From 7a0472fa35bcc51743422039932a8234f49d252e Mon Sep 17 00:00:00 2001
From: Ylva Selling <ylva.selling@gmail.com>
Date: Thu, 8 Jun 2023 14:28:29 -0400
Subject: [PATCH 001/701] Don't call update function unless layer has been
 initialized

---
 modules/globebrowsing/src/layer.cpp      | 4 ++++
 modules/globebrowsing/src/layer.h        | 2 ++
 modules/globebrowsing/src/layergroup.cpp | 2 +-
 3 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/modules/globebrowsing/src/layer.cpp b/modules/globebrowsing/src/layer.cpp
index e16f20fae0..49f390abad 100644
--- a/modules/globebrowsing/src/layer.cpp
+++ b/modules/globebrowsing/src/layer.cpp
@@ -438,6 +438,10 @@ bool Layer::enabled() const {
     return _enabled;
 }
 
+bool Layer::isInitialized() const {
+    return _isInitialized;
+}
+
 TileProvider* Layer::tileProvider() const {
     return _tileProvider.get();
 }
diff --git a/modules/globebrowsing/src/layer.h b/modules/globebrowsing/src/layer.h
index 84a0728631..a8e732fcd5 100644
--- a/modules/globebrowsing/src/layer.h
+++ b/modules/globebrowsing/src/layer.h
@@ -58,6 +58,7 @@ public:
     TileDepthTransform depthTransform() const;
     void setEnabled(bool enabled);
     bool enabled() const;
+    bool isInitialized() const;
     TileProvider* tileProvider() const;
     glm::vec3 solidColor() const;
     const LayerRenderSettings& renderSettings() const;
@@ -99,6 +100,7 @@ private:
     const layers::Group::ID _layerGroupId;
 
     std::function<void(Layer*)> _onChangeCallback;
+    bool _isInitialized = false;
   };
 
 } // namespace openspace::globebrowsing
diff --git a/modules/globebrowsing/src/layergroup.cpp b/modules/globebrowsing/src/layergroup.cpp
index e63d0a8ab5..1c466f26bd 100644
--- a/modules/globebrowsing/src/layergroup.cpp
+++ b/modules/globebrowsing/src/layergroup.cpp
@@ -91,7 +91,7 @@ void LayerGroup::update() {
     _activeLayers.clear();
 
     for (const std::unique_ptr<Layer>& layer : _layers) {
-        if (layer->enabled()) {
+        if (layer->enabled() && layer->isInitialized()) {
             layer->update();
             _activeLayers.push_back(layer.get());
         }

From ad58c695bfd2a43b88acb8883b907e8b8e66faf6 Mon Sep 17 00:00:00 2001
From: Ylva Selling <ylva.selling@gmail.com>
Date: Fri, 9 Jun 2023 10:31:57 -0400
Subject: [PATCH 002/701] Set initialize to true after initialization

---
 modules/globebrowsing/src/layer.cpp | 1 +
 1 file changed, 1 insertion(+)

diff --git a/modules/globebrowsing/src/layer.cpp b/modules/globebrowsing/src/layer.cpp
index 49f390abad..b051f6f37d 100644
--- a/modules/globebrowsing/src/layer.cpp
+++ b/modules/globebrowsing/src/layer.cpp
@@ -384,6 +384,7 @@ void Layer::initialize() {
     if (_tileProvider) {
         _tileProvider->initialize();
     }
+    _isInitialized = true;
 }
 
 void Layer::deinitialize() {

From 96823b848fb994b64b22662e12143c6efd32ea5e Mon Sep 17 00:00:00 2001
From: Ylva Selling <ylva.selling@gmail.com>
Date: Fri, 9 Jun 2023 16:15:27 -0400
Subject: [PATCH 003/701] Add function that calculates eclipse shadows

---
 .../rendering/atmospheredeferredcaster.cpp    | 39 +++++++++++++++++++
 .../rendering/atmospheredeferredcaster.h      |  1 +
 2 files changed, 40 insertions(+)

diff --git a/modules/atmosphere/rendering/atmospheredeferredcaster.cpp b/modules/atmosphere/rendering/atmospheredeferredcaster.cpp
index 26f1dac64c..89d9d9ae3b 100644
--- a/modules/atmosphere/rendering/atmospheredeferredcaster.cpp
+++ b/modules/atmosphere/rendering/atmospheredeferredcaster.cpp
@@ -270,6 +270,45 @@ void AtmosphereDeferredcaster::deinitialize() {
 
 void AtmosphereDeferredcaster::update(const UpdateData&) {}
 
+float AtmosphereDeferredcaster::eclipseShadow(glm::dvec3 position, bool ground)
+{
+    // This code is copied from the atmosphere deferred fragment shader 
+    // It is used to calculate the eclipse shadow
+    const ShadowRenderingStruct& shadow = _shadowDataArrayCache.front();
+    if (!shadow.isShadowing) {
+        return 1.0f;
+    }
+
+    glm::dvec3 pc = shadow.casterPositionVec - position;
+    glm::dvec3 scNorm = shadow.sourceCasterVec;
+    glm::dvec3 pcProj = dot(pc, scNorm) * scNorm;
+    glm::dvec3 d = pc - pcProj;
+
+    float length_d = float(length(d));
+    double lengthPcProj = length(pcProj);
+
+    float r_p_pi = float(shadow.rc * (lengthPcProj + shadow.xp) / shadow.xp);
+    float r_u_pi = float(shadow.rc * (shadow.xu - lengthPcProj) / shadow.xu);
+
+    if (length_d < r_u_pi) {
+        // umbra
+        if (_hardShadowsEnabled) {
+            return ground ? 0.2 : 0.5;
+        }
+        else {
+            // butterworth function
+            return sqrt(r_u_pi / (r_u_pi + pow(length_d, 4.0)));
+        }
+    }
+    else if (length_d < r_p_pi) {
+        // penumbra
+        return _hardShadowsEnabled ? 0.5 : length_d / r_p_pi;
+    }
+    else {
+        return 1.0;
+    }
+}
+
 void AtmosphereDeferredcaster::preRaycast(const RenderData& data, const DeferredcastData&,
                                           ghoul::opengl::ProgramObject& prg)
 {
diff --git a/modules/atmosphere/rendering/atmospheredeferredcaster.h b/modules/atmosphere/rendering/atmospheredeferredcaster.h
index 49f29a6395..4ed22758d9 100644
--- a/modules/atmosphere/rendering/atmospheredeferredcaster.h
+++ b/modules/atmosphere/rendering/atmospheredeferredcaster.h
@@ -75,6 +75,7 @@ public:
     void initializeCachedVariables(ghoul::opengl::ProgramObject& program) override;
 
     void update(const UpdateData&) override;
+    float eclipseShadow(glm::dvec3 position, bool ground);
 
     void calculateAtmosphereParameters();
 

From 52e316b03de37d0733b84a192b865e6955674b65 Mon Sep 17 00:00:00 2001
From: Ylva Selling <ylva.selling@gmail.com>
Date: Fri, 9 Jun 2023 16:21:12 -0400
Subject: [PATCH 004/701] Move calculate dimming coefficient to a function and
 also include calculations for eclipse shadows

---
 .../rendering/renderableatmosphere.cpp        | 125 +++++++++++-------
 .../rendering/renderableatmosphere.h          |   1 +
 2 files changed, 77 insertions(+), 49 deletions(-)

diff --git a/modules/atmosphere/rendering/renderableatmosphere.cpp b/modules/atmosphere/rendering/renderableatmosphere.cpp
index 7894d814de..0458e8cd6d 100644
--- a/modules/atmosphere/rendering/renderableatmosphere.cpp
+++ b/modules/atmosphere/rendering/renderableatmosphere.cpp
@@ -34,6 +34,7 @@
 #include <openspace/properties/property.h>
 #include <openspace/rendering/deferredcastermanager.h>
 #include <math.h>
+#include <algorithm>
 
 namespace {
     constexpr float KM_TO_M = 1000.f;
@@ -471,55 +472,7 @@ void RenderableAtmosphere::update(const UpdateData& data) {
     _deferredcaster->setModelTransform(modelTransform);
     _deferredcaster->setOpacity(opacity());
     _deferredcaster->update(data);
-
-    // Calculate atmosphere dimming coefficient
-    // Calculate if the camera is in the atmosphere and if it is in the fading region
-    float atmosphereDimming = 1.f;
-    glm::dvec3 cameraPos = global::navigationHandler->camera()->positionVec3();
-    glm::dvec3 planetPos = glm::dvec3(modelTransform * glm::dvec4(0.0, 0.0, 0.0, 1.0));
-    float cameraDistance = static_cast<float>(glm::distance(planetPos, cameraPos));
-    // Atmosphere height is in KM
-    float atmosphereEdge = KM_TO_M * (_planetRadius + _atmosphereHeight);
-    // Height of the atmosphere where the objects will be faded
-    float atmosphereFadingHeight = KM_TO_M * _atmosphereDimmingHeight * _atmosphereHeight;
-    float atmosphereInnerEdge = atmosphereEdge - atmosphereFadingHeight;
-    bool cameraIsInAtmosphere = cameraDistance < atmosphereEdge;
-    bool cameraIsInFadingRegion = cameraDistance > atmosphereInnerEdge;
-
-    // Check if camera is in sunset
-    glm::dvec3 normalUnderCamera = glm::normalize(cameraPos - planetPos);
-    glm::dvec3 vecToSun = glm::normalize(-planetPos);
-    float cameraSunAngle = glm::degrees(static_cast<float>(
-        glm::acos(glm::dot(vecToSun, normalUnderCamera))
-    ));
-    float sunsetStart = _atmosphereDimmingSunsetAngle.value().x;
-    float sunsetEnd = _atmosphereDimmingSunsetAngle.value().y;
-    // If cameraSunAngle is more than 90 degrees, we are in shaded part of globe
-    bool cameraIsInSun = cameraSunAngle <= sunsetEnd;
-    bool cameraIsInSunset = cameraSunAngle > sunsetStart && cameraIsInSun;
-
-    // Fade if camera is inside the atmosphere
-    if (cameraIsInAtmosphere && cameraIsInSun) {
-        // If camera is in fading part of the atmosphere
-        // Fade with regards to altitude
-        if (cameraIsInFadingRegion) {
-            // Fading - linear interpolation
-            atmosphereDimming = (cameraDistance - atmosphereInnerEdge) /
-                atmosphereFadingHeight;
-        }
-        else {
-            // Camera is below fading region - atmosphere dims objects completely
-            atmosphereDimming = 0.0;
-        }
-        if (cameraIsInSunset) {
-            // Fading - linear interpolation
-            atmosphereDimming = (cameraSunAngle - sunsetStart) /
-                (sunsetEnd - sunsetStart);
-        }
-        global::navigationHandler->camera()->setAtmosphereDimmingFactor(
-            atmosphereDimming
-        );
-    }
+    setDimmingCoefficient(computeModelTransformMatrix(data.modelTransform));
 }
 
 void RenderableAtmosphere::updateAtmosphereParameters() {
@@ -546,4 +499,78 @@ void RenderableAtmosphere::updateAtmosphereParameters() {
     _deferredcaster->setHardShadows(_hardShadowsEnabled);
 }
 
+// Calculate atmosphere dimming coefficient
+void RenderableAtmosphere::setDimmingCoefficient(const glm::dmat4& modelTransform) {
+    // Calculate if the camera is in the atmosphere and if it is in the sunny region
+    glm::dvec3 cameraPos = global::navigationHandler->camera()->positionVec3();
+    glm::dvec3 planetPos = glm::dvec3(modelTransform * glm::dvec4(0.0, 0.0, 0.0, 1.0));
+    float cameraDistance = static_cast<float>(glm::distance(planetPos, cameraPos));
+    glm::dvec3 normalUnderCamera = glm::normalize(cameraPos - planetPos);
+    glm::dvec3 vecToSun = glm::normalize(-planetPos);
+
+    float cameraSunAngle = glm::degrees(static_cast<float>(
+        glm::acos(glm::dot(vecToSun, normalUnderCamera))
+        ));
+    float sunsetEnd = _atmosphereDimmingSunsetAngle.value().y;
+
+    // If cameraSunAngle is more than 90 degrees, we are in shaded part of globe
+    bool cameraIsInSun = cameraSunAngle <= sunsetEnd;
+    // Atmosphere height is in KM
+    float atmosphereEdge = KM_TO_M * (_planetRadius + _atmosphereHeight);
+    bool cameraIsInAtmosphere = cameraDistance < atmosphereEdge;
+
+    // Don't fade if camera is not in the sunny part of an atmosphere 
+    if (!(cameraIsInAtmosphere && cameraIsInSun)) {
+        return;
+    }
+    // Else we need to fade the objects
+    // Height of the atmosphere where the objects will be faded
+    float atmosphereFadingHeight = KM_TO_M * _atmosphereDimmingHeight * _atmosphereHeight;
+    float atmosphereInnerEdge = atmosphereEdge - atmosphereFadingHeight;
+    bool cameraIsInFadingRegion = cameraDistance > atmosphereInnerEdge;
+
+    // Check if camera is in sunset
+    float sunsetStart = _atmosphereDimmingSunsetAngle.value().x;
+    bool cameraIsInSunset = cameraSunAngle > sunsetStart && cameraIsInSun;
+
+    // See if we are inside of an eclipse shadow
+    float eclipseShadow = _deferredcaster->eclipseShadow(cameraPos, false);
+    bool cameraIsInEclipse = std::abs(eclipseShadow - 1.0f) > glm::epsilon<float>();
+    // Invert shadow and multiply with itself to make it more narrow
+    eclipseShadow = std::pow(1.0f - eclipseShadow, 2.0f);
+    float atmosphereDimming = 0.f;
+
+    if (cameraIsInSunset) {
+        // Fading - linear interpolation
+        atmosphereDimming = (cameraSunAngle - sunsetStart) /
+            (sunsetEnd - sunsetStart);
+    }
+    else if (cameraIsInFadingRegion && cameraIsInEclipse) {
+        // Fade with regards to altitude & eclipse shadow
+        // Fading - linear interpolation
+        float fading = (cameraDistance - atmosphereInnerEdge) /
+            atmosphereFadingHeight;
+        atmosphereDimming = std::clamp(eclipseShadow + fading, 0.0f, 1.0f);
+    }
+    else if (cameraIsInFadingRegion) {
+        // Fade with regards to altitude
+        // Fading - linear interpolation
+        atmosphereDimming = (cameraDistance - atmosphereInnerEdge) /
+            atmosphereFadingHeight;
+    }
+    else if (cameraIsInEclipse) {
+        atmosphereDimming = eclipseShadow;
+    }
+    else {
+        // Camera is below fading region - atmosphere dims objects completely
+        atmosphereDimming = 0.0f;
+
+    }
+    // Calculate dimming coefficient for stars, labels etc that are dimmed in the
+    // atmosphere
+    global::navigationHandler->camera()->setAtmosphereDimmingFactor(
+        atmosphereDimming
+    );
+}
+
 }  // namespace openspace
diff --git a/modules/atmosphere/rendering/renderableatmosphere.h b/modules/atmosphere/rendering/renderableatmosphere.h
index acee718216..66843f16f1 100644
--- a/modules/atmosphere/rendering/renderableatmosphere.h
+++ b/modules/atmosphere/rendering/renderableatmosphere.h
@@ -79,6 +79,7 @@ public:
 private:
     glm::dmat4 computeModelTransformMatrix(const openspace::TransformData& data);
     void updateAtmosphereParameters();
+    void dimmingCoefficient(const glm::dmat4& modelTransform);
 
     properties::FloatProperty _atmosphereHeight;
     properties::FloatProperty _groundAverageReflectance;

From e5e5a22786d83d0dbfc5058cf6df7bfa699fc87a Mon Sep 17 00:00:00 2001
From: Emma Broman <emma.broman@liu.se>
Date: Mon, 12 Jun 2023 11:07:43 +0200
Subject: [PATCH 005/701] Read performshading from geojson file

---
 .../src/geojson/geojsonproperties.cpp         | 24 ++++++++++++++-----
 1 file changed, 18 insertions(+), 6 deletions(-)

diff --git a/modules/globebrowsing/src/geojson/geojsonproperties.cpp b/modules/globebrowsing/src/geojson/geojsonproperties.cpp
index 594fb49892..b7e768484a 100644
--- a/modules/globebrowsing/src/geojson/geojsonproperties.cpp
+++ b/modules/globebrowsing/src/geojson/geojsonproperties.cpp
@@ -64,6 +64,8 @@ namespace geojson::propertykeys {
     constexpr std::string_view AltitudeModeClamp = "clampToGround";
     constexpr std::string_view AltitudeModeAbsolute = "absolute";
     constexpr std::string_view AltitudeModeRelative = "relativeToGround";
+
+    constexpr std::string_view PerformShading = "performShading";
 } // namespace geojson::propertykeys
 
 namespace {
@@ -210,7 +212,8 @@ namespace {
     constexpr openspace::properties::Property::PropertyInfo ExtrudeInfo = {
         "Extrude",
         "Extrude",
-        "If true, extrude the mesh or line to intersect the globe",
+        "If true, extrude the geometry to intersect the globe.Lines/polygons will be"
+        "extruded with polygons,and points with lines ",
         openspace::properties::Property::Visibility::User
     };
 
@@ -404,16 +407,16 @@ GeoJsonProperties::GeoJsonProperties()
     addProperty(performShading);
 
     altitudeModeOption.addOptions({
-        { static_cast<int>(AltitudeMode::Absolute), "Absolute"},
+        { static_cast<int>(AltitudeMode::Absolute), "Absolute" },
         { static_cast<int>(AltitudeMode::RelativeToGround), "Relative to Ground" }
         //{ static_cast<int>(AltitudeMode::ClampToGround), "Clamp to Ground" } / TODO: add ClampToGround
-        });
+    });
     addProperty(altitudeModeOption);
 
     pointAnchorOption.addOptions({
-        { static_cast<int>(PointTextureAnchor::Bottom), "Bottom"},
+        { static_cast<int>(PointTextureAnchor::Bottom), "Bottom" },
         { static_cast<int>(PointTextureAnchor::Center), "Center" }
-        });
+    });
     addProperty(pointAnchorOption);
 
     addPropertySubOwner(tessellation);
@@ -555,6 +558,9 @@ GeoJsonOverrideProperties propsFromGeoJson(const geos::io::GeoJSONFeature& featu
                 ));
             }
         }
+        else if (keyMatches(key, propertykeys::PerformShading, PerformShadingInfo)) {
+            result.performShading = value.getBoolean();
+        }
         else if (keyMatches(key, propertykeys::Tessellate, TessellationEnabledInfo)) {
             result.tessellationEnabled = value.getBoolean();
         }
@@ -563,7 +569,13 @@ GeoJsonOverrideProperties propsFromGeoJson(const geos::io::GeoJSONFeature& featu
             result.useTessellationLevel = true;
             result.tessellationLevel = static_cast<int>(value.getNumber());
         }
-        else if (keyMatches(key, propertykeys::TessellationMaxDistance, TessellationDistanceInfo)) {
+        else if (
+            keyMatches(
+                key,
+                propertykeys::TessellationMaxDistance,
+                TessellationDistanceInfo
+            ))
+        {
             result.tessellationDistance = static_cast<float>(value.getNumber());
         }
     };

From 76402e05252beae874513f2dda1c25c62558e17a Mon Sep 17 00:00:00 2001
From: Emma Broman <emma.broman@liu.se>
Date: Mon, 12 Jun 2023 14:11:45 +0200
Subject: [PATCH 006/701] Consistent spelling of "tessellation"

---
 modules/globebrowsing/src/geojson/geojsonproperties.cpp  | 6 +++---
 modules/globebrowsing/src/geojson/globegeometryfeature.h | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/modules/globebrowsing/src/geojson/geojsonproperties.cpp b/modules/globebrowsing/src/geojson/geojsonproperties.cpp
index b7e768484a..2b96742276 100644
--- a/modules/globebrowsing/src/geojson/geojsonproperties.cpp
+++ b/modules/globebrowsing/src/geojson/geojsonproperties.cpp
@@ -258,9 +258,9 @@ namespace {
     constexpr openspace::properties::Property::PropertyInfo UseTessellationLevelInfo = {
         "UseTessellationLevel",
         "Use Tessellation Level",
-        "If true, use the 'Tesselation Level' to control the level of detail for the "
-        "tessellation. The distance used will be the 'Tesselation Distance' divided by "
-        "the 'Tesselation Level', so the higher the level value, the smaller each "
+        "If true, use the 'Tessellation Level' to control the level of detail for the "
+        "tessellation. The distance used will be the 'Tessellation Distance' divided by "
+        "the 'Tessellation Level', so the higher the level value, the smaller each "
         "segment in the geomoetry will be",
         openspace::properties::Property::Visibility::AdvancedUser
     };
diff --git a/modules/globebrowsing/src/geojson/globegeometryfeature.h b/modules/globebrowsing/src/geojson/globegeometryfeature.h
index 5870a138fa..07d1c5b634 100644
--- a/modules/globebrowsing/src/geojson/globegeometryfeature.h
+++ b/modules/globebrowsing/src/geojson/globegeometryfeature.h
@@ -174,7 +174,7 @@ private:
     void initializeRenderFeature(RenderFeature& feature,
         const std::vector<Vertex>& vertices);
 
-    /// Get the distance that shall be used for tesselation, based on the properties
+    /// Get the distance that shall be used for tessellation, based on the properties
     float tessellationStepSize() const;
 
     /// Compute the heights to the surface at the reference points

From 81a54927d0f5d2a8e65d6f9fc2396a057e2d6544 Mon Sep 17 00:00:00 2001
From: Ylva Selling <ylva.selling@gmail.com>
Date: Mon, 12 Jun 2023 09:41:13 -0400
Subject: [PATCH 007/701] Fix compilation issue

---
 modules/atmosphere/rendering/renderableatmosphere.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/atmosphere/rendering/renderableatmosphere.h b/modules/atmosphere/rendering/renderableatmosphere.h
index 66843f16f1..5d8cc531e2 100644
--- a/modules/atmosphere/rendering/renderableatmosphere.h
+++ b/modules/atmosphere/rendering/renderableatmosphere.h
@@ -79,7 +79,7 @@ public:
 private:
     glm::dmat4 computeModelTransformMatrix(const openspace::TransformData& data);
     void updateAtmosphereParameters();
-    void dimmingCoefficient(const glm::dmat4& modelTransform);
+    void setDimmingCoefficient(const glm::dmat4& modelTransform);
 
     properties::FloatProperty _atmosphereHeight;
     properties::FloatProperty _groundAverageReflectance;

From 08523695dd20dde070b86b147c44a2f43e14950f Mon Sep 17 00:00:00 2001
From: Ylva Selling <ylva.selling@gmail.com>
Date: Mon, 12 Jun 2023 11:41:19 -0400
Subject: [PATCH 008/701] Fix crash from dereferencing a null ptr

---
 modules/atmosphere/rendering/atmospheredeferredcaster.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/atmosphere/rendering/atmospheredeferredcaster.cpp b/modules/atmosphere/rendering/atmospheredeferredcaster.cpp
index 89d9d9ae3b..4ba764159c 100644
--- a/modules/atmosphere/rendering/atmospheredeferredcaster.cpp
+++ b/modules/atmosphere/rendering/atmospheredeferredcaster.cpp
@@ -275,7 +275,7 @@ float AtmosphereDeferredcaster::eclipseShadow(glm::dvec3 position, bool ground)
     // This code is copied from the atmosphere deferred fragment shader 
     // It is used to calculate the eclipse shadow
     const ShadowRenderingStruct& shadow = _shadowDataArrayCache.front();
-    if (!shadow.isShadowing) {
+    if (_shadowDataArrayCache.empty() || !shadow.isShadowing) {
         return 1.0f;
     }
 

From c1b97d2603faef7e53a9f0a21e600fd31f86dbf3 Mon Sep 17 00:00:00 2001
From: Ylva Selling <ylva.selling@gmail.com>
Date: Mon, 12 Jun 2023 17:50:07 -0400
Subject: [PATCH 009/701] Update documentation submodule: fix broken search and
 console errors for keys

---
 documentation | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/documentation b/documentation
index 3917fa57e4..3d6a26821f 160000
--- a/documentation
+++ b/documentation
@@ -1 +1 @@
-Subproject commit 3917fa57e47503e30e20d4059be9b54b729a5ea2
+Subproject commit 3d6a26821fe51b4ca8b6e182476246683a12080f

From ee9c917acfdda79d5fcb3200cfbe580b7fc6ea9d Mon Sep 17 00:00:00 2001
From: Emma Broman <emma.broman@liu.se>
Date: Tue, 13 Jun 2023 09:29:44 +0200
Subject: [PATCH 010/701] Fix some faulty indentation and remove a bunch of
 extra lines

---
 modules/globebrowsing/src/renderableglobe.cpp | 9 ++-------
 1 file changed, 2 insertions(+), 7 deletions(-)

diff --git a/modules/globebrowsing/src/renderableglobe.cpp b/modules/globebrowsing/src/renderableglobe.cpp
index fcb58d8020..00bfcbfbb4 100644
--- a/modules/globebrowsing/src/renderableglobe.cpp
+++ b/modules/globebrowsing/src/renderableglobe.cpp
@@ -987,7 +987,6 @@ void RenderableGlobe::renderChunks(const RenderData& data, RendererTasks&,
 {
     ZoneScoped;
 
-
     if (_layerManagerDirty) {
         _layerManager.update();
         _layerManagerDirty = false;
@@ -1001,8 +1000,8 @@ void RenderableGlobe::renderChunks(const RenderData& data, RendererTasks&,
             lgs.end(),
             0,
             [](int lhs, LayerGroup* lg) {
-            return lhs + static_cast<int>(lg->activeLayers().size());
-        }
+                return lhs + static_cast<int>(lg->activeLayers().size());
+            }
         );
         _nLayersIsDirty = false;
     }
@@ -1112,8 +1111,6 @@ void RenderableGlobe::renderChunks(const RenderData& data, RendererTasks&,
     _iterationsOfUnavailableData =
         (_allChunksAvailable ? 0 : _iterationsOfUnavailableData + 1);
 
-
-
     //
     // Setting uniforms that don't change between chunks but are view dependent
     //
@@ -1181,8 +1178,6 @@ void RenderableGlobe::renderChunks(const RenderData& data, RendererTasks&,
         _localRenderer.program->setIgnoreUniformLocationError(IgnoreError::Yes);
     }
 
-
-
     // Local shader
     _localRenderer.program->setUniform(
         "projectionTransform",

From 7ada21662066ae6841d92651cd7db38f49dd7452 Mon Sep 17 00:00:00 2001
From: Alexander Bock <mail@alexanderbock.eu>
Date: Tue, 13 Jun 2023 11:12:56 +0200
Subject: [PATCH 011/701] Change linear interpolation back to anisotropic
 interpolation (closes #2752)

---
 modules/globebrowsing/src/memoryawaretilecache.cpp | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/modules/globebrowsing/src/memoryawaretilecache.cpp b/modules/globebrowsing/src/memoryawaretilecache.cpp
index 9000d41dd0..653ad00577 100644
--- a/modules/globebrowsing/src/memoryawaretilecache.cpp
+++ b/modules/globebrowsing/src/memoryawaretilecache.cpp
@@ -219,14 +219,14 @@ void MemoryAwareTileCache::TextureContainer::reset() {
             _initData.ghoulTextureFormat,
             toGlTextureFormat(_initData.glType, _initData.ghoulTextureFormat),
             _initData.glType,
-            Texture::FilterMode::Linear,
+            Texture::FilterMode::AnisotropicMipMap,
             Texture::WrappingMode::ClampToEdge,
             Texture::AllocateData(_initData.shouldAllocateDataOnCPU)
         );
 
         tex->setDataOwnership(Texture::TakeOwnership::Yes);
         tex->uploadTexture();
-        tex->setFilter(Texture::FilterMode::Linear);
+        tex->setFilter(Texture::FilterMode::AnisotropicMipMap);
 
         _textures.push_back(std::move(tex));
     }
@@ -472,7 +472,10 @@ void MemoryAwareTileCache::createTileAndPut(ProviderTileKey key, RawTile rawTile
             _numTextureBytesAllocatedOnCPU += numBytes - previousExpectedDataSize;
             tex->reUploadTexture();
         }
-        tex->setFilter(ghoul::opengl::Texture::FilterMode::Linear);
+        // Hi there, I know someone will be tempted to change this to a Linear filtering
+        // mode at some point. This will introduce rendering artifacts when looking at the
+        // globe at oblique angles (see #2752)
+        tex->setFilter(ghoul::opengl::Texture::FilterMode::AnisotropicMipMap);
         Tile tile{ tex, std::move(rawTile.tileMetaData), Tile::Status::OK };
         TileTextureInitData::HashKey initDataKey = initData.hashKey;
         _textureContainerMap[initDataKey].second->put(std::move(key), std::move(tile));

From f38c7242d0544485ff360c1194d00e91764ad673 Mon Sep 17 00:00:00 2001
From: Micah Acinapura <micahnyc@gmail.com>
Date: Tue, 13 Jun 2023 08:26:34 -0600
Subject: [PATCH 012/701] =?UTF-8?q?added=20multiple=20and=20offset=20to=20?=
 =?UTF-8?q?blue=20marble=20height=20to=20make=20it=20similar=20lo=E2=80=A6?=
 =?UTF-8?q?=20(#2658)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* added multiple and offset to blue marble height to make it similar looking to esri terrain

* Update blue_marble_height.asset
---
 .../earth/layers/heightlayers/blue_marble_height.asset     | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/data/assets/scene/solarsystem/planets/earth/layers/heightlayers/blue_marble_height.asset b/data/assets/scene/solarsystem/planets/earth/layers/heightlayers/blue_marble_height.asset
index bc2d6a2b45..1b6c3fc58a 100644
--- a/data/assets/scene/solarsystem/planets/earth/layers/heightlayers/blue_marble_height.asset
+++ b/data/assets/scene/solarsystem/planets/earth/layers/heightlayers/blue_marble_height.asset
@@ -15,7 +15,12 @@ local Layer = {
   Identifier = "Earth_Bluemarble_Height",
   Enabled = asset.enabled,
   FilePath = texturesPath .. "earth_bluemarble_height.jpg",
-  Description = "Topographic layer from Blue Marble Next Generation"
+  Description = "Topographic layer from Blue Marble Next Generation",
+  --note these values were just chosen to try to closly match the look of the ESRI Terrain layer
+  Settings = {
+    Multiplier = 40,
+    Offset = -600
+  }
 }
 
 

From 7575be32c06a4486e2d581023258303ecb666b90 Mon Sep 17 00:00:00 2001
From: Alexander Bock <mail@alexanderbock.eu>
Date: Tue, 13 Jun 2023 19:16:09 +0200
Subject: [PATCH 013/701] Add version number to launcher (closes #2365)

---
 .../ext/launcher/resources/qss/launcher.qss          |  5 +++++
 apps/OpenSpace/ext/launcher/src/launcherwindow.cpp   | 12 ++++++++++++
 2 files changed, 17 insertions(+)

diff --git a/apps/OpenSpace/ext/launcher/resources/qss/launcher.qss b/apps/OpenSpace/ext/launcher/resources/qss/launcher.qss
index 5c920457bb..a22ab8a331 100644
--- a/apps/OpenSpace/ext/launcher/resources/qss/launcher.qss
+++ b/apps/OpenSpace/ext/launcher/resources/qss/launcher.qss
@@ -30,6 +30,11 @@ LauncherWindow  QLabel#clear {
   background-color: rgba(0, 0, 0, 0%);
 }
 
+LauncherWindow  QLabel#version-info {
+  font-size: 10pt;
+  color: #dfdfdf;
+}
+
 LauncherWindow  QComboBox#config {
   background: rgb(96, 96, 96);
   border: 1px solid rgb(128, 128, 128);
diff --git a/apps/OpenSpace/ext/launcher/src/launcherwindow.cpp b/apps/OpenSpace/ext/launcher/src/launcherwindow.cpp
index 9675293ae2..8454551101 100644
--- a/apps/OpenSpace/ext/launcher/src/launcherwindow.cpp
+++ b/apps/OpenSpace/ext/launcher/src/launcherwindow.cpp
@@ -82,6 +82,9 @@ namespace {
         constexpr QRect StartButton(
             LeftRuler, TopRuler + 400, ItemWidth, ItemHeight
         );
+        constexpr QRect VersionString(
+            5, ScreenHeight - SmallItemHeight, ItemWidth, SmallItemHeight
+        );
     } // geometry
 
     std::optional<Profile> loadProfileFromFile(QWidget* parent, std::string filename) {
@@ -364,6 +367,15 @@ QWidget* LauncherWindow::createCentralWidget() {
     _editWindowButton->setGeometry(geometry::EditWindowButton);
     _editWindowButton->setCursor(Qt::PointingHandCursor);
 
+
+    QLabel* versionLabel = new QLabel(centralWidget);
+    versionLabel->setVisible(true);
+    versionLabel->setText(
+        QString::fromStdString(std::string(openspace::OPENSPACE_VERSION_STRING_FULL))
+    );
+    versionLabel->setObjectName("version-info");
+    versionLabel->setGeometry(geometry::VersionString);
+
     return centralWidget;
 }
 

From 07ebac5cd3eeb36dd36f6e2418e34a6c54288345 Mon Sep 17 00:00:00 2001
From: Alexander Bock <mail@alexanderbock.eu>
Date: Tue, 13 Jun 2023 19:38:00 +0200
Subject: [PATCH 014/701] Remove the registered actions before updating the
 delta time keybindings (closes #2764)

---
 src/util/timemanager.cpp | 16 ++++++++++++++--
 1 file changed, 14 insertions(+), 2 deletions(-)

diff --git a/src/util/timemanager.cpp b/src/util/timemanager.cpp
index c9fc013e57..e400f3dec0 100644
--- a/src/util/timemanager.cpp
+++ b/src/util/timemanager.cpp
@@ -75,7 +75,9 @@ namespace {
     };
 
     constexpr std::string_view DeltaTimeStepsGuiPath = "/Time/Simulation Speed/Steps";
-}
+
+    constexpr std::string_view DeltaTimeActionPrefix = "core.time.delta_time";
+} // namespace
 
 namespace openspace {
 
@@ -466,6 +468,7 @@ void TimeManager::setDeltaTimeSteps(std::vector<double> deltaTimes) {
     _deltaTimeSteps = std::move(deltaTimes);
     _deltaTimeStepsChanged = true;
 
+    clearDeltaTimesKeybindings();
     addDeltaTimesKeybindings();
 }
 
@@ -500,7 +503,7 @@ void TimeManager::addDeltaTimesKeybindings() {
     auto addDeltaTimeKeybind = [this](Key key, KeyModifier mod, double step) {
         const std::string s = fmt::format("{:.0f}", step);
 
-        std::string identifier = fmt::format("core.time.delta_time.{}", s);
+        std::string identifier = fmt::format("{}.{}", DeltaTimeActionPrefix, s);
         interaction::Action action;
         action.identifier = identifier;
         action.command = fmt::format("openspace.time.interpolateDeltaTime({})", s);
@@ -551,6 +554,15 @@ void TimeManager::addDeltaTimesKeybindings() {
 }
 
 void TimeManager::clearDeltaTimesKeybindings() {
+    // Iterate over all of the registered actions with the common prefix that we created
+    // in the addDeltaTimesKeybindings function
+    std::vector<interaction::Action> actions = global::actionManager->actions();
+    for (const interaction::Action& action : actions) {
+        if (action.identifier.starts_with(DeltaTimeActionPrefix)) {
+            global::actionManager->removeAction(action.identifier);
+        }
+    }
+
     for (const KeyWithModifier& kb : _deltaTimeStepKeybindings) {
         // Check if there are multiple keys bound to the same key
         auto bindings = global::keybindingManager->keyBinding(kb);

From e89bef020347a35eded3c297dec77106316b9de6 Mon Sep 17 00:00:00 2001
From: Ylva Selling <ylva.selling@gmail.com>
Date: Tue, 13 Jun 2023 16:10:06 -0400
Subject: [PATCH 015/701] Address comments on PR and make code more readable

---
 .../rendering/atmospheredeferredcaster.cpp    | 71 ++++++++++---------
 .../rendering/atmospheredeferredcaster.h      | 10 +--
 .../rendering/renderableatmosphere.cpp        | 34 ++++-----
 3 files changed, 58 insertions(+), 57 deletions(-)

diff --git a/modules/atmosphere/rendering/atmospheredeferredcaster.cpp b/modules/atmosphere/rendering/atmospheredeferredcaster.cpp
index 4ba764159c..5dfd05bcfb 100644
--- a/modules/atmosphere/rendering/atmospheredeferredcaster.cpp
+++ b/modules/atmosphere/rendering/atmospheredeferredcaster.cpp
@@ -270,42 +270,44 @@ void AtmosphereDeferredcaster::deinitialize() {
 
 void AtmosphereDeferredcaster::update(const UpdateData&) {}
 
-float AtmosphereDeferredcaster::eclipseShadow(glm::dvec3 position, bool ground)
-{
+float AtmosphereDeferredcaster::eclipseShadow(glm::dvec3 position) {
     // This code is copied from the atmosphere deferred fragment shader 
     // It is used to calculate the eclipse shadow
     const ShadowRenderingStruct& shadow = _shadowDataArrayCache.front();
     if (_shadowDataArrayCache.empty() || !shadow.isShadowing) {
-        return 1.0f;
+        return 1.f;
     }
 
-    glm::dvec3 pc = shadow.casterPositionVec - position;
-    glm::dvec3 scNorm = shadow.sourceCasterVec;
-    glm::dvec3 pcProj = dot(pc, scNorm) * scNorm;
-    glm::dvec3 d = pc - pcProj;
+    const glm::dvec3 positionToCaster = shadow.casterPositionVec - position;
+    const glm::dvec3 sourceToCaster = shadow.sourceCasterVec; // Normalized
+    const glm::dvec3 casterShadow = dot(positionToCaster, sourceToCaster) * sourceToCaster;
+    const glm::dvec3 positionToShadow = positionToCaster - casterShadow;
 
-    float length_d = float(length(d));
-    double lengthPcProj = length(pcProj);
+    float distanceToShadow = static_cast<float>(length(positionToShadow));
+    double shadowLength = length(casterShadow);
 
-    float r_p_pi = float(shadow.rc * (lengthPcProj + shadow.xp) / shadow.xp);
-    float r_u_pi = float(shadow.rc * (shadow.xu - lengthPcProj) / shadow.xu);
+    float radiusPenumbra = static_cast<float>(
+        shadow.radiusCaster * (shadowLength + shadow.penumbra) / shadow.penumbra
+    );
+    float radiusUmbra = static_cast<float>(
+        shadow.radiusCaster * (shadow.umbra - shadowLength) / shadow.umbra
+    );
 
-    if (length_d < r_u_pi) {
-        // umbra
+    // Is the position in the umbra - the fully shaded part
+    if (distanceToShadow < radiusUmbra) {
         if (_hardShadowsEnabled) {
-            return ground ? 0.2 : 0.5;
+            return 0.5f;
         }
         else {
-            // butterworth function
-            return sqrt(r_u_pi / (r_u_pi + pow(length_d, 4.0)));
+            // Smooth the shadow with the butterworth function
+            return sqrt(radiusUmbra / (radiusUmbra + pow(distanceToShadow, 4.f)));
         }
     }
-    else if (length_d < r_p_pi) {
-        // penumbra
-        return _hardShadowsEnabled ? 0.5 : length_d / r_p_pi;
+    else if (distanceToShadow < radiusPenumbra) { // In penumbra - partially shaded part
+        return _hardShadowsEnabled ? 0.5f : distanceToShadow / radiusPenumbra;
     }
     else {
-        return 1.0;
+        return 1.f;
     }
 }
 
@@ -430,9 +432,10 @@ void AtmosphereDeferredcaster::preRaycast(const RenderData& data, const Deferred
                 return;
             }
 
-            const double sourceScale = std::max(glm::compMax(sourceNode->scale()), 1.0);
-            const double casterScale = std::max(glm::compMax(casterNode->scale()), 1.0);
-
+            double sourceScale = std::max(glm::compMax(sourceNode->scale()), 1.0);
+            double casterScale = std::max(glm::compMax(casterNode->scale()), 1.0);
+            double actualSourceRadius = shadowConf.source.second * sourceScale;
+            double actualCasterRadius = shadowConf.caster.second * casterScale;
             // First we determine if the caster is shadowing the current planet
             // (all calculations in World Coordinates):
             glm::dvec3 planetCasterVec = casterPos - data.modelTransform.translation;
@@ -442,11 +445,9 @@ void AtmosphereDeferredcaster::preRaycast(const RenderData& data, const Deferred
                 (glm::dot(planetCasterVec, sourceCasterVec) / (scLength * scLength)) *
                 sourceCasterVec;
             double dTest = glm::length(planetCasterVec - planetCasterProj);
-            double xpTest = shadowConf.caster.second * casterScale *
-                scLength /
-                (shadowConf.source.second * sourceScale +
-                    shadowConf.caster.second * casterScale);
-            double rpTest = shadowConf.caster.second * casterScale *
+            double xpTest = actualCasterRadius * scLength /
+                (actualSourceRadius + actualCasterRadius);
+            double rpTest = actualCasterRadius *
                 (glm::length(planetCasterProj) + xpTest) / xpTest;
 
             double casterDistSun = glm::length(casterPos - sunPosWorld);
@@ -462,11 +463,11 @@ void AtmosphereDeferredcaster::preRaycast(const RenderData& data, const Deferred
             {
                 // The current caster is shadowing the current planet
                 shadow.isShadowing = true;
-                shadow.rs = shadowConf.source.second * sourceScale;
-                shadow.rc = shadowConf.caster.second * casterScale;
+                shadow.radiusSource = actualSourceRadius;
+                shadow.radiusCaster = actualCasterRadius;
                 shadow.sourceCasterVec = glm::normalize(sourceCasterVec);
-                shadow.xp = xpTest;
-                shadow.xu = shadow.rc * scLength / (shadow.rs - shadow.rc);
+                shadow.penumbra = xpTest;
+                shadow.umbra = shadow.radiusCaster * scLength / (shadow.radiusSource - shadow.radiusCaster);
                 shadow.casterPositionVec = casterPos;
             }
             _shadowDataArrayCache.push_back(shadow);
@@ -483,11 +484,11 @@ void AtmosphereDeferredcaster::preRaycast(const RenderData& data, const Deferred
 
             if (sd.isShadowing) {
                 std::strcpy(bf, "].xp\0");
-                prg.setUniform(_uniformNameBuffer, sd.xp);
+                prg.setUniform(_uniformNameBuffer, sd.penumbra);
                 std::strcpy(bf, "].xu\0");
-                prg.setUniform(_uniformNameBuffer, sd.xu);
+                prg.setUniform(_uniformNameBuffer, sd.umbra);
                 std::strcpy(bf, "].rc\0");
-                prg.setUniform(_uniformNameBuffer, sd.rc);
+                prg.setUniform(_uniformNameBuffer, sd.radiusCaster);
                 std::strcpy(bf, "].sourceCasterVec\0");
                 prg.setUniform(_uniformNameBuffer, sd.sourceCasterVec);
                 std::strcpy(bf, "].casterPositionVec\0");
diff --git a/modules/atmosphere/rendering/atmospheredeferredcaster.h b/modules/atmosphere/rendering/atmospheredeferredcaster.h
index 4ed22758d9..eae2fa33ca 100644
--- a/modules/atmosphere/rendering/atmospheredeferredcaster.h
+++ b/modules/atmosphere/rendering/atmospheredeferredcaster.h
@@ -46,10 +46,10 @@ struct DeferredcastData;
 struct ShadowConfiguration;
 
 struct ShadowRenderingStruct {
-    double xu = 0.0;
-    double xp = 0.0;
-    double rs = 0.0;
-    double rc = 0.0;
+    double umbra = 0.0;
+    double penumbra = 0.0;
+    double radiusSource = 0.0;
+    double radiusCaster = 0.0;
     glm::dvec3 sourceCasterVec = glm::dvec3(0.0);
     glm::dvec3 casterPositionVec = glm::dvec3(0.0);
     bool isShadowing = false;
@@ -75,7 +75,7 @@ public:
     void initializeCachedVariables(ghoul::opengl::ProgramObject& program) override;
 
     void update(const UpdateData&) override;
-    float eclipseShadow(glm::dvec3 position, bool ground);
+    float eclipseShadow(glm::dvec3 position);
 
     void calculateAtmosphereParameters();
 
diff --git a/modules/atmosphere/rendering/renderableatmosphere.cpp b/modules/atmosphere/rendering/renderableatmosphere.cpp
index 0458e8cd6d..00e5a322d5 100644
--- a/modules/atmosphere/rendering/renderableatmosphere.cpp
+++ b/modules/atmosphere/rendering/renderableatmosphere.cpp
@@ -33,8 +33,8 @@
 #include <ghoul/misc/profiling.h>
 #include <openspace/properties/property.h>
 #include <openspace/rendering/deferredcastermanager.h>
-#include <math.h>
 #include <algorithm>
+#include <math.h>
 
 namespace {
     constexpr float KM_TO_M = 1000.f;
@@ -273,7 +273,7 @@ documentation::Documentation RenderableAtmosphere::Documentation() {
 
 RenderableAtmosphere::RenderableAtmosphere(const ghoul::Dictionary& dictionary)
     : Renderable(dictionary)
-    , _atmosphereHeight(AtmosphereHeightInfo, 60.f, 0.1f, 99.0f)
+    , _atmosphereHeight(AtmosphereHeightInfo, 60.f, 0.1f, 99.f)
     , _groundAverageReflectance(AverageGroundReflectanceInfo, 0.f, 0.f, 1.f)
     , _groundRadianceEmission(GroundRadianceEmissionInfo, 0.f, 0.f, 1.f)
     , _rayleighHeightScale(RayleighHeightScaleInfo, 0.f, 0.1f, 50.f)
@@ -502,15 +502,16 @@ void RenderableAtmosphere::updateAtmosphereParameters() {
 // Calculate atmosphere dimming coefficient
 void RenderableAtmosphere::setDimmingCoefficient(const glm::dmat4& modelTransform) {
     // Calculate if the camera is in the atmosphere and if it is in the sunny region
-    glm::dvec3 cameraPos = global::navigationHandler->camera()->positionVec3();
-    glm::dvec3 planetPos = glm::dvec3(modelTransform * glm::dvec4(0.0, 0.0, 0.0, 1.0));
+    const glm::dvec3 cameraPos = global::navigationHandler->camera()->positionVec3();
+    // TODO: change the assumption that the Sun is placed in the origin 
+    const glm::dvec3 planetPos = glm::dvec3(modelTransform * glm::dvec4(0.0, 0.0, 0.0, 1.0));
+    const glm::dvec3 normalUnderCamera = glm::normalize(cameraPos - planetPos);
+    const glm::dvec3 vecToSun = glm::normalize(-planetPos);
+    
     float cameraDistance = static_cast<float>(glm::distance(planetPos, cameraPos));
-    glm::dvec3 normalUnderCamera = glm::normalize(cameraPos - planetPos);
-    glm::dvec3 vecToSun = glm::normalize(-planetPos);
-
-    float cameraSunAngle = glm::degrees(static_cast<float>(
-        glm::acos(glm::dot(vecToSun, normalUnderCamera))
-        ));
+    float cameraSunAngle = static_cast<float>(
+        glm::degrees(glm::acos(glm::dot(vecToSun, normalUnderCamera))
+    ));
     float sunsetEnd = _atmosphereDimmingSunsetAngle.value().y;
 
     // If cameraSunAngle is more than 90 degrees, we are in shaded part of globe
@@ -520,7 +521,7 @@ void RenderableAtmosphere::setDimmingCoefficient(const glm::dmat4& modelTransfor
     bool cameraIsInAtmosphere = cameraDistance < atmosphereEdge;
 
     // Don't fade if camera is not in the sunny part of an atmosphere 
-    if (!(cameraIsInAtmosphere && cameraIsInSun)) {
+    if (!cameraIsInAtmosphere || !cameraIsInSun) {
         return;
     }
     // Else we need to fade the objects
@@ -534,10 +535,10 @@ void RenderableAtmosphere::setDimmingCoefficient(const glm::dmat4& modelTransfor
     bool cameraIsInSunset = cameraSunAngle > sunsetStart && cameraIsInSun;
 
     // See if we are inside of an eclipse shadow
-    float eclipseShadow = _deferredcaster->eclipseShadow(cameraPos, false);
-    bool cameraIsInEclipse = std::abs(eclipseShadow - 1.0f) > glm::epsilon<float>();
+    float eclipseShadow = _deferredcaster->eclipseShadow(cameraPos);
+    bool cameraIsInEclipse = std::abs(eclipseShadow - 1.f) > glm::epsilon<float>();
     // Invert shadow and multiply with itself to make it more narrow
-    eclipseShadow = std::pow(1.0f - eclipseShadow, 2.0f);
+    eclipseShadow = std::pow(1.f - eclipseShadow, 2.f);
     float atmosphereDimming = 0.f;
 
     if (cameraIsInSunset) {
@@ -550,7 +551,7 @@ void RenderableAtmosphere::setDimmingCoefficient(const glm::dmat4& modelTransfor
         // Fading - linear interpolation
         float fading = (cameraDistance - atmosphereInnerEdge) /
             atmosphereFadingHeight;
-        atmosphereDimming = std::clamp(eclipseShadow + fading, 0.0f, 1.0f);
+        atmosphereDimming = std::clamp(eclipseShadow + fading, 0.f, 1.f);
     }
     else if (cameraIsInFadingRegion) {
         // Fade with regards to altitude
@@ -563,8 +564,7 @@ void RenderableAtmosphere::setDimmingCoefficient(const glm::dmat4& modelTransfor
     }
     else {
         // Camera is below fading region - atmosphere dims objects completely
-        atmosphereDimming = 0.0f;
-
+        atmosphereDimming = 0.f;
     }
     // Calculate dimming coefficient for stars, labels etc that are dimmed in the
     // atmosphere

From 5d1882e398b3b57364900f947a98ec83a324613c Mon Sep 17 00:00:00 2001
From: Ylva Selling <ylva.selling@gmail.com>
Date: Wed, 14 Jun 2023 10:29:26 -0400
Subject: [PATCH 016/701] Update gui hash

---
 data/assets/util/webgui.asset | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/data/assets/util/webgui.asset b/data/assets/util/webgui.asset
index a72878a3db..2f6431c17f 100644
--- a/data/assets/util/webgui.asset
+++ b/data/assets/util/webgui.asset
@@ -4,7 +4,7 @@ local guiCustomization = asset.require("customization/gui")
 
 
 -- Select which commit hashes to use for the frontend and backend
-local frontendHash = "c6b16ef4ffdda6b20298d16a204c8977ad56ef09"
+local frontendHash = "3f93d653ee4783b22a38a6c771e599cbd95326c5"
 
 local frontend = asset.syncedResource({
   Identifier = "WebGuiFrontend",

From 641c747f94867aa41d24e577caf92a364856c4ca Mon Sep 17 00:00:00 2001
From: Ylva Selling <ylva.selling@gmail.com>
Date: Wed, 14 Jun 2023 10:52:33 -0400
Subject: [PATCH 017/701] Rename the property in the video player to reload
 instead of reset, and add some more explanation

---
 modules/video/include/videoplayer.h     |  4 ++--
 modules/video/src/videoplayer.cpp       | 19 ++++++++++---------
 modules/video/src/videotileprovider.cpp |  2 +-
 3 files changed, 13 insertions(+), 12 deletions(-)

diff --git a/modules/video/include/videoplayer.h b/modules/video/include/videoplayer.h
index a4ad4dfe39..7a10a667ad 100644
--- a/modules/video/include/videoplayer.h
+++ b/modules/video/include/videoplayer.h
@@ -67,7 +67,7 @@ public:
     const std::unique_ptr<ghoul::opengl::Texture>& frameTexture() const;
     bool isInitialized() const;
 
-    void reset();
+    void reload();
     void destroy();
     void update();
 
@@ -123,7 +123,7 @@ private:
     properties::TriggerProperty _play;
     properties::TriggerProperty _pause;
     properties::TriggerProperty _goToStart;
-    properties::TriggerProperty _reset;
+    properties::TriggerProperty _reload;
     properties::BoolProperty _playAudio;
     properties::BoolProperty _loopVideo;
 
diff --git a/modules/video/src/videoplayer.cpp b/modules/video/src/videoplayer.cpp
index e4b85762cb..35a80dfb94 100644
--- a/modules/video/src/videoplayer.cpp
+++ b/modules/video/src/videoplayer.cpp
@@ -60,13 +60,14 @@ namespace {
     constexpr openspace::properties::Property::PropertyInfo GoToStartInfo = {
         "GoToStart",
         "Go To Start",
-        "Go to start in video"
+        "Sets the time to the beginning of the video and pauses it."
     };
 
-    constexpr openspace::properties::Property::PropertyInfo ResetInfo = {
-        "Reset",
-        "Reset",
-        "Reset video"
+    constexpr openspace::properties::Property::PropertyInfo ReloadInfo = {
+        "Reload",
+        "Reload",
+        "Reloads the video and creates a new texture. This might be useful in case there "
+        "was an error loading the video."
     };
 
     constexpr openspace::properties::Property::PropertyInfo AudioInfo = {
@@ -249,7 +250,7 @@ VideoPlayer::VideoPlayer(const ghoul::Dictionary& dictionary)
     , _play(PlayInfo)
     , _pause(PauseInfo)
     , _goToStart(GoToStartInfo)
-    , _reset(ResetInfo)
+    , _reload(ReloadInfo)
     , _playAudio(AudioInfo, false)
     , _loopVideo(LoopVideoInfo, true)
 {
@@ -260,8 +261,8 @@ VideoPlayer::VideoPlayer(const ghoul::Dictionary& dictionary)
     _videoFile = p.video;
     _loopVideo = p.loopVideo.value_or(_loopVideo);
 
-    _reset.onChange([this]() { reset(); });
-    addProperty(_reset);
+    _reload.onChange([this]() { reload(); });
+    addProperty(_reload);
 
     if (p.playbackMode.has_value()) {
         switch (*p.playbackMode) {
@@ -781,7 +782,7 @@ const std::unique_ptr<ghoul::opengl::Texture>& VideoPlayer::frameTexture() const
     return _frameTexture;
 }
 
-void VideoPlayer::reset() {
+void VideoPlayer::reload() {
     if (_videoFile.empty()) {
         return;
     }
diff --git a/modules/video/src/videotileprovider.cpp b/modules/video/src/videotileprovider.cpp
index 5d4b03ee04..8446be051a 100644
--- a/modules/video/src/videotileprovider.cpp
+++ b/modules/video/src/videotileprovider.cpp
@@ -106,7 +106,7 @@ void VideoTileProvider::update() {
 }
 
 void VideoTileProvider::reset() {
-    _videoPlayer.reset();
+    _videoPlayer.reload();
 }
 
 ChunkTile VideoTileProvider::chunkTile(TileIndex tileIndex, int parents, int maxParents) {

From d1094c211e7544f1236b323c0a06ccdb68da83d1 Mon Sep 17 00:00:00 2001
From: Ylva Selling <ylva.selling@gmail.com>
Date: Wed, 14 Jun 2023 11:17:31 -0400
Subject: [PATCH 018/701] Change video example video to compressed science on a
 sphere video

---
 data/assets/examples/video/examplevideo.mp4 | Bin 4218 -> 287618 bytes
 1 file changed, 0 insertions(+), 0 deletions(-)

diff --git a/data/assets/examples/video/examplevideo.mp4 b/data/assets/examples/video/examplevideo.mp4
index 3f5d7225acc37c9e22692bed50e858e3aaea5928..ed70354cbee9ed6189459bacd83c90121ffd3ee4 100644
GIT binary patch
literal 287618
zcmX_mV_+pswC#zlNhX}wwr$(yiEZ1qJ+VD8Cbn&JV)Ny@_r3R{tJmIpZB<qO=<Wgl
z00gGa9`+Vab~XS2DB!>Q_r+xBYRqV3&%y`*0H94Bfj|JbJe!S)q4PJV782s?t8zp1
zwCiY9;!i5g3c)Jz<&`@V8w&v~fw7$<kbv<UIx;hGauNU;*w_t?7`_b>bl(JeSp`vX
zS{4F9HQ{fj3DEf4AZ%yvVGT5OCSYP<V5VhaU}E}Knmaq&bJ5egxw+A~T9^RstPO4H
z>>SPL|I0#W?rdZI&9Sq0wy?8x;vz6MG%_^iWh8I}n({Iem;jBe?ToE>8Mzp^7zhk)
z4Xr(#fV>Ru%v=oajEu|#Hb7o;pgVz+i_te?C$M+&_;&ps^&L%k8R;0loxTSG8w+=!
ziT-~P8NWUB9Sv>GfV_-s1jgo$b~c9k->!@V&W=E9YYV4u#Np0iV(k14j2&!v8NN#}
zH1V{v1@ba6(l9a-m>N1c>)Sh7S=j%__}>5y_WE|FrcOX-URovsXLHAI4<}w`CIV|a
zJ1ax;Z%P0EDOm}etSyYci}`;F1_E2h|4CwOVPok0Um+H@&Ok?N!*9~J-pJa;(a=NR
z*v`h@(D_?7{+=UeM?(wS?-1WaN5lU(rjCX-!0&_vM*8+1-`K*0m+2cDni$&u*M^b4
zk%ghte@QGHf&bH(8_>ec+}Y^cW@ity)i<-V|F-_G(*E1k3h412o0o}|;r~K?8w=ZS
zk-*6qXbUuUapq-V_^(Vy!~f>g5$I(8?e1u-|Nq<l&+cf<YwT!BU}N+>vH!L8E%35_
zuLgm`f6eeR(6N0(`~L#}&)v|SmyPpV;p7ao=Vc+Vu>W4A?;Y{Ih~Kdc9lkfff6EE*
z2LL3rf#Jab;;#p(jm7Q5c%{?<0AQ8aS^xmx?OGu+70;?;vGNkD^LYSeAOL^}`6R#7
zpluBsp(3N(<54DRld0qpnd^np)Xrn2dnyg}sC&?ayW~j#AjeCdm@sOHiq8B6RfZ&W
zFa<er?nd=PLkTF;FoV(85!EFfGcS%yT~Sj-3$Hyb$MFr+ULWyY))HS*u-U4M^2mv+
ziWS=J=Q~4R4drE@Q)eR`P+!CRXrGXj^T-BTny@(B7Vx^@*OkxgJEYKj9~P!^2uhT~
ze6INcMA12=>7AKuYjjHy*i4vq*Ux*W@^(srY!`RI5A2xzi<h#BRB<t-DfnwZ@T_c+
z%|E5?hVH)AOF1nI1M$asbp8N!ZMd63H|5qN*3>!rkHB9mB8><8UZE^&VP}MqCcIID
zbJ7%<Q%<EAsOn-|5f4Z{;|b$F+tbw2$b8PsMB;*Fpsai$lP#8`sE67)WuwT#A5a#I
zd*mGue{w>HNhOd!4!}p>SXjE6s1RAPV)PM7|6oG~keZnmuidzX<BM^R1tN9@?qh|S
z?zCnM_M!)k7t$cg<u>0j{(?2kGo*Owne(^(J=-ZCJtiUv!?kqQ&kkERzRP5@?rOM}
z9=?7+XnOy97kqHAH{2(OA)+S##Uyx+)z7k_eO#I@%7vjb&>a6tlgcGa1lSf{oXA-Z
zIX>DAmwrJdA^F1?XO*b&b=7F6x2#HZZoPW=@4&<ji&hHVQcgPjoy60ZgA(K=^!u&r
zv$l5bKC2N)%=a#mNqqv58TY{|W%0r|N}u%jioK}_LL{eky5nAJh0k3J698A`5QbIQ
zO~RLS11{3ZZZ9QV_t^#W3_{P}MNGhOU(eHcS=OD~@F#JiMROkXJ-?_yG<e00sll5i
zAt{7{aK^app4ds#(z~dv!amyeGB|ZzZltdGMzt4vU_Etk_%?l_78>gmT+4nGMF<-O
zcW<=d8T!U1X~o39=U1&yzH~>JvQ^Xy21)Pug9~CmASdg!P|hoUy2}7Y_AFifkM3_c
z<w_b@Xw`sac;%nEK&^k=%#F}#zuC5B@BG@biMy>*$m$};)3l_7E?5jzz<^6&`b?#&
zYNtEJW%hPuj&s^qu%oPb_s32+XLy2Gozq2OA4LS#wR)lXdtT+q+PdTp_RpHPn@X2@
zeiNgZVufs~Jx)=AgFJ@KSZRDVh+5&2XeoDJi6$Dj5K1Mc23o{mc3%bRY+VOvO|`<)
z6V!kGV2$rLNYblPTD?+=*(Ipa$F#Ub3|aquffjXmi<zt&97jVn^V8?}*PV#G<;;;3
z6p9_+6g>$ZGW2-7vK`v<tlL_M;Bcz=uoT!3W^&z#Ot`@RxB_SOWfTFxK4VdR#aH31
z*!7Ol%KugW1IhL<Dy0ww4e(b@8>u>rJjru)Z%xnJBa5Io#WA=QAP<$T))Uc_E9?ag
ztCy6+1{dD}cbAU7T%6ZrYr9%`m1lvw6?Ch$tg)s`*R?>Kl2Smg?65-*d`^98S=qF$
zSsgCj02$No8TC-2YvK;d^tA_D7KpmNv2yHUo@c7<d?MTy=10j=lsI;v@cIDo->`RE
zty8~Ascequ+KZ0VRhy87DdeXR9xoR9+YYeJf7x-VvHe^J)8yQ_bg(Zm0vZ8=T0C0Y
z0^-?MQc;5$W6g|Sm!7mgQouU~*v_3;BScFa--S7-gOiL__VAePqpidz|12?okPdNm
z$4#CY@06_%Kb!7**2^p_gXwEC8J!_C_P$uv_6Yj_ZHsWayYTJap}bjOeC4kmLlOJp
zcUY^U`pt3T<3He?RH(O-Uk^%i;}>mdVjXSGizJxSMb%Q&E)$M@L7;CU4aQY~j5KQ2
zl5p?RODwe=r6`1V#qJscOk`1qGYk9e7;M`G*BO~@?oxSvqjT%-V=XJh0dtN($ZjT3
z3&yV9p_~L!WCf)$wx`NSpiH=(rEwpe8pt&vLibY?7j>Z7Pc!kBP_@fiEO>fr2HX+V
z(%Dv(01%~49VY5b)Vt@6bs@P7`YZkLf<Y6JK^x6c)R8yXhm7iX%N<MpU0Ll=F{O(I
zIs`oc0|Q-Nn5#HRfRLgFzJS0aRsFhJVmWYi1SoOK(=8mwTe#+u@~~9Ij^$JwL*oE7
za?qfEKO{Ak%Z$!}C#^x~G+s>$tV?$G%G7<b$EZT9KyDI7R{d8Y>ujbWU}sr8R!UVR
zj;L^~Y7^MH)EKb&Wvyp#9#v)P@<<K~ag6*Mp|4ySR*OY{E0Wnyt-?rgNzC-Q(CXoS
zcj}S$iqB_1yU(x~MJlvqdzC4nvz=?#v2*H90H`ze_nq}I#|{sChdJq=JH?N5Q{KID
z>S*EZ{9HrxtKV+FAN3)P!K|4HMsx?xCyM;WtxUy7Xigq*p*U6bVj^`azm$AHg_rzZ
zCrNY&9V<bxylu}Kr#i!N;q0ZZ*5@8Tq4#D>X|~iC;KYBCHbQVP#oau8ZjJh|Jh~p^
zHa!0xD-w8f@fZfpYJFRfLYEjXW^}K0+^9v)4Y!G|7<jH76BsOJ2~QpLR(RNto<8Ne
zQe}b|$+kT>cH~(drk!kKN7&s}A)V=#xs#^tkjN|56^x$o%#Rc6co1%0(-9@Ak2-7S
zq^nOXp$@)Qm8D<A=_G9SOVC_$5swMiIB`Cl5cVF2d#5K;p?~anNll}rjv_vANiw`c
z`U7n=)!1-%L=qj4rZ;I;p%6=##abz6RZjQm;R@xQ#ne;-AuY0fH2rA2Yff;+fm{^Q
zy4sroWguecfskkBBJs)&iO!0>Rt~4V3l4KFtI~@_6uC4W^eSEFUp@%7fpNN10hvHQ
zRXyS!cONu!2zJGzA&DjC|5D0ftHfr&g!&5FPY6Gb837jX3GpPH-PJ7BiGUPLr}0Tm
z56Z<pToUEKxq!axelu$F$f3Y;_rr1_mY)kRi<^@ny%0kPtl`27x&t{$6C<`Fl&30^
zcSlzK@RK8eKF$?Nl2K(*unma^(C;n!k$?|8Iw_zt-1fQ>hVFk@LV;&Vny_iK?&t;h
zSH4o(s>dS2(o6)ieAsL8A0ekuYH6IqVvzfuaU}-RK0C&Ni(j-kUkVZ(>mvFMD0Ubi
zbreqgE>KT;y6XZjIbYBAi2Dgwz$SR(InP#DQ?;y<x~a=b6ezm$_xjiu(h<y0EZrG&
z3FXAa)2J=Ni~DFF%51E_73VX)x5vG{xI~TDU>!d(IyE2y;`(>v8t4<l1KZd~MPRQJ
z$t;(zvE{PgA1a1YYz7cP!dS}IMo(QuX5&WJ>)f-GkOv~Ey8$<N{2QI7vIbpYZZXk-
z6h3o=4u`j<dN<O)64`Om4H~G4oC2d-Y#}o%Ra9<T8A%n+Y#KD%O<?i)ucp8X_(moX
z)!n?b!qREJh25&sdwTCFaa<+U?4Bwl6t3=14szaWlK8VC&~%bGXT2O`H(LLH$lP!7
z{lq65-oG_W5e>MN@B7NUKAbXRaUq|iYY8rZ?SY`_^9o<%-6qb3Clh-v6Z8jiU#U>G
zzUM`F-ZR6Wb^v^Dh*I_F$wXAoKJkW6k>lB`O<7^9?1Fs4;_|EPU<EU=)}fhSXjfIp
zt;hN-*i^Oq^DSpSuw$jdNh*y6g<1Al6lm{TN|5O(p|0&3!oj~ZQIi*|SH->1<%DJ_
z(m~ayDK^(5GkS4h7PSP@2u~Vv-uF@<fxGZ@Di~%vW&n_{Ko9ZMBgQ|>P;5f45wBYk
zs|{$EjFN3GKA0`Du2RjT?@h{!g1Pg7j%P4%R2(Z0*QLl3Z6-2_@as~976D?_>>ayF
za&#s?rP0jcyt++UxU|_;vG|CrR`WceysckRohEQ;l0PMdOXlaiIX1pFK2llr60zq7
zGu0|4#oo$)fa~K=WYDSLX}CTxwIsSr+PzD+GRyBBgO9*W51X0g-*84GJ;0LEM7yRM
zX98(33x^I4cP1`8g*50eE*J{@zZ{j=gtsd3O+SCHKtF>uMynZhVuwE&@?NvBjV&S=
zKZr288^77>infI?4r1z<qY&V3a)^c<N8ge#Se@%9+Q|R?=iYQ@%Iq(^^C4u!N_gcH
zEy61`9<W~`V3eCbd+@bs4}79OYoecV$PHrPlBgEqr7{=DrRz0mQ_zWp@n5>syv_ON
z+NegxeBsr`h$!<3U?3ZU-}ctt6>c9AvI|1UR=j6$4{v!I30-NBde1~rGHPo0yL`)g
zwYIzwm|Y}@8_iDlsR24mrGQV=vEb*Y{%aj9mrOD^g<C#$N>N_GG@?_{*C$kIW6V;F
zcNeSH2n2+y;a>;DmDl*_SHt?JtFebpaVv+-ji|USR_0tdJYL-z!C`}EU45vWkN;7C
zpl>8;*>zb88u|Fe?1onnK@L%d=1xP8sf0K#Ot=p{TSBxg%C69BNd>MfXuK{Gvc6+{
zLd&ayJ|}!8zx_+)KX;P*&BQzWkzcP{hR<cCxm3Wb-u_2WcV|Va;7l%X9G{0))T%D^
zZqKIMxgX#(dX6vesA>K!Ry~$L;zIwS5LPn*MuZs2JYW@`70jY-=oOc{v34}GXtFO6
zEBjpk!vi+)q<J?o(V9P$x&>U_aCj@)8ph3h&eg}$7g#$c{P7BYcw0oszb34a@|y7;
zt_NvjJK8NIs>sC)aX)o~m^^bq1dL>6*pnW??58G}NGwOeFXZsuR=SN-Hpdb0^VT|H
zQ(0c4mO2i0o{OCTtQr_BG4aFzcdxu(x@3oM=2W<=vb-V;2C>Y1+U<BX^zGJ6Pzs)I
z!xzMMh)Ny5tqtr<<fKd4$KMQ<R+vGJ+%?A9MvY`8P~$?B4wmB+8VG8XxhI=@k-ZS#
zm21zN26qXO$W+%ZR*=W^y(MeQW5PRf6uqpLkzfeHOYwm7_0_dR2NBfLkOW)|HZp8v
zf)pEBxn1M~C5J_<7|j1hoY{g=2}LBR^B0jLOK9>eyOir>?sXDim($de+lF5m=qkMR
zdrr|WYu2AS(ll^oWu>?;OgC#OGm?%%G@Ve?8NCro5yW8QrX{Z8-fo0yCioZls<P*_
zk<B=vco12Of4}7=abL$f9F9i+*ux$hS4#P+w^x>S*RKPydpW4mOou=aHJ@h%PODiL
zTr%G*QsCjVcRTFN;J##4?>&!3Yb)hkL9H{O@qqrOUF30WO}o1?z~4hLu8I7;<a2HO
zCTSk*0C_e;v|E}W(>mS_`jAhVTj?QNj2ryR42{J@pZJ^$s2_HyEHrp`%*V6)Np%Aj
z3R12Jj8g6JcR`y!h}EJa0l9mV3i``f*5l`vy6k-x`OX|-LtW2lMLAd_H2`WbQ=o6@
zH<bT2jDG7c8YXroj7$GgXt=p@@2unKr%0Ls6(IAMuBXB^WeMN6f|FNGXhV&fCJz2I
zqGc#b4)=;#IkALk9DYf=^z!rK768BkyUE%;ZY<Z#Ko0Bb4+b!WZh~ukW%9tBh#a=a
za0PGCN|!qOrt|3kD@-op0s%*fd~6~8d-t9_Zz~}FlcZQ*nV~OmQb_uia36(DaHND5
z!BzG34Vsir28YstExjF8xG*O8O6JOoBqu0MO>9=0oY>6V{*=Ip(l)Xo`QPWj(d?54
zzIfwGE2q!YUJ3<O<3E#74YTjp`Kf$4HbIeD>x(#%5z}CzKpFQDvabP0Q?eC+1^^Hp
z_-0Mx4*Tu~gL)y^Q<+GJ7jMDo$cCiDRA^ubjIi&f#C(+uIo#mmW-Enyvs2itY@}t_
zE-PqztMVs;(Dv;sJw|ryEp}rYLTH(5)2V*!vHhh+z%);E4(QQyYs9`4gBjg;4adng
zj?HRA)BSUFwuw&lcVhRr!X$Szp2vi3-5)`)p+#P6H@-!{n5HtyyN+P;*WUmeI(f<;
zf3<oc$Wj{c7k#(MD!OKHJPSTd|0VzgkQ3NA(!iE>893?fi<*fZqDVnW?bbb1pOgAq
z<7j#Tre|DYbjgtM20>$s<fa$Tb=U#eW&{p%Do?l1Uq3K^>JvYX(TTS=)|$qm&U9HD
zs1T|B$_rtOS!uHC%SV{`GIBKTE&1|sM-ocoVZC;CsIyM~t;nhfUbGl`din-$(4>mg
z3gv1A?T*{9^_>2*r<RjopacSi>*p}xiU~jOzEA2jai!QH83h1PsZXCm46l1f%J}Gf
z7_K}btAMN)Bui|PePI=dWy)MDPg^(jyEx2NzZoLH%L<8o?_bA~gu21LDAM0XX@>*c
zTB;}=c5M|K(u7j~bF}_r=S7lHIB!|)^*zC^IXZYa6dL+FCAht$Hk;e9L9H4-?ah!w
zVk0_KrS_=-FHtoJg6@Lf{m~!)yiM<#o|f@{h-mMTDOOZg|EO8BTx#ToU{2pZh-&Kr
zAbzmn{SuE>W}GJ$7nU)*lR@WZ_KGnTs9<0f&p$;1wZ?I}*-ylT`BI*WEV^ufmcDA)
zeNDnQKbKI3lT_m$AWoY0d}aorH4c+kd_wD?uCB+vOQlIwwWs%ajm^Q{W?{GO(naXH
zMZYW0!TCo|?y2x6D&r13#MUp$S0&QtpUueuOSE2??28OCEBwDvJ{4Gx3Es0l;e=M!
z2$v(tO7=&$(O0pp)N=`j5)%~#0svTcA()|^h}M!CJ&(w$XlfAOxR6h6DCSk&Fe36^
zoS6N20V`1Bs_7Gr#<vnzG!d(3S9WBSS^=~8s4E52i4O^uF6JyWHFMGx;q<9R@6$`x
z5@(HB{ui9oX~?jhUaown1J7S^2I4|Bf(RO7q|L%6#IGz3kXffd+a_;zWKq%>%XN=p
z?|miwNarC$6i$A*jV8KSh2)L-Wap4eSQt4ES?B30u0K9I*d(guM4EQNC40nzyNH_J
zB%{tg@h=*ilU#1L<nw6?-mA;@u215>=BVZ|zktzkI!0od@zSZ{n+jzMw!NTBcNR>=
zrXvNVYEmpp?Io5yIr7S)G)$H>*ZV{#scgKa26yr4OzW&+upt{vM~$2K%lFLz+W@DK
zW;*;hNn;(Tq{8l10j^Iy88QCZ+nA&^&^6f4K}<-{S^#T}o=n=~2>^Wjb$d1C`N!hN
z8n>z{XNGDPMQgtXZFog>k{&~I1Euy`CU{S|g0t^mm#LFN)ZEj)#A<VuNL1994bGRl
z$O3^wcxFdBmy~@hs>JI7Q|Codk{h?{5RVe;m%}>?qyYL!!8~fIS1*&Cwe2mS+DvWV
zc}rn~)AXfDYYIDBhd2~#S;k!}-8%5@?FY30haRZwoKVhBKcofcC=CIBg+xJmeRAI*
z<?hVoxtVhEJR!6386X96*ZaKZYdbEK7t!P6rj$4dM?fbr4N6ZF1Z%q~i+Y}SfXh^~
zenM{3#(c-T{o-rw*B(E+Cv6CPS@=s`DE#rE0#QhYw!zb2JF(6<KjWC7Jvs%!@Zg7h
z#r&|>h33rVD|_r8<)l0e#vS6wrOMpg2d54pg1N^8?-NS;4(dNN74fViJ(Eaghh4&Y
zZMFVEA#m-ly7Irr@Mryc(1|JYV^5v?b^!n|&@jo*PchU9C4K3&Q*#7i8_;~KppS{E
zl}=%w53ZHHY22Ty1|xJ9M>ktXTP-)CMwOYlYNs#;p9N_FFUa*#b{9Asm_l(^$+)94
zhmUsT8HJVdg#LT^ja$8pOxv(M1T;sb7jQ3&qa|-uZ2Z5k92N$5!DJxUe`CFPt3);C
zzqY`Gu@F@6fH_)~sS5dz!CwlRvBdz)8#e-tuJDOo)V!nwG|F;N9hgHDaojYk1)PiX
zjHW#-7aH0}7I0yCNq^BlvCok4V!og7-5<}phVfbPLDXY!v_u2ez42t_FBWp+=<$$l
z!}oT&=$8YGMpVG7NIELUxyD1EYMn?rpM$r~Sgk;8$1V}6VJLee800|7JZ|h+)IsaR
z#E&||(fiF__Y+%%o-ZPNExs(LL+I-(iQt)@B4(gVL=gYA23nSCChg%Ofr3ps@&wQ#
z18}A{l7wQT>Z$ON@d+m8SKPW9hFSX?sTQ8vOv`j>vMGyG-4%BCv{3p>3$P)_#j^MP
za!h3j8!ZaqCWJPF#Z9F)ULOp7_b+P@E2YpdE=FE|$Seiv+DQV}DB;p^rAG4WV+AE=
zkeh!PZqw{N#=+_x3=-NCxm3bZ2pWPWdMrz6aS|sLH7{s%hgD@p;B=E=Z;665lh<;#
zDo;|Fx$Tf|*4I0Q^V5iHJ6)`wdE?-xH8=EzXgWvxfZa}`)|k+4W+q1q_R2A6d8jNp
zHV$*Y6`adW#V<Khw8WlWC5g*!i@(XEk0aSFp<G;pZE<TZP<K*Eu_CVvV#SCrDbcq<
z8|Yq!;uSGpepuT%JWJvKz|PNznQvhj?}3h<Wlz5c04N-pHB^Uckei#Zf=`vQdr0}X
zuw50w@SE7WRH0G8j7N!an2K42!g;sP<3{y{=@6(Z=O-p@MA5E&U0Dfa=V3(zN;w)Z
z68NhKhB%<-iOTzOb^ihi{=}UB<7-;+UXI&rnmlcVaUSqPku7NK0V`60LCgSzxlVs{
zt??Qc9ke;bKYLrUXX%>oj=H$=&wD4*2Z$ImB>o9!4jh-b6!ZO&Hj$%_dHh-}xK_=I
zki$NGWV?Z4X2W78QyOjWgX;i3;WMxX4XcdTn-nC3waY0gO^BoS;+fE9%x*T1AYA}v
zHoHRX0!-sPjbii%AaOW{jSup_x0B%`7%@6g7j0iEq7C{5Ac?-rIU^P}i=-n562Ug^
z9g)|KW?;2}BF^6!b0f870CA{|4E3!bYK@K6a$H985{7P{k*N%K<(WBP<^t1{U;^g>
zPB$A`*s=HjD#c=P$`tR!=^R)Fu&q(D*`gaX2wCTK8c|FI>rx<8`<w>EznmkzgKj-E
zB*IK!C6mqSShwF_;)rf8pd()2NNE!-f(yv*TlC))JNqbqMw{Y1hL{el&?p$)z4Ldk
zh+5D8(|8Z)n{qWY9<WL<Z!r=4tl)gpydAc-V?=I4Z=B48m*Br)Fgf}a02O-`FfufS
zh>eOmioGwpK~+ULDc~l$QC)c!*9!ok7(ev?PO|k4u(-^GQ*A%OcA`llkIM1-gvo>w
zzsI^RUrDpOjkFjzfX(1=FOG!i`%w-I@(s4CxCnQ_8G!V<+ZLy*b(d|VLK|cC59ODR
z@8czw$7}#y0;Sw8gK^bG&eiRiLIjQB`Q17)_mu5!uRdsgf+aQx!K&@~i>HB*e!IFl
z$yfUDTJ6=;EZ&a!lS1)5=B@q56D>lT@Md^;01sKEvC&s|Xt9aS`@;a#9{!t)b%89A
zS%x2Dgvm~*a~K{<*VC>#`TO)`?n0}H5P#unc5^(4Wj9`S528AsnwGe)#0tLc;ZvaR
z+t-M+d~Rj5oDPiZm=VOu$$h-^(B#V-r@`FY3uFa7$ggbH1#?=ZjQiycVq#S?Tn?}U
zhF8_u>wLF;sSz+l<!F{;ab|HRc;)<RzbO7-w$Sj-@Sg;K5M-`PllqY#>@*^<<1uif
zW7+>O>EUSDvEKYjFe8U<@~yp@;imLX`{YLUP=_Q2ZUBs>GI!YR=(y8@l$WvG!QFx6
zYLkA)=7t_<{s7cVbQv;>LC{TDFW^y#XMa~kNZ<1NfpBFGVnOjPT>8*8&UO00BzXXt
z(DRkECWcw0ob!Bi+eEtxn4a9-wc__T96|+~?8_Qr{Q<6n+%jvqr3jX&7t6ekdq1R&
zM(z|li_&I=rPzT8ZB<-0h`Hw)@aJN9LC-gu?l{6i<#G%b=~gIPdTQvK_{C+~1%T#Q
z*W|2SkA*SGlMi9UJ$Za4Pv!oGL0ya!o5c%03b=)ZLQp2&b3h)S<&09~9Y?_%wJLbW
zu8Je+(3R`4z}b=7;Eg5=1d}2FfaJbXdVVYsTv?r1E2p0&R~FPhSul8s8*8v%oV!_9
zY9kw_!0}Q+{sPXn{Q*ycSG%LwU3<3;yQ^cmH^|+7zAaLB3Fg5m<vrn!FGmEsQ$hM;
zj#OCXm>%|T{>=4{NL61$K55#e0bhbPE$}xsK+K0QCi0)Ro<tf%jL_u(*ex9y1*Dy-
zEkEGlY&Y`KodbVT!;pNlmr7MHhyuyVADS$4Ov)s#7p11rSCNPF@X7cqeItM+ifAsw
z9~7(j(Y4BaqnW^5FBl}Gq_{+)9Oa`ZbKSTrp6C+3<(3|&A@WE(+CIq+a4vc&`2@c8
z8y|XRffaVm%)nRrzb#&Q71!gQ+FyY?xL{6(8$9L=eWXsa>RaCIvdDfzjyM)BzXgi_
zxcdl@XW!Er#LGtUddx$j4_&f=y}%7IDJdoO&)+(MR->jAElxoSVRTG|bD(ZMB+PMm
z9$nB?z#)ICvSDd#w=I&@(dklJHHFbK&;6OH<OsSm*Nm-9Y`y1mnFCb-ozg~NRKTib
zY6snp^&SWHqaQ0B*kMs$L_E{V_Xi=7ga?78{Fkf=X5zzNqTE8fG(7wjU&dO$e$Z<+
z(FbPyQMB}0x~fL(HY2wgwn{c~CHqBCSYz}2sUUozH4!h8G&r3OW!^}}44slYV>OhO
zxR+-t@^41T#p_D?Xb{J}=)Lyym)VT=4PLB4nJ~eaVOg^wB%_`Un1lzpS1P(%KvG^D
z7Xb_Xp26Cx)VnE9Lon>LlGDlfoL$B71fdMLSIQ}$ku=qZobV573${>-6Vo=lw44d=
zp|HH5;uyqh^T6Rdk|TDvJ2COM_PM0lbU$Vd;E8im84b8LjN7s>s@D9EV~2w-W+!H$
zZYl%TPRWlAOtYabZa<nR-B;$t#r#y+L$J;f0ARZiD?;w_=k#Y5*a!HV$>!dGH+uYe
zx1Kw_61+Dj_+jR`y!yfJyV*EDq6S?-CVN!5BCN3=&cr7Y#UGt=hCbg~<Mm>0YZ;CE
z9aF+><(1D@EGvvNhRZ4Hx?}{=luW2J9?D5|0E{H@`|rY33^Ibft)auR8U;5n<;d(Z
z+<}1gP#hgJ4iG9&-oiWl!tx{mM&{U+)JKoQ)}OAk0RUHMv`D_DV#K&rk^9op%~u?z
z(*1x7E?1mxa1>tFU?OGY<=xDW;n@g6n1n;Kb6`A=3$yiPviY%w$y26oiYP?RooW?J
z_BwZqBhIyqvT+xI$FXSludfAu%;w*ca?Exbe~(Qc$bUA#HQjK#8tsHeH2MFaplWSg
z<M++^Ez*#c$K15dR)ex^em)@!8-pqT?vS!g7<UgkRgdygyQ*b4+va6zH=^AM83!3n
ze|rONo@2F9ddSHEvMf5ILLY*u<gLd%SfI225e=(TBbBT}HO;Ha#KKG^8MZw|iGm51
zG8D8L=G`5XyA>LOJ0xe979;ygJ=?|!Pfp$p)4FuH`O?Jy4;<04h{Bmeug2;H0A-_a
zZxA8019oMn`E<|m@iE1wEh?o?B6{%~r*i!&+)CCq+=g!mK5ZZXGS4ie-VzIbZ@5Q;
z5QeN;^2R*9RAbFv21Vd^d3ctat4=oE%K@jDKI<Lb%)1>)ND#5$TAn9@{=q!lV}-O<
zq{cKYN5GRw#+u;WEhu*;gSC53NB<lYm!Cqpqy7qIJ`fXt+UMZ2;X9%eM}G)HkbfZp
zIfELj@h@)@LADl2&vl~YxIbeSY_oD=Zd2;BEIhM(21^?ck^FV@awGgstSYOB-xCuT
z_b$X0np<WJO8(E(Qm={(XOa*{KvyloUoZ{U?ZdcETDmy>pC9|jfTDXAm9bd|Nq8xS
z2fUl&mh<V<&L!<YsH>(u5cf}9wAMa2ApsG}8&<J@MY{4pRU8e=Ln3P|)UF_Bw!;Lr
zvROgI2BgNqa&z#nXcu0a79LDB<d|x%97iP~`x_=xpv<clu1w_iR>q@c(#RTDIQn2V
zc<!_0#XxUNASFRCh1%CU;-8)FXWC#0@*Ud@5o#aJhi44<J6@+PhFR#oz!@wAxt&J~
zH79Ku{KtH5p5u7-kU5m%HtBWiQ^|4Twi-CR*R^XDHt5H3SjZ2Fj(LHrsM#Bm0EMu^
zxe-ay_kxUbB;X0z-Il)%tcg9I(IliIY_jk^R;g8vlmJ+d1Zdcgwee>kD2O0lUVhRy
zY4aa;ACXmAekF7Lsb+BHJAc>%qq((wh2)(WS@dSB3o(re!*OCe1nnPXqOWH~?s*GA
zotgJ=DLQv(r%TNFay-?Ub?3o&YZR`9W^1OJH1e&>wooAOCWrOxmCS_?FJsI?50ub_
z&+bT6YlC#l=)vbEuUj(@Z4J*bl&XHOTyAG_*$&Q(@b_gm_ya->??R&j62%0~I)yrj
z+gXNdo!)(XqTrF0qAMrG*+hZV4wRMU4AY}D@MR74G{Wd42cm|WT`Y-0Y0}By(2cEm
zp3ygA`@+=RuMVT!SHr6If~b*?^aNvKuY5>dSR>1Iv(gF-5HKG-cZmZX4hefHm~<v)
zkd5l)8q@K>KhAH71d51Mc450wmoVIFf2pc?W9({Z1HxEDDwA)Ux495LeAjX<%h=JB
z|3ajZ5wASdJWF=R7(kL1c?jF$d3OTs4&&5l;!ZRplHB*-HP(;2i`3m(0uPRggx)@2
zT+}%W9vjC0unbm002MG%F5+d<tTot<N@^i2N^8($MzKr--N_(>Uf|IU4X)CB*c?$g
zV5O0b^Pa3Qo(xi#QgVMO#zt(hA3e)8h&?%(uZ!pY-P#pUO>>sFEZsht{HT{ZrEp=L
z!07oHH~cHWt)CrA=ejw+)@TGonFsZxG%IE=I>8zMf$zq?ulOZ9-Ujj~9~RX~^jU-g
z)h5UnT#CFOhaTZGBc^<wVc1@1Upnrg+zRw^A@1u*x&kKXtF%YMge7zgVyX@4XJb>a
z28V5G2Vd%j*{=IB6}tQlo&L3{^R`&~xkA)SP!gKdO7rIqr9Bx)4r$;bOt8Z*#i|?X
z0&r*iJ2x*WBb)sM`8#>SB&+2|ohk>6HjmcVJ?$RO%%WgOrlgfD5XC&(W>&Av(zuj_
zhbk#Hfh56ciX&wLR13yyWqbcMiqqn^V#Gb%%>7oH@->mm<b&p&EW@kF=&7LbpBLNx
z(hB56JdZY}hnr-?f3x_R(i4TcjkD`K-X`*{O))u&YR<Xd8WU-`V?=U{kPF5W-GNNr
zg+}@EQ8AZ$Y}4Jdj{iE?yB#mfG0Lw2xDa>_c3`FQAD7e7UOZ(SwuboT$ThQY^3Iyc
zJF|=deyup-xd=fiOK>S10msTRxF%W-Tz$1rsY0FqDk?1u;z;hAVM0gG=8je8VASZF
z8-_|^jF%ga^OpIXVtybG^WyJ-chd7LKB#oExR^!j*t^m$n!cH-VI`JD+P3o+_HwWn
z`Xy~{|3bv=MRmxtTh@$7fs0JMj=a4|(OYZIBe+tufWAg9R~2+s|NB#1QV~ac_=K$3
z`|igSRQR#zSy#i%bml;gFTPoVK{LrMi{QEWPrs-OsDJ)?UCsILP`OwUr`CL&@60^K
zeh?%`q+Vet-jx_%;H^&Aa%I*>HEr-vZCj~|nUpx13#+`>?a3#?*u)I>uJh%}8edtO
zA(ID)Kt+1{!_cSryAR_XY<_wKpA`s1$5ry#$IFD=2+*Og#s*H1&0Fu6PhT~P&WW|*
z4}o4n3)1aHT+wx<Ih=%irPl<ySp=7#=J|5nq^J?gS=OziX%IH0wuDWwS`A8>Cy&MS
zBr->-9&E0l+sWu&Uo-o$K|7%R0ha2DeEc&Na08gEyOdzW?US|}f&eY<kCR<6JL~Ep
zX-wGXI&}wMb(3KoevG67xS~3H_0!`{U%RI_hqNQc-3q8c(JOw@X9R_k-Fa-3u}Z!$
zXoqmvniG=rt;we_o`&t>uH=1zo;VE5!zi%Z?>~kbE4$LKMit`3i%7DjGbm;7Xo&6D
z>%s?p`UA7$f^i$Py6_S5={i=8Q*W;Gu8F^Pf2OQY9$|!j70!g&?~aPo=^tgA@3kFT
zLGc{lr<^D6ggWw0Ip}S%r&u+|CY-t+We7+o7;4SABhVi+rL|}A!5(6Dq2%H@f>)LQ
z%%J>hIE8;ZUYHFM8Z>YGLp@g$WiKsJ2*Gztrs~=c<#0X$mJSbfiN?(WHL`vW-8(V(
z9~LfG_GwG^T23N20*`7md0L-p9|CO?x*SNMTc$}!EK$}r(?Ls^EKONleQ+Y9HTLa4
z|5rmtuxT>7vNok5*n>1l+%S@<!9WFUwd+j<l)LuQyU#b=wm3D0(MbK2#$<UUK-*m*
zJ0lDwk=k-ljfB@i{sI!5+Qg64`NEzx#a$1SM9ho54bO@n=*mZk!!!4(Z8toSuPM|v
z!td;+N16rGgW)#b2gpC5->BaGn%D_RS+M~iR&beV6jO$k;KKFd9m$k6rH+vhV!Zg+
zrgeT>)@@TF8K|=H6vdIwqbE2GiHC^A>o7B+)%NHg;NpKA1`Z9VFhq{|H@5OM31t8`
zf}F)jG?1hq_7N>V<g0k*qhXw0JsN}HHbpQae;d<2x;lk-8`ICOo}B&)PJATNO_K(7
zo`dx_Q{aM@WuKL$Xc$Q%r-)0?(Q<s7c2a}kS>{}35B3xB(hts2$OA|gSlGz6U>6@8
z&>}8&nHB5erpOqfBbk5nTV;YtHmTX2&mZb6th8`n!JA_Fm1mDO**wd5N0FjKCxRId
zK-#dL6ng@sO5!~W(K=0ag-D?W?)nD@cOrMxugSK@1^;=Jx5e=XRKbp?CSAncF-WZL
zDkk?*qBJa+`md^y0RC-czC8F=^4~45+GlX~*u!|1^c;-H+X;8d^${eh0(U=mpIGx6
z*zkCzE+$DO)x5iZtXg-yWv?uC;fFKc((*6%w-BCUcSKfIjb63|kgnxquYhW)uKSf7
zmxZYnUd_!H9Ij4cUeTtUv<-Qpy`5(e#Msxm?#bQ$3Y9APSV6tNuh#uLsA5zSS^8yR
ztRrFXvZ^u~c<$-kfv_SZ_rg0>LLEz8kIriGOvztl5XZ$KKH!ZTF8<~k%`iPtQm>Sn
ziU$g2AK#@+cMM_DDW6{_$2P*SA|j8RM%TsALfSJM5!_6iwKC6`HNtWWk}PE!SW+g*
zJWHC7X|69d7Ainsk$DtsA`n7Y99ZbRf#D1Eg&Gb`NIc}&zdNeD6J_J_YAU54gh8J4
z6g5;(Snoqc&7_{+sg9~ywtx3p!}}^`82^poVRZck-6(j}v^ma|CoPh=6#0b2uDhg!
zc*V~_z_07<FOeM)Ja>SdF_&6PM5vNY+ZULvag*DD=LTteH@2ILd@EZr1Z@}H3xXzR
zcrZFKV3Ir}aewjC(p3z;q5<@os4(3)=<p0<6Y<wbeOfl>+)|cXW215WKVDQ?>W$p3
zHi+Sne43UWZOK;3Wzz*ay}GYdnl^5qJp-eKz=+6A42)cmB>~6TXBUhPS2(^!K2Oyo
zfw2t{F~3$9+wK{2J9?Lxe0R-ouIErDKyVEzo?hpJ)0dUidr}<dpm`6@(b<x~{WTIe
zob#~2&qw}U`&`eYZ9{hcE%KttOvqJA%bb(mlc3MeC8=hUwDc|TEY(NG_%G_LhbnAE
zC0;n3@1u5aRi(tU0?9p>!=$;u-8@A8D7Fvvf&t6w<}z);e8SL;(T$1Wd>(wGPc;0i
z+l_1PU4(MynP6~%5Ol?U%_nfZc|6R|7g3hbNED$jFs%6yHv|6@4=yafQ2pWVU9Lnv
z|ByI{5jJd|F{Z>Gt<LRh@KT8i&ml58*u?q9qCT8L>SEqxqYrcfY<>bHSwej5(q03+
z*bA8zz&X*m(7hptQwZ04BxXzN{<y3{(?NWiC5E=gOV=P~Qh$-S`QNC!dU`>9)jhcI
ziv>*A!oLNc>f)UJ=E~0cq+=V$HX|iUUfZm2p&7JupsJ?+c;{KJ>zT!#G3yz=GtE@8
zLmjdyCOd5lX>fBsh8DOy8`Oi2mdBFaqwbdzcYCg0nP}@xXB<%_=>|Ge$O6Rq{LppR
zh)Mylp3yjw*A7^b*g=qGd}ezf@hR!9WX9}%`z!39eeCt4g5#y=9#dnuqIR}o345I$
z-%mlUkrTFF1&|gu3BnNm*-m&#!xM`lpXIL<R_xsR4|0Ydb!BGT?;f$Ms(&*QB@qf!
zjCWH-eXyYYqG=a{$4}wLiGO-A*iTNFqa|xIQLLymdQIpK$IECCeB2lf^F0fwVN0WW
zAU1d%y{{5ero_}G5viDbP)qswZz~)5+!UK!H`xdZb6GSG!Y|*pzZ9n8d50MO+Ri5G
zM2}N0RUdvxcIsL<aMFlJCBUO&R3)7_YCKde1S$9YeNX`V5%fMeLA_u&+OGmwliU8a
zeCA6KI~U(&Hx|qEtaij_8zi5enM=ELS6$YEiQo^Goq)djH!fu1@4UwdyVr4F_QK)`
zq8uH_O5d^pF!^S0P=@cv3hqsf;EBiB8rQmcRSmT3=hhlo9681$HL}yARX-l8Tg-)&
z$A`KacA9WD5=Ya?HevO@aAq66T51(eVmErzDitny&}{ycH;k7f-ECL$jC?6hI<@9#
zg<YnVGvCJ*)h+dmT7;+<ca2JC@NlfCjpA^0S@M=}&%Z0}DEycvMzOL#%mm^zPKCBc
zI;@@N1!>(NGGAw^>=G!b?z*l+q2a-Jh(l~#NPZ7w63{!57FkKu;$DbJrDzJ4tB{1@
zSXlgHgCq*Dil`jnnu1~W;y}-RcJx`=j0}inekpJW0(FGl%Ap0~1ITb{_%+{wF>-zP
z0{r78ND*l#fz<mqO`hF$GTVaB{x%FE5Z8}k#WoAhwZBC6WpYcTsLv4R*o!7!_(_6j
zS}b<S0E<SzDF8pNpII>i^ZA*)1q>tt7-4OJ`k6Uta|NAke=g|T{$13_twI^c0>YDl
z(!w12bg8r1jrrS>o3u;9+s`}ji#JeHdrE(qk?eslP!t;5w62DGIVJtr^eYVMvUXZB
z%oS4z(!DQj6LbGI2rUBB9Onr_$i|Ry#XDa29QTvTXmYqbwNd?eB)k>AI&D)~w$!Wy
znWUs(&@tm0scl#QK|Mb*`SVLBi{nuPiw0i9<)vX_l)&jfy5?CFt4N`$Y9G^LkQa_=
z7$-XYgh@$aP++?WOv02?LAi;FgBD96b62Y-&rtwz__lUz2JA~lHHHt2DtojJXVL{z
zLcLQk-F=dWVGEU=VKMw*|DIW3p>gu^f$nqXsM~$V)3~jzFPb}vd`t>7-g*a)zr>Dt
z-S0g2?7erZp2Zw7MV2D&{u6@tcjwvaLFA~>`Z&D6osg}4-66Fv;lUzL$d3jdZKEsM
z2?e&(4Ef5<z?Ch}^eWJyRyHj_%XR1h&%Myn%H=B|H_>du@mC{PH;Y9-#d$~Q8+GR5
za#pkdR=_WJKSaIfTrWl?3q>}=WwzdI?f5qQn!_*1LiAdEw<<UFESzMF9#v}3G%1o5
zFMBYGVPqxOUxjc=f;qSC50;by1Xx;_9~r~6)Y;cvA~GNm$q;%fQ`vGE5WzF=?x8MI
zsIZ0Nmn1R_;qI>6ED*)e_fK}-mW2Fpffa5e<bMJ=L>(`>Ad^c@+eAys9=k%x9APdM
zWQ8e%205SPN}LvH?y&ijC|#>nQs$|C;Yp1pZm4a}PGF|`ceR0>K$#2{a2(NVMbaUG
zHCU}z5&fy3>q=$+RgQ0gAj<{ywZ$3TaXQitrr^N}n+NDpT02oaGPD0F+19E_P;QC#
zd-v$acKABm`lEmoQ(-i6ZP!YtgBXcBFCnxrzox@}JD}sqxuU68;nT03{(bLBpmeUq
zbGGL};ZMz_qk7lD$WQ<AR<~&TyI)tB{f_pH)wQPdJ0ZE}BhZ^eRnTqSG!1z@{z)$j
znEjMJJWbrD@pG)if^u=G4-wT>bsY5C7}~9=aJYERmoY8vK3qacILcvL%nIgCtYRh%
znGkj<Ocm#P$Ah;+H_DCNXhT1{oD3I^+dDASiURgFAE%!!CH`${!?%l>VwwF78kxHp
zQzE5upER11-YE~*(i!~-Wo>zy3ShIyLhQ9pXEX0F)EhNdJZM-B)Z3nX@<h-+r!6#P
zt+>3mb#TMXt1()5B{VmL5LCL+MBD0AjG27Q3^{5<m>hDz<gE)>W>j0O5o)X5U#98S
z<xjJpTBanqvIRogf1pwUT}UCZ6fzX{Mv`!}`@_W3;%AS^2K+A82~Iz<{LL72u{92b
ze)-Fwei+w1pPYh+JW-?jP&$UX2{w?mXeHOMk0V2%M`5`8$xKXpZiD6$JmKgCGp})q
z@nMV)mH^^!TPJ~0Yiule+LoRd@z^Gk-7M0qhfUfoNqD*Fw2Fkz^j+%ue9BQ@ZK8Zs
zJZu3aB!Rd-IDKvutnp&f?SIrqvao6VdAL7A1cEU%9Kr=S9?WaQXPJ;05`_=}%IEJJ
zp?FkhWi~ZSo?EABpYV1(QnNpNRYRN|jdf&-IxrSFLwU%<Pf@HTUg0(=W{x_4W{>gN
z^P)XP!^mN}^-3l-ow77lzB5Ugm)^;?96T9wkX<kgc%P)Kg#4f%rHnwpp28#NGTZ}7
zVK#;=-JCv_9#pkb-46AD?Hi*3DK=dbhGkL|`e4wzv?q%k0b=Zbs28)N3+JfB<}S=R
z$oyf>2``4~OFh)A156PpB`hzx{S5}yGcE|C=%{Ks*Nrb#FA=Ba%en?+28m>)?IIZ(
z@JM!R*4X{ATq-jc-Qqwu7!DG=l3ZYBe%0v~9mDsCW_*48jO{0t8G9xw33g^Ab7Yz~
zH>pJT=6CFD^m-j~$IMLq{inTN!O!%x#=Mf!&b2Xr%|}zoKkrv89Z_91bL@d#RjfTr
zOBHC_=Zwm{dUirVC9Yk5wq|7FaBb%-2-6QIP?q3#;UqK`)-oKohzRk8+uTjoAUQmt
z#o=iCA2_RU?)y_Q?bZskw!mtezxIL8Yn)Xw-)D@27!#(mB|{kYIYsj1ef%4ZCCaYG
zTtgV7d{cK5&ium)KhV8-E+XNhh9MNh9Ws%<96kv1e_SP8<NNu-ejip1XXOcYq&HL3
zhCL*D)VRk63;7z-1rY;i8@WGehD~@)u_UP~gGM~iQJa}*1(atB3-Ry;e5k}Q>DQ?C
z+?4zM=8Ml?NS~-fYw+iDaj44+03ibvaehT>{I_RLAy4`8325||rFvFW4H+9^bxYdx
zi%9r7*nnE;hyet5ASWiRTZ;a1+%z!vx&Y^?e!f-GnQ$acg_{B0m3)<`?X*TV-q<7S
zSF7p=$#RuVO>0BZ=mpX<CF%`+0Sc0Tiz%1;QV5GAj?_TdSUX6FIqr3P{G6cF?BhXu
zv$7%{CJ0OyhJ@R8h4s!~t|^P4maI{{JlxX-CM(azo3g$Ze`Sf6y<ofqLhY*i2y^{D
zyv!R~DraL4Rd7)CTL$L?;g2x<a$cvL(Zw$7oXjaGrG1pvJk|BQWP^>E_isa?I^CA;
z^KWIfylF$;-v&k3>}~9pywKE$^Z`egaw`Ci+>%)RVj={K<Y!=>y*IpCDO@r=dBG-0
zOu}yVfGd6<z4c~-0`UxuKi;$v?k(5to>(-#$dO@vHFKc0oKB_NAAm{T416Kc7Pu{*
zzIfue)77n1tT(}83p62Y&T9(%Cqeq8eyX)&pyiB0;oqL8|0UJtrl)~izV9nlA4Za|
zo1L2Md(-w+<HWr27i<~mcEn$px@J?-6HCa<SwW8J=e+D=GsQPHzo2}wZycs}aX!;m
zajzdbpdAVG_)%UUNZS=tRwD%#T}$JwOHeTn&el13NM>sZkrO-o2iJg{A_@`(^lJZ}
zRVKgE@4ndutt@gmeLPOa9FMJzst&iQTxYAvj(QYn`D*n!gZ3wc*7IT8X*GVo6HD8Y
zEv3Re*$45-Ejj_<#86v<Qg{CHhnhr7+f@V%17O_3|6)=q-hu9whdF$Ap{@5<84ToZ
zKa%CY%g2+ig^*Iz)QugHG8%`fn4V=^TO?$=x`C4Sfhw|QW1XL1JR2W|l62<vH?VT^
zlvM#N{FJ;$$|}8Ogu1aqoYCHWFg$9WM7(hh@U&`YaEf1T?Bp@ZOnYl)U2@es8sjWI
zEaLx=gyvYSFOonWha;b94xl@pW`mGdTdcm)Rj(JUrOxO1$*!@9Da8J+P>VJ{ZWsTN
z9-_e(2`7lYxQ3LS4=s0t6FLiu*X;T7STK7#%NNB8nRyz6x<_aFDHlMp|MCYfKTKKW
zZ$Owo7)qlw^}v4P*cL6ctS{8n&xp~GJ3+&v=pfY&t5AXW*}0}5kjRhpL)Cspo#sB{
zEb!9m{xaN$7q(gQXJFG5zM-=m$Dfz|260*`uo?FGnJ#)hkeBf3;pQG?3<qHhlloQ2
zGn)2}?A3Dk8=e^u3h0qoFKX1*I(#@zI&TIX3%Q%O`M9_%iWFRlS_QoE<`zvp5pK}1
zAz|}>nsG}qI|IM&`{~Z);cZ&yqh;1^ZV#g@i5=Cm1$m|1N?l38VmbL+sl3=JW{8}Y
zHV^jEqmbj5S=Xt8P2qBE=-ARg4oxY6x~y*;#EIPQe~{I!8A{*%2oERKpnZRyF7d-=
z_d{mbgwNyg9L@=s_uw1t0_0<eN>V&|<?e*3esrut5UT|=6LV|Fe@b${e(>_}Ks$YK
zm8sM<mNwPX6botaN1r2ep6s_Xk-pP4OfxTTc0zDFENpFIWkgcuZT2d7AV-Ysq!Ney
z{o3H*YmV5HYsn$lBI1{&3W2MjXB&OP(`&oZMCT;8EK4S~279*+g+~(|Kv4QI#&eR+
zF1r&V`nu^Y&;=E?$LFp(MR<Nd*^)gpW+wjbkbKe1V3@EcZ}OX|0n-IyEbZ=NW-U3o
zTI+a&+zr9Q=^w;T9`gZXVWnYrjOpX%)8DS|ZL4PMze3qKc_X@9RK(xhE41hi1vPa(
zu)wslIs6}J=4BhV4U_T%J~iz~%^-cbe}6>_U9nBGR6352AEQw6Bah;U(mP}Ri^7b8
zidV&Hsn$`1G(>)w@!xlNllyJMDn4BX|DJxJkzOwttTc(6tWSDSg@C7khM61*Z*gK?
zJiG?$G`i>;H=Z6%W6sRD>uT$xJFA4}vye%0>`r5q@9|Z=XJ4;IF0hgNAp8C$LF?h(
zQNV5j+L;)LKrXp6@F2a$dH!nz1j|m5N4o$;;6fp=kFv<BTEOP1vmP=&Z2~IlEg}z1
z>Rm+gWfCg(|B&_$K$<mMyWm^4Z5v&#F59+kSC?(uw(aUdm(^w4w(Xia=Y0RY6ZfAR
zGZQyr$GcN|WyXFpbFG#6<g)<{4NUg@LpxAPlL|ndeAhTqYa=WjwCYxgfz9(mj?CQw
zolAdNp@n|yE5<+r(fVlf`*O`3cKseci8T2!Of?Lyk~1+&1QMX~lcYYH=V`ny72HV?
zaTcd)v4MceVA@SwAX3Ydi2FxbmNUCk6}M<{j_kUP43pwe+FA#hR;1D0$l@pdjYbXg
z&DxlcB)VyF)-k003_3E6M=gu22ddx%WErMsTm*IhPgSZ6*g8!1K+5e0<zC0PE_uuT
zNB_Al5}svQdXPm1G3G5=hv-IC?^{OPPuq(-2dn)=>Cv`08Ki=tJynCPM{0(0@V{cm
z`R$Z4;{h3~uGQqlB<aHLVLO$Q<YSBR@I;5wu~aOXcki;%?A-^_<0W!FYs0Yhm~I+B
zCR^RhxE?qfV$DF_S>p*my;4N@RC73}@}He3w%OQV>|%vanqN-a+MtPvZ^<ZVY0&TC
zxY;a6{MoJ<WF2#uUKKdjlkgo8x9xe;8KZ_3Da>YlGObhT?ie2DF%7cw{g`f4;6(es
ztZ8+uCWBxGSPz^NA%XAn%F`c&FGVWycA-+laHwJqRW@9ir#Q|eE~+i|Ws#|mJ_XmV
z7H4vnBKi4tNJu)V!nypz`%+1(?y4_;bX80KG~prHa$PhIy&FX~?mvzLQVr~nFUQHi
z>A{mVwyuhY0WIg-|J`>7gCyTlMl9}IA*$n47Q6JQmU@ZJa}jWiV4dN*D+c=Xlio_2
z3-{bN<|32~N)@q{{lHc@N1m_`#d?)ad-AV==1bc|dB^m<kVdO67oQeF=@c%8ZHIL{
z-oOt|SH6T*m>0cI_`!m!#lT7T;2K*Z+5Odt^t@SJLM;L;EGv?R9C*e77DZ_M8r1%#
zQ!(^h#r;L3@!w1M?PG_#MlQZ$5(#5JrJaCO<Eh64(u=71JA2fH1bppRTynMjlWq<_
z);%C0z$@kUet9z>-cB@DT^i?yP0F#hp8Hf|Jq;kzOf*1~e(i;dMsD^79YN|n8HpY$
z(Z}&1bWz+(v|bG#MX?<gAHOm%q|w8-(HW96?wZn!OAIH8Aid_OPgFrrC{>55h8U-s
zFxh_NGq|y7MC4re1>9LUC-1x`hfm!QmF_}Ut^H68D#w_5S}10bEBOWlz4!~%lL{=8
z2(FTEwX)UXTxS4};rzxkdFI%Up4fUnEDH1B2xz-|c&DJ(Bts{CvTbeT)d$V|HeDM5
zAf2&=gfo?NE3$%Cp004C2&gaFu7G&7bx8U#>wL<^3g!tul!%l}eVn<6pA}%gCT7&v
z@<~VhDCAPjsN5!Xrfkz~L>!$k-rk<&AN+OveFX~S*9aMBA;DCu7rn}X`(S|vlU%oc
zTIY<0^d|d-gmjtFxSWD52uZ(byB-F2t_;=<sRYY)y8hTQ1>33y=jtqscJpf`oo_it
z_Zay>Ec^PB7Go)ut*=+XustIW?g>!bn>FkWOF8BKl#`Sn&+iz-4qL&<EA5oUN=QHm
zA{y%l>Y+0DT)SB#Z2O4?{%{S2)LAJh<hiXI-YZF>722W{p9~BiHd%aRC9yo(cLv{p
znKE#hl9b?+hp>F?JlVQ!>rd>fcMB?*&B&~99>ClqGFqa-gqhXFgltXpa~ze<5{C@H
z72V~!V=rB&2Z^EFC^Tl?RN?eF2#%9Y*y<5MheFIY8=$dx@tNeB*syeM90kZ>9MoT;
z%JCHzXuo^<1M<Tcat1w)H`dWp)rcL}6h4Ygr0BO}s{q#!_@G2>{++~0-!O6EzN|dB
z!FZgRGbalHgCBMWY~m=g%FribJQHkM4I@W~-}#2xuT4~Q{&$X{P{-hv6O@Vak`eLv
zAZNy0ZwJ9MP2ZUe49Ief-jqBmsr>S$niA8lKX=#jEi<da5jAQdW&L9~BsIfyszJjG
zH|TjI8@WK?rFPxOpd{;#aEO>e(baKPZ#8;LKOJ?;OSVw1ntggV7(RLp@vJ*0TX3mR
zTizGVWM{C2f+>rmnh_}B@*HR}V>1!LkfO^zB9F-03nXs?Cn7G-TE?xFN{MXgI{m0s
z*aRNk-XSd1F^6WHeRM!nmD6vZsi{x_gI)mU-hLFu=Pyu68Z&bmI{A{Qvi%)exd>!(
z^PVF=?J7@F*7e9^miSV+*DTkX7kM?8B7BFh>&Zh;q^&ds9K^pINft`=8znZVQ*I$a
z>T9>mHH6wh3U6A3cznkl(u@p{M<Y)I*&SHLgadskfs`mXoZ?r_-cmAtt{BoG+Fs%2
z^3;NhqI+%K%tz^%YR9*7Q3DQ1?uZfo5oAqK)1LH1Dfu2X8%9c(=-LH^n&V+zd~0U{
zcAc>crbuQ(RV`(R+_JlTlx0k!$WR5_>-_G6LeF^=&Eg0eqD-1MS1-<Fs0BXhLC*}+
z0O5p(Q&PU;OIB3W``2eNV2&Os?4L5DNH}OJXNUA{WZv*hCc^hv84h_ir?>~K{;^$z
z9=jMK6gN+LS~bCX;uQ!+ryNWVH{Ib;4kKsqF}x_=kuFkAOQ;phf})aWa|ukmDh#JP
zs}We4sI!4M8fp)kTHg0vK2$p3r5q!@;k#us@lBk*bo%wm0wEYeftMYLv%gXyLhSU~
z9MJHWA5E;*m>@vgVXD=9G;>m}wjeE#w)bsEbXo!qMi`3d)#03BT9VL##hdM|tL%NG
z8X7-ulk6f^c!bGCQcfv<Z5{GbW9%<z|7}ue2DpOeOgzG<_~Ty#_5UyypI2k*nbqzz
zryNA+==)ldNUgT29?<wz?d;+S;!ohdG-h7y3mEmkXJNVt47F8~a*5+WF0*qQmZ$wq
z6VPS4ZqoMr*5oGIgD_WjPEi@mhhmfOW>+Xv=z(m`R)EM=qyR04w18TwpZ@b}6j#I;
z)OmXBwSI-l2)+<Fe~1HcvRwIPnLY>k!c7(D&@RLx2+ko*$btbqricI$G#dCo#K;P6
zIB?5SBaa1)iXL9|l1y1Ep1uQMwtMVGPnr#lJbbkvHxK9(zNkHM_bm-Jip<*dw(4CD
zU=BWquIPOPdy|VeWlhuv0B{VC?vPFn*Lf(>&7mdancxilVE;Zb04R>2Tkf5+_cH^T
zF~gP};mV^w{KkOP*E-r55))Rezm#NOBul~sg7AqAxyhft;r~Cpu;C&H<4d<&<`Yp$
zh-;*b$T>%SS9^%3`~Z_aYhlQw7&gIi03-D_D4!+>%%dy6<7<;W!{>+F{%s+T5k1eC
z>U$E%{Fa1KyJ_iLSIf)ABEqdrt)q?2Pc%eTTK*i@Ra=2lGOp)RA>BizY&jODa|VMi
zHlHiS1GIxNsYICfjr6>ZSoKKG6MjNEyNZn=I-{(Zwb<MCpnK56{HHPifQ?~M>l6__
zFr8^~w9dXU)q(7UUFrcSnPa?#`*<U0%M@C-2OQbYKyk;y@V={ea(65gnZ>1`#aBQF
z3NxLiQQ~Mt)Vtn@^f9T*Uem6t8PQ)&0Z&7n>9TPCcgdmYyS0`7fsF`%D9Bi(UuQVi
zBB;5@o(OdT;6gqZ82<a@$TyH%K7?pHo=%NUzvP<;<~xDF0F(b;0m{H^003xKAcNFe
zkPm>tD|$Vd8-v9<XO&%3b!Tt`*4{1Pb4MC)Xels$v-Q>s_^gw{W>b)V<ZXs-^B3W|
zsv0a4h3&ZrF*IvYM)`#U-3P0>hdN0Tc{UU%hH_yci@ywOcq3aZeWYA5jzjv5%LxPq
z1J_r#`~&2dBySSIeC*A*zm`T4%R%S+2d`$%vs7BIO-rSiGfP}D7%+FtW+*sx6+(H5
ztV~*EQ@MMp%x)P|l+Wn=>4Tp`t9h^N=}j(1n8E|!dd(yHqEcN&B)Uh)tAEt-D;Vr>
z(hiTnARSwl1@mO;njjjfc5rhG=4brd*>&gZWEpfZW?`d7wdN#~gsKz2C*r8Cj1~6M
z0jNBFb)K4H$bnk}1^D_lBRFYq>PBBojMIu=om|_Fhez7Ihtf6?bv@@}CYQSs-&{CT
zh0VJTH3LVg(57Fsdjx%SF3s<l(0jA2zX<}Vcgo&B_X=BRcOKm-H10@D73?QCJyBZc
zdT2y?zUB%Z6kcwC)7YCf_+)$FIAST-A3jt}9U2RQjiMQ7S;$^{EwMW-&v=FvBv_Hx
zZ|5a?LZR`@e}9-MPR!sJnD=cJwXXT&10KQ}xz=mSvKx}xJi7fVtxzr?T)&SD0>lJz
z1l^*){`EIQ7l6Hf<^h{#1VciN-2J-;e0PHXT&4f%5&w>W3IhNreZ>Ej^{+ILKi{JG
zfN~6+ME))6pQrxw?Ekl4Aie*HFtYqV5&>K+kYOfKCSaZ}4Jr2Z-B|?-b@TcU?ecOl
z`uNTuy2>9Fav0Py|GL^rB5jj3Qr{N#8L9$bpllnbh_eqEmvHj<v}3j6Ry)usFFLl_
zu%SpfH~DBtf>p9i*nhMmAB*sAt6DDmaj2=M6PKlB%T&b8L{wX%o1?8R17u(7H+&7{
zH{Di1QKHYD1;(dm7)9iNa<?!xV~U3kLi?feqD;{;k-EOl31=&Q2y+j&=VGP^bWWp6
zD^&HK+Rfd`nLQcQ6jQgOQu@&>yZA3=OW*ZHpYKF0fwFz-1F(_@60nnn*wUFPZ@yjm
z?5l(_%<1!zOr%5vC6QjfRS$1JIG25FA)9ft82^D6V;uRdaNpM{DskgkqOx<oUTh(k
zWua!AAe|mo&nvxh<7T29WLcY8m!X7pNqGi`<iYN^ZiOZ2a)5G!NTTwTC%+Gp(w`@S
zU}sL)LmQ88A}@Z6T=L4xvt?|$4M&gX#20@#(~ts_(?-Y_&h;WRNn$b};AyzvC1cGY
z%b~$@W{kr-Hug#gU}t6f)wAXXQ*{R96d;faW+SK%ff~?G5tR#*y~N1XjJsZFbGnqo
ziZI3dR5z_nA|83x<c6e~d8={fY^^}i6L~{S4o)s9gJ1kcW2~+2K(%Y6dQ!eNEQFn1
z`&rD3#A=|wneMmWt9LN${sb@3Gz9Moc%a_whvt|HbRE9W*yYiLYd}~x+;wV~gal0I
z9gi247{`Cb540`38AN8WA}J=8#^hAf;4z6V#U>{mt~JYFYp%IGN2Iz{7F_D&btOd{
zPws|y`&hg4l_!}kcx&|xuxu`VlBmD3=fzMe|3QNUmHr_ND~tX}#AUU_&E&pFpCpjC
zcue{vTQ(loF{J7)ZaE~vfn+CRlVQMWdqd*f``y<C1ag8!kZAP)Ks*4j^Z)y3`rn6T
z`Tu7gl>2`MOv(S*fB{Dr$f*1tFxKA#<_onqmCwu-_1+EAt=s!9S?aGx@Net_ZLPw%
zrg<pNI<m`*0{YVdcPMO;0`u(4tjb@{&#Wd(?H$CcM3%T76a@3Ue09jIl8L3jcZ4pd
zPG)BrA6%L=-rE<GxnJos@vca%LRgCCZ@pB^u9J)BHH@0C4%OgiKOKtRBXYyTCf{~(
zo-YtasFan5uVeGz>kQg$qzG~BHJ;n8RtrA!&)~5$v=iZZXEZ%I?KD0PI*@MbwkA_I
zYznnDB~489=y=`a)@nJ?|LBuws=WtkBb9b_X<qP+{oLrN5viP+-5y@I#O9AekZ~v7
z=`*0|3j%z6u#2#yKM;Epyw|&=Ub^fjksMrs1!V;iWK_iZOx7c_%u;s(RN1MqELFJ+
zrA7!x|IQ;8x*6y;j4KIT^;4A6&Kgh9y8eV8jf*kGh`$SwLmWg!q>qP_dZ|AR0Jglw
zc%Kk&I`a&lZ}Web+RlyZ`+j{u9<1k<XXLI?uXVK6huIB~(#2@#AD9?VQF<L!%JLz>
zO7OO~{RlbIV~YlhA*btD2PX4Pjo{Zf@m?9nqdv(4c`4QUYJ-1fmS?Evf3B20*5n)<
zEvj;<lT4&Xp*~egJf3?^%ot`jZPUr!NT<2W0|}??SS9BW(8#3T9U$eBQKBOF`H`9!
z80lfV%H7RU8|cpzE&s-eT1*LRNKQ`o`lfnP*}~noy~jhJwpaYR@H}C-2?cZ^1BNQ;
zMzBUt#}*0K9Ip8mN^gftJ~ck=I}(>J?3ae1ci`rZtH6vYmD&D687BuFh<dD_+X2PS
zy_s#g#z6Zb`Z=@pR$KjgcjFZa2ZHhOv^3N{>oNRDTm6JQGgHIw*0z0mQnxZpGiTDp
z1+4!LGIituaPWoijKPr42%&_ePG(Dal5MTQ5eGLc-oJaMVHI*+?e}e`JA+rkyQVy?
zr#SlfyKT&omQMXigJ*`r)fVI9iW6WlbXyGYHBlSkPp?45Ijpbikhtwv;K;6W@bQ8$
zA;R?V!57QIHv)O?K$P>d?-Xq~rC5sS3?fkbM6M45ZObB^m5E~Hg5%7vl-Ar>iSDnd
z0^ZPX4f<1{K9AHJniW8!?v3Hu2aB%SsP@bOZ^SN)ACJ>PQ?#ctTJ7)~Zg`8l8t64)
zz6O<16k7T7oQ%5Hl6d#ia9SosiP@C*HUGK-&EA?m$?!d+e--LnJt6**fiw~TYsol8
zH6qQsxYfqq-OXCclNB=Dc~)$D4b1jIKI`g4@s}{dOYLgo3#xK_-=Vlg3o+R}5c=BS
zhgdp-;Fv4dngBLq494qqU-A1b*oaML0`WI7-I3)S0d`w%CR_JMqyC#-0jigFZpj`Q
zOkG5_Z)r_*sxaym9F#YHbG)yLh>MzsgGfijwRhkp91$w^YqV|7DYleHI9OxNYbZL9
z0T;#$bhKgYIt&K~tCD;893!?z+;lE*lc$P#HB*Q?j7>7iWW|~u+?e?G#FABjO4T*%
znk8LscZH}x?HpJllh4xlY@=YPGZeWqE~H4~#juxJ+K`H?YB+mgbWbIG76Sb^hQ-Vg
z%A!a!Sb$eo9L_ti2V-lyx@nV?I*E(jyZ=_WU$mi3#sa^+Q@0a_%O$0{5)8-qS^eA3
zP<MNlj;<$)zf6slRk7$l@3AU6=-Rh72rnZSm{kRs4vh|U_9;ct%<^7+y?h=>!ddX2
ztIzvoy^`P0xY775!aCYhO%kbmhr!$tCRc+BQ=ev{AJYWy7vKIKOYyuGBn8K~oD2G_
z;@M1QdPm5G%2qd7)=4E~hA>Lh;-7i+=>>5Agf?zy(zaPh?Q@ZhT6?|+ksRMV?resh
zX)mIBDHDYsIwXW5BTF;{3vnC(Ol9tVRP<$cTF}3CqtEZu8i<BGY)p0@yLrob9ZQG;
z*WIjTLY9;Ulfw;>E%et4QM+INE!ymVj8l|F`Akj7$_LgLIRROg=8P;Cj}Yj}Kne0a
zJEKOVUO{+kTW?S9oJVXAp!!MHtGii(-=E0(0QB~H7$(r)<s4sd0^Vhy;9l@oPI+R$
z&e?&&19vn{?rAGYz{mVsxkw4*jEJDo+WpJGD+Bcc09}y#{ZIY#zu0(4alo3e22+@*
z*QZ>0eEje`3Kh=(E=(7DWDlhEEsh^3=lK7ReW>|e87d(V)jw5&#D2>V1j;%6N8f=&
zB-H)yoAbZ44m$52DR>OufiHoKi~p!RRB4ib8;OQ@nC5t};G7J=dl!+LzGd|kYr>{7
z&Zu>PhxGOpQ0rxW0xCuIqP5m;Mpi?KQ5MuM2ghh6XbAb6E=waVNR?`dbMaq)qs2jX
z)m#A^+sH95mO33Bm>;@?Ssx1TU&u}3E@lnC)Rg`E4oq)b=M(goRRa+EYfX}v7p4PH
z3g6m@1{B{F#=`bTdeA2i>HJ<;KneU|fK~<ODLP}(ND~Zjj{wQlXMB8(4>Hup>N6Je
zk=VV~*A3`Fc~(1ETy3hLXQ^i5I&zsVY3`$c!!Wk63T6A3xa45kBT+ACVgSxetffyf
zCFq5<u8uREbS+sEgP5VGxa4wu$hHVAhYIUbhR{?ZV(5@HXC>h=s#MK|_IN7ORYD?V
zm{JiI7};~9bU;lCwvOAvsh4<X#rha|bYG=g=);Z;A&<=xRt0)T&@^qqIBag5#=@BR
z2?9)`M@}pCi|^m-M@g?9X5l3Bxa)pHq^$zPpSYjCVRk;;%4z0*(B0cT3?A6uJ@$ZQ
zjD!|Cwo@fI`RRv+TM4Gmr?Qr{*Sc>uBfT|EzGPVIL6!la$vib1YRCus*r4a#?7Z^M
zHlZn-x_+Wa2Hq%P%kVNL@ob9XOgF69aWf(FMlr8Yjgf}C7(J_^Pxi?u)RNy@qkfXC
zJ0L8g$;V6g&TQ8zYC@w8b`#R+kd2CZt}H>${<v>&t+tzs$8m|Ryk{cnr!Xzre;89r
zut3a~Ad0mkB6aDx?}P$%$qVD>!<v6|@~b6!=*L(Oz&*sZoUDR2p*~0@nBvIWB17*E
ziqWIj{q7XK<G1IMu!a6RZ5ipMLM4t%yGB_b;e=jK>o=#8zJgR0q4`RP<oHeU*`1e8
ztG?;%3^#6zLXuNVKvoRX2(kA|(Y&tsW#8ZY!rD+8#=0BtDf=aOVc($!$*8}J8sBq+
zS&f>d4MtN<)dSNJ#_}6%Ky#6NmDxYonI62u)$2>=;fl!$U!R*_?G&hrq$9X>ss_na
z;+y&!#DOo=KHPUo@TQr`yOddaow9E9jz1sts0ohJD?jFhq4;#S0px)^E2i1&28RJq
z*YXKEg{;;=<;yMw3IrDGbmJxTb3Ud@yiyO|Y4hGgp}!oaOAlrvR|Abm-!Wrxru~h2
zaD`Z@!1x^Az{aBflT6$Z%=BtL?8_whXX@bV$C(TK>64I?y(Qy@>}3QDy((_c;@%Qt
z;QMLsW8q)h&!67Nhb!rV5&#2)R%89gJ*8qgL`c}L-I`puL+NR`()L^BuKI!gHm#2g
z5?G_6pZpWXt<L>a@0#dLj5P4DHCg)6x`(vQ3Ja3jX+$ntr`1W;^^F*?V|V~??eB?1
z5hxe-UlR#QqklI=djRHT0D*J;Rc9**MA$zw#s4yc{1dJC&IQS@0{}4mvMEIM2~4K{
zRs3WRK=92X4iPGli6F59t!Toa*vE%as1=}4`+L@!t-yx)o_os9aK43+@iurdeA4kZ
ztfHk`6a$*N={l$}ohBT_q}{3c03PxxE?-K5Qs_4m36!fYDhDeD2yI^E>VYOp-^2!x
ziA!b8;+6q{fK#StF}|g08=twXv=_J5vijwpA{OA6A@kRkg=l%pB37$my$vXd8ZwmP
zi_9VwAY>gMlI<COGUIH$u%8V<WlW5A3r4rND1lG&t&tXk(?%H&FqR>)lxVT-?80BL
zHdL=aFmx&41WqA28$c38#|FEmUa2sUy<nR#`!H}uy;k+e4Z&xF&aZ7eNN;4oF%JH0
zD=<IR^!owfw2>@_N)r9X<8Rb;5ug0^PQeoJo58AX$2g9N8gd)47ma}0+xV}be9<_*
z8<9%jrPxT?o_D6oM<($kJ>gBFsxeVM)!ox1HYu}Yb001!wX3}43<JCY^W)%5sCBM*
zI0PSd=qBuiBL2Q#;fY#B=C-F&Itip3bkD&u|BGjZtK_@9-)x;B^hT|p+PUMRnw9YJ
zsU5IaS<hjgnzI4881}q8-+e?E+>~h2QGPOXqvA>aiAC!1eTAMC;|M>Zg;98#4b0qq
zrLUIcZ_&Aupb9)h7eZJe<uVWwD*=1<QEVYo9&k_<SC%jNurA7~*^I=)8!AY}X4tHU
zt&@Y!8;-_I_Go^WWsq6q33^MTR5pFcoKbdc9zhx7HFD(Yt|T0z*AO6M5hHy}B2p|8
zOdx&A8%}rm#K}gqG%{!#d<H4+2jiG7%%KAzjt?(~UzoicvV7CE%f`0&%7r$f+eALN
zn^%3SCF@~qnk4<2QSf)m%HStL!~2Dus7U)56s^4HtNrofyU(_+Y(J<4o%4-W$;mt0
z(@uQhiEuvnNI~WhNaN>Q!dTndZ|F%b73V=!tLHZFZzc%wClFws@eEu6zec#51N@@<
zWHvT+l14AV8ikD=w(oB9#3WY6PX02*GF#<VOoDsx?hNxLmq;O;Y?s6v<YabFW<;Qb
zK{iideE?5pdhm}LQ{J|uIO`NCw&eFyQqh;sRLW}17!R%`zx0~&3jdOQhN@1L;SFWs
z@j?c}{Rli`F&CJZh4F|{g%>ENR9j_mPfpXX0aY1;pWH2)y2DjJ0%tm9P@=cWyX@6z
z?1Q&m18ubcLB;D0Eo^;>;o5@qMkyo&^|vZktc_fbuMz%L6dapu$nqOgw>F}m6NsCj
z3Ei{FpUy4*u0mzf9AQu{lMs&slnb88=NtvKExy^La7<zsxYLE<wi2&!6s2oF+&=8i
z8>Th82oPUHLFn4-;@km>{pOFNC?jEA@D|R}$I|jpu9>YGM}5wH*wT3Z5xnZV2fJP?
zqv!ci6KS#CxdsDm)lX5}s@z<fnd##)qZE_G=W#K@IC}|O>3C^-X*j9;F*ejrD;AAx
zHHGyd4}Px-?8Cr$Acvmx2V{3@xz&B(6K4m%e%?kzxd)n_U#H5cqhe24GptGHCGPFP
z@;5#Wdec_4#ad6eL<Qko*Vkso+2{D~_DZ^|EURAO{oqQhBHx-fkq%j%?kcZAS`fbV
z^>D`X9~`8msOs=yizo|%0p$QZ_VDAwfOf>l)5=*K)nxY(TU)mV;_WQVOSX<08y|ad
zv=U6+odtR(Fu2mW+7Oz{V+(L9Ap2X5J@WinP#*JS-n;jg-+zlgiBScx?T)P8qiOFb
zp)YHsipm#V;)qEulG@r=z%ruGtynVMuWNJ~!Fh!vU^Mt*fc24&%9v>0#xgZeBKe<e
z!$w(<-TA|EX66j`u<rH)@^ScHDuKL8pkO*R`r>)e_mjR{y}cOc${uu;uMwlTWcuWV
z=>QFyn?HKW8s7yO3{+qUo!mC@A~m}%S`)@kp<Y&CfBXQqhiKXq#cOYvTCdrse)BuZ
zSl95Sqv9VZn9B!~t4*i!ySAL->acEz5r?@@!&ru!sAT%f53`gV|LHoI0h+>dGl4fa
z;a5Yb$Y=94n}aefvee>f{J1AZ5H<4WZA}<qsxO76db&u;`q({lpSl~3xAek861^(Z
zJjRvoBV1S{hosyqHB)CqSVE*Ju5+5DjLpY3e%GfKhMPz84Cv{`*Lyzk*L2?uqio;K
z0=Z~T0s9!m3N=Fc3CnrI8i`eHB+eALfK_WP&!-%j98U;7f16^c*i%PTq2u`>G|BIK
zT}>31ANTuAHG4lDoYRh#BNG3@X|Gx6kS@*_z(qy$-B&T_q)W9Yz~Sm(PP)d_(~bA@
zW23HZ!VMlPUR!G=gy7(1-vh!qpytU2HWIkkiPxx*53_VM;mT(dQRffGer=4C&+MH9
zun_Z#AJSmAL?X!y{b0TAYCZ3ZRh1A#?iVCe{u2<O{3uPv-d~s<WBGUKD!AOP6|y%L
z8Qr!Rqqm+SOM@eNojyI79el}(UuwW3FptY*`N;)SB=2{ANe%xhUe8EL6z3f}(wh@#
zEtT6NKlb`i#hux<JMryVqn5-7dFe5tB9u4dZa&#=4a$ZEBk@K|c|gVIuBK=_t)rX3
z_G5t2_=i>D>C{`*tg3ayg8#RImj=qE|CfRXB8!(67MCL<cFW3t+z#>s0MPaSw;G;6
z#ZQPI09eTMWBtDU*TOY;F#rG?A&|)|u>&8T)Dz^3W26;iEp8t!a{4KEr1tK?gE>l{
z8znB^7iSKu&I%s>+XCEjcM7P{nrke1+)vlo;s&xm0_JNGu*Et7jGj0M`$HhHt;P`q
z@DONxf&;T$#70mJX3~N`Wg|1rtH)H3@W6P$lBGS@e{TGKMqZLg(CEaYhR**^UAZQj
zj7u~mcK=9hh@gj%l*2Ju=ZH?*bG-#scD3Eybz~S6+wk|;b<JMt8U?IKdBq8WF0%AS
zMm?o1Phd*O@}^e@rT-$|!gKIO9ITmU^?lY86H$wtsz8%PR*w}299^!>hF80XoD%~1
zBaI;y9GL?x2d=vG+|iY$OKd2`hKZj1m+W-rmGCR_T>ev$Z<h=b9+&gcRc;0yXwZIa
z>=y6xY~2sbd`d|uC!w5$0DV<X3IjqyX@dz(s%$x<E?yyU=hK9gh|c(@Y)F}62ue1r
znEGAz`NynRu%Mq(eF3W(Ad!iokuX(S>OMpp59%E86s<OPwXQVYk6)8#YIlqwqpEl|
z`u#!x)*Jv;w^DlGR{%+fNvk|}nDL28QwE*)6MMd#kKskkres(PWZ<;>VPrnfTvV55
zufwpGW)^P~J{Yl46;{86L6P5vd$ROjIr8IM3M+2IXwC{9XbH!CA7XA6sa;hu94GCs
zI-@ia7CM|P&fLU$EqvyeKc~M(mo-KFM6d1VC!F2P`s{ICB87tlBNs)99o-{LPIGVy
zcjzl2t*B&;p~*c0ons!ux$S(~w73swrlBGC)YSty%Rm5|+q+pjf@@Jmy@^}<dw5lc
zQhbqWhso4J5ko0cH9*~GUAU(91VR~u?xcRSUETU#;J{~A7VnuvYbb$l@|iHE<B$s*
zEekokp<ea1?nP{Z1@E-ihk7AOloOXRL|TW)4fsJR<5bQ2b_(Jf1P`z1o#UW7U<St>
zR<-g`w$rP{$;b}8RV&ilRe@N<jDs@%u~ax_d*{?%UJpUU9Tvs0){E5~j!nld6<wHJ
zT};GpeJ;AYP7@6hew7B<JE`C+S6ZbSmf`%oKAy2^4!z~#g4H><vm<{B;HofO<|;^1
zp*EG7z|wF)jb%%soa=gc60NP+mN_^H%h?30WQ#Ox2jJ;&hit<q+(5Q559u=Jo*r(h
z3a-^J$o2TrUov*Aa=MKOn6`RROBS3vj%q6+13uay!E0e3hdQr~N|RL*Xen$^PROgD
zq=<(yeeLH|L|WW7B+v6STkubP_R?l{pe{Y=^t0EZ9l9y!?;6k&Y~3Whfc9!itk1u{
z(GZf|JQ|)Pk(oLS4(U{Y1sS2NP_cc<)mI%mkk&^-@y)i3)FMObT2$C7%7#@?k+dI4
zmVtYj5279+vF4nSz7m}tcC8vanF)!)v<is_XtmM%z$DG#uTWw!;5@d%q!}x0?48*R
za2Md@TAHU>K?`GFG8Q0XpvmWzcJSl;?0?zH+qCA4{Nh(!<q}JMop}avJODS{Q$MzO
zcASA4vu{2CNfkTQM##T)|G>)C^haM=U4@3ahSN1dDNFin<03YKWbj5fa5%Ss`vv!j
z{z@sxq*3o#GI+|>rQXnAYJ-j4B?||)&Ti(PAW(Gok}sgbUVq_{BS}5UPz)zVcgRn(
z$OeO42(kF*T*Px8Q-%ft)NtgC9=@oJ&1!$%O!*PhktXQYF^wArCl*`_DVrFR$aHcA
zdQL0vwV{T+U~YR5xE<b)CC4h?1}5Y-b+;T<*&-t8xw~7K<8X|0bnN`@Xy8LXnd%}+
zQS;q-D<d4WpJWkLq`bu*Yf<#A<^Bf-6}3mzKBZWh;7I~fQxMN-L=U_9jRxW-oe@(s
znP}_!zG7miv^-TsG+V<Sek|D05zBVZjec4|r{Ep?bKxS+ysNO8fkTwM)@l;}+MH}$
zy?^LA-VG_p_Jo>teSs}WyD>srxED$bE7-O2p>?XPi`%Lr_D1?RO6$EsO&NpOfIOGw
z3#o;51@8%8iu<JL&&GoTnE>9-(F;d0b8!#6J${HE+~*(d^Yo~sElw|L1XgKxl3h(1
zqGRo8-o}{$id_A93)CA^T2?b72RL}@giGL}fLLsP^_((>vELWPmdLJA*K07aw;U1d
zsX$+<oCCvo7<Img6l_USUk8JfEo%e@feyriC}l>!Ldu9!Oa=pQc)~%3N5I~%tf{y_
zL#{J8j8HpDS~AJzQg+7_TnjK(NCM}>=70vu_dSKahWfmEnOB(TPZ;r2$uPcFZ760>
z0`xr!16{**pj=hA33%mWB|2#?6=5;`8T!hEY1UBU`oor^l5_JBEx_6AQUV!Z#YbJ-
z21ZLM*RQTaiU2^?scyPwUEGkrH>g}O?Fk<SBtzb&${H}D;i`V<%Sh+POEGpyhC@KU
zJBK{?+HS4xrb`u*UlRiL%~c6!8MKNeDDdXXWkA~X^&R@FCYClGy+iLpGeWl3U1JGp
z(;=63(q*bo;dmxeJJC$^`+TgcuJC?t_q<a>3YDo!uS>WSiMrcrIY*=H@cJBScMRtM
z?N4fb7K`h3+ih`wiAw1nUjPeHbcPG-&o&D}(RS+tEjV>LaI-HByvnP}e?>LI=LIT@
zp;&tP5U{QaWrTai$7>z#hT(GL<*;zEoEv|J{*mG|RMpMIwM(;B$UgToRkBez`iQk&
zfZ%i}u~^gaYwf6eMzsl+&1J^+t1#hniPDa7?Q;FH<Gsx-K<#z>bQcdsiiFA$9co~2
z7kx3b$rkIe3N|0q3+$6L()rxy(oLv(#0=v-FM$Df*okB_UN8VLF}9Km7VTJZrX+PB
z&wZew)F<XIHM;*5uhDHL4H71Xc?Tu?G|`rEfd8`+8baS{WR`aVd^!;8NP<dFE11l?
zuetv5jNlM$bdST1UOQ&oBf&sY_%P!{iMZxN$Sk9kG5K5sTTJ+DIIUEW_D}7J!;h%7
z-5;P&y2N;>evv;f#*ESM2mhML!F?&3iVJhCv1$Za95O6~ZO1e6nSs6+4360BTkwm(
zYui>Q7w?=c+~BQcIF959kIAr>l|TLHNSgSlZWD$gY^2azLdp$F&oUDV)IW9i`lCz~
z#}+t!3fys}X+KreiP7A!e-_S>G6%C&)OdD@=2=@~k0wJgt5aQUzQlu{4iAjE+?W;P
z*{)>mJ5RXAi-66^G~w<1LS``7Km3@<&dRl88rIb5NDk+M1`=Np-=-sC`1b{yr|?w=
zYlLT;Ny_)!&(dz2-RC^CSi7rylzf(nw3R(NuWB~xE=%Jr;e>V9)`PbpXWc^&g<eF_
z%jqYxrft-V&Ot<GoQK=rDZd*jRMf`xH`w-~<y;xMzI1i(Naa-Xm%m*SNWm+v6yyV4
z5;hnc&THO>#QhI-_1(oYqBnS?(ku9>_bQq&q6wUj6Vx0OV`2AdUle)h(1^x3%j?bu
zG-NNsx)kWYk+5zQ3cN8=sWlzuum+6F{bw?)#|rJ^YpJNH&N9>Y<Vaf9V}|S2y~H0C
znS*mw#$%e%L6uy+7s`QU$m9>&cA(a35JGRayo63YnjhR!iINd*ZWNXL|KeJwZ4T}9
zkzOdwD%5#<TA+zKG>U(n0yp9_Tv2?khQWL43u3=mJsn#xgWSSQ=W}BhE0%shLsnJl
z4?AzCXD5On=sn0NY3X#m#+j*slBX>vwFlTeIqOf?NiH;)%_<?a7SFqIfcpjMgS<tE
zXG8e3yT)qDvXb+%nkQPiP+QqBQ12cd_rX)eqm?fCmZ3VU&ap>;vY<+O>oP$<l7LFY
z5Ibb>*mMjvY#twzcX^n%sw3K9<HyS;2P(dc(oP;gaQ8zPmD(Y4>%i5^oNLKvPa+C`
z(EiPXMDSBDPDq#iroCr;@_aE-zQs@Qe%!;)o?JnlZ%+|=ft%Q#fx1aw0Hym?#Gs?n
zFK}hypg1z6+1!fn=!bl#tH}$Bkv{f%!!^3<>`+-u`#F)M+Q*$ROjRHFj#%__My1$U
z3oG3R4GjsRM=j=RR5GlYVon+UIj}~)unFo~kCg{X!!h?D0)<hs&ic-0udL2htAJ~P
z0a|L8Ey*||DFOpwjd7;vHEtiEeT0J>+s&0If-<^3&o_oWRkkqoP4F&mk~4o~(#JKr
zG2%c*rv8h_Ng?#dgCW`3Hr3GB`xT<ged(i>iT7`v3S9;DUlr+4a*1v$Dij2RplII<
z*u?QsIBb2`xw%bzmy0j-{xO^*IZJj}tvTQTg)_?1P&H5l-=V>zuq>AK*_33Y5YEK8
z6t-a#qRC0o&gf$R03aift002LZ3h4z2heS=0w5yr0X&}na#?`#U?%tx|EKfvj~Bz#
z6W$V-b`3zkaf2?i5|ji5mj(d;2gCD|@LQlQP_F&IH)m!|A{Ror&s7Ah(I|uqFw8|z
z*{9Huhe+q&W`Hj0OE`lSIP|}%-2DI~BmY!_7_Scin*S$a_{?744ln{o^@ylN<;28!
z{D|I6jI)DyUJ}$>A}#w*DWJ~p8U=uI9saYG1H}5@n)_d_*Z=Ur{(C^62LOPn5y*7?
zA7~#0Oo-VxKHg=6{c*?{=x}wzhG}0%8cRBW!TUs`?dLsz-Kt`&wFbN{g1Nuc$DQaS
z<mnBHqvs`lX}G?`_dES!E8iG9RGgVOTh`}wv$(NAmRX|n`w((A&!MNl<mt+FJp9pm
zVJ0d-r2Ho(pZjT(cMEBD$PgL>xo~RQsU8~xX;06FV4sHZR@(s+Of|bZuWr{#Q4EcW
zy=5Lf9$$+fntg8X%E0u~ek7$fPli`<2r9UU$!po+c2oE3P#pfnvOQO~3Dg251QYdR
zVqy?q4xPewp9$eJh1}*DZ_z{BPz;G*qX}H_eTTot4`~?w&$3t(n0ocE;D@hIU&hX0
zf7EHG8Bw<gK^b}>W>kaT2j%n^p~pgp5cZ)T0y3I1aF<w%@A3=PVS8&3m2K{9nJ0Aq
z<lp2edd+Us{8xtxC|bG@#T+9{#5QF%pEIG%KE+RG=aHODU)!}26bn)8SRk$o(s**I
z3L|H4+vSIk%RAYm3KmnxGoGbtx}cGIAd-v_j`|dn^6}qnO!eHs#qH^2sx~{1oWIy0
zEGdo=L0X(C>P47ZCQH_DERVu|%Kn0ADBov-3Ni6)oQ(2J2s~VPYspw7Nu6h873?gV
zNm2+Jrl4gt4c8b@NnI04q_;}F1eY*M#=Q%{R7%X&%D*$OI>6siN%m<WDyPF5V?%%~
z0*%^AFnY=r4(k>|#vmHqGVh45!Qwq-LQv!a=(jRS+PlL&v@#quu!$bYxFOeSKTv&M
z@n#rpqZ=4$tc-Lx_a+^p0Uyt8Jf)LZUHs~1Pq9?=0?I@Q#+U+QK&>^#*=8ze(RCyh
ziOn9Qss_LHxI$<6`AIDK8)mEZ*>KzGQCYS)m@9Opo~MhO*`__g+P{}!fb3WoC5=vf
zrw2Tma3k1b;4t3YkOVp*0EXP!>$#4%vuFDE%8z#nX(&khug!e8Q|6Xts~BYtQZyfo
z-KvXj5S=skA6dO;D?oN*C&Cr$_V*+6zr3{@i2iUUx*RPpe-U~4=Wq(L7^g|eU#k)^
zD^-RYM{N=+G%1Sscuy3dUyqnc?BO3UNy8E_Y>G4QYq%l>G~|NEc)hK718g#<ZyI0d
zLU)&mFOigT6X5E1u74N3$<&!((s5K?4hWg0$ZI0M#Y?l3o)X*m%KxaLY3Vwz|Km5(
zURU8QpOvFpSLM9jQ6b2VWJNL6rNT~)8%O+iDJP*wi6~ML3;y^fIvTXelnB}m>hBPK
zrmi>Bc`jpblkiQF5U;&6%~GiR3D)+fYVF3-(pZ?KlWRx)^8MxW^cXWLSmY1!3E<NG
z$9`O$8FX4z>QEq7>EGUw_#b30ggdI$imwm_VQHvfi(&~)Q^*!$X8?k09BJMUwkCyB
zRRos{=bP!`SAl9ARLrq5k~KFpZCESMyLNUlAN~a}N<S|65D#^T$(hVfjU1^K8oo?U
z3TE+c0Y@;*wN1hHzFn5Ss)qgsaMhuQbrB=g_CIUvi*VQiLr-=d5S!H7O^l{NK4XSX
zL-s^cgABfb`~+7ifB2ew%NNKd=XnxJ&3o<}yR1Ki*ozOhI@d4BVp_Rp1G((`hG!Tu
zb*#aD)g0|Vm@mA=<0LiYj13Ro?ZhSPPK#h9zA_|B$zf=~FkPLG4ht7SCM#W>$1y;=
z2@u@2`mxeAkViDdxS&E^igCkV28-{`x0-+jx-q10P0SHEF+Y_cP2U6uv;i{;up7l-
z-V0nOp#3-l5$AENjcdy;NYe(3?wZiRF*V@PY`{)bq_-dQ-1muic=A7*7D@uCo9yOi
zK<;9vjgPPmdNlxJ>QPOH=^yZk$^;?i!;n<RI0{=QCdn#NG0r{e7ro+xi}~5|j=Oum
zCH|$rYAJ*(x$~ngtClA(x^6ScbHm`kFsm}Otf@7rDV@Ss9KEG}k^D~c{DM%t&&803
zvS)zJ1nNnYc+8IXr)W7FfYE0VqT1`6Zxpgb@m2){ue*p!JKIaiifIN06dpGMy@Sdi
z#nL1@HEBjKN+<>F)wT5Ck$~AdKiYQym&K`mLdf9!8B2C5YVL>leSOIeDD+6d8!CB(
zQ@}iu_f8JA{S_i~G#9(b(KznfGx~bdO2c*D99K}F=f^=TA&YIK?w#<tskXh}Pqh8>
znF>q1`>@IOY;|PUJBNan9X{jXD{U1@ZoXQ6D;POcB#OnP>$qh^aNr%_MK-b8^D0iP
z-&}AM3P0KQXGxVVgMdUG=kkZA9txRpdUKArt+o+{izV}2Gg6P`QBi{znDL<1MB{(a
zx#44J@leY8f@iUpQy{<+WRO)oavtXPl{hiD?LxQli=Gy#Bu}A+9G|;u)W~H(*}+^Y
z5zh|v?xdcyd(oe2YW~_P0TUY#e{KjhW{RWSt-C|k&3G?YQbBGC(kv}utxD+E(uYtm
zBi_$hEGVQ!LtWH$XtVY9Y9KoTk&64??C+fIrF`zU_VJi^$*&Dx7E@GEQ;?vPL~=sc
zjglr8qxAU!Be{yfSxDMWAhIkvb8cMd!!nf!)@wpg*tOzJG|8~J^UK>1Nh{VPNSdXa
zPAR}7k|xWyiJOs6N<)EvujR3w<M|Ewyj?4l+_gj_!(O@~$7bT@UB$UGow)=iZ&7Xh
z&v%O^E8;Pc-bhUj%?=A8tV0N{LGDtmJ5=C1P9-c}#gxP~ri@PO?cD;#y?c4(dI)m1
zVv)kLzt-R>#b*q`ZPw0gZu-pTR~w~1%17O9XNx?hVC_S$a$58Y2PMYEOS)6W){LbH
z)==s2v&VLpF9pD^nCrR(Ffk#>O-k;rjsdLv&|@0<#lf5V#`(iJXB}z2@E+t+swdZz
zk#f!C*N^0kFgoYYxg`<xoMlL+tdcAGiQ0UesI0z6R_!5TJH0cfHy?w+Z6P(T{B|eN
zOF{0ujDsDXZAa%r@k)hW@=xt+HkYqG%<zIqPm45tOqh~rO{ZrZVkA=uyZ$11Oo@x?
zV6^b~Dy5v-x+OwbPQkg?=%ul<q8jhG*%1X`c(K238eOS+rsxTo5Zyj@<4E^Sn<I6~
zo`Abm;9x+OUOaV!-&3n*n5~b3X$qBw*(unlQ3(B5KRem#m(z)(c3qAefphk)O<xbH
zM6yf*ZKSkD`4TQEfG0uG#ZekiI^YZ_U4NqB5~`77z$y>b_!<$Ig+_mk`HT|KCRx0f
z==vp8Hi18q&MK!s?XB_ztJb+#tk;xVC&4mGz+=}oPM!TIr>nDVhvdh!$#UcPj6?4l
z=qSs286tJR5mhgXKSnz*WVZk5hLtgYOm-cDI>NF{vr8*(6AR^h!Yt7X=ir0wAlkid
zp`?FBSIS4TlYcg6s{y?cf2P0Tc}37+Pi((o)Dm<!zWMQ|6q+XLK*HQy1z1!}fb!`1
z*VMy3>{m`UuwxNqTwcBgP~jR)j2kDkykeZ=oL7)+!kkXxtH^u#V4DcAsKAEfkQNRL
z19S-Dz^_m*u~1clQu~hIQXi3o9*h!Ut+WLIZ;sBuu1KE^2!THptU*{=SCVZG5W358
z;1!JMrL{h*VKsq%^M_y1k~lms;=Odo;^JY~nH^ET7>dOTC}>qMuDV2BT~U!&0K5I*
zaat$_q2V>;)(DT2q&ll8hCHQ&^}zQ+6X6b-Z}y@1gO*3CQeG>JT!olu;!_&|`_jdJ
zYDNthKQQ6AbVpU%&y&|qKk7vPSeUIn4oz8)&xhw7ktBuE-a!->_^4DMDIYS(m_o5%
zEAAng-hmdRv@X(x<wN8&J(;BnnscRQe-+nJpGe1P9Y8nOh>J@b*H#LfglD;<#BJTz
zP7re%F5Kk7G#(Q$iU*wVsFGL+!kne!g`W%4zdD1dSe7mw<dwai8eZ7sfzjDSbU=5D
zbEOM-HH2AJL^q3o5v78t&{uDJQ)mn7Mw>3PkK`P7Lo2omKX>=grFwzIKk+vBJMBDR
zsr4=fm}FjsLV3w&C%@&~S8&jRa(|os5(2r&->~O@fy#iO0DvUF{{hYV?<PL9A%Lkz
zKIQEDd)15pzvw(zeHbR_e|!ZnnQvjjK)Fr-_FBNW0gz!pME|%KrvDHA1hBdv0Pp%=
z8CN4cqWr+m|C9mx*JcqPQ10)4U}gWk75}d(|2nz=8zhkV=N}lg*cU$9A~1&Uc@E6s
zhkY=PW>Tt5w`UZ`$1F$<NmM8N_)l#3;?3eD9<8b=_M~kZzzLRnNj(G^q2j@knhSL=
zPKZAur`jIJ+125n0hlI1Q5{c9YHVNqJ0=kaPZo4>N@>gAj}%Tkryh0cWA@RP-mVFr
zbYC@BNuqWx4Z_<8wzf(@&#MS>x#FyM(Z1nmk&WGex(=6{(QIJY6NsL0*(_7DqgX;d
z<{ZA(^LkaQ2QK|%cItN58-R`8+%*w9228H~0bEw+VTRY|5eG6xnuu_ol%=S0l7)kd
z(9pThpMy~b<l=sMW<^niI`iMEbsXn1fjt7fqs%~|_v3=>FVSbwI9G6%RFT+`Y<O_o
z{hmnZ4kczF>bh1l&W%Rk4**!1*wpZP7QDLAm=ofHigH}P9Xf3%53)|)e&-*np38F6
zgDU7xCC{(U6w&Y|ii)u1ykHIHKhSv)2AV&Pi@^2QFBqs!&6E$5Lv=PVqE+lH?5D*b
zY%q|kbMie7)@KMI<IdA4s4VB;ktebU`K<ANegp`8B+0iMiULpV#Iki!h<IYT$f%}}
zf~qFku82u0^7CmP$S=i!ZXkyCDnA)=UvSyGS|XJf1`K1eNGo>z4Q(apX3>=(<853`
zkH&tmkA&Z59vOD>o0O^coS{%pAdnZlVSxCBX7%vc=6{>vko<?#V5RhtFoEIBb^gf@
zLG|9WRf=MVtcR)RVrYHgHyE8$IaMiX-sb|n>x+7xe6V*0p1W~vlq)q-`w!`Zz@Q{S
zax`a52KUc>P2iWQ;qV*Tfv7YADA$<sG2<$Ay};}|PQ+p=rAd0w(j$@5m&@4o3T2aB
z|9B>O>N;d-QC7nIV44RtI_oEsN@76@rVTP%UTsm16iO6v-%WiK2dBk>9AQ$DXus2R
zf|szGj*I{`=Ff*`dwpt<-d{u!_^mIUQVc7ziSlVJvU%ze#o2<&;E&N7b+!EDXcnaa
z8cB$!nNpOi&$e#mZIc22qcbhovt6#2qIip-0SPJX7-)}&p>Byv)=%eA$x_84m&#C5
z^gHgVQ;mpz%DOIczS>tkIPzb*P%^cE{04G5W$8L-H>syi0>o~CJxvrc9mX$r_p`bi
zt&jQ+C#*a$PCo+cxFXn6`@cSy9&3^mW|#*GC<q9Y)YpH^iI5DpHMAZ0n=hvlU<gM4
z2>t0{KPVOseo9>Z`u1FblTONLgW9%GeptN8J)RuDpb!PVV@xX6+aYuqTVse{d*QB-
ziI9OjZxdOoOd_|bvK5-r4sRH@PtG@}cAtM8AQz#_Q#NF+?Zo#Og=9~>(r3Q(iU+>8
ztSi3imYti4zas^fc^Hyn;0GXN{yBsdv7i*MB#fHust$adzk?YD1X$0fjxoo^hpZL<
z$vagvUlx~gO-9yVq@D&Xj=JOei>(^JSdwn=r<BPGJAjHjs}vp=yc9$RxQK-9+$(ZZ
z)Lln{i97TP-We&LL>W{3Gk)U;TSfahz&&Zl*eOzqE7=$Nmn+?lb5Q`BeOyRJ_c7hf
z0*HcA-ZwjzmE?GFnA|e@-`<JZ7P?c@TYDWn!{2eIfAlO06yVTnMl9FG$un6#pj(x`
zvf0wO_Oxn2)k=q_nTNsRkS;9z>s3i(Dtq$FX*tgx*y4?_W{@HyMwul*K`+Xt(<=N#
zaQxk?>Dpx}xKO7lOn`<kSV2<GXB&w=lx9mFvIUf}RTH3JCZf8iV!gmnDh{}s!lKg|
z6>%^{aA9$IH(Y>}pc;ON-VoRgy0fHa2cHugoH25CR<PzvvxqnAWWRhe*-FV({~SBK
zU8QLX@kJTHT{swYStcS{V-*Y<7HS?A*2we(EL!#-y8gLjd7_{c^|BDV!Q(=wZa+>Z
z)RuEU37q`DNIR$CO5bkVub3ToY`bIIwrwXJ+qP|YY}>YN+a2fRzrSyz>g=0S=kBd{
z&1bIXYE}K#oMVihLIVM0lA@sAl0S%Xau4(ai>(j<guJy63V9%fPu=)SAx+amisp+J
zljp~ScrV8gAnGBfXC=Kcu!XFRmnj6IZ38HwiyGp>hpTh2ljVsx*QiNVogFEPJZcS9
z2Yd(AvG4V&0^j-JGUgsVjB|rZZ+5Chb=h({n~}%r?*Q)%6Kw@pf)t!8X+~r;#nn&v
zTtyBWiCspKEk&;5p*U8Dw0G7p7n812j}1da)X%3B4a%AYM=r}5AI3`**qZ)K(Qm77
zZXWRInQ~U1BFyt!x)_*lpo47mj%$|k8Ue@rx!)d<eJ<jmlY+Wy!I?g|7%1AWcnq9Q
zig1s)LvYOkpmD~Wi(l~(>>^rb#tsg34GpI!Y`T{klSxS@eyQHSw+Pyr6_J~o_Kl{+
zuvpYAtbnZ%{{+<BeClPm{n}qD1d+OP8a|Or+#(y>kheG6Rrt()#-iRUUfJc)ZJ9GM
zZb!9R%1Z9&ACIWoE&-J&O$*Ytt}PoT>BKx@D93Y_&J21&TK)<R>;BXlaW2s$UxX|+
zT}HZJ(jw|3_5Lfc^;i@-wN$Z8pCqczhK^SNwV*Emzsq#H;I{LWNcA)`omb4Veq9||
zL~#_*ch@%(#6Uz@8UNsyvz;;wbRsnjfYUx?ov$Q^oeIoU-GDlN;`azMp#1PrGQ$qh
z9yL|+sG~_Ruqix6Ryr&ZXlBju0@^}{SX{AX!4*p)MR_bW64;^i6+xj>WKK51?S;kQ
z(B<pLC}31bP&BHK-gfT%SOxhiF;#fzo1tdk)Zo@q72~YAnA3=44bQe**BjI&!tInh
zOzZ}AeV-IDv*r6@s#Y#W2qIJYvqn4QB9H@xg43#(A@Mt7usoIbsTg}1ffe!kn)zWH
zLrApDI#EvtRD3BqMm;X4jR%o=?*~&;88_I21o@Vx1d=DVQ<kqyli6>mk~BMcZeE;n
zNh{LWg%*st{cMP~ssd(zl-p$xYB*vxQA3n<ev;XCEr*;Vnw~SYrj28W_!4Idglc}a
z6XJ4hSr5#%Yt=Ttq&u!knEvdBft>zakB*rGYpCd{#-kdz8l&?fC=Yf8f1@4c@MF<{
z{C31iu&@Ji@El+K3=*535NkP$%L(O6n~}5C_o|TdF|N<relb_yYWG~IHjD;?A4+hO
zessxJf^QLj#fYm;!EfYw-mZkFw{0csi0k2B*$&F}v4r*9$V=M@Lj<JOwkZ-8GScXK
zyPWNPP$#r4E|Q9UNyn7u{!n5){lc0yU9|G+N1nm*o0<Q+9Sh0Nvxi5n5i@j1zr;o0
zA}p!Ipqwt7F!v}7Gj}s7f>b%^=|SD2l;;{YN??n%vS_}ikMDYC2_6?;l%HLALtF0v
zy0vy!&GjK#W7)}_!0=j+e&{JSe7*861|_98WoV~{nXciaco^es6%4H|eZ1GPT$B{c
zvx=qnvWhFl7_fHlUpnkikfakcG9ycNpS$?3P7<;`hp&Bw!>}^nO4`;tb(-Or<$aw0
zDe|M3<i};atFyc{i8(_ShFJ{Nv;pPv796XZOv(~)O&m;48hH=bs2x^;OY^76OE{<W
zuk8dM8{XygP*=2LIUUqg4^nK59!kEz8f-v?#Wo2l17dFu_;DIlcStZSQ`H`47k-u3
zXShYsuc17us-ag>_lMEnu#rfsyBezkU^JE556YTTZbuG!0nVN>P3lq3?|?G(#~suS
zo)~dxy;3eJmENMo`OiQ&(;u<%2PvNl1?ZJLc|USzprlp<8lL7uuPEzkU_ERI*-x}j
zPHHj>M`QS?I3p_UWXP{9*;v!+OQ8>+cYunebM6IJr5QRVwH#5b#3=#76HV%hJyHvV
zK$qB`lUE4<mCzl}8UrT_icem_h|PQz!Vo2Z#{_p2Vys{*SAin;3!90E3S)TCvJ%XR
zgO|jahrs2XO8#Ii@qq+5tisn-TI{~=W?y?uw)|{>0EjTimyu$E@e<BX)z;}ypioh@
z65G}ZLriu_jeR9B2Xeia<}4NcLz6g#n1IJo74e@0&a64;<CUi7MjWa88mHG^lLx~(
zV0{N+x%n<UfA7DgoPj6`NYUTH>PO(IIQceaBV`!o^d}SC?Pwb*=1*^v%PIjA`a#Gd
zRC9+U(MnFUN3S<?j(f!+iZ^gZ-6C|p#<df4*jxT1?VzAn{alC&Dj2COf?xrVp%)D8
z9vl+00lLc1c;3AwstVEol>RW2c7eXXD^MIwdX7IDz(|=u%ET*i%~`@83#3Etr!i}L
zi1WP9`?UknT8`PWi*O#xC?RI?pbh`Lt&(JN!328`TYkzUc*^S+he8*x5GkQO4|1VF
zArf5jar=#um4>dO4ETi2hX($GGK%~;tN#}503hVRs91>bZ<YB?4M0c!7byBh8#D4A
zK!=4to*_J54**yo4C;!8cDW`t4<Fzqxt{vZ84!hkk=FA+qy<Ft&nqv!|GnAwN31=7
zUqG(_`|k>{o$KIdApid?1?T?m^G#Z>|DUAwz@PE;U!;ZS`3`J-6eyPtq3Zex71>*@
zh-J?X&^+me-DWS6Drq6LdCJ2@QLefzq`_`6B0(Uqeq5~XEyQndoW?$DXu2C{__aUP
z^(y3sdppJA*a9Sn9q;Jm`xYzj%xgw`R#cytW^@iC!f$liN3mynXF7%Z5El}wqfrTx
z-){)NEBTC?$|wDrVIZJw1hqkjaF}_Jrnzt(l)sSC7bVED-t1Y;9zI3q6ttWMJ6By?
zwB#<#^JR<aa92*;CW<48sj{znTAS;6wHZKW3;o(1rLc?+bNM_5C0jSKtKB_%RH$O8
zN){}4U$I|wR!|S$g5OPo=ir$l(jmu8$YL-J!FzCCY5<>0)wl~&#Os6RQG!D%?6xZV
zDZDF~*)Yg0lz%bSseFF#e=wI3ty|0KcP0;wIt#O<Dcgc@bhr)T6QbzS?HV{z1pJ~2
zt^Yt@Hkn+Sb<(lRjO$q>OhkyK1Pv`?9Z{1GWlTP{t;^Szn7T-}=LxcbT!p#uTD7`B
zlrNh<c^!C$7))Ns0tP8bG<<IQ>&EyyDmUJ!?~Us*+wEc?M>Oqk$mU09MA&_B6xf1r
zfI2bcCBB~csK#?(T_F@QgC$ISec>#pr-A9@K8nc`D-!&VCX(eXO2c@pSl2rb8J``B
zJ4>AOPU0xE(}b>pZrM!F<&queP(KLz4$0^Gjq+cWOzm>M?CcsxU1#Z2cBWcUeIl{g
zVwJ%dZqy^wNVDAUtjKo&1ZU*1O$&$|jsvBo)YiL!mxJ@S8CL3fBprXB%H<sK!?`Is
z5s+WCy2mqCJY?<$!2vgD1!O$ng4_MYK7Fpf6<^qUp|wC{6AM_jzo(GwNKm1muwi;0
zq>bNbzx>_ybR|+QyNW)wqVSW|DEliY!?I!;fGnyFP`RFpmn{<R{!}#ype_-#F)B>5
za|=Bu;%!6#881OA@38p<m98hQ7^K9MgvTj%#pl5;=aRT@+uG&LmWk~h`;2z-LQ~ho
zR>J{)?yOXg@K=+9=$Ic%1CDos&$X9Wfwi+UMmZ)S$h~5yT#T;OJ#@j$0y^(WRq8Vr
zDrI*Uq#h9$q||I&u;2GySXcXI2jn5R6k>dH6unZ$4?jpe%T_;=sv5IeuZ?@aHMtxu
ziZT^T>j$XF$H-5sjV63thV$m=CD*vr1HjYD4U2KvTZgtqjJO3l_`HvEz+;YL*2a&X
z7N9@!)zkE}7^opN4X<`9t2NK0+py6}P;T}tUPj%$Q{>dH7sD3hAiTNBrV7a1O{S`k
z*NF#6Zl<8%CvkiNHu@=Qb%ZqBdlL4QAdaj;>(D@#lr_?)Brf+CDvIyWdel8F=7}Q)
zhDd8RO|6t=+|EJDBmaWeco#FqMR)qMGqYYeVYUxMJ;wv18;ac@FD*?&aIBcVT1!ch
z#U4$nNC;?I&1-OquHl;+nBYfhgwm?h@WSI_1;ZnWDrtT1>z*{*G&sLF2P28K7AU;Z
zh8x4^BjlL@QTu!zW8s{R^@`c6*Ln{xgi)PLoV>vNrLr)xfqy5H`-D?^Pcdcu1r#$;
z_)Gl0E!TKGEXn<D2(y@5dh2I!%5{Z2CW)kX*znvi!HDp{$!8UnvE^V<q(H&b6aJat
z3%lLsr~keDt*^_zp-l4JDT=Id-Eznm?t+#}ateY$be)=rwDjFXc81Dop>>HcLv?iR
z&!i7sU7a{Oi;y$#BiB|TUK>wO-;9@!TN-(A7LOSJeZ8^x6rKPKp^)p9dfcyCv+Z0O
zy*sqL&X|7g`v+yn?Vm0;Vuj^1y!&=M5n8iZRIXXw@Y3Jzh~UbNtzX3J&y6FP+7GE)
z5G#>WCfz`b=BS7}H<#bh7n_+VwQz<Vf!qvAjPuoa1vgT`zeY;8S8wCTg&&G#**l6h
z*d<#Q`R)9mC9M+Di!63yn%XGW9W0C_b%PWwD?it*Ap6OCO8br2I7VM8o$yDIHtcy5
z$=w@D;~Tc^`<Xe+lGZaZV2PyO7MV$BF<8Nbs0mu3;tFU`;~xF^U7dOpYGlsBU&6PI
z>ZaA1-$vJNvG)aAV}qlpKvGX^fxmcZ&Z+H7kX^ua^0Q5-OyOVKA=@)sQjOWxGhu{>
zGZdPj%{QllI((VuROwnIq{y#kNzCz3zt;r@O3Ye%D!w>Ca?>9&rrp1;m~5XEGrQQ(
z5=ThGjY(f!Fh~}Ikqf(h=<$Xd#dY*NlB(z&OAwwkb9N8ui8R%VE}Z&VTWzsBHP;CG
zIS}m73Y`Sr4;z=UTw8tu;j5Ucl*AFM_*>?mA#E3%FYeB%%!RD4`x&f@RmVq=S1yJ5
z5g$6e<QWUha*y}Hzr6KsL`Fv&P`xcq;|_|Fy4%S_e!eCTmNiFXxnz-#E21vY!^nRG
z)DH!Ew0y90iyxbPpe!7_c49_Zxl0$h5TiXZgg}wh^r6MpPu>iD09}i^Sje*YIlH3<
z4U}R&sn5rh>js{+By#5`KV+rsAEhFSw7*<d`)PE`tf`>9y$$bI<+W3x%lHbnVu%uE
z^g_Ai$*ENh4U?lLm>J+K1%bVxEs{)U1?5TGxC!WwZ;VY9gwsY_@gyfya2)Yv2BLka
z^lw_&iXF*UmY(+n7vP>82yC%`Er%<ck<*{kxV~7zOH6fqS*3LuPpa4(xFDpYxQjL@
z`^(1jb|VRZg^IuV5<@H8@9;=c=Z19rt*l&Z$)($3=Rf&{hI-IJUGGBsVcTK6oOI?=
zPnlAv$oyC9x+e>c_w{Bd>VkNvx^&3zBdj%s&av>!t-AxE6)Yv*a(<K`jT&M}7eG{K
zuCilKf1j?wBHB=JhTXY(rXBD9s51@>ja+HH=C-T7TgGi)%E5Y~&Y!p6C_60jws~gP
z^d68k`wT&4qnEt9sOMjjGy+Ef#kG0{;z4HTEP`G-N;-=s*0ro%+1U9mrI$S9pb5VV
zbBD97)zyQASVhBisKW#65t$ktZ%1XT7q321AHy}Wcj}`c3tJR?1!yk<wvr~i4oo<Z
zGbsL|YjSo87oIUi&QxTVcFkE^jW4WH@P#`-0&@W6MNfEn!Y9g|nVWI4zuZ6|B11}X
z7TT1E6stRv`=y(^2Itmw#MNf3cW{6(Rs1To3&P-yZ^kYbPm74P2pUkkL@}IQiIX&H
z4=--;#A1t9zjvbubBQbAKHi_vVm>H1>c>8KkDslaMD|rgis5T>fi#K(Nq`94NQi+!
zQ!2z6Ih>$fwpb}~-yV3kbzl~Pm13EF=FbrRm^t7(zg74qid>tT#RU584Rj@0WicP$
z9;}%ukYTkk!d_nt5o6EbjR>9rD$K;ls5gXC>P)l*=-&v~_8V&wcHvhshVu-a#=3h_
z9c3Xv2~4Oy=kC1crt$C7c7bbK&jLjP9~pNcH(!T@%1Mx>!wr8&xtKrkBmlSSG-~{P
zk`Sm!70X6{5g&kTlITk<D$rOb7IUVb*cC>a78N}yRpImGIo3D`nD%A1&0BcrzCk`Q
zVjyH?<-9!2hz*DC?>JIRU8b#+E=(MKTAeSfy!P+n)r%#6$97^Q1ZB3A8Q!U|d~biz
z*o;I&E(-Niwd*a!l4_miREXRGSc0SJAeM}G^iP&T=oPXAhUARQk|3e9+6L{K+7zGQ
z{7#c@fNl~oKWRrA_MK_ZP7*TV8cuv<){OKPHlHbQE7R3B$;Mx6)^KXTWZ_C_X2-VO
zK0%ixckn%vG9$^nX_!ryd9Fc^WR=$Kl^)cFl=tNM5KDxU6D9(RfFqc$qkCMPdp1`w
z2iXz_6GH}EO>XifL(F3vRc?Fp(=0x)1eK$k#|7=?9|HRHklRlVRJepvfv`fNkkH0+
z6r>7Z+%M_N3`yMQ^nObd%7=2-*5XM6_h?}XTQ=&b@gp?mknit9dPm_Y7HGz>*CSK)
z6~PeoXPZM56L|QQy%(JXuvijB+mZB^(5j$lRYozA-q#N~Qm1kj$8?oN;XW^fPB0Dp
z4goLisSGTjeB<A`t#hc?q5sQ7Ed^p3&e1Ce$7BzMPnRx#|40qn8W)2ttSOYFai0CD
zax|d<>)x0s+QC4VRG1+nE-eW+_*_wcDoGgS_rwEQOWp^E_8JQJW5QVm25hg|oExZw
zF>?|!fqQ1uGp@^WRAt>*YeXBz%K+X|17w+}(`=|!9T+N#1<cJ<1yLwYig{RP=7a{`
zzm(DO1+UK<L;b2sZScIB_%wTXy{-ZLug;|g+^qZ#`(2PjKExvqvbGSxe*L_)YvmHG
z4}&L8D>0L&_jB}wFdK_jI`gCuNw6IKxd&c=qH)QoNBI=q`yM#O(i4XW*(Ln;*#>CL
zbmWi-$(BxSnN9K~lrTX&wkdIemj$I~E0MJ?K<&}t<CsG}@8a23-|iDFeMKqlBj+yT
zq%Px`5V8{G5g$n8&o?@$@@M1xi|jD-{891G3IIU<z{ngHQZ=Ez1is(?Z47c|c+ub7
z^<T?#dcGQxLDX`-h!pXN@=N7U4txN(k-XV96mj@(eUsexneTnU;qTVcK-paXwq^*<
zK*T`2A;pJ~<M0JQ!~y`()Q*QSuK!W{U!6UuLCpR+tXH}7J%kgcNBG`Dq{{u*Hv^-7
zH~jW`;Q4>TJP>g5|8a2$DFEQd8-F^{e{<gcPf)}OSXlVT<JSJ{^iYfrAhS~1Jlx2_
zIH47kU<E3%#|}5QK6@&>5vh)dXyi%wZqn4AMxC~B&c@2zxrT>%-=Fxnkf>#AkrY3P
zO-886T49~9mZ3$Y0n;g3(8b7sY|zX-Z&l5|Nr;$>Rt!EZZ?sf-+`CHX@DFtS`m<6I
zUrQNACb4j`{p@!X@6a9vObYdgMc5>W#ZFFlrB%_jdvw9XWP%tKb4OY!onQw-$PIR2
z7~AuI;mKHtZsh*h?BcacH__HJD*+>@mhq@=h^g;WR_?9DrIXDM6fCnI;~S;Tb#5aD
z7tKm^w9TTN+g~djg5YeqJJb0kKAOP8-PM2m7~t)WMLqk_hB9NQ0`)Vh`b7qJ8KlD8
zQAjO=Yhu3Ge6nVSFE=^tGR_0@{iXf%&$kgYwkvZD5*Fe(GrDof!;O*t1V)acDbfs`
z4oq~n^pK!31>HK(bthqE1_5E-O3c89{~&S=9i5Og`x)Km7T)93yOJ;l)!Kaa;{~?x
z<$H0e?(XVX*%{7V@}vk)b79qpBqx2<_UOpG4_oykM3<K1zE~cN=V)rvgV|;Y@St`a
zBka6A%TH!Qqg`<WAW>oaAg{W2rn%5lB!l#x6{nsyQj~RuN1p*B1o4)pjcsiauY1y;
zXW=#eP=Rsu7_qzsk@e^Nu~yU<jD>jMqsd8ufN$vsYO`3cOXjZcW3g9QTA&e7o-iHb
z7x1~p598*sNb7rJ-E=!RAG3vWv@$c~<aPVz<YL9Q9?@C(u99q@Yv2gfiWkj1CNEg&
zbZ3{5#Ax~_vs{&_&ZswqH1-Of1;(Vg8X}>;XpPc;XMInS?+2toAFhjdLwVNRdXpUt
zJlMcJQE~INLe?ZqgnkazGlKBGP#9HJV&{RSFqEEw^1k{4eC-1FwBSa>O3HO-_(Tm_
z#%AiOR&j9eyk^N5uQU0JNps=$2ciXAFK92#?unRfkDxVxEd+C{A9N{w)Jq_kDym?e
zcC70n&~AA)i&sS40??<0rnf*_L-nSDm}M^idTs9;?wsL#Mrn`^i6*9Mf9&HUJ(&<-
zM&>zkY_R02j($e=ylgxhOfDAQNBf*dYDNOf*tINsFZN03*gH<OrYtxg6VC$?E{DnD
zTwKQ{P&}f6_uexN?O~dZTx#ileE*QY;D>~;=?i;$b$lh0Eu%Q&Rf~T6wZ5sX#)rD{
zUN<;M$UVyXvd|dUy?J?Ndw;8-m>n#4)u*joK6Y4V8vS1w8p<Y&Uwx_;@C`=!FJsiP
zip?6<OE<+|8vq_(F_DmH*GD~19PcQ%fr>no%|?^681MpjWZI+9@$C1>Ebh1UlImYV
zN>EPw3J=DOdm-6*OZP*Ok$AQ?&AWh<QB`0W;nxAg#3va0QM6W5_ZjBHkI<;CbaU9c
zKj*=|8kwxg<gC=Jb~YYzfY)d9^l3E0FjV0<b0Y4<fGStOVPJf`_Y`L3uRmc^bGWU4
zy{$QtD=w^R?Ad)dri#@kTAll@4RJ{H%RN12ajD1}RA-^b&2jdbe#=m(fi`>?O91;;
zHd?=|7Y;#jP5MEIfkT+asQcWGjEaOX&?bw;STw&;U~TpPEIO~9qC`VH8Tty<4`6ye
zDz$_40V!}ubcISAuEL0Z)rM_DH0|Jt64mzRU?A12HF9ND*U_8wS757o-Pr5dAc)Zh
z*E?CPd1#G~6u{gBW09<iV&0bK<prLDU>lUF)jBRq6inGB8%I=6(QpgUWJ_;}ZU$AV
zcO8#aY8dPgZ(z7mGe8HihOgLkU3=gmGCgbRh`Hl>{ferDn`T|*%ID0^9eusVX@z?u
z)O*shenSZRSvwf?!JTp0<?N^|igstpJYQAp|J;`e2%|mu;%q6Q3CQbF+aKRg7-X3>
z><Z`qTQT5^Y*d3lo%7ffaqCY^sTcx<I~9=V>L`8m`hH<}<32sD1ol&BLzDcKy`1L+
zK4(sjSLyS&wE_bl|IuSRTOuIYc|h9VtKR7<*vYgI0f4yRU206*$|gZ=f*lsV!~W|x
zyyA?+t=l9D6koB{m%vA^Jq_!{KDptHS8>!R;?$)f@%d<)<?m<kJ$UPNt8(QzFU+}_
zPj+Ew%_xoe7_#;m5zFWu!Rb;N?huhVU@c<CP(si}-ASx6zTx>bfmfo@^&VMrAj=fr
zu`P)Ns}E%SEnOd?ZASMOf65$;I#;#Hz#hW_1ACW4-KT@Wfz{C@ItMih=yPq?-l$!l
zXlWIOgnd(}!5zQYSvs`{1Ui*=+}yC6a>~8wRt1Wr&rm2jVE3tXiSw|yio(XG6H=k;
zCh4?vKBSLict`HsYt)N&>?WVuh?+u2vcT1cI?YrYk7EnP{T*tUzk)I7)VG-Vl<$O$
z#}vQ!!{J*f&yo+g6sVxw=NgdI%F*s_pzTI}xW*O63i?BhY)b5noh=4f(X){Sj1ujX
zf`ziNo`ReE-JRfm9XcDx-x>8zHdli+?fBYqWc~<!8Yv&#wOJKrnG)_x^UMSj?XOUd
z;0CLsX46p>9Ou2RLa?)J5Qq2G=eD#`=1GbOzte!cDKeI5+;KW!PO@nX2YDZWL0;69
z{L~nv73|6@?IirPsZs@)sPcd7^gPpuTiEd(nE@mS0a+0P?zz?DZU6*S_o(7aL2)xR
z1XX`{_4(jlENC*5oTqoY2+#*KVa19vua~C!F(k2^>WsK$3uYgA3IP|gAF{{SDoY<P
z(#Phc^3Owr-PEM8G_UpvO}^Ve9=9^o#(2?VM$oEG;f7=-mH5S54f+@O=QLHnbI!r1
z`%|$NF@MELutvos2K;2`hx==ZwZXAR{KH95;PQ06Azw)!V}jp6cjV2D@Fg!N2{C9N
z&)xt71Y9Ope>gQ?fSlTLbhC#Z{07W>sP9UVpEGz!W^}&|7d}3r6eOx}#_q85$%2;W
zk~oPVm2axaO%r~*d!@T!p%YI5bM4^yhQ24|Fat=vVdni&{WwtL>9|Z)z!y1$?y4<O
zP+Hc4SsDH5d!!OG_y&%yLuxMcVF!6KfU@M<VIdOU?Oy!oeaV_qL8qABaESlnZcBrC
z4er(~6S23OeT`NK+L=xP9$>pp#O&$F)6mLPjv%31BTmMp8CNG2N6!!mIvB(Rcn^GK
z?PGON889Q&<%>JN0^(6C>M8-Cm*10c>g3NtM#;_42SlnmhJN@lDKiIcOTZVW_vfmt
z9k}S+k`528n_dVtzRC|#>;5TQG7YNwA@>7QfQi%O;7w(E)9s*PFP8c%S1`8k!N6>r
zkPHc#FBtl4#U~*e+aPyrz`m$H$PDz(LSdrIJwRo+Z1XR`(D?}G(<1Ap^<t6!m2VLK
zAyd))ps%CW1azTC(oZG~;l0usw5YC#sCu8sAAn(IRhtq9o5pYXr^)Mdt?S<0trYLG
zlKkmU%M#_{+|oi&=v`hYLItWsbTdB8)~2l;3cXyv4#Od`PqsIo!w$HTmO&*Zk@Wl^
z&+A|ruwP#<{|SPVyz_yKa^PPm%1z+(EIMOVbRO<QbAAgW-#PC9rDVpR^oOJj{dNj<
z>}5}D!k$?^epP%A9kd4K?~Gd8&9g)}o;zjX-$AtXqVrB>dOr0lj`DDG`i(r}whiVa
zmesehVVu_4G4N1==J1I!QbIvxU293)N-sB{F<o#gku64bCK20yCFxegPOAm@FL({x
zNTfu&H8=IN4(fK4wO2D!C>E}*A`SC;gT2`p_+gf(BHYNMdQE#Z+Hb!^4xPaf%lR<{
zFwsajxq={nJhcj$;#Xm{edfm1K?lS79=Ol28L%L8*XFUU$&d;hnG=#LcO4YKj@Kq9
z=HtQj%xVbYXiBp91X-KutGwiq4>~1l>LZDUj7uF?NRxOy>(s%__rYs)crc#WRRB%S
zImJftB+N1&ZEqTp@E=};!O)I1Ys@f>A^d`#X{4S+NY)iRm<^ROW^3X{DTI%eO5NpO
z_0`NPhhIRvgHy`c2#LOAFJR1-vZ@k{q@b)A*fu@~es1!%WJD<y&5l~CAFXSW5Px<A
zt`}+*NPK4nwDa|JwBhE3$j(KfL*$^v_L?eaHmC==X4^`#I?kNfO3y)~(qRvf6MV+p
z$}6#iCMSt%!P4qwF5;8prdk7U=^K{b813q-TksgKU+oXXWHQDTVM>6R&3$qN3whI4
z$|HfGh^v>2z!B{Q0DF;vMrm9>k@a7TR<ZRrph*GC2!2&k2(!I0ZF~BtF$$Zx!mfqB
zOsbKh`T*mNH5%rd?RZA2oBBo`Pj}=mo(zN90NiB06s9V)=Qe7&2*)9T?A?alI`IYk
z#SlhCg~WPy+UuOnowy3p3-@-vicPJhd#Fq9?rB-Y<L<pirD>+rD9h9yMil&^dLo*Y
zB_E5-1;|~_%5R{IaNrDW)n?w9QyckXKaYESoa|kpuI7_9*<n3H6$9?(Jdi)O{mGS|
z-OuA9xu}0mag<izsup9eSa9feKpL^#8!~j*Ox^Spa_TRjC{uR@CG>cW-6&QC<hV(|
zXo%gh6`F#)Rd21E1N9B6uS8j~w-jrbLf^#`*UUI}FiA#BOHJzNg40%HC*PZL7kOE`
zeXCM+P*BH-6=umqxyz!_&-^25c9mL%ANp&m6Sk(MLMt+~TR7HdkHCLlBl#J;A0Pm2
z{dF(A(=!1oW>Ok2Na1ItR17U3mxQ>03vI<lNc-~<>#U-P?YVg|u>&nenz>|a<#(=W
zX#&@(=(a12_>GY2{Mr2f!d=umXdH(&8bv~bpXqeIw8eWCWY<04)`0&^7}3S}05$(6
zM<G7Iux~2>JYdl^a>h?7)E7tzOnv9jgMt!FSb^a`@iNBuySXG#w%&gLFL*3xt`kHB
zkP-k`0q`G83&2MB&(i+_>F<a1e_px)*M%wvRMZO7`#%1=i1vHw^jpi8ZSZg01wxo4
z`rpp~&tCu6GepBT?|%Htx%wX?UePZM8T2I<euWw4veZ&eqPHaqq9`Db6?qVi0G{%h
z-$!<QL2Y8v-3eTkI;t~z0*Y(>0Rgkk1w}=kFL$9nVuc=rt=^HGV<W&=rBTSaZh}EX
zsVq)um{h)+k5IN?L7&8DnTFK5BQ$3tRBQVptXv3Zv43rZl=RVhsCK1%c<85B9aB$s
zjy^jM|KJ5S??6j416Flx#(A0Fs7Tu_NhM%jmRCApb1Id1BF;34h%$^*Iz~`IG>GMl
zk~DeH5d1-um{k@hXOfC67PghtLc6S(8GOpx-^D250Ov7BKNk$5^|Rtb{<eTr%*?N}
zYa^rm86ZQ#?tE@z$3m!cT%a&TeJpCAJ&Md#LcENw1DwY9wEH&FrFveme*5%1jhGb)
zsXk+TjjJ{+v9wSX9C!Gg@286+hz=xAOo<AT1#?|nO&pV-)83Wz$@^$Tia;!kkt+E_
z;k2}q`x)1Wept4mnMH^Eh=B93@3qSey2M14KiX+Zu`pN!8ab=j8~+8|bW32g33+*b
z_&~&*9}6W4iesnujx6h?hqZ6qV!5^=X3{|6fL79(>F^_yY)by!u%=iubAkg6G7WP%
zfAdW!tZL#1BR`4DS)b!cQW}-+h}yorhX0x{zPi#EvSnzzA{K()w7u#O4}UFM3wKcJ
zdAC^&hF=K;nN}%~yPpo@aidQtj|1c*L^n-yS?SKuIVLe1s9uk!cgRPii^QrldC3-%
z?hf#2Ky6PwF}<1Mw%=WzZd>|LvMX2R;FLEm-+U)T4!U=8vS;!lN8?8myRYZZ5{#T>
zuJrI}jG{ZAqnsLCW)d(esC`!a4t?~yE8!1<>@g*y_JM56l}SN5h7vH1`b<uUMd8)u
zy+dRTxe?p2pf;Kdg2y(Ur(o_W9|wuwrW9;=0lHP8$Zm@XGdxMr>YK9rqaCXx+u)&3
zB_d_erlYNThh8=Knh7}~&*z4C=^><`f9L@pHPRKEky~A;8X0?+1qG+ki5t!(D6$s=
z%R4pKVotN;K~&}07o){k2#LSMlQT^&-Gr1^*R<Bmu<Q=rztdT;in0=oHldXUdeb9{
ziu?u@5RB1(x7X~J5~6f#-9}l@SUcq~g_e|fn2_gB0DENRpWW7XQ!`JA&V^V0Ew!t4
zMK$fWbwAW+OrNMQOL1r0kLuIld!4ZUO1JYd*?vNtMn{gA@Y6d)-M~-3Wh*eI=9~!}
z9e45}b_*pp3wamF#~u&&1{#gERhuN$0kE!XvrERMK=2(Br#Q{f)&_?<%a}ASCMc0B
zKl#a^!+xcuxf`V1$Q9_rDQw^R{uq2R@}=}MWJ>=nP99IcY*9`^CQZTM`xWau70eF0
zWo(UfU!$5@H>#lZ7b9e^WULMBhhu4L2;8ijv{du2BFAC649a5f6y=P`>c{i@mN_cu
z@eq|JH3g%^u<jvwZL^t>A97?#F2)Q?Ld{b2<)6z3%bn6!yRz%B3=?`hDV#8dE=+D|
z_&U&he?znCCA^84i4*5;!Y2u+i7ESel@_ysJ6o(H+Wv^l4k9>S2GClfm8^f|zZzCL
z8EY{NBkT@<IwxunnZC&fw(D44sXL_M-nZt$6WXgyO1C8F)C-n`Z&>dSjw8wSwV#q(
zBJD>McM26BqkFnH_M}}o+N{onAO@6A<J<?+s^M}&{KDLMDl^v{#w`PtG45o}Tnb(z
z97ZJu7T@W(yPOPXs_nm%>mdTjdRw3UF)!Sn;YypNQJt#}-oh-O5o_6v)2!3(z|2xI
zT|U$-iF>M+zOwT?a_fSqz4y$;0w-a_40y5%!0p*1IzI*XmfVyZy;MWSE)&Mlg%(ds
z<<C<WMK2Iwbgp~D6!t6Fo^woscz!~0J#SQIrNed;2HHNb($+wrP5hZ@Bo|w58XM@}
zJ+!GA3lr*@Mtwas{up~6Ys5=<N^I;2!z3<%UGhT8XlC<43U}V20n}UELcssC|N5?+
zsetZ}gl2CMh{1)LV|-6ir?>d(wOp31a~vm49+AFh)<nq*m<F88w<_wx&CbltoK+oS
zp#q>od}^Ss(le|ht&oTFny$gocKn-a0Ama&wNfATj?_{|n*NND+#4nt10gqh64H#{
z)A;VXjY5Ct(r|gposT(s`h$QN#V8Le_ZB+`+&IMT7|RM5k$>DleRmhm1|a4(bO5!w
z?8r(#NB1Ux=So+cS8R5UIE~HV_4tHKP%lJZ_ZC`SE`1ZMj5Wz4Vr>J_7}hJc)!UT`
z!|D*fqG6_dmbkDwy7dB5NM0n<c6#fb5YrEYh#Ajdzkm+41V|C<xImuHL5=X?1};~1
z{+azE;qF9}65oDdpD`tF9Bg5$?HMq<zj5f3((<W)lV+AtU|J$x9Ud<(<2X1U7!u}4
zcpJnK2u5OA)ZY<cl@PG;Ju0ds8Kwx{D+2xuYP%o@lI}5i_!Om6c|!;g&x7)0?ihuD
zeWS3hqrKxNpf_U)#}?gfY2Kw7qA<DrLJ{%x3Xs@QtkUnD+%eTs%^JwbNLJ6*y_m91
zfY*Cu#n7@Zhg^)~mHvZob&;o9WhP=|=|>r@08OM=r>s8pzQAk@jzK?Zf3B2_y|BLg
zoS6=p?Os2;5NNN+lfU(X^s6B#0k|MPwEqljL5sRTEz?E7jZpU~4BZvupdZ#LUAo1@
zT@CF{GEsJ94if+wp^@(Dp4q)Qm^)7O4kxd6xR4@_T&2@1j!PL^-W?+DX$CRYkyT0;
z@Pm3h05ss5GB1hR?j0Q7Tm;<OA;)6_bfUKvt$lz{5X!66rs+8n7|M3}w|n}<DR!bc
zP}yT=q>fG4Y{{>Nt3g~s1gXHg^3H^AS^k?4@<%}gQK2bf48i>zM*$AMYY#r){LQQL
zjGeWGS2Y*y%-LNnQGom1(OIm8`rbu8iaag;p&cpptIE~SV}CR%Wyj0n{SV>MII5Mq
z32_ld)(=wqx4nSoYe5<;X@)<H3-YFH7IE-_Yav=ee7uI^rbV98t)YVX!exnZ(4X<Q
zCtp2%Q1Ng<k-mky0<*mltDH?fO*jX#bNcVurU)#Z?#>Jil!tHlf-0<3{bG2*cz?c5
zM1^Lj+HjDI_`#46!xE<|IW4i6qNZq1Ur9)45<I*{I<0G5?FUf;GHv=?D{snVLU=8C
zWX)wS-^wZrcfz8ky#!{d(fNsnYsZv5w8K|Y64~7*iNGo%QWQc1l?vHCRJ)5nV@NF9
zI1U&!HE=)=)OqYWZRnrhZq_hxc#D3nIxEhAP&(JB*}%goYlpxtrvF$~x%)DB0>LuM
z|Fhd8-gExtW!MueGO-g*r3Q`WHJ&w03M#YGB+h(;&W1Gg1-%&nhilS~P|bpR-q==!
z2Y(h{PN^tT)m&|ii%$67i~oEaoW2n7F+ovoD$_7OCD<PC8O^x>VBN6p))Z|B47nfR
zJvwoAd+8%?D)9e~1u$Z?kfR%xg&nB2ybq4ocbyZ#kEXqnWJ#zM=!E{IpRC)BzjuzF
zKiyNWH(Ybqo`Ckc2ur;k>~eDPGn)Fj!be|@6Iq$;jN(w}ZZaKBwuy&;V^8?Ey1A^M
zJJU+5z7K|ZK$0{)Ps|cJ|9A~-e+qK04fitj)e6KoUjbp0mdWLz16L3-Swt(G_JsWH
zn+E=E@A|5Z2M|;5^3opVz#PX|w?E?i4@sM3M0=-wQC)%ezrHcQ$Q^Yk)*%LP=%%Gl
z&c!n?J52-X1)t`09b5?pF~w8f0kqOouQ1oPF|;I^z_Xf8i@t1QFNp8%(+n8Lvg;x>
zUZ#4RD7Z_}L37PXjx377l~F&HnJo8yZs?0MAwQ}^Z|yIBIMp!i?;Ju?2u)tN7kzNo
zsPw|2!5Qsy)+whk7X!+U=0OW^uGVjir{!LNm`*W5outut{ag?}P(55D*7P+sC4_uz
zz`4P{SEvJplaW?Jn4{LOrVNFXS?Ph27et7;mhA$Xn=AdVC^}yg%4+xVn2RFOL4r(P
z)t!LBURziOa|`wjy$<Y!?8~nfmwml&Pb)1_@+Rw3Y9^CdOM(X!x^Zcutb1mM92NOV
z9SQ0yomJ}x)Bi|F#K8r!=nF~Jnj*P7K~AiraTUg)i@Zk8=VpKYu()nUlF>vJtxJ^-
z70$Yu`AWuZ`x9jBOPh%+133cJU+dpC7d<W*CW*ySn?lf@sN%~td`dC-L*&C|`p{v8
z&j@~xEAp1G81|>m5-eGTH5C`T%bb*98BT9@dt*b4SzHlD^3;*1^;$2OZ|hjG7&<r7
z=sXU|Lyf8|e=Atm!WDS3O&GdfG@9ap51;onP3f-tM?^X<_P6@<c6<`L1{T^N2<%VI
zLm{(mkjy>V1bwgEaIbzW=~XL5pGB_e-{@vxguU*gP;48F&j96L@#5W@e?c>hZxYc}
z>46Ra1U#o%Wda7etO{pyHZwwMhjU<fB?{J8HmXNyIm{AxBWrA~KbN|&>iB7_h2C{&
z@#v+1sPR|Ag?#1=%eWdc^f{m#V5?3SE1B>;qc9g2TSP7n?r{GOKPKkJrRsm|3Z!d6
zzTJw&8QlqrslWo&kpvOw5%p;fDPIBq456F&W+m=Cj8M1O^!!LHvKFNNBV*w#n&QCa
z>9a<MP42Srut^ii{rNn&Xx3%V+*XnxK~scO69tT|v9;Cn-!&NZkBi$F1}rJjyO-%A
z{C$2(=4x|dKAliJga(56{@6#nC}!L%5-hR<ZqUi+dL`k?II(ex7fAq$`m@6(fp|^A
zw5_;7anonBxNnM7_$LwOUw-=l3_X-lKIH!-QC>b+T+C2N{9G=+|7J_h9pc=)GhZxE
zNTg&nK#?zSI}lum^kOQ2NufOVKgu-uzq@|Vb_@SK+noeJi6Q#B^Z-E6zs;)Iq2W`3
zk;wl?$A9L#8-O3fQ9S^_&zYYyufAkN;h@HSkeD+6YIya}hVl1o_y0X}2JGfPFaFP^
z;Pd}Gbmp6NF&LvVZ4~VDBw{(FY{$IGKLsjVrBcpaLI7Ax`CyX~%Sb@VX0jWEgvca6
zv?(3#fp<58t~17ZUb(4Gevf|J>kH)O33#}_wZ1<q#@H<4%nT$-$@&?4*4D}dSM1LH
zfkK}hVEwf?`zn2BY~#i+rJfbiX^`_<EKi%?C|F1FU8mSkFZp!IPOR_>5(PKxO%A$I
z&6&=uOeCa-wbaZ<jG7a6t?^yq5V<k!_T3VGkD_>AFjMF8Y|k+qZ0-E)y<z(D$f$ja
zG37GP$ApmJl(VSg3qmC1U3Ti0MtwI>o)rQi*g8~g%y06oSdd_TvS$Y6$NbEca~=Eo
zP@9r!+Vm}?E;UB0IduRc@;LCpQ`igt-=UCp$0i8qqzyv}l0`G|jUJ86Yum!&$ERVv
zw&tQkqgH&-MI0fUI_w;cg%^Yqs_4jMxQKFiI|FCBY|tFhi$xJvA=AGmNcI-L3a&R=
z(O85QQsh|)W+<excz?MR!i6$6^c176`r0Y~?$+=0Xp=>+8MH$Gn`=Eap{S?uC4rF`
zW3B&2&d$R=C38qemBT+A*k>N-sPZS%TeZw3)TErcyGF_Zwh;;I!kN2?1AdZ0l9k1p
zO(_!jV`E<T0Lb_0<r>ev$oGp2LN|%D?nHD9k&NY0{F0A6O!(leHVeYuOc&YysY#iS
zQb#ed5|EmZAf2Ve`=Cc&b~*KhmG1L~UeZF(qeu$hUd~n&#o;xI!z(zE0Y^S}i({Bp
zy-LC99?fJn;`hb0WAJq$j7P9!#y;ZaXEDdFtH}2UKED*%kh_TA;9KTz<`|Q6U6o+?
z#AwyA2rEfz<p(tJQOCOVQf-@4P)ylA&^$wl#9FdH`@m1PBvnUzBVKR`UHI_G!b&0M
z{8)iVgkhn+=0+w+Ku;(K5?G}H{HF__Pd>+q<1#_4$Fd_Mh{XzhD#H=Bu+R7CXB|YC
z6(&do%RF>bZq4UIy1dDZq~xA7hy0pLlo>xXXjlTdNzY=Ai<br?;%Y_gC|=F#qD@*E
zsT=hUX+9o76q}|vZgR232Zp38i|1~rFjL8lN4F-E;_|f7y1g&Ae9N}?z2o0dVI(iB
zyWcd8ns6mu*$8#q#_RHzeKsd2`Yf_w!PJul4SI(}u>yn)SINgr1{RT+<A#T(lrH{b
z`=Wf$Q+oZLJY=KKASdvEA+OPRZhTB*C#QbWHd29FGfGO&2GkyEj|`#=@kxst<Y_JN
z&IYN-YYZ@@bCCIHLACSEQT=!}80cDEb7W3?ne9g4<1+kvA&kCkMX+3)D#vJ2d(gN{
zte0K&*&!q7{HhWuF>rvoH0PiW&DZ@j?%X}pw%#X$k-&=`l7RM0P<@0gnm)Km@((@D
z%bdO{^@FFxb&mAvcW^-(o;=FEtKzYM>f*GWx!+G|Q$m@CIB~je2s}iBWv6P^K#{fa
z=vw7J?Ys&PI$<8YE16Xm{F~0K8Q-IckKT5n=x!wZlQ1aK(!`}imn`qHc^n)1kPX6a
zPsV@L9W=1W2d;GtZnZow`L?EI6!&hkRQH$(uAG%j?1NEWH=)Sf6@IjSjWdOqe4$0B
zxBG7bJ<a9?TOsI@Ie`!NC?%IHR6wAG;*jb=$uYLi&O=p09^o?adBKIV_@1Z+p56^>
z=SL8-4t20DLb<CkS_)F);rUX)`-!?nrkHStxbqp+hjJ>5UquEi{vai#JY6{CjjSpr
zZrIm67i{)M-L*)}>&UUeHZ|9&Jiz5pS&uj-moW<Ky`QfnBHAwV#vyC3R#Eq*E=Xiz
zy)_C#_vn$fL^0Fv?(%)@6`Jb#O#UU2*5sXnsC`F})FB^iY&sC|ii75UtPWJ6S?~tb
zXYqdg^BkpaZaawzv1R2*yv7}4=CD04T%H;PBlos?J+X)81s>=LqWb!sYI(Y)S@`uz
zcwWHuH&E`7tM=pwF{^BZ$}Yq+r>|`*aa_-ATz&XG3u%_ghN!IWA2SMK`&jTGB1Ki6
zTGHQi-CT<HgmEtngC;bE<yOt96>m0>o?5XjbYi6I$j0=1>)kbLzjP>72DErV0G5_&
zlZJpg?^dDhyB>LmBB#{yO!}5Yq4F+y#B*)xg`>N?i8EVp2vNcBiEuhu1G%kNHH6@A
zL;vZ5gb@h1zfc#70fEyae`PZyyPfy0w11*o-3{OxuGy3`h&KzZK(d}1!S$DMPg2~I
zUKNvdhvy&Bo7r3*9f$_9BO@QT(KEg{75tpaTxKN`Lx9g2=|kk8IM+?-J-BCHZ=1BP
zu}bBu+_$TzXVaI1XpX#Dp7IRL=4{xrG1D0BEEo96msK?YDc}0Kmgg@&&++p08`!wR
znLqoy23{~lf=krC{>ryQIt37{Xq2f?RDh8%625lMnZq{#kUE#<LQG4Go4q@!BN_{8
z#AKR#yb}KbK177RisFfE3bO6=HV!`VIw$g|A(kaT#_4(xBNs6Z0f00K7+4wR4V7kF
z04IbY_cBu8VZ*IGX2i@}`1M{kLS77Ro37uF+0ueSPJj9&lXY%o_xq5!C7S@v75MUm
z>+K$fkKu!$x&#;bygm1P>o?1^hA(ovyPE^2R4yO+!=_QNVa9y_%s9$%fu{0JEcYqc
z4E(3<we!2E6fqtS--Qn*yqrVE&wcwHzZA=3ctj$O9%x5Ieuxzc9=}0oFzA}0f_XWq
zKKkIRY2QU4!P(!4al+QppN3U!izwW~d!#%%8`erbHo<pd?YV+TPwQ2a-Tu+S2RlL1
zH6-KhKz&I_hyp}az>ahshAH)OF}K#t_RM&@G51i1n8kmpQ$?3cV~Y3m)v;?Qzla2J
z7vs1w*Qjc}mqaM)qpHEY=tt&gz%1Jo<9s{spG|=3oDlo4n>&YGfk~3s90{c{a7NZt
zeD92=3X~Q{QFSxyevc5^x8ZQ<Wr*+f>nOSSh1jOTj*HzSnuRFmx2E9w3tVC^1z8BZ
zFUZgm*P7Qe4>WcfMEdU;hAj8$7$aH(je5WpyoI^{1^RHwc^f;(-V{uxgG^-k-KSR5
z{uhjIIA)4R#e5i8M{X0?4P3!JB=`}wz~uYSa;Kv`9ST);m+ncf?Ta@Bl0C&8XJB|M
zk`_GNuFTakTK%MmP7Qx+XTE*)u|wd9hF@DDjC*&LmLw}?NYYfF%Z$Z!ww2zfn0R|-
z_TtXlQElVc;$Hc1$TZZ|p{Ar>l3oEy_qdGhB&xJCnkGe(XQwoS#77_ZobSHJn=i}~
zrU1muHB}uv5xD>i4p`vV%POe_?deT#(%YI82TslA&*DGyVo-gc$tb^{b>oiiOb3S)
zv7CEmim;J9<fTI6y6YXt3hmY-)}8bIAdT!amVbJz%-XTsGEl1?)w_4EcCB$-{>4A}
z+R2h*zrHZR*!=i)QSf3vOC(OoqM5OzgHjc@AKCYJ&lGA4fSYi%H9%5Jrvmh?*c4rL
zvporMIEO^)NZtXFjnxQ3<GE5Qpw6uQc%zA~z%|g<{_#U9B?e{8S8kQdIORK_z_u<j
z747%e(Cj?ORXTK_Hgt}2Tr|!ZeyC~@J{Ikwu9V~MmU?hXPTQ&KfDz3;Yo$<1BS;fz
zcy{qP{>(?V=k}MSU^VKdx%1z^-Py#9ABZD%yOr^Sk=SrALPZ+6GO7t%6{W`<oL}z)
z#=B5&=wwm*`1qc{VDRO7G&I!NpT{<H&r5!yD}Aveh;tTX&YVqJU*Y<4sA=yIg!GL;
z?+fvc%okQDXX1auIKrWd<K_98WUC6J+-N>9xX56sNcR&8FfB&kQgJ?h_i^#!>Xjkf
zvsMkTbv0bhX<iNB1&l{Jl&9Sa=w6RadS|_p{@O^+Q21E#X!c;W1^5V4JAN!2C24cd
zLXLJ~Q>)cJWNK~st85c-%Yd;qtz~Ou{-9l(p9X}v)J7<<?t!>RqX}Dn8?}OvYCp#A
zJB&tM{jNEeJ7Yhjh^-INUWiQRNVGPy$-zIRoyz`>cdL<q^iXE{{fNsT#gYF9Od2Er
zdryv|szGDJc^iM}kH7^^*>oJkLBG6`Y@acc6qE0j_3$A#I*0oFE}UM}@5CHyJ!$gw
z5O{B}l&Q})bz?&MRN+fV*&oW121%QWVDGL<kyhE&{n)f_9j!kho&UTojp<)dY0$Cu
z*QlK$?ddFm7mG-_rmoKTVoAT6_Tymq8F@x+*jU;Vmox@#KCy}lyWfNg6Id8#JepvM
zOZ_F%LecVY)Z0$t7_p2a9dCOS*0rEuG~JA?Hl|$tz&lN}b<pJ8EgHc8>r`~$@MYmN
zG*zd?dSeFj=9{gVy9D{up}s}zhMKIDpCG$9+#_AE%ki|tOkcr9F<yPHc=hq~$KQ06
zghDsd49}Q8IF7lC*8pMoeqyBR7HycbN~aMr4(N8%i2jvP`Q6*3N}H+OVZWyy!w`=~
z8fE_n7T&hgD<ad$6(jGg6xom!|HdkDw~i;fo-${2l#%Dku3Sbsu-qC>{Jr|uC(APY
zovxO$Cc;;_Kt-XX+%q`udB*@)7A*{mKdAye6+d%f28Ow@CSq84g}n*yGJ*FV<uWO^
zk-&d1<cZ~|@OlLbef3@Blz8Z!J{FKWh=G1^7l1s7O;(@n+|kS{Gy^=D4eQOk!^KzR
z*KKHird8|WS4;rMOr6~~6nLO`fY~ZNuf`6t=G@St{1u$H6tU8)d-*(^E{8%^@p`v3
z#OnHEr^lt1Zu0gPk4^#%y8Sp3-A+4wu+}uJCMhUomzoMQQ8(2K62F*b06$C)hifL>
zxejIt%NNNvRHEWn7!oXP;60+H!&ZXyiq;k0pUFUu(UKDVZPDR@edsJ3B&EK!c_g#*
z^C+L-g+lPdEYI}vSNZDaC#Nm{!lC$kXc<%#uKJY71RzI}MFa}PxdwYISV?P_-gLV{
zv#<FIhD#{EQfEdJ3!$^K8R}#87mslsI_hB)+rWVCO%eTSmW;KLOYMo$^A!EL;t|#t
z@A3Vqlal;ALc6bt22eXQ(ZaBYc2dEQCGn$^KjCEJE;7N74;TF?V^h-^|A(}9in6Tf
zq6JUdwr#W0wlgbj+qNog+qP{~+RjSbth777@Bi=Z+xPZEkI^rCoQS>liao}Dh%;lZ
zHK(J150sIV`2M6pl<MPchzp9HLE{4_YIk!djdKtLS@7%<)JOq?-_v+hL9n70+~3w2
z5s1x0dB^ZDTiihfM-0Df)`?VpkW48Y1A9ygEejrFoKcpMzZMHbHv#dvJ;=z49l{bd
zdiy93hL+ANEYui+Q&bTLHqf@7`iU2jlJ^~le$h1bepC2Lb<qpj4R=OZto9!VOfR;4
z?cREBX6H|=e`cx_MSE5lMuV3aK6wjfJxUYFj>_TYlhRd0TIxTpldw-hjYHo!%s$PR
zpm{zPuuu~9#@(F5zLCD(|1<zh8j5}v`_$XXj-b!NgdCTC>LUat@5clHnR0r{U_orJ
zYWf3_friBRMD#HV0NDKj08r9@0Y8kp(~>{6KLF$mfI)NsAZ1Jlf&A}D0GRdn5~BaN
zDIiha_l^Gw$+80N{Wt2rHRo^&|Bk<te@_q-hDF~n34i-|{mZ0-fqf_XUz`D1{QjTM
z{vUMve{+HW5NW<8ss4K#DEa$bVn8tC`hV7(V{5R~J9m^>hlUNM_~%c9(4^wpmhK>6
z{GGqmGbUEF4Bijt@mQd=iB~|kWy3q>m&I+*;-kS&WAn=J<j<Rx&0zZ_Wz2xXZ%l9!
zKeB6*9{-6l5M=~=!Y0!HdH6oOZG0{kD;(i}b4siur&=}yj`TAl#d%%Wnwvl~6H#ix
z#H>f+9EDKS6637ZX&x>6qe@b4i=Opnq5g;jE)5E9Zhhx?1Vkddcq}<w{l;G>FYGZW
z00hB~<VwG>guO4_+4`s(iR#2J;;W2;q3}_)3CeS7S#Km#$gd)w4J^y$b{wd-6G<;f
zt3^tlu_uII3zvAp8YU3F&33&G_S(=caHJvif`IpaCv$CvR=KL8UO{9>H5gP7s@F<L
zW1u`6U0Di^v%06vF*i3S3a0>NCsvHx&O;&L8hqvNYfE9v%-osx(=U?~pnR4-#G+NQ
zBsVjx0R4MhpL%02T#Us678`E1y#<4A-h9ItvPYw>xWBG`4g%jIbxfj}Rr{Rv!5Eg`
z9#JB@LX3I?FoM1LBnu{Tn%J&NF5@>qahJ=dI0X2m<XD!J9JBq1y#XU#4>d69(5bdo
z?Rk(Y9Iy|yJUaJNX-{FXAfy0h(&7$t$=!O-<U`>)aq!<Mfy4>E0(-%%0>>X*(`e!P
zr2|1_daF+pE%nd7+eVqU4k%xdsJ4T13V>BucLQX4;|!`>rO#_7O<{vm|4-2O-33QH
z_~xlb%kCN-B0aXS(7tVA%(qLNh0(Pdy9Kj@fyV~Ec+>-Rk<6%5yENtxLKw5uEzr`i
zmsOSX4|LFpKfHoZA4=Rc0CYGsJ4`%@^LFNPhEl$jgVa^Nv+$MB$LZ&_n{i?-0q~6?
z^TRN=;ZehxFYc8T0=hu=OM}Q-9oD%8my(Qw5%mIv)<=6kQ}^xl65Q>9Vbuo7oENNp
z9*w>AhiiS82i+r0TQf&XaDL1Fb2UjQNx`ps<Q>`2ws)kHQnJavlOyv&=cC*}l#h*8
zNMV>>InvI_rmuBF*?>J7w=t#6g;AvQ$Jkb)YiXH9YHi0-!nF6VjB_voQTBB?gDUNe
zUn4bc*-idCVN!ofc@WaoyZ?kiksskTpjG$YSsTf{cuxFn7;t(VkFff>4>5Y~?-Vr=
zWZ_opr)L+w;AZW%cPYBM_{4tj&Sg>W)y=@t_ICo5B7^S!X?{vfI!w`>lw}S%_`H?s
zG~R}|%N!I;R>2yFN)-H~uA6N<I$bX&#BE3}LUZEi63CpWg5S>=PfhtoMNhZ5X=8mh
zT!7!oH#{%y^H3Gr>R=ERc`y&$;|Z>9WOg@BB(7s|))Fv+TtsEp>HS;E#=O8Zji3>u
ziHbtpi=c0TI#tRdzHVZITlj=Wq@}XZgel%yMC!T_jOjH7dZQz6z<!P>G}|cbv_Bc2
zZ;kMCrVEyqzC`PWT4z-jJ;^8OIAg&W>=_~Rep<xT+TF&4hz|ej;eo23_Afa$an0N=
z?PKy+OWWF7yw+!3G^!#5n841$-G)wYqKY_JZ?#=n&ytoflS?!n-OowoTa?nd)m(|-
zxKkfd^zMyr)W^kzZxRJR_)!qLeB&!WbTrH}ge3BF^2PH>Ml@}9VTL*Ac)h+q)9JYI
z7&rWzh`h-D6S}nC-JE>%lK9lu7Xs`UOjy#J&O=|Ua{RTGz%7igP_A$mbECDSbF1i+
zU$4(JP_rcg=|U8bVv8X=fEQbwf)kAN3NRWYw?3t+ald`Jx2f3wwSGB0ZAtriE{9Y!
z&%20N8?I1C%b0g2w&J+DD6?eG5K5#gl(HtSVH|I;v)apU(Tx7Xfps8Af0M$N9X53L
zvnA1n!NHP)gtG1AkLvKxXAwv77~IdyCe@V-6YAY`@-gHrzrS#%*?X{9E{OHenEuH-
z7prV8*1r<0A@(|lEeH9~pkwm`p0^f1#H6CeUX3caz9`tx@F*e0G8c1@#zU!2wWy}-
zp%A`UC7(<^7Rv@44A<&OD}{Gb4}*m7+<jJr4-?rK)}cytveP^aXyFp$#V&<)Ti$I3
z$NQ*$U@V&Ki|{YSz{-+*#Z^WS&b+rQi40DX?P!X6A{L0(LG(aly)kEracy1}B{Pl2
zUQL)@zxm6v#`AL>p;F3dy!-B{(p9JnZZ<ozK|KE{m@pz-z2b7jhT8FqYL@TWz(Yot
z(~PHBt1@d)Yf$ZK019mhI);$0(3ziUzdO3EZTCKx*+$4<5wu-eUzbpeMxXZz>v%(d
z>tJN%FmM(uo^(L}%}E<!t}{-QsGWb_KeEJik@kq*B4ZuGHhrS`7o7h|mqyR+*jkkC
z1e8qCkN5*o?eTuGPe^IJL2>wkYuxgQIHruGGk;3Ap7Ki_$t4OD$Z}Gjnl`(P#DDDZ
zBC)#@reyYA9PruW)qBxA+0k<cI+M}Z2xU4DF@f=?T^eDf*NZZ7M|oaQ?^i~rr8a-d
zAc{oLw6iTtTBIM=Pmsh<ewCm-U7~8e9sM-C$4V%U%90KR$G<(q*;j)miJVGVzE!u)
zl`<zbk6?NOUuuBv{aizW@>K<|ZTOZ5QSbNxx4p#ynUcu~zUf@H9GPEE*zcEalzz5z
z>~$sZ@LxrKxizN3wo!pZMc|1SgPN=K-D2>kiZ<=jS;mPD5jkzSi4%`67(@#5OOc}b
zcQO3YPF;jj%YydjMDc`TXm31gF!moUOe?Cnc8|o@c@<i`4XSl3P$viQC><H2god<=
zgpa_CD3bnO!Fb?3_GQzL7726xqUnp&MP4`xUHF@`Doe0}e}CnspyJo+LLLmH%r?Rt
zuY6mr+XC5SHm*HNRs2!Bt?#VUB~dC$5au8B(C%_B!Yk)@(uy`TJe=y_EdNXOlRoip
z8slY{J-fHcRc|eSP0@Pl<>F@GM^l(G{xdaN^q8sq1J;ay!wCgQE;_f2#**tC6+jQG
zx8XFR&)DvXWP?IMLLw>m=dS+`E2cOuh~pi?pw*LuKG$pJlv}aI!gBAcPjKuOBv6M&
z(oQO7VY+&Ai8gSiB%a<uDmxJJjZVuoN0?BMo6b^O-2UlA$_awWw9eJ_3S>;IWFq~5
zmP{Xn4Y-QKZ@i;?9E46ACDKw_{dx^-3tc=8DDj+#p*`O47;RxQhF^@P+P9WB8jx#G
zUcbCEAW-|6vwX>QZ5A}J;ZU%~(oiz4aKX=l2K(@lh=FlPOpHmqQA^l9WdOCgUIE<}
znqW{0&fUIeVxOcCveTC_4DgP_f(mJ<f{ur83I1-LBxQ*j5&78(#_>>;`WDLL^%Gej
zp7MpUpd%l)L<s@xjggbAqS5?p<jtGIyXn57vd?`g+`c&_SJ{gNrz3LiDqm^j)&DnB
zq0ETF$Om?O+F}++LZj&m`&tIBl&E<rk|mDN=}LuOXmuRr+>k>5-yGCRd-WvmqzsSN
zP<^^!-*3v1tf_<TKqvHlVYd<3lf5R@grR-}(v4dq-PHZCw=H+OkJ|0vSc>3pW`lqL
zw~%@_5T@D%c<V_U$Gp9;fUf^-8c+{#!m&zhy{41Vb#1g%3F|%N*&@7c5*f5-3Xm^g
z#@$F`C40<&XGd?>&9Z9rmbC}rU0mCoE=Scqm-D0W7k(X^eDHmwmTn-qfW{8liSqD^
zy~feO3s0HmqWUOPwz3J5Fah2tuNc$yx>UW6q^T1CwL5(f&-0d%`feA!W({^XpMu9H
zzP@>4U{J)Cx%#M@&a~&{&VI?S)-i{gxh^WupSnx~`8Ng`Bmr2`%zC-(eTMW1|9ttW
zLhh?K3OuG&I@aZP4>y8(F2IpYzk<O^jD8hy=@*6dMU)gJKAbvwkAyXcFIp|mQzUyp
zwG0$Nn7pZShh4V`qXBR_&z;9rxo+v@;>7Zfi^v%Y^QQ*L{09C!H_u!|0@&NNb~BoB
zc-U$aU#he_c1k0!K-uq^YH<D@>CpKs-$hp-{ctT;x2FME5ZqR&%`qD1ESoivWFkHC
zvR(hW_kyHJre=b*<t>638<38bRU`Y=l15sfKRsPU<yRw(Z02ESvBDtbA|wj5L2lhO
zM(J?fp7L}=GdKaSxabJ@vnZ2^c#=xhPp5~&!o6}t5<SU-3U(Q<X<tvn1|p$`OdEE_
zrrJEtGL_yj9F4FxR-`|@SdJ$lkUa6=^Ut3b^aM~jsiJ8=PnJ@V;6hN~OYVs!|0d5x
z_tO+z(T*7w66D`4k8^%(Naaqs_n2NUP4alyq)FNHC@b!OWEn))V2|X{Sp*-2LH-F)
zZ?WC6Sf+H~TleY)P9j*)AN$RXj_kwKU-oQ%&$L~h*E6nzDS4SeuqK%&T4rziz|!xL
zO_h6#aaO_hqHWT+(xA~lzKXgob<NyWtXN@1o3@28R7>}DZ>xU8A#`v#{c2X*)4!#+
z=n>Ax@tSbi)&Ilhq<OTST{`+&1EQFJm@j(2z%HiRX-GBV7Bv*lp8gZ$=cGF52M=Q8
zJjoJVKqBwU8DSGi)3+)3U`!;?ews0li2118vuqsKqCKY`V{G$lke!$aGjcm(8jnC5
z*m|8artB_)%Jg2$*;WE(dl3dUXpcPMIczF@=wP(ao+nh<e9ezm7kupoT*n_6kr63G
zb_}MzWg}5MEw5GUB!`cR)%0FCjHprLE{zPi90@LKf#)Amc7EU5Vk_MHXT_P5?HeHd
z^*tmH8xW4;*5*qhXQHEyscqbst6ttjH)gXF*OF$S5B&m+JMdi%J1_7~_Bn#U^cyBh
zbP9wmfhA2>jZg7ZPK$&;C^9yoj57DRIqlxUkGE&eoX6o)R<+u)yNdlVHa@p|-=V+|
zoI+@uIWN$7nl165wM>T8rJwrY@ZOVEZRb?a^mh8~4cnGCza_-djxY8^q%0#3{Gdz?
zvpRHkN_bDKrmdU0DBWcr0>zTr?vK&C=maUW*Qz^=ctMUSR~W_e5>zLs1FziOJOG>>
zug>X818x2W{4LkijDFL{CASU;S38YB$a6qFiSFZemNvcMT%F9#HlD$Xh-8{e+IU|U
z$k!=*LzBT0cvPp!JInc~Z*`#2^ZgdylE8=nawY*VwXps3lsIRXCA^~!rEZAgC`VAH
ztDG1<q=_oEuSt|`%_D_oH5;t^KJy+T<P#zbXq#x!BJzavJ6VR$CET!%P3#o<_OC>v
zZ0tk@7i>QH;SY<=$N9BaYWSXpu@)p?8k24E2z&yy`&PD}@UVY3k#F$C+@w#WH;D~2
z&Sv3RX-i+6FV{5VvxVp1u3)C^=*kAHQ9s$RDZ#b;3~(>2&R-9ApCoJv-1*<OA>1(B
z?g!7x!#S%}MkRSLLOwb%>S_v(OmaUVUq=*88iEs&^`Vw}beoQMTQiq7`IQ?^182&<
z&jP+R(BS@4NC6cF04@3l;>RV`0X@#X2I!zd{00E9B7k~5sr3Jg{eicr{h$3cgMNlV
zXxpJV0swZifzHbQKzopoP+^9B|3s<vf2WlN%BB5pC52*9A5Gq?KXM!Zu;Wio<iEWL
zz+eOb+`;~h{`W`$7@3?9!1~X_K<Nkr5&%dkXE?qaIQuOBf960czY~6oq5bPo`fvPy
zU*`Y&?|)>c;okqTB`p*DPtyRP<1Ty705{3*P2n#ar#o;Hl6I^r-No<bz)lWUNwOcO
zj)`O8*o2|y$waxIDv#|T0@qv`Zz=GEnqL$Rw8jZ6SBf$5UT>B02`}W+ZGNImJw~h*
z4M9B<fi7z?!k<b<MzBBBEGiIO2JN_I6gpJNbQz8abH)St#c^RfPOQr>jtKWDi%j1s
zK9Rvxy=(LV343z}&{5~la~Dh>Fu`9FnXj(w{gyr}6GX_1A@;yIY`X=fID-C~c%)7w
zOw$c@)rsc!vwz5tU9<!0)QLIW8dsR%^6V!e^Ij+Jut0P(pK07Uo=ROpb}_6lZZJ-}
zQy~=zw2G}D5dcts>_W7v6OlysTq(Pxp*vr!`Oh>dj6LAvvmm2hA4gOyPh}uR5dF%E
zM|ll!6ntvlk%dtSeD>Dz^+dyea_Gr!FUq;&-Q-5(jSivi(w<pYn)KfYo2iE6W7gE=
zD${Sp9i4N2?fn4H2MW;!Dr&x5iE17q*cb1Qj1c5ZWekH^27^sU4-k(DiTRAb2L(B*
zT+AqhL3Z{^${hmb1M`1tthQrnUQDJ79uT0fyw~atcGu=dW>SovrKm!(dRSu83UO_`
zp+eri=Vg=@8ajHM`uKLyIh|lK37f9cm^c-TeM5V>909+(dcoU-)y6#FFP2O%$ti&J
zO}XV@o`J1KAQz6z%=ii3F)^ER7Hc7e8(5znGE}tQe2qkUL-Pz3p>F&6WW+$;&tULI
zd+T-cl^=KD%okd~qB{lULn}087o?Sjo{rQ&G7V<9_|<)<<|x%i_IiM_*{;fA`;oy-
zAbR)$83F88GV^)0KJ4>0b>>so2BXTGnV0!qHO<vtRu7%%ke|K&r}VjOOmV?noktz&
zoFk%vkIz+EGmb3CU<8=k4hb@FM>s~Fz`WEh813&6C@KR?qrL29Ym9vf!-q%AI@!pl
zu$Az~!Nsy}tdfUKeE3E#OAntC=!S<XN~kn&B8&}{sUXy`-Un<;ihikAr1~eiVackN
z%(-7pn9_sNiNDS%{PcMRtB_vJ3%>%V;mg1~LJ(yks~CMSKW|vRHJ)HA+<@GfGZ4k=
z(?qK=H-S%AVvsSR$aSJZin`_t6(GUTa>ke}Rv-=<FnugCeVe0CBMD)9Dp#RTNkSaO
zEl|q33{l`TC5C==U5Jt)^~2n-{qtlt{6}+MHR(2R|2f&_MdleAa5^lv4VxO@U7rrr
z-Q{dwa2~Qf|Bg@fk1O+6q86p}GEwke1$?t*A+%I?O)m^;>^syfRh16*i9etb1(8u8
z#^vE84VU;0R=PwTQ(2S7ZGs*}RzjAMaGBNAv5#^v%*-J;klmr^gMW?!Pc>SBMGI+4
zFm0e$p88!tFd@+t=SB$eydh^AtM8oR`>XtjiWo&KP0LL8V;|i&sL%Y-@Zvm{l0RAY
zY6y)v<+KW<c%CrCKi4q5BQxG**0P=-FIKBIcpdD*C%cjn=tL~)MDey)v%((WP$Z;G
znw+kc!91w*FXn9!4uU<&r+}_gxHG^d%rCHQE3{Nf{<7~0l)mx-KR2u~D7FM&eQLa@
zv(|!nQY`@4h~;{JSuga$@vyINX4Op8Ak#<3T4fxslp`SpuQJ)ED7w)xnbw&QgxML9
z=E9fr^JYgjeLM0-wFI_c1dCao=mnkj$xcB69y!;8!}7)+WEQ**M`132y774Z@FNv2
zTPAm0f_1JexEdWEx-NgPpBKABn+NwSKDSJ43IaX#Vynn+hIn|nIR9~nJ?5*D;q2xB
zY{gf;gkXgO<Vd!KIc|4y3f^$3m!732ri|By%QGvL?&o|9Pb()(tq0c*Eo<Y)+PwQ&
zxkFnLW*m1S1*kdAc77*I<LX2;{dWEff)c>Q{OhOMt`|g)4+xqch3Ph@cdCtP98Dzz
zY}g+V^&Dr<Mf^B0`xPGET(i}=xMRs>v8T3xpN<DM0%*dOer=aCyd2r0Mk1i}>KtRi
z<?Vq$mErv7*!*!TapN)?n-h!JaGQkXP^Orx0*0A1>dl(waTT>=Q8Z4=3^Z2VD~~vk
zBM=@lO+1ee#txS1@*5xlYyQ~gE}boWoV`jbcECIb@j;GTJ2h6tk>bG$9MxDcQEIA{
zsArZ-voe;ySAw&_&us`fn0^YIvB3zk$>Ce@-@E!u)@K2Y7<0H5HMOtUR-t>QuHcuf
zFl8W`Ufz-i4~Sad6X;cBFid)iUsbDXr6m8EQW97BkR&zz5HN;r4FOKv7#(`~Ua!-<
z!%JF>Z&2)Mi%mcqEejfI3Vf|FA!(w8$RSx()%HEOSjMH9bVOjRC>d;kJ1BdQO7xHA
zz8)45%i~E46=2Z6J~M_VfEw>m8_M=%&QU6C6Y5C4qoB?a55rPU|BL9_*Sb;K<q#s&
zifV!-0wSg(cAU6W*-;DY0YB~L_dfUwn2dEfh~&12+nF~;+~DgC{q6Kmoz3wY+MvzK
zyM;lI`tw)o%wNphW=PFwY1YWWzE3)0`Uf)R^qP+p{qGMcsxw~XF=c{AtUex}Pz}8h
z+Kf`Xf7-p8vZMrI?2=^s3i1Nik1*Kdxi;+QSik#wvtMB84fQM)mQ4ClcE=CB1aLe<
zlhawQQ5pixhS_F4lZYpIcu|zlu48cepcbDey}ESy@>c<l`r#^ltJjqA!Msj2VrF#q
z#^`_zPV=?v{kg`xINPh_HbWG+j=zV$6$SM=w+OG!q!~^*Px$2f_h&*3UQwsUV7hP}
z1{GKl6O)m0L;};h8*ZaR$mM;1@&Jko+VbA3X3#;fW4Y4dp=lln{4*YE?6tXQSLXbo
z^7nMjc!r*(w@i{K?S}M5-mbIOZDSmMG@=^qh09cqKA|*i@*6W;Po2Ta)b0uDvG;gL
zR-bk^Oh_cl+-5>=gGLG6kwwbQqnms1KQYgR#StJrJaH=8F<Dmy%CCWAlskZm+E(@z
ztSI(1sU=vT)9|e@@vf9K{L;clRUegun~fyTdissiEo{-vM4|y=U`a0aU<t|bb;a;B
zI5DFw%DyKelbigYF<X$eMl8=NIeq=tvh5~WWVcb0aVFegTa||zlAZiA$~fmOWC2(H
zhB0T@s)P{<^w)jhBvssAgA{Q5CIxUFH*Z@17>2QpbJ{JAof$S(MnAX^8igY()6^D7
zR7G$cXRPc=jh~}^bhUR4T#9k&r>~^bVhSB`sy*1mAbZx++gZsxA5jY?3qb}#!SFGR
z<2u!;I2ia}SdnlQU!5I}#9@u7P?WKkU*W<l)MF1x+0~S;rY@$!98*A}b_Yc(x9>@`
zG(!nxcOHfQWIQ39g4@ou7ug&1hg*gjjhqbD=(zdKc1~^zn38%xvSE}Pf2M!t!cW_#
zr#^;{p^85xR|XfPWym&HBmIu2RKIe3A}nt*EspoqXL9GBQkQ~~KkthaIYq_7A7F6B
zV(N6_E)b5iam_B^$BPmg*Ts1K<rJ}t+e<;2lEJF_phfHkVxScASh=vW5wytbI-*`>
zHEZZKQql8L1!Frh1_GUQSdCnEu$AIk!iYSc4vsIIy|mgmzP>kSQq3gvKs~7D#}LDP
zLt(@<1e=Chi&SJ9seQ6~PnatNV@uRkwRvel8}Q_b4h~^hn2Nw=wICG|9Zt#7ICw0m
z8vPDi1JHCXl$5-b$}zaQPt532d*Om_q^}vJJ6UwF%7eB=kIkfUHU7ogCL{g`Zi{CQ
zSJ!i7F@ooIZiNQKE=YS+M(UMah(n$6NE)-|Pv#3+Tai8DMOcOBNj|J-)01W-^+q;P
z6c1=t!V|;g<t>LkufSv*_e3^TEyg2#gLMH8!1|WTP(6VdI=1y&KjAL_5#M2jnX!z+
zzJ@Mj->@FO?Gs5^>si%)awdC{t{gG*LB+r$^yuuFOu^{Og2_~qR)+(6JdjDVaBSnd
zJ^1W&ermP)cm9BF@inSwnRZx(&F)QOBMyx1t#F9WBJSK>a*o1LaPt($#Wb)#ua6>>
zq7}+-`L<L=LY9QxKYuHUO-GBvYVH7H@-H<|?ykt8Yel~pg0UwhdO`CFxaWEzca(n?
zNz!~byd9QgMS8i)gy@by3c-dD80AQ;pK6D?Fr{g(qj<EaMBK%1-v@6^QI#8B!}mcV
zzC#n8B|D2saN}B~dW#%>4a}1r#}&GYJK4l%cf-DIMTXB}11iSzCwZFVt(GCy1-1uy
zkFBuoVbDJ3Qpetkx4BsnQ6l`I1l{ek?tJ}`4Tq1+O(q7r&}Sj>me>PEshSx5b@hcA
z$<;N_3fB^!LWm2!2G|pORTSsjjq+d8i?)3zoYeY(LGyF#rQ&zmi000uWi!EQa?P$+
z!`ey)I#kn2a<1G6%csT5h4-7PVOQ!GP@cnFDh=97&7$jRe8g}09t{1w#D*+>YSR09
z>nOA0^P38GAGT1P)zz$ILY^-H?AfuP5}>6<>k6y7pvVJD8o=e34HfD-w?6AZfT8hV
zf6DllA6rj@Po#{7%C4Tc;|QN#?zxj`@L7{D=Ir!d+@|F?6B}k-X`BddK-Y8xfErs%
z^yQx=%xopBs?|<tXE<-ih$%e-iicAJwEF-}`;Qs9WRX7*79Sb~K7%7?ewZ>v<6Psy
z(AT{1i|`HvtP+R}QPF|k9GK<W)19}OEzSG_wIoQTu8lzZZD5Fm6A<v%X|z+2;Zk*`
zGXtrpDh7B@QT((lx6Vp5ba=W_qr2LF&=!KsoJmD*{mY@e?CMUQcJBkV#lxCr*~NKS
z;zSX@A*9^DMzH_dDFFaD0wA<-eSqtr0{}o5@PMUnD)7Ic%3JU?L;%n>!b~5q`#G0C
zj2AU;9zq#J_+uUp;eWzFV!ks<{0}Es5CDr^64WS=0RU$Q;P3y<_5Ux){vpjlyuUBN
z2>)XZ@Mj3$6oLOSYWt^E;2Yrn*W>knd-VU)@E?E+5Aq*}*Z%-q!f&;21IL+E10~=w
z*g9a|$_D~|?=3o^>d1DopjwVo^GYM=R7n2nPbJ+x=A;lcDHgvV>$>co-~{hPpygZ!
zt=@r;xq&d}xN&2~(AbRRqyRLBpVaK=oI~(Kb+nX~No|iVImEC!zJJWjg~R1dR9s&1
zA4cl4!;s*s3&WaLI#uK=13%Or><kEDe3b~mx;z195Fs*@K6tMn=mBfJ38Nargmp(1
z%nCC7hf%!eq#Ml`ZAM~wSOi!pCS<-DAbJQCIV!zYFR#Zfo*|Ie$4f;ttc4VuzTKRt
z7-PG!>;6VV^B9gfqia)bt|@P2vTZa)yL}1Eu2NE(jVP{|ce_^E@r6)Pld{(><KrNu
zroO~FUZ_wt0m#u)hY=pjJ3ouOHf3=#BfoWpzcxZtts{3new>vOq*7idK@LBw*^E~)
zLVO_>e*ICZ78Thg{B5>k6gdSG^@7{VSwYB7pd18v&~Haa$;;O2+d}$c=l@v*9@j72
zb06+-0YV_kP~QX#p->@zo&MW*T<fa5l2ni1{8}g_0+l>Wew&Pb^%e`;@6RtOci~BK
z`pXN^WYPV2%<}8`v6_o<JVeXuibO5$6p+sKi$b}?J9zcklTCfeEF%aL9w<yFV6YCZ
z{<eEV)WOwF!SoqI>39lhdq^#Rx3uZ>G8q1*w2+lkiJz!+fg|Kz!Gpw3h;xCzODjl<
zpo4JUXc;*ilA7oF5q!uneQ62pfFkGBfD$o5rI!`rzScBSrzTDLVI5^(f3Qw%rz=bo
zp)0N9oAl~3gmW&-@=lSUVh0#++Q}Pwo6$Gehr)(=0FlrVMzLcFh&7*&-PX|Ozs@x3
z)ybR5*U3$>bfQBx*uC2qCx&p%VXSx3vVV$WZe~@E!aG!+@`-_4AIz^XUt;UIM<;Kf
zpkHu)mOJ8OT7$mDa?foaU{=DwFwEy$i!Ib)@n&ja%wNjJ;*NEpY$H4hjzEZPFI^b-
zKW`=DU@LSQ+3hj@ew;oxk{hj;fTHj{<=12{;X343Fl4`P3KtPO*j}hGGyNtH)rz<}
z<gpUfcPfrDr35l`*p+KziU{znK;OS`{XkNsQdFd0%1x1@X1-s17TZ7)Z?aRUtZ}g2
zDeYw&eM8i`#PZkAk)O@66~Jl+M@YM;J#KVz1Ncc<fDGS@oKtNHY?Bx9arTP|3mc*Y
zZ0OEp8T85tG8WYSw}xwFgi%F_H)uFeA!%Z!x5=wT*@AQw_3J}^FtHTz?zd{U(q$+?
z+%WmyD9G;%vPSYxHG~kCWGtkNV)EbroEqt9Aq#!D89)ogb!96)C}l@EN!^XmHC8FH
z@<C?wCT?0);DT*4egP&yBVcx8-Wuq_O)N>{9%6%*Pv6Hvm%!|78kD?QQOQ$~#ucN<
zI6n}WW5=|Mr0HK1+#~didVj%w`Z3Tq^$g<&p2=Il8a!X1I#=LYh`q?U)(Wx!jpcwm
zYyHuAYy<$f@3@(rSlR@{yVJi5tw^O_#*-l*6Nm=ms50ycShJD=pbw}A@XgS2Jvw(i
zF3QE(vQ2>q<W;aTdhFRI5T)LN<{+fit#b-iM~=i28D=Y&J4+%RKnmqZIgjXBf!o*3
zVUseybk<Eo_;6Pu1RedhN#j%nlmpfPOQtFtP;%X?N?z@7P1(*KqQkRsC-_`Lx1a{!
zUmNSSucXua0j^8hHvd-?n=j(kx>jhXdcV+y-9{Vs?L0L7$~t$?j4A()^!32uxr%{6
ztqmqpwdm}qKi4Zv9II3{!uUX%#E&O8v`<L4Tqlt#E&gwz=$u-FY?aF<r4K3Wp4Ish
znC(qZt|&p@Q#2KJ`Y8Iat<7qTD9+l%PaEE?!5JZaF3_tS$~r0f`Z}{`Zkg0_k-1XC
zBHxs`ziw_L#)gd}sIcwio@>$T=or;#=hV<|mMv_rX-yXM*?<ST;4K*V)%XzDDN+mN
zV-3t$FV{CS<(89<DWQ$s(6S-_%I>)PCIKMG&AKR8(qC>KI+Ha|S4)3`B3E3LIfe=D
zZ#ekt!Fy6pM*8JlDDI1@;@!P{&B?|?t&sB37zLDbLYOiWY@Y$1>c%7VA_H6~OkC40
zS`+pRu-9G$BYD$b5%Dfzo_Gubyc~x;x~6A8n4m5WwyHC=g0JG}wwLsvAl5b%kG5H~
zqS$Kdon~601l|Fwj^S7-28<A_+F)u5CoyP4(&JQvj%uqHI>;oMjwvk;7GZ@>j84%!
zsQZQ_nN6d$<m77TtLT}Az$7%f&Whc`=tGf{l;@v!@8%2cMZv$x)CePf7pEx_ENM?A
zr8WD11+>(<zKVbfS&oWhXnk2I6HeQ{Gxa<8DuDFDMH?EZPW+g4v!m4DK~Wg?_@GbO
zlG>O=2NRxu{sm+t>9GQe(fu6E9*6hq;p$;l4Bp7c5h2{62<Fn#FQ@$K*OpJbU*;q^
z++@`m{CU_5Uvx@&;u_M?`jxs|!%71|8b6yx7jEJO`1qT8Zr#mwCdzv#KdYH77}$39
zf{HSl(8AM6Na?)}HErVU2d88^XkvBWsO*_R{(Kc_nI!^YQ$5%F@5#@At8_jL8pzoT
zD=X*qfF6L0iSjeUJ+r`Es_#v)m;gk6j+eA{)#TU-;WR1~Vpo!{6XOl@y7s!-JN-2{
zMf#<X`bxg2Rm9esjA69*&pGQ4$(rUoQnC|44!%#Dk1kg@?E<<5q`eJUvPJmz+S7W|
zOl|MT-8sQ#n}e6~y^aF5#WbHU#4)sDlGv2f3BkVvk#HWyv`$QXR>}6tI5{BHc-wuI
zN`)6(8;H*Y@t#Y#_^s23E#nA-Kh`@EUx_`^vaw(u*pSPW<P&5`7OoKkd|f;3k;@`L
z^0SYC9F@zN4d<y+f=agJCqpUV)1qidQeeh1OB!NGkTwCt?=#NMR|(YkJYH;;9XBx1
z0dO~u3c!GB^om34NRT0O7Nb@F@t@3?w5~*s;_AmOw0$lh^;+vI&W&(S`ERXObzsWL
z`obBXnnLNs#F3XSo5`RE0$+jKqy-$^-cS}Ffj66uNcvrxt5l84@VJ*xy>rxLq+{@x
z?djjWk%}PL^UHsm#Zf!!7K48%C;MLSQ`N~Dmcz{Zd0t?4_Q2C-mSqRAYc<5v@1QEv
zNo?B;I1JT0Cg~sE?!7a8p^GlY_$`XLUxd8EdI1*Rmt>F3{%+ZM>+5IbtCf+~-d`T>
zE#_DTtK_xXIuXP9KBuGdVM8>ya`f?&k`E6bNDlXMi3!9&&+qwE57viQWs$SwroaXe
zJ!_dDxhE7SqR!V9T+o#}Sd+LMpySdUCF7v7is2BAG|XLHsvI~D7quW+iWT~(h+d!_
zIY8lBsWfwO;iv;7s(zBv3Qjj)zx3?UPxWUUJUutMuU765#nLd^(+pLAH4%C!%(Fr;
zGH0;-*lFT0V=!n;&YOah)RWfnl6d&8jHdfE*hJ4_GWvjt>LBeJBFP*AAF9YJ`|I8b
zBxHURrEWPOjsH_(hWs@u2khX9W|BmE-;=_r`x6ooxsjT8zKzU6b+gY{OB8Zm!j<b+
zn~KXBy3aye$X)?=85S1ABLCRgSYUoBn3t7IzRwNcFWSAAlY&*II(?;6J?>wtA%B=m
zLhx)av3Lq{Xv+IOOC=lBOo9D+pSQ+olLBq`n1qkM&bsmxT0+-!euSpGH_t-ap{!+X
zq`Vi9X1IA4t$oFa?hq-|rD~ZG@-Q3p(>P4K6_cI0HtnHZNClKPWbuHS9-Uc@v5ghc
zT|S**!7Rp-hB&?p61WW-_s%D>U5ES9gRGeLizS>2zzfXci)dg;HD3tOKJ&TI2&g3F
zZ#5!fp@f?KF-_43koLW)1Rm46hoOIXnmUB>=2Z@O5&&&kH=dU<tFPhkZy-Q+NU;+W
z`>YpytY(CU3VfFSFq?+}8MzL`jgjcxv%=NOp^mXHC7pr5`Jro*KDkSc($h1tG+VRg
zEbTk)=?>ZQi^SgwY6*5xrUTiia6s3y=c&a<Iggn{{bz5;&_0bNRx_vR68{&>v3XJs
zE3U5V!nJs4OGFN;=S~`8j{4ew&Ke-b*ziU^W*9pCs0zxWAmMFtwyupYCAtv%a)Qde
zBQZBulaDhHle;z+Xz{w^q5X3~?1a$Z*Cv++qaf+!G9+-&RS$|i@u@{&O^NFMhs!Vr
zced?8bYj8N0}k?B8o_mIq23B%&?crvMB>}lG;_D%xB}@Rl_hJYLG@0EP+BvaFdft~
zXR7S4;IpJtK=crEYw@-wYz+vaU>9=jn<oJ_C}iu&Dmq?^Gh2I|;xeeZ&t4RXk`f}*
zkCe5hqgMOXln^|_AShTwS{K(p4Dn*|vne}lwsY7hw2TYti(Cj;<v#^bTj55;mqA1&
zEglpP()ahsjU}I5Z;n6Q6b4~Oy=pFIDCyZDN-a!F0WZ@WIx9l#?^euPodzH8ew|;4
z6sL3!(!2>0?%R+}xr!9O#u?N0pnO;{=-^JJ%@E1_9@b3cM{(fgBo|405NA0ELQd@i
zM64a!d12<{&)Qnk@A%_wb$5QDhv?hqB!in6JCC&+x>)Oh4!0)Srgi2EUgPrCDS`}P
zrCnHhmZ)s?S&`k5pKBkqgp@K96x>)|ZCV^;b$BWuErefF%$}y20*Lm}gqG$et8Ksw
zjm@%qlp?UjEg@pnVdKWoQemI^5_5cLWv+qc3Mm3zxHU!so=P*u+<PH{>h^xbqg3^$
z>}$jwlKb~W`MNcnmZ8+DNYi7DJ-QiFT~=n5t;c<ntN?|7Y=i&P8xK?g0DNncYx{p=
zQ*{70o$WthQWpdo<QsZ|f7|+!lHmUfFW24mk6HY_b=p9e*}G&(-2klMWz7FL3Ges=
zNO!+;ivADx;D5j@08s&G3?u@eCIFBUK>S|v-^u^&ilq+#ZczuV17MC2)%_bnm-n6M
z8|ME1v=0Wm63lG>508r~L-GZ{;1gUhE?_0hWg<R-IoS^QVd+Td<WVg&2H2VHMmRrg
zEiuA1mVk{#pUm&>qq;ZE_HHS&ll@{(to>*;L7T1!CjGSnVCeNeZIU4CqO|OcG(e!L
z{q(wHr;oi58|XaO%zJAXUPk{*hl&e^^IHL5f~Ye@AA;-Pvfq_k@7z+hqqZ(qmu#qb
zPDoy^TBaNXvpo9@b~*5&?sCLEP@NM^vq5l`?Ls3?(Km%SxTi3=t0NX}MseevGh4G^
zr5@ci?Z~A$(d{?s?^WtG0@8!f=jl!FgL_&9il0`QV6;ebb)<P=rwbGqV6D@`2uQPj
zPms(;9_?7Hg3U73eo|E`uHrG79v@%$8@&nOH63>rKMrp*>`cq{+4Nu~je@PbiqT}8
zqLMs-VHd!eg*%n_R;}LHU3M;*Y}3Jga#gCf8GTUk*7j$ptK{|ME!mHoV%npVeabOd
zBK539tHcbWg6qU(w^5rYp8^KAn<|c*i#=(6-+2{=%$`)x1ouE_b)+%efHk=otaR9g
zt|$?7t$sJ;ChH=>UUt8bWGs&<9Gt$qYK#cF!*1?w{4q8^WYv4%C?C)B_ZqAt=&<O-
zi`-|Saj*<zIIQzlC28{iY^XzY^L=R)K<v4&T1IZ^o`O*0UnA;S#FTYYg{U{9iou!0
zE&q{Pjw0ASphGf!JuzileXmL5C8blZ57OjqF%%(OL}w?8lMHqLL!cJgpF>Go0<y`<
z!;56zZPu!>%s4Rl6Q@<S;CW#;1#dTDb;WEqCbJ>8Z9y9KSlZbN6=HA1vv8MO4aP(D
zZ<nwA=8LUze{6I>-d|9Cf+Kv#H4J-vKNINW{!{`yGxw|ybY`D|nT>5ZwlqcVb6Z#}
zMy?2sq{cYBPtR#`S%xwSbr>%<+yZvO@(t-l#5v`Y2MSpv?r849;Q{ma<`?`rC%7Xu
zR9!0U8SSAn0-fTt0|dg8?r$m^o5&RhH+A|W{(QOgx?Zhy^j^j_(F%N0JCI&Xgdm1W
z++TgqJNK=soi5B9ZStN3$$^1QbQ(EQYQ!H6lT~Cz`FEWsRM9z~=w<qwkXJ<Ab;to#
zo8|MC)Vo?dyd5U|B(xSmZ_=IjelN;h5U2)TjSR$59R1H`Ni+m&_fInPqG+wxdnJho
zP^|;c&pujPN<am1>};V{9n)Fg&fv#sr{S?L)|`l8a14L)=qgNqR*{&LajV%dM=)A!
zAB0tOr>GsY1mI?ts_Q7-*eHP=*DgM;>`@(86d@I@r1rJ@7b<vmC)rS5=tD%h1Ulqu
zO&r@cSHRP6`SSNQ)h;wgBiNlqy%Xd1%24_t+)}|7x=-hls<i>4jW_O*>{;qF{;DU0
zZkI|62$z;yZre}bXsb{x6)dXcxtm^+Bxx(6Sg$|zSZK(1p&b~niD!XEjjE8dGYY25
zn3!$C?6o#S5BdWBbHpu);r58x^79r-@p9x3_sGLe)ZUj4ZQz^fkGA$dnr4fAtzGCS
z{RoYV4@~vkQ)Hpp*bTjkAs2^}B>eIVWY@4Wc>dD+DGnwj*e({C1w}@6K@XaJWwm7@
zS=}Y@WVo1YLIoiHl)B_Kyay8v*(w^?OlO6l8$+IWQGN5hNv^uQqV^LhCMu57XwGB2
z2#KLt=e+P8IDjo9S?<U)V1Jh~u=)Y%7}Jlnr-Dei>aAd9)w#6IZF-2B_b$nh=U-Ay
zQ>n2KT5!7myDVmmmohs@&fcyte4+XWp-hFt7NZ4)&7FPb&pDWs17HwoU7H3RPn?TF
ztm7)_sFgi%YnSqxs_LNS7<d}#Tv+mu){UHH-$X|T$U*aV_+)5QbS7F9-!DVOs`n!d
zl6}<v>!vWE3U&f-8i^CBYcw>&Bl!s)UzgIcG95F)F&G=LtwwJ#BwJl1mekT?S}4#W
zFxt%AbwcP3EM`fY+6~?@KE!j&#^DpD@(Wu2pWP;?#!=`p;L>o|{tO4BIS+)}?-5?N
zXafs_pZl=2eJW8jf<wVGtKr|9hA>d>>i=PpA(4Qg^#8W?{HIn4GK{tl)jyB@d*}Nn
z2t*YCKtvJD+?3pfRx)8EBKUXPFj>9;C4XD?*K|HLxLUt*I1M&k>(|N>Y1|zZ(Af3j
zVF9sl!dq8&-C+IUSaL93G;t}nsRNQpPLA{>Wf5xKau~v4YIOL7J3kh@^Va2gTdX7u
zJx}U=?LVEi!-quH+|w|6n|=k$zTcDWK0-zj4v172bkMAo8C5_>!TvFxEPH}~f9aQY
z+iA1N{aX!*f!`p4Sf!C|^9I!ztjk13tBh@9Y`q!3I<}}VF#g>;{)bw<D?CCw?5m2@
zv3o+|e8JO2Lk@W(Mi4=0!G6AOg=<U$kX9Fz<fNtFWQd1No89f=s*v=r%2$GFH>{B*
zNsk{~!l}ufw6Os4WAg%|4U@UQ-5>JLjZaCTe=8{{q)LxWrXB=)<)g4w&WEz;ULBlw
zfex|)F<ZVh{@-GRUV~yfb!@^0&fA+k3~r5?6HEMStnB!b?n_MtHTqKAb?SLRZBb+G
zHd-=>CDBV(Shrt$BVICBX_^sHJD@CUku1>aT#ff-3uW)AE3YRRjM}78&CQDp1gtPm
zMGb=Y+%(IC{fKL#Y36><J792jPH9mxDOI@E%(eV!6|4fPgs-;U++pp%IJuTXS*}4W
zmm@>#UTS#hO8xZBlZrWyC<=}SJ-iKI%P~;kZ-mQx5tIH!ZG$M-2Uo%d>YT5x*lnoQ
zGCXTDr{NjFJq<R8htLZjlq&L?z*o`YO)-1_Yq@>q<jFTIqh50Df)$YnT84g+_eTmG
z0-s%f@>e>too|5Mwa@mwqvP!SWzmZ@eMvB^m`IA=Ouhf#W5Sf;%_Z;{Gi=7J)L%IX
zvlB~7>@(%3h)e<^62UFhBb%@^q~@k@=XM2EZuMSug07kIBa5dclV?a<yVXXTfB63P
z?TjYWKGUM@Igd@GVT<0C#yNV7{yH6488lF>OQ93mcr0`C9SMViR+FN-_&bwX{MHqA
z_F7%4_v@4mZM@`9%O8IX^h|g+C$1n+RJ}vX4pX0Y@%(^brnk-*Mo`W0MYaW-y@|9K
zB6J+RrAN(gU+=S?eIEFExIofwp|f<ht+2+Z#J7p-dFIhD{zr*lBy9yDYb(#EU-eg~
z#kYnm_7ZV1VzqZpKfrNRAUJ4&m4U0>dvKiSNm4{=$FhnG86!VEUnW<x3d!A8?Mp`)
zB4O*`C7LX-MyC!)m9ZjBhMy4*7%&yJpG;Dj4{5RjYDtR3lzNIL`IhjA#k-f!>(Okq
z{HlRp@EkZn_*_cZh^4sHUkb9V_2amwWFz!&g*&>NpG^WujxpQ_qw^G7t$y-&p1~oK
z5XOsB(y}*&I>fX0M#g+D!r@t<Uy0!LKNaur58(DYY%qsnPD*Oe=12phl4yL`5v)eU
zA}sqa5o(SXn0(Oi;Gjm<%e9BqE!!DH;ZL2>Qmj0}67IW)?Yz<@#}Su)el6eL{oJN6
z{0#X$h!4a$jcK)`+JxuqAR()|Z7EE%mlx4(T=y~vS(F9GU3#iirYthzAiF>4$kOBH
zEA(NH<c!zBAlBBv=*_pjgmUz%quU1Qe#*y9aCK22Hy<V}OHZxks@+K(+ww>0KJ#x<
zN|cN3ABrNKVo9vNi}OzSw(Xe?En`hFtWb5yDYdJeeSZp3jvq}Wx9Mh1+dDN9k(Qwc
z2AvT4QcpHBI6s~Rd6j*hUEv%{B$9}q-ND>Fb*+n|#NYhDQ|z4PAh|B=WD=kkBB!GW
zMd_6K-0O$H*G3cvV;Rgj-l|J-VIv#}ghFVB*GvOA!!yHF>K)=#sfH(uRO%y#?JZG^
zvnLs%R&u(C{Y>lMHj5nFTl6Ps#6W_uf-dc<C2w4w)47iX7*O$SL)mQ?<@N!;Qb3%3
zd{Q5w-<Zo>`mn8du6)c&p0YahFN|<Dh&t{`fb5ri>t}KgIQTY;n%_QgfkXqaqXAa&
z%|EppyF~YCk(rxyVoe^$d_o8M`eN>()k!2G(`-El)ERy}o`-`kPR(b`Q&&2C2m_C_
z=Fm1@;F+vC4~g5WG@I3B5u6rq;oA4_h;!)ge94kO1o4+W=mUY#ejWd@P~wG?IX-Q)
z(@3SGE$>Oj)hY57f0Sy`B=KEXjA^A!($Pg@;OEM0{rxOC|7bL`<5AXXy?52j9UZSi
zx=>==n*}8NPLMsPbQ~zd%7pqgJC`)-tpCY`qirT0kHMR!?CtzF$PCu})VSmoad)n9
zAny!L*+4zM{d)7~!riI^cm4*yxxd(55`(z=RT#|Ih$r}S6TUOG<^&aLn0oc8R=HrD
zX_otC?m0<EbdhfW?I%l5x6{Q^>0rl4#Ox9alhM5e@Z6VHt(BzJoxR|pGyi$PFieF+
z;DOm$YEI_gv?*a_T_PVblS^7|C}c3hfPqT^xWyfN2B>|b{$edJm&;bb5u!T$a{4J^
z6&WwgyEjI(3V>ZhRK8bFEP(}V_UD<ZQl8sh#TRdTwLm#SbwE92M#-?iAHZ=EL@Sk9
z4wEL94v8`m2EM%ah;UoWl4w$2mPY?{O^vq|Q)=`Bj=kF2#Kbps=<v*CVtbNQ=sICl
zW|MBgb+h-?DxS)Mm5JQ1KlsjY#c??BhdTI_B(KybA9N4brT@_9nc~Tg`p34g1)fNy
zYDljQWtIsiq``Yb^cYi9{{zjTG=AMwHj)QyKdkJGo`AN#uJCmD?6v!%@;X-mN#=@j
ztvdEOSd(H`f5N2T3KF5&%c1RF-|o4dKM#`b7&V^Dqrdob%-^iYxAu?NnWimXwhOno
zpS#1&d8di4Tna33Vm4U^2mL&Fr@<S>_872$l96Q{5fo(i(1i{i6c+6H6EatxIxWOM
z&U^zTjzQENQijUR6X(B~c;A}ce3<o9Dso>CgsDH*<UwytsZ>}--Xf)@C}p1nj@J@v
zZ^$U_ADNt`G7iyC^p}b}#YgB&>ne2m9D*X}eV~CVs6jfgF$vmMyfAKwZ2-KI@=5`a
z{mK5`**%Ry3vG_>F&c>j-E<=~6&^<?XAq#=6a6s|(nC-)A~J*Bmk5S!k3KS7fvhkd
zAT=JD?w|mpk=CKz*C`TtWGBBE>y*qGIPs&%gV&sipQBI4B}nBt?L2i}P&Ft_!|9ds
z7;Ljbd<S3W(ykOKl@#d3kd48FV>D!2P|baU-{J$g_-a&%6S%?t8d@!=OrWqXNX6QR
zcPEY<J_kUMf4*e{h(ImBeTv`Ho+Nl)kS0{ZqNsYxUZIiJEYZ;!L<}m3Lj|+CDkiy@
z$^%>T#!M^6UhYY?4BVwRy0VT(Q4&-44G@aGA*_2(*;l(;9&O>a!#915C&x5QZ2J}5
zK%BcRMSYV@=8RE*9FT03nMX}Ccnl*DZf>YoHP$zXJyTjf&WE!*>$)$|K$=`thTp+H
z^kmE$nbzhEZiZk{P+Km63f;s?kV^8O8cgb<4;Gm(G*U--yOB`H<xpWfy_s{x4Vg{E
zXUk0idjMeljOJ#2O`ekrWRoPdO7*T&;5@jigJQ8P0^a3`LRF~3%>_#MVmgHTqhq;V
zhlu_q^FK&&)>k#b!7%}t`qJS<Od~VpmtBwa0-H>{49C_pvSV^GVJFK%fh!MQw>Vj4
z=IDiNH!U?~Jna<Lt2(yYU(aUIodn-*l}V(9U_rYyt6*O3#H4`<NA4Sxf5&z-NPKRe
z6ME6%niX%aaF%4j9rW$u?rtY8&NWG!=n(;0K@w=wXh^6BQji)U=ef)Tatl}uBJ0yX
zI@j^q1wI~ds8tY+6vAUy!Ov7P3J4<b!s1E1d;_fz`N{GMcr8Xp?`osVG8R#(>cu=~
zvD5ICVO@N*(s6`oZn}&VRLGoK?X9>^1gm6GMeQbE)$IISI4^TrLF*@cr(&bUB%|K^
zZHs1p{gFQn|0Tv_;@NhkH+C2FS25=a&i#J#+@2<2@VGTgN2X;nb<IftPL2z`Lu}Rq
zv4y9%j8>!=Jt%Oh>l3)*5~bXAgY*4FtoC7aF7Id#r$-ogRgiFM8IMgH=H=^A;Udal
zdUbs`1&Q?d<4(1dxY=f~ud*D8L3OB0m|t)}(w#u3b{&YeV%N1k0Mh~z6w(+c?wl@@
zv(dS|l%m*|ev<~mP+sl-;_RJ+Bkj8P-;QnDwr$%J+nU(c#I|i?;)!kB$;7sE@;vW*
z&iAnDSEs7$uKVu2_uBnWSNG>yd#x)Cn*s&_^G&v1?&?&XZ6<!uAG=0*s3yNUvT$nA
zXPnNbLZjBPr8Ur9SV&c}Cj9)bW7kq^x*ONo-*UE%MITXB!a4H^1k`sm$oDcM6q<GK
z?LBMC)REkh7T&#&?lxAute)hb?rCYuD?xV>JBvub#b+n`amR27k&|P3+)5Tu1fU4|
z<Rb4Ok^c3X9-`99x_*+};YGP#k@|-pDO@E^3RnDpCben%Th11WVJN^1P&9)7l+hsb
zGnN7A8DrpXPN0YICgXW4Zf1lp-P(`x97+2o=uz$vk%YGW=1wt9fBJ)h>+BdWUL(`&
z!&>ee7Q+c;{vs;~jz?2vm~kRic3xj*sQgC^3bKaYBsJ01N}O&?&WH0}h(l8Bkp`5W
zFnoExfcik>DvQNcgzJKF&36!YU3%0G<;m$#0wD@p^|^uKAuy5j!QUOmH93cTiyHB;
zr|;$P()Tg?(>WPK>{yxH5eV&1Fz{w)S2&x^Enff`07ff@BQ4wU(UG}fJ#UdW1Ia!8
z$szMzG5WznW3avDRcD-My(*b4s-4AD*E$|jYdpMo_36*@AaAg1<<o}0RnikNdg{C`
zSE?j2Oh&wLnn^UiT8D7<$&62{^&mRN(y%U_bIw_8>wOFD3zgiib(UlQfkZs6NRlXh
z&TTKt6Joue6K2p4v|nnF-kqh%<Qh6yk24Um4Nfzi3I}kr)XPiJ%hh+|o(wDW=Lv)n
z3N%!b7<RADNcH}!-T9jPr5NhUr68g`w<X@TvTQ<o++U!C0#0prk#}wPJLe5gPoGRx
zAK}eBGgCLaRf4{y^xdf|+tlS^2RuE@MN}rBL|;qfkbFGw#nk(XN`41JhXT))254Qn
z`PVIvNW|9L75BQ>0m|7jiUJG6nxc~|#rv>xKlk8BOTUGZ)_y;u8srh33~>e_$rs2r
z5{Lm9vE*aS01oEgkvBw@$I@SdMsN@(=a}*U$$fBxE6fd!5u7-C1MM>=+wc|lcbr8r
zSq=AGZQwHnb|d!J0j?>MZhRk44m{T2d~#SBft%TM!QIjfoWvi}b2r0`M&uFKwQ&P{
zhXdGdm>08@H#|3a>g&;7`4;6749A{j3TQ5%tB9`Hxf0^R{J^Z*gn7sGx-C8->Jf|n
z-P&$)t5S1m$y=*4z%yuPaX?pZeLf8jyL3B>AJ*p0%bd#KmPIBixlgM1a*&=Cx^1uO
zZ|LyjM?AzQ^yBfvy*qzf%uA5E{vNISmECy!ag#>$m$%SYA%fG)K{Lyet&qYHJD9;4
zs$eXQ;#2N5d$g-sXC28D5k2qclC70apEua?KIR=Upe9A`wdO!PDHGfZ&PNk(G#S+s
zpiOM55-g;!83gLa5{10QQ%or%v*o+R)I0iC7bJvo-^5sD?Y`CTU;rQ=xE(-7_>X2_
z-va=;0x1I^{a4}s=TH~u0RZ}*`Wd9=zsdv1K<9t&uKmA5i38<e|F`VvI{>^r7hyiA
z$$uyOM<2KC`JYEYp)MdOz<0S6avTifw^9#^`tKNo+;=1apd8%)hvf19rnCPi?Emfh
zZ@rU>PzKPqPHyq9Ny@k0A#BB;Cmzd*ct}r(qj-8j$1l(NG48dJxA#Ou_6+`a`$ZgR
ztHIJ3jA7oM@ILCYb09}>;rMYA8($e$Y3q2Bvay)soPKXXSj==aP*gO`MR)KqS)YCy
zEpFf=64nN6`TYJfYUDP6<xX>U9{m?IVO{_Q`mX!WDJ<7~H8S@oO_*>4iJT!Eb2=4E
z@Qn|!_g#ENcz)@zZ7Q<%oHsfry%NUZBGpK{g!BFsmh|qS1XYUaUU6vbo$VNtc4M$6
zdxwD%BroA110h*dHBZRQevj~u)<jEupYUo$vquWhzxy#dGbgW+KNXmY@qX35I8T^a
zP5}H~RBL;IR28S$()b^}B|niWXIV>iit|T0qvTk_C!60qTrN7i_tf6rCMHJe%I&_w
z2T>wa?=XN~DCw-}`{qeCG?IU$*>&Z*yyT$^eypyiBn{4Yz#Qz{WM;5?$p)$()m)v7
zl4B;^OH+|=EE?tm0X*mgG`b>Jz@NP$W>);ZlI0y$IxKZ@?o$ow?h5Ct`+J!dSd9cP
zEJX65wtat8f4;4@KQ=|7<+wyAP_`eN8KoMpM;pd-fN|$*&`^0ur1{m!7D$OoRWD_s
zAc^EmZpNkV%lS%;z=*C+JMCLp8-O>;II#4_Bl0H0$TySsMoaIYQFBRq{<^i#5jDWX
zieuv)WJ6nCPoCr2HHfkSmKEY5)1pWh=Hp><RZPs+>geMgDEqc{d`CEm$Z3DzeO0xq
z;JfuT8!1-~4mPsNat9@3-jhwgHwsGwBe7fFk3k<a?3{3?<_Vgp+LSWJpzmg-DayH<
z;XfnF^Dc8~7}xBnp!!uVyB6a1L-0aPwSPmYV{9cP{)Jmhe9}`L6innUHzYM$62QWN
z0r0FJtyf#*n9HNXpZ_e0b|3Met^;wdaDNHHnTsVTOl;VLsXb`il~yLfDT-51!Rz#Q
z6D|t0S%lV;&W1<@*I@^A0L3<%!%x!jdjv_04u%o?YUbg~bRD-Yv!D`9n!ETlQo%1a
zOMmu&pSNhFNzo;$!eg+S3HvGltO&CNpuXf=sCHCwAaRR^LX$<<^?@esAYO(tl?aXl
z=8&jx;^$ga&LMHb=#4Ju+=YKHD+@BTHrjoTr|bNs5qHp3mYpOA%lgs<6?-%Wwjiyz
zN}COu?mDa8Z0o|4JN<=9+xiL5geg<I12?z<3uwY~w{Hz7*|V#xs?|VUhz*GcXmzvd
z$Yg9j32@f)Hfe){J!%`GiqArC*=;E0c~0?P<?3t=XfcAswH~G=1UzxA*Jr+053lUr
zY*XTQaUU5$mPvgv(0lRv9qL6SBJ*$?Nu!@@XiskfFkJwoC=#75_H$W_=)!(yAh8xz
zgGVTwZjr8JY+A1_8kk>P^g3)FwA03YkSzs$;E`?yB=e1&%Q|V3E0W$^vY>H>h$6{s
z!DKC3h~8s$#<Y`fAIixsaEoC27m(9BC<dn1I<d{#pAE@YDy4Pu6)JDuV%{AZ#o(Ko
zZD)34>G);rT(bik$Qwv%zAz!)D)9~M`5&}AG$%jY5)HRjtH))~@=O}8OEhg0d62gv
z;Y1*6k(V9mME!KsWSDHTpKixwT3oTg=Y=ZzcI&SN_C&E+5*HfGyzVPkBOZX}`LFs4
zu9jwO8l8^zy3D3Em0}1xl=I(WjN%O!;GmMCndBK5DvqK8BU<J#fX``v>;zzOH%Yd`
z++lDIV`u`I<iUR*pgVl5M+h}=lzJF;8mt^=+U@(S@Fo&9#X^>X$ve%X@}VANmLV@`
zW>;c{M)Y@(;lzN(;V{<Ae9(`11Y8-vXXqA<LkGTZCnEzHd*M(%wSd)X1!?H^?Qh9^
z_QWTT3U9|$hN>s*SYV|O=56b1-JTMW`t(QAtawC0H*rUP`u3N+4cADiCNg)QD)1rH
zPZg!IuT6Hj)3|&Ph{ffmZrPwIX}gB^Qv9_-8P(38VKWKLUcpo8NuhL!x({Zhj{_ZS
zttp^JNhHyVHLwk@8S(lAXi>VcevAf2H6;Cg(h2E(VT=sswmV~|m)L8!&&H-eUxR|k
z2L7%VtbkmISe~KjnBhQMKpZCgk@Adj4N`g}(y#6YbzPOEiOqumy^0An`B*8R(+v`Z
z{tF6m(|?=7Gw?RFal#VOPXu>FZA6$&-YlDT5xQzsknN0!k;@fYAe|?FMgHSUV!%mQ
zYR0}s-?NzCZMlmj{^n75IqGWM4!K*DOwB4yAq-ezthi^jH;WxmX)TyXt3NvKFzLRC
z4<%C8HEBwM^1uQQqE_4Y99u1rjSNmeLeM7+TIZ5k?X;&ut}j!^>c@e!maS5v3DCJJ
zJTkAlSOu1sz#s-6&}ucTI(9D2by6fh&7tK-A=c+OVddw)D)^!94QGGK=0s9smnT*s
zaaEsrC;&TlySRI~`6(vVX|0`>v*b`QW&8z8t(Mte+tC1w)M$RRW<%*a9@~*J($cB+
z5MJAZAqnKgdad3Enh(Uym78<OCQrRMtKP(aXH{{Wmkc{B69R3;|0h_;B5AU*rl>AL
zVt}HEM;b#qRy0x!c?ChK&F0r9X-61t);>Gl&>}kkGb%o?!%NMz<(hknX<UpZh98!5
zf-29c(x3!KX@q=rjc203Kque6V8Uz@jR7uuD)w!}RQPo|$4wIrC>ei`vl_KK6$SRw
zfOOZEU)2y<K~U&8cOY(O;d=k-n&}GSdM|XWQ;?jQ#9Cth^3lgtZm0;X-cG1&K%o-M
z1v0YgG!EfFhu8o)=xwk4c5E|Vtmq8+d7R$jd5c4P*^}wf64WpS5p=8frPK0<nvMWf
z_1%^>Ow|NS4tU9`N|tH*z>eHh2&g)tbGO;{P>CO+cFJapiAHWf7|x-}ilnV-sag0K
zkvA5BzE<OnT|)Ur^*MvmyOEwm^+k};AHP3=BJmcQ;mN18v9rp{U{fYYL=2cx4e2Bv
zBF#HowigH{tDS;J;s_he(urL-ee)esh*aVG0M)4E;q+^6SV$9{H~OsxHlY$l9?D?9
ztiO-;)xeMslbj48U14tzHRQrel>|MZeaGrFFU2#C9C9KOeMD`P6i(WG5L`tf%O(O{
zQ7-dhAqa(4CIfQnNvz5C_DWB&vyo&6{7+P#bsfFpr^+4zq9Q7JGGae#<$Ay`z_Lsf
z`iX)9a-}pEL2tg=9<VvL*P`GuFMJj+<xdVp3lMDgePbeDx$&V|o5k7LxY^J&(F*0)
zdZ;ok16WhU>2vE`l&vfYX5-^uP2<i!me+Pi=khp^F!d48@Oy~fQA7}k@GD-YJ}9hk
zNFEJUyHz}ozM@N9b4SQssu}zsFsrjt#YDQOopze+onO$1Ept!8&p<{})`N))RQ5Mc
zfZX5<Rb{t4<Z{g9-%|uh5bvIYXi1Er_vdtePg7UBhZK&)pJuPKD3rGf5C(@}EpF?b
zjKjXWp@!U0hRxH<k00}(rov_?&brTY`9Vp=+M?efJ!AAa_uK%NXtI4-$%9N$yHwL9
zJI2V{T#JkR%(|>YQJ}borWtLMm-`7tX0%RRR6D2ShTQ6GT${R8So@dRp~ZQ>><m)Z
zO`tEb#`Rq7Bn^gD99xMc*1C$MaL7<=0rOJ&RkVCPZ>{;Vg+jv4E~oUb`Pl|G3&(KK
z!Q>T5^8BMdxc=RV8d`0pbOPS=TR6pvA~(_1yM#wmvd{=z0|I1_<r!L#C?_)qH(;<8
zjNBlmu`O4Rj&aF!IHHYZK{ci<2@gwLtPC4Hu5OvpFTwr%@$JfXQt49o#b|>Wa{2fv
z)*Nfp7hGi_hQP%FiWL5tQ)C|6h*?*J;)hx)N*C>RL>91~GrY2OWAtt&l~REGiqRE{
zDzbrV)e}0^(ymDvQbWP-_Ads>Q<SdV>?UDyJ%L3=Zt4Uoy#S%ro(j?zFggxEGB8-$
z2Q+j=nvj&$MPVX5p#GTeI^Uud1L#_%=_Tj@3)7a-D*QUHl%xhmxIFlALka7~dB2bN
zl_6Ql$#ZInSVBKJz_IDEw!?KR+>tDPN<a=D4gX~VNqDa|F+9ZRiS(F*J9_Mf!*YJ=
zAjI%vh?IV=?qxnYU$`+iF?_T>4S=Z*L&H|NQ0}oV)72D;@*7d<RL){0j{Bld?N383
zYuozGPnGdQoGWM42mhqzk%Mso8Un27=j44%ls5Hl;wH<00cVqbmU<-GD^D{+rqrte
z=(;fK1vq6TZZKH)#1)MlozW?J0M*-a1#}qV*{pefKkOpj5;WhDGtT@DPez;j4D3Mf
ze2p2@Tw+cndx90@N#%;%{vv^QL+FInbBtk0MqZI&<0R!Tj=8<~$o7dCz`4gz&XMY&
ztI%AeKk6<&^1zC~L6oRF?n%kx!cBTEp+ESeVKAy=Adj?MW-d_D7_HKYg$bbin(t6i
zva@sbb+@v!WHd{cekKC;Pg()0GJh{Zn%7lEi56Z!1A3+c&>%Xi&+mN{%Yxdu@s^vw
zUD@-Lh<Y1_#?FchXDf0+?(y<YIs!$W?M8C^^K5mI5p}C?GLsR?5fDTAw~Pqbwv`TY
z1c04?2UtT!1mFq&%Wwa5(XjFd3dHyq^`IpGhylKb{$b01_zfs(8m#rdx3=HmB!P1D
z{)3FbR)Cu<0Dw+}_TORO|1&tEr}qHi%up@B`Tu7r06<7s5`c5t3FZtW^Uqr_qu;Tl
zfN})?1C78AivRn>{}pHiBe_cw*hfHipF+#u0su%1zN?8wgfhhbr(MQ3K3cmZU5r3R
z`lnu&{vywBGCpuf(+~ii9ZOuN7jfWY7mjyV+ht4^n3&Q<mMuARQ`qgqifDxuE~C(g
zWJyAYOX(<J>0Iq3CX2IFYCDCG95~MhL2LU{VP}I7F9W`a=TuwpOB>>4^TF?ZN3|5d
z-qr=aKu6I|ekKhb-@@-!JTy6?-&f4KvL`&xG1IgWav8dUe@09(KQ6h=gCt8v=<t3)
zbgN%<0{WijJb@ximTT~mCvjyin*A$d4!2tjpcF5Qt)E9|s{oe3W%Wul1nfq6QWE~P
z^n{$3xvG#?U?}-)x{VZE4Glu}`>i9jkpkg>QXWSLx{jL7=e|&ybI~Lx5cBVDP&@N4
z`iB0DhKRfIdmUq0!}M0fT>)gYZnFnTF^?tUBFX-I9`{N9QWzpPUS5HsnLDGgc9?>2
z<M=BVO7~L{+{*A7jhu6Ww7Jphsz5dy_T<fxoDn@@@07OkqN(Y$I<z6;y)Cc+vb)uy
zl!?c*?CyA{o<OmTsd#Zouc|%R2wajm+(^4_)P4zDjB(fD$p#<aweg9imE_{OKs)4+
z1acHeN}-H4ksg<vg1QG7gPjLQG}>$OsG=+GE1AkC`Jv21gCQO-YOhjE+vUChQGAIg
z^q5=1SWW6(+XoRXSE6$Cc>;v6!f{S%0iEgI&k~Y*n|nBiNJTO;Nj(7pG%~l+E>cEg
zQB~bTNl$J8=|*ATv<aj^3^cc2YmHQCI~WMTc%Xr%fP5kDi}Vx~Izp!t3?puUOUWmf
zgl%$@%DPG=4rk^N)>Ee*T)imh#nF2d#iDcY2f>@e9%s>qWg`0%YC{8S4O$ZL@e2_G
z%JfQhU{W9ACH`WH8P9n5q9+jjz5A?LD;u2w{)oA0#m@n74trAcJe?%g2i}&a>Mh{T
z)@)%oemOj(*tW6?Ztcd1UJK1;@~!e^SEt<Hbkox8?_#roHr^UrR830$=ne1@i~RIq
z(YV4W7bTKQ#A|l4gp^#w;xek=XS7??xfIfd(}TrG>6k3gTX$vt>Yk7jbETcBdnwvG
zEfZV1yrlOc#SFbn5p<3?@I~!3*9Le=RHcN}%Xk}5OM*^syI}YLKu3U}ABN(94Vv~I
z*j4D2m>dMBYBxj#<#RjNJ+*=lTHAnycjVf;)gHQc_$<eGnoN78R_Z@YehmCkbzqu#
zD#Oc=$5MU>ZSB0>C0CmW)p6WLS2%8#kcwTctXs2u3}r&VE4^bx@%+iko=Kv<<_Uhz
zURt28C)otrnWx5Ly&U2S{t<W~%B7|BW5H8XY4~&yntpU03@FpgJLu=UQi|q1qE*ym
zv(A=5tG(>zgkU!!?j9DEV2%GZeE9Q|2axEZBW!yxG9R(l9~5{nj_SPQVO~Na*FXq4
zhTl<lQg>bBo5V|1lU89P98-dGne>9ley~r%&$M@!0vVKnlz^r3vNH2_j`is3qWY^A
zJcJoMO)~G4UoxEIr0s0bdOe#@J_=}*5)`+ru=N55hw=!Yz(sl$;O{Kk&GHrm*HS@;
zy-~Pm{?cOj{u&kcFz1=WG04AS=H+-Ej2QI(4mr8Z8@p`!(y0Y+xLVX+N|PDL9nAIK
zF_q^5OEwTLc~<>8iytZ1<u}(BiK>Z1TNj!h-FoBIVULs1dXO+=V!e#*S329~@W1JG
z!`!lhR$Lf_BV*E&dn-=Dk*4W~@E_E|Xz^0Q6XfGMO6)u+*xuHLS)(EQ{vD&mSSNIL
z#59+SjsQiS%Sg<0){h>*<N0XyDnox>B0D-KEcaNp7wrEVh`OgB?$@POjG(|tvn^Zz
zWkJIXhz^SV)kU-WH+$QQLz=Iy!UMYa@cVSbSI=HiO^t}0&MaeY)RRs@G1DvdYn}{i
z8+qUF6{RZ~k;_;{chg&M2F1{ib^Mx#6R|QP4E4P(U9wY4Ll;qRc!RCYhSc|Y+R?um
zq2cu3y+);88O<JcVNT|vX-mF_*_S$pD~TgO+JDv15Rg7)q4q#BpMmy#vMm5MRpuyg
zWp55D86zTgBdwLywRJt<wlKDmZcR?^UmX;JIce*dN0*-h#XgC$MA6@<60T1d(Bn`e
zuYyAqDJ|bf<_AGbRlni{=gfTO7bn9JQbUAHnoDJxEnzMc0`tQ@msKQ{@+@|Faa>kL
zC^|_4cUT*1|G2)3!kkN^dlxWk7R!yMjOR6XvLqg`$!@FTunThVlBwn(P*qM46sN-=
z6e6~_0<+mDkp1C$jHVqaky#>{@y|;}@hy>s*{^<!DLEqnrBF1;^lHhiiP?iZ*44Bx
zj1-u?W`#0kkt>giWv3VhA9EQ@eNht|&DMihNGi;Z;%>|Roug?g;0_v+mtUkcl<MYS
zP8v9WEgthHA=ui+!Nb-X4Ku=;@Uc=&Lf7%rG?JSfdVY_Md$qK+QHvmMX7?$Ytb_{W
z?@wU7hGkP8dVEtkf@Xh$-r=bZD&u*5|74np`^U`$Zr)Azt~a%kMbzR^Fm%wcQYlVt
z(%YcMvcKy#z1gpgoiakdP`I^Be+SV;BD>tWCC3=nVyqKCj-1-X*6fwHJN^uH@L*O`
z>2mdV_!FHQ<od`Ov`)T(5(DwuWkJ_A-)hb3P5#dPKr|nLoilp)!5J<6AilBLkjXc%
z$X!Wn*;Gq@_2f+Pxy5#7x=Z;=nSW%T-qp0L!9nL!<x4QID!h1qIYZ>5QQjkhrNirq
z6|wtad5l}D9FBFT6%XrfbK5h5G_=UP`lzK`qX5r$q@7v)?<UvnEoU7+^|j=%Cr<gt
zhVx33_U%ZDa9T}=My%!8c+R9%5H`|9X$ECfOS*qIU||sm!<~IBnlXG1RurMRvHC}A
zJH=WU^PGlg5?LHnFm(R42mia*r-x*#)dEzlx_y8<W~#j<aVVbnS&uRm@J}G-+8TR|
z*NvJ3`~=>;`TH6Vku17M@E7w+7GtMG=FY{M{ite?1(BAszi(6ucfjnq<@*==s5Jrf
zQGvomAd;GYr7ilwbU8R!O^+<|QuM#_{cuXNS`=a<6?SFR3#JRMpbC^b8md8Fk4*<w
zIhGO0<x>#tK_||jaqF#V+x>6JBhJd66E}Br>t&xn5K6wvsa3Q#n&5)Kk{&ZJP#hQ8
z2M=$9MSO7>;G*}bK(>{C<PPrXj~pt4JviQ*c<75=<y)!8%LMeOJdwHyP?QIbP)$2L
zB&WjAreEk|8_v<zW|Epw4mPz-r&Rs8)L8C>w+F3Eh!B|L=21zxSD?y^%n%Y`Fh#cu
zgCVpf5fOcagMiD1pk<6@bQRVO3}u~(*d|3eFdZKpmM`LywpX8;QtA4=eXoK+ASIO}
z2b;gouyiQwL^I?q>9pL@Unm_c5&UzalR}ae@&mp*R!4#5C>N|i3^*97Rc4))T$0+@
z5NJZ{tc^xvb42s*Hix<a)Od>Ct%P1+E&nE^F&r8Qy99<a+Sx1?>p}ZD8f_pSSUeh>
zVaUt1pO<;;1c^FHfwoD%q(Wx1-?9{DS9xBIH9w|4fvo|s`YBLO=;bx4E89~Y(ml#s
zk0e8PCoEOZ9iZuug86m?!VNy{v!lz{gRnw|Puk%#5fl4(*zEaG_}3GYqjSKYN&qs&
z{Y8{b(Qk;x3wUc0+y?YqwcXXpYV)Y_$7<c*><J~Y<U3mw+}e9J+^zf3Q6XVMrZGGX
zqsL%28TP5cIM^&m-f5=5m+{ci+LjAjE#puh{^Ycb7&Zfi*Kif`Urx{T^_LPDpNbyR
z@#zFn%~!2btY_STT13iZgin~h1?GJsHBomYU2SbOlrDl4Yczuge^IzO70!qx<~;QA
zoQ%=zS)9h+T;D;a9XG0ZWdGiLXe-{-LF%}Dybd^;=XU;F)x#<$7?R-V_t`c+j{W^J
zVfe;@liv=s66&?%H8pg^qnZ-Cii|6IR2{`0z5)IWmbv?FyD)R~1zqs!wwE;2_W%IZ
zp>x3QN^|=x-Jxdn90lE+t!!Fa>y*1uSj?iB8}~Oclo)Zo`#7`)A+^4yfE9fhiOuwf
zooaar*q*nFPe_}NSl7~ob}`=u|1#EGvTJBWmM0~`nK&_au-a~rOncbcI-f-1IID8?
z%WEjJIo9gBx2V&SJ;)N$7^yX4hXIFKWPzwf6qiUbdpRw7j~4_&KKeL*V7Q5!%UmPu
zqinI-Cev|PQm$yd12&_fY)?8%{=VV;PwY7~m^0+Gdrf|@c=B1{W#p<P`}B(Ba;wbX
z7$DbI*K|4>NF&pPF|0(W8LUP-AI}E#pWI7!^wu8{{H!H4PNa;ORE~R<%g>|JaTLj8
zf@?>r)XrY#(ScM86?5}9-6)5Od8!yU3vaZg9FW^_!6f=wK#dqXcFm-C^_-)>ANfoN
zz2QhBrNqYEGU1>6asKc%sGh5l>~JB%r;dI89_tUh3S=;_#o%_OYSRLgL4YP*UQD4s
z3+U6Sf3*y+k6j5}JhF>irCXHzK_BJ1v_=@wk!+TaEi}IoCx3l?@3>mTo4w_RNQV#l
zBOcm7k~Bmbo5f8{HAEUR3WHX4GFr>^A%%W&siajh$>q!n#jmf270pq)q<dPc46+nB
zuOSQ~8i>!(95!GK|AzwRLVZuG^(&|<CMW6xOS~WA!O@2rSnJ{E?L~<fnouq~kfy*K
zTSt%ZQDpL2$?W531|L89*0f17os5!*6;X~(##fSR6VIJ-axBp_3VwX=Rem*a0M5O)
zKnduv&j<K@kV1}GO!4}&@yflQ4%p!`Q&s+LGy2oL8D*S09EixHdV`;_h9t<cP-VHQ
zc*b(EU53NNKCg9wyL!KOmj}^4pIo}5MkE2w__<H~gD3fgq#NKTtJ1F8xpY|D?Cnjo
zmxtY46$r146jnV!aL-I?mTqEnQ#&4qz95f!YQHn8?5=f^gi7aLG_h+4@JrbmGmdyE
zB6eJ*^v}yUwuunVM5z8!!Xz|j4Cy!ec8>g{C^8)QnMCNgzLppzOaJ;{wJaFh!caBn
zKcYydROhgwB~N}Dqf2J+r~v#BH}UC9sBbXV63Q|DZ%GueQ7(Xs5Mb&LOcIGN0aF40
z*8>Y0%^fI@j8IfQ&r}cqF!W~}?D>bD!7#1)Yj2SsaTNK_hex=CyhXuB|K<U}%K(Sy
zu!6wEdEYJ=k^lfe6DTL}|3LWvWMVP=0RVIZ003;~|AFDO-)ZH3SRgwjS1bQLG0a|4
zK>Md-sB|Hthv>Fq&7u+eVA=83xSP}Ww3hGS--+Ph|K&t5oVehB_xq>9>zn+c+5iC9
zDWQz;{~O7tBj`N~@xH#iRFvsya0NvUJacj!8^;mEr&L^Y4P-YY0_NW|H#3QSH1aZI
z$r(}^TS0CBnLYKws*e7y-yYU$>9%@%ItEXaNYQ_BisVEj_1^nE_IVX{&|hU~05T$8
zBFlenB7wy=h;H~P0Y|)<og2YI<tnd-ck+P@*V8bTY{xMQG`3n--ZJ|*+u!aea`PF}
zG!|9C-Dr85;NnvcU^=b$os{=MG#^PNf-Fr};rI_TY>)8Rm-4|aHb!o=iH3Pw)Ro5L
z3StyF3YpUA?7!6Sd$*&OlDm!w_q*(4^*5?PWx{D1Nf;kdF*O<wzPpp03F_DParqa)
zE5-v(C}k8{!R5QUf&sid<FI)Pwz?RDet_>TesVFRlSI%|@rXW^misVpYZ)c5{W7>n
z2bepDM+W8*;fW2Gnx0Ea(@r<hezpwxT}i1oIyqnFn~!un>RyKdt5ZRn%y{#TmbPut
zvD5a*v#C_2I^uWGg8I~~r)F@-WLfwk+M9LgT4wmR?;I{++BLMR^`s|neF>P8)eyH%
zA0}7*6A%>6;^pg>{ss9B^)RWzc|Xnr=9t8-`PNDg?D6qAU=0aHd3(M1W|#|OO#(U}
zP;Z!~EkZL}S#fXtp5MJOeU&6^m`5H;K$5Es$~$L4R6>ueL4WAXZkj;7H@qHh&E}ml
z#Zlyq?C>Rd4XVqu9>Y16GVV{f5}+v)lU%5}>gTkEZYGUyuJ%WyU}YBCo(mcFAnn{O
z5w$h3(03c5Nvqe4+i7ibcXLH<6Q_3NhP`EwX0sg%LnJ?TFeIN|f&aV>sboZn-^Us#
zY7E~y<^6V21zz1+qdUW)<i6Mx0>f!&s0sLOr!{E6YST(1y7QA3&ZI{_V5m(~K}-@s
zSz<6V6jC}@0!ZQJ_FIpFn6ZQ}YrST2*m}=gO*qt{2g1)vuh*Xu9$6<W-&4W><0B<<
z9g3}gQpx4-RT*F;W}>j|b_KO?V@5tTXg<*ce&*95YVc4qy6JzR%3iKtyCHgdm8SLr
z&8{6SA*yJgsbG#S)7P1m1KrTaNw})MF5<N~HMEhX1zOSk#g$x~rZXOa8C(HfmoPMo
z3i}A##4U9}(EzW=?qj(^MJS>_5t}ql)$LbuTkq1~;)$K%EBoW1-6YMH)W~sa`aX&H
zp3Jq=|HrL=-8~0Q^1}RNIiA9_oc%kIrMCpV+A&Q4glDziz<fQkAKpS(fBf%LYr2@m
z=S42ankZwQdti-CI`y-v3o-W#;(&Sq4XwW1HoGF9KR;w*nnL?$i~72|u{<s%Y*$Zz
zR<8Y6rM7+Y#sX8iLQ`w{uy+X%k9u89zpj+Br9f+!oVKxvt`k0_bfGJachRmnzmTO#
zky7s_^j*cWNrX)RL8z>_VFm9v6Qr;(S+oD>yMU9zl1VK8_PU;iz)ybp>D%EbjiQIh
z%CZFM^^iShu{4#uG!o9rjg!@bIv*d1L0P}mrV+nTW_?~Cf9J#lBf$TB`G+vQkjfDI
z{Pi4b!skH;sl+pBU;AsQ2icPQw$tN}RD{j!_lGcGXJhO8wxkdP)vSqCbpNdaemMU?
zPnY98<kS%Wx&CU^4X_2L`!+srx?DyfJ5oqvev6$xzs6?nTc%Eib9lmtO>s>x;*<4~
zAoy^qPQ1$PvLYr?wGMv>m}}-6=ht@~@jx`e8vUpx$|!k*D~GDKZeGVy%dMcnFMqj4
zn}loHroe{uVYYvS{@5onEe2(AvE?MrBLpq3Hl#(UyDsJ_tgPYoh;{-m#9Vw{rZUTJ
zZFrHW;&nAcWn*Saf1%?N%d7?Wxm3JC!rMz;@HIsoARV0-imKy(?3lJG!|eULLk{EO
zK?UL4o+76)TZK<L2cf_TG6?<-Hq?K-P?@kg1O=m2ID}x!^R?3Htyu-yDP$vi(XiLV
zn$s$ROu(#3X?$v$W)Hn@X&t8PFsu7G>|xV2stZ7Mb)ok<n}n+tM^ojW+LebIgpRBy
z;}1~{zkT@0S5WI3g3c0ZQveBj$%cUx8u^+@j!^dY+s~dKB)W`z?8aqEYEq*SG2iZX
z$d^=z)0(1R_$pr%nVSDGf^dk{Qru?If<p}R5#2=CLm+5~j|A;XmR>rN@?5xnF5i16
z8?p4uQ=68GbCz7nl{#012p7V)i~Lt|bavEkJcfALHBa<O90oo~)FGCfrqtlCA`HEG
zN9C=(U~v{3c!?HLv|Zt4Cf~bvB(Ecv%@>iyB%%|r0ZxONri<;~a$Tmnzy0esM<oD<
z9pH%>*#;8LeAXEybA-<DU`++muJ7Kaa}s1IFqZ=EWtUyf4z-ZNu|R;4u`&<~laiu&
zfxRE}=PvnEPk#2=fb@d;0|ka8M^H<5+;}S=`WVc1#F3ezAJGaBMt<-;6UzjL?>`0S
zr&qgusbB3YJCaV@%BKs7mv;Ps<s9)KPEEs3`&DFA*he0*FQ>)YPUFh)BqhH>4}lp-
zKBp_sRFj$(1z0UUfat+MXW2a{VrC%JMKK&Y-nU#SsGD<R>ZGAB%fq`>J{4=J1V+T2
zfN2Cy=6D+Fkju+2bU&`_5E@clQ^#-RRcffKaRl=6oNT8mEc^BE961HbNp$wWr;QJU
z+FQoW@Ux*eC6)i=KZSKuwQYVn0m^Ventf8;nwl%+?OQbyT*IRf<Cc8R!K0=s7P_MF
z5R)@avYfii_o2zN4`H`}&@t)jPN-Wt)&DT|#onV5=@++c;!h7?j^#`4)R&WeVlmU)
zJ;ZKnzpb7T#K%Zd;Puo{zeSd@H)#&Fo$U4mI~^SwhrNQgl}BlbJ%R>DA;q#(9Pgip
zzc@;}xn$Uo)o<~~M&r#;!XFn88Pp#ZA!HAL@@j<kCRK3?RV251LO?QbxsmRyOt4BY
zqC=BDN6V?AYds^4+CqWBZt~Q`=SJG-1ULB8I#|nS4j=a<E{D`w;9RV-Fgr~eq#R%*
zjJ637nVUj0bh(^9H)@S?#0Ob66btd7^!$+f!1z&1!SyPm@=3o{<-+<J3OGa(>qC#^
zKle>V>}HZI-=DKti(lkyZ*XAU(nL&V0M=iYw<CT9I#P?Ul+z**NGEjq{H3};sPWi9
z62ndg22WVlD!)eM5MIu$GvIx&|F~Fvl+5`6nLbJamY5&s(iq2+Kx-QbxxgTsp>Kyc
zJeWWKmI<V~qb5yRgT&W^*Ax&ja(*{BAwxxuoK)c3vw+eta)?^qX29H@=^FxVo1bzZ
zXq#4Q&213JLSvugx4W1C0?Nl#JadsdL=BQwqL$zS1#7JLE@|Oqr(%VyJ<cMvm@6uw
zjw1OdT`#XMeXj;9KeEF3<>V#c_qri^8pTlt8Ec$Ap`I4(a=du}qs}fD$S_?blfcv?
zb(5%&)Mi~KLPH$eSAAOgYgk{A+W6M#vZ}DrHP}t?PsG;xUvow`MNu0n1G+{Dr6DlJ
zK~m>WcSU0fuwx^Xys+jnnhE@2D?%jNcK0Pu9356FRRTGpP!AZry<d9C4iEN)z5FEv
zJ?p2QR6m6foGW|p<pF0Z$?XFSzG_uEu2y2$iR1jYh^O#JUP9Z=(=KttitC_f#Wk26
zK<BW&y6|Qfse2MA4384s(%xCp9FJqsvMr+$fPv!h-;b-%EFOG&`}Ko?GsOu%=saAN
zo{+LCPz|C~Fad#{dX@Uo#HUC?>gM^)&RROHd$4)v{g9vGBtRS5F8BF`RRY--JVlmu
zT&FSy{z7Y;`H$Ldf32;ywNp*qo9C}^t&&CSOaL0BPePuo&%p1iO51q+=4}1^CkRz4
zSBc~tb|mut?tr3wy!iV!@xC!cm@AuZ>n$4k3JyXt(0S&XmuhLK>p9dDI?l3f`2et8
z9qoqVmt(t5)_xpUE8C2Oy<qkC2_i!tQr5{h#pSd>PpR+$1}oW@3~H9w3UjY{9I37V
z>8(#i<jl=}%66|L4QwOCFG-;GA(*UCPZ*NP7{+b#-HlHZK{zK;<xH*>(2v@=<-pzN
zWUDk)<<H%i$5@4jznoui#Tu}~hyE6KHqL({p67{1&zH1xJfl{({=((K-INA!^{aQ}
z2?mq6%NXi9Q^r<wG@+s4CvP0UM5m#!+!TcwJx|tDxtkXX@o~t>KY}ADS@);gocM}G
z;wn%C@sj@_aw9kr)>i$YRQ@3$I_*KlLb;ZSYh7@89>aTMEoM*ob>R)3!D&g!k%FpH
zdQy5|womM-AVC9l*g<=>mHB(OS|a8!Ei){*D#p8Q;U^AHxUpF+zE!~r5sHS?^x{$f
zUo!kRp;>83m(lpf{KHdUmQ$Hfx}MO{JiZvvWMn|kLznV9wD<|Gxj{1xhLg}Y6n(ob
zmj0LL{>7Xm|2IMdKylcZNg4nEErL<E`*#a4o<F+%2f&O;Tm#@D?z{$cI%7k7_)`%7
ztUwh660zOrL82-McKLUGSZ)F6ch7%mN2!03uE5{T6u%t|a)$orC@+wB4&uKv|C3Ec
z`S$_;U&bo-|7QTqnLy<5--E(H8Tkwp`6A7`MBpFWcHsYv0%?B-6a>l{`CkUP|7`Q0
zD-Yp68;JCL=VXb6GA92oBxhAwcdJbCSH&EVoIzh$kz`dDAp<+|4#S=&PV_6Ti-!k>
zW(?SG(2^TuY1UV`LW$Qmi(2m)s=m?z1SlRpG3RjdHH$hfgMbsIqXC&s13X4!`Vo5}
zkTZ|1H7+RBO*q0(iMe5H-vhmHC$}DPMxHF*RQ|_b%E2hSSfDSHDl|fA6BOM2O*itV
z!@5*%v`<UPxv=R>KfIPd-7n_APN7-W;yrKcwLBu$)7HK{xMR-HV4_(D8vSVzztV*}
z2EMWlt#gI8YS%hyj6O2Saeyutk>Iz^t<@`F@M?2&0@E2s?b)6#pmGBwH=9kxTV@Zn
z5hwS4SwA!BbveHg;Q$BRp~APK6#8rEgzu@S{Y^GPrVSct!cOY0t@CfrYsB4obe+o`
z=H>NLABZ4+zv}l@?*Y>FFxGncCFru|Dh9=M$hI9T-(xCb17Se^D}vAEE86U=;7bFf
zh3s-*Z3SPX8x@7THsNdl{ngfhBJsPzLZ=)OCrtWR?%D2TN+@a55`<lLunQd)9-{p`
z3TUNz{SJj+2sQ=*-fqcMGdHHa6^UET*@<TpmwZW>>>86<*v}?9t8mQz_9I2{b!*m*
zk03NK|8cazlzIRciafN%=q5hKT9Dzek9qPjECCXJ{gPLZ#@$7$;3uc96RM721~-jv
zqTInmOmgXD{=FCXu_^)dh;^p7C<WEcS%SP$WBql2ygLg5{||_;i*xvJ!(qo?_QM42
zI%rP)ElYwLUF>-d1;&x!SG`*@R3B4h2{z`k2X(ziTd!r)Nzg0u(aw}qi=<22&D9Ev
zQfc2-W`LSaZ-n3#Pov*`%T*u~hb|*OjKN^+KBG^RU$xsD>u0hz51bh%XH9g-^JmDG
z9&2(JoL$HHC7>opq;HgTfvhFe$sJA*vKdXAv2E98moBzeu2HZ-_US8aKx^mU{JWCC
zli=T5baeSlt{VfX<Z3-~h5uxK)Q8<KJ5|n~XH^@@Yya8msqebPE1a8L)t6n7VHh&I
z0FI|`#K4OV>?U<L$l+|?Xnk*OI2TaRnyx4HN{*sk9!3y&jv8&g?k=ji$)s_ktJ5HP
zX*<3*4_7FyvaeCV+<Wq$v^VJ&rT8vMtyJCpbza0^AH7B>gkBfDsIb_0hdFOC#D(!^
zIljB?cOPbC`2;2m&~LU_8}h!}(|XYu8x}RdJmm`}1zb@Z<7zTC?=*h&luU|aaj+`$
zdACA!Le<*)LPYJEtC!HbMUGCng4Om5tILPe>0~)U#@QTItsAzh_QVZO08_DB8C>xX
zp0_DC++mN3`t8nKEf%NvEKW7?CQeYD$y&F&eLM=3W}IXZK`}1@80v_5_uTmp*gveh
zCW0dd{9>|nty0BHFO@U8)T}{1AxP9)(nq^NEZ@$$4yXYsu_X>eL7EU%PRrNwmB$^Q
z7#nbEJUNNk>DYXU-5Ub44G{uicl`zINV=zo^3E)l;zC6<Y03>+0pr3cBk(mtk8%}H
z&aZ9*9nBPSay_%`P@g~VbKUeS1Ztt_W`Adi7AoB=6o7d^m*R1&2$9*^UN<JD&SC5P
zkODpN(_1>CNo1QQ7zeh8(EG)sRwg>KV{CL`Vgvs!S0_O9iv8m3TNDw8e5`JnK}m0r
zuq!ZimY8F>A5<|U{iPG<p62*b?im9!bIsnZp4|e89NKO=_;BY+0}{XE!`Tqfbk<$0
z{GDh(YBHyo2g@kES2s0i`Tmyixm*S2F8Xc(5C^z1>%8ONU=<U08DQgxyj)GL;Lo3q
zb&ZglmgpkJn?AIZ=AKLvpyQH*@<(fjS;3#VxFkQLf+1NoQI=S^IrT10!G^<6isJ?K
zlIo$hyN41XzBX552_{9dd{xR8V83p<{LHhUifHLF5+)um2oHIQ9xI`RiHQSO&v?i!
zUe?kMI3OelMz=$O@Ur`_VE+D!Br}j8tmh8vK(TCWiI1pOqEwQ&(m@Yt*<k24x~g7e
zhpiM>L|6-M<(+hJTy=Nlx5M7j{gEvqH-GK>J4qxzl5PxUe@dOh9G#s5#}vaaRf5TI
z$n2g<`W_HmzI!Pl*;iakO9gzuW!?NMvrt5+%LKlf53pYt9kn?Crj}Nhte$ZX1ukgY
zdr?Oh#D?hoU3Rlg!pWdSzojqB&iG*PTb}7B1SRQ^xIQQde+8v@2xf-j?Pt=-n9N2)
zNmHl&mO?E`PQ-=J8D+ckx|M)Y16OA{f{`0MlZIh758%jb`Vr}{(T$W-gZ92h(+m<C
z14lM{n^CO;Y97{CL_!uqbXBdJE|NV8Ls6E5M#&A6*8rI@f-`HD%7~a3|8jhP@kfe*
zvL;Wi!CjZu?Wjk`=c4QM>S90iq!q6XS+rNA)K6bOdzTmsS;Ix1&r?)oS|?r4hb13+
z63g{{HLE!#aYve36s{Wp%RUUVs&r(L1^6)=o-<_fXu6Z!u@p#4LIbH+E8F&gIEr|f
zLiXj{E?Xam5tYyzWzfkY4FI!aP8QdoDT>l8;O91BHflXWjn}E*STM8oeZ2yNqm6+9
zRRQDNx{3jJ)XyUh35m8XXf!?gW9$+KN0d4=I$+0FKGGiq2{2wsuaZ~h4*UiFbQgo>
zEE`JUDRs);ZebB>C<w1TDvcxBlo_x_Ms@69(wl5Pos*3kH}9+I-T*q=GbJ29A;`Ix
zB8<Vn>IWR`9+$KbS$|6cm=IsVK*b-S%pfIV^OBt!5u!U%$Q|Kd8QHNk9SKJG8vArt
zgAelBHKJeuF=n(>hG{rtTK*@_BQ-<^Dxi{vP)Dt<3Y1Yy$$kQ{mB{OKh*J_H3E272
z_i)TT>(HZC3>`d4h9{)~2Y!}Q)q(L3*Z66M>z|)H^VFf<lrx@!2M{T#CyFy|*8~bN
z68_tLXI&5YYtbc}sHv4(;Pc73`D&EM0iqZYT&4YBu3oNBw>l4=qwqB1M?ZjlZk9-{
zs+_`E{*nU~R!*f2y_6Qeq@))SLqQ-kN|)ET&pu!y!Oh?5fJAaYyIRBjQMt~&S!Zby
z;tJ$z2`P%wq9tR2ojnfB9-k?_{%qmj_-J5H^j-+<i}HVhq&`GO-VowTP99=pc~klw
zYFVl_1{AeJEQ6O7UNL#4FSbAR?(~HU{ugq;5Vt>{6DI40k3;=qVwDZ`r;t$NiUN0u
zJFeqmtfNG*CFk0<)QI~}Wo%v|Tcki{%crjJ+R|;sF5}>!qxBYo<#k;hZE+@rtO#$*
z_F=%bP^2HDRX|OBW+*sccMUjclp;g&M)yO{9Ev~%Y2wC}xpB7VPvVICTuU1{MPE8V
zQ_*_Le3qNXQ)B*QLXVy1KJ{R<?gQO&H#t$sFO6Tcfh<(W*_hlWdvphyYd?gG_RVYy
zI?<K;^7G*6dKolDQ(RtY2;fd@6z_IvDe*JsD!E(T6$@g8F~8W<8r!_E$zZ*px!SGG
z-T7~%%#0g>f^rm$cPui47GB=%4hq<tft_1YGz})O^uvf|3S{!Ri?)01#j5CWGh8-T
z5kmaCrkIw{f@~*WzBuHprTcx34iu?EnuIpKFc1@(tUyDH54fWDDFn2(5<)*B0ke0y
zLedV}UU(8R&XsX=J+&xb+=4}I*Ly<1{31d*BtNncW)+j>XoY&xj5AkGLe6L2U&DS5
zeYA=arP>i&Xs*b^$`W3;`ME`L=+k1?;_{(`A3Ai*mQ*ye$aVT`{T7s!!Jgkck5kX9
z&D~J>$_f$pz*L$=5a|5F4vN}kpl`gsIFk5TCf74IfWJha@mIkU;&?Y>qa0Akst71w
z*+twFyk;@%su8|O_YBX^Nd90-Jc~sOf%0N3!U|ZHu56aylSv9sI+kArIWesyn+agT
zCqtG;MmA}%vL>84oYqk<_||e;3xLK+epsZxmk2Nv>{c0uIl`Leb$!7si~|fzbTw8L
zA*{n=7aUHKEaJHe)=o(>EI!>Rj}p}Ijt?!g3xkuI@;u__=SO3w6&K|3pg?(VA-?}~
z_Gvf4&SNKc8S3~v*B|4v0B7S3D1&tN0?RZ<;O%3+u1$F1e&yzk?pXI0oO}W&+bI?>
zyn}0Ze7XA!tP#p3hpf~>X`_Z;{d9T@5E)*_NUG`Xw?pU3H)|-EHgGY*{6m|fT|Zq_
zOguP29yS>?juBaj-=QZ{k}P1~qL)005HQYz!*l}gM4~Z-sLslMV$}X+%U&KaM;9)<
z7z?G8PQ~u5(`t?}i<zl!87-8iFM7NiDK@&i;e8e7R?lO}p;>`@75&oHfy@IF@uby=
zSL^EhGra0TXoASm*@puU0%<v=aQCU3X;rv$J#cK~yOzT{$KaYSCDP6;&hfk#tUfW*
z@d|hlA<Ums=5R2DL}v_^rHa6^#+A>H3YjQdz~Vwt{04-TZ34?yS_iv5&$o{XSIU+^
zN!%zEl|jbvM~4Ews@6xgbe3lh&sm#81h5rHF9qduJl-9B=h~v?mNzx$mrt-HA4{(a
zG2Cz(+{5H$1DF31!zY_k{y3V@IuN0ZfJro5dFSA_9mg}x!$;SQ$MHPj>>Qy|(sJ}4
z{4C<u<JT!&<|V75eChk3H5kko4dDCH!fVA``FQZxuE$hrIiT<Uq}_qQbNmqEE0b>a
zxCB`<<6IeAs5Zxlo5w$scvM5dBiw$Ky*PHv+&=W8SiJN*F?k2)LA(>Skz5)&qZDJB
zV*KeG@dzgW!Lyyy^pRvx(UUIKqv&6#EhKpjO0L9f(3xEsC>)0sRksFJQ1u9NP7<@j
zIQVMn-d=(fq)hNIq(FL##c;08TH_Teu>HrR#Zt#x1hF+avG<!a)r4}+{)di%umHjS
zXfpuMK%;*+l5XdpD@~qAFA^*zkg+`w5Q70Qs0pKFuxJOM3nxH-NYfwQKt^1UJ$L{_
z65a3;1Cs1}3HbM+WPm78F7*E}@pl*iXwyH@{=Z%@j6h8wCf3OY002yH*T2&u{lDV~
z0_DQ~|3cyKtvV9`5Z}-a4=R+2^nXQR{=5);dno5{&g?%ZoatvJ$1J&j<w6oe_k|oA
z02wx1)ISB^PxrnAaWL$fz>_d``COgU^eJN%HQ#*N10HehSh|c{sqj{-;((Ypw~oyB
z&lwhH0e_-JD5UVgA>k%<k&lK(#+HA?Q?xb!%XyLzyv6uoWk>eR!~HTcq<P-qWgMom
zOi6+=CMq-Ie(NFKLGtR;EfOEpV~{61s_bkFHsF_~__(6v^yTif=?gdC@5q7$n|X(t
z(wM<=Be@b<xZSAg;T764C0awH5jHglERy$>rL`#mODtI5tl0J1!jJW7xZT3Ph8(^p
z-89$>Nne-M4k;p4Me{&GR}9;zpg;~QF&0w@gMc!XFto=-#ecup1j<Ld1xKqyzF9t6
zUTurnr8pK(S`RgjSTwCJ-)|gT%q%`ia#HbBqd`n}TT%YP2R5B!gb6`ZzmbR%#%Agu
zT?v}yw@Kc_np5_ze(ZcXUFvC{9W9#THF&&S%L^a|9NQSjo$*j9XSniOpQiC%&(htD
zweMfaQbRZ43TBpwUrJ%2gR+DIVXt%-z3EGo^O0Lj)+~b?PQ8yaqW#iM2KK3y&P>##
z0i0B!V3?gm+v8@tw$^@UKFX<Ce3OQoR&FV(UrsH_Epd>TeXklXj@vYc*?DR8dN7oa
z?DnW~6c5UL1L54u?>R#23rD68Hjz5i3kuXrzy=LmE3gMCmCv2QjkxQ7%Zu!;OIjmM
z45viSkz0S+01dr-ojYUM&RlTrC?dl3fGh7bzV_er<-kAy3Fv3tu3eq8L*QD_!(;*_
zgx|{u)<6f6@Wxn!1Uc!$9Lf&-W`BFz{9#ya-!dkB&3{$3kg3DBYpfi*H{dE}hHe=7
za8d;Ir`d$g{x1d1GeN?vbeVE3qS7%Sh}?fFce}!$`%Sd)ZJU-~9#L^>SAoOtkz*sp
zYGh*w7bwo_FU%~2x^M1ECj9tGGt;nXLT3Zttx+8O|Hj!nMp@Rb%YrLy+qP}nwr$&}
zw9QIqB`a;)wpGbW+vxnxKD+zwdwO(_asRFPzH>gmBUZ!{!FeLjp=6vWAzJ`pWrKkb
zSNxzZxt5iIiO4l-jp2l?WP1SfOQw)+9Kz)hivo)f3d{*JPEgyo#|qp(muRwY04DF9
z<2l6M4Ks>24Qs7*QLz7o6-(d>*QntSX3=^<3e=-I0(<)S;pMTblC1Swv52YW8rqT?
zHMks?{D`V??n4W~Ean~Gnrm7*tCaKhMq5`)-2%lW&)?nWtW-)1|C@>}@<R+py~HHR
zK;JXZO#`Gt%vR{*o~3~O!h-&dJ!3C0xRM}jGx>R@8}wi_x#@@lo~WZ8uBAw$3>e{R
z7+9*<ls<02g(*Wv(qt{c(Jo08iKeDM;B|v}K!q>izT|+rNfYMpsXsnYUvm5J0I|M#
zNsu=v)u4A+*aO}$Hv*#16-vp)ap0>zS)BIu&ek!iCxk8B>Wt+?%r?}*TLvTFX7pxF
zG62Y<lIfwpBN4;<{VlbFQJQKQ0#wz<NT*wJhMpG0Vg_3P0ruWA%HHi!bF*L(`AcP(
z2OnJKaNA&x`=3#=z0KlH=a37HqU#Pa_d(7%Sppa$&%_<0gnMUD`s~K)`82QY+}FUO
z46+l;i6U2y4&<F;=w#q~!PHT%1-6sL9&Lr}NOt6k7pQ(e`Q;0EwsgqwYeG8r$3}S-
za4RJyJ|RNHFT_1!94Ocb<1VFv&_k|!M2wKv=P>s)AQR=I7I?+>{Mb+YqVXHo=wfHj
zec_bJM3`gxykF%~%7xwu@za5UGyb%pwGo4w*?2L`v)V%P2lo5p7P;QGMU>VL>`3^!
zRD@E~0d#D@-3f>R1AU%_6~}=^c42;6&|ui0%i35532?9%ou~~b7N)=xA#G%9zGGiq
zL1pz`rCD?&2I>i^MsVtcB3b-QRG*bFQ#0O);k^id|9BFGDiGgg$qE*o+q>7RiEjpK
zm#Yy|l=xYVFxUZxs=e@^_RWOIx$!^I35AUQB$U<lg)cee^Y?4Pf(bRxYFN&D=bWG$
zWL_acI0Y@vMi4pdZJQvm(Dot(QMx25kfF-=kWxts<n!_mo~iexWp?DA7e}G1H?~9Z
zR#1_q+P)dhw*qTvH)Rop+7&YfJ^g}DIWq)&CTwLw`^t(Q&y@Va5_B9<f)O^$vaI|m
zZK;l6Z_uEufKy+kAW4Qj+*~Q~bGx~0h7UY4$YATk(u2x`o5g<}$f~OTtL+z!>`vZ%
zA)P~&aE~;tAAdg16JPt?q{2C!{D%Iz(J>^ZW@3JGF@AZ0KEKxs_%$m)RDsurvZt{~
zfP)9GnmG&!vl2Q?P_~24pIuHdFZ}2GhDPEXfZ}<Oo}+7I%!K!b*fdSXF%hDNWb-dA
zZK;xSHM2|n*z6t|XN>UiZ^7;*;W?&gQyWpozzdca+lHKmjfbL}Bk${R;Y{(R9<Es{
zVvgyZSDK%KToSiaMQhtgolQBn^U{!+6BA0}!9VMfi1<--PfnBfC#UTAnSQz=&?bAr
zScm*T_uHT(Tk^V8BGbj>S3;7r?QW&k<g_LFJsS#VQn8cl#$QQ2>?eEFVrBTZKsPi`
z*{EF>VHOFl*id9L;dOFYPagvg^;R`JTl5}+A4r7x!nj}HKAI8KAy&+xc5mmQOR^Ut
z0@p1k1){8u3SNYqESsr?$~EW5GQVbqXjRhgLnsCu9<Sd)xa<pcg-anLR{Bto_T4-G
zeatW1s6A-C9q)&NAU$q5UitE9V|gW{5t|i<cYd7a_i2m%*sRaRPLIN`*=in`1s_k%
z?X_6eP3UHde(2k@T9*Vl5q*l%u}weyWa2M0CRf=6w_=_7n-Fxx-0TXvt}LtOdVhoU
z1k783MgcUt)B8@h&^*Y)Q<1Q0Y{Xw9^fIy<;Jl>575B5O^!01PQ!!;B8=XhmCMh@M
z6WiIZVH+ozm~GJQ;{iToxWI2UV=(3*<EKP}`gH#0nTqwYljcfIvLP-tMKTx@X9FzD
zu#%vIGdqhPlEcs!GtNT?7Th3fXWmR3V?>@x(aDD%(0De$NS+N{te=gU{?da*(eNV`
zgNo7?dpuaWmsiZ?nPa+6UqQf|(;idklwg|ll8LA8_!e2Js4K&G;H!Pu315Pp*n&uS
ziqzYe8P1)*kuCl}1%GCBcg~Ax@d7KWf_`NQz*o9KkeqrB_w+B6eb!i9CJitDDu*kX
zNc<u7i2wt1u2ES7vq^78H;@)rPjxO<24DPA4DRuuJeJAo9KNE$QdGrMCtQsyCh_i%
zGwRZOei+Ca9B$Kj&xO9Y6RfMxiiCFpy|)m<uzZ%Q^o+Ob@&r{fw+(EN(L1|a^?qf|
zvLjmO8;V|z+P)5wFRibHN1PDJzO8!a|6^mX(N0t-b>3=liHQ7SIX#G1OewZ?3=;os
zVirZLJkbmlYZ&WvplY-<vxO$&);(-KpZ<Z6WvG>XqTqq%?^bu1q34Pxk{nyUqqYPo
zFk2dM8Jpu>$@BKCa`Fif^)Uwp#{A5xHi*CyN5SUA=J^G>6PzZ+PhevZZ%zqnh;Z?w
zVV%=81Bs|>y&hl-i9<w!{1=z{ll{`q$1)q6ANqbJBJcvl2X>;NgIH_UA`e$QJ6$8z
zPpt!Bj)DYrKR{&#x45hf%^}NQjED3spq13qN^c|V$dYV|CHIK!Sg)gEzxGZ%sOP*b
zX4D1(xWn%wWVn8cc;Y8iqo>7Vo0ljLe(Rl)a~~2F0Rc{V@}pCJJgz6h<6~n4z_(@_
zdDjw^O64w1a9YqcbY&fh6krJTnrV4)Z4YvB%7|L33vVFXBsID;I8_p4d7q<;^SkbS
zV_!xVNhhr^ZzY+P9U1yPkCrElPy<7wsMfo)rUx+{A4QDtF3z1FKMnN|9ug^fdD?1d
z!`CYA5xXl3lpR5So`@o&y^7uAlDZ{saMg$sBc(Xhwf-<T7?r%;f@-gRDJC-*;J1ws
z1n|RfYPj&YJOKSw#*B4~S@Z|ZVDc`11ZMA?dL9#-l1LgH&g7bT)>8E450VTKeza_O
zwFnE-$`tQ-G0FXL$St)7YT)#xpvgM~!|HdQusr$BH>)OY{ZX}{->M(dZ-R}^)R_4o
zbOZQ(NaHaYZ=lH612|oQIOmI<v8*Ys*rQ(h>HU`|APQ0F$@o_S#79`4+4_dPOd@CJ
zy(vY_0u91xs%6E8O?WQdFIhDzo%7g5dNKz7%_sY>Hk19QbUkpNZP0cN9++i+%Y4iJ
zyAH?COgWSA;2*fUfV%iY%G9*CEwt&ts|9ie#2Z*;%zdfl$X_v&okkayB`|R+Tda)q
z>Bc2-p}T17ryp{c!;R@q;jx_pHIMWKD2B|GIYtHI)0Y$5zl#o7_>G>b11qqx#UrIO
z$5%_}e2ch?vg_G-2&xvA*N`Vw3b+S2e@_V5l|C2P9EFxCM>Q=QH7!w7gbT6ISBN}O
zy=n0oF|$af+Oq5iit5U*6g}xtNLe6b-~^;H#se=T+8W!^71Ok4ONt{zRH_&9>$9{5
zr+PoGm)4z7KT*D+x}k(%z4#zab7)=Oe9G)o@Ix4+>G|rMqcNDIZ?~v*cAf?85hJxg
z4vEe0*K69dNSHZAj5dD=rCMsbVTwOdO(aSuo0}K89ajKtH=(|%;yRY&ak{p76^28}
zu#QS!oy<}PbJ{=8*cgW3<ANBj8%8}ClsMZ|)*|B`f%n#(3&SsxWR3`ajyn|&Hp*a5
z043V`da}8p#Pxk?mX1U_QcCjq9t?L~W9+~7(l*-SL}8P(&g%!DRj_A#k(O;OnJubU
zVao8JfnuEhe#IXx>a?TcDEQ`*T0(gY|0cWe`2YZFEz&H{KdlF(`H+OLngBpTAf@0-
zAS|IG00i{gmW#?`Q1-obt5z0)IbOK!sr}7LK?Ga&!9P%G@=e-zJB6~W$q+d^0b>6!
zX=$K5`Tr!m|025_0RRMtf~tsrGhc@wZ~#q{%6G=Jt9<V)EhGTYCJ_k0NJL~CEdH-|
zh<3lH2?OOR{-4p_Z|N9)a6Axr{JX}UT_{`aKZ)-@8ZZ}JrWkBeMvi&sD5y!=+xlXg
z87CHI=1{Wpybc{aw;I%Ri>22U#<jFv+D=)ddm4x9IDF>skf!c91U`#PXHe7}hv%F*
za^Tq!*&K^|uHIW`Npe?mP?0iY^Nce50O`VJr@^X-$`5YDyJ|4aw%NzzrrCG=6#obU
zsW9nV!v|Pwjkl6i*W$wslr~<nm(>PAT<*Q^FnE~{yUsOs7iMyhC7!+^aaUtqY;%_b
zEl<T5M&>>)|3a<xKa%BQN;fJV4=QY%jFqgcfU+o6(4=zrLNl@~%v{RNHye?*UmoFH
zTPIQ(dB5Z$+(Rhk5Nh|WkUu~S1#i2&3yzX=f54IZwHQym{UxEMAA-z$IyDhejr-Bv
zeDhQDf(SvY7(Pl20(tm{sBro@xuZu`!kJ!^x|2G^;|2387;BT{85QK{2#z&Y!EQr}
znc%BSnI$ey@sE-H9c>8k_Z<#c*`IX}kXMaH9~)AXwUkKnwl8H3+f8@L=G3-SNc*&V
z9}%SuWlNHUo)a<?%rGTA_N??f#*e2;@VVPbeUv3HE1rKtD0%QyKX9b(3q!K9+dBl`
zQSQ-Z;Q~cPXM|CJbFn`B7x5pz!xm1T{e%@V0s$iPcvXQc`48>O(fgrFCm1I`0uDZY
zDa=Nhve7ND@aV!{A_unlX~RmXwKv*x&a$tTU9_oeAR??xvV<(1DW|)NkiYO#{S4Tj
zYK_l^38W+3<$hWNSY4SnCe-gMTBD>JmDtg3*S#w}T+n*`)V)F$$0y}pu4^%5ig0!a
zx7_#40b_HY(iA}nZZ)1_3|UObUP5TF`c3@tCn^JLO2It{eu#Y@Gobxib5qatJPnco
ze25tbs(lsp2ccuWJ7xk7OOUSg9<H|k9<rQX$5H6~GKr$7F4VW^l9DP)s=Eg5<#Ap(
znM0SpTy^$oQ`d^BLrIYrVuaUjQ`R(1)AaC@xQmasD==)aCEceQqFJfjb^f6<K<)(S
zzPR_8K6HHjY+4GykJp+_RIc=bS`k+<+DqE>*asu<JEJEMJ<gK#GDRAWbHUf2DI3?}
zw{?Rd&rLEP>b1Ols#SVjz2Z?Q?Sqj1X_u$4lyRx@$AkxGx~Jw!52<9q^d?5Q$Kg;$
z_S`f7il4u>Wzi8N5`Cy-&|_+H(JCkE%u%}MAM(*jkW4WhB<lgiD`O4k)Mo%0wVdsU
zO#os|RH0aEh8ZgaI=SLdn2?d;kARG_h{<P`Xr{HJCOAoIZB+wxXUd&klCsm6JC7&h
z<fGH%&GqWdLLao!uU4BoIR#=_XZFX(6?vw#U6tmRN(Zj!)JBGO(r`xsnOIeOaG8gW
z^;ZaUmpboxOkU<_S3nzHZ|P`-Pw<7FqxU*}R<3aT`7i1i%d?D2z5v->!5*YGe}PA!
zq2nqlA-ySK^HLz)+hB@*Q@EElHa?Ubq~!OY0O`{$T#V0cYnNs}s9dqq?OqM6N01IM
zn@tq_5ZFPa=;ab=Xr)YLWVON7_WBmwLFzJqyDd;Ab{%FMFm!5z{%@b=wI5{%jSX-b
zFH_v_myZnCUL@1~Kex4-%XL+tr%d{Ae>W))(*X63um!8FvHB3A71mgCaytV;sfyj-
z5PKyN_})<rzhjL%!l^-wq~<J<K%}>c5acWu_1*;z5Vo=1HwStWwt)^aHht#P*f~8Z
zv5_4N=LHoc^>$j7_HkGe{o^|D-5C*-ZK4h4Q`bIGcPr)du^Tpu?Z&DJcq?9F6=-wt
ztk382TxJvCJ_3SQUNrOa3|)Jl0~0588x&cyeyO?IRv>Fv;$ruGh=-Ca;UjA3^9vTf
zVsHSLKUE!FC|Pege@8!B)Y*j$@RG3_hozx83&O%2KZ--v?ieh_JsQ)+HZ>oB*DKQB
zAd|!-`J`=3239bi{ypw?plgH!v#&q+)#R5R8Xn2UmX)#N)5L*&ulvS$$cMA#d7S~C
zu<1>Rt^KqClD*uSrTq%+D3n=Z<VR{xRlM{?h8VklfT#+hSmSeC_kIJ9un06EV+OrW
z8=xrY{I(=4^Kd~ogQg)SdD&iU2tLjmqilL4h6%LPK%*iQqX=VL++k!huE6ABHC6;a
zI?OMYiu>Cn2bw*%_K}|26(_vjl%q-zW=dp{uNLO8$)f!iw<&gP5Mfb|<*KMqT=u=z
z@uWO%Xo!ak*b5ijg`}ClYzU;Ch-n5FVn4lfhP(DHU(u-+9zh`?=YW?w5oAwuWcsa}
z3xdKHgaEuGfz|{_J=D+~37_4=yQ~~$jMr*zb)CKXyFr3UW`zTAo;UF;(h)CVfZggv
z3<~Hz#E5!|AOuPS{g-=D;A6m%Izqz%O}e}U7Q;iyQAMTXsJkt&B(Yuk+*jT3>ByBe
z`FeRfE9%&U37?XcuA&D^uH(Zj5kPf{xV=|foc$B<qZKb_?f0~?R#xapA6~L=7ZRk4
zI@d-}l53!qM_+%f!lZQPu|K9`DH;~$C{?hCd&nEm*bYS9d3w^`<&bw7|BU;vIU+0A
zksnYvqfFT%vW!%4(;w|<!>~2*aE9r1-QYine{DN=R+AdqH=3~@F(p;)>s{NNn?v}y
z!Wzt$z15S0J5|Mb?%KTz!kEC}wQ%#3x>y)6XUUJ~r4V=x&m*}LiC9}*qW4-#wq$vx
z5>UWA(*uvxtCcdzogLPZZ$~ZPINc)S<D(+H7Sa$YF6wJ}qs1yYq_86#CS|u7&MtLW
zJ+Dg?4%e*RObT;1roI5a6MDoG=LrScvUSjZI<+&yLt+PYN7=;gsWq++CHytK^iDWh
z;rj|~e<IP!0{IFiMF@px?Vd^|YpziN;DA6ojM<#6A{LsT%1z_(Sv0+93!*j|>NtbQ
zjTty1JA$Ta;1WXuy}%qre;vIC2j_yMk3_{j@VNy&xm<!m8)f<@y2Vc^8>jbzQ(rI^
z+}tiDS=cJ=Ck>-n{letR8Aa9S1a8qbQkgn(GDPUJk!S7Mv%mjau~8^UJV4)8uvu^T
z`dnJ?=TN%A>m44W_V*W;0n^b^Z!Q(73?3>;tGZF6Qk`!6!F2+p&tBfMFfjf}&70|}
z@DmbZ(;+YWV#S?$RQK4kp(RO7W+F3CydiM+fOUXtnBz*~IPMi$)8qQ0treXkD!Hy{
z7apTy5K%btV}8FP;mmD?R_R~;$P(0{cBZlFj#D~V^$N}b2+iXnk^4~F(+S650|LAU
zrozD`2NOD62b?k+%NNec<R|yn0@Inb5Nu9P5;8{G%r?Mhs-cecoP?V=7$dBKV2=VA
z!KRm&2|T_=c%PBuB;g9Di(j;VCO9g+Zg@r-@^%kxf1SR{fzAh83PK6>C7_o}Q6v*z
znHCKxXu3?N2ZE``@;<#HFE@j`Ghm%HrKHS-ZAxBu!B3TUSmMTGmW#ni(z1MTcR2)N
zU2_Q88PlT{-4)2C^sv43XXuh99v#Y@JE*~9D|7%XwMvLmL5=*^))BDtCoQ+RZ5Iwn
zcc@LDj^{nouYg<xvLT0&6ETK{Ypny%4}noT_w<K{17>N`s?04$smaTvgo7vnSxuv8
z>tD>*U$9M1CzY_KCMdY)p-jr@taVbkG&?TZJ#$fl;fpFG6x=NLG4F`v7}vEJ<^vW3
z8s8hv=;e>(fCJzy9%T+v9MEa4NDMRyDL5Ltu*QsSJG194G-pnfmI%txx-5<3R$%_)
z;~D%%2YGkMg;h({FBN33Nryd7`uYYnL`@FO@ifW}#&?b@A&J(0pV*VHEAX&<vkLN_
zgsYo#l3@dJMaaabh=G*Z4vf9F{1s=#B39l`2@s74Vr0R-UQnjSXP_eB>>rn=>p@;m
z!(eHtv$?;wdmcp3Cll+M++rAi9Ey2oc}2J*`Esb_FT2%KI;G9w>7h@rXG$~|yb0KD
zo{Kgk01)W&PmeWQgY}Q|&xlqOH9G~e;v4CnYI3TpVz7+7tT=8A)N<qs0-z;`;<)C8
zLYcVYb#aI;!;?;kSz&NJa#QY_448-_TD%741JhJW7t83NG%U@HIdrbG>|#>oi!KC~
ztrVB46=i(1rK7(V2}5F+UCDg*XFQp&3>M!sDgut>dY)cl>LKj2*XCnF>q2Ptmv~r~
zQ)0@jpRY8R5z7ljO0XhyNa+ITd#_)c?EBfSF3Tk#D>)iIxEHS}8!5M!v4-c=*b^_6
zwRtDeJm_&PV)GMTGTOdQ)$!v_s)*sDEMYOtGl}y>NJImu2`xwDHt!>%<5*K;xUSjB
ztYYzKM+UIxd|ss(H`vubkqSTC=wi$%2h^+`x5i<*MKkdkfMz$XRkmi4@}<9blMiX$
zd9OUCy}2J+c3s(*tA<fM_LtRk(5p9|6)k<wIRai*qxO~%*kIZErca?2<>}615W?d`
zb;8hf86^?ABcT~TQ(u8Xi9YXmr7#XN2(%kaZVBA*e%Y;{$6OlHs15{L%qSI1A@&N8
zmFwqfz+)MXwp^TyKlfy4Lws_5^DkMUJePk{#eYeb5WfFraR1_U#Ds|dw)ukK19=Jr
z0)#4N|6z!dxCsDc#DT=<-ek>7Mp*!J{`b7^QoN-9V28)R-{DFBngjy!FTL}>pZ@FE
z5&$I$02d|%!1$P80szX9-*tRcgx`a{OYu_v&xqkabN>nZg}xKY&itROkVWK~H2PvL
za)`O8%O!|l!F=JN8C2Y)v@MZGu<q3LG^zSxKfH7a!h+4qXcwjn;<4RfZ3Niw0l%lD
zNzt8X^b6Bh(1ck?bfNas?5}F2X|v9sBAY%LSglbtMem<QZUagRLaSk#+J<JMA;eMw
z&}k5wLw7xjTPL?Z&v<xsHErY1iyP1TRoGK$fyR{*9BX&VDV)_gt5#cM)4YotT4z9@
zW@i_H{WPUgWuEDxN%~Kb#+*hpPQv-{g}ki+=s=izT<sr25*Hxckn5WmgsI@8nqM=)
z>Goc#At8DEPB|yaZh4@fWGo3^?(kNC%6>Q$m_t50)|fL<#0`)4ep{J@pU0H&Z<}Px
zlyA1Pq-E{<qN{lY#e6zD8i>7MakaUv@6(_w2rCbebP8nfnVN=np-<Z%ec3p68)FeM
zE(UWwGBT3XuS37nJN9%!SOvMD$UmnOCl-~1ul{VlJ#ZUx@8c}#yKkh)li)+^dY7W$
zoHFPfad!Vn$YPf!#jvcnUNi_9c|q+plwW>Dy1aL&(&hR^>e{*(N+N!`@|i$!(s+Y6
zBcia^fHnHA<W)i?$0x6LeQdveizv;`M!*fk5Nyy;@+*;qnUS*borkZ61NSW(f2$JN
z%A$r!ngeIP;C=#+)XLQsp788p(aG%m7HWr)aqsccIrzR~jat%Z#*imo1PD)TW^y(@
zs#{fBORFVY^bfe~oUvqNkS2tOPxsqL5_v=y&W_^*r3v`*L;WBbf7U$ReJhjOm9oLi
zoEc-n7tY_^KxpqO`BW!+QM{v@!Y*x0UtkB$qD!U;_WnS(m4INi3sO5L%&p1|;~PV+
zSpr-hX`?|IiFnKLDjDq{9(~o0H>$t%8w-kPRTAFtwHnBZ9}EbWzQ}hTVUjRL=b9KL
zfP+uc*mSzw_M~)rpOD%luxOJH4P+<~y$$G^klh*2epc5TX!GD)LTE{B7TytFySfnu
z9g-zQU*OUK?`j24x{slr795rQyt2Mmp`oV>=qVmV?`-l;Uw0#>Fd09`k>cxdC=1n#
z8FTO0S>^p29s#Whk))gLk;3B}HT_!Y5F7*d1NR|v9{X4_!oMu7I~AF^^z}Qm=n0X!
zHIjHQP9-t@Im6&r9aL1T(AIh8I79wrm-wz&)Cco?$lMv1U}r^o{SX#_iW#Cc30EfF
zDpEpIAq%a<yhEdVf|2!93a{DVH7qF;s+`7}Si!!r$i-z+l7q!x(^}yUbhu}dn1>Kb
zLu5X6e^yIVd4Lrb5PV%oVj7gVmDf1#63jAf(^p_IuFpl)*>w8$Jw73Whku+poLnP!
z8|Bd}sE42!^b}pw(t$-zVa_C55pTgt`@!^csj``wb_=NT6)owAv*$`5258Qgx<9A$
zaP*0>_eS}Oj&*_>gbGwVz=Y?T`>Q*@ZMnS?&tA|eu44AMr>A*}N<}q?PRZ|N-dRwW
za|CfzYH!M-$ru&cJuv@_3TZF8*CW_tYkk89NBE;1pS-LnBdYL_MvrO_!UxICM3yKb
zQFb_ey4b|&T7gw0+N`zZnqRViAa$^>*8;weL$j>0Y`%z3-`-As;tc$tkhG07<mWBv
zam@i`XxjPX3H(Bqk_v&Zo1WXDi&349lO_fi92+O|?U2Q6<@{L>YVtX3;j_1G^X<%{
zbT|Dp4nz2lp;-l{>>u`X*zg6*gLaN~%MV};i96qZU1kr|4IAGu(DQgTfw-SpFR4HA
z3Dy$rsIsWU#8p1^xZ!q-F`M5lNClC48=|%#nc{?s)2R`hdU#$>=3|zdG$!$k%W&cr
z!eWC<LF&PehsdB!1`M_gLREt~tk#Z&c+YrfA7jzRv*PHEz`wGm@(@(RFj~wN*qD0p
zu}wlyE=Tor9J47QTDzVf@?bkb?i$?#H(N@mup5)ay5E-2cLKArgswg3;wpH06dl3k
z1Cf5HokaHM!w#S8u43%AFSbEQNi(T1?>*--uPH|n1L5Z3;UJ<y`EAQMyJ6x)%*uLQ
zwPAC}{KWY)6mr0g^2?f*n8yC(4THbpYubGG0d*9L%E}XRkN-kQn3)YVQhoBAQ5=={
z!3Eg7C2t|(b+tNYAl)_r4|uV#<qjnk9UG6G@#`06<(e<(tju;#rNJc5bJWm1?@J4(
z1t!%qiK$?*m0MhRWVr7jd+1e{gYCk+(hPwrvg76C)CO8O6JRnN>~=I7zpzfARhm~T
zYI`nGTk3aZ&Dj<=ZhH}$6IB<n;qD`D+@yVX#6|hN^nkZgj(=w=VV$&+JtM?W${qp|
z^WBgfp>wX(aVQ@RS`Ns3eF2<^^Pe^bri}Z02K|A^!zQOhV2rxU)NF!^Vs4!bH3r;-
zIG;V90mO{cMn(+|tr8C;N$SwCnZHmV1&Q)}MLA#1oe{Cs#zelVq3BpU9aX^?*8MmJ
zYkT`|llNL1Pm9dQ9bl6XAM<R>@l=+O;o~W-!&$rmt?n)Lj|i7*gdhPcf7#KD57SG<
zO6jN}15i~yFo~nQGW|1Ro_@c{H1e<0(4SI=UkN)j&&E=kDA`9AR1fAH8CaK2<x3@Y
zrT4B6FT~gPi<XQ_QGZRWiW{@N%vv|Ef;{;CjtA)tkj4mGVJbka)BI>gkqKcU7W97#
zpb_C;U50%EM$M$Ij&~z_uCy%eE-BG6rm%w4a5&zgM#<L%MGw7wDOvkK{{}q~w1aZ?
zaz0up<l<QO7-Jm*)s?1X91B6S*VpxxW|*PW_8OBhZa(`bGZ3XGraKOt7f_isMt6aD
z5>u>Z&!Re|J^FKZ>}e!G(_*Qa1h{WbpR>!u6rEg~fh|+Opd5Ei7K+h(*|W_L;H^Qn
znC%Vovo_Dar72kWC6`6BTa->Lq`=9T4Eb+l#<KJWg;Yifo=?C`TfYo=0Nn}jD~TnE
z;J=j?IKT=(rFMcYo+O-v_~9C+i}4`04k(p7am!?D_Wh!uhww&?0vEBy?8GBknD12@
z@HF&v^)ow~Fl7|!N?&TS8qp9~CJCJOaN4?m3Q3^g>fv_)p%i9r5Ve<1D3bZh#UGlK
z=Y~`x)##DjR<m_Z0B$HDwAt1v%^rvGGol;1S6_!3`a52r@rpZ?E2nL+b1E}xKNDdf
zOJDa0$m#1EnWxORsM4r+mJ=YuH0TBJte{c2H-Ti-G}_6vZEB9e9pOfR?J^YoF%{%u
zU2_F$-P3r)gPa{$1-Nf=l0mi6np5ihvjR#|Ay)HW=Po@_T??MQoDqMk#s>++!NT>8
zFnXgfx$<1v2BSXTPXy@xb@k70-wa=!6P0d(n2(A+EL{tzq{R&RtlI3;cz4dKve0)$
zF8g6eor2dRcs`)WQ>AJA)%f?EHyW&bPtmdndP`9T!PrYfnOIL$1Ecq+Vq+$10?mU8
zgmsdd^E7NX0ST9TI~rK?NtO?uc*em)U#OEYq_esgdZQ(*SK5`mV(1l2>z%j#orRjP
zs7=$3*#ul#*Q41y;&sy2Qy-*!IBZoT&Hi%0kDm{P&EG*)C<g~zB81^WF?tunB1GiJ
zRa;evkxPH?5r2VBgYbr;$WjG?-C&eHHF&~1uQ4`tT)@GzHa0n{btB|`;z6-7G5z3E
z4r^ga1-A$$U90VpHn?t39m7j02yDwZ)NT^Fn{()1x`df&D5%oMjRQr{O@YJ?hubDr
z;SJtrW8K}*1Fyf4{C2ZNy8u1Xvafx2Z~!!g@>>2A(su$C{sW5NH*f;MJW9S5B2Y$v
z@&M>}6pJg+_ZRG0j)06H30oJUKmfoVK@eySTrc)k1iaE<+^{;ZI&f^}3V0Ks{*U-0
z36!_|AMn2C<e$mN|Fz}!Z<zmI!2TQL4+8*bg8w|Q2~xQdf$x2o_nkHaD8G*|oW5s$
zBmDo_VEVsuga6Op{~&zWn19+!%Y<zIpE{4~iz=`Y@yM|2K%yPy^NYL6cOfXzO2nGf
zeEHs-(g&XT_Y05q5YxksLC%$sf!!|t6v4QA@INQ++Zn2Exi#J@e-h3*vz7At<G};s
zv`}+zu1g9Snc8Vw+UrL*ewZ{DFC&*fE&Flk8X|`ZLN*>>>?(}Q(fg$^X_QHojAm9x
zJGp+Fysp{2ne59LdVwbvc%cv@&9=M`7}QXRIu7HrWr>|!7YBROgRZEKT@H2841v@9
zfdj<bq-%)}VT(J}3N(r4Mq@S*7ubp!<Ust)L-P6Wq_L&sC=|Ih1|x=SHm~$z<+kvG
zJj7!NZ|vrG8cEg<WIq{hPTPE;vDA2Q$^(<{wGjB^V)5!qohl%7j%UZc7+jms7@*DM
z%L-k5wPe7SvVHh#S+#{H0!4}2J8N<a$-rW6-NyX)H{<xX$<T0?uVP1Rf4~Z7Z@BU%
zaDbk%^(wkciD_T2Vu-vQe3A*$EA5sr;4xr~^IxN`H~O6YRG8xz9Myz)&b%vpUgmIE
z%9f)*9AxA3CS-Twb@5@8IoV&~`&k2gaX0;BjJ-_LXnAFb{bq#%lX2P%?Xi$vN3Vmo
z%l3ooSVsD%S7MP1`<kagz(A|uKFm6Q5rrSFzJYv3<#M^jnn1B0jLNd!C__{vr(TD=
zOQ6X>)*A*0(-po0mxj#a1~}SdBoLds4Vqx>hTZ-cQI+k>y2QbV-~&^FbVLxFBaHqc
zp>w(vr)`pkcojn!uDn$A-P^r@mfP#lXHMdAutSP|!7nTGa&gglp!nvb^?0+m)0`}q
z=}1Y0dw!607<oB^MAA$4FV{D(gT;ed=NCkR+>RHTGkiOPri=Xt%EoTFDKB>xDj;O1
z!wRoswv~^g7oE;KJa9Jlzr>!7GIP+H<)5$d>u5@oc%SaIj96*1Gf=u2XPGQ8>0NF>
z1>BhieZ|b9By(Kus9SU$J-vZiJjkUzhBnU65I3@-S_gEuu`lnFzEk~L%DWp&#Eu@|
z<cukc;ExeaM9js;7iaSWl|F(QWbIy0X`AOJkqZW2_W>=V%nzuhyOLhKWfzC$`Sq*3
zjeo$RvaHyJY3(fD0L`vjGAl0J?>~@z!n78Suuaon{eDR^<*r~(b(dxVUkfU$uE+s8
zIk73Y;(=+X<B#Fcb+2vwRh-zF$SYznf8(t1#D#ni;m$0@<slf*!F6BO$yuzm^@(mv
zRkX(-+NX!I|4ADBOBq)JEiCQ}ro%cYIONIR6mXcpT1sDS)tO#O-&Y)ks1aF3Mry#_
z?ORk~wbz(j{T3gfqi7;B=S1Y81zBj)FCKgX*Xe55UQV!W#nIz5g;gJ55W8AQr0fvN
zdbcNm<lR&@*_bze125^H>6vp+T55d77iNi8Xp}2&Xl7{&$%?+t{PkH^_e&EKHc=H-
z!*G(5@>CkaeE<tYYDOAcSk%fYCZ-sL1jcAWF+9Ki8j&yJu=VwP<VCPvaT3?%$OJp&
zD6<4XJ^tKV?Xq!@PWBPT*Kw||@y=oLuEhg{$L}JVZtmF|*tB(63^Bf3uB?azoGz6-
zBQG42+~M1GZ;vW6K?m5!bs~7tD`-}L&&Gb6-Wl}t&y-*}^gAei1hP}(;_Ev+y99Yj
z=t;a!D}pKp<Dva1Qd*z8tY2j=!mG4`8+ZT)O&s(GAFst2ak1Pk8T`o>s6xS|@l1uq
zt%ZCR!ZNBH#|EK}u(sQ67?iCS`1K{zk)gz^^TOwzyw;wZKdl^R(&*>44_CyBQWGX~
zRb4S*{BY2x?XiJY;~pu5DVnohF2Oc@KG*!rl#aDdvsKr<_ve)YQ`xfe$S))c{1a6(
ziT<Yqw0aeI)5fK;)1SuldhSbq3o`zw9PCZ|seO8%F9o7?Ex`~sDw&g$shJRWMTJe*
zahZ{7VKH|$?tB3%yQ4wt?ZREuVFRb&-(92GP$0EFtETaXMBD+}Cs~gK=O-rPK0PMm
z)%*E1MN!~9YlST&Eth7`#=TMZw7t<am|qb<XKpNp$&51MHfO}srL)}WkkmX1GEy3A
z7AXO(SoZIEP8yM*b7;7?G*0-?q-$&H@-FT_DVo!(4vKYvl^qkl)brYbq^hW4UQ^37
zgk{}fNOnw{iBQ1*uF52}YbG?Pt2ZqpmcjeI1{@??E_QIsYYi8LfkZ!dJp#RAO8}c3
zK$t>Cp&+JcEzl>_cH=OYd~5G^ua?=Sxn9iONT=LOM*&oJYZ_t2evVNJ-hSN24(NIt
z(tSgo(^C&<91A_64_Y)F$7(Uf;&kY2%XDZME^J3R1*l=@`IKw=HyO>nd()Uq5AF&N
zC7^~mbRmxPbWX*CiRrY6U6#c`O<Ov=JHM%1X*uE|gN7eh(W-**W}qVS5FKJ$mfpAE
zI%g!Ud*Ayr6Nq1W?iS8pk(9IkrqJ2$VEIOC=F{r8k@3SMo%aawvn(3yUz*}d(`D_K
zCNyykslq3)=yr}iEl~L)soXJS)GC%|wOcs!K&~5u<~)@y&TwEKlaGw&p)tQW@_5jy
z<E9H(M!yqs{vyXzjH`G6J<yQ+6Y@GfXpUN>YFIPBKl$?Vt_gia>8bO|Yqca&9S39r
zcHj3E;x-<z|CcrvjWEu+V*RQv4x>u=Sq?B)f^J@daHosc<rVwfVPB-k#+6x}dVN7H
zbeuDP?Dg8~j2|#!W9vgxRXKdomC39K!V_NXofiQ{@|h@=L|b_u5tgUPV|`Knj14p?
zN}+@$Z5(kdyl=lD1P7#JiWolMpbRnW<kGn$J9!m(O)DbEF~$TLhoqf2%xzjVYbMI{
zGhImPh?h9c0|Rl5RO2!sBkol&%)z?<7@j-irSZ$$UHCFIa|V_O5nv!rD~&gC1yG^I
zt2714ZUFz_ckv0FTH9a@Gt9JuM`YW)!IP#(*Ql!7^t&uUC{EkX){ngrs;>9G2FmRo
z^(G-+#HH>bW=|?$)}&$d*_zA5t&4H9nWvi)?y#eFmQy~Vf;3^6M%~MbN~K2PDDb}u
ze;Kawc}_U6UWZ3?`CYL55)_)I-<KfIzDbcenQAT(vPB2u3BKGJ?&Tdag0lWIP6B|_
zw}LSNLyYT!`b<N(&6g&eB|=o*Zzt}8LTLUQ6JxP+=^D~>v>=R)X;&!Y1<a@~CKG9J
zRz*}gI=J!TAm;>6R{(ey9yq5IT@IxP<>+t5nB7THrmd5b+eG=w0TCXONnG6_n28x{
z29DqSsxzz}Tqeqr;DShseFy10&x*kFnO#8HVp)kQN`NE5fVE<2MP62Wyw1##yk?8<
zf@0-~D=(9l<kvH~kkApbDr*?KF+SYNk|Lrfa9n;<98a_BOGp+i_}F`{E^($Av$6nL
z%q;)(=!j}zu+5Zk<uV{}BEI~Uk*Mp7qp(cRDz2({Arg{7qvgoGJpbnJ@HDMgH37|1
zND&I1D@S__lrRc7%Yw5TrFfA|r<s8mRvpG0Hxg(op`%!qfcBQMG&&@86cwxfS3F7a
z@V2}=2?Y)*Evg{JoFr{;$p~jZwi}l&j!Y)ynCKEdh~G>yJMqwFAAV^Q2+;dpQ~k}D
zi~#Mn>KN5FRS8d$?)fJ6JLu0%y)EeIJW;%GQk1={ZbvG{-AFrID33;l2;dIG8HX;E
zR_5BdAy<Qj<Wh9WrA%)W2e5IMm0+BnV<hB=9j+%G+q=K9_A2Y7HoF)*6Rgt`*N{Rb
zI;_0JiUAj`tyz1YVO>Ne>frS>e^2a^5FAi}o;<2to8VcxvWyYQ%opg6t`B~S0~M46
z0_$X{cyl)?C{Wuea)xo7XFK->5l|0ezb8Kd-$?WXj0op-p7u07bKQ1fx7^42a=1K$
z`cRfB_TN>8zLAbUieNA@ZQC!iQQw)OKzNx^EeyH#CMngF;XaFo#D|{Aj~;!5Ws&4|
zNhaClWKdZq&M0e<nC1_g+hG?7PInN%V12E|(F1j%mJb4iG3t_fy1QA~)3WhVte|$J
z(m#l|jAi;zM^C%$(DPZ)4tfTqzE`lY#r&^fw8ZH885WsqxD!J_tT%-B3%_pMSa1!O
zDkcXJLDNWnb0tJC#`mvrKI9emQ7V$bHgl$W&sFc2ym6`brCMHa0tM7Is8%O?oQUdN
z;&As(8QTG$LlNid^&m=bnQ4T3dBmjZmpn9%PC<<=10_y?^*YoYY0DSgSE+YTAMSWN
z)qp+_X{?(?<$7!yBp&F1Aj~<Yttw`xY!D9C*$1Ci^-2XLP=A2T+@J;}v{OE4+Us-L
z?|oAmjelwr(f+Fk<G)GJ4gdhL>I?7~{&wAE1;zwBgCe%d@(rB+a}Dea05E*Z9cF({
z<^zFv|2b;-37^3#ZL~g}2F_7GK(z>Dv}g#p5Bwf2`X4ol{~OiH`hMd-*%Czp{=bh<
ziNgR)yO6<#|COEj9l3)0|E{Y5)oT8aG5_1t?;Mzk@4YqXf3+z7FSP3)yB$Df#-=mj
z3cA!O9az#uVxhw;(EK>G&AV8wfgt>d;tJ+&&PL4NI+>g7(oz&!8=@bi!Iq%+lV(R!
zsItvFb8{D=E1kJ59`&!0|4`9RDz^*AbrqWjpS>4dX3VoG?(-!Yt8(=)*oJX%g|E?m
zy?%DMe~gXj{t>#MgCcXmgX~o&x`fK7@<eo;A6Q83304{ju85EHcOoWIip;}xlc4R-
zmDOT6uy4-~vxOl{)UZf@$*o<)gkFcr3T%W>ig&{4XIsO)^C`z+p8FH3gjX{&iW#hO
zW7;^-b#Hsr6P1C|c<l5UTR%x9ts#-neo(=kkp5KMnK^X!c>fP<N6kf^AEGgYWTuEO
zHp%a%4AvPO%U~PV2KZ{Z&ptt^IWvS%`h~CXjh=ZeL^CC#Z%lQ0GRBH{9RsX7Q%t0b
zdbqcQ!$-rXT}7Fh>pJ8U!4b`T0fu0PQveQe3>Jc)83YJ!Y+@AeP9wCcOW6;y!K7_A
zV#^ALD)^5mf1Z5<rF*~q_{M_Ke?;wkFTF>o?A*E*Pxp#naI+=NU%)L#>uX_6Zjpkj
zN<(x>&nK@rA$q$LYq&F;&~5X3R~aJHEGnC2CE^ibova~Au4A2-=;>;Gzl+C(1N*wc
zpD!vCc7V+^x22)#_eJP~$-^3ul9)w*hVdf?r67_}4}Rc7$%e@#vqN5Yix~Z7S?D{~
z(WwuYwiJd{T>f1NB>u1pM-3|ZMX40i^7qznPBg=GZN=sbCg>_Rv33X!jh?N|efrV!
zGhV1`C)*Q`!z@8flBv3mazmiWASQu$Fy$R7)y?4EXlMra$31XePWYk#gA!g%@W!3A
zUgAfPEWsL}d*)<%LPy;&f^h!$^0{n?Z_%bH6Xy|~qV5ynItKrgs=an=OT(H+RuOSl
zh?h}-VC+VP6)kdRI^e!Ne6fJtSUJGU!)J08?GHfU=G!9y)gDUsdN`H_WU+k{3`5?U
zdEF=w^LL(ugMBAI34JW(#!2#zk@Wm;KD{$1S@D;BDoZjLs>de=sYIz3wciuybMHC+
z@4#7vBbcEMRmF6U4o|v!*BI19Q&>2lI95(L?Q%W7I7KWbttZ053gr61CqiwAMo)9F
z)MYfkb`2X?$-O`<>4@^}wxN2iEun}t5dA^CXM*=?<?&w^Rft(0SS?|G;zQ~pX`d3T
z6qwa6*oCU=hiLZJv&brrwW;DwL|Jk+u*0QxDuedA!3Wi{!#xP2>H7w#Rg}kM!|rA*
z`E>gYraIkniS_>m0UJUP3C?e4CX&e-czq{_HAW50lLHz#7T@xUoLkmtaOxcSSZ;_B
zt=m+=?^~cc!i>Kq<|X4b)!lS<Nnz-fV?qlNlkp>ULOw4&Oh3mdx1JeD46N}SIm(L%
zvDe_yp2iR5(Zf;bh$1j~+Am5?ajOdc{wrTKYivd7bdmcnqqc4wAmU^4%Y*ReL%}%;
zlub45m6S^pMT~Fy7lP7xlW*Hv`&&YKZ4;qp0I`S^Pn?*e!Ec#5RzntN!AaW4v~2nv
zZ2c*iU`ebYdk+DVno5Qn6|S^#E!@X~Uo+b;gES;#cC16-7&G{%CaK4Ke=07=2E_9$
zxLng|edqYZd56y;gy-Hz>5Ar6AFgh%E+hD?8&U^mcxC)maoe&(Y7Om^v7N0G4t>3y
zW&?=kyIroah%{^}Z+^MyKfCUneyA`5UNTpqja#y2L@&_!fManz3Pr#&L_2DCJ#GBj
zd-b2;P}q(PX%zJ>LElwY--j0=OEGyUI*Y!uCt!GWOKX%Sk8E(57}*;`eiUTCe>?G(
z7BmBzc_a&Yc%4^bY*@5|v5S!UV3hQ-c9}FgOUUchN8kC&t5R__8hM4v)sGhFaPC6u
z-gKsobYgHeBqNs7JzflFsI&{40sCeNH%UBoH$$@C01HX{6IVii1DA+Y<l8-6h}=B*
zx~k9e&G`?r)awuvJzDO;Tx0(fDQdp_Pl`WRBg1XGZA-<@TVcb<WZfS`%5Wxfqw||n
ziWl(n@wz!eo_h3CJ5a6Y0F2b$6o|2VyF}V->?oza^OJm|VxNMxWm_loAQIs~H_RAP
z(`B$K2BYNXUq&(JSb}aT8*vClRt{xr4GkCZW$_&I21pcIr0>41U1Cn8gR@DZ*la$s
zF%M(535-stm*qYe5Q@Ku-P}KvleoP}iP88EIHYfrh=H@0(Lx?0;#g=oj2Oz?B5c5R
zgr2UyJ$cO}`S3xL_5ECCXFNA}$<CqLoeP$uB6W4??Z&T_PW01X#(&{MuajU$_lmVb
z<WWB*!l(p`1s;|n-&1guGA(aSAN?&_oDXWtk91H8{W$zQkVD6<!)_zCGX$#+tfX|&
zCk^|)yo%C@?%qZ`>lO9HC&hBJW2i^TqMj#80$gIU?5elQNNDB9vMhfTa}(T+;5p&Y
z>aK4+V(Otddpexd;VK&brEs?wt%7I725>Q!ZPRmFQUP%L>*A0;1rXSkS5gXpzn}*G
zG@9PcJEb$0XA48smSN2R$tTJoa6f&;iKVNa6Yb!k!`DD`f^zQfkP!Ae+)TN!Gskws
zBhWIWDfz4TQVyfnH$-Ey5k^+;CiI$;-RclKC992*E29F=5gg!NUqT=yD?Is#oeX>8
zt2su>Env4s(Lsf?BtxNhE4WNHJh==mWH3})P!54i@u7(7iCDoO0>+X%-KvZh$s5ga
zGJ}z{=n?@?2hyBUYPlL5V>gWaZDhe3H;AmjF~eSY#x7N<kx7YHg`E2Bz3WBKi{Brn
zQ4A2-tKg>fKb;?fdCdMYV=s=PZib4h!L+rIVb_gW;+po|oB8D1kB+Zq{_OGSGT!i|
z&)l)Q-6O&)ck=7@_AjsB`igu|qKPNI`D-nNx%g>P(;6y$&&;}hrJ-_}`7-!Gk1a2b
zf|z^pHsQY@Nbmjy$BQVKT!wMrLmu=XRu}$bK<7IoL+w+C>o0@W=JLFZsdBA)CJq87
z>9yhp^;`*fu<B#R9lt)Jq$Eh^tiv3x)((`;F7%DNXWgGjK{E4Y_plq_Wbu4;Zmfwh
z3kyAsLPz~~>p1!GXnxQvY)eAT*ZJww^?ZiSBuGY_{fLS#N^pOS0_(nW5EW|^5uF*3
zVd9Ho&eX_4yq(PyN~gEd$G6j8dm4Byg-YQs!~>MPG@C0s31PX`Ei^`9oyrb{*5&6L
zS}uzW^UOITPv<n~>!NjX>wkAtGL&a^=ILq@MYFJ{p`}SywQNKV9-7MDs0-;}tT@&T
zZ&@vre+7<#;qs6L;_T`3#fh%d>+hqs{ONV?tIf`9Q@oj<>Y@LHH8;EhqZ|^~<6=D}
z99uJ2S-hW%g5x3JTZv1-RanH5lB6a{5~j1vnuk+nd#z7VW$kb;)wweBX9&>LGTHbY
z5Jy39xvoQ)Zp}8$V{K2bi5j4)l2jTX<k#I%u515X(RuF3)A7f*>umGkaqUUyQNbjV
z8T;~={<dS-M<+=;zSr=17q3jeJNN8^P<UG9dw(B<xxm3)9(c0H16#_`d<v`RJJtb5
zbyl!On?kIr-$^jOOtfMJ^t;<+M64gG^PkZHum}|5*TdL#_D9T`7jhzzfO5JZ4S8i0
z(%2`BzbD6>JAdME{1l^pQ5I+HA262idXj(Yx*1$OOk}n`s=jf#@O_<~rEs+5Q>MtD
z{sn`*YL?-ubYf@w*#vx9KP`rFi8S0O09Nq02YZI8ydTmHB?ff6$9I@SWS|lEjm(w*
zDZl#<(Ekr=<_-i<83Isd0nAh7ST2I!LI|wk_a@GDxNmwO*e(F<dmrYzp{^G(D+0*(
z*P1208i>7!7F4eD<TZeR@q4Po|J{N2Zyf(GfPWqcg!Ioz;JWaCUi@<n<N$zCQX(Xz
zB@P5sfNUxP7K6S=eaGehcLm=6{Nn%r<R760lv5~6<X=Jysw~OZcX7JVg1&U%h<xRO
zAUX-+5hDQv8hqg8FT^!@prz-}NmIfH4a^JLIy=EY2?5Jdh~ISy=%Z_$Ersc)n}POY
z!Q*1Y#^UZpp!Mq=6A~j5^^X(RI!sWf;-%U#-9AOler>8OU3Js&JGqH<2$-*ikMJ?C
zfRZ0^+w`lS+$oquK$SrTKQ2ZLLgr>H+HaQ=F=1lJQMZ;IW;=xw;BTu;2R2q?iR!te
z&fE|&`TB{F^<ZjHiIVWJcmber&ZZO7#w7{LxRzd81~`<Aw354p)kmkip&i={*nad=
z`O5)LQjqM#A=!T654fy7<S%5U@wE=s+}Zsvu@nq*0t}xI_=@I1-DWuvEZ0@1>L@eC
zZ5<H}xWwE>f#x406y_)uOEDv9%O1MY^;HXe;LGCtqN(_qN=|A(rjIVP3&~nFf0s*u
ze(7)!Q<|mVI^Vk!Tp0!)N1#%MszEJrudo#mY_DX4ba;s>f<Q}dLv2+-nH<&G1mrQ<
zKF|Xo|F9EW`q-oY&_*nOx_{t9f|h&x==Eg>%eG6vu)W=UWLdonf%7F^2)90LE#k6n
zy&~ApBK!r4=jaOI!#BkRUnq27P`^k;Jq8pkeoM%gIYu)Dx~1Yv=QrK-33`Hhp;!jZ
zxL$N7t0AH~EgT>OmZQBkDb_^KJ4ca|vEE<je%bvb89+B=)byDce7c>b5g!md0=Ii@
z8lhLlEgGu3(tMX}zkoa(n4l)Mf`k)ElwExPLowu(fV&m-*5}?)(fHS^0yn%eHo@3>
z+|(a`Z=oZL{pctxma1;dIkQI|UP4rD{M|m6YZJcuWg>;futX(#jJQrlM^UfiJ$OU|
z{hebZi3?9XQvMSbkPt8i8w*;v?81Usv>aoft4!m&SYt)|QF~$RE~Hv#cYi2cjZiD!
zlIg#~wugoWz;)TWIe+}R501EB_tAa7P6e%30?v;j<J1x!p^O!KlD$YtK1AA`aaZna
z8v>+dLUvc5ReAvIpc_24otLreU>3a`YokFEg7x6(66;4^&?H{E<Srppwtxh&(X+g(
zj#t7z(F1ohH<e>eF^8pln!yN857~0jN}L#n)9V||KSe31^|tPGbuH}+#SPR7AfR$k
z?R(qRCW>r)&sI_>LekQtXFMG-WQ@<dympbeN5+4zKk<CBvWE!NL17j&7MqEk<R3cF
zp#<auB{nLS*;V~tq`hO1CDFRBJIl81sxI5MyKLLGZL7O%b(vkZ)n(hZeX7@5d!K#R
z-RItjv;WM<7$ft`UpeBL?}wMQd2Z~AV9-yBT|0Jd)9tBUsyJfoBC_TU!S(e|{XVUI
zY@T2V{OB$p&2`NK!+NRnLIVoSeCzT)LeB0FpUUM~YI~ORq01BQ{Q2APQ<p<{&|`Np
zXq1o#i{D*Fxn|`X^-C9_SJk=;WfUPjbX{V(Se$+uLC=@e1ECQ*H5uXlrEnMo{<r5L
z=LaP}eUJtqdrSn-?Rltc{H_dtZJFQviupQz#DKC5|4nfKg8TnHcYqqw0@Q#^nQR2U
zO?>-G^?vCm(2;`aW|G^`iY5$11pjdc!Lr?fH5xYwcankwlddZpQ=rD%yIn+vI_H7=
z+}4PQ!;4UGGUX;z`VvKbjm-16%0dU>YZfTt{?MLEe(iK?la$5>$r9zp`;mA;h}DBJ
zn_W&>?KlG=^Rt_YX>2J}0G%FJSeYm-_qq<G#f?~kpxyPcR%pH*R<~LzY0LWeH`Crj
zaZ8gT-AYr&?CxpRvJ(icL2|P&P0A!xL3cI9ekdm~Pd4`|J-l~@qlj)MWYbTlG;e+e
z?I_{cXHGW=C})BMs?K3)zTV8QHs3R2w1j*0K=t%pQw9PU6Ceb#O>G%eQ0Wm($^3-o
zhmoiWw`NjHwACQ9`DDYWrFj_aS&*~*#e!k06H4@Q1%DA*&a{>Q&#h5C&|Z#}X`mSi
zE{@PD71=4+Mz7PA8JnoHkthKI_f$B_x&l80!QmG>itg^4fs$#9YHIf)y|n;VF1bQ>
zT%JH!uHdebwI@RDxqw8$i8Lyw0VCab?~J#C66tz9>T6|=?Jd25!Tm@|HF@!%8cq!D
zf<6o5Zc;J0>o}+^awu`QT7k~18A@_xq$>9sq_HC7ogWd5aQzaZs{!7F-{=l?DFM7y
zdSgrCS7!bQ%beF&kdtn8G7b<0gvH)9nf|L_Gx1ye$MyT51p*Iz=$=>}ULqo*XwWyQ
zJpoB9PMK=@BgB>X9RpNyPQ4e?wQs@n6mO!s&)<*VE>vm3(#;JAB7qG;CTkSA!*|il
zI@CJSA#S7#z+R(En&UgpL#Nx!HbntZvd}z`?+W7v_`Hsp5?3J4Vk?t)`&imStBl_v
ze`Wjz`{P$RI9VFj9y?3jF;4RuTi^WsjLa$_^byo{)A*fuQ%5+PyaFFv-bHW-H<i7f
z>TWfBnKJO1ONexCeYC^I_|vZOQQZGx>4OPzAGy|^b-$At7D2Z<x<W(KKpjen?2>Z}
zv2rycb1`%={0IaA<?^G!z|`IO_O`kN-;SC^v&e9Fq{|v2AC<49cB|yhsZnHvv&ghI
zcw^c#-i3V3BXEj#u@P;sS>Mc@lLnlS822^(6I9JGJ;1@r30Uf6TBO^=v#>T)qiDZ?
zXgNcY9kWBhk$;R1Pxg(Qr9XJ3cfd@7io)`NlAV;meF;LIAemu~$zT+&mW?|0c;BP6
zl0;Yk@^n^bI@3s;G<l3obn%6KuAF<|$7{g(OQAB_;sq238tTS<Kv_hM4OOKkRc;$E
zEDI?Yy?g<YqH<GFv(~YBdwZ&++@I0|B2AHuYe(BzX=_0;4|niNL2f_$kaj%Ht;VEP
zN>B;Iz<0vQW~iTzbfbIn&Y{J>LeiEc<@>vT9856ggqs#03%!%9<-{-vKGVQX3*yF%
z{W9W(-h33%gL4$`lqjn<Y)3k}=a#H}J<CKE_&%f(bY(!GZmm4ab)y{P`lAMl9Md7)
zMEDNh9|`f!O%LmURS>@aTh<bWEu{A~g}K@zuvyqdg>mdr+O7$wvcwgh{PzC+ENZ00
z3ll&wyy?&sv}JRiIHr-dp#s2_^vi$B#Xud?;s;2BMZVDmpb+2tnQ4<cia(|$9^<Oy
z)kxntf4URUjlg4Xp8Zr~wFp>1%AqySOAt|B3U9U%0mwVboV~XE@!e>eWCRXOdAT*|
z@8M$BfV#EoyE!Tmy^>xeL8a-bO30>*{$5Osd<l0G5h=lBP|~)Pm%U?A3tdjf8|+e-
zAf303<wM0VReM?!MbOOmXvWa|^TQF2jH(hJ->qMxx|XFZ6eu_Itc7o=KlsQQ^%z1P
z`XYnukR+JfYpzuKTle%q^7=S*4Bt3wJ?CaA@lq*llLcyolxtwA9T~yzV)8!uaT^A5
z1wT-pRU0=jbLTNJpMevwrVMwe&$p6dKj#$#!v2SS4yX6ao8CY}$m4?Fv|LfY`O})%
zJEzQjEjezWBVvGi2@Df^*_@S*U^P2o{AINyoPSM6`AN>bTVOW;lcRcJ!Qw#fuxD>(
zbnh)Da9GTy6x$%S_xQ7r2hol1D_WA0;>wSTv=5KGFs>5(QMRhkce@YFy|?R`u2&h3
zMm|jIc0$e80^gA&P9!{sV{Yw@1joJ2x#wpq=9z6u^xXfH$F}KX8syLQ3WGrLn!hrj
zm+{GGuM|q?@bIB;r<49*TFy6LmzU{b<;scb4ye?ZN1Nk<B;Bn$=*E<V8<}3d=dle^
zea!2SplD<&@nGYT(py%8!%})Onj?bFMBs0AdQLSmdAnW?F?sgm{W5$sXKisNGZLq#
z`w=LA(o<O`7=8a3SJ34sH+X3|2DZe-ImR=~%U>^fWX5~?Qq{_H8!@^X46Q|OaH51!
zRYjbqg$Qqh?*qq*wo5UGS-(bcV)JS)C<Fg|5G@F^koEqqRqjhP3>fJECC_8*?noi}
zrUUnB!A1d(<Opdxb;{U5x`b$r+6EpNTrbwohhq0ea?_G-j{z2KCm}r%+gDe{j37rZ
z-dc7wf}HVa#T+E_>E1KC?=SyW2Tl`soY7fSV8tPjbOb%g&OoCbgC*5NfU_;vMXr%-
zC0H<Llky{0TbWy}9Q37Wcb)m!=r+z`6c5Yv^+!@gvr2l8wrqA18wpv1ys<YL@x&$^
ze%YhyHx!w5NYWYfbUZBWpKP5}XN{cQlvKb61yxo_+*z_v-`F?&k?EaF^L`Xf$X+EX
zML*hIPL9_!kA`C>@^u7q-KGXxgQcelrAbE8rOTwHW@Yc^kxbWe6m`+L^SnH*t$vST
z8nknsPxmKQw!hUqTZ}URg>wO1*E-0kZSi28ce^li*)RsgJ@;ai<7#hB&Zg%djYnT7
zLEH2N&YHU}hf66!rccb5Xl+SU!sJ<T-<01tw?oK{GU#g#9O;niQ7WN(@h9Q<;NW*l
zhN{s||Dhwy)NacZ9Yi5d@oB`9Nr`9%0Z{^)tYxV{5;aOy80he}1L;fOIeYOIb2x@z
z_c2mkHare#rbJKiTyfhbB9w6j@2v6=H!sY*))`bUnaS~^ggKcpKNXlEG9spa#5}vc
zT`&p{x`Qltq5JhXzUJ@V0eMoR5PYxb2Oda*r?OD`R98&D#Wg@44u1dMB#%uxmBr-K
zFqufQstV1!ue1AYD+q!aCnC}90NtA5I43m2^{DMgq5eq(FED1vAm=9{!4ok!kB%Nq
zK;={RactZz0c@Ubs9C(4zR@sih}cnZP~*C5>SxNy6N+ONG4Mb}A+k7tR$#}rOM6R~
zak*;WEyqPaM7LdCPpiFT)a}U7FYhYC`g+&D-BCR~PWpwuJM*4l-ORsD+Q{>AOOrsd
z5=0xbk?AELSmUL$igTO{&B$*DVK?Y3ni}KkIE}>OCT>0bzWf#}5<0M$=@*tNyLMwK
zU8#lsifr*OFe1*+ecBaZ1J$sU?Q5oA0}kz?#rU>S5ILokF4RZ(4x+K20)4i-W7U76
zipA=gWKaa&t|)O#eR&v%DnU{2O2nwZvB}>8Z4M~<8e7;jKZSFLZzO5wgo9fioHekp
zEKa+04KJC$IQ#)NkmUTw&+W>$cr)@-O>+f4gho?Vyv9%Mc~Z8N{3bz&bRTtADomv%
zi~S_tFRs-V%nlJ{k+J(Xlm$j+^alVO1^%&2Apg(*`rieBnZD*!<bv88SRm=sJm_}x
zxl)*RmXJ2Ihe?5BPPqe*J334=5P<E*H+?<r{I}Nf%elVr|50oC|4PRF?>AFPd_4sM
zz!3leRT-M31B`*Ii}J&g=>J^={R`n=8bI;CLHPfE`u`*FKeztTPK6|xUjC&4nEywy
z<v%2Vzxe%|!Pme)L~_F47WZL%JZeLKvsX(hvj#JR2`~+Zng?5{xb3sC+#vYIEopHF
z<0fRkO&5Q1H&<&@SQ}BaIgJ>)bYj+V$QlNTvM4OpmBcbnkXJyZ`>6&D-wh@zR@$4M
zmb1Q2M);=zMwkmpw|sWFkXo;u%9tyu>M_S#`kmDD*%58{X?WO9D_Y8t$c7GMQQ9=W
zNsa){(K9<_01g;C1%-wz&y%Z@w@b(~g1M@rlwfcu9x+@dy5n0NNLKGNh-CVvFv<X%
zRH?Bhb;1Y4$i^yE1uD^D+eVe;PwngV2-W@upTebC4bIz2x30#82fZ7kQ`RE!9-3!l
z1<bCEa7+$Pf-9Nz%F-hmuGOZXZfP<p>)`-!ObqaSv6-57RZQe;Jso@6w;M>p=7cDR
zg{u`ev3*h;lB4epEb}5*4%GgMzkkQr<Al)G;|{xfxoZnxz?JiH?uLzIySt{rR;C~|
za)xseRQRU}#K>2Qt@{NkBsHikDP_l<MFlydW~Kshw@MIWk~}Jtd0BYomhF4pAADx?
zN$@L~1jRbM*dQa2a?-+XtK_Ao9EDttBIq^8MS^TyU=qz&nim1i9jfDGOlzhAp?YM6
z{Id2pi`yq3F`%3Js2)HIkeM8nWh+aFiMkq_0Qu!~uUmzITal-_Clb)2i>p@=&a;WB
zi06`(KC48+D$p($<wlGt^z4rdWojYfyLLnO=dwwO{fZ^;b3=o}Od}O)j$KrGsZ)X3
zpBU*a=ZfO<MruM>A*`kAru1aJ2C^LP@88LdIjo^Z<tmXQBRq%?r=h!dQBawGWGUHF
zDEy#&G3_p^3*zV1I<NOAp3!}#Q6|Bk5iG#BJ;4>NRo>kV=M<4Stk3aiU*&_O#wOSH
z@-<IeO3@9GS(uvV5{v^j<=hgg^s;x~fVodn#-LIzLhg@Dsy}!=7Nb8Jf;iuFbNy`U
z+57Uv#)SSk3#iQGz5fvK+thHop3}IxTSh><(?!ID#Y|P@VG=#htkKa4V2aIIb2m}8
z&j%KL`BiR)jy{6yFE}jPIsVHPD)qt?^Q9oNEt(3gzOS+~8wMfct%aIgccFwDa$@)j
zEzBsaQ)65qruX-p6lu+8P#1rjtb3h7unx+rR?gX4qL4H$wGJhq{au++<Xdfwqsnbo
z_gL#Yr~GxfbLGoiMd{LLQ@Y{PzHv8Bv4Z_1sQKZtj!HxZkeVh$t|%(%(e}Fd7PLw^
zzpUVmU^%J`?3$=@t~Ho5eK-hS%sEN_#k_vDynL!hkYCni!cVE2$w*Q#XVdR=v2oMV
z`Ny%8bo`5e3(7XY>K{C3#(UB~N=ck#j0Dq!9KVK5*E_2yWe@t@I2y{swxkMJO~Bie
zP`Vzg6L2Y!9}>tzOL<~<zQ4$Fz^)^I)D>D5E$Gb|O&?DdUT+~}N?i!134n$5TnV64
zXy46OUI-9opF?RFHqXjSpcE%chyj5Mz&!<|j=P9Chv0yoGvW)h>dL<cf&U_xd(;LP
z9l&YZOJb`8ou0~3@^+w|v|JhdM5ZujE6An?hp*|SaJbSSdcfG?<pPcGZ%?ya)k|-d
zSBcZ(kd5!!{DxICR{4zp0>7ehZTuI|l;k-=8hGdIDV{9x>Htjg5lME|YG~7q*NALA
zD`wt$t}BC%*CDf>w@KCBOXFpP^;h~Fg-y9huie_CU;WGzV3BZQ_I9sl^m7FZ$Yw$Z
z4=o^K{$L@(xw5*i+W@!<8&%2rm|kZrvVd3sRt)P}LPf3K9di*B(HQv6eP68RZZ-Ai
zn$me<&1lEyHTIjduBRFcj42~;Q$a!L5(Dq#;K`DiOVJIECzosz*=ZMu&e`7PJwec`
zVo^yxn;=Jlcf0_Os?ia3tcCL3iGb1q3CgT56I^)Pi#t(j@A{859Z}Mhc{Wfhw}$}n
zlSTGi_mNEkh@QY>kSK2*t+nAGNyqGv*`C2ajz>H(^*(KK6OCYyj@IXKg;@lr0{WOb
z(!G^j+|@%vZW-;=zcvZ1Dv!>gp9(RVn3*u1fhiwjA|i#C6BAmjuQyjpUHyXXMf!qR
z)ru3EEL%m59j@5UOU1;_WU+j>K38#u%G`ID&aQvnMhXZrN&HkV?R>rAOrBEquEGQt
ztb3RbKmWbKm#ZbW_FcS`JiMIa{*}l2xniItrPD@ESz|!|)itnVgksLDoDMG^WdBNS
z-P*24QgXS~R!1T9^5vu~d|rc4qQq$}DEvoM?3CyY*lYD@#}JA_-2QQ%vELXiI_KCz
zNbX|DldTzB9g9_XYds<sV~Ui$pY2_s;QFyLxL`!nZF-umm~<AYQH_qJN2+ZT8&peK
z+;7;K5o=JijG5CVST4qCW^Z2)OaOB(+HvabI>EXrm6V341QSn+m!=!!mP99CR^k@L
zg{Rjg6P5S3xNhb|z?;{0>GdG(AN}@b0Y%>!ZFmnhsCc9bW@O~RsHDjDa?-*Gso2vP
zIpGGblkda%CNY$$zZ-^CP7$*MF4=78SRzE@d4(|vNUCBY>Pw$whmsxgb$&#zj-trS
zvkHPO#_|7zPghFr);(u>Q^*TZxY3^`TmJe$A|o96K=o8oTgIMPQ0Vv?LEDvrBB|fr
z@`oJ@xm+-MsW1vw9TS*$TvkJCl=Ma`bY8c0KM)WtrJd)&$Hy<j5}fF%RYzA@BIsP<
z1|L{*H$IDCRX>`VHr^C(V_L7XMO;Vy!qa`-IVe|C9_QDaEZj~U+++8GdNV_}wSnEo
zZ=^z7h?8=LuP8phMXjZh?Zh=cZ|x{SL_GWIz=`l4Z0=c>bvlQe+_lRCJ<>arl$j$F
zhcyT__BAbL!^Tqn$w9+8_i9rq=}r!-MYN@FdTc?~SB3ciY5IfAq>@l_n`+dGMueyD
zY?L~xip@ShN`pc^4|p{OVKEJcHl-Yw$2)fV`q+JlVbcU@5W<nG1M8u*63y_Nu%oVV
z%kUWe+D>eW6GNuieO?c|AP2EI;dbqZ(2vWC;RYKG@otU~w5b^n97gJz7&jjoUtuAz
z)pmdTm-P0tQ&3TxW3nG@??f@lH;4bRX$-mg$v5y?XMGfY!EjVDVja;VH+K=xi?Cg(
z@SsR)q)1ctHk2Dsr`BHase($Do^y6;8gS;D3x~zEMYa|j6Yn-^3PhXsj`6Swc_3Qc
ze}jD5d@oMF5WUu%hl2^LZ4=6uU5EGXM2B6&+pgHQ4ytNw<&&rbOcN8?JMIl4aV<>F
zmgC09Oxty-yS@5|cYF4M@{pvS63Ls06?9+-s<x8|^_~TGMd0^cg(4K8b~#YfzVj)2
zmy5j~Q<tpRB3-q|VZ^rb;|@G{VI_9Pg+Kn471)dC6*ofmm+g8$8R0!&8pvl~di5iy
z(1&V03At@Vo$9w&ktWjaFRuJ9m^~tj^j|C9pb`HCmh3~Y0I*c*+$nGWzboutw}0iR
zuo(c?INcEPUw~|c4{kB$Lw=S@k_!O-n-2pq{fhV{7a#pQ_5yt!ouq{Siu>QvDvY~V
z85Mv4(_cj3?`=qb8;k^jvQPf+nD=j26bL~6D-_hJVEW~MZ87>wy{W+LKy;_IE~}Df
z9CM<EN}4}zAHv@OETYtb4ouCoCp<0J&|Ji69{`AMli6I0n~9Fa5ZDuPh8ZgJ7EAL_
z5lHNSbV)&gk6RpRf$sWtZ=qXLD3^qnz0(<X1$d|)uF0F-8lFKoRKSF%UzvNxK!gwY
z4`iB3`f2!ub|~=0jnyJS)_a?abch3gu`z4O)Zlg?6X%`I{<3#iKvz4^tu)<sw*7_1
zb$Dxfg_Lu<z*CD?a?Ak-$2Ls2vjA(L9doUe$shj^1^Fk8?uF5Dy5dn74BSw=+d<M)
zVTes92K19dqV4T{{y~>J>57><>esra3#=URkejoBp+{|m3PzW;h<nkwUC*{@KHh3Q
zoOR?Qz-uPaFtzbUinBWNcRmRCk+R|D5wv3H3y=ZVEz06q6-av<3F0;u0VJv(8<Jr*
zvR@OEPeBsPcm_ob*3ikZh!Y}*jf3XOl6Qo)39Kbd+{g~tW6w;h96N!?zZ$KP<yJkQ
zv%D;~Nb7eSeLww0Ng9Y%am{-SDcK=dFMN0>T6=}s;ca4fBK~lz(<Yz_#W#&IGS;*D
z;_xL{6<WHwsgh*wDauXN*MUmVa<3`nq_ttlOH(n{fFKAEbnApj*8S3h3-nh95zgS6
zK^|OpC}XXef-Xd^`&}nYC^l%pHb5|olT5<mh*H~<nIRR3C=<XLny1xjz?tjCyjNI?
ze4xG??fsG0aaDFqtwgEqDq024?$)6yBQP9Bxwvfz7bHMKBxVn?K1HmGk{1_xP;00_
zXe$+V6#v4SYktl4Jh!tmA==1oP8Fpgt{`$2F8&aA08086)%gRmjbtqf>GyY<p95m-
zUecM*P-eYRQQOaJ(<8h1$Qqzm$e>a|yGV(Yjq2N86P!Wy&(g*}o_Ac|6V;WMZ+#?{
z3g{(9|CpEPx~5Uj^SM44pR9+z{Mi$`oEZR-{B&X&es4)?<3C8fP{#1`dkoz)^XZ^&
zNi9NB@JUOQE7avt;2C&}US!zB`(ekD8=U1zTL!gZ1v0&N)}qKS$wW<Q{??6HRL@R}
z3_hpJkZ%CZFEz_JK@QQCcSlB=K8lfRo>|Zwf8eJLObD%$Pl%dY_}iv67YJCWkqlGF
zwJUDr?$qvW^%#ny>XOa_gweF!MhEW5^81jjMj-GSqKd&`|0dla#~;F<h_gGi`s3_U
z=BB`4!nf?X77oTO$mj{pF8+CH!3#aiAI_i`N2Ypt-aS+S-zekGp|~M^aXsnAoH|@i
z;Rbh@^##l9gXKifw*86h34Qlu#rI^ZKp4s4J_ovf$~i5UigM7ySua3LG=}Nx*IC<O
zt-#|?pHUP)`|sV>eXL1i9DdkkPj2zT3l7&=9NqQa8)Sz@x1NTvqpQL?zpZWB2~1_x
zOp1tOMDsl4KSChz_CHhD`70yLh{vdDMK0JxV5^q?InKQLi8-1)U|M6(Gt7_LzuMc!
zemBRhL+56r$o5>SzcOGc9tcVUd_Pgw`3v#p+aKYK#c6oX74n}o(qv}cfwM$gXX@<c
zFDJXo8M^gALy#=AYAoN4=jV^MB5e2aSP}L;KD}<CkMx(Mvtmpf<o2pISF|zW3jwIZ
zvbMkayCz$RYxU0jF1+Ng#rW~<<#uG;_Lf$4V7rd?=0wHW_tvj_#p7YWY2{KG`-~To
zbw%(tR4@?-gtUf-)Vv0kEO5GILv#gKp~`9}WqiZJ`1x(AThH-YrI4La+Ytb{E3eX^
zhWOiNArUdMNN8(PrTh|ar~k8S*s0TaMc15nrkG9n{n-P9)UO0yDNYjvb8{+Cnzw%Q
zYQ}0SDE1Fsnpw8q$iCi50gw(ohVL-mtW^Ejyo4b)s|tZ>AwussA!S!MHt2})&K$9_
z!b{k4?;V8Ob8v#;{9b(q65xV6bFY>5Il1Ni+L}R^Wp=337OpT%emAZ5d=<A~lmQ;b
zc3tzFX(`KXX9p+sqTkxZ%$qV@WbL`0_UKFqs}g=7pU&1cthHPhtw!=jrsmlhiMqDo
z^VaV|e{|!|F1Q#>MlCM++S$E6=#lwCW+&J*0ZQ+V1)uK@5R0f-ze-d;m2cB`dL;BP
zLy7Y1T%L^~xCfJbUr+sKTY(Q888Bh0bO50^0_?9l@Jo$ZseD0A-{z046+<?LM<5~R
zs851Ki}KrJ;P%GJ*0al?t)(lxX+%PIY%g!u-8vh`)MCtXVee-K{rhO5KUJ;i<DVoV
z?skTE-l9LsK%dfQBGvGwY#t#Py+Q3^;N8l|XA;6wd)a{?qYR=pJ+bNu2NkY&K-QzW
zH=ks<KR%_He^FtI2Dt{hV|8KBZ3l(&XL}YK!{Z9dlXq({2#Kd4{6VAnC}W4x+@V44
zaUF-jACf=*r0Zoi;umz9W626;r6Yc3TZi@SPHh!k!Ve8R=Ty6sj6fsa(lJY*6hwbm
zQ`=Q+9uTpfv;OfoU=DB7AyjUT`zLHt;8u#K<7iR)CF64K@EBHS<2M{!^O3Vqp0f!w
zG}~{!wShXaTw_odi$%-KhPw-_ua5kWVdX!A$#X}Dw?B@y@L}yDh`(+8Sy`w%OPj@6
z=VEi}cRy+@LqHGkhKSF-xjKMW#MRZ@xNnhen}snjCe2%F7});?+!-`J9X?-tF&&V&
zROCH!7cx3tz)Pbk)nbt%8~1{d#*V5?<;_6lCfZbj4pH*HjvLo}dEBv^gI0>*Qlt|`
z6<->6a+3tcsIP`7=fxfIKm(_M_E3t;b#IZRpf}ltGjy+?d#c+6WSIN?O?m}*yf4`a
zyENQ1adNfMBI=l_rUvWVNqaHO2O1mDc>@2+OUniP71NouzSeAJMLa?lNZWKh4L&3K
z<=!%?I_nnvsA8+&4ktzHI2KUS41{@AhBhvzfDjV&VGr?`@rhr<`4sd3{|@)nEmW&R
z!e+V}(OEvAQ8`aAtA^9e+VJ#}CH;ca0dz3mvPFqLyQU2hX+Z_SZzS5xFlnCY_NHRW
z?o+32p{3A`<An##<>N%dd!V~#;S}X4f;XLwJEnw_VN=2l#^V?=M=DzOOu&gF_6;SX
zI(?vM7aX|_C1_dz3$Tgi>mbNu#@Voq4YrI+4|t|dw!JLf;bD-Ihr;?vv{z-#Ubg4)
z8$=b060;QL(=1b(ES#BVJ+8Mefqk<}E4p=zCT~pT(V0!xc|=t0`W5C~y6wVYy^_j^
z*wB){k)iQv8^w`7$pzPJ!iH6l6SPTypPD=bmN+(|kRjTAD+i#5d?^)iotA4Z*Zi3L
zgbAbl<@$9i<_VSHD4nDB(J+|oItOcec`5!epYsB2D^JJVkY;N{j~s0nv6s`|-(UMU
zW1{`4V#C>OGTFk4Tu`AQmM#Cqj9<<3aQ{)v<s$$J3II|DP=zu8fUt!Umj~p*&H#v5
z3d>)e^YWmi05QEULTm>H27FDY1=M^Q0x_CPX7T2@G@5kEpUTg<_=h$yxC-igHQJB=
zt;70io~QW-*}^jX#mm3#A74OBgA(*54ga&a>)(FS5dlDDSqW}o73lUzQ}&rKnSXDD
zhWd*2)jUu4f5*0eL;TfqA%O%lnE#V(;kzMR^ztL@iR;z5F@pq0)JVXF$=zm30Ot~K
zF<mu?OBb+gUTE2%cyil%WRKqu=(<sJ;AYu721{H@WfvLPNIg3?O3+-i0l3AjFkXD9
zl!ix{qUuyLfZ{mKg0an)z#s8ZUa<36Vfm}vg6D_On>kb_cH0^dv1G@jt)L!Q7%c@8
zrMA0;y$g-p;(H)W&j(*~81kujbBx2l#Ba~4uJ8HFZv~s*GqLH#NC~uG?8-vi1O{LD
zY%CE%rxj2Hx%tL!)~VXMLUPUHL~_Z_6ja{UW>+6Njk-NpXn$n1^%t(kYRQ~s|K2Ek
z9EtcEvFlA2<N2XcLKMJ<%iof^;?D=0EtJ6*n0afo)8-Ea62JG*X3u|=y?639Ga_8r
z^I{+M*rBzGM&@9DYez5w<+mVd(-&h_x$GaeSS!BSwuX8{o(xAjirsPcU7&*9D<2v*
z=*6t(?6xltbnGGsLn{f)4W-x4_dCpoImocq*-D-PWc5;gidQ!ijR#L4Z*3thnRbiF
z;laRo`<_RveZMdyq}cLIU;5!U6<JfR(fy~By5h}#4blz0A6k^U9|zepWY`zJ_Uc$q
z2GMYf@UStqBB%-=n&$7_X8<HAs!nGZ;r5b#hk#$LrrPDIxKkw;_D5^_*~if*IzY*a
zh1!H`PW^Z;qktp`o-3FG)&X9faE!eEg)H`13o2VF|Hq4mx<^NQAngG8^YRKW#ZCze
zoZ)7;wemQ%_Gl&65&pie>=}Q=OvzEYL92^I^GJ8!il%a{B{-Asj1L>;f)zFcIF4Zw
z9a_Hq+OY!K4rdH<_~pYDErh1#`<}k%wva024b^g@YJu%HJX~JyIZP9BJ}YycUsFxm
zoC|6UMzJ;Oc@J1Np)}pZWe>yp3uNMM6;`uDd$%Pr!s6?0B)KVPBS`F#noYq|2<s-Z
z2yyQ=0^(X*DLWu=8eVGpDT^_HiD`f|!=cr<FG+`Gx8AkttSjxCF>vmtQ`l>T*1cZ+
z8dvF)fp`_Y4dt^Tz^rkEeky7B*Vd~c64af||M-?xNYN_$eBJ&-+Q{V5;I3v9+qTgt
z$o=LIay!-WtIyP%Sh?@-u>;30MEzLsDIz9o0?*k=rPcG^L#gr7u9eq{XMZ`44oVaA
zw_;cgm-qCw+M2JH<l-f06ErP7c4DQq2Qm7Y-0JiQz^Ak<LCFYI;*C6*QOktW6HEt1
zP>VZ5a3Mw*Syi8U*&WWEA$<ZP6tG=meUZvGAr?Z&)trZjmP1jMS(@l3<<Z9wqIct)
zpo*<_358cy_mP<ufuS!UFyS=Z1clk9Sdu=!f|gg^<t0r5fGsfb#VZuNXQC#f?IG}l
zbiMco?gwq-cE+EYU>}7h(?(AIl(v`RN(ByUt`FYZD%Vdj`AIzw#~!R{&$q6?Df{Zl
zPa||NB$o)NY#l~p#JCXhI+&8Nlk?hG>u;415-4(~S&E)~ASE$DOZ2uTobxPxY0s6r
z<`|Ef3~Fe52nI5Y`DHn4ZHnJ59#MHi!Y*oSSyo&0Iy?=r7zSUeIjR#<?O>`nYsk@A
z-|ZQpX3Q$aut3@w>+4Mv+h=ABWTk=$S+I3jbj5<8gKA^)ed&FHMecF)_3*PO(fj20
zm&!+79sv9Fd6J&q9_pB&<^InR-v<e28S?TJagw*OJblefXlo(_!6`}gVCED-f)B)(
z!I)7Q9`4-J3YTWI9)ym1O3c?791kEa#4Te37TS9n!n|vM%YKKEPL{@k?muPgI&zP+
zWO`r=sm*gf@7;l~%4wc60NHyK5vG5}4tyWmfH~G3boccVE9kbyoux7b>)YAM&@hVP
zEQuUcZ4=K&@u4rHjkm-M1&;X{@=-BG+ADtPpb_P3U#TMk4HHxnMvIkKqaidwWp1~n
zwgE~-A!Lv6VWX7~1SFX6FSzO4^1R%dJ4l39+9whyzK3ytRa30xWRx;@GNcQGydvZo
zynCj4zESiIay?16j;@Hk(Bw!ocujRnD-qsnF3H>Kdmkwhv>FuhIj9%)tzWuc?Yd1~
z8Tv12fmpnXAqR{y%@An+9=HB&m6A){jy9tOlZqOLv2IylM|{k7-niy&`fwLs^N=VH
zec|>>M4Vsci=}p7)3>fwZ>7)G>bWHj;`zPTH*^uiar097jtSZdhi*t9>hHGJ*Eust
zzI!=QE`j!#3klRrV@XYmNwWQ1fs7Y8ya#_}+WB_X;W>Y>pF$+48pHqdz<fJb(8FWs
zBu;lL@%rJ@r`7HKv#u&!(4v?W=xBi#)^GB(1jD=vMiV@A*IGn*4PT|qmy7ikbh~z1
z{S(*Vg%Pmc8e`R1_OJnDQtbG0LyXQ<?@6tL6ibEyX(uqB0R^xE4JLc4y5)*DI4N*n
z!5B)*tw=&5bhdAdDNCxXRCQFzJD$V@7`Urf9oLVoJ3nQ2@2fx{gO<q+GFHq)4}pmr
zrC_yV&`rPBK*^tS5RDWkSom+`f*}OwZ$7?-?ORES4YsZW6f>YX+Hnv9#S>{l6-xD>
z#qPtRk1{s`;2@<KGqyf}-RY)0<kz1o;TqpW>s_ogRSpficgs8Jt$3-Sk~5~|I#Owu
zYLR=i@A!~crzx**g>;C_RLZ4!SqAWKv|aCe6Cc6-vcezPjomqaUnUnM|B&~2@EmNt
zyU&nN2KwRaXv-`>95S1%>m_>yE=DDlMw6gqwiO}e7?q^${>2eryrb|Ryz?&z`6^A<
z4=??azQPd?QPgyE0YF&b{{WVM?SlaSv+{fvn%?>j3Gub%b~CdBQQoLe1{_K>CTJM-
zi!eY2zha96<=FqblK0OTkY5#@|74wiG{XM9rhV=H2bpvNASGl%r54?>?|?&PzLtPe
z{)sz||3lni5zKJ=Pu%%0)uTTjx5%_09UrftprgFtD@;|SYrZV6xZ8tQt;tq>|A4C?
zLjdFMV6o(nqAe}%V27A}B@cL;s7yHMNBsmp=v>D5II!LdgK^#X+RcJ$Nn0h(YhfyC
z`t+!~ID9T7YOZtu$$3!eK+tyUd|q`!${P|TSh6n@F+{M>8$bZlo2he2&fUv)Q#6{g
z3TLCL%8W55;`8p8?aB<0ETL6L^J%c;dAT<*x^nzm;ofT9f|W3IHxqbsm(;1;{JrLW
zTTny2w^Ou_1KGlB3RioEHvM}gZp0VkD$Am&+!5m7E8?27@7iW%$)&xwS&i>5r!Nht
zxqV@mBKCaVIH1Bq$lu9%5KM;d)2Ov4wTJ5@aXZnAVUTDFc?}Fal_gZ~-ff<h&K?@T
zb)!CXK33=>TYvUJrqJoZ!PsgJraepm3(nR>@Wovw+xL0UN7IJ(G6iIO&FG7}p8rM#
zyT7vlFH7r|n2h&xe35064A-u>evNL0MC^@fLu9lGQ9s?pG8)o}bb^Cgl%=jjh`xBh
zuGkn?*3(=znJd`7_Vz5)t9pt(#z3hWES|kmA!g!n+Cr-*OhDQ+$8#jtC-QTIIzS_>
zy=^enm9BP6xZQ#fg-(y8h_&UH=~AW23iM~z%y)wB*RuOWqxZxj#eJrs)y9xhPHsq#
zTzFgeisJ+ICm}-NK7d${05Sxu+-R|bf#Y-JB<F9<12Vc(4Vcx~#t@`X;nM{K#&&*7
zYK#dDgv={B1fbzVzleFx*>3VTrb7E#QOyrC178W@EahVgf!kVZMZypHy(Y-KU%!hs
zYkuAHhx5(Qn{6A=yN4S&Q$b@dyv<LkBW6xlyX@lPijhN^1b+ZX#ny)>j~bTc7F&33
zGe4|B{VjI6D;R;+U#L4RSq*cQ>N8ddt&*L_ibX$GKoO$VcR?%JPDC)<qVQR27uWhQ
z^JC=%P>P5*XsDd);cKiks3cap2ZF}G-FrgK9t^)(GaOpO8eiPVzGdtQKyb8JA#H~A
zbonRDE|=f-*@^UxCTTQ=_D5X3S^M5H`*_S^(SaX`gye#sh$`D#);PI@zOLrgeqJj5
zAo%V5>j@`iU}c~=8$a=tKOm|mtm1}vS>iFZJ~{+h%SBGTC%l66oeGzjg`jD<mNJ*o
z+WNr^ezva({@gbatBpho^pNZ<iF7{@9g`@3wh+uTtm9nEz=Yy5MA~S^s|i$yytx+N
z*UflP_nyNvy9Jpn48+d9Fq|+^@^=zd_tYp@*N#xeFa-vE5SVswDutv&gu){f5WqSR
zVQoqxXzj9Cc#0lEk)hbWm5+B0+ppMb3K_z<g0AvlO3VSmtqzzKKtADeMW^=p4M=g>
z%r<m7bAhr9h_gkrSYlw)%Ih~@A47%LS1wdo0&fW_#TFD~?OxK7bDJK~ffZ$TcXmsp
zgU3b7!PE_W%`%+g)h3w<OF{A%meH}OQ;5L4J?0B23%C(+Gb|;+@9yu@e#<kYMO&iq
zxP+DN5b=1IU8+?*!U2S;e66J7AILt;rFD+l))ey)X&eVp^=J~^j(L!>%m$Tg=iK*L
zlNcbH2T4eNf?<4zSHvYe!XSDj6B4%`_bHwZp?&bqB=Xwe?{$iy<jNVJ)26u*`3Ob<
zkd=)obCup*AmjW&dw)zhKSKAa)?4}XDt#x4>Jjl)RR+QGFqC@D!B^Wim)AlTi0M1)
zbi%2Z!6(*scwj~1j8!peX-d@!WO{|rLm*wmGdFQ-!gfuPCi<eWf|H3vT*M%-<R*IB
z2d9TWFC1fAu_z-DT*z9mGxRfU0JLO0X`|t#1q+BI+lBLA1|`9k!PrOsniEb2ycrV$
zuiIlNoZ2$(CNCxM{SrJemmlZG$Mo+s;0`CguGX?X+w4+eja<G+yCc2QyYy!Rj+3c$
zVopDNl&>u9A9jvz-J(X$hH6dH-m0Ty;>$H(_^Rf)%MxqtY>zg$VR#K*QFp!#BPvF6
zN5Xc&eA)5HxsJb#hs!Bto4yu1a)7jK)Z}9#>><TET#Zmtt+~~Y>*JG#D&aXxmKRwF
zR&q~QLE%I&up%l=eqV4)lNeQZ0uxBWQQ}>@`(E(?8L;5dy5Ym_)FxgRl>`edTMy`e
z7~e`__P?It;ct-XNKKipx#Fnbd2faQPE6r!Enh$v&Lfks4w;sRkWm6hLcQL|NVAta
zEwH<v0A=@E2${?xy|shHc}Ezm9c)XQJUd1#Mf)j)4EW`O;ChulESTt@+@Uj4W*D9Y
zWj_FNS?`i{SCA{)$tkX{6){azKsHy*h8edyC4hvWp?i$KSnuGp*Qd0$xnDI5ZSuZD
zsC!yVbyJqQyS#$!mutft(}~xdN!<aONDq&+0+qA?@559T>xzuF)e<c8c~2iCwTuSy
zSw~9%b0v#Bcnm5<h27++wi#YjviNk8xEJ_P1D;uUXfBZv*N|rfp#6>EndLX{d9f=g
zx=)NsmW2H6l&Fk7%}mS9**su_Geru+U29^e)QC$Yg-!-(w035aW|A=mJ3~gcTdUgi
z%iMzK&XV^#Z$vVVe692iyf(+jdBvO;qNh9*`bPNJ=tGCcw#vnCt90Q7^3@U1($+B?
zH_Fzz97QJoDINEgYuDJSML1_N3-(YrR#LPJkhPz7QL#GlDg04eJ<U|WP68)~1|p$m
zv7?BN_2zl*3XUYQ9f@1-Sr{1x1K%6em~sk9)S2owK<z}TlhQBHeL7=&Q{+)~Gng2)
z=o6XX`r}1BN9t5sGX~p07Qd7mfT&<j%6}y!Fz3HeG6JXp2?hL@+2;QNG#~&%!oPzy
zzL18KTpeBiA6J;QUx9>yavJ`79QumKzVxpEX-EGV30M&TEPez4f#LX)oBpnnZ+(UN
zQht8_&rk?rP%xwIzek~HO_|0eNM((uq4TQOk7vj_kb1th1FOo7q1s=2_opQceY4xP
z?6cu{x?-FKH|`VbU1tU;BKC@V*}{y=OGz5T0zeH`o*Nth@R#rmhdvs6VrN#uzHy9=
zatwm889sVBTJhw_T(dlTyX#}YQLqb36Tm*-pB(M1@An#APx6LlH5guP)~pVZO+M>H
z9K5mQlTg!FtbceS>#9+s6N03j97MK(c9S!dvSGL0(PcH!f%6fWbVPLe8P|$F0#lm#
z;gUi(3l2?-@Dn&xj<~C#&t1&Nh;?RJ1`Fay!FYP|Wc$kqTBmIe5<Aq$RWM59H*e$X
zA<;Us$VVVlF;CqiZxNFdsALm3e>4c*CHiIiFA$Q=F~=Bb^M^CzudL*>W6{bspc=&i
zX@x4PvgvwI66Rofc&rXu*{}7KWQ70OQOQF%V+0?}bCl`_U5_#dOUG;5I_xO@eyKH?
zIzlVEc5aJx0*fs6!YoG*?1$diG;I@b*Jxp}`HZ8#;>_C?BQT!a0SmeJ+t@5XK!Q{h
zPq3Ox#Ro!=ydxgVGAK5?-cu2@KE#Hyc%?RK0OwVBQhnKTwMav@`EY8g48Jkto9xyS
zF%#s_pK{TSQd_4xI)(Hn1g6kDGO}Q$H}*0+b<$t%FO$pKdVccs5QoBUl$1~pnD$|z
zI4cU~=NHCSXODg{R^po3A|#%7lG}A;yJ+TTtVFpB+OD8=k$$a)l)G^6&$96>V=5y$
zndsoHNBX`bKNiL;LE44VygtQ%q}X}QY_ng))C))rR8@*}B6PBn%q9pPb^Jn}5Gq;t
z$^4ILdrdH(ym7DpAmviE$-LQo_I7qs9HtZKwca&TP2u|JIBO=FM<b%6$<(j)@&@yj
zc6~s;b~tJ{2V=!FwLH?CT`UIelrK7|_qq&OI&CU|DpTiu(zbG-c*4%UYz@ROUby6C
zl=l(nSb)$Dpq!{}CX~LdZuaV1EK|gP-_t!O2Aldx(z2e~W1uPmU~shX-(L`SVxY|6
z9yHh%@%k{}!KwLZWsc{-sJyNpVJm^g8-02NQhemqaRrJzmYJwd?SDt#1~~HkoD-u|
zV<22*Y+ss}ok+m4mGqb4yuAd`VOSf5osLTS5x7~0X5*W~e}xrpi&fqNN{oxmIKOgI
z>P07hV6&O0eB0%3cVJAgX4*SD$vh4R-n(c-o_ER#Vn%3~>=+e$eYUT{gV_i$0lQup
zm<C;T{y<xVHC{?PB}-D*apcCP$a{a)?o%vuOw-v^x5*%4VN(f!9Wr@|iDuydla*ZH
zfkHUZ22JLi=_9K0^8~h^5YE5sPh{@xBitWETUwDVutRhx+pWm0&7lZM8ab5oQ&oux
z?T3+3+_mVd%W!}6M#bd0A&*}zP_Qpyp_A~y)H)F5*mOJv-iY3E1u~trN|Tsg7yP+)
ze$&^*SOuRFK(SGRFNLd`Oj!fF2O4R4eT2@bw3;O(*Cb-v@FA=wKE#QqRw-ZM@U$-4
zdoSUz?t~Z-r{>d?bLp-O$X9wxLZ^o_DA#Evyqa2Naoe)nHMwNrnL94{fkC;xtRlhD
ze8dB5D$FTT<XCNO<@d3I#u!m6YV)!GXMW9I=vLCv?cPd>#3S1psxQ*@2nd~{x!C&J
zPkcvg_>Q-fZP5==4K?q@SU|tOKDStWxVckrZ$Nez#N8!LFQQgJ3>)?Uy!@d<yiOR}
zHxI6#h6X`skl#lMJ`Ho5hfV%DsizO2+QQdr*3y8rT5dMii_gvN?2S9+^sPkkMnR)m
zK)F*|EZNyhD9h5v(#v)SJCG4>%R_;0zH{h_|MSl`BrbDtj<U?$()vtnIfPBR_((dS
zInmp~1CbTmkeq|F&iXXzbVyAGgpFwni-^X0WB)GwS;e5e`v)}Tw7{(J2E$Dz(5(p4
zea7B9qjc*yB56i~WeH(H)*eUAnmf{2;9FPUKHP6G@R=fATA^^48C|y4V~9Ko>Ou0n
z-ht;&^wROgT|9cF?Fx~NN)Hs_FcZzZc<XMSGHk6p-xH>0k}_Ml-;1>!szw4p2vpa?
zYCZ)$O3M1pgATRzKB#0X<4(lH*^^u}6KhCv$i}l4lW&4qRU7p<X_*yy5VzcN!G1i%
zNZn*lFgEbWx#eGlrnP2YU*|g-?_&w8JQtbvrm9p4&j7n9VHCzd!03L?lRDY;b|ge_
zmz?v_w$z-YZF6Zfczw-Cb1;;=$tx6qnEK-y_<18p48=ez)|q6#fqW6A8rQ1mYiF78
z`_Gm)Iy$cJkXf9}BL@7fJx7|Q83kRlQs6ipp4-vhZ^wl^()_4T6)=jECFDp}l)l7S
zZYNupvODrZHHyLZ=M{o2?Nvuh3q0Cut1Jfu44O>Kv4WTO`DL{BYTOx?L#;XJaLi{J
zMVW=4HnV)z%L5$kI|uW8Uk>CJS3%A-w7oK%2Ax}^6SMf(iB3o)B=BVO013GDN0svo
z+Z6Nx0;Y`N?0`6KmX9z3vOK^DGPg*Lm$#{q7r%JvteBa6Y7af0azKxZv!`q)!M0z8
zkBE~v!HRKkB?4XxyqtWV1L&jC!K0cwUrn(NIxP_H`7s5Tolqj|nQ!=;<T&OGR96h(
z9EQV5a{c-X1|$V@mj5f9d{GDb72rQhu)dh#uhb&>7asnRWcr$0NBU1K2cri3)s?Gs
zvXngcYZu7mE0`cq&eQ)1Q2rB2{{7+*kns7hHDI@Y;>pYZ3{N1@1T#MWPk5pd3CuH(
zL(Bon#bc=RTf}Ti_al$JxIq2)M;_ugDDuXKS>wcjGYEo><<f_ATs@rv(uR9Oj9VPc
zHRY6_MW~5##+SV9aGqig_=J_VlX_uNAmmXv$#agBdt3G32CY6PTsw1LXU`A|-SY|b
zideTPUO9yOuX*csb;!?wYDkP;S*=@Z*Pk)&<B?`fI{N~aRi>d$UQ5D5Z!lP}4n!jJ
zD~%;Ft{!|wz%*lyq=!|)C%(Rd0Ak;^&ljjr5)SxB^8>m3S&lP*?ufzfd=y$US9}~|
zpp8*t2;yZRi5(tO$wFHP^ew$c({Z9i8*H|4Z4okii@(aOqwW}j(LJSw_`8;#DGE)Q
zVvW2^WQk2?XK$Ww@O4;5uGrpeec}f~xF>(Xko1*4M1c_#sH1MnN&ZS^cQh;Q747AV
z`H(3Rhr0<0W`mLZn!ecRgN@H=0Qfkv6U#me?YpKEm07rgi5Dt9>O~WG?Xo&;MrUdQ
zJyykz;+_R53<^*3C)p&3o=?D2((MTFq|*XF-Jo9FaLWSN0@Ae^$~H|^0+8#RsOBpN
zrhXx?R6Kuj@U$c0I<PZwPaCSn0Glm;8Z|_rnt-<)-Sxa!RA=+ZpW${V8k6Jm>qo<$
z#h=)tB-<JMo~jK6B@#um>Kk6L7eaX{MSVZ5k~?C$xZ~BXFK-X&3AbtjjUZO~UHnMG
zAR01{*k+>hWeA?j#GQXhDhD8vM4xXuQ(Q~{su3d=UekNGjsJ!pVn*mun$9lxBuc~_
z$h@>WO43MYt7J;FWw$)nLg~B)PJ;vH;A-@h>3qYgod(4<_rES}*IQMdYjTc(<Vs*$
z0ZJT2+Fq;ypA;{H>Sc})&uDQ+Dv5^jk|#XOZ+HUfLQ(Dum1D}pv<At46kT@a;i*6w
zKbR;Xq+ur)j|%$UNULg8Iuxv#n{JuDXv?OKLj;p5`@1{CW3B>OtZs$7_XDSNqL~rG
zqA1apq!U*ct(`8ds9n$*TUYbAsd=8U5nKGu_B_k+RSEuSS#VNWPEy)&XFgkYm0pp`
zcP%=I{P_S}Q4l2KyV6WYogVN(N_V=<Bk~})<d-pYNsG^lYWYgTOE32;?dG@U>vT9H
zo_o9F!cIFd#Q1HX+1uT@L7WLJKdV@@mw5J_dp`ac+$$>d8gZDibf3~B$ZaSN=dp4T
zU4v)J?XpS4>M24+q}3J_c++Omurd?<{bbwv^FajrzCq=1o6i%ldEP?U=UNy6wh=n)
zmB?s#nGbDN6jR)~>z>GlmTjdGD0n|B`Ift`8Z8CUAqZR}j$m8*J{m`T)tG~C<z=#9
z1JW0aTIG&f*}s*AN@}n*e<Mu1alVwkR7219WxA1$0#hVif0-jTot0Za`RZ*{?PXTp
zt09WXM>5yKdSmoTyKBnk=2P!^NG@Z$l<=Uqp~x6yj63PuXK*~NS?NS6d9yz1G8yA_
z1PUW@vNTs)dZO3No?vQ>xMSKdE<f14A3ZG<!Jkf&B4AIqPac*E-wy@9m2EWN2<dH%
zDb{X4=*C{^Oc8&wbx&;NN|#+l-vt*U597s!{7?q!rTpB{NnH{tf*rg|HEJl6eR}$V
zHyLzyE@^fHLdv1DdJA)lSwZ{9zdCe<W`GF2meICtmT|Y39)>q`V7`SYLpCrxRmt7i
zkd^$KCJ{pvr#LL1O<HwrVdu>ZUf2l6tf1-60bV%o?~hrq&wJs4R-KY&N8!x4sGdpu
z?RZQ=0H<3H_YbOAv)6r+9{Z9=Qz`w7d?j;0(dsVad}P#IC^pLS0LkPK2{OKFH+Klu
z8f0aEQPui2kGgiV0c=2=fm0k&W(7bb!~F`o`&B|i9Ue_+ryx}!z+jz~<&Z#Toni^0
zQMV@G9B#LXhB>a;`zOM-@1Es4jFqMMn;Wv5!S!NRNF`C*@;T&o?^SfaOM}UZbH}~E
zUPZ5+n~vq6#q!QOv_?pGquHRLNm^^YkGWyKJigMPp7(tz9QvxY6gl<kF(pz?owPK0
z6$vhZMR=I47|vm}utpGWY;0#l4JWwxYH^cmn>E52o@Y^#L}mBwX9_;HUZn};)~gw`
zyuf5fU=}-)y>S*lS#{0r?sI-R=F%CRK_TKzIsW(^k=zsWF#K`#Sg4Kbp;-Etzb?(U
zZ9!pL&`V${Y_hzwK#Sh1F5|~aP!=;oU#fjnd<O;E5Rp89%9)hlEz;@6nth_jO_zOg
z?Q)R@MQfbKsEG<$-#Nr<G-x;L;xCC#t2{Nufu%zr%dcwf&Ohh<w14hs{6d_T^-}{x
z+FPU)Jk7StQ<lCb0@zT`J&%3?AeIXYrZ)M8a<!Xj@`q$vu-bA~Oo6=LQB`290uO1P
zljd!$)p|c&-O3_(W`Zjr-jZ`%!qHgQl=<}Bzik9!tlifTFo;*Teu_qRI1po3H~Rq(
z3C6u}X2W^!WSRA$!(Mt~PvK_Y@r|AtlbL($e}`9J`@=rlVNAD@J{Vnjh(>&Pr1rl^
zd&eltmNr{>Co65+wr$(aO53WmZQHi3N>|!OrEQ}sakI|p+kM`*N009tx5wDIGGeV*
zbMIgA%!qjAd?2#Ne7q#mwAC17S~gF(y>OVf+cOE*>-F4(u^G|7bY_sQQZ69%J};3k
z_$!d~M771t!q7E30%)BhCqHB~D?96GgI+J!x{%_l5hAzgh1pNRFU?=u&#8hAkI5zi
zGr_KIN~F;y8kpWTeS~MPt($v-4nl9NmaF25Hc!uGdoZQPeeJ&vh971Q@E(Q=9G6aS
zoTa@~3Q7gEL#!pFFNsmuhqGl+kq>MB#ddOV|H*b90KI^(y#Nvd@NGB@0B{N#=I4>t
zCk6V)2VCG!7o-fKPXj<<jTQG-8hYlRY#d>r9G-t+J0SOey$MtIF981u2DI>bA4JE4
zPyqI?&6rQpB={HK$>ICo@trSsf*HjB6W>uo1jlkD2pH*ww8Py9$!)3{Yp7Mgpq}3_
z;lr^O28B})7Jnx+!}VG29)pEOm#x$n0{VUIc2<Wr_e@lN8jIU_@sc~fv(O)OGxzlS
zZ00pR(N}Da02`eavB_(B(P(hxm`#J`$4w{%D-+pOcnS+>-K4Wz4~n@A<WXbIqz<h`
z+N8pPb{{8lAvbonqmT_$wNW`<Ny~yNd`1Pac#wag@Rd;VI}!WQe7HZW1c=C?`LP-*
zY4&HWHCS6WAZr}II@=DkGrt&+OWilEZ*Y7RSwTI*C`h)tdbaz)thG`BZof1LCAFSf
z_D+_#_Ob=snB~gP+9LFK3ZXe@%w1u0y^P;6C%NiaQ9@6!)9xcFBGLTGv#DG7c8xn6
z?LIn1wk}p+2frk_1}ajWv$sw!kw38zY16ZFRn%MFP3zg0MI|v@Ab@e3^{5D>^^Uok
zjQbJi6L5=*j9)Q>!5#A!1(SNScykJ5e$C!0Nsg(Vb!ZYGC1MsmjBYPqR0K8jh6&2m
zAg@4SRvrGJd2vNZ@~Yo7MK8YDXUWG8ED+dsc_pd((ICz3dnYEmO1T6<q)Qnh0}F=V
zHgD=7pv6F23Fm?K)~<vcHBPjC{$|N}-@QuZLe$G(7<xlE$2T_|ZUTF6-rKl_Dm&l<
z_kFN?x5lE{R(|b#r=;WHM@A@%w&0`lajA)8_^1Q9x9w3Q9z85~-}^%>_xrHxGqxx`
znAW8q%#zmzt@eZPlu)Bp7)mShU4m!i<lq~#a&Fh_i#(HWvjVg)QVQy+>fW4aC1~dP
zUK}z<rA*+DQwB25<ZWxT1p~Hs*hx}-(;e7;hmBlF(x3ngg}RL}AjoaC?uVzbgr&&j
z9S(S<Dyd#GQrYO@LEJEH$Ox-WIu&I>c62pYny}uv25K@<e_pP=ly?hmf-iQA{Nw;e
zQJx>!T<g)qloy7XlOEbM4I4`#iLE7rPkPAVS3qRt9B1m70hRF~{#N(6SRqQtnW5r&
zE(ehdr%#e6h+|bu8Lr-)SZD1ZC^em{UDEbwnUzX9Y!y7zr1$6Qks_f{F0lbOv=?W{
zxu9g*6Br=YfCH?uXc86Xy!9?8rXh<}%e^}CFAExzmbiV1Zwg@aDhGKfTVpSy9y{${
z^=e=YXOU4vJjEnz1LsT!av5F*eM>vOd{Y>Mvs@;>i|KHTkrGfWLnIQC$rM#Z1>7@r
z%QH6EN~(vPzX{8E+?~zd)_FOi;a-75*vy_<QuVIPM%qsJw^+5G#I_UQR)ZG8Uh~FH
z&SveeWyNNMQ&hVKz_ZaOJ;k0&selI6lSRJ^Hwgi^M-eDhd3GV0ayekU^8t6$*C2eg
z4|Pq49EYzd;p_Ha$TAm@p!=1;=!gRcfdkQe$X%J_3^MG4iRE}C2Q=k>_iZFN@L4&)
zYf?ZSWCy_A@`bX2S^?FJ#4AFVtR&tkFx)$M#b*Kr<yBAjusPs9iYST2L?!Tax-piW
zPc-sNCmL_Uuc3r!+4SL%wnpQ{9g0g@|8s<rF4mnnFHxga_MeNfNJ_OVxEFEOwOH|D
zKHPCk%++SJUbC&FAgruy<gb~(xS3G!MBPAaxw6H!>~lrii|}Jw0u?id8K)eK1c~Lu
z8W!6gzhfEoZNTi>MW4c^r!{7`<6ROY!6M`W1m?ts_a?uu^DM)h4C`IC@zQRDoZiS9
z9jE$NSUE;kdT!HB?H+>I7#GD9khW{4ew*Z}Ny8=@AoFIvns&r&|6S>-y`3wq^a*7G
zQKNLRlORF|bmEkVm}9UpW}6yL7r(O}C<j$XTwTQa%+@<F+sw_J(*+_Bqn8O067-Jc
zA?9lmdR%)niNbg|vW=QuX%tV|r?h%>>KxCT4t3It{47hj?vZ+eKBtqv7q*^<GCbkz
ztFQ?>Pu5?}hTP#tQD@)5v~BwJVS8yGdg~Y<v0Q4|T6m}=a$Acm2!BIb$-29Z1|FIH
z?6n3*1Z?!^!&DW#E@ch+m8RBTWh&nRfb-2(aWM31ej~?&IoruR9hC6vrNN9Nn9Cu`
z!JFxDB2A#kUKLSPhlR1r_<1;_sqe3E^45Ka-Ziv@9Uic<_mT+Qa8Sw>kni1}rw&oH
zO*RS0v`R?`UP>O=s;mvHQ}MzC<-28%q8`3TMlG1$(2N-KAw-5-r0m-~VUA4x!4UZM
z2jbb-P_<nCXdZfaT${5Q+Ia`L@PTFlz-coRjSX@NQg#TmiX2oVKg}2>5K3c*nf6ld
zUw#m!grB4g!`JB`$d~u$+$i~Dh{w;^pxa|`pe~)d=5<eKxlQ;HrL#=P9vaDWmtP8X
z_^TsZ!{{-ll3nFpU>76rs?{D2>>?tD6Gv_Dy@t#^Um9X}eTxUp{*8ZLaZ;$ki<AUa
zK$=SeV3IU^(z?@jHKCOOj+t{{;;_rS95~NxTb!F`Hgu;i=UbYCy1=PK(sw)4Hh0|`
z?^fGN63-%}zr$|ou`LM-7jV~K0pC@4vQe>`D>m)&ayrx@(N^X<_`NNBHzTTKCVcc>
z6xvppYkK0io{m;-3!>O=Si%eDCp{b;eP1+P2R%7Tj$@8L0Q2V6a2Eu$24Og!TK!Nf
z>5FBUTPioBnX0u4Ntox7`SttE$Tj_}wZ6j${X5n@mBA>OFt>{A`@_8p@0<w*|0LQT
zoDPr)_4S*U<<2K__>|5G{)5c`2LXUaf%N|(A74lS+WjsN|3*ZB{!W$=uqv`C>)Sbn
z-99jm?EQ~13Id;qpC0l0|3ztlqdturZ~pIqPwRH_nZE}Eu@G_mX@M{|<o(-M0Al}8
zqfg=7zdN@5`?&w4MgMFlJY4;?xdfE^>3To;$E@uiwYmNX=RyYx#Gnf=^L%D5{TNZ5
z#_nW$NvVV|cYAr`Qm$PjKyEs6pkjVZK>Q*nZWt+ePicRCvhb!!v66o_crf~M<Jq2*
zRN*19VzU{4)1g$+T9Qt^auTQWp;ilQ<AQP)0g_lz&41p`wz%D$MS2r%V&Yova#~j7
z1%pT4M^j0}ToSHHcfpe|{@s{L25*n?DK@*0c&1*#?beAY6P^SE7|Dzey6j{!2&B<%
zt5+Rt6e4N%8!W=`5KYUMqNXB=Co@0SS<V&&d~q!(aMj2WhVOLQIaEe04p0D;Xar@n
zeRyi>UwU{S5o)D3yH$vIKZ}@1h%B8DU!gu=U1XyJA10I@*!y5Z2M6=dspMjR^kSaP
zy*1D~a&N-Miwxr!8O=58W|29!8Y+4dNw+AsQ`Lh%ZV^!nfPcHu;@mGde(orK!-kiZ
zaeYi#6W{EXkKWb4_+aPJX5YT9rhDf|Emn<x@4=z8t3MTWAgo5ZZBJ$SmBtUn5E^KG
zPjZ#ZM+r3aKqeeWJ~y_t>ZClXgU33oeNr&2jvRLZxwGD{U`1QOn<wRh9MTe!bU(|r
zV`rH8Rtx=cdPo{b2>s+|=gNngsz}5}Tk-2y7!sTH(ZieYlm+>|D(n}<=?c$K?l)A|
z6%mo~>=M65scYNPTOC3FQ=>EZRNQ=|3G#c94&~5lfc4;5y74mSr=ZF|V!~j}9JPgh
zN(6lv^e4@=)xwq#$?<#HU>mbAXh8kI2lz~1zLHTKyJy8_L`GW?qByYfZaVwX2^H<y
zHMZadLG(_C=`ac~4J2#>|KrdvR>b-#i>*UJ#51gkVX}BhHFew^)*2<AS1I$ae$gcF
z4pMXsV}Kx5i|&)d+rgA)k7x`2uE{jl>}^3}=`fw<K<*5uO#eVkO2&h_C==(!nOO%&
zO1(iE-j+M4^GrPKFV8#Nj&#!ppkoMP6J_YX2fjT%1bPucbI)7e&&<gUZbD#%>;>h`
zK+Z<si(Cq=O`fEJ-zuQNV#f`H2<N6zIR<tGF4c~l%r$f{6poI`_SNZu_W;;!a@##F
z0^krJx<zAb%~b~04AU0DQX%^i@l^8<%@oi&!yog<-4%>SzX+w0r&u(uNX1%l(hn5V
zuZ*G*LM3SWI7Kqo;X2u%#W`GP$s%9Hq$G1q6Tw9=&krsba-1Ne-oxU=T{@g<^0<(n
zNGBn3f4Tn_pSCMMnQ^Fts{T_?yjYc?kx8eReiN&C*9#2>v=1!1)E}EYgV7#wtfEv2
z6pQnQfhGvy^OS=3C#lOeRD0uH0Z{2`vx<>giO=kmEYey9U6X%OPB7#tGaT^ySCre#
zJa5SKG0Qu%sRT`@HyW#uuP}@w*4kae;JtakG18*>R-)2qG;Nle6k?MR8E&I{Cg$1V
zPT;Lb^NN$OO{dm4D=RSdK|edhW@6G03Z{vRJR?+=Jra{br8>8|@&ewxWic#<=KMeA
zPat>vn`Et^ei*m5273_#lQ0w5$v*o+mVm2E_3!1+6+^vDzb*(AL09W3wT=yF^({pn
ziSwuAExr#V#4E3K(@_D`;Z_*6a8;dK9%T<q=BlF%imFx_evT=RN+g~rh1E?rdTg}v
zbqY_G^~tz+YRIv|n%PS$Jmv}Vm)ZI@O*UCO4>hHv&%eH@^c^SAQtvC*ZMSp!fys|E
zrKt}mW2E5+`*+`=NUWW$8Hv8Jj57g$$wG7(hzv4%Pz88`qo7rDJZW7eeTNB@c;qB<
ztB{AwiE5Fq4iDD7DB<-^y~^UjPS4~V>9xIcJ??}nk2sffwb@P$EihB(`qAWRIZyqu
zRI9ps0VyzIRSgyo-0kdwZ5kDp4EabNti{nSc?`=TsFmK{C`XIfp#XV}sJs+Sd=sqY
z4boMRN=GY~(&2Y(u78iUKD&mxPqdp~NZjxS*%$Q0NBr$lB=c;6v@<FH2eBG0mh-MX
zrlBPTET=TQk>>{Nh~?(Wz29B^fJOGoogDEDt?;DH<Xzs^p`wDHHJS*4kD%Sqx%Z_*
zA)qbO<>uef;qR?yFFF;jc*3o%c;@O-RTP}%%*wCa?uDfKIP^AhAZpQX1EJykn3G@H
zz|RR6VB!tnpsXbE<#e|V@`Zk-9{DWBkEp3#>iH0`TPiceSM&qE|7cani_?UTca(Zr
z{(hk0>^cAS&I@fvqKu%Go&OaQ>Y|BT%ulEzPO|3*|2#{<+RC#j{Gk(?)e6z~qx?yI
zTm+E|n98b-^5*Ys=JKbufu6HsU)bPpBOSczDA@eH1(@Xd--=h*aG1n14ZA!1voUA5
zn4uPzxZ9haj~0(cVIELBaoI(u2nad~2z)yqv&YD?&$Z`}io8Ke_=3Ooeocg?FUtr*
zjV%R&uoT5B8E<s$fa8&z`Ay1DYn{Udfq$(h!;y}VlC?8lr}N7y9MyIpuj9kLG;dOG
z5C_j80-Z!jGI#eY5@m`cepiHu|0Z-kQvh{qpY<{F?#KQWV{RTvY|I{<$_dxUV8sZ$
zyLHus?C<%uY3A@X!ZCsgmJJLo$QK6hhE<;KZ`>I=&>4ZtXbfm3s4O=MiX{H*UxH~T
zs)iLjdih%nNL~AGEM}54G*%%h1^3PGd}?ff@Y!nf%aYyU)$p?2dt6*xq(51~r_Xip
zzw#AQg3n}_EI<1}V<eSPkT}3!&eT9#09b<mn;8RDcc8EkU8%n{3IH$&2}pQtLtOjG
z3A|}&UH<|6M3wk=m#dy*+kYV&_zAuL?1Ov<5E1|YJdXYrMfgfi=-Gb2`=8H&&_A*M
z_a;~1Ie(j6{by+#!FdYVheCpouDtV>ZRD{z<mQ<S92FV;!bkF%=?mNSy|9;{p3tx`
zvb_~!Z!$z}Iur66QSj@ZL1DGDU4&8I`N|A<%O4gro?E%;L>Uzo7mb)-$%je<u_8#$
zeqIa*P^9{Z>7BM>w*#vHDF&!%)FUGG2I^XuX+B-IgdJvBe@h}|L}S1Lr6^q}FtlnI
z&qeJ*sEUwd{rVA6XuJ=H1LzG(3SvpTF>k1W*<(9ZM(Gp=Yc<mmE_i`$T9N(`@QsVb
zx3p;cwz--bG7kgy3$i`p$|!tx5Ng?_jD)q6w$BP0!0m)#F6pY#WE7?Gtfa`CKkcpK
zf58`CQjdsCHBLF}?v+_=*|_Jiz#Qn*mc>C@KUfh|$|9wLe$!T$-kKe3tRz-P*MK`X
zj~vU$;xvj(I~7peC6Bu6cl^~o5H>eo|6P+u&TA$wZCq~WfbB3dT#TvhWw*2q9tv*g
zCc8H~6Oa&1$w(aR42`UlG^fX2QpQzGuV!`2JU@c=!6Zr0!fawL9^X&?Ld_B_Jr8_L
zn@oO*DRUc==4RcIK4t$=l0Mt%QCn(XR|#?P@;WB{WMT57BC%fNQ7^o^vFU<58=E{U
zcPVPFXA7Yw*wrjwy*eQ3m>-_|cdnTvu!@T$fFpYe%%G}T!D9kFNgcM&NkPN0v*e^6
z#+@S$C?TU4Iq^ie3+W86?di(|8Y_BQM3>j@<#_^s=1i`IgFM9iU}P-)%?bi{I$*9v
zs5rPJL&T@%w;<Yca>Tk^>bC;7D@RPHX?IWXnJn&S9+_Q&lAB?sEmkd@N1)CRPBN-Y
zou5`~)<eIiXP(A4p?X%^Qg<q`LJj86B`&qo*azhatq!SNAeD}e;Uv(vr*xd41j;W`
zP1Pg<(WOzjk>#NDTR&iAtj@Kwm2f;sWv7I6w6>3DVjE59Ler^2-Y}>YO(q9%SM<JZ
zjCqiouIJ-plq}%WIjTZc`v^`O_;Df%+-Nac<9$vBi)1Pa>30iHj|PJ4c`5GZd?wl{
ze9xmm*a*PsMd*4$>geA(@enzx)p;`#ZfNuXv}bQdpT3VwGW5lt{0IHE&BK(4v3`)a
zZ3WGk@sNDT?W$2zNZIccYaQ&B$yW~M;$qc!-C0zDlpH4{<_Bd88>`S!NjzdlxD4Cg
zF+&0Y!Lp{?;JCFN|C_3z&Wt{IcDICdOpA3KeebV`O<M}7OD~>UWUxeE9uh{44!w$9
zXVm*5i0i44fTzo*M?*!&#Bi*&rmIV1&OTwwax^2}_ya75z&U7S@Z%(ejadKgxCk;T
zz0hCs=f7W5Sl!F?sxFvK46Bf?xJP_&K!R-ryT%V5dm^j+UMZW?*f#4Zh%Dfwnq_Xn
z>6G?#&Rwlyn`vY?B5_YE7b=W)Qn`#jkD8d)qb0?1z4{DQ=x~e~-9*pA3*AE2)eJD#
z6s<#<brrmj>(JdR#BXM#_$wLu3TQAsq-NA5Eq>;~2&-}L|4imjU#%#2^H&E1U3U1`
zsn#SWJ1q;99Q5<nmqtw;%hS+89Yl>%^B{8DoKg*6%-2G4vv4_c*~?+4s!fSWMjD%E
zQ9F}t2m@hrnzFyeyU!hubQHMzgw3M$Cn_ZoehsKZ#PD}<gi}xdndC>iN2Gv7q@ZT5
zhqLzXY>IT`xzELxr>Dvb$DZC-BbutaFlE{eh|p|4`$o=RH+pO-DbK<EGX+P)S=^QL
zO$k=Pm>B-;hfXqDUBCHgIr%cIe|YMJ2)^U5E4Jt|4C_iFp129%9IXNeW%3OA(2wN_
zI21ozDxkp}HmvW^A|;RSF*jpsdTC$vSTm)0iy1a_Z%at|RsuBU9MfFj&z9^dS#1X%
zid8Qw?_!xkUS;&;-BQ>g#PmJsQ~^5=+bt)Q8>r;BGIMbgnX|{lW-h4YXt6ni4zr`7
zAK07$;C6yvvyhmklpLm*UK3N5D=jsQuL~w5T5+GF!#T6O9_*$WxH`+Nc<{U@i0&Pe
z2Hk<hXcE%KkP7a@o9S0pAJ9vLJmpX3QbqUNym0n_3&J0JnLS+RJrvn>-oJ^RES)#=
zamiORM!Y(Dnd-tt93rK(`OI&Z{KS98aEE0XEyyT{|B{H-)U*4VG%ncV%|%!7m0^Rt
zA~TX`F6UCdTRngMOnppCz?_VZmSKC<2_(Iy>2Zr9&oNDc?e-ms1RF2c!&fHrC4KRZ
z&T9Un0qP@6ELIyY!QeLI3h2~j_**3Xd{HrWp5JGXlmFwm^IzpAqy)VEpczC>1lB+#
zKnHsOK$O58(gFZM;EBJYCVVdt<Y$l-6b}A11I@rD0HE>%Ku%j{M}xqCBz%qlDfxsH
z{cn~#2A|*b_bCd51Qf~krx@t-@9!IjTYs(b!Q-xlfdL@*sI!QRQFWg?4c?zXp8@#)
z(Q)Sw`X5y?n9qOn+xa^HcT9VVd?EA;DKcB-B*cU>?;lKY7F&p421Zr)o{^+h)=f?G
zOkH&+gr!v&-RXb17%d7oA^wPW+lSX?epH)|9sf?ffe1tM_WI+5%T@feOa0boRJ~6E
z$$bW)ZriB}WD?>kH&a{4MPK0I^u92lfwUm!x@}dhK07F<E5BWmiSp`6Bsl=L=qJ&|
z)F7LGU=t>MCx?1rfXK;QcWm@H#IE+u+t>)jjT^H=GI2FFz%zASL4INUMFDf8NXs%-
z(+(+T4QtbId;?LkkVz>Xsm*WB(TyxksV~|e3|4A+(AVPbVt<J3gn<B6GX+$$g4hN)
zCf7GC7a-ZN;Ul3acPk?vxhfVo%wBOoXJfgKfe+sz&J)pOk7QS6fa5{?xPYh3Ntj;(
z&R!D&<5wPkJyp~xg??YhJVX@o(1^M-_5vfOd&H9se&qd~pUtC5K{uNArMurQH4HG)
z1mD<e8B2M>>Am>Gr1%sK$CN=pQ7>;i03U<bj#Knimw&0R@Im1!=@k8ZCil&I1T}W9
zI+jOcHNvthO!&;`n)0v_`!tMLW!J{l4_^cF%ojTX_rv1Mk?SK787$9e>j*-%SI;}F
zaJKE7^qV|4#F`bZ;}U35bZ5JfT$~?rn&rUE0F*qRUMJ4yCg)lJH%b-9;O|I~TtZS8
zwFe3Ep7u6!L@oSid&E<TqJ$#g>Y6%Ih22^oU^&Iw%07}ANx<AG_D6#CSMd5Vwvttr
zC>r}a<E-ciT!N?sv)(cT3~pF47T{Du*zZZ=wy-kFIpRBtSGIDNiT94ZzZybx=la3!
z>p~-qQ-F(tx5IueBP3+9%SF*hVjQ$wn|0p`hlz9L;S=1#G=g9m@mpR!Jz#6!_Keto
z!XjXbWYxrv5`wE#YJuJ-iG`m$9mxFhb@J?Y*v0o9&;0_Jm$4_Jhfh$UI0^F=1OJ_o
zO3T)FM!%mp&Pb5-SVrw5=joF9P!lTE5jBoO&Lw<?5z-x(Ux&h#qToeHZ!~Y(A-JsU
z^ivlgrCfk6Vtp8*W3*Uc)qR+s{Mx2_aom*}4gw$Wyg+WN0y&B-_uzPFVHhospE<G{
zL*noSN&e1Ki$?BRV5zjbz7Jhzl*L+=cgfV=evc9%i0G0Iau&rHKh(;D4&8386*Yrk
z=+-qN*p$;Z2T4l)hId4@r^|)0zMpiMK{0ksfJ||_DnlVD!o!%jM#@h_!bglv!xl#0
zalE{22;$nxlWv8HK}N`F4;<WL=A7bt8=B_Ut$8<g?T-Ql5kJ2V7q+I5Yi$C>`}|oQ
zyDkzZk1`HV{cHv9OR;5W@2fx~&uMAq@6{WM`YprkGHET?EVvz#_Jg>~$=v5Ij%j9D
zivAQkyNFfa=0eZ0Ig8&CgXm!~Y9Eu14ms>$Yh8h)7Y#9;r#(GoIU-l*F6Whj6Frg{
zFEs)1Q`KPx(nj9l?Loh-!y1TzxTU?%Xwp4H6ncfdYWPKvVieTsUxW@{3)=!ecJ82m
z7k;HW3*bYC-flj2?<T%g=3Rh*Io2|tj<;+po<_x*>mv(jBW3&rft0lJ>ws7%Wi6&r
zf#T}u(LYN?TwUv`Y)^h!XM^x-p=tN-)y(L-x>T7*f_3zq2e^k`Vv3`rx*)9nTfxYC
z@{(wd3rqUZ?j$|uD<Z$)>XNY740o*WRHU>W<%+Cx8>Ge$HUGILQo7VJ$sJki?lL7d
z5~4ZA(p@}ZpL{|B&4%tSnwu~E#^6#Tl9+<Qb&;;xA-uW71`=MS<!-DXJG|}B$tfq^
zR2Q{-c#cGv@{04vMv&}zwCyp;RgGoxYgJAQ!yAxA(Fzi%&c!*^8gi?{vM_lzeV<#-
z0Fi%KVEl7;_bUMQbJ6xE2ms0b`LFNySMMqyt?cjHpR;!tufU%+2=yn<XFB2Eb{Bug
zjnAv%-*5b9|DO#E{lDJ)1g8Ww{tJ(R@Dt>J?{o1*_@6!(e}tclA2DXdR#gpkR!RZ_
zy-ubyoT9y=TRbBQnF4Oa;k@9$Bg4q-r9@<muFzQoAxbJL0WgTuyiu)*%9mEJ(=Ty`
zTOS6?-Z6WlPuC^iEH8>$>$?shS@pm{mCW_QGp{j*jA;z<zlpiSTZNnMv9;P>q5_e8
zZCjr^|9OeL?B*;Pc_WRz)~LX!Xl<S(_3Xh69Oj*~7UD04&S%z*23#zYh?IqY23B$u
zw-^*nJ}>A-F9<mSnK<^Ww*(=<h%B6)Z^-T26$`&MaQ*h38*UgBSk0u{5*v7XAR36q
zIIybwa<gEr&j!vN#;88(MS*i9gutG5WgXECPiCgmQi{Quuyp>3(#?8O37}(Vy)*qi
z#0OmLnponR{5$F6blD*O`s7K#M|JM|S(*QK{ahQ#+o|t8gZ4ATW43N^&-a{x`<!EA
z7x0RLc%opWrgRlGCriuHX3&typGZ5C)~@Zq!Bj+O6yuPxtGu~M4^w21Y<(~*2!ZRz
z)$A#l8;5f_ZaG-ix3a7GI4Rw<v70GAaSNd}coB`d@@&C^cRUEJA~X*vsw@MHq+=>I
zlrzoGy!3RSEamK)`*q;vJ}A-0P+woFvkoX-sUm(k{nTO;MntVm<5I`^Mp#RIosLvQ
zUb9NlWT>JK+po6t;|F6S#HHC1rWfs(g!p-F7AUZHYXUQCkRO**dk*w{7m%-|k(Rj9
z{)JeYLA~g{yum6dr^^<U81lOkxb$G|aplbEQ^w|o?+(uMX2>8w$QaCE^}@6VD#Yy{
zGvo-R5*3*w0xC~7R-=c-J`}n~t&P?p$~oyz5Q~W)`j_*8mAU(b-@=QM=sbTXfdmOx
z+Y==O2&a?{0zmqs+~|L8)2_G?eWqxqUQA6Aa!SHZoDDnL&I!1znM`wriA)QU%Lf24
zy9FgZTlQRe134S0J{@>bwKelECdsmd*t^Wp!3hRcwK2OZ2<_9FB8%_Q77N1eld)+A
z@xes4Q=qTRIyQ1!JKO|-xzZw=c%!FR7ng|G8oxM5%qdEvKu*?s4#OWYh1dF3bql}w
z_q(}S%0kCcsmJU5miMTXtnhufhKWBndGVn`s1mOTI&eA$@>aqJB|dmp)c0Wcfq^Pj
zkuRL;nE~~-nSIejiDiX+zzk{$(Puo0$tH`yi`=0ryKRD@?)#L3&sQDd)XbNP_-lwr
zZkRoWWn!uDa)tb%ymk<_$$J<X8i+t1hh<fq5cJkN%(|(D)o?=Mhm`A@a2YO#3CU`e
zfJ!ZwaPR8T<vS;%#Gwz%<ScN{61gv8*vxfEqRo?&@nUGt_W^CCX9936&o#Q=iNnHC
zX);2A<zx7WoEtS=u0AQ0CX`K}bTg(&M|&ZnN8Ls6w#{>LHfgZXcDHajEjsnG5)hs4
z_>>rbYMgsyS|4VuuqIatA4?WnezmRTJlWd{51Tv-@Ix%SS}@Jq*Vd@Yz4YzG-6*Wz
z4#Ra7G@mSEmK0f~@h?-leeaFY(KHGNg~zYcMqkSR1tiF_@QOA+T>#@$Pz6(wiLxdJ
z;PK?b8#4lIIGU)HP<(k4wWg%<Pa*4!_QQLyq=bX$#3GZv>J+oLJ3sbzd=okn%EZz3
z=crEMq~9MFOv`&@xps+kyf<TJxagW1c+9i995GrG{m=;Fn%W9xEMxGG>REe|i^EhM
zuOM(RR+OS}&4Th5b~9?<+J-5Ougq^q9F~lrmdGc=FBk*&<F0RBh-x?N&KkpBHt^Vm
zAS@tc7rhN6_SGf8$oocR6BbUN!;zkFGmxaJYaoPJb*1q8Gan3!r&afbW=Fp#E)%_v
z=YeDuWvo!=_2Ubf8*#rY?WAEQ<l~{^6r_1Y!#P|a1k#iIY~uG}h6437>|e)ULUNcH
zmTy?Sh^@0OenL^I&UT+Fp9`ht=xDBU5T<NU3x$1Gv#YPId?^1-?{m<--{67|gLo`B
zwn$xDV#t}aOkg<HXnSM$461u(Apb*0$sQpb{GwqusHAue(%+|!8cWNnvb0I|i*pt=
z5v@p@V|}(e{AHD<NqtaEF-V|D%V<e;e?(s(YX?<GZ@XM3z$;P4@q?yz=e1_;29H!#
zimICI7g#+oJ$R%0BVlDQX$XY|G@S6yE{vopP2}z7i4=&w=Cg5LdtKBIh+;%2of!*R
zs}IX-)6@(7?Z#1T99GdmDHsBpeU|!{AFT_r7enM&o$3Zrm86ViJWlc!jM66V!K+Ry
z-A)R&eJqNJab8~EtkDVU%vevPcCwWA@x>7ga+Wc-#HOXKLqA58oOU^X4v~a{SSrn_
zC>C~Z?RqW=H)tykgDa|VFdZqw2Gk3~De3?VxVt*<J8oDJxDte63@A}#rCTEp9+JuN
z<TeFpby{|NoC@pnV3oqQBs&~U$Jk?vDk=-55K2YetdT$hea8?dgOL{D8b@graF^J>
z+=%Po-t6Z6&6y1YquKizi536TDdJBdLq{Ph0DvtAq3?bMbbku~rKzh70N}*o5da{<
z%m1|ggm3`?asmJ;!Dq$r6-Y@Q2oe$VpVfjukxWW|hy?5B{Xd$>|G^^SFQV}W1XSfO
zHsJEt6$Ieg`=<d}NOeQ=*Bvm_Pnb`Z@V~T&02>wjcY6pSsTOcoRy%3@6d=vr#M-(t
z7<XG=sON<$U(ir`eBR(VwobD4rFabzYcIiRza`1_=)%rMSsmBH3bEZy(27dOX}aUI
z$Hhp;YgIarxFIBD(XE)(L(wJZb9yMss6!a5%-LFj?3!)O;lZ)6$k)YNO%j!%H-i(u
z?<gRAEfC?zcpPz30RL%~P9Oos1li881a`RcnX(kRSCx%KSVR}_5QJAC$M3M#d%kX$
z!Xxw@zUH)x)mrW!T_X3nvd;}>LvW>1Xzv?&EDG8w5JD5+!<O|!D?}5w64UkteRC`p
zA;h=ajKSQ+IIog3qi;#1(JP_y<}!C|m}B+$Mc>(fXo%<!e{>aTSHB?{w&K3e|CY?p
zQnCqt^KN<Zt}qse2Te$j>rvKrexC&`AIP3z(n2{5<81yJA-GO@Of`FbkN}U%pm%7J
zZXzgHA1dF5LI31N$qg*!2XGq)J<&IMe>1zkYF8eiaMZ^s4(7iZ$#6NW!DhuLz7Nj*
z+D5~~X>B-~JhS`8^Z{)^4<R?l`{GVyvDyT?p=8%@%D#i<TU0N*U;m-DSADhpu1xAt
zO!~l~w+8ZDVcK$rwqXY&*wLZv4b>As6&Cm-dfk+@tFAH&t?WS;tV^{&q8dAxzfnaI
zwfCLA)+U?~OtY}07a-+!yEfXmg5=5)-6wna!zNqWg0)w&t7_%L(n)i=B3T+6VdIS#
z+Z0#P99y<$dp?++M{HEv5Zg|P+w@DR@cw$~$2G4I(3&8iUl+_+LA76lbsm^V|9pG+
zE7&z1-Yvc((9_XIT_fSrW`J}taSx<M{|I?+ixGpVO)R$BhLj3Xwd!)tPWrMsOz7g+
zmUtymofYMtC+kCpxMnf)W1POG=<XunW8jHQv(bGyrgZ#?e1I|HVn3-|Qo1^pbt-3p
zUSGt|!F@`>4LxXz+_y3MWi}0!2;TbEFI{Lu#bGFh%J>=Kk#t^8&%Y+p>XbnQx<>eF
z8OG)LM>Km}lcbxLp6A`**PVAkFqxahQLgj+cm@p%6-pPXpe}|(3nfraqg&OMiVLI9
zWl1{HsAEqe>Ey2V@l2jQi_XhG1Vl|KNH`TI3KI8%Gn=7+6oFX-2cZ|M>%Xjt)<V-f
zkF>NWT1LH|iF}Y&67Ci>H3W;F+BRJpFx;M0fku-!5X1tndPpjMu)2gG?8MB?u<UAF
zB;s`y+$YcJLJ*_Dql@1$jxQ5qKt5$Zbjz=yQ*)MtACB)w)iWME^Uw3XcV@hOR4FH-
z-TKdU@?-5`6Rq?rRk3h467N=}UyL%~#M6)7kk6n>d%d;pS*B$b!LsoAj}TleQHV9b
zO7VN2$o`^9L_X63L3x^yb6U<9mBsc;zwnWDnWfYdE96WdBiKn0<1y-{3oWS2vag#D
z-p^PPN8OGf15r7@;34li_|j|j)+2W5;#4<VuPPs=JGKyQiYL(!5}r4KWYAlA{fnMd
z!lu&V5n2Ef-@!@5VhL?P3q{vL{^3asTNImL{d)v1o`NNINrx6br7X5;=QQQc%knM0
zN!t+EaCQ&cnnd4M4#A-nzc%*!8}b!0Cu6<S#A_yb<C7(G#y~)Go3rccUdzwgs$k77
zB<3HnOfv|BOjg86Hmn*rkl~>6*A}bZ@Qn7JDcKn{4`N^W`rm`8MZ4A4Xv)r%p}4v}
z5_8%qZS%2IW?y*qTZOc|rPn@>bKhE3x-KcD3CWBXqhyVhjU2I(zf-mM6Ih9SVbDub
zZ2Fc%ky_ny1^W`APjzNhg>&5=43WsHz?uF?D$igdKv;+mpL9oAS0p{M{R+fYS@*0{
zqUjL?1KbeWeHinGNBfPr014bK;!K(#%X8!|CMdJi3U8h5oKf)$Cv9y5V0;9rKT;3p
zNB3@~k45K<^_$ldm<?@)7J72>bC3C)Qa`vt>-5vL{us&}hd%KMB63L>!e?mt-0%FS
zW*_KtAqn!Cz6~=1_)~@FbJdv;01f~}5EJ;*;UxIHf|LPR|LOs-VDbQsL9u>+9%=qL
zpcMLd***x&pJzC6z-3@ve_H?JC*lt>0DwL7iSoZ!?SrBGH`Tsy3=AY?Gj$HI=6D-d
zHhb~5*sXA6sUS}Z45LxW$%grGak6D2|NMdeX3-Wn3S-H|7IZx<(>tap*%Qd5TG5gr
z)K{K%UyH~!FIFPtjLTU6ko`>i2tCij*xLOgO10+uLB1ea<krgoMNJ<_Aq<k~ba*=@
z#b1L>Q-eM>UgW9eX3R-8g__4{j#+1?jKuvgb*r&Efu@^;@|N>Q7Ynm{_S~w6@_F^Z
z_)Qruu;`^u-|8Y~s{FRi_7&rf0=TBNr$AG~DeRa<02RFlb;PHOh}^uc;$j$RHm-V*
zBmVL?ZAav{H{Q3XbD-nWGgTV<17Q*#KSz7$H{Z@R--iVb2#3X~lOSsMlX^g(g{@UZ
zYQlI9Vf2X>?W_BUm<ftVBN$=8sUd*&r9(w*bd(r3Fdr;7K9EuydIdD%=Y7WQ$WoF{
z;enht8*q;89iH-r!Iia*Npku4_k<lqp^jX{)f=TQ<5qMEkcm0l8sO+0F=*&RQR}PP
z99Ez;l-+>U8q^eh&j?T4?ew1fz-he|=xZOA0^Ys{014WHIwr>0Scvfd#((p@gR?E-
zUpq=Up^Y0lJxme+T!a}*=VLHdEPDWl;wr^xp!sF&d>~@avaewGCk@^13O8j6b=QMM
zrG5SF{UEf;(H~iN$R8Cy&9VWqDzqVWt_=5;mM-+MVz5?Z@kbveMl^lkE5Ti}FtT>e
zI3BmyeZ5S4<82kD`(rwvs#sbsc}3WReFH15Tik$~bPVng_D@Ya1Ma}qAkc#QwhF|W
z8Pzz&5T`{TU?|#3nA4_^G>@VYI+r&rSe^H<iJZRen^2z(5R%&*ttliNNYoeD{Mu|g
z@jZnOpl2L}aGZJswSf5$CO26}Pa!MpcA>MX5h%Yazo}?I!u%N3V}YGgIn7ef$ZS(r
za>7(M1o0O$EWPIdC1E9)2Z6)h&brDliJvZJ<L>w&K<GYn<dh~UUblggmV;v`bUWM`
z*GSrnf%+V>ZNb8v94*laEPP-J?rnzr!{VFDby6;{5k#d4&D^Epb*|EskXQr1GE=pa
zRke{EznG0g;<G4e!2_2saiVxXdLsX*L3Yf&%ksQ?6@Aax)N$qPiN+M&xb~sr(Wxdq
zY?h#DTg15mqP&6+R<-XqaDsRebr@@I5d}?~KPpZ#hMT0QA`-K(3F2mL#VH>OO*=4^
zJxHzlK<d|#n^l^O5&-(F@`zL9xMmFbgqK*G6KGc#^TVC_kp!hb?`zmAA+6gNbVyiM
z92R@Za;8V3aQrK;Y&{Aa*o-3DrNUOuxA1W4dNUkC2dsE3&GQ{i@)#MrQn7hq^BMMb
z#jn|v^Z0nkFCO&kpc{n{q6881KUvqFyLsp>tQndoz?5#;@AvyYDq7ZLSm&5JDl13h
z@m5XK4lZJDAMtUK;;U%v0(16I_)R8ykpm@EcD0}z3X-LRq0{$Jk)3>1vvBD)hD9uo
zN*T{{cEegP4{eCFI{J3wS8Hri9LowS&4_x+Pmi9@MD6dk6}u%XvUF;~PmPP6Opd$*
zVghCQJcrDJ@tE))K4w%8QPjf@BA@M2X#EmxJZmijDih8HFMb>0i&*D6IhldAN-JHN
zPEQK+C3X{9ulcTOS$q2^nJ9n<Fd0=H+=8R)7buB0os~R31hi)9(aH6N-#AXiY5gEz
zmqXK#85nO0J_`j)b##%gxry{2CHU*a2%!3}8fd7CJOHjloJokzGyrf0qCi3`C<nma
z29O3r0H~W8KBr`$GmXzU0Mv&C02#XfYl?<@F@W2Sb^}yWB49T6{uzS(IcNWW>7n62
zC-#4x{<U;IPs&DsR#X6Z0-r}>-Jc)=K)L___0Z&>i<y5##Q*%kU$Fn1AetlR>IrUf
z4|kZurB+Hb#Mt$lT}nX39k{KrHVGRiuP}AfkI;$^o|OwH(DEM{3(?9)8$3>mhlLaf
zTJd<yns#gJM6XdiEMRZN)2qHuu}cK*{gx>!JX6J9fO_t>J&;2~q;XCbmp6hr{31u%
zI}fVz5*FsSQG?B8O%1{N7VcJUEMbkeuuUxm(f8w%!4<mOfl#u5<e+mJ5`Cbf9qz!;
zH@{>#xE}n9IJX)8*}f=`yym3F#(CWt$(N~7<ATmmRY&cm?(c4I(vpogA4TIf8)u?U
zGPXkgMUD+yiqFJD(FZe_8U7sZ`}4c8$N0L0O*bV#pqY#BdZ63lJCI)c$3N7`X$JQc
zGX`LkCRB}a*cYinR%><4Rfso1x^ConUmUS}s$dKBj)<?s5!@w_xF7h4=v5VXAVx*Y
zLzT#GO87_^y6OzDgyvUn1LM1eNJ-^v?Nfi{1m^NFmJiVs<HXn|fxc2@Z|02<+1bxr
z=ra!&r%6Tz2F1qj6`@&RRR{Yj-H!`3P*CeIRBpf;$hD(`;t>5x<PqCCcq!gA6@y&S
zwbkv%^Q#2^W&wxTVWSqwU+(eK31Dn4l{AnEVjz|DU{+Bx7?k48ujAUPulTK#u11l4
zkA}PE7pV9}?%-;`fj-$wJ!Jw@qC!RJ8`a8nch}Ze+;sa9cS^N!2a&y+3R0vF$4Lh&
zEFOOBVO8Ft*M7@r8OJrU!~@ea1(1Am2Tw)^-QI;g?6M?xO$t8;?x}Cvbls3SK(B&U
zqFFvq1{8h}W8*olAT)t0@V3+!zmDkVK`eu@Joiccs=UBVsNG)ob*c731wFTHGOh^-
zklvX$T=w{0XDBMAzsP0Mj&0o4u&rX2@a<_W{4fiyy%huX9H$9qSb7}y{|2fP%`6dK
zW;UNXHu;`|aEaKo5hI%W2x~N6Z=F1ATKp<kOe>`9zN<nS;kEhDd|#=wjim%5Tm*x0
zT$Gf4jUvEv&k>6cfzK$PInckFB568SSPeL`@Zct#sshKvE#9dg5!CaPa$?h5--0?G
z4uR&COq$As1rn(UNZ_<}yx^bKgjS<iKi{n)Zb#DzZr^ulwtZ2XKui7#hN$P{228tB
z7I;*jzxgV*O{|3yvA*IC40e0}jeE>^olXvu+Cf}1n3JBs8@%vakW(hN6=k621{g7Q
zrTC-ah()GW(?@K3Mi3(16x$=DzG*_iL%wl!3t|h~RVWJH{(MVl5*}W~reX-(2C}te
zCHNPaBIIc@pqSPh!uA^t34G8ISh?ge{knj8iAQjs3Xinwn{K(1tJVTE1FJ<7=Dw-S
zrOd`8s)*l+S?(2kAw6ThYC56rqoA90p$N#R^l7BiqC&q0gN=mO;uUC`gW!k#)0Qez
z;FJzod=#k@PMxj!^LKfpq%1Ii@ENu&L-gmIsyjYR6}(a!r8XjsR}}PTn$4BwT@k;a
zx`<Eo2ra^Pp$n-J(E(C1`YBAyZIS8`og|Egkv$0sAg}3)>cUVvIDw5E4Es$|Wz9w#
zIvjX=QeX=Ac5|cMDcO|;>$r=Tg~AJ89oW|<X~Xa>ZTpF+Z7?90Q})|{F>7k}=Wc9;
z^2fO-BxnJdUR4gQHqd?6N>!GcMAKN*oCAoF5>xsHf~Fc1h&c4qgf2l^=pIt4@mRup
zoyx>jlvYTN-sj6kCi=%(^ztw*Ku_hJ@<X`bQAVxF0!vPI;9Zap`WBidYc_;cD$rGA
zSIa_P`AmrX_B^4JCu?28!E`mhPS4Eh{iqJ8PW;f*5pxvlfClQj8Ub;ia~y==Pgzo2
zxRhSxp$9ucZA#hv1bfnNWF;ObqR4fKqHX1>nId{FAM-Xy0t!^oI3^d9PG<EvI+wrf
zlXqLN3M&<15wZN&Z>%>Bx5x2A1=?m{c6?h18CKgBu!_5&SJ9z_AD~IAXtM*hF8QSv
z4c3q~BRK`FLQdbH<3Xa@xRQQ1$p@&{p1Nr9_4Sn)P-KiUy%8$D#=5fafxpKCLBIGH
zQ9mG$D$(&LvXNy=L(E}{Bqno*tn76cHW&ZqA9zr$?ZUm7sm%mvTn9+2)-(pDZ4-Uy
zT-BQ_TzpexFb?QgX;B84de8}o4^xhfM%i9F??>d`3vVJu$_U#{%$y2yyuK?(j>w~p
z%t5`91fnvoWB9#FfJh4M%<fMF@EYKl-*8F{=vWydu@8p;{Zf?YQwZ$!Q5KlyoXAx^
z?5fa5#RzuTW*7`Ppx*D*KI!i=z{{wycN?8I3|UA^z{ac=`K_QTR=S^=kye=KQ1&yV
zVsG!xX8BibY=qhrnhue4m+o!Wu6j1!{0kFR44N1d4`}MbriX5L*-tO8O4=Q9-dY5(
zS<fv<uif1xiVQzq`U!p}i@dmGl;_VvdeoD~0N}gN5UVQqFS6jzWgV3t_;zJ^8vy9>
zJE(-lXCxPL@+c+<@g{<lW6wh(%&!Ij{Q>}%CqL^`2@kS-)eruR)}K3#LE3$Uz>|5O
z&i(+<$xq-<9n8N<g#Rr#|3^2*@6X$<esFnzMel#Gf{#y-&zzY5r9c>*=D!Jq#RQj?
zDARTz*!Vg@nCR7<c&2Q66kkyonSq{}nes+d!F63k{g}Olj#nS0M3-0RUc{lyx4N0B
z2HlZeCC{#Bb5*D`i5pY#ubD~ad=8Z{Mv;Qp4M;<HSVz<rXE^ia^H0VX#<@4W<zH<T
z{EzefU4k+xF5UcpV(;`1p)r{qvZ#MN3g29{ed%Y(rzClIjzCt{5QJc3mB<~JYXn#J
zHa=f5q1UU$J*(l4u8g36VeP@<xde#|{}7U~@hko4W#1~4rzpWNwrv9+q<2Voer!Hc
z#}|F&d?i?N#5Rp2ly`s6#wP+gK%I|o)C_7jb%wif(mfzbWp5I{LUSjq)wk)k33YI(
zIj~h;EPidNHVlH6Iryl&Hu``q-;fz%2M&A9(e4*!$qw7B3TveO9iLpi6piN}k^JU3
z_e2l<us$$Ykx!H<z=x*M2*Lor@}t$J#XI%M=fxC1DyrRJ$d+Aurg9Lz(fvT*KmuDE
zpLHxcNGZ-C;T4;8-aXWkK7)A^tV+lU+&KyLRAIxM=%{J)*|Gg+)?MYPnzSd70B<Ab
zNL02VmVJx)Gc5^mpi3l2izaJJlFLSe8k~w)lhMzB0P?7yA2Mql941^U`=`JV8DvO`
zEjN7ctLHu~ox<&@bgeRIOkR21KZBGWm0sVH#0m+qk$l}3JD?ganu*w2P*$Bi*&nDn
zJ=;YcS8jA~70hZMxfd6QTL!c?gO@{IQEH!?IB$=T(rC8~Rq@s-#SVNY7o6!fLyVCd
znstng;iHnFuyzk^eM~uji0ypohS@#6V5~46AAsO&9)KaV)moV-#|9(7jR+|v5hc{k
zRuIJRo1r=}GmPd{ku8~+C_JLj0{tR~X;fnoS}o+Sy3*HCys+aCqk^oTMabf=7J3ix
z1L{YFPonM}?;4H$Y2q%S`@stvG~BKV*T}ixE7j(wiiBi25!$DuNl^vL5p^V+(e2i2
zOn7PHQ$t1Wp%nilXiI&Q&fM&ToS&`-q0+4e#d@?Z2(yL=xeJ>i3{1})fL2L=Bi3z9
zD;($CQhRy!C=I3I`lH5%KO+3DzXyMnOA0G`NKf#)pn*sv$<v*U9!Vl1-+NM}Z$+JI
zlbntt@l3p$-bs13-t0=i%<Le4hPb3Sp+>6r-6Rw9K0i~dk)krE>k@A$XRtwBZe;GM
z=0nh{R>R?*5g0wpy?ge^^4K-)@yqVqxk6nfg7YvLsSFJH0K1k5(LBVE@C>EW0)kIi
z6y$M9dOsq`0EpCf=0%7evu9Xp@9$-Y3hd1=-@1Yl(Ot;4Rv8qa#x)$wLQgFBjH8V3
z;~n11lfdfWAMcQZ4w42g2B>Mm-fmhJGZwg=%PN!M_7WD;0tw6yq|=0ZWqn_>8lT8&
zoPo}r5yos*an0T^7d$&yOh5<F@$?|u?GfefqgeZmTC9ptQm|>U6o?=TxaO%d8pYSb
zB=9=Yc{^gvj9dkxCUo`_XAJGw0Ig%d>c2wor`$QZqiG#6$=8*1)4E+#9njqbd&5#|
zH+-6gBwLuW;!;d)&3;w$MGH&$mg*X_EU|!139kw75u{YM2OzHyj(PfpB%M0El$x3R
z?2|<!t08i<0fPEi7!&(SGS?))EG+e`21Bl!(?6(%(R|E>?Z$mYt50&&sq$IiU>Ut}
zeG~vGJ&auJLd_2?ti!Pn$@9@iFg%!vYxI3I?DE-ATl=m`OWnL1%Lhj4p%lL%6Q7=0
zRtj08?DvGNPum&!0(kvt$G~TKF_2^O2kIfND2+)y9lZe-_DD$8)#ReA7*5tCN+>gB
zyp0AuMwCoirH(*$XhmJeJeiW9S-3r{M`Q^7iPY(ZyuCc6885jo3HAi*$Vu+8aO0T=
z{81HI1?J<nxsVfc>Gb5|8x8QjQ0xt1VKz69rGZ~+UxF}0Y|&7bEU*f{TQ)HB2C}+=
zIn}#15!*7e#?FnYvkMS;oyLuehsuuZ6fEHrq&gk{{#j?o<RZi5snd{#YSKNZJ!3Zc
zy0qE9A;b5))$=-pJC^Mpad)J2;vmJ-Sv~M}OiLRvmy2JhRD|k}zq~x=q*Fv9;MrIN
z4l?^0az2$B|4^0!rvRe-WW?V3W`MN*oTUL10bmdp0DLvZtgiNeoWFwC-;s=Wrx2^4
zA?QyOLm{9Lbq2871pG-71(@}IqJCzH{zF{~0GoXLE8P9PUS$Vt{RKp)?gsz~rT_q}
z{K2?Vl`;taV+=_6%AXda!6(pXMErk}m;U`D|73}R%l?<R^aFsU+4qf1S{45!=*-1W
z`P(p;Cu#lL0Fh~X_zV}-Aw3-l#ACpIK_-MyS06Nt@15acwf74am6(TnQD{iEaS~b$
z0*s4kR<8unov3JvjFX$Y+Vs_R`#>&$pe#Y(zGw0W>|Ga$O3zCtxW4UnAB`tGO6)hR
z-y10n)S`h!6xTD*FbF}gffINT)nVFO09@%lQF4a-!sDVimvEh%f=5QEpJ*EIS6<|{
zc|)}seqj$oZqthn?bENh$nCO9x6k|FA)VDWk2Cp^gYzNeJtxm6>s!C|rP_qpBF`$J
zPcP<piFo%NBJD`mpYZsSOKlE?SYq6U;s~`_4siA)YOz^U#F3J4Y;O-*T-N2Q*sj}Y
z-;DNa8mVAQ-)fjN8Y2?5(i{Y_+niP!Gxy^`y*<u81fS|gLPc%&9(&BRe}9NCV?j4E
zX9wo*5R|ewNf{>%U<~h{vj-NV-KD(Qgi;(?M;yq%y}L??gaVmCJ`;V2Sx`Y&Y%jB{
z@W~wcf!d4H-k2!hm53q}Gx^vun%b=(Rd;}Gu+7TVi%3fu;4A$f(%v!1l6Kn`US-?W
zW!tuG+qPX@w#_cP%eHOXRb6(M)nC2)-TUr+&Ub#?8z*ALTAA~Sn7RHuIY-W%V+?p$
z^Xo0B!Px81(2i_^=Qps(OO}k*cRi<TlJ3J%Dr-fCs^4$#aXcSan|BQt^L6L)Qka>w
zU76PF?fRiE#*Co=iDQCr8Twnk;i5;ryMVgcph;o0AUAG<+T1CeUc--F;@=<?^NdN=
zF%n7^zZ!YT_RF}cmx)PygGD(EHWAr@^th|S<cLz)qb+c03F2DV!Qk!zy~7Ms3y)4D
zYkRpluxB%ZX)oKrrir+$<TR=B@GnXyE5ec&vPPI=l281Swy*&-#|Uu5Q)=OD+_JL}
zcVrbs5ZlYtRAcGVD%&m)$EGtsu@z$@G3?{;meS<(16u9ELAAF|b(HyLZIX#E31<zi
zu!iaKE*t4O$b0l+Gv8x!E@`yc%k4j@j?<iEFsmErI}5>lL_F{|v-_7kfyRze6Jzkx
zG-GOpf9uoKUMBDJvB_`BXP6}B_0>^bUM+xsny<%)(2cP%xnIm!Bw29!&VV#CpyYYy
zFOpxOUzoAO6&jUe8;C6&o#}|^ORt$TFtmlq!j`y4afhsXaq?;Net3excI<rEcfYTo
zn+jAcJB8j!9lS5Q<Of@;ppQZ1U!&t0k6%E-`Uy2-uJTb~o&d8lLVpKei=j>8Sowt`
z;hPZktU>@9-YyYM8QLqo^bPqVlZMC$>`V%xFP(UvD+B=>MXaXWFnLTF)OR{{3My$y
zpcB8f2mc3N)MT~=KM5rRW%OnGYW7=`sqSXI05vxGE)0EqolD?KdA=Uu4I)IimjgMQ
zPUiDWlOunQ6Y~C#9P{23^UA!<2<5Jpqwx*+vLJVpX=fMYaj4p#uYvA2rVp$cl9hL_
z+BLaN_lki-3JSWm7ATc)XG#nFcG7!_13+O1{(u;Pq3;DN@xC0%A;hm^x-w6>%(TfY
zs=2qA!BLmRXO+s>zfAD$hntV{rPg>>b{~rS>+vTCxCSZ`j`bG;_?wcy4f5u|E|H~q
zimwg*JZlR`c0jKI5y=#UT&*C^>@9vzE=2lx(+G{xN~+$dJb&~Z@QjM43c!;Yg5W%1
zx!9w8T5SxCTu4H%rygnA7+`NmT|k1x7f^yk+1jcP1nnvEPc`-34wP^US8Wp1;Ta}k
zV<88JU;CNWYm8p)2`)+VC*^yC;eKtejZNr?O-&*&bTRPc7c&NeVdGEJ0TlK6%V0on
zx807s)0c%4JHy+r5_D*{JtB-=E<>8Jg~t&AMaq_~@qJDzTym2!dP~uB-X@@1yC&>q
zUa+M2Ln!phN)=p9vc^WN(*lgyk;yx=ZmN0_UHRYF95h52zV={A1bAauJ#;v(#*t}?
z$%|@%G`|S64wqjU*_0}s7QW3H@yYvWOY|$3*H#~Q3ODsj`zyIr=-VXfQFJ?h_)Hhc
zR(U9z?vY(d|It0((f8Qy!1?_2FE-vIZALg;);^z0f;j@A!KD>-u~?5-ebX;LvD)yJ
z66#cf`E5CCW!=}Y3px{AQRKSoky6l@cBy4QSVF>Uig6J?q)+uUWIJn5n9^$O9zb^W
znGFpzWr3!z+ffsqL?;gi__W7+TP`p-mpwyqI09buSd+YPz-c;_iup@OQ}I8^jo-dF
z6@OK$Xnz3M4FKSZ&<i}t0Ve<ep9LTzel7e{h`|;Bv>y+k2LK2OfMYGeMLBx(_S)Nn
zF}#C!0YCv?Nx$?MivF#~@OSxw{%Yucl}x1gzkdEX>H2pG1>60{$`=n}M<N4=HF!Sx
z>rWW<edYPz^BO^v1vAV4R%1YwA^!7E`;*Wzev}eI<BT=m7iM^~;Exe8I^%G**cFuD
z0^jcy7i131O$bxq_+Ln+biD`OkW5?Rz^5(#WQ-z|w-+!Gb_#p0Tsz>Lt1Y^N`F{>I
z2kqgF)WbbI4$7|`C_F()2_Lkl&@^r`R0CF_9b)KvDeQhH6P5Epf$-u5?8rnx=6qHd
zQn}TULI^vT#ZS@;#o?6p@BZGF{H19EEX30vKCS=TjLm-`!KK9jCIBG@QGznz!RXsh
z6`D^;blT2yYUU2LKX<P!ZG|+I$U)o&WMP6<a1}0z519NIZ-voc7I8C_Mk^u@$EThi
z{NCsRpJ=L~H%E{Df@b6{HMM=T9~@hupB`0DCz;ueg(6D4>=Uf@9%c(?)OF2ymYhZ9
zK1OL##f45Au%wMX*j~p26fzSL^urwSnn4WMPU(uN2iZhg-?P8AdWvwUQQ=neLhX+f
zNdbrX8+!;Ne;VYG(at~JJMBkG7NLgm(_=YlHKNk5?rpop%KKRCOVH}JLN-tG{!Hx-
zIS|lTo&{<1dWz`f86{di0-{;2D=Jr~S6Q{xpPg`_7hcA@zRGYlQnW{eYq-m$(>3VD
zLz^Y>IZpUOA#d}D7gSjH70~K5xlkO}aAbEFoelGgvAWRU*s3dYr<NX3c`J&AXWfF4
zL!-Ekd+h^hnz?qw>Vk~L!E-Z_Iwac@ZsQ08XMCfoCWp`LP;tRzbKkC;D*R@5^x0m%
zx86t&50@NJRZg7{;&It3LtHXi!CN?+%GR`w)Gj-WCT7*c^hOGv%+(g-UM!Nm9ze1U
z<Pf7xM8)io=aKGd@fd*8;%=$Ka#S~$<fiFcuCT=jq;}k)<z*dK5Js8%k*6tRl18x=
zTNSBt8U?{#bPrvT2L^sxovP$?Y&%hPT!%j1D8NHb(iY%g$ZqpR1md9Epy|YIkmo5%
z#j#_ov=c3&*o4s^=f4YlyNi>$UjNa}FMe{7X^1GMJsR1*hY1yBVJ71x4TFLV>RdFR
zyphvhF4_GIYrcDD7&Iru_d6m6AzN~@H_RVHTea+PP&xLYM8(PX&CYdLTMt>I(A|x&
z_*h9A!EbL7eEX&6k0c=6nzM8H%QmF*6Xk0M|0N<f`fv3&6ooH7bl^XC@z?goGWhrL
z-@Bhz;I9aT&%fh8{lA(`qk@?el6%lfrVL8`{QvSMDyxi|F+uzpaF^F`pdZo0?TEP_
z;rU`c8zzTBtmi8)Z7{4bFDw^L=H7gmWnej~VciT#n7l)xWx{Ate8*%(-jTYQf_4w%
zS;1`N6jFrSD(8)-Ik>kPCBy-~SjO35weUe0B)3j~L_6yy#Fp=*=zHfZXlf_7ioA@9
zb65#y@v(<4%eVdB#f45Xs4c**d^AS{O3RwN+28SHz~$T+SKiuT)dCbZAZpp*U2RCK
z!+dV;35IJn3?e9}RHYxbL1q0xdY<vac0>8QJBmYC`XULY#6<dXMl%Sa9*0sx880r#
z2bt|0R`vnBuX4@HmB`U>Lt5@`Tm$i1c4|4FL&qT_(8*4&Nx?2g>}Znj1;~cv5)(!Y
zAstlL0&E4Y{U8NN?OOJnM6jM-QH1)T9v@pkwMk^u>=EMKoy0s$!`w7or+-9Vnz~%o
z4#Te)9ux{IuJw7eu=Eo8k5X~${m=AIStS0N=v*FVV(}f)C}3TV;b|%4Q!w^D_yL&q
zDvU&RiB`x?1=?t$9?{%b|0V6;;zi$UHzl`eg-r9oFgA)#kQ}{6R}7)fuds5gQ=ilT
zh6>DvQ+9(xN%+g*j#&(z!N6?-Qz(6+$9h7O7<<Y0D3Fy~zxZm;g7A;z`-RpMcw>E{
zlxu~%v#}9Y%z;AB+*OM-1eQ@pbXhJ;vgireOn{sAXWAz(4fy$Y63Wwa`qz6y&lm*>
z$<BYvdeU+mbL7@K0YvJd%~(V+RNG!o+r7^Ml(z8{`6Eoa|I|@Q6K}COWPGn@hA}p)
zH*oB}^=1;a`*<rBrOC-fa1`VN^D`xO+hlL;XQ^zLf$4%=ptyH|+Oow<R~3Tk=4ZI<
zF*h-pPa8QthdPzVDjma)v#P|OJ{3%LIy<x?%tSc%WOD-H+G{h~udErRTg=L^s1{;5
z&|)!eb~jonE?eOfjgwT4*w^J9i5LIz4tvk3un#H5g&bSRRBZvIrNgHlBYs(NlcHp1
z2}(CN>%bmFoORB}T*u`|`!kf)6?jLouZP@R5;B7UmUp!#hzr^MdQ-qOtQXhvn0DC8
zRZbk4eV$eNNq`=4k@a?+80($}{TOqhsORlW6$N5P%edPak>OQqPr^>V{2bbaj@7gF
z5}#w96`!$YIsL`lP41CcX7T}SJuAWM#%4!BvZV#g&>wM_vX>D2aaB8dGCul+U8aJ!
ze3)JJ&@NKTDcQmfb$q*YhHwhSUwE*Bo1XqxmZQJ`u}|6_@_gIxA?f@{McFgSI*1Xy
zl|0c_gzEX$3xhrvYKLm7k!QtlAC~0G*rS%5M9;a#jvzZ$n)wc80lr(h?!|l@AL<o<
z)cL6{lH8zy`;m%E&OOrGqz7t`F<hM|Ua^3=G_2JvLFG%=MmpieqsbPcn9c|<u=_4=
zdF3;P<ha3KWt`%~U@L1m0Zap%XN$REQ&02*V=7(-w7EUQqm$)&9%`?b@6~m#9e?`i
zRkWpmEU%*5w9_<517p`?JzTNMDQWh3N~X8&V)DVzjgk<~1|33Q<cU)2v3%_=J5)%u
zWG=-0`G0!&(Qk#OVu3;5hdX~}J(I&dz4fdlg~zRESuEgP;GypR-87f_4-P2ywL@~i
z41miY*hsh+*h$m>>(+-*2JD0pCIJBa1#kXFK3|YW8V-}P*93$QxcVyyg8A19CBfH&
ze&=6w&^`Ew<lbPvf8H3sM5IJVv63gaq#7kleHf@qZPKM-WZdO@Qe&DH>?{<(nU6H`
z1=EiaQ#*$H7PR{@4~$P8Rf8v(GaQsyiO@oxWvMWlm+x3>6sroD3%NpV*NrcRHMxH6
zS4sEzJiFw=HmXeFSdgFctIB>}a8ut4Z^AOd+t?cHUMXR$>mYI=damhBbMQpD{anO2
zMqL-hzm$pE&maI0nR#gr-wt4HK)!A04Jv-%vmYqvMD+wUc7^t5vvnAPAf82@eUQz3
zqrqA|isQsEp6#0Ns1XMNhYX#N#v)D!PhCBHSdnX}aYj*QBZ(SFWkapMzRit!Cst}h
z66@d*S6v>woxSCa4(I-uc2Qg$Ny|3KW}vkQ*4TeLuT;$%4q>P4`2@f=;DWO}zGYKl
z)fT<d=IvuJlB^!q7llEzDo7Mo!6E&ALu6+Y_wi!5px@T;lq42`W?kTZEt8lB1<PGT
zNg{<Kc5}->V@?0m^5<?k!`^qpcBHRm^1zuO`lDvs#;~(c`dCmn&P$U=i^c7Ia*An)
zKzBRuK&t8cJAu#k7dhfx+q2VSgRdYwK0YL>e=t)iRe(;oY5`##AE*XSrBwU<NwQGs
zZ&}jb{K{g<vLGD}bH)*xluj0Q+y$qepH^T`yQN>PGy>^_OtmrRU$#qcy{42WDs>Xd
zVc;UN4%jjIAyxHMiI{LH(ds_gKca#pMErstca%<|^WU|;Bkg~P2qAhvTou((t9EKW
zA(}oKJA%QpA<#(y;Tr2<=hU)sne|8Ov&D(MDs-%KFVRD0Z%oz#j1TpvrzyH@Z;?-Y
z$UuG|Si;+*8@;;*%X8eMb}|$Zx*+$iIR>@~sTV1r&<zhd*cl9fUW{Ts7c;>={$dV+
zr!Sb-eS(md;oWmEMhH6Ixu6$>Enm%5;$B-%EyZD>>gze`ilA4_h@2JkC10d@au8hP
zYA_zizXoF?0NHOpNZi7OGHU)2m1VWt_FB%dEO6U{B3yN#3H9fBcL<2mztJXLr4DU?
zBcHjSY!`9y{zD|gMA)&*fsHmi5JtGY`%{ghvfC$?p?7`-5W>PyhzV|oo-T`0z`sD<
zKa9~%+EvsBV_2QT8?`J<^L=gsS5Vi;Asyoqs#xnluf`lud1kgN>w`OIYg|7K)tFlh
z!(HLDD1U?>>ff$)?=-cUvFzRfv~PeRL^>i%=kOc}|EWTd(-T_I&hpEdH@Ie-WsgSl
zu&9ICK14318*rn&2bn024??34F_A1YX<Ta1f(Fko)x;888Xy9uI~69)JA8K+ne`oG
zMHwU0s)?Fd=zyuV4Gm0OYqj@l0ysAuNDvP)?~)^doi<g)UobV&cKNb4nu4j-h8wl5
z(A21qu2??PoT3nF^1BEwM?i!aw-LcA>kmX7XQ-0t!$Au;vCzZ<9m98T&%_!UxWQH{
zEMbDZDfah9DC5D{7tkxT$V%&H3#MxQ?s>%ww2JYW$SboQ;^l}@J0$DAya!aX?kWfx
zv5Y3=Vv`EO9_(hd_8}I*W`cp05<|CcHT_LBTo!b&Bb6%QGHa6v0phxY(q@QWW^WFM
zd&b?Yl8TPLB^u}8<J5fR>NWbQ7&Y8%>rnM#6EN>o5vY70x0Fw;3vHgby0efhD8yb(
z5TBonMObd=I|phrY%d1RYfpnM{;@Z{QoFh4>|XfiWKW8AT`jvD1PCEZXBjJzim`30
z95!Uad)LIQPH0mQrrbVjvem<?2?K@V=pP!ZPzv!h><P07%k^a2&4*8n+7?QhkPU6D
zs_y8F?9#dyFkYrwCS?%<tqaI4Sm(TT^+OvZF*f$H*o7oRFl|d0XKTvAb!hjdLb}G0
zM8B)533kuPV!|RWs$FX;<z?cyRy16Vue@KU3cU8ww_m33k`GP<HtB}l56O(_Ne(e$
z%fdBk{B?~Nb5$zNj4prhZydPu82BQ-&QsQQarY_Ng*!nr^W~H&^nxCQ5B8cuGWV4k
zRn^io?08PTnq(m{#i&|$9b-lS%)SA4?MWq?csX&0Xl5njS2`1>{Te7i#QLVdoiekM
zs8(;)3H+z1cgqL<q)1av+&<_h%+InOOA_gyEV`MA28Lurx6v6@opuArS{a<0RzP<r
zo6=H(*~0!QFH-~iezO@ovzdE~O2AjMl<b=s^!5rBdgO9PwbG{i(Ke}gsz`Nb3ss$p
z$=yU{UD-m#(zVf3jZOgT8fw*AT51~CQSXI%MrbPxsw{d_X>KS`U#sV<)kv+esXibU
zZUJ#>NNTOG`u3&P@Ry%FkNw}J4(Ln<@K1?H20<(g|HW7dgM17Gf0P{RM7fYoU=JW&
z0N~Ld0P=qx5a7P-R~NsYBaqL(CelEFTfS0?{{MKjU-fhD*~TA$S_^<!%!K~?TL1Gm
zB<<i|BV{jtwI}}f+*)v^zqz#*88VRK|EH@k%MS=odymzc;5z0{l_SLY)>=bnT~S?O
zzHXcT*=z9SP6{t~9`{Ci=U^=nn?KM*Mq@5ut>Xaw8+35HyyDR%8K1e(l46=qGM-`^
z1q7wh;Q4&(-aRq5n7ni4&&(TT;*VOS1K0&qXdey!Bl6`X*xT6l<f_-X1;R{zSRW=e
zZ0Yfr!T3%8eF3OlQ=#h7bvzA0pZpu4Vj6C*Cm4)c9#hXNcXk}{Nr6O$9Epg^l2WRi
zkB&d65gak&Wmgq>Ia1?15w$yk9Ql<D`tz))*u07vssp#ysWfNY`icaBeSaXZo2#`+
zIYn*O*SpCLw$)Tf`3xqymSs(_ArIJaGtTFJY(|OmRmftnjI?*Bn*HSHYWtd~1#)ci
z)t;bUOwj=MppUVx<iZ{J`E-t-AztYN+F9$C9y!#_T0Y#B=B+eb%}OGC)>%fmhem-n
z1~B~<xLcy*hIWNAcQ(pp>vO8T*QVompCr;JqGay7Uxbk}Z17Sarg8BJrhO8Si&8XN
z*dsYZ6+%LG#oICaq~TbYg^*mf3+>XLe6Tl9b#$E?j!e(|vZCK5<Q(6<LaYph4;G+)
znX)+Y4Ymi+i0)k;+~i>WG<c+*b3rhuXE&1R%vRO{u3>YSJ`RjT8`)(7%K)<ih6dY&
zW@6qseeDDL?JWzvesIyJanfNq37tf{K$$SF%%^Ld@FxdrYBR)DkhE|Zz8?4jGR|aY
z!$Kw-a1`rDGi-k}(j!6kv~=Z*%enw#r8<vtuma*A#xKJ-kRk&37dlSsj@%aR-JPky
zE&u#wEHZf*sfLBgY@JDC`f6QNpRjv**g)U2kO^uvSik^*-tAAMAWPCB4jFhgXSUst
z)YQvj-~0yGe%<o-welfhST#rZ6*qwT%Uq+HxwEs=icXGF;ET?Y%*IHT`yFO+*&Lo9
z6x%=w%|`jOr@mdF%$o%?4xpX6J+7CPSx9U~o^xmdlPF?#En-R=$!8-^RvR{KvZ)%2
zs-zh&##bWB7BKWdd|Y<V=NOqor8BP<9`9W&9So$<z_y7UT@-6lAQM{x%s*Q~I43FF
z_^FJ0E*cjfrHLZHJkmFR21;)uHWxaP!+yNQNQFJHG3K@O#IL|(u*f%a{sLSUQ!L}c
zVu6RH3TKCA9WR4;?ZjQ%*ngPZ@sNz@`RmjA6*0Rxd2Z)&^r;nAt{oT^r>coY$}A}u
z9o+7M@AOzfWO9gN<(aQgSBr8UhA!n=dFzJ>3+5mm&pfcgx=h8Wq3Ed;CAHGbqAg-e
zScjO?0Qj=lQ|)+UG*xxy+PKA`+K_K!8l|!(xj@A&U~4ay5C(#H4W#(HB$_L;ftZ?D
zYP>F!D?R764%1{&!~FLw5$x#{{TE-|0Tk4A2)dZ7gsbX~OvHO=n_CtJ8>kBgI=E0|
zntQUuwptMZzLJHid^Fx@%l7n_nQ?)0;tdq%bT{z>nL7H1@D@!f19e|MhI%p)RN#dA
z2#3{G9xGegfC(xqV|zLajgf#|ZX9O3kwcCSmI4S>_?DVX%<7Vs#{orDQBjTsXLK_a
z3(ios+Il?(SRhKG6dc;{)T$gIC0oN1Yr>O+4%+RIHK(Jq^v+cv<LnvGlm$i>;DkK~
zQ0|1gbSXbWc}1hGafNr@iX!Tv=aV2Uo|=wUm+)yhUxGTM_aSEu;lvv|M&OHwMR~f}
zdM8|8g6Q&Q@cqtwp70SKpf+xF1v(~%R9H;C;iD(l1HqARN5;8*8k+-%IPM_zbow!v
z^KaD;JNW^~h6LZ~V$FUB0O>3;?kNHBFM0EbGzq$xVW~;rIocHl>&WKfX7&kUDv1a*
z>F`dj4oRuUwa{Ujh!s#kQbCM7GL2-BX3hc7L3CxH*k2dQLBct@y7-ugG>0EDnNN?y
zV9$Q1IrK{i$FX57eILH6v$Tk<OPIFiC5J!_UlxIcM$l00fSB1r_}MW(%eJGJhztE_
z#ZY-0NpV(sdFDU8bx{`Zrfc*=a;|)Bu$ZbjQ03#N$xvk;x*>t-=XFo+z|m)VcGySE
zlDhXd$~@ff=M@N=VM7fez#~IStIQ<Gp`phtV%3@se7U_cUxnw(wMtPGiRSO3NKAS2
z&r*f20H7{ROiui2tRX4@fH`s-QUS&O|Egn3W8wcegJ@cG?*;HxoB#mO5?{$g{u_l9
z$oapv)&F|L1pejW0+g}&uT)>5J|N=5f1L6Qd|mCYHvs>84(XSC;(zCm>Pdx*Hh?Gw
zy>z4w5EU<3hmgz|Lph-|AIq0GHxnbi%ts*c>1A_KuVcoS3hY>4-CcK@%feh&Z>fv>
zY`@9v&B_1)fyS-hQ0ID?C7%0Eej`&0ksrxH@;9Bu&8bY*1V)3WlXXI(5dsR|i8~*5
z;iVEZ)C)_EVNu4JY$Y(CuSoJ)#;fx^C<~el`}nRV>H^x>y)6VrQz)RciUzq4mNkSc
z9i^kkQxJzD%uB!|5uzKx^!AddE#n!xVn7>b{(+*6HXd@io5?l#$M~Exfu0}l<@V?#
zouRam_1;go(8XA#S0kw@bWCV(B`9E(Op5~>Ycsz;p0WflHX~&5BEf@zMaG5~@654G
z4)}W%HdgmgxYt0fr0X^Zz6lwN(BTyMnN<pWBOj;cBw0IAkwQ0V*7#1CWEj(?b_R!y
za||cEJk<mV@(nzHVtD77m&rkSm^Q+5HW2odq366Vc_deS&Pn}`eszz@M*%Nfx_K{r
z+h&<1SIcu%g=*M04fUAIDK+$&s=YLch{3fjlju1S8mSC4?w@G*92j`d546QmP>b74
zE|C&f&~a9lK104#r^b{J$)HXq9+ae(t}H6K@tV@u=oCMP9#mUm-cX_3Huq#AAI|6?
zxj$rXzBzs0NBG#Gtg08X=iXuqG;$h;7}#e(ur>C(#sSIwW@C_jG30#l7K#(yWMB}6
zvK%V4SfshGqp_4JGN1<hL>{4j);pKv54Mr?DPqvLVSt;CWDqq{yAe^h$e&C(Vgj+R
z_`T%L7AxQ0ghgs;8wdVHvfwC~sb!G46W`1`oM$1>vO%|P$XTEb6$+0Im7w!OFR{~W
zbBf-QFFZ#nIsJ%le%zUmqu%U1avwXV0MQqUjh-*UP31j_B{;x;!lm~F3VYeL32|fc
z8G{b7m|QC6wfP&+gb3T~W1^Jv@zTwDgWApx_GV~c%H2e)gxjHE)^CNTYTh_qGu+6G
zsvq7rKtuydqi>p5HF6=srvr{#xGg5%z`Az4D<?c~`Z~E6rxL>h8b#%zAKPj}M%%9t
zxspt^(T8}_VUab;zd+X~0i$aCYFXw6WPKZu+EVQHLryj`db{KKnn<J{+YTDz2UYEi
zTQsCYKTE<EPD^Siiy))gCQLU93#>dZj9H$QIpV>PDi`;Gz}}`#t|uHb6{6S=2s+w1
zJ$?PQH-$Z0l5Ppy7&1PJ$Hx+ZJ>xeiIhx8LMSm~q&N_6K&qbx08Rd^xGQwnWKhIV)
zjxxMqD%k2JxLCu%OVHzewV+NDWDHh!nL}&goJ)7|YkTau4O4&1O-bl{o3oOB0&&zs
zGDgGf1fHcL3jZms^#blY3+xW#^P(pTbWt6p;1tUEekn_i8>G6yIRq;MjYn}pacDcH
z!g9Bh{YZg5&k3rl+w_D|h)X{7Ui+U*&Ig+tgXt)%Aw@b7&aH*8hD;3A`%qqE;L~*;
zTtQ>lq`!>Cwiv5`*Un$)7>!rqCK6FAzYC4i25GxmP!MY97P^_}1W(9XQgxT5pRunu
zOSQFB-lhPxHN_8^MW0exuJ)wHHW{_qw*q#11y3MY4_zjP0~iI<aW4xp!b;>;Qm-5q
zNVe+0;|+JNQinbr4ltmR`HxinFDR(}RDU;nOr7WR2W1WVdJO|`pY@hfi1)&bCEI<1
zjLtwy3oStiBVs0gfwia3I5!gR-j{7aCUpUwG$F+{!~Pb$SKW{p)~r7n+VXSgZ8C0*
z^kyZFjmt^w5QEM=gD}A40A-8GbphRK1S~M#DYr%ZusP2ZVgX!l^eBAuW%kpq@-YXY
zpr7ZRHKZEcaFhtN(<b*Z=2-IXq6E9k3yooCmoNY3SmwF5s$TdTaKUl~HG)3tM;aU^
z_y}SC(|z%BtdC`>`M0PlRfR+0u_+;~v}c)%ugx?D$*6XA1w~=DZ`ctu>Gx?cA#H=<
zIb7?7h>GlKDFx(6QjH6`+!<(!_ecz=op#sS?F7x;mBnAI)>tz!#$t`Ib~{nU(-Eg~
z=GL9~Bz?KNMQ-W9!%0KXE1~+p6)Ey475=!KJXnAB8^Z@Thh@A{M<I@9esLHdN?AmG
z1d`1wjv!JP3;Le>@WIE@Jr{3a<X)z7d>|PN))_n`eDC!zwjVt-2*~k9fN|6l)F4ND
z+PI5qGCpm;dtGIhAnyaZ;6aeK360S{FI;vIU+SMFA!#d?;E?56E*GQj@T<??b55Vm
za70xr_`z9nZ{?Nt%xb^YLxs@5KFlVEwLRib$C%5z`T-M27rY_fJL~9n6H^z=smAU;
zQuT266TLN=|4-$7joqE9JBk!D+B;&)hVPQ99u-{V3@VECz2fb6wmwgp7VGk8|CG7I
zt3R+z5KU<=MUATw7j+Vj4%EHevWAD2L>{Rq^`UzF9GPKt5z!|v(^BE^gW)UaV>!m*
zBAzIy&{tCh(VnoOX?fSB1!URhs}`PCHk0qgD!XmSL4{u3d>}MP+4oS);7@%T>ImHa
za(aCzu<+q!EdvAz#C}+Z{d$Uzt}2EZ?Ma~lMM?tVM#(GKLO!FvU>w&6*3mkaZA~g|
zSy#-j;&ds=L1nANO+pWz)W!XX&JyB_{n8@fmki_Y{Cc;ykJ=wr9}N~r3=t+teTJ=I
z<4Y2cu+nW+pD%vb%f}utVt}jKjn0*R%yHhF?B|sk{CPT~Z7|LR?(Zv&QkbXhN?q6W
zuG~%e!|&sLyP6nB-4mxmdc!py&Gu1;5op2kG3@9GY$tGuI4VUfM;THfMpE}&p!=kt
zOE$vHd!^=@=)KpR^RAxZWYHHZX`zfzZsM_|keLc<(lePc4-D5JM|CMTd0n=92ko>Z
zao_APz{ADm>fv40;1@rH#eKsQwOwZpq9M~DEx=%`Nrnk^59?}CV@v3>@}3BYn+}je
zidQaCOmTob)F$y?3VQxRJj(yclEwxAqJzLvK#sm(6$6Zip+6?+A+;OuwlcI3U$j4n
z1u`Z}5r3Y)mp=e9kL_!|0SEFn(}_{zOY@5d$o?OQYY70raQsU9AB1V(p}+aowt$ZR
zz+V4q`v0T*4+I7Lx4_50qd+i!!?FLR%{gT5e-fsV)gY20Nqb_wP2CN~`Z!1;g5-#S
zfmku!F+jmc93o%SLB<b}%<H)LjDgqz(_Q>y3ljVbdSMBx%Qlh+&WyZvNAaf6KR#*j
zkQo4}1Jzoo{Wo{l^epHzDC=Cg3EyT&$K^|Cs6(>+<=Dgj7#-a5tU6I9i@f{TPJ(}j
z#()rNV8-01)lXbfU*x$d76g9E`R+hqNi^UUSo%p+=J-Sev@-bZ=Z4N&e}bRwa7{&b
z8yhQ9jZ-fhMi8hIQ_&QP_<3CKh;xsa)KBN~F)(IB5uuXvq9r>BQ5dS>P7&=P+Hc=*
z4+5F{?l29j`5a1J=%EAEYFEv_<D0YTvNa0%JlWR@uT(bXRNbt%6x<$7<z+Ht{@$uw
zA)P5|i!pMlU}l$q(qN5HCzaeK8)nA)7VH4%``LVrA11xB4zy8szi(L0l~in;wcFeD
z9JeAA!VHohGNlp`?HvQNtz`LHZAb8~qnYj~+0_E(=wB&KdImI8TQq(XST=@R%pBb~
zjAcSW{fa3oU*N$pml|2Oj*Tk5xZWf@Ax8z5O!^++iKJBrvY!M*U=w#F30fgJlYjl~
zNp4ktF*{i4L0oOXauihvpq9j7Sr<OtezZFWk~t0uw?M@Eb0tCA$Fdt((`v@Cw=w8f
z9ChJ=o!ggqfwb#Aj1^OYCFF`gDimrE!MB^otAaT0F|Ii)WhEm;XVdGADU6`Sy7}{E
zqM^;nv2ODVIt%*F=z*F`yHytwQQZy&<B!wP768NW@k(;i<<OgM&5(62aQL@VY4+Pc
z;z!bzy5*-v@>KclWj;kTS*0GTt_DR<R2$pUx8Hbh@tq^5j%vlyUaS!f)F5RcY!`u1
zh043D(e4!S!R<|1M-sVi8+)|G(ciecO7W4DIX-Mwd!O&m$nX(1d*u->Z;|^_g@-68
zfY@?2#)#X$K`?qvB?V&Rig3E|Qg`k&)2s)-|Dd1NMkr})Fbkn+*44x|2dlt%|CS^7
z`g82XvGmzLuTd@+LHzWOMUcejj9lTIX~gyqcSyrUlo74QA4e+zWZth9d?X4i;XdiK
zB?QpX<{HxiO^vK4d_~2>etN$IynrSUbLZ4;m~9iC06D&W+n}25p=`*4(!@?nKrt>_
zTTc+Pg8J8EyP_4tnakStAQcSbOD~7kGn{g14Wqa%+I#AFT>gjPa@Y<OcAuBytkQ8}
zL^rsQce8G%B22^$L3G$VA*ykMoR29NFs<5@bkm)#(Fx3OW*=>~q)+s{gV2=22oF_W
z&c_NVrQUITokIRD`ftqlV0*@5p0m>TC!iNa+2JPl2O|MJtUSm-0QPk^AJY&}F0a87
z(9z@gVa@Pp%o8^tc0nyTRJsHMgm$<jG-0H1GPb0X&>vq~C0B)C1i+Rv6n%O2!AQJs
zaedmC;TGKD4`qW(31ooS2WK<iYKtG+5rQ%}Y7>py!Nof!zLjs+ibQAI46VqcRg?7y
zNJ*|<FgJ%UNn0xs0Q_8fzWSyGe{%+tH37;?qAE)NLB6%oyKAyR!C<mA@_=$u8{H~|
zj1rYC5Wiy9+f)ceo&*)J(5;f3w_&L(b=*iG#HBg0p9VKm!<Cz$gDj_TYqp0g1hQ|g
z1QE@0q5XBd*^x<te+C~`Z9sBdLkgByb{U7_=Yj303dMPew?fYK@fHx~*00Zd(P`1#
zv^7E?<g~mEaTpL;q`?e178&{h^t%&XmncIm^r9;7Ww_iWnDN=)EWfd|?bTc?*|2fh
zSJvA!C<%^`l;Ue5cCYDNP6b%^CrtAmw)?Y_{WjNJ;Nk-KK8?D{ywKPUnYx*F^~vp^
z-s8>fKChV<rtD~6#0x!%%0z(47{0OHz}`?g>X=W5=mUMkrA0W-*F#Yzi*1s;axkAm
zTcoe6;O~0Tbr-b+B~wC~k&_2>dK_@tT39&gz{g;*k2&Bd+j7n{V7i#~ueeIp_c7Ch
zd+bQC9L@BQ*CsHrcAt0{RAo7_t%MXgWg=ET7~Sfe4b?vP?4zf7gPKz4tXG&z_BeH%
zVBbY^FEytcreGQ^8mRjEX9EL`vx`}y^D9~?dU@U-CoO|Z?S>}llLpd016}<DQJ9Y{
zZxbGM-4Q7>EIOa{HR&{yU0Hd}GtnVl%nNKT%_06}v>6TIGhX0~pDG-H1UnD$hC9y^
z7Zzh4lT=O?PH;B8N|DV3F!{u5px_KsCx@{Rv|BoNX<k8#uzCB{#N^?a;7;XY4W5HB
zP^&|Qhe`n|U%n^$XxVqA5>bQ{ml5R|&EV~7%SOp$SM`hq+7tPxXU2k2va$9ps4GT>
zH!%nHmVZ0gqM!^2?wR9?A!b~=DQ2aJNO^YErlqP&BVV1q0?-}C1(08u)&SGrdPn`B
zM4J~q(EFN~80R@S0VWJBX#j%Rqwq2O<8M6_(st(EIJm?|CE;XSTA?k_dxP<a{q?$d
zyOfoE9_mS{lF_284P@GLBbJ_T@;Blp5U<^CGLJqbeX^H!9(xavNSul+{4%FUCEm+e
zCK3&pWLgzU+%sWpCigrfO={U#ePW=)j}7d-2vmbZpC9&cnD&9ucDd6!AP|xP0I@hD
zGRE^*SgE%HALP%X5pT?~`FbYyq6GF|M|9bSV!o7(uog={_(N<>l{3*^Z*#Ku$ECG<
zT+!{dDD)aVux-&|9FmHuxdYKa=|pc7`AprqViqIi&gPJQ%o*id;_|5EL?;ja9<lM9
zygmnJZTrRjs&2P0pqaEbtwiE;5ibfi!Irb@6&%gs6<r1}nR~?k6^l~LYt3O@i`N?#
zIU;5-866^$SRx~LIdU#v2iD}>Vou~BP9wL@7bRRWPx)IZnZqH*Ik|*iCkXn2C)-TX
z8Ma=>y6IItdbIc#f%yI(?%RRH5&M&v^pj`5<O3x6Hxf%TjP4eIe6Lj5c=VSp_kY(e
zKv4La3`P7J4(08I&x2H$1t}Xq3e2D+1mMO4I#DoI7gPTQqdYJSRDNb<i7FC+E`G&;
zk>T>n-A1J*IS2qS7Jq}V|Iy3+uXfkJk=8$s9b*4W2vh~Nz4ptkgYYZMmjc57y?DWY
zqy>AQ>HRAykoy-toEOac{4YjeOM$))M95daCDy}euiKbb{>&crxXyVCP2mLaT>rM<
z6VwW<PhluT5p6zED_3>Dy0gD@Rq#c_Sh2Lu!{die4sLl}##Xn}y$OvpNmCB|Js&ny
zIX1@Q(g9hS&gHo=Ca%Pb59a>>w`+p=T=W61QL~JW?ovcD$xmWrxYG=yn4)HssbTv^
zo!w%PjE?`Yq=NORa^Yl;@o{Lj&ooEwa8DnO4CzSwtQZdU$vyGplS!_1pHk-gP<K(2
zZ&pN!#6*a<r*>JA^h8>oNU{^c_g`qgxSLlHaP2?0Fk&t)r#^;!(8>kx1fj%M@7nm1
ziyVf-TgtHF0*bSfPYoy{1Si1e8Xbxtbj(k=$R1<Dcdsn2rU#?k3pPw6FA7Dmh`}Cz
zF;o^0bqA#I@?O}OR6O|A3|dbR@(MU4C+nM$bpguH5>yb4E`*WMgQH7lG#v3#YPO9P
z+GUEokr<;JOi*d^xqqAgP@MF?rNX4&i!E^z4QxE(yOwG`<i{~w3uuLYwta;@U@4e~
zf1t#c9zc<JA?%ss#IPgQzxvpv-4?e;iX(@+9}aF-_)sk@q@$X)A(@!#V&WrxzF`(D
zpOB+I_E3+1;qN+!XSlLy5%&&wDktYv9_R|T;tn78TTu27)O#7gM^jAEV17XT#sKxB
z$eG-!ySg~7+jL|wWohq|TpyJEG<lnc(z8f$TooxXvil7>Q>5@4?cLKiF=j1}yJ11e
zY>X1c;;RLhg=18Gub$Fw^<G`U&C_ndB7o(-{m4~%FEQ{B8FNwR^1^gl$}LqsJd?cr
zczmkvGwb#Kn@?|eJCB@Lg`MQ>4^ruBR|<2pA&T^(g|TuP7G2s<gMO)BgRi|GLnF(r
z$p`t5tJSDg3-&%6)~XB!`#40jOAjnC;gl!D`RXH8ZgtTs`Njvp2T}|8dmn^SO}`K=
z9*F~*Q^Zy*v1a>@e!5xbvlfx$iA2V@C!^YESf>rVLtDXhY9gUg;Tee;D2{p+A7B;E
z4mdV=|1f7kRxMJ8cu(EXa7+Do_ny7+BEfq%-aqY14;oR2a&)kfG>n;L>*8urxZp?Y
zRAc8Y+_GSN^RJ>Hd(ko?g>(7XzAV5Q_b8}Yt3;l!N(!Z!L$G@%!GYs*ns!Q6svJpt
z7NncIj+BvEhbTSjfKi|f#AWjHRhCeNj}h<I7;cNIt#_DQv_~j7$X+_&jJ+DlmOx;O
z17389W~KP9kwiA;nqxP8&tDtRW+95a?l&JSGT|=Nk)Z_9s#4I9x@~wdTvb8xZ7VEf
zuF)zsI8}rA*z34KZo^s$oz`Nn$RI+Rzt46hA8*=dZqCyr=|uOuF7tt71p2_F*b=@u
zDb=9eS$rN<)4TwMy}Iap!=g$;WhTgl(c<1hy@B@vjw=81u(K}2-3KlsF?G+5bJ@Qd
z31Bi6Q2|0oRp)Q|+z<+mOLCuJ%;gm{Q6k;zfc-`h+kbV|c16-r4#V6$8h-WkWlNJq
z<VfyW&KjG~B?c;^3<X3&NR`(JG`9Mic5cP5EQ1N4D-Zoiqp{YnX%*hf@u}jYz3f}~
zr*yM=3+EK5IFAlYt9feLhUTMMwBmNzR571b13l(N!39aKV5X>9@a<wR2u<aKqB;0+
z)Q#!M&|jD0VLNJgn+_I(shUC?1a;}`CeVlAgaY=lM_K)cG_j|Y=C2VrZ_DE(=O^Hh
z#D-C~Qr2H*mByb}UK%`CM;Y!K72e;@$=2$$<}%N9khI?j`q+-hTtI(ryVl{A6z)JP
zU^Av&>II67R;@uf1>ldDjc(|^e{OD4=(<@y&(wEig2=$v>4*6|^CH;V$ZMl<QWO64
zzsj;;h!Mt^b|4o^s?mR@A)Knx;6Lyg>7mBDG^W$Z1RvnflV5#l_AX+MZYL)BWwLP2
zQFCy2S+Y6H!togS<k`)^+8V+KaWVbMrxM~hQdvkM8;*<3S@yu>W%yMZbOdv7zHBJI
z$ar7(ef+#W@E3HWUao*0@K&<LJxc(HhK5%pG8I);uJSk_x4gl6VNSXUFaC>H2mrD4
ze1`)-LUsZ`ABAvd0RRetFJqtc(OCilaLB*XMg2XTki+}$$?E@Jv;L#j{Eth2kp!VQ
z1T%^Lv+xKh<myP#9flBio{m=oTXe3LvV6qZ)9V}-h720Wi;wLsK6CW4X<mHW4ffwZ
zKM8XT-7pdQ9oI%|Ac`C2WPSb_AcM>~-^K}gmWYdw8>3}E(h=iu{I(xJPxbqKzB8Tl
z)IU*`j_+GS9TH|W^2PZwOXqjRBj6Tqcqog$oVWHUFi_QDd_qY=J>1%)i1OdT!|Ruv
z+gra&z%z^q45)$6pZC=lLnBL27-qfj9KqCOI<G>k*iU`d12y+$g$ShbRKM?jS06UK
zJ%b)vTgP~4=6On2wh4e+8zwp}&n#19SWe7Y$MAqy=)ZOs-Nj=`(~;owT~OuY(`FAm
z#7i^2iq~VAJ3fB|6D0)Ey<|309;7ha=1FB-Z><ZvHj(j3c~?(+u-p=hqQ2{=emrX;
zWtt%im9~Sa;w=did&*VxfRNS!p#ha=qcQH|u~FX`6gVMK0Q(Vyy|?}*!gxq>#J^W)
z&jH7hM)-=ni|0`mD5WTim7MV!P#8+bo&(|BVnjMgD!_A*C_5*2i7**iS(G|R{z&8C
z$Zk2ngR&gHwwUW0+t8ELOKs~U?E7c%Sc4lUhirvGJn*ZVMPKFcodcPqrPP=5g_z@#
zI=GjiLU=Py9#|A*3;U75u$;o@7lntc+?l+z|D9^6-}!gUjw7k@7dQr$d*ddMC&k?3
zt#)lrkqH`99<~F!6;=}h0aMnoZ{!ej-*pd7YCdR^QV~zhk|{?KHd<ZsLI3z;SSIp3
zbl{(d3(XYI`A5mi+yXIeS$0<Y3t}XtiDrPeC)NZ~0N2zo|HQ`<in^}tup{SsZdvKs
z$IV36XQkT(#A%dCsnh-_F<5Y+jEsp2jR%M>6}T&t?)#0;H|rx(8fgNp0ehd5pO!o8
za$f~crWp>E_kJ|FGpkuwVH2oQ{&Xa!saYVip%OB-V+;*%c(HV=3d8{aa-4{Q5Lx26
zQ~~N7q8AzDL@~H*V5UFamVk9EV40q^BKnjvA#Ei9P<z3S;|~Q37OK&4a9h%`%)Ki4
zM`;hlgzrRKQj)U$`~l1@$TM#Ip;ze5630&g$MqXdI5I3GXC9ZPJNi&b+^eVX>K^mQ
zFs(t&tw+XYnJ8vxtnTOscIKp2PfyTPVNRj$p!ZqYOClozJz%pcVXi<1ZC?2O$^|-i
z(kE=WQDM1jRrfmq_IbTIexUxST;S!#@>!1Z#f#<1d{aQJD;Qi-LrLsed?Of6_JwFz
zF*3G6qGut^i33+C&*cNeu|J($D-;qI|Fy~P;`AIXcDWg<t;2wuN{8<Ti=BZduTydW
zaYVLjm0~|Tfv>j}D`%Ix&|QVMh9f#exU$V&18kDA>-_cVqXZ1Fwrzm4ytz})JF7HT
z(P}7^sP9!Nx>HwX4<UPbvb_4Z`H_jbREeeyqtW+VEa=La93=>Mp^H=M@AgKO0^?NP
zPJ>4Nz>6c{fc=l@5$|ZG`rk<5Tzi<>M;8W`1@o4DNoj<~0lR0Vka7_;T{W*T3~Md5
zcZSZI5aRbL5ASlqg<8(H!(bvDSFWsjM*9zizupdD`Q5>~U6I|&V5noKTv$lwi*v0J
z-aDQunVBA*W}QO#J*2qa->R8$<=sU2iY&vVQSJ8L^B98d?ZmMfyud)b+phF=;}}Ln
zgR4mEb&GL>ZXE`IMUhDJNGx{5^yaALHG|yIOTB@S3Dt5E&3+?3fIXkA(v!CAP$qRx
zRoh9-VWb@eT_aIS5qjQS79uF;AmdBE>W%p#h*(+SHCQSE>-6|o3@5D0fCZ4lzuf3a
zxv#)IPnjW5HXy#=@q`#L!L2EJjxk7Zrm=N}E2o=q-?@MDWv3Dv%W`F1d8kDH(v|zh
zSRhc_!REVrpew|Nr<-@Q!mj|#AS0<2Zkh#}V<Gk9VB!xh4y##&1SG?Znn`gUjHUEB
z^&T)ol^uTO)-d*alauo~a6NF$c;INQSfNP-7?GT#ohdfSPm<p_VYn8yBEHJQR*DTi
z#*}zH$i0jebOlN!j>d9co}caFn8|*%S_v#Zo*wz)x<(~kcZ!ieb-7%yz<CUS?X(xK
z+?~uSz(e3Hh*cWilZ8-;i#742bii5=xnD9a9E&Sha~Vn0#RZ+%6ev!?5V+}dV2}7W
z7sBuduN-y?=20{AFs-o*RvYw&;8O0A)Z5f;!&j|s=p>w=aDo%zo4WhC3RW)DHdHLJ
zd&<8H=peqlbNpg9?X#f58}n45!K3VlVF`*I6Z6GpXY(;K!ZmA*4WseI3s_)&2FjuP
zxRCB<AGnOCL@-_bPRR-41y)=}lb;#7;O^j4hStB^4OE~{9Tgg=h?ZWZB=CdY@D<SW
zvw{=|E1o@WQ1yr#8)`{+qLPcT8WHH(&GOoIiWZgmo_}4Im?Y1+JQ78enY5cx#`0i>
z0VF8uBO1c43xUI{+uk7RoV)#y?&B#3c<GHZPFrO6W{?<zTF1Jf0?$ql322WV8Dh?3
zqX4w75h(1H*0S0N_J#nST|s^|jlLI6ECVA00|GT>4}}`|eZMzCZ+#$@pPJ!C73sqC
zGISJGlD+$|gtvV@UW(^Z+5C2>Pb|W;><)HPVk1=w5kCp^D6v0^Dw9VgO3H3c^5bb%
z5x+>I84o07k2eyWeVs0s2cG?SKMQltRawLnzI_JsyRCR0>-AkzhS!mVu&<gbKMT{f
zpOcndd&tdh(&$V2UMpdpG}hU2RL#Q1{pz1X*v(ETP2OeijC?;)j@LvT^VEGH!ZlW2
zCRlFZVj^8c|7FxM^>T#Mj*?j*(1<$c!;s4eb`kJKf!i%)PJn`zrHvC_g34?`(XBlW
z&ujfC%C_0lUbtD^Ndfy^G>95t(kA26&tZ{Pj-)5Z(EvwgAk0OifM~Ys$m{fr3_#sv
zy<%fB{#<zpL8*h`S^(DPgD1I@-SrXH;y>n>7#t{1MWG~jF8--}ynp<}MvSMtueDVG
zI8U^&Ow*{<3={l8u1FRs`Nz$-74<a*HitVF7NXms5q@x**1Lj?h_6a#twasKt3#I9
zFCG#iS>>9U_2(aMqtt<ryC!tGaAln5h53ChPQ`cY+qe9})JDq~-S)>_k|#0~GK=qU
z86Fd-wiJ>$@o7G6B=XEQU+_*%Fh}4&T*kgYmMQ?l|1Wg*HJ;i!ii$`<;oU1H@K=B|
zJRI<siY`#*Bkvl+D3mgv(C%MxFate6cRdNcW0fzJU*=yCp}w!oazHtL|D6>3wf4^s
z?LSif^8}AYT_YB9ZxQIL?SZcVhCW*X@C3+6on9D}5Zb^Ud^J8uzOM9_Foog&GgQPJ
zoJ-;&qWDYc2{P~Nd+Q4@o(g7~{Sz?$Lseq=cc@&jRS&4kpH(>f1fO+*Sj1Y%$ZD%z
z?xk|zz>51<3NTR-#|TOxDEDjr2SJupdNtxnc>!VlxAkePUj!4eq(+{51-Rpk8WQze
z5Jd2_+jQX@kODo>Lcx4Mq#u$a$B>m&7I2D=q*Su>Viue-j?)pXxI@=3DGXiV-Cp<l
z$WpLxJRnPBj~4p88-C7&^++x2M(Zlz<kwV3=u-UrH<vLAes~BQ0zGBI%V_q;e_mL4
z0uy>4ik7BWKgsXjpdazd8ip!2G%*D9BX!behs1txB-SkZxj%(B&S$TQ5l)jlw>>md
z0v)Nrh#72a%V30}sJjmyoEf$vFd6F1H)YXA(rwO3yM}qo!|n|9$~mf})>f@POeSR`
z;4HN&Qxy#VU~QzfA50$}^4Be&(-Hi*xjC=Rc2svsq19NwpO(BVbem&((aBG2yGI`?
zn<DT&0B<aE<jigz$U0*8A1pixjLhD8Gwv<!uFg&|M@RZRl1)*jr_u)4oAN!RVom3#
z>JETEOqvAQThGCR&6iXS)X8cp)P(>7IG#C_)(TM%1yQ+LOGs5paA3laWXIN!D~>f?
zI8BP=XUGc|Legg}ymn;nv(rk@rGUXfRO(=lds<01Y=M1gO>q?xLzWkgJs6JS?G~LV
z9M~n$<CuPgf=garxAzhl+CMWmw-~e090rabQ2lU(IS{;7@o``RKv|m>sE66vx}k2}
zX7Nx2`VdVvSr)ysq^S0nUcrHY@P)()?w<85ssNoL901LVWZ~?!ay>NqgCCVRo%8nj
zs7qPrhPqJZ@C?D+6S}cy*23G<)9CM{b_Z<081hB+u+(~jh70_3Mo!d41zG-e9N2Fa
zBJL#kjxwWjQquDdhgfKosYU5O!}2+yOI#Kbke!F#3Y6lzEY+MNIOe}UNA;mx1ydEL
zAbh9ZS+5+jlm0v<<o?kOrPnM$-Ayjv#T|#%E+h+L6jfCeWE+OW?Pp5w%d_HgCoOP6
z-IOc`$$Zu@2`dgU+0lpiQl8OQ$1QAbUmBF|S|YB<9$(c((6Z#P9TVbqC8Hl@rY6e)
zapyTR`g&SOk*Ods$XeF)S;m@JeEUn%HJ2GxKWhP@3KQZ^(CfBT_WSfXc@@TFZ;;}^
zpIfAW4%8mSHrzU-`!mDtPC03f=<wKcnzA~Ci32TzauSN)?O{*~LO((LTVc-eeO*!3
zuqy5c<s<zbOw%W04h>e$Iu8kJ(dTT3@9U<*T&rH68bH<XA4T*t*_!XVj3FE~`1FrS
z_G?6L;o*+{Fp~a%l)Yn=F3q+jT(-T-wad0`+qP}nwr$(CciFaW>_XRj&OLp{{l5Ou
zJw`rHW<*A0{9CcsT(RbSh#}LXd*^Rqk>6W_Frznm1?sJsj7In0a>hJAZ{XDO=3!)Q
zaf%7=cr@#051U;|K;e=>jdI5fr0q8gU;(LHjC$qVxV@8lcTIdDv9$x`Y(v%R$ITud
zb1dSuRSMfCF$Wl==jQJTS8Ju@0+XtBT=?@eDqX8{f}(0_p+L~pUsgq?*5g51J0t%{
z_QeDM$}{&p50ybcopBY`yke*SAf=A;`h!>y$;nKks^us1qGmfjyi>Fki|5q?V1Ecr
zQNU<K;x~4e^4<*@Tg8KX#aEyzh!#iQy=A7eL!MEDu}LHp${$s!_%H{)&Ok1@`$M=~
zZ=WGU0Vf{HLE>4*gmwwn)cK5UD0|<b9Eeg0<)Z(l=B~3koO?x=I{`&=o2Y@jc-CSp
zTw<a|@YEp$gj2R#(?Hn^=s!wP!%^A9!QgkBT(2mI975Oj*WITDpl}*NV=OBX8nnn<
zU7D_0<OS#x?Np6kO}pKirJv-F*FW-+Y-XI;%g+z{)5RT67^_ui&+Hgk8Ij~nhvqx>
zt@Vs3d;K9mZBhbh)Y)QANcCaKuY~{>^?NQC)Y!Cxjw2-WLLFVNF=vziZHTQ;FXXJ$
z0bV!HU4h;;;c^x1!u5!SRQOW0nAN!_oJ7?(4gXN%(Nl>r>8W@{7Tfkjj#vyqDLcI4
zb>JNjy?k;vMtlIxH+25!8G$xD9cn)7Iambn0&%Mjyz`76z%iKrOHXSFb8gX3cM@B4
z<augo>Bp{U7?MV*YGS2QE?vlM4Wixe5bv^EP3+GKYuL$UGrxcaHy?SeN!ea-tWtZF
zu#=C2hq2{!cxM#_#uli@2yX#eU#o})lqF($%J3@Dp#XSwnF-XS@OH&gKzHaq&lj=n
z87-ik5(gXgM4*XF-Ch6vJ1C2wJz&93yr?Rb8U0CClqnEg8@%LtcjpK9IPq{~C;UvH
z>)2^TcA{{+4prTMKkWdICvC;D%Dpxq)(q@nC@E#6cT5@`WwS4)5x^eDBHft%cojO@
zBV>*87NITgytBbAx3^my@hg?{A`7><^IP$eX(UPo2m0}9r-OZxP-RPqh^{-xsR#)2
zl|Lf4>izGm@2d9>S+Md5dvdL8%N0?;P)4>*Y?ijl1~?IH`yWuc``XzYS{k!BF1+hc
z6>}_Ks@0tIeSzxBH9s(gwFbNF_}%80)<iS@`1)IH%&x$fW2bbX9ore4;O{HkI;|;=
zgms7qnsgeG?mz|~eI>fuXi|nfpy$&Q8?ltQ8s0sfPPC()9*Y)CB)~}C3l^c4^hn7^
z>{XC)dDA&3=Ozu~LE5RoC|^-*Thd`6qUsW=YG#f{!sMMVVws^G9HZiH{cb24FG?|c
zGe5iHBs)wn1^6-N!rCR%Iv&=1swf%`KYAA7`EO-jJ?zPRh`cpLg(R2n5I{8L;))BT
z)~W@~8YVs|P_5j%?6k7>LhFx?&(P6SgO2>EQv~^@)=x9Wn<1C@j$FR%@+yRAkMIPG
zCDAR=VL{p{IL&Eb)cHRX+=xm_xfB>iBfn48-TU=O=jq~}h7<;n{oW&J#tw%rfL~^#
zc*^`&mv6>`0NznHns3-X{Tg6Zq`}&iXb1^k+u7}pP8K$nZ8Yv=F@xddsg&#V>!&xH
zHo9+Gdu&0+Y_5Fb@w_r%(R&Z0Vs0&y96?i`CDe|`l_N_Mwi7`+1=O#D!>o8xdjB%c
z#0wSTShOn@Vc=+kH;`%xw>N#*qhVD82kQhc`bK)_?&D{Rt2<@;tq4A=*Q>v_;~o5J
zbUCxZu}+kroBQ@cN_&)&nNYYSm$S1QMjByo;)qpn?Btr6#q@e*1hU0w+-vskN%1ak
zpQ<2`r4fc!bDh>jZ)}P$wl_U-3g>EHA)0F5oLj#G)o(gQ>fz7|Ib-u(Wn_pdI_#J~
zv}JfZCTAC4l-uYvM!_hr;_)^pIu^<gCS+Td@-#}(c!)kQh?Y5@B>?0AWEyaj?q00u
z-v`q>c>^uxa`#pB<;`t{vCoB`r!D8wOj);Cs8S4<5<X?KTV*R)(5+J~KtdG2>uA@^
zEjexCX@}VPq1gt|=FbWGw}%U*oxk6Jh#+tD4^8+_^|2TL04-1ozuKg`$+2L{k2Hjz
zAEX!nV9!53D%{u4$tg3|L+Br*5<8B7HkoraZjbbpR8$klll+>w0wn04QLg+y3rGXz
z6#mE2CH-+Re`FDVJl3wC2SC_O06+`i(|`K@a{&qfU<|M+EaLz39uQVen~x^wGPc5q
z-uIs&u;M=-<O9qp{>RS+#QEQ|{_h@A4E`Ah{`Ny9j=`T%_HP##MauVI%xRPuq0xr1
zroTjq#?+JFwq*{C5|<aX&(Mx>oxRP_{R`85%AX`MQHSVJS^5fw0yvl7l#7~<-LpiQ
z*o@zZ=d7j>8)AJqd;Vr-h%XEDDrY&M#PDFCYXmxwaxQSeMJ?Jen@C2D2OA6L%le_v
zL#bP6M9q>8h_g%QNjTZ7=^^%NH0_0D#3~H7v$%psJ%rt8S-3nQ3v-r^EWIxe>Kt0z
zD-!?C;;w0s8~V`3DgbktrPB5*uC?&~K*5s=r+}nUkOJ<pCHpNhhkxiXP<dR++UQ<>
z3O?NwenNuJytDEv>+;tM34=AUvqyGQ4SLiQEeBZsjX+)9V*JdV9Q?i|)^1=l>8xt8
zmox4}rgY)#1w%EphKc?WpgMvRjp=thuZ&pb_Y{@=`NkYOl-~X=Yv79z`B0m_Oru8c
z&0jRT?jC_oWwiisce+j<zLfqv3}eU@%jOcLFB5K0LAwKJ@)%d*;-TxIu@$ztE}|wb
zH?lmolRLvMi5uIR2O)QGQZU@%tR@lS%#hz_PG4z*rqNg3SF?a2{o8EKLMv&XBYRlk
zu9BivxC-eeg}n&N4C^BtpFwBfI|ac?ngQschC@{tVe$}dlnPYpv$?(E>Z8CI3r+$!
z=iDRlmut=iItg;K3qg=74J5!>{?qasoc9L`IB;1BT;lD^;|HRoE_O2eT#)F(@mU-^
z3hl={zDp4?N1Q0&q%Je0FPpKC5f;;HFFCH=`>Byrv~~V?1#Wd^4TbAYgAKpUuq_F2
z(?kD=;v5-kH6+{rMiajXAgb(6heP7gh&d)M(^IDs>t~ZORp)t`-?+%6xeK8V7_^#+
zdvtIu^<ZHr@Lx}=u4R*xN5LU5Tvz>&V)F)*Pu+qZkhD>uF>kcRWL>`)N)2<JoSwBh
zpNCNHRNXhhb_jSbD!OPAgd7@u`8N7t99v(`&U#Ha%CgTl6KlKT4;@05Izqh#5LD@h
zW(B@~@IC4`v)Zk@(ZJo^alk2nyJ9Ml``nrK#=#c8mz3#_?+0U+xQ7ekfh~ePPwCFe
z*`p*!`6YN6&%OP;#=Keg1r>-Xd`w=~f*r^Vvc^kg$D?muA_%tJM#m-EC1Gz%tOa}r
z@2$56Kje5s5%Ge>Zj})vVLpeH*mC=DKRjD2!B2*du~XTSTa+@#Gd4(h?6Ipp>tU%3
zN-qa<N~?F(k1!|3B0jE3!jeUn5m-|FyInU&p6CQ5rAnKSpeop4K<8UtD|4>DQZ}r@
z*vqbNsIe;H5&GC^j%NR<g}>hE3S<A7syf*A?cfmfhDwSYVGpaeCj9laTigtJ?js7e
zEDI4dL7o){bH5ZKLbxV)+**($y9)cX&`iL=d~pf9`HuZz+VoU;Q49~LFp>dhn@Z8d
zhuGO0JI7t^_9;JS`Qk}nCr+ZDgqM6T*SPUPfyDF-bX2B#=H?7WxR~pa6nk{=6PuQO
z%Dr!Bs>9ULl;k%y>^P+P>hE_T$zTBOi#Eh%5c2Af8f6Pt92WirZlA2F2WpLs)rA`4
zIxc80hT{Oh4?QVx`9CBZ+7;`9%svdo&CT2z1#X1^aO;4{%q&dINP48&-s-RFzx?hT
z?P2?7rih#ic;)C_eP>W_`*-68Hw>%u^Fx@3#v+7Z@jKy>j4I1yY6Iq`mj_$&S3ov^
z>N6Gm7GO2S$7D_VbTjl?B+}bJBT`Y+o5T>dd5EkUH7ba>?tf3+&kD3|C(zUdBsFQn
zZSAMIVA*GA<4s(s*YWwzs~-*yKOUH3f0D@fx}6cOUhGpD&sIrUCubgD`%ZPmz`!Pe
zX-tYk!QPwbEi?g~RfD;j#4rsA7zgx}g8=;Sqt*sD#FMg48`%AVgYHQyM(rB(&xQbX
zb{CPU2E?Ru+HuZ!y@bGUe((J@su$)lRbt_U!tfC%L(zplSd12YFkcp652<`{aN~y*
zQ{F&WG0V&SD-Ku=nbg7^j)b-d_rw}APMQDr_Mm*QQJXl|Ly84Sm8mz#FmAlXSVLV}
zUH%;Eo7-sMGvjd7ZAz#ZO0K#D^4^jOaQg?gDLZcYIcjrz)AI}0Z)7@LBUCil(KsdF
zo4A|}UG)LRdNwNcsf2=jH_EYFESBqA$<0ABOIMCNc`BeY@5qRlGTNGV6urY*{QmTK
zx0V=UY5ltT$}zR^lx~Jfs%Keviq1(cB&P@+61Y(I_wMK+6!bA5*=1+?AYSO;uWIcj
zdkIXGm)N&Oz{;;fFy8RfNyiiyh&CCuUWix?jY)io^JFIB!+sPV>S<*xDhmMJWRAu<
zRkh7<Y6<ZkR*17oIwy)=l2aV({1z-LF%{|iSz6rd3G*1SNYiAMlx3K5k_EL9bJ>ci
zUiPG<LVzXFocm1L3g`_$FQw5oXWJTg263T(QjUs%Iivr<kuY~byY2qHy8^m_{_AN6
zPtLCIe{8r!GyiF_+a-6;p%I;1hi-4umoJW2;{W6|f6l)o{~${P{24zY&i|9#De!1A
zL4r_F3$nvXS<^4POe(7HEp&j)4|dgpQi78*7CqAW#AWO2h|51vm&kl!IWp&@^{9;G
zASriXcdN%>EW1~~_+${$FiaL0BeZ<J2rJAmt;{9O@bNCEbSDq9d%2qfEapbfjC7oV
zHOCqW%rEcle(NGtaZ#mz_xTHYUNOv2|Ne{iZ~oiJcx_$&{s$Y69Cj{yKZEs`)*f;R
z8MUsZ``A%dMr)1qgvg3=L)Lguy#3tC*qWjW!7b&1Gq*_TGL8N<{$IRX;D_v140F<;
z>H#qosWXDC1Wb#FM|XvGzCz5BM4jtcSZCY{!jT|9(ZlnLY?<jFd)Ex9Dsp2j%3pwF
zWY1Smx+FDR7Twfl$!giJ6IO?ftV|#8HRmCH{B}vlJdfkSa`?2kB1vq>qJ3u>`7Xw@
zjC^0WvJd)M@X5>4zGSnW;Qj)ERXQ<WEcH=<ClW2exBZ?2Xs6mYB6<ox?4C8n+(f5(
zKZG6}B0W}W7%evL<hARYpXT%CHQ6{SMA_WALnr_DB*0g#mdSVKL-n`(1-sZg*xfpn
zixPg9%5-gn4T?J#OGk~Vy7MCXJFJgp|2e?1T}EH1<1U{!{@+^J%>@r0O2jn*SV#pj
znK_m@rw2Arev-krmWA!D0!X`??0HGYo+bk~_^^}x7F3!x18&)-`%(Ti2?y1+9>7gR
zEs}TPC<u4Sl{r@dXtD)Zk0Ie6Dg$#n*?X+YyT203_ZQpV2}*{)7}^4wd<>Os7Ow^5
z()wOogz5r8twYSeeDsGS;ox|d+mq2KDD^Ng3P8O}Q@_#ly{X4&WudR2`37^SxeJ6;
zEUj*4(J&T0*7z+av_17d2GKJWXum!coy+QD=32cXqiEA5Mto`Po~uQ3RZtr|)NQ;l
zf@gRBZfA2(M6fgywkT#@OCdxt$(3-M{VhcBiM*w<-o&jGVVbsQY89!k_lEMfUe+{6
zqQ()ub=t2!>3!3UQP}OEgT|p1D;>I*N+Qn*koK_F?5dY0Ybmd#>phrUR%w6~vbk~{
z4|wHiIz@nV-=HWbn~G-fF;+{wbxsq!=wm}3p*jxNaaah%M%!5o2NVL_14n9h+V<+W
zPfu&Vi;*r}b>ki-<IS|}7^82<oOQF8CVrHGXyF*zW{neE<1#ewBv*h!r^a5|s_)(}
z>q}RMp*pAq)h9KzxlrNH08DBXd&lENHugfe1H@%axa>pmEy~>e;0cOQ>GcuXNMTD^
zkm;JJuGo&6r-Y#Ww6I>H9>htp!JdzXoM3EEUr@@jN9CjvdWGhTi?t;7onfmWUY1+{
z<L$G&DY==?1Joub#<_&5$y*VvLosyX*j=wkI0rpIz{t4R3i{rQqlsL^`7D`0RDWeD
z7BQ0-%AmI?bUpJ&bQW8xQmBEDxUFM{KJC70%+@rQ-%GP*DJ*+eN4=PyKx@^<Ed})?
zzO)E@f&Hr3=Cc10ShNhBtA#pUe7F{kD`Vy0w$%9Gbv|gkMCw5apocOhj=Q+g%0Dw}
zox&2b0^_46<T#2}RX&mB|I8Bq<Ei2xP@LYrbw|>7vf?Ygi~6?l`;<@XsH5nv;^ZY&
z@5eZb0p^_j$2k6X)bbzu_y6fZu|)Xy8{kC*^du%CASceep?~#&DFXmNgYsuw|C`h)
z_Fp)=>muSRuWP|5Y;53FZ)^mvAl$8uoheA_-7Y-(?z9W{AH2<Z1FL8B;>LthJhZkO
z@PI1#98^?Pk{}4T$w~|+VFop$D1p5FD_CE`JOaW9>_NOEyeV#Wvnl_COOa6N+1aYw
z&$pNB^3V|Ja+Cfy59MTQ(hdpJX)K?N$~HxGEld6msx;LIuvYx+%Vv~e^#dg%n(AGb
zQ>_LlMzkPPcMaTXKe_LLq<B?4GCq-E*(;;hhE1p!1Nx%n<{KHm2N!)j*owGOrzKiF
z1-~B@jsQH5(D<g0NbWQl`*je<cz-1T-rSB=+vSy1hjZqSMIxekD)#!wQ43Oa_Su*|
zETlp4?V?o6D9DHp7e8>FI3U`yX?^mxTM3$%c&#b=V5Vqp0)98QSIieW^(OOeVv0pi
z28&N-n7bM=Uu#J1t)4i;q_dA_emR#=&?V|OAmX}{JLu<oOR7Nv^$=I!6Z9~|7YouK
zwEL`LWedCoMz|{$B!`$Cl)=6%X8fkH6lx9p<1AIcGe5=)5*m?O9ch{R44RI3I-3tq
zwaSTDlcIMMcWYko&?V)D?j%ovI=8Rkp(vGK^T8cvi^VQo-lwzv!hFxhTugwumf+Y1
z4PWv!q90S6CA$zATVR3XvC;U2sm&l37)*fr={{QxR&eLRg>+M4($7S$&0|XyHGkIR
zHc2_?)HvXk?`Q=a2m<SW)XtC5(XIxWJsUvw*P=gjR_z0j+P#FdP6`12QYAyLFl1%F
z$oQ`rUF05cXQpxKQkGT+$D=;zM&H15e7CkUrNp@0j77h|QCJ!-q^hEc`#*1F8De9d
zVap@p+QOh|LZv9x&I_Bun0xQBI7O;g9;d1sj~{U^^^Fyk0C1JOmIb`2-+@W!SL@^L
zQ3?T}f^@ND_~owPt$Cpd8uQ&wJ7-+KMp@OWSa@^LNE}c!o%dIS0?O)14%%E|0la}}
zTv#PQqf#PPfvIQ@iBv}*DBjnP>W$}LRQCfSE`Ar%bH?@;Dvx!&)$J~EC6|eMPJslB
zQXH-pEq12HI`}S*!$GJsleK9ZqRf;wev&{oTLmi3^j0qd??}Yv1FzvDps}E!d2e@I
zEs*j~U!$<zlx2H*^@nvDq~&xe#9m7N5TqhAiv}S24D*W)@v`>nk1ozTRSS}u5;lR3
zn`&yGJx1t~VnlzrKu9Z(@0smA3n;tTBuxl}7$v6jV_dGFd9*)X>+Zdq{fS}xjrJ_w
zq{mouE3IS+FLQy)N{?AR{!?CUjB7lgB1+2~9;v|*6X;*GJkO4eRIfvbHHkJI>a^*s
zK)uijUiHfBT__Sp51d{RXWwL3e(Msc!@@x_Z!0KKr=J{SLD-}^3uo}h%~JmaZ%hh#
zBs*)qHJo+VW(K*R(HB{LnF0O^kyVQ|u=-2qk!<>IW`2A<x|$iTL-7)=-`xvJ>vA*6
ztgs$vGSKnhqzmy1MOR^;`R*;7HmgKvG6Ekl8$wR&mAk3piEsfV*OaIoXwa=qt`23;
z9)*k<HV`(iRq{v<cVM4-q<9Rk!an<t8>+~Yq}ZR$jZ;seAsjAfMb#vYQ&#3+;dGQM
zS1WDGE`uykY?m^Wr;`PPPp+G6p-q!yNlOIh9bC22QiW>U9-Aj<ZYfH;qqE_{SCo6k
zx2f@ciXe)*NS;|C;(U!O>l)$F^^0Nh`%-2iJU7JLZo01(zd}vR&zg<c?S<_A9t3t7
zJNHgKk&Myhq^t9xe3B!hCx>(}w4~ziw0GDL+KkqN1Vo!e6sKO<aFZ}ezAyPj6w)(&
z(ZsEO+X0Uc{@El+$sByYqjfJtlSR6jZ@>&#;_peEsZH-(=JX*kNo&Vw<kqL=_cic5
zyCY;C%9^x6vXbS~h$Vhm7d!~nT$z4c#XbC(m{{c2`s8c?97?kZ(QCh2D_a=myIHmg
zL`xNW)SSEz^8gg>jA>`SUtD<4mNdIw&!RLZ8x`^C2wNPMo1OWW)p5uBd%+_?+oOaj
z_$~+pnuhTY-{%GQ?d}qGu78QUC7xELoYR3fX*@wHsm$O)obfTB85l|0h&7)Q>dm5S
z4@z=C^l_(P->e~m1e#RaWN8JTA8XYS>U|_4Q;ibgV~7sDO;&^-eR=c4!6Y40{VeQE
z-=_H8-()G-q|WX6<7C-e628QxqJ$_w@H>+i$er+^M)M(-F;ne~Z&lXY^u8Uz<y*1?
zjAoS|(bxnIQW=^!O;-TF(|16)Z-zknt-C6_&pF4o<{I}n)7n_gvf|3`z&G3NFgPPa
zMn<hnTFDeBf<ug(-BPlI&$tUeqD{*8oLzQk?}dS|My0v89qBxV0h<frXks`~UqX#U
zOuEIOonL_Yl2psBTyz=XD!o1;_ZlI@y4oU~=zF-<vy8w-ppC7w70U9rS>In6$^(zL
zpuf%A-O&R_7DS|`Ye%lE8RVer)o-L-@-`KZh7fA><gCAGjzT|g73nun<C+uViCZ!l
zphs8u1ODbO|H%S4fOmrO>2D@nk+#iapqt}DUjtNRU`fJ$^?4yFC^nUCkL&TgQOkd)
zK`bSX{1_K$-lb39z=O1T>St-RAe!)fkY^Ome+b#1dfG^<3S!M3ZcSy!yO{<HNmEkt
zc`eRB{R1<B1)y?`fy8P!=8VY?9i2qIB2;^lVWd7f>w$j|tbO?0)gSMOH+}$@ftBMT
zifIq0b-t#18Zn&gk>ci$b`b3<GOO>y21IeTqsll%Rfj9`-s=FLR7drCJ1nVu8$CS}
zl(3IRYvF<s#8eqPMLMwJUvmK9JSN4Y?_O85<?a9btYCPuhY=GqokIt$9XLm#-z+|-
zx+j%l13uaJjtrEx$g{qlkGd0j?Zk9y-^3rjybhWB$p#kk5a&Fh0n{SB#(|$W;)x%`
z;7<oRY@|c&)nF!G)Z;_4@W<-$eH~v?HW+i8vy#)C;h)`lMtLi6!rg73&M@y_^Jy-h
z&&t#qf^-prG1LjyVnvJDUK0z2a2K`dt$OY&Pwhb8M{ofl$THDQHh&;_?<X!*$01b2
zv~jP<%d1H+1-7bJEcM?e0pZC=Y_`m${e?5<<z_ZegE74>IhmbPx#Q$a?0z6IcRTdj
z@XB2%2P*PJ%73tJI!vx;)_3`ls>iJEcUx96U;jSVk;+eBFT%UFsMBI`@vc*kcj1G^
zw)Ey64pE!M#3xeid|}?yusgtu8@0hB&&Xm-oB<C?t~G+c`euwj`$hUl9H?y=GL>7b
ztxX_!;GT&_4f@CzZVwfA@hE-2IFUOB%nzpQ2=SwBmlMLK04O(JE-Uh2E^lC6i9W?t
zl@A-t!s&SFphf$V{p}ni04`dfswX+%a#Y-ya`5|jD&g*hOSEW#W4bcNvGv(;q49_B
zRLBxUyK~dU)`HlCq3!AFrT|#?yZF<@w~kd#O-*)cp<6#1R$ix^4DE_~Hl<fA=Gcwq
zJWc+l^BO>BZXfIGy04KFa24YjHj~AhTX@$M5|YB3Zzy=I;*AT1azRW8cjgpdN&wr$
z>k}-YuyNvodV@%DTMvN0x|kI<10x8Nw#l~BVV_LKgNjS<H9O@*IHE(e3uzuWiH;2C
zFmEcbXT2?+x_iLFiI!vMLRbd-7Fn~8zm$w#0((jFeDq*4^EqhTTg^au3T(SJ;b`To
zZvC6=5&$TN=TO4W$@Yql3MmxHI^Pmg*?z;8Em>7uoMaUSCY5-all9LZHqbJU)4<**
z%Ar~mz8|Mrl0O&bzuDpb%bEU%0}dF#BjA$|$n3wme%k-OfSP{;kmLdI@d4-uVilFm
zdP$tR_JPv@09gO?IXS>w%Ku~>{xjpJHi!d2_2=#X?m!awcLVSV>TDfH2S)FoCZG~_
z3x5@c!}wwt)vFj1V%|^ZKh-+`qJX*7|JQ#1f7U?P*eKl$?AiJ#IQaKkz@9&aKtJ`^
zbU(R=AF?=<+t`1|T$c*L`ndVv!vrJYp;`cyLT8qQ0t&l6pqM=jtnL*q7nJP^s9scZ
zA>!s8<X=%wBs86L!X(h=!wS{Ll<~LE{Iakm;ZMtLldo&`^&Vj-r~c?7_Ys$JIbXx<
zTi$baud(s{&KXq2cIl*F!1xk0-gEvX=mHQeMbPGC4Mewhw6)UOk>LCkE#Bn@lKWR8
zt_y5xxDbm#iqKB=jFgcUAU;N_veU2`8FvH5?mYo&%jeg-8br>?sc38PayNaG31ZyJ
zpliiwA>CL2^U4wlV>E+%2TXY)mc%G=;maDdVI0Q^g`w?V$KT0ow$O!fo$&8eDet@{
z)Nj`W1{AJx!+Rtlcu_rPlhR7<3S*<cyuGmrMjeZ4>~}|%b&IZOKLmbh{3t3tT6BlN
z8u=CLJnMQ5L|8oYngH0#H0vf^Bo=Tk4wSQ|A8Oa52?o$;<wJI$xi^^t2AAI8ze9@i
z7fHVHZNTCt*WGR6Cpz3|t#37#R~hBN1D83usn-K2#o5|C?^r--afZcH>b(S7w4w1T
z2%K`S)E!i>N&&OQ*FTxzwm3aiC#==RBtY}(&+jbYkWx(9ElcP+mK>MQgiBB&CSBWk
zfxaTKhk&zadG6AFtzQlh6fPU}(Bvt^=jmPGZypab=z}L;x`N@vi^fiaEC5xEsa%L0
z=g%DhU4_6OhNkfQl1lpJFQvglqPT%`vdpu9bQc16)$YKKO1-21T|`S8V8P|Zd|awN
zGyRz92pd#z56Ey)`S{FYK?tyj*nMeZawt%3XgDtWiuNZZg5=l2mZf4I+a!7Lz9guz
zL!A5LbwF9E@~f+W{s9Z8Ny}*7j1N#Pf6^)ARmNUO73~X1+ML7vSi6!t>ssix2U=7n
zFmZMpZ?hq0K8X+}9Rxx}yN&V%MtIXJqTi>)A9XoIajtwii0`SSn+h)8^UJ|8M)MJO
zdbb9eodXrpfCIAm<<1O1MNKz2<Q-H*hG)041edNFy`IJ{m>PwThI3RRVmcx1(|b02
zn+jw!6hgr=D{BY4#jVm{m|{MMd9So1VnH5u%<@T&af(F@vvotNw)s=5iik}H?%^T;
z$AH|RGcU0&jXD(u!&_+m`}ve!Rxz+|2;y;Kgr+ZG`r4<Gt<i!|R1}7)0o+(XmB8oE
zr^WR}epy15MC``X3eY1Jo{f6+Q6iAT9q?A}HEaJg<1};QCf-ypi7gvaPm9>&&L_QK
zW%~8%qy$!CH&0yTbufPZ`V1(!^@F2Hp$6VT=sep}>DMoZxU>zRY0}!0QYeTH0E$OS
zUje_f6E%CCPu+(1>UDkE>fj9shzaGbm$|Ycl~B2pj}PrT8LZ2g#KrXPU~^i7vSvmh
zkL-Z(1$lG2isWa>Jl+OZk#~`9l%1s?g%MQDHY)(Yg7<9eP;&)SO@VHO^%mKd{OfDf
zg3T3b$cHndK}*iCKztB;POzpW=_szS6LOGw#qh3XI?hsJIO<2Fhy4nX)*$|$6AMt*
zGs>V-P$l?#Bxv*%-$aKBzVE3CBdLqx1TI>mlWiL$c^~Ms6v9<@Im~fTt7KOl?Zv}x
zUMy`ynrt~4VmvkMIBY)E?SJXYUc8=Mp#i~S?$78Mr5l54ydHX&eIxL@K_Cq^1MXZ#
z9wL3(DO(BVx3)0Dpc1ZWY@qe~(-pLy_t4l>NJHKrJqW){Y@`bR9zSdQr=dK;^3?^E
zn92SXC(Lmf*{#&j>6zpRB7`IQQ0*kE_DiA~m>}^kC=8helUVvK;!hTUP>_HIg%7x^
zdTPYq_%w1}O7*#Y$DsME5X{$y?%vmQO16#vAeE+fk}m)zZvK7}7}DZ=V8TX3{Zl;?
zIf}ox3vjy2p3YLSh>UDabg}^#lGklRn;z_^jum^fJjDCQ+DifE%Kn$N2e$h$*>V7Y
zKl$!|ne~eQy8rh^0!~!m4`=a%a38{HO)qq=T}xQi<lgx=q5tmtXZHXH0D#fp&s6$1
z_WdI|@}tw`hTkmb*WoW=IsTT4yVX(N%B^Z)D3zV=<@Zj8@u>q1OlYiPUh>wI&!WSf
zGtqe7dda;Z&IPECo}(i>8FSlROda?s`=&Z;c>NPPOnwkP^fzTyKEWe~>EC6J8u#;s
zLGt_C-zffmV!zxTy<oQ#7gbRxaBnEt>1v1#asdLfXAx@Kfz%Wcscl+FAs;$cM5Bp+
zMpo{jSi+&zNQH-&QrU64AqGu1fr3`<Z6ghA>9}3lsj}vwX7#Ha&)Wd*l=nEL(M-&2
zHZ3*Mb6aRo&WOKVH#6!28jLz1;WO}viI#~q7#T*+e2V?7?;J?(P}_r-WZ>AAO<4rV
zM|U+WhHvu}#^Cw0*C<kT9MKAT;cDheVi5}iTK#Ox#En6Qu$Ab?48@`d!Qbd#RJuS@
zdDYVt{5*t-z$|HHQ1ymhqEKhL&eILAdwr_wXoz`9Tmqn8uE`?JowHqL2p7{E0ozW-
z1N8#AGIkF3H}Jy;BTtQEK=-xsd#mfj?U18P#+*gErR6R5AeU@ap;(d?FJWNPe!(ZA
zI8rsgxz1Zd_NJada8BJ5hJ>1=c_pXY;*>wkp{gUf4YsM%DzO)|l=1P6Ifl1v^1z3O
zJ$SWz4RL_xiz+R2i{Jv$MT`m)yX;j>d>fnn)ZL)12=!LU?R|W++46CX%9D?2rGC0j
zk#P|v-fGFQBcm`xBT&x?5${|$qL8Xf=N%H_n>xaZi24CyJ*dOY4!2l_&1#De8`r9`
zfGvl#e{wPWm0>@dCaq>hkY8oy7YhYyy_o<9h04P&MjIU%xD8R@?l%>aa&uWsRV%JY
z(Kf<V+!X0y?P)-sVYOh6?#?WTGbPLAz>y6w<p8ym_GUP1)_}B6Lcik%imZmNkB@Y@
z0IgPPrvr_=+w}&CtopUzzEr04f_{}nVBk6SLk>Y2BI(zUa0HJd>7;x+Bw~F1Y0j>*
z$G1U<ooEZTkO;*Q3cVs`Qe$^fp*3LIrq+7{{x>o!kO5WPUr;J{TOb+k*hp6yw`~ww
zcr9@|xdzt*Azuueei?FP+qMls#h@jb{WLxczZ+`|@&w@-Mz~Ix2nb6~=^hgt7%+F(
z#y?T<<y-m-*9V)qii#l2{zR}06rv(j>AtPgvuexMTW~HZ)LWI`E|&H=e*w(<J@QXY
zquPRw^t)5(PI)SAG`;OIpgbwHyszo~ateN}D}G2YW@R%8t16oum)ah?$dH)g=OX{8
zd}a;v==CPSNj37(8<=EMuQl>B;3VCu9<kw;(>4Xk`*A;B|MgJ<u;gqF^R2#7cdRd)
z-8dY6;17bnn^bn+P$KzV1n#T#rataHO4`te=5)MmF1Dvkz|~LV4#{HZY)UYyNA(0;
zE;yfQ?wk7_1R8xq+#jO`Q+fjHb~R^%*+5`_56OZpu9sTil10Q9RoFy}tUq7**jzu|
z^nSYY^v2TVX@^B*dZ;7t88+;6KY{ZXU#L5Nt1x92a1PTcLggrkmJcTlr597Cz1I)q
zV!3=rcyq?=u|F7~Qk*0HD_y_L_LDvC?Ho}Vv4n5&P;g{|G}ZY)6My%Lg4VqWfFL%^
z@K1OhCgI0Wn^MZzr*oh=StMA;RXaUb{Y0hwwa8%zF=LtBDnTFfIv%$(=VF}Z+~+gD
zvd0ejuUS)de}y^X-DsnNYUuJO_|tG>N6F$p{lak=Re02{gN4sgv&XUT*nyb=$=LP+
zlaj36xMCpY>F8#ejtto5*9)%U;i`Q8n=xsk*_Ae9%W7QrwcufpJFUc6YR=)!EVrTD
z7D1NvhfK}kgpf~N`VYb|k?jNe8MUr*OC3!of7^9g+gq|4o=*C}?U)L;<<p8PFEODu
zkOkJ##^9Fw2IleDZ~;k5F|UvRAbeU5iSLo!3MAewM}|QSd2l%KJD(;-#34KI5|!4v
zE~Ij{%k^kYKLZr@B_1D(mnsi(f@kC1^l=khmDzn^3&teCIfn?V{q=OR>k`1hvqxgb
zUre4r-#*4J$_B2Qm*#`a7*oM2p?4lpmNe;l#;v3r1`iG=<T2Dl+@DOy0N2Zw)(ddj
zepJ}nbd)dzHaJ2jq|-LZV@G6|?I7j|4PiIeR;y1K$@Ttiz}=|f)WFX3ln<sL4SIci
zXNxM)i7^hF$E{A2RvjWk$ViZ2fxoe|$%w(`bp`A!<*a=kX%z2(dzrV%Eo~H{Z$JFW
zu1h+Ok)mVk1dW@4e^<eBq4PLcQaf}k8c!b|qq~NTbyrnAaK)xYBy#eSM4Yc0^#?h+
zqwY&EZ(kFUH&JhaP0P8!hmB<56(gN--=wm^$d8LQYcj3BPKTZapSe?xa@lm4gVH!3
zZ3u9P{IS^jC=b^GfsiJbgYHqukucXpbZDiEn+xS3Vc&nDtLl=GN$e|A=1HeXMVF}!
z*12m8EAkzfVG4!X;~GybR65XjUql<ki6X@pR6WVetI-{RiZQwA{Q-R$l331e5Q73d
z4mfTylg6uP%#RM>&`sD%2;;Y`J2h`EFnIg*lG|+ZTF;DD88?4Xi<theiBYV@faM{}
zCo|7p7C4%K(ZH@Ah#dXGrs4p@3B1Wsn~zAeq>_om$Z}$YyoI{mzqaS7V!dK3%nA3+
zag;44lYiY(z^uODxDL=>%~wNr=Jy*_gf8wu0tUcS>^Ik{AXFF4Z*etzfv85GvwINS
zl|tf9w8=tW54%Y|tbnRj&fNpn0mDobOAm&(&-tvvE9`IOz&VT9qfs_>+yLV?eWoP_
zz<*DnG_!&i+o`;X%B%1Q#8BLk$`=PV(tTVn4oOBYx9?@|eJu=n-sRtjtyu6W35Fr<
z6Vz<uQ_TAd?eb_OemSiw@j`-ZEZ^*ANvH-4QP%cHhi>q?_st&=*POpYyNX5U$gQY~
zK^g$1`lZpos&n5QeoPkG-l)4w_*M(KA~URO43e-CjX3nRD;Y;t#0pQy-xgUh7gE36
z;H6&v62N9us0DI@LVI$d)qw}kPmVVZ18)U_Ayg|7(EGbq*5TEod2u8%$j~-iX@fml
zI;$f0-m4#L^mXmW@J)fB?{)Ux@n<-=8%6tFZ*ywkhiNYYcJEz1-@@|DD<x!bMov`I
zOkHsIk)QwQRzNRG;KeGP3w>e9t|{{;gJ3D0K};$dg1ofwK0}p}TX>V1cfVGdJOKdP
zQQn~vX()7Jec!QWW)#u%rl&R(FRGDp&AN-2vC3HO)^G7TsI`6#6X#TE(6ceKy^iq5
zNPyNwZ;_YJjK;hijNY+3Xc@neP#8rO(J9Oomdy+nfwu`tMAkzurvC}~b=8@PIJe1K
z1#4^Dd*MTvAn-^e(e!QlMy;;JSpK~9w09N2WipEkWq6!;ZQ5BTn>0)v*&*-Qoo>9x
z4~Q7AkCUTwS6!G2e6H!^l7{JFRF-i5+(Sy-Nkis6{DCx&Ye0)=@_mVXfDA#-!UqW(
zjoh<Ue&`%Xk4GDri;Im}(?9o1jP>XbIRtlO;OcMEl0P6NR?UPXYc>1e!M!2%Q%igJ
z&Pi{1-S!iOr18CiLO~Q5g3-K;?sc{7(y{8kOAr)`5;X$!+lhRiJAiqY*7vI;bJ5$F
zZZPkWk1cOa?diZH_O#++928&2a<#_>6;CNX`)sHs%7gM_b^0&<SA9wMhAQyHGh-0v
z+kfLF+6CMI!>nYG$c8eqR&}MU0se%I>s|;IsInxbWUTY>NB9Tz!B@sZda1ewR!rl)
z*`_!jyJ!D#fwxrJOZ#jj$)Y%g<BUI1(vP(U4Y)rVLVF;57dopB05BWW`8uL~JcZ34
zhZPlQFkp7~E?4(<2rKJ{mm-0@0ii<NizbY~^snHOz?z?nCNLW1PHhP43Mbv|ugA<i
zsYc>8sSuDNvQTDU^OF7G8W2W|X1$)Vx8*q%jj$Fp8rb>d-cel5!9v^|PI@vMJnWT9
z%tl>IVY4KhdV6Iq(WOm>vA)n4CH)fFkR`6LLKb<v^Ag5Sgnc2<&nNLHrO5BcXUsRl
zR7&=7>9*L0zNJ`Q_}Wov6H;ddbYG}`zJ7W?VC`!~Tg%-l(<&DnO3Otd=I|CCnuV=T
z6k-7qS#YeLaJ+RSZXZ!}cc|b~J@9#VLo-DqlW{MeRA{%xq=O>rgTfqoOF^kadLD2i
zP<GIWjs%p54{gllwZaFPxykS9d#>8`9SZZuDi{8I@roe0TgLy1R(=Q!9fX;rY=2V9
zZU8?Z7bw?1F$&l#05O5dPYD|h{`yZ@+CTA%H{U-u&Ru}CAnDA3dAYz^e*gz>0nYsG
zq_Arvqq@7ltUp4JwtfI`XFs1+0L+d5FBlE@-}C<!00A5ZZ2u?{{eW%%G=a?gej=Zr
zq&9}!zod+S3_L3RA)^HfqSK#a=MaURxmu*14`2}f89nhc^dByr#Q$d?4FEENVMOm=
zD_ZsaEFQ(5nesm&w5uQ#D-fv%NqUO(ejY&&{)8j|cnH9Tc<H@gtK((ZU+}w<xCkn9
zrQSu)BxxM7^;%Aa@sA8NpTmpi`|HV4d_Xn&Jr91@Sq7PvCk`V8@1<t?3Vf(&sXoWD
zKO*Vx+V^PitMmXrs(oOasu2AH7p|i_xTx$2V)lmgbqTkfC0d(x(xjw3>oRhr$fO3)
z{`p}+*9N@14TvXcGQR^EVN6lO@LD&qg4i3cUWO;|*pYV0-2$CtHD{c?FWJT@??w7b
zetlk*Qpk1n1zSu6Bt52aYnUG`9KmxmTH(W&`dYACA-Oux3&6q1;nd9{_n&hev_tt2
zN}yb|7ueKcm7*135dnGulp6u1+JH-r-`pLa_~SZbCW3!+vOeDH;ZpfnZ3^u&QcmXU
zB%)h*3W6M?f)eU{{+3+;QssY5+l22Vz3~3vmv?}1QiSz>UIQruY9gkV!sTV_`Ypz~
z<QLDa*%zDE(r~Ab1xkdpN4J4ZGq*@@vFg{#m<f+MUZl4ce+_jpi>rC_HXHUfT7H}X
zv>PP^hiGkFAvlBGxe@EwQq4n0LFIgXm!mDD>z+fw%#yA(2V}Y#vR9K;W$i_)l~M$9
zY_^H(-7MgzM+Scu868sdg&=@thurfjtIhtF;>3i^OFFW^BolsbA0_QmR5H*(4hIR%
zD&>t79eg4(5v!h3#W{0rQevTFeskQHMBKHZhjBL%p-)*|N8xU~__2<qW$nBuN4-%_
ztyizf?y=@Hd3SyxJl~#x)eV;zcem1;IPHQuMy^Q*DQ{yUaVRNcOH1H<!V)7*-s`39
z*JNQBCc|B%VGdw6L8I9xd-Pa=`vWKSpi?$~Zg#rQ2f~TZ3H<ig!iZ;8%2i(4&*BXB
zBt0{k>~%z<eJGxDDt7PR`PP^892G8W_J_m#tUxgkb!f#dyZqisHiLfUL=KoX07J;^
zQjBD0o&ZGbIzXr)sfABe4~bf17W$q>3F5_QiMqb72Oe}|Ob8D|Etma`O;i);d!_|H
za-|0!DWM;RioRcuGri7JFqB;jCqBBV2ZT%v?tN+hr#QFHt6X83BvW(Ja5n47YT1qY
zsjRrmzoW~x=>`Pu&l7yeB|cr7-Adhq|62A<G_k@H;W>$H3|qr{Eywr`gKr^~RahiA
zlcR1LUsC67cw!Nc;V+SgWQ3?b&Tn7`8dJcs%?-GVmQy;U$0SG0ge|qIKAkPG$+^AG
z5++k{pQE(X7wh(MO0hsOQ?|Iw0QY5SxA%waap8><g=ODtxus@f*$9ibm26*!tIj{&
zd%&$nj#)N?WCagb!b9&UEtR_6p@sNj4V^=|(BwTypavT7OVn&8t-ZLCu@J=1Iy6>3
z_CZf18m|;n?Xr?7fdgQ=$`q2yirLV)T#}!9n`7LxTz2L{7>)xyai5Ptk3BO!o;f3$
zP|`fcNMuUbyk;Ql$`s)QQQS?;Y~*VU7^|-Up-d`;xtqdcXQXH%JF8~5=pI8xMb)h&
zGZMXWevbrK&9R21VA@f{NBWRc{@b#THtuzS#bMnIliSN$-#g`McE4T^2W^};OO9w_
z&&mG`_fk%`)j}vwya%L;;{2vri1WC?pNh_}C1f!PeS+Hr>?`kkeYpqvn5adx3Yl(e
z3et?%<0gebKq!**e1lvPD`)55d#kGZ5o<BEQXbYv=k*vpK$0n`JH>(nH^GXGV!DwW
zlfR8N#CXH^xd7;X*TRPx$J*xKVWG&v?|X-WGb_mPCtZf4!0+?N5c1!|ak^Zi&;YLS
zN+0q?mUl}=6FocBIWvPj2#-!%s46H->L$3elM_B%28`I`<T7Mqrmuzd_%6SrwNC+%
z034YtG&!MDx!AHw21_OpA;ABwC=8h@Bh}<wSN#~9nsf4+j<Iq2Mwdy>R~t68J147|
zEYJa@fAY({8Sw_3aC%B2T=|)}2cxdy0ZgU{!bljJ?C1dV@AZ3yqNM)bBm)1=oWCVW
z0j@FMP1Bq7gu1&uY4%hWM(l6HHVG{zn#E6E;xubl%%>^CchwzL75+S&ehd8z`mbpQ
zf9a=(7V`DeABcloN$eAbQ9h;^sD(OB{;`}?!^7yY1%X;fQ&%jhRX9)k)^ZTPd4WoD
zl3UEj^$<t{uX$Auw5J&#7wrwOw(dDZ@80XUZyoRNv`rm~(zU{?A7;5q8a){D(re|%
zZO#dwHjN&thW^i{rVN<d{Quk3g!%rxMgE`vfsinW-C}V>+b}g^V99w+<uT<<a47<X
z3_J|t0AzorYX1BnRroX8{>P!&r8UxtzSJL~Ut%5>##?$kKJbE_&9x*xHxyA2iAbfs
zvJJ|>LC>g=)>a2TcCmoLt};Vofyb&i3iGU|MYdoC%YMeOwoY}6j8&Lhy0YrA#p?aI
zn}{_pF~;vLSXks#XZe;*6iQS=iXfh~o{_UD?x(8y&%{as^Xi=w$r*Ct(=!mkc7{wL
z7yi7?qHTfO*u4S^wo=(F_u%mgQ)kcVkd&-RYneYUIuH8yE{{QC04DTMP9Sw<CZIZl
zn5m{NT{f0kTS|6cwe*GB)S<6OS}>_?e@b4tC&qZyD3JZssXw#3^Eh;009m79wr{|9
z$vLHOs`UW=dR&m!0!W7U_MIHm)6!wd4zfD6r?Zwn?WIHeX}y8<x_F7JHoZ@OTm(^M
z`bMttjuok8qrp#}n}fju+XU%O1=-S7tZh|l>vHURPi%dr!UEz{A6WUZF1@efHDIPK
zO*?TP>RuFJ%$yDjmg|>dAjdro$AK>^(p);(f@7m&xYN^SfXUXPScH9_*LK0m@RZ05
zMx*lzm`I`!`a{?|vYp@NZtOVX8g``2eHW|R28ep2<_w1T$F%ue+=ks*+MJE4NsWd>
z0+er=rl2Zf6SO)U<RHpz$-lXEpBK1@)d?_e$TlLXhKpMxAT`BEg&k7MF%95Nnf<z$
zbkem$qC$9k=p3B92%*k^i#mV*3%^?NdG`mEk2?T~R{)`q3^zv<!rTA~6~A7lwqDfF
zz;p{VeWn~Leo-bHWO4rih8Pq;l9G3B3koz7OldXgXdg$IOvIM`E!#ntFC(~AP*H}j
zj(@{OKh7W#^P+mB=QL4IaToC6i=N1urv->x^+0u#F10Wx0I>+_nrdhGfboeZY-jy8
zEHpPzP!g`j{+9G&A4K7y&z5!7Jp5w?b8N9S-4~t!*hGS%sBjQCO1GX^x5-rvm^@fn
zxm-P67#FTEO~9jd1>`XwCqPUSrXobK18DZu1_%;d*hnt^+CIqUYutP81QwwqVY4F4
zAWx6QJVwK_niA~1%RJy|<KUDW-IIyJW9p8HW9rB;iql%`CJeij)~VeRAt5*%RE3^x
zVB=S2Xhjja9kZP|Q>%FF-{fg!)E4cCRrX#fmc<p}Tf<l6XjSU{uxONXj_?Delu~=|
zfuhT96CDiUa0lE*nXn^zAsx^hgO#!yWvsSzzCS5sr)&CSv=h92I`4(`vz^4P%6Opb
zqN%?w=ei%#d6k`txLYkqBU%KUJ(-f0()OTcm5QHKp}n;zmDcK9UDhi7!4r=a3!q^M
zU;X9WbD##omkwpf;CxGI@YouM)Nmz_?AR%Q@-Ha2`*Ej(#MX0yVRz5_TEga}q}r}7
ziJaCoqCF7##--WXU*;6Y@}PXODHi%pHuC~~%OVh75iZS}K;R}3$n{bUrSxz?h6O1Z
zT1mChEU7N(e1dJR{U1tG3D)LO`y?SkUp?L-$n`tm-)10KSkBPz3q4&~9XpS0w=K-U
z=MwDk#BHGUJhS|MTO~Z7TuV4ALRIC%O*wHC(n%n#BAcWZ@t}h)3*27)x?)t})gol*
z@!@ODUx(Lbnm$1U5=HFEl}<ID2AwmCUIIU#wH}S|9CQ>U>ALg_V}T5N71t=|f@p8s
z`F(^<Yhv5w%E9t|2h7)l*818B^7{&3s33xeUq5TWrnm5_wki_DpKKKciKN1jSBWE}
z5tv&U!`I8)`aTtCQ}L88q;ygIM}%ocZcq-X%^4z>OGI<7{&@L88q7&F5GYMfEQE&M
zl6GN3Z_^giI1V@_-y7E~Dkgck1kI1J3})$-6?Q(02Nk{0x4!XQBXIlHDSEoHnQG${
zhwsR{r>vCh@502m+{cO!v)y?~5QPn2puZlGncpN|xNOvRFvrv+P+Tl?<{o*X1QsQy
zD53NcMH|Deig(G;?D~{Fcb1Wvj!*itzeo5+$dziTTF16;&CXc=<;H<XZ~dwQ|C#r^
zYotiGYhbq^4wFi$PiTFi;c?b4DzH?@i5zQ)5~H4s6^{sm+Osk}KoHjs%f&VPu?~Wk
z8$UD^2$Mo4sT*be4{y+DSquXXjF!?ngYW~rV}mX26RwT+l+w22>_BGtpgX(lDvoLM
znwm?pr9#Ovr-rS4K0>!sknu3c7ry%f5;1}v!!VP>!o}Y!ZVI8S5nR;?qa3=<zG*Lx
zSi!?_{Rj9zyfUAD9T;+dSxQP0^eWpZ>s}9F&)IZq5MN9^5>Te#Qx=^X2iS@O3Z3;B
zAYu1fJ+z<hJ>dW3>qx6gq$V3p6{So@vK*vm5W$nz|DL8rT^r6t=Rn!7oRXmMd{l<N
z0inj7%D~ESz&SNVezfmgJ^j6g*rP|5);qe3E`?|`%&QTdTJow}eBffQO+@Sm>Kk0}
zQwORL=TH|wORnhVMyM}UM>%V3?9<SD^r8QvVkD{T9#~`G4!q0x*fu1g2@*eEkAGli
z*D?%Csk&wt$hGy0(7Q_MajrjP&Yeh~Bq9=)*XI~sR@Va56sIS6qiDtFY)T8nJhGMT
zLCu<T#oRyaEBhBrTs~J|A0k`VHfrELGQ4X>LX9x2p0=MRCFM+Hm1X##g!_*~Bi&SX
z<YjZVET(A?hROoIIM;$pXhCuyEQ$+cCI{u;c2}-usk^C&^sP6(qxRk%2xo&1_5|?l
z0dyTMS*w}@H{(h2D=h_a476KCTZe~w`SzG^a!@f@Q#W%j+nC0;&d@kcYTBx33Q8gJ
zz76bO2V3HX3-FWKVyVjIggAj20g@S8v9$PF09CvrNEpWB`OlkT{h}w3^}=5LkEJZ+
zx~gP*-{-+8ig35`5ge{mj#RlRDuCupFie7mLoRf`Kt_eaByEEh(0TXjrzHZ%tJrR5
zHN&Q6J?lng8ZAA`k8$k%AYWacQHUD82!?)Hd1{Q;uJVC(_1zfomvoC)Gdf*}&z)V(
zGjcl?->A^V*jIR^;k>GG&l>YA)mzvY{YX!qfSiOu!qf4(He4|nA^kdp8HV{C6meP!
zajj#fxZm=>7<;E6TeNL!Gi|N3ZF{9{+gxd{v~AnAZQHhO+p64WpIdRO>fx`586(CV
z=<{`av-jTG$|+olxL^iBD&@LYC;E?~cieC@5cf~z4O_Ylpu7PuQ2V>H+P+Wa@j`<|
z(;cEt2@TjCW&xYay1Is0aM51~o1D5KQSt1)Qlp{RHc_o9-W;c97cq?%us+ilcfZJ;
zLz!-LMfrc8Y(GUp%l|yt0J;BppP3H%{8ae>1DpXo0s!0riU0t|Mfm)`A8vq3|E%!w
zD*?5&VECEhsi^2{P2N!c=NQ=JPns8lKYinWyEHGJQ@o-RfLV(^-wa^ijbGFh6A0{-
z^P7&b7ZSYRI)z|4zN3704#0n{XfdZoUiPMnZ>-IMPAOX6H#_a46TzsTZo2z~Cnm@k
zd|rIcR13*{g5!?w`^c5ykV=>|XU2i>d|S^!EwNC&Kh{K%q5gq91cH>KQ3luFJzyz%
z4^ND&9tM~aL4eiTa^Ml7xFr3H@^(6kix;jn$$-fG2Q$5=fveptm->9cQrG$lG%6y*
zik;Y4V0iP}wO6|b(VLFYW}LOdg0}5?BwL?+$YW%XnVX9Cx{53YDq;O|KG56=j?rI?
zy7tg~M{YO;La2IedgMGiGZF7z6yKl&ub3l^uda!$<87u!FV>!F<RxkPkNXR>X>oMe
z2?i7E7q$)<DpbZ%J*BdCL6UG7Ug9a3QB$7fxw>)<m1P)xqc4LY5?{1o^&cg34>8DA
z+Vjn?d{cz(=%E=^ebnN3@`N<I{&iH^*0lO0Vm=cxO&Lq;Q)KUz4TS7dRJEp&uOjM%
zTTz@W*#Kt)g+Ls|`0Dm@y^zvSCe1lE*6&1;8pq-TkRnB)Cm+p7HcSP?J82a4v4iy!
zx}w)ov!RHl7ZZBn=%SlCh!@(%lxQyi+B%0Z4C3=apMDs36%XzF*#He<Dg>F$<2;n(
zq#mvCTE34~vo3?>5yP;9zs@?x&&HiOgq-Fmjez6EO`SCq8a}(za$V*h7G@xdhT6m4
zE>=j1;vAs;O6k%Xq@7MkTl%(jq0*~{)MuI0kJ5hu3N_+!;$z-8S)IDZ$I3BRDdS+@
zTZ`?WVVps%O?K2}F8*?2BZ7v?2Vm1?Bn{QCA1<pi_GAQiMFeJTz_~j<qgYyBokh5R
zgu&5g1WCCPY-%%)ZmD29mS!0%*$}2&%-26WP0?GslACMiMqxcT{V5N@U*`Vu_F{Xv
z7iBL`ayFx9sidu~8b{f}*~73YmjgavF1PD|UF5ZXMszdKeSb4>H1?x)dgBY-2|*=r
zURo&|W-|)@yIk7PXl{UEu>Xz4)@@=&r6V_6ZHx~pRW@UChE@T>3R3!I22E3BVN}U0
zUrF_Ka7+0yerd{55k+J0IyVCRq6U!Bz#hicnOb+{Mv=Djg@HF1HVqWRLq>hI>5zU~
z8*Q|QkP|JyjP4igqxt6s7Dl9-vgRD3k{>RKFNlOxE|}#oq6N;G`nPHB(d9)L9kWf+
z;dqxFLSY;=de!0IjigL<Sra4Q%F{yoDmWq;EyE9{8Hn5ydVj<PouPLNE9cHKVO8w>
ziDq#=lRwJNfROyBLuJ`V)t`)~8x9<()h$|pNb#6pP-sD}9Nb&*?K20iCAnEvtt>1C
zX3fcnArWMj_~=%Q#ny#kS|vQa@#Fg|aJ@i<`*97tTw4URLQ8|XDr1=S`AfT$gdOc0
zZ=HGv-yi*g^V`Y>T=I7KBa#Z<^HQ?>_8U^Yt}CmdSqraQZlo}}H1oaeT$t_6v1EUn
zE#pa~NALvYlX2lsb2*E33-p`}Me_*`ZGT(%4;>`VA6b=OA5z!YFtOwE6>{M#M?=QJ
zdKKh2-?yftN3ykG-c_ClgQ)*P^0@((14*Xaeq3UTNvE=*Q6TYymIr!BL7yptXFe<*
z>_f(Y1S3W<X@nL&wQT?e_n-Bu?U9qpjg8nwy^MQIKtm?K$~S#C&`n&?ELB=iJhkLz
zWe1b$ju&vQ&mMK~t&6YYE%sAqdF?9JqS-3fzYUjNS>I*aXs{{k`yHWMpi_(=Ezb+?
zzd)>_dkS8>Y9aj@<>@g%NCvA@I`fC!x|YqT(yvm$R2hT!+>;?QT_h8<8M|}YQftNA
z<x}{CRSv;1_5ue6Ia1gE-Q6dIU4+1Ki@L8%>xmCWf!zp>-~j9zcd4|w=o#5im;G`8
z4Om`3lCq!_WPV#@DG~T^tWG#9AIJ{SL7BU~MG11HzNN@nTQ)7M4qW6B^C;@=4PjZB
zc$BgIA}i_q!K_*92J~eLF-w{{&zy8BPpP53QDQwGjly_ZSG>Tl_7FF1ER{q=S6UhH
zJhOE!nVwwIXVNN`eEw5de+u|vb`IxHzjQt{cq`b|Y<rtYfQ0Q@`#uakaZt>Y#sbaF
zAI7a2^)xnWys2lLSlfDd`iZHmD$5j|;_)ET&-kiht_!@u^IIyCzmUE;PsM+p0Kjg+
z#n9?2^n^O_=g?@wCKYN}p&pw!5{|s}p`t1n0w4W+c`tt*ttoPG_{Do%upN&^_TUgu
z>lmp7uE0*Vwxxql7!@f`Su7ea&_V(E0AuV?Xy}P8@i!uEY4t{`Mo1?+ru0Tiv(+T6
z`@cClloeh2n99?8mEveMw{zcSP;iSVzOT>3nCKBNLyh`^NP*XW_2KXf`20};PHdi`
zQej*Ix-{|vM%9laZJ?@zaPiDT4UBiN6tiKROez`{O(w0l@D!9%@hC63j2Q-(m*imf
zYe7S9xW<d-7rQ0IHO;tRo)M2N<j@MFLg<)a?N%}lWc)%={b;1FzA$6IkE?Dd=tMp_
z1N1Yz6h8rbxfb(+3(P*fGo@wfVXp6(-R+`IUyE|0x?!gZA9g}^^%`$w-uT*BGHM0f
zgrsqP-7DSz1_kU_cYdHJOEt2PxQ{|B;?HCo(-PJ33#(e{za=0kdl+W5Qz59Yn&P;K
zfDA#M*bZs|xASV>u}EmDTU1qYMghTVs>n)2)mDWE)!W1YzAl6Ukh3)-uRhCXGqHZV
zSLnh4a+8vwaqQsX(|^rldcc97Q1##WXaHf;VNWElpm#}L&8aHsapPY6Xj%K)2n^Y#
z{hS`>x*-HY@ge@A2ZUT_@uEeA9vJ4e=KsqHgjB!3aE(jIW(~A?pum`gAdY61y}cY4
z2ZFzE%avRdULMRW8c3a9*drG5piZ%{3{2WaGi6CI(dV*7I!x83hmt|A=WHfo)cZ59
zAl5|%8u{4x<MUDq7pv^IPmC<dwT=T&-yxU0_G(*O+-SYvp9nSK>`t-N3F?;l<CD53
zTmAl&jBPlsom-T9FP>{&?Q?2x2o+8Sy>K&qamn0-9;#?;u)GH15pcw8DIqX@nCnT8
zUhO=MNvIG(PjNW=(kdvim%-Z+EnlCk0LS}89;5|Pq$Bonq#K+d+jVliS%H1hBr%`@
zTDvJ3GD_+hEt|;_9ombzx#ILzXVFDdeS33<NQ@Tt38i~|k7NVEs5y5G*qI~|B|Sk}
z7a0=AvR9JU-gdmeoPh+Z^8znx7RAJaGQdlK%%mMqR+ZgEUE~2)Y#`{hcKKR5UH1f|
zt!$$6jM}EkkDg)Z2F{dsKcv3VGomYlfncuzF(wfoo%MvKiqlA0eE(^_wGsl9p#w1=
z+6G<xzRvh%b8~Ll-y8-a!*!F$>+(|H7ieSae?Zyo-X^evO>?3(tZnICnoYK^{KWGD
zp|B*@)t(7olo5%QULNeiGPA`$CZq@9u(JFhi;_qj_vubxkIdaj*kxntu)Za3Y;zqf
z9$Op~N_a#%xN4dS{~GI@bTai+O%pPrb-2pEth7I$-4ImS2arL36QfyXhDW{Yte7O)
zHg(0TlRX{<Own>AV=1NfQ|Aabxo<Mjzs2Wyp3=I?{TWD|1iqIK>APok=xs~+st8|D
zUJales3(8Fx8ZZwmRzL4JK7hX?*e|09n&eS$I5?XP&(h<fUKyU13s;neM>t$DMu$4
zwzJB!p>95qLBp0K5usq)GM)9nNjJ6`!%MlU{8ongtu*e!r5UeObH}ZacS$VARm-aI
zMAzL)jg4*|Tc0fBv?fqXA=T;5cj@0I4ZRW%Zp**5C-l(+KU5r1Ap8DFearF0s)S$q
z*5+x7MOM*q-CO^T-23}BW1JBMuUR!8V-*eLLJ@5*EEvd35-$xSmTc!;5l#>>F`cs4
z{7xy}V#GF0Ec}YE@CZ`=(&9I3_bD${A6G0Li=8uk@h{@5s-REOtrTx<hCIH+dsA!g
zeDA=0?`$w7(*Rk+H*hScYejh~U045yQ02R}em@52iu{L8Mb7~=cp*-QRC8U4BYk+&
zRr&d4bqRcai5WtPh+fI!l!C5bJOR_aX|=y3Sz4~zTR~SMkom$xqOF$0cpZ6C@qd8B
zkU#tFf0`VCJ)!=g2H-P<*wUW~&>!sB^WOks{APdz0Kj}dMsh!!2tEIdfCNIO1kwzO
z0O&oGA3&)S+;{li<8>YL{5^>@^|))q)th_+L3R7~%l{l!|3`004KNGipR_F?3IISW
z+ds=cMW~OcI{-X6fM@@H{bvN6{7?M<Z2xGMO2yP6C}s(~1F-q8rq$xhM;w+=yiGzZ
z@+=QW{3m&<^m80Q5HJhtKhX3O``={n|8e}ccZ2n8wbAFFI~ei+0I*a1X#oGGZy`j#
ze>xxpD0fyM(k{wNSuReF1Rv~t;S#y}Xjq@>J5KlK@5ckI5DA^(s$Uo3?_Qe)s^UO5
z$3Ep?aYbesOHSV(9{79Hs6(Jeo{&5kmK=QNcndljG47`wKcu1Wy+$v<{lRihCk{3d
z8peIG?HmTciBlQtOcBLz@v^SqkK}+0Pbgj1EO8xIuagX)d9M#5^MvAtWc4PAzsr{j
z_1f;xIGpW4q2*`LviC1iIAbT&HTKAM@_!tem3$IGX(AwaMqiyVAS@3#frkGoh%T+&
z=m@-gwWY%nXEytqVg_FMu>Kv=W(+Xvew59Yk@Kz=ozdm3)mOw?+-r{MusG~0VannZ
zmXpz29(tx0MI>hdy~f`2Ft78mw6A}-8HeHJ-~rc|YX%FL<>{F8cUThJ><$^ifyaBb
zJcd4QBb?<rJ*LagNtvRPu6r`}67oGZkmJ;8;$tc}kTJYGSHE1y9~ck;5AY<SW!hT7
zvnvvK7KrCT_+Uo#@OkfILl2(dR4K_Cwg4agePg3qQ6uB?JJ@!(pIOZ&&vhV$i*AGo
z+lyo&kZI#vic_Y86*0zanqXfuDrZd~n#Uc(bP(ONO1T;q;X2H<qT(t=^hnqk*>cTQ
ziF1DG_x?EiR5)L0^M;|Q&=NVjQ^*5AFSRO(2PPk=9>zsBr2rVyb6h3WP6oNN58Oo^
zO^Y-6+36aA3u2C7E}yyY{MYDfQ!*6N<b3`I;3CZ_^KXcS<YN?`R5q9Nk$EcGnUfr8
zIHu5rD-1}XZt)E0=?4uY39pqQbAcwi6%j7ih5eVMnAG2Y4prHb2OU4&bteZ_nr;11
zetnSFI<hCJMe`CwsWhYDhOMzuYYb+l5i5guTJu+V=Y28vWx3gei1F0XIn7|^k*$yl
z6y7wlbG8^ZUJ*L}wJmPq?3Ofy(}J;~B}EfUAQ`8qR*#cfqaI04d;DX#=ASc>NO!iL
zc$3B>?;8GK2SsL^>Zy05h!ZX|J9Oujz3gq1q98Bb+`GOkD>Q>+9_XTTQ_iC}c{uq8
z#T08slDKAyu7hU-4D(5JlMUPHEoDkgkkN4ETR1&!z0HJ5Ud{^LO}MZ56^`?rJ4|Mh
zq7L|;f-5s_wD53oV|Va011ZL0YxVIpHhJE+SkK_ib>~IH_r!E!6X(f_7@F{PNtL+=
zTlissX6xz3=|*31y7{|j3?oG}cZVc6V)m2SaiIA%fU6iMN8`Ld{4K0aLFZR73vO8u
z?m@k(2<=#sa(G<!(uGpnoS5yiB$=<>FA;$ftL7CFJ)S*$?)j8EyjuJ<PV3%5pF(;K
z{JgkHXe`z$DiRbxzdj!^sxR^#={kumqHfc0q5@}eMkYs5PyX&`=}7d7Vl}WV2{yWe
zl+>ymlAPXy0*-=)==jPa{9L<3b{9uBfbJUR{D?IRMUvDKR=QpN4)`s=-pn8s6fGx}
zd0Yzi%2}VlXU%1|Y3rv~N@C&8<V<d8!&5vMRK9J+$?=NHLH{|gDNg7m4qA*M#zzO&
zF=!aEpO*EvH+sJ}XjL#9U5A#I!S+GV`#*n_VkXy3$xXEgqvuF9C?gsed2!E(b>JD7
z>o=1Mnc{?O7p@I`?{NeC+4E7BTRA6lar><a-+LUis1ilIT&%i*g)w^aDZHFJ4JOBw
zwV2##<X*Y0t|Cvb5}Ve$*tw1z?3S>hCW`zTW~4=(i+t~h00{mfGgNpafSMN0OG8<l
z)AKABWzlQxpg<Uj5Akd)M4<|1k;c}>rMjnD@uhc#tx;$*v1|u_Cb1)cDLJc}I2wRf
ziMdetEOj>s68B16Qmo4&@&*rvbzJRqH?FvSteLTRYLIhv<{?+K1fQU8Om<rRZi}-%
zw57T>K`--Uumr%cL**MdBpFpD6x<$b=+VSi81_F<Kl)1A_U0U$>Yx5riM+@Y;O!9e
z26T80=(?H+7?_}DuhV2MO4fuo{v5}$i0f)O>d2h9n8fPnJD02xCGZT!CF9@Kb3E)f
zzyih)J2*owK5(`IQfCD?>ED@EViqdzvU+2=tG4P3T+DeA279?r-%yTRT>#AaMKEUt
zdfYeQP<=2N8uDvvYr(BHjecI3Hv5ybeWphGK|#Q$`iKC&k4E_nn|gMwyK9E!rvmks
z<f!7>RgEZON_@u~MTYIs%W!jY@^S}X8xXZskG!_$a;tw$%g{%kE5*ECLbq0G8--Z#
zV<wQQ-HAkRWU&oM9qNm=BL32y#{KRNxGdHc^EYD=QahKX#|IW4M}ZAoBL1=iR{u0n
zb=$}UiIlSJD6G2*Y!1)guAm}SN!A+L>9xDZ{xg7G89*?)&B%$XiUGjLR+Wtuz$HNv
zl(+%+B;XSvaJ=>_9Yx?5j<iwRXN=Hp|0c#}Jj#U-FwEbtMy6AON6g~gaUC9@Rj9mG
zcE}z=<{<dgnfmzsMrvX0ajoh;ZA~dmrpk{uVleNsMi&rEe>sfdj;qiaz40hVc}A><
zeNURN%fYW#r>s=g_iOclA&^b$ThXE3xkg-%${OZE4fU5Q9`E#kCOsp?<s-fUHEvO+
z3KEJF84}_o29pP0=Ez4Z?b9;3ja>;rX7H-%cGjA7*g}%)bac!?7ez?1R$GGs;64?~
z9UusuX!N;r?B#+P5Y2_cqWF-HGTUl`f3G_4L8SUv>Z7lkVl0)vpwL>euQmhE9D!p$
zpExN?ow)075rJSq0-AM0x1gjg6^#cn7vUoLy|TMK?lw%5f7xW}X4~vwQdzwfh55~|
zoKEqvBnNN$IZJUue&RLXv7E#XhO=L!=!=^Be!~DIyM&cRMkHPrbQ6Y2u+ZtZn4X1q
z@-b^ZJMsXE))c~lmp;mLImw4TfLe4&4#}v-f`1(QpVFva#clM%TMkkBhnarzz%dJ3
zGh70_-<ONFE-#L)f2n(GM4*tq`DGK9!aIfuiDTX;n)@-+BGVP%ujnSDeUUxtwj0?}
zgAo2*<lQ39X+6SaJlAq1V>oM|X~N_s!JL*M7hZ8XwbULnu^b=eMO=ZQF-ycQp6w*1
zBF8<MSSandeqka;L4ONJvGtOvQ~v|H-S_0T_&Ff13xmaghoBGMZiZ5uVF?gRzM#II
z@?m+ZYnja(vU55w#dCAREv4Nj(X6CV9UU+Oxi>FRu17%%#aXD~r!>TanIqHoJMUN?
zYN$t_aaXX8jdH;?dYD;x7U}3^O_K(Yw-vD`%M~0>Ig5#-S7?clnrX&KwH;<>&XhXo
z-T=a`4_TX|jx$7^22VhKXBlSx0Q<~t-@_WX%WUDu7VRsulvd7MVnQpH|Ejk9uP0Og
zn(m}lSD~Xh<~+Q4L6NyL#M2foco^o1;|eH&*q~G(J}{koOFp-8691K@XqHCP-2vCB
z7#x~cw;`eY;%l_TV&Yp7NU2T;-1O_AhYM=JzC5r17$~Wi<rGB(at_J>x<L=0kW053
z&xGUzO+Qh-ACH0@LzmW{eH_ekdf1YMV!#FYZrHTukCw`#Kw<vPSIBsl&CxwA;-x8q
z{TA|$9_Gl&y`12U&~-B0p0Jlr>TtzF)>3@gok9Wf>7>0F#mRPdZ6$vFTZ7L{$qhgu
zV?jD8H}%vX*~N-!o;ARow9lMfc#DoeF%=bEgysmSZ@OP(*@QWdPZqh}`?Vk8^S=q}
zuKF98WF{z+E0pT>G31K9Rsl#tISabBD3_h4Zg4DN=eFA1)s7+g?QJ)MzPbMV=ovF*
zPG8{J4Q+LbhfUi7@Al4^!4+)^UtNvd4oyH06(y292Qvh6^)P=mj|m^>47Ex3s`auH
zd;CHYft2$gZ$6~EG!a|w_+sd+<Ncc}d}AWttb%jTWG618P4lL<Xzia%bo1x}$3koV
z`u>(q_mE;-sk69C`F#Imn7l3)>idgq;G}rtEU?u#Sglngw@lTMD!ijVa&}HCj&zC~
zLj=aYkYc>Sg(ZN~e${tl#Z;)~@=^tny^`7le;+7YW(9x6LkyhSb`duGK!EUjxHR?U
zfM<GdzuUm>_(>$qkvcUyQTSAk4&B<_YM6!1#U&b83NerMX#6s#)c7EFZ<42^EStaj
zz_gdg50h*jTpodBrAu1P{`&QyL`UwIo;I{VqKSc#<&=K*l<%)3@6ytEC<h~2J7X~S
z)cv7slhikczh_dvVk;&)IAo`Y_X8|uKqYgF1qRAGr%1pyw{4dYaJq<Y2NT>GLdF*F
zr27E=(A)3BHy?KGmbJ}v#ZGylaG}#W3q3j#<Z=kEVN+N6z|dVYRLGNhHuo_c2RQc2
zTMi~am8w=XC-V46IR*ciF{7PW`(D%U`NyXh4s0~)#g%$6>bBpe1d6+h#Ly%W9Nz4F
zfUFK5r!-C>(3m_)5Z#tfWH#f&bJbZ1EMb{j6UXx)A1aun3!EbQ)&nciGv~UBZ*<$h
z>ORl8y%yT7v0>?ZydSP+4)tJO^v&xGw_6DG+OLwmI!k%ySk=RP3qGgBBbEMU<}{ZC
zk_@dd@UshQR^oO#;@je%kP@-&lazyEE%4!-x@~%-pU0UKsf%%g%jUef)&@Tm|K`de
zXMb|O32wNK<hiK0B!;8(XzB#rLkHS)UL`_K4l6}jiM7b2m^JAqX!+37(CpNFpH`5t
z$x;soZr6}-c`9hnxIV9j%+_Oo*nBO`IEWy!4@^NKPrgXaPK}0vf*NM{0mB~~G#=q!
z)IZ<~n}gY7lsO9sbpilv76&N#5A-E0`D~yQodMA4HTwVnE-3$;4}$oYAc2588vp<t
z`<Yi5ukAFzOZU~{p=y;ohPQFDd;lWVe+~h~{lpgs%+mf(E%Mxtcy9>+X3oF2|JV3q
z4f<asrRS^tK}~S{JSR}Pn=C2nv(#09`G0Qx?2GpN1p6_{(EV?<7EsMUtB60V|0j@z
z9m(a_ARPnw@5z76*<kqi(}ez25&kd7iZyGyAa|LxV*y&A%>c)44A7iBOdK|-92ZcZ
zwgsF{^E7o|y&d4VXLtsczqSXcuw))s+aG5(UT+@&7Yr4kdmHyc&f6FzS5@ds2NdL0
zvyM>t?C%AjuK0d`HOqj*o9@EY)UMG=;b1r$2yYgB?36>@c;fqz&j>ZG>q;C9oK2jN
z26tQP1@)StQ3_Sr{USf$&Ra{a?~VZ!_$%6_$f~cQW0Axz3KwbADG;Mw=wITKn#ft{
zswm;NU1GF9iPrcyv34T=4U_4wS@rTOX1&lJVm_`bz^oQV)16x_QThe{50M1P+R}1-
zjMe@Y7VWb$3yyPZoM=$#epHOSi=jd6i{kxD`r8`9$>tIKSB4Lw10N-QmHtppwwDEZ
z2hR|&X4)?X8QDz3a!U$HAif-IJieX96JI$Br#SQ9y@v41+3=;?K@=Gn;u(i34Y^Ph
zAXbFh;?xEc#KRzuJ7&)jJ#ayC_)F?&Ptr8j0-cq__CXR5w>dKA{sb3>45||FBs1}C
z3_r^Cq`>t=pn)+*D5>qg$!`MiIt;b}*$~B#+YPvzv6TADU?E(PbU}&WK=n5p{6&bt
z=^KQ`4FlxywEFkZ$&4!%>bwTD!eyg7$SANVM*IM_<I#P)C{&hf$afS(4H^f6ga`ts
ziDbf~z~z1qliFJ$8knA4n1?|&tX{wJ8}e}3VGhygHxI8=!UP*0j)nE-fgnp!y%t9b
z<wtITE^~aj1~6yIA0ev%V)J#<z{{(HP6(h99;}Fx179>2LHpD|K`nYg?=2jkYlTCY
z(+=SSH$I|f{U*moNhEw)T7lT@Uemy!GmjoX_q-joh@BQfCSIs45#yzN^BQQ1wGaw&
zU@ot0=8{bsBpn)_l4q0eqYX_K8O@8L2WHY1hFd~z)p+^I%1?#QG#b~-)*%^^#QXOe
zWN%2MpOmJ~XHt<wMh!AQGv6{0%KGOV^VR^hF3M1;eO)O{WpQV?Rxv3QA27_f%~(U<
zna}axB=o9RByt<X_nn+UY9pU)S!3Nd=&iB`4`MloyoTdtIf{GgUTg6ht0^S~oDKYd
zn($lLqB%#R2CWTh&gb?PAZEsV6JVEf)(h^bThQ;LFcm!*USexd!Fh(@hSEC(dP18B
z6UPZ_;HTaScoKhjjxobY-n=sdFJUvg8r>mg;mrf@RnGvT47ZO-OR#Oe!#~_mB_{-)
z`(SPT{(b;`q^M)8MDo`XmTTm+=zhLw9Th#)^!&lyuT}~7%=?_RTXz&Zrlwc~6I)zx
zld}47>(s#B61p9wfFd}f8i?T5-uzZ?u~*XEc)1lb7{Mfk_>n_ws{0HyGjCP^^oGZp
z!~=HoR6G5l!wO}a^G1EM+&6pN7tW-=DAd$9*46ffP1px!Z8J0}uS#eU95TpE&i6K{
zCV2IUyD9q)w*}=6n<(GV9jMkVR|Q7O%5DSwup?f+^mO&mZzdX7U_Cy3+qj9_cF$k5
zt;Zft+#g1*=^9yNI+KtK$KwUe<4$e_u1aic9EI9xrL#oQN@z0y@mvR4LRVf-n5NzB
zQ^V$#Ax8AwIT_m^`jX>~1L;M#JG^XdcOyAyBz`IHPRPr?nUg7%%hww=VAL$+m0&wz
z5B22{%KyH|T|y<fHU{!oob-YVFdfk^4p%V@C$xc|0X83~Ior6<EPzj^yQUsB<6`^0
zNeC7iMSg~AQ#IoA-9ld=U;iaVIMYvND!p0tUi28M^se3#f|-R6gmZG-g6Hj4#8zq4
zkxERGnPRXzb<I|Q%u;=**`}mNgsiV{v{Wqa3o$nf!>tk14+~JOAf$mLSWvUFA1^F%
zh-#sToP!F0jlAY2=>776DVnHg#!z)U>R()luxG`+XLa%<fE>CpMCEwK;#GU_`rrvv
z^*FXqRKI~O|B#AAX83`N+2a8|@ZPF~NFRn9!esKxCK6nV&(GRCiHQL1Ca<pxCB~c9
z%KmziPH5KR#mdgCoQI7w2!MQm<QyeX7|2aBx)io|i(}V~)Xda(Z0Art<)tw5E-gQP
zUMMR^{Nk4PSnO%P`LqYGndcOU>!te<ICKv3X6uMf2;ncKXQhy=q?GohJ-)RD%pb1h
z1TAVECwKYG*gOO-<2t2@IubC;sCEL5fk6+~=5Q4yoVbp8n-Es#>Me_;a}%LSUo<`K
z?GRiztVF4G!CSxlOS+?~Yt6(u4o+D=g-h!&!#*x%^g(}kZo1x*Oqb^MO&9fEPbAzX
z%~|M*O`C=3#JG?iU2cb>ruIs3o8sHYbiH?D_~hPKP-=0EwdHC(-f?GU=z_3Jhdh?3
z&G0Vi%#fMm(r5!<IH?QY?Hu*x`t|b?JfQl^P}+=Q{8@d`(T9l@+nyDr!M=s7cJs_u
z&AI#z*A|1HVr;ceVOF*mH#(o4EnG!Xw;+>Btps$XzDY3HT6X>3RSyr<hcFz1F8^{w
zihfP5x*z=%J8B4<h=j0+l-y&Hlhp)ecnBffgU=Rm)heFP6Ep^~2@Ar5ghg1^61G&@
z4W7<Bm}{HtMVCc0IoZnv1$BNU8vZ80%{&M>;mnXEQsUy=4q!ay1oWHW0~!lmN-Z6i
zO|MA4=S?-JEDSo-y>{=kVR|#Q<&xs$^(h1)opOzVUKFmN7f39Zv;Zdq`^%mbL<HTs
z_NhLVI5eoIt4{S;TT+<94h0{KUf(h5yR0Q{L=IJXHMM>833rI?!h9gv`MaYed35Ka
zL`=rf3-r0{7Qo*tX=xt{gdE|bOl%Nfy!#D4W~2A{BF46#DaoelsC2;4)tk^P`hGA*
zKf)v&F$!}5$%a#gu6S)3qJI^&9DG*;<VaN5q%b8)YBv&Lor_CMMNuQRKNXo%#!NV;
z)YjX*VOR7oZPD+`Q=ZHFN>9D%WCYrG>#WFZy7~X=3BVMGHO8vhWgV|Nqr^o%+6)4Y
zxg!v}^H1&p%wQTSzzR9{4A_zmuPa{w4kH0eM1LyGuq6N~<y0eKMGdqkGRtf@At<jc
z_cEGPI(RN^twr77;Pn0WG%=5x!PbTZKXRm1Pq0gdKI}RMuOlxg#rRFo(jA&lwwHm)
zaj0na4op$(1V&g8dKQi$?zXcXN0@6cEVIhpbXAGeh}nIHRXixM{7f(@JITiWoEXeg
zFeaAk^+=Nq*_+suD5#j>4<5V8wLB9X5Po+Z#5mm*s9^1@##1Ezm=N$u%~Udy8zO<S
z7oMe0^gSV#p<Cd^_MnNdh5?J}1qZ{)ykMYPuGcA<`LS~R<QC5TDOYL@_9Foi{9y;!
zgEX%FS(s9vM4IYm;vjDHfSbO4I@X{8pMInO1xgp7uyT4bmUz**$SKb=Vm5eG!<$F7
zSKgzod5lq;c?bQ$7OaB3dy-0jN*F_UHxdsdaKTIh1u+S>ZYSB?K&_!v!Fgclife*8
zSFviKaT)DGSerIywo2Y9!0{}VCVOQIvG!?}hKb0c6Eg5N1t4@{K?B=Y5BSvTW7*Us
z02kAM(W%@-Qeaty`u$CXimn%#GRn{T<yAXZvz&Hu1-89M^P(Ow3u(#@PSKiCnYqy{
z9eK}LF{rx)gtP0zGJ~7+$mAyOPmmTd8x_@f5-}qtqu%CJ1E$oES|O<AUHgzmByz+(
zR*zjJAH>o4wXIy&v2<QU9mpy1t%KZpuo;PwRm(RD?T~N|k^F(OsZk2tT7z<v*#0(K
z+m@2=kp%o9b?LXR2QEt=L|i;q(Oj^rM2JY>e*K%}ml+Q9eSt_^ONljZm*Yvya;Yxt
zPa1`$;<Lb~lacla#SCUSaH&9>Vr(Rm?$Qmq|0@S|Uei0_Z;h7rj7-H;&I}&rlUsmQ
z7wqq3DL#<t*C-K6F<3+DoEJ4rK)ux7U%zIc*-W3N1{^qvQ}f%LE5kzMhpqX0Z^CWV
z^`EO}lw^Oj`?)Enblz6_75C8{85X`t)LfAdbKqXmj8bZ<o~ncV0WYf(XAr{_XZuD4
zbzZVEfs!VAG~q`tS>{#q=b}Qq&&9Y7e{8Fvn;DRv!QiQK2W7lU6J<odSkXE9Ggd$u
zbvv{MZM|-pJ=p$GIWs`e?8=Ht2Ab;;lY0G8w*D2QBjdFuEjnXuY{$0$ZU`zQC0u-6
zuiBZTQKvQsG)l)7X;VhDW2w`@6=#JK&w{w{10(YMS%3b=VG!sB0Du7hf3pbCKhy$v
zP6Gfo12FW@2E+(3H6RGw%MV83RuSZib5?crB@U<IF^eY%{pTX;>`zcxz%1YYwr*<m
z{Id)R0RY(Yqh8Dh0E7qtfWr6B8sdNQdOs7S80OTZ=pMjkdcx_b>SB>BHkgE1;}eSk
zi5&oK^dF>C`w7VlnC1WfX>s{KLDNt0e?R{iQNyzEr-l4)T;gB6jLu=mTLBLx%B-{s
zIEpR}BDMgi&jv8!dl>ktCg^kUlnfv$+#o3=&7L|j*Uwl10m__os7k@OO)*z~orBfg
z@(h!pe_caTmP^Y=&0OsCE^Rd!vIN?0`h*R$b`!)5g>WNR)1VM44tmL0+D$M2TYHMZ
zDe`vr?4@SvF;TC=)w-AR_7I(rU?`^Qlgo`P-238|@sP+Q%FZ>BN1hm8a1wRZ39#KA
zuqEPjHAics129I<uF?$k@G&*4K=xZoQ@lNy9_{;Oysq2KRbxmHLJAQ3{T4rqN?kP8
zA)<QSIC{=!?j~hdE*&z#A9aar;4^_oDzv4<f4vTjsHW@iiiYr}nXa+5)M{8FQxh*8
z02IaW5619_^gUL&l!=M+E;b1aiSSVJFG6!&pf-$8^N3s;&hNV6(Q6JS#dyko16u%`
zqxef0`zFV4Jh#2*fXJ|1#Tt~xwxsb46W8jGDpf;foV8Prf(9NiX&)Y3ot5i@6TnC-
z7C94qW5x_kun?x>-DYx{o>EsHcC&1^JJ3F}ih;<|7xe65Ui0u&Q5|)JF*XDXD{M&2
z!h}e9W-5c212CXNHk_uOy!}g9Ylg<>EzcQdCr1c?xrt<8X0bPkItY+>-Zva8eGH?T
z))xm#FNeP(sn=MSpxstob^uSi@KJCoJcrk>IeRL3Gm%n61h$Hp5{D<HO@pI==j#)6
zdW-$-<*y2-bL}tpATEZ^ZTYq_lG&KQ-%263@zcS3<*jg2_h9F9TbBCw*64EwEf-c-
z^M`AzhOTEv12Nb)+!fYx@K1ON|6X|>mo?%u-zyZaFzfX={QVm>`Wy2j^9wu53rV@9
zG~N-UhXV-faXjh;oB#4Qug97u^yqDWf0((>YGjjAM&c4wk@?uX(z6433~=L)C~iX#
zdh(M5AG)+0pQ5M_g+lsj?;J9e#0?Id*Gfz*@9N=8&A}CG4LQ4b)q#nZ&u=JIBt;+T
z^b*Et4;<WB7wnE*yV^qi#EYG_w+OKyM**db_Q-E4@2iv%EGiJ<n<da6jOR4gC6!Mu
zA))TlL{@4GS0h(w=do~dT#?O#w3T}<?eaB9k)3Y09;2=qzRo^0o6KlzQEj)XnDmG+
zSJY_pg48(PvKAmCxa8SAoU8A?n7LWeTU6n8(MxsL*UVl@c%~)&^S7jeveacyJzwW~
zmVpK2^AWGe=^KVE@=hEaq&=h%=!2b^LqlqLlqErn#e$wwNtHD)h{_$Bw<nR~>{kIC
zyl26>-=XCy<*6Zb2&W%=CC6fRzxdcI&maBwjz4^>IAw+;E(Bhu#b{3ir@up4NYXor
z2>h6kjDz{6LRC_aWlRuBKY5mGu@$nN*lB*n{cT(NwGIwsgZX_}Ok{U!c9dV#1m7g^
zPPX^qxp%9M<zidDA$)e%GZeCH#)lTaQB?*aUY-4Z7y{GVE?P^I4S|dk*N9Ml>loq(
zk(}v^Jnc4KyC`|ao7Hq*jGoXc@_gGsOAO3e=CmEyN>~L!rxs?>_ta9pnEUJr4;*FK
zfHHYFZY!lviiMYq7Pc;U^741k$>6QC#uPtlXoQ3dY_P>o#L93jGzR&J4Rb<OzS%+e
zJtMTWKKc|$o}QjCx1%lVSn6Id$ENVyH<I%p#fL#XkY*(>8|4B$DF~Tc)uh@u4W~y8
zL@~0+eEm%WxC3}E;WV6{X8H^WR(5;t`Cg31^#oegV)C4kjqBu=O&sXVXzI@PRS4A}
z`veRure0JgHccqs|4k{zkVxjTi{?Th{U8J&C=2FPK=pkQXPIQ!L{Kmp5s;G*^gaIW
zCQ?-K=m4yp<d2KgF|N*PNl=z^R`M?#)zFTVo<^%gU%7~U_5K<Pq_s2%o3xViX4KfI
z(pSa2kx5&-&|xf~;jaf_vGN#O()iE;v~=ER90%W-x1d1kKZwj(i|b_bP0m31AstJY
zxK=8iXOnoaUMUA)%|n7PG{2~7hmD03ko!+qRzV`|z`F1@#(>~146tL^z!DtnHn)1P
zlB!bYF-7hi3Fznv&mfB$z^W8`o*DWiIia&*PTSRa@!)(p1aj=Y(GxrpQP?=KwYBp1
z<4K>HhIQA;OEZZJ5|dLQU7#h?m#LM$0+UfH;MWVETw8DD7CC8&y9<w*R`FOPkINL?
zuF}CS^Q@d_KOg7tV2{!Omq#s9DDd8Xg^NQw`EIDZ*QoG}tpw)yDSk9kHAp@;Km5Tr
zE#4vJz3zziG&RrZ&byFUS73nywN}b%wi01<C;qKRolttF>{Gu#a&Lda$KiOKo$dVM
z+x(>j@h-!9C6Q|+p!hpeS9alw*9k;5iwj&1)9l8*v8KRPu%3}az1WRb>9`jfqJ^d|
z1eb=p6wb_+Q1j$TD*DbTRd`XM7;Rb3Sg1qJ&|zQ%>W+up20!sWPOBJC;k0v)T|-a0
zDv?p$XM?H%y{f1GdjF4!E@>!uJP*0>!l0;iL~#?r;TVm=w3(~DyoxsQW)&bjfIra^
zbZu=<iN*Jn1{cyYeHdaS>gLI8gCGa1nEofVkF1D&{59E7BW{!IV3JsYaG(LPJ{F`s
zFX792lCS=vzHJtJp4yHVn5^XL(J2$s=`M4(Tv3wt!3=N@{FI4XWXmara)TSb?Hu$e
z8ptebJhfw~=!UTPUQ(#Ss#%@nsCz()i*x&VaV7%D-eKPScYsHp!7BnX$mxla)*`n0
zcKUA;a5C2h=(x$FrSGf3OTFdOSh9kqj>}6vN0A?a9pFVwjf>sa-8*`-3F>sY82@>w
z^{09Xu64Pau~{Awq2Qhj@%0d41k@L!<c(Q!y*v37fE#CJWtv_6rc|IJ4iDz2j>~o*
zs8`dgQoC)CV{HX;r%k7e3MF$og{_O&u-n56RGeyeQ{lRV%8zb?9NqX|N<-87UF_Rv
z)s6Gx?oI<uI>)DJl55AU+2`pa<ozb5F0Ht6<QG7IbF{C^lCqM*5cy}ICw(j4QN!>z
zR@`MmR)=V2!;a99=&*#0*(){^+DM|-%FHDUG>TmvN*`x7=Z90zyeYqEU(7tSEy5l)
zuh3T7ixAV$OyJJ--m*t|;^2`@2h`97wey){Az=2&Cng0PU6yxt8aq~~P6D2zwztuW
z`}<u}y;5#Gnodq$m$3r<YEn9&ym;cnj9NxhfP%xErfPqj?&ASAUzo%<@az!5bCd*J
zVHTXe)MukgbI=*{nVhn~mHRq6jEu$~`f5SEiFk8L@^zqy2L|jM*jZCd8BAfXxZoqg
zIJjtlzOy72=By1~_in?dpR>E6uDH&M=|!Ye-gOlrqfVqAdfMyHX|XVSDx{}-bC!4H
z--A^=3J0TX;kR>U;+a{n--k%UtY$SYqc?#+(G>dsI^-@uKkyvwm{GH{hJJfmX$dO5
zeT?@)B;}J_X{1PljA+dlC}mqFU+=Sn*DT7gz()!&SN@bI<njIm<&zPpC2i#Q_eM#L
zE$0K^ahYClqr<;^{EWp`syg6uIwu}dNZeU>Ly}@xwy$wZ1%eBX0iJMi<O^_S0&c;P
z;Kt`B+UW`l6-i#Qv;gTopdq()xD~V~I$#J3srogNzQT(e-7H{rkEkK|80sdXWdg!V
zk+^Lv*6slp{L~3OyI-r`-sLUIH_sdLwC5l5ad?xiTrA9~OMmK%C=T3!x<qC9%@%er
zp97&lRPnGSj74_pyebn?*=W53N$W55S+6T($*&gn7w(p{DTEgpjES~JPk@4SdVncv
zBN{1Om8*B983mu}9#fX8T{%KBy2Bnnp;%)KspS>~qW-uBE2}<RGyt~Y?r!1Jj{<t!
z@12QO&uGLh@W*woN36K6ZRmPuI3i?Z<$g|8=BMFsmenD8R7|#X-oocy#k^IP*c6Ff
zAvyEG!;06oU-G7hE(q7yYAvcl9dZl!{moHdMUE-@Qf9msJ)S<RdMg0Yt!M#<hpHFO
zeO#&AY%6Tt`~VvUkIS(m;WNEI(6Wa3m<Y3X9zF_xm>mfIBS?!7Rhd0!DG)D~m*CAv
z*t^-FUo4t)Irdy~^|GSqlI+!l%8Dn0%qUJ+(_WTbOO<x`Q)cMI_11{UbdZU?-mk01
z1K~8U-vM?UgW|_s{#OKKD}{Ih1PFz8#ct=pj&tWrUSUWeA}BY1Z#gGu&5Gp`xjjU9
zhWc0f3;kvOm4H`_C^6%e)%kCOO1yHb=MAApiu{r`8hJ-o&NU-3;k!~uA4zmo=V{P%
zPVa*#;|^nRP+5rh_0~vp0}%!4Up0s|*JMiHw%9^q&ibC1EX92wMKOE>>dGe=szACK
z-r~F24OKDw`%^fz{h#Upu;1?<ukza|+Mr69Q<nz4FL0k$Ov`3_UPClvbKv2n2zXoC
zDXAi4GlajH;$ZiNNcYdWQ}a7eXooG8Vw$vTa+|My!4iT`2|F_9p@Cd}`C|?_3O(?;
z1(Xr3qDc!}Sibr7t(>Cra2wjK<8<ii1p5vA)Q1At@@EzO4<r8I;D4$(%l=DNh%^74
z{0mwQJ^(=GI{z$@O7qqD8v`@$7F!PPYP^kiXdo9iU#<20)q5>O8waPDHdI0hz3Ni0
zGtsNDRh0Yt+hWRixQ7DF<wsxV9}QG_z^uXlGUUIZfwBM+e10^B=>H!-_|G0lKwbF`
z001&RfEAe^VGjh)C+9trG)RVt9txua>wgk&KYpUgKS6&e^8fZ0`yV#^H~Rmd@gItW
zlH^aD_<vC35-^^mYYsoTB*bVK#BTYt{*$r?gMlT*82!#Gg0aO_qUXy>1uJG`P;b~B
zVg=k{w*K14<-rxW9yq;XrDIP=o~#p<xsWxCyI|WxiFBD*9A#XQ7-T7YUi^_g*s%n5
z@wDqi%~FLvt~m?%H%cn=Z*h2JeB6&9I>ocNkR+9~T@U#_sxRvEs!(ed5J}I1^Dt{7
zrxe%W$bz-TrnO=SQ$%VGg{>Q<{Z+aON7Q{KwR>Bh(c6lVikA<@u6kybeXaEG{p0Yv
z^*hmU*Tsuz%4+nI-bQT<i#cvLZ3TnBwu=a9opzzyU6ehay_<{}f%PEIc0$JnHdX<r
zt7X%0v>{~}oEYk+9bXr)FS+-13)tPjWeu1}nQG=cDJ*!-hifqa``zn%;aJyp2kFKn
zDeY(@f}G%xkv2RX=gA-1VjRpgjG47G(f-Ge>DZ>-SFWf6Qu34JX~t!2rTk=Zuoqai
zTuLzeQ^ZIrDE2SfR6|%Jm331~m5h$I{sNoC3z-+6yCd<@+uel_AQd>&0D{b{hlSv7
zGvYmdX0A&NH|91aF7l}-k?$=nend$`uz>N5i8rh1@=+iqby}s>MZbG+>#o-dWWZq!
zszvaxljxWSPOXSLtMkZ`y);1jvJ7?PaA2QbR!LyeLo`v7lfFt+s?+q8Mz5awuFPN$
zjd|6g>XCe3IUxW*?IBnzA)jJ6lC#%!fhI7bv!j$Z3*vZCLu`g*<%dl!^s%Wa7^xZy
z%?GEl5rkr0@vD%5&+<n<v$yTLmo@|w_65Qo12Xu)Z(4wSnA*#Ly`w!zL@74O?ror`
z<;y2UPOqc;Q)C~3004sYG1T!8maun-s2bODH>+~H%EHV+t}PWB7x?G(nL$^TBOVJI
z1T;aidZ@af5Rhbd4IBE58MV1Xyqh%KRXL-D;BLC#8Z+6K$;oGO>PNFfD4E>7PwYj1
z`BAaVAi&F2HK|Bp+a8;uS4uOz>kmS!gHe$&>Ab?e2ocU_Ze;$I|0{tp3mQGHr+a}u
z*haA?``bO?x%Ldl?ls)>e6y0THF$$>rwr^E+K;9-J(a?b9G<~pd3)awiWQgcxk_LP
zpr9z0h#Nb1FRCB~kHJwW%ixON>yK%;1MS6LvkTy_LD;#5)z|R6ctdfol5CGFb-pkQ
z2&u1nq*MPPUwq{8t=v3bY%FD&LP!^5_v8o2KVZv_s)f>@K#^16vce19&ilJM0PLf<
zJP>Xp+j`!|iUjbw1xBh}s{G%un-J|9T{Gr5nrAer2+@j9{hJ7#U;W6cZZ$Z?m%nIR
zJ>*euPhM(3OA0gm8KD5Et#P(QnK*_b2v3uk#ZsE(Kh=m0K2J4KGkH$gqU0#%G-&<`
zqy=W$`yTcqPfCd1Hf0`uudzRuKLX$7Tj6&YayM4T?0=)?>Yc->rM+42?}c1VIXf9S
zZR{1@y@lY$33|EJSuu5e?%7N07kCf03LF()Xf}sBBV9spqIh(;$HzUQ@x)CWQBa!g
z=tXFx?j6}0=_mE<os`5To#_7&i<y1tRs`~RJvgWDNFSt;^FE#h7VM|%JfXIV2)sb;
z+IzV%6&I3$PZp9yG9SZ%mjZKI&kY(TexlrzSlWj7{HueH6;uGX1z3h7h&y3dAYWOe
zIi=XN+XPvdK`xM`pUx7hb$A*us=lTdm4g-qF0zy3$3<%YlO#~ck&Jsq&g(E7Ab!7s
z53oWludLm~Msz)e_DvY;Pj`t7B~7Q%u1Ol=JFfFZH5=A>hVJ2xp>;#9m!V%PRV0b;
zRGg}YRXyA#m6NW)?c6F@*Tu**mj+dQOE;S%hZ2%7<ds}Dkj&&C$RjK(ZxfNIrZ#|v
zY|Mqo9A@`%r--@ty3kJH$Mt>pg~ALGNyYO#=k3Eu{L&_SVaRHAFUSV10aMGjkX?dO
zo{@)8G}Vbx$l|JpNk6Dr<1GPljF}m)#G@$Gz;uksVRX^u3X*Z!S}-^Hv*hIzV7lNd
z=~^}SQ!!pMa>rJPspp5&{Vm)xz}Rx23*Qkqq%^m*Z!C<A^n7`-Y#5P_k&E-)L}Z;e
z?v9or#odcPYABcULFtrp6`sK~wb;Ly0Y`_^GpKllXnSB0Nsd+d8d7_3dJ7}~2ueCk
z@yAB5Te6#$Pa3$6pxbanOX=VY(MtgG9Hr6|QMBE%-&~HOp89F_+<c$Pk48c$h{k8%
zdmg*c|49JS5G4(|&NThZ08Rh9^#NWYpqc>?IFj#(NT>+MrW_WofW6EwhWS`rY5R(X
zgFKPcQz~?AO_w2GAe@Y_M?S8`CJ@7gqdWFeFrTqv;X42Y0Gx4o>hw4_M|E1zW-|O4
zz8~(=2pg&Zf_pOp#x#F)wAWOtV<b_O&jonK6p|TUJK@};>OgTdq^+{|K;6jmAhSxf
z(Um1LG?o4GQDxenPpjhX+Ec*&nb;ZHnr4;D$akPM+o#E}=r-qNqF7W-w!UzpBk3@e
z-O0MYVRUwm(u$KE?i`FBf}CseTyq_r<Ar`u+2?x*qvJfN!!A!^`5d^a;vU7e;GT&?
z`4M+IM|6kB_I@)pvMkl9j})KP@9!NhUhuE1@lebO9}|$C_JdYb<c|d^?r^ty@?cM@
z<A$q<Wj9&iL95OI5*AYHY`eyve>nMw`=*rXd>XDsL@Ylc<hZZTtq4v^-bNF;O`6Cf
z3TGcvVgrm}YE{Wmu$47|OHu>BI07IP$wYm=0TA$Xq6I&yVmJvgS;p46MT27TO<@q+
z6Ebe}SrH{$-`4qfs1=&Ed%jN94(}j*!*q0FR$Hg|nMg}j*&^*dvSZQ>FKS}ZPzG!h
z(Y@moxCSQuW_IYj1kYulUn$dF=Jj08fTzHdMdr(_WuD@o)o_zLiFUZ>K}_{%8&M-H
zSsfwpZblwPjmtdn$t&D2_N1Yp`_>I#TSf6YNGBFM-|mC>H2F(0a$QNfYfM%#p@4L7
zA>Ply$MxNGl7C8}MDMvGhfG>!IhLeZ0Ye?TkfA1@u4sq-2nfuzF9vXww6}JVLrwNk
zL46_fQq>ED4!-YzuF!F;b7<b?zcE`rndv%ovY7v{8Vcj6c!P%wjC{DsK$ugzI$IJT
z>SPDZdTvVDwsgmK^D3<*4;hPhR@4NL3UILA@o?hsmp7RhW-ClHqz5CHN;BooVXGAg
zVbYyLZ)wA~jTaDrH~rEqs0%^u>a>ClPG-w%;p@hK2cL!Vdm%p?{#YL>xlXqyl$W4S
z=9ZDWL&3?kYKdE53C9Qtj)(wF{?J&wq^jzS?vKy&^S3JtxQ0*rdHKtEbI>=wE&YA|
z5@Bm!k&<W%GzHx*tFD4?Z#O#t+u`@~8FRkn6qL-~fVxW|*h>P3*A{govDBRA54Y3x
zINfPszY1VAiv9k2pE+Y^^dGtIovco7F&trqkzF6{L}C#0t`W_2lAiS*Q|n=l$|RCo
zOnR04$h(9K9}^EhVXqjRW2w2McFZ-({J%(hrzp#st^ISSE1g;Cth8<0wr$&XrES}`
z%}N`Uwr!*HJ>NOwf4=T9`l9=0?Y&~fdSZ{UZ+<aj&iO!F?-qZze)uPI?et%44TPU)
zjR;`z%l~Fv_x^tvm#P<N>p!eZhzDTigZJe_nQ3A!E_`LhGxh`c_@4q4K@!z3AhcJV
z>_6M*kz{^l`yk4qNdFHav*&&5s{!Re{%?%_m-cre-2a_;nfWk~qrB7u`Ghs#*Z}ct
z(<GeRKjVo6SlqgLGj+sc40y>acgX+>z5l#v|9$<Y=^W_)e`hk#$ov@y|EB4GITM_q
zKZ?yi6o-$!)0Ag`>^9~$00Ke`Eu52Q-{0xvOeQIKg>g<>hRT{@C!@qBgbVem9a^6l
zzuiN{ir!qo&e0{|#b(K2{Ag)54ruGvK50F}q|5E_YzItXk=quxIYDM0Gq=lo4Hz-O
zLm070%>44EpN4vL+^N2lbmz3Qx>8lR_pjYWq&-%E!WBhNH4~=PO^X?L94g2O;uM07
zs+vg4vq5~xPMC(HRvCNHNN`0*cn~+YsJmx=Q#^gjRPp%nb7MoRRL<sJgX)PP#8+Wc
ztL&2IUsnAk<7o$+s~D|+ah>v@GkMcHm2Y<s!f{Oo$1B{M&^<9Vnv<7A&)`?qI)a_n
zuFadlG%Q2Fv>8=SZy5IIh_>A<#Vi|3L?b<_gG^wH$xD~y&41Q|O~{e)%}<?kWjhz|
z%Y#zsjxnAsX$e_sku}bBn{ye!bm;F=$z0^dGs|xImZoh$M<0<D>i)HBQtMy2*PW54
zh+XR|vKU6{KT+(nQM<zfBKmexb$Dm1z9Qp<oE!(0m>(@7(i81=3O~lN=?BS1;q_B_
zY@U}7%0R7}VE%aX&c2^0uy{&}NnRLmv)xe-nnD*Y%SvT3vB?n(VbJxeM*%;}MehE4
zYTE@(1z!y;RS*yDQpvQk#vI|GfVHF;v0gWNxz_Wg547q_qlhWzICZ&>QpETHBjoDF
z+NEw&+$J39a8$x;Fz>yeLj(iqTO`4<Gv}(1W&}p-{kNiBI_|K`Nbl*a?c!oYgH!;u
z9v2PHI@uLd?{yR`(t9DJiJRx=j%~$YChZf==~~f@X#ZBF3HYy<Od=@j8DJ|GMM_xe
zWpT=!-H6L(b;8=k+_6*p^3yCCOdW)<lZ7W{7=kEvIia!gQ8JkcJ;bN0t3k#JSBLv6
ze7i<^O@5|<F6JVqvKh<MPM`~=f%%0|m^KCxjI%ww5shBHp=&jcbu!~77jIQ8=0R4b
zX#BaBj2->32Wh@{nBx!)l<&jcN3Cp*C(0&hd<a*6UXHGJP@Mh{)N-XvWLLo$IXK!x
z!Zk9!i?!YRojO~_^{vJ`19=YkdNKC4bnxpxxP>n-ld_)%EtBfpx}aHqz?1~+<~Ovp
zk8@ks83I?Bx5{+9dmk{i9G~0x?UYTYl>65<@e;T1KLi+tBrC1Y!W$BX_UZ>=#Oir%
zltD!LB;+oRf)Aw@ut&Gwsq@YlOb!KqdT-Qfjb0F<7I-h(eyk1mKY?if5reIuRw+T;
zIAoQv%T7{Ge)bMzfBGXf9)tgwWC|T+fFPIAx=thPS<JIRr8w4&>d*uP`$#NT6u*J#
z=2?X=9%fEgZ6wURKJ!A547-x>T0O$Y!RF9u6kqftlyXn|JH$!DEZjT<9q~I0szd8L
z)tE+uY=;6z#{D(vrv>6}1TK&uQjU|pR9aSDNI8;6b0o-#tp+-3-D!!By9gkEvtFRy
zFC++kY_)P^E*>?^_IiA3npBg9w4f*1!<lfMq-`LN0+n+VR7D<O`UZ4suj7|?2f|r0
z44jx|yL1LIEPV9pmYH$RDo(hZ|9ejjDSW(VKuEWb5T)$M#2^m}IB#njCwP5Fg`_|i
zFEuSsI4i^?EoUIG4H&6cC2*88u&B^P5>s5Rf8|1cOQK)g#^5+kB{wDlI&D^Xi**v|
z{Pf2-&jjKR1#Ua4<IDqZ)eq%Wd8n@E?VDx<Bj{Jq+$4Ik13)=GhJ|!tTmADOq-`nl
zg2X9twF1hR#UESi%L^rYdTDl#^62fs9-8xQY5RUub)>S15h=w|;o|}nI@h-IH$H;G
zfEltPh;`YaDg6+-WaaYT=X!sYQO;dtFB=RPQemJ4lk8pXIfC>J=gfT{zVlQhv7i^i
zG2G!4)FzF8O1Z>qDi)Sb<a?vLCJTE@X8TshTykR2QN02CO27qb7*Mg<h&uNfiW@Pj
za>KHUN;aeZg%E(D-@x9Kfk6p28B}fk0ZY6MDngW}B~N&~7w)l-Yb-f=k~5Z(+?5e*
zUBedqiAVIyPQfqCd-C%fvh@W_gGcy$)IEQ)#o`y*RjOs6luzn8+n0$r^nOyylAN0)
zV<W9BNo{vb9Qf(skjasv=?KZ9yK0kICe_%moM{L%H-Tc3WS<E`n)>u_5dI$DDEKVo
zqeW|f6@~>!^N*jmx7>2P2rDs0Esuc<*16;vVlI<*7^51V)DyUG7O*ZyQxy@Qy(grr
z1?hf-0;!d5z4ES368?>xP0G2MfJL3VSX8ftD4`ZtGsF+&(_A1Iv{{09ze--jVK;X7
zFFb$m9?iis5wDBAg327rkl%`u+b47w8bu+b=MVk$<BIsTm&TG?VQUhOw+-}iwQT!E
zH`ZZ~d4VE<$f>r6fetqLws5g?Z*XJ}{KR%rGhE59@mAbU{&tDUMW%k)H`0e8hR$<P
zoCB+jIJiGX5YQ_^i;@gUL|#(dQoY<7Y8D^e@IL-Plru7<xE2I1S*d;oVnRQqw)8ip
z!wu~H1PY)6{eXLk1tF3HF5WKt)iFTAj<3Y$6gs}r{Wb7%47`GKhk~~g7Hv4|enAw*
z)*FfeH-;L}#n3&YM&!QJE&3=$Kll!s%I9jJBH3M}hk1jR%Fyx*MoK5rsuLPD%*)^!
zjq5T!L_Mw(h?GR5P$vKNd|D{gz<o8LMO$g3jjjGZ+zMkxf23Cz(>6tvVRyPj*Fqct
zAeoOW86LqG2GW9uyg&0VT{RQY8>>lDQ-M{gEtTB~#Hp@_T?I*lNjhrXRKH24!nYj>
zLuV`NJg|=Fi)l$h5C)SG%`XXZiW72)38m^#pxJs6-9mi=mi&QyGYhsEg-o1#hM?u0
z%n4ILrU}yNdDimV`Pjr%%O&4z$H6~0{!Y$)KD15?smkCQ^!cmL9zwzd#bB6={)2r8
zIje8wcHJKGJeJ^6zM6HH7N8B}i<nGX#nLA5L5{rC_TuSK5xw-pGbl1ZWI#yEpm!#3
z`+&U&+ya2Yi_Hrq!-~PV#Ao&2az^DCx0`AYn?VnQ;}%yU(DnR;1rJAT-q%02If+78
zvHICTkA{hWluzVcCz{*6ksV6hf^-n!j98<Sl|$~@)swgnw-7S4g$=2J>pQwg<FGNO
z>kma;Q7TjQ$w1d-+IcJNy7E&QO+I{9CQiSYf)i8AC0c^~h&Lyrn@P`T?WI6sqZV|m
zRk7hOsx+cK-U&tjB5J9-s!_>Gc?tJN^LHaKDa=)!3){Dxa9oTlqwPz#CatFxDy~@J
z#M=2xHj#>49hj(h?rHs7f3z+dV5d}jMW4mO#Me#iU+ziG5zK8iSZIg>)j-tH$~WQ{
zgBJXxP7fA;SI*OvLZhjvbVIduKNNO*%C-}%uO`9_6n%h-j1p!mgEVcs%3Zbla6*`o
zTHAr|oMine-uk?mmx#}pp2b#sgoP^v{GB~6H;OQUGp53EvtwdDU+N9gKLz8xOHjE2
zlu~ZNjd%Vw@ZoZhj+fe8wbN7QTG_o=(6?C)3nPwBig4XS*(*|PrB}5s&2SltM8Xst
z^(qrF`quz;v>pqeoL_DGEfEu_CTq&%56hZKq(I|)0f-ZTcaY7YW)^{zIp{u*1j&(9
zp{z)S+wD;J9wr{#T0_unLG0U(9QQ7Q0nV>A=8?kq!<s2~_>8G*^!RXeQ8%#4Y~Fle
zrJ^fFtV{@+zh|#k`O;kb=XMM@v~8Ew;%}49Vy9<0C4Vf0G4Zw`mtzEJ6QLrLEXm1i
z0;MIGB8ea))la2F0sblN0I2Zi(ELxxeFB#6U(N1;lm8#Y{+|f8MzIJTbSvb)0^J~^
z(7~*EjB?lP2^}Fp&uWa4!AkgejD-I@1fl#^mIlg^{`ZF9f2vRZYaj5hbg%!j3~Vj{
zfJG-A`<**=9RN(pE6hIwm31#9mzh3e5J<HB9eBt77X01?{Ku^9zoh<;%K!V|KQZ+m
ztpE6vmGWDqN&WajqX{k*FPUa-B<T_YIju#8dtLi3{-(*oWIx40HCPU|P5rw_7r_Z#
zr2H_;FN>@(rq>@@4j!p5mL7cOVg5-Au{m}fy{RS{9F<*g5$rH<<QagjmD-0h#@={b
zK^$N5l%APdQf;SGt-FRJQ@MKnS=sc&iPpAJ$n?tN+@-FJn&*)`xBc@rnoWfG=5%TI
znQ}f)yXH$QJ|q<#5ud*k1T*<&<&N6FCM0MI^+td6Z;Z!allHoL`Ex3Cspn`x4FLkT
zjcT08%pcc4AcG!yfDPp_G%K?h&YJp)_n(X}=P(}kjlXgwb)2GWjSbn9kYOmFn}yrO
zS))BXY{F?`19Lo+9v)!!kztKSJX(TsDth~qTvASCbeav_h`mP$c;3>OrEqsKEmv_^
z4v*eBsD{!bi_*yTjcv~O{CpV6@~&3FKxo%(Cf>k$dF@0z<X3xb^hGDAX3x)R9aVt}
z_;Z?p`Uo!Y)y!K{uz0@n({q%reiMColcJR|SCx2vsS$~YS1Li0y@56Ewe`!0eNYR|
z^>+I!vha>=k-PP!vC1A;81srKQhQp!58Lc8p3f>CpfB8S`8gD&f8!Y{!R`iDpAhN_
z3&rW9p5p*3h3i%_@jJ?J7?Q?c=7A+&J@oGou%DArw4>4${nO6GDU;@=s0>1zx)FzR
zK#$@H8soXrec-;Ob`~By9N*`-1o`*IPd-=cCMijR979BNJ{oaXWH)H)K6snDU}rXM
zxN7$`hO;C!MY$c}`VlYkFIT^dm=lqDTohNPa%!Li$kj_t1J5lj4k%sWmDN^RZD4~h
zo_<_F)~~bk+Sd+?lc>5BK^QngkSTCndh2q-s~Ih<ueS0fy~KCW7MiplxuU!}RNT3n
zGqD<<FNzn%Y}U;Pp!8hk$WkWJ0G~LKBtVBKEms6AgX=5(D77gISF%a}gN{o`uN(4v
zYRW>rpcY3KT@L((C=Ruw>EkzvhHp4CmohSD^X=>3v{>wB$P~PV@yKYe$hWxkzX}gj
z@9V$zDfLQg*$_^n2zPuU`BS{^4c^<ZYNACO^R95e9Hp0i@gWkzc-WNBmXvZEnscbq
z-*Z2ODLMlcBA&&}7aAMr(s6c|=w&9pgb{xoAk8!};re4u<3X)NdXv@}C`CvugdVJT
z$;r;cyM>yYHCb#R3f3$uaFuG1W&iDk7yzeW7=Bqld41f3$G<-avED3G822z@CC>hm
z1b#R6WpQ@DM;=3S_&MzY&BnNC{U+FN@BrIC7<tFbYOt&v#o^MMVIgCZEzZ$6U6sLe
zj%i}2%W8)Gox<DplMpHa2RRvuAx&TfZr780blUeWH#<iolk@~zDnh;|v;Ug^;7qYS
z5dUdd+ny5Vl%j=Q<_}<4<dz$r>pZdwtGXLQ;YP1ukV47(nvJ~)j<fn8DO_{hH9!lS
zpS_68Y+l3ts``u77WDdLR0`^m!=b@KVK8qvF1*`StC>U-naf}muMoq6XD?!vn!=2@
zKlxHE=Tk6+&t4(E50o&8$V3ezzCRY6j*!a7(8<Eokp-3@PoVsZnae`EtHLK4chje=
zdO0QQG`UY%|BtbY`=Tv9xd@xk_??-(Z1&gUvH|V<fyLpaxY~Wgoi=LP(&XD3$h4}B
zyDcfntrIm@>+i29&xKnH;)C-W^|?S!d7lBf!>uv{4zE(~?xeO(j|gMszFov9|KiEh
zBYCVljQh@TvXBu1Q>zpY<8#(O2pSKQaaf3<FIrJYJ%*9m2<6U0dgDD%eSl#z{-is>
zy|IYZmm1q%adtd+=q<hC?H?C?M=Fd<-lrbC19af@D)eB*)DL~_jtJ!mBTO+razEb^
zt)WJUkyw^W3iT{BwytKYJY_GdF3>eSaP>i^+8-mq*`0q+THN|XsoJZvk)E?JRt&j^
zm-AiJtn67B0Eh6LqA9J-N%=%ED>d?qWG4Nsd9$?-+1L}!$HOVeBHjM;u|VE`*O>3P
z3LyNb{h{v@V{lHCFO?z{Cm<kg?E;-c5&|sDvDDG-Y9RN!I3GX+pzHV}&|z)43a~GG
z8p3jbp*;L-#@=UW)l2H#a$sLnaYm~XvIFdzb&wlp?F4`ET$E%`de-5(#hU^K>Uug0
zp?%neMI~jG(x{MQ3T;d}*aJz?xQ!Ndf}Jo=A$`FP#Y(t$Z*^}k(j9ZHM5ZzfomG-v
z%RHl-{c3>P2@!Fiz{b$m=djePYk2#)7<1u^Tks}a^Qa+%ghLWQ!?k|3&N}x=w5qi=
zAu`P_%PEWCTr_}%N4`3c;&Hl{T^*d}wV%0>*k|s%$or4JKBFLxxRTU<cb;x>5(r4%
z*PznyP`1TD-YV5$GBE8sk===G>DKAh>nsY}h!CX-_-)tL5tp#k5{biHVjr`3cVHEy
z;D4axCYnq9Y)!##eQ@csQB2~s;f{91))q8XIY*Q?{LnYVp5(i>J`KBC-c4{1q@LO8
zyQ$4MVRuew;hI+bCq^0UX)>EXY>zpIK`#Q*zBZf|`6aK$vB%0Gy{k9j%gjH5-vzGs
zRwy?<Fec(GS`i`cHE8hsY^Ih_8(*|G#N3!#5+_&od2yTFDhjFFhNWn07qpzz)t~}K
zY0rX^V{dYphSEVS@%l?Y9kyk%68cY~+JX6#El`S7)U6<n3nwuC%3g;J9RFq=LYE<k
zc14xSowT~Fj%YVdJ7z8H3N^J_$r+Kiy0SS2>hItnZ3@HDpdW_jiE|DJ%)-DC>-Em&
z@PAr;e|sh*#O{O*o5q$njczHZJ<j2&*2yA#(}&bQ=0hm|RQ{s(!s`frV+XLpzt}_G
z@1GA;y??G|{~A#o@BJnk71-l{-66%I_3jJ*;oz7}^rQUOT;#ZKJ(2&o4$T2znsfg(
z^FNsN-yj1@^xuzw9bEa4knf!*0Nei>hI#&0`sSkl4^Bh>S?nJ!f^_81Nc}e#^#E`i
zdu^Yf&4nb+)W;Mq&h&pKwR-IQex~&^UpLO9>UKhz+wR`*p7ld3ZdE$omfp2)xr&#_
zl;39PgI6A~yx?}U%vxH8a>8h$%!ipX^XGlN9KWZBp>T<*+q(tS67f8V`Iiz@yhpeu
zz=aSTsUk;7F#1etEDl0mlt`2+zW-G(y<wSN1v}*Z6*~Z0IH3ZDTAv+l&cjsucetXy
zWJs2Se0<gO>8BTP0r#_+%ry8fnLm`ZQF~=H3DsQe=6^m_2CEN%=>15j#^DYXen3AH
zAj5t33=3YzqIP?={I&Emf4Y!ZKdgxPQ3)m<jnK5@KD&#BV1Yl5h@Su=Tp^1R?n6&x
zddIX5*|xJb@%iHnUcxU4?SYhO*nwO@JrR`G%=#xx<9qY!tf|x`eZ{G^lBR?HXR9q!
zFc3*bf<mnp()^z7EVQUwA|PPa9L}g134c4hey<`i(V68DKSceAO&~ZNPi5Cfxm?8o
z&6CTg%_1_rkJk>(e#LOeR&7lx(3IrCIypX}-|ZE?R{y2{0fHtjCX;?Nqq=L0GWi+o
z9dD!fyv(WMHf=-FIe|EE7$(Ly*P~!LIYm{lgUAAMg@~?y1={Mn^m)h<=E}uO<Q~E^
z0sqx8Bb}M{CSoI|!$*CiQz_2+5yE_@VOhsSX#pH3bzvl-7*R&!Ci4<5=cNy8uRzoX
zW*~Us8Em|6qUPi=ETg<4On1j1$o{wClyUKZlve}N#l~GJxPQpII97+IfFiOys7=?^
zPf`3JKXbRw1WpsHqC)L-&?k02hTt{S^g{Ai$4W6B)90~4A<<yL2!-BCV^$91v0CiB
zXpy2-6jp>La5JCz&%O1CAfVfh#r!l+qy6^OM-YRlfQ-(jUhs(Jvl3(v29n&T5DIYO
zb!ozcJ9MqR-zD--wxd}-4f5qm`k}xE6qoFuKKq8FpU+3iOA_Wv7P?81Os(opqqE|i
z8NawgfH>r#Sx;5gQSFjKDh4J|FpQxHtVh~+;XjDP7bgubm&BH0S>0^~IdKpF4s({K
zJl!NlN7ZY3jKkb$ry%8E#v3B`CV)*bRRe8(yS|{V!S);Ke5J8HPC=oycZ{t7APLWT
zR;+`<bFk6|wXWocghR=;NEr0ddoWlt<&6cC6UzwcYfQP5Tm1Y?rG;uI9lm?G-UTS?
zH)8VJ`@2}vSij8lQ+y%!PLzdHJ@O9{y<4#&FqvYE6$lhnjs>2paT1@9GO>OeA@Zg1
zMdk!2GAZm@_(~2@9nQKC=iuTuOJhWEL!%v4si(E;LO8cQdfQ?Jf;B~i@_s;qpz=?S
zS0xHu4m9`maTO3N;zo6PU&~&7B|fxABXPFGM%02XcXlAE4+xl3<E)AWAJ2pU9a9P^
zfqGvqsw~G;$JIHje7iD#GUMTI?_pdYwP^Q=07b5m%N!P=5`3`1H<ZP3BI%00h$bA3
z74xk<xRoP~sNYYU3{iU}&3)7|dq=+75sw;R7GhkO1vj;zEwq75XhcD2!a|^p3(AP!
zd*)U5l!u?)U&n@0B=c}x&|=;>8<XTC31DwzJF$3B{}}R^=-@fZxLJU!x_9?jNxJ6l
zIF$|&scZ@$L?fg^+f<3Q7JV!Qku6IIX#P?g+!n}8C6ZOk@wC;KCU29Rk6v2?MU>SH
zTMrk`8=(3XiXA*vn}FVOP<{gIaUh-i_y>(l3T&6(#CBEvSm$zu3FllI9%tnsT^I=u
z9mz$^1+y)iisU!RFEn%)lMUryqAk&|q5#QFP@i-6iwhUbR|wWC(x07)ZkcLRl~-|-
zE{OsUCSw&X2Z1}IL9vB@tCE@^7QFKQsE=yqnF>d{k)4*j+4BYCEFlN%r5Hzi&Ze9n
z>IcIYGcH{hOEufYsi2lw@zx@LpWo}lfXOjTjFhEc0rwLij?4Uw>luf@Mloa}&pbrh
z7K4GI^t~o6&D5S}<@hwl$#wzSb7O*LwGhtAmLo{K0%km6L2l(=&_a<|EX-Fx<QHdX
zIM1%biQ|3)(H?$8BQbYY#X)jt??Q*34gL^64v0B4WNyQrwOo+_zV<$t16zle5XhUQ
zm9B836pP=daR$Ht5{iW$DC=`1vdM!vecQ0e*y8f+D}YhOkj06VQ**}XJQ5|D4o7op
zIZXU;%IDR^mw(Ak^vffKdI*q(#BY0!x3{DKNBKlqw2^})BZl}jL!xHg!ov)$#X}6g
zBt^QvQ#z%VA^z*CX`i^$)Zm#GP4QvA+t0`N)JTO#OMp`^@A4vauZw@rV+42rVLB30
z>S<h&jNss^K4>}>RaB9WrhTBRdK}GdT$)XgZebs*CgNh)l}1+M#K8EinM(jlSJ}Fc
zfBoBKtU>!eD>>+`4q8VGA}PC$5`JL-l>s8>_5%=*tL93r1(JEX10Rv*?+Fz#NjVQk
zXH}su$l~lRIdzlpOC74*C>hszM6FTdu(P?4dEs|wxSz$%WMF<#oSCQDdb|I}0%~QG
z`^s+@TN)K?g2ak4%yb|*@L7FNJ!Z9@Sm^=j3kFQ+t<X-8S@||YgH&HSMr(I3gfCck
zZUG`Uy8}%YkJnQmAM1-m`OXXOKJJ70=7hscB)jp>KYpadh2`0r!4Q3oexJQv_o%lN
zYDXhBat=a<4`y?IZj3P0^qxp{_i3n>DD=%o0PbUY9V$M%0T~J)estHwL)C1$x3X;^
zBcFuj$VWKGE^cz4qK{VF<x=dBmvA(tMMeHyYeB>#^fG;y5i5%~w=@VR_n{JcUwu7s
z3kfPePxm0=MY(k@^vBg7!ZO?!tljKQ(P^Z2GeKfmAb53zMVrr6Ao{&h)=h}h2tZF`
zQ+wju+f{vrf^pPwq3oelH%UjP$uqKxo+Vuz(4F3tZPbT6O141)z9Y+s1LwyJ-A;*|
zd8}>q_A)2+x975e+B=0t)4trBbT!+{P6b~#24sldg-^>E6?A(F?|IXqp6wlkFhFE@
zFE43IK7LD<sNkS>);LSNFY{=8Vb&ix#>%y~I;Vp{d02--uT7bU99)+2#<zgBmm^kt
zY+`he^9zOC+dF549R`cs79@qrc<q~y85R}V-f+xmUU7A0$$Bv1-_bIPT(1e1eB#yD
zK!e)1_w60b1No=Fgn!^4gwAk1cxTQawJ{lIw8rq&b~i!d7fiJ`fePw2Lfaco>2BX`
zUlc#rZ+&bN7MU}dEGUU3zkHLMEPqb(fAU?0_yFLg|IK;;pa0x#2ao^+_;Aj#x4-Qu
zA-sNF0{}^=5n+ZjF@s8Yv1MUNa<Jb+AVA+p2M_|vS^Qte@X~xB|6BII=~DR!0ATm~
zZp8{<$3x*;{htMaHokTE{%sraJ)0BnKR@I@%=q6D|LZ%%UG2X$zGI8rsK%iI0H`n2
z7~gi;_)3s*W&of#<l}n+P&LbC;^Xx<+9JICLU=*rm2wZnkGGfm=aF-Y?e$KyE<9oz
zzA@YiC1NJn)UmYiAvcqcFMwOZRycWUJgi<NH4Nv|C*L>EH}{HSaUSG!e_}?c|JT+&
z9=82r2Y=Ck%6VZcwWoUuUWhU8Wfa*S7HvQ+gyPIu!vXGuOl@}VT5k~O-A83lZk~^|
zQqlpljV$WP3;?K(%sN=Mn1rBv^9S2eN)@d|Pe^)2BKO-en4Nfyc$mp0>_Fsu&H}!s
z9694k+e3-v8rY{5SH4)_j31b|_qZOvUvriCX=uh4PB*@*HPkX9d9FU5cy0f?(+*m7
zRO)XO$teu@l|NDxJHg;d#<rwOW~r((IG!q+0S@2Qs28ygs-esP=$f2WB?(iA3or!Y
zpg@X`9PbDT(aba<9$JRdg9O~9N6DiuXFF&psY7^;?1!r%69z^R^ny;4K0TPm6Bu|#
zAM6&v<{^Q-9jj`v3e_6?PS%LEcW>Ubo_<FO#@*h}m0tV9yo>Qz*A=$MuWQM9cabU%
zeId*8K!lpU`64?z^3rf0@#Mx}r~_O{6UE9okj#PZL)(ux5~*MwMZ7+C_w*eIhs~#H
zQ0&w>Udu=&{DMt2ucQjY84twtX0QAdFF%{k^-&(ATE~4K?7VIna4QEeZ}LqCG}&VG
zZRXtXKN$q*Epw+$-7xJ_goWpbH(8LUsWebuZQxMfiM=vl(RunX;zZdV+d`wAKEG91
zV2wwi>rwx$SkK9kfI4QNO`A~2mg)hmRN%0#GAh}gn(qPBykCr>rn>0Ie7@m%MK@!?
zJ&zb8JhgX|HN2BbU74_e1)Ucm`h#r{{3o_LIqQKCCUKV2Q*Q@cJ>T#-2tKQ_Xkrd$
zdriEl2BV^&FPq|hu?L$f$>4RLLqtDG&1zwA0#RUfte&E8prWllCc-u~YLsxNTbv1H
z=gxT3zBk^9_<BR-U}J6^zGZ~Wo&zYya?~5SPF3Qpo7P7~z_HGZ5DtCka&>!}kZ%0@
z8_QP=8kq!RIxGn*MFE+-xpi5EfR6GxT;s0qZoyqY>&nlKcvFm{sSry8GRQY42iMr{
zk{*dq`54mpP#BD25l7r%Yb}>h*0Xm|Uk^tS74|x4a|@>4V7U9tY$Z-^q{@BE_<|ql
zC0yKbeUqSW??%#&Lw<luAIzZE42Db5f-amb2Pp9&rq(kP#~izDpv9i?=D2H>=_D1T
zF^!$(>%c@qj3^Q)x(Kd9SX|6=L=EzzyEKq_{U!I%^i59X*)qO<^~@P%oYjUY5!Htf
zkZS5*!9;7%PG(AwJv(HCvBp8ZW-6GV=L-ul;km<dI$UP@tK<<mH%q@ny&mTL0KNEd
z=l6TnAsyKhZPbP8BKjAbaFex|gnVBJ_lL;3C-4!8gt=Rdjvl(B4{1<obR;d~JJ=y<
z>#SBv;jBNkjgD4okp~>N&S~yMS=rX=M4n|eB#I_!8sLfCa@EiwN~>t!FR8`p=`{z4
z=VZk070(}3C@rwy^MG*#Ja##r%x5MzSFx0iRI0Yeu9R0)^|gys`1QM*pANy&BL%QE
zQ&K83=3?h+p>bv{_b$6IqoOT!VZS*1@NqNN&M;G$F8Ia?--HuTJFGHoQ~RjVtW{qS
z+4IMxZ7>}AVphhRO$XD~rRLmgrbV380POh+BQU*lcBeLQqKp2919Q&I4^r_KzXzj*
zMy+kvKY@!ag_q^R$mEIF0T{@tQ5qDB<|D1j=|oayG5+=ks{zxlU)LDuq`ST>E{XtS
zq(FQR323!HXlsmLx{We~?xP@InY-#=YooYPp4sh-*91!;bX;BQgvBe40&-@NaWCKX
z?Y_uezdN(Nrz~S9NWn0^%XC+HY?);i)GR9l?W^Lr#yms)VOsRe4)met>c0?bPU9nu
zvt*iUGV<oQdUT(RekObdVb*+Uyy4|@Hkd-p0I+-?|L~mVwlax$obW6Vcq@pfeSM|`
z&Ih%tGR|JT<2W9h+gPCS3<-2DLI9<%Fam`v>UOgUs22tDkX(|j<P4L^8Nk;Ft^V{F
zIV-OJ6(CAwhMj<ERSN6O4kG86@$DPoKJsoYa`iZ)Q`RzAQ%$P-w0MW6vC(dZit<sl
zg&id{lz61&Q@r$QXz9l7lK8HxQf64B*?r&uRzcIORKwf%?Gm=I_4NtYF@%3__RDa-
zPX=xV<sAvIJ{^w#r@~hbDX-t}Hiu?&C_`2LPyw69Su}OH<vgkTn)6(K_U<%gN7BW#
zGm`?5B9<ySE{9TO3hlB1CD8{o4_wBuJ^cEN9xtlzkT0I$B5Q%?9SAvftzXGtp`(=S
z3{#(nw9n6XTK*Ge-ZiQ(pD@1ivNu_feo!KUJ_JID)=mk`t?4f3)r(iU_;bN7OFlxw
z(Ml#JAAf>C(Xd`PWSm3dZSt?WZTT6gkMLg&dU#Pk=b%ZP(<&u~c*=%f_~8Z2t*F&r
zd;HuAc1<J^R>aVwdkVHeR!;Is<@n-PAtUG3zpAPX_bOWfWkD31cP^0y`e^dBjq|!6
z<-0sAf;Kq$Z~Cs#jNH_duw09|5aWwcp)J@M$>TqDlof?2sn94@dlDfbEFktDLuMHU
z^L^%c0?}>&fy6Y>%D}_;cjwZz7nab&-4WFm6OxYbDunXT5=S#RH8+R_6GC?$h_ral
za$p`#%ub0W+I5iQwnO9SoPy|;=^k8mTJiOB;GsG2mHG(lTT+w)m4iA-(#>dQqh15f
zB#>`S_X4)BhCIs5=@5l%i{sAtMh7`w{p3mYF5rR3s^|wU%s3W`!d$|T+3Ne&`q7r2
zm$*4}nB3i3h6T(c6RHCkKab8dv7Hzn{(Oq|H@l|E4JIiS<C1SYa9bBoM0-BAJP?w^
zzjUtW7Tbd-_s2y+0sH`3Q9`|t;cIS{nJ|KH_kxJ>#mN$nlyZI2W!9*#oGw*enG~YC
zMxSpQC7>c<g1#x;F`u>RzAWBJI;!I((n*>&nTTP&PNRa;nDRsK{Wd0~?AIrf3h?bo
zdjefjddf7-BAji;oqG5Cz9_OuyWiej%I$y9Wz~PdW5U4R-LaKbUB^e=#HE|d8_6JJ
z=Gh3;my~t2GqKKy&D34=wuNymA}2CSjz$&(qsR1+`&X`SuNa?qg+KY5naCn>QXWJt
zlE9l;G5{}4SBM6>0)YsFo@%$XwZ}H^<k_R}yp=VOO?KB82EvExlMPvUd7qx+w!oS%
z-DS|KT=2*bp`Lf<IB9mbh*Yu5Ca{w0eHKRM{SeD})P<@`W94z(*n_|MdX>VWe7WuH
zFDng!<F2RZl74poJ7!5l+!3bHT4}W>QK*gqCdNigGmzO;F`Tt};~PBes3Roi=}>|N
z(N0oiGqPJA>?_><QOicE)lq(ln%`(Ojr2yWx~wd0@ov&xf8@|S<LBHNkfaq{8IOCJ
ztA*mzu9v+<uMd9}DmI>Gf^Y#XL+rm~PL2=XgncO|X{vG8Sn(7EQ7-d|My!de2%Ex3
zMLsNfn<+_HdYp89Sh!#Uquu{25JOzpiHR%-Ca>@wP7d4Oj?<}qd!Z$i2Lr+-)2(yn
z20}FBfJl|xa(%ZR)$x~gSQGJO)j2<%CC^@)Id^0;bfm<Mjw9^+k1peU=46O7KDdS@
z#(5M%5&y9Yi5=NOYO7U}vtNzEJZl#9`)a#d-+goX{L5uX%uy3RqHy;!MhZu@ekV2r
zSJcS>S349`<Ib4zR{iLYw|xV1U*oE}lZpg`j)7F_r`6mpenG46!D@zN<mjYP_Q()w
zDrL#%-T`PJ%zxCrpFY9bm;803F=dr{F5u8DgM196E`#3H7izjHP9^@_0B)n!%zcnw
z_naz$qN3_x5Q{U%dCnDgfNLPcM-#5E7t7f=?MO4NY25)NdtUJF-N-G}Y`<6KI+x3_
z_4S$CQ0}j&vxjqZo~Vz--glWwzx&Y<&@WS*Y8fYRTsFi+@RNTHM^EkK96q71=~q*?
z4Up_DXQ@u!ZmsXq4$}xs%LVs;c17kJ@w|N>m1u1ueL$@iq}@=qKy3%)WQ9RhD4X*>
z5HT2qylGJ}6IW|WR>}sr7kep>c_!`PeiFi2V%MkOZ&DfdjFtNC-kY&tHocOxgp^yB
zb-Vj%=E7<?=ok=S#w=!Fg`O29uN=Bhao>dqHd3!*%eq=L4CB*w0hrG0p{c0Qp;lq^
zU81)6V6?tV?2}DM()a@Hz?XF^Sr|q4>xrB}QcsgGQ`XPTB5px#j6QeK0-bQ>x+~ox
zi+K)G4>UtUIpJ5kmr~&nbj*$g9(#uPgKY?9tDjsxcn==AwPEO0lgu}sr)%UMt(494
zxR@()o8LR&?n@UjdlSW(i_Oh8H9nh*Wk^2Yo;Dr0zdo1S{N$A%uFzm-jjN62;rTQ>
zK5C$RgMGQt1%y@OU|@2$N(a`&JX8vagUX*)7~x(tTt)D}5Q(sJ>}Ii^qeC|G9-=i8
zP>II(9jCvoB3BX~S6)0S_Q8`J>kkQta2Mhs__-|zS-CPti!Va>z-b#K0DIvzfs3UF
z50L0VxzpvhRX3K$?!?9`{5wlEDWCxtnShA_@G0b=q3=c$F)bAlQ>^5>H>yBaO>L9-
z1LzD!7HaZ(?auiRIBInmnkc&6CqLXGse1y*+1y#T=X!`r3!@#9dKKWaHPOa{!m5kw
z`zlrKA(5Bl^g`xt=jByDo|>*)iEI)gSIl2cvfb`)=RYTAIxNUSG}H?;zL;i4IIpr6
z6fpY8Yf1fj=vVt;Jle*{Mdr!&35Phkwyvj->HicljZZrf7LRM1XxtKI-BF=mGR&Ok
zd{B8a?TM0=fkk5i(MFgA5&jK;-g>Tf9E*KWseR}Bt4-nt=?<n#v`3I#@9!|um?LkK
zk-18By_IWL!x+0e*Y~g&&yq?RFttBU6<Tp_A%*mpg{p-`s3)=wOt$1TW8kV`)?eoo
z_nf$$sx?w`OSE4J&n=jB-fol5H%y50d#3^{)W2c1@h<+5eM-CJ7F@*oV*5o%-yTyS
z3E~X~moSd{!~?>6>7mz&lHeB^dSS`mxW?o`G^_XXi1WP-vAEqiduqrRsNG)!7Hngt
zDMv|=60tvG8Dp6{Wk8}9#gEXr?c_4zp*Ivyz~%Za8r&nqV3z%vkj&nI(RYQiS^B$s
ze`yY;)aHw^Ru?KxR1;lH)a^k$Wr38e<fuyD3d9ixgZl~%1eCi}NZ(z`mtYa?b@`d#
zuI7bL?HPyNkdO0V?Ru`%qMrG@9o`p~i630$^s?=hv`4aYW%B;h`|Cutq)oIfraew5
zVdqyDvLEoUT6((z*Op${dI@M*2;ijfK&#B))#)WNdd!6)Rgl7E3zIi6jy+W(S{C`w
zCftZY*Tv9|-6d+{SU+`n+Lrh;b~F+c;>+Fe)X6b&D0`#QES>VshIyQ9VQ?C;(E*27
zU2LF6$2iSRk!!NE#t95-Fo!jphRrd8@QsVn7S}cI_RS~N<=LRaD+?D|I#kfa(E}+#
zq0umN{rqMiW+9GTNTm(CBV@${w_30spxtP((rV%$sJ4R1BH~_ePw=8WJR>KI6@<jP
zULi!PN_LxbfKP6JPf`f0gDK^_)2h0IYQ5>DCwMc}dBU-&Pl+6)%_vt{r)e06VB6*A
zYehb?Sf9?$>yYJ6V#U_jDg%-eHyUbUF~~1A+ZaMYUva8=tc_xcMTUx~3)%P(SFHRI
zRl)$xGoRG-yHcU<jYbtqj?TH&-)DtD3+at@<4<O5?7bDbV2Uv*y6f%Zu=^*Uo}FAy
z6#X`)!V3`kZSMlqB{}wz;U^@bMRcOYF-9qB#*s{wXi(Ru94<gUOkm)W08rHnjAmt9
zR4=DEXuGro&L7FZLcgMsTi#XiO87?2%_fpA24v1!Ho!L4zsuV_$=zugnEG^N{BGY_
z3#%p({D^vwFLz`rs4~n88J$)8j*#YTp(z;@OtOHawXL%QOSXoU^xMomxOMmqTzdxS
zNc*u@)M-}Q4bU5e=CyzPNK4Aoq;`^i552>3G^OtwLFrS8C&kZ}@REt^R*OYwPk=jA
zIffW?vC`uMS3lO&VQ1>SSlnh|J<glO_-zG~Xeoz6ou*@-qE1p$*|#xm2Kfkm{)c;{
zY6Zn-a%u#gb|i+_!>Pj&^N=a_gL>d{=8V7gyARtgK40nqyu?EiuM1>Mu-!23`chVK
zM6B4J0Y1sH#iA8wqI|Q;3Pk_@_-m0Plj@~t?Py9vKC9t)WVedZoo3r5)qBLj?z0u@
z;8}p3*StuQeFoiaKO+4y3&DM=o4)ajXdG~q#AgJ<!hY#7E?tjTQ=&Dyx^w(=GF|2a
zo}D;vB}m!daVU#hGcGP;KbYF{9PmQtWc}t1IR{QoUWd2EE=jFpzpq-;@P~-l_!RAR
zOfR3YUF^V8HH!XXG>$I0p)6rcUR?(h(E1`{uMILhmaCMcp`pLRGPjYVX8uy@w<%XE
z_sC^AY+{S|>nTmAQ_oH55*koZ&6<k6!EM+1vC#zFFl-epc_A7rs)H1dZ~!2SPd`Yh
zb$3md^Y`>iOx<Z&P(y+qPTzd@d-@*LJo314C*E`om_?MD#yC`6Owb)g$Wt?&jr{7l
zN4SO(r854j8oal1h$x(S+jjRGSQx>pyNEpa;>ECZer$@Y$(&UwxoK9?eiY)x)N*SG
zAuwyNgsEUt-5|{mnH6zbv>AVs`I6yAFaTM6rAo3_AHrV~94w8;Jx<w!$4NXW?rdK+
z-Nj{?cesnzva*~x`o8W--y`W$r5+nY0}%AlOPvxVCFSZ2a0ZZ9g}vu=QwCtKifQiy
zDxp{R78+q$kW{yk!HLK1*MI<Y8>uehoV9f=stq#(LUdsDWX`_$4V|Rc6h-}4ake+6
z*^6t-VE0eOuO?H`5UYWPT<%ZXp&Z|W2@LiF=nQh;Fd3*1h?GzOV^Wym561|eYC#ay
z(>b`)w(=V(X^F>6wpdqD+G#)VKDHGSqkteN+lV`QQY^+QwVVdplqG4ChZm49G4W0+
zw`NUkfdgL7d56kslSqzV>LV-1kZPSvRr=%2>AAmX+(&TeU1JJB5(HVSTqJ$8y=B?!
z(!=4VlJxn>F@?9iIH^|!D$8!2W^B{BY({o~sNo;yD@3>$E6U&0l%?vcTP$wmFNcDc
z8cyF2yU!~(p2XKn6AmTuaS@IG?kcd+l%g~vZ2tlt2bi<rr<ZKhaS{&RRMR$N;9(!y
z@*Kg)<nf2P!gI=KaF&j_Rit)#t0-S#9Z=+zZ*n{$)HayzsvFD~taZXmqN%SrZ(Zaw
z3=XagKGJ@NcJ&CiYwj$-#dXVgd!>$O;A348`&oNFE`~3f6+PwS#nf?t*mJgLf7i=!
z<kB!zJj{Rc>I!R?87YVHXS(?82^=x2J(h$R?gfRy@Bg(niT%9yN!<2Ft7fLPro*aY
z-<n*eBkSs_*5qd##m;6VNN+s7BlD)fLLn7e3WnV4CbDs0qIo;_|8XhB7gN9C%=o43
z_PGhaIMiF{vA7qNSmsW~W^P5kXsfh#i@4)F!tdk!oSCK}yHGP47s)F0vqFv_z57pW
z%+Z>1A{2>B1;rVqlFLM&jAqfnq&wyS1<y}I*)8?pm{!B>Y}rfgVU-gMFYJ{q=PdOf
zG%sg|qMHQAhba($+f8K@vwIzB+j&}N3UIdJA+bp<Xn}V8v-yz}3_d7+C=gA}FMUVG
zi=4k;aJ3UWjWFK-vZTeKRHVCE%^{cE|4ofoA1X*Va6i<6vmTLk-u|e=kK8lTxzLY;
zoe^gl`YLMlQE~z6OQ23nDR>-(TcsKO#b+9)Nop+Y53Uc-ZMuh~*d~^0^~@>>>sm>+
z_-ERxI$?2#8}~|-$#{^A<|iZ$AOR&^EpivFZj*X5^nn8%cjs`%g;1559NpIJ4I@lV
zPZkP34OqeIwr28ljkBDU!bn=9mTTPY6W(<bQ8ZVvCy68+Yi?-}<T41>^=9%SJj%V3
zogl1sBRNegjKodlYZRYUgh(&oS7@kVIN}wX<`2moKf0W|vC(Bs$y(3aCmqB9;W;L}
zs{SpR5H^~+2oi$Q4LJN|q>5OklV9+FALWFdwi5zlQjQ!nA{9vTOy>g&yQzBdXea)%
zKiAlJH%~a<mx5w#!*+7auw8kahLP+`t-&)}9F~ph7QN9AQd>S$AiSw=D`wfb_q5Qf
zra>EAUQz7!OSnt{LuUp{Syrdhf|qFtGdM_*+@^mh#V|t!FY^#%S!j5qTDX3Am-A^q
z3HekL^izcgD1nGkz6MqKdGXvhxa^3Q*)GYi1sW^!%kT97l{-5~AZU0AM<nqWm~`OX
zuuG@tqutiD)BCBtM7Az?wPGkme-gc)tA9QH2_5LB#65AbY^K@LUW+xcY3?ECFT6Xn
zd7EAIyT^Ehj+Xtdeo3M=&3kE?`RH~MK+0I7z(;6~^Vxjefl+cAA-OM35m&+&KGVy?
zKf9x<_epoVVWUWDk;2<i+jzLz<i0QSDBn4b&82U<&hBJU@aXQ_gjZyPFj&V~q4C7a
zI0R|(2#sVH;s(v3VcR-?!CO+Y(k^(8nBBXbkg^g%ZLVhwS{z=SPt^NxL#fh$A43{Y
z1@>JDSJC|~0pb0aM`9Oe(lUeFkTrkxQ~e-Tg)dfy*pt~dQ#Ipd)6Q6s8yZ9?-$^&u
z@Rw_NQhWEA34zjY4rAbixkL+d&@%TwgbQqOskELCi%0HBxS56=ZJ%M}i3XvT!NdyI
zU%gjCMZ+mylM4cwD@-x9vTwA)YBZ5kC+6_L{xE$oms$YO;s*Tlh?RlAj`NZC)l7Wr
zEl!l8B3WU=<-6}36hXoS%-)I<`~;tA$Dh_<Q%~|%8u5*-<G%9tk2v+B?{ZUApOTg_
z`0pqb+i0jC0LLG4R8l0|g+Rc(^sfGcBf)kRnhffaR9Uzh(cN;4ReBJ`-pj0m>n{-?
zU*=gs59Y~pe+^g_zW5BA0@yp!I&-Q5>*M>E&>6f^Qw@n~QTyUCL}{&Ixs>6)Jac=C
zp?-^qH~xyI0v%C&kSiEaBvd=M((1~^eN(L@9g0eZIC-k6`B-VOtRsTfyYDYorl5gA
zN*24u3=TSwiO#E9Xy3*E`(_Z#$v`9dF<`cN{hA|&_xm#mO<v*mes@1fQ&_iw4IxOq
z^HxpQ1q2qTUsBedFLLoZf9qOpN5`wrXIB&tvYk``|E{o6F?R`Mw_A!a2+*pNk-vo1
zH6wE&K_(M0X}Zq5c7I1DT_w4?xghOe1BS7pAd3_Ld?T^0EsP%V%>MM=MIpk(3Dp|N
zAU3&wL;u6lJ)#gvjAtJV7-&6Gt{JC^ZBakSe`?q}cF!`mU0Y^YKp5fd*TYA`+S+(G
zZ|;=!GwDH0>Qd&%P8^&0O93;IQP7{;bH8^w>R9H_h1Kqls%XXNh;shPQ{8rvu_plY
z3~%<z!vpfMp(1TX)f*6Un$`|(t5yzKhSAJLGWX)}xP_sKPD(Mf$#Z0lHN%Zi?(y^p
zv1CY!hZ@E;8Mr*Kf)i>W4}HWB1i66=8z9WYm-Jw5{nTTF!VP49)ta~Dcpm`JOa(OG
zts+en9IqGMipv&$pJmdyNf{%cQ!+_6aL0?a7`w1DY&8M;rD-ldG1>hd#KklYs|Z9m
zf8aK@=L!DdSR-da+Nll!)YJ92-ewbuSG3>g)PNzB(GQs8bhro$NplL2UY0IcY>gS4
zUfNNx?qfjv`=*|Nca7Pnw*yz$`|I!WV>^HM+SEYk>d(Ygq`T<ZwNm5KkW<Y;{iIhl
zY>p4?3sMLM1N)9I?b4SaJ)azG?kMDf_v+-m%J5stj|Og~Xz$Qo?*PxT6dc{36HdJV
z)IM?C{*ykE1sjF^-R+593)G1p{=K-M%EVJg6<S4%XeO(Sd(<m_TzEODT`wFvY||_E
z426!GDCb)32!bbGEv>~%ht>_U_mJ$gus<_h!ezkk_%qO3NMDaeW{A?Y`ddBpCmNsZ
z$Qu1>Pz1w!PFmIKerO${2e5ZhU~QYHa}|Gb(#h@!g$wJw|9p`V*JODg+56-3^Ac+j
zgw29tgXH4<UA|MTL*zgQ`R+nq1p6|Jnw+GU2h<+X-rlPldcDzL&!D>r9{MFI^O8oD
zUm;7n1!fw|b;D<NFC`dB1Hqva$g0&q<F*st$WL;>FZ@{O+e#%n$Rn|V0Vvxe017e>
zO*UuqR8}FGIx~$zQwyc;1piej6!mK*(}imK4wo>2t*b7dg$>vl8a>aBMat=?R_d{w
z#1Y$@4=J6pWuTtm4?Ujq?PlJ3iG<YzH;oSg<ZANccz1H7afe|qkI1mY&-4QxrPZHd
zlqWZr-HUTYQ0_7NubHzAwha{|TYwSQq~%(Y)YG*{%=b8kbB(L)2QcNkLD@)SMff5%
z7MqC?08gTL+Ww`;ub`VD`GIo=f5?T?*0PB`w6z&ucvV-&nZ<2Q=uxDW9>3Ed)<57?
z+`~*;h|ebGpRcbHvwz`RbaL~)HbS1!z4QdPy5*z%yrJqdzWUW>^NdHlyvnLjuWY0V
z<mzZmn2Oio&o$BZsXYsEfe^M7HIr!NdJ$PS&pBQO;YAp?^n!G}x83D7e>Vv$l259j
z<gh<{$!AlvIIU%N+gz-^5+XjMYJEz9<6g38lgCM@zmg1~%W}F5SN*X!8Eci)mC4*k
zu(%cHmNK6rcauYzw2Z@F-Nx|G?tm`4@ad5=zX1QS{u#O*FLr7=-hFFpgFH_giZlEj
zK9Qo5PRas3Q;EufV;3fL0rUgWxW0nyh9mLzonmVq<sF2#xp$g#W>-lC3V*)h%k^tX
z>J}^XY?ou@ainhe_Gq6SZgsIc_+^OVK?h^+a$M?Yu_?sl8Y7^v=F>**Eq3tntb{}h
zA~zJ}@SwBdlMH{-k<g}rO2CO1nm{*$u{DLSYkP^ZXZ2MG&IEg#)E-^#$InPP3sc<K
zUYlRKBRF6z9K99e!Djt<`s1?{{96`r_u_POoVKCI*XFRzpn1@w?q^umZ@6h0AcDtb
z%j%rMKuZP5;wnk&hYjYL_J#IK(H3mc!+a-8_k?O^6k|4ytf%b4=rdVq^AEuvD?Kzs
z{MR=*xQA>7*DDQN2ZCY{Ph})aKSSeYfyw!~SmV)oeDy-O$18SsMogG7KQCW+SU03@
zkDJ&7f}?hgUA$-(#pw;?*c{0=vHx20&@2k(Ynnj{c_%<x4Eh|~>PzWfe!C5cbYMA?
z+6K4YEe%)NQjR}6=Me&>eoShqHxe=MuK%jyxf$MH!0{&h`NF832Oc6>=+#Nu`ZLFz
zFnDRbzHcE%GA^8$&PT>35-nsJ#K<pl2y15!8UnA26F_@)3$e=2@pCXhD^H>O_nWA@
z5O0c|62C;*hW}7a%HK6?*{E}Sa9GtR-!Q5OcqZT70~rAYrfJg~+o|b&NH8kJ!V#xe
zO5Do^b1B+C0Ldvf`zh*0$m>hj#%g*qaeo0Zc)!+;(VGp1mQCQm1EY+(>ai}{1-;RV
z8L0OW*BSN$R5pCA9t0i_iJLczo!ydS<U2orko8KajA;`_a%$WEMcO;|=)!d2ws+gM
zZQHhO+pBHcw(aiKwrv}$ZQIz-dvgB3&Q9uEC6!bvl`EN5bBw}>>g*rKQ*62Rv3m$^
zEw^0)H+_z7uvmCYdI!iQ55uw`oJ{2FDti6r`>^c^SEm<n+Y@g=1@Kx9E8*>eNd5p|
zh9JVy6i-nvALB{woOxlNltZjo(51@>?0Z`i1Zb7k5NWwuq*U{*DTZ(dJZ8Lk|L(Xn
zPBA_@<{I`gBG28NQFkK2YDDz<x~Bngp6KFzrp;7Hf>@i0qvrGO@;Qrl%iz&5R*%Ju
zwN`5zDsN#-;-SPpLC0qBFU{doNdhfp-jf095hk0z%?HJ}(qUnqh-(IP*yBw)G!_md
z2N#aK<bCp=F%djAh1jv^Q{Ko`)o%UNnhGVO09Ii{Gwg5h1)QURIxmV3Z!G&rGI9xJ
zE4a(%Nm06TMbDSoww!eAL9*M^#`6Lmp&d~s|E=It4|Vw&SDfQgWD(jXkjo?d*kAF!
zpF9TLX`uH!Bo-{P>VZgj8A7Wtqwp^wDg5am8%dd;YX^m~Pw8w+l{Jk+4Pw^q4+fg$
zfcU7juQ0*Xkavfm*bLLUo-^;b<6&A~Mr}ttZ&xfvz#wZH$jG}1YTPj_x@jh6NdP8t
zd2pR<3q>idNlHQtyFf`_2m(5(>VJv?V0xO*Nluz5@#?Ovqn+Td%R__gG-w(T*?PpL
z$Y7XAVA0?@a}YTN5xPI~fbw@_sSKZ*x%`g+4DXZ_m}0F8An-nqKeR!7s{Qt?*N`TS
z>s8~F#9k2pDo99RZ#YCPl+p6a$$qHO2d6mA7mGBJ8n6Pu%V?(s|9hG@N9Gtb8rt<}
zeXwq3A`K|%GhsB6Vff2tr%RvQN5SDAvqU6MxC>RiIb19)X-f5*bHs1GC(v|BvQa2!
z6?`YPi6G2bzG)NN=Hb4vs&hq|nHS^5<2%6Vl<&0nW(V=eEXF?d994I}M(8rqXeT4N
zfyN5v?g-37Ew7Og22C8es30mMlRmq>PST&=^`@&`GL<~rB{N}}ub*u`0PpIw;SFAp
zSr%{hf^I@;M|$Em<u^<mqBVZ4Z>kl*?yk0uxR(*4Tj<Zg)HnR^80w1F(NHG<?!GN8
zwyT9RT=M4wb~|3oDm@DZ($u6?WWi{UIc1XsQqEin1w@}0J9G*MprI_AKf7%3**@9o
zb4b*nm#3=6=haO8mJ;U(q5e26sE0qI|INzO7oz(Si_6t#oq{fB1o7Q=ACa-PN6h;G
z`6Y1sR&tns@F~jM+C}FMiKJu2Aehb&(d^|0B-Ft79ye%&vL%YA;Z{)Q$C{-E6W1j7
zn#NF*^ua`YFm{Rly7f^UfWa+&fv&Ijt7RZ!BHMrBc_5=Y$L#^kb;l{C#h-4h+sZuQ
zd`awGKfX@aL~_mO+syro<tB=f_g6}&Qgdz^*H!YRv;3Ru?E(a~b)k|b`}Nmg@-;TY
zieyIC3&j2DKO;>S1JxpuzoUhux$Nw+I_`m(+&E<+s2$m}c>F>GyYH+tJ2T-shJO0b
zl8`JED&iwsME?eiynKdp6q#h^5IL%qND^SuAVvdE!qD`U8<22l`SBlirYg;&+3L9e
z6G#R<qnIwctMG1*e4&XXf5t~*QQs}{I9vZwCPt7uuSDoyb5ynUD;z`qj!}ReU9QUH
zh_;Fe@NX38>evqazW|qb6!vVecmRur+~snt5FSHO+Fu>5<yk)8_s(0sVp2Md+Wsco
z+uD@zE{2)Tak=Ribo^|?{>r@>6~^G623n@BdE0JhNZ3?kW8}wDv<*&q(4h0xSkubF
z$>6}(kmxrpGZ*qkcl*5=D^$OKu>JgB&yzF>GE0}iYQ>_e#QMBop=B7A!I{ISKd*O}
z20)WN>=sUPCzG0P)GhU3;hJ4*9>co60!UO`XbT!&E|j{4d_yRBw5DQj<_lJm_Eaeo
zO7gClA=78EYbw2V|ACPQFrT4pJVmlHGvJHoF+L4eNyH_)-$x+66LN_K*thDlyo9J|
z_$1{ne0mta=mS3dTy1bYV2jG3N!NoV*hnJ1XM^Rke3lsunU_q#(k#1U+Z#lE=Ms((
zP%mU5sC|v^64vHf4I+d==n|DF_g3mKFcVnh6Xm+nwJ6QK5FEEcl1t<{J1iyXAtt<L
z2LWlJNH=}!kbDdBmOgTxg&)LP#KY;)6kTl2o~xElhD3@*5pPh@r6)q?gi;O!TZ5^N
za{-pR!t<;Y7P3C}+eJ;SYVp(NF)56&j2B8Ob`S`4RO!t)t~>qnj3LwzHnS+AZ*?An
zX*g97Jq9gQ%H2+(I46py7qzLK5N?O|B0x#|G0*};9A*Q>ta!y+%AvEBUm2I0DK<8u
z{>bAHY4$oY3uI5#xw{(*0ct**7_>wIa@mPO>hC9BM|4YX2kkk$q2eTkqc@fLvBR0@
zA72Ln1igztI>T8xtp9lp(RwYaYuBSto|9PRC1<U2F(NC<Jbg|t{*r2f&JYb7akcO?
z@f0F40PBv=cc_!>_SWxH_5z?hWxDKMz!gkDPT0O?5(UFjOYloD<Ve_+i9&R7gHk9h
zd_alIRPpWEvk)0ftOjNcuxFIOCd!U2@8NZ=CEca;q}UEwIXv2K*Z-kJarOm&cWjhx
z+kX(;8)R3HnGWq%aYEr6D)}p$dU-zOHZJ7T78`Ua;bR8Y8nh<yKNhm^HstlF2?k-q
zl$=kfOd0w+M=UF$Z#dtU>1(I%q{gCn?Yd>9<n69HCldU&3QfxW1ZCGM`EL{A4b>I4
z>1ik;h7#6XUM6pUrQw?ICKIOW5#sr^;5Bp*zOKp@D=~CMDLAJocu<oZKO}fZ>ba3^
zJ9>5rV3UDcy*KCasbM`1u!|J=g7&ZaR0~d>hETm3Js*b}M0?dI={U>%dytUSOJvDQ
z__i3RmOrFCu;{kERqGuMtjsG-g)6(7hC06;xk9b@VLn-oLMahg-dU6l+%5}%_W^9T
zZsix?Qst@KJe*Qqt4Ae6RcoX=z`Uv`k#5!|scC=X>1$maIx-fZYXB7dvu@4Pj7ElX
zHwm_jQEdydiS3KRkVj4Ph&fQT9^N=LLgUy;#I9iDlx`nn8dw-Kf7wM`*)YUF!Se0#
zUeOuzj!etGn1W!?WpQ{CbT$j`;`wLV?yCyp75luqYn0xa*;ppI?wd${DyMwBFFgx}
z2wZcHjk5nm@7zEhDD)K@snTN%yki0G{=q<-3!oWzY{>JuRn*|^LXx^oz#TTZqB$%>
z{`CzGPx;csgmFmnzDrPqYJ%YQ>DpsY!?{x3IUa2wEfDpx+#IXQqpLqG$wg*#HPO@c
zpsi-^yp#z>2>Q#?3*~s@VZHqzABF}Gk?nS6x8}L`fo&@I20g-k538;sJ-iJ=BTbRT
zx<M5N+tE{S7;;+&^^07FB#kH~Ub#dt+E!PU(qXhERqP8%N((!c0*QmLVb*5<dju!w
zR~s4kiX~Li-H2}A&dbt-KyOaMji@1qZ{sV(<;5{X`FebABQzK%-BM;SEsn8vCRIR1
z$yi0?u&hSDT7>*i^F&$#ar-TNrp{<_Bdz9Dy4~s-UkTZ*%}X_f8q^PBrrgOOU8%Ew
zDf#s#{9DW}2|f(oVvv0P2DI4^zkCeF;ZEXjTwusNf`RBJXjE;>tJba8d#<eEvcyRq
z1U@D_DCz$#;h&<G)EAAppMU=B;rKiY2YA206{~HT909%=P1JHObxSqFMe@q6hHyTl
zS%qdoS_o{<jtZT|gMpoS%HN7Kh~CIn@Kb$fUS1QvQoy-@Ei_2rPkMd-rs0Tatf#o?
z&}V1Atp@o|1~&JE*U9Zmpschmj>v3;z_FR;g8<KsMpxXKY*Bj`m4D042r%Jqek{(6
zjkY=r7A?a-ZXEwf4F8}Znh0_JjrLBTreueO$HQ*jpi#CViHGqa(M3hK?J)LDlEp0)
z+kui3`jl%8SGzRP`t+q}Vff$?&t1`oce5OyKGngyfgvY`e_F-qyn`tF>z2+sg3ja(
z-O%i-V`r#}^H*!oWY_q|ld<Pam!O@#<ccF(G5=W&Z@4TSh>r2}1TC%1r?b@TPI8fS
z=Ejdup2Ust@RE>wSx9QP2&4f{9ODpqv6u1{50F5lOb4d?rhWm;413EU{q5gVdHET@
zM62v+jW3b&W)abDL3bP1Fs;V&k);hqfEhuo$4`L3ia=Az=s0KY{rV(b@ZmqEB1%T4
z(hGS-7Ttu9x^)WTQ@!sBrw&ctphlVc*7iuSC3g-L;YFlUrE8w$k;WT_;gn7IELg|2
zBPqNWyMXRNv<i^839xOvfcM%~!=j15zmvWwdiPW)`I;gHt2XfU?burg$#8kwNJ{{)
z?4?K^NY^JhvQL#!-ZK5CJ6XzVZuaaz*7IfI*8vc%Huqq3lT18G<F*SA+&+R&Wx3H#
zhAvZ6>{lVWZ;b)9v#S>Dzm9U=jEg-)1i_nb0t(s4Jz4@=w4RgqWDUf>#)y8hfw&qM
zYCN&iaq@Qw!v9(6>to!%ZSL%Z64H+N2ZEa#i3m-8gA$_YI>eAA7W038w~VCq00Fb6
zFSz6*C#lS^oZxCcBDdCST0<W=#!2jD@gmNurQoP6o&hCLXJ8A_x|pr>oBLEF-@TNL
zHM}2wVAH5+Gv++SbWJjrDRW}!SF!?oaJ>1eY&6^J%5<Q#;6h|5{sRmZ;Ej!?JH{3%
z>d!l15rD$e9mdp#NPX4VXOlOIFFhzDMJOSw&kAbM9ij5)cc5YL5v^O+9`pcf4j!QU
zzH>n9m-)E4lL$CSs2P^4Y3B%3MzMmMm?CwTJ#Zb4COj&)03I)ls#D&wl<B|i|2a4B
z%qvdcf6l$W1ofSCaSZEc3jp_1EgMEN{{_k|A;S-WUy&-KobO}pa@?mOD!pM7d<|gx
zK5nA_<cu!k8nkI^aa;e#+q9;W2()dLQXm6XlJewRFbdUNINa50;^zl<w9AfxPaPEf
z%i7o=cU`c}qCz=!e*AHq#rUEkSGajo;}XG4e+2;tM-@mP3o{P0`lStnWh|a!Tae(}
zsG@-J_fo8DuNm0gKQ0sVpQnSr$}@t(FWg_3>uJv~jsq!xBt;Ki040=#%Ze&NH+UE3
zn{MuSH78XZPv2<y7CD2B$6N+4{z)e(42&_dy03c#ysWd{Z$-$-j+GVNb|3c!$&8<S
zwri*VHWK?YC{82W3>NCoU**e5e6q4g6rm*5IIJ37n%_$re(^=)lYGM@X@Q>^!s`*<
zyxuKarq-vm=<Z*Tr+e?sI^pL0t6x6#phTrr#-_N!otCNh3X3V`i2i`LcY0m+7$6v+
zXRC(q52|;ET!W()OfK4$#2BNsp%(0ZdOg)ExOMo)J*Gs6E+0ve1^VLr<P2)sN7d^T
z_XJRu-Ro0oke5_5J1Po_OjO0`Nj*SwpnB>wE){`Wl`gKGve;q+zPDVli8x|-4fVx>
zT1%cFSS&0AdoP2)>r{nqu#gA?^9KI+KDi}5Q-mC&`Zm<Rf476kD#<wd8(0vu>L@p?
zBxFxVf6!$p(whb=YkP_yLi^s|sB}^X)4S$rUz6MT{PO<rw&AI^CIK(XC*4dmbHL+a
zUMl?Lg+PYZ_qaNTPsq|c=zt$i5fn#haS6Gg8L#Vi-sx17J-e=m!}Z*y8o2al_oj2L
z8O*`=T>zw7R8qnCpRYX(2MHPBP92z>vp*w<G<BMUs_w)~3({|1IH)^6LqMwx7&cJJ
zBPOz()SO;B(Zh1EHrALY>h04AqHIB5gSRRQJhV2sthkajoEc$9Yk#6%nq{-fGj<zL
zQa6>Xw%kS+ef6KW)ZU8>B||_<8YEN$G=l+yFT~l^OBVh%?qUkP$Z3wqMX#MqbGu<d
zjwm)6buKSD1HZP|fGXEpOn{0@Qz~v4N?2&h>8P)&Ks>*Yrgc)Xmb%)$MjDyB<kfGO
z>PG1**-w*wAKOQR)87~}Ns{f&SXG=4L2tT>#BM@AjYZ2=`<vmTCIBBi#6AVPSI>=5
z^3FfDmV_{_KCS?Wa!ejdkV0@kn&cVBeEm}{2>$|>uqSy;goaUaYtUGFS<_>&qA8PN
z>fr)yz74bTOcOeZ(X77e@Q@3N_2OQO#oV)>au$o_j>uow!P&e3z7=0{!(17E$&C1`
z^SWa+3w9du;CRGZkl&T=Tt1-TxNnXCyz3m@I*shHd!bakS-Uxi(u_-P&pR9?8+BoG
zK8`3>HOrtEf(6)}VG>Oi1@K1FU-Imi38B!;DY*f;u#Oi&nGSN4o#WJs5WMYoV!Ms!
zw@f<$W%(feB4Hun=S*3JT0f+yunRh}2FpeRl&gyW^fsLY3BK^=D^=DsdRb7YWaOqB
zF}<qNnjVCyKl_Fi&);R_Xq1~CJ@R*|%qBRW{#ec%c>S!N!qA^?%$=a@K8t?B>*9Q#
zM|0PBdE)6gX`hSMb&V7`9&R5dK{o+tg__6yR)F%sh&%m1jEVKOoQie&3sN7A8nJP<
z@MHx=wOWw+zBTvh_3D3=uC)3L`40QkD&AvPu%wDL>ZoYZ!YrwfwjITY3-I(ys$eEb
z0qBV}BS%{?7~=?zGE<g#HFG!X>bb|71f8+79)H;y<OYw$45pA0=H-N+Th{YodKT@I
zzWeUl94vBn<N5jv@#XEM;8sS&O<~S?PTj{&;1|!Ac}OO3T~wyn%lJ=lS_=1_kr0^k
zi*!(*aP?Y-Onxy?`GZKEC=(ByJj4{i`hAxvpdg)#=~1nMwJ~ON+r=*^;Xbw~GXyp6
zRtF~dH%E2?m}O07&ii6;zf%R@tOdhPc`p3CcT4iW<8Qb~Ot@)D`iRdGG?}shq@svn
zt+vwk1_6h_?kg0FB~NPy#_s4DQP<f#V(jOw&h1QZ+f^C1__erFK!n;zIdNaXxx_gB
zfh_$B*n;kAaB<90GHx`rxhMI-gsO;CM5mB7sho(T0W7L)1gT~Tdz5`B@}IrPycc7<
zjScUWQh{VxmmmnF0e(0<DT@<DLH^SJowTD74I7Vl<*oOEtWTrcSwSdh{Py}8i%}c4
zgoF0K_8z^GmYZN+=$dd{AO_(DY}G><ga-FeSo)ZMru-dUOG3FpsX)uem(&^8K*+)a
zk;D%~GX>o|H2d-x>k@ymkA#lXSdF2d8bfJ~vL-Ff9M=JZ-%~wGh?Z_W*j15g8YhNl
z5=@LF@Ugs{Mn{==DhqWePP8d}iXd4gk3(3d>(wsxdXf9U8n`h6K=|}dwY}+4j09Gz
z#CDKNStlj_FN>H$RcVcp_+YR5-eT<TZ9%xcx%%iw2Xec)mZPSg5p!y|)$&P*Ml#c&
z9$i5pMD`Ors&3AaRBWo^unkuHmrv;n0>HJldYX>Ah0$Rv%G~0O?+U*b08@fkXo^)P
zgs5=l+;6-SnlP<I%Tab_ZUjNViY1Wg4p1{bz5oot!5d$%)PPDLhG*$m9BTZBfWq|P
zj%VQ?0rgM)haV%Xu~Lz)#rK4Q261~4Hy48d;lZ`uthA@Y^%Zse3tMqw&{D?^qoCv%
zVvUo_p2_)nY3=<KU`r(dOH8;)Yhap~$UEHn8s*;CURXtb%VKvX!}XVPExK;P+C{T`
z&@`o~)2T%m)?V#-{iQpoU5T}p9bDfX^K|;k$(9yv=^!qO0PfQj1<B!Q64dUmdr9Rz
z`=-Ml8V+ZBWB-9LOO&&>)-0}v^iXn^y7?89#{TIjLXdUCNPrl2SZ|Z_@dR<pOQ(_i
zN9!8Xx&M=Kng)s^E{2Gk7no@^dOFzZZFFmK5YJen%%So)$CHZou*uWj07(zic&Q%z
z@*-<ej$X@&uDCur$j<Eg2zjJglpF$ZA4*0qeWt^t_gxGEr9t=TpdI#ij(y5Pol49O
zM&~baJccZbsPu`5T}lbeKq~ytJ@Z=@o&9L{Um=(Ri#NC6ysPeT``Of#KZP}W$=urd
zf7S@?M<_zOH#wo2O^jeQZ2~Lgo<(c>tJmF2g?hq9PIv3%8Nx9(3G+-BrKEDdE2f!a
zo8P2#b7nQB2&5W7%HwfOAC?NJ3kd|h@2L#elqA&fE)tGWb6J^r3^S1}zcVMpBv#FZ
zV#G+_(ba)Sud9Lh)O{&lIPz2kMVHH^e^fAw=7Of4vz^yy9q$!XS=Ev#h1}<dxC-lJ
z))3q2<`wrfa&H-cCwQr4jFaJ@z;#tXbDGH<iN@fa$>s=~F02zmdV87cAgkSswAA{4
zXqWOp(3p518XRTPKI>}Zk_RHX6ky+xiKlQGz-zXRRSLE`X}~~7*J?D)U8NXvs0N+;
zUVpN#g<g0-Y1K*jg8r&;R%DbDGbZ9IKyo`O@KH0wBwveVnmMZ|A=`<aU74m)SPozW
zPe$c4XLSR#n4Bs-_Iyxz(9R^mrvGK2>!uu4i2PE7Tu`G~G$EU&$M7~H@fm#xYY6;k
zOM@gVa-0GG5|GwFI|Vu#;9@D@_8@t@iuD)V3k2`V;{O|#;c7I0OS}DnMSecn+JSyM
zS!}@t0Bn{tf{B3czpp`D7P_+-0#xBZ^jH5#fxQxD4fy}wsBz6i;n3;rimb<u1*mK0
z&M6ytlZha>6w0ay6d3ec{^<n!Uaa(&{6OfYT8{c$kyf_*_t<NduIY2BN(;IfGBiCY
z_sZ|3q37+s^`6cMQGb|u`S{B#l6l+@00__9t|+h>cdJX*$1_QO<%{hSy+f~EA?U0$
zZEL=!z9)wCrzzB~q<UOE$BlL1;C=E=54**i@wy&?bnwj>9G7MVmi<8di3lX?yZ+i+
zeiZ!^R7kMDT6=Y#Syw2X=>JXEcn7l1{xv|_kCv{{6ITTVq`$)`2~NpXarIwGA}!>`
zP$CQflDZ8aH0xdGOBwo^*U7ob#?5g4E%s&Fy(##Ia*9vybypP;nLmDl;gzCSWP;*~
z^2p&fK;;1LRSkP07Qi4ES_5l59j?9S7KS&nuY?8$02c*zM?qEN!)Jm;|9ZjBd_Dh*
z;LhM}Uj$X-ngILMdh8im#d$6l#;o5dOQ75jalulR*5B$)X=j!Tw?|)p^VC*gS%8?a
zd;gDJZo$Wj-ovRGQfc&C#$7_7s<k1_4;{^uC$y6d=HbJyUx8>N7wH_F#G**9R-+Eo
zoBXqzF*{M6G<PqOh+g`n$^@ngHoN6F0)2fTgHC}WvQmE<OfRj_!)-_>7XVOcA8CW!
z<QRnK{HzBO(QY>V@8>wckJWeN=~HHrAOHX$fX6z9NCBns27qWY0|3Z}LRqA?!U9Bi
zrq}$P<+k<4s<!Its!24Z(|`0J%`M^{6}y~XGn9Ymf)Mz0>DRF)(C}2DD}*kg!Pb7i
zXz;BygR|Rh&F$dL-f~_ph}5tf{0|67MQ#HOKh#jEQY8)#bNLiHFRl5NA`^$!e8NC?
z)d%Gjv8d|WH*v$CwHd?L-R3*xym}PNmMDVUSTrc($i1B-?K}92btzo6F2jLm8>1uR
zFR1bI2OfU0^P|TK?ctkz6k5(EH$$}wxE%Q>RUOEpR2)xgB@L$JX?yJI!3=mqn&Z{_
zYUo)}S$0*SY|A5O(yO{HjnIEC>Gvs0bk>Ia9OB^D%mVkf4~apJg9wCdw`V&ClaWH-
zhDpr5bJ(^CxE3D@*P39a&L8+`cIqkxNupwn^UyB|u3dKNIrbxSI(zzS4Z;!2q{F+J
z3(HW$Cs&$lRN41)1!Zz>=BVQ+)GAx8X_%?OBu5LWK}En`5`fX}82jE=Lt5|);?u!N
z&qpIBSa*d9`Qv2&*c|~PspbNwwcfsAwN@6Da8-3J9S|0OxZGuzU2iN|wqI?_$&zbg
z=neMaiR7{T23<?ltZ}s`7MxUx)1!lLkqoV#UKpU;x!C*c*=<GA0c<q8b!;Z{eeBV?
zo1h4zW2!_s+^;-VvN?m7JL}YcIk$y~whzdWy<x5OF9zh(bbzC+2J#;+UlMsWRh%_r
zxmK+j6W#2C)FeF2edL3=Q`sztPBFmB+BXPQ0+sPxPYAvd6(3nncn6t$iZCWycIsDG
zLQAHM=ByCcY;_K$NsNq~KWYUUzPZ3NXob7<JD$MBc5bfG=r%RWB!GcvC0K1koQU!>
z3nv*BLe2}NV}-GK?%BffKfbeByxgIBQ1Cze*~Z%6FVEl@P8P}gfh7dCrPcNSCHQ?_
z+k&&;M@H>5ah<&atFqV-ysdJiqigD1xim$=mZKv>!p+wwkrxDg<dd>(<+JTUxujzA
z*_u{P0!+6i#mB#)Wev&H2Bj1Ij-^rc@T;91hK^t9gt!P^qXdrA*29hw1XERBtm&<y
z9grk6E+Ag3!G(bhnRZAm72n?1G-=s6O*F4#9ng_J2ZM=i{)K1b+Wa&RQ+!NlXVo2a
z@1KRu0AKx^^s+8}V=6K0U~F|A#B};7(0Wj2+ORN#&e;!l{%~DHY&@^)N!Q2{5~82d
zv^V&zXVBf1&z9+2PINsKD=cm%(sA&>ED1xPbMv(@I;AZLyJ^6|(%tRa&^bRLl7)1i
z38g+S2ly}Y8a_<#pv|Yc-JTIXWqcS9nFb(@oDjDTbjykW2m&JO;iYcShdT_8p0;qc
z<z|`#76;{b%6Kfwd4#bd8RV`xga%*$plD3AjNVZ@n>=#ci$o+HuWvu?!8rY;(G#nn
zc~}gXQV59Ru*NoPD1K3-X_7u*a?~s;8+aH>KKEGK&vg*%0l1_@d;XDoB3X7GC|Y=b
zf{3PqDCaY~J~8i7?cl!*LR&NINAqE_7KyqNWnTqalzx8&1U^SpGUWax!{M9=h<s+i
zM=bmjpW3AQ3l>N1?Xye_2UfD8-a<)G%yP0^n8lc$zdI-M<1K=!X8qF<|BF8xoFq3+
z!JgM?`~CWTG3m8I3j>a%<BXj`wuV4zjH>u2hMzw)_^eo8<BTP%g{DFG5+<mlp_G`^
zpxdf3v~*I3x{P5fb~r@B8g?h{6{DGc%`lD3qer5_%VnFx3Gwky42itpKc&kp<2uU)
zg>l_{{+g0KtM|NWY0JNsZSy1v=OSYpYPrNIa+hP>$2!G~W{*4PyCQ#&4%I_pu3Q&#
zO3P<mR`BfjWKuEG6}{f=hQDvtbp~S_IY|hRVN~OY@nn--S`!e}%vy1$vCMjm5dB!~
zn3Zy=O`#k|$t@si+QgOpjhsom!{d!4S3O+_b(N<&1CYTn`dK=jh{aaex^%_sTfOm{
znkPf3wvted>9Wd^qi6n5iK3=0kh<gO<&I}%r~XxX8B=dK>>UIjlL;WkG}FiY_8OkS
zvGyf-yC^vFJclQE;!E}fnH`JlJG*m?Kwzxh?Kc$M13FgENV(5lQ<JH#n2vak2ZAc%
zE1+$*w8jjK%lITGr)_h==F}JYHeuJ!L>268v67H~+Z)}DHXvZr$EwBI!dw)%gxumh
z3*g%95_X#}(~_7O-CVKm{FOQ|$Id|-R4Rm*3L$?8w92R;W$>E(MymkoZ+MBlYgyvx
zE~YyVW_Owwp=#64E>*e*E#1c%O9ovir{Mc22zoip0E4}qDHz-WG91o~o0J*qp1Xqb
zOUosr;3m5|kqaFs#0Kj{1<k99N@eR5<jz_;!z3WiQL7UbEu%J3w7;@YJ9tm~Da&h<
zrH0DmS}(gZkfG2X5I%mEH>m`tMRvr}a=sWD>CEu{rh4q;nZ!hWRFVdgQQ$cKkQ5NQ
zf36gc5-Exx2(n8zp7KKC&`$5eb0Nn<(butMXeMF34+IIkbtVxu*Wh-YpUd_FA-y=%
zKI&le2ST088riQLKRKLo>ie7VWc|0~ISPBy#G91C)GoMs6nqDWmb}@jrnxtfsAX{;
zBQ1uI69Y8pV-7>wQO?hNirC2ri*fv-IOxN@Gi%YNhi1`D-qP7tCfK5U=++aD{B;d9
zkwZwI^62}NSX1C{6NMec2KXktISjCK{6)PVwFOcD@=xGj1fy|CQXq%(s?=#BcAZmP
zplp%~Gea)LYj)IK1)5PBqz2BkojpGxXju2$M{d;18{fjT9|$Vf^I%7vr~WX_$Ay`%
zerZ*`wpGLz%BKKhBxYae=`&WR+OAVsI&jvi0{(2t0Zj_7=!=O;G!%19&d2u;920(z
zpK=*>)BD=AM=TCa)pt5C$?*XT2=L|TJ(ZoXOz;?XnmK3`*}Dw96cW+OSw!QdBjpd#
zJ&cQ*zn<;28ogbVKYKW9<vOtW*nLa>3(Eg61|0mvngrqm11}Q<KbyC%k_R=16j$}d
ztBF;8NVn3nd+J#G1jum?<)3B(%nR&pqoo^1nr_p1YIP{xtEFRYN~=AUagP28Ce|!Q
z$Z4NYG3pN1uVRff<GuG`$jgH%rncmXa9m_MC3uSo7x)?M_99|#?AE5O)8I%Or9kx(
z$><4rrdp2iFP>35LPo?*iKB8kbqscOCm_<y9o~<!Q@|Zxi%G-)rP@YutY;6f(?UXe
znw}c5%CVFqGP{1Coy(R|=?n>GGhDM5zg@zn0L->C$kMKF@)lEZ!OD3wAn?3{)h>Kx
z#YvdBs&5%*uKAoEJeyQ@kMpBeY!l%w#P0Nsiyf;I$1*mT5M9IiW*Br3Qmp5UoRFgA
z-l(foa)p<cvTZck8>=QmB`bc+6-MOayr<!I@9kW!9Ags8>9VZ7?@5G6{}v=a!UOAA
z?DC#xMhEdK?hG%Jni4v#-Gv^LEWwt-(%jIm2WMWiKI`b_U%84SS5l2@y32E=tSyQ2
zD`GKG3psv%(p!xhCku?XR~=-BYOFlHl4^XJ(xpLBc)h~}kWno?n|GecR?cJmrkNJg
zFUMP73#_Tctp06oMhgkZa6w97WEpCD(K)?zzoApc6UG~>=@R7uX22ZVvnjcZoUI3G
zxdVD>J3Vn7b)))g*#I!l+g4vu&akdG$HmggWjX?<Zs59d&+hTY{f(Ahjo%)1BM;37
z8i~2>h-j4DMI@LD^C4`DO12=Mo7WhRGG8dt|0}ycF8<4vL3BBn{@a<n;Cq)<QqH`N
zFc4_;_T~hd|MSr&|7bgeIK69GlN7i0brkkX7-a#~=zOQ5&Nt)ck^EIQWqb-#a98-a
zR!rkT=P>}YFRVK@#v%3j4YWL~tiS$oEr)7ap+{CuK7AoUn#b%XyB!(eQZR+VE2Mri
zYSuh8G!Tfba?9no^?Bsgsf(xgkE=*YUdqJJS!Tvdae%hgi)@87#a`no_d^ZI2R0Nj
zL7L_Gy?vlOwSYJ&{(|^U(nHyHzn^13I<LZ18_lBGN`VcnC#6D+i&Z;?<hcUEPA_}s
zppw(Yu=HGq_}eRtAw6H!SE4V7?y9ekVgYhA;Ne>YG=)?)4&Cq7veMv*C6I+q*tckW
zjhNKRlrkc1_G#qJnP~gP4Q5dKoABZxA0~eG&6WczJfHS-B<SQhB;ag`0CceboYB;?
zY*98l153rKSd<5Js2q1+Q2UB<Vy6%(zbzUX^eQwg0(FhV{&kyUchZ;W`@!wPM;Hb@
z_@bN7DoXYzABo4GP&Ns~*rldk*0c~{reCK!+?nx;;?463sSuyZHkSBbW5ZjYCT#=2
zv98^I8XQhHYl|Xc?P21;S2m^DkNvOq-JTPIvrNSi!d7nsE3Yb|T;9(Eo&D9}Bke-?
z+rejUE*r`S>!&t+Xd>5j=vk;|ptza;-2w)hq$aCq948O(V&Pg4UF$=nNQqWiZO9Z*
zvD!W}`+-i=rknK;&vsHVvA;W`e6~XvL@#l@8t74<-dC-LwRn<gSFC14ijJCTx=C&C
zS-4~PsC|jhsA9(@1G_zVg?-yt1w6O2?^X3o4^8%@?gHu1m+=q&@bE7~5ta1;NsP^4
zd=4jy+Ub_?-yOeq=So2Ig=BYG>yI5IckXi*+Ch{+0!HOASTz-@+SL&(jx&kQ4_I~$
zVTpNzdpml3ZT{9VrlV2fHh+Oe^tRpkS62Xy#APPKiAT|{oZBal9ddeSucxg|k``QX
zd7lAmG!ZxW#c;1$7;X-!6-M<LR_Hj$y4#=;A81__Jtx!6WDq6PBB#s9b;p2l6=ETt
z4eyPm!5O%pAZPQRnII8hCI7a!vMA~O>V^1;|Ck{4JPUT&T?!JyNt$1o*(U|S*48kt
zgo5GkIOsUr#zQBanES{YQeYu|1cs$n-*Oia>E+q#?0SG)k7~IOlBqaySM+c?GGbnc
zU?iK!!a|m%(BqjEBm>*!R?Yu}^1?Fd^JVZU2HJ2eX7M%+47~D3)vM?3J%K55T%XF3
z&qoVGbfQar7M=!?#Y&|38Z84FuzR~L0VeZuUw6TI;9`!N+FmK5^_Q{Kgy>GGz%KHR
zC<R-?k;m1E`ixJ?Nd0u>f51^d#kI+P3%S14OTb2HrnU8REE9P&E_lnD4l6;iR2y(t
z9j-GI^43Cc^y^E(cQ_KFabmsDy?QC6LF`V%cA;mg-0-<=WP;e0XX6O2Xi3R{JM5bV
z9!%7{K;HAK4En`tnixh}`(4;AQGtSjb)>56pf^LW{U)GX%Sj)=d>l#-*B2HE4~i6T
zbx;hga6#o!44C>^?NOzM_o1pB4mT(oZAE?@P*QNY!__Mue!n#nk$t&uG(8va?L4CV
zEGb#tTa6h*tq<6kkn2d8lZ2=r!4Pu(yT+)?YV2WXkl~YG41bUR1B3SEnKo^gwKmg`
z*Z*{Uainy15Hr!i?wdfT-`9Ufa{Ug_w4XEl!;l|T3@@*IK7pOJU@C*^1s(5Iv#E(5
z$d5l{fi*E8eU$ne>|SW3L8DJwKhumVYgn4l2mJCe=~zUS_&CUQRn}sZ%(`;@CzUlQ
zmMdKh?An6oEnDO61IC&=+f(Z#ST4b&5?=-pDel8-fopy$gq=;4INMcNsBK<6hvkI3
zC1+dIf_Crn1I8j$5Vjh$Laa>^jB(`Mic>4H1-XLeSfwSjF~oZk<KNXy4!mKOiA)Oh
zGr*z}AbfS01rAPQ<(Y>`qP;{hF1&1i2swH>|B0tNZY5Jg3n;9dcm?+8dU<&>&9FRN
z)0%)Z_|24i_9owrx*qmRVO)3{=n~|U>Pyqron3oiIB|1viAcSeQiu4uzT4;y^ls@)
zEH(JZ;1dz}>&F>g((*y`faLu`iu#@&4Bl$v^J%#)yWG)YNT^x|pHw+$g2rIBxZL}j
zElXQ-9EYj@V)&4+?@~#ARD=cJ|9#ih(-2~>*166?m~f1DomBgnKexW^lnN6)@vzNU
z(Kf4$<}l~ebqrXGk{wyzdxhcba?;V>(9?Z!Hv!j#ICR`cZ-v#KT{_M<j76noKU6a@
z3ae*89H}9GaelWV7?Gppm%=j(v>p4Axe^^79yO9UmJdxsR7PwnUD*naNn7wU(`#`j
z15+^@NUfoU<fg6Ga!aG`43Zi$m8ym2q|8mzTi{NC>boIMv+DVHPsL8Y-yJy=oT7cs
zuL56QhSX(T(nP&`&m#@%!2|t{N=J!!9V)P`n_fw#hz@&TR60MC^0}76;p8q&AMc;|
zPW}5DFoG-^42ehkr}ln8C_}-(^Dw?cn_xF%Sv>ntRN~WT?zMSlMg5Cu{+0Fk7FLsk
zgM8^`TrrlSRKh5$W!jgsq0W0V*6XBg8k+hB#J6!^<m}N&Sxqp%_sNW%kDjY*3QTu;
z91F&K(B+V~e|qD%<kZG+7Y(;57^`FFRU{{ooq7EI6^XWkS&-NXMZgdMP#pjOfRKdp
zggs(^0UZ5p+uRBS^m*2dks&ixF#92g_{iTRca@1fe=MZ8L#mCJGZT_d*G_93_MjSK
z3#M}?9D86slThH<#!e7v6^(FyH_5S}RKo3~RW)S&ias1RD&2R)zdK7HHw|}ZtI4q&
z2%_hbCbT)Lpa^_8Aaq7gXS8{A(x8&GIfGNNh>)!T;SX8H@$^>Kk%(8|yFw<4y!m42
zcH!6fJGRZ9ZKyF4GXFFai{lM9K3q;A;ODlF)^b>|Yl<^<=czrM4a>u{NON>jp<st}
zl`RLI8|)GSRw#i$T2M(Wg!3^?5`}s;IMB7Xln?<Bh^JIBY|||Z1W;z9XrjOf??8}4
zKM=h8Khv^^03Zqg0PqHsXY@ZpBM?~My6ZGeIT8{>L9;MnuYtm?s8@^42WS+&f*HK1
z^7yb(r_vGC-fbZ{){zwD6WnhK^${7`Y^eEgvW={PVoJ)HcOlSPje=*~5NG`60WbA*
zKp_PF0@YEkyToErq~1vtfmk(j<e5U=w#?S^m1~AJ$CRMUc`8jiCa4d)M_k~k)~#CH
zW(rDDTGGpj7<!_E?}{aX5F9!4BQ=y17Z-=(obuLnz>ciS#}OL0#`3u$C<651Q$hB$
ze7k3@94b&KeH#=+r<DPt15~6G?<TQMj<!3y4jd5)Zq;mA;)=?Oc4UxXUGbdf|H`3I
z9slk9KP|e+|C`7W97!n4;y+Zm<$nqniT|Xi`8z;-x?n09ht4FhvS@_tO*lh#Jy^j&
z&hN|ZF934k>!fdnN5t3De%hr!eUt)=WeEv3WS}Z2BG*CX!Ldr|sbvDDQ3S<;kUztu
ze~QoJCdbH*M9d+`Y>N)G1r5mlFsL(7P7vU(qc@|e6Wb4fCyrj)WO?D<IMi_1=Rjn=
zIeiX_t;c=e*QKqZ%LuJ487W~^;4nRtZwub7aEVx<!VcxhO#Jy{>_$3gBG^W$oAvbY
z6Ie<!lx!0=<?#sXJ%ZzLc9+-k%pgKb6PqCic9SbRXI1?%sl(4|6mznKnP!~qinF89
za?c*x0z;j*B!3P-A8}sz6G#+NH{*NT>Eg7aLZ0{?a>S*&r{$SGN=f~7Zq3@F3g+8=
z8z3^dtJErZ^1eNf63v~zkQ{wA&He`3tJ@n#DL;k`9pzt)>;z;-1BF9rK1>cBDeQ;?
zu8tHrcaR~3TVvsb9AM;HO37zdP<BAUwcaA)dWG#%9UA7^h9AfQ#zGvzV$ili(IyuX
zegtB>iz6T+7lLO33_%9z_73crYF#G>hQKx+Q>@wC2UPx$|L?I+ETxrLsk#J><hL+u
zUeI?uDh>QG*573<U&bn6k>^Bwa$|_%${fgwLVOoU(M~L^deS$dO0`HGAb7<vzY*-7
z%`~n(hCpg?%~z|0Zi=;bSYP}mwcoXUA&E$47LhGivoDWV3(W_Ay9{-%H%ozCJw<t^
zng~sE3^AXR_bIXwFeGu+v{6LJP8nf%W$^-1Wg3+@X?R@j$@C()oCX4udmIx+0<E?2
zvjC*pQD&r%GZcZqq_nU`wq#do50l1B>lngfeGptb`dbqG#0^!!1dR}miyt^S^G7(G
zCHe$SWxshze?WF>s_}tjmrD;kUaXO0^X8k7nFpj`?b~3S759fN`FuZz9gBqkhFM1-
zOnJRRi|^$*ec?4e;v}P1HvXkwt3#t&x`m6gP}t?0q!GmC{tY2!tBzn}tx!B<6phFw
zhDq-+(Y?K1t{v>UZ@h6KHr=vykp83L91#TFyY$<lUY}d4PA8+%n=+pZr2GeTwxIqv
zI{tkg?pqdHCp1};jpK51_b+-UXI4?Ut(~U+OXGh)sCnOX91{SwX3%U4sU+X?px#p-
z#Lg?Qs7t_V&uUnjK#q9A1!(LtL~jN<h{w=SiLm!PhHNp}nHOthbIN*YdfbBt#UIET
z?7|kX>$2<j>=VJfuBSM&U4$3dX%~iC^-~Q9=BOQFIv_h6R#<!-vs|8k|H)PV1U?<P
z%s+G1fj(DM#}i`tU{7vckBy@zCJ+j?+S_U|JhG0Ry7z+5(j3R-(GpR~z?197`AOuO
zf4(sI%qAy;IxW!dnl2tvO#M1+%EKw>lG{SpbRMS{<p0a7yLg<D=3JF>r&0sibI67i
zd9C=@4D)l4BQ^On{}1&p8ux)hZyq^E-u>?piO5IrCh*V!5TBh~Guyh@MfvVy_ZSHw
zYVA2%^($zPeWI2cobU{TW%Q}(J`6B&IV`3p+@>De2b(}~|8$qt<YkJ64kce1pIL8^
zHmq>OT1-Q08AO|r0c&wTOzIAwkU{RPLB0jPvmsR`kqEY^ecLmzUH~e^sXgKP-WRc4
zZ`kwfi9^_hLgQf}fK~I|2*DMdox$A2l+MRhmTO-{E*f~iVqd6oskXt7CgOUVQ{l#3
zAH3X~&C=h@HR`Wn3Gzfvax)#yyV#iC7r25W+T{`7$1GRJ09_&B(=jZ5&z+3_f_<iY
z4-~oCFG^Qj{_^>AXbxTt!Iehyts?em_?v^eY=(6)dnKjfcz9{sC23Flkot+i-mU7C
zwiFI4g6gK$i^|#R^l+Lk0jUDNSUYF1APUcJMX`2n%;5mH*%6v3A`lzp@6%3pAxqZl
z^1ni(gqAfG1!%HmL!}7$2il<T=*1U`Bv8kYa@M27V4A~o(BRv9bF$xG8j(v$Zfp1~
zY?!vPi~zorp%ty5(t(@I$fleugJ;lUFC_)Jkfw@}HMg}BzYI3>!MAhq;b9Tfb4}0Z
zh%uyObF6yX{{M32Ke=(J7!vJ&Dhu#-V30U;MZiY@l;nT01BB!ea2pU1JfZTR0sR65
z3ztz400afkc^^WzCoK2BT*6HNYIYI?c~Vb3WD878b*t-6%L?micb8wiH~il`NY;Pr
zivZ=7{eQW&7R(3$pro??Z|47MxC;RQ(A7d&)&IX{<G<{Jpt=vtVE0VD1`UDMj~sHr
z`u$GHDVB_)hEU+(?)#)y4PgmgMCM|bU5;mey6h7q0!p?ypG1BR8E)q}cHf54J(T*7
zmdbf;=jP)&UzD%Y4@=#B-!e?}76ORRF@O-a_BCH0`(|K+NrQqiLt(vxauP1~z+6i%
z?y|WMEtG3m?HuzrO|7iGShlS#(Uhl`v~d*)J!2;@D8BQKE1~@$0g^GReBoE7s9>}I
z<M2SE38eKEC+ZtKHbSIRyOZ{OH^>USm1t^ZnjhNWTNB4aB*Tg5^Z+}Nm0VNfk0-FF
zHrXqs=KvAU|J^;Aq3QViv#YzPTGA<Dhq5FHie~?8$>6tuxkPP#WmIPjx$gM_NLnbH
zZg7LW0+O2;q8BOGXRRihfgbZw+>2Q)%S7w;39B&1SV#;PmB0rv)pm6A^(TlSaXV0S
z8%%LjgAHUmy>;I1pO{mfBd@%7AC{pK)!M8tvTfb;!2&Z6V)$-?^SASg-pT&&;SOf<
zde*PoZ%fIrqhNiKN63*kQvOg=_r+QM2{_+#@%Q9+`s|Y}1JbMOsmNoaxfAX2AvbQp
zM_U<x$a3=!(s{Fr#&J9noe$jKefuTKy>+C=%ed~ljq9l>ezptLx~=?s!z0@P)V!c|
z1)h4k!>E431VXnDUH?4Rhp_&i^iJep9xbb9V&3VbOU<~+1P4QN0l^h(UbpED3nhuB
zw6JQItf+l_bDvWO$6T_-6Ol=}%IF>+mvNs5V$y?4VBvk#w1{lJ4tyXZKmUzgCbCuT
zYC*jhf67Y;xffcrQKH<`23=JIX4vO4Q&`um-W=gkiJ1VD00a0`e5-(@?A&cUUu~zU
zH2`1SGPHMeO7R#^XfOt7`Vr`L6Or8R4+R{WtZNKOp5l{$X7$@3x7D1jor9DWDbQ+!
z(Khvxgs=3(O73h=fXbxy(!O>{%TX8EB)U;qpzC=9;+_BlEmRGAGuc^f*+vbeL8FMy
zn|DYt&up1g(S>R^MG`Yn9&`Ua=OFd#QNGcEr4B62iBUe`=KQv2VtTQE;(%-s{8rwo
zq)9AXVlKkg$l0cN)EAJsULJu*ioex}BqY2ydu@4h&sS)JJ}*SV1q0)>3olfml@P$o
zSqCPuCmO;(>&R_EPs6;cfD~d_t;LQ+fe8cEL7d;@9DHH*8m?hv9GW^qw@Q@PAQ<@i
z01YXacimN!Oqk%}B5wIl%~$KB)}9T;Af0#ojr3T(hW|je{3=MTWN94lo+d>yw>kHP
z^*XuL#lJ9Gg41yJWR(W9$%V|4;e_Cd?|Jf8P-5Rc4%!jTng?Z`A*ex>a3kgUdnZX#
z5BzQ(oxXdbr~G`fOrG|c7ANgi)(z>&Ekug8Ir*$rUjT0WH8O$EjxbHULkmV&T{?*(
zmpBX*R)Yib(a2i5EQb8~#I-TBNPMA$o#_G0p!I3{e|@$P3|(Ja<?a@2cN1Ob%~FMI
za(@zh!;~wMpj$ov#4&FRZcZXKBrEi2<$=Nss6QNA@k`2c)YuIKGyq!XliZzAgI)wM
zbrvB?!K#`w-aO?s7CGeNdBfaE@C4tLnJeBI{wjDxf!cg$Z$;1j!*Ooeg!@1}!^+e8
zwZ;$A)M4OR60`>X(nM2gieCV|z3*~cO8rvuMD5YeU7Zr<&Cw%G@*ZDe7y{w{k2h|S
z`bbOjE0cA%76UV6Sm;j(_YtGK-x9pVZ*8*rUB$?R?aFU^Fs0lzjmr|pZu>EekRl9@
z2j{2WD6UNrp7obmHqIt4*df}JMc#|7HP{YHk%mQEE$=3^KJ@qWV7a4e3Z6jtbjx&|
z4jAQtdyn>`-1U@^wf>b|gia(WDBy%^LC@>T<e8wIO#vc-e918@v7nfea@{pzEfjtt
zjS`h5;II+C9g6#%N@K-7RtLV8C7^k}a6X^H52CF40<L5`^T9CrEP|g8cXMR;lYv#I
zx00n<sTFs@*d{f4B8OMN&ed9pIb=DC@~F$(XkV{Nr@em26KD3K@F%2}(A*wEvu(>q
zb1{}Xjag3k%-I%V41RvVbSW<*oLAXQH{aWn%^aCl%`LpnBPg`9$%lJiveLlo9}qGr
zB>mZ+tapCwV1pYDT%$4atO^40+686z$xT=8hLd9&T(DgZCL3SZfisBvh6xRise#av
z!lY0ZFSTLpgb@N~H>mo*C7_eCG;H;1x<3uG$BY4<yug||f4(h1rAIx8tk`Q&iVOsu
z9dcEnd@BdK)+1*C-q#J#)VjlzF>lz9n9PLo`_8t3$Pqc~&U7Iv-T{7h-&?fACen0d
z9qFicR2l|ee|GMRmaUYBIR`E}BLrzH6ci*4Vi-F$+7Q$yhOm3^t2(tDCM@3dcs1S@
ze&)9cnpe^J(FqspG8SyK>i=s%CSMT8H)2%PB|3~}zzOWVO)RuCCWe(!4X1>#I}vd0
z^0#lFdg)YC0+IOZ5tc!!VSvDDB^%yjPU+r=nmqR~3Y9((9wf9gF3$eJXObT9sVkm0
z<r~HxUKIV~p+Lc~9D1)}P}sr9Umn6+BOb*RuG5Q>MT9{^GwS?v4l}HZjrL#pqO~jm
z^A%I4UZ8vDR%xPLakphpskTcktL2XQJC-kb_G~gb>=BFq*SZ=GSO#N*$TnCj6dyRj
z6{+zdI?y{}Av(L={%hrK>Iu@Btn^SP^|n)LfcDKWZnl{gjElf^*-M+M^KWKav8Z^z
z2@i5mI7cm&SK3<_kDAw!7}9fGS$ICxycFDXm6}8bCfx!@W*G@Mlxn+3gEp{g>Bdet
z+>V+r=D&ITYr!S;(?NS<-GGYn#hHJ6Aa&-kXL3-_v>hn~xqLbNUfCg%Z+2oGDViE_
zJd~0BTL4@Y_j@SpA3zf%<|l@bM(_)Bw*=1qOB#V$d7{?CazAe{MzG+o>!{cGfw*74
zl9Ugl9S&;|6Yy0$3)yDoGfUC=Cdl*7g{@>#XyBiRbYHE4NT~XjBQ(x}*l@fhb|Efh
z#iC<-3xuIAX;82(W{NiKT>%O)rMLk|6R|;yQU1q$%AkWqj(}r!mH~)vCr@-A8q1c1
zc5mx{z~%Y!51<&VU-2OayeLpcY7#wmQ|)F*cjW5r7UT)#IfP>U#b;4@Ii9CszJ=go
zkxh2%XTimVHw@gaKLa|^6t**?DA_v?$n?w}3&W1oi|gnWiuatbW8+2)HB+)%vjd*o
zmLos;^?5#--?J}^WZ@}K2*K62K`4yEfU<ADk~LU~>{cHhDWF}hU!gLr{yK*V=w){4
zr}ifCs5D@j1X=c4V$8`f4^)L}E#Vfnc#m=X_ul;76|P1O>;FUATL#y$EbW?WiJ6(1
znI(&vSr#)hv&GEJj22qVY%w!4S!l5=mag_bd&l`==FY^On1~fCs;jcH`&ai<Z)IhA
z?Z+<~CJhv8MqdnJb@Psviz4!@$F3Y;<sLI!YKwG2)+&T<B?fePyoG&@Cs+F7q5evX
zvA>3^iXNq22^GI=J`KBSw{vI6NTN<4FIf-V;D2P4^f8cj*j9=hxq}QC1GntRN}Bdj
z>D~3871MAp+%l}@(E}rc!(=#g>$o)ec|yVN_k=6IwO@!p^=*1(oo{peBV)~z&4>|%
zVr1}Xs!t%6dR-^}mcM0(RINpATxpSpw3K>5bsK^=s4YuqHW4p?AU5|8_{=8pV8(#N
z_cUzA*(gUj)Om4^2y3fP>XjAB9sRdF$$w$jmS-;bZ*u<Z`mzJS-T4=Uje(y9K43I*
z0jt0~h8jbvaO75c!C?uIt4{;a&q5;rWnk{{-^!N`A6cslW8?r{?>}?FW-1K)|Mdg<
zKYad8*#y+I;F=Sw6hZ)y2?Aj{l|c&v=#srpdswPZuR_4w)BmX{0iFNr=)X_>|BUOR
zpGqZ^n^5M(f5{x;?UT$=%P3vQiC@ia_bcnKz2sJZ>rn<{;DEpMvvRV&a=4$x=F4)&
zfKz>>Kx(ZeGFWU=LKu*vnJuHlh=bmT5q?v4MMq)k8(`!k!2aHw5&+T+nHlXHD$eth
z?r|eFJHdVoih9)YXVw7Hmsw3i)wlN&@+ss|iRM~}J80WhxM1NquVNCOuk|NlvC^oN
zRco#;>*1v7*;c0HMr}7j6rUAM@V60$%4<`Z(VK{Cixq=KU2j;55=_YP4&R2i{Z}_f
z5o?=ZwJCClJb&r*V%<mXO0`+IjU$yLgGY5intc|su)z;l`Cudh2?ruORabXk64h15
zRt5prJ>mQ??BRi7Ip$?57`IM&2KEJn8s5mZ3TD4BO7{iWhKGi{BvDTo%(VS`b_5M3
zYH=A~lT&k!jcRJr72vuQCxK=(;3|VI&}uuSl5jn9+-S>BUW{bV`o^{juSyKi56=*L
z`csCdTN&%l@A<MzCtb{M=$Mego|qC#j)hfT*Io=N=2QaLm92OJEZOm(CenC3pKB3p
zdpj2kx*giHqSLS2_S$lvEAorzP;Ijb{mWGp9*}1_0IUN7LMauU^;bz=eTLT7?VySG
z$JkMzAUJ$`w2oZ44kteq0MC?hXX`X&yC<+DH?Xa!6opBGsYINj%qGeL`-!HZ8jVoi
z3sWM~R&8jId?D~4l*BncP0rjAu4SnjG?&Ks4g#TzF9;;6apv+v!NDvMS!}f%bBJKm
zNTz0}Sd>7*8}ED5#029Ru`Dy>I#vr))Z%UnX?{{6^4(ln=cUIrVB9Kq5h}&r_(yzq
zsIU0CT&@H+xQiFG2Qsu`ru165;lUlTOw6O77aNoO6KYwp%ZJ;q-!pqcu{Myou;6*t
zUzwUwICWMv5vkr7e_UFzDWKu&23kc)a_Ri`mMLlFipW2k2zq4C>+jp4j>T;1a4{(j
zPEu$nb5j3P%sP5i2Br2W_y#dp1PaHeQZYApz};aH-PMLR(GY2`VrD7dv#vlv%dDkI
zp<t4L7R;zaGV5XYx=d!@CTk5hK>sa02;0G^1}npzPs5*Q&{}BA+vDYgdfVlTv&fy-
z!n<*J3jQC5Z^`;*4^_OBlzndnH7HJzmIDD_kV!DkGB@}Wt@M__L*N?AbcELs8^9Ad
z8GFvl_kOcz*DG<BI7K+~yPW7IMUpkUwCGI|j!lfRHRF|qsOg!08Rm&*!hF(-`C*20
z)6<CW8lhK1g=TT-!HFy0lk~H`&s{JX7YVtmx$YaKSx<N@vauGKKsgkqvmu!THv^oO
zc3OGC!D<MGojLLm@K$m+MEsO5d-_|<{&eA6J=csuJ!Pn&K|%i=kC()(cfOA@O2JNO
z6(2gKg||v#AC?HY&Wt}F7KB`=3Zom9+WhJZlCAsZ(r#_Shau?vA?%|ztG}`oB-<-A
z=-JIZREY*69MmaFm89yc_=TOT0`Hw0N6Nqt9n9jk83V|{)0+~lTXUlC+w_xPa7^Aa
zWNB;%^>FqKA>ywSU~X4q7|%&oLI~ScR_-ysD%nEif>MAP?J|#3NKWq>HrH^dM!4Nm
zzwNB5S77J$SLe6V!Qv8|J>IagnzA#3i^4ZSk?Nu%eJ8n)luwC^qRYx<DQY+2N3_#^
zqM?>V=EseDeG2Cicm3`EyOhu<q(2eCc)Yfsl`Fbah1Xm(^6hP}^u0BgA<?4HN%CnF
zX=ME!9R<#jpge!dDM7rg2VkcI_)32J9Al<JA-WH3Rh-ldf3)EYw7IS!`StA-4|`AN
z#THom9YXrMjCXm=2;rYor{OgX0XnDNQd1=smoVdtIZZUSUrO0Va=k|uDvw2C(T}{k
zHdo1d0T&fx#qv^C;U{oz16(`avWNi%D<9w7%|T%a2MdkBpbiYf2FAY0h62%+GzlkQ
zSV{^WQvt{wtt{@?9<T(wHu11&!99<JEebGOb+NB}qoe|iXhm5k6ej2X)hNAcivjNN
zZuRncr&j*tV0@LG4TYux*ltK6gdWZDU<YR5v>icK_@Pjh3Zer=8$H71qX4Qj)VM4E
zN*L6G22`edO3*OuSxNzfWZsw`u*rHDk0)jiHSbcYxnfe%<C3>hjY0P1^R!OYD{S=D
zXRw3O(iuZM*T!SwA`HYbgzN_z-~;J7LUd!t&XVpNEMuTTt~D}!EiuQpoZfti8@{3=
zDOdHE6)pluFPc#_yPmk;$vypg#cm6*Ezc|;Q_!^3+u08mv*tNjS|LH5EoL^7tZc4t
zrC7a;*?s}*7?k^Eg!}`k;2`JK2@zZ?{2sY%5@QKmiC9^97uRRUr+m6(9}Or~YKwtk
zc))#IPXl~+^J5TAP)`C0o?{G#+OpyEVN)|29N?2)QHx*_T1TNYGl7Ql4igDRhCscH
zyuotyj%T_8BoJ294O3i-Rd8W2*j%ozjmFDQ<*`^~_$1KkoC8{LTM(E?7pBw2-oW+2
z6T$4n2Whb*M#*JiK))e%rUD;1_q0Bc>8NUQoLN?$UYrKMurF$|#BE#N<N^9E-d-)I
z;;oPQM_=Ysj(vL;MXFGnYMg_@x&>4TAx^WLFaWj457bRV%mfCo&rwKZU9{3e_w^?q
zZ=ce1p-h@-<)3WqyZhn<uxb2b^9&pghf=qoOr*`&@I7&=eBqVUUx44SuXJA}#_GL<
zS_CZYHr(E4d9@|=ShmMGA5P}f-I#*sFY->XY2i1iXJV-9@}N0Uj_a=W8_W^t336?}
zySWC}-ATeM^M8XI{q2}ZxF`{40TL&HbKXF8)>B#U%HsqPJ3kT%n?zA)=L`w=Ely-q
zYl?UX<{oFqlswN%vuhu4$OG=Sf5BLzeh2dLjVV(I*hpjei7%x>d2pYQr4Imp0}0;F
z&+IP4dWFA~<0~d4yO2u@haxB=qI6GNQv;y2ohdpPw-e>uNS83g&c@><omN^S{M-Su
z&BOoz2mS!iI{^A@WOddiHC%p{B~TUZE8ELp52A~4c>H%L&SM`K)6S2G%;>R^SkNrz
z<Tu<!fCqwlZe2u;!|l_Q!<#6tz(dC}Y#EHqs(-=2R5NwW5pqVE$0ufi0{H)WQej{o
z{okMkmg*!-+x!2Gvi>45+fNM?R$M5H<-eo_rEm%G7uC+}cp0vB5N16+N+IW<W3=FX
zgWE%15>ld;43Q(`ro#unKYYE8E*5ZaVWOh&*<>?`=_WbTCw;-Py>Z;qNzjLF8Vgdi
zr_nu<A3{`o*wx2+rawZ#Go-iSuPeni6U4$<1_7Xt<iW2idG5#WN%W@ar@yB*o>bjp
zIH%EcrB7L&U!GM9tYvbzvA~HcEyJ}$Cn4aM!mXvVE15e_bHA8u5#hC0eTMrocHLso
z$G!awr4*pcZ_;`Rke6G`Ov_g@qr8o#fSP56fCb<t@)>yJmVZ|2{K;LYA*`#fhiL#Z
z_-rNmm>lrEZ<nbT!7oRvao&%9cWw^I5c-q!i=*`LYxo;a6u5Qk6jWUZb;GcS9~|Kj
z6$@wq0<+S|rDx4N&X{^X5jzm`LtnXU2kB`Ff{SFT)w@ca4`M37I?vKRF&$xla~BH}
zfgpxH^@Dv58}EA5OUYlFeS+D7_sG-}e7i!B)1Iw8t|9qpC5n`j37_pZSAwDLVj$|1
z){yOvZQ^b=5C;3oNQ)i60m%my5~0uTp~9FwL43z%5@KBssIOBfPMn&*$_^QvH+EHs
zJbG86rxNH;RWp@BKY6E+5YcK!=zx5sq*gTnlDkLCzK-7<Fa!%J>cNu7507hVBnOX)
zn%tEGBdTg;UPD=uiT#~|_W7P-v1cuxxC9c=Iv#L5-bV)$o1{@a*Dmuo80I^tll_|9
z?2AcI6BM6uk3l0Y(M_dn_vIyYoC+QOaO~$TeRobLIfy+)I?Ce|jjp=MK;Ltod593;
zj|(vhJRWYI97V23P?4uXO*w<=5qn~0Jh|7P+(YNZA-TbMQPq;AJEg=aE!WDH<ou?<
zephMiw+6ge#E3<{;oEdJE-O^#9?~$(OU^OaQL)^4AAVJswVy%_UaD9srE`#NBYqFF
z@=q5ZF$_IJ7UmtPzZpJeaVgQ-Buef%4#Cdqkw!es@kHnM(LtpmBBWSx%TKtj{No%K
zP4*6fN0eCs&o2Ge3tzZO`fdg3UAM;hBMX!g_%jASe#<DB^b1HUC=3=6YF>74{Un&7
zv-J-BDNFpl@aiNi8yiWeCJ=?*5QCiMl!|JCV{P>WWq9yLElycZbQ?}rK`Wq5at^Mg
zmvOl)UKvVI%X@OD`-nDMAEelsYmd7;ez80&NAm<Q>tovM$h^8Oy`A2XLYI)fIV__C
zeuG=9x|{2@@h4usyzW7KxkeXxqE8XjmVjy@0#Re5nqG1O!bj=@N-5>yB%bIU#^rnh
z9}KheAl;=<Bv}~QBcXu#_k~OR4mXN|^?{mTQN<+Vtq%$RR?p!Of)pi=d{^qy#{9Gp
zpp&+@nZ+m=mgJ2Q)pq%3$dd!NGj?$!`wo(uF5d_D^v+W{3t0W3oy|&I*@WWW?<nf8
zqkFgt1NkPP;_jRZc_Wyz+!m5|d*EdvWGob_Fy8`7u0!o=>ut5^L$e6?YZ%sNj^A*Z
zts!u#(Tx=%_tMTT%N=MaSkO81NQQR6QP6^y<(KOmD50&~MD~<#TdC6<y>$AdXfjiz
z6wet9Bh<I(x#4l@Q?+^m2EdnZQBYu<n=^Ty7J65x*QX|iv@ViTO@;AI>1Np^%D8Y=
zDz?P%kd^&)e+;UZB=t5Rl+w#9xpp~VgtrqT+CW>C-&D-Na5YHPo++IK2mTQUYv12<
zXP4JcLr)7VgCY@{MX@5|+=C2IwH5=flBW*~Il&4+?p_bl$sBTTP%1Z~F1T#jQKhu@
zKpPhP>UXaVI<O+zoyJi4%hLT~@=mt2$|%J-u~DCNNGAIy7hg+XlvatJM=z~N%;S%z
zt{;Eym;@LYTbo0YHIsw!w8IdQraM}&x8d>+Lnqd+#gjkEsw6JTw%s}fn%AFFpS~W#
zvd&5$j9HuBKYsgp#s6ay{Gg8APONbo^9}qkfo{zU;aJF}?TlQ_t$<1GGO@d##;}tD
zQA*C^CSTa=Ua_&7sAY3acrM`JP7nrYB~jg}<E}8o+bPJfOWvn;jIY<d>I@*)9v$+J
z3aSb8FsPdrl0ndjkbu9N<&ODCLDAfyu$LihuhEQ5W$k=Q&#F-ZdlpV1WBxuCjev*_
zOF-N^c>S|34I;ygFDUYcVt#njMr-kXlyhyyWNYi1{-WborfMye39W_Aca<HM5X~aO
zS2xNKiO{+3?Lg%H4d<owwS{Mz0?5U#Zo4l%oMH3RGyrWG3VJR5jglQ~F4gpr!-*CD
zd88`I=3s`rl<1wdaEh<84m4jvGK%&hR42DVnc;>XEb55W72h#twi|HZ9nPnWUf?l3
zg9%M`gsBSIIIZ(gKghm*(+HFYw?=(-8FXBdZj8Q=>ecuac;kSlM9=>tXml~vIzjvB
zkibmJ58-ETbx*Bw&FYBeda+J6$)dIdC|W^a+Pn1orO=fc!OC0WqBw58%#ie2Qd$|4
zDq_FZmavD^pVi)yd)=1vDO7_80-mOGjQkdmshP=&sF~DcE*?dUV_AVed3?Qz>a*ya
zARUgJ9ivk)`;xO=yjH1##z_9@hOnpWUON4BzhEWJuC6kyJM|Nlkd~@ltOX!NL4zRh
zL3$ima1k24i}{frjh4S}1tF#HNhC#yaruxOcA`6RxoXd$_%_G*Z|lAHRRlle^YoPo
z81?B_rqG^I&)r_qEy`@-njVrP+&N30+EEZj!yA-kLPBX%zS%HcpCi<43L!5BW_LCQ
z!4YHjEIEl+GC}HE6?@h|l*eII1NBh#>o_t4I{F!U7tvIsxeH6K#EJ)~wo}8_WMO{{
zZzH_jKjTO7&J_di<9E8hf3MmbLLJ6gdDyafWz(0=S}-0_6fPlxzy;#<uzB^H!$W*&
z>8yb2S%sbBq+M*!syYY&UuTxY620!jN}Zg3z)mwUWbr(&3k?Qg09XnF%a~@V|LnqB
zvo`M8wW>{C$o3iB`GZhD(-d`)eN|kF$x9}XvaZ~%S1r6fy)coWYP@t9{pP(w^nigP
zsG}IdH}o;T1R~D&M*wny;W8TR!|E61^C5TNsOsvb-W_`~Y0U&Fl3Rk<hpdOu_)$<@
z*(_C<NoaB$r<Os<x{&X}(s`WupMc&B*T_Dq<)7-waP^pMN~ng5PJ7tZ>KU!Hl-i_S
zr6Q~&*h%Q0JDR}@!MT7NUhVMWuSeHkIwgoEwtl=6^O;VDfLOlC7mjK0kI@R0>*4s&
z=RR|L#ZAYBi852~YTKP;x!h&2rZwlld0R2@X9~iTJ~%@<L0o{}ljJu8c2|3-ag}rC
zP^a^U<mBwY!hY9HGT;;!)y>chfE%|{Xb9AnJr8m~G$hs>E7i>gb>w6({VJ=Hq*8sW
z7$8$L66aPyAQRyWZ~pcZL1C!cb?HgvnqM}GOTvHT9$u!CQ8Ga92gO4@2J!+cwttD4
zLm&WYjBWW3+o^F12p11cz9cAN>>s*wyY!8vOHj5l)Uu|_R1`)md?TsTjMuxaUHV<m
zJxKmHjLa5jU2OowvrA)t4?A++%{MOyBoz-R7FNm4BZb6KiQyFV<ws^ehRX~)y~5@=
z*>bc)5|J4KDlf-{{Z}Tw<Z~w(p@Z0pPA2}PDVZ|6m`;gI;sBg%-5^o_`iGAou-7_>
z1VG-cG|)u0e>)@JZpW)3wgj;QIapyVFw-6Zf7(e%`5iAVXULDpX%Pi|KwxZ-=!;~w
zqk5S^=baAb%^dM@`UYE>jBw9tXUqb~6SEC6f)oC98RJKhf18^d(XB+S?8U=n`gqdN
z&dDGDo3azD>K4yxo(%6!Sy-3v;n7lz4?_L2#TC0%U^LBsjV9DEi9l!%GQUqM|CDF*
z6#tQDfz*Jz5YbOa|BP4I`WMUv1^;dRD}EXSfY_ker`*Kp)hWF@L5tD<8sz`wPX?H0
z|Cc=b>BKt7#0rR;O}hgCAfuFlv?EC@0BAmKKmjO$fBi$A8T>o-^P=ppHZX+xE9XC*
z#D6Upgn)UD|LU?}F6n;_k^b%Cv+;lOgM0)4pznpU-2S^-fY(X_-UgS%XUL7LD4E<O
zVfeNT%TpfzDYc{W8#0b&+>^PS+I-Bo&qPJGDB_@GdlA-Dp1g$a>Rmn!GzNEk!@Ao0
za(7xpK<(bNABHTw?Jnt~Ly}eKrjCK+)@5s9RH5UO9DtUx%|OmCCDiYMr&P0Wu%RSO
zjH!<XZ|RshHcIg02SY%N_u+9{om%{J;q1=l;7$I?YJ+}^<s3EM0TGB-%WsX^E$lfK
zd;LM$nP{UZldo9j2FB*?$kQ&rqjozByJ{qaVqpdk_@NuFGD#)3bCWH9@0gg=Li&ck
z9aPe79BgQPgGRWF<DmPYB7z`eBagKvj7C6qCB*J4HaTQsff{=ijq3<XN0O8&w6Hjg
z?%*BZn{h<Pr8d4F&oPr(w<25SKoaf>ic&6$Dr%YO31L06WOu`pV#6u@1kxpKH=kZ;
z*<VrA`ayv*Nej)Ar(a(}G~5v!=_Xi@h=H`oaY52jG@Phi&gj6IBrXk$0i+sBBK?u<
zcWf`)ZZ-$Jyo%(DY!Oy7)q6Qlw~c~=Q<W$zq6>Evo5Li3&IK%J4ASYZtR2t~&9v}a
z_GcH=9e<-?31|xvLCpE}-c$*H2Ti8i*ACV|{uN3)ngcUgL)Tjoys_?Sfs`ynXC$3u
zpH#7tJt4CP$G5Ivn@XP$;Z^s!kAucfyZ(+A%8sZ7{X5;3XDVIlFORPG2)%hp+U8Ib
z`s)X8=B`)doNdvYJ>t(IVZ+a3WQ24d#F_<1U<AYg`^y(UyamtQ`Mz*8n9g#ng_r|`
z(4lW<KoSf%g^x&Kz><o^CMAEzS|{JzVsK*J%~<E=uCDurrsYa<g`l^V#<HP9goetI
z0kZi;Mi+*|p@JS6buxZbm9WR1eEFL58k{i@5hOK!CRLbndO{sqPK4$p_bhMaaz8a#
z6>;cCAnBvGU$0rY=(m3&6=)|SS>WKhzWnQX;rwHBHPErO6jG;lDw&zPZfwM(qP`=%
z{i(L#DHx@&#4h<_&_(rW%Ucv>9QkRpaU_6IIE?aANw+t{NY~+b<<Az4{3xfCio#7S
zL**>ds>(%_v`Zgc>bDl?Q-PdP{4^oQH%r?`!wFJMrgL;=ncs0Y?u)eWO%EGVM`A+f
zU8#u2Cl1^pi$jr>Pd$$Aauf=Ac*eY9Umf$pAXcW`W6jmi#Xryax_{H&xvN9TT?|L0
zQipuY?jRDSs}dTt4V^XA8m=m(I+X$bK*eo<UDq@cS}h~);A$gm%HBS;L#ymCZJ8U^
zc-ei~a3PR=$a%L#B2rl^Ob^Vzb07}8s+#R}&M{P1)|sxqk<`N9p0Ug>XUh{+M)x4?
zeb?`K*LO?CZ1l+Qq*#PBM}n%P_%(uXa^<>3<BhI2*u>Ev_i@VI@kD;SdOj@!?%o`~
zPC8d|<&w(<*3MKg5eX+{EB#hU%x$yA(W#~us-ql%I&)QN&1)t?g*`SV$zd7>T1@Ii
zGp*9R+LezZla*Xp_b|pxU(2F05%;@X2Ei!<xMIcF1)EK3i((v>Yld+?tU#sSSq_lT
zV50F{s0Zs5_M?96m}%v5swr-4O=SLA_97RHkh1L;)t-o{HfsYm^rT2TH2Nrgus)b5
z>p|bE!zXkhw2f3hJbdJRk$t22T2Gq9o&k+8sa<7aWs$NU4~5P>&Ol}SUd#d~IAGKu
z;V1Okx_J#Tnfuy2SsfB^d&`^NC6GW`Hlu6DnWK8euxd7+uGUz3j6_=F!K(L=yM6)-
z8t|2LxZlP$>?kl?Gae^gg_k%8V?;Jewmpp~?<3wuuU~(e0^(1R6IX8%xAUyW8);8q
z0x6`uhyTn+>h1i@F+?%ZmB8R^mcrndlDR3(Jy3BW1qc5K+J@ouJ>|7{A(^Bdi8b}W
zLG{`nHQveEBa;VFDr#&K*u}!P(3A$Bhd=9&jE4xp*-XPLswdgrxI{42!h(QwD-vYg
zqQWbmnF9EHOqNM9CIt56MGz3r&NRj2?FMi1JhMkb6pq~+?0sPrOPu)ONzP<y(&ZoM
z>$qXpjXzH}!=v0(D>I$652N37zv^r8l!uw^3QgOvz(%y`)%z(s)L?L{Fpmnf+}=8b
zhxfeThBL^sfRDuf`f728v4cd?q3ePK<&bx1_T_@!)e6&S!J<*1JR$h;_A$h@4R}P-
zT-GK&=svVTTh<#lvhZt;)n;-{N-FrQ-SJXE8l~5TlAisSD;SiqF#k9~8}yp=ExStg
z%2Emq3C+NOAn8fNED(r@5Xv0#@*S#-ospkn$AvWhVu^~$Fx|!28y(uLqfFO5Ml2CD
zgH`x|CNXb-g)j91^BZT7>{DL0cN*1nYQ?(1p&Y7@m2!-Lzt@I-=$X#$y?m?2u{TAD
zDM2bWVm_g8e`KdB2rj-TDFS6jsYnuM?>c8OIfu!q;xEGd9md{sDo_1zcdeN5u<098
ztBL*_Ds{OL8F&WXA*h)3(VU9N{46O`C=$>~*ZM3#CYe-du+yl~F|P7!zj-$Zs$Ztd
zD8``6Gp1hi*sOJdd*f<Ule&I2=4Qb~^aJ7w5-~GSy$zv<0-;b3&-R;v4oG0Zn^k(A
zsFgr{8imyfooTWOUq;)=O&e^ymOu3eDYqx?*A<z`#IHfaRYMQoD;4<A(3a*KtVq5*
z8POvPaDg@_>Is^}&_)YpQ~so_HFDNYV3~A5iBEPkwOwklVi&mg-L^KDVj6=>IIYbL
zgLHw|IUNhfQxJKZ+D$)FNZ#vj#lRXpzb<;_8Fj}g&^wTNR+f5a?ljDPAKeY2c#k#$
z2N_XTo5P&0Lg0)CPr@N!>f5xYjxt@H=6#P6z|(;*9Ylrq3?occ2Yc(IIo=}DZ+s2Q
z^5t(?q9@$2p+=IQ8NZxWJN(+8X%1fk^0RZJ#!R2GQoC%v7@oEjqjl;#;;$BDt3fb7
zr*TNAk$bz7NL^8vq16}>rhB~aS)``Dg+?)~2S+Ak7Iy6P;!e^fP2pt~!3UV34I<{n
zB@@=)Hq+D)^4Jm{-?>mIFSwPv0|_dWm#oR9Q&SdiqkIE}x84#D^6zl`CXf`m)D(f@
zzdOXUSpBbHI!Q_w!V!{-X+sjzxHY7Oeqx*UdV0>^De(kv8Fenjr7&J3({*=|!t6Ok
z6Ef@Y=eaZW69@=1Y5OJtVJPp&Vwkg<TG|;+m^GF~>1;1*w|quXqYJ0j#`)HeV%+FE
z#oXJxUVq=egSCkW-Y@-lnf17a?q=k*u10f3q&mw%C>$FS9(yJ}Sz%iiM;}Hd_0X>^
z(^t~q*PGsAYZ}NW*Ca0M{3gl<y%bqZcjZ+6tWJ3K8*+{pxvSHcv<h)4UqnIM2IA+W
za$1>!zN$n~gk>)^cx<q1&Cio1)KbXBplWtRe<0*1J*o-iCI1b#KpE)IUH<UQbPoVY
zJ`5EgLDnAtSNj=+i}Vjgis0{jO3MJ~nCd)_E+PO}vAAFpUOdZuVG7zttsxfA0XX$P
zmLQa$j>Uj^4gXN?Ula-v|2YUk^1mliP_V!Hc~t$0h`<?h;p#qb^f$YLBz-y(0OmFQ
z%eVh$MEjq~|M>@g#wtTE3uU$cmu}&3^1`WhpshJ%AhyRgvbMF@R?oV&=IE04z7QLH
zaKt7?To=E<n+OCEPk@ag<K@)`GrGcvc3oJLNUMUW$5T<sDwy$wXbiY?r$kr^)iy?%
z`JuIEH9^7I(kB>-Y5>?Q-!5ab3i4_*KBO6(Diua+@ub-w3eg=+FGqRqxCabfn6~9U
zSD!3)*^rTo=W(b_!4)4aAm`;d%?&D7Zp~E%64?Z?b{wQ%0tz;g7_TLyd(B*v{UeDc
z;`Y|OC=L?F>BmsPCS^f+p%HK}RES8K2}e4-|G3)~fba74T;28R(CJdz4XtgXMAx`&
zsdsdB&fd;&I>iYsx&$P<HIh*=IeKhEYnmKsU||zMjl0&HrA~B5`-2huV1MLkr_MGy
zC2*{W<$sj@qauO@&V#vE(Jva+P;u-h?9kODuTC7TGGta<HVcibDK(qyj~_x67Y+83
zfMBnhm=!wBb^39AyX2N3&KWZSiS(ka-N`SmRGyKLqK^)5YI*nrrdvCqO;;@#rRG6!
zcbgfAvDp#-F@#|Jt3|~)`Kq&fyq4O1fKoHO9j<dv-nZW*`Pq~iE~cxuCK6m&(8tv9
z<9*PxUpk*h`Z~u`Zn>20whdC-O<*kM5@dpOHCp(^)A(H?+83Uv6vwhh2=9&@@tLRp
z2VzMECTHP!JiBFn;SN;Vd%9aDn319Ml=vv0s@|WgBSHT$R|UH8p&7vAX9!`%HtDJ<
zmel?^C2KiG?b3JCA$5RW6{1(g>5@GT=;ryGodGi6Kx@yrv;5)i`$ZvYDu~cwm`ZHr
zc1sf3jQ|m-(W>cuwJjIa6g@VGft2Q%1LTc2k=vj#lu!4t{L^)>5cBe|3WuuFq#azO
ztB@X`x#zkl>tWHCu2ubD=;jzz>B`pCrz<GMDi54$5i7r9&h$@71yHU~Buv2lIJncq
zq{b|nNNklhy6^S6gnE?H8MXgi(&nzAVW{)2dJhvU=R5p>8ORayFS>!viu9igguYSM
zYg72I1bCPnf*q+Xg93Tpg#j*vI_*5baC^0tEJxOal&|GcS+jk{Xl^V!E^l=f?p>eT
zC|qB{95GT??o#Qb4_0L|=A7+)ddHz*LM6iS(|{vSFLHF5z5CRjd6xwE0==vc7bxA^
ze`b6)y|rdH=O|E!svF^}Gr|Pu__-`Ss9SuEN#fG%gX!b?sWW*g#L_26%pL)d+np-4
zW_ImPi`O#zMy`ux>|ry18Ugmf6jS-jM#5)E`>TdV!%pVE`D;Ufjd+o~EfCkbqYN+N
zS~Pe(at@B5UnRm5IcU9s>;Yhg?scDW8Dcp^cfb2uC^%3JnMs5nbTB$~m2H;DzW93b
zGV)WE`1l}f{}K{&2rhC!+E7*nz8m}mIeBL(?oX{T@17@tJtbS-z?V&~P?5|&M_i~i
zLLWYnsr!k^#0}#P&DUS7s)SadC)tVM1RG?cWVh|)p2*5U_DXt4SGXVUELeSH(D9Rn
zU8d|pyLQPQHSp1xU6o@Tkx+Jz&+KTDh*AB=AH@J7umpb8N<BMeO*5XmVJ;y)zpZ&%
z3Ja}SV@UHB(5my?6nUTm|GV+`bl-vxY2FiXun4&XsxWxxx>3I_H{5i%TB9$*DFeA-
zXlaJtA^Mf~Vks<pBr@!Zv`P#!ppT@i;4;NUjaY}Ca2(G#tVTp%%O4xy4UkOly5)*0
z=@7lxZFJKbsXy}~o`_#$J$a|Afh+`DOh!KOXQHK(<M$eEA67Y#_hWmEseIcW7t=3P
z1|ooDryc=qO9I(<Pvp-oDHh62jT`N#@`kOE2iJj3^F-K!!@K8MEj}M+s^E=d5=B=e
zi9!4uHcM<0xk4_?ur)f#Ua>hzzCEV;bB!Bc-s46NodMmz8Y}Fcj33!auR9xwgjs~V
z#G0yzq5{9IMOS2)cs{tJJAR)WuzN!1!kK)1o?p@qD%$CVoIf&&Te7GCp2m{vf)L-M
zemeQ7D8=%meGBxn0lOFvS^B6`^=0I60cX|N2W_N4R1Xrcc-OIgXM$J5ac{av(a}6}
zr~d9}ozDjz*V4`XRAk4Nj;iK{3_G?gYmimgzGQ+r-o5<H?KiR{vSSlB->KPIMN&Vk
zY!=u4_S(27wC=Hb+R|v8M@0}NI6~Wi9O^X{F7>WLRj+n$40CVvT{58Igtsg*fuXyg
zuWGa;={m3+<@*?IsCZc>JB;J-iX)q<hD#{A23Z7vR-Um(YIgmKk?oPeuAglK88(L{
zeqYTkJ7VUkB|eg_yfb&}qt%IrD{yQkg=W@#t$wfhg1eE_ne#WM;4dN#D&04=^2>8!
zma9YrNh{fsYEoyyDM<vcl0Ui~3v%&XOf^o##b1i~cb=;SE9f5k4vK?Ov@buPp0X9e
z-<7&qET=fzRPlyhT3ZlFBI?tWeP_3EQ*h^=3hM?Ng`}5xp0UElH@_|Cd_Z8b58rTD
zJBcrw(^~l%A}0t31Ga)u+BF%G#K`D>c)NK51R&lz8g$+l6yF6;<{%G@e(6lk;khn4
zbtrHa5aaRh_x<wMIf_~~85FA5DDB<e4kv~&Yp@jizF!+!5JVD!DXIJ0*6gxkXK+)4
zMD?hCB-pgi^scSh*0ex%06THCjo?i#HHVJjMgLar%dkXW;lcK<M*UbNv!K+UF4dzj
z8+TD?v1WC68H`X{-Nvs71EF6sC3pVp%s$AbbI_;6d(aqdEQJsR#e2(}6ER%DQn<!$
z-eDRgTaAKXfmivaEmHOlWtoviXs}FUe_i8Ts6i$=!5zJJs$(p5#mrg=tLc&DQ)4aM
zK}JR;f%-|Z-R&~+K;#Yq4Sm*2Wl#v&V}35#Lm$EO1j})U>=bcNR_wsjgF|M7=W0p8
zJRJ39n%vW^_$t|Bb2++b)HgPEyvphKV4Y7mUNW()GggsbB<zFvQ3r@hpBX7Kg8|&J
z;4T+I$hc6Ko$&5@v-i&vA+6C?e)mLBjf%k-;)G5Ph=fpAi`9>_dRhaEGfrQ+DNI>`
z=`gbbf4qJ<5U*iBlxqD+z+|Guev?v^AbE~wF-$Tlm6_a_XiqR)IDCwcjXvy8e5nid
z_s}5lSmg06f!-HKwmyP=ro-8YGAp}$XL`ogG|0WoJzIfp4G(%n8C5Zy8`QT^lqOM}
zXOS?jCSG-0-->)WLV|FojtTH3<M<?cP{l4F;5k+3$oL)A?MJC`Rv_f!Q?zeWgHzhl
zv+ht7;n7Rdbll@_(O|JQb$^PTR6_US+LhO`JZD2Otmn6`e22Ur%KBn*9~JxxsuY~C
z5JTFKO^9`4B6pSQ%p=x>HpA_qR!CoB1!%UOk011J%(~I7Kj~0jC~xK8*jXw$#WfD=
z{qBWNHMMsQ0Lk^gq0K6+D*#>J7leG!GM3jVfS(osK>CFwg!pe$sLvSyL15m)Ki~?2
z^Is2WME`C7Pr&@YwviqG!>mvL|Ckj#P$=v5Kg^0IOZowTuSfzSm26biwS~%T>C2-O
z4OC{Hn8$4VxIw_hnX^2-_ddI|^!5HWlJzGX>qr_3DRT8=Cy^lg8@sU_G~=Jc*3i3_
zzBN@U0b6%WUGR31d{(Ryp#?xg-QWbGrMmaCS8P$*oIXp?l|ppkb`9ea1~!^hGzn4z
zhL1n{ukSP*?oEwWjak%G;$ltLP7?%gb5bn&9r#GTq@^$qoNRq;u8u>ePz)q|>crxa
zd<LV-O$xcobdd4J19~dY{`bw>0>ZjNM`-vVY$<XdHFB3GJHM2f2KQs3+&9eL9LM-~
zbz;2Z3cfa-!MKHJje9$VdO6;fedZ<M#W=lE{DqJX!$LK>hOJEihk)em7gMSo7LA76
zi1>8VJqiL>%OVijtwxI=^Ikf1%3Zx0_-qrR2M#n4LwgDCN{=0|WBS4$Em}C`J5V++
zqVc=#du7EV?`M{ofNaA{SMysc27B(EC0-mRM37~c_~~PVzV8<VpSkh;+-n|?3Iu^R
zvT=<U^v))L_(iQ1w~FlCoO-Op^PYj*Fu(ozkdBK0y~Qwj5cH;s`}QM)>qi|>twUJM
zgk=|{S5ImYBXNV_apbp?w5<Ya9tW8@8p<)oKD-|-Z;LndP#*iQbLV(`Vt*(GYb4iW
z6Xmnp#0JF1Zc46KQqfA9A`kRr@~XUT?KchPPvY-2pRDtAR$5GPjSby6&Dd4Fq`SVj
z&OF_ehM|LGc8$941oWl|T0yC>t>^DJ&YI;cNeV<ApbtXKaP<jJ-_;1P$}%uC2fJ*Q
zq?P<3kTjKu_{RF?c&D}*eqAgJ`+LqPm@PvFBODK`h(Nk4+~Y<i^R)o?eaY2F-oQA*
zc(u?x`T1hCsZpS9Z<47UT3(U&kACAe)>Y!wyY^zys@H0t3r2$JSe=iBO?uA#1S!!s
z7nGu+8*XZ+x`rj?d#gBbGy+aKJLdecE?9Lar~75B@d^%OST%5{K|U7nH%EkAE%Tlh
z^J^ox+H7e$!hWWF<w=GbB9Vm$YlwQ#?fdCjB|4m+2tQ*fAifS_2(77+l0!`(CmwCT
zMZ8yX4iSl=<TqlPI!JTvj{mkUqOs2BshWE$c#~V&B!eD7B8I)opGZx)kEqrKmgU4-
zU3P{nHG28H=9veWH9}aDV1DVST2epCj{-3WS-Pwx>syGT(RbFERvD41tE*+0&lJ4d
zl_2WFh#XD6W$jn2+~g%Xf4xacD1^}eu@yLa#5}QB*gY~!)XwCUaJUf#Vwr4texS;J
zqsd;-1Z_e{@Y`4CC$cAbeT4EPS`WvCi_aY7lI`8Ar_9k6WIF;*<D98XEKY}$W<tWN
zEa#JZM{7&0>TmL(2Z@6<!+i#iSz%Y>?}Myv&p<G&s)zS);}uG!3oZn6_wIe_5nQPU
zYoOee&Obu?T$KK>M}<{9On@+9n0+iv%njA8ivA>fKVyWT56#~jb3h+kx>D%#-V<;z
z?i_-BmHYl{gUwTsnh<{P333HOEu!Ro`R<5OKm3}wyW&WHdb9vu;-&R8_(&{V{S*s7
zwDi%*OZIVRZvOtuu%W|KFW0XcD#!LwEQas0j=P%u0#FVrsGB@$cKeWt97ua1e^O~n
zO}dQ@H*mQ^6!>mpXbo;J$cON3zNNRBNI{KZjWpw4)85T_e0Vk+4{$gsR*&MspFvEn
zLR)jfUHZu0Z2pR*;B)zzSdT()4u66uW1wKgp=Lv6&)lpTIX`U+1G3a=_aQgN$lmn6
zmqBK5KzDG#&aW50CWmhsFNaFumJ38&1PLtiek}7_y|DhUO2sK(f25KkMVCmXc&58;
z^0YfrYuL!UYNtkh-OS3ysS%y3(pm;IT~9>P004XjpD%JzU@q=|UgSV@RK>r)0F{6K
z`4HIq|KGj{uwRG}e4qeGpO&@%4kiVBM&tDhWdfvjVU$gohzW_mNu{w_J<uFMT7VlZ
zJieR;$TA~`l*f#BdZ{pHa;{cXM4w$Ie~N>zQTew6twT_+k@oZW%z^L=Rr-o*8#OM^
zUS}Vg-oWcWuUXY8p}ZfJNdP$TH3(rXeBovPG}>e=!!VGz^sM=zwIsJ0{J`VN6JGUe
zMOv`IlA*dPHM><(dXO5(WDt?+$7cb)sV|gac9;X7^-&~4lU0i~e^nwOM%%`S7yg(E
zX2V2-&ZestUIo3=gbpgE5H0Y_z--mcvMl*JX+TDxrnM&P58ge-^@n7n8Ef5@%l1w-
zFQXFpdI&rGV@FK~2d)II9M@-1vqJm^?#B)F#hID?SqX#JO^UY<_#(8F?+RURRJ4>x
zyb9E5ejKq+b@^8(*3MqJuru)?yp`&=kjD*5P~)a-H<#|L1u#zut?bgXxx{i?HfMk4
zx$MFp=@m>>E58F95dBNBWsMc%Ok_wF;r+3Hg?f8OlT)+SMnu1(gS0SfgQn#BO`<%z
z?@@uWx~t|2K57mefU2~yB|q!7u*!+W_G1ULl#bTX+Vq^e;5wv-!OoVs3ez%R*HdSe
zvSw3t?Mg_G4o{gCZs`_iVVSM^pl)OWrBBfdh6hVplyhT@W(ok)>Q@f@>{NEXxkX;n
z(84d}aFD-bSb;Bopwjz(m9h{w;yp;+K)jG`cxcy*!(^ee7wJ}GoP3>URg>LsMhSM!
zWe><%etNKo8|6|FqdHALA6}{Uj|Oa?%GhUQB80J_F<qv*ol7T<bp6NH<=}&QM2*UQ
zryf@W2$>L0>|<~eyCrK4JjhTOm{nQR{qRcrri>nGG_iFNo?olK&vC(eDiU^26!k6m
zq6RtuNMgFcAOx@*2ulQmg9b32FZ9U?J+FD~<0!rf?QtAI&Wfh^Q=ijN@5zk8*(TVj
zJAFL?r1p=6ClSbQUaefCc}&4c!^LZyehnBkZ&X3w<!%w-FI0jw7vr;%Jht;`wQRYc
z7Ek+Pc&Shdz<D)73j>a~5d2P^GBAqi+K#$wG=AmL#0rUC1_Ot6M*bkV(YDUwK9E4$
zcR^@(ryu*8&H90_=k7A_N2RlO#DX<rDw7AR?5ueV`71%+Pb9}2NjTGhok^Tlk--sF
z^i4SC{(cHqg{S63^}2FDhGzq@bxsm6<TeyLr)kRr0m(mI7fT@mNwQ>UOYA4L(vpl%
zG8W+#Lgw`D0@3{yH*6<yrWiroN9K$!{1y0m#E5ftAVRmiES=;)knh2V_spw!j;GRq
zTAZSV<s}53O<VTyEMV#QYi)Q?kW2bo)4f?$q1*<Wl(K++OBk6NqX*vi#8A8}tAt>h
zNa$|I^(YN*G=HW|gp3C)`%WBiH~_}j^)rqU{Agi)*)_!GhM6A~j~;Ad+%rlOU{^bq
z_Jh`vlp6n7WF(MiWVu@nY}{C45X=UIn|vtghw4$QXIGvY*+XTu-*hF+tA3R?7=DZ*
z?E4_lU3%HZWfC1?GGL7dS+wsQa`ge`s!8Y-$*4Qk$vWQAH9D6`d`-~MBlyeU4cgAj
zt&`-K57K38ziXq%q_-ibW+q9>sM{tAnieM-D_#-NDxD1)TRvs|WnAGN+QO>&_A3Z=
zv7pRNJ6M`;4s2}$w**Fbul1hJP~2Pr#?)t_Kp(y{7i|GXm9)57kaNJxU3ttvsr00!
zI!_44ZI#iGGw8egkY*S&RRgDSa&!=t4mus0zzawD7}Og1_kgmhca1S{wQvo72m74#
zXa@)9Udlg%SSdCNW|)MWU?VY=ciO)kbb`CE3acXbonsJNLa```ByB1T<mJ|j;3B`z
zd>zG6OOw@-lx}L^Wl4_{J7TI9o7OQ9@hSbqVQTounrOB6PFg*RL4PgX<6<tc1D(F3
zcwitGULsuiGrDs<quxOF*zg`PB!lMH5|&>hd6rMF83vKq?C{R*T_B$*0Q*Prz?ih+
zZ}wkT{-lzC<_TyVTDLe98lJiibx<YTj(`g7RgY*>4F}g%Z_B{o>XuG|+hldO%RoLr
zdE*eo*@4(_8{ZaXjwR~maF%TI*THE%56zQZHSmL#h7mJrH?Pn`b9Kv*kLZgaH8^x(
zBnbz4Lv!_t7F*APVdA+A%h)W`4=M!#iA<Xz_VTq&F{HF1?*f)P4>FKVel62>2Z>Uf
z8^Lx{866FWcW9Fstn$DhOPwT*a&Y9*;A>9rJ1ibyezGvSdB1wkyAiJ13l@9W&eYJP
z14HKDr(b&gg=5_=kaH>g)fAJv=Z_R3OK5o#O5W)*T;RQf-@~gP%DXlvAl-lKM5#U#
zYR|s4aE^d&2B8>p0%y-1uc&YC$CAyEZOR!;`S{JAHWeMKiVU?@_WJ8*>?v}%9l?WL
zyGV?YEd(4ed{N9M%H2X(*{I>7V_u+VFUa3fQZk2vQZI3iICaf>guNm1`rH*kZ{|X!
zD3&_xBce3(5z!CodQqZH5-h02tH58LJme)Aq_K%7qFwtDN4tHK*5V-dwo(zfHpffq
z7X;_O<@Jc~BUPeAZ#86<-GA3cVKlN&vNrji%ahyf=eIDQsB#SNQebTG@T2tL=L|(n
zdLQ+o_r)~r#555y{bv;>+eO=K!Xl3}Y%eg1!(a7keYkK#89JN%6~2N#szUSi6L))j
z>37@WXj5X?)tP#!l?|UKkCAzLymCeGZ+54#NsnM|{oQ29^JBfF&BzXR3!t%6tDmww
z3b}{5MIR(7BQ+tsSh5)#Ez4(G(h(u<^<D{-`uzmzQE0apt=xnuYaPBFguCpw;S|@x
zqiqG;c!Z;6khr2z@l#Rbk6x+q3P5fm7j;DLA&_q!(w;MkfJSj;rT7l|4&;L6ygsh=
zSQcUOEYJ{!c+}(4S=6N~Sij8=YrDEJ(5Tzkjt!!#449o=0B42?W)kbggz6NLGv(9j
zam{$XTi0=xjo<Z*np+z0O(UP<;S$n^Skd{HX<j5}>krMD)QelgkilI0F_K5Ap8Zi-
z?$C$0o`t24v{2Y}L|Nc3Mg;vB0qw2rx^Vf%h1spC`T1^6ayxK<LJGj1HBO?q=GUXn
z=~I~;8Q)l1C2`>eB#eFFp;{ad?z9d9ot>iyP}voXJi2GbAD|$cYP=LkpHR7GPW@z@
ze#eJ(%jywm=Acm><Q~7Mk4ESa_R2Kd#^23X^BneeDk;yOL3irnW3OFPc^OpBwcenV
zOxdODfd)+wpHM&URt|x-zP7mvk_fg4Rvoq}e!(!ueA7VtFsiXyXR2<0Rw|J#Tkb&V
zdGQh1X?hmud?DGg%jZmT;Ze>Nz-{Rm9Ru@rL4wZHQ|$)H8ezl?;jx5#8<Obz5_o{4
zE6H~C2ec;Pd=2MFtN7;~G5H;dbUW0rmOGE_rr7H|;T@EC7OL@NYW+8A22%dP{VK@H
zLj(h;oCNrx$~(sA@R>6R+x78}b~5zeoVz&!z3%4PJ4}kdxp<N7GiNFa0ey|Yh>7fT
zYu-Kww&U;;8N3(CC?J@+kuF6~s{|psOsprFsKBUyg-0RB!B8`E+AkD25W?X?iep|n
zGp$+O;-Q(YPGioYFlh(Y<Dbvzb0%Gn7obw30}8S$5bfyJ?~9IXyv_JjuALoKi6vIp
z%*urw^WRThM>rPk1<s#!4-g9lL(`S=B+z>Z8%G8}O`nIO&?^QnDyL5rA6vYCX|#8Q
z^Nhi*SzD4yVV}0`ZJ8owr!l{9+>)+E6Sf@cL&b!ddae27<>0Chw?$S*Hs@`hrRdWy
zUAadUWS-J%*uUZ3e;ait=UcRw{OAiKE<R}brrElrv4A?=)W(nKF*1i}KW+ny`NPo&
z4$m8JRhoZt$T)(51Lx$ch!h+P5>-H_->=YL=*ov4l4Lwgjdx{>Y10?w@WmNZiDaH>
zRjk_efCnX@)FZMG*SH#Dn?V}Ss%5*h+wqltEU|S}iqZ!GzxRQ2rLW83F_;N=lg9Ub
z5;yk8gkv#d*`@b!W8km^K!Sw&`P6d#ZO8Tab2(rvl*=#1CTsu6_MoTIf@Gw<wCI8W
zr+$9`Oul<B0Qe~*@oN1b^!8i*hyMKow*X)@NWe-a%m6f`j9x5~2}VoUDGMkp00ft2
zm-5V)(@-b0I`o5{8IZrH$oGBTMh2Lx`;P<#=1NF6A_?HnxAF%-lKpjGi~qO={ZzUB
zvq{?iPvh@P;OOsgH%F0~fBJ}bKivrebM^mT#NaUj=y(37_5WKN#N(e)NIU=ltVJkO
z_*0JhOb3W|6$cbJqE6}$g(5>^FSUXk(v9cqT3>Cwedl${J=7)nhRP=uk%kIs1sI0t
zi+^}0-JSlaaEz4DshTq?=QFC;OjtT@a-qX+`?VjAFW=3F`tndZ5{meTD;7D555TN$
zp2;SWLL7vd*$QqHKjLIyiNtF8K+IM=$c2E8LfqA1@~Ylws*|M!eUDfGU0qRY(mqd0
zoR0EPTNqaZ2b%`I9@~ii2LnZrjRB$-M^seA1y1!J>Mv?}32@aYxv?H&dNwu|vxY*i
z(%H_n%5LWQTQ_`IL1}zFCU%%$Og(-4kneT&j?a*~4qAL@;C1fq7GS!@wQ23Z5W{#=
zhTImPu}OQfK@_)ahA_ZP%~;LA0eg6Yn-)0<ZuZxM4m#E#4W+2P;(8=9>j5<JVWvaa
z_*!z9a_%epV#`n#fju_JXm0@_X~*u0&88`{q9X}7WnzMPjg@$~^#18~3kVRSl?I=z
z890)`)l8#(^WisMOWW1lt7QzN-|#6Xvu8sZPY5Sb()mNfTwXGB->Qb~_Oj_bnQ6Ct
z8$3o8s=SFrK@i$7OlmuU>i`k;^qD37Fo|6pUI5D}w1PJsMC1jl3xfe&w1Q-j%WBbQ
zty{d5*?s;8`)DSO7jFUyI=~2L&gdA;yyHnJP7nDu2~%nw(rELD=DBi!?hUw<(XuI=
zq0R1$>c#@43j@g3jS865XO?w}J}NjZ{jt_w(=MIBOu{&{+u>{+Ji7zch`gkWQiBli
zuzQCL%CU?Ue?OuAv8PdxYCOMnjW_GB#BMwZ96I(&`8arVq!SQlHTd!{4a=_wAX16q
zh`$lTg0}@o4sG$?E_qn_9_~~SloU|H)>)V?&Lax>nC_m9y+gz9>B^l3IHE;ZRVO}@
z7rq=`JRi4Xk>Q-mnciEP+B<339uB{C{~A!Bm1cmU7%^BzdZp-(w!aiE4=2?7*|L|-
zB){yaxff1xJ_+&|73@E#kl#n<M)6Rc{h(ZSg*_|z=rvp*x`PqyjiIw!U%7QMg0>@&
zk}eP<kU*&*?Ey6!pqD{Qg8&JHa2w7k8m6tCr7u*AnGqB`ho^<QtwN#@I|{YU^dSec
z0u%Y572eFJICF)=Io#Iw5~0)>jnNom5AlW<6jKxV)A>D7`{zTP9dk?B3JK2u7vXPl
znQ}FKoWL&b{3F4ai~^7h4(&{GNj62c=$nP9{DVJuE=}>&Asl_)D3aK_w?@2&(HRq`
zyK-d@kQSz8)$P!B56n&arm@8R3Y-Wu!;52h%#70ii?Vl&&a7Fxh40w5ZQHhO+qP{d
z9ix+uZ5!ROI=1bkV}0rU?ERj1k8yr{XN-HSwW_Xb)wq9E%{8m8In(BJ7snWm-U<Yn
zSQT<96`R|*XRzD$CRRMG&3>p<lR40~ik9O@;jLZs*nK-1v&CCVBrUlEbrxo@@EfqZ
z2*uT$z6I&!D3~5`o-<?ct7y}NYmyvO0m-<m8y~){(0y(Ok`YZ|ke3FJ-M+P(Z?MZL
zMuVh!&^Y1zv}XPU?JTGnxHU+Nkl5h#L?od=_sD7e2+&M4m5EjK`N2C=T>>UI*esz-
zTpG#<D>`z^>$l4QuK=S^|6$eLho@&yKx67`AVdYa9RgHJ|GUNxH%<p2YZ{&+3G2;a
zk}7DHK#21|6xy)p*?Z6S(*~&F>qyF1J!PKJzsY!7!oPFcKQr56;D612z|sHJ1k%I5
z2B4Vd|Lp{){nFdG6Us9G4}$|h_w2C;#ZFkci675Fm#89pj5>kNHwwPoS0}}x#L%7_
zo=aahAjj@!Y|AH`>&;LQENz^jBdZ0T^|cXm0*2l8ee%?B;}i??r#%+|s}V*2l1Mso
zccRRY>GAm7|HDv?InJjrPk*Xw!U17IfY+`y&V-ji4&SLJl^&V&E&6^9V!8A(8BkT<
z(zP0^hjO0q0Z5_@dhLI@6DyPf6QNO{IpAIIN0sEV8@RIpRfGA!o=*HI|IKt}JsTnK
z=d4ueGZi%_ND^QK2G+%qGbK|v7Y3)JR49p8`r*UdWn-P(<dL%LGUdR&7-5u9;2IXP
z&isVkw^(x7y3<_?4WYiB%6U7K;yjnb=6$>tL8IWK45|_Ab5}}0nx<F9S?p+tTi{-R
z$9_y~&JIZq-u%8Py7HsVCIeCz#Ni>VLjKQ=Ls$5pArQ@j-p=3}mnw{@1ZKcm>8P>d
zsR~aaq2wRx6-bMP@7mj3^2yn)ix>ttPaDfkxwX#B5@FCj*l)gZrpIt0gzyH^`jjF!
z>k|ZRkJ5I$B3F131G&9fJxVt-B{^L$g>U!q-p$3via|a^Q-0SerAEvLYh9u%$Ju&i
zOdeC;-x$YZ_CMxn7;}2{2JyUsTNh09{H>p0#tOCl+jM4gn76hUB_3276>7)}_kJj*
zu#pqs%{(NCUV`zMJa9~dgWZZ+3?DKuOZ|*BkRk1KpCUKcpj2ZaZU-0Z(KGT3OQAJR
zzhdPOx1U9{nQ5Z~(c$p3=x4e4)lhkc#zTpsHFq?rS5ZpLAHD*EH)JR^n2&f*J;Rmo
zC+rbT#%0EFeeA~^23)xVR-olUmny-Kl-K-IBuhNB?gN@xZa{d{36|UhkS(a-r7mr#
zcX+gL>#}`CMEP3rgq@Cxduw{^D~5Jf`*?>;?5`9wpa^yj(CsM@p{KjME&^#g{DnJp
zdAoJ401)bsgcJ-*0x+j<zem2ySf-yk4!@7rce6#9b&ZzRsh0i1Dp;d+##uT5iT=((
z@KdF{W_tauSXYrgI<*aT*4$JQRY`({7r|{)3M^J&gZOM1{|9BB05fv3O*WJVAd1KL
z+ccd77$k`TG`by6x|O)H1Pr1J#yvd2=98n@GPHJtwb*hV%*hi8miT9E>VWH1Xp@~n
zFxatxT!%H-Z%-nJ(1MSAunqYTB}cFL%wI*ITgHl;ivi~!k|SCv?#sL}=i)%k?K{%b
z){t7+OTDL0Iq6dxhh{FC4gs^?Bn$URq;6Agv4e6(?(@k9myx3E=XFR?20bsuWde$p
z;5egH66GZuH0`B(XjN3q`4N|VaPsu<D4L?e>Rj2mOCU4WxvM5Q!Cfj97x?V(WX;*c
z%x@33K$o@={B#hQdx^?NqKmtk`l+tCLD62I4%(AElf?t7DG3Gdp+T)e;4U0(>kuzL
z<`|iX>_;0Xuo#R>7H~rIKJR;BD_wg!Qs*}DgN|drpORXAUOZ!VTjdp`9s7P*%l>H(
z$$GgRC^<HPp%;a)>nRqC=a>uobuS<fVyHRNvw2B7;oU&;N|%DjIiPIqGxWw8B2%Y7
z0&0d&1}Bo435uQBq&Pkvy!h#H5jTJx+Xm=n*6gnBt_jQM(?XnhKINf>!b127ljyk?
zzP^WZze!__54kTr_7bJtEd?Ap#ZXUsNf}*r58D1sr$Y46E%u-^AhWiPKd(NyeP+$Z
z-FhxAEe%nq9e=^X8!K7%!~CXF3>(5gA7pcnbBjsIN%aD)JWup{%_mT0h40pyLmw;n
ztf{4LfqJ8CKy9ukaOU}T1Ny*VmJtRCiEk#`NE)6^sZ$+Jq`;ZGZN>f2G{CoN4ikK|
zbu`5eITdUyrip!{x``y>={oMgjf%fS3Z^UD&KtBop&@02(Ed#uXVA;=`|pMZ1O!Fh
zxS~P0-luV5i<K!8+1w?Rpov#ZjRYNHGSBtd)??)uwDhCJ7ZJx(TkSbR`}Hs9L<}mu
z9=uT%!8DBM29CL4Cd?flQQ>p^bnXS4WAwIBD<)u7Gt%~lh%njM!zB7Cd?Cquo;Lv`
zvJx`Zb!L^qjuanM_+XL`l38l!ZAI(&*FwJ!Yr)a=UEPr&$E5Z5O4gZhb1i$|AdLW|
zY_C+JlwP~dC)t<s+eJKA&V;BdTnKw6PIna0pV)(ae<I233Ga}j=IEu>)<+d<j5yKC
zbs&oNLsl-mZet($6rw_i#>S7-5R|8=T<471r9fplekIvaXNh}+B!$Pf97uETPCeeU
zFT#yFj5ZJL<44Rq3ra4xpvU#tK_HTD3bX%)>`S^G1-K_XUZ#KOv^qVHFOn^iyo@`v
zD>amrM%gHH>Qqx3FQkP&pFC+2SDj=Q*g#K(Q;bh{Kqhe*BeWIs^pjWG3FPtO&SG^)
z&LMub(5wi*UxbH99uOy>8Vud8Pks{LXPcRUEeFR!Uu)ffUx{DL&Bj3%a>Eq7-CCaE
zkQ?$42v;{=(oJrc9H*-QxSkv2Ahx&DvSM0gp0MH=R;`3;43RzGb&%zqb{W0%`*~{%
z1QQgUl3?3Hvj~q@vjv8T{BFSbnF*|_EMhDUH|f@cStS`nwZldaaUp(wP*<$aq0wYr
zRGPnIA^FAJtLQR@G*{EUSTQN@k_<?#B%S;etsQcRtFM1RIPbdRZXuF%A4wWym~rt5
z&8ed$V3#bujz>2o-tFf|2|I}={Nn&>mAl?G*ul4k(9x~WSJ%HO2(FbI=ZBl6w-eBs
z%>(X;$D!3HEDA2@v*Z(hs1Vl30omfsef-0G)_Hyh808fxJ)O-6kG(Mc&)&lGq{xC0
z2z?Q4;`sLsB|#j|#ET>OpBEV%<$p@Cb`cqzPX~*-ccgBq7*Ka6qmq4%lu+OVJ!jpF
zr07z6gobWeV`d3;HAvDQRsP%}u`5N0QsD~1OQR`0IF@_IKTirqh#!u@5ne4gvNVM`
zH&c~_6|0MkwSr1JHVdIR>A*LUid%)A9IoRJv9%|GZt?Vkx#-zwbz;FskqFu%^zYAR
z+#Mk+6(H-OY=lD0CMlU(b*?g1^bSI=_5u^*-&am6h@UsA1VZ^U%>^p`l#YDTVuUq7
z`LcEhO6lEA5q0<`R8@M<-f*k3$pk!E=0-sjfCRW1xWZ@!o_H!$4QN5~v+tY|8>Auw
zF>d(-(WTDAzQe^<zviNAf4V0A9Q2LL{g$@vH~B|lN)`JBDqF2iD}juTOb}(L4SmW5
zWfU{vd8j`9Dgbcb3>B{BMMjE|vCs|+JgP&^rxt3q`ZVl>U1^;ogaUi*s?5wevZr`)
zFr`%hk^t#xP<d8={6eh4XOSZM9;sqKLlFuRc)BZj!%l+RRAEBgPgH3v8Il>H)R0pH
zH}Q0EqgJZ53w_n!UZ2mMYH+hczn#+_ihW#ac8qk9BRJ&12^bOy;d-Qm%EEP^mkY}f
z6|^+-^TH&Ff1c8g_Flk$ai^I0G56izp&H9i{L2OM9%DD6JHwD~HDdj;5fZ2vR}~F;
z(+6W12vk<(WM@xd39e@<NFzOhLM-M}0oyH@7@zrVTB6Ty<?xA-c@@Nqu63=6bMvSp
zAbajQu6)Si6{!j783~FmD3!x!ibSY92@8)m2ET?Q*p^Y<`TiK?vvK&wBTqvDON+ry
zV0^Oq9W4(_`}2vaWF8xoD)9K2K>=8GsCdR!m8Dr4QOG>Nty6xd7cMH{^=`0L<S<^8
ze1@|t5&)g~1)i0J@<RV%JVK*JzK&8y0sxHv0>v+Zq+fT+h0O!32+hAJnV9$*kQ2k>
z2p$*A`4#ck3L><Lf`qfg);7`=(7EpW2VR4u0{{SVpuEDr{Kgl={(2E~A4(7axC;Cy
z;lHj(h<}?n+ai4cylVi&`~Bkhb&v8tDInfoBYjaD#s9|k@Bj7Y*K7Zm-xo*oU%kj*
ze*o-MD68y$s0{$jG)Gf`p@jC?08?{l6PcocE4tS&!9F?C*bGMX9sS57#q3NK1GB_7
zH1weGv!U0aQnz(M=$d1kVp`@Bu2c)XYKKV|d8L#g7Jy^^?@mH9iC(^30J2|2GZ+L}
zz{{gEx0!-bj(y+RC+ig317vVBqnX(^q@^;DiLXzr$mGkmVl50#ve=&cw4*v1C=z1|
z1zN;xAD&@Io%NW_S6jiaTG!cLTNU#9f!#+?DM4xjGKlREEvUWnNeIL8u(f`X{Bsv~
z6sO00`=uWJC7c}^$k4-xM%dIB^W6gq{>U|C;8Usn@hqfg(YaxEH%b#Ei{|uncbcsk
z%nZZEm8@5{R$iHxdm!b4^jyn>nxRq$I5Vsv8g}I1q-EbF<3aAsN02zt@?%2QY5JhO
z{&1NSl`vkr`bj-B5ggQgiJlefv^*nTH@nxyqhDYu#pbaaBQ)<}99ce?A7zg-3mZ@z
zl3>%>XR$}Brc6$IT_B^kotstunOK6;O9d>E(8x<W18vCN2v>qKsUR(LWp|mQ>avgv
zPGngXFN~Cjg+`^l=eO}mOw-7(TiI}>N*kWfN{tsmn|KFsQ7}T8rR25LG}%{ITZ3Bg
z<h62qLkEa4B#oJh$@av@FaFipbOw3Gx^eBlIIk+CXqx#T1D!Z^N<OLrD*8svVy$ko
zzv}~!i=bvvhF8+(`?(#IH@;pN<`AxYuSqhsEt9ey_7h8ZlDrl;Nt;zcCzw`n0H#II
z1H|?cqgqiQsvtq(69BLNa%#f?f78~=3EUu}=~}`S<Qo4zg@&ic8bEg=+8-~i<m*e`
z-ZS6=TP~TKTEWqRsfVYC)_?*dzMy(j&L~YgA6~jTkzX-tVuBHWL(cCmlV8c_{8-$a
z8hlDcdlanfYOo{<MPd*S$NM%=iTCVQ1yO{d7cJR1D<*v$TW>)RENt0W(!Q41gkp2w
zQV=o>N_!G~;=!#6uT@fG735H$qU{U)!%VOHzAa;4F1D->t3p-oK`7D(n{^Ym2WbA`
zK0_1pWoh9K4PFYHN0+lo75(K6!cWUr5Tie@jxnWTiNNulqb)>PBmS_iCnJ=Q=nQ!h
z-xt5gn9J%|r}i+LfnP%YcoPvuVt`Es?iicRNsH5q$}uYaqrHo04Q#p-CfVTPaE)*=
zN&B531Zdu~5o|^pOtaYC0@)P8j0cctPE5nLO-)L=M5Q%Sl{6cQ-?}+4-N$>n^&sF~
z6!o+RSGwD$GG#80k%S5t8Z3an;SyVl;vKlY9q{K-+=D))HFGOpQioqaPsJsIO3No~
zz?+6w?~oP9$IRh2$bI69zFarQt3DFRAn3?4q0Xxqg`&d5zNln|E2V^9PNy+^m`^mU
zgo3zfPf8!}{aP`nh4{|IqP<S@`*(Eojy1=i)MVa+2Rf==-zIZ2Ol1pN+5*!kH*kEO
zIGB;wWx=H8m023`Lg2^9T8vLA5`|E>`N_S>h26@>%7)zdb!xPLR3yqi^3NgLhUBuW
z_#$2p-bw`=g?g4#_;V}p+?Cq(d1I|Hj=bhjfgX-N#jIH|1%*oHIEN>z@Jig$odzo7
zHcMJF*>A`hs)$a%k_86^PG?)gt1{2ZGwXn0h|T5FFT|sNA1&ysqtT;z_Z4dNK#_>0
zhil-D{>D|(ank#&Ej|<*vt$#+GxwRnKfn0q$b>&0ftJ%q`~+#-9ieRqv?z3!x!8<z
z+GUSf0%HNuF*NxNFTqI#SHP5@E+*XlJQ_;gy9p2>j;dfCSISCF^sy3hq|7i76F19U
z|6I_Z8bsg=4I-<y>W0+Aa|68U94qW#@@^Hv;v>wwNT}`-8IM83<&*4CaK%ukUFAC7
zUF&yJ9HfSH*Z~d~QV)4mx&<^L@(n%6T{p|8(iL}mYcL?9P3IX-jtiLb(V<vhOGxkv
z$Uw|vmI$d#CXGng{R}Nl^4Nnyv=Q(c-FJuWYblsO53#o`)UbukKlCdG*BOoG!<(^(
zS}q3w`<D%p0?Hfy*NOp(o=!vg!`ZsR(ku=L41oD}X#n|Rdj45BKoh^7fQiv}jsMew
zN(hqtpXaX}^{;$r2cfKq{~?9oAwx3TK&1<;ls4r%uv3^<<X6ALxqD@1o;gX4J4M)F
zcN1_T3pwvPe@YlFT{;ev6}NvCg)fpC6A>qGsp2RfGp?~uot#q-o**WY;%lY~R^|)=
zNnzlwnD`1Mi{wV?M&=|$*l+FhZvXggFML^lSN0*E8B!A0RpsfIofs)j*!Uf+>DPvg
zee=vGwY*NPQT$VdMltPkr-E`{w^|Z?zg|3-yK+aJS>!fkJkSSOD!|EA+tYX-CV^r-
zbZkLcU!bZg6|v<2Cb(#}B&>>w^T(4GFC}@zF{kS<VHu2kbwL~_hF_1vO~qGRCxPGA
z5}Ks;;Rjv*aN<eSu1edcJz<)2{%NyLiMLU>_OjvY6rC5KzU6M(V=C7k<LIvc=-qso
z9+#m>YZ6fTV0vo3jjbX*y>u>@9jxm;Dem(OuB)mWaN(gF-VCbtrcurtcuP68E3Hsy
zXw9ldr$DyBxJe9O5ichiOHVf?hIT`jpeE0><aJSDx<Kys6RPaf`+Qj#1^Imd`&xsc
zc5ID0<{;A#7G6*m``aujKYal4E+p$PArh8zz)b681SY$T77wnD+C@2A=bQEwrU1QT
z5qSA@W#M&PPf%!Vz-j_{9Z3Wz!4QKG6wR;Y`t!&Xr}7$S`Y@s~RaSB3g7+4XLHe4i
zn;VGqkz}dhEtFLlwI8K>zu-i9cU!V7mDRjDz#|lI5gqv^;E5G_?MSniH%aG$I>u=#
zeNVIX(!Iy49?OLQJ5-LfrOhv%K$_7E733h->UHI=&k>d_6U>UPk1NB7^e~x{HD_LB
zm&e0Sp)%9sR^w8>lkHc)BQ>rLHmo2#cNPs4Yg&y2fFitMABdDf1iH8r=~tzmX7GB}
zqqQ@DwItccb?Zd<VXFx$U950UfzXZQc!^UUjp8gto>T^XhuM2*i)?KW(;L3cx8TFu
z+_s3<7J3#PfUzH~lP+Iw#IsU6?}ATuIS#ZoiF-0&M{s9tOH7qXq~ixpH9cvbkIuQh
z*A}E-h*`b^9Z`D6z4*>hR=2b7vdDYsZVY+jt=gE9PH$RS%WUgQm6^?y(k$k3vL=j#
zxt{FOG1=LYF2QWS8G3~6;n8JF#RjgK?U{Sjbaz-%Ub;;`mj|sQt4AX&^LY6q)bRNM
zd=|PRd)RBNvnL9jb#$5Xm7XA?qVIh$Cr)ue3htMOjD~bWOzcfEu@WeY^9(R&idK?n
z*-s!8j1Vn8=(`j6{M%*gV&{oHlaSTfDxHlXZlY6O7jAAc)@u;fD@J=8qpnf241;1&
z!6O6=`<fUEjZlxqx+9d!3#s@4H+FmNl%fz$jG3Kc(7~+F?{V1ac`e{X6{xKU4N%T!
z9E@j+afDfEY@wW_(`{+Sz(1A(I16@+7&%gS(VysY`MXyXNxQ(C*bs_DC}y`Re34{N
zH|17ap%v2F8<$p5C&j(Zycl&E#i~e=EL*Mp*U+DS*TA7_pg1vr+th#;HjRIBYXL;!
zcg67Ly8aAwL{^S2K@v9EX&E|?*5b%PSmRtqGvKA#!9^MGOXCbg40w_fB{HqRc#>Ql
zwjwALlw3CD#koO+s0Wy=cJjJw-dTV+zeAzvS+=scD0e9rJiD*P8n~4HiAloU?G%Gh
zaRxbH*tQ-t#h6R+5oQz2`LXL)-Yd9S>g$|Q9K^(qx49#6CRxc)azAPGqq0dJT|ZX{
zRU=u)27-)0ci#kIA*awA^CV6OQXOuwdTL-e?mFJ;vWjmUcTXQzdx%6l3lej1_ay<0
z4lfQo?v#+Ka~KD5k<&RjheTO3-iGlHL&nbq;pYS&5&|;O@gzDR@#lsVVd{9JnU0i1
z*%;3kT>nnfLJ&;lg8LHuS#LL42!G8i2x1Cdk{6+cWAt5~P~k(M<zLy2NPGH1p%@w-
zmnAj>5+VTbGFHp9)daCF*cJ9)?pxd*>U3-!Joe<YHTW2@at%obh+j_Cc-pl{W-;ct
zGkFy)gletKF%jgrTBA3A`X6oiK<F}T4DLN<MD>%7Su|jlP9X931llalfu2d%$!}<G
z7~;W4iUgCTAN4{)l;M*W&bBO}3AQocWp3}qPA5ntABOvRC67;SQHf01V{Y#Ca_?~K
zHyfuH+<5SDE;|jnEaY@yA%`ycJ)CwhoR56VW@uee5PB5ZY06nd`;1;px4lSS+$dJ|
z8u2oRA}1~}JjcmT|7>-}u`ZDW3yhUK{BUKyuRAV7AK!Kj@&JQr-YC6-W6#jDx1{F%
z9%EOVgYgbzBv6F3<{^e)l`^800sZ>REwQp>xqf>kMKzxK2xDZUrYS4OJQ}nDY5<Au
zAf_WnmXp!7;Y+rp@4m135MBWop<V01viB}E{YqOPh`1rR$^m1c7LUmCkA7#gEoEb`
z%^Pp>JXBwXrL-}dmKx((YR1oY_Katk-?q}~w6~*S$4_2ib6EYoHpZ=#Q+^ff^W8rd
zYxTY6g@U5E70I+lP`U#=^-1ibW72$Fnyo&aW(zQUIXyC|F*+FuG_{O;m7k3dT?#a=
zQv?-uIAvo4H~S<EVeLz2>g)w}Wf4rqKnxNmyQ!B>+gvUKxtw^aiN-qz-`b%p9x7xq
z{5@$d%=0tvx|GwqJ+}j09j{lPd%}XygFk;-!ZW0?1=iQpSL{Z!Xs1U$3h3=6cO~>Z
zd1Ens8*;SL=KHl@efQP{frinHjdLh~b_Wn`%m^gCB7bDJX%`MhT^C()XJy#(jZFbo
z-V;!&m_aihFQ@hp&>6x#Bo_3aSDyu2lU6(_5kiilId<yuA&*hY5I)~sm_wnEz-b$M
zxf)$YD-C^3m1ME%hLP9GB0JQc!5q@TvjZm(*_4TPD*xOcJQ*s%Be3Y-H3RR9)jbZ)
z5zH(?t=Mn0O_t<*IdWcEoVtm)vVi?y61>Pj@OSqvW*be7=hW3j7PKtV&v>~DIOBn7
zc0hQGRRAj2HypL7NP!|tp&RAhka^WW@sk_Dz~2l*MmoJPelJ4DMq&2zqm5?zb#_l_
z36V4kJATG?t|Y)Ge;#~j9J`}v8e|mqA)(!voz+C<h&|N8Ya;LK{R9WcZ&O$c>{=G!
z?#Iq&L(*0Kb~=!XOx?uoVhNFU`oe6-X>|N_s1vt(1XDN9y`Z}@3zQ(1K>vJeL;$*(
zi1&@xB`AZXPRF2l)|tI$L{|`M)1-CQ=$!_T3l>2s6@)@NnoDeumVeA-K5D@|*TTUw
ztk?HzkgzNnDyf^XKkyc=&_@KX1Kx`((QyhilUb(M7{3HY3p%rV*n%eo^c_a0n!uIR
zdB|5+Iz}6_yIcYF7REv>b|4XKy}t<Wy;pnx>X=uJfs6Q;cSW!45VdvuHVX4c=)KUO
zt$0UOc5Epxgut@(9y|kR(4+#Ey<)|S%2KpJc;wtk#3XN6`whI(C(~rDCG>O4C^HF?
ze0AI<6m9%N+KP}W_GVK>MB>KJgy7y=a#gPnG~G!q8TTg%z6Exuey6GOY~_smMGbH7
zGCC{!ZX^b(+k{LvZG$4d<%)Mnw2c>T2f=&*022xDx8N!7^k0MwurlDxIry&=z`sx_
zoFxD*|F1?A$f=QJBmk0-y1)|P1s(_hxa|fkbGm=&-l8mlngUM%>cXG?gJUzl!hZ#%
zp#D##KJv_eg8u+vNXY-R2}1!us{d*HFM37h?~#?SswtR%6EXkAu>7yQ|J@JQ_um6a
zeT@OJE0m4+4-xZaISKS7zm14$dKQ=O<2%oalhkWvd17jUDTW`c>W7Orw8GN*_~+|8
zDFY;n;88|Hj^=@-uoMTS4<s?$*yaFset2t*z{TkTEoi_m{<2{IX!AiIHUNJ`TiTZ4
z!gHJ&c#^;mDUu;%DiKm{JGo|8+o&!*dQH>Mnp<vRLCT&l5YbViOL@MXkgFe#AKIuT
zb~%R0OGWPY3HsHo4_r;zgf#*zYIxKW=wlb(6kJ1pBvy&hGg8NgR<wUO&V(tY%-}aP
zHDmAy@KhxR+p6stN27o;xHWbYTk{TXem+Zu+bi~Vxdz%i5NrZu`eQ9a*58|?zwr%X
zAseOg6Y51pA{pMfNt^<W=n*@Pf8C$ZEI4qXqs9yAh<CUHxw@op^r%DI`nu<i4cK~n
zPL28;ksj?1TXI3Nk@0kRr@+&wWL4k_P48$Ylx^%vHhzRaDzEH+Cj|YhO7_w3Vzzsj
zBA-7FzEdJ<ghak1Y%?-zR+OEN42q{5G55x|r>^YXcTb0jS&ygeMRAl`RE!UqY~ai0
ztKZ?TJSrDgOFqxlj3zl+LyRuM!n`Gklc+F?B@S?d0pTxa9P|DNksz8m3~a5xt#-Mx
zU+%Hw+Dd)1CL=Y|=p{K0ke3UUSR2@4%<_O*(^44SNzK9%;E~C6O$!aPS{BATX|ptQ
zvkN{G&hQ6OXYJQtiUW0)rABb#oO9q==N<7QV;x&lnskK;nF|qW_oW%0d-T~>)@A%Y
zj~72Y$0<D%yx4wELZ!e+G0M@|@!fSR&aF3EXQGOFBp<z^UbTLR-1QCEVF%I<c{`sZ
zMZ2*%*KxagI!G?PJ`mum_L3-P^`{8tRT8=q>=8z7qy8Ed2(c*qv627yWG9l(|BBWL
zput~wWg`m?q?Uut--~GjdK-6(`b(&v2KDK^D7?q4fBYNJLXi3Ku3)%!zJTe#Cx}0U
z5hjbRKbQC|QSai;CLJ>6?ZJIDJFUy^DEOU6fi|#-b4*MH=}zy}Vj$ANhpawwut8zg
z%uMUZAEmOn!9-<5oc6kQq$4#Qq&7UjBTCUt$ucSM2nnXs3D`70dkYUXB^U0ec;C+D
zNNzkKu&_+5Kgr45DX9*ULUexDpk6YuK+LKDTnD=p(6iDsj4%(D=20vq#t*i;7d|cn
za+F6B{PD4bH8NaGim3A)dX@@lVHfeb4UZ2J2&0N&;{jQ`R0`%;XRK@ApmIhxf0=Xk
z?Fl?|%l_zbH0-zN!()Vuh>1Yk=u{eLM-YR-MGGbYmTZYXN6g3ito@N{n7^}9<_9op
zBbO<8c#EgFbiD*79vYfxa)*6MisVmJ^dH4<@LS;w2L*}PHzQXzwA}77YuCt7l6?^J
zki(AGEY4v^SEHMNZWMbQO~-LNOxv40BA!R|=dqMf_;n*(4g=N(?*xu*8u&C~B3Y9C
zgCTvFinHG%6-+BLESXxR?V|>KxxSpK-bvWuoQrGm1SJ>+cYd{%W!7PlnpRzaiSi4~
zX?aPP4Hl<L09V;VA?Axj9!j(?Y|A>XF3>fTRpet0(2Yng)+ZebA)@=e$uzK@)N>lg
z8@9OBM|OHKn$pXsiJ;z|UjICKhJNeFcLd77K}n~sPYw$+=ycN_^P*`)fSc{`tKmbq
z&|xHw2=XnSO!MSJdQ<kYm^PxiCo>q$hPOdeNzr2ug`^2&+ttqigO)9MqeqCj&Wi66
zRI?+5WvX>8;#;fZWpg1LCp)2-r<k%|;pMlk_=9t@ooW)fmtJqagpPweDIXS#5*Rdm
z3Bg$+B#EHDDi;WUuyvRPm6>Iby5ky_Z?2BJEJIr8o6Zw=MJCJwf(A6F-a;V8lrZw>
z6^;F}_Z_Mq(Qi8Spq*FFY;%^;|IsHPA)cnS)$sX*#s=7Xy7z3{plU>w^xB3qu3?;2
zq`N!6a4diyJx8#&kyq45(%8Tw!*0u_<L#6b4s5e;I4J`wG#WnrE-+7qZLMU~<j2q<
zv7QK$N1V`tApZkw9{{t~S9X0VN#;o3k8m&XY}D7=yx8d1^EH#sg&tS=15GB5^2iA7
zKyUX;;v^<U#gBbauZGa2T(P_BcBhic*99Xio2aC7FioYS#xbut`<jV!vt5TH?3b!_
z&qHB@nYk<c34XhqaX1C}-3EVwAWd1PpfL7!kFfOMOEul2%R*-6V+hT7eSUtIhYAm#
zaqYBl+n!*M^217uaoum)@y}7Ul@Rp#jK9)yNn;5*Qkg6s!w+tyis$B8uRN>(OMdvm
zjp)=2#7X!0f^lMyR^+W7$NGlJeA{isc0Yf566{3oJ|T-%qQgX^Npj9apWG^3V<}2e
zylJ}*5Mh-jG|etdE}^R5`W{6_pMs>-#zfESPe#ozNKN`xmJbza7I)N;p%ZVTy}=U8
z7RX|ox(|QPs1qgvNAA(JmqXrSrvyE0I9%r0EN}4ng`wI2`a5}_{uy1mn)fV-xocBg
zNOsxSKWstxu`X31Sac&%1<#6!$S!e5I-K&gos%ib!ZY8WrRl0mnw>y}y%FK#M3{vA
zrC~o<z5`!>PeulK$o|(FYQFAri>qq0L12R7!WKin69A%a%z$8$e{nm3x{RY=3FF{2
zA(V?Xu+fY__U_18pHUTt1R@<#&r@?-7Lpd>hJIcXV`5i|P%(bf<y+yGo>2K0Qcx87
zPXFa0`gMjDH{ITTR*9<)NZrN|$P-}sFGzqkqxP>mY8~ho-sk~<ZIeO{{-)Gv^A+X}
z1R&4sVSJrS4Gg5}1G@TG9u(Ktm?A*m<^Ba>F#h5SkW&D_qaPAj_+JVCAP~2&fEeN5
z4p65$0C*sEW8nXaf&l(XaQ+1`3V%V&|Esmpzmbh--`55iu28nhKXu!GeY4@U`bsfL
z%(e^r^gbA9)LqR)svl!c!800-G?_niwUQ+4$wiMTm3ly{SM?Ijt0B8;e~;uXEcv~G
z-qOWXv}9!ct{FLdy(+1$kZGKuAlJ{db+_FK{1z8(L5f6cuE&COxGq5k2dk`nI!=lU
z**P?5+#Av3>oRuX{*1p-ee<UzK=XAQzg%oP5L~4QZE<i^Lm;8f0;HvSWtdpkw+IF3
zCGrtNwklS`@+yQ3He3uNq1a{Yvf`PhIW-Eu=yd#Xp!$8#814il;#Lvib!!TWmE_$p
zKji|I#!slhVwmk$`cMp3m)e>Zh*sK^oXQ<0?V0S1m$=L$J*G2#_%6)5LgBsdau?5P
zrbY<e@8#lz(^}~y_SCiCH#+DFg0+<s)Y)(&J)k2ceX%Y&P1HPAN7F!u^%tlo1KVRM
zChI7r@4NJJ#o1!j#nf%Hsf(=!-2}qMTpYdn2x}2<yqbyKH7v*Uv-y_Tn|xZbi4E*D
zk9Akq>tzQ(K8A=qpKz-*Da7!>>-&APP%d?2;+ni?#l9?%6@)r(>o<3X3v01ZYu^vT
zYaE5Mm=`MfJ-&7=1Eix{jRRFWtO6Pz1JpZAqAbByoX#C*g%C->khUp${<u5CgUss9
zcGG7R>`u)M4)%ctS8V+#G*eQAoQimwRI@)an_NKW#pyrV7t{*k;1(!x8FU;yTRy0f
zUx4ivL-pz?uoP>i{AMfKhc)4lnG1ibXNB^%Df&wWOUOp}mFfoc%FjUD?Jl;!0Q-a6
z-xiyq%)|VrVNYbYMqKb%m;dmMqhuT+2Ssc|^~%8Zb?)bsGH<9K>H?pw&Z%1o&MSxT
zC95889f@z0oGu@0`MmZd)%}(55f<SS!h^a_(dh9{T`L(;qiHK8;5K)7xc9f3+k=VI
z0p$`L3<z@R{vUXK8*0d0)9O0bX9<}uGTQ0HMjLqV&gdZ8B_VNHmY2&hsFww*{j?4c
z_1-5q%83TL=LuSYDzYl?z^l_+!XX<1?CVgiMC~?pph*eCSkwl!z*dH+-W0#X2a_p8
zSj55Bw3{cV`hz$lt+}Eet_YX7Y^yL8tAD^mk-liY7~Y_S^o%fUe|A=uU<=-lsHkyT
zuTU{O_)7hT);rE5MSeM%X-up4Yh#B<XWM{D%gYa}Sp)}XeyZaL7AZ{rY}S(%=RIP>
zA5`!ySYtvQ$)n#&NI`*1O%%36Pa&DOByqq}sjiQ8;s@^Gkb;a1x;vepS`mt`t;2XX
z%(&pcJ5(CT>ZS0HFFn_qRC&`ipfNA{bDq1u7$;h1NuS~6iAzUvEP12nfNqpPY*d^A
zBlv<<1d|MBMxS{Ker@S34H??-XQ&RXOMn1`7lT!AgPz^RJIm=ZrKCBqCVZv&r4<Yk
z9iP2!;YTJpIrz^^#g@=uMDoLQNf^CRc<25)CJs_R=qz`nEERA9yBXt$YsF1$iQj^o
z5Ti3=lSDRBJHP$l_;P7DQZDfvrhoyZs9vgU4ch((7mqK`C6|&v+<#>xb=O68;}nwb
z(A)}o`rIBq+JOuj-V;faet7d4duCtyDW^YW0S_@$L*Ym76Wj9cI=dkM-Xo9Tw(OCc
zSn0fDt{Hs_Fp`H}1D;z#F~1H(YqPr-AmTn?{)xle)B)Vul+8b*9hC%{GP-j=bCr-l
zF|-wvX#aVje7d+IIP#}Omo(mtyO0sg`0^PG+eO@-N8YU`bI(;~nP#Rr4N0!}10?>Z
zA5;U^viH5s?@;h^XW3&!3#;G}<W7R`9Re0yos@o@3N&*<Yr8<mI?XEy&hgo27abVy
z`$kyOveb`Zr?jPIZ`jflF|E&i2)CqD>E9L7kQ(^4LyyHZFcV1Xe&$BCU%5LPt2{Q~
zRK!pDt-!(d=Rb9mRUUk)v_M!o{&-)=I&i{#t3PP@$(6BGK(h*tJgJM=5@K%36mSQd
zo-&2hOgZMsF)1L2Iyz#?s5-5Ozw!ibHursQbE7DJ^1Tz4*6aX%fp7=%+^U$D&%$xd
z9~rJFrw!~H^*R^<+LFpsWUilN$HisOU4Mdf)rgJf&!JnTSP?#lRC>JjtjKAj_mPV1
z(KT8rj)I*kM)%X&z!3+2$k8ctSwowr>3%?euBReWL@=)U)atVM5I)%0^cz$F6B`6X
zE^ntj9TuViore7wwlf=Nv(`cT=eN$4*oiM95r*uZY6TCMZ&hBRJ*sJ`?9g!;Z%5a8
zpb2W?ODlz+uW?&f!a5+qyAjt`tsO;PZsXSGM;|^-BH}qusE|#*oQyIMJ%t)50tLP6
zGapCWhB&E-2Zd>{8N6|Ja>%$k0CXzRyZo6$tta*mG>W|R1P;D=>{4ZVzit;e=r#9x
zQ@`y*H#h<kDq_O8&sw5N!vu$$YIy2&c<k9c)R^tuw{SXDHcj_byvtXTpkule9DK7i
zLnia2Z^Y4+c&FI5GE>9u{z?NsgLkQ1j=Cun6+3*Ih;&L+5Z&syJ<0K-ReLGcUj-r<
z_Ads<sbaqfsdb&D1t*K5C*-cTnsve#c#0kRf+(up+cA5E;avWW&6J)Wa28K0Ay+lf
zGr$@1TO=*MnjZ<&GA0n*Y=|AJaT-_}eQsjzfm~)3I+mMFe<pOPMO+o*O>Wk7+xp~y
z796Qs>fLJMmdE-A=>2`VFuQQ?toAHVh}qrIv{$nOFGrv<&|Ji4_(zHhYn*mrGB&R<
z;%DtjjQ0XQ2b#br$)HsE;bnKAGH|TFoMJFPM+7;I4=&P92E8YgOe<Q9`5GH#YOz_+
zdxNmcza-l$SWC`~(})NGky_}gJ3ZerK%}@3KFKRxIlANg4dU?wH)g-|=Rk>kG%%Ar
z%cnksY)iUCunQAfPJ~^FhaF{j9-LterVbT8K6?s0vx$&ZTI_KEhLfrI555~%g1cI)
zHVBJU4JNAMx04tzip<wGa{kCEBq%Z=z=3AM@)pu;{n@}3g2zhBZO`1k+GM_R3SZtX
zlLT_vuh<8^66~gvx;fvEqh*otpnGN;lMM%R0@Aop!S^$Xso)pk!wzwU*R)07jBHVb
z%b1S|VS&P4?QYL9fIQegp3Qvq0%1<S{RLZpz1ab(Lf@VK<--I3omUS0>Hz_W3W6Da
z-GS2_qW<o>0;snCUV(^x!BRtT9g)7t#6qeBvAVQlICX9V<YRvjTqr<q4+GEy|EB%T
zl=>R?3%e!%hk)8Z&Hs1kpM?J(R}lWMA}3Ix?9_j-+rKn-Af0vl;P@Ek5#-0a_Q0S&
zs>_h*XZshg1!rWFWp62AlrlVwF`ZB+&!;Li$ncvfWYxs&1xii~sJ(1{Wu(XDi80!J
z2E!ICREeKK(=DJCss(msU<23|DO|a=&YZ<t;ApPV4|wXZ>G`pPFLYW9?G=7Ep6wTs
zO4I~Aa2Igiau>x$E@<s)46E3ZEg&@VkMd;h;UC+CtRfmQ8<$COT@1}GRUQpaj6Z)4
z9*-2|%)L0z<E7OwMECnuZ6$1$J}}VpqQ4+4c)%5&2fe4jd~?UYKNq0tEECDdwosuf
zeo!aL3oevBsj<YlQ$~B-;lf4(DitTD@@&1E;g<WJodLPSc8}`c<gTv2AtNEg&K5X#
zLuk*u5F!RJaVN9(8z@T!&O1W*C6B5kmP9L$|A--f2RIgsm^aOoo=nXE&-~!)dyS*U
z@TM~3e`5#@yapn|HK--m*Oc<V2#>Ypjda)9cS~DOTGW!0VqCj#0$Ej%%MJA*RYvFE
zaz#^0^u_GH`-Yg26WF<7o0Tl5KpI~EDY+F6TT!8zXpVlGc<HQy)x`W*hKkUd&9pYl
zA-BM*kMN^Nl}bL{{es<}DJFX$US5Sg_;Q2%u;(}5nGv<t-Uf`M_m#v_&)k!)PlzJ|
zP-e4VbK0=2Iiw9Gv;_s<2z2-w9*3(+?znrhL^ds%e+zYd1SxHpZBM4K80H2B2%RVf
z3&Od*CQ|E`R-rj)E$Nw0R;Sss8&)X~XL$%3f2H3x*m$BtZAJM=P&8Go>tyy6Tko59
z2wwwyzy&z#OGOFd)(ZY<U%a~*>U=$`V<&9g;2O+je6R6y{j0xZS|jh9UmiBO8D|!8
zW_p7XVcppTZ-xvxp>lGCo~Y`~RqtT@9_!DXmPY?@O)+zaqKnL*3mD+VxO$BOJNPIV
z%aVwof=^{>AH(?$13z(Obg=#2n`E(yN9=JCy9#rZ9_<Y6E#ePC8?j%HNU-&7GRIVM
zLT=Oz9<cd?)eN+K4HwaQ(Y1Cjxpo?P4G=czWI@YjNd8c7>MBnQ<pm6%XKU8FGyUOn
zKxd3#A_(D=y+Bw$S;ue)_UC$QW5{ybj~#kq<n@z(&+DX4k>MzTS0snUT8Q#zM<8L8
zfdE}pf{(&tIX^DZ0C_hNus+(Ha@W=XOr60$<+Z~N2kb%rfzntl`9V%}i<Z~@QQ-Z<
zZRybZCpR=1B#tL4dnXpk!ve?3ebKE@JIp-1vo37zPaUurj`DeE&{rGez9park)ZW=
zW!_{l<QA**Y7@}zuy5&5&~*MbZY>FUeympKJgC9&3X@XKNNmFEUgVDb_hfqfKUCgf
z_V*BJsXJKu008g5bCf91_ojc(C2)?S$vnHr|F6>tK<F=_%`BAN{(p{#RPF)JEcGf^
zhG5Zqoz$UqJaNlzmyFfs!#<-Pqy019B7pYcs{2!BPK#zOzeRM>DY9^YatY?Y(-1X#
zQiT^je?O~L%8eYz=}4^9E)<6NKF^i}Jxp6MLVVlEZPwP80#1#k(|r%mDDYB?L{@yv
zq}BPE9YRXFtTFjEb3pm4nu@v;(jE#1s=~nT?)!Qnvr>iVG^gM(GCJp60zQbW{$si<
zMIW;E;)JT3<XMkh{^U1tc(Qr27pqYT$odP_I!eMLqJ9Jy>`)!YRCHiaA=tUp9ad@f
zX+zr|gysVTN}9`E%&|xW$TU0soOHTiyBd}!LvV+{z#8cMLUSwTT>NyJh8#C@+CrJQ
z%q0zl4dqSRYFM9MbWvLJUc``m&bQ&AAm_y~z&FO=c-BD2aG#(2X@<~ymNtBX1g3oL
zwUQluX_ge{x3Y6#WR!Cmr@zj2FujApoczfbS)uT=s!9rUGN7r20;XV^p3qY#^Slk>
zqChxr#kvJ;ix0eF8?olNa&c}z<6}{La0s?{Noh@iSYT>E4K^pqQEV=2s;}KiQ={ps
zDP@gttXCZt-SDGa&XG|G*m{rY#)0qduEs{7z-T9wLF3%ak<LnWfhRy}^rU;#^iynb
zlRlw3%frds?Puy((C@8_!%+o(-uYwz-J^4G=bD8AJ!O$}O)=T>WKD;)A_+-qp4Xzs
zVhr;0)<5h>pc_~a7ek^f?vgi#lWJpSc$5!WV}X-RzA|T6rV7?Cm<so(7b~1;qaciu
zIv9MrgN`^<4o<yixS&K`I>Y`XW8X&-DA-4x9~a@7-iKexl#0|iaPzCIX0mF1LsSX)
z2K(#!%=vvG{%08*g1g-stFxq+p&jwAS*Ol>06|5IiBnM{D=0CAi%x~mrIH-!BV7oF
z3_r6WoZ_Do6d+q5(S$~6hymTJHCLpz8`vS9utZBLC7l8@vcw}0(!I$na9PMjwHMcY
zJ#h_o9`72I<Ltz$W1?@c;+LSNzgF;c!QnoB5b+O4M&Oj4-eL6$W*gY{x%1XQQ)v9;
ze$0mJ%a#<=e@_OVD!@eO@{jP1rTDx^u>9?7`Wi<6gr^Bj*mE{%jG*hx23Z@xyi{OE
zJE2nzmQ{g4ez;q)o05P$b>_NERi5m|gx(Mo5`^pC5+4Jgb{~-;XMsvU!E`H<W2HON
zP#DK&U8cEEV|#wL$23=TN$}vgonsAAE#sC$l%@Lm_KA>IJ3Z)l#}j$O+5xy7`1EEn
zg~@>AcKB<qMv8Dxdx;GfdY!ti5JmO(WNn|<s)jzBo3krRaU1Z0Py}*#{8l$LX~1ew
z{e7Q>fmR?A{IGk?dbJlY8uzlo3O6%DiUC_I^b6q;mpqO-%wZdk@|ti+;{qC`zvF{l
z%Cc^+eQS($`*&eB1{Si{I#+MQyOEN$ad0pLknSha(UA?)O8!e92#S*XAH~)JI`&*h
zH2*9Y!`_ped5`(=aFy}0{Mt}0+1<Qb&U?~raQ{0Kn|*%^ilE64hV;`b8M>4e2`uLk
z1|BCv5c&jIh#}+1P-pItajN02ems{sG4%^K{v!j)SH+4n_{#I^NCk54YWVM?VMlgi
zdeoxN;qr9nOr;W+XVA1`dj?NVXDbrZPEw)L<9*0p$rDH3`M*u#e4PEAA8Jd38?Zo7
zj@yd>W`@v4V<^a1Tw2kE_WrIZ0xoaoS%u34^<2dBnUwSNk6;1G(mCkxtqYPei{1^c
ze4KBXklyHCmPef-cB{a=R>vpT4#CH9eKCgd+sgO%a?^%CbVd31!HdaVO+W)oq1h-&
zseca$S>Fq%AHdU5t-4y^x6h)S-0->J)bmWzkp20^@>0*E>aib8%iSZVJ6dw~tF(z7
z<(F!a;#HE+GQffV2?Hsv?ksfTf*B!IovMRiI*ZIf=<`Ei+WmTAMuzl2e>?#GN*HHF
z<{~WHbg@-Vd4x6-5p3*=PhaNYWqr*?vmejXA5WLF?&`Hq0EuzQ7l}5iWC>m3QW4GK
zJTVtbNwidG=libsye~eKo>g@z`i_#S;8vXBP}1YGgqd3#MtYEAMLTo>NQ02GRY1&2
zSNg_5Od9GNc^7jVp5z&|4a^zoW7HN^5`G~919_7Nmavt1MtF&2hR9|Tr83QNo!Y@{
za7!G(O2v0C(Wn>LGMQwd18na^&c!3GS6_(wMhGCSKU=qHtZp@=IWIED^rSTT=3;GU
z<6V~;rXA$oGreq)$picR-3;2*VLTY1)h^&wT*GF(Qk0CGb?9_~;PEC<1<PA^)&r<$
zg@$0cK_u}px1h9qi#&WRPchvRStt=h*|jTLQa?C`dPBd}J%^g(GN(TUqyj^&?koY(
zns1#~K?(VgJGW@|8sy~|1igkOBfEM@ZyLnoiV4cA=I=62*L_>zj`00yZTu!?czf2;
z{&hI>Yt;lu2z_7rx5xrOTx5~<iw6dP01>hNU4y|e|5=HF|HbY0Bm8T#`inaTSoQ&=
z1pxrVK+?c}GX4VkzgDUb|K8e$*;f8{<e&Ke?Fugmhz$IyM}SCV{C60t?Q4`TDf_3t
zaDZxC?R48BxC2da`#(bg8UEG8|G#`+eEn%sLcsrsG<>n%UmExv|7d!Ci6}sRGVKJ^
z^owW<dbVnRnw3hd46u7OWvc?29={Qk>GH_;IbaT|{OSB03Yg_v#NcfauwB9E^ao<Q
z;W6|7Ad~oE>*n4(_PHj!a-f?Q`T=ZV0aAmciiB!~ed_|t*k1s<XA08f>^zfrlNHx<
zeFlxyJ#p+@Fjd)a$z1Tx1QBp)eNFl0d5aYxf{`~whjzk#Sbq{GCTiErg9`kb+tjDg
z${(}#Q^Jf&(!jtH0<}q@Ba%+Kq%j2!Ys^fHZqfnecif74yNS(HmSWaxJ~D|Vsv|pM
z9wo543(&DY!38L?wH~_x^(V9ra=X4N=jHgk^%Z(>P@RN+%x{%OpZr6^Zze1#spsz7
z90MsV-_A|34>mK$o=<B2XtxZHdW&DRHP{5y8svT#2GRdq2_vt*{aGxPWh9Kz7@C&y
zB+jQ0yQb>axq4DKoD{MX=U)$P$;W<ttR9!<n@4?^KH;tO((vmiw5LPUEy?2_CBtB7
z_ttiputk~-YhX9~xMp>EX+M{)ddSwO=1zm%ol*KuMgZDT$E6Hb?)V;yCQw3=bbZ){
zkZeCJiFS5~aI|m`8)lroy&I3!y|;I+?>RgN<ZHw;d->Y{E}a)vZv3MVsb2Z6s2<GG
z#mWhqt;V1S!K0N`H&v_=xDrBuH>nH<gN`cc2n)dj{recwg-)YEKN|%VFavKu)z;zy
zY+D2rvq?ZQee1~Upm?6q#*zN<Q-&8ZTDM^bM4lLU*-0uezv^|r_-tGaxZM;3-h3i6
z2;)I90yYGLzVDK-M02iQtHT<+6^1htwc<e}G@!ss)U8-}x6~pdllVxq*2a^J{q)K*
zi~yoJl~kgQ-}LUgX;>D_Z;u-j`6s-S!%oaprzz6l^DZ7HWP&5{*};}aH;?L~?IYq`
z)3>ar;`p>02kePrd{rmOiA58j@Vii&HM0%nFWqBb0>a1{7I7fX+muVm40OANKr$k4
zQT&_H#y;5HjwD}a$1bXS%EoHcOndy(bt75Dyu~FD{Lfac+W7*#Wzk7FOU*_Kj(t|h
zoYcpW1~0OC!8AMVQ@+x$9XtwejbC<RnZvDIdHo67Vd{G2*>H99e3fvVJ}WqTVK}YP
zpJq%fZSA_$J#72<`5YZHrY@j4{;*VeOzd1GXDRTol&T#8j7nj+aWWa)DkXhHH%<Gw
zhRH+lv89sMLk~iH2b7he;zFrfWW1n9@xZL#jakWy%j>eBV26HIfE}c2HE`PJ$r2;`
zR_3m6bBdnn4Nmx_{19njNwdf|PHJ_7ntOS;M_l8PEf8+{vkyw;m9N9dLe#c@?IW~6
z1q`V=Be+nHe*x5B<kzsGr@)GgY&x@=YH0)6M9Iv;U8aO?Z6)tm)yb_IkVCHYRleqh
zR_t?HJ@_-G(UX@x&4gA@hlL0x>X5qoux}tWidLx>BW~dgsn`TNbqY5f24<VZsp-I4
z%pjqiU5W{IEidn;mq)k_r6a|TiZSx|+kTQ^qrx6p5Ryo!2PtSO&f8g4pS-1+)X6sq
zB=2NzDl!rw9f)jyIe`6nX@hr%a2Cd(uq>IrW$%4~QsqXL^6(wg1gz1sT+b>~r}j=$
z9TU`ziOMU#Tu=x_6;s@m!KHgm?0p7C=GOGe$aOK)QKkG*&~h#4DeKfH5-F>Dm?Lv8
z7ma2Tpk-8}q*sqKrzJ|eSRzjCnuA2&P=%x35PeXyE|1>HDb~8^RYAK?rL5Cv?7I@t
zs;8ZC>{H3_klglXO+j)Sm>*|K7!PM<*3Y{2zjLC2vP*~45U3dg8o!?hj>h|ZYBarj
z(FhrK#N%R)a5-Gl-Dl1JQl1tyP$pgpB6WCrJg>^qWr@W*Nqz`!BKQ#ftg0@r2y2NI
zmF&+m+NK=%G1I4~3g+qwNP;sf#jNDfCs3OmOreY4f`T*h$E+vrO-X3adUA@ulfm#v
z3TG&GAT5AS(!uf(>Cef`ft8g?hx-3W`wHMVmTb!wgT>6u7BgAQOcpaUvn-ay%*@Qp
zELqIV%w&-*mbU$7-ptNlij5!9QC(S;b+bC6^PHPEFD$d#JAaZ=U4|aZc2|ewcEZls
z6ZU^<J{~&xE#H-+wvhlCqDtP2cH?`9M{LbZqXsGXG&<2~T5biXkRtVcd(2V}wlRwZ
zv~ht|<u4ibHNBr_rN~8@LJZgx`i#24>`$!a0>FR?egH~>**L&mQ(!fdWspd`xQw)N
zu>b%-O#r~NYd{*F+UAE?3N7&$5h3~s06<Ftuzj=C015GL0D${%B5t`+0DyutIl=T_
zTm_N`l*$j1&GWa>?Em1Y^}pe^zkB|vtpcVcn9lb<+05Xq@SKqXMfG}H!?zL@u8?^%
z+`<bxARj3fgA|R;JUiawIuo!)f8;-#XGokI7Nswt!h^a>W*}xPzhInD?$3GikF|mo
zs100C*?PPO|E|2~XXT<EXo!NoWvpB!IHW453#_H8L!BNx?H)HYN}sYW8(ls$<Zxm$
zx@rN_bEzJ0LG*u)(#J9Vd~UQ%$-mC>TPZM$F#DyfrzpVNTO*3m=B=Htkalt8ej^f<
zTRA);ZH!4tbuNQf!&)KdAlW2I88H6ki+LM;+5S+Up+GLgvR+yYPE59x%vG70Xla3z
z484o+r<=5j*M~beNrU7Tt@*>eWp~={7@NXM3K(Cms0SaA;IneQN%fwRqpLj?nK(Yb
z$*||}yGjd^QOob}j{ym?*}M%yrwH-ldov3LNl6Pk2OYn&nKYZFq<$Pb6RF&TJIzfE
zKJZSAHA_>HkG0Y<mTJ^QigPq~h)9_@oJ=hFo{hFdwR?oKDH`yEXEwhJYHzu9^q<Sm
z<1Mv#E3}UPvV^(NuuBVoh<&XTEhr6>6pYw!kej^o0QZtl9#JisZe<}Jd?0RfxG%<E
zJ=-(Z|BQ14*Qz7V2=m(YvmXHKQ0xZcHVt<Jrei1bB0o7U>(Lc#m!G!)^ZB@Bd#|Lv
zA0!HD9Li&Jpw^qiVXG><_qS>G!0>_`;WQG)b9Z^t(3`jWQJ7q>E2w>g910&>iClv8
z)s!tt1oA7Y0qYI)nx|!>Or{5#C9_sKgV0FVgNs2#_=RYBV^+9?S+U>Gw^3PiA@zIe
z3|XuaQM}JvQy$?4f~@N;%K&X&8_H+tr7WlS>fob;-L()*iSLjrm+Eo25Row?6XLcw
zGr$a-IqI}Igxf@GzgWbQ$R`tRdYigFj7`0xu=uj42CVuA=!Gk$STi^XRcPev%YZo$
z3Z{~h7gLwS*Rq9H;ju_O{qitpcIp)w;*%8Q_~gH)Z(`h`kIxFBbyx%T=4lw=8Q|09
zZI>n!!2xBE)UHdc*z85xUXBhqT_eW+x_LrQ6(DkR6xNzAF}0NJSrsMUKPWQxeil-P
zEYP7ApU~8j$#@S*H=xgTfAb?1txRcy-<aZ+i!bukarm4XO_+pjEuzr<XPP2j181l(
zFcsKeGc?){=>7oo`2=A6a|(mj{&m9c$0qR4D}SacInh%p#b2uO-xC)UI7`9r1=9uo
zVTn@e=Lh^XNduPTXv>yN(!!Zi?c|Hm@h?|2tb?TTnN1c-hy}bKYxZAad(gGtSw$@G
z;$P28O^gX-y?EO02)j{<(}K6=LmPRetPr9jX=5%1Lvl8os1Jpv+Ki5G07PbMpJKv`
zom)k2qs7A5NZ%EiG>Lad4!#x%PT++c5+L^$rg(qE^LS+bh({{sSeXnqE9?VqzUw+U
zF9bv2sqIRYP|VY&hKVqwe>d$Z!9CZnX21Xx>tCzRa4XBOORcI>FA#DqRNYv;6NuR5
zY?o)kk6v#2rf$}H%1=q8j7|4i;_a+^vEF=k0tg^bbOT)&lg)o%>dPeQu(>866ZDa~
za2ln?N#<pn`lodab7^9*?^r>~y_`jik9PC(&^GWj0kcVzoS}uI(dvD8f1(Y5&h8y~
z-5{$3Wt;0NO%<=x22bEwCjIhd)ZJRwM#x3jBGE=o1hQ)cgJGFA@D02F0)3hdY=02Y
zH(K!$>0hSs4mo1bGr95TL+sujLRU(G)C2viWY5lqkJs=hYzhn7>Z@o*pXe_^()g(s
zY73R%sD-%0fj&LeTbYUZ0?CoC#h%8qmnjeXMWi;mqvEO*bxbvMlh{Lxu6NzqZ3Lg8
zdratj;iBs%aAQl|NeW^tc{+<Hvb|MCGoW<?Mqr)>Dv6F0?0nvy=959MORD}M%+Lh7
zLH{cBOljhGt8NXqWFZSF!P4Al_H-Jw#F|*w^z{I{YYZW{A4ezaKC9pF8nNU)HVCZy
z_pN-iuAoE*8y3l~0{d;zB<~JmtvO$^9yL6FSU0d{)YIT>>hnK;pVi+{JIKu{Y#m|L
z6U6K<h}CB=wVWEwx(^Z&#Dr42{;fs7$#z_0qRmi_t3S>A83a`fUn=CBsaB~v<4#3v
zLC2?jht0vdoyCye3B9AOo^jAeYugf5k?dmP0{M4l?#-+pZh)%MErZ5|<ntgUTr>LF
zAtdxqbH~#e>il3dwj(m3iWMzkCxUNx^9OJ?2UvA2OBnof6hCKsDI9`=ywo{*#u@ag
zxs%w5D#bU6{1!>mO|TTyHIdoLte~2nml{K$v*8VVe@CBUf~t+ZYWTD4nt4J9gBgsZ
zfkI6779uK9kR%70D0jRkiPqB4lE#S{IR#l?7dlHFMktm#WR-n}`1l5r!%!3X{K*D>
zvVFA?oSv*Gyb;Mo#i0~8#}CK3>SlxEO2@mAbXK15xm-w+!2I}mVw-tt{AjYE_ZOGq
zt;0*dn3u#}&CiPQ<)?VewmV*_$x?2+d5w*D?^M}{xU#ixo%GCx<r^poq9hbQSn^ys
zAn0wiokba@_IfQ62#Y0={LDMW-Ce;bBP#ciW$iS<#hy&^qw7qi;ooK|=0Sw=!2$!g
zg0vZpJ6kuwXgsGd#fXy;NmG{A{BNhIg7DyW3HP1WT;`d~*1Lxj;*^@KWW>NC9_v79
z$`256Vdxx_XJkD<mByV<9BMmD#$3Jbt<}6;oR3+D_7v3+>7UeSUwj!Pn!H<BD5orQ
z__G$`u_bZl7lm$#f60xe<yC%;b?2)XR{n&76CrnD$bp9rozo8vn*)nO<^y8DB4_we
z$jVB;M{%E2HS)y*0!<&S*$Z&z63X|G^OChsI%0bm$FIeekh8}RigWo@pqNZiKvS@-
zf6_V1r6aQTTXrY_fOrFhPYIB0-#_q)8#NxGaN1%DEN6EH;P{{L@^4+{A80B24=4pM
zhW*bjKm35J_kF>1W652Fu*BXVU#xwtFx+Kot~ioX)TuWGUk4}s1q>37$%)W5RYjPQ
zGPO6tZGF>Rl<Avn>GF?XZCsMyZgs^RGt(1j=^@7b<j7+atD_3bJ3N$DTPw_U<CwDb
z5wYxzuLtf*lr|s=tw1X+OwtFot=8}Em5P2>z$FQ7>PGkv?Yd`lyQvSJxKBZ3VFUVH
z4#z`K0_M7~=!V)c)^K#DjWgc?!J2-oKZMW}&BeTZwzVv|u;jrb>K`L}^(7hV^YC20
z7agEw85gnaK<`}CGqtbg7?PwvR2m_sH$Eq~)n!{i>uQ|X9QrevcA;3N(e7rXG<3GN
zjpQ)~Y@NL|tW@gZ&^sSILLZVW#?~`UV;!5BSvyt3eud;w2%A3VdyQRCOv-k5H6gJ@
z`M#2Tc@>m|y}IS5u94&#uI1!iex<RM18{dHXsdxg9wC)C)TN1q=F|$T>EupwPED+o
zLfs`4I!L^%#ER2z$#+z5COWDCmHnE@tQdJ=;aGskTBbF7>^a!Fj1ltV$VPdyl8{6h
z;SdTA17TT{s!s^|QhXyD?j{j1AAB!WAYh3QDQA_{CgAzwwPP!mq-(P1O7@1Yk(w4{
zbg+Sj&x=F?uV`IN59G9*F}C8h(2JW)t1o~Wx`AE~>LWfYB`wEKMU#T5!r{BEVv=Im
z%e9{+BQ-n&W{<`<x62)ELY3Us3$akdH-UJ{pf~0@^@eU=!**_61wF47$|Fl#m&Ws}
z{tM7DI?5_(Qs-2Pc?Z$BxyndOR_nkEZQWD^!ZpOIp)bAIVC1=Ak6-f=jHE0Qd`E3C
zb~yvMgsIr=RsBW)gTDEU7w=d5r4e0ufx1KeZC6g5N+0}^f~xPr-|MG*`L#-`w&bKq
z2=M$^=~ClP<73qVITQi|?d?0i<Ry|Wya_Xbo(ta?kz<A(8`oAbZ$c?$T`;AFK=nbF
zS-Q?kZ{?&e%ZZ9VZ7H@Zlz+-wOc6e}{c7!_oxM5QCE#MnS!MusuVX*<9a>tmTrw`y
z=`I1n{g@d{;nDN#w0HcrRbD`OWJdt8AxzVF=cRXG*4WfcX|_N`$?nsYuU)P%|IQ*}
zLfcBdHMdI9r|15N=e(z>Iaz1V8k@EqDjpd&^_|GZ2Bz5=9pctnnNq}3tB@hYq4XSC
ze<IlU($1<%76C1?eOz~AtR{O<!GU21+(0v8@$LJu%8%C7{@Uc>a>=(Mvpj_bi=FST
zHB;)_C<ZYG&OY})V|v1ad3-2w2h5GSA6n%csry02VI)8OHnPpG?tzEcA4G6BvvDTz
zD88U_ooH0m7lCD4c0<XkxmzQMLJKOv>0F-dMNxs&fGX_$W+t@pCYNG{%<jD+zXyX|
zXet_*o80Nz%qy`*EoN^2AvnxObFV6<oV_gbOzda00j(+Rt}|1n+m0l<<ZTmFFKP6K
zk%_Y|O=rr?4&jaZC9pNFFzf>JpfM6u@HyIw1<HLS-n_+2K2_&Jp@0-R#|p}9-y8+h
z`}DJIqcOxR+5o&@P7^J-X1cp!>%u{jZ|Ql<>_nCHPKTTM*KQ(s>UI6^-3rDvw8+V5
zV-qzTn!|{+>^$wqMec}SK&BH)3E8i**R}iNiIe@T)D85DdIU|K#8b!YL-BrwePLAr
zjK1ziE%mpe(xhIwCtJNiS6AsQJz6G4S1Nan;-3i6w)eM8dQ|}6r8Q(x(H@`R1pF(J
zDX>w>&0dTlhP!`hjx4+)BTFfXkTSH37v|#Yd=!P53CIy02EP=Cuq?J~wQw0rpRn+$
zzivN^_cfU5lk3Mn^Bb|gX54-{ig<X)`(aNGyGbdt^}7kQw<qy?4YY8v2_ZgB?zfgF
z7i3YrF|EzMGi{NWZ=LF1urVQLYHztHSe>n0#_$I=_8lB<mgVh3$i9W+IUaS)io7rV
zBAO>1M)E|(zbEFT&+8*?&Wg?l_vpfq5n8YU^xX)KN}Vu1Y3aCzIy;r!`69CSfuIrm
z8bz063L8(SrTi&Lnf|<!mb%lZqm&t`bamL_&aFt2-f6HUJ<y{(vnA2QW8C-IeRGV0
zo4rt6pupPWI2l14F$=X!hSB1)Xt|9w1y)6GR17s8tZqJW5&jqynfdcQXY&CMX>B@*
zRoE?~Mvj*kpW0N~+^-qcTvo@V1tDxqZVNBb(ZU=+ON_|2A$~hK@}_aJXU+>n4VtNq
zAXNfLF2%r-xkOVLA>4doJ=FjTX|DY3c%R;?(c#6ZB+?|Qomdo}z6}&L73N5G`({39
zTj!$)6d2nVoLGnzP2cyK4i(N#Q)h#0^&a)cV;<UhWnhLBXq_^qA}m1P6=i68t+b7G
z`Quw(FOc!TFoBdQB$yo_ip~r4&xQoD-e3HP5({iR{wF2=gE$-hTm;nwfHeO5uBQM{
z3NSHG-oJy&{$7jxyVHNY@=xadn~wPmfHK5^X@dTcH(~7zAT>5N?Mo3Daln6yfLHjB
z_MiL>mCBU>RNxE$Eecc~xc;&HSB{@QUfJh}V<*j^#2Am7T3)}XYS1<a1)U0#E7yhC
z)~!iOzGn}@1twCf^TAMR5>j9hw}GQeoPp%5ej0?yK62D##7b|bOw)vrlr@klkxLiZ
z9f44RPBZIt>f{ndRc0(#-C=Bj*SgAz*PheD&o5|Vo;Lxz17p5RnqNhC5`8DQ@BwDN
zzvcsTWJh$s_JzW1GU(&{Db)yCdGxh|TX>yb?9*=Yi4PfDFunTQ@VZ?=mCP*qa)?_k
zm|HLiNGm@0#Rn;m%}>F3=rlqo?nn-sLmZ2?1U{|&iP|6aXP740iU(Aon+WN`GNwDP
z6PHOk*qlqYMgGfv6*aRCh0r*^DCrjYjGJRX4o4XRJO`L$oqv3x*KVqS;Bq2LtdE!F
z5ojW}aX5N_`PwG*KqSijyCH&Z=FwDjDVs<F+Vr05MR0uTJkI{T7V_Dq<DB$K-HjYd
zt<$RZ%Y{oOif7jzH_B$8--OhUmt9$j5A4mXR6*_HS1yx*Mthy>{9YANy6K~Waph<Q
z>^h_Hq|0A5V+y5xAxW25y2FG=;VpLH+cVi8YVq&~5l4Fk>d_Pub`_rd7fd$1%&<vr
z2&={M?~lL`vmszafbMUOs~->4;4onzKi^$LvzCw-q&8LNY}enMP@-9BI;GWN@I9BH
zBOYbh-|u#1$1^I{<k>HDJ_q|W_RPPikkNI<<FzaJ<X(!qJJFS15lFETh}n(wZ4Woj
z+PNU6S3~Rl!X3GdPagZZrM}=mre``2DLm8wpNK_LXQthL&#MKC#(QJ&8W2rB0%chU
zjx8eCmQa8RkqZlqd-eCmJ;oulOcm{hAAs$v?BI0*ZRhY4Kji|asB*W@KIh*z4Q!JY
z6*OJnC4y~rgZIeF&&Y4qxMKUQdODK-d;L__Ujs5ZDQ`tFm<#0WNPQN9Z*w-%e?$|G
zWAYbO<%dB6W9K?Yy<eplocyYhOk#=OqOTGoJ+Ee?R2$*K)O#{Z;my@2Rz(*F3_tQh
z3d~)K`I^~0$uSfc*xzXILQ*#COTKn2Rdi7DtdR*HMD6m#Ib@;VCsq~mz#1fw_0VQ(
z4^E|7jAJ{8A2vd0H^!n_6d(Ki)+$K5f20{3uQ<Dk*y-I+j;0#4KM(#0nKu97jqb&-
zKx#BR&qCEXU+VC>84!MD!L!jTPRC$z<fE--m70>cnqeqppT+pu((C$xt}0PbMLEX<
zT*<~Vb0?z#iDL|m=oY5zN7=?jS5d7@_`5hB<kyG+)px@z4Mdnjr{l?P-KF~hIVM*c
zUpPkEF(j=i#uae3?n)KxPdM5&gn27P>GNhrq%%=~=q2gYUW&}X=q*z_N@YB^HI+~B
z?+3NKy7Q$F6OOpWlMu<QB>V{^Bt2zBrzJ?C*d}uOnPU5#d4b7wH<vifNW01NBGTh_
z76GU6bz^?c)oanJ!7rYmKPiR4OQSi=D?bT6XKCVoe_@^jwR!tgtt1qcM0xcKKoLRF
z3V@sd0+*Ix_RwD;E;tDF0`2}40D?l1e*@CLkO`s`Al#$7JIoJEu>KFU!k^l<_d_(t
z%DSYxhIL*s<-2*ctY7H|T79Y*i2rl~y#k5{T5S*if3Wp$B>cx9f2_8D;Q9EUhF?@z
zzrTn7&yN3k&;Rv=a0iH~tAgnl|B7@0A%5G5e-4wc+dRrqP2^!6<!zcPVCrN_`-*m%
zW+3%8uV~A;DnvI$(K@)rYk!{)R^zg+X8k|_hm^<(e$wu?@Ooe<goOJ(Ls`UU4wW+w
z5yRpY7b=AZHl`Ifz-B@Spo(Q+T+;uxi_CfEcdojdj~zSHG)*`Va0-jfI=p~!LU1%}
zW))VuZRcjMlk>q4Yf%b0_sGqR#DfUVV2a##!95gbolsQkr&{Sgfm_jbEe9bs77ADD
z7?X(uH7cp&He_@6*k@5`P4gn5T{7cV?ya}wO?5AjV~^DitPm!~dB{5c*!43N!P;CW
z_*CRve|U&=YK(2HdREeV#6T>Ir|sI*hq`Af=%pa%+dxQW74ti3ALdMFhcZVKKk_Hd
zfP>?2{S2A6+lwbxpr=*bS2V4IkWK<Z{Xb})1;tHXoVcn&GGHZF!O{>OLETBCm@XSV
zj_4G+R>v?R0>q`V*J~nK@1L->>V4N<q=hw350y_?6xwD`Sa;9nu&tV6zjsqttk!ig
z8t?}W&cue`p&>-Bb%WwH2`*WSOnH$(O0Kg6^($fNxT%6>Nn6O3=;nyX7P8YAU-^D#
z06mkI_Bh*z<X8Hb?wMZCJnb7@<BLPy+@q?YVN+OXJ#S+vYaQ)U)!sGTt#$jhX=Kk+
zBmmtJX+Z#A>4pS5l+oSqn{_^^+uWo5yPAv_$vM}vl!M|VmZff|O|X!L^HSj97g$|c
z*Qo1|E{-mAeSGEPrY8~o9oAH0l^Uf5hW{|SOyJqhJ#8zt1bN^G!unjHT<0q;=g4S*
zOiWXQK>r8{N#G705INLhiA0(nm=52GAgQPzBDQ~Rzj<w`SIyqP5yGW*_zKIUN1rjy
z_Fb@0Zlg}j?9JVJ7OVc)x<QDnW4j>T91nU;4r>!gRRLRK2gk(K8}SG4IeiFY-UBGs
zeyKL^H?<#Z^Bmu{HY595xNfzb&WxIwct{++sT>gR{D~dtPGnF@O~6MkO7=1AqoRHW
zH0pX5A`F;-9pIT@`=#`3I-I4Z;qNTX-;jTTZ+3cW)fgz5#-;2N$0)W1X0e2zM7mbc
zSLv3Z3^ZS^OIcG|y{Ds!`H7}KEoNJBaH_Ddo}$FV9ZK_y2;1Ud9i_W*d4qRs{_aIF
zbRRHvy&shIC}-g)A`rB7^Og|+wp#($WrlMy&IG2<ABJhKsi*VmroE2fprT*E4C$3p
z>@Qmj;znLk9&@1rdB0YN&YCJH`BNGXA|;%}UO8r#_k`j2NoeuYtqSy6e0&$}1Um1#
zWqh)bp30pXCxY>de6io-Zkf^@R+jyA@*Hiymx{g-9;XxcB$06VgqyN=Mtp$4qeTLb
zMEWRU^O`UTNDP!H<#G%>f(r3HZd`Tvag;Rs-~(x!hhj^_2u$%Cf(ht%xg@UD-QGFm
zc_^HRBBx9oghz&t5|!fQHA6LvcWd3ZqZD(70u?%v0)fG|&VUYx+;Wq|mtS*|C!%8x
zaFI+{AN<_8U!;#ONU|+vas3@v&+!>^)?ZRDqN}PRG8cF+X!%?8uGLH9MD#BnuA%0P
z3R4$YupW_o`6yz@aK^#=hJz8y!|Wma+~uN_TLS_DYT%kQJSQbQQw!XoKYN{|pg)(s
zPy(^gvkwT6mV!C3f7O+xppJ|Yml0VV-97$NHsC+KLljf55)NtCssyD10By&<1^|GD
z`Julc6uj8*&-YuGo~&@zRz9swYQCTVfN7$B2f!4Katj*#E$8as=iCl-@?+fJn2S3D
z91R%1Nc~SlfA9k+0AJ#N55-_a|GEQ)^{>-EC-gvi01`va=YOL5|3SciJo8`r{2>NN
zTEPs)e}Ot+sEjdUQVm8+ceb^h{bACDlAxQ?Nag7Vvge`;T5nG6zB;{<xS|?(l6Tg;
z-RpI>cntE7%^bFJ%-L561hu{PVD>M)tr|(%M#E)~sBq}G;7BazHXqaF%D!qv;^{HT
z)yBE8klFDleZCV4xi#NqF{IHLXy2U~pMeU5P}tf!IagDr(o;t}8Oc{;B|JTX2RLyw
zGXzywFPGzkQFyNj<W~jD7&dFC-byQ2bEW}FNlQ^EFo7N&5oFTm9lzdPS&KDPRmQEJ
zVG4aLl+D4*BTy8tB_l_nsR+t0{Ln!o&(pnW8;!dXKWo$noV)Rj$vqVkYlfDy$L4le
zaRnRdR1<yV8pSd3rpv)^jc@gIj9K9|dDo$3X9K=4(r{fIZfGH|%gr|-20Z-p$b4fi
z*eCO2YFmOSEoW?&>YW3m%=<I)Op^$HErDx1AWsKxfke{^pw24ULyf$nmvNGfC>NL=
zp1$q9XUm35ez?DvGq8ta*G;`#@Q$Ecx$k%wSI)54C0(X|d#&NFC;r|7=A(Cv8<mFm
zVvn>G58&~gl_8l4r8_`{R_@3%<`H1S5WtZVGIL;ka6p-y;n$>1F-EvhGSGyBF_;HC
zp{P4a|J1i<s?j@j+0Uy%qX^<V*udQ#f-@^4EC*7J!-f4#t~>U05&W*XCPRlW?DW~{
zTaKFyjF-oWm@;aPQq(TI$;f@c26r@SI-CMStXoK2I=}H1%`3{cI@Ixupqq*Plp&*S
z*#OBvVI_Y3aNdoHb=tyn@M5tqvmAlVX{;#9A*3%*wz`wu2(Uq?4pTU{HUlA5@I@~k
z8+fGFQc-r6at7R`J8UzE!K50Ugrn|lOI<BLK;|_QDY<p?8iS$G2h4~&0=~<XNnWh~
z;(a%iX!G`ejQ1YEDDbJd+6O5(eRdj|-JK*0$uGsEQ~TaP`bl@^Qgr_vskeGFBjus8
zq_(@>>~b7patGPq_c6U4x|AxJ`ZlJ&CYdd9=5UQcFTHUKqp2m1QEYFgTNvlcT;`Ok
z7abZ47QCdtfC|5d%nSk-y5=6A$3jG<vp$a7V&^6Y2xqSdy^}m4Lv*b0Cg#gSoxKBI
z<jA^NBJ7k&1y$)a=T@Di>0UIZ#H7Y02OB6RRf4PV5e@nZ`XEZN==(F<ML7&G6Ipai
zRuiNV<|UlQCzZ&>vhx)`yCzz@P4>^oOE`{M!d#F=Au0?dB{x2rsG#7?H0F=!xpAMm
zWS_|-`C}=Ix?37tV3c2<h!)zYe)2JAT9F61a5ccQ?aL(u`q@sE$M=wW)ZZ#`r##^J
z{{A{D<$pkECcLE)h~o5F`g!FEEO@}ht9YsG=JyEDLpi=9KN98+c8Y?JK)y6Hss~%k
zhi$h69kgF8;F)hNJ5)$m0feI5M-NPZ0;HA**+w^+Puyjh9O>YrYR-IMuI$`mnAEn(
zz7AsUXOoX^T<iOHYOg2NgI*-ZI=f|Vla|6_)lTz!SD-E8$0dH(C#Jv#uC?8Pwj!=^
z)LYg0Pu{&tP|uMbYG{1}`U2-niEbb>hRO23wW_uuxB9v6q&Nf+W?5(YB*Ut}t;Snw
zG|lO0o2J+ogv=J}XrC3&)fXL=-q^opr4U3=941|NdVA1j+R*))tk_#S8GMIh{@!hV
zT1YU!GEZN=s8Aa%ys}~qNRiIw+lB|fUHM)gMfU>Su!Ud?(W`-!gU(pVkCgbTlC5{J
z!*~uh8nOkdg#Vf5zT$vsF1O74;U;kT+A5k}y57Jcb*c$}8Z1>>oiX!dG_a+GV7h6K
zQf5+q@M)J_pJQ0u5jj-uf)ymaa%i?<b<+XOrGx`rZaT_5@AgF$lvq{xXI3(Z|H1^F
zUg(Ofj{{4xM`XNht-r5{kqO1;o*w+rQ%c2T49Zi^Mog>Ey9@<&+Ac*BB^9(r$nTsc
z-^B%Tw~EW9#Xfi(YC%7utZz=SI@rZ9K#Wu!K^EN5R076Fp0%52OmhU<bj%v!Y;t@S
zs%EHzGFDo|zCOZ$HqSPf8<N~9AoDIA`|!9-tNUO-v^cB}OrG|f-iX!NuMy&i$Ko;c
zaL8k$g0NMdIU9R|LP19R0YH*~l%p@0Blj0i65K|*a}4;AF`~PJGQ)ubS?w<hgE&4b
zEC6oCbY%+Q?zBh>Pzk2RR>hwfnctk!{OKYfQYk)21{$QJ_tD5nu%oR5!xYN9Q2RGe
z5deAej~A!S|6{!an*H|^U;r=)=sLfDH-Uph0GodT#O(f%BmSNrXg}kB-2ca`{@;%f
zGQfb2als7df3xHJF;WLJ$+{?FP3KrEqDvu{u6yxkWNYN(0|m&-#vpm))~d6Dq73Br
z=bH4oh>OHUFc1UkrRH8k6EpgQAZsF@S8Hc;YLd7<IFR(%N5x;?9!_oDA2mw6Q%6~`
z@j_`7g=wB*vkW9iCSe6}_2N<1+o2Y{pBJ(mqQJhXgQo0^dh+0SH{%ed9Sj%N6+SSw
zbV?xq@XBjGMJN%nk~6gxuK}Oxv>5nqk*|*%S^!sO#4)(H!p}9CnG1F?;I&-^VpB<g
zOLhVV7H>r=c*-Km_!&DOgm6<QfyxZgh-hvxyG`QmJw#|&!GC<IJ3n#cekqG}yR$Z}
z!V?TZ95VC*IvP`jgWR*m<^GB$fM)>@KlMl)K_fn4?G8yQqu)NJsMi?u&>Nrpj8dSO
zE}#3GZos5VQ^9-FV_MZOrjKp3WvBOV`&2z8m4w@6a=S&$Fv(NHNE0tXB^Ls`$dRXC
z<VTZ>ZlBwr5_o6#w-qEW>ku@dzZUZx!FSIwu6UAIC<(OfV;ey*ResywU*RRbNzA@0
zk_skjlJK}5Mh<OYW+IIu<meA0dGFa7MH5&obdyEN>N<l(IAS!F#6K~)bRb(oeOTUH
zifaFr#(9FX8>ymsG{o^UjAgsTj~EIx!mdv#8L#-*Z!9-h=-7PRUofmpQj`QG_}!^m
zL+QlqV&`MM>*fyhXWk@>*OM#w@JzTP#w^jh+l=p)X;?~Ru7w+4e++X>R@8!#P91hP
zqfmEp{}nxa)n-FSslo|I&4bc6-F+D*7h*l2kA>rqpMHCF0aQ;zGyBg346^}(BR;;4
z*f#vap^rVN?SAQr2O$S@VN}PZC?%4pUNg+1I?@&@tAL9gXn>CVX8MPc0!Ce1@2mD{
zt={CQ*o#}mBB^S|4<76?y3<_C=Yvkih^2+ucvb=dNsTe0?XTbTMsI5GO&F(?r;#`v
zI*=NbMDMZ;g-R@PaZw<PK8X{^#)x>Wgt547Cqzdfh6<GAa?z<Lej9YyY;v=ch=uvh
zejdeiO`$F!veyqujEMg<>ygH-*sX`!KqLOrN3NOcBNRxmn3m-;E}3OF6c>2f?u_z~
zU%rc-0AOdqo%4)%E3G;kRDXDgI<!OHBy$>l?X6w|QRZFT5Z#xet(U%mXyrrtw9f+a
zW#r9q)r{f7*}Sm{Ndxyz#N}DRqBkxkyH*xV7-kC3g8@1{3!ahWa=v52;zy*c<sgq}
zep1Y*#+n=qKgkzi>Z!WHPd@Ai{+m}!N-(pnN#EMnj&S`m#MWC<q%}qpWpj^}ewSs#
z_oZ)T7cWxdG$?(znju`oFXLF)!ivKoQd8`Zc-MdLICqAFw<hc&{T2Te@$x?PYhwLu
zIqXJDJYxOm8h$X>R$hLX;nMfYF4X4L#Y_w+C>b5*0#4$-WNvl#_bH|nMEb1#*HK!Y
zD+xXnjG}C4l8-{P3JPigQFhY@d!cvtV>{w84b8+ZV<qwG5&g+bx6NN7r=v3Mw#*us
zw+?4fZ@!-P7)@Mj&nz4wY^~E^F(7qvye(gnI(?fL8k1!$KgUc#m91(8l+RPkvkpfI
zb5I@yIf-*)qqw&FrfrRXF6>332|Jf*T*#uZd^~g+lU3nk4H{Ym^({L{mXlX_KHcQ$
z`jV_gZa;?4vg1QqXpyFFr<{BZWu3*eakZ(rWWsW}BozW0J7a=!x+tvS?*TQ$uig*A
zYZr(_0^8xhPU*IBwV?6bWz2s)KvWNy$&j+e?O(iDfU-J?toUT?2K#+(yzbMd^~D)A
zk<T{P^%h6M{M2}bQBxcHP+dXa%hW!Gjp>CQ>q=3IscueG^3qUeD%P2P=CcZ37pO7v
zj%{#|h;?23UQ3z%sjGgDbiG{iIbn~^prvQDs2>jkR>uK`ullSc|LejuL=c7NZ<(J^
z!Nfl@(fgg0J?eX0M<0rU(;@f$kLg-WD9b5Zgg<vj9$f7#BdYMQ<u`T0CCYehC$*Rt
zOYWXhsMtQmboln^Df#XPOA$to2nq+q&G~e(%!Eqro#Q7AWbi(^Qs$(kF^KrZ-tg><
zOxnXHBKevuza5!FB}EtvZTF#kHH!EpHJfg^b%o5tL_lUi8$JKdU%7r`6`Y<a<D-S$
zix0>_Z^{XSIDdUu<NS3pwVmhOSD2ixoMI!%zm0b>=UP~?xNIdLKid9^jizn@x=CxS
z;23?0Vp7I28=IDQcsbBef5jkCXDjh7$%)iB{Q_|?*>4p#a(99_m|@jWWje^ei|J<c
zCcbtz>IUGHNayqblh_vT`16W9Zzut>r)Oi+=s?XCs5p6e)bnUpMF?G~=ip52AhF<k
zoC;rKKF#=%q}jz1Gj8;^al?h1`Is#g86X^qIZ+&7!H%z!Ju?R2uFLE^iQVFw)bXT9
zpoo9on2x`l%>Z|4qSGzN{QXt-#G-Eietv&rq9IW_lzUs2fg!7Q@TSEmi1c3HWWCS0
zMFSt3>wdV3bIFZBvC%Oe3bS2pva2c{*)+-)?%Pq9SJI+1yyt<j4POJYrK#X~pJD5X
z9`@=xN<aLFd2Ll!{42_{ncGUF#-0Z)qStjn*_w%d3vT8kX5bL+CYj!WFMuu-Nnz3*
zIV<5(rEGei02i(S-&Pgb&vpj)4uJTlxJ8#>PW)fW3%)!mITkS^O^wBu9=P=V_}2jf
zoV*5V$d*Vts$zzAZrWR3&1`OUO&7xAT+^Qxv856k-SWhOP~XYU!lEuoV0P@;a%+%e
z4W=j?WnQUm`G@Fs8dXFb6}>HYt`XTWg8{|@4FI^>i&98z4=9?OZ8sUE4lA5eA-)Mu
zrb=6U&p{IeTeLW4d~)N}B!-2@dEAZ+OzQ3quk;^k!y4MTAz1U+YiFq>_;7eM>ibBA
zf0P$+Uf>U~1<9%VqZ#4);mxn9a(tDiuMYES<so<cr+NbyaC;Pm{H<+d0LA3co|%T(
zrf(p`MuZ)J5#q=02VgbI9_v0JA`nHL699lKX+n>tK63nAMt=v5)G<V~CuIU)kvh;`
z{8Jc;J#a*ziJ{@YX=11r%xL|W5(PqV{?i7UYO4=Ul;~)&IVA*6H~2TA5IM#<!&5lv
z(Eb5&0}1wh<mWhY)225T4s(M?A2^MfVHbnl2rL~E_+Gojyr8}&aiJXKvobL4{i<rn
zosOy}T;~)y;@0WP&w;s2Z`3A1D+xuyIu{Toiut~EBy{#6WA;tyZ0JLhRO-RL8c9mF
zs)OWQyuqXvYEgFazQ^A>5D{yM*Bpfd#gV@{y+4zXg7=b?6Tt;<6pQ2(1gKi`A1+rP
z6eutm+^tjx#k_ZCwWQf`T$xisW@mG_j_H3E0^9q6jgjy*LmZ1O!)-Xa)15D*_Dg?M
z9(aq#r9GBg?$2-PjbNGA`Gd>IJ8Hf~qK?SGnvEE4yEd5Co;$_*`Ic!;{YBhTi;S`{
z5CIhNjr&P9qoM@SGWY{O<Y3%t@6Y;vh4L0hgEBDsaS?c|M~S(j-7j~$_LFkENo3p0
z<v`Sve7ksmTGJn9gru3ldQ&h{>QhG++DW^5cYFTOovMqMlt@`kTXhyB!fGaGjlK}W
z{(!$U5_?;FSI9>_7VGj3i(>p`1|YAXtg5J>6JW_%4Os55_ahSIp79e_a($3APz7ho
zevRDzb|UdyTXaU6e;@-JUSI7j-M)+%!l~X>Y9EWjf%u(gbZYo_p9VrXg|u9<)2_e|
zx;L|B7kUHNk71nCUpxyRJ?gjQ7^ej4!TS_Rhg5e`pJ?s}m4y2fUb9oT&D*(f#ifL?
z;{`EbDgqW>bI4%h3bixU_|FYdZ6kH*UW7l1kNJ3skbT`fMpEm=7}V^)7-78Ucm0C%
zEu+;~x)8>9v#J{e&Hrh(`AvpyCtZ{1yo%2J<=tL%xlqiNiXAOngHu0B7+LyQTbf!B
z@lLBPa!g|U(O?^Xw^h^Ct1P!~Jda-fclB5_lr2%XB|jPX>U!d^fLD~TJp*b015!S*
ziEgGiWyN*W?40kx5BOicDAO{zXRB{QW#o9ew0F$hQL&BeT$@U6<JA-dA_EZLud12B
zU85-I1&?ov(3pqd(`}+C8k~nQAo}Ti61R!5GACd$Pu#NQ<F631R5C)ry#S{dG9`9Z
zm@M><V(%m;!Z*w9L6p_?Pky`?{0HFZ#)bHUwAvr5pXn_-Z4Wy^DYoX7h2+zf!jF&_
z#5YPI@6Hs&Y`Q-k(C|;FZ2uVa(1rXqBnCl$clWA1a3I{`EPKbo9ab}VBU&gWe|F+&
zW^VG_&+4C&6B{=XSi19kLO_l;*@C_dm-%IVGC+Lx)QPTu2EqFYIWanU!RM6&QafEv
z#^K&2s}9}4{AXxiNNX823C{#_M`a+`*Is04R{!Wbd;-iM-W@<aAXgu?6?Q9K)*ntl
z1ctEMF`EC{ct_S6w~bQy%^s(Q!IwRHawAv6wsvoIKEB>Jyo<wH2wvjy6>9b}83AEo
z&r0j3gbt6~ydAGDOZd_#n^GbDW<=twc~{VK1XQBUuv?MU@mNX>SirrRJi4Z;mfdFu
z9EF!P#EiUcuriA3+(i8SvdlqHhcJ>D+c9^l9#V#oaw>O(56>l`X+qXR#I-IFMxJy=
zW}_oyR{K<Y<OG$ZJhnKR@>&DuPR*N7+a!L4hjmic;8`;_^|j%4-;&85)J32>qhDzz
z>=i{)stsUCwZqkg!lJ*r=M*4^{*Jc-p8(-M$}{&OfgjCOonc{-WS#y+$n^HTG+M$D
zVa|VxGXyqoZ4gGiqPC?U<HG5lve6DKrib~tONux}by9=7zTFN26v{dcVk45;SKC~o
zdpF&_xz1wyN_{DCrP#nGJ;co+_j+3<-T(|?vnElFjMOxk$$b_C3x;=qybiPwm*|MH
znIackOfsuxjotl+`F_2=faX@oU3ea8P+wvbQ%65AEGyyyA%7maf7R&cjtL=$0Lm$q
z9AOzKe1a7T4TL^K6f((92P`*^k_qysbdsz<sswqH1k&amdA4tda)sBv#80lGJ?A^m
zqBn|A>R>XY5(4D%$Qa*45iQ4;Pwv}G)rWTD@QD0c1vrc=9I@UW2IF@r3=N;biecfY
z1A9i>-|TFnq4(J#n*vRoG1q$r94zujet|{ogt9JS&hhjFrry568cCUwzkHr=>Cwa~
z#<mpO7DCiHPP)E*x#)P0G{eW^W{r*FNW|V`$n9UEHd+dU8vezY#i(9-pAa+&w%|t=
zH24;OMt5NUb6;xM@0ZTEwzgOV00AzZ#U{cNRr}5m9>eVp!yY7yifM(v(R5AD#7E<R
zv3Jg2MhM0{AnEA{<}CfCCjcN8V&U}v@FD!4!&d-cMjfIPY5B)jUH}-~#n*tyH5)$w
zqtH-a0ib2FzY~Bp4#WE(SPl4D>9k(o`^!sUah<ZemE-=OlnRtVX#gAmX#fB9PYZ{&
z^S|!_bK+2LJp(WjfO!RXi2#U0I{-=|z*k_PERf+LG-tT}T{H{26(|Ns&JX`ha%TKT
zh^jR(L{<C)OIRz2`%ZSD^JwLB#U_R*W0xw}_=9zKOhyxdn?R_PfxdI>!)7*jMYR}&
zV}ca`u19I}v0U|mh~yl^r!t<fY!n#(wo2hsCs~ht^?bmIlN|4aWLOgWB6WpAvJxoF
z4;B`ahud{#6Nvo*OuO`uo|<wf_~RTDN9NHRq2z2xHG6%*p!mLVrJtkfrXt0P<W9Y-
zeO?;sq7^5ck85mCKMYP$FrWP)f71&}&z~s!q~UQTjl~D+%d%ja@XE5e5JI0K2q?Ju
z*>CI*2$vmd`#s})mZM6tWrYE|n&UK!i@>w;r(vqoZ;eo2gRkOw?qf^}M1CrzzwFdm
zBN936<hx-umq(7Nu`W@>6sXLeMK`J9y3?*@x-y!4|G~9Qip94QQivk^(5FVhN3PG#
z9%hu}Xjnd}(NCVea@rzZjdeGwMcXVb?|(&%q)X9w()Ddk<1HpFMV`van~*e(olYR1
zRzBjlS=(I8h;ZG;R5Lkm7Zd)b*rWepr7qvC>9;$<xmB9s*sRk-v|dBl1+deEvV&B}
zo4gH3EPDuv15v9|&9`_1qao4T8tp;l0Y8zEf;4pj$S$5l*KF3+-E}47&ELmjXQC4E
zN?)?ci&6v#>@R&*c}-4EVtysfa@j~DQR!5Xza`=uqf3UCi}fd9@GtCvyDSMOa7{l~
zB}}tVR7I|Y&~0Fvdm#a;9;5Ik`WC`jUV6RfX5nnkXy_W99?f7R%yx&FZ@Z+mE;3zn
zVjy<}wEK`k4>`Tx=;N5@$-tKuDFTv@xLm&<N4cecO-O!%lVeT}JmQUQswEKy{WQwB
zIZobzRDhjqnqI3x%K+i{hF316{+S*^pO^$?lJvbqy!qLV32)c^x5O@do4Lu2U$9;o
z2Xh&Rss&u@&8Hl<c)7SI_xPs~OK#qK6ixrF(*cxV;<N3Un}kTb>btUIMBuK6$k(zq
zs|%k2?$l#T-4SjDq5`YiN*#wCXmhI`skvMfFQITw`Lp`Ruj8D!`rI0;fRe;aNuO;m
zcg4<${k?ZnNt7nY&a4{F+gU!ud7%cU)F#KwjP9{vTBuk&mm`X<eFq;}2%@4swi)9f
ztR+nrRYqNHkg4&qTu(U9Y*toP>0$KfukSA|M3!l|#@#>j+yc86G3%JH`|wT%r7J1)
zM>~dZ&=<2Sr}v&o`nP^dR~NR}_;P|oY(y@dbJL;*MI6qHitwm#Gwrn;YXf@T1g&#E
zk;|TxqVO`ccc{V6;7>vzmUE`9`h$7Efq-ea)N*e4f8BI?)6QI`cQS@|Ye~53aJ^%+
zyqh!`DY3HL&FVDdy%(YjboHp%u1a6rCv(BPiKzVzjjGOfq?=HW)<wiTz{T8}2HI+d
zZ)WFu;Iv(Vw+JoONd#|vtiHN4zfqE|sI|EJqXjcC#>AGbYp`+la+7M5@~7<qJZEuy
zxp%@Qo5eJGRo`n)26iGE%<I(RA_@{hJFUgma|zM<yd@-xpf@l75#G86J$(8ON_L7m
z`v`>FuYme4gq{(NBh8w9?xxbkS2fBWY3L}|dIUM;AI`#MRQl5Ob`NOH$d7!UWj70!
z!ve>zV>Z%bJs#Kwp0_A9Zh&6h{Ev9>tDm{gj@)oXZ_sF8d5yw*@@N&9<&9~g$IaIe
zBDo68z+9j<q{4ODm9241hk^Sa{v?s2t8~To(7n?!eWYy%k}wNy{JCwfBXVrnXV2?)
z*i)DJc|O>HgPXx@93|wg<{g)xb*1^ILE|B`Rw-yRCGLDf#_b+?t_g;jOs#xM(0L*}
zv|;|ZqMN}{Q2U((yC+O{K;?xl3f2rhMy}!o^GzqGP?=`|e=S?4qGG7Qe<rpV?ret4
zAaRl@dX#gB94Eex_)7?amsBzNpmxCH9(LQsuB0(l9LhAJ*6hl$D%p2~XodrZM;?tm
z!@I7fr1fDR<859^=^i^aulmHKeaVA>RCf8_iH-JkqAKk9_P@CzCV4`^)IaI>fFwXk
zalnu*BKM;#sV$fxZ}+r3?AfGP=_sxqkAPz~ecPTD(PS9w>n<pEZUXCJ6KF;I{!@KQ
z(xySxMmuqZKcpTWbRF%e;-E_5kEaumcHI8NrlJEg`r_{3_}RU{Aes98;V|$)RA51Z
zMkumB4NxI0Q^^wm;85jH3tbTQxbFv{nTq{)*(nENKrOyC9s!$>TIS5n1-sLgb<NN#
z&qi0Xmd1Hb3%T>JknQ&EvI-;sJm~eqKFG3B?;jbSz#~8kB%ABMYz=_w0f`$g7J$PG
zfX-nA)<>WT^l14LsS3b|2K3j%<Mcv6-v{vqLtv}v|GD~)4|pa}+J8SB7W!2%o#<bS
zTR_iE0SrTqa_L$eww>ezK0f^H%G=UVTWI-gigfd%1*_Lru%6+s8Da>tAni(b`z(qd
zy0~T$;)3xyZ%#@6Pc3sBfljuDr1=D;hEqq4&N~Yb#YreN5(+csjhVr{9S3q??xI4D
zp@C)^T-a8RQZu%(;vMC@wmVM;ZUy-B3n!WG63@zgI6@ACYTu@|+uej=7Cd@jVHp#&
zx3RT9MFbe|m}u;4ZI;_lgb_xFpbrwv+P$!vB3^*sDRizAH|{$q()?&W4C}%<i9nRL
zZDC|Wes{oSw@P1qWaFBTsZ&@lr+j;lI|Z*w*A5bYVXp2yU?30^liMB=ro@ETyo}Dr
zhOolZMZ@So=rkd#C~P~1YwsH2zrKYXH`3a&2_<77VL}2(F?#c-osjb<lAcu2>K~^7
zZuVw7yK{@@?kQ@F{3GlX+bqOQil9|06tT4+bFXVZD>X=Vr0l$l_8nnp%t*D)iupO}
zid9aSO+lCaM$8yuYv=et@1~Qd{3S#sMqIV8<-uLMq^WTkzOYfU_j}Gsa`=}bXs7lg
zg144N*8Rq$I!)JGkoer78OmMG6#?yj`O9&+UWo<(7RV=Cd2~UH*0vTd;ZHJa2xEk;
z8@D+T3Pf<es_*7Oqaxr2p$~zVZkOCq<989c;ji#5>b+LJN}^+W*(&=?0@7~DD(6KS
zQuH*0vsTexxmd(3^Xp<)_f^6w%5t$m%Vf-gN+*dM#3thv*9Ud`wYPkIyRZA<=+7_J
zn?C<umBf8Vg$!s>z9Z(|lH`|CLP=OOgk(b3W3l&`6ljtjoOlT(VkxIXd)X(ass1`5
zPllw}aN64Z#c=z+v4Ad10$MC9>Q0Z>>Wf-8iGzm67{B#^{~?L5Ge35pNC4th2rI&7
z=xI;ABDoXPy0lFw>_;-znBozIbew~+!fd8&&m0L|v$Dm(7>McmBX63)D!(;b5-Oug
zyC~>(lJ+Vj!y|hoa$sv-)nK<F7#bDVRs)2<kyzALg@>{fQ+@5aGU~zlj$E-nBn2e+
z{u0D66z0y{!}aDC!Y%olm5!|c_&Ss}AHUP_Q1fhI>eHhF(I@L4lh7Y8HFI;$?*4pD
z*qf1j^hwm|UGWdNaJQaAma)2B#7_Az%zXqK0xJo6`x=;9#WM?Yl#a`$aFe!mNZ>aa
za|IrZ`49195n6B@n>#g@&M&k)-+lJ%GKJK8H(yLGLc>uUN+J=LwQSv8=~8^!h|U)o
z69y8fGzTX0=@wX^k>~9ozjt33)tJ486(ZlV!E<)}_>DwG@pK7(1`39;*G+=@(>9ec
zINL?gS)7c|=<Z6nC}7F`c#|nd$A0HGxHBpwly6~UFyI4`D`EgIJjHrPXBZLxQ1=e9
ziw)e(ajdwkliK*^z*dzp7ZD!6E&9R9i2Pm3zm{FEKccoJ_*6>`0;lg=CP>|pxF?RM
zP!XTZgXDI17JtB)7FJFiO}xfuudFsT@!OY}ovJ9RHrE6mbmEk!T(PSJzXI3&crZdP
zS^R~!=T-CgIzg(oFcu8|pG33{zsXSSCy$rmwDjVvTV4aZ-F%FB;AgmSAPP%3`i_@(
z!5H=i=n|%*N*?!ROTw}xCj>QnZWhM8GMQ5F)RhwHXoTV2K|$LVq3cWQsto9Gf?2f{
znglk7s4Cfo$dJ};v=%*XLNO!uCKe!m<(UWA)5Y}Keorq8*`VNWOOglvkxu-vA)AC~
zVDL+XO%`@1iVPGIzJsrF4}=Ppy`U`pFo46O6l+c}CJ!N2x8V`vH6|7h51gl<FP)7=
zT>Q~#ZYxyFExr@JJ7L`r+*9SsQKYWLk)-pMDonVS*B&r2U*Ca&`m!ZXd<kETNv!~~
z$F@*(^yEw@tc+q9$k3!}iOIOu)YGj>q>nxkaVdF85xC0NeGA)gTdV}2)ivH-^W8+a
zRpXyAb&`}CQ!*t^7>9wdMtC_pxEkU!k@Vj8y*wKpy0}N@9DJ*^&bIc19K{7$fFMt`
zaJ*npo(A(rSAuJ_t%UWYAgx%zgu}Ndlt+%hv6(!#gMb;bYgG;gwLd5hRVo8q6(U|K
zmdU$f`(b2Y8nWp|oowt>>Y+**YkCK<N<NomWt!I?QH+n54OWVTwjyJUoUs|)ARUd2
zJA$PyJFZu=l~?A&;8{;{=%|bj&ok%#q+}mhvKlKtujPM#mW+m=t=8{4rNcw-sJ@sU
z!euB?wtL<gF%J;Y2lpaaIF5qHXxL^Ibpo|W<&+W=i>nESUYr!%|H9s2A5Dp)1s$Gl
z@vLBYIxw5y3G|-uzy*}gYV>BTjgUUf3OMY*F5J|8?rQ^vvhaM_Cf+niI0At)2&vSO
z_0l6(JtIHm82j8%cW_}Vymtt#hP_~<9F<t&mNP%dzBNjXj792C$tkiUo^jnlEYBG`
zl*&HXB~UILkj`)EA25!2iZ2|Xf{>(`Ik45vycquyiCaj+|10O`&f}Px&#HBtK@@S^
z{_gFEtoS3n&Xe(*WSOia7zfYdGvvp4koUr~lO&l3hXa?cQM4S@vm@24$Ah83_Sk^p
zV%u7y!&2<>3?5cdkNQa?Qi>@-?=2+r+h=f_u45=`UA=iVV39ocrv-i<yp}xW13Oij
z^@Lp~`z%`TsI*;cHb@TdsXcl$f*nkni}>q9_7>rgC3UN?Y|3s>xVft8UpuyQ>IaV%
zgjbB;)6+S=+>aU39j`LUCJueB=^2t~4-l<S5eqT6Ba=t9Jbl;$ae5{RwD%Cx-G?eX
zVl2}$Ln*etK6oH9K?VU0H5{D~oNmQ!k$lPTtPbN$43s!z6P`wv3+??%_dLy#L%qz@
z{N^)`MD^t<01O+`{9UI@HE1wf%S60y_K*;)nJ$_ZB9@2-?C?-A3&SH_z}acjcPYVY
zne8c`K<AS`n&(}Q-??jr{f1?uL5rviCuKQ3sbS9$V`Kmx!b}nA5BW-Rl5d}*|3`aY
z0aZoUHGD69=`QI;I;Fcyq)YPB-3TfnA|cX9gCHm%At~~R3eqYeAqs*Z9V*fx{~3hm
z@pXOw=jU2~taq(<7Ms2I*=NVu=bV`{Gk0dL*yff^tEIoLm8B@9s#oA}yF_}AMCmE|
zef@f>#v*jq>#GcD?<=K8KXMJCwDKB_7?>J9uunL6w<-ohDFI6;1Nl75<Fz0qgGd;9
zww^NsKOwZlIwJ>uG5(cm4&xCC;HjLu`W&ujK!PRmts&GFJ9M@fZWuf_)X=>(<XLG>
z7|KiNQ{%_0vm4>SE?DSYffjm{xwvcAu(bJO8UI`uY`K4l0b+cBgVV(vYSybMs<bdv
z@N#s;iMP7AFmVI6Qz<qASOW{a<Hv&k*7zgh_`N5g@>#Y&7JAUTg5mJPDV7L7S(^`M
zTMdwJ_Rcn|_>xfAU{h@>FY0llhBTM;so|z@o<n{js!Wf&rVeYS=;AecltjFt#4e{1
z+7jSNlt4KR=j72GcS(|xRbN}>7Z9>tDq9~^A&VQzX<BN3uKWR?L0lq-6Pq$Z>ivT{
zt|?6_7LV7nUMMYW`5gXXlx#~rdZr(@&v`SO*Lmn5!iCe`zARl68C<>4yiXb^qNjj%
zOVr_^){Xo;`+W+w;hi@5>U4h{=Sh4wR2-AtQ0rieMNSpE$g%PidJ{bNlu5Bhk@?B1
z4-G4|GAGi<oRmyzSNN0DNEMTGZr5&IcU#R*ULv=7o;7+QhWox}TsoB~Ctm#(uLlx`
zpJf@jdE9NIQo;FZh5wazTs)rcbU14fWsS?4VQX9(2il`gGWC7U<kl)~tr_W{iSpyw
zzbW5V=XfU0)T81)<kAxFRlM6S=lEQ?eM|})8Kq`qDCqF`Bb&1BCohwA@{HtVWn71E
zUoIEFHW#V!#8hRy&DGv6-XH6wvFtRr#JiOEE+Og-f^|kX&e50}M=i~(KdoZ`De=-0
z<2!0M@3ZD2>9%(jnvJICSl_(iDav}3kxL_E(6^JXaJ?Mk-70bbS3v50@Li^g7*&np
zUMo@onTqgc-rFf(tA)@t9xSABRF>jg>X~Cvdn~DnW)J(zlS517?cQor_}PnwYF9o<
zk4z-T;nIy{RSP5V`c-*VYqcZV@tMWx)$AUZc)Ez~eltue=^c@vx>A7?J@7OG-`l$9
z<BTJ-0B%>PFfmEqRQ{Z2&7~UVA^t_zjnCH*B}g~!8cLLey(JGSmGP_f@lFCL>XlFK
zjI-Mj3Uu(2qP1LZf5+97r$;mMVCd!<q5(#_m8j337g;KtQ(iC($!n*LA8|=DMt<(D
z2~|eNSurD4B!0;kG>}1lm0hV|uuoqFFHD&bEz(%Kd?m+EKy^TK;4xg`mYC~H`P_*L
z;)C^ikBH0{+|{CemM(%tw!<WpGQ*Fu@LKX}NGN6NnO3Wi2ey0gK1nmo$>^u>=5VG|
zy5>vMgZH?~xz6eEDCiP4#y@nKJ8%k*54l0mY>akCYjMfvqP*seIkR9iWu08-J{I9%
zOH|Gap@_orUX&4yTvmyDyJK!r4_xBepMFBk`eZHBjaj1R6j%5Kk@4`yJchG_S*#4t
z3;%Js6K(<%DS#wbe%cHC%bXT`rXUArL_q;h6~?!Y{Jn31Spx;kVfn16)A#g(C;M;E
zver(t%L>8PZq`XiU*KdK;khf=x@dG}^_KtT9p&39OFChMY~B{MEy<tHwRFuE&e+al
z_Xj+oTThXo$h7ft-QFM;LU$Wb+BZbG`?;0M7B?}b1Ct%jBhD#>>Q$o4D&Gs&dC*yI
zOq${+Hla%)o4mcZToC2%qq)TPbyLDLr{8~i(=P3Gcy{<>d5KqAtW8H&+nUs!CHscB
z#tvgzx43Td7T{uJOiMqQy$d^g|IGD0Dsge)$R?NbbN#OaKXBCN-}Zi+Uotw)j*oV=
z%&T^l(`<w@Nhz|?IKpc4MUTBnTGU^Hsl>&eXeg%h;Cj<+EGy?X!NiN=%r>6in70v6
zYn21>k`<k1McAt6L}v}D|6&<Sn&^pgy4G%eXusunPWBEvpJZ&QBNw7ObjIQP<{c%G
z@%G(P`*8&mMtTW-A>5HoPd&;F--Pis@5seb*RJ^cq-gM#%8wPe^uAiTT_bLdADCp&
z*<vZX&UL|E_I7z9eV)Fr{A&nr-^y9$`V)%H6+5xEvWgfDZzRijOzm>iu+U?5q3-XY
z%tia@M`>hj+`JbTvI#|z(;U+3&dbGj>>sle-Ih%c6}MpO&vp6imY;B_@z9o5FPXRc
zeN(@k+5KGU%GONARNkS{j!#dBIpjM-xB`oV4CdN0icmXiWJ##{hQ6q*d=W-_lYc<Q
zC3=5^>CNDz>3MRC4-#m$MX&qMUuoW2_ne4Spr#y<)px;)7BR?l&NsvxAm=l`iq@Y}
zDBl{F@P!j|?5OZnMt$!no1)It`v8hXQlHy+@BG}whhDvs6(!=ig%iX{Zzq~VSIkZ+
zr8N=W<;6xq5iLWW;Um?r%I9izaM3vZs{VaE&n(kBOZQp|?L80Gh)m+$R<BpUpW~o^
z;wEg4ewh-vey63k$bsojqfqw4e)DTrpDHqO2L?zq;|<xMnkEd{h?=dkw2`eHDk{fl
zhaUE}aJ+uw!xJ09i0SPy!fw2fxOjt+T!En|VzO6gv)anyfs)ra{QC3nT!aGBbWxFS
z`42Fk(EE>vz7J<3%p7=%<?9iIzTW)T$4(a&cKmdTRTeJxxVp>OvI0Fq!MOCw#*vw-
zSIbz)ADTYg#@bu`r15mv=)mrXm2{@mIZu-ui!is;s+r8|rF!aU$yejg+NM)<RJbhU
z*Yot(ircVhXlD~pcXB)E`o0G#y$wkeQZBfn@O8rr#zs)iVqU3X8EHCg`A|K7m)BGw
z%>2b(WoN|jZRa6ahR*tBRQ{Y8M13p6^1wOxbfr9<aWbW%M3jAqZnEyUX{pQ^`PHYi
z-dpON76A=py9z0oJ#lfLIvmOg*lw%k%lc|=Zr5SeRDDy!9gN_O6~)%K!}D^vMoqb2
zhPdQjj3GdNL_B(1bmImeOMPJi+^6bY1Q}15QEp+F&yu7!47*20+F=RRn}G1MLtK*N
z8Lpj!$%vbSBB8hH&uV;)oNf|jdYn(ldlXK;Hf(xV^gHP%goXL$j^dzEJc3!@0iKyI
zisp_-gd11M`)OCWBd2hb+p*Lo@i6amm3K<SmHsjsmFF_X4TfKM72LT(5rvO!##U}+
zDPZ^+>_<HZJN?+qhgIAm?c7BlBBz`V{0k69X8D(%`(L5l4ts$~_o$m)6)B8=u`KXv
zkBuqe3z>OURso#vJR{~qOP6e{?y4DPs%~6gXllG|?&uMJeJMCWD?vfpo_I~blRhzQ
zjB;I~ud+COov`*s7IQ>}KV8CW=>wUr2CGMp9db1G&wGcEJ>t{Wo!3-#VHkea`L#+r
zO>)rQ@7>B_eT~ztjY#RqoUCT;LiNVfkrbNsZs!sOabf#OlnY-i4>29JJfBQNaNN(7
z5@Ml?!EO%@phDdKI4j_eFX?PHKKAgwvd*A1Ix)3IIL5n)X%o95CKi6Az7P#PC%4Q<
zb;WI)kS;l@L%k41ikA9Bf&In>ODd16TPqIvXYs8i(WN^yTgA3tzLD`=Z1*w1v@_2s
z*pyQisTLvIxpih&keOyJj&`Kap%E`;&0Z+9FlcK3<+%49EXjr8Lz>_&(y$7z18RdR
zt7e@0j|&_LLO;($Q+yzCsAX;{)r*Ixoi9j0-oK`&n06Df8&#ofQQ&}Oks^=^lW(FD
zyir=2`+ha4j#rV`cu?;WO@Y|*Syh?Vu$8UV%u8x#y~ScYy9aN-T6oqCk9kP@eKk~v
zeo9iFwZznz#;y;QqH|E=wR^wH0fu6Qc>)~vmW}&aZwuF>0;;A~$tj-NUM-R0*wsMp
z!200XAi=4p(KcqbjuRG3ZOI<nm$knujR+}faz9h+{c=sIRN~oG0BO<KcUBL{nJfHD
zV@WAoDHk81JP6{cmY|%`sg*V_V?lMBf5oYC5HibQx_HU@B}d<Y7MH<Z@F)sn+Vhm`
zfN%4}uxYF<gA4-7cl)=TS(u(`W2eY@27A6i>D*F(=P3I+EsW~>y-QzXc9^<D37cxN
z<HOa;+Q}N<uuDg`%apY|Yuma>6hp0&HOf(~ccqu>AiIeiEl%tvTdaoA*>-omH7zOO
ztK44+)nCzOj>d?j@-c~*hICC9Q(S*tPNA#%LXNc~fH87Tj&?ulGakuu5U!q=&(-?z
z&Ni|$)4lt)y~R3v1=Zw?LRsYba^k!XX-H?b!<iI%YGLl8=5hQm9B`Kuc3wX3?(wUH
z;TK`3$1hd;mqh_8jOf|%dcp+J#b?Kju@Iex&Wv-|^oW@;5`1a5G&;}rMdIm+1NhDe
zbg>&eIotNj73Y6y{9^rY7Jm7MA8;L<_lJ%4Kf6y$UhtC>6<`eGwtQ9(IR7|)moOZ0
zfJ;Z-KYPVKq<2y;_Q+uFpkr)OI-QS_H20(HmOu6#&oqULt^-;5xOSLjw7x6Fo3QjL
zx%O(~Ifp&g1%YA{Ih>^NSLxEXD&{mPoVB_-Q1%UYg+;K0g3egxUVoM5?=XhZVtY}<
zugJ!iNy{V9fM$R4pp<w)cS96)l=59HLC`moqcfcM|3Z%?L%dt-^>rna(R{>G%W@qn
zs?%WQj&q042jr^YZi7270}cg6!iGZOW!Y)%3OZz&eE*9KpS`$G1>0BTOg`{m9FJnd
z;f=m1_*Qm9IL%3lWTc<f8{ez)=BH`dRqN*}9lGTvWFGtdY_D-L@aQY__xE{AKWFd0
zcSY;jnzmph(%YUP%}{Y#(uvUCX0gN;G@#mx?4Dio7vB^&LX0fdTvV4Y`>ItKtjePt
zxT0>S9jCl0`BE5zuR8nOT+GmzAC&@U1N>T~=rtL2LPafH)}e+QOY2^Y1RF?8>K=uc
zQdb?t1?&wY2GOo+)<4#<i2B-O%{buO8_AsU<u1YKBRN7d**<eQ+Z=)*v<n2L@aJ<G
z+5OARQ!@*BGfj)nXj4X?H?@Td-bGv;_H+-*L*9A3Fi-xCC25VSP9<Mau;+=NYko0y
z1C9TTl->e3!?MmI#S*G7=S(5(4s1bxdU5?`@@FmGAr6N(wr)*rq7j&zo|FnbUts)W
z>Kh@QjB(vNTVs1trM&Lfi$3aXYJbKXyMRbub2f^#rPt;YLR;91{b*ZD9I$YNzE?yO
z@Y>B$fi$kgkyo%pdQZ1lahO4BqqK+%{SIbR(jx*BtDBr3rSwZCV&pj59&vSXrG93d
zb$i6;jn0XeXxVJ0DqqWz)b2wSzIK85dSS=QFWv5|P8-FYs1$c>JO!)1&fe5{`$RyP
zbu^B1jQzZRZc;VkduDa$EbX8hjVCtV#}pACMY+jcW@_~;b;GTq{PoSJ$O}tIG^JtU
z5Ta-G>iBMAt>4(52O8fK!RQDm$%!s9>Thq;V0y;(-9O@Wo0QB;>sY_{eR90IYa$KH
ze5HN+kwhEQPDWJ(Z)e=Ph4Co7B;{`3k8@RG<gS#QG)|+oWD^wAey(r7%=XP*t+JBe
zSJ+d5ESR~P!iQIIrhc7d+Q43xSkC@2zL6njjc1hxlf@>tkqtp`S;pde_IEeeP03Y1
zrqm1XX=>oB`4WoUTMnDKXPWmZ-=H+E6SVlJ?4U6lY<pkOicN-%^B081n;%BjR~^_@
zcc`jzyxkh@R#sDup*PY>x71x=3J>C8VJ7#}RwsGl5loG7!6QT~J4-dpfp1x|%^8LC
zo{WhN;>mKqL#5U<NjYI{u|Rg?U*h~;m+={C<#VSc6FZ_Z6VYN<k%G*wti#W*e(LhR
zD0v~T_34Y%E!8WQ*{|<?^cfDssy;_;Qt#b->FUwrVF#6cyN-&{hdKf7`s?sZn1eLb
zEexAP8&?*2d{&68+Bs$d!qnqglx9D6A0|yoaaJ;uxD+<oyqinXeLu02P^Lz~Rxdz0
zmN3<XCt!!wTI9NyEkxa$s3;SfiFj-krWPT^88A^b8N}3guXtn1>~<~#X?*K|F|5)K
z)!{?@S<}WB21p{koS7RRVbm*6?h^YZhV%!XV{t8^F-O|pYIG*n9SvC~!8-fotNIQ#
zsz(J)2Z_ts%q7_3t;U=T8`nOP@M!EXZ3l}DpMW5Y%heliF~rVRD5^+~mx;X2^|rq%
zW0Xd=6G>WDi0ot{Mtn%yrNtB2mR+^KY(J){KW4SW{82|RJ_JiG;aT}E($h!1I<6^Z
zMQVgj%z%_I7)^it9$hTyoz_OPs=u@?1Fg@C^0c}ml@6>_ZW^la&W#t@9IE$*x(j}B
zny)lmFpH;q7*LLFuKuA^g5zjN*L|hez2VtC<1IU_C_L<=6~<Lz7dg|MGO0PTx_9YM
zW)pWKT1x!R)w)K75jiE9qo>7o+-;nwVwJkh$wlY*d@!@w%QfnQP%6#q`GHVW;|3$O
zw<S9hab;KEm;`m-so0`^ylpI)&_f&5Jj;N6tCGY7Sx^>CMO-UbkwTO#XZdBHC6-w#
zdV?4pGw_vr-vep3VBO#Xi}Dhk&hN=3T(Bc*`ggHTtv78+WvABPyQRW5USt$Uh`Lz%
z*KOCBD4zZ1@Y-s=`mm(@oZyFDd+ICl<1}F#!<d;5=29~oSz$iq<7Qqk*2xCuwXsZ6
z+8lj4{dTcjl5*+W(}(Dmc!qBGjs}ok`riI9m?w0I)R)g&`0<6;(+hH<VYR4bVm}?i
zPF~Q{8HVO3XC7^~6pZ~|dpC#h2|Wj>gsP(PBA#0=?4SB#Q^2eWJRkFyBQG5NxQ;%!
zd3)*#hVu;W2^p~<1^-b#U|+)YmHS7G$^|Te-$^0<?D+eSd9VzCZYDF!XXBsT=RKlv
z%t{KmQ9UhSpZvzmu>t$+{H#S*d7TW8go!C@-d6^8FY+!Y>l+SCmKGe0oi%BnL>J$1
zRS;!mDP1dgRe?$1GcMbOF@nfkUmj2K-8Z>XzMx5DrfbKLdc}#adu&%om5sIPY$hh#
zoa@L?`>neDb;)}iJjv~dIt^~(J1PpS4ABd#3<c5O?rFMWc3qk5!~d-6?=|4TM!|qW
zGjE{T@RhE`KqtMtyh(xiDO}bno0jIQ7UJ%+@6`e^HTXsHL;=N8p6t}*L)Mg8iCuXg
zovC#wSmdg2%)}3VfSaeYSHHNn)+xNql3o2uDw*`a>&UPDTux9-2D)hE-e<eZ(#ZWr
z<tBBP8=li`fyrVwzPqZ&Pa&-?jAiFbsSmjiqYQZC!8>{_@riI$&>K8`;$-LbWE!k-
z4Z9qOHAJ&jrRbwp9@{Hm)`=o@#4x0=0})RP>$zsw!?C}NRP42&JgIx$Hyg*3cdg1y
z-cG6afm7&2krKg^=d*c*H`HFp@1fehr61%IeqGaFDo(%WEuiAj8rj#XWYUANB%_qV
z`}kJif`G%;<=njOIEz<Rlb29G5usU?1Xs}ERzI7)=Bu+TA~i?P@jwmUs(fB()Pc{Z
zDOy`ql6JV*vt6JwUP*J?I(_guY&YTq^O%eAL?ybw)<%-;?P~9~hh$6w%UYVRDfw0}
zx!##d&eFd|QJ|QqLQ7haipoWgrz64A`)*7p+fQ$pXwnc<#CeC+m7nWLT(zu)(s!{S
zC6qk38SKp@@dl*wd+iwcnr$`4Q3|R@tAR~liuwuzBhPd)DcQ`#>=`UqQ0kzL<yj+B
z)1Kj`h#L}ISCHvi&G4Bw>2DiEd&A@;cwJFj;u79n5kFlu%*EFFHZ8_%k_?Ix?a7;y
z>k(MjupW2hYDHbRj`Z{RZU9T}&65nz)Wc?o5*WDb%(HJ|M>Vh0Ou&11HLp9flt$F)
ze!-3?Q?ykoS793J2dnKiclG@eb@#dEUDS7J2&xsVIaXZU<fhb^vF&{c^h`=ithdxf
zh{IMGyk5E)C()*;dM|vIIt)$^W*YdG2lw&q0Pwp-6sCWs;mLdo4*REwiQ$a#6vR^O
z+;duoiMcoLoC>K=o&weUW%|Qb{?-SdeExe6fC>Y9B5=!L3PxJ}Q?cW75D<6@RQu1S
zz9hp>HWYykls@_F3nz1b5=PK$^xzSmwv9}`6lS1QgRr5bm+q(3IzPd~tR2AsRB6<T
z0=xsav7EH>yt_n%2Nz@SOgx~tZ~M8rDy2$L=#tPOaqA_mHEhQWKkq2yCQZm$e%cAK
zAPyU6xmBNnZ&3~ov#+$tOEZ};yI#huN+c}En``t{EhBHvnj{nl6~EuRh$<r}?D}bn
zSJTX7-8qmJIbY}z)z-|yMQZe2z^?R6j>cA~eQRT@-#Wjh)ovb5s<)Lv_xo9iRW4y2
zNprcoFdTjY3mx$Odh$^=k*pi<Fi^d=#+zI0yXihihmz(aT^^2$WK!qg%H56o60Ypn
z`p~b{(2BWj7;lVZK))PAFMf3HiLG+05eq@m4ih`WnkV7`wzB+90bMUNwz9UIwf0RH
zhP_3$Y0dV{dOPA2Y>y%vu?sH-tkqwTm6>%f;~%LUomZJx`_|J^XVhaCYY4|Ox|JGG
zak<*E=DdR`0iVf|ceZOaUKPKIL5~Prh`pD4dRx@Tj!BeLoWH@NC@H28>+9J@=5XGC
z(8Mz@h-|&KyH}ULqN_b0M~J^LBPv&7gE7h5&eLu+y~Ug#@m!>rrJ^LcTbI=)v6Gc=
zo34qWl~k_ZU`j*UfI^8uUUfmphOv&`?|g*v>`;#~14ol=pMk39&O^?$i?XeKq37Qe
z=dDW=_I`;I9Ji>fdGB<Nsxb5BEV_;(y@PB1_99E7-%-FYJ9n0YU;{owpwzwYS1N1{
zd>Z_BZqhxbtRmhGO{1H=Oi7+#`tlR52tR(fYpe)+>|r0lN4@C#gNfJpEjFb-R%Bwr
z$rV36JgOEm$g57D8w^UMtHZ4w=w(xU+SF=DA9M&Gzm0v*zNRg}%j8l4Zm_N1%tR;N
z4U<|rypKVGPyh1y`hZ6I%ZFT4+A$?5K4#}$GaTFLy1egxb^Yrz3)E*N8<_P;{HxoU
zoiO!NmB6VkOkF<T6U<ZS$oAj;fj3rxV=9L=x-JZxkf2%)rpdsNF$7oeI#t4U0>;4M
zHSy2p*w0>}!z=7SK0D>~?wS>h;H-^Y0Qlls!G*Y*&5p=YUP&51QA%d3`_#2>G+BKm
z^yv8~!29WTXi1at2h~|`aAdu?cnwAwv&e>pNS99$sP>dAh^+c@u(p9lNLW<JB~T6{
zw-!duU#mt7DX>(T4DD(0yvD+(Lj7T0ER5c+8<tTASG4@Np>j9=($>VRfu?Qb_F_`a
ziYadk4OPV>t6GDUzz7aG^Tiz)wu?;(c0Zk?u^;(GvPs#Pw?=LQMLy9A;n+@={``YN
zkErhwUt}C|<?1JMT{ohTatnUl!kI|GI}wN-=heU^I>q`IbwgQ4-nY~hTgosfja=5C
z{qpeqn*V7E1LPnzH8~iK<+Ia%$PR<SNLk!HJp+I-H}?Q1B)~sys0%O{-whZX2L1iB
z{R;z%f8pi+srg?~;N}X6j-QW>D-c@vxgPrj!|Cts#2WDX>-LME|H>~G&_Vm5$6}B4
z^93Z0y_>J!i78+KvI}Y)+am68M>^X88G}3W*S1T6UHChg;frHU9w($5cv|kq7T}Du
zKcyjT1b9z18xN$LJyeI-+uhm20T84C?#D)d4x0t}Lq>!2v4`qF8zjf|_i<zRK@$u3
z`q{bx`nj*4?`elXbspLT*a-j(Z9m&QF2I5sr3Od{pbbu@1?r24^9r5g72xM*aC5c|
z5)>8wAw2$1d2|HuIZ#Uxj)ZX>fio^gfFF#>F~GvBiJ(CO+@Qjw2q*>8;V=xR<tZEP
zxWgTAz=gpGy=;8Jd_E2Y3Wn6y&*w*$QHHHy5WrxRzJA9&07$4F+#RG8qCvSY)HBcq
z6+rrXFc^-U-QV@$P;x*yXw)&rKEbCv#6t38djLcI4l$?v@9JaxqW>%ZJN^I2f8_sv
z*B}4M=a2mSPsii$#?ycD`F}Q_zsvW(yZqPj@+<%UyM2GUzy4jkzqapJ{!jJ)wEmy^
z`<?xNclqgY;dkx$({b>p^?&F8ck(~&*Z<q~e;4ns`T5g$ey9JZ_I?-dzq|bZbw2*v
z{-FWuYCC9Q3pQv?4FFnmLm0ga$buokj}0o<BnF}pz-t0f`~fJX04x8XF{l9suf>Nc
z0Z;*Jap)|~2>cK(4q#ny&T<Rj3jm<A9-xC$1F$v#H2}aKZZyEgKk?9sgE;_52iU}e
zPCqUJfP4Ubd?;pM|5Q#;0%)i`>HvU$f)0Qodyqb`j}H(`4*+=Q+A)s_umJ$5K9HlY
z1FQ;8RVV<4+NklP91pSq`GoX9y!bBxwgdph0>wQDFy!|nPJA{%n*xB^1>(ksIsvMy
z0|3N@Cjl_X$EjcJZ9rQ9IEf245ztV(PxNu1z@c`Y<o);^Eg&{*D4*5<pd5lYu*m?1
z+6ToA@`Lyc@K1KJ&`<aiJ6K|XhuRL>4C!O`01Vjzx)6^=b;6&@p*SJ?P+Xu6<^aG@
zTqkj36arcwz-c}s0DV&T*gj+jJluZj5B(LOAzhFYNDh64`8aQoe~>p!`k#0p$KVG%
z<nP2j29$5e9^?baQK5bUKG2~40lCI_2JlbuV2A=9YTrqHtSUf5Iw$_IiU1Au8^nVc
z&_@8a1^{d$!0A2A3;@)A;2*IHunmBdKF6d1G_Zx%0WfG24gz3k%s}G{<QpBb4b1^)
z+(15|b^sq3P+tR|2*@_5i%Scz69A~+KwI#jv1JVaiW~UFh2|F2W~f~tE<AC7{ZGmO
zj}7^>1_0>;9tX-PWE+YT@K}-ngE&sdHX;zvkS!=Dz_v6sxF9hP<~bSQ4*&oi42ZS{
z0OG-hat7(2#E%sW=rRBxXE@NfgJe()plyg<fT4Vz^cUhiprQOhZ2)%BqW}heaXJBZ
z1OVv)8Co;Iz~1q^fZ7V#1?A{#0E0YW`vMHvIUOf+fQIr6;)CiT7yvf;L8D;-418ch
zeGiR$U>Ax91Ih!`1`r3T6~I6jZ3ke`cNp^kL-n9IfexAnz)&4f_c*=@fT1$TA1FH>
zmq<XL=wS8%`Z)lf6L}55&{#RGFAV4q0AP$l`p{50j`xH|y#{y?Bjy;uP~Sjt0Kmuw
z7#cfJK7bx7JHV%H0&<i$fQQBjkU_h~<NT2N`q_Cx4A`JTegL-qNIxhZGk5!A3`iK`
w&sVI#RW2VJFE2MpaJun0|F|s1TI%Ns8Kgzp94jAt0+)^)z@;O><4Z^X3ltkvAOHXW

literal 4218
zcmeHLU2GIp6u!$ssr-~;KpKO1g=)mG+nMcBXw8H!rP30N#3+9;40mSkcE`@_OlNMl
zyT}6=ZAkP*P53EhH!%oGu)Of|pazH-0TUBRFxFpM5)dJxk_bX{J$Gi?SsNbYffv)8
zy>rh!=X~efd(QpKB7|^~<!s%xOoYZE-a?I$j4GOTTto;}CLKzl*=lNpflhzLgko|3
zcdeH{zBtf!bo+v@@xZ)au4Q8laU8*_<xngF>C_92jhG4zi-;nCpe+gtbx*HqT^@<!
z#OfB%)Tj!A7R$~VG|6yG5b7f_Ar=E>iZQ#XuCAx2Cz{bUY8fOQwVaMR?j@RHrU5#Z
z&2%g6Her=0M3qGB(4<t4HL4hv+9`=mLX&_=nix5kN<y~2Nyv&~JvOP7qFL;AD?ly6
zwwnVed}T+I#Hauu_+V4dQcdO-ML@_7Nq105Y`|*Du}mTZRK(1ohM~JaEzU01R0f3F
zWl91JfoPkoG?ilF0#U?C;xgHGJ9V3D_y)Rc*-9o|%A`mPvy=k}Zpg5#PLhI-9PnI2
zS79u}3<0Md&xfj;gz<6cX+|A`fD-T(quU`lS+z`?FzBlgBIXc14JJU*AzUZv5R<wP
zEJe0+K<k<m1Da^W=Ce>_MJFzIqC3=^R}a-YQcMAvWz)3WVc8({nKnQ>X%1{lv4uj3
zlubP?#p2jiX_~6tOo|J9m=56~b*P&HxTDG=)8%qUl~gB*O$Fl0rv)7;Rv#5`7oUtI
zL>qv#xnZv*S*f8B7%ro>6vw&^NrD9dIRsmz3-ZsiiMGHB-b1&&f~>y>`m!@NY(INy
z{}cA>1A1gf)gPA*?cCP1cg@vQb=TT&hgkGd`_MCQoPOYNF1lgG!PA?kd~xCD9S5%+
zdPiIHQgzL`{)*oZ92xgyMq9mN{s*6~U2<buvaS`kBtP79wXJ&Nt=BFt|6Uv#oMmQ?
z$YJH=emyepvD&Zpw&z|hw!eMulkvAct2-r}pFgP~eCFKol}pj)A?MQKhqu=BUO#)T
zf8QXCb8@1u)_AIT{mq-No`>#ziTu)Rp}3>B5jvHjJYn)%@=l;9hVtr*^12g1RwepU
z?e8U0yH-~Icx!O0kLqomzM!}&;cLFjd`$rD1JH3FbO1nx58478aCN42W&pYjAg&3Z
zD*@=&0OWfrRF#1Wkr7XYx)IRscmVP}6`m~zb&Yr`xB(~|fJ&aWd!S}-OohXNr=tKm
z0o<y@?vDac$<sIGp8gCx-3~zK1CZ}2Kc~!7UK#=AmyCe=Y6Fn(DZjML6HnA|^hV{W
z6!Ma%-g3}bo)Ug?$MRGP#68$g$A-^{!d>hq0Nwq5DqO$uANSMLMBhArKTR%%AA~gk
zhfxA{#<Ay4cnc!0_~*jJFHOtJ0Lw5lDGl1P68;IH>g6be_%A5`>HvFGzd6vn6EzN@
zira8!b%O8(*6H~SmnoL4f#1<(l%G5LZ3YnbfVEU(E>N?n;lcyUD`0`!9bX!Ag==a$
z0SPv>(Q_AoeF{B)(!)hkn&Eg9eE8F8nC9(j{*-DXY0aQqr(zCVrb!@XWK7R!`LJs>
zUp8BV8=HfnaQT#O$G|>4;Rlx~2GIR3bB7bcb@Kf62rVz=HhoSr!l(^MUU>=4TnYLM
z8>97$q9Q!K3|-;RJYVR2Yl=l^<Dk_N($J*hAez+y?SX-1>#Gq8BmN1a-{!8{7(x}P
zD;GYWd;G7PH#u|$JSIvZtzHHpg^Fri=7pQf`RHKekZI6`S@1OQ!ue3ckE?;M>hs2z
z<daJ6aG!TM#<K<OnB0%YSbY3A@a6G;S|62sKCsxm^*$T+4&NWVl=cqaSDX&*0of)`
z;(vf2UJv9ns8gX%fjSxL{iQyq$NKj^9@ER>4QHQfL7x|%KYphu-5Mj%t~aUI0*M|e
rzh2-<a)@p78(^eFbpH-}^nGS=gAc)f2HXfYir}12!Z{!F&iQ`;+Xq?N


From 475f3c63c2e090ca23df4764d690ca955d3e561e Mon Sep 17 00:00:00 2001
From: Alexander Bock <mail@alexanderbock.eu>
Date: Wed, 14 Jun 2023 20:04:08 +0200
Subject: [PATCH 019/701] Update TilePixelSizes to temporarily address #2472

---
 .../solarsystem/missions/apollo/apollo_globebrowsing.asset   | 5 +++++
 .../planets/earth/layers/heightlayers/terrain_tileset.asset  | 2 +-
 .../planets/mars/layers/heightlayers/hirisels.asset          | 2 +-
 .../planets/mars/layers/heightlayers/mdem200m.asset          | 2 +-
 .../planets/venus/layers/heightlayers/magellan_newyork.asset | 2 +-
 .../planets/venus/layers/heightlayers/magellan_utah.asset    | 2 +-
 modules/globebrowsing/scripts/layer_support.lua              | 2 +-
 7 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/data/assets/scene/solarsystem/missions/apollo/apollo_globebrowsing.asset b/data/assets/scene/solarsystem/missions/apollo/apollo_globebrowsing.asset
index 80a25772cb..25ff907125 100644
--- a/data/assets/scene/solarsystem/missions/apollo/apollo_globebrowsing.asset
+++ b/data/assets/scene/solarsystem/missions/apollo/apollo_globebrowsing.asset
@@ -1,4 +1,9 @@
 local moon = asset.require("scene/solarsystem/planets/earth/moon/moon")
+-- This is technically not necessary, but we need to ensure that the default layers load
+-- first before we add the layers from this assets or else the default layers might be
+-- initialized later, causing them to appear **after** these layers
+asset.require("scene/solarsystem/planets/earth/moon/default_layers")
+
 
 local heightmaps = asset.syncedResource({
   Name = "Apollo Globebrowsing Heightmaps",
diff --git a/data/assets/scene/solarsystem/planets/earth/layers/heightlayers/terrain_tileset.asset b/data/assets/scene/solarsystem/planets/earth/layers/heightlayers/terrain_tileset.asset
index 8892c0cb89..40bb76d119 100644
--- a/data/assets/scene/solarsystem/planets/earth/layers/heightlayers/terrain_tileset.asset
+++ b/data/assets/scene/solarsystem/planets/earth/layers/heightlayers/terrain_tileset.asset
@@ -7,7 +7,7 @@ local Layer = {
   Name = "Terrain tileset",
   Enabled = asset.enabled,
   FilePath = asset.localResource("terrain_tileset.wms"),
-  TilePixelSize = 512,
+  TilePixelSize = 129,
   Description = [[This globe layer presents elevation data at approximately 90m or 1km
     per pixel resolution for the world. The elevation data includes 90m Shuttle Radar
     Topography Mission (SRTM) elevation data from NASA and National
diff --git a/data/assets/scene/solarsystem/planets/mars/layers/heightlayers/hirisels.asset b/data/assets/scene/solarsystem/planets/mars/layers/heightlayers/hirisels.asset
index 20d4566c0f..af7a51b238 100644
--- a/data/assets/scene/solarsystem/planets/mars/layers/heightlayers/hirisels.asset
+++ b/data/assets/scene/solarsystem/planets/mars/layers/heightlayers/hirisels.asset
@@ -7,7 +7,7 @@ local Layer = {
   Name = "HiRISE Local Set DEM",
   Enabled = asset.enabled,
   FilePath = asset.localResource("hirisels.wms"),
-  TilePixelSize = 512,
+  TilePixelSize = 129,
   Description = [[HiRISE (High Resolution Imaging Science Experiment) is the most
     powerful camera ever sent to another planet, one of six instruments onboard the
     Mars Reconnaissance Orbiter. We launched in 2005, arrived at Mars in 2006 and have
diff --git a/data/assets/scene/solarsystem/planets/mars/layers/heightlayers/mdem200m.asset b/data/assets/scene/solarsystem/planets/mars/layers/heightlayers/mdem200m.asset
index 2a7a58987d..8206a3a70c 100644
--- a/data/assets/scene/solarsystem/planets/mars/layers/heightlayers/mdem200m.asset
+++ b/data/assets/scene/solarsystem/planets/mars/layers/heightlayers/mdem200m.asset
@@ -7,7 +7,7 @@ local Layer = {
   Name = "HRSC MOLA Blended DEM Global 200m v2",
   Enabled = asset.enabled,
   FilePath = asset.localResource("mdem200m.wms"),
-  TilePixelSize = 513,
+  TilePixelSize = 129,
   Description = [[Blend of data derived from the Mars Orbiter Laser Altimeter
     (MOLA, an instrument aboard NASA's Mars Global Surveyor spacecraft), and data derived
     from the High-Resolution Stereo Camera (HRSC, an instrument aboard the European Space
diff --git a/data/assets/scene/solarsystem/planets/venus/layers/heightlayers/magellan_newyork.asset b/data/assets/scene/solarsystem/planets/venus/layers/heightlayers/magellan_newyork.asset
index a2e2534caf..102ea3fcaa 100644
--- a/data/assets/scene/solarsystem/planets/venus/layers/heightlayers/magellan_newyork.asset
+++ b/data/assets/scene/solarsystem/planets/venus/layers/heightlayers/magellan_newyork.asset
@@ -7,7 +7,7 @@ local Layer = {
   Name = "Magellan Elevation [New York]",
   Enabled = asset.enabled,
   FilePath = asset.localResource("magellan_newyork.wms"),
-  TilePixelSize = 256,
+  TilePixelSize = 129,
   Settings = {
     Gamma = 1.72,
     Multiplier = 1.1
diff --git a/data/assets/scene/solarsystem/planets/venus/layers/heightlayers/magellan_utah.asset b/data/assets/scene/solarsystem/planets/venus/layers/heightlayers/magellan_utah.asset
index a9d380d3db..83a7c0125a 100644
--- a/data/assets/scene/solarsystem/planets/venus/layers/heightlayers/magellan_utah.asset
+++ b/data/assets/scene/solarsystem/planets/venus/layers/heightlayers/magellan_utah.asset
@@ -7,7 +7,7 @@ local Layer = {
   Name = "Magellan Elevation [Utah]",
   Enabled = asset.enabled,
   FilePath = asset.localResource("magellan_utah.wms"),
-  TilePixelSize = 256,
+  TilePixelSize = 129,
   Settings = {
     Gamma = 1.72,
     Multiplier = 1.1
diff --git a/modules/globebrowsing/scripts/layer_support.lua b/modules/globebrowsing/scripts/layer_support.lua
index d396f5db6a..3622156feb 100644
--- a/modules/globebrowsing/scripts/layer_support.lua
+++ b/modules/globebrowsing/scripts/layer_support.lua
@@ -245,7 +245,7 @@ openspace.globebrowsing.parseInfoFile = function (file)
             Name = name,
             Description = Description or "",
             FilePath = dir .. '/' .. HeightFile,
-            TilePixelSize = 512
+            TilePixelSize = 65
         }
     end
 

From 045e4fcaa376e80456c9016a5094f1b944a20f3f Mon Sep 17 00:00:00 2001
From: Ylva Selling <ylva.selling@gmail.com>
Date: Wed, 14 Jun 2023 18:23:43 -0400
Subject: [PATCH 020/701] =?UTF-8?q?Add=20property=20to=20make=20it=20possi?=
 =?UTF-8?q?ble=20to=20set=20if=20the=20browser=20display=20copies=E2=80=A6?=
 =?UTF-8?q?=20(#2774)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* Add property to make it possible to set if the browser display copies should animate while the target is moving

* Update modules/skybrowser/src/targetbrowserpair.cpp

Co-authored-by: Alexander Bock <alexander.bock@liu.se>

---------

Co-authored-by: Alexander Bock <alexander.bock@liu.se>
---
 .../include/screenspaceskybrowser.h           |  2 ++
 .../skybrowser/src/screenspaceskybrowser.cpp  | 20 +++++++++++++++++++
 modules/skybrowser/src/targetbrowserpair.cpp  |  5 ++++-
 3 files changed, 26 insertions(+), 1 deletion(-)

diff --git a/modules/skybrowser/include/screenspaceskybrowser.h b/modules/skybrowser/include/screenspaceskybrowser.h
index a4b1e91620..13d41db2a8 100644
--- a/modules/skybrowser/include/screenspaceskybrowser.h
+++ b/modules/skybrowser/include/screenspaceskybrowser.h
@@ -50,6 +50,7 @@ public:
     glm::dvec2 fineTuneVector(const glm::dvec2& drag);
     bool isInitialized() const;
     bool isPointingSpacecraft() const;
+    bool shouldUpdateWhileTargetAnimates() const;
 
     double setVerticalFovWithScroll(float scroll);
     void setIdInBrowser() const;
@@ -71,6 +72,7 @@ private:
     properties::FloatProperty _textureQuality;
     properties::BoolProperty _isHidden;
     properties::BoolProperty _isPointingSpacecraft;
+    properties::BoolProperty _updateDuringTargetAnimation;
     std::vector<std::unique_ptr<properties::Vec3Property>> _displayCopies;
     std::vector<std::unique_ptr<properties::BoolProperty>> _showDisplayCopies;
 
diff --git a/modules/skybrowser/src/screenspaceskybrowser.cpp b/modules/skybrowser/src/screenspaceskybrowser.cpp
index 21b11fb99e..b004c5cb79 100644
--- a/modules/skybrowser/src/screenspaceskybrowser.cpp
+++ b/modules/skybrowser/src/screenspaceskybrowser.cpp
@@ -82,6 +82,14 @@ namespace {
         openspace::properties::Property::Visibility::User
     };
 
+    constexpr openspace::properties::Property::PropertyInfo UpdateDuringAnimationInfo = {
+        "UpdateDuringTargetAnimation",
+        "Update During Target Animation",
+        "If checked, the sky browser display copy will update its coordinates while "
+        "the target is animating.",
+        openspace::properties::Property::Visibility::User
+    };
+
     struct [[codegen::Dictionary(ScreenSpaceSkyBrowser)]] Parameters {
         // [[codegen::verbatim(TextureQualityInfo.description)]]
         std::optional<float> textureQuality;
@@ -91,6 +99,9 @@ namespace {
 
         // [[codegen::verbatim(PointSpacecraftInfo.description)]]
         std::optional<bool> pointSpacecraft;
+
+        // [[codegen::verbatim(UpdateDuringAnimationInfo.description)]]
+        std::optional<bool> updateDuringTargetAnimation;
     };
 
 #include "screenspaceskybrowser_codegen.cpp"
@@ -123,6 +134,7 @@ ScreenSpaceSkyBrowser::ScreenSpaceSkyBrowser(const ghoul::Dictionary& dictionary
     , _textureQuality(TextureQualityInfo, 1.f, 0.25f, 1.f)
     , _isHidden(IsHiddenInfo, true)
     , _isPointingSpacecraft(PointSpacecraftInfo, false)
+    , _updateDuringTargetAnimation(UpdateDuringAnimationInfo, false)
 {
     _identifier = makeUniqueIdentifier(_identifier);
 
@@ -131,6 +143,9 @@ ScreenSpaceSkyBrowser::ScreenSpaceSkyBrowser(const ghoul::Dictionary& dictionary
     _textureQuality = p.textureQuality.value_or(_textureQuality);
     _isHidden = p.isHidden.value_or(_isHidden);
     _isPointingSpacecraft = p.pointSpacecraft.value_or(_isPointingSpacecraft);
+    _updateDuringTargetAnimation = p.updateDuringTargetAnimation.value_or(
+        _updateDuringTargetAnimation
+    );
 
     addProperty(_isHidden);
     addProperty(_url);
@@ -139,6 +154,7 @@ ScreenSpaceSkyBrowser::ScreenSpaceSkyBrowser(const ghoul::Dictionary& dictionary
     addProperty(_textureQuality);
     addProperty(_verticalFov);
     addProperty(_isPointingSpacecraft);
+    addProperty(_updateDuringTargetAnimation);
 
     _textureQuality.onChange([this]() { _isDimensionsDirty = true; });
 
@@ -199,6 +215,10 @@ bool ScreenSpaceSkyBrowser::isPointingSpacecraft() const {
     return _isPointingSpacecraft;
 }
 
+bool ScreenSpaceSkyBrowser::shouldUpdateWhileTargetAnimates() const {
+    return _updateDuringTargetAnimation;
+}
+
 void ScreenSpaceSkyBrowser::setIdInBrowser() const {
     int currentNode = global::windowDelegate->currentNode();
     WwtCommunicator::setIdInBrowser(fmt::format("{}_{}", identifier(), currentNode));
diff --git a/modules/skybrowser/src/targetbrowserpair.cpp b/modules/skybrowser/src/targetbrowserpair.cpp
index 90672f5856..57e4e86d48 100644
--- a/modules/skybrowser/src/targetbrowserpair.cpp
+++ b/modules/skybrowser/src/targetbrowserpair.cpp
@@ -91,7 +91,10 @@ void TargetBrowserPair::fineTuneTarget(const glm::vec2& translation) {
 }
 
 void TargetBrowserPair::synchronizeAim() {
-    if (!_targetAnimation.isAnimating() && _browser->isInitialized()) {
+    bool shouldUpdate =
+        _browser->shouldUpdateWhileTargetAnimates() ||
+        !_targetAnimation.isAnimating();
+    if (shouldUpdate && _browser->isInitialized()) {
         _browser->setEquatorialAim(targetDirectionEquatorial());
         _browser->setTargetRoll(targetRoll());
         _targetRenderable->setVerticalFov(_browser->verticalFov());

From fb85410850d682b5c4b10273a6a75012936b652d Mon Sep 17 00:00:00 2001
From: Ylva Selling <ylva.selling@gmail.com>
Date: Wed, 14 Jun 2023 18:34:37 -0400
Subject: [PATCH 021/701] Fix bug with dark screen space renderables (#2776)

---
 modules/skybrowser/skybrowsermodule_lua.inl | 1 -
 src/rendering/screenspacerenderable.cpp     | 2 +-
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/modules/skybrowser/skybrowsermodule_lua.inl b/modules/skybrowser/skybrowsermodule_lua.inl
index 7201a08cad..b84c568235 100644
--- a/modules/skybrowser/skybrowsermodule_lua.inl
+++ b/modules/skybrowser/skybrowsermodule_lua.inl
@@ -525,7 +525,6 @@ std::string prunedIdentifier(std::string identifier) {
         "Name = '" + nameBrowser + "',"
         "Url = '" + url + "',"
         "FaceCamera = false,"
-        "Gamma = 2.2,"
         "CartesianPosition = " + ghoul::to_string(positionBrowser) +
      "}";
 
diff --git a/src/rendering/screenspacerenderable.cpp b/src/rendering/screenspacerenderable.cpp
index b615c75380..35905f2b55 100644
--- a/src/rendering/screenspacerenderable.cpp
+++ b/src/rendering/screenspacerenderable.cpp
@@ -464,7 +464,7 @@ void ScreenSpaceRenderable::createShaders() {
         "hdrExposure",
         static_cast<double>(global::renderEngine->hdrExposure())
     );
-    rendererData.setValue("disableHDR", global::renderEngine->isHdrDisabled());
+    rendererData.setValue("disableHDR", true);
 
     dict.setValue("rendererData", rendererData);
     dict.setValue(

From 516b0fadfb8bca75ed1e467761d8cdce329c1db1 Mon Sep 17 00:00:00 2001
From: Micah Acinapura <micahnyc@gmail.com>
Date: Wed, 14 Jun 2023 18:43:42 -0400
Subject: [PATCH 022/701] updated goldengate and gatewayarch models;  (#2775)

* updated goldengate and gatewayarch models; update ghoul for cachefix

* update ghoul to support current and previous versions of .osmodel

* revert ghoul commits

* Apply suggestions from code review

Co-authored-by: Alexander Bock <alexander.bock@liu.se>

---------

Co-authored-by: Alexander Bock <alexander.bock@liu.se>
---
 data/assets/educational/scale/gateway_arch.asset  | 15 +++++++--------
 .../educational/scale/golden_gate_bridge.asset    |  6 ++----
 2 files changed, 9 insertions(+), 12 deletions(-)

diff --git a/data/assets/educational/scale/gateway_arch.asset b/data/assets/educational/scale/gateway_arch.asset
index 28e89ee780..451b19e50b 100644
--- a/data/assets/educational/scale/gateway_arch.asset
+++ b/data/assets/educational/scale/gateway_arch.asset
@@ -5,15 +5,13 @@ local sunAsset = asset.require("scene/solarsystem/sun/sun")
 
 local modelFolder = asset.syncedResource({
   Name = "Scale Gateway Arch",
-  Type = "UrlSynchronization",
+  Type = "HttpSynchronization",
   Identifier = "scale_model_gateway_arch",
-  Url = "https://wms.openspace.amnh.org/static/sync/url/scalemodels/GatewayArch_fbx.osmodel",
-  Filename = "GatewayArch_fbx.osmodel",
-  Override = false
+  Version = 2
 })
 
 
-local Location = { 38.624880, -90.184939 }
+local Location = { 38.624640, -90.184940 }
 
 local ScaleModel = {
   Identifier = "Scale_GatewayArch",
@@ -36,14 +34,15 @@ local ScaleModel = {
     },
     Scale = {
       Type = "StaticScale",
-      Scale = 0.5
+      Scale = 1.1
     }
   },
   Renderable = {
     Type = "RenderableModel",
-    GeometryFile = modelFolder .. "GatewayArch_fbx.osmodel",
+    GeometryFile = modelFolder .. "GatewayArch.osmodel",
     RotationVector = { 0.0, 157.0, 0.0 },
-    LightSources = { sunAsset.LightSource }
+    LightSources = { sunAsset.LightSource },
+    ModelScale = "Centimeter"
   },
   GUI = {
     Name = "Gateway Arch",
diff --git a/data/assets/educational/scale/golden_gate_bridge.asset b/data/assets/educational/scale/golden_gate_bridge.asset
index d0ee73f63a..e66860e047 100644
--- a/data/assets/educational/scale/golden_gate_bridge.asset
+++ b/data/assets/educational/scale/golden_gate_bridge.asset
@@ -5,11 +5,9 @@ local sunAsset = asset.require("scene/solarsystem/sun/sun")
 
 local modelFolder = asset.syncedResource({
   Name = "Scale Golden Gate Bridge",
-  Type = "UrlSynchronization",
+  Type = "HttpSynchronization",
   Identifier = "scale_model_golden_gate_bridge",
-  Url = "https://wms.openspace.amnh.org/static/sync/url/scalemodels/golden_gate.osmodel",
-  Filename = "golden_gate.osmodel",
-  Override = false
+  Version = 2
 })
 
 

From 8d7b4238033cfa5d1c3978a2a6b35b43a1b34b7c Mon Sep 17 00:00:00 2001
From: Micah Acinapura <micahnyc@gmail.com>
Date: Wed, 14 Jun 2023 18:45:09 -0400
Subject: [PATCH 023/701] Add cache false to jpg layers to remove warnings 
 (#2777)

* removing warnings from jpg layers; move scanner warning to debug

* update moon texture to v2

* Apply suggestions from code review

Co-authored-by: Alexander Bock <alexander.bock@liu.se>

---------

Co-authored-by: Alexander Bock <alexander.bock@liu.se>
---
 .../dwarf_planets/ceres/layers/colorlayers/lamo_local.asset | 3 ++-
 .../heliosphere/bastille_day/magnetogram_textures.asset     | 3 ++-
 .../planets/earth/layers/colorlayers/blue_marble.asset      | 3 ++-
 .../earth/layers/heightlayers/blue_marble_height.asset      | 3 ++-
 .../earth/layers/nightlayers/earth_night_texture.asset      | 3 ++-
 .../earth/moon/layers/colorlayers/moon_texture.asset        | 5 +++--
 .../earth/noaa-sos/land/blue_marble-blue_marble.asset       | 3 ++-
 .../ganymede/layers/colorlayers/ganymede_texture.asset      | 3 ++-
 .../planets/jupiter/io/layers/colorlayers/io_texture.asset  | 3 ++-
 .../jupiter/layers/colorlayers/jupiter_texture.asset        | 3 ++-
 .../planets/mars/layers/colorlayers/mars_texture.asset      | 3 ++-
 .../mercury/layers/colorlayers/alsimap_02122015.asset       | 3 ++-
 .../mercury/layers/colorlayers/casimap_02122015.asset       | 3 ++-
 .../mercury/layers/colorlayers/fesimap_02122015.asset       | 3 ++-
 .../mercury/layers/colorlayers/mercury_texture.asset        | 3 ++-
 .../mercury/layers/colorlayers/mgsimap_02122015.asset       | 3 ++-
 .../mercury/layers/colorlayers/ssimap_02122015.asset        | 3 ++-
 .../neptune/layers/colorlayers/neptune_texture.asset        | 3 ++-
 .../triton_voyager2_clrmosaic_globalfill_600m.asset         | 3 ++-
 .../saturn/dione/layers/colorlayers/dione_texture.asset     | 3 ++-
 .../enceladus/layers/colorlayers/enceladus_texture.asset    | 3 ++-
 .../saturn/iapetus/layers/colorlayers/iapetus_texture.asset | 3 ++-
 .../planets/saturn/layers/colorlayers/saturn_texture.asset  | 3 ++-
 .../saturn/mimas/layers/colorlayers/mimas_texture.asset     | 3 ++-
 .../saturn/rhea/layers/colorlayers/rhea_texture.asset       | 3 ++-
 .../saturn/tethys/layers/colorlayers/tethys_texture.asset   | 3 ++-
 .../planets/uranus/layers/colorlayers/uranus_texture.asset  | 3 ++-
 .../venus/layers/colorlayers/clouds_magellan_combo.asset    | 3 ++-
 .../layers/colorlayers/clouds_magellan_combo_newyork.asset  | 3 ++-
 .../planets/venus/layers/colorlayers/venus_texture.asset    | 6 ++++--
 .../solarsystem/sun/layers/colorlayers/sun_texture.asset    | 3 ++-
 modules/spacecraftinstruments/util/instrumentdecoder.cpp    | 2 +-
 32 files changed, 66 insertions(+), 34 deletions(-)

diff --git a/data/assets/scene/solarsystem/dwarf_planets/ceres/layers/colorlayers/lamo_local.asset b/data/assets/scene/solarsystem/dwarf_planets/ceres/layers/colorlayers/lamo_local.asset
index 8ca72672c9..4bfd3e4e7d 100644
--- a/data/assets/scene/solarsystem/dwarf_planets/ceres/layers/colorlayers/lamo_local.asset
+++ b/data/assets/scene/solarsystem/dwarf_planets/ceres/layers/colorlayers/lamo_local.asset
@@ -14,7 +14,8 @@ local Layer = {
   Identifier = "LAMO_Local",
   Name = "LAMO [Local]",
   Enabled = asset.enabled,
-  FilePath = textures .. "ceres_lamo_4096x2048.png"
+  FilePath = textures .. "ceres_lamo_4096x2048.png",
+  CacheSettings = { Enabled = false }
 }
 
 
diff --git a/data/assets/scene/solarsystem/heliosphere/bastille_day/magnetogram_textures.asset b/data/assets/scene/solarsystem/heliosphere/bastille_day/magnetogram_textures.asset
index 7dae7bd896..0455bc9b86 100644
--- a/data/assets/scene/solarsystem/heliosphere/bastille_day/magnetogram_textures.asset
+++ b/data/assets/scene/solarsystem/heliosphere/bastille_day/magnetogram_textures.asset
@@ -42,7 +42,8 @@ asset.onInitialize(function()
         Name = imagename,   --"Magnetogram-" .. i,
         Description = "",
         FilePath = imagename,
-        Enabled = false
+        Enabled = false,
+        CacheSettings = { Enabled = false }
       }
     )
   end
diff --git a/data/assets/scene/solarsystem/planets/earth/layers/colorlayers/blue_marble.asset b/data/assets/scene/solarsystem/planets/earth/layers/colorlayers/blue_marble.asset
index f9244b2208..886df1be13 100644
--- a/data/assets/scene/solarsystem/planets/earth/layers/colorlayers/blue_marble.asset
+++ b/data/assets/scene/solarsystem/planets/earth/layers/colorlayers/blue_marble.asset
@@ -15,7 +15,8 @@ local Layer = {
   Name = "Blue Marble",
   Enabled = asset.enabled,
   FilePath = texturesPath .. "earth_bluemarble.jpg",
-  Description = "Earth image from Blue Marble Next Generation"
+  Description = "Earth image from Blue Marble Next Generation",
+  CacheSettings = { Enabled = false }
 }
 
 
diff --git a/data/assets/scene/solarsystem/planets/earth/layers/heightlayers/blue_marble_height.asset b/data/assets/scene/solarsystem/planets/earth/layers/heightlayers/blue_marble_height.asset
index 1b6c3fc58a..f6d07c0577 100644
--- a/data/assets/scene/solarsystem/planets/earth/layers/heightlayers/blue_marble_height.asset
+++ b/data/assets/scene/solarsystem/planets/earth/layers/heightlayers/blue_marble_height.asset
@@ -20,7 +20,8 @@ local Layer = {
   Settings = {
     Multiplier = 40,
     Offset = -600
-  }
+  },
+  CacheSettings = { Enabled = false }
 }
 
 
diff --git a/data/assets/scene/solarsystem/planets/earth/layers/nightlayers/earth_night_texture.asset b/data/assets/scene/solarsystem/planets/earth/layers/nightlayers/earth_night_texture.asset
index b42d01213a..df716c1df8 100644
--- a/data/assets/scene/solarsystem/planets/earth/layers/nightlayers/earth_night_texture.asset
+++ b/data/assets/scene/solarsystem/planets/earth/layers/nightlayers/earth_night_texture.asset
@@ -15,7 +15,8 @@ local Layer = {
   Name = "Earth Night Texture",
   Enabled = asset.enabled,
   FilePath = texturesPath .. "earth_night.png",
-  Description = "Earth's city lights are clearly visible from space"
+  Description = "Earth's city lights are clearly visible from space",
+  CacheSettings = { Enabled = false }
 }
 
 
diff --git a/data/assets/scene/solarsystem/planets/earth/moon/layers/colorlayers/moon_texture.asset b/data/assets/scene/solarsystem/planets/earth/moon/layers/colorlayers/moon_texture.asset
index d5f236e673..35249206b2 100644
--- a/data/assets/scene/solarsystem/planets/earth/moon/layers/colorlayers/moon_texture.asset
+++ b/data/assets/scene/solarsystem/planets/earth/moon/layers/colorlayers/moon_texture.asset
@@ -6,7 +6,7 @@ local texturesPath = asset.syncedResource({
   Name = "Moon Textures",
   Type = "HttpSynchronization",
   Identifier = "moon_textures",
-  Version = 1
+  Version = 2
 })
 
 
@@ -15,7 +15,8 @@ local Layer = {
   Name = "Moon Texture",
   Enabled = asset.enabled,
   FilePath = texturesPath .. "WAC_GLOBAL_E000N0000_032P.png",
-  Description = "Lower Resolution offline version of WAC layer"
+  Description = "Lower Resolution offline version of WAC layer",
+  CacheSettings = { Enabled = false }
 }
 
 
diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/blue_marble-blue_marble.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/blue_marble-blue_marble.asset
index f991d2c041..256ee75fc0 100644
--- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/blue_marble-blue_marble.asset
+++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/blue_marble-blue_marble.asset
@@ -30,7 +30,8 @@ local Layer = {
   Name = Name,
   Enabled = asset.enabled,
   FilePath = syncedDirectory .. "4096.jpg",
-  Description = Description
+  Description = Description,
+  CacheSettings = { Enabled = false }
 }
 
 
diff --git a/data/assets/scene/solarsystem/planets/jupiter/ganymede/layers/colorlayers/ganymede_texture.asset b/data/assets/scene/solarsystem/planets/jupiter/ganymede/layers/colorlayers/ganymede_texture.asset
index 48c3aeda3c..c13cba2e90 100644
--- a/data/assets/scene/solarsystem/planets/jupiter/ganymede/layers/colorlayers/ganymede_texture.asset
+++ b/data/assets/scene/solarsystem/planets/jupiter/ganymede/layers/colorlayers/ganymede_texture.asset
@@ -13,7 +13,8 @@ local texturesPath = asset.syncedResource({
 local Layer = {
   Identifier = "Texture",
   FilePath = texturesPath .. "ganymede.jpg",
-  Enabled = asset.enabled
+  Enabled = asset.enabled,
+  CacheSettings = { Enabled = false }
 }
 
 
diff --git a/data/assets/scene/solarsystem/planets/jupiter/io/layers/colorlayers/io_texture.asset b/data/assets/scene/solarsystem/planets/jupiter/io/layers/colorlayers/io_texture.asset
index 69015dcc80..d28283f7f2 100644
--- a/data/assets/scene/solarsystem/planets/jupiter/io/layers/colorlayers/io_texture.asset
+++ b/data/assets/scene/solarsystem/planets/jupiter/io/layers/colorlayers/io_texture.asset
@@ -13,7 +13,8 @@ local texturesPath = asset.syncedResource({
 local Layer = {
   Identifier = "Texture",
   FilePath = texturesPath .. "io.jpg",
-  Enabled = asset.enabled
+  Enabled = asset.enabled,
+  CacheSettings = { Enabled = false }
 }
 
 
diff --git a/data/assets/scene/solarsystem/planets/jupiter/layers/colorlayers/jupiter_texture.asset b/data/assets/scene/solarsystem/planets/jupiter/layers/colorlayers/jupiter_texture.asset
index 7fc4927002..3b8eaf3ee3 100644
--- a/data/assets/scene/solarsystem/planets/jupiter/layers/colorlayers/jupiter_texture.asset
+++ b/data/assets/scene/solarsystem/planets/jupiter/layers/colorlayers/jupiter_texture.asset
@@ -13,7 +13,8 @@ local texturesPath = asset.syncedResource({
 local Layer = {
   Identifier = "Texture",
   FilePath = texturesPath .. "jupiter_os.tif",
-  Enabled = asset.enabled
+  Enabled = asset.enabled,
+  CacheSettings = { Enabled = false }
 }
 
 
diff --git a/data/assets/scene/solarsystem/planets/mars/layers/colorlayers/mars_texture.asset b/data/assets/scene/solarsystem/planets/mars/layers/colorlayers/mars_texture.asset
index 34d40999ea..605155e4d0 100644
--- a/data/assets/scene/solarsystem/planets/mars/layers/colorlayers/mars_texture.asset
+++ b/data/assets/scene/solarsystem/planets/mars/layers/colorlayers/mars_texture.asset
@@ -15,7 +15,8 @@ local Layer = {
   Name = "Mars Texture",
   Enabled = asset.enabled,
   FilePath = texturesPath .. "mars.jpg",
-  Description = "Default jpg texture for Mars"
+  Description = "Default jpg texture for Mars",
+  CacheSettings = { Enabled = false }
 }
 
 
diff --git a/data/assets/scene/solarsystem/planets/mercury/layers/colorlayers/alsimap_02122015.asset b/data/assets/scene/solarsystem/planets/mercury/layers/colorlayers/alsimap_02122015.asset
index d796c5e88a..e27c699f95 100644
--- a/data/assets/scene/solarsystem/planets/mercury/layers/colorlayers/alsimap_02122015.asset
+++ b/data/assets/scene/solarsystem/planets/mercury/layers/colorlayers/alsimap_02122015.asset
@@ -15,7 +15,8 @@ local Layer = {
   Identifier = "alsimap_02122015",
   Enabled = asset.enabled,
   FilePath = texturesPath .. "alsimap_02122015.png",
-  BlendMode = "Multiply"
+  BlendMode = "Multiply",
+  CacheSettings = { Enabled = false }
 }
 
 
diff --git a/data/assets/scene/solarsystem/planets/mercury/layers/colorlayers/casimap_02122015.asset b/data/assets/scene/solarsystem/planets/mercury/layers/colorlayers/casimap_02122015.asset
index 91e6d3e67d..dc5e3e71c7 100644
--- a/data/assets/scene/solarsystem/planets/mercury/layers/colorlayers/casimap_02122015.asset
+++ b/data/assets/scene/solarsystem/planets/mercury/layers/colorlayers/casimap_02122015.asset
@@ -15,7 +15,8 @@ local Layer = {
   Identifier = "casimap_02122015",
   Enabled = asset.enabled,
   FilePath = texturesPath .. "casimap_02122015.png",
-  BlendMode = "Multiply"
+  BlendMode = "Multiply",
+  CacheSettings = { Enabled = false }
 }
 
 
diff --git a/data/assets/scene/solarsystem/planets/mercury/layers/colorlayers/fesimap_02122015.asset b/data/assets/scene/solarsystem/planets/mercury/layers/colorlayers/fesimap_02122015.asset
index 30e3529429..fb397287a7 100644
--- a/data/assets/scene/solarsystem/planets/mercury/layers/colorlayers/fesimap_02122015.asset
+++ b/data/assets/scene/solarsystem/planets/mercury/layers/colorlayers/fesimap_02122015.asset
@@ -15,7 +15,8 @@ local Layer = {
   Identifier = "fesimap_02122015",
   Enabled = asset.enabled,
   FilePath = texturesPath .. "fesimap_02122015.png",
-  BlendMode = "Multiply"
+  BlendMode = "Multiply",
+  CacheSettings = { Enabled = false }
 }
 
 
diff --git a/data/assets/scene/solarsystem/planets/mercury/layers/colorlayers/mercury_texture.asset b/data/assets/scene/solarsystem/planets/mercury/layers/colorlayers/mercury_texture.asset
index 9c507209f4..363bef5186 100644
--- a/data/assets/scene/solarsystem/planets/mercury/layers/colorlayers/mercury_texture.asset
+++ b/data/assets/scene/solarsystem/planets/mercury/layers/colorlayers/mercury_texture.asset
@@ -16,7 +16,8 @@ local Layer = {
   Enabled = asset.enabled,
   Description = [[The Map Projected Basemap RDR (BDR) data set consists of a global
     monochrome map of reflectance at a resolution of 256 pixels per degree (~166 m/p).
-    This is an offline version with lower resoution than the Messenger BDR layer.]]
+    This is an offline version with lower resoution than the Messenger BDR layer.]],
+    CacheSettings = { Enabled = false }
 }
 
 
diff --git a/data/assets/scene/solarsystem/planets/mercury/layers/colorlayers/mgsimap_02122015.asset b/data/assets/scene/solarsystem/planets/mercury/layers/colorlayers/mgsimap_02122015.asset
index 1fa0e13d80..f83de8ebad 100644
--- a/data/assets/scene/solarsystem/planets/mercury/layers/colorlayers/mgsimap_02122015.asset
+++ b/data/assets/scene/solarsystem/planets/mercury/layers/colorlayers/mgsimap_02122015.asset
@@ -19,7 +19,8 @@ local Layer = {
     Gamma = 1.33,
     Multiplier = 1.15
   },
-  BlendMode = "Multiply"
+  BlendMode = "Multiply",
+  CacheSettings = { Enabled = false }
 }
 
 
diff --git a/data/assets/scene/solarsystem/planets/mercury/layers/colorlayers/ssimap_02122015.asset b/data/assets/scene/solarsystem/planets/mercury/layers/colorlayers/ssimap_02122015.asset
index 9ba29f0e9d..52f6cc4076 100644
--- a/data/assets/scene/solarsystem/planets/mercury/layers/colorlayers/ssimap_02122015.asset
+++ b/data/assets/scene/solarsystem/planets/mercury/layers/colorlayers/ssimap_02122015.asset
@@ -15,7 +15,8 @@ local Layer = {
   Identifier = "ssimap_02122015",
   Enabled = asset.enabled,
   FilePath = texturesPath .. "ssimap_02122015.png",
-  BlendMode = "Multiply"
+  BlendMode = "Multiply",
+  CacheSettings = { Enabled = false }
 }
 
 
diff --git a/data/assets/scene/solarsystem/planets/neptune/layers/colorlayers/neptune_texture.asset b/data/assets/scene/solarsystem/planets/neptune/layers/colorlayers/neptune_texture.asset
index 06c5a383f7..1e5705d57f 100644
--- a/data/assets/scene/solarsystem/planets/neptune/layers/colorlayers/neptune_texture.asset
+++ b/data/assets/scene/solarsystem/planets/neptune/layers/colorlayers/neptune_texture.asset
@@ -13,7 +13,8 @@ local texturesPath = asset.syncedResource({
 local Layer = {
   Identifier = "Texture",
   FilePath = texturesPath .. "neptune.jpg",
-  Enabled = asset.enabled
+  Enabled = asset.enabled,
+  CacheSettings = { Enabled = false }
 }
 
 
diff --git a/data/assets/scene/solarsystem/planets/neptune/triton/layers/colorlayers/triton_voyager2_clrmosaic_globalfill_600m.asset b/data/assets/scene/solarsystem/planets/neptune/triton/layers/colorlayers/triton_voyager2_clrmosaic_globalfill_600m.asset
index c6e34d821f..46e83c352b 100644
--- a/data/assets/scene/solarsystem/planets/neptune/triton/layers/colorlayers/triton_voyager2_clrmosaic_globalfill_600m.asset
+++ b/data/assets/scene/solarsystem/planets/neptune/triton/layers/colorlayers/triton_voyager2_clrmosaic_globalfill_600m.asset
@@ -19,7 +19,8 @@ local Layer = {
     This map has a resolution of 1,970 feet (600 meters per pixel [m]). Color was synthesized by
     combining high-resolution images taken through orange, violet, and ultraviolet filters; these
     images were displayed as red, green, and blue images and combined to create this
-    color version (Smith et al., 1989).]]
+    color version (Smith et al., 1989).]],
+    CacheSettings = { Enabled = false }
 }
 
 
diff --git a/data/assets/scene/solarsystem/planets/saturn/dione/layers/colorlayers/dione_texture.asset b/data/assets/scene/solarsystem/planets/saturn/dione/layers/colorlayers/dione_texture.asset
index 4c2c4305f9..caca2f9069 100644
--- a/data/assets/scene/solarsystem/planets/saturn/dione/layers/colorlayers/dione_texture.asset
+++ b/data/assets/scene/solarsystem/planets/saturn/dione/layers/colorlayers/dione_texture.asset
@@ -13,7 +13,8 @@ local texturesPath = asset.syncedResource({
 local Layer = {
   Identifier = "Texture",
   FilePath = texturesPath .. "dione.jpg",
-  Enabled = asset.enabled
+  Enabled = asset.enabled,
+  CacheSettings = { Enabled = false }
 }
 
 
diff --git a/data/assets/scene/solarsystem/planets/saturn/enceladus/layers/colorlayers/enceladus_texture.asset b/data/assets/scene/solarsystem/planets/saturn/enceladus/layers/colorlayers/enceladus_texture.asset
index 1cd5ccc633..0dd079b028 100644
--- a/data/assets/scene/solarsystem/planets/saturn/enceladus/layers/colorlayers/enceladus_texture.asset
+++ b/data/assets/scene/solarsystem/planets/saturn/enceladus/layers/colorlayers/enceladus_texture.asset
@@ -13,7 +13,8 @@ local texturesPath = asset.syncedResource({
 local Layer = {
   Identifier = "Texture",
   FilePath = texturesPath .. "enceladus.jpg",
-  Enabled = asset.enabled
+  Enabled = asset.enabled,
+  CacheSettings = { Enabled = false }
 }
 
 
diff --git a/data/assets/scene/solarsystem/planets/saturn/iapetus/layers/colorlayers/iapetus_texture.asset b/data/assets/scene/solarsystem/planets/saturn/iapetus/layers/colorlayers/iapetus_texture.asset
index 842d15cc5b..b3b19e7464 100644
--- a/data/assets/scene/solarsystem/planets/saturn/iapetus/layers/colorlayers/iapetus_texture.asset
+++ b/data/assets/scene/solarsystem/planets/saturn/iapetus/layers/colorlayers/iapetus_texture.asset
@@ -13,7 +13,8 @@ local texturesPath = asset.syncedResource({
 local layer = {
   Identifier = "Texture",
   FilePath = texturesPath .. "iapetus.jpg",
-  Enabled = asset.enabled
+  Enabled = asset.enabled,
+  CacheSettings = { Enabled = false }
 }
 
 
diff --git a/data/assets/scene/solarsystem/planets/saturn/layers/colorlayers/saturn_texture.asset b/data/assets/scene/solarsystem/planets/saturn/layers/colorlayers/saturn_texture.asset
index 53ad4d9cb0..a3e7ca57ad 100644
--- a/data/assets/scene/solarsystem/planets/saturn/layers/colorlayers/saturn_texture.asset
+++ b/data/assets/scene/solarsystem/planets/saturn/layers/colorlayers/saturn_texture.asset
@@ -13,7 +13,8 @@ local texturesPath = asset.syncedResource({
 local Layer = {
   Identifier = "Texture",
   FilePath = texturesPath .. "saturn.jpg",
-  Enabled = asset.enabled
+  Enabled = asset.enabled,
+  CacheSettings = { Enabled = false }
 }
 
 
diff --git a/data/assets/scene/solarsystem/planets/saturn/mimas/layers/colorlayers/mimas_texture.asset b/data/assets/scene/solarsystem/planets/saturn/mimas/layers/colorlayers/mimas_texture.asset
index fc2feae315..6c000042f2 100644
--- a/data/assets/scene/solarsystem/planets/saturn/mimas/layers/colorlayers/mimas_texture.asset
+++ b/data/assets/scene/solarsystem/planets/saturn/mimas/layers/colorlayers/mimas_texture.asset
@@ -13,7 +13,8 @@ local texturesPath = asset.syncedResource({
 local Layer = {
   Identifier = "Texture",
   FilePath = texturesPath .. "mimas.jpg",
-  Enabled = asset.enabled
+  Enabled = asset.enabled,
+  CacheSettings = { Enabled = false }
 }
 
 
diff --git a/data/assets/scene/solarsystem/planets/saturn/rhea/layers/colorlayers/rhea_texture.asset b/data/assets/scene/solarsystem/planets/saturn/rhea/layers/colorlayers/rhea_texture.asset
index 7a704c70f5..9ff9287019 100644
--- a/data/assets/scene/solarsystem/planets/saturn/rhea/layers/colorlayers/rhea_texture.asset
+++ b/data/assets/scene/solarsystem/planets/saturn/rhea/layers/colorlayers/rhea_texture.asset
@@ -13,7 +13,8 @@ local texturesPath = asset.syncedResource({
 local Layer = {
   Identifier = "Texture",
   FilePath = texturesPath .. "rhea.jpg",
-  Enabled = asset.enabled
+  Enabled = asset.enabled,
+  CacheSettings = { Enabled = false }
 }
 
 
diff --git a/data/assets/scene/solarsystem/planets/saturn/tethys/layers/colorlayers/tethys_texture.asset b/data/assets/scene/solarsystem/planets/saturn/tethys/layers/colorlayers/tethys_texture.asset
index bf048d863e..5e76f7b274 100644
--- a/data/assets/scene/solarsystem/planets/saturn/tethys/layers/colorlayers/tethys_texture.asset
+++ b/data/assets/scene/solarsystem/planets/saturn/tethys/layers/colorlayers/tethys_texture.asset
@@ -13,7 +13,8 @@ local texturesPath = asset.syncedResource({
 local Layer = {
   Identifier = "Texture",
   FilePath = texturesPath .. "tethys.jpg",
-  Enabled = asset.enabled
+  Enabled = asset.enabled,
+  CacheSettings = { Enabled = false }
 }
 
 
diff --git a/data/assets/scene/solarsystem/planets/uranus/layers/colorlayers/uranus_texture.asset b/data/assets/scene/solarsystem/planets/uranus/layers/colorlayers/uranus_texture.asset
index 5e9d4272bf..b8702a1d72 100644
--- a/data/assets/scene/solarsystem/planets/uranus/layers/colorlayers/uranus_texture.asset
+++ b/data/assets/scene/solarsystem/planets/uranus/layers/colorlayers/uranus_texture.asset
@@ -13,7 +13,8 @@ local texturesPath = asset.syncedResource({
 local Layer = {
   Identifier = "Texture",
   FilePath = texturesPath .. "uranus.jpg",
-  Enabled = asset.enabled
+  Enabled = asset.enabled,
+  CacheSettings = { Enabled = false }
 }
 
 
diff --git a/data/assets/scene/solarsystem/planets/venus/layers/colorlayers/clouds_magellan_combo.asset b/data/assets/scene/solarsystem/planets/venus/layers/colorlayers/clouds_magellan_combo.asset
index 603db61c9a..74d459010f 100644
--- a/data/assets/scene/solarsystem/planets/venus/layers/colorlayers/clouds_magellan_combo.asset
+++ b/data/assets/scene/solarsystem/planets/venus/layers/colorlayers/clouds_magellan_combo.asset
@@ -21,7 +21,8 @@ local Layer = {
       TileProvider = {
         Identifier = "Clouds",
         Name = "Clouds",
-        FilePath = texturesPath .. "venus_clouds.jpg"
+        FilePath = texturesPath .. "venus_clouds.jpg",
+        CacheSettings = { Enabled = false }
       }
     },
     {
diff --git a/data/assets/scene/solarsystem/planets/venus/layers/colorlayers/clouds_magellan_combo_newyork.asset b/data/assets/scene/solarsystem/planets/venus/layers/colorlayers/clouds_magellan_combo_newyork.asset
index e8a1211c15..87477b880b 100644
--- a/data/assets/scene/solarsystem/planets/venus/layers/colorlayers/clouds_magellan_combo_newyork.asset
+++ b/data/assets/scene/solarsystem/planets/venus/layers/colorlayers/clouds_magellan_combo_newyork.asset
@@ -21,7 +21,8 @@ local Layer = {
       TileProvider = {
         Identifier = "Clouds",
         Name = "Clouds",
-        FilePath = texturesPath .. "venus_clouds.jpg"
+        FilePath = texturesPath .. "venus_clouds.jpg",
+        CacheSettings = { Enabled = false }
       }
     },
     {
diff --git a/data/assets/scene/solarsystem/planets/venus/layers/colorlayers/venus_texture.asset b/data/assets/scene/solarsystem/planets/venus/layers/colorlayers/venus_texture.asset
index b49f35bc9c..d327130a11 100644
--- a/data/assets/scene/solarsystem/planets/venus/layers/colorlayers/venus_texture.asset
+++ b/data/assets/scene/solarsystem/planets/venus/layers/colorlayers/venus_texture.asset
@@ -13,7 +13,8 @@ local texturesPath = asset.syncedResource({
 local Clouds = {
   Identifier = "Clouds",
   FilePath = texturesPath .. "venus_clouds.jpg",
-  Enabled = asset.enabled
+  Enabled = asset.enabled,
+  CacheSettings = { Enabled = false }
 }
 
 local Layer = {
@@ -23,7 +24,8 @@ local Layer = {
   Settings = {
     Opacity = 0.48,
     Gamma = 0.48
-  }
+  },
+  CacheSettings = { Enabled = false }
 }
 
 
diff --git a/data/assets/scene/solarsystem/sun/layers/colorlayers/sun_texture.asset b/data/assets/scene/solarsystem/sun/layers/colorlayers/sun_texture.asset
index 830731671f..e0a558a030 100644
--- a/data/assets/scene/solarsystem/sun/layers/colorlayers/sun_texture.asset
+++ b/data/assets/scene/solarsystem/sun/layers/colorlayers/sun_texture.asset
@@ -13,7 +13,8 @@ local texturesPath = asset.syncedResource({
 local Layer = {
   Identifier = "Texture",
   FilePath = texturesPath .. "sun.jpg",
-  Enabled = asset.enabled
+  Enabled = asset.enabled,
+  CacheSettings = { Enabled = false }
 }
 
 
diff --git a/modules/spacecraftinstruments/util/instrumentdecoder.cpp b/modules/spacecraftinstruments/util/instrumentdecoder.cpp
index a06ab2fe11..5fa03edf2a 100644
--- a/modules/spacecraftinstruments/util/instrumentdecoder.cpp
+++ b/modules/spacecraftinstruments/util/instrumentdecoder.cpp
@@ -57,7 +57,7 @@ InstrumentDecoder::InstrumentDecoder(const ghoul::Dictionary& dictionary) {
         _stopCommand = *p.stopCommand;
     }
     else {
-        LWARNING("Scanner must provide stop command, please check asset file");
+        LDEBUG("Scanner must provide stop command, please check asset file");
     }
 
     _spiceIDs = p.spice;

From 1c281b2545414a98097726aa38a2207eb836590c Mon Sep 17 00:00:00 2001
From: Micah Acinapura <micahnyc@gmail.com>
Date: Wed, 14 Jun 2023 18:46:30 -0400
Subject: [PATCH 024/701] Remove panoramas until licenced; remove currentFocus
 lighting action until fixed; (#2778)

* removing panoramas until licensing is sorted

* remove current focus from planet lighting until its fixed
---
 .../actions/planets/planet_lighting.asset     |  22 +-
 data/assets/nightsky/ground_panoramas.asset   | 188 ------------------
 data/assets/nightsky/nightsky.asset           |   1 -
 3 files changed, 11 insertions(+), 200 deletions(-)
 delete mode 100644 data/assets/nightsky/ground_panoramas.asset

diff --git a/data/assets/actions/planets/planet_lighting.asset b/data/assets/actions/planets/planet_lighting.asset
index 2676f71a8d..5a8923845f 100644
--- a/data/assets/actions/planets/planet_lighting.asset
+++ b/data/assets/actions/planets/planet_lighting.asset
@@ -59,13 +59,13 @@ local function illuminationAction(node, nodeLower, global)
     Command = actionCommand,
     Documentation = "Enables " .. string.lower(actionName) .. " for" .. node,
     GuiPath = "/Solar System/" .. node,
-    IsLocal = true
+    IsLocal = false
   }
   return action
 end
 
-local CurrentFocusGlobal = illuminationAction("Current Focus", "current_focus", true)
-local CurrentFocusStandard = illuminationAction("Current Focus", "current_focus", false)
+--local CurrentFocusGlobal = illuminationAction("Current Focus", "current_focus", true)
+--local CurrentFocusStandard = illuminationAction("Current Focus", "current_focus", false)
 
 local EarthGlobal = illuminationAction("Earth", "earth", true)
 local EarthStandard = illuminationAction("Earth", "earth", false)
@@ -98,7 +98,7 @@ local AllGlobesGlobalIllumination = {
   ]],
   Documentation = "Enables global illumination for all globes",
   GuiPath = "/Solar System",
-  IsLocal = true
+  IsLocal = false
 }
 
 local AllGlobesStandardIllumination = {
@@ -114,13 +114,13 @@ local AllGlobesStandardIllumination = {
   ]],
   Documentation = "Disables global illumination for all globes",
   GuiPath = "/Solar System",
-  IsLocal = true
+  IsLocal = false
 }
 
 
 asset.onInitialize(function()
-  openspace.action.registerAction(CurrentFocusGlobal)
-  openspace.action.registerAction(CurrentFocusStandard)
+  -- openspace.action.registerAction(CurrentFocusGlobal)
+  -- openspace.action.registerAction(CurrentFocusStandard)
   openspace.action.registerAction(EarthGlobal)
   openspace.action.registerAction(EarthStandard)
   openspace.action.registerAction(MarsGlobal)
@@ -148,12 +148,12 @@ asset.onDeinitialize(function()
   openspace.action.removeAction(MarsGlobal)
   openspace.action.removeAction(EarthStandard)
   openspace.action.removeAction(EarthGlobal)
-  openspace.action.removeAction(CurrentFocusStandard)
-  openspace.action.removeAction(CurrentFocusGlobal)
+  -- openspace.action.removeAction(CurrentFocusStandard)
+  -- openspace.action.removeAction(CurrentFocusGlobal)
 end)
 
-asset.export("CurrentFocusGlobal", CurrentFocusGlobal.Identifier)
-asset.export("CurrentFocusStandard", CurrentFocusStandard.Identifier)
+-- asset.export("CurrentFocusGlobal", CurrentFocusGlobal.Identifier)
+-- asset.export("CurrentFocusStandard", CurrentFocusStandard.Identifier)
 asset.export("EarthGlobal", EarthGlobal.Identifier)
 asset.export("EarthStandard", EarthStandard.Identifier)
 asset.export("MarsGlobal", MarsGlobal.Identifier)
diff --git a/data/assets/nightsky/ground_panoramas.asset b/data/assets/nightsky/ground_panoramas.asset
deleted file mode 100644
index 6e2cf44100..0000000000
--- a/data/assets/nightsky/ground_panoramas.asset
+++ /dev/null
@@ -1,188 +0,0 @@
-local earthAsset = asset.require("scene/solarsystem/planets/earth/earth")
-
-
-
-local textures = asset.syncedResource({
-  Name = "Ground Panorama Textures",
-  Type = "UrlSynchronization",
-  Identifier = "ground_panorama_textures",
-  Url = {
-    "https://wms.openspace.amnh.org/static/sync/url/panos/0.png",
-    "https://wms.openspace.amnh.org/static/sync/url/panos/1.png",
-    "https://wms.openspace.amnh.org/static/sync/url/panos/2.png",
-    "https://wms.openspace.amnh.org/static/sync/url/panos/3.png",
-    "https://wms.openspace.amnh.org/static/sync/url/panos/4.png",
-    "https://wms.openspace.amnh.org/static/sync/url/panos/5.png",
-    "https://wms.openspace.amnh.org/static/sync/url/panos/6.png"
-  },
-  Override = false
-})
-
-
-local GroundPanoPosition = {
-  Identifier = "GroundPanoPosition",
-  Parent = earthAsset.Earth.Identifier,
-  Transform = {
-    Translation = {
-      Type = "GlobeTranslation",
-      Globe = earthAsset.Earth.Identifier,
-      Latitude = 34.201639,
-      Longitude = -118.171319,
-      Altitude = 10.0,
-      UseCamera = false,
-      UseCameraAltitude = false
-    },
-    Rotation = {
-      Type = "GlobeRotation",
-      Globe = earthAsset.Earth.Identifier,
-      Latitude = 34.201639,
-      Longitude = -118.171319,
-      UseHeightmap = false,
-      Angle = 270.0
-    }
-  },
-  GUI = {
-    Name = "Ground Pano Position",
-    Path = "/Other/Night Sky",
-    Hidden = true
-  }
-}
-
-local GroundPanoSphere = {
-  Identifier = "GroundPanoSphere",
-  Parent = GroundPanoPosition.Identifier,
-  Transform = {
-    Rotation = {
-      Type = "StaticRotation",
-      Rotation = { -math.pi / 2, 0.0, 0.0 }
-    }
-  },
-  Renderable = {
-    Type = "RenderableSphere",
-    Size = 8.5,
-    Segments = 40,
-    Opacity = 1.0,
-    Enabled = asset.enabled,
-    Texture = textures .. "3.png",
-    Orientation = "Inside",
-    MirrorTexture = true,
-    FadeOutThreshold = 1.00,
-    Background = true,
-    RenderBinMode = "Overlay"
-  },
-  GUI = {
-    Name = "Ground Panorama",
-    Path = "/Other/Night Sky"
-  }
-}
-
-local showCommand = [[
-  local lat, lon, alt = openspace.globebrowsing.getGeoPositionForCamera()
-  local camera = openspace.navigation.getNavigationState()
-  openspace.setParent("GroundPanoPosition", camera.Anchor)
-  openspace.setPropertyValueSingle("Scene.GroundPanoPosition.Translation.Globe", camera.Anchor)
-  openspace.setPropertyValueSingle("Scene.GroundPanoPosition.Translation.Latitude", lat)
-  openspace.setPropertyValueSingle("Scene.GroundPanoPosition.Translation.Longitude", lon)
-  openspace.setPropertyValueSingle("Scene.GroundPanoPosition.Translation.Altitude", alt)
-  openspace.setPropertyValueSingle("Scene.GroundPanoPosition.Rotation.Globe", camera.Anchor)
-  openspace.setPropertyValueSingle("Scene.GroundPanoPosition.Rotation.Latitude", lat)
-  openspace.setPropertyValueSingle("Scene.GroundPanoPosition.Rotation.Longitude", lon)
-  openspace.setPropertyValueSingle("Scene.GroundPanoSphere.Renderable.Enabled", true)
-  openspace.setPropertyValueSingle("Scene.GroundPanoSphere.Renderable.Fade", 0.0)
-  openspace.setPropertyValueSingle("Scene.GroundPanoSphere.Renderable.Fade", 1.0, 1.0)
-]]
-
-local setTextureCommand = function(scene)
-  local command = [[openspace.setPropertyValueSingle("Scene.GroundPanoSphere.Renderable.Texture", "]]
-  command = command .. textures
-  if (scene == "forest") then
-    command = command .. "1"
-  elseif (scene == "city") then
-    command = command .. "2"
-  elseif (scene == "backyard") then
-    command = command .. "3"
-  elseif (scene == "desert") then
-    command = command .. "4"
-  else
-    openspace.printDebug("unknown scene")
-  end
-  command = command .. [[.png")]]
-  command = command:gsub("\\", "\\\\")
-  return command
-end
-
-local ShowForestPano = {
-  Identifier = "os.nightsky.ShowForestPano",
-  Name = "Show forest panorama",
-  Command = setTextureCommand("forest") .. showCommand,
-  Documentation = "Shows the panorama sphere with a forest scene",
-  GuiPath = "/Night Sky/Panoramas",
-  IsLocal = false
-}
-
-local ShowCityPano = {
-  Identifier = "os.nightsky.ShowCityPano",
-  Name = "Show city panorama",
-  Command = setTextureCommand("city") .. showCommand,
-  Documentation = "Shows the panorama sphere with a city scene",
-  GuiPath = "/Night Sky/Panoramas",
-  IsLocal = false
-}
-
-local ShowBackyardPano = {
-  Identifier = "os.nightsky.ShowBackyardPano",
-  Name = "Show backyard panorama",
-  Command = setTextureCommand("backyard") .. showCommand,
-  Documentation = "Shows the panorama sphere with a backyard scene",
-  GuiPath = "/Night Sky/Panoramas",
-  IsLocal = false
-}
-
-local ShowDesertPano = {
-  Identifier = "os.nightsky.ShowDesertPano",
-  Name = "Show desert panorama",
-  Command = setTextureCommand("desert") .. showCommand,
-  Documentation = "Shows the panorama sphere with a desert scene",
-  GuiPath = "/Night Sky/Panoramas",
-  IsLocal = false
-}
-
-local HideGroundPano = {
-  Identifier = "os.nightsky.HideGroundPano",
-  Name = "Hide ground panorama",
-  Command = [[
-    openspace.fadeOut("Scene.GroundPanoSphere.Renderable")
-  ]],
-  Documentation = "Hides the panorama",
-  GuiPath = "/Night Sky/Panoramas",
-  IsLocal = false
-}
-
-
-asset.onInitialize(function()
-  openspace.addSceneGraphNode(GroundPanoPosition)
-  openspace.addSceneGraphNode(GroundPanoSphere)
-  openspace.action.registerAction(ShowForestPano)
-  openspace.action.registerAction(ShowCityPano)
-  openspace.action.registerAction(ShowBackyardPano)
-  openspace.action.registerAction(ShowDesertPano)
-  openspace.action.registerAction(HideGroundPano)
-end)
-
-asset.onDeinitialize(function()
-  openspace.action.removeAction(HideGroundPano)
-  openspace.action.removeAction(ShowForestPano)
-  openspace.action.removeAction(ShowCityPano)
-  openspace.action.removeAction(ShowBackyardPano)
-  openspace.action.removeAction(ShowDesertPano)
-  openspace.removeSceneGraphNode(GroundPanoSphere)
-  openspace.removeSceneGraphNode(GroundPanoPosition)
-end)
-
-asset.export(GroundPanoPosition)
-asset.export(GroundPanoSphere)
-asset.export("ShowForestPano", ShowForestPano.Identifier)
-asset.export("ShowCityPano", ShowCityPano.Identifier)
-asset.export("ShowBackyardPano", ShowBackyardPano.Identifier)
-asset.export("ShowDesertPano", ShowDesertPano.Identifier)
-asset.export("HideGroundPano", HideGroundPano.Identifier)
diff --git a/data/assets/nightsky/nightsky.asset b/data/assets/nightsky/nightsky.asset
index cac8f1d380..57cc9e2dd0 100644
--- a/data/assets/nightsky/nightsky.asset
+++ b/data/assets/nightsky/nightsky.asset
@@ -3,7 +3,6 @@ asset.require("./cardinal_directions", false)
 asset.require("./ecliptic_band", false)
 asset.require("./equatorial_band", false)
 asset.require("./galactic_band", false)
-asset.require("./ground_panoramas", false)
 asset.require("./meridian", false)
 asset.require("./light_pollution", false)
 asset.require("./zenith", false)

From 5c8ff9eec5e3d2d1196494cba3318fbb0ba23174 Mon Sep 17 00:00:00 2001
From: Alexander Bock <mail@alexanderbock.eu>
Date: Thu, 15 Jun 2023 00:52:39 +0200
Subject: [PATCH 025/701] Revert "Merge pull request #2721 from
 OpenSpace/issue/2682"

This reverts commit b4337e8188624ce1454beae9095f35cd2998fd14, reversing
changes made to 384f1e55307090b68bfa5a4846e5f48b88c4a49b.
---
 modules/globebrowsing/src/basictypes.h                   | 1 -
 modules/globebrowsing/src/rawtiledatareader.cpp          | 4 +++-
 .../src/tileprovider/defaulttileprovider.cpp             | 9 +--------
 3 files changed, 4 insertions(+), 10 deletions(-)

diff --git a/modules/globebrowsing/src/basictypes.h b/modules/globebrowsing/src/basictypes.h
index 4e7bd94e3f..6655d2611a 100644
--- a/modules/globebrowsing/src/basictypes.h
+++ b/modules/globebrowsing/src/basictypes.h
@@ -104,7 +104,6 @@ struct TileMetaData {
     std::array<float, 4> maxValues;
     std::array<float, 4> minValues;
     std::array<bool, 4> hasMissingData;
-    bool allMissingData = false;
     uint8_t nValues = 0;
 };
 
diff --git a/modules/globebrowsing/src/rawtiledatareader.cpp b/modules/globebrowsing/src/rawtiledatareader.cpp
index 01ccd67694..d3f00fe0ea 100644
--- a/modules/globebrowsing/src/rawtiledatareader.cpp
+++ b/modules/globebrowsing/src/rawtiledatareader.cpp
@@ -977,7 +977,9 @@ TileMetaData RawTileDataReader::tileMetaData(RawTile& rawTile,
         }
     }
 
-    ppData.allMissingData = allIsMissing;
+    if (allIsMissing) {
+        rawTile.error = RawTile::ReadError::Failure;
+    }
 
     return ppData;
 }
diff --git a/modules/globebrowsing/src/tileprovider/defaulttileprovider.cpp b/modules/globebrowsing/src/tileprovider/defaulttileprovider.cpp
index 0ed4601d23..60bb918b4e 100644
--- a/modules/globebrowsing/src/tileprovider/defaulttileprovider.cpp
+++ b/modules/globebrowsing/src/tileprovider/defaulttileprovider.cpp
@@ -251,16 +251,9 @@ Tile::Status DefaultTileProvider::tileStatus(const TileIndex& index) {
         .tileIndex = index,
         .providerID = uniqueIdentifier
     };
-    
     cache::MemoryAwareTileCache* tileCache =
         global::moduleEngine->module<GlobeBrowsingModule>()->tileCache();
-
-    Tile t = tileCache->get(key);
-    if (t.metaData.has_value() && t.metaData->allMissingData) {
-        return Tile::Status::OutOfRange;
-    }
-
-    return t.status;
+    return tileCache->get(key).status;
 }
 
 TileDepthTransform DefaultTileProvider::depthTransform() {

From bf38d9a415753f44bcd5e3735296c62835bf3b4e Mon Sep 17 00:00:00 2001
From: Emma Broman <emma.broman@liu.se>
Date: Thu, 15 Jun 2023 16:35:06 +0200
Subject: [PATCH 026/701] provide some more info in GEOS errors on geojson load

---
 .../src/geojson/globegeometryfeature.cpp              | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/modules/globebrowsing/src/geojson/globegeometryfeature.cpp b/modules/globebrowsing/src/geojson/globegeometryfeature.cpp
index c41f17d626..74c699b874 100644
--- a/modules/globebrowsing/src/geojson/globegeometryfeature.cpp
+++ b/modules/globebrowsing/src/geojson/globegeometryfeature.cpp
@@ -231,13 +231,20 @@ void GlobeGeometryFeature::createFromSingleGeosGeometry(const geos::geom::Geomet
 
                 _type = GeometryType::Polygon;
             }
-            catch (geos::util::IllegalStateException&) {
-                LERROR("Non-simple (e.g. self-intersecting) polygons not supported yet");
+            catch (geos::util::IllegalStateException& e) {
+                LERROR(fmt::format(
+                    "Non-simple (e.g. self-intersecting) polygons not supported yet. "
+                    "GEOS error: '{}'", e.what()
+                ));
                 throw ghoul::MissingCaseException();
 
                 // TODO: handle self-intersections points
                 // https://www.sciencedirect.com/science/article/pii/S0304397520304199
             }
+            catch (geos::util::GEOSException& e) {
+                LERROR(fmt::format("Unknown geos error: {}", e.what()));
+                throw ghoul::MissingCaseException();
+            }
             break;
         }
         default:

From 3bbe19f56c76b8d1ccf6dc785c82ac8fd4bc789d Mon Sep 17 00:00:00 2001
From: Emma Broman <emma.broman@liu.se>
Date: Thu, 15 Jun 2023 18:30:08 +0200
Subject: [PATCH 027/701] Update GUI hash

---
 data/assets/util/webgui.asset | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/data/assets/util/webgui.asset b/data/assets/util/webgui.asset
index 2f6431c17f..98c92d27c7 100644
--- a/data/assets/util/webgui.asset
+++ b/data/assets/util/webgui.asset
@@ -4,7 +4,7 @@ local guiCustomization = asset.require("customization/gui")
 
 
 -- Select which commit hashes to use for the frontend and backend
-local frontendHash = "3f93d653ee4783b22a38a6c771e599cbd95326c5"
+local frontendHash = "aab5767cdfe004a8a512f18e41217f608b62f131"
 
 local frontend = asset.syncedResource({
   Identifier = "WebGuiFrontend",

From 23b01aba12611ae7b61e4826c5a87e6f54736665 Mon Sep 17 00:00:00 2001
From: Emma Broman <emma.broman@liu.se>
Date: Thu, 15 Jun 2023 18:40:51 +0200
Subject: [PATCH 028/701] Add a trigger property to delete a geojson component

---
 .../src/geojson/geojsoncomponent.cpp          | 26 +++++++++++++++++++
 .../src/geojson/geojsoncomponent.h            |  5 ++++
 2 files changed, 31 insertions(+)

diff --git a/modules/globebrowsing/src/geojson/geojsoncomponent.cpp b/modules/globebrowsing/src/geojson/geojsoncomponent.cpp
index 9bf2fcbf1e..394f5e4f00 100644
--- a/modules/globebrowsing/src/geojson/geojsoncomponent.cpp
+++ b/modules/globebrowsing/src/geojson/geojsoncomponent.cpp
@@ -165,6 +165,14 @@ namespace {
         openspace::properties::Property::Visibility::NoviceUser
     };
 
+    constexpr openspace::properties::Property::PropertyInfo DeleteInfo = {
+        "Delete",
+        "Delete",
+        "Triggering this will remove this GeoJson component from its globe. Note that the "
+        "GUI may have to be reloaded for the change to be reflect in the user interface.",
+        openspace::properties::Property::Visibility::User
+    };
+
     struct [[codegen::Dictionary(GeoJsonComponent)]] Parameters {
         // The unique identifier for this layer. May not contain '.' or spaces
         std::string identifier;
@@ -305,6 +313,8 @@ GeoJsonComponent::GeoJsonComponent(const ghoul::Dictionary& dictionary,
         glm::vec2(90.f, 180.f)
     )
     , _flyToFeature(FlyToFeatureInfo)
+    , _deleteThisComponent(DeleteInfo)
+    , _deletePropertyOwner({ "Deletion", "Deletion" })
     , _lightSourcePropertyOwner({ "LightSources", "Light Sources" })
     , _featuresPropertyOwner({ "Features", "Features" })
 {
@@ -404,6 +414,12 @@ GeoJsonComponent::GeoJsonComponent(const ghoul::Dictionary& dictionary,
     _flyToFeature.onChange([this]() { flyToFeature(); });
     addProperty(_flyToFeature);
 
+    // Add delete trigger under its own property owner, to make it more difficult to
+    // access by mistake
+    _deleteThisComponent.onChange([this]() { triggerDeletion(); });
+    _deletePropertyOwner.addProperty(_deleteThisComponent);
+    addPropertySubOwner(_deletePropertyOwner);
+
     readFile();
 
     if (p.lightSources.has_value()) {
@@ -812,4 +828,14 @@ void GeoJsonComponent::flyToFeature(std::optional<int> index) const {
     );
 }
 
+void GeoJsonComponent::triggerDeletion() const {
+    global::scriptEngine->queueScript(
+        fmt::format(
+            "openspace.globebrowsing.deleteGeoJson(\"{}\", \"{}\")",
+            _globeNode.owner()->identifier(), _identifier
+        ),
+        scripting::ScriptEngine::RemoteScripting::Yes
+    );
+}
+
 } // namespace openspace::globebrowsing
diff --git a/modules/globebrowsing/src/geojson/geojsoncomponent.h b/modules/globebrowsing/src/geojson/geojsoncomponent.h
index 133960bc65..5e25c552ff 100644
--- a/modules/globebrowsing/src/geojson/geojsoncomponent.h
+++ b/modules/globebrowsing/src/geojson/geojsoncomponent.h
@@ -115,6 +115,8 @@ private:
      */
     void flyToFeature(std::optional<int> index = std::nullopt) const;
 
+    void triggerDeletion() const;
+
     std::vector<GlobeGeometryFeature> _geometryFeatures;
 
     properties::BoolProperty _enabled;
@@ -146,6 +148,9 @@ private:
     float _bboxDiagonalSize = 0.f;
     properties::TriggerProperty _flyToFeature;
 
+    properties::PropertyOwner _deletePropertyOwner;
+    properties::TriggerProperty _deleteThisComponent;
+
     std::vector<std::unique_ptr<LightSource>> _lightSources;
     std::unique_ptr<LightSource> _defaultLightSource;
 

From 0b20affc5d37c71ef7a5b02df3dbbcdedb14cde1 Mon Sep 17 00:00:00 2001
From: Ylva Selling <ylva.selling@gmail.com>
Date: Thu, 15 Jun 2023 15:42:32 -0400
Subject: [PATCH 029/701] Add border to screenspace renderables

---
 .../rendering/screenspacerenderable.h         |  7 ++-
 modules/base/shaders/screenspace_fs.glsl      |  9 ++++
 modules/skybrowser/include/wwtcommunicator.h  |  2 +-
 .../skybrowser/src/screenspaceskybrowser.cpp  |  2 +-
 modules/skybrowser/src/wwtcommunicator.cpp    |  6 +--
 src/rendering/screenspacerenderable.cpp       | 43 +++++++++++++++++--
 6 files changed, 60 insertions(+), 9 deletions(-)

diff --git a/include/openspace/rendering/screenspacerenderable.h b/include/openspace/rendering/screenspacerenderable.h
index 93b03efe17..886e16c109 100644
--- a/include/openspace/rendering/screenspacerenderable.h
+++ b/include/openspace/rendering/screenspacerenderable.h
@@ -129,6 +129,10 @@ protected:
     // Local rotation (roll, pitch, yaw)
     properties::Vec3Property _localRotation;
 
+    // Border
+    properties::FloatProperty _borderWidth;
+    properties::Vec3Property _borderColor;
+
     properties::FloatProperty _scale;
     properties::FloatProperty _gamma;
     properties::Vec3Property _multiplyColor;
@@ -136,7 +140,8 @@ protected:
     properties::TriggerProperty _delete;
 
     glm::ivec2 _objectSize = glm::ivec2(0);
-    UniformCache(color, opacity, mvp, texture, backgroundColor, gamma) _uniformCache;
+    UniformCache(color, opacity, mvp, texture, backgroundColor, gamma, 
+        borderColor, borderWidth) _uniformCache;
     std::unique_ptr<ghoul::opengl::ProgramObject> _shader;
 };
 
diff --git a/modules/base/shaders/screenspace_fs.glsl b/modules/base/shaders/screenspace_fs.glsl
index 21af960401..6478a93dab 100644
--- a/modules/base/shaders/screenspace_fs.glsl
+++ b/modules/base/shaders/screenspace_fs.glsl
@@ -33,6 +33,8 @@ uniform vec3 color = vec3(1.0);
 uniform float opacity = 1.0;
 uniform vec4 backgroundColor = vec4(0.0);
 uniform float gamma = 1.0;
+uniform vec2 borderWidth = vec2(0.1);
+uniform vec3 borderColor = vec3(0.0);
 
 
 Fragment getFragment() {
@@ -41,6 +43,13 @@ Fragment getFragment() {
   vec4 texColor = texture(tex, vs_st) * vec4(color, opacity);
 
   frag.color = texColor.a * texColor + (1.0 - texColor.a) * backgroundColor;
+
+  // Set border color
+  if (vs_st.x < borderWidth.x || vs_st.x > 1 - borderWidth.x ||
+      vs_st.y < borderWidth.y || vs_st.y > 1 - borderWidth.y) {
+    frag.color = vec4(borderColor, 1.0);
+  }
+
   if (frag.color.a == 0.0) {
     discard;
   }
diff --git a/modules/skybrowser/include/wwtcommunicator.h b/modules/skybrowser/include/wwtcommunicator.h
index 61f3e2ac65..bc2235dc92 100644
--- a/modules/skybrowser/include/wwtcommunicator.h
+++ b/modules/skybrowser/include/wwtcommunicator.h
@@ -76,7 +76,7 @@ protected:
     properties::DoubleProperty _verticalFov;
 
     double _borderRadius = 0.0;
-    glm::ivec3 _borderColor = glm::ivec3(70);
+    glm::ivec3 _wwtBorderColor = glm::ivec3(70);
     glm::dvec2 _equatorialAim = glm::dvec2(0.0);
     double _targetRoll = 0.0;
     bool _isImageCollectionLoaded = false;
diff --git a/modules/skybrowser/src/screenspaceskybrowser.cpp b/modules/skybrowser/src/screenspaceskybrowser.cpp
index 21b11fb99e..4ea4aa90b0 100644
--- a/modules/skybrowser/src/screenspaceskybrowser.cpp
+++ b/modules/skybrowser/src/screenspaceskybrowser.cpp
@@ -143,7 +143,7 @@ ScreenSpaceSkyBrowser::ScreenSpaceSkyBrowser(const ghoul::Dictionary& dictionary
     _textureQuality.onChange([this]() { _isDimensionsDirty = true; });
 
     if (global::windowDelegate->isMaster()) {
-        _borderColor = randomBorderColor();
+        _wwtBorderColor = randomBorderColor();
     }
 
     _useRadiusAzimuthElevation.onChange(
diff --git a/modules/skybrowser/src/wwtcommunicator.cpp b/modules/skybrowser/src/wwtcommunicator.cpp
index 674609710d..67c7224f98 100644
--- a/modules/skybrowser/src/wwtcommunicator.cpp
+++ b/modules/skybrowser/src/wwtcommunicator.cpp
@@ -242,7 +242,7 @@ void WwtCommunicator::setEquatorialAim(glm::dvec2 equatorial) {
 }
 
 void WwtCommunicator::setBorderColor(glm::ivec3 color) {
-    _borderColor = std::move(color);
+    _wwtBorderColor = std::move(color);
     _borderColorIsDirty = true;
 }
 
@@ -255,7 +255,7 @@ void WwtCommunicator::setBorderRadius(double radius) {
 void WwtCommunicator::updateBorderColor() const {
     std::string script = fmt::format(
         "setBackgroundColor('rgb({},{},{})');",
-        _borderColor.x, _borderColor.y, _borderColor.z
+        _wwtBorderColor.x, _wwtBorderColor.y, _wwtBorderColor.z
     );
     executeJavascript(script);
 }
@@ -355,7 +355,7 @@ void WwtCommunicator::setIdInBrowser(const std::string& id) const {
 }
 
 glm::ivec3 WwtCommunicator::borderColor() const {
-    return _borderColor;
+    return _wwtBorderColor;
 }
 
 double WwtCommunicator::verticalFov() const {
diff --git a/src/rendering/screenspacerenderable.cpp b/src/rendering/screenspacerenderable.cpp
index b615c75380..07f6f1c744 100644
--- a/src/rendering/screenspacerenderable.cpp
+++ b/src/rendering/screenspacerenderable.cpp
@@ -43,8 +43,9 @@
 #include <variant>
 
 namespace {
-    constexpr std::array<const char*, 6> UniformNames = {
-        "color", "opacity", "mvpMatrix", "tex", "backgroundColor", "gamma"
+    constexpr std::array<const char*, 8> UniformNames = {
+        "color", "opacity", "mvpMatrix", "tex", "backgroundColor", "gamma", "borderColor",
+        "borderWidth"
     };
 
     constexpr openspace::properties::Property::PropertyInfo EnabledInfo = {
@@ -153,6 +154,20 @@ namespace {
         openspace::properties::Property::Visibility::AdvancedUser
     };
 
+    constexpr openspace::properties::Property::PropertyInfo BorderWidthInfo = {
+        "BorderWidth",
+        "Border Width",
+        "The width of the border",
+        openspace::properties::Property::Visibility::NoviceUser
+    };
+
+    constexpr openspace::properties::Property::PropertyInfo BorderColorInfo = {
+        "BorderColor",
+        "Border Color",
+        "Sets the color of the border",
+        openspace::properties::Property::Visibility::NoviceUser
+    };
+
     float wrap(float value, float min, float max) {
         return glm::mod(value - min, max - min) + min;
     }
@@ -188,6 +203,12 @@ namespace {
         // [[codegen::verbatim(GammaInfo.description)]]
         std::optional<glm::vec3> radiusAzimuthElevation;
 
+        // [[codegen::verbatim(BorderWidthInfo.description)]]
+        std::optional<float> borderWidth;
+
+        // [[codegen::verbatim(BorderColorInfo.description)]]
+        std::optional<glm::vec3> borderColor [[codegen::color()]];
+
         // [[codegen::verbatim(ScaleInfo.description)]]
         std::optional<float> scale;
 
@@ -292,6 +313,8 @@ ScreenSpaceRenderable::ScreenSpaceRenderable(const ghoul::Dictionary& dictionary
         glm::vec4(1.f)
     )
     , _delete(DeleteInfo)
+    , _borderWidth(BorderWidthInfo, 0.f, 0.f, 1000.f)
+    , _borderColor(BorderColorInfo, glm::vec3(0.f), glm::vec3(0.f), glm::vec3(1.f))
 {
     const Parameters p = codegen::bake<Parameters>(dictionary);
 
@@ -328,6 +351,13 @@ ScreenSpaceRenderable::ScreenSpaceRenderable(const ghoul::Dictionary& dictionary
     addProperty(Fadeable::_fade);
     addProperty(_localRotation);
 
+    addProperty(_borderColor);
+    addProperty(_borderWidth);
+
+    _borderWidth = p.borderWidth.value_or(_borderWidth);
+
+    _borderColor = p.borderColor.value_or(_borderColor);
+    _borderColor.setViewOption(properties::Property::ViewOptions::Color);
 
     _multiplyColor = p.multiplyColor.value_or(_multiplyColor);
     _multiplyColor.setViewOption(properties::Property::ViewOptions::Color);
@@ -498,7 +528,7 @@ glm::vec2 ScreenSpaceRenderable::screenSpacePosition() {
     return glm::vec2(_cartesianPosition.value());
 }
 
-glm::vec2  ScreenSpaceRenderable::screenSpaceDimensions() {
+glm::vec2 ScreenSpaceRenderable::screenSpaceDimensions() {
     float ratio = static_cast<float>(_objectSize.x) / static_cast<float>(_objectSize.y);
     return glm::vec2(2.f * _scale * ratio, 2.f * _scale);
 }
@@ -596,11 +626,18 @@ void ScreenSpaceRenderable::draw(glm::mat4 modelTransform) {
     glDisable(GL_CULL_FACE);
 
     _shader->activate();
+    // Calculate the border from pixels to UV coordinates
+    glm::vec2 borderUV = glm::vec2(
+        _borderWidth / static_cast<float>(_objectSize.x),
+        _borderWidth / static_cast<float>(_objectSize.y)
+    );
 
     _shader->setUniform(_uniformCache.color, _multiplyColor);
     _shader->setUniform(_uniformCache.opacity, opacity());
     _shader->setUniform(_uniformCache.backgroundColor, _backgroundColor);
     _shader->setUniform(_uniformCache.gamma, _gamma);
+    _shader->setUniform(_uniformCache.borderWidth, borderUV);
+    _shader->setUniform(_uniformCache.borderColor, _borderColor);
     _shader->setUniform(
         _uniformCache.mvp,
         global::renderEngine->scene()->camera()->viewProjectionMatrix() * modelTransform

From 91026c4c5208f1449b299002b23152e96dc98cc9 Mon Sep 17 00:00:00 2001
From: Emma Broman <emma.broman@liu.se>
Date: Tue, 20 Jun 2023 15:54:53 +0200
Subject: [PATCH 030/701] Put statue of libery back on Liberty Island (closes
 #2787)

---
 data/assets/educational/scale/statue_of_liberty.asset | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/data/assets/educational/scale/statue_of_liberty.asset b/data/assets/educational/scale/statue_of_liberty.asset
index c01e96f0f0..076469747e 100644
--- a/data/assets/educational/scale/statue_of_liberty.asset
+++ b/data/assets/educational/scale/statue_of_liberty.asset
@@ -11,7 +11,7 @@ local modelFolder = asset.syncedResource({
 })
 
 
-local Location = { 48.87389, 2.29492, -3.0 }
+local Location = { 40.689206, -74.044487, -3.0 }
 
 local ScaleModel = {
   Identifier = "Scale_StatueOfLiberty",

From 89d130dcd5400ebc47cc684c26cd32ca81d9d995 Mon Sep 17 00:00:00 2001
From: Adam Rohdin <adam.rohdin@liu.se>
Date: Wed, 21 Jun 2023 15:58:08 +0200
Subject: [PATCH 031/701] Change Voyager 1 & 2 trail end times to 2021 JAN 01
 as it was wrongly changed in old commit

---
 .../scene/solarsystem/missions/voyager/voyager1.asset       | 6 +++---
 .../scene/solarsystem/missions/voyager/voyager2.asset       | 6 +++---
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/data/assets/scene/solarsystem/missions/voyager/voyager1.asset b/data/assets/scene/solarsystem/missions/voyager/voyager1.asset
index 14e4e19228..630081d46e 100644
--- a/data/assets/scene/solarsystem/missions/voyager/voyager1.asset
+++ b/data/assets/scene/solarsystem/missions/voyager/voyager1.asset
@@ -227,9 +227,9 @@ local VoyagerTrailCruiseSaturnInf = {
     EnableFade = false,
     Color = { 0.70, 0.50, 0.20 },
     StartTime = "1980 NOV 16",
-    EndTime = "2300 JAN 01",
-    -- 116558 is the number of days between the Start and End time
-    SampleInterval = 116558 * 2
+    EndTime = "2021 JAN 01",
+    -- 14656 is the number of days between the Start and End time
+    SampleInterval = 14656 * 2
   },
   Tag = { "voyager1_trail" },
   GUI = {
diff --git a/data/assets/scene/solarsystem/missions/voyager/voyager2.asset b/data/assets/scene/solarsystem/missions/voyager/voyager2.asset
index 4c6543dfb4..68cd0c3a89 100644
--- a/data/assets/scene/solarsystem/missions/voyager/voyager2.asset
+++ b/data/assets/scene/solarsystem/missions/voyager/voyager2.asset
@@ -331,9 +331,9 @@ local VoyagerTrailCruiseNeptuneInf = {
     EnableFade = false,
     Color = { 0.70, 0.50, 0.20 },
     StartTime = "1989 AUG 26",
-    EndTime = "2300 JAN 01",
-    -- 113353 is the number of days between the Start and End time
-    SampleInterval = 113353 * 2
+    EndTime = "2021 JAN 01",
+    -- 11451 is the number of days between the Start and End time
+    SampleInterval = 11451 * 2
   },
   Tag = { "voyager2_trail" },
   GUI = {

From c424783b5069e9e5945a2f8750355813aa78f3d6 Mon Sep 17 00:00:00 2001
From: Emma Broman <emma.broman@liu.se>
Date: Thu, 22 Jun 2023 11:08:52 +0200
Subject: [PATCH 032/701] Offset sample coordinate by 0.5 when estimating
 height values (#2769)

* Offset sample coordinate by 0.5 when estimating height values
---
 modules/globebrowsing/src/renderableglobe.cpp | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/modules/globebrowsing/src/renderableglobe.cpp b/modules/globebrowsing/src/renderableglobe.cpp
index 00bfcbfbb4..4658e212b1 100644
--- a/modules/globebrowsing/src/renderableglobe.cpp
+++ b/modules/globebrowsing/src/renderableglobe.cpp
@@ -1436,7 +1436,6 @@ void RenderableGlobe::renderChunkLocally(const Chunk& chunk, const RenderData& d
     const glm::dmat4 viewTransform = data.camera.combinedViewMatrix();
     const glm::dmat4 modelViewTransform = viewTransform * _cachedModelTransform;
 
-
     std::array<glm::dvec3, 4> cornersCameraSpace;
     std::array<glm::dvec3, 4> cornersModelSpace;
     for (int i = 0; i < 4; ++i) {
@@ -1992,7 +1991,12 @@ float RenderableGlobe::getHeight(const glm::dvec3& position) const {
 
         const glm::uvec3 dimensions = tileTexture->dimensions();
 
-        const glm::vec2 samplePos = transformedUv * glm::vec2(dimensions);
+        glm::vec2 samplePos = transformedUv * glm::vec2(dimensions);
+        // @TODO (emmbr, 2023-06-14) This 0.5f offset was added as a bandaid for issue
+        // #2696. It seems to improve the behavior, but I am not certain of why. And the
+        // underlying problem is still there and should at some point be looked at again
+        samplePos -= glm::vec2(0.5f);
+
         glm::uvec2 samplePos00 = samplePos;
         samplePos00 = glm::clamp(
             samplePos00,

From 2a06a1e9f4fe2d705b36491f394695021e6276ad Mon Sep 17 00:00:00 2001
From: Alexander Bock <alexander.bock@liu.se>
Date: Mon, 26 Jun 2023 12:44:15 +0200
Subject: [PATCH 033/701] Create SUPPORT.md

---
 .github/SUPPORT.md | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 .github/SUPPORT.md

diff --git a/.github/SUPPORT.md b/.github/SUPPORT.md
new file mode 100644
index 0000000000..7489d59feb
--- /dev/null
+++ b/.github/SUPPORT.md
@@ -0,0 +1 @@
+In order to get in touch with the developers and to get support about using and contribution to OpenSpace either send an email to support@openspaceproject.com or join our Slack [here](https://join.slack.com/t/openspacesupport/shared_invite/zt-37niq6y9-T0JaCIk4UoFLI4VF5U9Vsw).

From 73609daac584c864d0c9df710ed49507214194e3 Mon Sep 17 00:00:00 2001
From: Alexander Bock <mail@alexanderbock.eu>
Date: Mon, 26 Jun 2023 12:47:41 +0200
Subject: [PATCH 034/701] Update issue templates

---
 .github/ISSUE_TEMPLATE/bug_report.md      | 31 +++++++++++++++++++++++
 .github/ISSUE_TEMPLATE/feature_request.md | 20 +++++++++++++++
 2 files changed, 51 insertions(+)
 create mode 100644 .github/ISSUE_TEMPLATE/bug_report.md
 create mode 100644 .github/ISSUE_TEMPLATE/feature_request.md

diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md
new file mode 100644
index 0000000000..cd840e9382
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/bug_report.md
@@ -0,0 +1,31 @@
+---
+name: Bug report
+about: Create a report to help us improve
+title: ''
+labels: 'Type: Bug'
+assignees: ''
+
+---
+
+**Describe the bug**
+A clear and concise description of what the bug is.
+
+**To Reproduce**
+Steps to reproduce the behavior:
+1. Go to '...'
+2. Click on '....'
+3. Scroll down to '....'
+4. See error
+
+**Expected behavior**
+A clear and concise description of what you expected to happen.
+
+**Screenshots**
+If applicable, add screenshots to help explain your problem.
+
+**Desktop (please complete the following information):**
+ - OS: [e.g. Windows, Linux (which distribution), MacOS]
+ - Version [e.g. 22]
+
+**Additional context**
+Add any other context about the problem here.
diff --git a/.github/ISSUE_TEMPLATE/feature_request.md b/.github/ISSUE_TEMPLATE/feature_request.md
new file mode 100644
index 0000000000..a6caefe08d
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/feature_request.md
@@ -0,0 +1,20 @@
+---
+name: Feature request
+about: Suggest an idea for this project
+title: ''
+labels: 'Type: Enhancement'
+assignees: ''
+
+---
+
+**Is your feature request related to a problem? Please describe.**
+A clear and concise description of what the problem is. Ex. I'm always frustrated when [...]
+
+**Describe the solution you'd like**
+A clear and concise description of what you want to happen.
+
+**Describe alternatives you've considered**
+A clear and concise description of any alternative solutions or features you've considered.
+
+**Additional context**
+Add any other context or screenshots about the feature request here.

From 8084856e6e707d67a48f736f222fc5c658723f15 Mon Sep 17 00:00:00 2001
From: Alexander Bock <mail@alexanderbock.eu>
Date: Mon, 26 Jun 2023 12:48:38 +0200
Subject: [PATCH 035/701] Update issue templates

---
 .github/ISSUE_TEMPLATE/blank-issue.md | 10 ++++++++++
 1 file changed, 10 insertions(+)
 create mode 100644 .github/ISSUE_TEMPLATE/blank-issue.md

diff --git a/.github/ISSUE_TEMPLATE/blank-issue.md b/.github/ISSUE_TEMPLATE/blank-issue.md
new file mode 100644
index 0000000000..b08518e650
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/blank-issue.md
@@ -0,0 +1,10 @@
+---
+name: Blank issue
+about: A blank issue without prefilled fields
+title: ''
+labels: ''
+assignees: ''
+
+---
+
+

From 9ec3e5b81e2cdba3600452df0bd6059a8dd98696 Mon Sep 17 00:00:00 2001
From: Alexander Bock <mail@alexanderbock.eu>
Date: Mon, 26 Jun 2023 12:50:39 +0200
Subject: [PATCH 036/701] Remove old-style issue template

---
 .github/ISSUE_TEMPLATE.md | 7 -------
 1 file changed, 7 deletions(-)
 delete mode 100644 .github/ISSUE_TEMPLATE.md

diff --git a/.github/ISSUE_TEMPLATE.md b/.github/ISSUE_TEMPLATE.md
deleted file mode 100644
index 6a26096403..0000000000
--- a/.github/ISSUE_TEMPLATE.md
+++ /dev/null
@@ -1,7 +0,0 @@
-<< Description of the problem >>
-
-<< What did you expect to happen >>
-<< What did happen? >>
-
-
-<< Attach screenshots, if possible >>
\ No newline at end of file

From f4f923914a98496ff37b6f67df8872f27dd215a5 Mon Sep 17 00:00:00 2001
From: Alexander Bock <mail@alexanderbock.eu>
Date: Mon, 26 Jun 2023 12:54:29 +0200
Subject: [PATCH 037/701] Add a config.yml for the issue templates

---
 .github/ISSUE_TEMPLATE/config.yml | 7 +++++++
 1 file changed, 7 insertions(+)
 create mode 100644 .github/ISSUE_TEMPLATE/config.yml

diff --git a/.github/ISSUE_TEMPLATE/config.yml b/.github/ISSUE_TEMPLATE/config.yml
new file mode 100644
index 0000000000..2704eb3d22
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/config.yml
@@ -0,0 +1,7 @@
+contact_links:
+  - name: Slack Community Support
+    url: https://github.com/orgs/community/discussions
+    about: Please ask and answer questions here. Slack is the easiest and most reliable way of getting in touch with the project members.
+  - name: Support Email
+    url: support@openspaceproject.com
+    about: To get in contact with the project members for people that don't want to use Slack

From a05261838524dbf62ca7538142c7c70ce0d0abe7 Mon Sep 17 00:00:00 2001
From: Alexander Bock <mail@alexanderbock.eu>
Date: Mon, 26 Jun 2023 13:18:11 +0200
Subject: [PATCH 038/701] Email doesn't work

---
 .github/ISSUE_TEMPLATE/config.yml | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/.github/ISSUE_TEMPLATE/config.yml b/.github/ISSUE_TEMPLATE/config.yml
index 2704eb3d22..f06d14875e 100644
--- a/.github/ISSUE_TEMPLATE/config.yml
+++ b/.github/ISSUE_TEMPLATE/config.yml
@@ -2,6 +2,3 @@ contact_links:
   - name: Slack Community Support
     url: https://github.com/orgs/community/discussions
     about: Please ask and answer questions here. Slack is the easiest and most reliable way of getting in touch with the project members.
-  - name: Support Email
-    url: support@openspaceproject.com
-    about: To get in contact with the project members for people that don't want to use Slack

From 67b7330229e453c3f7876942e0251e463479866a Mon Sep 17 00:00:00 2001
From: Ylva Selling <ylva.selling@gmail.com>
Date: Mon, 26 Jun 2023 11:43:02 -0400
Subject: [PATCH 039/701] Allow transparency for movies. Closes #2792

---
 modules/video/src/videoplayer.cpp | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/modules/video/src/videoplayer.cpp b/modules/video/src/videoplayer.cpp
index 35a80dfb94..b199aa898f 100644
--- a/modules/video/src/videoplayer.cpp
+++ b/modules/video/src/videoplayer.cpp
@@ -409,6 +409,9 @@ void VideoPlayer::initializeMpv() {
     // Starting MPV in a paused state seems to reduce problems with initialization
     setPropertyStringMpv("pause", "");
 
+    // Allow alpha channels
+    setPropertyStringMpv("alpha", "yes");
+
     // Verbose mode for debug purposes
     // setPropertyStringMpv("msg-level", "all=v");
     //mpv_request_log_messages(_mpvHandle, "debug");

From d317c287ebdffb81239f2de986548bf8e547b03b Mon Sep 17 00:00:00 2001
From: Ylva Selling <ylva.selling@gmail.com>
Date: Wed, 28 Jun 2023 17:14:14 -0400
Subject: [PATCH 040/701] Update modules/base/shaders/screenspace_fs.glsl

Co-authored-by: Alexander Bock <alexander.bock@liu.se>
---
 modules/base/shaders/screenspace_fs.glsl | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/modules/base/shaders/screenspace_fs.glsl b/modules/base/shaders/screenspace_fs.glsl
index 6478a93dab..1ff3f0fe9c 100644
--- a/modules/base/shaders/screenspace_fs.glsl
+++ b/modules/base/shaders/screenspace_fs.glsl
@@ -46,7 +46,8 @@ Fragment getFragment() {
 
   // Set border color
   if (vs_st.x < borderWidth.x || vs_st.x > 1 - borderWidth.x ||
-      vs_st.y < borderWidth.y || vs_st.y > 1 - borderWidth.y) {
+      vs_st.y < borderWidth.y || vs_st.y > 1 - borderWidth.y)
+  {
     frag.color = vec4(borderColor, 1.0);
   }
 

From a67d2937ae22d9b5155ecd01d17e9703b5c0b5b9 Mon Sep 17 00:00:00 2001
From: Ylva Selling <ylva.selling@gmail.com>
Date: Wed, 28 Jun 2023 17:14:24 -0400
Subject: [PATCH 041/701] Update src/rendering/screenspacerenderable.cpp

Co-authored-by: Alexander Bock <alexander.bock@liu.se>
---
 src/rendering/screenspacerenderable.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/rendering/screenspacerenderable.cpp b/src/rendering/screenspacerenderable.cpp
index 9265964480..8f39aad7f0 100644
--- a/src/rendering/screenspacerenderable.cpp
+++ b/src/rendering/screenspacerenderable.cpp
@@ -204,7 +204,7 @@ namespace {
         std::optional<glm::vec3> radiusAzimuthElevation;
 
         // [[codegen::verbatim(BorderWidthInfo.description)]]
-        std::optional<float> borderWidth;
+        std::optional<float> borderWidth [[codegen::greater(0.0)]];
 
         // [[codegen::verbatim(BorderColorInfo.description)]]
         std::optional<glm::vec3> borderColor [[codegen::color()]];

From 391c5ef3d1c37e7f1db6ef3789fc52f92825afd5 Mon Sep 17 00:00:00 2001
From: Malin E <malin.ejdbo@gmail.com>
Date: Tue, 4 Jul 2023 10:42:19 +0200
Subject: [PATCH 042/701] Update and rename blank-issue.md to general-issue.md

---
 .github/ISSUE_TEMPLATE/blank-issue.md   | 10 ----------
 .github/ISSUE_TEMPLATE/general-issue.md | 10 ++++++++++
 2 files changed, 10 insertions(+), 10 deletions(-)
 delete mode 100644 .github/ISSUE_TEMPLATE/blank-issue.md
 create mode 100644 .github/ISSUE_TEMPLATE/general-issue.md

diff --git a/.github/ISSUE_TEMPLATE/blank-issue.md b/.github/ISSUE_TEMPLATE/blank-issue.md
deleted file mode 100644
index b08518e650..0000000000
--- a/.github/ISSUE_TEMPLATE/blank-issue.md
+++ /dev/null
@@ -1,10 +0,0 @@
----
-name: Blank issue
-about: A blank issue without prefilled fields
-title: ''
-labels: ''
-assignees: ''
-
----
-
-
diff --git a/.github/ISSUE_TEMPLATE/general-issue.md b/.github/ISSUE_TEMPLATE/general-issue.md
new file mode 100644
index 0000000000..91b21568de
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/general-issue.md
@@ -0,0 +1,10 @@
+---
+name: General issue
+about: An issue without prefilled fields
+title: ''
+labels: ''
+assignees: ''
+
+---
+
+

From 380f768e4c3b811b6623e4f1fc93bfbca5994576 Mon Sep 17 00:00:00 2001
From: Alexander Bock <alexander.bock@liu.se>
Date: Thu, 6 Jul 2023 10:03:44 +0200
Subject: [PATCH 043/701] Allow negative values for KeplerTranslation values
 (#2784)

---
 .../space/translation/keplertranslation.cpp   | 19 ++++++++++---------
 1 file changed, 10 insertions(+), 9 deletions(-)

diff --git a/modules/space/translation/keplertranslation.cpp b/modules/space/translation/keplertranslation.cpp
index b6c722bdad..2cf331f892 100644
--- a/modules/space/translation/keplertranslation.cpp
+++ b/modules/space/translation/keplertranslation.cpp
@@ -121,16 +121,16 @@ namespace {
         double semiMajorAxis;
 
         // [[codegen::verbatim(InclinationInfo.description)]]
-        double inclination [[codegen::inrange(0.0, 360.0)]];
+        double inclination [[codegen::inrange(-360.0, 360.0)]];
 
         // [[codegen::verbatim(AscendingNodeInfo.description)]]
-        double ascendingNode [[codegen::inrange(0.0, 360.0)]];
+        double ascendingNode [[codegen::inrange(-360.0, 360.0)]];
 
         // [[codegen::verbatim(ArgumentOfPeriapsisInfo.description)]]
-        double argumentOfPeriapsis [[codegen::inrange(0.0, 360.0)]];
+        double argumentOfPeriapsis [[codegen::inrange(-360.0, 360.0)]];
 
         // [[codegen::verbatim(MeanAnomalyAtEpochInfo.description)]]
-        double meanAnomaly [[codegen::inrange(0.0, 360.0)]];
+        double meanAnomaly [[codegen::inrange(-360.0, 360.0)]];
 
         // [[codegen::verbatim(EpochInfo.description)]]
         std::string epoch;
@@ -198,10 +198,12 @@ KeplerTranslation::KeplerTranslation(const ghoul::Dictionary& dictionary)
     setKeplerElements(
         p.eccentricity,
         p.semiMajorAxis,
-        p.inclination,
-        p.ascendingNode,
-        p.argumentOfPeriapsis,
-        p.meanAnomaly,
+        p.inclination < 0.0 ? p.inclination + 360.0 : p.inclination,
+        p.ascendingNode < 0.0 ? p.ascendingNode + 360.0 : p.ascendingNode,
+        p.argumentOfPeriapsis < 0.0 ?
+            p.argumentOfPeriapsis + 360.0 :
+            p.argumentOfPeriapsis,
+        p.meanAnomaly < 0.0 ? p.meanAnomaly + 360.0 : p.meanAnomaly,
         p.period,
         p.epoch
     );
@@ -329,7 +331,6 @@ void KeplerTranslation::setKeplerElements(double eccentricity, double semiMajorA
     auto isInRange = [](double val, double min, double max) -> bool {
         return val >= min && val <= max;
     };
-
     if (isInRange(eccentricity, 0.0, 1.0)) {
         _eccentricity = eccentricity;
     }

From 9fa0def25e607196bead94460af8ba29662faa3c Mon Sep 17 00:00:00 2001
From: Alexander Bock <alexander.bock@liu.se>
Date: Thu, 6 Jul 2023 14:59:40 +0200
Subject: [PATCH 044/701] Update offline mars map to fix 180 degree offset

---
 apps/OpenSpace/ext/sgct                                       | 2 +-
 .../planets/mars/layers/colorlayers/mars_texture.asset        | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/apps/OpenSpace/ext/sgct b/apps/OpenSpace/ext/sgct
index 2a4e0fa3fc..e7859b22cf 160000
--- a/apps/OpenSpace/ext/sgct
+++ b/apps/OpenSpace/ext/sgct
@@ -1 +1 @@
-Subproject commit 2a4e0fa3fcd89b655015f67ba28b406086279a7e
+Subproject commit e7859b22cf11f7b7be16ebab5e6c44ec8637c540
diff --git a/data/assets/scene/solarsystem/planets/mars/layers/colorlayers/mars_texture.asset b/data/assets/scene/solarsystem/planets/mars/layers/colorlayers/mars_texture.asset
index 605155e4d0..090565e026 100644
--- a/data/assets/scene/solarsystem/planets/mars/layers/colorlayers/mars_texture.asset
+++ b/data/assets/scene/solarsystem/planets/mars/layers/colorlayers/mars_texture.asset
@@ -6,7 +6,7 @@ local texturesPath = asset.syncedResource({
   Name = "Mars Textures",
   Type = "HttpSynchronization",
   Identifier = "mars_textures",
-  Version = 1
+  Version = 3
 })
 
 
@@ -14,7 +14,7 @@ local Layer = {
   Identifier = "Mars_Texture",
   Name = "Mars Texture",
   Enabled = asset.enabled,
-  FilePath = texturesPath .. "mars.jpg",
+  FilePath = texturesPath .. "mars.png",
   Description = "Default jpg texture for Mars",
   CacheSettings = { Enabled = false }
 }

From 61a69490fbcbe991ac4190bf95195a0c29b90041 Mon Sep 17 00:00:00 2001
From: Alexander Bock <alexander.bock@liu.se>
Date: Wed, 12 Jul 2023 10:49:50 +0200
Subject: [PATCH 045/701] Add the ability to specify the angular size of the
 Sun in the atmosphere

---
 .../rendering/atmospheredeferredcaster.cpp     |  9 ++++++---
 .../rendering/atmospheredeferredcaster.h       |  5 +++--
 .../rendering/renderableatmosphere.cpp         | 18 +++++++++++++++++-
 .../rendering/renderableatmosphere.h           |  1 +
 .../shaders/atmosphere_deferred_fs.glsl        |  7 ++++---
 5 files changed, 31 insertions(+), 9 deletions(-)

diff --git a/modules/atmosphere/rendering/atmospheredeferredcaster.cpp b/modules/atmosphere/rendering/atmospheredeferredcaster.cpp
index 5dfd05bcfb..3c9c872413 100644
--- a/modules/atmosphere/rendering/atmospheredeferredcaster.cpp
+++ b/modules/atmosphere/rendering/atmospheredeferredcaster.cpp
@@ -70,14 +70,14 @@
 namespace {
     constexpr std::string_view _loggerCat = "AtmosphereDeferredcaster";
 
-    constexpr std::array<const char*, 28> UniformNames = {
+    constexpr std::array<const char*, 29> UniformNames = {
         "cullAtmosphere", "opacity", "Rg", "Rt", "groundRadianceEmission", "HR",
         "betaRayleigh", "HM", "betaMieExtinction", "mieG", "sunRadiance",
         "ozoneLayerEnabled", "HO", "betaOzoneExtinction", "SAMPLES_R", "SAMPLES_MU",
         "SAMPLES_MU_S", "SAMPLES_NU", "inverseModelTransformMatrix",
         "modelTransformMatrix", "projectionToModelTransformMatrix", "viewToWorldMatrix",
         "camPosObj", "sunDirectionObj", "hardShadows", "transmittanceTexture",
-        "irradianceTexture", "inscatterTexture"
+        "irradianceTexture", "inscatterTexture", "sunAngularSize"
     };
 
     constexpr float ATM_EPS = 2000.f;
@@ -352,6 +352,8 @@ void AtmosphereDeferredcaster::preRaycast(const RenderData& data, const Deferred
         prg.setUniform(_uniformCache.SAMPLES_MU, _muSamples);
         prg.setUniform(_uniformCache.SAMPLES_MU_S, _muSSamples);
         prg.setUniform(_uniformCache.SAMPLES_NU, _nuSamples);
+        // We expose the value as degrees, but the shader wants radians
+        prg.setUniform(_uniformCache.sunAngularSize, glm::radians(_sunAngularSize));
 
         // Object Space
         glm::dmat4 invModelMatrix = glm::inverse(_modelTransform);
@@ -558,7 +560,7 @@ void AtmosphereDeferredcaster::setParameters(float atmosphereRadius, float plane
                                              glm::vec3 ozoneExtinctionCoefficients,
                                              glm::vec3 mieScatteringCoefficients,
                                              glm::vec3 mieExtinctionCoefficients,
-                                             bool sunFollowing)
+                                             bool sunFollowing, float sunAngularSize)
 {
     _atmosphereRadius = atmosphereRadius;
     _atmospherePlanetRadius = planetRadius;
@@ -575,6 +577,7 @@ void AtmosphereDeferredcaster::setParameters(float atmosphereRadius, float plane
     _mieScatteringCoeff = std::move(mieScatteringCoefficients);
     _mieExtinctionCoeff = std::move(mieExtinctionCoefficients);
     _sunFollowingCameraEnabled = sunFollowing;
+    _sunAngularSize = sunAngularSize;
 }
 
 void AtmosphereDeferredcaster::setHardShadows(bool enabled) {
diff --git a/modules/atmosphere/rendering/atmospheredeferredcaster.h b/modules/atmosphere/rendering/atmospheredeferredcaster.h
index eae2fa33ca..d5e5960e2a 100644
--- a/modules/atmosphere/rendering/atmospheredeferredcaster.h
+++ b/modules/atmosphere/rendering/atmospheredeferredcaster.h
@@ -88,7 +88,7 @@ public:
         float mieHeightScale, float miePhaseConstant, float sunRadiance,
         glm::vec3 rayScatteringCoefficients, glm::vec3 ozoneExtinctionCoefficients,
         glm::vec3 mieScatteringCoefficients, glm::vec3 mieExtinctionCoefficients,
-        bool sunFollowing);
+        bool sunFollowing, float sunAngularSize);
 
     void setHardShadows(bool enabled);
 
@@ -119,7 +119,7 @@ private:
         betaOzoneExtinction, SAMPLES_R, SAMPLES_MU, SAMPLES_MU_S, SAMPLES_NU,
         inverseModelTransformMatrix, modelTransformMatrix, projectionToModelTransform,
         viewToWorldMatrix, camPosObj, sunDirectionObj, hardShadows, transmittanceTexture,
-        irradianceTexture, inscatterTexture) _uniformCache;
+        irradianceTexture, inscatterTexture, sunAngularSize) _uniformCache;
 
     ghoul::opengl::TextureUnit _transmittanceTableTextureUnit;
     ghoul::opengl::TextureUnit _irradianceTableTextureUnit;
@@ -141,6 +141,7 @@ private:
     float _mieHeightScale = 0.f;
     float _miePhaseConstant = 0.f;
     float _sunRadianceIntensity = 5.f;
+    float _sunAngularSize = 0.3f;
 
     glm::vec3 _rayleighScatteringCoeff = glm::vec3(0.f);
     glm::vec3 _ozoneExtinctionCoeff = glm::vec3(0.f);
diff --git a/modules/atmosphere/rendering/renderableatmosphere.cpp b/modules/atmosphere/rendering/renderableatmosphere.cpp
index 00e5a322d5..a49601e4f8 100644
--- a/modules/atmosphere/rendering/renderableatmosphere.cpp
+++ b/modules/atmosphere/rendering/renderableatmosphere.cpp
@@ -175,6 +175,13 @@ namespace {
         openspace::properties::Property::Visibility::AdvancedUser
     };
 
+    constexpr openspace::properties::Property::PropertyInfo SunAngularSize = {
+        "SunAngularSize",
+        "Angular Size of the Sun",
+        "Specifies the angular size of the Sun in degrees",
+        openspace::properties::Property::Visibility::AdvancedUser
+    };
+
     struct [[codegen::Dictionary(RenderableAtmosphere)]] Parameters {
         struct ShadowGroup {
             // Individual light sources
@@ -260,6 +267,9 @@ namespace {
 
         // [[codegen::verbatim(SunsetAngleInfo.description)]]
         std::optional<glm::vec2> sunsetAngle;
+
+        // [[codegen::verbatim(SunAngularSize.description)]]
+        std::optional<float> sunAngularSize [[codegen::inrange(0.0, 180.0)]];
     };
 #include "renderableatmosphere_codegen.cpp"
 
@@ -305,6 +315,7 @@ RenderableAtmosphere::RenderableAtmosphere(const ghoul::Dictionary& dictionary)
         SunsetAngleInfo,
         glm::vec2(95.f, 100.f), glm::vec2(0.f), glm::vec2(180.f)
     )
+    , _sunAngularSize(SunAngularSize, 0.3f, 0.f, 180.f)
  {
     auto updateWithCalculation = [this]() {
         _deferredCasterNeedsUpdate = true;
@@ -420,6 +431,10 @@ RenderableAtmosphere::RenderableAtmosphere(const ghoul::Dictionary& dictionary)
         properties::Property::ViewOptions::MinMaxRange
     );
     addProperty(_atmosphereDimmingSunsetAngle);
+
+    _sunAngularSize = p.sunAngularSize.value_or(_sunAngularSize);
+    _sunAngularSize.onChange(updateWithoutCalculation);
+    addProperty(_sunAngularSize);
 }
 
 void RenderableAtmosphere::deinitializeGL() {
@@ -494,7 +509,8 @@ void RenderableAtmosphere::updateAtmosphereParameters() {
         _ozoneCoeff,
         _mieScatteringCoeff,
         _mieExtinctionCoeff,
-        _sunFollowingCameraEnabled
+        _sunFollowingCameraEnabled,
+        _sunAngularSize
     );
     _deferredcaster->setHardShadows(_hardShadowsEnabled);
 }
diff --git a/modules/atmosphere/rendering/renderableatmosphere.h b/modules/atmosphere/rendering/renderableatmosphere.h
index 5d8cc531e2..a82b33c394 100644
--- a/modules/atmosphere/rendering/renderableatmosphere.h
+++ b/modules/atmosphere/rendering/renderableatmosphere.h
@@ -96,6 +96,7 @@ private:
     properties::FloatProperty _sunIntensity;
     properties::BoolProperty _sunFollowingCameraEnabled;
     properties::BoolProperty _hardShadowsEnabled;
+    properties::FloatProperty _sunAngularSize;
 
     // Atmosphere dimming
     properties::FloatProperty _atmosphereDimmingHeight;
diff --git a/modules/atmosphere/shaders/atmosphere_deferred_fs.glsl b/modules/atmosphere/shaders/atmosphere_deferred_fs.glsl
index c0bfdcdc30..11c03304cc 100644
--- a/modules/atmosphere/shaders/atmosphere_deferred_fs.glsl
+++ b/modules/atmosphere/shaders/atmosphere_deferred_fs.glsl
@@ -77,6 +77,7 @@ uniform vec3 betaMieExtinction;
 uniform float mieG;
 uniform float sunRadiance;
 uniform bool ozoneLayerEnabled;
+uniform float sunAngularSize;
 uniform int SAMPLES_R;
 uniform int SAMPLES_MU;
 uniform int SAMPLES_MU_S;
@@ -503,11 +504,11 @@ vec3 sunColor(vec3 v, vec3 s, float r, float mu, float irradianceFactor) {
 
   // @TODO (abock, 2021-07-01) This value is hard-coded to our sun+earth right now
   // Convert 0.3 degrees -> radians
-  const float SunAngularSize = (0.3 * M_PI / 180.0);
+  // const float SunAngularSize = (0.3 * M_PI / 180.0);
   const float FuzzyFactor = 0.5; // How fuzzy should the edges be
 
-  const float p1 = cos(SunAngularSize);
-  const float p2 = cos(SunAngularSize * FuzzyFactor);
+  const float p1 = cos(sunAngularSize);
+  const float p2 = cos(sunAngularSize * FuzzyFactor);
 
   float t = (angle - p1) / (p2 - p1);
   float scale = clamp(t, 0.0, 1.0);

From bef10aca102d0bedef8f168b3f1bb80c180614bb Mon Sep 17 00:00:00 2001
From: Alexander Bock <alexander.bock@liu.se>
Date: Wed, 12 Jul 2023 11:16:37 +0200
Subject: [PATCH 046/701] Fix layering of the Sun/Moon during an eclipse

---
 .../shaders/atmosphere_deferred_fs.glsl       | 24 ++++++++++---------
 1 file changed, 13 insertions(+), 11 deletions(-)

diff --git a/modules/atmosphere/shaders/atmosphere_deferred_fs.glsl b/modules/atmosphere/shaders/atmosphere_deferred_fs.glsl
index 11c03304cc..c0de958617 100644
--- a/modules/atmosphere/shaders/atmosphere_deferred_fs.glsl
+++ b/modules/atmosphere/shaders/atmosphere_deferred_fs.glsl
@@ -120,11 +120,13 @@ uniform ShadowRenderingStruct shadowDataArray[numberOfShadows];
 uniform int shadows;
 uniform bool hardShadows;
 
-float calcShadow(ShadowRenderingStruct shadowInfoArray[numberOfShadows], dvec3 position,
+// Returns whether there is an eclipse in the x component and the strength of the
+// shadowing in the y component
+vec2 calcShadow(ShadowRenderingStruct shadowInfoArray[numberOfShadows], dvec3 position,
                  bool ground)
 {
   if (!shadowInfoArray[0].isShadowing) {
-    return 1.0;
+    return vec2(0.0, 1.0);
   }
 
   dvec3 pc = shadowInfoArray[0].casterPositionVec - position;
@@ -141,19 +143,19 @@ float calcShadow(ShadowRenderingStruct shadowInfoArray[numberOfShadows], dvec3 p
   if (length_d < r_u_pi) {
     // umbra
     if (hardShadows) {
-      return ground  ?  0.2  :  0.5;
+      return ground  ?  vec2(1.0, 0.2)  :  vec2(1.0, 0.5);
     }
     else {
       // butterworth function
-      return sqrt(r_u_pi / (r_u_pi + pow(length_d, 4.0)));
+      return vec2(1.0, sqrt(r_u_pi / (r_u_pi + pow(length_d, 4.0))));
     }
   }
   else if (length_d < r_p_pi) {
     // penumbra
-    return hardShadows  ?  0.5  :  length_d / r_p_pi;
+    return hardShadows  ?  vec2(1.0, 0.5)  :  vec2(1.0, length_d / r_p_pi);
   }
   else {
-    return 1.0;
+    return vec2(1.0, 1.0);
   }
 }
 
@@ -619,8 +621,8 @@ void main() {
   pixelDepth -= offset;
 
   dvec3 onATMPos = (modelTransformMatrix * dvec4(x * 1000.0, 1.0)).xyz;
-  float eclipseShadowATM = calcShadow(shadowDataArray, onATMPos, false);
-  float sunIntensityInscatter = sunRadiance * eclipseShadowATM;
+  vec2 eclipseShadowATM = calcShadow(shadowDataArray, onATMPos, false);
+  float sunIntensityInscatter = sunRadiance * eclipseShadowATM.y;
 
   float irradianceFactor = 0.0;
 
@@ -632,15 +634,15 @@ void main() {
     attenuation, groundHit);
   vec3 atmColor = vec3(0.0);
   if (groundHit) {
-    float eclipseShadowPlanet = calcShadow(shadowDataArray, positionWorldCoords.xyz, true);
-    float sunIntensityGround = sunRadiance * eclipseShadowPlanet;
+    vec2 eclipseShadowPlanet = calcShadow(shadowDataArray, positionWorldCoords.xyz, true);
+    float sunIntensityGround = sunRadiance * eclipseShadowPlanet.y;
     atmColor = groundColor(x, tF, v, s, attenuation, color, normal.xyz, irradianceFactor,
       normal.w, sunIntensityGround);
   }
   else {
     // In order to get better performance, we are not tracing multiple rays per pixel
     // when the ray doesn't intersect the ground
-    atmColor = sunColor(v, s, r, mu, irradianceFactor);
+    atmColor = sunColor(v, s, r, mu, irradianceFactor) * (1.0 - eclipseShadowATM.x);
   }
 
   // Final Color of ATM plus terrain. We want to support opacity so we blend between the

From 80ddf3e1878741ea367fd3cdbc1cf6bd1af210c8 Mon Sep 17 00:00:00 2001
From: Alexander Bock <alexander.bock@liu.se>
Date: Wed, 12 Jul 2023 12:42:25 +0200
Subject: [PATCH 047/701] Prevent occasional crash in RenderableShadowCylinder
 when adding an asset at runtime

---
 .../rendering/renderableshadowcylinder.cpp                      | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/spacecraftinstruments/rendering/renderableshadowcylinder.cpp b/modules/spacecraftinstruments/rendering/renderableshadowcylinder.cpp
index be1f8efef7..0e1c4ca3cc 100644
--- a/modules/spacecraftinstruments/rendering/renderableshadowcylinder.cpp
+++ b/modules/spacecraftinstruments/rendering/renderableshadowcylinder.cpp
@@ -250,7 +250,7 @@ void RenderableShadowCylinder::deinitializeGL() {
 }
 
 bool RenderableShadowCylinder::isReady() const {
-    return true;
+    return _shader;
 }
 
 void RenderableShadowCylinder::render(const RenderData& data, RendererTasks&) {

From ce1b024f7bcd2e66c1e7306498a313f72aa3903c Mon Sep 17 00:00:00 2001
From: GPayne <payne.gene@gmail.com>
Date: Wed, 12 Jul 2023 23:40:02 -0600
Subject: [PATCH 048/701] First pass of adding descriptions to window config
 files with schema

---
 apps/OpenSpace/ext/sgct                  |  2 +-
 config/equirectangular_gui.json          |  9 ++++++++-
 config/fullscreen1080.json               |  9 ++++++++-
 config/gui_projector.json                |  9 ++++++++-
 config/single.json                       |  9 ++++++++-
 config/single_fisheye.json               |  9 ++++++++-
 config/single_fisheye_gui.json           | 10 +++++++++-
 config/single_gui.json                   |  9 ++++++++-
 config/single_gui_spout.json             |  9 ++++++++-
 config/single_gui_with_graphics.json     |  9 ++++++++-
 config/single_sbs_stereo.json            |  9 ++++++++-
 config/single_two_win.json               | 10 +++++++++-
 config/spherical_mirror.json             |  9 ++++++++-
 config/spherical_mirror_gui.json         |  9 ++++++++-
 config/spout_output_cubemap.json         |  9 ++++++++-
 config/spout_output_equirectangular.json |  9 ++++++++-
 config/spout_output_fisheye.json         |  9 ++++++++-
 config/spout_output_flat.json            |  9 ++++++++-
 config/two_nodes.json                    |  9 ++++++++-
 19 files changed, 147 insertions(+), 19 deletions(-)

diff --git a/apps/OpenSpace/ext/sgct b/apps/OpenSpace/ext/sgct
index e7859b22cf..19e7e21435 160000
--- a/apps/OpenSpace/ext/sgct
+++ b/apps/OpenSpace/ext/sgct
@@ -1 +1 @@
-Subproject commit e7859b22cf11f7b7be16ebab5e6c44ec8637c540
+Subproject commit 19e7e21435fe4df71eb89d53599b46b68758273d
diff --git a/config/equirectangular_gui.json b/config/equirectangular_gui.json
index fe744ef269..7d3d2dc303 100644
--- a/config/equirectangular_gui.json
+++ b/config/equirectangular_gui.json
@@ -54,5 +54,12 @@
       "eyeseparation": 0.065,
       "pos": { "x": 0.0, "y": 0.0, "z": 0.0 }
     }
-  ]
+  ],
+  "meta": {
+    "author": "OpenSpace Team",
+    "description": "Two windows: Primary 1280x720 window with equirectangular projection rendering without menu or text overlays, and a secondary with menu and text overlays minus rendering.",
+    "license": "MIT License",
+    "name": "Single",
+    "version": "1.0"
+  }
 }
diff --git a/config/fullscreen1080.json b/config/fullscreen1080.json
index 59ef891571..6b8afbcd3e 100644
--- a/config/fullscreen1080.json
+++ b/config/fullscreen1080.json
@@ -43,5 +43,12 @@
       "eyeseparation": 0.065,
       "pos": { "x": 0.0, "y": 0.0, "z": 0.0 }
     }
-  ]
+  ],
+  "meta": {
+    "author": "OpenSpace Team",
+    "description": "A single 1920x1080 fullscreen window with planar projection rendering. The display will automatically be set to 1920x1080, regardless of native resolution.",
+    "license": "MIT License",
+    "name": "Single",
+    "version": "1.0"
+  }
 }
diff --git a/config/gui_projector.json b/config/gui_projector.json
index 155af25705..c4affe89fd 100644
--- a/config/gui_projector.json
+++ b/config/gui_projector.json
@@ -59,5 +59,12 @@
       "eyeseparation": 0.065,
       "pos": { "x": 0.0, "y": 0.0, "z": 0.0 }
     }
-  ]
+  ],
+  "meta": {
+    "author": "OpenSpace Team",
+    "description": "Two windows for a side-by-side dual-monitor configuration, where the right-side monitor can be considered a projector. Primary 1920x1080 window with menu and text overlays minus rendering, and a secondary 1920x1080 fullscreen window with planar projection rendering without menu or text overlays.",
+    "license": "MIT License",
+    "name": "Single",
+    "version": "1.0"
+  }
 }
diff --git a/config/single.json b/config/single.json
index 925ab5df8f..38004b58c5 100644
--- a/config/single.json
+++ b/config/single.json
@@ -43,5 +43,12 @@
       "eyeseparation": 0.065,
       "pos": { "x": 0.0, "y": 0.0, "z": 0.0 }
     }
-  ]
+  ],
+  "meta": {
+    "author": "OpenSpace Team",
+    "description": "A single 1280x720 window with planar projection rendering at 2560x1440 resolution.",
+    "license": "MIT License",
+    "name": "Single",
+    "version": "1.0"
+  }
 }
diff --git a/config/single_fisheye.json b/config/single_fisheye.json
index adfacbe680..1309a8e623 100644
--- a/config/single_fisheye.json
+++ b/config/single_fisheye.json
@@ -33,5 +33,12 @@
       "eyeseparation": 0.06,
       "pos": { "x": 0.0, "y": 0.0, "z": 0.0 }
     }
-  ]
+  ],
+  "meta": {
+    "author": "OpenSpace Team",
+    "description": "A single 1024x1024 window with fisheye projection rendering.",
+    "license": "MIT License",
+    "name": "Single",
+    "version": "1.0"
+  }
 }
diff --git a/config/single_fisheye_gui.json b/config/single_fisheye_gui.json
index 1d1ca3a909..ef67552cbd 100644
--- a/config/single_fisheye_gui.json
+++ b/config/single_fisheye_gui.json
@@ -57,5 +57,13 @@
       "eyeseparation": 0.06,
       "pos": { "x": 0.0, "y": 0.0, "z": 0.0 }
     }
-  ]
+  ],
+  "meta": {
+    "author": "OpenSpace Team",
+    "description": "Two windows: Primary 1024x1024 window with menu and text overlays minus rendering, and a secondary 1024x1024 window with fisheye projection rendering without menu and text overlays.",
+    "license": "MIT License",
+    "name": "Single",
+    "version": "1.0"
+  }
+
 }
diff --git a/config/single_gui.json b/config/single_gui.json
index 0483f62baa..6d67ed64f9 100644
--- a/config/single_gui.json
+++ b/config/single_gui.json
@@ -66,5 +66,12 @@
       "eyeseparation": 0.065,
       "pos": { "x": 0.0, "y": 0.0, "z": 0.0 }
     }
-  ]
+  ],
+  "meta": {
+    "author": "OpenSpace Team",
+    "description": "Two windows: Primary 1280x720 window with planar projection rendering without menu or text overlays, and a secondary with menu and text overlays minus rendering.",
+    "license": "MIT License",
+    "name": "Single",
+    "version": "1.0"
+  }
 }
diff --git a/config/single_gui_spout.json b/config/single_gui_spout.json
index 7f95acd344..5f54282976 100644
--- a/config/single_gui_spout.json
+++ b/config/single_gui_spout.json
@@ -63,5 +63,12 @@
       "eyeseparation": 0.06499999761581421,
       "pos": { "x": 0.0, "y": 0.0, "z": 0.0 }
     }
-  ]
+  ],
+  "meta": {
+    "author": "OpenSpace Team",
+    "description": "Two windows: Primary 1280x720 window with Spout output (name 'OpenSpace') planar projection rendering without menu or text overlays, and a secondary with menu and text overlays minus rendering.",
+    "license": "MIT License",
+    "name": "Single",
+    "version": "1.0"
+  }
 }
diff --git a/config/single_gui_with_graphics.json b/config/single_gui_with_graphics.json
index c866040411..31d1b630ab 100644
--- a/config/single_gui_with_graphics.json
+++ b/config/single_gui_with_graphics.json
@@ -67,5 +67,12 @@
       "eyeseparation": 0.065,
       "pos": { "x": 0.0, "y": 0.0, "z": 0.0 }
     }
-  ]
+  ],
+  "meta": {
+    "author": "OpenSpace Team",
+    "description": "Two windows: Primary 1280x720 window with planar projection rendering without menu or text overlays, and a secondary with menu and text overlays plus rendering from the primary.",
+    "license": "MIT License",
+    "name": "Single",
+    "version": "1.0"
+  }
 }
diff --git a/config/single_sbs_stereo.json b/config/single_sbs_stereo.json
index 2c0019f083..e1fa34337b 100644
--- a/config/single_sbs_stereo.json
+++ b/config/single_sbs_stereo.json
@@ -42,5 +42,12 @@
       "eyeseparation": 0.065,
       "pos": { "x": 0.0, "y": 0.0, "z": 0.0 }
     }
-  ]
+  ],
+  "meta": {
+    "author": "OpenSpace Team",
+    "description": "A single 1280x720 window containing side-by-side stereo planar projection rendering views.",
+    "license": "MIT License",
+    "name": "Single",
+    "version": "1.0"
+  }
 }
diff --git a/config/single_two_win.json b/config/single_two_win.json
index 9e88325d39..6d35594ef0 100644
--- a/config/single_two_win.json
+++ b/config/single_two_win.json
@@ -55,5 +55,13 @@
       "eyeseparation": 0.065,
       "pos": { "x": 0.0, "y": 0.0, "z": 0.0 }
     }
-  ]
+  ],
+  "meta": {
+    "author": "OpenSpace Team",
+    "description": "Two 1280x720 windows each with identical planar projection rendering. Only the primary window has menu controls, but both have text overlays.",
+    "license": "MIT License",
+    "name": "Single",
+    "version": "1.0"
+  }
+
 }
diff --git a/config/spherical_mirror.json b/config/spherical_mirror.json
index f8f1e5669c..a422b34d35 100644
--- a/config/spherical_mirror.json
+++ b/config/spherical_mirror.json
@@ -36,5 +36,12 @@
       "eyeseparation": 0.06,
       "pos": { "x": 0.0, "y": 0.0, "z": 0.0 }
     }
-  ]
+  ],
+  "meta": {
+    "author": "OpenSpace Team",
+    "description": "A single 1280x720 window with spherical projection rendering at 2048x2048 resolution.",
+    "license": "MIT License",
+    "name": "Single",
+    "version": "1.0"
+  }
 }
diff --git a/config/spherical_mirror_gui.json b/config/spherical_mirror_gui.json
index 5fbd9baf4e..e96ba89936 100644
--- a/config/spherical_mirror_gui.json
+++ b/config/spherical_mirror_gui.json
@@ -61,5 +61,12 @@
       "eyeseparation": 0.06,
       "pos": { "x": 0.0, "y": 0.0, "z": 0.0 }
     }
-  ]
+  ],
+  "meta": {
+    "author": "OpenSpace Team",
+    "description": "Two windows: Primary 1280x720 window with menu and text overlays minus rendering, and a secondary 1280x720 window at 2048x2048 resolution with spherical mirror projection rendering without the menu or text overlays.",
+    "license": "MIT License",
+    "name": "Single",
+    "version": "1.0"
+  }
 }
diff --git a/config/spout_output_cubemap.json b/config/spout_output_cubemap.json
index 064f48ecfc..a8c2621064 100644
--- a/config/spout_output_cubemap.json
+++ b/config/spout_output_cubemap.json
@@ -56,5 +56,12 @@
       "eyeseparation": 0.05999999865889549,
       "pos": { "x": 0.0, "y": 0.0, "z": 0.0 }
     }
-  ]
+  ],
+  "meta": {
+    "author": "OpenSpace Team",
+    "description": "A single 1024x1024 window with spout output cubemap projection rendering.",
+    "license": "MIT License",
+    "name": "Single",
+    "version": "1.0"
+  }
 }
diff --git a/config/spout_output_equirectangular.json b/config/spout_output_equirectangular.json
index 87a3bd98c2..39de1154a2 100644
--- a/config/spout_output_equirectangular.json
+++ b/config/spout_output_equirectangular.json
@@ -56,5 +56,12 @@
       "eyeseparation": 0.06,
       "pos": { "x": 0.0, "y": 0.0, "z": 0.0 }
     }
-  ]
+  ],
+  "meta": {
+    "author": "OpenSpace Team",
+    "description": "A single 1024x1024 window with spout output equirectangular projection rendering.",
+    "license": "MIT License",
+    "name": "Single",
+    "version": "1.0"
+  }
 }
diff --git a/config/spout_output_fisheye.json b/config/spout_output_fisheye.json
index cd1b2a490e..f95628bd50 100644
--- a/config/spout_output_fisheye.json
+++ b/config/spout_output_fisheye.json
@@ -56,5 +56,12 @@
       "eyeseparation": 0.06,
       "pos": { "x": 0.0, "y": 0.0, "z": 0.0 }
     }
-  ]
+  ],
+  "meta": {
+    "author": "OpenSpace Team",
+    "description": "A single 1024x1024 window with spout output fisheye projection rendering.",
+    "license": "MIT License",
+    "name": "Single",
+    "version": "1.0"
+  }
 }
diff --git a/config/spout_output_flat.json b/config/spout_output_flat.json
index 585a0830e7..c7c8ff2d06 100644
--- a/config/spout_output_flat.json
+++ b/config/spout_output_flat.json
@@ -55,5 +55,12 @@
       "eyeseparation": 0.05999999865889549,
       "pos": { "x": 0.0, "y": 0.0, "z": 0.0 }
     }
-  ]
+  ],
+  "meta": {
+    "author": "OpenSpace Team",
+    "description": "A single 1024x1024 window with spout output planar/flat projection rendering at 1920x1080 resolution.",
+    "license": "MIT License",
+    "name": "Single",
+    "version": "1.0"
+  }
 }
diff --git a/config/two_nodes.json b/config/two_nodes.json
index 621bfbbeb0..9bb4f8cf13 100644
--- a/config/two_nodes.json
+++ b/config/two_nodes.json
@@ -60,5 +60,12 @@
       "eyeseparation": 0.065,
       "pos": { "x": 0.0, "y": 0.0, "z": 0.0 }
     }
-  ]
+  ],
+  "meta": {
+    "author": "OpenSpace Team",
+    "description": "Two individual nodes, each with a 1280x720 window with planar projection rendering.",
+    "license": "MIT License",
+    "name": "Single",
+    "version": "1.0"
+  }
 }

From a6522f403849167a6a866e0739a0252be31a72de Mon Sep 17 00:00:00 2001
From: GPayne <payne.gene@gmail.com>
Date: Fri, 14 Jul 2023 11:08:13 -0600
Subject: [PATCH 049/701] Increased wait time for some visual tests

---
 tests/visual/apollo/11landing.ostest     | 2 +-
 tests/visual/apollo/11landingsite.ostest | 2 +-
 tests/visual/apollo/17landingsite.ostest | 2 +-
 tests/visual/default/MarsHiRISE.ostest   | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/tests/visual/apollo/11landing.ostest b/tests/visual/apollo/11landing.ostest
index bba09dab7b..e0c4f662bb 100644
--- a/tests/visual/apollo/11landing.ostest
+++ b/tests/visual/apollo/11landing.ostest
@@ -10,7 +10,7 @@
     { "type": "navigationstate", 
       "value": "{Anchor='Apollo11LemPosition',Pitch=0.979095E-1,Position={-2.457687E0,2.504798E1,3.804939E0},ReferenceFrame='Root',Up={-0.682505E0,0.438584E-1,-0.729564E0},Yaw=0.435056E-1}"},
     { "type": "wait", 
-      "value": "30"}, 
+      "value": "45"}, 
     { "type": "screenshot", 
       "value": ""}
 ]
diff --git a/tests/visual/apollo/11landingsite.ostest b/tests/visual/apollo/11landingsite.ostest
index c051c7ee26..1198a2b22e 100644
--- a/tests/visual/apollo/11landingsite.ostest
+++ b/tests/visual/apollo/11landingsite.ostest
@@ -12,7 +12,7 @@
     { "type": "navigationstate", 
       "value": "{Anchor='Apollo11LemPosition',Pitch=-0.275880E-1,Position={6.249130E0,2.576497E1,-1.435499E1},ReferenceFrame='Root',Up={-0.860897E0,-0.718231E-1,-0.503684E0},Yaw=-0.141143E-3}"},
     { "type": "wait", 
-      "value": "20"}, 
+      "value": "45"}, 
     { "type": "screenshot", 
       "value": "11landingsite"}
 ] 
diff --git a/tests/visual/apollo/17landingsite.ostest b/tests/visual/apollo/17landingsite.ostest
index 6c364a2931..3702f3ea34 100644
--- a/tests/visual/apollo/17landingsite.ostest
+++ b/tests/visual/apollo/17landingsite.ostest
@@ -10,7 +10,7 @@
     { "type": "navigationstate", 
       "value": "{Anchor='Moon',Pitch=0.953555E0,Position={1.399797E6,8.334161E5,5.988283E5},Up={-0.381687E0,-0.228442E-1,0.924009E0},Yaw=-0.789410E-1}"},
     { "type": "wait", 
-      "value": "20"}, 
+      "value": "45"}, 
     { "type": "screenshot", 
       "value": "17landingsite"}
 ] 
diff --git a/tests/visual/default/MarsHiRISE.ostest b/tests/visual/default/MarsHiRISE.ostest
index ece6dae6b3..8ff130ca7e 100644
--- a/tests/visual/default/MarsHiRISE.ostest
+++ b/tests/visual/default/MarsHiRISE.ostest
@@ -14,7 +14,7 @@
     { "type": "script", 
       "value": "openspace.setPropertyValueSingle('Scene.Mars.Renderable.Layers.ColorLayers.CTX_blended_01.Enabled', true)"},
     { "type": "wait", 
-      "value": "60"},
+      "value": "100"},
     { "type": "navigationstate", 
       "value": "{Anchor='Mars',Pitch=1.347758E0,Position={7.635264E5,-3.287992E6,-3.854482E5},Up={-0.470953E-1,-0.127084E0,0.990773E0},Yaw=0.463204E-1}"},
     { "type": "wait", 

From b5572b0e075d76c2c7e3b9f46e2256d6dfdbba8c Mon Sep 17 00:00:00 2001
From: GPayne <payne.gene@gmail.com>
Date: Mon, 17 Jul 2023 12:27:25 -0600
Subject: [PATCH 050/701] Remove ISS trail in defaultEarth test

---
 tests/visual/default/DefaultEarth.ostest | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/tests/visual/default/DefaultEarth.ostest b/tests/visual/default/DefaultEarth.ostest
index 5372543010..898da9a324 100644
--- a/tests/visual/default/DefaultEarth.ostest
+++ b/tests/visual/default/DefaultEarth.ostest
@@ -1,6 +1,8 @@
 [ 
     { "type": "time", 
-      "value": "2019-01-01T05:00:00.00"}, 
+      "value": "2019-01-01T05:00:00.00"},
+    { "type": "script",
+      "value": "openspace.setPropertyValueSingle('Scene.ISS_trail.Renderable.Enabled', false)"},
     { "type": "wait", 
       "value": "20"}, 
     { "type": "screenshot", 

From 14082cd8d914e663e15fe2d38234759a4729ce57 Mon Sep 17 00:00:00 2001
From: Alexander Bock <alexander.bock@liu.se>
Date: Tue, 18 Jul 2023 11:58:17 +0200
Subject: [PATCH 051/701] Add the ability to render an eclipse cone for the
 Earth and Moon system (#2816)

---
 .../planets/earth/eclipse_shadow.asset        |  43 ++
 modules/space/CMakeLists.txt                  |   2 +
 .../space/rendering/renderableeclipsecone.cpp | 509 ++++++++++++++++++
 .../space/rendering/renderableeclipsecone.h   |  87 +++
 modules/space/shaders/eclipsecone_fs.glsl     |  38 ++
 modules/space/shaders/eclipsecone_vs.glsl     |  41 ++
 modules/space/spacemodule.cpp                 |   3 +
 7 files changed, 723 insertions(+)
 create mode 100644 data/assets/scene/solarsystem/planets/earth/eclipse_shadow.asset
 create mode 100644 modules/space/rendering/renderableeclipsecone.cpp
 create mode 100644 modules/space/rendering/renderableeclipsecone.h
 create mode 100644 modules/space/shaders/eclipsecone_fs.glsl
 create mode 100644 modules/space/shaders/eclipsecone_vs.glsl

diff --git a/data/assets/scene/solarsystem/planets/earth/eclipse_shadow.asset b/data/assets/scene/solarsystem/planets/earth/eclipse_shadow.asset
new file mode 100644
index 0000000000..a3ea5e0a1d
--- /dev/null
+++ b/data/assets/scene/solarsystem/planets/earth/eclipse_shadow.asset
@@ -0,0 +1,43 @@
+local transforms = asset.require("scene/solarsystem/planets/earth/moon/moon")
+
+local EarthMoonShadow = {
+  Identifier = "EarthMoonShadow",
+  Parent = transforms.Moon.Identifier,
+  Renderable = {
+    Type = "RenderableEclipseCone",
+    Opacity = 1.0,
+    ShadowLength = 1.0,
+    UmbralShadowColor = { 0.85, 1.0, 1.0, 0.20 },
+    PenumbralShadowColor = { 0.35, 0.35, 0.35, 0.29 },
+    LightSource = "SUN",
+    LightSourceFrame = "IAU_SUN",
+    Shadower = "MOON",
+    ShadowerFrame = "IAU_MOON",
+    Shadowee = "EARTH"
+  },
+  GUI = {
+    Name = "Earth/Moon Shadow",
+    Path = "/Solar System/Planets/Earth"
+  }
+}
+
+asset.onInitialize(function()
+  openspace.addSceneGraphNode(EarthMoonShadow)
+end)
+
+asset.onDeinitialize(function()
+  openspace.removeSceneGraphNode(EarthMoonShadow)
+end)
+
+asset.export(EarthMoonShadow)
+
+
+
+asset.meta = {
+  Name = "Eclipse Shadow",
+  Version = "1.0",
+  Description = "The penumbral and umbral shadow eclipses for the Earth-Moon system",
+  Author = "OpenSpace Team",
+  URL = "http://openspaceproject.com",
+  License = "MIT license"
+}
diff --git a/modules/space/CMakeLists.txt b/modules/space/CMakeLists.txt
index 1c5295ce21..d4b308bfeb 100644
--- a/modules/space/CMakeLists.txt
+++ b/modules/space/CMakeLists.txt
@@ -32,6 +32,7 @@ set(HEADER_FILES
   rendering/renderableconstellationsbase.h
   rendering/renderableconstellationbounds.h
   rendering/renderableconstellationlines.h
+  rendering/renderableeclipsecone.h
   rendering/renderablefluxnodes.h
   rendering/renderablehabitablezone.h
   rendering/renderablerings.h
@@ -55,6 +56,7 @@ set(SOURCE_FILES
   rendering/renderableconstellationsbase.cpp
   rendering/renderableconstellationbounds.cpp
   rendering/renderableconstellationlines.cpp
+  rendering/renderableeclipsecone.cpp
   rendering/renderablefluxnodes.cpp
   rendering/renderablehabitablezone.cpp
   rendering/renderablerings.cpp
diff --git a/modules/space/rendering/renderableeclipsecone.cpp b/modules/space/rendering/renderableeclipsecone.cpp
new file mode 100644
index 0000000000..93887214a3
--- /dev/null
+++ b/modules/space/rendering/renderableeclipsecone.cpp
@@ -0,0 +1,509 @@
+/*****************************************************************************************
+ *                                                                                       *
+ * OpenSpace                                                                             *
+ *                                                                                       *
+ * Copyright (c) 2014-2023                                                               *
+ *                                                                                       *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
+ * software and associated documentation files (the "Software"), to deal in the Software *
+ * without restriction, including without limitation the rights to use, copy, modify,    *
+ * merge, publish, distribute, sublicense, and/or sell copies of the Software, and to    *
+ * permit persons to whom the Software is furnished to do so, subject to the following   *
+ * conditions:                                                                           *
+ *                                                                                       *
+ * The above copyright notice and this permission notice shall be included in all copies *
+ * or substantial portions of the Software.                                              *
+ *                                                                                       *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED,   *
+ * INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A         *
+ * PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT    *
+ * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF  *
+ * CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE  *
+ * OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                                         *
+ ****************************************************************************************/
+
+#include <modules/space/rendering/renderableeclipsecone.h>
+
+#include <modules/spacecraftinstruments/spacecraftinstrumentsmodule.h>
+#include <openspace/documentation/documentation.h>
+#include <openspace/documentation/verifier.h>
+#include <openspace/engine/globals.h>
+#include <openspace/rendering/renderengine.h>
+#include <openspace/util/spicemanager.h>
+#include <openspace/util/updatestructures.h>
+#include <ghoul/filesystem/filesystem.h>
+
+namespace {
+    constexpr std::array<const char*, 3> UniformNames = {
+        "modelViewProjectionTransform", "shadowColor", "opacity"
+    };
+
+    struct VBOLayout {
+        float x = 0.f;
+        float y = 0.f;
+        float z = 0.f;
+    };
+
+    constexpr openspace::properties::Property::PropertyInfo NumberPointsInfo = {
+        "AmountOfPoints",
+        "Points",
+        "This value determines the number of control points that is used to construct "
+        "the shadow geometry. The higher this number, the more detailed the shadow is, "
+        "but it will have a negative impact on the performance",
+        openspace::properties::Property::Visibility::AdvancedUser
+    };
+
+    constexpr openspace::properties::Property::PropertyInfo ShadowLengthInfo = {
+        "ShadowLength",
+        "Shadow Length",
+        "This value determines the length of the shadow that is cast by the target "
+        "object. The total distance of the shadow is equal to the distance from the "
+        "target to the Sun multiplied with this value",
+        openspace::properties::Property::Visibility::AdvancedUser
+    };
+
+    constexpr openspace::properties::Property::PropertyInfo ShowUmbralShadowInfo = {
+        "ShowUmbralShadow",
+        "Show Umbral Shadow",
+        "If this is enabled, the umbral portioon of the shadow is shown",
+        openspace::properties::Property::Visibility::User
+    };
+
+    constexpr openspace::properties::Property::PropertyInfo UmbralShadowColorInfo = {
+        "UmbralShadowColor",
+        "Umbral Shadow Color",
+        "This value determines the color that is used for the shadow cylinder of the "
+        "umbral shadow",
+        // @VISIBILITY(2.5)
+        openspace::properties::Property::Visibility::User
+    };
+
+    constexpr openspace::properties::Property::PropertyInfo ShowPenumbralShadowInfo = {
+        "ShowPenumbralShadow",
+        "Show Penumbral Shadow",
+        "If this is enabled, the penumbral portioon of the shadow is shown",
+        openspace::properties::Property::Visibility::User
+    };
+
+    constexpr openspace::properties::Property::PropertyInfo PenumbralShadowColorInfo = {
+        "PenumbralShadowColor",
+        "Penumbral Shadow Color",
+        "This value determines the color that is used for the shadow cylinder of the "
+        "penumbral shadow",
+        // @VISIBILITY(2.5)
+        openspace::properties::Property::Visibility::User
+    };
+
+    constexpr openspace::properties::Property::PropertyInfo LightSourceInfo = {
+        "LightSource",
+        "Light Source",
+        "This value determines the SPICE name of the object that is used as the "
+        "illuminator for computing the shadow cylinder",
+        openspace::properties::Property::Visibility::AdvancedUser
+    };
+
+    constexpr openspace::properties::Property::PropertyInfo LightSourceFrameInfo = {
+        "LightSourceFrame",
+        "Light Source Frame",
+        "This value is the SPICE name of the body-fixed reference frame for the light "
+        "source",
+        openspace::properties::Property::Visibility::AdvancedUser
+    };
+
+    constexpr openspace::properties::Property::PropertyInfo ShadowerInfo = {
+        "Shadower",
+        "Shadower",
+        "This value specifies the SPICE name of the object that is casting the shadow on "
+        "the shadowee",
+        openspace::properties::Property::Visibility::AdvancedUser
+    };
+
+    constexpr openspace::properties::Property::PropertyInfo ShadowerFrameInfo = {
+        "ShadowerFrame",
+        "Shadower Frame",
+        "This value is the SPICE name of the body-fixed reference frame for the shadower",
+        openspace::properties::Property::Visibility::AdvancedUser
+    };
+
+    constexpr openspace::properties::Property::PropertyInfo ShadoweeInfo = {
+        "Shadowee",
+        "Shadowee",
+        "This value is the SPICE name of object that is receiving the shadow from the "
+        "shadower",
+        openspace::properties::Property::Visibility::AdvancedUser
+    };
+
+    struct [[codegen::Dictionary(RenderableEclipseCone)]] Parameters {
+        // [[codegen::verbatim(NumberPointsInfo.description)]]
+        std::optional<int> numberOfPoints [[codegen::key("AmountOfPoints")]];
+
+        // [[codegen::verbatim(ShadowLengthInfo.description)]]
+        std::optional<float> shadowLength;
+
+        // [[codegen::verbatim(ShowUmbralShadowInfo.description)]]
+        std::optional<bool> showUmbralShadow;
+
+        // [[codegen::verbatim(UmbralShadowColorInfo.description)]]
+        std::optional<glm::vec4> umbralShadowColor [[codegen::color()]];
+
+        // [[codegen::verbatim(ShowPenumbralShadowInfo.description)]]
+        std::optional<bool> showPenumbralShadow;
+
+        // [[codegen::verbatim(PenumbralShadowColorInfo.description)]]
+        std::optional<glm::vec4> penumbralShadowColor [[codegen::color()]];
+
+        // [[codegen::verbatim(LightSourceInfo.description)]]
+        std::string lightSource;
+
+        // [[codegen::verbatim(LightSourceFrameInfo.description)]]
+        std::string lightSourceFrame;
+
+        // [[codegen::verbatim(ShadowerInfo.description)]]
+        std::string shadower;
+
+        // [[codegen::verbatim(ShadowerFrameInfo.description)]]
+        std::string shadowerFrame;
+
+        // [[codegen::verbatim(ShadoweeInfo.description)]]
+        std::string shadowee;
+    };
+#include "renderableeclipsecone_codegen.cpp"
+} // namespace
+
+namespace openspace {
+
+documentation::Documentation RenderableEclipseCone::Documentation() {
+    return codegen::doc<Parameters>("space_renderableeclipsecone");
+}
+
+RenderableEclipseCone::RenderableEclipseCone(const ghoul::Dictionary& dictionary)
+    : Renderable(dictionary)
+    , _numberOfPoints(NumberPointsInfo, 190, 1, 300)
+    , _shadowLength(ShadowLengthInfo, 0.1f, 0.f, 2.f)
+    , _showUmbralShadow(ShowUmbralShadowInfo, true)
+    , _umbralShadowColor(
+        UmbralShadowColorInfo,
+        glm::vec4(1.f),
+        glm::vec4(0.f),
+        glm::vec4(1.f)
+    )
+    , _showPenumbralShadow(ShowPenumbralShadowInfo, true)
+    , _penumbralShadowColor(
+        PenumbralShadowColorInfo,
+        glm::vec4(1.f),
+        glm::vec4(0.f),
+        glm::vec4(1.f)
+    )
+    , _lightSource(LightSourceInfo)
+    , _lightSourceFrame(LightSourceFrameInfo)
+    , _shadower(ShadowerInfo)
+    , _shadowerFrame(ShadowerFrameInfo)
+    , _shadowee(ShadoweeInfo)
+    //, _test({"ABC", "ABC", ""}, 1, 0, 380)
+{
+    const Parameters p = codegen::bake<Parameters>(dictionary);
+    //addProperty(_test);
+    addProperty(Fadeable::_opacity);
+
+    _numberOfPoints = p.numberOfPoints.value_or(_numberOfPoints);
+    addProperty(_numberOfPoints);
+
+    _shadowLength = p.shadowLength.value_or(_shadowLength);
+    addProperty(_shadowLength);
+
+    _showUmbralShadow = p.showUmbralShadow.value_or(_showUmbralShadow);
+    addProperty(_showUmbralShadow);
+    _umbralShadowColor = p.umbralShadowColor.value_or(_umbralShadowColor);
+    _umbralShadowColor.setViewOption(properties::Property::ViewOptions::Color);
+    addProperty(_umbralShadowColor);
+
+    _showPenumbralShadow = p.showPenumbralShadow.value_or(_showPenumbralShadow);
+    addProperty(_showPenumbralShadow);
+    _penumbralShadowColor = p.penumbralShadowColor.value_or(_penumbralShadowColor);
+    _penumbralShadowColor.setViewOption(properties::Property::ViewOptions::Color);
+    addProperty(_penumbralShadowColor);
+
+    _lightSource = p.lightSource;
+    _lightSourceFrame = p.lightSourceFrame;
+    _shadower = p.shadower;
+    _shadowee = p.shadowee;
+    _shadowerFrame = p.shadowerFrame;
+
+    setRenderBin(RenderBin::PostDeferredTransparent);
+}
+
+void RenderableEclipseCone::initializeGL() {
+    glGenVertexArrays(1, &_vao);
+    glGenBuffers(1, &_vbo);
+
+    _shader = SpacecraftInstrumentsModule::ProgramObjectManager.request(
+        "ShadowCylinderProgram",
+        []() -> std::unique_ptr<ghoul::opengl::ProgramObject> {
+            return global::renderEngine->buildRenderProgram(
+                "ShadowCylinderProgram",
+                absPath("${MODULE_SPACE}/shaders/eclipsecone_vs.glsl"),
+                absPath("${MODULE_SPACE}/shaders/eclipsecone_fs.glsl")
+            );
+        }
+    );
+
+    ghoul::opengl::updateUniformLocations(*_shader, _uniformCache, UniformNames);
+}
+
+void RenderableEclipseCone::deinitializeGL() {
+    SpacecraftInstrumentsModule::ProgramObjectManager.release(
+        "ShadowCylinderProgram",
+        [](ghoul::opengl::ProgramObject* p) {
+            global::renderEngine->removeRenderProgram(p);
+        }
+    );
+    _shader = nullptr;
+
+    glDeleteVertexArrays(1, &_vao);
+    _vao = 0;
+    glDeleteBuffers(1, &_vbo);
+    _vbo = 0;
+}
+
+bool RenderableEclipseCone::isReady() const {
+    return _shader;
+}
+
+void RenderableEclipseCone::render(const RenderData& data, RendererTasks&) {
+    glDepthMask(false);
+    glDisable(GL_CULL_FACE);
+
+    _shader->activate();
+
+    // Model transform and view transform needs to be in double precision
+    const glm::dmat4 modelTransform =
+        glm::translate(glm::dmat4(1.0), data.modelTransform.translation) *
+        glm::dmat4(data.modelTransform.rotation) *
+        glm::scale(glm::dmat4(1.0), glm::dvec3(data.modelTransform.scale));
+    glm::dmat4 modelViewTransform = data.camera.combinedViewMatrix() * modelTransform;
+
+    _shader->setUniform(
+        _uniformCache.modelViewProjectionTransform,
+        data.camera.projectionMatrix() * glm::mat4(modelViewTransform)
+    );
+
+    _shader->setUniform(_uniformCache.opacity, opacity());
+
+    glBindVertexArray(_vao);
+    if (_showUmbralShadow) {
+        _shader->setUniform(_uniformCache.shadowColor, _umbralShadowColor);
+        glDrawArrays(GL_TRIANGLE_STRIP, 0, _nVertices);
+    }
+    if (_showPenumbralShadow) {
+        // The shadow vertices live in the same VBO so the start index might be offset
+        const int startIndex = _showUmbralShadow ? _nVertices : 0;
+        _shader->setUniform(_uniformCache.shadowColor, _penumbralShadowColor);
+        glDrawArrays(GL_TRIANGLE_STRIP, startIndex, _nVertices);
+    }
+    glBindVertexArray(0);
+
+    _shader->deactivate();
+
+    glDisable(GL_CULL_FACE);
+    glDepthMask(true);
+}
+
+void RenderableEclipseCone::update(const UpdateData& data) {
+    if (_shader->isDirty()) {
+        _shader->rebuildFromFile();
+        ghoul::opengl::updateUniformLocations(*_shader, _uniformCache, UniformNames);
+    }
+    createCone(data.time.j2000Seconds());
+}
+
+std::vector<VBOLayout> calculateShadowPoints(const std::vector<glm::dvec3>& srcTerminator,
+                                             const std::vector<glm::dvec3>& dstTerminator,
+                                             const glm::dvec3& shadowerToLightSource,
+                                             const glm::dmat3& lightSourceToShadower,
+                                             double lengthScale)
+{
+    ghoul_assert(srcTerminator.size() == dstTerminator.size(), "Unmatched termiator pts");
+
+    std::vector<VBOLayout> vertices;
+    vertices.reserve(dstTerminator.size() * 2);
+    for (size_t i = 0; i < dstTerminator.size(); i++) {
+        // Convert the terminator points from the reference frame of the Sun to the
+        // reference frame of the Moon
+        const glm::dvec3 src =
+            lightSourceToShadower * srcTerminator[i] + shadowerToLightSource;
+        const glm::dvec3 dst = dstTerminator[i];
+        const glm::dvec3 dir = glm::normalize(dst - src);
+
+        // The start point is the terminator point on the Moon
+        glm::vec3 p1 = dst;
+        vertices.push_back({ p1.x, p1.y, p1.z });
+
+        // The end point is calculated by forward propagating the incoming direction
+        glm::vec3 p2 = dst + dir * lengthScale;
+        vertices.push_back({ p2.x, p2.y, p2.z });
+    }
+    return vertices;
+}
+
+void RenderableEclipseCone::createCone(double et) {
+    // Big picture for the calculation for this example (lightSource = Sun,
+    // shadower = Moon, shadowee = Earth). We get the limb (= penumbral terminator) of the
+    // Sun as viewed from the Moon, then the limb of the Moon as viewed from the Sun.
+    // The penumbral shadow cone is constructed by connecting the points of the limbs in
+    // order. The umbral shadow cone is constructed by connecting them 180 deg out of
+    // phase (meaning top to bottom). We want the cone to eminate from the shadower, so
+    // we take the distance from the shadower to the shadowee and use that as a scale for
+    // the resulting vectors we get (also including the _shadowLength) as an additional
+    // scale factor
+
+    // 1. Get the penumbral terminator of the lightsource from the view of the shadower
+    SpiceManager::TerminatorEllipseResult resSrc = SpiceManager::ref().terminatorEllipse(
+        _lightSource,
+        _shadowee, // The actual value of this doesn't matter
+        _lightSourceFrame,
+        _shadower,
+        SpiceManager::TerminatorType::Penumbral,
+        {
+            SpiceManager::AberrationCorrection::Type::None,
+            SpiceManager::AberrationCorrection::Direction::Reception
+        },
+        et,
+        _numberOfPoints
+    );
+    // convert to meter
+    for (glm::dvec3& p : resSrc.terminatorPoints) {
+        p *= 1000.0;
+    }
+
+
+    // 2. Get the penumbral terminator of the shadower from the lightsource
+    SpiceManager::TerminatorEllipseResult resDst = SpiceManager::ref().terminatorEllipse(
+        _shadower,
+        _shadowee, // The actual value of this doesn't matter
+        _shadowerFrame,
+        _lightSource,
+        SpiceManager::TerminatorType::Penumbral,
+        {
+            SpiceManager::AberrationCorrection::Type::None,
+            SpiceManager::AberrationCorrection::Direction::Reception
+        },
+        et,
+        _numberOfPoints
+    );
+    // convert to meter
+    for (glm::dvec3& p : resDst.terminatorPoints) {
+        p *= 1000.0;
+    }
+    // Spice calculates the terminator points in a fixed clockwise/counterclockwise
+    // direction from the point of the view of the observer. Since we are switching target
+    // and observer, this means that one of the sets of points is clockwise, while the
+    // other is counterclockwise. In order for the right points to match up, we need to
+    // reverse the order of one of them. It doesn't matter which one, so we pick this one
+    std::reverse(resDst.terminatorPoints.begin(), resDst.terminatorPoints.end());
+
+    ghoul_assert(
+        resSrc.terminatorPoints.size() == resDst.terminatorPoints.size(),
+        "Inconsistent number of terminator points retrieved"
+    );
+
+
+    // 3. Get the necessary conversion distances and matrices
+    glm::dvec3 diff = SpiceManager::ref().targetPosition(
+        _shadowee,
+        _shadower,
+        "GALACTIC",
+        {
+            SpiceManager::AberrationCorrection::Type::None,
+            SpiceManager::AberrationCorrection::Direction::Reception
+        },
+        et
+    );
+    const double distance = glm::length(diff) * 1000.0; // to meter
+
+
+    const glm::dvec3 shadowerToLightSource = SpiceManager::ref().targetPosition(
+        _lightSource,
+        _shadower,
+        _shadowerFrame,
+        {
+            SpiceManager::AberrationCorrection::Type::None,
+            SpiceManager::AberrationCorrection::Direction::Reception
+        },
+        et
+    ) * 1000.0; // to meter
+    glm::dmat3 lightSourceToShadower = SpiceManager::ref().frameTransformationMatrix(
+        _lightSourceFrame, _shadowerFrame, et
+    );
+
+
+    // 4. Construct the penumbral shadow
+    std::vector<VBOLayout> penumbralVertices;
+    if (_showPenumbralShadow) {
+        penumbralVertices = calculateShadowPoints(
+            resSrc.terminatorPoints,
+            resDst.terminatorPoints,
+            shadowerToLightSource,
+            lightSourceToShadower,
+            distance * static_cast<double>(_shadowLength)
+        );
+        
+        // We need to duplicate the first two vertices to close the cylinder at the seam
+        penumbralVertices.push_back(penumbralVertices[0]);
+        penumbralVertices.push_back(penumbralVertices[1]);
+    }
+
+
+    // 5. Construct the umbral shadow
+    std::vector<VBOLayout> umbralVertices;
+    if (_showUmbralShadow) {
+        // For the umbral shadow, we need to mix the terminator points with a 180
+        // degree phase shift, so that the top terminator point of the sun gets matched
+        // with the bottom terminator point of the Moon, etc
+        std::rotate(
+            resSrc.terminatorPoints.begin(),
+            resSrc.terminatorPoints.begin() + resSrc.terminatorPoints.size() / 2,
+            resSrc.terminatorPoints.end()
+        );
+        umbralVertices = calculateShadowPoints(
+            resSrc.terminatorPoints,
+            resDst.terminatorPoints,
+            shadowerToLightSource,
+            lightSourceToShadower,
+            distance * static_cast<double>(_shadowLength)
+        );
+
+        // We need to duplicate the first two vertices to close the cylinder at the seam
+        umbralVertices.push_back(umbralVertices[0]);
+        umbralVertices.push_back(umbralVertices[1]);
+    }
+
+    
+    // 6. Combine vertices
+    std::vector<VBOLayout> vertices;
+    vertices.reserve(umbralVertices.size() + penumbralVertices.size());
+    vertices.insert(vertices.end(), umbralVertices.begin(), umbralVertices.end());
+    vertices.insert(vertices.end(), penumbralVertices.begin(), penumbralVertices.end());
+
+    _nVertices = 0;
+    if (_showPenumbralShadow) {
+        _nVertices = static_cast<int>(penumbralVertices.size());
+    }
+    if (_showUmbralShadow) {
+        _nVertices = static_cast<int>(penumbralVertices.size());
+    }
+
+    glBindVertexArray(_vao);
+    glBindBuffer(GL_ARRAY_BUFFER, _vbo);
+    glBufferData(
+        GL_ARRAY_BUFFER,
+        vertices.size() * sizeof(VBOLayout),
+        vertices.data(),
+        GL_DYNAMIC_DRAW
+    );
+
+    glEnableVertexAttribArray(0);
+    glVertexAttribPointer(0, 3, GL_FLOAT, GL_FALSE, 0, nullptr);
+    glBindVertexArray(0);
+}
+
+} // namespace openspace
diff --git a/modules/space/rendering/renderableeclipsecone.h b/modules/space/rendering/renderableeclipsecone.h
new file mode 100644
index 0000000000..0d7d6253fe
--- /dev/null
+++ b/modules/space/rendering/renderableeclipsecone.h
@@ -0,0 +1,87 @@
+/*****************************************************************************************
+ *                                                                                       *
+ * OpenSpace                                                                             *
+ *                                                                                       *
+ * Copyright (c) 2014-2023                                                               *
+ *                                                                                       *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
+ * software and associated documentation files (the "Software"), to deal in the Software *
+ * without restriction, including without limitation the rights to use, copy, modify,    *
+ * merge, publish, distribute, sublicense, and/or sell copies of the Software, and to    *
+ * permit persons to whom the Software is furnished to do so, subject to the following   *
+ * conditions:                                                                           *
+ *                                                                                       *
+ * The above copyright notice and this permission notice shall be included in all copies *
+ * or substantial portions of the Software.                                              *
+ *                                                                                       *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED,   *
+ * INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A         *
+ * PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT    *
+ * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF  *
+ * CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE  *
+ * OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                                         *
+ ****************************************************************************************/
+
+#ifndef __OPENSPACE_MODULE_SPACECRAFTINSTRUMENTS___RENDERABLEECLIPSECONE___H__
+#define __OPENSPACE_MODULE_SPACECRAFTINSTRUMENTS___RENDERABLEECLIPSECONE___H__
+
+#include <openspace/rendering/renderable.h>
+
+#include <openspace/properties/optionproperty.h>
+#include <openspace/properties/stringproperty.h>
+#include <openspace/properties/scalar/intproperty.h>
+#include <openspace/properties/scalar/floatproperty.h>
+#include <openspace/properties/vector/vec4property.h>
+#include <ghoul/opengl/ghoul_gl.h>
+#include <ghoul/opengl/uniformcache.h>
+
+namespace ghoul::opengl { class ProgramObject; }
+
+namespace openspace {
+
+namespace documentation { struct Documentation; }
+
+struct RenderData;
+struct UpdateData;
+
+class RenderableEclipseCone : public Renderable {
+public:
+    RenderableEclipseCone(const ghoul::Dictionary& dictionary);
+
+    void initializeGL() override;
+    void deinitializeGL() override;
+
+    bool isReady() const override;
+    void render(const RenderData& data, RendererTasks& rendererTask) override;
+    void update(const UpdateData& data) override;
+
+    static documentation::Documentation Documentation();
+
+private:
+    void createCone(double et);
+
+    properties::IntProperty _numberOfPoints;
+    properties::FloatProperty _shadowLength;
+    properties::BoolProperty _showUmbralShadow;
+    properties::Vec4Property _umbralShadowColor;
+    properties::BoolProperty _showPenumbralShadow;
+    properties::Vec4Property _penumbralShadowColor;
+
+    properties::StringProperty _lightSource;
+    properties::StringProperty _lightSourceFrame;
+    properties::StringProperty _shadower;
+    properties::StringProperty _shadowerFrame;
+    properties::StringProperty _shadowee;
+
+    ghoul::opengl::ProgramObject* _shader = nullptr;
+    UniformCache(modelViewProjectionTransform, shadowColor, opacity) _uniformCache;
+
+    GLuint _vao = 0;
+    GLuint _vbo = 0;
+
+    int _nVertices = 0;
+};
+
+} // namespace openspace
+
+#endif // __OPENSPACE_MODULE_SPACECRAFTINSTRUMENTS___RENDERABLEECLIPSECONE___H__
diff --git a/modules/space/shaders/eclipsecone_fs.glsl b/modules/space/shaders/eclipsecone_fs.glsl
new file mode 100644
index 0000000000..a14344c0e6
--- /dev/null
+++ b/modules/space/shaders/eclipsecone_fs.glsl
@@ -0,0 +1,38 @@
+/*****************************************************************************************
+ *                                                                                       *
+ * OpenSpace                                                                             *
+ *                                                                                       *
+ * Copyright (c) 2014-2023                                                               *
+ *                                                                                       *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
+ * software and associated documentation files (the "Software"), to deal in the Software *
+ * without restriction, including without limitation the rights to use, copy, modify,    *
+ * merge, publish, distribute, sublicense, and/or sell copies of the Software, and to    *
+ * permit persons to whom the Software is furnished to do so, subject to the following   *
+ * conditions:                                                                           *
+ *                                                                                       *
+ * The above copyright notice and this permission notice shall be included in all copies *
+ * or substantial portions of the Software.                                              *
+ *                                                                                       *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED,   *
+ * INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A         *
+ * PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT    *
+ * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF  *
+ * CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE  *
+ * OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                                         *
+ ****************************************************************************************/
+
+#include "fragment.glsl"
+
+in float vs_depth;
+
+uniform float opacity;
+uniform vec4 shadowColor;
+
+
+Fragment getFragment() {
+  Fragment frag;
+  frag.color = vec4(shadowColor.rgb, shadowColor.a * opacity);
+  frag.depth = vs_depth;
+  return frag;
+}
diff --git a/modules/space/shaders/eclipsecone_vs.glsl b/modules/space/shaders/eclipsecone_vs.glsl
new file mode 100644
index 0000000000..177f3e04c7
--- /dev/null
+++ b/modules/space/shaders/eclipsecone_vs.glsl
@@ -0,0 +1,41 @@
+/*****************************************************************************************
+ *                                                                                       *
+ * OpenSpace                                                                             *
+ *                                                                                       *
+ * Copyright (c) 2014-2023                                                               *
+ *                                                                                       *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
+ * software and associated documentation files (the "Software"), to deal in the Software *
+ * without restriction, including without limitation the rights to use, copy, modify,    *
+ * merge, publish, distribute, sublicense, and/or sell copies of the Software, and to    *
+ * permit persons to whom the Software is furnished to do so, subject to the following   *
+ * conditions:                                                                           *
+ *                                                                                       *
+ * The above copyright notice and this permission notice shall be included in all copies *
+ * or substantial portions of the Software.                                              *
+ *                                                                                       *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED,   *
+ * INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A         *
+ * PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT    *
+ * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF  *
+ * CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE  *
+ * OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                                         *
+ ****************************************************************************************/
+
+#version __CONTEXT__
+
+#include "PowerScaling/powerScaling_vs.hglsl"
+
+layout(location = 0) in vec3 in_point_position;
+
+out float vs_depth;
+
+uniform mat4 modelViewProjectionTransform;
+
+
+void main() {
+  vec4 positionClipSpace = modelViewProjectionTransform * vec4(in_point_position, 1.0);
+  vec4 p = z_normalization(positionClipSpace);
+  vs_depth = p.w;
+  gl_Position = p;
+}
diff --git a/modules/space/spacemodule.cpp b/modules/space/spacemodule.cpp
index cd975b4eed..f5f8d792cf 100644
--- a/modules/space/spacemodule.cpp
+++ b/modules/space/spacemodule.cpp
@@ -27,6 +27,7 @@
 #include <modules/space/labelscomponent.h>
 #include <modules/space/rendering/renderableconstellationbounds.h>
 #include <modules/space/rendering/renderableconstellationlines.h>
+#include <modules/space/rendering/renderableeclipsecone.h>
 #include <modules/space/rendering/renderablefluxnodes.h>
 #include <modules/space/rendering/renderablehabitablezone.h>
 #include <modules/space/rendering/renderableorbitalkepler.h>
@@ -85,6 +86,7 @@ void SpaceModule::internalInitialize(const ghoul::Dictionary& dictionary) {
     fRenderable->registerClass<RenderableConstellationLines>(
         "RenderableConstellationLines"
     );
+    fRenderable->registerClass<RenderableEclipseCone>("RenderableEclipseCone");
     fRenderable->registerClass<RenderableFluxNodes>("RenderableFluxNodes");
     fRenderable->registerClass<RenderableHabitableZone>("RenderableHabitableZone");
     fRenderable->registerClass<RenderableRings>("RenderableRings");
@@ -122,6 +124,7 @@ std::vector<documentation::Documentation> SpaceModule::documentations() const {
         KeplerTranslation::Documentation(),
         RenderableConstellationBounds::Documentation(),
         RenderableConstellationLines::Documentation(),
+        RenderableEclipseCone::Documentation(),
         RenderableFluxNodes::Documentation(),
         RenderableHabitableZone::Documentation(),
         RenderableRings::Documentation(),

From 8bc890942540c705c28fee1da2afab21f0f50185 Mon Sep 17 00:00:00 2001
From: Gene Payne <payne.gene@gmail.com>
Date: Tue, 18 Jul 2023 17:51:10 -0600
Subject: [PATCH 052/701] Bump to sgct version with meta info

---
 apps/OpenSpace/ext/sgct | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/apps/OpenSpace/ext/sgct b/apps/OpenSpace/ext/sgct
index 19e7e21435..7a0b95f703 160000
--- a/apps/OpenSpace/ext/sgct
+++ b/apps/OpenSpace/ext/sgct
@@ -1 +1 @@
-Subproject commit 19e7e21435fe4df71eb89d53599b46b68758273d
+Subproject commit 7a0b95f703d59182f57fbc14ea3e591c265038f7

From ceed3fc58a9c1e1d1384dae67f6cf03206ee7a5f Mon Sep 17 00:00:00 2001
From: GPayne <payne.gene@gmail.com>
Date: Wed, 19 Jul 2023 10:11:11 -0600
Subject: [PATCH 053/701] New visual test of nightsky constellations

---
 tests/visual/nightsky/constellationlines.ostest | 12 ++++++++++++
 1 file changed, 12 insertions(+)
 create mode 100644 tests/visual/nightsky/constellationlines.ostest

diff --git a/tests/visual/nightsky/constellationlines.ostest b/tests/visual/nightsky/constellationlines.ostest
new file mode 100644
index 0000000000..77916b69cc
--- /dev/null
+++ b/tests/visual/nightsky/constellationlines.ostest
@@ -0,0 +1,12 @@
+[
+    { "type": "pause",
+      "value": "true"},
+    { "type": "time",
+      "value": "2023-03-03T20:00:00.00"},
+    { "type": "script",
+      "value": "openspace.fadeIn('Scene.Constellations.Renderable')"},
+    { "type": "wait",
+      "value": "30"},
+    { "type": "screenshot",
+      "value": "constellationlines"}
+]

From 72bf7f59d3638b7f0a8bafa2b132f10b78db195c Mon Sep 17 00:00:00 2001
From: Gene Payne <payne.gene@gmail.com>
Date: Wed, 19 Jul 2023 13:50:59 -0600
Subject: [PATCH 054/701] Implemented tooltips for sgct window config files in
 launcher dropdown

---
 .../ext/launcher/src/launcherwindow.cpp        | 18 ++++++++++++++++++
 apps/OpenSpace/ext/sgct                        |  2 +-
 2 files changed, 19 insertions(+), 1 deletion(-)

diff --git a/apps/OpenSpace/ext/launcher/src/launcherwindow.cpp b/apps/OpenSpace/ext/launcher/src/launcherwindow.cpp
index 8454551101..7bb25f7e61 100644
--- a/apps/OpenSpace/ext/launcher/src/launcherwindow.cpp
+++ b/apps/OpenSpace/ext/launcher/src/launcherwindow.cpp
@@ -552,6 +552,17 @@ bool handleConfigurationFile(QComboBox& box, const std::filesystem::directory_en
     }
     box.addItem(QString::fromStdString(p.path().filename().string()));
 
+    //Add tooltip
+    if (isJson) {
+        sgct::config::Meta meta = sgct::readMeta(p.path().string(), true);
+        if (!meta.description.empty()) {
+            QString toolTip = QString::fromStdString(
+                fmt::format("<p>{}</p>", meta.description)
+            );
+            box.setItemData(box.count() - 1, toolTip, Qt::ToolTipRole);
+        }
+    }
+
     // For now, mark the XML configuration files to show that they are deprecated
     if (isXml) {
         box.setItemData(box.count() - 1, QBrush(Qt::darkYellow), Qt::ForegroundRole);
@@ -644,6 +655,13 @@ void LauncherWindow::populateWindowConfigsList(std::string preset) {
         _windowConfigBoxIndexSgctCfgDefault,
         QString::fromStdString(_sgctConfigName)
     );
+    QString defaultTip = 
+        "<p>The basic default configuration specified in the .cfg file</p>";
+    _windowConfigBox->setItemData(
+        _windowConfigBoxIndexSgctCfgDefault,
+        defaultTip,
+        Qt::ToolTipRole
+    );
     // Try to find the requested configuration file and set it as the current one. As we
     // have support for function-generated configuration files that will not be in the
     // list we need to add a preset that doesn't exist a file for
diff --git a/apps/OpenSpace/ext/sgct b/apps/OpenSpace/ext/sgct
index 7a0b95f703..db37bed6d7 160000
--- a/apps/OpenSpace/ext/sgct
+++ b/apps/OpenSpace/ext/sgct
@@ -1 +1 @@
-Subproject commit 7a0b95f703d59182f57fbc14ea3e591c265038f7
+Subproject commit db37bed6d79689202ac3eb195366ba923f109358

From 90d8abcfb10efd0e6a80a5dca97e62b17445a65d Mon Sep 17 00:00:00 2001
From: GPayne <payne.gene@gmail.com>
Date: Thu, 20 Jul 2023 08:45:45 -0600
Subject: [PATCH 055/701] Bump sgct rev with comment header

---
 apps/OpenSpace/ext/sgct | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/apps/OpenSpace/ext/sgct b/apps/OpenSpace/ext/sgct
index db37bed6d7..d643b8bf2a 160000
--- a/apps/OpenSpace/ext/sgct
+++ b/apps/OpenSpace/ext/sgct
@@ -1 +1 @@
-Subproject commit db37bed6d79689202ac3eb195366ba923f109358
+Subproject commit d643b8bf2a456006f16c3623ff00d6ce572dff51

From 083ded25f55bc779a9fae603a157d366fe4c96d3 Mon Sep 17 00:00:00 2001
From: Alexander Bock <alexander.bock@liu.se>
Date: Tue, 25 Jul 2023 19:24:00 +0200
Subject: [PATCH 056/701] Update CREDITS.md

---
 CREDITS.md | 46 ++++++----------------------------------------
 1 file changed, 6 insertions(+), 40 deletions(-)

diff --git a/CREDITS.md b/CREDITS.md
index c8c08729da..91d3244a00 100644
--- a/CREDITS.md
+++ b/CREDITS.md
@@ -1,56 +1,22 @@
 # Core Team
 Alexander Bock
 Emma Broman
-Emil Axelsson
+Malin Ejdbo
 Gene Payne
+Emil Axelsson
 Kalle Bladin
 Jonathas Costa
-Malin Ejdbo
-Elon Olsson
+Ylva Selling
 Micah Acinapura
+Elon Olsson
 Jonas Strandstedt
 Michal Marcinkowski
+Adam Rohdin
 Joakim Kilby
 Lovisa Hassler
 Mikael Petterson
 Erik Sundén
 Stefan Lindblad
+Megan Villa
 Corrie Roe
 Eric Myers
-
-Sebastian Piwell
-Erik Broberg
-Jonathan Bosson
-Michael Nilsson
-Jonathan Franzen
-ChristianAdamsson
-Emilie Ho
-Karin Reidarman
-Hans-Christian Helltegen
-Anton Arbring
-Oskar Carlbaum
-Matthew Territo
-Jonathan Grangien
-Klas Eskilson
-Aniisa Bihi
-Tomas Forsyth Rosin
-Niclas Hultberg
-Rickard Lindtstedt
-Ingela Rossing
-Michael Sjöström
-Michael Novén
-Christoffer Särevall
-
-# Community Support
-Anteige
-arfon
-DavidLaidlaw
-ethanejohnsons
-johnriedel
-mik3caprio
-mingenuity
-nbartzokas
-nealmcb
-noahdasanaike
-PTrottier
-sa5bke

From 5a9c70f22c63a5c3ac8f5da783b035aabe10e5c4 Mon Sep 17 00:00:00 2001
From: GPayne <payne.gene@gmail.com>
Date: Tue, 25 Jul 2023 13:12:42 -0600
Subject: [PATCH 057/701] Added a JWST visual test

---
 tests/visual/jwst/earthorbit.ostest | 12 ++++++++++++
 1 file changed, 12 insertions(+)
 create mode 100644 tests/visual/jwst/earthorbit.ostest

diff --git a/tests/visual/jwst/earthorbit.ostest b/tests/visual/jwst/earthorbit.ostest
new file mode 100644
index 0000000000..c27fc78712
--- /dev/null
+++ b/tests/visual/jwst/earthorbit.ostest
@@ -0,0 +1,12 @@
+[ 
+    { "type": "pause", 
+      "value": "true"},
+    { "type": "time",
+      "value": "2021-12-25T20:12:51.00"},
+    { "type": "navigationstate", 
+      "value": "{Anchor='JWSTModel',Pitch=-0.0016564658365626121,Position={29.160003662109375,-2.7035293579101562,-15.113174438476562},ReferenceFrame='Root',Up={0.2476631160089928,0.916590399238525,0.3138869557539424},Yaw=-0.005731161690830819}"},
+    { "type": "wait", 
+      "value": "45"}, 
+    { "type": "screenshot", 
+      "value": "earthorbit"}
+] 

From b32183e4a9fa084641af3e719f4e6952d0a469e3 Mon Sep 17 00:00:00 2001
From: Alexander Bock <mail@alexanderbock.eu>
Date: Wed, 26 Jul 2023 22:23:58 +0200
Subject: [PATCH 058/701] Correctly show the Apollo 17 insignia

---
 .../scene/solarsystem/missions/apollo/insignias_map.asset       | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/data/assets/scene/solarsystem/missions/apollo/insignias_map.asset b/data/assets/scene/solarsystem/missions/apollo/insignias_map.asset
index cebfca401f..e00120ffa5 100644
--- a/data/assets/scene/solarsystem/missions/apollo/insignias_map.asset
+++ b/data/assets/scene/solarsystem/missions/apollo/insignias_map.asset
@@ -200,6 +200,7 @@ asset.onInitialize(function()
   openspace.addSceneGraphNode(Apollo14)
   openspace.addSceneGraphNode(Apollo15)
   openspace.addSceneGraphNode(Apollo16)
+  openspace.addSceneGraphNode(Apollo17)
 
   openspace.action.registerAction(ShowInsignias)
   openspace.action.registerAction(HideInsignias)
@@ -209,6 +210,7 @@ asset.onDeinitialize(function()
   openspace.action.removeAction(HideInsignias)
   openspace.action.removeAction(ShowInsignias)
 
+  openspace.removeSceneGraphNode(Apollo17)
   openspace.removeSceneGraphNode(Apollo16)
   openspace.removeSceneGraphNode(Apollo15)
   openspace.removeSceneGraphNode(Apollo14)

From 59d51a365f04e2004b415dc329134bb20ed7111e Mon Sep 17 00:00:00 2001
From: Alexander Bock <alexander.bock@liu.se>
Date: Mon, 31 Jul 2023 13:39:35 +0200
Subject: [PATCH 059/701] Prevent crash when no shadow caster is available

---
 modules/atmosphere/rendering/atmospheredeferredcaster.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/modules/atmosphere/rendering/atmospheredeferredcaster.cpp b/modules/atmosphere/rendering/atmospheredeferredcaster.cpp
index 3c9c872413..5223fba086 100644
--- a/modules/atmosphere/rendering/atmospheredeferredcaster.cpp
+++ b/modules/atmosphere/rendering/atmospheredeferredcaster.cpp
@@ -273,11 +273,11 @@ void AtmosphereDeferredcaster::update(const UpdateData&) {}
 float AtmosphereDeferredcaster::eclipseShadow(glm::dvec3 position) {
     // This code is copied from the atmosphere deferred fragment shader 
     // It is used to calculate the eclipse shadow
-    const ShadowRenderingStruct& shadow = _shadowDataArrayCache.front();
-    if (_shadowDataArrayCache.empty() || !shadow.isShadowing) {
+    if (_shadowDataArrayCache.empty() || !_shadowDataArrayCache.front().isShadowing) {
         return 1.f;
     }
 
+    const ShadowRenderingStruct& shadow = _shadowDataArrayCache.front();
     const glm::dvec3 positionToCaster = shadow.casterPositionVec - position;
     const glm::dvec3 sourceToCaster = shadow.sourceCasterVec; // Normalized
     const glm::dvec3 casterShadow = dot(positionToCaster, sourceToCaster) * sourceToCaster;

From 25451e08e8faa6d939494597d63eafc7574a45dd Mon Sep 17 00:00:00 2001
From: Emma Broman <emma.broman@liu.se>
Date: Wed, 2 Aug 2023 15:56:35 +0200
Subject: [PATCH 060/701] Update GUI hash

---
 data/assets/util/webgui.asset | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/data/assets/util/webgui.asset b/data/assets/util/webgui.asset
index 98c92d27c7..2892f6e71c 100644
--- a/data/assets/util/webgui.asset
+++ b/data/assets/util/webgui.asset
@@ -4,7 +4,7 @@ local guiCustomization = asset.require("customization/gui")
 
 
 -- Select which commit hashes to use for the frontend and backend
-local frontendHash = "aab5767cdfe004a8a512f18e41217f608b62f131"
+local frontendHash = "44a3e3aa89f250b74ffc4b7f3a503a5149c0e8de"
 
 local frontend = asset.syncedResource({
   Identifier = "WebGuiFrontend",

From 32776e7b76318f43ad4572cff8c6e65ad1d90f57 Mon Sep 17 00:00:00 2001
From: Gene Payne <payne.gene@gmail.com>
Date: Wed, 2 Aug 2023 12:28:27 -0600
Subject: [PATCH 061/701] Fix visual test file Mars terrain typo in CTX layer

---
 tests/visual/default/MarsHiRISE.ostest | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/visual/default/MarsHiRISE.ostest b/tests/visual/default/MarsHiRISE.ostest
index 8ff130ca7e..84c03b7386 100644
--- a/tests/visual/default/MarsHiRISE.ostest
+++ b/tests/visual/default/MarsHiRISE.ostest
@@ -12,7 +12,7 @@
     { "type": "script", 
       "value": "openspace.setPropertyValueSingle('Scene.Mars.Renderable.Layers.ColorLayers.HiRISE-PSP.Enabled', true)"},
     { "type": "script", 
-      "value": "openspace.setPropertyValueSingle('Scene.Mars.Renderable.Layers.ColorLayers.CTX_blended_01.Enabled', true)"},
+      "value": "openspace.setPropertyValueSingle('Scene.Mars.Renderable.Layers.ColorLayers.CTX_blended.Enabled', true)"},
     { "type": "wait", 
       "value": "100"},
     { "type": "navigationstate", 

From 091697c5b7c5425e05894395e26677cd0407af74 Mon Sep 17 00:00:00 2001
From: Emma Broman <emma.broman@liu.se>
Date: Thu, 3 Aug 2023 09:46:55 +0200
Subject: [PATCH 062/701] Make geojson file extension parsing more flexible in
 lua function (closes #2797)

Now allows geojson files with caps in the extension, as well as files with the .json extension.

Note that .json files will not be handled by drag-n-drop  (we might want to use that extension for something else)
---
 modules/globebrowsing/globebrowsingmodule_lua.inl | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/modules/globebrowsing/globebrowsingmodule_lua.inl b/modules/globebrowsing/globebrowsingmodule_lua.inl
index 21268feb04..1332f4889d 100644
--- a/modules/globebrowsing/globebrowsingmodule_lua.inl
+++ b/modules/globebrowsing/globebrowsingmodule_lua.inl
@@ -612,9 +612,13 @@ getGeoPositionForCamera(bool useEyePosition = false)
         ));
     }
 
-    if (path.extension() != ".geojson") {
+    std::string extension = path.extension().string();
+    std::transform(extension.begin(), extension.end(), extension.begin(),
+        [](unsigned char c) { return std::tolower(c); });
+
+    if (extension != ".geojson" && extension != ".json") {
         throw ghoul::lua::LuaError(fmt::format(
-            "Unexpected file type: '{}'. Expected '.geojson' file", filename
+            "Unexpected file type: '{}'. Expected '.geojson' or '.json' file", filename
         ));
     }
 

From c973cee5a12b11f6d464db14120ce602f39f2a4a Mon Sep 17 00:00:00 2001
From: Emma Broman <emma.broman@liu.se>
Date: Thu, 3 Aug 2023 10:46:48 +0200
Subject: [PATCH 063/701] Allow reading GeoJson files with null geometry (issue
 #2811)

Present a warning when a null geometry is encountered, as it will not be loaded as of now
---
 modules/globebrowsing/ext/geos                |  2 +-
 .../src/geojson/geojsoncomponent.cpp          | 27 ++++++++++++++-----
 .../src/geojson/geojsoncomponent.h            |  2 +-
 3 files changed, 23 insertions(+), 8 deletions(-)

diff --git a/modules/globebrowsing/ext/geos b/modules/globebrowsing/ext/geos
index bc93e4c523..e9ca7617f6 160000
--- a/modules/globebrowsing/ext/geos
+++ b/modules/globebrowsing/ext/geos
@@ -1 +1 @@
-Subproject commit bc93e4c523e92baee3c92608b1309a31453ece06
+Subproject commit e9ca7617f6249a9bbb86721dfc2ebd6283168e53
diff --git a/modules/globebrowsing/src/geojson/geojsoncomponent.cpp b/modules/globebrowsing/src/geojson/geojsoncomponent.cpp
index 394f5e4f00..d3f6b43afc 100644
--- a/modules/globebrowsing/src/geojson/geojsoncomponent.cpp
+++ b/modules/globebrowsing/src/geojson/geojsoncomponent.cpp
@@ -611,8 +611,10 @@ void GeoJsonComponent::readFile() {
     try {
         GeoJSONFeatureCollection fc = reader.readFeatures(content);
 
+        int count = 1;
         for (const GeoJSONFeature& feature : fc.getFeatures()) {
-            parseSingleFeature(feature);
+            parseSingleFeature(feature, count);
+            count++;
         }
 
         if (_geometryFeatures.empty()) {
@@ -633,16 +635,25 @@ void GeoJsonComponent::readFile() {
     computeMainFeatureMetaPropeties();
 }
 
-void GeoJsonComponent::parseSingleFeature(const geos::io::GeoJSONFeature& feature) {
+void GeoJsonComponent::parseSingleFeature(const geos::io::GeoJSONFeature& feature,
+                                          int indexInFile
+) {
     // Read the geometry
     const geos::geom::Geometry* geom = feature.getGeometry();
-    ghoul_assert(geom, "No geometry found");
 
     // Read the properties
     GeoJsonOverrideProperties propsFromFile = propsFromGeoJson(feature);
 
     std::vector<const geos::geom::Geometry*> geomsToAdd;
-    if (geom->isPuntal()) {
+    if (!geom) {
+        // Null geometry => no geometries to add
+        LWARNING(fmt::format(
+            "Feature {} in GeoJson file '{}' is a null geometry and will not be loaded",
+            indexInFile, _geoJsonFile
+        ));
+        // @TODO (emmbr26) We should eventually support features with null geometry
+    }
+    else if (geom->isPuntal()) {
         // If points, handle all point features as one feature, even multi-points
         geomsToAdd = { geom };
     }
@@ -650,7 +661,10 @@ void GeoJsonComponent::parseSingleFeature(const geos::io::GeoJSONFeature& featur
         size_t nGeom = geom->getNumGeometries();
         geomsToAdd.reserve(nGeom);
         for (size_t i = 0; i < nGeom; ++i) {
-            geomsToAdd.push_back(geom->getGeometryN(i));
+            const geos::geom::Geometry* subGeometry = geom->getGeometryN(i);
+            if (subGeometry) {
+                geomsToAdd.push_back(subGeometry);
+            }
         }
     }
 
@@ -687,7 +701,8 @@ void GeoJsonComponent::parseSingleFeature(const geos::io::GeoJSONFeature& featur
         catch (const ghoul::MissingCaseException&) {
             LERROR(fmt::format(
                 "Error creating GeoJson layer with identifier '{}'. Problem reading "
-                "feature {} in GeoJson file '{}'.", identifier(), index, _geoJsonFile
+                "feature {} in GeoJson file '{}'.",
+                identifier(), indexInFile, _geoJsonFile
             ));
             // Do nothing
         }
diff --git a/modules/globebrowsing/src/geojson/geojsoncomponent.h b/modules/globebrowsing/src/geojson/geojsoncomponent.h
index 5e25c552ff..cad6eb9fbb 100644
--- a/modules/globebrowsing/src/geojson/geojsoncomponent.h
+++ b/modules/globebrowsing/src/geojson/geojsoncomponent.h
@@ -98,7 +98,7 @@ private:
     };
 
     void readFile();
-    void parseSingleFeature(const geos::io::GeoJSONFeature& feature);
+    void parseSingleFeature(const geos::io::GeoJSONFeature& feature, int indexInFile);
 
     /**
      * Add meta properties to the feature, to allow things like flying to it,

From 2b3226d18d8ac1ea61cae62a5474113cc946fb4c Mon Sep 17 00:00:00 2001
From: Emma Broman <emma.broman@liu.se>
Date: Thu, 3 Aug 2023 16:51:13 +0200
Subject: [PATCH 064/701] FIx aspect ratio issue for RenderableVideoPlane
 (closes #2815)

---
 modules/video/src/renderablevideoplane.cpp | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/modules/video/src/renderablevideoplane.cpp b/modules/video/src/renderablevideoplane.cpp
index 49fde34615..5bcba06397 100644
--- a/modules/video/src/renderablevideoplane.cpp
+++ b/modules/video/src/renderablevideoplane.cpp
@@ -74,7 +74,7 @@ void RenderableVideoPlane::update(const UpdateData& data) {
         return;
     }
 
-    // Shape the vidoe based on the aspect ration of the film
+    // Shape the plane based on the aspect ration of the video
     glm::vec2 textureDim = glm::vec2(_videoPlayer.frameTexture()->dimensions());
     if (_textureDimensions != textureDim) {
         float aspectRatio = textureDim.x / textureDim.y;
@@ -83,10 +83,11 @@ void RenderableVideoPlane::update(const UpdateData& data) {
         if (std::abs(planeAspectRatio - aspectRatio) >
             std::numeric_limits<float>::epsilon())
         {
+            double scale = _size.value().y;
             glm::vec2 newSize =
                 aspectRatio > 0.f ?
-                glm::vec2(_size.value().x * aspectRatio, _size.value().y) :
-                glm::vec2(_size.value().x, _size.value().y * aspectRatio);
+                glm::vec2(scale * aspectRatio, scale) :
+                glm::vec2(scale, scale * aspectRatio);
             _size = newSize;
         }
 

From cb7ec8de707cfcdd2aba7cb41afe1bd2417ef307 Mon Sep 17 00:00:00 2001
From: Alexander Bock <mail@alexanderbock.eu>
Date: Thu, 3 Aug 2023 14:30:36 +0200
Subject: [PATCH 065/701] Fix issue where the time is wrong when starting a
 profile paused (closes #2826)

---
 include/openspace/util/time.h | 21 +++++----
 src/util/time.cpp             | 69 +++++++++++++++++++++++++---
 src/util/time_lua.inl         | 85 +++++++----------------------------
 src/util/timemanager.cpp      | 15 ++++---
 4 files changed, 98 insertions(+), 92 deletions(-)

diff --git a/include/openspace/util/time.h b/include/openspace/util/time.h
index 40dc00b6bb..48d70ef3b7 100644
--- a/include/openspace/util/time.h
+++ b/include/openspace/util/time.h
@@ -70,6 +70,12 @@ public:
     /// \overload static double convertTime(const std::string& time)
     static double convertTime(const char* time);
 
+    /**
+     * Returns the current wall time as an ISO 8601 date string (YYYY-MM-DDTHH-MN-SS) in
+     * the UTC timezone.
+     */
+    static std::string currentWallTime();
+
     explicit Time(double secondsJ2000 = -1);
     explicit Time(const std::string& time);
     Time(const Time& other) = default;
@@ -157,16 +163,13 @@ public:
     double advanceTime(double tickTime);
 
     /**
-     * Sets a relative time from profile.
+     * Modifies the passed time (first argument) by the delta time (second argument). The
+     * first argument must be an ISO 8601 date string. The second argument should be a
+     * string of the form [-]XX(s,m,h,d,M,y] with (s)econds, (m)inutes, (h)ours, (d)ays,
+     * (M)onths, and (y)ears as units and an optional - sign to move backwards in time.
+     * The return value is in the form of an ISO 8601 date string.
      */
-    static void setTimeRelativeFromProfile(const std::string& setTime);
-
-    /**
-     * Sets an absolute time from profile.
-     * \param setTime a string containing time to set, which must be a valid
-     * ISO 8601-like date string of the format YYYY-MM-DDTHH:MN:SS
-     */
-    static void setTimeAbsoluteFromProfile(const std::string& setTime);
+    static std::string advancedTime(std::string base, std::string change);
 
     /**
      * Returns the Lua library that contains all Lua functions available to change the
diff --git a/src/util/time.cpp b/src/util/time.cpp
index 883b7848bb..d83b6378da 100644
--- a/src/util/time.cpp
+++ b/src/util/time.cpp
@@ -60,6 +60,18 @@ double Time::convertTime(const char* time) {
     return SpiceManager::ref().ephemerisTimeFromDate(time);
 }
 
+std::string Time::currentWallTime() {
+    std::time_t t = std::time(nullptr);
+    std::tm* utcTime = std::gmtime(&t);
+
+    std::string time = fmt::format(
+        "{:04d}-{:02d}-{:02d}T{:02d}:{:02d}:{:02d}",
+        utcTime->tm_year + 1900, utcTime->tm_mon + 1, utcTime->tm_mday,
+        utcTime->tm_hour, utcTime->tm_min, utcTime->tm_sec
+    );
+    return time;
+}
+
 Time::Time(double secondsJ2000) : _time(secondsJ2000) {}
 
 Time::Time(const std::string& time) :
@@ -132,14 +144,57 @@ void Time::ISO8601(char* buffer) const {
     SpiceManager::ref().dateFromEphemerisTime(_time, buffer, S, Format);
 }
 
-void Time::setTimeRelativeFromProfile(const std::string& setTime) {
-    std::string t = currentWallTime();
-    std::variant<std::string, double> t2 = advancedTime(t, setTime);
-    ::setTime(std::get<std::string>(t2));
-}
+std::string Time::advancedTime(std::string base, std::string change) {
+    double j2000Seconds = Time::convertTime(base);
 
-void Time::setTimeAbsoluteFromProfile(const std::string& setTime) {
-    ::setTime(setTime);
+    double dt = 0.0;
+    if (change.empty()) {
+        throw ghoul::RuntimeError("Modifier string must not be empty");
+    }
+    ghoul::trimWhitespace(change);
+    bool isNegative = false;
+    if (change[0] == '-') {
+        isNegative = true;
+        change = change.substr(1);
+    }
+
+    auto it = std::find_if(
+        change.begin(), change.end(),
+        [](unsigned char c) {
+            const bool digit = std::isdigit(c) != 0;
+            const bool isDot = c == '.';
+            return !digit && !isDot;
+        }
+    );
+
+    try {
+        double value = std::stod(std::string(change.begin(), it));
+        std::string uName = std::string(it, change.end());
+
+        TimeUnit unit = TimeUnit::Second;
+        if (uName == "s") { unit = TimeUnit::Second; }
+        else if (uName == "m") { unit = TimeUnit::Minute; }
+        else if (uName == "h") { unit = TimeUnit::Hour; }
+        else if (uName == "d") { unit = TimeUnit::Day; }
+        else if (uName == "M") { unit = TimeUnit::Month; }
+        else if (uName == "y") { unit = TimeUnit::Year; }
+        else {
+            throw ghoul::RuntimeError(fmt::format("Unknown unit '{}'", uName));
+        }
+
+        dt = openspace::convertTime(value, unit, TimeUnit::Second);
+        if (isNegative) {
+            dt *= -1.0;
+        }
+    }
+    catch (...) {
+        throw ghoul::RuntimeError(fmt::format(
+            "Error parsing relative time offset '{}'", change
+        ));
+    }
+
+    std::string_view ret = Time(j2000Seconds + dt).ISO8601();
+    return std::string(ret);
 }
 
 scripting::LuaLibrary Time::luaLibrary() {
diff --git a/src/util/time_lua.inl b/src/util/time_lua.inl
index 171773f2b5..e32ff13bdf 100644
--- a/src/util/time_lua.inl
+++ b/src/util/time_lua.inl
@@ -291,15 +291,7 @@ namespace {
  * UTC timezone.
  */
 [[codegen::luawrap]] std::string currentWallTime() {
-    std::time_t t = std::time(nullptr);
-    std::tm* utcTime = std::gmtime(&t);
-
-    std::string time = fmt::format(
-        "{:04d}-{:02d}-{:02d}T{:02d}:{:02d}:{:02d}",
-        utcTime->tm_year + 1900, utcTime->tm_mon + 1, utcTime->tm_mday,
-        utcTime->tm_hour, utcTime->tm_min, utcTime->tm_sec
-    );
-    return time;
+    return openspace::Time::currentWallTime();
 }
 
 /**
@@ -323,77 +315,30 @@ namespace {
                                                    std::variant<std::string, double> base,
                                                  std::variant<std::string, double> change)
 {
-    using namespace openspace;
-
-    double j2000Seconds = -1.0;
-    bool usesISO = false;
+    std::string b;
     if (std::holds_alternative<std::string>(base)) {
-        j2000Seconds = Time::convertTime(std::get<std::string>(base));
-        usesISO = true;
+        b = std::get<std::string>(base);
     }
     else {
-        j2000Seconds = std::get<double>(base);
-        usesISO = false;
+        b = openspace::Time(std::get<double>(base)).ISO8601();
     }
-
-    double dt = 0.0;
-    if (std::holds_alternative<double>(change)) {
-        dt = std::get<double>(change);
+    
+    std::string c;
+    if (std::holds_alternative<std::string>(change)) {
+        c = std::get<std::string>(change);
     }
     else {
-        std::string modifier = std::get<std::string>(change);
-        if (modifier.empty()) {
-            throw ghoul::lua::LuaError("Modifier string must not be empty");
-        }
-        ghoul::trimWhitespace(modifier);
-        bool isNegative = false;
-        if (modifier[0] == '-') {
-            isNegative = true;
-            modifier = modifier.substr(1);
-        }
-
-        auto it = std::find_if(
-            modifier.begin(), modifier.end(),
-            [](unsigned char c) {
-                const bool digit = std::isdigit(c) != 0;
-                const bool isDot = c == '.';
-                return !digit && !isDot;
-            }
-        );
-
-        try {
-            double value = std::stod(std::string(modifier.begin(), it));
-            std::string uName = std::string(it, modifier.end());
-
-            TimeUnit unit = TimeUnit::Second;
-            if (uName == "s")       { unit = TimeUnit::Second; }
-            else if (uName == "m") { unit = TimeUnit::Minute; }
-            else if (uName == "h") { unit = TimeUnit::Hour; }
-            else if (uName == "d") { unit = TimeUnit::Day; }
-            else if (uName == "M") { unit = TimeUnit::Month; }
-            else if (uName == "y") { unit = TimeUnit::Year; }
-            else {
-                throw ghoul::lua::LuaError(fmt::format("Unknown unit '{}'", uName));
-            }
-
-            dt = convertTime(value, unit, TimeUnit::Second);
-            if (isNegative) {
-                dt *= -1.0;
-            }
-        }
-        catch (...) {
-            throw ghoul::lua::LuaError(fmt::format(
-                "Error parsing relative time offset '{}'", modifier
-            ));
-        }
+        double v = std::get<double>(change);
+        c = fmt::format("{}s", v);
     }
 
-    if (usesISO) {
-        std::string_view ret = Time(j2000Seconds + dt).ISO8601();
-        return std::string(ret);
+    std::string res = openspace::Time::advancedTime(std::move(b), std::move(c));
+
+    if (std::holds_alternative<std::string>(base)) {
+        return res;
     }
     else {
-        return j2000Seconds + dt;
+        return openspace::Time::convertTime(res);
     }
 }
 
diff --git a/src/util/timemanager.cpp b/src/util/timemanager.cpp
index e400f3dec0..94ed7f7700 100644
--- a/src/util/timemanager.cpp
+++ b/src/util/timemanager.cpp
@@ -941,13 +941,17 @@ void TimeManager::setTimeFromProfile(const Profile& p) {
     if (p.time.has_value()) {
         switch (p.time->type) {
             case Profile::Time::Type::Relative:
-                Time::setTimeRelativeFromProfile(p.time->value);
+            {
+                std::string t = Time::currentWallTime();
+                std::variant<std::string, double> t2 =
+                    Time::advancedTime(t, p.time->value);
+                ghoul_assert(std::holds_alternative<std::string>(t2), "Wrong type");
+                _currentTime.data() = Time(std::get<std::string>(t2));
                 break;
-
+            }
             case Profile::Time::Type::Absolute:
-                Time::setTimeAbsoluteFromProfile(p.time->value);
+                _currentTime.data() = Time(p.time->value);
                 break;
-
             default:
                 throw ghoul::MissingCaseException();
         }
@@ -956,8 +960,7 @@ void TimeManager::setTimeFromProfile(const Profile& p) {
     }
     else {
         // No value was specified so we are using 'now' instead
-        std::string now = std::string(Time::now().UTC());
-        Time::setTimeAbsoluteFromProfile(now);
+        _currentTime.data() = Time::now();
     }
 }
 

From 30b80843c34273ef9f30eb785e496f2eb259e4d8 Mon Sep 17 00:00:00 2001
From: Alexander Bock <mail@alexanderbock.eu>
Date: Thu, 3 Aug 2023 14:46:39 +0200
Subject: [PATCH 066/701] Add a new Lua function that resets the camera back to
 the start position (closes #2825)

---
 src/engine/openspaceengine.cpp     | 34 +++++++++++++++++++++---------
 src/engine/openspaceengine_lua.inl |  7 ++++++
 2 files changed, 31 insertions(+), 10 deletions(-)

diff --git a/src/engine/openspaceengine.cpp b/src/engine/openspaceengine.cpp
index 6e526a3f7d..10d9b57e69 100644
--- a/src/engine/openspaceengine.cpp
+++ b/src/engine/openspaceengine.cpp
@@ -1690,7 +1690,8 @@ scripting::LuaLibrary OpenSpaceEngine::luaLibrary() {
             codegen::lua::CreateSingleColorImage,
             codegen::lua::IsMaster,
             codegen::lua::Version,
-            codegen::lua::ReadCSVFile
+            codegen::lua::ReadCSVFile,
+            codegen::lua::ResetCamera
         },
         {
             absPath("${SCRIPTS}/core_scripts.lua")
@@ -1717,19 +1718,28 @@ void setCameraFromProfile(const Profile& p) {
         return;
     }
 
+    auto checkNodeExists = [](const std::string& node) {
+        if (global::renderEngine->scene()->sceneGraphNode(node) == nullptr) {
+            throw ghoul::RuntimeError(fmt::format("Could not find node '{}'", node));
+        }
+    };
+
     std::visit(
-        overloaded{
-            [](const Profile::CameraNavState& navStateProfile) {
+        overloaded {
+            [&checkNodeExists](const Profile::CameraNavState& navStateProfile) {
                 interaction::NavigationState nav;
                 nav.anchor = navStateProfile.anchor;
+                checkNodeExists(nav.anchor);
                 if (navStateProfile.aim.has_value()) {
                     nav.aim = navStateProfile.aim.value();
+                    checkNodeExists(nav.aim);
                 }
                 if (navStateProfile.referenceFrame.empty()) {
                     nav.referenceFrame = nav.anchor;
                 }
                 else {
                     nav.referenceFrame = navStateProfile.referenceFrame;
+                    checkNodeExists(navStateProfile.referenceFrame);
                 }
                 nav.position = navStateProfile.position;
                 if (navStateProfile.up.has_value()) {
@@ -1743,11 +1753,12 @@ void setCameraFromProfile(const Profile& p) {
                 }
                 global::navigationHandler->setNavigationStateNextFrame(nav);
             },
-            [](const Profile::CameraGoToGeo& geo) {
-                // Instead of direct calls to navigation state code, lua commands with
+            [&checkNodeExists](const Profile::CameraGoToGeo& geo) {
+                // Instead of direct calls to navigation state code, Lua commands with
                 // globebrowsing goToGeo are used because this prevents a module
                 // dependency in this core code. Eventually, goToGeo will be incorporated
                 // in the OpenSpace core and this code will change.
+                checkNodeExists(geo.anchor);
                 std::string geoScript = fmt::format("openspace.globebrowsing.goToGeo"
                     "([[{}]], {}, {}", geo.anchor, geo.latitude, geo.longitude);
                 if (geo.altitude.has_value()) {
@@ -1759,13 +1770,16 @@ void setCameraFromProfile(const Profile& p) {
                     scripting::ScriptEngine::RemoteScripting::Yes
                 );
             },
-            [](const Profile::CameraGoToNode& node) {
+            [&checkNodeExists](const Profile::CameraGoToNode& node) {
                 using namespace interaction;
-                NodeCameraStateSpec spec;
-                spec.identifier = node.anchor;
-                spec.height = node.height;
-                spec.useTargetUpDirection = true;
 
+                checkNodeExists(node.anchor);
+
+                NodeCameraStateSpec spec = {
+                    .identifier = node.anchor,
+                    .height = node.height,
+                    .useTargetUpDirection = true
+                };
                 global::navigationHandler->setCameraFromNodeSpecNextFrame(spec);
             }
         },
diff --git a/src/engine/openspaceengine_lua.inl b/src/engine/openspaceengine_lua.inl
index 96a7d0c29d..8c57caf881 100644
--- a/src/engine/openspaceengine_lua.inl
+++ b/src/engine/openspaceengine_lua.inl
@@ -228,4 +228,11 @@ namespace {
     return res;
 }
 
+/**
+ * Resets the camera position to the same position where the profile originally started
+ */
+[[codegen::luawrap]] void resetCamera() {
+    openspace::setCameraFromProfile(*openspace::global::profile);
+}
+
 #include "openspaceengine_lua_codegen.cpp"

From 8d42537d6d7d4f5a42004ae7d02e6b4184ed431b Mon Sep 17 00:00:00 2001
From: Alexander Bock <mail@alexanderbock.eu>
Date: Thu, 3 Aug 2023 15:34:13 +0200
Subject: [PATCH 067/701] Set the user position to be (0,0,0) which fixed the
 creation of Fisheye configurations (closes #2818)

---
 apps/OpenSpace/ext/launcher/src/sgctedit/sgctedit.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/apps/OpenSpace/ext/launcher/src/sgctedit/sgctedit.cpp b/apps/OpenSpace/ext/launcher/src/sgctedit/sgctedit.cpp
index 2f15244b02..2a98f99b78 100644
--- a/apps/OpenSpace/ext/launcher/src/sgctedit/sgctedit.cpp
+++ b/apps/OpenSpace/ext/launcher/src/sgctedit/sgctedit.cpp
@@ -498,7 +498,7 @@ void SgctEdit::generateConfigUsers() {
     if (!_didImportValues) {
         sgct::config::User user;
         user.eyeSeparation = 0.065f;
-        user.position = { 0.f, 0.f, 4.f };
+        user.position = { 0.f, 0.f, 0.f };
         _cluster.users = { user };
     }
 }

From ecb8b06df6cf74131aa8c3c7a3ee6c1a894e7ce1 Mon Sep 17 00:00:00 2001
From: Alexander Bock <mail@alexanderbock.eu>
Date: Thu, 3 Aug 2023 16:57:01 +0200
Subject: [PATCH 068/701] Add new Lua function to remove all loaded assets
 (closes #2812).  Fix crash that would occur when trying to unload an asset
 that requires a root asset

---
 include/openspace/scene/assetmanager.h | 17 ++++++++++++++++
 src/scene/asset.cpp                    | 10 +++++++---
 src/scene/assetmanager.cpp             | 18 ++++++++++++++++-
 src/scene/assetmanager_lua.inl         | 27 ++++++++++++++++++++++++++
 4 files changed, 68 insertions(+), 4 deletions(-)

diff --git a/include/openspace/scene/assetmanager.h b/include/openspace/scene/assetmanager.h
index 7c4a4d42d4..6343d07653 100644
--- a/include/openspace/scene/assetmanager.h
+++ b/include/openspace/scene/assetmanager.h
@@ -92,8 +92,25 @@ public:
      */
     std::vector<const Asset*> allAssets() const;
 
+    /**
+     * Returns all root assets, which are assets that have been loaded directly from the
+     * profile or by calling the #add method.
+     *
+     * \return A list of all root assets
+     */
+    std::vector<const Asset*> rootAssets() const;
+
     std::vector<const ResourceSynchronization*> allSynchronizations() const;
 
+    /**
+     * Returns whether the provided \p asset has been loaded directly by the user or
+     * loaded through a profile file.
+     *
+     * \param asset The asset that should be tested
+     * \return Whether the \p asset has been loaded directly or included in a profile
+     */
+    bool isRootAsset(const Asset* asset) const;
+
     /**
      * Loads the provided \p asset as a child of the provided \p parent. Loading an asset
      * means that asset file gets executed and the meta information is extracted from it.
diff --git a/src/scene/asset.cpp b/src/scene/asset.cpp
index b8e3fe806c..e25f119d12 100644
--- a/src/scene/asset.cpp
+++ b/src/scene/asset.cpp
@@ -260,10 +260,12 @@ void Asset::unload() {
 
         child->_parentAssets.erase(parentIt);
 
-        if (!child->hasInitializedParent()) {
+        // We only want to deinitialize the child if noone is keeping track of it,
+        // which is either a still initialized parent or that it is loaded as a root
+        if (!child->hasInitializedParent() && !_manager.isRootAsset(child)) {
             child->deinitialize();
         }
-        if (!child->hasLoadedParent()) {
+        if (!child->hasLoadedParent() && !_manager.isRootAsset(child)) {
             child->unload();
         }
     }
@@ -324,7 +326,9 @@ void Asset::deinitialize() {
 
     // 1. Deinitialize unwanted requirements
     for (Asset* dependency : _requiredAssets) {
-        if (!dependency->hasInitializedParent()) {
+        // We only want to deinitialize the dependency if noone is keeping track of it,
+        // which is either a still initialized parent or that it is loaded as a root
+        if (!dependency->hasInitializedParent() && !_manager.isRootAsset(dependency)) {
             dependency->deinitialize();
         }
     }
diff --git a/src/scene/assetmanager.cpp b/src/scene/assetmanager.cpp
index 6bc58caa48..418ff1e5fa 100644
--- a/src/scene/assetmanager.cpp
+++ b/src/scene/assetmanager.cpp
@@ -320,6 +320,15 @@ std::vector<const Asset*> AssetManager::allAssets() const {
     return res;
 }
 
+std::vector<const Asset*> AssetManager::rootAssets() const {
+    std::vector<const Asset*> res;
+    res.reserve(_rootAssets.size());
+    for (Asset* asset : _rootAssets) {
+        res.push_back(asset);
+    }
+    return res;
+}
+
 std::vector<const ResourceSynchronization*> AssetManager::allSynchronizations() const {
     std::vector<const ResourceSynchronization*> res;
     res.reserve(_synchronizations.size());
@@ -331,6 +340,11 @@ std::vector<const ResourceSynchronization*> AssetManager::allSynchronizations()
     return res;
 }
 
+bool AssetManager::isRootAsset(const Asset* asset) const {
+    auto it = std::find(_rootAssets.begin(), _rootAssets.end(), asset);
+    return it != _rootAssets.end();
+}
+
 bool AssetManager::loadAsset(Asset* asset, Asset* parent) {
     ghoul_precondition(asset, "Asset must not be nullptr");
 
@@ -941,8 +955,10 @@ scripting::LuaLibrary AssetManager::luaLibrary() {
         {
             codegen::lua::Add,
             codegen::lua::Remove,
+            codegen::lua::RemoveAll,
             codegen::lua::IsLoaded,
-            codegen::lua::AllAssets
+            codegen::lua::AllAssets,
+            codegen::lua::RootAssets
         }
     };
 }
diff --git a/src/scene/assetmanager_lua.inl b/src/scene/assetmanager_lua.inl
index 6a56192b38..d3a7e181ca 100644
--- a/src/scene/assetmanager_lua.inl
+++ b/src/scene/assetmanager_lua.inl
@@ -41,6 +41,18 @@ namespace {
     openspace::global::openSpaceEngine->assetManager().remove(assetName);
 }
 
+/**
+ * Removes all assets that are currently loaded
+ */
+[[codegen::luawrap]] void removeAll() {
+    using namespace openspace;
+    std::vector<const Asset*> as = global::openSpaceEngine->assetManager().rootAssets();
+    std::reverse(as.begin(), as.end());
+    for (const Asset* asset : as) {
+        global::openSpaceEngine->assetManager().remove(asset->path().string());
+    }
+}
+
 /**
  * Returns true if the referenced asset already has been loaded. Otherwise false is
  * returned. The parameter to this function is the path of the asset that should be
@@ -72,6 +84,21 @@ namespace {
     return res;
 }
 
+/**
+ * Returns the paths to all loaded root assets, which are assets that are loaded directly
+ * either through a profile or by calling the `openspace.asset.add` method.
+ */
+[[codegen::luawrap]] std::vector<std::string> rootAssets() {
+    using namespace openspace;
+    std::vector<const Asset*> as = global::openSpaceEngine->assetManager().rootAssets();
+    std::vector<std::string> res;
+    res.reserve(as.size());
+    for (const Asset* a : as) {
+        res.push_back(a->path().string());
+    }
+    return res;
+}
+
 #include "assetmanager_lua_codegen.cpp"
 
 } // namespace

From 1593ab50aa69363b77377ca048b9811251d5845a Mon Sep 17 00:00:00 2001
From: Alexander Bock <mail@alexanderbock.eu>
Date: Thu, 3 Aug 2023 18:55:54 +0200
Subject: [PATCH 069/701] Rename TileLayer to TileProvider classes (closes
 #2767).

Breaking change in assets that load Layers:
 - DefaultTileLayer -> DefaultTileProvider
 - SingleImageTileLayer -> SingleImageProvider
 - ImageSequenceTileLayer -> ImageSequenceTileProvider
 - SpoutImageTileLayer -> SpoutImageProvider
 - TemporalTileLayer -> TemporalTileProvider
 - TileIndexTileLayer -> TileIndexTileProvider
 - SizeReferenceTileLayer -> SizeReferenceTileProvider
 - ByLevelTileLayer -> TileProviderByLevel
 - ByIndexTileLayer -> TileProviderByIndex
---
 .../examples/temperature_land_highres.asset   |  4 +-
 ...om_w1_sea_ice_concentration_temporal.asset |  2 +-
 .../colorlayers/aqua_modis_temporal.asset     |  2 +-
 .../colorlayers/esri_noaa20_combo.asset       |  4 +-
 .../layers/colorlayers/esri_viirs_combo.asset |  4 +-
 ...mur_sea_surface_temperature_temporal.asset |  2 +-
 .../modis_terra_chlorophyll_a_temporal.asset  |  2 +-
 .../colorlayers/terra_modis_temporal.asset    |  2 +-
 .../colorlayers/terra_texture_spout.asset     |  2 +-
 .../colorlayers/viirs_noaa20_temporal.asset   |  2 +-
 .../colorlayers/viirs_snpp_temporal.asset     |  2 +-
 .../nightlayers/earth_at_night_temporal.asset |  2 +-
 .../earth_at_night_temporal_blue_yellow.asset |  2 +-
 .../layers/overlays/size_reference.asset      |  2 +-
 .../earth/layers/overlays/tile_indices.asset  |  2 +-
 .../moon/layers/overlays/size_reference.asset |  2 +-
 .../moon/layers/overlays/tile_indices.asset   |  2 +-
 .../atmosphere/2000_carbon_monoxide.asset     |  2 +-
 .../atmosphere/2004_ir_hurricane.asset        |  2 +-
 .../atmosphere/2005_hurricane-grayir.asset    |  2 +-
 .../atmosphere/2005_hurricane-wvsst.asset     |  2 +-
 .../noaa-sos/atmosphere/2012_hurricane.asset  |  4 +-
 .../atmosphere/aerosol_blackcarbon.asset      |  2 +-
 .../aerosol_blackcarbon_and_sulfate.asset     |  2 +-
 .../noaa-sos/atmosphere/aerosol_sulfate.asset |  2 +-
 .../noaa-sos/atmosphere/airtraffic.asset      |  2 +-
 .../earth/noaa-sos/atmosphere/all_sats.asset  |  2 +-
 .../noaa-sos/atmosphere/aqua_swath.asset      |  2 +-
 .../noaa-sos/atmosphere/carbonflux.asset      |  2 +-
 .../carbontracker_2000_2100-fixed_scale.asset |  4 +-
 ...arbontracker_2000_2100-sliding_scale.asset |  4 +-
 .../earth/noaa-sos/atmosphere/co_gmd.asset    |  2 +-
 .../earth/noaa-sos/atmosphere/fim_chem.asset  |  2 +-
 .../noaa-sos/atmosphere/fossil_fuel.asset     |  2 +-
 .../earth/noaa-sos/atmosphere/fukushima.asset |  2 +-
 .../earth/noaa-sos/atmosphere/geo_sat.asset   |  2 +-
 .../earth/noaa-sos/atmosphere/geo_scan.asset  |  2 +-
 .../noaa-sos/atmosphere/giss_temp_anom.asset  |  2 +-
 .../atmosphere/globe-insolation.asset         |  2 +-
 .../noaa-sos/atmosphere/globe-rainfall.asset  |  2 +-
 .../atmosphere/harvey-clouds_precip.asset     |  2 +-
 .../atmosphere/hurricane_season_2017.asset    |  2 +-
 .../hurricane_season_2017_wvsst.asset         |  2 +-
 .../earth/noaa-sos/atmosphere/isaac.asset     |  4 +-
 .../earth/noaa-sos/atmosphere/land_temp.asset |  2 +-
 .../noaa-sos/atmosphere/ltg_vaisala.asset     |  2 +-
 .../earth/noaa-sos/atmosphere/nasa_sats.asset |  2 +-
 .../atmosphere/nccs_models-carbon.asset       |  2 +-
 .../atmosphere/nccs_models-chem.asset         |  2 +-
 .../atmosphere/nccs_models-winds.asset        |  2 +-
 .../earth/noaa-sos/atmosphere/no2_omsi.asset  |  2 +-
 .../earth/noaa-sos/atmosphere/pclim.asset     |  2 +-
 .../earth/noaa-sos/atmosphere/poes_sat.asset  |  2 +-
 .../atmosphere/reanalysis-antarctic.asset     |  2 +-
 .../atmosphere/reanalysis-elnino.asset        |  2 +-
 .../atmosphere/reanalysis-hurricane.asset     |  2 +-
 .../earth/noaa-sos/atmosphere/sandy.asset     |  2 +-
 .../noaa-sos/atmosphere/sunsync_sat.asset     |  2 +-
 .../earth/noaa-sos/atmosphere/temp_anom.asset |  2 +-
 .../atmosphere/typhoon_haiyan-wvsst.asset     |  2 +-
 .../noaa-sos/atmosphere/typhoon_haiyan.asset  |  2 +-
 .../noaa-sos/atmosphere/volcano_ash.asset     |  2 +-
 .../planets/earth/noaa-sos/land/birds.asset   |  2 +-
 .../land/blue_marble-blue_marble_topo.asset   |  2 +-
 .../blue_marble-blue_marble_topo_bathy.asset  |  2 +-
 .../land/blue_marble-nightlights.asset        |  2 +-
 .../blue_marble-seasonal_blue_marble.asset    |  2 +-
 .../earth/noaa-sos/land/dams-global.asset     |  2 +-
 .../noaa-sos/land/dams-mississippi.asset      |  2 +-
 .../earth/noaa-sos/land/dams-yangtze.asset    |  2 +-
 .../noaa-sos/land/day_night-06z_only.asset    |  2 +-
 .../noaa-sos/land/day_night-full_year.asset   |  2 +-
 .../noaa-sos/land/day_night-oneday.asset      |  2 +-
 .../land/earthquake-1980_1995_quakes.asset    |  2 +-
 .../land/earthquakes_and_eruptions.asset      |  2 +-
 .../earths_magnetism_magnetic_lines.asset     |  2 +-
 .../land/earths_magnetism_magnets.asset       |  2 +-
 .../planets/earth/noaa-sos/land/fire.asset    |  2 +-
 .../earth/noaa-sos/land/fire_veg.asset        |  2 +-
 .../noaa-sos/land/global_vegetation.asset     |  2 +-
 .../earth/noaa-sos/land/hot_topo.asset        |  2 +-
 .../noaa-sos/land/irsat_nightlights.asset     |  2 +-
 .../earth/noaa-sos/land/japan_quake.asset     |  2 +-
 .../koppen_climate-koppen_1901_2100.asset     |  2 +-
 .../noaa-sos/land/land_cover-animation.asset  |  2 +-
 .../earth/noaa-sos/land/land_ratio.asset      |  2 +-
 .../noaa-sos/land/magnetic_declination.asset  |  2 +-
 .../noaa-sos/land/nuclear_earthquake.asset    |  2 +-
 .../earth/noaa-sos/land/plate_movement.asset  |  2 +-
 .../noaa-sos/land/river_discharge_2010.asset  |  2 +-
 .../land/seismic_waves-1994northridge.asset   |  2 +-
 .../noaa-sos/land/surface_temperature.asset   |  2 +-
 .../earth/noaa-sos/models/bm10000.asset       |  2 +-
 .../earth/noaa-sos/models/gfdl_seaice.asset   |  2 +-
 .../noaa-sos/models/ipcc_temp-ccsm-a1b.asset  |  2 +-
 .../noaa-sos/models/ipcc_temp-ccsm-b1.asset   |  2 +-
 .../noaa-sos/models/ipcc_temp-gfdl-a1b.asset  |  2 +-
 .../noaa-sos/models/ipcc_temp-gfdl-b1.asset   |  2 +-
 .../noaa-sos/models/ipcc_temp-had-a1b.asset   |  2 +-
 .../noaa-sos/models/ipcc_temp-had-b1.asset    |  2 +-
 .../earth/noaa-sos/models/rcp-ga26.asset      |  2 +-
 .../earth/noaa-sos/models/rcp-ga45.asset      |  2 +-
 .../earth/noaa-sos/models/rcp-ga60.asset      |  2 +-
 .../earth/noaa-sos/models/rcp-ga85.asset      |  2 +-
 .../earth/noaa-sos/models/ukmet-a1b.asset     |  2 +-
 .../earth/noaa-sos/models/ukmet-e1.asset      |  2 +-
 .../noaa-sos/oceans/2009_ice_animation.asset  |  2 +-
 .../noaa-sos/oceans/animal_tracking.asset     |  2 +-
 .../noaa-sos/oceans/argo_buoy_tracks.asset    |  2 +-
 .../noaa-sos/oceans/argo_buoy_waterfall.asset |  2 +-
 .../earth/noaa-sos/oceans/atl_turtle.asset    |  2 +-
 .../noaa-sos/oceans/chlorophyll_model.asset   |  2 +-
 .../noaa-sos/oceans/ecco2_sst-gray_land.asset |  2 +-
 .../noaa-sos/oceans/ecco2_sst-veg_land.asset  |  2 +-
 .../oceans/gfdl_sst-black_background.asset    |  2 +-
 .../oceans/gfdl_sst-land_background.asset     |  2 +-
 .../noaa-sos/oceans/greenland_melt.asset      |  2 +-
 .../noaa-sos/oceans/japan_tsunami_waves.asset |  2 +-
 .../oceans/loggerheadseaturtletracks.asset    |  2 +-
 .../oceans/mexico_turtles_947293.asset        |  2 +-
 .../oceans/mexico_turtles_958002.asset        |  2 +-
 .../earth/noaa-sos/oceans/modis_sst.asset     |  2 +-
 .../earth/noaa-sos/oceans/nasa_speed.asset    |  2 +-
 .../earth/noaa-sos/oceans/nasa_sst.asset      |  2 +-
 .../noaa-sos/oceans/ocean_acid-co2_flux.asset |  2 +-
 .../earth/noaa-sos/oceans/ocean_acid-ph.asset |  2 +-
 .../oceans/ocean_acid-saturation.asset        |  2 +-
 .../noaa-sos/oceans/ocean_depths_temp.asset   |  4 +-
 .../noaa-sos/oceans/ocean_drain-gray.asset    |  2 +-
 .../earth/noaa-sos/oceans/pac_turtle.asset    |  2 +-
 .../earth/noaa-sos/oceans/phytoplankton.asset |  2 +-
 .../earth/noaa-sos/oceans/pr_tsunami.asset    |  2 +-
 .../earth/noaa-sos/oceans/sea_level.asset     |  2 +-
 .../oceans/sea_surface_height_anomaly.asset   |  2 +-
 .../noaa-sos/oceans/seaice_monthly.asset      |  2 +-
 .../oceans/seawifs-land_background.asset      |  2 +-
 .../noaa-sos/oceans/seawifs-no_holes.asset    |  2 +-
 .../noaa-sos/oceans/seawifs-polar_holes.asset |  2 +-
 .../planets/earth/noaa-sos/oceans/shark.asset |  2 +-
 .../planets/earth/noaa-sos/oceans/sss.asset   |  2 +-
 .../earth/noaa-sos/oceans/sst_1980_1999.asset |  2 +-
 .../earth/noaa-sos/oceans/vector_winds.asset  |  2 +-
 .../oceans/vent_discoveries_animation.asset   |  2 +-
 .../earth/noaa-sos/oceans/vorticity.asset     |  2 +-
 .../oceans/waves-wave_height_2012.asset       |  2 +-
 .../oceans/waves-wave_height_katrina.asset    |  2 +-
 .../oceans/waves-wave_height_sandy.asset      |  2 +-
 .../oceans/waves-wave_power_2012.asset        |  2 +-
 .../oceans/weeklyseaice-10day_seaice.asset    |  2 +-
 .../oceans/weeklyseaice-sept_seaice.asset     |  2 +-
 .../mars/layers/overlays/indices.asset        |  2 +-
 .../mars/layers/overlays/size_reference.asset |  2 +-
 .../colorlayers/clouds_magellan_combo.asset   |  2 +-
 .../clouds_magellan_combo_newyork.asset       |  2 +-
 modules/globebrowsing/globebrowsingmodule.cpp | 18 ++---
 .../shaders/texturetilemapping.glsl           | 18 ++---
 modules/globebrowsing/src/gpulayergroup.cpp   | 40 +++++-----
 modules/globebrowsing/src/layer.cpp           | 73 ++++++++++---------
 modules/globebrowsing/src/layergroupid.h      | 60 +++++++--------
 .../src/tileprovider/tileproviderbyindex.cpp  |  4 +-
 .../src/tileprovider/tileproviderbylevel.cpp  |  2 +-
 modules/video/videomodule.cpp                 |  2 +-
 162 files changed, 271 insertions(+), 270 deletions(-)

diff --git a/data/assets/examples/temperature_land_highres.asset b/data/assets/examples/temperature_land_highres.asset
index 5fbe0db6e5..75217b70df 100644
--- a/data/assets/examples/temperature_land_highres.asset
+++ b/data/assets/examples/temperature_land_highres.asset
@@ -13,7 +13,7 @@ local path = asset.syncedResource({
 local LayerPrototype = {
   Identifier = "ERA5_Land_HighRes_Monthly_2M_Temperature_Temporal_prototype",
   Name = "ERA5 Land HighRes Monthly 2M Temperature (Temporal) [Prototype]",
-  Type = "TemporalTileLayer",
+  Type = "TemporalTileProvider",
   Mode = "Prototyped",
   Prototyped = {
     Time = {
@@ -32,7 +32,7 @@ local LayerPrototype = {
 local LayerFolder = {
   Identifier = "ERA5_Land_HighRes_Monthly_2M_Temperature_Temporal_folder",
   Name = "ERA5 Land HighRes Monthly 2M Temperature (Temporal) [Folder]",
-  Type = "TemporalTileLayer",
+  Type = "TemporalTileProvider",
   Mode = "Folder",
   Folder = {
     Folder = path,
diff --git a/data/assets/scene/solarsystem/planets/earth/layers/colorlayers/amsr2_gcom_w1_sea_ice_concentration_temporal.asset b/data/assets/scene/solarsystem/planets/earth/layers/colorlayers/amsr2_gcom_w1_sea_ice_concentration_temporal.asset
index 1eccf39e08..5a41542027 100644
--- a/data/assets/scene/solarsystem/planets/earth/layers/colorlayers/amsr2_gcom_w1_sea_ice_concentration_temporal.asset
+++ b/data/assets/scene/solarsystem/planets/earth/layers/colorlayers/amsr2_gcom_w1_sea_ice_concentration_temporal.asset
@@ -6,7 +6,7 @@ local Layer = {
   Identifier = "AMSR2_GCOM_W1_Sea_Ice_Concentration_Temporal",
   Name = "AMSR2 GCOM W1 Sea Ice Concentration (Temporal)",
   Enabled = asset.enabled,
-  Type = "TemporalTileLayer",
+  Type = "TemporalTileProvider",
   Mode = "Prototyped",
   Prototyped = {
     Time = {
diff --git a/data/assets/scene/solarsystem/planets/earth/layers/colorlayers/aqua_modis_temporal.asset b/data/assets/scene/solarsystem/planets/earth/layers/colorlayers/aqua_modis_temporal.asset
index 10cc8fa385..b175332afd 100644
--- a/data/assets/scene/solarsystem/planets/earth/layers/colorlayers/aqua_modis_temporal.asset
+++ b/data/assets/scene/solarsystem/planets/earth/layers/colorlayers/aqua_modis_temporal.asset
@@ -6,7 +6,7 @@ local Layer = {
   Identifier = "Aqua_Modis_Temporal",
   Name = "Aqua Modis (Temporal)",
   Enabled = asset.enabled,
-  Type = "TemporalTileLayer",
+  Type = "TemporalTileProvider",
   Mode = "Prototyped",
   Prototyped = {
     Time = {
diff --git a/data/assets/scene/solarsystem/planets/earth/layers/colorlayers/esri_noaa20_combo.asset b/data/assets/scene/solarsystem/planets/earth/layers/colorlayers/esri_noaa20_combo.asset
index 6ab7e6c7e6..82dbdcf012 100644
--- a/data/assets/scene/solarsystem/planets/earth/layers/colorlayers/esri_noaa20_combo.asset
+++ b/data/assets/scene/solarsystem/planets/earth/layers/colorlayers/esri_noaa20_combo.asset
@@ -6,14 +6,14 @@ local Layer = {
   Identifier = "ESRI_NOAA20_Combo",
   Name = "ESRI NOAA20 Combo",
   Enabled = asset.enabled,
-  Type = "ByLevelTileLayer",
+  Type = "TileProviderByLevel",
   LevelTileProviders = {
     {
       MaxLevel = 4,
       TileProvider = {
         Identifier = "Temporal_VIIRS_NOAA20",
         Name = "Temporal VIIRS NOAA20",
-        Type = "TemporalTileLayer",
+        Type = "TemporalTileProvider",
         Mode = "Prototyped",
         Prototyped = {
           Time = {
diff --git a/data/assets/scene/solarsystem/planets/earth/layers/colorlayers/esri_viirs_combo.asset b/data/assets/scene/solarsystem/planets/earth/layers/colorlayers/esri_viirs_combo.asset
index 8a3bb8da0a..4449baadd4 100644
--- a/data/assets/scene/solarsystem/planets/earth/layers/colorlayers/esri_viirs_combo.asset
+++ b/data/assets/scene/solarsystem/planets/earth/layers/colorlayers/esri_viirs_combo.asset
@@ -6,14 +6,14 @@ local Layer = {
   Identifier = "ESRI_VIIRS_Combo",
   Name = "ESRI VIIRS Combo",
   Enabled = asset.enabled,
-  Type = "ByLevelTileLayer",
+  Type = "TileProviderByLevel",
   LevelTileProviders = {
     {
       MaxLevel = 4,
       TileProvider = {
         Identifier = "Temporal_VIIRS_SNPP",
         Name = "Temporal VIIRS SNPP",
-        Type = "TemporalTileLayer",
+        Type = "TemporalTileProvider",
         Mode = "Prototyped",
         Prototyped = {
           Time = {
diff --git a/data/assets/scene/solarsystem/planets/earth/layers/colorlayers/ghrsst_l4_mur_sea_surface_temperature_temporal.asset b/data/assets/scene/solarsystem/planets/earth/layers/colorlayers/ghrsst_l4_mur_sea_surface_temperature_temporal.asset
index fc016ab893..19212a0627 100644
--- a/data/assets/scene/solarsystem/planets/earth/layers/colorlayers/ghrsst_l4_mur_sea_surface_temperature_temporal.asset
+++ b/data/assets/scene/solarsystem/planets/earth/layers/colorlayers/ghrsst_l4_mur_sea_surface_temperature_temporal.asset
@@ -6,7 +6,7 @@ local Layer = {
   Identifier = "GHRSST_L4_MUR_Sea_Surface_Temperature_Temporal",
   Name = "GHRSST L4 MUR Sea Surface Temperature (Temporal)",
   Enabled = asset.enabled,
-  Type = "TemporalTileLayer",
+  Type = "TemporalTileProvider",
   Mode = "Prototyped",
   Prototyped = {
     Time = {
diff --git a/data/assets/scene/solarsystem/planets/earth/layers/colorlayers/modis_terra_chlorophyll_a_temporal.asset b/data/assets/scene/solarsystem/planets/earth/layers/colorlayers/modis_terra_chlorophyll_a_temporal.asset
index 12dcbb3d36..dda1ca392f 100644
--- a/data/assets/scene/solarsystem/planets/earth/layers/colorlayers/modis_terra_chlorophyll_a_temporal.asset
+++ b/data/assets/scene/solarsystem/planets/earth/layers/colorlayers/modis_terra_chlorophyll_a_temporal.asset
@@ -6,7 +6,7 @@ local Layer = {
   Identifier = "MODIS_Terra_Chlorophyll_A_Temporal",
   Name = "MODIS Terra Chlorophyll A (Temporal)",
   Enabled = asset.enabled,
-  Type = "TemporalTileLayer",
+  Type = "TemporalTileProvider",
   Mode = "Prototyped",
   Prototyped = {
     Time = {
diff --git a/data/assets/scene/solarsystem/planets/earth/layers/colorlayers/terra_modis_temporal.asset b/data/assets/scene/solarsystem/planets/earth/layers/colorlayers/terra_modis_temporal.asset
index d58a03a00b..7d268390f8 100644
--- a/data/assets/scene/solarsystem/planets/earth/layers/colorlayers/terra_modis_temporal.asset
+++ b/data/assets/scene/solarsystem/planets/earth/layers/colorlayers/terra_modis_temporal.asset
@@ -6,7 +6,7 @@ local Layer = {
   Identifier = "Terra_Modis_Temporal",
   Name = "Terra Modis (Temporal)",
   Enabled = asset.enabled,
-  Type = "TemporalTileLayer",
+  Type = "TemporalTileProvider",
   Mode = "Prototyped",
   Prototyped = {
     Time = {
diff --git a/data/assets/scene/solarsystem/planets/earth/layers/colorlayers/terra_texture_spout.asset b/data/assets/scene/solarsystem/planets/earth/layers/colorlayers/terra_texture_spout.asset
index 7f83b74402..1fa4595d02 100644
--- a/data/assets/scene/solarsystem/planets/earth/layers/colorlayers/terra_texture_spout.asset
+++ b/data/assets/scene/solarsystem/planets/earth/layers/colorlayers/terra_texture_spout.asset
@@ -6,7 +6,7 @@ local Layer = {
   Identifier = "TextureSpout",
   Enabled = asset.enabled,
   SpoutName = "SPOUT_TERRA_RECEIVER",
-  Type = "SpoutImageTileLayer"
+  Type = "SpoutImageProvider"
 }
 
 
diff --git a/data/assets/scene/solarsystem/planets/earth/layers/colorlayers/viirs_noaa20_temporal.asset b/data/assets/scene/solarsystem/planets/earth/layers/colorlayers/viirs_noaa20_temporal.asset
index 4798202aa7..49f87efd0c 100644
--- a/data/assets/scene/solarsystem/planets/earth/layers/colorlayers/viirs_noaa20_temporal.asset
+++ b/data/assets/scene/solarsystem/planets/earth/layers/colorlayers/viirs_noaa20_temporal.asset
@@ -6,7 +6,7 @@ local Layer = {
   Identifier = "VIIRS_NOAA20_Temporal",
   Name = "VIIRS NOAA20 (Temporal)",
   Enabled = asset.enabled,
-  Type = "TemporalTileLayer",
+  Type = "TemporalTileProvider",
   Mode = "Prototyped",
   Prototyped = {
     Time = {
diff --git a/data/assets/scene/solarsystem/planets/earth/layers/colorlayers/viirs_snpp_temporal.asset b/data/assets/scene/solarsystem/planets/earth/layers/colorlayers/viirs_snpp_temporal.asset
index 81209d74a8..d6aebe676d 100644
--- a/data/assets/scene/solarsystem/planets/earth/layers/colorlayers/viirs_snpp_temporal.asset
+++ b/data/assets/scene/solarsystem/planets/earth/layers/colorlayers/viirs_snpp_temporal.asset
@@ -6,7 +6,7 @@ local Layer = {
   Identifier = "VIIRS_SNPP_Temporal",
   Name = "VIIRS SNPP (Temporal)",
   Enabled = asset.enabled,
-  Type = "TemporalTileLayer",
+  Type = "TemporalTileProvider",
   Mode = "Prototyped",
   Prototyped = {
     Time = {
diff --git a/data/assets/scene/solarsystem/planets/earth/layers/nightlayers/earth_at_night_temporal.asset b/data/assets/scene/solarsystem/planets/earth/layers/nightlayers/earth_at_night_temporal.asset
index cec806e322..db35ca1dc2 100644
--- a/data/assets/scene/solarsystem/planets/earth/layers/nightlayers/earth_at_night_temporal.asset
+++ b/data/assets/scene/solarsystem/planets/earth/layers/nightlayers/earth_at_night_temporal.asset
@@ -6,7 +6,7 @@ local Layer = {
   Identifier = "Earth_at_Night_Temporal",
   Name = "Earth at Night (Temporal)",
   Enabled = asset.enabled,
-  Type = "TemporalTileLayer",
+  Type = "TemporalTileProvider",
   Mode = "Prototyped",
   Prototyped = {
     Time = {
diff --git a/data/assets/scene/solarsystem/planets/earth/layers/nightlayers/earth_at_night_temporal_blue_yellow.asset b/data/assets/scene/solarsystem/planets/earth/layers/nightlayers/earth_at_night_temporal_blue_yellow.asset
index 0f017472f1..d53e454119 100644
--- a/data/assets/scene/solarsystem/planets/earth/layers/nightlayers/earth_at_night_temporal_blue_yellow.asset
+++ b/data/assets/scene/solarsystem/planets/earth/layers/nightlayers/earth_at_night_temporal_blue_yellow.asset
@@ -6,7 +6,7 @@ local Layer = {
   Identifier = "Earth_at_Night_Temporal_Blue_Yellow",
   Name = "Earth at Night Blue Yellow (Temporal)",
   Enabled = asset.enabled,
-  Type = "TemporalTileLayer",
+  Type = "TemporalTileProvider",
   Mode = "Prototyped",
   Prototyped = {
     Time = {
diff --git a/data/assets/scene/solarsystem/planets/earth/layers/overlays/size_reference.asset b/data/assets/scene/solarsystem/planets/earth/layers/overlays/size_reference.asset
index 5f6e75648b..4e3f0b46b8 100644
--- a/data/assets/scene/solarsystem/planets/earth/layers/overlays/size_reference.asset
+++ b/data/assets/scene/solarsystem/planets/earth/layers/overlays/size_reference.asset
@@ -6,7 +6,7 @@ local Layer ={
   Identifier = "Size_Reference",
   Name = "Size Reference",
   Enabled = asset.enabled,
-  Type = "SizeReferenceTileLayer",
+  Type = "SizeReferenceTileProvider",
   Radii = globe.Earth.Renderable.Radii
 }
 
diff --git a/data/assets/scene/solarsystem/planets/earth/layers/overlays/tile_indices.asset b/data/assets/scene/solarsystem/planets/earth/layers/overlays/tile_indices.asset
index 83acd1c8dd..b61a0713f2 100644
--- a/data/assets/scene/solarsystem/planets/earth/layers/overlays/tile_indices.asset
+++ b/data/assets/scene/solarsystem/planets/earth/layers/overlays/tile_indices.asset
@@ -6,7 +6,7 @@ local Layer = {
   Identifier = "Tile_Indices",
   Name = "Tile Indices",
   Enabled = asset.enabled,
-  Type = "TileIndexTileLayer"
+  Type = "TileIndexTileProvider"
 }
 
 
diff --git a/data/assets/scene/solarsystem/planets/earth/moon/layers/overlays/size_reference.asset b/data/assets/scene/solarsystem/planets/earth/moon/layers/overlays/size_reference.asset
index 684ffeb1fc..71193ff4cb 100644
--- a/data/assets/scene/solarsystem/planets/earth/moon/layers/overlays/size_reference.asset
+++ b/data/assets/scene/solarsystem/planets/earth/moon/layers/overlays/size_reference.asset
@@ -6,7 +6,7 @@ local Layer = {
   Identifier = "Size_Reference",
   Name = "Size Reference",
   Enabled = asset.enabled,
-  Type = "SizeReferenceTileLayer",
+  Type = "SizeReferenceTileProvider",
   Radii = globe.Moon.Renderable.Radii
 }
 
diff --git a/data/assets/scene/solarsystem/planets/earth/moon/layers/overlays/tile_indices.asset b/data/assets/scene/solarsystem/planets/earth/moon/layers/overlays/tile_indices.asset
index b1edc92ce2..ec88eb72fe 100644
--- a/data/assets/scene/solarsystem/planets/earth/moon/layers/overlays/tile_indices.asset
+++ b/data/assets/scene/solarsystem/planets/earth/moon/layers/overlays/tile_indices.asset
@@ -6,7 +6,7 @@ local Layer = {
   Identifier = "Tile_Indices",
   Name = "Tile Indices",
   Enabled = asset.enabled,
-  Type = "TileIndexTileLayer"
+  Type = "TileIndexTileProvider"
 }
 
 
diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/2000_carbon_monoxide.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/2000_carbon_monoxide.asset
index e75087f08e..e627c703e4 100644
--- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/2000_carbon_monoxide.asset
+++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/2000_carbon_monoxide.asset
@@ -29,7 +29,7 @@ local Layer = {
   Identifier = Identifier,
   Name = Name,
   Enabled = asset.enabled,
-  Type = "ImageSequenceTileLayer",
+  Type = "ImageSequenceTileProvider",
   FolderPath = syncedDirectory .. "1024",
   Description = Description
 }
diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/2004_ir_hurricane.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/2004_ir_hurricane.asset
index 9fc8d2bd1d..b7c88a2d5e 100644
--- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/2004_ir_hurricane.asset
+++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/2004_ir_hurricane.asset
@@ -29,7 +29,7 @@ local Layer = {
   Identifier = Identifier,
   Name = Name,
   Enabled = asset.enabled,
-  Type = "TemporalTileLayer",
+  Type = "TemporalTileProvider",
   Mode = "Folder",
   Folder = {
     Folder = syncedDirectory .. "2048",
diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/2005_hurricane-grayir.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/2005_hurricane-grayir.asset
index 8a9924cb22..22d4c3ffa4 100644
--- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/2005_hurricane-grayir.asset
+++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/2005_hurricane-grayir.asset
@@ -26,7 +26,7 @@ local Layer = {
   Identifier = Identifier,
   Name = Name,
   Enabled = asset.enabled,
-  Type = "TemporalTileLayer",
+  Type = "TemporalTileProvider",
   Mode = "Folder",
   Folder = {
     Folder = syncedDirectory .. "images",
diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/2005_hurricane-wvsst.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/2005_hurricane-wvsst.asset
index bad7dcadac..b904040628 100644
--- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/2005_hurricane-wvsst.asset
+++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/2005_hurricane-wvsst.asset
@@ -25,7 +25,7 @@ local Layer = {
   Identifier = Identifier,
   Name = Name,
   Enabled = asset.enabled,
-  Type = "TemporalTileLayer",
+  Type = "TemporalTileProvider",
   Mode = "Folder",
   Folder = {
     Folder = syncedDirectory .. "2048",
diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/2012_hurricane.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/2012_hurricane.asset
index e7c2bfcfe1..3d1c11732e 100644
--- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/2012_hurricane.asset
+++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/2012_hurricane.asset
@@ -33,7 +33,7 @@ local satDestination = syncedDirectory .. "sat"
 local LayerNames = {
   Identifier = Identifier .. "-names",
   Name = Name .. " (Names)",
-  Type = "ImageSequenceTileLayer",
+  Type = "ImageSequenceTileProvider",
   FolderPath = namesDestination,
   Description = Description
 }
@@ -41,7 +41,7 @@ local LayerNames = {
 local LayerSat = {
   Identifier = Identifier .. "-sat",
   Name = Name .. " (Satellites)",
-  Type = "TemporalTileLayer",
+  Type = "TemporalTileProvider",
   Mode = "Folder",
   Folder = {
     Folder = satDestination,
diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/aerosol_blackcarbon.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/aerosol_blackcarbon.asset
index 091cc58877..46d0b31305 100644
--- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/aerosol_blackcarbon.asset
+++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/aerosol_blackcarbon.asset
@@ -33,7 +33,7 @@ local Layer = {
   Identifier = Identifier,
   Name = Name,
   Enabled = asset.enabled,
-  Type = "ImageSequenceTileLayer",
+  Type = "ImageSequenceTileProvider",
   FolderPath = syncedDirectory .. "2048_png",
   Description = Description
 }
diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/aerosol_blackcarbon_and_sulfate.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/aerosol_blackcarbon_and_sulfate.asset
index 73802bd770..635dd828d8 100644
--- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/aerosol_blackcarbon_and_sulfate.asset
+++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/aerosol_blackcarbon_and_sulfate.asset
@@ -33,7 +33,7 @@ local Layer = {
   Identifier = Identifier,
   Name = Name,
   Enabled = asset.enabled,
-  Type = "ImageSequenceTileLayer",
+  Type = "ImageSequenceTileProvider",
   FolderPath = syncedDirectory .. "2048_png",
   Description = Description
 }
diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/aerosol_sulfate.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/aerosol_sulfate.asset
index 80348b6bd3..68f8a0bd14 100644
--- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/aerosol_sulfate.asset
+++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/aerosol_sulfate.asset
@@ -33,7 +33,7 @@ local Layer = {
   Identifier = Identifier,
   Name = Name,
   Enabled = asset.enabled,
-  Type = "ImageSequenceTileLayer",
+  Type = "ImageSequenceTileProvider",
   FolderPath = syncedDirectory .. "2048_png",
   Description = Description
 }
diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/airtraffic.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/airtraffic.asset
index cca34ed3ed..fcddb6a034 100644
--- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/airtraffic.asset
+++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/airtraffic.asset
@@ -29,7 +29,7 @@ local Layer = {
   Identifier = Identifier,
   Name = Name,
   Enabled = asset.enabled,
-  Type = "ImageSequenceTileLayer",
+  Type = "ImageSequenceTileProvider",
   FolderPath = syncedDirectory .. "images",
   Description = Description
 }
diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/all_sats.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/all_sats.asset
index e2b6d6eebb..7a1467473a 100644
--- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/all_sats.asset
+++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/all_sats.asset
@@ -33,7 +33,7 @@ local Layer = {
   Identifier = Identifier,
   Name = Name,
   Enabled = asset.enabled,
-  Type = "ImageSequenceTileLayer",
+  Type = "ImageSequenceTileProvider",
   FolderPath = syncedDirectory .. "2048",
   Description = Description
 }
diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/aqua_swath.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/aqua_swath.asset
index bdcca74f10..f272694ac0 100644
--- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/aqua_swath.asset
+++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/aqua_swath.asset
@@ -33,7 +33,7 @@ local Layer = {
   Identifier = Identifier,
   Name = Name,
   Enabled = asset.enabled,
-  Type = "ImageSequenceTileLayer",
+  Type = "ImageSequenceTileProvider",
   FolderPath = syncedDirectory .. "images",
   Description = Description
 }
diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/carbonflux.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/carbonflux.asset
index 6e8b16bab4..1f9b8a1bb3 100644
--- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/carbonflux.asset
+++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/carbonflux.asset
@@ -31,7 +31,7 @@ local Layer = {
   Identifier = Identifier,
   Name = Name,
   Enabled = asset.enabled,
-  Type = "ImageSequenceTileLayer",
+  Type = "ImageSequenceTileProvider",
   FolderPath = syncedDirectory .. "2160",
   Description = Description
 }
diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/carbontracker_2000_2100-fixed_scale.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/carbontracker_2000_2100-fixed_scale.asset
index 4d118bcc3f..f56bd621f2 100644
--- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/carbontracker_2000_2100-fixed_scale.asset
+++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/carbontracker_2000_2100-fixed_scale.asset
@@ -34,7 +34,7 @@ local colorbarDestination = syncedDirectory .. "colorbar"
 local LayerField = {
   Identifier = Identifier .. "-field",
   Name = Name .. " (Field)",
-  Type = "TemporalTileLayer",
+  Type = "TemporalTileProvider",
   Mode = "Folder",
   Folder = {
     Folder = fieldDestination,
@@ -48,7 +48,7 @@ local LayerField = {
 local LayerObs = {
   Identifier = Identifier .. "-obs",
   Name = Name .. " (Observed)",
-  Type = "TemporalTileLayer",
+  Type = "TemporalTileProvider",
   Mode = "Folder",
   Folder = {
     Folder = obsDestination,
diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/carbontracker_2000_2100-sliding_scale.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/carbontracker_2000_2100-sliding_scale.asset
index 3f2c8eea71..d63b070c1b 100644
--- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/carbontracker_2000_2100-sliding_scale.asset
+++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/carbontracker_2000_2100-sliding_scale.asset
@@ -33,7 +33,7 @@ local colorbarDestination = syncedDirectory .. "colorbar"
 local LayerField = {
   Identifier = Identifier .. "-field",
   Name = Name .. " (Field)",
-  Type = "TemporalTileLayer",
+  Type = "TemporalTileProvider",
   Mode = "Folder",
   Folder = {
     Folder = fieldDestination,
@@ -47,7 +47,7 @@ local LayerField = {
 local LayerObs = {
   Identifier = Identifier .. "-obs",
   Name = Name .. " (Observed)",
-  Type = "TemporalTileLayer",
+  Type = "TemporalTileProvider",
   Mode = "Folder",
   Folder = {
     Folder = obsDestination,
diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/co_gmd.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/co_gmd.asset
index b8e4372857..d65682d582 100644
--- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/co_gmd.asset
+++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/co_gmd.asset
@@ -33,7 +33,7 @@ local Layer = {
   Identifier = Identifier,
   Name = Name,
   Enabled = asset.enabled,
-  Type = "TemporalTileLayer",
+  Type = "TemporalTileProvider",
   Mode = "Folder",
   Folder = {
     Folder = syncedDirectory .. "images",
diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/fim_chem.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/fim_chem.asset
index 6549bbb405..a8d9eaa785 100644
--- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/fim_chem.asset
+++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/fim_chem.asset
@@ -28,7 +28,7 @@ local Layer = {
   Identifier = Identifier,
   Name = Name,
   Enabled = asset.enabled,
-  Type = "ImageSequenceTileLayer",
+  Type = "ImageSequenceTileProvider",
   FolderPath = syncedDirectory .. "composite",
   Description = Description
 }
diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/fossil_fuel.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/fossil_fuel.asset
index 5d47783d20..340d39938a 100644
--- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/fossil_fuel.asset
+++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/fossil_fuel.asset
@@ -35,7 +35,7 @@ local Layer = {
   Identifier = Identifier,
   Name = Name,
   Enabled = asset.enabled,
-  Type = "TemporalTileLayer",
+  Type = "TemporalTileProvider",
   Mode = "Folder",
   Folder = {
     Folder = syncedDirectory .. "3100",
diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/fukushima.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/fukushima.asset
index 1f50cb2727..5745f85178 100644
--- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/fukushima.asset
+++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/fukushima.asset
@@ -27,7 +27,7 @@ local Layer = {
   Identifier = Identifier,
   Name = Name,
   Enabled = asset.enabled,
-  Type = "ImageSequenceTileLayer",
+  Type = "ImageSequenceTileProvider",
   FolderPath = syncedDirectory .. "2054",
   Description = Description
 }
diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/geo_sat.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/geo_sat.asset
index 13b6159c0f..c1b307452d 100644
--- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/geo_sat.asset
+++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/geo_sat.asset
@@ -31,7 +31,7 @@ local Layer = {
   Identifier = Identifier,
   Name = Name,
   Enabled = asset.enabled,
-  Type = "ImageSequenceTileLayer",
+  Type = "ImageSequenceTileProvider",
   FolderPath = syncedDirectory .. "2048",
   Description = Description
 }
diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/geo_scan.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/geo_scan.asset
index a8208b645a..ea7f80eaa2 100644
--- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/geo_scan.asset
+++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/geo_scan.asset
@@ -31,7 +31,7 @@ local Layer = {
   Identifier = Identifier,
   Name = Name,
   Enabled = asset.enabled,
-  Type = "ImageSequenceTileLayer",
+  Type = "ImageSequenceTileProvider",
   FolderPath = syncedDirectory .. "2048",
   Description = Description
 }
diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/giss_temp_anom.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/giss_temp_anom.asset
index 4952fdefae..93c0bb28bb 100644
--- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/giss_temp_anom.asset
+++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/giss_temp_anom.asset
@@ -23,7 +23,7 @@ local Layer = {
   Identifier = Identifier,
   Name = Name,
   Enabled = asset.enabled,
-  Type = "ImageSequenceTileLayer",
+  Type = "ImageSequenceTileProvider",
   FolderPath = syncedDirectory .. "2012",
   Description = Description
 }
diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/globe-insolation.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/globe-insolation.asset
index 30b837be1b..169c523ede 100644
--- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/globe-insolation.asset
+++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/globe-insolation.asset
@@ -27,7 +27,7 @@ local Layer = {
   Identifier = Identifier,
   Name = Name,
   Enabled = asset.enabled,
-  Type = "TemporalTileLayer",
+  Type = "TemporalTileProvider",
   Mode = "Folder",
   Folder = {
     Folder = syncedDirectory .. "1440",
diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/globe-rainfall.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/globe-rainfall.asset
index 2c7ee2c672..8ad3926164 100644
--- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/globe-rainfall.asset
+++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/globe-rainfall.asset
@@ -27,7 +27,7 @@ local Layer = {
   Identifier = Identifier,
   Name = Name,
   Enabled = asset.enabled,
-  Type = "TemporalTileLayer",
+  Type = "TemporalTileProvider",
   Mode = "Folder",
   Folder = {
     Folder = syncedDirectory .. "1440",
diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/harvey-clouds_precip.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/harvey-clouds_precip.asset
index ccbb01db89..c41747a256 100644
--- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/harvey-clouds_precip.asset
+++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/harvey-clouds_precip.asset
@@ -27,7 +27,7 @@ local Layer = {
   Identifier = Identifier,
   Name = Name,
   Enabled = asset.enabled,
-  Type = "TemporalTileLayer",
+  Type = "TemporalTileProvider",
   Mode = "Folder",
   Folder = {
     Folder = syncedDirectory .. "4096",
diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/hurricane_season_2017.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/hurricane_season_2017.asset
index 5249aa670f..c380649be9 100644
--- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/hurricane_season_2017.asset
+++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/hurricane_season_2017.asset
@@ -31,7 +31,7 @@ local Layer = {
   Identifier = Identifier,
   Name = Name,
   Enabled = asset.enabled,
-  Type = "TemporalTileLayer",
+  Type = "TemporalTileProvider",
   Mode = "Folder",
   Folder = {
     Folder = syncedDirectory .. "images",
diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/hurricane_season_2017_wvsst.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/hurricane_season_2017_wvsst.asset
index 111508eead..b1aba5e1e8 100644
--- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/hurricane_season_2017_wvsst.asset
+++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/hurricane_season_2017_wvsst.asset
@@ -30,7 +30,7 @@ local Layer = {
   Identifier = Identifier,
   Name = Name,
   Enabled = asset.enabled,
-  Type = "TemporalTileLayer",
+  Type = "TemporalTileProvider",
   Mode = "Folder",
   Folder = {
     Folder = syncedDirectory .. "2048",
diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/isaac.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/isaac.asset
index 455d2b7101..19782cbd5a 100644
--- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/isaac.asset
+++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/isaac.asset
@@ -30,7 +30,7 @@ local satDestination = syncedDirectory .. "sat"
 local LayerRadar = {
   Identifier = Identifier .. "-radar",
   Name = Name .. " (Radar)",
-  Type = "TemporalTileLayer",
+  Type = "TemporalTileProvider",
   Mode = "Folder",
   Folder = {
     Folder = radarDestination,
@@ -44,7 +44,7 @@ local LayerRadar = {
 local LayerSat = {
   Identifier = Identifier .. "-sat",
   Name = Name .. " (Sat)",
-  Type = "TemporalTileLayer",
+  Type = "TemporalTileProvider",
   Mode = "Folder",
   Folder = {
     Folder = satDestination,
diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/land_temp.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/land_temp.asset
index 65d92b1c53..a592db0723 100644
--- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/land_temp.asset
+++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/land_temp.asset
@@ -27,7 +27,7 @@ local Layer = {
   Identifier = Identifier,
   Name = Name,
   Enabled = asset.enabled,
-  Type = "TemporalTileLayer",
+  Type = "TemporalTileProvider",
   Mode = "Folder",
   Folder = {
     Folder = syncedDirectory .. "4096",
diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/ltg_vaisala.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/ltg_vaisala.asset
index 15644f0bca..9b7feb1d1f 100644
--- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/ltg_vaisala.asset
+++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/ltg_vaisala.asset
@@ -32,7 +32,7 @@ local Layer = {
   Identifier = Identifier,
   Name = Name,
   Enabled = asset.enabled,
-  Type = "TemporalTileLayer",
+  Type = "TemporalTileProvider",
   Mode = "Folder",
   Folder = {
     Folder = syncedDirectory .. "2160",
diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/nasa_sats.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/nasa_sats.asset
index b8b001f2d0..43bf62187a 100644
--- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/nasa_sats.asset
+++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/nasa_sats.asset
@@ -30,7 +30,7 @@ local Layer = {
   Identifier = Identifier,
   Name = Name,
   Enabled = asset.enabled,
-  Type = "ImageSequenceTileLayer",
+  Type = "ImageSequenceTileProvider",
   FolderPath = syncedDirectory .. "2048",
   Description = Description
 }
diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/nccs_models-carbon.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/nccs_models-carbon.asset
index 8855568da7..d059ba1cd8 100644
--- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/nccs_models-carbon.asset
+++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/nccs_models-carbon.asset
@@ -27,7 +27,7 @@ local Layer = {
   Identifier = Identifier,
   Name = Name,
   Enabled = asset.enabled,
-  Type = "ImageSequenceTileLayer",
+  Type = "ImageSequenceTileProvider",
   FolderPath = syncedDirectory .. "2048",
   Description = Description
 }
diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/nccs_models-chem.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/nccs_models-chem.asset
index ed13bc7eec..30ca95c704 100644
--- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/nccs_models-chem.asset
+++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/nccs_models-chem.asset
@@ -28,7 +28,7 @@ local Layer = {
   Identifier = Identifier,
   Name = Name,
   Enabled = asset.enabled,
-  Type = "TemporalTileLayer",
+  Type = "TemporalTileProvider",
   Mode = "Folder",
   Folder = {
     Folder = syncedDirectory .. "images",
diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/nccs_models-winds.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/nccs_models-winds.asset
index 047c59a294..29759ea97c 100644
--- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/nccs_models-winds.asset
+++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/nccs_models-winds.asset
@@ -28,7 +28,7 @@ local Layer = {
   Identifier = Identifier,
   Name = Name,
   Enabled = asset.enabled,
-  Type = "TemporalTileLayer",
+  Type = "TemporalTileProvider",
   Mode = "Folder",
   Folder = {
     Folder = syncedDirectory .. "images",
diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/no2_omsi.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/no2_omsi.asset
index 74950f8713..6cdf0ac2b7 100644
--- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/no2_omsi.asset
+++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/no2_omsi.asset
@@ -28,7 +28,7 @@ local Layer = {
   Identifier = Identifier,
   Name = Name,
   Enabled = asset.enabled,
-  Type = "TemporalTileLayer",
+  Type = "TemporalTileProvider",
   Mode = "Folder",
   Folder = {
     Folder = syncedDirectory .. "2880",
diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/pclim.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/pclim.asset
index d80064cdda..ad471808da 100644
--- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/pclim.asset
+++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/pclim.asset
@@ -25,7 +25,7 @@ local Layer = {
   Identifier = Identifier,
   Name = Name,
   Enabled = asset.enabled,
-  Type = "ImageSequenceTileLayer",
+  Type = "ImageSequenceTileProvider",
   FolderPath = syncedDirectory .. "raw",
   Description = Description
 }
diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/poes_sat.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/poes_sat.asset
index 3a1beb5dd7..ca3c100c52 100644
--- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/poes_sat.asset
+++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/poes_sat.asset
@@ -28,7 +28,7 @@ local Layer = {
   Identifier = Identifier,
   Name = Name,
   Enabled = asset.enabled,
-  Type = "TemporalTileLayer",
+  Type = "TemporalTileProvider",
   Mode = "Folder",
   Folder = {
     Folder = syncedDirectory .. "2048",
diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/reanalysis-antarctic.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/reanalysis-antarctic.asset
index 0682f6b83a..396092394f 100644
--- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/reanalysis-antarctic.asset
+++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/reanalysis-antarctic.asset
@@ -39,7 +39,7 @@ local Layer = {
   Identifier = Identifier,
   Name = Name,
   Enabled = asset.enabled,
-  Type = "ImageSequenceTileLayer",
+  Type = "ImageSequenceTileProvider",
   FolderPath = syncedDirectory .. "2048",
   Description = Description
 }
diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/reanalysis-elnino.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/reanalysis-elnino.asset
index 8f9b8a3acf..dd23e40a4f 100644
--- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/reanalysis-elnino.asset
+++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/reanalysis-elnino.asset
@@ -39,7 +39,7 @@ local Layer = {
   Identifier = Identifier,
   Name = Name,
   Enabled = asset.enabled,
-  Type = "ImageSequenceTileLayer",
+  Type = "ImageSequenceTileProvider",
   FolderPath = syncedDirectory .. "2048",
   Description = Description
 }
diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/reanalysis-hurricane.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/reanalysis-hurricane.asset
index c3b0e5ce21..8e591c95fe 100644
--- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/reanalysis-hurricane.asset
+++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/reanalysis-hurricane.asset
@@ -39,7 +39,7 @@ local Layer = {
   Identifier = Identifier,
   Name = Name,
   Enabled = asset.enabled,
-  Type = "ImageSequenceTileLayer",
+  Type = "ImageSequenceTileProvider",
   FolderPath = syncedDirectory .. "2048_png",
   Description = Description
 }
diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/sandy.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/sandy.asset
index 191563f601..2b02f27780 100644
--- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/sandy.asset
+++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/sandy.asset
@@ -23,7 +23,7 @@ local Layer = {
   Identifier = Identifier,
   Name = Name,
   Enabled = asset.enabled,
-  Type = "TemporalTileLayer",
+  Type = "TemporalTileProvider",
   Mode = "Folder",
   Folder = {
     Folder = syncedDirectory .. "4096",
diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/sunsync_sat.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/sunsync_sat.asset
index 2c45958d75..4d0494246b 100644
--- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/sunsync_sat.asset
+++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/sunsync_sat.asset
@@ -28,7 +28,7 @@ local Layer = {
   Identifier = Identifier,
   Name = Name,
   Enabled = asset.enabled,
-  Type = "TemporalTileLayer",
+  Type = "TemporalTileProvider",
   Mode = "Folder",
   Folder = {
     Folder = syncedDirectory .. "2048",
diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/temp_anom.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/temp_anom.asset
index e7455f18da..490c0d6d37 100644
--- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/temp_anom.asset
+++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/temp_anom.asset
@@ -31,7 +31,7 @@ local Layer = {
   Identifier = Identifier,
   Name = Name,
   Enabled = asset.enabled,
-  Type = "TemporalTileLayer",
+  Type = "TemporalTileProvider",
   Mode = "Folder",
   Folder = {
     Folder = syncedDirectory .. "4096_new",
diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/typhoon_haiyan-wvsst.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/typhoon_haiyan-wvsst.asset
index fbbbd6af65..6ffe5657f2 100644
--- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/typhoon_haiyan-wvsst.asset
+++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/typhoon_haiyan-wvsst.asset
@@ -25,7 +25,7 @@ local Layer = {
   Identifier = Identifier,
   Name = Name,
   Enabled = asset.enabled,
-  Type = "ImageSequenceTileLayer",
+  Type = "ImageSequenceTileProvider",
   FolderPath = syncedDirectory .. "2048",
   Description = Description
 }
diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/typhoon_haiyan.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/typhoon_haiyan.asset
index 1cdff01fa8..0f6f98766e 100644
--- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/typhoon_haiyan.asset
+++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/typhoon_haiyan.asset
@@ -25,7 +25,7 @@ local Layer = {
   Identifier = Identifier,
   Name = Name,
   Enabled = asset.enabled,
-  Type = "TemporalTileLayer",
+  Type = "TemporalTileProvider",
   Mode = "Folder",
   Folder = {
     Folder = syncedDirectory .. "2048",
diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/volcano_ash.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/volcano_ash.asset
index 7529963294..2fef56cbb0 100644
--- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/volcano_ash.asset
+++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/volcano_ash.asset
@@ -31,7 +31,7 @@ local Layer = {
   Identifier = Identifier,
   Name = Name,
   Enabled = asset.enabled,
-  Type = "ImageSequenceTileLayer",
+  Type = "ImageSequenceTileProvider",
   FolderPath = syncedDirectory .. "2992",
   Description = Description
 }
diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/birds.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/birds.asset
index 8b42aa16b3..14823d0289 100644
--- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/birds.asset
+++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/birds.asset
@@ -26,7 +26,7 @@ local Layer = {
   Identifier = Identifier,
   Name = Name,
   Enabled = asset.enabled,
-  Type = "ImageSequenceTileLayer",
+  Type = "ImageSequenceTileProvider",
   FolderPath = syncedDirectory .. "birds",
   Description = Description
 }
diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/blue_marble-blue_marble_topo.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/blue_marble-blue_marble_topo.asset
index e6c3b197bf..b18ff1a6f0 100644
--- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/blue_marble-blue_marble_topo.asset
+++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/blue_marble-blue_marble_topo.asset
@@ -26,7 +26,7 @@ local Layer = {
   Identifier = Identifier,
   Name = Name,
   Enabled = asset.enabled,
-  Type = "TemporalTileLayer",
+  Type = "TemporalTileProvider",
   Mode = "Folder",
   Folder = {
     Folder = syncedDirectory .. "5400",
diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/blue_marble-blue_marble_topo_bathy.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/blue_marble-blue_marble_topo_bathy.asset
index 966f8ca018..3c12994ae2 100644
--- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/blue_marble-blue_marble_topo_bathy.asset
+++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/blue_marble-blue_marble_topo_bathy.asset
@@ -26,7 +26,7 @@ local Layer = {
   Identifier = Identifier,
   Name = Name,
   Enabled = asset.enabled,
-  Type = "TemporalTileLayer",
+  Type = "TemporalTileProvider",
   Mode = "Folder",
   Folder = {
     Folder = syncedDirectory .. "5400",
diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/blue_marble-nightlights.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/blue_marble-nightlights.asset
index 2756a119e3..d9881cd218 100644
--- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/blue_marble-nightlights.asset
+++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/blue_marble-nightlights.asset
@@ -33,7 +33,7 @@ local Layer = {
   Identifier = Identifier,
   Name = Name,
   Enabled = asset.enabled,
-  Type = "ImageSequenceTileLayer",
+  Type = "ImageSequenceTileProvider",
   FolderPath = syncedDirectory .. "images",
   Description = Description
 }
diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/blue_marble-seasonal_blue_marble.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/blue_marble-seasonal_blue_marble.asset
index fcfa08d84a..1ed2f90abc 100644
--- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/blue_marble-seasonal_blue_marble.asset
+++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/blue_marble-seasonal_blue_marble.asset
@@ -27,7 +27,7 @@ local Layer = {
   Identifier = Identifier,
   Name = Name,
   Enabled = asset.enabled,
-  Type = "TemporalTileLayer",
+  Type = "TemporalTileProvider",
   Mode = "Folder",
   Folder = {
     Folder = syncedDirectory .. "4096",
diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/dams-global.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/dams-global.asset
index ab5686d954..7dadc485b7 100644
--- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/dams-global.asset
+++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/dams-global.asset
@@ -24,7 +24,7 @@ local syncedDirectory = asset.syncedResource({
 local Layer = {
   Identifier = Identifier,
   Name = Name,
-  Type = "ImageSequenceTileLayer",
+  Type = "ImageSequenceTileProvider",
   FolderPath = syncedDirectory .. "4096",
   Description = Description
 }
diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/dams-mississippi.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/dams-mississippi.asset
index 8e0a677ce0..02c0b651ef 100644
--- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/dams-mississippi.asset
+++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/dams-mississippi.asset
@@ -25,7 +25,7 @@ local Layer = {
   Identifier = Identifier,
   Name = Name,
   Enabled = asset.enabled,
-  Type = "ImageSequenceTileLayer",
+  Type = "ImageSequenceTileProvider",
   FolderPath = syncedDirectory .. "4096",
   Description = Description
 }
diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/dams-yangtze.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/dams-yangtze.asset
index 1a272bc7ef..9e1b70a16b 100644
--- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/dams-yangtze.asset
+++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/dams-yangtze.asset
@@ -25,7 +25,7 @@ local Layer = {
   Identifier = Identifier,
   Name = Name,
   Enabled = asset.enabled,
-  Type = "ImageSequenceTileLayer",
+  Type = "ImageSequenceTileProvider",
   FolderPath = syncedDirectory .. "4096",
   Description = Description
 }
diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/day_night-06z_only.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/day_night-06z_only.asset
index 62832a4efa..7dff94800c 100644
--- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/day_night-06z_only.asset
+++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/day_night-06z_only.asset
@@ -27,7 +27,7 @@ local Layer = {
   Identifier = Identifier,
   Name = Name,
   Enabled = asset.enabled,
-  Type = "TemporalTileLayer",
+  Type = "TemporalTileProvider",
   Mode = "Folder",
   Folder = {
     Folder = syncedDirectory .. "2048",
diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/day_night-full_year.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/day_night-full_year.asset
index c52b4ebcb8..f6c7b80fa5 100644
--- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/day_night-full_year.asset
+++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/day_night-full_year.asset
@@ -28,7 +28,7 @@ local Layer = {
   Identifier = Identifier,
   Name = Name,
   Enabled = asset.enabled,
-  Type = "TemporalTileLayer",
+  Type = "TemporalTileProvider",
   Mode = "Folder",
   Folder = {
     Folder = syncedDirectory .. "images",
diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/day_night-oneday.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/day_night-oneday.asset
index 00e7952031..8e5a5136fc 100644
--- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/day_night-oneday.asset
+++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/day_night-oneday.asset
@@ -26,7 +26,7 @@ local Layer = {
   Identifier = Identifier,
   Name = Name,
   Enabled = asset.enabled,
-  Type = "ImageSequenceTileLayer",
+  Type = "ImageSequenceTileProvider",
   FolderPath = syncedDirectory .. "2048",
   Description = Description
 }
diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/earthquake-1980_1995_quakes.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/earthquake-1980_1995_quakes.asset
index b84996ad10..4414257e03 100644
--- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/earthquake-1980_1995_quakes.asset
+++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/earthquake-1980_1995_quakes.asset
@@ -34,7 +34,7 @@ local Layer = {
   Identifier = Identifier,
   Name = Name,
   Enabled = asset.enabled,
-  Type = "ImageSequenceTileLayer",
+  Type = "ImageSequenceTileProvider",
   FolderPath = syncedDirectory .. "1024",
   Description = Description
 }
diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/earthquakes_and_eruptions.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/earthquakes_and_eruptions.asset
index 365c23f778..8341231db6 100644
--- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/earthquakes_and_eruptions.asset
+++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/earthquakes_and_eruptions.asset
@@ -27,7 +27,7 @@ local Layer = {
   Identifier = Identifier,
   Name = Name,
   Enabled = asset.enabled,
-  Type = "ImageSequenceTileLayer",
+  Type = "ImageSequenceTileProvider",
   FolderPath = syncedDirectory .. "4096",
   Description = Description
 }
diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/earths_magnetism_magnetic_lines.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/earths_magnetism_magnetic_lines.asset
index b29f26799c..c844a389e5 100644
--- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/earths_magnetism_magnetic_lines.asset
+++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/earths_magnetism_magnetic_lines.asset
@@ -32,7 +32,7 @@ local Layer = {
   Identifier = Identifier,
   Name = Name,
   Enabled = asset.enabled,
-  Type = "TemporalTileLayer",
+  Type = "TemporalTileProvider",
   Mode = "Folder",
   Folder = {
     Folder = syncedDirectory .. "4096",
diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/earths_magnetism_magnets.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/earths_magnetism_magnets.asset
index 8846b8617d..359e6060ca 100644
--- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/earths_magnetism_magnets.asset
+++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/earths_magnetism_magnets.asset
@@ -32,7 +32,7 @@ local Layer = {
   Identifier = Identifier,
   Name = Name,
   Enabled = asset.enabled,
-  Type = "TemporalTileLayer",
+  Type = "TemporalTileProvider",
   Mode = "Folder",
   Folder = {
     Folder = syncedDirectory .. "4096",
diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/fire.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/fire.asset
index 6f0fb0148c..0e5c6596a3 100644
--- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/fire.asset
+++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/fire.asset
@@ -30,7 +30,7 @@ local Layer = {
   Identifier = Identifier,
   Name = Name,
   Enabled = asset.enabled,
-  Type = "TemporalTileLayer",
+  Type = "TemporalTileProvider",
   Mode = "Folder",
   Folder = {
     Folder = syncedDirectory .. "4096",
diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/fire_veg.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/fire_veg.asset
index 1e08cc27fa..33606bda10 100644
--- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/fire_veg.asset
+++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/fire_veg.asset
@@ -29,7 +29,7 @@ local Layer = {
   Identifier = Identifier,
   Name = Name,
   Enabled = asset.enabled,
-  Type = "ImageSequenceTileLayer",
+  Type = "ImageSequenceTileProvider",
   FolderPath = syncedDirectory .. "2048",
   Description = Description
 }
diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/global_vegetation.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/global_vegetation.asset
index cff0605334..e690559e05 100644
--- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/global_vegetation.asset
+++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/global_vegetation.asset
@@ -45,7 +45,7 @@ local Layer = {
   Identifier = Identifier,
   Name = Name,
   Enabled = asset.enabled,
-  Type = "TemporalTileLayer",
+  Type = "TemporalTileProvider",
   Mode = "Folder",
   Folder = {
     Folder = imagesDestination,
diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/hot_topo.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/hot_topo.asset
index 73f3409ba2..1722b454f5 100644
--- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/hot_topo.asset
+++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/hot_topo.asset
@@ -34,7 +34,7 @@ local Layer = {
   Identifier = Identifier,
   Name = Name,
   Enabled = asset.enabled,
-  Type = "ImageSequenceTileLayer",
+  Type = "ImageSequenceTileProvider",
   FolderPath = syncedDirectory .. "images",
   Description = Description
 }
diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/irsat_nightlights.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/irsat_nightlights.asset
index a54dfe3f8d..75adb14afb 100644
--- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/irsat_nightlights.asset
+++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/irsat_nightlights.asset
@@ -27,7 +27,7 @@ local Layer = {
   Identifier = Identifier,
   Name = Name,
   Enabled = asset.enabled,
-  Type = "ImageSequenceTileLayer",
+  Type = "ImageSequenceTileProvider",
   FolderPath = syncedDirectory .. "2048",
   Description = Description
 }
diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/japan_quake.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/japan_quake.asset
index 728ef25be7..c10f56cd42 100644
--- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/japan_quake.asset
+++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/japan_quake.asset
@@ -27,7 +27,7 @@ local Layer = {
   Identifier = Identifier,
   Name = Name,
   Enabled = asset.enabled,
-  Type = "ImageSequenceTileLayer",
+  Type = "ImageSequenceTileProvider",
   FolderPath = syncedDirectory .. "2048",
   Description = Description
 }
diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/koppen_climate-koppen_1901_2100.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/koppen_climate-koppen_1901_2100.asset
index c902c48aa9..d27f83c2aa 100644
--- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/koppen_climate-koppen_1901_2100.asset
+++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/koppen_climate-koppen_1901_2100.asset
@@ -27,7 +27,7 @@ local Layer = {
   Identifier = Identifier,
   Name = Name,
   Enabled = asset.enabled,
-  Type = "ImageSequenceTileLayer",
+  Type = "ImageSequenceTileProvider",
   FolderPath = syncedDirectory .. "4096",
   Description = Description
 }
diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/land_cover-animation.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/land_cover-animation.asset
index 1274a7f916..d09fc82a7c 100644
--- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/land_cover-animation.asset
+++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/land_cover-animation.asset
@@ -32,7 +32,7 @@ local Layer = {
   Identifier = Identifier,
   Name = Name,
   Enabled = asset.enabled,
-  Type = "ImageSequenceTileLayer",
+  Type = "ImageSequenceTileProvider",
   FolderPath = syncedDirectory .. "3600",
   Description = Description
 }
diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/land_ratio.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/land_ratio.asset
index 32a40ad221..8f245c37e8 100644
--- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/land_ratio.asset
+++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/land_ratio.asset
@@ -22,7 +22,7 @@ local Layer = {
   Identifier = Identifier,
   Name = Name,
   Enabled = asset.enabled,
-  Type = "ImageSequenceTileLayer",
+  Type = "ImageSequenceTileProvider",
   FolderPath = syncedDirectory .. "4096",
   Description = Description
 }
diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/magnetic_declination.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/magnetic_declination.asset
index ae8d56a7d7..39ee251726 100644
--- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/magnetic_declination.asset
+++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/magnetic_declination.asset
@@ -26,7 +26,7 @@ local Layer = {
   Identifier = Identifier,
   Name = Name,
   Enabled = asset.enabled,
-  Type = "TemporalTileLayer",
+  Type = "TemporalTileProvider",
   Mode = "Folder",
   Folder = {
     Folder = syncedDirectory .. "4096",
diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/nuclear_earthquake.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/nuclear_earthquake.asset
index 41e56bf74f..86f8b078f3 100644
--- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/nuclear_earthquake.asset
+++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/nuclear_earthquake.asset
@@ -60,7 +60,7 @@ local LayerNuclear = {
 local LayerImages = {
   Identifier = Identifier .. "-images",
   Name = Name .. " (Images)",
-  Type = "ImageSequenceTileLayer",
+  Type = "ImageSequenceTileProvider",
   FolderPath = imagesDestination,
   Description = Description
 }
diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/plate_movement.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/plate_movement.asset
index 44d933793b..6444d42a3e 100644
--- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/plate_movement.asset
+++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/plate_movement.asset
@@ -34,7 +34,7 @@ local Layer = {
   Identifier = Identifier,
   Name = Name,
   Enabled = asset.enabled,
-  Type = "ImageSequenceTileLayer",
+  Type = "ImageSequenceTileProvider",
   FolderPath = syncedDirectory .. "4096",
   Description = Description
 }
diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/river_discharge_2010.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/river_discharge_2010.asset
index 7cbfd7b115..46b10fdd5a 100644
--- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/river_discharge_2010.asset
+++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/river_discharge_2010.asset
@@ -25,7 +25,7 @@ local Layer = {
   Identifier = Identifier,
   Name = Name,
   Enabled = asset.enabled,
-  Type = "ImageSequenceTileLayer",
+  Type = "ImageSequenceTileProvider",
   FolderPath = syncedDirectory .. "4096",
   Description = Description
 }
diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/seismic_waves-1994northridge.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/seismic_waves-1994northridge.asset
index 56e91232cc..c580a32d93 100644
--- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/seismic_waves-1994northridge.asset
+++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/seismic_waves-1994northridge.asset
@@ -44,7 +44,7 @@ local LayerStations = {
 local LayerImages = {
   Identifier = Identifier .. "-images",
   Name = Name .. " (Images)",
-  Type = "ImageSequenceTileLayer",
+  Type = "ImageSequenceTileProvider",
   FolderPath = imagesDestination,
   Description = Description
 }
diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/surface_temperature.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/surface_temperature.asset
index f474ee11d5..66a3736839 100644
--- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/surface_temperature.asset
+++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/surface_temperature.asset
@@ -28,7 +28,7 @@ local Layer = {
   Identifier = Identifier,
   Name = Name,
   Enabled = asset.enabled,
-  Type = "ImageSequenceTileLayer",
+  Type = "ImageSequenceTileProvider",
   FolderPath = syncedDirectory .. "4096",
   Description = Description
 }
diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/models/bm10000.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/models/bm10000.asset
index c6f090b852..e7e97f9b28 100644
--- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/models/bm10000.asset
+++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/models/bm10000.asset
@@ -50,7 +50,7 @@ local Layer = {
   Identifier = Identifier,
   Name = Name,
   Enabled = asset.enabled,
-  Type = "ImageSequenceTileLayer",
+  Type = "ImageSequenceTileProvider",
   FolderPath = syncedDirectory .. "4096",
   Description = Description
 }
diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/models/gfdl_seaice.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/models/gfdl_seaice.asset
index 8f91d3ab72..48d53c5b82 100644
--- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/models/gfdl_seaice.asset
+++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/models/gfdl_seaice.asset
@@ -34,7 +34,7 @@ local Layer = {
   Identifier = Identifier,
   Name = Name,
   Enabled = asset.enabled,
-  Type = "ImageSequenceTileLayer",
+  Type = "ImageSequenceTileProvider",
   FolderPath = syncedDirectory .. "images",
   Description = Description
 }
diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/models/ipcc_temp-ccsm-a1b.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/models/ipcc_temp-ccsm-a1b.asset
index f089002eab..848febb8f9 100644
--- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/models/ipcc_temp-ccsm-a1b.asset
+++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/models/ipcc_temp-ccsm-a1b.asset
@@ -30,7 +30,7 @@ local Layer = {
   Identifier = Identifier,
   Name = Name,
   Enabled = asset.enabled,
-  Type = "ImageSequenceTileLayer",
+  Type = "ImageSequenceTileProvider",
   FolderPath = syncedDirectory .. "4095",
   Description = Description
 }
diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/models/ipcc_temp-ccsm-b1.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/models/ipcc_temp-ccsm-b1.asset
index 6f08d18a47..2e1a4f97b0 100644
--- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/models/ipcc_temp-ccsm-b1.asset
+++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/models/ipcc_temp-ccsm-b1.asset
@@ -30,7 +30,7 @@ local Layer = {
   Identifier = Identifier,
   Name = Name,
   Enabled = asset.enabled,
-  Type = "ImageSequenceTileLayer",
+  Type = "ImageSequenceTileProvider",
   FolderPath = syncedDirectory .. "4095",
   Description = Description
 }
diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/models/ipcc_temp-gfdl-a1b.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/models/ipcc_temp-gfdl-a1b.asset
index 7bc8cf03eb..77775a04bc 100644
--- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/models/ipcc_temp-gfdl-a1b.asset
+++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/models/ipcc_temp-gfdl-a1b.asset
@@ -30,7 +30,7 @@ local Layer = {
   Identifier = Identifier,
   Name = Name,
   Enabled = asset.enabled,
-  Type = "ImageSequenceTileLayer",
+  Type = "ImageSequenceTileProvider",
   FolderPath = syncedDirectory .. "4095",
   Description = Description
 }
diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/models/ipcc_temp-gfdl-b1.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/models/ipcc_temp-gfdl-b1.asset
index 7d57b7e60a..3363e76a50 100644
--- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/models/ipcc_temp-gfdl-b1.asset
+++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/models/ipcc_temp-gfdl-b1.asset
@@ -30,7 +30,7 @@ local Layer = {
   Identifier = Identifier,
   Name = Name,
   Enabled = asset.enabled,
-  Type = "ImageSequenceTileLayer",
+  Type = "ImageSequenceTileProvider",
   FolderPath = syncedDirectory .. "4095",
   Description = Description
 }
diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/models/ipcc_temp-had-a1b.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/models/ipcc_temp-had-a1b.asset
index 63f6155941..0969862c73 100644
--- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/models/ipcc_temp-had-a1b.asset
+++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/models/ipcc_temp-had-a1b.asset
@@ -30,7 +30,7 @@ local Layer = {
   Identifier = Identifier,
   Name = Name,
   Enabled = asset.enabled,
-  Type = "ImageSequenceTileLayer",
+  Type = "ImageSequenceTileProvider",
   FolderPath = syncedDirectory .. "4095",
   Description = Description
 }
diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/models/ipcc_temp-had-b1.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/models/ipcc_temp-had-b1.asset
index 9a0c2fc0db..77b3a7b8ca 100644
--- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/models/ipcc_temp-had-b1.asset
+++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/models/ipcc_temp-had-b1.asset
@@ -30,7 +30,7 @@ local Layer = {
   Identifier = Identifier,
   Name = Name,
   Enabled = asset.enabled,
-  Type = "ImageSequenceTileLayer",
+  Type = "ImageSequenceTileProvider",
   FolderPath = syncedDirectory .. "4095",
   Description = Description
 }
diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/models/rcp-ga26.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/models/rcp-ga26.asset
index 9f50f66f96..13902c9a57 100644
--- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/models/rcp-ga26.asset
+++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/models/rcp-ga26.asset
@@ -22,7 +22,7 @@ local Layer = {
   Identifier = Identifier,
   Name = Name,
   Enabled = asset.enabled,
-  Type = "TemporalTileLayer",
+  Type = "TemporalTileProvider",
   Mode = "Folder",
   Folder = {
     Folder = syncedDirectory .. "4096",
diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/models/rcp-ga45.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/models/rcp-ga45.asset
index f8c306561e..3f9ac61d06 100644
--- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/models/rcp-ga45.asset
+++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/models/rcp-ga45.asset
@@ -22,7 +22,7 @@ local Layer = {
   Identifier = Identifier,
   Name = Name,
   Enabled = asset.enabled,
-  Type = "TemporalTileLayer",
+  Type = "TemporalTileProvider",
   Mode = "Folder",
   Folder = {
     Folder = syncedDirectory .. "4096",
diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/models/rcp-ga60.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/models/rcp-ga60.asset
index 40b5bc8ea5..a25f860df7 100644
--- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/models/rcp-ga60.asset
+++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/models/rcp-ga60.asset
@@ -22,7 +22,7 @@ local Layer = {
   Identifier = Identifier,
   Name = Name,
   Enabled = asset.enabled,
-  Type = "TemporalTileLayer",
+  Type = "TemporalTileProvider",
   Mode = "Folder",
   Folder = {
     Folder = syncedDirectory .. "4096",
diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/models/rcp-ga85.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/models/rcp-ga85.asset
index d08173408c..fdbf42c66b 100644
--- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/models/rcp-ga85.asset
+++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/models/rcp-ga85.asset
@@ -22,7 +22,7 @@ local Layer = {
   Identifier = Identifier,
   Name = Name,
   Enabled = asset.enabled,
-  Type = "TemporalTileLayer",
+  Type = "TemporalTileProvider",
   Mode = "Folder",
   Folder = {
     Folder = syncedDirectory .. "4096",
diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/models/ukmet-a1b.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/models/ukmet-a1b.asset
index e89ebe3083..8384c9f5bd 100644
--- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/models/ukmet-a1b.asset
+++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/models/ukmet-a1b.asset
@@ -32,7 +32,7 @@ local Layer = {
   Identifier = Identifier,
   Name = Name,
   Enabled = asset.enabled,
-  Type = "TemporalTileLayer",
+  Type = "TemporalTileProvider",
   Mode = "Folder",
   Folder = {
     Folder = syncedDirectory .. "2100",
diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/models/ukmet-e1.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/models/ukmet-e1.asset
index aa01f2247a..593d54ba07 100644
--- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/models/ukmet-e1.asset
+++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/models/ukmet-e1.asset
@@ -31,7 +31,7 @@ local Layer = {
   Identifier = Identifier,
   Name = Name,
   Enabled = asset.enabled,
-  Type = "TemporalTileLayer",
+  Type = "TemporalTileProvider",
   Mode = "Folder",
   Folder = {
     Folder = syncedDirectory .. "2100",
diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/2009_ice_animation.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/2009_ice_animation.asset
index 2cb6719612..8c19cd9782 100644
--- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/2009_ice_animation.asset
+++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/2009_ice_animation.asset
@@ -31,7 +31,7 @@ local Layer = {
   Identifier = Identifier,
   Name = Name,
   Enabled = asset.enabled,
-  Type = "ImageSequenceTileLayer",
+  Type = "ImageSequenceTileProvider",
   FolderPath = syncedDirectory .. "4096",
   Description = Description
 }
diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/animal_tracking.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/animal_tracking.asset
index 1ae81f532a..187f6e42d7 100644
--- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/animal_tracking.asset
+++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/animal_tracking.asset
@@ -28,7 +28,7 @@ local Layer = {
   Identifier = Identifier,
   Name = Name,
   Enabled = asset.enabled,
-  Type = "TemporalTileLayer",
+  Type = "TemporalTileProvider",
   Mode = "Folder",
   Folder = {
     Folder = syncedDirectory .. "4096",
diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/argo_buoy_tracks.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/argo_buoy_tracks.asset
index 6e16a28e71..1e18740f11 100644
--- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/argo_buoy_tracks.asset
+++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/argo_buoy_tracks.asset
@@ -30,7 +30,7 @@ local Layer = {
   Identifier = Identifier,
   Name = Name,
   Enabled = asset.enabled,
-  Type = "ImageSequenceTileLayer",
+  Type = "ImageSequenceTileProvider",
   FolderPath = syncedDirectory .. "4096",
   Description = Description
 }
diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/argo_buoy_waterfall.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/argo_buoy_waterfall.asset
index 66568c8570..81e673f004 100644
--- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/argo_buoy_waterfall.asset
+++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/argo_buoy_waterfall.asset
@@ -30,7 +30,7 @@ local Layer = {
   Identifier = Identifier,
   Name = Name,
   Enabled = asset.enabled,
-  Type = "ImageSequenceTileLayer",
+  Type = "ImageSequenceTileProvider",
   FolderPath = syncedDirectory .. "4096",
   Description = Description
 }
diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/atl_turtle.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/atl_turtle.asset
index 2deeedd2f5..c2c5499355 100644
--- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/atl_turtle.asset
+++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/atl_turtle.asset
@@ -30,7 +30,7 @@ local Layer = {
   Identifier = Identifier,
   Name = Name,
   Enabled = asset.enabled,
-  Type = "TemporalTileLayer",
+  Type = "TemporalTileProvider",
   Mode = "Folder",
   Folder = {
     Folder = syncedDirectory .. "2048",
diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/chlorophyll_model.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/chlorophyll_model.asset
index 8f9c7bf587..fea17dc984 100644
--- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/chlorophyll_model.asset
+++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/chlorophyll_model.asset
@@ -30,7 +30,7 @@ local Layer = {
   Identifier = Identifier,
   Name = Name,
   Enabled = asset.enabled,
-  Type = "ImageSequenceTileLayer",
+  Type = "ImageSequenceTileProvider",
   FolderPath = syncedDirectory .. "3232",
   Description = Description
 }
diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/ecco2_sst-gray_land.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/ecco2_sst-gray_land.asset
index 37ad56e6f0..9beda39568 100644
--- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/ecco2_sst-gray_land.asset
+++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/ecco2_sst-gray_land.asset
@@ -33,7 +33,7 @@ local Layer = {
   Identifier = Identifier,
   Name = Name,
   Enabled = asset.enabled,
-  Type = "ImageSequenceTileLayer",
+  Type = "ImageSequenceTileProvider",
   FolderPath = syncedDirectory .. "images",
   Description = Description
 }
diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/ecco2_sst-veg_land.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/ecco2_sst-veg_land.asset
index e8eec99c36..c07834ffd6 100644
--- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/ecco2_sst-veg_land.asset
+++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/ecco2_sst-veg_land.asset
@@ -33,7 +33,7 @@ local Layer = {
   Identifier = Identifier,
   Name = Name,
   Enabled = asset.enabled,
-  Type = "ImageSequenceTileLayer",
+  Type = "ImageSequenceTileProvider",
   FolderPath = syncedDirectory .. "images",
   Description = Description
 }
diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/gfdl_sst-black_background.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/gfdl_sst-black_background.asset
index a8b4cac5bc..866a3fb9e0 100644
--- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/gfdl_sst-black_background.asset
+++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/gfdl_sst-black_background.asset
@@ -27,7 +27,7 @@ local Layer = {
   Identifier = Identifier,
   Name = Name,
   Enabled = asset.enabled,
-  Type = "TemporalTileLayer",
+  Type = "TemporalTileProvider",
   Mode = "Folder",
   Folder = {
     Folder = syncedDirectory .. "images",
diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/gfdl_sst-land_background.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/gfdl_sst-land_background.asset
index 49bc327946..ff77be0d3d 100644
--- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/gfdl_sst-land_background.asset
+++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/gfdl_sst-land_background.asset
@@ -27,7 +27,7 @@ local Layer = {
   Identifier = Identifier,
   Name = Name,
   Enabled = asset.enabled,
-  Type = "TemporalTileLayer",
+  Type = "TemporalTileProvider",
   Mode = "Folder",
   Folder = {
     Folder = syncedDirectory .. "images",
diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/greenland_melt.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/greenland_melt.asset
index 13e9b5733a..95d515789b 100644
--- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/greenland_melt.asset
+++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/greenland_melt.asset
@@ -30,7 +30,7 @@ local Layer = {
   Identifier = Identifier,
   Name = Name,
   Enabled = asset.enabled,
-  Type = "TemporalTileLayer",
+  Type = "TemporalTileProvider",
   Mode = "Folder",
   Folder = {
     Folder = syncedDirectory .. "2048",
diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/japan_tsunami_waves.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/japan_tsunami_waves.asset
index 111503e0b4..910dbd1868 100644
--- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/japan_tsunami_waves.asset
+++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/japan_tsunami_waves.asset
@@ -33,7 +33,7 @@ local Layer = {
   Identifier = Identifier,
   Name = Name,
   Enabled = asset.enabled,
-  Type = "ImageSequenceTileLayer",
+  Type = "ImageSequenceTileProvider",
   FolderPath = syncedDirectory .. "4096",
   Description = Description
 }
diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/loggerheadseaturtletracks.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/loggerheadseaturtletracks.asset
index ff43991c66..daef08d4c6 100644
--- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/loggerheadseaturtletracks.asset
+++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/loggerheadseaturtletracks.asset
@@ -30,7 +30,7 @@ local Layer = {
   Identifier = Identifier,
   Name = Name,
   Enabled = asset.enabled,
-  Type = "ImageSequenceTileLayer",
+  Type = "ImageSequenceTileProvider",
   FolderPath = syncedDirectory .. "4096",
   Description = Description
 }
diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/mexico_turtles_947293.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/mexico_turtles_947293.asset
index 20eb8a2b80..40b6035177 100644
--- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/mexico_turtles_947293.asset
+++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/mexico_turtles_947293.asset
@@ -29,7 +29,7 @@ local Layer = {
   Identifier = Identifier,
   Name = Name,
   Enabled = asset.enabled,
-  Type = "TemporalTileLayer",
+  Type = "TemporalTileProvider",
   Mode = "Folder",
   Folder = {
     Folder = syncedDirectory .. "2048",
diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/mexico_turtles_958002.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/mexico_turtles_958002.asset
index 57df62b3b4..edf064cf59 100644
--- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/mexico_turtles_958002.asset
+++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/mexico_turtles_958002.asset
@@ -29,7 +29,7 @@ local Layer = {
   Identifier = Identifier,
   Name = Name,
   Enabled = asset.enabled,
-  Type = "TemporalTileLayer",
+  Type = "TemporalTileProvider",
   Mode = "Folder",
   Folder = {
     Folder = syncedDirectory .. "2048",
diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/modis_sst.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/modis_sst.asset
index 44f12a17db..caba554a45 100644
--- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/modis_sst.asset
+++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/modis_sst.asset
@@ -28,7 +28,7 @@ local Layer = {
   Identifier = Identifier,
   Name = Name,
   Enabled = asset.enabled,
-  Type = "ImageSequenceTileLayer",
+  Type = "ImageSequenceTileProvider",
   FolderPath = syncedDirectory .. "2048",
   Description = Description
 }
diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/nasa_speed.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/nasa_speed.asset
index 5ec4f01cf3..ddb23c4a85 100644
--- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/nasa_speed.asset
+++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/nasa_speed.asset
@@ -28,7 +28,7 @@ local Layer = {
   Identifier = Identifier,
   Name = Name,
   Enabled = asset.enabled,
-  Type = "ImageSequenceTileLayer",
+  Type = "ImageSequenceTileProvider",
   FolderPath = syncedDirectory .. "4000",
   Description = Description
 }
diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/nasa_sst.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/nasa_sst.asset
index f3c37b0358..813324aa22 100644
--- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/nasa_sst.asset
+++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/nasa_sst.asset
@@ -26,7 +26,7 @@ local Layer = {
   Identifier = Identifier,
   Name = Name,
   Enabled = asset.enabled,
-  Type = "ImageSequenceTileLayer",
+  Type = "ImageSequenceTileProvider",
   FolderPath = syncedDirectory .. "4000",
   Description = Description
 }
diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/ocean_acid-co2_flux.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/ocean_acid-co2_flux.asset
index 8a996a24a2..7ce6e84ed0 100644
--- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/ocean_acid-co2_flux.asset
+++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/ocean_acid-co2_flux.asset
@@ -25,7 +25,7 @@ local Layer = {
   Identifier = Identifier,
   Name = Name,
   Enabled = asset.enabled,
-  Type = "TemporalTileLayer",
+  Type = "TemporalTileProvider",
   Mode = "Folder",
   Folder = {
     Folder = syncedDirectory .. "images",
diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/ocean_acid-ph.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/ocean_acid-ph.asset
index 0f910888ef..855b08afa1 100644
--- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/ocean_acid-ph.asset
+++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/ocean_acid-ph.asset
@@ -28,7 +28,7 @@ local Layer = {
   Identifier = Identifier,
   Name = Name,
   Enabled = asset.enabled,
-  Type = "TemporalTileLayer",
+  Type = "TemporalTileProvider",
   Mode = "Folder",
   Folder = {
     Folder = syncedDirectory .. "images",
diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/ocean_acid-saturation.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/ocean_acid-saturation.asset
index e99b96ee99..7371f28050 100644
--- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/ocean_acid-saturation.asset
+++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/ocean_acid-saturation.asset
@@ -33,7 +33,7 @@ local Layer = {
   Identifier = Identifier,
   Name = Name,
   Enabled = asset.enabled,
-  Type = "TemporalTileLayer",
+  Type = "TemporalTileProvider",
   Mode = "Folder",
   Folder = {
     Folder = syncedDirectory .. "images",
diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/ocean_depths_temp.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/ocean_depths_temp.asset
index 46b62e8f2a..846f34d8dd 100644
--- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/ocean_depths_temp.asset
+++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/ocean_depths_temp.asset
@@ -31,7 +31,7 @@ local Layer = {
   Identifier = Identifier,
   Name = Name,
   Enabled = asset.enabled,
-  Type = "ImageSequenceTileLayer",
+  Type = "ImageSequenceTileProvider",
   FolderPath = imagesDestination,
   Description = Description
 }
@@ -40,7 +40,7 @@ local LayerByDepth = {
   Identifier = Identifier .. "-bydepth",
   Name = Name .. " (by Depth)",
   Enabled = asset.enabled,
-  Type = "ImageSequenceTileLayer",
+  Type = "ImageSequenceTileProvider",
   FolderPath = imagesByDepthDestination,
   Description = Description
 }
diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/ocean_drain-gray.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/ocean_drain-gray.asset
index 22d0d9fc8f..b3c491381a 100644
--- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/ocean_drain-gray.asset
+++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/ocean_drain-gray.asset
@@ -26,7 +26,7 @@ local Layer = {
   Identifier = Identifier,
   Name = Name,
   Enabled = asset.enabled,
-  Type = "ImageSequenceTileLayer",
+  Type = "ImageSequenceTileProvider",
   FolderPath = syncedDirectory .. "4096",
   Description = Description
 }
diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/pac_turtle.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/pac_turtle.asset
index 75041aaea1..f3a36de299 100644
--- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/pac_turtle.asset
+++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/pac_turtle.asset
@@ -28,7 +28,7 @@ local Layer = {
   Identifier = Identifier,
   Name = Name,
   Enabled = asset.enabled,
-  Type = "TemporalTileLayer",
+  Type = "TemporalTileProvider",
   Mode = "Folder",
   Folder = {
     Folder = syncedDirectory .. "2048",
diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/phytoplankton.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/phytoplankton.asset
index 77f36009ea..6eb6fa12eb 100644
--- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/phytoplankton.asset
+++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/phytoplankton.asset
@@ -33,7 +33,7 @@ local Layer = {
   Identifier = Identifier,
   Name = Name,
   Enabled = asset.enabled,
-  Type = "ImageSequenceTileLayer",
+  Type = "ImageSequenceTileProvider",
   FolderPath = syncedDirectory .. "images",
   Description = Description
 }
diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/pr_tsunami.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/pr_tsunami.asset
index e4e99ebfe8..5019d5de8f 100644
--- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/pr_tsunami.asset
+++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/pr_tsunami.asset
@@ -29,7 +29,7 @@ local Layer = {
   Identifier = Identifier,
   Name = Name,
   Enabled = asset.enabled,
-  Type = "ImageSequenceTileLayer",
+  Type = "ImageSequenceTileProvider",
   FolderPath = syncedDirectory .. "2048",
   Description = Description
 }
diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/sea_level.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/sea_level.asset
index 3275d9f5d9..88749947cc 100644
--- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/sea_level.asset
+++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/sea_level.asset
@@ -34,7 +34,7 @@ local Layer = {
   Identifier = Identifier,
   Name = Name,
   Enabled = asset.enabled,
-  Type = "ImageSequenceTileLayer",
+  Type = "ImageSequenceTileProvider",
   FolderPath = syncedDirectory .. "4000",
   Description = Description
 }
diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/sea_surface_height_anomaly.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/sea_surface_height_anomaly.asset
index aac8596353..fbde95f363 100644
--- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/sea_surface_height_anomaly.asset
+++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/sea_surface_height_anomaly.asset
@@ -30,7 +30,7 @@ local Layer = {
   Identifier = Identifier,
   Name = Name,
   Enabled = asset.enabled,
-  Type = "ImageSequenceTileLayer",
+  Type = "ImageSequenceTileProvider",
   FolderPath = syncedDirectory .. "images",
   Description = Description
 }
diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/seaice_monthly.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/seaice_monthly.asset
index 71776524d7..6043d8e4ac 100644
--- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/seaice_monthly.asset
+++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/seaice_monthly.asset
@@ -28,7 +28,7 @@ local Layer = {
   Identifier = Identifier,
   Name = Name,
   Enabled = asset.enabled,
-  Type = "TemporalTileLayer",
+  Type = "TemporalTileProvider",
   Mode = "Folder",
   Folder = {
     Folder = syncedDirectory .. "4096",
diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/seawifs-land_background.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/seawifs-land_background.asset
index dda7d3718f..993e9e9022 100644
--- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/seawifs-land_background.asset
+++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/seawifs-land_background.asset
@@ -23,7 +23,7 @@ local Layer = {
   Identifier = Identifier,
   Name = Name,
   Enabled = asset.enabled,
-  Type = "ImageSequenceTileLayer",
+  Type = "ImageSequenceTileProvider",
   FolderPath = syncedDirectory .. "4096",
   Description = Description
 }
diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/seawifs-no_holes.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/seawifs-no_holes.asset
index bbb48f8618..c0a0c6082a 100644
--- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/seawifs-no_holes.asset
+++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/seawifs-no_holes.asset
@@ -24,7 +24,7 @@ local Layer = {
   Identifier = Identifier,
   Name = Name,
   Enabled = asset.enabled,
-  Type = "ImageSequenceTileLayer",
+  Type = "ImageSequenceTileProvider",
   FolderPath = syncedDirectory .. "2048",
   Description = Description
 }
diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/seawifs-polar_holes.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/seawifs-polar_holes.asset
index bcd447cacb..012ebd28de 100644
--- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/seawifs-polar_holes.asset
+++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/seawifs-polar_holes.asset
@@ -24,7 +24,7 @@ local Layer = {
   Identifier = Identifier,
   Name = Name,
   Enabled = asset.enabled,
-  Type = "ImageSequenceTileLayer",
+  Type = "ImageSequenceTileProvider",
   FolderPath = syncedDirectory .. "4320_png",
   Description = Description
 }
diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/shark.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/shark.asset
index 9ca297201e..ca0c3360c4 100644
--- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/shark.asset
+++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/shark.asset
@@ -29,7 +29,7 @@ local Layer = {
   Identifier = Identifier,
   Name = Name,
   Enabled = asset.enabled,
-  Type = "TemporalTileLayer",
+  Type = "TemporalTileProvider",
   Mode = "Folder",
   Folder = {
     Folder = syncedDirectory .. "2048",
diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/sss.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/sss.asset
index 8420f0cd6b..0ab1905034 100644
--- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/sss.asset
+++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/sss.asset
@@ -27,7 +27,7 @@ local Layer = {
   Identifier = Identifier,
   Name = Name,
   Enabled = asset.enabled,
-  Type = "ImageSequenceTileLayer",
+  Type = "ImageSequenceTileProvider",
   FolderPath = syncedDirectory .. "4096",
   Description = Description
 }
diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/sst_1980_1999.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/sst_1980_1999.asset
index 29654f0f29..c8b742970e 100644
--- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/sst_1980_1999.asset
+++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/sst_1980_1999.asset
@@ -29,7 +29,7 @@ local Layer = {
   Identifier = Identifier,
   Name = Name,
   Enabled = asset.enabled,
-  Type = "TemporalTileLayer",
+  Type = "TemporalTileProvider",
   Mode = "Folder",
   Folder = {
     Folder = syncedDirectory .. "4096",
diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/vector_winds.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/vector_winds.asset
index 121737a56c..fa7f73d43f 100644
--- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/vector_winds.asset
+++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/vector_winds.asset
@@ -30,7 +30,7 @@ local Layer = {
   Identifier = Identifier,
   Name = Name,
   Enabled = asset.enabled,
-  Type = "ImageSequenceTileLayer",
+  Type = "ImageSequenceTileProvider",
   FolderPath = syncedDirectory .. "images",
   Description = Description
 }
diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/vent_discoveries_animation.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/vent_discoveries_animation.asset
index 11285fea5b..9354c87045 100644
--- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/vent_discoveries_animation.asset
+++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/vent_discoveries_animation.asset
@@ -26,7 +26,7 @@ local Layer = {
   Identifier = Identifier,
   Name = Name,
   Enabled = asset.enabled,
-  Type = "TemporalTileLayer",
+  Type = "TemporalTileProvider",
   Mode = "Folder",
   Folder = {
     Folder = syncedDirectory .. "new",
diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/vorticity.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/vorticity.asset
index d258f60bd7..20a3fb3f8a 100644
--- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/vorticity.asset
+++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/vorticity.asset
@@ -27,7 +27,7 @@ local Layer = {
   Identifier = Identifier,
   Name = Name,
   Enabled = asset.enabled,
-  Type = "ImageSequenceTileLayer",
+  Type = "ImageSequenceTileProvider",
   FolderPath = syncedDirectory .. "frames",
   Description = Description
 }
diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/waves-wave_height_2012.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/waves-wave_height_2012.asset
index 7aca8b703e..aae1c3c290 100644
--- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/waves-wave_height_2012.asset
+++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/waves-wave_height_2012.asset
@@ -24,7 +24,7 @@ local Layer = {
   Identifier = Identifier,
   Name = Name,
   Enabled = asset.enabled,
-  Type = "ImageSequenceTileLayer",
+  Type = "ImageSequenceTileProvider",
   FolderPath = syncedDirectory .. "4096",
   Description = Description
 }
diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/waves-wave_height_katrina.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/waves-wave_height_katrina.asset
index ff5f904c85..3b9e4435e6 100644
--- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/waves-wave_height_katrina.asset
+++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/waves-wave_height_katrina.asset
@@ -26,7 +26,7 @@ local Layer = {
   Identifier = Identifier,
   Name = Name,
   Enabled = asset.enabled,
-  Type = "ImageSequenceTileLayer",
+  Type = "ImageSequenceTileProvider",
   FolderPath = syncedDirectory .. "4096",
   Description = Description
 }
diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/waves-wave_height_sandy.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/waves-wave_height_sandy.asset
index bbb7b24e8c..174650547f 100644
--- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/waves-wave_height_sandy.asset
+++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/waves-wave_height_sandy.asset
@@ -26,7 +26,7 @@ local Layer = {
   Identifier = Identifier,
   Name = Name,
   Enabled = asset.enabled,
-  Type = "ImageSequenceTileLayer",
+  Type = "ImageSequenceTileProvider",
   FolderPath = syncedDirectory .. "4096",
   Description = Description
 }
diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/waves-wave_power_2012.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/waves-wave_power_2012.asset
index bd07070dc0..c1fbc68467 100644
--- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/waves-wave_power_2012.asset
+++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/waves-wave_power_2012.asset
@@ -24,7 +24,7 @@ local Layer = {
   Identifier = Identifier,
   Name = Name,
   Enabled = asset.enabled,
-  Type = "ImageSequenceTileLayer",
+  Type = "ImageSequenceTileProvider",
   FolderPath = syncedDirectory .. "4096",
   Description = Description
 }
diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/weeklyseaice-10day_seaice.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/weeklyseaice-10day_seaice.asset
index 9ffd591f30..6d5533fd1a 100644
--- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/weeklyseaice-10day_seaice.asset
+++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/weeklyseaice-10day_seaice.asset
@@ -30,7 +30,7 @@ local Layer = {
   Identifier = Identifier,
   Name = Name,
   Enabled = asset.enabled,
-  Type = "TemporalTileLayer",
+  Type = "TemporalTileProvider",
   Mode = "Folder",
   Folder = {
     Folder = syncedDirectory .. "4096_png",
diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/weeklyseaice-sept_seaice.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/weeklyseaice-sept_seaice.asset
index b4e006454e..b299b2de26 100644
--- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/weeklyseaice-sept_seaice.asset
+++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/weeklyseaice-sept_seaice.asset
@@ -38,7 +38,7 @@ local Layer = {
   Identifier = Identifier,
   Name = Name,
   Enabled = asset.enabled,
-  Type = "TemporalTileLayer",
+  Type = "TemporalTileProvider",
   Mode = "Folder",
   Folder = {
     Folder = syncedDirectory .. "4096",
diff --git a/data/assets/scene/solarsystem/planets/mars/layers/overlays/indices.asset b/data/assets/scene/solarsystem/planets/mars/layers/overlays/indices.asset
index eba0ee9243..9b0e288b66 100644
--- a/data/assets/scene/solarsystem/planets/mars/layers/overlays/indices.asset
+++ b/data/assets/scene/solarsystem/planets/mars/layers/overlays/indices.asset
@@ -4,7 +4,7 @@ local globe = asset.require("../../mars")
 
 local Layer = {
   Identifier = "Indices",
-  Type = "TileIndexTileLayer",
+  Type = "TileIndexTileProvider",
   Enabled = asset.enabled
 }
 
diff --git a/data/assets/scene/solarsystem/planets/mars/layers/overlays/size_reference.asset b/data/assets/scene/solarsystem/planets/mars/layers/overlays/size_reference.asset
index 179cf96cee..ae7e657a10 100644
--- a/data/assets/scene/solarsystem/planets/mars/layers/overlays/size_reference.asset
+++ b/data/assets/scene/solarsystem/planets/mars/layers/overlays/size_reference.asset
@@ -6,7 +6,7 @@ local Layer = {
   Identifier = "Size_Reference",
   Name = "Size Reference",
   Enabled = asset.enabled,
-  Type = "SizeReferenceTileLayer",
+  Type = "SizeReferenceTileProvider",
   Radii = globe.Mars.Renderable.Radii
 }
 
diff --git a/data/assets/scene/solarsystem/planets/venus/layers/colorlayers/clouds_magellan_combo.asset b/data/assets/scene/solarsystem/planets/venus/layers/colorlayers/clouds_magellan_combo.asset
index 74d459010f..504cdfad08 100644
--- a/data/assets/scene/solarsystem/planets/venus/layers/colorlayers/clouds_magellan_combo.asset
+++ b/data/assets/scene/solarsystem/planets/venus/layers/colorlayers/clouds_magellan_combo.asset
@@ -14,7 +14,7 @@ local Layer = {
   Identifier = "Clouds_Magellan_Combo",
   Name = "Clouds Magellan Combo",
   Enabled = asset.enabled,
-  Type = "ByLevelTileLayer",
+  Type = "TileProviderByLevel",
   LevelTileProviders = {
     {
       MaxLevel = 4,
diff --git a/data/assets/scene/solarsystem/planets/venus/layers/colorlayers/clouds_magellan_combo_newyork.asset b/data/assets/scene/solarsystem/planets/venus/layers/colorlayers/clouds_magellan_combo_newyork.asset
index 87477b880b..172fee7f3a 100644
--- a/data/assets/scene/solarsystem/planets/venus/layers/colorlayers/clouds_magellan_combo_newyork.asset
+++ b/data/assets/scene/solarsystem/planets/venus/layers/colorlayers/clouds_magellan_combo_newyork.asset
@@ -14,7 +14,7 @@ local Layer = {
   Identifier = "Clouds_Magellan_Combo_NewYork",
   Name = "Clouds Magellan Combo [New York]",
   Enabled = asset.enabled,
-  Type = "ByLevelTileLayer",
+  Type = "TileProviderByLevel",
   LevelTileProviders = {
     {
       MaxLevel = 4,
diff --git a/modules/globebrowsing/globebrowsingmodule.cpp b/modules/globebrowsing/globebrowsingmodule.cpp
index 5850ce5b0c..cbfb1b10c7 100644
--- a/modules/globebrowsing/globebrowsingmodule.cpp
+++ b/modules/globebrowsing/globebrowsingmodule.cpp
@@ -302,15 +302,15 @@ void GlobeBrowsingModule::internalInitialize(const ghoul::Dictionary& dict) {
     ghoul_assert(fTileProvider, "TileProvider factory was not created");
 
 
-    fTileProvider->registerClass<DefaultTileProvider>("DefaultTileLayer");
-    fTileProvider->registerClass<SingleImageProvider>("SingleImageTileLayer");
-    fTileProvider->registerClass<ImageSequenceTileProvider>("ImageSequenceTileLayer");
-    fTileProvider->registerClass<SpoutImageProvider>("SpoutImageTileLayer");
-    fTileProvider->registerClass<TemporalTileProvider>("TemporalTileLayer");
-    fTileProvider->registerClass<TileIndexTileProvider>("TileIndexTileLayer");
-    fTileProvider->registerClass<SizeReferenceTileProvider>("SizeReferenceTileLayer");
-    fTileProvider->registerClass<TileProviderByLevel>("ByLevelTileLayer");
-    fTileProvider->registerClass<TileProviderByIndex>("ByIndexTileLayer");
+    fTileProvider->registerClass<DefaultTileProvider>("DefaultTileProvider");
+    fTileProvider->registerClass<SingleImageProvider>("SingleImageProvider");
+    fTileProvider->registerClass<ImageSequenceTileProvider>("ImageSequenceTileProvider");
+    fTileProvider->registerClass<SpoutImageProvider>("SpoutImageProvider");
+    fTileProvider->registerClass<TemporalTileProvider>("TemporalTileProvider");
+    fTileProvider->registerClass<TileIndexTileProvider>("TileIndexTileProvider");
+    fTileProvider->registerClass<SizeReferenceTileProvider>("SizeReferenceTileProvider");
+    fTileProvider->registerClass<TileProviderByLevel>("TileProviderByLevel");
+    fTileProvider->registerClass<TileProviderByIndex>("TileProviderByIndex");
 
     ghoul::TemplateFactory<DashboardItem>* fDashboard =
         FactoryManager::ref().factory<DashboardItem>();
diff --git a/modules/globebrowsing/shaders/texturetilemapping.glsl b/modules/globebrowsing/shaders/texturetilemapping.glsl
index 74811b8331..d7e39c3431 100644
--- a/modules/globebrowsing/shaders/texturetilemapping.glsl
+++ b/modules/globebrowsing/shaders/texturetilemapping.glsl
@@ -146,25 +146,25 @@ vec4 getSample#{layerGroup}#{i}(vec2 uv, vec3 levelWeights,
   vec4 c = vec4(0.0, 0.0, 0.0, 1.0);
 
     // All tile layers are the same. Sample from texture
-#if (#{#{layerGroup}#{i}LayerType} == 0) // DefaultTileLayer
+#if (#{#{layerGroup}#{i}LayerType} == 0) // DefaultTileProvider
   c = getTexVal(#{layerGroup}[#{i}].pile, levelWeights, uv, #{layerGroup}[#{i}].padding);
-#elif (#{#{layerGroup}#{i}LayerType} == 1) // SingleImageTileLayer
+#elif (#{#{layerGroup}#{i}LayerType} == 1) // SingleImageProvider
   c = getTexVal(#{layerGroup}[#{i}].pile, levelWeights, uv, #{layerGroup}[#{i}].padding);
-#elif (#{#{layerGroup}#{i}LayerType} == 2) // ImageSequenceTileLayer
+#elif (#{#{layerGroup}#{i}LayerType} == 2) // ImageSequenceTileProvider
   c = getTexVal(#{layerGroup}[#{i}].pile, levelWeights, uv, #{layerGroup}[#{i}].padding);
-#elif (#{#{layerGroup}#{i}LayerType} == 3) // SizeReferenceTileLayer
+#elif (#{#{layerGroup}#{i}LayerType} == 3) // SizeReferenceTileProvider
   c = getTexVal(#{layerGroup}[#{i}].pile, levelWeights, uv, #{layerGroup}[#{i}].padding);
-#elif (#{#{layerGroup}#{i}LayerType} == 4) // TemporalTileLayer
+#elif (#{#{layerGroup}#{i}LayerType} == 4) // TemporalTileProvider
   c = getTexVal(#{layerGroup}[#{i}].pile, levelWeights, uv, #{layerGroup}[#{i}].padding);
-#elif (#{#{layerGroup}#{i}LayerType} == 5) // TileIndexTileLayer
+#elif (#{#{layerGroup}#{i}LayerType} == 5) // TileIndexTileProvider
   c = getTexVal(#{layerGroup}[#{i}].pile, levelWeights, uv, #{layerGroup}[#{i}].padding);
-#elif (#{#{layerGroup}#{i}LayerType} == 6) // ByIndexTileLayer
+#elif (#{#{layerGroup}#{i}LayerType} == 6) // TileProviderByIndex
   c = getTexVal(#{layerGroup}[#{i}].pile, levelWeights, uv, #{layerGroup}[#{i}].padding);
-#elif (#{#{layerGroup}#{i}LayerType} == 7) // ByLevelTileLayer
+#elif (#{#{layerGroup}#{i}LayerType} == 7) // TileProviderByLevel
   c = getTexVal(#{layerGroup}[#{i}].pile, levelWeights, uv, #{layerGroup}[#{i}].padding);
 #elif (#{#{layerGroup}#{i}LayerType} == 8) // SolidColor
   c.rgb = #{layerGroup}[#{i}].color;
-#elif (#{#{layerGroup}#{i}LayerType} == 9) // SpoutImageTileLayer
+#elif (#{#{layerGroup}#{i}LayerType} == 9) // SpoutImageProvider
   c = getTexVal(#{layerGroup}[#{i}].pile, levelWeights, uv, #{layerGroup}[#{i}].padding);
 #elif (#{#{layerGroup}#{i}LayerType} == 10) // VideoTileProvider
   c = getTexVal(#{layerGroup}[#{i}].pile, levelWeights, uv, #{layerGroup}[#{i}].padding);
diff --git a/modules/globebrowsing/src/gpulayergroup.cpp b/modules/globebrowsing/src/gpulayergroup.cpp
index 1f27869a97..adc2f7b6ea 100644
--- a/modules/globebrowsing/src/gpulayergroup.cpp
+++ b/modules/globebrowsing/src/gpulayergroup.cpp
@@ -66,16 +66,16 @@ void GPULayerGroup::setValue(ghoul::opengl::ProgramObject& program,
 
         switch (al.type()) {
             // Intentional fall through. Same for all tile layers
-            case layers::Layer::ID::DefaultTileLayer:
-            case layers::Layer::ID::SingleImageTileLayer:
-            case layers::Layer::ID::SpoutImageTileLayer:
-            case layers::Layer::ID::VideoTileLayer:
-            case layers::Layer::ID::ImageSequenceTileLayer:
-            case layers::Layer::ID::SizeReferenceTileLayer:
-            case layers::Layer::ID::TemporalTileLayer:
-            case layers::Layer::ID::TileIndexTileLayer:
-            case layers::Layer::ID::ByIndexTileLayer:
-            case layers::Layer::ID::ByLevelTileLayer: {
+            case layers::Layer::ID::DefaultTileProvider:
+            case layers::Layer::ID::SingleImageProvider:
+            case layers::Layer::ID::SpoutImageProvider:
+            case layers::Layer::ID::VideoTileProvider:
+            case layers::Layer::ID::ImageSequenceTileProvider:
+            case layers::Layer::ID::SizeReferenceTileProvider:
+            case layers::Layer::ID::TemporalTileProvider:
+            case layers::Layer::ID::TileIndexTileProvider:
+            case layers::Layer::ID::TileProviderByIndex:
+            case layers::Layer::ID::TileProviderByLevel: {
                 const ChunkTilePile& ctp = al.chunkTilePile(
                     tileIndex,
                     layerGroup.pileSize()
@@ -146,16 +146,16 @@ void GPULayerGroup::bind(ghoul::opengl::ProgramObject& p, const LayerGroup& laye
 
         switch (al.type()) {
             // Intentional fall through. Same for all tile layers
-            case layers::Layer::ID::DefaultTileLayer:
-            case layers::Layer::ID::SingleImageTileLayer:
-            case layers::Layer::ID::SpoutImageTileLayer:
-            case layers::Layer::ID::VideoTileLayer:
-            case layers::Layer::ID::ImageSequenceTileLayer:
-            case layers::Layer::ID::SizeReferenceTileLayer:
-            case layers::Layer::ID::TemporalTileLayer:
-            case layers::Layer::ID::TileIndexTileLayer:
-            case layers::Layer::ID::ByIndexTileLayer:
-            case layers::Layer::ID::ByLevelTileLayer: {
+            case layers::Layer::ID::DefaultTileProvider:
+            case layers::Layer::ID::SingleImageProvider:
+            case layers::Layer::ID::SpoutImageProvider:
+            case layers::Layer::ID::VideoTileProvider:
+            case layers::Layer::ID::ImageSequenceTileProvider:
+            case layers::Layer::ID::SizeReferenceTileProvider:
+            case layers::Layer::ID::TemporalTileProvider:
+            case layers::Layer::ID::TileIndexTileProvider:
+            case layers::Layer::ID::TileProviderByIndex:
+            case layers::Layer::ID::TileProviderByLevel: {
                 gal.gpuChunkTiles.resize(pileSize);
                 for (size_t j = 0; j < gal.gpuChunkTiles.size(); ++j) {
                     GPULayer::GPUChunkTile& t = gal.gpuChunkTiles[j];
diff --git a/modules/globebrowsing/src/layer.cpp b/modules/globebrowsing/src/layer.cpp
index b051f6f37d..f9da70aa1a 100644
--- a/modules/globebrowsing/src/layer.cpp
+++ b/modules/globebrowsing/src/layer.cpp
@@ -121,11 +121,12 @@ namespace {
         std::optional<glm::vec3> color [[codegen::color()]];
 
         // Specifies the type of layer that is to be added. If this value is not
-        // specified, the layer is a DefaultTileLayer
-        std::optional<std::string> type [[codegen::inlist("DefaultTileLayer",
-            "SingleImageTileLayer", "ImageSequenceTileLayer", "SizeReferenceTileLayer",
-            "TemporalTileLayer", "TileIndexTileLayer", "ByIndexTileLayer",
-            "ByLevelTileLayer", "SolidColor", "SpoutImageTileLayer", "VideoTileLayer")]];
+        // specified, the layer is a DefaultTileProvider
+        std::optional<std::string> type [[codegen::inlist("DefaultTileProvider",
+            "SingleImageProvider", "ImageSequenceTileProvider",
+            "SizeReferenceTileProvider", "TemporalTileProvider", "TileIndexTileProvider",
+            "TileProviderByIndex", "TileProviderByLevel", "SolidColor",
+            "SpoutImageProvider", "VideoTileProvider")]];
 
         // Determine whether the layer is enabled or not. If this value is not specified,
         // the layer is disabled
@@ -220,7 +221,7 @@ Layer::Layer(layers::Group::ID id, const ghoul::Dictionary& layerDict, LayerGrou
         }
     }
     else {
-        typeID = layers::Layer::ID::DefaultTileLayer;
+        typeID = layers::Layer::ID::DefaultTileProvider;
     }
 
     initializeBasedOnType(typeID, layerDict);
@@ -320,16 +321,16 @@ Layer::Layer(layers::Group::ID id, const ghoul::Dictionary& layerDict, LayerGrou
     _typeOption.onChange([this]() {
         switch (type()) {
             // Intentional fall through. Same for all tile layers
-            case layers::Layer::ID::DefaultTileLayer:
-            case layers::Layer::ID::SingleImageTileLayer:
-            case layers::Layer::ID::SpoutImageTileLayer:
-            case layers::Layer::ID::ImageSequenceTileLayer:
-            case layers::Layer::ID::SizeReferenceTileLayer:
-            case layers::Layer::ID::TemporalTileLayer:
-            case layers::Layer::ID::TileIndexTileLayer:
-            case layers::Layer::ID::ByIndexTileLayer:
-            case layers::Layer::ID::ByLevelTileLayer:
-            case layers::Layer::ID::VideoTileLayer:
+            case layers::Layer::ID::DefaultTileProvider:
+            case layers::Layer::ID::SingleImageProvider:
+            case layers::Layer::ID::SpoutImageProvider:
+            case layers::Layer::ID::ImageSequenceTileProvider:
+            case layers::Layer::ID::SizeReferenceTileProvider:
+            case layers::Layer::ID::TemporalTileProvider:
+            case layers::Layer::ID::TileIndexTileProvider:
+            case layers::Layer::ID::TileProviderByIndex:
+            case layers::Layer::ID::TileProviderByLevel:
+            case layers::Layer::ID::VideoTileProvider:
                 if (_tileProvider) {
                     removePropertySubOwner(*_tileProvider);
                 }
@@ -495,16 +496,16 @@ glm::vec2 Layer::tileUvToTextureSamplePosition(const TileUvTransform& uvTransfor
 void Layer::initializeBasedOnType(layers::Layer::ID id, ghoul::Dictionary initDict) {
     switch (id) {
         // Intentional fall through. Same for all tile layers
-        case layers::Layer::ID::DefaultTileLayer:
-        case layers::Layer::ID::SingleImageTileLayer:
-        case layers::Layer::ID::SpoutImageTileLayer:
-        case layers::Layer::ID::ImageSequenceTileLayer:
-        case layers::Layer::ID::SizeReferenceTileLayer:
-        case layers::Layer::ID::TemporalTileLayer:
-        case layers::Layer::ID::TileIndexTileLayer:
-        case layers::Layer::ID::ByIndexTileLayer:
-        case layers::Layer::ID::ByLevelTileLayer:
-        case layers::Layer::ID::VideoTileLayer:
+        case layers::Layer::ID::DefaultTileProvider:
+        case layers::Layer::ID::SingleImageProvider:
+        case layers::Layer::ID::SpoutImageProvider:
+        case layers::Layer::ID::ImageSequenceTileProvider:
+        case layers::Layer::ID::SizeReferenceTileProvider:
+        case layers::Layer::ID::TemporalTileProvider:
+        case layers::Layer::ID::TileIndexTileProvider:
+        case layers::Layer::ID::TileProviderByIndex:
+        case layers::Layer::ID::TileProviderByLevel:
+        case layers::Layer::ID::VideoTileProvider:
             // We add the id to the dictionary since it needs to be known by
             // the tile provider
             initDict.setValue(
@@ -530,16 +531,16 @@ void Layer::initializeBasedOnType(layers::Layer::ID id, ghoul::Dictionary initDi
 void Layer::addVisibleProperties() {
     switch (type()) {
         // Intentional fall through. Same for all tile layers
-        case layers::Layer::ID::DefaultTileLayer:
-        case layers::Layer::ID::SingleImageTileLayer:
-        case layers::Layer::ID::SpoutImageTileLayer:
-        case layers::Layer::ID::ImageSequenceTileLayer:
-        case layers::Layer::ID::SizeReferenceTileLayer:
-        case layers::Layer::ID::TemporalTileLayer:
-        case layers::Layer::ID::TileIndexTileLayer:
-        case layers::Layer::ID::ByIndexTileLayer:
-        case layers::Layer::ID::ByLevelTileLayer:
-        case layers::Layer::ID::VideoTileLayer:
+        case layers::Layer::ID::DefaultTileProvider:
+        case layers::Layer::ID::SingleImageProvider:
+        case layers::Layer::ID::SpoutImageProvider:
+        case layers::Layer::ID::ImageSequenceTileProvider:
+        case layers::Layer::ID::SizeReferenceTileProvider:
+        case layers::Layer::ID::TemporalTileProvider:
+        case layers::Layer::ID::TileIndexTileProvider:
+        case layers::Layer::ID::TileProviderByIndex:
+        case layers::Layer::ID::TileProviderByLevel:
+        case layers::Layer::ID::VideoTileProvider:
             if (_tileProvider) {
                 addPropertySubOwner(*_tileProvider);
             }
diff --git a/modules/globebrowsing/src/layergroupid.h b/modules/globebrowsing/src/layergroupid.h
index d6c4d55dfe..146482621f 100644
--- a/modules/globebrowsing/src/layergroupid.h
+++ b/modules/globebrowsing/src/layergroupid.h
@@ -78,17 +78,17 @@ constexpr std::array<Group, 5> Groups = {
 
 struct Layer {
     enum class ID {
-        DefaultTileLayer = 0,
-        SingleImageTileLayer,
-        ImageSequenceTileLayer,
-        SizeReferenceTileLayer,
-        TemporalTileLayer,
-        TileIndexTileLayer,
-        ByIndexTileLayer,
-        ByLevelTileLayer,
+        DefaultTileProvider = 0,
+        SingleImageProvider,
+        ImageSequenceTileProvider,
+        SizeReferenceTileProvider,
+        TemporalTileProvider,
+        TileIndexTileProvider,
+        TileProviderByIndex,
+        TileProviderByLevel,
         SolidColor,
-        SpoutImageTileLayer,
-        VideoTileLayer,
+        SpoutImageProvider,
+        VideoTileProvider,
         Unknown
     };
 
@@ -98,48 +98,48 @@ struct Layer {
 
 constexpr std::array<Layer, 11> Layers = {
     Layer {
-        .id = Layer::ID::DefaultTileLayer,
-        .identifier = "DefaultTileLayer"
+        .id = Layer::ID::DefaultTileProvider,
+        .identifier = "DefaultTileProvider"
     },
     Layer {
-        .id = Layer::ID::SingleImageTileLayer,
-        .identifier = "SingleImageTileLayer"
+        .id = Layer::ID::SingleImageProvider,
+        .identifier = "SingleImageProvider"
     },
     Layer {
-        .id = Layer::ID::ImageSequenceTileLayer,
-        .identifier = "ImageSequenceTileLayer"
+        .id = Layer::ID::ImageSequenceTileProvider,
+        .identifier = "ImageSequenceTileProvider"
     },
     Layer {
-        .id = Layer::ID::SizeReferenceTileLayer,
-        .identifier = "SizeReferenceTileLayer"
+        .id = Layer::ID::SizeReferenceTileProvider,
+        .identifier = "SizeReferenceTileProvider"
     },
     Layer {
-        .id = Layer::ID::TemporalTileLayer,
-        .identifier = "TemporalTileLayer"
+        .id = Layer::ID::TemporalTileProvider,
+        .identifier = "TemporalTileProvider"
     },
     Layer {
-        .id = Layer::ID::TileIndexTileLayer,
-        .identifier = "TileIndexTileLayer"
+        .id = Layer::ID::TileIndexTileProvider,
+        .identifier = "TileIndexTileProvider"
     },
     Layer {
-        .id = Layer::ID::ByIndexTileLayer,
-        .identifier = "ByIndexTileLayer"
+        .id = Layer::ID::TileProviderByIndex,
+        .identifier = "TileProviderByIndex"
     },
     Layer {
-        .id = Layer::ID::ByLevelTileLayer,
-        .identifier = "ByLevelTileLayer"
+        .id = Layer::ID::TileProviderByLevel,
+        .identifier = "TileProviderByLevel"
     },
     Layer {
         .id = Layer::ID::SolidColor,
         .identifier = "SolidColor"
     },
     Layer {
-        .id = Layer::ID::SpoutImageTileLayer,
-        .identifier = "SpoutImageTileLayer"
+        .id = Layer::ID::SpoutImageProvider,
+        .identifier = "SpoutImageProvider"
     },
     Layer {
-        .id = Layer::ID::VideoTileLayer,
-        .identifier = "VideoTileLayer"
+        .id = Layer::ID::VideoTileProvider,
+        .identifier = "VideoTileProvider"
     }
 };
 
diff --git a/modules/globebrowsing/src/tileprovider/tileproviderbyindex.cpp b/modules/globebrowsing/src/tileprovider/tileproviderbyindex.cpp
index 30428e5724..4b05839083 100644
--- a/modules/globebrowsing/src/tileprovider/tileproviderbyindex.cpp
+++ b/modules/globebrowsing/src/tileprovider/tileproviderbyindex.cpp
@@ -69,7 +69,7 @@ TileProviderByIndex::TileProviderByIndex(const ghoul::Dictionary& dictionary) {
 
     const Parameters p = codegen::bake<Parameters>(dictionary);
 
-    layers::Layer::ID typeID = layers::Layer::ID::DefaultTileLayer;
+    layers::Layer::ID typeID = layers::Layer::ID::DefaultTileProvider;
     if (p.defaultProvider.hasValue<std::string>("Type")) {
         std::string type = p.defaultProvider.value<std::string>("Type");
         typeID = ghoul::from_string<layers::Layer::ID>(type);
@@ -88,7 +88,7 @@ TileProviderByIndex::TileProviderByIndex(const ghoul::Dictionary& dictionary) {
             static_cast<uint8_t>(ip.tileIndex.level)
         );
 
-        layers::Layer::ID providerID = layers::Layer::ID::DefaultTileLayer;
+        layers::Layer::ID providerID = layers::Layer::ID::DefaultTileProvider;
         if (ip.tileProvider.hasValue<std::string>("Type")) {
             std::string type = ip.tileProvider.value<std::string>("Type");
             providerID = ghoul::from_string<layers::Layer::ID>(type);
diff --git a/modules/globebrowsing/src/tileprovider/tileproviderbylevel.cpp b/modules/globebrowsing/src/tileprovider/tileproviderbylevel.cpp
index da1228fa40..b86fbca700 100644
--- a/modules/globebrowsing/src/tileprovider/tileproviderbylevel.cpp
+++ b/modules/globebrowsing/src/tileprovider/tileproviderbylevel.cpp
@@ -56,7 +56,7 @@ TileProviderByLevel::TileProviderByLevel(const ghoul::Dictionary& dictionary) {
         ghoul::Dictionary& tileProviderDict = provider.tileProvider;
         tileProviderDict.setValue("LayerGroupID", static_cast<int>(group));
 
-        layers::Layer::ID typeID = layers::Layer::ID::DefaultTileLayer;
+        layers::Layer::ID typeID = layers::Layer::ID::DefaultTileProvider;
         if (tileProviderDict.hasValue<std::string>("Type")) {
             std::string type = tileProviderDict.value<std::string>("Type");
             typeID = ghoul::from_string<layers::Layer::ID>(type);
diff --git a/modules/video/videomodule.cpp b/modules/video/videomodule.cpp
index 7963296979..9c67becbb1 100644
--- a/modules/video/videomodule.cpp
+++ b/modules/video/videomodule.cpp
@@ -65,7 +65,7 @@ void VideoModule::internalInitialize(const ghoul::Dictionary& dict) {
     ghoul::TemplateFactory<globebrowsing::TileProvider>* fTileProvider =
         FactoryManager::ref().factory<globebrowsing::TileProvider>();
     ghoul_assert(fTileProvider, "TileProvider factory was not created");
-    fTileProvider->registerClass<globebrowsing::VideoTileProvider>("VideoTileLayer");
+    fTileProvider->registerClass<globebrowsing::VideoTileProvider>("VideoTileProvider");
 
     ghoul::TemplateFactory<ScreenSpaceRenderable>* fSsRenderable =
         FactoryManager::ref().factory<ScreenSpaceRenderable>();

From f78f42fbd5aa348f56e5a7e41f3e94839a86e720 Mon Sep 17 00:00:00 2001
From: Emma Broman <emma.broman@liu.se>
Date: Fri, 4 Aug 2023 08:31:49 +0200
Subject: [PATCH 070/701] Fix miguiding RotationSpeedFactor documentation, and
 increase default value (closes #2838)

---
 src/navigation/pathnavigator.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/navigation/pathnavigator.cpp b/src/navigation/pathnavigator.cpp
index 4d4fa5c36b..f61478fcb5 100644
--- a/src/navigation/pathnavigator.cpp
+++ b/src/navigation/pathnavigator.cpp
@@ -101,7 +101,7 @@ namespace {
         "Rotation Speed Factor (Linear Path)",
         "Affects how fast the camera rotates to the target rotation during a linear "
         "path. A value of 1 means that the camera will rotate 90 degrees in about 5 "
-        "seconds. A value of 2 means twice that fast, and so on",
+        "seconds. A value of 2 means twice that time, i.e. 10 seconds, and so on",
         // @VISIBILITY(2.5)
         openspace::properties::Property::Visibility::User
     };
@@ -137,7 +137,7 @@ PathNavigator::PathNavigator()
     , _speedScale(SpeedScaleInfo, 1.f, 0.01f, 2.f)
     , _applyIdleBehaviorOnFinish(IdleBehaviorOnFinishInfo, false)
     , _arrivalDistanceFactor(ArrivalDistanceFactorInfo, 2.0, 0.1, 20.0)
-    , _linearRotationSpeedFactor(RotationSpeedFactorInfo, 1.f, 0.1f, 2.f)
+    , _linearRotationSpeedFactor(RotationSpeedFactorInfo, 1.5f, 0.1f, 3.f)
     , _minValidBoundingSphere(MinBoundingSphereInfo, 10.0, 1.0, 3e10)
     , _relevantNodeTags(RelevantNodeTagsInfo)
 {

From 57fafe48f4e764c59f58e7b87b898a22febe96ca Mon Sep 17 00:00:00 2001
From: Alexander Bock <alexander.bock@liu.se>
Date: Sat, 5 Aug 2023 19:20:08 +0200
Subject: [PATCH 071/701] Rename Lua function to bring them more in line with
 the function naming in C++ (#2840)

* Rename Lua function to bring them more in line with the function naming in C++
---
 .../actions/planets/planet_lighting.asset     |  4 +-
 .../planets/scale_planets_and_moons.asset     |  4 +-
 .../trails/on_off_all_minor_moons.asset       | 16 ++--
 .../toggle_all_dwarf_planet_trails.asset      |  4 +-
 .../trails/toggle_all_minor_moon_trails.asset |  4 +-
 .../actions/trails/toggle_all_trails.asset    | 14 ++--
 ...gle_all_trails_planets_moons_instant.asset |  8 +-
 data/assets/actions/trails/toggle_trail.asset |  2 +-
 .../trails/toggle_trails_planets_moons.asset  |  6 +-
 .../actions/trails/trail_appearance.asset     | 10 +--
 data/assets/base_keybindings.asset            |  4 +-
 data/assets/default_keybindings.asset         |  4 +-
 data/assets/events/toggle_sun.asset           |  2 +-
 .../modules/exoplanets/exoplanets_data.asset  |  4 +-
 .../exoplanets/exoplanets_textures.asset      | 10 +--
 data/assets/nightsky/planets.asset            |  2 +-
 .../2012/sun_earth_2012_fieldlines_pfss.asset |  2 +-
 .../bastille_day/density_volume.asset         |  6 +-
 .../heliosphere/bastille_day/fieldlines.asset |  6 +-
 .../heliosphere/bastille_day/fluxnodes.asset  |  6 +-
 .../bastille_day/fluxnodescutplane.asset      | 12 +--
 .../bastille_day/fluxnodeslegend.asset        |  8 +-
 .../solarsystem/missions/apollo/actions.asset |  2 +-
 .../apollo/apollo_globebrowsing.asset         |  2 +-
 .../missions/artemis/toggle_trail.asset       |  4 +-
 .../missions/newhorizons/actions.asset        | 32 ++++----
 .../missions/osirisrex/actions.asset          |  2 +-
 .../solarsystem/missions/rosetta/67p.asset    |  2 +-
 .../missions/rosetta/actions.asset            |  4 +-
 .../missions/rosetta/rosetta.asset            |  4 +-
 .../missions/voyager/actions.asset            |  4 +-
 .../solarsystem/planets/earth/earth.asset     |  4 +-
 .../solarsystem/planets/earth/moon/moon.asset |  2 +-
 .../planets/jupiter/major_moons.asset         | 16 ++--
 .../planets/jupiter/minor_moons.asset         | 16 ++--
 .../planets/neptune/major_moons.asset         | 16 ++--
 .../planets/neptune/minor_moons.asset         | 16 ++--
 .../planets/saturn/major_moons.asset          | 16 ++--
 .../planets/saturn/minor_moons.asset          | 16 ++--
 .../planets/uranus/major_moons.asset          | 16 ++--
 .../planets/uranus/minor_moons.asset          | 16 ++--
 .../scene/solarsystem/sun/EUV_layer.asset     |  6 +-
 .../solarsystem/telescopes/jwst/actions.asset | 28 +++----
 .../telescopes/jwst/timelapse.asset           |  2 +-
 .../telescopes/jwst/toggle_trail.asset        |  6 +-
 data/assets/util/dpiscaling.asset             |  8 +-
 data/assets/util/property_helper.asset        |  6 +-
 data/assets/util/screenshots_endpoint.asset   |  4 +-
 modules/exoplanets/exoplanetsmodule.cpp       |  3 +-
 modules/exoplanets/exoplanetsmodule_lua.inl   | 16 +++-
 modules/globebrowsing/globebrowsingmodule.cpp |  9 ++-
 .../globebrowsing/globebrowsingmodule_lua.inl | 73 +++++++++++++++++--
 src/scene/scene.cpp                           | 15 +++-
 src/scene/scene_lua.inl                       | 25 ++++++-
 54 files changed, 321 insertions(+), 208 deletions(-)

diff --git a/data/assets/actions/planets/planet_lighting.asset b/data/assets/actions/planets/planet_lighting.asset
index 5a8923845f..95da0b5b6c 100644
--- a/data/assets/actions/planets/planet_lighting.asset
+++ b/data/assets/actions/planets/planet_lighting.asset
@@ -6,7 +6,7 @@ local function illuminationCommand(node, global)
   if (global) then
     commandString = commandString .. [[
 if (openspace.hasProperty("Scene."..node..".Renderable.UseAccurateNormals")) then
-  local list = openspace.getProperty("Scene." .. node .. ".Renderable.Layers.NightLayers.*.Enabled")
+  local list = openspace.property("Scene." .. node .. ".Renderable.Layers.NightLayers.*.Enabled")
   if (#list > 0) then
     openspace.setPropertyValue("Scene." .. node .. ".Renderable.Layers.NightLayers.*.Enabled", false)
   else
@@ -24,7 +24,7 @@ end]]
   else
     --todo @micahnyc this 40 wont do once we have more rings
     commandString = commandString .. [[if (openspace.hasProperty("Scene."..node..".Renderable.UseAccurateNormals")) then
-local list = openspace.getProperty("Scene." .. node .. ".Renderable.Layers.NightLayers.*.Enabled")
+local list = openspace.property("Scene." .. node .. ".Renderable.Layers.NightLayers.*.Enabled")
 if (#list > 0) then
   openspace.setPropertyValue(list[1], true)
 else
diff --git a/data/assets/actions/planets/scale_planets_and_moons.asset b/data/assets/actions/planets/scale_planets_and_moons.asset
index 10ee22dd18..7db5f9c182 100644
--- a/data/assets/actions/planets/scale_planets_and_moons.asset
+++ b/data/assets/actions/planets/scale_planets_and_moons.asset
@@ -29,12 +29,12 @@ local function toggleScaleAction(identifier, scale, name, speedup, speeddown)
     Identifier = "os.toggle_" .. string.gsub(name, "%s+", "") .. "_scale",
     Name = "Toggle " .. name .. " scale",
     Command = [[
-local list = openspace.getProperty("]] .. identifier .. [[.Scale.Scale")
+local list = openspace.property("]] .. identifier .. [[.Scale.Scale")
 if #list == 0 then
   openspace.printWarning("No planets to resize")
 else
   local prop = list[1]
-  local currentScale = openspace.getPropertyValue(prop)
+  local currentScale = openspace.propertyValue(prop)
   local newScale = 1
   if (currentScale == 1) then
     ]] .. scaleCommand(identifier, scale, speedup) .. [[
diff --git a/data/assets/actions/trails/on_off_all_minor_moons.asset b/data/assets/actions/trails/on_off_all_minor_moons.asset
index a70f772b9e..e0441c6ac4 100644
--- a/data/assets/actions/trails/on_off_all_minor_moons.asset
+++ b/data/assets/actions/trails/on_off_all_minor_moons.asset
@@ -2,11 +2,11 @@ local MinorMoonsOn = {
   Identifier = "os.MinorMoonsOn",
   Name = "Turn on minor moons and trails",
   Command = [[
-    local trails = openspace.getProperty("{moonTrail_minor}.Renderable.Enabled")
-    local trails_fade = openspace.getProperty("{moonTrail_minor}.Renderable.Fade")
+    local trails = openspace.property("{moonTrail_minor}.Renderable.Enabled")
+    local trails_fade = openspace.property("{moonTrail_minor}.Renderable.Fade")
 
-    local moons = openspace.getProperty("{moon_minor}.Renderable.Enabled")
-    local moons_fade = openspace.getProperty("{moon_minor}.Renderable.Fade")
+    local moons = openspace.property("{moon_minor}.Renderable.Enabled")
+    local moons_fade = openspace.property("{moon_minor}.Renderable.Fade")
 
     for i, v in pairs(trails_fade) do
       openspace.setPropertyValueSingle(trails[i], true)
@@ -27,11 +27,11 @@ local MinorMoonsOff = {
   Identifier = "os.MinorMoonsOff",
   Name = "Turn off minor moons and trails",
   Command = [[
-    local trails = openspace.getProperty("{moonTrail_minor}.Renderable.Enabled")
-    local trails_fade = openspace.getProperty("{moonTrail_minor}.Renderable.Fade")
+    local trails = openspace.property("{moonTrail_minor}.Renderable.Enabled")
+    local trails_fade = openspace.property("{moonTrail_minor}.Renderable.Fade")
 
-    local moons = openspace.getProperty("{moon_minor}.Renderable.Enabled")
-    local moons_fade = openspace.getProperty("{moon_minor}.Renderable.Fade")
+    local moons = openspace.property("{moon_minor}.Renderable.Enabled")
+    local moons_fade = openspace.property("{moon_minor}.Renderable.Fade")
 
     for i, v in pairs(trails_fade) do
       openspace.setPropertyValueSingle(
diff --git a/data/assets/actions/trails/toggle_all_dwarf_planet_trails.asset b/data/assets/actions/trails/toggle_all_dwarf_planet_trails.asset
index 3fc127643f..d57b55886c 100644
--- a/data/assets/actions/trails/toggle_all_dwarf_planet_trails.asset
+++ b/data/assets/actions/trails/toggle_all_dwarf_planet_trails.asset
@@ -2,9 +2,9 @@ local ToggleDwarfPlanetTrails = {
   Identifier = "os.ToggleDwarfPlanetTrails",
   Name = "Toggle dwarf planet trails",
   Command = [[
-    local list = openspace.getProperty("{planetTrail_dwarf}.Renderable.Enabled")
+    local list = openspace.property("{planetTrail_dwarf}.Renderable.Enabled")
     for _,v in pairs(list) do
-      openspace.setPropertyValueSingle(v, not openspace.getPropertyValue(v))
+      openspace.setPropertyValueSingle(v, not openspace.propertyValue(v))
     end
   ]],
   Documentation = "Toggle on/off trails for all dwarf planets in the solar system",
diff --git a/data/assets/actions/trails/toggle_all_minor_moon_trails.asset b/data/assets/actions/trails/toggle_all_minor_moon_trails.asset
index 65c508dea8..d86ff3c470 100644
--- a/data/assets/actions/trails/toggle_all_minor_moon_trails.asset
+++ b/data/assets/actions/trails/toggle_all_minor_moon_trails.asset
@@ -2,9 +2,9 @@ local ToggleMinorMoonTrails = {
   Identifier = "os.ToggleMinorMoonTrails",
   Name = "Toggle minor moon trails",
   Command = [[
-    local list = openspace.getProperty("{moonTrail_minor}.Renderable.Enabled")
+    local list = openspace.property("{moonTrail_minor}.Renderable.Enabled")
     for _,v in pairs(list) do
-      openspace.setPropertyValueSingle(v, not openspace.getPropertyValue(v))
+      openspace.setPropertyValueSingle(v, not openspace.propertyValue(v))
     end
   ]],
   Documentation = "Toggle on/off minor moon trails for all planets in the solar system",
diff --git a/data/assets/actions/trails/toggle_all_trails.asset b/data/assets/actions/trails/toggle_all_trails.asset
index e3a7cf6e19..22bc7fdb68 100644
--- a/data/assets/actions/trails/toggle_all_trails.asset
+++ b/data/assets/actions/trails/toggle_all_trails.asset
@@ -2,11 +2,11 @@ local FadeUpTrails = {
   Identifier = "os.FadeUpTrails",
   Name = "Show all trails",
   Command = [[
-    local capList = openspace.getProperty("Scene.*Trail.Renderable.Fade")
+    local capList = openspace.property("Scene.*Trail.Renderable.Fade")
     for _,v in ipairs(capList) do
       openspace.setPropertyValueSingle(v, 1, 2)
     end
-    local list = openspace.getProperty("Scene.*trail.Renderable.Fade")
+    local list = openspace.property("Scene.*trail.Renderable.Fade")
     for _,v in ipairs(list) do
       openspace.setPropertyValueSingle(v, 1, 2)
     end
@@ -20,11 +20,11 @@ local FadeDownTrails = {
   Identifier = "os.FadeDownTrails",
   Name = "Hide all trails",
   Command = [[
-    local capList = openspace.getProperty("Scene.*Trail.Renderable.Fade")
+    local capList = openspace.property("Scene.*Trail.Renderable.Fade")
     for _,v in ipairs(capList) do
       openspace.setPropertyValueSingle(v, 0, 2)
     end
-    local list = openspace.getProperty("Scene.*trail.Renderable.Fade")
+    local list = openspace.property("Scene.*trail.Renderable.Fade")
     for _,v in ipairs(list) do
       openspace.setPropertyValueSingle(v, 0, 2)
     end
@@ -38,8 +38,8 @@ local ToggleTrails = {
   Identifier = "os.ToggleTrails",
   Name = "Toggle all trails",
   Command = [[
-    local capList = openspace.getProperty("*Trail.Renderable.Fade")
-    local list = openspace.getProperty("*trail.Renderable.Fade")
+    local capList = openspace.property("*Trail.Renderable.Fade")
+    local list = openspace.property("*trail.Renderable.Fade")
     if (#capList == 0) and (#list == 0) then
       openspace.printWarning("No trails to toggle")
     else
@@ -49,7 +49,7 @@ local ToggleTrails = {
       else
         prop = list[1]
       end
-      local currentFade = openspace.getPropertyValue(prop)
+      local currentFade = openspace.propertyValue(prop)
       local newFade = 0
       if currentFade < 1 then
         newFade = 1
diff --git a/data/assets/actions/trails/toggle_all_trails_planets_moons_instant.asset b/data/assets/actions/trails/toggle_all_trails_planets_moons_instant.asset
index 19f84a8eb0..a351ddb0ef 100644
--- a/data/assets/actions/trails/toggle_all_trails_planets_moons_instant.asset
+++ b/data/assets/actions/trails/toggle_all_trails_planets_moons_instant.asset
@@ -2,14 +2,14 @@ local ToggleTrailsInstant = {
   Identifier = "os.ToggleTrailsInstant",
   Name = "Toggle planet and moon trails (instant)",
   Command = [[
-    local list = openspace.getProperty("{planetTrail_solarSystem}.Renderable.Enabled")
+    local list = openspace.property("{planetTrail_solarSystem}.Renderable.Enabled")
     for _,v in pairs(list) do
-      openspace.setPropertyValueSingle(v, not openspace.getPropertyValue(v))
+      openspace.setPropertyValueSingle(v, not openspace.propertyValue(v))
     end
 
-    local moonlist = openspace.getProperty("{moonTrail_solarSystem}.Renderable.Enabled")
+    local moonlist = openspace.property("{moonTrail_solarSystem}.Renderable.Enabled")
     for _,v in pairs(moonlist) do
-      openspace.setPropertyValueSingle(v, not openspace.getPropertyValue(v))
+      openspace.setPropertyValueSingle(v, not openspace.propertyValue(v))
     end
   ]],
   Documentation = "Toggles the visibility of planet and moon trails",
diff --git a/data/assets/actions/trails/toggle_trail.asset b/data/assets/actions/trails/toggle_trail.asset
index e5c03871e5..1acd99a14c 100644
--- a/data/assets/actions/trails/toggle_trail.asset
+++ b/data/assets/actions/trails/toggle_trail.asset
@@ -29,7 +29,7 @@ local ToggleTrail = {
         return
       end
     else
-      visibility = not openspace.getPropertyValue("Scene." .. trail .. ".Renderable.Enabled")
+      visibility = not openspace.propertyValue("Scene." .. trail .. ".Renderable.Enabled")
     end
 
     if visibility then
diff --git a/data/assets/actions/trails/toggle_trails_planets_moons.asset b/data/assets/actions/trails/toggle_trails_planets_moons.asset
index c4d54ca718..7792fdbeb4 100644
--- a/data/assets/actions/trails/toggle_trails_planets_moons.asset
+++ b/data/assets/actions/trails/toggle_trails_planets_moons.asset
@@ -26,8 +26,8 @@ local ToggleTrails = {
   Identifier = "os.planetsmoons.ToggleTrails",
   Name = "Toggle planet and moon trails",
   Command = [[
-    local capList = openspace.getProperty("{planetTrail_solarSystem}.Renderable.Fade")
-    local list = openspace.getProperty("{moonTrail_solarSystem}.Renderable.Fade")
+    local capList = openspace.property("{planetTrail_solarSystem}.Renderable.Fade")
+    local list = openspace.property("{moonTrail_solarSystem}.Renderable.Fade")
     if (#capList == 0) and (#list == 0) then
       openspace.printWarning("No trails to toggle")
     else
@@ -37,7 +37,7 @@ local ToggleTrails = {
       else
         prop = list[1]
       end
-      local currentFade = openspace.getPropertyValue(prop)
+      local currentFade = openspace.propertyValue(prop)
       local newFade = 0
       if currentFade < 1 then
         newFade = 1
diff --git a/data/assets/actions/trails/trail_appearance.asset b/data/assets/actions/trails/trail_appearance.asset
index 6bc20d15b1..4c7cf6fabe 100644
--- a/data/assets/actions/trails/trail_appearance.asset
+++ b/data/assets/actions/trails/trail_appearance.asset
@@ -29,12 +29,12 @@ local function toggleHighlightAction(identifierString, value, nameString)
     Identifier = "os.toggle_" .. identifierString .. "_trail_highlight",
     Name = "Toggle " .. nameString .. " trail highlight",
     Command = [[
-local list = openspace.getProperty("]] .. identifierString .. [[.Renderable.Appearance.Fade")
+local list = openspace.property("]] .. identifierString .. [[.Renderable.Appearance.Fade")
 if #list == 0 then
   openspace.printWarning("No planets to resize")
 else
   local prop = list[1]
-  local fadeValue = openspace.getPropertyValue(prop)
+  local fadeValue = openspace.propertyValue(prop)
   if fadeValue > 1 then
     ]] .. highlightCommand(identifierString, 1, nameString) .. "\n" .. [[
   else
@@ -76,8 +76,8 @@ local ToggleTrailFading = {
   Identifier = "os.ToggleTrailFading",
   Name = "Toggle trail fading",
   Command = [[
-    local capList = openspace.getProperty("*Trail.Renderable.Appearance.EnableFade")
-    local list = openspace.getProperty("*trail.Renderable.Appearance.EnableFade")
+    local capList = openspace.property("*Trail.Renderable.Appearance.EnableFade")
+    local list = openspace.property("*trail.Renderable.Appearance.EnableFade")
     if (#capList == 0) and (#list == 0) then
       openspace.printWarning("No trails to toggle")
     else
@@ -87,7 +87,7 @@ local ToggleTrailFading = {
       else
         prop = list[1]
       end
-      local currentFade = openspace.getPropertyValue(prop)
+      local currentFade = openspace.propertyValue(prop)
       local newFade = not currentFade
       openspace.setPropertyValue("Scene.*Trail.Renderable.Appearance.EnableFade", newFade)
       openspace.setPropertyValue("Scene.*trail.Renderable.Appearance.EnableFade", newFade)
diff --git a/data/assets/base_keybindings.asset b/data/assets/base_keybindings.asset
index f2d19ffbf2..95d3a1ce23 100644
--- a/data/assets/base_keybindings.asset
+++ b/data/assets/base_keybindings.asset
@@ -7,9 +7,9 @@ local TogglePlanetLabels = {
   Identifier = "os_default.TogglePlanetLabels",
   Name = "Toggle planet labels",
   Command = [[
-    local list = openspace.getProperty("{solarsystem_labels}.Renderable.Enabled")
+    local list = openspace.property("{solarsystem_labels}.Renderable.Enabled")
     for _,v in pairs(list) do
-      openspace.setPropertyValueSingle(v, not openspace.getPropertyValue(v))
+      openspace.setPropertyValueSingle(v, not openspace.propertyValue(v))
     end
   ]],
   Documentation = "Turns on visibility for all solar system labels",
diff --git a/data/assets/default_keybindings.asset b/data/assets/default_keybindings.asset
index fa0e93aa2e..06883e32b3 100644
--- a/data/assets/default_keybindings.asset
+++ b/data/assets/default_keybindings.asset
@@ -78,7 +78,7 @@ local FadeToBlack = {
   Identifier = "os.FadeToBlack",
   Name = "Fade to/from black",
   Command = [[
-    if openspace.getPropertyValue("RenderEngine.BlackoutFactor") > 0.5 then
+    if openspace.propertyValue("RenderEngine.BlackoutFactor") > 0.5 then
       openspace.setPropertyValueSingle("RenderEngine.BlackoutFactor", 0.0, 3)
     else
       openspace.setPropertyValueSingle("RenderEngine.BlackoutFactor", 1.0, 3)
@@ -102,7 +102,7 @@ local ToggleOverlays = {
   Identifier = "os.ToggleOverlays",
   Name = "Toggle dashboard and overlays",
   Command = [[
-    local isEnabled = openspace.getPropertyValue("Dashboard.IsEnabled")
+    local isEnabled = openspace.propertyValue("Dashboard.IsEnabled")
     openspace.setPropertyValueSingle("Dashboard.IsEnabled", not isEnabled)
     openspace.setPropertyValueSingle("RenderEngine.ShowLog", not isEnabled)
     openspace.setPropertyValueSingle("RenderEngine.ShowVersion", not isEnabled)
diff --git a/data/assets/events/toggle_sun.asset b/data/assets/events/toggle_sun.asset
index bb1a09a17d..c772471f5c 100644
--- a/data/assets/events/toggle_sun.asset
+++ b/data/assets/events/toggle_sun.asset
@@ -7,7 +7,7 @@ local ToggleSun = {
       return
     end
 
-    if not openspace.getPropertyValue("Scene.Sun.Renderable.Enabled") then
+    if not openspace.propertyValue("Scene.Sun.Renderable.Enabled") then
       openspace.setPropertyValueSingle("Scene.Sun.Renderable.Enabled", true)
     end
 
diff --git a/data/assets/modules/exoplanets/exoplanets_data.asset b/data/assets/modules/exoplanets/exoplanets_data.asset
index d7b40e7a6b..adc8290eac 100644
--- a/data/assets/modules/exoplanets/exoplanets_data.asset
+++ b/data/assets/modules/exoplanets/exoplanets_data.asset
@@ -17,12 +17,12 @@ asset.onInitialize(function()
   -- Set the default data files used for the exoplanet system creation
   -- (Check if already set, to not override value set in another file)
   local p1 = "Modules.Exoplanets.DataFolder"
-  if (openspace.getPropertyValue(p1) == "") then
+  if (openspace.propertyValue(p1) == "") then
     openspace.setPropertyValueSingle(p1, dataPath)
   end
 
   local p2 = "Modules.Exoplanets.BvColormap"
-  if (openspace.getPropertyValue(p2) == "") then
+  if (openspace.propertyValue(p2) == "") then
     openspace.setPropertyValueSingle(p2, colormaps .. "colorbv.cmap")
   end
 end)
diff --git a/data/assets/modules/exoplanets/exoplanets_textures.asset b/data/assets/modules/exoplanets/exoplanets_textures.asset
index 410faca805..94258024f0 100644
--- a/data/assets/modules/exoplanets/exoplanets_textures.asset
+++ b/data/assets/modules/exoplanets/exoplanets_textures.asset
@@ -31,27 +31,27 @@ asset.onInitialize(function()
   -- Set the default textures used for the exoplanet system creation
   -- (Check if already set, to not override value set in another file)
   local p1 = "Modules.Exoplanets.StarTexture"
-  if (openspace.getPropertyValue(p1) == "") then
+  if (openspace.propertyValue(p1) == "") then
     openspace.setPropertyValueSingle(p1, starTexture)
   end
 
   local p2 = "Modules.Exoplanets.StarGlareTexture"
-  if (openspace.getPropertyValue(p2) == "") then
+  if (openspace.propertyValue(p2) == "") then
     openspace.setPropertyValueSingle(p2, starGlareTexture)
   end
 
   local p3 = "Modules.Exoplanets.NoDataTexture"
-  if (openspace.getPropertyValue(p3) == "") then
+  if (openspace.propertyValue(p3) == "") then
     openspace.setPropertyValueSingle(p3, noDataTexture)
   end
 
   local p4 = "Modules.Exoplanets.OrbitDiscTexture"
-  if (openspace.getPropertyValue(p4) == "") then
+  if (openspace.propertyValue(p4) == "") then
     openspace.setPropertyValueSingle(p4, discTexture)
   end
 
   local p5 = "Modules.Exoplanets.HabitableZoneTexture"
-  if (openspace.getPropertyValue(p5) == "") then
+  if (openspace.propertyValue(p5) == "") then
     openspace.setPropertyValueSingle(p5, hzTexture)
   end
 end)
diff --git a/data/assets/nightsky/planets.asset b/data/assets/nightsky/planets.asset
index 79f649cd51..f5855cf4a7 100644
--- a/data/assets/nightsky/planets.asset
+++ b/data/assets/nightsky/planets.asset
@@ -156,7 +156,7 @@ local ToggleNightSkyPlanets = {
     openspace.toggleFade("Scene.NightSkyMars.Renderable")
     openspace.toggleFade("Scene.NightSkyJupiter.Renderable")
     openspace.toggleFade("Scene.NightSkySaturn.Renderable")
-    local scale = openspace.getPropertyValue("Scene.Moon.Scale.Scale")
+    local scale = openspace.propertyValue("Scene.Moon.Scale.Scale")
     if (scale > 1) then
       openspace.setPropertyValueSingle("Scene.Moon.Scale.Scale", 1.0)
     else
diff --git a/data/assets/scene/solarsystem/heliosphere/2012/sun_earth_2012_fieldlines_pfss.asset b/data/assets/scene/solarsystem/heliosphere/2012/sun_earth_2012_fieldlines_pfss.asset
index 6053429e3d..f3dc419f1e 100644
--- a/data/assets/scene/solarsystem/heliosphere/2012/sun_earth_2012_fieldlines_pfss.asset
+++ b/data/assets/scene/solarsystem/heliosphere/2012/sun_earth_2012_fieldlines_pfss.asset
@@ -23,7 +23,7 @@ local DarkSun = {
   Name = "Dark sun",
   Command = [[
     local property = "Scene.Sun.Renderable.Layers.ColorLayers.Texture.Settings.Multiplier"
-    local textureMultiplier = openspace.getPropertyValue(property)
+    local textureMultiplier = openspace.propertyValue(property)
     if (textureMultiplier < 0.01) then
       openspace.setPropertyValueSingle(property, 1.0, 1)
     else
diff --git a/data/assets/scene/solarsystem/heliosphere/bastille_day/density_volume.asset b/data/assets/scene/solarsystem/heliosphere/bastille_day/density_volume.asset
index 0ea120b38c..bd70b8a781 100644
--- a/data/assets/scene/solarsystem/heliosphere/bastille_day/density_volume.asset
+++ b/data/assets/scene/solarsystem/heliosphere/bastille_day/density_volume.asset
@@ -56,11 +56,11 @@ local ToggleVolume = {
   Identifier = "os.bastilleday.densityvolume.ToggleVolume",
   Name = "Toggle volume",
   Command = [[
-    if openspace.getPropertyValue("Scene.MAS-MHD-Density-bastille-day-2000.Renderable.Enabled") then
+    if openspace.propertyValue("Scene.MAS-MHD-Density-bastille-day-2000.Renderable.Enabled") then
       openspace.setPropertyValueSingle(
         "Scene.MAS-MHD-Density-bastille-day-2000.Renderable.Fade",
         0.0,
-        openspace.getPropertyValue("OpenSpaceEngine.FadeDuration"),
+        openspace.propertyValue("OpenSpaceEngine.FadeDuration"),
         "Linear",
         'openspace.setPropertyValueSingle("Scene.MAS-MHD-Density-bastille-day-2000.Renderable.Enabled", false)'
       )
@@ -69,7 +69,7 @@ local ToggleVolume = {
       openspace.setPropertyValueSingle(
         "Scene.MAS-MHD-Density-bastille-day-2000.Renderable.Fade",
         1.0,
-        openspace.getPropertyValue("OpenSpaceEngine.FadeDuration"),
+        openspace.propertyValue("OpenSpaceEngine.FadeDuration"),
         "Linear"
       )
     end
diff --git a/data/assets/scene/solarsystem/heliosphere/bastille_day/fieldlines.asset b/data/assets/scene/solarsystem/heliosphere/bastille_day/fieldlines.asset
index 63eb7fd446..6331867a88 100644
--- a/data/assets/scene/solarsystem/heliosphere/bastille_day/fieldlines.asset
+++ b/data/assets/scene/solarsystem/heliosphere/bastille_day/fieldlines.asset
@@ -55,11 +55,11 @@ local ToggleFieldlines = {
   Identifier = "os.bastilleday.fieldlines.ToggleFieldlines",
   Name = "Toggle fieldlines",
   Command = [[
-    if openspace.getPropertyValue("Scene.MAS-MHD-Fieldlines-bastille-day-2000.Renderable.Enabled") then
+    if openspace.propertyValue("Scene.MAS-MHD-Fieldlines-bastille-day-2000.Renderable.Enabled") then
       openspace.setPropertyValueSingle(
         "Scene.MAS-MHD-Fieldlines-bastille-day-2000.Renderable.Fade",
         0.0,
-        openspace.getPropertyValue("OpenSpaceEngine.FadeDuration"),
+        openspace.propertyValue("OpenSpaceEngine.FadeDuration"),
         "Linear",
         'openspace.setPropertyValueSingle("Scene.MAS-MHD-Fieldlines-bastille-day-2000.Renderable.Enabled", false)'
       )
@@ -68,7 +68,7 @@ local ToggleFieldlines = {
       openspace.setPropertyValueSingle(
         "Scene.MAS-MHD-Fieldlines-bastille-day-2000.Renderable.Fade",
         1.0,
-        openspace.getPropertyValue("OpenSpaceEngine.FadeDuration"),
+        openspace.propertyValue("OpenSpaceEngine.FadeDuration"),
         "Linear"
       )
     end
diff --git a/data/assets/scene/solarsystem/heliosphere/bastille_day/fluxnodes.asset b/data/assets/scene/solarsystem/heliosphere/bastille_day/fluxnodes.asset
index cf83463d8c..283a18a4c9 100644
--- a/data/assets/scene/solarsystem/heliosphere/bastille_day/fluxnodes.asset
+++ b/data/assets/scene/solarsystem/heliosphere/bastille_day/fluxnodes.asset
@@ -40,11 +40,11 @@ local ToggleFluxnodes = {
   Identifier = "os.bastilleday.fluxnodes.ToggleFluxnodes",
   Name = "Toggle flux nodes",
   Command = [[
-    if openspace.getPropertyValue("Scene.MAS-MHD-FluxNodes-bastille-day-2000.Renderable.Enabled") then
+    if openspace.propertyValue("Scene.MAS-MHD-FluxNodes-bastille-day-2000.Renderable.Enabled") then
       openspace.setPropertyValueSingle(
         "Scene.MAS-MHD-FluxNodes-bastille-day-2000.Renderable.Fade",
         0.0,
-        openspace.getPropertyValue("OpenSpaceEngine.FadeDuration"),
+        openspace.propertyValue("OpenSpaceEngine.FadeDuration"),
         "Linear",
         'openspace.setPropertyValueSingle("Scene.MAS-MHD-FluxNodes-bastille-day-2000.Renderable.Enabled", false)'
       )
@@ -53,7 +53,7 @@ local ToggleFluxnodes = {
       openspace.setPropertyValueSingle(
         "Scene.MAS-MHD-FluxNodes-bastille-day-2000.Renderable.Fade",
         1.0,
-        openspace.getPropertyValue("OpenSpaceEngine.FadeDuration"),
+        openspace.propertyValue("OpenSpaceEngine.FadeDuration"),
         "Linear"
       )
     end
diff --git a/data/assets/scene/solarsystem/heliosphere/bastille_day/fluxnodescutplane.asset b/data/assets/scene/solarsystem/heliosphere/bastille_day/fluxnodescutplane.asset
index ecc8466874..bcda52593c 100644
--- a/data/assets/scene/solarsystem/heliosphere/bastille_day/fluxnodescutplane.asset
+++ b/data/assets/scene/solarsystem/heliosphere/bastille_day/fluxnodescutplane.asset
@@ -78,11 +78,11 @@ local ToggleEquatorial = {
   Identifier = "os.bastilleday.fluxnodescutplane.ToggleEquatorial",
   Name = "Toggle equatorial cutplane",
   Command = [[
-    if openspace.getPropertyValue("Scene.EquatorialCutplane-bastille-day-2000.Renderable.Enabled") then
+    if openspace.propertyValue("Scene.EquatorialCutplane-bastille-day-2000.Renderable.Enabled") then
       openspace.setPropertyValueSingle(
         "Scene.EquatorialCutplane-bastille-day-2000.Renderable.Fade",
         0.0,
-        openspace.getPropertyValue("OpenSpaceEngine.FadeDuration"),
+        openspace.propertyValue("OpenSpaceEngine.FadeDuration"),
         "Linear",
         'openspace.setPropertyValueSingle("Scene.EquatorialCutplane-bastille-day-2000.Renderable.Enabled", false)'
       )
@@ -91,7 +91,7 @@ local ToggleEquatorial = {
       openspace.setPropertyValueSingle(
         "Scene.EquatorialCutplane-bastille-day-2000.Renderable.Fade",
         1.0,
-        openspace.getPropertyValue("OpenSpaceEngine.FadeDuration"),
+        openspace.propertyValue("OpenSpaceEngine.FadeDuration"),
         "Linear"
       )
     end
@@ -104,11 +104,11 @@ local ToggleMeridial = {
   Identifier = "os.bastilleday.fluxnodescutplane.ToggleMeridial",
   Name = "Toggle meridial cutplane",
   Command = [[
-    if openspace.getPropertyValue("Scene.MeridialCutplane-bastille-day-2000.Renderable.Enabled") then
+    if openspace.propertyValue("Scene.MeridialCutplane-bastille-day-2000.Renderable.Enabled") then
       openspace.setPropertyValueSingle(
         "Scene.MeridialCutplane-bastille-day-2000.Renderable.Fade",
         0.0,
-        openspace.getPropertyValue("OpenSpaceEngine.FadeDuration"),
+        openspace.propertyValue("OpenSpaceEngine.FadeDuration"),
         "Linear",
         'openspace.setPropertyValueSingle("Scene.MeridialCutplane-bastille-day-2000.Renderable.Enabled", false)'
       )
@@ -117,7 +117,7 @@ local ToggleMeridial = {
       openspace.setPropertyValueSingle(
         "Scene.MeridialCutplane-bastille-day-2000.Renderable.Fade",
         1.0,
-        openspace.getPropertyValue("OpenSpaceEngine.FadeDuration"),
+        openspace.propertyValue("OpenSpaceEngine.FadeDuration"),
         "Linear"
       )
     end
diff --git a/data/assets/scene/solarsystem/heliosphere/bastille_day/fluxnodeslegend.asset b/data/assets/scene/solarsystem/heliosphere/bastille_day/fluxnodeslegend.asset
index 8b34675423..d9a3044da8 100644
--- a/data/assets/scene/solarsystem/heliosphere/bastille_day/fluxnodeslegend.asset
+++ b/data/assets/scene/solarsystem/heliosphere/bastille_day/fluxnodeslegend.asset
@@ -23,11 +23,11 @@ local ToggleLegend = {
   Identifier = "os.bastilleday.fluxnodelegend.ToggleLegend",
   Name = "Toggle the legend image",
   Command = [[
-    if openspace.getPropertyValue("ScreenSpace.LegendFluxNodes-bastille-day-2000.Enabled") then
+    if openspace.propertyValue("ScreenSpace.LegendFluxNodes-bastille-day-2000.Enabled") then
       openspace.setPropertyValueSingle(
         "ScreenSpace.LegendFluxNodes-bastille-day-2000.Fade",
         0.0,
-        openspace.getPropertyValue("OpenSpaceEngine.FadeDuration"),
+        openspace.propertyValue("OpenSpaceEngine.FadeDuration"),
         "Linear",
         'openspace.setPropertyValueSingle("ScreenSpace.LegendFluxNodes-bastille-day-2000.Enabled", false)'
       )
@@ -36,7 +36,7 @@ local ToggleLegend = {
       openspace.setPropertyValueSingle(
         "ScreenSpace.LegendFluxNodes-bastille-day-2000.Fade",
         1.0,
-        openspace.getPropertyValue("OpenSpaceEngine.FadeDuration"),
+        openspace.propertyValue("OpenSpaceEngine.FadeDuration"),
         "Linear"
       )
     end
@@ -53,7 +53,7 @@ local HideLegend = {
     openspace.setPropertyValueSingle(
       "ScreenSpace.LegendFluxNodes-bastille-day-2000.Fade",
       0.0,
-      openspace.getPropertyValue("OpenSpaceEngine.FadeDuration"),
+      openspace.propertyValue("OpenSpaceEngine.FadeDuration"),
       "Linear",
       'openspace.setPropertyValueSingle("ScreenSpace.LegendFluxNodes-bastille-day-2000.Enabled", false)'
     )
diff --git a/data/assets/scene/solarsystem/missions/apollo/actions.asset b/data/assets/scene/solarsystem/missions/apollo/actions.asset
index 078b57781e..fdd6fd0c53 100644
--- a/data/assets/scene/solarsystem/missions/apollo/actions.asset
+++ b/data/assets/scene/solarsystem/missions/apollo/actions.asset
@@ -4,7 +4,7 @@ local ToggleMoonShading = {
   Command = [[
     openspace.setPropertyValueSingle(
       "Scene.Moon.Renderable.PerformShading",
-      not openspace.getPropertyValue("Scene.Moon.Renderable.PerformShading")
+      not openspace.propertyValue("Scene.Moon.Renderable.PerformShading")
     )
   ]],
   Documentation = "Toggles the shading of the Moon",
diff --git a/data/assets/scene/solarsystem/missions/apollo/apollo_globebrowsing.asset b/data/assets/scene/solarsystem/missions/apollo/apollo_globebrowsing.asset
index 25ff907125..207ec3ed99 100644
--- a/data/assets/scene/solarsystem/missions/apollo/apollo_globebrowsing.asset
+++ b/data/assets/scene/solarsystem/missions/apollo/apollo_globebrowsing.asset
@@ -40,7 +40,7 @@ local ToggleKaguyaLayer = {
   Command = [[
     openspace.setPropertyValueSingle(
       "Scene.Moon.Renderable.Layers.ColorLayers.Kaguya_Utah.Enabled",
-      not openspace.getPropertyValue("Scene.Moon.Renderable.Layers.ColorLayers.Kaguya_Utah.Enabled")
+      not openspace.propertyValue("Scene.Moon.Renderable.Layers.ColorLayers.Kaguya_Utah.Enabled")
     )
   ]],
   Documentation = "Toggles Moon Kaguya color layer",
diff --git a/data/assets/scene/solarsystem/missions/artemis/toggle_trail.asset b/data/assets/scene/solarsystem/missions/artemis/toggle_trail.asset
index 28bee49bc8..b8f15cf8cc 100644
--- a/data/assets/scene/solarsystem/missions/artemis/toggle_trail.asset
+++ b/data/assets/scene/solarsystem/missions/artemis/toggle_trail.asset
@@ -27,8 +27,8 @@ local ToggleTrail = {
       end
     else
       visibility = not (
-        (openspace.getPropertyValue("Scene." .. earthTrail .. ".Renderable.Fade") == 1) or
-        (openspace.getPropertyValue("Scene." .. moonTrail .. ".Renderable.Fade") == 1)
+        (openspace.propertyValue("Scene." .. earthTrail .. ".Renderable.Fade") == 1) or
+        (openspace.propertyValue("Scene." .. moonTrail .. ".Renderable.Fade") == 1)
       )
     end
 
diff --git a/data/assets/scene/solarsystem/missions/newhorizons/actions.asset b/data/assets/scene/solarsystem/missions/newhorizons/actions.asset
index 68e637aaca..af6d36c9e4 100644
--- a/data/assets/scene/solarsystem/missions/newhorizons/actions.asset
+++ b/data/assets/scene/solarsystem/missions/newhorizons/actions.asset
@@ -54,7 +54,7 @@ local ToggleImageProjection = {
   Identifier = "os.newhorizons.ToggleImageProjection",
   Name = "Toggle NH image projection",
   Command = [[
-    local enabled = openspace.getPropertyValue("Scene.PlutoProjection.Renderable.ProjectionComponent.PerformProjection")
+    local enabled = openspace.propertyValue("Scene.PlutoProjection.Renderable.ProjectionComponent.PerformProjection")
     openspace.setPropertyValue("Scene.PlutoProjection.Renderable.ProjectionComponent.PerformProjection", not enabled)
     openspace.setPropertyValue("Scene.CharonProjection.Renderable.ProjectionComponent.PerformProjection", not enabled)
   ]],
@@ -94,7 +94,7 @@ local IncreaseHeightmapPluto = {
   Command = [[
     openspace.setPropertyValueSingle(
       "Scene.PlutoProjection.Renderable.HeightExaggeration",
-      openspace.getPropertyValue("Scene.PlutoProjection.Renderable.HeightExaggeration") + 5000
+      openspace.propertyValue("Scene.PlutoProjection.Renderable.HeightExaggeration") + 5000
     )
   ]],
   Documentation = "Increases the height map exaggeration on Pluto",
@@ -108,7 +108,7 @@ local DecreaseHeightmapPluto = {
   Command = [[
     openspace.setPropertyValueSingle(
       "Scene.PlutoProjection.Renderable.HeightExaggeration",
-      openspace.getPropertyValue("Scene.PlutoProjection.Renderable.HeightExaggeration") - 5000
+      openspace.propertyValue("Scene.PlutoProjection.Renderable.HeightExaggeration") - 5000
     )
   ]],
   Documentation = "Decreases the height map exaggeration on Pluto",
@@ -122,7 +122,7 @@ local IncreaseHeightmapCharon = {
   Command = [[
     openspace.setPropertyValueSingle(
       "Scene.CharonProjection.Renderable.HeightExaggeration",
-      openspace.getPropertyValue("Scene.CharonProjection.Renderable.HeightExaggeration") + 5000
+      openspace.propertyValue("Scene.CharonProjection.Renderable.HeightExaggeration") + 5000
     )
   ]],
   Documentation = "Increases the height map exaggeration on Charon",
@@ -136,7 +136,7 @@ local DecreaseHeightmapCharon = {
   Command = [[
     openspace.setPropertyValueSingle(
       "Scene.CharonProjection.Renderable.HeightExaggeration",
-      openspace.getPropertyValue("Scene.CharonProjection.Renderable.HeightExaggeration") - 5000
+      openspace.propertyValue("Scene.CharonProjection.Renderable.HeightExaggeration") - 5000
     )
   ]],
   Documentation = "Decreases the height map exaggeration on Charon",
@@ -150,7 +150,7 @@ local TogglePlutoTrail = {
   Command = [[
     openspace.setPropertyValueSingle(
       "Scene.PlutoBarycentricTrail.Renderable.Enabled",
-      not openspace.getPropertyValue("Scene.PlutoBarycentricTrail.Renderable.Enabled")
+      not openspace.propertyValue("Scene.PlutoBarycentricTrail.Renderable.Enabled")
     )
   ]],
   Documentation = "Toggles the visibility of the trail behind Pluto",
@@ -164,27 +164,27 @@ local TogglePlutoLabels = {
   Command = [[
     openspace.setPropertyValueSingle(
       "Scene.PlutoText.Renderable.Enabled",
-      not openspace.getPropertyValue("Scene.PlutoText.Renderable.Enabled")
+      not openspace.propertyValue("Scene.PlutoText.Renderable.Enabled")
     )
     openspace.setPropertyValueSingle(
       "Scene.CharonText.Renderable.Enabled",
-      not openspace.getPropertyValue("Scene.CharonText.Renderable.Enabled")
+      not openspace.propertyValue("Scene.CharonText.Renderable.Enabled")
     )
     openspace.setPropertyValueSingle(
       "Scene.HydraText.Renderable.Enabled",
-      not openspace.getPropertyValue("Scene.HydraText.Renderable.Enabled")
+      not openspace.propertyValue("Scene.HydraText.Renderable.Enabled")
     )
     openspace.setPropertyValueSingle(
       "Scene.NixText.Renderable.Enabled",
-      not openspace.getPropertyValue("Scene.NixText.Renderable.Enabled")
+      not openspace.propertyValue("Scene.NixText.Renderable.Enabled")
     )
     openspace.setPropertyValueSingle(
       "Scene.KerberosText.Renderable.Enabled",
-      not openspace.getPropertyValue("Scene.KerberosText.Renderable.Enabled")
+      not openspace.propertyValue("Scene.KerberosText.Renderable.Enabled")
     )
     openspace.setPropertyValueSingle(
       "Scene.StyxText.Renderable.Enabled",
-      not openspace.getPropertyValue("Scene.StyxText.Renderable.Enabled")
+      not openspace.propertyValue("Scene.StyxText.Renderable.Enabled")
     )
   ]],
   Documentation = "Toggles the visibility of the text labels of Pluto, Charon, Hydra, Nix, Kerberos, and Styx",
@@ -196,7 +196,7 @@ local ToggleNewHorizonsLabels = {
   Identifier = "os.newhorizons.ToggleNewHorizonsLabels",
   Name = "Toggle New Horizons labels",
   Command = [[
-    local v = openspace.getPropertyValue("Scene.Labels.Renderable.Opacity")
+    local v = openspace.propertyValue("Scene.Labels.Renderable.Opacity")
     if v <= 0.5 then
       openspace.setPropertyValueSingle("Scene.Labels.Renderable.Opacity", 1.0, 2.0)
     else
@@ -214,11 +214,11 @@ local ToggleShadows = {
   Command = [[
     openspace.setPropertyValueSingle(
       "Scene.PlutoShadow.Renderable.Enabled",
-      not openspace.getPropertyValue("Scene.PlutoShadow.Renderable.Enabled")
+      not openspace.propertyValue("Scene.PlutoShadow.Renderable.Enabled")
     )
     openspace.setPropertyValueSingle(
       "Scene.CharonShadow.Renderable.Enabled",
-      not openspace.getPropertyValue("Scene.CharonShadow.Renderable.Enabled")
+      not openspace.propertyValue("Scene.CharonShadow.Renderable.Enabled")
     )
   ]],
   Documentation = "Toggles the visibility of the shadow visualization of Pluto and Charon",
@@ -232,7 +232,7 @@ local ToggleNewHorizonsTrail = {
   Command = [[
     openspace.setPropertyValueSingle(
       "Scene.NewHorizonsTrailPluto.Renderable.Enabled",
-      not openspace.getPropertyValue("Scene.NewHorizonsTrailPluto.Renderable.Enabled")
+      not openspace.propertyValue("Scene.NewHorizonsTrailPluto.Renderable.Enabled")
     )
   ]],
   Documentation = "Toggles the trail of New Horizons",
diff --git a/data/assets/scene/solarsystem/missions/osirisrex/actions.asset b/data/assets/scene/solarsystem/missions/osirisrex/actions.asset
index c44984a77a..dc1889a966 100644
--- a/data/assets/scene/solarsystem/missions/osirisrex/actions.asset
+++ b/data/assets/scene/solarsystem/missions/osirisrex/actions.asset
@@ -78,7 +78,7 @@ local ToggleSunMarker = {
   Command = [[
     openspace.setPropertyValueSingle(
       "Scene.SunMarker.Renderable.Enabled",
-      not openspace.getPropertyValue("Scene.SunMarker.Renderable.Enabled")
+      not openspace.propertyValue("Scene.SunMarker.Renderable.Enabled")
     )
   ]],
   Documentation = "Toggles the visibility of the text marking the location of the Sun",
diff --git a/data/assets/scene/solarsystem/missions/rosetta/67p.asset b/data/assets/scene/solarsystem/missions/rosetta/67p.asset
index b472df33f6..42377f4cfe 100644
--- a/data/assets/scene/solarsystem/missions/rosetta/67p.asset
+++ b/data/assets/scene/solarsystem/missions/rosetta/67p.asset
@@ -161,7 +161,7 @@ local Toggle67pProjection = {
   Command = [[
     openspace.setPropertyValueSingle(
       "Scene.67P.Renderable.ProjectionComponent.PerformProjection",
-      not openspace.getPropertyValue("Scene.67P.Renderable.ProjectionComponent.PerformProjection")
+      not openspace.propertyValue("Scene.67P.Renderable.ProjectionComponent.PerformProjection")
     )
   ]],
   Documentation = "Enables or disables the image projection on 67P",
diff --git a/data/assets/scene/solarsystem/missions/rosetta/actions.asset b/data/assets/scene/solarsystem/missions/rosetta/actions.asset
index 3b97f170f7..48c096def2 100644
--- a/data/assets/scene/solarsystem/missions/rosetta/actions.asset
+++ b/data/assets/scene/solarsystem/missions/rosetta/actions.asset
@@ -2,9 +2,9 @@ local ToggleOuterPlanetaryTrails = {
   Identifier = "os.rosetta.ToggleOuterPlanetaryTrails",
   Name = "Toggle outer planetary trails",
   Command = [[
-    local list = openspace.getProperty("{planetTrail_giants}.Renderable.Enabled")
+    local list = openspace.property("{planetTrail_giants}.Renderable.Enabled")
     for _,v in pairs(list) do
-      openspace.setPropertyValueSingle(v, not openspace.getPropertyValue(v))
+      openspace.setPropertyValueSingle(v, not openspace.propertyValue(v))
     end
   ]],
   Documentation = "Toggles the visibility of all trails further from the Sun than 67P",
diff --git a/data/assets/scene/solarsystem/missions/rosetta/rosetta.asset b/data/assets/scene/solarsystem/missions/rosetta/rosetta.asset
index c18ba5bfa2..1d794f3130 100644
--- a/data/assets/scene/solarsystem/missions/rosetta/rosetta.asset
+++ b/data/assets/scene/solarsystem/missions/rosetta/rosetta.asset
@@ -298,7 +298,7 @@ local ToggleImagePlane = {
   Command = [[
     openspace.setPropertyValueSingle(
       "Scene.ImagePlaneRosetta.Renderable.Enabled",
-      not openspace.getPropertyValue("Scene.ImagePlaneRosetta.Renderable.Enabled")
+      not openspace.propertyValue("Scene.ImagePlaneRosetta.Renderable.Enabled")
     )
   ]],
   Documentation = "Toggles the visibility of the free floating image plane",
@@ -312,7 +312,7 @@ local TogglePhilaeTrail = {
   Command = [[
     openspace.setPropertyValueSingle(
       "Scene.PhilaeTrail.Renderable.Enabled",
-      not openspace.getPropertyValue("Scene.PhilaeTrail.Renderable.Enabled")
+      not openspace.propertyValue("Scene.PhilaeTrail.Renderable.Enabled")
     )
   ]],
   Documentation = "Toggles the visibility of Philae's trail",
diff --git a/data/assets/scene/solarsystem/missions/voyager/actions.asset b/data/assets/scene/solarsystem/missions/voyager/actions.asset
index 44d11901c6..d8e1a39f4f 100644
--- a/data/assets/scene/solarsystem/missions/voyager/actions.asset
+++ b/data/assets/scene/solarsystem/missions/voyager/actions.asset
@@ -50,9 +50,9 @@ local ToggleMinorMoonTrails = {
   Identifier = "os.voyager.ToggleMinorMoonTrails",
   Name = "Toggle minor trails",
   Command = [[
-    local list = openspace.getProperty("{moonTrail_minor}.Renderable.Enabled")
+    local list = openspace.property("{moonTrail_minor}.Renderable.Enabled")
     for _,v in pairs(list) do
-      openspace.setPropertyValueSingle(v, not openspace.getPropertyValue(v))
+      openspace.setPropertyValueSingle(v, not openspace.propertyValue(v))
     end
   ]],
   Documentation = "Toggles the trails of the minor moons",
diff --git a/data/assets/scene/solarsystem/planets/earth/earth.asset b/data/assets/scene/solarsystem/planets/earth/earth.asset
index e970802f7f..2c65e6484d 100644
--- a/data/assets/scene/solarsystem/planets/earth/earth.asset
+++ b/data/assets/scene/solarsystem/planets/earth/earth.asset
@@ -93,9 +93,9 @@ local ToggleSatelliteTrails = {
   Identifier = "os.solarsystem.ToggleSatelliteTrails",
   Name = "Toggle satellite trails",
   Command = [[
-    local list = openspace.getProperty("{earth_satellites}.Renderable.Enabled")
+    local list = openspace.property("{earth_satellites}.Renderable.Enabled")
     for _,v in pairs(list) do
-      openspace.setPropertyValueSingle(v, not openspace.getPropertyValue(v))
+      openspace.setPropertyValueSingle(v, not openspace.propertyValue(v))
     end
   ]],
   Documentation = "Toggle trails on or off for satellites around Earth",
diff --git a/data/assets/scene/solarsystem/planets/earth/moon/moon.asset b/data/assets/scene/solarsystem/planets/earth/moon/moon.asset
index a0105c1798..6d2e79612b 100644
--- a/data/assets/scene/solarsystem/planets/earth/moon/moon.asset
+++ b/data/assets/scene/solarsystem/planets/earth/moon/moon.asset
@@ -103,7 +103,7 @@ local ToggleMoonShading = {
   Command = [[
     openspace.setPropertyValueSingle(
       "Scene.Moon.Renderable.PerformShading",
-      not openspace.getPropertyValue("Scene.Moon.Renderable.PerformShading")
+      not openspace.propertyValue("Scene.Moon.Renderable.PerformShading")
     )
   ]],
   Documentation = "Toggles the shading of the Moon",
diff --git a/data/assets/scene/solarsystem/planets/jupiter/major_moons.asset b/data/assets/scene/solarsystem/planets/jupiter/major_moons.asset
index 6a42b2842c..e0eb196004 100644
--- a/data/assets/scene/solarsystem/planets/jupiter/major_moons.asset
+++ b/data/assets/scene/solarsystem/planets/jupiter/major_moons.asset
@@ -9,11 +9,11 @@ local JupiterMajorMoonsOn = {
   Identifier = "os.solarsystem.JupiterMajorMoonsOn",
   Name = "Turn ON major moons and trails",
   Command = [[
-    local trails = openspace.getProperty("{moonTrail_major_jupiter}.Renderable.Enabled")
-    local trails_fade = openspace.getProperty("{moonTrail_major_jupiter}.Renderable.Fade")
+    local trails = openspace.property("{moonTrail_major_jupiter}.Renderable.Enabled")
+    local trails_fade = openspace.property("{moonTrail_major_jupiter}.Renderable.Fade")
 
-    local moons = openspace.getProperty("{moon_major_jupiter}.Renderable.Enabled")
-    local moons_fade = openspace.getProperty("{moon_major_jupiter}.Renderable.Fade")
+    local moons = openspace.property("{moon_major_jupiter}.Renderable.Enabled")
+    local moons_fade = openspace.property("{moon_major_jupiter}.Renderable.Fade")
 
     for i, v in pairs(trails_fade) do
       openspace.setPropertyValueSingle(trails[i], true)
@@ -34,11 +34,11 @@ local JupiterMajorMoonsOff = {
   Identifier = "os.solarsystem.JupiterMajorMoonsOff",
   Name = "Turn OFF majors moon and trails",
   Command = [[
-    local trails = openspace.getProperty("{moonTrail_major_jupiter}.Renderable.Enabled")
-    local trails_fade = openspace.getProperty("{moonTrail_major_jupiter}.Renderable.Fade")
+    local trails = openspace.property("{moonTrail_major_jupiter}.Renderable.Enabled")
+    local trails_fade = openspace.property("{moonTrail_major_jupiter}.Renderable.Fade")
 
-    local moons = openspace.getProperty("{moon_major_jupiter}.Renderable.Enabled")
-    local moons_fade = openspace.getProperty("{moon_major_jupiter}.Renderable.Fade")
+    local moons = openspace.property("{moon_major_jupiter}.Renderable.Enabled")
+    local moons_fade = openspace.property("{moon_major_jupiter}.Renderable.Fade")
 
     for i, v in pairs(trails_fade) do
       openspace.setPropertyValueSingle(
diff --git a/data/assets/scene/solarsystem/planets/jupiter/minor_moons.asset b/data/assets/scene/solarsystem/planets/jupiter/minor_moons.asset
index 5d7b4f1d81..67292c4586 100644
--- a/data/assets/scene/solarsystem/planets/jupiter/minor_moons.asset
+++ b/data/assets/scene/solarsystem/planets/jupiter/minor_moons.asset
@@ -13,11 +13,11 @@ local JupiterMinorMoonsOn = {
   Identifier = "os.solarsystem.JupiterMinorMoonsOn",
   Name = "Turn ON minor moons and trails",
   Command = [[
-    local trails = openspace.getProperty("{moonTrail_minor_jupiter}.Renderable.Enabled")
-    local trails_fade = openspace.getProperty("{moonTrail_minor_jupiter}.Renderable.Fade")
+    local trails = openspace.property("{moonTrail_minor_jupiter}.Renderable.Enabled")
+    local trails_fade = openspace.property("{moonTrail_minor_jupiter}.Renderable.Fade")
 
-    local moons = openspace.getProperty("{moon_minor_jupiter}.Renderable.Enabled")
-    local moons_fade = openspace.getProperty("{moon_minor_jupiter}.Renderable.Fade")
+    local moons = openspace.property("{moon_minor_jupiter}.Renderable.Enabled")
+    local moons_fade = openspace.property("{moon_minor_jupiter}.Renderable.Fade")
 
     for i, v in pairs(trails_fade) do
       openspace.setPropertyValueSingle(trails[i], true)
@@ -38,11 +38,11 @@ local JupiterMinorMoonsOff = {
   Identifier = "os.solarsystem.JupiterMinorMoonsOff",
   Name = "Turn OFF minors moon and trails",
   Command = [[
-    local trails = openspace.getProperty("{moonTrail_minor_jupiter}.Renderable.Enabled")
-    local trails_fade = openspace.getProperty("{moonTrail_minor_jupiter}.Renderable.Fade")
+    local trails = openspace.property("{moonTrail_minor_jupiter}.Renderable.Enabled")
+    local trails_fade = openspace.property("{moonTrail_minor_jupiter}.Renderable.Fade")
 
-    local moons = openspace.getProperty("{moon_minor_jupiter}.Renderable.Enabled")
-    local moons_fade = openspace.getProperty("{moon_minor_jupiter}.Renderable.Fade")
+    local moons = openspace.property("{moon_minor_jupiter}.Renderable.Enabled")
+    local moons_fade = openspace.property("{moon_minor_jupiter}.Renderable.Fade")
 
     for i, v in pairs(trails_fade) do
       openspace.setPropertyValueSingle(
diff --git a/data/assets/scene/solarsystem/planets/neptune/major_moons.asset b/data/assets/scene/solarsystem/planets/neptune/major_moons.asset
index 22692658ce..d8040bb25b 100644
--- a/data/assets/scene/solarsystem/planets/neptune/major_moons.asset
+++ b/data/assets/scene/solarsystem/planets/neptune/major_moons.asset
@@ -8,11 +8,11 @@ local NeptuneMajorMoonsOn = {
   Identifier = "os.solarsystem.NeptuneMajorMoonsOn",
   Name = "Turn on major moons and trails",
   Command = [[
-    local trails = openspace.getProperty("{moonTrail_major_neptune}.Renderable.Enabled")
-    local trails_fade = openspace.getProperty("{moonTrail_major_neptune}.Renderable.Fade")
+    local trails = openspace.property("{moonTrail_major_neptune}.Renderable.Enabled")
+    local trails_fade = openspace.property("{moonTrail_major_neptune}.Renderable.Fade")
 
-    local moons = openspace.getProperty("{moon_major_neptune}.Renderable.Enabled")
-    local moons_fade = openspace.getProperty("{moon_major_neptune}.Renderable.Fade")
+    local moons = openspace.property("{moon_major_neptune}.Renderable.Enabled")
+    local moons_fade = openspace.property("{moon_major_neptune}.Renderable.Fade")
 
     for i, v in pairs(trails_fade) do
       openspace.setPropertyValueSingle(trails[i], true)
@@ -33,11 +33,11 @@ local NeptuneMajorMoonsOff = {
   Identifier = "os.solarsystem.NeptuneMajorMoonsOff",
   Name = "Turn off majors moon and trails",
   Command = [[
-    local trails = openspace.getProperty("{moonTrail_major_neptune}.Renderable.Enabled")
-    local trails_fade = openspace.getProperty("{moonTrail_major_neptune}.Renderable.Fade")
+    local trails = openspace.property("{moonTrail_major_neptune}.Renderable.Enabled")
+    local trails_fade = openspace.property("{moonTrail_major_neptune}.Renderable.Fade")
 
-    local moons = openspace.getProperty("{moon_major_neptune}.Renderable.Enabled")
-    local moons_fade = openspace.getProperty("{moon_major_neptune}.Renderable.Fade")
+    local moons = openspace.property("{moon_major_neptune}.Renderable.Enabled")
+    local moons_fade = openspace.property("{moon_major_neptune}.Renderable.Fade")
 
     for i, v in pairs(trails_fade) do
       openspace.setPropertyValueSingle(
diff --git a/data/assets/scene/solarsystem/planets/neptune/minor_moons.asset b/data/assets/scene/solarsystem/planets/neptune/minor_moons.asset
index a87f91fed6..e30c04a6a1 100644
--- a/data/assets/scene/solarsystem/planets/neptune/minor_moons.asset
+++ b/data/assets/scene/solarsystem/planets/neptune/minor_moons.asset
@@ -7,11 +7,11 @@ local NeptuneMinorMoonsOn = {
   Identifier = "os.solarsystem.NeptuneMinorMoonsOn",
   Name = "Turn on minor moons and trails",
   Command = [[
-    local trails = openspace.getProperty("{moonTrail_minor_neptune}.Renderable.Enabled")
-    local trails_fade = openspace.getProperty("{moonTrail_minor_neptune}.Renderable.Fade")
+    local trails = openspace.property("{moonTrail_minor_neptune}.Renderable.Enabled")
+    local trails_fade = openspace.property("{moonTrail_minor_neptune}.Renderable.Fade")
 
-    local moons = openspace.getProperty("{moon_minor_neptune}.Renderable.Enabled")
-    local moons_fade = openspace.getProperty("{moon_minor_neptune}.Renderable.Fade")
+    local moons = openspace.property("{moon_minor_neptune}.Renderable.Enabled")
+    local moons_fade = openspace.property("{moon_minor_neptune}.Renderable.Fade")
 
     for i, v in pairs(trails_fade) do
       openspace.setPropertyValueSingle(trails[i], true)
@@ -32,11 +32,11 @@ local NeptuneMinorMoonsOff = {
   Identifier = "os.solarsystem.NeptuneMinorMoonsOff",
   Name = "Turn off minors moon and trails",
   Command = [[
-    local trails = openspace.getProperty("{moonTrail_minor_neptune}.Renderable.Enabled")
-    local trails_fade = openspace.getProperty("{moonTrail_minor_neptune}.Renderable.Fade")
+    local trails = openspace.property("{moonTrail_minor_neptune}.Renderable.Enabled")
+    local trails_fade = openspace.property("{moonTrail_minor_neptune}.Renderable.Fade")
 
-    local moons = openspace.getProperty("{moon_minor_neptune}.Renderable.Enabled")
-    local moons_fade = openspace.getProperty("{moon_minor_neptune}.Renderable.Fade")
+    local moons = openspace.property("{moon_minor_neptune}.Renderable.Enabled")
+    local moons_fade = openspace.property("{moon_minor_neptune}.Renderable.Fade")
 
     for i, v in pairs(trails_fade) do
       openspace.setPropertyValueSingle(
diff --git a/data/assets/scene/solarsystem/planets/saturn/major_moons.asset b/data/assets/scene/solarsystem/planets/saturn/major_moons.asset
index 55dc4dd87e..8f7aa38c72 100644
--- a/data/assets/scene/solarsystem/planets/saturn/major_moons.asset
+++ b/data/assets/scene/solarsystem/planets/saturn/major_moons.asset
@@ -14,11 +14,11 @@ local SaturnMajorMoonsOn = {
   Identifier = "os.solarsystem.SaturnMajorMoonsOn",
   Name = "Turn ON major moons and trails",
   Command = [[
-    local trails = openspace.getProperty("{moonTrail_major_saturn}.Renderable.Enabled")
-    local trails_fade = openspace.getProperty("{moonTrail_major_saturn}.Renderable.Fade")
+    local trails = openspace.property("{moonTrail_major_saturn}.Renderable.Enabled")
+    local trails_fade = openspace.property("{moonTrail_major_saturn}.Renderable.Fade")
 
-    local moons = openspace.getProperty("{moon_major_saturn}.Renderable.Enabled")
-    local moons_fade = openspace.getProperty("{moon_major_saturn}.Renderable.Fade")
+    local moons = openspace.property("{moon_major_saturn}.Renderable.Enabled")
+    local moons_fade = openspace.property("{moon_major_saturn}.Renderable.Fade")
 
     for i, v in pairs(trails_fade) do
       openspace.setPropertyValueSingle(trails[i], true)
@@ -39,11 +39,11 @@ local SaturnMajorMoonsOff = {
   Identifier = "os.solarsystem.SaturnMajorMoonsOff",
   Name = "Turn OFF majors moon and trails",
   Command = [[
-    local trails = openspace.getProperty("{moonTrail_major_saturn}.Renderable.Enabled")
-    local trails_fade = openspace.getProperty("{moonTrail_major_saturn}.Renderable.Fade")
+    local trails = openspace.property("{moonTrail_major_saturn}.Renderable.Enabled")
+    local trails_fade = openspace.property("{moonTrail_major_saturn}.Renderable.Fade")
 
-    local moons = openspace.getProperty("{moon_major_saturn}.Renderable.Enabled")
-    local moons_fade = openspace.getProperty("{moon_major_saturn}.Renderable.Fade")
+    local moons = openspace.property("{moon_major_saturn}.Renderable.Enabled")
+    local moons_fade = openspace.property("{moon_major_saturn}.Renderable.Fade")
 
     for i, v in pairs(trails_fade) do
       openspace.setPropertyValueSingle(
diff --git a/data/assets/scene/solarsystem/planets/saturn/minor_moons.asset b/data/assets/scene/solarsystem/planets/saturn/minor_moons.asset
index 1e6b513bad..f2db6cfe5f 100644
--- a/data/assets/scene/solarsystem/planets/saturn/minor_moons.asset
+++ b/data/assets/scene/solarsystem/planets/saturn/minor_moons.asset
@@ -10,11 +10,11 @@ local SaturnMinorMoonsOn = {
   Identifier = "os.solarsystem.SaturnMinorMoonsOn",
   Name = "Turn ON minor moons and trails",
   Command = [[
-    local trails = openspace.getProperty("{moonTrail_minor_saturn}.Renderable.Enabled")
-    local trails_fade = openspace.getProperty("{moonTrail_minor_saturn}.Renderable.Fade")
+    local trails = openspace.property("{moonTrail_minor_saturn}.Renderable.Enabled")
+    local trails_fade = openspace.property("{moonTrail_minor_saturn}.Renderable.Fade")
 
-    local moons = openspace.getProperty("{moon_minor_saturn}.Renderable.Enabled")
-    local moons_fade = openspace.getProperty("{moon_minor_saturn}.Renderable.Fade")
+    local moons = openspace.property("{moon_minor_saturn}.Renderable.Enabled")
+    local moons_fade = openspace.property("{moon_minor_saturn}.Renderable.Fade")
 
     for i, v in pairs(trails_fade) do
       openspace.setPropertyValueSingle(trails[i], true)
@@ -35,11 +35,11 @@ local SaturnMinorMoonsOff = {
   Identifier = "os.solarsystem.SaturnMinorMoonsOff",
   Name = "Turn OFF minors moon and trails",
   Command = [[
-    local trails = openspace.getProperty("{moonTrail_minor_saturn}.Renderable.Enabled")
-    local trails_fade = openspace.getProperty("{moonTrail_minor_saturn}.Renderable.Fade")
+    local trails = openspace.property("{moonTrail_minor_saturn}.Renderable.Enabled")
+    local trails_fade = openspace.property("{moonTrail_minor_saturn}.Renderable.Fade")
 
-    local moons = openspace.getProperty("{moon_minor_saturn}.Renderable.Enabled")
-    local moons_fade = openspace.getProperty("{moon_minor_saturn}.Renderable.Fade")
+    local moons = openspace.property("{moon_minor_saturn}.Renderable.Enabled")
+    local moons_fade = openspace.property("{moon_minor_saturn}.Renderable.Fade")
 
     for i, v in pairs(trails_fade) do
       openspace.setPropertyValueSingle(
diff --git a/data/assets/scene/solarsystem/planets/uranus/major_moons.asset b/data/assets/scene/solarsystem/planets/uranus/major_moons.asset
index 4d5f5eade6..8b8d1c527b 100644
--- a/data/assets/scene/solarsystem/planets/uranus/major_moons.asset
+++ b/data/assets/scene/solarsystem/planets/uranus/major_moons.asset
@@ -353,11 +353,11 @@ local UranusMajorMoonsOn = {
   Identifier = "os.solarsystem.UranusMajorMoonsOn",
   Name = "Turn ON major moons and trails",
   Command = [[
-    local trails = openspace.getProperty("{moonTrail_major_uranus}.Renderable.Enabled")
-    local trails_fade = openspace.getProperty("{moonTrail_major_uranus}.Renderable.Fade")
+    local trails = openspace.property("{moonTrail_major_uranus}.Renderable.Enabled")
+    local trails_fade = openspace.property("{moonTrail_major_uranus}.Renderable.Fade")
 
-    local moons = openspace.getProperty("{moon_major_uranus}.Renderable.Enabled")
-    local moons_fade = openspace.getProperty("{moon_major_uranus}.Renderable.Fade")
+    local moons = openspace.property("{moon_major_uranus}.Renderable.Enabled")
+    local moons_fade = openspace.property("{moon_major_uranus}.Renderable.Fade")
 
     for i, v in pairs(trails_fade) do
       openspace.setPropertyValueSingle(trails[i], true)
@@ -378,11 +378,11 @@ local UranusMajorMoonsOff = {
   Identifier = "os.solarsystem.UranusMajorMoonsOff",
   Name = "Turn OFF majors moon and trails",
   Command = [[
-    local trails = openspace.getProperty("{moonTrail_major_uranus}.Renderable.Enabled")
-    local trails_fade = openspace.getProperty("{moonTrail_major_uranus}.Renderable.Fade")
+    local trails = openspace.property("{moonTrail_major_uranus}.Renderable.Enabled")
+    local trails_fade = openspace.property("{moonTrail_major_uranus}.Renderable.Fade")
 
-    local moons = openspace.getProperty("{moon_major_uranus}.Renderable.Enabled")
-    local moons_fade = openspace.getProperty("{moon_major_uranus}.Renderable.Fade")
+    local moons = openspace.property("{moon_major_uranus}.Renderable.Enabled")
+    local moons_fade = openspace.property("{moon_major_uranus}.Renderable.Fade")
 
     for i, v in pairs(trails_fade) do
       openspace.setPropertyValueSingle(
diff --git a/data/assets/scene/solarsystem/planets/uranus/minor_moons.asset b/data/assets/scene/solarsystem/planets/uranus/minor_moons.asset
index ecdce57028..02e89109a3 100644
--- a/data/assets/scene/solarsystem/planets/uranus/minor_moons.asset
+++ b/data/assets/scene/solarsystem/planets/uranus/minor_moons.asset
@@ -8,11 +8,11 @@ local UranusMinorMoonsOn = {
   Identifier = "os.solarsystem.UranusMinorMoonsOn",
   Name = "Turn ON minor moons and trails",
   Command = [[
-    local trails = openspace.getProperty("{moonTrail_minor_uranus}.Renderable.Enabled")
-    local trails_fade = openspace.getProperty("{moonTrail_minor_uranus}.Renderable.Fade")
+    local trails = openspace.property("{moonTrail_minor_uranus}.Renderable.Enabled")
+    local trails_fade = openspace.property("{moonTrail_minor_uranus}.Renderable.Fade")
 
-    local moons = openspace.getProperty("{moon_minor_uranus}.Renderable.Enabled")
-    local moons_fade = openspace.getProperty("{moon_minor_uranus}.Renderable.Fade")
+    local moons = openspace.property("{moon_minor_uranus}.Renderable.Enabled")
+    local moons_fade = openspace.property("{moon_minor_uranus}.Renderable.Fade")
 
     for i, v in pairs(trails_fade) do
       openspace.setPropertyValueSingle(trails[i], true)
@@ -33,11 +33,11 @@ local UranusMinorMoonsOff = {
   Identifier = "os.solarsystem.UranusMinorMoonsOff",
   Name = "Turn OFF minors moon and trails",
   Command = [[
-    local trails = openspace.getProperty("{moonTrail_minor_uranus}.Renderable.Enabled")
-    local trails_fade = openspace.getProperty("{moonTrail_minor_uranus}.Renderable.Fade")
+    local trails = openspace.property("{moonTrail_minor_uranus}.Renderable.Enabled")
+    local trails_fade = openspace.property("{moonTrail_minor_uranus}.Renderable.Fade")
 
-    local moons = openspace.getProperty("{moon_minor_uranus}.Renderable.Enabled")
-    local moons_fade = openspace.getProperty("{moon_minor_uranus}.Renderable.Fade")
+    local moons = openspace.property("{moon_minor_uranus}.Renderable.Enabled")
+    local moons_fade = openspace.property("{moon_minor_uranus}.Renderable.Fade")
 
     for i, v in pairs(trails_fade) do
       openspace.setPropertyValueSingle(
diff --git a/data/assets/scene/solarsystem/sun/EUV_layer.asset b/data/assets/scene/solarsystem/sun/EUV_layer.asset
index aeb1921870..2bb83577d3 100644
--- a/data/assets/scene/solarsystem/sun/EUV_layer.asset
+++ b/data/assets/scene/solarsystem/sun/EUV_layer.asset
@@ -38,11 +38,11 @@ local ToggleEuv = {
   Identifier = "os.solarsystem.ToggleEuv",
   Name = "Toggle EUV layer",
   Command = [[
-    if openspace.getPropertyValue("Scene.EUV-Layer-bastille-day-2000.Renderable.Enabled") then
+    if openspace.propertyValue("Scene.EUV-Layer-bastille-day-2000.Renderable.Enabled") then
       openspace.setPropertyValueSingle(
         "Scene.EUV-Layer-bastille-day-2000.Renderable.Fade",
         0.0,
-        openspace.getPropertyValue("OpenSpaceEngine.FadeDuration"),
+        openspace.propertyValue("OpenSpaceEngine.FadeDuration"),
         "Linear",
         'openspace.setPropertyValueSingle("Scene.EUV-Layer-bastille-day-2000.Renderable.Enabled", false)'
       )
@@ -51,7 +51,7 @@ local ToggleEuv = {
       openspace.setPropertyValueSingle(
         "Scene.EUV-Layer-bastille-day-2000.Renderable.Fade",
         1.0,
-        openspace.getPropertyValue("OpenSpaceEngine.FadeDuration"),
+        openspace.propertyValue("OpenSpaceEngine.FadeDuration"),
         "Linear"
       )
     end
diff --git a/data/assets/scene/solarsystem/telescopes/jwst/actions.asset b/data/assets/scene/solarsystem/telescopes/jwst/actions.asset
index a0615e5196..d14c028896 100644
--- a/data/assets/scene/solarsystem/telescopes/jwst/actions.asset
+++ b/data/assets/scene/solarsystem/telescopes/jwst/actions.asset
@@ -2,9 +2,9 @@ local ToggleLagrangianPoints = {
   Identifier = "os.jwst.ToggleLagrangianPoints",
   Name = "Toggle Lagrangian points",
   Command = [[
-    local list = openspace.getProperty("{lagrange_points_earth}.Renderable.Enabled")
+    local list = openspace.property("{lagrange_points_earth}.Renderable.Enabled")
     for _,v in pairs(list) do
-      openspace.setPropertyValueSingle(v, not openspace.getPropertyValue(v))
+      openspace.setPropertyValueSingle(v, not openspace.propertyValue(v))
     end
   ]],
   Documentation = "Toggle points and labels for the Lagrangian points for Earth Sun system",
@@ -16,9 +16,9 @@ local ToggleHudf = {
   Identifier = "os.jwst.ToggleHudf",
   Name = "Toggle Hubble Ultra Deep Field",
   Command = [[
-    local list = openspace.getProperty("{mission_jwst_hudf}.*.Enabled")
+    local list = openspace.property("{mission_jwst_hudf}.*.Enabled")
     for _,v in pairs(list) do
-      openspace.setPropertyValueSingle(v, not openspace.getPropertyValue(v))
+      openspace.setPropertyValueSingle(v, not openspace.propertyValue(v))
     end
   ]],
   Documentation = "Toggle Hubble Ultra Deep Field image and line towards its coordinate",
@@ -30,9 +30,9 @@ local ToggleL2 = {
   Identifier = "os.jwst.ToggleL2",
   Name = "Toggle L2 line and small L2 label",
   Command = [[
-    local list = openspace.getProperty("{lagrange_points_earth_l2_small}.*.Enabled")
+    local list = openspace.property("{lagrange_points_earth_l2_small}.*.Enabled")
     for _,v in pairs(list) do
-      openspace.setPropertyValueSingle(v, not openspace.getPropertyValue(v))
+      openspace.setPropertyValueSingle(v, not openspace.propertyValue(v))
     end
   ]],
   Documentation = "Toggle L2 label, point and line",
@@ -44,9 +44,9 @@ local ToggleFov = {
   Identifier = "os.jwst.ToggleFov",
   Name = "Toggle JWST field of view and view band",
   Command = [[
-    local list = openspace.getProperty("{mission_jwst_fov}.*.Enabled")
+    local list = openspace.property("{mission_jwst_fov}.*.Enabled")
     for _,v in pairs(list) do
-      openspace.setPropertyValueSingle(v, not openspace.getPropertyValue(v))
+      openspace.setPropertyValueSingle(v, not openspace.propertyValue(v))
     end
   ]],
   Documentation = "Toggle James Webb Space Telecope field of view and view band",
@@ -82,7 +82,7 @@ local ToggleSunTrail = {
   Identifier = "os.jwst.ToggleSunTrail",
   Name = "Toggle JWST Sun trail",
   Command = [[
-    local value = openspace.getPropertyValue("Scene.JWSTSunTrail.Renderable.Enabled")
+    local value = openspace.propertyValue("Scene.JWSTSunTrail.Renderable.Enabled")
     openspace.setPropertyValueSingle("Scene.JWSTSunTrail.Renderable.Enabled", not value)
   ]],
   Documentation = "Toggle JWST trail relative to the Sun",
@@ -94,13 +94,13 @@ local ToggleTrailsExceptMoon = {
   Identifier = "os.jwst.ToggleTrailsExceptMoon",
   Name = "Toggle trails (except Moon)",
   Command = [[
-    local list = openspace.getProperty("{planetTrail_solarSystem}.Renderable.Enabled")
+    local list = openspace.property("{planetTrail_solarSystem}.Renderable.Enabled")
     for _,v in pairs(list) do
-      openspace.setPropertyValueSingle(v, not openspace.getPropertyValue(v))
+      openspace.setPropertyValueSingle(v, not openspace.propertyValue(v))
     end
-    local moonlist = openspace.getProperty("{moonTrail_solarSystem}.Renderable.Enabled")
+    local moonlist = openspace.property("{moonTrail_solarSystem}.Renderable.Enabled")
     for _,v in pairs(moonlist) do
-      openspace.setPropertyValueSingle(v, not openspace.getPropertyValue(v))
+      openspace.setPropertyValueSingle(v, not openspace.propertyValue(v))
     end
     openspace.setPropertyValueSingle("Scene.MoonTrail.Renderable.Enabled", true)
   ]],
@@ -119,7 +119,7 @@ local ToggleJwstTrails = {
       "Scene.JWSTTrailCoRevOrbit.Renderable.Enabled"
     }
     for _,v in pairs(list) do
-      openspace.setPropertyValueSingle(v, not openspace.getPropertyValue(v))
+      openspace.setPropertyValueSingle(v, not openspace.propertyValue(v))
     end
   ]],
   Documentation = "Toggle JWST launch, cruise and L2 co-revolving orbit trails, not the Sun trail",
diff --git a/data/assets/scene/solarsystem/telescopes/jwst/timelapse.asset b/data/assets/scene/solarsystem/telescopes/jwst/timelapse.asset
index ef0d2a4b7b..8ab0ec61c3 100644
--- a/data/assets/scene/solarsystem/telescopes/jwst/timelapse.asset
+++ b/data/assets/scene/solarsystem/telescopes/jwst/timelapse.asset
@@ -604,7 +604,7 @@ asset.onInitialize(function()
       end
 
       -- Update the dashboard text
-      local text = openspace.getPropertyValue("Dashboard.JWSTStateText.Text")
+      local text = openspace.propertyValue("Dashboard.JWSTStateText.Text")
       if string.len(text) > 14 then
         local newText = ""
         if text:sub(13, 13) == "-" then
diff --git a/data/assets/scene/solarsystem/telescopes/jwst/toggle_trail.asset b/data/assets/scene/solarsystem/telescopes/jwst/toggle_trail.asset
index 1866639228..63c9afc1e0 100644
--- a/data/assets/scene/solarsystem/telescopes/jwst/toggle_trail.asset
+++ b/data/assets/scene/solarsystem/telescopes/jwst/toggle_trail.asset
@@ -29,9 +29,9 @@ local ToggleTrail = {
       end
     else
       visibility = not (
-        openspace.getPropertyValue("Scene." .. launchTrail .. ".Renderable.Enabled") or
-        openspace.getPropertyValue("Scene." .. cruiseTrail .. ".Renderable.Enabled") or
-        openspace.getPropertyValue("Scene." .. coRevOrbitTrail .. ".Renderable.Enabled")
+        openspace.propertyValue("Scene." .. launchTrail .. ".Renderable.Enabled") or
+        openspace.propertyValue("Scene." .. cruiseTrail .. ".Renderable.Enabled") or
+        openspace.propertyValue("Scene." .. coRevOrbitTrail .. ".Renderable.Enabled")
       )
     end
 
diff --git a/data/assets/util/dpiscaling.asset b/data/assets/util/dpiscaling.asset
index d460088092..647f22b7ad 100644
--- a/data/assets/util/dpiscaling.asset
+++ b/data/assets/util/dpiscaling.asset
@@ -6,19 +6,19 @@ asset.onInitialize(function()
   if openspace.modules.isLoaded("CefWebGui") then
     openspace.setPropertyValueSingle(
       "Modules.CefWebGui.GuiScale",
-      openspace.getPropertyValue("Modules.CefWebGui.GuiScale") * scale
+      openspace.propertyValue("Modules.CefWebGui.GuiScale") * scale
     )
   end
 
-  local dashboards = openspace.getProperty("Dashboard.*.FontSize")
+  local dashboards = openspace.property("Dashboard.*.FontSize")
   for _, v in ipairs(dashboards) do
     openspace.setPropertyValueSingle(
       v,
-      openspace.getPropertyValue(v) * scale
+      openspace.propertyValue(v) * scale
     )
   end
 
-  local offset = openspace.getPropertyValue("Dashboard.StartPositionOffset")
+  local offset = openspace.propertyValue("Dashboard.StartPositionOffset")
   openspace.setPropertyValueSingle(
     "Dashboard.StartPositionOffset",
     { offset[1] * scale, offset[2] * scale }
diff --git a/data/assets/util/property_helper.asset b/data/assets/util/property_helper.asset
index d0c9809641..99f059b6a6 100644
--- a/data/assets/util/property_helper.asset
+++ b/data/assets/util/property_helper.asset
@@ -1,14 +1,14 @@
 -- Function that returns the string that inverts the fully qualified boolean property 'property'
 function invert(prop)
   local escaped_property = [["]] .. prop .. [["]]
-  return "openspace.setPropertyValueSingle(" .. escaped_property .. ", not openspace.getPropertyValue(" .. escaped_property .. "))"
+  return "openspace.setPropertyValueSingle(" .. escaped_property .. ", not openspace.propertyValue(" .. escaped_property .. "))"
 end
 
 -- Function that returns the string that increments the 'property' by the 'value'
 function increment(prop, value)
   local v = value or 1
   local escaped_property = [["]] .. prop .. [["]]
-  return "openspace.setPropertyValueSingle(" .. escaped_property .. ", openspace.getPropertyValue(" .. escaped_property .. ") + " .. v .. ")"
+  return "openspace.setPropertyValueSingle(" .. escaped_property .. ", openspace.propertyValue(" .. escaped_property .. ") + " .. v .. ")"
 end
 
 -- Function that returns the string that decrements the 'property' by the 'value'
@@ -38,7 +38,7 @@ function fadeInOut(prop, duration)
 
   local escaped_property = [["]] .. prop .. [["]]
   -- If the value is > 0.5 fade out, otherwise fade in
-  return "local v = openspace.getPropertyValue(" .. escaped_property .. ") if v <= 0.5 then " .. fadeIn(prop, duration) .. " else " .. fadeOut(prop, duration) .. " end"
+  return "local v = openspace.propertyValue(" .. escaped_property .. ") if v <= 0.5 then " .. fadeIn(prop, duration) .. " else " .. fadeOut(prop, duration) .. " end"
 end
 
 asset.export("invert", invert)
diff --git a/data/assets/util/screenshots_endpoint.asset b/data/assets/util/screenshots_endpoint.asset
index f39066846e..09a1cbeb63 100644
--- a/data/assets/util/screenshots_endpoint.asset
+++ b/data/assets/util/screenshots_endpoint.asset
@@ -5,10 +5,10 @@ asset.onInitialize(function()
   -- remove automatic restart on each property change, since frequent restarting seems to
   -- be unstable on MacOS.
 
-  local enabled = openspace.getPropertyValue("Modules.WebGui.ServerProcessEnabled")
+  local enabled = openspace.propertyValue("Modules.WebGui.ServerProcessEnabled")
   openspace.setPropertyValueSingle("Modules.WebGui.ServerProcessEnabled", false)
 
-  local directories = openspace.getPropertyValue("Modules.WebGui.Directories")
+  local directories = openspace.propertyValue("Modules.WebGui.Directories")
   directories[#directories + 1] = "screenshots"
   directories[#directories + 1] = "${SCREENSHOTS}"
   openspace.setPropertyValueSingle("Modules.WebGui.Directories", directories)
diff --git a/modules/exoplanets/exoplanetsmodule.cpp b/modules/exoplanets/exoplanetsmodule.cpp
index 8747c43a26..5bda398894 100644
--- a/modules/exoplanets/exoplanetsmodule.cpp
+++ b/modules/exoplanets/exoplanetsmodule.cpp
@@ -346,7 +346,8 @@ scripting::LuaLibrary ExoplanetsModule::luaLibrary() const {
         {
             codegen::lua::AddExoplanetSystem,
             codegen::lua::RemoveExoplanetSystem,
-            codegen::lua::GetListOfExoplanets,
+            codegen::lua::ListOfExoplanets,
+            codegen::lua::ListOfExoplanetsDeprecated,
             codegen::lua::ListAvailableExoplanetSystems
         }
     };
diff --git a/modules/exoplanets/exoplanetsmodule_lua.inl b/modules/exoplanets/exoplanetsmodule_lua.inl
index 8faa22754f..2552f2037d 100644
--- a/modules/exoplanets/exoplanetsmodule_lua.inl
+++ b/modules/exoplanets/exoplanetsmodule_lua.inl
@@ -639,11 +639,25 @@ std::vector<std::string> hostStarsWithSufficientData() {
     );
 }
 
-[[codegen::luawrap]] std::vector<std::string> getListOfExoplanets() {
+[[codegen::luawrap]] std::vector<std::string> listOfExoplanets() {
     std::vector<std::string> names = hostStarsWithSufficientData();
     return names;
 }
 
+/**
+ * Deprecated in favor of 'listOfExoplanets'
+ */
+[[codegen::luawrap("getListOfExoplanets")]] std::vector<std::string>
+listOfExoplanetsDeprecated()
+{
+    LWARNINGC(
+        "Deprecation",
+        "'getListOfExoplanets' function is deprecated and should be replaced with "
+        "'listOfExoplanets'"
+    );
+    return listOfExoplanets();
+}
+
 [[codegen::luawrap]] void listAvailableExoplanetSystems() {
     std::vector<std::string> names = hostStarsWithSufficientData();
 
diff --git a/modules/globebrowsing/globebrowsingmodule.cpp b/modules/globebrowsing/globebrowsingmodule.cpp
index cbfb1b10c7..285a692dfe 100644
--- a/modules/globebrowsing/globebrowsingmodule.cpp
+++ b/modules/globebrowsing/globebrowsingmodule.cpp
@@ -692,15 +692,18 @@ scripting::LuaLibrary GlobeBrowsingModule::luaLibrary() const {
         .functions = {
             codegen::lua::AddLayer,
             codegen::lua::DeleteLayer,
-            codegen::lua::GetLayers,
+            codegen::lua::Layers,
+            codegen::lua::LayersDeprecated,
             codegen::lua::MoveLayer,
             codegen::lua::GoToChunk,
             codegen::lua::GoToGeo,
             // @TODO (2021-06-23, emmbr) Combine with the above function when the camera
             // paths work really well close to surfaces
             codegen::lua::FlyToGeo,
-            codegen::lua::GetLocalPositionFromGeo,
-            codegen::lua::GetGeoPositionForCamera,
+            codegen::lua::LocalPositionFromGeo,
+            codegen::lua::LocalPositionFromGeoDeprecated,
+            codegen::lua::GeoPositionForCamera,
+            codegen::lua::GeoPositionForCameraDeprecated,
             codegen::lua::LoadWMSCapabilities,
             codegen::lua::RemoveWMSServer,
             codegen::lua::CapabilitiesWMS,
diff --git a/modules/globebrowsing/globebrowsingmodule_lua.inl b/modules/globebrowsing/globebrowsingmodule_lua.inl
index 1332f4889d..78d9cd7c61 100644
--- a/modules/globebrowsing/globebrowsingmodule_lua.inl
+++ b/modules/globebrowsing/globebrowsingmodule_lua.inl
@@ -118,8 +118,8 @@ namespace {
  * Returns the list of layers for the scene graph node specified in the first parameter.
  * The second parameter specifies which layer type should be queried.
  */
-[[codegen::luawrap]] std::vector<std::string> getLayers(std::string globeIdentifier,
-                                                        std::string layer)
+[[codegen::luawrap]] std::vector<std::string> layers(std::string globeIdentifier,
+                                                     std::string layer)
 {
     using namespace openspace;
     using namespace globebrowsing;
@@ -150,6 +150,23 @@ namespace {
     return res;
 }
 
+/**
+ * Returns the list of layers for the scene graph node specified in the first parameter.
+ * The second parameter specifies which layer type should be queried. Deprecated in favor
+ * of 'layers'.
+ */
+[[codegen::luawrap("getLayers")]] std::vector<std::string> layersDeprecated(
+                                                              std::string globeIdentifier,
+                                                                        std::string layer)
+{
+    LWARNINGC(
+        "Deprecation",
+        "'getLayers' function is deprecated and should be replaced with 'layers'"
+    );
+
+    return layers(std::move(globeIdentifier), std::move(layer));
+}
+
 /**
  * Rearranges the order of a single layer on a globe. The first parameter is the
  * identifier of the globe, the second parameter specifies the name of the layer group,
@@ -398,8 +415,8 @@ namespace {
  */
 [[codegen::luawrap]]
 std::tuple<double, double, double>
-getLocalPositionFromGeo(std::string globeIdentifier, double latitude, double longitude,
-                        double altitude)
+localPositionFromGeo(std::string globeIdentifier, double latitude, double longitude,
+                     double altitude)
 {
     using namespace openspace;
     using namespace globebrowsing;
@@ -418,13 +435,39 @@ getLocalPositionFromGeo(std::string globeIdentifier, double latitude, double lon
     return { p.x, p.y, p.z };
 }
 
+/**
+ * Returns a position in the local Cartesian coordinate system of the globe identified by
+ * the first argument, that corresponds to the given geographic coordinates: latitude,
+ * longitude and altitude (in degrees and meters). In the local coordinate system, the
+ * position (0,0,0) corresponds to the globe's center. Deprecated in favor of
+ * 'localPositionFromGeo'.
+ */
+[[codegen::luawrap("getLocalPositionFromGeo")]]
+std::tuple<double, double, double>
+localPositionFromGeoDeprecated(std::string globeIdentifier, double latitude,
+                               double longitude, double altitude)
+{
+    LWARNINGC(
+        "Deprecation",
+        "'getLocalPositionFromGeo' function is deprecated and should be replaced with "
+        "'localPositionFromGeo'"
+    );
+
+    return localPositionFromGeo(
+        std::move(globeIdentifier),
+        latitude,
+        longitude,
+        altitude
+    );
+}
+
 /**
  * Get geographic coordinates of the camera position in latitude, longitude, and altitude
  * (degrees and meters). If the optional bool paramater is specified, the camera
  * eye postion will be used instead
  */
-[[codegen::luawrap]] std::tuple<double, double, double>
-getGeoPositionForCamera(bool useEyePosition = false)
+[[codegen::luawrap]] std::tuple<double, double, double> geoPositionForCamera(
+                                                              bool useEyePosition = false)
 {
     using namespace openspace;
     using namespace globebrowsing;
@@ -477,6 +520,24 @@ getGeoPositionForCamera(bool useEyePosition = false)
     return { glm::degrees(geo2.lat), glm::degrees(geo2.lon), altitude };
 }
 
+/**
+ * Get geographic coordinates of the camera position in latitude, longitude, and altitude
+ * (degrees and meters). If the optional bool paramater is specified, the camera
+ * eye postion will be used instead. Deprecated in favor of 'geoPositionForCamera'.
+ */
+[[codegen::luawrap("getGeoPositionForCamera")]]
+std::tuple<double, double, double>
+geoPositionForCameraDeprecated(bool useEyePosition = false)
+{
+    LWARNINGC(
+        "Deprecation",
+        "'getGeoPositionForCamera' function is deprecated and should be replaced with "
+        "'geoPositionForCamera'"
+    );
+
+    return geoPositionForCamera(useEyePosition);
+}
+
 /**
  * Loads and parses the WMS capabilities xml file from a remote server. The first argument
  * is the name of the capabilities that can be used to later refer to the set of
diff --git a/src/scene/scene.cpp b/src/scene/scene.cpp
index fb3bf6d809..f7c0244f20 100644
--- a/src/scene/scene.cpp
+++ b/src/scene/scene.cpp
@@ -835,14 +835,25 @@ scripting::LuaLibrary Scene::luaLibrary() {
             },
             {
                 "getPropertyValue",
+                &luascriptfunctions::propertyGetValueDeprecated,
+                {},
+                "",
+                "Returns the value the property, identified by the provided URI. "
+                "Deprecated in favor of the 'propertyValue' function",
+                {}
+            },
+            {
+                "propertyValue",
                 &luascriptfunctions::propertyGetValue,
                 {},
                 "",
-                "Returns the value the property, identified by the provided URI",
+                "Returns the value the property, identified by the provided URI. "
+                "Deprecated in favor of the 'propertyValue' function",
                 {}
             },
             codegen::lua::HasProperty,
-            codegen::lua::GetProperty,
+            codegen::lua::PropertyDeprecated,
+            codegen::lua::Property,
             codegen::lua::AddCustomProperty,
             codegen::lua::RemoveCustomProperty,
             codegen::lua::AddSceneGraphNode,
diff --git a/src/scene/scene_lua.inl b/src/scene/scene_lua.inl
index 96b2fb93c7..3fb52a7ab4 100644
--- a/src/scene/scene_lua.inl
+++ b/src/scene/scene_lua.inl
@@ -470,6 +470,16 @@ int propertyGetValue(lua_State* L) {
     return 1;
 }
 
+int propertyGetValueDeprecated(lua_State* L) {
+    LWARNINGC(
+        "Deprecation",
+        "'getPropertyValue' function is deprecated and should be replaced with "
+        "'propertyValue'"
+    );
+
+    return propertyGetValue(L);
+}
+
 }  // namespace openspace::luascriptfunctions
 
 namespace {
@@ -485,7 +495,7 @@ namespace {
 /**
  * Returns a list of property identifiers that match the passed regular expression
  */
-[[codegen::luawrap]] std::vector<std::string> getProperty(std::string regex) {
+[[codegen::luawrap]] std::vector<std::string> property(std::string regex) {
     using namespace openspace;
 
     std::string groupName;
@@ -591,6 +601,19 @@ namespace {
     return res;
 }
 
+/**
+ * Returns a list of property identifiers that match the passed regular expression
+ */
+[[codegen::luawrap("getProperty")]] std::vector<std::string> propertyDeprecated(
+                                                                        std::string regex)
+{
+    LWARNINGC(
+        "Deprecation",
+        "'getProperty' function is deprecated and should be replaced with 'property'"
+    );
+    return property(std::move(regex));
+}
+
 /**
  * Loads the SceneGraphNode described in the table and adds it to the SceneGraph.
  */

From 399dc323af70cd01d2a9e033a44b9b8c6d438634 Mon Sep 17 00:00:00 2001
From: GPayne <payne.gene@gmail.com>
Date: Sun, 6 Aug 2023 15:08:00 -0600
Subject: [PATCH 072/701] Add search text box and filtering capability to
 profile assets editor

---
 .../launcher/include/profile/assetsdialog.h   | 35 ++++++-
 .../ext/launcher/src/profile/assetsdialog.cpp | 92 ++++++++++++++++---
 2 files changed, 112 insertions(+), 15 deletions(-)

diff --git a/apps/OpenSpace/ext/launcher/include/profile/assetsdialog.h b/apps/OpenSpace/ext/launcher/include/profile/assetsdialog.h
index 85714b26bb..5ad607efb2 100644
--- a/apps/OpenSpace/ext/launcher/include/profile/assetsdialog.h
+++ b/apps/OpenSpace/ext/launcher/include/profile/assetsdialog.h
@@ -26,12 +26,36 @@
 #define __OPENSPACE_UI_LAUNCHER___ASSETSDIALOG___H__
 
 #include <QDialog>
-
+#include <QSortFilterProxyModel>
+#include <QRegExp>
 #include "assettreemodel.h"
 
 class QTextEdit;
 class QTreeView;
 
+class SearchProxyModel : public QSortFilterProxyModel {
+public:
+    /**
+     * Constructor for SearchProxyModel class
+     *
+     * \param parent The QObject* object that is the Qt parent of this object
+     */
+    SearchProxyModel(QObject* parent = nullptr) : QSortFilterProxyModel(parent) {}
+
+    /**
+     * Sets the regular expression pattern to apply to the filter
+     *
+     * \param pattern The QString reference containing the regex pattern
+     */
+    void setFilterRegExp(const QString& pattern);
+
+protected:
+    bool filterAcceptsRow(int sourceRow, const QModelIndex& sourceParent) const override;
+
+private:
+    bool acceptIndex(const QModelIndex& idx) const;
+};
+
 class AssetsDialog final : public QDialog {
 Q_OBJECT
 public:
@@ -48,12 +72,14 @@ public:
     AssetsDialog(QWidget* parent, openspace::Profile* profile,
         const std::string& assetBasePath, const std::string& userAssetBasePath);
 
+private slots:
+    void searchTextChanged(const QString& text);
+
 private:
     void createWidgets();
-
+    void setViewToBaseModel();
     void parseSelections();
     void selected(const QModelIndex&);
-
     /// Creates a text summary of all assets and their paths
     QString createTextSummary();
     void openAssetEditor();
@@ -61,7 +87,10 @@ private:
     openspace::Profile* _profile = nullptr;
     AssetTreeModel _assetTreeModel;
     QTreeView* _assetTree = nullptr;
+    QLineEdit* _searchTextBox = nullptr;
     QTextEdit* _summary = nullptr;
+    QSortFilterProxyModel* _assetProxyModel = nullptr;
+    SearchProxyModel* _searchProxyModel = nullptr;
 };
 
 #endif // __OPENSPACE_UI_LAUNCHER___ASSETSDIALOG___H__
diff --git a/apps/OpenSpace/ext/launcher/src/profile/assetsdialog.cpp b/apps/OpenSpace/ext/launcher/src/profile/assetsdialog.cpp
index 897b7c2e5f..dedc8deb20 100644
--- a/apps/OpenSpace/ext/launcher/src/profile/assetsdialog.cpp
+++ b/apps/OpenSpace/ext/launcher/src/profile/assetsdialog.cpp
@@ -62,7 +62,6 @@ namespace {
     void traverseToFindFilesystemMatch(AssetTreeModel& model, QModelIndex parent,
                                        int nRows, const std::string& path)
     {
-
         int startIndex = 0;
         std::string token = "${USER_ASSETS}/";
         if (path.find(token) == 0) {
@@ -152,6 +151,15 @@ AssetsDialog::AssetsDialog(QWidget* parent, openspace::Profile* profile,
         newAssetButton->setDefault(false);
         container->addWidget(newAssetButton, 0, 2);
         layout->addLayout(container);
+
+        QLabel* searchLabel = new QLabel("Search: ");
+        searchLabel->setObjectName("heading");
+        _searchTextBox = new QLineEdit;
+        _searchTextBox->setClearButtonEnabled(true);
+        QBoxLayout* layoutSearchBox = new QHBoxLayout;
+        layoutSearchBox->addWidget(searchLabel);
+        layoutSearchBox->addWidget(_searchTextBox);
+        layout->addLayout(layoutSearchBox);
     }
     {
         _assetTree = new QTreeView;
@@ -160,17 +168,7 @@ AssetsDialog::AssetsDialog(QWidget* parent, openspace::Profile* profile,
             "Enable checkbox to include an asset. Those assets highlighted in red are "
             "present in the profile but do not exist in this OpenSpace installation"
         );
-        _assetTree->setAlternatingRowColors(true);
-        _assetTree->setModel(&_assetTreeModel);
-        _assetTree->setRootIndex(_assetTreeModel.index(-1, 0));
-        _assetTree->setColumnWidth(1, 60);
-        _assetTree->setColumnWidth(0, _assetTree->width() - 60);
-        _assetTree->header()->setSectionResizeMode(0, QHeaderView::Stretch);
-        _assetTree->header()->setSectionResizeMode(1, QHeaderView::Fixed);
-        _assetTree->header()->setStretchLastSection(false);
-        _assetTree->setAnimated(true);
-        _assetTree->setSortingEnabled(false);
-        _assetTree->setSelectionMode(QAbstractItemView::SingleSelection);
+        setViewToBaseModel();
         connect(_assetTree, &QTreeView::clicked, this, &AssetsDialog::selected);
 
 
@@ -215,8 +213,31 @@ AssetsDialog::AssetsDialog(QWidget* parent, openspace::Profile* profile,
             buttons, &QDialogButtonBox::rejected,
             this, &AssetsDialog::reject
         );
+        connect(
+            _searchTextBox, &QLineEdit::textChanged,
+            this, &AssetsDialog::searchTextChanged
+        );
         layout->addWidget(buttons);
     }
+    {
+        _searchProxyModel = new SearchProxyModel(this);
+        _searchProxyModel->setSourceModel(&_assetTreeModel);
+        _assetProxyModel = qobject_cast<QSortFilterProxyModel*>(_searchProxyModel);
+    }
+}
+
+void AssetsDialog::setViewToBaseModel() {
+    _assetTree->setAlternatingRowColors(true);
+    _assetTree->setModel(&_assetTreeModel);
+    _assetTree->setRootIndex(_assetTreeModel.index(-1, 0));
+    _assetTree->setColumnWidth(1, 60);
+    _assetTree->setColumnWidth(0, _assetTree->width() - 60);
+    _assetTree->header()->setSectionResizeMode(0, QHeaderView::Stretch);
+    _assetTree->header()->setSectionResizeMode(1, QHeaderView::Fixed);
+    _assetTree->header()->setStretchLastSection(false);
+    _assetTree->setAnimated(true);
+    _assetTree->setSortingEnabled(false);
+    _assetTree->setSelectionMode(QAbstractItemView::SingleSelection);
 }
 
 QString AssetsDialog::createTextSummary() {
@@ -259,3 +280,50 @@ void AssetsDialog::parseSelections() {
 void AssetsDialog::selected(const QModelIndex&) {
     _summary->setText(createTextSummary());
 }
+
+void AssetsDialog::searchTextChanged(const QString& text) {
+    if (!_assetProxyModel) {
+        return;
+    }
+    if (text.isEmpty()) {
+        setViewToBaseModel();
+        traverseToExpandSelectedItems(
+            *_assetTree,
+            _assetTreeModel,
+            _assetTreeModel.rowCount(_assetTreeModel.index(-1, 0)),
+            _assetTreeModel.index(-1, 0)
+        );
+    }
+    else {
+        _assetTree->setModel(_searchProxyModel);
+        _assetProxyModel->setFilterRegExp(text);
+        _assetTree->expandAll();
+    }
+}
+    
+void SearchProxyModel::setFilterRegExp(const QString& pattern) {
+    QRegExp regex(pattern, Qt::CaseInsensitive, QRegExp::FixedString);
+    QSortFilterProxyModel::setFilterRegExp(regex);
+}
+
+bool SearchProxyModel::filterAcceptsRow(int sourceRow,
+                                        const QModelIndex& sourceParent) const
+{
+    QModelIndex idx = sourceModel()->index(sourceRow, 0, sourceParent);
+    return acceptIndex(idx);
+}
+
+bool SearchProxyModel::acceptIndex(const QModelIndex& idx) const {
+    if (idx.isValid()) {
+        QString text = idx.data(Qt::DisplayRole).toString();
+        if (filterRegExp().indexIn(text) >= 0) {
+            return true;
+        }
+        for (int row = 0; row < idx.model()->rowCount(idx); ++row) {
+            if (acceptIndex(idx.model()->index(row, 0, idx))) {
+                return true;
+            }
+        }
+    }
+    return false;
+}

From 8b923f3a4bc35fdca99f8406ad2f7474cd1c0afd Mon Sep 17 00:00:00 2001
From: Emma Broman <emma.broman@liu.se>
Date: Mon, 7 Aug 2023 09:08:40 +0200
Subject: [PATCH 073/701] Fix compiler error in geojson shaders

Cuases problems with GeoJson on some graphics cards
---
 modules/globebrowsing/shaders/geojson_fs.glsl | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/globebrowsing/shaders/geojson_fs.glsl b/modules/globebrowsing/shaders/geojson_fs.glsl
index 7cb33a3825..7d3496e9ca 100644
--- a/modules/globebrowsing/shaders/geojson_fs.glsl
+++ b/modules/globebrowsing/shaders/geojson_fs.glsl
@@ -35,7 +35,7 @@ uniform float ambientIntensity = 0.2;
 uniform float diffuseIntensity = 0.8;
 uniform bool performShading = true;
 
-uniform unsigned int nLightSources;
+uniform uint nLightSources;
 uniform vec3 lightDirectionsViewSpace[8];
 uniform float lightIntensities[8];
 

From 15dbe323412e23556bd4bd894cfb51b77ca24747 Mon Sep 17 00:00:00 2001
From: Emma Broman <emma.broman@liu.se>
Date: Mon, 7 Aug 2023 09:46:24 +0200
Subject: [PATCH 074/701] Make it possible to fade in/out
 RenderableFieldLinesSequences (e.g. magnetosphere)

---
 .../rendering/renderablefieldlinessequence.cpp                | 4 ++++
 modules/fieldlinessequence/shaders/fieldlinessequence_fs.glsl | 3 ++-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/modules/fieldlinessequence/rendering/renderablefieldlinessequence.cpp b/modules/fieldlinessequence/rendering/renderablefieldlinessequence.cpp
index 37405e993b..92b10d7c1c 100644
--- a/modules/fieldlinessequence/rendering/renderablefieldlinessequence.cpp
+++ b/modules/fieldlinessequence/rendering/renderablefieldlinessequence.cpp
@@ -354,6 +354,8 @@ RenderableFieldlinesSequence::RenderableFieldlinesSequence(
 {
     const Parameters p = codegen::bake<Parameters>(dictionary);
 
+    addProperty(Fadeable::_opacity);
+
     // Extracts the general information (from the asset file) that
     // is mandatory for the class to function;
     std::string fileTypeString;
@@ -1031,6 +1033,8 @@ void RenderableFieldlinesSequence::render(const RenderData& data, RendererTasks&
         global::windowDelegate->applicationTime() * (_flowReversed ? -1 : 1)
     );
 
+    _shaderProgram->setUniform("opacity", opacity());
+
     bool additiveBlending = false;
     if (_colorABlendEnabled) {
         additiveBlending = true;
diff --git a/modules/fieldlinessequence/shaders/fieldlinessequence_fs.glsl b/modules/fieldlinessequence/shaders/fieldlinessequence_fs.glsl
index f5eecf5ef0..946397875f 100644
--- a/modules/fieldlinessequence/shaders/fieldlinessequence_fs.glsl
+++ b/modules/fieldlinessequence/shaders/fieldlinessequence_fs.glsl
@@ -28,7 +28,7 @@ in vec4 vs_color;
 in float vs_depth;
 
 uniform bool usingAdditiveBlending;
-
+uniform float opacity;
 
 Fragment getFragment() {
   if (vs_color.a == 0) {
@@ -40,6 +40,7 @@ Fragment getFragment() {
   Fragment frag;
   frag.depth = vs_depth;
   frag.color = fragColor;
+  frag.color.a *= opacity;
 
   // G-Buffer
   frag.gPosition  = vec4(0.0);//vs_gPosition;

From add6df05fd7b478e6f7ea4f0784de0a9b7cad59c Mon Sep 17 00:00:00 2001
From: Emma Broman <emma.broman@liu.se>
Date: Mon, 7 Aug 2023 10:08:21 +0200
Subject: [PATCH 075/701] Replace some more `getPropertyValue` function calls
 (deprecated)

---
 data/assets/util/webgui.asset  | 10 +++++-----
 scripts/core_scripts.lua       | 28 ++++++++++++++--------------
 src/interaction/touchbar.mm    |  4 ++--
 src/rendering/renderengine.cpp |  6 +++---
 4 files changed, 24 insertions(+), 24 deletions(-)

diff --git a/data/assets/util/webgui.asset b/data/assets/util/webgui.asset
index 2892f6e71c..aa59aa8000 100644
--- a/data/assets/util/webgui.asset
+++ b/data/assets/util/webgui.asset
@@ -27,10 +27,10 @@ asset.onInitialize(function()
   -- and remove automatic restart on each property change,
   -- since frequent restarting seems to be unstable on mac.
 
-  local enabled = openspace.getPropertyValue("Modules.WebGui.ServerProcessEnabled")
+  local enabled = openspace.propertyValue("Modules.WebGui.ServerProcessEnabled")
   openspace.setPropertyValueSingle("Modules.WebGui.ServerProcessEnabled", false)
 
-  local directories = openspace.getPropertyValue("Modules.WebGui.Directories")
+  local directories = openspace.propertyValue("Modules.WebGui.Directories")
   directories[#directories + 1] = "frontend"
   directories[#directories + 1] = frontend .. "frontend"
 
@@ -40,7 +40,7 @@ asset.onInitialize(function()
 
   -- The GUI contains date and simulation increment,
   -- so let's remove these from the dashboard.
-  if openspace.getPropertyValue("Modules.CefWebGui.Visible") then
+  if openspace.propertyValue("Modules.CefWebGui.Visible") then
     if openspace.hasProperty("Dashboard.Date.Enabled") then
       openspace.setPropertyValueSingle("Dashboard.Date.Enabled", false)
     end
@@ -52,7 +52,7 @@ end)
 
 asset.onDeinitialize(function()
   -- Remove the frontend endpoint
-  local directories = openspace.getPropertyValue("Modules.WebGui.Directories")
+  local directories = openspace.propertyValue("Modules.WebGui.Directories")
   local newDirectories = {}
 
   -- @TODO(maci, 2019-08-23) see message below
@@ -73,7 +73,7 @@ asset.onDeinitialize(function()
 end)
 
 function setCefRoute(route)
-  local port = openspace.getPropertyValue("Modules.WebGui.Port")
+  local port = openspace.propertyValue("Modules.WebGui.Port")
   -- As a developer, you can manually serve the webgui from port 4690
   -- with the command `npm start` in the web gui repository
   if guiCustomization.webguiDevelopmentMode then
diff --git a/scripts/core_scripts.lua b/scripts/core_scripts.lua
index 8a0c434a99..602b50e5a5 100644
--- a/scripts/core_scripts.lua
+++ b/scripts/core_scripts.lua
@@ -146,7 +146,7 @@ openspace.rebindKey = function(oldKey, newKey)
 end
 
 openspace.appendToListProperty = function(propertyIdentifier, newItem)
-    local list = openspace.getPropertyValue(propertyIdentifier)
+    local list = openspace.propertyValue(propertyIdentifier)
     if type(list) ~= 'table' then
         openspace.printError(
             "Error when calling script 'openspace.appendToListProperty': " ..
@@ -159,7 +159,7 @@ openspace.appendToListProperty = function(propertyIdentifier, newItem)
 end
 
 openspace.addToPropertyValue = function(propertyIdentifier, valueToAdd)
-    local value = openspace.getPropertyValue(propertyIdentifier)
+    local value = openspace.propertyValue(propertyIdentifier)
     if type(value) == 'string' then
         value = value .. valueToAdd;
     else
@@ -169,7 +169,7 @@ openspace.addToPropertyValue = function(propertyIdentifier, valueToAdd)
 end
 
 openspace.invertBooleanProperty = function(propertyIdentifier)
-    local value = openspace.getPropertyValue(propertyIdentifier)
+    local value = openspace.propertyValue(propertyIdentifier)
     if type(value) ~= 'boolean' then
         openspace.printError(
             "Error when calling script 'openspace.invertBooleanProperty': " ..
@@ -183,7 +183,7 @@ end
 openspace.fadeIn = function(identifier, fadeTime, endScript)
     -- Set default values for optional arguments
     endScript = endScript or ""
-    fadeTime = fadeTime or openspace.getPropertyValue("OpenSpaceEngine.FadeDuration")
+    fadeTime = fadeTime or openspace.propertyValue("OpenSpaceEngine.FadeDuration")
 
     local enabledProperty = identifier .. ".Enabled"
     local fadeProperty = identifier .. ".Fade"
@@ -197,7 +197,7 @@ openspace.fadeIn = function(identifier, fadeTime, endScript)
 
     if hasTag ~= nil or hasWild ~= nil then
         -- Regex, several nodes
-        local enabledPropertyList = openspace.getProperty(enabledProperty)
+        local enabledPropertyList = openspace.property(enabledProperty)
         if next(enabledPropertyList) == nil then
             -- List is empty, no matches found
             openspace.printError(
@@ -207,7 +207,7 @@ openspace.fadeIn = function(identifier, fadeTime, endScript)
             return
         end
 
-        local fadePropertyList = openspace.getProperty(fadeProperty)
+        local fadePropertyList = openspace.property(fadeProperty)
         if next(fadePropertyList) == nil then
             -- List is empty, no matches found
             openspace.printError(
@@ -234,7 +234,7 @@ openspace.fadeIn = function(identifier, fadeTime, endScript)
             )
             return
         else
-            isEnabled = openspace.getPropertyValue(enabledProperty)
+            isEnabled = openspace.propertyValue(enabledProperty)
         end
     end
 
@@ -250,7 +250,7 @@ end
 openspace.fadeOut = function(identifier, fadeTime, endScript)
     -- Set default values for optional arguments
     endScript = endScript or ""
-    fadeTime = fadeTime or openspace.getPropertyValue("OpenSpaceEngine.FadeDuration")
+    fadeTime = fadeTime or openspace.propertyValue("OpenSpaceEngine.FadeDuration")
 
     local enabledProperty = identifier .. ".Enabled"
     local fadeProperty = identifier .. ".Fade"
@@ -264,7 +264,7 @@ openspace.fadeOut = function(identifier, fadeTime, endScript)
 
     if hasTag ~= nil or hasWild ~= nil then
         -- Regex, several nodes
-        local enabledPropertyList = openspace.getProperty(enabledProperty)
+        local enabledPropertyList = openspace.property(enabledProperty)
         if next(enabledPropertyList) == nil then
             -- List is empty, no matches found
             openspace.printError(
@@ -274,7 +274,7 @@ openspace.fadeOut = function(identifier, fadeTime, endScript)
             return
         end
 
-        local fadePropertyList = openspace.getProperty(fadeProperty)
+        local fadePropertyList = openspace.property(fadeProperty)
         if next(fadePropertyList) == nil then
             -- List is empty, no matches found
             openspace.printError(
@@ -301,7 +301,7 @@ openspace.fadeOut = function(identifier, fadeTime, endScript)
             )
             return
         else
-            isEnabled = openspace.getPropertyValue(enabledProperty)
+            isEnabled = openspace.propertyValue(enabledProperty)
         end
     end
 
@@ -319,10 +319,10 @@ end
 
 openspace.toggleFade = function(renderable, fadeTime, endScript)
   if (fadeTime == nil) then
-    fadeTime = openspace.getPropertyValue("OpenSpaceEngine.FadeDuration")
+    fadeTime = openspace.propertyValue("OpenSpaceEngine.FadeDuration")
   end
-  local enabled = openspace.getPropertyValue(renderable .. ".Enabled")
-  local fadeState = openspace.getPropertyValue(renderable .. ".Fade")
+  local enabled = openspace.propertyValue(renderable .. ".Enabled")
+  local fadeState = openspace.propertyValue(renderable .. ".Fade")
   if (enabled) then
     if (fadeState < 0.5) then
       openspace.fadeIn(renderable, fadeTime-(fadeTime*fadeState), endScript)
diff --git a/src/interaction/touchbar.mm b/src/interaction/touchbar.mm
index 3e67369240..6f8bbbf1c4 100644
--- a/src/interaction/touchbar.mm
+++ b/src/interaction/touchbar.mm
@@ -206,7 +206,7 @@ NSArray* focusIdentifiers;
         (void)sender;
 
         global::scriptEngine->queueScript(
-            "local isEnabled = openspace.getPropertyValue('Dashboard.IsEnabled');\
+            "local isEnabled = openspace.propertyValue('Dashboard.IsEnabled');\
              openspace.setPropertyValueSingle('Dashboard.IsEnabled', not isEnabled);\
              openspace.setPropertyValueSingle('RenderEngine.ShowLog', not isEnabled);\
              openspace.setPropertyValueSingle('RenderEngine.ShowVersion', not isEnabled);\
@@ -219,7 +219,7 @@ NSArray* focusIdentifiers;
         // Remove unused variable warning
         (void)sender;
         global::scriptEngine->queueScript(
-            "local isEnabled = openspace.getPropertyValue('Modules.CefWebGui.Visible');\
+            "local isEnabled = openspace.propertyValue('Modules.CefWebGui.Visible');\
             openspace.setPropertyValueSingle('Modules.CefWebGui.Visible', not isEnabled);",
             scripting::ScriptEngine::RemoteScripting::No
         );
diff --git a/src/rendering/renderengine.cpp b/src/rendering/renderengine.cpp
index 1c486dac18..f73dbcc2f6 100644
--- a/src/rendering/renderengine.cpp
+++ b/src/rendering/renderengine.cpp
@@ -772,7 +772,7 @@ bool RenderEngine::mouseActivationCallback(const glm::dvec2& mousePosition) cons
     if (intersects(mousePosition, _cameraButtonLocations.rotation)) {
         constexpr const char ToggleRotationFrictionScript[] = R"(
             local f = 'NavigationHandler.OrbitalNavigator.Friction.RotationalFriction';
-            openspace.setPropertyValueSingle(f, not openspace.getPropertyValue(f));)";
+            openspace.setPropertyValueSingle(f, not openspace.propertyValue(f));)";
 
         global::scriptEngine->queueScript(
             ToggleRotationFrictionScript,
@@ -784,7 +784,7 @@ bool RenderEngine::mouseActivationCallback(const glm::dvec2& mousePosition) cons
     if (intersects(mousePosition, _cameraButtonLocations.zoom)) {
         constexpr const char ToggleZoomFrictionScript[] = R"(
             local f = 'NavigationHandler.OrbitalNavigator.Friction.ZoomFriction';
-            openspace.setPropertyValueSingle(f, not openspace.getPropertyValue(f));)";
+            openspace.setPropertyValueSingle(f, not openspace.propertyValue(f));)";
 
         global::scriptEngine->queueScript(
             ToggleZoomFrictionScript,
@@ -796,7 +796,7 @@ bool RenderEngine::mouseActivationCallback(const glm::dvec2& mousePosition) cons
     if (intersects(mousePosition, _cameraButtonLocations.roll)) {
         constexpr const char ToggleRollFrictionScript[] = R"(
             local f = 'NavigationHandler.OrbitalNavigator.Friction.RollFriction';
-            openspace.setPropertyValueSingle(f, not openspace.getPropertyValue(f));)";
+            openspace.setPropertyValueSingle(f, not openspace.propertyValue(f));)";
 
         global::scriptEngine->queueScript(
             ToggleRollFrictionScript,

From 85100e13be9c4107429bfc8e364f6455ec2090ae Mon Sep 17 00:00:00 2001
From: Emma Broman <emma.broman@liu.se>
Date: Mon, 7 Aug 2023 10:19:43 +0200
Subject: [PATCH 076/701] Rename some more deprecated functions in Lua calls

---
 data/assets/nightsky/cardinal_directions.asset                  | 2 +-
 .../heliosphere/bastille_day/magnetogram_textures.asset         | 2 +-
 modules/globebrowsing/scripts/node_support.lua                  | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/data/assets/nightsky/cardinal_directions.asset b/data/assets/nightsky/cardinal_directions.asset
index cc3b68b854..e30d87ec94 100644
--- a/data/assets/nightsky/cardinal_directions.asset
+++ b/data/assets/nightsky/cardinal_directions.asset
@@ -65,7 +65,7 @@ local CardinalDirectionSphere = {
 }
 
 local showCommand = [[
-  local lat, lon, alt = openspace.globebrowsing.getGeoPositionForCamera()
+  local lat, lon, alt = openspace.globebrowsing.geoPositionForCamera()
   local camera = openspace.navigation.getNavigationState()
   openspace.setParent("CardinalDirectionsPosition", camera.Anchor)
   openspace.setPropertyValueSingle("Scene.CardinalDirectionsPosition.Translation.Globe", camera.Anchor)
diff --git a/data/assets/scene/solarsystem/heliosphere/bastille_day/magnetogram_textures.asset b/data/assets/scene/solarsystem/heliosphere/bastille_day/magnetogram_textures.asset
index 0455bc9b86..cfbe2e771a 100644
--- a/data/assets/scene/solarsystem/heliosphere/bastille_day/magnetogram_textures.asset
+++ b/data/assets/scene/solarsystem/heliosphere/bastille_day/magnetogram_textures.asset
@@ -8,7 +8,7 @@ local SwitchColorLayer = {
   Identifier = "os.bastilleday.magnetogramtexture.SwitchColorLayer",
   Name = "Next sun texture",
   Command = [[
-    local textureList = openspace.globebrowsing.getLayers("Sun", "ColorLayers")
+    local textureList = openspace.globebrowsing.layers("Sun", "ColorLayers")
     if (magnetogramsTextureIndex == -1) then
       magnetogramsTextureIndex = 2
     end
diff --git a/modules/globebrowsing/scripts/node_support.lua b/modules/globebrowsing/scripts/node_support.lua
index 800f6df164..35f275b7f8 100644
--- a/modules/globebrowsing/scripts/node_support.lua
+++ b/modules/globebrowsing/scripts/node_support.lua
@@ -34,7 +34,7 @@ openspace.globebrowsing.setNodePosition = function (node_identifer, globe_identi
 end
 
 openspace.globebrowsing.setNodePositionFromCamera = function (node_identifer, use_altitude)
-    local lat, lon, alt = openspace.globebrowsing.getGeoPositionForCamera();
+    local lat, lon, alt = openspace.globebrowsing.geoPositionForCamera();
     local camera = openspace.navigation.getNavigationState();
     openspace.setParent(node_identifer, camera.Anchor)
     openspace.setPropertyValueSingle('Scene.' .. node_identifer .. '.Translation.Globe', camera.Anchor);

From 786c2887da91fdcaf4d6e114974d4d416ad3da66 Mon Sep 17 00:00:00 2001
From: Malin E <malin.ejdbo@gmail.com>
Date: Mon, 7 Aug 2023 11:47:32 +0200
Subject: [PATCH 077/701] Sphere maintenance (#2800)

* Split RenderableSphere class into a local and online sphere

* Make the video sphere derive from the regular sphere

* Make RenderableTimeVaryingSphere derive from RenderableSphere

* Some clean up

* Address PR comments
---
 data/assets/examples/spheres.asset            |   2 +-
 .../assets/nightsky/cardinal_directions.asset |   2 +-
 data/assets/nightsky/ecliptic_band.asset      |   2 +-
 data/assets/nightsky/light_pollution.asset    |   2 +-
 .../digitaluniverse/backgroundradiation.asset |  16 +-
 .../backgroundradiation_multiverse.asset      |   8 +-
 .../digitaluniverse/milkyway_sphere.asset     |   2 +-
 data/assets/scene/milkyway/milkyway/eso.asset |   2 +-
 .../solarsystem/telescopes/jwst/jwst.asset    |   2 +-
 modules/base/CMakeLists.txt                   |   4 +
 modules/base/basemodule.cpp                   |   8 +-
 modules/base/rendering/renderablesphere.cpp   | 181 ++++-----
 modules/base/rendering/renderablesphere.h     |  24 +-
 .../rendering/renderablesphereimagelocal.cpp  | 134 +++++++
 .../rendering/renderablesphereimagelocal.h    |  67 ++++
 .../rendering/renderablesphereimageonline.cpp | 163 ++++++++
 .../rendering/renderablesphereimageonline.h   |  67 ++++
 .../rendering/renderabletimevaryingsphere.cpp | 368 ++----------------
 .../rendering/renderabletimevaryingsphere.h   |  39 +-
 modules/spout/renderablespherespout.cpp       |   3 +-
 modules/video/include/renderablevideoplane.h  |   2 +-
 modules/video/include/renderablevideosphere.h |  45 +--
 modules/video/src/renderablevideoplane.cpp    |   2 +-
 modules/video/src/renderablevideosphere.cpp   | 346 +---------------
 24 files changed, 604 insertions(+), 887 deletions(-)
 create mode 100644 modules/base/rendering/renderablesphereimagelocal.cpp
 create mode 100644 modules/base/rendering/renderablesphereimagelocal.h
 create mode 100644 modules/base/rendering/renderablesphereimageonline.cpp
 create mode 100644 modules/base/rendering/renderablesphereimageonline.h

diff --git a/data/assets/examples/spheres.asset b/data/assets/examples/spheres.asset
index df6afcfe81..1d3dd15195 100644
--- a/data/assets/examples/spheres.asset
+++ b/data/assets/examples/spheres.asset
@@ -13,7 +13,7 @@ for z = 1,3 do
           }
         },
         Renderable = {
-          Type = "RenderableSphere",
+          Type = "RenderableSphereImageLocal",
           Size = 0.20 + i * 0.01,
           Segments = 80,
           Opacity = 1,
diff --git a/data/assets/nightsky/cardinal_directions.asset b/data/assets/nightsky/cardinal_directions.asset
index e30d87ec94..3edce459fe 100644
--- a/data/assets/nightsky/cardinal_directions.asset
+++ b/data/assets/nightsky/cardinal_directions.asset
@@ -48,7 +48,7 @@ local CardinalDirectionSphere = {
     }
   },
   Renderable = {
-    Type = "RenderableSphere",
+    Type = "RenderableSphereImageLocal",
     Enabled = asset.enabled,
     Size = 50000,
     Segments = 80,
diff --git a/data/assets/nightsky/ecliptic_band.asset b/data/assets/nightsky/ecliptic_band.asset
index e7fbc319bd..90a89193cd 100644
--- a/data/assets/nightsky/ecliptic_band.asset
+++ b/data/assets/nightsky/ecliptic_band.asset
@@ -54,7 +54,7 @@ local EclipticBand = {
     }
   },
   Renderable = {
-    Type = "RenderableSphere",
+    Type = "RenderableSphereImageLocal",
     Texture = textures .. "band2x.png",
     Size = 4.28601E17,
     Segments = 50,
diff --git a/data/assets/nightsky/light_pollution.asset b/data/assets/nightsky/light_pollution.asset
index a8850826dd..d2b6eace04 100644
--- a/data/assets/nightsky/light_pollution.asset
+++ b/data/assets/nightsky/light_pollution.asset
@@ -33,7 +33,7 @@ local LightPollutionSphere = {
     }
   },
   Renderable = {
-    Type = "RenderableSphere",
+    Type = "RenderableSphereImageLocal",
     Size = earthAsset.Earth.Renderable.Radii[1] * 1.05,
     Segments = 40,
     Opacity = 0.0,
diff --git a/data/assets/scene/digitaluniverse/backgroundradiation.asset b/data/assets/scene/digitaluniverse/backgroundradiation.asset
index 32409116e5..0fd43a12ea 100644
--- a/data/assets/scene/digitaluniverse/backgroundradiation.asset
+++ b/data/assets/scene/digitaluniverse/backgroundradiation.asset
@@ -22,7 +22,7 @@ local WMAP = {
     }
   },
   Renderable = {
-    Type = "RenderableSphere",
+    Type = "RenderableSphereImageLocal",
     Enabled = false,
     Size = 3975.41417036064E23,
     Segments = 80,
@@ -47,7 +47,7 @@ local CBE = {
     }
   },
   Renderable = {
-    Type = "RenderableSphere",
+    Type = "RenderableSphereImageLocal",
     Enabled = false,
     Size = 3975.41417036064E23,
     Segments = 80,
@@ -72,7 +72,7 @@ local Planck = {
     }
   },
   Renderable = {
-    Type = "RenderableSphere",
+    Type = "RenderableSphereImageLocal",
     Enabled = true,
     Size = 3975.41417036064E23,
     Segments = 80,
@@ -98,7 +98,7 @@ local HAlpha = {
     }
   },
   Renderable = {
-    Type = "RenderableSphere",
+    Type = "RenderableSphereImageLocal",
     Enabled = false,
     Size = 9.2E21,
     Segments = 40,
@@ -141,10 +141,10 @@ asset.meta = {
   Name = "Background Radiation",
   Version = "2.1",
   Description = [[Various AllSky images for the Milky Way and observable Universe.
-      Included: Wilkinson Microwave Anisotropy Probe (WMAP), Cosmic Background Explorer,
-      Planck, and H Alpha <br><br> Data Reference: Planck/ESA and the Planck
-      Collaboration, Wilkinson Microwave Anisotropy Probe/NASA, Doug
-      Finkbeiner (Princeton)]],
+    Included: Wilkinson Microwave Anisotropy Probe (WMAP), Cosmic Background Explorer,
+    Planck, and H Alpha <br><br> Data Reference: Planck/ESA and the Planck
+    Collaboration, Wilkinson Microwave Anisotropy Probe/NASA, Doug
+    Finkbeiner (Princeton)]],
   Author = "Brian Abbott (AMNH), OpenSpace Team",
   URL = "https://www.amnh.org/research/hayden-planetarium/digital-universe",
   License = "AMNH Digital Universe"
diff --git a/data/assets/scene/digitaluniverse/backgroundradiation_multiverse.asset b/data/assets/scene/digitaluniverse/backgroundradiation_multiverse.asset
index 70d83e7716..6633d975c9 100644
--- a/data/assets/scene/digitaluniverse/backgroundradiation_multiverse.asset
+++ b/data/assets/scene/digitaluniverse/backgroundradiation_multiverse.asset
@@ -19,7 +19,7 @@ local PlanckMultiverse1 = {
     }
   },
   Renderable = {
-    Type = "RenderableSphere",
+    Type = "RenderableSphereImageLocal",
     Enabled = false,
     Size = 3975.41417036064E23,
     Segments = 80,
@@ -48,7 +48,7 @@ local PlanckMultiverse2 = {
     }
   },
   Renderable = {
-    Type = "RenderableSphere",
+    Type = "RenderableSphereImageLocal",
     Enabled = false,
     Size = 3975.41417036064E23,
     Segments = 80,
@@ -77,7 +77,7 @@ local PlanckMultiverse3 = {
     }
   },
   Renderable = {
-    Type = "RenderableSphere",
+    Type = "RenderableSphereImageLocal",
     Enabled = false,
     Size = 3975.41417036064E23,
     Segments = 80,
@@ -106,7 +106,7 @@ local PlanckMultiverse4 = {
     }
   },
   Renderable = {
-    Type = "RenderableSphere",
+    Type = "RenderableSphereImageLocal",
     Enabled = false,
     Size = 3975.41417036064E23,
     Segments = 80,
diff --git a/data/assets/scene/digitaluniverse/milkyway_sphere.asset b/data/assets/scene/digitaluniverse/milkyway_sphere.asset
index 65ed5cab71..1c4f51a7ad 100644
--- a/data/assets/scene/digitaluniverse/milkyway_sphere.asset
+++ b/data/assets/scene/digitaluniverse/milkyway_sphere.asset
@@ -15,7 +15,7 @@ local Sphere = {
     }
   },
   Renderable = {
-    Type = "RenderableSphere",
+    Type = "RenderableSphereImageLocal",
     Size = 9.2E21,
     Segments = 40,
     Opacity = 0.25,
diff --git a/data/assets/scene/milkyway/milkyway/eso.asset b/data/assets/scene/milkyway/milkyway/eso.asset
index 8112beb9ab..47a51aee35 100644
--- a/data/assets/scene/milkyway/milkyway/eso.asset
+++ b/data/assets/scene/milkyway/milkyway/eso.asset
@@ -15,7 +15,7 @@ local Object = {
     }
   },
   Renderable = {
-    Type = "RenderableSphere",
+    Type = "RenderableSphereImageLocal",
     Size = 9.2E20,
     Segments = 40,
     Opacity = 0.4,
diff --git a/data/assets/scene/solarsystem/telescopes/jwst/jwst.asset b/data/assets/scene/solarsystem/telescopes/jwst/jwst.asset
index 364181f76e..4c992a9fcf 100644
--- a/data/assets/scene/solarsystem/telescopes/jwst/jwst.asset
+++ b/data/assets/scene/solarsystem/telescopes/jwst/jwst.asset
@@ -43,7 +43,7 @@ local JWSTBand = {
     }
   },
   Renderable = {
-    Type = "RenderableSphere",
+    Type = "RenderableSphereImageLocal",
     Texture = band .. "JWST-band.png",
     Size = 9.2E15,
     Segments = 50,
diff --git a/modules/base/CMakeLists.txt b/modules/base/CMakeLists.txt
index f37c8bc1a0..a0a14901f6 100644
--- a/modules/base/CMakeLists.txt
+++ b/modules/base/CMakeLists.txt
@@ -55,6 +55,8 @@ set(HEADER_FILES
   rendering/renderableplanetimevaryingimage.h
   rendering/renderableprism.h
   rendering/renderablesphere.h
+  rendering/renderablesphereimagelocal.h
+  rendering/renderablesphereimageonline.h
   rendering/renderabletimevaryingsphere.h
   rendering/renderabletrail.h
   rendering/renderabletrailorbit.h
@@ -111,6 +113,8 @@ set(SOURCE_FILES
   rendering/renderableplanetimevaryingimage.cpp
   rendering/renderableprism.cpp
   rendering/renderablesphere.cpp
+  rendering/renderablesphereimagelocal.cpp
+  rendering/renderablesphereimageonline.cpp
   rendering/renderabletimevaryingsphere.cpp
   rendering/renderabletrail.cpp
   rendering/renderabletrailorbit.cpp
diff --git a/modules/base/basemodule.cpp b/modules/base/basemodule.cpp
index 7b8ef29316..0ab2488a03 100644
--- a/modules/base/basemodule.cpp
+++ b/modules/base/basemodule.cpp
@@ -48,7 +48,8 @@
 #include <modules/base/rendering/renderablelabel.h>
 #include <modules/base/rendering/renderablemodel.h>
 #include <modules/base/rendering/renderablenodeline.h>
-#include <modules/base/rendering/renderablesphere.h>
+#include <modules/base/rendering/renderablesphereimagelocal.h>
+#include <modules/base/rendering/renderablesphereimageonline.h>
 #include <modules/base/rendering/renderabletrailorbit.h>
 #include <modules/base/rendering/renderabletrailtrajectory.h>
 #include <modules/base/rendering/renderableplaneimagelocal.h>
@@ -146,7 +147,8 @@ void BaseModule::internalInitialize(const ghoul::Dictionary&) {
         "RenderableTimeVaryingSphere"
     );
     fRenderable->registerClass<RenderableRadialGrid>("RenderableRadialGrid");
-    fRenderable->registerClass<RenderableSphere>("RenderableSphere");
+    fRenderable->registerClass<RenderableSphereImageLocal>("RenderableSphereImageLocal");
+    fRenderable->registerClass<RenderableSphereImageOnline>("RenderableSphereImageOnline");
     fRenderable->registerClass<RenderableSphericalGrid>("RenderableSphericalGrid");
     fRenderable->registerClass<RenderableTrailOrbit>("RenderableTrailOrbit");
     fRenderable->registerClass<RenderableTrailTrajectory>("RenderableTrailTrajectory");
@@ -226,6 +228,8 @@ std::vector<documentation::Documentation> BaseModule::documentations() const {
         RenderablePrism::Documentation(),
         RenderableRadialGrid::Documentation(),
         RenderableSphere::Documentation(),
+        RenderableSphereImageLocal::Documentation(),
+        RenderableSphereImageOnline::Documentation(),
         RenderableSphericalGrid::Documentation(),
         RenderableTimeVaryingSphere::Documentation(),
         RenderableTrailOrbit::Documentation(),
diff --git a/modules/base/rendering/renderablesphere.cpp b/modules/base/rendering/renderablesphere.cpp
index 640a768048..c734654687 100644
--- a/modules/base/rendering/renderablesphere.cpp
+++ b/modules/base/rendering/renderablesphere.cpp
@@ -31,13 +31,12 @@
 #include <openspace/rendering/renderengine.h>
 #include <openspace/util/sphere.h>
 #include <openspace/util/updatestructures.h>
-#include <ghoul/glm.h>
 #include <ghoul/filesystem/filesystem.h>
+#include <ghoul/glm.h>
 #include <ghoul/logging/logmanager.h>
-#include <ghoul/io/texture/texturereader.h>
-#include <ghoul/opengl/texture.h>
-#include <ghoul/opengl/textureunit.h>
+#include <ghoul/opengl/openglstatecache.h>
 #include <ghoul/opengl/programobject.h>
+#include <ghoul/opengl/textureunit.h>
 #include <optional>
 
 namespace {
@@ -46,29 +45,27 @@ namespace {
         "colorTexture", "mirrorTexture"
     };
 
+    constexpr openspace::properties::Property::PropertyInfo SizeInfo = {
+        "Size",
+        "Size (in meters)",
+        "This value specifies the radius of the sphere in meters",
+        openspace::properties::Property::Visibility::AdvancedUser
+    };
+
+    constexpr openspace::properties::Property::PropertyInfo SegmentsInfo = {
+        "Segments",
+        "Number of Segments",
+        "This value specifies the number of segments that the sphere is separated in",
+        // @VISIBILITY(2.67)
+        openspace::properties::Property::Visibility::AdvancedUser
+    };
+
     enum class Orientation : int {
         Outside = 0,
         Inside,
         Both
     };
 
-    constexpr openspace::properties::Property::PropertyInfo TextureInfo = {
-        "Texture",
-        "Texture",
-        "This value specifies an image that is loaded from disk and is used as a texture "
-        "that is applied to this sphere. This image is expected to be an equirectangular "
-        "projection",
-        // @VISIBILITY(2.33)
-        openspace::properties::Property::Visibility::User
-    };
-
-    constexpr openspace::properties::Property::PropertyInfo MirrorTextureInfo = {
-        "MirrorTexture",
-        "Mirror Texture",
-        "Mirror the texture along the x-axis",
-        openspace::properties::Property::Visibility::User
-    };
-
     constexpr openspace::properties::Property::PropertyInfo OrientationInfo = {
         "Orientation",
         "Orientation",
@@ -77,30 +74,20 @@ namespace {
         openspace::properties::Property::Visibility::AdvancedUser
     };
 
-    constexpr openspace::properties::Property::PropertyInfo SegmentsInfo = {
-        "Segments",
-        "Number of Segments",
-        "This value specifies the number of segments that the sphere is separated in",
-        // @VISIBILITY(2.67)
+    constexpr openspace::properties::Property::PropertyInfo MirrorTextureInfo = {
+        "MirrorTexture",
+        "Mirror Texture",
+        "Mirror the texture along the x-axis",
+        openspace::properties::Property::Visibility::AdvancedUser
+    };
+
+    constexpr openspace::properties::Property::PropertyInfo DisableFadeInOutInfo = {
+        "DisableFadeInOut",
+        "Disable Fade-In/Fade-Out effects",
+        "Enables/Disables the fade in and out effects",
         openspace::properties::Property::Visibility::User
     };
 
-    constexpr openspace::properties::Property::PropertyInfo SizeInfo = {
-        "Size",
-        "Size (in meters)",
-        "This value specifies the radius of the sphere in meters",
-        openspace::properties::Property::Visibility::AdvancedUser
-    };
-
-    constexpr openspace::properties::Property::PropertyInfo FadeOutThresholdInfo = {
-        "FadeOutThreshold",
-        "Fade-Out Threshold",
-        "This value determines percentage of the sphere that is visible before starting "
-        "to fade it out. A negative or zero value means no fading out will happen. This "
-        "is also the default",
-        openspace::properties::Property::Visibility::AdvancedUser
-    };
-
     constexpr openspace::properties::Property::PropertyInfo FadeInThresholdInfo = {
         "FadeInThreshold",
         "Fade-In Threshold",
@@ -111,11 +98,13 @@ namespace {
         openspace::properties::Property::Visibility::AdvancedUser
     };
 
-    constexpr openspace::properties::Property::PropertyInfo DisableFadeInOutInfo = {
-        "DisableFadeInOut",
-        "Disable Fade-In/Fade-Out effects",
-        "Enables/Disables the fade in and out effects",
-        openspace::properties::Property::Visibility::User
+    constexpr openspace::properties::Property::PropertyInfo FadeOutThresholdInfo = {
+        "FadeOutThreshold",
+        "Fade-Out Threshold",
+        "This value determines percentage of the sphere that is visible before starting "
+        "to fade it out. A negative or zero value means no fading out will happen. This "
+        "is also the default",
+        openspace::properties::Property::Visibility::AdvancedUser
     };
 
     struct [[codegen::Dictionary(RenderableSphere)]] Parameters {
@@ -125,9 +114,6 @@ namespace {
         // [[codegen::verbatim(SegmentsInfo.description)]]
         int segments;
 
-        // [[codegen::verbatim(TextureInfo.description)]]
-        std::string texture;
-
         enum class [[codegen::map(Orientation)]] Orientation {
             Outside,
             Inside,
@@ -140,14 +126,14 @@ namespace {
         // [[codegen::verbatim(MirrorTextureInfo.description)]]
         std::optional<bool> mirrorTexture;
 
-        // [[codegen::verbatim(FadeOutThresholdInfo.description)]]
-        std::optional<float> fadeOutThreshold [[codegen::inrange(0.0, 1.0)]];
+        // [[codegen::verbatim(DisableFadeInOutInfo.description)]]
+        std::optional<bool> disableFadeInOut;
 
         // [[codegen::verbatim(FadeInThresholdInfo.description)]]
         std::optional<float> fadeInThreshold;
 
-        // [[codegen::verbatim(DisableFadeInOutInfo.description)]]
-        std::optional<bool> disableFadeInOut;
+        // [[codegen::verbatim(FadeOutThresholdInfo.description)]]
+        std::optional<float> fadeOutThreshold [[codegen::inrange(0.0, 1.0)]];
     };
 #include "renderablesphere_codegen.cpp"
 } // namespace
@@ -160,10 +146,9 @@ documentation::Documentation RenderableSphere::Documentation() {
 
 RenderableSphere::RenderableSphere(const ghoul::Dictionary& dictionary)
     : Renderable(dictionary)
-    , _texturePath(TextureInfo)
-    , _orientation(OrientationInfo, properties::OptionProperty::DisplayType::Dropdown)
     , _size(SizeInfo, 1.f, 0.f, 1e25f)
     , _segments(SegmentsInfo, 8, 4, 1000)
+    , _orientation(OrientationInfo, properties::OptionProperty::DisplayType::Dropdown)
     , _mirrorTexture(MirrorTextureInfo, false)
     , _disableFadeInDistance(DisableFadeInOutInfo, false)
     , _fadeInThreshold(FadeInThresholdInfo, -1.f, -0.1f, 1.f, 0.001f)
@@ -174,23 +159,6 @@ RenderableSphere::RenderableSphere(const ghoul::Dictionary& dictionary)
     addProperty(Fadeable::_opacity);
 
     _size = p.size;
-    _segments = p.segments;
-    _texturePath = p.texture;
-
-    _orientation.addOptions({
-        { static_cast<int>(Orientation::Outside), "Outside" },
-        { static_cast<int>(Orientation::Inside), "Inside" },
-        { static_cast<int>(Orientation::Both), "Both" }
-    });
-
-    if (p.orientation.has_value()) {
-        _orientation = static_cast<int>(codegen::map<Orientation>(*p.orientation));
-    }
-    else {
-        _orientation = static_cast<int>(Orientation::Outside);
-    }
-    addProperty(_orientation);
-
     _size.setExponent(15.f);
     _size.onChange([this]() {
         setBoundingSphere(_size);
@@ -198,29 +166,39 @@ RenderableSphere::RenderableSphere(const ghoul::Dictionary& dictionary)
     });
     addProperty(_size);
 
+    _segments = p.segments;
+    _segments.onChange([this]() {
+        _sphereIsDirty = true;
+    });
     addProperty(_segments);
-    _segments.onChange([this]() { _sphereIsDirty = true; });
 
-    addProperty(_texturePath);
-    _texturePath.onChange([this]() { loadTexture(); });
+    _orientation.addOptions({
+        { static_cast<int>(Orientation::Outside), "Outside" },
+        { static_cast<int>(Orientation::Inside), "Inside" },
+        { static_cast<int>(Orientation::Both), "Both" }
+    });
+    _orientation = p.orientation.has_value() ?
+        static_cast<int>(codegen::map<Orientation>(*p.orientation)):
+        static_cast<int>(Orientation::Outside);
+    addProperty(_orientation);
 
     _mirrorTexture = p.mirrorTexture.value_or(_mirrorTexture);
     addProperty(_mirrorTexture);
 
-    _fadeOutThreshold = p.fadeOutThreshold.value_or(_fadeOutThreshold);
-    addProperty(_fadeOutThreshold);
+    _disableFadeInDistance = p.disableFadeInOut.value_or(_disableFadeInDistance);
+    addProperty(_disableFadeInDistance);
 
     _fadeInThreshold = p.fadeInThreshold.value_or(_fadeInThreshold);
     addProperty(_fadeInThreshold);
 
-    _disableFadeInDistance = p.disableFadeInOut.value_or(_disableFadeInDistance);
-    addProperty(_disableFadeInDistance);
+    _fadeOutThreshold = p.fadeOutThreshold.value_or(_fadeOutThreshold);
+    addProperty(_fadeOutThreshold);
 
     setBoundingSphere(_size);
 }
 
 bool RenderableSphere::isReady() const {
-    return _shader && _texture;
+    return _shader != nullptr;
 }
 
 void RenderableSphere::initializeGL() {
@@ -239,12 +217,10 @@ void RenderableSphere::initializeGL() {
     );
 
     ghoul::opengl::updateUniformLocations(*_shader, _uniformCache, UniformNames);
-
-    loadTexture();
 }
 
 void RenderableSphere::deinitializeGL() {
-    _texture = nullptr;
+    _sphere = nullptr;
 
     BaseModule::ProgramObjectManager.release(
         "Sphere",
@@ -252,6 +228,7 @@ void RenderableSphere::deinitializeGL() {
             global::renderEngine->removeRenderProgram(p);
         }
     );
+
     _shader = nullptr;
 }
 
@@ -366,21 +343,21 @@ void RenderableSphere::render(const RenderData& data, RendererTasks&) {
         glDisable(GL_CULL_FACE);
     }
 
-    if (_renderBin == Renderable::RenderBin::PreDeferredTransparent) {
+    if (renderBin() == Renderable::RenderBin::PreDeferredTransparent) {
         glBlendFunc(GL_SRC_ALPHA, GL_ONE);
         glDepthMask(false);
     }
 
     _sphere->render();
 
-    if (_renderBin == Renderable::RenderBin::PreDeferredTransparent) {
-        glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
-        glDepthMask(true);
-    }
-
     _shader->setIgnoreUniformLocationError(IgnoreError::No);
     _shader->deactivate();
 
+    // Reset
+    global::renderEngine->openglStateCache().resetBlendState();
+    global::renderEngine->openglStateCache().resetDepthState();
+    unbindTexture();
+
     if (orientation == Orientation::Inside) {
         glCullFace(GL_BACK);
     }
@@ -402,28 +379,8 @@ void RenderableSphere::update(const UpdateData&) {
     }
 }
 
-void RenderableSphere::bindTexture() {
-    _texture->bind();
-}
-
-void RenderableSphere::unbindTexture() {}
-
-void RenderableSphere::loadTexture() {
-    if (!_texturePath.value().empty()) {
-        std::unique_ptr<ghoul::opengl::Texture> texture =
-            ghoul::io::TextureReader::ref().loadTexture(_texturePath, 2);
-
-        if (texture) {
-            LDEBUGC(
-                "RenderableSphere",
-                fmt::format("Loaded texture from {}", absPath(_texturePath))
-            );
-            texture->uploadTexture();
-            texture->setFilter(ghoul::opengl::Texture::FilterMode::LinearMipMap);
-            texture->purgeFromRAM();
-            _texture = std::move(texture);
-        }
-    }
+void RenderableSphere::unbindTexture() {
+    glBindTexture(GL_TEXTURE_2D, 0);
 }
 
 } // namespace openspace
diff --git a/modules/base/rendering/renderablesphere.h b/modules/base/rendering/renderablesphere.h
index 1cf492b135..d75dc69369 100644
--- a/modules/base/rendering/renderablesphere.h
+++ b/modules/base/rendering/renderablesphere.h
@@ -27,16 +27,10 @@
 
 #include <openspace/rendering/renderable.h>
 
-#include <openspace/properties/stringproperty.h>
 #include <openspace/properties/optionproperty.h>
-#include <openspace/properties/scalar/intproperty.h>
-#include <openspace/properties/scalar/floatproperty.h>
 #include <ghoul/opengl/uniformcache.h>
 
-namespace ghoul::opengl {
-    class ProgramObject;
-    class Texture;
-} // namespace ghoul::opengl
+namespace ghoul::opengl { class ProgramObject; }
 
 namespace openspace {
 
@@ -61,33 +55,27 @@ public:
     static documentation::Documentation Documentation();
 
 protected:
-    virtual void bindTexture();
+    virtual void bindTexture() = 0;
     virtual void unbindTexture();
 
-private:
-    void loadTexture();
-
-    properties::StringProperty _texturePath;
-    properties::OptionProperty _orientation;
-
     properties::FloatProperty _size;
     properties::IntProperty _segments;
 
+    properties::OptionProperty _orientation;
     properties::BoolProperty _mirrorTexture;
-    properties::BoolProperty _disableFadeInDistance;
 
+    properties::BoolProperty _disableFadeInDistance;
     properties::FloatProperty _fadeInThreshold;
     properties::FloatProperty _fadeOutThreshold;
 
+private:
     ghoul::opengl::ProgramObject* _shader = nullptr;
-    std::unique_ptr<ghoul::opengl::Texture> _texture;
 
     std::unique_ptr<Sphere> _sphere;
+    bool _sphereIsDirty = false;
 
     UniformCache(opacity, modelViewProjection, modelViewTransform, modelViewRotation,
         colorTexture, mirrorTexture) _uniformCache;
-
-    bool _sphereIsDirty = false;
 };
 
 } // namespace openspace
diff --git a/modules/base/rendering/renderablesphereimagelocal.cpp b/modules/base/rendering/renderablesphereimagelocal.cpp
new file mode 100644
index 0000000000..13b8f64ed9
--- /dev/null
+++ b/modules/base/rendering/renderablesphereimagelocal.cpp
@@ -0,0 +1,134 @@
+/*****************************************************************************************
+ *                                                                                       *
+ * OpenSpace                                                                             *
+ *                                                                                       *
+ * Copyright (c) 2014-2023                                                               *
+ *                                                                                       *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
+ * software and associated documentation files (the "Software"), to deal in the Software *
+ * without restriction, including without limitation the rights to use, copy, modify,    *
+ * merge, publish, distribute, sublicense, and/or sell copies of the Software, and to    *
+ * permit persons to whom the Software is furnished to do so, subject to the following   *
+ * conditions:                                                                           *
+ *                                                                                       *
+ * The above copyright notice and this permission notice shall be included in all copies *
+ * or substantial portions of the Software.                                              *
+ *                                                                                       *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED,   *
+ * INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A         *
+ * PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT    *
+ * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF  *
+ * CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE  *
+ * OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                                         *
+ ****************************************************************************************/
+
+#include <modules/base/rendering/renderablesphereimagelocal.h>
+
+#include <openspace/documentation/documentation.h>
+#include <openspace/documentation/verifier.h>
+#include <openspace/util/sphere.h>
+#include <ghoul/filesystem/filesystem.h>
+#include <ghoul/io/texture/texturereader.h>
+#include <ghoul/opengl/texture.h>
+#include <optional>
+
+namespace {
+    constexpr openspace::properties::Property::PropertyInfo TextureInfo = {
+        "Texture",
+        "Texture",
+        "This value specifies an image that is loaded from disk and is used as a texture "
+        "that is applied to this sphere. This image is expected to be an equirectangular "
+        "projection",
+        // @VISIBILITY(2.33)
+        openspace::properties::Property::Visibility::User
+    };
+
+    struct [[codegen::Dictionary(RenderableSphere)]] Parameters {
+        // [[codegen::verbatim(TextureInfo.description)]]
+        std::string texture;
+
+        // If this value is set to 'true', the image for this sphere will not be loaded at
+        // startup but rather when the image is shown for the first time. Additionally, if
+        // the sphere is disabled, the image will automatically be unloaded
+        std::optional<bool> lazyLoading;
+    };
+#include "renderablesphereimagelocal_codegen.cpp"
+} // namespace
+
+namespace openspace {
+
+documentation::Documentation RenderableSphereImageLocal::Documentation() {
+    return codegen::doc<Parameters>("base_renderable_sphere_image_local");
+}
+
+RenderableSphereImageLocal::RenderableSphereImageLocal(const ghoul::Dictionary& dictionary)
+    : RenderableSphere(dictionary)
+    , _texturePath(TextureInfo)
+{
+    const Parameters p = codegen::bake<Parameters>(dictionary);
+
+    _texturePath = p.texture;
+    _texturePath.onChange([this]() {
+        loadTexture();
+    });
+    addProperty(_texturePath);
+}
+
+bool RenderableSphereImageLocal::isReady() const {
+    return RenderableSphere::isReady() && _texture;
+}
+
+void RenderableSphereImageLocal::initializeGL() {
+    RenderableSphere::initializeGL();
+
+    if (!_isLoadingLazily) {
+        loadTexture();
+    }
+}
+
+void RenderableSphereImageLocal::deinitializeGL() {
+    _texture = nullptr;
+
+    RenderableSphere::deinitializeGL();
+}
+
+void RenderableSphereImageLocal::update(const UpdateData& data) {
+    RenderableSphere::update(data);
+
+    if (_textureIsDirty) {
+        loadTexture();
+        _textureIsDirty = false;
+    }
+}
+
+void RenderableSphereImageLocal::bindTexture() {
+    _texture->bind();
+}
+
+void RenderableSphereImageLocal::loadTexture() {
+    if (_texturePath.value().empty()) {
+        return;
+    }
+
+    std::unique_ptr<ghoul::opengl::Texture> texture =
+        ghoul::io::TextureReader::ref().loadTexture(_texturePath, 2);
+
+    if (!texture) {
+        LWARNINGC(
+            "RenderableSphereImageLocal",
+            fmt::format("Could not load texture from {}", absPath(_texturePath))
+        );
+        return;
+    }
+
+    LDEBUGC(
+        "RenderableSphereImageLocal",
+        fmt::format("Loaded texture from {}", absPath(_texturePath))
+    );
+    texture->uploadTexture();
+    texture->setFilter(ghoul::opengl::Texture::FilterMode::LinearMipMap);
+    texture->purgeFromRAM();
+    _texture = std::move(texture);
+}
+
+} // namespace openspace
diff --git a/modules/base/rendering/renderablesphereimagelocal.h b/modules/base/rendering/renderablesphereimagelocal.h
new file mode 100644
index 0000000000..2b7fe624c0
--- /dev/null
+++ b/modules/base/rendering/renderablesphereimagelocal.h
@@ -0,0 +1,67 @@
+/*****************************************************************************************
+ *                                                                                       *
+ * OpenSpace                                                                             *
+ *                                                                                       *
+ * Copyright (c) 2014-2023                                                               *
+ *                                                                                       *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
+ * software and associated documentation files (the "Software"), to deal in the Software *
+ * without restriction, including without limitation the rights to use, copy, modify,    *
+ * merge, publish, distribute, sublicense, and/or sell copies of the Software, and to    *
+ * permit persons to whom the Software is furnished to do so, subject to the following   *
+ * conditions:                                                                           *
+ *                                                                                       *
+ * The above copyright notice and this permission notice shall be included in all copies *
+ * or substantial portions of the Software.                                              *
+ *                                                                                       *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED,   *
+ * INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A         *
+ * PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT    *
+ * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF  *
+ * CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE  *
+ * OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                                         *
+ ****************************************************************************************/
+
+#ifndef __OPENSPACE_MODULE_BASE___RENDERABLESPHEREIMAGELOCAL___H__
+#define __OPENSPACE_MODULE_BASE___RENDERABLESPHEREIMAGELOCAL___H__
+
+#include <modules/base/rendering/renderablesphere.h>
+
+namespace ghoul::opengl { class Texture; }
+
+namespace openspace {
+
+struct RenderData;
+struct UpdateData;
+
+namespace documentation { struct Documentation; }
+
+class RenderableSphereImageLocal : public RenderableSphere {
+public:
+    RenderableSphereImageLocal(const ghoul::Dictionary& dictionary);
+
+    void initializeGL() override;
+    void deinitializeGL() override;
+
+    bool isReady() const override;
+
+    void update(const UpdateData& data) override;
+
+    static documentation::Documentation Documentation();
+
+protected:
+    void bindTexture() override;
+
+private:
+    void loadTexture();
+
+    properties::StringProperty _texturePath;
+
+    std::unique_ptr<ghoul::opengl::Texture> _texture;
+    bool _isLoadingLazily = false;
+    bool _textureIsDirty = false;
+};
+
+} // namespace openspace
+
+#endif // __OPENSPACE_MODULE_BASE___RENDERABLESPHEREIMAGELOCAL___H__
diff --git a/modules/base/rendering/renderablesphereimageonline.cpp b/modules/base/rendering/renderablesphereimageonline.cpp
new file mode 100644
index 0000000000..1cc0e04d86
--- /dev/null
+++ b/modules/base/rendering/renderablesphereimageonline.cpp
@@ -0,0 +1,163 @@
+/*****************************************************************************************
+ *                                                                                       *
+ * OpenSpace                                                                             *
+ *                                                                                       *
+ * Copyright (c) 2014-2023                                                               *
+ *                                                                                       *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
+ * software and associated documentation files (the "Software"), to deal in the Software *
+ * without restriction, including without limitation the rights to use, copy, modify,    *
+ * merge, publish, distribute, sublicense, and/or sell copies of the Software, and to    *
+ * permit persons to whom the Software is furnished to do so, subject to the following   *
+ * conditions:                                                                           *
+ *                                                                                       *
+ * The above copyright notice and this permission notice shall be included in all copies *
+ * or substantial portions of the Software.                                              *
+ *                                                                                       *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED,   *
+ * INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A         *
+ * PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT    *
+ * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF  *
+ * CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE  *
+ * OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                                         *
+ ****************************************************************************************/
+
+#include <modules/base/rendering/renderablesphereimageonline.h>
+
+#include <openspace/documentation/documentation.h>
+#include <openspace/documentation/verifier.h>
+#include <openspace/engine/globals.h>
+#include <openspace/util/sphere.h>
+#include <ghoul/filesystem/filesystem.h>
+#include <ghoul/io/texture/texturereader.h>
+#include <ghoul/opengl/texture.h>
+
+namespace {
+    constexpr openspace::properties::Property::PropertyInfo TextureInfo = {
+        "URL",
+        "Image URL",
+        "Sets the URL of the texture that is displayed on this sphere. If "
+        "this value is changed, the image at the new path will automatically be loaded "
+        "and displayed. This image is expected to be an equirectangular projection",
+        // @VISIBILITY(2.25)
+        openspace::properties::Property::Visibility::User
+    };
+
+    struct [[codegen::Dictionary(RenderableSphere)]] Parameters {
+        // [[codegen::verbatim(TextureInfo.description)]]
+        std::string url [[codegen::key("URL")]];
+    };
+#include "renderablesphereimageonline_codegen.cpp"
+} // namespace
+
+namespace openspace {
+
+documentation::Documentation RenderableSphereImageOnline::Documentation() {
+    return codegen::doc<Parameters>("base_renderable_sphere_image_online");
+}
+
+RenderableSphereImageOnline::RenderableSphereImageOnline(const ghoul::Dictionary& dictionary)
+    : RenderableSphere(dictionary)
+    , _textureUrl(TextureInfo)
+{
+    const Parameters p = codegen::bake<Parameters>(dictionary);
+
+    _textureUrl = p.url;
+    _textureUrl.onChange([this]() {
+        _textureIsDirty = true;
+    });
+    addProperty(_textureUrl);
+}
+
+void RenderableSphereImageOnline::deinitializeGL() {
+    _texture = nullptr;
+
+    RenderableSphere::deinitializeGL();
+}
+
+void RenderableSphereImageOnline::update(const UpdateData& data) {
+    RenderableSphere::update(data);
+
+    if (!_textureIsDirty) {
+        return;
+    }
+
+    if (!_imageFuture.valid()) {
+        std::future<DownloadManager::MemoryFile> future = downloadImageToMemory(
+            _textureUrl
+        );
+        if (future.valid()) {
+            _imageFuture = std::move(future);
+        }
+    }
+
+    if (_imageFuture.valid() && DownloadManager::futureReady(_imageFuture)) {
+        DownloadManager::MemoryFile imageFile = _imageFuture.get();
+
+        if (imageFile.corrupted) {
+            LERRORC(
+                "RenderableSphereImageOnline",
+                fmt::format("Error loading image from URL '{}'", _textureUrl)
+            );
+            return;
+        }
+
+        try {
+            std::unique_ptr<ghoul::opengl::Texture> texture =
+                ghoul::io::TextureReader::ref().loadTexture(
+                    reinterpret_cast<void*>(imageFile.buffer),
+                    imageFile.size,
+                    2,
+                    imageFile.format
+                );
+
+            if (texture) {
+                // Images don't need to start on 4-byte boundaries, for example if the
+                // image is only RGB
+                glPixelStorei(GL_UNPACK_ALIGNMENT, 1);
+
+                texture->uploadTexture();
+                texture->setFilter(ghoul::opengl::Texture::FilterMode::LinearMipMap);
+                texture->purgeFromRAM();
+
+                _texture = std::move(texture);
+                _textureIsDirty = false;
+            }
+        }
+        catch (const ghoul::io::TextureReader::InvalidLoadException& e) {
+            _textureIsDirty = false;
+            LERRORC(e.component, e.message);
+        }
+    }
+}
+
+void RenderableSphereImageOnline::bindTexture() {
+    if (_texture) {
+        _texture->bind();
+    }
+    else {
+        unbindTexture();
+    }
+}
+
+std::future<DownloadManager::MemoryFile>
+RenderableSphereImageOnline::downloadImageToMemory(const std::string& url)
+{
+    return global::downloadManager->fetchFile(
+        url,
+        [url](const DownloadManager::MemoryFile&) {
+            LDEBUGC(
+                "RenderableSphereImageOnline",
+                fmt::format("Download to memory finished for image '{}'", url)
+            );
+        },
+        [url](const std::string& err) {
+            LDEBUGC(
+                "RenderableSphereImageOnline",
+                fmt::format("Download to memory failed for image '{}': {}", url, err)
+            );
+        }
+    );
+}
+
+} // namespace openspace
diff --git a/modules/base/rendering/renderablesphereimageonline.h b/modules/base/rendering/renderablesphereimageonline.h
new file mode 100644
index 0000000000..0aec90ba0c
--- /dev/null
+++ b/modules/base/rendering/renderablesphereimageonline.h
@@ -0,0 +1,67 @@
+/*****************************************************************************************
+ *                                                                                       *
+ * OpenSpace                                                                             *
+ *                                                                                       *
+ * Copyright (c) 2014-2023                                                               *
+ *                                                                                       *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
+ * software and associated documentation files (the "Software"), to deal in the Software *
+ * without restriction, including without limitation the rights to use, copy, modify,    *
+ * merge, publish, distribute, sublicense, and/or sell copies of the Software, and to    *
+ * permit persons to whom the Software is furnished to do so, subject to the following   *
+ * conditions:                                                                           *
+ *                                                                                       *
+ * The above copyright notice and this permission notice shall be included in all copies *
+ * or substantial portions of the Software.                                              *
+ *                                                                                       *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED,   *
+ * INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A         *
+ * PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT    *
+ * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF  *
+ * CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE  *
+ * OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                                         *
+ ****************************************************************************************/
+
+#ifndef __OPENSPACE_MODULE_BASE___RENDERABLESPHEREIMAGEONLINE___H__
+#define __OPENSPACE_MODULE_BASE___RENDERABLESPHEREIMAGEONLINE___H__
+
+#include <modules/base/rendering/renderablesphere.h>
+
+#include <openspace/engine/downloadmanager.h>
+
+namespace ghoul::opengl { class Texture; }
+
+namespace openspace {
+
+struct RenderData;
+struct UpdateData;
+
+namespace documentation { struct Documentation; }
+
+class RenderableSphereImageOnline : public RenderableSphere {
+public:
+    RenderableSphereImageOnline(const ghoul::Dictionary& dictionary);
+
+    void deinitializeGL() override;
+
+    void update(const UpdateData& data) override;
+
+    static documentation::Documentation Documentation();
+
+protected:
+    void bindTexture() override;
+
+private:
+    std::future<DownloadManager::MemoryFile> downloadImageToMemory(
+        const std::string& url);
+
+    properties::StringProperty _textureUrl;
+
+    std::future<DownloadManager::MemoryFile> _imageFuture;
+    std::unique_ptr<ghoul::opengl::Texture> _texture;
+    bool _textureIsDirty = false;
+};
+
+} // namespace openspace
+
+#endif // __OPENSPACE_MODULE_BASE___RENDERABLESPHEREIMAGEONLINE___H__
diff --git a/modules/base/rendering/renderabletimevaryingsphere.cpp b/modules/base/rendering/renderabletimevaryingsphere.cpp
index 634db73cc8..8f616136b4 100644
--- a/modules/base/rendering/renderabletimevaryingsphere.cpp
+++ b/modules/base/rendering/renderabletimevaryingsphere.cpp
@@ -24,35 +24,31 @@
 
 #include <modules/base/rendering/renderabletimevaryingsphere.h>
 
-#include <modules/base/basemodule.h>
 #include <openspace/documentation/documentation.h>
 #include <openspace/documentation/verifier.h>
-#include <openspace/engine/globals.h>
-#include <openspace/rendering/renderengine.h>
 #include <openspace/util/sphere.h>
 #include <openspace/util/updatestructures.h>
 #include <ghoul/filesystem/filesystem.h>
-#include <ghoul/glm.h>
 #include <ghoul/io/texture/texturereader.h>
-#include <ghoul/logging/logmanager.h>
 #include <ghoul/misc/crc32.h>
 #include <ghoul/opengl/texture.h>
-#include <ghoul/opengl/textureunit.h>
-#include <ghoul/opengl/programobject.h>
-#include <filesystem>
-#include <optional>
 
 namespace {
-    constexpr std::array<const char*, 5> UniformNames = {
-        "opacity", "modelViewProjection", "modelViewRotation", "colorTexture",
-        "mirrorTexture"
-    };
+    // Extract J2000 time from file names
+    // Requires files to be named as such: 'YYYY-MM-DDTHH-MM-SS-XXX.png'
+    double extractTriggerTimeFromFileName(const std::string& filePath) {
+        // Extract the filename from the path (without extension)
+        std::string timeString = std::filesystem::path(filePath).stem().string();
 
-    enum class Orientation {
-        Outside = 0,
-        Inside,
-        Both
-    };
+        // Ensure the separators are correct
+        timeString.replace(4, 1, "-");
+        timeString.replace(7, 1, "-");
+        timeString.replace(13, 1, ":");
+        timeString.replace(16, 1, ":");
+        timeString.replace(19, 1, ".");
+
+        return openspace::Time::convertTime(timeString);
+    }
 
     constexpr openspace::properties::Property::PropertyInfo TextureSourceInfo = {
         "TextureSource",
@@ -63,185 +59,36 @@ namespace {
         openspace::properties::Property::Visibility::AdvancedUser
     };
 
-    constexpr openspace::properties::Property::PropertyInfo MirrorTextureInfo = {
-        "MirrorTexture",
-        "Mirror Texture",
-        "Mirror the texture along the x-axis",
-        openspace::properties::Property::Visibility::User
-    };
-
-    constexpr openspace::properties::Property::PropertyInfo OrientationInfo = {
-        "Orientation",
-        "Orientation",
-        "Specifies whether the texture is applied to the inside of the sphere, the "
-        "outside of the sphere, or both",
-        openspace::properties::Property::Visibility::AdvancedUser
-    };
-
-    constexpr openspace::properties::Property::PropertyInfo SegmentsInfo = {
-        "Segments",
-        "Number of Segments",
-        "This value specifies the number of segments that the sphere is separated in",
-        // @VISIBILITY(2.67)
-        openspace::properties::Property::Visibility::User
-    };
-
-    constexpr openspace::properties::Property::PropertyInfo SizeInfo = {
-        "Size",
-        "Size (in meters)",
-        "This value specifies the radius of the sphere in meters",
-        openspace::properties::Property::Visibility::AdvancedUser
-    };
-
-    constexpr openspace::properties::Property::PropertyInfo FadeOutThresholdInfo = {
-        "FadeOutThreshold",
-        "Fade-Out Threshold",
-        "This value determines percentage of the sphere is visible before starting "
-        "fading-out it",
-        openspace::properties::Property::Visibility::AdvancedUser
-    };
-
-    constexpr openspace::properties::Property::PropertyInfo FadeInThresholdInfo = {
-        "FadeInThreshold",
-        "Fade-In Threshold",
-        "Distance from center of MilkyWay from where the astronomical object starts to "
-        "fade in",
-        openspace::properties::Property::Visibility::AdvancedUser
-    };
-
-    constexpr openspace::properties::Property::PropertyInfo DisableFadeInOutInfo = {
-        "DisableFadeInOut",
-        "Disable Fade-In/Fade-Out effects",
-        "Enables/Disables the Fade-In/Out effects",
-        // @VISIBILITY(2.33)
-        openspace::properties::Property::Visibility::User
-    };
-
     struct [[codegen::Dictionary(RenderableTimeVaryingSphere)]] Parameters {
-        // [[codegen::verbatim(SizeInfo.description)]]
-        float size;
-
-        // [[codegen::verbatim(SegmentsInfo.description)]]
-        int segments;
-
         // [[codegen::verbatim(TextureSourceInfo.description)]]
         std::string textureSource;
-
-        enum class [[codegen::map(Orientation)]] Orientation {
-            Outside,
-            Inside,
-            Both
-        };
-
-        // [[codegen::verbatim(OrientationInfo.description)]]
-        std::optional<Orientation> orientation;
-
-        // [[codegen::verbatim(MirrorTextureInfo.description)]]
-        std::optional<bool> mirrorTexture;
-
-        // [[codegen::verbatim(FadeOutThresholdInfo.description)]]
-        std::optional<float> fadeOutThreshold [[codegen::inrange(0.0, 1.0)]];
-
-        // [[codegen::verbatim(FadeInThresholdInfo.description)]]
-        std::optional<float> fadeInThreshold;
-
-        // [[codegen::verbatim(DisableFadeInOutInfo.description)]]
-        std::optional<bool> disableFadeInOut;
     };
 #include "renderabletimevaryingsphere_codegen.cpp"
 } // namespace
 
 namespace openspace {
 
-double extractTriggerTimeFromFileName(const std::string& filePath);
-
 documentation::Documentation RenderableTimeVaryingSphere::Documentation() {
     return codegen::doc<Parameters>("base_renderable_time_varying_sphere");
 }
 
 RenderableTimeVaryingSphere::RenderableTimeVaryingSphere(
                                                       const ghoul::Dictionary& dictionary)
-    : Renderable(dictionary)
+    : RenderableSphere(dictionary)
     , _textureSourcePath(TextureSourceInfo)
-    , _orientation(OrientationInfo, properties::OptionProperty::DisplayType::Dropdown)
-    , _size(SizeInfo, 1.f, 0.f, 1e35f)
-    , _segments(SegmentsInfo, 8, 4, 1000)
-    , _mirrorTexture(MirrorTextureInfo, false)
-    , _disableFadeInDistance(DisableFadeInOutInfo, true)
-    , _fadeInThreshold(FadeInThresholdInfo, -1.f, -1.f, 1.f)
-    , _fadeOutThreshold(FadeOutThresholdInfo, -1.f, -1.f, 1.f)
 {
     const Parameters p = codegen::bake<Parameters>(dictionary);
 
-    addProperty(Fadeable::_opacity);
-
-    _size = p.size;
-    _segments = p.segments;
     _textureSourcePath = p.textureSource;
-
-    _orientation.addOptions({
-        { static_cast<int>(Orientation::Outside), "Outside" },
-        { static_cast<int>(Orientation::Inside), "Inside" },
-        { static_cast<int>(Orientation::Both), "Both" }
-    });
-
-    if (p.orientation.has_value()) {
-        _orientation = static_cast<int>(codegen::map<Orientation>(*p.orientation));
-    }
-    else {
-        _orientation = static_cast<int>(Orientation::Outside);
-    }
-    addProperty(_orientation);
-
-    _size.setExponent(20.f);
-    _size.onChange([this]() {
-        setBoundingSphere(_size);
-        _sphereIsDirty = true;
-    });
-    addProperty(_size);
-
-    addProperty(_segments);
-    _segments.onChange([this]() { _sphereIsDirty = true; });
-
-    addProperty(_mirrorTexture);
-    addProperty(_fadeOutThreshold);
-    addProperty(_fadeInThreshold);
-
-    _mirrorTexture = p.mirrorTexture.value_or(_mirrorTexture);
-    _fadeOutThreshold = p.fadeOutThreshold.value_or(_fadeOutThreshold);
-    _fadeInThreshold = p.fadeInThreshold.value_or(_fadeInThreshold);
-
-    if (_fadeOutThreshold || _fadeInThreshold) {
-        _disableFadeInDistance = false;
-        addProperty(_disableFadeInDistance);
-    }
-
-    setBoundingSphere(_size);
 }
 
 bool RenderableTimeVaryingSphere::isReady() const {
-    return _shader && _texture;
+    return RenderableSphere::isReady() && _texture;
 }
 
 void RenderableTimeVaryingSphere::initializeGL() {
-    _sphere = std::make_unique<Sphere>(_size, _segments);
-    _sphere->initialize();
+    RenderableSphere::initializeGL();
 
-    _shader = BaseModule::ProgramObjectManager.request(
-        "Timevarying Sphere",
-        []() -> std::unique_ptr<ghoul::opengl::ProgramObject> {
-            return global::renderEngine->buildRenderProgram(
-                "Timevarying Sphere",
-                absPath("${MODULE_BASE}/shaders/sphere_vs.glsl"),
-                absPath("${MODULE_BASE}/shaders/sphere_fs.glsl")
-            );
-        }
-    );
-    _shader->setIgnoreUniformLocationError(
-        ghoul::opengl::ProgramObject::IgnoreError::Yes
-    );
-
-    ghoul::opengl::updateUniformLocations(*_shader, _uniformCache, UniformNames);
     extractMandatoryInfoFromSourceFolder();
     computeSequenceEndTime();
     loadTexture();
@@ -249,134 +96,9 @@ void RenderableTimeVaryingSphere::initializeGL() {
 
 void RenderableTimeVaryingSphere::deinitializeGL() {
     _texture = nullptr;
-
-    BaseModule::ProgramObjectManager.release(
-        "Timevarying Sphere",
-        [](ghoul::opengl::ProgramObject* p) {
-            global::renderEngine->removeRenderProgram(p);
-        }
-    );
     _files.clear();
-    _shader = nullptr;
-}
 
-void RenderableTimeVaryingSphere::render(const RenderData& data, RendererTasks&) {
-    Orientation orientation = static_cast<Orientation>(_orientation.value());
-
-    glm::dmat4 modelTransform =
-        glm::translate(glm::dmat4(1.0), data.modelTransform.translation) *
-        glm::dmat4(data.modelTransform.rotation) *
-        glm::scale(glm::dmat4(1.0), glm::dvec3(data.modelTransform.scale));
-
-    glm::dmat3 modelRotation = data.modelTransform.rotation;
-
-    _shader->activate();
-
-    glm::mat4 modelViewProjection = data.camera.projectionMatrix() *
-                             glm::mat4(data.camera.combinedViewMatrix() * modelTransform);
-    _shader->setUniform(_uniformCache.modelViewProjection, modelViewProjection);
-
-    glm::mat3 modelViewRotation = glm::mat3(
-        glm::dmat3(data.camera.viewRotationMatrix()) * modelRotation
-    );
-    _shader->setUniform(_uniformCache.modelViewRotation, modelViewRotation);
-
-    float adjustedOpacity = opacity();
-
-    if (!_disableFadeInDistance) {
-        if (_fadeInThreshold > -1.0) {
-            const float logDistCamera = glm::log(static_cast<float>(
-                glm::distance(data.camera.positionVec3(), data.modelTransform.translation)
-            ));
-            const float startLogFadeDistance = glm::log(_size * _fadeInThreshold);
-            const float stopLogFadeDistance = startLogFadeDistance + 1.f;
-
-            if (logDistCamera > startLogFadeDistance &&
-                logDistCamera < stopLogFadeDistance)
-            {
-                const float fadeFactor = glm::clamp(
-                    (logDistCamera - startLogFadeDistance) /
-                        (stopLogFadeDistance - startLogFadeDistance),
-                    0.f,
-                    1.f
-                );
-                adjustedOpacity *= fadeFactor;
-            }
-            else if (logDistCamera <= startLogFadeDistance) {
-                adjustedOpacity = 0.f;
-            }
-        }
-
-        if (_fadeOutThreshold > -1.0) {
-            const float logDistCamera = glm::log(static_cast<float>(
-                glm::distance(data.camera.positionVec3(), data.modelTransform.translation)
-            ));
-            const float startLogFadeDistance = glm::log(_size * _fadeOutThreshold);
-            const float stopLogFadeDistance = startLogFadeDistance + 1.f;
-
-            if (logDistCamera > startLogFadeDistance &&
-                logDistCamera < stopLogFadeDistance)
-            {
-                const float fadeFactor = glm::clamp(
-                    (logDistCamera - startLogFadeDistance) /
-                        (stopLogFadeDistance - startLogFadeDistance),
-                    0.f,
-                    1.f
-                );
-                adjustedOpacity *= (1.f - fadeFactor);
-            }
-            else if (logDistCamera >= stopLogFadeDistance) {
-                adjustedOpacity = 0.f;
-            }
-        }
-    }
-    // Performance wise
-    if (adjustedOpacity < 0.01f) {
-        return;
-    }
-
-    _shader->setUniform(_uniformCache.opacity, adjustedOpacity);
-    _shader->setUniform(_uniformCache._mirrorTexture, _mirrorTexture);
-
-    ghoul::opengl::TextureUnit unit;
-    unit.activate();
-    _texture->bind();
-    _shader->setUniform(_uniformCache.colorTexture, unit);
-
-    // Setting these states should not be necessary,
-    // since they are the default state in OpenSpace.
-    glEnable(GL_CULL_FACE);
-    glCullFace(GL_BACK);
-
-    if (orientation == Orientation::Inside) {
-        glCullFace(GL_FRONT);
-    }
-    else if (orientation == Orientation::Both) {
-        glDisable(GL_CULL_FACE);
-    }
-
-    if (_renderBin == Renderable::RenderBin::PreDeferredTransparent) {
-        glBlendFunc(GL_SRC_ALPHA, GL_ONE);
-        glDepthMask(false);
-    }
-
-    _sphere->render();
-
-    if (_renderBin == Renderable::RenderBin::PreDeferredTransparent) {
-        glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
-        glDepthMask(true);
-    }
-
-    _shader->setIgnoreUniformLocationError(ghoul::opengl::ProgramObject::IgnoreError::No);
-    _shader->deactivate();
-
-    if (orientation == Orientation::Inside) {
-        glCullFace(GL_BACK);
-    }
-    else if (orientation == Orientation::Both) {
-        glEnable(GL_CULL_FACE);
-    }
-    glDisable(GL_CULL_FACE);
+    RenderableSphere::deinitializeGL();
 }
 
 void RenderableTimeVaryingSphere::extractMandatoryInfoFromSourceFolder() {
@@ -386,7 +108,7 @@ void RenderableTimeVaryingSphere::extractMandatoryInfoFromSourceFolder() {
     fs::path sourceFolder = absPath(_textureSourcePath);
     if (!std::filesystem::is_directory(sourceFolder)) {
         throw ghoul::RuntimeError(
-            "Source folder for timevaryingsphere is not a valid directory"
+            "Source folder for RenderableTimeVaryingSphere is not a valid directory"
         );
     }
     // Extract all file paths from the provided folder
@@ -410,7 +132,8 @@ void RenderableTimeVaryingSphere::extractMandatoryInfoFromSourceFolder() {
     }
 
     std::sort(
-        _files.begin(), _files.end(),
+        _files.begin(),
+        _files.end(),
         [](const FileData& a, const FileData& b) {
             return a.time < b.time;
         }
@@ -418,19 +141,14 @@ void RenderableTimeVaryingSphere::extractMandatoryInfoFromSourceFolder() {
     // Ensure that there are available and valid source files left
     if (_files.empty()) {
         throw ghoul::RuntimeError(
-            "Source folder for timevaryingsphere contains no files"
+            "Source folder for RenderableTimeVaryingSphere contains no files"
         );
     }
 }
 
 void RenderableTimeVaryingSphere::update(const UpdateData& data) {
-    if (!_enabled) {
-        return;
-    }
-    if (_shader->isDirty()) {
-        _shader->rebuildFromFile();
-        ghoul::opengl::updateUniformLocations(*_shader, _uniformCache, UniformNames);
-    }
+    RenderableSphere::update(data);
+
     const double currentTime = data.time.j2000Seconds();
     const bool isInInterval = (currentTime >= _files[0].time) &&
         (currentTime < _sequenceEndTime);
@@ -443,40 +161,33 @@ void RenderableTimeVaryingSphere::update(const UpdateData& data) {
             (nextIdx < _files.size() && currentTime >= _files[nextIdx].time))
         {
             updateActiveTriggerTimeIndex(currentTime);
-            _sphereIsDirty = true;
+            _textureIsDirty = true;
         } // else {we're still in same state as previous frame (no changes needed)}
     }
     else {
         // not in interval => set everything to false
         _activeTriggerTimeIndex = 0;
     }
-    if (_sphereIsDirty) {
-        _sphere = std::make_unique<Sphere>(_size, _segments);
-        _sphere->initialize();
+    if (_textureIsDirty) {
         loadTexture();
-        _sphereIsDirty = false;
+        _textureIsDirty = false;
     }
 }
 
-// Extract J2000 time from file names
-// Requires files to be named as such: 'YYYY-MM-DDTHH-MM-SS-XXX.png'
-double extractTriggerTimeFromFileName(const std::string& filePath) {
-    // Extract the filename from the path (without extension)
-    std::string timeString = std::filesystem::path(filePath).stem().string();
-
-    // Ensure the separators are correct
-    timeString.replace(4, 1, "-");
-    timeString.replace(7, 1, "-");
-    timeString.replace(13, 1, ":");
-    timeString.replace(16, 1, ":");
-    timeString.replace(19, 1, ".");
-
-    return Time::convertTime(timeString);
+void RenderableTimeVaryingSphere::bindTexture() {
+    if (_texture) {
+        _texture->bind();
+    }
+    else {
+        unbindTexture();
+    }
 }
 
 void RenderableTimeVaryingSphere::updateActiveTriggerTimeIndex(double currentTime) {
     auto iter = std::upper_bound(
-        _files.begin(), _files.end(), currentTime,
+        _files.begin(),
+        _files.end(),
+        currentTime,
         [](double value, const FileData& f) {
             return value < f.time;
         }
@@ -499,8 +210,8 @@ void RenderableTimeVaryingSphere::computeSequenceEndTime() {
     if (_files.size() > 1) {
         const double lastTriggerTime = _files[_files.size() - 1].time;
         const double sequenceDuration = lastTriggerTime - _files[0].time;
-        const double averageStateDuration = sequenceDuration /
-            (static_cast<double>(_files.size()) - 1.0);
+        const double averageStateDuration =
+            sequenceDuration / (static_cast<double>(_files.size()) - 1.0);
         _sequenceEndTime = lastTriggerTime + averageStateDuration;
     }
 }
@@ -510,4 +221,5 @@ void RenderableTimeVaryingSphere::loadTexture() {
         _texture = _files[_activeTriggerTimeIndex].texture.get();
     }
 }
+
 } // namespace openspace
diff --git a/modules/base/rendering/renderabletimevaryingsphere.h b/modules/base/rendering/renderabletimevaryingsphere.h
index 36d411b5e9..d7f9aeeb13 100644
--- a/modules/base/rendering/renderabletimevaryingsphere.h
+++ b/modules/base/rendering/renderabletimevaryingsphere.h
@@ -25,28 +25,18 @@
 #ifndef __OPENSPACE_MODULE_BASE___RENDERABLETIMEVARYINGSPHERE___H__
 #define __OPENSPACE_MODULE_BASE___RENDERABLETIMEVARYINGSPHERE___H__
 
-#include <openspace/rendering/renderable.h>
+#include <modules/base/rendering/renderablesphere.h>
 
-#include <openspace/properties/stringproperty.h>
-#include <openspace/properties/optionproperty.h>
-#include <openspace/properties/scalar/intproperty.h>
-#include <openspace/properties/scalar/floatproperty.h>
-#include <ghoul/opengl/uniformcache.h>
-
-namespace ghoul::opengl {
-    class ProgramObject;
-    class Texture;
-} // namespace ghoul::opengl
+namespace ghoul::opengl { class Texture; }
 
 namespace openspace {
 
-class Sphere;
 struct RenderData;
 struct UpdateData;
 
 namespace documentation { struct Documentation; }
 
-class RenderableTimeVaryingSphere : public Renderable {
+class RenderableTimeVaryingSphere : public RenderableSphere {
 public:
     RenderableTimeVaryingSphere(const ghoul::Dictionary& dictionary);
 
@@ -55,11 +45,13 @@ public:
 
     bool isReady() const override;
 
-    void render(const RenderData& data, RendererTasks& rendererTask) override;
     void update(const UpdateData& data) override;
 
     static documentation::Documentation Documentation();
 
+protected:
+    void bindTexture() override;
+
 private:
     struct FileData {
         std::string path;
@@ -77,25 +69,8 @@ private:
     int _activeTriggerTimeIndex = 0;
 
     properties::StringProperty _textureSourcePath;
-    properties::OptionProperty _orientation;
-
-    properties::FloatProperty _size;
-    properties::IntProperty _segments;
-
-    properties::BoolProperty _mirrorTexture;
-    properties::BoolProperty _disableFadeInDistance;
-
-    properties::FloatProperty _fadeInThreshold;
-    properties::FloatProperty _fadeOutThreshold;
-
-    ghoul::opengl::ProgramObject* _shader = nullptr;
     ghoul::opengl::Texture* _texture = nullptr;
-    std::unique_ptr<Sphere> _sphere;
-
-    UniformCache(opacity, modelViewProjection, modelViewRotation, colorTexture,
-        _mirrorTexture) _uniformCache;
-
-    bool _sphereIsDirty = false;
+    bool _textureIsDirty = false;
 };
 
 } // namespace openspace
diff --git a/modules/spout/renderablespherespout.cpp b/modules/spout/renderablespherespout.cpp
index b956c9428e..9aaf5cffc2 100644
--- a/modules/spout/renderablespherespout.cpp
+++ b/modules/spout/renderablespherespout.cpp
@@ -29,7 +29,6 @@
 #include <openspace/documentation/documentation.h>
 #include <openspace/documentation/verifier.h>
 #include <openspace/util/sphere.h>
-#include <ghoul/logging/logmanager.h>
 #include <ghoul/opengl/texture.h>
 
 namespace openspace {
@@ -102,7 +101,7 @@ void RenderableSphereSpout::bindTexture() {
         glBindTexture(GL_TEXTURE_2D, _spoutReceiver.spoutTexture());
     }
     else {
-        RenderableSphere::bindTexture();
+        RenderableSphere::unbindTexture();
     }
 }
 
diff --git a/modules/video/include/renderablevideoplane.h b/modules/video/include/renderablevideoplane.h
index b569d2a71e..c9b145f1ad 100644
--- a/modules/video/include/renderablevideoplane.h
+++ b/modules/video/include/renderablevideoplane.h
@@ -48,7 +48,7 @@ public:
     static documentation::Documentation Documentation();
 
 protected:
-    virtual void bindTexture() override;
+    void bindTexture() override;
 
 private:
     VideoPlayer _videoPlayer;
diff --git a/modules/video/include/renderablevideosphere.h b/modules/video/include/renderablevideosphere.h
index e1a9c8723f..c7db3a3fa5 100644
--- a/modules/video/include/renderablevideosphere.h
+++ b/modules/video/include/renderablevideosphere.h
@@ -25,29 +25,15 @@
 #ifndef __OPENSPACE_MODULE_VIDEO___RENDERABLEVIDEOSPHERE___H__
 #define __OPENSPACE_MODULE_VIDEO___RENDERABLEVIDEOSPHERE___H__
 
-#include <openspace/rendering/renderable.h>
+#include <modules/base/rendering/renderablesphere.h>
 
 #include <modules/video/include/videoplayer.h>
-#include <openspace/properties/stringproperty.h>
-#include <openspace/properties/optionproperty.h>
-#include <openspace/properties/scalar/intproperty.h>
-#include <openspace/properties/scalar/floatproperty.h>
-#include <ghoul/opengl/uniformcache.h>
-
-namespace ghoul::opengl {
-    class ProgramObject;
-    class Texture;
-} // namespace ghoul::opengl
 
 namespace openspace {
 
-class Sphere;
-struct RenderData;
-struct UpdateData;
-
 namespace documentation { struct Documentation; }
 
-class RenderableVideoSphere : public Renderable {
+class RenderableVideoSphere : public RenderableSphere {
 public:
     RenderableVideoSphere(const ghoul::Dictionary& dictionary);
 
@@ -56,37 +42,16 @@ public:
 
     bool isReady() const override;
 
-    virtual void render(const RenderData& data, RendererTasks& rendererTask) override;
-    virtual void update(const UpdateData& data) override;
+    void render(const RenderData& data, RendererTasks& rendererTask) override;
+    void update(const UpdateData& data) override;
 
     static documentation::Documentation Documentation();
 
 protected:
-    void bindTexture();
-    void unbindTexture();
+    void bindTexture() override;
 
 private:
     VideoPlayer _videoPlayer;
-
-    properties::OptionProperty _orientation;
-
-    properties::FloatProperty _size;
-    properties::IntProperty _segments;
-
-    properties::BoolProperty _mirrorTexture;
-    properties::BoolProperty _disableFadeInDistance;
-
-    properties::FloatProperty _fadeInThreshold;
-    properties::FloatProperty _fadeOutThreshold;
-
-    ghoul::opengl::ProgramObject* _shader = nullptr;
-
-    std::unique_ptr<Sphere> _sphere;
-
-    UniformCache(opacity, modelViewProjection, modelViewTransform, modelViewRotation,
-        colorTexture, mirrorTexture) _uniformCache;
-
-    bool _sphereIsDirty = false;
 };
 
 } // namespace openspace
diff --git a/modules/video/src/renderablevideoplane.cpp b/modules/video/src/renderablevideoplane.cpp
index 5bcba06397..6c694c32e8 100644
--- a/modules/video/src/renderablevideoplane.cpp
+++ b/modules/video/src/renderablevideoplane.cpp
@@ -74,7 +74,7 @@ void RenderableVideoPlane::update(const UpdateData& data) {
         return;
     }
 
-    // Shape the plane based on the aspect ration of the video
+    // Shape the plane based on the aspect ratio of the video
     glm::vec2 textureDim = glm::vec2(_videoPlayer.frameTexture()->dimensions());
     if (_textureDimensions != textureDim) {
         float aspectRatio = textureDim.x / textureDim.y;
diff --git a/modules/video/src/renderablevideosphere.cpp b/modules/video/src/renderablevideosphere.cpp
index 3ce47e9960..f0ab52f706 100644
--- a/modules/video/src/renderablevideosphere.cpp
+++ b/modules/video/src/renderablevideosphere.cpp
@@ -24,115 +24,16 @@
 
 #include <modules/video/include/renderablevideosphere.h>
 
-#include <modules/base/basemodule.h>
 #include <openspace/documentation/documentation.h>
 #include <openspace/documentation/verifier.h>
-#include <openspace/engine/globals.h>
-#include <openspace/rendering/renderengine.h>
 #include <openspace/util/sphere.h>
-#include <openspace/util/updatestructures.h>
-#include <ghoul/glm.h>
-#include <ghoul/filesystem/filesystem.h>
-#include <ghoul/logging/logmanager.h>
-#include <ghoul/io/texture/texturereader.h>
-#include <ghoul/opengl/texture.h>
-#include <ghoul/opengl/textureunit.h>
-#include <ghoul/opengl/programobject.h>
-#include <optional>
-
-namespace {
-    constexpr std::array<const char*, 6> UniformNames = {
-        "opacity", "modelViewProjection", "modelViewTransform", "modelViewRotation",
-        "colorTexture", "mirrorTexture"
-    };
-
-    enum class Orientation : int {
-        Outside = 0,
-        Inside,
-        Both
-    };
-
-    constexpr openspace::properties::Property::PropertyInfo MirrorTextureInfo = {
-        "MirrorTexture",
-        "Mirror Texture",
-        "Mirror the texture along the x-axis"
-    };
-
-    constexpr openspace::properties::Property::PropertyInfo OrientationInfo = {
-        "Orientation",
-        "Orientation",
-        "Specifies whether the texture is applied to the inside of the sphere, the "
-        "outside of the sphere, or both"
-    };
-
-    constexpr openspace::properties::Property::PropertyInfo SegmentsInfo = {
-        "Segments",
-        "Number of Segments",
-        "This value specifies the number of segments that the sphere is separated in"
-    };
-
-    constexpr openspace::properties::Property::PropertyInfo SizeInfo = {
-        "Size",
-        "Size (in meters)",
-        "This value specifies the radius of the sphere in meters"
-    };
-
-    constexpr openspace::properties::Property::PropertyInfo FadeOutThresholdInfo = {
-        "FadeOutThreshold",
-        "Fade-Out Threshold",
-        "This value determines percentage of the sphere is visible before starting "
-        "fading-out it"
-    };
-
-    constexpr openspace::properties::Property::PropertyInfo FadeInThresholdInfo = {
-        "FadeInThreshold",
-        "Fade-In Threshold",
-        "Distance from center of MilkyWay from where the astronomical object starts to "
-        "fade in"
-    };
-
-    constexpr openspace::properties::Property::PropertyInfo DisableFadeInOutInfo = {
-        "DisableFadeInOut",
-        "Disable Fade-In/Fade-Out effects",
-        "Enables/Disables the Fade-In/Out effects"
-    };
-
-    struct [[codegen::Dictionary(RenderableVideoSphere)]] Parameters {
-        // [[codegen::verbatim(SizeInfo.description)]]
-        float size;
-
-        // [[codegen::verbatim(SegmentsInfo.description)]]
-        int segments;
-
-        enum class [[codegen::map(Orientation)]] Orientation {
-            Outside,
-            Inside,
-            Both
-        };
-
-        // [[codegen::verbatim(OrientationInfo.description)]]
-        std::optional<Orientation> orientation;
-
-        // [[codegen::verbatim(MirrorTextureInfo.description)]]
-        std::optional<bool> mirrorTexture;
-
-        // [[codegen::verbatim(FadeOutThresholdInfo.description)]]
-        std::optional<float> fadeOutThreshold [[codegen::inrange(0.0, 1.0)]];
-
-        // [[codegen::verbatim(FadeInThresholdInfo.description)]]
-        std::optional<float> fadeInThreshold;
-
-        // [[codegen::verbatim(DisableFadeInOutInfo.description)]]
-        std::optional<bool> disableFadeInOut;
-    };
-#include "renderablevideosphere_codegen.cpp"
-} // namespace
 
 namespace openspace {
 
 documentation::Documentation RenderableVideoSphere::Documentation() {
-    documentation::Documentation doc =
-        codegen::doc<Parameters>("renderable_video_sphere");
+    documentation::Documentation doc = RenderableSphere::Documentation();
+    doc.name = "RenderableVideoSphere";
+    doc.id = "video_renderablevideosphere";
 
     documentation::Documentation vp = VideoPlayer::Documentation();
     doc.entries.insert(doc.entries.end(), vp.entries.begin(), vp.entries.end());
@@ -141,261 +42,42 @@ documentation::Documentation RenderableVideoSphere::Documentation() {
 }
 
 RenderableVideoSphere::RenderableVideoSphere(const ghoul::Dictionary& dictionary)
-    : Renderable(dictionary)
+    : RenderableSphere(dictionary)
     , _videoPlayer(dictionary)
-    , _orientation(OrientationInfo, properties::OptionProperty::DisplayType::Dropdown)
-    , _size(SizeInfo, 1.f, 0.f, 1e25f)
-    , _segments(SegmentsInfo, 8, 4, 1000)
-    , _mirrorTexture(MirrorTextureInfo, false)
-    , _disableFadeInDistance(DisableFadeInOutInfo, true)
-    , _fadeInThreshold(FadeInThresholdInfo, -1.f, 0.f, 1.f)
-    , _fadeOutThreshold(FadeOutThresholdInfo, -1.f, 0.f, 1.f)
 {
-    const Parameters p = codegen::bake<Parameters>(dictionary);
-
-    addProperty(_opacity);
-
-    _size = p.size;
-    _segments = p.segments;
-
-    _orientation.addOptions({
-        { static_cast<int>(Orientation::Outside), "Outside" },
-        { static_cast<int>(Orientation::Inside), "Inside" },
-        { static_cast<int>(Orientation::Both), "Both" }
-    });
-
-    if (p.orientation.has_value()) {
-        _orientation = static_cast<int>(codegen::map<Orientation>(*p.orientation));
-    }
-    else {
-        _orientation = static_cast<int>(Orientation::Outside);
-    }
-    addProperty(_orientation);
-
-    _size.setExponent(15.f);
-    _size.onChange([this]() {
-        setBoundingSphere(_size);
-        _sphereIsDirty = true;
-    });
-    addProperty(_size);
-
-    addProperty(_segments);
-    _segments.onChange([this]() { _sphereIsDirty = true; });
-
-    addProperty(_mirrorTexture);
-
-    _mirrorTexture = p.mirrorTexture.value_or(_mirrorTexture);
-
-    bool hasGivenFadeOut = p.fadeOutThreshold.has_value();
-    if (hasGivenFadeOut) {
-        _fadeOutThreshold = *p.fadeOutThreshold;
-        addProperty(_fadeOutThreshold);
-    }
-
-    bool hasGivenFadeIn = p.fadeInThreshold.has_value();
-    if (hasGivenFadeIn) {
-        _fadeInThreshold = *p.fadeInThreshold;
-        addProperty(_fadeInThreshold);
-    }
-
-    if (hasGivenFadeIn || hasGivenFadeOut) {
-        _disableFadeInDistance = false;
-        addProperty(_disableFadeInDistance);
-    }
-
-    setBoundingSphere(_size);
-    setRenderBinFromOpacity();
     addPropertySubOwner(_videoPlayer);
 }
 
-
 bool RenderableVideoSphere::isReady() const {
-    return _shader && _videoPlayer.isInitialized();
+    return RenderableSphere::isReady() && _videoPlayer.isInitialized();
 }
 
 void RenderableVideoSphere::initializeGL() {
-    _sphere = std::make_unique<Sphere>(_size, _segments);
-    _sphere->initialize();
-
-    _shader = BaseModule::ProgramObjectManager.request(
-        "Sphere",
-        []() -> std::unique_ptr<ghoul::opengl::ProgramObject> {
-            return global::renderEngine->buildRenderProgram(
-                "Sphere",
-                absPath("${MODULE_BASE}/shaders/sphere_vs.glsl"),
-                absPath("${MODULE_BASE}/shaders/sphere_fs.glsl")
-            );
-        }
-    );
-
-    ghoul::opengl::updateUniformLocations(*_shader, _uniformCache, UniformNames);
-
+    RenderableSphere::initializeGL();
     _videoPlayer.initialize();
 }
 
 void RenderableVideoSphere::deinitializeGL() {
     _videoPlayer.destroy();
-    BaseModule::ProgramObjectManager.release(
-        "Sphere",
-        [](ghoul::opengl::ProgramObject* p) {
-            global::renderEngine->removeRenderProgram(p);
-        }
-    );
-    _shader = nullptr;
+    RenderableSphere::deinitializeGL();
 }
 
-void RenderableVideoSphere::render(const RenderData& data, RendererTasks&) {
-    Orientation orientation = static_cast<Orientation>(_orientation.value());
-
-    glm::dmat4 modelTransform =
-        glm::translate(glm::dmat4(1.0), data.modelTransform.translation) *
-        glm::dmat4(data.modelTransform.rotation) *
-        glm::scale(glm::dmat4(1.0), glm::dvec3(data.modelTransform.scale));
-
-    glm::dmat3 modelRotation =
-        glm::dmat3(data.modelTransform.rotation);
-
-    // Activate shader
-    using IgnoreError = ghoul::opengl::ProgramObject::IgnoreError;
-    _shader->activate();
-    _shader->setIgnoreUniformLocationError(IgnoreError::Yes);
-
-    glm::mat4 modelViewProjection = data.camera.projectionMatrix() *
-        glm::mat4(data.camera.combinedViewMatrix() * modelTransform);
-    _shader->setUniform(_uniformCache.modelViewProjection, modelViewProjection);
-
-    const glm::dmat4 modelViewTransform =
-        data.camera.combinedViewMatrix() * modelTransform;
-    _shader->setUniform(_uniformCache.modelViewTransform, glm::mat4(modelViewTransform));
-
-    glm::mat3 modelViewRotation = glm::mat3(
-        glm::dmat3(data.camera.viewRotationMatrix()) * modelRotation
-    );
-    _shader->setUniform(_uniformCache.modelViewRotation, modelViewRotation);
-
-    float adjustedOpacity = opacity();
-
-    if (!_disableFadeInDistance) {
-        if (_fadeInThreshold > -1.0) {
-            const double d = glm::distance(
-                data.camera.positionVec3(),
-                data.modelTransform.translation
-            );
-            const float logDist =
-                d > 0.0 ?
-                std::log(static_cast<float>(d)) :
-                -std::numeric_limits<float>::max();
-
-            const float startLogFadeDistance = glm::log(_size * _fadeInThreshold);
-            const float stopLogFadeDistance = startLogFadeDistance + 1.f;
-
-            if (logDist > startLogFadeDistance && logDist < stopLogFadeDistance) {
-                const float fadeFactor = glm::clamp(
-                    (logDist - startLogFadeDistance) /
-                    (stopLogFadeDistance - startLogFadeDistance),
-                    0.f,
-                    1.f
-                );
-                adjustedOpacity *= fadeFactor;
-            }
-            else if (logDist <= startLogFadeDistance) {
-                adjustedOpacity = 0.f;
-            }
-        }
-
-        if (_fadeOutThreshold > -1.0) {
-            const double d = glm::distance(
-                data.camera.positionVec3(),
-                data.modelTransform.translation
-            );
-            const float logDist =
-                d > 0.0 ?
-                std::log(static_cast<float>(d)) :
-                -std::numeric_limits<float>::max();
-            const float startLogFadeDistance = glm::log(_size * _fadeOutThreshold);
-            const float stopLogFadeDistance = startLogFadeDistance + 1.f;
-
-            if (logDist > startLogFadeDistance && logDist < stopLogFadeDistance) {
-                const float fadeFactor = glm::clamp(
-                    (logDist - startLogFadeDistance) /
-                    (stopLogFadeDistance - startLogFadeDistance),
-                    0.f,
-                    1.f
-                );
-                adjustedOpacity *= (1.f - fadeFactor);
-            }
-            else if (logDist >= stopLogFadeDistance) {
-                adjustedOpacity = 0.f;
-            }
-        }
-    }
-    // Performance wise
-    if (adjustedOpacity < 0.01f) {
-        return;
-    }
-
-    _shader->setUniform(_uniformCache.opacity, adjustedOpacity);
-    _shader->setUniform(_uniformCache.mirrorTexture, _mirrorTexture.value());
-
-    ghoul::opengl::TextureUnit unit;
-    unit.activate();
-    bindTexture();
-    defer{ unbindTexture(); };
-    _shader->setUniform(_uniformCache.colorTexture, unit);
-
-    // Setting these states should not be necessary,
-    // since they are the default state in OpenSpace.
-    glEnable(GL_CULL_FACE);
-    glCullFace(GL_BACK);
-
-    if (orientation == Orientation::Inside) {
-        glCullFace(GL_FRONT);
-    }
-    else if (orientation == Orientation::Both) {
-        glDisable(GL_CULL_FACE);
-    }
-
-    if (_renderBin == Renderable::RenderBin::PreDeferredTransparent) {
-        glBlendFunc(GL_SRC_ALPHA, GL_ONE);
-        glDepthMask(false);
-    }
-
-    _sphere->render();
-
-    if (_renderBin == Renderable::RenderBin::PreDeferredTransparent) {
-        glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
-        glDepthMask(true);
-    }
-
-    _shader->setIgnoreUniformLocationError(IgnoreError::No);
-    _shader->deactivate();
-
-    if (orientation == Orientation::Inside) {
-        glCullFace(GL_BACK);
-    }
-    else if (orientation == Orientation::Both) {
-        glEnable(GL_CULL_FACE);
+void RenderableVideoSphere::render(const RenderData& data, RendererTasks& rendererTask) {
+    if (_videoPlayer.isInitialized()) {
+        RenderableSphere::render(data, rendererTask);
     }
 }
 
 void RenderableVideoSphere::update(const UpdateData&) {
+    if (!_videoPlayer.isInitialized()) {
+        return;
+    }
+
     _videoPlayer.update();
-
-    if (_shader->isDirty()) {
-        _shader->rebuildFromFile();
-        ghoul::opengl::updateUniformLocations(*_shader, _uniformCache, UniformNames);
-    }
-
-    if (_sphereIsDirty) {
-        _sphere = std::make_unique<Sphere>(_size, _segments);
-        _sphere->initialize();
-        _sphereIsDirty = false;
-    }
 }
 
 void RenderableVideoSphere::bindTexture() {
     _videoPlayer.frameTexture().get()->bind();
 }
 
-void RenderableVideoSphere::unbindTexture() {}
 } // namespace openspace

From 8a68825d48cc5109b406ec3ebbeeffbcfec786f0 Mon Sep 17 00:00:00 2001
From: Adam Rohdin <adam.rohdin@liu.se>
Date: Mon, 7 Aug 2023 16:24:33 +0200
Subject: [PATCH 078/701] updated example to use pos instead of windowPos

---
 openspace.cfg | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/openspace.cfg b/openspace.cfg
index 2c1bbbea53..82e8a4b910 100644
--- a/openspace.cfg
+++ b/openspace.cfg
@@ -12,7 +12,7 @@ SGCTConfig = sgct.config.single{vsync=false}
 -- A regular 1920x1080 window
 -- SGCTConfig = sgct.config.single{1920, 1080}
 -- A windowed 1920x1080 fullscreen
--- SGCTConfig = sgct.config.single{1920, 1080, border=false, windowPos={0,0}}
+-- SGCTConfig = sgct.config.single{1920, 1080, border=false, pos={0,0}}
 -- A 1k fisheye rendering
 -- SGCTConfig = sgct.config.fisheye{1024, 1024}
 -- A 4k fisheye rendering in a 1024x1024 window

From 9cfda4db2f54a24e2d51d57367a0374a7b30c184 Mon Sep 17 00:00:00 2001
From: Gene Payne <payne.gene@gmail.com>
Date: Mon, 7 Aug 2023 12:50:06 -0600
Subject: [PATCH 079/701] Fixed the name in the meta section of each config

---
 apps/OpenSpace/ext/launcher/src/launcherwindow.cpp | 2 +-
 config/equirectangular_gui.json                    | 2 +-
 config/fullscreen1080.json                         | 2 +-
 config/gui_projector.json                          | 2 +-
 config/single_fisheye.json                         | 2 +-
 config/single_fisheye_gui.json                     | 2 +-
 config/single_gui.json                             | 2 +-
 config/single_gui_spout.json                       | 2 +-
 config/single_gui_with_graphics.json               | 2 +-
 config/single_sbs_stereo.json                      | 2 +-
 config/single_two_win.json                         | 2 +-
 config/spherical_mirror.json                       | 2 +-
 config/spherical_mirror_gui.json                   | 2 +-
 config/spout_output_cubemap.json                   | 4 ++--
 config/spout_output_equirectangular.json           | 4 ++--
 config/spout_output_fisheye.json                   | 4 ++--
 config/spout_output_flat.json                      | 4 ++--
 config/two_nodes.json                              | 2 +-
 18 files changed, 22 insertions(+), 22 deletions(-)

diff --git a/apps/OpenSpace/ext/launcher/src/launcherwindow.cpp b/apps/OpenSpace/ext/launcher/src/launcherwindow.cpp
index 7bb25f7e61..f1352e7444 100644
--- a/apps/OpenSpace/ext/launcher/src/launcherwindow.cpp
+++ b/apps/OpenSpace/ext/launcher/src/launcherwindow.cpp
@@ -552,7 +552,7 @@ bool handleConfigurationFile(QComboBox& box, const std::filesystem::directory_en
     }
     box.addItem(QString::fromStdString(p.path().filename().string()));
 
-    //Add tooltip
+    // Add tooltip
     if (isJson) {
         sgct::config::Meta meta = sgct::readMeta(p.path().string(), true);
         if (!meta.description.empty()) {
diff --git a/config/equirectangular_gui.json b/config/equirectangular_gui.json
index 7d3d2dc303..425c78a509 100644
--- a/config/equirectangular_gui.json
+++ b/config/equirectangular_gui.json
@@ -59,7 +59,7 @@
     "author": "OpenSpace Team",
     "description": "Two windows: Primary 1280x720 window with equirectangular projection rendering without menu or text overlays, and a secondary with menu and text overlays minus rendering.",
     "license": "MIT License",
-    "name": "Single",
+    "name": "Equirectangular + GUI",
     "version": "1.0"
   }
 }
diff --git a/config/fullscreen1080.json b/config/fullscreen1080.json
index 6b8afbcd3e..6d8cfa7987 100644
--- a/config/fullscreen1080.json
+++ b/config/fullscreen1080.json
@@ -48,7 +48,7 @@
     "author": "OpenSpace Team",
     "description": "A single 1920x1080 fullscreen window with planar projection rendering. The display will automatically be set to 1920x1080, regardless of native resolution.",
     "license": "MIT License",
-    "name": "Single",
+    "name": "Fullscreen 1080",
     "version": "1.0"
   }
 }
diff --git a/config/gui_projector.json b/config/gui_projector.json
index c4affe89fd..2ae6a35593 100644
--- a/config/gui_projector.json
+++ b/config/gui_projector.json
@@ -64,7 +64,7 @@
     "author": "OpenSpace Team",
     "description": "Two windows for a side-by-side dual-monitor configuration, where the right-side monitor can be considered a projector. Primary 1920x1080 window with menu and text overlays minus rendering, and a secondary 1920x1080 fullscreen window with planar projection rendering without menu or text overlays.",
     "license": "MIT License",
-    "name": "Single",
+    "name": "Side Projector + GUI",
     "version": "1.0"
   }
 }
diff --git a/config/single_fisheye.json b/config/single_fisheye.json
index 1309a8e623..941cf221e2 100644
--- a/config/single_fisheye.json
+++ b/config/single_fisheye.json
@@ -38,7 +38,7 @@
     "author": "OpenSpace Team",
     "description": "A single 1024x1024 window with fisheye projection rendering.",
     "license": "MIT License",
-    "name": "Single",
+    "name": "Fisheye",
     "version": "1.0"
   }
 }
diff --git a/config/single_fisheye_gui.json b/config/single_fisheye_gui.json
index ef67552cbd..862ec78611 100644
--- a/config/single_fisheye_gui.json
+++ b/config/single_fisheye_gui.json
@@ -62,7 +62,7 @@
     "author": "OpenSpace Team",
     "description": "Two windows: Primary 1024x1024 window with menu and text overlays minus rendering, and a secondary 1024x1024 window with fisheye projection rendering without menu and text overlays.",
     "license": "MIT License",
-    "name": "Single",
+    "name": "Fisheye + GUI",
     "version": "1.0"
   }
 
diff --git a/config/single_gui.json b/config/single_gui.json
index 6d67ed64f9..87c997d0ef 100644
--- a/config/single_gui.json
+++ b/config/single_gui.json
@@ -71,7 +71,7 @@
     "author": "OpenSpace Team",
     "description": "Two windows: Primary 1280x720 window with planar projection rendering without menu or text overlays, and a secondary with menu and text overlays minus rendering.",
     "license": "MIT License",
-    "name": "Single",
+    "name": "Single + GUI",
     "version": "1.0"
   }
 }
diff --git a/config/single_gui_spout.json b/config/single_gui_spout.json
index 5f54282976..bfd91f6a65 100644
--- a/config/single_gui_spout.json
+++ b/config/single_gui_spout.json
@@ -68,7 +68,7 @@
     "author": "OpenSpace Team",
     "description": "Two windows: Primary 1280x720 window with Spout output (name 'OpenSpace') planar projection rendering without menu or text overlays, and a secondary with menu and text overlays minus rendering.",
     "license": "MIT License",
-    "name": "Single",
+    "name": "Planar Spout + GUI",
     "version": "1.0"
   }
 }
diff --git a/config/single_gui_with_graphics.json b/config/single_gui_with_graphics.json
index 31d1b630ab..950207760d 100644
--- a/config/single_gui_with_graphics.json
+++ b/config/single_gui_with_graphics.json
@@ -72,7 +72,7 @@
     "author": "OpenSpace Team",
     "description": "Two windows: Primary 1280x720 window with planar projection rendering without menu or text overlays, and a secondary with menu and text overlays plus rendering from the primary.",
     "license": "MIT License",
-    "name": "Single",
+    "name": "Planar + GUI",
     "version": "1.0"
   }
 }
diff --git a/config/single_sbs_stereo.json b/config/single_sbs_stereo.json
index e1fa34337b..b3e32c1e1b 100644
--- a/config/single_sbs_stereo.json
+++ b/config/single_sbs_stereo.json
@@ -47,7 +47,7 @@
     "author": "OpenSpace Team",
     "description": "A single 1280x720 window containing side-by-side stereo planar projection rendering views.",
     "license": "MIT License",
-    "name": "Single",
+    "name": "Side-by-Side Stereo",
     "version": "1.0"
   }
 }
diff --git a/config/single_two_win.json b/config/single_two_win.json
index 6d35594ef0..9eabfd6977 100644
--- a/config/single_two_win.json
+++ b/config/single_two_win.json
@@ -60,7 +60,7 @@
     "author": "OpenSpace Team",
     "description": "Two 1280x720 windows each with identical planar projection rendering. Only the primary window has menu controls, but both have text overlays.",
     "license": "MIT License",
-    "name": "Single",
+    "name": "Twin Planar",
     "version": "1.0"
   }
 
diff --git a/config/spherical_mirror.json b/config/spherical_mirror.json
index a422b34d35..5b2361f192 100644
--- a/config/spherical_mirror.json
+++ b/config/spherical_mirror.json
@@ -41,7 +41,7 @@
     "author": "OpenSpace Team",
     "description": "A single 1280x720 window with spherical projection rendering at 2048x2048 resolution.",
     "license": "MIT License",
-    "name": "Single",
+    "name": "Spherical Mirror",
     "version": "1.0"
   }
 }
diff --git a/config/spherical_mirror_gui.json b/config/spherical_mirror_gui.json
index e96ba89936..08a0e8be9b 100644
--- a/config/spherical_mirror_gui.json
+++ b/config/spherical_mirror_gui.json
@@ -66,7 +66,7 @@
     "author": "OpenSpace Team",
     "description": "Two windows: Primary 1280x720 window with menu and text overlays minus rendering, and a secondary 1280x720 window at 2048x2048 resolution with spherical mirror projection rendering without the menu or text overlays.",
     "license": "MIT License",
-    "name": "Single",
+    "name": "Spherical Mirror + GUI",
     "version": "1.0"
   }
 }
diff --git a/config/spout_output_cubemap.json b/config/spout_output_cubemap.json
index a8c2621064..83cfcdd35d 100644
--- a/config/spout_output_cubemap.json
+++ b/config/spout_output_cubemap.json
@@ -59,9 +59,9 @@
   ],
   "meta": {
     "author": "OpenSpace Team",
-    "description": "A single 1024x1024 window with spout output cubemap projection rendering.",
+    "description": "A single 1024x1024 window with Spout output cubemap projection rendering.",
     "license": "MIT License",
-    "name": "Single",
+    "name": "Cubemap Spout",
     "version": "1.0"
   }
 }
diff --git a/config/spout_output_equirectangular.json b/config/spout_output_equirectangular.json
index 39de1154a2..1cf7436a75 100644
--- a/config/spout_output_equirectangular.json
+++ b/config/spout_output_equirectangular.json
@@ -59,9 +59,9 @@
   ],
   "meta": {
     "author": "OpenSpace Team",
-    "description": "A single 1024x1024 window with spout output equirectangular projection rendering.",
+    "description": "A single 1024x1024 window with Spout output equirectangular projection rendering.",
     "license": "MIT License",
-    "name": "Single",
+    "name": "Equirectangular Spout",
     "version": "1.0"
   }
 }
diff --git a/config/spout_output_fisheye.json b/config/spout_output_fisheye.json
index f95628bd50..584bf5b8f9 100644
--- a/config/spout_output_fisheye.json
+++ b/config/spout_output_fisheye.json
@@ -59,9 +59,9 @@
   ],
   "meta": {
     "author": "OpenSpace Team",
-    "description": "A single 1024x1024 window with spout output fisheye projection rendering.",
+    "description": "A single 1024x1024 window with Spout output fisheye projection rendering.",
     "license": "MIT License",
-    "name": "Single",
+    "name": "Fisheye Spout",
     "version": "1.0"
   }
 }
diff --git a/config/spout_output_flat.json b/config/spout_output_flat.json
index c7c8ff2d06..9a953b616a 100644
--- a/config/spout_output_flat.json
+++ b/config/spout_output_flat.json
@@ -58,9 +58,9 @@
   ],
   "meta": {
     "author": "OpenSpace Team",
-    "description": "A single 1024x1024 window with spout output planar/flat projection rendering at 1920x1080 resolution.",
+    "description": "A single 1024x1024 window with Spout output planar/flat projection rendering at 1920x1080 resolution.",
     "license": "MIT License",
-    "name": "Single",
+    "name": "Planar Spout",
     "version": "1.0"
   }
 }
diff --git a/config/two_nodes.json b/config/two_nodes.json
index 9bb4f8cf13..637bc27dea 100644
--- a/config/two_nodes.json
+++ b/config/two_nodes.json
@@ -65,7 +65,7 @@
     "author": "OpenSpace Team",
     "description": "Two individual nodes, each with a 1280x720 window with planar projection rendering.",
     "license": "MIT License",
-    "name": "Single",
+    "name": "Two Nodes",
     "version": "1.0"
   }
 }

From 7411302334157ab3a34b39722f297dfa39d43404 Mon Sep 17 00:00:00 2001
From: Emma Broman <emma.broman@liu.se>
Date: Tue, 8 Aug 2023 13:41:20 +0200
Subject: [PATCH 080/701] Fix fatal error when starting profile with navigation
 state camera setting

And provide more information in the fatal error message... (emerged from commit 30b80843c34273ef9f30eb785e496f2eb259e4d8)
---
 src/engine/openspaceengine.cpp | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/engine/openspaceengine.cpp b/src/engine/openspaceengine.cpp
index 10d9b57e69..894790e077 100644
--- a/src/engine/openspaceengine.cpp
+++ b/src/engine/openspaceengine.cpp
@@ -1720,7 +1720,9 @@ void setCameraFromProfile(const Profile& p) {
 
     auto checkNodeExists = [](const std::string& node) {
         if (global::renderEngine->scene()->sceneGraphNode(node) == nullptr) {
-            throw ghoul::RuntimeError(fmt::format("Could not find node '{}'", node));
+            throw ghoul::RuntimeError(fmt::format(
+                "Error when setting camera from profile. Could not find node '{}'", node
+            ));
         }
     };
 
@@ -1730,7 +1732,7 @@ void setCameraFromProfile(const Profile& p) {
                 interaction::NavigationState nav;
                 nav.anchor = navStateProfile.anchor;
                 checkNodeExists(nav.anchor);
-                if (navStateProfile.aim.has_value()) {
+                if (navStateProfile.aim.has_value() && !(*navStateProfile.aim).empty()) {
                     nav.aim = navStateProfile.aim.value();
                     checkNodeExists(nav.aim);
                 }

From 54ad5bfdd513ebbb2bb0a7f43425d702f144fd3f Mon Sep 17 00:00:00 2001
From: Malin E <malin.ejdbo@gmail.com>
Date: Wed, 9 Aug 2023 16:04:20 +0200
Subject: [PATCH 081/701] Add pivot property for Models to move model origin

---
 modules/base/rendering/renderablemodel.cpp | 33 ++++++++++++++--------
 modules/base/rendering/renderablemodel.h   |  1 +
 2 files changed, 23 insertions(+), 11 deletions(-)

diff --git a/modules/base/rendering/renderablemodel.cpp b/modules/base/rendering/renderablemodel.cpp
index e8eb35b013..5b7f5db8aa 100644
--- a/modules/base/rendering/renderablemodel.cpp
+++ b/modules/base/rendering/renderablemodel.cpp
@@ -143,6 +143,13 @@ namespace {
         openspace::properties::Property::Visibility::Developer
     };
 
+    constexpr openspace::properties::Property::PropertyInfo PivotInfo = {
+        "Pivot",
+        "Pivot",
+        "A vector that moves the place of origin for the model",
+        openspace::properties::Property::Visibility::AdvancedUser
+    };
+
     constexpr openspace::properties::Property::PropertyInfo ModelScaleInfo = {
         "ModelScale",
         "Model Scale",
@@ -278,6 +285,9 @@ namespace {
         // [[codegen::verbatim(ModelTransformInfo.description)]]
         std::optional<glm::dmat4x4> modelTransform;
 
+        // [[codegen::verbatim(PivotInfo.description)]]
+        std::optional<glm::vec3> pivot;
+
         // [[codegen::verbatim(RotationVecInfo.description)]]
         std::optional<glm::dvec3> rotationVector;
 
@@ -322,6 +332,12 @@ RenderableModel::RenderableModel(const ghoul::Dictionary& dictionary)
         glm::dmat4(-1.0),
         glm::dmat4(1.0)
     )
+    , _pivot(
+        PivotInfo,
+        glm::vec3(0.f),
+        glm::vec3(-std::numeric_limits<float>::max()),
+        glm::vec3(std::numeric_limits<float>::max())
+    )
     , _modelScale(ModelScaleInfo, 1.0, std::numeric_limits<double>::epsilon(), 4e+27)
     , _rotationVec(RotationVecInfo, glm::dvec3(0.0), glm::dvec3(0.0), glm::dvec3(360.0))
     , _enableDepthTest(EnableDepthTestInfo, true)
@@ -371,17 +387,10 @@ RenderableModel::RenderableModel(const ghoul::Dictionary& dictionary)
         }
     }
 
-    if (p.modelTransform.has_value()) {
-        _modelTransform = *p.modelTransform;
-    }
-
-    if (p.animationStartTime.has_value()) {
-        _animationStart = *p.animationStartTime;
-    }
-
-    if (p.enableAnimation.has_value()) {
-        _enableAnimation = *p.enableAnimation;
-    }
+    _modelTransform = p.modelTransform.value_or(_modelTransform);
+    _pivot = p.pivot.value_or(_pivot);
+    _animationStart = p.animationStartTime.value_or(_animationStart);
+    _enableAnimation = p.enableAnimation.value_or(_enableAnimation);
 
     if (p.animationTimeScale.has_value()) {
         if (std::holds_alternative<float>(*p.animationTimeScale)) {
@@ -460,6 +469,7 @@ RenderableModel::RenderableModel(const ghoul::Dictionary& dictionary)
     addProperty(_enableFaceCulling);
     addProperty(_enableDepthTest);
     addProperty(_modelTransform);
+    addProperty(_pivot);
     addProperty(_rotationVec);
 
     addProperty(_modelScale);
@@ -781,6 +791,7 @@ void RenderableModel::render(const RenderData& data, RendererTasks&) {
 
     // Model transform and view transform needs to be in double precision
     const glm::dmat4 modelTransform =
+        glm::translate(glm::dmat4(1.0), glm::dvec3(_pivot.value())) *
         glm::translate(glm::dmat4(1.0), data.modelTransform.translation) *
         glm::dmat4(data.modelTransform.rotation) *
         glm::scale(glm::dmat4(1.0), glm::dvec3(data.modelTransform.scale)) *
diff --git a/modules/base/rendering/renderablemodel.h b/modules/base/rendering/renderablemodel.h
index 25c6f7f919..fd963a7a0d 100644
--- a/modules/base/rendering/renderablemodel.h
+++ b/modules/base/rendering/renderablemodel.h
@@ -97,6 +97,7 @@ private:
     properties::BoolProperty _performShading;
     properties::BoolProperty _enableFaceCulling;
     properties::DMat4Property _modelTransform;
+    properties::Vec3Property _pivot;
     properties::Vec3Property _rotationVec;
 
     properties::BoolProperty _enableDepthTest;

From 72b186b80573246bbf05aeea98a89af31c36e7c9 Mon Sep 17 00:00:00 2001
From: Malin E <malin.ejdbo@gmail.com>
Date: Wed, 9 Aug 2023 16:25:36 +0200
Subject: [PATCH 082/701] Fix issue with hide all constellation lines action

---
 data/assets/scene/digitaluniverse/constellations.asset | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/data/assets/scene/digitaluniverse/constellations.asset b/data/assets/scene/digitaluniverse/constellations.asset
index 8e8ed7d626..b9fdcc55b2 100644
--- a/data/assets/scene/digitaluniverse/constellations.asset
+++ b/data/assets/scene/digitaluniverse/constellations.asset
@@ -116,7 +116,7 @@ local HideConstellations = {
   Identifier = "os.constellations.HideConstellations",
   Name = "Hide all",
   Command = [[
-    openspace.fadeOut("Scene.Constellations.Renderable", nil, "openspace.setPropertyValueSingle('Scene.Constellations.Renderable.Enabled', false); openspace.setPropertyValueSingle("Scene.Constellations.Renderable.ConstellationSelection", {})")
+    openspace.fadeOut("Scene.Constellations.Renderable", nil, "openspace.setPropertyValueSingle('Scene.Constellations.Renderable.Enabled', false); openspace.setPropertyValueSingle('Scene.Constellations.Renderable.ConstellationSelection', {})")
   ]],
   Documentation = "Hides all the constellations lines",
   GuiPath = "/Constellations/Lines",

From ff421bc19ad5b4ae0a9c49cb3524752721dbf3aa Mon Sep 17 00:00:00 2001
From: Ylva Selling <ylva.selling@gmail.com>
Date: Wed, 9 Aug 2023 14:47:08 -0400
Subject: [PATCH 083/701] Add JUICE mission file

---
 .../solarsystem/missions/juice/mission.asset  | 67 +++++++++++++++++++
 data/profiles/juice.profile                   |  1 +
 2 files changed, 68 insertions(+)
 create mode 100644 data/assets/scene/solarsystem/missions/juice/mission.asset

diff --git a/data/assets/scene/solarsystem/missions/juice/mission.asset b/data/assets/scene/solarsystem/missions/juice/mission.asset
new file mode 100644
index 0000000000..879872f148
--- /dev/null
+++ b/data/assets/scene/solarsystem/missions/juice/mission.asset
@@ -0,0 +1,67 @@
+local Mission = {
+  Name = "Juice",
+  Image = "https://www.esa.int/var/esa/storage/images/science_exploration/space_science/juice/23388092-2-eng-GB/Juice_pillars.jpg",
+  Description = "ESA’s Jupiter Icy Moons Explorer, Juice, will make detailed observations of the giant gas planet and its three large ocean-bearing moons – Ganymede, Callisto and Europa – with a suite of remote sensing, geophysical and in situ instruments. The mission will characterise these moons as both planetary objects and possible habitats, explore Jupiter’s complex environment in depth, and study the wider Jupiter system as an archetype for gas giants across the Universe.",
+  Milestones = {
+    {
+      Name = "Earth flyby 1",
+      Date = "2024 AUG 01 00:00:00",
+    },
+    {
+      Name = "Venus flyby",
+      Date = "2025 AUG 01 00:00:00",
+    },
+    {
+      Name = "Earth flyby 2",
+      Date = "2026 SEP 01 00:00:00",
+    },
+    {
+      Name = "Earth flyby 3",
+      Date = "2029 JAN 01 00:00:00",
+    },
+    {
+      Name = "Arrival at Jupiter",
+      Date = "2031 JUL 01 00:00:00",
+    },
+    {
+      Name = "Europa flyby 1",
+      Date = "2032 JUL 02 16:21:51",
+    },
+    {
+      Name = "Europa flyby 2",
+      Date = "2032 JUL 16 22:18:22",
+    }
+  },
+  Phases = {
+    {
+      Name = "Journey to Jupiter",
+      TimeRange = { Start = "2023 APR 05 16:25:00", End = "2031 JUL 01 00:00:00" },
+    },
+    {
+      Name = "Jupiter orbit ",
+      TimeRange = { Start = "2031 JUL 01 00:00:00", End = "2033 NOV 01 00:00:00" },
+      Phases = {
+        {
+          Name = "Jupiter inclined phase - Callisto flybys",
+          TimeRange = { Start = "2032 AUG 01 00:00:00", End = "2033 AUG 01 00:00:00" },
+          Description = "ESA’s Jupiter Icy Moons Explorer – Juice – will catch its first glimpse of ancient, cratered Callisto in June 2032, going on to whizz past the moon 21 times before making a final flyby in 2034. During these close encounters, Juice will collect valuable scientific treasure about the moon.",
+
+        }
+      }
+    },
+    {
+      Name = "Ganymede orbit",
+      TimeRange = { Start = "2034 NOV 01 00:00:00", End = "2035 SEP 01 00:00:00" },
+      Description = "Monstrous, mysterious Ganymede is the primary target of ESA’s Jupiter Icy Moons Explorer (Juice) and the largest moon in the Solar System – larger even than Pluto and Mercury! Though Juice will make flybys of all three of Jupiter’s largest Galilean moons (Ganymede, Europa and Callisto), Ganymede is the only one that the spacecraft will orbit. In doing so, Juice will become the first spacecraft ever to orbit a moon other than our own, enabling us to see the Jovian world in a whole new light. Ganymede is also the only moon in the Solar System to generate its own magnetic field. Juice will explore various key topics: Ganymede’s puzzling magnetic field, its hidden ocean, its complex core, its ice content and shell, its interactions with its local environment and that of Jupiter, its past and present activity, and whether or not the moon could be – or ever have been – a habitable environment."
+    }
+  }
+}
+
+
+asset.onInitialize(function()
+  openspace.loadMission(Mission)
+end)
+
+asset.onDeinitialize(function()
+  openspace.unloadMission(Mission.Name)
+end)
diff --git a/data/profiles/juice.profile b/data/profiles/juice.profile
index 1def720964..3fd45ae004 100644
--- a/data/profiles/juice.profile
+++ b/data/profiles/juice.profile
@@ -9,6 +9,7 @@
     "scene/solarsystem/missions/juice/model",
     "scene/solarsystem/missions/juice/plane",
     "scene/solarsystem/missions/juice/trail",
+    "scene/solarsystem/missions/juice/mission",
     "scene/solarsystem/planets/earth/earth",
     "scene/solarsystem/planets/jupiter/layers/colorlayers/jupiter_video"
   ],

From 4433abdf7964a36043a510ba1b07fb6f4c5844cc Mon Sep 17 00:00:00 2001
From: GPayne <payne.gene@gmail.com>
Date: Thu, 10 Aug 2023 05:59:20 -0600
Subject: [PATCH 084/701] Switched to Qt RegularExpression for asset search

---
 .../launcher/include/profile/assetsdialog.h   |  7 +++++--
 .../ext/launcher/src/profile/assetsdialog.cpp | 19 +++++++++++++------
 2 files changed, 18 insertions(+), 8 deletions(-)

diff --git a/apps/OpenSpace/ext/launcher/include/profile/assetsdialog.h b/apps/OpenSpace/ext/launcher/include/profile/assetsdialog.h
index 5ad607efb2..a91f959ea5 100644
--- a/apps/OpenSpace/ext/launcher/include/profile/assetsdialog.h
+++ b/apps/OpenSpace/ext/launcher/include/profile/assetsdialog.h
@@ -27,13 +27,14 @@
 
 #include <QDialog>
 #include <QSortFilterProxyModel>
-#include <QRegExp>
+#include <QRegularExpression>
 #include "assettreemodel.h"
 
 class QTextEdit;
 class QTreeView;
 
 class SearchProxyModel : public QSortFilterProxyModel {
+Q_OBJECT
 public:
     /**
      * Constructor for SearchProxyModel class
@@ -42,17 +43,19 @@ public:
      */
     SearchProxyModel(QObject* parent = nullptr) : QSortFilterProxyModel(parent) {}
 
+public slots:
     /**
      * Sets the regular expression pattern to apply to the filter
      *
      * \param pattern The QString reference containing the regex pattern
      */
-    void setFilterRegExp(const QString& pattern);
+    void setFilterRegularExpression(const QString& pattern);
 
 protected:
     bool filterAcceptsRow(int sourceRow, const QModelIndex& sourceParent) const override;
 
 private:
+    QRegularExpression* _regExPattern = nullptr;
     bool acceptIndex(const QModelIndex& idx) const;
 };
 
diff --git a/apps/OpenSpace/ext/launcher/src/profile/assetsdialog.cpp b/apps/OpenSpace/ext/launcher/src/profile/assetsdialog.cpp
index dedc8deb20..f464703576 100644
--- a/apps/OpenSpace/ext/launcher/src/profile/assetsdialog.cpp
+++ b/apps/OpenSpace/ext/launcher/src/profile/assetsdialog.cpp
@@ -296,14 +296,17 @@ void AssetsDialog::searchTextChanged(const QString& text) {
     }
     else {
         _assetTree->setModel(_searchProxyModel);
-        _assetProxyModel->setFilterRegExp(text);
+        _searchProxyModel->setFilterRegularExpression(text);
         _assetTree->expandAll();
     }
 }
-    
-void SearchProxyModel::setFilterRegExp(const QString& pattern) {
-    QRegExp regex(pattern, Qt::CaseInsensitive, QRegExp::FixedString);
-    QSortFilterProxyModel::setFilterRegExp(regex);
+
+void SearchProxyModel::setFilterRegularExpression(const QString& pattern) {
+    _regExPattern = new QRegularExpression(
+        pattern,
+        QRegularExpression::CaseInsensitiveOption
+    );
+    QSortFilterProxyModel::setFilterRegularExpression(*_regExPattern);
 }
 
 bool SearchProxyModel::filterAcceptsRow(int sourceRow,
@@ -316,7 +319,11 @@ bool SearchProxyModel::filterAcceptsRow(int sourceRow,
 bool SearchProxyModel::acceptIndex(const QModelIndex& idx) const {
     if (idx.isValid()) {
         QString text = idx.data(Qt::DisplayRole).toString();
-        if (filterRegExp().indexIn(text) >= 0) {
+        if (!_regExPattern) {
+            return false;
+        }
+        QRegularExpressionMatchIterator matchIterator = _regExPattern->globalMatch(text);
+        if (matchIterator.hasNext()) {
             return true;
         }
         for (int row = 0; row < idx.model()->rowCount(idx); ++row) {

From 8cd6338a565f99834f476468039b8216b4d46127 Mon Sep 17 00:00:00 2001
From: Alexander Bock <alexander.bock@liu.se>
Date: Fri, 11 Aug 2023 05:15:03 +0200
Subject: [PATCH 085/701] Perform an update after creating a
 ScreenSpaceRenderable, causing images to be loaded immediately and provide
 error messages to the user (closes #2848)

---
 src/rendering/renderengine.cpp | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/rendering/renderengine.cpp b/src/rendering/renderengine.cpp
index f73dbcc2f6..f88a18352f 100644
--- a/src/rendering/renderengine.cpp
+++ b/src/rendering/renderengine.cpp
@@ -1111,6 +1111,9 @@ void RenderEngine::addScreenSpaceRenderable(std::unique_ptr<ScreenSpaceRenderabl
     s->initialize();
     s->initializeGL();
 
+    // We should do one update cycle to make sure that we have all the data that we need
+    s->update();
+
     ScreenSpaceRenderable* ssr = s.get();
     global::screenSpaceRootPropertyOwner->addPropertySubOwner(ssr);
     global::screenSpaceRenderables->push_back(std::move(s));

From ee82691bebd3f9010c1977c757e12ecdb9750274 Mon Sep 17 00:00:00 2001
From: Alexander Bock <alexander.bock@liu.se>
Date: Fri, 11 Aug 2023 06:57:43 +0200
Subject: [PATCH 086/701] Transmit the GlobeName through the
 TileProviderByLevel;  Don't explicitly specifiy data and index filenames and
 not use the same name twice

---
 modules/globebrowsing/src/rawtiledatareader.cpp            | 5 +----
 .../globebrowsing/src/tileprovider/tileproviderbylevel.cpp | 7 +++++++
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/modules/globebrowsing/src/rawtiledatareader.cpp b/modules/globebrowsing/src/rawtiledatareader.cpp
index d3f00fe0ea..80a7005c9e 100644
--- a/modules/globebrowsing/src/rawtiledatareader.cpp
+++ b/modules/globebrowsing/src/rawtiledatareader.cpp
@@ -421,7 +421,6 @@ std::optional<std::string> RawTileDataReader::mrfCache() {
         module.mrfCacheLocation(), _cacheProperties.path, datasetIdentifier);
     std::string root = absPath(path).string();
     std::string mrf = root + datasetIdentifier + ".mrf";
-    std::string cache = root + datasetIdentifier + ".mrfcache";
 
     if (!std::filesystem::exists(mrf)) {
         std::error_code ec;
@@ -450,7 +449,7 @@ std::optional<std::string> RawTileDataReader::mrfCache() {
                 return std::nullopt;
             }
 
-            defer{ GDALClose(src); };
+            defer { GDALClose(src); };
 
             char** createOpts = nullptr;
             createOpts = CSLSetNameValue(
@@ -475,8 +474,6 @@ std::optional<std::string> RawTileDataReader::mrfCache() {
                 "blocksize",
                 std::to_string(_cacheProperties.blockSize).c_str()
             );
-            createOpts = CSLSetNameValue(createOpts, "indexname", cache.c_str());
-            createOpts = CSLSetNameValue(createOpts, "DATANAME", cache.c_str());
 
             GDALDataset* dst = static_cast<GDALDataset*>(
                 driver->CreateCopy(mrf.c_str(), src, false, createOpts, nullptr, nullptr)
diff --git a/modules/globebrowsing/src/tileprovider/tileproviderbylevel.cpp b/modules/globebrowsing/src/tileprovider/tileproviderbylevel.cpp
index b86fbca700..0e0f439bfc 100644
--- a/modules/globebrowsing/src/tileprovider/tileproviderbylevel.cpp
+++ b/modules/globebrowsing/src/tileprovider/tileproviderbylevel.cpp
@@ -56,6 +56,13 @@ TileProviderByLevel::TileProviderByLevel(const ghoul::Dictionary& dictionary) {
         ghoul::Dictionary& tileProviderDict = provider.tileProvider;
         tileProviderDict.setValue("LayerGroupID", static_cast<int>(group));
 
+        // Pass down the caching information from the enclosing dictionary
+        if (dictionary.hasValue<std::string>("GlobeName")) {
+            tileProviderDict.setValue(
+                "GlobeName",
+                dictionary.value<std::string>("GlobeName")
+            );
+        }
         layers::Layer::ID typeID = layers::Layer::ID::DefaultTileProvider;
         if (tileProviderDict.hasValue<std::string>("Type")) {
             std::string type = tileProviderDict.value<std::string>("Type");

From 0ae73acc55a8cb1b3c29e2e6dbecc64d42cf4be7 Mon Sep 17 00:00:00 2001
From: Alexander Bock <mail@alexanderbock.eu>
Date: Fri, 11 Aug 2023 07:58:37 +0200
Subject: [PATCH 087/701] Add new Lua functions to get a list of all scene
 graph nodes, scene graph nodes by renderable type (closes #2558), and all
 screenspace renderables

---
 src/scene/scene.cpp     |  3 +++
 src/scene/scene_lua.inl | 47 +++++++++++++++++++++++++++++++++++++++++
 2 files changed, 50 insertions(+)

diff --git a/src/scene/scene.cpp b/src/scene/scene.cpp
index f7c0244f20..17aa498279 100644
--- a/src/scene/scene.cpp
+++ b/src/scene/scene.cpp
@@ -860,6 +860,9 @@ scripting::LuaLibrary Scene::luaLibrary() {
             codegen::lua::RemoveSceneGraphNode,
             codegen::lua::RemoveSceneGraphNodesFromRegex,
             codegen::lua::HasSceneGraphNode,
+            codegen::lua::SceneGraphNodes,
+            codegen::lua::NodeByRenderableType,
+            codegen::lua::ScreenSpaceRenderables,
             codegen::lua::AddInterestingTime,
             codegen::lua::WorldPosition,
             codegen::lua::WorldRotation,
diff --git a/src/scene/scene_lua.inl b/src/scene/scene_lua.inl
index 3fb52a7ab4..7c31c0d997 100644
--- a/src/scene/scene_lua.inl
+++ b/src/scene/scene_lua.inl
@@ -52,6 +52,8 @@
 #include <openspace/properties/vector/vec2property.h>
 #include <openspace/properties/vector/vec3property.h>
 #include <openspace/properties/vector/vec4property.h>
+#include <openspace/rendering/renderable.h>
+#include <openspace/rendering/screenspacerenderable.h>
 #include <algorithm>
 #include <cctype>
 
@@ -877,6 +879,51 @@ namespace {
     return node != nullptr;
 }
 
+// Returns a list of all scene graph nodes in the scene
+[[codegen::luawrap]] std::vector<std::string> sceneGraphNodes() {
+    using namespace openspace;
+    
+    const std::vector<SceneGraphNode*>& nodes =
+        global::renderEngine->scene()->allSceneGraphNodes();
+    std::vector<std::string> res;
+    res.reserve(nodes.size());
+    for (SceneGraphNode* node : nodes) {
+        res.push_back(node->identifier());
+    }
+    return res;
+}
+
+// Returns a list of all scene graph nodes in the scene that have a renderable of the
+// specific type
+[[codegen::luawrap]] std::vector<std::string> nodeByRenderableType(std::string type) {
+    using namespace openspace;
+
+    const std::vector<SceneGraphNode*>& nodes =
+        global::renderEngine->scene()->allSceneGraphNodes();
+    std::vector<std::string> res;
+    for (SceneGraphNode* node : nodes) {
+        Renderable* renderable = node->renderable();
+        if (renderable && renderable->typeAsString() == type) {
+            res.push_back(node->identifier());
+        }
+    }
+    return res;
+}
+
+// Returns a list of all screen-space renderables
+[[codegen::luawrap]] std::vector<std::string> screenSpaceRenderables() {
+    using namespace openspace;
+
+    const std::vector<ScreenSpaceRenderable*>& ssrs = 
+        global::renderEngine->screenSpaceRenderables();
+    std::vector<std::string> res;
+    res.reserve(ssrs.size());
+    for (ScreenSpaceRenderable* ssr : ssrs) {
+        res.push_back(ssr->identifier());
+    }
+    return res;
+}
+
 /**
  * Adds an interesting time to the current scene. The first argument is the name of the
  * time and the second argument is the time itself in the format YYYY-MM-DDThh:mm:ss.uuu

From cb68ab87d94683ea4efa59af15b7318f78f9d3e5 Mon Sep 17 00:00:00 2001
From: Alexander Bock <mail@alexanderbock.eu>
Date: Fri, 11 Aug 2023 09:42:24 +0200
Subject: [PATCH 088/701] Remove unused extra name for the amount of points in
 the eclipse cone and shadow cylinder

---
 modules/space/rendering/renderableeclipsecone.cpp               | 2 +-
 .../rendering/renderableshadowcylinder.cpp                      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/modules/space/rendering/renderableeclipsecone.cpp b/modules/space/rendering/renderableeclipsecone.cpp
index 93887214a3..2610b49fb2 100644
--- a/modules/space/rendering/renderableeclipsecone.cpp
+++ b/modules/space/rendering/renderableeclipsecone.cpp
@@ -135,7 +135,7 @@ namespace {
 
     struct [[codegen::Dictionary(RenderableEclipseCone)]] Parameters {
         // [[codegen::verbatim(NumberPointsInfo.description)]]
-        std::optional<int> numberOfPoints [[codegen::key("AmountOfPoints")]];
+        std::optional<int> numberOfPoints;
 
         // [[codegen::verbatim(ShadowLengthInfo.description)]]
         std::optional<float> shadowLength;
diff --git a/modules/spacecraftinstruments/rendering/renderableshadowcylinder.cpp b/modules/spacecraftinstruments/rendering/renderableshadowcylinder.cpp
index 0e1c4ca3cc..dc18010b34 100644
--- a/modules/spacecraftinstruments/rendering/renderableshadowcylinder.cpp
+++ b/modules/spacecraftinstruments/rendering/renderableshadowcylinder.cpp
@@ -115,7 +115,7 @@ namespace {
 
     struct [[codegen::Dictionary(RenderableShadowCylinder)]] Parameters {
         // [[codegen::verbatim(NumberPointsInfo.description)]]
-        std::optional<int> numberOfPoints [[codegen::key("AmountOfPoints")]];
+        std::optional<int> numberOfPoints;
 
         // [[codegen::verbatim(ShadowLengthInfo.description)]]
         std::optional<float> shadowLength;

From 4ebdd58c97411d147769cca9ca2a9eba8591a308 Mon Sep 17 00:00:00 2001
From: Emma Broman <emma.broman@liu.se>
Date: Fri, 11 Aug 2023 09:45:50 +0200
Subject: [PATCH 089/701] Improve rendering of debug spheres (#2849)

Render in sticker, remove triangle mesh to make it easier to see if one sphere is inside the other, and add a description of which sphere is which
---
 src/scene/scenegraphnode.cpp | 25 ++++++++++---------------
 1 file changed, 10 insertions(+), 15 deletions(-)

diff --git a/src/scene/scenegraphnode.cpp b/src/scene/scenegraphnode.cpp
index 5ec8cb0a4b..8e0970d1cc 100644
--- a/src/scene/scenegraphnode.cpp
+++ b/src/scene/scenegraphnode.cpp
@@ -162,7 +162,9 @@ namespace {
         "ShowDebugSphere",
         "Show Debug Sphere",
         "If enabled the bounding sphere of this scene graph node is rendered as a debug "
-        "method",
+        "method. The interaction sphere is rendered in cyan and the bounding sphere in "
+        "purple. If only one is visible, this may be because the spheres have equal "
+        "size and are overlapping.",
         // @VISIBILITY(3.67)
         openspace::properties::Property::Visibility::AdvancedUser
     };
@@ -770,11 +772,7 @@ void SceneGraphNode::render(const RenderData& data, RendererTasks& tasks) {
         _renderable->renderSecondary(newData, tasks);
     }
 
-    if (!_renderable->matchesRenderBinMask(data.renderBinMask)) {
-        return;
-    }
-
-    {
+    if (_renderable->matchesRenderBinMask(data.renderBinMask)) {
         TracyGpuZone("Render")
 
         _renderable->render(newData, tasks);
@@ -784,13 +782,16 @@ void SceneGraphNode::render(const RenderData& data, RendererTasks& tasks) {
         }
     }
 
-    if (_showDebugSphere) {
+    bool isInStickerBin =
+        data.renderBinMask & static_cast<int>(Renderable::RenderBin::Sticker);
+
+    if (_showDebugSphere && isInStickerBin) {
         if (const double bs = boundingSphere();  bs > 0.0) {
             renderDebugSphere(data.camera, bs, glm::vec4(0.5f, 0.15f, 0.5f, 0.75f));
         }
 
         if (const double is = interactionSphere();  is > 0.0) {
-            renderDebugSphere(data.camera, is, glm::vec4(0.15f, 0.35f, 0.85f, 0.75f));
+            renderDebugSphere(data.camera, is, glm::vec4(0.15f, 0.75f, 0.75f, 0.75f));
         }
     }
 }
@@ -812,20 +813,14 @@ void SceneGraphNode::renderDebugSphere(const Camera& camera, double size, glm::v
     _debugSphereProgram->setUniform("color", color);
 
     glEnable(GL_BLEND);
+    glEnable(GL_LINE_SMOOTH);
     glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
     glDisable(GL_CULL_FACE);
     glEnable(GL_DEPTH_TEST);
 
     glBindVertexArray(rendering::helper::vertexObjects.sphere.vao);
-    glDrawElements(
-        GL_TRIANGLES,
-        rendering::helper::vertexObjects.sphere.nElements,
-        GL_UNSIGNED_SHORT,
-        nullptr
-    );
 
     glLineWidth(2.0);
-    _debugSphereProgram->setUniform("color", glm::vec4(1.f, 1.f, 1.f, 1.f));
     glDrawElements(
         GL_LINES,
         rendering::helper::vertexObjects.sphere.nElements,

From c1aefb33d02bf2761f4100331f1f9314f5d8d174 Mon Sep 17 00:00:00 2001
From: Ylva Selling <ylva.selling@gmail.com>
Date: Fri, 11 Aug 2023 10:53:37 -0400
Subject: [PATCH 090/701] Update
 data/assets/scene/solarsystem/missions/juice/mission.asset

Co-authored-by: Alexander Bock <alexander.bock@liu.se>
---
 data/assets/scene/solarsystem/missions/juice/mission.asset | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/data/assets/scene/solarsystem/missions/juice/mission.asset b/data/assets/scene/solarsystem/missions/juice/mission.asset
index 879872f148..d6eac6bb99 100644
--- a/data/assets/scene/solarsystem/missions/juice/mission.asset
+++ b/data/assets/scene/solarsystem/missions/juice/mission.asset
@@ -1,7 +1,7 @@
 local Mission = {
   Name = "Juice",
   Image = "https://www.esa.int/var/esa/storage/images/science_exploration/space_science/juice/23388092-2-eng-GB/Juice_pillars.jpg",
-  Description = "ESA’s Jupiter Icy Moons Explorer, Juice, will make detailed observations of the giant gas planet and its three large ocean-bearing moons – Ganymede, Callisto and Europa – with a suite of remote sensing, geophysical and in situ instruments. The mission will characterise these moons as both planetary objects and possible habitats, explore Jupiter’s complex environment in depth, and study the wider Jupiter system as an archetype for gas giants across the Universe.",
+  Description = "ESA's Jupiter Icy Moons Explorer, Juice, will make detailed observations of the giant gas planet and its three large ocean-bearing moons - Ganymede, Callisto and Europa - with a suite of remote sensing, geophysical, and in situ instruments. The mission will characterize these moons as both planetary objects and possible habitats, explore Jupiter's complex environment in depth, and study the wider Jupiter system as an archetype for gas giants across the Universe.",
   Milestones = {
     {
       Name = "Earth flyby 1",

From 873cc862c6be6ad738b0057c371672fa349287ed Mon Sep 17 00:00:00 2001
From: Ylva Selling <ylva.selling@gmail.com>
Date: Fri, 11 Aug 2023 10:53:42 -0400
Subject: [PATCH 091/701] Update
 data/assets/scene/solarsystem/missions/juice/mission.asset

Co-authored-by: Alexander Bock <alexander.bock@liu.se>
---
 data/assets/scene/solarsystem/missions/juice/mission.asset | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/data/assets/scene/solarsystem/missions/juice/mission.asset b/data/assets/scene/solarsystem/missions/juice/mission.asset
index d6eac6bb99..d7c507561f 100644
--- a/data/assets/scene/solarsystem/missions/juice/mission.asset
+++ b/data/assets/scene/solarsystem/missions/juice/mission.asset
@@ -38,7 +38,7 @@ local Mission = {
       TimeRange = { Start = "2023 APR 05 16:25:00", End = "2031 JUL 01 00:00:00" },
     },
     {
-      Name = "Jupiter orbit ",
+      Name = "Jupiter orbit",
       TimeRange = { Start = "2031 JUL 01 00:00:00", End = "2033 NOV 01 00:00:00" },
       Phases = {
         {

From 03d79a7b961ea867ed9ae751b7c0b0b1b451c8ad Mon Sep 17 00:00:00 2001
From: Ylva Selling <ylva.selling@gmail.com>
Date: Fri, 11 Aug 2023 10:53:55 -0400
Subject: [PATCH 092/701] Update
 data/assets/scene/solarsystem/missions/juice/mission.asset

Co-authored-by: Alexander Bock <alexander.bock@liu.se>
---
 data/assets/scene/solarsystem/missions/juice/mission.asset | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/data/assets/scene/solarsystem/missions/juice/mission.asset b/data/assets/scene/solarsystem/missions/juice/mission.asset
index d7c507561f..d679bf5b50 100644
--- a/data/assets/scene/solarsystem/missions/juice/mission.asset
+++ b/data/assets/scene/solarsystem/missions/juice/mission.asset
@@ -44,7 +44,7 @@ local Mission = {
         {
           Name = "Jupiter inclined phase - Callisto flybys",
           TimeRange = { Start = "2032 AUG 01 00:00:00", End = "2033 AUG 01 00:00:00" },
-          Description = "ESA’s Jupiter Icy Moons Explorer – Juice – will catch its first glimpse of ancient, cratered Callisto in June 2032, going on to whizz past the moon 21 times before making a final flyby in 2034. During these close encounters, Juice will collect valuable scientific treasure about the moon.",
+          Description = "ESA's Jupiter Icy Moons Explorer - Juice - will catch its first glimpse of ancient, cratered Callisto in June 2032, going on to whizz past the moon 21 times before making a final flyby in 2034. During these close encounters, Juice will collect valuable scientific treasure about the moon.",
 
         }
       }

From 68c587fec84ec4390dbd714ade3eccebedb29dbd Mon Sep 17 00:00:00 2001
From: Ylva Selling <ylva.selling@gmail.com>
Date: Fri, 11 Aug 2023 10:54:01 -0400
Subject: [PATCH 093/701] Update
 data/assets/scene/solarsystem/missions/juice/mission.asset

Co-authored-by: Alexander Bock <alexander.bock@liu.se>
---
 data/assets/scene/solarsystem/missions/juice/mission.asset | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/data/assets/scene/solarsystem/missions/juice/mission.asset b/data/assets/scene/solarsystem/missions/juice/mission.asset
index d679bf5b50..7197776353 100644
--- a/data/assets/scene/solarsystem/missions/juice/mission.asset
+++ b/data/assets/scene/solarsystem/missions/juice/mission.asset
@@ -52,7 +52,7 @@ local Mission = {
     {
       Name = "Ganymede orbit",
       TimeRange = { Start = "2034 NOV 01 00:00:00", End = "2035 SEP 01 00:00:00" },
-      Description = "Monstrous, mysterious Ganymede is the primary target of ESA’s Jupiter Icy Moons Explorer (Juice) and the largest moon in the Solar System – larger even than Pluto and Mercury! Though Juice will make flybys of all three of Jupiter’s largest Galilean moons (Ganymede, Europa and Callisto), Ganymede is the only one that the spacecraft will orbit. In doing so, Juice will become the first spacecraft ever to orbit a moon other than our own, enabling us to see the Jovian world in a whole new light. Ganymede is also the only moon in the Solar System to generate its own magnetic field. Juice will explore various key topics: Ganymede’s puzzling magnetic field, its hidden ocean, its complex core, its ice content and shell, its interactions with its local environment and that of Jupiter, its past and present activity, and whether or not the moon could be – or ever have been – a habitable environment."
+      Description = "Monstrous, mysterious Ganymede is the primary target of ESA's Jupiter Icy Moons Explorer (Juice) and the largest moon in the Solar System - larger even than Pluto and Mercury! Though Juice will make flybys of all three of Jupiter's largest Galilean moons (Ganymede, Europa and Callisto), Ganymede is the only one that the spacecraft will orbit. In doing so, Juice will become the first spacecraft ever to orbit a moon other than our own, enabling us to see the Jovian world in a whole new light. Ganymede is also the only moon in the Solar System to generate its own magnetic field. Juice will explore various key topics: Ganymede's puzzling magnetic field, its hidden ocean, its complex core, its ice content and shell, its interactions with its local environment and that of Jupiter, its past and present activity, and whether or not the moon could be - or ever have been - a habitable environment."
     }
   }
 }

From e7cad060c236ee8987b47b554d25ad2a515a7c1a Mon Sep 17 00:00:00 2001
From: Alexander Bock <mail@alexanderbock.eu>
Date: Fri, 11 Aug 2023 20:58:41 +0200
Subject: [PATCH 094/701] Adapt to coding style

---
 include/openspace/rendering/screenspacerenderable.h      | 2 +-
 .../atmosphere/rendering/atmospheredeferredcaster.cpp    | 9 ++++++---
 modules/atmosphere/rendering/renderableatmosphere.cpp    | 9 +++++----
 modules/base/basemodule.cpp                              | 4 +++-
 modules/base/rendering/renderablesphereimagelocal.cpp    | 3 ++-
 modules/base/rendering/renderablesphereimageonline.cpp   | 3 ++-
 .../src/tileprovider/tileindextileprovider.cpp           | 2 +-
 modules/space/rendering/renderableeclipsecone.cpp        | 4 ++--
 modules/space/rendering/renderableeclipsecone.h          | 6 +++---
 src/navigation/navigationhandler_lua.inl                 | 4 +++-
 src/scene/scene_lua.inl                                  | 4 ++--
 src/util/time_lua.inl                                    | 2 +-
 12 files changed, 31 insertions(+), 21 deletions(-)

diff --git a/include/openspace/rendering/screenspacerenderable.h b/include/openspace/rendering/screenspacerenderable.h
index 886e16c109..6ef0225c8a 100644
--- a/include/openspace/rendering/screenspacerenderable.h
+++ b/include/openspace/rendering/screenspacerenderable.h
@@ -140,7 +140,7 @@ protected:
     properties::TriggerProperty _delete;
 
     glm::ivec2 _objectSize = glm::ivec2(0);
-    UniformCache(color, opacity, mvp, texture, backgroundColor, gamma, 
+    UniformCache(color, opacity, mvp, texture, backgroundColor, gamma,
         borderColor, borderWidth) _uniformCache;
     std::unique_ptr<ghoul::opengl::ProgramObject> _shader;
 };
diff --git a/modules/atmosphere/rendering/atmospheredeferredcaster.cpp b/modules/atmosphere/rendering/atmospheredeferredcaster.cpp
index 5223fba086..9724972f3e 100644
--- a/modules/atmosphere/rendering/atmospheredeferredcaster.cpp
+++ b/modules/atmosphere/rendering/atmospheredeferredcaster.cpp
@@ -271,7 +271,7 @@ void AtmosphereDeferredcaster::deinitialize() {
 void AtmosphereDeferredcaster::update(const UpdateData&) {}
 
 float AtmosphereDeferredcaster::eclipseShadow(glm::dvec3 position) {
-    // This code is copied from the atmosphere deferred fragment shader 
+    // This code is copied from the atmosphere deferred fragment shader
     // It is used to calculate the eclipse shadow
     if (_shadowDataArrayCache.empty() || !_shadowDataArrayCache.front().isShadowing) {
         return 1.f;
@@ -280,7 +280,8 @@ float AtmosphereDeferredcaster::eclipseShadow(glm::dvec3 position) {
     const ShadowRenderingStruct& shadow = _shadowDataArrayCache.front();
     const glm::dvec3 positionToCaster = shadow.casterPositionVec - position;
     const glm::dvec3 sourceToCaster = shadow.sourceCasterVec; // Normalized
-    const glm::dvec3 casterShadow = dot(positionToCaster, sourceToCaster) * sourceToCaster;
+    const glm::dvec3 casterShadow =
+        dot(positionToCaster, sourceToCaster) * sourceToCaster;
     const glm::dvec3 positionToShadow = positionToCaster - casterShadow;
 
     float distanceToShadow = static_cast<float>(length(positionToShadow));
@@ -469,7 +470,9 @@ void AtmosphereDeferredcaster::preRaycast(const RenderData& data, const Deferred
                 shadow.radiusCaster = actualCasterRadius;
                 shadow.sourceCasterVec = glm::normalize(sourceCasterVec);
                 shadow.penumbra = xpTest;
-                shadow.umbra = shadow.radiusCaster * scLength / (shadow.radiusSource - shadow.radiusCaster);
+                shadow.umbra =
+                    shadow.radiusCaster * scLength /
+                    (shadow.radiusSource - shadow.radiusCaster);
                 shadow.casterPositionVec = casterPos;
             }
             _shadowDataArrayCache.push_back(shadow);
diff --git a/modules/atmosphere/rendering/renderableatmosphere.cpp b/modules/atmosphere/rendering/renderableatmosphere.cpp
index a49601e4f8..cb3b74c070 100644
--- a/modules/atmosphere/rendering/renderableatmosphere.cpp
+++ b/modules/atmosphere/rendering/renderableatmosphere.cpp
@@ -519,11 +519,12 @@ void RenderableAtmosphere::updateAtmosphereParameters() {
 void RenderableAtmosphere::setDimmingCoefficient(const glm::dmat4& modelTransform) {
     // Calculate if the camera is in the atmosphere and if it is in the sunny region
     const glm::dvec3 cameraPos = global::navigationHandler->camera()->positionVec3();
-    // TODO: change the assumption that the Sun is placed in the origin 
-    const glm::dvec3 planetPos = glm::dvec3(modelTransform * glm::dvec4(0.0, 0.0, 0.0, 1.0));
+    // TODO: change the assumption that the Sun is placed in the origin
+    const glm::dvec3 planetPos =
+        glm::dvec3(modelTransform * glm::dvec4(0.0, 0.0, 0.0, 1.0));
     const glm::dvec3 normalUnderCamera = glm::normalize(cameraPos - planetPos);
     const glm::dvec3 vecToSun = glm::normalize(-planetPos);
-    
+
     float cameraDistance = static_cast<float>(glm::distance(planetPos, cameraPos));
     float cameraSunAngle = static_cast<float>(
         glm::degrees(glm::acos(glm::dot(vecToSun, normalUnderCamera))
@@ -536,7 +537,7 @@ void RenderableAtmosphere::setDimmingCoefficient(const glm::dmat4& modelTransfor
     float atmosphereEdge = KM_TO_M * (_planetRadius + _atmosphereHeight);
     bool cameraIsInAtmosphere = cameraDistance < atmosphereEdge;
 
-    // Don't fade if camera is not in the sunny part of an atmosphere 
+    // Don't fade if camera is not in the sunny part of an atmosphere
     if (!cameraIsInAtmosphere || !cameraIsInSun) {
         return;
     }
diff --git a/modules/base/basemodule.cpp b/modules/base/basemodule.cpp
index 0ab2488a03..8b8bbf2bc5 100644
--- a/modules/base/basemodule.cpp
+++ b/modules/base/basemodule.cpp
@@ -148,7 +148,9 @@ void BaseModule::internalInitialize(const ghoul::Dictionary&) {
     );
     fRenderable->registerClass<RenderableRadialGrid>("RenderableRadialGrid");
     fRenderable->registerClass<RenderableSphereImageLocal>("RenderableSphereImageLocal");
-    fRenderable->registerClass<RenderableSphereImageOnline>("RenderableSphereImageOnline");
+    fRenderable->registerClass<RenderableSphereImageOnline>(
+        "RenderableSphereImageOnline"
+    );
     fRenderable->registerClass<RenderableSphericalGrid>("RenderableSphericalGrid");
     fRenderable->registerClass<RenderableTrailOrbit>("RenderableTrailOrbit");
     fRenderable->registerClass<RenderableTrailTrajectory>("RenderableTrailTrajectory");
diff --git a/modules/base/rendering/renderablesphereimagelocal.cpp b/modules/base/rendering/renderablesphereimagelocal.cpp
index 13b8f64ed9..92810ecc80 100644
--- a/modules/base/rendering/renderablesphereimagelocal.cpp
+++ b/modules/base/rendering/renderablesphereimagelocal.cpp
@@ -61,7 +61,8 @@ documentation::Documentation RenderableSphereImageLocal::Documentation() {
     return codegen::doc<Parameters>("base_renderable_sphere_image_local");
 }
 
-RenderableSphereImageLocal::RenderableSphereImageLocal(const ghoul::Dictionary& dictionary)
+RenderableSphereImageLocal::RenderableSphereImageLocal(
+                                                      const ghoul::Dictionary& dictionary)
     : RenderableSphere(dictionary)
     , _texturePath(TextureInfo)
 {
diff --git a/modules/base/rendering/renderablesphereimageonline.cpp b/modules/base/rendering/renderablesphereimageonline.cpp
index 1cc0e04d86..d21e9d4bea 100644
--- a/modules/base/rendering/renderablesphereimageonline.cpp
+++ b/modules/base/rendering/renderablesphereimageonline.cpp
@@ -56,7 +56,8 @@ documentation::Documentation RenderableSphereImageOnline::Documentation() {
     return codegen::doc<Parameters>("base_renderable_sphere_image_online");
 }
 
-RenderableSphereImageOnline::RenderableSphereImageOnline(const ghoul::Dictionary& dictionary)
+RenderableSphereImageOnline::RenderableSphereImageOnline(
+                                                      const ghoul::Dictionary& dictionary)
     : RenderableSphere(dictionary)
     , _textureUrl(TextureInfo)
 {
diff --git a/modules/globebrowsing/src/tileprovider/tileindextileprovider.cpp b/modules/globebrowsing/src/tileprovider/tileindextileprovider.cpp
index 1e2e38a142..ad4de6f268 100644
--- a/modules/globebrowsing/src/tileprovider/tileindextileprovider.cpp
+++ b/modules/globebrowsing/src/tileprovider/tileindextileprovider.cpp
@@ -42,7 +42,7 @@ namespace {
 } // namespace
 
 namespace openspace::globebrowsing {
-    
+
 documentation::Documentation TileIndexTileProvider::Documentation() {
     return codegen::doc<Parameters>("globebrowsing_tileindextileprovider");
 }
diff --git a/modules/space/rendering/renderableeclipsecone.cpp b/modules/space/rendering/renderableeclipsecone.cpp
index 2610b49fb2..05b528c4b8 100644
--- a/modules/space/rendering/renderableeclipsecone.cpp
+++ b/modules/space/rendering/renderableeclipsecone.cpp
@@ -446,7 +446,7 @@ void RenderableEclipseCone::createCone(double et) {
             lightSourceToShadower,
             distance * static_cast<double>(_shadowLength)
         );
-        
+
         // We need to duplicate the first two vertices to close the cylinder at the seam
         penumbralVertices.push_back(penumbralVertices[0]);
         penumbralVertices.push_back(penumbralVertices[1]);
@@ -477,7 +477,7 @@ void RenderableEclipseCone::createCone(double et) {
         umbralVertices.push_back(umbralVertices[1]);
     }
 
-    
+
     // 6. Combine vertices
     std::vector<VBOLayout> vertices;
     vertices.reserve(umbralVertices.size() + penumbralVertices.size());
diff --git a/modules/space/rendering/renderableeclipsecone.h b/modules/space/rendering/renderableeclipsecone.h
index 0d7d6253fe..bee608a571 100644
--- a/modules/space/rendering/renderableeclipsecone.h
+++ b/modules/space/rendering/renderableeclipsecone.h
@@ -22,8 +22,8 @@
  * OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                                         *
  ****************************************************************************************/
 
-#ifndef __OPENSPACE_MODULE_SPACECRAFTINSTRUMENTS___RENDERABLEECLIPSECONE___H__
-#define __OPENSPACE_MODULE_SPACECRAFTINSTRUMENTS___RENDERABLEECLIPSECONE___H__
+#ifndef __OPENSPACE_MODULE_SPACE___RENDERABLEECLIPSECONE___H__
+#define __OPENSPACE_MODULE_SPACE___RENDERABLEECLIPSECONE___H__
 
 #include <openspace/rendering/renderable.h>
 
@@ -84,4 +84,4 @@ private:
 
 } // namespace openspace
 
-#endif // __OPENSPACE_MODULE_SPACECRAFTINSTRUMENTS___RENDERABLEECLIPSECONE___H__
+#endif // __OPENSPACE_MODULE_SPACE___RENDERABLEECLIPSECONE___H__
diff --git a/src/navigation/navigationhandler_lua.inl b/src/navigation/navigationhandler_lua.inl
index b43f3d3582..983c51c089 100644
--- a/src/navigation/navigationhandler_lua.inl
+++ b/src/navigation/navigationhandler_lua.inl
@@ -250,7 +250,9 @@ namespace {
  * bool.
  */
 [[codegen::luawrap]]
-std::tuple<std::string, bool, std::string, bool, bool, double, std::string, float, float, bool>
+std::tuple<
+    std::string, bool, std::string, bool, bool, double, std::string, float, float, bool
+>
 joystickAxis(std::string joystickName, int axis)
 {
     using namespace openspace;
diff --git a/src/scene/scene_lua.inl b/src/scene/scene_lua.inl
index 7c31c0d997..f5728f5ed5 100644
--- a/src/scene/scene_lua.inl
+++ b/src/scene/scene_lua.inl
@@ -882,7 +882,7 @@ namespace {
 // Returns a list of all scene graph nodes in the scene
 [[codegen::luawrap]] std::vector<std::string> sceneGraphNodes() {
     using namespace openspace;
-    
+
     const std::vector<SceneGraphNode*>& nodes =
         global::renderEngine->scene()->allSceneGraphNodes();
     std::vector<std::string> res;
@@ -914,7 +914,7 @@ namespace {
 [[codegen::luawrap]] std::vector<std::string> screenSpaceRenderables() {
     using namespace openspace;
 
-    const std::vector<ScreenSpaceRenderable*>& ssrs = 
+    const std::vector<ScreenSpaceRenderable*>& ssrs =
         global::renderEngine->screenSpaceRenderables();
     std::vector<std::string> res;
     res.reserve(ssrs.size());
diff --git a/src/util/time_lua.inl b/src/util/time_lua.inl
index e32ff13bdf..ceaaaab423 100644
--- a/src/util/time_lua.inl
+++ b/src/util/time_lua.inl
@@ -322,7 +322,7 @@ namespace {
     else {
         b = openspace::Time(std::get<double>(base)).ISO8601();
     }
-    
+
     std::string c;
     if (std::holds_alternative<std::string>(change)) {
         c = std::get<std::string>(change);

From cbe215fc5b30ffa495c210f62e441cb4f33b84c2 Mon Sep 17 00:00:00 2001
From: Gene Payne <payne.gene@gmail.com>
Date: Fri, 11 Aug 2023 16:16:19 -0600
Subject: [PATCH 095/701] Code review changes

---
 .../launcher/include/profile/assetsdialog.h   |  7 +++--
 .../ext/launcher/src/profile/assetsdialog.cpp | 29 ++++++++++---------
 2 files changed, 20 insertions(+), 16 deletions(-)

diff --git a/apps/OpenSpace/ext/launcher/include/profile/assetsdialog.h b/apps/OpenSpace/ext/launcher/include/profile/assetsdialog.h
index a91f959ea5..0ca2607aa5 100644
--- a/apps/OpenSpace/ext/launcher/include/profile/assetsdialog.h
+++ b/apps/OpenSpace/ext/launcher/include/profile/assetsdialog.h
@@ -26,8 +26,8 @@
 #define __OPENSPACE_UI_LAUNCHER___ASSETSDIALOG___H__
 
 #include <QDialog>
-#include <QSortFilterProxyModel>
 #include <QRegularExpression>
+#include <QSortFilterProxyModel>
 #include "assettreemodel.h"
 
 class QTextEdit;
@@ -41,7 +41,7 @@ public:
      *
      * \param parent The QObject* object that is the Qt parent of this object
      */
-    SearchProxyModel(QObject* parent = nullptr) : QSortFilterProxyModel(parent) {}
+    SearchProxyModel(QObject* parent = nullptr);
 
 public slots:
     /**
@@ -55,8 +55,9 @@ protected:
     bool filterAcceptsRow(int sourceRow, const QModelIndex& sourceParent) const override;
 
 private:
-    QRegularExpression* _regExPattern = nullptr;
     bool acceptIndex(const QModelIndex& idx) const;
+
+    QRegularExpression* _regExPattern = nullptr;
 };
 
 class AssetsDialog final : public QDialog {
diff --git a/apps/OpenSpace/ext/launcher/src/profile/assetsdialog.cpp b/apps/OpenSpace/ext/launcher/src/profile/assetsdialog.cpp
index f464703576..00dff88e11 100644
--- a/apps/OpenSpace/ext/launcher/src/profile/assetsdialog.cpp
+++ b/apps/OpenSpace/ext/launcher/src/profile/assetsdialog.cpp
@@ -64,7 +64,7 @@ namespace {
     {
         int startIndex = 0;
         std::string token = "${USER_ASSETS}/";
-        if (path.find(token) == 0) {
+        if (path.starts_with(token)) {
             startIndex = static_cast<int>(token.length());
         }
         const size_t slash = path.find_first_of('/', startIndex);
@@ -301,6 +301,10 @@ void AssetsDialog::searchTextChanged(const QString& text) {
     }
 }
 
+SearchProxyModel::SearchProxyModel(QObject* parent)
+    : QSortFilterProxyModel(parent)
+{}
+
 void SearchProxyModel::setFilterRegularExpression(const QString& pattern) {
     _regExPattern = new QRegularExpression(
         pattern,
@@ -317,20 +321,19 @@ bool SearchProxyModel::filterAcceptsRow(int sourceRow,
 }
 
 bool SearchProxyModel::acceptIndex(const QModelIndex& idx) const {
-    if (idx.isValid()) {
-        QString text = idx.data(Qt::DisplayRole).toString();
-        if (!_regExPattern) {
-            return false;
-        }
-        QRegularExpressionMatchIterator matchIterator = _regExPattern->globalMatch(text);
-        if (matchIterator.hasNext()) {
+    if (!idx.isValid() || !_regExPattern) {
+        return false;
+    }
+    QString text = idx.data(Qt::DisplayRole).toString();
+    QRegularExpressionMatchIterator matchIterator = _regExPattern->globalMatch(text);
+    if (matchIterator.hasNext()) {
+        return true;
+    }
+    for (int row = 0; row < idx.model()->rowCount(idx); ++row) {
+        if (acceptIndex(idx.model()->index(row, 0, idx))) {
             return true;
         }
-        for (int row = 0; row < idx.model()->rowCount(idx); ++row) {
-            if (acceptIndex(idx.model()->index(row, 0, idx))) {
-                return true;
-            }
-        }
     }
+
     return false;
 }

From f179f20c9611f80d9dbb5b0de102affedca5754b Mon Sep 17 00:00:00 2001
From: Joakim Kilby <jockekilby@gmail.com>
Date: Mon, 14 Aug 2023 13:38:20 +0200
Subject: [PATCH 096/701] Remove tile-padding to reduce stair-stepping issues
 (#2842)

* account for availability of next level in desired level

solves #2834

* remove tile-padding option & functionality

* remove (no longer needed) recursive read function

since we no longer padd tiles we cannot sample outside of a read region
anymore.

* change default tilesize for heightlayers to avoid discontinuities

* make frustum culling control a debug property

* Small style guide fix

* clarify if-statement with comment

* add variable for default height-tile resolution, update comment

---------

Co-authored-by: Alexander Bock <mail@alexanderbock.eu>
---
 .../shaders/texturetilemapping.glsl           |  45 ++----
 modules/globebrowsing/shaders/tile.glsl       |   6 -
 modules/globebrowsing/src/gpulayergroup.cpp   |  14 --
 modules/globebrowsing/src/gpulayergroup.h     |   3 +-
 modules/globebrowsing/src/layer.cpp           |  25 +--
 modules/globebrowsing/src/layer.h             |   5 -
 .../src/memoryawaretilecache.cpp              |   2 +-
 .../globebrowsing/src/rawtiledatareader.cpp   | 149 ++----------------
 modules/globebrowsing/src/rawtiledatareader.h |   7 -
 modules/globebrowsing/src/renderableglobe.cpp |  23 ++-
 modules/globebrowsing/src/renderableglobe.h   |   1 +
 .../src/tileprovider/defaulttileprovider.cpp  |   9 +-
 .../src/tileprovider/defaulttileprovider.h    |   1 -
 .../src/tileprovider/temporaltileprovider.cpp |   1 -
 .../src/tileprovider/tileprovider.cpp         |   1 -
 .../globebrowsing/src/tiletextureinitdata.cpp |  25 +--
 .../globebrowsing/src/tiletextureinitdata.h   |   8 +-
 17 files changed, 60 insertions(+), 265 deletions(-)

diff --git a/modules/globebrowsing/shaders/texturetilemapping.glsl b/modules/globebrowsing/shaders/texturetilemapping.glsl
index d7e39c3431..cb59d52a45 100644
--- a/modules/globebrowsing/shaders/texturetilemapping.glsl
+++ b/modules/globebrowsing/shaders/texturetilemapping.glsl
@@ -108,30 +108,23 @@ vec4 performLayerSettings(vec4 value, LayerSettings settings) {
   return vec4(v, value.a * settings.opacity);
 }
 
-vec2 tileUVToTextureSamplePosition(ChunkTile chunkTile, vec2 tileUV, PixelPadding padding)
+vec2 tileUVToTextureSamplePosition(ChunkTile chunkTile, vec2 tileUV)
 {
-  vec2 uv = chunkTile.uvTransform.uvOffset + chunkTile.uvTransform.uvScale * tileUV;
-
-  // compensateSourceTextureSampling
-  ivec2 resolution = textureSize(chunkTile.textureSampler, 0);
-  vec2 sourceSize = vec2(resolution) + padding.sizeDifference;
-  vec2 currentSize = vec2(resolution);
-  vec2 sourceToCurrentSize = currentSize / sourceSize;
-  return sourceToCurrentSize * (uv - padding.startOffset / sourceSize);
+  return chunkTile.uvTransform.uvOffset + chunkTile.uvTransform.uvScale * tileUV;
 }
 
-vec4 getTexVal(ChunkTilePile chunkTilePile, vec3 w, vec2 uv, PixelPadding padding) {
+vec4 getTexVal(ChunkTilePile chunkTilePile, vec3 w, vec2 uv) {
   vec4 v1 = texture(
     chunkTilePile.chunkTile0.textureSampler,
-    tileUVToTextureSamplePosition(chunkTilePile.chunkTile0, uv, padding)
+    tileUVToTextureSamplePosition(chunkTilePile.chunkTile0, uv)
   );
   vec4 v2 = texture(
     chunkTilePile.chunkTile1.textureSampler,
-    tileUVToTextureSamplePosition(chunkTilePile.chunkTile1, uv, padding)
+    tileUVToTextureSamplePosition(chunkTilePile.chunkTile1, uv)
   );
   vec4 v3 = texture(
     chunkTilePile.chunkTile2.textureSampler,
-    tileUVToTextureSamplePosition(chunkTilePile.chunkTile2, uv, padding)
+    tileUVToTextureSamplePosition(chunkTilePile.chunkTile2, uv)
   );
 
   return w.x * v1 + w.y * v2 + w.z * v3;
@@ -147,27 +140,27 @@ vec4 getSample#{layerGroup}#{i}(vec2 uv, vec3 levelWeights,
 
     // All tile layers are the same. Sample from texture
 #if (#{#{layerGroup}#{i}LayerType} == 0) // DefaultTileProvider
-  c = getTexVal(#{layerGroup}[#{i}].pile, levelWeights, uv, #{layerGroup}[#{i}].padding);
+  c = getTexVal(#{layerGroup}[#{i}].pile, levelWeights, uv);
 #elif (#{#{layerGroup}#{i}LayerType} == 1) // SingleImageProvider
-  c = getTexVal(#{layerGroup}[#{i}].pile, levelWeights, uv, #{layerGroup}[#{i}].padding);
+  c = getTexVal(#{layerGroup}[#{i}].pile, levelWeights, uv);
 #elif (#{#{layerGroup}#{i}LayerType} == 2) // ImageSequenceTileProvider
-  c = getTexVal(#{layerGroup}[#{i}].pile, levelWeights, uv, #{layerGroup}[#{i}].padding);
+  c = getTexVal(#{layerGroup}[#{i}].pile, levelWeights, uv);
 #elif (#{#{layerGroup}#{i}LayerType} == 3) // SizeReferenceTileProvider
-  c = getTexVal(#{layerGroup}[#{i}].pile, levelWeights, uv, #{layerGroup}[#{i}].padding);
+  c = getTexVal(#{layerGroup}[#{i}].pile, levelWeights, uv);
 #elif (#{#{layerGroup}#{i}LayerType} == 4) // TemporalTileProvider
-  c = getTexVal(#{layerGroup}[#{i}].pile, levelWeights, uv, #{layerGroup}[#{i}].padding);
+  c = getTexVal(#{layerGroup}[#{i}].pile, levelWeights, uv);
 #elif (#{#{layerGroup}#{i}LayerType} == 5) // TileIndexTileProvider
-  c = getTexVal(#{layerGroup}[#{i}].pile, levelWeights, uv, #{layerGroup}[#{i}].padding);
+  c = getTexVal(#{layerGroup}[#{i}].pile, levelWeights, uv);
 #elif (#{#{layerGroup}#{i}LayerType} == 6) // TileProviderByIndex
-  c = getTexVal(#{layerGroup}[#{i}].pile, levelWeights, uv, #{layerGroup}[#{i}].padding);
+  c = getTexVal(#{layerGroup}[#{i}].pile, levelWeights, uv);
 #elif (#{#{layerGroup}#{i}LayerType} == 7) // TileProviderByLevel
-  c = getTexVal(#{layerGroup}[#{i}].pile, levelWeights, uv, #{layerGroup}[#{i}].padding);
+  c = getTexVal(#{layerGroup}[#{i}].pile, levelWeights, uv);
 #elif (#{#{layerGroup}#{i}LayerType} == 8) // SolidColor
   c.rgb = #{layerGroup}[#{i}].color;
 #elif (#{#{layerGroup}#{i}LayerType} == 9) // SpoutImageProvider
-  c = getTexVal(#{layerGroup}[#{i}].pile, levelWeights, uv, #{layerGroup}[#{i}].padding);
+  c = getTexVal(#{layerGroup}[#{i}].pile, levelWeights, uv);
 #elif (#{#{layerGroup}#{i}LayerType} == 10) // VideoTileProvider
-  c = getTexVal(#{layerGroup}[#{i}].pile, levelWeights, uv, #{layerGroup}[#{i}].padding);
+  c = getTexVal(#{layerGroup}[#{i}].pile, levelWeights, uv);
 #endif
 
   return c;
@@ -332,12 +325,8 @@ vec4 calculateDebugColor(vec2 uv, vec4 fragPos, vec2 vertexResolution) {
 }
 
 float tileResolution(vec2 tileUV, ChunkTile chunkTile) {
-  PixelPadding padding;
-  padding.startOffset = ivec2(0);
-  padding.sizeDifference = ivec2(0);
-
   vec2 heightResolution = textureSize(chunkTile.textureSampler, 0);
-  vec2 uv = tileUVToTextureSamplePosition(chunkTile, tileUV, padding);
+  vec2 uv = tileUVToTextureSamplePosition(chunkTile, tileUV);
   return gridDots(uv, heightResolution);
 }
 
diff --git a/modules/globebrowsing/shaders/tile.glsl b/modules/globebrowsing/shaders/tile.glsl
index b525bc3852..37872327bf 100644
--- a/modules/globebrowsing/shaders/tile.glsl
+++ b/modules/globebrowsing/shaders/tile.glsl
@@ -40,11 +40,6 @@ struct ChunkTile {
   TileUvTransform uvTransform;
 };
 
-struct PixelPadding {
-  ivec2 startOffset;
-  ivec2 sizeDifference;
-};
-
 struct ChunkTilePile {
   ChunkTile chunkTile0;
   ChunkTile chunkTile1;
@@ -69,7 +64,6 @@ struct Layer {
   TileDepthTransform depthTransform;
   LayerSettings settings;
   LayerAdjustment adjustment;
-  PixelPadding padding;
 
   // Other layer type properties stuff
   vec3 color;
diff --git a/modules/globebrowsing/src/gpulayergroup.cpp b/modules/globebrowsing/src/gpulayergroup.cpp
index adc2f7b6ea..8aa8a347b1 100644
--- a/modules/globebrowsing/src/gpulayergroup.cpp
+++ b/modules/globebrowsing/src/gpulayergroup.cpp
@@ -94,12 +94,6 @@ void GPULayerGroup::setValue(ghoul::opengl::ProgramObject& program,
                     program.setUniform(t.uniformCache.uvOffset, ct.uvTransform.uvOffset);
                     program.setUniform(t.uniformCache.uvScale, ct.uvTransform.uvScale);
                 }
-
-                program.setUniform(galuc.paddingStartOffset, al.tilePixelStartOffset());
-                program.setUniform(
-                    galuc.paddingSizeDifference,
-                    al.tilePixelSizeDifference()
-                );
                 break;
             }
             case layers::Layer::ID::SolidColor:
@@ -166,14 +160,6 @@ void GPULayerGroup::bind(ghoul::opengl::ProgramObject& p, const LayerGroup& laye
                     tuc.uvOffset = p.uniformLocation(n + "uvTransform.uvOffset");
                     tuc.uvScale = p.uniformLocation(n + "uvTransform.uvScale");
                 }
-
-                galuc.paddingStartOffset = p.uniformLocation(
-                    name + "padding.startOffset"
-                );
-                galuc.paddingSizeDifference = p.uniformLocation(
-                    name + "padding.sizeDifference"
-                );
-
                 break;
             }
             case layers::Layer::ID::SolidColor:
diff --git a/modules/globebrowsing/src/gpulayergroup.h b/modules/globebrowsing/src/gpulayergroup.h
index 7ff8197b22..dd9f4697a7 100644
--- a/modules/globebrowsing/src/gpulayergroup.h
+++ b/modules/globebrowsing/src/gpulayergroup.h
@@ -78,8 +78,7 @@ private:
         std::vector<GPUChunkTile> gpuChunkTiles;
 
         UniformCache(opacity, gamma, multiplier, offset, valueBlending, chromaKeyColor,
-            chromaKeyTolerance, paddingStartOffset, paddingSizeDifference, color,
-            depthOffset, depthScale) uniformCache;
+            chromaKeyTolerance, color, depthOffset, depthScale) uniformCache;
 
         bool isHeightLayer = false;
     };
diff --git a/modules/globebrowsing/src/layer.cpp b/modules/globebrowsing/src/layer.cpp
index f9da70aa1a..867bfcbc94 100644
--- a/modules/globebrowsing/src/layer.cpp
+++ b/modules/globebrowsing/src/layer.cpp
@@ -132,10 +132,6 @@ namespace {
         // the layer is disabled
         std::optional<bool> enabled;
 
-        // Determines whether the downloaded tiles should have a padding added to the
-        // borders
-        std::optional<bool> padTiles;
-
         // The opacity value of the layer
         std::optional<float> opacity [[codegen::inrange(0.0, 1.0)]];
 
@@ -233,11 +229,7 @@ Layer::Layer(layers::Group::ID id, const ghoul::Dictionary& layerDict, LayerGrou
         addProperty(_guiDescription);
     }
 
-    const bool padTiles = p.padTiles.value_or(true);
-
-    TileTextureInitData initData = tileTextureInitData(_layerGroupId, padTiles);
-    _padTilePixelStartOffset = initData.tilePixelStartOffset;
-    _padTilePixelSizeDifference = initData.tilePixelSizeDifference;
+    TileTextureInitData initData = tileTextureInitData(_layerGroupId);
 
     _opacity = p.opacity.value_or(_opacity);
     addProperty(Fadeable::_opacity);
@@ -472,25 +464,12 @@ void Layer::update() {
     }
 }
 
-glm::ivec2 Layer::tilePixelStartOffset() const {
-    return _padTilePixelStartOffset;
-}
-
-glm::ivec2 Layer::tilePixelSizeDifference() const {
-    return _padTilePixelSizeDifference;
-}
-
 glm::vec2 Layer::tileUvToTextureSamplePosition(const TileUvTransform& uvTransform,
                                                const glm::vec2& tileUV,
                                                const glm::uvec2& resolution)
 {
     glm::vec2 uv = uvTransform.uvOffset + uvTransform.uvScale * tileUV;
-
-    const glm::vec2 sourceSize = glm::vec2(resolution) +
-                                 glm::vec2(_padTilePixelSizeDifference);
-    const glm::vec2 currentSize = glm::vec2(resolution);
-    const glm::vec2 sourceToCurrentSize = currentSize / sourceSize;
-    return sourceToCurrentSize * (uv - glm::vec2(_padTilePixelStartOffset) / sourceSize);
+    return uv;
 }
 
 void Layer::initializeBasedOnType(layers::Layer::ID id, ghoul::Dictionary initDict) {
diff --git a/modules/globebrowsing/src/layer.h b/modules/globebrowsing/src/layer.h
index a8e732fcd5..e0679deda0 100644
--- a/modules/globebrowsing/src/layer.h
+++ b/modules/globebrowsing/src/layer.h
@@ -68,8 +68,6 @@ public:
 
     void update();
 
-    glm::ivec2 tilePixelStartOffset() const;
-    glm::ivec2 tilePixelSizeDifference() const;
     glm::vec2 tileUvToTextureSamplePosition(const TileUvTransform& uvTransform,
         const glm::vec2& tileUV, const glm::uvec2& resolution);
 
@@ -94,9 +92,6 @@ private:
     LayerRenderSettings _renderSettings;
     LayerAdjustment _layerAdjustment;
 
-    glm::ivec2 _padTilePixelStartOffset = glm::ivec2(0);
-    glm::ivec2 _padTilePixelSizeDifference = glm::ivec2(0);
-
     const layers::Group::ID _layerGroupId;
 
     std::function<void(Layer*)> _onChangeCallback;
diff --git a/modules/globebrowsing/src/memoryawaretilecache.cpp b/modules/globebrowsing/src/memoryawaretilecache.cpp
index 653ad00577..60d878a013 100644
--- a/modules/globebrowsing/src/memoryawaretilecache.cpp
+++ b/modules/globebrowsing/src/memoryawaretilecache.cpp
@@ -321,7 +321,7 @@ void MemoryAwareTileCache::createDefaultTextureContainers() {
     ZoneScoped;
 
     for (const layers::Group& gi : layers::Groups) {
-        TileTextureInitData initData = tileTextureInitData(gi.id, true);
+        TileTextureInitData initData = tileTextureInitData(gi.id);
         assureTextureContainerExists(initData);
     }
 }
diff --git a/modules/globebrowsing/src/rawtiledatareader.cpp b/modules/globebrowsing/src/rawtiledatareader.cpp
index 80a7005c9e..c0678b88e1 100644
--- a/modules/globebrowsing/src/rawtiledatareader.cpp
+++ b/modules/globebrowsing/src/rawtiledatareader.cpp
@@ -674,7 +674,7 @@ void RawTileDataReader::readImageData(IODescription& io, RawTile::ReadError& wor
     switch (_initData.ghoulTextureFormat) {
         case ghoul::opengl::Texture::Format::Red: {
             char* dest = imageDataDest;
-            const RawTile::ReadError err = repeatedRasterRead(1, io, dest);
+            const RawTile::ReadError err = rasterRead(1, io, dest);
             worstError = std::max(worstError, err);
             break;
         }
@@ -686,7 +686,7 @@ void RawTileDataReader::readImageData(IODescription& io, RawTile::ReadError& wor
                     // The final destination pointer is offsetted by one datum byte size
                     // for every raster (or data channel, i.e. R in RGB)
                     char* dest = imageDataDest + (i * _initData.bytesPerDatum);
-                    const RawTile::ReadError err = repeatedRasterRead(1, io, dest);
+                    const RawTile::ReadError err = rasterRead(1, io, dest);
                     worstError = std::max(worstError, err);
                 }
             }
@@ -695,12 +695,12 @@ void RawTileDataReader::readImageData(IODescription& io, RawTile::ReadError& wor
                     // The final destination pointer is offsetted by one datum byte size
                     // for every raster (or data channel, i.e. R in RGB)
                     char* dest = imageDataDest + (i * _initData.bytesPerDatum);
-                    const RawTile::ReadError err = repeatedRasterRead(1, io, dest);
+                    const RawTile::ReadError err = rasterRead(1, io, dest);
                     worstError = std::max(worstError, err);
                 }
                 // Last read is the alpha channel
                 char* dest = imageDataDest + (3 * _initData.bytesPerDatum);
-                const RawTile::ReadError err = repeatedRasterRead(2, io, dest);
+                const RawTile::ReadError err = rasterRead(2, io, dest);
                 worstError = std::max(worstError, err);
             }
             else { // Three or more rasters
@@ -708,7 +708,7 @@ void RawTileDataReader::readImageData(IODescription& io, RawTile::ReadError& wor
                     // The final destination pointer is offsetted by one datum byte size
                     // for every raster (or data channel, i.e. R in RGB)
                     char* dest = imageDataDest + (i * _initData.bytesPerDatum);
-                    const RawTile::ReadError err = repeatedRasterRead(i + 1, io, dest);
+                    const RawTile::ReadError err = rasterRead(i + 1, io, dest);
                     worstError = std::max(worstError, err);
                 }
             }
@@ -721,7 +721,7 @@ void RawTileDataReader::readImageData(IODescription& io, RawTile::ReadError& wor
                     // The final destination pointer is offsetted by one datum byte size
                     // for every raster (or data channel, i.e. R in RGB)
                     char* dest = imageDataDest + (i * _initData.bytesPerDatum);
-                    const RawTile::ReadError err = repeatedRasterRead(1, io, dest);
+                    const RawTile::ReadError err = rasterRead(1, io, dest);
                     worstError = std::max(worstError, err);
                 }
             }
@@ -730,12 +730,12 @@ void RawTileDataReader::readImageData(IODescription& io, RawTile::ReadError& wor
                     // The final destination pointer is offsetted by one datum byte size
                     // for every raster (or data channel, i.e. R in RGB)
                     char* dest = imageDataDest + (i * _initData.bytesPerDatum);
-                    const RawTile::ReadError err = repeatedRasterRead(1, io, dest);
+                    const RawTile::ReadError err = rasterRead(1, io, dest);
                     worstError = std::max(worstError, err);
                 }
                 // Last read is the alpha channel
                 char* dest = imageDataDest + (3 * _initData.bytesPerDatum);
-                const RawTile::ReadError err = repeatedRasterRead(2, io, dest);
+                const RawTile::ReadError err = rasterRead(2, io, dest);
                 worstError = std::max(worstError, err);
             }
             else { // Three or more rasters
@@ -743,14 +743,14 @@ void RawTileDataReader::readImageData(IODescription& io, RawTile::ReadError& wor
                     // The final destination pointer is offsetted by one datum byte size
                     // for every raster (or data channel, i.e. R in RGB)
                     char* dest = imageDataDest + (i * _initData.bytesPerDatum);
-                    const RawTile::ReadError err = repeatedRasterRead(3 - i, io, dest);
+                    const RawTile::ReadError err = rasterRead(3 - i, io, dest);
                     worstError = std::max(worstError, err);
                 }
             }
             if (nRastersToRead > 3) { // Alpha channel exists
                 // Last read is the alpha channel
                 char* dest = imageDataDest + (3 * _initData.bytesPerDatum);
-                const RawTile::ReadError err = repeatedRasterRead(4, io, dest);
+                const RawTile::ReadError err = rasterRead(4, io, dest);
                 worstError = std::max(worstError, err);
             }
             break;
@@ -773,20 +773,6 @@ IODescription RawTileDataReader::ioDescription(const TileIndex& tileIndex) const
     io.read.overview = 0;
     io.read.fullRegion.start = glm::ivec2(0, 0);
     io.read.fullRegion.numPixels = glm::ivec2(_rasterXSize, _rasterYSize);
-    // For correct sampling in dataset, we need to pad the texture tile
-
-    PixelRegion scaledPadding = {
-        .start = _initData.tilePixelStartOffset,
-        .numPixels = _initData.tilePixelSizeDifference
-    };
-
-    const double scale = static_cast<double>(io.read.region.numPixels.x) /
-                         static_cast<double>(io.write.region.numPixels.x);
-    scaledPadding.numPixels *= scale;
-    scaledPadding.start *= scale;
-
-    io.read.region.start += scaledPadding.start;
-    io.read.region.numPixels += scaledPadding.numPixels;
 
     io.write.bytesPerLine = _initData.bytesPerLine;
     io.write.totalNumBytes = _initData.totalNumBytes;
@@ -811,121 +797,6 @@ glm::ivec2 RawTileDataReader::fullPixelSize() const {
     return geodeticToPixel(Geodetic2{ 90.0, 180.0 }, _padfTransform);
 }
 
-RawTile::ReadError RawTileDataReader::repeatedRasterRead(int rasterBand,
-                                                         const IODescription& fullIO,
-                                                         char* dataDestination,
-                                                         int depth) const
-{
-
-    // NOTE:
-    // Ascii graphics illustrates the implementation details of this method, for one
-    // specific case. Even though the illustrated case is specific, readers can
-    // hopefully find it useful to get the general idea.
-
-    // Make a copy of the full IO desription as we will have to modify it
-    IODescription io = fullIO;
-
-    // Example:
-    // We have an io description that defines a WRITE and a READ region.
-    // In this case the READ region extends outside of the defined io.read.fullRegion,
-    // meaning we will have to perform wrapping
-
-    // io.write.region             io.read.region
-    //    |                         |
-    //    V                         V
-    // +-------+                +-------+
-    // |       |                |       |--------+
-    // |       |                |       |        |
-    // |       |                |       |        |
-    // +-------+                +-------+        |
-    //                            |              | <-- io.read.fullRegion
-    //                            |              |
-    //                            +--------------+
-
-    RawTile::ReadError worstError = RawTile::ReadError::None;
-    if (!isInside(io.read.region, io.read.fullRegion)) {
-        //  Loop through each side: left, top, right, bottom
-        for (int i = 0; i < 4; ++i) {
-            // Example:
-            // We are currently considering the left side of the pixel region
-            const Side side = static_cast<Side>(i);
-            IODescription cutoff = cutIODescription(
-                io,
-                side,
-                edge(io.read.fullRegion, side)
-            );
-
-            // Example:
-            // We cut off the left part that was outside the io.read.fullRegion, and we
-            // now have an additional io description for the cut off region.
-            // Note that the cut-method used above takes care of the corresponding
-            // WRITE region for us.
-
-            // cutoff.write.region    cutoff.read.region
-            //  |  io.write.region     |  io.read.region
-            //  |   |                  |   |
-            //  V   V                  V   V
-            // +-+-----+               +-+-----+
-            // | |     |               | |     |--------+
-            // | |     |               | |     |        |
-            // | |     |               | |     |        |
-            // +-+-----+               +-+-----+        |
-            //                           |              | <-- io.read.fullRegion
-            //                           |              |
-            //                           +--------------+
-
-            const int area = cutoff.read.region.numPixels.x *
-                             cutoff.read.region.numPixels.y;
-            if (area > 0) {
-                // Wrap by repeating
-                Side oppositeSide = static_cast<Side>((i + 2) % 4);
-
-                alignPixelRegion(
-                    cutoff.read.region,
-                    oppositeSide,
-                    edge(io.read.fullRegion, oppositeSide)
-                );
-
-                // Example:
-                // The cut off region is wrapped to the opposite side of the region,
-                // i.e. "repeated". Note that we don't want WRITE region to change,
-                // we're only wrapping the READ region.
-
-                // cutoff.write.region   io.read.region cutoff.read.region
-                //  |  io.write.region        |          |
-                //  |   |                     V          V
-                //  V   V                  +-----+      +-+
-                // +-+-----+               |     |------| |
-                // | |     |               |     |      | |
-                // | |     |               |     |      | |
-                // | |     |               +-----+      +-+
-                // +-+-----+               |              | <-- io.read.fullRegion
-                //                         |              |
-                //                         +--------------+
-
-                // Example:
-                // The cutoff region has been repeated along one of its sides, but
-                // as we can see in this example, it still has a top part outside the
-                // defined gdal region. This is handled through recursion.
-                const RawTile::ReadError err = repeatedRasterRead(
-                    rasterBand,
-                    cutoff,
-                    dataDestination,
-                    depth + 1
-                );
-
-                worstError = std::max(worstError, err);
-            }
-        }
-    }
-
-    const RawTile::ReadError err = rasterRead(rasterBand, io, dataDestination);
-
-    // The return error from a repeated rasterRead is ONLY based on the main region,
-    // which in the usual case will cover the main area of the patch anyway
-    return err;
-}
-
 TileMetaData RawTileDataReader::tileMetaData(RawTile& rawTile,
                                              const PixelRegion& region) const
 {
diff --git a/modules/globebrowsing/src/rawtiledatareader.h b/modules/globebrowsing/src/rawtiledatareader.h
index 1bc4d3c24e..f2860846d5 100644
--- a/modules/globebrowsing/src/rawtiledatareader.h
+++ b/modules/globebrowsing/src/rawtiledatareader.h
@@ -79,13 +79,6 @@ private:
 
     IODescription ioDescription(const TileIndex& tileIndex) const;
 
-    /**
-     * A recursive function that is able to perform wrapping in case the read region of
-     * the given IODescription is outside of the given write region.
-     */
-    RawTile::ReadError repeatedRasterRead(int rasterBand, const IODescription& fullIO,
-        char* dataDestination, int depth = 0) const;
-
     TileMetaData tileMetaData(RawTile& rawTile, const PixelRegion& region) const;
 
     const std::string _datasetFilePath;
diff --git a/modules/globebrowsing/src/renderableglobe.cpp b/modules/globebrowsing/src/renderableglobe.cpp
index 4658e212b1..e21987e1d9 100644
--- a/modules/globebrowsing/src/renderableglobe.cpp
+++ b/modules/globebrowsing/src/renderableglobe.cpp
@@ -69,7 +69,6 @@ namespace {
 
     // Global flags to modify the RenderableGlobe
     constexpr bool LimitLevelByAvailableData = true;
-    constexpr bool PerformFrustumCulling = true;
     constexpr bool PreformHorizonCulling = true;
 
     // Shadow structure
@@ -98,6 +97,7 @@ namespace {
     // time being.  --abock  2018-10-30
     constexpr int DefaultSkirtedGridSegments = 64;
     constexpr int UnknownDesiredLevel = -1;
+    constexpr int DefaultHeightTileResolution = 512;
 
     const openspace::globebrowsing::GeodeticPatch Coverage =
         openspace::globebrowsing::GeodeticPatch(0, 0, 90, 180);
@@ -126,6 +126,13 @@ namespace {
         openspace::properties::Property::Visibility::Developer
     };
 
+    constexpr openspace::properties::Property::PropertyInfo PerformFrustumCullingInfo = {
+        "PerformFrustumCulling",
+        "Perform frusum culling",
+        "If this value is set to 'true', frustum culling will be performed.",
+        openspace::properties::Property::Visibility::AdvancedUser
+    };
+
     constexpr openspace::properties::Property::PropertyInfo ResetTileProviderInfo = {
         "ResetTileProviders",
         "Reset tile providers",
@@ -543,6 +550,7 @@ RenderableGlobe::RenderableGlobe(const ghoul::Dictionary& dictionary)
         BoolProperty(ShowChunkEdgeInfo, false),
         BoolProperty(LevelProjectedAreaInfo, true),
         BoolProperty(ResetTileProviderInfo, false),
+        BoolProperty(PerformFrustumCullingInfo, true),
         IntProperty(ModelSpaceRenderingInfo, 14, 1, 22),
         IntProperty(DynamicLodIterationCountInfo, 16, 4, 128)
     })
@@ -649,6 +657,7 @@ RenderableGlobe::RenderableGlobe(const ghoul::Dictionary& dictionary)
     _debugPropertyOwner.addProperty(_debugProperties.showChunkEdges);
     _debugPropertyOwner.addProperty(_debugProperties.levelByProjectedAreaElseDistance);
     _debugPropertyOwner.addProperty(_debugProperties.resetTileProviders);
+    _debugPropertyOwner.addProperty(_debugProperties.performFrustumCulling);
     _debugPropertyOwner.addProperty(_debugProperties.modelSpaceRenderingCutoffLevel);
     _debugPropertyOwner.addProperty(_debugProperties.dynamicLodIterationCount);
 
@@ -1602,11 +1611,11 @@ void RenderableGlobe::setCommonUniforms(ghoul::opengl::ProgramObject& programObj
 
         const glm::mat3& modelViewTransformMat3 = glm::mat3(modelViewTransform);
 
-        // This is an assumption that the height tile has a resolution of 64 * 64
+        // This is an assumption that the height tile has a resolution of 512 * 512
         // If it does not it will still produce "correct" normals. If the resolution is
         // higher the shadows will be softer, if it is lower, pixels will be visible.
-        // Since default is 64 this will most likely work fine.
-        constexpr float TileDelta = 1.f / DefaultSkirtedGridSegments;
+        // Since default is 512 this will most likely work fine.
+        constexpr float TileDelta = 1.f / DefaultHeightTileResolution;
         const glm::vec3 deltaTheta0 = modelViewTransformMat3 *
             (glm::vec3(corner10 - corner00) * TileDelta);
         const glm::vec3 deltaTheta1 = modelViewTransformMat3 *
@@ -1890,7 +1899,7 @@ bool RenderableGlobe::testIfCullable(const Chunk& chunk,
     ZoneScoped;
 
     return (PreformHorizonCulling && isCullableByHorizon(chunk, renderData, heights)) ||
-           (PerformFrustumCulling && isCullableByFrustum(chunk, renderData, mvp));
+           (_debugProperties.performFrustumCulling && isCullableByFrustum(chunk, renderData, mvp));
 }
 
 int RenderableGlobe::desiredLevel(const Chunk& chunk, const RenderData& renderData,
@@ -2357,7 +2366,9 @@ int RenderableGlobe::desiredLevelByAvailableTileData(const Chunk& chunk) const {
         const std::vector<Layer*>& lyrs = _layerManager.layerGroup(gi.id).activeLayers();
         for (Layer* layer : lyrs) {
             Tile::Status status = layer->tileStatus(chunk.tileIndex);
-            if (status == Tile::Status::OK) {
+            // Ensure that the current tile is OK and that the tileprovider for the current
+            // layer has enough data to support an additional level.
+            if (status == Tile::Status::OK && layer->tileProvider()->maxLevel() > currLevel + 1) {
                 return UnknownDesiredLevel;
             }
         }
diff --git a/modules/globebrowsing/src/renderableglobe.h b/modules/globebrowsing/src/renderableglobe.h
index e6ed5c1c61..5c0654f5a4 100644
--- a/modules/globebrowsing/src/renderableglobe.h
+++ b/modules/globebrowsing/src/renderableglobe.h
@@ -130,6 +130,7 @@ private:
         properties::BoolProperty showChunkEdges;
         properties::BoolProperty levelByProjectedAreaElseDistance;
         properties::BoolProperty resetTileProviders;
+        properties::BoolProperty performFrustumCulling;
         properties::IntProperty  modelSpaceRenderingCutoffLevel;
         properties::IntProperty  dynamicLodIterationCount;
     } _debugProperties;
diff --git a/modules/globebrowsing/src/tileprovider/defaulttileprovider.cpp b/modules/globebrowsing/src/tileprovider/defaulttileprovider.cpp
index 60bb918b4e..616593897d 100644
--- a/modules/globebrowsing/src/tileprovider/defaulttileprovider.cpp
+++ b/modules/globebrowsing/src/tileprovider/defaulttileprovider.cpp
@@ -82,10 +82,6 @@ namespace {
         // [[codegen::verbatim(TilePixelSizeInfo.description)]]
         std::optional<int> tilePixelSize;
 
-        // Determines whether the tiles should have a padding zone around it, making the
-        // interpolation between tiles more pleasant
-        std::optional<bool> padTiles;
-
         // Determines if the tiles should be preprocessed before uploading to the GPU
         std::optional<bool> performPreProcessing;
 
@@ -144,7 +140,6 @@ DefaultTileProvider::DefaultTileProvider(const ghoul::Dictionary& dictionary)
     // 2. Initialize default values for any optional Keys
     // getValue does not work for integers
     int pixelSize = p.tilePixelSize.value_or(0);
-    _padTiles = p.padTiles.value_or(_padTiles);
 
     // Only preprocess height layers by default
     _performPreProcessing = _layerGroupID == layers::Group::ID::HeightLayers;
@@ -193,7 +188,7 @@ DefaultTileProvider::DefaultTileProvider(const ghoul::Dictionary& dictionary)
     _cacheProperties.compression = codegen::toString(compression);
 
     TileTextureInitData initData(
-        tileTextureInitData(_layerGroupID, _padTiles, pixelSize)
+        tileTextureInitData(_layerGroupID, pixelSize)
     );
     _tilePixelSize = initData.dimensions.x;
     initAsyncTileDataReader(initData, _cacheProperties);
@@ -279,7 +274,7 @@ void DefaultTileProvider::update() {
 
     if (_asyncTextureDataProvider->shouldBeDeleted()) {
         initAsyncTileDataReader(
-            tileTextureInitData(_layerGroupID, _padTiles, _tilePixelSize),
+            tileTextureInitData(_layerGroupID, _tilePixelSize),
             _cacheProperties
         );
     }
diff --git a/modules/globebrowsing/src/tileprovider/defaulttileprovider.h b/modules/globebrowsing/src/tileprovider/defaulttileprovider.h
index e422fd9ad6..1cb777cb0e 100644
--- a/modules/globebrowsing/src/tileprovider/defaulttileprovider.h
+++ b/modules/globebrowsing/src/tileprovider/defaulttileprovider.h
@@ -57,7 +57,6 @@ private:
     std::unique_ptr<AsyncTileDataProvider> _asyncTextureDataProvider;
     layers::Group::ID _layerGroupID = layers::Group::ID::Unknown;
     bool _performPreProcessing = false;
-    bool _padTiles = true;
     TileCacheProperties _cacheProperties;
 };
 
diff --git a/modules/globebrowsing/src/tileprovider/temporaltileprovider.cpp b/modules/globebrowsing/src/tileprovider/temporaltileprovider.cpp
index 81ebabe395..e080d59bc7 100644
--- a/modules/globebrowsing/src/tileprovider/temporaltileprovider.cpp
+++ b/modules/globebrowsing/src/tileprovider/temporaltileprovider.cpp
@@ -737,7 +737,6 @@ Tile TemporalTileProvider::InterpolateTileProvider::tile(const TileIndex& tileIn
         prev.texture->dimensions().y,
         prev.texture->dataType(),
         prev.texture->format(),
-        TileTextureInitData::PadTiles::No,
         TileTextureInitData::ShouldAllocateDataOnCPU::No
     );
 
diff --git a/modules/globebrowsing/src/tileprovider/tileprovider.cpp b/modules/globebrowsing/src/tileprovider/tileprovider.cpp
index 3db97c0c96..f1ea094896 100644
--- a/modules/globebrowsing/src/tileprovider/tileprovider.cpp
+++ b/modules/globebrowsing/src/tileprovider/tileprovider.cpp
@@ -97,7 +97,6 @@ void TileProvider::initializeDefaultTile() {
         8,
         GL_UNSIGNED_BYTE,
         Texture::Format::RGBA,
-        TileTextureInitData::PadTiles::No,
         TileTextureInitData::ShouldAllocateDataOnCPU::Yes
     );
     char* pixels = new char[initData.totalNumBytes];
diff --git a/modules/globebrowsing/src/tiletextureinitdata.cpp b/modules/globebrowsing/src/tiletextureinitdata.cpp
index 3f5ff86783..6b195aae4b 100644
--- a/modules/globebrowsing/src/tiletextureinitdata.cpp
+++ b/modules/globebrowsing/src/tiletextureinitdata.cpp
@@ -26,9 +26,6 @@
 
 namespace {
 
-const glm::ivec2 TilePixelStartOffset = glm::ivec2(-2);
-const glm::ivec2 TilePixelSizeDifference = glm::ivec2(4);
-
 size_t numberOfRasters(ghoul::opengl::Texture::Format format) {
     switch (format) {
         case ghoul::opengl::Texture::Format::Red:
@@ -104,18 +101,17 @@ openspace::globebrowsing::TileTextureInitData::HashKey calculateHashKey(
 
 namespace openspace::globebrowsing {
 
-TileTextureInitData tileTextureInitData(layers::Group::ID id, bool shouldPadTiles,
+TileTextureInitData tileTextureInitData(layers::Group::ID id,
                                         size_t preferredTileSize)
 {
     switch (id) {
         case layers::Group::ID::HeightLayers: {
-            const size_t tileSize = preferredTileSize ? preferredTileSize : 64;
+            const size_t tileSize = preferredTileSize ? preferredTileSize : 512;
             return TileTextureInitData(
                 tileSize,
                 tileSize,
                 GL_FLOAT,
                 ghoul::opengl::Texture::Format::Red,
-                TileTextureInitData::PadTiles(shouldPadTiles),
                 TileTextureInitData::ShouldAllocateDataOnCPU::Yes
             );
         }
@@ -125,8 +121,7 @@ TileTextureInitData tileTextureInitData(layers::Group::ID id, bool shouldPadTile
                 tileSize,
                 tileSize,
                 GL_UNSIGNED_BYTE,
-                ghoul::opengl::Texture::Format::BGRA,
-                TileTextureInitData::PadTiles(shouldPadTiles)
+                ghoul::opengl::Texture::Format::BGRA
             );
         }
         case layers::Group::ID::Overlays: {
@@ -135,8 +130,7 @@ TileTextureInitData tileTextureInitData(layers::Group::ID id, bool shouldPadTile
                 tileSize,
                 tileSize,
                 GL_UNSIGNED_BYTE,
-                ghoul::opengl::Texture::Format::BGRA,
-                TileTextureInitData::PadTiles(shouldPadTiles)
+                ghoul::opengl::Texture::Format::BGRA
             );
         }
         case layers::Group::ID::NightLayers: {
@@ -145,8 +139,7 @@ TileTextureInitData tileTextureInitData(layers::Group::ID id, bool shouldPadTile
                 tileSize,
                 tileSize,
                 GL_UNSIGNED_BYTE,
-                ghoul::opengl::Texture::Format::BGRA,
-                TileTextureInitData::PadTiles(shouldPadTiles)
+                ghoul::opengl::Texture::Format::BGRA
             );
         }
         case layers::Group::ID::WaterMasks: {
@@ -155,8 +148,7 @@ TileTextureInitData tileTextureInitData(layers::Group::ID id, bool shouldPadTile
                 tileSize,
                 tileSize,
                 GL_UNSIGNED_BYTE,
-                ghoul::opengl::Texture::Format::BGRA,
-                TileTextureInitData::PadTiles(shouldPadTiles)
+                ghoul::opengl::Texture::Format::BGRA
             );
         }
         default: {
@@ -167,10 +159,8 @@ TileTextureInitData tileTextureInitData(layers::Group::ID id, bool shouldPadTile
 
 TileTextureInitData::TileTextureInitData(size_t width, size_t height, GLenum type,
                                          ghoul::opengl::Texture::Format textureFormat,
-                                         PadTiles pad, ShouldAllocateDataOnCPU allocCpu)
+                                         ShouldAllocateDataOnCPU allocCpu)
     : dimensions(width, height, 1)
-    , tilePixelStartOffset(pad ? TilePixelStartOffset : glm::ivec2(0))
-    , tilePixelSizeDifference(pad ? TilePixelSizeDifference : glm::ivec2(0))
     , glType(type)
     , ghoulTextureFormat(textureFormat)
     , nRasters(numberOfRasters(ghoulTextureFormat))
@@ -179,7 +169,6 @@ TileTextureInitData::TileTextureInitData(size_t width, size_t height, GLenum typ
     , bytesPerLine(bytesPerPixel * width)
     , totalNumBytes(bytesPerLine * height)
     , shouldAllocateDataOnCPU(allocCpu)
-    , padTiles(pad)
     , hashKey(calculateHashKey(dimensions, ghoulTextureFormat, glType))
 {}
 
diff --git a/modules/globebrowsing/src/tiletextureinitdata.h b/modules/globebrowsing/src/tiletextureinitdata.h
index e1ac44411f..2aa7925098 100644
--- a/modules/globebrowsing/src/tiletextureinitdata.h
+++ b/modules/globebrowsing/src/tiletextureinitdata.h
@@ -39,10 +39,9 @@ class TileTextureInitData {
 public:
     using HashKey = uint64_t;
     BooleanType(ShouldAllocateDataOnCPU);
-    BooleanType(PadTiles);
 
     TileTextureInitData(size_t width, size_t height, GLenum type,
-        ghoul::opengl::Texture::Format textureFormat, PadTiles pad,
+        ghoul::opengl::Texture::Format textureFormat,
         ShouldAllocateDataOnCPU allocCpu = ShouldAllocateDataOnCPU::No);
 
     TileTextureInitData(const TileTextureInitData& original) = default;
@@ -54,8 +53,6 @@ public:
     ~TileTextureInitData() = default;
 
     const glm::ivec3 dimensions;
-    const glm::ivec2 tilePixelStartOffset;
-    const glm::ivec2 tilePixelSizeDifference;
     const GLenum glType;
     const ghoul::opengl::Texture::Format ghoulTextureFormat;
     const size_t nRasters;
@@ -64,11 +61,10 @@ public:
     const size_t bytesPerLine;
     const size_t totalNumBytes;
     const bool shouldAllocateDataOnCPU;
-    const bool padTiles;
     const HashKey hashKey;
 };
 
-TileTextureInitData tileTextureInitData(layers::Group::ID id, bool shouldPadTiles,
+TileTextureInitData tileTextureInitData(layers::Group::ID id,
     size_t preferredTileSize = 0);
 
 } // namespace openspace::globebrowsing

From 1b0b7e73f787b103017639e02e19c39e749508f7 Mon Sep 17 00:00:00 2001
From: Alexander Bock <alexander.bock@liu.se>
Date: Mon, 14 Aug 2023 14:42:23 +0200
Subject: [PATCH 097/701] Fix faulty deinitialization in scene graph nodes that
 would cause nodes to be ignored (closes #2851). Add warning message if nodes
 are not deinitialized at the end of the program

---
 data/assets/scene/digitaluniverse/grids.asset | 1 +
 ext/ghoul                                     | 2 +-
 src/scene/assetmanager.cpp                    | 7 ++++++-
 src/scene/scene.cpp                           | 6 ++++++
 4 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/data/assets/scene/digitaluniverse/grids.asset b/data/assets/scene/digitaluniverse/grids.asset
index 2823482079..f37098eae8 100644
--- a/data/assets/scene/digitaluniverse/grids.asset
+++ b/data/assets/scene/digitaluniverse/grids.asset
@@ -669,6 +669,7 @@ asset.onDeinitialize(function()
     openspace.removeSceneGraphNode(EquatorialSphere)
     openspace.removeSceneGraphNode(EclipticSphereLabels)
     openspace.removeSceneGraphNode(EclipticSphere)
+    openspace.removeSceneGraphNode(OortSphere)
     openspace.removeSceneGraphNode(RadioSphere)
 end)
 
diff --git a/ext/ghoul b/ext/ghoul
index ede185dd8b..b8685a2fe0 160000
--- a/ext/ghoul
+++ b/ext/ghoul
@@ -1 +1 @@
-Subproject commit ede185dd8b2f6c9cda5731b7e3512dec0f08a12e
+Subproject commit b8685a2fe0c00516eb28183658974e9601b3edd0
diff --git a/src/scene/assetmanager.cpp b/src/scene/assetmanager.cpp
index 418ff1e5fa..4181214ee7 100644
--- a/src/scene/assetmanager.cpp
+++ b/src/scene/assetmanager.cpp
@@ -143,11 +143,16 @@ AssetManager::~AssetManager() {
 void AssetManager::deinitialize() {
     ZoneScoped;
 
-    for (Asset* asset : _rootAssets) {
+    // In general, the potential dependencies in the root assets are ordered, which is
+    // index 0 might be the parent of 1, but not vice versa. So it is safer to do the
+    // order deinitialization in reverse
+    while (!_rootAssets.empty()) {
+        Asset* asset = _rootAssets.back();
         if (!asset->hasInitializedParent()) {
             asset->deinitialize();
             asset->unload();
         }
+        _rootAssets.pop_back();
     }
     _toBeDeleted.clear();
 }
diff --git a/src/scene/scene.cpp b/src/scene/scene.cpp
index 17aa498279..25c45353a1 100644
--- a/src/scene/scene.cpp
+++ b/src/scene/scene.cpp
@@ -116,6 +116,12 @@ Scene::~Scene() {
         if (node->identifier() == "Root") {
             continue;
         }
+
+        LWARNING(fmt::format(
+            "SceneGraphNode '{}' was not removed before shutdown",
+            node->identifier()
+        ));
+
         // There might still be scene graph nodes around that weren't removed by the asset
         // manager as they would have been added manually by the user. This also serves as
         // a backstop for assets that forgot to implement the onDeinitialize functions

From 153e71853ee5e7166babd01ffaf9893d2c56bc42 Mon Sep 17 00:00:00 2001
From: Alexander Bock <alexander.bock@liu.se>
Date: Mon, 14 Aug 2023 15:05:39 +0200
Subject: [PATCH 098/701] Fix up the missing SkyBrowser functions for naming
 scheme

---
 data/assets/util/webgui.asset               |  2 +-
 modules/skybrowser/skybrowsermodule.cpp     |  9 +++--
 modules/skybrowser/skybrowsermodule_lua.inl | 44 +++++++++++++++++++--
 3 files changed, 48 insertions(+), 7 deletions(-)

diff --git a/data/assets/util/webgui.asset b/data/assets/util/webgui.asset
index aa59aa8000..cdaaa51adb 100644
--- a/data/assets/util/webgui.asset
+++ b/data/assets/util/webgui.asset
@@ -4,7 +4,7 @@ local guiCustomization = asset.require("customization/gui")
 
 
 -- Select which commit hashes to use for the frontend and backend
-local frontendHash = "44a3e3aa89f250b74ffc4b7f3a503a5149c0e8de"
+local frontendHash = "1379c57e0876473573a67a381214a53fda53e516"
 
 local frontend = asset.syncedResource({
   Identifier = "WebGuiFrontend",
diff --git a/modules/skybrowser/skybrowsermodule.cpp b/modules/skybrowser/skybrowsermodule.cpp
index b1b661246b..837365b6b5 100644
--- a/modules/skybrowser/skybrowsermodule.cpp
+++ b/modules/skybrowser/skybrowsermodule.cpp
@@ -529,7 +529,8 @@ scripting::LuaLibrary SkyBrowserModule::luaLibrary() const {
             codegen::lua::StartSetup,
             codegen::lua::InitializeBrowser,
             codegen::lua::SendOutIdsToBrowsers,
-            codegen::lua::GetListOfImages,
+            codegen::lua::ListOfImages,
+            codegen::lua::ListOfImagesDeprecated,
             codegen::lua::SetHoverCircle,
             codegen::lua::MoveCircleToHoverImage,
             codegen::lua::DisableHoverCircle,
@@ -538,7 +539,8 @@ scripting::LuaLibrary SkyBrowserModule::luaLibrary() const {
             codegen::lua::RemoveSelectedImageInBrowser,
             codegen::lua::AdjustCamera,
             codegen::lua::SetSelectedBrowser,
-            codegen::lua::GetTargetData,
+            codegen::lua::TargetData,
+            codegen::lua::TargetDataDeprecated,
             codegen::lua::CreateTargetBrowserPair,
             codegen::lua::RemoveTargetBrowserPair,
             codegen::lua::SetOpacityOfImageLayer,
@@ -557,7 +559,8 @@ scripting::LuaLibrary SkyBrowserModule::luaLibrary() const {
             codegen::lua::ScrollOverBrowser,
             codegen::lua::LoadingImageCollectionComplete,
             codegen::lua::ShowAllTargetsAndBrowsers,
-            codegen::lua::GetWwtImageCollectionUrl,
+            codegen::lua::WwtImageCollectionUrl,
+            codegen::lua::WwtImageCollectionUrlDeprecated,
             codegen::lua::StopAnimations,
             codegen::lua::SetBorderRadius,
             codegen::lua::ReloadDisplayCopyOnNode
diff --git a/modules/skybrowser/skybrowsermodule_lua.inl b/modules/skybrowser/skybrowsermodule_lua.inl
index b84c568235..a23865c18a 100644
--- a/modules/skybrowser/skybrowsermodule_lua.inl
+++ b/modules/skybrowser/skybrowsermodule_lua.inl
@@ -317,7 +317,7 @@ std::string prunedIdentifier(std::string identifier) {
 /**
  * Returns the AAS WorldWide Telescope image collection url.
  */
-[[codegen::luawrap]] ghoul::Dictionary getWwtImageCollectionUrl() {
+[[codegen::luawrap]] ghoul::Dictionary wwtImageCollectionUrl() {
     using namespace openspace;
     SkyBrowserModule* module = global::moduleEngine->module<SkyBrowserModule>();
     ghoul::Dictionary url;
@@ -325,13 +325,27 @@ std::string prunedIdentifier(std::string identifier) {
     return url;
 }
 
+/**
+ * Deprecated in favor of 'wwtImageCollectionUrl'
+ */
+[[codegen::luawrap("getWwtImageCollectionUrl")]]
+ghoul::Dictionary wwtImageCollectionUrlDeprecated()
+{
+    LWARNINGC(
+        "Deprecation",
+        "'getWwtImageCollectionUrl' function is deprecated and should be replaced with "
+        "'wwtImageCollectionUrl'"
+    );
+    return wwtImageCollectionUrl();
+}
+
 /**
  * Returns a list of all the loaded AAS WorldWide Telescope images that have been loaded.
  * Each image has a name, thumbnail url, equatorial spherical coordinates RA and Dec,
  * equatorial Cartesian coordinates, if the image has celestial coordinates, credits text,
  * credits url and the identifier of the image which is a unique number.
  */
-[[codegen::luawrap]] ghoul::Dictionary getListOfImages() {
+[[codegen::luawrap]] ghoul::Dictionary listOfImages() {
     using namespace openspace;
 
     // Send image list to GUI
@@ -367,11 +381,24 @@ std::string prunedIdentifier(std::string identifier) {
     return list;
 }
 
+/**
+ * Deprecated in favor of 'listOfExoplanets'
+ */
+[[codegen::luawrap("getListOfImages")]] ghoul::Dictionary listOfImagesDeprecated()
+{
+    LWARNINGC(
+        "Deprecation",
+        "'getListOfImages' function is deprecated and should be replaced with "
+        "'listOfImages'"
+    );
+    return listOfImages();
+}
+
 /**
  * Returns a table of data regarding the current view and the sky browsers and targets.
  * returns a table of data regarding the current targets.
  */
-[[codegen::luawrap]] ghoul::Dictionary getTargetData() {
+[[codegen::luawrap]] ghoul::Dictionary targetData() {
     using namespace openspace;
 
     SkyBrowserModule* module = global::moduleEngine->module<SkyBrowserModule>();
@@ -437,6 +464,17 @@ std::string prunedIdentifier(std::string identifier) {
     return data;
 }
 
+/**
+ * Deprecated in favor of 'targetData'
+ */
+[[codegen::luawrap("getTargetData")]] ghoul::Dictionary targetDataDeprecated() {
+    LWARNINGC(
+        "Deprecation",
+        "'getTargetData' function is deprecated and should be replaced with 'targetData'"
+    );
+    return targetData();
+}
+
 /**
  * Takes an identifier to a sky browser or sky target. Rotates the camera so that the
  * target is placed in the center of the view.

From 56abd768c9a8afe0da12626d49e0c83ffc912b58 Mon Sep 17 00:00:00 2001
From: Alexander Bock <alexander.bock@liu.se>
Date: Mon, 14 Aug 2023 16:08:45 +0200
Subject: [PATCH 099/701] Update Voyager kernels to reach year 2100 (closes
 #2790)

---
 .../scene/solarsystem/missions/voyager/voyager1.asset | 11 ++++++-----
 .../scene/solarsystem/missions/voyager/voyager2.asset |  9 +++++----
 2 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/data/assets/scene/solarsystem/missions/voyager/voyager1.asset b/data/assets/scene/solarsystem/missions/voyager/voyager1.asset
index 630081d46e..275c15430d 100644
--- a/data/assets/scene/solarsystem/missions/voyager/voyager1.asset
+++ b/data/assets/scene/solarsystem/missions/voyager/voyager1.asset
@@ -14,7 +14,7 @@ local kernels = asset.syncedResource({
   Name = "Voyager 1 Kernels",
   Type = "HttpSynchronization",
   Identifier = "voyager1_spice",
-  Version = 1
+  Version = 2
 })
 
 
@@ -25,8 +25,9 @@ local Kernels = {
   kernels .. "voyager_1.ST+1991_a54418u.merged.bsp",
   kernels .. "vgr1_jup230.bsp",
   kernels .. "vgr1_sat337.bsp",
+  kernels .. "vgr1.x2100.bsp",
   kernels .. "vgr1_super.bc",
-  kernels .. "vgr1_super_v2.bc"
+  kernels .. "vgr1_super_v2.bc",
 }
 
 local RotationMatrix = {
@@ -227,9 +228,9 @@ local VoyagerTrailCruiseSaturnInf = {
     EnableFade = false,
     Color = { 0.70, 0.50, 0.20 },
     StartTime = "1980 NOV 16",
-    EndTime = "2021 JAN 01",
-    -- 14656 is the number of days between the Start and End time
-    SampleInterval = 14656 * 2
+    EndTime = "2100 JAN 01",
+    -- 43511 is the number of days between the Start and End time
+    SampleInterval = 43511 * 2
   },
   Tag = { "voyager1_trail" },
   GUI = {
diff --git a/data/assets/scene/solarsystem/missions/voyager/voyager2.asset b/data/assets/scene/solarsystem/missions/voyager/voyager2.asset
index 68cd0c3a89..448776f05f 100644
--- a/data/assets/scene/solarsystem/missions/voyager/voyager2.asset
+++ b/data/assets/scene/solarsystem/missions/voyager/voyager2.asset
@@ -14,7 +14,7 @@ local kernels = asset.syncedResource({
   Name = "Voyager 2 Kernels",
   Type = "HttpSynchronization",
   Identifier = "voyager2_spice",
-  Version = 1
+  Version = 2
 })
 
 
@@ -27,6 +27,7 @@ local Kernels = {
   kernels .. "vgr2_sat337.bsp",
   kernels .. "vgr2_ura083.bsp",
   kernels .. "vgr2_nep081.bsp",
+  kernels .. "vgr2.x2100.bsp",
   kernels .. "vgr2_super.bc",
   kernels .. "vgr2_super_v2.bc"
 }
@@ -331,9 +332,9 @@ local VoyagerTrailCruiseNeptuneInf = {
     EnableFade = false,
     Color = { 0.70, 0.50, 0.20 },
     StartTime = "1989 AUG 26",
-    EndTime = "2021 JAN 01",
-    -- 11451 is the number of days between the Start and End time
-    SampleInterval = 11451 * 2
+    EndTime = "2100 JAN 01",
+    -- 40306 is the number of days between the Start and End time
+    SampleInterval = 40306 * 2
   },
   Tag = { "voyager2_trail" },
   GUI = {

From 16591fab567c27a6848a1b262d7d66739c502d6a Mon Sep 17 00:00:00 2001
From: GPayne <payne.gene@gmail.com>
Date: Mon, 14 Aug 2023 15:53:45 -0600
Subject: [PATCH 100/701] Added another visual test for JWST

---
 tests/visual/jwst/unfolded.ostest | 12 ++++++++++++
 1 file changed, 12 insertions(+)
 create mode 100644 tests/visual/jwst/unfolded.ostest

diff --git a/tests/visual/jwst/unfolded.ostest b/tests/visual/jwst/unfolded.ostest
new file mode 100644
index 0000000000..93759912c2
--- /dev/null
+++ b/tests/visual/jwst/unfolded.ostest
@@ -0,0 +1,12 @@
+[ 
+    { "type": "pause", 
+      "value": "true"},
+    { "type": "time",
+      "value": "2022-01-22T05:24:50.00"},
+    { "type": "navigationstate", 
+      "value": "{Anchor='JWSTModel',Pitch=-0.0016592552067427437,Position={-18.15692138671875,17.05841827392578,-21.566741943359375},ReferenceFrame='Root',Up={0.7974728925265553,0.5576779554782311,-0.2302873936170828},Yaw=-0.005725894528578101}"},
+    { "type": "wait", 
+      "value": "20"}, 
+    { "type": "screenshot", 
+      "value": "unfolded"}
+] 

From d88cc9d9d56facdfd1b03a8e352d381f11c1793a Mon Sep 17 00:00:00 2001
From: Malin E <malin.ejdbo@gmail.com>
Date: Tue, 15 Aug 2023 11:14:44 +0200
Subject: [PATCH 101/701] Make sure that the volume textures never gets smaller
 than 1x1, fixes #2852

---
 src/rendering/framebufferrenderer.cpp | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/src/rendering/framebufferrenderer.cpp b/src/rendering/framebufferrenderer.cpp
index 6c85a386ac..d2fbfd3ffa 100644
--- a/src/rendering/framebufferrenderer.cpp
+++ b/src/rendering/framebufferrenderer.cpp
@@ -517,10 +517,10 @@ void FramebufferRenderer::updateDownscaleTextures() {
         0,
         GL_RGBA32F,
         static_cast<GLsizei>(
-            _resolution.x * _downscaleVolumeRendering.currentDownscaleFactor
+            glm::max(_resolution.x * _downscaleVolumeRendering.currentDownscaleFactor, 1.f)
         ),
         static_cast<GLsizei>(
-            _resolution.y * _downscaleVolumeRendering.currentDownscaleFactor
+            glm::max(_resolution.y * _downscaleVolumeRendering.currentDownscaleFactor, 1.f)
         ),
         0,
         GL_RGBA,
@@ -538,10 +538,10 @@ void FramebufferRenderer::updateDownscaleTextures() {
         0,
         GL_DEPTH_COMPONENT32F,
         static_cast<GLsizei>(
-            _resolution.x * _downscaleVolumeRendering.currentDownscaleFactor
+            glm::max(_resolution.x * _downscaleVolumeRendering.currentDownscaleFactor, 1.f)
         ),
         static_cast<GLsizei>(
-            _resolution.y * _downscaleVolumeRendering.currentDownscaleFactor
+            glm::max(_resolution.y * _downscaleVolumeRendering.currentDownscaleFactor, 1.f)
         ),
         0,
         GL_DEPTH_COMPONENT,
@@ -846,10 +846,10 @@ void FramebufferRenderer::updateResolution() {
         0,
         GL_RGBA32F,
         static_cast<GLsizei>(
-            _resolution.x * _downscaleVolumeRendering.currentDownscaleFactor
+            glm::max(_resolution.x * _downscaleVolumeRendering.currentDownscaleFactor, 1.f)
         ),
         static_cast<GLsizei>(
-            _resolution.y * _downscaleVolumeRendering.currentDownscaleFactor
+            glm::max(_resolution.y * _downscaleVolumeRendering.currentDownscaleFactor, 1.f)
         ),
         0,
         GL_RGBA,
@@ -878,10 +878,10 @@ void FramebufferRenderer::updateResolution() {
         0,
         GL_DEPTH_COMPONENT32F,
         static_cast<GLsizei>(
-            _resolution.x * _downscaleVolumeRendering.currentDownscaleFactor
+            glm::max(_resolution.x * _downscaleVolumeRendering.currentDownscaleFactor, 1.f)
         ),
         static_cast<GLsizei>(
-            _resolution.y * _downscaleVolumeRendering.currentDownscaleFactor
+            glm::max(_resolution.y * _downscaleVolumeRendering.currentDownscaleFactor, 1.f)
         ),
         0,
         GL_DEPTH_COMPONENT,

From bd153b3f4f0087bb399bd24ba0265f69cc37a411 Mon Sep 17 00:00:00 2001
From: Alexander Bock <alexander.bock@liu.se>
Date: Thu, 17 Aug 2023 01:59:26 +0200
Subject: [PATCH 102/701] Use correct error type in geojsoncomponent; Check for
 (0,0,0) camera vectors in navigator;  Fix issue with non-ASCII characters
 when making identifiers

---
 .../globebrowsing/src/geojson/geojsoncomponent.cpp |  3 ++-
 .../src/geojson/globegeometryfeature.cpp           |  8 ++++----
 modules/video/src/videoplayer.cpp                  |  3 +--
 src/navigation/orbitalnavigator.cpp                | 14 +++++++++++++-
 src/scene/scene.cpp                                |  2 +-
 5 files changed, 21 insertions(+), 9 deletions(-)

diff --git a/modules/globebrowsing/src/geojson/geojsoncomponent.cpp b/modules/globebrowsing/src/geojson/geojsoncomponent.cpp
index d3f6b43afc..ca3dbf5423 100644
--- a/modules/globebrowsing/src/geojson/geojsoncomponent.cpp
+++ b/modules/globebrowsing/src/geojson/geojsoncomponent.cpp
@@ -698,12 +698,13 @@ void GeoJsonComponent::parseSingleFeature(const geos::io::GeoJSONFeature& featur
 
             _featuresPropertyOwner.addPropertySubOwner(_features.back().get());
         }
-        catch (const ghoul::MissingCaseException&) {
+        catch (const ghoul::RuntimeError& error) {
             LERROR(fmt::format(
                 "Error creating GeoJson layer with identifier '{}'. Problem reading "
                 "feature {} in GeoJson file '{}'.",
                 identifier(), indexInFile, _geoJsonFile
             ));
+            LERRORC(error.component, error.message);
             // Do nothing
         }
     }
diff --git a/modules/globebrowsing/src/geojson/globegeometryfeature.cpp b/modules/globebrowsing/src/geojson/globegeometryfeature.cpp
index 74c699b874..170928cf2b 100644
--- a/modules/globebrowsing/src/geojson/globegeometryfeature.cpp
+++ b/modules/globebrowsing/src/geojson/globegeometryfeature.cpp
@@ -232,18 +232,18 @@ void GlobeGeometryFeature::createFromSingleGeosGeometry(const geos::geom::Geomet
                 _type = GeometryType::Polygon;
             }
             catch (geos::util::IllegalStateException& e) {
-                LERROR(fmt::format(
+                throw ghoul::RuntimeError(fmt::format(
                     "Non-simple (e.g. self-intersecting) polygons not supported yet. "
                     "GEOS error: '{}'", e.what()
                 ));
-                throw ghoul::MissingCaseException();
 
                 // TODO: handle self-intersections points
                 // https://www.sciencedirect.com/science/article/pii/S0304397520304199
             }
             catch (geos::util::GEOSException& e) {
-                LERROR(fmt::format("Unknown geos error: {}", e.what()));
-                throw ghoul::MissingCaseException();
+                throw ghoul::RuntimeError(fmt::format(
+                    "Unknown geos error: {}", e.what()
+                ));
             }
             break;
         }
diff --git a/modules/video/src/videoplayer.cpp b/modules/video/src/videoplayer.cpp
index b199aa898f..3b69a3f744 100644
--- a/modules/video/src/videoplayer.cpp
+++ b/modules/video/src/videoplayer.cpp
@@ -739,9 +739,8 @@ void VideoPlayer::handleMpvProperties(mpv_event* event) {
             }
             break;
         }
-        default: {
+        default:
             throw ghoul::MissingCaseException();
-        }
     }
 }
 
diff --git a/src/navigation/orbitalnavigator.cpp b/src/navigation/orbitalnavigator.cpp
index 738ad8901a..992dce2a0e 100644
--- a/src/navigation/orbitalnavigator.cpp
+++ b/src/navigation/orbitalnavigator.cpp
@@ -746,6 +746,12 @@ void OrbitalNavigator::updateCameraStateFromStates(double deltaTime) {
         .rotation = _camera->rotationQuaternion()
     };
 
+    if (glm::length(pose.position) == 0.0) {
+        // If the position is 0.0, a lot of the calculations downstairs will fail as we
+        // calculate relative offsets from the center of the anchor node
+        return;
+    }
+
     const bool hasPreviousPositions =
         _previousAnchorNodePosition.has_value() &&
         _previousAimNodePosition.has_value();
@@ -872,6 +878,11 @@ void OrbitalNavigator::updateCameraScalingFromAnchor(double deltaTime) {
         const glm::dvec3 anchorPos = _anchorNode->worldPosition();
         const glm::dvec3 cameraPos = _camera->positionVec3();
 
+        if (glm::length(cameraPos) == 0.0) {
+            // Calculating the surface position fails for (0,0,0) vectors
+            return;
+        }
+
         SurfacePositionHandle posHandle =
             calculateSurfacePositionHandle(*_anchorNode, cameraPos);
 
@@ -1123,7 +1134,8 @@ void OrbitalNavigator::setRetargetInterpolationTime(float durationInSeconds) {
 
 bool OrbitalNavigator::shouldFollowAnchorRotation(const glm::dvec3& cameraPosition) const
 {
-    if (!_anchorNode || !_followAnchorNodeRotation) {
+    if (!_anchorNode || !_followAnchorNodeRotation || glm::length(cameraPosition) == 0.0)
+    {
         return false;
     }
 
diff --git a/src/scene/scene.cpp b/src/scene/scene.cpp
index 25c45353a1..cbd7203a50 100644
--- a/src/scene/scene.cpp
+++ b/src/scene/scene.cpp
@@ -888,7 +888,7 @@ std::string makeIdentifier(std::string s) {
     std::replace_if(
         s.begin(),
         s.end(),
-        [](char c) { return std::ispunct(c) != 0; },
+        [](unsigned char c) { return std::ispunct(c) != 0; },
         '-'
     );
     std::replace(s.begin(), s.end(), ' ', '_');

From cd7788ff1d2269405a4a37c422d92f4382e3be16 Mon Sep 17 00:00:00 2001
From: Alexander Bock <alexander.bock@liu.se>
Date: Thu, 17 Aug 2023 15:46:49 +0200
Subject: [PATCH 103/701] Fix error with eclipse shadow cone flipping

---
 .../space/rendering/renderableeclipsecone.cpp | 41 +++++++++++++++----
 1 file changed, 32 insertions(+), 9 deletions(-)

diff --git a/modules/space/rendering/renderableeclipsecone.cpp b/modules/space/rendering/renderableeclipsecone.cpp
index 05b528c4b8..72ef239df6 100644
--- a/modules/space/rendering/renderableeclipsecone.cpp
+++ b/modules/space/rendering/renderableeclipsecone.cpp
@@ -49,7 +49,8 @@ namespace {
         "Points",
         "This value determines the number of control points that is used to construct "
         "the shadow geometry. The higher this number, the more detailed the shadow is, "
-        "but it will have a negative impact on the performance",
+        "but it will have a negative impact on the performance. Also note that rendering "
+        "errors will occur if this value is even",
         openspace::properties::Property::Visibility::AdvancedUser
     };
 
@@ -178,7 +179,7 @@ documentation::Documentation RenderableEclipseCone::Documentation() {
 
 RenderableEclipseCone::RenderableEclipseCone(const ghoul::Dictionary& dictionary)
     : Renderable(dictionary)
-    , _numberOfPoints(NumberPointsInfo, 190, 1, 300)
+    , _numberOfPoints(NumberPointsInfo, 191, 1, 300)
     , _shadowLength(ShadowLengthInfo, 0.1f, 0.f, 2.f)
     , _showUmbralShadow(ShowUmbralShadowInfo, true)
     , _umbralShadowColor(
@@ -335,7 +336,7 @@ std::vector<VBOLayout> calculateShadowPoints(const std::vector<glm::dvec3>& srcT
         const glm::dvec3 dir = glm::normalize(dst - src);
 
         // The start point is the terminator point on the Moon
-        glm::vec3 p1 = dst;
+        glm::vec3 p1 = dst -dir * lengthScale*1000.0;
         vertices.push_back({ p1.x, p1.y, p1.z });
 
         // The end point is calculated by forward propagating the incoming direction
@@ -346,6 +347,8 @@ std::vector<VBOLayout> calculateShadowPoints(const std::vector<glm::dvec3>& srcT
 }
 
 void RenderableEclipseCone::createCone(double et) {
+    ZoneScoped;
+
     // Big picture for the calculation for this example (lightSource = Sun,
     // shadower = Moon, shadowee = Earth). We get the limb (= penumbral terminator) of the
     // Sun as viewed from the Moon, then the limb of the Moon as viewed from the Sun.
@@ -375,6 +378,17 @@ void RenderableEclipseCone::createCone(double et) {
         p *= 1000.0;
     }
 
+    // 1a. For some reason in some situations the angular position of the first vertex is
+    // rotating, which causes a mismatch in the direction calculations. In order to
+    // prevent that, we rotate the positions so that the point with the highest z
+    // component is always the first point
+    auto it = std::max_element(
+        resSrc.terminatorPoints.begin(),
+        resSrc.terminatorPoints.end(),
+        [](const glm::dvec3& p1, const glm::dvec3& p2) { return p1.z > p2.z; }
+    );
+    std::rotate(resSrc.terminatorPoints.begin(), it, resSrc.terminatorPoints.end());
+
 
     // 2. Get the penumbral terminator of the shadower from the lightsource
     SpiceManager::TerminatorEllipseResult resDst = SpiceManager::ref().terminatorEllipse(
@@ -394,11 +408,20 @@ void RenderableEclipseCone::createCone(double et) {
     for (glm::dvec3& p : resDst.terminatorPoints) {
         p *= 1000.0;
     }
-    // Spice calculates the terminator points in a fixed clockwise/counterclockwise
-    // direction from the point of the view of the observer. Since we are switching target
-    // and observer, this means that one of the sets of points is clockwise, while the
-    // other is counterclockwise. In order for the right points to match up, we need to
-    // reverse the order of one of them. It doesn't matter which one, so we pick this one
+
+    // 2a. Doing the same as in 1a
+    auto jt = std::max_element(
+        resDst.terminatorPoints.begin(),
+        resDst.terminatorPoints.end(),
+        [](const glm::dvec3& p1, const glm::dvec3& p2) { return p1.z > p2.z; }
+    );
+    std::rotate(resDst.terminatorPoints.begin(), jt, resDst.terminatorPoints.end());
+
+    // 2b. Spice calculates the terminator points in a fixed counterclockwise direction
+    // from the point of the view of the observer. Since we are switching target and
+    // observer, this means that one of the sets of points is clockwise, while the other
+    // is counterclockwise. In order for the right points to match up, we need to reverse
+    // the order of one of them. It doesn't matter which one, so we pick this one
     std::reverse(resDst.terminatorPoints.begin(), resDst.terminatorPoints.end());
 
     ghoul_assert(
@@ -489,7 +512,7 @@ void RenderableEclipseCone::createCone(double et) {
         _nVertices = static_cast<int>(penumbralVertices.size());
     }
     if (_showUmbralShadow) {
-        _nVertices = static_cast<int>(penumbralVertices.size());
+        _nVertices = static_cast<int>(umbralVertices.size());
     }
 
     glBindVertexArray(_vao);

From 4ae61a848e3ea6ffb036ed4abaaa121da6ab54ee Mon Sep 17 00:00:00 2001
From: Alexander Bock <mail@alexanderbock.eu>
Date: Fri, 18 Aug 2023 15:32:19 +0200
Subject: [PATCH 104/701] Using linear texture filtering on AMD until the crash
 can be fixed (addresses #2843)

---
 .../src/memoryawaretilecache.cpp              | 22 ++++++++++++++++---
 1 file changed, 19 insertions(+), 3 deletions(-)

diff --git a/modules/globebrowsing/src/memoryawaretilecache.cpp b/modules/globebrowsing/src/memoryawaretilecache.cpp
index 60d878a013..e6863132fa 100644
--- a/modules/globebrowsing/src/memoryawaretilecache.cpp
+++ b/modules/globebrowsing/src/memoryawaretilecache.cpp
@@ -29,6 +29,7 @@
 #include <modules/globebrowsing/src/rawtile.h>
 #include <ghoul/logging/logmanager.h>
 #include <ghoul/systemcapabilities/generalcapabilitiescomponent.h>
+#include <ghoul/systemcapabilities/openglcapabilitiescomponent.h>
 #include <numeric>
 
 namespace {
@@ -211,22 +212,31 @@ void MemoryAwareTileCache::TextureContainer::reset() {
 
     _textures.clear();
     _freeTexture = 0;
+
+    using namespace ghoul::systemcapabilities;
+
+    ghoul::opengl::Texture::FilterMode mode =
+        OpenGLCap.gpuVendor() == OpenGLCapabilitiesComponent::Vendor::AmdATI ?
+        ghoul::opengl::Texture::FilterMode::Linear :
+        ghoul::opengl::Texture::FilterMode::AnisotropicMipMap;
+
     for (size_t i = 0; i < _numTextures; ++i) {
         using namespace ghoul::opengl;
+
         std::unique_ptr<Texture> tex = std::make_unique<Texture>(
             _initData.dimensions,
             GL_TEXTURE_2D,
             _initData.ghoulTextureFormat,
             toGlTextureFormat(_initData.glType, _initData.ghoulTextureFormat),
             _initData.glType,
-            Texture::FilterMode::AnisotropicMipMap,
+            mode,
             Texture::WrappingMode::ClampToEdge,
             Texture::AllocateData(_initData.shouldAllocateDataOnCPU)
         );
 
         tex->setDataOwnership(Texture::TakeOwnership::Yes);
         tex->uploadTexture();
-        tex->setFilter(Texture::FilterMode::AnisotropicMipMap);
+        tex->setFilter(mode);
 
         _textures.push_back(std::move(tex));
     }
@@ -475,7 +485,13 @@ void MemoryAwareTileCache::createTileAndPut(ProviderTileKey key, RawTile rawTile
         // Hi there, I know someone will be tempted to change this to a Linear filtering
         // mode at some point. This will introduce rendering artifacts when looking at the
         // globe at oblique angles (see #2752)
-        tex->setFilter(ghoul::opengl::Texture::FilterMode::AnisotropicMipMap);
+        using namespace ghoul::systemcapabilities;
+        ghoul::opengl::Texture::FilterMode mode =
+            OpenGLCap.gpuVendor() == OpenGLCapabilitiesComponent::Vendor::AmdATI ?
+            ghoul::opengl::Texture::FilterMode::Linear :
+            ghoul::opengl::Texture::FilterMode::AnisotropicMipMap;
+
+        tex->setFilter(mode);
         Tile tile{ tex, std::move(rawTile.tileMetaData), Tile::Status::OK };
         TileTextureInitData::HashKey initDataKey = initData.hashKey;
         _textureContainerMap[initDataKey].second->put(std::move(key), std::move(tile));

From 1f32394fb288c061f623aec87389c2674799fb0e Mon Sep 17 00:00:00 2001
From: Emma Broman <emma.broman@liu.se>
Date: Fri, 18 Aug 2023 16:32:56 +0200
Subject: [PATCH 105/701] Issue/2225 - Add exoplanets from a CSV file (#2846)

* Make reading exoplanet data from CSV during runtime work

* Add function descriptions

* Clarify an info message

* Initialize all data parameters with NaN, to prevent unpredictable values when a parameter is not included in the dataset

Co-authored-by: Alexander Bock <alexander.bock@liu.se>

---------

Co-authored-by: Alexander Bock <alexander.bock@liu.se>
---
 modules/exoplanets/exoplanetshelper.cpp       |  19 +
 modules/exoplanets/exoplanetshelper.h         | 131 +++--
 modules/exoplanets/exoplanetsmodule.cpp       |  12 +-
 modules/exoplanets/exoplanetsmodule.h         |   1 +
 modules/exoplanets/exoplanetsmodule_lua.inl   | 153 ++++--
 .../tasks/exoplanetsdatapreparationtask.cpp   | 478 ++++++++++--------
 .../tasks/exoplanetsdatapreparationtask.h     |  53 +-
 7 files changed, 561 insertions(+), 286 deletions(-)

diff --git a/modules/exoplanets/exoplanetshelper.cpp b/modules/exoplanets/exoplanetshelper.cpp
index 58975f5205..01c374044f 100644
--- a/modules/exoplanets/exoplanetshelper.cpp
+++ b/modules/exoplanets/exoplanetshelper.cpp
@@ -161,4 +161,23 @@ void sanitizeNameString(std::string& s) {
     s.erase(remove(s.begin(), s.end(), '\''), s.end());
 }
 
+void updateStarDataFromNewPlanet(StarData& starData, const ExoplanetDataEntry& p) {
+    const glm::vec3 pos = glm::vec3(p.positionX, p.positionY, p.positionZ);
+    if (starData.position != pos && isValidPosition(pos)) {
+        starData.position = pos;
+    }
+    if (starData.radius != p.rStar && !std::isnan(p.rStar)) {
+        starData.radius = p.rStar;
+    }
+    if (starData.bv != p.bmv && !std::isnan(p.bmv)) {
+        starData.bv = p.bmv;
+    }
+    if (starData.teff != p.teff && !std::isnan(p.teff)) {
+        starData.teff = p.teff;
+    }
+    if (starData.luminosity != p.luminosity && !std::isnan(p.luminosity)) {
+        starData.luminosity = p.luminosity;
+    }
+}
+
 } // namespace openspace::exoplanets
diff --git a/modules/exoplanets/exoplanetshelper.h b/modules/exoplanets/exoplanetshelper.h
index d4e9c9ca0f..83368d4f7d 100644
--- a/modules/exoplanets/exoplanetshelper.h
+++ b/modules/exoplanets/exoplanetshelper.h
@@ -33,43 +33,95 @@
 namespace openspace::exoplanets {
 
 struct ExoplanetDataEntry {
-    float a;            // Orbital semi-major axis in AU
-    double aUpper;      // Upper uncertainty of orbital semi-major axis
-    double aLower;      // Lower uncertainty of orbital semi-major axis
-    float bigOmega;     // Longitude of ascending node in degrees
-    float bigOmegaUpper; // Upper uncertainty of longitude of ascending node
-    float bigOmegaLower; // Lower uncertainty of longitude of ascending node
-    bool binary;        // Star known to be binary?
-    float bmv;          // Star B − V color
-    float ecc;          // Orbital eccentricity
-    float eccUpper;     // Upper uncertainty of orbital eccentricity
-    float eccLower;     // Lower uncertainty of orbital eccentricity
-    float i;            // Orbital inclination in degrees (for transiting systems only)
-    float iUpper;       // Upper uncertainty of orbital inclination
-    float iLower;       // Lower uncertainty of orbital inclination
-    int nPlanets;       // Number of known planets in the planetary system
-    int nStars;         // Number of stars in the planetary system
-    float omega;        // Argument of periastron in degrees
-    float omegaUpper;   // Upper uncertainty of argument of periastron
-    float omegaLower;   // Lower uncertainty of argument of periastron
-    double per;         // Orbital period in days
-    float perUpper;     // Upper uncertainty of period
-    float perLower;     // Lower uncertainty of period
-    double r;           // Radius of the planet in Jupiter radii
-    double rUpper;      // Upper uncertainty of radius of the planet
-    double rLower;      // Lower uncertainty of radius of the planet
-    float rStar;        // Estimated radius of the star in solar radii
-    float rStarUpper;   // Upper uncertainty of estimated star radius
-    float rStarLower;   // Lower uncertainty of estimated star radius
-    float luminosity;      // Star luminosity, in units of solar luminosities
-    float luminosityUpper; // Upper uncertainty of star luminosity
-    float luminosityLower; // Lower uncertainty of star luminosity
-    float teff;         // Star's effective temperature in Kelvin
-    float teffUpper;    // Upper uncertainty of effective temperature
-    float teffLower;    // Lower uncertainty of effective temperature
-    double tt;          // Epoch of transit center in HJD-2440000
-    float ttUpper;      // Upper uncertainty of epoch of transit center
-    float ttLower;      // Lower uncertainty of epoch of transit center
+    // Orbital semi-major axis in AU
+    float a = std::numeric_limits<float>::quiet_NaN();
+    // Upper uncertainty of orbital semi-major axis
+    double aUpper = std::numeric_limits<double>::quiet_NaN();
+    // Lower uncertainty of orbital semi-major axis
+    double aLower = std::numeric_limits<double>::quiet_NaN();
+
+    // Longitude of ascending node in degrees
+    float bigOmega = std::numeric_limits<float>::quiet_NaN();
+    // Upper uncertainty of longitude of ascending node
+    float bigOmegaUpper = std::numeric_limits<float>::quiet_NaN();
+    // Lower uncertainty of longitude of ascending node
+    float bigOmegaLower = std::numeric_limits<float>::quiet_NaN();
+
+    // Star known to be binary?
+    bool binary = false;
+
+    // Star B − V color
+    float bmv = std::numeric_limits<float>::quiet_NaN();
+
+    // Orbital eccentricity
+    float ecc = std::numeric_limits<float>::quiet_NaN();
+    // Upper uncertainty of orbital eccentricity
+    float eccUpper = std::numeric_limits<float>::quiet_NaN();
+    // Lower uncertainty of orbital eccentricity
+    float eccLower = std::numeric_limits<float>::quiet_NaN();
+
+    // Orbital inclination in degrees (for transiting systems only)
+    float i = std::numeric_limits<float>::quiet_NaN();
+    // Upper uncertainty of orbital inclination
+    float iUpper = std::numeric_limits<float>::quiet_NaN();
+    // Lower uncertainty of orbital inclination
+    float iLower = std::numeric_limits<float>::quiet_NaN();
+
+    // Number of known planets in the planetary system
+    int nPlanets = std::numeric_limits<int>::quiet_NaN();
+
+    // Number of stars in the planetary system
+    int nStars = std::numeric_limits<int>::quiet_NaN();
+
+    // Argument of periastron in degrees
+    float omega = std::numeric_limits<float>::quiet_NaN();
+    // Upper uncertainty of argument of periastron
+    float omegaUpper = std::numeric_limits<float>::quiet_NaN();
+    // Lower uncertainty of argument of periastron
+    float omegaLower = std::numeric_limits<float>::quiet_NaN();
+
+    // Orbital period in days
+    double per = std::numeric_limits<double>::quiet_NaN();
+    // Upper uncertainty of period
+    float perUpper = std::numeric_limits<float>::quiet_NaN();
+    // Lower uncertainty of period
+    float perLower = std::numeric_limits<float>::quiet_NaN();
+
+    // Radius of the planet in Jupiter radii
+    double r = std::numeric_limits<double>::quiet_NaN();
+    // Upper uncertainty of radius of the planet
+    double rUpper = std::numeric_limits<double>::quiet_NaN();
+    // Lower uncertainty of radius of the planet
+    double rLower = std::numeric_limits<double>::quiet_NaN();
+
+    // Estimated radius of the star in solar radii
+    float rStar = std::numeric_limits<float>::quiet_NaN();
+    // Upper uncertainty of estimated star radius
+    float rStarUpper = std::numeric_limits<float>::quiet_NaN();
+    // Lower uncertainty of estimated star radius
+    float rStarLower = std::numeric_limits<float>::quiet_NaN();
+
+    // Star luminosity, in units of solar luminosities
+    float luminosity = std::numeric_limits<float>::quiet_NaN();
+    // Upper uncertainty of star luminosity
+    float luminosityUpper = std::numeric_limits<float>::quiet_NaN();
+    // Lower uncertainty of star luminosity
+    float luminosityLower = std::numeric_limits<float>::quiet_NaN();
+
+    // Star's effective temperature in Kelvin
+    float teff = std::numeric_limits<float>::quiet_NaN();
+    // Upper uncertainty of effective temperature
+    float teffUpper = std::numeric_limits<float>::quiet_NaN();
+    // Lower uncertainty of effective temperature
+    float teffLower = std::numeric_limits<float>::quiet_NaN();
+
+    // Epoch of transit center in HJD-2440000
+    double tt = std::numeric_limits<double>::quiet_NaN();
+    // Upper uncertainty of epoch of transit center
+    float ttUpper = std::numeric_limits<float>::quiet_NaN();
+    // Lower uncertainty of epoch of transit center
+    float ttLower = std::numeric_limits<float>::quiet_NaN();
+
     // Star position's X-coordinate in parsec
     float positionX = std::numeric_limits<float>::quiet_NaN();
     // Star position's Y-coordinate in parsec
@@ -110,6 +162,11 @@ glm::dmat3 computeSystemRotation(glm::dvec3 starPosition);
 
 void sanitizeNameString(std::string& s);
 
+// Star data should not vary between planets, but one data entry might lack data
+// for the host star while another does not. So for every planet, update star data
+// if needed
+void updateStarDataFromNewPlanet(StarData& starData, const ExoplanetDataEntry& p);
+
 } // namespace openspace::exoplanets
 
 #endif // __OPENSPACE_MODULE_EXOPLANETS___EXOPLANETSHELPER___H__
diff --git a/modules/exoplanets/exoplanetsmodule.cpp b/modules/exoplanets/exoplanetsmodule.cpp
index 5bda398894..a724c68c5f 100644
--- a/modules/exoplanets/exoplanetsmodule.cpp
+++ b/modules/exoplanets/exoplanetsmodule.cpp
@@ -147,6 +147,7 @@ namespace {
 
     constexpr std::string_view ExoplanetsDataFileName = "exoplanets_data.bin";
     constexpr std::string_view LookupTableFileName = "lookup.txt";
+    constexpr std::string_view TeffToBvConversionFileName = "teff_bv.txt";
 
     struct [[codegen::Dictionary(ExoplanetsModule)]] Parameters {
         // [[codegen::verbatim(EnabledInfo.description)]]
@@ -246,6 +247,14 @@ std::string ExoplanetsModule::lookUpTablePath() const {
     ).string();
 }
 
+std::string ExoplanetsModule::teffToBvConversionFilePath() const {
+    ghoul_assert(hasDataFiles(), "Data files not loaded");
+
+    return absPath(fmt::format(
+        "{}/{}", _exoplanetsDataFolder.value(), TeffToBvConversionFileName
+    )).string();
+}
+
 std::string ExoplanetsModule::bvColormapPath() const {
     return _bvColorMapPath;
 }
@@ -348,7 +357,8 @@ scripting::LuaLibrary ExoplanetsModule::luaLibrary() const {
             codegen::lua::RemoveExoplanetSystem,
             codegen::lua::ListOfExoplanets,
             codegen::lua::ListOfExoplanetsDeprecated,
-            codegen::lua::ListAvailableExoplanetSystems
+            codegen::lua::ListAvailableExoplanetSystems,
+            codegen::lua::LoadExoplanetsFromCsv
         }
     };
 }
diff --git a/modules/exoplanets/exoplanetsmodule.h b/modules/exoplanets/exoplanetsmodule.h
index 7943967ba7..a77b6a43b5 100644
--- a/modules/exoplanets/exoplanetsmodule.h
+++ b/modules/exoplanets/exoplanetsmodule.h
@@ -44,6 +44,7 @@ public:
     bool hasDataFiles() const;
     std::string exoplanetsDataPath() const;
     std::string lookUpTablePath() const;
+    std::string teffToBvConversionFilePath() const;
     std::string bvColormapPath() const;
     std::string starTexturePath() const;
     std::string starGlareTexturePath() const;
diff --git a/modules/exoplanets/exoplanetsmodule_lua.inl b/modules/exoplanets/exoplanetsmodule_lua.inl
index 2552f2037d..bdd98a510a 100644
--- a/modules/exoplanets/exoplanetsmodule_lua.inl
+++ b/modules/exoplanets/exoplanetsmodule_lua.inl
@@ -23,7 +23,9 @@
  ****************************************************************************************/
 
 #include <openspace/scene/scene.h>
+#include <ghoul/misc/csvreader.h>
 #include <algorithm>
+#include <map>
 #include <string>
 #include <string_view>
 
@@ -95,32 +97,16 @@ openspace::exoplanets::ExoplanetSystem findExoplanetSystemInData(
         system.planetNames.push_back(name);
         system.planetsData.push_back(p);
 
-        // Star data - Should not vary between planets, but one data entry might lack data
-        // for the host star while another does not. So for every planet, update star data
-        // if needed
-        const glm::vec3 pos = glm::vec3(p.positionX, p.positionY, p.positionZ);
-        if (system.starData.position != pos && isValidPosition(pos)) {
-            system.starData.position = pos;
-        }
-        if (system.starData.radius != p.rStar && !std::isnan(p.rStar)) {
-            system.starData.radius = p.rStar;
-        }
-        if (system.starData.bv != p.bmv && !std::isnan(p.bmv)) {
-            system.starData.bv = p.bmv;
-        }
-        if (system.starData.teff != p.teff && !std::isnan(p.teff)) {
-            system.starData.teff = p.teff;
-        }
-        if (system.starData.luminosity != p.luminosity && !std::isnan(p.luminosity)) {
-            system.starData.luminosity = p.luminosity;
-        }
+        updateStarDataFromNewPlanet(system.starData, p);
     }
 
     system.starName = starName;
     return system;
 }
 
-void createExoplanetSystem(const std::string& starName) {
+void createExoplanetSystem(const std::string& starName,
+                           openspace::exoplanets::ExoplanetSystem system)
+{
     using namespace openspace;
     using namespace exoplanets;
 
@@ -140,12 +126,6 @@ void createExoplanetSystem(const std::string& starName) {
         return;
     }
 
-    ExoplanetSystem system = findExoplanetSystemInData(starName);
-    if (system.planetsData.empty()) {
-        LERROR(fmt::format("Exoplanet system '{}' could not be found", starName));
-        return;
-    }
-
     const glm::vec3 starPosInParsec = system.starData.position;
     if (!isValidPosition(starPosInParsec)) {
         LERROR(fmt::format(
@@ -238,6 +218,8 @@ void createExoplanetSystem(const std::string& starName) {
 
     // Planets
     for (size_t i = 0; i < system.planetNames.size(); i++) {
+        // Note that we are here overriding some invalid parameters in the planet data.
+        // Use a reference, so that it is changed down the line
         ExoplanetDataEntry& planet = system.planetsData[i];
         const std::string planetName = system.planetNames[i];
 
@@ -616,17 +598,29 @@ std::vector<std::string> hostStarsWithSufficientData() {
 [[codegen::luawrap]] void addExoplanetSystem(
                             std::variant<std::string, std::vector<std::string>> starNames)
 {
+    std::vector<std::string> starsToAdd;
+
     if (std::holds_alternative<std::string>(starNames)) {
         // The user provided a single name
-        std::string starName = std::get<std::string>(starNames);
-        createExoplanetSystem(starName);
+        const std::string starName = std::get<std::string>(starNames);
+        starsToAdd.push_back(starName);
     }
     else {
-        std::vector<std::string> sns = std::get<std::vector<std::string>>(starNames);
-        for (const std::string& starName : sns) {
-            createExoplanetSystem(starName);
-        }
+        starsToAdd = std::get<std::vector<std::string>>(starNames);
     }
+
+    for (const std::string& starName : starsToAdd) {
+        openspace::exoplanets::ExoplanetSystem systemData =
+            findExoplanetSystemInData(starName);
+
+        if (systemData.planetsData.empty()) {
+            LERROR(fmt::format("Exoplanet system '{}' could not be found", starName));
+            return;
+        }
+
+        createExoplanetSystem(starName, systemData);
+    }
+
 }
 
 [[codegen::luawrap]] void removeExoplanetSystem(std::string starName) {
@@ -639,6 +633,11 @@ std::vector<std::string> hostStarsWithSufficientData() {
     );
 }
 
+/**
+ * Returns a list with names of the host star of all the exoplanet systems
+ * that have sufficient data for generating a visualization, based on the
+ * module's loaded data file.
+ */
 [[codegen::luawrap]] std::vector<std::string> listOfExoplanets() {
     std::vector<std::string> names = hostStarsWithSufficientData();
     return names;
@@ -674,6 +673,96 @@ listOfExoplanetsDeprecated()
     ));
 }
 
+/**
+ * Load a set of exoplanets based on custom data, in the form of a CSV file, and add
+ * them to the rendering. Can be used to load custom datasets, or more recent planets
+ * than what are included in the internal data file that is released with OpenSpace.
+ *
+ * The format and column names in the CSV sould be the same as the ones provided by the
+ * NASA Exoplanet Archive. https://exoplanetarchive.ipac.caltech.edu/
+ *
+ * We recommend downloading the file from the Exoplanet Archive's Composite data table,
+ * where multiple sources are combined into one row per planet.
+ * https://exoplanetarchive.ipac.caltech.edu/cgi-bin/TblView/nph-tblView?app=ExoTbls&config=PSCompPars
+ *
+ * Please remember to include all columns in the file download, as missing data columns
+ * may lead to an incomplete visualization.
+ *
+ * Also, avoid loading too large files of planets, as each added system will affect the
+ * rendering performance.
+ */
+[[codegen::luawrap]] void loadExoplanetsFromCsv(std::string csvFile) {
+    using namespace openspace;
+    using namespace exoplanets;
+
+    using PlanetData = ExoplanetsDataPreparationTask::PlanetData;
+
+    std::ifstream inputDataFile(csvFile);
+    if (!inputDataFile.good()) {
+        LERROR(fmt::format("Failed to open input file {}", csvFile));
+        return;
+    }
+
+    std::vector<std::string> columnNames =
+        ExoplanetsDataPreparationTask::readFirstDataRow(inputDataFile);
+
+    const ExoplanetsModule* module = global::moduleEngine->module<ExoplanetsModule>();
+    const std::string teffBvConversionPath = module->teffToBvConversionFilePath();
+
+    std::map<std::string, ExoplanetSystem> hostNameToSystemDataMap;
+
+    // Parse the file line by line to compose system information
+    std::string row;
+    while (std::getline(inputDataFile, row)) {
+        PlanetData planetData = ExoplanetsDataPreparationTask::parseDataRow(
+            row,
+            columnNames,
+            "",
+            module->teffToBvConversionFilePath()
+        );
+
+        LINFO(fmt::format("Reading data for planet: '{}' ", planetData.name));
+
+        if (!hasSufficientData(planetData.dataEntry)) {
+            LWARNING(fmt::format("Insufficient data for exoplanet: '{}'", planetData.name));
+            continue;
+        }
+
+        auto found = hostNameToSystemDataMap.find(planetData.host);
+        if (found != hostNameToSystemDataMap.end()) {
+            // Found a match. Add the planet to the system data
+            ExoplanetSystem& system = found->second;
+            sanitizeNameString(planetData.name);
+            system.planetNames.push_back(planetData.name);
+            system.planetsData.push_back(planetData.dataEntry);
+            updateStarDataFromNewPlanet(system.starData, planetData.dataEntry);
+        }
+        else {
+            // No host found. Add a new one
+            ExoplanetSystem system;
+            sanitizeNameString(planetData.name);
+            system.planetNames.push_back(planetData.name);
+            system.planetsData.push_back(planetData.dataEntry);
+            updateStarDataFromNewPlanet(system.starData, planetData.dataEntry);
+
+            hostNameToSystemDataMap[planetData.host] = system;
+        }
+    }
+
+    // Add all the added exoplanet systems
+    for (const std::pair<const std::string, ExoplanetSystem>& entry : hostNameToSystemDataMap) {
+        const std::string& hostName = entry.first;
+        const ExoplanetSystem& data = entry.second;
+        createExoplanetSystem(hostName, data);
+    }
+
+    LINFO(fmt::format(
+        "Read data for {} exoplanet systems from CSV file: '{}'. Please wait until "
+        "they are all finished initializing. You may have to reload the user interface.",
+        hostNameToSystemDataMap.size(), csvFile
+    ));
+}
+
 #include "exoplanetsmodule_lua_codegen.cpp"
 
 } // namespace
diff --git a/modules/exoplanets/tasks/exoplanetsdatapreparationtask.cpp b/modules/exoplanets/tasks/exoplanetsdatapreparationtask.cpp
index 4b9477fa80..621c287dac 100644
--- a/modules/exoplanets/tasks/exoplanetsdatapreparationtask.cpp
+++ b/modules/exoplanets/tasks/exoplanetsdatapreparationtask.cpp
@@ -118,24 +118,9 @@ void ExoplanetsDataPreparationTask::perform(
     int version = 1;
     binFile.write(reinterpret_cast<char*>(&version), sizeof(int));
 
-    auto readFirstDataRow = [](std::ifstream& file, std::string& line) -> void {
-        while (std::getline(file, line)) {
-            bool shouldSkip = line[0] == '#' || line.empty();
-            if (!shouldSkip) break;
-        }
-    };
-
-    // Find the line containing the data names
-    std::string columnNamesRow;
-    readFirstDataRow(inputDataFile, columnNamesRow);
-
-    // Read column names into a vector, for later access
-    std::vector<std::string> columnNames;
-    std::stringstream sStream(columnNamesRow);
-    std::string colName;
-    while (std::getline(sStream, colName, ',')) {
-        columnNames.push_back(colName);
-    }
+    // Read until the first line contaning the column names, and save them for
+    // later access
+    std::vector<std::string> columnNames = readFirstDataRow(inputDataFile);
 
     // Read total number of items
     int total = 0;
@@ -146,37 +131,94 @@ void ExoplanetsDataPreparationTask::perform(
     inputDataFile.clear();
     inputDataFile.seekg(0);
 
-    // Read past the first line, containing the data names
-    readFirstDataRow(inputDataFile, row);
+    // The reading is restarted, so we need to read past the first line,
+    // containing the data names, again
+    readFirstDataRow(inputDataFile);
 
     LINFO(fmt::format("Loading {} exoplanets", total));
 
+    int exoplanetCount = 0;
+    while (std::getline(inputDataFile, row)) {
+        ++exoplanetCount;
+        progressCallback(static_cast<float>(exoplanetCount) / static_cast<float>(total));
+
+        PlanetData planetData = parseDataRow(
+            row,
+            columnNames,
+            _inputSpeckPath,
+            _teffToBvFilePath
+        );
+
+        // Create look-up table
+        long pos = static_cast<long>(binFile.tellp());
+        std::string planetName = planetData.host + " " + planetData.component;
+        lutFile << planetName << "," << pos << std::endl;
+
+        binFile.write(
+            reinterpret_cast<char*>(&planetData.dataEntry),
+            sizeof(ExoplanetDataEntry)
+        );
+    }
+
+    progressCallback(1.f);
+}
+
+std::vector<std::string>
+ExoplanetsDataPreparationTask::readFirstDataRow(std::ifstream& file)
+{
+    std::string line;
+
+    // Read past any comments and empty lines
+    while (std::getline(file, line)) {
+        bool shouldSkip = line.empty() || line[0] == '#';
+        if (!shouldSkip) {
+            break;
+        }
+    }
+
+    // The identified line should contain the column names. Return them!
+    std::vector<std::string> columnNames;
+    std::stringstream sStream(line);
+    std::string colName;
+    while (std::getline(sStream, colName, ',')) {
+        columnNames.push_back(colName);
+    }
+
+    return columnNames;
+};
+
+ExoplanetsDataPreparationTask::PlanetData
+ExoplanetsDataPreparationTask::parseDataRow(std::string row,
+                                            const std::vector<std::string>& columnNames,
+                                            std::filesystem::path positionSourceFile,
+                                          std::filesystem::path bvFromTeffConversionFile)
+{
     auto readFloatData = [](const std::string& str) -> float {
-    #ifdef WIN32
+#ifdef WIN32
         float result;
         auto [p, ec] = std::from_chars(str.data(), str.data() + str.size(), result);
         if (ec == std::errc()) {
             return result;
         }
         return std::numeric_limits<float>::quiet_NaN();
-    #else
+#else
         // clang is missing float support for std::from_chars
         return !str.empty() ? std::stof(str.c_str(), nullptr) : NAN;
-    #endif
-    };
+#endif
+};
 
     auto readDoubleData = [](const std::string& str) -> double {
-    #ifdef WIN32
+#ifdef WIN32
         double result;
         auto [p, ec] = std::from_chars(str.data(), str.data() + str.size(), result);
         if (ec == std::errc()) {
             return result;
         }
         return std::numeric_limits<double>::quiet_NaN();
-    #else
+#else
         // clang is missing double support for std::from_chars
         return !str.empty() ? std::stod(str.c_str(), nullptr) : NAN;
-    #endif
+#endif
     };
 
     auto readIntegerData = [](const std::string& str) -> int {
@@ -194,202 +236,206 @@ void ExoplanetsDataPreparationTask::perform(
         return result;
     };
 
+    float ra = std::numeric_limits<float>::quiet_NaN(); // decimal degrees
+    float dec = std::numeric_limits<float>::quiet_NaN(); // decimal degrees
+    float distanceInParsec = std::numeric_limits<float>::quiet_NaN();
+
+    std::istringstream lineStream(row);
+    int columnIndex = 0;
+
     ExoplanetDataEntry p;
+    std::string component;
+    std::string starName;
+    std::string name;
+
     std::string data;
-    int exoplanetCount = 0;
-    while (std::getline(inputDataFile, row)) {
-        ++exoplanetCount;
-        progressCallback(static_cast<float>(exoplanetCount) / static_cast<float>(total));
+    while (std::getline(lineStream, data, ',')) {
+        const std::string& column = columnNames[columnIndex];
+        columnIndex++;
 
-        std::string component;
-        std::string starName;
-
-        float ra = std::numeric_limits<float>::quiet_NaN(); // decimal degrees
-        float dec = std::numeric_limits<float>::quiet_NaN(); // decimal degrees
-        float distanceInParsec = std::numeric_limits<float>::quiet_NaN();
-
-        std::istringstream lineStream(row);
-        int columnIndex = 0;
-        while (std::getline(lineStream, data, ',')) {
-            const std::string& column = columnNames[columnIndex];
-            columnIndex++;
-
-            if (column == "pl_letter") {
-                component = readStringData(data);
-            }
-            // Orbital semi-major axis
-            else if (column == "pl_orbsmax") {
-                p.a = readFloatData(data);
-            }
-            else if (column == "pl_orbsmaxerr1") {
-                p.aUpper = readDoubleData(data);
-            }
-            else if (column == "pl_orbsmaxerr2") {
-                p.aLower = -readDoubleData(data);
-            }
-            // Orbital eccentricity
-            else if (column == "pl_orbeccen") {
-                p.ecc = readFloatData(data);
-            }
-            else if (column == "pl_orbeccenerr1") {
-                p.eccUpper = readFloatData(data);
-            }
-            else if (column == "pl_orbeccenerr2") {
-                p.eccLower = -readFloatData(data);
-            }
-            // Orbital inclination
-            else if (column == "pl_orbincl") {
-                p.i = readFloatData(data);
-            }
-            else if (column == "pl_orbinclerr1") {
-                p.iUpper = readFloatData(data);
-            }
-            else if (column == "pl_orbinclerr2") {
-                p.iLower = -readFloatData(data);
-            }
-            // Argument of periastron
-            else if (column == "pl_orblper") {
-                p.omega = readFloatData(data);
-            }
-            else if (column == "pl_orblpererr1") {
-                p.omegaUpper = readFloatData(data);
-            }
-            else if (column == "pl_orblpererr2") {
-                p.omegaLower = -readFloatData(data);
-            }
-            // Orbital period
-            else if (column == "pl_orbper") {
-                p.per = readDoubleData(data);
-            }
-            else if (column == "pl_orbpererr1") {
-                p.perUpper = readFloatData(data);
-            }
-            else if (column == "pl_orbpererr2") {
-                p.perLower = -readFloatData(data);
-            }
-            // Radius of the planet (Jupiter radii)
-            else if (column == "pl_radj") {
-                p.r = readDoubleData(data);
-            }
-            else if (column == "pl_radjerr1") {
-                p.rUpper = readDoubleData(data);
-            }
-            else if (column == "pl_radjerr2") {
-                p.rLower = -readDoubleData(data);
-            }
-            // Time of transit midpoint
-            else if (column == "pl_tranmid") {
-                p.tt = readDoubleData(data);
-            }
-            else if (column == "pl_tranmiderr1") {
-                p.ttUpper = readFloatData(data);
-            }
-            else if (column == "pl_tranmiderr2") {
-                p.ttLower = -readFloatData(data);
-            }
-            // Star - name and position
-            else if (column == "hostname") {
-                starName = readStringData(data);
-                glm::vec3 position = starPosition(starName);
-                p.positionX = position[0];
-                p.positionY = position[1];
-                p.positionZ = position[2];
-            }
-            else if (column == "ra") {
-                ra = readFloatData(data);
-            }
-            else if (column == "dec") {
-                dec = readFloatData(data);
-            }
-            else if (column == "sy_dist") {
-                distanceInParsec = readFloatData(data);
-            }
-            // Star radius
-            else if (column == "st_rad") {
-                p.rStar = readFloatData(data);
-            }
-            else if (column == "st_raderr1") {
-                p.rStarUpper = readFloatData(data);
-            }
-            else if (column == "st_raderr2") {
-                p.rStarLower = -readFloatData(data);
-            }
-            // Effective temperature and color of star
-            // (B-V color index computed from star's effective temperature)
-            else if (column == "st_teff") {
-                p.teff = readFloatData(data);
-                p.bmv = bvFromTeff(p.teff);
-            }
-            else if (column == "st_tefferr1") {
-                p.teffUpper = readFloatData(data);
-            }
-            else if (column == "st_tefferr2") {
-                p.teffLower = -readFloatData(data);
-            }
-            // Star luminosity
-            else if (column == "st_lum") {
-                float dataInLogSolar = readFloatData(data);
-                p.luminosity = static_cast<float>(std::pow(10, dataInLogSolar));
-            }
-            else if (column == "st_lumerr1") {
-                float dataInLogSolar = readFloatData(data);
-                p.luminosityUpper = static_cast<float>(std::pow(10, dataInLogSolar));
-            }
-            else if (column == "st_lumerr2") {
-                float dataInLogSolar = readFloatData(data);
-                p.luminosityLower = static_cast<float>(-std::pow(10, dataInLogSolar));
-            }
-            // Is the planet orbiting a binary system?
-            else if (column == "cb_flag") {
-                p.binary = static_cast<bool>(readIntegerData(data));
-            }
-            // Number of stars in the system
-            else if (column == "sy_snum") {
-                p.nStars = readIntegerData(data);
-            }
-            // Number of planets in the system
-            else if (column == "sy_pnum") {
-                p.nPlanets = readIntegerData(data);
-            }
+        if (column == "pl_letter") {
+            component = readStringData(data);
         }
-
-        // @TODO (emmbr 2020-10-05) Currently, the dataset has no information about the
-        // longitude of the ascending node, but maybe it might in the future
-        p.bigOmega = std::numeric_limits<float>::quiet_NaN();
-        p.bigOmegaUpper = std::numeric_limits<float>::quiet_NaN();
-        p.bigOmegaLower = std::numeric_limits<float>::quiet_NaN();
-
-        bool foundPositionFromSpeck = !std::isnan(p.positionX);
-        bool hasDistance = !std::isnan(distanceInParsec);
-        bool hasIcrsCoords = !std::isnan(ra) && !std::isnan(dec) && hasDistance;
-
-        if (!foundPositionFromSpeck && hasIcrsCoords) {
-            glm::dvec3 pos = icrsToGalacticCartesian(ra, dec, distanceInParsec);
-            p.positionX = static_cast<float>(pos.x);
-            p.positionY = static_cast<float>(pos.y);
-            p.positionZ = static_cast<float>(pos.z);
+        else if (column == "pl_name") {
+            name = readStringData(data);
+        }
+        // Orbital semi-major axis
+        else if (column == "pl_orbsmax") {
+            p.a = readFloatData(data);
+        }
+        else if (column == "pl_orbsmaxerr1") {
+            p.aUpper = readDoubleData(data);
+        }
+        else if (column == "pl_orbsmaxerr2") {
+            p.aLower = -readDoubleData(data);
+        }
+        // Orbital eccentricity
+        else if (column == "pl_orbeccen") {
+            p.ecc = readFloatData(data);
+        }
+        else if (column == "pl_orbeccenerr1") {
+            p.eccUpper = readFloatData(data);
+        }
+        else if (column == "pl_orbeccenerr2") {
+            p.eccLower = -readFloatData(data);
+        }
+        // Orbital inclination
+        else if (column == "pl_orbincl") {
+            p.i = readFloatData(data);
+        }
+        else if (column == "pl_orbinclerr1") {
+            p.iUpper = readFloatData(data);
+        }
+        else if (column == "pl_orbinclerr2") {
+            p.iLower = -readFloatData(data);
+        }
+        // Argument of periastron
+        else if (column == "pl_orblper") {
+            p.omega = readFloatData(data);
+        }
+        else if (column == "pl_orblpererr1") {
+            p.omegaUpper = readFloatData(data);
+        }
+        else if (column == "pl_orblpererr2") {
+            p.omegaLower = -readFloatData(data);
+        }
+        // Orbital period
+        else if (column == "pl_orbper") {
+            p.per = readDoubleData(data);
+        }
+        else if (column == "pl_orbpererr1") {
+            p.perUpper = readFloatData(data);
+        }
+        else if (column == "pl_orbpererr2") {
+            p.perLower = -readFloatData(data);
+        }
+        // Radius of the planet (Jupiter radii)
+        else if (column == "pl_radj") {
+            p.r = readDoubleData(data);
+        }
+        else if (column == "pl_radjerr1") {
+            p.rUpper = readDoubleData(data);
+        }
+        else if (column == "pl_radjerr2") {
+            p.rLower = -readDoubleData(data);
+        }
+        // Time of transit midpoint
+        else if (column == "pl_tranmid") {
+            p.tt = readDoubleData(data);
+        }
+        else if (column == "pl_tranmiderr1") {
+            p.ttUpper = readFloatData(data);
+        }
+        else if (column == "pl_tranmiderr2") {
+            p.ttLower = -readFloatData(data);
+        }
+        // Star - name and position
+        else if (column == "hostname") {
+            starName = readStringData(data);
+            glm::vec3 position = starPosition(starName, positionSourceFile);
+            p.positionX = position[0];
+            p.positionY = position[1];
+            p.positionZ = position[2];
+        }
+        else if (column == "ra") {
+            ra = readFloatData(data);
+        }
+        else if (column == "dec") {
+            dec = readFloatData(data);
+        }
+        else if (column == "sy_dist") {
+            distanceInParsec = readFloatData(data);
+        }
+        // Star radius
+        else if (column == "st_rad") {
+            p.rStar = readFloatData(data);
+        }
+        else if (column == "st_raderr1") {
+            p.rStarUpper = readFloatData(data);
+        }
+        else if (column == "st_raderr2") {
+            p.rStarLower = -readFloatData(data);
+        }
+        // Effective temperature and color of star
+        // (B-V color index computed from star's effective temperature)
+        else if (column == "st_teff") {
+            p.teff = readFloatData(data);
+            p.bmv = bvFromTeff(p.teff, bvFromTeffConversionFile);
+        }
+        else if (column == "st_tefferr1") {
+            p.teffUpper = readFloatData(data);
+        }
+        else if (column == "st_tefferr2") {
+            p.teffLower = -readFloatData(data);
+        }
+        // Star luminosity
+        else if (column == "st_lum") {
+            float dataInLogSolar = readFloatData(data);
+            p.luminosity = static_cast<float>(std::pow(10, dataInLogSolar));
+        }
+        else if (column == "st_lumerr1") {
+            float dataInLogSolar = readFloatData(data);
+            p.luminosityUpper = static_cast<float>(std::pow(10, dataInLogSolar));
+        }
+        else if (column == "st_lumerr2") {
+            float dataInLogSolar = readFloatData(data);
+            p.luminosityLower = static_cast<float>(-std::pow(10, dataInLogSolar));
+        }
+        // Is the planet orbiting a binary system?
+        else if (column == "cb_flag") {
+            p.binary = readIntegerData(data) != 0;
+        }
+        // Number of stars in the system
+        else if (column == "sy_snum") {
+            p.nStars = readIntegerData(data);
+        }
+        // Number of planets in the system
+        else if (column == "sy_pnum") {
+            p.nPlanets = readIntegerData(data);
         }
-
-        // Create look-up table
-        long pos = static_cast<long>(binFile.tellp());
-        std::string planetName = starName + " " + component;
-        lutFile << planetName << "," << pos << std::endl;
-
-        binFile.write(reinterpret_cast<char*>(&p), sizeof(ExoplanetDataEntry));
     }
 
-    progressCallback(1.f);
+    // @TODO (emmbr 2020-10-05) Currently, the dataset has no information about the
+    // longitude of the ascending node, but maybe it might in the future
+    p.bigOmega = std::numeric_limits<float>::quiet_NaN();
+    p.bigOmegaUpper = std::numeric_limits<float>::quiet_NaN();
+    p.bigOmegaLower = std::numeric_limits<float>::quiet_NaN();
+
+    bool foundPositionFromSpeck = !std::isnan(p.positionX);
+    bool hasDistance = !std::isnan(distanceInParsec);
+    bool hasIcrsCoords = !std::isnan(ra) && !std::isnan(dec) && hasDistance;
+
+    if (!foundPositionFromSpeck && hasIcrsCoords) {
+        glm::dvec3 pos = icrsToGalacticCartesian(ra, dec, distanceInParsec);
+        p.positionX = static_cast<float>(pos.x);
+        p.positionY = static_cast<float>(pos.y);
+        p.positionZ = static_cast<float>(pos.z);
+    }
+
+    return {
+        .host = starName,
+        .name = name,
+        .component = component,
+        .dataEntry = p
+    };
 }
 
-glm::vec3 ExoplanetsDataPreparationTask::starPosition(const std::string& starName) {
-    std::ifstream exoplanetsFile(_inputSpeckPath);
-    if (!exoplanetsFile) {
-        LERROR(fmt::format("Error opening file expl.speck"));
+glm::vec3 ExoplanetsDataPreparationTask::starPosition(const std::string& starName,
+                                                      const std::filesystem::path& sourceFile)
+{
+    glm::vec3 position = glm::vec3(std::numeric_limits<float>::quiet_NaN());
+
+    if (sourceFile.empty()) {
+        // No file specified => return NaN position
+        return position;
     }
 
-    glm::vec3 position{ std::numeric_limits<float>::quiet_NaN() };
-    std::string line;
+    std::ifstream exoplanetsFile(sourceFile);
+    if (!exoplanetsFile) {
+        LERROR(fmt::format("Error opening file {}", sourceFile));
+    }
 
+    std::string line;
     while (std::getline(exoplanetsFile, line)) {
         bool shouldSkipLine = (
             line.empty() || line[0] == '#' || line.substr(0, 7) == "datavar" ||
@@ -423,17 +469,21 @@ glm::vec3 ExoplanetsDataPreparationTask::starPosition(const std::string& starNam
     return position;
 }
 
-float ExoplanetsDataPreparationTask::bvFromTeff(float teff) {
+float ExoplanetsDataPreparationTask::bvFromTeff(float teff,
+                                              const std::filesystem::path& conversionFile)
+{
     if (std::isnan(teff)) {
         return std::numeric_limits<float>::quiet_NaN();
     }
 
-    std::ifstream teffToBvFile(_teffToBvFilePath);
+    std::ifstream teffToBvFile(conversionFile);
     if (!teffToBvFile.good()) {
-        LERROR(fmt::format("Failed to open teff_bv.txt file"));
+        LERROR(fmt::format("Failed to open file {}", conversionFile));
         return std::numeric_limits<float>::quiet_NaN();
     }
 
+    // Find the line in the file that most closely corresponds to the specified teff,
+    // and finally interpolate the value
     float bv = 0.f;
     float bvUpper = 0.f;
     float bvLower = 0.f;
diff --git a/modules/exoplanets/tasks/exoplanetsdatapreparationtask.h b/modules/exoplanets/tasks/exoplanetsdatapreparationtask.h
index 39bdd0ae65..5d0542af28 100644
--- a/modules/exoplanets/tasks/exoplanetsdatapreparationtask.h
+++ b/modules/exoplanets/tasks/exoplanetsdatapreparationtask.h
@@ -27,6 +27,8 @@
 
 #include <openspace/util/task.h>
 
+#include <modules/exoplanets/exoplanetshelper.h>
+
 #include <openspace/properties/vector/vec3property.h>
 #include <filesystem>
 #include <string>
@@ -35,11 +37,49 @@ namespace openspace::exoplanets {
 
 class ExoplanetsDataPreparationTask : public Task {
 public:
+    struct PlanetData {
+        std::string host;
+        std::string name;
+        std::string component;
+        ExoplanetDataEntry dataEntry;
+    };
+
     ExoplanetsDataPreparationTask(const ghoul::Dictionary& dictionary);
     std::string description() override;
     void perform(const Task::ProgressCallback& progressCallback) override;
     static documentation::Documentation documentation();
 
+    /**
+     * The exoplanet file includes a set of commented lines in the beginning. This
+     * funciton skips those lines, as well as any empty lines, and continues reading
+     * until it find the first valid data line (which will be the column names).
+     *
+     * \param file The input file stream used for reading the file
+     * \return The content of the first data row (i.e. the column names).
+     */
+    static std::vector<std::string> readFirstDataRow(std::ifstream& file);
+
+    /**
+     * Parse a row in the CSV file of exoplanets. Assumes the same format and column
+     * names as provided by the NASA Exoplanet Archive.
+     * (https://exoplanetarchive.ipac.caltech.edu/)
+     *
+     * \param row The row to parse, given as a string
+     * \param columnNames The list of column names in the file, from the CSV header
+     * \param positionSourceFile A SPECK file to use for getting the position of the star.
+     *        This is used to make sure the position of the star matches those of other star
+     *        datasets. If no file is provided, the position from the CSV data file is read
+     *        and used instead
+     * \param bvFromTeffConversionFile A text file containing a mapping between effective
+     *        temperature (teff) values and B-V color index values. Each line should include
+     *        two values separated by a comma: first the teff value and hten the B-V value
+     * \return An object containing the parsed information.
+     */
+    static PlanetData parseDataRow(std::string row,
+        const std::vector<std::string>& columnNames,
+        std::filesystem::path positionSourceFile,
+        std::filesystem::path bvFromTeffConversionFile);
+
 private:
     std::filesystem::path _inputDataPath;
     std::filesystem::path _inputSpeckPath;
@@ -47,10 +87,19 @@ private:
     std::filesystem::path _outputLutPath;
     std::filesystem::path _teffToBvFilePath;
 
-    glm::vec3 starPosition(const std::string& starName);
+    /**
+     * Try to find the star position from an input speck file. If not found, the
+     * returned position will contain NaN values.
+     *
+     * \param starName The name of the star to look for in the file
+     * \param sourceFile The name of the file in which to look
+     * \return The resulting star position, given in galactix XYZ
+     */
+    static glm::vec3 starPosition(const std::string& starName,
+        const std::filesystem::path& sourceFile);
 
     // Compute b-v color from teff value using a conversion file
-    float bvFromTeff(float teff);
+    static float bvFromTeff(float teff, const std::filesystem::path& conversionFile);
 };
 
 } // namespace openspace::exoplanets

From 4d5ce33903e097d19e2932bd3bce31c26e533294 Mon Sep 17 00:00:00 2001
From: Emma Broman <emma.broman@liu.se>
Date: Fri, 18 Aug 2023 16:33:59 +0200
Subject: [PATCH 106/701] Add UI descriptions and asset metas to a bunch of
 assets (#2845)

* Add asset meta and GUI description to AltAz grid and move to Night sky in menu

To avoid confusion with other grids, that have a global position rather than a local one

* Add asset metas and GUI descriptions to Night Sky assets

* Add metas and update name of some example assets

* Night sky asset meta

* Add descriptions and asset metas to scale objects

---------

Co-authored-by: Ylva Selling <ylva.selling@gmail.com>
---
 .../educational/scale/arc_de_triomphe.asset   | 14 +++++++++++++
 data/assets/educational/scale/big_ben.asset   | 13 ++++++++++++
 .../educational/scale/burj_khalifa.asset      | 14 +++++++++++++
 .../educational/scale/eiffeltower.asset       | 13 ++++++++++++
 .../scale/empire_state_building.asset         | 14 +++++++++++++
 .../educational/scale/gateway_arch.asset      | 13 ++++++++++++
 .../scale/golden_gate_bridge.asset            | 13 ++++++++++++
 .../scale/kuala_lumpur_tower.asset            | 13 ++++++++++++
 data/assets/educational/scale/rose_bowl.asset | 16 +++++++++++++++
 .../assets/educational/scale/school_bus.asset | 15 +++++++++++++-
 data/assets/educational/scale/scientist.asset | 12 +++++++++++
 .../educational/scale/statue_of_liberty.asset | 15 ++++++++++++++
 data/assets/examples/dashboarditems.asset     | 12 +++++++++++
 .../assets/examples/debugcoordinateaxes.asset | 17 ++++++++++++++++
 data/assets/examples/discs.asset              | 10 ++++++++++
 data/assets/examples/globerotation.asset      | 12 +++++++++++
 data/assets/examples/globetranslation.asset   | 12 +++++++++++
 data/assets/examples/grids.asset              | 14 +++++++++++++
 data/assets/examples/joystickproperty.asset   | 11 ++++++++++
 data/assets/examples/primitives.asset         | 11 ++++++++++
 .../examples/renderableplaneimageonline.asset | 12 +++++++++++
 data/assets/examples/screenspacebrowser.asset | 11 ++++++++++
 data/assets/examples/spheres.asset            | 12 +++++++++++
 data/assets/examples/statemachine.asset       | 11 ++++++++++
 data/assets/examples/urlsynchronization.asset | 16 +++++++++++++++
 data/assets/examples/video/videoglobe.asset   |  6 +++---
 data/assets/examples/video/videoplane.asset   |  6 +++---
 .../examples/video/videoscreenspace.asset     |  6 +++---
 data/assets/examples/video/videosphere.asset  |  6 +++---
 data/assets/nightsky/altaz.asset              | 20 +++++++++++++++++--
 .../assets/nightsky/cardinal_directions.asset | 16 +++++++++++++++
 data/assets/nightsky/ecliptic_band.asset      | 13 ++++++++++++
 data/assets/nightsky/equatorial_band.asset    | 12 +++++++++++
 data/assets/nightsky/galactic_band.asset      | 13 ++++++++++++
 data/assets/nightsky/light_pollution.asset    | 15 ++++++++++++++
 data/assets/nightsky/meridian.asset           | 12 +++++++++++
 data/assets/nightsky/nightsky.asset           | 10 ++++++++++
 data/assets/nightsky/planets.asset            | 19 ++++++++++++++++++
 data/assets/nightsky/zenith.asset             | 14 +++++++++++++
 39 files changed, 479 insertions(+), 15 deletions(-)

diff --git a/data/assets/educational/scale/arc_de_triomphe.asset b/data/assets/educational/scale/arc_de_triomphe.asset
index 7b42395fae..3640c96a83 100644
--- a/data/assets/educational/scale/arc_de_triomphe.asset
+++ b/data/assets/educational/scale/arc_de_triomphe.asset
@@ -40,6 +40,8 @@ local ScaleModel = {
   },
   GUI = {
     Name = "Arc de Triomphe",
+    Description = [[The triumphal arch is 50 m (164 ft) tall and has a footprint of
+      45x22 m (148x72 ft).]],
     Path = "/Scale Objects"
   }
 }
@@ -83,3 +85,15 @@ end)
 asset.export(ScaleModel)
 asset.export("UpdatePositionAction", UpdatePositionAction.Identifier)
 asset.export("ResetPositionAction", ResetPositionAction.Identifier)
+
+
+asset.meta = {
+  Name = "Scale Model - Arc de Triomphe",
+  Version = "1.0",
+  Description = [[A 1:1 scale model of the Arc de Triomphe. Per default it is placed at
+    its actual position in Paris, France. But the asset also includes actions to move it
+    to a position under the camera, or back to its original position.]],
+  Author = "OpenSpace Team",
+  URL = "http://openspaceproject.com",
+  License = "MIT license"
+}
diff --git a/data/assets/educational/scale/big_ben.asset b/data/assets/educational/scale/big_ben.asset
index b5a88e6eff..6720edafe6 100644
--- a/data/assets/educational/scale/big_ben.asset
+++ b/data/assets/educational/scale/big_ben.asset
@@ -42,6 +42,7 @@ local ScaleModel = {
   },
   GUI = {
     Name = "Big Ben",
+    Description = "The clock tower is 96 m (316 ft) tall.",
     Path = "/Scale Objects"
   }
 }
@@ -85,3 +86,15 @@ end)
 asset.export(ScaleModel)
 asset.export("UpdatePositionAction", UpdatePositionAction.Identifier)
 asset.export("ResetPositionAction", ResetPositionAction.Identifier)
+
+
+asset.meta = {
+  Name = "Scale Model - Big Ben",
+  Version = "1.0",
+  Description = [[A 1:1 scale model of the Big Ben. Per default it is placed at its
+    actual position in London, England. But the asset also includes actions to move
+    it to a position under the camera, or back to its original position.]],
+  Author = "OpenSpace Team",
+  URL = "http://openspaceproject.com",
+  License = "MIT license"
+}
diff --git a/data/assets/educational/scale/burj_khalifa.asset b/data/assets/educational/scale/burj_khalifa.asset
index b69921106b..0f7d24101e 100644
--- a/data/assets/educational/scale/burj_khalifa.asset
+++ b/data/assets/educational/scale/burj_khalifa.asset
@@ -43,6 +43,8 @@ local ScaleModel = {
   },
   GUI = {
     Name = "Burj Khalifa",
+    Description = [[The skyscraper is 830 m (2,722 ft) tall, and the tallest in the
+      world as of 2009.]],
     Path = "/Scale Objects"
   }
 }
@@ -85,3 +87,15 @@ end)
 asset.export(ScaleModel)
 asset.export("UpdatePositionAction", UpdatePositionAction.Identifier)
 asset.export("ResetPositionAction", ResetPositionAction.Identifier)
+
+
+asset.meta = {
+  Name = "Scale Model - Burj Khalifa",
+  Version = "1.0",
+  Description = [[A 1:1 scale model of the Burj Khalifa. Per default it is placed at its
+    actual position in Dubai. But the asset also includes actions to move it to a
+    position under the camera, or back to its original position.]],
+  Author = "OpenSpace Team",
+  URL = "http://openspaceproject.com",
+  License = "MIT license"
+}
diff --git a/data/assets/educational/scale/eiffeltower.asset b/data/assets/educational/scale/eiffeltower.asset
index 4437cdedab..ed612a1271 100644
--- a/data/assets/educational/scale/eiffeltower.asset
+++ b/data/assets/educational/scale/eiffeltower.asset
@@ -46,6 +46,7 @@ local ScaleModel = {
   },
   GUI = {
     Name = "Eiffel Tower",
+    Description = "The tower is 330 m (1,083 ft) tall.",
     Path = "/Scale Objects"
   }
 }
@@ -89,3 +90,15 @@ end)
 asset.export(ScaleModel)
 asset.export("UpdatePositionAction", UpdatePositionAction.Identifier)
 asset.export("ResetPositionAction", ResetPositionAction.Identifier)
+
+
+asset.meta = {
+  Name = "Scale Model - Eiffel Tower",
+  Version = "1.0",
+  Description = [[A 1:1 scale model of the Eiffel Tower. Per default it is placed at
+    its actual position in Paris, France. But the asset also includes actions to move it
+    to a position under the camera, or back to its original position.]],
+  Author = "OpenSpace Team",
+  URL = "http://openspaceproject.com",
+  License = "MIT license"
+}
diff --git a/data/assets/educational/scale/empire_state_building.asset b/data/assets/educational/scale/empire_state_building.asset
index 0ba6828e1f..c35daf815e 100644
--- a/data/assets/educational/scale/empire_state_building.asset
+++ b/data/assets/educational/scale/empire_state_building.asset
@@ -45,6 +45,8 @@ local ScaleModel = {
   },
   GUI = {
     Name = "Empire State Building",
+    Description = [[The building is 443 m (1,454 ft) tall, including the spire, and has
+      102 floors. It has a footprint of 129x57 m (424x187 ft).]],
     Path = "/Scale Objects"
   }
 }
@@ -88,3 +90,15 @@ end)
 asset.export(ScaleModel)
 asset.export("UpdatePositionAction", UpdatePositionAction.Identifier)
 asset.export("ResetPositionAction", ResetPositionAction.Identifier)
+
+
+asset.meta = {
+  Name = "Scale Model - Empire State Building",
+  Version = "1.0",
+  Description = [[A 1:1 scale model of the Empire State Building. Per default it is
+    placed at its actual position in New York City. But the asset also includes actions
+    to move it to a position under the camera, or back to its original position.]],
+  Author = "OpenSpace Team",
+  URL = "http://openspaceproject.com",
+  License = "MIT license"
+}
diff --git a/data/assets/educational/scale/gateway_arch.asset b/data/assets/educational/scale/gateway_arch.asset
index 451b19e50b..2d089375e4 100644
--- a/data/assets/educational/scale/gateway_arch.asset
+++ b/data/assets/educational/scale/gateway_arch.asset
@@ -46,6 +46,7 @@ local ScaleModel = {
   },
   GUI = {
     Name = "Gateway Arch",
+    Description = "The arch monument is 192 m (630 ft) tall.",
     Path = "/Scale Objects"
   }
 }
@@ -89,3 +90,15 @@ end)
 asset.export(ScaleModel)
 asset.export("UpdatePositionAction", UpdatePositionAction.Identifier)
 asset.export("ResetPositionAction", ResetPositionAction.Identifier)
+
+
+asset.meta = {
+  Name = "Scale Model - Gateway Arch",
+  Version = "1.0",
+  Description = [[A 1:1 scale model of the Gateway Arch. Per default it is placed at its
+    actual position in Saint Louis, Missouri. But the asset also includes actions to move
+    it to a position under the camera, or back to its original position.]],
+  Author = "OpenSpace Team",
+  URL = "http://openspaceproject.com",
+  License = "MIT license"
+}
diff --git a/data/assets/educational/scale/golden_gate_bridge.asset b/data/assets/educational/scale/golden_gate_bridge.asset
index e66860e047..5e7b07d3fc 100644
--- a/data/assets/educational/scale/golden_gate_bridge.asset
+++ b/data/assets/educational/scale/golden_gate_bridge.asset
@@ -46,6 +46,7 @@ local ScaleModel = {
   },
   GUI = {
     Name = "Golden Gate Bridge",
+    Description = "The bridge is 2,737 m (8,980 ft) long and 227 m (746 ft) high.",
     Path = "/Scale Objects"
   }
 }
@@ -89,3 +90,15 @@ end)
 asset.export(ScaleModel)
 asset.export("UpdatePositionAction", UpdatePositionAction.Identifier)
 asset.export("ResetPositionAction", ResetPositionAction.Identifier)
+
+
+asset.meta = {
+  Name = "Scale Model - Golden Gate Bridge",
+  Version = "1.0",
+  Description = [[A 1:1 scale model of the Golden Gate Bridge. Per default it is placed
+    at its actual position in San Fransisco. But the asset also includes actions to move
+    it to a position under the camera, or back to its original position.]],
+  Author = "OpenSpace Team",
+  URL = "http://openspaceproject.com",
+  License = "MIT license"
+}
diff --git a/data/assets/educational/scale/kuala_lumpur_tower.asset b/data/assets/educational/scale/kuala_lumpur_tower.asset
index 24faa8229a..6a4f7ce950 100644
--- a/data/assets/educational/scale/kuala_lumpur_tower.asset
+++ b/data/assets/educational/scale/kuala_lumpur_tower.asset
@@ -40,6 +40,7 @@ local ScaleModel = {
   },
   GUI = {
     Name = "Kuala Lumpur Tower",
+    Description = "The tower is 421 m (1,381 ft) tall.",
     Path = "/Scale Objects"
   }
 }
@@ -83,3 +84,15 @@ end)
 asset.export(ScaleModel)
 asset.export("UpdatePositionAction", UpdatePositionAction.Identifier)
 asset.export("ResetPositionAction", ResetPositionAction.Identifier)
+
+
+asset.meta = {
+  Name = "Scale Model - Kuala Lumpur Tower",
+  Version = "1.0",
+  Description = [[A 1:1 scale model of the Kuala Lumpur Tower. Per default it is placed
+    at its actual position in Kuala Lumpur, Malaysia. But the asset also includes actions
+    to move it to a position under the camera, or back to its original position.]],
+  Author = "OpenSpace Team",
+  URL = "http://openspaceproject.com",
+  License = "MIT license"
+}
diff --git a/data/assets/educational/scale/rose_bowl.asset b/data/assets/educational/scale/rose_bowl.asset
index 97f93c86fd..67f3a660a1 100644
--- a/data/assets/educational/scale/rose_bowl.asset
+++ b/data/assets/educational/scale/rose_bowl.asset
@@ -41,6 +41,10 @@ local ScaleModel = {
   },
   GUI = {
     Name = "Rose Bowl",
+    Description = [[The stadium seats over 92,000 people, with 77 rows of seats. It
+      measures 880 feet (268 meters) from the north rim to the south rim, and 695 feet
+      (212 meters) from east to west. The turfed area is 79,156 square feet (7354
+      square meters).]],
     Path = "/Scale Objects"
   }
 }
@@ -84,3 +88,15 @@ end)
 asset.export(ScaleModel)
 asset.export("UpdatePositionAction", UpdatePositionAction.Identifier)
 asset.export("ResetPositionAction", ResetPositionAction.Identifier)
+
+
+asset.meta = {
+  Name = "Scale Model - Rose Bowl Stadium",
+  Version = "1.0",
+  Description = [[A 1:1 scale model of the Rose Bowl Stadium. Per default it is placed
+    at its actual position in Pasadena, California. But the asset also includes actions
+    to move it to a position under the camera, or back to its original position.]],
+  Author = "OpenSpace Team",
+  URL = "http://openspaceproject.com",
+  License = "MIT license"
+}
diff --git a/data/assets/educational/scale/school_bus.asset b/data/assets/educational/scale/school_bus.asset
index 8147de93ff..ba9cdf20db 100644
--- a/data/assets/educational/scale/school_bus.asset
+++ b/data/assets/educational/scale/school_bus.asset
@@ -41,6 +41,8 @@ local ScaleModel = {
   },
   GUI = {
     Name = "School bus",
+    Desription = [[The average length of a full size US school bus is above 35 feet
+      (10.7 meters).]],
     Path = "/Scale Objects"
   }
 }
@@ -61,7 +63,7 @@ local ResetPositionAction = {
   Name = "Reset School bus position",
   Command = [[
     openspace.globebrowsing.setNodePosition("Scale_SchoolBus", "]] .. earthAsset.Earth.Identifier .. [[", ]] .. Location[1] .. "," .. Location[2] .. ")",
-  Documentation = "Resets the school bus back to its actual location",
+  Documentation = "Resets the school bus back to its start location",
   GuiPath = "/Scale Objects",
   IsLocal = false
 }
@@ -83,3 +85,14 @@ end)
 asset.export(ScaleModel)
 asset.export("UpdatePositionAction", UpdatePositionAction.Identifier)
 asset.export("ResetPositionAction", ResetPositionAction.Identifier)
+
+
+asset.meta = {
+  Name = "Scale Model - Eiffel Tower",
+  Version = "1.0",
+  Description = [[A 1:1 scale model of a US school bus, with actions to move
+    it to a position under the camera, or back to its start position.]],
+  Author = "OpenSpace Team",
+  URL = "http://openspaceproject.com",
+  License = "MIT license"
+}
diff --git a/data/assets/educational/scale/scientist.asset b/data/assets/educational/scale/scientist.asset
index 14d0139859..8e889ac0f0 100644
--- a/data/assets/educational/scale/scientist.asset
+++ b/data/assets/educational/scale/scientist.asset
@@ -41,6 +41,7 @@ local ScaleModel = {
   },
   GUI = {
     Name = "Scientist",
+    Description = [[The average height of a human is a bit under 170 cm (5'7").]],
     Path = "/Scale Objects"
   }
 }
@@ -84,3 +85,14 @@ end)
 asset.export(ScaleModel)
 asset.export("UpdatePositionAction", UpdatePositionAction.Identifier)
 asset.export("ResetPositionAction", ResetPositionAction.Identifier)
+
+
+asset.meta = {
+  Name = "Scale Model - Eiffel Tower",
+  Version = "1.0",
+  Description = [[A 1:1 scale model of a human scientist, with actions to move
+    it to a position under the camera, or back to its start position.]],
+  Author = "OpenSpace Team",
+  URL = "http://openspaceproject.com",
+  License = "MIT license"
+}
diff --git a/data/assets/educational/scale/statue_of_liberty.asset b/data/assets/educational/scale/statue_of_liberty.asset
index 076469747e..31171ac56e 100644
--- a/data/assets/educational/scale/statue_of_liberty.asset
+++ b/data/assets/educational/scale/statue_of_liberty.asset
@@ -41,6 +41,8 @@ local ScaleModel = {
   },
   GUI = {
     Name = "Statue of Liberty",
+    Description = [[From ground level, the statue is 93 meters (305 feet) tall, up to the
+      torch.]],
     Path = "/Scale Objects"
   }
 }
@@ -84,3 +86,16 @@ end)
 asset.export(ScaleModel)
 asset.export("UpdatePositionAction", UpdatePositionAction.Identifier)
 asset.export("ResetPositionAction", ResetPositionAction.Identifier)
+
+
+asset.meta = {
+  Name = "Scale Model - Statue of Liberty",
+  Version = "1.0",
+  Description = [[A 1:1 scale model of the Statue of Liberty. Per default it is
+    placed at its actual position on Liberty Island in New York City. But the asset
+    also includes actions to move it to a position under the camera, or back to its
+    original position.]],
+  Author = "OpenSpace Team",
+  URL = "http://openspaceproject.com",
+  License = "MIT license"
+}
diff --git a/data/assets/examples/dashboarditems.asset b/data/assets/examples/dashboarditems.asset
index cb6cdad74e..f6c3b14179 100644
--- a/data/assets/examples/dashboarditems.asset
+++ b/data/assets/examples/dashboarditems.asset
@@ -100,3 +100,15 @@ asset.export(Mission)
 asset.export(PropertyValue)
 asset.export(ElapsedTime)
 asset.export(InputState)
+
+
+asset.meta = {
+  Name = "Dashboard Items Example",
+  Version = "1.0",
+  Description = [[Examples of different types of dashboard items. These are dynamic
+    information texts that will be shown over the rendering (per default in the top
+    left corner, on flat screens).]],
+  Author = "OpenSpace Team",
+  URL = "http://openspaceproject.com",
+  License = "MIT license"
+}
diff --git a/data/assets/examples/debugcoordinateaxes.asset b/data/assets/examples/debugcoordinateaxes.asset
index d7477a6bf7..4f5050aa29 100644
--- a/data/assets/examples/debugcoordinateaxes.asset
+++ b/data/assets/examples/debugcoordinateaxes.asset
@@ -19,6 +19,7 @@ local EarthBarycenterAxes = {
     Type = "RenderableCartesianAxes"
   },
   GUI = {
+    Name = "Earth Barycenter Axes",
     Path = "/Other/Coordinate Systems"
   }
 }
@@ -36,6 +37,7 @@ local EarthInertialAxes = {
     Type = "RenderableCartesianAxes"
   },
   GUI = {
+    Name = "Earth Inertial Axes",
     Path = "/Other/Coordinate Systems"
   }
 }
@@ -53,6 +55,7 @@ local EarthIAUAxes = {
     Type = "RenderableCartesianAxes"
   },
   GUI = {
+    Name = "Earth IAU Axes",
     Path = "/Other/Coordinate Systems"
   }
 }
@@ -70,6 +73,7 @@ local SunIAUAxes = {
     Type = "RenderableCartesianAxes"
   },
   GUI = {
+    Name = "Sun IAU Axes",
     Path = "/Other/Coordinate Systems"
   }
 }
@@ -87,6 +91,7 @@ local SolarSystemBarycenterAxes = {
     Type = "RenderableCartesianAxes"
   },
   GUI = {
+    Name = "Solar System Barycenter Axes",
     Path = "/Other/Coordinate Systems"
   }
 }
@@ -114,3 +119,15 @@ asset.export(EarthInertialAxes)
 asset.export(EarthIAUAxes)
 asset.export(SunIAUAxes)
 asset.export(SolarSystemBarycenterAxes)
+
+
+asset.meta = {
+  Name = "Debug Coordinates",
+  Version = "1.0",
+  Description = [[A set of coordinate axes demonstrating different XYZ coordinate
+    reference frames that are useful for debugging, such as the Earth or Solar
+    System Barycenter.]],
+  Author = "OpenSpace Team",
+  URL = "http://openspaceproject.com",
+  License = "MIT license"
+}
diff --git a/data/assets/examples/discs.asset b/data/assets/examples/discs.asset
index cfa461021f..b07e87af93 100644
--- a/data/assets/examples/discs.asset
+++ b/data/assets/examples/discs.asset
@@ -51,3 +51,13 @@ end)
 
 asset.export(BasicDisc)
 asset.export(FullEllipticDisc)
+
+
+asset.meta = {
+  Name = "Example Discs",
+  Version = "1.0",
+  Description = [[Examples of different types of rendered discs.]],
+  Author = "OpenSpace Team",
+  URL = "http://openspaceproject.com",
+  License = "MIT license"
+}
diff --git a/data/assets/examples/globerotation.asset b/data/assets/examples/globerotation.asset
index b3060b9d1d..f267be6e56 100644
--- a/data/assets/examples/globerotation.asset
+++ b/data/assets/examples/globerotation.asset
@@ -55,3 +55,15 @@ asset.onDeinitialize(function()
 end)
 
 asset.export(ExampleGlobeRotation)
+
+
+asset.meta = {
+  Name = "Model Example",
+  Version = "1.0",
+  Description = [[An example that demonstrates how to load a 3D model from a geometry
+    file, together with some basic functionality. The model is placed on the surface
+    of a planet using a GlobeRotation and GlobeTranslation.]],
+  Author = "OpenSpace Team",
+  URL = "http://openspaceproject.com",
+  License = "MIT license"
+}
diff --git a/data/assets/examples/globetranslation.asset b/data/assets/examples/globetranslation.asset
index 6ac330c077..ba393ed61c 100644
--- a/data/assets/examples/globetranslation.asset
+++ b/data/assets/examples/globetranslation.asset
@@ -72,3 +72,15 @@ end)
 
 asset.export(ExampleFixedHeight)
 asset.export(ExampleAdaptiveHeight)
+
+
+asset.meta = {
+  Name = "GlobeTranslation Example",
+  Version = "1.0",
+  Description = [[An example that demonstrates how to place an object on a planet surface
+    using the "GlobeTranslation" transform. For the altitude, a fixed height can be used,
+    or the height can be queried from the height map]],
+  Author = "OpenSpace Team",
+  URL = "http://openspaceproject.com",
+  License = "MIT license"
+}
diff --git a/data/assets/examples/grids.asset b/data/assets/examples/grids.asset
index 95dbe754c0..4f7e699f13 100644
--- a/data/assets/examples/grids.asset
+++ b/data/assets/examples/grids.asset
@@ -19,6 +19,7 @@ local RadialGrid = {
   },
   GUI = {
     Name = "Example Radial Grid",
+    Description = [[A circular 2D grid, with segments based on the radius and angle.]],
     Path = "/Examples/Grids"
   }
 }
@@ -43,6 +44,7 @@ local PlanarGrid = {
   },
   GUI = {
     Name = "Example Grid",
+    Description = [[A basic 2D grid, with a given size and number of segments.]],
     Path = "/Examples/Grids"
   }
 }
@@ -63,6 +65,7 @@ local SphericalGrid = {
   },
   GUI = {
     Name = "Example Spherical Grid",
+    Description = [[A grid in the form of a 3D sphere.]],
     Path = "/Examples/Grids"
   }
 }
@@ -84,6 +87,7 @@ local BoxGrid = {
   },
   GUI = {
     Name = "Example Box Grid",
+    Description = [[A grid in the form of a 3D box.]],
     Path = "/Examples/Grids"
   }
 }
@@ -107,3 +111,13 @@ asset.export(RadialGrid)
 asset.export(PlanarGrid)
 asset.export(SphericalGrid)
 asset.export(BoxGrid)
+
+
+asset.meta = {
+  Name = "Example Grids",
+  Version = "1.0",
+  Description = [[Examples of different types of rendered grids.]],
+  Author = "OpenSpace Team",
+  URL = "http://openspaceproject.com",
+  License = "MIT license"
+}
diff --git a/data/assets/examples/joystickproperty.asset b/data/assets/examples/joystickproperty.asset
index d0afb768ae..8ed0a3a36d 100644
--- a/data/assets/examples/joystickproperty.asset
+++ b/data/assets/examples/joystickproperty.asset
@@ -94,3 +94,14 @@ asset.onInitialize(function()
     "Freeze current scale for Earth. Or release it to the trigger again."
   )
 end)
+
+
+asset.meta = {
+  Name = "Joystick example",
+  Version = "1.0",
+  Description = [[Example asset that binds a joystick to use for input and navigation.
+    More info on the OpenSpace wiki page.]],
+  Author = "OpenSpace Team",
+  URL = "http://openspaceproject.com",
+  License = "MIT license"
+}
diff --git a/data/assets/examples/primitives.asset b/data/assets/examples/primitives.asset
index 8adf31d570..98f4aebad6 100644
--- a/data/assets/examples/primitives.asset
+++ b/data/assets/examples/primitives.asset
@@ -57,3 +57,14 @@ end)
 
 asset.export(Circle)
 asset.export(Ellipse)
+
+
+asset.meta = {
+  Name = "Primitives Example",
+  Version = "1.0",
+  Description = [[Examples of different simple rendered primitives, such as circles
+    and ellipses.]],
+  Author = "OpenSpace Team",
+  URL = "http://openspaceproject.com",
+  License = "MIT license"
+}
diff --git a/data/assets/examples/renderableplaneimageonline.asset b/data/assets/examples/renderableplaneimageonline.asset
index e6297da464..6e48992e23 100644
--- a/data/assets/examples/renderableplaneimageonline.asset
+++ b/data/assets/examples/renderableplaneimageonline.asset
@@ -13,6 +13,7 @@ local RenderablePlaneImageOnline = {
     URL = "http://data.openspaceproject.com/examples/renderableplaneimageonline.jpg"
   },
   GUI = {
+    Description = "A plane that loads a texture from the internet.",
     Path = "/Examples"
   }
 }
@@ -27,3 +28,14 @@ asset.onDeinitialize(function()
 end)
 
 asset.export(RenderablePlaneImageOnline)
+
+
+asset.meta = {
+  Name = "RenderablePlaneImageOnline Example",
+  Version = "1.0",
+  Description = [[Example of how to create a textured plane in 3D space, where the
+    texture is loaded from a web URL]],
+  Author = "OpenSpace Team",
+  URL = "http://openspaceproject.com",
+  License = "MIT license"
+}
diff --git a/data/assets/examples/screenspacebrowser.asset b/data/assets/examples/screenspacebrowser.asset
index 98e2ab4bea..5a1ceec89d 100644
--- a/data/assets/examples/screenspacebrowser.asset
+++ b/data/assets/examples/screenspacebrowser.asset
@@ -15,3 +15,14 @@ asset.onDeinitialize(function()
 end)
 
 asset.export(Browser)
+
+
+asset.meta = {
+  Name = "ScreenSpaceBrowser Example",
+  Version = "1.0",
+  Description = [[Example of how to load and show a webpage in the rendering. The loaded
+    webpage is shown in screen space.]],
+  Author = "OpenSpace Team",
+  URL = "http://openspaceproject.com",
+  License = "MIT license"
+}
diff --git a/data/assets/examples/spheres.asset b/data/assets/examples/spheres.asset
index 1d3dd15195..f217370437 100644
--- a/data/assets/examples/spheres.asset
+++ b/data/assets/examples/spheres.asset
@@ -49,3 +49,15 @@ end)
 for _, n in ipairs(spheres) do
   asset.export(n)
 end
+
+
+asset.meta = {
+  Name = "Spheres Example",
+  Version = "1.0",
+  Description = [[Example showing how to render textured spheres in 3D space. Some
+    coding logic is used to generate 9 spheres with different size and position.]],
+  Author = "OpenSpace Team",
+  URL = "http://openspaceproject.com",
+  License = "MIT license"
+}
+
diff --git a/data/assets/examples/statemachine.asset b/data/assets/examples/statemachine.asset
index 97b48baf46..174d572311 100644
--- a/data/assets/examples/statemachine.asset
+++ b/data/assets/examples/statemachine.asset
@@ -71,3 +71,14 @@ asset.onInitialize(function()
 
   openspace.statemachine.createStateMachine(States, Transitions, "Earth")
 end)
+
+
+asset.meta = {
+  Name = "State Machine",
+  Version = "1.0",
+  Description = [[Example of how to create a state machine in OpenSpace, where each
+    state and transition between states may trigger different behaviors.]],
+  Author = "OpenSpace Team",
+  URL = "http://openspaceproject.com",
+  License = "MIT license"
+}
diff --git a/data/assets/examples/urlsynchronization.asset b/data/assets/examples/urlsynchronization.asset
index 0e74438b49..6005a176c6 100644
--- a/data/assets/examples/urlsynchronization.asset
+++ b/data/assets/examples/urlsynchronization.asset
@@ -31,6 +31,9 @@ asset.syncedResource({
   Override = true
 })
 
+-- Load a resource without hashing, meaning that the bare directory name will be
+-- used for the downloaded file. If UseHash is true, the hash of the URL is appended
+-- to the directory name to produce a unique directory under all circumstances
 asset.syncedResource({
   Name = "Example No Hash",
   Type = "UrlSynchronization",
@@ -38,3 +41,16 @@ asset.syncedResource({
   Url = "http://wms.itn.liu.se/Mercury/Messenger_Mosaic/Messenger_Mosaic.wms",
   UseHash = false
 })
+
+
+asset.meta = {
+  Name = "UrlSynchronization",
+  Version = "1.0",
+  Description = [[Example showing how to load resources (any type of data file) from
+    online sources, using the UrlSynchronization resource type. These can then be used
+    in other assets. See more information on resources on the OpenSpace wiki page.
+  ]],
+  Author = "OpenSpace Team",
+  URL = "http://openspaceproject.com",
+  License = "MIT license"
+}
diff --git a/data/assets/examples/video/videoglobe.asset b/data/assets/examples/video/videoglobe.asset
index 490c165c10..657ed5e04e 100644
--- a/data/assets/examples/video/videoglobe.asset
+++ b/data/assets/examples/video/videoglobe.asset
@@ -1,4 +1,4 @@
--- To learn how you can include your own video, see the wiki 
+-- To learn how you can include your own video, see the wiki
 -- http://wiki.openspaceproject.com/docs/builders/assets/resources.html
 
 local earth = asset.require("scene/solarsystem/planets/earth/earth")
@@ -27,9 +27,9 @@ asset.export("layer", Layer)
 
 
 asset.meta = {
-  Name = "Video Player Test",
+  Name = "Video Player on Globe Example",
   Version = "1.0",
-  Description = "An example asset that shows how to include a video on Earth",
+  Description = "An example asset that shows how to include a video on Earth.",
   Author = "OpenSpace Team",
   URL = "https://openspaceproject.com",
   License = "MIT"
diff --git a/data/assets/examples/video/videoplane.asset b/data/assets/examples/video/videoplane.asset
index f27722ebe9..f81fda6a47 100644
--- a/data/assets/examples/video/videoplane.asset
+++ b/data/assets/examples/video/videoplane.asset
@@ -1,4 +1,4 @@
--- To learn how you can include your own video, see the wiki 
+-- To learn how you can include your own video, see the wiki
 -- http://wiki.openspaceproject.com/docs/builders/assets/resources.html
 
 local transforms = asset.require("scene/solarsystem/planets/earth/transforms")
@@ -40,9 +40,9 @@ asset.export(Plane)
 
 
 asset.meta = {
-  Name = "Video Plane Test",
+  Name = "Video Plane Example",
   Version = "1.0",
-  Description = "An example asset that shows how to include a video on a plane",
+  Description = "An example asset that shows how to include a video on a plane.",
   Author = "OpenSpace Team",
   URL = "https://openspaceproject.com",
   License = "MIT"
diff --git a/data/assets/examples/video/videoscreenspace.asset b/data/assets/examples/video/videoscreenspace.asset
index c6982ff66e..4b52ce4a6b 100644
--- a/data/assets/examples/video/videoscreenspace.asset
+++ b/data/assets/examples/video/videoscreenspace.asset
@@ -1,4 +1,4 @@
--- To learn how you can include your own video, see the wiki 
+-- To learn how you can include your own video, see the wiki
 -- http://wiki.openspaceproject.com/docs/builders/assets/resources.html
 
 local ScreenSpace = {
@@ -22,9 +22,9 @@ asset.export(ScreenSpace)
 
 
 asset.meta = {
-  Name = "Video ScreenSpace",
+  Name = "ScreenSpace Video Example",
   Version = "1.0",
-  Description = "An example asset that shows how to include a video in screen space",
+  Description = "An example asset that shows how to include a video in screen space.",
   Author = "OpenSpace Team",
   URL = "https://openspaceproject.com",
   License = "MIT"
diff --git a/data/assets/examples/video/videosphere.asset b/data/assets/examples/video/videosphere.asset
index d2a5df19ac..960a70c58c 100644
--- a/data/assets/examples/video/videosphere.asset
+++ b/data/assets/examples/video/videosphere.asset
@@ -1,4 +1,4 @@
--- To learn how you can include your own video, see the wiki 
+-- To learn how you can include your own video, see the wiki
 -- http://wiki.openspaceproject.com/docs/builders/assets/resources.html
 
 local Sphere = {
@@ -30,9 +30,9 @@ asset.export(Sphere)
 
 
 asset.meta = {
-  Name = "Video Player on Sphere",
+  Name = "Video Player on Sphere Example",
   Version = "1.0",
-  Description = "An example asset that shows how to include a video on a sphere",
+  Description = "An example asset that shows how to include a video on a sphere.",
   Author = "OpenSpace Team",
   URL = "https://openspaceproject.com",
   License = "MIT"
diff --git a/data/assets/nightsky/altaz.asset b/data/assets/nightsky/altaz.asset
index 6a4d0727ad..9aea1c2449 100644
--- a/data/assets/nightsky/altaz.asset
+++ b/data/assets/nightsky/altaz.asset
@@ -26,7 +26,7 @@ local AltAzGridPosition = {
   },
   GUI = {
     Name = "Altitude/Azimuth Grid Position",
-    Path = "/Other/Grids",
+    Path = "/Other/Night Sky",
     Hidden = true
   }
 }
@@ -54,7 +54,11 @@ local AltAzGrid = {
   },
   GUI = {
     Name = "Altitude/Azimuth Grid",
-    Path = "/Other/Grids"
+    Description = [[A local Altitude/Azimuth grid centered around your position on a
+    planetary surface. The grid can be toggled, hidden or shown using the accompanying
+    actions in the actions panel, under "Night Sky". Use these actions to move it to
+    another planet. The default is Earth.]],
+    Path = "/Other/Night Sky"
   }
 }
 
@@ -120,3 +124,15 @@ asset.export(AltAzGrid)
 asset.export("ShowAltaz", ShowAltaz.Identifier)
 asset.export("HideAltaz", HideAltaz.Identifier)
 asset.export("ToggleAltaz", ToggleAltaz.Identifier)
+
+
+asset.meta = {
+  Name = "Altitude/Azimuth Grid",
+  Version = "1.0",
+  Description = [[A local Altitude/Azimuth grid centered around your position on a
+    planetary surface. The asset also includes some actions to toggle, hide or
+    show the grid.]],
+  Author = "OpenSpace Team",
+  URL = "http://openspaceproject.com",
+  License = "MIT license"
+}
diff --git a/data/assets/nightsky/cardinal_directions.asset b/data/assets/nightsky/cardinal_directions.asset
index 3edce459fe..c499cb0019 100644
--- a/data/assets/nightsky/cardinal_directions.asset
+++ b/data/assets/nightsky/cardinal_directions.asset
@@ -60,6 +60,9 @@ local CardinalDirectionSphere = {
   },
   GUI = {
     Name = "Cardinal Directions",
+    Description = [[A textured sphere showing the cardinal directions.
+      The sphere is placed on the planet surface and follows the camera's movements.
+    ]],
     Path = "/Other/Night Sky"
   }
 }
@@ -153,3 +156,16 @@ asset.export("ShowNeswBandSmall", ShowNeswBand.Identifier)
 asset.export("ShowNeswLetters", ShowNeswLetters.Identifier)
 asset.export("ShowNeswLettersSmall", ShowNeswLettersSmall.Identifier)
 asset.export("HideNesw", HideNesw.Identifier)
+
+
+asset.meta = {
+  Name = "Cardinal Directions",
+  Version = "1.0",
+  Description = [[Adds a sphere showing the cardinal directions, that follows the camera
+    around when navigating on the planet surface. It also includes actions to change the
+    texture of the sphere to different styles.
+  ]],
+  Author = "OpenSpace Team",
+  URL = "http://openspaceproject.com",
+  License = "MIT license"
+}
diff --git a/data/assets/nightsky/ecliptic_band.asset b/data/assets/nightsky/ecliptic_band.asset
index 90a89193cd..d46b6c2e0d 100644
--- a/data/assets/nightsky/ecliptic_band.asset
+++ b/data/assets/nightsky/ecliptic_band.asset
@@ -40,6 +40,7 @@ local EclipticLine = {
   },
   GUI = {
     Name = "Ecliptic Line",
+    Description = "A line representation of the Ecliptic plane.",
     Path = "/Other/Lines"
   }
 }
@@ -65,6 +66,7 @@ local EclipticBand = {
   },
   GUI = {
     Name = "Ecliptic Band",
+    Description = "A band representation of the Ecliptic plane.",
     Path = "/Other/Lines"
   }
 }
@@ -158,3 +160,14 @@ asset.export("ToggleEclipticLine", ToggleEclipticLine.Identifier)
 asset.export("ShowEclipticBand", ShowEclipticBand.Identifier)
 asset.export("HideEclipticBand", HideEclipticBand.Identifier)
 asset.export("ToggleEclipticBand", ToggleEclipticBand.Identifier)
+
+
+asset.meta = {
+  Name = "Ecliptic Band/Line",
+  Version = "1.0",
+  Description = [[A line and band representation of the Ecliptic plane, including actions
+    to toggle, hide and show each of them.]],
+  Author = "OpenSpace Team",
+  URL = "http://openspaceproject.com",
+  License = "MIT license"
+}
diff --git a/data/assets/nightsky/equatorial_band.asset b/data/assets/nightsky/equatorial_band.asset
index 5b049121c4..8a71079761 100644
--- a/data/assets/nightsky/equatorial_band.asset
+++ b/data/assets/nightsky/equatorial_band.asset
@@ -33,6 +33,7 @@ local EquatorialLine = {
   },
   GUI = {
     Name = "Equatorial Line",
+    Description = "A line representation of the Equatorial plane.",
     Path = "/Other/Lines"
   }
 }
@@ -87,3 +88,14 @@ asset.export(EquatorialLine)
 asset.export("ShowEquatorialLine", ShowEquatorialLine.Identifier)
 asset.export("HideEquatorialLine", HideEquatorialLine.Identifier)
 asset.export("ToggleEquatorialLine", ToggleEquatorialLine.Identifier)
+
+
+asset.meta = {
+  Name = "Equatorial Line",
+  Version = "1.0",
+  Description = [[A line representation of the Equatorial plane, including actions
+    to toggle, hide and show it.]],
+  Author = "OpenSpace Team",
+  URL = "http://openspaceproject.com",
+  License = "MIT license"
+}
diff --git a/data/assets/nightsky/galactic_band.asset b/data/assets/nightsky/galactic_band.asset
index 94724286a9..fbe3615454 100644
--- a/data/assets/nightsky/galactic_band.asset
+++ b/data/assets/nightsky/galactic_band.asset
@@ -22,6 +22,7 @@ local GalacticBand = {
     },
     GUI = {
         Name = "Galactic Equator Line",
+        Description = "A line representation of the Galactic Equator plane.",
         Path = "/Other/Lines"
     }
 }
@@ -73,3 +74,15 @@ end)
 asset.export(GalacticBand)
 asset.export("ShowGalacticBand", ShowGalacticBand.Identifier)
 asset.export("HideGalacticBand", HideGalacticBand.Identifier)
+
+
+asset.meta = {
+  Name = "Galactic Line",
+  Version = "1.0",
+  Description = [[A line representation of the Galactic Equator plane, including actions
+    to toggle, hide and show it.]],
+  Author = "OpenSpace Team",
+  URL = "http://openspaceproject.com",
+  License = "MIT license"
+}
+
diff --git a/data/assets/nightsky/light_pollution.asset b/data/assets/nightsky/light_pollution.asset
index d2b6eace04..806a75fbee 100644
--- a/data/assets/nightsky/light_pollution.asset
+++ b/data/assets/nightsky/light_pollution.asset
@@ -48,6 +48,9 @@ local LightPollutionSphere = {
   },
   GUI = {
     Name = "Light Pollution Sphere",
+    Description = [[A sphere used to simulate the effect of light pollution on
+      the night sky. Different pollution levels can be set using the provided actions.
+      These alter the opacity of the sphere.]],
     Path = "/Other/Night Sky",
     Hidden = false
   }
@@ -250,3 +253,15 @@ asset.export("SetLightPollutionLevel7", SetLightPollutionLevel7.Identifier)
 asset.export("SetLightPollutionLevel8", SetLightPollutionLevel8.Identifier)
 asset.export("SetLightPollutionLevel9", SetLightPollutionLevel9.Identifier)
 asset.export("UndoLightPollution", UndoLightPollution.Identifier)
+
+
+asset.meta = {
+  Name = "Light Pollution",
+  Version = "1.0",
+  Description = [[Includes a sphere used to simulate the effect of light pollution on
+    the night sky, and actions to set the desired level of pollution (with a scale
+    from 1-9).]],
+  Author = "OpenSpace Team",
+  URL = "http://openspaceproject.com",
+  License = "MIT license"
+}
diff --git a/data/assets/nightsky/meridian.asset b/data/assets/nightsky/meridian.asset
index 9497c47c12..0c3e3c31eb 100644
--- a/data/assets/nightsky/meridian.asset
+++ b/data/assets/nightsky/meridian.asset
@@ -50,6 +50,7 @@ local MeridianPlane = {
   },
   GUI = {
     Name = "Local Meridian",
+    Description = [[A line representation of the Local Meridian]],
     Path = "/Other/Lines"
   }
 }
@@ -118,3 +119,14 @@ asset.export(MeridianPlane)
 asset.export("ShowMeridian", ShowMeridian.Identifier)
 asset.export("HideMeridian", HideMeridian.Identifier)
 asset.export("ToggleMeridian", ToggleMeridian.Identifier)
+
+
+asset.meta = {
+  Name = "Meridian",
+  Version = "1.0",
+  Description = [[A line representation of the Local Meridian, including actions
+    to toggle, hide and show it.]],
+  Author = "OpenSpace Team",
+  URL = "http://openspaceproject.com",
+  License = "MIT license"
+}
diff --git a/data/assets/nightsky/nightsky.asset b/data/assets/nightsky/nightsky.asset
index 57cc9e2dd0..2bca47efa6 100644
--- a/data/assets/nightsky/nightsky.asset
+++ b/data/assets/nightsky/nightsky.asset
@@ -9,3 +9,13 @@ asset.require("./zenith", false)
 asset.require("./planets", false)
 asset.require("actions/nightsky/camera", false)
 asset.require("actions/nightsky/daytime", false)
+
+
+asset.meta = {
+  Name = "Night Sky Assets",
+  Version = "1.0",
+  Description = [[A collection of assets useful for studying the night sky.]],
+  Author = "OpenSpace Team",
+  URL = "http://openspaceproject.com",
+  License = "MIT license"
+}
diff --git a/data/assets/nightsky/planets.asset b/data/assets/nightsky/planets.asset
index f5855cf4a7..33d3ba205a 100644
--- a/data/assets/nightsky/planets.asset
+++ b/data/assets/nightsky/planets.asset
@@ -30,6 +30,8 @@ local Mercury = {
   Tag = { "nightsky_billboard" },
   GUI = {
     Name = "Night Sky Mercury",
+    Description = [[A night sky version of the planet Mercury, making it visible as
+      a bright object on the sky (textured representation).]],
     Path = "/Other/Night Sky/Planets"
   }
 }
@@ -50,6 +52,8 @@ local Venus = {
   Tag = { "nightsky_billboard" },
   GUI = {
     Name = "Night Sky Venus",
+    Description = [[A night sky version of the planet Venus, making it visible as
+      a bright object on the sky (textured representation).]],
     Path = "/Other/Night Sky/Planets"
   }
 }
@@ -90,6 +94,8 @@ local Jupiter = {
   Tag = { "nightsky_billboard" },
   GUI = {
     Name = "Night Sky Jupiter",
+    Description = [[A night sky version of the planet Jupiter, making it visible as
+      a bright object on the sky (textured representation).]],
     Path = "/Other/Night Sky/Planets"
   }
 }
@@ -110,6 +116,8 @@ local Saturn = {
   Tag = { "nightsky_billboard" },
   GUI = {
     Name = "Night Sky Saturn",
+    Description = [[A night sky version of the planet Saturn, making it visible as
+      a bright object on the sky (textured representation).]],
     Path = "/Other/Night Sky/Planets"
   }
 }
@@ -198,3 +206,14 @@ asset.export(Saturn)
 asset.export("ShowNightSkyPlanets", ShowNightSkyPlanets.Identifier)
 asset.export("HideNightSkyPlanets", HideNightSkyPlanets.Identifier)
 asset.export("ToggleNightSkyPlanets", ToggleNightSkyPlanets.Identifier)
+
+
+asset.meta = {
+  Name = "Night Sky Planets",
+  Version = "1.0",
+  Description = [[A collection of night sky versions of the planets Mercury, Venus,
+    Mars, Jupiter and Saturn, including actions to toggle, hide and show them.]],
+  Author = "OpenSpace Team",
+  URL = "http://openspaceproject.com",
+  License = "MIT license"
+}
diff --git a/data/assets/nightsky/zenith.asset b/data/assets/nightsky/zenith.asset
index 0170bcc5ec..0819e27ea5 100644
--- a/data/assets/nightsky/zenith.asset
+++ b/data/assets/nightsky/zenith.asset
@@ -58,6 +58,9 @@ local ZenithDot = {
   },
   GUI = {
     Name = "Zenith",
+    Description = [[A dot representation of the Local Zenith, based on the camera's
+      current position on a planet. Use the provided show or toggle action to move it
+      between planets. The default is Earth.]],
     Path = "/Other/Points"
   }
 }
@@ -124,3 +127,14 @@ asset.export(ZenithDot)
 asset.export("ShowZenith", ShowZenith.Identifier)
 asset.export("HideZenith", HideZenith.Identifier)
 asset.export("ToggleZenith", ToggleZenith.Identifier)
+
+
+asset.meta = {
+  Name = "Zenith",
+  Version = "1.0",
+  Description = [[A dot representation of the Local Zenith (based on the current
+    camera positon), including actions to toggle, hide and show it.]],
+  Author = "OpenSpace Team",
+  URL = "http://openspaceproject.com",
+  License = "MIT license"
+}

From 31b04c1412c946d9e004bfe6189664f2c00fa7b4 Mon Sep 17 00:00:00 2001
From: Emma Broman <emma.broman@liu.se>
Date: Fri, 18 Aug 2023 16:40:59 +0200
Subject: [PATCH 107/701] Update GUI hash

---
 data/assets/util/webgui.asset | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/data/assets/util/webgui.asset b/data/assets/util/webgui.asset
index cdaaa51adb..3e67f8f319 100644
--- a/data/assets/util/webgui.asset
+++ b/data/assets/util/webgui.asset
@@ -4,7 +4,7 @@ local guiCustomization = asset.require("customization/gui")
 
 
 -- Select which commit hashes to use for the frontend and backend
-local frontendHash = "1379c57e0876473573a67a381214a53fda53e516"
+local frontendHash = "f28b121318e266bd546c7c9f6bdf5a790e66c742"
 
 local frontend = asset.syncedResource({
   Identifier = "WebGuiFrontend",

From c18ab499653c6b8dfa3b265bc6c40acd2eb17386 Mon Sep 17 00:00:00 2001
From: Alexander Bock <alexander.bock@liu.se>
Date: Mon, 21 Aug 2023 13:26:26 +0200
Subject: [PATCH 108/701] Sort additional scripts by row-order, not
 selection-order (closes #2862)

---
 .../ext/launcher/src/profile/scriptlogdialog.cpp    | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

diff --git a/apps/OpenSpace/ext/launcher/src/profile/scriptlogdialog.cpp b/apps/OpenSpace/ext/launcher/src/profile/scriptlogdialog.cpp
index 80524b5b18..d78e105118 100644
--- a/apps/OpenSpace/ext/launcher/src/profile/scriptlogdialog.cpp
+++ b/apps/OpenSpace/ext/launcher/src/profile/scriptlogdialog.cpp
@@ -167,7 +167,18 @@ void ScriptlogDialog::updateScriptList() {
 void ScriptlogDialog::saveChosenScripts() {
     std::vector<std::string> chosenScripts;
     QList<QListWidgetItem*> itemList = _scriptlogList->selectedItems();
-    for (QListWidgetItem* item : _scriptlogList->selectedItems()) {
+
+    // The selected items are returned in order of **selection** not in row-order, so we
+    // need to sort them first
+    std::sort(
+        itemList.begin(),
+        itemList.end(),
+        [this](QListWidgetItem* lhs, QListWidgetItem* rhs) {
+            return _scriptlogList->row(lhs) < _scriptlogList->row(rhs);
+        }
+    );
+
+    for (QListWidgetItem* item : itemList) {
         chosenScripts.push_back(item->text().toStdString());
     }
     emit scriptsSelected(chosenScripts);

From d13dd78838c967f5685d0a1c674d009b1530fcaa Mon Sep 17 00:00:00 2001
From: Alexander Bock <alexander.bock@liu.se>
Date: Mon, 21 Aug 2023 13:36:37 +0200
Subject: [PATCH 109/701] Nuking the cache folder when an inconsistent state in
 the cache is detected, rather than crashing (closes #2850)

---
 ext/ghoul | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ext/ghoul b/ext/ghoul
index b8685a2fe0..24486b7c56 160000
--- a/ext/ghoul
+++ b/ext/ghoul
@@ -1 +1 @@
-Subproject commit b8685a2fe0c00516eb28183658974e9601b3edd0
+Subproject commit 24486b7c5645f41a3b13f39dbe9ae58a98abbdc9

From 3efd5407cb10dd2824806ee2a4af96221142aca4 Mon Sep 17 00:00:00 2001
From: Emma Broman <emma.broman@liu.se>
Date: Tue, 22 Aug 2023 15:22:39 +0200
Subject: [PATCH 110/701] Fix crash when flying to NS with nonexisting anchor,
 and actually print error from path creation

---
 src/navigation/path.cpp          | 8 ++++++++
 src/navigation/pathnavigator.cpp | 2 +-
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/src/navigation/path.cpp b/src/navigation/path.cpp
index 0d741bbf89..d6cd9b1a04 100644
--- a/src/navigation/path.cpp
+++ b/src/navigation/path.cpp
@@ -517,6 +517,14 @@ Path createPathFromDictionary(const ghoul::Dictionary& dictionary,
             const NavigationState navigationState =
                 NavigationState(p.navigationState.value());
 
+            const SceneGraphNode* targetNode = sceneGraphNode(navigationState.anchor);
+            if (!targetNode) {
+                throw ghoul::RuntimeError(fmt::format(
+                    "Could not find anchor node '{}' in provided navigation state",
+                    navigationState.anchor
+                ));
+            }
+
             waypoints = { Waypoint(navigationState) };
             break;
         }
diff --git a/src/navigation/pathnavigator.cpp b/src/navigation/pathnavigator.cpp
index f61478fcb5..49f4732272 100644
--- a/src/navigation/pathnavigator.cpp
+++ b/src/navigation/pathnavigator.cpp
@@ -290,7 +290,7 @@ void PathNavigator::createPath(const ghoul::Dictionary& dictionary) {
         // Do nothing
     }
     catch (const ghoul::RuntimeError& e) {
-        LERROR(fmt::format("Could not create path. Reason: ", e.message));
+        LERROR(fmt::format("Could not create path. Reason: {}", e.message));
         return;
     }
 

From 08d5662c17d2a44cda0ad8e606dfac8ac16fea2b Mon Sep 17 00:00:00 2001
From: Emma Broman <emma.broman@liu.se>
Date: Tue, 22 Aug 2023 15:43:26 +0200
Subject: [PATCH 111/701] Update faulty tags for Charon and update some other
 pluto moon tags for consistency

---
 .../solarsystem/dwarf_planets/pluto/charon/charon.asset      | 2 +-
 .../dwarf_planets/pluto/charon/charon_trail.asset            | 3 ++-
 .../scene/solarsystem/dwarf_planets/pluto/minor/hydra.asset  | 5 +++--
 .../solarsystem/dwarf_planets/pluto/minor/kerberos.asset     | 5 +++--
 .../scene/solarsystem/dwarf_planets/pluto/minor/nix.asset    | 5 +++--
 .../scene/solarsystem/dwarf_planets/pluto/minor/styx.asset   | 2 +-
 6 files changed, 13 insertions(+), 9 deletions(-)

diff --git a/data/assets/scene/solarsystem/dwarf_planets/pluto/charon/charon.asset b/data/assets/scene/solarsystem/dwarf_planets/pluto/charon/charon.asset
index 368e950a3b..5b774f1bd9 100644
--- a/data/assets/scene/solarsystem/dwarf_planets/pluto/charon/charon.asset
+++ b/data/assets/scene/solarsystem/dwarf_planets/pluto/charon/charon.asset
@@ -44,7 +44,7 @@ local Charon = {
       Color = { 1.0, 1.0, 0.0 }
     }
   },
-  Tag = { "planet_solarSystem", "planet_terrestrial" },
+  Tag = { "moon_solarSystem", "moon_dwarf", "moon_pluto", "moon_major", "moon_major_pluto" },
   GUI = {
     Path = "/Solar System/Dwarf Planets/Pluto/Charon"
   }
diff --git a/data/assets/scene/solarsystem/dwarf_planets/pluto/charon/charon_trail.asset b/data/assets/scene/solarsystem/dwarf_planets/pluto/charon/charon_trail.asset
index 377b3bd797..d24adb6466 100644
--- a/data/assets/scene/solarsystem/dwarf_planets/pluto/charon/charon_trail.asset
+++ b/data/assets/scene/solarsystem/dwarf_planets/pluto/charon/charon_trail.asset
@@ -21,7 +21,8 @@ local CharonBarycentricTrail = {
     "moonTrail_solarSystem",
     "moonTrail_dwarf",
     "moonTrail_pluto",
-    "moonTrail_minor"
+    "moonTrail_major",
+    "moonTrail_major_pluto"
   },
   GUI = {
     Name = "Charon Barycentric Trail",
diff --git a/data/assets/scene/solarsystem/dwarf_planets/pluto/minor/hydra.asset b/data/assets/scene/solarsystem/dwarf_planets/pluto/minor/hydra.asset
index aa11471028..8dfa6a0743 100644
--- a/data/assets/scene/solarsystem/dwarf_planets/pluto/minor/hydra.asset
+++ b/data/assets/scene/solarsystem/dwarf_planets/pluto/minor/hydra.asset
@@ -19,7 +19,7 @@ local Hydra = {
     SegmentsPerPatch = 64,
     Layers = {}
   },
-  Tag = { "moon_solarSystem", "moon_dwarf", "moon_pluto", "moon_minor" },
+  Tag = { "moon_solarSystem", "moon_dwarf", "moon_pluto", "moon_minor", "moon_minor_pluto" },
   GUI = {
     Path = "/Solar System/Dwarf Planets/Pluto/Moons/Hydra"
   }
@@ -43,7 +43,8 @@ local HydraTrail = {
     "moonTrail_solarSystem",
     "moonTrail_dwarf",
     "moonTrail_pluto",
-    "moonTrail_minor"
+    "moonTrail_minor",
+    "moonTrail_minor_pluto"
   },
   GUI = {
     Name = "Hydra Trail",
diff --git a/data/assets/scene/solarsystem/dwarf_planets/pluto/minor/kerberos.asset b/data/assets/scene/solarsystem/dwarf_planets/pluto/minor/kerberos.asset
index fe4683585f..9594d8dfc4 100644
--- a/data/assets/scene/solarsystem/dwarf_planets/pluto/minor/kerberos.asset
+++ b/data/assets/scene/solarsystem/dwarf_planets/pluto/minor/kerberos.asset
@@ -18,7 +18,7 @@ local Kerberos = {
     SegmentsPerPatch = 64,
     Layers = {}
   },
-  Tag = { "moon_solarSystem", "moon_dwarf", "moon_pluto", "moon_minor" },
+  Tag = { "moon_solarSystem", "moon_dwarf", "moon_pluto", "moon_minor", "moon_minor_pluto" },
   GUI = {
     Path = "/Solar System/Dwarf Planets/Pluto/Moons/Kerberos"
   }
@@ -42,7 +42,8 @@ local KerberosTrail = {
     "moonTrail_solarSystem",
     "moonTrail_dwarf",
     "moonTrail_pluto",
-    "moonTrail_minor"
+    "moonTrail_minor",
+    "moonTrail_minor_pluto"
   },
   GUI = {
     Name = "Kerberos Trail",
diff --git a/data/assets/scene/solarsystem/dwarf_planets/pluto/minor/nix.asset b/data/assets/scene/solarsystem/dwarf_planets/pluto/minor/nix.asset
index 85728475ec..8c1dbea469 100644
--- a/data/assets/scene/solarsystem/dwarf_planets/pluto/minor/nix.asset
+++ b/data/assets/scene/solarsystem/dwarf_planets/pluto/minor/nix.asset
@@ -18,7 +18,7 @@ local Nix = {
     SegmentsPerPatch = 64,
     Layers = {}
   },
-  Tag = { "moon_solarSystem", "moon_dwarf", "moon_pluto", "moon_minor" },
+  Tag = { "moon_solarSystem", "moon_dwarf", "moon_pluto", "moon_minor", "moon_minor_pluto" },
   GUI = {
     Path = "/Solar System/Dwarf Planets/Pluto/Moons/Nix"
   }
@@ -42,7 +42,8 @@ local NixTrail = {
     "moonTrail_solarSystem",
     "moonTrail_dwarf",
     "moonTrail_pluto",
-    "moonTrail_minor"
+    "moonTrail_minor",
+    "moonTrail_minor_pluto"
   },
   GUI = {
     Name = "Nix Trail",
diff --git a/data/assets/scene/solarsystem/dwarf_planets/pluto/minor/styx.asset b/data/assets/scene/solarsystem/dwarf_planets/pluto/minor/styx.asset
index 76d28680d1..89c64aa3bb 100644
--- a/data/assets/scene/solarsystem/dwarf_planets/pluto/minor/styx.asset
+++ b/data/assets/scene/solarsystem/dwarf_planets/pluto/minor/styx.asset
@@ -17,7 +17,7 @@ local Styx = {
     SegmentsPerPatch = 64,
     Layers = {}
   },
-  Tag = { "moon_solarSystem", "moon_dwarf", "moon_pluto", "moon_minor" },
+  Tag = { "moon_solarSystem", "moon_dwarf", "moon_pluto", "moon_minor", "moon_minor_pluto" },
   GUI = {
     Path = "/Solar System/Dwarf Planets/Pluto/Moons/Styx"
   }

From caa9492c42ffa8d7b326a257e9ea32ab369016b0 Mon Sep 17 00:00:00 2001
From: Emma Broman <emma.broman@liu.se>
Date: Tue, 22 Aug 2023 16:58:39 +0200
Subject: [PATCH 112/701] Update GUI hash

---
 data/assets/util/webgui.asset | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/data/assets/util/webgui.asset b/data/assets/util/webgui.asset
index 3e67f8f319..998debfe36 100644
--- a/data/assets/util/webgui.asset
+++ b/data/assets/util/webgui.asset
@@ -4,7 +4,7 @@ local guiCustomization = asset.require("customization/gui")
 
 
 -- Select which commit hashes to use for the frontend and backend
-local frontendHash = "f28b121318e266bd546c7c9f6bdf5a790e66c742"
+local frontendHash = "7ed2de3b136b4712454c944a3838c2171c26605a"
 
 local frontend = asset.syncedResource({
   Identifier = "WebGuiFrontend",

From baf0974c5681efca9199c916dff4dc623bc39fed Mon Sep 17 00:00:00 2001
From: Emma Broman <emma.broman@liu.se>
Date: Tue, 22 Aug 2023 18:07:32 +0200
Subject: [PATCH 113/701] Increase default value for linear rotation speed
 (closes #2584)

---
 src/navigation/pathnavigator.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/navigation/pathnavigator.cpp b/src/navigation/pathnavigator.cpp
index 49f4732272..f2c5418192 100644
--- a/src/navigation/pathnavigator.cpp
+++ b/src/navigation/pathnavigator.cpp
@@ -137,7 +137,7 @@ PathNavigator::PathNavigator()
     , _speedScale(SpeedScaleInfo, 1.f, 0.01f, 2.f)
     , _applyIdleBehaviorOnFinish(IdleBehaviorOnFinishInfo, false)
     , _arrivalDistanceFactor(ArrivalDistanceFactorInfo, 2.0, 0.1, 20.0)
-    , _linearRotationSpeedFactor(RotationSpeedFactorInfo, 1.5f, 0.1f, 3.f)
+    , _linearRotationSpeedFactor(RotationSpeedFactorInfo, 2.f, 0.1f, 3.f)
     , _minValidBoundingSphere(MinBoundingSphereInfo, 10.0, 1.0, 3e10)
     , _relevantNodeTags(RelevantNodeTagsInfo)
 {

From 2d9932e3238caee48e0a4786faa90de92fc9bee9 Mon Sep 17 00:00:00 2001
From: Emma Broman <emma.broman@liu.se>
Date: Wed, 23 Aug 2023 08:47:59 +0200
Subject: [PATCH 114/701] Add tag to another pluto moon

File was apparently not saved or included in the last commit..
---
 .../scene/solarsystem/dwarf_planets/pluto/minor/styx.asset     | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/data/assets/scene/solarsystem/dwarf_planets/pluto/minor/styx.asset b/data/assets/scene/solarsystem/dwarf_planets/pluto/minor/styx.asset
index 89c64aa3bb..3385785481 100644
--- a/data/assets/scene/solarsystem/dwarf_planets/pluto/minor/styx.asset
+++ b/data/assets/scene/solarsystem/dwarf_planets/pluto/minor/styx.asset
@@ -41,7 +41,8 @@ local StyxTrail = {
     "moonTrail_solarSystem",
     "moonTrail_dwarf",
     "moonTrail_pluto",
-    "moonTrail_minor"
+    "moonTrail_minor",
+    "moonTrail_minor_pluto"
   },
   GUI = {
     Name = "Styx Trail",

From 31a47d2a06c3d6dcd4bc19b4d6ef81c4c7235fda Mon Sep 17 00:00:00 2001
From: Gene Payne <payne.gene@gmail.com>
Date: Fri, 25 Aug 2023 16:46:55 -0600
Subject: [PATCH 115/701] Added reference to meta in base sgct schema

---
 config/schema/sgcteditor.schema.json | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/config/schema/sgcteditor.schema.json b/config/schema/sgcteditor.schema.json
index 7f0b2276d4..b8b0eb3672 100644
--- a/config/schema/sgcteditor.schema.json
+++ b/config/schema/sgcteditor.schema.json
@@ -313,6 +313,9 @@
         "minor": { "type": "integer" }
       },
       "required": [ "name", "major", "minor" ]
+    },
+    "meta": {
+      "$ref": "sgct.schema.json#/$defs/meta"
     }
   },
   "additionalProperties": false,

From bd35397e9e4374534de68d28865caddd8beee98c Mon Sep 17 00:00:00 2001
From: Gene Payne <payne.gene@gmail.com>
Date: Fri, 25 Aug 2023 16:49:20 -0600
Subject: [PATCH 116/701] Bump sgct submodule rev to get meta fix in base sgct
 schema

---
 apps/OpenSpace/ext/sgct | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/apps/OpenSpace/ext/sgct b/apps/OpenSpace/ext/sgct
index d643b8bf2a..ca7a076139 160000
--- a/apps/OpenSpace/ext/sgct
+++ b/apps/OpenSpace/ext/sgct
@@ -1 +1 @@
-Subproject commit d643b8bf2a456006f16c3623ff00d6ce572dff51
+Subproject commit ca7a076139b9b2a915b18bc6e8091bae2cbf186b

From f591938f013768f44c0ca8b1be076e4a28bd9424 Mon Sep 17 00:00:00 2001
From: Emma Broman <emma.broman@liu.se>
Date: Tue, 29 Aug 2023 09:12:02 +0200
Subject: [PATCH 117/701] Add options to disable roll and zoom in
 OrbitalNavigator (#2866)

---
 .../openspace/navigation/orbitalnavigator.h   |  3 +
 src/navigation/orbitalnavigator.cpp           | 88 +++++++++++++++----
 2 files changed, 76 insertions(+), 15 deletions(-)

diff --git a/include/openspace/navigation/orbitalnavigator.h b/include/openspace/navigation/orbitalnavigator.h
index b269eb79a9..cd88bfaa46 100644
--- a/include/openspace/navigation/orbitalnavigator.h
+++ b/include/openspace/navigation/orbitalnavigator.h
@@ -214,6 +214,9 @@ private:
 
     LimitZoom _limitZoom;
 
+    properties::BoolProperty _disableZoom;
+    properties::BoolProperty _disableRoll;
+
     properties::FloatProperty _mouseSensitivity;
     properties::FloatProperty _joystickSensitivity;
     properties::FloatProperty _websocketSensitivity;
diff --git a/src/navigation/orbitalnavigator.cpp b/src/navigation/orbitalnavigator.cpp
index 992dce2a0e..3cc92030e2 100644
--- a/src/navigation/orbitalnavigator.cpp
+++ b/src/navigation/orbitalnavigator.cpp
@@ -374,6 +374,25 @@ namespace {
         // @VISIBILITY(?)
         openspace::properties::Property::Visibility::AdvancedUser
     };
+
+    constexpr openspace::properties::Property::PropertyInfo DisableZoomInfo = {
+        "DisableZoom",
+        "Disable Zoom",
+        "When set to true, disables all vertical navigation based on input. This means "
+        "that the camera cannot be moved closer to or further away from the current "
+        "anchor node",
+        openspace::properties::Property::Visibility::AdvancedUser
+    };
+
+    constexpr openspace::properties::Property::PropertyInfo DisableRollInfo = {
+        "DisableRoll",
+        "Disable Roll",
+        "When set to true, disables all rolling camera motions based on input. This "
+        "means that the camera cannot be rotated to change the perceived up-direction "
+        "of the current anchor node, or rotate the horizon on a planet, for example",
+        openspace::properties::Property::Visibility::AdvancedUser
+    };
+
 } // namespace
 
 namespace openspace::interaction {
@@ -477,6 +496,8 @@ OrbitalNavigator::OrbitalNavigator()
     , _mouseStates(_mouseSensitivity * 0.0001, 1 / (_friction.friction + 0.0000001))
     , _joystickStates(_joystickSensitivity * 0.1, 1 / (_friction.friction + 0.0000001))
     , _websocketStates(_websocketSensitivity, 1 / (_friction.friction + 0.0000001))
+    , _disableZoom(DisableZoomInfo, false)
+    , _disableRoll(DisableRollInfo, false)
 {
     _anchor.onChange([this]() {
         if (_anchor.value().empty()) {
@@ -644,14 +665,39 @@ OrbitalNavigator::OrbitalNavigator()
     _followRotationInterpolator.setInterpolationTime(_followRotationInterpolationTime);
     addProperty(_followRotationInterpolationTime);
 
-    _invertMouseButtons.onChange(
-        [this]() { _mouseStates.setInvertMouseButton(_invertMouseButtons); }
-    );
+    _invertMouseButtons.onChange([this]() {
+        _mouseStates.setInvertMouseButton(_invertMouseButtons);
+    });
     addProperty(_invertMouseButtons);
 
     addProperty(_mouseSensitivity);
     addProperty(_joystickSensitivity);
     addProperty(_websocketSensitivity);
+
+    addProperty(_disableZoom);
+    _disableZoom.onChange([this]() {
+        if (_disableZoom) {
+            LWARNING(
+                "Zooming has been disabled. No vertical camera motion based on "
+                "input will occur until re-enabled. See setting in Orbital Navigator"
+            );
+        }
+        else {
+            LINFO("Zooming has been enabled");
+        }
+    });
+    addProperty(_disableRoll);
+    _disableRoll.onChange([this]() {
+        if (_disableRoll) {
+            LWARNING(
+                "Camera roll has been disabled. No rolling camera motion based on "
+                "input will occur until re-enabled. See setting in Orbital Navigator"
+            );
+        }
+        else {
+            LINFO("Camera roll has been enabled");
+        }
+    });
 }
 
 glm::dvec3 OrbitalNavigator::anchorNodeToCameraVector() const {
@@ -811,7 +857,10 @@ void OrbitalNavigator::updateCameraStateFromStates(double deltaTime) {
     );
 
     // Update local rotation based on user input
-    camRot.localRotation = roll(deltaTime, camRot.localRotation);
+    if (!_disableRoll) {
+        camRot.localRotation = roll(deltaTime, camRot.localRotation);
+    }
+
     camRot.localRotation = interpolateLocalRotation(deltaTime, camRot.localRotation);
     camRot.localRotation = rotateLocally(deltaTime, camRot.localRotation);
 
@@ -853,20 +902,29 @@ void OrbitalNavigator::updateCameraStateFromStates(double deltaTime) {
     );
 
     // Rotate around the surface out direction based on user input
-    camRot.globalRotation = rotateHorizontally(
-        deltaTime,
-        camRot.globalRotation,
-        posHandle
-    );
+    if (!_disableRoll) {
+        camRot.globalRotation = rotateHorizontally(
+            deltaTime,
+            camRot.globalRotation,
+            posHandle
+        );
+    }
 
     // Perform the vertical movements based on user input
-    pose.position = translateVertically(deltaTime, pose.position, anchorPos, posHandle);
+    if (!_disableZoom) {
+        pose.position = translateVertically(
+            deltaTime,
+            pose.position,
+            anchorPos,
+            posHandle
+        );
 
-    pose.position = pushToSurface(
-        pose.position,
-        anchorPos,
-        posHandle
-    );
+        pose.position = pushToSurface(
+            pose.position,
+            anchorPos,
+            posHandle
+        );
+    }
 
     pose.rotation = composeCameraRotation(camRot);
 

From 0bf22efe720215056e514e2cf96cb35fd4aa04de Mon Sep 17 00:00:00 2001
From: GPayne <payne.gene@gmail.com>
Date: Wed, 30 Aug 2023 20:30:20 -0600
Subject: [PATCH 118/701] Reference latest commit in sgct submodule master

---
 apps/OpenSpace/ext/sgct | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/apps/OpenSpace/ext/sgct b/apps/OpenSpace/ext/sgct
index ca7a076139..654a594e2d 160000
--- a/apps/OpenSpace/ext/sgct
+++ b/apps/OpenSpace/ext/sgct
@@ -1 +1 @@
-Subproject commit ca7a076139b9b2a915b18bc6e8091bae2cbf186b
+Subproject commit 654a594e2d6e8f8784b1f73b02ae96ff33be0848

From 455ee9335afa4b1c800dd6b96a01c1793282a466 Mon Sep 17 00:00:00 2001
From: Alexander Bock <alexander.bock@liu.se>
Date: Thu, 31 Aug 2023 18:19:37 +0200
Subject: [PATCH 119/701] Add a proper blackout to the ScreenSpaceRenderables
 and a property and codegen option to toggle that behavior (#2868)

---
 .../rendering/screenspacerenderable.h         |  7 ++--
 .../base/rendering/screenspaceframebuffer.cpp |  4 +--
 .../base/rendering/screenspaceframebuffer.h   |  2 +-
 modules/base/shaders/screenspace_fs.glsl      |  3 +-
 .../include/screenspaceskybrowser.h           |  2 +-
 .../skybrowser/src/screenspaceskybrowser.cpp  | 14 ++++----
 modules/video/include/screenspacevideo.h      |  2 +-
 modules/video/src/screenspacevideo.cpp        |  4 +--
 .../webbrowser/include/screenspacebrowser.h   |  2 +-
 modules/webbrowser/src/screenspacebrowser.cpp |  8 ++---
 src/rendering/renderengine.cpp                |  4 +--
 src/rendering/screenspacerenderable.cpp       | 36 ++++++++++++++-----
 12 files changed, 55 insertions(+), 33 deletions(-)

diff --git a/include/openspace/rendering/screenspacerenderable.h b/include/openspace/rendering/screenspacerenderable.h
index 6ef0225c8a..0d832a7b68 100644
--- a/include/openspace/rendering/screenspacerenderable.h
+++ b/include/openspace/rendering/screenspacerenderable.h
@@ -61,7 +61,7 @@ public:
     ScreenSpaceRenderable(const ghoul::Dictionary& dictionary);
     virtual ~ScreenSpaceRenderable() override;
 
-    virtual void render();
+    virtual void render(float blackoutFactor);
 
     virtual bool initialize();
     virtual bool initializeGL();
@@ -102,7 +102,7 @@ protected:
     glm::vec3 raeToCartesian(const glm::vec3& rae) const;
     glm::vec3 cartesianToRae(const glm::vec3& cartesian) const;
 
-    void draw(glm::mat4 modelTransform);
+    void draw(glm::mat4 modelTransform, float blackoutFactor);
 
     virtual void bindTexture() = 0;
     virtual void unbindTexture();
@@ -114,6 +114,7 @@ protected:
     glm::vec3 sanitizeSphericalCoordinates(glm::vec3 spherical) const;
 
     properties::BoolProperty _enabled;
+    properties::BoolProperty _renderDuringBlackout;
     properties::BoolProperty _usePerspectiveProjection;
     properties::BoolProperty _useRadiusAzimuthElevation;
     properties::BoolProperty _faceCamera;
@@ -140,7 +141,7 @@ protected:
     properties::TriggerProperty _delete;
 
     glm::ivec2 _objectSize = glm::ivec2(0);
-    UniformCache(color, opacity, mvp, texture, backgroundColor, gamma,
+    UniformCache(color, opacity, blackoutFactor, mvp, texture, backgroundColor, gamma,
         borderColor, borderWidth) _uniformCache;
     std::unique_ptr<ghoul::opengl::ProgramObject> _shader;
 };
diff --git a/modules/base/rendering/screenspaceframebuffer.cpp b/modules/base/rendering/screenspaceframebuffer.cpp
index b6cf74bf62..5da3fffb18 100644
--- a/modules/base/rendering/screenspaceframebuffer.cpp
+++ b/modules/base/rendering/screenspaceframebuffer.cpp
@@ -105,7 +105,7 @@ bool ScreenSpaceFramebuffer::deinitializeGL() {
     return true;
 }
 
-void ScreenSpaceFramebuffer::render() {
+void ScreenSpaceFramebuffer::render(float blackoutFactor) {
     const glm::vec2& resolution = global::windowDelegate->currentDrawBufferResolution();
     const glm::vec4& size = _size.value();
 
@@ -145,7 +145,7 @@ void ScreenSpaceFramebuffer::render() {
             glm::vec3((1.f / xratio), (1.f / yratio), 1.f)
         );
         const glm::mat4 modelTransform = globalRotation*translation*localRotation*scale;
-        draw(modelTransform);
+        draw(modelTransform, blackoutFactor);
     }
 }
 
diff --git a/modules/base/rendering/screenspaceframebuffer.h b/modules/base/rendering/screenspaceframebuffer.h
index ad9d2d15d8..96ad201faf 100644
--- a/modules/base/rendering/screenspaceframebuffer.h
+++ b/modules/base/rendering/screenspaceframebuffer.h
@@ -55,7 +55,7 @@ public:
 
     bool initializeGL() override;
     bool deinitializeGL() override;
-    void render() override;
+    void render(float blackoutFactor) override;
     bool isReady() const override;
 
     void setSize(glm::vec4 size);
diff --git a/modules/base/shaders/screenspace_fs.glsl b/modules/base/shaders/screenspace_fs.glsl
index 1ff3f0fe9c..0124d1c5d0 100644
--- a/modules/base/shaders/screenspace_fs.glsl
+++ b/modules/base/shaders/screenspace_fs.glsl
@@ -31,6 +31,7 @@ in float vs_depth;
 uniform sampler2D tex;
 uniform vec3 color = vec3(1.0);
 uniform float opacity = 1.0;
+uniform float blackoutFactor = 1.0;
 uniform vec4 backgroundColor = vec4(0.0);
 uniform float gamma = 1.0;
 uniform vec2 borderWidth = vec2(0.1);
@@ -56,6 +57,6 @@ Fragment getFragment() {
   }
 
   frag.depth = vs_depth;
-  frag.color.rgb = pow(frag.color.rgb, vec3(1.0/(gamma)));
+  frag.color.rgb = pow(frag.color.rgb, vec3(1.0/(gamma))) * blackoutFactor;
   return frag;
 }
diff --git a/modules/skybrowser/include/screenspaceskybrowser.h b/modules/skybrowser/include/screenspaceskybrowser.h
index 13d41db2a8..de47a0355a 100644
--- a/modules/skybrowser/include/screenspaceskybrowser.h
+++ b/modules/skybrowser/include/screenspaceskybrowser.h
@@ -43,7 +43,7 @@ public:
     bool initializeGL() override;
     bool deinitializeGL() override;
     glm::mat4 scaleMatrix() override;
-    void render() override;
+    void render(float blackoutFactor) override;
     void update() override;
 
     float opacity() const noexcept override;
diff --git a/modules/skybrowser/src/screenspaceskybrowser.cpp b/modules/skybrowser/src/screenspaceskybrowser.cpp
index f66c17fb45..29566eff1b 100644
--- a/modules/skybrowser/src/screenspaceskybrowser.cpp
+++ b/modules/skybrowser/src/screenspaceskybrowser.cpp
@@ -314,16 +314,16 @@ bool ScreenSpaceSkyBrowser::deinitializeGL() {
     return true;
 }
 
-void ScreenSpaceSkyBrowser::render() {
+void ScreenSpaceSkyBrowser::render(float blackoutFactor) {
     WwtCommunicator::render();
 
     if (!_isHidden) {
-        draw(
+        glm::mat4 mat =
             globalRotationMatrix() *
             translationMatrix() *
             localRotationMatrix() *
-            scaleMatrix()
-        );
+            scaleMatrix();
+        draw(mat, blackoutFactor);
     }
 
     // Render the display copies
@@ -342,12 +342,12 @@ void ScreenSpaceSkyBrowser::render() {
                 ));
             }
 
-            draw(
+            glm::mat4 mat =
                 globalRotationMatrix() *
                 glm::translate(glm::mat4(1.f), coordinates) *
                 localRotation *
-                scaleMatrix()
-            );
+                scaleMatrix();
+            draw(mat, blackoutFactor);
         }
     }
 }
diff --git a/modules/video/include/screenspacevideo.h b/modules/video/include/screenspacevideo.h
index a864567aa7..723a572093 100644
--- a/modules/video/include/screenspacevideo.h
+++ b/modules/video/include/screenspacevideo.h
@@ -43,7 +43,7 @@ public:
     bool initializeGL() override;
     bool deinitializeGL() override;
     void update() override;
-    void render() override;
+    void render(float blackoutFactor) override;
 
     static documentation::Documentation Documentation();
 
diff --git a/modules/video/src/screenspacevideo.cpp b/modules/video/src/screenspacevideo.cpp
index a7b59e94ea..01a71b406d 100644
--- a/modules/video/src/screenspacevideo.cpp
+++ b/modules/video/src/screenspacevideo.cpp
@@ -79,9 +79,9 @@ void ScreenSpaceVideo::update() {
     }
 }
 
-void ScreenSpaceVideo::render() {
+void ScreenSpaceVideo::render(float blackoutFactor) {
     if (_videoPlayer.isInitialized()) {
-        ScreenSpaceRenderable::render();
+        ScreenSpaceRenderable::render(blackoutFactor);
     }
 }
 
diff --git a/modules/webbrowser/include/screenspacebrowser.h b/modules/webbrowser/include/screenspacebrowser.h
index cf765cbd09..cafb114dc4 100644
--- a/modules/webbrowser/include/screenspacebrowser.h
+++ b/modules/webbrowser/include/screenspacebrowser.h
@@ -68,7 +68,7 @@ public:
     bool initializeGL() override;
     bool deinitializeGL() override;
 
-    void render() override;
+    void render(float blackoutFactor) override;
     void update() override;
     bool isReady() const override;
 
diff --git a/modules/webbrowser/src/screenspacebrowser.cpp b/modules/webbrowser/src/screenspacebrowser.cpp
index b3c18a9bc3..cf7d45fc78 100644
--- a/modules/webbrowser/src/screenspacebrowser.cpp
+++ b/modules/webbrowser/src/screenspacebrowser.cpp
@@ -152,18 +152,18 @@ bool ScreenSpaceBrowser::deinitializeGL() {
     return ScreenSpaceRenderable::deinitializeGL();
 }
 
-void ScreenSpaceBrowser::render() {
+void ScreenSpaceBrowser::render(float blackoutFactor) {
     if (!_renderHandler->isTextureReady()) {
         return;
     }
 
     _renderHandler->updateTexture();
-    draw(
+    glm::mat4 mat =
         globalRotationMatrix() *
         translationMatrix() *
         localRotationMatrix() *
-        scaleMatrix()
-    );
+        scaleMatrix();
+    draw(mat, blackoutFactor);
 }
 
 void ScreenSpaceBrowser::update() {
diff --git a/src/rendering/renderengine.cpp b/src/rendering/renderengine.cpp
index f88a18352f..7adc3ddbc4 100644
--- a/src/rendering/renderengine.cpp
+++ b/src/rendering/renderengine.cpp
@@ -728,7 +728,7 @@ void RenderEngine::render(const glm::mat4& sceneMatrix, const glm::mat4& viewMat
         RenderFont(*_fontFrameInfo, penPosition, res);
     }
 
-    if (renderingEnabled && !delegate.isGuiWindow() && _globalBlackOutFactor > 0.f) {
+    if (renderingEnabled && !delegate.isGuiWindow()) {
         ZoneScopedN("Render Screenspace Renderable");
 
         std::vector<ScreenSpaceRenderable*> ssrs;
@@ -755,7 +755,7 @@ void RenderEngine::render(const glm::mat4& sceneMatrix, const glm::mat4& viewMat
         glEnable(GL_BLEND);
         glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
         for (ScreenSpaceRenderable* ssr : ssrs) {
-            ssr->render();
+            ssr->render(_globalBlackOutFactor);
         }
         glDisable(GL_BLEND);
     }
diff --git a/src/rendering/screenspacerenderable.cpp b/src/rendering/screenspacerenderable.cpp
index 8f39aad7f0..f3535aec34 100644
--- a/src/rendering/screenspacerenderable.cpp
+++ b/src/rendering/screenspacerenderable.cpp
@@ -43,9 +43,9 @@
 #include <variant>
 
 namespace {
-    constexpr std::array<const char*, 8> UniformNames = {
-        "color", "opacity", "mvpMatrix", "tex", "backgroundColor", "gamma", "borderColor",
-        "borderWidth"
+    constexpr std::array<const char*, 9> UniformNames = {
+        "color", "opacity", "blackoutFactor", "mvpMatrix", "tex", "backgroundColor",
+        "gamma", "borderColor", "borderWidth"
     };
 
     constexpr openspace::properties::Property::PropertyInfo EnabledInfo = {
@@ -55,6 +55,16 @@ namespace {
         openspace::properties::Property::Visibility::AdvancedUser
     };
 
+    constexpr openspace::properties::Property::PropertyInfo RenderDuringBlackoutInfo = {
+        "RenderDuringBlackout",
+        "Render during Blackout",
+        "If this value is 'true', this screenspace renderable is going to ignore the "
+        "global blackout factor from the Render Engine and will always render at full "
+        "opacity. If it is 'false', it will adhere to the factor and fade out like the "
+        "rest of the 3D rendering",
+        openspace::properties::Property::Visibility::User
+    };
+
     constexpr openspace::properties::Property::PropertyInfo
         UseRadiusAzimuthElevationInfo =
     {
@@ -191,6 +201,9 @@ namespace {
         // [[codegen::verbatim(EnabledInfo.description)]]
         std::optional<bool> enabled;
 
+        // [[codegen::verbatim(RenderDuringBlackoutInfo.description)]]
+        std::optional<bool> renderDuringBlackout;
+
         // [[codegen::verbatim(UseRadiusAzimuthElevationInfo.description)]]
         std::optional<bool> useRadiusAzimuthElevation;
 
@@ -282,6 +295,7 @@ std::string ScreenSpaceRenderable::makeUniqueIdentifier(std::string name) {
 ScreenSpaceRenderable::ScreenSpaceRenderable(const ghoul::Dictionary& dictionary)
     : properties::PropertyOwner({ "" })
     , _enabled(EnabledInfo, true)
+    , _renderDuringBlackout(RenderDuringBlackoutInfo, false)
     , _usePerspectiveProjection(UsePerspectiveProjectionInfo, false)
     , _useRadiusAzimuthElevation(UseRadiusAzimuthElevationInfo, false)
     , _faceCamera(FaceCameraInfo, true)
@@ -327,6 +341,8 @@ ScreenSpaceRenderable::ScreenSpaceRenderable(const ghoul::Dictionary& dictionary
     }
 
     addProperty(_enabled);
+    _renderDuringBlackout = p.renderDuringBlackout.value_or(_renderDuringBlackout);
+    addProperty(_renderDuringBlackout);
     addProperty(_useRadiusAzimuthElevation);
     addProperty(_usePerspectiveProjection);
     addProperty(_faceCamera);
@@ -436,15 +452,15 @@ bool ScreenSpaceRenderable::deinitializeGL() {
     return true;
 }
 
-void ScreenSpaceRenderable::render() {
+void ScreenSpaceRenderable::render(float blackoutFactor) {
     ZoneScoped;
 
-    draw(
+    glm::mat4 mat =
         globalRotationMatrix() *
         translationMatrix() *
         localRotationMatrix() *
-        scaleMatrix()
-    );
+        scaleMatrix();
+    draw(mat, blackoutFactor);
 }
 
 bool ScreenSpaceRenderable::isReady() const {
@@ -622,7 +638,7 @@ glm::mat4 ScreenSpaceRenderable::translationMatrix() {
     return glm::translate(glm::mat4(1.f), translation);
 }
 
-void ScreenSpaceRenderable::draw(glm::mat4 modelTransform) {
+void ScreenSpaceRenderable::draw(glm::mat4 modelTransform, float blackoutFactor) {
     glDisable(GL_CULL_FACE);
 
     _shader->activate();
@@ -634,6 +650,10 @@ void ScreenSpaceRenderable::draw(glm::mat4 modelTransform) {
 
     _shader->setUniform(_uniformCache.color, _multiplyColor);
     _shader->setUniform(_uniformCache.opacity, opacity());
+    _shader->setUniform(
+        _uniformCache.blackoutFactor,
+        _renderDuringBlackout ? 1.f : blackoutFactor
+    );
     _shader->setUniform(_uniformCache.backgroundColor, _backgroundColor);
     _shader->setUniform(_uniformCache.gamma, _gamma);
     _shader->setUniform(_uniformCache.borderWidth, borderUV);

From c3ae39da62db15e7b44b4687dcdf785d3e8dfce7 Mon Sep 17 00:00:00 2001
From: Ylva Selling <ylva.selling@gmail.com>
Date: Fri, 1 Sep 2023 08:10:10 -0400
Subject: [PATCH 120/701] Change name of line fade in RenderableTrail from Fade
 to LineFade (#2857)

* Change name of line fade in RenderableTrail from Fade to LineFade

* Adress review comments

---------

Co-authored-by: Emma Broman <emma.broman@liu.se>
---
 modules/base/rendering/renderabletrail.cpp | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/modules/base/rendering/renderabletrail.cpp b/modules/base/rendering/renderabletrail.cpp
index f6a25cdf22..31477e4be6 100644
--- a/modules/base/rendering/renderabletrail.cpp
+++ b/modules/base/rendering/renderabletrail.cpp
@@ -86,8 +86,8 @@ namespace {
         openspace::properties::Property::Visibility::NoviceUser
     };
 
-    constexpr openspace::properties::Property::PropertyInfo FadeInfo = {
-        "Fade",
+    constexpr openspace::properties::Property::PropertyInfo LineFadeInfo = {
+        "LineFade",
         "Line fade",
         "The fading factor that is applied to the trail if the 'EnableFade' value is "
         "'true'. If it is 'false', this setting has no effect. The higher the number, "
@@ -138,8 +138,8 @@ namespace {
         // [[codegen::verbatim(EnableFadeInfo.description)]]
         std::optional<bool> enableFade;
 
-        // [[codegen::verbatim(FadeInfo.description)]]
-        std::optional<float> fade;
+        // [[codegen::verbatim(LineFadeInfo.description)]]
+        std::optional<float> lineFade;
 
         // [[codegen::verbatim(LineWidthInfo.description)]]
         std::optional<float> lineWidth;
@@ -173,7 +173,7 @@ RenderableTrail::Appearance::Appearance()
     })
     , lineColor(LineColorInfo, glm::vec3(1.f), glm::vec3(0.f), glm::vec3(1.f))
     , useLineFade(EnableFadeInfo, true)
-    , lineFade(FadeInfo, 1.f, 0.f, 30.f)
+    , lineFade(LineFadeInfo, 1.f, 0.f, 30.f)
     , lineWidth(LineWidthInfo, 10.f, 1.f, 20.f)
     , pointSize(PointSizeInfo, 1, 1, 64)
     , renderingModes(
@@ -211,7 +211,7 @@ RenderableTrail::RenderableTrail(const ghoul::Dictionary& dictionary)
 
     _appearance.lineColor = p.color;
     _appearance.useLineFade = p.enableFade.value_or(_appearance.useLineFade);
-    _appearance.lineFade = p.fade.value_or(_appearance.lineFade);
+    _appearance.lineFade = p.lineFade.value_or(_appearance.lineFade);
     _appearance.lineWidth = p.lineWidth.value_or(_appearance.lineWidth);
     _appearance.pointSize = p.pointSize.value_or(_appearance.pointSize);
 

From b49a8704dc134b2595b8694e95ed3747d01108e4 Mon Sep 17 00:00:00 2001
From: Alexander Bock <alexander.bock@liu.se>
Date: Wed, 6 Sep 2023 08:55:02 +0200
Subject: [PATCH 121/701] Add new asset showing a text marker for the moon
 (closes #2831)

---
 .../planets/earth/moon/markers.asset          | 51 +++++++++++++++++++
 1 file changed, 51 insertions(+)
 create mode 100644 data/assets/scene/solarsystem/planets/earth/moon/markers.asset

diff --git a/data/assets/scene/solarsystem/planets/earth/moon/markers.asset b/data/assets/scene/solarsystem/planets/earth/moon/markers.asset
new file mode 100644
index 0000000000..e6fc604800
--- /dev/null
+++ b/data/assets/scene/solarsystem/planets/earth/moon/markers.asset
@@ -0,0 +1,51 @@
+local transforms = asset.require("./moon")
+
+
+
+local texturesPath = asset.syncedResource({
+  Name = "Moon Textures",
+  Type = "HttpSynchronization",
+  Identifier = "moon_textures",
+  Version = 3
+})
+
+
+local MoonMarker = {
+  Identifier = "MoonMarker",
+  Parent = transforms.Moon.Identifier,
+  Renderable = {
+    Type = "RenderablePlaneImageLocal",
+    Enabled = false,
+    Size = 3.0E7,
+    Origin = "Center",
+    Billboard = true,
+    Texture = texturesPath .. "marker.png",
+    BlendMode = "Additive"
+  },
+  GUI = {
+    Name = "Moon Marker",
+    Path = "/Solar System/Planets/Earth/Moon"
+  }
+}
+
+
+asset.onInitialize(function()
+  openspace.addSceneGraphNode(MoonMarker)
+end)
+
+asset.onDeinitialize(function()
+  openspace.removeSceneGraphNode(MoonMarker)
+end)
+
+asset.export(MoonMarker)
+
+
+
+asset.meta = {
+  Name = "Moon marker",
+  Version = "1.0",
+  Description = "Moon marker with name, sized for Earth view",
+  Author = "OpenSpace Team",
+  URL = "http://openspaceproject.com",
+  License = "MIT license"
+}

From 4447de87f53b28d0ccb415d26f3d78f5eedbbf1f Mon Sep 17 00:00:00 2001
From: Malin E <malin.ejdbo@gmail.com>
Date: Thu, 7 Sep 2023 13:21:29 +0200
Subject: [PATCH 122/701] Issue/2768 (#2872)

* Rename remote scripting property to reflect better what it does

* Change the remote scripting name in all modules

* Update all scripts and action calls to use the new property for sync

* Simplify code that decides whether to send actions to nodes and peers

* Move Lua console hint text to be right top aligned

* Update Lua script topic

* Added new JSON key whether or not the script should be synced to other
  nodes and peers

* Per default all scripts sync to everyone
  In the next full release, we should have two separate keys that
  decides whether to sync and send to nodes and peers separately

* Add some comments that explain why there is no sync for some scripts

* Make sync argument in trigger action function BooleanType
---
 include/openspace/interaction/actionmanager.h |   6 +-
 include/openspace/rendering/luaconsole.h      |   3 +-
 include/openspace/scripting/scriptengine.h    |  10 +-
 modules/debugging/debuggingmodule_lua.inl     |  24 ++--
 modules/exoplanets/exoplanetsmodule_lua.inl   |  36 ++++--
 .../src/geojson/geojsoncomponent.cpp          |   6 +-
 modules/imgui/src/guiactioncomponent.cpp      |  12 +-
 modules/imgui/src/guigibscomponent.cpp        |   3 +-
 .../imgui/src/guiglobebrowsingcomponent.cpp   |   3 +-
 modules/imgui/src/guispacetimecomponent.cpp   | 117 ++++++++++++++----
 modules/imgui/src/renderproperties.cpp        |   3 +-
 modules/iswa/rendering/iswacygnet.cpp         |   6 +-
 modules/iswa/rendering/iswakameleongroup.cpp  |   6 +-
 modules/iswa/rendering/kameleonplane.cpp      |   3 +-
 modules/iswa/rendering/screenspacecygnet.cpp  |   3 +-
 modules/iswa/util/iswamanager.cpp             |  15 ++-
 modules/iswa/util/iswamanager_lua.inl         |   6 +-
 .../server/include/topics/luascripttopic.h    |   2 +-
 .../src/topics/flightcontrollertopic.cpp      |   3 +-
 modules/server/src/topics/luascripttopic.cpp  |  24 +++-
 .../server/src/topics/setpropertytopic.cpp    |   3 +-
 .../src/topics/triggerpropertytopic.cpp       |   3 +-
 modules/skybrowser/skybrowsermodule.cpp       |   9 +-
 modules/skybrowser/skybrowsermodule_lua.inl   |  38 ++++--
 modules/skybrowser/src/targetbrowserpair.cpp  |   6 +-
 modules/statemachine/src/state.cpp            |   6 +-
 modules/statemachine/src/transition.cpp       |   3 +-
 src/engine/openspaceengine.cpp                |  18 ++-
 src/events/eventengine.cpp                    |   8 +-
 src/interaction/actionmanager.cpp             |  28 +++--
 src/interaction/actionmanager_lua.inl         |  10 +-
 src/interaction/joystickcamerastates.cpp      |   8 +-
 src/interaction/keybindingmanager.cpp         |   6 +-
 src/interaction/sessionrecording.cpp          |   3 +-
 src/navigation/navigationhandler.cpp          |  32 ++++-
 src/navigation/pathnavigator.cpp              |   9 +-
 src/network/parallelpeer.cpp                  |   5 +-
 src/rendering/luaconsole.cpp                  |  76 ++++++++----
 src/rendering/renderengine.cpp                |   9 +-
 src/rendering/screenspacerenderable.cpp       |   6 +-
 src/scene/scene.cpp                           |   6 +-
 src/scripting/scriptengine.cpp                |  28 +++--
 src/scripting/scriptscheduler.cpp             |   3 +-
 43 files changed, 449 insertions(+), 165 deletions(-)

diff --git a/include/openspace/interaction/actionmanager.h b/include/openspace/interaction/actionmanager.h
index 9054b3fc09..610bdbf1e9 100644
--- a/include/openspace/interaction/actionmanager.h
+++ b/include/openspace/interaction/actionmanager.h
@@ -35,14 +35,16 @@ namespace openspace::interaction {
 
 class ActionManager {
 public:
+    BooleanType(ShouldBeSynchronized);
+
     bool hasAction(const std::string& identifier) const;
     void registerAction(Action action);
     void removeAction(const std::string& identifier);
     const Action& action(const std::string& identifier) const;
     std::vector<Action> actions() const;
 
-    void triggerAction(const std::string& identifier,
-        const ghoul::Dictionary& arguments) const;
+    void triggerAction(const std::string& identifier, const ghoul::Dictionary& arguments,
+        ShouldBeSynchronized shouldBeSynchronized) const;
     static scripting::LuaLibrary luaLibrary();
 
 private:
diff --git a/include/openspace/rendering/luaconsole.h b/include/openspace/rendering/luaconsole.h
index f7a828fb97..cd875a2b4a 100644
--- a/include/openspace/rendering/luaconsole.h
+++ b/include/openspace/rendering/luaconsole.h
@@ -66,7 +66,8 @@ private:
     void addToCommand(std::string c);
 
     properties::BoolProperty _isVisible;
-    properties::BoolProperty _remoteScripting;
+    properties::BoolProperty _shouldBeSynchronized;
+    properties::BoolProperty _shouldSendToRemote;
 
     properties::Vec4Property _backgroundColor;
     properties::Vec4Property _entryTextColor;
diff --git a/include/openspace/scripting/scriptengine.h b/include/openspace/scripting/scriptengine.h
index 8221fee70a..65e6703fe9 100644
--- a/include/openspace/scripting/scriptengine.h
+++ b/include/openspace/scripting/scriptengine.h
@@ -51,11 +51,13 @@ namespace openspace::scripting {
 class ScriptEngine : public Syncable {
 public:
     using ScriptCallback = std::function<void(ghoul::Dictionary)>;
-    BooleanType(RemoteScripting);
+    BooleanType(ShouldBeSynchronized);
+    BooleanType(ShouldSendToRemote);
 
     struct QueueItem {
         std::string script;
-        RemoteScripting remoteScripting;
+        ShouldBeSynchronized shouldBeSynchronized;
+        ShouldSendToRemote shouldSendToRemote;
         ScriptCallback callback;
     };
 
@@ -89,8 +91,8 @@ public:
     virtual void decode(SyncBuffer* syncBuffer) override;
     virtual void postSync(bool isMaster) override;
 
-    void queueScript(std::string script, RemoteScripting remoteScripting,
-        ScriptCallback cb = ScriptCallback());
+    void queueScript(std::string script, ShouldBeSynchronized shouldBeSynchronized,
+        ShouldSendToRemote shouldSendToRemote, ScriptCallback cb = ScriptCallback());
 
     std::vector<std::string> allLuaFunctions() const;
 
diff --git a/modules/debugging/debuggingmodule_lua.inl b/modules/debugging/debuggingmodule_lua.inl
index c8951ae0fb..de69a6deb5 100644
--- a/modules/debugging/debuggingmodule_lua.inl
+++ b/modules/debugging/debuggingmodule_lua.inl
@@ -66,7 +66,8 @@ constexpr glm::vec3 OrientationLineColor = glm::vec3(0.0, 1.0, 1.0);
 
     global::scriptEngine->queueScript(
         addParentScript,
-        scripting::ScriptEngine::RemoteScripting::Yes
+        scripting::ScriptEngine::ShouldBeSynchronized::Yes,
+        scripting::ScriptEngine::ShouldSendToRemote::Yes
     );
 
     // Get the poses along the path
@@ -98,7 +99,8 @@ constexpr glm::vec3 OrientationLineColor = glm::vec3(0.0, 1.0, 1.0);
 
         global::scriptEngine->queueScript(
             fmt::format("openspace.addSceneGraphNode({})", pointNode),
-            scripting::ScriptEngine::RemoteScripting::Yes
+            scripting::ScriptEngine::ShouldBeSynchronized::Yes,
+            scripting::ScriptEngine::ShouldSendToRemote::Yes
         );
     };
 
@@ -120,7 +122,8 @@ constexpr glm::vec3 OrientationLineColor = glm::vec3(0.0, 1.0, 1.0);
 
         global::scriptEngine->queueScript(
             fmt::format("openspace.addSceneGraphNode({})", lineNode),
-            scripting::ScriptEngine::RemoteScripting::Yes
+            scripting::ScriptEngine::ShouldBeSynchronized::Yes,
+            scripting::ScriptEngine::ShouldSendToRemote::Yes
         );
     };
 
@@ -157,7 +160,8 @@ constexpr glm::vec3 OrientationLineColor = glm::vec3(0.0, 1.0, 1.0);
     using namespace openspace;
     global::scriptEngine->queueScript(
         fmt::format("openspace.removeSceneGraphNode('{}');", RenderedPathIdentifier),
-        scripting::ScriptEngine::RemoteScripting::Yes
+        scripting::ScriptEngine::ShouldBeSynchronized::Yes,
+        scripting::ScriptEngine::ShouldSendToRemote::Yes
     );
 }
 
@@ -189,7 +193,8 @@ constexpr glm::vec3 OrientationLineColor = glm::vec3(0.0, 1.0, 1.0);
 
     global::scriptEngine->queueScript(
         addParentScript,
-        scripting::ScriptEngine::RemoteScripting::Yes
+        scripting::ScriptEngine::ShouldBeSynchronized::Yes,
+        scripting::ScriptEngine::ShouldSendToRemote::Yes
     );
 
     const std::vector<glm::dvec3> points = currentPath->controlPoints();
@@ -226,7 +231,8 @@ constexpr glm::vec3 OrientationLineColor = glm::vec3(0.0, 1.0, 1.0);
 
         global::scriptEngine->queueScript(
             fmt::format("openspace.addSceneGraphNode({})", node),
-            scripting::ScriptEngine::RemoteScripting::Yes
+            scripting::ScriptEngine::ShouldBeSynchronized::Yes,
+            scripting::ScriptEngine::ShouldSendToRemote::Yes
         );
     }
 }
@@ -236,7 +242,8 @@ constexpr glm::vec3 OrientationLineColor = glm::vec3(0.0, 1.0, 1.0);
     using namespace openspace;
     global::scriptEngine->queueScript(
         fmt::format("openspace.removeSceneGraphNode('{}');", RenderedPointsIdentifier),
-        scripting::ScriptEngine::RemoteScripting::Yes
+        scripting::ScriptEngine::ShouldBeSynchronized::Yes,
+        scripting::ScriptEngine::ShouldSendToRemote::Yes
     );
 }
 
@@ -291,7 +298,8 @@ constexpr glm::vec3 OrientationLineColor = glm::vec3(0.0, 1.0, 1.0);
 
     global::scriptEngine->queueScript(
         fmt::format("openspace.addSceneGraphNode({});", axes),
-        scripting::ScriptEngine::RemoteScripting::Yes
+        scripting::ScriptEngine::ShouldBeSynchronized::Yes,
+        scripting::ScriptEngine::ShouldSendToRemote::Yes
     );
 }
 
diff --git a/modules/exoplanets/exoplanetsmodule_lua.inl b/modules/exoplanets/exoplanetsmodule_lua.inl
index bdd98a510a..a7aa2d4f15 100644
--- a/modules/exoplanets/exoplanetsmodule_lua.inl
+++ b/modules/exoplanets/exoplanetsmodule_lua.inl
@@ -211,9 +211,12 @@ void createExoplanetSystem(const std::string& starName,
         "}"
     "}";
 
+    // No sync or send because this is already inside a Lua script, therefor it has
+    // already been synced and sent to the connected nodes and peers
     global::scriptEngine->queueScript(
         "openspace.addSceneGraphNode(" + starParent + ");",
-        scripting::ScriptEngine::RemoteScripting::Yes
+        scripting::ScriptEngine::ShouldBeSynchronized::No,
+        scripting::ScriptEngine::ShouldSendToRemote::No
     );
 
     // Planets
@@ -327,10 +330,13 @@ void createExoplanetSystem(const std::string& starName,
             "}"
         "}";
 
+        // No sync or send because this is already inside a Lua script, therefor it has
+        // already been synced and sent to the connected nodes and peers
         global::scriptEngine->queueScript(
             "openspace.addSceneGraphNode(" + planetTrailNode + ");"
             "openspace.addSceneGraphNode(" + planetNode + ");",
-            scripting::ScriptEngine::RemoteScripting::Yes
+            scripting::ScriptEngine::ShouldBeSynchronized::No,
+            scripting::ScriptEngine::ShouldSendToRemote::No
         );
 
         bool hasUpperAUncertainty = !std::isnan(planet.aUpper);
@@ -377,9 +383,12 @@ void createExoplanetSystem(const std::string& starName,
                 "}"
             "}";
 
+            // No sync or send because this is already inside a Lua script, therefor it
+            // has already been synced and sent to the connected nodes and peers
             global::scriptEngine->queueScript(
                 "openspace.addSceneGraphNode(" + discNode + ");",
-                scripting::ScriptEngine::RemoteScripting::Yes
+                scripting::ScriptEngine::ShouldBeSynchronized::No,
+                scripting::ScriptEngine::ShouldSendToRemote::No
             );
         }
     }
@@ -422,9 +431,12 @@ void createExoplanetSystem(const std::string& starName,
         "}"
     "}";
 
+    // No sync or send because this is already inside a Lua script, therefor it has
+    // already been synced and sent to the connected nodes and peers
     global::scriptEngine->queueScript(
         "openspace.addSceneGraphNode(" + circle + ");",
-        scripting::ScriptEngine::RemoteScripting::Yes
+        scripting::ScriptEngine::ShouldBeSynchronized::No,
+        scripting::ScriptEngine::ShouldSendToRemote::No
     );
 
     // Habitable Zone
@@ -477,9 +489,12 @@ void createExoplanetSystem(const std::string& starName,
             "}"
         "}";
 
+        // No sync or send because this is already inside a Lua script, therefor it has
+        // already been synced and sent to the connected nodes and peers
         global::scriptEngine->queueScript(
             "openspace.addSceneGraphNode(" + zoneDiscNode + ");",
-            scripting::ScriptEngine::RemoteScripting::Yes
+            scripting::ScriptEngine::ShouldBeSynchronized::No,
+            scripting::ScriptEngine::ShouldSendToRemote::No
         );
 
         // Star glare
@@ -518,9 +533,12 @@ void createExoplanetSystem(const std::string& starName,
                 "}"
             "}";
 
+            // No sync or send because this is already inside a Lua script, therefor it
+            // has already been synced and sent to the connected nodes and peers
             global::scriptEngine->queueScript(
                 "openspace.addSceneGraphNode(" + starGlare + ");",
-                scripting::ScriptEngine::RemoteScripting::Yes
+                scripting::ScriptEngine::ShouldBeSynchronized::No,
+                scripting::ScriptEngine::ShouldSendToRemote::No
             );
         }
     }
@@ -627,9 +645,13 @@ std::vector<std::string> hostStarsWithSufficientData() {
     using namespace openspace;
     using namespace exoplanets;
     const std::string starIdentifier = makeIdentifier(std::move(starName));
+
+    // No sync or send because this is already inside a Lua script, therefor it has
+    // already been synced and sent to the connected nodes and peers
     global::scriptEngine->queueScript(
         "openspace.removeSceneGraphNode('" + starIdentifier + "');",
-        scripting::ScriptEngine::RemoteScripting::Yes
+        scripting::ScriptEngine::ShouldBeSynchronized::No,
+        scripting::ScriptEngine::ShouldSendToRemote::No
     );
 }
 
diff --git a/modules/globebrowsing/src/geojson/geojsoncomponent.cpp b/modules/globebrowsing/src/geojson/geojsoncomponent.cpp
index ca3dbf5423..1d876df11b 100644
--- a/modules/globebrowsing/src/geojson/geojsoncomponent.cpp
+++ b/modules/globebrowsing/src/geojson/geojsoncomponent.cpp
@@ -840,7 +840,8 @@ void GeoJsonComponent::flyToFeature(std::optional<int> index) const {
             "openspace.globebrowsing.flyToGeo(\"{}\", {}, {}, {})",
             _globeNode.owner()->identifier(), lat, lon, d
         ),
-        scripting::ScriptEngine::RemoteScripting::Yes
+        scripting::ScriptEngine::ShouldBeSynchronized::Yes,
+        scripting::ScriptEngine::ShouldSendToRemote::Yes
     );
 }
 
@@ -850,7 +851,8 @@ void GeoJsonComponent::triggerDeletion() const {
             "openspace.globebrowsing.deleteGeoJson(\"{}\", \"{}\")",
             _globeNode.owner()->identifier(), _identifier
         ),
-        scripting::ScriptEngine::RemoteScripting::Yes
+        scripting::ScriptEngine::ShouldBeSynchronized::Yes,
+        scripting::ScriptEngine::ShouldSendToRemote::Yes
     );
 }
 
diff --git a/modules/imgui/src/guiactioncomponent.cpp b/modules/imgui/src/guiactioncomponent.cpp
index a9bb377201..1c7ea37b7c 100644
--- a/modules/imgui/src/guiactioncomponent.cpp
+++ b/modules/imgui/src/guiactioncomponent.cpp
@@ -55,7 +55,11 @@ void GuiActionComponent::render() {
     for (const std::pair<const K, V>& p : binds) {
         boundActions.insert(p.second);
         if (ImGui::Button(ghoul::to_string(p.first).c_str())) {
-            global::actionManager->triggerAction(p.second, ghoul::Dictionary());
+            global::actionManager->triggerAction(
+                p.second,
+                ghoul::Dictionary(),
+                interaction::ActionManager::ShouldBeSynchronized::Yes
+            );
         }
         ImGui::SameLine();
 
@@ -78,7 +82,11 @@ void GuiActionComponent::render() {
         }
 
         if (ImGui::Button(action.identifier.c_str())) {
-            global::actionManager->triggerAction(action.command, ghoul::Dictionary());
+            global::actionManager->triggerAction(
+                action.command,
+                ghoul::Dictionary(),
+                interaction::ActionManager::ShouldBeSynchronized::Yes
+            );
         }
         ImGui::SameLine();
 
diff --git a/modules/imgui/src/guigibscomponent.cpp b/modules/imgui/src/guigibscomponent.cpp
index e544e01241..a9c2c71a1c 100644
--- a/modules/imgui/src/guigibscomponent.cpp
+++ b/modules/imgui/src/guigibscomponent.cpp
@@ -147,7 +147,8 @@ void GuiGIBSComponent::render() {
         );
         global::scriptEngine->queueScript(
             script,
-            scripting::ScriptEngine::RemoteScripting::Yes
+            scripting::ScriptEngine::ShouldBeSynchronized::Yes,
+            scripting::ScriptEngine::ShouldSendToRemote::Yes
         );
     }
 
diff --git a/modules/imgui/src/guiglobebrowsingcomponent.cpp b/modules/imgui/src/guiglobebrowsingcomponent.cpp
index 3e3848a830..af6c52d820 100644
--- a/modules/imgui/src/guiglobebrowsingcomponent.cpp
+++ b/modules/imgui/src/guiglobebrowsingcomponent.cpp
@@ -344,7 +344,8 @@ void GuiGlobeBrowsingComponent::render() {
                     l.name,
                     l.url
                 ),
-                scripting::ScriptEngine::RemoteScripting::Yes
+                scripting::ScriptEngine::ShouldBeSynchronized::Yes,
+                scripting::ScriptEngine::ShouldSendToRemote::Yes
             );
         };
 
diff --git a/modules/imgui/src/guispacetimecomponent.cpp b/modules/imgui/src/guispacetimecomponent.cpp
index 7c00f3d155..0a7bf9dbc7 100644
--- a/modules/imgui/src/guispacetimecomponent.cpp
+++ b/modules/imgui/src/guispacetimecomponent.cpp
@@ -109,12 +109,14 @@ void GuiSpaceTimeComponent::render() {
                     "openspace.setPropertyValue('" +
                     std::string(AnchorProperty) + "', '" +
                     n->identifier() + "');",
-                    scripting::ScriptEngine::RemoteScripting::Yes
+                    scripting::ScriptEngine::ShouldBeSynchronized::Yes,
+                    scripting::ScriptEngine::ShouldSendToRemote::Yes
                 );
                 global::scriptEngine->queueScript(
                     "openspace.setPropertyValue('" +
                     std::string(RetargetAnchorProperty) + "', nil);",
-                    scripting::ScriptEngine::RemoteScripting::Yes
+                    scripting::ScriptEngine::ShouldBeSynchronized::Yes,
+                    scripting::ScriptEngine::ShouldSendToRemote::Yes
                 );
             }
         }
@@ -144,12 +146,14 @@ void GuiSpaceTimeComponent::render() {
         global::scriptEngine->queueScript(
             "openspace.setPropertyValue('" + std::string(AnchorProperty) + "', '" +
             nodes[currentPosition]->identifier() + "');",
-            scripting::ScriptEngine::RemoteScripting::Yes
+            scripting::ScriptEngine::ShouldBeSynchronized::Yes,
+            scripting::ScriptEngine::ShouldSendToRemote::Yes
         );
         global::scriptEngine->queueScript(
             "openspace.setPropertyValue('" +
             std::string(RetargetAnchorProperty) + "', nil);",
-            scripting::ScriptEngine::RemoteScripting::Yes
+            scripting::ScriptEngine::ShouldBeSynchronized::Yes,
+            scripting::ScriptEngine::ShouldSendToRemote::Yes
         );
     }
 
@@ -159,7 +163,8 @@ void GuiSpaceTimeComponent::render() {
         global::scriptEngine->queueScript(
             "openspace.setPropertyValue('" +
             std::string(RetargetAnchorProperty) + "', nil);",
-            scripting::ScriptEngine::RemoteScripting::Yes
+            scripting::ScriptEngine::ShouldBeSynchronized::Yes,
+            scripting::ScriptEngine::ShouldSendToRemote::Yes
         );
     }
 
@@ -195,9 +200,13 @@ void GuiSpaceTimeComponent::render() {
         for (size_t i = 0; i < interestingTimes.size(); ++i) {
             const Scene::InterestingTime& t = interestingTimes[i];
             if (ImGui::Button(t.name.c_str())) {
+
+                // No sync or send because time settings are always synced and sent
+                // to the connected nodes and peers
                 global::scriptEngine->queueScript(
                     "openspace.time.setTime(\"" + t.time + "\")",
-                    scripting::ScriptEngine::RemoteScripting::No
+                    scripting::ScriptEngine::ShouldBeSynchronized::No,
+                    scripting::ScriptEngine::ShouldSendToRemote::No
                 );
             }
 
@@ -223,9 +232,12 @@ void GuiSpaceTimeComponent::render() {
         ImGuiInputTextFlags_EnterReturnsTrue
     );
     if (dateChanged) {
+        // No sync or send because time settings are always synced and sent to the
+        // connected nodes and peers
         global::scriptEngine->queueScript(
             "openspace.time.setTime(\"" + std::string(Buffer) + "\")",
-            scripting::ScriptEngine::RemoteScripting::No
+            scripting::ScriptEngine::ShouldBeSynchronized::No,
+            scripting::ScriptEngine::ShouldSendToRemote::No
         );
     }
 
@@ -255,17 +267,23 @@ void GuiSpaceTimeComponent::render() {
             j2000 + seconds;
 
         if (shift) {
-            // If any shift key is pressed we want to always jump to the time
+            // If any shift key is pressed we want to always jump to the time.
+            // No sync or send because time settings are always synced and sent
+            // to the connected nodes and peers
             global::scriptEngine->queueScript(
                 "openspace.time.setTime(" + std::to_string(newTime) + ")",
-                scripting::ScriptEngine::RemoteScripting::No
+                scripting::ScriptEngine::ShouldBeSynchronized::No,
+                scripting::ScriptEngine::ShouldSendToRemote::No
             );
         }
         else {
+            // No sync or send because time settings are always synced and sent
+            // to the connected nodes and peers
             global::scriptEngine->queueScript(
                 "openspace.time.interpolateTime(" + std::to_string(newTime) + ", " +
                 std::to_string(duration) + ")",
-                scripting::ScriptEngine::RemoteScripting::No
+                scripting::ScriptEngine::ShouldBeSynchronized::No,
+                scripting::ScriptEngine::ShouldSendToRemote::No
             );
         }
     };
@@ -302,9 +320,12 @@ void GuiSpaceTimeComponent::render() {
         // setTime doesn't like the T in it and wants a space instead
         nowTime[11] = ' ';
 
+        // No sync or send because time settings are always synced and sent
+        // to the connected nodes and peers
         global::scriptEngine->queueScript(
             "openspace.time.setTime(\"" + nowTime + "\")",
-            scripting::ScriptEngine::RemoteScripting::No
+            scripting::ScriptEngine::ShouldBeSynchronized::No,
+            scripting::ScriptEngine::ShouldSendToRemote::No
         );
 
     }
@@ -382,9 +403,13 @@ void GuiSpaceTimeComponent::render() {
             // If the value changed, we want to change the delta time to the new value
 
             double newDt = convertTime(_deltaTime, _deltaTimeUnit, TimeUnit::Second);
+
+            // No sync or send because time settings are always synced and sent
+            // to the connected nodes and peers
             global::scriptEngine->queueScript(
                 "openspace.time.interpolateDeltaTime(" + std::to_string(newDt) + ")",
-                scripting::ScriptEngine::RemoteScripting::No
+                scripting::ScriptEngine::ShouldBeSynchronized::No,
+                scripting::ScriptEngine::ShouldSendToRemote::No
             );
         }
         if (unitChanged) {
@@ -430,16 +455,22 @@ void GuiSpaceTimeComponent::render() {
                 TimeUnit::Second
             );
 
+            // No sync or send because time settings are always synced and sent
+            // to the connected nodes and peers
             global::scriptEngine->queueScript(
                 "openspace.time.setDeltaTime(" + std::to_string(newDeltaTime) + ")",
-                scripting::ScriptEngine::RemoteScripting::No
+                scripting::ScriptEngine::ShouldBeSynchronized::No,
+                scripting::ScriptEngine::ShouldSendToRemote::No
             );
         }
         if (!ImGui::IsItemActive() && !ImGui::IsItemClicked()) {
             if (_slidingDelta != 0.f) {
+                // No sync or send because time settings are always synced and sent
+                // to the connected nodes and peers
                 global::scriptEngine->queueScript(
                     "openspace.time.setDeltaTime(" + std::to_string(_oldDeltaTime) + ")",
-                    scripting::ScriptEngine::RemoteScripting::No
+                    scripting::ScriptEngine::ShouldBeSynchronized::No,
+                    scripting::ScriptEngine::ShouldSendToRemote::No
                 );
 
             }
@@ -464,9 +495,12 @@ void GuiSpaceTimeComponent::render() {
                 TimeUnit::Second
             );
 
+            // No sync or send because time settings are always synced and sent
+            // to the connected nodes and peers
             global::scriptEngine->queueScript(
                 "openspace.time.setDeltaTime(" + std::to_string(newDeltaTime) + ")",
-                scripting::ScriptEngine::RemoteScripting::No
+                scripting::ScriptEngine::ShouldBeSynchronized::No,
+                scripting::ScriptEngine::ShouldSendToRemote::No
             );
         }
         else {
@@ -484,7 +518,8 @@ void GuiSpaceTimeComponent::render() {
     if (pauseChanged) {
         global::scriptEngine->queueScript(
             "openspace.time.interpolateTogglePause()",
-            scripting::ScriptEngine::RemoteScripting::No
+            scripting::ScriptEngine::ShouldBeSynchronized::Yes,
+            scripting::ScriptEngine::ShouldSendToRemote::Yes
         );
     }
     ImGui::SameLine();
@@ -493,53 +528,71 @@ void GuiSpaceTimeComponent::render() {
         { ImGui::GetWindowWidth() / 2 - 7.5f, 0.f }
     );
     if (invert) {
+        // No sync or send because time settings are always synced and sent
+        // to the connected nodes and peers
         global::scriptEngine->queueScript(
             "openspace.time.interpolateDeltaTime(-1 * openspace.time.deltaTime());",
-            scripting::ScriptEngine::RemoteScripting::No
+            scripting::ScriptEngine::ShouldBeSynchronized::No,
+            scripting::ScriptEngine::ShouldSendToRemote::No
         );
     }
 
     const bool minusDs = ImGui::Button("-1d/s");
     if (minusDs) {
+        // No sync or send because time settings are always synced and sent
+        // to the connected nodes and peers
         global::scriptEngine->queueScript(
             "openspace.time.interpolateDeltaTime(" + std::to_string(-24 * 60 * 60) + ")",
-            scripting::ScriptEngine::RemoteScripting::No
+            scripting::ScriptEngine::ShouldBeSynchronized::No,
+            scripting::ScriptEngine::ShouldSendToRemote::No
         );
     }
     ImGui::SameLine();
 
     const bool minusHs = ImGui::Button("-1h/s");
     if (minusHs) {
+        // No sync or send because time settings are always synced and sent
+        // to the connected nodes and peers
         global::scriptEngine->queueScript(
             "openspace.time.interpolateDeltaTime(" + std::to_string(-60 * 60) + ")",
-            scripting::ScriptEngine::RemoteScripting::No
+            scripting::ScriptEngine::ShouldBeSynchronized::No,
+            scripting::ScriptEngine::ShouldSendToRemote::No
         );
     }
     ImGui::SameLine();
 
     const bool minusMs = ImGui::Button("-1min/s");
     if (minusMs) {
+        // No sync or send because time settings are always synced and sent
+        // to the connected nodes and peers
         global::scriptEngine->queueScript(
             "openspace.time.interpolateDeltaTime(" + std::to_string(-60) + ")",
-            scripting::ScriptEngine::RemoteScripting::No
+            scripting::ScriptEngine::ShouldBeSynchronized::No,
+            scripting::ScriptEngine::ShouldSendToRemote::No
         );
     }
     ImGui::SameLine();
 
     const bool minusSs = ImGui::Button("-1s/s");
     if (minusSs) {
+        // No sync or send because time settings are always synced and sent
+        // to the connected nodes and peers
         global::scriptEngine->queueScript(
             "openspace.time.interpolateDeltaTime(" + std::to_string(-1) + ")",
-            scripting::ScriptEngine::RemoteScripting::No
+            scripting::ScriptEngine::ShouldBeSynchronized::No,
+            scripting::ScriptEngine::ShouldSendToRemote::No
         );
     }
     ImGui::SameLine();
 
     const bool zero = ImGui::Button("0");
     if (zero) {
+        // No sync or send because time settings are always synced and sent
+        // to the connected nodes and peers
         global::scriptEngine->queueScript(
             "openspace.time.interpolateDeltaTime(" + std::to_string(0) + ")",
-            scripting::ScriptEngine::RemoteScripting::No
+            scripting::ScriptEngine::ShouldBeSynchronized::No,
+            scripting::ScriptEngine::ShouldSendToRemote::No
         );
     }
     ImGui::SameLine();
@@ -547,36 +600,48 @@ void GuiSpaceTimeComponent::render() {
 
     const bool plusSs = ImGui::Button("+1s/s");
     if (plusSs) {
+        // No sync or send because time settings are always synced and sent
+        // to the connected nodes and peers
         global::scriptEngine->queueScript(
             "openspace.time.interpolateDeltaTime(" + std::to_string(1) + ")",
-            scripting::ScriptEngine::RemoteScripting::No
+            scripting::ScriptEngine::ShouldBeSynchronized::No,
+            scripting::ScriptEngine::ShouldSendToRemote::No
         );
     }
     ImGui::SameLine();
 
     const bool plusMs = ImGui::Button("1min/s");
     if (plusMs) {
+        // No sync or send because time settings are always synced and sent
+        // to the connected nodes and peers
         global::scriptEngine->queueScript(
             "openspace.time.interpolateDeltaTime(" + std::to_string(60) + ")",
-            scripting::ScriptEngine::RemoteScripting::No
+            scripting::ScriptEngine::ShouldBeSynchronized::No,
+            scripting::ScriptEngine::ShouldSendToRemote::No
         );
     }
     ImGui::SameLine();
 
     const bool plusHs = ImGui::Button("1h/s");
     if (plusHs) {
+        // No sync or send because time settings are always synced and sent
+        // to the connected nodes and peers
         global::scriptEngine->queueScript(
             "openspace.time.interpolateDeltaTime(" + std::to_string(60 * 60) + ")",
-            scripting::ScriptEngine::RemoteScripting::No
+            scripting::ScriptEngine::ShouldBeSynchronized::No,
+            scripting::ScriptEngine::ShouldSendToRemote::No
         );
     }
     ImGui::SameLine();
 
     const bool plusDs = ImGui::Button("1d/s");
     if (plusDs) {
+        // No sync or send because time settings are always synced and sent
+        // to the connected nodes and peers
         global::scriptEngine->queueScript(
             "openspace.time.interpolateDeltaTime(" + std::to_string(24 * 60 * 60) + ")",
-            scripting::ScriptEngine::RemoteScripting::No
+            scripting::ScriptEngine::ShouldBeSynchronized::No,
+            scripting::ScriptEngine::ShouldSendToRemote::No
         );
     }
 
diff --git a/modules/imgui/src/renderproperties.cpp b/modules/imgui/src/renderproperties.cpp
index 2fa228cf55..6e49500b36 100644
--- a/modules/imgui/src/renderproperties.cpp
+++ b/modules/imgui/src/renderproperties.cpp
@@ -74,7 +74,8 @@ void renderTooltip(Property* prop, double delay) {
 void executeSetPropertyScript(const std::string& id, const std::string& value) {
     global::scriptEngine->queueScript(
         fmt::format("openspace.setPropertyValueSingle('{}', {});", id, value),
-        scripting::ScriptEngine::RemoteScripting::Yes
+        scripting::ScriptEngine::ShouldBeSynchronized::Yes,
+        scripting::ScriptEngine::ShouldSendToRemote::Yes
     );
 }
 
diff --git a/modules/iswa/rendering/iswacygnet.cpp b/modules/iswa/rendering/iswacygnet.cpp
index b8e0f12120..48b935cf20 100644
--- a/modules/iswa/rendering/iswacygnet.cpp
+++ b/modules/iswa/rendering/iswacygnet.cpp
@@ -139,7 +139,8 @@ void IswaCygnet::initializeGL() {
             deinitialize();
             global::scriptEngine->queueScript(
                 "openspace.removeSceneGraphNode('" + identifier() + "')",
-                scripting::ScriptEngine::RemoteScripting::Yes
+                scripting::ScriptEngine::ShouldBeSynchronized::Yes,
+                scripting::ScriptEngine::ShouldSendToRemote::Yes
             );
         });
     }
@@ -306,7 +307,8 @@ void IswaCygnet::initializeGroup() {
             LDEBUG(identifier() + " Event clearGroup");
             global::scriptEngine->queueScript(
                 "openspace.removeSceneGraphNode('" + identifier() + "')",
-                scripting::ScriptEngine::RemoteScripting::Yes
+                scripting::ScriptEngine::ShouldBeSynchronized::Yes,
+                scripting::ScriptEngine::ShouldSendToRemote::Yes
             );
         }
     );
diff --git a/modules/iswa/rendering/iswakameleongroup.cpp b/modules/iswa/rendering/iswakameleongroup.cpp
index 5eb84733fb..3840f5f74b 100644
--- a/modules/iswa/rendering/iswakameleongroup.cpp
+++ b/modules/iswa/rendering/iswakameleongroup.cpp
@@ -153,7 +153,8 @@ void IswaKameleonGroup::updateFieldlineSeeds() {
 
             global::scriptEngine->queueScript(
                 "openspace.removeSceneGraphNode('" + std::get<0>(seedPath.second) + "')",
-                scripting::ScriptEngine::RemoteScripting::Yes
+                scripting::ScriptEngine::ShouldBeSynchronized::Yes,
+                scripting::ScriptEngine::ShouldSendToRemote::Yes
             );
             std::get<2>(seedPath.second) = false;
         // if this option was turned on
@@ -180,7 +181,8 @@ void IswaKameleonGroup::clearFieldlines() {
 
             global::scriptEngine->queueScript(
                 "openspace.removeSceneGraphNode('" + std::get<0>(seedPath.second) + "')",
-                scripting::ScriptEngine::RemoteScripting::Yes
+                scripting::ScriptEngine::ShouldBeSynchronized::Yes,
+                scripting::ScriptEngine::ShouldSendToRemote::Yes
             );
             std::get<2>(seedPath.second) = false;
         }
diff --git a/modules/iswa/rendering/kameleonplane.cpp b/modules/iswa/rendering/kameleonplane.cpp
index 51cbf6286f..5ca5a57c78 100644
--- a/modules/iswa/rendering/kameleonplane.cpp
+++ b/modules/iswa/rendering/kameleonplane.cpp
@@ -292,7 +292,8 @@ void KameleonPlane::updateFieldlineSeeds() {
             LDEBUG("Removed fieldlines: " + std::get<0>(seedPath.second));
             global::scriptEngine->queueScript(
                 "openspace.removeSceneGraphNode('" + std::get<0>(seedPath.second) + "')",
-                scripting::ScriptEngine::RemoteScripting::Yes
+                scripting::ScriptEngine::ShouldBeSynchronized::Yes,
+                scripting::ScriptEngine::ShouldSendToRemote::Yes
             );
             std::get<2>(seedPath.second) = false;
         // if this option was turned on
diff --git a/modules/iswa/rendering/screenspacecygnet.cpp b/modules/iswa/rendering/screenspacecygnet.cpp
index e0b7dcf613..ae31fc066e 100644
--- a/modules/iswa/rendering/screenspacecygnet.cpp
+++ b/modules/iswa/rendering/screenspacecygnet.cpp
@@ -55,7 +55,8 @@ ScreenSpaceCygnet::ScreenSpaceCygnet(const ghoul::Dictionary& dictionary)
     _delete.onChange([this]() {
         global::scriptEngine->queueScript(
             "openspace.iswa.removeScreenSpaceCygnet("+std::to_string(_cygnetId)+");",
-            scripting::ScriptEngine::RemoteScripting::Yes
+            scripting::ScriptEngine::ShouldBeSynchronized::Yes,
+            scripting::ScriptEngine::ShouldSendToRemote::Yes
         );
     });
 }
diff --git a/modules/iswa/util/iswamanager.cpp b/modules/iswa/util/iswamanager.cpp
index d0532ac2f5..09489ed78d 100644
--- a/modules/iswa/util/iswamanager.cpp
+++ b/modules/iswa/util/iswamanager.cpp
@@ -87,7 +87,8 @@ namespace {
         std::string idStr = std::to_string(id);
         openspace::global::scriptEngine->queueScript(
             "openspace.iswa.addScreenSpaceCygnet({CygnetId =" + idStr + "});",
-            openspace::scripting::ScriptEngine::RemoteScripting::Yes
+            openspace::scripting::ScriptEngine::ShouldBeSynchronized::Yes,
+            openspace::scripting::ScriptEngine::ShouldSendToRemote::Yes
         );
     }
 } // namespace
@@ -546,7 +547,8 @@ void IswaManager::createPlane(MetadataFuture& data) {
         std::string script = "openspace.addSceneGraphNode(" + luaTable + ");";
         global::scriptEngine->queueScript(
             script,
-            scripting::ScriptEngine::RemoteScripting::Yes
+            scripting::ScriptEngine::ShouldBeSynchronized::Yes,
+            scripting::ScriptEngine::ShouldSendToRemote::Yes
         );
     }
 }
@@ -579,7 +581,8 @@ void IswaManager::createSphere(MetadataFuture& data) {
         std::string script = "openspace.addSceneGraphNode(" + luaTable + ");";
         global::scriptEngine->queueScript(
             script,
-            scripting::ScriptEngine::RemoteScripting::Yes
+            scripting::ScriptEngine::ShouldBeSynchronized::Yes,
+            scripting::ScriptEngine::ShouldSendToRemote::Yes
         );
     }
 }
@@ -612,7 +615,8 @@ void IswaManager::createKameleonPlane(CdfInfo info, std::string cut) {
             std::string script = "openspace.addSceneGraphNode(" + luaTable + ");";
             global::scriptEngine->queueScript(
                 script,
-                scripting::ScriptEngine::RemoteScripting::Yes
+                scripting::ScriptEngine::ShouldBeSynchronized::Yes,
+                scripting::ScriptEngine::ShouldSendToRemote::Yes
             );
         }
     }
@@ -653,7 +657,8 @@ void IswaManager::createFieldline(std::string name, std::string cdfPath,
             std::string script = "openspace.addSceneGraphNode(" + luaTable + ");";
             global::scriptEngine->queueScript(
                 script,
-                scripting::ScriptEngine::RemoteScripting::Yes
+                scripting::ScriptEngine::ShouldBeSynchronized::Yes,
+                scripting::ScriptEngine::ShouldSendToRemote::Yes
             );
         }
     }
diff --git a/modules/iswa/util/iswamanager_lua.inl b/modules/iswa/util/iswamanager_lua.inl
index ddb7e3a20b..ab7d16a935 100644
--- a/modules/iswa/util/iswamanager_lua.inl
+++ b/modules/iswa/util/iswamanager_lua.inl
@@ -71,7 +71,8 @@ namespace {
     using namespace openspace;
     global::scriptEngine->queueScript(
         "openspace.removeSceneGraphNode('" + name + "')",
-        scripting::ScriptEngine::RemoteScripting::Yes
+        scripting::ScriptEngine::ShouldBeSynchronized::Yes,
+        scripting::ScriptEngine::ShouldSendToRemote::Yes
     );
 }
 
@@ -96,7 +97,8 @@ namespace {
 
     global::scriptEngine->queueScript(
         script,
-        scripting::ScriptEngine::RemoteScripting::Yes
+        scripting::ScriptEngine::ShouldBeSynchronized::Yes,
+        scripting::ScriptEngine::ShouldSendToRemote::Yes
     );
 }
 
diff --git a/modules/server/include/topics/luascripttopic.h b/modules/server/include/topics/luascripttopic.h
index 3a8db5f313..b0ed050eeb 100644
--- a/modules/server/include/topics/luascripttopic.h
+++ b/modules/server/include/topics/luascripttopic.h
@@ -35,7 +35,7 @@ public:
     bool isDone() const override;
 
 private:
-    void runScript(std::string script, bool returnValue);
+    void runScript(std::string script, bool returnValue, bool shouldBeSynchronized);
 
     bool _waitingForReturnValue = true;
 };
diff --git a/modules/server/src/topics/flightcontrollertopic.cpp b/modules/server/src/topics/flightcontrollertopic.cpp
index 65c9a42922..ec1b172e0e 100644
--- a/modules/server/src/topics/flightcontrollertopic.cpp
+++ b/modules/server/src/topics/flightcontrollertopic.cpp
@@ -467,7 +467,8 @@ void FlightControllerTopic::processLua(const nlohmann::json &json) {
     const std::string script = json[LuaScript];
     global::scriptEngine->queueScript(
         script,
-        openspace::scripting::ScriptEngine::RemoteScripting::Yes
+        scripting::ScriptEngine::ShouldBeSynchronized::Yes,
+        scripting::ScriptEngine::ShouldSendToRemote::Yes
     );
 }
 
diff --git a/modules/server/src/topics/luascripttopic.cpp b/modules/server/src/topics/luascripttopic.cpp
index 26b2957abc..b75d863681 100644
--- a/modules/server/src/topics/luascripttopic.cpp
+++ b/modules/server/src/topics/luascripttopic.cpp
@@ -37,6 +37,7 @@ namespace {
     constexpr std::string_view KeyFunction = "function";
     constexpr std::string_view KeyArguments = "arguments";
     constexpr std::string_view KeyReturn = "return";
+    constexpr std::string_view KeyShouldBeSynchronized = "shouldBeSynchronized";
     constexpr std::string_view _loggerCat = "LuaScriptTopic";
 
     std::string formatLua(const nlohmann::json::const_iterator& it);
@@ -146,7 +147,13 @@ void LuaScriptTopic::handleJson(const nlohmann::json& json) {
                                  ret->is_boolean() &&
                                  ret->get<bool>();
 
-            runScript(luaScript, shouldReturn);
+            nlohmann::json::const_iterator sync = json.find(KeyShouldBeSynchronized);
+            bool shouldBeSynchronized = true;
+            if (sync != json.end() && sync->is_boolean()) {
+                shouldBeSynchronized = sync->get<bool>();
+            }
+
+            runScript(luaScript, shouldReturn, shouldBeSynchronized);
         }
         else if (function != json.end() && function->is_string()) {
             std::string luaFunction = function->get<std::string>();
@@ -155,6 +162,12 @@ void LuaScriptTopic::handleJson(const nlohmann::json& json) {
                                  ret->is_boolean() &&
                                  ret->get<bool>();
 
+            nlohmann::json::const_iterator sync = json.find(KeyShouldBeSynchronized);
+            bool shouldBeSynchronized = true;
+            if (sync != json.end() && sync->is_boolean()) {
+                shouldBeSynchronized = sync->get<bool>();
+            }
+
             nlohmann::json::const_iterator args = json.find(KeyArguments);
             if (!args->is_array()) {
                 return;
@@ -167,7 +180,7 @@ void LuaScriptTopic::handleJson(const nlohmann::json& json) {
             }
 
             std::string luaScript = generateScript(luaFunction, formattedArgs);
-            runScript(luaScript, shouldReturn);
+            runScript(luaScript, shouldReturn, shouldBeSynchronized);
         }
     }
     catch (const std::out_of_range& e) {
@@ -176,7 +189,9 @@ void LuaScriptTopic::handleJson(const nlohmann::json& json) {
     }
 }
 
-void LuaScriptTopic::runScript(std::string script, bool shouldReturn) {
+void LuaScriptTopic::runScript(std::string script, bool shouldReturn,
+                               bool shouldBeSynchronized)
+{
     scripting::ScriptEngine::ScriptCallback callback;
     if (shouldReturn) {
         callback = [this](ghoul::Dictionary data) {
@@ -195,7 +210,8 @@ void LuaScriptTopic::runScript(std::string script, bool shouldReturn) {
 
     global::scriptEngine->queueScript(
         std::move(script),
-        scripting::ScriptEngine::RemoteScripting::No,
+        scripting::ScriptEngine::ShouldBeSynchronized(shouldBeSynchronized),
+        scripting::ScriptEngine::ShouldSendToRemote(shouldBeSynchronized),
         callback
     );
 }
diff --git a/modules/server/src/topics/setpropertytopic.cpp b/modules/server/src/topics/setpropertytopic.cpp
index 559adc6b6d..3a6ca50f67 100644
--- a/modules/server/src/topics/setpropertytopic.cpp
+++ b/modules/server/src/topics/setpropertytopic.cpp
@@ -126,7 +126,8 @@ void SetPropertyTopic::handleJson(const nlohmann::json& json) {
                 fmt::format(
                     "openspace.setPropertyValueSingle(\"{}\", {})", propertyKey, literal
                 ),
-                 scripting::ScriptEngine::RemoteScripting::Yes
+                scripting::ScriptEngine::ShouldBeSynchronized::Yes,
+                scripting::ScriptEngine::ShouldSendToRemote::Yes
              );
         }
     }
diff --git a/modules/server/src/topics/triggerpropertytopic.cpp b/modules/server/src/topics/triggerpropertytopic.cpp
index bb5f3ad143..6ba2e78d05 100644
--- a/modules/server/src/topics/triggerpropertytopic.cpp
+++ b/modules/server/src/topics/triggerpropertytopic.cpp
@@ -44,7 +44,8 @@ void TriggerPropertyTopic::handleJson(const nlohmann::json& json) {
             fmt::format(
                 "openspace.setPropertyValueSingle(\"{}\", nil)", propertyKey
             ),
-            scripting::ScriptEngine::RemoteScripting::Yes
+            scripting::ScriptEngine::ShouldBeSynchronized::Yes,
+            scripting::ScriptEngine::ShouldSendToRemote::Yes
         );
     }
     catch (const std::out_of_range& e) {
diff --git a/modules/skybrowser/skybrowsermodule.cpp b/modules/skybrowser/skybrowsermodule.cpp
index 837365b6b5..188fec73db 100644
--- a/modules/skybrowser/skybrowsermodule.cpp
+++ b/modules/skybrowser/skybrowsermodule.cpp
@@ -356,7 +356,8 @@ void SkyBrowserModule::moveHoverCircle(const std::string& imageUrl, bool useScri
         );
         global::scriptEngine->queueScript(
             script,
-            scripting::ScriptEngine::RemoteScripting::Yes
+            scripting::ScriptEngine::ShouldBeSynchronized::Yes,
+            scripting::ScriptEngine::ShouldSendToRemote::Yes
         );
     }
     else {
@@ -379,7 +380,8 @@ void SkyBrowserModule::moveHoverCircle(const std::string& imageUrl, bool useScri
     );
     global::scriptEngine->queueScript(
         script,
-        scripting::ScriptEngine::RemoteScripting::Yes
+        scripting::ScriptEngine::ShouldBeSynchronized::Yes,
+        scripting::ScriptEngine::ShouldSendToRemote::Yes
     );
 }
 
@@ -392,7 +394,8 @@ void SkyBrowserModule::disableHoverCircle(bool useScript) {
             );
             global::scriptEngine->queueScript(
                 script,
-                scripting::ScriptEngine::RemoteScripting::Yes
+                scripting::ScriptEngine::ShouldBeSynchronized::Yes,
+                scripting::ScriptEngine::ShouldSendToRemote::Yes
             );
         }
         else {
diff --git a/modules/skybrowser/skybrowsermodule_lua.inl b/modules/skybrowser/skybrowsermodule_lua.inl
index a23865c18a..66b1a628e2 100644
--- a/modules/skybrowser/skybrowsermodule_lua.inl
+++ b/modules/skybrowser/skybrowsermodule_lua.inl
@@ -228,7 +228,7 @@ std::string prunedIdentifier(std::string identifier) {
 }
 
 /**
- * Starts the setup process of the sky browers. This function calls the lua function
+ * Starts the setup process of the sky browers. This function calls the Lua function
  * 'sendOutIdsToBrowsers' in all nodes in the cluster.
  */
 [[codegen::luawrap]] void startSetup() {
@@ -246,17 +246,23 @@ std::string prunedIdentifier(std::string identifier) {
                 "openspace.skybrowser.setBorderColor('{}', {}, {}, {})",
                 id, color.r, color.g, color.b
             );
+
+            // No sync or send because this is already inside a Lua script, therefor it
+            // has already been synced and sent to the connected nodes and peers
             global::scriptEngine->queueScript(
                 script,
-                scripting::ScriptEngine::RemoteScripting::Yes
+                scripting::ScriptEngine::ShouldBeSynchronized::No,
+                scripting::ScriptEngine::ShouldSendToRemote::No
             );
         }
     }
     // To ensure each node in a cluster calls its own instance of the wwt application
-    // Do not send this script to the other nodes
+    // Do not send this script to the other nodes. (Note malej 2023-AUG-23: Due to this
+    // already being inside a Lua function that have already been synced out)
     global::scriptEngine->queueScript(
         "openspace.skybrowser.sendOutIdsToBrowsers()",
-        scripting::ScriptEngine::RemoteScripting::Yes
+        scripting::ScriptEngine::ShouldBeSynchronized::No,
+        scripting::ScriptEngine::ShouldSendToRemote::No
     );
 }
 
@@ -599,25 +605,31 @@ ghoul::Dictionary wwtImageCollectionUrlDeprecated()
         "}"
     "}";
 
+    // No sync or send because this is already inside a Lua script, therefor it has
+    // already been synced and sent to the connected nodes and peers
     global::scriptEngine->queueScript(
         "openspace.addScreenSpaceRenderable(" + browser + ");",
-        scripting::ScriptEngine::RemoteScripting::Yes
+        scripting::ScriptEngine::ShouldBeSynchronized::No,
+        scripting::ScriptEngine::ShouldSendToRemote::No
     );
 
     global::scriptEngine->queueScript(
         "openspace.addSceneGraphNode(" + target + ");",
-        scripting::ScriptEngine::RemoteScripting::Yes
+        scripting::ScriptEngine::ShouldBeSynchronized::No,
+        scripting::ScriptEngine::ShouldSendToRemote::No
     );
 
     global::scriptEngine->queueScript(
         "openspace.skybrowser.addPairToSkyBrowserModule('" + idTarget + "','"
         + idBrowser + "');",
-        scripting::ScriptEngine::RemoteScripting::Yes
+        scripting::ScriptEngine::ShouldBeSynchronized::No,
+        scripting::ScriptEngine::ShouldSendToRemote::No
     );
 
     global::scriptEngine->queueScript(
         "openspace.skybrowser.setSelectedBrowser('" + idBrowser + "');",
-        scripting::ScriptEngine::RemoteScripting::Yes
+        scripting::ScriptEngine::ShouldBeSynchronized::No,
+        scripting::ScriptEngine::ShouldSendToRemote::No
     );
 }
 
@@ -635,15 +647,19 @@ ghoul::Dictionary wwtImageCollectionUrlDeprecated()
 
         module->removeTargetBrowserPair(identifier);
 
-        // Remove from engine
+        // Remove from engine.
+        // No sync or send because this is already inside a Lua script, therefor it has
+        // already been synced and sent to the connected nodes and peers
         global::scriptEngine->queueScript(
             "openspace.removeScreenSpaceRenderable('" + browser + "');",
-            scripting::ScriptEngine::RemoteScripting::Yes
+            scripting::ScriptEngine::ShouldBeSynchronized::No,
+            scripting::ScriptEngine::ShouldSendToRemote::No
         );
 
         global::scriptEngine->queueScript(
             "openspace.removeSceneGraphNode('" + target + "');",
-            scripting::ScriptEngine::RemoteScripting::Yes
+            scripting::ScriptEngine::ShouldBeSynchronized::No,
+            scripting::ScriptEngine::ShouldSendToRemote::No
         );
     }
 }
diff --git a/modules/skybrowser/src/targetbrowserpair.cpp b/modules/skybrowser/src/targetbrowserpair.cpp
index 57e4e86d48..8683264840 100644
--- a/modules/skybrowser/src/targetbrowserpair.cpp
+++ b/modules/skybrowser/src/targetbrowserpair.cpp
@@ -51,7 +51,8 @@ namespace {
         );
         openspace::global::scriptEngine->queueScript(
             script,
-            openspace::scripting::ScriptEngine::RemoteScripting::Yes
+            openspace::scripting::ScriptEngine::ShouldBeSynchronized::Yes,
+            openspace::scripting::ScriptEngine::ShouldSendToRemote::Yes
         );
     }
 } // namespace
@@ -327,7 +328,8 @@ void TargetBrowserPair::startFading(float goal, float fadeTime) {
 
     global::scriptEngine->queueScript(
         script,
-        scripting::ScriptEngine::RemoteScripting::Yes
+        scripting::ScriptEngine::ShouldBeSynchronized::Yes,
+        scripting::ScriptEngine::ShouldSendToRemote::Yes
     );
 }
 
diff --git a/modules/statemachine/src/state.cpp b/modules/statemachine/src/state.cpp
index 019646f4cc..6a09ee24e7 100644
--- a/modules/statemachine/src/state.cpp
+++ b/modules/statemachine/src/state.cpp
@@ -62,14 +62,16 @@ State::State(const ghoul::Dictionary& dictionary) {
 void State::enter() const {
     global::scriptEngine->queueScript(
         _enter,
-        scripting::ScriptEngine::RemoteScripting::Yes
+        scripting::ScriptEngine::ShouldBeSynchronized::Yes,
+        scripting::ScriptEngine::ShouldSendToRemote::Yes
     );
 }
 
 void State::exit() const {
     global::scriptEngine->queueScript(
         _exit,
-        scripting::ScriptEngine::RemoteScripting::Yes
+        scripting::ScriptEngine::ShouldBeSynchronized::Yes,
+        scripting::ScriptEngine::ShouldSendToRemote::Yes
     );
 }
 
diff --git a/modules/statemachine/src/transition.cpp b/modules/statemachine/src/transition.cpp
index 247529a6fe..55873a398b 100644
--- a/modules/statemachine/src/transition.cpp
+++ b/modules/statemachine/src/transition.cpp
@@ -71,7 +71,8 @@ void Transition::performAction() const {
     }
     global::scriptEngine->queueScript(
         _action,
-        scripting::ScriptEngine::RemoteScripting::Yes
+        scripting::ScriptEngine::ShouldBeSynchronized::Yes,
+        scripting::ScriptEngine::ShouldSendToRemote::Yes
     );
 }
 
diff --git a/src/engine/openspaceengine.cpp b/src/engine/openspaceengine.cpp
index 894790e077..b6eb9c8103 100644
--- a/src/engine/openspaceengine.cpp
+++ b/src/engine/openspaceengine.cpp
@@ -1124,7 +1124,8 @@ void OpenSpaceEngine::preSynchronization() {
         for (const std::string& script : scheduledScripts) {
             global::scriptEngine->queueScript(
                 script,
-                scripting::ScriptEngine::RemoteScripting::Yes
+                scripting::ScriptEngine::ShouldBeSynchronized::Yes,
+                scripting::ScriptEngine::ShouldSendToRemote::Yes
             );
         }
 
@@ -1577,7 +1578,8 @@ void OpenSpaceEngine::handleDragDrop(std::filesystem::path file) {
     std::string script = ghoul::lua::value<std::string>(s);
     global::scriptEngine->queueScript(
         script,
-        scripting::ScriptEngine::RemoteScripting::Yes
+        scripting::ScriptEngine::ShouldBeSynchronized::Yes,
+        scripting::ScriptEngine::ShouldSendToRemote::Yes
     );
 }
 
@@ -1769,7 +1771,8 @@ void setCameraFromProfile(const Profile& p) {
                 geoScript += ")";
                 global::scriptEngine->queueScript(
                     geoScript,
-                    scripting::ScriptEngine::RemoteScripting::Yes
+                    scripting::ScriptEngine::ShouldBeSynchronized::Yes,
+                    scripting::ScriptEngine::ShouldSendToRemote::Yes
                 );
             },
             [&checkNodeExists](const Profile::CameraGoToNode& node) {
@@ -1800,7 +1803,8 @@ void setModulesFromProfile(const Profile& p) {
             if (mod.loadedInstruction.has_value()) {
                 global::scriptEngine->queueScript(
                     mod.loadedInstruction.value(),
-                    scripting::ScriptEngine::RemoteScripting::Yes
+                    scripting::ScriptEngine::ShouldBeSynchronized::Yes,
+                    scripting::ScriptEngine::ShouldSendToRemote::Yes
                 );
             }
         }
@@ -1808,7 +1812,8 @@ void setModulesFromProfile(const Profile& p) {
             if (mod.notLoadedInstruction.has_value()) {
                 global::scriptEngine->queueScript(
                     mod.notLoadedInstruction.value(),
-                    scripting::ScriptEngine::RemoteScripting::Yes
+                    scripting::ScriptEngine::ShouldBeSynchronized::Yes,
+                    scripting::ScriptEngine::ShouldSendToRemote::Yes
                 );
             }
         }
@@ -1872,7 +1877,8 @@ void setAdditionalScriptsFromProfile(const Profile& p) {
     for (const std::string& a : p.additionalScripts) {
         global::scriptEngine->queueScript(
             a,
-            scripting::ScriptEngine::RemoteScripting::Yes
+            scripting::ScriptEngine::ShouldBeSynchronized::Yes,
+            scripting::ScriptEngine::ShouldSendToRemote::Yes
         );
     }
 }
diff --git a/src/events/eventengine.cpp b/src/events/eventengine.cpp
index 01b41f1e52..c777bdfe7a 100644
--- a/src/events/eventengine.cpp
+++ b/src/events/eventengine.cpp
@@ -164,7 +164,13 @@ void EventEngine::triggerActions() const {
                 if (ai.isEnabled &&
                     (!ai.filter.has_value() || params.isSubset(*ai.filter)))
                 {
-                    global::actionManager->triggerAction(ai.action, params);
+                    // No sync because events are always synced and sent to the connected
+                    // nodes and peers
+                    global::actionManager->triggerAction(
+                        ai.action,
+                        params,
+                        interaction::ActionManager::ShouldBeSynchronized::No
+                    );
                 }
             }
         }
diff --git a/src/interaction/actionmanager.cpp b/src/interaction/actionmanager.cpp
index fb8e4fe904..c52f00f42f 100644
--- a/src/interaction/actionmanager.cpp
+++ b/src/interaction/actionmanager.cpp
@@ -80,7 +80,8 @@ std::vector<Action> ActionManager::actions() const {
 }
 
 void ActionManager::triggerAction(const std::string& identifier,
-                                  const ghoul::Dictionary& arguments) const
+                                  const ghoul::Dictionary& arguments,
+                           ActionManager::ShouldBeSynchronized shouldBeSynchronized) const
 {
     ghoul_assert(!identifier.empty(), "Identifier must not be empty");
 
@@ -93,18 +94,21 @@ void ActionManager::triggerAction(const std::string& identifier,
     }
 
     const Action& a = action(identifier);
-    if (arguments.isEmpty()) {
-        global::scriptEngine->queueScript(
-            a.command,
-            scripting::ScriptEngine::RemoteScripting(!a.isLocal)
-        );
-    }
-    else {
-        global::scriptEngine->queueScript(
-            fmt::format("args = {}\n{}", ghoul::formatLua(arguments), a.command),
-            scripting::ScriptEngine::RemoteScripting(!a.isLocal)
-        );
+    std::string script =
+        arguments.isEmpty() ?
+        a.command :
+        fmt::format("args = {}\n{}", ghoul::formatLua(arguments), a.command);
+
+    using ShouldBeSynchronized = scripting::ScriptEngine::ShouldBeSynchronized;
+    using ShouldSendToRemote = scripting::ScriptEngine::ShouldSendToRemote;
+    ShouldBeSynchronized sync = ShouldBeSynchronized::Yes;
+    ShouldSendToRemote send = ShouldSendToRemote::Yes;
+    if (!shouldBeSynchronized || a.isLocal) {
+        sync = ShouldBeSynchronized::No;
+        send = ShouldSendToRemote::No;
     }
+
+    global::scriptEngine->queueScript(script, sync, send);
 }
 
 scripting::LuaLibrary ActionManager::luaLibrary() {
diff --git a/src/interaction/actionmanager_lua.inl b/src/interaction/actionmanager_lua.inl
index 819251d303..1c7bede99e 100644
--- a/src/interaction/actionmanager_lua.inl
+++ b/src/interaction/actionmanager_lua.inl
@@ -36,7 +36,7 @@ namespace {
 }
 
 /**
- * Removes an existing action from the list of possible actions.The action is identifies
+ * Removes an existing action from the list of possible actions. The action is identifies
  * either by the passed name, or if it is a table, the value behind the 'Identifier' key
  * is extract and used instead.
  */
@@ -192,7 +192,13 @@ struct [[codegen::Dictionary(Action)]] Action {
         throw ghoul::lua::LuaError(fmt::format("Action '{}' not found", id));
     }
 
-    global::actionManager->triggerAction(id, arg);
+    // No sync because this is already inside a Lua script, therefor it has
+    // already been synced and sent to the connected nodes and peers
+    global::actionManager->triggerAction(
+        id,
+        arg,
+        interaction::ActionManager::ShouldBeSynchronized::No
+    );
 }
 
 #include "actionmanager_lua_codegen.cpp"
diff --git a/src/interaction/joystickcamerastates.cpp b/src/interaction/joystickcamerastates.cpp
index b53d1c76aa..e5bb3c1be3 100644
--- a/src/interaction/joystickcamerastates.cpp
+++ b/src/interaction/joystickcamerastates.cpp
@@ -169,7 +169,8 @@ void JoystickCameraStates::updateStateFromInput(
 
                     global::scriptEngine->queueScript(
                         script,
-                        scripting::ScriptEngine::RemoteScripting(t.isRemote)
+                        scripting::ScriptEngine::ShouldBeSynchronized(t.isRemote),
+                        scripting::ScriptEngine::ShouldSendToRemote(t.isRemote)
                     );
                     break;
             }
@@ -188,7 +189,10 @@ void JoystickCameraStates::updateStateFromInput(
                 if (active) {
                     global::scriptEngine->queueScript(
                         it->second.command,
-                        scripting::ScriptEngine::RemoteScripting(
+                        scripting::ScriptEngine::ShouldBeSynchronized(
+                            it->second.synchronization
+                        ),
+                        scripting::ScriptEngine::ShouldSendToRemote(
                             it->second.synchronization
                         )
                     );
diff --git a/src/interaction/keybindingmanager.cpp b/src/interaction/keybindingmanager.cpp
index b086e3f524..46d3663a76 100644
--- a/src/interaction/keybindingmanager.cpp
+++ b/src/interaction/keybindingmanager.cpp
@@ -52,7 +52,11 @@ void KeybindingManager::keyboardCallback(Key key, KeyModifier modifier, KeyActio
                 // bind a key to multiple actions, only one of which could be defined
                 continue;
             }
-            global::actionManager->triggerAction(it->second, ghoul::Dictionary());
+            global::actionManager->triggerAction(
+                it->second,
+                ghoul::Dictionary(),
+                interaction::ActionManager::ShouldBeSynchronized::Yes
+            );
         }
     }
 }
diff --git a/src/interaction/sessionrecording.cpp b/src/interaction/sessionrecording.cpp
index 6ca8d1d952..f7e6c9f63c 100644
--- a/src/interaction/sessionrecording.cpp
+++ b/src/interaction/sessionrecording.cpp
@@ -2088,7 +2088,8 @@ bool SessionRecording::processScriptKeyframe() {
         );
         global::scriptEngine->queueScript(
             nextScript,
-            scripting::ScriptEngine::RemoteScripting::Yes
+            scripting::ScriptEngine::ShouldBeSynchronized::Yes,
+            scripting::ScriptEngine::ShouldSendToRemote::Yes
         );
     }
 
diff --git a/src/navigation/navigationhandler.cpp b/src/navigation/navigationhandler.cpp
index 637bdba6cd..5c0de14a84 100644
--- a/src/navigation/navigationhandler.cpp
+++ b/src/navigation/navigationhandler.cpp
@@ -279,7 +279,13 @@ void NavigationHandler::updateCameraTransitions() {
                 dict.setValue("Node", anchorNode()->identifier());
                 dict.setValue("Transition", "Exiting"s);
                 for (const std::string& action : anchorNode()->onExitAction()) {
-                    global::actionManager->triggerAction(action, dict);
+                    // No sync because events are always synced and sent to the connected
+                    // nodes and peers
+                    global::actionManager->triggerAction(
+                        action,
+                        dict,
+                        interaction::ActionManager::ShouldBeSynchronized::No
+                    );
                 }
             }
 
@@ -299,7 +305,13 @@ void NavigationHandler::updateCameraTransitions() {
                 dict.setValue("Node", anchorNode()->identifier());
                 dict.setValue("Transition", "Reaching"s);
                 for (const std::string& action : anchorNode()->onReachAction()) {
-                    global::actionManager->triggerAction(action, dict);
+                    // No sync because events are always synced and sent to the connected
+                    // nodes and peers
+                    global::actionManager->triggerAction(
+                        action,
+                        dict,
+                        interaction::ActionManager::ShouldBeSynchronized::No
+                    );
                 }
             }
 
@@ -320,7 +332,13 @@ void NavigationHandler::updateCameraTransitions() {
             dict.setValue("Node", anchorNode()->identifier());
             dict.setValue("Transition", "Receding"s);
             for (const std::string& action : anchorNode()->onRecedeAction()) {
-                global::actionManager->triggerAction(action, dict);
+                // No sync because events are always synced and sent to the connected
+                // nodes and peers
+                global::actionManager->triggerAction(
+                    action,
+                    dict,
+                    interaction::ActionManager::ShouldBeSynchronized::No
+                );
             }
         }
 
@@ -341,7 +359,13 @@ void NavigationHandler::updateCameraTransitions() {
             dict.setValue("Node", anchorNode()->identifier());
             dict.setValue("Transition", "Approaching"s);
             for (const std::string& action : anchorNode()->onApproachAction()) {
-                global::actionManager->triggerAction(action, dict);
+                // No sync because events are always synced and sent to the connected
+                // nodes and peers
+                global::actionManager->triggerAction(
+                    action,
+                    dict,
+                    interaction::ActionManager::ShouldBeSynchronized::No
+                );
             }
         }
 
diff --git a/src/navigation/pathnavigator.cpp b/src/navigation/pathnavigator.cpp
index f2c5418192..838df0eebb 100644
--- a/src/navigation/pathnavigator.cpp
+++ b/src/navigation/pathnavigator.cpp
@@ -322,7 +322,8 @@ void PathNavigator::startPath() {
     if (!global::timeManager->isPaused()) {
         openspace::global::scriptEngine->queueScript(
             "openspace.time.setPause(true)",
-            scripting::ScriptEngine::RemoteScripting::Yes
+            scripting::ScriptEngine::ShouldBeSynchronized::Yes,
+            scripting::ScriptEngine::ShouldSendToRemote::Yes
         );
 
         _startSimulationTimeOnFinish = true;
@@ -437,7 +438,8 @@ void PathNavigator::handlePathEnd() {
     if (_startSimulationTimeOnFinish) {
         openspace::global::scriptEngine->queueScript(
             "openspace.time.setPause(false)",
-            scripting::ScriptEngine::RemoteScripting::Yes
+            scripting::ScriptEngine::ShouldBeSynchronized::Yes,
+            scripting::ScriptEngine::ShouldSendToRemote::Yes
         );
         _startSimulationTimeOnFinish = false;
     }
@@ -448,7 +450,8 @@ void PathNavigator::handlePathEnd() {
                 "'NavigationHandler.OrbitalNavigator.IdleBehavior.ApplyIdleBehavior',"
                 "true"
             ");",
-            openspace::scripting::ScriptEngine::RemoteScripting::Yes
+            openspace::scripting::ScriptEngine::ShouldBeSynchronized::Yes,
+            openspace::scripting::ScriptEngine::ShouldSendToRemote::Yes
         );
     }
 
diff --git a/src/network/parallelpeer.cpp b/src/network/parallelpeer.cpp
index 28a1f12c0a..5f5e5727ba 100644
--- a/src/network/parallelpeer.cpp
+++ b/src/network/parallelpeer.cpp
@@ -392,9 +392,12 @@ void ParallelPeer::dataMessageReceived(const std::vector<char>& message) {
             datamessagestructures::ScriptMessage sm;
             sm.deserialize(buffer);
 
+            // No sync or send because this has already been recived by a peer,
+            // don't send it back again
             global::scriptEngine->queueScript(
                 sm._script,
-                scripting::ScriptEngine::RemoteScripting::No
+                scripting::ScriptEngine::ShouldBeSynchronized::No,
+                scripting::ScriptEngine::ShouldSendToRemote::No
             );
             break;
         }
diff --git a/src/rendering/luaconsole.cpp b/src/rendering/luaconsole.cpp
index d87833ea29..19ff81c7c9 100644
--- a/src/rendering/luaconsole.cpp
+++ b/src/rendering/luaconsole.cpp
@@ -76,11 +76,21 @@ namespace {
         openspace::properties::Property::Visibility::AdvancedUser
     };
 
-    constexpr openspace::properties::Property::PropertyInfo RemoveScriptingInfo = {
-        "RemoteScripting",
-        "Remote scripting",
+    constexpr openspace::properties::Property::PropertyInfo ShouldBeSynchronizedInfo = {
+       "ShouldBeSynchronized",
+       "Should Be Synchronized",
+       "Determines whether the entered commands will only be executed locally (if this "
+       "is disabled), or whether they will be send to other connected nodes, for "
+       "example in a cluster environment",
+       openspace::properties::Property::Visibility::AdvancedUser
+    };
+
+    constexpr openspace::properties::Property::PropertyInfo ShouldSendToRemoteInfo = {
+        "ShouldSendToRemote",
+        "Should Send To Remote",
         "Determines whether the entered commands will only be executed locally (if this "
-        "is disabled), or whether they will be send to connected remove instances",
+        "is disabled), or whether they will be send to connected remote instances (other "
+        "peers through a parallel connection)",
         openspace::properties::Property::Visibility::AdvancedUser
     };
 
@@ -134,7 +144,8 @@ namespace openspace {
 LuaConsole::LuaConsole()
     : properties::PropertyOwner({ "LuaConsole", "Lua Console" })
     , _isVisible(VisibleInfo, false)
-    , _remoteScripting(RemoveScriptingInfo, false)
+    , _shouldSendToRemote(ShouldSendToRemoteInfo, false)
+    , _shouldBeSynchronized(ShouldBeSynchronizedInfo, true)
     , _backgroundColor(
         BackgroundColorInfo,
         glm::vec4(21.f / 255.f, 23.f / 255.f, 28.f / 255.f, 0.8f),
@@ -157,7 +168,8 @@ LuaConsole::LuaConsole()
     , _autoCompleteInfo({NoAutoComplete, false, ""})
 {
     addProperty(_isVisible);
-    addProperty(_remoteScripting);
+    addProperty(_shouldBeSynchronized);
+    addProperty(_shouldSendToRemote);
     addProperty(_historyLength);
 
     _backgroundColor.setViewOption(properties::Property::ViewOptions::Color);
@@ -278,12 +290,25 @@ bool LuaConsole::keyboardCallback(Key key, KeyModifier modifier, KeyAction actio
         return false;
     }
 
+    const bool modifierShift = (modifier == KeyModifier::Shift);
+    const bool modifierControl = (modifier == KeyModifier::Control);
+
+    // Button left of 1 and above TAB (default)
+    // Can be changed to any other key with the setCommandInputButton funciton
     if (key == _commandInputButton) {
-        // Button left of 1 and above TAB
-        // How to deal with different keyboard languages? ---abock
         if (_isVisible) {
-            if (_remoteScripting) {
-                _remoteScripting = false;
+            if (modifierShift) {
+                // Toggle ShouldBeSynchronized property for all scripts
+                _shouldBeSynchronized = !_shouldBeSynchronized;
+            }
+            else if (modifierControl) {
+                // Only allow this toggle if a ParallelConnection exists
+                if (_shouldSendToRemote) {
+                    _shouldSendToRemote = false;
+                }
+                else if (global::parallelPeer->status() == ParallelConnection::Status::Host) {
+                    _shouldSendToRemote = true;
+                }
             }
             else {
                 _isVisible = false;
@@ -293,9 +318,6 @@ bool LuaConsole::keyboardCallback(Key key, KeyModifier modifier, KeyAction actio
         }
         else {
             _isVisible = true;
-            if (global::parallelPeer->status() == ParallelConnection::Status::Host) {
-                _remoteScripting = true;
-            }
         }
 
         return true;
@@ -310,10 +332,6 @@ bool LuaConsole::keyboardCallback(Key key, KeyModifier modifier, KeyAction actio
         return true;
     }
 
-
-    const bool modifierControl = (modifier == KeyModifier::Control);
-    const bool modifierShift = (modifier == KeyModifier::Shift);
-
     // Paste from clipboard
     if (modifierControl && (key == Key::V || key == Key::Y)) {
         addToCommand(sanitizeInput(ghoul::clipboardText()));
@@ -432,8 +450,11 @@ bool LuaConsole::keyboardCallback(Key key, KeyModifier modifier, KeyAction actio
     if (key == Key::Enter || key == Key::KeypadEnter) {
         std::string cmd = _commands.at(_activeCommand);
         if (!cmd.empty()) {
-            using RemoteScripting = scripting::ScriptEngine::RemoteScripting;
-            global::scriptEngine->queueScript(cmd, RemoteScripting(_remoteScripting));
+            global::scriptEngine->queueScript(
+                cmd,
+                scripting::ScriptEngine::ShouldBeSynchronized(_shouldBeSynchronized),
+                scripting::ScriptEngine::ShouldSendToRemote(_shouldSendToRemote)
+            );
 
             // Only add the current command to the history if it hasn't been
             // executed before. We don't want two of the same commands in a row
@@ -799,14 +820,22 @@ void LuaConsole::render() {
 
         const glm::vec2 loc = glm::vec2(
             EntryFontSize * dpi / 2.f,
-            res.y - _currentHeight + EntryFontSize * dpi
+            res.y - EntryFontSize * dpi
         );
 
         const glm::vec2 bbox = _font->boundingBox(text);
         return glm::vec2(loc.x + res.x - bbox.x - 10.f, loc.y);
     };
 
-    if (_remoteScripting) {
+    if (!_shouldBeSynchronized) {
+        const glm::vec4 Yellow(1.0f, 1.0f, 0.f, 1.f);
+
+        const std::string masterOnlyExecutionText =
+            "Master only script execution (Nodes and Peers will not recieve scripts)";
+        const glm::vec2 loc = locationForRightJustifiedText(masterOnlyExecutionText);
+        RenderFont(*_font, loc, masterOnlyExecutionText, Yellow);
+    }
+    else if (_shouldSendToRemote) {
         const glm::vec4 Red(1.f, 0.f, 0.f, 1.f);
 
         ParallelConnection::Status status = global::parallelPeer->status();
@@ -826,7 +855,8 @@ void LuaConsole::render() {
     else if (global::parallelPeer->isHost()) {
         const glm::vec4 LightBlue(0.4f, 0.4f, 1.f, 1.f);
 
-        const std::string localExecutionText = "Local script execution";
+        const std::string localExecutionText =
+            "Local script execution (Peers will not recieve scripts)";
         const glm::vec2 loc = locationForRightJustifiedText(localExecutionText);
         RenderFont(*_font, loc, localExecutionText, LightBlue);
     }
@@ -847,7 +877,7 @@ void LuaConsole::addToCommand(std::string c) {
 }
 
 void LuaConsole::parallelConnectionChanged(const ParallelConnection::Status& status) {
-    _remoteScripting = (status == ParallelConnection::Status::Host);
+    _shouldSendToRemote = (status == ParallelConnection::Status::Host);
 }
 
 } // namespace openspace
diff --git a/src/rendering/renderengine.cpp b/src/rendering/renderengine.cpp
index 7adc3ddbc4..e8d3ecbade 100644
--- a/src/rendering/renderengine.cpp
+++ b/src/rendering/renderengine.cpp
@@ -776,7 +776,8 @@ bool RenderEngine::mouseActivationCallback(const glm::dvec2& mousePosition) cons
 
         global::scriptEngine->queueScript(
             ToggleRotationFrictionScript,
-            scripting::ScriptEngine::RemoteScripting::Yes
+            scripting::ScriptEngine::ShouldBeSynchronized::Yes,
+            scripting::ScriptEngine::ShouldSendToRemote::Yes
         );
         return true;
     }
@@ -788,7 +789,8 @@ bool RenderEngine::mouseActivationCallback(const glm::dvec2& mousePosition) cons
 
         global::scriptEngine->queueScript(
             ToggleZoomFrictionScript,
-            scripting::ScriptEngine::RemoteScripting::Yes
+            scripting::ScriptEngine::ShouldBeSynchronized::Yes,
+            scripting::ScriptEngine::ShouldSendToRemote::Yes
         );
         return true;
     }
@@ -800,7 +802,8 @@ bool RenderEngine::mouseActivationCallback(const glm::dvec2& mousePosition) cons
 
         global::scriptEngine->queueScript(
             ToggleRollFrictionScript,
-            scripting::ScriptEngine::RemoteScripting::Yes
+            scripting::ScriptEngine::ShouldBeSynchronized::Yes,
+            scripting::ScriptEngine::ShouldSendToRemote::Yes
         );
         return true;
     }
diff --git a/src/rendering/screenspacerenderable.cpp b/src/rendering/screenspacerenderable.cpp
index f3535aec34..2ddfcacca8 100644
--- a/src/rendering/screenspacerenderable.cpp
+++ b/src/rendering/screenspacerenderable.cpp
@@ -420,9 +420,13 @@ ScreenSpaceRenderable::ScreenSpaceRenderable(const ghoul::Dictionary& dictionary
     _delete.onChange([this](){
         std::string script =
             "openspace.removeScreenSpaceRenderable('" + identifier() + "');";
+        // No sync or send because this is already inside a Lua script that was triggered
+        // when this triggerProperty was pressed in the gui, therefor it has already been
+        // synced and sent to the connected nodes and peers
         global::scriptEngine->queueScript(
             script,
-            scripting::ScriptEngine::RemoteScripting::No
+            scripting::ScriptEngine::ShouldBeSynchronized::No,
+            scripting::ScriptEngine::ShouldSendToRemote::No
         );
     });
     addProperty(_delete);
diff --git a/src/scene/scene.cpp b/src/scene/scene.cpp
index cbd7203a50..1fd7efcdc6 100644
--- a/src/scene/scene.cpp
+++ b/src/scene/scene.cpp
@@ -548,9 +548,13 @@ void Scene::updateInterpolations() {
 
         if (i.isExpired) {
             if (!i.postScript.empty()) {
+                // No sync or send because this is already inside a Lua script that was triggered
+                // when the interpolation of the property was triggered, therefor it has already been
+                // synced and sent to the connected nodes and peers
                 global::scriptEngine->queueScript(
                     std::move(i.postScript),
-                    scripting::ScriptEngine::RemoteScripting::No
+                    scripting::ScriptEngine::ShouldBeSynchronized::No,
+                    scripting::ScriptEngine::ShouldSendToRemote::No
                 );
             }
 
diff --git a/src/scripting/scriptengine.cpp b/src/scripting/scriptengine.cpp
index c3f6eeb81a..1663b3b133 100644
--- a/src/scripting/scriptengine.cpp
+++ b/src/scripting/scriptengine.cpp
@@ -533,18 +533,24 @@ void ScriptEngine::preSync(bool isMaster) {
             QueueItem item = std::move(_incomingScripts.front());
             _incomingScripts.pop();
 
-            _scriptsToSync.push_back(item.script);
-            const bool remoteScripting = item.remoteScripting;
-
             // Not really a received script but the master also needs to run the script...
             _masterScriptQueue.push(item);
 
-            if (global::parallelPeer->isHost() && remoteScripting) {
-                global::parallelPeer->sendScript(item.script);
-            }
             if (global::sessionRecording->isRecording()) {
                 global::sessionRecording->saveScriptKeyframeToTimeline(item.script);
             }
+
+            // Sync out to other nodes (cluster)
+            if (!item.shouldBeSynchronized) {
+                continue;
+            }
+            _scriptsToSync.push_back(item.script);
+
+            // Send to other peers (parallel connection)
+            const bool shouldSendToRemote = item.shouldSendToRemote;
+            if (global::parallelPeer->isHost() && shouldSendToRemote) {
+                global::parallelPeer->sendScript(item.script);
+            }
         }
     }
     else {
@@ -613,7 +619,8 @@ void ScriptEngine::postSync(bool isMaster) {
 }
 
 void ScriptEngine::queueScript(std::string script,
-                               ScriptEngine::RemoteScripting remoteScripting,
+                               ScriptEngine::ShouldBeSynchronized shouldBeSynchronized,
+                               ScriptEngine::ShouldSendToRemote shouldSendToRemote,
                                ScriptCallback callback)
 {
     ZoneScoped;
@@ -621,7 +628,12 @@ void ScriptEngine::queueScript(std::string script,
     if (script.empty()) {
         return;
     }
-    _incomingScripts.push({ std::move(script), remoteScripting, std::move(callback) });
+    _incomingScripts.push({
+        std::move(script),
+        shouldBeSynchronized,
+        shouldSendToRemote,
+        std::move(callback)
+    });
 }
 
 
diff --git a/src/scripting/scriptscheduler.cpp b/src/scripting/scriptscheduler.cpp
index bbc5cdd451..3a1d8244e4 100644
--- a/src/scripting/scriptscheduler.cpp
+++ b/src/scripting/scriptscheduler.cpp
@@ -262,7 +262,8 @@ void ScriptScheduler::setCurrentTime(double time) {
         for (const std::string& script : scheduledScripts) {
             global::scriptEngine->queueScript(
                 script,
-                scripting::ScriptEngine::RemoteScripting::Yes
+                scripting::ScriptEngine::ShouldBeSynchronized::Yes,
+                scripting::ScriptEngine::ShouldSendToRemote::Yes
             );
         }
     }

From aad8beb60c81f27123b16f5f19ac38de335cd923 Mon Sep 17 00:00:00 2001
From: Alexander Bock <mail@alexanderbock.eu>
Date: Thu, 7 Sep 2023 19:00:26 +0200
Subject: [PATCH 123/701] Remove warnings

---
 ext/ghoul                                       | 2 +-
 include/openspace/documentation/documentation.h | 3 ++-
 include/openspace/scene/profile.h               | 6 +++---
 src/documentation/documentation.cpp             | 2 ++
 src/properties/property.cpp                     | 6 +++---
 5 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/ext/ghoul b/ext/ghoul
index 24486b7c56..c50518fb79 160000
--- a/ext/ghoul
+++ b/ext/ghoul
@@ -1 +1 @@
-Subproject commit 24486b7c5645f41a3b13f39dbe9ae58a98abbdc9
+Subproject commit c50518fb79edd741b41130f04143605232579495
diff --git a/include/openspace/documentation/documentation.h b/include/openspace/documentation/documentation.h
index b369faa06c..15ec83ce52 100644
--- a/include/openspace/documentation/documentation.h
+++ b/include/openspace/documentation/documentation.h
@@ -56,6 +56,7 @@ struct TestResult {
          * The Reason for the offense
          */
         enum class Reason {
+            Unknown,          ///< Unknown reason
             MissingKey,       ///< The offending key that was requested was not found
             WrongType,        ///< The key's value was not of the expected type
             Verification,     ///< The value did not pass a necessary non-type verifier
@@ -65,7 +66,7 @@ struct TestResult {
         /// this value will be the fully qualified name of the key
         std::string offender;
         /// The Reason that caused this offense
-        Reason reason;
+        Reason reason = Reason::Unknown;
         /// An optional explanation for when a verification fails
         std::string explanation;
     };
diff --git a/include/openspace/scene/profile.h b/include/openspace/scene/profile.h
index db3e13d848..c1dbdeca07 100644
--- a/include/openspace/scene/profile.h
+++ b/include/openspace/scene/profile.h
@@ -101,7 +101,7 @@ public:
             Relative
         };
 
-        Type type;
+        Type type = Type::Relative;
         std::string value;
         bool startPaused = false;
     };
@@ -129,8 +129,8 @@ public:
         static constexpr std::string_view Type = "goToGeo";
 
         std::string anchor;
-        double latitude;
-        double longitude;
+        double latitude = 0.0;
+        double longitude = 0.0;
         std::optional<double> altitude;
     };
 
diff --git a/src/documentation/documentation.cpp b/src/documentation/documentation.cpp
index 3b66777c4c..794d00ddfb 100644
--- a/src/documentation/documentation.cpp
+++ b/src/documentation/documentation.cpp
@@ -105,6 +105,8 @@ template <>
 std::string to_string(const openspace::documentation::TestResult::Offense::Reason& value)
 {
     switch (value) {
+        case openspace::documentation::TestResult::Offense::Reason::Unknown:
+            return "Unknown";
         case openspace::documentation::TestResult::Offense::Reason::MissingKey:
             return "Missing key";
         case openspace::documentation::TestResult::Offense::Reason::UnknownIdentifier:
diff --git a/src/properties/property.cpp b/src/properties/property.cpp
index 93d429018b..b60276e0d9 100644
--- a/src/properties/property.cpp
+++ b/src/properties/property.cpp
@@ -54,9 +54,9 @@ uint64_t Property::Identifier = 0;
 #endif
 
 Property::Property(PropertyInfo info)
-    : _identifier(std::move(info.identifier))
-    , _guiName(std::move(info.guiName))
-    , _description(std::move(info.description))
+    : _identifier(info.identifier)
+    , _guiName(info.guiName)
+    , _description(info.description)
 #ifdef _DEBUG
     , _id(Identifier++)
 #endif

From 7bfedbdf12fe0b0a1edbea5e2a1491999fa18ce5 Mon Sep 17 00:00:00 2001
From: Emma Broman <emma.broman@liu.se>
Date: Mon, 11 Sep 2023 10:44:12 +0200
Subject: [PATCH 124/701] Feature - OrbitalNavigator Setting - Orbit Around Up
 (#2874)

* Hack to try to get desired behavior (for testing)

* Add properties to control axes of rotation and whether rotation aorund up should be enabled

* Generalze orbit function to just use an angle instead of speed and deltatime

* Move speed scale computation to a separate function

* Refactor horizontal translation code a bit

* Refactor speed computation for idel behavior

* Refactor/clean up orbit code

* Add property docs

* Add some safety checks

* Apply suggestions from code review

Co-authored-by: Alexander Bock <alexander.bock@liu.se>

* More updates based on code review

---------

Co-authored-by: Alexander Bock <alexander.bock@liu.se>
---
 .../openspace/navigation/orbitalnavigator.h   |  39 ++-
 src/navigation/orbitalnavigator.cpp           | 244 ++++++++++++------
 2 files changed, 193 insertions(+), 90 deletions(-)

diff --git a/include/openspace/navigation/orbitalnavigator.h b/include/openspace/navigation/orbitalnavigator.h
index cd88bfaa46..99896908c0 100644
--- a/include/openspace/navigation/orbitalnavigator.h
+++ b/include/openspace/navigation/orbitalnavigator.h
@@ -233,6 +233,15 @@ private:
 
     properties::BoolProperty _invertMouseButtons;
 
+    properties::BoolProperty _shouldRotateAroundUp;
+
+    enum class UpDirectionChoice {
+        XAxis = 0,
+        YAxis,
+        ZAxis
+    };
+    properties::OptionProperty _upToUseForRotation;
+
     MouseCameraStates _mouseStates;
     JoystickCameraStates _joystickStates;
     WebsocketCameraStates _websocketStates;
@@ -322,6 +331,15 @@ private:
     double interpolateCameraToSurfaceDistance(double deltaTime, double currentDistance,
         double targetDistance);
 
+    /**
+     * Modify the camera position and global rotation to rotate around the up vector
+     * of the current anchor based on x-wise input
+     *
+     * The up-vector to rotate around is determined by the "_upToUseForRotation" property
+     */
+    void rotateAroundAnchorUp(double deltaTime, double speedScale,
+        glm::dvec3& cameraPosition, glm::dquat& globalCameraRotation);
+
     /**
      * Translates the horizontal direction. If far from the anchor object, this will
      * result in an orbital rotation around the object. This function does not affect the
@@ -329,8 +347,9 @@ private:
      *
      * \return a position vector adjusted in the horizontal direction.
      */
-    glm::dvec3 translateHorizontally(double deltaTime, const glm::dvec3& cameraPosition,
-        const glm::dvec3& objectPosition, const glm::dquat& globalCameraRotation,
+    glm::dvec3 translateHorizontally(double deltaTime, double speedScale,
+        const glm::dvec3& cameraPosition, const glm::dvec3& objectPosition,
+        const glm::dquat& globalCameraRotation,
         const SurfacePositionHandle& positionHandle) const;
 
     /*
@@ -410,13 +429,11 @@ private:
      *
      * Used for IdleBehavior::Behavior::Orbit
      *
-     * \param deltaTime The time step to use for the motion. Controls the rotation angle
+     * \param angle The rotation angle to use for the motion
      * \param position The position of the camera. Will be changed by the function
      * \param globalRotation The camera's global rotation. Will be changed by the function
-     * \param speedScale A speed scale that controls the speed of the motion
      */
-    void orbitAnchor(double deltaTime, glm::dvec3& position,
-        glm::dquat& globalRotation, double speedScale);
+    void orbitAnchor(double angle, glm::dvec3& position, glm::dquat& globalRotation);
 
     /**
      * Orbit the current anchor node, by adding a rotation around the given axis. For
@@ -429,13 +446,15 @@ private:
      * IdleBehavior::Behavior::OrbitAroundUp (axis = up = y-axis)
      *
      * \param axis The axis to arbit around, given in model coordinates of the anchor
-     * \param deltaTime The time step to use for the motion. Controls the rotation angle
+     * \param angle The rotation angle to use for the motion
      * \param position The position of the camera. Will be changed by the function
      * \param globalRotation The camera's global rotation. Will be changed by the function
-     * \param speedScale A speed scale that controls the speed of the motion
      */
-    void orbitAroundAxis(const glm::dvec3 axis, double deltaTime, glm::dvec3& position,
-        glm::dquat& globalRotation, double speedScale);
+    void orbitAroundAxis(const glm::dvec3 axis, double angle, glm::dvec3& position,
+        glm::dquat& globalRotation);
+
+    double rotationSpeedScaleFromCameraHeight(const glm::dvec3& cameraPosition,
+        const SurfacePositionHandle& positionHandle) const;
 };
 
 } // namespace openspace::interaction
diff --git a/src/navigation/orbitalnavigator.cpp b/src/navigation/orbitalnavigator.cpp
index 3cc92030e2..cb194b3047 100644
--- a/src/navigation/orbitalnavigator.cpp
+++ b/src/navigation/orbitalnavigator.cpp
@@ -393,6 +393,24 @@ namespace {
         openspace::properties::Property::Visibility::AdvancedUser
     };
 
+    constexpr openspace::properties::Property::PropertyInfo ShouldRotateAroundUpInfo = {
+        "ShouldRotateAroundUp",
+        "Should Rotate Around Up",
+        "When set to true, global rotation interactions in the X-direction will lead to "
+        "a rotation around the specified up vector instead of just around the object. "
+        "The up vector is the local coordinate axis, and can be set to either the X-, Y- "
+        "or Z-axis through the 'UpToUseForRotation' property",
+        openspace::properties::Property::Visibility::AdvancedUser
+    };
+
+    constexpr openspace::properties::Property::PropertyInfo UpToUseForRotationInfo = {
+        "UpToUseForRotation",
+        "Up To Use For Rotation",
+        "Specifies the local coordinate axis of the anchor node to use as up direction "
+        "when the camera is set to orbit around up. In general, the Z-axis is a good "
+        "choice for globes, and the Y-axis is a good choice for models",
+        openspace::properties::Property::Visibility::AdvancedUser
+    };
 } // namespace
 
 namespace openspace::interaction {
@@ -498,6 +516,8 @@ OrbitalNavigator::OrbitalNavigator()
     , _websocketStates(_websocketSensitivity, 1 / (_friction.friction + 0.0000001))
     , _disableZoom(DisableZoomInfo, false)
     , _disableRoll(DisableRollInfo, false)
+    , _shouldRotateAroundUp(ShouldRotateAroundUpInfo, false)
+    , _upToUseForRotation(UpToUseForRotationInfo)
 {
     _anchor.onChange([this]() {
         if (_anchor.value().empty()) {
@@ -698,6 +718,15 @@ OrbitalNavigator::OrbitalNavigator()
             LINFO("Camera roll has been enabled");
         }
     });
+
+    addProperty(_shouldRotateAroundUp);
+    _upToUseForRotation.addOptions({
+        { static_cast<int>(UpDirectionChoice::XAxis), "Local X" },
+        { static_cast<int>(UpDirectionChoice::YAxis), "Local Y" },
+        { static_cast<int>(UpDirectionChoice::ZAxis), "Local Z" }
+    });
+    _upToUseForRotation = static_cast<int>(UpDirectionChoice::ZAxis);
+    addProperty(_upToUseForRotation);
 }
 
 glm::dvec3 OrbitalNavigator::anchorNodeToCameraVector() const {
@@ -864,9 +893,25 @@ void OrbitalNavigator::updateCameraStateFromStates(double deltaTime) {
     camRot.localRotation = interpolateLocalRotation(deltaTime, camRot.localRotation);
     camRot.localRotation = rotateLocally(deltaTime, camRot.localRotation);
 
+    double horizontalTranslationSpeedScale =
+        rotationSpeedScaleFromCameraHeight(pose.position, posHandle);
+
+    // Rotation around target object's up vector based on user input
+    // (one kind of horizontal translation)
+    // Affects the position and global rotation
+    if (_shouldRotateAroundUp) {
+        rotateAroundAnchorUp(
+            deltaTime,
+            horizontalTranslationSpeedScale,
+            pose.position,
+            camRot.globalRotation
+        );
+    }
+
     // Horizontal translation based on user input
     pose.position = translateHorizontally(
         deltaTime,
+        horizontalTranslationSpeedScale,
         pose.position,
         anchorPos,
         camRot.globalRotation,
@@ -1583,72 +1628,68 @@ double OrbitalNavigator::interpolateCameraToSurfaceDistance(double deltaTime,
     return result;
 }
 
-glm::dvec3 OrbitalNavigator::translateHorizontally(double deltaTime,
+void OrbitalNavigator::rotateAroundAnchorUp(double deltaTime, double speedScale,
+                                            glm::dvec3& cameraPosition,
+                                            glm::dquat& globalCameraRotation)
+{
+    const glm::dvec3 axis = [](UpDirectionChoice upAxis) {
+        switch (upAxis) {
+            case UpDirectionChoice::XAxis:
+                return glm::dvec3(1.0, 0.0, 0.0);
+            case UpDirectionChoice::YAxis:
+                return glm::dvec3(0.0, 1.0, 0.0);
+            case UpDirectionChoice::ZAxis:
+                return glm::dvec3(0.0, 0.0, 1.0);
+            default:
+                throw ghoul::MissingCaseException();
+        }
+    }(UpDirectionChoice(_upToUseForRotation.value()));
+
+    double combinedXInput = _mouseStates.globalRotationVelocity().x +
+        _joystickStates.globalRotationVelocity().x +
+        _websocketStates.globalRotationVelocity().x +
+        _scriptStates.globalRotationVelocity().x;
+
+    double angle = combinedXInput * deltaTime * speedScale;
+    orbitAroundAxis(axis, angle, cameraPosition, globalCameraRotation);
+}
+
+glm::dvec3 OrbitalNavigator::translateHorizontally(double deltaTime, double speedScale,
                                                    const glm::dvec3& cameraPosition,
                                                    const glm::dvec3& objectPosition,
                                                    const glm::dquat& globalCameraRotation,
                                         const SurfacePositionHandle& positionHandle) const
 {
-    const glm::dmat4 modelTransform = _anchorNode->modelTransform();
+    // If we are orbiting around an up vector, we only want to allow verical
+    // movement and not use the x velocity
+    bool useX = !_shouldRotateAroundUp;
 
-    const glm::dvec3 outDirection = glm::normalize(glm::dmat3(modelTransform) *
-                                    positionHandle.referenceSurfaceOutDirection);
-
-    // Vector logic
-    const glm::dvec3 posDiff = cameraPosition - objectPosition;
-    const glm::dvec3 centerToActualSurfaceModelSpace =
-        positionHandle.centerToReferenceSurface +
-        positionHandle.referenceSurfaceOutDirection * positionHandle.heightToSurface;
-
-    const glm::dvec3 centerToActualSurface =
-        glm::dmat3(modelTransform) * centerToActualSurfaceModelSpace;
-
-    const glm::dvec3 actualSurfaceToCamera = posDiff - centerToActualSurface;
-
-    const double distFromSurfaceToCamera = [&]() {
-        if (_constantVelocityFlight) {
-            const glm::dvec3 centerToRefSurface =
-                glm::dmat3(modelTransform) * positionHandle.centerToReferenceSurface;
-            const glm::dvec3 refSurfaceToCamera = posDiff - centerToRefSurface;
-            return glm::length(refSurfaceToCamera);
-        }
-        else {
-            return glm::length(actualSurfaceToCamera);
-        }
-    }();
-
-    // Final values to be used
-    const double distFromCenterToSurface = glm::length(centerToActualSurface);
-    const double distFromCenterToCamera = glm::length(posDiff);
-
-    double speedScale =
-        distFromCenterToSurface > 0.0 ?
-        glm::clamp(distFromSurfaceToCamera / distFromCenterToSurface, 0.0, 1.0) :
-        1.0;
+    double angleScale = deltaTime * speedScale;
 
     // Get rotation in camera space
     const glm::dquat mouseRotationDiffCamSpace = glm::dquat(glm::dvec3(
-        -_mouseStates.globalRotationVelocity().y * deltaTime,
-        -_mouseStates.globalRotationVelocity().x * deltaTime,
-        0.0) * speedScale);
+        -_mouseStates.globalRotationVelocity().y,
+        useX ? -_mouseStates.globalRotationVelocity().x : 0.0,
+        0.0
+    ) * angleScale);
 
     const glm::dquat joystickRotationDiffCamSpace = glm::dquat(glm::dvec3(
-        -_joystickStates.globalRotationVelocity().y * deltaTime,
-        -_joystickStates.globalRotationVelocity().x * deltaTime,
-        0.0) * speedScale
-    );
+        -_joystickStates.globalRotationVelocity().y,
+        useX ? -_joystickStates.globalRotationVelocity().x : 0.0,
+        0.0
+    ) * angleScale);
 
     const glm::dquat scriptRotationDiffCamSpace = glm::dquat(glm::dvec3(
-        -_scriptStates.globalRotationVelocity().y * deltaTime,
-        -_scriptStates.globalRotationVelocity().x * deltaTime,
-        0.0) * speedScale
-    );
+        -_scriptStates.globalRotationVelocity().y,
+        useX ? -_scriptStates.globalRotationVelocity().x : 0.0,
+        0.0
+    ) * angleScale);
 
     const glm::dquat websocketRotationDiffCamSpace = glm::dquat(glm::dvec3(
-        -_websocketStates.globalRotationVelocity().y * deltaTime,
-        -_websocketStates.globalRotationVelocity().x * deltaTime,
-        0.0) * speedScale
-    );
+        -_websocketStates.globalRotationVelocity().y,
+        useX ? -_websocketStates.globalRotationVelocity().x : 0.0,
+        0.0
+    ) * angleScale);
 
     // Transform to world space
     const glm::dquat rotationDiffWorldSpace = globalCameraRotation *
@@ -1656,10 +1697,18 @@ glm::dvec3 OrbitalNavigator::translateHorizontally(double deltaTime,
         websocketRotationDiffCamSpace * scriptRotationDiffCamSpace *
         glm::inverse(globalCameraRotation);
 
+    const glm::dmat4 modelTransform = _anchorNode->modelTransform();
+    const glm::dvec3 outDirection = glm::normalize(
+        glm::dmat3(modelTransform) *
+        positionHandle.referenceSurfaceOutDirection
+    );
+
+    // Compute the vector to rotate to find the new position
+    const double distFromCenterToCamera = glm::length(cameraPosition - objectPosition);
+    const glm::dvec3 outVector = distFromCenterToCamera * outDirection;
+
     // Rotate and find the difference vector
-    const glm::dvec3 rotationDiffVec3 =
-        (distFromCenterToCamera * outDirection) * rotationDiffWorldSpace -
-        (distFromCenterToCamera * outDirection);
+    const glm::dvec3 rotationDiffVec3 = outVector * rotationDiffWorldSpace - outVector;
 
     // Add difference to position
     return cameraPosition + rotationDiffVec3;
@@ -1908,22 +1957,8 @@ void OrbitalNavigator::applyIdleBehavior(double deltaTime, glm::dvec3& position,
     SurfacePositionHandle posHandle =
         calculateSurfacePositionHandle(*_anchorNode, position);
 
-    const glm::dvec3 centerToActualSurfaceModelSpace =
-        posHandle.centerToReferenceSurface +
-        posHandle.referenceSurfaceOutDirection * posHandle.heightToSurface;
-
-    const glm::dvec3 centerToActualSurface = glm::dmat3(_anchorNode->modelTransform()) *
-        centerToActualSurfaceModelSpace;
-    const glm::dvec3 centerToCamera = position - _anchorNode->worldPosition();
-    const glm::dvec3 actualSurfaceToCamera = centerToCamera - centerToActualSurface;
-
-    const double distFromSurfaceToCamera = glm::length(actualSurfaceToCamera);
-    const double distFromCenterToSurface = glm::length(centerToActualSurface);
-
-    double speedScale =
-        distFromCenterToSurface > 0.0 ?
-        glm::clamp(distFromSurfaceToCamera / distFromCenterToSurface, 0.0, 1.0) :
-        1.0; // same as horizontal translation
+    // Same speed scale as horizontal translation
+    double speedScale = rotationSpeedScaleFromCameraHeight(position, posHandle);
 
     speedScale *= _idleBehavior.speedScaleFactor;
     speedScale *= 0.05; // without this scaling, the motion is way too fast
@@ -1936,6 +1971,8 @@ void OrbitalNavigator::applyIdleBehavior(double deltaTime, glm::dvec3& position,
     double s = _idleBehaviorDampenInterpolator.value();
     speedScale *= _invertIdleBehaviorInterpolation ? (1.0 - s) : s;
 
+    double angle = deltaTime * speedScale;
+
     // Apply the chosen behavior
     const IdleBehavior::Behavior choice = _idleBehavior.chosenBehavior.value_or(
         static_cast<IdleBehavior::Behavior>(_idleBehavior.defaultBehavior.value())
@@ -1943,7 +1980,7 @@ void OrbitalNavigator::applyIdleBehavior(double deltaTime, glm::dvec3& position,
 
     switch (choice) {
         case IdleBehavior::Behavior::Orbit:
-            orbitAnchor(deltaTime, position, globalRotation, speedScale);
+            orbitAnchor(angle, position, globalRotation);
             break;
         case IdleBehavior::Behavior::OrbitAtConstantLat: {
             // Assume that "north" coincides with the local z-direction
@@ -1951,13 +1988,13 @@ void OrbitalNavigator::applyIdleBehavior(double deltaTime, glm::dvec3& position,
             // north/up, so that we can query this information rather than assuming it.
             // The we could also combine this idle behavior with the next
             const glm::dvec3 north = glm::dvec3(0.0, 0.0, 1.0);
-            orbitAroundAxis(north, deltaTime, position, globalRotation, speedScale);
+            orbitAroundAxis(north, angle, position, globalRotation);
             break;
         }
         case IdleBehavior::Behavior::OrbitAroundUp: {
             // Assume that "up" coincides with the local y-direction
             const glm::dvec3 up = glm::dvec3(0.0, 1.0, 0.0);
-            orbitAroundAxis(up, deltaTime, position, globalRotation, speedScale);
+            orbitAroundAxis(up, angle, position, globalRotation);
             break;
         }
         default:
@@ -1965,15 +2002,15 @@ void OrbitalNavigator::applyIdleBehavior(double deltaTime, glm::dvec3& position,
     }
 }
 
-void OrbitalNavigator::orbitAnchor(double deltaTime, glm::dvec3& position,
-                                   glm::dquat& globalRotation, double speedScale)
+void OrbitalNavigator::orbitAnchor(double angle, glm::dvec3& position,
+                                   glm::dquat& globalRotation)
 {
     ghoul_assert(_anchorNode != nullptr, "Node to orbit must be set");
 
     // Apply a rotation to the right, in camera space
     // (Maybe we should also let the user decide which direction to rotate?
     // Or provide a few different orbit options)
-    const glm::dvec3 eulerAngles = glm::dvec3(0.0, -1.0, 0.0) * deltaTime * speedScale;
+    const glm::dvec3 eulerAngles = glm::dvec3(0.0, -1.0, 0.0) * angle;
     const glm::dquat rotationDiffCameraSpace = glm::dquat(eulerAngles);
 
     const glm::dquat rotationDiffWorldSpace = globalRotation *
@@ -1988,18 +2025,20 @@ void OrbitalNavigator::orbitAnchor(double deltaTime, glm::dvec3& position,
     position += rotationDiffVec3;
 }
 
-void OrbitalNavigator::orbitAroundAxis(const glm::dvec3 axis, double deltaTime,
-                                       glm::dvec3& position, glm::dquat& globalRotation,
-                                       double speedScale)
+void OrbitalNavigator::orbitAroundAxis(const glm::dvec3 axis, double angle,
+                                       glm::dvec3& position, glm::dquat& globalRotation)
 {
     ghoul_assert(_anchorNode != nullptr, "Node to orbit must be set");
 
+    if (glm::abs(angle) < AngleEpsilon) {
+        return;
+    }
+
     const glm::dmat4 modelTransform = _anchorNode->modelTransform();
     const glm::dvec3 axisInWorldSpace =
         glm::normalize(glm::dmat3(modelTransform) * glm::normalize(axis));
 
     // Compute rotation to be applied around the axis
-    double angle = deltaTime * speedScale;
     const glm::dquat spinRotation = glm::angleAxis(angle, axisInWorldSpace);
 
     // Rotate the position vector from the center to camera and update position
@@ -2007,6 +2046,10 @@ void OrbitalNavigator::orbitAroundAxis(const glm::dvec3 axis, double deltaTime,
     const glm::dvec3 rotationDiffVec3 =
         spinRotation * anchorCenterToCamera - anchorCenterToCamera;
 
+    if (glm::length(rotationDiffVec3) == 0.0) {
+        return;
+    }
+
     position += rotationDiffVec3;
 
     // Also apply the rotation to the global rotation, so the camera up vector is
@@ -2014,6 +2057,47 @@ void OrbitalNavigator::orbitAroundAxis(const glm::dvec3 axis, double deltaTime,
     globalRotation = spinRotation * globalRotation;
 }
 
+double OrbitalNavigator::rotationSpeedScaleFromCameraHeight(
+                                                         const glm::dvec3& cameraPosition,
+                                        const SurfacePositionHandle& positionHandle) const
+{
+    const glm::dmat4 modelTransform = _anchorNode->modelTransform();
+    const glm::dvec3 anchorPos = _anchorNode->worldPosition();
+
+    const glm::dvec3 outDirection = glm::normalize(
+        glm::dmat3(modelTransform) *
+        positionHandle.referenceSurfaceOutDirection
+    );
+
+    const glm::dvec3 posDiff = cameraPosition - anchorPos;
+    const glm::dvec3 centerToActualSurfaceModelSpace =
+        positionHandle.centerToReferenceSurface +
+        positionHandle.referenceSurfaceOutDirection * positionHandle.heightToSurface;
+
+    const glm::dvec3 centerToActualSurface =
+        glm::dmat3(modelTransform) * centerToActualSurfaceModelSpace;
+
+    const glm::dvec3 actualSurfaceToCamera = posDiff - centerToActualSurface;
+
+    const double distFromSurfaceToCamera = [&]() {
+        if (_constantVelocityFlight) {
+            const glm::dvec3 centerToRefSurface =
+                glm::dmat3(modelTransform) * positionHandle.centerToReferenceSurface;
+            const glm::dvec3 refSurfaceToCamera = posDiff - centerToRefSurface;
+            return glm::length(refSurfaceToCamera);
+        }
+        else {
+            return glm::length(actualSurfaceToCamera);
+        }
+    }();
+
+    const double distFromCenterToSurface = glm::length(centerToActualSurface);
+
+    return distFromCenterToSurface > 0.0 ?
+        glm::clamp(distFromSurfaceToCamera / distFromCenterToSurface, 0.0, 1.0) :
+        1.0;
+}
+
 scripting::LuaLibrary OrbitalNavigator::luaLibrary() {
     return {
         "orbitalnavigation",

From d77836d910d309587ad1346d6dae8c99fc0aabbb Mon Sep 17 00:00:00 2001
From: Emma Broman <emma.broman@liu.se>
Date: Mon, 11 Sep 2023 11:04:46 +0200
Subject: [PATCH 125/701] Feature/arrow renderable (#2219)

* Create a RenderableNodeLine example asset

* First version of node direction hint renderable (arrow)

* Add possibility to set length as a multiplier of the bounding sphere

* Draw arrow cylinder using index array

* Update exponents and min max values for lengths

* Draw arrow head

* Only update arrow geometry when positions change

* Add some properties to control visuals of arrow

* Implement invert option

* Add normals and shading

* Set arrow head size by length percentage instead of angle

* Add bottom circle to cone

* Cleanup and update examples

* Remove non-existing property from example asset

* Fix vertices not updating if anchor node was changed

And some missing updates on property change

* Start cleaning up some shape rendering helper functions

* Cleanup code and move cylinder function to helper class

* Refactor cylinder creation code (fewer loops over same vector)

* Update transformations to correctly scale and place arrow

* Add the cone to make the arrowhead

* Update faulty triangle normals

* Add property visibilities

* Rename NodeDirectionHint to NodeArrow

* Apply suggestions from code review

Co-authored-by: Alexander Bock <alexander.bock@liu.se>


---------

Co-authored-by: Alexander Bock <alexander.bock@liu.se>
---
 data/assets/examples/nodearrow.asset          |  77 +++
 data/assets/examples/nodeline.asset           |  43 ++
 include/openspace/rendering/helper.h          |  32 +-
 modules/base/CMakeLists.txt                   |   4 +
 modules/base/basemodule.cpp                   |   3 +
 .../base/rendering/renderablenodearrow.cpp    | 515 ++++++++++++++++++
 modules/base/rendering/renderablenodearrow.h  | 103 ++++
 modules/base/rendering/renderableprism.cpp    |  48 +-
 modules/base/shaders/arrow_fs.glsl            |  75 +++
 modules/base/shaders/arrow_vs.glsl            |  47 ++
 src/rendering/helper.cpp                      | 287 +++++++++-
 11 files changed, 1176 insertions(+), 58 deletions(-)
 create mode 100644 data/assets/examples/nodearrow.asset
 create mode 100644 data/assets/examples/nodeline.asset
 create mode 100644 modules/base/rendering/renderablenodearrow.cpp
 create mode 100644 modules/base/rendering/renderablenodearrow.h
 create mode 100644 modules/base/shaders/arrow_fs.glsl
 create mode 100644 modules/base/shaders/arrow_vs.glsl

diff --git a/data/assets/examples/nodearrow.asset b/data/assets/examples/nodearrow.asset
new file mode 100644
index 0000000000..ef851baa48
--- /dev/null
+++ b/data/assets/examples/nodearrow.asset
@@ -0,0 +1,77 @@
+local earth = asset.require("scene/solarsystem/planets/earth/earth")
+local moon = asset.require("scene/solarsystem/planets/earth/moon/moon")
+local mars = asset.require("scene/solarsystem/planets/mars/mars")
+
+
+
+local EarthRadius = 6371000.0
+
+local ArrowExample = {
+  Identifier = "RenderableNodeArrowExample",
+  Parent = earth.Earth.Identifier,
+  Renderable = {
+    Type = "RenderableNodeArrow",
+    StartNode = earth.Earth.Identifier,
+    EndNode = mars.Mars.Identifier,
+    Color = { 0.8, 1.0, 0.8 },
+    Offset = 2 * EarthRadius,
+    Length = 5 * EarthRadius,
+    Width = 900000.0
+  },
+  GUI = {
+    Name = "Node Arrow Example",
+    Path = "/Example",
+    Description = [[Example node direction arrow, using absolute sizes]]
+  }
+}
+
+-- Relative values: Multiplied with bounding sphere
+local ArrowExample_RelativeUnits = {
+  Identifier = "RenderableNodeArrowExample_Relative",
+  Parent = earth.Earth.Identifier,
+  Renderable = {
+    Type = "RenderableNodeArrow",
+    StartNode = earth.Earth.Identifier,
+    EndNode = moon.Moon.Identifier,
+    Color = { 0.78, 0.0, 1.0 },
+    UseRelativeOffset = true,
+    UseRelativeLength = true,
+    Offset = 2.0,
+    Length = 5.0,
+    Width = 900000.0,
+    Invert = true -- Point to start node instead of end node
+  },
+  GUI = {
+    Name = "Node Arrow Example (relative units)",
+    Path = "/Example",
+    Description = [[Example node direction arrow, using relative sizes]]
+  }
+}
+
+
+asset.onInitialize(function()
+  openspace.addSceneGraphNode(ArrowExample)
+  openspace.addSceneGraphNode(ArrowExample_RelativeUnits)
+end)
+
+asset.onDeinitialize(function()
+  openspace.removeSceneGraphNode(ArrowExample_RelativeUnits)
+  openspace.removeSceneGraphNode(ArrowExample)
+end)
+
+asset.export(ArrowExample)
+asset.export(ArrowExample_RelativeUnits)
+
+
+
+asset.meta = {
+  Name = "RenderableNodeArrow Example asset",
+  Version = "1.0",
+  Description = [[Examples of the RenderableNodeArrow renderable, that can be used to draw
+    an arrow pointing from one scene graph node in the direction of another. Note that
+    the arrows are generated as objects in 3D space and need to have a size that is
+    suitable for their 3D context.]],
+  Author = "OpenSpace Team",
+  URL = "http://openspaceproject.com",
+  License = "MIT license"
+}
diff --git a/data/assets/examples/nodeline.asset b/data/assets/examples/nodeline.asset
new file mode 100644
index 0000000000..7f0edb27cb
--- /dev/null
+++ b/data/assets/examples/nodeline.asset
@@ -0,0 +1,43 @@
+local earth = asset.require("scene/solarsystem/planets/earth/earth")
+local mars = asset.require("scene/solarsystem/planets/mars/mars")
+
+
+
+local RenderableNodeLineExample = {
+  Identifier = "RenderableNodeLineExample",
+  Renderable = {
+    Type = "RenderableNodeLine",
+    StartNode = earth.Earth.Identifier,
+    EndNode = mars.Mars.Identifier,
+    Color = { 0.5, 0.5, 0.5 },
+    LineWidth = 2
+  },
+  GUI = {
+    Name = "RenderableNodeLine Example",
+    Path = "/Example",
+    Description = [[Draws a line between two nodes in the scene.]]
+  }
+}
+
+
+asset.onInitialize(function()
+  openspace.addSceneGraphNode(RenderableNodeLineExample)
+end)
+
+asset.onDeinitialize(function()
+  openspace.removeSceneGraphNode(RenderableNodeLineExample)
+end)
+
+asset.export(RenderableNodeLineExample)
+
+
+
+asset.meta = {
+  Name = "RenderableNodeLine Example asset",
+  Version = "1.0",
+  Description = [[Example of a RenderableNodeLine, that can be used to draw an line
+    between two scene graph nodes.]],
+  Author = "OpenSpace Team",
+  URL = "http://openspaceproject.com",
+  License = "MIT license"
+}
diff --git a/include/openspace/rendering/helper.h b/include/openspace/rendering/helper.h
index 0770617383..ddff046cd4 100644
--- a/include/openspace/rendering/helper.h
+++ b/include/openspace/rendering/helper.h
@@ -89,6 +89,22 @@ struct VertexObjects {
         int nElements = 64;
     } sphere;
 
+    struct {
+        GLuint vao = 0;
+        GLuint vbo = 0;
+        GLuint ibo = 0;
+
+        int nElements = 64;
+    } cylinder;
+
+    struct {
+        GLuint vao = 0;
+        GLuint vbo = 0;
+        GLuint ibo = 0;
+
+        int nElements = 64;
+    } cone;
+
     struct {
         GLuint vao = 0;
     } empty;
@@ -119,6 +135,12 @@ struct VertexXYZNormal {
     GLfloat normal[3];
 };
 
+template <typename V>
+struct VertexIndexListCombo {
+    std::vector<V> vertices;
+    std::vector<GLushort> indices;
+};
+
 VertexXYZ convertToXYZ(const Vertex& v);
 
 std::vector<VertexXYZ> convert(std::vector<Vertex> v);
@@ -126,9 +148,17 @@ std::vector<VertexXYZ> convert(std::vector<Vertex> v);
 std::vector<Vertex> createRing(int nSegments, float radius,
     glm::vec4 colors = glm::vec4(1.f));
 
-std::pair<std::vector<Vertex>, std::vector<GLushort>>
+std::vector<VertexXYZ> createRingXYZ(int nSegments, float radius);
+
+VertexIndexListCombo<Vertex>
 createSphere(int nSegments, glm::vec3 radii, glm::vec4 colors = glm::vec4(1.f));
 
+VertexIndexListCombo<VertexXYZNormal> createCylinder(unsigned int nSegments,
+    float radius, float height);
+
+VertexIndexListCombo<VertexXYZNormal> createCone(unsigned int nSegments, float radius,
+    float height);
+
 /**
  * Data structure that can be used for rendering using multiple light directions
  */
diff --git a/modules/base/CMakeLists.txt b/modules/base/CMakeLists.txt
index a0a14901f6..6559ad54b3 100644
--- a/modules/base/CMakeLists.txt
+++ b/modules/base/CMakeLists.txt
@@ -48,6 +48,7 @@ set(HEADER_FILES
   rendering/renderabledisc.h
   rendering/renderablelabel.h
   rendering/renderablemodel.h
+  rendering/renderablenodearrow.h
   rendering/renderablenodeline.h
   rendering/renderableplane.h
   rendering/renderableplaneimagelocal.h
@@ -106,6 +107,7 @@ set(SOURCE_FILES
   rendering/renderabledisc.cpp
   rendering/renderablelabel.cpp
   rendering/renderablemodel.cpp
+  rendering/renderablenodearrow.cpp
   rendering/renderablenodeline.cpp
   rendering/renderableplane.cpp
   rendering/renderableplaneimagelocal.cpp
@@ -142,6 +144,8 @@ set(SOURCE_FILES
 source_group("Source Files" FILES ${SOURCE_FILES})
 
 set(SHADER_FILES
+  shaders/arrow_fs.glsl
+  shaders/arrow_vs.glsl
   shaders/axes_fs.glsl
   shaders/axes_vs.glsl
   shaders/disc_fs.glsl
diff --git a/modules/base/basemodule.cpp b/modules/base/basemodule.cpp
index 8b8bbf2bc5..9939cea058 100644
--- a/modules/base/basemodule.cpp
+++ b/modules/base/basemodule.cpp
@@ -47,6 +47,7 @@
 #include <modules/base/rendering/renderabledisc.h>
 #include <modules/base/rendering/renderablelabel.h>
 #include <modules/base/rendering/renderablemodel.h>
+#include <modules/base/rendering/renderablenodearrow.h>
 #include <modules/base/rendering/renderablenodeline.h>
 #include <modules/base/rendering/renderablesphereimagelocal.h>
 #include <modules/base/rendering/renderablesphereimageonline.h>
@@ -136,6 +137,7 @@ void BaseModule::internalInitialize(const ghoul::Dictionary&) {
     fRenderable->registerClass<RenderableGrid>("RenderableGrid");
     fRenderable->registerClass<RenderableLabel>("RenderableLabel");
     fRenderable->registerClass<RenderableModel>("RenderableModel");
+    fRenderable->registerClass<RenderableNodeArrow>("RenderableNodeArrow");
     fRenderable->registerClass<RenderableNodeLine>("RenderableNodeLine");
     fRenderable->registerClass<RenderablePlaneImageLocal>("RenderablePlaneImageLocal");
     fRenderable->registerClass<RenderablePlaneImageOnline>("RenderablePlaneImageOnline");
@@ -222,6 +224,7 @@ std::vector<documentation::Documentation> BaseModule::documentations() const {
         RenderableGrid::Documentation(),
         RenderableLabel::Documentation(),
         RenderableModel::Documentation(),
+        RenderableNodeArrow::Documentation(),
         RenderableNodeLine::Documentation(),
         RenderablePlane::Documentation(),
         RenderablePlaneImageLocal::Documentation(),
diff --git a/modules/base/rendering/renderablenodearrow.cpp b/modules/base/rendering/renderablenodearrow.cpp
new file mode 100644
index 0000000000..1a6983874d
--- /dev/null
+++ b/modules/base/rendering/renderablenodearrow.cpp
@@ -0,0 +1,515 @@
+/*****************************************************************************************
+ *                                                                                       *
+ * OpenSpace                                                                             *
+ *                                                                                       *
+ * Copyright (c) 2014-2023                                                               *
+ *                                                                                       *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
+ * software and associated documentation files (the "Software"), to deal in the Software *
+ * without restriction, including without limitation the rights to use, copy, modify,    *
+ * merge, publish, distribute, sublicense, and/or sell copies of the Software, and to    *
+ * permit persons to whom the Software is furnished to do so, subject to the following   *
+ * conditions:                                                                           *
+ *                                                                                       *
+ * The above copyright notice and this permission notice shall be included in all copies *
+ * or substantial portions of the Software.                                              *
+ *                                                                                       *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED,   *
+ * INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A         *
+ * PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT    *
+ * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF  *
+ * CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE  *
+ * OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                                         *
+ ****************************************************************************************/
+
+#include <modules/base/rendering/renderablenodearrow.h>
+
+#include <modules/base/basemodule.h>
+#include <openspace/documentation/verifier.h>
+#include <openspace/engine/globals.h>
+#include <openspace/navigation/navigationhandler.h>
+#include <openspace/navigation/orbitalnavigator.h>
+#include <openspace/query/query.h>
+#include <openspace/rendering/helper.h>
+#include <openspace/rendering/renderengine.h>
+#include <openspace/scene/scene.h>
+#include <openspace/scene/translation.h>
+#include <openspace/util/updatestructures.h>
+#include <ghoul/filesystem/filesystem.h>
+#include <ghoul/logging/logmanager.h>
+#include <ghoul/opengl/openglstatecache.h>
+#include <ghoul/opengl/programobject.h>
+#include <glm/gtx/projection.hpp>
+#include <glm/gtx/transform.hpp>
+
+namespace {
+    constexpr std::string_view _loggerCat = "RenderableNodeArrow";
+
+    constexpr openspace::properties::Property::PropertyInfo StartNodeInfo = {
+        "StartNode",
+        "Start Node",
+        "The identifier of the node the arrow starts from",
+        openspace::properties::Property::Visibility::NoviceUser
+    };
+
+    constexpr openspace::properties::Property::PropertyInfo EndNodeInfo = {
+        "EndNode",
+        "End Node",
+        "The identifier of the node the arrow should point towards",
+        openspace::properties::Property::Visibility::NoviceUser
+    };
+
+    constexpr openspace::properties::Property::PropertyInfo ColorInfo = {
+        "Color",
+        "Color",
+        "This value determines the RGB color for the arrow",
+        openspace::properties::Property::Visibility::NoviceUser
+    };
+
+    constexpr openspace::properties::Property::PropertyInfo SegmentsInfo = {
+        "Segments",
+        "Number of Segments",
+        "This value specifies the number of segments that the shapes for the arrow are "
+        "separated in. A higher number leads to a higher resolution",
+        openspace::properties::Property::Visibility::AdvancedUser
+    };
+
+    constexpr openspace::properties::Property::PropertyInfo InvertInfo = {
+        "Invert",
+        "Invert Direction",
+        "If set to true, the arrow direction is inverted so that it points to the "
+        "start node instead of the end node",
+        openspace::properties::Property::Visibility::NoviceUser
+    };
+
+    constexpr openspace::properties::Property::PropertyInfo ArrowHeadSizeInfo = {
+        "ArrowHeadSize",
+        "Arrow Head Size",
+        "This size of the arrow head, given in relative value of the entire length of "
+        "the arrow. For example, 0.1 makes the arrow head length be 10% of the full "
+        "arrow length",
+        openspace::properties::Property::Visibility::AdvancedUser
+    };
+
+    constexpr openspace::properties::Property::PropertyInfo ArrowHeadWidthInfo = {
+        "ArrowHeadWidthFactor",
+        "Arrow Head Width Factor",
+        "A factor that is multiplied with the width, or the arrow itself, to determine "
+        "the width of the base of the arrow head",
+        openspace::properties::Property::Visibility::AdvancedUser
+    };
+
+    constexpr openspace::properties::Property::PropertyInfo OffsetDistanceInfo = {
+        "Offset",
+        "Offset Distance",
+        "The distance from the center of the start node where the arrow starts. "
+        "If 'UseRelativeOffset' is true, the value should be given as a factor to "
+        "multiply with the bounding sphere of the node. Otherwise, the value is "
+        "specified in meters",
+        openspace::properties::Property::Visibility::AdvancedUser
+    };
+
+    constexpr openspace::properties::Property::PropertyInfo RelativeOffsetInfo = {
+        "UseRelativeOffset",
+        "Use Relative Offset Distance",
+        "Decide whether to use relative distances (in units of start node bounding "
+        "sphere) for the offset distance. If false, meters is used",
+        openspace::properties::Property::Visibility::AdvancedUser
+    };
+
+    constexpr openspace::properties::Property::PropertyInfo LengthInfo = {
+        "Length",
+        "Length",
+        "The length of the arrow, given either in meters or as a factor to be "
+        "multiplied with the bounding sphere of the start node (if "
+        "'UseRelativeLength' is true)",
+        openspace::properties::Property::Visibility::AdvancedUser
+    };
+
+    constexpr openspace::properties::Property::PropertyInfo RelativeLengthInfo = {
+        "UseRelativeLength",
+        "Use Relative Length",
+        "Decide whether to use relative size (in units of start node bounding "
+        "sphere) for the length of the arrow. If false, meters is used",
+        openspace::properties::Property::Visibility::AdvancedUser
+    };
+
+    constexpr openspace::properties::Property::PropertyInfo WidthInfo = {
+        "Width",
+        "Width",
+        "This value specifies the width of the arrow shape",
+        openspace::properties::Property::Visibility::AdvancedUser
+    };
+
+    constexpr openspace::properties::Property::PropertyInfo AmbientIntensityInfo = {
+        "AmbientIntensity",
+        "Ambient Intensity",
+        "A multiplier for ambient lighting for the shading of the arrow",
+        openspace::properties::Property::Visibility::User
+    };
+
+    constexpr openspace::properties::Property::PropertyInfo DiffuseIntensityInfo = {
+        "DiffuseIntensity",
+        "Diffuse Intensity",
+        "A multiplier for diffuse lighting for the shading of the arrow",
+        openspace::properties::Property::Visibility::User
+    };
+
+    constexpr openspace::properties::Property::PropertyInfo SpecularIntensityInfo = {
+        "SpecularIntensity",
+        "Specular Intensity",
+        "A multiplier for specular lighting for the shading of the arrow",
+        openspace::properties::Property::Visibility::User
+    };
+
+    constexpr openspace::properties::Property::PropertyInfo ShadingEnabledInfo = {
+        "PerformShading",
+        "Perform Shading",
+        "This value determines whether shading should be applied to the arrow model",
+        openspace::properties::Property::Visibility::User
+    };
+
+    struct [[codegen::Dictionary(RenderableNodeArrow)]] Parameters {
+        // [[codegen::verbatim(StartNodeInfo.description)]]
+        std::string startNode [[codegen::notempty]];
+
+        // [[codegen::verbatim(EndNodeInfo.description)]]
+        std::string endNode [[codegen::notempty]];
+
+        // [[codegen::verbatim(ColorInfo.description)]]
+        std::optional<glm::vec3> color [[codegen::color()]];
+
+        // [[codegen::verbatim(SegmentsInfo.description)]]
+        std::optional<int> segments [[codegen::greaterequal(3)]];
+
+        // [[codegen::verbatim(InvertInfo.description)]]
+        std::optional<bool> invert;
+
+        // [[codegen::verbatim(ArrowHeadSizeInfo.description)]]
+        std::optional<float> arrowHeadSize [[codegen::greaterequal(0.f)]];
+
+        // [[codegen::verbatim(ArrowHeadWidthInfo.description)]]
+        std::optional<float> arrowHeadWidthFactor [[codegen::greaterequal(0.f)]];
+
+        // [[codegen::verbatim(OffsetDistanceInfo.description)]]
+        std::optional<float> offset;
+
+        // [[codegen::verbatim(RelativeOffsetInfo.description)]]
+        std::optional<bool> useRelativeOffset;
+
+        // [[codegen::verbatim(LengthInfo.description)]]
+        std::optional<float> length [[codegen::greaterequal(0.f)]];
+
+        // [[codegen::verbatim(RelativeLengthInfo.description)]]
+        std::optional<bool> useRelativeLength;
+
+        // [[codegen::verbatim(WidthInfo.description)]]
+        std::optional<float> width [[codegen::greaterequal(0.f)]];
+
+        // [[codegen::verbatim(ShadingEnabledInfo.description)]]
+        std::optional<float> performShading;
+
+        // [[codegen::verbatim(AmbientIntensityInfo.description)]]
+        std::optional<float> ambientIntensity [[codegen::greaterequal(0.f)]];
+
+        // [[codegen::verbatim(DiffuseIntensityInfo.description)]]
+        std::optional<float> diffuseIntensity [[codegen::greaterequal(0.f)]];
+
+        // [[codegen::verbatim(SpecularIntensityInfo.description)]]
+        std::optional<float> specularIntensity [[codegen::greaterequal(0.f)]];
+    };
+#include "renderablenodearrow_codegen.cpp"
+
+    void updateDistanceBasedOnRelativeValues(const std::string& nodeName,
+                                             bool useRelative,
+                                             openspace::properties::FloatProperty& prop)
+    {
+        using namespace::openspace;
+
+        SceneGraphNode* startNode = sceneGraphNode(nodeName);
+        if (!startNode) {
+            LERROR(fmt::format("Could not find start node '{}'", nodeName));
+            return;
+        }
+        const double boundingSphere = startNode->boundingSphere();
+
+        if (!useRelative) {
+            // Recompute distance (previous value was relative)
+            prop = static_cast<float>(prop * boundingSphere);
+            prop.setExponent(11.f);
+            prop.setMaxValue(1e20f);
+        }
+        else {
+            // Recompute distance (previous value was in meters)
+            if (boundingSphere < std::numeric_limits<double>::epsilon()) {
+                LERROR(fmt::format(
+                    "Start node '{}' has invalid bounding sphere", nodeName
+                ));
+                return;
+            }
+            prop = static_cast<float>(prop / boundingSphere);
+            prop.setExponent(3.f);
+            prop.setMaxValue(1000.f);
+        }
+        // @TODO (emmbr, 2022-08-22): make GUI update when min/max value is updated
+    };
+} // namespace
+
+namespace openspace {
+
+documentation::Documentation RenderableNodeArrow::Documentation() {
+    return codegen::doc<Parameters>("base_renderable_renderablenodearrow");
+}
+
+RenderableNodeArrow::Shading::Shading()
+    : properties::PropertyOwner({ "Shading" })
+    , enabled(ShadingEnabledInfo, true)
+    , ambientIntensity(AmbientIntensityInfo, 0.2f, 0.f, 1.f)
+    , diffuseIntensity(DiffuseIntensityInfo, 0.7f, 0.f, 1.f)
+    , specularIntensity(SpecularIntensityInfo, 0.f, 0.f, 1.f)
+{
+    addProperty(enabled);
+    addProperty(ambientIntensity);
+    addProperty(diffuseIntensity);
+    addProperty(specularIntensity);
+}
+
+RenderableNodeArrow::RenderableNodeArrow(const ghoul::Dictionary& dictionary)
+    : Renderable(dictionary)
+    , _start(StartNodeInfo)
+    , _end(EndNodeInfo)
+    , _color(ColorInfo, glm::vec3(1.f), glm::vec3(0.f), glm::vec3(1.f))
+    , _segments(SegmentsInfo, 10, 3, 100)
+    , _invertArrowDirection(InvertInfo, false)
+    , _arrowHeadSize(ArrowHeadSizeInfo, 0.1f, 0.f, 1.f)
+    , _arrowHeadWidthFactor(ArrowHeadWidthInfo, 2.f, 1.f, 100.f)
+    , _offsetDistance(OffsetDistanceInfo, 0.f, 0.f, 1e20f)
+    , _useRelativeOffset(RelativeOffsetInfo, false)
+    , _length(LengthInfo, 100.f, 0.f, 1e20f)
+    , _useRelativeLength(RelativeLengthInfo, false)
+    , _width(WidthInfo, 10.f, 0.f, 1e11f)
+{
+    const Parameters p = codegen::bake<Parameters>(dictionary);
+
+    _shading.enabled = p.performShading.value_or(_shading.enabled);
+    _shading.ambientIntensity = p.ambientIntensity.value_or(_shading.ambientIntensity);
+    _shading.diffuseIntensity = p.diffuseIntensity.value_or(_shading.diffuseIntensity);
+    _shading.specularIntensity = p.specularIntensity.value_or(_shading.specularIntensity);
+    addPropertySubOwner(_shading);
+
+    addProperty(Fadeable::_opacity);
+
+    _color = p.color.value_or(_color);
+    _color.setViewOption(properties::Property::ViewOptions::Color);
+    addProperty(_color);
+
+    _start = p.startNode;
+    addProperty(_start);
+
+    _end = p.endNode;
+    addProperty(_end);
+
+    _segments = p.segments.value_or(_segments);
+    addProperty(_segments);
+
+    _invertArrowDirection = p.invert.value_or(_invertArrowDirection);
+    addProperty(_invertArrowDirection);
+
+    _arrowHeadSize = p.arrowHeadSize.value_or(_arrowHeadSize);
+    addProperty(_arrowHeadSize);
+
+    _arrowHeadWidthFactor = p.arrowHeadWidthFactor.value_or(_arrowHeadWidthFactor);
+    addProperty(_arrowHeadWidthFactor);
+
+    _width = p.width.value_or(_width);
+    _width.setExponent(10.f);
+    addProperty(_width);
+
+    _useRelativeLength.onChange([this]() {
+        updateDistanceBasedOnRelativeValues(_start, _useRelativeLength, _length);
+    });
+    _useRelativeLength = p.useRelativeLength.value_or(_useRelativeLength);
+
+    _length = p.length.value_or(_length);
+    if (!_useRelativeLength) {
+        _length.setExponent(11.f);
+    }
+    addProperty(_length);
+
+    _useRelativeOffset.onChange([this]() {
+        updateDistanceBasedOnRelativeValues(_start, _useRelativeOffset, _offsetDistance);
+    });
+    _useRelativeOffset = p.useRelativeOffset.value_or(_useRelativeOffset);
+
+    _offsetDistance = p.offset.value_or(_offsetDistance);
+    if (!_useRelativeOffset) {
+        _offsetDistance.setExponent(11.f);
+    }
+    addProperty(_offsetDistance);
+
+    addProperty(_useRelativeLength);
+    addProperty(_useRelativeOffset);
+}
+
+void RenderableNodeArrow::initializeGL() {
+    _shaderProgram = BaseModule::ProgramObjectManager.request(
+        "NodeDirectionLineProgram",
+        []() -> std::unique_ptr<ghoul::opengl::ProgramObject> {
+            return global::renderEngine->buildRenderProgram(
+                "NodeDirectionLineProgram",
+                absPath("${MODULE_BASE}/shaders/arrow_vs.glsl"),
+                absPath("${MODULE_BASE}/shaders/arrow_fs.glsl")
+            );
+        }
+    );
+}
+
+void RenderableNodeArrow::deinitializeGL() {
+    BaseModule::ProgramObjectManager.release(
+        "NodeDirectionLineProgram",
+        [](ghoul::opengl::ProgramObject* p) {
+            global::renderEngine->removeRenderProgram(p);
+        }
+    );
+    _shaderProgram = nullptr;
+}
+
+bool RenderableNodeArrow::isReady() const {
+    return _shaderProgram;
+}
+
+void RenderableNodeArrow::updateShapeTransforms(const RenderData& data) {
+    SceneGraphNode* startNode = sceneGraphNode(_start);
+    SceneGraphNode* endNode = sceneGraphNode(_end);
+
+    if (!startNode) {
+        LERROR(fmt::format("Could not find start node '{}'", _start.value()));
+        return;
+    }
+
+    if (!endNode) {
+        LERROR(fmt::format("Could not find end node '{}'", _end.value()));
+        return;
+    }
+
+    const double boundingSphere = startNode->boundingSphere();
+    bool hasNoBoundingSphere = boundingSphere < std::numeric_limits<double>::epsilon();
+
+    if (hasNoBoundingSphere && (_useRelativeLength || _useRelativeOffset)) {
+        LERROR(fmt::format(
+            "Node '{}' has no valid bounding sphere. Can not use relative values",
+            _end.value()
+        ));
+        return;
+    }
+
+    double offset = static_cast<double>(_offsetDistance);
+    if (_useRelativeOffset) {
+        offset *= boundingSphere;
+    }
+
+    double length = static_cast<double>(_length);
+    if (_useRelativeLength) {
+        length *= boundingSphere;
+    }
+
+    // Take additional transformation scale into account
+    const glm::dmat4 s = glm::scale(
+        glm::dmat4(1.0),
+        glm::dvec3(data.modelTransform.scale)
+    );
+
+    // Update the position based on the arrowDirection of the nodes
+    glm::dvec3 startNodePos = startNode->worldPosition();
+    glm::dvec3 endNodePos = endNode->worldPosition();
+
+    glm::dvec3 arrowDirection = glm::normalize(endNodePos - startNodePos);
+    glm::dvec3 startPos = glm::dvec3(startNodePos + offset * arrowDirection);
+    glm::dvec3 endPos = glm::dvec3(startPos + length * arrowDirection);
+
+    if (_invertArrowDirection) {
+        std::swap(startPos, endPos);
+        arrowDirection *= -1.0;
+    }
+
+    double coneLength = _arrowHeadSize * length;
+    double cylinderLength = length - coneLength;
+    double arrowHeadWidth = _width * _arrowHeadWidthFactor;
+
+    // Create transformation matrices to reshape to size and position
+    _cylinderTranslation = glm::translate(glm::dmat4(1.0), startPos);
+    glm::dvec3 cylinderScale = glm::dvec3(s * glm::dvec4(_width, _width, cylinderLength, 0.0));
+    _cylinderScale = glm::scale(glm::dmat4(1.0), cylinderScale);
+
+    // Adapt arrow head start to scaled size
+    glm::dvec3 arrowHeadStartPos = startPos + cylinderScale.z * arrowDirection;
+
+    _coneTranslation = glm::translate(glm::dmat4(1.0), arrowHeadStartPos);
+    glm::dvec3 coneScale = glm::dvec3(arrowHeadWidth, arrowHeadWidth, coneLength);
+    _coneScale = s * glm::scale(glm::dmat4(1.0), coneScale);
+
+    // Rotation to point at the end node
+    glm::quat rotQuat = glm::rotation(glm::dvec3(0.0, 0.0, 1.0), arrowDirection);
+    _pointDirectionRotation = glm::dmat4(glm::toMat4(rotQuat));
+}
+
+void RenderableNodeArrow::render(const RenderData& data, RendererTasks&) {
+    updateShapeTransforms(data);
+
+    // Cylinder transforms
+    glm::dmat4 modelTransform =
+        _cylinderTranslation * _pointDirectionRotation * _cylinderScale;
+    glm::dmat4 modelViewTransform = data.camera.combinedViewMatrix() * modelTransform;
+    glm::dmat4 normalTransform = glm::transpose(glm::inverse(modelViewTransform));
+
+    _shaderProgram->activate();
+
+    _shaderProgram->setUniform("modelViewTransform", glm::mat4(modelViewTransform));
+    _shaderProgram->setUniform("projectionTransform", data.camera.projectionMatrix());
+    _shaderProgram->setUniform("normalTransform", glm::mat3(normalTransform));
+
+    _shaderProgram->setUniform("color", _color);
+    _shaderProgram->setUniform("opacity", opacity());
+
+    _shaderProgram->setUniform("ambientIntensity", _shading.ambientIntensity);
+    _shaderProgram->setUniform("diffuseIntensity", _shading.diffuseIntensity);
+    _shaderProgram->setUniform("specularIntensity", _shading.specularIntensity);
+    _shaderProgram->setUniform("performShading", _shading.enabled);
+
+    // Change GL state:
+    glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
+    glEnablei(GL_BLEND, 0);
+
+    // Draw cylinder
+    glBindVertexArray(rendering::helper::vertexObjects.cylinder.vao);
+    glDrawElements(
+        GL_TRIANGLES,
+        rendering::helper::vertexObjects.cylinder.nElements,
+        GL_UNSIGNED_SHORT,
+        nullptr
+    );
+
+    // Update transforms and render cone
+    modelTransform = _coneTranslation * _pointDirectionRotation * _coneScale;
+    modelViewTransform = data.camera.combinedViewMatrix() * modelTransform;
+    normalTransform = glm::transpose(glm::inverse(modelViewTransform));
+
+    _shaderProgram->setUniform("modelViewTransform", glm::mat4(modelViewTransform));
+    _shaderProgram->setUniform("normalTransform", glm::mat3(normalTransform));
+
+    glBindVertexArray(rendering::helper::vertexObjects.cone.vao);
+    glDrawElements(
+        GL_TRIANGLES,
+        rendering::helper::vertexObjects.cone.nElements,
+        GL_UNSIGNED_SHORT,
+        nullptr
+    );
+
+    // Restore GL State
+    glBindVertexArray(0);
+    global::renderEngine->openglStateCache().resetBlendState();
+
+    _shaderProgram->deactivate();
+}
+
+} // namespace openspace
diff --git a/modules/base/rendering/renderablenodearrow.h b/modules/base/rendering/renderablenodearrow.h
new file mode 100644
index 0000000000..f51bafbc28
--- /dev/null
+++ b/modules/base/rendering/renderablenodearrow.h
@@ -0,0 +1,103 @@
+/*****************************************************************************************
+ *                                                                                       *
+ * OpenSpace                                                                             *
+ *                                                                                       *
+ * Copyright (c) 2014-2023                                                               *
+ *                                                                                       *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
+ * software and associated documentation files (the "Software"), to deal in the Software *
+ * without restriction, including without limitation the rights to use, copy, modify,    *
+ * merge, publish, distribute, sublicense, and/or sell copies of the Software, and to    *
+ * permit persons to whom the Software is furnished to do so, subject to the following   *
+ * conditions:                                                                           *
+ *                                                                                       *
+ * The above copyright notice and this permission notice shall be included in all copies *
+ * or substantial portions of the Software.                                              *
+ *                                                                                       *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED,   *
+ * INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A         *
+ * PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT    *
+ * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF  *
+ * CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE  *
+ * OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                                         *
+ ****************************************************************************************/
+
+#ifndef __OPENSPACE_MODULE_BASE___RENDERABLENODEARROW___H__
+#define __OPENSPACE_MODULE_BASE___RENDERABLENODEARROW___H__
+
+#include <openspace/rendering/renderable.h>
+
+#include <openspace/properties/scalar/boolproperty.h>
+#include <openspace/properties/scalar/floatproperty.h>
+#include <openspace/properties/scalar/uintproperty.h>
+#include <openspace/properties/vector/vec3property.h>
+#include <ghoul/opengl/ghoul_gl.h>
+#include <ghoul/glm.h>
+
+namespace ghoul::opengl { class ProgramObject; }
+
+namespace openspace {
+
+namespace documentation { struct Documentation; }
+class Translation;
+
+/**
+ * Generates an arrow shape that points from the start node to the
+ * end node
+ */
+class RenderableNodeArrow : public Renderable {
+public:
+    RenderableNodeArrow(const ghoul::Dictionary& dictionary);
+    ~RenderableNodeArrow() override = default;
+
+    void initializeGL() override;
+    void deinitializeGL() override;
+
+    bool isReady() const override;
+    void render(const RenderData& data, RendererTasks& rendererTask) override;
+
+    static documentation::Documentation Documentation();
+
+private:
+    struct Shading : properties::PropertyOwner {
+        Shading();
+        properties::BoolProperty enabled;
+        properties::FloatProperty ambientIntensity;
+        properties::FloatProperty diffuseIntensity;
+        properties::FloatProperty specularIntensity;
+    };
+
+    void updateShapeTransforms(const RenderData& data);
+
+    Shading _shading;
+
+    ghoul::opengl::ProgramObject* _shaderProgram;
+
+    properties::StringProperty _start;
+    properties::StringProperty _end;
+    properties::Vec3Property _color;
+
+    properties::UIntProperty _segments;
+    properties::BoolProperty _invertArrowDirection;
+
+    properties::FloatProperty _arrowHeadSize;
+    properties::FloatProperty _arrowHeadWidthFactor;
+
+    properties::FloatProperty _offsetDistance;
+    properties::BoolProperty _useRelativeOffset;
+    properties::FloatProperty _length;
+    properties::BoolProperty _useRelativeLength;
+    properties::FloatProperty _width;
+
+    glm::dmat4 _cylinderTranslation = glm::dmat4(1.0);
+    glm::dmat4 _cylinderScale = glm::dmat4(1.0);
+
+    glm::dmat4 _coneTranslation = glm::dmat4(1.0);
+    glm::dmat4 _coneScale = glm::dmat4(1.0);
+
+    glm::dmat4 _pointDirectionRotation = glm::dmat4(1.0);
+};
+
+} // namespace openspace
+
+#endif // __OPENSPACE_MODULE_BASE___RENDERABLENODEARROW___H__
diff --git a/modules/base/rendering/renderableprism.cpp b/modules/base/rendering/renderableprism.cpp
index 308391b9c3..04fe0a22ad 100644
--- a/modules/base/rendering/renderableprism.cpp
+++ b/modules/base/rendering/renderableprism.cpp
@@ -27,6 +27,7 @@
 #include <openspace/documentation/documentation.h>
 #include <openspace/documentation/verifier.h>
 #include <openspace/engine/globals.h>
+#include <openspace/rendering/helper.h>
 #include <openspace/rendering/renderengine.h>
 #include <openspace/util/updatestructures.h>
 #include <ghoul/filesystem/filesystem.h>
@@ -98,20 +99,6 @@ namespace {
         openspace::properties::Property::Visibility::User
     };
 
-    // Generate vertices around the unit circle on the XY-plane
-    std::vector<float> unitCircleVertices(int sectorCount) {
-        std::vector<float> vertices;
-        vertices.reserve(2 * sectorCount);
-        float sectorStep = glm::two_pi<float>() / sectorCount;
-
-        for (int i = 0; i < sectorCount; ++i) {
-            float sectorAngle = i * sectorStep;
-            vertices.push_back(cos(sectorAngle)); // x
-            vertices.push_back(sin(sectorAngle)); // y
-        }
-        return vertices;
-    }
-
     struct [[codegen::Dictionary(RenderablePrism)]] Parameters {
         // [[codegen::verbatim(SegmentsInfo.description)]]
         int segments;
@@ -236,17 +223,16 @@ void RenderablePrism::updateVertexData() {
     _vertexArray.clear();
     _indexArray.clear();
 
+    using namespace rendering::helper;
+
     // Get unit circle vertices on the XY-plane
-    std::vector<float> unitVertices = unitCircleVertices(_nShapeSegments);
-    std::vector<float> unitVerticesLines = unitCircleVertices(_nLines);
+    std::vector<VertexXYZ> unitVertices = createRingXYZ(_nShapeSegments.value(), 1.f);
+    std::vector<VertexXYZ> unitVerticesLines = createRingXYZ(_nLines.value(), 1.f);
 
     // Put base vertices into array
-    for (int j = 0, k = 0;
-        j < _nShapeSegments && k < static_cast<int>(unitVertices.size());
-        ++j, k += 2)
-    {
-        float ux = unitVertices[k];
-        float uy = unitVertices[k + 1];
+    for (int j = 0; j < _nShapeSegments; ++j) {
+        float ux = unitVertices[j].xyz[0];
+        float uy = unitVertices[j].xyz[1];
 
         _vertexArray.push_back(ux * _baseRadius); // x
         _vertexArray.push_back(uy * _baseRadius); // y
@@ -254,12 +240,9 @@ void RenderablePrism::updateVertexData() {
     }
 
     // Put top shape vertices into array
-    for (int j = 0, k = 0;
-        j < _nShapeSegments && k < static_cast<int>(unitVertices.size());
-        ++j, k += 2)
-    {
-        float ux = unitVertices[k];
-        float uy = unitVertices[k + 1];
+    for (int j = 0; j < _nShapeSegments; ++j) {
+        float ux = unitVertices[j].xyz[0];
+        float uy = unitVertices[j].xyz[1];
 
         _vertexArray.push_back(ux * _radius); // x
         _vertexArray.push_back(uy * _radius); // y
@@ -280,12 +263,9 @@ void RenderablePrism::updateVertexData() {
         _vertexArray.push_back(_length);
     }
     else {
-        for (int j = 0, k = 0;
-             j < _nLines && k < static_cast<int>(unitVerticesLines.size());
-             ++j, k += 2)
-        {
-            float ux = unitVerticesLines[k];
-            float uy = unitVerticesLines[k + 1];
+        for (int j = 0; j < _nLines; ++j) {
+            float ux = unitVerticesLines[j].xyz[0];
+            float uy = unitVerticesLines[j].xyz[1];
 
             // Base
             _vertexArray.push_back(ux * _baseRadius); // x
diff --git a/modules/base/shaders/arrow_fs.glsl b/modules/base/shaders/arrow_fs.glsl
new file mode 100644
index 0000000000..036e67ed18
--- /dev/null
+++ b/modules/base/shaders/arrow_fs.glsl
@@ -0,0 +1,75 @@
+/*****************************************************************************************
+ *                                                                                       *
+ * OpenSpace                                                                             *
+ *                                                                                       *
+ * Copyright (c) 2014-2023                                                               *
+ *                                                                                       *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
+ * software and associated documentation files (the "Software"), to deal in the Software *
+ * without restriction, including without limitation the rights to use, copy, modify,    *
+ * merge, publish, distribute, sublicense, and/or sell copies of the Software, and to    *
+ * permit persons to whom the Software is furnished to do so, subject to the following   *
+ * conditions:                                                                           *
+ *                                                                                       *
+ * The above copyright notice and this permission notice shall be included in all copies *
+ * or substantial portions of the Software.                                              *
+ *                                                                                       *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED,   *
+ * INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A         *
+ * PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT    *
+ * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF  *
+ * CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE  *
+ * OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                                         *
+ ****************************************************************************************/
+
+#include "fragment.glsl"
+
+in float vs_depth;
+in vec3 vs_normal;
+in vec4 vs_positionViewSpace;
+
+uniform vec3 color;
+uniform float opacity;
+uniform float ambientIntensity = 0.2;
+uniform float diffuseIntensity = 1.0;
+uniform float specularIntensity = 1.0;
+uniform bool performShading = true;
+
+const vec3 LightColor = vec3(1.0);
+
+Fragment getFragment() {
+  Fragment frag;
+
+  frag.color = vec4(color, opacity);
+
+  // Simple phong shading (same color for diffuse and ambient. White specular)
+  if (performShading) {
+    const vec3 lightDirectionViewSpace = vec3(0.0, 0.0, 1.0);
+    const float lightIntensity = 1.0;
+    const float specularPower = 100.0;
+
+    // Ambient color
+    vec3 shadedColor = ambientIntensity * color;
+
+    // Diffuse
+    vec3 n = normalize(vs_normal);
+    vec3 l = lightDirectionViewSpace;
+    shadedColor += diffuseIntensity * max(dot(n,l), 0.0) * color;
+
+    // Specular
+    vec3 viewDir = normalize(vs_positionViewSpace.xyz);
+    vec3 reflectDir = reflect(l, n);
+    shadedColor +=
+        specularIntensity * pow(max(dot(viewDir,reflectDir), 0), specularPower) * color;
+
+    // Light contribution (one light soruce)
+    shadedColor *= lightIntensity * LightColor;
+
+    frag.color.xyz = shadedColor;
+  }
+
+  frag.depth = vs_depth;
+  frag.gPosition = vs_positionViewSpace;
+  frag.gNormal = vec4(0.0, 0.0, 0.0, 1.0);
+  return frag;
+}
diff --git a/modules/base/shaders/arrow_vs.glsl b/modules/base/shaders/arrow_vs.glsl
new file mode 100644
index 0000000000..919e838d2d
--- /dev/null
+++ b/modules/base/shaders/arrow_vs.glsl
@@ -0,0 +1,47 @@
+/*****************************************************************************************
+ *                                                                                       *
+ * OpenSpace                                                                             *
+ *                                                                                       *
+ * Copyright (c) 2014-2023                                                               *
+ *                                                                                       *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
+ * software and associated documentation files (the "Software"), to deal in the Software *
+ * without restriction, including without limitation the rights to use, copy, modify,    *
+ * merge, publish, distribute, sublicense, and/or sell copies of the Software, and to    *
+ * permit persons to whom the Software is furnished to do so, subject to the following   *
+ * conditions:                                                                           *
+ *                                                                                       *
+ * The above copyright notice and this permission notice shall be included in all copies *
+ * or substantial portions of the Software.                                              *
+ *                                                                                       *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED,   *
+ * INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A         *
+ * PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT    *
+ * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF  *
+ * CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE  *
+ * OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                                         *
+ ****************************************************************************************/
+
+#version __CONTEXT__
+
+layout(location = 0) in vec3 in_position;
+layout(location = 1) in vec3 in_normal;
+
+out float vs_depth;
+out vec3 vs_normal;
+out vec4 vs_positionViewSpace;
+
+uniform mat4 modelViewTransform;
+uniform mat4 projectionTransform;
+uniform mat3 normalTransform;
+
+void main() {
+  vs_positionViewSpace = vec4(modelViewTransform * dvec4(in_position, 1));
+  vec4 positionScreenSpace = projectionTransform * vs_positionViewSpace;
+  vs_depth = positionScreenSpace.w;
+  vs_normal = normalize(normalTransform * in_normal);
+  gl_Position  = positionScreenSpace;
+
+  // Set z to 0 to disable near and far plane, unique handling for perspective in space
+  gl_Position.z = 0.f;
+}
diff --git a/src/rendering/helper.cpp b/src/rendering/helper.cpp
index 8184c7b605..28d9080b50 100644
--- a/src/rendering/helper.cpp
+++ b/src/rendering/helper.cpp
@@ -33,6 +33,7 @@
 #include <ghoul/opengl/ghoul_gl.h>
 #include <ghoul/opengl/texture.h>
 #include <ghoul/opengl/textureunit.h>
+#include <glm/gtx/closest_point.hpp>
 #include <algorithm>
 #include <filesystem>
 #include <fstream>
@@ -246,10 +247,11 @@ void initialize() {
         reinterpret_cast<GLvoid*>(offsetof(VertexXYUVRGBA, rgba)));
     glBindVertexArray(0);
 
+
     //
     // Sphere vertex array object
     //
-    std::pair<std::vector<Vertex>, std::vector<GLushort>> sphereData = createSphere(
+    VertexIndexListCombo<Vertex> sphereData = createSphere(
         64, glm::vec3(1.f, 1.f, 1.f), glm::vec4(1.f, 1.f, 1.f, 1.f)
     );
 
@@ -261,16 +263,16 @@ void initialize() {
     glBindBuffer(GL_ARRAY_BUFFER, vertexObjects.sphere.vbo);
     glBufferData(
         GL_ARRAY_BUFFER,
-        sphereData.first.size() * sizeof(Vertex),
-        sphereData.first.data(),
+        sphereData.vertices.size() * sizeof(Vertex),
+        sphereData.vertices.data(),
         GL_STATIC_DRAW
     );
 
     glBindBuffer(GL_ELEMENT_ARRAY_BUFFER, vertexObjects.sphere.ibo);
     glBufferData(
         GL_ELEMENT_ARRAY_BUFFER,
-        sphereData.second.size() * sizeof(GLushort),
-        sphereData.second.data(),
+        sphereData.indices.size() * sizeof(GLushort),
+        sphereData.indices.data(),
         GL_STATIC_DRAW
     );
     glEnableVertexAttribArray(0);
@@ -282,7 +284,75 @@ void initialize() {
     glVertexAttribPointer(2, 4, GL_FLOAT, GL_FALSE, sizeof(Vertex),
         reinterpret_cast<GLvoid*>(offsetof(Vertex, rgba)));
     glBindVertexArray(0);
-    vertexObjects.sphere.nElements = static_cast<int>(sphereData.second.size());
+    vertexObjects.sphere.nElements = static_cast<int>(sphereData.indices.size());
+
+
+    //
+    // Cylinder vertex array object
+    //
+    VertexIndexListCombo<VertexXYZNormal> cylinderData = createCylinder(64, 1.f, 1.f);
+
+    glGenVertexArrays(1, &vertexObjects.cylinder.vao);
+    glGenBuffers(1, &vertexObjects.cylinder.vbo);
+    glGenBuffers(1, &vertexObjects.cylinder.ibo);
+
+    glBindVertexArray(vertexObjects.cylinder.vao);
+    glBindBuffer(GL_ARRAY_BUFFER, vertexObjects.cylinder.vbo);
+    glBufferData(
+        GL_ARRAY_BUFFER,
+        cylinderData.vertices.size() * sizeof(VertexXYZNormal),
+        cylinderData.vertices.data(),
+        GL_STATIC_DRAW
+    );
+
+    glBindBuffer(GL_ELEMENT_ARRAY_BUFFER, vertexObjects.cylinder.ibo);
+    glBufferData(
+        GL_ELEMENT_ARRAY_BUFFER,
+        cylinderData.indices.size() * sizeof(GLushort),
+        cylinderData.indices.data(),
+        GL_STATIC_DRAW
+    );
+    glEnableVertexAttribArray(0);
+    glVertexAttribPointer(0, 3, GL_FLOAT, GL_FALSE, sizeof(VertexXYZNormal), nullptr);
+    glEnableVertexAttribArray(1);
+    glVertexAttribPointer(1, 3, GL_FLOAT, GL_FALSE, sizeof(VertexXYZNormal),
+        reinterpret_cast<GLvoid*>(offsetof(VertexXYZNormal, normal)));
+    glBindVertexArray(0);
+    vertexObjects.cylinder.nElements = static_cast<int>(cylinderData.indices.size());
+
+
+    //
+    // Cone vertex array object
+    //
+    VertexIndexListCombo<VertexXYZNormal> coneData = createCone(64, 1.f, 1.f);
+
+    glGenVertexArrays(1, &vertexObjects.cone.vao);
+    glGenBuffers(1, &vertexObjects.cone.vbo);
+    glGenBuffers(1, &vertexObjects.cone.ibo);
+
+    glBindVertexArray(vertexObjects.cone.vao);
+    glBindBuffer(GL_ARRAY_BUFFER, vertexObjects.cone.vbo);
+    glBufferData(
+        GL_ARRAY_BUFFER,
+        coneData.vertices.size() * sizeof(VertexXYZNormal),
+        coneData.vertices.data(),
+        GL_STATIC_DRAW
+    );
+
+    glBindBuffer(GL_ELEMENT_ARRAY_BUFFER, vertexObjects.cone.ibo);
+    glBufferData(
+        GL_ELEMENT_ARRAY_BUFFER,
+        coneData.indices.size() * sizeof(GLushort),
+        coneData.indices.data(),
+        GL_STATIC_DRAW
+    );
+    glEnableVertexAttribArray(0);
+    glVertexAttribPointer(0, 3, GL_FLOAT, GL_FALSE, sizeof(VertexXYZNormal), nullptr);
+    glEnableVertexAttribArray(1);
+    glVertexAttribPointer(1, 3, GL_FLOAT, GL_FALSE, sizeof(VertexXYZNormal),
+        reinterpret_cast<GLvoid*>(offsetof(VertexXYZNormal, normal)));
+    glBindVertexArray(0);
+    vertexObjects.cone.nElements = static_cast<int>(coneData.indices.size());
 
 
     //
@@ -320,6 +390,14 @@ void deinitialize() {
     glDeleteBuffers(1, &vertexObjects.sphere.vbo);
     glDeleteBuffers(1, &vertexObjects.sphere.ibo);
 
+    glDeleteVertexArrays(1, &vertexObjects.cylinder.vao);
+    glDeleteBuffers(1, &vertexObjects.cylinder.vbo);
+    glDeleteBuffers(1, &vertexObjects.cylinder.ibo);
+
+    glDeleteVertexArrays(1, &vertexObjects.cone.vao);
+    glDeleteBuffers(1, &vertexObjects.cone.vbo);
+    glDeleteBuffers(1, &vertexObjects.cone.ibo);
+
     glDeleteVertexArrays(1, &vertexObjects.empty.vao);
 
     isInitialized = false;
@@ -423,32 +501,48 @@ std::vector<VertexXYZ> convert(std::vector<Vertex> v) {
     return result;
 }
 
+Vertex computeCircleVertex(int i, int nSegments, float radius,
+                           glm::vec4 color = glm::vec4(1.f))
+{
+    const float fsegments = static_cast<float>(nSegments);
+
+    const float fi = static_cast<float>(i);
+
+    const float theta = fi * glm::two_pi<float>() / fsegments;  // 0 -> 2*PI
+
+    const float x = radius * std::cos(theta);
+    const float y = radius * std::sin(theta);
+    const float z = 0.f;
+
+    const float u = std::cos(theta);
+    const float v = std::sin(theta);
+
+    return { x, y, z, u, v, color.r, color.g, color.b, color.a };
+}
+
 std::vector<Vertex> createRing(int nSegments, float radius, glm::vec4 colors) {
     const int nVertices = nSegments + 1;
     std::vector<Vertex> vertices(nVertices);
 
-    const float fsegments = static_cast<float>(nSegments);
-
     for (int i = 0; i <= nSegments; ++i) {
-        const float fi = static_cast<float>(i);
-
-        const float theta = fi * glm::pi<float>() * 2.f / fsegments;  // 0 -> 2*PI
-
-        const float x = radius * std::cos(theta);
-        const float y = radius * std::sin(theta);
-        const float z = 0.f;
-
-        const float u = std::cos(theta);
-        const float v = std::sin(theta);
-
-        vertices[i] = { x, y, z, u, v, colors.r, colors.g, colors.b, colors.a };
+        vertices[i] = computeCircleVertex(i, nSegments, radius, colors);
     }
     return vertices;
 }
 
-std::pair<std::vector<Vertex>, std::vector<GLushort>> createSphere(int nSegments,
-                                                                   glm::vec3 radii,
-                                                                   glm::vec4 colors)
+std::vector<VertexXYZ> createRingXYZ(int nSegments, float radius) {
+    const int nVertices = nSegments + 1;
+    std::vector<VertexXYZ> vertices(nVertices);
+
+    for (int i = 0; i <= nSegments; ++i) {
+        Vertex fullVertex = computeCircleVertex(i, nSegments, radius);
+        vertices[i] = { fullVertex.xyz[0], fullVertex.xyz[1], fullVertex.xyz[2] };
+    }
+    return vertices;
+}
+
+VertexIndexListCombo<Vertex> createSphere(int nSegments, glm::vec3 radii,
+                                          glm::vec4 colors)
 {
     std::vector<Vertex> vertices;
     vertices.reserve(nSegments * nSegments);
@@ -505,6 +599,153 @@ std::pair<std::vector<Vertex>, std::vector<GLushort>> createSphere(int nSegments
     return { vertices, indices };
 }
 
+VertexIndexListCombo<VertexXYZNormal> createConicalCylinder(unsigned int nSegments,
+                                                            float bottomRadius,
+                                                            float topRadius,
+                                                            float height)
+{
+    // Create a ring for the top and bottom vertices (XY plane)
+    std::vector<VertexXYZ> bottomVertices = createRingXYZ(nSegments, bottomRadius);
+    std::vector<VertexXYZ> topVertices = createRingXYZ(nSegments, topRadius);
+
+    // Build the 4 rings of vertices (with different normals), that will make up the
+    // shape for the cylinder
+    std::vector<VertexXYZNormal> vertices;
+    vertices.reserve(4 * bottomVertices.size() + 2);
+
+    // Center bottom vertex
+    vertices.push_back({
+        .xyz = { 0.f, 0.f, 0.f },
+        .normal = { 0.f, 0.f, -1.f }
+    });
+
+    std::vector<VertexXYZNormal> verts0;
+    verts0.reserve(bottomVertices.size());
+    std::vector<VertexXYZNormal> verts1;
+    verts1.reserve(bottomVertices.size());
+    std::vector<VertexXYZNormal> verts2;
+    verts2.reserve(bottomVertices.size());
+    std::vector<VertexXYZNormal> verts3;
+    verts3.reserve(bottomVertices.size());
+
+    for (size_t i = 0; i < bottomVertices.size(); i++) {
+        const VertexXYZ& vBot = bottomVertices[i];
+        VertexXYZ& vTop = topVertices[i];
+        vTop.xyz[2] += height;
+
+        glm::vec3 sideNormal;
+        if (std::abs(bottomRadius - topRadius) < std::numeric_limits<float>::epsilon()) {
+            sideNormal = glm::normalize(
+                glm::vec3(vBot.xyz[0], vBot.xyz[1], vBot.xyz[2])
+            );
+        }
+        else {
+            glm::vec3 p = glm::closestPointOnLine(
+                glm::vec3(0.f),
+                glm::vec3(vBot.xyz[0], vBot.xyz[1], vBot.xyz[2]),
+                glm::vec3(vTop.xyz[0], vTop.xyz[1], vTop.xyz[2])
+            );
+            sideNormal = glm::normalize(p);
+        }
+
+        // Ring 0 - vertices of bottom circle, with normals pointing down
+        verts0.push_back({
+            .xyz = { vBot.xyz[0], vBot.xyz[1], vBot.xyz[2] },
+            .normal = { 0.f, 0.f, -1.f }
+        });
+
+        // Ring 1 - bottom vertices of cylider sides with normals pointing outwards
+        verts1.push_back({
+            .xyz = { vBot.xyz[0], vBot.xyz[1], vBot.xyz[2] },
+            .normal = { sideNormal.x, sideNormal.y, sideNormal.z }
+        });
+
+        // Ring 2 - top vertices of cylinder side, normals pointing outwards
+        // Note that only difference between top and bottom is the height added to Z
+        verts2.push_back({
+            .xyz = { vTop.xyz[0], vTop.xyz[1], vTop.xyz[2] },
+            .normal = { sideNormal.x, sideNormal.y, sideNormal.z }
+        });
+
+        // Ring 3 - vertices of top circle, normals pointing up
+        verts3.push_back({
+            .xyz = { vTop.xyz[0], vTop.xyz[1], vTop.xyz[2] },
+            .normal = { 0.f, 0.f, 1.f }
+        });
+    }
+
+    vertices.insert(vertices.end(), verts0.begin(), verts0.end());
+    vertices.insert(vertices.end(), verts1.begin(), verts1.end());
+    vertices.insert(vertices.end(), verts2.begin(), verts2.end());
+    vertices.insert(vertices.end(), verts3.begin(), verts3.end());
+
+    // Center top vertex
+    vertices.push_back({
+        .xyz = { 0.f, 0.f, height },
+        .normal = { 0.f, 0.f, 1.f }
+    });
+
+    // Contruct the index list, based on the above vertex rings
+    std::vector<GLushort> indexArray;
+    indexArray.reserve(4 * 3 * nSegments);
+
+    auto ringVerticeIndex = [&nSegments](unsigned int ringIndex, unsigned int i) {
+        return static_cast<GLushort>(1 + ringIndex * (nSegments + 1) + i);
+    };
+
+    GLushort botCenterIndex = 0;
+    GLushort topCenterIndex = static_cast<GLushort>(vertices.size()) - 1;
+
+    for (unsigned int i = 0; i < nSegments; ++i) {
+        bool isLast = (i == nSegments - 1);
+        GLushort v0, v1, v2, v3;
+
+        // Bottom triangle
+        v0 = ringVerticeIndex(0, i);
+        v1 = ringVerticeIndex(0, isLast ? 0 : i + 1);
+        indexArray.push_back(botCenterIndex);
+        indexArray.push_back(v1);
+        indexArray.push_back(v0);
+
+        // Side of cylinder
+
+        // Bottom ring
+        v0 = ringVerticeIndex(1, i);
+        v1 = ringVerticeIndex(1, isLast ? 0 : i + 1);
+        // Top ring
+        v2 = ringVerticeIndex(2, i);
+        v3 = ringVerticeIndex(2, isLast ? 0 : i + 1);
+        indexArray.push_back(v0);
+        indexArray.push_back(v1);
+        indexArray.push_back(v2);
+
+        indexArray.push_back(v1);
+        indexArray.push_back(v3);
+        indexArray.push_back(v2);
+
+        // Top triangle
+        v0 = ringVerticeIndex(3, i);
+        v1 = ringVerticeIndex(3, isLast ? 0 : i + 1);
+        indexArray.push_back(topCenterIndex);
+        indexArray.push_back(v0);
+        indexArray.push_back(v1);
+    }
+
+    return { vertices, indexArray };
+}
+
+VertexIndexListCombo<VertexXYZNormal> createCylinder(unsigned int nSegments,
+                                                     float radius, float height)
+{
+    return createConicalCylinder(nSegments, radius, radius, height);
+}
+
+VertexIndexListCombo<VertexXYZNormal> createCone(unsigned int nSegments, float radius,
+                                                 float height)
+{
+    return createConicalCylinder(nSegments, radius, 0.f, height);
+}
+
 void LightSourceRenderData::updateBasedOnLightSources(const RenderData& renderData,
                                 const std::vector<std::unique_ptr<LightSource>>& sources)
 {

From 247f48058f79cc2afb0e52d448788811062e56d8 Mon Sep 17 00:00:00 2001
From: Emma Broman <emma.broman@liu.se>
Date: Mon, 11 Sep 2023 15:47:05 +0200
Subject: [PATCH 126/701] Update GUI hash (to get double actions update for PR
 #2872)

---
 data/assets/util/webgui.asset | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/data/assets/util/webgui.asset b/data/assets/util/webgui.asset
index 998debfe36..19902055cd 100644
--- a/data/assets/util/webgui.asset
+++ b/data/assets/util/webgui.asset
@@ -4,7 +4,7 @@ local guiCustomization = asset.require("customization/gui")
 
 
 -- Select which commit hashes to use for the frontend and backend
-local frontendHash = "7ed2de3b136b4712454c944a3838c2171c26605a"
+local frontendHash = "c4fccbef3051522c7b8bcd96aeb20b8126ac2286"
 
 local frontend = asset.syncedResource({
   Identifier = "WebGuiFrontend",

From 80ecc7d7e464b83a65b0e00cfbaced74cedf2578 Mon Sep 17 00:00:00 2001
From: Emma Broman <emma.broman@liu.se>
Date: Mon, 11 Sep 2023 16:14:41 +0200
Subject: [PATCH 127/701] Fix misspelled IsLocal in actions assets

---
 .../solarsystem/missions/apollo/actions.asset |  6 ++--
 .../missions/insight/actions.asset            |  4 +--
 .../missions/newhorizons/actions.asset        | 32 +++++++++----------
 .../missions/osirisrex/actions.asset          | 18 +++++------
 .../missions/perseverance/actions.asset       |  2 +-
 .../solarsystem/missions/rosetta/67p.asset    |  6 ++--
 .../missions/rosetta/actions.asset            |  2 +-
 .../missions/rosetta/rosetta.asset            |  8 ++---
 .../missions/voyager/actions.asset            | 10 +++---
 .../missions/voyager/voyager1.asset           |  2 +-
 .../missions/voyager/voyager2.asset           |  2 +-
 .../solarsystem/planets/earth/earth.asset     |  4 +--
 .../solarsystem/planets/earth/moon/moon.asset |  4 +--
 .../planets/earth/satellites/misc/iss.asset   |  2 +-
 .../solarsystem/telescopes/jwst/actions.asset | 18 +++++------
 15 files changed, 60 insertions(+), 60 deletions(-)

diff --git a/data/assets/scene/solarsystem/missions/apollo/actions.asset b/data/assets/scene/solarsystem/missions/apollo/actions.asset
index fdd6fd0c53..99e3a6830d 100644
--- a/data/assets/scene/solarsystem/missions/apollo/actions.asset
+++ b/data/assets/scene/solarsystem/missions/apollo/actions.asset
@@ -9,7 +9,7 @@ local ToggleMoonShading = {
   ]],
   Documentation = "Toggles the shading of the Moon",
   GuiPath = "/Missions/Apollo",
-  isLocal = false
+  IsLocal = false
 }
 
 local FocusMoon = {
@@ -22,7 +22,7 @@ local FocusMoon = {
   ]],
   Documentation = "Set camera focus on the Moon",
   GuiPath = "/Missions/Apollo",
-  isLocal = false
+  IsLocal = false
 }
 
 local FocusEarth = {
@@ -35,7 +35,7 @@ local FocusEarth = {
   ]],
   Documentation = "Set camera focus on the Earth",
   GuiPath = "/Missions/Apollo",
-  isLocal = false
+  IsLocal = false
 }
 
 
diff --git a/data/assets/scene/solarsystem/missions/insight/actions.asset b/data/assets/scene/solarsystem/missions/insight/actions.asset
index a863a3c8ef..ebb9df1798 100644
--- a/data/assets/scene/solarsystem/missions/insight/actions.asset
+++ b/data/assets/scene/solarsystem/missions/insight/actions.asset
@@ -20,7 +20,7 @@ local Setup = {
   ]],
   Documentation = "Set and goto Insight Landing",
   GuiPath = "/Missions/Insight",
-  isLocal = false
+  IsLocal = false
 }
 
 local DisableLayers = {
@@ -34,7 +34,7 @@ local DisableLayers = {
   ]],
   Documentation = "Disable Mars layer settings used for insight EDL",
   GuiPath = "/Missions/Insight",
-  isLocal = false
+  IsLocal = false
 }
 
 
diff --git a/data/assets/scene/solarsystem/missions/newhorizons/actions.asset b/data/assets/scene/solarsystem/missions/newhorizons/actions.asset
index af6d36c9e4..4b2caea883 100644
--- a/data/assets/scene/solarsystem/missions/newhorizons/actions.asset
+++ b/data/assets/scene/solarsystem/missions/newhorizons/actions.asset
@@ -8,7 +8,7 @@ local FocusNewHorizons = {
   ]],
   Documentation = "Sets the focus of the camera on 'NewHorizons'",
   GuiPath = "/Missions/New Horizons",
-  isLocal = false
+  IsLocal = false
 }
 
 local AimPluto = {
@@ -21,7 +21,7 @@ local AimPluto = {
   ]],
   Documentation = "Anchor at New Horizons, Aim at Pluto",
   GuiPath = "/Missions/New Horizons",
-  isLocal = false
+  IsLocal = false
 }
 
 local FocusPluto = {
@@ -34,7 +34,7 @@ local FocusPluto = {
   ]],
   Documentation = "Sets the focus of the camera on 'Pluto'",
   GuiPath = "/Missions/New Horizons",
-  isLocal = false
+  IsLocal = false
 }
 
 local FocusCharon = {
@@ -47,7 +47,7 @@ local FocusCharon = {
   ]],
   Documentation = "Sets the focus of the camera on 'Charon'",
   GuiPath = "/Missions/New Horizons",
-  isLocal = false
+  IsLocal = false
 }
 
 local ToggleImageProjection = {
@@ -60,7 +60,7 @@ local ToggleImageProjection = {
   ]],
   Documentation = "Toggles New Horizons image projection",
   GuiPath = "/Missions/New Horizons",
-  isLocal = false
+  IsLocal = false
 }
 
 local ClearImageProjections = {
@@ -72,7 +72,7 @@ local ClearImageProjections = {
   ]],
   Documentation = "Removes all image projections from Pluto and Charon",
   GuiPath = "/Missions/New Horizons",
-  isLocal = false
+  IsLocal = false
 }
 
 local Approach = {
@@ -85,7 +85,7 @@ local Approach = {
   ]],
   Documentation = "Jumps to the 14th of July 2015 at 0900 UTC and clears all projections",
   GuiPath = "/Missions/New Horizons",
-  isLocal = false
+  IsLocal = false
 }
 
 local IncreaseHeightmapPluto = {
@@ -99,7 +99,7 @@ local IncreaseHeightmapPluto = {
   ]],
   Documentation = "Increases the height map exaggeration on Pluto",
   GuiPath = "/Missions/New Horizons",
-  isLocal = false
+  IsLocal = false
 }
 
 local DecreaseHeightmapPluto = {
@@ -113,7 +113,7 @@ local DecreaseHeightmapPluto = {
   ]],
   Documentation = "Decreases the height map exaggeration on Pluto",
   GuiPath = "/Missions/New Horizons",
-  isLocal = false
+  IsLocal = false
 }
 
 local IncreaseHeightmapCharon = {
@@ -127,7 +127,7 @@ local IncreaseHeightmapCharon = {
   ]],
   Documentation = "Increases the height map exaggeration on Charon",
   GuiPath = "/Missions/New Horizons",
-  isLocal = false
+  IsLocal = false
 }
 
 local DecreaseHeightmapCharon = {
@@ -141,7 +141,7 @@ local DecreaseHeightmapCharon = {
   ]],
   Documentation = "Decreases the height map exaggeration on Charon",
   GuiPath = "/Missions/New Horizons",
-  isLocal = false
+  IsLocal = false
 }
 
 local TogglePlutoTrail = {
@@ -155,7 +155,7 @@ local TogglePlutoTrail = {
   ]],
   Documentation = "Toggles the visibility of the trail behind Pluto",
   GuiPath = "/Missions/New Horizons",
-  isLocal = false
+  IsLocal = false
 }
 
 local TogglePlutoLabels = {
@@ -189,7 +189,7 @@ local TogglePlutoLabels = {
   ]],
   Documentation = "Toggles the visibility of the text labels of Pluto, Charon, Hydra, Nix, Kerberos, and Styx",
   GuiPath = "/Missions/New Horizons",
-  isLocal = false
+  IsLocal = false
 }
 
 local ToggleNewHorizonsLabels = {
@@ -205,7 +205,7 @@ local ToggleNewHorizonsLabels = {
   ]],
   Documentation = "Toggles the visibility of the labels for the New Horizons instruments",
   GuiPath = "/Missions/New Horizons",
-  isLocal = false
+  IsLocal = false
 }
 
 local ToggleShadows = {
@@ -223,7 +223,7 @@ local ToggleShadows = {
   ]],
   Documentation = "Toggles the visibility of the shadow visualization of Pluto and Charon",
   GuiPath = "/Missions/New Horizons",
-  isLocal = false
+  IsLocal = false
 }
 
 local ToggleNewHorizonsTrail = {
@@ -237,7 +237,7 @@ local ToggleNewHorizonsTrail = {
   ]],
   Documentation = "Toggles the trail of New Horizons",
   GuiPath = "/Missions/New Horizons",
-  isLocal = false
+  IsLocal = false
 }
 
 
diff --git a/data/assets/scene/solarsystem/missions/osirisrex/actions.asset b/data/assets/scene/solarsystem/missions/osirisrex/actions.asset
index dc1889a966..4f03d03e42 100644
--- a/data/assets/scene/solarsystem/missions/osirisrex/actions.asset
+++ b/data/assets/scene/solarsystem/missions/osirisrex/actions.asset
@@ -8,7 +8,7 @@ local FocusOsirisRex = {
   ]],
   Documentation = "Sets the focus of the camera on 'OsirisRex'",
   GuiPath = "/Missions/Osiris Rex",
-  isLocal = false
+  IsLocal = false
 }
 
 local FocusBennu = {
@@ -21,7 +21,7 @@ local FocusBennu = {
   ]],
   Documentation = "Sets the focus of the camera on 'Bennu'",
   GuiPath = "/Missions/Osiris Rex",
-  isLocal = false
+  IsLocal = false
 }
 
 local SetupBennuApproach = {
@@ -33,7 +33,7 @@ local SetupBennuApproach = {
   ]],
   Documentation = "Sets the time to the approach at Bennu",
   GuiPath = "/Missions/Osiris Rex",
-  isLocal = false
+  IsLocal = false
 }
 
 local SetupBennuSurvey = {
@@ -45,7 +45,7 @@ local SetupBennuSurvey = {
   ]],
   Documentation = "Sets the time to the preliminary survey of Bennu",
   GuiPath = "/Missions/Osiris Rex",
-  isLocal = false
+  IsLocal = false
 }
 
 local SetupBennuEventB = {
@@ -57,7 +57,7 @@ local SetupBennuEventB = {
   ]],
   Documentation = "Sets the time to the orbital B event",
   GuiPath = "/Missions/Osiris Rex",
-  isLocal = false
+  IsLocal = false
 }
 
 local SetupBennuReconEvent = {
@@ -69,7 +69,7 @@ local SetupBennuReconEvent = {
   ]],
   Documentation = "Sets the time to the recon event",
   GuiPath = "/Missions/Osiris Rex",
-  isLocal = false
+  IsLocal = false
 }
 
 local ToggleSunMarker = {
@@ -83,7 +83,7 @@ local ToggleSunMarker = {
   ]],
   Documentation = "Toggles the visibility of the text marking the location of the Sun",
   GuiPath = "/Missions/Osiris Rex",
-  isLocal = false
+  IsLocal = false
 }
 
 local AimAtBennu = {
@@ -119,7 +119,7 @@ local SetLaunchTime = {
   ]],
   Documentation = "Look at the launch of OSIRIS-REx",
   GuiPath = "/Missions/Osiris Rex",
-  isLocal = false
+  IsLocal = false
 }
 
 local LookImageCapture = {
@@ -133,7 +133,7 @@ local LookImageCapture = {
   ]],
   Documentation = "Look at the image capture of OSIRIS-REx",
   GuiPath = "/Missions/Osiris Rex",
-  isLocal = false
+  IsLocal = false
 }
 
 asset.onInitialize(function()
diff --git a/data/assets/scene/solarsystem/missions/perseverance/actions.asset b/data/assets/scene/solarsystem/missions/perseverance/actions.asset
index 63ecd648f1..e0b4ec4398 100644
--- a/data/assets/scene/solarsystem/missions/perseverance/actions.asset
+++ b/data/assets/scene/solarsystem/missions/perseverance/actions.asset
@@ -20,7 +20,7 @@ local Setup = {
   ]],
   Documentation = "Sets time and layers for Perseverance landing",
   GuiPath = "/Missions/Perseverance",
-  isLocal = false
+  IsLocal = false
 }
 
 
diff --git a/data/assets/scene/solarsystem/missions/rosetta/67p.asset b/data/assets/scene/solarsystem/missions/rosetta/67p.asset
index 42377f4cfe..131fc2e01b 100644
--- a/data/assets/scene/solarsystem/missions/rosetta/67p.asset
+++ b/data/assets/scene/solarsystem/missions/rosetta/67p.asset
@@ -141,7 +141,7 @@ local Focus67p = {
   ]],
   Documentation = "Sets the focus of the camera on 67P",
   GuiPath = "/Missions/Rosetta",
-  isLocal = false
+  IsLocal = false
 }
 
 local ClearImageProjections = {
@@ -152,7 +152,7 @@ local ClearImageProjections = {
   ]],
   Documentation = "Removes all image projections from 67P",
   GuiPath = "/Missions/Rosetta",
-  isLocal = false
+  IsLocal = false
 }
 
 local Toggle67pProjection = {
@@ -166,7 +166,7 @@ local Toggle67pProjection = {
   ]],
   Documentation = "Enables or disables the image projection on 67P",
   GuiPath = "/Missions/Rosetta",
-  isLocal = false
+  IsLocal = false
 }
 
 
diff --git a/data/assets/scene/solarsystem/missions/rosetta/actions.asset b/data/assets/scene/solarsystem/missions/rosetta/actions.asset
index 48c096def2..62f788b009 100644
--- a/data/assets/scene/solarsystem/missions/rosetta/actions.asset
+++ b/data/assets/scene/solarsystem/missions/rosetta/actions.asset
@@ -9,7 +9,7 @@ local ToggleOuterPlanetaryTrails = {
   ]],
   Documentation = "Toggles the visibility of all trails further from the Sun than 67P",
   GuiPath = "/Missions/Rosetta",
-  isLocal = false
+  IsLocal = false
 }
 
 
diff --git a/data/assets/scene/solarsystem/missions/rosetta/rosetta.asset b/data/assets/scene/solarsystem/missions/rosetta/rosetta.asset
index 1d794f3130..4db204dae8 100644
--- a/data/assets/scene/solarsystem/missions/rosetta/rosetta.asset
+++ b/data/assets/scene/solarsystem/missions/rosetta/rosetta.asset
@@ -278,7 +278,7 @@ local FocusRosetta = {
   ]],
   Documentation = "Sets the focus of the camera on Rosetta",
   GuiPath = "/Missions/Rosetta",
-  isLocal = false
+  IsLocal = false
 }
 
 local SetupLanderRelease = {
@@ -289,7 +289,7 @@ local SetupLanderRelease = {
   ]],
   Documentation = "Jumps to the time when the Philae lander is released",
   GuiPath = "/Missions/Rosetta",
-  isLocal = false
+  IsLocal = false
 }
 
 local ToggleImagePlane = {
@@ -303,7 +303,7 @@ local ToggleImagePlane = {
   ]],
   Documentation = "Toggles the visibility of the free floating image plane",
   GuiPath = "/Missions/Rosetta",
-  isLocal = false
+  IsLocal = false
 }
 
 local TogglePhilaeTrail = {
@@ -317,7 +317,7 @@ local TogglePhilaeTrail = {
   ]],
   Documentation = "Toggles the visibility of Philae's trail",
   GuiPath = "/Missions/Rosetta",
-  isLocal = false
+  IsLocal = false
 }
 
 
diff --git a/data/assets/scene/solarsystem/missions/voyager/actions.asset b/data/assets/scene/solarsystem/missions/voyager/actions.asset
index d8e1a39f4f..7b5b73f8de 100644
--- a/data/assets/scene/solarsystem/missions/voyager/actions.asset
+++ b/data/assets/scene/solarsystem/missions/voyager/actions.asset
@@ -6,7 +6,7 @@ local SetupJupiterApproach = {
   ]],
   Documentation = "Sets the time for Voyager's approach to Jupiter",
   GuiPath = "/Missions/Voyager",
-  isLocal = false
+  IsLocal = false
 }
 
 local SetupSaturnApproach = {
@@ -17,7 +17,7 @@ local SetupSaturnApproach = {
   ]],
   Documentation = "Sets the time for Voyager's approach to Saturn",
   GuiPath = "/Missions/Voyager",
-  isLocal = false
+  IsLocal = false
 }
 
 local JupiterFocus = {
@@ -30,7 +30,7 @@ local JupiterFocus = {
   ]],
   Documentation = "Set the camera focus to Jupiter",
   GuiPath = "/Missions/Voyager",
-  isLocal = false
+  IsLocal = false
 }
 
 local SaturnFocus = {
@@ -43,7 +43,7 @@ local SaturnFocus = {
   ]],
   Documentation = "Sets the camera focus on Saturn",
   GuiPath = "/Missions/Voyager",
-  isLocal = false
+  IsLocal = false
 }
 
 local ToggleMinorMoonTrails = {
@@ -57,7 +57,7 @@ local ToggleMinorMoonTrails = {
   ]],
   Documentation = "Toggles the trails of the minor moons",
   GuiPath = "/Trails",
-  isLocal = false
+  IsLocal = false
 }
 
 
diff --git a/data/assets/scene/solarsystem/missions/voyager/voyager1.asset b/data/assets/scene/solarsystem/missions/voyager/voyager1.asset
index 275c15430d..a028e015e8 100644
--- a/data/assets/scene/solarsystem/missions/voyager/voyager1.asset
+++ b/data/assets/scene/solarsystem/missions/voyager/voyager1.asset
@@ -250,7 +250,7 @@ local FocusVoyager1 = {
   ]],
   Documentation = "Set camera focus to Voyager 1",
   GuiPath = "/Missions/Voyager",
-  isLocal = false
+  IsLocal = false
 }
 
 
diff --git a/data/assets/scene/solarsystem/missions/voyager/voyager2.asset b/data/assets/scene/solarsystem/missions/voyager/voyager2.asset
index 448776f05f..0655d269fa 100644
--- a/data/assets/scene/solarsystem/missions/voyager/voyager2.asset
+++ b/data/assets/scene/solarsystem/missions/voyager/voyager2.asset
@@ -353,7 +353,7 @@ local FocusVoyager2 = {
   ]],
   Documentation = "Set camera focus to Voyager 2",
   GuiPath = "/Missions/Voyager",
-  isLocal = false
+  IsLocal = false
 }
 
 
diff --git a/data/assets/scene/solarsystem/planets/earth/earth.asset b/data/assets/scene/solarsystem/planets/earth/earth.asset
index 2c65e6484d..103382bf2a 100644
--- a/data/assets/scene/solarsystem/planets/earth/earth.asset
+++ b/data/assets/scene/solarsystem/planets/earth/earth.asset
@@ -86,7 +86,7 @@ local FocusEarth = {
   ]],
   Documentation = "Set camera focus on the Earth",
   GuiPath = "/Solar System/Earth",
-  isLocal = false
+  IsLocal = false
 }
 
 local ToggleSatelliteTrails = {
@@ -100,7 +100,7 @@ local ToggleSatelliteTrails = {
   ]],
   Documentation = "Toggle trails on or off for satellites around Earth",
   GuiPath = "/Solar System/Earth",
-  isLocal = false
+  IsLocal = false
 }
 
 
diff --git a/data/assets/scene/solarsystem/planets/earth/moon/moon.asset b/data/assets/scene/solarsystem/planets/earth/moon/moon.asset
index 6d2e79612b..145d109c29 100644
--- a/data/assets/scene/solarsystem/planets/earth/moon/moon.asset
+++ b/data/assets/scene/solarsystem/planets/earth/moon/moon.asset
@@ -94,7 +94,7 @@ local FocusMoon = {
   ]],
   Documentation = "Set camera focus on the Moon",
   GuiPath = "/Solar System/Earth/Moon",
-  isLocal = false
+  IsLocal = false
 }
 
 local ToggleMoonShading = {
@@ -108,7 +108,7 @@ local ToggleMoonShading = {
   ]],
   Documentation = "Toggles the shading of the Moon",
   GuiPath = "/Solar System/Earth/Moon",
-  isLocal = false
+  IsLocal = false
 }
 
 
diff --git a/data/assets/scene/solarsystem/planets/earth/satellites/misc/iss.asset b/data/assets/scene/solarsystem/planets/earth/satellites/misc/iss.asset
index a775c89188..e113c31ed8 100644
--- a/data/assets/scene/solarsystem/planets/earth/satellites/misc/iss.asset
+++ b/data/assets/scene/solarsystem/planets/earth/satellites/misc/iss.asset
@@ -130,7 +130,7 @@ local FocusIss = {
   ]],
   Documentation = "Refocuses the camera on the ISS",
   GuiPath = "/Solar System/Earth",
-  isLocal = false
+  IsLocal = false
 }
 
 
diff --git a/data/assets/scene/solarsystem/telescopes/jwst/actions.asset b/data/assets/scene/solarsystem/telescopes/jwst/actions.asset
index d14c028896..5cbec1b0c3 100644
--- a/data/assets/scene/solarsystem/telescopes/jwst/actions.asset
+++ b/data/assets/scene/solarsystem/telescopes/jwst/actions.asset
@@ -9,7 +9,7 @@ local ToggleLagrangianPoints = {
   ]],
   Documentation = "Toggle points and labels for the Lagrangian points for Earth Sun system",
   GuiPath = "/JWST",
-  isLocal = false
+  IsLocal = false
 }
 
 local ToggleHudf = {
@@ -23,7 +23,7 @@ local ToggleHudf = {
   ]],
   Documentation = "Toggle Hubble Ultra Deep Field image and line towards its coordinate",
   GuiPath = "/JWST",
-  isLocal = false
+  IsLocal = false
 }
 
 local ToggleL2 = {
@@ -37,7 +37,7 @@ local ToggleL2 = {
   ]],
   Documentation = "Toggle L2 label, point and line",
   GuiPath = "/JWST",
-  isLocal = false
+  IsLocal = false
 }
 
 local ToggleFov = {
@@ -51,7 +51,7 @@ local ToggleFov = {
   ]],
   Documentation = "Toggle James Webb Space Telecope field of view and view band",
   GuiPath = "/JWST",
-  isLocal = false
+  IsLocal = false
 }
 
 local SetupLaunch = {
@@ -63,7 +63,7 @@ local SetupLaunch = {
   ]],
   Documentation = "Set the time to the launch time of JWST",
   GuiPath = "/JWST",
-  isLocal = false
+  IsLocal = false
 }
 
 local SetupDetach = {
@@ -75,7 +75,7 @@ local SetupDetach = {
   ]],
   Documentation = "Set the time to the detach time of JWST",
   GuiPath = "/JWST",
-  isLocal = false
+  IsLocal = false
 }
 
 local ToggleSunTrail = {
@@ -87,7 +87,7 @@ local ToggleSunTrail = {
   ]],
   Documentation = "Toggle JWST trail relative to the Sun",
   GuiPath = "/JWST",
-  isLocal = false
+  IsLocal = false
 }
 
 local ToggleTrailsExceptMoon = {
@@ -106,7 +106,7 @@ local ToggleTrailsExceptMoon = {
   ]],
   Documentation = "Toggle all planet and moon trails, except the Moon",
   GuiPath = "/JWST",
-  isLocal = false
+  IsLocal = false
 }
 
 local ToggleJwstTrails = {
@@ -124,7 +124,7 @@ local ToggleJwstTrails = {
   ]],
   Documentation = "Toggle JWST launch, cruise and L2 co-revolving orbit trails, not the Sun trail",
   GuiPath = "/JWST",
-  isLocal = false
+  IsLocal = false
 }
 
 

From e763aeeba95afcc9efb63b1003f48c536b72d174 Mon Sep 17 00:00:00 2001
From: Alexander Bock <mail@alexanderbock.eu>
Date: Mon, 11 Sep 2023 20:09:37 +0200
Subject: [PATCH 128/701] Global pass over all actions to make most of them not
 local

---
 data/assets/actions/planets/mars_layers.asset        | 12 ++++++------
 .../actions/planets/scale_planets_and_moons.asset    |  4 ++--
 data/assets/actions/system/undo_event_fades.asset    |  4 ++--
 .../actions/trails/on_off_all_minor_moons.asset      |  4 ++--
 .../trails/toggle_all_dwarf_planet_trails.asset      |  2 +-
 .../trails/toggle_all_minor_moon_trails.asset        |  2 +-
 data/assets/actions/trails/toggle_all_trails.asset   |  6 +++---
 data/assets/actions/trails/toggle_trail.asset        |  6 +++---
 .../actions/trails/toggle_trails_planets_moons.asset |  6 +++---
 data/assets/actions/trails/trail_appearance.asset    | 10 +++++-----
 data/assets/default_keybindings.asset                |  6 +++---
 .../solarsystem/missions/apollo/insignias_map.asset  |  4 ++--
 .../solarsystem/missions/artemis/toggle_trail.asset  |  2 +-
 .../solarsystem/planets/jupiter/major_moons.asset    |  4 ++--
 .../solarsystem/planets/jupiter/minor_moons.asset    |  4 ++--
 .../solarsystem/planets/neptune/major_moons.asset    |  4 ++--
 .../solarsystem/planets/neptune/minor_moons.asset    |  4 ++--
 .../solarsystem/planets/saturn/major_moons.asset     |  4 ++--
 .../solarsystem/planets/saturn/minor_moons.asset     |  4 ++--
 .../solarsystem/planets/uranus/major_moons.asset     |  4 ++--
 .../solarsystem/planets/uranus/minor_moons.asset     |  4 ++--
 .../solarsystem/telescopes/jwst/point_jwst.asset     |  2 +-
 .../solarsystem/telescopes/jwst/toggle_trail.asset   |  2 +-
 23 files changed, 52 insertions(+), 52 deletions(-)

diff --git a/data/assets/actions/planets/mars_layers.asset b/data/assets/actions/planets/mars_layers.asset
index 554de5adee..303cf927ec 100644
--- a/data/assets/actions/planets/mars_layers.asset
+++ b/data/assets/actions/planets/mars_layers.asset
@@ -7,7 +7,7 @@ openspace.setPropertyValueSingle("Scene.Mars.Renderable.Layers.ColorLayers.CTX_b
 openspace.setPropertyValueSingle("Scene.Mars.Renderable.Layers.ColorLayers.CTX_blended_01.Settings.Opacity", 1.0, 2.0)]],
   Documentation = "Enables and fades in CTX layer for Mars",
   GuiPath = "/Solar System/Mars",
-  IsLocal = true
+  IsLocal = false
 }
 
 local CTXFadeOut = {
@@ -16,7 +16,7 @@ local CTXFadeOut = {
   Command = [[openspace.setPropertyValueSingle("Scene.Mars.Renderable.Layers.ColorLayers.CTX_blended_01.Settings.Opacity", 0.0, 2.0)]],
   Documentation = "Fade out CTX",
   GuiPath = "/Solar System/Mars",
-  IsLocal = true
+  IsLocal = false
 }
 
 local HiriseFadeIn = {
@@ -28,7 +28,7 @@ openspace.setPropertyValueSingle("Scene.Mars.Renderable.Layers.ColorLayers.HiRIS
 openspace.setPropertyValueSingle("Scene.Mars.Renderable.Layers.ColorLayers.HiRISE-PSP.Settings.Opacity", 1.0, 2.0)]],
   Documentation = "Enables and fades in HiRise layer for Mars",
   GuiPath = "/Solar System/Mars",
-  IsLocal = true
+  IsLocal = false
 }
 
 local HiriseFadeOut = {
@@ -37,7 +37,7 @@ local HiriseFadeOut = {
   Command = [[openspace.setPropertyValueSingle("Scene.Mars.Renderable.Layers.ColorLayers.HiRISE-PSP.Settings.Opacity", 0.0, 2.0)]],
   Documentation = "Fade out HiRISE layer for Mars",
   GuiPath = "/Solar System/Mars",
-  IsLocal = true
+  IsLocal = false
 }
 
 local LocalSetHiriseFadeIn = {
@@ -50,7 +50,7 @@ openspace.setPropertyValueSingle("Scene.Mars.Renderable.Layers.ColorLayers.HiRIS
 openspace.setPropertyValueSingle("Scene.Mars.Renderable.Layers.ColorLayers.HiRISE-LS.Settings.Opacity", 1.0, 2.0)]],
   Documentation = "Enables and fades in HiRise local set layers for Mars (including height)",
   GuiPath = "/Solar System/Mars",
-  IsLocal = true
+  IsLocal = false
 }
 
 local LocalSetHiriseFadeOut = {
@@ -62,7 +62,7 @@ openspace.setPropertyValueSingle("Scene.Mars.Renderable.Layers.HeightLayers.HiRI
 ]],
   Documentation = "Fade out HiRISE local set layer for Mars",
   GuiPath = "/Solar System/Mars",
-  IsLocal = true
+  IsLocal = false
 }
 
 
diff --git a/data/assets/actions/planets/scale_planets_and_moons.asset b/data/assets/actions/planets/scale_planets_and_moons.asset
index 7db5f9c182..e5f5ac9ccd 100644
--- a/data/assets/actions/planets/scale_planets_and_moons.asset
+++ b/data/assets/actions/planets/scale_planets_and_moons.asset
@@ -20,7 +20,7 @@ local function scaleAction(identifier, scale, name, speed)
     Command = scaleCommand(identifier, scale, speed),
     Documentation = "Scales " .. name .. " to " .. scale .. "x",
     GuiPath = "/Solar System/Scale",
-    IsLocal = true
+    IsLocal = false
   }
 end
 
@@ -45,7 +45,7 @@ end
 ]],
     GuiPath = "/Solar System/Scale",
     Documentation = "Toggle the scale of " .. name,
-    IsLocal = true
+    IsLocal = false
   }
 end
 
diff --git a/data/assets/actions/system/undo_event_fades.asset b/data/assets/actions/system/undo_event_fades.asset
index 12ee3bb00e..4ce4ca7dbe 100644
--- a/data/assets/actions/system/undo_event_fades.asset
+++ b/data/assets/actions/system/undo_event_fades.asset
@@ -4,10 +4,10 @@ local UndoEventFade = {
   Command = [[
     openspace.setPropertyValue("Scene.*.Renderable.Fade", 1.0, 0.5)
   ]],
-  Documentation = [[Sets the 'Fade' value of all renderables to 1. This internval values
+  Documentation = [[Sets the 'Fade' value of all renderables to 1. This internal values
     is managed by events]],
   GuiPath = "/System/Rendering",
-  IsLocal = true
+  IsLocal = false
 }
 
 
diff --git a/data/assets/actions/trails/on_off_all_minor_moons.asset b/data/assets/actions/trails/on_off_all_minor_moons.asset
index e0441c6ac4..6fa79297e3 100644
--- a/data/assets/actions/trails/on_off_all_minor_moons.asset
+++ b/data/assets/actions/trails/on_off_all_minor_moons.asset
@@ -20,7 +20,7 @@ local MinorMoonsOn = {
   ]],
   Documentation = "Turn ON minor moons and their trails for all planets in the solar system",
   GuiPath = "/Solar System/Minor Moons",
-  IsLocal = true
+  IsLocal = false
 }
 
 local MinorMoonsOff = {
@@ -55,7 +55,7 @@ local MinorMoonsOff = {
   ]],
   Documentation = "Turn OFF minor moons and their trails for all planets in the solar system",
   GuiPath = "/Solar System/Minor Moons",
-  IsLocal = true
+  IsLocal = false
 }
 
 
diff --git a/data/assets/actions/trails/toggle_all_dwarf_planet_trails.asset b/data/assets/actions/trails/toggle_all_dwarf_planet_trails.asset
index d57b55886c..7813bc2adb 100644
--- a/data/assets/actions/trails/toggle_all_dwarf_planet_trails.asset
+++ b/data/assets/actions/trails/toggle_all_dwarf_planet_trails.asset
@@ -9,7 +9,7 @@ local ToggleDwarfPlanetTrails = {
   ]],
   Documentation = "Toggle on/off trails for all dwarf planets in the solar system",
   GuiPath = "/Trails",
-  IsLocal = true
+  IsLocal = false
 }
 
 
diff --git a/data/assets/actions/trails/toggle_all_minor_moon_trails.asset b/data/assets/actions/trails/toggle_all_minor_moon_trails.asset
index d86ff3c470..f587747417 100644
--- a/data/assets/actions/trails/toggle_all_minor_moon_trails.asset
+++ b/data/assets/actions/trails/toggle_all_minor_moon_trails.asset
@@ -9,7 +9,7 @@ local ToggleMinorMoonTrails = {
   ]],
   Documentation = "Toggle on/off minor moon trails for all planets in the solar system",
   GuiPath = "/Trails",
-  IsLocal = true
+  IsLocal = false
 }
 
 
diff --git a/data/assets/actions/trails/toggle_all_trails.asset b/data/assets/actions/trails/toggle_all_trails.asset
index 22bc7fdb68..9e129e055a 100644
--- a/data/assets/actions/trails/toggle_all_trails.asset
+++ b/data/assets/actions/trails/toggle_all_trails.asset
@@ -13,7 +13,7 @@ local FadeUpTrails = {
   ]],
   Documentation = "Fade up all enabled trails in the Scene",
   GuiPath = "/Trails",
-  IsLocal = true
+  IsLocal = false
 }
 
 local FadeDownTrails = {
@@ -31,7 +31,7 @@ local FadeDownTrails = {
   ]],
   Documentation = "Fade down all enabled trails in the Scene",
   GuiPath = "/Trails",
-  IsLocal = true
+  IsLocal = false
 }
 
 local ToggleTrails = {
@@ -60,7 +60,7 @@ local ToggleTrails = {
   ]],
   Documentation = "Toggle fade for all trails in the Scene",
   GuiPath = "/Trails",
-  IsLocal = true
+  IsLocal = false
 }
 
 
diff --git a/data/assets/actions/trails/toggle_trail.asset b/data/assets/actions/trails/toggle_trail.asset
index 1acd99a14c..270520cac4 100644
--- a/data/assets/actions/trails/toggle_trail.asset
+++ b/data/assets/actions/trails/toggle_trail.asset
@@ -42,7 +42,7 @@ local ToggleTrail = {
     This action takes optional arguments to 1) determine which trail to hide (as the
     'Node') and 2) the transition direction (as 'After' and 'Before')]],
   GuiPath = "/Trails",
-  IsLocal = true
+  IsLocal = false
 }
 
 local HideTrail = {
@@ -66,7 +66,7 @@ local HideTrail = {
     optional argument to determine whose trail to hide. If no argument is provided, the
     current focus node is used instead]],
   GuiPath = "/Trails",
-  IsLocal = true
+  IsLocal = false
 }
 
 local ShowTrail = {
@@ -90,7 +90,7 @@ local ShowTrail = {
     optional argument to determine whose trail to hide. If no argument is provided, the
     current focus node is used instead]],
   GuiPath = "/Trails",
-  IsLocal = true
+  IsLocal = false
 }
 
 
diff --git a/data/assets/actions/trails/toggle_trails_planets_moons.asset b/data/assets/actions/trails/toggle_trails_planets_moons.asset
index 7792fdbeb4..0a65d1618c 100644
--- a/data/assets/actions/trails/toggle_trails_planets_moons.asset
+++ b/data/assets/actions/trails/toggle_trails_planets_moons.asset
@@ -7,7 +7,7 @@ local FadeUpTrails = {
   ]],
   Documentation = "Fade up all planet and moon trails in the Scene",
   GuiPath = "/Trails",
-  IsLocal = true
+  IsLocal = false
 }
 
 local FadeDownTrails = {
@@ -19,7 +19,7 @@ local FadeDownTrails = {
   ]],
   Documentation = "Fade down all planet and moon trails in the Scene",
   GuiPath = "/Trails",
-  IsLocal = true
+  IsLocal = false
 }
 
 local ToggleTrails = {
@@ -48,7 +48,7 @@ local ToggleTrails = {
   ]],
   Documentation = "Toggle fade for planet and moon trails in the Scene",
   GuiPath = "/Trails",
-  IsLocal = true
+  IsLocal = false
 }
 
 
diff --git a/data/assets/actions/trails/trail_appearance.asset b/data/assets/actions/trails/trail_appearance.asset
index 4c7cf6fabe..e28538be30 100644
--- a/data/assets/actions/trails/trail_appearance.asset
+++ b/data/assets/actions/trails/trail_appearance.asset
@@ -20,7 +20,7 @@ local function highlightAction(identifierString, value, nameString)
     Command = highlightCommand(identifierString, value),
     Documentation = "Animates the trail fade of " .. nameString .. "'s Trail",
     GuiPath = "/Trails/Appearance",
-    IsLocal = true
+    IsLocal = false
   }
 end
 
@@ -43,7 +43,7 @@ else
 end]],
     Documentation = "Animates the trail fade of " .. nameString .. "'s trail",
     GuiPath = "/Trails/Appearance",
-    IsLocal = true
+    IsLocal = false
   }
 end
 
@@ -57,7 +57,7 @@ local EnableTrailFading = {
   ]],
   Documentation = "Set orbits to fade out towards the end",
   GuiPath = "/Trails/Appearance",
-  IsLocal = true
+  IsLocal = false
 }
 
 local DisableTrailFading = {
@@ -69,7 +69,7 @@ local DisableTrailFading = {
   ]],
   Documentation = "Sets trails not to fade out torwards end",
   GuiPath = "/Trails/Appearance",
-  IsLocal = true
+  IsLocal = false
 }
 
 local ToggleTrailFading = {
@@ -95,7 +95,7 @@ local ToggleTrailFading = {
   ]],
   Documentation = "Toggle trails to fade out towards the end for all trails in the Scene",
   GuiPath = "/Trails/Appearance",
-  IsLocal = true
+  IsLocal = false
 }
 
 local HighlightEarthTrail = highlightAction("Scene.EarthTrail", 10, "Earth")
diff --git a/data/assets/default_keybindings.asset b/data/assets/default_keybindings.asset
index 06883e32b3..2b207fa0c1 100644
--- a/data/assets/default_keybindings.asset
+++ b/data/assets/default_keybindings.asset
@@ -53,7 +53,7 @@ local ToggleRotationFriction = {
   Command = propertyHelper.invert("NavigationHandler.OrbitalNavigator.Friction.RotationalFriction"),
   Documentation = "Toggles the rotational friction of the camera. If it is disabled, the camera rotates around the focus object indefinitely",
   GuiPath = "/Navigation",
-  IsLocal = false
+  IsLocal = true
 }
 
 local ToggleZoomFriction = {
@@ -62,7 +62,7 @@ local ToggleZoomFriction = {
   Command = propertyHelper.invert("NavigationHandler.OrbitalNavigator.Friction.ZoomFriction"),
   Documentation = "Toggles the zoom friction of the camera. If it is disabled, the camera rises up from or closes in towards the focus object indefinitely",
   GuiPath = "/Navigation",
-  IsLocal = false
+  IsLocal = true
 }
 
 local ToggleRollFriction = {
@@ -71,7 +71,7 @@ local ToggleRollFriction = {
   Command = propertyHelper.invert("NavigationHandler.OrbitalNavigator.Friction.RollFriction"),
   Documentation = "Toggles the roll friction of the camera. If it is disabled, the camera rolls around its own axis indefinitely",
   GuiPath = "/Navigation",
-  IsLocal = false
+  IsLocal = true
 }
 
 local FadeToBlack = {
diff --git a/data/assets/scene/solarsystem/missions/apollo/insignias_map.asset b/data/assets/scene/solarsystem/missions/apollo/insignias_map.asset
index e00120ffa5..0a3c9d7eb3 100644
--- a/data/assets/scene/solarsystem/missions/apollo/insignias_map.asset
+++ b/data/assets/scene/solarsystem/missions/apollo/insignias_map.asset
@@ -182,7 +182,7 @@ local ShowInsignias = {
   Command = [[openspace.setPropertyValue("Scene.Apollo*Insignia.Renderable.Opacity", 1, 0.5)]],
   Documentation = "Show patches of the Apollo missions on their respective landing sites",
   GuiPath = "/Missions/Apollo",
-  IsLocal = true
+  IsLocal = false
 }
 
 local HideInsignias = {
@@ -191,7 +191,7 @@ local HideInsignias = {
   Command = [[openspace.setPropertyValue("Scene.Apollo*Insignia.Renderable.Opacity", 0, 0.5)]],
   Documentation = "Hide patches of the Apollo missions on their respective landing sites",
   GuiPath = "/Missions/Apollo",
-  IsLocal = true
+  IsLocal = false
 }
 
 asset.onInitialize(function()
diff --git a/data/assets/scene/solarsystem/missions/artemis/toggle_trail.asset b/data/assets/scene/solarsystem/missions/artemis/toggle_trail.asset
index b8f15cf8cc..bcb6a13ad7 100644
--- a/data/assets/scene/solarsystem/missions/artemis/toggle_trail.asset
+++ b/data/assets/scene/solarsystem/missions/artemis/toggle_trail.asset
@@ -46,7 +46,7 @@ local ToggleTrail = {
     node is currently in focus and only hide Artemis trails if it is in focus (as the
     'Node') and 2) the transition direction (as 'Approaching' or 'Exiting')]],
   GuiPath = "/Artemis/Events",
-  IsLocal = true
+  IsLocal = false
 }
 
 
diff --git a/data/assets/scene/solarsystem/planets/jupiter/major_moons.asset b/data/assets/scene/solarsystem/planets/jupiter/major_moons.asset
index e0eb196004..98dccf15d3 100644
--- a/data/assets/scene/solarsystem/planets/jupiter/major_moons.asset
+++ b/data/assets/scene/solarsystem/planets/jupiter/major_moons.asset
@@ -27,7 +27,7 @@ local JupiterMajorMoonsOn = {
   ]],
   Documentation = "Turn ON Jupiter's major moons and their trails",
   GuiPath = "/Solar System/Jupiter",
-  IsLocal = true
+  IsLocal = false
 }
 
 local JupiterMajorMoonsOff = {
@@ -62,7 +62,7 @@ local JupiterMajorMoonsOff = {
   ]],
   Documentation = "Turn OFF Jupiter's major moons and their trails",
   GuiPath = "/Solar System/Jupiter",
-  IsLocal = true
+  IsLocal = false
 }
 
 
diff --git a/data/assets/scene/solarsystem/planets/jupiter/minor_moons.asset b/data/assets/scene/solarsystem/planets/jupiter/minor_moons.asset
index 67292c4586..c071959616 100644
--- a/data/assets/scene/solarsystem/planets/jupiter/minor_moons.asset
+++ b/data/assets/scene/solarsystem/planets/jupiter/minor_moons.asset
@@ -31,7 +31,7 @@ local JupiterMinorMoonsOn = {
   ]],
   Documentation = "Turn ON Jupiter's minor moons and their trails",
   GuiPath = "/Solar System/Jupiter",
-  IsLocal = true
+  IsLocal = false
 }
 
 local JupiterMinorMoonsOff = {
@@ -66,7 +66,7 @@ local JupiterMinorMoonsOff = {
   ]],
   Documentation = "Turn OFF Jupiter's minor moons and their trails",
   GuiPath = "/Solar System/Jupiter",
-  IsLocal = true
+  IsLocal = false
 }
 
 
diff --git a/data/assets/scene/solarsystem/planets/neptune/major_moons.asset b/data/assets/scene/solarsystem/planets/neptune/major_moons.asset
index d8040bb25b..190dd64267 100644
--- a/data/assets/scene/solarsystem/planets/neptune/major_moons.asset
+++ b/data/assets/scene/solarsystem/planets/neptune/major_moons.asset
@@ -26,7 +26,7 @@ local NeptuneMajorMoonsOn = {
   ]],
   Documentation = "Turn ON Neptune's major moons and their trails",
   GuiPath = "/Solar System/Neptune",
-  IsLocal = true
+  IsLocal = false
 }
 
 local NeptuneMajorMoonsOff = {
@@ -61,7 +61,7 @@ local NeptuneMajorMoonsOff = {
   ]],
   Documentation = "Turn OFF Neptune's major moons and their trails",
   GuiPath = "/Solar System/Neptune",
-  IsLocal = true
+  IsLocal = false
 }
 
 
diff --git a/data/assets/scene/solarsystem/planets/neptune/minor_moons.asset b/data/assets/scene/solarsystem/planets/neptune/minor_moons.asset
index e30c04a6a1..c4c1511261 100644
--- a/data/assets/scene/solarsystem/planets/neptune/minor_moons.asset
+++ b/data/assets/scene/solarsystem/planets/neptune/minor_moons.asset
@@ -25,7 +25,7 @@ local NeptuneMinorMoonsOn = {
   ]],
   Documentation = "Turn ON Neptune's minor moons and their trails",
   GuiPath = "/Solar System/Neptune",
-  IsLocal = true
+  IsLocal = false
 }
 
 local NeptuneMinorMoonsOff = {
@@ -60,7 +60,7 @@ local NeptuneMinorMoonsOff = {
   ]],
   Documentation = "Turn OFF Neptune's minor moons and their trails",
   GuiPath = "/Solar System/Neptune",
-  IsLocal = true
+  IsLocal = false
 }
 
 
diff --git a/data/assets/scene/solarsystem/planets/saturn/major_moons.asset b/data/assets/scene/solarsystem/planets/saturn/major_moons.asset
index 8f7aa38c72..5f7e9524ab 100644
--- a/data/assets/scene/solarsystem/planets/saturn/major_moons.asset
+++ b/data/assets/scene/solarsystem/planets/saturn/major_moons.asset
@@ -32,7 +32,7 @@ local SaturnMajorMoonsOn = {
   ]],
   Documentation = "Turn ON Saturn's major moons and their trails",
   GuiPath = "/Solar System/Saturn",
-  IsLocal = true
+  IsLocal = false
 }
 
 local SaturnMajorMoonsOff = {
@@ -67,7 +67,7 @@ local SaturnMajorMoonsOff = {
   ]],
   Documentation = "Turn OFF Saturn's major moons and their trails",
   GuiPath = "/Solar System/Saturn",
-  IsLocal = true
+  IsLocal = false
 }
 
 
diff --git a/data/assets/scene/solarsystem/planets/saturn/minor_moons.asset b/data/assets/scene/solarsystem/planets/saturn/minor_moons.asset
index f2db6cfe5f..b1ba22ded4 100644
--- a/data/assets/scene/solarsystem/planets/saturn/minor_moons.asset
+++ b/data/assets/scene/solarsystem/planets/saturn/minor_moons.asset
@@ -28,7 +28,7 @@ local SaturnMinorMoonsOn = {
   ]],
   Documentation = "Turn ON Saturn's minor moons and their trails",
   GuiPath = "/Solar System/Saturn",
-  IsLocal = true
+  IsLocal = false
 }
 
 local SaturnMinorMoonsOff = {
@@ -63,7 +63,7 @@ local SaturnMinorMoonsOff = {
   ]],
   Documentation = "Turn OFF Saturn's minor moons and their trails",
   GuiPath = "/Solar System/Saturn",
-  IsLocal = true
+  IsLocal = false
 }
 
 
diff --git a/data/assets/scene/solarsystem/planets/uranus/major_moons.asset b/data/assets/scene/solarsystem/planets/uranus/major_moons.asset
index 8b8d1c527b..53550d4f6c 100644
--- a/data/assets/scene/solarsystem/planets/uranus/major_moons.asset
+++ b/data/assets/scene/solarsystem/planets/uranus/major_moons.asset
@@ -371,7 +371,7 @@ local UranusMajorMoonsOn = {
   ]],
   Documentation = "Turn ON Uranus's major moons and their trails",
   GuiPath = "/Solar System/Uranus",
-  IsLocal = true
+  IsLocal = false
 }
 
 local UranusMajorMoonsOff = {
@@ -406,7 +406,7 @@ local UranusMajorMoonsOff = {
   ]],
   Documentation = "Turn OFF Uranus's major moons and their trails",
   GuiPath = "/Solar System/Uranus",
-  IsLocal = true
+  IsLocal = false
 }
 
 
diff --git a/data/assets/scene/solarsystem/planets/uranus/minor_moons.asset b/data/assets/scene/solarsystem/planets/uranus/minor_moons.asset
index 02e89109a3..ec8b985f20 100644
--- a/data/assets/scene/solarsystem/planets/uranus/minor_moons.asset
+++ b/data/assets/scene/solarsystem/planets/uranus/minor_moons.asset
@@ -26,7 +26,7 @@ local UranusMinorMoonsOn = {
   ]],
   Documentation = "Turn ON Uranus's minor moons and their trails",
   GuiPath = "/Solar System/Uranus",
-  IsLocal = true
+  IsLocal = false
 }
 
 local UranusMinorMoonsOff = {
@@ -61,7 +61,7 @@ local UranusMinorMoonsOff = {
   ]],
   Documentation = "Turn OFF Uranus's minor moons and their trails",
   GuiPath = "/Solar System/Uranus",
-  IsLocal = true
+  IsLocal = false
 }
 
 
diff --git a/data/assets/scene/solarsystem/telescopes/jwst/point_jwst.asset b/data/assets/scene/solarsystem/telescopes/jwst/point_jwst.asset
index ebe2b56876..bc2bd95d60 100644
--- a/data/assets/scene/solarsystem/telescopes/jwst/point_jwst.asset
+++ b/data/assets/scene/solarsystem/telescopes/jwst/point_jwst.asset
@@ -136,7 +136,7 @@ local PointJwst = {
     sky coordinate as arguments.
   ]],
   GuiPath = "/JWST/Events",
-  IsLocal = true
+  IsLocal = false
 }
 
 
diff --git a/data/assets/scene/solarsystem/telescopes/jwst/toggle_trail.asset b/data/assets/scene/solarsystem/telescopes/jwst/toggle_trail.asset
index 63c9afc1e0..36c89c61cc 100644
--- a/data/assets/scene/solarsystem/telescopes/jwst/toggle_trail.asset
+++ b/data/assets/scene/solarsystem/telescopes/jwst/toggle_trail.asset
@@ -53,7 +53,7 @@ local ToggleTrail = {
     node is currently in focus and only hide JWST trail if it is in focus (as the
     'Node') and 2) the transition direction (as 'Approaching' or 'Exiting')]],
   GuiPath = "/JWST/Events",
-  IsLocal = true
+  IsLocal = false
 }
 
 

From a2004e7bade7d927e9f90f4d0c1a6996c5c14b3d Mon Sep 17 00:00:00 2001
From: Alexander Bock <alexander.bock@liu.se>
Date: Tue, 12 Sep 2023 13:18:11 +0200
Subject: [PATCH 129/701] Fix issue with example video for the globe

---
 data/assets/examples/video/videoglobe.asset | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/data/assets/examples/video/videoglobe.asset b/data/assets/examples/video/videoglobe.asset
index 657ed5e04e..83f9bcf7b6 100644
--- a/data/assets/examples/video/videoglobe.asset
+++ b/data/assets/examples/video/videoglobe.asset
@@ -9,7 +9,7 @@ local Layer = {
   Name = "Globe Video Loop Example",
   Identifier = "GlobeVideoLoopExample",
   Enabled = true,
-  Type = "VideoTileLayer",
+  Type = "VideoTileProvider",
   Video = asset.localResource("examplevideo.mp4"),
 }
 

From 8c327576d5abc207073ff042830ae6f1cd54430c Mon Sep 17 00:00:00 2001
From: Alexander Bock <alexander.bock@liu.se>
Date: Tue, 12 Sep 2023 13:18:25 +0200
Subject: [PATCH 130/701] Update editorconfig file

---
 .editorconfig | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/.editorconfig b/.editorconfig
index ea67455ec4..5a1c0f0d3c 100644
--- a/.editorconfig
+++ b/.editorconfig
@@ -9,3 +9,7 @@ charset = utf-8
 indent_style = space
 indent_size = 4
 insert_final_newline = true
+trim_trailing_whitespace = true
+
+[data/**.asset]
+indent_size = 2

From a2d8e40fb5f02f9532e0ff77134b6d61f23855c8 Mon Sep 17 00:00:00 2001
From: Alexander Bock <alexander.bock@liu.se>
Date: Wed, 13 Sep 2023 09:44:46 +0200
Subject: [PATCH 131/701] Create SECURITY.md

---
 .github/SECURITY.md | 3 +++
 1 file changed, 3 insertions(+)
 create mode 100644 .github/SECURITY.md

diff --git a/.github/SECURITY.md b/.github/SECURITY.md
new file mode 100644
index 0000000000..f1f4116f2f
--- /dev/null
+++ b/.github/SECURITY.md
@@ -0,0 +1,3 @@
+If you find any security issues with OpenSpace of any of its components, please __do not report the issue here on GitHub__. Instead send an email to support@openspaceproject.com, preferrably with the prefix "Vulnerability: " as these are processed immediately. Alternatively, you can also report it @Alex Bock or @Megan Villa on the public Slack for which you can sign up [here](https://join.slack.com/t/openspacesupport/shared_invite/zt-37niq6y9-T0JaCIk4UoFLI4VF5U9Vsw). Please do not report it in the general channel, but as a private message instead.
+
+Thank you!

From a4af241cadc0f603c4c020d950514d30f87f5e23 Mon Sep 17 00:00:00 2001
From: Alexander Bock <alexander.bock@liu.se>
Date: Wed, 13 Sep 2023 09:50:09 +0200
Subject: [PATCH 132/701] Add assets for eclipse profile (#2878)

* Add assets for eclipse profile
* Include the eclipse shadow in the eclipse profile
* Fix issue with the eclipse extended in both directions.  Disable the Earth and Moon grids by default in the profile
---
 .../eclipses/corona/corona20170821.asset      |   73 +
 .../planets/earth/eclipses/eclipses.asset     |    5 +
 .../grid/earth_ecliptic_radial_grid.asset     |   59 +
 .../eclipses/grid/moon_radial_grid.asset      |   49 +
 .../earth/eclipses/paths/annular.asset        |   20 +
 .../eclipses/paths/annular/2003-05-31.asset   |   35 +
 .../eclipses/paths/annular/2005-10-03.asset   |   35 +
 .../eclipses/paths/annular/2006-09-22.asset   |   35 +
 .../eclipses/paths/annular/2008-02-07.asset   |   35 +
 .../eclipses/paths/annular/2009-01-26.asset   |   35 +
 .../eclipses/paths/annular/2010-01-15.asset   |   35 +
 .../eclipses/paths/annular/2012-05-20.asset   |   35 +
 .../eclipses/paths/annular/2013-05-10.asset   |   35 +
 .../eclipses/paths/annular/2014-04-29.asset   |   35 +
 .../eclipses/paths/annular/2016-09-01.asset   |   35 +
 .../eclipses/paths/annular/2017-02-26.asset   |   35 +
 .../eclipses/paths/annular/2019-12-26.asset   |   35 +
 .../eclipses/paths/annular/2020-06-21.asset   |   35 +
 .../eclipses/paths/annular/2021-06-10.asset   |   36 +
 .../eclipses/paths/annular/2023-10-14.asset   |   35 +
 .../eclipses/paths/annular/2024-10-02.asset   |   35 +
 .../eclipses/paths/annular/2026-02-17.asset   |   35 +
 .../eclipses/paths/annular/2027-02-06.asset   |   35 +
 .../eclipses/paths/annular/2028-01-26.asset   |   35 +
 .../eclipses/paths/annular/2030-06-01.asset   |   35 +
 .../earth/eclipses/paths/annular_data.asset   |    8 +
 .../planets/earth/eclipses/paths/hybrid.asset |    4 +
 .../eclipses/paths/hybrid/2005-04-08.asset    |   35 +
 .../eclipses/paths/hybrid/2013-11-03.asset    |   35 +
 .../eclipses/paths/hybrid/2023-04-20.asset    |   35 +
 .../eclipses/paths/hybrid/2031-11-14.asset    |   35 +
 .../earth/eclipses/paths/hybrid_data.asset    |    8 +
 .../planets/earth/eclipses/paths/paths.asset  |    3 +
 .../planets/earth/eclipses/paths/total.asset  |   29 +
 .../eclipses/paths/total/2003-11-23.asset     |   35 +
 .../eclipses/paths/total/2006-03-29.asset     |   35 +
 .../eclipses/paths/total/2008-08-01.asset     |   35 +
 .../eclipses/paths/total/2009-07-22.asset     |   35 +
 .../eclipses/paths/total/2010-07-11.asset     |   35 +
 .../eclipses/paths/total/2012-11-13.asset     |   35 +
 .../eclipses/paths/total/2015-03-20.asset     |   35 +
 .../eclipses/paths/total/2016-03-09.asset     |   35 +
 .../eclipses/paths/total/2017-08-21.asset     |   35 +
 .../eclipses/paths/total/2019-07-02.asset     |   35 +
 .../eclipses/paths/total/2020-12-14.asset     |   35 +
 .../eclipses/paths/total/2021-12-04.asset     |   35 +
 .../eclipses/paths/total/2024-04-08.asset     |   35 +
 .../eclipses/paths/total/2026-08-12.asset     |   35 +
 .../eclipses/paths/total/2027-08-02.asset     |   35 +
 .../eclipses/paths/total/2028-07-22.asset     |   37 +
 .../eclipses/paths/total/2030-11-25.asset     |   35 +
 .../eclipses/paths/total/2033-03-30.asset     |   37 +
 .../eclipses/paths/total/2034-03-20.asset     |   37 +
 .../eclipses/paths/total/2035-09-02.asset     |   35 +
 .../eclipses/paths/total/2037-07-13.asset     |   35 +
 .../eclipses/paths/total/2038-12-26.asset     |   35 +
 .../eclipses/paths/total/2039-12-15.asset     |   35 +
 .../eclipses/paths/total/2041-04-30.asset     |   35 +
 .../eclipses/paths/total/2042-04-20.asset     |   37 +
 .../eclipses/paths/total/2043-04-09.asset     |   35 +
 .../earth/eclipses/paths/total_data.asset     |    8 +
 .../planets/earth/eclipses/timeline.asset     | 2290 +++++++++++++++++
 data/profiles/eclipse.profile                 |   74 +
 .../space/rendering/renderableeclipsecone.cpp |    2 +-
 64 files changed, 4390 insertions(+), 1 deletion(-)
 create mode 100644 data/assets/scene/solarsystem/planets/earth/eclipses/corona/corona20170821.asset
 create mode 100644 data/assets/scene/solarsystem/planets/earth/eclipses/eclipses.asset
 create mode 100644 data/assets/scene/solarsystem/planets/earth/eclipses/grid/earth_ecliptic_radial_grid.asset
 create mode 100644 data/assets/scene/solarsystem/planets/earth/eclipses/grid/moon_radial_grid.asset
 create mode 100644 data/assets/scene/solarsystem/planets/earth/eclipses/paths/annular.asset
 create mode 100644 data/assets/scene/solarsystem/planets/earth/eclipses/paths/annular/2003-05-31.asset
 create mode 100644 data/assets/scene/solarsystem/planets/earth/eclipses/paths/annular/2005-10-03.asset
 create mode 100644 data/assets/scene/solarsystem/planets/earth/eclipses/paths/annular/2006-09-22.asset
 create mode 100644 data/assets/scene/solarsystem/planets/earth/eclipses/paths/annular/2008-02-07.asset
 create mode 100644 data/assets/scene/solarsystem/planets/earth/eclipses/paths/annular/2009-01-26.asset
 create mode 100644 data/assets/scene/solarsystem/planets/earth/eclipses/paths/annular/2010-01-15.asset
 create mode 100644 data/assets/scene/solarsystem/planets/earth/eclipses/paths/annular/2012-05-20.asset
 create mode 100644 data/assets/scene/solarsystem/planets/earth/eclipses/paths/annular/2013-05-10.asset
 create mode 100644 data/assets/scene/solarsystem/planets/earth/eclipses/paths/annular/2014-04-29.asset
 create mode 100644 data/assets/scene/solarsystem/planets/earth/eclipses/paths/annular/2016-09-01.asset
 create mode 100644 data/assets/scene/solarsystem/planets/earth/eclipses/paths/annular/2017-02-26.asset
 create mode 100644 data/assets/scene/solarsystem/planets/earth/eclipses/paths/annular/2019-12-26.asset
 create mode 100644 data/assets/scene/solarsystem/planets/earth/eclipses/paths/annular/2020-06-21.asset
 create mode 100644 data/assets/scene/solarsystem/planets/earth/eclipses/paths/annular/2021-06-10.asset
 create mode 100644 data/assets/scene/solarsystem/planets/earth/eclipses/paths/annular/2023-10-14.asset
 create mode 100644 data/assets/scene/solarsystem/planets/earth/eclipses/paths/annular/2024-10-02.asset
 create mode 100644 data/assets/scene/solarsystem/planets/earth/eclipses/paths/annular/2026-02-17.asset
 create mode 100644 data/assets/scene/solarsystem/planets/earth/eclipses/paths/annular/2027-02-06.asset
 create mode 100644 data/assets/scene/solarsystem/planets/earth/eclipses/paths/annular/2028-01-26.asset
 create mode 100644 data/assets/scene/solarsystem/planets/earth/eclipses/paths/annular/2030-06-01.asset
 create mode 100644 data/assets/scene/solarsystem/planets/earth/eclipses/paths/annular_data.asset
 create mode 100644 data/assets/scene/solarsystem/planets/earth/eclipses/paths/hybrid.asset
 create mode 100644 data/assets/scene/solarsystem/planets/earth/eclipses/paths/hybrid/2005-04-08.asset
 create mode 100644 data/assets/scene/solarsystem/planets/earth/eclipses/paths/hybrid/2013-11-03.asset
 create mode 100644 data/assets/scene/solarsystem/planets/earth/eclipses/paths/hybrid/2023-04-20.asset
 create mode 100644 data/assets/scene/solarsystem/planets/earth/eclipses/paths/hybrid/2031-11-14.asset
 create mode 100644 data/assets/scene/solarsystem/planets/earth/eclipses/paths/hybrid_data.asset
 create mode 100644 data/assets/scene/solarsystem/planets/earth/eclipses/paths/paths.asset
 create mode 100644 data/assets/scene/solarsystem/planets/earth/eclipses/paths/total.asset
 create mode 100644 data/assets/scene/solarsystem/planets/earth/eclipses/paths/total/2003-11-23.asset
 create mode 100644 data/assets/scene/solarsystem/planets/earth/eclipses/paths/total/2006-03-29.asset
 create mode 100644 data/assets/scene/solarsystem/planets/earth/eclipses/paths/total/2008-08-01.asset
 create mode 100644 data/assets/scene/solarsystem/planets/earth/eclipses/paths/total/2009-07-22.asset
 create mode 100644 data/assets/scene/solarsystem/planets/earth/eclipses/paths/total/2010-07-11.asset
 create mode 100644 data/assets/scene/solarsystem/planets/earth/eclipses/paths/total/2012-11-13.asset
 create mode 100644 data/assets/scene/solarsystem/planets/earth/eclipses/paths/total/2015-03-20.asset
 create mode 100644 data/assets/scene/solarsystem/planets/earth/eclipses/paths/total/2016-03-09.asset
 create mode 100644 data/assets/scene/solarsystem/planets/earth/eclipses/paths/total/2017-08-21.asset
 create mode 100644 data/assets/scene/solarsystem/planets/earth/eclipses/paths/total/2019-07-02.asset
 create mode 100644 data/assets/scene/solarsystem/planets/earth/eclipses/paths/total/2020-12-14.asset
 create mode 100644 data/assets/scene/solarsystem/planets/earth/eclipses/paths/total/2021-12-04.asset
 create mode 100644 data/assets/scene/solarsystem/planets/earth/eclipses/paths/total/2024-04-08.asset
 create mode 100644 data/assets/scene/solarsystem/planets/earth/eclipses/paths/total/2026-08-12.asset
 create mode 100644 data/assets/scene/solarsystem/planets/earth/eclipses/paths/total/2027-08-02.asset
 create mode 100644 data/assets/scene/solarsystem/planets/earth/eclipses/paths/total/2028-07-22.asset
 create mode 100644 data/assets/scene/solarsystem/planets/earth/eclipses/paths/total/2030-11-25.asset
 create mode 100644 data/assets/scene/solarsystem/planets/earth/eclipses/paths/total/2033-03-30.asset
 create mode 100644 data/assets/scene/solarsystem/planets/earth/eclipses/paths/total/2034-03-20.asset
 create mode 100644 data/assets/scene/solarsystem/planets/earth/eclipses/paths/total/2035-09-02.asset
 create mode 100644 data/assets/scene/solarsystem/planets/earth/eclipses/paths/total/2037-07-13.asset
 create mode 100644 data/assets/scene/solarsystem/planets/earth/eclipses/paths/total/2038-12-26.asset
 create mode 100644 data/assets/scene/solarsystem/planets/earth/eclipses/paths/total/2039-12-15.asset
 create mode 100644 data/assets/scene/solarsystem/planets/earth/eclipses/paths/total/2041-04-30.asset
 create mode 100644 data/assets/scene/solarsystem/planets/earth/eclipses/paths/total/2042-04-20.asset
 create mode 100644 data/assets/scene/solarsystem/planets/earth/eclipses/paths/total/2043-04-09.asset
 create mode 100644 data/assets/scene/solarsystem/planets/earth/eclipses/paths/total_data.asset
 create mode 100644 data/assets/scene/solarsystem/planets/earth/eclipses/timeline.asset
 create mode 100644 data/profiles/eclipse.profile

diff --git a/data/assets/scene/solarsystem/planets/earth/eclipses/corona/corona20170821.asset b/data/assets/scene/solarsystem/planets/earth/eclipses/corona/corona20170821.asset
new file mode 100644
index 0000000000..ca47bbc223
--- /dev/null
+++ b/data/assets/scene/solarsystem/planets/earth/eclipses/corona/corona20170821.asset
@@ -0,0 +1,73 @@
+local transforms = asset.require("scene/solarsystem/sun/transforms")
+
+
+
+local videos = asset.syncedResource({
+  Name = "Eclipse Corona Video",
+  Type = "HttpSynchronization",
+  Identifier = "earth-eclipse-corona",
+  Version = 1
+})
+
+
+local Plane = {
+  Identifier = "CoronaVideoPlane",
+  Parent = transforms.SunIAU.Identifier,
+  Transform = {
+    Rotation = {
+      Type = "StaticRotation",
+      Rotation = { 1.57, 0.0, 0.45 }
+    },
+    Scale = {
+      Type = "StaticScale",
+      Scale = 30.3
+    }
+  },
+  Renderable = {
+    Type = "RenderableVideoPlane",
+    Enabled = false,
+    MirrorBackside = true,
+    Size = 30000000,
+    Video = videos .. "corona20170821_0171.mp4",
+    PlaybackMode = "MapToSimulationTime",
+    StartTime = "2017 08 21 00:00:00",
+    EndTime = "2017 08 21 23:59:59",
+  },
+  GUI = {
+    Name = "Sun Corona",
+    Path = "/Solar System/Sun"
+  },
+}
+
+
+asset.onInitialize(function()
+  openspace.addSceneGraphNode(Plane)
+
+  openspace.scriptScheduler.loadScheduledScript(
+    "2017 AUG 21 00:00:00",
+    [[openspace.setPropertyValueSingle("Scene.CoronaVideoPlane.Renderable.Enabled", true)]],
+    [[openspace.setPropertyValueSingle("Scene.CoronaVideoPlane.Renderable.Enabled", false)]]
+  )
+  openspace.scriptScheduler.loadScheduledScript(
+    "2017 AUG 21 23:59:59",
+    [[openspace.setPropertyValueSingle("Scene.CoronaVideoPlane.Renderable.Enabled", false)]],
+    [[openspace.setPropertyValueSingle("Scene.CoronaVideoPlane.Renderable.Enabled", true)]]
+  )
+end)
+
+asset.onDeinitialize(function()
+  openspace.removeSceneGraphNode(Plane)
+end)
+
+asset.export(Plane)
+
+
+
+asset.meta = {
+  Name = "Corona 2017-08-21",
+  Version = "1.0",
+  Description = "An SDO video of the Sun for the day 2017-08-21",
+  Author = "OpenSpace Team",
+  URL = "http://openspaceproject.com",
+  License = "MIT license"
+}
diff --git a/data/assets/scene/solarsystem/planets/earth/eclipses/eclipses.asset b/data/assets/scene/solarsystem/planets/earth/eclipses/eclipses.asset
new file mode 100644
index 0000000000..08edb1d99d
--- /dev/null
+++ b/data/assets/scene/solarsystem/planets/earth/eclipses/eclipses.asset
@@ -0,0 +1,5 @@
+asset.require("./timeline")
+asset.require("./corona/corona20170821")
+asset.require("./grid/earth_ecliptic_radial_grid")
+asset.require("./grid/moon_radial_grid")
+asset.require("./paths/paths")
diff --git a/data/assets/scene/solarsystem/planets/earth/eclipses/grid/earth_ecliptic_radial_grid.asset b/data/assets/scene/solarsystem/planets/earth/eclipses/grid/earth_ecliptic_radial_grid.asset
new file mode 100644
index 0000000000..7cec21c1a9
--- /dev/null
+++ b/data/assets/scene/solarsystem/planets/earth/eclipses/grid/earth_ecliptic_radial_grid.asset
@@ -0,0 +1,59 @@
+local transforms = asset.require("scene/solarsystem/planets/earth/transforms")
+
+
+
+local EclipticRotationMatrix = {
+  -0.05487554,  0.4941095, -0.8676661,
+  -0.9938214,  -0.1109906, -0.0003515167,
+  -0.09647644,  0.8622859,  0.4971472
+}
+
+
+local eclipticGrid = {
+  Identifier = "EarthEclipticRadialGrid",
+  Parent = transforms.EarthCenter.Identifier,
+  Transform = {
+    Rotation = {
+      Type = "StaticRotation",
+      Rotation = EclipticRotationMatrix
+    },
+    Scale = {
+      Type = "StaticScale",
+      Scale = 430000000
+    },
+  },
+  Renderable = {
+    Type = "RenderableRadialGrid",
+    Color = { 0.086, 0.106, 0.431 },
+    LineWidth = 2.0,
+    GridSegments = { 8, 8 },
+    CircleSegments = 64,
+    Radii = { 0.0, 1.0 }
+  },
+  GUI = {
+    Name = "Earth Ecliptic Grid",
+    Path = "/Solar System/Planets/Earth",
+  }
+}
+
+
+asset.onInitialize(function()
+  openspace.addSceneGraphNode(eclipticGrid)
+end)
+
+asset.onDeinitialize(function()
+  openspace.removeSceneGraphNode(eclipticGrid)
+end)
+
+asset.export(eclipticGrid)
+
+
+
+asset.meta = {
+  Name = "Earth Ecliptic Grid",
+  Version = "1.0",
+  Description = "A grid that shows the ecliptic of the Earth a radial grid",
+  Author = "OpenSpace Team",
+  URL = "http://openspaceproject.com",
+  License = "MIT license"
+}
diff --git a/data/assets/scene/solarsystem/planets/earth/eclipses/grid/moon_radial_grid.asset b/data/assets/scene/solarsystem/planets/earth/eclipses/grid/moon_radial_grid.asset
new file mode 100644
index 0000000000..ecb3d6e613
--- /dev/null
+++ b/data/assets/scene/solarsystem/planets/earth/eclipses/grid/moon_radial_grid.asset
@@ -0,0 +1,49 @@
+local moon = asset.require("scene/solarsystem/planets/earth/moon/moon")
+
+
+
+local orbitalPlaneGrid = {
+  Identifier = "MoonOrbitalPlaneRadialGrid",
+  Parent = "Moon",
+  Transform = {
+    Scale = {
+      Type = "StaticScale",
+      Scale = 430000000
+    },
+  },
+  Renderable = {
+    Type = "RenderableRadialGrid",
+    Color = { 0.502, 0.502, 0.502 },
+    LineWidth = 2.0,
+    GridSegments = { 8, 8 },
+    CircleSegments = 64,
+    Radii = { 0.0, 1.0 }
+  },
+  GUI = {
+    Name = "Moon Ecliptic Grid",
+    Path = "/Solar System/Planets/Earth/Moon",
+  }
+}
+
+
+
+asset.onInitialize(function()
+  openspace.addSceneGraphNode(orbitalPlaneGrid)
+end)
+
+asset.onDeinitialize(function()
+  openspace.removeSceneGraphNode(orbitalPlaneGrid)
+end)
+
+asset.export(orbitalPlaneGrid)
+
+
+
+asset.meta = {
+  Name = "Moon Orbital Plane",
+  Version = "1.0",
+  Description = "A grid that shows the orbital plane of the Moon",
+  Author = "OpenSpace Team",
+  URL = "http://openspaceproject.com",
+  License = "MIT license"
+}
diff --git a/data/assets/scene/solarsystem/planets/earth/eclipses/paths/annular.asset b/data/assets/scene/solarsystem/planets/earth/eclipses/paths/annular.asset
new file mode 100644
index 0000000000..39df373484
--- /dev/null
+++ b/data/assets/scene/solarsystem/planets/earth/eclipses/paths/annular.asset
@@ -0,0 +1,20 @@
+asset.require("./annular/2003-05-31")
+asset.require("./annular/2005-10-03")
+asset.require("./annular/2006-09-22")
+asset.require("./annular/2008-02-07")
+asset.require("./annular/2009-01-26")
+asset.require("./annular/2010-01-15")
+asset.require("./annular/2012-05-20")
+asset.require("./annular/2013-05-10")
+asset.require("./annular/2014-04-29")
+asset.require("./annular/2016-09-01")
+asset.require("./annular/2017-02-26")
+asset.require("./annular/2019-12-26")
+asset.require("./annular/2020-06-21")
+asset.require("./annular/2021-06-10")
+asset.require("./annular/2023-10-14")
+asset.require("./annular/2024-10-02")
+asset.require("./annular/2026-02-17")
+asset.require("./annular/2027-02-06")
+asset.require("./annular/2028-01-26")
+asset.require("./annular/2030-06-01")
diff --git a/data/assets/scene/solarsystem/planets/earth/eclipses/paths/annular/2003-05-31.asset b/data/assets/scene/solarsystem/planets/earth/eclipses/paths/annular/2003-05-31.asset
new file mode 100644
index 0000000000..e34c8017b3
--- /dev/null
+++ b/data/assets/scene/solarsystem/planets/earth/eclipses/paths/annular/2003-05-31.asset
@@ -0,0 +1,35 @@
+local earth = asset.require('scene/solarsystem/planets/earth/earth')
+local data = asset.require('../annular_data')
+
+
+
+local Layer = {
+  Identifier = "Annular-2003-05-31",
+  Enabled = false,
+  File = data.path .. "2003-05-31.geojson",
+  HeightOffset = 2000.0,
+  DefaultProperties = {
+    LineWidth = 2.0,
+    Extrude = true
+  }
+}
+
+
+asset.onInitialize(function()
+  openspace.globebrowsing.addGeoJson(earth.Earth.Identifier, Layer)
+end)
+
+asset.onDeinitialize(function()
+  openspace.globebrowsing.deleteGeoJson(earth.Earth.Identifier, Layer)
+end)
+
+
+
+asset.meta = {
+  Name = "Annular 2003-05-31",
+  Version = "1.0",
+  Description = "Annular eclipse map for 2003-05-31",
+  Author = "OpenSpace Team",
+  URL = "http://openspaceproject.com",
+  License = "MIT license"
+}
diff --git a/data/assets/scene/solarsystem/planets/earth/eclipses/paths/annular/2005-10-03.asset b/data/assets/scene/solarsystem/planets/earth/eclipses/paths/annular/2005-10-03.asset
new file mode 100644
index 0000000000..7166488752
--- /dev/null
+++ b/data/assets/scene/solarsystem/planets/earth/eclipses/paths/annular/2005-10-03.asset
@@ -0,0 +1,35 @@
+local earth = asset.require('scene/solarsystem/planets/earth/earth')
+local data = asset.require('../annular_data')
+
+
+
+local Layer = {
+  Identifier = "Annular-2005-10-03",
+  Enabled = false,
+  File = data.path .. "2005-10-03.geojson",
+  HeightOffset = 2000.0,
+  DefaultProperties = {
+    LineWidth = 2.0,
+    Extrude = true
+  }
+}
+
+
+asset.onInitialize(function()
+  openspace.globebrowsing.addGeoJson(earth.Earth.Identifier, Layer)
+end)
+
+asset.onDeinitialize(function()
+  openspace.globebrowsing.deleteGeoJson(earth.Earth.Identifier, Layer)
+end)
+
+
+
+asset.meta = {
+  Name = "Annular 2005-10-03",
+  Version = "1.0",
+  Description = "Annular eclipse map for 2005-10-03",
+  Author = "OpenSpace Team",
+  URL = "http://openspaceproject.com",
+  License = "MIT license"
+}
diff --git a/data/assets/scene/solarsystem/planets/earth/eclipses/paths/annular/2006-09-22.asset b/data/assets/scene/solarsystem/planets/earth/eclipses/paths/annular/2006-09-22.asset
new file mode 100644
index 0000000000..b5c981dc97
--- /dev/null
+++ b/data/assets/scene/solarsystem/planets/earth/eclipses/paths/annular/2006-09-22.asset
@@ -0,0 +1,35 @@
+local earth = asset.require('scene/solarsystem/planets/earth/earth')
+local data = asset.require('../annular_data')
+
+
+
+local Layer = {
+  Identifier = "Annular-2006-09-22",
+  Enabled = false,
+  File = data.path .. "2006-09-22.geojson",
+  HeightOffset = 2000.0,
+  DefaultProperties = {
+    LineWidth = 2.0,
+    Extrude = true
+  }
+}
+
+
+asset.onInitialize(function()
+  openspace.globebrowsing.addGeoJson(earth.Earth.Identifier, Layer)
+end)
+
+asset.onDeinitialize(function()
+  openspace.globebrowsing.deleteGeoJson(earth.Earth.Identifier, Layer)
+end)
+
+
+
+asset.meta = {
+  Name = "Annular 2006-09-22",
+  Version = "1.0",
+  Description = "Annular eclipse map for 2006-09-22",
+  Author = "OpenSpace Team",
+  URL = "http://openspaceproject.com",
+  License = "MIT license"
+}
diff --git a/data/assets/scene/solarsystem/planets/earth/eclipses/paths/annular/2008-02-07.asset b/data/assets/scene/solarsystem/planets/earth/eclipses/paths/annular/2008-02-07.asset
new file mode 100644
index 0000000000..178dc65054
--- /dev/null
+++ b/data/assets/scene/solarsystem/planets/earth/eclipses/paths/annular/2008-02-07.asset
@@ -0,0 +1,35 @@
+local earth = asset.require('scene/solarsystem/planets/earth/earth')
+local data = asset.require('../annular_data')
+
+
+
+local Layer = {
+  Identifier = "Annular-2008-02-07",
+  Enabled = false,
+  File = data.path .. "2008-02-07.geojson",
+  HeightOffset = 2000.0,
+  DefaultProperties = {
+    LineWidth = 2.0,
+    Extrude = true
+  }
+}
+
+
+asset.onInitialize(function()
+  openspace.globebrowsing.addGeoJson(earth.Earth.Identifier, Layer)
+end)
+
+asset.onDeinitialize(function()
+  openspace.globebrowsing.deleteGeoJson(earth.Earth.Identifier, Layer)
+end)
+
+
+
+asset.meta = {
+  Name = "Annular 2008-02-07",
+  Version = "1.0",
+  Description = "Annular eclipse map for 2008-02-07",
+  Author = "OpenSpace Team",
+  URL = "http://openspaceproject.com",
+  License = "MIT license"
+}
diff --git a/data/assets/scene/solarsystem/planets/earth/eclipses/paths/annular/2009-01-26.asset b/data/assets/scene/solarsystem/planets/earth/eclipses/paths/annular/2009-01-26.asset
new file mode 100644
index 0000000000..327ebe3704
--- /dev/null
+++ b/data/assets/scene/solarsystem/planets/earth/eclipses/paths/annular/2009-01-26.asset
@@ -0,0 +1,35 @@
+local earth = asset.require('scene/solarsystem/planets/earth/earth')
+local data = asset.require('../annular_data')
+
+
+
+local Layer = {
+  Identifier = "Annular-2009-01-26",
+  Enabled = false,
+  File = data.path .. "2009-01-26.geojson",
+  HeightOffset = 2000.0,
+  DefaultProperties = {
+    LineWidth = 2.0,
+    Extrude = true
+  }
+}
+
+
+asset.onInitialize(function()
+  openspace.globebrowsing.addGeoJson(earth.Earth.Identifier, Layer)
+end)
+
+asset.onDeinitialize(function()
+  openspace.globebrowsing.deleteGeoJson(earth.Earth.Identifier, Layer)
+end)
+
+
+
+asset.meta = {
+  Name = "Annular 2009-01-26",
+  Version = "1.0",
+  Description = "Annular eclipse map for 2009-01-26",
+  Author = "OpenSpace Team",
+  URL = "http://openspaceproject.com",
+  License = "MIT license"
+}
diff --git a/data/assets/scene/solarsystem/planets/earth/eclipses/paths/annular/2010-01-15.asset b/data/assets/scene/solarsystem/planets/earth/eclipses/paths/annular/2010-01-15.asset
new file mode 100644
index 0000000000..19f8f72b25
--- /dev/null
+++ b/data/assets/scene/solarsystem/planets/earth/eclipses/paths/annular/2010-01-15.asset
@@ -0,0 +1,35 @@
+local earth = asset.require('scene/solarsystem/planets/earth/earth')
+local data = asset.require('../annular_data')
+
+
+
+local Layer = {
+  Identifier = "Annular-2010-01-15",
+  Enabled = false,
+  File = data.path .. "2010-01-15.geojson",
+  HeightOffset = 2000.0,
+  DefaultProperties = {
+    LineWidth = 2.0,
+    Extrude = true
+  }
+}
+
+
+asset.onInitialize(function()
+  openspace.globebrowsing.addGeoJson(earth.Earth.Identifier, Layer)
+end)
+
+asset.onDeinitialize(function()
+  openspace.globebrowsing.deleteGeoJson(earth.Earth.Identifier, Layer)
+end)
+
+
+
+asset.meta = {
+  Name = "Annular 2010-01-15",
+  Version = "1.0",
+  Description = "Annular eclipse map for 2010-01-15",
+  Author = "OpenSpace Team",
+  URL = "http://openspaceproject.com",
+  License = "MIT license"
+}
diff --git a/data/assets/scene/solarsystem/planets/earth/eclipses/paths/annular/2012-05-20.asset b/data/assets/scene/solarsystem/planets/earth/eclipses/paths/annular/2012-05-20.asset
new file mode 100644
index 0000000000..02b08d1105
--- /dev/null
+++ b/data/assets/scene/solarsystem/planets/earth/eclipses/paths/annular/2012-05-20.asset
@@ -0,0 +1,35 @@
+local earth = asset.require('scene/solarsystem/planets/earth/earth')
+local data = asset.require('../annular_data')
+
+
+
+local Layer = {
+  Identifier = "Annular-2012-05-20",
+  Enabled = false,
+  File = data.path .. "2012-05-20.geojson",
+  HeightOffset = 2000.0,
+  DefaultProperties = {
+    LineWidth = 2.0,
+    Extrude = true
+  }
+}
+
+
+asset.onInitialize(function()
+  openspace.globebrowsing.addGeoJson(earth.Earth.Identifier, Layer)
+end)
+
+asset.onDeinitialize(function()
+  openspace.globebrowsing.deleteGeoJson(earth.Earth.Identifier, Layer)
+end)
+
+
+
+asset.meta = {
+  Name = "Annular 2012-05-20",
+  Version = "1.0",
+  Description = "Annular eclipse map for 2012-05-20",
+  Author = "OpenSpace Team",
+  URL = "http://openspaceproject.com",
+  License = "MIT license"
+}
diff --git a/data/assets/scene/solarsystem/planets/earth/eclipses/paths/annular/2013-05-10.asset b/data/assets/scene/solarsystem/planets/earth/eclipses/paths/annular/2013-05-10.asset
new file mode 100644
index 0000000000..36b1a91dc0
--- /dev/null
+++ b/data/assets/scene/solarsystem/planets/earth/eclipses/paths/annular/2013-05-10.asset
@@ -0,0 +1,35 @@
+local earth = asset.require('scene/solarsystem/planets/earth/earth')
+local data = asset.require('../annular_data')
+
+
+
+local Layer = {
+  Identifier = "Annular-2013-05-10",
+  Enabled = false,
+  File = data.path .. "2013-05-10.geojson",
+  HeightOffset = 2000.0,
+  DefaultProperties = {
+    LineWidth = 2.0,
+    Extrude = true
+  }
+}
+
+
+asset.onInitialize(function()
+  openspace.globebrowsing.addGeoJson(earth.Earth.Identifier, Layer)
+end)
+
+asset.onDeinitialize(function()
+  openspace.globebrowsing.deleteGeoJson(earth.Earth.Identifier, Layer)
+end)
+
+
+
+asset.meta = {
+  Name = "Annular 2013-05-10",
+  Version = "1.0",
+  Description = "Annular eclipse map for 2013-05-10",
+  Author = "OpenSpace Team",
+  URL = "http://openspaceproject.com",
+  License = "MIT license"
+}
diff --git a/data/assets/scene/solarsystem/planets/earth/eclipses/paths/annular/2014-04-29.asset b/data/assets/scene/solarsystem/planets/earth/eclipses/paths/annular/2014-04-29.asset
new file mode 100644
index 0000000000..453eb7c081
--- /dev/null
+++ b/data/assets/scene/solarsystem/planets/earth/eclipses/paths/annular/2014-04-29.asset
@@ -0,0 +1,35 @@
+local earth = asset.require('scene/solarsystem/planets/earth/earth')
+local data = asset.require('../annular_data')
+
+
+
+local Layer = {
+  Identifier = "Annular-2014-04-29",
+  Enabled = false,
+  File = data.path .. "2014-04-29.geojson",
+  HeightOffset = 2000.0,
+  DefaultProperties = {
+    LineWidth = 2.0,
+    Extrude = true
+  }
+}
+
+
+asset.onInitialize(function()
+  openspace.globebrowsing.addGeoJson(earth.Earth.Identifier, Layer)
+end)
+
+asset.onDeinitialize(function()
+  openspace.globebrowsing.deleteGeoJson(earth.Earth.Identifier, Layer)
+end)
+
+
+
+asset.meta = {
+  Name = "Annular 2014-04-29",
+  Version = "1.0",
+  Description = "Annular eclipse map for 2014-04-29",
+  Author = "OpenSpace Team",
+  URL = "http://openspaceproject.com",
+  License = "MIT license"
+}
diff --git a/data/assets/scene/solarsystem/planets/earth/eclipses/paths/annular/2016-09-01.asset b/data/assets/scene/solarsystem/planets/earth/eclipses/paths/annular/2016-09-01.asset
new file mode 100644
index 0000000000..5a4ce9bb14
--- /dev/null
+++ b/data/assets/scene/solarsystem/planets/earth/eclipses/paths/annular/2016-09-01.asset
@@ -0,0 +1,35 @@
+local earth = asset.require('scene/solarsystem/planets/earth/earth')
+local data = asset.require('../annular_data')
+
+
+
+local Layer = {
+  Identifier = "Annular-2016-09-01",
+  Enabled = false,
+  File = data.path .. "2016-09-01.geojson",
+  HeightOffset = 2000.0,
+  DefaultProperties = {
+    LineWidth = 2.0,
+    Extrude = true
+  }
+}
+
+
+asset.onInitialize(function()
+  openspace.globebrowsing.addGeoJson(earth.Earth.Identifier, Layer)
+end)
+
+asset.onDeinitialize(function()
+  openspace.globebrowsing.deleteGeoJson(earth.Earth.Identifier, Layer)
+end)
+
+
+
+asset.meta = {
+  Name = "Annular 2016-09-01",
+  Version = "1.0",
+  Description = "Annular eclipse map for 2016-09-01",
+  Author = "OpenSpace Team",
+  URL = "http://openspaceproject.com",
+  License = "MIT license"
+}
diff --git a/data/assets/scene/solarsystem/planets/earth/eclipses/paths/annular/2017-02-26.asset b/data/assets/scene/solarsystem/planets/earth/eclipses/paths/annular/2017-02-26.asset
new file mode 100644
index 0000000000..12567c9071
--- /dev/null
+++ b/data/assets/scene/solarsystem/planets/earth/eclipses/paths/annular/2017-02-26.asset
@@ -0,0 +1,35 @@
+local earth = asset.require('scene/solarsystem/planets/earth/earth')
+local data = asset.require('../annular_data')
+
+
+
+local Layer = {
+  Identifier = "Annular-2017-02-26",
+  Enabled = false,
+  File = data.path .. "2017-02-26.geojson",
+  HeightOffset = 2000.0,
+  DefaultProperties = {
+    LineWidth = 2.0,
+    Extrude = true
+  }
+}
+
+
+asset.onInitialize(function()
+  openspace.globebrowsing.addGeoJson(earth.Earth.Identifier, Layer)
+end)
+
+asset.onDeinitialize(function()
+  openspace.globebrowsing.deleteGeoJson(earth.Earth.Identifier, Layer)
+end)
+
+
+
+asset.meta = {
+  Name = "Annular 2017-02-26",
+  Version = "1.0",
+  Description = "Annular eclipse map for 2017-02-26",
+  Author = "OpenSpace Team",
+  URL = "http://openspaceproject.com",
+  License = "MIT license"
+}
diff --git a/data/assets/scene/solarsystem/planets/earth/eclipses/paths/annular/2019-12-26.asset b/data/assets/scene/solarsystem/planets/earth/eclipses/paths/annular/2019-12-26.asset
new file mode 100644
index 0000000000..47a13fc598
--- /dev/null
+++ b/data/assets/scene/solarsystem/planets/earth/eclipses/paths/annular/2019-12-26.asset
@@ -0,0 +1,35 @@
+local earth = asset.require('scene/solarsystem/planets/earth/earth')
+local data = asset.require('../annular_data')
+
+
+
+local Layer = {
+  Identifier = "Annular-2019-12-26",
+  Enabled = false,
+  File = data.path .. "2019-12-26.geojson",
+  HeightOffset = 2000.0,
+  DefaultProperties = {
+    LineWidth = 2.0,
+    Extrude = true
+  }
+}
+
+
+asset.onInitialize(function()
+  openspace.globebrowsing.addGeoJson(earth.Earth.Identifier, Layer)
+end)
+
+asset.onDeinitialize(function()
+  openspace.globebrowsing.deleteGeoJson(earth.Earth.Identifier, Layer)
+end)
+
+
+
+asset.meta = {
+  Name = "Annular 2019-12-26",
+  Version = "1.0",
+  Description = "Annular eclipse map for 2019-12-26",
+  Author = "OpenSpace Team",
+  URL = "http://openspaceproject.com",
+  License = "MIT license"
+}
diff --git a/data/assets/scene/solarsystem/planets/earth/eclipses/paths/annular/2020-06-21.asset b/data/assets/scene/solarsystem/planets/earth/eclipses/paths/annular/2020-06-21.asset
new file mode 100644
index 0000000000..9686af3657
--- /dev/null
+++ b/data/assets/scene/solarsystem/planets/earth/eclipses/paths/annular/2020-06-21.asset
@@ -0,0 +1,35 @@
+local earth = asset.require('scene/solarsystem/planets/earth/earth')
+local data = asset.require('../annular_data')
+
+
+
+local Layer = {
+  Identifier = "Annular-2020-06-21",
+  Enabled = false,
+  File = data.path .. "2020-06-21.geojson",
+  HeightOffset = 2000.0,
+  DefaultProperties = {
+    LineWidth = 2.0,
+    Extrude = true
+  }
+}
+
+
+asset.onInitialize(function()
+  openspace.globebrowsing.addGeoJson(earth.Earth.Identifier, Layer)
+end)
+
+asset.onDeinitialize(function()
+  openspace.globebrowsing.deleteGeoJson(earth.Earth.Identifier, Layer)
+end)
+
+
+
+asset.meta = {
+  Name = "Annular 2020-06-21",
+  Version = "1.0",
+  Description = "Annular eclipse map for 2020-06-21",
+  Author = "OpenSpace Team",
+  URL = "http://openspaceproject.com",
+  License = "MIT license"
+}
diff --git a/data/assets/scene/solarsystem/planets/earth/eclipses/paths/annular/2021-06-10.asset b/data/assets/scene/solarsystem/planets/earth/eclipses/paths/annular/2021-06-10.asset
new file mode 100644
index 0000000000..144334625b
--- /dev/null
+++ b/data/assets/scene/solarsystem/planets/earth/eclipses/paths/annular/2021-06-10.asset
@@ -0,0 +1,36 @@
+local earth = asset.require('scene/solarsystem/planets/earth/earth')
+local data = asset.require('../annular_data')
+
+
+
+local Layer = {
+  Identifier = "Annular-2021-06-10",
+  Enabled = false,
+  File = data.path .. "2021-06-10.geojson",
+  HeightOffset = 2000.0,
+  DefaultProperties = {
+    LineWidth = 2.0,
+    Extrude = true
+  }
+}
+
+
+asset.onInitialize(function()
+  -- @TODO:  The file contains a non-simple geometry which is currently not supported
+  -- openspace.globebrowsing.addGeoJson(earth.Earth.Identifier, Layer)
+end)
+
+asset.onDeinitialize(function()
+  -- openspace.globebrowsing.deleteGeoJson(earth.Earth.Identifier, Layer)
+end)
+
+
+
+asset.meta = {
+  Name = "Annular 2021-06-10",
+  Version = "1.0",
+  Description = "Annular eclipse map for 2021-06-10",
+  Author = "OpenSpace Team",
+  URL = "http://openspaceproject.com",
+  License = "MIT license"
+}
diff --git a/data/assets/scene/solarsystem/planets/earth/eclipses/paths/annular/2023-10-14.asset b/data/assets/scene/solarsystem/planets/earth/eclipses/paths/annular/2023-10-14.asset
new file mode 100644
index 0000000000..9ed1bbc35c
--- /dev/null
+++ b/data/assets/scene/solarsystem/planets/earth/eclipses/paths/annular/2023-10-14.asset
@@ -0,0 +1,35 @@
+local earth = asset.require('scene/solarsystem/planets/earth/earth')
+local data = asset.require('../annular_data')
+
+
+
+local Layer = {
+  Identifier = "Annular-2023-10-14",
+  Enabled = false,
+  File = data.path .. "2023-10-14.geojson",
+  HeightOffset = 2000.0,
+  DefaultProperties = {
+    LineWidth = 2.0,
+    Extrude = true
+  }
+}
+
+
+asset.onInitialize(function()
+  openspace.globebrowsing.addGeoJson(earth.Earth.Identifier, Layer)
+end)
+
+asset.onDeinitialize(function()
+  openspace.globebrowsing.deleteGeoJson(earth.Earth.Identifier, Layer)
+end)
+
+
+
+asset.meta = {
+  Name = "Annular 2023-10-14",
+  Version = "1.0",
+  Description = "Annular eclipse map for 2023-10-14",
+  Author = "OpenSpace Team",
+  URL = "http://openspaceproject.com",
+  License = "MIT license"
+}
diff --git a/data/assets/scene/solarsystem/planets/earth/eclipses/paths/annular/2024-10-02.asset b/data/assets/scene/solarsystem/planets/earth/eclipses/paths/annular/2024-10-02.asset
new file mode 100644
index 0000000000..ffdd14f68f
--- /dev/null
+++ b/data/assets/scene/solarsystem/planets/earth/eclipses/paths/annular/2024-10-02.asset
@@ -0,0 +1,35 @@
+local earth = asset.require('scene/solarsystem/planets/earth/earth')
+local data = asset.require('../annular_data')
+
+
+
+local Layer = {
+  Identifier = "Annular-2024-10-02",
+  Enabled = false,
+  File = data.path .. "2024-10-02.geojson",
+  HeightOffset = 2000.0,
+  DefaultProperties = {
+    LineWidth = 2.0,
+    Extrude = true
+  }
+}
+
+
+asset.onInitialize(function()
+  openspace.globebrowsing.addGeoJson(earth.Earth.Identifier, Layer)
+end)
+
+asset.onDeinitialize(function()
+  openspace.globebrowsing.deleteGeoJson(earth.Earth.Identifier, Layer)
+end)
+
+
+
+asset.meta = {
+  Name = "Annular 2024-10-02",
+  Version = "1.0",
+  Description = "Annular eclipse map for 2024-10-02",
+  Author = "OpenSpace Team",
+  URL = "http://openspaceproject.com",
+  License = "MIT license"
+}
diff --git a/data/assets/scene/solarsystem/planets/earth/eclipses/paths/annular/2026-02-17.asset b/data/assets/scene/solarsystem/planets/earth/eclipses/paths/annular/2026-02-17.asset
new file mode 100644
index 0000000000..f9b7e5158a
--- /dev/null
+++ b/data/assets/scene/solarsystem/planets/earth/eclipses/paths/annular/2026-02-17.asset
@@ -0,0 +1,35 @@
+local earth = asset.require('scene/solarsystem/planets/earth/earth')
+local data = asset.require('../annular_data')
+
+
+
+local Layer = {
+  Identifier = "Annular-2026-02-17",
+  Enabled = false,
+  File = data.path .. "2026-02-17.geojson",
+  HeightOffset = 2000.0,
+  DefaultProperties = {
+    LineWidth = 2.0,
+    Extrude = true
+  }
+}
+
+
+asset.onInitialize(function()
+  openspace.globebrowsing.addGeoJson(earth.Earth.Identifier, Layer)
+end)
+
+asset.onDeinitialize(function()
+  openspace.globebrowsing.deleteGeoJson(earth.Earth.Identifier, Layer)
+end)
+
+
+
+asset.meta = {
+  Name = "Annular 2026-02-17",
+  Version = "1.0",
+  Description = "Annular eclipse map for 2026-02-17",
+  Author = "OpenSpace Team",
+  URL = "http://openspaceproject.com",
+  License = "MIT license"
+}
diff --git a/data/assets/scene/solarsystem/planets/earth/eclipses/paths/annular/2027-02-06.asset b/data/assets/scene/solarsystem/planets/earth/eclipses/paths/annular/2027-02-06.asset
new file mode 100644
index 0000000000..788110b461
--- /dev/null
+++ b/data/assets/scene/solarsystem/planets/earth/eclipses/paths/annular/2027-02-06.asset
@@ -0,0 +1,35 @@
+local earth = asset.require('scene/solarsystem/planets/earth/earth')
+local data = asset.require('../annular_data')
+
+
+
+local Layer = {
+  Identifier = "Annular-2027-02-06",
+  Enabled = false,
+  File = data.path .. "2027-02-06.geojson",
+  HeightOffset = 2000.0,
+  DefaultProperties = {
+    LineWidth = 2.0,
+    Extrude = true
+  }
+}
+
+
+asset.onInitialize(function()
+  openspace.globebrowsing.addGeoJson(earth.Earth.Identifier, Layer)
+end)
+
+asset.onDeinitialize(function()
+  openspace.globebrowsing.deleteGeoJson(earth.Earth.Identifier, Layer)
+end)
+
+
+
+asset.meta = {
+  Name = "Annular 2027-02-06",
+  Version = "1.0",
+  Description = "Annular eclipse map for 2027-02-06",
+  Author = "OpenSpace Team",
+  URL = "http://openspaceproject.com",
+  License = "MIT license"
+}
diff --git a/data/assets/scene/solarsystem/planets/earth/eclipses/paths/annular/2028-01-26.asset b/data/assets/scene/solarsystem/planets/earth/eclipses/paths/annular/2028-01-26.asset
new file mode 100644
index 0000000000..1376c23149
--- /dev/null
+++ b/data/assets/scene/solarsystem/planets/earth/eclipses/paths/annular/2028-01-26.asset
@@ -0,0 +1,35 @@
+local earth = asset.require('scene/solarsystem/planets/earth/earth')
+local data = asset.require('../annular_data')
+
+
+
+local Layer = {
+  Identifier = "Annular-2028-01-26",
+  Enabled = false,
+  File = data.path .. "2028-01-26.geojson",
+  HeightOffset = 2000.0,
+  DefaultProperties = {
+    LineWidth = 2.0,
+    Extrude = true
+  }
+}
+
+
+asset.onInitialize(function()
+  openspace.globebrowsing.addGeoJson(earth.Earth.Identifier, Layer)
+end)
+
+asset.onDeinitialize(function()
+  openspace.globebrowsing.deleteGeoJson(earth.Earth.Identifier, Layer)
+end)
+
+
+
+asset.meta = {
+  Name = "Annular 2028-01-26",
+  Version = "1.0",
+  Description = "Annular eclipse map for 2028-01-26",
+  Author = "OpenSpace Team",
+  URL = "http://openspaceproject.com",
+  License = "MIT license"
+}
diff --git a/data/assets/scene/solarsystem/planets/earth/eclipses/paths/annular/2030-06-01.asset b/data/assets/scene/solarsystem/planets/earth/eclipses/paths/annular/2030-06-01.asset
new file mode 100644
index 0000000000..02a48e3f28
--- /dev/null
+++ b/data/assets/scene/solarsystem/planets/earth/eclipses/paths/annular/2030-06-01.asset
@@ -0,0 +1,35 @@
+local earth = asset.require('scene/solarsystem/planets/earth/earth')
+local data = asset.require('../annular_data')
+
+
+
+local Layer = {
+  Identifier = "Annular-2030-06-01",
+  Enabled = false,
+  File = data.path .. "2030-06-01.geojson",
+  HeightOffset = 2000.0,
+  DefaultProperties = {
+    LineWidth = 2.0,
+    Extrude = true
+  }
+}
+
+
+asset.onInitialize(function()
+  openspace.globebrowsing.addGeoJson(earth.Earth.Identifier, Layer)
+end)
+
+asset.onDeinitialize(function()
+  openspace.globebrowsing.deleteGeoJson(earth.Earth.Identifier, Layer)
+end)
+
+
+
+asset.meta = {
+  Name = "Annular 2030-06-01",
+  Version = "1.0",
+  Description = "Annular eclipse map for 2030-06-01",
+  Author = "OpenSpace Team",
+  URL = "http://openspaceproject.com",
+  License = "MIT license"
+}
diff --git a/data/assets/scene/solarsystem/planets/earth/eclipses/paths/annular_data.asset b/data/assets/scene/solarsystem/planets/earth/eclipses/paths/annular_data.asset
new file mode 100644
index 0000000000..e834107191
--- /dev/null
+++ b/data/assets/scene/solarsystem/planets/earth/eclipses/paths/annular_data.asset
@@ -0,0 +1,8 @@
+local data = asset.syncedResource({
+  Name = "Annular Eclipse Paths",
+  Type = "HttpSynchronization",
+  Identifier = "earth-eclipse-path-annular",
+  Version = 1
+})
+
+asset.export("path", data)
diff --git a/data/assets/scene/solarsystem/planets/earth/eclipses/paths/hybrid.asset b/data/assets/scene/solarsystem/planets/earth/eclipses/paths/hybrid.asset
new file mode 100644
index 0000000000..d42ee8ec41
--- /dev/null
+++ b/data/assets/scene/solarsystem/planets/earth/eclipses/paths/hybrid.asset
@@ -0,0 +1,4 @@
+asset.require("./hybrid/2005-04-08")
+asset.require("./hybrid/2013-11-03")
+asset.require("./hybrid/2023-04-20")
+asset.require("./hybrid/2031-11-14")
diff --git a/data/assets/scene/solarsystem/planets/earth/eclipses/paths/hybrid/2005-04-08.asset b/data/assets/scene/solarsystem/planets/earth/eclipses/paths/hybrid/2005-04-08.asset
new file mode 100644
index 0000000000..232028e33e
--- /dev/null
+++ b/data/assets/scene/solarsystem/planets/earth/eclipses/paths/hybrid/2005-04-08.asset
@@ -0,0 +1,35 @@
+local earth = asset.require('scene/solarsystem/planets/earth/earth')
+local data = asset.require('../hybrid_data')
+
+
+
+local Layer = {
+  Identifier = "Hybrid-2005-04-08",
+  Enabled = false,
+  File = data.path .. "2005-04-08.geojson",
+  HeightOffset = 2000.0,
+  DefaultProperties = {
+    LineWidth = 2.0,
+    Extrude = true
+  }
+}
+
+
+asset.onInitialize(function()
+  openspace.globebrowsing.addGeoJson(earth.Earth.Identifier, Layer)
+end)
+
+asset.onDeinitialize(function()
+  openspace.globebrowsing.deleteGeoJson(earth.Earth.Identifier, Layer)
+end)
+
+
+
+asset.meta = {
+  Name = "Hybrid 2005-04-08",
+  Version = "1.0",
+  Description = "Hybrid eclipse map for 2005-04-08",
+  Author = "OpenSpace Team",
+  URL = "http://openspaceproject.com",
+  License = "MIT license"
+}
diff --git a/data/assets/scene/solarsystem/planets/earth/eclipses/paths/hybrid/2013-11-03.asset b/data/assets/scene/solarsystem/planets/earth/eclipses/paths/hybrid/2013-11-03.asset
new file mode 100644
index 0000000000..c199f77c5e
--- /dev/null
+++ b/data/assets/scene/solarsystem/planets/earth/eclipses/paths/hybrid/2013-11-03.asset
@@ -0,0 +1,35 @@
+local earth = asset.require('scene/solarsystem/planets/earth/earth')
+local data = asset.require('../hybrid_data')
+
+
+
+local Layer = {
+  Identifier = "Hybrid-2013-11-03",
+  Enabled = false,
+  File = data.path .. "2013-11-03.geojson",
+  HeightOffset = 2000.0,
+  DefaultProperties = {
+    LineWidth = 2.0,
+    Extrude = true
+  }
+}
+
+
+asset.onInitialize(function()
+  openspace.globebrowsing.addGeoJson(earth.Earth.Identifier, Layer)
+end)
+
+asset.onDeinitialize(function()
+  openspace.globebrowsing.deleteGeoJson(earth.Earth.Identifier, Layer)
+end)
+
+
+
+asset.meta = {
+  Name = "Hybrid 2013-11-03",
+  Version = "1.0",
+  Description = "Hybrid eclipse map for 2013-11-03",
+  Author = "OpenSpace Team",
+  URL = "http://openspaceproject.com",
+  License = "MIT license"
+}
diff --git a/data/assets/scene/solarsystem/planets/earth/eclipses/paths/hybrid/2023-04-20.asset b/data/assets/scene/solarsystem/planets/earth/eclipses/paths/hybrid/2023-04-20.asset
new file mode 100644
index 0000000000..0ef81475a5
--- /dev/null
+++ b/data/assets/scene/solarsystem/planets/earth/eclipses/paths/hybrid/2023-04-20.asset
@@ -0,0 +1,35 @@
+local earth = asset.require('scene/solarsystem/planets/earth/earth')
+local data = asset.require('../hybrid_data')
+
+
+
+local Layer = {
+  Identifier = "Hybrid-2023-04-20",
+  Enabled = false,
+  File = data.path .. "2023-04-20.geojson",
+  HeightOffset = 2000.0,
+  DefaultProperties = {
+    LineWidth = 2.0,
+    Extrude = true
+  }
+}
+
+
+asset.onInitialize(function()
+  openspace.globebrowsing.addGeoJson(earth.Earth.Identifier, Layer)
+end)
+
+asset.onDeinitialize(function()
+  openspace.globebrowsing.deleteGeoJson(earth.Earth.Identifier, Layer)
+end)
+
+
+
+asset.meta = {
+  Name = "Hybrid 2023-04-20",
+  Version = "1.0",
+  Description = "Hybrid eclipse map for 2023-04-20",
+  Author = "OpenSpace Team",
+  URL = "http://openspaceproject.com",
+  License = "MIT license"
+}
diff --git a/data/assets/scene/solarsystem/planets/earth/eclipses/paths/hybrid/2031-11-14.asset b/data/assets/scene/solarsystem/planets/earth/eclipses/paths/hybrid/2031-11-14.asset
new file mode 100644
index 0000000000..086ff2fefc
--- /dev/null
+++ b/data/assets/scene/solarsystem/planets/earth/eclipses/paths/hybrid/2031-11-14.asset
@@ -0,0 +1,35 @@
+local earth = asset.require('scene/solarsystem/planets/earth/earth')
+local data = asset.require('../hybrid_data')
+
+
+
+local Layer = {
+  Identifier = "Hybrid-2031-11-14",
+  Enabled = false,
+  File = data.path .. "2031-11-14.geojson",
+  HeightOffset = 2000.0,
+  DefaultProperties = {
+    LineWidth = 2.0,
+    Extrude = true
+  }
+}
+
+
+asset.onInitialize(function()
+  openspace.globebrowsing.addGeoJson(earth.Earth.Identifier, Layer)
+end)
+
+asset.onDeinitialize(function()
+  openspace.globebrowsing.deleteGeoJson(earth.Earth.Identifier, Layer)
+end)
+
+
+
+asset.meta = {
+  Name = "Hybrid 2031-11-14",
+  Version = "1.0",
+  Description = "Hybrid eclipse map for 2031-11-14",
+  Author = "OpenSpace Team",
+  URL = "http://openspaceproject.com",
+  License = "MIT license"
+}
diff --git a/data/assets/scene/solarsystem/planets/earth/eclipses/paths/hybrid_data.asset b/data/assets/scene/solarsystem/planets/earth/eclipses/paths/hybrid_data.asset
new file mode 100644
index 0000000000..e2ef0f9ffd
--- /dev/null
+++ b/data/assets/scene/solarsystem/planets/earth/eclipses/paths/hybrid_data.asset
@@ -0,0 +1,8 @@
+local data = asset.syncedResource({
+  Name = "Hybrid Eclipse Paths",
+  Type = "HttpSynchronization",
+  Identifier = "earth-eclipse-path-hybrid",
+  Version = 1
+})
+
+asset.export("path", data)
diff --git a/data/assets/scene/solarsystem/planets/earth/eclipses/paths/paths.asset b/data/assets/scene/solarsystem/planets/earth/eclipses/paths/paths.asset
new file mode 100644
index 0000000000..28e34ec5e9
--- /dev/null
+++ b/data/assets/scene/solarsystem/planets/earth/eclipses/paths/paths.asset
@@ -0,0 +1,3 @@
+asset.require("./annular")
+asset.require("./hybrid")
+asset.require("./total")
diff --git a/data/assets/scene/solarsystem/planets/earth/eclipses/paths/total.asset b/data/assets/scene/solarsystem/planets/earth/eclipses/paths/total.asset
new file mode 100644
index 0000000000..230c73e921
--- /dev/null
+++ b/data/assets/scene/solarsystem/planets/earth/eclipses/paths/total.asset
@@ -0,0 +1,29 @@
+-- The assets that are commented out in this file currently produce a warning as they
+-- contain geometry that cannot be displayed by OpenSpace correctly
+
+asset.require("./total/2003-11-23")
+asset.require("./total/2006-03-29")
+asset.require("./total/2008-08-01")
+asset.require("./total/2009-07-22")
+asset.require("./total/2010-07-11")
+asset.require("./total/2012-11-13")
+asset.require("./total/2015-03-20")
+asset.require("./total/2016-03-09")
+asset.require("./total/2017-08-21")
+asset.require("./total/2019-07-02")
+asset.require("./total/2020-12-14")
+asset.require("./total/2021-12-04")
+asset.require("./total/2024-04-08")
+asset.require("./total/2026-08-12")
+asset.require("./total/2027-08-02")
+-- asset.require("./total/2028-07-22")
+asset.require("./total/2030-11-25")
+-- asset.require("./total/2033-03-30")
+-- asset.require("./total/2034-03-20")
+asset.require("./total/2035-09-02")
+asset.require("./total/2037-07-13")
+asset.require("./total/2038-12-26")
+asset.require("./total/2039-12-15")
+asset.require("./total/2041-04-30")
+-- asset.require("./total/2042-04-20")
+asset.require("./total/2043-04-09")
diff --git a/data/assets/scene/solarsystem/planets/earth/eclipses/paths/total/2003-11-23.asset b/data/assets/scene/solarsystem/planets/earth/eclipses/paths/total/2003-11-23.asset
new file mode 100644
index 0000000000..82dee12ec2
--- /dev/null
+++ b/data/assets/scene/solarsystem/planets/earth/eclipses/paths/total/2003-11-23.asset
@@ -0,0 +1,35 @@
+local earth = asset.require('scene/solarsystem/planets/earth/earth')
+local data = asset.require('../total_data')
+
+
+
+local Layer = {
+  Identifier = "Total-2003-11-23",
+  Enabled = false,
+  File = data.path .. "2003-11-23.geojson",
+  HeightOffset = 2000.0,
+  DefaultProperties = {
+    LineWidth = 2.0,
+    Extrude = true
+  }
+}
+
+
+asset.onInitialize(function()
+  openspace.globebrowsing.addGeoJson(earth.Earth.Identifier, Layer)
+end)
+
+asset.onDeinitialize(function()
+  openspace.globebrowsing.deleteGeoJson(earth.Earth.Identifier, Layer)
+end)
+
+
+
+asset.meta = {
+  Name = "Total 2003-11-23",
+  Version = "1.0",
+  Description = "Total eclipse map for 2003-11-23",
+  Author = "OpenSpace Team",
+  URL = "http://openspaceproject.com",
+  License = "MIT license"
+}
diff --git a/data/assets/scene/solarsystem/planets/earth/eclipses/paths/total/2006-03-29.asset b/data/assets/scene/solarsystem/planets/earth/eclipses/paths/total/2006-03-29.asset
new file mode 100644
index 0000000000..93642d6571
--- /dev/null
+++ b/data/assets/scene/solarsystem/planets/earth/eclipses/paths/total/2006-03-29.asset
@@ -0,0 +1,35 @@
+local earth = asset.require('scene/solarsystem/planets/earth/earth')
+local data = asset.require('../total_data')
+
+
+
+local Layer = {
+  Identifier = "Total-2006-03-29",
+  Enabled = false,
+  File = data.path .. "2006-03-29.geojson",
+  HeightOffset = 2000.0,
+  DefaultProperties = {
+    LineWidth = 2.0,
+    Extrude = true
+  }
+}
+
+
+asset.onInitialize(function()
+  openspace.globebrowsing.addGeoJson(earth.Earth.Identifier, Layer)
+end)
+
+asset.onDeinitialize(function()
+  openspace.globebrowsing.deleteGeoJson(earth.Earth.Identifier, Layer)
+end)
+
+
+
+asset.meta = {
+  Name = "Total 2006-03-29",
+  Version = "1.0",
+  Description = "Total eclipse map for 2006-03-29",
+  Author = "OpenSpace Team",
+  URL = "http://openspaceproject.com",
+  License = "MIT license"
+}
diff --git a/data/assets/scene/solarsystem/planets/earth/eclipses/paths/total/2008-08-01.asset b/data/assets/scene/solarsystem/planets/earth/eclipses/paths/total/2008-08-01.asset
new file mode 100644
index 0000000000..03df58c887
--- /dev/null
+++ b/data/assets/scene/solarsystem/planets/earth/eclipses/paths/total/2008-08-01.asset
@@ -0,0 +1,35 @@
+local earth = asset.require('scene/solarsystem/planets/earth/earth')
+local data = asset.require('../total_data')
+
+
+
+local Layer = {
+  Identifier = "Total-2008-08-01",
+  Enabled = false,
+  File = data.path .. "2008-08-01.geojson",
+  HeightOffset = 2000.0,
+  DefaultProperties = {
+    LineWidth = 2.0,
+    Extrude = true
+  }
+}
+
+
+asset.onInitialize(function()
+  openspace.globebrowsing.addGeoJson(earth.Earth.Identifier, Layer)
+end)
+
+asset.onDeinitialize(function()
+  openspace.globebrowsing.deleteGeoJson(earth.Earth.Identifier, Layer)
+end)
+
+
+
+asset.meta = {
+  Name = "Total 2008-08-01",
+  Version = "1.0",
+  Description = "Total eclipse map for 2008-08-01",
+  Author = "OpenSpace Team",
+  URL = "http://openspaceproject.com",
+  License = "MIT license"
+}
diff --git a/data/assets/scene/solarsystem/planets/earth/eclipses/paths/total/2009-07-22.asset b/data/assets/scene/solarsystem/planets/earth/eclipses/paths/total/2009-07-22.asset
new file mode 100644
index 0000000000..74d7bc9812
--- /dev/null
+++ b/data/assets/scene/solarsystem/planets/earth/eclipses/paths/total/2009-07-22.asset
@@ -0,0 +1,35 @@
+local earth = asset.require('scene/solarsystem/planets/earth/earth')
+local data = asset.require('../total_data')
+
+
+
+local Layer = {
+  Identifier = "Total-2009-07-22",
+  Enabled = false,
+  File = data.path .. "2009-07-22.geojson",
+  HeightOffset = 2000.0,
+  DefaultProperties = {
+    LineWidth = 2.0,
+    Extrude = true
+  }
+}
+
+
+asset.onInitialize(function()
+  openspace.globebrowsing.addGeoJson(earth.Earth.Identifier, Layer)
+end)
+
+asset.onDeinitialize(function()
+  openspace.globebrowsing.deleteGeoJson(earth.Earth.Identifier, Layer)
+end)
+
+
+
+asset.meta = {
+  Name = "Total 2009-07-22",
+  Version = "1.0",
+  Description = "Total eclipse map for 2009-07-22",
+  Author = "OpenSpace Team",
+  URL = "http://openspaceproject.com",
+  License = "MIT license"
+}
diff --git a/data/assets/scene/solarsystem/planets/earth/eclipses/paths/total/2010-07-11.asset b/data/assets/scene/solarsystem/planets/earth/eclipses/paths/total/2010-07-11.asset
new file mode 100644
index 0000000000..7d6324f10c
--- /dev/null
+++ b/data/assets/scene/solarsystem/planets/earth/eclipses/paths/total/2010-07-11.asset
@@ -0,0 +1,35 @@
+local earth = asset.require('scene/solarsystem/planets/earth/earth')
+local data = asset.require('../total_data')
+
+
+
+local Layer = {
+  Identifier = "Total-2010-07-11",
+  Enabled = false,
+  File = data.path .. "2010-07-11.geojson",
+  HeightOffset = 2000.0,
+  DefaultProperties = {
+    LineWidth = 2.0,
+    Extrude = true
+  }
+}
+
+
+asset.onInitialize(function()
+  openspace.globebrowsing.addGeoJson(earth.Earth.Identifier, Layer)
+end)
+
+asset.onDeinitialize(function()
+  openspace.globebrowsing.deleteGeoJson(earth.Earth.Identifier, Layer)
+end)
+
+
+
+asset.meta = {
+  Name = "Total 2010-07-11",
+  Version = "1.0",
+  Description = "Total eclipse map for 2010-07-11",
+  Author = "OpenSpace Team",
+  URL = "http://openspaceproject.com",
+  License = "MIT license"
+}
diff --git a/data/assets/scene/solarsystem/planets/earth/eclipses/paths/total/2012-11-13.asset b/data/assets/scene/solarsystem/planets/earth/eclipses/paths/total/2012-11-13.asset
new file mode 100644
index 0000000000..bdcf752c8f
--- /dev/null
+++ b/data/assets/scene/solarsystem/planets/earth/eclipses/paths/total/2012-11-13.asset
@@ -0,0 +1,35 @@
+local earth = asset.require('scene/solarsystem/planets/earth/earth')
+local data = asset.require('../total_data')
+
+
+
+local Layer = {
+  Identifier = "Total-2012-11-13",
+  Enabled = false,
+  File = data.path .. "2012-11-13.geojson",
+  HeightOffset = 2000.0,
+  DefaultProperties = {
+    LineWidth = 2.0,
+    Extrude = true
+  }
+}
+
+
+asset.onInitialize(function()
+  openspace.globebrowsing.addGeoJson(earth.Earth.Identifier, Layer)
+end)
+
+asset.onDeinitialize(function()
+  openspace.globebrowsing.deleteGeoJson(earth.Earth.Identifier, Layer)
+end)
+
+
+
+asset.meta = {
+  Name = "Total 2012-11-13",
+  Version = "1.0",
+  Description = "Total eclipse map for 2012-11-13",
+  Author = "OpenSpace Team",
+  URL = "http://openspaceproject.com",
+  License = "MIT license"
+}
diff --git a/data/assets/scene/solarsystem/planets/earth/eclipses/paths/total/2015-03-20.asset b/data/assets/scene/solarsystem/planets/earth/eclipses/paths/total/2015-03-20.asset
new file mode 100644
index 0000000000..4c23180746
--- /dev/null
+++ b/data/assets/scene/solarsystem/planets/earth/eclipses/paths/total/2015-03-20.asset
@@ -0,0 +1,35 @@
+local earth = asset.require('scene/solarsystem/planets/earth/earth')
+local data = asset.require('../total_data')
+
+
+
+local Layer = {
+  Identifier = "Total-2015-03-20",
+  Enabled = false,
+  File = data.path .. "2015-03-20.geojson",
+  HeightOffset = 2000.0,
+  DefaultProperties = {
+    LineWidth = 2.0,
+    Extrude = true
+  }
+}
+
+
+asset.onInitialize(function()
+  openspace.globebrowsing.addGeoJson(earth.Earth.Identifier, Layer)
+end)
+
+asset.onDeinitialize(function()
+  openspace.globebrowsing.deleteGeoJson(earth.Earth.Identifier, Layer)
+end)
+
+
+
+asset.meta = {
+  Name = "Total 2015-03-20",
+  Version = "1.0",
+  Description = "Total eclipse map for 2015-03-20",
+  Author = "OpenSpace Team",
+  URL = "http://openspaceproject.com",
+  License = "MIT license"
+}
diff --git a/data/assets/scene/solarsystem/planets/earth/eclipses/paths/total/2016-03-09.asset b/data/assets/scene/solarsystem/planets/earth/eclipses/paths/total/2016-03-09.asset
new file mode 100644
index 0000000000..80dedefe8a
--- /dev/null
+++ b/data/assets/scene/solarsystem/planets/earth/eclipses/paths/total/2016-03-09.asset
@@ -0,0 +1,35 @@
+local earth = asset.require('scene/solarsystem/planets/earth/earth')
+local data = asset.require('../total_data')
+
+
+
+local Layer = {
+  Identifier = "Total-2016-03-09",
+  Enabled = false,
+  File = data.path .. "2016-03-09.geojson",
+  HeightOffset = 2000.0,
+  DefaultProperties = {
+    LineWidth = 2.0,
+    Extrude = true
+  }
+}
+
+
+asset.onInitialize(function()
+  openspace.globebrowsing.addGeoJson(earth.Earth.Identifier, Layer)
+end)
+
+asset.onDeinitialize(function()
+  openspace.globebrowsing.deleteGeoJson(earth.Earth.Identifier, Layer)
+end)
+
+
+
+asset.meta = {
+  Name = "Total 2016-03-09",
+  Version = "1.0",
+  Description = "Total eclipse map for 2016-03-09",
+  Author = "OpenSpace Team",
+  URL = "http://openspaceproject.com",
+  License = "MIT license"
+}
diff --git a/data/assets/scene/solarsystem/planets/earth/eclipses/paths/total/2017-08-21.asset b/data/assets/scene/solarsystem/planets/earth/eclipses/paths/total/2017-08-21.asset
new file mode 100644
index 0000000000..a33a876600
--- /dev/null
+++ b/data/assets/scene/solarsystem/planets/earth/eclipses/paths/total/2017-08-21.asset
@@ -0,0 +1,35 @@
+local earth = asset.require('scene/solarsystem/planets/earth/earth')
+local data = asset.require('../total_data')
+
+
+
+local Layer = {
+  Identifier = "Total-2017-08-21",
+  Enabled = false,
+  File = data.path .. "2017-08-21.geojson",
+  HeightOffset = 2000.0,
+  DefaultProperties = {
+    LineWidth = 2.0,
+    Extrude = true
+  }
+}
+
+
+asset.onInitialize(function()
+  openspace.globebrowsing.addGeoJson(earth.Earth.Identifier, Layer)
+end)
+
+asset.onDeinitialize(function()
+  openspace.globebrowsing.deleteGeoJson(earth.Earth.Identifier, Layer)
+end)
+
+
+
+asset.meta = {
+  Name = "Total 2017-08-21",
+  Version = "1.0",
+  Description = "Total eclipse map for 2017-08-21",
+  Author = "OpenSpace Team",
+  URL = "http://openspaceproject.com",
+  License = "MIT license"
+}
diff --git a/data/assets/scene/solarsystem/planets/earth/eclipses/paths/total/2019-07-02.asset b/data/assets/scene/solarsystem/planets/earth/eclipses/paths/total/2019-07-02.asset
new file mode 100644
index 0000000000..49f39e18dd
--- /dev/null
+++ b/data/assets/scene/solarsystem/planets/earth/eclipses/paths/total/2019-07-02.asset
@@ -0,0 +1,35 @@
+local earth = asset.require('scene/solarsystem/planets/earth/earth')
+local data = asset.require('../total_data')
+
+
+
+local Layer = {
+  Identifier = "Total-2019-07-02",
+  Enabled = false,
+  File = data.path .. "2019-07-02.geojson",
+  HeightOffset = 2000.0,
+  DefaultProperties = {
+    LineWidth = 2.0,
+    Extrude = true
+  }
+}
+
+
+asset.onInitialize(function()
+  openspace.globebrowsing.addGeoJson(earth.Earth.Identifier, Layer)
+end)
+
+asset.onDeinitialize(function()
+  openspace.globebrowsing.deleteGeoJson(earth.Earth.Identifier, Layer)
+end)
+
+
+
+asset.meta = {
+  Name = "Total 2019-07-02",
+  Version = "1.0",
+  Description = "Total eclipse map for 2019-07-02",
+  Author = "OpenSpace Team",
+  URL = "http://openspaceproject.com",
+  License = "MIT license"
+}
diff --git a/data/assets/scene/solarsystem/planets/earth/eclipses/paths/total/2020-12-14.asset b/data/assets/scene/solarsystem/planets/earth/eclipses/paths/total/2020-12-14.asset
new file mode 100644
index 0000000000..116351bc69
--- /dev/null
+++ b/data/assets/scene/solarsystem/planets/earth/eclipses/paths/total/2020-12-14.asset
@@ -0,0 +1,35 @@
+local earth = asset.require('scene/solarsystem/planets/earth/earth')
+local data = asset.require('../total_data')
+
+
+
+local Layer = {
+  Identifier = "Total-2020-12-14",
+  Enabled = false,
+  File = data.path .. "2020-12-14.geojson",
+  HeightOffset = 2000.0,
+  DefaultProperties = {
+    LineWidth = 2.0,
+    Extrude = true
+  }
+}
+
+
+asset.onInitialize(function()
+  openspace.globebrowsing.addGeoJson(earth.Earth.Identifier, Layer)
+end)
+
+asset.onDeinitialize(function()
+  openspace.globebrowsing.deleteGeoJson(earth.Earth.Identifier, Layer)
+end)
+
+
+
+asset.meta = {
+  Name = "Total 2020-12-14",
+  Version = "1.0",
+  Description = "Total eclipse map for 2020-12-14",
+  Author = "OpenSpace Team",
+  URL = "http://openspaceproject.com",
+  License = "MIT license"
+}
diff --git a/data/assets/scene/solarsystem/planets/earth/eclipses/paths/total/2021-12-04.asset b/data/assets/scene/solarsystem/planets/earth/eclipses/paths/total/2021-12-04.asset
new file mode 100644
index 0000000000..b01e33b354
--- /dev/null
+++ b/data/assets/scene/solarsystem/planets/earth/eclipses/paths/total/2021-12-04.asset
@@ -0,0 +1,35 @@
+local earth = asset.require('scene/solarsystem/planets/earth/earth')
+local data = asset.require('../total_data')
+
+
+
+local Layer = {
+  Identifier = "Total-2021-12-04",
+  Enabled = false,
+  File = data.path .. "2021-12-04.geojson",
+  HeightOffset = 2000.0,
+  DefaultProperties = {
+    LineWidth = 2.0,
+    Extrude = true
+  }
+}
+
+
+asset.onInitialize(function()
+  openspace.globebrowsing.addGeoJson(earth.Earth.Identifier, Layer)
+end)
+
+asset.onDeinitialize(function()
+  openspace.globebrowsing.deleteGeoJson(earth.Earth.Identifier, Layer)
+end)
+
+
+
+asset.meta = {
+  Name = "Total 2021-12-04",
+  Version = "1.0",
+  Description = "Total eclipse map for 2021-12-04",
+  Author = "OpenSpace Team",
+  URL = "http://openspaceproject.com",
+  License = "MIT license"
+}
diff --git a/data/assets/scene/solarsystem/planets/earth/eclipses/paths/total/2024-04-08.asset b/data/assets/scene/solarsystem/planets/earth/eclipses/paths/total/2024-04-08.asset
new file mode 100644
index 0000000000..47e8efd726
--- /dev/null
+++ b/data/assets/scene/solarsystem/planets/earth/eclipses/paths/total/2024-04-08.asset
@@ -0,0 +1,35 @@
+local earth = asset.require('scene/solarsystem/planets/earth/earth')
+local data = asset.require('../total_data')
+
+
+
+local Layer = {
+  Identifier = "Total-2024-04-08",
+  Enabled = false,
+  File = data.path .. "2024-04-08.geojson",
+  HeightOffset = 2000.0,
+  DefaultProperties = {
+    LineWidth = 2.0,
+    Extrude = true
+  }
+}
+
+
+asset.onInitialize(function()
+  openspace.globebrowsing.addGeoJson(earth.Earth.Identifier, Layer)
+end)
+
+asset.onDeinitialize(function()
+  openspace.globebrowsing.deleteGeoJson(earth.Earth.Identifier, Layer)
+end)
+
+
+
+asset.meta = {
+  Name = "Total 2024-04-08",
+  Version = "1.0",
+  Description = "Total eclipse map for 2024-04-08",
+  Author = "OpenSpace Team",
+  URL = "http://openspaceproject.com",
+  License = "MIT license"
+}
diff --git a/data/assets/scene/solarsystem/planets/earth/eclipses/paths/total/2026-08-12.asset b/data/assets/scene/solarsystem/planets/earth/eclipses/paths/total/2026-08-12.asset
new file mode 100644
index 0000000000..e73db56245
--- /dev/null
+++ b/data/assets/scene/solarsystem/planets/earth/eclipses/paths/total/2026-08-12.asset
@@ -0,0 +1,35 @@
+local earth = asset.require('scene/solarsystem/planets/earth/earth')
+local data = asset.require('../total_data')
+
+
+
+local Layer = {
+  Identifier = "Total-2026-08-12",
+  Enabled = false,
+  File = data.path .. "2026-08-12.geojson",
+  HeightOffset = 2000.0,
+  DefaultProperties = {
+    LineWidth = 2.0,
+    Extrude = true
+  }
+}
+
+
+asset.onInitialize(function()
+  openspace.globebrowsing.addGeoJson(earth.Earth.Identifier, Layer)
+end)
+
+asset.onDeinitialize(function()
+  openspace.globebrowsing.deleteGeoJson(earth.Earth.Identifier, Layer)
+end)
+
+
+
+asset.meta = {
+  Name = "Total 2026-08-12",
+  Version = "1.0",
+  Description = "Total eclipse map for 2026-08-12",
+  Author = "OpenSpace Team",
+  URL = "http://openspaceproject.com",
+  License = "MIT license"
+}
diff --git a/data/assets/scene/solarsystem/planets/earth/eclipses/paths/total/2027-08-02.asset b/data/assets/scene/solarsystem/planets/earth/eclipses/paths/total/2027-08-02.asset
new file mode 100644
index 0000000000..b13e5035b3
--- /dev/null
+++ b/data/assets/scene/solarsystem/planets/earth/eclipses/paths/total/2027-08-02.asset
@@ -0,0 +1,35 @@
+local earth = asset.require('scene/solarsystem/planets/earth/earth')
+local data = asset.require('../total_data')
+
+
+
+local Layer = {
+  Identifier = "Total-2027-08-02",
+  Enabled = false,
+  File = data.path .. "2027-08-02.geojson",
+  HeightOffset = 2000.0,
+  DefaultProperties = {
+    LineWidth = 2.0,
+    Extrude = true
+  }
+}
+
+
+asset.onInitialize(function()
+  openspace.globebrowsing.addGeoJson(earth.Earth.Identifier, Layer)
+end)
+
+asset.onDeinitialize(function()
+  openspace.globebrowsing.deleteGeoJson(earth.Earth.Identifier, Layer)
+end)
+
+
+
+asset.meta = {
+  Name = "Total 2027-08-02",
+  Version = "1.0",
+  Description = "Total eclipse map for 2027-08-02",
+  Author = "OpenSpace Team",
+  URL = "http://openspaceproject.com",
+  License = "MIT license"
+}
diff --git a/data/assets/scene/solarsystem/planets/earth/eclipses/paths/total/2028-07-22.asset b/data/assets/scene/solarsystem/planets/earth/eclipses/paths/total/2028-07-22.asset
new file mode 100644
index 0000000000..e886f56326
--- /dev/null
+++ b/data/assets/scene/solarsystem/planets/earth/eclipses/paths/total/2028-07-22.asset
@@ -0,0 +1,37 @@
+local earth = asset.require('scene/solarsystem/planets/earth/earth')
+local data = asset.require('../total_data')
+
+
+
+local Layer = {
+  Identifier = "Total-2028-07-22",
+  Enabled = false,
+  File = data.path .. "2028-07-22.geojson",
+  HeightOffset = 2000.0,
+  DefaultProperties = {
+    LineWidth = 2.0,
+    Extrude = true
+  }
+}
+
+
+asset.onInitialize(function()
+  openspace.printWarning("The map for the total eclipse of 22nd July 2028 contains a geometry that cannot be read right now")
+  -- @TODO:  The file contains a non-simple geometry which is currently not supported
+  -- openspace.globebrowsing.addGeoJson(earth.Earth.Identifier, Layer)
+end)
+
+asset.onDeinitialize(function()
+  -- openspace.globebrowsing.deleteGeoJson(earth.Earth.Identifier, Layer)
+end)
+
+
+
+asset.meta = {
+  Name = "Total 2028-07-22",
+  Version = "1.0",
+  Description = "Total eclipse map for 2028-07-22",
+  Author = "OpenSpace Team",
+  URL = "http://openspaceproject.com",
+  License = "MIT license"
+}
diff --git a/data/assets/scene/solarsystem/planets/earth/eclipses/paths/total/2030-11-25.asset b/data/assets/scene/solarsystem/planets/earth/eclipses/paths/total/2030-11-25.asset
new file mode 100644
index 0000000000..b33981bb1e
--- /dev/null
+++ b/data/assets/scene/solarsystem/planets/earth/eclipses/paths/total/2030-11-25.asset
@@ -0,0 +1,35 @@
+local earth = asset.require('scene/solarsystem/planets/earth/earth')
+local data = asset.require('../total_data')
+
+
+
+local Layer = {
+  Identifier = "Total-2030-11-25",
+  Enabled = false,
+  File = data.path .. "2030-11-25.geojson",
+  HeightOffset = 2000.0,
+  DefaultProperties = {
+    LineWidth = 2.0,
+    Extrude = true
+  }
+}
+
+
+asset.onInitialize(function()
+  openspace.globebrowsing.addGeoJson(earth.Earth.Identifier, Layer)
+end)
+
+asset.onDeinitialize(function()
+  openspace.globebrowsing.deleteGeoJson(earth.Earth.Identifier, Layer)
+end)
+
+
+
+asset.meta = {
+  Name = "Total 2030-11-25",
+  Version = "1.0",
+  Description = "Total eclipse map for 2030-11-25",
+  Author = "OpenSpace Team",
+  URL = "http://openspaceproject.com",
+  License = "MIT license"
+}
diff --git a/data/assets/scene/solarsystem/planets/earth/eclipses/paths/total/2033-03-30.asset b/data/assets/scene/solarsystem/planets/earth/eclipses/paths/total/2033-03-30.asset
new file mode 100644
index 0000000000..aae1ac71f0
--- /dev/null
+++ b/data/assets/scene/solarsystem/planets/earth/eclipses/paths/total/2033-03-30.asset
@@ -0,0 +1,37 @@
+local earth = asset.require('scene/solarsystem/planets/earth/earth')
+local data = asset.require('../total_data')
+
+
+
+local Layer = {
+  Identifier = "Total-2033-03-30",
+  Enabled = false,
+  File = data.path .. "2033-03-30.geojson",
+  HeightOffset = 2000.0,
+  DefaultProperties = {
+    LineWidth = 2.0,
+    Extrude = true
+  }
+}
+
+
+asset.onInitialize(function()
+  openspace.printWarning("The map for the total eclipse of 30th March 2033 contains a geometry that cannot be read right now")
+  -- @TODO:  The file contains a non-simple geometry which is currently not supported
+  -- openspace.globebrowsing.addGeoJson(earth.Earth.Identifier, Layer)
+end)
+
+asset.onDeinitialize(function()
+  -- openspace.globebrowsing.deleteGeoJson(earth.Earth.Identifier, Layer)
+end)
+
+
+
+asset.meta = {
+  Name = "Total 2033-03-30",
+  Version = "1.0",
+  Description = "Total eclipse map for 2033-03-30",
+  Author = "OpenSpace Team",
+  URL = "http://openspaceproject.com",
+  License = "MIT license"
+}
diff --git a/data/assets/scene/solarsystem/planets/earth/eclipses/paths/total/2034-03-20.asset b/data/assets/scene/solarsystem/planets/earth/eclipses/paths/total/2034-03-20.asset
new file mode 100644
index 0000000000..c5a662ddab
--- /dev/null
+++ b/data/assets/scene/solarsystem/planets/earth/eclipses/paths/total/2034-03-20.asset
@@ -0,0 +1,37 @@
+local earth = asset.require('scene/solarsystem/planets/earth/earth')
+local data = asset.require('../total_data')
+
+
+
+local Layer = {
+  Identifier = "Total-2034-03-20",
+  Enabled = false,
+  File = data.path .. "2034-03-20.geojson",
+  HeightOffset = 2000.0,
+  DefaultProperties = {
+    LineWidth = 2.0,
+    Extrude = true
+  }
+}
+
+
+asset.onInitialize(function()
+  openspace.printWarning("The map for the total eclipse of 20th March 2034 contains a geometry that cannot be read right now")
+  -- @TODO:  The file contains a non-simple geometry which is currently not supported
+  -- openspace.globebrowsing.addGeoJson(earth.Earth.Identifier, Layer)
+end)
+
+asset.onDeinitialize(function()
+  -- openspace.globebrowsing.deleteGeoJson(earth.Earth.Identifier, Layer)
+end)
+
+
+
+asset.meta = {
+  Name = "Total 2034-03-20",
+  Version = "1.0",
+  Description = "Total eclipse map for 2034-03-20",
+  Author = "OpenSpace Team",
+  URL = "http://openspaceproject.com",
+  License = "MIT license"
+}
diff --git a/data/assets/scene/solarsystem/planets/earth/eclipses/paths/total/2035-09-02.asset b/data/assets/scene/solarsystem/planets/earth/eclipses/paths/total/2035-09-02.asset
new file mode 100644
index 0000000000..ea1110a5b4
--- /dev/null
+++ b/data/assets/scene/solarsystem/planets/earth/eclipses/paths/total/2035-09-02.asset
@@ -0,0 +1,35 @@
+local earth = asset.require('scene/solarsystem/planets/earth/earth')
+local data = asset.require('../total_data')
+
+
+
+local Layer = {
+  Identifier = "Total-2035-09-02",
+  Enabled = false,
+  File = data.path .. "2035-09-02.geojson",
+  HeightOffset = 2000.0,
+  DefaultProperties = {
+    LineWidth = 2.0,
+    Extrude = true
+  }
+}
+
+
+asset.onInitialize(function()
+  openspace.globebrowsing.addGeoJson(earth.Earth.Identifier, Layer)
+end)
+
+asset.onDeinitialize(function()
+  openspace.globebrowsing.deleteGeoJson(earth.Earth.Identifier, Layer)
+end)
+
+
+
+asset.meta = {
+  Name = "Total 2035-09-02",
+  Version = "1.0",
+  Description = "Total eclipse map for 2035-09-02",
+  Author = "OpenSpace Team",
+  URL = "http://openspaceproject.com",
+  License = "MIT license"
+}
diff --git a/data/assets/scene/solarsystem/planets/earth/eclipses/paths/total/2037-07-13.asset b/data/assets/scene/solarsystem/planets/earth/eclipses/paths/total/2037-07-13.asset
new file mode 100644
index 0000000000..9d3b1ba1d3
--- /dev/null
+++ b/data/assets/scene/solarsystem/planets/earth/eclipses/paths/total/2037-07-13.asset
@@ -0,0 +1,35 @@
+local earth = asset.require('scene/solarsystem/planets/earth/earth')
+local data = asset.require('../total_data')
+
+
+
+local Layer = {
+  Identifier = "Total-2037-07-13",
+  Enabled = false,
+  File = data.path .. "2037-07-13.geojson",
+  HeightOffset = 2000.0,
+  DefaultProperties = {
+    LineWidth = 2.0,
+    Extrude = true
+  }
+}
+
+
+asset.onInitialize(function()
+  openspace.globebrowsing.addGeoJson(earth.Earth.Identifier, Layer)
+end)
+
+asset.onDeinitialize(function()
+  openspace.globebrowsing.deleteGeoJson(earth.Earth.Identifier, Layer)
+end)
+
+
+
+asset.meta = {
+  Name = "Total 2037-07-13",
+  Version = "1.0",
+  Description = "Total eclipse map for 2037-07-13",
+  Author = "OpenSpace Team",
+  URL = "http://openspaceproject.com",
+  License = "MIT license"
+}
diff --git a/data/assets/scene/solarsystem/planets/earth/eclipses/paths/total/2038-12-26.asset b/data/assets/scene/solarsystem/planets/earth/eclipses/paths/total/2038-12-26.asset
new file mode 100644
index 0000000000..19964c89ce
--- /dev/null
+++ b/data/assets/scene/solarsystem/planets/earth/eclipses/paths/total/2038-12-26.asset
@@ -0,0 +1,35 @@
+local earth = asset.require('scene/solarsystem/planets/earth/earth')
+local data = asset.require('../total_data')
+
+
+
+local Layer = {
+  Identifier = "Total-2038-12-26",
+  Enabled = false,
+  File = data.path .. "2038-12-26.geojson",
+  HeightOffset = 2000.0,
+  DefaultProperties = {
+    LineWidth = 2.0,
+    Extrude = true
+  }
+}
+
+
+asset.onInitialize(function()
+  openspace.globebrowsing.addGeoJson(earth.Earth.Identifier, Layer)
+end)
+
+asset.onDeinitialize(function()
+  openspace.globebrowsing.deleteGeoJson(earth.Earth.Identifier, Layer)
+end)
+
+
+
+asset.meta = {
+  Name = "Total 2038-12-26",
+  Version = "1.0",
+  Description = "Total eclipse map for 2038-12-26",
+  Author = "OpenSpace Team",
+  URL = "http://openspaceproject.com",
+  License = "MIT license"
+}
diff --git a/data/assets/scene/solarsystem/planets/earth/eclipses/paths/total/2039-12-15.asset b/data/assets/scene/solarsystem/planets/earth/eclipses/paths/total/2039-12-15.asset
new file mode 100644
index 0000000000..46c2d0c9b8
--- /dev/null
+++ b/data/assets/scene/solarsystem/planets/earth/eclipses/paths/total/2039-12-15.asset
@@ -0,0 +1,35 @@
+local earth = asset.require('scene/solarsystem/planets/earth/earth')
+local data = asset.require('../total_data')
+
+
+
+local Layer = {
+  Identifier = "Total-2039-12-15",
+  Enabled = false,
+  File = data.path .. "2039-12-15.geojson",
+  HeightOffset = 2000.0,
+  DefaultProperties = {
+    LineWidth = 2.0,
+    Extrude = true
+  }
+}
+
+
+asset.onInitialize(function()
+  openspace.globebrowsing.addGeoJson(earth.Earth.Identifier, Layer)
+end)
+
+asset.onDeinitialize(function()
+  openspace.globebrowsing.deleteGeoJson(earth.Earth.Identifier, Layer)
+end)
+
+
+
+asset.meta = {
+  Name = "Total 2039-12-15",
+  Version = "1.0",
+  Description = "Total eclipse map for 2039-12-15",
+  Author = "OpenSpace Team",
+  URL = "http://openspaceproject.com",
+  License = "MIT license"
+}
diff --git a/data/assets/scene/solarsystem/planets/earth/eclipses/paths/total/2041-04-30.asset b/data/assets/scene/solarsystem/planets/earth/eclipses/paths/total/2041-04-30.asset
new file mode 100644
index 0000000000..7b215343c7
--- /dev/null
+++ b/data/assets/scene/solarsystem/planets/earth/eclipses/paths/total/2041-04-30.asset
@@ -0,0 +1,35 @@
+local earth = asset.require('scene/solarsystem/planets/earth/earth')
+local data = asset.require('../total_data')
+
+
+
+local Layer = {
+  Identifier = "Total-2041-04-30",
+  Enabled = false,
+  File = data.path .. "2041-04-30.geojson",
+  HeightOffset = 2000.0,
+  DefaultProperties = {
+    LineWidth = 2.0,
+    Extrude = true
+  }
+}
+
+
+asset.onInitialize(function()
+  openspace.globebrowsing.addGeoJson(earth.Earth.Identifier, Layer)
+end)
+
+asset.onDeinitialize(function()
+  openspace.globebrowsing.deleteGeoJson(earth.Earth.Identifier, Layer)
+end)
+
+
+
+asset.meta = {
+  Name = "Total 2041-04-30",
+  Version = "1.0",
+  Description = "Total eclipse map for 2041-04-30",
+  Author = "OpenSpace Team",
+  URL = "http://openspaceproject.com",
+  License = "MIT license"
+}
diff --git a/data/assets/scene/solarsystem/planets/earth/eclipses/paths/total/2042-04-20.asset b/data/assets/scene/solarsystem/planets/earth/eclipses/paths/total/2042-04-20.asset
new file mode 100644
index 0000000000..952a43a8a9
--- /dev/null
+++ b/data/assets/scene/solarsystem/planets/earth/eclipses/paths/total/2042-04-20.asset
@@ -0,0 +1,37 @@
+local earth = asset.require('scene/solarsystem/planets/earth/earth')
+local data = asset.require('../total_data')
+
+
+
+local Layer = {
+  Identifier = "Total-2042-04-20",
+  Enabled = false,
+  File = data.path .. "2042-04-20.geojson",
+  HeightOffset = 2000.0,
+  DefaultProperties = {
+    LineWidth = 2.0,
+    Extrude = true
+  }
+}
+
+
+asset.onInitialize(function()
+  openspace.printWarning("The map for the total eclipse of 20th April 2042 contains a geometry that cannot be read right now")
+  -- @TODO:  The file contains a non-simple geometry which is currently not supported
+  -- openspace.globebrowsing.addGeoJson(earth.Earth.Identifier, Layer)
+end)
+
+asset.onDeinitialize(function()
+  -- openspace.globebrowsing.deleteGeoJson(earth.Earth.Identifier, Layer)
+end)
+
+
+
+asset.meta = {
+  Name = "Total 2042-04-20",
+  Version = "1.0",
+  Description = "Total eclipse map for 2042-04-20",
+  Author = "OpenSpace Team",
+  URL = "http://openspaceproject.com",
+  License = "MIT license"
+}
diff --git a/data/assets/scene/solarsystem/planets/earth/eclipses/paths/total/2043-04-09.asset b/data/assets/scene/solarsystem/planets/earth/eclipses/paths/total/2043-04-09.asset
new file mode 100644
index 0000000000..96a3637e8d
--- /dev/null
+++ b/data/assets/scene/solarsystem/planets/earth/eclipses/paths/total/2043-04-09.asset
@@ -0,0 +1,35 @@
+local earth = asset.require('scene/solarsystem/planets/earth/earth')
+local data = asset.require('../total_data')
+
+
+
+local Layer = {
+  Identifier = "Total-2043-04-09",
+  Enabled = false,
+  File = data.path .. "2043-04-09.geojson",
+  HeightOffset = 2000.0,
+  DefaultProperties = {
+    LineWidth = 2.0,
+    Extrude = true
+  }
+}
+
+
+asset.onInitialize(function()
+  openspace.globebrowsing.addGeoJson(earth.Earth.Identifier, Layer)
+end)
+
+asset.onDeinitialize(function()
+  openspace.globebrowsing.deleteGeoJson(earth.Earth.Identifier, Layer)
+end)
+
+
+
+asset.meta = {
+  Name = "Total 2043-04-09",
+  Version = "1.0",
+  Description = "Total eclipse map for 2043-04-09",
+  Author = "OpenSpace Team",
+  URL = "http://openspaceproject.com",
+  License = "MIT license"
+}
diff --git a/data/assets/scene/solarsystem/planets/earth/eclipses/paths/total_data.asset b/data/assets/scene/solarsystem/planets/earth/eclipses/paths/total_data.asset
new file mode 100644
index 0000000000..826632b191
--- /dev/null
+++ b/data/assets/scene/solarsystem/planets/earth/eclipses/paths/total_data.asset
@@ -0,0 +1,8 @@
+local data = asset.syncedResource({
+  Name = "Total Eclipse Paths",
+  Type = "HttpSynchronization",
+  Identifier = "earth-eclipse-path-total",
+  Version = 1
+})
+
+asset.export("path", data)
diff --git a/data/assets/scene/solarsystem/planets/earth/eclipses/timeline.asset b/data/assets/scene/solarsystem/planets/earth/eclipses/timeline.asset
new file mode 100644
index 0000000000..ad5d31540e
--- /dev/null
+++ b/data/assets/scene/solarsystem/planets/earth/eclipses/timeline.asset
@@ -0,0 +1,2290 @@
+local Timeline = {
+  Name = "Eclipses",
+  Image = "https://www.esa.int/var/esa/storage/images/esa_multimedia/images/2019/07/stages_of_a_total_solar_eclipse/19468511-1-eng-GB/Stages_of_a_total_solar_eclipse_pillars.jpg",
+  Description = "An eclipse is an awe-inspiring celestial event that drastically changes the appearance of the two biggest objects we see in our sky: our Sun and Moon. On Earth, people can experience solar eclipses when Earth, the Moon, and the Sun line up. There are four types of solar eclipses: total, partial, hybrid, and annular. The type of eclipse that people get to see depends on how the Moon aligns with Earth and the Sun, and how far away the Moon is from Earth. In addition to inspiring artists and musicians, eclipses have driven numerous scientific discoveries. For over a century, solar eclipses helped scientists decipher the Sun's structure and explosive events, find evidence for the theory of general relativity, discover a new element, and much more. Scientists still study eclipses to make new discoveries about the Sun, Earth, and our space environment. Total solar eclipses are particularly important because they allow scientists to see a part of the Sun's atmosphere - known as the corona - which is too faint to see except when the bright light of the Sun's surface is blocked.",
+  TimeRange = {
+    Start = "1900 Jan 01",
+    End = "2099 Dec 31"
+  },
+  Milestones = {
+    {
+      Name = "Total Eclipse",
+      Date = "1901 May 18 05:33:48",
+      Image = "https://eclipse.gsfc.nasa.gov/5MCSEmap/1901-2000/1901-05-18.gif"
+    },
+    {
+      Name = "Annular Eclipse",
+      Date = "1901 Nov 11 07:28:21",
+      Image = "https://eclipse.gsfc.nasa.gov/5MCSEmap/1901-2000/1901-11-11.gif"
+    },
+    {
+      Name = "Partial Eclipse",
+      Date = "1902 Apr 08 14:05:06",
+      Image = "https://eclipse.gsfc.nasa.gov/5MCSEmap/1901-2000/1902-04-08.gif"
+    },
+    {
+      Name = "Partial Eclipse",
+      Date = "1902 May 07 22:34:16",
+      Image = "https://eclipse.gsfc.nasa.gov/5MCSEmap/1901-2000/1902-05-07.gif"
+    },
+    {
+      Name = "Partial Eclipse",
+      Date = "1902 Oct 31 08:00:18",
+      Image = "https://eclipse.gsfc.nasa.gov/5MCSEmap/1901-2000/1902-10-31.gif"
+    },
+    {
+      Name = "Annular Eclipse",
+      Date = "1903 Mar 29 01:35:2",
+      Image = "https://eclipse.gsfc.nasa.gov/5MCSEmap/1901-2000/1903-03-29.gif"
+    },
+    {
+      Name = "Total Eclipse",
+      Date = "1903 Sep 21 04:39:52",
+      Image = "https://eclipse.gsfc.nasa.gov/5MCSEmap/1901-2000/1903-09-21.gif"
+    },
+    {
+      Name = "Annular Eclipse",
+      Date = "1904 Mar 17 05:40:44",
+      Image = "https://eclipse.gsfc.nasa.gov/5MCSEmap/1901-2000/1904-03-17.gif"
+    },
+    {
+      Name = "Total Eclipse",
+      Date = "1904 Sep 09 20:44:21",
+      Image = "https://eclipse.gsfc.nasa.gov/5MCSEmap/1901-2000/1904-09-09.gif"
+    },
+    {
+      Name = "Annular Eclipse",
+      Date = "1905 Mar 06 05:12:26",
+      Image = "https://eclipse.gsfc.nasa.gov/5MCSEmap/1901-2000/1905-03-06.gif"
+    },
+    {
+      Name = "Total Eclipse",
+      Date = "1905 Aug 30 13:07:26",
+      Image = "https://eclipse.gsfc.nasa.gov/5MCSEmap/1901-2000/1905-08-30.gif"
+    },
+    {
+      Name = "Partial Eclipse",
+      Date = "1906 Feb 23 07:43:20",
+      Image = "https://eclipse.gsfc.nasa.gov/5MCSEmap/1901-2000/1906-02-23.gif"
+    },
+    {
+      Name = "Partial Eclipse",
+      Date = "1906 Jul 21 13:14:19",
+      Image = "https://eclipse.gsfc.nasa.gov/5MCSEmap/1901-2000/1906-07-21.gif"
+    },
+    {
+      Name = "Partial Eclipse",
+      Date = "1906 Aug 20 01:12:50",
+      Image = "https://eclipse.gsfc.nasa.gov/5MCSEmap/1901-2000/1906-08-20.gif"
+    },
+    {
+      Name = "Total Eclipse",
+      Date = "1907 Jan 14 06:05:43",
+      Image = "https://eclipse.gsfc.nasa.gov/5MCSEmap/1901-2000/1907-01-14.gif"
+    },
+    {
+      Name = "Annular Eclipse",
+      Date = "1907 Jul 10 15:24:32",
+      Image = "https://eclipse.gsfc.nasa.gov/5MCSEmap/1901-2000/1907-07-10.gif"
+    },
+    {
+      Name = "Total Eclipse",
+      Date = "1908 Jan 03 21:45:22",
+      Image = "https://eclipse.gsfc.nasa.gov/5MCSEmap/1901-2000/1908-01-03.gif"
+    },
+    {
+      Name = "Annular Eclipse",
+      Date = "1908 Jun 28 16:29:51",
+      Image = "https://eclipse.gsfc.nasa.gov/5MCSEmap/1901-2000/1908-06-28.gif"
+    },
+    {
+      Name = "Hybrid Eclipse",
+      Date = "1908 Dec 23 11:44:28",
+      Image = "https://eclipse.gsfc.nasa.gov/5MCSEmap/1901-2000/1908-12-23.gif"
+    },
+    {
+      Name = "Hybrid Eclipse",
+      Date = "1909 Jun 17 23:18:38",
+      Image = "https://eclipse.gsfc.nasa.gov/5MCSEmap/1901-2000/1909-06-17.gif"
+    },
+    {
+      Name = "Partial Eclipse",
+      Date = "1909 Dec 12 19:44:48",
+      Image = "https://eclipse.gsfc.nasa.gov/5MCSEmap/1901-2000/1909-12-12.gif"
+    },
+    {
+      Name = "Total Eclipse",
+      Date = "1910 May 09 05:42:13",
+      Image = "https://eclipse.gsfc.nasa.gov/5MCSEmap/1901-2000/1910-05-09.gif"
+    },
+    {
+      Name = "Partial Eclipse",
+      Date = "1910 Nov 02 02:08:32",
+      Image = "https://eclipse.gsfc.nasa.gov/5MCSEmap/1901-2000/1910-11-02.gif"
+    },
+    {
+      Name = "Total Eclipse",
+      Date = "1911 Apr 28 22:27:22",
+      Image = "https://eclipse.gsfc.nasa.gov/5MCSEmap/1901-2000/1911-04-28.gif"
+    },
+    {
+      Name = "Annular Eclipse",
+      Date = "1911 Oct 22 04:13:02",
+      Image = "https://eclipse.gsfc.nasa.gov/5MCSEmap/1901-2000/1911-10-22.gif"
+    },
+    {
+      Name = "Hybrid Eclipse",
+      Date = "1912 Apr 17 11:34:22",
+      Image = "https://eclipse.gsfc.nasa.gov/5MCSEmap/1901-2000/1912-04-17.gif"
+    },
+    {
+      Name = "Total Eclipse",
+      Date = "1912 Oct 10 13:36:14",
+      Image = "https://eclipse.gsfc.nasa.gov/5MCSEmap/1901-2000/1912-10-10.gif"
+    },
+    {
+      Name = "Partial Eclipse",
+      Date = "1913 Apr 06 17:33:07",
+      Image = "https://eclipse.gsfc.nasa.gov/5MCSEmap/1901-2000/1913-04-06.gif"
+    },
+    {
+      Name = "Partial Eclipse",
+      Date = "1913 Aug 31 20:52:12",
+      Image = "https://eclipse.gsfc.nasa.gov/5MCSEmap/1901-2000/1913-08-31.gif"
+    },
+    {
+      Name = "Partial Eclipse",
+      Date = "1913 Sep 30 04:45:49",
+      Image = "https://eclipse.gsfc.nasa.gov/5MCSEmap/1901-2000/1913-09-30.gif"
+    },
+    {
+      Name = "Annular Eclipse",
+      Date = "1914 Feb 25 00:13:01",
+      Image = "https://eclipse.gsfc.nasa.gov/5MCSEmap/1901-2000/1914-02-25.gif"
+    },
+    {
+      Name = "Total Eclipse",
+      Date = "1914 Aug 21 12:34:27",
+      Image = "https://eclipse.gsfc.nasa.gov/5MCSEmap/1901-2000/1914-08-21.gif"
+    },
+    {
+      Name = "Annular Eclipse",
+      Date = "1915 Feb 14 04:33:20",
+      Image = "https://eclipse.gsfc.nasa.gov/5MCSEmap/1901-2000/1915-02-14.gif"
+    },
+    {
+      Name = "Annular Eclipse",
+      Date = "1915 Aug 10 22:52:25",
+      Image = "https://eclipse.gsfc.nasa.gov/5MCSEmap/1901-2000/1915-08-10.gif"
+    },
+    {
+      Name = "Total Eclipse",
+      Date = "1916 Feb 03 16:00:21",
+      Image = "https://eclipse.gsfc.nasa.gov/5MCSEmap/1901-2000/1916-02-03.gif"
+    },
+    {
+      Name = "Annular Eclipse",
+      Date = "1916 Jul 30 02:06:10",
+      Image = "https://eclipse.gsfc.nasa.gov/5MCSEmap/1901-2000/1916-07-30.gif"
+    },
+    {
+      Name = "Partial Eclipse",
+      Date = "1916 Dec 24 20:46:22",
+      Image = "https://eclipse.gsfc.nasa.gov/5MCSEmap/1901-2000/1916-12-24.gif"
+    },
+    {
+      Name = "Partial Eclipse",
+      Date = "1917 Jan 23 07:28:31",
+      Image = "https://eclipse.gsfc.nasa.gov/5MCSEmap/1901-2000/1917-01-23.gif"
+    },
+    {
+      Name = "Partial Eclipse",
+      Date = "1917 Jun 19 13:16:21",
+      Image = "https://eclipse.gsfc.nasa.gov/5MCSEmap/1901-2000/1917-06-19.gif"
+    },
+    {
+      Name = "Partial Eclipse",
+      Date = "1917 Jul 19 02:42:42",
+      Image = "https://eclipse.gsfc.nasa.gov/5MCSEmap/1901-2000/1917-07-19.gif"
+    },
+    {
+      Name = "Annular Eclipse",
+      Date = "1917 Dec 14 09:27:20",
+      Image = "https://eclipse.gsfc.nasa.gov/5MCSEmap/1901-2000/1917-12-14.gif"
+    },
+    {
+      Name = "Total Eclipse",
+      Date = "1918 Jun 08 22:07:43",
+      Image = "https://eclipse.gsfc.nasa.gov/5MCSEmap/1901-2000/1918-06-08.gif"
+    },
+    {
+      Name = "Annular Eclipse",
+      Date = "1918 Dec 03 15:22:02",
+      Image = "https://eclipse.gsfc.nasa.gov/5MCSEmap/1901-2000/1918-12-03.gif"
+    },
+    {
+      Name = "Total Eclipse",
+      Date = "1919 May 29 13:08:55",
+      Image = "https://eclipse.gsfc.nasa.gov/5MCSEmap/1901-2000/1919-05-29.gif"
+    },
+    {
+      Name = "Annular Eclipse",
+      Date = "1919 Nov 22 15:14:12",
+      Image = "https://eclipse.gsfc.nasa.gov/5MCSEmap/1901-2000/1919-11-22.gif"
+    },
+    {
+      Name = "Partial Eclipse",
+      Date = "1920 May 18 06:14:55",
+      Image = "https://eclipse.gsfc.nasa.gov/5MCSEmap/1901-2000/1920-05-18.gif"
+    },
+    {
+      Name = "Partial Eclipse",
+      Date = "1920 Nov 10 15:52:15",
+      Image = "https://eclipse.gsfc.nasa.gov/5MCSEmap/1901-2000/1920-11-10.gif"
+    },
+    {
+      Name = "Annular Eclipse",
+      Date = "1921 Apr 08 09:15:01",
+      Image = "https://eclipse.gsfc.nasa.gov/5MCSEmap/1901-2000/1921-04-08.gif"
+    },
+    {
+      Name = "Total Eclipse",
+      Date = "1921 Oct 01 12:35:58",
+      Image = "https://eclipse.gsfc.nasa.gov/5MCSEmap/1901-2000/1921-10-01.gif"
+    },
+    {
+      Name = "Annular Eclipse",
+      Date = "1922 Mar 28 13:05:26",
+      Image = "https://eclipse.gsfc.nasa.gov/5MCSEmap/1901-2000/1922-03-28.gif"
+    },
+    {
+      Name = "Total Eclipse",
+      Date = "1922 Sep 21 04:40:31",
+      Image = "https://eclipse.gsfc.nasa.gov/5MCSEmap/1901-2000/1922-09-21.gif"
+    },
+    {
+      Name = "Annular Eclipse",
+      Date = "1923 Mar 17 12:44:58",
+      Image = "https://eclipse.gsfc.nasa.gov/5MCSEmap/1901-2000/1923-03-17.gif"
+    },
+    {
+      Name = "Total Eclipse",
+      Date = "1923 Sep 10 20:47:29",
+      Image = "https://eclipse.gsfc.nasa.gov/5MCSEmap/1901-2000/1923-09-10.gif"
+    },
+    {
+      Name = "Partial Eclipse",
+      Date = "1924 Mar 05 15:44:20",
+      Image = "https://eclipse.gsfc.nasa.gov/5MCSEmap/1901-2000/1924-03-05.gif"
+    },
+    {
+      Name = "Partial Eclipse",
+      Date = "1924 Jul 31 19:58:20",
+      Image = "https://eclipse.gsfc.nasa.gov/5MCSEmap/1901-2000/1924-07-31.gif"
+    },
+    {
+      Name = "Partial Eclipse",
+      Date = "1924 Aug 30 08:23:00",
+      Image = "https://eclipse.gsfc.nasa.gov/5MCSEmap/1901-2000/1924-08-30.gif"
+    },
+    {
+      Name = "Total Eclipse",
+      Date = "1925 Jan 24 14:54:03",
+      Image = "https://eclipse.gsfc.nasa.gov/5MCSEmap/1901-2000/1925-01-24.gif"
+    },
+    {
+      Name = "Annular Eclipse",
+      Date = "1925 Jul 20 21:48:42",
+      Image = "https://eclipse.gsfc.nasa.gov/5MCSEmap/1901-2000/1925-07-20.gif"
+    },
+    {
+      Name = "Total Eclipse",
+      Date = "1926 Jan 14 06:36:58",
+      Image = "https://eclipse.gsfc.nasa.gov/5MCSEmap/1901-2000/1926-01-14.gif"
+    },
+    {
+      Name = "Annular Eclipse",
+      Date = "1926 Jul 09 23:06:02",
+      Image = "https://eclipse.gsfc.nasa.gov/5MCSEmap/1901-2000/1926-07-09.gif"
+    },
+    {
+      Name = "Annular Eclipse",
+      Date = "1927 Jan 03 20:22:53",
+      Image = "https://eclipse.gsfc.nasa.gov/5MCSEmap/1901-2000/1927-01-03.gif"
+    },
+    {
+      Name = "Total Eclipse",
+      Date = "1927 Jun 29 06:23:27",
+      Image = "https://eclipse.gsfc.nasa.gov/5MCSEmap/1901-2000/1927-06-29.gif"
+    },
+    {
+      Name = "Partial Eclipse",
+      Date = "1927 Dec 24 03:59:41",
+      Image = "https://eclipse.gsfc.nasa.gov/5MCSEmap/1901-2000/1927-12-24.gif"
+    },
+    {
+      Name = "Total Eclipse",
+      Date = "1928 May 19 13:24:20",
+      Image = "https://eclipse.gsfc.nasa.gov/5MCSEmap/1901-2000/1928-05-19.gif"
+    },
+    {
+      Name = "Partial Eclipse",
+      Date = "1928 Jun 17 20:27:28",
+      Image = "https://eclipse.gsfc.nasa.gov/5MCSEmap/1901-2000/1928-06-17.gif"
+    },
+    {
+      Name = "Partial Eclipse",
+      Date = "1928 Nov 12 09:48:24",
+      Image = "https://eclipse.gsfc.nasa.gov/5MCSEmap/1901-2000/1928-11-12.gif"
+    },
+    {
+      Name = "Total Eclipse",
+      Date = "1929 May 09 06:10:34",
+      Image = "https://eclipse.gsfc.nasa.gov/5MCSEmap/1901-2000/1929-05-09.gif"
+    },
+    {
+      Name = "Annular Eclipse",
+      Date = "1929 Nov 01 12:05:10",
+      Image = "https://eclipse.gsfc.nasa.gov/5MCSEmap/1901-2000/1929-11-01.gif"
+    },
+    {
+      Name = "Hybrid Eclipse",
+      Date = "1930 Apr 28 19:03:34",
+      Image = "https://eclipse.gsfc.nasa.gov/5MCSEmap/1901-2000/1930-04-28.gif"
+    },
+    {
+      Name = "Total Eclipse",
+      Date = "1930 Oct 21 21:43:53",
+      Image = "https://eclipse.gsfc.nasa.gov/5MCSEmap/1901-2000/1930-10-21.gif"
+    },
+    {
+      Name = "Partial Eclipse",
+      Date = "1931 Apr 18 00:45:35",
+      Image = "https://eclipse.gsfc.nasa.gov/5MCSEmap/1901-2000/1931-04-18.gif"
+    },
+    {
+      Name = "Partial Eclipse",
+      Date = "1931 Sep 12 04:41:25",
+      Image = "https://eclipse.gsfc.nasa.gov/5MCSEmap/1901-2000/1931-09-12.gif"
+    },
+    {
+      Name = "Partial Eclipse",
+      Date = "1931 Oct 11 12:55:40",
+      Image = "https://eclipse.gsfc.nasa.gov/5MCSEmap/1901-2000/1931-10-11.gif"
+    },
+    {
+      Name = "Annular Eclipse",
+      Date = "1932 Mar 07 07:55:50",
+      Image = "https://eclipse.gsfc.nasa.gov/5MCSEmap/1901-2000/1932-03-07.gif"
+    },
+    {
+      Name = "Total Eclipse",
+      Date = "1932 Aug 31 20:03:41",
+      Image = "https://eclipse.gsfc.nasa.gov/5MCSEmap/1901-2000/1932-08-31.gif"
+    },
+    {
+      Name = "Annular Eclipse",
+      Date = "1933 Feb 24 12:46:39",
+      Image = "https://eclipse.gsfc.nasa.gov/5MCSEmap/1901-2000/1933-02-24.gif"
+    },
+    {
+      Name = "Annular Eclipse",
+      Date = "1933 Aug 21 05:49:11",
+      Image = "https://eclipse.gsfc.nasa.gov/5MCSEmap/1901-2000/1933-08-21.gif"
+    },
+    {
+      Name = "Total Eclipse",
+      Date = "1934 Feb 14 00:38:41",
+      Image = "https://eclipse.gsfc.nasa.gov/5MCSEmap/1901-2000/1934-02-14.gif"
+    },
+    {
+      Name = "Annular Eclipse",
+      Date = "1934 Aug 10 08:37:48",
+      Image = "https://eclipse.gsfc.nasa.gov/5MCSEmap/1901-2000/1934-08-10.gif"
+    },
+    {
+      Name = "Partial Eclipse",
+      Date = "1935 Jan 05 05:35:46",
+      Image = "https://eclipse.gsfc.nasa.gov/5MCSEmap/1901-2000/1935-01-05.gif"
+    },
+    {
+      Name = "Partial Eclipse",
+      Date = "1935 Feb 03 16:16:20",
+      Image = "https://eclipse.gsfc.nasa.gov/5MCSEmap/1901-2000/1935-02-03.gif"
+    },
+    {
+      Name = "Partial Eclipse",
+      Date = "1935 Jun 30 19:59:46",
+      Image = "https://eclipse.gsfc.nasa.gov/5MCSEmap/1901-2000/1935-06-30.gif"
+    },
+    {
+      Name = "Partial Eclipse",
+      Date = "1935 Jul 30 09:16:28",
+      Image = "https://eclipse.gsfc.nasa.gov/5MCSEmap/1901-2000/1935-07-30.gif"
+    },
+    {
+      Name = "Annular Eclipse",
+      Date = "1935 Dec 25 17:59:52",
+      Image = "https://eclipse.gsfc.nasa.gov/5MCSEmap/1901-2000/1935-12-25.gif"
+    },
+    {
+      Name = "Total Eclipse",
+      Date = "1936 Jun 19 05:20:31",
+      Image = "https://eclipse.gsfc.nasa.gov/5MCSEmap/1901-2000/1936-06-19.gif"
+    },
+    {
+      Name = "Annular Eclipse",
+      Date = "1936 Dec 13 23:28:12",
+      Image = "https://eclipse.gsfc.nasa.gov/5MCSEmap/1901-2000/1936-12-13.gif"
+    },
+    {
+      Name = "Total Eclipse",
+      Date = "1937 Jun 08 20:41:02",
+      Image = "https://eclipse.gsfc.nasa.gov/5MCSEmap/1901-2000/1937-06-08.gif"
+    },
+    {
+      Name = "Annular Eclipse",
+      Date = "1937 Dec 02 23:05:45",
+      Image = "https://eclipse.gsfc.nasa.gov/5MCSEmap/1901-2000/1937-12-02.gif"
+    },
+    {
+      Name = "Total Eclipse",
+      Date = "1938 May 29 13:50:19",
+      Image = "https://eclipse.gsfc.nasa.gov/5MCSEmap/1901-2000/1938-05-29.gif"
+    },
+    {
+      Name = "Partial Eclipse",
+      Date = "1938 Nov 21 23:52:25",
+      Image = "https://eclipse.gsfc.nasa.gov/5MCSEmap/1901-2000/1938-11-21.gif"
+    },
+    {
+      Name = "Annular Eclipse",
+      Date = "1939 Apr 19 16:45:53",
+      Image = "https://eclipse.gsfc.nasa.gov/5MCSEmap/1901-2000/1939-04-19.gif"
+    },
+    {
+      Name = "Total Eclipse",
+      Date = "1939 Oct 12 20:40:23",
+      Image = "https://eclipse.gsfc.nasa.gov/5MCSEmap/1901-2000/1939-10-12.gif"
+    },
+    {
+      Name = "Annular Eclipse",
+      Date = "1940 Apr 07 20:21:21",
+      Image = "https://eclipse.gsfc.nasa.gov/5MCSEmap/1901-2000/1940-04-07.gif"
+    },
+    {
+      Name = "Total Eclipse",
+      Date = "1940 Oct 01 12:44:06",
+      Image = "https://eclipse.gsfc.nasa.gov/5MCSEmap/1901-2000/1940-10-01.gif"
+    },
+    {
+      Name = "Annular Eclipse",
+      Date = "1941 Mar 27 20:08:08",
+      Image = "https://eclipse.gsfc.nasa.gov/5MCSEmap/1901-2000/1941-03-27.gif"
+    },
+    {
+      Name = "Total Eclipse",
+      Date = "1941 Sep 21 04:34:03",
+      Image = "https://eclipse.gsfc.nasa.gov/5MCSEmap/1901-2000/1941-09-21.gif"
+    },
+    {
+      Name = "Partial Eclipse",
+      Date = "1942 Mar 16 23:37:07",
+      Image = "https://eclipse.gsfc.nasa.gov/5MCSEmap/1901-2000/1942-03-16.gif"
+    },
+    {
+      Name = "Partial Eclipse",
+      Date = "1942 Aug 12 02:45:12",
+      Image = "https://eclipse.gsfc.nasa.gov/5MCSEmap/1901-2000/1942-08-12.gif"
+    },
+    {
+      Name = "Partial Eclipse",
+      Date = "1942 Sep 10 15:39:32",
+      Image = "https://eclipse.gsfc.nasa.gov/5MCSEmap/1901-2000/1942-09-10.gif"
+    },
+    {
+      Name = "Total Eclipse",
+      Date = "1943 Feb 04 23:38:10",
+      Image = "https://eclipse.gsfc.nasa.gov/5MCSEmap/1901-2000/1943-02-04.gif"
+    },
+    {
+      Name = "Annular Eclipse",
+      Date = "1943 Aug 01 04:16:13",
+      Image = "https://eclipse.gsfc.nasa.gov/5MCSEmap/1901-2000/1943-08-01.gif"
+    },
+    {
+      Name = "Total Eclipse",
+      Date = "1944 Jan 25 15:26:42",
+      Image = "https://eclipse.gsfc.nasa.gov/5MCSEmap/1901-2000/1944-01-25.gif"
+    },
+    {
+      Name = "Annular Eclipse",
+      Date = "1944 Jul 20 05:43:13",
+      Image = "https://eclipse.gsfc.nasa.gov/5MCSEmap/1901-2000/1944-07-20.gif"
+    },
+    {
+      Name = "Annular Eclipse",
+      Date = "1945 Jan 14 05:01:43",
+      Image = "https://eclipse.gsfc.nasa.gov/5MCSEmap/1901-2000/1945-01-14.gif"
+    },
+    {
+      Name = "Total Eclipse",
+      Date = "1945 Jul 09 13:27:45",
+      Image = "https://eclipse.gsfc.nasa.gov/5MCSEmap/1901-2000/1945-07-09.gif"
+    },
+    {
+      Name = "Partial Eclipse",
+      Date = "1946 Jan 03 12:16:11",
+      Image = "https://eclipse.gsfc.nasa.gov/5MCSEmap/1901-2000/1946-01-03.gif"
+    },
+    {
+      Name = "Partial Eclipse",
+      Date = "1946 May 30 21:00:24",
+      Image = "https://eclipse.gsfc.nasa.gov/5MCSEmap/1901-2000/1946-05-30.gif"
+    },
+    {
+      Name = "Partial Eclipse",
+      Date = "1946 Jun 29 03:51:58",
+      Image = "https://eclipse.gsfc.nasa.gov/5MCSEmap/1901-2000/1946-06-29.gif"
+    },
+    {
+      Name = "Partial Eclipse",
+      Date = "1946 Nov 23 17:37:12",
+      Image = "https://eclipse.gsfc.nasa.gov/5MCSEmap/1901-2000/1946-11-23.gif"
+    },
+    {
+      Name = "Total Eclipse",
+      Date = "1947 May 20 13:47:47",
+      Image = "https://eclipse.gsfc.nasa.gov/5MCSEmap/1901-2000/1947-05-20.gif"
+    },
+    {
+      Name = "Annular Eclipse",
+      Date = "1947 Nov 12 20:05:37",
+      Image = "https://eclipse.gsfc.nasa.gov/5MCSEmap/1901-2000/1947-11-12.gif"
+    },
+    {
+      Name = "Annular Eclipse",
+      Date = "1948 May 09 02:26:04",
+      Image = "https://eclipse.gsfc.nasa.gov/5MCSEmap/1901-2000/1948-05-09.gif"
+    },
+    {
+      Name = "Total Eclipse",
+      Date = "1948 Nov 01 05:59:18",
+      Image = "https://eclipse.gsfc.nasa.gov/5MCSEmap/1901-2000/1948-11-01.gif"
+    },
+    {
+      Name = "Partial Eclipse",
+      Date = "1949 Apr 28 07:48:53",
+      Image = "https://eclipse.gsfc.nasa.gov/5MCSEmap/1901-2000/1949-04-28.gif"
+    },
+    {
+      Name = "Partial Eclipse",
+      Date = "1949 Oct 21 21:13:01",
+      Image = "https://eclipse.gsfc.nasa.gov/5MCSEmap/1901-2000/1949-10-21.gif"
+    },
+    {
+      Name = "Annular Eclipse",
+      Date = "1950 Mar 18 15:32:01",
+      Image = "https://eclipse.gsfc.nasa.gov/5MCSEmap/1901-2000/1950-03-18.gif"
+    },
+    {
+      Name = "Total Eclipse",
+      Date = "1950 Sep 12 03:38:47",
+      Image = "https://eclipse.gsfc.nasa.gov/5MCSEmap/1901-2000/1950-09-12.gif"
+    },
+    {
+      Name = "Annular Eclipse",
+      Date = "1951 Mar 07 20:53:40",
+      Image = "https://eclipse.gsfc.nasa.gov/5MCSEmap/1901-2000/1951-03-07.gif"
+    },
+    {
+      Name = "Annular Eclipse",
+      Date = "1951 Sep 01 12:51:51",
+      Image = "https://eclipse.gsfc.nasa.gov/5MCSEmap/1901-2000/1951-09-01.gif"
+    },
+    {
+      Name = "Total Eclipse",
+      Date = "1952 Feb 25 09:11:35",
+      Image = "https://eclipse.gsfc.nasa.gov/5MCSEmap/1901-2000/1952-02-25.gif"
+    },
+    {
+      Name = "Annular Eclipse",
+      Date = "1952 Aug 20 15:13:35",
+      Image = "https://eclipse.gsfc.nasa.gov/5MCSEmap/1901-2000/1952-08-20.gif"
+    },
+    {
+      Name = "Partial Eclipse",
+      Date = "1953 Feb 14 00:59:30",
+      Image = "https://eclipse.gsfc.nasa.gov/5MCSEmap/1901-2000/1953-02-14.gif"
+    },
+    {
+      Name = "Partial Eclipse",
+      Date = "1953 Jul 11 02:44:14",
+      Image = "https://eclipse.gsfc.nasa.gov/5MCSEmap/1901-2000/1953-07-11.gif"
+    },
+    {
+      Name = "Partial Eclipse",
+      Date = "1953 Aug 09 15:55:03",
+      Image = "https://eclipse.gsfc.nasa.gov/5MCSEmap/1901-2000/1953-08-09.gif"
+    },
+    {
+      Name = "Annular Eclipse",
+      Date = "1954 Jan 05 02:32:01",
+      Image = "https://eclipse.gsfc.nasa.gov/5MCSEmap/1901-2000/1954-01-05.gif"
+    },
+    {
+      Name = "Total Eclipse",
+      Date = "1954 Jun 30 12:32:38",
+      Image = "https://eclipse.gsfc.nasa.gov/5MCSEmap/1901-2000/1954-06-30.gif"
+    },
+    {
+      Name = "Annular Eclipse",
+      Date = "1954 Dec 25 07:36:42",
+      Image = "https://eclipse.gsfc.nasa.gov/5MCSEmap/1901-2000/1954-12-25.gif"
+    },
+    {
+      Name = "Total Eclipse",
+      Date = "1955 Jun 20 04:10:42",
+      Image = "https://eclipse.gsfc.nasa.gov/5MCSEmap/1901-2000/1955-06-20.gif"
+    },
+    {
+      Name = "Annular Eclipse",
+      Date = "1955 Dec 14 07:02:25",
+      Image = "https://eclipse.gsfc.nasa.gov/5MCSEmap/1901-2000/1955-12-14.gif"
+    },
+    {
+      Name = "Total Eclipse",
+      Date = "1956 Jun 08 21:20:39",
+      Image = "https://eclipse.gsfc.nasa.gov/5MCSEmap/1901-2000/1956-06-08.gif"
+    },
+    {
+      Name = "Partial Eclipse",
+      Date = "1956 Dec 02 08:00:35",
+      Image = "https://eclipse.gsfc.nasa.gov/5MCSEmap/1901-2000/1956-12-02.gif"
+    },
+    {
+      Name = "Annular Eclipse",
+      Date = "1957 Apr 30 00:05:28",
+      Image = "https://eclipse.gsfc.nasa.gov/5MCSEmap/1901-2000/1957-04-30.gif"
+    },
+    {
+      Name = "Total Eclipse",
+      Date = "1957 Oct 23 04:54:02",
+      Image = "https://eclipse.gsfc.nasa.gov/5MCSEmap/1901-2000/1957-10-23.gif"
+    },
+    {
+      Name = "Annular Eclipse",
+      Date = "1958 Apr 19 03:27:17",
+      Image = "https://eclipse.gsfc.nasa.gov/5MCSEmap/1901-2000/1958-04-19.gif"
+    },
+    {
+      Name = "Total Eclipse",
+      Date = "1958 Oct 12 20:55:28",
+      Image = "https://eclipse.gsfc.nasa.gov/5MCSEmap/1901-2000/1958-10-12.gif"
+    },
+    {
+      Name = "Annular Eclipse",
+      Date = "1959 Apr 08 03:24:08",
+      Image = "https://eclipse.gsfc.nasa.gov/5MCSEmap/1901-2000/1959-04-08.gif"
+    },
+    {
+      Name = "Total Eclipse",
+      Date = "1959 Oct 02 12:27:00",
+      Image = "https://eclipse.gsfc.nasa.gov/5MCSEmap/1901-2000/1959-10-02.gif"
+    },
+    {
+      Name = "Partial Eclipse",
+      Date = "1960 Mar 27 07:25:07",
+      Image = "https://eclipse.gsfc.nasa.gov/5MCSEmap/1901-2000/1960-03-27.gif"
+    },
+    {
+      Name = "Partial Eclipse",
+      Date = "1960 Sep 20 22:59:56",
+      Image = "https://eclipse.gsfc.nasa.gov/5MCSEmap/1901-2000/1960-09-20.gif"
+    },
+    {
+      Name = "Total Eclipse",
+      Date = "1961 Feb 15 08:19:48",
+      Image = "https://eclipse.gsfc.nasa.gov/5MCSEmap/1901-2000/1961-02-15.gif"
+    },
+    {
+      Name = "Annular Eclipse",
+      Date = "1961 Aug 11 10:46:47",
+      Image = "https://eclipse.gsfc.nasa.gov/5MCSEmap/1901-2000/1961-08-11.gif"
+    },
+    {
+      Name = "Total Eclipse",
+      Date = "1962 Feb 05 00:12:38",
+      Image = "https://eclipse.gsfc.nasa.gov/5MCSEmap/1901-2000/1962-02-05.gif"
+    },
+    {
+      Name = "Annular Eclipse",
+      Date = "1962 Jul 31 12:25:33",
+      Image = "https://eclipse.gsfc.nasa.gov/5MCSEmap/1901-2000/1962-07-31.gif"
+    },
+    {
+      Name = "Annular Eclipse",
+      Date = "1963 Jan 25 13:37:12",
+      Image = "https://eclipse.gsfc.nasa.gov/5MCSEmap/1901-2000/1963-01-25.gif"
+    },
+    {
+      Name = "Total Eclipse",
+      Date = "1963 Jul 20 20:36:13",
+      Image = "https://eclipse.gsfc.nasa.gov/5MCSEmap/1901-2000/1963-07-20.gif"
+    },
+    {
+      Name = "Partial Eclipse",
+      Date = "1964 Jan 14 20:30:08",
+      Image = "https://eclipse.gsfc.nasa.gov/5MCSEmap/1901-2000/1964-01-14.gif"
+    },
+    {
+      Name = "Partial Eclipse",
+      Date = "1964 Jun 10 04:34:07",
+      Image = "https://eclipse.gsfc.nasa.gov/5MCSEmap/1901-2000/1964-06-10.gif"
+    },
+    {
+      Name = "Partial Eclipse",
+      Date = "1964 Jul 09 11:17:53",
+      Image = "https://eclipse.gsfc.nasa.gov/5MCSEmap/1901-2000/1964-07-09.gif"
+    },
+    {
+      Name = "Partial Eclipse",
+      Date = "1964 Dec 04 01:31:54",
+      Image = "https://eclipse.gsfc.nasa.gov/5MCSEmap/1901-2000/1964-12-04.gif"
+    },
+    {
+      Name = "Total Eclipse",
+      Date = "1965 May 30 21:17:31",
+      Image = "https://eclipse.gsfc.nasa.gov/5MCSEmap/1901-2000/1965-05-30.gif"
+    },
+    {
+      Name = "Annular Eclipse",
+      Date = "1965 Nov 23 04:14:51",
+      Image = "https://eclipse.gsfc.nasa.gov/5MCSEmap/1901-2000/1965-11-23.gif"
+    },
+    {
+      Name = "Annular Eclipse",
+      Date = "1966 May 20 09:39:02",
+      Image = "https://eclipse.gsfc.nasa.gov/5MCSEmap/1901-2000/1966-05-20.gif"
+    },
+    {
+      Name = "Total Eclipse",
+      Date = "1966 Nov 12 14:23:28",
+      Image = "https://eclipse.gsfc.nasa.gov/5MCSEmap/1901-2000/1966-11-12.gif"
+    },
+    {
+      Name = "Partial Eclipse",
+      Date = "1967 May 09 14:42:48",
+      Image = "https://eclipse.gsfc.nasa.gov/5MCSEmap/1901-2000/1967-05-09.gif"
+    },
+    {
+      Name = "Total Eclipse",
+      Date = "1967 Nov 02 05:38:56",
+      Image = "https://eclipse.gsfc.nasa.gov/5MCSEmap/1901-2000/1967-11-02.gif"
+    },
+    {
+      Name = "Partial Eclipse",
+      Date = "1968 Mar 28 23:00:30",
+      Image = "https://eclipse.gsfc.nasa.gov/5MCSEmap/1901-2000/1968-03-28.gif"
+    },
+    {
+      Name = "Total Eclipse",
+      Date = "1968 Sep 22 11:18:46",
+      Image = "https://eclipse.gsfc.nasa.gov/5MCSEmap/1901-2000/1968-09-22.gif"
+    },
+    {
+      Name = "Annular Eclipse",
+      Date = "1969 Mar 18 04:54:57",
+      Image = "https://eclipse.gsfc.nasa.gov/5MCSEmap/1901-2000/1969-03-18.gif"
+    },
+    {
+      Name = "Annular Eclipse",
+      Date = "1969 Sep 11 19:58:59",
+      Image = "https://eclipse.gsfc.nasa.gov/5MCSEmap/1901-2000/1969-09-11.gif"
+    },
+    {
+      Name = "Total Eclipse",
+      Date = "1970 Mar 07 17:38:30",
+      Image = "https://eclipse.gsfc.nasa.gov/5MCSEmap/1901-2000/1970-03-07.gif"
+    },
+    {
+      Name = "Annular Eclipse",
+      Date = "1970 Aug 31 21:55:30",
+      Image = "https://eclipse.gsfc.nasa.gov/5MCSEmap/1901-2000/1970-08-31.gif"
+    },
+    {
+      Name = "Partial Eclipse",
+      Date = "1971 Feb 25 09:38:07",
+      Image = "https://eclipse.gsfc.nasa.gov/5MCSEmap/1901-2000/1971-02-25.gif"
+    },
+    {
+      Name = "Partial Eclipse",
+      Date = "1971 Jul 22 09:31:55",
+      Image = "https://eclipse.gsfc.nasa.gov/5MCSEmap/1901-2000/1971-07-22.gif"
+    },
+    {
+      Name = "Partial Eclipse",
+      Date = "1971 Aug 20 22:39:31",
+      Image = "https://eclipse.gsfc.nasa.gov/5MCSEmap/1901-2000/1971-08-20.gif"
+    },
+    {
+      Name = "Annular Eclipse",
+      Date = "1972 Jan 16 11:03:22",
+      Image = "https://eclipse.gsfc.nasa.gov/5MCSEmap/1901-2000/1972-01-16.gif"
+    },
+    {
+      Name = "Total Eclipse",
+      Date = "1972 Jul 10 19:46:38",
+      Image = "https://eclipse.gsfc.nasa.gov/5MCSEmap/1901-2000/1972-07-10.gif"
+    },
+    {
+      Name = "Annular Eclipse",
+      Date = "1973 Jan 04 15:46:21",
+      Image = "https://eclipse.gsfc.nasa.gov/5MCSEmap/1901-2000/1973-01-04.gif"
+    },
+    {
+      Name = "Total Eclipse",
+      Date = "1973 Jun 30 11:38:41",
+      Image = "https://eclipse.gsfc.nasa.gov/5MCSEmap/1901-2000/1973-06-30.gif"
+    },
+    {
+      Name = "Annular Eclipse",
+      Date = "1973 Dec 24 15:02:44",
+      Image = "https://eclipse.gsfc.nasa.gov/5MCSEmap/1901-2000/1973-12-24.gif"
+    },
+    {
+      Name = "Total Eclipse",
+      Date = "1974 Jun 20 04:48:04",
+      Image = "https://eclipse.gsfc.nasa.gov/5MCSEmap/1901-2000/1974-06-20.gif"
+    },
+    {
+      Name = "Partial Eclipse",
+      Date = "1974 Dec 13 16:13:13",
+      Image = "https://eclipse.gsfc.nasa.gov/5MCSEmap/1901-2000/1974-12-13.gif"
+    },
+    {
+      Name = "Partial Eclipse",
+      Date = "1975 May 11 07:17:33",
+      Image = "https://eclipse.gsfc.nasa.gov/5MCSEmap/1901-2000/1975-05-11.gif"
+    },
+    {
+      Name = "Partial Eclipse",
+      Date = "1975 Nov 03 13:15:54",
+      Image = "https://eclipse.gsfc.nasa.gov/5MCSEmap/1901-2000/1975-11-03.gif"
+    },
+    {
+      Name = "Annular Eclipse",
+      Date = "1976 Apr 29 10:24:18",
+      Image = "https://eclipse.gsfc.nasa.gov/5MCSEmap/1901-2000/1976-04-29.gif"
+    },
+    {
+      Name = "Total Eclipse",
+      Date = "1976 Oct 23 05:13:45",
+      Image = "https://eclipse.gsfc.nasa.gov/5MCSEmap/1901-2000/1976-10-23.gif"
+    },
+    {
+      Name = "Annular Eclipse",
+      Date = "1977 Apr 18 10:31:30",
+      Image = "https://eclipse.gsfc.nasa.gov/5MCSEmap/1901-2000/1977-04-18.gif"
+    },
+    {
+      Name = "Total Eclipse",
+      Date = "1977 Oct 12 20:27:27",
+      Image = "https://eclipse.gsfc.nasa.gov/5MCSEmap/1901-2000/1977-10-12.gif"
+    },
+    {
+      Name = "Partial Eclipse",
+      Date = "1978 Apr 07 15:03:47",
+      Image = "https://eclipse.gsfc.nasa.gov/5MCSEmap/1901-2000/1978-04-07.gif"
+    },
+    {
+      Name = "Partial Eclipse",
+      Date = "1978 Oct 02 06:28:43",
+      Image = "https://eclipse.gsfc.nasa.gov/5MCSEmap/1901-2000/1978-10-02.gif"
+    },
+    {
+      Name = "Total Eclipse",
+      Date = "1979 Feb 26 16:55:06",
+      Image = "https://eclipse.gsfc.nasa.gov/5MCSEmap/1901-2000/1979-02-26.gif"
+    },
+    {
+      Name = "Annular Eclipse",
+      Date = "1979 Aug 22 17:22:38",
+      Image = "https://eclipse.gsfc.nasa.gov/5MCSEmap/1901-2000/1979-08-22.gif"
+    },
+    {
+      Name = "Total Eclipse",
+      Date = "1980 Feb 16 08:54:01",
+      Image = "https://eclipse.gsfc.nasa.gov/5MCSEmap/1901-2000/1980-02-16.gif"
+    },
+    {
+      Name = "Annular Eclipse",
+      Date = "1980 Aug 10 19:12:21",
+      Image = "https://eclipse.gsfc.nasa.gov/5MCSEmap/1901-2000/1980-08-10.gif"
+    },
+    {
+      Name = "Annular Eclipse",
+      Date = "1981 Feb 04 22:09:24",
+      Image = "https://eclipse.gsfc.nasa.gov/5MCSEmap/1901-2000/1981-02-04.gif"
+    },
+    {
+      Name = "Total Eclipse",
+      Date = "1981 Jul 31 03:46:37",
+      Image = "https://eclipse.gsfc.nasa.gov/5MCSEmap/1901-2000/1981-07-31.gif"
+    },
+    {
+      Name = "Partial Eclipse",
+      Date = "1982 Jan 25 04:42:53",
+      Image = "https://eclipse.gsfc.nasa.gov/5MCSEmap/1901-2000/1982-01-25.gif"
+    },
+    {
+      Name = "Partial Eclipse",
+      Date = "1982 Jun 21 12:04:33",
+      Image = "https://eclipse.gsfc.nasa.gov/5MCSEmap/1901-2000/1982-06-21.gif"
+    },
+    {
+      Name = "Partial Eclipse",
+      Date = "1982 Jul 20 18:44:44",
+      Image = "https://eclipse.gsfc.nasa.gov/5MCSEmap/1901-2000/1982-07-20.gif"
+    },
+    {
+      Name = "Partial Eclipse",
+      Date = "1982 Dec 15 09:32:09",
+      Image = "https://eclipse.gsfc.nasa.gov/5MCSEmap/1901-2000/1982-12-15.gif"
+    },
+    {
+      Name = "Total Eclipse",
+      Date = "1983 Jun 11 04:43:33",
+      Image = "https://eclipse.gsfc.nasa.gov/5MCSEmap/1901-2000/1983-06-11.gif"
+    },
+    {
+      Name = "Annular Eclipse",
+      Date = "1983 Dec 04 12:31:15",
+      Image = "https://eclipse.gsfc.nasa.gov/5MCSEmap/1901-2000/1983-12-04.gif"
+    },
+    {
+      Name = "Annular Eclipse",
+      Date = "1984 May 30 16:45:41",
+      Image = "https://eclipse.gsfc.nasa.gov/5MCSEmap/1901-2000/1984-05-30.gif"
+    },
+    {
+      Name = "Total Eclipse",
+      Date = "1984 Nov 22 22:54:17",
+      Image = "https://eclipse.gsfc.nasa.gov/5MCSEmap/1901-2000/1984-11-22.gif"
+    },
+    {
+      Name = "Partial Eclipse",
+      Date = "1985 May 19 21:29:38",
+      Image = "https://eclipse.gsfc.nasa.gov/5MCSEmap/1901-2000/1985-05-19.gif"
+    },
+    {
+      Name = "Total Eclipse",
+      Date = "1985 Nov 12 14:11:27",
+      Image = "https://eclipse.gsfc.nasa.gov/5MCSEmap/1901-2000/1985-11-12.gif"
+    },
+    {
+      Name = "Partial Eclipse",
+      Date = "1986 Apr 09 06:21:22",
+      Image = "https://eclipse.gsfc.nasa.gov/5MCSEmap/1901-2000/1986-04-09.gif"
+    },
+    {
+      Name = "Hybrid Eclipse",
+      Date = "1986 Oct 03 19:06:15",
+      Image = "https://eclipse.gsfc.nasa.gov/5MCSEmap/1901-2000/1986-10-03.gif"
+    },
+    {
+      Name = "Hybrid Eclipse",
+      Date = "1987 Mar 29 12:49:47",
+      Image = "https://eclipse.gsfc.nasa.gov/5MCSEmap/1901-2000/1987-03-29.gif"
+    },
+    {
+      Name = "Annular Eclipse",
+      Date = "1987 Sep 23 03:12:22",
+      Image = "https://eclipse.gsfc.nasa.gov/5MCSEmap/1901-2000/1987-09-23.gif"
+    },
+    {
+      Name = "Total Eclipse",
+      Date = "1988 Mar 18 01:58:56",
+      Image = "https://eclipse.gsfc.nasa.gov/5MCSEmap/1901-2000/1988-03-18.gif"
+    },
+    {
+      Name = "Annular Eclipse",
+      Date = "1988 Sep 11 04:44:29",
+      Image = "https://eclipse.gsfc.nasa.gov/5MCSEmap/1901-2000/1988-09-11.gif"
+    },
+    {
+      Name = "Partial Eclipse",
+      Date = "1989 Mar 07 18:08:41",
+      Image = "https://eclipse.gsfc.nasa.gov/5MCSEmap/1901-2000/1989-03-07.gif"
+    },
+    {
+      Name = "Partial Eclipse",
+      Date = "1989 Aug 31 05:31:47",
+      Image = "https://eclipse.gsfc.nasa.gov/5MCSEmap/1901-2000/1989-08-31.gif"
+    },
+    {
+      Name = "Annular Eclipse",
+      Date = "1990 Jan 26 19:31:24",
+      Image = "https://eclipse.gsfc.nasa.gov/5MCSEmap/1901-2000/1990-01-26.gif"
+    },
+    {
+      Name = "Total Eclipse",
+      Date = "1990 Jul 22 03:03:07",
+      Image = "https://eclipse.gsfc.nasa.gov/5MCSEmap/1901-2000/1990-07-22.gif"
+    },
+    {
+      Name = "Annular Eclipse",
+      Date = "1991 Jan 15 23:53:51",
+      Image = "https://eclipse.gsfc.nasa.gov/5MCSEmap/1901-2000/1991-01-15.gif"
+    },
+    {
+      Name = "Total Eclipse",
+      Date = "1991 Jul 11 19:07:01",
+      Image = "https://eclipse.gsfc.nasa.gov/5MCSEmap/1901-2000/1991-07-11.gif"
+    },
+    {
+      Name = "Annular Eclipse",
+      Date = "1992 Jan 04 23:05:37",
+      Image = "https://eclipse.gsfc.nasa.gov/5MCSEmap/1901-2000/1992-01-04.gif"
+    },
+    {
+      Name = "Total Eclipse",
+      Date = "1992 Jun 30 12:11:22",
+      Image = "https://eclipse.gsfc.nasa.gov/5MCSEmap/1901-2000/1992-06-30.gif"
+    },
+    {
+      Name = "Partial Eclipse",
+      Date = "1992 Dec 24 00:31:41",
+      Image = "https://eclipse.gsfc.nasa.gov/5MCSEmap/1901-2000/1992-12-24.gif"
+    },
+    {
+      Name = "Partial Eclipse",
+      Date = "1993 May 21 14:20:15",
+      Image = "https://eclipse.gsfc.nasa.gov/5MCSEmap/1901-2000/1993-05-21.gif"
+    },
+    {
+      Name = "Partial Eclipse",
+      Date = "1993 Nov 13 21:45:51",
+      Image = "https://eclipse.gsfc.nasa.gov/5MCSEmap/1901-2000/1993-11-13.gif"
+    },
+    {
+      Name = "Annular Eclipse",
+      Date = "1994 May 10 17:12:26",
+      Image = "https://eclipse.gsfc.nasa.gov/5MCSEmap/1901-2000/1994-05-10.gif"
+    },
+    {
+      Name = "Total Eclipse",
+      Date = "1994 Nov 03 13:40:06",
+      Image = "https://eclipse.gsfc.nasa.gov/5MCSEmap/1901-2000/1994-11-03.gif"
+    },
+    {
+      Name = "Annular Eclipse",
+      Date = "1995 Apr 29 17:33:21",
+      Image = "https://eclipse.gsfc.nasa.gov/5MCSEmap/1901-2000/1995-04-29.gif"
+    },
+    {
+      Name = "Total Eclipse",
+      Date = "1995 Oct 24 04:33:30",
+      Image = "https://eclipse.gsfc.nasa.gov/5MCSEmap/1901-2000/1995-10-24.gif"
+    },
+    {
+      Name = "Partial Eclipse",
+      Date = "1996 Apr 17 22:38:12",
+      Image = "https://eclipse.gsfc.nasa.gov/5MCSEmap/1901-2000/1996-04-17.gif"
+    },
+    {
+      Name = "Partial Eclipse",
+      Date = "1996 Oct 12 14:03:04",
+      Image = "https://eclipse.gsfc.nasa.gov/5MCSEmap/1901-2000/1996-10-12.gif"
+    },
+    {
+      Name = "Total Eclipse",
+      Date = "1997 Mar 09 01:24:51",
+      Image = "https://eclipse.gsfc.nasa.gov/5MCSEmap/1901-2000/1997-03-09.gif"
+    },
+    {
+      Name = "Partial Eclipse",
+      Date = "1997 Sep 02 00:04:48",
+      Image = "https://eclipse.gsfc.nasa.gov/5MCSEmap/1901-2000/1997-09-02.gif"
+    },
+    {
+      Name = "Total Eclipse",
+      Date = "1998 Feb 26 17:29:27",
+      Image = "https://eclipse.gsfc.nasa.gov/5MCSEmap/1901-2000/1998-02-26.gif"
+    },
+    {
+      Name = "Annular Eclipse",
+      Date = "1998 Aug 22 02:07:11",
+      Image = "https://eclipse.gsfc.nasa.gov/5MCSEmap/1901-2000/1998-08-22.gif"
+    },
+    {
+      Name = "Annular Eclipse",
+      Date = "1999 Feb 16 06:34:38",
+      Image = "https://eclipse.gsfc.nasa.gov/5MCSEmap/1901-2000/1999-02-16.gif"
+    },
+    {
+      Name = "Total Eclipse",
+      Date = "1999 Aug 11 11:04:09",
+      Image = "https://eclipse.gsfc.nasa.gov/5MCSEmap/1901-2000/1999-08-11.gif"
+    },
+    {
+      Name = "Partial Eclipse",
+      Date = "2000 Feb 05 12:50:27",
+      Image = "https://eclipse.gsfc.nasa.gov/5MCSEmap/1901-2000/2000-02-05.gif"
+    },
+    {
+      Name = "Partial Eclipse",
+      Date = "2000 Jul 01 19:33:34",
+      Image = "https://eclipse.gsfc.nasa.gov/5MCSEmap/1901-2000/2000-07-01.gif"
+    },
+    {
+      Name = "Partial Eclipse",
+      Date = "2000 Jul 31 02:14:08",
+      Image = "https://eclipse.gsfc.nasa.gov/5MCSEmap/1901-2000/2000-07-31.gif"
+    },
+    {
+      Name = "Partial Eclipse",
+      Date = "2000 Dec 25 17:35:57",
+      Image = "https://eclipse.gsfc.nasa.gov/5MCSEmap/1901-2000/2000-12-25.gif"
+    },
+    {
+      Name = "Total Eclipse",
+      Date = "2001 Jun 21 12:04:46",
+      Image = "https://eclipse.gsfc.nasa.gov/5MCSEmap/2001-2100/2001-06-21.gif"
+    },
+    {
+      Name = "Annular Eclipse",
+      Date = "2001 Dec 14 20:53:01",
+      Image = "https://eclipse.gsfc.nasa.gov/5MCSEmap/2001-2100/2001-12-14.gif"
+    },
+    {
+      Name = "Annular Eclipse",
+      Date = "2002 Jun 10 23:45:22",
+      Image = "https://eclipse.gsfc.nasa.gov/5MCSEmap/2001-2100/2002-06-10.gif"
+    },
+    {
+      Name = "Total Eclipse",
+      Date = "2002 Dec 04 07:32:16",
+      Image = "https://eclipse.gsfc.nasa.gov/5MCSEmap/2001-2100/2002-12-04.gif"
+    },
+    {
+      Name = "Annular Eclipse",
+      Date = "2003 May 31 04:09:22",
+      Image = "https://eclipse.gsfc.nasa.gov/5MCSEmap/2001-2100/2003-05-31.gif"
+    },
+    {
+      Name = "Total Eclipse",
+      Date = "2003 Nov 23 22:50:22",
+      Image = "https://eclipse.gsfc.nasa.gov/5MCSEmap/2001-2100/2003-11-23.gif"
+    },
+    {
+      Name = "Partial Eclipse",
+      Date = "2004 Apr 19 13:35:05",
+      Image = "https://eclipse.gsfc.nasa.gov/5MCSEmap/2001-2100/2004-04-19.gif"
+    },
+    {
+      Name = "Partial Eclipse",
+      Date = "2004 Oct 14 03:00:23",
+      Image = "https://eclipse.gsfc.nasa.gov/5MCSEmap/2001-2100/2004-10-14.gif"
+    },
+    {
+      Name = "Hybrid Eclipse",
+      Date = "2005 Apr 08 20:36:51",
+      Image = "https://eclipse.gsfc.nasa.gov/5MCSEmap/2001-2100/2005-04-08.gif"
+    },
+    {
+      Name = "Annular Eclipse",
+      Date = "2005 Oct 03 10:32:47",
+      Image = "https://eclipse.gsfc.nasa.gov/5MCSEmap/2001-2100/2005-10-03.gif"
+    },
+    {
+      Name = "Total Eclipse",
+      Date = "2006 Mar 29 10:12:23",
+      Image = "https://eclipse.gsfc.nasa.gov/5MCSEmap/2001-2100/2006-03-29.gif"
+    },
+    {
+      Name = "Annular Eclipse",
+      Date = "2006 Sep 22 11:41:16",
+      Image = "https://eclipse.gsfc.nasa.gov/5MCSEmap/2001-2100/2006-09-22.gif"
+    },
+    {
+      Name = "Partial Eclipse",
+      Date = "2007 Mar 19 02:32:57",
+      Image = "https://eclipse.gsfc.nasa.gov/5MCSEmap/2001-2100/2007-03-19.gif"
+    },
+    {
+      Name = "Partial Eclipse",
+      Date = "2007 Sep 11 12:32:24",
+      Image = "https://eclipse.gsfc.nasa.gov/5MCSEmap/2001-2100/2007-09-11.gif"
+    },
+    {
+      Name = "Annular Eclipse",
+      Date = "2008 Feb 07 03:56:10",
+      Image = "https://eclipse.gsfc.nasa.gov/5MCSEmap/2001-2100/2008-02-07.gif"
+    },
+    {
+      Name = "Total Eclipse",
+      Date = "2008 Aug 01 10:22:12",
+      Image = "https://eclipse.gsfc.nasa.gov/5MCSEmap/2001-2100/2008-08-01.gif"
+    },
+    {
+      Name = "Annular Eclipse",
+      Date = "2009 Jan 26 07:59:45",
+      Image = "https://eclipse.gsfc.nasa.gov/5MCSEmap/2001-2100/2009-01-26.gif"
+    },
+    {
+      Name = "Total Eclipse",
+      Date = "2009 Jul 22 02:36:25",
+      Image = "https://eclipse.gsfc.nasa.gov/5MCSEmap/2001-2100/2009-07-22.gif"
+    },
+    {
+      Name = "Annular Eclipse",
+      Date = "2010 Jan 15 07:07:39",
+      Image = "https://eclipse.gsfc.nasa.gov/5MCSEmap/2001-2100/2010-01-15.gif"
+    },
+    {
+      Name = "Total Eclipse",
+      Date = "2010 Jul 11 19:34:38",
+      Image = "https://eclipse.gsfc.nasa.gov/5MCSEmap/2001-2100/2010-07-11.gif"
+    },
+    {
+      Name = "Partial Eclipse",
+      Date = "2011 Jan 04 08:51:4",
+      Image = "https://eclipse.gsfc.nasa.gov/5MCSEmap/2001-2100/2011-01-04.gif"
+    },
+    {
+      Name = "Partial Eclipse",
+      Date = "2011 Jun 01 21:17:18",
+      Image = "https://eclipse.gsfc.nasa.gov/5MCSEmap/2001-2100/2011-06-01.gif"
+    },
+    {
+      Name = "Partial Eclipse",
+      Date = "2011 Jul 01 08:39:30",
+      Image = "https://eclipse.gsfc.nasa.gov/5MCSEmap/2001-2100/2011-07-01.gif"
+    },
+    {
+      Name = "Partial Eclipse",
+      Date = "2011 Nov 25 06:21:24",
+      Image = "https://eclipse.gsfc.nasa.gov/5MCSEmap/2001-2100/2011-11-25.gif"
+    },
+    {
+      Name = "Annular Eclipse",
+      Date = "2012 May 20 23:53:54",
+      Image = "https://eclipse.gsfc.nasa.gov/5MCSEmap/2001-2100/2012-05-20.gif"
+    },
+    {
+      Name = "Total Eclipse",
+      Date = "2012 Nov 13 22:12:55",
+      Image = "https://eclipse.gsfc.nasa.gov/5MCSEmap/2001-2100/2012-11-13.gif"
+    },
+    {
+      Name = "Annular Eclipse",
+      Date = "2013 May 10 00:26:20",
+      Image = "https://eclipse.gsfc.nasa.gov/5MCSEmap/2001-2100/2013-05-10.gif"
+    },
+    {
+      Name = "Hybrid Eclipse",
+      Date = "2013 Nov 03 12:47:36",
+      Image = "https://eclipse.gsfc.nasa.gov/5MCSEmap/2001-2100/2013-11-03.gif"
+    },
+    {
+      Name = "Annular Eclipse",
+      Date = "2014 Apr 29 06:04:33",
+      Image = "https://eclipse.gsfc.nasa.gov/5MCSEmap/2001-2100/2014-04-29.gif"
+    },
+    {
+      Name = "Partial Eclipse",
+      Date = "2014 Oct 23 21:45:39",
+      Image = "https://eclipse.gsfc.nasa.gov/5MCSEmap/2001-2100/2014-10-23.gif"
+    },
+    {
+      Name = "Total Eclipse",
+      Date = "2015 Mar 20 09:46:47",
+      Image = "https://eclipse.gsfc.nasa.gov/5MCSEmap/2001-2100/2015-03-20.gif"
+    },
+    {
+      Name = "Partial Eclipse",
+      Date = "2015 Sep 13 06:55:19",
+      Image = "https://eclipse.gsfc.nasa.gov/5MCSEmap/2001-2100/2015-09-13.gif"
+    },
+    {
+      Name = "Total Eclipse",
+      Date = "2016 Mar 09 01:58:19",
+      Image = "https://eclipse.gsfc.nasa.gov/5MCSEmap/2001-2100/2016-03-09.gif"
+    },
+    {
+      Name = "Annular Eclipse",
+      Date = "2016 Sep 01 09:08:02",
+      Image = "https://eclipse.gsfc.nasa.gov/5MCSEmap/2001-2100/2016-09-01.gif"
+    },
+    {
+      Name = "Annular Eclipse",
+      Date = "2017 Feb 26 14:54:33",
+      Image = "https://eclipse.gsfc.nasa.gov/5MCSEmap/2001-2100/2017-02-26.gif"
+    },
+    {
+      Name = "Total Eclipse",
+      Date = "2017 Aug 21 18:26:40",
+      Image = "https://eclipse.gsfc.nasa.gov/5MCSEmap/2001-2100/2017-08-21.gif"
+    },
+    {
+      Name = "Partial Eclipse",
+      Date = "2018 Feb 15 20:52:33",
+      Image = "https://eclipse.gsfc.nasa.gov/5MCSEmap/2001-2100/2018-02-15.gif"
+    },
+    {
+      Name = "Partial Eclipse",
+      Date = "2018 Jul 13 03:02:16",
+      Image = "https://eclipse.gsfc.nasa.gov/5MCSEmap/2001-2100/2018-07-13.gif"
+    },
+    {
+      Name = "Partial Eclipse",
+      Date = "2018 Aug 11 09:47:28",
+      Image = "https://eclipse.gsfc.nasa.gov/5MCSEmap/2001-2100/2018-08-11.gif"
+    },
+    {
+      Name = "Partial Eclipse",
+      Date = "2019 Jan 06 01:42:38",
+      Image = "https://eclipse.gsfc.nasa.gov/5MCSEmap/2001-2100/2019-01-06.gif"
+    },
+    {
+      Name = "Total Eclipse",
+      Date = "2019 Jul 02 19:24:07",
+      Image = "https://eclipse.gsfc.nasa.gov/5MCSEmap/2001-2100/2019-07-02.gif"
+    },
+    {
+      Name = "Annular Eclipse",
+      Date = "2019 Dec 26 05:18:53",
+      Image = "https://eclipse.gsfc.nasa.gov/5MCSEmap/2001-2100/2019-12-26.gif"
+    },
+    {
+      Name = "Annular Eclipse",
+      Date = "2020 Jun 21 06:41:15",
+      Image = "https://eclipse.gsfc.nasa.gov/5MCSEmap/2001-2100/2020-06-21.gif"
+    },
+    {
+      Name = "Total Eclipse",
+      Date = "2020 Dec 14 16:14:39",
+      Image = "https://eclipse.gsfc.nasa.gov/5MCSEmap/2001-2100/2020-12-14.gif"
+    },
+    {
+      Name = "Annular Eclipse",
+      Date = "2021 Jun 10 10:43:07",
+      Image = "https://eclipse.gsfc.nasa.gov/5MCSEmap/2001-2100/2021-06-10.gif"
+    },
+    {
+      Name = "Total Eclipse",
+      Date = "2021 Dec 04 07:34:38",
+      Image = "https://eclipse.gsfc.nasa.gov/5MCSEmap/2001-2100/2021-12-04.gif"
+    },
+    {
+      Name = "Partial Eclipse",
+      Date = "2022 Apr 30 20:42:36",
+      Image = "https://eclipse.gsfc.nasa.gov/5MCSEmap/2001-2100/2022-04-30.gif"
+    },
+    {
+      Name = "Partial Eclipse",
+      Date = "2022 Oct 25 11:01:20",
+      Image = "https://eclipse.gsfc.nasa.gov/5MCSEmap/2001-2100/2022-10-25.gif"
+    },
+    {
+      Name = "Hybrid Eclipse",
+      Date = "2023 Apr 20 04:17:56",
+      Image = "https://eclipse.gsfc.nasa.gov/5MCSEmap/2001-2100/2023-04-20.gif"
+    },
+    {
+      Name = "Annular Eclipse",
+      Date = "2023 Oct 14 18:00:41",
+      Image = "https://eclipse.gsfc.nasa.gov/5MCSEmap/2001-2100/2023-10-14.gif"
+    },
+    {
+      Name = "Total Eclipse",
+      Date = "2024 Apr 08 18:18:29",
+      Image = "https://eclipse.gsfc.nasa.gov/5MCSEmap/2001-2100/2024-04-08.gif"
+    },
+    {
+      Name = "Annular Eclipse",
+      Date = "2024 Oct 02 18:46:13",
+      Image = "https://eclipse.gsfc.nasa.gov/5MCSEmap/2001-2100/2024-10-02.gif"
+    },
+    {
+      Name = "Partial Eclipse",
+      Date = "2025 Mar 29 10:48:36",
+      Image = "https://eclipse.gsfc.nasa.gov/5MCSEmap/2001-2100/2025-03-29.gif"
+    },
+    {
+      Name = "Partial Eclipse",
+      Date = "2025 Sep 21 19:43:04",
+      Image = "https://eclipse.gsfc.nasa.gov/5MCSEmap/2001-2100/2025-09-21.gif"
+    },
+    {
+      Name = "Annular Eclipse",
+      Date = "2026 Feb 17 12:13:06",
+      Image = "https://eclipse.gsfc.nasa.gov/5MCSEmap/2001-2100/2026-02-17.gif"
+    },
+    {
+      Name = "Total Eclipse",
+      Date = "2026 Aug 12 17:47:06",
+      Image = "https://eclipse.gsfc.nasa.gov/5MCSEmap/2001-2100/2026-08-12.gif"
+    },
+    {
+      Name = "Annular Eclipse",
+      Date = "2027 Feb 06 16:00:48",
+      Image = "https://eclipse.gsfc.nasa.gov/5MCSEmap/2001-2100/2027-02-06.gif"
+    },
+    {
+      Name = "Total Eclipse",
+      Date = "2027 Aug 02 10:07:50",
+      Image = "https://eclipse.gsfc.nasa.gov/5MCSEmap/2001-2100/2027-08-02.gif"
+    },
+    {
+      Name = "Annular Eclipse",
+      Date = "2028 Jan 26 15:08:59",
+      Image = "https://eclipse.gsfc.nasa.gov/5MCSEmap/2001-2100/2028-01-26.gif"
+    },
+    {
+      Name = "Total Eclipse",
+      Date = "2028 Jul 22 02:56:40",
+      Image = "https://eclipse.gsfc.nasa.gov/5MCSEmap/2001-2100/2028-07-22.gif"
+    },
+    {
+      Name = "Partial Eclipse",
+      Date = "2029 Jan 14 17:13:48",
+      Image = "https://eclipse.gsfc.nasa.gov/5MCSEmap/2001-2100/2029-01-14.gif"
+    },
+    {
+      Name = "Partial Eclipse",
+      Date = "2029 Jun 12 04:06:13",
+      Image = "https://eclipse.gsfc.nasa.gov/5MCSEmap/2001-2100/2029-06-12.gif"
+    },
+    {
+      Name = "Partial Eclipse",
+      Date = "2029 Jul 11 15:37:19",
+      Image = "https://eclipse.gsfc.nasa.gov/5MCSEmap/2001-2100/2029-07-11.gif"
+    },
+    {
+      Name = "Partial Eclipse",
+      Date = "2029 Dec 05 15:03:58",
+      Image = "https://eclipse.gsfc.nasa.gov/5MCSEmap/2001-2100/2029-12-05.gif"
+    },
+    {
+      Name = "Annular Eclipse",
+      Date = "2030 Jun 01 06:29:13",
+      Image = "https://eclipse.gsfc.nasa.gov/5MCSEmap/2001-2100/2030-06-01.gif"
+    },
+    {
+      Name = "Total Eclipse",
+      Date = "2030 Nov 25 06:51:37",
+      Image = "https://eclipse.gsfc.nasa.gov/5MCSEmap/2001-2100/2030-11-25.gif"
+    },
+    {
+      Name = "Annular Eclipse",
+      Date = "2031 May 21 07:16:04",
+      Image = "https://eclipse.gsfc.nasa.gov/5MCSEmap/2001-2100/2031-05-21.gif"
+    },
+    {
+      Name = "Hybrid Eclipse",
+      Date = "2031 Nov 14 21:07:31",
+      Image = "https://eclipse.gsfc.nasa.gov/5MCSEmap/2001-2100/2031-11-14.gif"
+    },
+    {
+      Name = "Annular Eclipse",
+      Date = "2032 May 09 13:26:42",
+      Image = "https://eclipse.gsfc.nasa.gov/5MCSEmap/2001-2100/2032-05-09.gif"
+    },
+    {
+      Name = "Partial Eclipse",
+      Date = "2032 Nov 03 05:34:13",
+      Image = "https://eclipse.gsfc.nasa.gov/5MCSEmap/2001-2100/2032-11-03.gif"
+    },
+    {
+      Name = "Total Eclipse",
+      Date = "2033 Mar 30 18:02:36",
+      Image = "https://eclipse.gsfc.nasa.gov/5MCSEmap/2001-2100/2033-03-30.gif"
+    },
+    {
+      Name = "Partial Eclipse",
+      Date = "2033 Sep 23 13:54:31",
+      Image = "https://eclipse.gsfc.nasa.gov/5MCSEmap/2001-2100/2033-09-23.gif"
+    },
+    {
+      Name = "Total Eclipse",
+      Date = "2034 Mar 20 10:18:45",
+      Image = "https://eclipse.gsfc.nasa.gov/5MCSEmap/2001-2100/2034-03-20.gif"
+    },
+    {
+      Name = "Annular Eclipse",
+      Date = "2034 Sep 12 16:19:28",
+      Image = "https://eclipse.gsfc.nasa.gov/5MCSEmap/2001-2100/2034-09-12.gif"
+    },
+    {
+      Name = "Annular Eclipse",
+      Date = "2035 Mar 09 23:05:54",
+      Image = "https://eclipse.gsfc.nasa.gov/5MCSEmap/2001-2100/2035-03-09.gif"
+    },
+    {
+      Name = "Total Eclipse",
+      Date = "2035 Sep 02 01:56:46",
+      Image = "https://eclipse.gsfc.nasa.gov/5MCSEmap/2001-2100/2035-09-02.gif"
+    },
+    {
+      Name = "Partial Eclipse",
+      Date = "2036 Feb 27 04:46:49",
+      Image = "https://eclipse.gsfc.nasa.gov/5MCSEmap/2001-2100/2036-02-27.gif"
+    },
+    {
+      Name = "Partial Eclipse",
+      Date = "2036 Jul 23 10:32:06",
+      Image = "https://eclipse.gsfc.nasa.gov/5MCSEmap/2001-2100/2036-07-23.gif"
+    },
+    {
+      Name = "Partial Eclipse",
+      Date = "2036 Aug 21 17:25:45",
+      Image = "https://eclipse.gsfc.nasa.gov/5MCSEmap/2001-2100/2036-08-21.gif"
+    },
+    {
+      Name = "Partial Eclipse",
+      Date = "2037 Jan 16 09:48:55",
+      Image = "https://eclipse.gsfc.nasa.gov/5MCSEmap/2001-2100/2037-01-16.gif"
+    },
+    {
+      Name = "Total Eclipse",
+      Date = "2037 Jul 13 02:40:36",
+      Image = "https://eclipse.gsfc.nasa.gov/5MCSEmap/2001-2100/2037-07-13.gif"
+    },
+    {
+      Name = "Annular Eclipse",
+      Date = "2038 Jan 05 13:47:11",
+      Image = "https://eclipse.gsfc.nasa.gov/5MCSEmap/2001-2100/2038-01-05.gif"
+    },
+    {
+      Name = "Annular Eclipse",
+      Date = "2038 Jul 02 13:32:55",
+      Image = "https://eclipse.gsfc.nasa.gov/5MCSEmap/2001-2100/2038-07-02.gif"
+    },
+    {
+      Name = "Total Eclipse",
+      Date = "2038 Dec 26 01:00:10",
+      Image = "https://eclipse.gsfc.nasa.gov/5MCSEmap/2001-2100/2038-12-26.gif"
+    },
+    {
+      Name = "Annular Eclipse",
+      Date = "2039 Jun 21 17:12:54",
+      Image = "https://eclipse.gsfc.nasa.gov/5MCSEmap/2001-2100/2039-06-21.gif"
+    },
+    {
+      Name = "Total Eclipse",
+      Date = "2039 Dec 15 16:23:46",
+      Image = "https://eclipse.gsfc.nasa.gov/5MCSEmap/2001-2100/2039-12-15.gif"
+    },
+    {
+      Name = "Partial Eclipse",
+      Date = "2040 May 11 03:43:02",
+      Image = "https://eclipse.gsfc.nasa.gov/5MCSEmap/2001-2100/2040-05-11.gif"
+    },
+    {
+      Name = "Partial Eclipse",
+      Date = "2040 Nov 04 19:09:02",
+      Image = "https://eclipse.gsfc.nasa.gov/5MCSEmap/2001-2100/2040-11-04.gif"
+    },
+    {
+      Name = "Total Eclipse",
+      Date = "2041 Apr 30 11:52:21",
+      Image = "https://eclipse.gsfc.nasa.gov/5MCSEmap/2001-2100/2041-04-30.gif"
+    },
+    {
+      Name = "Annular Eclipse",
+      Date = "2041 Oct 25 01:36:22",
+      Image = "https://eclipse.gsfc.nasa.gov/5MCSEmap/2001-2100/2041-10-25.gif"
+    },
+    {
+      Name = "Total Eclipse",
+      Date = "2042 Apr 20 02:17:30",
+      Image = "https://eclipse.gsfc.nasa.gov/5MCSEmap/2001-2100/2042-04-20.gif"
+    },
+    {
+      Name = "Annular Eclipse",
+      Date = "2042 Oct 14 02:00:42",
+      Image = "https://eclipse.gsfc.nasa.gov/5MCSEmap/2001-2100/2042-10-14.gif"
+    },
+    {
+      Name = "Total Eclipse",
+      Date = "2043 Apr 09 18:57:49",
+      Image = "https://eclipse.gsfc.nasa.gov/5MCSEmap/2001-2100/2043-04-09.gif"
+    },
+    {
+      Name = "Annular Eclipse",
+      Date = "2043 Oct 03 03:01:49",
+      Image = "https://eclipse.gsfc.nasa.gov/5MCSEmap/2001-2100/2043-10-03.gif"
+    },
+    {
+      Name = "Annular Eclipse",
+      Date = "2044 Feb 28 20:24:39",
+      Image = "https://eclipse.gsfc.nasa.gov/5MCSEmap/2001-2100/2044-02-28.gif"
+    },
+    {
+      Name = "Total Eclipse",
+      Date = "2044 Aug 23 01:17:02",
+      Image = "https://eclipse.gsfc.nasa.gov/5MCSEmap/2001-2100/2044-08-23.gif"
+    },
+    {
+      Name = "Annular Eclipse",
+      Date = "2045 Feb 16 23:56:07",
+      Image = "https://eclipse.gsfc.nasa.gov/5MCSEmap/2001-2100/2045-02-16.gif"
+    },
+    {
+      Name = "Total Eclipse",
+      Date = "2045 Aug 12 17:42:39",
+      Image = "https://eclipse.gsfc.nasa.gov/5MCSEmap/2001-2100/2045-08-12.gif"
+    },
+    {
+      Name = "Annular Eclipse",
+      Date = "2046 Feb 05 23:06:26",
+      Image = "https://eclipse.gsfc.nasa.gov/5MCSEmap/2001-2100/2046-02-05.gif"
+    },
+    {
+      Name = "Total Eclipse",
+      Date = "2046 Aug 02 10:21:13",
+      Image = "https://eclipse.gsfc.nasa.gov/5MCSEmap/2001-2100/2046-08-02.gif"
+    },
+    {
+      Name = "Partial Eclipse",
+      Date = "2047 Jan 26 01:33:18",
+      Image = "https://eclipse.gsfc.nasa.gov/5MCSEmap/2001-2100/2047-01-26.gif"
+    },
+    {
+      Name = "Partial Eclipse",
+      Date = "2047 Jun 23 10:52:31",
+      Image = "https://eclipse.gsfc.nasa.gov/5MCSEmap/2001-2100/2047-06-23.gif"
+    },
+    {
+      Name = "Partial Eclipse",
+      Date = "2047 Jul 22 22:36:17",
+      Image = "https://eclipse.gsfc.nasa.gov/5MCSEmap/2001-2100/2047-07-22.gif"
+    },
+    {
+      Name = "Partial Eclipse",
+      Date = "2047 Dec 16 23:50:12",
+      Image = "https://eclipse.gsfc.nasa.gov/5MCSEmap/2001-2100/2047-12-16.gif"
+    },
+    {
+      Name = "Annular Eclipse",
+      Date = "2048 Jun 11 12:58:53",
+      Image = "https://eclipse.gsfc.nasa.gov/5MCSEmap/2001-2100/2048-06-11.gif"
+    },
+    {
+      Name = "Total Eclipse",
+      Date = "2048 Dec 05 15:35:27",
+      Image = "https://eclipse.gsfc.nasa.gov/5MCSEmap/2001-2100/2048-12-05.gif"
+    },
+    {
+      Name = "Annular Eclipse",
+      Date = "2049 May 31 13:59:59",
+      Image = "https://eclipse.gsfc.nasa.gov/5MCSEmap/2001-2100/2049-05-31.gif"
+    },
+    {
+      Name = "Hybrid Eclipse",
+      Date = "2049 Nov 25 05:33:48",
+      Image = "https://eclipse.gsfc.nasa.gov/5MCSEmap/2001-2100/2049-11-25.gif"
+    },
+    {
+      Name = "Hybrid Eclipse",
+      Date = "2050 May 20 20:42:50",
+      Image = "https://eclipse.gsfc.nasa.gov/5MCSEmap/2001-2100/2050-05-20.gif"
+    },
+    {
+      Name = "Partial Eclipse",
+      Date = "2050 Nov 14 13:30:53",
+      Image = "https://eclipse.gsfc.nasa.gov/5MCSEmap/2001-2100/2050-11-14.gif"
+    },
+    {
+      Name = "Partial Eclipse",
+      Date = "2051 Apr 11 02:10:39",
+      Image = "https://eclipse.gsfc.nasa.gov/5MCSEmap/2001-2100/2051-04-11.gif"
+    },
+    {
+      Name = "Partial Eclipse",
+      Date = "2051 Oct 04 21:02:14",
+      Image = "https://eclipse.gsfc.nasa.gov/5MCSEmap/2001-2100/2051-10-04.gif"
+    },
+    {
+      Name = "Total Eclipse",
+      Date = "2052 Mar 30 18:31:53",
+      Image = "https://eclipse.gsfc.nasa.gov/5MCSEmap/2001-2100/2052-03-30.gif"
+    },
+    {
+      Name = "Annular Eclipse",
+      Date = "2052 Sep 22 23:39:10",
+      Image = "https://eclipse.gsfc.nasa.gov/5MCSEmap/2001-2100/2052-09-22.gif"
+    },
+    {
+      Name = "Annular Eclipse",
+      Date = "2053 Mar 20 07:08:19",
+      Image = "https://eclipse.gsfc.nasa.gov/5MCSEmap/2001-2100/2053-03-20.gif"
+    },
+    {
+      Name = "Total Eclipse",
+      Date = "2053 Sep 12 09:34:09",
+      Image = "https://eclipse.gsfc.nasa.gov/5MCSEmap/2001-2100/2053-09-12.gif"
+    },
+    {
+      Name = "Partial Eclipse",
+      Date = "2054 Mar 09 12:33:40",
+      Image = "https://eclipse.gsfc.nasa.gov/5MCSEmap/2001-2100/2054-03-09.gif"
+    },
+    {
+      Name = "Partial Eclipse",
+      Date = "2054 Aug 03 18:04:02",
+      Image = "https://eclipse.gsfc.nasa.gov/5MCSEmap/2001-2100/2054-08-03.gif"
+    },
+    {
+      Name = "Partial Eclipse",
+      Date = "2054 Sep 02 01:09:34",
+      Image = "https://eclipse.gsfc.nasa.gov/5MCSEmap/2001-2100/2054-09-02.gif"
+    },
+    {
+      Name = "Partial Eclipse",
+      Date = "2055 Jan 27 17:54:05",
+      Image = "https://eclipse.gsfc.nasa.gov/5MCSEmap/2001-2100/2055-01-27.gif"
+    },
+    {
+      Name = "Total Eclipse",
+      Date = "2055 Jul 24 09:57:50",
+      Image = "https://eclipse.gsfc.nasa.gov/5MCSEmap/2001-2100/2055-07-24.gif"
+    },
+    {
+      Name = "Annular Eclipse",
+      Date = "2056 Jan 16 22:16:45",
+      Image = "https://eclipse.gsfc.nasa.gov/5MCSEmap/2001-2100/2056-01-16.gif"
+    },
+    {
+      Name = "Annular Eclipse",
+      Date = "2056 Jul 12 20:21:59",
+      Image = "https://eclipse.gsfc.nasa.gov/5MCSEmap/2001-2100/2056-07-12.gif"
+    },
+    {
+      Name = "Total Eclipse",
+      Date = "2057 Jan 05 09:47:52",
+      Image = "https://eclipse.gsfc.nasa.gov/5MCSEmap/2001-2100/2057-01-05.gif"
+    },
+    {
+      Name = "Annular Eclipse",
+      Date = "2057 Jul 01 23:40:15",
+      Image = "https://eclipse.gsfc.nasa.gov/5MCSEmap/2001-2100/2057-07-01.gif"
+    },
+    {
+      Name = "Total Eclipse",
+      Date = "2057 Dec 26 01:14:35",
+      Image = "https://eclipse.gsfc.nasa.gov/5MCSEmap/2001-2100/2057-12-26.gif"
+    },
+    {
+      Name = "Partial Eclipse",
+      Date = "2058 May 22 10:39:25",
+      Image = "https://eclipse.gsfc.nasa.gov/5MCSEmap/2001-2100/2058-05-22.gif"
+    },
+    {
+      Name = "Partial Eclipse",
+      Date = "2058 Jun 21 00:19:35",
+      Image = "https://eclipse.gsfc.nasa.gov/5MCSEmap/2001-2100/2058-06-21.gif"
+    },
+    {
+      Name = "Partial Eclipse",
+      Date = "2058 Nov 16 03:23:07",
+      Image = "https://eclipse.gsfc.nasa.gov/5MCSEmap/2001-2100/2058-11-16.gif"
+    },
+    {
+      Name = "Total Eclipse",
+      Date = "2059 May 11 19:22:16",
+      Image = "https://eclipse.gsfc.nasa.gov/5MCSEmap/2001-2100/2059-05-11.gif"
+    },
+    {
+      Name = "Annular Eclipse",
+      Date = "2059 Nov 05 09:18:15",
+      Image = "https://eclipse.gsfc.nasa.gov/5MCSEmap/2001-2100/2059-11-05.gif"
+    },
+    {
+      Name = "Total Eclipse",
+      Date = "2060 Apr 30 10:10:00",
+      Image = "https://eclipse.gsfc.nasa.gov/5MCSEmap/2001-2100/2060-04-30.gif"
+    },
+    {
+      Name = "Annular Eclipse",
+      Date = "2060 Oct 24 09:24:10",
+      Image = "https://eclipse.gsfc.nasa.gov/5MCSEmap/2001-2100/2060-10-24.gif"
+    },
+    {
+      Name = "Total Eclipse",
+      Date = "2061 Apr 20 02:56:49",
+      Image = "https://eclipse.gsfc.nasa.gov/5MCSEmap/2001-2100/2061-04-20.gif"
+    },
+    {
+      Name = "Annular Eclipse",
+      Date = "2061 Oct 13 10:32:10",
+      Image = "https://eclipse.gsfc.nasa.gov/5MCSEmap/2001-2100/2061-10-13.gif"
+    },
+    {
+      Name = "Partial Eclipse",
+      Date = "2062 Mar 11 04:26:16",
+      Image = "https://eclipse.gsfc.nasa.gov/5MCSEmap/2001-2100/2062-03-11.gif"
+    },
+    {
+      Name = "Partial Eclipse",
+      Date = "2062 Sep 03 08:54:27",
+      Image = "https://eclipse.gsfc.nasa.gov/5MCSEmap/2001-2100/2062-09-03.gif"
+    },
+    {
+      Name = "Annular Eclipse",
+      Date = "2063 Feb 28 07:43:30",
+      Image = "https://eclipse.gsfc.nasa.gov/5MCSEmap/2001-2100/2063-02-28.gif"
+    },
+    {
+      Name = "Total Eclipse",
+      Date = "2063 Aug 24 01:22:11",
+      Image = "https://eclipse.gsfc.nasa.gov/5MCSEmap/2001-2100/2063-08-24.gif"
+    },
+    {
+      Name = "Annular Eclipse",
+      Date = "2064 Feb 17 07:00:23",
+      Image = "https://eclipse.gsfc.nasa.gov/5MCSEmap/2001-2100/2064-02-17.gif"
+    },
+    {
+      Name = "Total Eclipse",
+      Date = "2064 Aug 12 17:46:06",
+      Image = "https://eclipse.gsfc.nasa.gov/5MCSEmap/2001-2100/2064-08-12.gif"
+    },
+    {
+      Name = "Partial Eclipse",
+      Date = "2065 Feb 05 09:52:26",
+      Image = "https://eclipse.gsfc.nasa.gov/5MCSEmap/2001-2100/2065-02-05.gif"
+    },
+    {
+      Name = "Partial Eclipse",
+      Date = "2065 Jul 03 17:33:52",
+      Image = "https://eclipse.gsfc.nasa.gov/5MCSEmap/2001-2100/2065-07-03.gif"
+    },
+    {
+      Name = "Partial Eclipse",
+      Date = "2065 Aug 02 05:34:17",
+      Image = "https://eclipse.gsfc.nasa.gov/5MCSEmap/2001-2100/2065-08-02.gif"
+    },
+    {
+      Name = "Partial Eclipse",
+      Date = "2065 Dec 27 08:39:56",
+      Image = "https://eclipse.gsfc.nasa.gov/5MCSEmap/2001-2100/2065-12-27.gif"
+    },
+    {
+      Name = "Annular Eclipse",
+      Date = "2066 Jun 22 19:25:48",
+      Image = "https://eclipse.gsfc.nasa.gov/5MCSEmap/2001-2100/2066-06-22.gif"
+    },
+    {
+      Name = "Total Eclipse",
+      Date = "2066 Dec 17 00:23:40",
+      Image = "https://eclipse.gsfc.nasa.gov/5MCSEmap/2001-2100/2066-12-17.gif"
+    },
+    {
+      Name = "Annular Eclipse",
+      Date = "2067 Jun 11 20:42:26",
+      Image = "https://eclipse.gsfc.nasa.gov/5MCSEmap/2001-2100/2067-06-11.gif"
+    },
+    {
+      Name = "Hybrid Eclipse",
+      Date = "2067 Dec 06 14:03:43",
+      Image = "https://eclipse.gsfc.nasa.gov/5MCSEmap/2001-2100/2067-12-06.gif"
+    },
+    {
+      Name = "Total Eclipse",
+      Date = "2068 May 31 03:56:39",
+      Image = "https://eclipse.gsfc.nasa.gov/5MCSEmap/2001-2100/2068-05-31.gif"
+    },
+    {
+      Name = "Partial Eclipse",
+      Date = "2068 Nov 24 21:32:30",
+      Image = "https://eclipse.gsfc.nasa.gov/5MCSEmap/2001-2100/2068-11-24.gif"
+    },
+    {
+      Name = "Partial Eclipse",
+      Date = "2069 Apr 21 10:11:09",
+      Image = "https://eclipse.gsfc.nasa.gov/5MCSEmap/2001-2100/2069-04-21.gif"
+    },
+    {
+      Name = "Partial Eclipse",
+      Date = "2069 May 20 17:53:18",
+      Image = "https://eclipse.gsfc.nasa.gov/5MCSEmap/2001-2100/2069-05-20.gif"
+    },
+    {
+      Name = "Partial Eclipse",
+      Date = "2069 Oct 15 04:19:56",
+      Image = "https://eclipse.gsfc.nasa.gov/5MCSEmap/2001-2100/2069-10-15.gif"
+    },
+    {
+      Name = "Total Eclipse",
+      Date = "2070 Apr 11 02:36:09",
+      Image = "https://eclipse.gsfc.nasa.gov/5MCSEmap/2001-2100/2070-04-11.gif"
+    },
+    {
+      Name = "Annular Eclipse",
+      Date = "2070 Oct 04 07:08:57",
+      Image = "https://eclipse.gsfc.nasa.gov/5MCSEmap/2001-2100/2070-10-04.gif"
+    },
+    {
+      Name = "Annular Eclipse",
+      Date = "2071 Mar 31 15:01:06",
+      Image = "https://eclipse.gsfc.nasa.gov/5MCSEmap/2001-2100/2071-03-31.gif"
+    },
+    {
+      Name = "Total Eclipse",
+      Date = "2071 Sep 23 17:20:28",
+      Image = "https://eclipse.gsfc.nasa.gov/5MCSEmap/2001-2100/2071-09-23.gif"
+    },
+    {
+      Name = "Partial Eclipse",
+      Date = "2072 Mar 19 20:10:31",
+      Image = "https://eclipse.gsfc.nasa.gov/5MCSEmap/2001-2100/2072-03-19.gif"
+    },
+    {
+      Name = "Total Eclipse",
+      Date = "2072 Sep 12 08:59:20",
+      Image = "https://eclipse.gsfc.nasa.gov/5MCSEmap/2001-2100/2072-09-12.gif"
+    },
+    {
+      Name = "Partial Eclipse",
+      Date = "2073 Feb 07 01:55:59",
+      Image = "https://eclipse.gsfc.nasa.gov/5MCSEmap/2001-2100/2073-02-07.gif"
+    },
+    {
+      Name = "Total Eclipse",
+      Date = "2073 Aug 03 17:15:23",
+      Image = "https://eclipse.gsfc.nasa.gov/5MCSEmap/2001-2100/2073-08-03.gif"
+    },
+    {
+      Name = "Annular Eclipse",
+      Date = "2074 Jan 27 06:44:15",
+      Image = "https://eclipse.gsfc.nasa.gov/5MCSEmap/2001-2100/2074-01-27.gif"
+    },
+    {
+      Name = "Annular Eclipse",
+      Date = "2074 Jul 24 03:10:32",
+      Image = "https://eclipse.gsfc.nasa.gov/5MCSEmap/2001-2100/2074-07-24.gif"
+    },
+    {
+      Name = "Total Eclipse",
+      Date = "2075 Jan 16 18:36:04",
+      Image = "https://eclipse.gsfc.nasa.gov/5MCSEmap/2001-2100/2075-01-16.gif"
+    },
+    {
+      Name = "Annular Eclipse",
+      Date = "2075 Jul 13 06:05:44",
+      Image = "https://eclipse.gsfc.nasa.gov/5MCSEmap/2001-2100/2075-07-13.gif"
+    },
+    {
+      Name = "Total Eclipse",
+      Date = "2076 Jan 06 10:07:27",
+      Image = "https://eclipse.gsfc.nasa.gov/5MCSEmap/2001-2100/2076-01-06.gif"
+    },
+    {
+      Name = "Partial Eclipse",
+      Date = "2076 Jun 01 17:31:22",
+      Image = "https://eclipse.gsfc.nasa.gov/5MCSEmap/2001-2100/2076-06-01.gif"
+    },
+    {
+      Name = "Partial Eclipse",
+      Date = "2076 Jul 01 06:50:43",
+      Image = "https://eclipse.gsfc.nasa.gov/5MCSEmap/2001-2100/2076-07-01.gif"
+    },
+    {
+      Name = "Partial Eclipse",
+      Date = "2076 Nov 26 11:43:01",
+      Image = "https://eclipse.gsfc.nasa.gov/5MCSEmap/2001-2100/2076-11-26.gif"
+    },
+    {
+      Name = "Total Eclipse",
+      Date = "2077 May 22 02:46:05",
+      Image = "https://eclipse.gsfc.nasa.gov/5MCSEmap/2001-2100/2077-05-22.gif"
+    },
+    {
+      Name = "Annular Eclipse",
+      Date = "2077 Nov 15 17:07:56",
+      Image = "https://eclipse.gsfc.nasa.gov/5MCSEmap/2001-2100/2077-11-15.gif"
+    },
+    {
+      Name = "Total Eclipse",
+      Date = "2078 May 11 17:56:55",
+      Image = "https://eclipse.gsfc.nasa.gov/5MCSEmap/2001-2100/2078-05-11.gif"
+    },
+    {
+      Name = "Annular Eclipse",
+      Date = "2078 Nov 04 16:55:44",
+      Image = "https://eclipse.gsfc.nasa.gov/5MCSEmap/2001-2100/2078-11-04.gif"
+    },
+    {
+      Name = "Total Eclipse",
+      Date = "2079 May 01 10:50:13",
+      Image = "https://eclipse.gsfc.nasa.gov/5MCSEmap/2001-2100/2079-05-01.gif"
+    },
+    {
+      Name = "Annular Eclipse",
+      Date = "2079 Oct 24 18:11:21",
+      Image = "https://eclipse.gsfc.nasa.gov/5MCSEmap/2001-2100/2079-10-24.gif"
+    },
+    {
+      Name = "Partial Eclipse",
+      Date = "2080 Mar 21 12:20:15",
+      Image = "https://eclipse.gsfc.nasa.gov/5MCSEmap/2001-2100/2080-03-21.gif"
+    },
+    {
+      Name = "Partial Eclipse",
+      Date = "2080 Sep 13 16:38:09",
+      Image = "https://eclipse.gsfc.nasa.gov/5MCSEmap/2001-2100/2080-09-13.gif"
+    },
+    {
+      Name = "Annular Eclipse",
+      Date = "2081 Mar 10 15:23:31",
+      Image = "https://eclipse.gsfc.nasa.gov/5MCSEmap/2001-2100/2081-03-10.gif"
+    },
+    {
+      Name = "Total Eclipse",
+      Date = "2081 Sep 03 09:07:31",
+      Image = "https://eclipse.gsfc.nasa.gov/5MCSEmap/2001-2100/2081-09-03.gif"
+    },
+    {
+      Name = "Annular Eclipse",
+      Date = "2082 Feb 27 14:47:00",
+      Image = "https://eclipse.gsfc.nasa.gov/5MCSEmap/2001-2100/2082-02-27.gif"
+    },
+    {
+      Name = "Total Eclipse",
+      Date = "2082 Aug 24 01:16:21",
+      Image = "https://eclipse.gsfc.nasa.gov/5MCSEmap/2001-2100/2082-08-24.gif"
+    },
+    {
+      Name = "Partial Eclipse",
+      Date = "2083 Feb 16 18:06:36",
+      Image = "https://eclipse.gsfc.nasa.gov/5MCSEmap/2001-2100/2083-02-16.gif"
+    },
+    {
+      Name = "Partial Eclipse",
+      Date = "2083 Jul 15 00:14:23",
+      Image = "https://eclipse.gsfc.nasa.gov/5MCSEmap/2001-2100/2083-07-15.gif"
+    },
+    {
+      Name = "Partial Eclipse",
+      Date = "2083 Aug 13 12:34:41",
+      Image = "https://eclipse.gsfc.nasa.gov/5MCSEmap/2001-2100/2083-08-13.gif"
+    },
+    {
+      Name = "Partial Eclipse",
+      Date = "2084 Jan 07 17:30:24",
+      Image = "https://eclipse.gsfc.nasa.gov/5MCSEmap/2001-2100/2084-01-07.gif"
+    },
+    {
+      Name = "Annular Eclipse",
+      Date = "2084 Jul 03 01:50:26",
+      Image = "https://eclipse.gsfc.nasa.gov/5MCSEmap/2001-2100/2084-07-03.gif"
+    },
+    {
+      Name = "Total Eclipse",
+      Date = "2084 Dec 27 09:13:48",
+      Image = "https://eclipse.gsfc.nasa.gov/5MCSEmap/2001-2100/2084-12-27.gif"
+    },
+    {
+      Name = "Annular Eclipse",
+      Date = "2085 Jun 22 03:21:16",
+      Image = "https://eclipse.gsfc.nasa.gov/5MCSEmap/2001-2100/2085-06-22.gif"
+    },
+    {
+      Name = "Annular Eclipse",
+      Date = "2085 Dec 16 22:37:48",
+      Image = "https://eclipse.gsfc.nasa.gov/5MCSEmap/2001-2100/2085-12-16.gif"
+    },
+    {
+      Name = "Total Eclipse",
+      Date = "2086 Jun 11 11:07:14",
+      Image = "https://eclipse.gsfc.nasa.gov/5MCSEmap/2001-2100/2086-06-11.gif"
+    },
+    {
+      Name = "Partial Eclipse",
+      Date = "2086 Dec 06 05:38:55",
+      Image = "https://eclipse.gsfc.nasa.gov/5MCSEmap/2001-2100/2086-12-06.gif"
+    },
+    {
+      Name = "Partial Eclipse",
+      Date = "2087 May 02 18:04:42",
+      Image = "https://eclipse.gsfc.nasa.gov/5MCSEmap/2001-2100/2087-05-02.gif"
+    },
+    {
+      Name = "Partial Eclipse",
+      Date = "2087 Jun 01 01:27:14",
+      Image = "https://eclipse.gsfc.nasa.gov/5MCSEmap/2001-2100/2087-06-01.gif"
+    },
+    {
+      Name = "Partial Eclipse",
+      Date = "2087 Oct 26 11:46:57",
+      Image = "https://eclipse.gsfc.nasa.gov/5MCSEmap/2001-2100/2087-10-26.gif"
+    },
+    {
+      Name = "Total Eclipse",
+      Date = "2088 Apr 21 10:31:49",
+      Image = "https://eclipse.gsfc.nasa.gov/5MCSEmap/2001-2100/2088-04-21.gif"
+    },
+    {
+      Name = "Annular Eclipse",
+      Date = "2088 Oct 14 14:48:05",
+      Image = "https://eclipse.gsfc.nasa.gov/5MCSEmap/2001-2100/2088-10-14.gif"
+    },
+    {
+      Name = "Annular Eclipse",
+      Date = "2089 Apr 10 22:44:42",
+      Image = "https://eclipse.gsfc.nasa.gov/5MCSEmap/2001-2100/2089-04-10.gif"
+    },
+    {
+      Name = "Total Eclipse",
+      Date = "2089 Oct 04 01:15:23",
+      Image = "https://eclipse.gsfc.nasa.gov/5MCSEmap/2001-2100/2089-10-04.gif"
+    },
+    {
+      Name = "Partial Eclipse",
+      Date = "2090 Mar 31 03:38:08",
+      Image = "https://eclipse.gsfc.nasa.gov/5MCSEmap/2001-2100/2090-03-31.gif"
+    },
+    {
+      Name = "Total Eclipse",
+      Date = "2090 Sep 23 16:56:36",
+      Image = "https://eclipse.gsfc.nasa.gov/5MCSEmap/2001-2100/2090-09-23.gif"
+    },
+    {
+      Name = "Partial Eclipse",
+      Date = "2091 Feb 18 09:54:40",
+      Image = "https://eclipse.gsfc.nasa.gov/5MCSEmap/2001-2100/2091-02-18.gif"
+    },
+    {
+      Name = "Total Eclipse",
+      Date = "2091 Aug 15 00:34:43",
+      Image = "https://eclipse.gsfc.nasa.gov/5MCSEmap/2001-2100/2091-08-15.gif"
+    },
+    {
+      Name = "Annular Eclipse",
+      Date = "2092 Feb 07 15:10:20",
+      Image = "https://eclipse.gsfc.nasa.gov/5MCSEmap/2001-2100/2092-02-07.gif"
+    },
+    {
+      Name = "Annular Eclipse",
+      Date = "2092 Aug 03 09:59:33",
+      Image = "https://eclipse.gsfc.nasa.gov/5MCSEmap/2001-2100/2092-08-03.gif"
+    },
+    {
+      Name = "Total Eclipse",
+      Date = "2093 Jan 27 03:22:16",
+      Image = "https://eclipse.gsfc.nasa.gov/5MCSEmap/2001-2100/2093-01-27.gif"
+    },
+    {
+      Name = "Annular Eclipse",
+      Date = "2093 Jul 23 12:32:04",
+      Image = "https://eclipse.gsfc.nasa.gov/5MCSEmap/2001-2100/2093-07-23.gif"
+    },
+    {
+      Name = "Total Eclipse",
+      Date = "2094 Jan 16 18:59:03",
+      Image = "https://eclipse.gsfc.nasa.gov/5MCSEmap/2001-2100/2094-01-16.gif"
+    },
+    {
+      Name = "Partial Eclipse",
+      Date = "2094 Jun 13 00:22:11",
+      Image = "https://eclipse.gsfc.nasa.gov/5MCSEmap/2001-2100/2094-06-13.gif"
+    },
+    {
+      Name = "Partial Eclipse",
+      Date = "2094 Jul 12 13:24:35",
+      Image = "https://eclipse.gsfc.nasa.gov/5MCSEmap/2001-2100/2094-07-12.gif"
+    },
+    {
+      Name = "Partial Eclipse",
+      Date = "2094 Dec 07 20:05:56",
+      Image = "https://eclipse.gsfc.nasa.gov/5MCSEmap/2001-2100/2094-12-07.gif"
+    },
+    {
+      Name = "Total Eclipse",
+      Date = "2095 Jun 02 10:07:40",
+      Image = "https://eclipse.gsfc.nasa.gov/5MCSEmap/2001-2100/2095-06-02.gif"
+    },
+    {
+      Name = "Annular Eclipse",
+      Date = "2095 Nov 27 01:02:57",
+      Image = "https://eclipse.gsfc.nasa.gov/5MCSEmap/2001-2100/2095-11-27.gif"
+    },
+    {
+      Name = "Total Eclipse",
+      Date = "2096 May 22 01:37:14",
+      Image = "https://eclipse.gsfc.nasa.gov/5MCSEmap/2001-2100/2096-05-22.gif"
+    },
+    {
+      Name = "Annular Eclipse",
+      Date = "2096 Nov 15 00:36:15",
+      Image = "https://eclipse.gsfc.nasa.gov/5MCSEmap/2001-2100/2096-11-15.gif"
+    },
+    {
+      Name = "Total Eclipse",
+      Date = "2097 May 11 18:34:31",
+      Image = "https://eclipse.gsfc.nasa.gov/5MCSEmap/2001-2100/2097-05-11.gif"
+    },
+    {
+      Name = "Annular Eclipse",
+      Date = "2097 Nov 04 02:01:25",
+      Image = "https://eclipse.gsfc.nasa.gov/5MCSEmap/2001-2100/2097-11-04.gif"
+    },
+    {
+      Name = "Partial Eclipse",
+      Date = "2098 Apr 01 20:02:31",
+      Image = "https://eclipse.gsfc.nasa.gov/5MCSEmap/2001-2100/2098-04-01.gif"
+    },
+    {
+      Name = "Partial Eclipse",
+      Date = "2098 Sep 25 00:31:16",
+      Image = "https://eclipse.gsfc.nasa.gov/5MCSEmap/2001-2100/2098-09-25.gif"
+    },
+    {
+      Name = "Partial Eclipse",
+      Date = "2098 Oct 24 10:36:11",
+      Image = "https://eclipse.gsfc.nasa.gov/5MCSEmap/2001-2100/2098-10-24.gif"
+    },
+    {
+      Name = "Annular Eclipse",
+      Date = "2099 Mar 21 22:54:32",
+      Image = "https://eclipse.gsfc.nasa.gov/5MCSEmap/2001-2100/2099-03-21.gif"
+    },
+    {
+      Name = "Total Eclipse",
+      Date = "2099 Sep 14 16:57:53",
+      Image = "https://eclipse.gsfc.nasa.gov/5MCSEmap/2001-2100/2099-09-14.gif"
+    },
+    {
+      Name = "Annular Eclipse",
+      Date = "2100 Mar 10 22:28:11",
+      Image = "https://eclipse.gsfc.nasa.gov/5MCSEmap/2001-2100/2100-03-10.gif"
+    },
+    {
+      Name = "Total Eclipse",
+      Date = "2100 Sep 04 08:49:20",
+      Image = "https://eclipse.gsfc.nasa.gov/5MCSEmap/2001-2100/2100-09-04.gif"
+    }
+  }
+}
+
+asset.onInitialize(function()
+  openspace.loadMission(Timeline)
+end)
+
+asset.onDeinitialize(function()
+  openspace.unloadMission(Timeline.Name)
+end)
+
+
+
+asset.meta = {
+  Name = "Eclipses Timeline",
+  Version = "1.0",
+  Description = "A timeline that shows all of the eclipses in the past and next 100 years",
+  Author = "OpenSpace Team",
+  URL = "http://openspaceproject.com",
+  License = "MIT license"
+}
diff --git a/data/profiles/eclipse.profile b/data/profiles/eclipse.profile
new file mode 100644
index 0000000000..2e3193ea3e
--- /dev/null
+++ b/data/profiles/eclipse.profile
@@ -0,0 +1,74 @@
+{
+  "assets": [
+    "base",
+    "base_keybindings",
+    "events/toggle_sun",
+    "scene/solarsystem/planets/earth/earth",
+    "scene/solarsystem/planets/earth/eclipses/eclipses",
+    "scene/solarsystem/planets/earth/eclipse_shadow"
+  ],
+  "camera": {
+    "altitude": 17000000.0,
+    "anchor": "Earth",
+    "latitude": 58.5877,
+    "longitude": 16.1924,
+    "type": "goToGeo"
+  },
+  "delta_times": [
+    1.0,
+    5.0,
+    30.0,
+    60.0,
+    300.0,
+    1800.0,
+    3600.0,
+    43200.0,
+    86400.0,
+    604800.0,
+    1209600.0,
+    2592000.0,
+    5184000.0,
+    7776000.0,
+    15552000.0,
+    31536000.0,
+    63072000.0,
+    157680000.0,
+    315360000.0,
+    630720000.0
+  ],
+  "keybindings": [],
+  "mark_nodes": [
+    "Earth",
+    "Moon",
+    "Sun",
+    "ISS"
+  ],
+  "meta": {
+    "author": "OpenSpace Team",
+    "description": "OpenSpace profile to highlight solar eclipses on the Earth from 1900 to 2100",
+    "license": "MIT License",
+    "name": "Default",
+    "url": "https://www.openspaceproject.com",
+    "version": "1.0"
+  },
+  "properties": [
+    {
+      "name": "Scene.MoonOrbitalPlaneRadialGrid.Renderable.Enabled",
+      "type": "setPropertyValueSingle",
+      "value": "false"
+    },
+    {
+      "name": "Scene.EarthEclipticRadialGrid.Renderable.Enabled",
+      "type": "setPropertyValueSingle",
+      "value": "false"
+    }
+  ],
+  "time": {
+    "type": "absolute",
+    "value": "2023 Oct 14 18:00:41"
+  },
+  "version": {
+    "major": 1,
+    "minor": 1
+  }
+}
diff --git a/modules/space/rendering/renderableeclipsecone.cpp b/modules/space/rendering/renderableeclipsecone.cpp
index 72ef239df6..1f6c893fc1 100644
--- a/modules/space/rendering/renderableeclipsecone.cpp
+++ b/modules/space/rendering/renderableeclipsecone.cpp
@@ -336,7 +336,7 @@ std::vector<VBOLayout> calculateShadowPoints(const std::vector<glm::dvec3>& srcT
         const glm::dvec3 dir = glm::normalize(dst - src);
 
         // The start point is the terminator point on the Moon
-        glm::vec3 p1 = dst -dir * lengthScale*1000.0;
+        glm::vec3 p1 = dst;
         vertices.push_back({ p1.x, p1.y, p1.z });
 
         // The end point is calculated by forward propagating the incoming direction

From 7483b912e0f96eedaf3f4097c4179b33e706c0fa Mon Sep 17 00:00:00 2001
From: Alexander Bock <alexander.bock@liu.se>
Date: Wed, 13 Sep 2023 09:51:30 +0200
Subject: [PATCH 133/701] Update submodules to fix compilation error on newer
 Clang and GCC (#2890)

* Update submodules

* Update Ghoul
---
 apps/OpenSpace/ext/sgct                                |  2 +-
 ext/ghoul                                              |  2 +-
 modules/base/rendering/renderablenodeline.cpp          |  4 ++--
 modules/base/rendering/renderableplaneimageonline.cpp  |  2 +-
 .../base/rendering/renderableplanetimevaryingimage.cpp |  4 ++--
 modules/base/rendering/renderablesphereimageonline.cpp |  2 +-
 modules/base/rendering/screenspaceimagelocal.cpp       |  4 +++-
 modules/base/rendering/screenspaceimageonline.cpp      |  2 +-
 modules/cefwebgui/cefwebguimodule.cpp                  |  2 +-
 modules/gaia/rendering/renderablegaiastars.cpp         |  2 +-
 modules/globebrowsing/src/geojson/geojsoncomponent.cpp | 10 +++++-----
 .../rendering/renderablekameleonvolume.cpp             |  2 +-
 modules/space/horizonsfile.cpp                         |  6 ++++--
 modules/space/rendering/renderableorbitalkepler.cpp    |  2 +-
 modules/space/rendering/renderablestars.cpp            |  4 ++--
 modules/video/src/videoplayer.cpp                      |  3 ++-
 modules/vislab/rendering/renderabledistancelabel.cpp   |  4 +++-
 src/navigation/pathnavigator.cpp                       |  2 +-
 src/scene/assetmanager.cpp                             |  4 ++--
 19 files changed, 35 insertions(+), 28 deletions(-)

diff --git a/apps/OpenSpace/ext/sgct b/apps/OpenSpace/ext/sgct
index 654a594e2d..ada33efc9e 160000
--- a/apps/OpenSpace/ext/sgct
+++ b/apps/OpenSpace/ext/sgct
@@ -1 +1 @@
-Subproject commit 654a594e2d6e8f8784b1f73b02ae96ff33be0848
+Subproject commit ada33efc9e65fc6db36d1f75d9782afdcac80cef
diff --git a/ext/ghoul b/ext/ghoul
index c50518fb79..fb549390c1 160000
--- a/ext/ghoul
+++ b/ext/ghoul
@@ -1 +1 @@
-Subproject commit c50518fb79edd741b41130f04143605232579495
+Subproject commit fb549390c101cfcaac34f490185854faeb18911d
diff --git a/modules/base/rendering/renderablenodeline.cpp b/modules/base/rendering/renderablenodeline.cpp
index 11a50606fd..a4b922c3f4 100644
--- a/modules/base/rendering/renderablenodeline.cpp
+++ b/modules/base/rendering/renderablenodeline.cpp
@@ -186,7 +186,7 @@ RenderableNodeLine::RenderableNodeLine(const ghoul::Dictionary& dictionary)
                 "Trying to use relative offsets for start node '{}' that has no "
                 "bounding sphere. This will result in no offset. Use direct "
                 "values by setting UseRelativeOffsets to false",
-                parent()->identifier(), _start
+                parent()->identifier(), _start.value()
             ));
         }
     });
@@ -204,7 +204,7 @@ RenderableNodeLine::RenderableNodeLine(const ghoul::Dictionary& dictionary)
                 "Trying to use relative offsets for end node '{}' that has no "
                 "bounding sphere. This will result in no offset. Use direct "
                 "values by setting UseRelativeOffsets to false",
-                parent()->identifier(), _end
+                parent()->identifier(), _end.value()
             ));
         }
      });
diff --git a/modules/base/rendering/renderableplaneimageonline.cpp b/modules/base/rendering/renderableplaneimageonline.cpp
index 65c9f4ffb1..a7d876237d 100644
--- a/modules/base/rendering/renderableplaneimageonline.cpp
+++ b/modules/base/rendering/renderableplaneimageonline.cpp
@@ -134,7 +134,7 @@ void RenderablePlaneImageOnline::update(const UpdateData& data) {
         if (imageFile.corrupted) {
             LERRORC(
                 "ScreenSpaceImageOnline",
-                fmt::format("Error loading image from URL '{}'", _texturePath)
+                fmt::format("Error loading image from URL '{}'", _texturePath.value())
             );
             return;
         }
diff --git a/modules/base/rendering/renderableplanetimevaryingimage.cpp b/modules/base/rendering/renderableplanetimevaryingimage.cpp
index 27c93f371a..b7d498ed47 100644
--- a/modules/base/rendering/renderableplanetimevaryingimage.cpp
+++ b/modules/base/rendering/renderableplanetimevaryingimage.cpp
@@ -98,7 +98,7 @@ RenderablePlaneTimeVaryingImage::RenderablePlaneTimeVaryingImage(
     if (!std::filesystem::is_directory(absPath(_sourceFolder))) {
         LERROR(fmt::format(
             "Time varying image, {} is not a valid directory",
-            _sourceFolder
+            _sourceFolder.value()
         ));
     }
 
@@ -176,7 +176,7 @@ bool RenderablePlaneTimeVaryingImage::extractMandatoryInfoFromDictionary() {
     if (_sourceFiles.empty()) {
         LERROR(fmt::format(
             "{}: Plane sequence filepath {} was empty",
-            _identifier, _sourceFolder
+            _identifier, _sourceFolder.value()
         ));
         return false;
     }
diff --git a/modules/base/rendering/renderablesphereimageonline.cpp b/modules/base/rendering/renderablesphereimageonline.cpp
index d21e9d4bea..036fc52bcd 100644
--- a/modules/base/rendering/renderablesphereimageonline.cpp
+++ b/modules/base/rendering/renderablesphereimageonline.cpp
@@ -98,7 +98,7 @@ void RenderableSphereImageOnline::update(const UpdateData& data) {
         if (imageFile.corrupted) {
             LERRORC(
                 "RenderableSphereImageOnline",
-                fmt::format("Error loading image from URL '{}'", _textureUrl)
+                fmt::format("Error loading image from URL '{}'", _textureUrl.value())
             );
             return;
         }
diff --git a/modules/base/rendering/screenspaceimagelocal.cpp b/modules/base/rendering/screenspaceimagelocal.cpp
index d84cf9b011..2115750690 100644
--- a/modules/base/rendering/screenspaceimagelocal.cpp
+++ b/modules/base/rendering/screenspaceimagelocal.cpp
@@ -85,7 +85,9 @@ ScreenSpaceImageLocal::ScreenSpaceImageLocal(const ghoul::Dictionary& dictionary
         if (!std::filesystem::is_regular_file(absPath(_texturePath))) {
             LWARNINGC(
                 "ScreenSpaceImageLocal",
-                fmt::format("Image {} did not exist for {}", _texturePath, _identifier)
+                fmt::format(
+                    "Image {} did not exist for {}", _texturePath.value(), _identifier
+                )
             );
         }
         else {
diff --git a/modules/base/rendering/screenspaceimageonline.cpp b/modules/base/rendering/screenspaceimageonline.cpp
index 71160a3eb2..e39b422288 100644
--- a/modules/base/rendering/screenspaceimageonline.cpp
+++ b/modules/base/rendering/screenspaceimageonline.cpp
@@ -110,7 +110,7 @@ void ScreenSpaceImageOnline::update() {
             if (imageFile.corrupted) {
                 LERRORC(
                     "ScreenSpaceImageOnline",
-                    fmt::format("Error loading image from URL '{}'", _texturePath)
+                    fmt::format("Error loading image from URL '{}'", _texturePath.value())
                 );
                 return;
             }
diff --git a/modules/cefwebgui/cefwebguimodule.cpp b/modules/cefwebgui/cefwebguimodule.cpp
index 193a12a242..e9c81bd121 100644
--- a/modules/cefwebgui/cefwebguimodule.cpp
+++ b/modules/cefwebgui/cefwebguimodule.cpp
@@ -102,7 +102,7 @@ void CefWebGuiModule::startOrStopGui() {
     const bool isMaster = global::windowDelegate->isMaster();
 
     if (_enabled && isMaster) {
-        LDEBUGC("WebBrowser", fmt::format("Loading GUI from {}", _url));
+        LDEBUGC("WebBrowser", fmt::format("Loading GUI from {}", _url.value()));
 
         if (!_instance) {
             _instance = std::make_unique<BrowserInstance>(
diff --git a/modules/gaia/rendering/renderablegaiastars.cpp b/modules/gaia/rendering/renderablegaiastars.cpp
index 2b83ce82c0..cd2d5baded 100644
--- a/modules/gaia/rendering/renderablegaiastars.cpp
+++ b/modules/gaia/rendering/renderablegaiastars.cpp
@@ -511,7 +511,7 @@ RenderableGaiaStars::RenderableGaiaStars(const ghoul::Dictionary& dictionary)
             _dataIsDirty = true;
         }
         else {
-            LWARNING(fmt::format("File not found: {}", _filePath));
+            LWARNING(fmt::format("File not found: {}", _filePath.value()));
         }
     });
     addProperty(_filePath);
diff --git a/modules/globebrowsing/src/geojson/geojsoncomponent.cpp b/modules/globebrowsing/src/geojson/geojsoncomponent.cpp
index 1d876df11b..e87bf58e67 100644
--- a/modules/globebrowsing/src/geojson/geojsoncomponent.cpp
+++ b/modules/globebrowsing/src/geojson/geojsoncomponent.cpp
@@ -369,7 +369,7 @@ GeoJsonComponent::GeoJsonComponent(const ghoul::Dictionary& dictionary,
         else {
             LERROR(fmt::format(
                 "Provided texture file does not exist: '{}'",
-                _defaultProperties.pointTexture
+                _defaultProperties.pointTexture.value()
             ));
         }
     });
@@ -593,7 +593,7 @@ void GeoJsonComponent::readFile() {
     std::ifstream file(_geoJsonFile);
 
     if (!file.good()) {
-        LERROR(fmt::format("Failed to open GeoJSON file: {}", _geoJsonFile));
+        LERROR(fmt::format("Failed to open GeoJSON file: {}", _geoJsonFile.value()));
         return;
     }
 
@@ -628,7 +628,7 @@ void GeoJsonComponent::readFile() {
     catch (const geos::util::GEOSException& e) {
         LERROR(fmt::format(
             "Error creating GeoJson layer with identifier '{}'. Problem reading "
-            "GeoJson file '{}'. Error: '{}'", identifier(), _geoJsonFile, e.what()
+            "GeoJson file '{}'. Error: '{}'", identifier(), _geoJsonFile.value(), e.what()
         ));
     }
 
@@ -649,7 +649,7 @@ void GeoJsonComponent::parseSingleFeature(const geos::io::GeoJSONFeature& featur
         // Null geometry => no geometries to add
         LWARNING(fmt::format(
             "Feature {} in GeoJson file '{}' is a null geometry and will not be loaded",
-            indexInFile, _geoJsonFile
+            indexInFile, _geoJsonFile.value()
         ));
         // @TODO (emmbr26) We should eventually support features with null geometry
     }
@@ -702,7 +702,7 @@ void GeoJsonComponent::parseSingleFeature(const geos::io::GeoJSONFeature& featur
             LERROR(fmt::format(
                 "Error creating GeoJson layer with identifier '{}'. Problem reading "
                 "feature {} in GeoJson file '{}'.",
-                identifier(), indexInFile, _geoJsonFile
+                identifier(), indexInFile, _geoJsonFile.value()
             ));
             LERRORC(error.component, error.message);
             // Do nothing
diff --git a/modules/kameleonvolume/rendering/renderablekameleonvolume.cpp b/modules/kameleonvolume/rendering/renderablekameleonvolume.cpp
index a4a45dd2f4..7a77315239 100644
--- a/modules/kameleonvolume/rendering/renderablekameleonvolume.cpp
+++ b/modules/kameleonvolume/rendering/renderablekameleonvolume.cpp
@@ -361,7 +361,7 @@ void RenderableKameleonVolume::load() {
 
 std::string RenderableKameleonVolume::cacheSuffix() const {
     glm::uvec3 dims = _dimensions;
-    return fmt::format(".{}.{}x{}x{}", _variable, dims[0], dims[1], dims[2]);
+    return fmt::format(".{}.{}x{}x{}", _variable.value(), dims[0], dims[1], dims[2]);
 }
 
 void RenderableKameleonVolume::loadFromPath(const std::string& path) {
diff --git a/modules/space/horizonsfile.cpp b/modules/space/horizonsfile.cpp
index 6e4bb00c0f..83ceae3953 100644
--- a/modules/space/horizonsfile.cpp
+++ b/modules/space/horizonsfile.cpp
@@ -163,7 +163,9 @@ HorizonsResultCode isValidHorizonsAnswer(const json& answer) {
     if (auto signature = answer.find("signature");  signature != answer.end()) {
         if (auto source = signature->find("source");  source != signature->end()) {
             if (*source != static_cast<std::string>(ApiSource)) {
-                LWARNING(fmt::format("Horizons answer from unkown source '{}'", *source));
+                LWARNING(fmt::format(
+                    "Horizons answer from unknown source '{}'", source->dump()
+                ));
             }
         }
         else {
@@ -178,7 +180,7 @@ HorizonsResultCode isValidHorizonsAnswer(const json& answer) {
             if (v != CurrentMajorVersion) {
                 LWARNING(fmt::format(
                     "Unknown Horizons major version '{}' found. The currently supported "
-                    "major version is {}", *version, CurrentMajorVersion
+                    "major version is {}", version->dump(), CurrentMajorVersion
                 ));
             }
         }
diff --git a/modules/space/rendering/renderableorbitalkepler.cpp b/modules/space/rendering/renderableorbitalkepler.cpp
index 722801c5eb..0b5174457c 100644
--- a/modules/space/rendering/renderableorbitalkepler.cpp
+++ b/modules/space/rendering/renderableorbitalkepler.cpp
@@ -313,7 +313,7 @@ void RenderableOrbitalKepler::updateBuffers() {
 
     if (_startRenderIdx >= _numObjects) {
         throw ghoul::RuntimeError(fmt::format(
-            "Start index {} out of range [0, {}]", _startRenderIdx, _numObjects
+            "Start index {} out of range [0, {}]", _startRenderIdx.value(), _numObjects
         ));
     }
 
diff --git a/modules/space/rendering/renderablestars.cpp b/modules/space/rendering/renderablestars.cpp
index 87d8ca7d6b..9309473b57 100644
--- a/modules/space/rendering/renderablestars.cpp
+++ b/modules/space/rendering/renderablestars.cpp
@@ -662,7 +662,7 @@ RenderableStars::RenderableStars(const ghoul::Dictionary& dictionary)
             _colorTextureIsDirty = true;
         }
         else {
-            LWARNING(fmt::format("File not found: {}", _colorTexturePath));
+            LWARNING(fmt::format("File not found: {}", _colorTexturePath.value()));
         }
     });
     _colorTextureFile->setCallback([this]() { _colorTextureIsDirty = true; });
@@ -682,7 +682,7 @@ RenderableStars::RenderableStars(const ghoul::Dictionary& dictionary)
             _otherDataColorMapIsDirty = true;
         }
         else {
-            LWARNING(fmt::format("File not found: {}", _otherDataColorMapPath));
+            LWARNING(fmt::format("File not found: {}", _otherDataColorMapPath.value()));
         }
     });
 
diff --git a/modules/video/src/videoplayer.cpp b/modules/video/src/videoplayer.cpp
index 3b69a3f744..ca44dc492c 100644
--- a/modules/video/src/videoplayer.cpp
+++ b/modules/video/src/videoplayer.cpp
@@ -564,7 +564,8 @@ void VideoPlayer::handleMpvEvents() {
         }
         if (!checkMpvError(event->error)) {
             LWARNING(fmt::format(
-                "Error at mpv event : {} {}", event->event_id, event->reply_userdata
+                "Error at mpv event: {} {}",
+                static_cast<int>(event->event_id), event->reply_userdata
             ));
             break;
         }
diff --git a/modules/vislab/rendering/renderabledistancelabel.cpp b/modules/vislab/rendering/renderabledistancelabel.cpp
index 80c2fa3aac..76a04775b4 100644
--- a/modules/vislab/rendering/renderabledistancelabel.cpp
+++ b/modules/vislab/rendering/renderabledistancelabel.cpp
@@ -155,7 +155,9 @@ void RenderableDistanceLabel::update(const UpdateData&) {
         }
     }
     else {
-        LERROR(fmt::format("There is no scenegraph node with id {}", _nodelineId));
+        LERROR(fmt::format(
+            "There is no scenegraph node with id {}", _nodelineId.value()
+        ));
         _errorThrown = true;
     }
 }
diff --git a/src/navigation/pathnavigator.cpp b/src/navigation/pathnavigator.cpp
index 838df0eebb..a937ec4af5 100644
--- a/src/navigation/pathnavigator.cpp
+++ b/src/navigation/pathnavigator.cpp
@@ -414,7 +414,7 @@ double PathNavigator::findValidBoundingSphere(const SceneGraphNode* node) const
         LDEBUG(fmt::format(
             "The scene graph node '{}' has no, or a very small, bounding sphere. Using "
             "minimal value of {}. This might lead to unexpected results",
-            node->identifier(), _minValidBoundingSphere
+            node->identifier(), _minValidBoundingSphere.value()
         ));
         result = _minValidBoundingSphere;
     }
diff --git a/src/scene/assetmanager.cpp b/src/scene/assetmanager.cpp
index 4181214ee7..f29e23fb14 100644
--- a/src/scene/assetmanager.cpp
+++ b/src/scene/assetmanager.cpp
@@ -826,8 +826,8 @@ Asset* AssetManager::retrieveAsset(const std::filesystem::path& path,
                     "Loading asset {0} from {1} with enable state {3} different from "
                     "initial loading from {2} with state {4}. Only {4} will have an "
                     "effect",
-                    path, retriever, a->firstParent()->path(), explicitEnable,
-                    a->explicitEnabled()
+                    path, retriever, a->firstParent()->path(),
+                    explicitEnable.value_or(true), a->explicitEnabled().value_or(true)
                 ));
             }
             else {

From 8c0c90dcf84697817240e489e185018c74838ac7 Mon Sep 17 00:00:00 2001
From: Malin E <malin.ejdbo@gmail.com>
Date: Wed, 13 Sep 2023 14:04:49 +0200
Subject: [PATCH 134/701] Update touchbar remote scripting, fixes #2884

---
 src/interaction/touchbar.mm | 16 +++++++++++-----
 1 file changed, 11 insertions(+), 5 deletions(-)

diff --git a/src/interaction/touchbar.mm b/src/interaction/touchbar.mm
index 6f8bbbf1c4..fe59e2ed5d 100644
--- a/src/interaction/touchbar.mm
+++ b/src/interaction/touchbar.mm
@@ -172,9 +172,12 @@ NSArray* focusIdentifiers;
     }
 
     - (void)pauseResumeButtonAction:(id)sender {
+        // No sync or send because time settings are always synced and sent
+        // to the connected nodes and peers
         global::scriptEngine->queueScript(
             "openspace.time.togglePause();",
-            scripting::ScriptEngine::RemoteScripting::Yes
+            scripting::ScriptEngine::ShouldBeSynchronized::No,
+            scripting::ScriptEngine::ShouldSendToRemote::No
         );
 
         NSButton* button = static_cast<NSButton*>(sender);
@@ -197,7 +200,8 @@ NSArray* focusIdentifiers;
         );
         global::scriptEngine->queueScript(
             str,
-            scripting::ScriptEngine::RemoteScripting::Yes
+            scripting::ScriptEngine::ShouldBeSynchronized::Yes,
+            scripting::ScriptEngine::ShouldSendToRemote::Yes
         );
     }
 
@@ -211,7 +215,8 @@ NSArray* focusIdentifiers;
              openspace.setPropertyValueSingle('RenderEngine.ShowLog', not isEnabled);\
              openspace.setPropertyValueSingle('RenderEngine.ShowVersion', not isEnabled);\
              openspace.setPropertyValueSingle('RenderEngine.ShowCamera', not isEnabled)",
-            scripting::ScriptEngine::RemoteScripting::No
+            scripting::ScriptEngine::ShouldBeSynchronized::No,
+            scripting::ScriptEngine::ShouldSendToRemote::No
         );
     }
 
@@ -220,8 +225,9 @@ NSArray* focusIdentifiers;
         (void)sender;
         global::scriptEngine->queueScript(
             "local isEnabled = openspace.propertyValue('Modules.CefWebGui.Visible');\
-            openspace.setPropertyValueSingle('Modules.CefWebGui.Visible', not isEnabled);",
-            scripting::ScriptEngine::RemoteScripting::No
+             openspace.setPropertyValueSingle('Modules.CefWebGui.Visible', not isEnabled);",
+            scripting::ScriptEngine::ShouldBeSynchronized::No,
+            scripting::ScriptEngine::ShouldSendToRemote::No
         );
     }
 @end

From 4aac713185d4f9005fe7480014c1cd02786ec57c Mon Sep 17 00:00:00 2001
From: Alexander Bock <mail@alexanderbock.eu>
Date: Fri, 15 Sep 2023 20:45:25 +0200
Subject: [PATCH 135/701] Make the eclipse profile start at 'yesterday'

---
 data/profiles/eclipse.profile | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/data/profiles/eclipse.profile b/data/profiles/eclipse.profile
index 2e3193ea3e..4efef08434 100644
--- a/data/profiles/eclipse.profile
+++ b/data/profiles/eclipse.profile
@@ -64,8 +64,8 @@
     }
   ],
   "time": {
-    "type": "absolute",
-    "value": "2023 Oct 14 18:00:41"
+    "type": "relative",
+    "value": "-1d"
   },
   "version": {
     "major": 1,

From 36ee6840b55485ba9fa1cea5652ef1b9bc861cde Mon Sep 17 00:00:00 2001
From: Garrett Summerfield <garrettsummerfi3ld@gmail.com>
Date: Thu, 21 Sep 2023 06:01:43 -0500
Subject: [PATCH 136/701] Bump CCfits to 2.6 (fixes #2891)

Updated CCfits submodule.
---
 modules/fitsfilereader/ext/CCfits | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/fitsfilereader/ext/CCfits b/modules/fitsfilereader/ext/CCfits
index 3c16ca3f1e..15e78f599d 160000
--- a/modules/fitsfilereader/ext/CCfits
+++ b/modules/fitsfilereader/ext/CCfits
@@ -1 +1 @@
-Subproject commit 3c16ca3f1e9a405be7fdbd0db363151eca96629f
+Subproject commit 15e78f599dcf619a573cc011e32b2635be9bf3dc

From ce789fcd2270d0623ab41b19f1371c50155187f9 Mon Sep 17 00:00:00 2001
From: Malin E <malin.ejdbo@gmail.com>
Date: Thu, 21 Sep 2023 14:22:36 +0200
Subject: [PATCH 137/701] Feature/matrix maintenance (#2875)

* Split RenderableSphere class into a local and an online sphere

* Make the video sphere derive from the regular sphere

* Make RenderableTimeVaryingSphere derive from RenderableSphere

* Some clean up

* Add general functions for renderable matrix calculations

* Make RenderableSphere and Plane use them

* Fix an issue with the RenderablePlane shader

* Make one function that returns all three types of render matrices

* Make more Renderables use the general matric calculation function

* Make more Renderable use the general matrix function

* Simplify alternative transforms for matrix calculations

* Small clean-up

* Update RenderableModel (again) to use new transform functions

* Make calc all matrix function to return tuple

* Update some more places
---
 include/openspace/rendering/renderable.h      | 66 ++++++++++++++++++-
 .../rendering/grids/renderableboxgrid.cpp     | 15 ++---
 .../base/rendering/grids/renderablegrid.cpp   |  9 +--
 .../rendering/grids/renderableradialgrid.cpp  | 16 ++---
 .../grids/renderablesphericalgrid.cpp         | 16 ++---
 .../rendering/renderablecartesianaxes.cpp     |  8 +--
 modules/base/rendering/renderabledisc.cpp     | 10 +--
 modules/base/rendering/renderablelabel.cpp    |  8 +--
 modules/base/rendering/renderablemodel.cpp    | 12 ++--
 modules/base/rendering/renderablenodeline.cpp | 10 +--
 modules/base/rendering/renderableplane.cpp    | 36 +++++-----
 modules/base/rendering/renderableplane.h      |  6 +-
 modules/base/rendering/renderableprism.cpp    | 15 ++---
 modules/base/rendering/renderablesphere.cpp   | 17 ++---
 modules/base/rendering/renderabletrail.cpp    |  8 +--
 modules/base/shaders/plane_fs.glsl            | 13 ++--
 modules/base/shaders/plane_vs.glsl            |  4 +-
 .../rendering/renderablebillboardscloud.cpp   | 12 +---
 .../rendering/renderableplanescloud.cpp       | 30 ++++-----
 .../rendering/renderableplanescloud.h         |  4 +-
 .../rendering/renderablepoints.cpp            |  3 +-
 .../rendering/renderableorbitdisc.cpp         |  9 +--
 .../gaia/rendering/renderablegaiastars.cpp    |  6 +-
 modules/galaxy/rendering/renderablegalaxy.cpp | 30 ++++-----
 .../skybrowser/src/renderableskytarget.cpp    | 16 ++---
 .../renderableconstellationbounds.cpp         |  6 +-
 .../renderableconstellationlines.cpp          | 11 +---
 .../renderableconstellationsbase.cpp          | 15 ++---
 .../space/rendering/renderableeclipsecone.cpp |  9 +--
 .../space/rendering/renderablefluxnodes.cpp   | 19 +++---
 .../rendering/renderablehabitablezone.cpp     |  9 +--
 .../rendering/renderableorbitalkepler.cpp     | 10 +--
 modules/space/rendering/renderablerings.cpp   |  9 +--
 modules/space/rendering/renderablestars.cpp   |  5 +-
 .../space/rendering/renderabletravelspeed.cpp | 13 ++--
 .../rendering/renderablecrawlingline.cpp      |  8 +--
 .../rendering/renderablefov.cpp               |  8 +--
 .../rendering/renderablemodelprojection.cpp   | 10 ++-
 .../rendering/renderableplaneprojection.cpp   | 10 ++-
 .../rendering/renderableplanetprojection.cpp  | 11 +---
 .../rendering/renderableshadowcylinder.cpp    |  8 +--
 src/rendering/renderable.cpp                  | 47 +++++++++++++
 42 files changed, 270 insertions(+), 317 deletions(-)

diff --git a/include/openspace/rendering/renderable.h b/include/openspace/rendering/renderable.h
index 38f94f62a3..71bd6f3c2e 100644
--- a/include/openspace/rendering/renderable.h
+++ b/include/openspace/rendering/renderable.h
@@ -141,8 +141,72 @@ protected:
     // An optional renderbin that renderables can use for certain components, in cases
     // where all parts of the renderable should not be rendered in the same bin
     std::optional<RenderBin> _secondaryRenderBin;
-private:
 
+    struct AlternativeTransform {
+        std::optional<glm::dvec3> translation = std::nullopt;
+        std::optional<glm::dmat3> rotation = std::nullopt;
+        std::optional<glm::dvec3> scale = std::nullopt;
+    };
+
+    /**
+     * Calculates the model transformation matrix with the given data and returns it
+     *
+     * \param data the RenderData for the object that the model transformation matrix
+     *        should be calculated for
+     * \param altTransform an object containing alternative transformations to use instead
+     *        of those given in data. The transforms can be translation, rotation and
+     *        scale.
+     *
+     * \return the resulting model transformation matrix in double precision
+     */
+    glm::dmat4 calcModelTransform(const RenderData& data,
+        const AlternativeTransform& altTransform = {}) const;
+
+    /**
+     * Calculates the model view transformation matrix with the given data and returns it
+     *
+     * \param data the RenderData for the object that the model view transformation matrix
+     *        should be calculated for
+     * \param modelTransform an alternative model transformation matrix to use. If not
+     *        provided the function will calculate a new one.
+     *
+     * \return the resulting model view transformation matrix in double precision
+     */
+    glm::dmat4 calcModelViewTransform(const RenderData& data,
+        std::optional<glm::dmat4> modelTransform = std::nullopt) const;
+
+    /**
+     * Calculates the model view projection transformation matrix with the given data and
+     * returns it
+     *
+     * \param data the RenderData for the object that the model view projection
+     *        transformation matrix should be calculated for
+     * \param modelTransform an alternative model transformation matrix to use. If not
+     *        provided the function will calculate a new one.
+     *
+     * \return the resulting model view projection transformation matrix in double
+     *         precision
+     */
+    glm::dmat4 calcModelViewProjectionTransform(const RenderData& data,
+        std::optional<glm::dmat4> modelTransform = std::nullopt) const;
+
+    /**
+     * Calculates the model, model view, and the model view projection transformation
+     * matricies with the given data and returns them in a tuple object
+     *
+     * \param data the RenderData for the object that the transforms should be
+     *        calculated for
+     * \param altModelTransform an object containing alternative transformations to use
+     *        instead of those given in data. The transforms can be translation, rotation
+     *        and scale.
+     *
+     * \return a tuple object containing the resulting model, model view, and the
+     *         model view projection transformation matrices
+     */
+    std::tuple<glm::dmat4, glm::dmat4, glm::dmat4> calcAllTransforms(
+        const RenderData& data, const AlternativeTransform& altModelTransform = {}) const;
+
+private:
     double _boundingSphere = 0.0;
     double _interactionSphere = 0.0;
     SceneGraphNode* _parent = nullptr;
diff --git a/modules/base/rendering/grids/renderableboxgrid.cpp b/modules/base/rendering/grids/renderableboxgrid.cpp
index 2a54b6d064..7af3822024 100644
--- a/modules/base/rendering/grids/renderableboxgrid.cpp
+++ b/modules/base/rendering/grids/renderableboxgrid.cpp
@@ -168,18 +168,11 @@ void RenderableBoxGrid::deinitializeGL() {
 void RenderableBoxGrid::render(const RenderData& data, RendererTasks&){
     _gridProgram->activate();
 
-    glm::dmat4 modelTransform =
-        glm::translate(glm::dmat4(1.0), data.modelTransform.translation) * // Translation
-        glm::dmat4(data.modelTransform.rotation) *  // Spice rotation
-        glm::scale(glm::dmat4(1.0), glm::dvec3(data.modelTransform.scale));
-
-    glm::dmat4 modelViewTransform = data.camera.combinedViewMatrix() * modelTransform;
-    const glm::dmat4 projectionMatrix = data.camera.projectionMatrix();
-
-    const glm::dmat4 modelViewProjectionMatrix = projectionMatrix * modelViewTransform;
+    auto [modelTransform, modelViewTransform, modelViewProjectionTransform] =
+        calcAllTransforms(data);
 
     _gridProgram->setUniform("modelViewTransform", modelViewTransform);
-    _gridProgram->setUniform("MVPTransform", modelViewProjectionMatrix);
+    _gridProgram->setUniform("MVPTransform", modelViewProjectionTransform);
     _gridProgram->setUniform("opacity", opacity());
     _gridProgram->setUniform("gridColor", _color);
 
@@ -227,7 +220,7 @@ void RenderableBoxGrid::render(const RenderData& data, RendererTasks&){
         const glm::vec3 orthoUp = glm::normalize(
             glm::vec3(worldToModelTransform * glm::dvec4(up, 0.0))
         );
-        _labels->render(data, modelViewProjectionMatrix, orthoRight, orthoUp);
+        _labels->render(data, modelViewProjectionTransform, orthoRight, orthoUp);
     }
 }
 
diff --git a/modules/base/rendering/grids/renderablegrid.cpp b/modules/base/rendering/grids/renderablegrid.cpp
index a855a2b441..ceddd1bd0f 100644
--- a/modules/base/rendering/grids/renderablegrid.cpp
+++ b/modules/base/rendering/grids/renderablegrid.cpp
@@ -245,12 +245,9 @@ void RenderableGrid::deinitializeGL() {
 void RenderableGrid::render(const RenderData& data, RendererTasks&){
     _gridProgram->activate();
 
-    const glm::dmat4 modelMatrix =
-        glm::translate(glm::dmat4(1.0), data.modelTransform.translation) * // Translation
-        glm::dmat4(data.modelTransform.rotation) *  // Spice rotation
-        glm::scale(glm::dmat4(1.0), glm::dvec3(data.modelTransform.scale));
+    const glm::dmat4 modelTransform = calcModelTransform(data);
+    const glm::dmat4 modelViewTransform = calcModelViewTransform(data, modelTransform);
 
-    const glm::dmat4 modelViewTransform = data.camera.combinedViewMatrix() * modelMatrix;
     const glm::dmat4 projectionMatrix = data.camera.projectionMatrix();
 
     const glm::dmat4 modelViewProjectionMatrix = projectionMatrix * modelViewTransform;
@@ -260,7 +257,7 @@ void RenderableGrid::render(const RenderData& data, RendererTasks&){
     glm::vec3 right = glm::cross(viewDirection, lookup);
     const glm::vec3 up = glm::cross(right, viewDirection);
 
-    const glm::dmat4 worldToModelTransform = glm::inverse(modelMatrix);
+    const glm::mat4 worldToModelTransform = glm::inverse(modelTransform);
     glm::vec3 orthoRight = glm::normalize(
         glm::vec3(worldToModelTransform * glm::vec4(right, 0.0))
     );
diff --git a/modules/base/rendering/grids/renderableradialgrid.cpp b/modules/base/rendering/grids/renderableradialgrid.cpp
index fa1f2c4d5e..4f528fd15b 100644
--- a/modules/base/rendering/grids/renderableradialgrid.cpp
+++ b/modules/base/rendering/grids/renderableradialgrid.cpp
@@ -199,19 +199,11 @@ void RenderableRadialGrid::deinitializeGL() {
 void RenderableRadialGrid::render(const RenderData& data, RendererTasks&) {
     _gridProgram->activate();
 
-    const glm::dmat4 modelTransform =
-        glm::translate(glm::dmat4(1.0), data.modelTransform.translation) * // Translation
-        glm::dmat4(data.modelTransform.rotation) *  // Spice rotation
-        glm::scale(glm::dmat4(1.0), glm::dvec3(data.modelTransform.scale));
-
-    const glm::dmat4 modelViewTransform =
-        data.camera.combinedViewMatrix() * modelTransform;
-    const glm::dmat4 projectionMatrix = data.camera.projectionMatrix();
-
-    const glm::dmat4 modelViewProjectionMatrix = projectionMatrix * modelViewTransform;
+    auto [modelTransform, modelViewTransform, modelViewProjectionTransform] =
+        calcAllTransforms(data);
 
     _gridProgram->setUniform("modelViewTransform", modelViewTransform);
-    _gridProgram->setUniform("MVPTransform", modelViewProjectionMatrix);
+    _gridProgram->setUniform("MVPTransform", modelViewProjectionTransform);
     _gridProgram->setUniform("opacity", opacity());
     _gridProgram->setUniform("gridColor", _color);
 
@@ -261,7 +253,7 @@ void RenderableRadialGrid::render(const RenderData& data, RendererTasks&) {
         const glm::vec3 orthoUp = glm::normalize(
             glm::vec3(worldToModelTransform * glm::dvec4(up, 0.0))
         );
-        _labels->render(data, modelViewProjectionMatrix, orthoRight, orthoUp);
+        _labels->render(data, modelViewProjectionTransform, orthoRight, orthoUp);
     }
 }
 
diff --git a/modules/base/rendering/grids/renderablesphericalgrid.cpp b/modules/base/rendering/grids/renderablesphericalgrid.cpp
index bc261d6078..b196d5d460 100644
--- a/modules/base/rendering/grids/renderablesphericalgrid.cpp
+++ b/modules/base/rendering/grids/renderablesphericalgrid.cpp
@@ -185,19 +185,11 @@ void RenderableSphericalGrid::deinitializeGL() {
 void RenderableSphericalGrid::render(const RenderData& data, RendererTasks&){
     _gridProgram->activate();
 
-    const glm::dmat4 modelTransform =
-        glm::translate(glm::dmat4(1.0), data.modelTransform.translation) * // Translation
-        glm::dmat4(data.modelTransform.rotation) *  // Spice rotation
-        glm::scale(glm::dmat4(1.0), glm::dvec3(data.modelTransform.scale));
-
-    const glm::dmat4 modelViewTransform =
-        data.camera.combinedViewMatrix() * modelTransform;
-    const glm::dmat4 projectionMatrix = data.camera.projectionMatrix();
-
-    const glm::dmat4 modelViewProjectionMatrix = projectionMatrix * modelViewTransform;
+    auto [modelTransform, modelViewTransform, modelViewProjectionTransform] =
+        calcAllTransforms(data);
 
     _gridProgram->setUniform("modelViewTransform", modelViewTransform);
-    _gridProgram->setUniform("MVPTransform", modelViewProjectionMatrix);
+    _gridProgram->setUniform("MVPTransform", modelViewProjectionTransform);
     _gridProgram->setUniform("opacity", opacity());
     _gridProgram->setUniform("gridColor", _color);
 
@@ -246,7 +238,7 @@ void RenderableSphericalGrid::render(const RenderData& data, RendererTasks&){
         const glm::vec3 orthoUp = glm::normalize(
             glm::vec3(worldToModelTransform * glm::dvec4(up, 0.0))
         );
-        _labels->render(data, modelViewProjectionMatrix, orthoRight, orthoUp);
+        _labels->render(data, modelViewProjectionTransform, orthoRight, orthoUp);
     }
 }
 
diff --git a/modules/base/rendering/renderablecartesianaxes.cpp b/modules/base/rendering/renderablecartesianaxes.cpp
index e93e18d107..841a6b032e 100644
--- a/modules/base/rendering/renderablecartesianaxes.cpp
+++ b/modules/base/rendering/renderablecartesianaxes.cpp
@@ -181,13 +181,7 @@ void RenderableCartesianAxes::deinitializeGL() {
 void RenderableCartesianAxes::render(const RenderData& data, RendererTasks&){
     _program->activate();
 
-    const glm::dmat4 modelTransform =
-        glm::translate(glm::dmat4(1.0), data.modelTransform.translation) *
-        glm::dmat4(data.modelTransform.rotation) *
-        glm::scale(glm::dmat4(1.0), glm::dvec3(data.modelTransform.scale));
-
-    const glm::dmat4 modelViewTransform = data.camera.combinedViewMatrix() *
-                                          modelTransform;
+    const glm::dmat4 modelViewTransform = calcModelViewTransform(data);
 
     _program->setUniform("modelViewTransform", glm::mat4(modelViewTransform));
     _program->setUniform("projectionTransform", data.camera.projectionMatrix());
diff --git a/modules/base/rendering/renderabledisc.cpp b/modules/base/rendering/renderabledisc.cpp
index f09ae1dbfd..2cb9431ab8 100644
--- a/modules/base/rendering/renderabledisc.cpp
+++ b/modules/base/rendering/renderabledisc.cpp
@@ -148,16 +148,12 @@ void RenderableDisc::deinitializeGL() {
 void RenderableDisc::render(const RenderData& data, RendererTasks&) {
     _shader->activate();
 
-    glm::dmat4 modelTransform =
-        glm::translate(glm::dmat4(1.0), data.modelTransform.translation) *
-        glm::dmat4(data.modelTransform.rotation) *
-        glm::scale(glm::dmat4(1.0), glm::dvec3(data.modelTransform.scale));
-
-    glm::dmat4 modelViewTransform = data.camera.combinedViewMatrix() * modelTransform;
+    const glm::dmat4 modelViewProjectionTransform =
+        calcModelViewProjectionTransform(data);
 
     _shader->setUniform(
         _uniformCache.modelViewProjection,
-        data.camera.projectionMatrix() * glm::mat4(modelViewTransform)
+        glm::mat4(modelViewProjectionTransform)
     );
     _shader->setUniform(_uniformCache.width, _width);
     _shader->setUniform(_uniformCache.opacity, opacity());
diff --git a/modules/base/rendering/renderablelabel.cpp b/modules/base/rendering/renderablelabel.cpp
index f11f5bd89f..54e1bbba80 100644
--- a/modules/base/rendering/renderablelabel.cpp
+++ b/modules/base/rendering/renderablelabel.cpp
@@ -412,10 +412,8 @@ void RenderableLabel::render(const RenderData& data, RendererTasks&) {
     }
 
     glm::dmat4 modelMatrix(1.0);
-    glm::dmat4 modelViewMatrix = data.camera.combinedViewMatrix() * modelMatrix;
-    glm::dmat4 projectionMatrix = glm::dmat4(data.camera.projectionMatrix());
-
-    glm::dmat4 modelViewProjectionMatrix = projectionMatrix * modelViewMatrix;
+    const glm::dmat4 modelViewProjectionTransform =
+        calcModelViewProjectionTransform(data, modelMatrix);
 
     glm::dvec3 cameraViewDirectionWorld = -data.camera.viewDirectionWorldSpace();
     glm::dvec3 cameraUpDirectionWorld = data.camera.lookUpVectorWorldSpace();
@@ -432,7 +430,7 @@ void RenderableLabel::render(const RenderData& data, RendererTasks&) {
     }
     glm::dvec3 orthoUp = glm::normalize(glm::cross(cameraViewDirectionWorld, orthoRight));
 
-    renderLabels(data, modelViewProjectionMatrix, orthoRight, orthoUp, fadeInVariable);
+    renderLabels(data, modelViewProjectionTransform, orthoRight, orthoUp, fadeInVariable);
 
     global::renderEngine->openglStateCache().resetBlendState();
     global::renderEngine->openglStateCache().resetDepthState();
diff --git a/modules/base/rendering/renderablemodel.cpp b/modules/base/rendering/renderablemodel.cpp
index 5b7f5db8aa..e9d9d0d1a9 100644
--- a/modules/base/rendering/renderablemodel.cpp
+++ b/modules/base/rendering/renderablemodel.cpp
@@ -790,14 +790,10 @@ void RenderableModel::render(const RenderData& data, RendererTasks&) {
     _program->activate();
 
     // Model transform and view transform needs to be in double precision
-    const glm::dmat4 modelTransform =
-        glm::translate(glm::dmat4(1.0), glm::dvec3(_pivot.value())) *
-        glm::translate(glm::dmat4(1.0), data.modelTransform.translation) *
-        glm::dmat4(data.modelTransform.rotation) *
-        glm::scale(glm::dmat4(1.0), glm::dvec3(data.modelTransform.scale)) *
-        glm::scale(_modelTransform.value(), glm::dvec3(_modelScale));
-    const glm::dmat4 modelViewTransform = data.camera.combinedViewMatrix() *
-        modelTransform;
+    glm::dmat4 modelTransform = calcModelTransform(data);
+    modelTransform = glm::translate(modelTransform, glm::dvec3(_pivot.value()));
+    modelTransform *= glm::scale(_modelTransform.value(), glm::dvec3(_modelScale));
+    const glm::dmat4 modelViewTransform = calcModelViewTransform(data, modelTransform);
 
     int nLightSources = 0;
     _lightIntensitiesBuffer.resize(_lightSources.size());
diff --git a/modules/base/rendering/renderablenodeline.cpp b/modules/base/rendering/renderablenodeline.cpp
index a4b922c3f4..b15644c5fa 100644
--- a/modules/base/rendering/renderablenodeline.cpp
+++ b/modules/base/rendering/renderablenodeline.cpp
@@ -386,13 +386,9 @@ void RenderableNodeLine::render(const RenderData& data, RendererTasks&) {
         );
     }
 
-    const glm::dmat4 modelTransform =
-        glm::translate(glm::dmat4(1.0), data.modelTransform.translation) *
-        glm::dmat4(data.modelTransform.rotation) *
-        glm::scale(glm::dmat4(1.0), glm::dvec3(data.modelTransform.scale));
-
-    const glm::dmat4 modelViewTransform = data.camera.combinedViewMatrix() *
-        modelTransform * anchorTranslation;
+    const glm::dmat4 modelTransform = calcModelTransform(data);
+    const glm::dmat4 modelViewTransform =
+        calcModelViewTransform(data, modelTransform) * anchorTranslation;
 
     _program->setUniform("modelViewTransform", glm::mat4(modelViewTransform));
     _program->setUniform("projectionTransform", data.camera.projectionMatrix());
diff --git a/modules/base/rendering/renderableplane.cpp b/modules/base/rendering/renderableplane.cpp
index 31de178d52..37e688e08f 100644
--- a/modules/base/rendering/renderableplane.cpp
+++ b/modules/base/rendering/renderableplane.cpp
@@ -29,14 +29,11 @@
 #include <openspace/documentation/verifier.h>
 #include <openspace/engine/globals.h>
 #include <openspace/rendering/renderengine.h>
-#include <openspace/scene/scenegraphnode.h>
 #include <openspace/util/updatestructures.h>
 #include <ghoul/filesystem/filesystem.h>
-#include <ghoul/io/texture/texturereader.h>
 #include <ghoul/misc/defer.h>
 #include <ghoul/misc/profiling.h>
 #include <ghoul/opengl/programobject.h>
-#include <ghoul/opengl/texture.h>
 #include <ghoul/opengl/textureunit.h>
 #include <ghoul/glm.h>
 #include <glm/gtx/string_cast.hpp>
@@ -44,6 +41,11 @@
 #include <variant>
 
 namespace {
+    constexpr std::array<const char*, 6> UniformNames = {
+        "modelViewProjection", "modelViewTransform", "colorTexture", "opacity",
+        "mirrorBackside", "multiplyColor"
+    };
+
     enum BlendMode {
         Normal = 0,
         Additive
@@ -213,6 +215,8 @@ void RenderablePlane::initializeGL() {
             );
         }
     );
+
+    ghoul::opengl::updateUniformLocations(*_shader, _uniformCache, UniformNames);
 }
 
 void RenderablePlane::deinitializeGL() {
@@ -237,9 +241,9 @@ void RenderablePlane::render(const RenderData& data, RendererTasks&) {
     ZoneScoped;
 
     _shader->activate();
-    _shader->setUniform("opacity", opacity());
+    _shader->setUniform(_uniformCache.opacity, opacity());
 
-    _shader->setUniform("mirrorBackside", _mirrorBackside);
+    _shader->setUniform(_uniformCache.mirrorBackside, _mirrorBackside);
 
     glm::dvec3 objectPositionWorld = glm::dvec3(
         glm::translate(
@@ -262,26 +266,23 @@ void RenderablePlane::render(const RenderData& data, RendererTasks&) {
         cameraOrientedRotation :
         glm::dmat4(data.modelTransform.rotation);
 
-    const glm::dmat4 modelTransform =
-        glm::translate(glm::dmat4(1.0), data.modelTransform.translation) *
-        rotationTransform *
-        glm::scale(glm::dmat4(1.0), glm::dvec3(data.modelTransform.scale));
-    const glm::dmat4 modelViewTransform =
-        data.camera.combinedViewMatrix() * modelTransform;
+    auto [modelTransform, modelViewTransform, modelViewProjectionTransform] =
+        calcAllTransforms(data, { .rotation = rotationTransform });
 
-    _shader->setUniform("modelViewProjectionTransform",
-        data.camera.projectionMatrix() * glm::mat4(modelViewTransform));
-
-    _shader->setUniform("modelViewTransform", glm::mat4(modelViewTransform));
+    _shader->setUniform(
+        _uniformCache.modelViewProjection,
+        glm::mat4(modelViewProjectionTransform)
+    );
+    _shader->setUniform(_uniformCache.modelViewTransform, glm::mat4(modelViewTransform));
 
     ghoul::opengl::TextureUnit unit;
     unit.activate();
     bindTexture();
     defer { unbindTexture(); };
 
-    _shader->setUniform("texture1", unit);
+    _shader->setUniform(_uniformCache.colorTexture, unit);
 
-    _shader->setUniform("multiplyColor", _multiplyColor);
+    _shader->setUniform(_uniformCache.multiplyColor, _multiplyColor);
 
     bool additiveBlending = (_blendMode == static_cast<int>(BlendMode::Additive));
     if (additiveBlending) {
@@ -311,6 +312,7 @@ void RenderablePlane::update(const UpdateData&) {
 
     if (_shader->isDirty()) {
         _shader->rebuildFromFile();
+        ghoul::opengl::updateUniformLocations(*_shader, _uniformCache, UniformNames);
     }
 
     if (_planeIsDirty) {
diff --git a/modules/base/rendering/renderableplane.h b/modules/base/rendering/renderableplane.h
index feb6c53782..d6bc9f9b53 100644
--- a/modules/base/rendering/renderableplane.h
+++ b/modules/base/rendering/renderableplane.h
@@ -28,11 +28,10 @@
 #include <openspace/rendering/renderable.h>
 
 #include <openspace/properties/optionproperty.h>
-#include <openspace/properties/stringproperty.h>
-#include <openspace/properties/scalar/boolproperty.h>
 #include <openspace/properties/vector/vec2property.h>
 #include <openspace/properties/vector/vec3property.h>
 #include <ghoul/opengl/ghoul_gl.h>
+#include <ghoul/opengl/uniformcache.h>
 
 namespace ghoul::filesystem { class File; }
 
@@ -83,6 +82,9 @@ protected:
 
 private:
     bool _planeIsDirty = false;
+
+    UniformCache(modelViewProjection, modelViewTransform, colorTexture, opacity,
+        mirrorBackside, multiplyColor) _uniformCache;
 };
 
 } // namespace openspace
diff --git a/modules/base/rendering/renderableprism.cpp b/modules/base/rendering/renderableprism.cpp
index 04fe0a22ad..b7d3936e14 100644
--- a/modules/base/rendering/renderableprism.cpp
+++ b/modules/base/rendering/renderableprism.cpp
@@ -328,17 +328,14 @@ void RenderablePrism::render(const RenderData& data, RendererTasks&) {
     _shader->activate();
 
     // Model transform and view transform needs to be in double precision
-    glm::dmat4 modelTransform =
-        glm::translate(glm::dmat4(1.0), data.modelTransform.translation) *
-        glm::dmat4(data.modelTransform.rotation) *
-        glm::scale(glm::dmat4(1.0), glm::dvec3(data.modelTransform.scale));
-
-    glm::mat4 modelViewProjectionTransform =
-        data.camera.projectionMatrix() *
-        glm::mat4(data.camera.combinedViewMatrix() * modelTransform);
+    const glm::dmat4 modelViewProjectionTransform =
+        calcModelViewProjectionTransform(data);
 
     // Uniforms
-    _shader->setUniform(_uniformCache.modelViewProjection, modelViewProjectionTransform);
+    _shader->setUniform(
+        _uniformCache.modelViewProjection,
+        glm::mat4(modelViewProjectionTransform)
+    );
     _shader->setUniform(_uniformCache.color, glm::vec4(_lineColor.value(), opacity()));
 
     // Render
diff --git a/modules/base/rendering/renderablesphere.cpp b/modules/base/rendering/renderablesphere.cpp
index c734654687..2cd9f54ff2 100644
--- a/modules/base/rendering/renderablesphere.cpp
+++ b/modules/base/rendering/renderablesphere.cpp
@@ -235,26 +235,17 @@ void RenderableSphere::deinitializeGL() {
 void RenderableSphere::render(const RenderData& data, RendererTasks&) {
     Orientation orientation = static_cast<Orientation>(_orientation.value());
 
-    glm::dmat4 modelTransform =
-        glm::translate(glm::dmat4(1.0), data.modelTransform.translation) *
-        glm::dmat4(data.modelTransform.rotation) *
-        glm::scale(glm::dmat4(1.0), glm::dvec3(data.modelTransform.scale));
-
-    glm::dmat3 modelRotation =
-        glm::dmat3(data.modelTransform.rotation);
-
     // Activate shader
     using IgnoreError = ghoul::opengl::ProgramObject::IgnoreError;
     _shader->activate();
     _shader->setIgnoreUniformLocationError(IgnoreError::Yes);
 
-    glm::mat4 modelViewProjection = data.camera.projectionMatrix() *
-                             glm::mat4(data.camera.combinedViewMatrix() * modelTransform);
-    _shader->setUniform(_uniformCache.modelViewProjection, modelViewProjection);
+    auto [modelTransform, modelViewTransform, modelViewProjectionTransform] =
+        calcAllTransforms(data);
+    glm::dmat3 modelRotation = glm::dmat3(data.modelTransform.rotation);
 
-    const glm::dmat4 modelViewTransform =
-        data.camera.combinedViewMatrix() * modelTransform;
     _shader->setUniform(_uniformCache.modelViewTransform, glm::mat4(modelViewTransform));
+    _shader->setUniform(_uniformCache.modelViewProjection, glm::mat4(modelViewProjectionTransform));
 
     glm::mat3 modelViewRotation = glm::mat3(
         glm::dmat3(data.camera.viewRotationMatrix()) * modelRotation
diff --git a/modules/base/rendering/renderabletrail.cpp b/modules/base/rendering/renderabletrail.cpp
index 31477e4be6..1f0d9f26ba 100644
--- a/modules/base/rendering/renderabletrail.cpp
+++ b/modules/base/rendering/renderabletrail.cpp
@@ -291,9 +291,10 @@ void RenderableTrail::internalRender(bool renderLines, bool renderPoints,
     // We pass in the model view transformation matrix as double in order to maintain
     // high precision for vertices; especially for the trails, a high vertex precision
     // is necessary as they are usually far away from their reference
+    glm::dmat4 modelViewTransform = calcModelViewTransform(data, modelTransform);
     _programObject->setUniform(
         _uniformCache.modelView,
-        data.camera.combinedViewMatrix() * modelTransform * info._localTransform
+        modelViewTransform * info._localTransform
     );
 
     const int sorting = [](RenderInformation::VertexSorting s) {
@@ -391,10 +392,7 @@ void RenderableTrail::render(const RenderData& data, RendererTasks&) {
     _programObject->activate();
     _programObject->setUniform(_uniformCache.opacity, opacity());
 
-    glm::dmat4 modelTransform =
-        glm::translate(glm::dmat4(1.0), data.modelTransform.translation) *
-        glm::dmat4(data.modelTransform.rotation) *
-        glm::scale(glm::dmat4(1.0), glm::dvec3(data.modelTransform.scale));
+    glm::dmat4 modelTransform = calcModelTransform(data);
 
     _programObject->setUniform(_uniformCache.projection, data.camera.projectionMatrix());
 
diff --git a/modules/base/shaders/plane_fs.glsl b/modules/base/shaders/plane_fs.glsl
index d3491cd260..11761fdb47 100644
--- a/modules/base/shaders/plane_fs.glsl
+++ b/modules/base/shaders/plane_fs.glsl
@@ -29,8 +29,7 @@ in vec3 vs_gNormal;
 in float vs_screenSpaceDepth;
 in vec2 vs_st;
 
-uniform sampler2D texture1;
-uniform bool additiveBlending;
+uniform sampler2D colorTexture;
 uniform float opacity = 1.0;
 uniform bool mirrorBackside = true;
 uniform vec3 multiplyColor;
@@ -39,14 +38,14 @@ uniform vec3 multiplyColor;
 Fragment getFragment() {
   Fragment frag;
   if (gl_FrontFacing) {
-    frag.color = texture(texture1, vs_st);
+    frag.color = texture(colorTexture, vs_st);
   }
   else {
     if (mirrorBackside) {
-      frag.color = texture(texture1, vec2(1.0 - vs_st.s, vs_st.t));
+      frag.color = texture(colorTexture, vec2(1.0 - vs_st.s, vs_st.t));
     }
     else {
-      frag.color = texture(texture1, vs_st);
+      frag.color = texture(colorTexture, vs_st);
     }
   }
 
@@ -59,10 +58,6 @@ Fragment getFragment() {
 
   frag.depth = vs_screenSpaceDepth;
 
-  if (additiveBlending) {
-    frag.blend = BLEND_MODE_ADDITIVE;
-  }
-
   // G-Buffer
   frag.gPosition = vs_gPosition;
   frag.gNormal = vec4(vs_gNormal, 1.0);
diff --git a/modules/base/shaders/plane_vs.glsl b/modules/base/shaders/plane_vs.glsl
index 83f9720ca7..e1e3bb1f73 100644
--- a/modules/base/shaders/plane_vs.glsl
+++ b/modules/base/shaders/plane_vs.glsl
@@ -34,13 +34,13 @@ out vec3 vs_gNormal;
 out float vs_screenSpaceDepth;
 out vec2 vs_st;
 
-uniform mat4 modelViewProjectionTransform;
+uniform mat4 modelViewProjection;
 uniform mat4 modelViewTransform;
 
 
 void main() {
   vec4 position = vec4(in_position.xyz * pow(10, in_position.w), 1);
-  vec4 positionClipSpace = modelViewProjectionTransform * position;
+  vec4 positionClipSpace = modelViewProjection * position;
   vec4 positionScreenSpace = z_normalization(positionClipSpace);
 
   gl_Position = positionScreenSpace;
diff --git a/modules/digitaluniverse/rendering/renderablebillboardscloud.cpp b/modules/digitaluniverse/rendering/renderablebillboardscloud.cpp
index 2414994f05..3f04668c98 100644
--- a/modules/digitaluniverse/rendering/renderablebillboardscloud.cpp
+++ b/modules/digitaluniverse/rendering/renderablebillboardscloud.cpp
@@ -702,15 +702,9 @@ void RenderableBillboardsCloud::render(const RenderData& data, RendererTasks&) {
         }
     }
 
-    glm::dmat4 modelMatrix =
-        glm::translate(glm::dmat4(1.0), data.modelTransform.translation) * // Translation
-        glm::dmat4(data.modelTransform.rotation) *  // Spice rotation
-        glm::scale(glm::dmat4(1.0), glm::dvec3(data.modelTransform.scale));
-
-    glm::dmat4 modelViewMatrix = data.camera.combinedViewMatrix() * modelMatrix;
-    glm::dmat4 projectionMatrix = glm::dmat4(data.camera.projectionMatrix());
-
-    glm::dmat4 modelViewProjectionMatrix = projectionMatrix * modelViewMatrix;
+    glm::dmat4 modelMatrix = calcModelTransform(data);
+    glm::dmat4 modelViewProjectionMatrix =
+        calcModelViewProjectionTransform(data, modelMatrix);
 
     glm::dvec3 cameraViewDirectionWorld = -data.camera.viewDirectionWorldSpace();
     glm::dvec3 cameraUpDirectionWorld = data.camera.lookUpVectorWorldSpace();
diff --git a/modules/digitaluniverse/rendering/renderableplanescloud.cpp b/modules/digitaluniverse/rendering/renderableplanescloud.cpp
index 060023baf9..c599f429fb 100644
--- a/modules/digitaluniverse/rendering/renderableplanescloud.cpp
+++ b/modules/digitaluniverse/rendering/renderableplanescloud.cpp
@@ -376,8 +376,8 @@ void RenderablePlanesCloud::deinitializeGL() {
 }
 
 void RenderablePlanesCloud::renderPlanes(const RenderData&,
-                                         const glm::dmat4& modelViewMatrix,
-                                         const glm::dmat4& projectionMatrix,
+                                         const glm::dmat4& modelViewTransform,
+                                         const glm::dmat4& projectionTransform,
                                          const float fadeInVariable)
 {
     glEnablei(GL_BLEND, 0);
@@ -387,10 +387,11 @@ void RenderablePlanesCloud::renderPlanes(const RenderData&,
 
     _program->activate();
 
-    glm::dmat4 modelViewProjectionMatrix = glm::dmat4(projectionMatrix) * modelViewMatrix;
+    glm::dmat4 modelViewProjectionTransform =
+        glm::dmat4(projectionTransform) * modelViewTransform;
     _program->setUniform(
         _uniformCache.modelViewProjectionTransform,
-        modelViewProjectionMatrix
+        modelViewProjectionTransform
     );
     _program->setUniform(_uniformCache.alphaValue, opacity());
     _program->setUniform(_uniformCache.fadeInValue, fadeInVariable);
@@ -448,24 +449,21 @@ void RenderablePlanesCloud::render(const RenderData& data, RendererTasks&) {
         }
     }
 
-    const glm::dmat4 modelMatrix =
-        glm::translate(glm::dmat4(1.0), data.modelTransform.translation) * // Translation
-        glm::dmat4(data.modelTransform.rotation) *  // Spice rotation
-        glm::scale(glm::dmat4(1.0), glm::dvec3(data.modelTransform.scale));
-
-    const glm::dmat4 modelViewMatrix = data.camera.combinedViewMatrix() * modelMatrix;
-    const glm::mat4 projectionMatrix = data.camera.projectionMatrix();
+    const glm::dmat4 modelTransform = calcModelTransform(data);
+    const glm::dmat4 modelViewTransform = calcModelViewTransform(data, modelTransform);
+    const glm::mat4 projectionTransform = data.camera.projectionMatrix();
 
     if (_hasSpeckFile) {
-        renderPlanes(data, modelViewMatrix, projectionMatrix, fadeInVariable);
+        renderPlanes(data, modelViewTransform, projectionTransform, fadeInVariable);
     }
 
     if (_hasLabels) {
-        const glm::dmat4 mvpMatrix = glm::dmat4(projectionMatrix) * modelViewMatrix;
+        const glm::dmat4 modelViewProjectionTransform =
+            glm::dmat4(projectionTransform) * modelViewTransform;
 
-        const glm::dmat4 invMVPParts = glm::inverse(modelMatrix) *
+        const glm::dmat4 invMVPParts = glm::inverse(modelTransform) *
             glm::inverse(data.camera.combinedViewMatrix()) *
-            glm::inverse(glm::dmat4(projectionMatrix));
+            glm::inverse(glm::dmat4(projectionTransform));
         const glm::dvec3 orthoRight = glm::normalize(
             glm::dvec3(invMVPParts * glm::dvec4(1.0, 0.0, 0.0, 0.0))
         );
@@ -473,7 +471,7 @@ void RenderablePlanesCloud::render(const RenderData& data, RendererTasks&) {
             glm::dvec3(invMVPParts * glm::dvec4(0.0, 1.0, 0.0, 0.0))
         );
 
-        _labels->render(data, mvpMatrix, orthoRight, orthoUp, fadeInVariable);
+        _labels->render(data, modelViewProjectionTransform, orthoRight, orthoUp, fadeInVariable);
     }
 }
 
diff --git a/modules/digitaluniverse/rendering/renderableplanescloud.h b/modules/digitaluniverse/rendering/renderableplanescloud.h
index 4ee824e228..8c8773e70d 100644
--- a/modules/digitaluniverse/rendering/renderableplanescloud.h
+++ b/modules/digitaluniverse/rendering/renderableplanescloud.h
@@ -80,8 +80,8 @@ private:
 
     void deleteDataGPUAndCPU();
     void createPlanes();
-    void renderPlanes(const RenderData& data, const glm::dmat4& modelViewMatrix,
-        const glm::dmat4& projectionMatrix, float fadeInVariable);
+    void renderPlanes(const RenderData& data, const glm::dmat4& modelViewTransform,
+        const glm::dmat4& projectionTransform, float fadeInVariable);
 
     void loadTextures();
 
diff --git a/modules/digitaluniverse/rendering/renderablepoints.cpp b/modules/digitaluniverse/rendering/renderablepoints.cpp
index 1a7d76acd5..c104723ffb 100644
--- a/modules/digitaluniverse/rendering/renderablepoints.cpp
+++ b/modules/digitaluniverse/rendering/renderablepoints.cpp
@@ -238,8 +238,7 @@ void RenderablePoints::render(const RenderData& data, RendererTasks&) {
 
     _program->setUniform(
         _uniformCache.modelViewProjectionTransform,
-        glm::dmat4(data.camera.projectionMatrix()) *
-            data.camera.combinedViewMatrix() * glm::dmat4(1.0)
+        calcModelViewProjectionTransform(data, glm::dmat4(1.0))
     );
 
     _program->setUniform(_uniformCache.color, _pointColor);
diff --git a/modules/exoplanets/rendering/renderableorbitdisc.cpp b/modules/exoplanets/rendering/renderableorbitdisc.cpp
index dddb81f391..9fadb165f1 100644
--- a/modules/exoplanets/rendering/renderableorbitdisc.cpp
+++ b/modules/exoplanets/rendering/renderableorbitdisc.cpp
@@ -185,16 +185,9 @@ void RenderableOrbitDisc::deinitializeGL() {
 void RenderableOrbitDisc::render(const RenderData& data, RendererTasks&) {
     _shader->activate();
 
-    glm::dmat4 modelTransform =
-        glm::translate(glm::dmat4(1.0), data.modelTransform.translation) *
-        glm::dmat4(data.modelTransform.rotation) *
-        glm::scale(glm::dmat4(1.0), glm::dvec3(data.modelTransform.scale));
-
-    glm::dmat4 modelViewTransform = data.camera.combinedViewMatrix() * modelTransform;
-
     _shader->setUniform(
         _uniformCache.modelViewProjection,
-        data.camera.projectionMatrix() * glm::mat4(modelViewTransform)
+        glm::mat4(calcModelViewProjectionTransform(data))
     );
     _shader->setUniform(_uniformCache.offset, _offset);
     _shader->setUniform(_uniformCache.opacity, opacity());
diff --git a/modules/gaia/rendering/renderablegaiastars.cpp b/modules/gaia/rendering/renderablegaiastars.cpp
index cd2d5baded..f99b1c75aa 100644
--- a/modules/gaia/rendering/renderablegaiastars.cpp
+++ b/modules/gaia/rendering/renderablegaiastars.cpp
@@ -962,15 +962,13 @@ void RenderableGaiaStars::render(const RenderData& data, RendererTasks&) {
     GLint defaultFbo;
     glGetIntegerv(GL_FRAMEBUFFER_BINDING, &defaultFbo);
 
-    glm::dmat4 model = glm::translate(glm::dmat4(1.0), data.modelTransform.translation) *
-        glm::dmat4(data.modelTransform.rotation) *
-        glm::scale(glm::dmat4(1.0), glm::dvec3(data.modelTransform.scale));
+    glm::dmat4 model = calcModelTransform(data);
 
     float viewScaling = data.camera.scaling();
     glm::dmat4 view = data.camera.combinedViewMatrix();
     glm::dmat4 projection = data.camera.projectionMatrix();
 
-    glm::dmat4 modelViewProjMat = projection * view * model;
+    glm::dmat4 modelViewProjMat = calcModelViewProjectionTransform(data, model);
     glm::vec2 screenSize = glm::vec2(global::renderEngine->renderingResolution());
 
     // Wait until camera has stabilized before we traverse the Octree/stream from files.
diff --git a/modules/galaxy/rendering/renderablegalaxy.cpp b/modules/galaxy/rendering/renderablegalaxy.cpp
index 164ff7f11c..b77ccf1001 100644
--- a/modules/galaxy/rendering/renderablegalaxy.cpp
+++ b/modules/galaxy/rendering/renderablegalaxy.cpp
@@ -629,17 +629,14 @@ void RenderableGalaxy::renderPoints(const RenderData& data) {
             glm::rotate(glm::dmat4(1.0), 4.45741, glm::dvec3(0.0, 0.0, 1.0)
     );
 
-    glm::dmat4 modelMatrix =
-        glm::translate(glm::dmat4(1.0), data.modelTransform.translation) *
-        glm::dmat4(data.modelTransform.rotation) * rotMatrix *
-        glm::scale(glm::dmat4(1.0), glm::dvec3(data.modelTransform.scale));
+    AlternativeTransform altTransform;
+    altTransform.rotation = glm::dmat4(data.modelTransform.rotation) * rotMatrix;
+    glm::dmat4 modelTransform = calcModelTransform(data, altTransform);
 
-    glm::dmat4 projectionMatrix = glm::dmat4(data.camera.projectionMatrix());
+    glm::dmat4 cameraViewProjectionMatrix =
+        glm::dmat4(data.camera.projectionMatrix()) * data.camera.combinedViewMatrix();
 
-    glm::dmat4 cameraViewProjectionMatrix = projectionMatrix *
-        data.camera.combinedViewMatrix();
-
-    _pointsProgram->setUniform(_uniformCachePoints.modelMatrix, modelMatrix);
+    _pointsProgram->setUniform(_uniformCachePoints.modelMatrix, modelTransform);
     _pointsProgram->setUniform(
         _uniformCachePoints.cameraViewProjectionMatrix,
         cameraViewProjectionMatrix
@@ -682,17 +679,14 @@ void RenderableGalaxy::renderBillboards(const RenderData& data) {
             glm::rotate(glm::dmat4(1.0), 4.45741, glm::dvec3(0.0, 0.0, 1.0)
     );
 
-    glm::dmat4 modelMatrix =
-        glm::translate(glm::dmat4(1.0), data.modelTransform.translation) *
-        glm::dmat4(data.modelTransform.rotation) * rotMatrix *
-        glm::scale(glm::dmat4(1.0), data.modelTransform.scale);
+    AlternativeTransform altTransform;
+    altTransform.rotation = glm::dmat4(data.modelTransform.rotation) * rotMatrix;
+    glm::dmat4 modelTransform = calcModelTransform(data, altTransform);
 
-    glm::dmat4 projectionMatrix = glm::dmat4(data.camera.projectionMatrix());
+    glm::dmat4 cameraViewProjectionMatrix =
+        glm::dmat4(data.camera.projectionMatrix()) * data.camera.combinedViewMatrix();
 
-    glm::dmat4 cameraViewProjectionMatrix = projectionMatrix *
-        data.camera.combinedViewMatrix();
-
-    _billboardsProgram->setUniform(_uniformCacheBillboards.modelMatrix, modelMatrix);
+    _billboardsProgram->setUniform(_uniformCacheBillboards.modelMatrix, modelTransform);
     _billboardsProgram->setUniform(
         _uniformCacheBillboards.cameraViewProjectionMatrix,
         cameraViewProjectionMatrix
diff --git a/modules/skybrowser/src/renderableskytarget.cpp b/modules/skybrowser/src/renderableskytarget.cpp
index 8619ebaed8..429b660d15 100644
--- a/modules/skybrowser/src/renderableskytarget.cpp
+++ b/modules/skybrowser/src/renderableskytarget.cpp
@@ -241,23 +241,15 @@ void RenderableSkyTarget::render(const RenderData& data, RendererTasks&) {
         cameraOrientedRotation :
         glm::dmat4(data.modelTransform.rotation);
 
-    const glm::dmat4 modelTransform =
-        glm::translate(glm::dmat4(1.0), data.modelTransform.translation) *
-        rotationTransform *
-        glm::scale(glm::dmat4(1.0), glm::dvec3(data.modelTransform.scale)) *
-        glm::dmat4(1.0);
-    const glm::dmat4 modelViewTransform =
-        data.camera.combinedViewMatrix() * modelTransform;
+    auto [modelTransform, modelViewTransform, modelViewProjectionTransform] =
+        calcAllTransforms(data, { .rotation = rotationTransform });
 
     _shader->setUniform(
         "modelViewProjectionTransform",
-        data.camera.projectionMatrix() * glm::mat4(modelViewTransform)
+        glm::mat4(modelViewProjectionTransform)
     );
 
-    _shader->setUniform(
-        "modelViewTransform",
-        glm::mat4(data.camera.combinedViewMatrix() * glm::dmat4(modelViewTransform))
-    );
+    _shader->setUniform("modelViewTransform", glm::mat4(modelViewTransform));
 
     _shader->setUniform("multiplyColor", _multiplyColor);
 
diff --git a/modules/space/rendering/renderableconstellationbounds.cpp b/modules/space/rendering/renderableconstellationbounds.cpp
index 2aa9a6fd81..8e3cb017fa 100644
--- a/modules/space/rendering/renderableconstellationbounds.cpp
+++ b/modules/space/rendering/renderableconstellationbounds.cpp
@@ -186,11 +186,7 @@ void RenderableConstellationBounds::render(const RenderData& data, RendererTasks
     _program->setUniform("camrot", glm::mat4(data.camera.viewRotationMatrix()));
     _program->setUniform("scaling", glm::vec2(1.f, 0.f));
 
-    glm::dmat4 modelTransform =
-        glm::translate(glm::dmat4(1.0), data.modelTransform.translation) *
-        glm::dmat4(data.modelTransform.rotation) *
-        glm::scale(glm::dmat4(1.0), glm::dvec3(data.modelTransform.scale));
-
+    const glm::dmat4 modelTransform = calcModelTransform(data);
 
     _program->setUniform("ViewProjection", data.camera.viewProjectionMatrix());
     _program->setUniform("ModelTransform", glm::mat4(modelTransform));
diff --git a/modules/space/rendering/renderableconstellationlines.cpp b/modules/space/rendering/renderableconstellationlines.cpp
index cb4f55cfec..01529fad9d 100644
--- a/modules/space/rendering/renderableconstellationlines.cpp
+++ b/modules/space/rendering/renderableconstellationlines.cpp
@@ -283,16 +283,11 @@ void RenderableConstellationLines::renderConstellations(const RenderData&,
 }
 
 void RenderableConstellationLines::render(const RenderData& data, RendererTasks& tasks) {
-    const glm::dmat4 modelMatrix =
-        glm::translate(glm::dmat4(1.0), data.modelTransform.translation) * // Translation
-        glm::dmat4(data.modelTransform.rotation) *  // Spice rotation
-        glm::scale(glm::dmat4(1.0), glm::dvec3(data.modelTransform.scale));
-
-    const glm::dmat4 modelViewMatrix = data.camera.combinedViewMatrix() * modelMatrix;
-    const glm::dmat4 projectionMatrix = data.camera.projectionMatrix();
+    const glm::dmat4 modelViewTransform = calcModelViewTransform(data);
+    const glm::dmat4 projectionTransform = data.camera.projectionMatrix();
 
     if (_drawElements) {
-        renderConstellations(data, modelViewMatrix, projectionMatrix);
+        renderConstellations(data, modelViewTransform, projectionTransform);
     }
 
     RenderableConstellationsBase::render(data, tasks);
diff --git a/modules/space/rendering/renderableconstellationsbase.cpp b/modules/space/rendering/renderableconstellationsbase.cpp
index ad73cffcf9..fd77b5bc64 100644
--- a/modules/space/rendering/renderableconstellationsbase.cpp
+++ b/modules/space/rendering/renderableconstellationsbase.cpp
@@ -214,21 +214,16 @@ void RenderableConstellationsBase::render(const RenderData& data, RendererTasks&
         return;
     }
 
-    const glm::dmat4 modelMatrix =
-        glm::translate(glm::dmat4(1.0), data.modelTransform.translation) * // Translation
-        glm::dmat4(data.modelTransform.rotation) *  // Spice rotation
-        glm::scale(glm::dmat4(1.0), glm::dvec3(data.modelTransform.scale));
-
-    const glm::dmat4 modelViewMatrix = data.camera.combinedViewMatrix() * modelMatrix;
-    const glm::dmat4 projectionMatrix = data.camera.projectionMatrix();
-    const glm::dmat4 modelViewProjectionMatrix = projectionMatrix * modelViewMatrix;
+    const glm::dmat4 modelTransform = calcModelTransform(data);
+    const glm::dmat4 modelViewProjectionTransform =
+        calcModelViewProjectionTransform(data, modelTransform);
 
     const glm::vec3 lookup = data.camera.lookUpVectorWorldSpace();
     const glm::vec3 viewDirection = data.camera.viewDirectionWorldSpace();
     glm::vec3 right = glm::cross(viewDirection, lookup);
     const glm::vec3 up = glm::cross(right, viewDirection);
 
-    const glm::dmat4 worldToModelTransform = glm::inverse(modelMatrix);
+    const glm::dmat4 worldToModelTransform = glm::inverse(modelTransform);
     glm::vec3 orthoRight = glm::normalize(
         glm::vec3(worldToModelTransform * glm::vec4(right, 0.f))
     );
@@ -244,7 +239,7 @@ void RenderableConstellationsBase::render(const RenderData& data, RendererTasks&
     const glm::vec3 orthoUp = glm::normalize(
         glm::vec3(worldToModelTransform * glm::dvec4(up, 0.f))
     );
-    _labels->render(data, modelViewProjectionMatrix, orthoRight, orthoUp);
+    _labels->render(data, modelViewProjectionTransform, orthoRight, orthoUp);
 }
 
 } // namespace openspace
diff --git a/modules/space/rendering/renderableeclipsecone.cpp b/modules/space/rendering/renderableeclipsecone.cpp
index 1f6c893fc1..a5b22b12cd 100644
--- a/modules/space/rendering/renderableeclipsecone.cpp
+++ b/modules/space/rendering/renderableeclipsecone.cpp
@@ -277,15 +277,12 @@ void RenderableEclipseCone::render(const RenderData& data, RendererTasks&) {
     _shader->activate();
 
     // Model transform and view transform needs to be in double precision
-    const glm::dmat4 modelTransform =
-        glm::translate(glm::dmat4(1.0), data.modelTransform.translation) *
-        glm::dmat4(data.modelTransform.rotation) *
-        glm::scale(glm::dmat4(1.0), glm::dvec3(data.modelTransform.scale));
-    glm::dmat4 modelViewTransform = data.camera.combinedViewMatrix() * modelTransform;
+    const glm::dmat4 modelViewProjectionTransform =
+        calcModelViewProjectionTransform(data);
 
     _shader->setUniform(
         _uniformCache.modelViewProjectionTransform,
-        data.camera.projectionMatrix() * glm::mat4(modelViewTransform)
+        glm::mat4(modelViewProjectionTransform)
     );
 
     _shader->setUniform(_uniformCache.opacity, opacity());
diff --git a/modules/space/rendering/renderablefluxnodes.cpp b/modules/space/rendering/renderablefluxnodes.cpp
index 7a547ae1b1..cd0ed7b9a5 100644
--- a/modules/space/rendering/renderablefluxnodes.cpp
+++ b/modules/space/rendering/renderablefluxnodes.cpp
@@ -676,21 +676,24 @@ void RenderableFluxNodes::render(const RenderData& data, RendererTasks&) {
     _shaderProgram->activate();
 
     // Calculate Model View MatrixProjection
-    const glm::dmat4 rotMat = glm::dmat4(data.modelTransform.rotation);
-    const glm::dmat4 modelMat =
-        glm::translate(glm::dmat4(1.0), data.modelTransform.translation) *
-        rotMat * glm::scale(glm::dmat4(1.0), data.modelTransform.scale);
-    const glm::dmat4 modelViewMat = data.camera.combinedViewMatrix() * modelMat;
+    const glm::dmat4 rotationTransform = glm::dmat4(data.modelTransform.rotation);
+    const glm::dmat4 modelTransform = calcModelTransform(
+        data,
+        { .rotation = rotationTransform }
+    );
 
-    _shaderProgram->setUniform("modelViewProjection",
-        data.camera.sgctInternal.projectionMatrix() * glm::mat4(modelViewMat)
+    _shaderProgram->setUniform(
+        "modelViewProjection",
+        glm::mat4(calcModelViewProjectionTransform(data, modelTransform))
     );
 
     SceneGraphNode* earthNode = sceneGraphNode("Earth");
     if (!earthNode) {
         LWARNING("Could not find scene graph node 'Earth'");
     }
-    glm::vec3 earthPos = earthNode->worldPosition() * data.modelTransform.rotation;
+    glm::vec3 earthPos = glm::vec3(
+        earthNode->worldPosition() * data.modelTransform.rotation
+    );
 
     _shaderProgram->setUniform(_uniformCache.streamColor, _streamColor);
     _shaderProgram->setUniform(_uniformCache.nodeSize, _nodeSize);
diff --git a/modules/space/rendering/renderablehabitablezone.cpp b/modules/space/rendering/renderablehabitablezone.cpp
index 03b946631c..67caa87580 100644
--- a/modules/space/rendering/renderablehabitablezone.cpp
+++ b/modules/space/rendering/renderablehabitablezone.cpp
@@ -146,16 +146,9 @@ RenderableHabitableZone::RenderableHabitableZone(const ghoul::Dictionary& dictio
 void RenderableHabitableZone::render(const RenderData& data, RendererTasks&) {
     _shader->activate();
 
-    glm::dmat4 modelTransform =
-        glm::translate(glm::dmat4(1.0), data.modelTransform.translation) *
-        glm::dmat4(data.modelTransform.rotation) *
-        glm::scale(glm::dmat4(1.0), glm::dvec3(data.modelTransform.scale));
-
-    glm::dmat4 modelViewTransform = data.camera.combinedViewMatrix() * modelTransform;
-
     _shader->setUniform(
         _uniformCache.modelViewProjection,
-        data.camera.projectionMatrix() * glm::mat4(modelViewTransform)
+        glm::mat4(calcModelViewProjectionTransform(data))
     );
     _shader->setUniform(_uniformCache.width, _width);
     _shader->setUniform(_uniformCache.opacity, opacity());
diff --git a/modules/space/rendering/renderableorbitalkepler.cpp b/modules/space/rendering/renderableorbitalkepler.cpp
index 0b5174457c..1baa644886 100644
--- a/modules/space/rendering/renderableorbitalkepler.cpp
+++ b/modules/space/rendering/renderableorbitalkepler.cpp
@@ -271,15 +271,7 @@ void RenderableOrbitalKepler::render(const RenderData& data, RendererTasks&) {
     _programObject->setUniform(_uniformCache.opacity, opacity());
     _programObject->setUniform(_uniformCache.inGameTime, data.time.j2000Seconds());
 
-    glm::dmat4 modelTransform =
-        glm::translate(glm::dmat4(1.0), data.modelTransform.translation) *
-        glm::dmat4(data.modelTransform.rotation) *
-        glm::scale(glm::dmat4(1.0), glm::dvec3(data.modelTransform.scale));
-
-    _programObject->setUniform(
-        _uniformCache.modelView,
-        data.camera.combinedViewMatrix() * modelTransform
-    );
+    _programObject->setUniform(_uniformCache.modelView, calcModelViewTransform(data));
 
     // Because we want the property to work similar to the planet trails
     const float fade = pow(_appearance.lineFade.maxValue() - _appearance.lineFade, 2.f);
diff --git a/modules/space/rendering/renderablerings.cpp b/modules/space/rendering/renderablerings.cpp
index b2e618dd6b..41fe330e8b 100644
--- a/modules/space/rendering/renderablerings.cpp
+++ b/modules/space/rendering/renderablerings.cpp
@@ -184,16 +184,9 @@ void RenderableRings::deinitializeGL() {
 void RenderableRings::render(const RenderData& data, RendererTasks&) {
     _shader->activate();
 
-    glm::dmat4 modelTransform =
-        glm::translate(glm::dmat4(1.0), data.modelTransform.translation) *
-        glm::dmat4(data.modelTransform.rotation) *
-        glm::scale(glm::dmat4(1.0), glm::dvec3(data.modelTransform.scale));
-
-    glm::dmat4 modelViewTransform = data.camera.combinedViewMatrix() * modelTransform;
-
     _shader->setUniform(
         _uniformCache.modelViewProjection,
-        data.camera.projectionMatrix() * glm::mat4(modelViewTransform)
+        glm::mat4(calcModelViewProjectionTransform(data))
     );
     _shader->setUniform(_uniformCache.textureOffset, _offset);
     _shader->setUniform(_uniformCache.colorFilterValue, _colorFilter);
diff --git a/modules/space/rendering/renderablestars.cpp b/modules/space/rendering/renderablestars.cpp
index 9309473b57..8207385ad8 100644
--- a/modules/space/rendering/renderablestars.cpp
+++ b/modules/space/rendering/renderablestars.cpp
@@ -1047,10 +1047,7 @@ void RenderableStars::render(const RenderData& data, RendererTasks&) {
     glm::dvec3 cameraUp = data.camera.lookUpVectorWorldSpace();
     _program->setUniform(_uniformCache.cameraUp, cameraUp);
 
-    glm::dmat4 modelMatrix =
-        glm::translate(glm::dmat4(1.0), data.modelTransform.translation) *
-        glm::dmat4(data.modelTransform.rotation) *
-        glm::scale(glm::dmat4(1.0), data.modelTransform.scale);
+    glm::dmat4 modelMatrix = calcModelTransform(data);
 
     glm::dmat4 projectionMatrix = glm::dmat4(data.camera.projectionMatrix());
 
diff --git a/modules/space/rendering/renderabletravelspeed.cpp b/modules/space/rendering/renderabletravelspeed.cpp
index b495961e39..7b8b354370 100644
--- a/modules/space/rendering/renderabletravelspeed.cpp
+++ b/modules/space/rendering/renderabletravelspeed.cpp
@@ -299,15 +299,10 @@ void RenderableTravelSpeed::render(const RenderData& data, RendererTasks&) {
     }
     _shaderProgram->activate();
 
-    const glm::dmat4 modelTransform =
-        glm::translate(glm::dmat4(1.0), data.modelTransform.translation) *
-        glm::dmat4(data.modelTransform.rotation) *
-        glm::scale(glm::dmat4(1.0), data.modelTransform.scale);
-
-    const glm::dmat4 modelViewTransform = data.camera.combinedViewMatrix() *
-        modelTransform;
-
-    _shaderProgram->setUniform("modelViewTransform", glm::mat4(modelViewTransform));
+    _shaderProgram->setUniform(
+        "modelViewTransform",
+        glm::mat4(calcModelViewTransform(data))
+    );
     _shaderProgram->setUniform("projectionTransform", data.camera.projectionMatrix());
 
 #ifndef __APPLE__
diff --git a/modules/spacecraftinstruments/rendering/renderablecrawlingline.cpp b/modules/spacecraftinstruments/rendering/renderablecrawlingline.cpp
index 902847649e..31688c56c6 100644
--- a/modules/spacecraftinstruments/rendering/renderablecrawlingline.cpp
+++ b/modules/spacecraftinstruments/rendering/renderablecrawlingline.cpp
@@ -142,13 +142,7 @@ void RenderableCrawlingLine::render(const RenderData& data, RendererTasks&) {
     _program->activate();
     _frameCounter++;
 
-    glm::dmat4 modelTransform =
-        glm::translate(glm::dmat4(1.0), data.modelTransform.translation) *
-        glm::dmat4(data.modelTransform.rotation) *
-        glm::scale(glm::dmat4(1.0), glm::dvec3(data.modelTransform.scale));
-
-    glm::dmat4 modelViewProjectionTransform = data.camera.projectionMatrix() *
-                             glm::mat4(data.camera.combinedViewMatrix() * modelTransform);
+    glm::dmat4 modelViewProjectionTransform = calcModelViewProjectionTransform(data);
 
     _program->setUniform("modelViewProjection", modelViewProjectionTransform);
 
diff --git a/modules/spacecraftinstruments/rendering/renderablefov.cpp b/modules/spacecraftinstruments/rendering/renderablefov.cpp
index e29610b013..e25e156eaf 100644
--- a/modules/spacecraftinstruments/rendering/renderablefov.cpp
+++ b/modules/spacecraftinstruments/rendering/renderablefov.cpp
@@ -758,14 +758,8 @@ void RenderableFov::render(const RenderData& data, RendererTasks&) {
     _program->activate();
 
     // Model transform and view transform needs to be in double precision
-    glm::dmat4 modelTransform =
-        glm::translate(glm::dmat4(1.0), data.modelTransform.translation) *
-        glm::dmat4(data.modelTransform.rotation) *
-        glm::scale(glm::dmat4(1.0), glm::dvec3(data.modelTransform.scale));
-
     glm::mat4 modelViewProjectionTransform =
-        data.camera.projectionMatrix() *
-        glm::mat4(data.camera.combinedViewMatrix() * modelTransform);
+        calcModelViewProjectionTransform(data);
 
     _program->setUniform(_uniformCache.modelViewProjection, modelViewProjectionTransform);
 
diff --git a/modules/spacecraftinstruments/rendering/renderablemodelprojection.cpp b/modules/spacecraftinstruments/rendering/renderablemodelprojection.cpp
index 3852feda2e..bd88be6f96 100644
--- a/modules/spacecraftinstruments/rendering/renderablemodelprojection.cpp
+++ b/modules/spacecraftinstruments/rendering/renderablemodelprojection.cpp
@@ -262,12 +262,10 @@ void RenderableModelProjection::render(const RenderData& data, RendererTasks&) {
     const glm::vec3 bodyPos = data.modelTransform.translation;
 
     // Model transform and view transform needs to be in double precision
-    const glm::dmat4 transform =
-        glm::translate(glm::dmat4(1.0), data.modelTransform.translation) *
-        glm::dmat4(data.modelTransform.rotation) *
-        glm::scale(glm::dmat4(1.0), glm::dvec3(data.modelTransform.scale)) *
-        glm::scale(glm::dmat4(1.0), glm::dvec3(_modelScale));
-    const glm::dmat4 modelViewTransform = data.camera.combinedViewMatrix() * transform;
+    const glm::dmat4 modelTransform = glm::scale(
+        calcModelTransform(data), glm::dvec3(_modelScale)
+    );
+    const glm::dmat4 modelViewTransform = calcModelViewTransform(data, modelTransform);
 
     // malej 2023-FEB-23: The light sources should probably not be hard coded
     const glm::vec3 directionToSun = glm::normalize(_sunPosition - bodyPos);
diff --git a/modules/spacecraftinstruments/rendering/renderableplaneprojection.cpp b/modules/spacecraftinstruments/rendering/renderableplaneprojection.cpp
index bf6f4c41a0..9a9ea32360 100644
--- a/modules/spacecraftinstruments/rendering/renderableplaneprojection.cpp
+++ b/modules/spacecraftinstruments/rendering/renderableplaneprojection.cpp
@@ -125,10 +125,14 @@ void RenderablePlaneProjection::render(const RenderData& data, RendererTasks&) {
     glm::dmat4 modelTransform =
         glm::translate(glm::dmat4(1.0), data.modelTransform.translation) *
         glm::dmat4(_stateMatrix);
-    glm::mat4 mvp = data.camera.projectionMatrix() *
-                    glm::mat4(data.camera.combinedViewMatrix() * modelTransform);
 
-    _shader->setUniform("modelViewProjectionTransform", mvp);
+    const glm::dmat4 ModelViewProjectionTransform =
+        calcModelViewProjectionTransform(data, modelTransform);
+
+    _shader->setUniform(
+        "modelViewProjectionTransform",
+        glm::mat4(ModelViewProjectionTransform)
+    );
 
     ghoul::opengl::TextureUnit unit;
     unit.activate();
diff --git a/modules/spacecraftinstruments/rendering/renderableplanetprojection.cpp b/modules/spacecraftinstruments/rendering/renderableplanetprojection.cpp
index 818c2e0a7d..dd395868f8 100644
--- a/modules/spacecraftinstruments/rendering/renderableplanetprojection.cpp
+++ b/modules/spacecraftinstruments/rendering/renderableplanetprojection.cpp
@@ -522,17 +522,12 @@ void RenderablePlanetProjection::render(const RenderData& data, RendererTasks&)
     _programObject->setUniform(_mainUniformCache.sunPos, static_cast<glm::vec3>(sunPos));
 
     // Model transform and view transform needs to be in double precision
-    glm::dmat4 trans =
-        glm::translate(glm::dmat4(1.0), data.modelTransform.translation) * // Translation
-        glm::dmat4(data.modelTransform.rotation) *  // Spice rotation
-        glm::scale(glm::dmat4(1.0), glm::dvec3(data.modelTransform.scale));
+    const glm::dmat4 modelTransform = calcModelTransform(data);
 
-    glm::dmat4 modelViewTransform = data.camera.combinedViewMatrix() * trans;
-
-    _programObject->setUniform(_mainUniformCache.modelTransform, glm::mat4(trans));
+    _programObject->setUniform(_mainUniformCache.modelTransform, glm::mat4(modelTransform));
     _programObject->setUniform(
         _mainUniformCache.modelViewProjectionTransform,
-        data.camera.projectionMatrix() * glm::mat4(modelViewTransform)
+        glm::mat4(calcModelViewProjectionTransform(data, modelTransform))
     );
 
     _programObject->setUniform(_mainUniformCache.hasBaseMap, _baseTexture != nullptr);
diff --git a/modules/spacecraftinstruments/rendering/renderableshadowcylinder.cpp b/modules/spacecraftinstruments/rendering/renderableshadowcylinder.cpp
index dc18010b34..f721ea17c7 100644
--- a/modules/spacecraftinstruments/rendering/renderableshadowcylinder.cpp
+++ b/modules/spacecraftinstruments/rendering/renderableshadowcylinder.cpp
@@ -260,15 +260,9 @@ void RenderableShadowCylinder::render(const RenderData& data, RendererTasks&) {
     _shader->activate();
 
     // Model transform and view transform needs to be in double precision
-    const glm::dmat4 modelTransform =
-        glm::translate(glm::dmat4(1.0), data.modelTransform.translation) *
-        glm::dmat4(data.modelTransform.rotation) *
-        glm::scale(glm::dmat4(1.0), glm::dvec3(data.modelTransform.scale));
-    glm::dmat4 modelViewTransform = data.camera.combinedViewMatrix() * modelTransform;
-
     _shader->setUniform(
         _uniformCache.modelViewProjectionTransform,
-        data.camera.projectionMatrix() * glm::mat4(modelViewTransform)
+        glm::mat4(calcModelViewProjectionTransform(data))
     );
 
     _shader->setUniform(_uniformCache.shadowColor, _shadowColor);
diff --git a/src/rendering/renderable.cpp b/src/rendering/renderable.cpp
index 1b35fbb3ff..ec30219e37 100644
--- a/src/rendering/renderable.cpp
+++ b/src/rendering/renderable.cpp
@@ -337,4 +337,51 @@ bool Renderable::hasOverrideRenderBin() const noexcept {
     return _hasOverrideRenderBin;
 }
 
+glm::dmat4 Renderable::calcModelTransform(const RenderData& data,
+                                          const AlternativeTransform& altTransform) const
+{
+    glm::dvec3 translation =
+        altTransform.translation.value_or(data.modelTransform.translation);
+    glm::dmat3 rotation = altTransform.rotation.value_or(data.modelTransform.rotation);
+    glm::dvec3 scale = altTransform.scale.value_or(data.modelTransform.scale);
+
+    return glm::translate(glm::dmat4(1.0), translation) *
+        glm::dmat4(rotation) *
+        glm::scale(glm::dmat4(1.0), scale);
+}
+
+glm::dmat4 Renderable::calcModelViewTransform(const RenderData& data,
+                                           std::optional<glm::dmat4> modelTransform) const
+{
+    glm::dmat4 modelMatrix = modelTransform.value_or(calcModelTransform(data));
+    return data.camera.combinedViewMatrix() * modelMatrix;
+}
+
+glm::dmat4 Renderable::calcModelViewProjectionTransform(const RenderData& data,
+                                           std::optional<glm::dmat4> modelTransform) const
+{
+    glm::dmat4 modelMatrix = modelTransform.value_or(calcModelTransform(data));
+    glm::dmat4 viewMatrix = data.camera.combinedViewMatrix();
+    glm::dmat4 projectionMatrix = data.camera.projectionMatrix();
+    return glm::dmat4(projectionMatrix * viewMatrix * modelMatrix);
+}
+
+std::tuple<glm::dmat4, glm::dmat4, glm::dmat4> Renderable::calcAllTransforms(
+                                                                   const RenderData& data,
+                                      const AlternativeTransform& altModelTransform) const
+{
+    glm::dmat4 modelTransform = calcModelTransform(data, altModelTransform);
+    glm::dmat4 modelViewTransform = calcModelViewTransform(data, modelTransform);
+    glm::dmat4 modelViewProjectionTransform = calcModelViewProjectionTransform(
+        data,
+        modelTransform
+    );
+
+    return {
+        modelTransform,
+        modelViewTransform,
+        modelViewProjectionTransform
+    };
+}
+
 }  // namespace openspace

From 30003ae20fc34d79886bf3a1cf211abd8e6a7cd6 Mon Sep 17 00:00:00 2001
From: Alexander Bock <alexander.bock@liu.se>
Date: Thu, 21 Sep 2023 20:51:33 +0200
Subject: [PATCH 138/701] Add new environment variable flag to control the MRF
 cache location

---
 openspace.cfg | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/openspace.cfg b/openspace.cfg
index 82e8a4b910..b2d27b72d5 100644
--- a/openspace.cfg
+++ b/openspace.cfg
@@ -126,7 +126,7 @@ ModuleConfigurations = {
     GlobeBrowsing = {
         TileCacheSize = 2048, -- for all globes (CPU and GPU memory)
         MRFCacheEnabled = false,
-        MRFCacheLocation = "${BASE}/mrf_cache",
+        MRFCacheLocation = os.getenv("OPENSPACE_MRFCACHE") or "${BASE}/mrf_cache",
         DefaultGeoPointTexture = "${DATA}/globe_pin.png"
     },
     Sync = {

From c6ffddd253b2baffc84b174a27b2bf31fc8eab73 Mon Sep 17 00:00:00 2001
From: Gene Payne <payne.gene@gmail.com>
Date: Fri, 22 Sep 2023 11:35:10 -0600
Subject: [PATCH 139/701] Non-Windows compiler fix for empty initializer list

---
 include/openspace/rendering/renderable.h | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/include/openspace/rendering/renderable.h b/include/openspace/rendering/renderable.h
index 71bd6f3c2e..9ca5adfbd7 100644
--- a/include/openspace/rendering/renderable.h
+++ b/include/openspace/rendering/renderable.h
@@ -160,7 +160,9 @@ protected:
      * \return the resulting model transformation matrix in double precision
      */
     glm::dmat4 calcModelTransform(const RenderData& data,
-        const AlternativeTransform& altTransform = {}) const;
+        const AlternativeTransform& altTransform = {
+            std::nullopt, std::nullopt, std::nullopt
+        }) const;
 
     /**
      * Calculates the model view transformation matrix with the given data and returns it
@@ -204,7 +206,9 @@ protected:
      *         model view projection transformation matrices
      */
     std::tuple<glm::dmat4, glm::dmat4, glm::dmat4> calcAllTransforms(
-        const RenderData& data, const AlternativeTransform& altModelTransform = {}) const;
+        const RenderData& data, const AlternativeTransform& altModelTransform = {
+            std::nullopt, std::nullopt, std::nullopt
+        }) const;
 
 private:
     double _boundingSphere = 0.0;

From 357f58ccfe3ddee7eafd7b8d83b86113187cecff Mon Sep 17 00:00:00 2001
From: Alexander Bock <alexander.bock@liu.se>
Date: Mon, 25 Sep 2023 16:54:10 +0200
Subject: [PATCH 140/701] Use OPENSPACE_GLOBEBROWSING instead of
 OPENSPACE_MRFCACHE

---
 openspace.cfg | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/openspace.cfg b/openspace.cfg
index b2d27b72d5..ec258bdd81 100644
--- a/openspace.cfg
+++ b/openspace.cfg
@@ -126,7 +126,7 @@ ModuleConfigurations = {
     GlobeBrowsing = {
         TileCacheSize = 2048, -- for all globes (CPU and GPU memory)
         MRFCacheEnabled = false,
-        MRFCacheLocation = os.getenv("OPENSPACE_MRFCACHE") or "${BASE}/mrf_cache",
+        MRFCacheLocation = os.getenv("OPENSPACE_GLOBEBROWSING") or "${BASE}/mrf_cache",
         DefaultGeoPointTexture = "${DATA}/globe_pin.png"
     },
     Sync = {

From 38308a4cde1b16fd0c1255de52692d633b44eeee Mon Sep 17 00:00:00 2001
From: Alexander Bock <mail@alexanderbock.eu>
Date: Wed, 27 Sep 2023 23:48:37 +0200
Subject: [PATCH 141/701] Store the mrf cache in a mrf_cache subfolder inside
 the OPENSPACE_GLOBEBROWSING instead if it is provided

---
 openspace.cfg | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/openspace.cfg b/openspace.cfg
index ec258bdd81..9d39a87a04 100644
--- a/openspace.cfg
+++ b/openspace.cfg
@@ -126,7 +126,7 @@ ModuleConfigurations = {
     GlobeBrowsing = {
         TileCacheSize = 2048, -- for all globes (CPU and GPU memory)
         MRFCacheEnabled = false,
-        MRFCacheLocation = os.getenv("OPENSPACE_GLOBEBROWSING") or "${BASE}/mrf_cache",
+        MRFCacheLocation = (os.getenv("OPENSPACE_GLOBEBROWSING") or "${BASE}") .. "/mrf_cache",
         DefaultGeoPointTexture = "${DATA}/globe_pin.png"
     },
     Sync = {

From 46ed8382e83bd777082fe935e87e2940e6a7ff78 Mon Sep 17 00:00:00 2001
From: Alexander Bock <alexander.bock@liu.se>
Date: Thu, 28 Sep 2023 09:40:51 +0200
Subject: [PATCH 142/701] Add the ability to specify a custom shader for the
 RenderableGalaxy class

---
 .../examples/galaxyshader/galaxyraycast.glsl  | 73 ++++++++++++++++++
 .../assets/examples/galaxyshader/volume.asset | 76 +++++++++++++++++++
 modules/galaxy/rendering/galaxyraycaster.cpp  |  6 +-
 modules/galaxy/rendering/galaxyraycaster.h    |  4 +-
 modules/galaxy/rendering/renderablegalaxy.cpp | 12 ++-
 modules/galaxy/rendering/renderablegalaxy.h   |  1 +
 6 files changed, 168 insertions(+), 4 deletions(-)
 create mode 100644 data/assets/examples/galaxyshader/galaxyraycast.glsl
 create mode 100644 data/assets/examples/galaxyshader/volume.asset

diff --git a/data/assets/examples/galaxyshader/galaxyraycast.glsl b/data/assets/examples/galaxyshader/galaxyraycast.glsl
new file mode 100644
index 0000000000..bc4acd2ffe
--- /dev/null
+++ b/data/assets/examples/galaxyshader/galaxyraycast.glsl
@@ -0,0 +1,73 @@
+/*****************************************************************************************
+*                                                                                       *
+* OpenSpace                                                                             *
+*                                                                                       *
+* Copyright (c) 2014-2020                                                               *
+*                                                                                       *
+* Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
+* software and associated documentation files (the "Software"), to deal in the Software *
+* without restriction, including without limitation the rights to use, copy, modify,    *
+* merge, publish, distribute, sublicense, and/or sell copies of the Software, and to    *
+* permit persons to whom the Software is furnished to do so, subject to the following   *
+* conditions:                                                                           *
+*                                                                                       *
+* The above copyright notice and this permission notice shall be included in all copies *
+* or substantial portions of the Software.                                              *
+*                                                                                       *
+* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED,   *
+* INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A         *
+* PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT    *
+* HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF  *
+* CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE  *
+* OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                                         *
+****************************************************************************************/
+
+uniform float maxStepSize#{id} = 0.1;
+uniform vec3 aspect#{id} = vec3(1.0);
+uniform float opacityCoefficient#{id} = 1.0;
+uniform float absorptionMultiply#{id} = 50.0;
+uniform float emissionMultiply#{id} = 1500.0;
+uniform sampler3D galaxyTexture#{id};
+
+void sample#{id}(vec3 samplePos, vec3 dir, inout vec3 accumulatedColor,
+                 inout vec3 accumulatedAlpha, inout float stepSize)
+{
+  vec3 aspect = aspect#{id};
+  stepSize = maxStepSize#{id} / length(dir / aspect);
+
+  // Early ray termination on black parts of the data
+  vec3 normalizedPos = samplePos * 2.0 - 1.0;
+  if (normalizedPos.x * normalizedPos.x + normalizedPos.y * normalizedPos.y > 0.7) {
+    return;
+  }
+
+  vec4 sampledColor = texture(galaxyTexture#{id}, samplePos.xyz);
+
+  // Source textures currently are square-rooted to avoid dithering in the shadows.
+  // So square them back
+  sampledColor = sampledColor*sampledColor;
+
+  // Fudge for the dust "spreading"
+  sampledColor.a = clamp(sampledColor.a, 0.0, 1.0);
+  sampledColor.a = pow(sampledColor.a, 0.7);
+
+  // Absorption probability
+  float scaledDensity = sampledColor.a * stepSize * absorptionMultiply#{id};
+  vec3 alphaTint = vec3(-0.7, -0.44, -0.35);
+  vec3 absorption = alphaTint * scaledDensity;
+
+  // Extinction
+  vec3 extinction = exp(-absorption);
+  accumulatedColor.rgb *= extinction;
+
+  // Emission
+  accumulatedColor.rgb +=
+    sampledColor.rgb * stepSize * emissionMultiply#{id} * opacityCoefficient#{id};
+
+  vec3 oneMinusFrontAlpha = vec3(1.0) - accumulatedAlpha;
+  accumulatedAlpha += oneMinusFrontAlpha * sampledColor.rgb  * opacityCoefficient#{id};
+}
+
+float stepSize#{id}(vec3 samplePos, vec3 dir) {
+  return maxStepSize#{id} * length(dir * 1.0 / aspect#{id});
+}
diff --git a/data/assets/examples/galaxyshader/volume.asset b/data/assets/examples/galaxyshader/volume.asset
new file mode 100644
index 0000000000..d52b3f2bc0
--- /dev/null
+++ b/data/assets/examples/galaxyshader/volume.asset
@@ -0,0 +1,76 @@
+local transforms = asset.require("scene/solarsystem/sun/transforms")
+
+
+
+local data = asset.syncedResource({
+  Name = "Milkyway Volume Data",
+  Type = "HttpSynchronization",
+  Identifier = "milkyway_volume_data",
+  Version = 1
+})
+
+
+local KiloParsec = 3.086E19
+
+local MilkyWayVolume = {
+  Identifier = "MilkyWayVolume_CustomShader",
+  Parent = transforms.SolarSystemBarycenter.Identifier,
+  Transform = {
+    Translation = {
+      Type = "StaticTranslation",
+      -- The center of the Milky Way is approximately 8 kiloparsec from the Sun.
+      -- The x-axis of galactic coordinates points from the sun towards the center
+      -- of the galaxy.
+      Position = { 8 * KiloParsec, 0, 0 }
+    }
+  },
+  Renderable = {
+    Type = "RenderableGalaxy",
+    StepSize = 0.01,
+    AbsorptionMultiply = 200,
+    EmissionMultiply = 250,
+    Rotation = { math.pi, 3.1248, 4.45741 },
+    RaycastingShader = asset.localResource("galaxyraycast2.glsl"),
+    Volume = {
+      Type = "Volume",
+      Filename = data .. "MilkyWayRGBAVolume1024x1024x128.raw",
+      Dimensions = { 1024, 1024, 128 },
+      Size = { 1.2E21, 1.2E21, 0.15E21 },
+      Downscale = 0.4,
+    },
+    Points = {
+      Type = "Points",
+      Filename = data .. "MilkyWayPoints.off",
+      EnabledPointsRatio = 0.3,
+      Texture = data .. "halo.png"
+    }
+  },
+  GUI = {
+    Path = "/Milky Way",
+    Name = "Milky Way Volume (Custom Shader)",
+    Description = "Volumetric rendering of Milky Way galaxy based on simulation from NAOJ"
+  }
+}
+
+
+asset.onInitialize(function()
+  openspace.addSceneGraphNode(MilkyWayVolume)
+end)
+
+asset.onDeinitialize(function()
+  openspace.removeSceneGraphNode(MilkyWayVolume)
+end)
+
+asset.export(MilkyWayVolume)
+
+
+
+asset.meta = {
+  Name = "Milky Way Volume",
+  Version = "1.1",
+  Description = [[Volumetric rendering of Milky Way galaxy based on simulations from "
+  "NAOJ with a custom shader]],
+  Author = "OpenSpace Team",
+  URL = "http://openspaceproject.com",
+  License = "MIT License"
+}
diff --git a/modules/galaxy/rendering/galaxyraycaster.cpp b/modules/galaxy/rendering/galaxyraycaster.cpp
index 7aa2334963..623bdb04c1 100644
--- a/modules/galaxy/rendering/galaxyraycaster.cpp
+++ b/modules/galaxy/rendering/galaxyraycaster.cpp
@@ -43,10 +43,12 @@ namespace {
 
 namespace openspace {
 
-GalaxyRaycaster::GalaxyRaycaster(ghoul::opengl::Texture& texture)
+GalaxyRaycaster::GalaxyRaycaster(ghoul::opengl::Texture& texture,
+                                 std::optional<std::filesystem::path> raycastingShader)
     : _boundingBox(glm::vec3(1.f))
     , _texture(texture)
     , _textureUnit(nullptr)
+    , _raycastingShader(raycastingShader.value_or(GlslRaycastPath))
 {}
 
 void GalaxyRaycaster::initialize() {
@@ -149,7 +151,7 @@ std::string GalaxyRaycaster::boundsFragmentShaderPath() const {
 }
 
 std::string GalaxyRaycaster::raycasterPath() const {
-    return std::string(GlslRaycastPath);
+    return _raycastingShader.string();
 }
 
 std::string GalaxyRaycaster::helperPath() const {
diff --git a/modules/galaxy/rendering/galaxyraycaster.h b/modules/galaxy/rendering/galaxyraycaster.h
index 9be21a3f97..5711247f40 100644
--- a/modules/galaxy/rendering/galaxyraycaster.h
+++ b/modules/galaxy/rendering/galaxyraycaster.h
@@ -45,7 +45,8 @@ struct RaycastData;
 
 class GalaxyRaycaster : public VolumeRaycaster {
 public:
-    GalaxyRaycaster(ghoul::opengl::Texture& texture);
+    GalaxyRaycaster(ghoul::opengl::Texture& texture,
+        std::optional<std::filesystem::path> raycastingShader = std::nullopt);
     ~GalaxyRaycaster() override = default;
 
     void initialize();
@@ -87,6 +88,7 @@ private:
     float _emissionMultiply = 0.f;
     ghoul::opengl::Texture& _texture;
     std::unique_ptr<ghoul::opengl::TextureUnit> _textureUnit;
+    std::filesystem::path _raycastingShader;
 
 }; // GalaxyRaycaster
 
diff --git a/modules/galaxy/rendering/renderablegalaxy.cpp b/modules/galaxy/rendering/renderablegalaxy.cpp
index b77ccf1001..b6ca4bbab3 100644
--- a/modules/galaxy/rendering/renderablegalaxy.cpp
+++ b/modules/galaxy/rendering/renderablegalaxy.cpp
@@ -175,6 +175,10 @@ namespace {
         // [[codegen::verbatim(EmissionMultiplyInfo.description)]]
         std::optional<float> emissionMultiply;
 
+        // If this value is specified, the default raycasting shader is overwritten and
+        // the shader found at the provided location is used instead
+        std::optional<std::filesystem::path> raycastingShader;
+
         enum class [[codegen::map(StarRenderingMethod)]] StarRenderingMethod {
             Points,
             Billboards
@@ -285,6 +289,7 @@ RenderableGalaxy::RenderableGalaxy(const ghoul::Dictionary& dictionary)
     _stepSize = p.stepSizeInfo.value_or(_stepSize);
     _absorptionMultiply = p.absorptionMultiply.value_or(_absorptionMultiply);
     _emissionMultiply = p.emissionMultiply.value_or(_emissionMultiply);
+    _raycastingShader = p.raycastingShader.value_or(_raycastingShader);
 
     _starRenderingMethod.addOptions({
         { StarRenderingMethod::Points, "Points" },
@@ -417,7 +422,12 @@ void RenderableGalaxy::initializeGL() {
     _texture->setDimensions(_volume->dimensions());
     _texture->uploadTexture();
 
-    _raycaster = std::make_unique<GalaxyRaycaster>(*_texture);
+    if (_raycastingShader.empty()) {
+        _raycaster = std::make_unique<GalaxyRaycaster>(*_texture);
+    }
+    else {
+        _raycaster = std::make_unique<GalaxyRaycaster>(*_texture, _raycastingShader);
+    }
     _raycaster->initialize();
 
     // We no longer need the data
diff --git a/modules/galaxy/rendering/renderablegalaxy.h b/modules/galaxy/rendering/renderablegalaxy.h
index a6b9be02fc..6614529633 100644
--- a/modules/galaxy/rendering/renderablegalaxy.h
+++ b/modules/galaxy/rendering/renderablegalaxy.h
@@ -88,6 +88,7 @@ private:
     glm::ivec3 _volumeDimensions = glm::ivec3(0);
     std::string _pointsFilename;
     std::string _pointSpreadFunctionTexturePath;
+    std::filesystem::path _raycastingShader;
 
     std::unique_ptr<GalaxyRaycaster> _raycaster;
     std::unique_ptr<volume::RawVolume<glm::tvec4<GLubyte>>> _volume;

From 49b3cb9eb1753a3ea4619dbd1dd3de5c38f03ae8 Mon Sep 17 00:00:00 2001
From: Alexander Bock <mail@alexanderbock.eu>
Date: Fri, 6 Oct 2023 14:12:18 +0200
Subject: [PATCH 143/701] Fix naming of umbral and penumbral shadows

---
 .../space/rendering/renderableeclipsecone.cpp | 52 +++++++++----------
 1 file changed, 26 insertions(+), 26 deletions(-)

diff --git a/modules/space/rendering/renderableeclipsecone.cpp b/modules/space/rendering/renderableeclipsecone.cpp
index a5b22b12cd..b782045340 100644
--- a/modules/space/rendering/renderableeclipsecone.cpp
+++ b/modules/space/rendering/renderableeclipsecone.cpp
@@ -456,34 +456,9 @@ void RenderableEclipseCone::createCone(double et) {
     );
 
 
-    // 4. Construct the penumbral shadow
-    std::vector<VBOLayout> penumbralVertices;
-    if (_showPenumbralShadow) {
-        penumbralVertices = calculateShadowPoints(
-            resSrc.terminatorPoints,
-            resDst.terminatorPoints,
-            shadowerToLightSource,
-            lightSourceToShadower,
-            distance * static_cast<double>(_shadowLength)
-        );
-
-        // We need to duplicate the first two vertices to close the cylinder at the seam
-        penumbralVertices.push_back(penumbralVertices[0]);
-        penumbralVertices.push_back(penumbralVertices[1]);
-    }
-
-
-    // 5. Construct the umbral shadow
+    // 4. Construct the umbral shadow
     std::vector<VBOLayout> umbralVertices;
     if (_showUmbralShadow) {
-        // For the umbral shadow, we need to mix the terminator points with a 180
-        // degree phase shift, so that the top terminator point of the sun gets matched
-        // with the bottom terminator point of the Moon, etc
-        std::rotate(
-            resSrc.terminatorPoints.begin(),
-            resSrc.terminatorPoints.begin() + resSrc.terminatorPoints.size() / 2,
-            resSrc.terminatorPoints.end()
-        );
         umbralVertices = calculateShadowPoints(
             resSrc.terminatorPoints,
             resDst.terminatorPoints,
@@ -498,6 +473,31 @@ void RenderableEclipseCone::createCone(double et) {
     }
 
 
+    // 5. Construct the penumbral shadow
+    std::vector<VBOLayout> penumbralVertices;
+    if (_showPenumbralShadow) {
+        // For the penumbral shadow, we need to mix the terminator points with a 180
+        // degree phase shift, so that the top terminator point of the sun gets matched
+        // with the bottom terminator point of the Moon, etc
+        std::rotate(
+            resSrc.terminatorPoints.begin(),
+            resSrc.terminatorPoints.begin() + resSrc.terminatorPoints.size() / 2,
+            resSrc.terminatorPoints.end()
+        );
+        penumbralVertices = calculateShadowPoints(
+            resSrc.terminatorPoints,
+            resDst.terminatorPoints,
+            shadowerToLightSource,
+            lightSourceToShadower,
+            distance * static_cast<double>(_shadowLength)
+        );
+
+        // We need to duplicate the first two vertices to close the cylinder at the seam
+        penumbralVertices.push_back(penumbralVertices[0]);
+        penumbralVertices.push_back(penumbralVertices[1]);
+    }
+
+
     // 6. Combine vertices
     std::vector<VBOLayout> vertices;
     vertices.reserve(umbralVertices.size() + penumbralVertices.size());

From 4cc8e394fb6c89c02549e274abfbb62fe9a4ef53 Mon Sep 17 00:00:00 2001
From: Alexander Bock <alexander.bock@liu.se>
Date: Fri, 6 Oct 2023 14:51:57 +0200
Subject: [PATCH 144/701] Add sponsor logos

---
 README.md | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/README.md b/README.md
index c5f30645b6..b15ef66fb1 100644
--- a/README.md
+++ b/README.md
@@ -47,4 +47,9 @@ Feel free to create issues for missing features, bug reports, or compile problem
 ![Image](https://github.com/OpenSpace/openspace.github.io/raw/master/assets/images/himalaya-nkpg-dome.jpg)
 
 # License
-The contents of this repository is under an [MIT license](https://github.com/OpenSpace/OpenSpace/blob/master/LICENSE.md).
+The contents of this repository provided under an [MIT license](https://github.com/OpenSpace/OpenSpace/blob/master/LICENSE.md).
+
+# Support
+OpenSpace is supported by the following institutions:
+
+![Image](https://github.com/OpenSpace/openspace.github.io/raw/master/assets/logos/sponsors.png)

From c56ca4d71cb44133169556593839fe26187bc69e Mon Sep 17 00:00:00 2001
From: Micah Acinapura <micahnyc@gmail.com>
Date: Fri, 6 Oct 2023 13:54:40 -0400
Subject: [PATCH 145/701] Update default_layers for Europa

Made the local layer for Europa default as the new york is broken and the Sweden is misaligned.
---
 .../solarsystem/planets/jupiter/europa/default_layers.asset | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/data/assets/scene/solarsystem/planets/jupiter/europa/default_layers.asset b/data/assets/scene/solarsystem/planets/jupiter/europa/default_layers.asset
index 281f4178c7..19438c0567 100644
--- a/data/assets/scene/solarsystem/planets/jupiter/europa/default_layers.asset
+++ b/data/assets/scene/solarsystem/planets/jupiter/europa/default_layers.asset
@@ -1,13 +1,13 @@
 asset.require("./layers/colorlayers/europa_texture", false)
-asset.require("./layers/colorlayers/voyager_global_mosaic_local", false)
+asset.require("./layers/colorlayers/voyager_global_mosaic_local", true)
 asset.require("./layers/colorlayers/voyager_global_mosaic_sweden", false)
-asset.require("./layers/colorlayers/voyager_global_mosaic_newyork", true)
+asset.require("./layers/colorlayers/voyager_global_mosaic_newyork", false)
 
 
 
 asset.meta = {
   Name = "Default Europa Layers",
-  Version = "1.0",
+  Version = "1.1",
   Description = "Default Europa layers are: Europa Texture",
   Author = "OpenSpace Team",
   URL = "http://openspaceproject.com",

From abee11f97326f29f36f39913af0804b00c0e20bc Mon Sep 17 00:00:00 2001
From: Micah Acinapura <micahnyc@gmail.com>
Date: Mon, 9 Oct 2023 19:38:49 -0400
Subject: [PATCH 146/701] changed shader variables from const for mac
 compilation (#2915)

---
 modules/atmosphere/shaders/atmosphere_deferred_fs.glsl | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/modules/atmosphere/shaders/atmosphere_deferred_fs.glsl b/modules/atmosphere/shaders/atmosphere_deferred_fs.glsl
index c0de958617..86da689bc5 100644
--- a/modules/atmosphere/shaders/atmosphere_deferred_fs.glsl
+++ b/modules/atmosphere/shaders/atmosphere_deferred_fs.glsl
@@ -509,8 +509,8 @@ vec3 sunColor(vec3 v, vec3 s, float r, float mu, float irradianceFactor) {
   // const float SunAngularSize = (0.3 * M_PI / 180.0);
   const float FuzzyFactor = 0.5; // How fuzzy should the edges be
 
-  const float p1 = cos(sunAngularSize);
-  const float p2 = cos(sunAngularSize * FuzzyFactor);
+  float p1 = cos(sunAngularSize);
+  float p2 = cos(sunAngularSize * FuzzyFactor);
 
   float t = (angle - p1) / (p2 - p1);
   float scale = clamp(t, 0.0, 1.0);

From 685b185b5eed90ded042878bc63dae78bc264502 Mon Sep 17 00:00:00 2001
From: Alexander Bock <alexander.bock@liu.se>
Date: Mon, 16 Oct 2023 13:29:07 +0200
Subject: [PATCH 147/701] Fix property spelling

---
 modules/globebrowsing/src/renderableglobe.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/globebrowsing/src/renderableglobe.cpp b/modules/globebrowsing/src/renderableglobe.cpp
index e21987e1d9..b94a63780b 100644
--- a/modules/globebrowsing/src/renderableglobe.cpp
+++ b/modules/globebrowsing/src/renderableglobe.cpp
@@ -128,7 +128,7 @@ namespace {
 
     constexpr openspace::properties::Property::PropertyInfo PerformFrustumCullingInfo = {
         "PerformFrustumCulling",
-        "Perform frusum culling",
+        "Perform frustum culling",
         "If this value is set to 'true', frustum culling will be performed.",
         openspace::properties::Property::Visibility::AdvancedUser
     };

From 15f175ce3d034581506b20616867d1ba55d191ee Mon Sep 17 00:00:00 2001
From: Alexander Bock <alexander.bock@liu.se>
Date: Mon, 16 Oct 2023 20:06:08 +0200
Subject: [PATCH 148/701] Update SGCT submodule

---
 apps/OpenSpace/ext/sgct | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/apps/OpenSpace/ext/sgct b/apps/OpenSpace/ext/sgct
index ada33efc9e..cfd94f0e6a 160000
--- a/apps/OpenSpace/ext/sgct
+++ b/apps/OpenSpace/ext/sgct
@@ -1 +1 @@
-Subproject commit ada33efc9e65fc6db36d1f75d9782afdcac80cef
+Subproject commit cfd94f0e6af50772d1ed27136cf5190d105c6b35

From 1dbe58a8ac4d1ccccb76789cf29a4da412179d78 Mon Sep 17 00:00:00 2001
From: Alexander Bock <mail@alexanderbock.eu>
Date: Wed, 18 Oct 2023 22:29:31 +0200
Subject: [PATCH 149/701] Add a new property to control whether the blackout
 factor should apply to the master (closes #2923)

---
 include/openspace/rendering/renderengine.h |  5 ++--
 src/rendering/renderengine.cpp             | 33 ++++++++++++++--------
 2 files changed, 24 insertions(+), 14 deletions(-)

diff --git a/include/openspace/rendering/renderengine.h b/include/openspace/rendering/renderengine.h
index 4a298becb6..9465ada77d 100644
--- a/include/openspace/rendering/renderengine.h
+++ b/include/openspace/rendering/renderengine.h
@@ -92,9 +92,6 @@ public:
     void renderEndscreen();
     void postDraw();
 
-    float globalBlackOutFactor() const;
-    void setGlobalBlackOutFactor(float opacity);
-
     float hdrExposure() const;
     bool isHdrDisabled() const;
 
@@ -168,6 +165,7 @@ private:
     void renderCameraInformation();
     void renderShutdownInformation(float timer, float fullTime);
     void renderDashboard();
+    float combinedBlackoutFactor() const;
 
     Camera* _camera = nullptr;
     Scene* _scene = nullptr;
@@ -193,6 +191,7 @@ private:
     properties::BoolProperty _disableMasterRendering;
 
     properties::FloatProperty _globalBlackOutFactor;
+    properties::BoolProperty _applyBlackoutToMaster;
 
     properties::BoolProperty _enableFXAA;
 
diff --git a/src/rendering/renderengine.cpp b/src/rendering/renderengine.cpp
index e8d3ecbade..2061c8b5e1 100644
--- a/src/rendering/renderengine.cpp
+++ b/src/rendering/renderengine.cpp
@@ -278,6 +278,14 @@ namespace {
         openspace::properties::Property::Visibility::User
     };
 
+    constexpr openspace::properties::Property::PropertyInfo ApplyBlackoutToMasterInfo = {
+        "ApplyBlackoutToMaster",
+        "Apply Blackout to Master",
+        "If this value is 'true', the blackout factor is applied to the master node. "
+        "Regardless of this value, the clients will always adhere to the factor",
+        openspace::properties::Property::Visibility::AdvancedUser
+    };
+
     constexpr openspace::properties::Property::PropertyInfo FXAAInfo = {
         "FXAA",
         "Enable FXAA",
@@ -317,6 +325,7 @@ RenderEngine::RenderEngine()
     , _showFrameInformation(ShowFrameNumberInfo, false)
     , _disableMasterRendering(DisableMasterInfo, false)
     , _globalBlackOutFactor(GlobalBlackoutFactorInfo, 1.f, 0.f, 1.f)
+    , _applyBlackoutToMaster(ApplyBlackoutToMasterInfo, true)
     , _enableFXAA(FXAAInfo, true)
     , _disableHDRPipeline(DisableHDRPipelineInfo, false)
     , _hdrExposure(HDRExposureInfo, 3.7f, 0.01f, 10.f)
@@ -377,6 +386,7 @@ RenderEngine::RenderEngine()
     addProperty(_value);
 
     addProperty(_globalBlackOutFactor);
+    addProperty(_applyBlackoutToMaster);
     addProperty(_screenshotWindowIds);
     addProperty(_applyWarping);
 
@@ -686,8 +696,8 @@ void RenderEngine::render(const glm::mat4& sceneMatrix, const glm::mat4& viewMat
     }
 
     const bool renderingEnabled = delegate.isMaster() ? !_disableMasterRendering : true;
-    if (renderingEnabled && _globalBlackOutFactor > 0.f) {
-        _renderer.render(_scene, _camera, _globalBlackOutFactor);
+    if (renderingEnabled && combinedBlackoutFactor() > 0.f) {
+        _renderer.render(_scene, _camera, combinedBlackoutFactor());
     }
 
     // The CEF webbrowser fix has to be called at least once per frame and we are doing
@@ -755,7 +765,7 @@ void RenderEngine::render(const glm::mat4& sceneMatrix, const glm::mat4& viewMat
         glEnable(GL_BLEND);
         glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
         for (ScreenSpaceRenderable* ssr : ssrs) {
-            ssr->render(_globalBlackOutFactor);
+            ssr->render(combinedBlackoutFactor());
         }
         glDisable(GL_BLEND);
     }
@@ -905,6 +915,15 @@ void RenderEngine::renderDashboard() {
     global::dashboard->render(penPosition);
 }
 
+float RenderEngine::combinedBlackoutFactor() const {
+    if (global::windowDelegate->isMaster()) {
+        return _applyBlackoutToMaster ? _globalBlackOutFactor : 1.f;
+    }
+    else {
+        return _globalBlackOutFactor;
+    }
+}
+
 void RenderEngine::postDraw() {
     ZoneScoped;
 
@@ -930,14 +949,6 @@ ghoul::opengl::OpenGLStateCache& RenderEngine::openglStateCache() {
     return *_openglStateCache;
 }
 
-float RenderEngine::globalBlackOutFactor() const {
-    return _globalBlackOutFactor;
-}
-
-void RenderEngine::setGlobalBlackOutFactor(float opacity) {
-    _globalBlackOutFactor = opacity;
-}
-
 float RenderEngine::hdrExposure() const {
     return _hdrExposure;
 }

From 06a7c692c5fa56d6f69ac34771cb3bd2524bacf3 Mon Sep 17 00:00:00 2001
From: Alexander Bock <mail@alexanderbock.eu>
Date: Thu, 19 Oct 2023 03:48:57 +0200
Subject: [PATCH 150/701] Add special handling for a number of properties in
 the DashboardItemPropertyValue (closes #2899)

---
 data/assets/examples/dashboarditems.asset     | 106 ++++++++-
 .../openspace/navigation/orbitalnavigator.h   |   1 -
 .../dashboard/dashboarditempropertyvalue.cpp  | 204 +++++++++++++++++-
 3 files changed, 291 insertions(+), 20 deletions(-)

diff --git a/data/assets/examples/dashboarditems.asset b/data/assets/examples/dashboarditems.asset
index f6c3b14179..26654ef092 100644
--- a/data/assets/examples/dashboarditems.asset
+++ b/data/assets/examples/dashboarditems.asset
@@ -1,7 +1,6 @@
 local Angle = {
   Type = "DashboardItemAngle",
   Identifier = "Angle",
-  GuiName = "Angle",
   ReferenceType = "Node",
   ReferenceNodeName = "Earth",
   DestinationType = "Node",
@@ -10,8 +9,7 @@ local Angle = {
 
 local Date = {
   Type = "DashboardItemDate",
-  Identifier = "Date",
-  GuiName = "Date"
+  Identifier = "Date"
 }
 
 local SimulationIncrement = {
@@ -22,14 +20,12 @@ local SimulationIncrement = {
 
 local Distance = {
   Type = "DashboardItemDistance",
-  Identifier = "Distance",
-  GuiName = "Distance"
+  Identifier = "Distance"
 }
 
 local Framerate = {
   Type = "DashboardItemFramerate",
-  Identifier = "Framerate",
-  GuiName = "Framerate"
+  Identifier = "Framerate"
 }
 
 local ParallelConnection = {
@@ -40,18 +36,79 @@ local ParallelConnection = {
 
 local Mission = {
   Type = "DashboardItemMission",
-  Identifier = "Mission",
-  GuiName = "Mission"
+  Identifier = "Mission"
 }
 
 local PropertyValue = {
   Type = "DashboardItemPropertyValue",
-  Identifier = "asd",
-  GuiName = "adasd",
+  Identifier = "DashbaordItemPropertyValue",
   URI = "Scene.Earth.Renderable.Enabled",
   DisplayString = "Earth is enabled: {}"
 }
 
+local PropertyValueFloat = {
+  Type = "DashboardItemPropertyValue",
+  Identifier = "DashbaordItemPropertyValue_Float",
+  URI = "Scene.Earth.Renderable.TargetLodScaleFactor",
+  DisplayString = "Earth LOD is {:.5f}"
+}
+
+local PropertyValueDouble = {
+  Type = "DashboardItemPropertyValue",
+  Identifier = "DashbaordItemPropertyValue_Double",
+  URI = "NavigationHandler.PathNavigator.ArrivalDistanceFactor",
+  DisplayString = "Arrival Distance Factor is {:.8f}"
+}
+
+local PropertyValueInt = {
+  Type = "DashboardItemPropertyValue",
+  Identifier = "DashbaordItemPropertyValue_Int",
+  URI = "LuaConsole.HistoryLength",
+  DisplayString = "History length is {}"
+}
+
+local PropertyValueUInt = {
+  Type = "DashboardItemPropertyValue",
+  Identifier = "DashboardItemPropertyValue_UInt",
+  URI = "Modules.Globebrowsing.TileCacheSize",
+  DisplayString = "Tile Cache Size is {}"
+}
+
+local PropertyValueDVec3 = {
+  Type = "DashboardItemPropertyValue",
+  Identifier = "DashboardItemPropertyValue_DVec3",
+  URI = "Scene.SolarSystemBarycenter.Transform.Transform",
+  DisplayString = "SSB Transform is: ({}, {}, {})"
+}
+
+local PropertyValueIVec2 = {
+  Type = "DashboardItemPropertyValue",
+  Identifier = "DashboardItemPropertyValue_IVec2",
+  URI = "Scene.SolarSystemBarycenter.Renderable.ScreenSpacePosition",
+  DisplayString = "Random ScreenSpace Position: ({}, {})"
+}
+
+local PropertyValueVec2 = {
+  Type = "DashboardItemPropertyValue",
+  Identifier = "DashboardItemPropertyValue_Vec2",
+  URI = "Scene.EarthAtmosphere.Renderable.AtmosphereDimmingSunsetAngle",
+  DisplayString = "Sunset Angle is ({}, {})"
+}
+
+local PropertyValueVec3 = {
+  Type = "DashboardItemPropertyValue",
+  Identifier = "DashboardItemPropertyValue_Vec3",
+  URI = "RenderEngine.GlobalRotation",
+  DisplayString = "Global Rotation is ({}, {}, {})"
+}
+
+local PropertyValueVec4 = {
+  Type = "DashboardItemPropertyValue",
+  Identifier = "DashboardItemPropertyValue_Vec4",
+  URI = "LuaConsole.BackgroundColor",
+  DisplayString = "Background Coolor is ({}, {}, {}, {})"
+}
+
 local ElapsedTime = {
   Type = "DashboardItemElapsedTime",
   Identifier = "ElapsedTime",
@@ -73,6 +130,15 @@ asset.onInitialize(function()
   openspace.dashboard.addDashboardItem(ParallelConnection)
   openspace.dashboard.addDashboardItem(Mission)
   openspace.dashboard.addDashboardItem(PropertyValue)
+  openspace.dashboard.addDashboardItem(PropertyValueFloat)
+  openspace.dashboard.addDashboardItem(PropertyValueDouble)
+  openspace.dashboard.addDashboardItem(PropertyValueInt)
+  openspace.dashboard.addDashboardItem(PropertyValueUInt)
+  openspace.dashboard.addDashboardItem(PropertyValueDVec3)
+  openspace.dashboard.addDashboardItem(PropertyValueIVec2)
+  openspace.dashboard.addDashboardItem(PropertyValueVec2)
+  openspace.dashboard.addDashboardItem(PropertyValueVec3)
+  openspace.dashboard.addDashboardItem(PropertyValueVec4)
   openspace.dashboard.addDashboardItem(ElapsedTime)
   openspace.dashboard.addDashboardItem(InputState)
 end)
@@ -80,6 +146,15 @@ end)
 asset.onDeinitialize(function()
   openspace.dashboard.removeDashboardItem(InputState)
   openspace.dashboard.removeDashboardItem(ElapsedTime)
+  openspace.dashboard.removeDashboardItem(PropertyValueVec4)
+  openspace.dashboard.removeDashboardItem(PropertyValueVec3)
+  openspace.dashboard.removeDashboardItem(PropertyValueVec2)
+  openspace.dashboard.removeDashboardItem(PropertyValueIVec2)
+  openspace.dashboard.removeDashboardItem(PropertyValueDVec3)
+  openspace.dashboard.removeDashboardItem(PropertyValueUInt)
+  openspace.dashboard.removeDashboardItem(PropertyValueInt)
+  openspace.dashboard.removeDashboardItem(PropertyValueDouble)
+  openspace.dashboard.removeDashboardItem(PropertyValueFloat)
   openspace.dashboard.removeDashboardItem(PropertyValue)
   openspace.dashboard.removeDashboardItem(Mission)
   openspace.dashboard.removeDashboardItem(ParallelConnection)
@@ -98,6 +173,15 @@ asset.export(Framerate)
 asset.export(ParallelConnection)
 asset.export(Mission)
 asset.export(PropertyValue)
+asset.export(PropertyValueFloat)
+asset.export(PropertyValueDouble)
+asset.export(PropertyValueInt)
+asset.export(PropertyValueUInt)
+asset.export(PropertyValueDVec3)
+asset.export(PropertyValueIVec2)
+asset.export(PropertyValueVec2)
+asset.export(PropertyValueVec3)
+asset.export(PropertyValueVec4)
 asset.export(ElapsedTime)
 asset.export(InputState)
 
diff --git a/include/openspace/navigation/orbitalnavigator.h b/include/openspace/navigation/orbitalnavigator.h
index 99896908c0..0d5f440cb9 100644
--- a/include/openspace/navigation/orbitalnavigator.h
+++ b/include/openspace/navigation/orbitalnavigator.h
@@ -37,7 +37,6 @@
 #include <openspace/properties/stringproperty.h>
 #include <openspace/properties/scalar/boolproperty.h>
 #include <openspace/properties/scalar/floatproperty.h>
-#include <openspace/properties/scalar/doubleproperty.h>
 #include <openspace/properties/triggerproperty.h>
 #include <ghoul/glm.h>
 #include <glm/gtx/quaternion.hpp>
diff --git a/modules/base/dashboard/dashboarditempropertyvalue.cpp b/modules/base/dashboard/dashboarditempropertyvalue.cpp
index 2d24893547..ba0058cfa4 100644
--- a/modules/base/dashboard/dashboarditempropertyvalue.cpp
+++ b/modules/base/dashboard/dashboarditempropertyvalue.cpp
@@ -27,6 +27,24 @@
 #include <openspace/documentation/documentation.h>
 #include <openspace/documentation/verifier.h>
 #include <openspace/engine/globals.h>
+#include <openspace/properties/scalar/intproperty.h>
+#include <openspace/properties/scalar/longproperty.h>
+#include <openspace/properties/scalar/shortproperty.h>
+#include <openspace/properties/scalar/uintproperty.h>
+#include <openspace/properties/scalar/ulongproperty.h>
+#include <openspace/properties/scalar/ushortproperty.h>
+#include <openspace/properties/vector/dvec2property.h>
+#include <openspace/properties/vector/dvec3property.h>
+#include <openspace/properties/vector/dvec4property.h>
+#include <openspace/properties/vector/ivec2property.h>
+#include <openspace/properties/vector/ivec3property.h>
+#include <openspace/properties/vector/ivec4property.h>
+#include <openspace/properties/vector/uvec2property.h>
+#include <openspace/properties/vector/uvec3property.h>
+#include <openspace/properties/vector/uvec4property.h>
+#include <openspace/properties/vector/vec2property.h>
+#include <openspace/properties/vector/vec3property.h>
+#include <openspace/properties/vector/vec4property.h>
 #include <openspace/query/query.h>
 #include <openspace/util/timemanager.h>
 #include <ghoul/font/font.h>
@@ -47,8 +65,11 @@ namespace {
         "DisplayString",
         "Display String",
         "The String that is being displayed. It must either be empty (in which case only "
-        "the value itself will be displayed), or it must contain extact one instance of "
-        "{}, which will be replaced with the value of the property during rendering",
+        "the value itself will be displayed), or it must contain extact one or more "
+        "instances of {}, which will be replaced with the value(s) of the property "
+        "during rendering. For scalar types, there has to be exactly one instance of {}, "
+        "for vector types, there need to be as many {} as there are compoents in the "
+        "vector, for example two {} for vec2 types, three for vec3 types, etc",
         // @VISIBILITY(2.67)
         openspace::properties::Property::Visibility::User
     };
@@ -97,12 +118,179 @@ void DashboardItemPropertyValue::render(glm::vec2& penPosition) {
     }
 
     if (_property) {
-        std::string value = _property->stringValue();
-        RenderFont(
-            *_font,
-            penPosition,
-            fmt::format(fmt::runtime(_displayString.value()), value)
-        );
+        std::string_view type = _property->className();
+        if (type == "DoubleProperty") {
+            double value = static_cast<properties::DoubleProperty*>(_property)->value();
+            RenderFont(
+                *_font,
+                penPosition,
+                fmt::format(fmt::runtime(_displayString.value()), value)
+            );
+        }
+        else if (type == "FloatProperty") {
+            float value = static_cast<properties::FloatProperty*>(_property)->value();
+            RenderFont(
+                *_font,
+                penPosition,
+                fmt::format(fmt::runtime(_displayString.value()), value)
+            );
+        }
+        else if (type == "IntProperty") {
+            int value = static_cast<properties::IntProperty*>(_property)->value();
+            RenderFont(
+                *_font,
+                penPosition,
+                fmt::format(fmt::runtime(_displayString.value()), value)
+            );
+        }
+        else if (type == "LongProperty") {
+            long value = static_cast<properties::LongProperty*>(_property)->value();
+            RenderFont(
+                *_font,
+                penPosition,
+                fmt::format(fmt::runtime(_displayString.value()), value)
+            );
+        }
+        else if (type == "ShortProperty") {
+            short value = static_cast<properties::ShortProperty*>(_property)->value();
+            RenderFont(
+                *_font,
+                penPosition,
+                fmt::format(fmt::runtime(_displayString.value()), value)
+            );
+        }
+        else if (type == "UIntProperty") {
+            unsigned int v = static_cast<properties::UIntProperty*>(_property)->value();
+            RenderFont(
+                *_font,
+                penPosition,
+                fmt::format(fmt::runtime(_displayString.value()), v)
+            );
+        }
+        else if (type == "ULongProperty") {
+            unsigned long v = static_cast<properties::ULongProperty*>(_property)->value();
+            RenderFont(
+                *_font,
+                penPosition,
+                fmt::format(fmt::runtime(_displayString.value()), v)
+            );
+        }
+        else if (type == "UShortProperty") {
+            unsigned short v =
+                static_cast<properties::UShortProperty*>(_property)->value();
+            RenderFont(
+                *_font,
+                penPosition,
+                fmt::format(fmt::runtime(_displayString.value()), v)
+            );
+        }
+        else if (type == "DVec2Property") {
+            glm::dvec2 v = static_cast<properties::DVec2Property*>(_property)->value();
+            RenderFont(
+                *_font,
+                penPosition,
+                fmt::format(fmt::runtime(_displayString.value()), v.x, v.y)
+            );
+        }
+        else if (type == "DVec3Property") {
+            glm::dvec3 v = static_cast<properties::DVec3Property*>(_property)->value();
+            RenderFont(
+                *_font,
+                penPosition,
+                fmt::format(fmt::runtime(_displayString.value()), v.x, v.y, v.z)
+            );
+        }
+        else if (type == "DVec4Property") {
+            glm::dvec4 v = static_cast<properties::DVec4Property*>(_property)->value();
+            RenderFont(
+                *_font,
+                penPosition,
+                fmt::format(fmt::runtime(_displayString.value()), v.x, v.y, v.z, v.w)
+            );
+        }
+        else if (type == "IVec2Property") {
+            glm::ivec2 v = static_cast<properties::IVec2Property*>(_property)->value();
+            RenderFont(
+                *_font,
+                penPosition,
+                fmt::format(fmt::runtime(_displayString.value()), v.x, v.y)
+            );
+        }
+        else if (type == "IVec3Property") {
+            glm::ivec3 v = static_cast<properties::IVec3Property*>(_property)->value();
+            RenderFont(
+                *_font,
+                penPosition,
+                fmt::format(fmt::runtime(_displayString.value()), v.x, v.y, v.z)
+            );
+        }
+        else if (type == "IVec4Property") {
+            glm::ivec4 v = static_cast<properties::IVec4Property*>(_property)->value();
+            RenderFont(
+                *_font,
+                penPosition,
+                fmt::format(fmt::runtime(_displayString.value()), v.x, v.y, v.z, v.w)
+            );
+        }
+        else if (type == "UVec2Property") {
+            glm::uvec2 v = static_cast<properties::UVec2Property*>(_property)->value();
+            RenderFont(
+                *_font,
+                penPosition,
+                fmt::format(fmt::runtime(_displayString.value()), v.x, v.y)
+            );
+        }
+        else if (type == "UVec3Property") {
+            glm::uvec3 v = static_cast<properties::UVec3Property*>(_property)->value();
+            RenderFont(
+                *_font,
+                penPosition,
+                fmt::format(fmt::runtime(_displayString.value()), v.x, v.y, v.z)
+            );
+        }
+        else if (type == "UVec4Property") {
+            glm::uvec4 v = static_cast<properties::UVec4Property*>(_property)->value();
+            RenderFont(
+                *_font,
+                penPosition,
+                fmt::format(fmt::runtime(_displayString.value()), v.x, v.y, v.z, v.w)
+            );
+        }
+        else if (type == "Vec2Property") {
+            glm::vec2 v = static_cast<properties::Vec2Property*>(_property)->value();
+            RenderFont(
+                *_font,
+                penPosition,
+                fmt::format(fmt::runtime(_displayString.value()), v.x, v.y)
+            );
+        }
+        else if (type == "Vec3Property") {
+            glm::vec3 v = static_cast<properties::Vec3Property*>(_property)->value();
+            RenderFont(
+                *_font,
+                penPosition,
+                fmt::format(fmt::runtime(_displayString.value()), v.x, v.y, v.z)
+            );
+        }
+        else if (type == "Vec4Property") {
+            glm::vec4 v = static_cast<properties::Vec4Property*>(_property)->value();
+            RenderFont(
+                *_font,
+                penPosition,
+                fmt::format(fmt::runtime(_displayString.value()), v.x, v.y, v.z, v.w)
+            );
+        }
+        else {
+            // Fallback if we don't have a special case above
+
+            std::string value = _property->stringValue();
+            RenderFont(
+                *_font,
+                penPosition,
+                fmt::format(fmt::runtime(_displayString.value()), value)
+            );
+        }
+
         penPosition.y -= _font->height();
     }
 }

From b43a13d39e5a251f1de42e898b003cd0fc0b71ef Mon Sep 17 00:00:00 2001
From: Alexander Bock <alexander.bock@liu.se>
Date: Thu, 19 Oct 2023 11:59:25 +0200
Subject: [PATCH 151/701] Merge asset.localResource and asset.syncedResource
 (#2906)

---
 .../educational/scale/arc_de_triomphe.asset   |   2 +-
 data/assets/educational/scale/big_ben.asset   |   2 +-
 .../educational/scale/burj_khalifa.asset      |   2 +-
 .../educational/scale/eiffeltower.asset       |   2 +-
 .../scale/empire_state_building.asset         |   2 +-
 .../educational/scale/gateway_arch.asset      |   2 +-
 .../scale/golden_gate_bridge.asset            |   2 +-
 .../scale/kuala_lumpur_tower.asset            |   2 +-
 data/assets/educational/scale/rose_bowl.asset |   2 +-
 .../assets/educational/scale/school_bus.asset |   2 +-
 data/assets/educational/scale/scientist.asset |   2 +-
 .../educational/scale/statue_of_liberty.asset |   2 +-
 data/assets/examples/animation.asset          |   2 +-
 data/assets/examples/approachevents.asset     |   2 +-
 .../assets/examples/galaxyshader/volume.asset |   4 +-
 .../geojson_extruded_shaded_polygon.asset     |   2 +-
 .../examples/geojson/geojson_lines.asset      |   2 +-
 .../geojson/geojson_multiple_polygons.asset   |   2 +-
 .../examples/geojson/geojson_points.asset     |   2 +-
 .../geojson/geojson_points_outfacing.asset    |   2 +-
 .../geojson/geojson_polygons_with_holes.asset |   2 +-
 .../examples/geojson/geojson_roverpath.asset  |   2 +-
 .../geojson_toronto_neighborhoods.asset       |   2 +-
 data/assets/examples/globerotation.asset      |   2 +-
 data/assets/examples/globetranslation.asset   |   2 +-
 .../examples/modelshader/modelshader.asset    |   6 +-
 .../examples/temperature_land_highres.asset   |   2 +-
 data/assets/examples/urlsynchronization.asset |  10 +-
 data/assets/examples/video/videoglobe.asset   |   2 +-
 data/assets/examples/video/videoplane.asset   |   2 +-
 .../examples/video/videoscreenspace.asset     |   2 +-
 data/assets/examples/video/videosphere.asset  |   2 +-
 .../examples/video/videostretchedtotime.asset |   2 +-
 .../examples/volume/generated/cartesian.asset |   4 +-
 .../volume/generated/cartesiansequence.asset  |   4 +-
 .../examples/volume/generated/spherical.asset |   4 +-
 data/assets/global/openspacebookmarks.asset   |   2 +-
 data/assets/gui/images.asset                  |   6 +-
 .../modules/exoplanets/exoplanets_data.asset  |   4 +-
 .../exoplanets/exoplanets_textures.asset      |   4 +-
 .../modules/skybrowser/hover_circle.asset     |   2 +-
 .../assets/nightsky/cardinal_directions.asset |   2 +-
 data/assets/nightsky/ecliptic_band.asset      |   2 +-
 data/assets/nightsky/light_pollution.asset    |   2 +-
 data/assets/nightsky/planets.asset            |   2 +-
 data/assets/nightsky/zenith.asset             |   2 +-
 data/assets/scene/digitaluniverse/2dF.asset   |   4 +-
 data/assets/scene/digitaluniverse/2mass.asset |   4 +-
 data/assets/scene/digitaluniverse/6dF.asset   |   4 +-
 data/assets/scene/digitaluniverse/abell.asset |   4 +-
 .../digitaluniverse/alternatestarlabels.asset |   2 +-
 .../digitaluniverse/backgroundradiation.asset |   4 +-
 .../backgroundradiation_multiverse.asset      |   2 +-
 .../scene/digitaluniverse/clusters.asset      |   2 +-
 .../digitaluniverse/constellationbounds.asset |   2 +-
 .../digitaluniverse/constellations.asset      |   2 +-
 .../scene/digitaluniverse/deepsky.asset       |   4 +-
 .../assets/scene/digitaluniverse/dwarfs.asset |   4 +-
 .../scene/digitaluniverse/exoplanets.asset    |   4 +-
 .../exoplanets_candidates.asset               |   4 +-
 .../digitaluniverse/globularclusters.asset    |   4 +-
 data/assets/scene/digitaluniverse/grids.asset |   2 +-
 .../assets/scene/digitaluniverse/groups.asset |   2 +-
 .../scene/digitaluniverse/h2regions.asset     |   4 +-
 data/assets/scene/digitaluniverse/hdf.asset   |   6 +-
 .../scene/digitaluniverse/localdwarfs.asset   |   4 +-
 .../scene/digitaluniverse/milkyway.asset      |   4 +-
 .../digitaluniverse/milkyway_arm_labels.asset |   4 +-
 .../digitaluniverse/milkyway_label.asset      |   2 +-
 .../digitaluniverse/milkyway_sphere.asset     |   2 +-
 .../digitaluniverse/obassociations.asset      |   4 +-
 .../scene/digitaluniverse/openclusters.asset  |   4 +-
 .../digitaluniverse/planetarynebulae.asset    |   4 +-
 .../scene/digitaluniverse/pulsars.asset       |   4 +-
 .../scene/digitaluniverse/quasars.asset       |   6 +-
 data/assets/scene/digitaluniverse/sdss.asset  |   4 +-
 .../scene/digitaluniverse/starlabels.asset    |   2 +-
 .../scene/digitaluniverse/starorbits.asset    |   2 +-
 data/assets/scene/digitaluniverse/stars.asset |   8 +-
 .../scene/digitaluniverse/superclusters.asset |   4 +-
 .../digitaluniverse/supernovaremnants.asset   |   4 +-
 data/assets/scene/digitaluniverse/tully.asset |   4 +-
 data/assets/scene/digitaluniverse/voids.asset |   2 +-
 .../constellations/constellation_art.asset    |   6 +-
 data/assets/scene/milkyway/gaia/apogee.asset  |   6 +-
 .../gaia/gaia_dr2_download_stars.asset        |   4 +-
 .../scene/milkyway/gaia/gaiastars.asset       |   6 +-
 data/assets/scene/milkyway/gaia/galah.asset   |   6 +-
 .../habitable_zone_textures.asset             |   2 +-
 data/assets/scene/milkyway/milkyway/eso.asset |   2 +-
 .../scene/milkyway/milkyway/volume.asset      |   2 +-
 .../objects/orionnebula/cluster.asset         |   2 +-
 .../milkyway/objects/orionnebula/nebula.asset |   2 +-
 data/assets/scene/milkyway/stars/denver.asset |   6 +-
 .../dwarf_planets/ceres/kernels.asset         |   2 +-
 .../ceres/layers/colorlayers/lamo.asset       |   2 +-
 .../ceres/layers/colorlayers/lamo_local.asset |   2 +-
 .../dwarf_planets/eris/planet.asset           |   2 +-
 .../dwarf_planets/haumea/planet.asset         |   2 +-
 .../dwarf_planets/makemake/planet.asset       |   2 +-
 .../dwarf_planets/pluto/charon/charon.asset   |   2 +-
 .../dwarf_planets/pluto/kernels.asset         |   2 +-
 .../dwarf_planets/pluto/pluto.asset           |   2 +-
 .../dwarf_planets/vesta/planet.asset          |   2 +-
 .../sun_earth_2012_fieldlines_batsrus.asset   |   4 +-
 .../sun_earth_2012_fieldlines_enlil.asset     |   4 +-
 .../2012/sun_earth_2012_fieldlines_pfss.asset |   4 +-
 .../bastille_day/density_volume.asset         |   4 +-
 .../heliosphere/bastille_day/fieldlines.asset |   6 +-
 .../heliosphere/bastille_day/fluxnodes.asset  |   4 +-
 .../bastille_day/fluxnodescutplane.asset      |   4 +-
 .../bastille_day/fluxnodeslegend.asset        |   2 +-
 .../bastille_day/magnetogram.asset            |   2 +-
 .../interstellar/c-2019_q4_borisov.asset      |   2 +-
 .../solarsystem/interstellar/oumuamua.asset   |   2 +-
 .../missions/apollo/11/apollo11.asset         |   4 +-
 .../missions/apollo/11/kernels.asset          |   2 +-
 .../solarsystem/missions/apollo/11/lem.asset  |   2 +-
 .../missions/apollo/11/lem_flipbook.asset     |   2 +-
 .../missions/apollo/15/apollo15.asset         |   2 +-
 .../missions/apollo/15/kernels.asset          |   2 +-
 .../missions/apollo/17/bouldersstation2.asset |   2 +-
 .../missions/apollo/17/bouldersstation6.asset |   2 +-
 .../missions/apollo/17/bouldersstation7.asset |   2 +-
 .../solarsystem/missions/apollo/17/lem.asset  |   2 +-
 .../missions/apollo/8/kernels.asset           |   2 +-
 .../missions/apollo/8/launch_model.asset      |   2 +-
 .../solarsystem/missions/apollo/8/model.asset |   2 +-
 .../apollo/apollo_globebrowsing.asset         |   8 +-
 .../missions/apollo/insignias_map.asset       |   2 +-
 .../solarsystem/missions/artemis/model.asset  |   2 +-
 .../solarsystem/missions/artemis/trail.asset  |   2 +-
 .../missions/artemis/transforms.asset         |   2 +-
 .../solarsystem/missions/dawn/dawn.asset      |   6 +-
 .../solarsystem/missions/dawn/vesta.asset     |   8 +-
 .../solarsystem/missions/insight/edl.asset    |   4 +-
 .../missions/juice/fieldlines.asset           |   4 +-
 .../solarsystem/missions/juice/kernels.asset  |   2 +-
 .../solarsystem/missions/juice/model.asset    |   2 +-
 .../solarsystem/missions/juice/plane.asset    |   2 +-
 .../solarsystem/missions/juno/juno.asset      |   2 +-
 .../solarsystem/missions/juno/kernels.asset   |   2 +-
 .../missions/messenger/kernels.asset          |   2 +-
 .../messenger/mercurymagnetosphere.asset      |   2 +-
 .../missions/messenger/messenger.asset        |   2 +-
 .../missions/newhorizons/charon.asset         |   2 +-
 .../missions/newhorizons/kernels.asset        |   2 +-
 .../missions/newhorizons/label.asset          |   2 +-
 .../missions/newhorizons/model.asset          |   2 +-
 .../missions/newhorizons/othermoons.asset     |   8 +-
 .../missions/newhorizons/pluto.asset          |   8 +-
 .../missions/osirisrex/bennu.asset            |   2 +-
 .../missions/osirisrex/bennu_projection.asset |   6 +-
 .../missions/osirisrex/imageplane.asset       |   2 +-
 .../missions/osirisrex/kernels.asset          |   2 +-
 .../missions/osirisrex/model.asset            |   2 +-
 .../missions/perseverance/model.asset         |   2 +-
 .../missions/perseverance/spice.asset         |   2 +-
 .../missions/pioneer/pioneer10.asset          |   2 +-
 .../missions/pioneer/pioneer11.asset          |   2 +-
 .../missions/pioneer/pioneermodel.asset       |   2 +-
 .../solarsystem/missions/rosetta/67p.asset    |   6 +-
 .../missions/rosetta/rosetta.asset            |   4 +-
 .../missions/voyager/voyager1.asset           |   4 +-
 .../missions/voyager/voyager2.asset           |   4 +-
 .../voyager1_2__pioneer10_11.asset            |   4 +-
 .../solarsystem/planets/earth/earth.asset     |   2 +-
 .../eclipses/corona/corona20170821.asset      |   2 +-
 .../earth/eclipses/paths/annular_data.asset   |   2 +-
 .../earth/eclipses/paths/hybrid_data.asset    |   2 +-
 .../earth/eclipses/paths/total_data.asset     |   2 +-
 .../planets/earth/lagrange_points/l1.asset    |   4 +-
 .../planets/earth/lagrange_points/l2.asset    |   4 +-
 .../planets/earth/lagrange_points/l4.asset    |   4 +-
 .../planets/earth/lagrange_points/l5.asset    |   4 +-
 .../layers/colorlayers/blue_marble.asset      |   2 +-
 .../layers/colorlayers/bmng_newyork.asset     |   2 +-
 .../layers/colorlayers/bmng_sweden.asset      |   2 +-
 .../earth/layers/colorlayers/bmng_utah.asset  |   2 +-
 .../colorlayers/esri_noaa20_combo.asset       |   2 +-
 .../layers/colorlayers/esri_viirs_combo.asset |   2 +-
 .../colorlayers/esri_world_imagery.asset      |   2 +-
 .../heightlayers/blue_marble_height.asset     |   2 +-
 .../layers/heightlayers/terrain_tileset.asset |   2 +-
 .../nightlayers/earth_at_night_2012.asset     |   2 +-
 .../nightlayers/earth_night_texture.asset     |   2 +-
 .../earth/layers/overlays/coastlines.asset    |   2 +-
 .../layers/overlays/reference_features.asset  |   2 +-
 .../layers/overlays/reference_labels.asset    |   2 +-
 .../layers/watermasks/gebco_newyork.asset     |   2 +-
 .../layers/watermasks/gebco_sweden.asset      |   2 +-
 .../earth/layers/watermasks/gebco_utah.asset  |   2 +-
 .../layers/watermasks/modis_water_mask.asset  |   2 +-
 .../earth/magnetosphere/magnetosphere.asset   |   4 +-
 .../transforms_magnetosphere.asset            |   2 +-
 .../solarsystem/planets/earth/markers.asset   |   2 +-
 .../apollo_15_metric_newyork.asset            |   2 +-
 .../colorlayers/clemuvvis_newyork.asset       |   2 +-
 .../layers/colorlayers/clemuvvis_sweden.asset |   2 +-
 .../layers/colorlayers/clemuvvis_utah.asset   |   2 +-
 .../layers/colorlayers/kaguya_newyork.asset   |   2 +-
 .../layers/colorlayers/kaguya_sweden.asset    |   2 +-
 .../moon/layers/colorlayers/kaguya_utah.asset |   2 +-
 .../colorlayers/lo_mr_mosaic_newyork.asset    |   2 +-
 .../colorlayers/lo_mr_mosaic_sweden.asset     |   2 +-
 .../colorlayers/lola_clr_shade_newyork.asset  |   2 +-
 .../colorlayers/lola_clr_shade_sweden.asset   |   2 +-
 .../colorlayers/lola_clr_shade_utah.asset     |   2 +-
 .../colorlayers/lola_shade_newyork.asset      |   2 +-
 .../colorlayers/lola_shade_sweden.asset       |   2 +-
 .../layers/colorlayers/lola_shade_utah.asset  |   2 +-
 .../layers/colorlayers/moon_texture.asset     |   2 +-
 .../colorlayers/uvvishybrid_newyork.asset     |   2 +-
 .../colorlayers/uvvishybrid_sweden.asset      |   2 +-
 .../layers/colorlayers/uvvishybrid_utah.asset |   2 +-
 .../moon/layers/colorlayers/wac_newyork.asset |   2 +-
 .../moon/layers/colorlayers/wac_sweden.asset  |   2 +-
 .../moon/layers/colorlayers/wac_utah.asset    |   2 +-
 .../layers/colorlayers/wac_v1_newyork.asset   |   2 +-
 .../layers/colorlayers/wac_v1_sweden.asset    |   2 +-
 .../moon/layers/colorlayers/wac_v1_utah.asset |   2 +-
 .../layers/heightlayers/loladem_newyork.asset |   2 +-
 .../layers/heightlayers/loladem_sweden.asset  |   2 +-
 .../layers/heightlayers/loladem_utah.asset    |   2 +-
 .../planets/earth/moon/markers.asset          |   2 +-
 .../solarsystem/planets/earth/moon/moon.asset |   2 +-
 .../nasa-treks/Apollo_15_Metric_Cam_DEM.asset |   8 +-
 .../nasa-treks/Apollo_15_Pan_Cam_DEM.asset    |   6 +-
 .../Apollo_15_Pan_Cam_Image_Mosaic.asset      |   6 +-
 .../nasa-treks/Apollo_16_Metric_Cam_DEM.asset |   6 +-
 .../nasa-treks/Apollo_17_Metric_Cam_DEM.asset |   4 +-
 .../nasa-treks/Apollo_Zone_Metric_Cam.asset   |   2 +-
 .../Apollo_Zone_Metric_Cam_DEM.asset          |   2 +-
 .../earth/moon/nasa-treks/Global.asset        |  38 +++---
 .../Kaguya_LGM2011_Freeair_Gravity.asset      |   4 +-
 .../Kaguya_LGM2011_Surface_Gravity.asset      |   4 +-
 .../nasa-treks/LOLA_Roughness_16ppd.asset     |   2 +-
 .../moon/nasa-treks/LOLA_Slope_16ppd.asset    |   2 +-
 .../LOLA_Slope_Northpole_120m.asset           |   2 +-
 .../LOLA_Slope_Southpole_120m.asset           |   2 +-
 .../LOLA_and_TC_Stereo_DEM_Merge_512ppd.asset |   2 +-
 ..._of_Region_Inside_Schrodinger_Crater.asset |   2 +-
 ...trolled_Mosaic_of_Schrodinger_Crater.asset |   2 +-
 .../nasa-treks/LRO_Diviner_CF_Mosaic.asset    |   2 +-
 .../LRO_Diviner_CF_Mosaic_128ppd.asset        |   2 +-
 .../LRO_Diviner_Surface_Temp_Avg.asset        |   2 +-
 .../LRO_Diviner_Surface_Temp_Normal_Avg.asset |   2 +-
 ...er_Surface_Temperature_Mosaic_128ppd.asset |   2 +-
 .../earth/moon/nasa-treks/LRO_LOLA_DEM.asset  |  14 +-
 .../LRO_LROC_Crater_Abundance.asset           |  46 +++----
 .../LRO_LROC_Crater_Abundance_Hazard.asset    |  46 +++----
 .../nasa-treks/LRO_LROC_Crater_Density.asset  |  46 +++----
 .../LRO_LROC_Crater_Density_Hazard.asset      |  46 +++----
 .../earth/moon/nasa-treks/LRO_LROC_DEM.asset  |  86 ++++++------
 .../nasa-treks/LRO_LROC_Image_Mosaic.asset    |  68 +++++-----
 .../LRO_LROC_Image_Mosaic_26cm.asset          |   2 +-
 .../LRO_LROC_Image_Mosaic_28cm.asset          |   2 +-
 .../moon/nasa-treks/LRO_LROC_Mosaic.asset     |   2 +-
 .../LRO_LROC_NAC_Image_Mosaic.asset           |   4 +-
 .../nasa-treks/LRO_LROC_Rock_Abundance.asset  |  46 +++----
 .../LRO_LROC_Rock_Abundance_Hazard.asset      |  46 +++----
 .../nasa-treks/LRO_LROC_Rock_Density.asset    |  48 +++----
 .../LRO_LROC_Rock_Density_Hazard.asset        |  44 +++---
 .../moon/nasa-treks/LRO_Laser_Altimeter.asset |   2 +-
 ..._Mini-RF_Circular_Polarization_Ratio.asset |   2 +-
 .../nasa-treks/LRO_NAC_ColorHillshade.asset   |   2 +-
 .../moon/nasa-treks/LRO_NAC_Mosaic.asset      |   2 +-
 .../nasa-treks/LRO_NAC_Mosaic_0.5mpp.asset    |   2 +-
 .../moon/nasa-treks/LRO_NAC_Mosaic_1mpp.asset |   2 +-
 .../nasa-treks/LRO_NAC_PSR_Mosaic_20mpp.asset |   4 +-
 .../LRO_NAC_and_CE-2_CCD_Mosaic_1mpp.asset    |   2 +-
 .../nasa-treks/LRO_Narrow_Angle_Camera.asset  |  50 +++----
 .../moon/nasa-treks/LRO_WAC-GLD100_DEM.asset  |   2 +-
 .../moon/nasa-treks/LRO_WAC_GLD100_DEM.asset  |   4 +-
 ..._Kaguya_Multi_Instruments_1895.21mpp.asset |  10 +-
 .../atmosphere/2000_carbon_monoxide.asset     |   2 +-
 .../atmosphere/2004_ir_hurricane.asset        |   2 +-
 .../atmosphere/2005_hurricane-grayir.asset    |   2 +-
 .../atmosphere/2005_hurricane-wvsst.asset     |   2 +-
 .../noaa-sos/atmosphere/2012_hurricane.asset  |   2 +-
 .../atmosphere/aerosol_blackcarbon.asset      |   2 +-
 .../aerosol_blackcarbon_and_sulfate.asset     |   2 +-
 .../noaa-sos/atmosphere/aerosol_sulfate.asset |   2 +-
 .../noaa-sos/atmosphere/airtraffic.asset      |   2 +-
 .../earth/noaa-sos/atmosphere/all_sats.asset  |   2 +-
 .../noaa-sos/atmosphere/aqua_swath.asset      |   2 +-
 .../noaa-sos/atmosphere/carbonflux.asset      |   2 +-
 .../carbontracker_2000_2100-fixed_scale.asset |   2 +-
 ...arbontracker_2000_2100-sliding_scale.asset |   2 +-
 .../noaa-sos/atmosphere/climate_niche.asset   |   2 +-
 .../earth/noaa-sos/atmosphere/co_gmd.asset    |   2 +-
 .../earth/noaa-sos/atmosphere/fim_chem.asset  |   2 +-
 .../noaa-sos/atmosphere/fossil_fuel.asset     |   2 +-
 .../earth/noaa-sos/atmosphere/fukushima.asset |   2 +-
 .../earth/noaa-sos/atmosphere/geo_sat.asset   |   2 +-
 .../earth/noaa-sos/atmosphere/geo_scan.asset  |   2 +-
 .../noaa-sos/atmosphere/giss_temp_anom.asset  |   2 +-
 .../atmosphere/globe-insolation.asset         |   2 +-
 .../noaa-sos/atmosphere/globe-rainfall.asset  |   2 +-
 .../atmosphere/harvey-clouds_precip.asset     |   2 +-
 .../atmosphere/hurricane_season_2017.asset    |   2 +-
 .../hurricane_season_2017_wvsst.asset         |   2 +-
 .../hurricane_tracks-cumulative.asset         |   2 +-
 .../earth/noaa-sos/atmosphere/isaac.asset     |   2 +-
 .../earth/noaa-sos/atmosphere/iss_track.asset |   2 +-
 .../earth/noaa-sos/atmosphere/land_temp.asset |   2 +-
 .../earth/noaa-sos/atmosphere/lightning.asset |   2 +-
 .../noaa-sos/atmosphere/ltg_vaisala.asset     |   2 +-
 .../earth/noaa-sos/atmosphere/nasa_sats.asset |   2 +-
 .../atmosphere/nccs_models-carbon.asset       |   2 +-
 .../atmosphere/nccs_models-chem.asset         |   2 +-
 .../atmosphere/nccs_models-winds.asset        |   2 +-
 .../earth/noaa-sos/atmosphere/no2_omsi.asset  |   2 +-
 .../noaa-sos/atmosphere/noaa_sat-tracks.asset |   2 +-
 .../earth/noaa-sos/atmosphere/pclim.asset     |   2 +-
 .../earth/noaa-sos/atmosphere/poes_sat.asset  |   2 +-
 .../atmosphere/reanalysis-antarctic.asset     |   2 +-
 .../atmosphere/reanalysis-elnino.asset        |   2 +-
 .../atmosphere/reanalysis-hurricane.asset     |   2 +-
 .../earth/noaa-sos/atmosphere/sandy.asset     |   2 +-
 .../noaa-sos/atmosphere/sunsync_sat.asset     |   2 +-
 .../earth/noaa-sos/atmosphere/temp_anom.asset |   2 +-
 .../atmosphere/tropical_widening.asset        |   2 +-
 .../atmosphere/typhoon_haiyan-wvsst.asset     |   2 +-
 .../noaa-sos/atmosphere/typhoon_haiyan.asset  |   2 +-
 .../noaa-sos/atmosphere/volcano_ash.asset     |   2 +-
 .../noaa-sos/land/agriculture-cropland.asset  |   2 +-
 .../land/agriculture-pastureland.asset        |   2 +-
 .../planets/earth/noaa-sos/land/birds.asset   |   2 +-
 .../land/blue_marble-blue_marble.asset        |   2 +-
 .../land/blue_marble-blue_marble_topo.asset   |   2 +-
 .../blue_marble-blue_marble_topo_bathy.asset  |   2 +-
 .../land/blue_marble-nightlights.asset        |   2 +-
 .../blue_marble-seasonal_blue_marble.asset    |   2 +-
 .../earth/noaa-sos/land/dams-global.asset     |   2 +-
 .../noaa-sos/land/dams-mississippi.asset      |   2 +-
 .../earth/noaa-sos/land/dams-yangtze.asset    |   2 +-
 .../noaa-sos/land/day_night-06z_only.asset    |   2 +-
 .../noaa-sos/land/day_night-full_year.asset   |   2 +-
 .../noaa-sos/land/day_night-oneday.asset      |   2 +-
 .../noaa-sos/land/earth_night-1992_2002.asset |   2 +-
 .../noaa-sos/land/earth_night-1992_2008.asset |   2 +-
 .../noaa-sos/land/earth_night-1992_2009.asset |   2 +-
 .../noaa-sos/land/earth_night-2012.asset      |   2 +-
 .../land/earth_night-color_nightlights.asset  |   2 +-
 .../land/earth_night-nightlights.asset        |   2 +-
 .../land/earthquake-1980_1995_quakes.asset    |   2 +-
 .../noaa-sos/land/earthquake-2001_2015.asset  |   2 +-
 .../noaa-sos/land/earthquakes_1901_2000.asset |   2 +-
 .../land/earthquakes_and_eruptions.asset      |   2 +-
 .../earths_magnetism_magnetic_lines.asset     |   2 +-
 .../land/earths_magnetism_magnets.asset       |   2 +-
 .../planets/earth/noaa-sos/land/etopo1.asset  |   2 +-
 .../noaa-sos/land/etopo2-earth_bright.asset   |   2 +-
 .../noaa-sos/land/etopo2-earth_color.asset    |   2 +-
 .../noaa-sos/land/etopo2-earth_shaded.asset   |   2 +-
 .../noaa-sos/land/etopo2-earth_topo.asset     |   2 +-
 .../earth/noaa-sos/land/etopo2-landsat.asset  |   2 +-
 .../planets/earth/noaa-sos/land/fire.asset    |   2 +-
 .../earth/noaa-sos/land/fire_veg.asset        |   2 +-
 .../land/flooding-displaced_250.asset         |   2 +-
 .../earth/noaa-sos/land/flooding-fatal.asset  |   2 +-
 .../noaa-sos/land/flooding-heavy_rain.asset   |   2 +-
 .../noaa-sos/land/flooding-major_floods.asset |   2 +-
 .../earth/noaa-sos/land/food_v_feed.asset     |   2 +-
 .../planets/earth/noaa-sos/land/forests.asset |   2 +-
 .../noaa-sos/land/geomag_tracklines.asset     |   2 +-
 .../noaa-sos/land/global_vegetation.asset     |   2 +-
 .../earth/noaa-sos/land/gray_earth.asset      |   2 +-
 .../earth/noaa-sos/land/hot_topo.asset        |   2 +-
 .../noaa-sos/land/irsat_nightlights.asset     |   2 +-
 .../earth/noaa-sos/land/japan_quake.asset     |   2 +-
 .../koppen_climate-koppen_1901_2100.asset     |   2 +-
 .../land/koppen_climate-koppen_2007.asset     |   2 +-
 .../noaa-sos/land/land_cover-animation.asset  |   2 +-
 .../noaa-sos/land/land_cover-ribbon.asset     |   2 +-
 .../noaa-sos/land/land_cover-slideshow.asset  |   2 +-
 .../land_production-cropland_current.asset    |   2 +-
 .../land_production-cropland_potential.asset  |   2 +-
 .../land/land_production-production_gap.asset |   2 +-
 .../earth/noaa-sos/land/land_ratio.asset      |   2 +-
 .../noaa-sos/land/latitude_longitude.asset    |   2 +-
 .../noaa-sos/land/magnetic_declination.asset  |   2 +-
 .../earth/noaa-sos/land/nightsky.asset        |   2 +-
 .../noaa-sos/land/nuclear_earthquake.asset    |   2 +-
 .../earth/noaa-sos/land/paleo_map.asset       |   2 +-
 .../earth/noaa-sos/land/paleo_overlays.asset  |   2 +-
 .../noaa-sos/land/pantropical_biomass.asset   |   2 +-
 .../earth/noaa-sos/land/plate_movement.asset  |   2 +-
 .../noaa-sos/land/river_discharge_2010.asset  |   2 +-
 .../land/sea_floor_age-iso_lines_yellow.asset |   2 +-
 .../land/sea_floor_age-shaded_veg.asset       |   2 +-
 .../noaa-sos/land/sea_floor_age-topo.asset    |   2 +-
 .../land/seismic_waves-1994northridge.asset   |   2 +-
 .../land/species_richness-amphibians.asset    |   2 +-
 ...ecies_richness-amphibians_threatened.asset |   2 +-
 .../land/species_richness-birds.asset         |   2 +-
 .../species_richness-birds_threatened.asset   |   2 +-
 .../land/species_richness-mammals.asset       |   2 +-
 .../species_richness-mammals_threatened.asset |   2 +-
 .../noaa-sos/land/surface_temperature.asset   |   2 +-
 .../earth/noaa-sos/land/top_quakes.asset      |   2 +-
 .../noaa-sos/land/volcanoes-eruptions.asset   |   2 +-
 .../land/volcanoes-global_volcanoes.asset     |   2 +-
 .../noaa-sos/land/volcanoes-tsunami.asset     |   2 +-
 .../earth/noaa-sos/models/bm10000.asset       |   2 +-
 .../earth/noaa-sos/models/gfdl_seaice.asset   |   2 +-
 .../noaa-sos/models/ipcc_temp-ccsm-a1b.asset  |   2 +-
 .../noaa-sos/models/ipcc_temp-ccsm-b1.asset   |   2 +-
 .../noaa-sos/models/ipcc_temp-compare.asset   |   2 +-
 .../noaa-sos/models/ipcc_temp-gfdl-a1b.asset  |   2 +-
 .../noaa-sos/models/ipcc_temp-gfdl-b1.asset   |   2 +-
 .../noaa-sos/models/ipcc_temp-had-a1b.asset   |   2 +-
 .../noaa-sos/models/ipcc_temp-had-b1.asset    |   2 +-
 .../earth/noaa-sos/models/rcp-ga26.asset      |   2 +-
 .../earth/noaa-sos/models/rcp-ga45.asset      |   2 +-
 .../earth/noaa-sos/models/rcp-ga60.asset      |   2 +-
 .../earth/noaa-sos/models/rcp-ga85.asset      |   2 +-
 .../earth/noaa-sos/models/ukmet-a1b.asset     |   2 +-
 .../earth/noaa-sos/models/ukmet-e1.asset      |   2 +-
 .../noaa-sos/oceans/2009_ice_animation.asset  |   2 +-
 .../oceans/6m_sea_level_rise-black.asset      |   2 +-
 .../oceans/6m_sea_level_rise-red.asset        |   2 +-
 .../noaa-sos/oceans/animal_tracking.asset     |   2 +-
 .../noaa-sos/oceans/argo_buoy_tracks.asset    |   2 +-
 .../noaa-sos/oceans/argo_buoy_waterfall.asset |   2 +-
 .../earth/noaa-sos/oceans/atl_turtle.asset    |   2 +-
 .../noaa-sos/oceans/buoy_locations.asset      |   2 +-
 .../earth/noaa-sos/oceans/catch_model.asset   |   2 +-
 .../noaa-sos/oceans/chlorophyll_model.asset   |   2 +-
 .../earth/noaa-sos/oceans/currents.asset      |   2 +-
 .../earth/noaa-sos/oceans/dart_buoy.asset     |   2 +-
 .../noaa-sos/oceans/ecco2_sst-gray_land.asset |   2 +-
 .../noaa-sos/oceans/ecco2_sst-veg_land.asset  |   2 +-
 .../earth/noaa-sos/oceans/elnino.asset        |   2 +-
 .../oceans/gfdl_sst-black_background.asset    |   2 +-
 .../oceans/gfdl_sst-land_background.asset     |   2 +-
 .../noaa-sos/oceans/greenland_melt.asset      |   2 +-
 .../earth/noaa-sos/oceans/japan_tsunami.asset |   2 +-
 .../noaa-sos/oceans/japan_tsunami_waves.asset |   2 +-
 .../oceans/loggerheadseaturtletracks.asset    |   2 +-
 .../noaa-sos/oceans/marine_impacts.asset      |   2 +-
 .../oceans/marine_life_tracking.asset         |   2 +-
 .../oceans/mexico_turtles_947293.asset        |   2 +-
 .../oceans/mexico_turtles_958002.asset        |   2 +-
 .../earth/noaa-sos/oceans/modis_sst.asset     |   2 +-
 .../earth/noaa-sos/oceans/nasa_speed.asset    |   2 +-
 .../earth/noaa-sos/oceans/nasa_sst.asset      |   2 +-
 .../noaa-sos/oceans/ocean_acid-co2_flux.asset |   2 +-
 .../earth/noaa-sos/oceans/ocean_acid-ph.asset |   2 +-
 .../oceans/ocean_acid-saturation.asset        |   2 +-
 .../noaa-sos/oceans/ocean_depths_temp.asset   |   2 +-
 .../noaa-sos/oceans/ocean_drain-gray.asset    |   2 +-
 .../earth/noaa-sos/oceans/pac_turtle.asset    |   2 +-
 .../earth/noaa-sos/oceans/phytoplankton.asset |   2 +-
 .../earth/noaa-sos/oceans/pr_tsunami.asset    |   2 +-
 .../earth/noaa-sos/oceans/reefs_risk.asset    |   2 +-
 .../earth/noaa-sos/oceans/sea_level.asset     |   2 +-
 .../noaa-sos/oceans/sea_level_trends.asset    |   2 +-
 .../oceans/sea_surface_height_anomaly.asset   |   2 +-
 .../noaa-sos/oceans/seaice_monthly.asset      |   2 +-
 .../noaa-sos/oceans/seaice_radiation.asset    |   2 +-
 .../oceans/seawifs-land_background.asset      |   2 +-
 .../noaa-sos/oceans/seawifs-no_holes.asset    |   2 +-
 .../noaa-sos/oceans/seawifs-polar_holes.asset |   2 +-
 .../planets/earth/noaa-sos/oceans/shark.asset |   2 +-
 .../noaa-sos/oceans/ship_tracks-mosaic.asset  |   2 +-
 .../noaa-sos/oceans/ship_tracks-tracks.asset  |   2 +-
 .../earth/noaa-sos/oceans/shipping.asset      |   2 +-
 .../noaa-sos/oceans/species_richness.asset    |   2 +-
 .../planets/earth/noaa-sos/oceans/sss.asset   |   2 +-
 .../earth/noaa-sos/oceans/sst_1980_1999.asset |   2 +-
 .../tsunami_historical_series-alaska.asset    |   2 +-
 .../tsunami_historical_series-aleutians.asset |   2 +-
 ...ami_historical_series-aleutians_1957.asset |   2 +-
 .../tsunami_historical_series-cascadia.asset  |   2 +-
 .../tsunami_historical_series-chile.asset     |   2 +-
 .../tsunami_historical_series-japan.asset     |   2 +-
 .../tsunami_historical_series-lisbon.asset    |   2 +-
 .../tsunami_historical_series-samoa.asset     |   2 +-
 .../tsunami_historical_series-sumatra.asset   |   2 +-
 .../noaa-sos/oceans/tsunami_locations.asset   |   2 +-
 .../earth/noaa-sos/oceans/vector_winds.asset  |   2 +-
 .../oceans/vent_discoveries_animation.asset   |   2 +-
 .../noaa-sos/oceans/vent_locations.asset      |   2 +-
 .../earth/noaa-sos/oceans/vorticity.asset     |   2 +-
 .../oceans/waves-wave_height_2012.asset       |   2 +-
 .../oceans/waves-wave_height_katrina.asset    |   2 +-
 .../oceans/waves-wave_height_sandy.asset      |   2 +-
 .../oceans/waves-wave_power_2012.asset        |   2 +-
 .../oceans/weeklyseaice-10day_seaice.asset    |   2 +-
 .../oceans/weeklyseaice-sept_seaice.asset     |   2 +-
 .../earth/noaa-sos/overlays/cables.asset      |   2 +-
 .../earth/noaa-sos/overlays/capitals.asset    |   2 +-
 .../earth/noaa-sos/overlays/city_names.asset  |   2 +-
 .../overlays/continent_borders-black.asset    |   2 +-
 .../overlays/continent_borders-white.asset    |   2 +-
 .../noaa-sos/overlays/continent_names.asset   |   2 +-
 .../overlays/country_borders-black.asset      |   2 +-
 .../overlays/country_borders-white.asset      |   2 +-
 .../noaa-sos/overlays/country_pop_names.asset |   2 +-
 .../earth/noaa-sos/overlays/currents.asset    |   2 +-
 .../overlays/general_circulation.asset        |   2 +-
 .../noaa-sos/overlays/land_mask-black.asset   |   2 +-
 .../noaa-sos/overlays/land_mask-veg.asset     |   2 +-
 .../noaa-sos/overlays/latlon_grid-black.asset |   2 +-
 .../noaa-sos/overlays/latlon_grid-white.asset |   2 +-
 .../earth/noaa-sos/overlays/ocean_names.asset |   2 +-
 .../overlays/plate_boundary-color.asset       |   2 +-
 .../overlays/plate_boundary-white.asset       |   2 +-
 .../earth/noaa-sos/overlays/plate_names.asset |   2 +-
 .../earth/noaa-sos/overlays/railroad.asset    |   2 +-
 .../earth/noaa-sos/overlays/rivers.asset      |   2 +-
 .../earth/noaa-sos/overlays/roads-black.asset |   2 +-
 .../earth/noaa-sos/overlays/roads-white.asset |   2 +-
 .../overlays/state_borders-black.asset        |   2 +-
 .../overlays/state_borders-white.asset        |   2 +-
 .../earth/noaa-sos/overlays/timezones.asset   |   2 +-
 .../satellites/communications/amateur.asset   |   2 +-
 .../communications/experimental.asset         |   2 +-
 .../communications/geostationary.asset        |   2 +-
 .../communications/globalstar.asset           |   2 +-
 .../satellites/communications/gorizont.asset  |   2 +-
 .../satellites/communications/intelsat.asset  |   2 +-
 .../satellites/communications/iridium.asset   |   2 +-
 .../communications/iridium_next.asset         |   2 +-
 .../satellites/communications/molniya.asset   |   2 +-
 .../satellites/communications/orbcomm.asset   |   2 +-
 .../communications/other_comm.asset           |   2 +-
 .../satellites/communications/raduga.asset    |   2 +-
 .../earth/satellites/communications/ses.asset |   2 +-
 .../satellites/communications/starlink.asset  |   2 +-
 .../earth/satellites/debris/debris_asat.asset |   2 +-
 .../satellites/debris/debris_breezem.asset    |   2 +-
 .../satellites/debris/debris_fengyun.asset    |   2 +-
 .../satellites/debris/debris_iridium33.asset  |   2 +-
 .../satellites/debris/debris_kosmos2251.asset |   2 +-
 .../debris/volume/cartesian_volume.asset      |   4 +-
 .../debris/volume/spherical_volume.asset      |   4 +-
 .../earth/satellites/misc/active.asset        |   2 +-
 .../earth/satellites/misc/brightest.asset     |   2 +-
 .../earth/satellites/misc/cubesats.asset      |   2 +-
 .../earth/satellites/misc/hubble_trail.asset  |   2 +-
 .../planets/earth/satellites/misc/iss.asset   |   4 +-
 .../earth/satellites/misc/military.asset      |   2 +-
 .../planets/earth/satellites/misc/other.asset |   2 +-
 .../planets/earth/satellites/misc/radar.asset |   2 +-
 .../earth/satellites/misc/spacestations.asset |   2 +-
 .../earth/satellites/misc/tle-new.asset       |   2 +-
 .../earth/satellites/navigation/beidou.asset  |   2 +-
 .../earth/satellites/navigation/galileo.asset |   2 +-
 .../satellites/navigation/glosnass.asset      |   2 +-
 .../earth/satellites/navigation/gps.asset     |   2 +-
 .../earth/satellites/navigation/musson.asset  |   2 +-
 .../earth/satellites/navigation/nnss.asset    |   2 +-
 .../earth/satellites/navigation/sbas.asset    |   2 +-
 .../earth/satellites/science/education.asset  |   2 +-
 .../satellites/science/engineering.asset      |   2 +-
 .../earth/satellites/science/geodetic.asset   |   2 +-
 .../earth/satellites/science/spaceearth.asset |   2 +-
 .../earth/satellites/weather/aqua.asset       |   2 +-
 .../earth/satellites/weather/argos.asset      |   2 +-
 .../earth/satellites/weather/dmc.asset        |   2 +-
 .../satellites/weather/earth_resources.asset  |   2 +-
 .../earth/satellites/weather/goes.asset       |   2 +-
 .../earth/satellites/weather/noaa.asset       |   2 +-
 .../earth/satellites/weather/planet.asset     |   2 +-
 .../earth/satellites/weather/sarsat.asset     |   2 +-
 .../earth/satellites/weather/snpp.asset       |   2 +-
 .../earth/satellites/weather/spire.asset      |   2 +-
 .../earth/satellites/weather/tdrss.asset      |   2 +-
 .../earth/satellites/weather/terra.asset      |   2 +-
 .../earth/satellites/weather/weather.asset    |   2 +-
 .../planets/jupiter/callisto/callisto.asset   |   2 +-
 .../layers/colorlayers/callisto_texture.asset |   2 +-
 .../planets/jupiter/europa/europa.asset       |   2 +-
 .../layers/colorlayers/europa_texture.asset   |   2 +-
 .../voyager_global_mosaic_local.asset         |   2 +-
 .../voyager_global_mosaic_newyork.asset       |   2 +-
 .../voyager_global_mosaic_sweden.asset        |   2 +-
 .../planets/jupiter/ganymede/ganymede.asset   |   2 +-
 .../layers/colorlayers/ganymede_texture.asset |   2 +-
 .../solarsystem/planets/jupiter/io/io.asset   |   2 +-
 .../io/layers/colorlayers/io_texture.asset    |   2 +-
 .../solarsystem/planets/jupiter/kernels.asset |   2 +-
 .../layers/colorlayers/jupiter_texture.asset  |   2 +-
 .../layers/colorlayers/jupiter_video.asset    |   2 +-
 .../mars/layers/colorlayers/ctx_blended.asset |   2 +-
 .../colorlayers/ctx_blended_beta01.asset      |   2 +-
 .../colorlayers/ctx_mosaic_newyork.asset      |   2 +-
 .../colorlayers/ctx_mosaic_sweden.asset       |   2 +-
 .../layers/colorlayers/ctx_mosaic_utah.asset  |   2 +-
 .../mars/layers/colorlayers/hirise.asset      |   2 +-
 .../mars/layers/colorlayers/hirisels.asset    |   2 +-
 .../layers/colorlayers/mars_texture.asset     |   2 +-
 .../colorlayers/moc_wa_color_newyork.asset    |   2 +-
 .../colorlayers/moc_wa_color_sweden.asset     |   2 +-
 .../colorlayers/moc_wa_color_utah.asset       |   2 +-
 .../colorlayers/mola_hrsc_newyork.asset       |   2 +-
 .../layers/colorlayers/mola_hrsc_sweden.asset |   2 +-
 .../layers/colorlayers/mola_hrsc_utah.asset   |   2 +-
 .../mola_pseudo_color_newyork.asset           |   2 +-
 .../mola_pseudo_color_sweden.asset            |   2 +-
 .../colorlayers/mola_pseudo_color_utah.asset  |   2 +-
 .../colorlayers/themis_ir_day_newyork.asset   |   2 +-
 .../colorlayers/themis_ir_day_sweden.asset    |   2 +-
 .../colorlayers/themis_ir_day_utah.asset      |   2 +-
 .../colorlayers/themis_ir_night_newyork.asset |   2 +-
 .../colorlayers/themis_ir_night_sweden.asset  |   2 +-
 .../colorlayers/themis_ir_night_utah.asset    |   2 +-
 .../colorlayers/viking_mdim_newyork.asset     |   2 +-
 .../colorlayers/viking_mdim_sweden.asset      |   2 +-
 .../layers/colorlayers/viking_mdim_utah.asset |   2 +-
 .../mars/layers/heightlayers/hirisels.asset   |   2 +-
 .../mars/layers/heightlayers/mdem200m.asset   |   2 +-
 .../mars/layers/heightlayers/mola_amnh.asset  |   2 +-
 .../layers/heightlayers/mola_sweden.asset     |   2 +-
 .../mars/layers/heightlayers/mola_utah.asset  |   2 +-
 .../mars/layers/nasa-treks/MEX_HRSC.asset     |   4 +-
 .../layers/nasa-treks/MGS_MOC_Atlas.asset     |   2 +-
 .../mars/layers/nasa-treks/MGS_MOLA.asset     |   6 +-
 .../MGS_MOLA_and_Mars_Express_HRSC.asset      |   4 +-
 .../mars/layers/nasa-treks/MGS_TES.asset      |  12 +-
 .../layers/nasa-treks/MO_THEMIS-IR_Day.asset  |   2 +-
 .../nasa-treks/MO_THEMIS-IR_Night.asset       |   2 +-
 .../mars/layers/nasa-treks/MRO_CTX.asset      |  98 +++++++-------
 .../mars/layers/nasa-treks/MRO_HiRISE.asset   |  42 +++---
 .../planets/mars/layers/nasa-treks/MSL.asset  |   2 +-
 .../layers/nasa-treks/Mars_Express_HRSC.asset |  14 +-
 .../Mars_Reconnaissance_Orbiter_CTX.asset     | 126 +++++++++---------
 .../scene/solarsystem/planets/mars/mars.asset |   2 +-
 .../planets/mars/moons/deimos.asset           |   4 +-
 .../planets/mars/moons/deimos_globe.asset     |   2 +-
 .../planets/mars/moons/phobos.asset           |   4 +-
 .../planets/mars/moons/phobos_globe.asset     |   2 +-
 .../layers/colorlayers/alsimap_02122015.asset |   2 +-
 .../layers/colorlayers/casimap_02122015.asset |   2 +-
 .../layers/colorlayers/fesimap_02122015.asset |   2 +-
 .../layers/colorlayers/mercury_texture.asset  |   2 +-
 .../colorlayers/messenger_bdr_newyork.asset   |   2 +-
 .../colorlayers/messenger_bdr_sweden.asset    |   2 +-
 .../colorlayers/messenger_bdr_utah.asset      |   2 +-
 .../colorlayers/messenger_hie_newyork.asset   |   2 +-
 .../colorlayers/messenger_hie_sweden.asset    |   2 +-
 .../colorlayers/messenger_hie_utah.asset      |   2 +-
 .../colorlayers/messenger_hiw_newyork.asset   |   2 +-
 .../colorlayers/messenger_hiw_sweden.asset    |   2 +-
 .../colorlayers/messenger_hiw_utah.asset      |   2 +-
 .../colorlayers/messenger_loi_newyork.asset   |   2 +-
 .../colorlayers/messenger_loi_sweden.asset    |   2 +-
 .../colorlayers/messenger_loi_utah.asset      |   2 +-
 .../colorlayers/messenger_mdis_newyork.asset  |   2 +-
 .../colorlayers/messenger_mdis_sweden.asset   |   2 +-
 .../colorlayers/messenger_mdis_utah.asset     |   2 +-
 .../colorlayers/messenger_mdr_utah.asset      |   2 +-
 .../messenger_mosaic2_newyork.asset           |   2 +-
 .../messenger_mosaic2_sweden.asset            |   2 +-
 .../colorlayers/messenger_mosaic2_utah.asset  |   2 +-
 .../messenger_mosaic_newyork.asset            |   2 +-
 .../colorlayers/messenger_mosaic_sweden.asset |   2 +-
 .../colorlayers/messenger_mosaic_utah.asset   |   2 +-
 .../colorlayers/messenger_mp3_utah.asset      |   2 +-
 .../colorlayers/messenger_shade_newyork.asset |   2 +-
 .../colorlayers/messenger_shade_sweden.asset  |   2 +-
 .../colorlayers/messenger_shade_utah.asset    |   2 +-
 .../layers/colorlayers/mgsimap_02122015.asset |   2 +-
 .../layers/colorlayers/ssimap_02122015.asset  |   2 +-
 .../heightlayers/messenger_dem_utah.asset     |   2 +-
 .../mercury/layers/nasa-treks/MSGR_MDIS.asset |   6 +-
 .../layers/nasa-treks/MSGR_MDIS_Mosaic.asset  |  20 +--
 .../layers/nasa-treks/MSGR_MDIS_Slope.asset   |  20 +--
 .../solarsystem/planets/mercury/mercury.asset |   2 +-
 .../solarsystem/planets/neptune/kernels.asset |   2 +-
 .../layers/colorlayers/neptune_texture.asset  |   2 +-
 ...n_voyager2_clrmosaic_globalfill_600m.asset |   2 +-
 .../planets/saturn/dione/dione.asset          |   2 +-
 .../layers/colorlayers/dione_texture.asset    |   2 +-
 .../planets/saturn/enceladus/enceladus.asset  |   2 +-
 .../colorlayers/enceladus_texture.asset       |   2 +-
 .../global_mosaic_100m_hpf_newyork.asset      |   2 +-
 .../global_mosaic_100m_hpf_sweden.asset       |   2 +-
 .../planets/saturn/hyperion/hyperion.asset    |   2 +-
 .../planets/saturn/iapetus/iapetus.asset      |   2 +-
 .../layers/colorlayers/iapetus_texture.asset  |   2 +-
 .../solarsystem/planets/saturn/kernels.asset  |   2 +-
 .../layers/colorlayers/saturn_texture.asset   |   2 +-
 .../layers/colorlayers/mimas_texture.asset    |   2 +-
 .../planets/saturn/mimas/mimas.asset          |   2 +-
 .../planets/saturn/minor/shepherd_group.asset |   2 +-
 .../layers/colorlayers/rhea_texture.asset     |   2 +-
 .../planets/saturn/rhea/rhea.asset            |   2 +-
 .../solarsystem/planets/saturn/saturn.asset   |   2 +-
 .../layers/colorlayers/tethys_texture.asset   |   2 +-
 .../planets/saturn/tethys/tethys.asset        |   2 +-
 .../cassini_iss_global_mosaic_4km_local.asset |   2 +-
 ...assini_iss_global_mosaic_4km_newyork.asset |   2 +-
 ...cassini_iss_global_mosaic_4km_sweden.asset |   2 +-
 .../planets/saturn/titan/titan.asset          |   2 +-
 .../solarsystem/planets/uranus/kernels.asset  |   2 +-
 .../layers/colorlayers/uranus_texture.asset   |   2 +-
 .../colorlayers/clouds_magellan_combo.asset   |   4 +-
 .../clouds_magellan_combo_newyork.asset       |   4 +-
 .../colorlayers/magellan_mosaic_newyork.asset |   2 +-
 .../colorlayers/magellan_mosaic_utah.asset    |   2 +-
 .../layers/colorlayers/venus_texture.asset    |   2 +-
 .../heightlayers/magellan_newyork.asset       |   2 +-
 .../layers/heightlayers/magellan_utah.asset   |   2 +-
 .../solarsystem/planets/venus/venus.asset     |   2 +-
 .../solarsystem/sssb/amor_asteroid.asset      |   2 +-
 .../solarsystem/sssb/apollo_asteroid.asset    |   2 +-
 .../scene/solarsystem/sssb/astraea.asset      |   2 +-
 .../solarsystem/sssb/aten_asteroid.asset      |   2 +-
 .../solarsystem/sssb/atira_asteroid.asset     |   2 +-
 .../scene/solarsystem/sssb/c2019y4atlas.asset |   2 +-
 .../solarsystem/sssb/centaur_asteroid.asset   |   2 +-
 .../solarsystem/sssb/chiron-type_comet.asset  |   2 +-
 .../solarsystem/sssb/encke-type_comet.asset   |   2 +-
 .../solarsystem/sssb/halley-type_comet.asset  |   2 +-
 .../sssb/inner_main_belt_asteroid.asset       |   2 +-
 .../scene/solarsystem/sssb/itokawa.asset      |   4 +-
 .../sssb/jupiter-family_comet.asset           |   2 +-
 .../sssb/jupiter_trojan_asteroid.asset        |   2 +-
 .../solarsystem/sssb/main_belt_asteroid.asset |   2 +-
 .../sssb/mars-crossing_asteroid.asset         |   2 +-
 .../sssb/outer_main_belt_asteroid.asset       |   2 +-
 data/assets/scene/solarsystem/sssb/pha.asset  |   2 +-
 .../scene/solarsystem/sssb/swifttuttle.asset  |   2 +-
 .../solarsystem/sssb/tesla_roadster.asset     |   2 +-
 .../sssb/transneptunian_object_asteroid.asset |   2 +-
 .../scene/solarsystem/sun/EUV_layer.asset     |   2 +-
 data/assets/scene/solarsystem/sun/glare.asset |   2 +-
 .../sun/layers/colorlayers/sun_texture.asset  |   2 +-
 .../assets/scene/solarsystem/sun/marker.asset |   2 +-
 .../sun/transforms_heliosphere.asset          |   2 +-
 .../solarsystem/telescopes/gaia/gaia.asset    |   2 +-
 .../solarsystem/telescopes/gaia/trail.asset   |   2 +-
 .../telescopes/gaia/transforms.asset          |   2 +-
 .../solarsystem/telescopes/jwst/jwst.asset    |   4 +-
 .../telescopes/jwst/targets/crab_image.asset  |   2 +-
 .../jwst/targets/hd84406_image.asset          |   2 +-
 .../telescopes/jwst/targets/hh212_image.asset |   2 +-
 .../telescopes/jwst/targets/hudf_image.asset  |   2 +-
 .../telescopes/jwst/targets/m51_image.asset   |   2 +-
 .../telescopes/jwst/targets/m82_image.asset   |   2 +-
 .../telescopes/jwst/targets/orion_image.asset |   2 +-
 .../telescopes/jwst/targets/ring_image.asset  |   2 +-
 .../jwst/targets/sn1987a_image.asset          |   2 +-
 .../jwst/targets/trifid_image.asset           |   2 +-
 .../solarsystem/telescopes/jwst/trail.asset   |   2 +-
 .../telescopes/jwst/transforms.asset          |   2 +-
 data/assets/spice/base.asset                  |   6 +-
 data/assets/util/add_marker.asset             |   2 +-
 data/assets/util/constellations_helper.asset  |   2 +-
 data/assets/util/launcher_images.asset        |   2 +-
 data/assets/util/static_server.asset          |   2 +-
 data/assets/util/webgui.asset                 |   2 +-
 src/scene/assetmanager.cpp                    | 117 +++++++++-------
 .../AssetLoaderTest/assetfunctionsexist.asset |   6 +-
 758 files changed, 1412 insertions(+), 1395 deletions(-)

diff --git a/data/assets/educational/scale/arc_de_triomphe.asset b/data/assets/educational/scale/arc_de_triomphe.asset
index 3640c96a83..1669995813 100644
--- a/data/assets/educational/scale/arc_de_triomphe.asset
+++ b/data/assets/educational/scale/arc_de_triomphe.asset
@@ -3,7 +3,7 @@ local sunAsset = asset.require("scene/solarsystem/sun/sun")
 
 
 
-local modelFolder = asset.syncedResource({
+local modelFolder = asset.resource({
   Name = "Scale Model Arc de Triomphe",
   Type = "HttpSynchronization",
   Identifier = "scale_model_arc_de_triomphe",
diff --git a/data/assets/educational/scale/big_ben.asset b/data/assets/educational/scale/big_ben.asset
index 6720edafe6..20cce7e0e2 100644
--- a/data/assets/educational/scale/big_ben.asset
+++ b/data/assets/educational/scale/big_ben.asset
@@ -3,7 +3,7 @@ local sunAsset = asset.require("scene/solarsystem/sun/sun")
 
 
 
-local modelFolder = asset.syncedResource({
+local modelFolder = asset.resource({
   Name = "Scale Model Big Ben",
   Type = "HttpSynchronization",
   Identifier = "scale_model_big_ben",
diff --git a/data/assets/educational/scale/burj_khalifa.asset b/data/assets/educational/scale/burj_khalifa.asset
index 0f7d24101e..ff46cd6976 100644
--- a/data/assets/educational/scale/burj_khalifa.asset
+++ b/data/assets/educational/scale/burj_khalifa.asset
@@ -3,7 +3,7 @@ local sunAsset = asset.require("scene/solarsystem/sun/sun")
 
 
 
-local modelFolder = asset.syncedResource({
+local modelFolder = asset.resource({
   Name = "Scale Burj Khalifa",
   Type = "UrlSynchronization",
   Identifier = "scale_model_burj_khalifa",
diff --git a/data/assets/educational/scale/eiffeltower.asset b/data/assets/educational/scale/eiffeltower.asset
index ed612a1271..5495949158 100644
--- a/data/assets/educational/scale/eiffeltower.asset
+++ b/data/assets/educational/scale/eiffeltower.asset
@@ -3,7 +3,7 @@ local sunAsset = asset.require("scene/solarsystem/sun/sun")
 
 
 
-local modelFolder = asset.syncedResource({
+local modelFolder = asset.resource({
   Name = "Scale Eiffel Tower",
   Type = "HttpSynchronization",
   Identifier = "scale_model_eiffel_tower",
diff --git a/data/assets/educational/scale/empire_state_building.asset b/data/assets/educational/scale/empire_state_building.asset
index c35daf815e..eec3bf3c24 100644
--- a/data/assets/educational/scale/empire_state_building.asset
+++ b/data/assets/educational/scale/empire_state_building.asset
@@ -3,7 +3,7 @@ local sunAsset = asset.require("scene/solarsystem/sun/sun")
 
 
 
-local modelFolder = asset.syncedResource({
+local modelFolder = asset.resource({
   Name = "Scale Empire State Building",
   Type = "HttpSynchronization",
   Identifier = "scale_model_empire_state",
diff --git a/data/assets/educational/scale/gateway_arch.asset b/data/assets/educational/scale/gateway_arch.asset
index 2d089375e4..3946149d10 100644
--- a/data/assets/educational/scale/gateway_arch.asset
+++ b/data/assets/educational/scale/gateway_arch.asset
@@ -3,7 +3,7 @@ local sunAsset = asset.require("scene/solarsystem/sun/sun")
 
 
 
-local modelFolder = asset.syncedResource({
+local modelFolder = asset.resource({
   Name = "Scale Gateway Arch",
   Type = "HttpSynchronization",
   Identifier = "scale_model_gateway_arch",
diff --git a/data/assets/educational/scale/golden_gate_bridge.asset b/data/assets/educational/scale/golden_gate_bridge.asset
index 5e7b07d3fc..75df110e7f 100644
--- a/data/assets/educational/scale/golden_gate_bridge.asset
+++ b/data/assets/educational/scale/golden_gate_bridge.asset
@@ -3,7 +3,7 @@ local sunAsset = asset.require("scene/solarsystem/sun/sun")
 
 
 
-local modelFolder = asset.syncedResource({
+local modelFolder = asset.resource({
   Name = "Scale Golden Gate Bridge",
   Type = "HttpSynchronization",
   Identifier = "scale_model_golden_gate_bridge",
diff --git a/data/assets/educational/scale/kuala_lumpur_tower.asset b/data/assets/educational/scale/kuala_lumpur_tower.asset
index 6a4f7ce950..3d64296e95 100644
--- a/data/assets/educational/scale/kuala_lumpur_tower.asset
+++ b/data/assets/educational/scale/kuala_lumpur_tower.asset
@@ -3,7 +3,7 @@ local sunAsset = asset.require("scene/solarsystem/sun/sun")
 
 
 
-local modelFolder = asset.syncedResource({
+local modelFolder = asset.resource({
   Name = "Scale Kuala Lumpur Tower",
   Type = "HttpSynchronization",
   Identifier = "scale_model_kuala_lumpur_tower",
diff --git a/data/assets/educational/scale/rose_bowl.asset b/data/assets/educational/scale/rose_bowl.asset
index 67f3a660a1..46e30ccf9f 100644
--- a/data/assets/educational/scale/rose_bowl.asset
+++ b/data/assets/educational/scale/rose_bowl.asset
@@ -3,7 +3,7 @@ local sunAsset = asset.require("scene/solarsystem/sun/sun")
 
 
 
-local modelFolder = asset.syncedResource({
+local modelFolder = asset.resource({
   Name = "Scale Rose Bowl",
   Type = "HttpSynchronization",
   Identifier = "scale_model_rose_bowl",
diff --git a/data/assets/educational/scale/school_bus.asset b/data/assets/educational/scale/school_bus.asset
index ba9cdf20db..ef2875b6a9 100644
--- a/data/assets/educational/scale/school_bus.asset
+++ b/data/assets/educational/scale/school_bus.asset
@@ -3,7 +3,7 @@ local sunAsset = asset.require("scene/solarsystem/sun/sun")
 
 
 
-local modelFolder = asset.syncedResource({
+local modelFolder = asset.resource({
   Name = "Scale School Bus",
   Type = "HttpSynchronization",
   Identifier = "scale_model_school_bus",
diff --git a/data/assets/educational/scale/scientist.asset b/data/assets/educational/scale/scientist.asset
index 8e889ac0f0..621654dea5 100644
--- a/data/assets/educational/scale/scientist.asset
+++ b/data/assets/educational/scale/scientist.asset
@@ -3,7 +3,7 @@ local sunAsset = asset.require("scene/solarsystem/sun/sun")
 
 
 
-local modelFolder = asset.syncedResource({
+local modelFolder = asset.resource({
   Name = "Scale Model Scientist",
   Type = "HttpSynchronization",
   Identifier = "scale_model_scientist",
diff --git a/data/assets/educational/scale/statue_of_liberty.asset b/data/assets/educational/scale/statue_of_liberty.asset
index 31171ac56e..e40bf4a21a 100644
--- a/data/assets/educational/scale/statue_of_liberty.asset
+++ b/data/assets/educational/scale/statue_of_liberty.asset
@@ -3,7 +3,7 @@ local sunAsset = asset.require("scene/solarsystem/sun/sun")
 
 
 
-local modelFolder = asset.syncedResource({
+local modelFolder = asset.resource({
   Name = "Scale Model Statue of Liberty",
   Type = "HttpSynchronization",
   Identifier = "scale_model_statue_of_liberty",
diff --git a/data/assets/examples/animation.asset b/data/assets/examples/animation.asset
index b715ad7293..6406ae0e96 100644
--- a/data/assets/examples/animation.asset
+++ b/data/assets/examples/animation.asset
@@ -3,7 +3,7 @@ local transforms = asset.require("scene/solarsystem/planets/earth/transforms")
 
 
 
-local model = asset.syncedResource({
+local model = asset.resource({
   Name = "Animated Box",
   Type = "HttpSynchronization",
   Identifier = "animated_box",
diff --git a/data/assets/examples/approachevents.asset b/data/assets/examples/approachevents.asset
index 7d68868671..46e71fd254 100644
--- a/data/assets/examples/approachevents.asset
+++ b/data/assets/examples/approachevents.asset
@@ -3,7 +3,7 @@ local transforms = asset.require("scene/solarsystem/planets/earth/transforms")
 
 
 
-local model = asset.syncedResource({
+local model = asset.resource({
   Name = "Animated Box",
   Type = "HttpSynchronization",
   Identifier = "animated_box",
diff --git a/data/assets/examples/galaxyshader/volume.asset b/data/assets/examples/galaxyshader/volume.asset
index d52b3f2bc0..17db8fe4ee 100644
--- a/data/assets/examples/galaxyshader/volume.asset
+++ b/data/assets/examples/galaxyshader/volume.asset
@@ -2,7 +2,7 @@ local transforms = asset.require("scene/solarsystem/sun/transforms")
 
 
 
-local data = asset.syncedResource({
+local data = asset.resource({
   Name = "Milkyway Volume Data",
   Type = "HttpSynchronization",
   Identifier = "milkyway_volume_data",
@@ -30,7 +30,7 @@ local MilkyWayVolume = {
     AbsorptionMultiply = 200,
     EmissionMultiply = 250,
     Rotation = { math.pi, 3.1248, 4.45741 },
-    RaycastingShader = asset.localResource("galaxyraycast2.glsl"),
+    RaycastingShader = asset.resource("galaxyraycast2.glsl"),
     Volume = {
       Type = "Volume",
       Filename = data .. "MilkyWayRGBAVolume1024x1024x128.raw",
diff --git a/data/assets/examples/geojson/geojson_extruded_shaded_polygon.asset b/data/assets/examples/geojson/geojson_extruded_shaded_polygon.asset
index 56002c2439..f192dec785 100644
--- a/data/assets/examples/geojson/geojson_extruded_shaded_polygon.asset
+++ b/data/assets/examples/geojson/geojson_extruded_shaded_polygon.asset
@@ -3,7 +3,7 @@ local sun = asset.require("scene/solarsystem/sun/sun")
 
 
 
-local data = asset.syncedResource({
+local data = asset.resource({
   Name = "GeoJSON Example Africa",
   Type = "UrlSynchronization",
   Identifier = "geojson_example_polygon_extruded_africa",
diff --git a/data/assets/examples/geojson/geojson_lines.asset b/data/assets/examples/geojson/geojson_lines.asset
index 481c7b2326..684ff47cce 100644
--- a/data/assets/examples/geojson/geojson_lines.asset
+++ b/data/assets/examples/geojson/geojson_lines.asset
@@ -2,7 +2,7 @@ local earth = asset.require("scene/solarsystem/planets/earth/earth")
 
 
 
-local data = asset.syncedResource({
+local data = asset.resource({
   Name = "GeoJSON Example Lines",
   Type = "UrlSynchronization",
   Identifier = "geojson_example_lines",
diff --git a/data/assets/examples/geojson/geojson_multiple_polygons.asset b/data/assets/examples/geojson/geojson_multiple_polygons.asset
index 640ce589f5..1613446283 100644
--- a/data/assets/examples/geojson/geojson_multiple_polygons.asset
+++ b/data/assets/examples/geojson/geojson_multiple_polygons.asset
@@ -2,7 +2,7 @@ local earth = asset.require("scene/solarsystem/planets/earth/earth")
 
 
 
-local data = asset.syncedResource({
+local data = asset.resource({
   Name = "GeoJSON Example Polygon Multiple",
   Type = "UrlSynchronization",
   Identifier = "geojson_example_polygon_multiple",
diff --git a/data/assets/examples/geojson/geojson_points.asset b/data/assets/examples/geojson/geojson_points.asset
index a1a4736661..bcf0464845 100644
--- a/data/assets/examples/geojson/geojson_points.asset
+++ b/data/assets/examples/geojson/geojson_points.asset
@@ -2,7 +2,7 @@ local earth = asset.require("scene/solarsystem/planets/earth/earth")
 
 
 
-local data = asset.syncedResource({
+local data = asset.resource({
   Name = "GeoJSON Example Outfacing",
   Type = "UrlSynchronization",
   Identifier = "geojson_example_points",
diff --git a/data/assets/examples/geojson/geojson_points_outfacing.asset b/data/assets/examples/geojson/geojson_points_outfacing.asset
index 9e9f74a299..07ad634959 100644
--- a/data/assets/examples/geojson/geojson_points_outfacing.asset
+++ b/data/assets/examples/geojson/geojson_points_outfacing.asset
@@ -2,7 +2,7 @@ local earth = asset.require("scene/solarsystem/planets/earth/earth")
 
 
 
-local data = asset.syncedResource({
+local data = asset.resource({
   Name = "GeoJSON Example Outfacing",
   Type = "UrlSynchronization",
   Identifier = "geojson_example_points",
diff --git a/data/assets/examples/geojson/geojson_polygons_with_holes.asset b/data/assets/examples/geojson/geojson_polygons_with_holes.asset
index 8adcaff40e..eeadd26b76 100644
--- a/data/assets/examples/geojson/geojson_polygons_with_holes.asset
+++ b/data/assets/examples/geojson/geojson_polygons_with_holes.asset
@@ -2,7 +2,7 @@ local earth = asset.require("scene/solarsystem/planets/earth/earth")
 
 
 
-local data = asset.syncedResource({
+local data = asset.resource({
   Name = "GeoJSON Example Polygon with holes",
   Type = "UrlSynchronization",
   Identifier = "geojson_example_polygon_with_holes",
diff --git a/data/assets/examples/geojson/geojson_roverpath.asset b/data/assets/examples/geojson/geojson_roverpath.asset
index 876f5b8e33..97e7056f78 100644
--- a/data/assets/examples/geojson/geojson_roverpath.asset
+++ b/data/assets/examples/geojson/geojson_roverpath.asset
@@ -2,7 +2,7 @@ local mars = asset.require("scene/solarsystem/planets/mars/mars")
 
 
 
-local data = asset.syncedResource({
+local data = asset.resource({
   Name = "GeoJSON Example Path Perseverance",
   Type = "UrlSynchronization",
   Identifier = "geojson_example_path_perseverance",
diff --git a/data/assets/examples/geojson/geojson_toronto_neighborhoods.asset b/data/assets/examples/geojson/geojson_toronto_neighborhoods.asset
index 1eba4160c1..7ac4341ae4 100644
--- a/data/assets/examples/geojson/geojson_toronto_neighborhoods.asset
+++ b/data/assets/examples/geojson/geojson_toronto_neighborhoods.asset
@@ -2,7 +2,7 @@ local earth = asset.require("scene/solarsystem/planets/earth/earth")
 
 
 
-local data = asset.syncedResource({
+local data = asset.resource({
   Name = "GeoJSON Example Toronto Neighborhoods",
   Type = "UrlSynchronization",
   Identifier = "geojson_example_toronto_neighborhoods",
diff --git a/data/assets/examples/globerotation.asset b/data/assets/examples/globerotation.asset
index f267be6e56..25bfe9258f 100644
--- a/data/assets/examples/globerotation.asset
+++ b/data/assets/examples/globerotation.asset
@@ -3,7 +3,7 @@ local earth = asset.require("scene/solarsystem/planets/earth/earth")
 
 
 
-local models = asset.syncedResource({
+local models = asset.resource({
   Name = "New Horizons Model",
   Type = "HttpSynchronization",
   Identifier = "newhorizons_model",
diff --git a/data/assets/examples/globetranslation.asset b/data/assets/examples/globetranslation.asset
index ba393ed61c..7cccfb64f5 100644
--- a/data/assets/examples/globetranslation.asset
+++ b/data/assets/examples/globetranslation.asset
@@ -3,7 +3,7 @@ local earth = asset.require("scene/solarsystem/planets/earth/earth")
 
 
 
-local models = asset.syncedResource({
+local models = asset.resource({
   Name = "New Horizons Model",
   Type = "HttpSynchronization",
   Identifier = "newhorizons_model",
diff --git a/data/assets/examples/modelshader/modelshader.asset b/data/assets/examples/modelshader/modelshader.asset
index 8cacd99129..e086da7e98 100644
--- a/data/assets/examples/modelshader/modelshader.asset
+++ b/data/assets/examples/modelshader/modelshader.asset
@@ -3,7 +3,7 @@ local transforms = asset.require("scene/solarsystem/planets/earth/transforms")
 
 
 
-local model = asset.syncedResource({
+local model = asset.resource({
   Name = "Animated Box",
   Type = "HttpSynchronization",
   Identifier = "animated_box",
@@ -27,8 +27,8 @@ local Model = {
     -- (malej 2023-MAY-22) Note that PerformShading should be false in this example,
     -- these example shaders dont't contain any light calculations
     PerformShading = false,
-    VertexShader = asset.localResource("model_vs.glsl"),
-    FragmentShader = asset.localResource("model_fs.glsl"),
+    VertexShader = asset.resource("model_vs.glsl"),
+    FragmentShader = asset.resource("model_fs.glsl"),
     EnableAnimation = true,
     AnimationStartTime = "2023 05 11 00:00:00",
     AnimationTimeScale = "Second",
diff --git a/data/assets/examples/temperature_land_highres.asset b/data/assets/examples/temperature_land_highres.asset
index 75217b70df..18de8d6409 100644
--- a/data/assets/examples/temperature_land_highres.asset
+++ b/data/assets/examples/temperature_land_highres.asset
@@ -2,7 +2,7 @@ local globe = asset.require("scene/solarsystem/planets/earth/earth")
 
 
 
-local path = asset.syncedResource({
+local path = asset.resource({
   Name = "Earth Textures Climate",
   Type = "HttpSynchronization",
   Identifier = "earth_textures_climate",
diff --git a/data/assets/examples/urlsynchronization.asset b/data/assets/examples/urlsynchronization.asset
index 6005a176c6..e45895f791 100644
--- a/data/assets/examples/urlsynchronization.asset
+++ b/data/assets/examples/urlsynchronization.asset
@@ -1,11 +1,11 @@
-asset.syncedResource({
+asset.resource({
   Name = "Example Single",
   Type = "UrlSynchronization",
   Identifier = "example_single",
   Url = "http://celestrak.com/NORAD/elements/geo.txt"
 })
 
-asset.syncedResource({
+asset.resource({
   Name = "Example Multiple",
   Type = "UrlSynchronization",
   Identifier = "example_multiple",
@@ -15,7 +15,7 @@ asset.syncedResource({
   }
 })
 
-asset.syncedResource({
+asset.resource({
   Name = "Example Large",
   Type = "UrlSynchronization",
   Identifier = "example_large",
@@ -23,7 +23,7 @@ asset.syncedResource({
   Override = true
 })
 
-asset.syncedResource({
+asset.resource({
   Name = "Example Medium",
   Type = "UrlSynchronization",
   Identifier = "example_medium",
@@ -34,7 +34,7 @@ asset.syncedResource({
 -- Load a resource without hashing, meaning that the bare directory name will be
 -- used for the downloaded file. If UseHash is true, the hash of the URL is appended
 -- to the directory name to produce a unique directory under all circumstances
-asset.syncedResource({
+asset.resource({
   Name = "Example No Hash",
   Type = "UrlSynchronization",
   Identifier = "no_hash",
diff --git a/data/assets/examples/video/videoglobe.asset b/data/assets/examples/video/videoglobe.asset
index 83f9bcf7b6..e886d5dbbf 100644
--- a/data/assets/examples/video/videoglobe.asset
+++ b/data/assets/examples/video/videoglobe.asset
@@ -10,7 +10,7 @@ local Layer = {
   Identifier = "GlobeVideoLoopExample",
   Enabled = true,
   Type = "VideoTileProvider",
-  Video = asset.localResource("examplevideo.mp4"),
+  Video = asset.resource("examplevideo.mp4"),
 }
 
 
diff --git a/data/assets/examples/video/videoplane.asset b/data/assets/examples/video/videoplane.asset
index f81fda6a47..f4b102dc43 100644
--- a/data/assets/examples/video/videoplane.asset
+++ b/data/assets/examples/video/videoplane.asset
@@ -18,7 +18,7 @@ local Plane = {
     Type = "RenderableVideoPlane",
     MirrorBackside = true,
     Size = 3E7,
-    Video = asset.localResource("examplevideo.mp4"),
+    Video = asset.resource("examplevideo.mp4"),
   },
   GUI = {
     Name = "Video Plane Example",
diff --git a/data/assets/examples/video/videoscreenspace.asset b/data/assets/examples/video/videoscreenspace.asset
index 4b52ce4a6b..c114f26251 100644
--- a/data/assets/examples/video/videoscreenspace.asset
+++ b/data/assets/examples/video/videoscreenspace.asset
@@ -5,7 +5,7 @@ local ScreenSpace = {
   Identifier = "ScreenSpaceVideoExample",
   Type = "ScreenSpaceVideo",
   Name = "Screen Space Video Example",
-  Video = asset.localResource("examplevideo.mp4")
+  Video = asset.resource("examplevideo.mp4")
 }
 
 
diff --git a/data/assets/examples/video/videosphere.asset b/data/assets/examples/video/videosphere.asset
index 960a70c58c..5155cbb2a7 100644
--- a/data/assets/examples/video/videosphere.asset
+++ b/data/assets/examples/video/videosphere.asset
@@ -7,7 +7,7 @@ local Sphere = {
     Type = "RenderableVideoSphere",
     Size = 100.0,
     Segments = 80,
-    Video = asset.localResource("examplevideo.mp4"),
+    Video = asset.resource("examplevideo.mp4"),
     Orientation = "Both"
   },
   GUI = {
diff --git a/data/assets/examples/video/videostretchedtotime.asset b/data/assets/examples/video/videostretchedtotime.asset
index 93c31047a9..747470b7a7 100644
--- a/data/assets/examples/video/videostretchedtotime.asset
+++ b/data/assets/examples/video/videostretchedtotime.asset
@@ -9,7 +9,7 @@ local Layer = {
   Name = "Stretched Video Example",
   Identifier = "StretchedVideoExample",
   Type = "VideoTileLayer",
-  Video = asset.localResource("examplevideo.mp4"),
+  Video = asset.resource("examplevideo.mp4"),
   StartTime = "2023 01 29 20:00:00",
   EndTime = "2023 01 29 21:00:00",
   PlaybackMode = "MapToSimulationTime",
diff --git a/data/assets/examples/volume/generated/cartesian.asset b/data/assets/examples/volume/generated/cartesian.asset
index 634f009e6f..30ad1dc7ed 100644
--- a/data/assets/examples/volume/generated/cartesian.asset
+++ b/data/assets/examples/volume/generated/cartesian.asset
@@ -19,8 +19,8 @@ local Volume = {
   },
   Renderable = {
     Type = "RenderableTimeVaryingVolume",
-    SourceDirectory = asset.localResource("cartesian"),
-    TransferFunction = asset.localResource("../transferfunction.txt"),
+    SourceDirectory = asset.resource("cartesian"),
+    TransferFunction = asset.resource("../transferfunction.txt"),
     StepSize = 0.01,
     MinValue = 0,
     MaxValue = 1,
diff --git a/data/assets/examples/volume/generated/cartesiansequence.asset b/data/assets/examples/volume/generated/cartesiansequence.asset
index c0e860c6e5..a9cc344384 100644
--- a/data/assets/examples/volume/generated/cartesiansequence.asset
+++ b/data/assets/examples/volume/generated/cartesiansequence.asset
@@ -13,8 +13,8 @@ local Volume = {
   Parent = transforms.SolarSystemBarycenter.Identifier,
   Renderable = {
     Type = "RenderableTimeVaryingVolume",
-    SourceDirectory = asset.localResource("cartesiansequence"),
-    TransferFunction = asset.localResource("../transferfunction.txt"),
+    SourceDirectory = asset.resource("cartesiansequence"),
+    TransferFunction = asset.resource("../transferfunction.txt"),
     StepSize = 0.01,
     MinValue = 0,
     MaxValue = 1,
diff --git a/data/assets/examples/volume/generated/spherical.asset b/data/assets/examples/volume/generated/spherical.asset
index d0d4b7e25c..d61e070962 100644
--- a/data/assets/examples/volume/generated/spherical.asset
+++ b/data/assets/examples/volume/generated/spherical.asset
@@ -19,8 +19,8 @@ local Volume = {
   },
   Renderable = {
     Type = "RenderableTimeVaryingVolume",
-    SourceDirectory = asset.localResource("spherical"),
-    TransferFunction = asset.localResource("../transferfunction.txt"),
+    SourceDirectory = asset.resource("spherical"),
+    TransferFunction = asset.resource("../transferfunction.txt"),
     StepSize = 0.01,
     MinValue = 0,
     MaxValue = 1,
diff --git a/data/assets/global/openspacebookmarks.asset b/data/assets/global/openspacebookmarks.asset
index 90bf4bcbd0..d8770c2e20 100644
--- a/data/assets/global/openspacebookmarks.asset
+++ b/data/assets/global/openspacebookmarks.asset
@@ -2,7 +2,7 @@ local bookmarkHelper = asset.require("util/generate_bookmarks")
 
 local dataProvider = "http://data.openspaceproject.com/files/bookmarks/v1/bookmarks.csv"
 
-local bookmarksCSV = asset.syncedResource({
+local bookmarksCSV = asset.resource({
   Identifier = "openspace_bookmarks",
   Name = "OpenSpace Bookmarks",
   Type = "UrlSynchronization",
diff --git a/data/assets/gui/images.asset b/data/assets/gui/images.asset
index 97397155cf..e67cc96217 100644
--- a/data/assets/gui/images.asset
+++ b/data/assets/gui/images.asset
@@ -1,4 +1,4 @@
-asset.syncedResource({
+asset.resource({
   Type = "UrlSynchronization",
   Name = "Icons",
   Identifier = "planet_icons",
@@ -20,7 +20,7 @@ asset.syncedResource({
   UseHash = false
 })
 
-asset.syncedResource({
+asset.resource({
   Type = "UrlSynchronization",
   Name = "Stories",
   Identifier = "story_images",
@@ -35,7 +35,7 @@ asset.syncedResource({
   UseHash = false
 })
 
-asset.syncedResource({
+asset.resource({
   Type = "UrlSynchronization",
   Name = "Instructions",
   Identifier = "images",
diff --git a/data/assets/modules/exoplanets/exoplanets_data.asset b/data/assets/modules/exoplanets/exoplanets_data.asset
index adc8290eac..839967411e 100644
--- a/data/assets/modules/exoplanets/exoplanets_data.asset
+++ b/data/assets/modules/exoplanets/exoplanets_data.asset
@@ -1,11 +1,11 @@
-local dataPath = asset.syncedResource({
+local dataPath = asset.resource({
   Name = "Exoplanet Data Files",
   Type = "HttpSynchronization",
   Identifier = "exoplanets_data",
   Version = 5
 })
 
-local colormaps = asset.syncedResource({
+local colormaps = asset.resource({
   Name = "Stars Color Table",
   Type = "HttpSynchronization",
   Identifier = "stars_colormap",
diff --git a/data/assets/modules/exoplanets/exoplanets_textures.asset b/data/assets/modules/exoplanets/exoplanets_textures.asset
index 94258024f0..b8d4c63589 100644
--- a/data/assets/modules/exoplanets/exoplanets_textures.asset
+++ b/data/assets/modules/exoplanets/exoplanets_textures.asset
@@ -4,14 +4,14 @@ local habitableZoneTextures = asset.require(
 
 
 
-local sunTextures = asset.syncedResource({
+local sunTextures = asset.resource({
   Type = "HttpSynchronization",
   Name = "Sun textures",
   Identifier = "sun_textures",
   Version = 4
 })
 
-local texturesPath = asset.syncedResource({
+local texturesPath = asset.resource({
   Name = "Exoplanet Textures",
   Type = "HttpSynchronization",
   Identifier = "exoplanets_textures",
diff --git a/data/assets/modules/skybrowser/hover_circle.asset b/data/assets/modules/skybrowser/hover_circle.asset
index efaa04368f..027c2a09cb 100644
--- a/data/assets/modules/skybrowser/hover_circle.asset
+++ b/data/assets/modules/skybrowser/hover_circle.asset
@@ -1,6 +1,6 @@
 local transforms = asset.require("scene/solarsystem/sun/transforms")
 
-local imageFolder = asset.syncedResource({
+local imageFolder = asset.resource({
   Name = "Hover Circle Image",
   Type = "HttpSynchronization",
   Identifier = "misc_ring_image",
diff --git a/data/assets/nightsky/cardinal_directions.asset b/data/assets/nightsky/cardinal_directions.asset
index c499cb0019..6f342cd7a1 100644
--- a/data/assets/nightsky/cardinal_directions.asset
+++ b/data/assets/nightsky/cardinal_directions.asset
@@ -2,7 +2,7 @@ local earthAsset = asset.require("scene/solarsystem/planets/earth/earth")
 
 
 
-local textures = asset.syncedResource({
+local textures = asset.resource({
   Name = "Cardinal Directions Textures",
   Type = "HttpSynchronization",
   Identifier = "cardinal_directions_textures",
diff --git a/data/assets/nightsky/ecliptic_band.asset b/data/assets/nightsky/ecliptic_band.asset
index d46b6c2e0d..cfa8527cfe 100644
--- a/data/assets/nightsky/ecliptic_band.asset
+++ b/data/assets/nightsky/ecliptic_band.asset
@@ -2,7 +2,7 @@ local transforms = asset.require("scene/solarsystem/sun/transforms")
 
 
 
-local textures = asset.syncedResource({
+local textures = asset.resource({
   Name = "Ecliptic Band Textures",
   Type = "HttpSynchronization",
   Identifier = "ecliptic_band_textures",
diff --git a/data/assets/nightsky/light_pollution.asset b/data/assets/nightsky/light_pollution.asset
index 806a75fbee..6bcaef20c5 100644
--- a/data/assets/nightsky/light_pollution.asset
+++ b/data/assets/nightsky/light_pollution.asset
@@ -2,7 +2,7 @@ local earthAsset = asset.require("scene/solarsystem/planets/earth/earth")
 
 
 
-local textures = asset.syncedResource({
+local textures = asset.resource({
   Name = "Light Pollution Textures",
   Type = "HttpSynchronization",
   Identifier = "light_pollution_textures",
diff --git a/data/assets/nightsky/planets.asset b/data/assets/nightsky/planets.asset
index 33d3ba205a..658b0ae4d5 100644
--- a/data/assets/nightsky/planets.asset
+++ b/data/assets/nightsky/planets.asset
@@ -6,7 +6,7 @@ local saturn = asset.require("scene/solarsystem/planets/saturn/transforms")
 
 
 
-local textures = asset.syncedResource({
+local textures = asset.resource({
   Name = "Night Sky Planet Textures",
   Type = "HttpSynchronization",
   Identifier = "night_sky_planet_textures",
diff --git a/data/assets/nightsky/zenith.asset b/data/assets/nightsky/zenith.asset
index 0819e27ea5..d510f249d5 100644
--- a/data/assets/nightsky/zenith.asset
+++ b/data/assets/nightsky/zenith.asset
@@ -2,7 +2,7 @@ local earthAsset = asset.require("scene/solarsystem/planets/earth/earth")
 
 
 
-local textures = asset.syncedResource({
+local textures = asset.resource({
   Name = "Zenith Textures",
   Type = "HttpSynchronization",
   Identifier = "zenith_textures",
diff --git a/data/assets/scene/digitaluniverse/2dF.asset b/data/assets/scene/digitaluniverse/2dF.asset
index ab705d3667..fca4597e97 100644
--- a/data/assets/scene/digitaluniverse/2dF.asset
+++ b/data/assets/scene/digitaluniverse/2dF.asset
@@ -1,11 +1,11 @@
-local textures = asset.syncedResource({
+local textures = asset.resource({
   Name = "2dF Textures",
   Type = "HttpSynchronization",
   Identifier = "digitaluniverse_2dF_textures",
   Version = 2
 })
 
-local speck = asset.syncedResource({
+local speck = asset.resource({
   Name = "2dF Speck Files",
   Type = "HttpSynchronization",
   Identifier = "digitaluniverse_2dF_speck",
diff --git a/data/assets/scene/digitaluniverse/2mass.asset b/data/assets/scene/digitaluniverse/2mass.asset
index 71506f0dd2..da92e173fc 100644
--- a/data/assets/scene/digitaluniverse/2mass.asset
+++ b/data/assets/scene/digitaluniverse/2mass.asset
@@ -1,11 +1,11 @@
-local textures = asset.syncedResource({
+local textures = asset.resource({
   Name = "2MASS Textures",
   Type = "HttpSynchronization",
   Identifier = "digitaluniverse_2mass_textures",
   Version = 2
 })
 
-local speck = asset.syncedResource({
+local speck = asset.resource({
   Name = "2MASS Speck Files",
   Type = "HttpSynchronization",
   Identifier = "digitaluniverse_2mass_speck",
diff --git a/data/assets/scene/digitaluniverse/6dF.asset b/data/assets/scene/digitaluniverse/6dF.asset
index 4d7ead66e5..34bdd92b3b 100644
--- a/data/assets/scene/digitaluniverse/6dF.asset
+++ b/data/assets/scene/digitaluniverse/6dF.asset
@@ -1,11 +1,11 @@
-local textures = asset.syncedResource({
+local textures = asset.resource({
   Name = "6dF Textures",
   Type = "HttpSynchronization",
   Identifier = "digitaluniverse_6dF_textures",
   Version = 2
 })
 
-local speck = asset.syncedResource({
+local speck = asset.resource({
   Name = "6dF Speck Files",
   Type = "HttpSynchronization",
   Identifier = "digitaluniverse_6dF_speck",
diff --git a/data/assets/scene/digitaluniverse/abell.asset b/data/assets/scene/digitaluniverse/abell.asset
index fbbe0285a9..b7c5de498d 100644
--- a/data/assets/scene/digitaluniverse/abell.asset
+++ b/data/assets/scene/digitaluniverse/abell.asset
@@ -1,11 +1,11 @@
-local textures = asset.syncedResource({
+local textures = asset.resource({
   Name = "Abell Textures",
   Type = "HttpSynchronization",
   Identifier = "digitaluniverse_abell_textures",
   Version = 2
 })
 
-local speck = asset.syncedResource({
+local speck = asset.resource({
   Name = "Abell Speck Files",
   Type = "HttpSynchronization",
   Identifier = "digitaluniverse_abell_speck",
diff --git a/data/assets/scene/digitaluniverse/alternatestarlabels.asset b/data/assets/scene/digitaluniverse/alternatestarlabels.asset
index d6237a0330..070e50eb7d 100644
--- a/data/assets/scene/digitaluniverse/alternatestarlabels.asset
+++ b/data/assets/scene/digitaluniverse/alternatestarlabels.asset
@@ -1,4 +1,4 @@
-local speck = asset.syncedResource({
+local speck = asset.resource({
   Name = "Alternate Star Labels Speck Files",
   Type = "HttpSynchronization",
   Identifier = "digitaluniverse_alternatestarlabels_speck",
diff --git a/data/assets/scene/digitaluniverse/backgroundradiation.asset b/data/assets/scene/digitaluniverse/backgroundradiation.asset
index 0fd43a12ea..efd33fb458 100644
--- a/data/assets/scene/digitaluniverse/backgroundradiation.asset
+++ b/data/assets/scene/digitaluniverse/backgroundradiation.asset
@@ -1,11 +1,11 @@
-local speck = asset.syncedResource({
+local speck = asset.resource({
   Name = "Background Radiation Speck Files",
   Type = "HttpSynchronization",
   Identifier = "digitaluniverse_backgroundradiation_speck",
   Version = 1
 })
 
-local textures = asset.syncedResource({
+local textures = asset.resource({
   Name = "Background Radiation Textures",
   Type = "HttpSynchronization",
   Identifier = "digitaluniverse_backgroundradiation_textures",
diff --git a/data/assets/scene/digitaluniverse/backgroundradiation_multiverse.asset b/data/assets/scene/digitaluniverse/backgroundradiation_multiverse.asset
index 6633d975c9..8c9e729340 100644
--- a/data/assets/scene/digitaluniverse/backgroundradiation_multiverse.asset
+++ b/data/assets/scene/digitaluniverse/backgroundradiation_multiverse.asset
@@ -1,4 +1,4 @@
-local textures = asset.syncedResource({
+local textures = asset.resource({
   Name = "Background Radiation Textures",
   Type = "HttpSynchronization",
   Identifier = "digitaluniverse_backgroundradiation_textures",
diff --git a/data/assets/scene/digitaluniverse/clusters.asset b/data/assets/scene/digitaluniverse/clusters.asset
index 36687cd7b3..f266d6afb9 100644
--- a/data/assets/scene/digitaluniverse/clusters.asset
+++ b/data/assets/scene/digitaluniverse/clusters.asset
@@ -1,4 +1,4 @@
-local speck = asset.syncedResource({
+local speck = asset.resource({
   Name = "Clusters Speck Files",
   Type = "HttpSynchronization",
   Identifier = "digitaluniverse_clusters_speck",
diff --git a/data/assets/scene/digitaluniverse/constellationbounds.asset b/data/assets/scene/digitaluniverse/constellationbounds.asset
index e4d0f611b2..892b38b156 100644
--- a/data/assets/scene/digitaluniverse/constellationbounds.asset
+++ b/data/assets/scene/digitaluniverse/constellationbounds.asset
@@ -1,4 +1,4 @@
-local data = asset.syncedResource({
+local data = asset.resource({
   Name = "Constellation Files",
   Type = "HttpSynchronization",
   Identifier = "digitaluniverse_constellations_data",
diff --git a/data/assets/scene/digitaluniverse/constellations.asset b/data/assets/scene/digitaluniverse/constellations.asset
index b9fdcc55b2..301112a2ff 100644
--- a/data/assets/scene/digitaluniverse/constellations.asset
+++ b/data/assets/scene/digitaluniverse/constellations.asset
@@ -2,7 +2,7 @@ local constellations_helper = asset.require("util/constellations_helper")
 
 
 
-local speck = asset.syncedResource({
+local speck = asset.resource({
   Name = "Constellation Files",
   Type = "HttpSynchronization",
   Identifier = "digitaluniverse_constellations_data",
diff --git a/data/assets/scene/digitaluniverse/deepsky.asset b/data/assets/scene/digitaluniverse/deepsky.asset
index 83ac809645..371fd66ea1 100644
--- a/data/assets/scene/digitaluniverse/deepsky.asset
+++ b/data/assets/scene/digitaluniverse/deepsky.asset
@@ -1,11 +1,11 @@
-local textures = asset.syncedResource({
+local textures = asset.resource({
   Name = "Deep Sky Objects Textures",
   Type = "HttpSynchronization",
   Identifier = "digitaluniverse_deepsky_textures",
   Version = 2
 })
 
-local speck = asset.syncedResource({
+local speck = asset.resource({
   Name = "Deep Sky Objects Speck Files",
   Type = "HttpSynchronization",
   Identifier = "digitaluniverse_deepsky_speck",
diff --git a/data/assets/scene/digitaluniverse/dwarfs.asset b/data/assets/scene/digitaluniverse/dwarfs.asset
index 6e789834d0..fe879a8ec6 100644
--- a/data/assets/scene/digitaluniverse/dwarfs.asset
+++ b/data/assets/scene/digitaluniverse/dwarfs.asset
@@ -1,11 +1,11 @@
-local textures = asset.syncedResource({
+local textures = asset.resource({
   Name = "Brown Dwarf Textures",
   Type = "HttpSynchronization",
   Identifier = "digitaluniverse_dwarfs_textures",
   Version = 1
 })
 
-local speck = asset.syncedResource({
+local speck = asset.resource({
   Name = "Brown Dwarf Speck Files",
   Type = "HttpSynchronization",
   Identifier = "digitaluniverse_dwarfs_speck",
diff --git a/data/assets/scene/digitaluniverse/exoplanets.asset b/data/assets/scene/digitaluniverse/exoplanets.asset
index 2c1cface48..c20351cb17 100644
--- a/data/assets/scene/digitaluniverse/exoplanets.asset
+++ b/data/assets/scene/digitaluniverse/exoplanets.asset
@@ -1,11 +1,11 @@
-local textures = asset.syncedResource({
+local textures = asset.resource({
   Name = "Exoplanets Textures",
   Type = "HttpSynchronization",
   Identifier = "digitaluniverse_exoplanets_textures",
   Version = 1
 })
 
-local speck = asset.syncedResource({
+local speck = asset.resource({
   Name = "Exoplanets Speck Files",
   Type = "HttpSynchronization",
   Identifier = "digitaluniverse_exoplanets_speck",
diff --git a/data/assets/scene/digitaluniverse/exoplanets_candidates.asset b/data/assets/scene/digitaluniverse/exoplanets_candidates.asset
index 0786bef147..5fa0436b7e 100644
--- a/data/assets/scene/digitaluniverse/exoplanets_candidates.asset
+++ b/data/assets/scene/digitaluniverse/exoplanets_candidates.asset
@@ -1,11 +1,11 @@
-local textures = asset.syncedResource({
+local textures = asset.resource({
     Name = "Exoplanets Candidates Textures",
     Type = "HttpSynchronization",
     Identifier = "digitaluniverse_exoplanets_candidates_textures",
     Version = 1
 })
 
-local speck = asset.syncedResource({
+local speck = asset.resource({
   Name = "Exoplanets Candidates Speck Files",
   Type = "HttpSynchronization",
   Identifier = "digitaluniverse_exoplanets_candidates_speck",
diff --git a/data/assets/scene/digitaluniverse/globularclusters.asset b/data/assets/scene/digitaluniverse/globularclusters.asset
index 779002bc62..4e7095f8e4 100644
--- a/data/assets/scene/digitaluniverse/globularclusters.asset
+++ b/data/assets/scene/digitaluniverse/globularclusters.asset
@@ -1,11 +1,11 @@
-local textures = asset.syncedResource({
+local textures = asset.resource({
   Name = "Globular Clusters Textures",
   Type = "HttpSynchronization",
   Identifier = "digitaluniverse_globularclusters_textures",
   Version = 1
 })
 
-local speck = asset.syncedResource({
+local speck = asset.resource({
   Name = "Globular Clusters Speck Files",
   Type = "HttpSynchronization",
   Identifier = "digitaluniverse_globularclusters_speck",
diff --git a/data/assets/scene/digitaluniverse/grids.asset b/data/assets/scene/digitaluniverse/grids.asset
index f37098eae8..65989fab4d 100644
--- a/data/assets/scene/digitaluniverse/grids.asset
+++ b/data/assets/scene/digitaluniverse/grids.asset
@@ -3,7 +3,7 @@ local earthTransforms = asset.require("scene/solarsystem/planets/earth/transform
 
 
 
-local speck = asset.syncedResource({
+local speck = asset.resource({
   Name = "Grids Speck Files",
   Type = "HttpSynchronization",
   Identifier = "digitaluniverse_grids_speck",
diff --git a/data/assets/scene/digitaluniverse/groups.asset b/data/assets/scene/digitaluniverse/groups.asset
index 6279d5cbd1..03cb117c68 100644
--- a/data/assets/scene/digitaluniverse/groups.asset
+++ b/data/assets/scene/digitaluniverse/groups.asset
@@ -1,4 +1,4 @@
-local speck = asset.syncedResource({
+local speck = asset.resource({
   Name = "Galaxy Groups Speck Files",
   Type = "HttpSynchronization",
   Identifier = "digitaluniverse_groups_speck",
diff --git a/data/assets/scene/digitaluniverse/h2regions.asset b/data/assets/scene/digitaluniverse/h2regions.asset
index 30e7f29607..c5fb3baced 100644
--- a/data/assets/scene/digitaluniverse/h2regions.asset
+++ b/data/assets/scene/digitaluniverse/h2regions.asset
@@ -1,11 +1,11 @@
-local textures = asset.syncedResource({
+local textures = asset.resource({
   Name = "HII Regions Textures",
   Type = "HttpSynchronization",
   Identifier = "digitaluniverse_h2regions_textures",
   Version = 1
 })
 
-local speck = asset.syncedResource({
+local speck = asset.resource({
   Name = "HII Regions Speck Files",
   Type = "HttpSynchronization",
   Identifier = "digitaluniverse_h2regions_speck",
diff --git a/data/assets/scene/digitaluniverse/hdf.asset b/data/assets/scene/digitaluniverse/hdf.asset
index 46416d9722..f34094b0c2 100644
--- a/data/assets/scene/digitaluniverse/hdf.asset
+++ b/data/assets/scene/digitaluniverse/hdf.asset
@@ -1,18 +1,18 @@
-local circle = asset.syncedResource({
+local circle = asset.resource({
   Name = "Circle",
   Type = "HttpSynchronization",
   Identifier = "circle_image",
   Version = 1
 })
 
-local HUDFSpeck = asset.syncedResource({
+local HUDFSpeck = asset.resource({
   Name = "HUDF Speck",
   Type = "HttpSynchronization",
   Identifier = "digitaluniverse_hudf_speck",
   Version = 1
 })
 
-local ColorMap = asset.syncedResource({
+local ColorMap = asset.resource({
   Name = "HUDF color map",
   Type = "HttpSynchronization",
   Identifier = "digitaluniverse_hudf_textures",
diff --git a/data/assets/scene/digitaluniverse/localdwarfs.asset b/data/assets/scene/digitaluniverse/localdwarfs.asset
index e18fc4b7a7..7426659150 100644
--- a/data/assets/scene/digitaluniverse/localdwarfs.asset
+++ b/data/assets/scene/digitaluniverse/localdwarfs.asset
@@ -1,11 +1,11 @@
-local textures = asset.syncedResource({
+local textures = asset.resource({
   Name = "Local Dwarfs Textures",
   Type = "HttpSynchronization",
   Identifier = "digitaluniverse_localdwarfs_textures",
   Version = 1
 })
 
-local speck = asset.syncedResource({
+local speck = asset.resource({
   Name = "Local Dwarfs Speck Files",
   Type = "HttpSynchronization",
   Identifier = "digitaluniverse_localdwarfs_speck",
diff --git a/data/assets/scene/digitaluniverse/milkyway.asset b/data/assets/scene/digitaluniverse/milkyway.asset
index 98544a780f..6e1445e36f 100644
--- a/data/assets/scene/digitaluniverse/milkyway.asset
+++ b/data/assets/scene/digitaluniverse/milkyway.asset
@@ -1,11 +1,11 @@
-local planeTextures = asset.syncedResource({
+local planeTextures = asset.resource({
   Name = "Milky Way Plane Textures",
   Type = "HttpSynchronization",
   Identifier = "digitaluniverse_milkyway_textures",
   Version = 2
 })
 
-local planeSpeck = asset.syncedResource({
+local planeSpeck = asset.resource({
   Name = "Milky Way Plane Speck",
   Type = "HttpSynchronization",
   Identifier = "digitaluniverse_milkyway_speck",
diff --git a/data/assets/scene/digitaluniverse/milkyway_arm_labels.asset b/data/assets/scene/digitaluniverse/milkyway_arm_labels.asset
index 4ff17170e0..4961fc648a 100644
--- a/data/assets/scene/digitaluniverse/milkyway_arm_labels.asset
+++ b/data/assets/scene/digitaluniverse/milkyway_arm_labels.asset
@@ -1,11 +1,11 @@
-local planeTextures = asset.syncedResource({
+local planeTextures = asset.resource({
   Name = "Milky Way Plane Textures",
   Type = "HttpSynchronization",
   Identifier = "digitaluniverse_milkyway_textures",
   Version = 2
 })
 
-local planeSpeck = asset.syncedResource({
+local planeSpeck = asset.resource({
   Name = "Milky Way Plane Speck",
   Type = "HttpSynchronization",
   Identifier = "digitaluniverse_milkyway_speck",
diff --git a/data/assets/scene/digitaluniverse/milkyway_label.asset b/data/assets/scene/digitaluniverse/milkyway_label.asset
index d4431cb0eb..c2098b14ff 100644
--- a/data/assets/scene/digitaluniverse/milkyway_label.asset
+++ b/data/assets/scene/digitaluniverse/milkyway_label.asset
@@ -1,4 +1,4 @@
-local homespeck = asset.syncedResource({
+local homespeck = asset.resource({
   Name = "Home Speck File",
   Type = "HttpSynchronization",
   Identifier = "digitaluniverse_home_speck",
diff --git a/data/assets/scene/digitaluniverse/milkyway_sphere.asset b/data/assets/scene/digitaluniverse/milkyway_sphere.asset
index 1c4f51a7ad..ff91649fc0 100644
--- a/data/assets/scene/digitaluniverse/milkyway_sphere.asset
+++ b/data/assets/scene/digitaluniverse/milkyway_sphere.asset
@@ -1,4 +1,4 @@
-local sphereTextures = asset.syncedResource({
+local sphereTextures = asset.resource({
   Name = "Milky Way Sphere Textures",
   Type = "HttpSynchronization",
   Identifier = "milkyway_textures",
diff --git a/data/assets/scene/digitaluniverse/obassociations.asset b/data/assets/scene/digitaluniverse/obassociations.asset
index 72f5c036e3..73644a8c82 100644
--- a/data/assets/scene/digitaluniverse/obassociations.asset
+++ b/data/assets/scene/digitaluniverse/obassociations.asset
@@ -1,11 +1,11 @@
-local textures = asset.syncedResource({
+local textures = asset.resource({
   Name = "OB Associations Textures",
   Type = "HttpSynchronization",
   Identifier = "digitaluniverse_obassociations_textures",
   Version = 1
 })
 
-local speck = asset.syncedResource({
+local speck = asset.resource({
   Name = "OB Associations Speck Files",
   Type = "HttpSynchronization",
   Identifier = "digitaluniverse_obassociations_speck",
diff --git a/data/assets/scene/digitaluniverse/openclusters.asset b/data/assets/scene/digitaluniverse/openclusters.asset
index dd7197b1ca..e16a67dcbf 100644
--- a/data/assets/scene/digitaluniverse/openclusters.asset
+++ b/data/assets/scene/digitaluniverse/openclusters.asset
@@ -1,11 +1,11 @@
-local textures = asset.syncedResource({
+local textures = asset.resource({
   Name = "Open Clusters Textures",
   Type = "HttpSynchronization",
   Identifier = "digitaluniverse_openclusters_textures",
   Version = 1
 })
 
-local speck = asset.syncedResource({
+local speck = asset.resource({
   Name = "Open Clusters Speck Files",
   Type = "HttpSynchronization",
   Identifier = "digitaluniverse_openclusters_speck",
diff --git a/data/assets/scene/digitaluniverse/planetarynebulae.asset b/data/assets/scene/digitaluniverse/planetarynebulae.asset
index afff444408..48837eac3d 100644
--- a/data/assets/scene/digitaluniverse/planetarynebulae.asset
+++ b/data/assets/scene/digitaluniverse/planetarynebulae.asset
@@ -1,11 +1,11 @@
-local textures = asset.syncedResource({
+local textures = asset.resource({
   Name = "Planetary Nebulae Textures",
   Type = "HttpSynchronization",
   Identifier = "digitaluniverse_planetarynebulae_textures",
   Version = 1
 })
 
-local speck = asset.syncedResource({
+local speck = asset.resource({
   Name = "Planetary Nebulae Speck Files",
   Type = "HttpSynchronization",
   Identifier = "digitaluniverse_planetarynebulae_speck",
diff --git a/data/assets/scene/digitaluniverse/pulsars.asset b/data/assets/scene/digitaluniverse/pulsars.asset
index e08ea7dbeb..8118e80fe8 100644
--- a/data/assets/scene/digitaluniverse/pulsars.asset
+++ b/data/assets/scene/digitaluniverse/pulsars.asset
@@ -1,11 +1,11 @@
-local textures = asset.syncedResource({
+local textures = asset.resource({
   Name = "Pulsars Textures",
   Type = "HttpSynchronization",
   Identifier = "digitaluniverse_pulsars_textures",
   Version = 1
 })
 
-local speck = asset.syncedResource({
+local speck = asset.resource({
   Name = "Pulsars Speck Files",
   Type = "HttpSynchronization",
   Identifier = "digitaluniverse_pulsars_speck",
diff --git a/data/assets/scene/digitaluniverse/quasars.asset b/data/assets/scene/digitaluniverse/quasars.asset
index d78ba9cc68..783b1b9b1b 100644
--- a/data/assets/scene/digitaluniverse/quasars.asset
+++ b/data/assets/scene/digitaluniverse/quasars.asset
@@ -1,18 +1,18 @@
-local textures = asset.syncedResource({
+local textures = asset.resource({
   Name = "Quasars Textures",
   Type = "HttpSynchronization",
   Identifier = "digitaluniverse_quasars_textures",
   Version = 2
 })
 
-local speck = asset.syncedResource({
+local speck = asset.resource({
   Name = "Quasars Speck Files",
   Type = "HttpSynchronization",
   Identifier = "digitaluniverse_quasars_speck",
   Version = 2
 })
 
-local colormaps = asset.syncedResource({
+local colormaps = asset.resource({
   Name = "Quasars Colormap",
   Type = "HttpSynchronization",
   Identifier = "digitaluniverse_quasars_colormap",
diff --git a/data/assets/scene/digitaluniverse/sdss.asset b/data/assets/scene/digitaluniverse/sdss.asset
index 36925c1b4c..b1159ddf92 100644
--- a/data/assets/scene/digitaluniverse/sdss.asset
+++ b/data/assets/scene/digitaluniverse/sdss.asset
@@ -1,11 +1,11 @@
-local textures = asset.syncedResource({
+local textures = asset.resource({
   Name = "Sloan Digital Sky Survey Textures",
   Type = "HttpSynchronization",
   Identifier = "digitaluniverse_sloandss_textures",
   Version = 2
 })
 
-local speck = asset.syncedResource({
+local speck = asset.resource({
   Name = "Sloan Digital Sky Survey Speck Files",
   Type = "HttpSynchronization",
   Identifier = "digitaluniverse_sloandss_speck",
diff --git a/data/assets/scene/digitaluniverse/starlabels.asset b/data/assets/scene/digitaluniverse/starlabels.asset
index 052001c823..bd33b78b85 100644
--- a/data/assets/scene/digitaluniverse/starlabels.asset
+++ b/data/assets/scene/digitaluniverse/starlabels.asset
@@ -1,4 +1,4 @@
-local speck = asset.syncedResource({
+local speck = asset.resource({
   Name = "Star Labels Speck Files",
   Type = "HttpSynchronization",
   Identifier = "digitaluniverse_starlabels_speck",
diff --git a/data/assets/scene/digitaluniverse/starorbits.asset b/data/assets/scene/digitaluniverse/starorbits.asset
index b56ebcdc5f..a233d14146 100644
--- a/data/assets/scene/digitaluniverse/starorbits.asset
+++ b/data/assets/scene/digitaluniverse/starorbits.asset
@@ -3,7 +3,7 @@ local earth_transforms = asset.require("scene/solarsystem/planets/earth/transfor
 
 
 
-local speck = asset.syncedResource({
+local speck = asset.resource({
   Name = "Grids Speck Files",
   Type = "HttpSynchronization",
   Identifier = "digitaluniverse_starorbits_speck",
diff --git a/data/assets/scene/digitaluniverse/stars.asset b/data/assets/scene/digitaluniverse/stars.asset
index dd818db75b..81ec0fa7d2 100644
--- a/data/assets/scene/digitaluniverse/stars.asset
+++ b/data/assets/scene/digitaluniverse/stars.asset
@@ -1,25 +1,25 @@
-local speck = asset.syncedResource({
+local speck = asset.resource({
   Name = "Stars Speck Files",
   Type = "HttpSynchronization",
   Identifier = "stars_du",
   Version = 5
 })
 
-local sunspeck = asset.syncedResource({
+local sunspeck = asset.resource({
   Name = "Stars Speck Files",
   Type = "HttpSynchronization",
   Identifier = "digitaluniverse_sunstar_speck",
   Version = 1
 })
 
-local colormaps = asset.syncedResource({
+local colormaps = asset.resource({
   Name = "Stars Color Table",
   Type = "HttpSynchronization",
   Identifier = "stars_colormap",
   Version = 3
 })
 
-local textures = asset.syncedResource({
+local textures = asset.resource({
   Name = "Stars Textures",
   Type = "HttpSynchronization",
   Identifier = "stars_textures",
diff --git a/data/assets/scene/digitaluniverse/superclusters.asset b/data/assets/scene/digitaluniverse/superclusters.asset
index b40fe08b91..4959dc3c47 100644
--- a/data/assets/scene/digitaluniverse/superclusters.asset
+++ b/data/assets/scene/digitaluniverse/superclusters.asset
@@ -1,11 +1,11 @@
-local textures = asset.syncedResource({
+local textures = asset.resource({
   Name = "Galaxy Superclusters Textures",
   Type = "HttpSynchronization",
   Identifier = "digitaluniverse_superclusters_textures",
   Version = 2
 })
 
-local speck = asset.syncedResource({
+local speck = asset.resource({
   Name = "Galaxy Superclusters Speck Files",
   Type = "HttpSynchronization",
   Identifier = "digitaluniverse_superclusters_speck",
diff --git a/data/assets/scene/digitaluniverse/supernovaremnants.asset b/data/assets/scene/digitaluniverse/supernovaremnants.asset
index c0909ccd2c..5332888150 100644
--- a/data/assets/scene/digitaluniverse/supernovaremnants.asset
+++ b/data/assets/scene/digitaluniverse/supernovaremnants.asset
@@ -1,11 +1,11 @@
-local textures = asset.syncedResource({
+local textures = asset.resource({
   Name = "Supernova Remnants Textures",
   Type = "HttpSynchronization",
   Identifier = "digitaluniverse_supernovaremnants_textures",
   Version = 1
 })
 
-local speck = asset.syncedResource({
+local speck = asset.resource({
   Name = "Supernova Remnants Speck Files",
   Type = "HttpSynchronization",
   Identifier = "digitaluniverse_supernovaremnants_speck",
diff --git a/data/assets/scene/digitaluniverse/tully.asset b/data/assets/scene/digitaluniverse/tully.asset
index fe206f45bf..b4a20b1e4b 100644
--- a/data/assets/scene/digitaluniverse/tully.asset
+++ b/data/assets/scene/digitaluniverse/tully.asset
@@ -1,11 +1,11 @@
-local textures = asset.syncedResource({
+local textures = asset.resource({
   Name = "Tully Textures",
   Type = "HttpSynchronization",
   Identifier = "digitaluniverse_tully_textures",
   Version = 3
 })
 
-local speck = asset.syncedResource({
+local speck = asset.resource({
   Name = "Tully Speck Files",
   Type = "HttpSynchronization",
   Identifier = "digitaluniverse_tully_speck",
diff --git a/data/assets/scene/digitaluniverse/voids.asset b/data/assets/scene/digitaluniverse/voids.asset
index d8dedcca5b..6f38436ee0 100644
--- a/data/assets/scene/digitaluniverse/voids.asset
+++ b/data/assets/scene/digitaluniverse/voids.asset
@@ -1,4 +1,4 @@
-local speck = asset.syncedResource({
+local speck = asset.resource({
   Name = "Voids Speck Files",
   Type = "HttpSynchronization",
   Identifier = "digitaluniverse_voids_speck",
diff --git a/data/assets/scene/milkyway/constellations/constellation_art.asset b/data/assets/scene/milkyway/constellations/constellation_art.asset
index f022e39395..d81539ee8a 100644
--- a/data/assets/scene/milkyway/constellations/constellation_art.asset
+++ b/data/assets/scene/milkyway/constellations/constellation_art.asset
@@ -1,17 +1,17 @@
-local constellationsCSV = asset.localResource("constellation_data.csv")
+local constellationsCSV = asset.resource("constellation_data.csv")
 local transforms = asset.require("scene/solarsystem/sun/transforms")
 local constellations_helper = asset.require("util/constellations_helper")
 
 
 
-local images = asset.syncedResource({
+local images = asset.resource({
   Name = "Constellation Images",
   Type = "HttpSynchronization",
   Identifier = "constellation_images",
   Version = 4
 })
 
-local data = asset.syncedResource({
+local data = asset.resource({
   Name = "Constellation Files",
   Type = "HttpSynchronization",
   Identifier = "digitaluniverse_constellations_data",
diff --git a/data/assets/scene/milkyway/gaia/apogee.asset b/data/assets/scene/milkyway/gaia/apogee.asset
index bdfd70d925..31a7fd0de8 100644
--- a/data/assets/scene/milkyway/gaia/apogee.asset
+++ b/data/assets/scene/milkyway/gaia/apogee.asset
@@ -1,18 +1,18 @@
-local speck = asset.syncedResource({
+local speck = asset.resource({
   Name = "Apogee Speck Files",
   Type = "HttpSynchronization",
   Identifier = "gaia_apogee",
   Version = 1
 })
 
-local colormaps = asset.syncedResource({
+local colormaps = asset.resource({
   Name = "Stars Color Table",
   Type = "HttpSynchronization",
   Identifier = "stars_colormap",
   Version = 3
 })
 
-local textures = asset.syncedResource({
+local textures = asset.resource({
   Name = "Stars Textures",
   Type = "HttpSynchronization",
   Identifier = "stars_textures",
diff --git a/data/assets/scene/milkyway/gaia/gaia_dr2_download_stars.asset b/data/assets/scene/milkyway/gaia/gaia_dr2_download_stars.asset
index 1b23bf6ab6..0ea6813df0 100644
--- a/data/assets/scene/milkyway/gaia/gaia_dr2_download_stars.asset
+++ b/data/assets/scene/milkyway/gaia/gaia_dr2_download_stars.asset
@@ -1,7 +1,7 @@
 -- Download a dataset of 618 million stars (28 GB), already preprocessed and stored in a binary octree.
 -- The octree was generated from the full DR2 by filtering away all stars with a parallax error higher than 0.5
 -- Max Star Per Node = 50,000 and max distance = 500kpc
-local gaia618Destination = asset.syncedResource({
+local gaia618Destination = asset.resource({
   Name = "Gaia DR2 618M Octree",
   Type = "HttpSynchronization",
   Identifier = "gaia_stars_618M_octree",
@@ -14,7 +14,7 @@ local gaia618DestinationExtracted = gaia618Destination .. "data"
 -- Download the full DR2 dataset with 24 values per star (preprocessed with theReadFitsTask (gaia_read.task) into 8 binary files).
 -- From these files new subsets can be created with the ConstructOctreeTask (gaia_octree.task).
 -- Total size of download is 151 GB.
-local gaiaFull = asset.syncedResource({
+local gaiaFull = asset.resource({
   Name = "Gaia DR2 Full Raw",
   Type = "HttpSynchronization",
   Identifier = "gaia_stars_dr2_raw",
diff --git a/data/assets/scene/milkyway/gaia/gaiastars.asset b/data/assets/scene/milkyway/gaia/gaiastars.asset
index 9e46a60b54..3123918b81 100644
--- a/data/assets/scene/milkyway/gaia/gaiastars.asset
+++ b/data/assets/scene/milkyway/gaia/gaiastars.asset
@@ -6,21 +6,21 @@ end
 
 -- Download a preprocessed binary octree of Radial Velocity subset values per star
 -- (preprocessed into 8 binary files).
-local starsFolder = asset.syncedResource({
+local starsFolder = asset.resource({
   Name = "Gaia Stars RV",
   Type = "HttpSynchronization",
   Identifier = "gaia_stars_rv_octree",
   Version = 1
 })
 
-local colormaps = asset.syncedResource({
+local colormaps = asset.resource({
   Name = "Stars Color Table",
   Type = "HttpSynchronization",
   Identifier = "stars_colormap",
   Version = 3
 })
 
-local textures = asset.syncedResource({
+local textures = asset.resource({
   Name = "Stars Textures",
   Type = "HttpSynchronization",
   Identifier = "stars_textures",
diff --git a/data/assets/scene/milkyway/gaia/galah.asset b/data/assets/scene/milkyway/gaia/galah.asset
index 4ef21201e8..d232f4eb9a 100644
--- a/data/assets/scene/milkyway/gaia/galah.asset
+++ b/data/assets/scene/milkyway/gaia/galah.asset
@@ -1,18 +1,18 @@
-local speck = asset.syncedResource({
+local speck = asset.resource({
   Name = "Galah Speck Files",
   Type = "HttpSynchronization",
   Identifier = "gaia_galah",
   Version = 1
 })
 
-local colormaps = asset.syncedResource({
+local colormaps = asset.resource({
   Name = "Stars Color Table",
   Type = "HttpSynchronization",
   Identifier = "stars_colormap",
   Version = 3
 })
 
-local textures = asset.syncedResource({
+local textures = asset.resource({
   Name = "Stars Textures",
   Type = "HttpSynchronization",
   Identifier = "stars_textures",
diff --git a/data/assets/scene/milkyway/habitable_zones/habitable_zone_textures.asset b/data/assets/scene/milkyway/habitable_zones/habitable_zone_textures.asset
index 1ace42d07d..b51e5f9767 100644
--- a/data/assets/scene/milkyway/habitable_zones/habitable_zone_textures.asset
+++ b/data/assets/scene/milkyway/habitable_zones/habitable_zone_textures.asset
@@ -1,4 +1,4 @@
-local texturesPath = asset.syncedResource({
+local texturesPath = asset.resource({
   Name = "Habitable Zone Textures",
   Type = "HttpSynchronization",
   Identifier = "habitable_zone_textures",
diff --git a/data/assets/scene/milkyway/milkyway/eso.asset b/data/assets/scene/milkyway/milkyway/eso.asset
index 47a51aee35..8d343964f0 100644
--- a/data/assets/scene/milkyway/milkyway/eso.asset
+++ b/data/assets/scene/milkyway/milkyway/eso.asset
@@ -1,4 +1,4 @@
-local textures = asset.syncedResource({
+local textures = asset.resource({
   Name = "ESO Milky Way Textures",
   Type = "HttpSynchronization",
   Identifier = "milkyway-eso_textures",
diff --git a/data/assets/scene/milkyway/milkyway/volume.asset b/data/assets/scene/milkyway/milkyway/volume.asset
index b8959ed991..88b151040d 100644
--- a/data/assets/scene/milkyway/milkyway/volume.asset
+++ b/data/assets/scene/milkyway/milkyway/volume.asset
@@ -2,7 +2,7 @@ local transforms = asset.require("scene/solarsystem/sun/transforms")
 
 
 
-local data = asset.syncedResource({
+local data = asset.resource({
   Name = "Milkyway Volume Data",
   Type = "HttpSynchronization",
   Identifier = "milkyway_volume_data",
diff --git a/data/assets/scene/milkyway/objects/orionnebula/cluster.asset b/data/assets/scene/milkyway/objects/orionnebula/cluster.asset
index 169e2ae1b7..7b7b927925 100644
--- a/data/assets/scene/milkyway/objects/orionnebula/cluster.asset
+++ b/data/assets/scene/milkyway/objects/orionnebula/cluster.asset
@@ -2,7 +2,7 @@ local transforms = asset.require("./transforms")
 
 
 
-local sync = asset.syncedResource({
+local sync = asset.resource({
   Name = "Orion Nebula Star Cluster",
   Type = "HttpSynchronization",
   Identifier = "orion_nebula_star_cluster",
diff --git a/data/assets/scene/milkyway/objects/orionnebula/nebula.asset b/data/assets/scene/milkyway/objects/orionnebula/nebula.asset
index f7c4a66ab3..0845c6dfae 100644
--- a/data/assets/scene/milkyway/objects/orionnebula/nebula.asset
+++ b/data/assets/scene/milkyway/objects/orionnebula/nebula.asset
@@ -3,7 +3,7 @@ local transforms = asset.require("./transforms")
 
 
 
-local sync = asset.syncedResource({
+local sync = asset.resource({
   Name = "Orion Nebula Model",
   Type = "HttpSynchronization",
   Identifier = "orion_nebula_model",
diff --git a/data/assets/scene/milkyway/stars/denver.asset b/data/assets/scene/milkyway/stars/denver.asset
index a8924ad47e..e9a31d0592 100644
--- a/data/assets/scene/milkyway/stars/denver.asset
+++ b/data/assets/scene/milkyway/stars/denver.asset
@@ -1,18 +1,18 @@
-local textures = asset.syncedResource({
+local textures = asset.resource({
   Name = "Stars Textures",
   Type = "HttpSynchronization",
   Identifier = "stars-denver_textures",
   Version = 1
 })
 
-local speck = asset.syncedResource({
+local speck = asset.resource({
   Name = "Stars Speck Files",
   Type = "HttpSynchronization",
   Identifier = "stars-denver_speck",
   Version = 1
 })
 
-local colorLUT = asset.syncedResource({
+local colorLUT = asset.resource({
   Name = "Stars Color Table",
   Type = "HttpSynchronization",
   Identifier = "stars-denver_colormap",
diff --git a/data/assets/scene/solarsystem/dwarf_planets/ceres/kernels.asset b/data/assets/scene/solarsystem/dwarf_planets/ceres/kernels.asset
index 40f52766a5..bc0488e33f 100644
--- a/data/assets/scene/solarsystem/dwarf_planets/ceres/kernels.asset
+++ b/data/assets/scene/solarsystem/dwarf_planets/ceres/kernels.asset
@@ -1,4 +1,4 @@
-local kernels = asset.syncedResource({
+local kernels = asset.resource({
   Name = "Ceres Kernels",
   Type = "HttpSynchronization",
   Identifier = "ceres_kernels",
diff --git a/data/assets/scene/solarsystem/dwarf_planets/ceres/layers/colorlayers/lamo.asset b/data/assets/scene/solarsystem/dwarf_planets/ceres/layers/colorlayers/lamo.asset
index 794caa9382..7511aa0966 100644
--- a/data/assets/scene/solarsystem/dwarf_planets/ceres/layers/colorlayers/lamo.asset
+++ b/data/assets/scene/solarsystem/dwarf_planets/ceres/layers/colorlayers/lamo.asset
@@ -6,7 +6,7 @@ local Layer = {
   Identifier = "LAMO_Sweden",
   Name = "LAMO [Sweden]",
   Enabled = asset.enabled,
-  FilePath = asset.localResource("lamo.wms")
+  FilePath = asset.resource("lamo.wms")
 }
 
 
diff --git a/data/assets/scene/solarsystem/dwarf_planets/ceres/layers/colorlayers/lamo_local.asset b/data/assets/scene/solarsystem/dwarf_planets/ceres/layers/colorlayers/lamo_local.asset
index 4bfd3e4e7d..762b2f69af 100644
--- a/data/assets/scene/solarsystem/dwarf_planets/ceres/layers/colorlayers/lamo_local.asset
+++ b/data/assets/scene/solarsystem/dwarf_planets/ceres/layers/colorlayers/lamo_local.asset
@@ -2,7 +2,7 @@ local globe = asset.require("../../ceres")
 
 
 
-local textures = asset.syncedResource({
+local textures = asset.resource({
   Name = "Ceres Textures",
   Type = "HttpSynchronization",
   Identifier = "ceres_textures",
diff --git a/data/assets/scene/solarsystem/dwarf_planets/eris/planet.asset b/data/assets/scene/solarsystem/dwarf_planets/eris/planet.asset
index 6f83956938..29248d81fd 100644
--- a/data/assets/scene/solarsystem/dwarf_planets/eris/planet.asset
+++ b/data/assets/scene/solarsystem/dwarf_planets/eris/planet.asset
@@ -3,7 +3,7 @@ local transforms = asset.require("./transforms")
 
 
 
-local modelFolder = asset.syncedResource({
+local modelFolder = asset.resource({
   Name = "Eris Model",
   Type = "HttpSynchronization",
   Identifier = "eris_model",
diff --git a/data/assets/scene/solarsystem/dwarf_planets/haumea/planet.asset b/data/assets/scene/solarsystem/dwarf_planets/haumea/planet.asset
index 6dbbaabdea..6f3acf92ff 100644
--- a/data/assets/scene/solarsystem/dwarf_planets/haumea/planet.asset
+++ b/data/assets/scene/solarsystem/dwarf_planets/haumea/planet.asset
@@ -3,7 +3,7 @@ local transforms = asset.require("./transforms")
 
 
 
-local modelFolder = asset.syncedResource({
+local modelFolder = asset.resource({
   Name = "Hamuea Model",
   Type = "HttpSynchronization",
   Identifier = "hamuea_model",
diff --git a/data/assets/scene/solarsystem/dwarf_planets/makemake/planet.asset b/data/assets/scene/solarsystem/dwarf_planets/makemake/planet.asset
index da89544973..22e1780f5b 100644
--- a/data/assets/scene/solarsystem/dwarf_planets/makemake/planet.asset
+++ b/data/assets/scene/solarsystem/dwarf_planets/makemake/planet.asset
@@ -3,7 +3,7 @@ local transforms = asset.require("./transforms")
 
 
 
-local modelFolder = asset.syncedResource({
+local modelFolder = asset.resource({
   Name = "Makemake Model",
   Type = "HttpSynchronization",
   Identifier = "makemake_model",
diff --git a/data/assets/scene/solarsystem/dwarf_planets/pluto/charon/charon.asset b/data/assets/scene/solarsystem/dwarf_planets/pluto/charon/charon.asset
index 5b774f1bd9..9ecc4c16f6 100644
--- a/data/assets/scene/solarsystem/dwarf_planets/pluto/charon/charon.asset
+++ b/data/assets/scene/solarsystem/dwarf_planets/pluto/charon/charon.asset
@@ -4,7 +4,7 @@ asset.require("../trail")
 
 
 
-local labelsPath = asset.syncedResource({
+local labelsPath = asset.resource({
   Name = "Pluto Labels",
   Type = "HttpSynchronization",
   Identifier = "pluto_labels",
diff --git a/data/assets/scene/solarsystem/dwarf_planets/pluto/kernels.asset b/data/assets/scene/solarsystem/dwarf_planets/pluto/kernels.asset
index e96141f851..b4dfc571e6 100644
--- a/data/assets/scene/solarsystem/dwarf_planets/pluto/kernels.asset
+++ b/data/assets/scene/solarsystem/dwarf_planets/pluto/kernels.asset
@@ -1,4 +1,4 @@
-local kernels = asset.syncedResource({
+local kernels = asset.resource({
   Name = "Pluto Kernels",
   Type = "HttpSynchronization",
   Identifier = "pluto_kernels",
diff --git a/data/assets/scene/solarsystem/dwarf_planets/pluto/pluto.asset b/data/assets/scene/solarsystem/dwarf_planets/pluto/pluto.asset
index 67b23a287f..9b6125e14f 100644
--- a/data/assets/scene/solarsystem/dwarf_planets/pluto/pluto.asset
+++ b/data/assets/scene/solarsystem/dwarf_planets/pluto/pluto.asset
@@ -4,7 +4,7 @@ asset.require("./trail")
 
 
 
-local labelsPath = asset.syncedResource({
+local labelsPath = asset.resource({
   Name = "Pluto Labels",
   Type = "HttpSynchronization",
   Identifier = "pluto_labels",
diff --git a/data/assets/scene/solarsystem/dwarf_planets/vesta/planet.asset b/data/assets/scene/solarsystem/dwarf_planets/vesta/planet.asset
index 3e1bd8f547..25c6c13c16 100644
--- a/data/assets/scene/solarsystem/dwarf_planets/vesta/planet.asset
+++ b/data/assets/scene/solarsystem/dwarf_planets/vesta/planet.asset
@@ -3,7 +3,7 @@ local transforms = asset.require("./transforms")
 
 
 
-local models = asset.syncedResource({
+local models = asset.resource({
   Name = "Vesta Models",
   Type = "HttpSynchronization",
   Identifier = "vesta_model",
diff --git a/data/assets/scene/solarsystem/heliosphere/2012/sun_earth_2012_fieldlines_batsrus.asset b/data/assets/scene/solarsystem/heliosphere/2012/sun_earth_2012_fieldlines_batsrus.asset
index a80683ba5a..a7dbc5bcad 100644
--- a/data/assets/scene/solarsystem/heliosphere/2012/sun_earth_2012_fieldlines_batsrus.asset
+++ b/data/assets/scene/solarsystem/heliosphere/2012/sun_earth_2012_fieldlines_batsrus.asset
@@ -3,14 +3,14 @@ local transforms = asset.require("scene/solarsystem/planets/earth/magnetosphere/
 
 
 
-local transferFunctions = asset.syncedResource({
+local transferFunctions = asset.resource({
   Name = "Fieldlines Transfer Functions",
   Type = "HttpSynchronization",
   Identifier = "sun_earth_event_july_2012-fieldlines_transferfunctions",
   Version = 2
 })
 
-local fieldlineData = asset.syncedResource({
+local fieldlineData = asset.resource({
   Name = "Fieldlines Data BATSRUS",
   Type = "HttpSynchronization",
   Identifier = "sun_earth_event_july_2012-batsrus",
diff --git a/data/assets/scene/solarsystem/heliosphere/2012/sun_earth_2012_fieldlines_enlil.asset b/data/assets/scene/solarsystem/heliosphere/2012/sun_earth_2012_fieldlines_enlil.asset
index 3287299a88..65288f08ce 100644
--- a/data/assets/scene/solarsystem/heliosphere/2012/sun_earth_2012_fieldlines_enlil.asset
+++ b/data/assets/scene/solarsystem/heliosphere/2012/sun_earth_2012_fieldlines_enlil.asset
@@ -3,14 +3,14 @@ local transforms = asset.require("scene/solarsystem/sun/transforms_heliosphere")
 
 
 
-local transferFunctions = asset.syncedResource({
+local transferFunctions = asset.resource({
   Name = "Fieldlines Transfer Functions",
   Type = "HttpSynchronization",
   Identifier = "sun_earth_event_july_2012-fieldlines_transferfunctions",
   Version = 1
 })
 
-local fieldlineData = asset.syncedResource({
+local fieldlineData = asset.resource({
   Name = "Fieldlines Data ENLIL",
   Type = "HttpSynchronization",
   Identifier = "sun_earth_event_july_2012-enlil",
diff --git a/data/assets/scene/solarsystem/heliosphere/2012/sun_earth_2012_fieldlines_pfss.asset b/data/assets/scene/solarsystem/heliosphere/2012/sun_earth_2012_fieldlines_pfss.asset
index f3dc419f1e..271a84b9bb 100644
--- a/data/assets/scene/solarsystem/heliosphere/2012/sun_earth_2012_fieldlines_pfss.asset
+++ b/data/assets/scene/solarsystem/heliosphere/2012/sun_earth_2012_fieldlines_pfss.asset
@@ -2,14 +2,14 @@ local transforms = asset.require("scene/solarsystem/sun/transforms_heliosphere")
 
 
 
-local transferFunctions = asset.syncedResource({
+local transferFunctions = asset.resource({
   Name = "Fieldlines Transfer Functions",
   Type = "HttpSynchronization",
   Identifier = "sun_earth_event_july_2012-fieldlines_transferfunctions",
   Version = 1
 })
 
-local fieldlineData = asset.syncedResource({
+local fieldlineData = asset.resource({
   Name = "Fieldlines Data PFSS",
   Type = "HttpSynchronization",
   Identifier = "sun_earth_event_july_2012-pfss",
diff --git a/data/assets/scene/solarsystem/heliosphere/bastille_day/density_volume.asset b/data/assets/scene/solarsystem/heliosphere/bastille_day/density_volume.asset
index bd70b8a781..de8e1848e3 100644
--- a/data/assets/scene/solarsystem/heliosphere/bastille_day/density_volume.asset
+++ b/data/assets/scene/solarsystem/heliosphere/bastille_day/density_volume.asset
@@ -4,7 +4,7 @@ local sunAsset = asset.require("scene/solarsystem/sun/sun")
 
 
 
-local densityDirectory = asset.syncedResource({
+local densityDirectory = asset.resource({
   Name = "Bastille Day MAS Density",
   Type = "HttpSynchronization",
   Identifier = "bastille_day_mas_density",
@@ -36,7 +36,7 @@ local DensityVolume = {
     Type = "RenderableTimeVaryingVolume",
     StepSize = 0.004,
     Brightness = 0.3,
-    TransferFunction = asset.localResource("transferfunctions/mas-mhd-r-squared-old.txt"),
+    TransferFunction = asset.resource("transferfunctions/mas-mhd-r-squared-old.txt"),
     SourceDirectory = densityDirectory,
     GridType = "Spherical",
     SecondsBefore = 24 * 60 * 60,
diff --git a/data/assets/scene/solarsystem/heliosphere/bastille_day/fieldlines.asset b/data/assets/scene/solarsystem/heliosphere/bastille_day/fieldlines.asset
index 6331867a88..104aa74034 100644
--- a/data/assets/scene/solarsystem/heliosphere/bastille_day/fieldlines.asset
+++ b/data/assets/scene/solarsystem/heliosphere/bastille_day/fieldlines.asset
@@ -4,7 +4,7 @@ local rot = asset.require("./carrington_to_heeq_rotation")
 
 
 
-local fieldlinesDirectory = asset.syncedResource({
+local fieldlinesDirectory = asset.resource({
   Name = "Bastille Day MAS Fieldlines",
   Type = "HttpSynchronization",
   Identifier = "bastille_day_mas_fieldlines",
@@ -34,8 +34,8 @@ local Fieldlines = {
     AlphaBlendlingEnabled = false,
     InputFileType = "Osfls",
     ColorTablePaths = {
-      asset.localResource("transferfunctions/density-fieldlines.txt"),
-      asset.localResource("transferfunctions/velocity-fieldlines.txt")
+      asset.resource("transferfunctions/density-fieldlines.txt"),
+      asset.resource("transferfunctions/velocity-fieldlines.txt")
     },
     ColorTableRanges = {
       { 0, 1000000 },
diff --git a/data/assets/scene/solarsystem/heliosphere/bastille_day/fluxnodes.asset b/data/assets/scene/solarsystem/heliosphere/bastille_day/fluxnodes.asset
index 283a18a4c9..fa63a907b4 100644
--- a/data/assets/scene/solarsystem/heliosphere/bastille_day/fluxnodes.asset
+++ b/data/assets/scene/solarsystem/heliosphere/bastille_day/fluxnodes.asset
@@ -4,7 +4,7 @@ local rot = asset.require("./carrington_to_heeq_rotation")
 
 
 
-local fluxNodesBinaries = asset.syncedResource({
+local fluxNodesBinaries = asset.resource({
   Name = "Bastille day Flux nodes binaries",
   Type = "HttpSynchronization",
   Identifier = "bastille_day_streamnodes_binaries",
@@ -25,7 +25,7 @@ local Fluxnodes = {
   Renderable = {
     Type = "RenderableFluxNodes",
     SourceFolder = fluxNodesBinaries,
-    ColorTablePath = asset.localResource("transferfunctions/CMR.txt"),
+    ColorTablePath = asset.resource("transferfunctions/CMR.txt"),
     ColorTableRange = { -2.0, 4.0 }
   },
   GUI = {
diff --git a/data/assets/scene/solarsystem/heliosphere/bastille_day/fluxnodescutplane.asset b/data/assets/scene/solarsystem/heliosphere/bastille_day/fluxnodescutplane.asset
index bcda52593c..1952a84819 100644
--- a/data/assets/scene/solarsystem/heliosphere/bastille_day/fluxnodescutplane.asset
+++ b/data/assets/scene/solarsystem/heliosphere/bastille_day/fluxnodescutplane.asset
@@ -4,14 +4,14 @@ local rot = asset.require("./carrington_to_heeq_rotation")
 
 
 
-local TexturesPathEquatorial = asset.syncedResource({
+local TexturesPathEquatorial = asset.resource({
 Type = "HttpSynchronization",
   Name = "cutplanes_textures",
   Identifier = "cutplanes_textures",
   Version = 1
 })
 
-local TexturesPathMeridial = asset.syncedResource({
+local TexturesPathMeridial = asset.resource({
   Type = "HttpSynchronization",
   Name = "cutplane_meridial_textures",
   Identifier = "cutplane_meridial_textures",
diff --git a/data/assets/scene/solarsystem/heliosphere/bastille_day/fluxnodeslegend.asset b/data/assets/scene/solarsystem/heliosphere/bastille_day/fluxnodeslegend.asset
index d9a3044da8..1f0fd9ede1 100644
--- a/data/assets/scene/solarsystem/heliosphere/bastille_day/fluxnodeslegend.asset
+++ b/data/assets/scene/solarsystem/heliosphere/bastille_day/fluxnodeslegend.asset
@@ -2,7 +2,7 @@ asset.require("spice/base")
 
 
 
-local TexturesPath = asset.syncedResource({
+local TexturesPath = asset.resource({
   Type = "HttpSynchronization",
   Name = "Streamnodes textures",
   Identifier = "streamnodes_legend",
diff --git a/data/assets/scene/solarsystem/heliosphere/bastille_day/magnetogram.asset b/data/assets/scene/solarsystem/heliosphere/bastille_day/magnetogram.asset
index 8794ab4411..2027018b5c 100644
--- a/data/assets/scene/solarsystem/heliosphere/bastille_day/magnetogram.asset
+++ b/data/assets/scene/solarsystem/heliosphere/bastille_day/magnetogram.asset
@@ -1,4 +1,4 @@
-local TexturesPath = asset.syncedResource({
+local TexturesPath = asset.resource({
   Name = "Bastille Day Magnetogram",
   Type = "HttpSynchronization",
   Identifier = "bastille_day_magnetogram",
diff --git a/data/assets/scene/solarsystem/interstellar/c-2019_q4_borisov.asset b/data/assets/scene/solarsystem/interstellar/c-2019_q4_borisov.asset
index 0fc0acc793..aa41c39912 100644
--- a/data/assets/scene/solarsystem/interstellar/c-2019_q4_borisov.asset
+++ b/data/assets/scene/solarsystem/interstellar/c-2019_q4_borisov.asset
@@ -2,7 +2,7 @@ local sunTransforms = asset.require("scene/solarsystem/sun/transforms")
 
 
 
-local trajectory = asset.syncedResource({
+local trajectory = asset.resource({
   Name = "C-2019 Q4 Borisov Trajectory",
   Type = "HttpSynchronization",
   Identifier = "borisov_horizons",
diff --git a/data/assets/scene/solarsystem/interstellar/oumuamua.asset b/data/assets/scene/solarsystem/interstellar/oumuamua.asset
index 0f206ee77c..a94947803e 100644
--- a/data/assets/scene/solarsystem/interstellar/oumuamua.asset
+++ b/data/assets/scene/solarsystem/interstellar/oumuamua.asset
@@ -2,7 +2,7 @@ local sunTransforms = asset.require("scene/solarsystem/sun/transforms")
 
 
 
-local trajectory = asset.syncedResource({
+local trajectory = asset.resource({
   Name = "'Oumuamua Trajectory",
   Type = "HttpSynchronization",
   Identifier = "oumuamua_horizons",
diff --git a/data/assets/scene/solarsystem/missions/apollo/11/apollo11.asset b/data/assets/scene/solarsystem/missions/apollo/11/apollo11.asset
index f4f45209a0..288734c935 100644
--- a/data/assets/scene/solarsystem/missions/apollo/11/apollo11.asset
+++ b/data/assets/scene/solarsystem/missions/apollo/11/apollo11.asset
@@ -9,14 +9,14 @@ local kernels = asset.require("./kernels")
 
 
 
-local models = asset.syncedResource({
+local models = asset.resource({
   Name = "Apollo Models",
   Type = "HttpSynchronization",
   Identifier = "apollo_11_models",
   Version = 1
 })
 
-local lemModel = asset.syncedResource({
+local lemModel = asset.resource({
   Name = "Apollo Lem Models",
   Type = "HttpSynchronization",
   Identifier = "apollo_lem_model",
diff --git a/data/assets/scene/solarsystem/missions/apollo/11/kernels.asset b/data/assets/scene/solarsystem/missions/apollo/11/kernels.asset
index 3a38755977..819532dae2 100644
--- a/data/assets/scene/solarsystem/missions/apollo/11/kernels.asset
+++ b/data/assets/scene/solarsystem/missions/apollo/11/kernels.asset
@@ -1,4 +1,4 @@
-local kernelsFolder = asset.syncedResource({
+local kernelsFolder = asset.resource({
   Name = "Apollo Kernels",
   Type = "HttpSynchronization",
   Identifier = "apollo_11_spice",
diff --git a/data/assets/scene/solarsystem/missions/apollo/11/lem.asset b/data/assets/scene/solarsystem/missions/apollo/11/lem.asset
index d88745f8b7..4be3fd6f8c 100644
--- a/data/assets/scene/solarsystem/missions/apollo/11/lem.asset
+++ b/data/assets/scene/solarsystem/missions/apollo/11/lem.asset
@@ -3,7 +3,7 @@ local moon_asset = asset.require("scene/solarsystem/planets/earth/moon/moon")
 
 
 
-local lem_model = asset.syncedResource({
+local lem_model = asset.resource({
   Name = "Apollo Lem Models",
   Type = "HttpSynchronization",
   Identifier = "apollo_lem_model",
diff --git a/data/assets/scene/solarsystem/missions/apollo/11/lem_flipbook.asset b/data/assets/scene/solarsystem/missions/apollo/11/lem_flipbook.asset
index a8f9f9d248..58f1aba6c4 100644
--- a/data/assets/scene/solarsystem/missions/apollo/11/lem_flipbook.asset
+++ b/data/assets/scene/solarsystem/missions/apollo/11/lem_flipbook.asset
@@ -9,7 +9,7 @@ local flipbookCount = 19
 
 local flipbook = nil
 
-local vrts = asset.syncedResource({
+local vrts = asset.resource({
   Name = "Apollo 11 Flipbook",
   Type = "HttpSynchronization",
   Identifier = "apollo_11_flipbook",
diff --git a/data/assets/scene/solarsystem/missions/apollo/15/apollo15.asset b/data/assets/scene/solarsystem/missions/apollo/15/apollo15.asset
index d80e9bc775..8dfc61ccab 100644
--- a/data/assets/scene/solarsystem/missions/apollo/15/apollo15.asset
+++ b/data/assets/scene/solarsystem/missions/apollo/15/apollo15.asset
@@ -6,7 +6,7 @@ local kernels = asset.require("scene/solarsystem/missions/apollo/15/kernels")
 
 
 
-local models = asset.syncedResource({
+local models = asset.resource({
   Name = "Apollo Models",
   Type = "HttpSynchronization",
   Identifier = "apollo_models",
diff --git a/data/assets/scene/solarsystem/missions/apollo/15/kernels.asset b/data/assets/scene/solarsystem/missions/apollo/15/kernels.asset
index 6af820b829..0c6dacf3ff 100644
--- a/data/assets/scene/solarsystem/missions/apollo/15/kernels.asset
+++ b/data/assets/scene/solarsystem/missions/apollo/15/kernels.asset
@@ -1,4 +1,4 @@
-local folder = asset.syncedResource({
+local folder = asset.resource({
   Name = "Apollo Kernels",
   Type = "HttpSynchronization",
   Identifier = "apollo_spice",
diff --git a/data/assets/scene/solarsystem/missions/apollo/17/bouldersstation2.asset b/data/assets/scene/solarsystem/missions/apollo/17/bouldersstation2.asset
index 899826a0de..a00bc27562 100644
--- a/data/assets/scene/solarsystem/missions/apollo/17/bouldersstation2.asset
+++ b/data/assets/scene/solarsystem/missions/apollo/17/bouldersstation2.asset
@@ -3,7 +3,7 @@ local moonAsset = asset.require("scene/solarsystem/planets/earth/moon/moon")
 
 
 
-local models = asset.syncedResource({
+local models = asset.resource({
   Name = "Apollo Boulders Models",
   Type = "HttpSynchronization",
   Identifier = "apollo_boulders",
diff --git a/data/assets/scene/solarsystem/missions/apollo/17/bouldersstation6.asset b/data/assets/scene/solarsystem/missions/apollo/17/bouldersstation6.asset
index ad31f48f21..3626401732 100644
--- a/data/assets/scene/solarsystem/missions/apollo/17/bouldersstation6.asset
+++ b/data/assets/scene/solarsystem/missions/apollo/17/bouldersstation6.asset
@@ -3,7 +3,7 @@ local moonAsset = asset.require("scene/solarsystem/planets/earth/moon/moon")
 
 
 
-local models = asset.syncedResource({
+local models = asset.resource({
   Name = "Apollo Boulders Models",
   Type = "HttpSynchronization",
   Identifier = "apollo_boulders",
diff --git a/data/assets/scene/solarsystem/missions/apollo/17/bouldersstation7.asset b/data/assets/scene/solarsystem/missions/apollo/17/bouldersstation7.asset
index 20b0b71409..bcaa71aa44 100644
--- a/data/assets/scene/solarsystem/missions/apollo/17/bouldersstation7.asset
+++ b/data/assets/scene/solarsystem/missions/apollo/17/bouldersstation7.asset
@@ -3,7 +3,7 @@ local moonAsset = asset.require("scene/solarsystem/planets/earth/moon/moon")
 
 
 
-local models = asset.syncedResource({
+local models = asset.resource({
   Name = "Apollo Boulders Models",
   Type = "HttpSynchronization",
   Identifier = "apollo_boulders",
diff --git a/data/assets/scene/solarsystem/missions/apollo/17/lem.asset b/data/assets/scene/solarsystem/missions/apollo/17/lem.asset
index af2be3ccc5..10a72ddd3c 100644
--- a/data/assets/scene/solarsystem/missions/apollo/17/lem.asset
+++ b/data/assets/scene/solarsystem/missions/apollo/17/lem.asset
@@ -3,7 +3,7 @@ local moonAsset = asset.require("scene/solarsystem/planets/earth/moon/moon")
 
 
 
-local model = asset.syncedResource({
+local model = asset.resource({
   Name = "Apollo Lem Models",
   Type = "HttpSynchronization",
   Identifier = "apollo_lem_model",
diff --git a/data/assets/scene/solarsystem/missions/apollo/8/kernels.asset b/data/assets/scene/solarsystem/missions/apollo/8/kernels.asset
index 9297926544..538effcfdf 100644
--- a/data/assets/scene/solarsystem/missions/apollo/8/kernels.asset
+++ b/data/assets/scene/solarsystem/missions/apollo/8/kernels.asset
@@ -1,4 +1,4 @@
-local kernelsFolder = asset.syncedResource({
+local kernelsFolder = asset.resource({
   Name = "Apollo Kernels",
   Type = "HttpSynchronization",
   Identifier = "apollo_spice",
diff --git a/data/assets/scene/solarsystem/missions/apollo/8/launch_model.asset b/data/assets/scene/solarsystem/missions/apollo/8/launch_model.asset
index 374a029010..1fa667b234 100644
--- a/data/assets/scene/solarsystem/missions/apollo/8/launch_model.asset
+++ b/data/assets/scene/solarsystem/missions/apollo/8/launch_model.asset
@@ -4,7 +4,7 @@ local kernels = asset.require("./kernels")
 
 
 
-local models = asset.syncedResource({
+local models = asset.resource({
   Name = "Apollo Models",
   Type = "HttpSynchronization",
   Identifier = "apollo_models",
diff --git a/data/assets/scene/solarsystem/missions/apollo/8/model.asset b/data/assets/scene/solarsystem/missions/apollo/8/model.asset
index 93cb4aa90a..c93b47c34a 100644
--- a/data/assets/scene/solarsystem/missions/apollo/8/model.asset
+++ b/data/assets/scene/solarsystem/missions/apollo/8/model.asset
@@ -4,7 +4,7 @@ local kernels = asset.require("./kernels")
 
 
 
-local models = asset.syncedResource({
+local models = asset.resource({
   Name = "Apollo Models",
   Type = "HttpSynchronization",
   Identifier = "apollo_models",
diff --git a/data/assets/scene/solarsystem/missions/apollo/apollo_globebrowsing.asset b/data/assets/scene/solarsystem/missions/apollo/apollo_globebrowsing.asset
index 207ec3ed99..e5333e8134 100644
--- a/data/assets/scene/solarsystem/missions/apollo/apollo_globebrowsing.asset
+++ b/data/assets/scene/solarsystem/missions/apollo/apollo_globebrowsing.asset
@@ -5,28 +5,28 @@ local moon = asset.require("scene/solarsystem/planets/earth/moon/moon")
 asset.require("scene/solarsystem/planets/earth/moon/default_layers")
 
 
-local heightmaps = asset.syncedResource({
+local heightmaps = asset.resource({
   Name = "Apollo Globebrowsing Heightmaps",
   Type = "HttpSynchronization",
   Identifier = "apollo_globebrowsing_heightmaps",
   Version = 1
 })
 
-local basemaps = asset.syncedResource({
+local basemaps = asset.resource({
   Name = "Apollo Globebrowsing Basemaps",
   Type = "HttpSynchronization",
   Identifier = "apollo_globebrowsing_basemaps",
   Version = 1
 })
 
-local naclighting = asset.syncedResource({
+local naclighting = asset.resource({
   Name = "Apollo Globebrowsing NAC Lighting",
   Type = "HttpSynchronization",
   Identifier = "apollo_globebrowsing_naclighting",
   Version = 1
 })
 
-local stations = asset.syncedResource({
+local stations = asset.resource({
   Name = "Apollo 17 Globebrowsing Stations",
   Type = "HttpSynchronization",
   Identifier = "apollo_17_stations",
diff --git a/data/assets/scene/solarsystem/missions/apollo/insignias_map.asset b/data/assets/scene/solarsystem/missions/apollo/insignias_map.asset
index 0a3c9d7eb3..e6771b3c80 100644
--- a/data/assets/scene/solarsystem/missions/apollo/insignias_map.asset
+++ b/data/assets/scene/solarsystem/missions/apollo/insignias_map.asset
@@ -6,7 +6,7 @@ local moon = asset.require("scene/solarsystem/planets/earth/moon/moon")
 
 
 
-local insigniasPath = asset.syncedResource({
+local insigniasPath = asset.resource({
   Name = "Apollo Insignias",
   Type = "HttpSynchronization",
   Identifier = "apollo_insignias",
diff --git a/data/assets/scene/solarsystem/missions/artemis/model.asset b/data/assets/scene/solarsystem/missions/artemis/model.asset
index 1cd1625d95..8d7e8665df 100644
--- a/data/assets/scene/solarsystem/missions/artemis/model.asset
+++ b/data/assets/scene/solarsystem/missions/artemis/model.asset
@@ -3,7 +3,7 @@ local transforms = asset.require("./transforms")
 
 
 
-local models = asset.syncedResource({
+local models = asset.resource({
   Name = "Artemis Models",
   Type = "HttpSynchronization",
   Identifier = "artemis_1_models",
diff --git a/data/assets/scene/solarsystem/missions/artemis/trail.asset b/data/assets/scene/solarsystem/missions/artemis/trail.asset
index e4e66164aa..2077cc21f6 100644
--- a/data/assets/scene/solarsystem/missions/artemis/trail.asset
+++ b/data/assets/scene/solarsystem/missions/artemis/trail.asset
@@ -6,7 +6,7 @@ local moonTransforms = asset.require("scene/solarsystem/planets/earth/moon/moon"
 
 local ArtemisSpiceId = "-1023"
 
-local kernels = asset.syncedResource({
+local kernels = asset.resource({
   Name = "Artemis Kernels",
   Type = "HttpSynchronization",
   Identifier = "artemis_1_kernels",
diff --git a/data/assets/scene/solarsystem/missions/artemis/transforms.asset b/data/assets/scene/solarsystem/missions/artemis/transforms.asset
index 6af48c6db4..59df655a91 100644
--- a/data/assets/scene/solarsystem/missions/artemis/transforms.asset
+++ b/data/assets/scene/solarsystem/missions/artemis/transforms.asset
@@ -3,7 +3,7 @@ local earthTransforms = asset.require("scene/solarsystem/planets/earth/transform
 
 
 
-local kernels = asset.syncedResource({
+local kernels = asset.resource({
   Name = "Artemis Kernels",
   Type = "HttpSynchronization",
   Identifier = "artemis_1_kernels",
diff --git a/data/assets/scene/solarsystem/missions/dawn/dawn.asset b/data/assets/scene/solarsystem/missions/dawn/dawn.asset
index 535150e8df..b9c66b0ec6 100644
--- a/data/assets/scene/solarsystem/missions/dawn/dawn.asset
+++ b/data/assets/scene/solarsystem/missions/dawn/dawn.asset
@@ -4,21 +4,21 @@ local sun = asset.require("scene/solarsystem/sun/sun")
 
 
 
-local kernels = asset.syncedResource({
+local kernels = asset.resource({
   Name = "Dawn Kernels",
   Type = "HttpSynchronization",
   Identifier = "dawn_kernels",
   Version = 3
 })
 
-local textures = asset.syncedResource({
+local textures = asset.resource({
   Name = "Dawn Textures",
   Type = "HttpSynchronization",
   Identifier = "dawn_textures",
   Version = 1
 })
 
-local models = asset.syncedResource({
+local models = asset.resource({
   Name = "Dawn Models",
   Type = "HttpSynchronization",
   Identifier = "dawn_model",
diff --git a/data/assets/scene/solarsystem/missions/dawn/vesta.asset b/data/assets/scene/solarsystem/missions/dawn/vesta.asset
index 9c0caeb690..a3bb63553a 100644
--- a/data/assets/scene/solarsystem/missions/dawn/vesta.asset
+++ b/data/assets/scene/solarsystem/missions/dawn/vesta.asset
@@ -2,28 +2,28 @@ local transforms = asset.require("scene/solarsystem/sun/transforms")
 
 
 
-local kernels = asset.syncedResource({
+local kernels = asset.resource({
   Name = "Vesta Kernels",
   Type = "HttpSynchronization",
   Identifier = "vesta_kernels",
   Version = 1
 })
 
-local textures = asset.syncedResource({
+local textures = asset.resource({
   Name = "Vesta Textures",
   Type = "HttpSynchronization",
   Identifier = "vesta_textures",
   Version = 1
 })
 
-local images = asset.syncedResource({
+local images = asset.resource({
   Name = "Vesta Images",
   Type = "HttpSynchronization",
   Identifier = "vesta_images",
   Version = 1
 })
 
-local models = asset.syncedResource({
+local models = asset.resource({
   Name = "Vesta Models",
   Type = "HttpSynchronization",
   Identifier = "vesta_model",
diff --git a/data/assets/scene/solarsystem/missions/insight/edl.asset b/data/assets/scene/solarsystem/missions/insight/edl.asset
index 8f9154cfb1..41f0a9a093 100644
--- a/data/assets/scene/solarsystem/missions/insight/edl.asset
+++ b/data/assets/scene/solarsystem/missions/insight/edl.asset
@@ -6,14 +6,14 @@ local mars = asset.require("scene/solarsystem/planets/mars/mars")
 
 
 
-local models = asset.syncedResource({
+local models = asset.resource({
   Name = "Insight Models Chutes",
   Type = "HttpSynchronization",
   Identifier = "insight_models",
   Version = 2
 })
 
-local ikernels = asset.syncedResource({
+local ikernels = asset.resource({
   Name = "Insight Kernels",
   Type = "HttpSynchronization",
   Identifier = "insight_kernels",
diff --git a/data/assets/scene/solarsystem/missions/juice/fieldlines.asset b/data/assets/scene/solarsystem/missions/juice/fieldlines.asset
index 87c1a52555..c33e2af97a 100644
--- a/data/assets/scene/solarsystem/missions/juice/fieldlines.asset
+++ b/data/assets/scene/solarsystem/missions/juice/fieldlines.asset
@@ -2,7 +2,7 @@ local transforms = asset.require("./transforms")
 
 
 
-local data = asset.syncedResource({
+local data = asset.resource({
   Type = "HttpSynchronization",
   Name = "Ganymede Plane Simulations",
   Identifier = "juice_ganymede_fieldlines",
@@ -21,7 +21,7 @@ local GanymedeMagnetosphere = {
     ColorMethod = "By Quantity",
     ColorQuantity = 0,
     ColorTableRanges = { { 62.556353386366766, 1665.5534182835445 } },
-    ColorTablePaths = { asset.localResource("CMR-illuminance2.txt") },
+    ColorTablePaths = { asset.resource("CMR-illuminance2.txt") },
     Color = { 0.03, 0.0, 0.0, 1.0 },
     ParticleSpacing = 42.0,
     ParticleSize = 30.0,
diff --git a/data/assets/scene/solarsystem/missions/juice/kernels.asset b/data/assets/scene/solarsystem/missions/juice/kernels.asset
index db17a3b901..8e83a877c4 100644
--- a/data/assets/scene/solarsystem/missions/juice/kernels.asset
+++ b/data/assets/scene/solarsystem/missions/juice/kernels.asset
@@ -1,4 +1,4 @@
-local kernels = asset.syncedResource({
+local kernels = asset.resource({
   Name = "JUICE Kernels",
   Type = "HttpSynchronization",
   Identifier = "juice_kernels",
diff --git a/data/assets/scene/solarsystem/missions/juice/model.asset b/data/assets/scene/solarsystem/missions/juice/model.asset
index c6a25379f0..29ca6ccde6 100644
--- a/data/assets/scene/solarsystem/missions/juice/model.asset
+++ b/data/assets/scene/solarsystem/missions/juice/model.asset
@@ -3,7 +3,7 @@ local transforms = asset.require("./transforms")
 
 
 
-local model = asset.syncedResource({
+local model = asset.resource({
   Name = "JUICE Model",
   Type = "HttpSynchronization",
   Identifier = "juice_models",
diff --git a/data/assets/scene/solarsystem/missions/juice/plane.asset b/data/assets/scene/solarsystem/missions/juice/plane.asset
index 8ce670a85e..f7cccdf666 100644
--- a/data/assets/scene/solarsystem/missions/juice/plane.asset
+++ b/data/assets/scene/solarsystem/missions/juice/plane.asset
@@ -4,7 +4,7 @@ local transforms = asset.require("./transforms")
 
 -- Datasets created using the script found at:
 -- https://github.com/OpenSpace/scripts/tree/master/juice-gphio-image-conversion
-local data = asset.syncedResource({
+local data = asset.resource({
   Type = "HttpSynchronization",
   Name = "Ganymede Plane Simulations",
   Identifier = "juice_ganymede_plane_cuts",
diff --git a/data/assets/scene/solarsystem/missions/juno/juno.asset b/data/assets/scene/solarsystem/missions/juno/juno.asset
index 49e25abfd2..750f1c6e42 100644
--- a/data/assets/scene/solarsystem/missions/juno/juno.asset
+++ b/data/assets/scene/solarsystem/missions/juno/juno.asset
@@ -6,7 +6,7 @@ local kernels = asset.require("./kernels")
 
 
 
-local model = asset.syncedResource({
+local model = asset.resource({
   Name = "Juno Model",
   Type = "HttpSynchronization",
   Identifier = "juno_model",
diff --git a/data/assets/scene/solarsystem/missions/juno/kernels.asset b/data/assets/scene/solarsystem/missions/juno/kernels.asset
index 570b4fcc16..e21f711bcb 100644
--- a/data/assets/scene/solarsystem/missions/juno/kernels.asset
+++ b/data/assets/scene/solarsystem/missions/juno/kernels.asset
@@ -1,5 +1,5 @@
 
-local kernels = asset.syncedResource({
+local kernels = asset.resource({
   Name = "Juno Kernels",
   Type = "HttpSynchronization",
   Identifier = "juno_kernels",
diff --git a/data/assets/scene/solarsystem/missions/messenger/kernels.asset b/data/assets/scene/solarsystem/missions/messenger/kernels.asset
index 9be3910dc7..35920865e2 100644
--- a/data/assets/scene/solarsystem/missions/messenger/kernels.asset
+++ b/data/assets/scene/solarsystem/missions/messenger/kernels.asset
@@ -1,4 +1,4 @@
-local kernels = asset.syncedResource({
+local kernels = asset.resource({
   Name = "Messenger Kernels",
   Type = "HttpSynchronization",
   Identifier = "messenger_spice",
diff --git a/data/assets/scene/solarsystem/missions/messenger/mercurymagnetosphere.asset b/data/assets/scene/solarsystem/missions/messenger/mercurymagnetosphere.asset
index 2f5015562f..90973b583d 100644
--- a/data/assets/scene/solarsystem/missions/messenger/mercurymagnetosphere.asset
+++ b/data/assets/scene/solarsystem/missions/messenger/mercurymagnetosphere.asset
@@ -1,6 +1,6 @@
 local mercuryTransforms = asset.require("scene/solarsystem/planets/mercury/transforms")
 
-local localFolder = asset.syncedResource({
+local localFolder = asset.resource({
   Name = "Mercury Magnetosphere",
   Type = "HttpSynchronization",
   Identifier = "mercury_magnetosphere",
diff --git a/data/assets/scene/solarsystem/missions/messenger/messenger.asset b/data/assets/scene/solarsystem/missions/messenger/messenger.asset
index 47e5850e97..8c47e7f462 100644
--- a/data/assets/scene/solarsystem/missions/messenger/messenger.asset
+++ b/data/assets/scene/solarsystem/missions/messenger/messenger.asset
@@ -4,7 +4,7 @@ local mercuryTransforms = asset.require("scene/solarsystem/planets/mercury/trans
 local kernels = asset.require("./kernels")
 
 
-local models = asset.syncedResource({
+local models = asset.resource({
   Name = "Messenger Models",
   Type = "HttpSynchronization",
   Identifier = "messenger_model",
diff --git a/data/assets/scene/solarsystem/missions/newhorizons/charon.asset b/data/assets/scene/solarsystem/missions/newhorizons/charon.asset
index e75ca41ad1..8c2c09ed59 100644
--- a/data/assets/scene/solarsystem/missions/newhorizons/charon.asset
+++ b/data/assets/scene/solarsystem/missions/newhorizons/charon.asset
@@ -3,7 +3,7 @@ local sunTransforms = asset.require("scene/solarsystem/sun/transforms")
 
 
 
-local textures = asset.syncedResource({
+local textures = asset.resource({
   Name = "Charon Textures",
   Type = "HttpSynchronization",
   Identifier = "charon_textures",
diff --git a/data/assets/scene/solarsystem/missions/newhorizons/kernels.asset b/data/assets/scene/solarsystem/missions/newhorizons/kernels.asset
index 0b998693ab..435d5c9a49 100644
--- a/data/assets/scene/solarsystem/missions/newhorizons/kernels.asset
+++ b/data/assets/scene/solarsystem/missions/newhorizons/kernels.asset
@@ -1,4 +1,4 @@
-local Kernels = asset.syncedResource({
+local Kernels = asset.resource({
   Name = "New Horizons Kernels",
   Type = "HttpSynchronization",
   Identifier = "newhorizons_kernels",
diff --git a/data/assets/scene/solarsystem/missions/newhorizons/label.asset b/data/assets/scene/solarsystem/missions/newhorizons/label.asset
index ba41511879..3d1ccfdd95 100644
--- a/data/assets/scene/solarsystem/missions/newhorizons/label.asset
+++ b/data/assets/scene/solarsystem/missions/newhorizons/label.asset
@@ -2,7 +2,7 @@ local NewHorizonsModel = asset.require("./model")
 
 
 
-local models = asset.syncedResource({
+local models = asset.resource({
   Name = "New Horizons Model",
   Type = "HttpSynchronization",
   Identifier = "newhorizons_model",
diff --git a/data/assets/scene/solarsystem/missions/newhorizons/model.asset b/data/assets/scene/solarsystem/missions/newhorizons/model.asset
index 85abd73ebe..7805cd6674 100644
--- a/data/assets/scene/solarsystem/missions/newhorizons/model.asset
+++ b/data/assets/scene/solarsystem/missions/newhorizons/model.asset
@@ -3,7 +3,7 @@ local sun = asset.require("scene/solarsystem/sun/sun")
 
 
 
-local models = asset.syncedResource({
+local models = asset.resource({
   Name = "New Horizons Model",
   Type = "HttpSynchronization",
   Identifier = "newhorizons_model",
diff --git a/data/assets/scene/solarsystem/missions/newhorizons/othermoons.asset b/data/assets/scene/solarsystem/missions/newhorizons/othermoons.asset
index 547b844a69..fca0413850 100644
--- a/data/assets/scene/solarsystem/missions/newhorizons/othermoons.asset
+++ b/data/assets/scene/solarsystem/missions/newhorizons/othermoons.asset
@@ -5,28 +5,28 @@ local Styx = asset.require("scene/solarsystem/dwarf_planets/pluto/minor/styx")
 
 
 
-local hydraTextures = asset.syncedResource({
+local hydraTextures = asset.resource({
   Name = "Hydra Textures",
   Type = "HttpSynchronization",
   Identifier = "hydra_textures",
   Version = 1
 })
 
-local kerberosTextures = asset.syncedResource({
+local kerberosTextures = asset.resource({
   Name = "Kerberos Textures",
   Type = "HttpSynchronization",
   Identifier = "kerberos_textures",
   Version = 1
 })
 
-local nixTextures = asset.syncedResource({
+local nixTextures = asset.resource({
   Name = "Nix Textures",
   Type = "HttpSynchronization",
   Identifier = "nix_textures",
   Version = 1
 })
 
-local styxTextures = asset.syncedResource({
+local styxTextures = asset.resource({
   Name = "Styx Textures",
   Type = "HttpSynchronization",
   Identifier = "styx_textures",
diff --git a/data/assets/scene/solarsystem/missions/newhorizons/pluto.asset b/data/assets/scene/solarsystem/missions/newhorizons/pluto.asset
index b2d33dfb94..040af9beef 100644
--- a/data/assets/scene/solarsystem/missions/newhorizons/pluto.asset
+++ b/data/assets/scene/solarsystem/missions/newhorizons/pluto.asset
@@ -4,28 +4,28 @@ local kernels = asset.require("./kernels")
 
 
 
-local assets = asset.syncedResource({
+local assets = asset.resource({
   Name = "Pluto Assets",
   Type = "HttpSynchronization",
   Identifier = "newhorizons_plutoencounter_pluto_assets",
   Version = 1
 })
 
-local encounterTextures = asset.syncedResource({
+local encounterTextures = asset.resource({
   Name = "Pluto Encounter Textures",
   Type = "HttpSynchronization",
   Identifier = "newhorizons_plutoencounter_pluto_textures",
   Version = 4
 })
 
-local textures = asset.syncedResource({
+local textures = asset.resource({
   Name = "Pluto Textures",
   Type = "HttpSynchronization",
   Identifier = "pluto_textures",
   Version = 5
 })
 
-local images = asset.syncedResource({
+local images = asset.resource({
   Name = "Pluto Images",
   Type = "HttpSynchronization",
   Identifier = "newhorizons_plutoencounter_pluto_images",
diff --git a/data/assets/scene/solarsystem/missions/osirisrex/bennu.asset b/data/assets/scene/solarsystem/missions/osirisrex/bennu.asset
index 60e8a60bf6..264df9361e 100644
--- a/data/assets/scene/solarsystem/missions/osirisrex/bennu.asset
+++ b/data/assets/scene/solarsystem/missions/osirisrex/bennu.asset
@@ -3,7 +3,7 @@ local sun = asset.require("scene/solarsystem/sun/sun")
 
 
 
-local models = asset.syncedResource({
+local models = asset.resource({
   Name = "Bennu Models",
   Type = "HttpSynchronization",
   Identifier = "bennu_models",
diff --git a/data/assets/scene/solarsystem/missions/osirisrex/bennu_projection.asset b/data/assets/scene/solarsystem/missions/osirisrex/bennu_projection.asset
index 74f24bbd89..45b2c0b99d 100644
--- a/data/assets/scene/solarsystem/missions/osirisrex/bennu_projection.asset
+++ b/data/assets/scene/solarsystem/missions/osirisrex/bennu_projection.asset
@@ -3,21 +3,21 @@ local sunTransforms = asset.require("scene/solarsystem/sun/transforms")
 
 
 
-local models = asset.syncedResource({
+local models = asset.resource({
   Name = "Bennu Models",
   Type = "HttpSynchronization",
   Identifier = "bennu_models",
   Version = 2
 })
 
-local images = asset.syncedResource({
+local images = asset.resource({
   Name = "Bennu Images Approach",
   Type = "HttpSynchronization",
   Identifier = "osirisrex_bennu_images_approach",
   Version = 1
 })
 
-local imagesA = asset.syncedResource({
+local imagesA = asset.resource({
   Name = "Bennu Images A",
   Type = "HttpSynchronization",
   Identifier = "osirisrex_bennu_images_orbit_a",
diff --git a/data/assets/scene/solarsystem/missions/osirisrex/imageplane.asset b/data/assets/scene/solarsystem/missions/osirisrex/imageplane.asset
index 6dc8f08889..5c4f091058 100644
--- a/data/assets/scene/solarsystem/missions/osirisrex/imageplane.asset
+++ b/data/assets/scene/solarsystem/missions/osirisrex/imageplane.asset
@@ -2,7 +2,7 @@ local transforms = asset.require("./transforms")
 
 
 
-local textures = asset.syncedResource({
+local textures = asset.resource({
   Name = "Bennu Textures",
   Type = "HttpSynchronization",
   Identifier = "bennu_textures",
diff --git a/data/assets/scene/solarsystem/missions/osirisrex/kernels.asset b/data/assets/scene/solarsystem/missions/osirisrex/kernels.asset
index e3147a0153..ac9468e85b 100644
--- a/data/assets/scene/solarsystem/missions/osirisrex/kernels.asset
+++ b/data/assets/scene/solarsystem/missions/osirisrex/kernels.asset
@@ -1,4 +1,4 @@
-local kernels = asset.syncedResource({
+local kernels = asset.resource({
   Name = "Osiris Rex Kernels",
   Type = "HttpSynchronization",
   Identifier = "osirisrex_kernels",
diff --git a/data/assets/scene/solarsystem/missions/osirisrex/model.asset b/data/assets/scene/solarsystem/missions/osirisrex/model.asset
index 51f43d3b60..ed47b8928d 100644
--- a/data/assets/scene/solarsystem/missions/osirisrex/model.asset
+++ b/data/assets/scene/solarsystem/missions/osirisrex/model.asset
@@ -6,7 +6,7 @@ local kernels = asset.require("./kernels")
 
 
 
-local models = asset.syncedResource({
+local models = asset.resource({
   Name = "Osiris Rex Models",
   Type = "HttpSynchronization",
   Identifier = "osirisrex_models",
diff --git a/data/assets/scene/solarsystem/missions/perseverance/model.asset b/data/assets/scene/solarsystem/missions/perseverance/model.asset
index 35e044dca2..717ed59314 100644
--- a/data/assets/scene/solarsystem/missions/perseverance/model.asset
+++ b/data/assets/scene/solarsystem/missions/perseverance/model.asset
@@ -5,7 +5,7 @@ local spice = asset.require("./spice")
 
 
 
-local models = asset.syncedResource({
+local models = asset.resource({
   Name = "Perseverance Model",
   Type = "HttpSynchronization",
   Identifier = "perseverance_models",
diff --git a/data/assets/scene/solarsystem/missions/perseverance/spice.asset b/data/assets/scene/solarsystem/missions/perseverance/spice.asset
index 73d631ed94..dd0f679a9c 100644
--- a/data/assets/scene/solarsystem/missions/perseverance/spice.asset
+++ b/data/assets/scene/solarsystem/missions/perseverance/spice.asset
@@ -1,4 +1,4 @@
-local kernels = asset.syncedResource({
+local kernels = asset.resource({
   Name = "Mars 2020 Kernels",
   Type = "HttpSynchronization",
   Identifier = "perseverance_kernels",
diff --git a/data/assets/scene/solarsystem/missions/pioneer/pioneer10.asset b/data/assets/scene/solarsystem/missions/pioneer/pioneer10.asset
index d89b7809e3..c42dc91827 100644
--- a/data/assets/scene/solarsystem/missions/pioneer/pioneer10.asset
+++ b/data/assets/scene/solarsystem/missions/pioneer/pioneer10.asset
@@ -3,7 +3,7 @@ local model = asset.require("scene/solarsystem/missions/pioneer/pioneermodel")
 
 
 
-local kernelsFolder = asset.syncedResource({
+local kernelsFolder = asset.resource({
   Name = "Pioneer Kernels",
   Type = "HttpSynchronization",
   Identifier = "pioneer_10_spice",
diff --git a/data/assets/scene/solarsystem/missions/pioneer/pioneer11.asset b/data/assets/scene/solarsystem/missions/pioneer/pioneer11.asset
index 6b58a8e995..083552a11d 100644
--- a/data/assets/scene/solarsystem/missions/pioneer/pioneer11.asset
+++ b/data/assets/scene/solarsystem/missions/pioneer/pioneer11.asset
@@ -3,7 +3,7 @@ local model = asset.require("scene/solarsystem/missions/pioneer/pioneermodel")
 
 
 
-local kernelsFolder = asset.syncedResource({
+local kernelsFolder = asset.resource({
   Name = "Pioneer Kernels",
   Type = "HttpSynchronization",
   Identifier = "pioneer_11_spice",
diff --git a/data/assets/scene/solarsystem/missions/pioneer/pioneermodel.asset b/data/assets/scene/solarsystem/missions/pioneer/pioneermodel.asset
index bd138d8ee8..ce63f52782 100644
--- a/data/assets/scene/solarsystem/missions/pioneer/pioneermodel.asset
+++ b/data/assets/scene/solarsystem/missions/pioneer/pioneermodel.asset
@@ -2,7 +2,7 @@ local sun = asset.require("scene/solarsystem/sun/sun")
 
 
 
-local modelFolder = asset.syncedResource({
+local modelFolder = asset.resource({
   Name = "Pioneer 10/11 Models",
   Type = "HttpSynchronization",
   Identifier = "pioneer_10_11_model",
diff --git a/data/assets/scene/solarsystem/missions/rosetta/67p.asset b/data/assets/scene/solarsystem/missions/rosetta/67p.asset
index 131fc2e01b..d906c582a9 100644
--- a/data/assets/scene/solarsystem/missions/rosetta/67p.asset
+++ b/data/assets/scene/solarsystem/missions/rosetta/67p.asset
@@ -2,21 +2,21 @@ local transforms = asset.require("scene/solarsystem/sun/transforms")
 
 
 
-local textures = asset.syncedResource({
+local textures = asset.resource({
   Name = "67P Textures",
   Type = "HttpSynchronization",
   Identifier = "67p_textures",
   Version = 2
 })
 
-local models = asset.syncedResource({
+local models = asset.resource({
   Name = "67P Models",
   Type = "HttpSynchronization",
   Identifier = "67p_models",
   Version = 1
 })
 
-local images = asset.syncedResource({
+local images = asset.resource({
   Name = "Rosetta Images",
   Type = "HttpSynchronization",
   Identifier = "rosettaimages",
diff --git a/data/assets/scene/solarsystem/missions/rosetta/rosetta.asset b/data/assets/scene/solarsystem/missions/rosetta/rosetta.asset
index 4db204dae8..9c85324cd9 100644
--- a/data/assets/scene/solarsystem/missions/rosetta/rosetta.asset
+++ b/data/assets/scene/solarsystem/missions/rosetta/rosetta.asset
@@ -4,14 +4,14 @@ local transforms = asset.require("./67p")
 
 
 
-local models = asset.syncedResource({
+local models = asset.resource({
   Name = "Rosetta Models",
   Type = "HttpSynchronization",
   Identifier = "rosetta_model",
   Version = 5
 })
 
-local kernels = asset.syncedResource({
+local kernels = asset.resource({
   Name = "Rosetta Kernels",
   Type = "HttpSynchronization",
   Identifier = "rosetta_kernels",
diff --git a/data/assets/scene/solarsystem/missions/voyager/voyager1.asset b/data/assets/scene/solarsystem/missions/voyager/voyager1.asset
index a028e015e8..e9325eb7a9 100644
--- a/data/assets/scene/solarsystem/missions/voyager/voyager1.asset
+++ b/data/assets/scene/solarsystem/missions/voyager/voyager1.asset
@@ -3,14 +3,14 @@ local sunTransforms = asset.require("scene/solarsystem/sun/transforms")
 
 
 
-local models = asset.syncedResource({
+local models = asset.resource({
   Name = "Voyager Model",
   Type = "HttpSynchronization",
   Identifier = "voyager_model",
   Version = 1
 })
 
-local kernels = asset.syncedResource({
+local kernels = asset.resource({
   Name = "Voyager 1 Kernels",
   Type = "HttpSynchronization",
   Identifier = "voyager1_spice",
diff --git a/data/assets/scene/solarsystem/missions/voyager/voyager2.asset b/data/assets/scene/solarsystem/missions/voyager/voyager2.asset
index 0655d269fa..8a06f6db83 100644
--- a/data/assets/scene/solarsystem/missions/voyager/voyager2.asset
+++ b/data/assets/scene/solarsystem/missions/voyager/voyager2.asset
@@ -3,14 +3,14 @@ local sunTransforms = asset.require("scene/solarsystem/sun/transforms")
 
 
 
-local models = asset.syncedResource({
+local models = asset.resource({
   Name = "Voyager Model",
   Type = "HttpSynchronization",
   Identifier = "voyager_model",
   Version = 1
 })
 
-local kernels = asset.syncedResource({
+local kernels = asset.resource({
   Name = "Voyager 2 Kernels",
   Type = "HttpSynchronization",
   Identifier = "voyager2_spice",
diff --git a/data/assets/scene/solarsystem/missions/voyagerpioneer/voyager1_2__pioneer10_11.asset b/data/assets/scene/solarsystem/missions/voyagerpioneer/voyager1_2__pioneer10_11.asset
index ba8948f0d9..fff6bbce10 100644
--- a/data/assets/scene/solarsystem/missions/voyagerpioneer/voyager1_2__pioneer10_11.asset
+++ b/data/assets/scene/solarsystem/missions/voyagerpioneer/voyager1_2__pioneer10_11.asset
@@ -1,11 +1,11 @@
-local voyager_horizons = asset.syncedResource({
+local voyager_horizons = asset.resource({
   Name = "Voyager horizons",
   Type = "HttpSynchronization",
   Identifier = "voyager_horizons",
   Version = 1
 })
 
-local pioneer_horizons = asset.syncedResource({
+local pioneer_horizons = asset.resource({
   Name = "Pioneer horizons",
   Type = "HttpSynchronization",
   Identifier = "pioneer_horizons",
diff --git a/data/assets/scene/solarsystem/planets/earth/earth.asset b/data/assets/scene/solarsystem/planets/earth/earth.asset
index 103382bf2a..23c2ee9806 100644
--- a/data/assets/scene/solarsystem/planets/earth/earth.asset
+++ b/data/assets/scene/solarsystem/planets/earth/earth.asset
@@ -2,7 +2,7 @@ local transforms = asset.require("./transforms")
 
 
 
-local labelsPath = asset.syncedResource({
+local labelsPath = asset.resource({
   Name = "Earth Labels",
   Type = "HttpSynchronization",
   Identifier = "earth_labels",
diff --git a/data/assets/scene/solarsystem/planets/earth/eclipses/corona/corona20170821.asset b/data/assets/scene/solarsystem/planets/earth/eclipses/corona/corona20170821.asset
index ca47bbc223..cfc13f6fe1 100644
--- a/data/assets/scene/solarsystem/planets/earth/eclipses/corona/corona20170821.asset
+++ b/data/assets/scene/solarsystem/planets/earth/eclipses/corona/corona20170821.asset
@@ -2,7 +2,7 @@ local transforms = asset.require("scene/solarsystem/sun/transforms")
 
 
 
-local videos = asset.syncedResource({
+local videos = asset.resource({
   Name = "Eclipse Corona Video",
   Type = "HttpSynchronization",
   Identifier = "earth-eclipse-corona",
diff --git a/data/assets/scene/solarsystem/planets/earth/eclipses/paths/annular_data.asset b/data/assets/scene/solarsystem/planets/earth/eclipses/paths/annular_data.asset
index e834107191..1a74b9beb5 100644
--- a/data/assets/scene/solarsystem/planets/earth/eclipses/paths/annular_data.asset
+++ b/data/assets/scene/solarsystem/planets/earth/eclipses/paths/annular_data.asset
@@ -1,4 +1,4 @@
-local data = asset.syncedResource({
+local data = asset.resource({
   Name = "Annular Eclipse Paths",
   Type = "HttpSynchronization",
   Identifier = "earth-eclipse-path-annular",
diff --git a/data/assets/scene/solarsystem/planets/earth/eclipses/paths/hybrid_data.asset b/data/assets/scene/solarsystem/planets/earth/eclipses/paths/hybrid_data.asset
index e2ef0f9ffd..7c2f11f26d 100644
--- a/data/assets/scene/solarsystem/planets/earth/eclipses/paths/hybrid_data.asset
+++ b/data/assets/scene/solarsystem/planets/earth/eclipses/paths/hybrid_data.asset
@@ -1,4 +1,4 @@
-local data = asset.syncedResource({
+local data = asset.resource({
   Name = "Hybrid Eclipse Paths",
   Type = "HttpSynchronization",
   Identifier = "earth-eclipse-path-hybrid",
diff --git a/data/assets/scene/solarsystem/planets/earth/eclipses/paths/total_data.asset b/data/assets/scene/solarsystem/planets/earth/eclipses/paths/total_data.asset
index 826632b191..ff5da00b86 100644
--- a/data/assets/scene/solarsystem/planets/earth/eclipses/paths/total_data.asset
+++ b/data/assets/scene/solarsystem/planets/earth/eclipses/paths/total_data.asset
@@ -1,4 +1,4 @@
-local data = asset.syncedResource({
+local data = asset.resource({
   Name = "Total Eclipse Paths",
   Type = "HttpSynchronization",
   Identifier = "earth-eclipse-path-total",
diff --git a/data/assets/scene/solarsystem/planets/earth/lagrange_points/l1.asset b/data/assets/scene/solarsystem/planets/earth/lagrange_points/l1.asset
index 313853a4a5..d558c956f5 100644
--- a/data/assets/scene/solarsystem/planets/earth/lagrange_points/l1.asset
+++ b/data/assets/scene/solarsystem/planets/earth/lagrange_points/l1.asset
@@ -3,14 +3,14 @@ local transforms = asset.require("scene/solarsystem/sun/transforms")
 
 
 
-local circle = asset.syncedResource({
+local circle = asset.resource({
   Name = "Circle",
   Type = "HttpSynchronization",
   Identifier = "circle_image",
   Version = 1
 })
 
-local kernels = asset.syncedResource({
+local kernels = asset.resource({
   Name = "Lagrange Kernels",
   Type = "HttpSynchronization",
   Identifier = "earth_lagrange_kernels",
diff --git a/data/assets/scene/solarsystem/planets/earth/lagrange_points/l2.asset b/data/assets/scene/solarsystem/planets/earth/lagrange_points/l2.asset
index 3d165d1940..d819543680 100644
--- a/data/assets/scene/solarsystem/planets/earth/lagrange_points/l2.asset
+++ b/data/assets/scene/solarsystem/planets/earth/lagrange_points/l2.asset
@@ -4,14 +4,14 @@ local transforms = asset.require("scene/solarsystem/sun/transforms")
 
 
 
-local circle = asset.syncedResource({
+local circle = asset.resource({
   Name = "Circle",
   Type = "HttpSynchronization",
   Identifier = "circle_image",
   Version = 1
 })
 
-local kernels = asset.syncedResource({
+local kernels = asset.resource({
   Name = "Lagrange Kernels",
   Type = "HttpSynchronization",
   Identifier = "earth_lagrange_kernels",
diff --git a/data/assets/scene/solarsystem/planets/earth/lagrange_points/l4.asset b/data/assets/scene/solarsystem/planets/earth/lagrange_points/l4.asset
index ff370b3f89..6ac6259cf5 100644
--- a/data/assets/scene/solarsystem/planets/earth/lagrange_points/l4.asset
+++ b/data/assets/scene/solarsystem/planets/earth/lagrange_points/l4.asset
@@ -3,14 +3,14 @@ local transforms = asset.require("scene/solarsystem/sun/transforms")
 
 
 
-local circle = asset.syncedResource({
+local circle = asset.resource({
   Name = "Circle",
   Type = "HttpSynchronization",
   Identifier = "circle_image",
   Version = 1
 })
 
-local kernels = asset.syncedResource({
+local kernels = asset.resource({
   Name = "Lagrange Kernels",
   Type = "HttpSynchronization",
   Identifier = "earth_lagrange_kernels",
diff --git a/data/assets/scene/solarsystem/planets/earth/lagrange_points/l5.asset b/data/assets/scene/solarsystem/planets/earth/lagrange_points/l5.asset
index 66b90ffb49..b0368bd06c 100644
--- a/data/assets/scene/solarsystem/planets/earth/lagrange_points/l5.asset
+++ b/data/assets/scene/solarsystem/planets/earth/lagrange_points/l5.asset
@@ -3,14 +3,14 @@ local transforms = asset.require("scene/solarsystem/sun/transforms")
 
 
 
-local circle = asset.syncedResource({
+local circle = asset.resource({
   Name = "Circle",
   Type = "HttpSynchronization",
   Identifier = "circle_image",
   Version = 1
 })
 
-local kernels = asset.syncedResource({
+local kernels = asset.resource({
   Name = "Lagrange Kernels",
   Type = "HttpSynchronization",
   Identifier = "earth_lagrange_kernels",
diff --git a/data/assets/scene/solarsystem/planets/earth/layers/colorlayers/blue_marble.asset b/data/assets/scene/solarsystem/planets/earth/layers/colorlayers/blue_marble.asset
index 886df1be13..10ac031e8e 100644
--- a/data/assets/scene/solarsystem/planets/earth/layers/colorlayers/blue_marble.asset
+++ b/data/assets/scene/solarsystem/planets/earth/layers/colorlayers/blue_marble.asset
@@ -2,7 +2,7 @@ local globe = asset.require("../../earth")
 
 
 
-local texturesPath = asset.syncedResource({
+local texturesPath = asset.resource({
   Name = "Earth Textures",
   Type = "HttpSynchronization",
   Identifier = "earth_textures",
diff --git a/data/assets/scene/solarsystem/planets/earth/layers/colorlayers/bmng_newyork.asset b/data/assets/scene/solarsystem/planets/earth/layers/colorlayers/bmng_newyork.asset
index a816a633c9..d8b2b24aef 100644
--- a/data/assets/scene/solarsystem/planets/earth/layers/colorlayers/bmng_newyork.asset
+++ b/data/assets/scene/solarsystem/planets/earth/layers/colorlayers/bmng_newyork.asset
@@ -6,7 +6,7 @@ local Layer = {
   Identifier = "BMNG_NewYork",
   Name = "BMNG [New York]",
   Enabled = asset.enabled,
-  FilePath = asset.localResource("bmng_newyork.wms"),
+  FilePath = asset.resource("bmng_newyork.wms"),
   Description = [[Web loaded full resolution map of Blue Marble Next Generation. This map
     is hosted on the OpenSpace servers in New York]]
 }
diff --git a/data/assets/scene/solarsystem/planets/earth/layers/colorlayers/bmng_sweden.asset b/data/assets/scene/solarsystem/planets/earth/layers/colorlayers/bmng_sweden.asset
index 3f71e1f649..039798cad7 100644
--- a/data/assets/scene/solarsystem/planets/earth/layers/colorlayers/bmng_sweden.asset
+++ b/data/assets/scene/solarsystem/planets/earth/layers/colorlayers/bmng_sweden.asset
@@ -6,7 +6,7 @@ local Layer = {
   Identifier = "BMNG_Sweden",
   Name = "BMNG [Sweden]",
   Enabled = asset.enabled,
-  FilePath = asset.localResource("bmng_sweden.wms"),
+  FilePath = asset.resource("bmng_sweden.wms"),
   Description = [[Web loaded full resolution map of Blue Marble Next Generation. This map
     is hosted on the OpenSpace servers in Sweden]]
 }
diff --git a/data/assets/scene/solarsystem/planets/earth/layers/colorlayers/bmng_utah.asset b/data/assets/scene/solarsystem/planets/earth/layers/colorlayers/bmng_utah.asset
index 71e07bc43a..746beb4da7 100644
--- a/data/assets/scene/solarsystem/planets/earth/layers/colorlayers/bmng_utah.asset
+++ b/data/assets/scene/solarsystem/planets/earth/layers/colorlayers/bmng_utah.asset
@@ -6,7 +6,7 @@ local Layer = {
   Identifier = "BMNG_Utah",
   Name = "BMNG [Utah]",
   Enabled = asset.enabled,
-  FilePath = asset.localResource("bmng_utah.wms"),
+  FilePath = asset.resource("bmng_utah.wms"),
   Description = [[Web loaded full resolution map of Blue Marble Next Generation. This map
     is hosted on the OpenSpace servers in Utah]]
 }
diff --git a/data/assets/scene/solarsystem/planets/earth/layers/colorlayers/esri_noaa20_combo.asset b/data/assets/scene/solarsystem/planets/earth/layers/colorlayers/esri_noaa20_combo.asset
index 82dbdcf012..ad00fcb6af 100644
--- a/data/assets/scene/solarsystem/planets/earth/layers/colorlayers/esri_noaa20_combo.asset
+++ b/data/assets/scene/solarsystem/planets/earth/layers/colorlayers/esri_noaa20_combo.asset
@@ -36,7 +36,7 @@ local Layer = {
       TileProvider = {
         Identifier = "ESRI_World_Imagery",
         Name = "ESRI World Imagery",
-        FilePath = asset.localResource("esri_world_imagery.wms"),
+        FilePath = asset.resource("esri_world_imagery.wms"),
         PadTiles = false
       }
     }
diff --git a/data/assets/scene/solarsystem/planets/earth/layers/colorlayers/esri_viirs_combo.asset b/data/assets/scene/solarsystem/planets/earth/layers/colorlayers/esri_viirs_combo.asset
index 4449baadd4..9bf3296f8a 100644
--- a/data/assets/scene/solarsystem/planets/earth/layers/colorlayers/esri_viirs_combo.asset
+++ b/data/assets/scene/solarsystem/planets/earth/layers/colorlayers/esri_viirs_combo.asset
@@ -36,7 +36,7 @@ local Layer = {
       TileProvider = {
         Identifier = "ESRI_World_Imagery",
         Name = "ESRI World Imagery",
-        FilePath = asset.localResource("esri_world_imagery.wms"),
+        FilePath = asset.resource("esri_world_imagery.wms"),
         PadTiles = false
       }
     }
diff --git a/data/assets/scene/solarsystem/planets/earth/layers/colorlayers/esri_world_imagery.asset b/data/assets/scene/solarsystem/planets/earth/layers/colorlayers/esri_world_imagery.asset
index 25c3faf776..510d022f1c 100644
--- a/data/assets/scene/solarsystem/planets/earth/layers/colorlayers/esri_world_imagery.asset
+++ b/data/assets/scene/solarsystem/planets/earth/layers/colorlayers/esri_world_imagery.asset
@@ -6,7 +6,7 @@ local Layer = {
   Identifier = "ESRI_World_Imagery",
   Name = "ESRI World Imagery",
   Enabled = asset.enabled,
-  FilePath = asset.localResource("esri_world_imagery.wms"),
+  FilePath = asset.resource("esri_world_imagery.wms"),
   Description = [[World Imagery provides one meter or better satellite and aerial
     imagery in many parts of the world and lower resolution satellite imagery
     worldwide. The map includes 15m TerraColor imagery at small and mid-scales
diff --git a/data/assets/scene/solarsystem/planets/earth/layers/heightlayers/blue_marble_height.asset b/data/assets/scene/solarsystem/planets/earth/layers/heightlayers/blue_marble_height.asset
index f6d07c0577..99fd5da004 100644
--- a/data/assets/scene/solarsystem/planets/earth/layers/heightlayers/blue_marble_height.asset
+++ b/data/assets/scene/solarsystem/planets/earth/layers/heightlayers/blue_marble_height.asset
@@ -2,7 +2,7 @@ local globe = asset.require("../../earth")
 
 
 
-local texturesPath = asset.syncedResource({
+local texturesPath = asset.resource({
   Name = "Earth Textures",
   Type = "HttpSynchronization",
   Identifier = "earth_textures",
diff --git a/data/assets/scene/solarsystem/planets/earth/layers/heightlayers/terrain_tileset.asset b/data/assets/scene/solarsystem/planets/earth/layers/heightlayers/terrain_tileset.asset
index 40bb76d119..725438b659 100644
--- a/data/assets/scene/solarsystem/planets/earth/layers/heightlayers/terrain_tileset.asset
+++ b/data/assets/scene/solarsystem/planets/earth/layers/heightlayers/terrain_tileset.asset
@@ -6,7 +6,7 @@ local Layer = {
   Identifier = "Terrain_tileset",
   Name = "Terrain tileset",
   Enabled = asset.enabled,
-  FilePath = asset.localResource("terrain_tileset.wms"),
+  FilePath = asset.resource("terrain_tileset.wms"),
   TilePixelSize = 129,
   Description = [[This globe layer presents elevation data at approximately 90m or 1km
     per pixel resolution for the world. The elevation data includes 90m Shuttle Radar
diff --git a/data/assets/scene/solarsystem/planets/earth/layers/nightlayers/earth_at_night_2012.asset b/data/assets/scene/solarsystem/planets/earth/layers/nightlayers/earth_at_night_2012.asset
index ab8a2062e7..bf5d210a4d 100644
--- a/data/assets/scene/solarsystem/planets/earth/layers/nightlayers/earth_at_night_2012.asset
+++ b/data/assets/scene/solarsystem/planets/earth/layers/nightlayers/earth_at_night_2012.asset
@@ -6,7 +6,7 @@ local Layer = {
   Identifier = "Earth_at_Night_2012",
   Name = "Earth at Night 2012",
   Enabled = asset.enabled,
-  FilePath = asset.localResource("earth_at_night_2012.wms"),
+  FilePath = asset.resource("earth_at_night_2012.wms"),
   Description = [[The lights of cities and villages trace the outlines of civilization
     in this global view]]
 }
diff --git a/data/assets/scene/solarsystem/planets/earth/layers/nightlayers/earth_night_texture.asset b/data/assets/scene/solarsystem/planets/earth/layers/nightlayers/earth_night_texture.asset
index df716c1df8..87d1650b61 100644
--- a/data/assets/scene/solarsystem/planets/earth/layers/nightlayers/earth_night_texture.asset
+++ b/data/assets/scene/solarsystem/planets/earth/layers/nightlayers/earth_night_texture.asset
@@ -2,7 +2,7 @@ local globe = asset.require("../../earth")
 
 
 
-local texturesPath = asset.syncedResource({
+local texturesPath = asset.resource({
   Name = "Earth Textures",
   Type = "HttpSynchronization",
   Identifier = "earth_textures",
diff --git a/data/assets/scene/solarsystem/planets/earth/layers/overlays/coastlines.asset b/data/assets/scene/solarsystem/planets/earth/layers/overlays/coastlines.asset
index 4a35585b02..73bdf4dbb9 100644
--- a/data/assets/scene/solarsystem/planets/earth/layers/overlays/coastlines.asset
+++ b/data/assets/scene/solarsystem/planets/earth/layers/overlays/coastlines.asset
@@ -4,7 +4,7 @@ local globe = asset.require("../../earth")
 
 local Layer = {
   Identifier = "Coastlines",
-  FilePath = asset.localResource("coastlines.wms"),
+  FilePath = asset.resource("coastlines.wms"),
   Enabled = asset.enabled
 }
 
diff --git a/data/assets/scene/solarsystem/planets/earth/layers/overlays/reference_features.asset b/data/assets/scene/solarsystem/planets/earth/layers/overlays/reference_features.asset
index 0e8f3d3ec8..732a417970 100644
--- a/data/assets/scene/solarsystem/planets/earth/layers/overlays/reference_features.asset
+++ b/data/assets/scene/solarsystem/planets/earth/layers/overlays/reference_features.asset
@@ -6,7 +6,7 @@ local Layer = {
   Identifier = "Reference_Features",
   Name = "Reference Features",
   Enabled = asset.enabled,
-  FilePath = asset.localResource("reference_features.wms")
+  FilePath = asset.resource("reference_features.wms")
 }
 
 
diff --git a/data/assets/scene/solarsystem/planets/earth/layers/overlays/reference_labels.asset b/data/assets/scene/solarsystem/planets/earth/layers/overlays/reference_labels.asset
index 462b635511..44e0ba7299 100644
--- a/data/assets/scene/solarsystem/planets/earth/layers/overlays/reference_labels.asset
+++ b/data/assets/scene/solarsystem/planets/earth/layers/overlays/reference_labels.asset
@@ -6,7 +6,7 @@ local Layer = {
   Identifier = "Reference_Labels",
   Name = "Reference Labels",
   Enabled = asset.enabled,
-  FilePath = asset.localResource("reference_labels.wms")
+  FilePath = asset.resource("reference_labels.wms")
 }
 
 
diff --git a/data/assets/scene/solarsystem/planets/earth/layers/watermasks/gebco_newyork.asset b/data/assets/scene/solarsystem/planets/earth/layers/watermasks/gebco_newyork.asset
index b961f411a6..83d6cca607 100644
--- a/data/assets/scene/solarsystem/planets/earth/layers/watermasks/gebco_newyork.asset
+++ b/data/assets/scene/solarsystem/planets/earth/layers/watermasks/gebco_newyork.asset
@@ -6,7 +6,7 @@ local Layer = {
   Name = "Gebco [New York]",
   Identifier = "Gebco_NewYork",
   Enabled = asset.enabled,
-  FilePath = asset.localResource("gebco_newyork.wms")
+  FilePath = asset.resource("gebco_newyork.wms")
 }
 
 
diff --git a/data/assets/scene/solarsystem/planets/earth/layers/watermasks/gebco_sweden.asset b/data/assets/scene/solarsystem/planets/earth/layers/watermasks/gebco_sweden.asset
index 8b3c2e49d1..711be5ded2 100644
--- a/data/assets/scene/solarsystem/planets/earth/layers/watermasks/gebco_sweden.asset
+++ b/data/assets/scene/solarsystem/planets/earth/layers/watermasks/gebco_sweden.asset
@@ -6,7 +6,7 @@ local Layer = {
   Name = "Gebco [Sweden]",
   Identifier = "Gebco_Sweden",
   Enabled = asset.enabled,
-  FilePath = asset.localResource("gebco_sweden.wms")
+  FilePath = asset.resource("gebco_sweden.wms")
 }
 
 
diff --git a/data/assets/scene/solarsystem/planets/earth/layers/watermasks/gebco_utah.asset b/data/assets/scene/solarsystem/planets/earth/layers/watermasks/gebco_utah.asset
index aa6ea8e5a0..245e08d926 100644
--- a/data/assets/scene/solarsystem/planets/earth/layers/watermasks/gebco_utah.asset
+++ b/data/assets/scene/solarsystem/planets/earth/layers/watermasks/gebco_utah.asset
@@ -6,7 +6,7 @@ local Layer = {
   Name = "Gebco [Utah]",
   Identifier = "Gebco_Utah",
   Enabled = asset.enabled,
-  FilePath = asset.localResource("gebco_utah.wms")
+  FilePath = asset.resource("gebco_utah.wms")
 }
 
 
diff --git a/data/assets/scene/solarsystem/planets/earth/layers/watermasks/modis_water_mask.asset b/data/assets/scene/solarsystem/planets/earth/layers/watermasks/modis_water_mask.asset
index 73f03a8c97..52b5b9ed9a 100644
--- a/data/assets/scene/solarsystem/planets/earth/layers/watermasks/modis_water_mask.asset
+++ b/data/assets/scene/solarsystem/planets/earth/layers/watermasks/modis_water_mask.asset
@@ -6,7 +6,7 @@ local Layer = {
   Identifier = "MODIS_Water_Mask",
   Name = "MODIS Water Mask",
   Enabled = asset.enabled,
-  FilePath = asset.localResource("modis_water_mask.wms")
+  FilePath = asset.resource("modis_water_mask.wms")
 }
 
 
diff --git a/data/assets/scene/solarsystem/planets/earth/magnetosphere/magnetosphere.asset b/data/assets/scene/solarsystem/planets/earth/magnetosphere/magnetosphere.asset
index 0d10b2134d..de8720ac4a 100644
--- a/data/assets/scene/solarsystem/planets/earth/magnetosphere/magnetosphere.asset
+++ b/data/assets/scene/solarsystem/planets/earth/magnetosphere/magnetosphere.asset
@@ -2,9 +2,9 @@ local transforms = asset.require("./transforms_magnetosphere")
 
 
 
-local transferFunction = asset.localResource("CMR-illuminance2.txt")
+local transferFunction = asset.resource("CMR-illuminance2.txt")
 
-local fieldlinesDirectory = asset.syncedResource({
+local fieldlinesDirectory = asset.resource({
   Name = "Magnetosphere 2012 event",
   Type = "HttpSynchronization",
   Identifier = "magnetosphere_2012_event",
diff --git a/data/assets/scene/solarsystem/planets/earth/magnetosphere/transforms_magnetosphere.asset b/data/assets/scene/solarsystem/planets/earth/magnetosphere/transforms_magnetosphere.asset
index 64b90d6b05..d13e5aed46 100644
--- a/data/assets/scene/solarsystem/planets/earth/magnetosphere/transforms_magnetosphere.asset
+++ b/data/assets/scene/solarsystem/planets/earth/magnetosphere/transforms_magnetosphere.asset
@@ -3,7 +3,7 @@ asset.require("spice/base")
 
 
 
-local GSMKernel = asset.localResource("../kernels/GSM.ti")
+local GSMKernel = asset.resource("../kernels/GSM.ti")
 
 local GSMReferenceFrame = {
   Identifier = "GSMReferenceFrame",
diff --git a/data/assets/scene/solarsystem/planets/earth/markers.asset b/data/assets/scene/solarsystem/planets/earth/markers.asset
index 04fe9c6f57..fd9ff9cde9 100644
--- a/data/assets/scene/solarsystem/planets/earth/markers.asset
+++ b/data/assets/scene/solarsystem/planets/earth/markers.asset
@@ -2,7 +2,7 @@ local transforms = asset.require("./transforms")
 
 
 
-local texturesPath = asset.syncedResource({
+local texturesPath = asset.resource({
   Name = "Earth Textures",
   Type = "HttpSynchronization",
   Identifier = "earth_textures",
diff --git a/data/assets/scene/solarsystem/planets/earth/moon/layers/colorlayers/apollo_15_metric_newyork.asset b/data/assets/scene/solarsystem/planets/earth/moon/layers/colorlayers/apollo_15_metric_newyork.asset
index 0f04dd67e0..2dbb8b30d0 100644
--- a/data/assets/scene/solarsystem/planets/earth/moon/layers/colorlayers/apollo_15_metric_newyork.asset
+++ b/data/assets/scene/solarsystem/planets/earth/moon/layers/colorlayers/apollo_15_metric_newyork.asset
@@ -6,7 +6,7 @@ local Layer = {
   Identifier = "Apollo15Metric_NewYork",
   Name = "Apollo 15 Metric Cam [New York]",
   Enabled = asset.enabled,
-  FilePath = asset.localResource("apollo_15_metric_newyork.wms"),
+  FilePath = asset.resource("apollo_15_metric_newyork.wms"),
   Description = [[
     The Apollo 15 Metric (Mapping) Camera obtained high-quality metric photographs, on
     black and white film, with high geometric precision of the lunar surface from lunar
diff --git a/data/assets/scene/solarsystem/planets/earth/moon/layers/colorlayers/clemuvvis_newyork.asset b/data/assets/scene/solarsystem/planets/earth/moon/layers/colorlayers/clemuvvis_newyork.asset
index a6a076cd0f..2c5a74352f 100644
--- a/data/assets/scene/solarsystem/planets/earth/moon/layers/colorlayers/clemuvvis_newyork.asset
+++ b/data/assets/scene/solarsystem/planets/earth/moon/layers/colorlayers/clemuvvis_newyork.asset
@@ -6,7 +6,7 @@ local Layer = {
   Identifier = "ClemUvvis_NewYork",
   Name = "Clem Uvvis [New York]",
   Enabled = asset.enabled,
-  FilePath = asset.localResource("clemuvvis_newyork.wms"),
+  FilePath = asset.resource("clemuvvis_newyork.wms"),
   Settings = {
     Gamma = 1.14,
     Multiplier = 1.4
diff --git a/data/assets/scene/solarsystem/planets/earth/moon/layers/colorlayers/clemuvvis_sweden.asset b/data/assets/scene/solarsystem/planets/earth/moon/layers/colorlayers/clemuvvis_sweden.asset
index 8fed8d750a..b47dc00156 100644
--- a/data/assets/scene/solarsystem/planets/earth/moon/layers/colorlayers/clemuvvis_sweden.asset
+++ b/data/assets/scene/solarsystem/planets/earth/moon/layers/colorlayers/clemuvvis_sweden.asset
@@ -6,7 +6,7 @@ local Layer = {
   Identifier = "ClemUvvis_Sweden",
   Name = "Clem Uvvis [Sweden]",
   Enabled = asset.enabled,
-  FilePath = asset.localResource("clemuvvis_sweden.wms"),
+  FilePath = asset.resource("clemuvvis_sweden.wms"),
   Settings = {
     Gamma = 1.14,
     Multiplier = 1.4
diff --git a/data/assets/scene/solarsystem/planets/earth/moon/layers/colorlayers/clemuvvis_utah.asset b/data/assets/scene/solarsystem/planets/earth/moon/layers/colorlayers/clemuvvis_utah.asset
index b1d7a0e6fa..9af2387895 100644
--- a/data/assets/scene/solarsystem/planets/earth/moon/layers/colorlayers/clemuvvis_utah.asset
+++ b/data/assets/scene/solarsystem/planets/earth/moon/layers/colorlayers/clemuvvis_utah.asset
@@ -6,7 +6,7 @@ local Layer = {
   Identifier = "ClemUvvis_Utah",
   Name = "Clem Uvvis [Utah]",
   Enabled = asset.enabled,
-  FilePath = asset.localResource("clemuvvis_utah.wms"),
+  FilePath = asset.resource("clemuvvis_utah.wms"),
   Settings = {
     Gamma = 1.14,
     Multiplier = 1.4
diff --git a/data/assets/scene/solarsystem/planets/earth/moon/layers/colorlayers/kaguya_newyork.asset b/data/assets/scene/solarsystem/planets/earth/moon/layers/colorlayers/kaguya_newyork.asset
index 1e27e41394..5510619d20 100644
--- a/data/assets/scene/solarsystem/planets/earth/moon/layers/colorlayers/kaguya_newyork.asset
+++ b/data/assets/scene/solarsystem/planets/earth/moon/layers/colorlayers/kaguya_newyork.asset
@@ -6,7 +6,7 @@ local Layer = {
   Identifier = "Kaguya_NewYork",
   Name = "Kaguya [New York]",
   Enabled = asset.enabled,
-  FilePath = asset.localResource("kaguya_newyork.vrt"),
+  FilePath = asset.resource("kaguya_newyork.vrt"),
   Settings = {
     Gamma = 1.0,
     Multiplier = 1.23
diff --git a/data/assets/scene/solarsystem/planets/earth/moon/layers/colorlayers/kaguya_sweden.asset b/data/assets/scene/solarsystem/planets/earth/moon/layers/colorlayers/kaguya_sweden.asset
index df22023c77..bdcf860861 100644
--- a/data/assets/scene/solarsystem/planets/earth/moon/layers/colorlayers/kaguya_sweden.asset
+++ b/data/assets/scene/solarsystem/planets/earth/moon/layers/colorlayers/kaguya_sweden.asset
@@ -6,7 +6,7 @@ local Layer = {
   Identifier = "Kaguya_Sweden",
   Name = "Kaguya [Sweden]",
   Enabled = asset.enabled,
-  FilePath = asset.localResource("kaguya_sweden.vrt"),
+  FilePath = asset.resource("kaguya_sweden.vrt"),
   Settings = {
     Gamma = 1.0,
     Multiplier = 1.23
diff --git a/data/assets/scene/solarsystem/planets/earth/moon/layers/colorlayers/kaguya_utah.asset b/data/assets/scene/solarsystem/planets/earth/moon/layers/colorlayers/kaguya_utah.asset
index ccc6e1db1b..039f491c67 100644
--- a/data/assets/scene/solarsystem/planets/earth/moon/layers/colorlayers/kaguya_utah.asset
+++ b/data/assets/scene/solarsystem/planets/earth/moon/layers/colorlayers/kaguya_utah.asset
@@ -6,7 +6,7 @@ local Layer = {
   Identifier = "Kaguya_Utah",
   Name = "Kaguya [Utah]",
   Enabled = asset.enabled,
-  FilePath = asset.localResource("kaguya_utah.vrt"),
+  FilePath = asset.resource("kaguya_utah.vrt"),
   Settings = {
     Gamma = 1.0,
     Multiplier = 1.23
diff --git a/data/assets/scene/solarsystem/planets/earth/moon/layers/colorlayers/lo_mr_mosaic_newyork.asset b/data/assets/scene/solarsystem/planets/earth/moon/layers/colorlayers/lo_mr_mosaic_newyork.asset
index ea8a0f12f2..32cf9e3350 100644
--- a/data/assets/scene/solarsystem/planets/earth/moon/layers/colorlayers/lo_mr_mosaic_newyork.asset
+++ b/data/assets/scene/solarsystem/planets/earth/moon/layers/colorlayers/lo_mr_mosaic_newyork.asset
@@ -6,7 +6,7 @@ local Layer = {
   Identifier = "LO_MR_Mosaic_NewYork",
   Name = "Moon Lunar Orbiter Digital Photographic Global Mosaic 59m v1 [New York]",
   Enabled = asset.enabled,
-  FilePath = asset.localResource("lo_mr_mosaic_newyork.wms"),
+  FilePath = asset.resource("lo_mr_mosaic_newyork.wms"),
   Description = [[
     This Lunar Orbiter (LO) mosaic of the Moon was constructed using
     photographs acquired by LO III, IV and V. Work towards constructing the global mosaic
diff --git a/data/assets/scene/solarsystem/planets/earth/moon/layers/colorlayers/lo_mr_mosaic_sweden.asset b/data/assets/scene/solarsystem/planets/earth/moon/layers/colorlayers/lo_mr_mosaic_sweden.asset
index bdb6289b30..d29dda3b1e 100644
--- a/data/assets/scene/solarsystem/planets/earth/moon/layers/colorlayers/lo_mr_mosaic_sweden.asset
+++ b/data/assets/scene/solarsystem/planets/earth/moon/layers/colorlayers/lo_mr_mosaic_sweden.asset
@@ -6,7 +6,7 @@ local Layer = {
   Identifier = "LO_MR_Mosaic_Sweden",
   Name = "Moon Lunar Orbiter Digital Photographic Global Mosaic 59m v1 [Sweden]",
   Enabled = asset.enabled,
-  FilePath = asset.localResource("lo_mr_mosaic_sweden.wms"),
+  FilePath = asset.resource("lo_mr_mosaic_sweden.wms"),
   Description = [[
     This Lunar Orbiter (LO) mosaic of the Moon was constructed using photographs acquired
     by LO III, IV and V. Work towards constructing the global mosaic spanned over seven
diff --git a/data/assets/scene/solarsystem/planets/earth/moon/layers/colorlayers/lola_clr_shade_newyork.asset b/data/assets/scene/solarsystem/planets/earth/moon/layers/colorlayers/lola_clr_shade_newyork.asset
index 6ec6420c62..e8637aaf32 100644
--- a/data/assets/scene/solarsystem/planets/earth/moon/layers/colorlayers/lola_clr_shade_newyork.asset
+++ b/data/assets/scene/solarsystem/planets/earth/moon/layers/colorlayers/lola_clr_shade_newyork.asset
@@ -6,7 +6,7 @@ local Layer = {
   Identifier = "Lola_Clr_Shade_NewYork",
   Name = "LRO LOLA Color Shaded Relief 388m v4 [New York]",
   Enabled = asset.enabled,
-  FilePath = asset.localResource("lola_clr_shade_newyork.wms"),
+  FilePath = asset.resource("lola_clr_shade_newyork.wms"),
   Description = [[This is a colorized shaded-relief of a original polar digital elevation
     model (DEM) from the Lunar Orbiter Laser Altimeter (LOLA; Smith et al., 2010), an
     instrument on the National Aeronautics and Space Agency (NASA) Lunar Reconnaissance
diff --git a/data/assets/scene/solarsystem/planets/earth/moon/layers/colorlayers/lola_clr_shade_sweden.asset b/data/assets/scene/solarsystem/planets/earth/moon/layers/colorlayers/lola_clr_shade_sweden.asset
index 573f18aa71..24982ee682 100644
--- a/data/assets/scene/solarsystem/planets/earth/moon/layers/colorlayers/lola_clr_shade_sweden.asset
+++ b/data/assets/scene/solarsystem/planets/earth/moon/layers/colorlayers/lola_clr_shade_sweden.asset
@@ -6,7 +6,7 @@ local Layer = {
   Identifier = "Lola_Clr_Shade_Sweden",
   Name = "LRO LOLA Color Shaded Relief 388m v4 [Sweden]",
   Enabled = asset.enabled,
-  FilePath = asset.localResource("lola_clr_shade_sweden.wms"),
+  FilePath = asset.resource("lola_clr_shade_sweden.wms"),
   Description = [[This is a colorized shaded-relief of a original polar digital elevation
     model (DEM) from the Lunar Orbiter Laser Altimeter (LOLA; Smith et al., 2010), an
     instrument on the National Aeronautics and Space Agency (NASA) Lunar Reconnaissance
diff --git a/data/assets/scene/solarsystem/planets/earth/moon/layers/colorlayers/lola_clr_shade_utah.asset b/data/assets/scene/solarsystem/planets/earth/moon/layers/colorlayers/lola_clr_shade_utah.asset
index bbd2185b61..d482bfc423 100644
--- a/data/assets/scene/solarsystem/planets/earth/moon/layers/colorlayers/lola_clr_shade_utah.asset
+++ b/data/assets/scene/solarsystem/planets/earth/moon/layers/colorlayers/lola_clr_shade_utah.asset
@@ -6,7 +6,7 @@ local Layer = {
   Identifier = "Lola_Clr_Shade_Utah",
   Name = "LRO LOLA Color Shaded Relief 388m v4 [Utah]",
   Enabled = asset.enabled,
-  FilePath = asset.localResource("lola_clr_shade_utah.wms"),
+  FilePath = asset.resource("lola_clr_shade_utah.wms"),
   Description = [[This is a colorized shaded-relief of a original polar digital elevation
     model (DEM) from the Lunar Orbiter Laser Altimeter (LOLA; Smith et al., 2010), an
     instrument on the National Aeronautics and Space Agency (NASA) Lunar Reconnaissance
diff --git a/data/assets/scene/solarsystem/planets/earth/moon/layers/colorlayers/lola_shade_newyork.asset b/data/assets/scene/solarsystem/planets/earth/moon/layers/colorlayers/lola_shade_newyork.asset
index b7dfd05486..f7d0abd6ac 100644
--- a/data/assets/scene/solarsystem/planets/earth/moon/layers/colorlayers/lola_shade_newyork.asset
+++ b/data/assets/scene/solarsystem/planets/earth/moon/layers/colorlayers/lola_shade_newyork.asset
@@ -6,7 +6,7 @@ local Layer = {
   Identifier = "Lola_Shade_NewYork",
   Name = "Lola Shade [New York]",
   Enabled = asset.enabled,
-  FilePath = asset.localResource("lola_shade_newyork.wms"),
+  FilePath = asset.resource("lola_shade_newyork.wms"),
   Description = [[This is a shaded-relief of a original polar digital elevation model
     (DEM) from the Lunar Orbiter Laser Altimeter (LOLA; Smith et al., 2010), an instrument
     on the National Aeronautics and Space Agency (NASA) Lunar Reconnaissance Orbiter (LRO)
diff --git a/data/assets/scene/solarsystem/planets/earth/moon/layers/colorlayers/lola_shade_sweden.asset b/data/assets/scene/solarsystem/planets/earth/moon/layers/colorlayers/lola_shade_sweden.asset
index 32febd2575..494aa6558c 100644
--- a/data/assets/scene/solarsystem/planets/earth/moon/layers/colorlayers/lola_shade_sweden.asset
+++ b/data/assets/scene/solarsystem/planets/earth/moon/layers/colorlayers/lola_shade_sweden.asset
@@ -6,7 +6,7 @@ local Layer = {
   Identifier = "Lola_Shade_Sweden",
   Name = "Lola Shade [Sweden]",
   Enabled = asset.enabled,
-  FilePath = asset.localResource("lola_shade_sweden.wms"),
+  FilePath = asset.resource("lola_shade_sweden.wms"),
   Description = [[This is a shaded-relief of a original polar digital elevation model
     (DEM) from the Lunar Orbiter Laser Altimeter (LOLA; Smith et al., 2010), an instrument
     on the National Aeronautics and Space Agency (NASA) Lunar Reconnaissance Orbiter (LRO)
diff --git a/data/assets/scene/solarsystem/planets/earth/moon/layers/colorlayers/lola_shade_utah.asset b/data/assets/scene/solarsystem/planets/earth/moon/layers/colorlayers/lola_shade_utah.asset
index 98ede5bd6b..eb6ea2fcbd 100644
--- a/data/assets/scene/solarsystem/planets/earth/moon/layers/colorlayers/lola_shade_utah.asset
+++ b/data/assets/scene/solarsystem/planets/earth/moon/layers/colorlayers/lola_shade_utah.asset
@@ -6,7 +6,7 @@ local Layer = {
   Identifier = "Lola_Shade_Utah",
   Name = "Lola Shade [Utah]",
   Enabled = asset.enabled,
-  FilePath = asset.localResource("lola_shade_utah.wms"),
+  FilePath = asset.resource("lola_shade_utah.wms"),
   Description = [[This is a shaded-relief of a original polar digital elevation model
     (DEM) from the Lunar Orbiter Laser Altimeter (LOLA; Smith et al., 2010), an instrument
     on the National Aeronautics and Space Agency (NASA) Lunar Reconnaissance Orbiter (LRO)
diff --git a/data/assets/scene/solarsystem/planets/earth/moon/layers/colorlayers/moon_texture.asset b/data/assets/scene/solarsystem/planets/earth/moon/layers/colorlayers/moon_texture.asset
index 35249206b2..4d1126830a 100644
--- a/data/assets/scene/solarsystem/planets/earth/moon/layers/colorlayers/moon_texture.asset
+++ b/data/assets/scene/solarsystem/planets/earth/moon/layers/colorlayers/moon_texture.asset
@@ -2,7 +2,7 @@ local globe = asset.require("../../moon")
 
 
 
-local texturesPath = asset.syncedResource({
+local texturesPath = asset.resource({
   Name = "Moon Textures",
   Type = "HttpSynchronization",
   Identifier = "moon_textures",
diff --git a/data/assets/scene/solarsystem/planets/earth/moon/layers/colorlayers/uvvishybrid_newyork.asset b/data/assets/scene/solarsystem/planets/earth/moon/layers/colorlayers/uvvishybrid_newyork.asset
index 7a89103305..e115aa99cc 100644
--- a/data/assets/scene/solarsystem/planets/earth/moon/layers/colorlayers/uvvishybrid_newyork.asset
+++ b/data/assets/scene/solarsystem/planets/earth/moon/layers/colorlayers/uvvishybrid_newyork.asset
@@ -6,7 +6,7 @@ local Layer = {
   Identifier = "UvvisHybrid_NewYork",
   Name = "Uvvis Hybrid [New York]",
   Enabled = asset.enabled,
-  FilePath = asset.localResource("uvvishybrid_newyork.wms"),
+  FilePath = asset.resource("uvvishybrid_newyork.wms"),
   Settings = {
     Gamma = 0.52,
     Multiplier = 0.65
diff --git a/data/assets/scene/solarsystem/planets/earth/moon/layers/colorlayers/uvvishybrid_sweden.asset b/data/assets/scene/solarsystem/planets/earth/moon/layers/colorlayers/uvvishybrid_sweden.asset
index eba3c74b84..a614c22a97 100644
--- a/data/assets/scene/solarsystem/planets/earth/moon/layers/colorlayers/uvvishybrid_sweden.asset
+++ b/data/assets/scene/solarsystem/planets/earth/moon/layers/colorlayers/uvvishybrid_sweden.asset
@@ -6,7 +6,7 @@ local Layer = {
   Identifier = "UvvisHybrid_Sweden",
   Name = "Uvvis Hybrid [Sweden]",
   Enabled = asset.enabled,
-  FilePath = asset.localResource("uvvishybrid_sweden.wms"),
+  FilePath = asset.resource("uvvishybrid_sweden.wms"),
   Settings = {
     Gamma = 0.52,
     Multiplier = 0.65
diff --git a/data/assets/scene/solarsystem/planets/earth/moon/layers/colorlayers/uvvishybrid_utah.asset b/data/assets/scene/solarsystem/planets/earth/moon/layers/colorlayers/uvvishybrid_utah.asset
index 1fab137ebf..65178ebebf 100644
--- a/data/assets/scene/solarsystem/planets/earth/moon/layers/colorlayers/uvvishybrid_utah.asset
+++ b/data/assets/scene/solarsystem/planets/earth/moon/layers/colorlayers/uvvishybrid_utah.asset
@@ -6,7 +6,7 @@ local Layer = {
   Identifier = "UvvisHybrid_Utah",
   Name = "Uvvis Hybrid [Utah]",
   Enabled = asset.enabled,
-  FilePath = asset.localResource("uvvishybrid_utah.wms"),
+  FilePath = asset.resource("uvvishybrid_utah.wms"),
   Settings = {
     Gamma = 0.52,
     Multiplier = 0.65
diff --git a/data/assets/scene/solarsystem/planets/earth/moon/layers/colorlayers/wac_newyork.asset b/data/assets/scene/solarsystem/planets/earth/moon/layers/colorlayers/wac_newyork.asset
index c4416d5928..5c51f24967 100644
--- a/data/assets/scene/solarsystem/planets/earth/moon/layers/colorlayers/wac_newyork.asset
+++ b/data/assets/scene/solarsystem/planets/earth/moon/layers/colorlayers/wac_newyork.asset
@@ -6,7 +6,7 @@ local Layer = {
   Identifier = "WAC_NewYork",
   Name = "WAC [New York]",
   Enabled = asset.enabled,
-  FilePath = asset.localResource("wac_newyork.wms"),
+  FilePath = asset.resource("wac_newyork.wms"),
   Settings = { Gamma = 0.84 },
   Description = [[Lunar Reconnaissance Orbiter Camera (LROC) Wide Angle Camera (WAC)
     aboard the Lunar Reconnaissance Orbiter (LRO) has allowed the instrument team to
diff --git a/data/assets/scene/solarsystem/planets/earth/moon/layers/colorlayers/wac_sweden.asset b/data/assets/scene/solarsystem/planets/earth/moon/layers/colorlayers/wac_sweden.asset
index cf28ca5bd3..11e95cdaa4 100644
--- a/data/assets/scene/solarsystem/planets/earth/moon/layers/colorlayers/wac_sweden.asset
+++ b/data/assets/scene/solarsystem/planets/earth/moon/layers/colorlayers/wac_sweden.asset
@@ -6,7 +6,7 @@ local Layer = {
   Identifier = "WAC_Sweden",
   Name = "WAC [Sweden]",
   Enabled = asset.enabled,
-  FilePath = asset.localResource("wac_sweden.wms"),
+  FilePath = asset.resource("wac_sweden.wms"),
   Settings = { Gamma = 0.84 },
   Description = [[Lunar Reconnaissance Orbiter Camera (LROC) Wide Angle Camera (WAC)
     aboard the Lunar Reconnaissance Orbiter (LRO) has allowed the instrument team to
diff --git a/data/assets/scene/solarsystem/planets/earth/moon/layers/colorlayers/wac_utah.asset b/data/assets/scene/solarsystem/planets/earth/moon/layers/colorlayers/wac_utah.asset
index a5033b2521..2a5e3c8b91 100644
--- a/data/assets/scene/solarsystem/planets/earth/moon/layers/colorlayers/wac_utah.asset
+++ b/data/assets/scene/solarsystem/planets/earth/moon/layers/colorlayers/wac_utah.asset
@@ -6,7 +6,7 @@ local Layer = {
   Identifier = "WAC_Utah",
   Name = "WAC [Utah]",
   Enabled = asset.enabled,
-  FilePath = asset.localResource("wac_utah.wms"),
+  FilePath = asset.resource("wac_utah.wms"),
   Settings = { Gamma = 0.84 },
   Description = [[Lunar Reconnaissance Orbiter Camera (LROC) Wide Angle Camera (WAC)
     aboard the Lunar Reconnaissance Orbiter (LRO) has allowed the instrument team to
diff --git a/data/assets/scene/solarsystem/planets/earth/moon/layers/colorlayers/wac_v1_newyork.asset b/data/assets/scene/solarsystem/planets/earth/moon/layers/colorlayers/wac_v1_newyork.asset
index c6619d72f9..fe3dff4f5e 100644
--- a/data/assets/scene/solarsystem/planets/earth/moon/layers/colorlayers/wac_v1_newyork.asset
+++ b/data/assets/scene/solarsystem/planets/earth/moon/layers/colorlayers/wac_v1_newyork.asset
@@ -6,7 +6,7 @@ local Layer = {
   Identifier = "WAC_V1_NewYork",
   Name = "WAC V1 [New York]",
   Enabled = asset.enabled,
-  FilePath = asset.localResource("wac_v1_newyork.wms"),
+  FilePath = asset.resource("wac_v1_newyork.wms"),
   Settings = { Gamma = 0.84 },
   Description = [[Lunar Reconnaissance Orbiter Camera (LROC) Wide Angle Camera (WAC)
     aboard the Lunar Reconnaissance Orbiter (LRO) has allowed the instrument team to
diff --git a/data/assets/scene/solarsystem/planets/earth/moon/layers/colorlayers/wac_v1_sweden.asset b/data/assets/scene/solarsystem/planets/earth/moon/layers/colorlayers/wac_v1_sweden.asset
index eb0c4fad2a..8f78d2c428 100644
--- a/data/assets/scene/solarsystem/planets/earth/moon/layers/colorlayers/wac_v1_sweden.asset
+++ b/data/assets/scene/solarsystem/planets/earth/moon/layers/colorlayers/wac_v1_sweden.asset
@@ -6,7 +6,7 @@ local Layer = {
   Identifier = "WAC_V1_Sweden",
   Name = "WAC V1 [Sweden]",
   Enabled = asset.enabled,
-  FilePath = asset.localResource("wac_v1_sweden.wms"),
+  FilePath = asset.resource("wac_v1_sweden.wms"),
   Settings = { Gamma = 0.84 },
   Description = [[Lunar Reconnaissance Orbiter Camera (LROC) Wide Angle Camera (WAC)
     aboard the Lunar Reconnaissance Orbiter (LRO) has allowed the instrument team to
diff --git a/data/assets/scene/solarsystem/planets/earth/moon/layers/colorlayers/wac_v1_utah.asset b/data/assets/scene/solarsystem/planets/earth/moon/layers/colorlayers/wac_v1_utah.asset
index bbeff64218..79e888a969 100644
--- a/data/assets/scene/solarsystem/planets/earth/moon/layers/colorlayers/wac_v1_utah.asset
+++ b/data/assets/scene/solarsystem/planets/earth/moon/layers/colorlayers/wac_v1_utah.asset
@@ -6,7 +6,7 @@ local Layer = {
   Identifier = "WAC_V1_Utah",
   Name = "WAC V1 [Utah]",
   Enabled = asset.enabled,
-  FilePath = asset.localResource("wac_v1_utah.wms"),
+  FilePath = asset.resource("wac_v1_utah.wms"),
   Settings = { Gamma = 0.84 },
   Description = [[Lunar Reconnaissance Orbiter Camera (LROC) Wide Angle Camera (WAC)
     aboard the Lunar Reconnaissance Orbiter (LRO) has allowed the instrument team to
diff --git a/data/assets/scene/solarsystem/planets/earth/moon/layers/heightlayers/loladem_newyork.asset b/data/assets/scene/solarsystem/planets/earth/moon/layers/heightlayers/loladem_newyork.asset
index 2bb42cb75a..636261ef0a 100644
--- a/data/assets/scene/solarsystem/planets/earth/moon/layers/heightlayers/loladem_newyork.asset
+++ b/data/assets/scene/solarsystem/planets/earth/moon/layers/heightlayers/loladem_newyork.asset
@@ -6,7 +6,7 @@ local Layer = {
   Identifier = "LolaDem_NewYork",
   Name = "Lola DEM [New York]",
   Enabled = asset.enabled,
-  FilePath = asset.localResource("loladem_newyork.wms"),
+  FilePath = asset.resource("loladem_newyork.wms"),
   TilePixelSize = 360,
   Settings = { Multiplier = 0.5 },
   Description = [[This digital elevation model (DEM) is based on data from the Lunar
diff --git a/data/assets/scene/solarsystem/planets/earth/moon/layers/heightlayers/loladem_sweden.asset b/data/assets/scene/solarsystem/planets/earth/moon/layers/heightlayers/loladem_sweden.asset
index 1f104ba1a7..1077329238 100644
--- a/data/assets/scene/solarsystem/planets/earth/moon/layers/heightlayers/loladem_sweden.asset
+++ b/data/assets/scene/solarsystem/planets/earth/moon/layers/heightlayers/loladem_sweden.asset
@@ -6,7 +6,7 @@ local Layer = {
   Identifier = "LolaDem_Sweden",
   Name = "Lola DEM [Sweden]",
   Enabled = asset.enabled,
-  FilePath = asset.localResource("loladem_sweden.wms"),
+  FilePath = asset.resource("loladem_sweden.wms"),
   TilePixelSize = 360,
   Settings = { Multiplier = 0.5 }
 }
diff --git a/data/assets/scene/solarsystem/planets/earth/moon/layers/heightlayers/loladem_utah.asset b/data/assets/scene/solarsystem/planets/earth/moon/layers/heightlayers/loladem_utah.asset
index e71e47147e..126ba159e3 100644
--- a/data/assets/scene/solarsystem/planets/earth/moon/layers/heightlayers/loladem_utah.asset
+++ b/data/assets/scene/solarsystem/planets/earth/moon/layers/heightlayers/loladem_utah.asset
@@ -6,7 +6,7 @@ local Layer = {
   Identifier = "LolaDem_Utah",
   Name = "Lola DEM [Utah]",
   Enabled = asset.enabled,
-  FilePath = asset.localResource("loladem_utah.wms"),
+  FilePath = asset.resource("loladem_utah.wms"),
   TilePixelSize = 360,
   Settings = { Multiplier = 0.5 },
   Description = [[This digital elevation model (DEM) is based on data from the Lunar
diff --git a/data/assets/scene/solarsystem/planets/earth/moon/markers.asset b/data/assets/scene/solarsystem/planets/earth/moon/markers.asset
index e6fc604800..6a0e63ed03 100644
--- a/data/assets/scene/solarsystem/planets/earth/moon/markers.asset
+++ b/data/assets/scene/solarsystem/planets/earth/moon/markers.asset
@@ -2,7 +2,7 @@ local transforms = asset.require("./moon")
 
 
 
-local texturesPath = asset.syncedResource({
+local texturesPath = asset.resource({
   Name = "Moon Textures",
   Type = "HttpSynchronization",
   Identifier = "moon_textures",
diff --git a/data/assets/scene/solarsystem/planets/earth/moon/moon.asset b/data/assets/scene/solarsystem/planets/earth/moon/moon.asset
index 145d109c29..a2a23e1dff 100644
--- a/data/assets/scene/solarsystem/planets/earth/moon/moon.asset
+++ b/data/assets/scene/solarsystem/planets/earth/moon/moon.asset
@@ -5,7 +5,7 @@ local earthAsset = asset.require("../earth")
 
 
 
-local labelsPath = asset.syncedResource({
+local labelsPath = asset.resource({
   Name = "Moon Labels",
   Type = "HttpSynchronization",
   Identifier = "moon_labels",
diff --git a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/Apollo_15_Metric_Cam_DEM.asset b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/Apollo_15_Metric_Cam_DEM.asset
index 964d2edc0e..035b0ddc0b 100644
--- a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/Apollo_15_Metric_Cam_DEM.asset
+++ b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/Apollo_15_Metric_Cam_DEM.asset
@@ -9,28 +9,28 @@ local globeIdentifier = asset.require("scene/solarsystem//planets/earth/moon/moo
 local treks_Apollo15_MetricCam_ClrShade_Global_1024ppd = {
   Identifier = "Apollo15_MetricCam_ClrShade_Global_1024ppd",
   Name = [[Apollo 15 Metric Cam DEM, ColorHillshade]],
-  FilePath = asset.localResource("Apollo_15_Metric_Cam_DEM/ColorHillshade.vrt"),
+  FilePath = asset.resource("Apollo_15_Metric_Cam_DEM/ColorHillshade.vrt"),
   Description = [[]]
 }
 
 local treks_Apollo15_MetricCam_ClrConf_Global_1024ppd = {
   Identifier = "Apollo15_MetricCam_ClrConf_Global_1024ppd",
   Name = [[Apollo 15 Metric Cam DEM, Colorized Confidence]],
-  FilePath = asset.localResource("Apollo_15_Metric_Cam_DEM/Colorized_Confidence.vrt"),
+  FilePath = asset.resource("Apollo_15_Metric_Cam_DEM/Colorized_Confidence.vrt"),
   Description = [[]]
 }
 
 local treks_Apollo15_MetricCam_Gray_Global_1024ppd = {
   Identifier = "Apollo15_MetricCam_Gray_Global_1024ppd",
   Name = [[Apollo 15 Metric Cam DEM, Grayscale]],
-  FilePath = asset.localResource("Apollo_15_Metric_Cam_DEM/Grayscale.vrt"),
+  FilePath = asset.resource("Apollo_15_Metric_Cam_DEM/Grayscale.vrt"),
   Description = [[]]
 }
 
 local treks_Apollo15_MetricCam_Shade_Global_1024ppd = {
   Identifier = "Apollo15_MetricCam_Shade_Global_1024ppd",
   Name = [[Apollo 15 Metric Cam DEM, Hillshade]],
-  FilePath = asset.localResource("Apollo_15_Metric_Cam_DEM/Hillshade.vrt"),
+  FilePath = asset.resource("Apollo_15_Metric_Cam_DEM/Hillshade.vrt"),
   Description = [[]]
 }
 
diff --git a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/Apollo_15_Pan_Cam_DEM.asset b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/Apollo_15_Pan_Cam_DEM.asset
index a55c41ca8c..4a982bc9af 100644
--- a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/Apollo_15_Pan_Cam_DEM.asset
+++ b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/Apollo_15_Pan_Cam_DEM.asset
@@ -9,21 +9,21 @@ local globeIdentifier = asset.require("scene/solarsystem//planets/earth/moon/moo
 local treks_Apollo15_PanCam_ClrShade_25N311E_5mp = {
   Identifier = "Apollo15_PanCam_ClrShade_25N311E_5mp",
   Name = [[Apollo 15 Pan Cam DEM, Aristarchus Plateau 1, ColorHillshade]],
-  FilePath = asset.localResource("Apollo_15_Pan_Cam_DEM/Aristarchus_Plateau_1.vrt"),
+  FilePath = asset.resource("Apollo_15_Pan_Cam_DEM/Aristarchus_Plateau_1.vrt"),
   Description = [[]]
 }
 
 local treks_Apollo15_PanCam_ClrShade_28N307E_3mp = {
   Identifier = "Apollo15_PanCam_ClrShade_28N307E_3mp",
   Name = [[Apollo 15 Pan Cam DEM, Aristarchus Plateau 2, ColorHillshade]],
-  FilePath = asset.localResource("Apollo_15_Pan_Cam_DEM/Aristarchus_Plateau_2.vrt"),
+  FilePath = asset.resource("Apollo_15_Pan_Cam_DEM/Aristarchus_Plateau_2.vrt"),
   Description = [[]]
 }
 
 local treks_Apollo15_PanCam_ClrShade_19S129E_5mp = {
   Identifier = "Apollo15_PanCam_ClrShade_19S129E_5mp",
   Name = [[Apollo 15 Pan Cam DEM, Tsiolkovskiy Crater, ColorHillshade]],
-  FilePath = asset.localResource("Apollo_15_Pan_Cam_DEM/Tsiolkovskiy_Crater.vrt"),
+  FilePath = asset.resource("Apollo_15_Pan_Cam_DEM/Tsiolkovskiy_Crater.vrt"),
   Description = [[]]
 }
 
diff --git a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/Apollo_15_Pan_Cam_Image_Mosaic.asset b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/Apollo_15_Pan_Cam_Image_Mosaic.asset
index a85f90fcb7..ce84cd9ef3 100644
--- a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/Apollo_15_Pan_Cam_Image_Mosaic.asset
+++ b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/Apollo_15_Pan_Cam_Image_Mosaic.asset
@@ -9,21 +9,21 @@ local globeIdentifier = asset.require("scene/solarsystem//planets/earth/moon/moo
 local treks_Apollo15_PanCam_Mosaic_25N311E_150cmp = {
   Identifier = "Apollo15_PanCam_Mosaic_25N311E_150cmp",
   Name = [[Apollo 15 Pan Cam Image Mosaic, Aristarchus Plateau 1]],
-  FilePath = asset.localResource("Apollo_15_Pan_Cam_Image_Mosaic/Aristarchus_Plateau_1.vrt"),
+  FilePath = asset.resource("Apollo_15_Pan_Cam_Image_Mosaic/Aristarchus_Plateau_1.vrt"),
   Description = [[]]
 }
 
 local treks_Apollo15_PanCam_Mosaic_28N307E_1mp = {
   Identifier = "Apollo15_PanCam_Mosaic_28N307E_1mp",
   Name = [[Apollo 15 Pan Cam Image Mosaic, Aristarchus Plateau 2]],
-  FilePath = asset.localResource("Apollo_15_Pan_Cam_Image_Mosaic/Aristarchus_Plateau_2.vrt"),
+  FilePath = asset.resource("Apollo_15_Pan_Cam_Image_Mosaic/Aristarchus_Plateau_2.vrt"),
   Description = [[]]
 }
 
 local treks_Apollo15_PanCam_Mosaic_19S129E_2mp = {
   Identifier = "Apollo15_PanCam_Mosaic_19S129E_2mp",
   Name = [[Apollo 15 Pan Cam Image Mosaic, Tsiolkovskiy Crater]],
-  FilePath = asset.localResource("Apollo_15_Pan_Cam_Image_Mosaic/Tsiolkovskiy_Crater.vrt"),
+  FilePath = asset.resource("Apollo_15_Pan_Cam_Image_Mosaic/Tsiolkovskiy_Crater.vrt"),
   Description = [[]]
 }
 
diff --git a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/Apollo_16_Metric_Cam_DEM.asset b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/Apollo_16_Metric_Cam_DEM.asset
index fb5b11d029..78188ee50a 100644
--- a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/Apollo_16_Metric_Cam_DEM.asset
+++ b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/Apollo_16_Metric_Cam_DEM.asset
@@ -9,21 +9,21 @@ local globeIdentifier = asset.require("scene/solarsystem//planets/earth/moon/moo
 local treks_Apollo16_MetricCam_ClrConf_Global_1024ppd = {
   Identifier = "Apollo16_MetricCam_ClrConf_Global_1024ppd",
   Name = [[Apollo 16 Metric Cam DEM, Colorized Confidence]],
-  FilePath = asset.localResource("Apollo_16_Metric_Cam_DEM/Colorized_Confidence.vrt"),
+  FilePath = asset.resource("Apollo_16_Metric_Cam_DEM/Colorized_Confidence.vrt"),
   Description = [[]]
 }
 
 local treks_Apollo16_MetricCam_Gray_Global_1024ppd = {
   Identifier = "Apollo16_MetricCam_Gray_Global_1024ppd",
   Name = [[Apollo 16 Metric Cam DEM, Grayscale]],
-  FilePath = asset.localResource("Apollo_16_Metric_Cam_DEM/Grayscale.vrt"),
+  FilePath = asset.resource("Apollo_16_Metric_Cam_DEM/Grayscale.vrt"),
   Description = [[]]
 }
 
 local treks_Apollo16_MetricCam_Shade_Global_1024ppd = {
   Identifier = "Apollo16_MetricCam_Shade_Global_1024ppd",
   Name = [[Apollo 16 Metric Cam DEM, Hillshade]],
-  FilePath = asset.localResource("Apollo_16_Metric_Cam_DEM/Hillshade.vrt"),
+  FilePath = asset.resource("Apollo_16_Metric_Cam_DEM/Hillshade.vrt"),
   Description = [[]]
 }
 
diff --git a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/Apollo_17_Metric_Cam_DEM.asset b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/Apollo_17_Metric_Cam_DEM.asset
index 2bf7517b6e..0fb53f33c8 100644
--- a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/Apollo_17_Metric_Cam_DEM.asset
+++ b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/Apollo_17_Metric_Cam_DEM.asset
@@ -9,14 +9,14 @@ local globeIdentifier = asset.require("scene/solarsystem//planets/earth/moon/moo
 local treks_Apollo17_MetricCam_ClrShade_Global_1024ppd = {
   Identifier = "Apollo17_MetricCam_ClrShade_Global_1024ppd",
   Name = [[Apollo 17 Metric Cam DEM, ColorHillshade]],
-  FilePath = asset.localResource("Apollo_17_Metric_Cam_DEM/ColorHillshade.vrt"),
+  FilePath = asset.resource("Apollo_17_Metric_Cam_DEM/ColorHillshade.vrt"),
   Description = [[]]
 }
 
 local treks_Apollo17_MetricCam_Gray_Global_1024ppd = {
   Identifier = "Apollo17_MetricCam_Gray_Global_1024ppd",
   Name = [[Apollo 17 Metric Cam DEM, Grayscale]],
-  FilePath = asset.localResource("Apollo_17_Metric_Cam_DEM/Grayscale.vrt"),
+  FilePath = asset.resource("Apollo_17_Metric_Cam_DEM/Grayscale.vrt"),
   Description = [[]]
 }
 
diff --git a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/Apollo_Zone_Metric_Cam.asset b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/Apollo_Zone_Metric_Cam.asset
index 0999b62972..ae5681787f 100644
--- a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/Apollo_Zone_Metric_Cam.asset
+++ b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/Apollo_Zone_Metric_Cam.asset
@@ -9,7 +9,7 @@ local globeIdentifier = asset.require("scene/solarsystem//planets/earth/moon/moo
 local treks_ApolloZone_MetricCam_Shade_Global_1024ppd = {
   Identifier = "ApolloZone_MetricCam_Shade_Global_1024ppd",
   Name = [[Apollo Zone Metric Cam, Hillshade]],
-  FilePath = asset.localResource("Apollo_Zone_Metric_Cam/Hillshade.vrt"),
+  FilePath = asset.resource("Apollo_Zone_Metric_Cam/Hillshade.vrt"),
   Description = [[]]
 }
 
diff --git a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/Apollo_Zone_Metric_Cam_DEM.asset b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/Apollo_Zone_Metric_Cam_DEM.asset
index bd9c029f1e..b42db397d7 100644
--- a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/Apollo_Zone_Metric_Cam_DEM.asset
+++ b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/Apollo_Zone_Metric_Cam_DEM.asset
@@ -9,7 +9,7 @@ local globeIdentifier = asset.require("scene/solarsystem//planets/earth/moon/moo
 local treks_ApolloZone_MetricCam_ClrShade_Global_1024ppd = {
   Identifier = "ApolloZone_MetricCam_ClrShade_Global_1024ppd",
   Name = [[Apollo Zone Metric Cam DEM, ColorHillshade]],
-  FilePath = asset.localResource("Apollo_Zone_Metric_Cam_DEM/ColorHillshade.vrt"),
+  FilePath = asset.resource("Apollo_Zone_Metric_Cam_DEM/ColorHillshade.vrt"),
   Description = [[]]
 }
 
diff --git a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/Global.asset b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/Global.asset
index 382f4693db..81130e1b68 100644
--- a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/Global.asset
+++ b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/Global.asset
@@ -9,119 +9,119 @@ local globeIdentifier = asset.require("scene/solarsystem//planets/earth/moon/moo
 local treks_Apollo15_MetricCam_Mosaic_Global_4096ppd = {
   Identifier = "Apollo15_MetricCam_Mosaic_Global_4096ppd",
   Name = [[Apollo 15 Metric Cam Image Mosaic]],
-  FilePath = asset.localResource("Global/Apollo_15_Metric_Cam_Image_Mosaic.vrt"),
+  FilePath = asset.resource("Global/Apollo_15_Metric_Cam_Image_Mosaic.vrt"),
   Description = [[]]
 }
 
 local treks_Apollo17_MetricCam_Mosaic_Global_3033ppd = {
   Identifier = "Apollo17_MetricCam_Mosaic_Global_3033ppd",
   Name = [[Apollo 17 Metric Cam Image Mosaic]],
-  FilePath = asset.localResource("Global/Apollo_17_Metric_Cam_Image_Mosaic.vrt"),
+  FilePath = asset.resource("Global/Apollo_17_Metric_Cam_Image_Mosaic.vrt"),
   Description = [[]]
 }
 
 local treks_ApolloZone_MetricCam_Mosaic_Global_3033ppd = {
   Identifier = "ApolloZone_MetricCam_Mosaic_Global_3033ppd",
   Name = [[Apollo Zone Metric Cam Image Mosaic]],
-  FilePath = asset.localResource("Global/Apollo_Zone_Metric_Cam_Image_Mosaic.vrt"),
+  FilePath = asset.resource("Global/Apollo_Zone_Metric_Cam_Image_Mosaic.vrt"),
   Description = [[]]
 }
 
 local treks_Clem_UVVIS_FeO_Clr_Global_152ppd = {
   Identifier = "Clem_UVVIS_FeO_Clr_Global_152ppd",
   Name = [[Clementine UVVIS FeO Weight Percent]],
-  FilePath = asset.localResource("Global/Clementine_UVVIS_FeO_Weight_Percent.vrt"),
+  FilePath = asset.resource("Global/Clementine_UVVIS_FeO_Weight_Percent.vrt"),
   Description = [[]]
 }
 
 local treks_Clem_UVVIS_OpticalMaturity_Gray_Global_152ppd = {
   Identifier = "Clem_UVVIS_OpticalMaturity_Gray_Global_152ppd",
   Name = [[Clementine UVVIS Optical Maturity]],
-  FilePath = asset.localResource("Global/Clementine_UVVIS_Optical_Maturity.vrt"),
+  FilePath = asset.resource("Global/Clementine_UVVIS_Optical_Maturity.vrt"),
   Description = [[]]
 }
 
 local treks_Clem_UVVIS_TiO2_Clr_Global_152ppd = {
   Identifier = "Clem_UVVIS_TiO2_Clr_Global_152ppd",
   Name = [[Clementine UVVIS TiO2 Weight Percent]],
-  FilePath = asset.localResource("Global/Clementine_UVVIS_TiO2_Weight_Percent.vrt"),
+  FilePath = asset.resource("Global/Clementine_UVVIS_TiO2_Weight_Percent.vrt"),
   Description = [[]]
 }
 
 local treks_Kaguya_TCortho_Mosaic_Global_4096ppd = {
   Identifier = "Kaguya_TCortho_Mosaic_Global_4096ppd",
   Name = [[Kaguya TC Ortho Mosaic]],
-  FilePath = asset.localResource("Global/Kaguya_TC_Ortho_Mosaic.vrt"),
+  FilePath = asset.resource("Global/Kaguya_TC_Ortho_Mosaic.vrt"),
   Description = [[]]
 }
 
 local treks_LP_NS_H_Clr_Global_2ppd = {
   Identifier = "LP_NS_H_Clr_Global_2ppd",
   Name = [[LP NS H Abundance]],
-  FilePath = asset.localResource("Global/LP_NS_H_Abundance.vrt"),
+  FilePath = asset.resource("Global/LP_NS_H_Abundance.vrt"),
   Description = [[]]
 }
 
 local treks_LRO_Diviner_CF_NoFill_Global_8ppd = {
   Identifier = "LRO_Diviner_CF_NoFill_Global_8ppd",
   Name = [[LRO Diviner CF Mosaic]],
-  FilePath = asset.localResource("Global/LRO_Diviner_CF_Mosaic.vrt"),
+  FilePath = asset.resource("Global/LRO_Diviner_CF_Mosaic.vrt"),
   Description = [[]]
 }
 
 local treks_LRO_WAC_Mosaic_Global_303ppd = {
   Identifier = "LRO_WAC_Mosaic_Global_303ppd",
   Name = [[LRO LROC WAC Image Mosaic]],
-  FilePath = asset.localResource("Global/LRO_LROC_WAC_Image_Mosaic.vrt"),
+  FilePath = asset.resource("Global/LRO_LROC_WAC_Image_Mosaic.vrt"),
   Description = [[]]
 }
 
 local treks_LRO_MiniRF_S1_Gray_Global_128ppd = {
   Identifier = "LRO_MiniRF_S1_Gray_Global_128ppd",
   Name = [[LRO Mini-RF First Stokes Parameter]],
-  FilePath = asset.localResource("Global/LRO_Mini-RF_First_Stokes_Parameter.vrt"),
+  FilePath = asset.resource("Global/LRO_Mini-RF_First_Stokes_Parameter.vrt"),
   Description = [[]]
 }
 
 local treks_LRO_WAC_Mosaic_Global_303ppd_v02 = {
   Identifier = "LRO_WAC_Mosaic_Global_303ppd_v02",
   Name = [[LRO WAC Mosaic v2]],
-  FilePath = asset.localResource("Global/LRO_WAC_Mosaic_v2.vrt"),
+  FilePath = asset.resource("Global/LRO_WAC_Mosaic_v2.vrt"),
   Description = [[]]
 }
 
 local treks_SchrodingerCraterMareUnit_50cmV10eq = {
   Identifier = "SchrodingerCraterMareUnit_50cmV10eq",
   Name = [[LROC NAC Uncontrolled Mosaic of Mare Unit in Schrodinger Crater]],
-  FilePath = asset.localResource("Global/LROC_NAC_Uncontrolled_Mosaic_of_Mare_Unit_in_Schrodinger_Crater.vrt"),
+  FilePath = asset.resource("Global/LROC_NAC_Uncontrolled_Mosaic_of_Mare_Unit_in_Schrodinger_Crater.vrt"),
   Description = [[This is a 50cm/px uncontrolled visible image mosaic generated using Lunar Reconnaissance Orbiter Camera (LROC) Narrow Angle Camera (NAC) images from the Lunar Reconnaissance Orbiter mission. Each NAC image was registered horizontally to the LRO's Lunar Orbiter Laser Altimeter (LOLA) global DEM, and then mosaicked together and color balanced. ]]
 }
 
 local treks_SchrodingerCraterMassif_50cmV10eq = {
   Identifier = "SchrodingerCraterMassif_50cmV10eq",
   Name = [[LROC NAC Uncontrolled Mosaic of Massif in Schrodinger Crater]],
-  FilePath = asset.localResource("Global/LROC_NAC_Uncontrolled_Mosaic_of_Massif_in_Schrodinger_Crater.vrt"),
+  FilePath = asset.resource("Global/LROC_NAC_Uncontrolled_Mosaic_of_Massif_in_Schrodinger_Crater.vrt"),
   Description = [[This is a 50cm/px uncontrolled visible image mosaic generated using Lunar Reconnaissance Orbiter Camera (LROC) Narrow Angle Camera (NAC) images from the Lunar Reconnaissance Orbiter mission. Each NAC image was registered horizontally to the LRO's Lunar Orbiter Laser Altimeter (LOLA) global DEM, and then mosaicked together and color balanced. ]]
 }
 
 local treks_LRO_LOLAKaguya_ClrHillshade_60N60S_512ppd = {
   Identifier = "LRO_LOLAKaguya_ClrHillshade_60N60S_512ppd",
   Name = [[LRO LOLA and Kaguya TC Color Hillshade 512ppd]],
-  FilePath = asset.localResource("Global/LRO_LOLA_and_Kaguya_TC_Color_Hillshade_512ppd.vrt"),
+  FilePath = asset.resource("Global/LRO_LOLA_and_Kaguya_TC_Color_Hillshade_512ppd.vrt"),
   Description = [[This is a colorized shaded-relief representation of the Lunar surface generated from the LOLA and Kaguya merged DEM product. The LOLA and Kaguya Teams have created an improved lunar digital elevation model (DEM) covering latitudes within &plusmn;60&deg;, at a horizontal resolution of 512 pixels per degree (&sim;59 m at the equator) and a typical vertical accuracy &sim;3 to 4 m. This DEM is constructed from &sim;4.5&times;109 geodetically-accurate topographic heights from the Lunar Orbiter Laser Altimeter (LOLA) onboard the Lunar Reconnaissance Orbiter, to which we co-registered 43,200 stereo-derived DEMs (each 1&times;1 degree) from the SELENE Terrain Camera (TC) (&sim;1010 pixels total). After co-registration, approximately 90&percnt; of the TC DEMs show root-mean-square vertical residuals with the LOLA data of &lt;5 m compared to &sim;50&percnt; prior to co-registration. We use the co-registered TC data to estimate and correct orbital and pointing geolocation errors from the LOLA altimetric profiles (typically amounting to &lt;10 m horizontally and &lt;1 m vertically). By combining both co-registered datasets, we obtain a near-global DEM with high geodetic accuracy, and without the need for surface interpolation. We evaluate the resulting LOLA + TC merged DEM (designated as &ldquo;SLDEM2015&rdquo;) with particular attention to quantifying seams and crossover errors. The legend coveys the mapping colors to elevation values (meters) and map values are referred to a radius of 1737400 m.]]
 }
 
 local treks_LRO_LOLAKaguya_Hillshade_60N60S_512ppd = {
   Identifier = "LRO_LOLAKaguya_Hillshade_60N60S_512ppd",
   Name = [[LRO LOLA and Kaguya TC Hillshade 512ppd]],
-  FilePath = asset.localResource("Global/LRO_LOLA_and_Kaguya_TC_Hillshade_512ppd.vrt"),
+  FilePath = asset.resource("Global/LRO_LOLA_and_Kaguya_TC_Hillshade_512ppd.vrt"),
   Description = [[This is a shaded-relief representation of the Lunar surface generated from the LOLA and Kaguya merged DEM product. The LOLA and Kaguya Teams have created an improved lunar digital elevation model (DEM) covering latitudes within &plusmn;60&deg;, at a horizontal resolution of 512 pixels per degree (&sim;59 m at the equator) and a typical vertical accuracy &sim;3 to 4 m. This DEM is constructed from &sim;4.5&times;109 geodetically-accurate topographic heights from the Lunar Orbiter Laser Altimeter (LOLA) onboard the Lunar Reconnaissance Orbiter, to which we co-registered 43,200 stereo-derived DEMs (each 1&times;1 degree) from the SELENE Terrain Camera (TC) (&sim;1010 pixels total). After co-registration, approximately 90&percnt; of the TC DEMs show root-mean-square vertical residuals with the LOLA data of &lt;5 m compared to &sim;50&percnt; prior to co-registration. We use the co-registered TC data to estimate and correct orbital and pointing geolocation errors from the LOLA altimetric profiles (typically amounting to &lt;10 m horizontally and &lt;1 m vertically). By combining both co-registered datasets, we obtain a near-global DEM with high geodetic accuracy, and without the need for surface interpolation. We evaluate the resulting LOLA + TC merged DEM (designated as &ldquo;SLDEM2015&rdquo;) with particular attention to quantifying seams and crossover errors. Elevation values are in meters and map values are referred to a radius of 1737400 m.]]
 }
 
 local treks_Lunar_Clementine_UVVIS_Warp_ClrRatio_Global_200m = {
   Identifier = "Lunar_Clementine_UVVIS_Warp_ClrRatio_Global_200m",
   Name = [[Clementine UVVIS Warped Color Ratio]],
-  FilePath = asset.localResource("Global/Clementine_UVVIS_Warped_Color_Ratio.vrt"),
+  FilePath = asset.resource("Global/Clementine_UVVIS_Warped_Color_Ratio.vrt"),
   Description = [[This base represents the Clementine Ultraviolet/Visible (UVVIS) warped color-ratio mineral map. This was generated from the UVVIS mosaics using three spectral filters (415, 750, and 1000 nm) and which were previously warped (spatially adjusted) to the ULCN2005 control network. The mosaic is a composite in which the ratio of the 750/415nm bands is used for the red-channel brightness, 415/750nm for the blue channel, and the 750/1000nm ratio controls the green channel. Resolution of this mosaic is 200 meters per pixel (m).
 
 Color interpretations:
@@ -134,14 +134,14 @@ For more information on how the color ratio was derived, please see Lucy et al.,
 local treks_LRO_LOLA_Illumination_NPole65N_240m_EQ = {
   Identifier = "LRO_LOLA_Illumination_NPole65N_240m_EQ",
   Name = [[LOLA Permanently Shadowed Regions Northpole 240m]],
-  FilePath = asset.localResource("Global/LOLA_Permanently_Shadowed_Regions_Northpole_240m.vrt"),
+  FilePath = asset.resource("Global/LOLA_Permanently_Shadowed_Regions_Northpole_240m.vrt"),
   Description = [[This data product is a map of the permanently shadowed regions (PSRs) in the lunar North Pole. The map resolution is 240m/pix by 240m/pix, true at the pole in polar stereographic (spherical) projection. The calculations are based on the LOLA elevation map LDEM_75N_240M and are described in. The values are binary, indicating whether a pixel is in permanent shadow (1) or not (0, NoDATA).]]
 }
 
 local treks_LRO_LOLA_Illumination_SPole65S_240m_EQ = {
   Identifier = "LRO_LOLA_Illumination_SPole65S_240m_EQ",
   Name = [[LOLA Permanently Shadowed Regions Southpole 240m]],
-  FilePath = asset.localResource("Global/LOLA_Permanently_Shadowed_Regions_Southpole_240m.vrt"),
+  FilePath = asset.resource("Global/LOLA_Permanently_Shadowed_Regions_Southpole_240m.vrt"),
   Description = [[This data product is a map of the permanently shadowed regions (PSRs) in the lunar South Pole. The map resolution is 240m/pix by 240m/pix, true at the pole in polar stereographic (spherical) projection. The calculations are based on the LOLA elevation map LDEM_75S_240M and are described in. The values are binary, indicating whether a pixel is in permanent shadow (1) or not (0, NoDATA).]]
 }
 
diff --git a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/Kaguya_LGM2011_Freeair_Gravity.asset b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/Kaguya_LGM2011_Freeair_Gravity.asset
index 2042128903..ecb16dc40f 100644
--- a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/Kaguya_LGM2011_Freeair_Gravity.asset
+++ b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/Kaguya_LGM2011_Freeair_Gravity.asset
@@ -9,14 +9,14 @@ local globeIdentifier = asset.require("scene/solarsystem//planets/earth/moon/moo
 local treks_Kaguya_LGM2011_FreeairGravity_Colorized_Global_mgal3m_20ppd = {
   Identifier = "Kaguya_LGM2011_FreeairGravity_Colorized_Global_mgal3m_20ppd",
   Name = [[Kaguya LGM2011 Freeair Gravity, Colorized]],
-  FilePath = asset.localResource("Kaguya_LGM2011_Freeair_Gravity/Colorized.vrt"),
+  FilePath = asset.resource("Kaguya_LGM2011_Freeair_Gravity/Colorized.vrt"),
   Description = [[]]
 }
 
 local treks_Kaguya_LGM2011_FreeairGravity_Gray_Global_mgal3m_20ppd = {
   Identifier = "Kaguya_LGM2011_FreeairGravity_Gray_Global_mgal3m_20ppd",
   Name = [[Kaguya LGM2011 Freeair Gravity, Greyscale]],
-  FilePath = asset.localResource("Kaguya_LGM2011_Freeair_Gravity/Greyscale.vrt"),
+  FilePath = asset.resource("Kaguya_LGM2011_Freeair_Gravity/Greyscale.vrt"),
   Description = [[]]
 }
 
diff --git a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/Kaguya_LGM2011_Surface_Gravity.asset b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/Kaguya_LGM2011_Surface_Gravity.asset
index 0fa16b1f6c..6f91fd6335 100644
--- a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/Kaguya_LGM2011_Surface_Gravity.asset
+++ b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/Kaguya_LGM2011_Surface_Gravity.asset
@@ -9,14 +9,14 @@ local globeIdentifier = asset.require("scene/solarsystem//planets/earth/moon/moo
 local treks_Kaguya_LGM2011_SurfaceGravity_Colorized_Global_mgal3m_20ppd = {
   Identifier = "Kaguya_LGM2011_SurfaceGravity_Colorized_Global_mgal3m_20ppd",
   Name = [[Kaguya LGM2011 Surface Gravity, Colorized]],
-  FilePath = asset.localResource("Kaguya_LGM2011_Surface_Gravity/Colorized.vrt"),
+  FilePath = asset.resource("Kaguya_LGM2011_Surface_Gravity/Colorized.vrt"),
   Description = [[]]
 }
 
 local treks_Kaguya_LGM2011_SurfaceGravity_Gray_Global_mgal3m_20ppd = {
   Identifier = "Kaguya_LGM2011_SurfaceGravity_Gray_Global_mgal3m_20ppd",
   Name = [[Kaguya LGM2011 Surface Gravity, Greyscale]],
-  FilePath = asset.localResource("Kaguya_LGM2011_Surface_Gravity/Greyscale.vrt"),
+  FilePath = asset.resource("Kaguya_LGM2011_Surface_Gravity/Greyscale.vrt"),
   Description = [[]]
 }
 
diff --git a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LOLA_Roughness_16ppd.asset b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LOLA_Roughness_16ppd.asset
index e78e82d395..9bcb27c76e 100644
--- a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LOLA_Roughness_16ppd.asset
+++ b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LOLA_Roughness_16ppd.asset
@@ -9,7 +9,7 @@ local globeIdentifier = asset.require("scene/solarsystem//planets/earth/moon/moo
 local treks_LRO_LOLA_ClrRoughness_Global_16ppd = {
   Identifier = "LRO_LOLA_ClrRoughness_Global_16ppd",
   Name = [[LOLA Roughness 16ppd, Colorized]],
-  FilePath = asset.localResource("LOLA_Roughness_16ppd/Colorized.vrt"),
+  FilePath = asset.resource("LOLA_Roughness_16ppd/Colorized.vrt"),
   Description = [[]]
 }
 
diff --git a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LOLA_Slope_16ppd.asset b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LOLA_Slope_16ppd.asset
index 341af32a88..911e56f518 100644
--- a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LOLA_Slope_16ppd.asset
+++ b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LOLA_Slope_16ppd.asset
@@ -9,7 +9,7 @@ local globeIdentifier = asset.require("scene/solarsystem//planets/earth/moon/moo
 local treks_LRO_LOLA_ClrSlope_Global_16ppd = {
   Identifier = "LRO_LOLA_ClrSlope_Global_16ppd",
   Name = [[LOLA Slope 16ppd, Colorized]],
-  FilePath = asset.localResource("LOLA_Slope_16ppd/Colorized.vrt"),
+  FilePath = asset.resource("LOLA_Slope_16ppd/Colorized.vrt"),
   Description = [[]]
 }
 
diff --git a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LOLA_Slope_Northpole_120m.asset b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LOLA_Slope_Northpole_120m.asset
index 5404d41424..19dd265fbf 100644
--- a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LOLA_Slope_Northpole_120m.asset
+++ b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LOLA_Slope_Northpole_120m.asset
@@ -9,7 +9,7 @@ local globeIdentifier = asset.require("scene/solarsystem//planets/earth/moon/moo
 local treks_LRO_LOLA_ClrSlope_NPole75N_120m_EQ = {
   Identifier = "LRO_LOLA_ClrSlope_NPole75N_120m_EQ",
   Name = [[LOLA Slope Northpole 120m, Colorized]],
-  FilePath = asset.localResource("LOLA_Slope_Northpole_120m/Colorized.vrt"),
+  FilePath = asset.resource("LOLA_Slope_Northpole_120m/Colorized.vrt"),
   Description = [[This is a colorized map of the original north polar surface slope of the Moon at a resolution of 16 m/pix by 16 m/pix, based on altimetry data acquired by the LOLA instrument. The LOLA Laser 1 and 2 data through mission phase LRO_SM_17 are the source for this data set. The bi-directional slope was calculated from a plane fit to three successive laser shots requiring n=5 to 15 profile returns. Depending on orbital velocity, probability of detection, and spacecraft altitude, the slope baseline may vary from 30 to 120 meters.]]
 }
 
diff --git a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LOLA_Slope_Southpole_120m.asset b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LOLA_Slope_Southpole_120m.asset
index 1087cf1b52..933ee335d4 100644
--- a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LOLA_Slope_Southpole_120m.asset
+++ b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LOLA_Slope_Southpole_120m.asset
@@ -9,7 +9,7 @@ local globeIdentifier = asset.require("scene/solarsystem//planets/earth/moon/moo
 local treks_LRO_LOLA_ClrSlope_SPole75S_120m_EQ = {
   Identifier = "LRO_LOLA_ClrSlope_SPole75S_120m_EQ",
   Name = [[LOLA Slope Southpole 120m, Colorized]],
-  FilePath = asset.localResource("LOLA_Slope_Southpole_120m/Colorized.vrt"),
+  FilePath = asset.resource("LOLA_Slope_Southpole_120m/Colorized.vrt"),
   Description = [[This is a colorized map of the original south polar surface slope of the Moon at a resolution of 16 m/pix by 16 m/pix, based on altimetry data acquired by the LOLA instrument. The LOLA Laser 1 and 2 data through mission phase LRO_SM_17 are the source for this data set. The bi-directional slope was calculated from a plane fit to three successive laser shots requiring n=5 to 15 profile returns. Depending on orbital velocity, probability of detection, and spacecraft altitude, the slope baseline may vary from 30 to 120 meters.]]
 }
 
diff --git a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LOLA_and_TC_Stereo_DEM_Merge_512ppd.asset b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LOLA_and_TC_Stereo_DEM_Merge_512ppd.asset
index fea4021887..793771bf60 100644
--- a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LOLA_and_TC_Stereo_DEM_Merge_512ppd.asset
+++ b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LOLA_and_TC_Stereo_DEM_Merge_512ppd.asset
@@ -9,7 +9,7 @@ local globeIdentifier = asset.require("scene/solarsystem//planets/earth/moon/moo
 local treks_LRO_LrocKaguya_Shade_60N60S_512ppd = {
   Identifier = "LRO_LrocKaguya_Shade_60N60S_512ppd",
   Name = [[LOLA and TC Stereo DEM Merge 512ppd, Shade]],
-  FilePath = asset.localResource("LOLA_and_TC_Stereo_DEM_Merge_512ppd/Shade.vrt"),
+  FilePath = asset.resource("LOLA_and_TC_Stereo_DEM_Merge_512ppd/Shade.vrt"),
   Description = [[]]
 }
 
diff --git a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LROC_NAC_Uncontrolled_Mosaic_of_Region_Inside_Schrodinger_Crater.asset b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LROC_NAC_Uncontrolled_Mosaic_of_Region_Inside_Schrodinger_Crater.asset
index 9d6a545c91..e4f335c548 100644
--- a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LROC_NAC_Uncontrolled_Mosaic_of_Region_Inside_Schrodinger_Crater.asset
+++ b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LROC_NAC_Uncontrolled_Mosaic_of_Region_Inside_Schrodinger_Crater.asset
@@ -9,7 +9,7 @@ local globeIdentifier = asset.require("scene/solarsystem//planets/earth/moon/moo
 local treks_SchrodingerMareNortheq = {
   Identifier = "SchrodingerMareNortheq",
   Name = [[LROC NAC Uncontrolled Mosaic of Region Inside Schrodinger Crater, 50cm/px]],
-  FilePath = asset.localResource("LROC_NAC_Uncontrolled_Mosaic_of_Region_Inside_Schrodinger_Crater/50cmpx.vrt"),
+  FilePath = asset.resource("LROC_NAC_Uncontrolled_Mosaic_of_Region_Inside_Schrodinger_Crater/50cmpx.vrt"),
   Description = [[This is a 50cm/px uncontrolled visible image mosaic generated using Lunar Reconnaissance Orbiter Camera (LROC) Narrow Angle Camera (NAC) images from the Lunar Reconnaissance Orbiter mission. Each NAC image was registered horizontally to the LRO's Lunar Orbiter Laser Altimeter (LOLA) global DEM, and then mosaicked together and color balanced.]]
 }
 
diff --git a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LROC_NAC_Uncontrolled_Mosaic_of_Schrodinger_Crater.asset b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LROC_NAC_Uncontrolled_Mosaic_of_Schrodinger_Crater.asset
index 8dff440d2c..bb150794f5 100644
--- a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LROC_NAC_Uncontrolled_Mosaic_of_Schrodinger_Crater.asset
+++ b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LROC_NAC_Uncontrolled_Mosaic_of_Schrodinger_Crater.asset
@@ -9,7 +9,7 @@ local globeIdentifier = asset.require("scene/solarsystem//planets/earth/moon/moo
 local treks_allSchrodinger_10mV10eq = {
   Identifier = "allSchrodinger_10mV10eq",
   Name = [[LROC NAC Uncontrolled Mosaic of Schrodinger Crater, 10m/px]],
-  FilePath = asset.localResource("LROC_NAC_Uncontrolled_Mosaic_of_Schrodinger_Crater/10mpx.vrt"),
+  FilePath = asset.resource("LROC_NAC_Uncontrolled_Mosaic_of_Schrodinger_Crater/10mpx.vrt"),
   Description = [[This is a 10m/px uncontrolled visible image mosaic generated using Lunar Reconnaissance Orbiter Camera (LROC) Narrow Angle Camera (NAC) images from the Lunar Reconnaissance Orbiter mission. Each NAC image was registered horizontally to the LRO's Lunar Orbiter Laser Altimeter (LOLA) global DEM, and then mosaicked together and color balanced.]]
 }
 
diff --git a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_Diviner_CF_Mosaic.asset b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_Diviner_CF_Mosaic.asset
index 0a622dadbd..faeab9f096 100644
--- a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_Diviner_CF_Mosaic.asset
+++ b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_Diviner_CF_Mosaic.asset
@@ -9,7 +9,7 @@ local globeIdentifier = asset.require("scene/solarsystem//planets/earth/moon/moo
 local treks_LRO_Diviner_CF_Filled_Global_8ppd = {
   Identifier = "LRO_Diviner_CF_Filled_Global_8ppd",
   Name = [[LRO Diviner CF Mosaic, Filled]],
-  FilePath = asset.localResource("LRO_Diviner_CF_Mosaic/Filled.vrt"),
+  FilePath = asset.resource("LRO_Diviner_CF_Mosaic/Filled.vrt"),
   Description = [[]]
 }
 
diff --git a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_Diviner_CF_Mosaic_128ppd.asset b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_Diviner_CF_Mosaic_128ppd.asset
index 303f210ab2..862059b9ab 100644
--- a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_Diviner_CF_Mosaic_128ppd.asset
+++ b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_Diviner_CF_Mosaic_128ppd.asset
@@ -9,7 +9,7 @@ local globeIdentifier = asset.require("scene/solarsystem//planets/earth/moon/moo
 local treks_LRO_DIVINER_ClrCF_Global_128ppd = {
   Identifier = "LRO_DIVINER_ClrCF_Global_128ppd",
   Name = [[LRO Diviner CF Mosaic 128ppd, Colorized]],
-  FilePath = asset.localResource("LRO_Diviner_CF_Mosaic_128ppd/Colorized.vrt"),
+  FilePath = asset.resource("LRO_Diviner_CF_Mosaic_128ppd/Colorized.vrt"),
   Description = [[]]
 }
 
diff --git a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_Diviner_Surface_Temp_Avg.asset b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_Diviner_Surface_Temp_Avg.asset
index 9d9c1c917d..3da55102bb 100644
--- a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_Diviner_Surface_Temp_Avg.asset
+++ b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_Diviner_Surface_Temp_Avg.asset
@@ -9,7 +9,7 @@ local globeIdentifier = asset.require("scene/solarsystem//planets/earth/moon/moo
 local treks_LRO_Diviner_ST_Avg_Clr_Global_32ppd = {
   Identifier = "LRO_Diviner_ST_Avg_Clr_Global_32ppd",
   Name = [[LRO Diviner Surface Temp Avg, Color]],
-  FilePath = asset.localResource("LRO_Diviner_Surface_Temp_Avg/Color.vrt"),
+  FilePath = asset.resource("LRO_Diviner_Surface_Temp_Avg/Color.vrt"),
   Description = [[]]
 }
 
diff --git a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_Diviner_Surface_Temp_Normal_Avg.asset b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_Diviner_Surface_Temp_Normal_Avg.asset
index 65a8a1fc58..0533a6b9b9 100644
--- a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_Diviner_Surface_Temp_Normal_Avg.asset
+++ b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_Diviner_Surface_Temp_Normal_Avg.asset
@@ -9,7 +9,7 @@ local globeIdentifier = asset.require("scene/solarsystem//planets/earth/moon/moo
 local treks_LRO_Diviner_STN_Avg_Clr_Global_32ppd = {
   Identifier = "LRO_Diviner_STN_Avg_Clr_Global_32ppd",
   Name = [[LRO Diviner Surface Temp Normal Avg, Color]],
-  FilePath = asset.localResource("LRO_Diviner_Surface_Temp_Normal_Avg/Color.vrt"),
+  FilePath = asset.resource("LRO_Diviner_Surface_Temp_Normal_Avg/Color.vrt"),
   Description = [[]]
 }
 
diff --git a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_Diviner_Surface_Temperature_Mosaic_128ppd.asset b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_Diviner_Surface_Temperature_Mosaic_128ppd.asset
index fe69bd1bb0..67955e8b5d 100644
--- a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_Diviner_Surface_Temperature_Mosaic_128ppd.asset
+++ b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_Diviner_Surface_Temperature_Mosaic_128ppd.asset
@@ -9,7 +9,7 @@ local globeIdentifier = asset.require("scene/solarsystem//planets/earth/moon/moo
 local treks_LRO_DIVINER_ClrRockFreeSurfaceTemp_Global_128ppd = {
   Identifier = "LRO_DIVINER_ClrRockFreeSurfaceTemp_Global_128ppd",
   Name = [[LRO Diviner Surface Temperature Mosaic 128ppd, Colorized]],
-  FilePath = asset.localResource("LRO_Diviner_Surface_Temperature_Mosaic_128ppd/Colorized.vrt"),
+  FilePath = asset.resource("LRO_Diviner_Surface_Temperature_Mosaic_128ppd/Colorized.vrt"),
   Description = [[]]
 }
 
diff --git a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LOLA_DEM.asset b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LOLA_DEM.asset
index b55b87c24c..6ed71a2476 100644
--- a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LOLA_DEM.asset
+++ b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LOLA_DEM.asset
@@ -9,49 +9,49 @@ local globeIdentifier = asset.require("scene/solarsystem//planets/earth/moon/moo
 local treks_LRO_LOLA_ClrShade_Global_128ppd_v04 = {
   Identifier = "LRO_LOLA_ClrShade_Global_128ppd_v04",
   Name = [[LRO LOLA DEM, ColorHillshade]],
-  FilePath = asset.localResource("LRO_LOLA_DEM/ColorHillshade.vrt"),
+  FilePath = asset.resource("LRO_LOLA_DEM/ColorHillshade.vrt"),
   Description = [[]]
 }
 
 local treks_LRO_LOLA_ClrShade_Global_256ppd_v06 = {
   Identifier = "LRO_LOLA_ClrShade_Global_256ppd_v06",
   Name = [[LRO LOLA DEM, ColorHillshade v6]],
-  FilePath = asset.localResource("LRO_LOLA_DEM/ColorHillshade_v6.vrt"),
+  FilePath = asset.resource("LRO_LOLA_DEM/ColorHillshade_v6.vrt"),
   Description = [[]]
 }
 
 local treks_LRO_LOLA_Coverage_Global_128ppd_v04 = {
   Identifier = "LRO_LOLA_Coverage_Global_128ppd_v04",
   Name = [[LRO LOLA DEM, Coverage]],
-  FilePath = asset.localResource("LRO_LOLA_DEM/Coverage.vrt"),
+  FilePath = asset.resource("LRO_LOLA_DEM/Coverage.vrt"),
   Description = [[]]
 }
 
 local treks_LRO_LOLA_Shade_Global_256ppd_v06 = {
   Identifier = "LRO_LOLA_Shade_Global_256ppd_v06",
   Name = [[LRO LOLA DEM, Hillshade]],
-  FilePath = asset.localResource("LRO_LOLA_DEM/Hillshade.vrt"),
+  FilePath = asset.resource("LRO_LOLA_DEM/Hillshade.vrt"),
   Description = [[]]
 }
 
 local treks_LRO_LOLA_NoDataMask_Global_128ppd_v04 = {
   Identifier = "LRO_LOLA_NoDataMask_Global_128ppd_v04",
   Name = [[LRO LOLA DEM, No Data Mask]],
-  FilePath = asset.localResource("LRO_LOLA_DEM/No_Data_Mask.vrt"),
+  FilePath = asset.resource("LRO_LOLA_DEM/No_Data_Mask.vrt"),
   Description = [[]]
 }
 
 local treks_LRO_LOLA_ClrShade_NPole875_5mp_v04_EQ = {
   Identifier = "LRO_LOLA_ClrShade_NPole875_5mp_v04_EQ",
   Name = [[LRO LOLA DEM, N Pole, 87.5 deg, ColorHillshade]],
-  FilePath = asset.localResource("LRO_LOLA_DEM/N_Pole.vrt"),
+  FilePath = asset.resource("LRO_LOLA_DEM/N_Pole.vrt"),
   Description = [[This is version 4 of the LRO LOLA North Pole 87.5 deg DEM, ColorHillshade. This is a colorized shaded-relief of a original polar LOLA Digital Elevation Model (DEM). The DEM is a shape map (radius) of the Moon at a resolution 100 meters per pixel, based on altimetry data acquired through Spetember 2011 by the LOLA instrument. The ground tracks were interpolated using the Generic Mapping Tools programs "surface" and "grdblend". Map values are referred to a radius of 1737400 m.]]
 }
 
 local treks_LRO_LOLA_ClrShade_SPole875_5mp_v04_EQ = {
   Identifier = "LRO_LOLA_ClrShade_SPole875_5mp_v04_EQ",
   Name = [[LRO LOLA DEM, S Pole, 87.5 deg, ColorHillshade]],
-  FilePath = asset.localResource("LRO_LOLA_DEM/S_Pole.vrt"),
+  FilePath = asset.resource("LRO_LOLA_DEM/S_Pole.vrt"),
   Description = [[This is version 4 of the LRO LOLA South Pole 87.5 deg DEM, ColorHillshade. This is a colorized shaded-relief of a original polar LOLA Digital Elevation Model (DEM). The DEM is a shape map (radius) of the Moon at a resolution 100 meters per pixel, based on altimetry data acquired through Spetember 2011 by the LOLA instrument. The ground tracks were interpolated using the Generic Mapping Tools programs "surface" and "grdblend". Map values are referred to a radius of 1737400 m.]]
 }
 
diff --git a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Crater_Abundance.asset b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Crater_Abundance.asset
index 162ed62c7f..306ef4a4a7 100644
--- a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Crater_Abundance.asset
+++ b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Crater_Abundance.asset
@@ -9,161 +9,161 @@ local globeIdentifier = asset.require("scene/solarsystem//planets/earth/moon/moo
 local treks_LRO_NAC_CratAbnd_17S173E_150cmp = {
   Identifier = "LRO_NAC_CratAbnd_17S173E_150cmp",
   Name = [[LRO LROC Crater Abundance, Aitken Crater]],
-  FilePath = asset.localResource("LRO_LROC_Crater_Abundance/Aitken_Crater.vrt"),
+  FilePath = asset.resource("LRO_LROC_Crater_Abundance/Aitken_Crater.vrt"),
   Description = [[]]
 }
 
 local treks_LRO_NAC_CratAbnd_13S358E_2mp = {
   Identifier = "LRO_NAC_CratAbnd_13S358E_2mp",
   Name = [[LRO LROC Crater Abundance, Alphonsus Crater]],
-  FilePath = asset.localResource("LRO_LROC_Crater_Abundance/Alphonsus_Crater.vrt"),
+  FilePath = asset.resource("LRO_LROC_Crater_Abundance/Alphonsus_Crater.vrt"),
   Description = [[]]
 }
 
 local treks_LRO_NAC_CratAbnd_73N350E_150cmp = {
   Identifier = "LRO_NAC_CratAbnd_73N350E_150cmp",
   Name = [[LRO LROC Crater Abundance, Anaxagoras Crater]],
-  FilePath = asset.localResource("LRO_LROC_Crater_Abundance/Anaxagoras_Crater.vrt"),
+  FilePath = asset.resource("LRO_LROC_Crater_Abundance/Anaxagoras_Crater.vrt"),
   Description = [[]]
 }
 
 local treks_LRO_NAC_CratAbnd_26N004E_150cmp = {
   Identifier = "LRO_NAC_CratAbnd_26N004E_150cmp",
   Name = [[LRO LROC Crater Abundance, Apollo 15]],
-  FilePath = asset.localResource("LRO_LROC_Crater_Abundance/Apollo_15.vrt"),
+  FilePath = asset.resource("LRO_LROC_Crater_Abundance/Apollo_15.vrt"),
   Description = [[]]
 }
 
 local treks_LRO_NAC_CratAbnd_09S015E_150cmp = {
   Identifier = "LRO_NAC_CratAbnd_09S015E_150cmp",
   Name = [[LRO LROC Crater Abundance, Apollo 16]],
-  FilePath = asset.localResource("LRO_LROC_Crater_Abundance/Apollo_16.vrt"),
+  FilePath = asset.resource("LRO_LROC_Crater_Abundance/Apollo_16.vrt"),
   Description = [[]]
 }
 
 local treks_LRO_NAC_CratAbnd_37S206E_150cmp = {
   Identifier = "LRO_NAC_CratAbnd_37S206E_150cmp",
   Name = [[LRO LROC Crater Abundance, Apollo Basin]],
-  FilePath = asset.localResource("LRO_LROC_Crater_Abundance/Apollo_Basin.vrt"),
+  FilePath = asset.resource("LRO_LROC_Crater_Abundance/Apollo_Basin.vrt"),
   Description = [[]]
 }
 
 local treks_LRO_NAC_CratAbnd_25N311E_2mp = {
   Identifier = "LRO_NAC_CratAbnd_25N311E_2mp",
   Name = [[LRO LROC Crater Abundance, Aristarchus 1]],
-  FilePath = asset.localResource("LRO_LROC_Crater_Abundance/Aristarchus_1.vrt"),
+  FilePath = asset.resource("LRO_LROC_Crater_Abundance/Aristarchus_1.vrt"),
   Description = [[]]
 }
 
 local treks_LRO_NAC_CratAbnd_28N307E_150cmp = {
   Identifier = "LRO_NAC_CratAbnd_28N307E_150cmp",
   Name = [[LRO LROC Crater Abundance, Aristarchus 2]],
-  FilePath = asset.localResource("LRO_LROC_Crater_Abundance/Aristarchus_2.vrt"),
+  FilePath = asset.resource("LRO_LROC_Crater_Abundance/Aristarchus_2.vrt"),
   Description = [[]]
 }
 
 local treks_LRO_NAC_CratAbnd_19S070E_150cmp = {
   Identifier = "LRO_NAC_CratAbnd_19S070E_150cmp",
   Name = [[LRO LROC Crater Abundance, Balmer Basin]],
-  FilePath = asset.localResource("LRO_LROC_Crater_Abundance/Balmer_Basin.vrt"),
+  FilePath = asset.resource("LRO_LROC_Crater_Abundance/Balmer_Basin.vrt"),
   Description = [[]]
 }
 
 local treks_LRO_NAC_CratAbnd_20S337E_400cmp = {
   Identifier = "LRO_NAC_CratAbnd_20S337E_400cmp",
   Name = [[LRO LROC Crater Abundance, Bullialdus Crater]],
-  FilePath = asset.localResource("LRO_LROC_Crater_Abundance/Bullialdus_Crater.vrt"),
+  FilePath = asset.resource("LRO_LROC_Crater_Abundance/Bullialdus_Crater.vrt"),
   Description = [[]]
 }
 
 local treks_LRO_NAC_CratAbnd_36N320E_2mp = {
   Identifier = "LRO_NAC_CratAbnd_36N320E_2mp",
   Name = [[LRO LROC Crater Abundance, Gruithuisen Domes]],
-  FilePath = asset.localResource("LRO_LROC_Crater_Abundance/Gruithuisen_Domes.vrt"),
+  FilePath = asset.resource("LRO_LROC_Crater_Abundance/Gruithuisen_Domes.vrt"),
   Description = [[]]
 }
 
 local treks_LRO_NAC_CratAbnd_00N234E_150cmp = {
   Identifier = "LRO_NAC_CratAbnd_00N234E_150cmp",
   Name = [[LRO LROC Crater Abundance, Hertzsprung]],
-  FilePath = asset.localResource("LRO_LROC_Crater_Abundance/Hertzsprung.vrt"),
+  FilePath = asset.resource("LRO_LROC_Crater_Abundance/Hertzsprung.vrt"),
   Description = [[]]
 }
 
 local treks_LRO_NAC_CratAbnd_08N332E_2mp = {
   Identifier = "LRO_NAC_CratAbnd_08N332E_2mp",
   Name = [[LRO LROC Crater Abundance, Hortensius Domes]],
-  FilePath = asset.localResource("LRO_LROC_Crater_Abundance/Hortensius_Domes.vrt"),
+  FilePath = asset.resource("LRO_LROC_Crater_Abundance/Hortensius_Domes.vrt"),
   Description = [[]]
 }
 
 local treks_LRO_NAC_CratAbnd_06N120E_200cmp = {
   Identifier = "LRO_NAC_CratAbnd_06N120E_200cmp",
   Name = [[LRO LROC Crater Abundance, King Crater]],
-  FilePath = asset.localResource("LRO_LROC_Crater_Abundance/King_Crater.vrt"),
+  FilePath = asset.resource("LRO_LROC_Crater_Abundance/King_Crater.vrt"),
   Description = [[]]
 }
 
 local treks_LRO_NAC_CratAbnd_32N292E_2mp = {
   Identifier = "LRO_NAC_CratAbnd_32N292E_2mp",
   Name = [[LRO LROC Crater Abundance, Lichtenberg Crater]],
-  FilePath = asset.localResource("LRO_LROC_Crater_Abundance/Lichtenberg_Crater.vrt"),
+  FilePath = asset.resource("LRO_LROC_Crater_Abundance/Lichtenberg_Crater.vrt"),
   Description = [[]]
 }
 
 local treks_LRO_NAC_CratAbnd_10N058E_150cmp = {
   Identifier = "LRO_NAC_CratAbnd_10N058E_150cmp",
   Name = [[LRO LROC Crater Abundance, Mare Crisium]],
-  FilePath = asset.localResource("LRO_LROC_Crater_Abundance/Mare_Crisium.vrt"),
+  FilePath = asset.resource("LRO_LROC_Crater_Abundance/Mare_Crisium.vrt"),
   Description = [[]]
 }
 
 local treks_LRO_NAC_CratAbnd_16S041E_150cmp = {
   Identifier = "LRO_NAC_CratAbnd_16S041E_150cmp",
   Name = [[LRO LROC Crater Abundance, Montes Pyrenaeus]],
-  FilePath = asset.localResource("LRO_LROC_Crater_Abundance/Montes_Pyrenaeus.vrt"),
+  FilePath = asset.resource("LRO_LROC_Crater_Abundance/Montes_Pyrenaeus.vrt"),
   Description = [[]]
 }
 
 local treks_LRO_NAC_CratAbnd_26S265E_200cmp = {
   Identifier = "LRO_NAC_CratAbnd_26S265E_200cmp",
   Name = [[LRO LROC Crater Abundance, Orientale 1]],
-  FilePath = asset.localResource("LRO_LROC_Crater_Abundance/Orientale_1.vrt"),
+  FilePath = asset.resource("LRO_LROC_Crater_Abundance/Orientale_1.vrt"),
   Description = [[]]
 }
 
 local treks_LRO_NAC_CratAbnd_53N354E_150cmp = {
   Identifier = "LRO_NAC_CratAbnd_53N354E_150cmp",
   Name = [[LRO LROC Crater Abundance, Plato Ejecta]],
-  FilePath = asset.localResource("LRO_LROC_Crater_Abundance/Plato_Ejecta.vrt"),
+  FilePath = asset.resource("LRO_LROC_Crater_Abundance/Plato_Ejecta.vrt"),
   Description = [[]]
 }
 
 local treks_LRO_NAC_CratAbnd_60S200E_150cmp = {
   Identifier = "LRO_NAC_CratAbnd_60S200E_150cmp",
   Name = [[LRO LROC Crater Abundance, South Pole-Aitken Basin Interior]],
-  FilePath = asset.localResource("LRO_LROC_Crater_Abundance/South_Pole-Aitken_Basin_Interior.vrt"),
+  FilePath = asset.resource("LRO_LROC_Crater_Abundance/South_Pole-Aitken_Basin_Interior.vrt"),
   Description = [[]]
 }
 
 local treks_LRO_NAC_CratAbnd_02S167E_150cmp = {
   Identifier = "LRO_NAC_CratAbnd_02S167E_150cmp",
   Name = [[LRO LROC Crater Abundance, Stratton (Dewar) High Fe Anomaly]],
-  FilePath = asset.localResource("LRO_LROC_Crater_Abundance/Stratton_Dewar_High_Fe_Anomaly.vrt"),
+  FilePath = asset.resource("LRO_LROC_Crater_Abundance/Stratton_Dewar_High_Fe_Anomaly.vrt"),
   Description = [[]]
 }
 
 local treks_LRO_NAC_CratAbnd_20N010E_2mp = {
   Identifier = "LRO_NAC_CratAbnd_20N010E_2mp",
   Name = [[LRO LROC Crater Abundance, Sulpicius Gallus]],
-  FilePath = asset.localResource("LRO_LROC_Crater_Abundance/Sulpicius_Gallus.vrt"),
+  FilePath = asset.resource("LRO_LROC_Crater_Abundance/Sulpicius_Gallus.vrt"),
   Description = [[]]
 }
 
 local treks_LRO_NAC_CratAbnd_43S349E_150cmp = {
   Identifier = "LRO_NAC_CratAbnd_43S349E_150cmp",
   Name = [[LRO LROC Crater Abundance, Tycho Crater]],
-  FilePath = asset.localResource("LRO_LROC_Crater_Abundance/Tycho_Crater.vrt"),
+  FilePath = asset.resource("LRO_LROC_Crater_Abundance/Tycho_Crater.vrt"),
   Description = [[]]
 }
 
diff --git a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Crater_Abundance_Hazard.asset b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Crater_Abundance_Hazard.asset
index 5e7ada8659..6d409b350c 100644
--- a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Crater_Abundance_Hazard.asset
+++ b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Crater_Abundance_Hazard.asset
@@ -9,161 +9,161 @@ local globeIdentifier = asset.require("scene/solarsystem//planets/earth/moon/moo
 local treks_LRO_NAC_CratAbndHaz_17S173E_150cmp = {
   Identifier = "LRO_NAC_CratAbndHaz_17S173E_150cmp",
   Name = [[LRO LROC Crater Abundance Hazard, Aitken Crater]],
-  FilePath = asset.localResource("LRO_LROC_Crater_Abundance_Hazard/Aitken_Crater.vrt"),
+  FilePath = asset.resource("LRO_LROC_Crater_Abundance_Hazard/Aitken_Crater.vrt"),
   Description = [[]]
 }
 
 local treks_LRO_NAC_CratAbndHaz_13S358E_2mp = {
   Identifier = "LRO_NAC_CratAbndHaz_13S358E_2mp",
   Name = [[LRO LROC Crater Abundance Hazard, Alphonsus Crater]],
-  FilePath = asset.localResource("LRO_LROC_Crater_Abundance_Hazard/Alphonsus_Crater.vrt"),
+  FilePath = asset.resource("LRO_LROC_Crater_Abundance_Hazard/Alphonsus_Crater.vrt"),
   Description = [[]]
 }
 
 local treks_LRO_NAC_CratAbndHaz_73N350E_150cmp = {
   Identifier = "LRO_NAC_CratAbndHaz_73N350E_150cmp",
   Name = [[LRO LROC Crater Abundance Hazard, Anaxagoras Crater]],
-  FilePath = asset.localResource("LRO_LROC_Crater_Abundance_Hazard/Anaxagoras_Crater.vrt"),
+  FilePath = asset.resource("LRO_LROC_Crater_Abundance_Hazard/Anaxagoras_Crater.vrt"),
   Description = [[]]
 }
 
 local treks_LRO_NAC_CratAbndHaz_26N004E_150cmp = {
   Identifier = "LRO_NAC_CratAbndHaz_26N004E_150cmp",
   Name = [[LRO LROC Crater Abundance Hazard, Apollo 15]],
-  FilePath = asset.localResource("LRO_LROC_Crater_Abundance_Hazard/Apollo_15.vrt"),
+  FilePath = asset.resource("LRO_LROC_Crater_Abundance_Hazard/Apollo_15.vrt"),
   Description = [[]]
 }
 
 local treks_LRO_NAC_CratAbndHaz_09S015E_150cmp = {
   Identifier = "LRO_NAC_CratAbndHaz_09S015E_150cmp",
   Name = [[LRO LROC Crater Abundance Hazard, Apollo 16]],
-  FilePath = asset.localResource("LRO_LROC_Crater_Abundance_Hazard/Apollo_16.vrt"),
+  FilePath = asset.resource("LRO_LROC_Crater_Abundance_Hazard/Apollo_16.vrt"),
   Description = [[]]
 }
 
 local treks_LRO_NAC_CratAbndHaz_37S206E_150cmp = {
   Identifier = "LRO_NAC_CratAbndHaz_37S206E_150cmp",
   Name = [[LRO LROC Crater Abundance Hazard, Apollo Basin]],
-  FilePath = asset.localResource("LRO_LROC_Crater_Abundance_Hazard/Apollo_Basin.vrt"),
+  FilePath = asset.resource("LRO_LROC_Crater_Abundance_Hazard/Apollo_Basin.vrt"),
   Description = [[]]
 }
 
 local treks_LRO_NAC_CratAbndHaz_25N311E_2mp = {
   Identifier = "LRO_NAC_CratAbndHaz_25N311E_2mp",
   Name = [[LRO LROC Crater Abundance Hazard, Aristarchus 1]],
-  FilePath = asset.localResource("LRO_LROC_Crater_Abundance_Hazard/Aristarchus_1.vrt"),
+  FilePath = asset.resource("LRO_LROC_Crater_Abundance_Hazard/Aristarchus_1.vrt"),
   Description = [[]]
 }
 
 local treks_LRO_NAC_CratAbndHaz_28N307E_150cmp = {
   Identifier = "LRO_NAC_CratAbndHaz_28N307E_150cmp",
   Name = [[LRO LROC Crater Abundance Hazard, Aristarchus 2]],
-  FilePath = asset.localResource("LRO_LROC_Crater_Abundance_Hazard/Aristarchus_2.vrt"),
+  FilePath = asset.resource("LRO_LROC_Crater_Abundance_Hazard/Aristarchus_2.vrt"),
   Description = [[]]
 }
 
 local treks_LRO_NAC_CratAbndHaz_19S070E_150cmp = {
   Identifier = "LRO_NAC_CratAbndHaz_19S070E_150cmp",
   Name = [[LRO LROC Crater Abundance Hazard, Balmer Basin]],
-  FilePath = asset.localResource("LRO_LROC_Crater_Abundance_Hazard/Balmer_Basin.vrt"),
+  FilePath = asset.resource("LRO_LROC_Crater_Abundance_Hazard/Balmer_Basin.vrt"),
   Description = [[]]
 }
 
 local treks_LRO_NAC_CratAbndHaz_20S337E_400cmp = {
   Identifier = "LRO_NAC_CratAbndHaz_20S337E_400cmp",
   Name = [[LRO LROC Crater Abundance Hazard, Bullialdus Crater]],
-  FilePath = asset.localResource("LRO_LROC_Crater_Abundance_Hazard/Bullialdus_Crater.vrt"),
+  FilePath = asset.resource("LRO_LROC_Crater_Abundance_Hazard/Bullialdus_Crater.vrt"),
   Description = [[]]
 }
 
 local treks_LRO_NAC_CratAbndHaz_36N320E_2mp = {
   Identifier = "LRO_NAC_CratAbndHaz_36N320E_2mp",
   Name = [[LRO LROC Crater Abundance Hazard, Gruithuisen Domes]],
-  FilePath = asset.localResource("LRO_LROC_Crater_Abundance_Hazard/Gruithuisen_Domes.vrt"),
+  FilePath = asset.resource("LRO_LROC_Crater_Abundance_Hazard/Gruithuisen_Domes.vrt"),
   Description = [[]]
 }
 
 local treks_LRO_NAC_CratAbndHaz_00N234E_150cmp = {
   Identifier = "LRO_NAC_CratAbndHaz_00N234E_150cmp",
   Name = [[LRO LROC Crater Abundance Hazard, Hertzsprung]],
-  FilePath = asset.localResource("LRO_LROC_Crater_Abundance_Hazard/Hertzsprung.vrt"),
+  FilePath = asset.resource("LRO_LROC_Crater_Abundance_Hazard/Hertzsprung.vrt"),
   Description = [[]]
 }
 
 local treks_LRO_NAC_CratAbndHaz_08N332E_2mp = {
   Identifier = "LRO_NAC_CratAbndHaz_08N332E_2mp",
   Name = [[LRO LROC Crater Abundance Hazard, Hortensius Domes]],
-  FilePath = asset.localResource("LRO_LROC_Crater_Abundance_Hazard/Hortensius_Domes.vrt"),
+  FilePath = asset.resource("LRO_LROC_Crater_Abundance_Hazard/Hortensius_Domes.vrt"),
   Description = [[]]
 }
 
 local treks_LRO_NAC_CratAbndHaz_06N120E_200cmp = {
   Identifier = "LRO_NAC_CratAbndHaz_06N120E_200cmp",
   Name = [[LRO LROC Crater Abundance Hazard, King Crater]],
-  FilePath = asset.localResource("LRO_LROC_Crater_Abundance_Hazard/King_Crater.vrt"),
+  FilePath = asset.resource("LRO_LROC_Crater_Abundance_Hazard/King_Crater.vrt"),
   Description = [[]]
 }
 
 local treks_LRO_NAC_CratAbndHaz_32N292E_2mp = {
   Identifier = "LRO_NAC_CratAbndHaz_32N292E_2mp",
   Name = [[LRO LROC Crater Abundance Hazard, Lichtenberg Crater]],
-  FilePath = asset.localResource("LRO_LROC_Crater_Abundance_Hazard/Lichtenberg_Crater.vrt"),
+  FilePath = asset.resource("LRO_LROC_Crater_Abundance_Hazard/Lichtenberg_Crater.vrt"),
   Description = [[]]
 }
 
 local treks_LRO_NAC_CratAbndHaz_10N058E_150cmp = {
   Identifier = "LRO_NAC_CratAbndHaz_10N058E_150cmp",
   Name = [[LRO LROC Crater Abundance Hazard, Mare Crisium]],
-  FilePath = asset.localResource("LRO_LROC_Crater_Abundance_Hazard/Mare_Crisium.vrt"),
+  FilePath = asset.resource("LRO_LROC_Crater_Abundance_Hazard/Mare_Crisium.vrt"),
   Description = [[]]
 }
 
 local treks_LRO_NAC_CratAbndHaz_16S041E_150cmp = {
   Identifier = "LRO_NAC_CratAbndHaz_16S041E_150cmp",
   Name = [[LRO LROC Crater Abundance Hazard, Montes Pyrenaeus]],
-  FilePath = asset.localResource("LRO_LROC_Crater_Abundance_Hazard/Montes_Pyrenaeus.vrt"),
+  FilePath = asset.resource("LRO_LROC_Crater_Abundance_Hazard/Montes_Pyrenaeus.vrt"),
   Description = [[]]
 }
 
 local treks_LRO_NAC_CratAbndHaz_26S265E_200cmp = {
   Identifier = "LRO_NAC_CratAbndHaz_26S265E_200cmp",
   Name = [[LRO LROC Crater Abundance Hazard, Orientale 1]],
-  FilePath = asset.localResource("LRO_LROC_Crater_Abundance_Hazard/Orientale_1.vrt"),
+  FilePath = asset.resource("LRO_LROC_Crater_Abundance_Hazard/Orientale_1.vrt"),
   Description = [[]]
 }
 
 local treks_LRO_NAC_CratAbndHaz_53N354E_150cmp = {
   Identifier = "LRO_NAC_CratAbndHaz_53N354E_150cmp",
   Name = [[LRO LROC Crater Abundance Hazard, Plato Ejecta]],
-  FilePath = asset.localResource("LRO_LROC_Crater_Abundance_Hazard/Plato_Ejecta.vrt"),
+  FilePath = asset.resource("LRO_LROC_Crater_Abundance_Hazard/Plato_Ejecta.vrt"),
   Description = [[]]
 }
 
 local treks_LRO_NAC_CratAbndHaz_60S200E_150cmp = {
   Identifier = "LRO_NAC_CratAbndHaz_60S200E_150cmp",
   Name = [[LRO LROC Crater Abundance Hazard, South Pole-Aitken Basin Interior]],
-  FilePath = asset.localResource("LRO_LROC_Crater_Abundance_Hazard/South_Pole-Aitken_Basin_Interior.vrt"),
+  FilePath = asset.resource("LRO_LROC_Crater_Abundance_Hazard/South_Pole-Aitken_Basin_Interior.vrt"),
   Description = [[]]
 }
 
 local treks_LRO_NAC_CratAbndHaz_02S167E_150cmp = {
   Identifier = "LRO_NAC_CratAbndHaz_02S167E_150cmp",
   Name = [[LRO LROC Crater Abundance Hazard, Stratton (Dewar) High Fe Anomaly]],
-  FilePath = asset.localResource("LRO_LROC_Crater_Abundance_Hazard/Stratton_Dewar_High_Fe_Anomaly.vrt"),
+  FilePath = asset.resource("LRO_LROC_Crater_Abundance_Hazard/Stratton_Dewar_High_Fe_Anomaly.vrt"),
   Description = [[]]
 }
 
 local treks_LRO_NAC_CratAbndHaz_20N010E_2mp = {
   Identifier = "LRO_NAC_CratAbndHaz_20N010E_2mp",
   Name = [[LRO LROC Crater Abundance Hazard, Sulpicius Gallus]],
-  FilePath = asset.localResource("LRO_LROC_Crater_Abundance_Hazard/Sulpicius_Gallus.vrt"),
+  FilePath = asset.resource("LRO_LROC_Crater_Abundance_Hazard/Sulpicius_Gallus.vrt"),
   Description = [[]]
 }
 
 local treks_LRO_NAC_CratAbndHaz_43S349E_150cmp = {
   Identifier = "LRO_NAC_CratAbndHaz_43S349E_150cmp",
   Name = [[LRO LROC Crater Abundance Hazard, Tycho Crater]],
-  FilePath = asset.localResource("LRO_LROC_Crater_Abundance_Hazard/Tycho_Crater.vrt"),
+  FilePath = asset.resource("LRO_LROC_Crater_Abundance_Hazard/Tycho_Crater.vrt"),
   Description = [[]]
 }
 
diff --git a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Crater_Density.asset b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Crater_Density.asset
index db4800754b..17ed43885a 100644
--- a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Crater_Density.asset
+++ b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Crater_Density.asset
@@ -9,161 +9,161 @@ local globeIdentifier = asset.require("scene/solarsystem//planets/earth/moon/moo
 local treks_LRO_NAC_CratDen_17S173E_150cmp = {
   Identifier = "LRO_NAC_CratDen_17S173E_150cmp",
   Name = [[LRO LROC Crater Density, Aitken Crater]],
-  FilePath = asset.localResource("LRO_LROC_Crater_Density/Aitken_Crater.vrt"),
+  FilePath = asset.resource("LRO_LROC_Crater_Density/Aitken_Crater.vrt"),
   Description = [[]]
 }
 
 local treks_LRO_NAC_CratDen_13S358E_2mp = {
   Identifier = "LRO_NAC_CratDen_13S358E_2mp",
   Name = [[LRO LROC Crater Density, Alphonsus Crater]],
-  FilePath = asset.localResource("LRO_LROC_Crater_Density/Alphonsus_Crater.vrt"),
+  FilePath = asset.resource("LRO_LROC_Crater_Density/Alphonsus_Crater.vrt"),
   Description = [[]]
 }
 
 local treks_LRO_NAC_CratDen_73N350E_150cmp = {
   Identifier = "LRO_NAC_CratDen_73N350E_150cmp",
   Name = [[LRO LROC Crater Density, Anaxagoras Crater]],
-  FilePath = asset.localResource("LRO_LROC_Crater_Density/Anaxagoras_Crater.vrt"),
+  FilePath = asset.resource("LRO_LROC_Crater_Density/Anaxagoras_Crater.vrt"),
   Description = [[]]
 }
 
 local treks_LRO_NAC_CratDen_26N004E_150cmp = {
   Identifier = "LRO_NAC_CratDen_26N004E_150cmp",
   Name = [[LRO LROC Crater Density, Apollo 15]],
-  FilePath = asset.localResource("LRO_LROC_Crater_Density/Apollo_15.vrt"),
+  FilePath = asset.resource("LRO_LROC_Crater_Density/Apollo_15.vrt"),
   Description = [[]]
 }
 
 local treks_LRO_NAC_CratDen_09S015E_150cmp = {
   Identifier = "LRO_NAC_CratDen_09S015E_150cmp",
   Name = [[LRO LROC Crater Density, Apollo 16]],
-  FilePath = asset.localResource("LRO_LROC_Crater_Density/Apollo_16.vrt"),
+  FilePath = asset.resource("LRO_LROC_Crater_Density/Apollo_16.vrt"),
   Description = [[]]
 }
 
 local treks_LRO_NAC_CratDen_37S206E_150cmp = {
   Identifier = "LRO_NAC_CratDen_37S206E_150cmp",
   Name = [[LRO LROC Crater Density, Apollo Basin]],
-  FilePath = asset.localResource("LRO_LROC_Crater_Density/Apollo_Basin.vrt"),
+  FilePath = asset.resource("LRO_LROC_Crater_Density/Apollo_Basin.vrt"),
   Description = [[]]
 }
 
 local treks_LRO_NAC_CratDen_25N311E_2mp = {
   Identifier = "LRO_NAC_CratDen_25N311E_2mp",
   Name = [[LRO LROC Crater Density, Aristarchus 1]],
-  FilePath = asset.localResource("LRO_LROC_Crater_Density/Aristarchus_1.vrt"),
+  FilePath = asset.resource("LRO_LROC_Crater_Density/Aristarchus_1.vrt"),
   Description = [[]]
 }
 
 local treks_LRO_NAC_CratDen_28N307E_150cmp = {
   Identifier = "LRO_NAC_CratDen_28N307E_150cmp",
   Name = [[LRO LROC Crater Density, Aristarchus 2]],
-  FilePath = asset.localResource("LRO_LROC_Crater_Density/Aristarchus_2.vrt"),
+  FilePath = asset.resource("LRO_LROC_Crater_Density/Aristarchus_2.vrt"),
   Description = [[]]
 }
 
 local treks_LRO_NAC_CratDen_19S070E_150cmp = {
   Identifier = "LRO_NAC_CratDen_19S070E_150cmp",
   Name = [[LRO LROC Crater Density, Balmer Basin]],
-  FilePath = asset.localResource("LRO_LROC_Crater_Density/Balmer_Basin.vrt"),
+  FilePath = asset.resource("LRO_LROC_Crater_Density/Balmer_Basin.vrt"),
   Description = [[]]
 }
 
 local treks_LRO_NAC_CratDen_20S337E_400cmp = {
   Identifier = "LRO_NAC_CratDen_20S337E_400cmp",
   Name = [[LRO LROC Crater Density, Bullialdus Crater]],
-  FilePath = asset.localResource("LRO_LROC_Crater_Density/Bullialdus_Crater.vrt"),
+  FilePath = asset.resource("LRO_LROC_Crater_Density/Bullialdus_Crater.vrt"),
   Description = [[]]
 }
 
 local treks_LRO_NAC_CratDen_36N320E_2mp = {
   Identifier = "LRO_NAC_CratDen_36N320E_2mp",
   Name = [[LRO LROC Crater Density, Gruithuisen Domes]],
-  FilePath = asset.localResource("LRO_LROC_Crater_Density/Gruithuisen_Domes.vrt"),
+  FilePath = asset.resource("LRO_LROC_Crater_Density/Gruithuisen_Domes.vrt"),
   Description = [[]]
 }
 
 local treks_LRO_NAC_CratDen_00N234E_150cmp = {
   Identifier = "LRO_NAC_CratDen_00N234E_150cmp",
   Name = [[LRO LROC Crater Density, Hertzsprung]],
-  FilePath = asset.localResource("LRO_LROC_Crater_Density/Hertzsprung.vrt"),
+  FilePath = asset.resource("LRO_LROC_Crater_Density/Hertzsprung.vrt"),
   Description = [[]]
 }
 
 local treks_LRO_NAC_CratDen_08N332E_2mp = {
   Identifier = "LRO_NAC_CratDen_08N332E_2mp",
   Name = [[LRO LROC Crater Density, Hortensius Domes]],
-  FilePath = asset.localResource("LRO_LROC_Crater_Density/Hortensius_Domes.vrt"),
+  FilePath = asset.resource("LRO_LROC_Crater_Density/Hortensius_Domes.vrt"),
   Description = [[]]
 }
 
 local treks_LRO_NAC_CratDen_06N120E_200cmp = {
   Identifier = "LRO_NAC_CratDen_06N120E_200cmp",
   Name = [[LRO LROC Crater Density, King Crater]],
-  FilePath = asset.localResource("LRO_LROC_Crater_Density/King_Crater.vrt"),
+  FilePath = asset.resource("LRO_LROC_Crater_Density/King_Crater.vrt"),
   Description = [[]]
 }
 
 local treks_LRO_NAC_CratDen_32N292E_2mp = {
   Identifier = "LRO_NAC_CratDen_32N292E_2mp",
   Name = [[LRO LROC Crater Density, Lichtenberg Crater]],
-  FilePath = asset.localResource("LRO_LROC_Crater_Density/Lichtenberg_Crater.vrt"),
+  FilePath = asset.resource("LRO_LROC_Crater_Density/Lichtenberg_Crater.vrt"),
   Description = [[]]
 }
 
 local treks_LRO_NAC_CratDen_10N058E_150cmp = {
   Identifier = "LRO_NAC_CratDen_10N058E_150cmp",
   Name = [[LRO LROC Crater Density, Mare Crisium]],
-  FilePath = asset.localResource("LRO_LROC_Crater_Density/Mare_Crisium.vrt"),
+  FilePath = asset.resource("LRO_LROC_Crater_Density/Mare_Crisium.vrt"),
   Description = [[]]
 }
 
 local treks_LRO_NAC_CratDen_16S041E_150cmp = {
   Identifier = "LRO_NAC_CratDen_16S041E_150cmp",
   Name = [[LRO LROC Crater Density, Montes Pyrenaeus]],
-  FilePath = asset.localResource("LRO_LROC_Crater_Density/Montes_Pyrenaeus.vrt"),
+  FilePath = asset.resource("LRO_LROC_Crater_Density/Montes_Pyrenaeus.vrt"),
   Description = [[]]
 }
 
 local treks_LRO_NAC_CratDen_26S265E_200cmp = {
   Identifier = "LRO_NAC_CratDen_26S265E_200cmp",
   Name = [[LRO LROC Crater Density, Orientale 1]],
-  FilePath = asset.localResource("LRO_LROC_Crater_Density/Orientale_1.vrt"),
+  FilePath = asset.resource("LRO_LROC_Crater_Density/Orientale_1.vrt"),
   Description = [[]]
 }
 
 local treks_LRO_NAC_CratDen_53N354E_150cmp = {
   Identifier = "LRO_NAC_CratDen_53N354E_150cmp",
   Name = [[LRO LROC Crater Density, Plato Ejecta]],
-  FilePath = asset.localResource("LRO_LROC_Crater_Density/Plato_Ejecta.vrt"),
+  FilePath = asset.resource("LRO_LROC_Crater_Density/Plato_Ejecta.vrt"),
   Description = [[]]
 }
 
 local treks_LRO_NAC_CratDen_60S200E_150cmp = {
   Identifier = "LRO_NAC_CratDen_60S200E_150cmp",
   Name = [[LRO LROC Crater Density, South Pole-Aitken Basin Interior]],
-  FilePath = asset.localResource("LRO_LROC_Crater_Density/South_Pole-Aitken_Basin_Interior.vrt"),
+  FilePath = asset.resource("LRO_LROC_Crater_Density/South_Pole-Aitken_Basin_Interior.vrt"),
   Description = [[]]
 }
 
 local treks_LRO_NAC_CratDen_02S167E_150cmp = {
   Identifier = "LRO_NAC_CratDen_02S167E_150cmp",
   Name = [[LRO LROC Crater Density, Stratton (Dewar) High Fe Anomaly]],
-  FilePath = asset.localResource("LRO_LROC_Crater_Density/Stratton_Dewar_High_Fe_Anomaly.vrt"),
+  FilePath = asset.resource("LRO_LROC_Crater_Density/Stratton_Dewar_High_Fe_Anomaly.vrt"),
   Description = [[]]
 }
 
 local treks_LRO_NAC_CratDen_20N010E_2mp = {
   Identifier = "LRO_NAC_CratDen_20N010E_2mp",
   Name = [[LRO LROC Crater Density, Sulpicius Gallus]],
-  FilePath = asset.localResource("LRO_LROC_Crater_Density/Sulpicius_Gallus.vrt"),
+  FilePath = asset.resource("LRO_LROC_Crater_Density/Sulpicius_Gallus.vrt"),
   Description = [[]]
 }
 
 local treks_LRO_NAC_CratDen_43S349E_150cmp = {
   Identifier = "LRO_NAC_CratDen_43S349E_150cmp",
   Name = [[LRO LROC Crater Density, Tycho Crater]],
-  FilePath = asset.localResource("LRO_LROC_Crater_Density/Tycho_Crater.vrt"),
+  FilePath = asset.resource("LRO_LROC_Crater_Density/Tycho_Crater.vrt"),
   Description = [[]]
 }
 
diff --git a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Crater_Density_Hazard.asset b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Crater_Density_Hazard.asset
index 544eef27c0..f4ad36cb2c 100644
--- a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Crater_Density_Hazard.asset
+++ b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Crater_Density_Hazard.asset
@@ -9,161 +9,161 @@ local globeIdentifier = asset.require("scene/solarsystem//planets/earth/moon/moo
 local treks_LRO_NAC_CratDenHaz_17S173E_150cmp = {
   Identifier = "LRO_NAC_CratDenHaz_17S173E_150cmp",
   Name = [[LRO LROC Crater Density Hazard, Aitken Crater]],
-  FilePath = asset.localResource("LRO_LROC_Crater_Density_Hazard/Aitken_Crater.vrt"),
+  FilePath = asset.resource("LRO_LROC_Crater_Density_Hazard/Aitken_Crater.vrt"),
   Description = [[]]
 }
 
 local treks_LRO_NAC_CratDenHaz_13S358E_2mp = {
   Identifier = "LRO_NAC_CratDenHaz_13S358E_2mp",
   Name = [[LRO LROC Crater Density Hazard, Alphonsus Crater]],
-  FilePath = asset.localResource("LRO_LROC_Crater_Density_Hazard/Alphonsus_Crater.vrt"),
+  FilePath = asset.resource("LRO_LROC_Crater_Density_Hazard/Alphonsus_Crater.vrt"),
   Description = [[]]
 }
 
 local treks_LRO_NAC_CratDenHaz_73N350E_150cmp = {
   Identifier = "LRO_NAC_CratDenHaz_73N350E_150cmp",
   Name = [[LRO LROC Crater Density Hazard, Anaxagoras Crater]],
-  FilePath = asset.localResource("LRO_LROC_Crater_Density_Hazard/Anaxagoras_Crater.vrt"),
+  FilePath = asset.resource("LRO_LROC_Crater_Density_Hazard/Anaxagoras_Crater.vrt"),
   Description = [[]]
 }
 
 local treks_LRO_NAC_CratDenHaz_26N004E_150cmp = {
   Identifier = "LRO_NAC_CratDenHaz_26N004E_150cmp",
   Name = [[LRO LROC Crater Density Hazard, Apollo 15]],
-  FilePath = asset.localResource("LRO_LROC_Crater_Density_Hazard/Apollo_15.vrt"),
+  FilePath = asset.resource("LRO_LROC_Crater_Density_Hazard/Apollo_15.vrt"),
   Description = [[]]
 }
 
 local treks_LRO_NAC_CratDenHaz_09S015E_150cmp = {
   Identifier = "LRO_NAC_CratDenHaz_09S015E_150cmp",
   Name = [[LRO LROC Crater Density Hazard, Apollo 16]],
-  FilePath = asset.localResource("LRO_LROC_Crater_Density_Hazard/Apollo_16.vrt"),
+  FilePath = asset.resource("LRO_LROC_Crater_Density_Hazard/Apollo_16.vrt"),
   Description = [[]]
 }
 
 local treks_LRO_NAC_CratDenHaz_37S206E_150cmp = {
   Identifier = "LRO_NAC_CratDenHaz_37S206E_150cmp",
   Name = [[LRO LROC Crater Density Hazard, Apollo Basin]],
-  FilePath = asset.localResource("LRO_LROC_Crater_Density_Hazard/Apollo_Basin.vrt"),
+  FilePath = asset.resource("LRO_LROC_Crater_Density_Hazard/Apollo_Basin.vrt"),
   Description = [[]]
 }
 
 local treks_LRO_NAC_CratDenHaz_25N311E_2mp = {
   Identifier = "LRO_NAC_CratDenHaz_25N311E_2mp",
   Name = [[LRO LROC Crater Density Hazard, Aristarchus 1]],
-  FilePath = asset.localResource("LRO_LROC_Crater_Density_Hazard/Aristarchus_1.vrt"),
+  FilePath = asset.resource("LRO_LROC_Crater_Density_Hazard/Aristarchus_1.vrt"),
   Description = [[]]
 }
 
 local treks_LRO_NAC_CratDenHaz_28N307E_150cmp = {
   Identifier = "LRO_NAC_CratDenHaz_28N307E_150cmp",
   Name = [[LRO LROC Crater Density Hazard, Aristarchus 2]],
-  FilePath = asset.localResource("LRO_LROC_Crater_Density_Hazard/Aristarchus_2.vrt"),
+  FilePath = asset.resource("LRO_LROC_Crater_Density_Hazard/Aristarchus_2.vrt"),
   Description = [[]]
 }
 
 local treks_LRO_NAC_CratDenHaz_19S070E_150cmp = {
   Identifier = "LRO_NAC_CratDenHaz_19S070E_150cmp",
   Name = [[LRO LROC Crater Density Hazard, Balmer Basin]],
-  FilePath = asset.localResource("LRO_LROC_Crater_Density_Hazard/Balmer_Basin.vrt"),
+  FilePath = asset.resource("LRO_LROC_Crater_Density_Hazard/Balmer_Basin.vrt"),
   Description = [[]]
 }
 
 local treks_LRO_NAC_CratDenHaz_20S337E_400cmp = {
   Identifier = "LRO_NAC_CratDenHaz_20S337E_400cmp",
   Name = [[LRO LROC Crater Density Hazard, Bullialdus Crater]],
-  FilePath = asset.localResource("LRO_LROC_Crater_Density_Hazard/Bullialdus_Crater.vrt"),
+  FilePath = asset.resource("LRO_LROC_Crater_Density_Hazard/Bullialdus_Crater.vrt"),
   Description = [[]]
 }
 
 local treks_LRO_NAC_CratDenHaz_36N320E_2mp = {
   Identifier = "LRO_NAC_CratDenHaz_36N320E_2mp",
   Name = [[LRO LROC Crater Density Hazard, Gruithuisen Domes]],
-  FilePath = asset.localResource("LRO_LROC_Crater_Density_Hazard/Gruithuisen_Domes.vrt"),
+  FilePath = asset.resource("LRO_LROC_Crater_Density_Hazard/Gruithuisen_Domes.vrt"),
   Description = [[]]
 }
 
 local treks_LRO_NAC_CratDenHaz_00N234E_150cmp = {
   Identifier = "LRO_NAC_CratDenHaz_00N234E_150cmp",
   Name = [[LRO LROC Crater Density Hazard, Hertzsprung]],
-  FilePath = asset.localResource("LRO_LROC_Crater_Density_Hazard/Hertzsprung.vrt"),
+  FilePath = asset.resource("LRO_LROC_Crater_Density_Hazard/Hertzsprung.vrt"),
   Description = [[]]
 }
 
 local treks_LRO_NAC_CratDenHaz_08N332E_2mp = {
   Identifier = "LRO_NAC_CratDenHaz_08N332E_2mp",
   Name = [[LRO LROC Crater Density Hazard, Hortensius Domes]],
-  FilePath = asset.localResource("LRO_LROC_Crater_Density_Hazard/Hortensius_Domes.vrt"),
+  FilePath = asset.resource("LRO_LROC_Crater_Density_Hazard/Hortensius_Domes.vrt"),
   Description = [[]]
 }
 
 local treks_LRO_NAC_CratDenHaz_06N120E_200cmp = {
   Identifier = "LRO_NAC_CratDenHaz_06N120E_200cmp",
   Name = [[LRO LROC Crater Density Hazard, King Crater]],
-  FilePath = asset.localResource("LRO_LROC_Crater_Density_Hazard/King_Crater.vrt"),
+  FilePath = asset.resource("LRO_LROC_Crater_Density_Hazard/King_Crater.vrt"),
   Description = [[]]
 }
 
 local treks_LRO_NAC_CratDenHaz_32N292E_2mp = {
   Identifier = "LRO_NAC_CratDenHaz_32N292E_2mp",
   Name = [[LRO LROC Crater Density Hazard, Lichtenberg Crater]],
-  FilePath = asset.localResource("LRO_LROC_Crater_Density_Hazard/Lichtenberg_Crater.vrt"),
+  FilePath = asset.resource("LRO_LROC_Crater_Density_Hazard/Lichtenberg_Crater.vrt"),
   Description = [[]]
 }
 
 local treks_LRO_NAC_CratDenHaz_10N058E_150cmp = {
   Identifier = "LRO_NAC_CratDenHaz_10N058E_150cmp",
   Name = [[LRO LROC Crater Density Hazard, Mare Crisium]],
-  FilePath = asset.localResource("LRO_LROC_Crater_Density_Hazard/Mare_Crisium.vrt"),
+  FilePath = asset.resource("LRO_LROC_Crater_Density_Hazard/Mare_Crisium.vrt"),
   Description = [[]]
 }
 
 local treks_LRO_NAC_CratDenHaz_16S041E_150cmp = {
   Identifier = "LRO_NAC_CratDenHaz_16S041E_150cmp",
   Name = [[LRO LROC Crater Density Hazard, Montes Pyrenaeus]],
-  FilePath = asset.localResource("LRO_LROC_Crater_Density_Hazard/Montes_Pyrenaeus.vrt"),
+  FilePath = asset.resource("LRO_LROC_Crater_Density_Hazard/Montes_Pyrenaeus.vrt"),
   Description = [[]]
 }
 
 local treks_LRO_NAC_CratDenHaz_26S265E_200cmp = {
   Identifier = "LRO_NAC_CratDenHaz_26S265E_200cmp",
   Name = [[LRO LROC Crater Density Hazard, Orientale 1]],
-  FilePath = asset.localResource("LRO_LROC_Crater_Density_Hazard/Orientale_1.vrt"),
+  FilePath = asset.resource("LRO_LROC_Crater_Density_Hazard/Orientale_1.vrt"),
   Description = [[]]
 }
 
 local treks_LRO_NAC_CratDenHaz_53N354E_150cmp = {
   Identifier = "LRO_NAC_CratDenHaz_53N354E_150cmp",
   Name = [[LRO LROC Crater Density Hazard, Plato Ejecta]],
-  FilePath = asset.localResource("LRO_LROC_Crater_Density_Hazard/Plato_Ejecta.vrt"),
+  FilePath = asset.resource("LRO_LROC_Crater_Density_Hazard/Plato_Ejecta.vrt"),
   Description = [[]]
 }
 
 local treks_LRO_NAC_CratDenHaz_60S200E_150cmp = {
   Identifier = "LRO_NAC_CratDenHaz_60S200E_150cmp",
   Name = [[LRO LROC Crater Density Hazard, South Pole-Aitken Basin Interior]],
-  FilePath = asset.localResource("LRO_LROC_Crater_Density_Hazard/South_Pole-Aitken_Basin_Interior.vrt"),
+  FilePath = asset.resource("LRO_LROC_Crater_Density_Hazard/South_Pole-Aitken_Basin_Interior.vrt"),
   Description = [[]]
 }
 
 local treks_LRO_NAC_CratDenHaz_02S167E_150cmp = {
   Identifier = "LRO_NAC_CratDenHaz_02S167E_150cmp",
   Name = [[LRO LROC Crater Density Hazard, Stratton (Dewar) High Fe Anomaly]],
-  FilePath = asset.localResource("LRO_LROC_Crater_Density_Hazard/Stratton_Dewar_High_Fe_Anomaly.vrt"),
+  FilePath = asset.resource("LRO_LROC_Crater_Density_Hazard/Stratton_Dewar_High_Fe_Anomaly.vrt"),
   Description = [[]]
 }
 
 local treks_LRO_NAC_CratDenHaz_20N010E_2mp = {
   Identifier = "LRO_NAC_CratDenHaz_20N010E_2mp",
   Name = [[LRO LROC Crater Density Hazard, Sulpicius Gallus]],
-  FilePath = asset.localResource("LRO_LROC_Crater_Density_Hazard/Sulpicius_Gallus.vrt"),
+  FilePath = asset.resource("LRO_LROC_Crater_Density_Hazard/Sulpicius_Gallus.vrt"),
   Description = [[]]
 }
 
 local treks_LRO_NAC_CratDenHaz_43S349E_150cmp = {
   Identifier = "LRO_NAC_CratDenHaz_43S349E_150cmp",
   Name = [[LRO LROC Crater Density Hazard, Tycho Crater]],
-  FilePath = asset.localResource("LRO_LROC_Crater_Density_Hazard/Tycho_Crater.vrt"),
+  FilePath = asset.resource("LRO_LROC_Crater_Density_Hazard/Tycho_Crater.vrt"),
   Description = [[]]
 }
 
diff --git a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_DEM.asset b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_DEM.asset
index fcdef25339..2f0a72b7a6 100644
--- a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_DEM.asset
+++ b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_DEM.asset
@@ -9,301 +9,301 @@ local globeIdentifier = asset.require("scene/solarsystem//planets/earth/moon/moo
 local treks_LRO_NAC_ClrRoughness_15m_17S173E_150cmp = {
   Identifier = "LRO_NAC_ClrRoughness_15m_17S173E_150cmp",
   Name = [[LRO LROC DEM, Aitken Crater, 15m Color Roughness]],
-  FilePath = asset.localResource("LRO_LROC_DEM/Aitken_Crater.vrt"),
+  FilePath = asset.resource("LRO_LROC_DEM/Aitken_Crater.vrt"),
   Description = [[]]
 }
 
 local treks_LRO_NAC_ClrRoughness_15m_13S358E_2mp = {
   Identifier = "LRO_NAC_ClrRoughness_15m_13S358E_2mp",
   Name = [[LRO LROC DEM, Alphonsus Crater, 15m Color Roughness]],
-  FilePath = asset.localResource("LRO_LROC_DEM/Alphonsus_Crater.vrt"),
+  FilePath = asset.resource("LRO_LROC_DEM/Alphonsus_Crater.vrt"),
   Description = [[]]
 }
 
 local treks_LRO_NAC_ClrShade_13S358E_200cmp = {
   Identifier = "LRO_NAC_ClrShade_13S358E_200cmp",
   Name = [[LRO LROC DEM, Alphonsus, ColorHillshade]],
-  FilePath = asset.localResource("LRO_LROC_DEM/Alphonsus.vrt"),
+  FilePath = asset.resource("LRO_LROC_DEM/Alphonsus.vrt"),
   Description = [[]]
 }
 
 local treks_LRO_NAC_ClrRoughness_15m_73N350E_150cmp = {
   Identifier = "LRO_NAC_ClrRoughness_15m_73N350E_150cmp",
   Name = [[LRO LROC DEM, Anaxagoras Crater, 15m Color Roughness]],
-  FilePath = asset.localResource("LRO_LROC_DEM/Anaxagoras_Crater.vrt"),
+  FilePath = asset.resource("LRO_LROC_DEM/Anaxagoras_Crater.vrt"),
   Description = [[]]
 }
 
 local treks_LRO_NAC_ClrRoughness_15m_26N004E_150cmp = {
   Identifier = "LRO_NAC_ClrRoughness_15m_26N004E_150cmp",
   Name = [[LRO LROC DEM, Apollo 15, 15m Color Roughness]],
-  FilePath = asset.localResource("LRO_LROC_DEM/Apollo_15.vrt"),
+  FilePath = asset.resource("LRO_LROC_DEM/Apollo_15.vrt"),
   Description = [[]]
 }
 
 local treks_LRO_NAC_ClrRoughness_15m_09S015E_150cmp = {
   Identifier = "LRO_NAC_ClrRoughness_15m_09S015E_150cmp",
   Name = [[LRO LROC DEM, Apollo 16, 15m Color Roughness]],
-  FilePath = asset.localResource("LRO_LROC_DEM/Apollo_16.vrt"),
+  FilePath = asset.resource("LRO_LROC_DEM/Apollo_16.vrt"),
   Description = [[]]
 }
 
 local treks_LRO_NAC_ClrRoughness_15m_37S206E_150cmp = {
   Identifier = "LRO_NAC_ClrRoughness_15m_37S206E_150cmp",
   Name = [[LRO LROC DEM, Apollo Basin, 15m Color Roughness]],
-  FilePath = asset.localResource("LRO_LROC_DEM/Apollo_Basin.vrt"),
+  FilePath = asset.resource("LRO_LROC_DEM/Apollo_Basin.vrt"),
   Description = [[]]
 }
 
 local treks_LRO_NAC_ClrRoughness_15m_25N311E_2mp = {
   Identifier = "LRO_NAC_ClrRoughness_15m_25N311E_2mp",
   Name = [[LRO LROC DEM, Aristarchus 1, 15m Color Roughness]],
-  FilePath = asset.localResource("LRO_LROC_DEM/Aristarchus_1.vrt"),
+  FilePath = asset.resource("LRO_LROC_DEM/Aristarchus_1.vrt"),
   Description = [[]]
 }
 
 local treks_LRO_NAC_ClrRoughness_15m_28N307E_150cmp = {
   Identifier = "LRO_NAC_ClrRoughness_15m_28N307E_150cmp",
   Name = [[LRO LROC DEM, Aristarchus 2, 15m Color Roughness]],
-  FilePath = asset.localResource("LRO_LROC_DEM/Aristarchus_2.vrt"),
+  FilePath = asset.resource("LRO_LROC_DEM/Aristarchus_2.vrt"),
   Description = [[]]
 }
 
 local treks_LRO_NAC_ClrRoughness_15m_19S070E_150cmp = {
   Identifier = "LRO_NAC_ClrRoughness_15m_19S070E_150cmp",
   Name = [[LRO LROC DEM, Balmer Basin, 15m Color Roughness]],
-  FilePath = asset.localResource("LRO_LROC_DEM/Balmer_Basin.vrt"),
+  FilePath = asset.resource("LRO_LROC_DEM/Balmer_Basin.vrt"),
   Description = [[]]
 }
 
 local treks_LRO_NAC_ClrRoughness_15m_20S337E_400cmp = {
   Identifier = "LRO_NAC_ClrRoughness_15m_20S337E_400cmp",
   Name = [[LRO LROC DEM, Bullialdus Crater, 15m Color Roughness]],
-  FilePath = asset.localResource("LRO_LROC_DEM/Bullialdus_Crater.vrt"),
+  FilePath = asset.resource("LRO_LROC_DEM/Bullialdus_Crater.vrt"),
   Description = [[]]
 }
 
 local treks_LRO_NAC_ClrShade_61N099E_150cmp = {
   Identifier = "LRO_NAC_ClrShade_61N099E_150cmp",
   Name = [[LRO LROC DEM, Compton Belkovich Th Anomaly, ColorHillshade]],
-  FilePath = asset.localResource("LRO_LROC_DEM/Compton_Belkovich_Th_Anomaly.vrt"),
+  FilePath = asset.resource("LRO_LROC_DEM/Compton_Belkovich_Th_Anomaly.vrt"),
   Description = [[]]
 }
 
 local treks_LRO_NAC_ClrRoughness_15m_26N178E_150cmp = {
   Identifier = "LRO_NAC_ClrRoughness_15m_26N178E_150cmp",
   Name = [[LRO LROC DEM, Dante Crater, 15m Color Roughness]],
-  FilePath = asset.localResource("LRO_LROC_DEM/Dante_Crater.vrt"),
+  FilePath = asset.resource("LRO_LROC_DEM/Dante_Crater.vrt"),
   Description = [[]]
 }
 
 local treks_LRO_NAC_ClrShade_02S317E_150cmp = {
   Identifier = "LRO_NAC_ClrShade_02S317E_150cmp",
   Name = [[LRO LROC DEM, Flamsteed Crater, ColorHillshade]],
-  FilePath = asset.localResource("LRO_LROC_DEM/Flamsteed_Crater.vrt"),
+  FilePath = asset.resource("LRO_LROC_DEM/Flamsteed_Crater.vrt"),
   Description = [[]]
 }
 
 local treks_LRO_NAC_ClrShade_03N280E_2m = {
   Identifier = "LRO_NAC_ClrShade_03N280E_2m",
   Name = [[LRO LROC DEM, Fresh Crater East of Lents, ColorHillshade]],
-  FilePath = asset.localResource("LRO_LROC_DEM/Fresh_Crater_East_of_Lents.vrt"),
+  FilePath = asset.resource("LRO_LROC_DEM/Fresh_Crater_East_of_Lents.vrt"),
   Description = [[]]
 }
 
 local treks_LRO_NAC_ClrRoughness_15m_36N320E_2mp = {
   Identifier = "LRO_NAC_ClrRoughness_15m_36N320E_2mp",
   Name = [[LRO LROC DEM, Gruithuisen Domes, 15m Color Roughness]],
-  FilePath = asset.localResource("LRO_LROC_DEM/Gruithuisen_Domes.vrt"),
+  FilePath = asset.resource("LRO_LROC_DEM/Gruithuisen_Domes.vrt"),
   Description = [[]]
 }
 
 local treks_LRO_NAC_ClrRoughness_15m_00N234E_150cmp = {
   Identifier = "LRO_NAC_ClrRoughness_15m_00N234E_150cmp",
   Name = [[LRO LROC DEM, Hertzsprung, 15m Color Roughness]],
-  FilePath = asset.localResource("LRO_LROC_DEM/Hertzsprung.vrt"),
+  FilePath = asset.resource("LRO_LROC_DEM/Hertzsprung.vrt"),
   Description = [[]]
 }
 
 local treks_LRO_NAC_ClrRoughness_15m_08N332E_2mp = {
   Identifier = "LRO_NAC_ClrRoughness_15m_08N332E_2mp",
   Name = [[LRO LROC DEM, Hortensius Domes, 15m Color Roughness]],
-  FilePath = asset.localResource("LRO_LROC_DEM/Hortensius_Domes.vrt"),
+  FilePath = asset.resource("LRO_LROC_DEM/Hortensius_Domes.vrt"),
   Description = [[]]
 }
 
 local treks_LRO_NAC_ClrShade_55N077E_200cmp = {
   Identifier = "LRO_NAC_ClrShade_55N077E_200cmp",
   Name = [[LRO LROC DEM, Humboldtianum Basin, ColorHillshade]],
-  FilePath = asset.localResource("LRO_LROC_DEM/Humboldtianum_Basin.vrt"),
+  FilePath = asset.resource("LRO_LROC_DEM/Humboldtianum_Basin.vrt"),
   Description = [[]]
 }
 
 local treks_LRO_NAC_ClrShade_19N005E_2mp = {
   Identifier = "LRO_NAC_ClrShade_19N005E_2mp",
   Name = [[LRO LROC DEM, Ina (D-Caldera), ColorHillshade]],
-  FilePath = asset.localResource("LRO_LROC_DEM/Ina_D-Caldera.vrt"),
+  FilePath = asset.resource("LRO_LROC_DEM/Ina_D-Caldera.vrt"),
   Description = [[]]
 }
 
 local treks_LRO_NAC_ClrRoughness_15m_06N120E_200cmp = {
   Identifier = "LRO_NAC_ClrRoughness_15m_06N120E_200cmp",
   Name = [[LRO LROC DEM, King Crater, 15m Color Roughness]],
-  FilePath = asset.localResource("LRO_LROC_DEM/King_Crater.vrt"),
+  FilePath = asset.resource("LRO_LROC_DEM/King_Crater.vrt"),
   Description = [[]]
 }
 
 local treks_LRO_NAC_ClrRoughness_15m_32N292E_2mp = {
   Identifier = "LRO_NAC_ClrRoughness_15m_32N292E_2mp",
   Name = [[LRO LROC DEM, Lichtenberg Crater, 15m Color Roughness]],
-  FilePath = asset.localResource("LRO_LROC_DEM/Lichtenberg_Crater.vrt"),
+  FilePath = asset.resource("LRO_LROC_DEM/Lichtenberg_Crater.vrt"),
   Description = [[]]
 }
 
 local treks_LRO_NAC_ClrRoughness_15m_10N58E_150cmp = {
   Identifier = "LRO_NAC_ClrRoughness_15m_10N58E_150cmp",
   Name = [[LRO LROC DEM, Mare Crisium, 15m Color Roughness]],
-  FilePath = asset.localResource("LRO_LROC_DEM/Mare_Crisium.vrt"),
+  FilePath = asset.resource("LRO_LROC_DEM/Mare_Crisium.vrt"),
   Description = [[]]
 }
 
 local treks_LRO_NAC_ClrShade_36S164E_2mp = {
   Identifier = "LRO_NAC_ClrShade_36S164E_2mp",
   Name = [[LRO LROC DEM, Mare Ingenii, ColorHillshade]],
-  FilePath = asset.localResource("LRO_LROC_DEM/Mare_Ingenii.vrt"),
+  FilePath = asset.resource("LRO_LROC_DEM/Mare_Ingenii.vrt"),
   Description = [[]]
 }
 
 local treks_LRO_NAC_ClrShade_26N150E_200cmp = {
   Identifier = "LRO_NAC_ClrShade_26N150E_200cmp",
   Name = [[LRO LROC DEM, Mare Moscoviense, ColorHillshade]],
-  FilePath = asset.localResource("LRO_LROC_DEM/Mare_Moscoviense.vrt"),
+  FilePath = asset.resource("LRO_LROC_DEM/Mare_Moscoviense.vrt"),
   Description = [[]]
 }
 
 local treks_LRO_NAC_ClrShade_02N085E_150cmp = {
   Identifier = "LRO_NAC_ClrShade_02N085E_150cmp",
   Name = [[LRO LROC DEM, Mare Smythii, ColorHillshade]],
-  FilePath = asset.localResource("LRO_LROC_DEM/Mare_Smythii.vrt"),
+  FilePath = asset.resource("LRO_LROC_DEM/Mare_Smythii.vrt"),
   Description = [[]]
 }
 
 local treks_LRO_NAC_ClrShade_07N022E_150cmp = {
   Identifier = "LRO_NAC_ClrShade_07N022E_150cmp",
   Name = [[LRO LROC DEM, Mare Tranquillitatis, ColorHillshade]],
-  FilePath = asset.localResource("LRO_LROC_DEM/Mare_Tranquillitatis.vrt"),
+  FilePath = asset.resource("LRO_LROC_DEM/Mare_Tranquillitatis.vrt"),
   Description = [[]]
 }
 
 local treks_LRO_NAC_ClrShade_14N304E_2mp = {
   Identifier = "LRO_NAC_ClrShade_14N304E_2mp",
   Name = [[LRO LROC DEM, Marius Hills, ColorHillshade]],
-  FilePath = asset.localResource("LRO_LROC_DEM/Marius_Hills.vrt"),
+  FilePath = asset.resource("LRO_LROC_DEM/Marius_Hills.vrt"),
   Description = [[]]
 }
 
 local treks_LRO_NAC_ClrRoughness_15m_16S041E_150cmp = {
   Identifier = "LRO_NAC_ClrRoughness_15m_16S041E_150cmp",
   Name = [[LRO LROC DEM, Montes Pyrenaeus, 15m Color Roughness]],
-  FilePath = asset.localResource("LRO_LROC_DEM/Montes_Pyrenaeus.vrt"),
+  FilePath = asset.resource("LRO_LROC_DEM/Montes_Pyrenaeus.vrt"),
   Description = [[]]
 }
 
 local treks_LRO_NAC_ClrShade_05N000E_150cmp = {
   Identifier = "LRO_NAC_ClrShade_05N000E_150cmp",
   Name = [[LRO LROC DEM, Murchison Crater, ColorHillshade]],
-  FilePath = asset.localResource("LRO_LROC_DEM/Murchison_Crater.vrt"),
+  FilePath = asset.resource("LRO_LROC_DEM/Murchison_Crater.vrt"),
   Description = [[]]
 }
 
 local treks_LRO_NAC_ClrRoughness_15m_26S265E_200cmp = {
   Identifier = "LRO_NAC_ClrRoughness_15m_26S265E_200cmp",
   Name = [[LRO LROC DEM, Orientale 1, 15m Color Roughness]],
-  FilePath = asset.localResource("LRO_LROC_DEM/Orientale_1.vrt"),
+  FilePath = asset.resource("LRO_LROC_DEM/Orientale_1.vrt"),
   Description = [[]]
 }
 
 local treks_LRO_NAC_ClrRoughness_15m_53N354E_150cmp = {
   Identifier = "LRO_NAC_ClrRoughness_15m_53N354E_150cmp",
   Name = [[LRO LROC DEM, Plato Ejecta, 15m Color Roughness]],
-  FilePath = asset.localResource("LRO_LROC_DEM/Plato_Ejecta.vrt"),
+  FilePath = asset.resource("LRO_LROC_DEM/Plato_Ejecta.vrt"),
   Description = [[]]
 }
 
 local treks_LRO_NAC_ClrShade_07N301E_2mp = {
   Identifier = "LRO_NAC_ClrShade_07N301E_2mp",
   Name = [[LRO LROC DEM, Reiner Gamma, ColorHillshade]],
-  FilePath = asset.localResource("LRO_LROC_DEM/Reiner_Gamma.vrt"),
+  FilePath = asset.resource("LRO_LROC_DEM/Reiner_Gamma.vrt"),
   Description = [[]]
 }
 
 local treks_LRO_NAC_ClrShade_03S286E_150cmp = {
   Identifier = "LRO_NAC_ClrShade_03S286E_150cmp",
   Name = [[LRO LROC DEM, Riccioli Crater, ColorHillshade]],
-  FilePath = asset.localResource("LRO_LROC_DEM/Riccioli_Crater.vrt"),
+  FilePath = asset.resource("LRO_LROC_DEM/Riccioli_Crater.vrt"),
   Description = [[]]
 }
 
 local treks_LRO_NAC_ClrShade_13N356E_150cmp = {
   Identifier = "LRO_NAC_ClrShade_13N356E_150cmp",
   Name = [[LRO LROC DEM, Rima Bode, ColorHillshade]],
-  FilePath = asset.localResource("LRO_LROC_DEM/Rima_Bode.vrt"),
+  FilePath = asset.resource("LRO_LROC_DEM/Rima_Bode.vrt"),
   Description = [[]]
 }
 
 local treks_LRO_NAC_ClrShade_27N318E_150cmp = {
   Identifier = "LRO_NAC_ClrShade_27N318E_150cmp",
   Name = [[LRO LROC DEM, Rimae Prinz, ColorHillshade]],
-  FilePath = asset.localResource("LRO_LROC_DEM/Rimae_Prinz.vrt"),
+  FilePath = asset.resource("LRO_LROC_DEM/Rimae_Prinz.vrt"),
   Description = [[]]
 }
 
 local treks_LRO_NAC_ClrRoughness_15m_60S200E_150cmp = {
   Identifier = "LRO_NAC_ClrRoughness_15m_60S200E_150cmp",
   Name = [[LRO LROC DEM, South Pole-Aitken Basin Interior, 15m Color Roughness]],
-  FilePath = asset.localResource("LRO_LROC_DEM/South_Pole-Aitken_Basin_Interior.vrt"),
+  FilePath = asset.resource("LRO_LROC_DEM/South_Pole-Aitken_Basin_Interior.vrt"),
   Description = [[]]
 }
 
 local treks_LRO_NAC_ClrShade_51S171E_2mp = {
   Identifier = "LRO_NAC_ClrShade_51S171E_2mp",
   Name = [[LRO LROC DEM, South Pole-Aitken Rim, ColorHillshade]],
-  FilePath = asset.localResource("LRO_LROC_DEM/South_Pole-Aitken_Rim.vrt"),
+  FilePath = asset.resource("LRO_LROC_DEM/South_Pole-Aitken_Rim.vrt"),
   Description = [[]]
 }
 
 local treks_LRO_NAC_ClrRoughness_15m_02S167E_150cmp = {
   Identifier = "LRO_NAC_ClrRoughness_15m_02S167E_150cmp",
   Name = [[LRO LROC DEM, Stratton (Dewar) High Fe Anomaly, 15m Color Roughness]],
-  FilePath = asset.localResource("LRO_LROC_DEM/Stratton_Dewar_High_Fe_Anomaly.vrt"),
+  FilePath = asset.resource("LRO_LROC_DEM/Stratton_Dewar_High_Fe_Anomaly.vrt"),
   Description = [[]]
 }
 
 local treks_LRO_NAC_ClrShade_02S167E_150cmp = {
   Identifier = "LRO_NAC_ClrShade_02S167E_150cmp",
   Name = [[LRO LROC DEM, Stratton (Dewar), ColorHillshade]],
-  FilePath = asset.localResource("LRO_LROC_DEM/Stratton_Dewar.vrt"),
+  FilePath = asset.resource("LRO_LROC_DEM/Stratton_Dewar.vrt"),
   Description = [[]]
 }
 
 local treks_LRO_NAC_ClrRoughness_15m_20N010E_2mp = {
   Identifier = "LRO_NAC_ClrRoughness_15m_20N010E_2mp",
   Name = [[LRO LROC DEM, Sulpicius Gallus, 15m Color Roughness]],
-  FilePath = asset.localResource("LRO_LROC_DEM/Sulpicius_Gallus.vrt"),
+  FilePath = asset.resource("LRO_LROC_DEM/Sulpicius_Gallus.vrt"),
   Description = [[]]
 }
 
 local treks_LRO_NAC_ClrRoughness_15m_19S129E_150cmp = {
   Identifier = "LRO_NAC_ClrRoughness_15m_19S129E_150cmp",
   Name = [[LRO LROC DEM, Tsiolkovskiy Crater, 15m Color Roughness]],
-  FilePath = asset.localResource("LRO_LROC_DEM/Tsiolkovskiy_Crater.vrt"),
+  FilePath = asset.resource("LRO_LROC_DEM/Tsiolkovskiy_Crater.vrt"),
   Description = [[]]
 }
 
 local treks_LRO_NAC_ClrRoughness_15m_43S349E_150cmp = {
   Identifier = "LRO_NAC_ClrRoughness_15m_43S349E_150cmp",
   Name = [[LRO LROC DEM, Tycho Crater, 15m Color Roughness]],
-  FilePath = asset.localResource("LRO_LROC_DEM/Tycho_Crater.vrt"),
+  FilePath = asset.resource("LRO_LROC_DEM/Tycho_Crater.vrt"),
   Description = [[]]
 }
 
diff --git a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Image_Mosaic.asset b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Image_Mosaic.asset
index bc910b1954..759197bb9b 100644
--- a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Image_Mosaic.asset
+++ b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Image_Mosaic.asset
@@ -9,238 +9,238 @@ local globeIdentifier = asset.require("scene/solarsystem//planets/earth/moon/moo
 local treks_LRO_NAC_Mosaic_17S173E_50cmp = {
   Identifier = "LRO_NAC_Mosaic_17S173E_50cmp",
   Name = [[LRO LROC Image Mosaic, Aitken Crater]],
-  FilePath = asset.localResource("LRO_LROC_Image_Mosaic/Aitken_Crater.vrt"),
+  FilePath = asset.resource("LRO_LROC_Image_Mosaic/Aitken_Crater.vrt"),
   Description = [[]]
 }
 
 local treks_LRO_NAC_Mosaic_13S358E_50cmp = {
   Identifier = "LRO_NAC_Mosaic_13S358E_50cmp",
   Name = [[LRO LROC Image Mosaic, Alphonsus]],
-  FilePath = asset.localResource("LRO_LROC_Image_Mosaic/Alphonsus.vrt"),
+  FilePath = asset.resource("LRO_LROC_Image_Mosaic/Alphonsus.vrt"),
   Description = [[]]
 }
 
 local treks_LRO_NAC_Mosaic_26N004E_50cmp = {
   Identifier = "LRO_NAC_Mosaic_26N004E_50cmp",
   Name = [[LRO LROC Image Mosaic, Apollo 15]],
-  FilePath = asset.localResource("LRO_LROC_Image_Mosaic/Apollo_15.vrt"),
+  FilePath = asset.resource("LRO_LROC_Image_Mosaic/Apollo_15.vrt"),
   Description = [[]]
 }
 
 local treks_LRO_NAC_Mosaic_09S015E_50cmp = {
   Identifier = "LRO_NAC_Mosaic_09S015E_50cmp",
   Name = [[LRO LROC Image Mosaic, Apollo 16]],
-  FilePath = asset.localResource("LRO_LROC_Image_Mosaic/Apollo_16.vrt"),
+  FilePath = asset.resource("LRO_LROC_Image_Mosaic/Apollo_16.vrt"),
   Description = [[]]
 }
 
 local treks_LRO_NAC_Mosaic_25N311E_50cmp = {
   Identifier = "LRO_NAC_Mosaic_25N311E_50cmp",
   Name = [[LRO LROC Image Mosaic, Aristarchus 1]],
-  FilePath = asset.localResource("LRO_LROC_Image_Mosaic/Aristarchus_1.vrt"),
+  FilePath = asset.resource("LRO_LROC_Image_Mosaic/Aristarchus_1.vrt"),
   Description = [[]]
 }
 
 local treks_LRO_NAC_Mosaic_28N307E_50cmp = {
   Identifier = "LRO_NAC_Mosaic_28N307E_50cmp",
   Name = [[LRO LROC Image Mosaic, Aristarchus 2]],
-  FilePath = asset.localResource("LRO_LROC_Image_Mosaic/Aristarchus_2.vrt"),
+  FilePath = asset.resource("LRO_LROC_Image_Mosaic/Aristarchus_2.vrt"),
   Description = [[]]
 }
 
 local treks_LRO_NAC_Mosaic_19S070E_50cmp = {
   Identifier = "LRO_NAC_Mosaic_19S070E_50cmp",
   Name = [[LRO LROC Image Mosaic, Balmer Basin]],
-  FilePath = asset.localResource("LRO_LROC_Image_Mosaic/Balmer_Basin.vrt"),
+  FilePath = asset.resource("LRO_LROC_Image_Mosaic/Balmer_Basin.vrt"),
   Description = [[]]
 }
 
 local treks_LRO_NAC_Mosaic_61N099E_50cmp = {
   Identifier = "LRO_NAC_Mosaic_61N099E_50cmp",
   Name = [[LRO LROC Image Mosaic, Compton Belkovich Th Anomaly]],
-  FilePath = asset.localResource("LRO_LROC_Image_Mosaic/Compton_Belkovich_Th_Anomaly.vrt"),
+  FilePath = asset.resource("LRO_LROC_Image_Mosaic/Compton_Belkovich_Th_Anomaly.vrt"),
   Description = [[]]
 }
 
 local treks_LRO_NAC_Mosaic_02S317E_50cmp = {
   Identifier = "LRO_NAC_Mosaic_02S317E_50cmp",
   Name = [[LRO LROC Image Mosaic, Flamsteed Crater]],
-  FilePath = asset.localResource("LRO_LROC_Image_Mosaic/Flamsteed_Crater.vrt"),
+  FilePath = asset.resource("LRO_LROC_Image_Mosaic/Flamsteed_Crater.vrt"),
   Description = [[]]
 }
 
 local treks_LRO_NAC_Mosaic_36N320E_50cmp = {
   Identifier = "LRO_NAC_Mosaic_36N320E_50cmp",
   Name = [[LRO LROC Image Mosaic, Gruithuisen Domes]],
-  FilePath = asset.localResource("LRO_LROC_Image_Mosaic/Gruithuisen_Domes.vrt"),
+  FilePath = asset.resource("LRO_LROC_Image_Mosaic/Gruithuisen_Domes.vrt"),
   Description = [[]]
 }
 
 local treks_LRO_NAC_Mosaic_00N234E_50cmp = {
   Identifier = "LRO_NAC_Mosaic_00N234E_50cmp",
   Name = [[LRO LROC Image Mosaic, Hertzsprung]],
-  FilePath = asset.localResource("LRO_LROC_Image_Mosaic/Hertzsprung.vrt"),
+  FilePath = asset.resource("LRO_LROC_Image_Mosaic/Hertzsprung.vrt"),
   Description = [[]]
 }
 
 local treks_LRO_NAC_Mosaic_08N332E_50cmp = {
   Identifier = "LRO_NAC_Mosaic_08N332E_50cmp",
   Name = [[LRO LROC Image Mosaic, Hortensius Domes]],
-  FilePath = asset.localResource("LRO_LROC_Image_Mosaic/Hortensius_Domes.vrt"),
+  FilePath = asset.resource("LRO_LROC_Image_Mosaic/Hortensius_Domes.vrt"),
   Description = [[]]
 }
 
 local treks_LRO_NAC_Mosaic_55N077E_50cmp = {
   Identifier = "LRO_NAC_Mosaic_55N077E_50cmp",
   Name = [[LRO LROC Image Mosaic, Humboldtianum Basin]],
-  FilePath = asset.localResource("LRO_LROC_Image_Mosaic/Humboldtianum_Basin.vrt"),
+  FilePath = asset.resource("LRO_LROC_Image_Mosaic/Humboldtianum_Basin.vrt"),
   Description = [[]]
 }
 
 local treks_LRO_NAC_Mosaic_19N005E_50cmp = {
   Identifier = "LRO_NAC_Mosaic_19N005E_50cmp",
   Name = [[LRO LROC Image Mosaic, Ina D-Caldera]],
-  FilePath = asset.localResource("LRO_LROC_Image_Mosaic/Ina_D-Caldera.vrt"),
+  FilePath = asset.resource("LRO_LROC_Image_Mosaic/Ina_D-Caldera.vrt"),
   Description = [[]]
 }
 
 local treks_LRO_NAC_Mosaic_06N120E_50cmp = {
   Identifier = "LRO_NAC_Mosaic_06N120E_50cmp",
   Name = [[LRO LROC Image Mosaic, King Crater]],
-  FilePath = asset.localResource("LRO_LROC_Image_Mosaic/King_Crater.vrt"),
+  FilePath = asset.resource("LRO_LROC_Image_Mosaic/King_Crater.vrt"),
   Description = [[]]
 }
 
 local treks_LRO_NAC_Mosaic_32N292E_50cmp = {
   Identifier = "LRO_NAC_Mosaic_32N292E_50cmp",
   Name = [[LRO LROC Image Mosaic, Lichtenberg Crater]],
-  FilePath = asset.localResource("LRO_LROC_Image_Mosaic/Lichtenberg_Crater.vrt"),
+  FilePath = asset.resource("LRO_LROC_Image_Mosaic/Lichtenberg_Crater.vrt"),
   Description = [[]]
 }
 
 local treks_LRO_NAC_Mosaic_36S164E_70cmp = {
   Identifier = "LRO_NAC_Mosaic_36S164E_70cmp",
   Name = [[LRO LROC Image Mosaic, Mare Ingenii]],
-  FilePath = asset.localResource("LRO_LROC_Image_Mosaic/Mare_Ingenii.vrt"),
+  FilePath = asset.resource("LRO_LROC_Image_Mosaic/Mare_Ingenii.vrt"),
   Description = [[]]
 }
 
 local treks_LRO_NAC_Mosaic_26N150E_50cmp = {
   Identifier = "LRO_NAC_Mosaic_26N150E_50cmp",
   Name = [[LRO LROC Image Mosaic, Mare Moscoviense]],
-  FilePath = asset.localResource("LRO_LROC_Image_Mosaic/Mare_Moscoviense.vrt"),
+  FilePath = asset.resource("LRO_LROC_Image_Mosaic/Mare_Moscoviense.vrt"),
   Description = [[]]
 }
 
 local treks_LRO_NAC_Mosaic_02N085E_50cmp = {
   Identifier = "LRO_NAC_Mosaic_02N085E_50cmp",
   Name = [[LRO LROC Image Mosaic, Mare Smythii]],
-  FilePath = asset.localResource("LRO_LROC_Image_Mosaic/Mare_Smythii.vrt"),
+  FilePath = asset.resource("LRO_LROC_Image_Mosaic/Mare_Smythii.vrt"),
   Description = [[]]
 }
 
 local treks_LRO_NAC_Mosaic_07N022E_50cmp = {
   Identifier = "LRO_NAC_Mosaic_07N022E_50cmp",
   Name = [[LRO LROC Image Mosaic, Mare Tranquillitatis]],
-  FilePath = asset.localResource("LRO_LROC_Image_Mosaic/Mare_Tranquillitatis.vrt"),
+  FilePath = asset.resource("LRO_LROC_Image_Mosaic/Mare_Tranquillitatis.vrt"),
   Description = [[]]
 }
 
 local treks_LRO_NAC_Mosaic_14N304E_50cmp = {
   Identifier = "LRO_NAC_Mosaic_14N304E_50cmp",
   Name = [[LRO LROC Image Mosaic, Marius Hills]],
-  FilePath = asset.localResource("LRO_LROC_Image_Mosaic/Marius_Hills.vrt"),
+  FilePath = asset.resource("LRO_LROC_Image_Mosaic/Marius_Hills.vrt"),
   Description = [[]]
 }
 
 local treks_LRO_NAC_Mosaic_16S041E_50cmp = {
   Identifier = "LRO_NAC_Mosaic_16S041E_50cmp",
   Name = [[LRO LROC Image Mosaic, Montes Pyrenaeus]],
-  FilePath = asset.localResource("LRO_LROC_Image_Mosaic/Montes_Pyrenaeus.vrt"),
+  FilePath = asset.resource("LRO_LROC_Image_Mosaic/Montes_Pyrenaeus.vrt"),
   Description = [[]]
 }
 
 local treks_LRO_NAC_Mosaic_05N000E_50cmp = {
   Identifier = "LRO_NAC_Mosaic_05N000E_50cmp",
   Name = [[LRO LROC Image Mosaic, Murchison Crater]],
-  FilePath = asset.localResource("LRO_LROC_Image_Mosaic/Murchison_Crater.vrt"),
+  FilePath = asset.resource("LRO_LROC_Image_Mosaic/Murchison_Crater.vrt"),
   Description = [[]]
 }
 
 local treks_LRO_NAC_Mosaic_26S265E_50cmp = {
   Identifier = "LRO_NAC_Mosaic_26S265E_50cmp",
   Name = [[LRO LROC Image Mosaic, Orientale 1]],
-  FilePath = asset.localResource("LRO_LROC_Image_Mosaic/Orientale_1.vrt"),
+  FilePath = asset.resource("LRO_LROC_Image_Mosaic/Orientale_1.vrt"),
   Description = [[]]
 }
 
 local treks_LRO_NAC_Mosaic_07N301E_50cmp = {
   Identifier = "LRO_NAC_Mosaic_07N301E_50cmp",
   Name = [[LRO LROC Image Mosaic, Reiner Gamma]],
-  FilePath = asset.localResource("LRO_LROC_Image_Mosaic/Reiner_Gamma.vrt"),
+  FilePath = asset.resource("LRO_LROC_Image_Mosaic/Reiner_Gamma.vrt"),
   Description = [[]]
 }
 
 local treks_LRO_NAC_Mosaic_03S286E_50cmp = {
   Identifier = "LRO_NAC_Mosaic_03S286E_50cmp",
   Name = [[LRO LROC Image Mosaic, Riccioli Crater]],
-  FilePath = asset.localResource("LRO_LROC_Image_Mosaic/Riccioli_Crater.vrt"),
+  FilePath = asset.resource("LRO_LROC_Image_Mosaic/Riccioli_Crater.vrt"),
   Description = [[]]
 }
 
 local treks_LRO_NAC_Mosaic_13N356E_50cmp = {
   Identifier = "LRO_NAC_Mosaic_13N356E_50cmp",
   Name = [[LRO LROC Image Mosaic, Rima Bode]],
-  FilePath = asset.localResource("LRO_LROC_Image_Mosaic/Rima_Bode.vrt"),
+  FilePath = asset.resource("LRO_LROC_Image_Mosaic/Rima_Bode.vrt"),
   Description = [[]]
 }
 
 local treks_LRO_NAC_Mosaic_27N318E_50cmp = {
   Identifier = "LRO_NAC_Mosaic_27N318E_50cmp",
   Name = [[LRO LROC Image Mosaic, Rimae Prinz]],
-  FilePath = asset.localResource("LRO_LROC_Image_Mosaic/Rimae_Prinz.vrt"),
+  FilePath = asset.resource("LRO_LROC_Image_Mosaic/Rimae_Prinz.vrt"),
   Description = [[]]
 }
 
 local treks_LRO_NAC_Mosaic_60S200E_50cmp = {
   Identifier = "LRO_NAC_Mosaic_60S200E_50cmp",
   Name = [[LRO LROC Image Mosaic, South Pole-Aitken Basin Interior]],
-  FilePath = asset.localResource("LRO_LROC_Image_Mosaic/South_Pole-Aitken_Basin_Interior.vrt"),
+  FilePath = asset.resource("LRO_LROC_Image_Mosaic/South_Pole-Aitken_Basin_Interior.vrt"),
   Description = [[]]
 }
 
 local treks_LRO_NAC_Mosaic_51S171E_60cmp = {
   Identifier = "LRO_NAC_Mosaic_51S171E_60cmp",
   Name = [[LRO LROC Image Mosaic, South Pole-Aitken Rim]],
-  FilePath = asset.localResource("LRO_LROC_Image_Mosaic/South_Pole-Aitken_Rim.vrt"),
+  FilePath = asset.resource("LRO_LROC_Image_Mosaic/South_Pole-Aitken_Rim.vrt"),
   Description = [[]]
 }
 
 local treks_LRO_NAC_Mosaic_02S167E_50cmp = {
   Identifier = "LRO_NAC_Mosaic_02S167E_50cmp",
   Name = [[LRO LROC Image Mosaic, Stratton (Dewar)]],
-  FilePath = asset.localResource("LRO_LROC_Image_Mosaic/Stratton_Dewar.vrt"),
+  FilePath = asset.resource("LRO_LROC_Image_Mosaic/Stratton_Dewar.vrt"),
   Description = [[]]
 }
 
 local treks_LRO_NAC_Mosaic_20N010E_60cmp = {
   Identifier = "LRO_NAC_Mosaic_20N010E_60cmp",
   Name = [[LRO LROC Image Mosaic, Sulpicius Gallus]],
-  FilePath = asset.localResource("LRO_LROC_Image_Mosaic/Sulpicius_Gallus.vrt"),
+  FilePath = asset.resource("LRO_LROC_Image_Mosaic/Sulpicius_Gallus.vrt"),
   Description = [[]]
 }
 
 local treks_LRO_NAC_Mosaic_19S129E_50cmp = {
   Identifier = "LRO_NAC_Mosaic_19S129E_50cmp",
   Name = [[LRO LROC Image Mosaic, Tsiolkovskiy Crater]],
-  FilePath = asset.localResource("LRO_LROC_Image_Mosaic/Tsiolkovskiy_Crater.vrt"),
+  FilePath = asset.resource("LRO_LROC_Image_Mosaic/Tsiolkovskiy_Crater.vrt"),
   Description = [[]]
 }
 
 local treks_LRO_NAC_Mosaic_43S349E_50cmp = {
   Identifier = "LRO_NAC_Mosaic_43S349E_50cmp",
   Name = [[LRO LROC Image Mosaic, Tycho Crater]],
-  FilePath = asset.localResource("LRO_LROC_Image_Mosaic/Tycho_Crater.vrt"),
+  FilePath = asset.resource("LRO_LROC_Image_Mosaic/Tycho_Crater.vrt"),
   Description = [[]]
 }
 
diff --git a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Image_Mosaic_26cm.asset b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Image_Mosaic_26cm.asset
index 30c20963ce..53f7ac725d 100644
--- a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Image_Mosaic_26cm.asset
+++ b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Image_Mosaic_26cm.asset
@@ -9,7 +9,7 @@ local globeIdentifier = asset.require("scene/solarsystem//planets/earth/moon/moo
 local treks_apollo11_26cm_mosaic_byte_geo_1_2_highContrast = {
   Identifier = "apollo11_26cm_mosaic_byte_geo_1_2_highContrast",
   Name = [[LRO LROC Image Mosaic 26cm, Apollo 11]],
-  FilePath = asset.localResource("LRO_LROC_Image_Mosaic_26cm/Apollo_11.vrt"),
+  FilePath = asset.resource("LRO_LROC_Image_Mosaic_26cm/Apollo_11.vrt"),
   Description = [[]]
 }
 
diff --git a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Image_Mosaic_28cm.asset b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Image_Mosaic_28cm.asset
index f86537c2f3..f97b47c66e 100644
--- a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Image_Mosaic_28cm.asset
+++ b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Image_Mosaic_28cm.asset
@@ -9,7 +9,7 @@ local globeIdentifier = asset.require("scene/solarsystem//planets/earth/moon/moo
 local treks_apollo14_28cm_mosaic_byte_geo_1_2_highContrast = {
   Identifier = "apollo14_28cm_mosaic_byte_geo_1_2_highContrast",
   Name = [[LRO LROC Image Mosaic 28cm, Apollo 14]],
-  FilePath = asset.localResource("LRO_LROC_Image_Mosaic_28cm/Apollo_14.vrt"),
+  FilePath = asset.resource("LRO_LROC_Image_Mosaic_28cm/Apollo_14.vrt"),
   Description = [[]]
 }
 
diff --git a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Mosaic.asset b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Mosaic.asset
index b5e8d0ec54..d53822c253 100644
--- a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Mosaic.asset
+++ b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Mosaic.asset
@@ -9,7 +9,7 @@ local globeIdentifier = asset.require("scene/solarsystem//planets/earth/moon/moo
 local treks_LRO_NAC_Mosaic_03N280E_70cm = {
   Identifier = "LRO_NAC_Mosaic_03N280E_70cm",
   Name = [[LRO LROC Mosaic, Fresh Crater East of Lents]],
-  FilePath = asset.localResource("LRO_LROC_Mosaic/Fresh_Crater_East_of_Lents.vrt"),
+  FilePath = asset.resource("LRO_LROC_Mosaic/Fresh_Crater_East_of_Lents.vrt"),
   Description = [[]]
 }
 
diff --git a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_NAC_Image_Mosaic.asset b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_NAC_Image_Mosaic.asset
index 1e92e14ced..ad356b216c 100644
--- a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_NAC_Image_Mosaic.asset
+++ b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_NAC_Image_Mosaic.asset
@@ -9,14 +9,14 @@ local globeIdentifier = asset.require("scene/solarsystem//planets/earth/moon/moo
 local treks_LRO_NAC_AvgMosaic_NPole855_1mp_EQ = {
   Identifier = "LRO_NAC_AvgMosaic_NPole855_1mp_EQ",
   Name = [[LRO LROC NAC Image Mosaic, N Pole, Avg Merge]],
-  FilePath = asset.localResource("LRO_LROC_NAC_Image_Mosaic/N_Pole.vrt"),
+  FilePath = asset.resource("LRO_LROC_NAC_Image_Mosaic/N_Pole.vrt"),
   Description = [[This is a visible image mosaic generated using Lunar Reconnaissance Orbiter Camera (LROC) Narrow Angle Camera (NAC) images from the Lunar Reconnaissance Orbiter mission. The images were orthorectified using LRO's Lunar Orbiter Laser Altimeter (LOLA) polar 5 meter/pixel DEM. The mosaic is generated at half the resolution at which the individual LROC NAC images were gathered, which is approximately 0.5 meters/pixel. The mosaic was registered horizontally to the LOLA global DEM.]]
 }
 
 local treks_LRO_NAC_AvgMosaic_SPole855_1mp_EQ = {
   Identifier = "LRO_NAC_AvgMosaic_SPole855_1mp_EQ",
   Name = [[LRO LROC NAC Image Mosaic, S Pole, Avg Merge]],
-  FilePath = asset.localResource("LRO_LROC_NAC_Image_Mosaic/S_Pole.vrt"),
+  FilePath = asset.resource("LRO_LROC_NAC_Image_Mosaic/S_Pole.vrt"),
   Description = [[This is a visible image mosaic generated using Lunar Reconnaissance Orbiter Camera (LROC) Narrow Angle Camera (NAC) images from the Lunar Reconnaissance Orbiter mission. The images were orthorectified using LRO's Lunar Orbiter Laser Altimeter (LOLA) polar 5 meter/pixel DEM. The mosaic is generated at half the resolution at which the individual LROC NAC images were gathered, which is approximately 0.5 meters/pixel. The mosaic was registered horizontally to the LOLA global DEM.]]
 }
 
diff --git a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Rock_Abundance.asset b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Rock_Abundance.asset
index d0a7610fad..f5335fc558 100644
--- a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Rock_Abundance.asset
+++ b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Rock_Abundance.asset
@@ -9,161 +9,161 @@ local globeIdentifier = asset.require("scene/solarsystem//planets/earth/moon/moo
 local treks_LRO_NAC_RockAbnd_17S173E_150cmp = {
   Identifier = "LRO_NAC_RockAbnd_17S173E_150cmp",
   Name = [[LRO LROC Rock Abundance, Aitken Crater]],
-  FilePath = asset.localResource("LRO_LROC_Rock_Abundance/Aitken_Crater.vrt"),
+  FilePath = asset.resource("LRO_LROC_Rock_Abundance/Aitken_Crater.vrt"),
   Description = [[]]
 }
 
 local treks_LRO_NAC_RockAbnd_13S358E_2mp = {
   Identifier = "LRO_NAC_RockAbnd_13S358E_2mp",
   Name = [[LRO LROC Rock Abundance, Alphonsus Crater]],
-  FilePath = asset.localResource("LRO_LROC_Rock_Abundance/Alphonsus_Crater.vrt"),
+  FilePath = asset.resource("LRO_LROC_Rock_Abundance/Alphonsus_Crater.vrt"),
   Description = [[]]
 }
 
 local treks_LRO_NAC_RockAbnd_73N350E_150cmp = {
   Identifier = "LRO_NAC_RockAbnd_73N350E_150cmp",
   Name = [[LRO LROC Rock Abundance, Anaxagoras Crater]],
-  FilePath = asset.localResource("LRO_LROC_Rock_Abundance/Anaxagoras_Crater.vrt"),
+  FilePath = asset.resource("LRO_LROC_Rock_Abundance/Anaxagoras_Crater.vrt"),
   Description = [[]]
 }
 
 local treks_LRO_NAC_RockAbnd_26N004E_150cmp = {
   Identifier = "LRO_NAC_RockAbnd_26N004E_150cmp",
   Name = [[LRO LROC Rock Abundance, Apollo 15]],
-  FilePath = asset.localResource("LRO_LROC_Rock_Abundance/Apollo_15.vrt"),
+  FilePath = asset.resource("LRO_LROC_Rock_Abundance/Apollo_15.vrt"),
   Description = [[]]
 }
 
 local treks_LRO_NAC_RockAbnd_09S015E_150cmp = {
   Identifier = "LRO_NAC_RockAbnd_09S015E_150cmp",
   Name = [[LRO LROC Rock Abundance, Apollo 16]],
-  FilePath = asset.localResource("LRO_LROC_Rock_Abundance/Apollo_16.vrt"),
+  FilePath = asset.resource("LRO_LROC_Rock_Abundance/Apollo_16.vrt"),
   Description = [[]]
 }
 
 local treks_LRO_NAC_RockAbnd_37S206E_150cmp = {
   Identifier = "LRO_NAC_RockAbnd_37S206E_150cmp",
   Name = [[LRO LROC Rock Abundance, Apollo Basin]],
-  FilePath = asset.localResource("LRO_LROC_Rock_Abundance/Apollo_Basin.vrt"),
+  FilePath = asset.resource("LRO_LROC_Rock_Abundance/Apollo_Basin.vrt"),
   Description = [[]]
 }
 
 local treks_LRO_NAC_RockAbnd_25N311E_2mp = {
   Identifier = "LRO_NAC_RockAbnd_25N311E_2mp",
   Name = [[LRO LROC Rock Abundance, Aristarchus 1]],
-  FilePath = asset.localResource("LRO_LROC_Rock_Abundance/Aristarchus_1.vrt"),
+  FilePath = asset.resource("LRO_LROC_Rock_Abundance/Aristarchus_1.vrt"),
   Description = [[]]
 }
 
 local treks_LRO_NAC_RockAbnd_28N307E_150cmp = {
   Identifier = "LRO_NAC_RockAbnd_28N307E_150cmp",
   Name = [[LRO LROC Rock Abundance, Aristarchus 2]],
-  FilePath = asset.localResource("LRO_LROC_Rock_Abundance/Aristarchus_2.vrt"),
+  FilePath = asset.resource("LRO_LROC_Rock_Abundance/Aristarchus_2.vrt"),
   Description = [[]]
 }
 
 local treks_LRO_NAC_RockAbnd_19S070E_150cmp = {
   Identifier = "LRO_NAC_RockAbnd_19S070E_150cmp",
   Name = [[LRO LROC Rock Abundance, Balmer Basin]],
-  FilePath = asset.localResource("LRO_LROC_Rock_Abundance/Balmer_Basin.vrt"),
+  FilePath = asset.resource("LRO_LROC_Rock_Abundance/Balmer_Basin.vrt"),
   Description = [[]]
 }
 
 local treks_LRO_NAC_RockAbnd_20S337E_400cmp = {
   Identifier = "LRO_NAC_RockAbnd_20S337E_400cmp",
   Name = [[LRO LROC Rock Abundance, Bullialdus Crater]],
-  FilePath = asset.localResource("LRO_LROC_Rock_Abundance/Bullialdus_Crater.vrt"),
+  FilePath = asset.resource("LRO_LROC_Rock_Abundance/Bullialdus_Crater.vrt"),
   Description = [[]]
 }
 
 local treks_LRO_NAC_RockAbnd_36N320E_2mp = {
   Identifier = "LRO_NAC_RockAbnd_36N320E_2mp",
   Name = [[LRO LROC Rock Abundance, Gruithuisen Domes]],
-  FilePath = asset.localResource("LRO_LROC_Rock_Abundance/Gruithuisen_Domes.vrt"),
+  FilePath = asset.resource("LRO_LROC_Rock_Abundance/Gruithuisen_Domes.vrt"),
   Description = [[]]
 }
 
 local treks_LRO_NAC_RockAbnd_00N234E_150cmp = {
   Identifier = "LRO_NAC_RockAbnd_00N234E_150cmp",
   Name = [[LRO LROC Rock Abundance, Hertzsprung]],
-  FilePath = asset.localResource("LRO_LROC_Rock_Abundance/Hertzsprung.vrt"),
+  FilePath = asset.resource("LRO_LROC_Rock_Abundance/Hertzsprung.vrt"),
   Description = [[]]
 }
 
 local treks_LRO_NAC_RockAbnd_08N332E_2mp = {
   Identifier = "LRO_NAC_RockAbnd_08N332E_2mp",
   Name = [[LRO LROC Rock Abundance, Hortensius Domes]],
-  FilePath = asset.localResource("LRO_LROC_Rock_Abundance/Hortensius_Domes.vrt"),
+  FilePath = asset.resource("LRO_LROC_Rock_Abundance/Hortensius_Domes.vrt"),
   Description = [[]]
 }
 
 local treks_LRO_NAC_RockAbnd_06N120E_200cmp = {
   Identifier = "LRO_NAC_RockAbnd_06N120E_200cmp",
   Name = [[LRO LROC Rock Abundance, King Crater]],
-  FilePath = asset.localResource("LRO_LROC_Rock_Abundance/King_Crater.vrt"),
+  FilePath = asset.resource("LRO_LROC_Rock_Abundance/King_Crater.vrt"),
   Description = [[]]
 }
 
 local treks_LRO_NAC_RockAbnd_32N292E_2mp = {
   Identifier = "LRO_NAC_RockAbnd_32N292E_2mp",
   Name = [[LRO LROC Rock Abundance, Lichtenberg Crater]],
-  FilePath = asset.localResource("LRO_LROC_Rock_Abundance/Lichtenberg_Crater.vrt"),
+  FilePath = asset.resource("LRO_LROC_Rock_Abundance/Lichtenberg_Crater.vrt"),
   Description = [[]]
 }
 
 local treks_LRO_NAC_RockAbnd_10N058E_150cmp = {
   Identifier = "LRO_NAC_RockAbnd_10N058E_150cmp",
   Name = [[LRO LROC Rock Abundance, Mare Crisium]],
-  FilePath = asset.localResource("LRO_LROC_Rock_Abundance/Mare_Crisium.vrt"),
+  FilePath = asset.resource("LRO_LROC_Rock_Abundance/Mare_Crisium.vrt"),
   Description = [[]]
 }
 
 local treks_LRO_NAC_RockAbnd_16S041E_150cmp = {
   Identifier = "LRO_NAC_RockAbnd_16S041E_150cmp",
   Name = [[LRO LROC Rock Abundance, Montes Pyrenaeus]],
-  FilePath = asset.localResource("LRO_LROC_Rock_Abundance/Montes_Pyrenaeus.vrt"),
+  FilePath = asset.resource("LRO_LROC_Rock_Abundance/Montes_Pyrenaeus.vrt"),
   Description = [[]]
 }
 
 local treks_LRO_NAC_RockAbnd_26S265E_200cmp = {
   Identifier = "LRO_NAC_RockAbnd_26S265E_200cmp",
   Name = [[LRO LROC Rock Abundance, Orientale 1]],
-  FilePath = asset.localResource("LRO_LROC_Rock_Abundance/Orientale_1.vrt"),
+  FilePath = asset.resource("LRO_LROC_Rock_Abundance/Orientale_1.vrt"),
   Description = [[]]
 }
 
 local treks_LRO_NAC_RockAbnd_53N354E_150cmp = {
   Identifier = "LRO_NAC_RockAbnd_53N354E_150cmp",
   Name = [[LRO LROC Rock Abundance, Plato Ejecta]],
-  FilePath = asset.localResource("LRO_LROC_Rock_Abundance/Plato_Ejecta.vrt"),
+  FilePath = asset.resource("LRO_LROC_Rock_Abundance/Plato_Ejecta.vrt"),
   Description = [[]]
 }
 
 local treks_LRO_NAC_RockAbnd_60S200E_150cmp = {
   Identifier = "LRO_NAC_RockAbnd_60S200E_150cmp",
   Name = [[LRO LROC Rock Abundance, South Pole-Aitken Basin Interior]],
-  FilePath = asset.localResource("LRO_LROC_Rock_Abundance/South_Pole-Aitken_Basin_Interior.vrt"),
+  FilePath = asset.resource("LRO_LROC_Rock_Abundance/South_Pole-Aitken_Basin_Interior.vrt"),
   Description = [[]]
 }
 
 local treks_LRO_NAC_RockAbnd_02S167E_150cmp = {
   Identifier = "LRO_NAC_RockAbnd_02S167E_150cmp",
   Name = [[LRO LROC Rock Abundance, Stratton (Dewar) High Fe Anomaly]],
-  FilePath = asset.localResource("LRO_LROC_Rock_Abundance/Stratton_Dewar_High_Fe_Anomaly.vrt"),
+  FilePath = asset.resource("LRO_LROC_Rock_Abundance/Stratton_Dewar_High_Fe_Anomaly.vrt"),
   Description = [[]]
 }
 
 local treks_LRO_NAC_RockAbnd_20N010E_2mp = {
   Identifier = "LRO_NAC_RockAbnd_20N010E_2mp",
   Name = [[LRO LROC Rock Abundance, Sulpicius Gallus]],
-  FilePath = asset.localResource("LRO_LROC_Rock_Abundance/Sulpicius_Gallus.vrt"),
+  FilePath = asset.resource("LRO_LROC_Rock_Abundance/Sulpicius_Gallus.vrt"),
   Description = [[]]
 }
 
 local treks_LRO_NAC_RockAbnd_43S349E_150cmp = {
   Identifier = "LRO_NAC_RockAbnd_43S349E_150cmp",
   Name = [[LRO LROC Rock Abundance, Tycho Crater]],
-  FilePath = asset.localResource("LRO_LROC_Rock_Abundance/Tycho_Crater.vrt"),
+  FilePath = asset.resource("LRO_LROC_Rock_Abundance/Tycho_Crater.vrt"),
   Description = [[]]
 }
 
diff --git a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Rock_Abundance_Hazard.asset b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Rock_Abundance_Hazard.asset
index 164674befb..e038350169 100644
--- a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Rock_Abundance_Hazard.asset
+++ b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Rock_Abundance_Hazard.asset
@@ -9,161 +9,161 @@ local globeIdentifier = asset.require("scene/solarsystem//planets/earth/moon/moo
 local treks_LRO_NAC_RockAbndHaz_17S173E_150cmp = {
   Identifier = "LRO_NAC_RockAbndHaz_17S173E_150cmp",
   Name = [[LRO LROC Rock Abundance Hazard, Aitken Crater]],
-  FilePath = asset.localResource("LRO_LROC_Rock_Abundance_Hazard/Aitken_Crater.vrt"),
+  FilePath = asset.resource("LRO_LROC_Rock_Abundance_Hazard/Aitken_Crater.vrt"),
   Description = [[]]
 }
 
 local treks_LRO_NAC_RockAbndHaz_13S358E_2mp = {
   Identifier = "LRO_NAC_RockAbndHaz_13S358E_2mp",
   Name = [[LRO LROC Rock Abundance Hazard, Alphonsus Crater]],
-  FilePath = asset.localResource("LRO_LROC_Rock_Abundance_Hazard/Alphonsus_Crater.vrt"),
+  FilePath = asset.resource("LRO_LROC_Rock_Abundance_Hazard/Alphonsus_Crater.vrt"),
   Description = [[]]
 }
 
 local treks_LRO_NAC_RockAbndHaz_73N350E_150cmp = {
   Identifier = "LRO_NAC_RockAbndHaz_73N350E_150cmp",
   Name = [[LRO LROC Rock Abundance Hazard, Anaxagoras Crater]],
-  FilePath = asset.localResource("LRO_LROC_Rock_Abundance_Hazard/Anaxagoras_Crater.vrt"),
+  FilePath = asset.resource("LRO_LROC_Rock_Abundance_Hazard/Anaxagoras_Crater.vrt"),
   Description = [[]]
 }
 
 local treks_LRO_NAC_RockAbndHaz_26N004E_150cmp = {
   Identifier = "LRO_NAC_RockAbndHaz_26N004E_150cmp",
   Name = [[LRO LROC Rock Abundance Hazard, Apollo 15]],
-  FilePath = asset.localResource("LRO_LROC_Rock_Abundance_Hazard/Apollo_15.vrt"),
+  FilePath = asset.resource("LRO_LROC_Rock_Abundance_Hazard/Apollo_15.vrt"),
   Description = [[]]
 }
 
 local treks_LRO_NAC_RockAbndHaz_09S015E_150cmp = {
   Identifier = "LRO_NAC_RockAbndHaz_09S015E_150cmp",
   Name = [[LRO LROC Rock Abundance Hazard, Apollo 16]],
-  FilePath = asset.localResource("LRO_LROC_Rock_Abundance_Hazard/Apollo_16.vrt"),
+  FilePath = asset.resource("LRO_LROC_Rock_Abundance_Hazard/Apollo_16.vrt"),
   Description = [[]]
 }
 
 local treks_LRO_NAC_RockAbndHaz_37S206E_150cmp = {
   Identifier = "LRO_NAC_RockAbndHaz_37S206E_150cmp",
   Name = [[LRO LROC Rock Abundance Hazard, Apollo Basin]],
-  FilePath = asset.localResource("LRO_LROC_Rock_Abundance_Hazard/Apollo_Basin.vrt"),
+  FilePath = asset.resource("LRO_LROC_Rock_Abundance_Hazard/Apollo_Basin.vrt"),
   Description = [[]]
 }
 
 local treks_LRO_NAC_RockAbndHaz_25N311E_2mp = {
   Identifier = "LRO_NAC_RockAbndHaz_25N311E_2mp",
   Name = [[LRO LROC Rock Abundance Hazard, Aristarchus 1]],
-  FilePath = asset.localResource("LRO_LROC_Rock_Abundance_Hazard/Aristarchus_1.vrt"),
+  FilePath = asset.resource("LRO_LROC_Rock_Abundance_Hazard/Aristarchus_1.vrt"),
   Description = [[]]
 }
 
 local treks_LRO_NAC_RockAbndHaz_28N307E_150cmp = {
   Identifier = "LRO_NAC_RockAbndHaz_28N307E_150cmp",
   Name = [[LRO LROC Rock Abundance Hazard, Aristarchus 2]],
-  FilePath = asset.localResource("LRO_LROC_Rock_Abundance_Hazard/Aristarchus_2.vrt"),
+  FilePath = asset.resource("LRO_LROC_Rock_Abundance_Hazard/Aristarchus_2.vrt"),
   Description = [[]]
 }
 
 local treks_LRO_NAC_RockAbndHaz_19S070E_150cmp = {
   Identifier = "LRO_NAC_RockAbndHaz_19S070E_150cmp",
   Name = [[LRO LROC Rock Abundance Hazard, Balmer Basin]],
-  FilePath = asset.localResource("LRO_LROC_Rock_Abundance_Hazard/Balmer_Basin.vrt"),
+  FilePath = asset.resource("LRO_LROC_Rock_Abundance_Hazard/Balmer_Basin.vrt"),
   Description = [[]]
 }
 
 local treks_LRO_NAC_RockAbndHaz_20S337E_400cmp = {
   Identifier = "LRO_NAC_RockAbndHaz_20S337E_400cmp",
   Name = [[LRO LROC Rock Abundance Hazard, Bullialdus Crater]],
-  FilePath = asset.localResource("LRO_LROC_Rock_Abundance_Hazard/Bullialdus_Crater.vrt"),
+  FilePath = asset.resource("LRO_LROC_Rock_Abundance_Hazard/Bullialdus_Crater.vrt"),
   Description = [[]]
 }
 
 local treks_LRO_NAC_RockAbndHaz_36N320E_2mp = {
   Identifier = "LRO_NAC_RockAbndHaz_36N320E_2mp",
   Name = [[LRO LROC Rock Abundance Hazard, Gruithuisen Domes]],
-  FilePath = asset.localResource("LRO_LROC_Rock_Abundance_Hazard/Gruithuisen_Domes.vrt"),
+  FilePath = asset.resource("LRO_LROC_Rock_Abundance_Hazard/Gruithuisen_Domes.vrt"),
   Description = [[]]
 }
 
 local treks_LRO_NAC_RockAbndHaz_00N234E_150cmp = {
   Identifier = "LRO_NAC_RockAbndHaz_00N234E_150cmp",
   Name = [[LRO LROC Rock Abundance Hazard, Hertzsprung]],
-  FilePath = asset.localResource("LRO_LROC_Rock_Abundance_Hazard/Hertzsprung.vrt"),
+  FilePath = asset.resource("LRO_LROC_Rock_Abundance_Hazard/Hertzsprung.vrt"),
   Description = [[]]
 }
 
 local treks_LRO_NAC_RockAbndHaz_08N332E_2mp = {
   Identifier = "LRO_NAC_RockAbndHaz_08N332E_2mp",
   Name = [[LRO LROC Rock Abundance Hazard, Hortensius Domes]],
-  FilePath = asset.localResource("LRO_LROC_Rock_Abundance_Hazard/Hortensius_Domes.vrt"),
+  FilePath = asset.resource("LRO_LROC_Rock_Abundance_Hazard/Hortensius_Domes.vrt"),
   Description = [[]]
 }
 
 local treks_LRO_NAC_RockAbndHaz_06N120E_200cmp = {
   Identifier = "LRO_NAC_RockAbndHaz_06N120E_200cmp",
   Name = [[LRO LROC Rock Abundance Hazard, King Crater]],
-  FilePath = asset.localResource("LRO_LROC_Rock_Abundance_Hazard/King_Crater.vrt"),
+  FilePath = asset.resource("LRO_LROC_Rock_Abundance_Hazard/King_Crater.vrt"),
   Description = [[]]
 }
 
 local treks_LRO_NAC_RockAbndHaz_32N292E_2mp = {
   Identifier = "LRO_NAC_RockAbndHaz_32N292E_2mp",
   Name = [[LRO LROC Rock Abundance Hazard, Lichtenberg Crater]],
-  FilePath = asset.localResource("LRO_LROC_Rock_Abundance_Hazard/Lichtenberg_Crater.vrt"),
+  FilePath = asset.resource("LRO_LROC_Rock_Abundance_Hazard/Lichtenberg_Crater.vrt"),
   Description = [[]]
 }
 
 local treks_LRO_NAC_RockAbndHaz_10N058E_150cmp = {
   Identifier = "LRO_NAC_RockAbndHaz_10N058E_150cmp",
   Name = [[LRO LROC Rock Abundance Hazard, Mare Crisium]],
-  FilePath = asset.localResource("LRO_LROC_Rock_Abundance_Hazard/Mare_Crisium.vrt"),
+  FilePath = asset.resource("LRO_LROC_Rock_Abundance_Hazard/Mare_Crisium.vrt"),
   Description = [[]]
 }
 
 local treks_LRO_NAC_RockAbndHaz_16S041E_150cmp = {
   Identifier = "LRO_NAC_RockAbndHaz_16S041E_150cmp",
   Name = [[LRO LROC Rock Abundance Hazard, Montes Pyrenaeus]],
-  FilePath = asset.localResource("LRO_LROC_Rock_Abundance_Hazard/Montes_Pyrenaeus.vrt"),
+  FilePath = asset.resource("LRO_LROC_Rock_Abundance_Hazard/Montes_Pyrenaeus.vrt"),
   Description = [[]]
 }
 
 local treks_LRO_NAC_RockAbndHaz_26S265E_200cmp = {
   Identifier = "LRO_NAC_RockAbndHaz_26S265E_200cmp",
   Name = [[LRO LROC Rock Abundance Hazard, Orientale 1]],
-  FilePath = asset.localResource("LRO_LROC_Rock_Abundance_Hazard/Orientale_1.vrt"),
+  FilePath = asset.resource("LRO_LROC_Rock_Abundance_Hazard/Orientale_1.vrt"),
   Description = [[]]
 }
 
 local treks_LRO_NAC_RockAbndHaz_53N354E_150cmp = {
   Identifier = "LRO_NAC_RockAbndHaz_53N354E_150cmp",
   Name = [[LRO LROC Rock Abundance Hazard, Plato Ejecta]],
-  FilePath = asset.localResource("LRO_LROC_Rock_Abundance_Hazard/Plato_Ejecta.vrt"),
+  FilePath = asset.resource("LRO_LROC_Rock_Abundance_Hazard/Plato_Ejecta.vrt"),
   Description = [[]]
 }
 
 local treks_LRO_NAC_RockAbndHaz_60S200E_150cmp = {
   Identifier = "LRO_NAC_RockAbndHaz_60S200E_150cmp",
   Name = [[LRO LROC Rock Abundance Hazard, South Pole-Aitken Basin Interior]],
-  FilePath = asset.localResource("LRO_LROC_Rock_Abundance_Hazard/South_Pole-Aitken_Basin_Interior.vrt"),
+  FilePath = asset.resource("LRO_LROC_Rock_Abundance_Hazard/South_Pole-Aitken_Basin_Interior.vrt"),
   Description = [[]]
 }
 
 local treks_LRO_NAC_RockAbndHaz_02S167E_150cmp = {
   Identifier = "LRO_NAC_RockAbndHaz_02S167E_150cmp",
   Name = [[LRO LROC Rock Abundance Hazard, Stratton (Dewar) High Fe Anomaly]],
-  FilePath = asset.localResource("LRO_LROC_Rock_Abundance_Hazard/Stratton_Dewar_High_Fe_Anomaly.vrt"),
+  FilePath = asset.resource("LRO_LROC_Rock_Abundance_Hazard/Stratton_Dewar_High_Fe_Anomaly.vrt"),
   Description = [[]]
 }
 
 local treks_LRO_NAC_RockAbndHaz_20N010E_2mp = {
   Identifier = "LRO_NAC_RockAbndHaz_20N010E_2mp",
   Name = [[LRO LROC Rock Abundance Hazard, Sulpicius Gallus]],
-  FilePath = asset.localResource("LRO_LROC_Rock_Abundance_Hazard/Sulpicius_Gallus.vrt"),
+  FilePath = asset.resource("LRO_LROC_Rock_Abundance_Hazard/Sulpicius_Gallus.vrt"),
   Description = [[]]
 }
 
 local treks_LRO_NAC_RockAbndHaz_43S349E_150cmp = {
   Identifier = "LRO_NAC_RockAbndHaz_43S349E_150cmp",
   Name = [[LRO LROC Rock Abundance Hazard, Tycho Crater]],
-  FilePath = asset.localResource("LRO_LROC_Rock_Abundance_Hazard/Tycho_Crater.vrt"),
+  FilePath = asset.resource("LRO_LROC_Rock_Abundance_Hazard/Tycho_Crater.vrt"),
   Description = [[]]
 }
 
diff --git a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Rock_Density.asset b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Rock_Density.asset
index f24a52ba9f..75a5f16111 100644
--- a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Rock_Density.asset
+++ b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Rock_Density.asset
@@ -9,168 +9,168 @@ local globeIdentifier = asset.require("scene/solarsystem//planets/earth/moon/moo
 local treks_LRO_NAC_RockDen_17S173E_150cmp = {
   Identifier = "LRO_NAC_RockDen_17S173E_150cmp",
   Name = [[LRO LROC Rock Density, Aitken Crater]],
-  FilePath = asset.localResource("LRO_LROC_Rock_Density/Aitken_Crater.vrt"),
+  FilePath = asset.resource("LRO_LROC_Rock_Density/Aitken_Crater.vrt"),
   Description = [[]]
 }
 
 local treks_LRO_NAC_RockDen_13S358E_2mp = {
   Identifier = "LRO_NAC_RockDen_13S358E_2mp",
   Name = [[LRO LROC Rock Density, Alphonsus Crater]],
-  FilePath = asset.localResource("LRO_LROC_Rock_Density/Alphonsus_Crater.vrt"),
+  FilePath = asset.resource("LRO_LROC_Rock_Density/Alphonsus_Crater.vrt"),
   Description = [[]]
 }
 
 local treks_LRO_NAC_RockDen_73N350E_150cmp = {
   Identifier = "LRO_NAC_RockDen_73N350E_150cmp",
   Name = [[LRO LROC Rock Density, Anaxagoras Crater]],
-  FilePath = asset.localResource("LRO_LROC_Rock_Density/Anaxagoras_Crater.vrt"),
+  FilePath = asset.resource("LRO_LROC_Rock_Density/Anaxagoras_Crater.vrt"),
   Description = [[]]
 }
 
 local treks_LRO_NAC_RockDen_26N004E_150cmp = {
   Identifier = "LRO_NAC_RockDen_26N004E_150cmp",
   Name = [[LRO LROC Rock Density, Apollo 15]],
-  FilePath = asset.localResource("LRO_LROC_Rock_Density/Apollo_15.vrt"),
+  FilePath = asset.resource("LRO_LROC_Rock_Density/Apollo_15.vrt"),
   Description = [[]]
 }
 
 local treks_LRO_NAC_RockDen_09S015E_150cmp = {
   Identifier = "LRO_NAC_RockDen_09S015E_150cmp",
   Name = [[LRO LROC Rock Density, Apollo 16]],
-  FilePath = asset.localResource("LRO_LROC_Rock_Density/Apollo_16.vrt"),
+  FilePath = asset.resource("LRO_LROC_Rock_Density/Apollo_16.vrt"),
   Description = [[]]
 }
 
 local treks_LRO_NAC_RockDen_37S206E_150cmp = {
   Identifier = "LRO_NAC_RockDen_37S206E_150cmp",
   Name = [[LRO LROC Rock Density, Apollo Basin]],
-  FilePath = asset.localResource("LRO_LROC_Rock_Density/Apollo_Basin.vrt"),
+  FilePath = asset.resource("LRO_LROC_Rock_Density/Apollo_Basin.vrt"),
   Description = [[]]
 }
 
 local treks_LRO_NAC_RockDen_25N311E_2mp = {
   Identifier = "LRO_NAC_RockDen_25N311E_2mp",
   Name = [[LRO LROC Rock Density, Aristarchus 1]],
-  FilePath = asset.localResource("LRO_LROC_Rock_Density/Aristarchus_1.vrt"),
+  FilePath = asset.resource("LRO_LROC_Rock_Density/Aristarchus_1.vrt"),
   Description = [[]]
 }
 
 local treks_LRO_NAC_RockDen_28N307E_150cmp = {
   Identifier = "LRO_NAC_RockDen_28N307E_150cmp",
   Name = [[LRO LROC Rock Density, Aristarchus 2]],
-  FilePath = asset.localResource("LRO_LROC_Rock_Density/Aristarchus_2.vrt"),
+  FilePath = asset.resource("LRO_LROC_Rock_Density/Aristarchus_2.vrt"),
   Description = [[]]
 }
 
 local treks_LRO_NAC_RockDen_19S070E_150cmp = {
   Identifier = "LRO_NAC_RockDen_19S070E_150cmp",
   Name = [[LRO LROC Rock Density, Balmer Basin]],
-  FilePath = asset.localResource("LRO_LROC_Rock_Density/Balmer_Basin.vrt"),
+  FilePath = asset.resource("LRO_LROC_Rock_Density/Balmer_Basin.vrt"),
   Description = [[]]
 }
 
 local treks_LRO_NAC_RockDen_20S337E_400cmp = {
   Identifier = "LRO_NAC_RockDen_20S337E_400cmp",
   Name = [[LRO LROC Rock Density, Bullialdus Crater]],
-  FilePath = asset.localResource("LRO_LROC_Rock_Density/Bullialdus_Crater.vrt"),
+  FilePath = asset.resource("LRO_LROC_Rock_Density/Bullialdus_Crater.vrt"),
   Description = [[]]
 }
 
 local treks_LRO_NAC_RockDen_36N320E_2mp = {
   Identifier = "LRO_NAC_RockDen_36N320E_2mp",
   Name = [[LRO LROC Rock Density, Gruithuisen Domes]],
-  FilePath = asset.localResource("LRO_LROC_Rock_Density/Gruithuisen_Domes.vrt"),
+  FilePath = asset.resource("LRO_LROC_Rock_Density/Gruithuisen_Domes.vrt"),
   Description = [[]]
 }
 
 local treks_LRO_NAC_RockDenHaz_17S173E_150cmp = {
   Identifier = "LRO_NAC_RockDenHaz_17S173E_150cmp",
   Name = [[LRO LROC Rock Density, Hazard Aitken Crater]],
-  FilePath = asset.localResource("LRO_LROC_Rock_Density/Hazard_Aitken_Crater.vrt"),
+  FilePath = asset.resource("LRO_LROC_Rock_Density/Hazard_Aitken_Crater.vrt"),
   Description = [[]]
 }
 
 local treks_LRO_NAC_RockDen_00N234E_150cmp = {
   Identifier = "LRO_NAC_RockDen_00N234E_150cmp",
   Name = [[LRO LROC Rock Density, Hertzsprung]],
-  FilePath = asset.localResource("LRO_LROC_Rock_Density/Hertzsprung.vrt"),
+  FilePath = asset.resource("LRO_LROC_Rock_Density/Hertzsprung.vrt"),
   Description = [[]]
 }
 
 local treks_LRO_NAC_RockDen_08N332E_2mp = {
   Identifier = "LRO_NAC_RockDen_08N332E_2mp",
   Name = [[LRO LROC Rock Density, Hortensius Domes]],
-  FilePath = asset.localResource("LRO_LROC_Rock_Density/Hortensius_Domes.vrt"),
+  FilePath = asset.resource("LRO_LROC_Rock_Density/Hortensius_Domes.vrt"),
   Description = [[]]
 }
 
 local treks_LRO_NAC_RockDen_06N120E_200cmp = {
   Identifier = "LRO_NAC_RockDen_06N120E_200cmp",
   Name = [[LRO LROC Rock Density, King Crater]],
-  FilePath = asset.localResource("LRO_LROC_Rock_Density/King_Crater.vrt"),
+  FilePath = asset.resource("LRO_LROC_Rock_Density/King_Crater.vrt"),
   Description = [[]]
 }
 
 local treks_LRO_NAC_RockDen_32N292E_2mp = {
   Identifier = "LRO_NAC_RockDen_32N292E_2mp",
   Name = [[LRO LROC Rock Density, Lichtenberg Crater]],
-  FilePath = asset.localResource("LRO_LROC_Rock_Density/Lichtenberg_Crater.vrt"),
+  FilePath = asset.resource("LRO_LROC_Rock_Density/Lichtenberg_Crater.vrt"),
   Description = [[]]
 }
 
 local treks_LRO_NAC_RockDen_10N058E_150cmp = {
   Identifier = "LRO_NAC_RockDen_10N058E_150cmp",
   Name = [[LRO LROC Rock Density, Mare Crisium]],
-  FilePath = asset.localResource("LRO_LROC_Rock_Density/Mare_Crisium.vrt"),
+  FilePath = asset.resource("LRO_LROC_Rock_Density/Mare_Crisium.vrt"),
   Description = [[]]
 }
 
 local treks_LRO_NAC_RockDen_16S041E_150cmp = {
   Identifier = "LRO_NAC_RockDen_16S041E_150cmp",
   Name = [[LRO LROC Rock Density, Montes Pyrenaeus]],
-  FilePath = asset.localResource("LRO_LROC_Rock_Density/Montes_Pyrenaeus.vrt"),
+  FilePath = asset.resource("LRO_LROC_Rock_Density/Montes_Pyrenaeus.vrt"),
   Description = [[]]
 }
 
 local treks_LRO_NAC_RockDen_26S265E_200cmp = {
   Identifier = "LRO_NAC_RockDen_26S265E_200cmp",
   Name = [[LRO LROC Rock Density, Orientale 1]],
-  FilePath = asset.localResource("LRO_LROC_Rock_Density/Orientale_1.vrt"),
+  FilePath = asset.resource("LRO_LROC_Rock_Density/Orientale_1.vrt"),
   Description = [[]]
 }
 
 local treks_LRO_NAC_RockDen_53N354E_150cmp = {
   Identifier = "LRO_NAC_RockDen_53N354E_150cmp",
   Name = [[LRO LROC Rock Density, Plato Ejecta]],
-  FilePath = asset.localResource("LRO_LROC_Rock_Density/Plato_Ejecta.vrt"),
+  FilePath = asset.resource("LRO_LROC_Rock_Density/Plato_Ejecta.vrt"),
   Description = [[]]
 }
 
 local treks_LRO_NAC_RockDen_60S200E_150cmp = {
   Identifier = "LRO_NAC_RockDen_60S200E_150cmp",
   Name = [[LRO LROC Rock Density, South Pole-Aitken Basin Interior]],
-  FilePath = asset.localResource("LRO_LROC_Rock_Density/South_Pole-Aitken_Basin_Interior.vrt"),
+  FilePath = asset.resource("LRO_LROC_Rock_Density/South_Pole-Aitken_Basin_Interior.vrt"),
   Description = [[]]
 }
 
 local treks_LRO_NAC_RockDen_02S167E_150cmp = {
   Identifier = "LRO_NAC_RockDen_02S167E_150cmp",
   Name = [[LRO LROC Rock Density, Stratton (Dewar) High Fe Anomaly]],
-  FilePath = asset.localResource("LRO_LROC_Rock_Density/Stratton_Dewar_High_Fe_Anomaly.vrt"),
+  FilePath = asset.resource("LRO_LROC_Rock_Density/Stratton_Dewar_High_Fe_Anomaly.vrt"),
   Description = [[]]
 }
 
 local treks_LRO_NAC_RockDen_20N010E_2mp = {
   Identifier = "LRO_NAC_RockDen_20N010E_2mp",
   Name = [[LRO LROC Rock Density, Sulpicius Gallus]],
-  FilePath = asset.localResource("LRO_LROC_Rock_Density/Sulpicius_Gallus.vrt"),
+  FilePath = asset.resource("LRO_LROC_Rock_Density/Sulpicius_Gallus.vrt"),
   Description = [[]]
 }
 
 local treks_LRO_NAC_RockDen_43S349E_150cmp = {
   Identifier = "LRO_NAC_RockDen_43S349E_150cmp",
   Name = [[LRO LROC Rock Density, Tycho Crater]],
-  FilePath = asset.localResource("LRO_LROC_Rock_Density/Tycho_Crater.vrt"),
+  FilePath = asset.resource("LRO_LROC_Rock_Density/Tycho_Crater.vrt"),
   Description = [[]]
 }
 
diff --git a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Rock_Density_Hazard.asset b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Rock_Density_Hazard.asset
index fdc01e0b65..9a1c107cc8 100644
--- a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Rock_Density_Hazard.asset
+++ b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Rock_Density_Hazard.asset
@@ -9,154 +9,154 @@ local globeIdentifier = asset.require("scene/solarsystem//planets/earth/moon/moo
 local treks_LRO_NAC_RockDenHaz_13S358E_2mp = {
   Identifier = "LRO_NAC_RockDenHaz_13S358E_2mp",
   Name = [[LRO LROC Rock Density Hazard, Alphonsus Crater]],
-  FilePath = asset.localResource("LRO_LROC_Rock_Density_Hazard/Alphonsus_Crater.vrt"),
+  FilePath = asset.resource("LRO_LROC_Rock_Density_Hazard/Alphonsus_Crater.vrt"),
   Description = [[]]
 }
 
 local treks_LRO_NAC_RockDenHaz_73N350E_150cmp = {
   Identifier = "LRO_NAC_RockDenHaz_73N350E_150cmp",
   Name = [[LRO LROC Rock Density Hazard, Anaxagoras Crater]],
-  FilePath = asset.localResource("LRO_LROC_Rock_Density_Hazard/Anaxagoras_Crater.vrt"),
+  FilePath = asset.resource("LRO_LROC_Rock_Density_Hazard/Anaxagoras_Crater.vrt"),
   Description = [[]]
 }
 
 local treks_LRO_NAC_RockDenHaz_26N004E_150cmp = {
   Identifier = "LRO_NAC_RockDenHaz_26N004E_150cmp",
   Name = [[LRO LROC Rock Density Hazard, Apollo 15]],
-  FilePath = asset.localResource("LRO_LROC_Rock_Density_Hazard/Apollo_15.vrt"),
+  FilePath = asset.resource("LRO_LROC_Rock_Density_Hazard/Apollo_15.vrt"),
   Description = [[]]
 }
 
 local treks_LRO_NAC_RockDenHaz_09S015E_150cmp = {
   Identifier = "LRO_NAC_RockDenHaz_09S015E_150cmp",
   Name = [[LRO LROC Rock Density Hazard, Apollo 16]],
-  FilePath = asset.localResource("LRO_LROC_Rock_Density_Hazard/Apollo_16.vrt"),
+  FilePath = asset.resource("LRO_LROC_Rock_Density_Hazard/Apollo_16.vrt"),
   Description = [[]]
 }
 
 local treks_LRO_NAC_RockDenHaz_37S206E_150cmp = {
   Identifier = "LRO_NAC_RockDenHaz_37S206E_150cmp",
   Name = [[LRO LROC Rock Density Hazard, Apollo Basin]],
-  FilePath = asset.localResource("LRO_LROC_Rock_Density_Hazard/Apollo_Basin.vrt"),
+  FilePath = asset.resource("LRO_LROC_Rock_Density_Hazard/Apollo_Basin.vrt"),
   Description = [[]]
 }
 
 local treks_LRO_NAC_RockDenHaz_25N311E_2mp = {
   Identifier = "LRO_NAC_RockDenHaz_25N311E_2mp",
   Name = [[LRO LROC Rock Density Hazard, Aristarchus 1]],
-  FilePath = asset.localResource("LRO_LROC_Rock_Density_Hazard/Aristarchus_1.vrt"),
+  FilePath = asset.resource("LRO_LROC_Rock_Density_Hazard/Aristarchus_1.vrt"),
   Description = [[]]
 }
 
 local treks_LRO_NAC_RockDenHaz_28N307E_150cmp = {
   Identifier = "LRO_NAC_RockDenHaz_28N307E_150cmp",
   Name = [[LRO LROC Rock Density Hazard, Aristarchus 2]],
-  FilePath = asset.localResource("LRO_LROC_Rock_Density_Hazard/Aristarchus_2.vrt"),
+  FilePath = asset.resource("LRO_LROC_Rock_Density_Hazard/Aristarchus_2.vrt"),
   Description = [[]]
 }
 
 local treks_LRO_NAC_RockDenHaz_19S070E_150cmp = {
   Identifier = "LRO_NAC_RockDenHaz_19S070E_150cmp",
   Name = [[LRO LROC Rock Density Hazard, Balmer Basin]],
-  FilePath = asset.localResource("LRO_LROC_Rock_Density_Hazard/Balmer_Basin.vrt"),
+  FilePath = asset.resource("LRO_LROC_Rock_Density_Hazard/Balmer_Basin.vrt"),
   Description = [[]]
 }
 
 local treks_LRO_NAC_RockDenHaz_20S337E_400cmp = {
   Identifier = "LRO_NAC_RockDenHaz_20S337E_400cmp",
   Name = [[LRO LROC Rock Density Hazard, Bullialdus Crater]],
-  FilePath = asset.localResource("LRO_LROC_Rock_Density_Hazard/Bullialdus_Crater.vrt"),
+  FilePath = asset.resource("LRO_LROC_Rock_Density_Hazard/Bullialdus_Crater.vrt"),
   Description = [[]]
 }
 
 local treks_LRO_NAC_RockDenHaz_36N320E_2mp = {
   Identifier = "LRO_NAC_RockDenHaz_36N320E_2mp",
   Name = [[LRO LROC Rock Density Hazard, Gruithuisen Domes]],
-  FilePath = asset.localResource("LRO_LROC_Rock_Density_Hazard/Gruithuisen_Domes.vrt"),
+  FilePath = asset.resource("LRO_LROC_Rock_Density_Hazard/Gruithuisen_Domes.vrt"),
   Description = [[]]
 }
 
 local treks_LRO_NAC_RockDenHaz_00N234E_150cmp = {
   Identifier = "LRO_NAC_RockDenHaz_00N234E_150cmp",
   Name = [[LRO LROC Rock Density Hazard, Hertzsprung]],
-  FilePath = asset.localResource("LRO_LROC_Rock_Density_Hazard/Hertzsprung.vrt"),
+  FilePath = asset.resource("LRO_LROC_Rock_Density_Hazard/Hertzsprung.vrt"),
   Description = [[]]
 }
 
 local treks_LRO_NAC_RockDenHaz_08N332E_2mp = {
   Identifier = "LRO_NAC_RockDenHaz_08N332E_2mp",
   Name = [[LRO LROC Rock Density Hazard, Hortensius Domes]],
-  FilePath = asset.localResource("LRO_LROC_Rock_Density_Hazard/Hortensius_Domes.vrt"),
+  FilePath = asset.resource("LRO_LROC_Rock_Density_Hazard/Hortensius_Domes.vrt"),
   Description = [[]]
 }
 
 local treks_LRO_NAC_RockDenHaz_06N120E_200cmp = {
   Identifier = "LRO_NAC_RockDenHaz_06N120E_200cmp",
   Name = [[LRO LROC Rock Density Hazard, King Crater]],
-  FilePath = asset.localResource("LRO_LROC_Rock_Density_Hazard/King_Crater.vrt"),
+  FilePath = asset.resource("LRO_LROC_Rock_Density_Hazard/King_Crater.vrt"),
   Description = [[]]
 }
 
 local treks_LRO_NAC_RockDenHaz_32N292E_2mp = {
   Identifier = "LRO_NAC_RockDenHaz_32N292E_2mp",
   Name = [[LRO LROC Rock Density Hazard, Lichtenberg Crater]],
-  FilePath = asset.localResource("LRO_LROC_Rock_Density_Hazard/Lichtenberg_Crater.vrt"),
+  FilePath = asset.resource("LRO_LROC_Rock_Density_Hazard/Lichtenberg_Crater.vrt"),
   Description = [[]]
 }
 
 local treks_LRO_NAC_RockDenHaz_10N058E_150cmp = {
   Identifier = "LRO_NAC_RockDenHaz_10N058E_150cmp",
   Name = [[LRO LROC Rock Density Hazard, Mare Crisium]],
-  FilePath = asset.localResource("LRO_LROC_Rock_Density_Hazard/Mare_Crisium.vrt"),
+  FilePath = asset.resource("LRO_LROC_Rock_Density_Hazard/Mare_Crisium.vrt"),
   Description = [[]]
 }
 
 local treks_LRO_NAC_RockDenHaz_16S041E_150cmp = {
   Identifier = "LRO_NAC_RockDenHaz_16S041E_150cmp",
   Name = [[LRO LROC Rock Density Hazard, Montes Pyrenaeus]],
-  FilePath = asset.localResource("LRO_LROC_Rock_Density_Hazard/Montes_Pyrenaeus.vrt"),
+  FilePath = asset.resource("LRO_LROC_Rock_Density_Hazard/Montes_Pyrenaeus.vrt"),
   Description = [[]]
 }
 
 local treks_LRO_NAC_RockDenHaz_26S265E_200cmp = {
   Identifier = "LRO_NAC_RockDenHaz_26S265E_200cmp",
   Name = [[LRO LROC Rock Density Hazard, Orientale 1]],
-  FilePath = asset.localResource("LRO_LROC_Rock_Density_Hazard/Orientale_1.vrt"),
+  FilePath = asset.resource("LRO_LROC_Rock_Density_Hazard/Orientale_1.vrt"),
   Description = [[]]
 }
 
 local treks_LRO_NAC_RockDenHaz_53N354E_150cmp = {
   Identifier = "LRO_NAC_RockDenHaz_53N354E_150cmp",
   Name = [[LRO LROC Rock Density Hazard, Plato Ejecta]],
-  FilePath = asset.localResource("LRO_LROC_Rock_Density_Hazard/Plato_Ejecta.vrt"),
+  FilePath = asset.resource("LRO_LROC_Rock_Density_Hazard/Plato_Ejecta.vrt"),
   Description = [[]]
 }
 
 local treks_LRO_NAC_RockDenHaz_60S200E_150cmp = {
   Identifier = "LRO_NAC_RockDenHaz_60S200E_150cmp",
   Name = [[LRO LROC Rock Density Hazard, South Pole-Aitken Basin Interior]],
-  FilePath = asset.localResource("LRO_LROC_Rock_Density_Hazard/South_Pole-Aitken_Basin_Interior.vrt"),
+  FilePath = asset.resource("LRO_LROC_Rock_Density_Hazard/South_Pole-Aitken_Basin_Interior.vrt"),
   Description = [[]]
 }
 
 local treks_LRO_NAC_RockDenHaz_02S167E_150cmp = {
   Identifier = "LRO_NAC_RockDenHaz_02S167E_150cmp",
   Name = [[LRO LROC Rock Density Hazard, Stratton (Dewar) High Fe Anomaly]],
-  FilePath = asset.localResource("LRO_LROC_Rock_Density_Hazard/Stratton_Dewar_High_Fe_Anomaly.vrt"),
+  FilePath = asset.resource("LRO_LROC_Rock_Density_Hazard/Stratton_Dewar_High_Fe_Anomaly.vrt"),
   Description = [[]]
 }
 
 local treks_LRO_NAC_RockDenHaz_20N010E_2mp = {
   Identifier = "LRO_NAC_RockDenHaz_20N010E_2mp",
   Name = [[LRO LROC Rock Density Hazard, Sulpicius Gallus]],
-  FilePath = asset.localResource("LRO_LROC_Rock_Density_Hazard/Sulpicius_Gallus.vrt"),
+  FilePath = asset.resource("LRO_LROC_Rock_Density_Hazard/Sulpicius_Gallus.vrt"),
   Description = [[]]
 }
 
 local treks_LRO_NAC_RockDenHaz_43S349E_150cmp = {
   Identifier = "LRO_NAC_RockDenHaz_43S349E_150cmp",
   Name = [[LRO LROC Rock Density Hazard, Tycho Crater]],
-  FilePath = asset.localResource("LRO_LROC_Rock_Density_Hazard/Tycho_Crater.vrt"),
+  FilePath = asset.resource("LRO_LROC_Rock_Density_Hazard/Tycho_Crater.vrt"),
   Description = [[]]
 }
 
diff --git a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_Laser_Altimeter.asset b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_Laser_Altimeter.asset
index 189254ff5d..dc5205175f 100644
--- a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_Laser_Altimeter.asset
+++ b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_Laser_Altimeter.asset
@@ -9,7 +9,7 @@ local globeIdentifier = asset.require("scene/solarsystem//planets/earth/moon/moo
 local treks_ldam_10 = {
   Identifier = "ldam_10",
   Name = [[LRO Laser Altimeter, Albedo Global]],
-  FilePath = asset.localResource("LRO_Laser_Altimeter/Albedo_Global.vrt"),
+  FilePath = asset.resource("LRO_Laser_Altimeter/Albedo_Global.vrt"),
   Description = [[The Lunar Orbiter Laser Altimeter (LOLA) experiment on Lunar Reconnaissance Orbiter (LRO) is a laser altimeter that also measures the strength of the return pulse from the lunar surface. These data have been used to estimate the reflectance (albedo) of the lunar surface, including regions lacking direct solar illumination. A new calibration of these data was used to generate a 2016 albedo map that features lower uncertainties overall and more consistent results in the polar regions than the previous 2014 version. (Improved calibration of reflectance data from the LRO Lunar Orbiter Laser Altimeter (LOLA) and implications for space weathering; M. Lemelin, P.G. Lucey, G.A. Neumann, E.M. Mazarico, M.K. Barker, A. Kakazu, D. Trang, D.E. Smith, M.T. Zuber; Icarus, Volume 273, 15 July 2016, Pages 315-328)]]
 }
 
diff --git a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_Mini-RF_Circular_Polarization_Ratio.asset b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_Mini-RF_Circular_Polarization_Ratio.asset
index e9225827bf..4f2d601e87 100644
--- a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_Mini-RF_Circular_Polarization_Ratio.asset
+++ b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_Mini-RF_Circular_Polarization_Ratio.asset
@@ -9,7 +9,7 @@ local globeIdentifier = asset.require("scene/solarsystem//planets/earth/moon/moo
 local treks_LRO_MiniRF_CPR_Gray_Global_128ppd = {
   Identifier = "LRO_MiniRF_CPR_Gray_Global_128ppd",
   Name = [[LRO Mini-RF Circular Polarization Ratio, Grayscale]],
-  FilePath = asset.localResource("LRO_Mini-RF_Circular_Polarization_Ratio/Grayscale.vrt"),
+  FilePath = asset.resource("LRO_Mini-RF_Circular_Polarization_Ratio/Grayscale.vrt"),
   Description = [[]]
 }
 
diff --git a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_NAC_ColorHillshade.asset b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_NAC_ColorHillshade.asset
index fd7ce6346f..fe834d704b 100644
--- a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_NAC_ColorHillshade.asset
+++ b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_NAC_ColorHillshade.asset
@@ -9,7 +9,7 @@ local globeIdentifier = asset.require("scene/solarsystem//planets/earth/moon/moo
 local treks_20191118demmoseqccolorhillshade = {
   Identifier = "20191118demmoseqccolorhillshade",
   Name = [[LRO NAC ColorHillshade, Lacus Mortis]],
-  FilePath = asset.localResource("LRO_NAC_ColorHillshade/Lacus_Mortis.vrt"),
+  FilePath = asset.resource("LRO_NAC_ColorHillshade/Lacus_Mortis.vrt"),
   Description = [[TBD]]
 }
 
diff --git a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_NAC_Mosaic.asset b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_NAC_Mosaic.asset
index a9eb29d17d..fd87dc86c8 100644
--- a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_NAC_Mosaic.asset
+++ b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_NAC_Mosaic.asset
@@ -9,7 +9,7 @@ local globeIdentifier = asset.require("scene/solarsystem//planets/earth/moon/moo
 local treks_20200415_lacusmortis_orthomos_filled_8bit_lzw = {
   Identifier = "20200415_lacusmortis_orthomos_filled_8bit_lzw",
   Name = [[LRO NAC Mosaic, Lacus Mortis, Extended Version]],
-  FilePath = asset.localResource("LRO_NAC_Mosaic/Lacus_Mortis.vrt"),
+  FilePath = asset.resource("LRO_NAC_Mosaic/Lacus_Mortis.vrt"),
   Description = [[This is an orthoimage mosaic produced by combining LROC NAC images, for the southwestern area of Lacus Mortis, including Rimae Bürg and the Lacus Mortis Pit. The images are projected onto a DEM mosaic produced by stereo reconstructions in which each of the images is paired with another LROC NAC.]]
 }
 
diff --git a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_NAC_Mosaic_0.5mpp.asset b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_NAC_Mosaic_0.5mpp.asset
index a60559a59f..29881f42cb 100644
--- a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_NAC_Mosaic_0.5mpp.asset
+++ b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_NAC_Mosaic_0.5mpp.asset
@@ -9,7 +9,7 @@ local globeIdentifier = asset.require("scene/solarsystem//planets/earth/moon/moo
 local treks_LRO_NAC_Mosaic_50cmpp_VonKarman_v2 = {
   Identifier = "LRO_NAC_Mosaic_50cmpp_VonKarman_v2",
   Name = [[LRO NAC Mosaic 0.5mpp, Von Karman]],
-  FilePath = asset.localResource("LRO_NAC_Mosaic_0.5mpp/Von_Karman.vrt"),
+  FilePath = asset.resource("LRO_NAC_Mosaic_0.5mpp/Von_Karman.vrt"),
   Description = [[This is an orthorectified NAC mosaic of the Von Karman Crater region for the south pole of the Moon. This mosaic includes a total of 370 orthorectified NAC images: 252 sampled at 0.5 m/px and 118 sampled at 1 m/px. NAC orthoimages have been constructed from EDRs downloaded from the Planetary Data System (PDS) and subsequent USGS-ISIS processing. This mosaic has been coaligned to Chang'e-2 20 m/px DEM which has been coaligned to the USGS 59 m/px LOLA-SELENE DEM using ENVI (v5.6.2) patented auto-coreg. Most of the area used stereo-photogrammetrically processing of LROC-NAC stereo-pairs with the UCL CASPGO 3D mapping system, CASP-GO is described in Tao, Y., Muller, J.-P. et al. (2018) Massive Stereo-based DTM Production for Mars on Cloud Computers. Planetary Space Science 154, 30-58 (2018). doi: 10.1016/j.pss.2018.02.012 and CASP-GO is now integrated into ASP (https://stereopipeline.readthedocs.io/en/latest/experimental.html?highlight=casp-go#the-casp-go-stereo-processing-system) as part of the NASA PDART program. Individual NAC orthoimages mosaicked together using ArcGIS Pro (v2.9.2). A color balancing algorithm has been applied to roughly correct for color differences at the seams of NAC images. This data has been made available by and should be credited to: Yu Tao and Jan-Peter Muller, Imaging Group, Mullard Space Science Laboratory, University College London.]]
 }
 
diff --git a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_NAC_Mosaic_1mpp.asset b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_NAC_Mosaic_1mpp.asset
index b42b2bf72b..6ae7ed873e 100644
--- a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_NAC_Mosaic_1mpp.asset
+++ b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_NAC_Mosaic_1mpp.asset
@@ -9,7 +9,7 @@ local globeIdentifier = asset.require("scene/solarsystem//planets/earth/moon/moo
 local treks_LRO_NAC_Mosaic_1mpp = {
   Identifier = "LRO_NAC_Mosaic_1mpp",
   Name = [[LRO NAC Mosaic 1mpp, Von Karman]],
-  FilePath = asset.localResource("LRO_NAC_Mosaic_1mpp/Von_Karman.vrt"),
+  FilePath = asset.resource("LRO_NAC_Mosaic_1mpp/Von_Karman.vrt"),
   Description = [[This is an orthorectified NAC mosaic of the Von Karman Crater region for the south pole of the Moon. This mosaic includes 118 individual orthorectified NAC images sampled at 1 m/px. NAC orthoimages have been constructed from EDRs downloaded from the Planetary Data System (PDS) and subsequent USGS-ISIS processing. This mosaic has been coaligned to Chang&rsquo;e 2 20 m/px DEM which has been coaligned to the USGS 59 m/px LOLA-SELENE DEM using ENVI (v5.6.2) patented auto-coreg. Individual NAC orthoimages have been mosaicked together using ArcGIS Pro (v2.9.0). A color balancing algorithm has been applied to roughly correct for color differences at the seams of NAC images. This data has been made available by and should be credited to: Yu Tao and Jan-Peter Muller, Imaging Group, Mullard Space Science Laboratory, University College London.]]
 }
 
diff --git a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_NAC_PSR_Mosaic_20mpp.asset b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_NAC_PSR_Mosaic_20mpp.asset
index d0ca877f5b..fa1a1071ae 100644
--- a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_NAC_PSR_Mosaic_20mpp.asset
+++ b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_NAC_PSR_Mosaic_20mpp.asset
@@ -9,14 +9,14 @@ local globeIdentifier = asset.require("scene/solarsystem//planets/earth/moon/moo
 local treks_NAC_POLE_PSR_NORTH_STRETCH_EQ = {
   Identifier = "NAC_POLE_PSR_NORTH_STRETCH_EQ",
   Name = [[LRO NAC PSR Mosaic 20mpp, N Pole]],
-  FilePath = asset.localResource("LRO_NAC_PSR_Mosaic_20mpp/N_Pole.vrt"),
+  FilePath = asset.resource("LRO_NAC_PSR_Mosaic_20mpp/N_Pole.vrt"),
   Description = [[This is an uncontrolled mosaic generated from images taken by the Narrow Angle Camera (NAC) onboard the Lunar Reconnaissance Orbiter (LRO) for the North Pole region of the Moon. The NAC mosaics have been trimmed to the Permanently Shadowed Region (PSR) shapefile, providing visible NAC image coverage of the PSRs only. Acquisition of NAC PSR observations were optimized over several campaigns to maximize signal-to-noise ratio (SNR), resulting in a comprehensive dataset that is systematically reviewed and analyzed. Observations are acquired at a variety of pixel scales (2 to 20 m/px). The final PSR mosaics are assembled from re-sampled images to 20 m/px, and ordering of images is based on image quality and areal coverage of individual PSRs. A total of 550 NAC images were used to create a North Pole PSR mosaic at 20 m/px, 90&deg; to 80&deg; latitude, and -180&deg; to 180&deg; longitude. This mosaic has been merged with the existing LROC NAC North Pole RDR product to replace over-saturated illuminated polar areas.]]
 }
 
 local treks_NAC_POLE_PSR_SOUTH_STRETCH_EQ = {
   Identifier = "NAC_POLE_PSR_SOUTH_STRETCH_EQ",
   Name = [[LRO NAC PSR Mosaic 20mpp, S Pole]],
-  FilePath = asset.localResource("LRO_NAC_PSR_Mosaic_20mpp/S_Pole.vrt"),
+  FilePath = asset.resource("LRO_NAC_PSR_Mosaic_20mpp/S_Pole.vrt"),
   Description = [[This is an uncontrolled mosaic generated from images taken by the Narrow Angle Camera (NAC) onboard the Lunar Reconnaissance Orbiter (LRO) for the South Pole region of the Moon. The NAC mosaics have been trimmed to the Permanently Shadowed Region (PSR) shapefile, providing visible NAC image coverage of the PSRs only. Acquisition of NAC PSR observations were optimized over several campaigns to maximize signal-to-noise ratio (SNR), resulting in a comprehensive dataset that is systematically reviewed and analyzed. Observations are acquired at a variety of pixel scales (2 to 20 m/px). The final PSR mosaics are assembled from re-sampled images to 20 m/px, and ordering of images is based on image quality and areal coverage of individual PSRs. A total of 550 NAC images were used to create a South Pole PSR mosaic at 20 m/px, 90&deg; to 80&deg; latitude, and -180&deg; to 180&deg; longitude. This mosaic has been merged with the existing LROC NAC South Pole RDR product to replace over-saturated illuminated polar areas.]]
 }
 
diff --git a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_NAC_and_CE-2_CCD_Mosaic_1mpp.asset b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_NAC_and_CE-2_CCD_Mosaic_1mpp.asset
index a815a0aa32..5fd4fee268 100644
--- a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_NAC_and_CE-2_CCD_Mosaic_1mpp.asset
+++ b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_NAC_and_CE-2_CCD_Mosaic_1mpp.asset
@@ -9,7 +9,7 @@ local globeIdentifier = asset.require("scene/solarsystem//planets/earth/moon/moo
 local treks_LRO_NAC_CE2_Mosaic_1mpp = {
   Identifier = "LRO_NAC_CE2_Mosaic_1mpp",
   Name = [[LRO NAC and CE-2 CCD Mosaic 1mpp, Von Karman]],
-  FilePath = asset.localResource("LRO_NAC_and_CE-2_CCD_Mosaic_1mpp/Von_Karman.vrt"),
+  FilePath = asset.resource("LRO_NAC_and_CE-2_CCD_Mosaic_1mpp/Von_Karman.vrt"),
   Description = [[This is an orthorectified NAC and Chang&rsquo;e-2 mosaic of the Von Karman Crater region for the south pole of the Moon. This mosaic includes 118 individual orthorectified NAC images sampled at 1 m/px and has been mosaicked on top of the respective Chang&rsquo;e 7 m/px orthomosaic. NAC orthoimages have been constructed from EDRs downloaded from the Planetary Data System (PDS) and subsequent USGS-ISIS processing. This mosaic has been coaligned to Chang&rsquo;e-2 20 m/px DEM which has been coaligned to the USGS 59 m/px LOLA-SELENE DEM using ENVI (v5.6.2) patented auto-coreg. Individual NAC orthoimages and the underlying Chang&rsquo;e ortho product have been mosaicked together using ArcGIS Pro (v2.9.0). A color balancing algorithm has been applied to roughly correct for color differences at the seams of NAC images. This data has been made available by and should be credited to: Yu Tao and Jan-Peter Muller, Imaging Group, Mullard Space Science Laboratory, University College London.]]
 }
 
diff --git a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_Narrow_Angle_Camera.asset b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_Narrow_Angle_Camera.asset
index 6cce87ea53..78de5ec0a9 100644
--- a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_Narrow_Angle_Camera.asset
+++ b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_Narrow_Angle_Camera.asset
@@ -9,7 +9,7 @@ local globeIdentifier = asset.require("scene/solarsystem//planets/earth/moon/moo
 local treks_LRO_NAC_Apollo11_Mosaic_p = {
   Identifier = "LRO_NAC_Apollo11_Mosaic_p",
   Name = [[LRO Narrow Angle Camera, Apollo 11 Landing Site]],
-  FilePath = asset.localResource("LRO_Narrow_Angle_Camera/Apollo_11_Landing_Site.vrt"),
+  FilePath = asset.resource("LRO_Narrow_Angle_Camera/Apollo_11_Landing_Site.vrt"),
   Description = [[This is the site where American astronauts Neil Armstrong and Edwin “Buzz” Aldrin made the first human landing on the Moon on July 20, 1969. Armstrong and Aldrin landed here aboard the lunar module Eagle, while Michael Collins remained in orbit around the Moon in the command module Columbia. Armstrong and Aldrin conducted one EVA on the lunar surface lasting 2 hours, 31 minutes 40 seconds, remaining within 60 meters of the lunar module. They collected 21.55 kg of lunar sample material for return to the Earth.
 
 In this LRO NAC view of the landing site, the descent stage of the Eagle is the largest man-made object visible. The dark tracks of the astronauts' footprints extend out from it clustered primarily in 3 directions. To the northwest, the tracks extend to the location where the astronauts set up a TV camera. To the south, tracks extend to where a Lunar Ranging Retroreflector and the Passive Seismic Experiment Package were deployed. To the east, the tracks extend to the rim of Little West Crater.
@@ -21,7 +21,7 @@ The landing site, located at 0.67416 N, 23.47314 E, is in the southwest part of
 local treks_LRO_NAC_Apollo12_Mosaic_p = {
   Identifier = "LRO_NAC_Apollo12_Mosaic_p",
   Name = [[LRO Narrow Angle Camera, Apollo 12 Landing Site]],
-  FilePath = asset.localResource("LRO_Narrow_Angle_Camera/Apollo_12_Landing_Site.vrt"),
+  FilePath = asset.resource("LRO_Narrow_Angle_Camera/Apollo_12_Landing_Site.vrt"),
   Description = [[This is the site where American astronauts Charles “Pete” Conrad and Alan Bean made the second human landing on the Moon on November 19, 1969. Conrad and Bean landed here aboard the lunar module Intrepid, while Richard Gordon remained in orbit around the Moon in the command module Yankee Clipper. Apollo 12 demonstrated the key capability of a precision landing, with Intrepid touching down less than 200 meters from the site where the Surveyor 3 probe had landed on April 20, 1967. Conrad and Bean conducted 2 EVAs on the lunar surface. The first, lasting 3 hours, 56 minutes, extended to the northwest for deployment of the ALSEP instrument package, and the continued to the rim of a 350-meter diameter crater dubbed Middle Crescent. The second EVA, lasting 3 hours, 49 minutes, was a loop trip of 1.5 km around several craters to the south, including retrieval of a camera from Surveyor 3. They collected 34.35 kilograms of lunar sample material for return to the Earth.
 
 In this LRO NAC view of the landing site, the descent stage of the Intrepid is the largest man-made object visible. The dark tracks of the astronauts' footprints extend out from it. To the northwest, the tracks extend about 130 meters to were components of the ALSEP can be seen. About 160 meters to the southeast of Intrepid, Surveyor 3 is visible with a dense cluster of footprints around it.
@@ -33,7 +33,7 @@ The landing site, located at 3.0138 S N, 23.4219 W, is in the southern part of O
 local treks_LRO_NAC_Apollo14_Mosaic_p = {
   Identifier = "LRO_NAC_Apollo14_Mosaic_p",
   Name = [[LRO Narrow Angle Camera, Apollo 14 Landing Site]],
-  FilePath = asset.localResource("LRO_Narrow_Angle_Camera/Apollo_14_Landing_Site.vrt"),
+  FilePath = asset.resource("LRO_Narrow_Angle_Camera/Apollo_14_Landing_Site.vrt"),
   Description = [[This is the site where American astronauts Alan Shepard and Edgar Mitchell made the third human landing on the Moon on February 5, 1971. Shepard and Mitchell landed here aboard the lunar module Antares, while Stuart Roosa remained in orbit around the Moon in the command module Kitty Hawk. Shephard and Mitchell conducted 2 EVAs on the lunar surface. The first, lasting 4 hours, 47 minutes, 50 seconds, extended to the west for deployment of the ALSEP instrument package, included collection of a contingency sample, and covered a total distance of about 550 meters. The second EVA, lasting 4 hours, 34 minutes, 41 seconds, was intended to visit Cone Crater, 370 meters in diameter and located approximately 1.2 kilometers to the northeast. To help transport the load of equipment and retrieved samples on this EVA, the astronauts were equipped with a hand-pulled cart, the Modular Equipment Transporter (MET). The rough, hummocky terrain made navigation difficult during the second EVA, and the astronauts were not able to identify the rim of Cone Crater, though later imagery showed that they reached a point about 20 meters south of the crater rim. Shepard and Mitchell collected 42.80 kilograms of lunar sample material for return to the Earth.
 
 In this LRO NAC view of the landing site, the descent stage of the Antares is the largest man-made object visible. The dark tracks of the astronauts' footprints from the first EVA extend to the west, where components of the ALSEP are visible. Extending to the northeast of Antares' landing site, the track of the astronauts' footprints and the tracks of the MET's wheels can be traced toward Cone Crater.
@@ -44,7 +44,7 @@ The landing site, located at 3.64589 S, 17.47194 W, was selected largely with th
 local treks_LRO_NAC_Apollo15_Mosaic_p = {
   Identifier = "LRO_NAC_Apollo15_Mosaic_p",
   Name = [[LRO Narrow Angle Camera, Apollo 15 Landing Site]],
-  FilePath = asset.localResource("LRO_Narrow_Angle_Camera/Apollo_15_Landing_Site.vrt"),
+  FilePath = asset.resource("LRO_Narrow_Angle_Camera/Apollo_15_Landing_Site.vrt"),
   Description = [[This is the site where American astronauts David Scott and James Irwin made the fourth human landing on the Moon on July 30, 1971. Scott and Irwin landed here aboard the lunar module Falcon, while Alfred Worden remained in orbit around the Moon in the command module Endeavour. This was the first of the Apollo J missions. These featured a greater emphasis on conducting science on the Moon along with longer stays on the lunar surface. The J missions also included a lunar rover which allowed the astronauts to drive across the lunar surface, covering far greater areas, and carrying back more sample material. Scott first conducted a 33-minute stand-up EVA, surveying and imaging the local terrain through the upper hatch of the lunar module. Scott and Irwin then conducted 3 surface EVAs. The first, lasting 6 hours, 32 minutes, 42 seconds, involved deploying the Lunar Rover, and driving in it on a 10.3-km geological traverse. They drove southwest to the edge of Hadley Rille and then continued south along the edge of the rille. At the end of the first surface EVA, they deployed the Apollo Lunar Surface Experiments Package (ALSEP) approximately 110 meters north-northwest of the lunar module. The second surface EVA, lasting 7 hours, 12 minutes, 14 seconds, featured a 12.5-kilometer lunar rover traverse southeast across the mare and along the base of the Apennine Mountains. The third surface EVA, lasting 4 hours, 49 minutes, 50 seconds, had the astronauts making a 5.1-kilometer traverse west to Hadley Rille northwest along the edge of the rille, and east across the mare back to the lunar module. Scott and Irwin collected 77 kilograms of lunar sample material for return to the Earth.
 
 In this LRO NAC view of the landing site, the descent stage of the Falcon is the largest man-made object visible. The dark markings of the astronauts' footprints and rover tire tracks are visible around the landing site, especially extending to the north-northwest, where components of the ALSEP are visible.
@@ -56,7 +56,7 @@ The landing site, located at 26.13239 N, 3.63330 E, was selected to provide acce
 local treks_LRO_NAC_Apollo16_Mosaic_p = {
   Identifier = "LRO_NAC_Apollo16_Mosaic_p",
   Name = [[LRO Narrow Angle Camera, Apollo 16 Landing Site]],
-  FilePath = asset.localResource("LRO_Narrow_Angle_Camera/Apollo_16_Landing_Site.vrt"),
+  FilePath = asset.resource("LRO_Narrow_Angle_Camera/Apollo_16_Landing_Site.vrt"),
   Description = [[This is the site where American astronauts John Young and Charles Duke made the fifth human landing on the Moon on April 21, 1972. Young and Duke landed here aboard the lunar module Orion, while Ken Mattingly remained in orbit around the Moon in the command module Casper. Young and Duke conducted 3 surface EVAs. The first, lasting 7 hours, 11 minutes, 2 seconds, included deploying the Apollo Lunar Surface Experiments Package (ALSEP) approximately 95 meters southwest of the lunar module, and conducting a geologic traverse using the lunar rover to a couple of small craters within about 1,400 meters to the west of the landing site. The second surface EVA, lasting 7 hours, 23 minutes, 9 seconds, featured an 11.1-kilometer lunar rover drive south to the Cinco Crater area of Stone Mountain, making stops at 6 stations along the way. across the mare and along the base of the Apennine Mountains. The third surface EVA, lasting 5 hours, 40 minutes, 3 seconds, had the astronauts making a 11.4-kilometer traverse north to North Ray Crater. Young and Duke collected 95.71 kilograms of lunar sample material for return to the Earth.
 
 In this LRO NAC view of the landing site, the descent stage of the Orion is the largest man-made object visible, within a dark halo on the western rim of a ~30-meter crater. The dark markings of the astronauts' footprints and rover tire tracks are visible around the landing site, especially extending to the southwest, where components of the ALSEP are visible.
@@ -68,63 +68,63 @@ With the previous Apollo landings having focused on the low, flat, basaltic terr
 local treks_NAC_DTM_APOLLO17_CLRSHADE = {
   Identifier = "NAC_DTM_APOLLO17_CLRSHADE",
   Name = [[LRO Narrow Angle Camera, ColorHillShade Apollo 17]],
-  FilePath = asset.localResource("LRO_Narrow_Angle_Camera/ColorHillShade_Apollo_17.vrt"),
+  FilePath = asset.resource("LRO_Narrow_Angle_Camera/ColorHillShade_Apollo_17.vrt"),
   Description = [[Color-coded topography draped over the shaded relief from a 5m Digital Terrain Model (DTM) of the Apollo 17 landing site created with Narrow Angle Camera (NAC) stereo image pairs from the Lunar Reconnaissance Orbiter Camera (LROC) aboard the Lunar Reconnaissance Orbiter (LRO). The shaded relief image was generated with the sun azimuth of 315 degrees (northwest) and sun altitude of 45 degrees. ]]
 }
 
 local treks_NAC_DTM_APOLLO17_SHADE = {
   Identifier = "NAC_DTM_APOLLO17_SHADE",
   Name = [[LRO Narrow Angle Camera, HillShade Apollo 17]],
-  FilePath = asset.localResource("LRO_Narrow_Angle_Camera/HillShade_Apollo_17.vrt"),
+  FilePath = asset.resource("LRO_Narrow_Angle_Camera/HillShade_Apollo_17.vrt"),
   Description = [[This is a  shaded-relief derived from a 5m Digital Terrain Model (DTM) of the Apollo 17 landing site created with Narrow Angle Camera (NAC) stereo image pairs from the Lunar Reconnaissance Orbiter Camera (LROC) aboard the Lunar Reconnaissance Orbiter (LRO). The shaded relief image was generated with the sun azimuth of 315 degrees (northwest) and sun altitude of 45 degrees. Image is a TIFF image, 8 bits/sample, 1 samples/pixel in single image plane configuration.]]
 }
 
 local treks_A11_60x60kmeq = {
   Identifier = "A11_60x60kmeq",
   Name = [[LRO Narrow Angle Camera, Mosaic Apollo 11]],
-  FilePath = asset.localResource("LRO_Narrow_Angle_Camera/Mosaic_Apollo_11.vrt"),
+  FilePath = asset.resource("LRO_Narrow_Angle_Camera/Mosaic_Apollo_11.vrt"),
   Description = [[This is a Lunar Reconnaisance Orbiter (LRO) Narrow Angle Camera (NAC) mosaic centered at the Apollo 11 landing site with an extent of 60x60km. Each NAC image was processed in ISIS3 at a resolution of 50cm pixel, color balanced, and synthesized into a single output.]]
 }
 
 local treks_A12_60x60km0_3eq = {
   Identifier = "A12_60x60km0_3eq",
   Name = [[LRO Narrow Angle Camera, Mosaic Apollo 12]],
-  FilePath = asset.localResource("LRO_Narrow_Angle_Camera/Mosaic_Apollo_12.vrt"),
+  FilePath = asset.resource("LRO_Narrow_Angle_Camera/Mosaic_Apollo_12.vrt"),
   Description = [[This is a Lunar Reconnaissance Orbiter (LRO) Narrow Angle Camera (NAC) mosaic centered at the Apollo 12 landing site with an extent of 60x60km. Each NAC image was processed in ISIS3 at a resolution of 50cm pixel, color balanced, and synthesized into a single output. Apollo 12 was second crewed mission to land on the surface of the Moon. The mission launched on November 14th 1969, and landed five days later at the Ocean of Storms within walking distance of the Surveyor 3 spacecraft.]]
 }
 
 local treks_A14_60x60km0_3eq = {
   Identifier = "A14_60x60km0_3eq",
   Name = [[LRO Narrow Angle Camera, Mosaic Apollo 14]],
-  FilePath = asset.localResource("LRO_Narrow_Angle_Camera/Mosaic_Apollo_14.vrt"),
+  FilePath = asset.resource("LRO_Narrow_Angle_Camera/Mosaic_Apollo_14.vrt"),
   Description = [[This is a Lunar Reconnaissance Orbiter (LRO) Narrow Angle Camera (NAC) mosaic centered at the Apollo 14 landing site with an extent of 60x60km. Each NAC image was processed in ISIS3 at a resolution of 50cm pixel, color balanced, and synthesized into a single output. Apollo 14 landed on the Moon February 15th 1971.]]
 }
 
 local treks_A15_60x60km0_2eq = {
   Identifier = "A15_60x60km0_2eq",
   Name = [[LRO Narrow Angle Camera, Mosaic Apollo 15]],
-  FilePath = asset.localResource("LRO_Narrow_Angle_Camera/Mosaic_Apollo_15.vrt"),
+  FilePath = asset.resource("LRO_Narrow_Angle_Camera/Mosaic_Apollo_15.vrt"),
   Description = [[This is a Lunar Reconnaisance Orbiter (LRO) Narrow Angle Camera (NAC) mosaic centered at the Apollo 15 landing site with an extent of 60x60km. Each NAC image was processed in ISIS3 at a resolution of 50cm pixel, color balanced, and synthesized into a single output.]]
 }
 
 local treks_A16_60x60kmeq = {
   Identifier = "A16_60x60kmeq",
   Name = [[LRO Narrow Angle Camera, Mosaic Apollo 16]],
-  FilePath = asset.localResource("LRO_Narrow_Angle_Camera/Mosaic_Apollo_16.vrt"),
+  FilePath = asset.resource("LRO_Narrow_Angle_Camera/Mosaic_Apollo_16.vrt"),
   Description = [[This is a Lunar Reconnaisance Orbiter (LRO) Narrow Angle Camera (NAC) mosaic centered at the Apollo 16 landing site with an extent of 60x60km. Each NAC image was processed in ISIS3 at a resolution of 50cm pixel, color balanced, and synthesized into a single output.]]
 }
 
 local treks_A17_60x60kmeq = {
   Identifier = "A17_60x60kmeq",
   Name = [[LRO Narrow Angle Camera, Mosaic Apollo 17]],
-  FilePath = asset.localResource("LRO_Narrow_Angle_Camera/Mosaic_Apollo_17.vrt"),
+  FilePath = asset.resource("LRO_Narrow_Angle_Camera/Mosaic_Apollo_17.vrt"),
   Description = [[This is a Lunar Reconnaisance Orbiter (LRO) Narrow Angle Camera (NAC) mosaic centered at the Apollo 17 landing site with an extent of 60x60km. Each NAC image was processed in ISIS3 at a resolution of 50cm pixel, color balanced, and synthesized into a single output.]]
 }
 
 local treks_M129086118ndgcs = {
   Identifier = "M129086118ndgcs",
   Name = [[LRO Narrow Angle Camera, Mosaic Apollo 17 Landing Site]],
-  FilePath = asset.localResource("LRO_Narrow_Angle_Camera/Mosaic_Apollo_17_Landing_Site.vrt"),
+  FilePath = asset.resource("LRO_Narrow_Angle_Camera/Mosaic_Apollo_17_Landing_Site.vrt"),
   Description = [[This is the site where American astronauts Eugene Cernan and Harrison Schmitt made the sixth and final human landing on the Moon of the Apollo program on December 11, 1972. Cernan and Schmitt landed here aboard the lunar module Challenger, while Ronald Evans remained in orbit around the Moon in the command module America. With a PhD in geology, Schmitt was the first and only professional scientist to have visited the Moon. Cernan and Schmitt conducted 3 surface EVAs. The first, lasting 7 hours, 11 minutes, 53 seconds, included deploying the Apollo Lunar Surface Experiments Package (ALSEP) approximately 185 meters west-northwest of the lunar module, and conducting a 3.5-kilometer geologic traverse using the lunar rover to the rim of Steno, a small impact crater south of the landing site. The second surface EVA, lasting 7 hours, 36 minutes, 56 seconds, featured a 20.4-kilometer geologic traverse south and west. Stops included a location at the base of South Massif where a landslide had brought ancient highland rocks from high on the mountain into reach, and at Shorty Crater, which was found to be impact rather than volcanic in origin, but which excavated an older volcanic deposit which yielded the famous , beads of volcanic glass erupted in a lunar fire fountain. The third surface EVA, lasting 7 hours, 15 minutes, 8 seconds, had the astronauts making a 20.4-kilometer geologic traverse north and east to North Massif. Stops on this traverse included taking samples of early lunar crust material from large boulders near the base of the massif that had rolled down from high up on the mountain. Cernan and Schmitt collected 110.52 kilograms of lunar sample material for return to the Earth.
 
 In this LRO NAC view of the landing site, the descent stage of the Challenger is the largest man-made object visible. The dark markings of the astronauts' footprints and rover tire tracks are visible around the landing site, especially extending to the west-northwest, where components of the ALSEP are visible.
@@ -135,77 +135,77 @@ The landing site, located at 20.1911 N, 30.7723 E, is in a narrow valley in the
 local treks_ingenii_skylight = {
   Identifier = "ingenii_skylight",
   Name = [[LRO Narrow Angle Camera, Mosaic Ingenii]],
-  FilePath = asset.localResource("LRO_Narrow_Angle_Camera/Mosaic_Ingenii.vrt"),
+  FilePath = asset.resource("LRO_Narrow_Angle_Camera/Mosaic_Ingenii.vrt"),
   Description = [[Mare Ingenii is notable for being one of the few examples of a mare on the far side of the Moon, and the site for notable lunar swirls, enigmatic bright albedo features. This was enough to qualify the area as a Constellation Region of Interest. However, the area became even more interesting with the discovery of a lunar pit in imagery obtained using the Kaguya Terrain Camera. It measures about 130 m in diameter, and researchers speculate that the pit could be a skylight resulting from the collapse of the roof of a lava tube. Whether this is actually the case, and if so, the accessibility and extent of the lava tube have yet to be determined. However, such lava tubes are of great interest as potential locations for lunar bases, offering protection from extreme swings in temperature, galactic and solar radiation, and meteoroid impacts. This data layer was obtained using the Narrow Angle Camera aboard the Lunar Reconnaissance Orbiter and is a is a mosaic of 2 NAC strips centered on the Mare Ingenii pit.]]
 }
 
 local treks_marius_skylight = {
   Identifier = "marius_skylight",
   Name = [[LRO Narrow Angle Camera, Mosaic Marius]],
-  FilePath = asset.localResource("LRO_Narrow_Angle_Camera/Mosaic_Marius.vrt"),
+  FilePath = asset.resource("LRO_Narrow_Angle_Camera/Mosaic_Marius.vrt"),
   Description = [[The Marius Hills represents one of the most prominent collection of volcanic domes on the Moon. The area was a candidate landing site for the Apollo program and was also designated as a Constellation Region of Interest. It remains a site under consideration for possible future missions. In addition to volcanic domes, the area features basaltic flows, sinuous rilles, and one prominent lunar pit. The Marius Hills pit measures 58 x 49 m in diameter and 40 m deep. It was first noticed in an image taken with the Kaguya Terrain Camera on May 20, 2008, by a team led by Junichi Haruyama . The fact that the Marius Hills pit is located on the floor of a sinuous rille has encouraged speculation the pit could be a skylight resulting from the collapse of the roof of a lava tube. Whether this is actually the case, and if so, the accessibility and extent of the lava tube have yet to be determined. However, such lava tubes are of great interest as potential locations for lunar bases, offering protection from extreme swings in temperature, galactic and solar radiation, and meteoroid impacts. This data layer was obtained using the Narrow Angle Camera aboard the Lunar Reconnaissance Orbiter and is a is a mosaic of 2 NAC strips centered on the Marius Hills pit.]]
 }
 
 local treks_LRO_NAC_Schrodinger = {
   Identifier = "LRO_NAC_Schrodinger",
   Name = [[LRO Narrow Angle Camera, Mosaic Schrodinger]],
-  FilePath = asset.localResource("LRO_Narrow_Angle_Camera/Mosaic_Schrodinger.vrt"),
+  FilePath = asset.resource("LRO_Narrow_Angle_Camera/Mosaic_Schrodinger.vrt"),
   Description = [[This is a visible image mosaic generated using Lunar Reconnaissance Orbiter Camera (LROC) Narrow Angle Camera (NAC) images from the Lunar Reconnaissance Orbiter mission. The images were orthorectified using a digital elevation model (DEM) created from LROC NAC stereo images, when available, or LRO's Lunar Orbiter Laser Altimeter (LOLA) global DEM. The mosaic is generated at the same resolution at which the individual LROC NAC images were gathered, which is approximately 0.5 meters/pixel. The mosaic was registered horizontally to the LOLA global DEM.]]
 }
 
 local treks_schrodingerextraswathseq = {
   Identifier = "schrodingerextraswathseq",
   Name = [[LRO Narrow Angle Camera, Mosaic Schrodinger Extra]],
-  FilePath = asset.localResource("LRO_Narrow_Angle_Camera/Mosaic_Schrodinger_Extra.vrt"),
+  FilePath = asset.resource("LRO_Narrow_Angle_Camera/Mosaic_Schrodinger_Extra.vrt"),
   Description = [[TBD]]
 }
 
 local treks_LRO_NAC_SchrodingerLandingSite2 = {
   Identifier = "LRO_NAC_SchrodingerLandingSite2",
   Name = [[LRO Narrow Angle Camera, Mosaic Schrodinger Landing Site]],
-  FilePath = asset.localResource("LRO_Narrow_Angle_Camera/Mosaic_Schrodinger_Landing_Site.vrt"),
+  FilePath = asset.resource("LRO_Narrow_Angle_Camera/Mosaic_Schrodinger_Landing_Site.vrt"),
   Description = [[This is a visible image mosaic generated using Lunar Reconnaissance Orbiter Camera (LROC) Narrow Angle Camera (NAC) images from the Lunar Reconnaissance Orbiter mission. The images were orthorectified using a digital elevation model (DEM) created from LROC NAC stereo images, when available, or LRO's Lunar Orbiter Laser Altimeter (LOLA) global DEM. The mosaic is generated at the same resolution at which the individual LROC NAC images were gathered, which is approximately 0.5 meters/pixel. The mosaic was registered horizontally to the LOLA global DEM.]]
 }
 
 local treks_schrodingerneequirect = {
   Identifier = "schrodingerneequirect",
   Name = [[LRO Narrow Angle Camera, Mosaic Schrodinger NorthEast]],
-  FilePath = asset.localResource("LRO_Narrow_Angle_Camera/Mosaic_Schrodinger_NorthEast.vrt"),
+  FilePath = asset.resource("LRO_Narrow_Angle_Camera/Mosaic_Schrodinger_NorthEast.vrt"),
   Description = [[This is a visible image mosaic generated using Lunar Reconnaissance Orbiter Camera (LROC) Narrow Angle Camera (NAC) images from the Lunar Reconnaissance Orbiter mission. Each NAC image was registered horizontally to the LRO's Lunar Orbiter Laser Altimeter (LOLA) global DEM, and then mosaicked together and color balanced. The mosaic is generated at the same resolution at which the individual LROC NAC images were gathered, which is approximately 1 meters/pixel.]]
 }
 
 local treks_schrodingerscequirect = {
   Identifier = "schrodingerscequirect",
   Name = [[LRO Narrow Angle Camera, Mosaic Schrodinger SouthCenter]],
-  FilePath = asset.localResource("LRO_Narrow_Angle_Camera/Mosaic_Schrodinger_SouthCenter.vrt"),
+  FilePath = asset.resource("LRO_Narrow_Angle_Camera/Mosaic_Schrodinger_SouthCenter.vrt"),
   Description = [[This is a visible image mosaic generated using Lunar Reconnaissance Orbiter Camera (LROC) Narrow Angle Camera (NAC) images from the Lunar Reconnaissance Orbiter mission. Each NAC image was registered horizontally to the LRO's Lunar Orbiter Laser Altimeter (LOLA) global DEM, and then mosaicked together and color balanced. The mosaic is generated at the same resolution at which the individual LROC NAC images were gathered, which is approximately 1 meters/pixel.]]
 }
 
 local treks_schrodingerseequirect = {
   Identifier = "schrodingerseequirect",
   Name = [[LRO Narrow Angle Camera, Mosaic Schrodinger SouthEast]],
-  FilePath = asset.localResource("LRO_Narrow_Angle_Camera/Mosaic_Schrodinger_SouthEast.vrt"),
+  FilePath = asset.resource("LRO_Narrow_Angle_Camera/Mosaic_Schrodinger_SouthEast.vrt"),
   Description = [[This is a visible image mosaic generated using Lunar Reconnaissance Orbiter Camera (LROC) Narrow Angle Camera (NAC) images from the Lunar Reconnaissance Orbiter mission. Each NAC image was registered horizontally to the LRO's Lunar Orbiter Laser Altimeter (LOLA) global DEM, and then mosaicked together and color balanced. The mosaic is generated at the same resolution at which the individual LROC NAC images were gathered, which is approximately 1 meters/pixel.]]
 }
 
 local treks_small_tranq_skylight_1 = {
   Identifier = "small_tranq_skylight_1",
   Name = [[LRO Narrow Angle Camera, Mosaic Small Tranquilltatis 1]],
-  FilePath = asset.localResource("LRO_Narrow_Angle_Camera/Mosaic_Small_Tranquilltatis_1.vrt"),
+  FilePath = asset.resource("LRO_Narrow_Angle_Camera/Mosaic_Small_Tranquilltatis_1.vrt"),
   Description = [[The discovery of three lunar pits using imagery from imagery obtained using the Kaguya Terrain Camera led researchers to wonder how common such features might be. A very successful campaign was mounted to search Lunar Reconnaissance Orbiter Narrow Angle Camera (NAC) images to see if the higher resolution of NAC might reveal more lunar pits smaller than were detectable with the Kaguya Terrain Camera (R. V. Wagner and M. S. Robinson, 2015, UPDATE: THE SEARCH FOR LUNAR PITS, 2nd International Planetary Caves Conference). Researchers speculate that these lunar pits could be skylights resulting from roof collapse in lava tubes. Whether this is actually the case, and if so, the accessibility and extent of the lava tubes have yet to be determined. However, such lava tubes are of great interest as potential locations for lunar bases, offering protection from extreme swings in temperature, galactic and solar radiation, and meteoroid impacts. This data layer was obtained using the Narrow Angle Camera aboard the Lunar Reconnaissance Orbiter and is a is a mosaic of 2 NAC strips centered on a small pit in Mare Tranquillitatis.]]
 }
 
 local treks_small_tranq_skylight_2 = {
   Identifier = "small_tranq_skylight_2",
   Name = [[LRO Narrow Angle Camera, Mosaic Small Tranquilltatis 2]],
-  FilePath = asset.localResource("LRO_Narrow_Angle_Camera/Mosaic_Small_Tranquilltatis_2.vrt"),
+  FilePath = asset.resource("LRO_Narrow_Angle_Camera/Mosaic_Small_Tranquilltatis_2.vrt"),
   Description = [[The discovery of three lunar pits using imagery from imagery obtained using the Kaguya Terrain Camera led researchers to wonder how common such features might be. A very successful campaign was mounted to search Lunar Reconnaissance Orbiter Narrow Angle Camera (NAC) images to see if the higher resolution of NAC might reveal more lunar pits smaller than were detectable with the Kaguya Terrain Camera (R. V. Wagner and M. S. Robinson, 2015, UPDATE: THE SEARCH FOR LUNAR PITS, 2nd International Planetary Caves Conference). Researchers speculate that these lunar pits could be skylights resulting from roof collapse in lava tubes. Whether this is actually the case, and if so, the accessibility and extent of the lava tubes have yet to be determined. However, such lava tubes are of great interest as potential locations for lunar bases, offering protection from extreme swings in temperature, galactic and solar radiation, and meteoroid impacts. This data layer was obtained using the Narrow Angle Camera aboard the Lunar Reconnaissance Orbiter and is a is a mosaic of 2 NAC strips centered on a small pit in Mare Tranquillitatis.]]
 }
 
 local treks_NAC_DTM_APOLLO17_SLOPE = {
   Identifier = "NAC_DTM_APOLLO17_SLOPE",
   Name = [[LRO Narrow Angle Camera, Slope Apollo 17]],
-  FilePath = asset.localResource("LRO_Narrow_Angle_Camera/Slope_Apollo_17.vrt"),
+  FilePath = asset.resource("LRO_Narrow_Angle_Camera/Slope_Apollo_17.vrt"),
   Description = [[This is a color slope map derived from a 5m Digital Terrain Model (DTM) of the Apollo 17 landing site created with Narrow Angle Camera (NAC) stereo image pairs from the Lunar Reconnaissance Orbiter Camera (LROC) aboard the Lunar Reconnaissance Orbiter (LRO). Image is 3-channel RGB TIFF, 8 bits/sample, 3 samples/pixel in single image plane configuration]]
 }
 
diff --git a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_WAC-GLD100_DEM.asset b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_WAC-GLD100_DEM.asset
index b79cfafafa..46d3eba271 100644
--- a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_WAC-GLD100_DEM.asset
+++ b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_WAC-GLD100_DEM.asset
@@ -9,7 +9,7 @@ local globeIdentifier = asset.require("scene/solarsystem//planets/earth/moon/moo
 local treks_LRO_WACGLD100_Gray_79S79N_256ppd = {
   Identifier = "LRO_WACGLD100_Gray_79S79N_256ppd",
   Name = [[LRO WAC-GLD100 DEM, Grayscale]],
-  FilePath = asset.localResource("LRO_WAC-GLD100_DEM/Grayscale.vrt"),
+  FilePath = asset.resource("LRO_WAC-GLD100_DEM/Grayscale.vrt"),
   Description = [[]]
 }
 
diff --git a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_WAC_GLD100_DEM.asset b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_WAC_GLD100_DEM.asset
index b1e8e6ab82..1f64a5cbce 100644
--- a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_WAC_GLD100_DEM.asset
+++ b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_WAC_GLD100_DEM.asset
@@ -9,14 +9,14 @@ local globeIdentifier = asset.require("scene/solarsystem//planets/earth/moon/moo
 local treks_LRO_WACGLD100_ClrShade_79S79N_256ppd = {
   Identifier = "LRO_WACGLD100_ClrShade_79S79N_256ppd",
   Name = [[LRO WAC GLD100 DEM, ColorHillShade]],
-  FilePath = asset.localResource("LRO_WAC_GLD100_DEM/ColorHillShade.vrt"),
+  FilePath = asset.resource("LRO_WAC_GLD100_DEM/ColorHillShade.vrt"),
   Description = [[]]
 }
 
 local treks_LRO_WACGLD100_Shade_79S79N_256ppd = {
   Identifier = "LRO_WACGLD100_Shade_79S79N_256ppd",
   Name = [[LRO WAC GLD100 DEM, Hillshade]],
-  FilePath = asset.localResource("LRO_WAC_GLD100_DEM/Hillshade.vrt"),
+  FilePath = asset.resource("LRO_WAC_GLD100_DEM/Hillshade.vrt"),
   Description = [[]]
 }
 
diff --git a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_and_Kaguya_Multi_Instruments_1895.21mpp.asset b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_and_Kaguya_Multi_Instruments_1895.21mpp.asset
index b712baf75b..7a72733e9e 100644
--- a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_and_Kaguya_Multi_Instruments_1895.21mpp.asset
+++ b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_and_Kaguya_Multi_Instruments_1895.21mpp.asset
@@ -9,35 +9,35 @@ local globeIdentifier = asset.require("scene/solarsystem//planets/earth/moon/moo
 local treks_3He_Dig_Here_Layer = {
   Identifier = "3He_Dig_Here_Layer",
   Name = [[LRO and Kaguya Multi Instruments 1895.21mpp, 3He Dig Here]],
-  FilePath = asset.localResource("LRO_and_Kaguya_Multi_Instruments_1895.21mpp/3He_Dig_Here.vrt"),
+  FilePath = asset.resource("LRO_and_Kaguya_Multi_Instruments_1895.21mpp/3He_Dig_Here.vrt"),
   Description = [[This data represents potential Helium-3 deposits and other solar wind implanted volatiles on the Moon. This data layer has been generated by querying specific criteria from the following datasets: Titanium Oxide (TiO2) abundance from Lunar Reconnaissance Orbiter&rsquo;s (LRO) Wide-Angle Camera (WAC), Optical Maturity Index (OMAT) from Kaguya Lunar Multiband Imager (MI), slope from LRO&rsquo;s Lunar Orbital Laser Altimeter (LOLA), and Rock Abundance from LRO&rsquo;s Lunar Radiometer Experiment (DIVINER). For this &ldquo;Dig Here&rdquo; layer, the following criteria has been applied: TiO2 &gt; 9.0&percnt;, OMAT &lt; 0.15, Slope &lt; 4&deg;, and rock abundance &lt; 0.02&percnt;. The research on Helium-3 as a potential use for fuel for a fusion cell and the data presented as a result of this research culminated as an outcome of a group project at the Colorado School of Mines. The research for this data should be credited to: Stewart Ray, Colleen Olson, Lisa Robibero, Steven Coutts, and Maxwell Sissman of the Planetary and Terrestrial Mining Sciences Symposium and Space Resources Roundtable, Colorado School of Mines.]]
 }
 
 local treks_3He_Likely_Layer = {
   Identifier = "3He_Likely_Layer",
   Name = [[LRO and Kaguya Multi Instruments 1895.21mpp, 3He Likely]],
-  FilePath = asset.localResource("LRO_and_Kaguya_Multi_Instruments_1895.21mpp/3He_Likely.vrt"),
+  FilePath = asset.resource("LRO_and_Kaguya_Multi_Instruments_1895.21mpp/3He_Likely.vrt"),
   Description = [[This data represents potential Helium-3 deposits and other solar wind implanted volatiles on the Moon. This data layer has been generated by querying specific criteria from the following datasets: Titanium Oxide (TiO2) abundance from Lunar Reconnaissance Orbiter&rsquo;s (LRO) Wide-Angle Camera (WAC), Optical Maturity Index (OMAT) from Kaguya Lunar Multiband Imager (MI), slope from LRO&rsquo;s Lunar Orbital Laser Altimeter (LOLA), and Rock Abundance from LRO&rsquo;s Lunar Radiometer Experiment (DIVINER). For this &ldquo;Likely&rdquo; layer, the following criteria has been applied: TiO2 &gt; 3.0&percnt;, OMAT &lt; 0.25, Slope &lt; 20&deg;, and rock abundance &lt; 0.10&percnt;. The research on Helium-3 as a potential use for fuel for a fusion cell and the data presented as a result of this research culminated as an outcome of a group project at the Colorado School of Mines. The research for this data should be credited to: Stewart Ray, Colleen Olson, Lisa Robibero, Steven Coutts, and Maxwell Sissman of the Planetary and Terrestrial Mining Sciences Symposium and Space Resources Roundtable, Colorado School of Mines.]]
 }
 
 local treks_3He_More_Likely_Layer = {
   Identifier = "3He_More_Likely_Layer",
   Name = [[LRO and Kaguya Multi Instruments 1895.21mpp, 3He More Likely]],
-  FilePath = asset.localResource("LRO_and_Kaguya_Multi_Instruments_1895.21mpp/3He_More_Likely.vrt"),
+  FilePath = asset.resource("LRO_and_Kaguya_Multi_Instruments_1895.21mpp/3He_More_Likely.vrt"),
   Description = [[This data represents potential Helium-3 deposits and other solar wind implanted volatiles on the Moon. This data layer has been generated by querying specific criteria from the following datasets: Titanium Oxide (TiO2) abundance from Lunar Reconnaissance Orbiter&rsquo;s (LRO) Wide-Angle Camera (WAC), Optical Maturity Index (OMAT) from Kaguya Lunar Multiband Imager (MI), slope from LRO&rsquo;s Lunar Orbital Laser Altimeter (LOLA), and Rock Abundance from LRO&rsquo;s Lunar Radiometer Experiment (DIVINER). For this &ldquo;More Likely&rdquo; layer, the following criteria has been applied: TiO2 &gt; 4.5&percnt;, OMAT &lt; 0.225, Slope &lt; 16&deg;, and rock abundance &lt; 0.08&percnt;. The research on Helium-3 as a potential use for fuel for a fusion cell and the data presented as a result of this research culminated as an outcome of a group project at the Colorado School of Mines. The research for this data should be credited to: Stewart Ray, Colleen Olson, Lisa Robibero, Steven Coutts, and Maxwell Sissman of the Planetary and Terrestrial Mining Sciences Symposium and Space Resources Roundtable, Colorado School of Mines.]]
 }
 
 local treks_3He_Most_Likely_Layer = {
   Identifier = "3He_Most_Likely_Layer",
   Name = [[LRO and Kaguya Multi Instruments 1895.21mpp, 3He Most Likely]],
-  FilePath = asset.localResource("LRO_and_Kaguya_Multi_Instruments_1895.21mpp/3He_Most_Likely.vrt"),
+  FilePath = asset.resource("LRO_and_Kaguya_Multi_Instruments_1895.21mpp/3He_Most_Likely.vrt"),
   Description = [[This data represents potential Helium-3 deposits and other solar wind implanted volatiles on the Moon. This data layer has been generated by querying specific criteria from the following datasets: Titanium Oxide (TiO2) abundance from Lunar Reconnaissance Orbiter&rsquo;s (LRO) Wide-Angle Camera (WAC), Optical Maturity Index (OMAT) from Kaguya Lunar Multiband Imager (MI), slope from LRO&rsquo;s Lunar Orbital Laser Altimeter (LOLA), and Rock Abundance from LRO&rsquo;s Lunar Radiometer Experiment (DIVINER). For this &ldquo;Most Likely&rdquo; layer, the following criteria has been applied: TiO2 &gt; 7.5&percnt;, OMAT &lt; 0.175, Slope &lt; 8&deg;, and rock abundance &lt; 0.04&percnt;. The research on Helium-3 as a potential use for fuel for a fusion cell and the data presented as a result of this research culminated as an outcome of a group project at the Colorado School of Mines. The research for this data should be credited to: Stewart Ray, Colleen Olson, Lisa Robibero, Steven Coutts, and Maxwell Sissman of the Planetary and Terrestrial Mining Sciences Symposium and Space Resources Roundtable, Colorado School of Mines.]]
 }
 
 local treks_3He_Very_Likely_Layer = {
   Identifier = "3He_Very_Likely_Layer",
   Name = [[LRO and Kaguya Multi Instruments 1895.21mpp, 3He Very Likely]],
-  FilePath = asset.localResource("LRO_and_Kaguya_Multi_Instruments_1895.21mpp/3He_Very_Likely.vrt"),
+  FilePath = asset.resource("LRO_and_Kaguya_Multi_Instruments_1895.21mpp/3He_Very_Likely.vrt"),
   Description = [[This data represents potential Helium-3 deposits and other solar wind implanted volatiles on the Moon. This data layer has been generated by querying specific criteria from the following datasets: Titanium Oxide (TiO2) abundance from Lunar Reconnaissance Orbiter&rsquo;s (LRO) Wide-Angle Camera (WAC), Optical Maturity Index (OMAT) from Kaguya Lunar Multiband Imager (MI), slope from LRO&rsquo;s Lunar Orbital Laser Altimeter (LOLA), and Rock Abundance from LRO&rsquo;s Lunar Radiometer Experiment (DIVINER). For this &ldquo;Very Likely&rdquo; layer, the following criteria has been applied: TiO2 &gt; 6.0&percnt;, OMAT &lt; 0.20, Slope &lt; 12&deg;, and rock abundance &lt; 0.06&percnt;. The research on Helium-3 as a potential use for fuel for a fusion cell and the data presented as a result of this research culminated as an outcome of a group project at the Colorado School of Mines. The research for this data should be credited to: Stewart Ray, Colleen Olson, Lisa Robibero, Steven Coutts, and Maxwell Sissman of the Planetary and Terrestrial Mining Sciences Symposium and Space Resources Roundtable, Colorado School of Mines.]]
 }
 
diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/2000_carbon_monoxide.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/2000_carbon_monoxide.asset
index e627c703e4..f80b089ff5 100644
--- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/2000_carbon_monoxide.asset
+++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/2000_carbon_monoxide.asset
@@ -16,7 +16,7 @@ volcanoes and brush burning. Between the anthropogenic and natural sources, scie
 estimate that the annual production of carbon monoxide is 2-5 gigatons]]
 local URL = "https://sos.noaa.gov/catalog/datasets/carbon-monoxide-2000/"
 
-local syncedDirectory = asset.syncedResource({
+local syncedDirectory = asset.resource({
   Name = Name,
   Type = "HttpSynchronization",
   Identifier = Identifier,
diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/2004_ir_hurricane.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/2004_ir_hurricane.asset
index b7c88a2d5e..e3122e3be3 100644
--- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/2004_ir_hurricane.asset
+++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/2004_ir_hurricane.asset
@@ -16,7 +16,7 @@ hurricane season]]
 local URL = "https://sos.noaa.gov/catalog/datasets/hurricane-season-2004/"
 
 
-local syncedDirectory = asset.syncedResource({
+local syncedDirectory = asset.resource({
   Name = Name,
   Type = "HttpSynchronization",
   Identifier = Identifier,
diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/2005_hurricane-grayir.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/2005_hurricane-grayir.asset
index 22d4c3ffa4..54dc62e0eb 100644
--- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/2005_hurricane-grayir.asset
+++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/2005_hurricane-grayir.asset
@@ -12,7 +12,7 @@ commerce for oceans and atmosphere and NOAA administrator]]
 local URL = "https://sos.noaa.gov/catalog/datasets/hurricane-season-2005/"
 
 
-local syncedDirectory = asset.syncedResource({
+local syncedDirectory = asset.resource({
   Name = Name,
   Type = "HttpSynchronization",
   Identifier = Identifier,
diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/2005_hurricane-wvsst.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/2005_hurricane-wvsst.asset
index b904040628..c0ef080763 100644
--- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/2005_hurricane-wvsst.asset
+++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/2005_hurricane-wvsst.asset
@@ -12,7 +12,7 @@ commerce for oceans and atmosphere and NOAA administrator]]
 local URL = "https://sos.noaa.gov/catalog/datasets/hurricane-season-water-vapor-and-sst-2005/"
 
 
-local syncedDirectory = asset.syncedResource({
+local syncedDirectory = asset.resource({
   Name = Name,
   Type = "HttpSynchronization",
   Identifier = Identifier,
diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/2012_hurricane.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/2012_hurricane.asset
index 3d1c11732e..3f3e9068a4 100644
--- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/2012_hurricane.asset
+++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/2012_hurricane.asset
@@ -18,7 +18,7 @@ recorded by geostationary satellites]]
 local URL = "https://sos.noaa.gov/catalog/datasets/hurricane-season-2012/"
 
 
-local syncedDirectory = asset.syncedResource({
+local syncedDirectory = asset.resource({
   Name = Name,
   Type = "HttpSynchronization",
   Identifier = Identifier,
diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/aerosol_blackcarbon.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/aerosol_blackcarbon.asset
index 46d0b31305..9f1f47fd8c 100644
--- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/aerosol_blackcarbon.asset
+++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/aerosol_blackcarbon.asset
@@ -20,7 +20,7 @@ Pinatubo]]
 local URL = "https://sos.noaa.gov/catalog/datasets/aerosols-black-carbon/"
 
 
-local syncedDirectory = asset.syncedResource({
+local syncedDirectory = asset.resource({
   Name = Name,
   Type = "HttpSynchronization",
   Identifier = Identifier,
diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/aerosol_blackcarbon_and_sulfate.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/aerosol_blackcarbon_and_sulfate.asset
index 635dd828d8..86bf016ffc 100644
--- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/aerosol_blackcarbon_and_sulfate.asset
+++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/aerosol_blackcarbon_and_sulfate.asset
@@ -20,7 +20,7 @@ Pinatubo]]
 local URL = "https://sos.noaa.gov/catalog/datasets/aerosols-black-carbon-and-sulfate/"
 
 
-local syncedDirectory = asset.syncedResource({
+local syncedDirectory = asset.resource({
   Name = Name,
   Type = "HttpSynchronization",
   Identifier = Identifier,
diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/aerosol_sulfate.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/aerosol_sulfate.asset
index 68f8a0bd14..6a7ebd203e 100644
--- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/aerosol_sulfate.asset
+++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/aerosol_sulfate.asset
@@ -20,7 +20,7 @@ Pinatubo]]
 local URL = "https://sos.noaa.gov/catalog/datasets/aerosols-sulfate/"
 
 
-local syncedDirectory = asset.syncedResource({
+local syncedDirectory = asset.resource({
   Name = Name,
   Type = "HttpSynchronization",
   Identifier = Identifier,
diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/airtraffic.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/airtraffic.asset
index fcddb6a034..e4d6d301e7 100644
--- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/airtraffic.asset
+++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/airtraffic.asset
@@ -15,7 +15,7 @@ takeoffs and landings." - From the National Air Traffic Controllers Association
 local URL = "https://sos.noaa.gov/catalog/datasets/air-traffic/"
 
 
-local syncedDirectory = asset.syncedResource({
+local syncedDirectory = asset.resource({
   Name = Name,
   Type = "HttpSynchronization",
   Identifier = Identifier,
diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/all_sats.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/all_sats.asset
index 7a1467473a..80b2539b4a 100644
--- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/all_sats.asset
+++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/all_sats.asset
@@ -20,7 +20,7 @@ than one day]]
 local URL = "https://sos.noaa.gov/catalog/datasets/satellites-paths-and-positions/"
 
 
-local syncedDirectory = asset.syncedResource({
+local syncedDirectory = asset.resource({
   Name = Name,
   Type = "HttpSynchronization",
   Identifier = Identifier,
diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/aqua_swath.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/aqua_swath.asset
index f272694ac0..5b7df40b5a 100644
--- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/aqua_swath.asset
+++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/aqua_swath.asset
@@ -19,7 +19,7 @@ about the same local time everyday. Aqua crosses the equator from south to north
 local URL = "https://sos.noaa.gov/catalog/datasets/polar-orbiting-aqua-satellite-and-modis-swath/"
 
 
-local syncedDirectory = asset.syncedResource({
+local syncedDirectory = asset.resource({
   Name = Name,
   Type = "HttpSynchronization",
   Identifier = Identifier,
diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/carbonflux.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/carbonflux.asset
index 1f9b8a1bb3..a1f6807fdf 100644
--- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/carbonflux.asset
+++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/carbonflux.asset
@@ -18,7 +18,7 @@ for CO2 and related trace gases. The data set shows daily average fluxes constru
 local URL = "https://sos.noaa.gov/catalog/datasets/polar-orbiting-aqua-satellite-and-modis-swath/"
 
 
-local syncedDirectory = asset.syncedResource({
+local syncedDirectory = asset.resource({
   Name = Name,
   Type = "HttpSynchronization",
   Identifier = Identifier,
diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/carbontracker_2000_2100-fixed_scale.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/carbontracker_2000_2100-fixed_scale.asset
index f56bd621f2..dd969db107 100644
--- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/carbontracker_2000_2100-fixed_scale.asset
+++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/carbontracker_2000_2100-fixed_scale.asset
@@ -18,7 +18,7 @@ performed by the NOAA Global Monitoring Division and international partners]]
 local URL = "https://sos.noaa.gov/catalog/datasets/carbon-tracker-fixed-scale/"
 
 
-local syncedDirectory = asset.syncedResource({
+local syncedDirectory = asset.resource({
   Name = Name,
   Type = "HttpSynchronization",
   Identifier = Identifier,
diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/carbontracker_2000_2100-sliding_scale.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/carbontracker_2000_2100-sliding_scale.asset
index d63b070c1b..cb1c676a70 100644
--- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/carbontracker_2000_2100-sliding_scale.asset
+++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/carbontracker_2000_2100-sliding_scale.asset
@@ -18,7 +18,7 @@ performed by the NOAA Global Monitoring Division and international partners]]
 local URL = "https://sos.noaa.gov/catalog/datasets/carbon-tracker-sliding-scale/"
 
 
-local syncedDirectory = asset.syncedResource({
+local syncedDirectory = asset.resource({
   Name = Name,
   Type = "HttpSynchronization",
   Identifier = Identifier,
diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/climate_niche.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/climate_niche.asset
index d66a48f2e3..d6fcfabaf8 100644
--- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/climate_niche.asset
+++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/climate_niche.asset
@@ -21,7 +21,7 @@ projected to cover 19% of the global land and impact an estimated 3.5 billion pe
 local URL = "https://sos.noaa.gov/catalog/datasets/human-climate-niche-2020-and-2070/"
 
 
-local syncedDirectory = asset.syncedResource({
+local syncedDirectory = asset.resource({
   Name = Name,
   Type = "HttpSynchronization",
   Identifier = Identifier,
diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/co_gmd.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/co_gmd.asset
index d65682d582..557670a013 100644
--- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/co_gmd.asset
+++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/co_gmd.asset
@@ -19,7 +19,7 @@ emissions from heavy traffic can produce CO concentrations of 200 - 5000 ppb]]
 local URL = "https://sos.noaa.gov/catalog/datasets/carbon-monoxide-2008-2011/"
 
 
-local syncedDirectory = asset.syncedResource({
+local syncedDirectory = asset.resource({
   Name = Name,
   Type = "HttpSynchronization",
   Identifier = Identifier,
diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/fim_chem.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/fim_chem.asset
index a8d9eaa785..9799f9951c 100644
--- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/fim_chem.asset
+++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/fim_chem.asset
@@ -15,7 +15,7 @@ for better Earth system modeling for climate prediction]]
 local URL = "https://sos.noaa.gov/catalog/datasets/aerosols-fim-chem-model/"
 
 
-local syncedDirectory = asset.syncedResource({
+local syncedDirectory = asset.resource({
   Name = Name,
   Type = "HttpSynchronization",
   Identifier = Identifier,
diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/fossil_fuel.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/fossil_fuel.asset
index 340d39938a..fc43fc2b5a 100644
--- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/fossil_fuel.asset
+++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/fossil_fuel.asset
@@ -22,7 +22,7 @@ human management of global resources]]
 local URL = "https://sos.noaa.gov/catalog/datasets/fossil-fuel-co2-release-2011-2012/"
 
 
-local syncedDirectory = asset.syncedResource({
+local syncedDirectory = asset.resource({
   Name = Name,
   Type = "HttpSynchronization",
   Identifier = Identifier,
diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/fukushima.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/fukushima.asset
index 5745f85178..6f7c10371b 100644
--- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/fukushima.asset
+++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/fukushima.asset
@@ -14,7 +14,7 @@ passively follow the wind]]
 local URL = "https://sos.noaa.gov/catalog/datasets/fukushima-radioactive-aerosol-dispersion-model/"
 
 
-local syncedDirectory = asset.syncedResource({
+local syncedDirectory = asset.resource({
   Name = Name,
   Type = "HttpSynchronization",
   Identifier = Identifier,
diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/geo_sat.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/geo_sat.asset
index c1b307452d..6b907476bf 100644
--- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/geo_sat.asset
+++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/geo_sat.asset
@@ -18,7 +18,7 @@ local Description = [[Geostationary satellites are a key tool for scientists to
 local URL = "https://sos.noaa.gov/catalog/datasets/geostationary-satellites/"
 
 
-local syncedDirectory = asset.syncedResource({
+local syncedDirectory = asset.resource({
   Name = Name,
   Type = "HttpSynchronization",
   Identifier = Identifier,
diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/geo_scan.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/geo_scan.asset
index ea7f80eaa2..673b40fff3 100644
--- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/geo_scan.asset
+++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/geo_scan.asset
@@ -18,7 +18,7 @@ worldwide]]
 local URL = "https://sos.noaa.gov/catalog/datasets/geostationary-satellites-scanning-pattern/"
 
 
-local syncedDirectory = asset.syncedResource({
+local syncedDirectory = asset.resource({
   Name = Name,
   Type = "HttpSynchronization",
   Identifier = Identifier,
diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/giss_temp_anom.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/giss_temp_anom.asset
index 93c0bb28bb..3c46da965f 100644
--- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/giss_temp_anom.asset
+++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/giss_temp_anom.asset
@@ -10,7 +10,7 @@ not absolute temperature]]
 local URL = "https://sos.noaa.gov/catalog/datasets/temperature-anomaly-nasa-1884-2012/"
 
 
-local syncedDirectory = asset.syncedResource({
+local syncedDirectory = asset.resource({
   Name = Name,
   Type = "HttpSynchronization",
   Identifier = Identifier,
diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/globe-insolation.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/globe-insolation.asset
index 169c523ede..882d03bc59 100644
--- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/globe-insolation.asset
+++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/globe-insolation.asset
@@ -14,7 +14,7 @@ places]]
 local URL = "https://sos.noaa.gov/catalog/datasets/solar-insolation-monthly-nasa/"
 
 
-local syncedDirectory = asset.syncedResource({
+local syncedDirectory = asset.resource({
   Name = Name,
   Type = "HttpSynchronization",
   Identifier = Identifier,
diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/globe-rainfall.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/globe-rainfall.asset
index 8ad3926164..712af8bc9f 100644
--- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/globe-rainfall.asset
+++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/globe-rainfall.asset
@@ -14,7 +14,7 @@ atmosphere. This heating is a major part of Earth's energy budget and climate]]
 local URL = "https://sos.noaa.gov/catalog/datasets/rainfall-monthly-nasa/"
 
 
-local syncedDirectory = asset.syncedResource({
+local syncedDirectory = asset.resource({
   Name = Name,
   Type = "HttpSynchronization",
   Identifier = Identifier,
diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/harvey-clouds_precip.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/harvey-clouds_precip.asset
index c41747a256..a5cf15c25c 100644
--- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/harvey-clouds_precip.asset
+++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/harvey-clouds_precip.asset
@@ -14,7 +14,7 @@ local Description = [[Hurricane Harvey was an extremely destructive Atlantic hur
 local URL = "https://sos.noaa.gov/catalog/datasets/hurricane-harvey-clouds-with-precipitation-2017/"
 
 
-local syncedDirectory = asset.syncedResource({
+local syncedDirectory = asset.resource({
   Name = Name,
   Type = "HttpSynchronization",
   Identifier = Identifier,
diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/hurricane_season_2017.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/hurricane_season_2017.asset
index c380649be9..abb12828da 100644
--- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/hurricane_season_2017.asset
+++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/hurricane_season_2017.asset
@@ -17,7 +17,7 @@ and calling on volunteers for help]]
 local URL = "https://sos.noaa.gov/catalog/datasets/hurricane-season-2017/"
 
 
-local syncedDirectory = asset.syncedResource({
+local syncedDirectory = asset.resource({
   Name = Name,
   Type = "HttpSynchronization",
   Identifier = Identifier,
diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/hurricane_season_2017_wvsst.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/hurricane_season_2017_wvsst.asset
index b1aba5e1e8..94c7b73a8b 100644
--- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/hurricane_season_2017_wvsst.asset
+++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/hurricane_season_2017_wvsst.asset
@@ -17,7 +17,7 @@ local Description = [[After a long lull in major hurricanes striking the U.S.
 local URL = "https://sos.noaa.gov/catalog/datasets/hurricane-season-water-vapor-and-sst-2017/"
 
 
-local syncedDirectory = asset.syncedResource({
+local syncedDirectory = asset.resource({
   Name = Name,
   Type = "HttpSynchronization",
   Identifier = Identifier,
diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/hurricane_tracks-cumulative.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/hurricane_tracks-cumulative.asset
index 0fd6929d3e..26b8ec90e4 100644
--- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/hurricane_tracks-cumulative.asset
+++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/hurricane_tracks-cumulative.asset
@@ -12,7 +12,7 @@ been created to predict hurricane paths include the historical data in their mod
 local URL = "https://sos.noaa.gov/catalog/datasets/hurricane-tracks-cumulative-1950-2005/"
 
 
-local syncedDirectory = asset.syncedResource({
+local syncedDirectory = asset.resource({
   Name = Name,
   Type = "HttpSynchronization",
   Identifier = Identifier,
diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/isaac.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/isaac.asset
index 19782cbd5a..05d3d2c136 100644
--- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/isaac.asset
+++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/isaac.asset
@@ -15,7 +15,7 @@ brought significant amounts of rain to the southeastern United States]]
 local URL = "https://sos.noaa.gov/catalog/datasets/hurricane-isaac-2012/"
 
 
-local syncedDirectory = asset.syncedResource({
+local syncedDirectory = asset.resource({
   Name = Name,
   Type = "HttpSynchronization",
   Identifier = Identifier,
diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/iss_track.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/iss_track.asset
index 7d7ed3c86c..1885b12d30 100644
--- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/iss_track.asset
+++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/iss_track.asset
@@ -18,7 +18,7 @@ local Description = [[The first piece of the International Space Station was sen
 local URL = "https://sos.noaa.gov/catalog/datasets/international-space-station-track/"
 
 
-local syncedDirectory = asset.syncedResource({
+local syncedDirectory = asset.resource({
   Name = Name,
   Type = "HttpSynchronization",
   Identifier = Identifier,
diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/land_temp.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/land_temp.asset
index a592db0723..b7b37a9708 100644
--- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/land_temp.asset
+++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/land_temp.asset
@@ -14,7 +14,7 @@ the University of Delaware]]
 local URL = "https://sos.noaa.gov/catalog/datasets/international-space-station-track/"
 
 
-local syncedDirectory = asset.syncedResource({
+local syncedDirectory = asset.resource({
   Name = Name,
   Type = "HttpSynchronization",
   Identifier = Identifier,
diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/lightning.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/lightning.asset
index 6528b0afb8..01371824a9 100644
--- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/lightning.asset
+++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/lightning.asset
@@ -15,7 +15,7 @@ number of lightning flashes per square kilometer]]
 local URL = "https://sos.noaa.gov/catalog/datasets/lightning-flash-rate/"
 
 
-local syncedDirectory = asset.syncedResource({
+local syncedDirectory = asset.resource({
   Name = Name,
   Type = "HttpSynchronization",
   Identifier = Identifier,
diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/ltg_vaisala.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/ltg_vaisala.asset
index 9b7feb1d1f..6ded0d0620 100644
--- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/ltg_vaisala.asset
+++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/ltg_vaisala.asset
@@ -19,7 +19,7 @@ number of events. This dataset runs from June 2011 through August 2012]]
 local URL = "c"
 
 
-local syncedDirectory = asset.syncedResource({
+local syncedDirectory = asset.resource({
   Name = Name,
   Type = "HttpSynchronization",
   Identifier = Identifier,
diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/nasa_sats.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/nasa_sats.asset
index 43bf62187a..46cf73d447 100644
--- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/nasa_sats.asset
+++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/nasa_sats.asset
@@ -17,7 +17,7 @@ of the satellites are currently in orbit, and the sixth satellite is scheduled t
 launched in 2008]]
 local URL = "https://sos.noaa.gov/catalog/datasets/polar-orbiting-nasa-a-train-satellites/"
 
-local syncedDirectory = asset.syncedResource({
+local syncedDirectory = asset.resource({
   Name = Name,
   Type = "HttpSynchronization",
   Identifier = Identifier,
diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/nccs_models-carbon.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/nccs_models-carbon.asset
index d059ba1cd8..199a26002f 100644
--- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/nccs_models-carbon.asset
+++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/nccs_models-carbon.asset
@@ -14,7 +14,7 @@ atmosphere]]
 local URL = "https://sos.noaa.gov/catalog/datasets/carbon-dioxide-concentration-geos-5-model/"
 
 
-local syncedDirectory = asset.syncedResource({
+local syncedDirectory = asset.resource({
   Name = Name,
   Type = "HttpSynchronization",
   Identifier = Identifier,
diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/nccs_models-chem.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/nccs_models-chem.asset
index 30ca95c704..0861878015 100644
--- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/nccs_models-chem.asset
+++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/nccs_models-chem.asset
@@ -14,7 +14,7 @@ and climate]]
 local URL = "https://sos.noaa.gov/catalog/datasets/atmospheric-chemistry-geos-5-model/"
 
 
-local syncedDirectory = asset.syncedResource({
+local syncedDirectory = asset.resource({
   Name = Name,
   Type = "HttpSynchronization",
   Identifier = Identifier,
diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/nccs_models-winds.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/nccs_models-winds.asset
index 29759ea97c..e59570d7c1 100644
--- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/nccs_models-winds.asset
+++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/nccs_models-winds.asset
@@ -14,7 +14,7 @@ around the globe. Red, orange and yellow are used for the fastest moving air]]
 local URL = "https://sos.noaa.gov/catalog/datasets/winds-geos-5-model/"
 
 
-local syncedDirectory = asset.syncedResource({
+local syncedDirectory = asset.resource({
   Name = Name,
   Type = "HttpSynchronization",
   Identifier = Identifier,
diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/no2_omsi.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/no2_omsi.asset
index 6cdf0ac2b7..0b089d56d4 100644
--- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/no2_omsi.asset
+++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/no2_omsi.asset
@@ -15,7 +15,7 @@ local Description = [[Nitrogen dioxide (NO2) is a key component of urban air pol
 local URL = "https://sos.noaa.gov/catalog/datasets/nitrogen-dioxide/"
 
 
-local syncedDirectory = asset.syncedResource({
+local syncedDirectory = asset.resource({
   Name = Name,
   Type = "HttpSynchronization",
   Identifier = Identifier,
diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/noaa_sat-tracks.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/noaa_sat-tracks.asset
index d5f3f9e2c9..e4ccbcf3f8 100644
--- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/noaa_sat-tracks.asset
+++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/noaa_sat-tracks.asset
@@ -19,7 +19,7 @@ other applications]]
 local URL = "https://sos.noaa.gov/catalog/datasets/polar-orbiting-noaa-satellite-tracks/"
 
 
-local syncedDirectory = asset.syncedResource({
+local syncedDirectory = asset.resource({
   Name = Name,
   Type = "HttpSynchronization",
   Identifier = Identifier,
diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/pclim.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/pclim.asset
index ad471808da..b10da7f4b6 100644
--- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/pclim.asset
+++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/pclim.asset
@@ -12,7 +12,7 @@ normal]]
 local URL = "https://sos.noaa.gov/catalog/datasets/temperature-anomaly-yearly-500-2006-paleoclimate-evidence/"
 
 
-local syncedDirectory = asset.syncedResource({
+local syncedDirectory = asset.resource({
   Name = Name,
   Type = "HttpSynchronization",
   Identifier = Identifier,
diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/poes_sat.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/poes_sat.asset
index ca3c100c52..72166327b2 100644
--- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/poes_sat.asset
+++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/poes_sat.asset
@@ -15,7 +15,7 @@ orbit the Earth 14.1 times per day]]
 local URL = "https://sos.noaa.gov/catalog/datasets/polar-orbiting-noaa-17-satellite-coverage/"
 
 
-local syncedDirectory = asset.syncedResource({
+local syncedDirectory = asset.resource({
   Name = Name,
   Type = "HttpSynchronization",
   Identifier = Identifier,
diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/reanalysis-antarctic.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/reanalysis-antarctic.asset
index 396092394f..3a31ab9c2c 100644
--- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/reanalysis-antarctic.asset
+++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/reanalysis-antarctic.asset
@@ -26,7 +26,7 @@ temporal resolution and 2 degree longitude by 2 degree latitude resolution]]
 local URL = "https://sos.noaa.gov/catalog/datasets/precipitable-water-antarctic-expedition-1902-1903/"
 
 
-local syncedDirectory = asset.syncedResource({
+local syncedDirectory = asset.resource({
   Name = Name,
   Type = "HttpSynchronization",
   Identifier = Identifier,
diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/reanalysis-elnino.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/reanalysis-elnino.asset
index dd23e40a4f..506e1eed80 100644
--- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/reanalysis-elnino.asset
+++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/reanalysis-elnino.asset
@@ -26,7 +26,7 @@ temporal resolution and 2 degree longitude by 2 degree latitude resolution]]
 local URL = "https://sos.noaa.gov/catalog/datasets/precipitable-water-el-nino-1917-1919/"
 
 
-local syncedDirectory = asset.syncedResource({
+local syncedDirectory = asset.resource({
   Name = Name,
   Type = "HttpSynchronization",
   Identifier = Identifier,
diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/reanalysis-hurricane.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/reanalysis-hurricane.asset
index 8e591c95fe..5f075a0882 100644
--- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/reanalysis-hurricane.asset
+++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/reanalysis-hurricane.asset
@@ -26,7 +26,7 @@ local Description = [[Until 2010, the longest globally-complete estimate of the
 local URL = "https://sos.noaa.gov/catalog/datasets/precipitable-water-galveston-hurricane-1900/"
 
 
-local syncedDirectory = asset.syncedResource({
+local syncedDirectory = asset.resource({
   Name = Name,
   Type = "HttpSynchronization",
   Identifier = Identifier,
diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/sandy.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/sandy.asset
index 2b02f27780..993858da9d 100644
--- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/sandy.asset
+++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/sandy.asset
@@ -10,7 +10,7 @@ local Description = [[Hurricane Sandy was a memorable and disastrous storm that
 local URL = "https://sos.noaa.gov/catalog/datasets/precipitable-water-galveston-hurricane-1900/"
 
 
-local syncedDirectory = asset.syncedResource({
+local syncedDirectory = asset.resource({
   Name = Name,
   Type = "HttpSynchronization",
   Identifier = Identifier,
diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/sunsync_sat.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/sunsync_sat.asset
index 4d0494246b..5642468f42 100644
--- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/sunsync_sat.asset
+++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/sunsync_sat.asset
@@ -15,7 +15,7 @@ orbit the Earth 14.1 times per day]]
 local URL = "https://sos.noaa.gov/catalog/datasets/polar-orbiting-noaa-17-and-noaa-18/"
 
 
-local syncedDirectory = asset.syncedResource({
+local syncedDirectory = asset.resource({
   Name = Name,
   Type = "HttpSynchronization",
   Identifier = Identifier,
diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/temp_anom.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/temp_anom.asset
index 490c0d6d37..7371f9ffca 100644
--- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/temp_anom.asset
+++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/temp_anom.asset
@@ -18,7 +18,7 @@ warmest]]
 local URL = "https://sos.noaa.gov/catalog/datasets/temperature-anomaly-yearly-noaa-1880-present/"
 
 
-local syncedDirectory = asset.syncedResource({
+local syncedDirectory = asset.resource({
   Name = Name,
   Type = "HttpSynchronization",
   Identifier = Identifier,
diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/tropical_widening.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/tropical_widening.asset
index dc9a991756..b06c47520c 100644
--- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/tropical_widening.asset
+++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/tropical_widening.asset
@@ -9,7 +9,7 @@ shows the changes in the tropical zone boundaries over the last three decades]]
 local URL = "https://sos.noaa.gov/catalog/datasets/tropical-widening/"
 
 
-local syncedDirectory = asset.syncedResource({
+local syncedDirectory = asset.resource({
   Name = Name,
   Type = "HttpSynchronization",
   Identifier = Identifier,
diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/typhoon_haiyan-wvsst.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/typhoon_haiyan-wvsst.asset
index 6ffe5657f2..49387eaf9c 100644
--- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/typhoon_haiyan-wvsst.asset
+++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/typhoon_haiyan-wvsst.asset
@@ -12,7 +12,7 @@ Real-time: SST from October 30th to November 12th, 2013]]
 local URL = "https://sos.noaa.gov/catalog/datasets/typhoon-haiyan-water-vapor-and-sst-oct-nov-2013/"
 
 
-local syncedDirectory = asset.syncedResource({
+local syncedDirectory = asset.resource({
   Name = Name,
   Type = "HttpSynchronization",
   Identifier = Identifier,
diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/typhoon_haiyan.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/typhoon_haiyan.asset
index 0f6f98766e..1895f32d98 100644
--- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/typhoon_haiyan.asset
+++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/typhoon_haiyan.asset
@@ -12,7 +12,7 @@ to 195 mph. If confirmed, it would beat the previous record holder, Hurricane Ca
 local URL = "https://sos.noaa.gov/catalog/datasets/typhoon-haiyan-oct-nov-2013/"
 
 
-local syncedDirectory = asset.syncedResource({
+local syncedDirectory = asset.resource({
   Name = Name,
   Type = "HttpSynchronization",
   Identifier = Identifier,
diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/volcano_ash.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/volcano_ash.asset
index 2fef56cbb0..bcb98981e5 100644
--- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/volcano_ash.asset
+++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/volcano_ash.asset
@@ -18,7 +18,7 @@ engine failures]]
 local URL = "https://sos.noaa.gov/catalog/datasets/volcanic-ash-eruption-iceland/"
 
 
-local syncedDirectory = asset.syncedResource({
+local syncedDirectory = asset.resource({
   Name = Name,
   Type = "HttpSynchronization",
   Identifier = Identifier,
diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/agriculture-cropland.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/agriculture-cropland.asset
index 3babd0b6d7..d2dc1af89d 100644
--- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/agriculture-cropland.asset
+++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/agriculture-cropland.asset
@@ -14,7 +14,7 @@ the area of Africa]]
 local URL = "https://sos.noaa.gov/catalog/datasets/agriculture-cropland-intensity/"
 
 
-local syncedDirectory = asset.syncedResource({
+local syncedDirectory = asset.resource({
   Name = Name,
   Type = "HttpSynchronization",
   Identifier = Identifier,
diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/agriculture-pastureland.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/agriculture-pastureland.asset
index 5e0ddef36e..83900b4dab 100644
--- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/agriculture-pastureland.asset
+++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/agriculture-pastureland.asset
@@ -14,7 +14,7 @@ the area of Africa]]
 local URL = "https://sos.noaa.gov/catalog/datasets/agriculture-pastureland-intensity/"
 
 
-local syncedDirectory = asset.syncedResource({
+local syncedDirectory = asset.resource({
   Name = Name,
   Type = "HttpSynchronization",
   Identifier = Identifier,
diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/birds.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/birds.asset
index 14823d0289..8d39b8a6b7 100644
--- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/birds.asset
+++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/birds.asset
@@ -13,7 +13,7 @@ and National Audubon Society, that allows birdwatchers to enter their observatio
 local URL = "https://sos.noaa.gov/catalog/datasets/bird-migration-patterns-western-hemisphere/"
 
 
-local syncedDirectory = asset.syncedResource({
+local syncedDirectory = asset.resource({
   Name = Name,
   Type = "HttpSynchronization",
   Identifier = Identifier,
diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/blue_marble-blue_marble.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/blue_marble-blue_marble.asset
index 256ee75fc0..58c755df20 100644
--- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/blue_marble-blue_marble.asset
+++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/blue_marble-blue_marble.asset
@@ -17,7 +17,7 @@ poles using thermal infrared imagery.]]
 local URL = "https://sos.noaa.gov/catalog/datasets/blue-marble/"
 
 
-local syncedDirectory = asset.syncedResource({
+local syncedDirectory = asset.resource({
   Name = Name,
   Type = "HttpSynchronization",
   Identifier = Identifier,
diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/blue_marble-blue_marble_topo.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/blue_marble-blue_marble_topo.asset
index b18ff1a6f0..8d59f9a4e8 100644
--- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/blue_marble-blue_marble_topo.asset
+++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/blue_marble-blue_marble_topo.asset
@@ -13,7 +13,7 @@ local Description = [[The Blue Marble is an incredibly detailed, true-color depi
 local URL = "https://sos.noaa.gov/catalog/datasets/blue-marble-with-topography-seasonal/"
 
 
-local syncedDirectory = asset.syncedResource({
+local syncedDirectory = asset.resource({
   Name = Name,
   Type = "HttpSynchronization",
   Identifier = Identifier,
diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/blue_marble-blue_marble_topo_bathy.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/blue_marble-blue_marble_topo_bathy.asset
index 3c12994ae2..99b4c8d412 100644
--- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/blue_marble-blue_marble_topo_bathy.asset
+++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/blue_marble-blue_marble_topo_bathy.asset
@@ -13,7 +13,7 @@ local Description = [[The Blue Marble is an incredibly detailed, true-color depi
 local URL = "https://sos.noaa.gov/catalog/datasets/blue-marble-with-topography-seasonal/"
 
 
-local syncedDirectory = asset.syncedResource({
+local syncedDirectory = asset.resource({
   Name = Name,
   Type = "HttpSynchronization",
   Identifier = Identifier,
diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/blue_marble-nightlights.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/blue_marble-nightlights.asset
index d9881cd218..37c2d7ef41 100644
--- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/blue_marble-nightlights.asset
+++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/blue_marble-nightlights.asset
@@ -19,7 +19,7 @@ needed to get a view of the clouds over the poles using thermal infrared imagery
 local URL = "https://sos.noaa.gov/catalog/datasets/blue-marble-and-nighttime-lights/"
 
 
-local syncedDirectory = asset.syncedResource({
+local syncedDirectory = asset.resource({
   Name = Name,
   Type = "HttpSynchronization",
   Identifier = Identifier,
diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/blue_marble-seasonal_blue_marble.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/blue_marble-seasonal_blue_marble.asset
index 1ed2f90abc..e5984b1c27 100644
--- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/blue_marble-seasonal_blue_marble.asset
+++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/blue_marble-seasonal_blue_marble.asset
@@ -14,7 +14,7 @@ on any given day clouds are blocking a significant portion of the surface]]
 local URL = "https://sos.noaa.gov/catalog/datasets/blue-marble-seasonal/"
 
 
-local syncedDirectory = asset.syncedResource({
+local syncedDirectory = asset.resource({
   Name = Name,
   Type = "HttpSynchronization",
   Identifier = Identifier,
diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/dams-global.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/dams-global.asset
index 7dadc485b7..b4175be9ed 100644
--- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/dams-global.asset
+++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/dams-global.asset
@@ -12,7 +12,7 @@ the world's hydrological cycle]]
 local URL = "https://sos.noaa.gov/catalog/datasets/dams-and-reservoirs-1800-2010/"
 
 
-local syncedDirectory = asset.syncedResource({
+local syncedDirectory = asset.resource({
   Name = Name,
   Type = "HttpSynchronization",
   Identifier = Identifier,
diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/dams-mississippi.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/dams-mississippi.asset
index 02c0b651ef..4f56658289 100644
--- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/dams-mississippi.asset
+++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/dams-mississippi.asset
@@ -12,7 +12,7 @@ where data were available]]
 local URL = "https://sos.noaa.gov/catalog/datasets/dams-and-reservoirs-mississippi-river-1800-2010/"
 
 
-local syncedDirectory = asset.syncedResource({
+local syncedDirectory = asset.resource({
   Name = Name,
   Type = "HttpSynchronization",
   Identifier = Identifier,
diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/dams-yangtze.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/dams-yangtze.asset
index 9e1b70a16b..83574adc63 100644
--- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/dams-yangtze.asset
+++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/dams-yangtze.asset
@@ -12,7 +12,7 @@ the world's hydrological cycle]]
 local URL = "https://sos.noaa.gov/catalog/datasets/dams-and-reservoirs-yangtze-1800-2010/"
 
 
-local syncedDirectory = asset.syncedResource({
+local syncedDirectory = asset.resource({
   Name = Name,
   Type = "HttpSynchronization",
   Identifier = Identifier,
diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/day_night-06z_only.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/day_night-06z_only.asset
index 7dff94800c..530348ea91 100644
--- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/day_night-06z_only.asset
+++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/day_night-06z_only.asset
@@ -14,7 +14,7 @@ greater area than the land covered by darkness]]
 local URL = "https://sos.noaa.gov/catalog/datasets/daynight-terminator-daily/"
 
 
-local syncedDirectory = asset.syncedResource({
+local syncedDirectory = asset.resource({
   Name = Name,
   Type = "HttpSynchronization",
   Identifier = Identifier,
diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/day_night-full_year.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/day_night-full_year.asset
index f6c7b80fa5..8fe830bb97 100644
--- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/day_night-full_year.asset
+++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/day_night-full_year.asset
@@ -14,7 +14,7 @@ greater area than the land covered by darkness]]
 local URL = "https://sos.noaa.gov/catalog/datasets/daynight-terminator-hourly/"
 
 
-local syncedDirectory = asset.syncedResource({
+local syncedDirectory = asset.resource({
   Name = Name,
   Type = "HttpSynchronization",
   Identifier = Identifier,
diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/day_night-oneday.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/day_night-oneday.asset
index 8e5a5136fc..df43c5ec61 100644
--- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/day_night-oneday.asset
+++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/day_night-oneday.asset
@@ -14,7 +14,7 @@ greater area than the land covered by darkness]]
 local URL = "https://sos.noaa.gov/catalog/datasets/daynight-terminator-single-day/"
 
 
-local syncedDirectory = asset.syncedResource({
+local syncedDirectory = asset.resource({
   Name = Name,
   Type = "HttpSynchronization",
   Identifier = Identifier,
diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/earth_night-1992_2002.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/earth_night-1992_2002.asset
index bbbedd7abd..003584eabf 100644
--- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/earth_night-1992_2002.asset
+++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/earth_night-1992_2002.asset
@@ -13,7 +13,7 @@ local Description = [[The data was recorded by the Defense Meteorological Satell
 local URL = "https://sos.noaa.gov/catalog/datasets/nighttime-lights-comparison-1992-and-2002/"
 
 
-local syncedDirectory = asset.syncedResource({
+local syncedDirectory = asset.resource({
   Name = Name,
   Type = "HttpSynchronization",
   Identifier = Identifier,
diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/earth_night-1992_2008.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/earth_night-1992_2008.asset
index a3685b893b..336b374623 100644
--- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/earth_night-1992_2008.asset
+++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/earth_night-1992_2008.asset
@@ -13,7 +13,7 @@ infrared radiance at night]]
 local URL = "https://sos.noaa.gov/catalog/datasets/nighttime-lights-comparison-1992-2000-and-2008/"
 
 
-local syncedDirectory = asset.syncedResource({
+local syncedDirectory = asset.resource({
   Name = Name,
   Type = "HttpSynchronization",
   Identifier = Identifier,
diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/earth_night-1992_2009.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/earth_night-1992_2009.asset
index 79847962d9..d5fbd4c977 100644
--- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/earth_night-1992_2009.asset
+++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/earth_night-1992_2009.asset
@@ -13,7 +13,7 @@ radiance at night]]
 local URL = "https://sos.noaa.gov/catalog/datasets/nighttime-lights-comparison-1992-and-2009/"
 
 
-local syncedDirectory = asset.syncedResource({
+local syncedDirectory = asset.resource({
   Name = Name,
   Type = "HttpSynchronization",
   Identifier = Identifier,
diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/earth_night-2012.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/earth_night-2012.asset
index f272717e0e..82a44ade54 100644
--- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/earth_night-2012.asset
+++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/earth_night-2012.asset
@@ -11,7 +11,7 @@ the Department of Defense]]
 local URL = "https://sos.noaa.gov/catalog/datasets/nighttime-lights-2012/"
 
 
-local syncedDirectory = asset.syncedResource({
+local syncedDirectory = asset.resource({
   Name = Name,
   Type = "HttpSynchronization",
   Identifier = Identifier,
diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/earth_night-color_nightlights.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/earth_night-color_nightlights.asset
index e246a6f54c..4b092c15ec 100644
--- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/earth_night-color_nightlights.asset
+++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/earth_night-color_nightlights.asset
@@ -16,7 +16,7 @@ Meteorological Satellite Program (DMSP) data spanning October 1994 - March 1995]
 local URL = "https://sos.noaa.gov/catalog/datasets/nighttime-lights-colorized/"
 
 
-local syncedDirectory = asset.syncedResource({
+local syncedDirectory = asset.resource({
   Name = Name,
   Type = "HttpSynchronization",
   Identifier = Identifier,
diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/earth_night-nightlights.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/earth_night-nightlights.asset
index 7b3dfcd372..dec6df226a 100644
--- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/earth_night-nightlights.asset
+++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/earth_night-nightlights.asset
@@ -16,7 +16,7 @@ Meteorological Satellite Program (DMSP) data spanning October 1994 - March 1995]
 local URL = "https://sos.noaa.gov/catalog/datasets/nighttime-lights/"
 
 
-local syncedDirectory = asset.syncedResource({
+local syncedDirectory = asset.resource({
   Name = Name,
   Type = "HttpSynchronization",
   Identifier = Identifier,
diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/earthquake-1980_1995_quakes.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/earthquake-1980_1995_quakes.asset
index 4414257e03..3eb6fb3f2f 100644
--- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/earthquake-1980_1995_quakes.asset
+++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/earthquake-1980_1995_quakes.asset
@@ -21,7 +21,7 @@ some shaking of indoor items and significant damage unlikely]]
 local URL = "https://sos.noaa.gov/catalog/datasets/earthquakes-cumulative-1980-1995/"
 
 
-local syncedDirectory = asset.syncedResource({
+local syncedDirectory = asset.resource({
   Name = Name,
   Type = "HttpSynchronization",
   Identifier = Identifier,
diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/earthquake-2001_2015.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/earthquake-2001_2015.asset
index 01df0c1d2c..5feb93ace6 100644
--- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/earthquake-2001_2015.asset
+++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/earthquake-2001_2015.asset
@@ -18,7 +18,7 @@ when they are shallow within the earth (less than 100 km or 60 mi. deep)]]
 local URL = "https://sos.noaa.gov/catalog/datasets/earthquakes-2001-2015/"
 
 
-local syncedDirectory = asset.syncedResource({
+local syncedDirectory = asset.resource({
   Name = Name,
   Type = "HttpSynchronization",
   Identifier = Identifier,
diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/earthquakes_1901_2000.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/earthquakes_1901_2000.asset
index ae3ec7f342..be3f75493d 100644
--- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/earthquakes_1901_2000.asset
+++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/earthquakes_1901_2000.asset
@@ -19,7 +19,7 @@ the plate boundary faults responsible for the majority of all of these earthquak
 local URL = "https://sos.noaa.gov/catalog/datasets/earthquakes-of-the-20th-century/"
 
 
-local syncedDirectory = asset.syncedResource({
+local syncedDirectory = asset.resource({
   Name = Name,
   Type = "HttpSynchronization",
   Identifier = Identifier,
diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/earthquakes_and_eruptions.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/earthquakes_and_eruptions.asset
index 8341231db6..b16a81bb6b 100644
--- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/earthquakes_and_eruptions.asset
+++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/earthquakes_and_eruptions.asset
@@ -14,7 +14,7 @@ dots]]
 local URL = "https://sos.noaa.gov/catalog/datasets/earthquakes-and-eruptions-1960-2010/"
 
 
-local syncedDirectory = asset.syncedResource({
+local syncedDirectory = asset.resource({
   Name = Name,
   Type = "HttpSynchronization",
   Identifier = Identifier,
diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/earths_magnetism_magnetic_lines.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/earths_magnetism_magnetic_lines.asset
index c844a389e5..7200450a55 100644
--- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/earths_magnetism_magnetic_lines.asset
+++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/earths_magnetism_magnetic_lines.asset
@@ -19,7 +19,7 @@ Earth, between the red and blue lines, is the magnetic equator shaded yellow]]
 local URL = "https://sos.noaa.gov/catalog/datasets/earths-magnetic-lines/"
 
 
-local syncedDirectory = asset.syncedResource({
+local syncedDirectory = asset.resource({
   Name = Name,
   Type = "HttpSynchronization",
   Identifier = Identifier,
diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/earths_magnetism_magnets.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/earths_magnetism_magnets.asset
index 359e6060ca..3a29cb1ed8 100644
--- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/earths_magnetism_magnets.asset
+++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/earths_magnetism_magnets.asset
@@ -19,7 +19,7 @@ Earth, between the red and blue lines, is the magnetic equator shaded yellow]]
 local URL = "https://sos.noaa.gov/catalog/datasets/earths-magnetic-field-compass-needles/"
 
 
-local syncedDirectory = asset.syncedResource({
+local syncedDirectory = asset.resource({
   Name = Name,
   Type = "HttpSynchronization",
   Identifier = Identifier,
diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/etopo1.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/etopo1.asset
index e8368c6c65..4c888bcca8 100644
--- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/etopo1.asset
+++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/etopo1.asset
@@ -16,7 +16,7 @@ modeling and Earth visualization]]
 local URL = "https://sos.noaa.gov/catalog/datasets/etopo1-topography-and-bathymetry/"
 
 
-local syncedDirectory = asset.syncedResource({
+local syncedDirectory = asset.resource({
   Name = Name,
   Type = "HttpSynchronization",
   Identifier = Identifier,
diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/etopo2-earth_bright.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/etopo2-earth_bright.asset
index cb63930d27..9dfc2e090e 100644
--- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/etopo2-earth_bright.asset
+++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/etopo2-earth_bright.asset
@@ -14,7 +14,7 @@ uses green, yellow, orange, red and white to denote increasing elevation of the
 local URL = "https://sos.noaa.gov/catalog/datasets/etopo2-topography-and-bathymetry-bright-colors/"
 
 
-local syncedDirectory = asset.syncedResource({
+local syncedDirectory = asset.resource({
   Name = Name,
   Type = "HttpSynchronization",
   Identifier = Identifier,
diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/etopo2-earth_color.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/etopo2-earth_color.asset
index a225878d88..82cb62fbf4 100644
--- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/etopo2-earth_color.asset
+++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/etopo2-earth_color.asset
@@ -14,7 +14,7 @@ green, yellow, orange, red and white to denote increasing elevation of the land]
 local URL = "https://sos.noaa.gov/catalog/datasets/etopo2-topography-and-bathymetry-color-enhanced/"
 
 
-local syncedDirectory = asset.syncedResource({
+local syncedDirectory = asset.resource({
   Name = Name,
   Type = "HttpSynchronization",
   Identifier = Identifier,
diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/etopo2-earth_shaded.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/etopo2-earth_shaded.asset
index 70decb20cd..5676c1f385 100644
--- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/etopo2-earth_shaded.asset
+++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/etopo2-earth_shaded.asset
@@ -14,7 +14,7 @@ model]]
 local URL = "https://sos.noaa.gov/catalog/datasets/etopo2-topography-and-bathymetry-shaded-colors/"
 
 
-local syncedDirectory = asset.syncedResource({
+local syncedDirectory = asset.resource({
   Name = Name,
   Type = "HttpSynchronization",
   Identifier = Identifier,
diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/etopo2-earth_topo.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/etopo2-earth_topo.asset
index cc6f7a54ed..ce1530cc6f 100644
--- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/etopo2-earth_topo.asset
+++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/etopo2-earth_topo.asset
@@ -17,7 +17,7 @@ use green, yellow, orange, red and white to denote increasing elevation of the l
 local URL = "https://sos.noaa.gov/catalog/datasets/etopo2-topography-and-bathymetry-natural-colors/"
 
 
-local syncedDirectory = asset.syncedResource({
+local syncedDirectory = asset.resource({
   Name = Name,
   Type = "HttpSynchronization",
   Identifier = Identifier,
diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/etopo2-landsat.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/etopo2-landsat.asset
index 4b461e3cbf..78a8f15a7f 100644
--- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/etopo2-landsat.asset
+++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/etopo2-landsat.asset
@@ -13,7 +13,7 @@ from the GLOBE project which has a global digital elevation model]]
 local URL = "https://sos.noaa.gov/catalog/datasets/etopo2-bathymetry/"
 
 
-local syncedDirectory = asset.syncedResource({
+local syncedDirectory = asset.resource({
   Name = Name,
   Type = "HttpSynchronization",
   Identifier = Identifier,
diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/fire.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/fire.asset
index 0e5c6596a3..d0ff98dec5 100644
--- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/fire.asset
+++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/fire.asset
@@ -17,7 +17,7 @@ and their short- and long-term effects on ecosystems]]
 local URL = "https://sos.noaa.gov/catalog/datasets/fires-2009/"
 
 
-local syncedDirectory = asset.syncedResource({
+local syncedDirectory = asset.resource({
   Name = Name,
   Type = "HttpSynchronization",
   Identifier = Identifier,
diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/fire_veg.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/fire_veg.asset
index 33606bda10..f7a85b0659 100644
--- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/fire_veg.asset
+++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/fire_veg.asset
@@ -16,7 +16,7 @@ local Description = [[This dataset leads viewers on a narrated global tour of fi
 local URL = "https://sos.noaa.gov/catalog/datasets/fire-observations-and-vegetation-2002-2011/"
 
 
-local syncedDirectory = asset.syncedResource({
+local syncedDirectory = asset.resource({
   Name = Name,
   Type = "HttpSynchronization",
   Identifier = Identifier,
diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/flooding-displaced_250.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/flooding-displaced_250.asset
index fc38b5ac1e..04666ec168 100644
--- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/flooding-displaced_250.asset
+++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/flooding-displaced_250.asset
@@ -17,7 +17,7 @@ vulnerable to the effects of flooding]]
 local URL = "https://sos.noaa.gov/catalog/datasets/flood-events-displaced-250-or-more-people-2000-2009/"
 
 
-local syncedDirectory = asset.syncedResource({
+local syncedDirectory = asset.resource({
   Name = Name,
   Type = "HttpSynchronization",
   Identifier = Identifier,
diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/flooding-fatal.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/flooding-fatal.asset
index 8b053ac833..f41a83c311 100644
--- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/flooding-fatal.asset
+++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/flooding-fatal.asset
@@ -17,7 +17,7 @@ vulnerable to the effects of flooding]]
 local URL = "https://sos.noaa.gov/catalog/datasets/flood-events-50-or-more-fatalities-2000-2009/"
 
 
-local syncedDirectory = asset.syncedResource({
+local syncedDirectory = asset.resource({
   Name = Name,
   Type = "HttpSynchronization",
   Identifier = Identifier,
diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/flooding-heavy_rain.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/flooding-heavy_rain.asset
index ccda40b529..58c8536244 100644
--- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/flooding-heavy_rain.asset
+++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/flooding-heavy_rain.asset
@@ -17,7 +17,7 @@ vulnerable to the effects of flooding]]
 local URL = "https://sos.noaa.gov/catalog/datasets/flood-events-due-to-heavy-rain-2000-2009/"
 
 
-local syncedDirectory = asset.syncedResource({
+local syncedDirectory = asset.resource({
   Name = Name,
   Type = "HttpSynchronization",
   Identifier = Identifier,
diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/flooding-major_floods.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/flooding-major_floods.asset
index 414a7a44e5..5b24cf1dc2 100644
--- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/flooding-major_floods.asset
+++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/flooding-major_floods.asset
@@ -17,7 +17,7 @@ vulnerable to the effects of flooding]]
 local URL = "https://sos.noaa.gov/catalog/datasets/flood-events-2000-2009/"
 
 
-local syncedDirectory = asset.syncedResource({
+local syncedDirectory = asset.resource({
   Name = Name,
   Type = "HttpSynchronization",
   Identifier = Identifier,
diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/food_v_feed.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/food_v_feed.asset
index 8ce2ecc1e9..410c898ef2 100644
--- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/food_v_feed.asset
+++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/food_v_feed.asset
@@ -12,7 +12,7 @@ where most of the crops are used as animal feed (in red)]]
 local URL = "https://sos.noaa.gov/catalog/datasets/agriculture-food-vs-feed/"
 
 
-local syncedDirectory = asset.syncedResource({
+local syncedDirectory = asset.resource({
   Name = Name,
   Type = "HttpSynchronization",
   Identifier = Identifier,
diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/forests.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/forests.asset
index 6eec50dfa2..682e404b0e 100644
--- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/forests.asset
+++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/forests.asset
@@ -13,7 +13,7 @@ replanting after loss has occurred]]
 local URL = "https://sos.noaa.gov/catalog/datasets/forest-change-extent-gain-and-loss-2000-2014/"
 
 
-local syncedDirectory = asset.syncedResource({
+local syncedDirectory = asset.resource({
   Name = Name,
   Type = "HttpSynchronization",
   Identifier = Identifier,
diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/geomag_tracklines.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/geomag_tracklines.asset
index 631bbd5ead..d9fb82ea75 100644
--- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/geomag_tracklines.asset
+++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/geomag_tracklines.asset
@@ -13,7 +13,7 @@ created in the liquid iron-nickel core]]
 local URL = "https://sos.noaa.gov/catalog/datasets/geomagnetic-tracklines/"
 
 
-local syncedDirectory = asset.syncedResource({
+local syncedDirectory = asset.resource({
   Name = Name,
   Type = "HttpSynchronization",
   Identifier = Identifier,
diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/global_vegetation.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/global_vegetation.asset
index e690559e05..93c92af7a6 100644
--- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/global_vegetation.asset
+++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/global_vegetation.asset
@@ -13,7 +13,7 @@ data from the satellite, developed by scientists at NOAA]]
 local URL = "https://sos.noaa.gov/catalog/datasets/vegetation-seasonal-changes-apr-2012-apr-2013/"
 
 
-local syncedDirectory = asset.syncedResource({
+local syncedDirectory = asset.resource({
   Name = Name,
   Type = "HttpSynchronization",
   Identifier = Identifier,
diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/gray_earth.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/gray_earth.asset
index 0197017490..334b16fcd0 100644
--- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/gray_earth.asset
+++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/gray_earth.asset
@@ -24,7 +24,7 @@ equalized hypsography that forms the foundation of the Gray Earth imagery]]
 local URL = "https://sos.noaa.gov/catalog/datasets/gray-earth/"
 
 
-local syncedDirectory = asset.syncedResource({
+local syncedDirectory = asset.resource({
   Name = Name,
   Type = "HttpSynchronization",
   Identifier = Identifier,
diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/hot_topo.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/hot_topo.asset
index 1722b454f5..74f0e33e84 100644
--- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/hot_topo.asset
+++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/hot_topo.asset
@@ -20,7 +20,7 @@ Everest, the tallest point on earth at a height of 29,035 feet, almost 5.5 miles
 local URL = "https://sos.noaa.gov/catalog/datasets/topography-and-bathymetry-with-nighttime-lights/"
 
 
-local syncedDirectory = asset.syncedResource({
+local syncedDirectory = asset.resource({
   Name = Name,
   Type = "HttpSynchronization",
   Identifier = Identifier,
diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/irsat_nightlights.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/irsat_nightlights.asset
index 75adb14afb..fd2d9bc973 100644
--- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/irsat_nightlights.asset
+++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/irsat_nightlights.asset
@@ -14,7 +14,7 @@ greater area than the land covered by darkness]]
 local URL = "https://sos.noaa.gov/catalog/datasets/daynight-terminator-with-clouds/"
 
 
-local syncedDirectory = asset.syncedResource({
+local syncedDirectory = asset.resource({
   Name = Name,
   Type = "HttpSynchronization",
   Identifier = Identifier,
diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/japan_quake.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/japan_quake.asset
index c10f56cd42..0cbb716b0e 100644
--- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/japan_quake.asset
+++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/japan_quake.asset
@@ -14,7 +14,7 @@ waves]]
 local URL = "https://sos.noaa.gov/catalog/datasets/japan-earthquake-march-2011/"
 
 
-local syncedDirectory = asset.syncedResource({
+local syncedDirectory = asset.resource({
   Name = Name,
   Type = "HttpSynchronization",
   Identifier = Identifier,
diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/koppen_climate-koppen_1901_2100.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/koppen_climate-koppen_1901_2100.asset
index d27f83c2aa..3f6c43a626 100644
--- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/koppen_climate-koppen_1901_2100.asset
+++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/koppen_climate-koppen_1901_2100.asset
@@ -14,7 +14,7 @@ climatologist Rudolf Geiger]]
 local URL = "https://sos.noaa.gov/catalog/datasets/koppen-geiger-climate-changes-1901-2100/"
 
 
-local syncedDirectory = asset.syncedResource({
+local syncedDirectory = asset.resource({
   Name = Name,
   Type = "HttpSynchronization",
   Identifier = Identifier,
diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/koppen_climate-koppen_2007.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/koppen_climate-koppen_2007.asset
index b9c6112dd2..5a48702002 100644
--- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/koppen_climate-koppen_2007.asset
+++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/koppen_climate-koppen_2007.asset
@@ -14,7 +14,7 @@ climatologist Rudolf Geiger.This particular revision is from 2007]]
 local URL = "https://sos.noaa.gov/catalog/datasets/koppen-geiger-climate-classification-2007/"
 
 
-local syncedDirectory = asset.syncedResource({
+local syncedDirectory = asset.resource({
   Name = Name,
   Type = "HttpSynchronization",
   Identifier = Identifier,
diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/land_cover-animation.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/land_cover-animation.asset
index d09fc82a7c..74312c68ec 100644
--- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/land_cover-animation.asset
+++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/land_cover-animation.asset
@@ -19,7 +19,7 @@ Earth]]
 local URL = "https://sos.noaa.gov/catalog/datasets/land-cover-animation/"
 
 
-local syncedDirectory = asset.syncedResource({
+local syncedDirectory = asset.resource({
   Name = Name,
   Type = "HttpSynchronization",
   Identifier = Identifier,
diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/land_cover-ribbon.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/land_cover-ribbon.asset
index 15514b56fd..4daf011126 100644
--- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/land_cover-ribbon.asset
+++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/land_cover-ribbon.asset
@@ -19,7 +19,7 @@ Earth]]
 local URL = "https://sos.noaa.gov/catalog/datasets/land-cover-map-with-ribbon-of-labels/"
 
 
-local syncedDirectory = asset.syncedResource({
+local syncedDirectory = asset.resource({
   Name = Name,
   Type = "HttpSynchronization",
   Identifier = Identifier,
diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/land_cover-slideshow.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/land_cover-slideshow.asset
index 21ba1b8650..64f938d1ef 100644
--- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/land_cover-slideshow.asset
+++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/land_cover-slideshow.asset
@@ -19,7 +19,7 @@ Earth]]
 local URL = "https://sos.noaa.gov/catalog/datasets/land-cover-map-with-slideshow-of-labels/"
 
 
-local syncedDirectory = asset.syncedResource({
+local syncedDirectory = asset.resource({
   Name = Name,
   Type = "HttpSynchronization",
   Identifier = Identifier,
diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/land_production-cropland_current.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/land_production-cropland_current.asset
index 9062e2ef0c..139b6eda91 100644
--- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/land_production-cropland_current.asset
+++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/land_production-cropland_current.asset
@@ -14,7 +14,7 @@ indicate higher yields]]
 local URL = "https://sos.noaa.gov/catalog/datasets/agriculture-cropland-yield-current/"
 
 
-local syncedDirectory = asset.syncedResource({
+local syncedDirectory = asset.resource({
   Name = Name,
   Type = "HttpSynchronization",
   Identifier = Identifier,
diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/land_production-cropland_potential.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/land_production-cropland_potential.asset
index fa2184dbbd..cf1b64cd85 100644
--- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/land_production-cropland_potential.asset
+++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/land_production-cropland_potential.asset
@@ -13,7 +13,7 @@ yields, while bright pink areas indicate higher yields]]
 local URL = "https://sos.noaa.gov/catalog/datasets/agriculture-cropland-yield-potential/"
 
 
-local syncedDirectory = asset.syncedResource({
+local syncedDirectory = asset.resource({
 	Name = Name,
 	Type = "HttpSynchronization",
 	Identifier = Identifier,
diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/land_production-production_gap.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/land_production-production_gap.asset
index 2362a1ac18..d0eedf650c 100644
--- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/land_production-production_gap.asset
+++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/land_production-production_gap.asset
@@ -13,7 +13,7 @@ local Description = [[A major component of the 2 Billion More Coming to Dinner f
 local URL = "https://sos.noaa.gov/catalog/datasets/agriculture-cropland-yield-potential/"
 
 
-local syncedDirectory = asset.syncedResource({
+local syncedDirectory = asset.resource({
   Name = Name,
   Type = "HttpSynchronization",
   Identifier = Identifier,
diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/land_ratio.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/land_ratio.asset
index 8f245c37e8..86025ca6f9 100644
--- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/land_ratio.asset
+++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/land_ratio.asset
@@ -9,7 +9,7 @@ that shows the ratio of land and sea at different latitudes]]
 local URL = "https://sos.noaa.gov/catalog/datasets/land-to-sea-ratio/"
 
 
-local syncedDirectory = asset.syncedResource({
+local syncedDirectory = asset.resource({
   Name = Name,
   Type = "HttpSynchronization",
   Identifier = Identifier,
diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/latitude_longitude.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/latitude_longitude.asset
index bb3c44399a..7f02d6b4de 100644
--- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/latitude_longitude.asset
+++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/latitude_longitude.asset
@@ -10,7 +10,7 @@ introduction of map reading and exploration]]
 local URL = "https://sos.noaa.gov/catalog/datasets/latitude-longitude-layers/"
 
 
-local syncedDirectory = asset.syncedResource({
+local syncedDirectory = asset.resource({
   Name = Name,
   Type = "HttpSynchronization",
   Identifier = Identifier,
diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/magnetic_declination.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/magnetic_declination.asset
index 39ee251726..aa6016c541 100644
--- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/magnetic_declination.asset
+++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/magnetic_declination.asset
@@ -13,7 +13,7 @@ created in the liquid iron-nickel core]]
 local URL = "https://sos.noaa.gov/catalog/datasets/earths-magnetic-declination/"
 
 
-local syncedDirectory = asset.syncedResource({
+local syncedDirectory = asset.resource({
   Name = Name,
   Type = "HttpSynchronization",
   Identifier = Identifier,
diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/nightsky.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/nightsky.asset
index e79777a478..bad37b4666 100644
--- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/nightsky.asset
+++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/nightsky.asset
@@ -10,7 +10,7 @@ constellations in the night sky]]
 local URL = "https://sos.noaa.gov/catalog/datasets/light-pollution-artificial-sky-brightness/"
 
 
-local syncedDirectory = asset.syncedResource({
+local syncedDirectory = asset.resource({
   Name = Name,
   Type = "HttpSynchronization",
   Identifier = Identifier,
diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/nuclear_earthquake.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/nuclear_earthquake.asset
index 86f8b078f3..b6cb618048 100644
--- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/nuclear_earthquake.asset
+++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/nuclear_earthquake.asset
@@ -19,7 +19,7 @@ prediction continues to be inaccurate and imprecise]]
 local URL = "https://sos.noaa.gov/catalog/datasets/earthquakes-and-nuclear-power-plants/"
 
 
-local syncedDirectory = asset.syncedResource({
+local syncedDirectory = asset.resource({
   Name = Name,
   Type = "HttpSynchronization",
   Identifier = Identifier,
diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/paleo_map.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/paleo_map.asset
index c510b97081..1ded519273 100644
--- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/paleo_map.asset
+++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/paleo_map.asset
@@ -18,7 +18,7 @@ local Description = [[The PALEOMAP PaleoAtlas for GPlates consists of 91 paleoge
 local URL = "https://sos.noaa.gov/catalog/datasets/paleomap-paleoatlas-0-750-million-years-ago/"
 
 
-local syncedDirectory = asset.syncedResource({
+local syncedDirectory = asset.resource({
   Name = Name,
   Type = "HttpSynchronization",
   Identifier = Identifier,
diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/paleo_overlays.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/paleo_overlays.asset
index 3cbffba2f3..e3bc89c716 100644
--- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/paleo_overlays.asset
+++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/paleo_overlays.asset
@@ -18,7 +18,7 @@ mineral-rich water from the roof of the cave]]
 local URL = "https://sos.noaa.gov/catalog/datasets/paleoclimate-proxies/"
 
 
-local syncedDirectory = asset.syncedResource({
+local syncedDirectory = asset.resource({
   Name = Name,
   Type = "HttpSynchronization",
   Identifier = Identifier,
diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/pantropical_biomass.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/pantropical_biomass.asset
index 1f950ba22e..04ac41cd55 100644
--- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/pantropical_biomass.asset
+++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/pantropical_biomass.asset
@@ -12,7 +12,7 @@ accurate baseline for evaluating and monitoring future changes]]
 local URL = "https://sos.noaa.gov/catalog/datasets/land-cover-woody-biomass-in-pan-tropics/"
 
 
-local syncedDirectory = asset.syncedResource({
+local syncedDirectory = asset.resource({
   Name = Name,
   Type = "HttpSynchronization",
   Identifier = Identifier,
diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/plate_movement.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/plate_movement.asset
index 6444d42a3e..de764789fc 100644
--- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/plate_movement.asset
+++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/plate_movement.asset
@@ -21,7 +21,7 @@ motion of the oceanic plates]]
 local URL = "https://sos.noaa.gov/catalog/datasets/plate-movement-200-million-years-ago-to-today/"
 
 
-local syncedDirectory = asset.syncedResource({
+local syncedDirectory = asset.resource({
   Name = Name,
   Type = "HttpSynchronization",
   Identifier = Identifier,
diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/river_discharge_2010.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/river_discharge_2010.asset
index 46b10fdd5a..c9ec00865d 100644
--- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/river_discharge_2010.asset
+++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/river_discharge_2010.asset
@@ -12,7 +12,7 @@ cells]]
 local URL = "https://sos.noaa.gov/catalog/datasets/rivers-daily-discharge-2010/"
 
 
-local syncedDirectory = asset.syncedResource({
+local syncedDirectory = asset.resource({
   Name = Name,
   Type = "HttpSynchronization",
   Identifier = Identifier,
diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/sea_floor_age-iso_lines_yellow.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/sea_floor_age-iso_lines_yellow.asset
index 226a21c2fa..7fd63a675c 100644
--- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/sea_floor_age-iso_lines_yellow.asset
+++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/sea_floor_age-iso_lines_yellow.asset
@@ -18,7 +18,7 @@ not uniform causing linear features perpendicular to the divergent boundaries]]
 local URL = "https://sos.noaa.gov/catalog/datasets/age-of-the-seafloor-contour-lines/"
 
 
-local syncedDirectory = asset.syncedResource({
+local syncedDirectory = asset.resource({
   Name = Name,
   Type = "HttpSynchronization",
   Identifier = Identifier,
diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/sea_floor_age-shaded_veg.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/sea_floor_age-shaded_veg.asset
index 3fad571144..187eb0090e 100644
--- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/sea_floor_age-shaded_veg.asset
+++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/sea_floor_age-shaded_veg.asset
@@ -18,7 +18,7 @@ not uniform causing linear features perpendicular to the divergent boundaries]]
 local URL = "https://sos.noaa.gov/catalog/datasets/age-of-the-seafloor-vegetation/"
 
 
-local syncedDirectory = asset.syncedResource({
+local syncedDirectory = asset.resource({
   Name = Name,
   Type = "HttpSynchronization",
   Identifier = Identifier,
diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/sea_floor_age-topo.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/sea_floor_age-topo.asset
index c02691c137..29862244b3 100644
--- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/sea_floor_age-topo.asset
+++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/sea_floor_age-topo.asset
@@ -18,7 +18,7 @@ not uniform causing linear features perpendicular to the divergent boundaries]]
 local URL = "https://sos.noaa.gov/catalog/datasets/age-of-the-seafloor-topography/"
 
 
-local syncedDirectory = asset.syncedResource({
+local syncedDirectory = asset.resource({
   Name = Name,
   Type = "HttpSynchronization",
   Identifier = Identifier,
diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/seismic_waves-1994northridge.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/seismic_waves-1994northridge.asset
index c580a32d93..200484ba65 100644
--- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/seismic_waves-1994northridge.asset
+++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/seismic_waves-1994northridge.asset
@@ -15,7 +15,7 @@ displaced from their homes by the effects of the quake]]
 local URL = "https://sos.noaa.gov/catalog/datasets/seismic-waves-northridge-earthquake-1994/"
 
 
-local syncedDirectory = asset.syncedResource({
+local syncedDirectory = asset.resource({
   Name = Name,
   Type = "HttpSynchronization",
   Identifier = Identifier,
diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/species_richness-amphibians.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/species_richness-amphibians.asset
index 74da04e0be..4bc5d9c98e 100644
--- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/species_richness-amphibians.asset
+++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/species_richness-amphibians.asset
@@ -15,7 +15,7 @@ ensure that the places with the most vulnerable species are being protected]]
 local URL = "https://sos.noaa.gov/catalog/datasets/species-richness-amphibians/"
 
 
-local syncedDirectory = asset.syncedResource({
+local syncedDirectory = asset.resource({
   Name = Name,
   Type = "HttpSynchronization",
   Identifier = Identifier,
diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/species_richness-amphibians_threatened.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/species_richness-amphibians_threatened.asset
index 01e9e088c4..a9384cfc87 100644
--- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/species_richness-amphibians_threatened.asset
+++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/species_richness-amphibians_threatened.asset
@@ -15,7 +15,7 @@ ensure that the places with the most vulnerable species are being protected]]
 local URL = "https://sos.noaa.gov/catalog/datasets/species-richness-amphibians-threatened/"
 
 
-local syncedDirectory = asset.syncedResource({
+local syncedDirectory = asset.resource({
   Name = Name,
   Type = "HttpSynchronization",
   Identifier = Identifier,
diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/species_richness-birds.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/species_richness-birds.asset
index b9a31f6778..63c58241be 100644
--- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/species_richness-birds.asset
+++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/species_richness-birds.asset
@@ -15,7 +15,7 @@ ensure that the places with the most vulnerable species are being protected]]
 local URL = "https://sos.noaa.gov/catalog/datasets/species-richness-birds/"
 
 
-local syncedDirectory = asset.syncedResource({
+local syncedDirectory = asset.resource({
   Name = Name,
   Type = "HttpSynchronization",
   Identifier = Identifier,
diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/species_richness-birds_threatened.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/species_richness-birds_threatened.asset
index cfd93d573f..7d74457996 100644
--- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/species_richness-birds_threatened.asset
+++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/species_richness-birds_threatened.asset
@@ -15,7 +15,7 @@ ensure that the places with the most vulnerable species are being protected]]
 local URL = "https://sos.noaa.gov/catalog/datasets/species-richness-birds-threatened/"
 
 
-local syncedDirectory = asset.syncedResource({
+local syncedDirectory = asset.resource({
   Name = Name,
   Type = "HttpSynchronization",
   Identifier = Identifier,
diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/species_richness-mammals.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/species_richness-mammals.asset
index 0bd4cd9d68..898368e9b4 100644
--- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/species_richness-mammals.asset
+++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/species_richness-mammals.asset
@@ -15,7 +15,7 @@ ensure that the places with the most vulnerable species are being protected]]
 local URL = "https://sos.noaa.gov/catalog/datasets/species-richness-mammals/"
 
 
-local syncedDirectory = asset.syncedResource({
+local syncedDirectory = asset.resource({
   Name = Name,
   Type = "HttpSynchronization",
   Identifier = Identifier,
diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/species_richness-mammals_threatened.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/species_richness-mammals_threatened.asset
index 2b76fb9369..26aaeb3d3e 100644
--- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/species_richness-mammals_threatened.asset
+++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/species_richness-mammals_threatened.asset
@@ -15,7 +15,7 @@ ensure that the places with the most vulnerable species are being protected]]
 local URL = "https://sos.noaa.gov/catalog/datasets/species-richness-mammals-threatened/"
 
 
-local syncedDirectory = asset.syncedResource({
+local syncedDirectory = asset.resource({
   Name = Name,
   Type = "HttpSynchronization",
   Identifier = Identifier,
diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/surface_temperature.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/surface_temperature.asset
index 66a3736839..03246628cb 100644
--- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/surface_temperature.asset
+++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/surface_temperature.asset
@@ -15,7 +15,7 @@ area in the northern hemisphere, is also evident]]
 local URL = "https://sos.noaa.gov/catalog/datasets/surface-temperature/"
 
 
-local syncedDirectory = asset.syncedResource({
+local syncedDirectory = asset.resource({
   Name = Name,
   Type = "HttpSynchronization",
   Identifier = Identifier,
diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/top_quakes.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/top_quakes.asset
index 0f2fdc7dfb..1923dfe436 100644
--- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/top_quakes.asset
+++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/top_quakes.asset
@@ -21,7 +21,7 @@ motion]]
 local URL = "https://sos.noaa.gov/catalog/datasets/earthquakes-historical-top-10-through-2011/"
 
 
-local syncedDirectory = asset.syncedResource({
+local syncedDirectory = asset.resource({
   Name = Name,
   Type = "HttpSynchronization",
   Identifier = Identifier,
diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/volcanoes-eruptions.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/volcanoes-eruptions.asset
index 70619dbd43..fc9b6dbb89 100644
--- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/volcanoes-eruptions.asset
+++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/volcanoes-eruptions.asset
@@ -19,7 +19,7 @@ rising to the surface. The volcanoes on Hawaii are the result of hotspots]]
 local URL = "https://sos.noaa.gov/catalog/datasets/volcano-eruptions-through-2010/"
 
 
-local syncedDirectory = asset.syncedResource({
+local syncedDirectory = asset.resource({
   Name = Name,
   Type = "HttpSynchronization",
   Identifier = Identifier,
diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/volcanoes-global_volcanoes.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/volcanoes-global_volcanoes.asset
index 7a5c88dabf..bd1d17724e 100644
--- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/volcanoes-global_volcanoes.asset
+++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/volcanoes-global_volcanoes.asset
@@ -19,7 +19,7 @@ rising to the surface. The volcanoes on Hawaii are the result of hotspots]]
 local URL = "https://sos.noaa.gov/catalog/datasets/volcano-locations/"
 
 
-local syncedDirectory = asset.syncedResource({
+local syncedDirectory = asset.resource({
   Name = Name,
   Type = "HttpSynchronization",
   Identifier = Identifier,
diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/volcanoes-tsunami.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/volcanoes-tsunami.asset
index d253562d82..cd92fa7082 100644
--- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/volcanoes-tsunami.asset
+++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/volcanoes-tsunami.asset
@@ -19,7 +19,7 @@ rising to the surface. The volcanoes on Hawaii are the result of hotspots]]
 local URL = "https://sos.noaa.gov/catalog/datasets/volcano-eruptions-causing-tsunamis-through-2010/"
 
 
-local syncedDirectory = asset.syncedResource({
+local syncedDirectory = asset.resource({
   Name = Name,
   Type = "HttpSynchronization",
   Identifier = Identifier,
diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/models/bm10000.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/models/bm10000.asset
index e7e97f9b28..f1500048de 100644
--- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/models/bm10000.asset
+++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/models/bm10000.asset
@@ -37,7 +37,7 @@ coasts]]
 local URL = "https://sos.noaa.gov/catalog/datasets/blue-marble-sea-level-ice-and-vegetation-changes-19000bc-10000ad/"
 
 
-local syncedDirectory = asset.syncedResource({
+local syncedDirectory = asset.resource({
   Name = Name,
   Type = "HttpSynchronization",
   Identifier = Identifier,
diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/models/gfdl_seaice.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/models/gfdl_seaice.asset
index 48d53c5b82..a4522509af 100644
--- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/models/gfdl_seaice.asset
+++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/models/gfdl_seaice.asset
@@ -20,7 +20,7 @@ temperatures]]
 local URL = "https://sos.noaa.gov/catalog/datasets/climate-model-sea-ice-change-gfdl-a1b-1861-2100/"
 
 
-local syncedDirectory = asset.syncedResource({
+local syncedDirectory = asset.resource({
   Name = Name,
   Type = "HttpSynchronization",
   Identifier = Identifier,
diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/models/ipcc_temp-ccsm-a1b.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/models/ipcc_temp-ccsm-a1b.asset
index 848febb8f9..fd2cf07bfa 100644
--- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/models/ipcc_temp-ccsm-a1b.asset
+++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/models/ipcc_temp-ccsm-a1b.asset
@@ -17,7 +17,7 @@ formatted for Science On a Sphere]]
 local URL = "https://sos.noaa.gov/catalog/datasets/climate-model-temperature-change-ccsm-a1b-1870-2100/"
 
 
-local syncedDirectory = asset.syncedResource({
+local syncedDirectory = asset.resource({
   Name = Name,
   Type = "HttpSynchronization",
   Identifier = Identifier,
diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/models/ipcc_temp-ccsm-b1.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/models/ipcc_temp-ccsm-b1.asset
index 2e1a4f97b0..414ca53bbd 100644
--- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/models/ipcc_temp-ccsm-b1.asset
+++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/models/ipcc_temp-ccsm-b1.asset
@@ -17,7 +17,7 @@ formatted for Science On a Sphere]]
 local URL = "https://sos.noaa.gov/catalog/datasets/climate-model-temperature-change-ccsm-b1-1870-2100/"
 
 
-local syncedDirectory = asset.syncedResource({
+local syncedDirectory = asset.resource({
   Name = Name,
   Type = "HttpSynchronization",
   Identifier = Identifier,
diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/models/ipcc_temp-compare.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/models/ipcc_temp-compare.asset
index de2207e70f..7b9ecc5cbb 100644
--- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/models/ipcc_temp-compare.asset
+++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/models/ipcc_temp-compare.asset
@@ -17,7 +17,7 @@ formatted for Science On a Sphere]]
 local URL = "https://sos.noaa.gov/catalog/datasets/climate-model-temperature-change-comparison-gfdl-a1b-and-b1/"
 
 
-local syncedDirectory = asset.syncedResource({
+local syncedDirectory = asset.resource({
   Name = Name,
   Type = "HttpSynchronization",
   Identifier = Identifier,
diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/models/ipcc_temp-gfdl-a1b.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/models/ipcc_temp-gfdl-a1b.asset
index 77775a04bc..c8e2503572 100644
--- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/models/ipcc_temp-gfdl-a1b.asset
+++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/models/ipcc_temp-gfdl-a1b.asset
@@ -17,7 +17,7 @@ formatted for Science On a Sphere]]
 local URL = "https://sos.noaa.gov/catalog/datasets/climate-model-temperature-change-gfdl-a1b-1870-2100/"
 
 
-local syncedDirectory = asset.syncedResource({
+local syncedDirectory = asset.resource({
   Name = Name,
   Type = "HttpSynchronization",
   Identifier = Identifier,
diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/models/ipcc_temp-gfdl-b1.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/models/ipcc_temp-gfdl-b1.asset
index 3363e76a50..53cf3c1058 100644
--- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/models/ipcc_temp-gfdl-b1.asset
+++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/models/ipcc_temp-gfdl-b1.asset
@@ -17,7 +17,7 @@ formatted for Science On a Sphere]]
 local URL = "https://sos.noaa.gov/catalog/datasets/climate-model-temperature-change-gfdl-b1-1870-2100/"
 
 
-local syncedDirectory = asset.syncedResource({
+local syncedDirectory = asset.resource({
   Name = Name,
   Type = "HttpSynchronization",
   Identifier = Identifier,
diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/models/ipcc_temp-had-a1b.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/models/ipcc_temp-had-a1b.asset
index 0969862c73..84735005b0 100644
--- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/models/ipcc_temp-had-a1b.asset
+++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/models/ipcc_temp-had-a1b.asset
@@ -17,7 +17,7 @@ formatted for Science On a Sphere]]
 local URL = "https://sos.noaa.gov/catalog/datasets/climate-model-temperature-change-hadley-a1b-1870-2100/"
 
 
-local syncedDirectory = asset.syncedResource({
+local syncedDirectory = asset.resource({
   Name = Name,
   Type = "HttpSynchronization",
   Identifier = Identifier,
diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/models/ipcc_temp-had-b1.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/models/ipcc_temp-had-b1.asset
index 77b3a7b8ca..37e4f72ff1 100644
--- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/models/ipcc_temp-had-b1.asset
+++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/models/ipcc_temp-had-b1.asset
@@ -17,7 +17,7 @@ formatted for Science On a Sphere]]
 local URL = "https://sos.noaa.gov/catalog/datasets/climate-model-temperature-change-hadley-b1-1870-2100/"
 
 
-local syncedDirectory = asset.syncedResource({
+local syncedDirectory = asset.resource({
   Name = Name,
   Type = "HttpSynchronization",
   Identifier = Identifier,
diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/models/rcp-ga26.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/models/rcp-ga26.asset
index 13902c9a57..90b1469ba8 100644
--- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/models/rcp-ga26.asset
+++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/models/rcp-ga26.asset
@@ -9,7 +9,7 @@ of dynamics of the weather and climate system to projections of future climate]]
 local URL = "https://sos.noaa.gov/catalog/datasets/climate-model-temperature-change-rcp-26-2006-2100/"
 
 
-local syncedDirectory = asset.syncedResource({
+local syncedDirectory = asset.resource({
   Name = Name,
   Type = "HttpSynchronization",
   Identifier = Identifier,
diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/models/rcp-ga45.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/models/rcp-ga45.asset
index 3f9ac61d06..eecde1e968 100644
--- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/models/rcp-ga45.asset
+++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/models/rcp-ga45.asset
@@ -9,7 +9,7 @@ of dynamics of the weather and climate system to projections of future climate]]
 local URL = "https://sos.noaa.gov/catalog/datasets/climate-model-temperature-change-rcp-45-2006-2100/"
 
 
-local syncedDirectory = asset.syncedResource({
+local syncedDirectory = asset.resource({
   Name = Name,
   Type = "HttpSynchronization",
   Identifier = Identifier,
diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/models/rcp-ga60.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/models/rcp-ga60.asset
index a25f860df7..f3d5a28fc4 100644
--- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/models/rcp-ga60.asset
+++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/models/rcp-ga60.asset
@@ -9,7 +9,7 @@ of dynamics of the weather and climate system to projections of future climate]]
 local URL = "https://sos.noaa.gov/catalog/datasets/climate-model-temperature-change-rcp-60-2006-2100/"
 
 
-local syncedDirectory = asset.syncedResource({
+local syncedDirectory = asset.resource({
   Name = Name,
   Type = "HttpSynchronization",
   Identifier = Identifier,
diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/models/rcp-ga85.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/models/rcp-ga85.asset
index fdbf42c66b..6fb81cd80b 100644
--- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/models/rcp-ga85.asset
+++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/models/rcp-ga85.asset
@@ -9,7 +9,7 @@ of dynamics of the weather and climate system to projections of future climate]]
 local URL = "https://sos.noaa.gov/catalog/datasets/climate-model-temperature-change-rcp-85-2006-2100/"
 
 
-local syncedDirectory = asset.syncedResource({
+local syncedDirectory = asset.resource({
   Name = Name,
   Type = "HttpSynchronization",
   Identifier = Identifier,
diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/models/ukmet-a1b.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/models/ukmet-a1b.asset
index 8384c9f5bd..ab5213b79d 100644
--- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/models/ukmet-a1b.asset
+++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/models/ukmet-a1b.asset
@@ -19,7 +19,7 @@ local Description = [[Scientists use computer climate models as a way to underst
 local URL = "https://sos.noaa.gov/catalog/datasets/climate-model-temperature-change-hadley-a1b-1860-2099/"
 
 
-local syncedDirectory = asset.syncedResource({
+local syncedDirectory = asset.resource({
   Name = Name,
   Type = "HttpSynchronization",
   Identifier = Identifier,
diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/models/ukmet-e1.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/models/ukmet-e1.asset
index 593d54ba07..5c28fbbce1 100644
--- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/models/ukmet-e1.asset
+++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/models/ukmet-e1.asset
@@ -18,7 +18,7 @@ and then drops to 421ppm by 2099, with a global mean temperature increase of 2.1
 local URL = "https://sos.noaa.gov/catalog/datasets/climate-model-temperature-change-hadley-e1-1860-2099/"
 
 
-local syncedDirectory = asset.syncedResource({
+local syncedDirectory = asset.resource({
   Name = Name,
   Type = "HttpSynchronization",
   Identifier = Identifier,
diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/2009_ice_animation.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/2009_ice_animation.asset
index 8c19cd9782..ad3a0b706c 100644
--- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/2009_ice_animation.asset
+++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/2009_ice_animation.asset
@@ -18,7 +18,7 @@ Microwave/Imager. The resolution is 2 km]]
 local URL = "https://sos.noaa.gov/catalog/datasets/sea-ice-animation-2009/"
 
 
-local syncedDirectory = asset.syncedResource({
+local syncedDirectory = asset.resource({
   Name = Name,
   Type = "HttpSynchronization",
   Identifier = Identifier,
diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/6m_sea_level_rise-black.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/6m_sea_level_rise-black.asset
index c3515c1222..4327700b34 100644
--- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/6m_sea_level_rise-black.asset
+++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/6m_sea_level_rise-black.asset
@@ -21,7 +21,7 @@ inches for low emission scenarios and 10 - 23 inches for high emission scenarios
 local URL = "https://sos.noaa.gov/catalog/datasets/sea-level-rise-impact-of-6-meter-black/"
 
 
-local syncedDirectory = asset.syncedResource({
+local syncedDirectory = asset.resource({
   Name = Name,
   Type = "HttpSynchronization",
   Identifier = Identifier,
diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/6m_sea_level_rise-red.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/6m_sea_level_rise-red.asset
index 26dc7c7ab6..aca7f7aed0 100644
--- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/6m_sea_level_rise-red.asset
+++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/6m_sea_level_rise-red.asset
@@ -21,7 +21,7 @@ Report predicts that total global-average sea level rise from 1990 - 2100 will b
 local URL = "https://sos.noaa.gov/catalog/datasets/sea-level-rise-impact-of-6-meter-red/"
 
 
-local syncedDirectory = asset.syncedResource({
+local syncedDirectory = asset.resource({
   Name = Name,
   Type = "HttpSynchronization",
   Identifier = Identifier,
diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/animal_tracking.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/animal_tracking.asset
index 187f6e42d7..a279e0bce7 100644
--- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/animal_tracking.asset
+++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/animal_tracking.asset
@@ -15,7 +15,7 @@ local Description = [["TOPP, Tagging of the Pacific Predators, began in 2000 as
 local URL = "https://sos.noaa.gov/catalog/datasets/seal-and-seabird-tracks-pacific-ocean/"
 
 
-local syncedDirectory = asset.syncedResource({
+local syncedDirectory = asset.resource({
   Name = Name,
   Type = "HttpSynchronization",
   Identifier = Identifier,
diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/argo_buoy_tracks.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/argo_buoy_tracks.asset
index 1e18740f11..80c657cacc 100644
--- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/argo_buoy_tracks.asset
+++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/argo_buoy_tracks.asset
@@ -17,7 +17,7 @@ climate]]
 local URL = "https://sos.noaa.gov/catalog/datasets/float-tracks-argo-buoy-surface-animation/"
 
 
-local syncedDirectory = asset.syncedResource({
+local syncedDirectory = asset.resource({
   Name = Name,
   Type = "HttpSynchronization",
   Identifier = Identifier,
diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/argo_buoy_waterfall.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/argo_buoy_waterfall.asset
index 81e673f004..ef27752c47 100644
--- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/argo_buoy_waterfall.asset
+++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/argo_buoy_waterfall.asset
@@ -17,7 +17,7 @@ climate]]
 local URL = "https://sos.noaa.gov/catalog/datasets/float-tracks-argo-buoy-depths-animation/"
 
 
-local syncedDirectory = asset.syncedResource({
+local syncedDirectory = asset.resource({
   Name = Name,
   Type = "HttpSynchronization",
   Identifier = Identifier,
diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/atl_turtle.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/atl_turtle.asset
index c2c5499355..604610e609 100644
--- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/atl_turtle.asset
+++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/atl_turtle.asset
@@ -17,7 +17,7 @@ was outfitted with a satellite tag by Kate Mansfield, then a Ph.D. student at th
 local URL = "https://sos.noaa.gov/catalog/datasets/sea-turtle-track-atlantic-ocean/"
 
 
-local syncedDirectory = asset.syncedResource({
+local syncedDirectory = asset.resource({
   Name = Name,
   Type = "HttpSynchronization",
   Identifier = Identifier,
diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/buoy_locations.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/buoy_locations.asset
index c171f02641..c1406f0f01 100644
--- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/buoy_locations.asset
+++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/buoy_locations.asset
@@ -14,7 +14,7 @@ can be seen on this visualization]]
 local URL = "https://sos.noaa.gov/catalog/datasets/buoy-and-float-locations/"
 
 
-local syncedDirectory = asset.syncedResource({
+local syncedDirectory = asset.resource({
   Name = Name,
   Type = "HttpSynchronization",
   Identifier = Identifier,
diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/catch_model.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/catch_model.asset
index d7e49d2d31..ab15fba4d1 100644
--- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/catch_model.asset
+++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/catch_model.asset
@@ -18,7 +18,7 @@ catch in these areas]]
 local URL = "https://sos.noaa.gov/catalog/datasets/fisheries-catch-model-2005-vs-2050/"
 
 
-local syncedDirectory = asset.syncedResource({
+local syncedDirectory = asset.resource({
   Name = Name,
   Type = "HttpSynchronization",
   Identifier = Identifier,
diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/chlorophyll_model.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/chlorophyll_model.asset
index fea17dc984..6080951b6c 100644
--- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/chlorophyll_model.asset
+++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/chlorophyll_model.asset
@@ -17,7 +17,7 @@ understand the possible effects on life in the ocean and the global carbon cycle
 local URL = "https://sos.noaa.gov/catalog/datasets/biosphere-marine-chlorophyll-concentration-model/"
 
 
-local syncedDirectory = asset.syncedResource({
+local syncedDirectory = asset.resource({
   Name = Name,
   Type = "HttpSynchronization",
   Identifier = Identifier,
diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/currents.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/currents.asset
index 52a5a4c998..f20aaeba3e 100644
--- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/currents.asset
+++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/currents.asset
@@ -21,7 +21,7 @@ to move through the whole conveyor belt]]
 local URL = "https://sos.noaa.gov/catalog/datasets/ocean-circulation-labeled-currents/"
 
 
-local syncedDirectory = asset.syncedResource({
+local syncedDirectory = asset.resource({
   Name = Name,
   Type = "HttpSynchronization",
   Identifier = Identifier,
diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/dart_buoy.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/dart_buoy.asset
index c69391da60..ea86ca24c0 100644
--- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/dart_buoy.asset
+++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/dart_buoy.asset
@@ -16,7 +16,7 @@ DART Project will consist of 32 DART buoys]]
 local URL = "https://sos.noaa.gov/catalog/datasets/buoy-locations-dart-only/"
 
 
-local syncedDirectory = asset.syncedResource({
+local syncedDirectory = asset.resource({
   Name = Name,
   Type = "HttpSynchronization",
   Identifier = Identifier,
diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/ecco2_sst-gray_land.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/ecco2_sst-gray_land.asset
index 9beda39568..77f9c7d36e 100644
--- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/ecco2_sst-gray_land.asset
+++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/ecco2_sst-gray_land.asset
@@ -19,7 +19,7 @@ surface temperatures. The sea surface temperature data is also from the ECCO2 mo
 local URL = "https://sos.noaa.gov/catalog/datasets/sea-surface-currents-and-temperature-gray-land/"
 
 
-local syncedDirectory = asset.syncedResource({
+local syncedDirectory = asset.resource({
   Name = Name,
   Type = "HttpSynchronization",
   Identifier = Identifier,
diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/ecco2_sst-veg_land.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/ecco2_sst-veg_land.asset
index c07834ffd6..9d1020ab5e 100644
--- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/ecco2_sst-veg_land.asset
+++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/ecco2_sst-veg_land.asset
@@ -19,7 +19,7 @@ surface temperatures. The sea surface temperature data is also from the ECCO2 mo
 local URL = "https://sos.noaa.gov/catalog/datasets/sea-surface-currents-and-temperature-vegetation-on-land/"
 
 
-local syncedDirectory = asset.syncedResource({
+local syncedDirectory = asset.resource({
   Name = Name,
   Type = "HttpSynchronization",
   Identifier = Identifier,
diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/elnino.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/elnino.asset
index b8afbc6621..7734c78160 100644
--- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/elnino.asset
+++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/elnino.asset
@@ -16,7 +16,7 @@ lasts for about 18 months]]
 local URL = "https://sos.noaa.gov/catalog/datasets/el-nino-and-la-nina-seasonal-impacts/"
 
 
-local syncedDirectory = asset.syncedResource({
+local syncedDirectory = asset.resource({
   Name = Name,
   Type = "HttpSynchronization",
   Identifier = Identifier,
diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/gfdl_sst-black_background.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/gfdl_sst-black_background.asset
index 866a3fb9e0..6007fb6e1e 100644
--- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/gfdl_sst-black_background.asset
+++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/gfdl_sst-black_background.asset
@@ -13,7 +13,7 @@ Dynamics Laboratory (GFDL)]]
 local URL = "https://sos.noaa.gov/catalog/datasets/sea-surface-temperature-noaa-model-black-land/"
 
 
-local syncedDirectory = asset.syncedResource({
+local syncedDirectory = asset.resource({
   Name = Name,
   Type = "HttpSynchronization",
   Identifier = Identifier,
diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/gfdl_sst-land_background.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/gfdl_sst-land_background.asset
index ff77be0d3d..a2c534a529 100644
--- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/gfdl_sst-land_background.asset
+++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/gfdl_sst-land_background.asset
@@ -13,7 +13,7 @@ Dynamics Laboratory (GFDL)]]
 local URL = "https://sos.noaa.gov/catalog/datasets/sea-surface-temperature-noaa-model-with-vegetation/"
 
 
-local syncedDirectory = asset.syncedResource({
+local syncedDirectory = asset.resource({
   Name = Name,
   Type = "HttpSynchronization",
   Identifier = Identifier,
diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/greenland_melt.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/greenland_melt.asset
index 95d515789b..67f471a1d0 100644
--- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/greenland_melt.asset
+++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/greenland_melt.asset
@@ -17,7 +17,7 @@ average over the past 18 years that have been studied]]
 local URL = "https://sos.noaa.gov/catalog/datasets/greenland-melting-trends/"
 
 
-local syncedDirectory = asset.syncedResource({
+local syncedDirectory = asset.resource({
   Name = Name,
   Type = "HttpSynchronization",
   Identifier = Identifier,
diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/japan_tsunami.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/japan_tsunami.asset
index 36a78b06a8..0c7c8615ec 100644
--- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/japan_tsunami.asset
+++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/japan_tsunami.asset
@@ -14,7 +14,7 @@ waves]]
 local URL = "https://sos.noaa.gov/catalog/datasets/japan-tsunami-wave-heights-march-11-2011/"
 
 
-local syncedDirectory = asset.syncedResource({
+local syncedDirectory = asset.resource({
   Name = Name,
   Type = "HttpSynchronization",
   Identifier = Identifier,
diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/japan_tsunami_waves.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/japan_tsunami_waves.asset
index 910dbd1868..e27ec10675 100644
--- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/japan_tsunami_waves.asset
+++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/japan_tsunami_waves.asset
@@ -20,7 +20,7 @@ the DART buoys]]
 local URL = "https://sos.noaa.gov/catalog/datasets/japan-tsunami-wave-propagation-march-11-2011/"
 
 
-local syncedDirectory = asset.syncedResource({
+local syncedDirectory = asset.resource({
   Name = Name,
   Type = "HttpSynchronization",
   Identifier = Identifier,
diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/loggerheadseaturtletracks.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/loggerheadseaturtletracks.asset
index daef08d4c6..2a81d52f9e 100644
--- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/loggerheadseaturtletracks.asset
+++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/loggerheadseaturtletracks.asset
@@ -17,7 +17,7 @@ proportional to the turtle length]]
 local URL = "https://sos.noaa.gov/catalog/datasets/loggerhead-sea-turtle-tracks/"
 
 
-local syncedDirectory = asset.syncedResource({
+local syncedDirectory = asset.resource({
   Name = Name,
   Type = "HttpSynchronization",
   Identifier = Identifier,
diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/marine_impacts.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/marine_impacts.asset
index 25fd80c9a3..19e7fde4fd 100644
--- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/marine_impacts.asset
+++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/marine_impacts.asset
@@ -17,7 +17,7 @@ acidification]]
 local URL = "https://sos.noaa.gov/catalog/datasets/human-influences-on-marine-ecosystems/"
 
 
-local syncedDirectory = asset.syncedResource({
+local syncedDirectory = asset.resource({
   Name = Name,
   Type = "HttpSynchronization",
   Identifier = Identifier,
diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/marine_life_tracking.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/marine_life_tracking.asset
index 7c3943e563..e1e727e216 100644
--- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/marine_life_tracking.asset
+++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/marine_life_tracking.asset
@@ -14,7 +14,7 @@ animal tracking dataset. For a more extensive dataset using data from TOPP, go h
 local URL = "https://sos.noaa.gov/catalog/datasets/marine-life-tracks-pacific-ocean/"
 
 
-local syncedDirectory = asset.syncedResource({
+local syncedDirectory = asset.resource({
   Name = Name,
   Type = "HttpSynchronization",
   Identifier = Identifier,
diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/mexico_turtles_947293.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/mexico_turtles_947293.asset
index 40b6035177..393bcc47da 100644
--- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/mexico_turtles_947293.asset
+++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/mexico_turtles_947293.asset
@@ -16,7 +16,7 @@ capture site]]
 local URL = "https://sos.noaa.gov/catalog/datasets/sea-turtle-track-gulf-of-mexico-94-7293/"
 
 
-local syncedDirectory = asset.syncedResource({
+local syncedDirectory = asset.resource({
   Name = Name,
   Type = "HttpSynchronization",
   Identifier = Identifier,
diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/mexico_turtles_958002.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/mexico_turtles_958002.asset
index edf064cf59..93fc0bc868 100644
--- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/mexico_turtles_958002.asset
+++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/mexico_turtles_958002.asset
@@ -16,7 +16,7 @@ released within 2 days at the capture site]]
 local URL = "https://sos.noaa.gov/catalog/datasets/sea-turtle-track-gulf-of-mexico-94-8002/"
 
 
-local syncedDirectory = asset.syncedResource({
+local syncedDirectory = asset.resource({
   Name = Name,
   Type = "HttpSynchronization",
   Identifier = Identifier,
diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/modis_sst.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/modis_sst.asset
index caba554a45..500cda2ca1 100644
--- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/modis_sst.asset
+++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/modis_sst.asset
@@ -15,7 +15,7 @@ months]]
 local URL = "https://sos.noaa.gov/catalog/datasets/sea-surface-temperature-observations-2002-2006/"
 
 
-local syncedDirectory = asset.syncedResource({
+local syncedDirectory = asset.resource({
   Name = Name,
   Type = "HttpSynchronization",
   Identifier = Identifier,
diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/nasa_speed.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/nasa_speed.asset
index ddb23c4a85..e22a3b1774 100644
--- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/nasa_speed.asset
+++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/nasa_speed.asset
@@ -15,7 +15,7 @@ green areas are moving faster than the blue areas]]
 local URL = "https://sos.noaa.gov/catalog/datasets/sea-surface-currents/"
 
 
-local syncedDirectory = asset.syncedResource({
+local syncedDirectory = asset.resource({
   Name = Name,
   Type = "HttpSynchronization",
   Identifier = Identifier,
diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/nasa_sst.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/nasa_sst.asset
index 813324aa22..f550750ea7 100644
--- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/nasa_sst.asset
+++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/nasa_sst.asset
@@ -13,7 +13,7 @@ Space Flight Center]]
 local URL = "https://sos.noaa.gov/catalog/datasets/sea-surface-temperature-model/"
 
 
-local syncedDirectory = asset.syncedResource({
+local syncedDirectory = asset.resource({
   Name = Name,
   Type = "HttpSynchronization",
   Identifier = Identifier,
diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/ocean_acid-co2_flux.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/ocean_acid-co2_flux.asset
index 7ce6e84ed0..c357a919df 100644
--- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/ocean_acid-co2_flux.asset
+++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/ocean_acid-co2_flux.asset
@@ -12,7 +12,7 @@ water than in atmosphere above, CO2 is released to the atmosphere]]
 local URL = "https://sos.noaa.gov/catalog/datasets/ocean-atmosphere-co2-exchange/"
 
 
-local syncedDirectory = asset.syncedResource({
+local syncedDirectory = asset.resource({
   Name = Name,
   Type = "HttpSynchronization",
   Identifier = Identifier,
diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/ocean_acid-ph.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/ocean_acid-ph.asset
index 855b08afa1..fb85da36b3 100644
--- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/ocean_acid-ph.asset
+++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/ocean_acid-ph.asset
@@ -15,7 +15,7 @@ dataset starts in 1861 and runs through 2100]]
 local URL = "https://sos.noaa.gov/catalog/datasets/ocean-acidification-surface-ph/"
 
 
-local syncedDirectory = asset.syncedResource({
+local syncedDirectory = asset.resource({
   Name = Name,
   Type = "HttpSynchronization",
   Identifier = Identifier,
diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/ocean_acid-saturation.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/ocean_acid-saturation.asset
index 7371f28050..b41f0377d7 100644
--- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/ocean_acid-saturation.asset
+++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/ocean_acid-saturation.asset
@@ -20,7 +20,7 @@ acidification]]
 local URL = "https://sos.noaa.gov/catalog/datasets/ocean-acidification-saturation-state/"
 
 
-local syncedDirectory = asset.syncedResource({
+local syncedDirectory = asset.resource({
   Name = Name,
   Type = "HttpSynchronization",
   Identifier = Identifier,
diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/ocean_depths_temp.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/ocean_depths_temp.asset
index 846f34d8dd..27c5016607 100644
--- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/ocean_depths_temp.asset
+++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/ocean_depths_temp.asset
@@ -15,7 +15,7 @@ in some of the deeper imagery]]
 local URL = "https://sos.noaa.gov/catalog/datasets/ocean-temperature-at-depth-seasonal/"
 
 
-local syncedDirectory = asset.syncedResource({
+local syncedDirectory = asset.resource({
   Name = Name,
   Type = "HttpSynchronization",
   Identifier = Identifier,
diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/ocean_drain-gray.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/ocean_drain-gray.asset
index b3c491381a..3a14bf4d87 100644
--- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/ocean_drain-gray.asset
+++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/ocean_drain-gray.asset
@@ -13,7 +13,7 @@ anomalies in the sea surface detected by satellites]]
 local URL = "https://sos.noaa.gov/catalog/datasets/ocean-drain-with-gray-bathymetry/"
 
 
-local syncedDirectory = asset.syncedResource({
+local syncedDirectory = asset.resource({
   Name = Name,
   Type = "HttpSynchronization",
   Identifier = Identifier,
diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/pac_turtle.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/pac_turtle.asset
index f3a36de299..1a4151cdf0 100644
--- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/pac_turtle.asset
+++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/pac_turtle.asset
@@ -15,7 +15,7 @@ tag transmitted a signal that allowed Adelita's track to be monitored post-relea
 local URL = "https://sos.noaa.gov/catalog/datasets/sea-turtle-track-pacific-ocean/"
 
 
-local syncedDirectory = asset.syncedResource({
+local syncedDirectory = asset.resource({
   Name = Name,
   Type = "HttpSynchronization",
   Identifier = Identifier,
diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/phytoplankton.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/phytoplankton.asset
index 6eb6fa12eb..dd262a0677 100644
--- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/phytoplankton.asset
+++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/phytoplankton.asset
@@ -19,7 +19,7 @@ biomass]]
 local URL = "https://sos.noaa.gov/catalog/datasets/phytoplankton-model/"
 
 
-local syncedDirectory = asset.syncedResource({
+local syncedDirectory = asset.resource({
   Name = Name,
   Type = "HttpSynchronization",
   Identifier = Identifier,
diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/pr_tsunami.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/pr_tsunami.asset
index 5019d5de8f..78b14d4818 100644
--- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/pr_tsunami.asset
+++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/pr_tsunami.asset
@@ -16,7 +16,7 @@ Trench, the deepest location in the Atlantic Ocean]]
 local URL = "https://sos.noaa.gov/catalog/datasets/puerto-rico-hypothetical-tsunami/"
 
 
-local syncedDirectory = asset.syncedResource({
+local syncedDirectory = asset.resource({
   Name = Name,
   Type = "HttpSynchronization",
   Identifier = Identifier,
diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/reefs_risk.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/reefs_risk.asset
index f6a6533d60..720127aecb 100644
--- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/reefs_risk.asset
+++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/reefs_risk.asset
@@ -24,7 +24,7 @@ is leading to wide-spread coral bleaching]]
 local URL = "https://sos.noaa.gov/catalog/datasets/coral-reef-risk-outlook/"
 
 
-local syncedDirectory = asset.syncedResource({
+local syncedDirectory = asset.resource({
   Name = Name,
   Type = "HttpSynchronization",
   Identifier = Identifier,
diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/sea_level.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/sea_level.asset
index 88749947cc..c5f092c2c3 100644
--- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/sea_level.asset
+++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/sea_level.asset
@@ -21,7 +21,7 @@ inches for low emission scenarios and 10 - 23 inches for high emission scenarios
 local URL = "https://sos.noaa.gov/catalog/datasets/sea-level-rise-10m-increments/"
 
 
-local syncedDirectory = asset.syncedResource({
+local syncedDirectory = asset.resource({
   Name = Name,
   Type = "HttpSynchronization",
   Identifier = Identifier,
diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/sea_level_trends.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/sea_level_trends.asset
index 871633731f..9757aa3491 100644
--- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/sea_level_trends.asset
+++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/sea_level_trends.asset
@@ -22,7 +22,7 @@ high emission scenarios]]
 local URL = "https://sos.noaa.gov/catalog/datasets/sea-level-trends-1993-2012/"
 
 
-local syncedDirectory = asset.syncedResource({
+local syncedDirectory = asset.resource({
   Name = Name,
   Type = "HttpSynchronization",
   Identifier = Identifier,
diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/sea_surface_height_anomaly.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/sea_surface_height_anomaly.asset
index fbde95f363..71c12a4abc 100644
--- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/sea_surface_height_anomaly.asset
+++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/sea_surface_height_anomaly.asset
@@ -16,7 +16,7 @@ collecting sea surface height data over the global ocean for almost two decades]
 local URL = "https://sos.noaa.gov/catalog/datasets/sea-surface-height-anomaly/"
 
 
-local syncedDirectory = asset.syncedResource({
+local syncedDirectory = asset.resource({
   Name = Name,
   Type = "HttpSynchronization",
   Identifier = Identifier,
diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/seaice_monthly.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/seaice_monthly.asset
index 6043d8e4ac..7ddcc88c9a 100644
--- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/seaice_monthly.asset
+++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/seaice_monthly.asset
@@ -15,7 +15,7 @@ planet]]
 local URL = "https://sos.noaa.gov/catalog/datasets/sea-ice-extent-arctic-only-1850-present/"
 
 
-local syncedDirectory = asset.syncedResource({
+local syncedDirectory = asset.resource({
   Name = Name,
   Type = "HttpSynchronization",
   Identifier = Identifier,
diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/seaice_radiation.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/seaice_radiation.asset
index dd42635ed6..52963b7232 100644
--- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/seaice_radiation.asset
+++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/seaice_radiation.asset
@@ -13,7 +13,7 @@ which is more pronounced than anywhere else on the planet]]
 local URL = "https://sos.noaa.gov/catalog/datasets/sea-ice-fraction-and-solar-radiation-absorption/"
 
 
-local syncedDirectory = asset.syncedResource({
+local syncedDirectory = asset.resource({
   Name = Name,
   Type = "HttpSynchronization",
   Identifier = Identifier,
diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/seawifs-land_background.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/seawifs-land_background.asset
index 993e9e9022..b670d3816b 100644
--- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/seawifs-land_background.asset
+++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/seawifs-land_background.asset
@@ -10,7 +10,7 @@ quantity of marine plant-life as it changes throughout the seasons of the year]]
 local URL = "https://sos.noaa.gov/catalog/datasets/biosphere-marine-chlorophyll-concentration/"
 
 
-local syncedDirectory = asset.syncedResource({
+local syncedDirectory = asset.resource({
   Name = Name,
   Type = "HttpSynchronization",
   Identifier = Identifier,
diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/seawifs-no_holes.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/seawifs-no_holes.asset
index c0a0c6082a..765a94802f 100644
--- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/seawifs-no_holes.asset
+++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/seawifs-no_holes.asset
@@ -11,7 +11,7 @@ year]]
 local URL = "https://sos.noaa.gov/catalog/datasets/biosphere-marine-chlorophyll-concentration-and-land-vegetation-with-co2-labels/"
 
 
-local syncedDirectory = asset.syncedResource({
+local syncedDirectory = asset.resource({
   Name = Name,
   Type = "HttpSynchronization",
   Identifier = Identifier,
diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/seawifs-polar_holes.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/seawifs-polar_holes.asset
index 012ebd28de..bc98e00dc9 100644
--- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/seawifs-polar_holes.asset
+++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/seawifs-polar_holes.asset
@@ -11,7 +11,7 @@ year]]
 local URL = "https://sos.noaa.gov/catalog/datasets/biosphere-marine-chlorophyll-concentration-and-land-vegetation/"
 
 
-local syncedDirectory = asset.syncedResource({
+local syncedDirectory = asset.resource({
   Name = Name,
   Type = "HttpSynchronization",
   Identifier = Identifier,
diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/shark.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/shark.asset
index ca0c3360c4..89d70e40ca 100644
--- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/shark.asset
+++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/shark.asset
@@ -16,7 +16,7 @@ the coast of California also were tracked traveling great distances from Califor
 local URL = "https://sos.noaa.gov/catalog/datasets/great-white-shark-track/"
 
 
-local syncedDirectory = asset.syncedResource({
+local syncedDirectory = asset.resource({
   Name = Name,
   Type = "HttpSynchronization",
   Identifier = Identifier,
diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/ship_tracks-mosaic.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/ship_tracks-mosaic.asset
index 7a414b9034..773ea2dba6 100644
--- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/ship_tracks-mosaic.asset
+++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/ship_tracks-mosaic.asset
@@ -22,7 +22,7 @@ ocean]]
 local URL = "https://sos.noaa.gov/catalog/datasets/ship-multibeam-bathymetric-surveys-mosaic/"
 
 
-local syncedDirectory = asset.syncedResource({
+local syncedDirectory = asset.resource({
   Name = Name,
   Type = "HttpSynchronization",
   Identifier = Identifier,
diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/ship_tracks-tracks.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/ship_tracks-tracks.asset
index 3a22679f6c..e9bd96ea0e 100644
--- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/ship_tracks-tracks.asset
+++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/ship_tracks-tracks.asset
@@ -22,7 +22,7 @@ ocean]]
 local URL = "https://sos.noaa.gov/catalog/datasets/ship-tracklines-of-multibeam-bathymetric-surveys/"
 
 
-local syncedDirectory = asset.syncedResource({
+local syncedDirectory = asset.resource({
   Name = Name,
   Type = "HttpSynchronization",
   Identifier = Identifier,
diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/shipping.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/shipping.asset
index 197b037d66..6b36871784 100644
--- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/shipping.asset
+++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/shipping.asset
@@ -17,7 +17,7 @@ Global Map of Human Impacts to Marine Ecosystems]]
 local URL = "https://sos.noaa.gov/catalog/datasets/shipping-routes-with-labels-one-year/"
 
 
-local syncedDirectory = asset.syncedResource({
+local syncedDirectory = asset.resource({
   Name = Name,
   Type = "HttpSynchronization",
   Identifier = Identifier,
diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/species_richness.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/species_richness.asset
index 4534a808c3..9ea1b64c46 100644
--- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/species_richness.asset
+++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/species_richness.asset
@@ -20,7 +20,7 @@ fisheries]]
 local URL = "https://sos.noaa.gov/catalog/datasets/fisheries-species-richness/"
 
 
-local syncedDirectory = asset.syncedResource({
+local syncedDirectory = asset.resource({
   Name = Name,
   Type = "HttpSynchronization",
   Identifier = Identifier,
diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/sss.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/sss.asset
index 0ab1905034..f7fe11873c 100644
--- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/sss.asset
+++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/sss.asset
@@ -14,7 +14,7 @@ Earth's water cycle and ocean circulation]]
 local URL = "https://sos.noaa.gov/catalog/datasets/sea-surface-salinity/"
 
 
-local syncedDirectory = asset.syncedResource({
+local syncedDirectory = asset.resource({
   Name = Name,
   Type = "HttpSynchronization",
   Identifier = Identifier,
diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/sst_1980_1999.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/sst_1980_1999.asset
index c8b742970e..6206025b57 100644
--- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/sst_1980_1999.asset
+++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/sst_1980_1999.asset
@@ -16,7 +16,7 @@ shading is a cooling of the ocean by 5-10°F]]
 local URL = "https://sos.noaa.gov/catalog/datasets/sea-surface-temperature-anomalies-1980-1999/"
 
 
-local syncedDirectory = asset.syncedResource({
+local syncedDirectory = asset.resource({
   Name = Name,
   Type = "HttpSynchronization",
   Identifier = Identifier,
diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/tsunami_historical_series-alaska.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/tsunami_historical_series-alaska.asset
index 673fe90b00..bbe1c9024b 100644
--- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/tsunami_historical_series-alaska.asset
+++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/tsunami_historical_series-alaska.asset
@@ -26,7 +26,7 @@ high also struck Mexico, Chile, and even New Zealand]]
 local URL = "https://sos.noaa.gov/catalog/datasets/tsunami-historical-series-alaska-1964/"
 
 
-local syncedDirectory = asset.syncedResource({
+local syncedDirectory = asset.resource({
   Name = Name,
   Type = "HttpSynchronization",
   Identifier = Identifier,
diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/tsunami_historical_series-aleutians.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/tsunami_historical_series-aleutians.asset
index 9a84b76b13..2c3a881556 100644
--- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/tsunami_historical_series-aleutians.asset
+++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/tsunami_historical_series-aleutians.asset
@@ -23,7 +23,7 @@ in Peru]]
 local URL = "https://sos.noaa.gov/catalog/datasets/tsunami-historical-series-aleutian-islands-1946/"
 
 
-local syncedDirectory = asset.syncedResource({
+local syncedDirectory = asset.resource({
   Name = Name,
   Type = "HttpSynchronization",
   Identifier = Identifier,
diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/tsunami_historical_series-aleutians_1957.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/tsunami_historical_series-aleutians_1957.asset
index 456505a344..3c1bdbad9f 100644
--- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/tsunami_historical_series-aleutians_1957.asset
+++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/tsunami_historical_series-aleutians_1957.asset
@@ -24,7 +24,7 @@ These efforts, established in 1948, would later become the Pacific Tsunami Warni
 local URL = "https://sos.noaa.gov/catalog/datasets/tsunami-historical-series-aleutian-islands-1957/"
 
 
-local syncedDirectory = asset.syncedResource({
+local syncedDirectory = asset.resource({
   Name = Name,
   Type = "HttpSynchronization",
   Identifier = Identifier,
diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/tsunami_historical_series-cascadia.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/tsunami_historical_series-cascadia.asset
index 3c688d3a66..c6d07d7ef8 100644
--- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/tsunami_historical_series-cascadia.asset
+++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/tsunami_historical_series-cascadia.asset
@@ -26,7 +26,7 @@ occurred around 9:00 at night in Cascadia on January 26, 1700 (05:00 January 27
 local URL = "https://sos.noaa.gov/catalog/datasets/tsunami-historical-series-cascadia-1700/"
 
 
-local syncedDirectory = asset.syncedResource({
+local syncedDirectory = asset.resource({
   Name = Name,
   Type = "HttpSynchronization",
   Identifier = Identifier,
diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/tsunami_historical_series-chile.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/tsunami_historical_series-chile.asset
index b8334de5e8..89b087b975 100644
--- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/tsunami_historical_series-chile.asset
+++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/tsunami_historical_series-chile.asset
@@ -28,7 +28,7 @@ and caused minor damage in San Diego, California and in Japan]]
 local URL = "https://sos.noaa.gov/catalog/datasets/tsunami-historical-series-chile-2010/"
 
 
-local syncedDirectory = asset.syncedResource({
+local syncedDirectory = asset.resource({
   Name = Name,
   Type = "HttpSynchronization",
   Identifier = Identifier,
diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/tsunami_historical_series-japan.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/tsunami_historical_series-japan.asset
index 1e3c4a08c6..d3d26e05fc 100644
--- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/tsunami_historical_series-japan.asset
+++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/tsunami_historical_series-japan.asset
@@ -33,7 +33,7 @@ California]]
 local URL = "https://sos.noaa.gov/catalog/datasets/tsunami-historical-series-japan-2011/"
 
 
-local syncedDirectory = asset.syncedResource({
+local syncedDirectory = asset.resource({
   Name = Name,
   Type = "HttpSynchronization",
   Identifier = Identifier,
diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/tsunami_historical_series-lisbon.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/tsunami_historical_series-lisbon.asset
index 5dfb64a7cd..bbb689a831 100644
--- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/tsunami_historical_series-lisbon.asset
+++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/tsunami_historical_series-lisbon.asset
@@ -16,7 +16,7 @@ completing the earthquake's destruction]]
 local URL = "https://sos.noaa.gov/catalog/datasets/tsunami-historical-series-lisbon-1755/"
 
 
-local syncedDirectory = asset.syncedResource({
+local syncedDirectory = asset.resource({
   Name = Name,
   Type = "HttpSynchronization",
   Identifier = Identifier,
diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/tsunami_historical_series-samoa.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/tsunami_historical_series-samoa.asset
index 11b3d8b34c..7b25322717 100644
--- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/tsunami_historical_series-samoa.asset
+++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/tsunami_historical_series-samoa.asset
@@ -18,7 +18,7 @@ evacuation. PTWC canceled all tsunami alerts about four hours after the earthqua
 local URL = "https://sos.noaa.gov/catalog/datasets/tsunami-historical-series-samoa-2009/"
 
 
-local syncedDirectory = asset.syncedResource({
+local syncedDirectory = asset.resource({
   Name = Name,
   Type = "HttpSynchronization",
   Identifier = Identifier,
diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/tsunami_historical_series-sumatra.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/tsunami_historical_series-sumatra.asset
index bbe0fbb68a..af71950876 100644
--- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/tsunami_historical_series-sumatra.asset
+++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/tsunami_historical_series-sumatra.asset
@@ -12,7 +12,7 @@ Province, Sumatra, where the tsunami rose as high as 30 m (100 ft.) and traveled
 local URL = "https://sos.noaa.gov/catalog/datasets/tsunami-historical-series-sumatra-2004//"
 
 
-local syncedDirectory = asset.syncedResource({
+local syncedDirectory = asset.resource({
   Name = Name,
   Type = "HttpSynchronization",
   Identifier = Identifier,
diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/tsunami_locations.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/tsunami_locations.asset
index 162f691b35..5e2e99ca81 100644
--- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/tsunami_locations.asset
+++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/tsunami_locations.asset
@@ -22,7 +22,7 @@ pronounced ocean features, such as volcanic islands, rift zones, and plate bound
 local URL = "https://sos.noaa.gov/catalog/datasets/tsunami-locations-2000-bce-2014/"
 
 
-local syncedDirectory = asset.syncedResource({
+local syncedDirectory = asset.resource({
   Name = Name,
   Type = "HttpSynchronization",
   Identifier = Identifier,
diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/vector_winds.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/vector_winds.asset
index fa7f73d43f..5fb452633a 100644
--- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/vector_winds.asset
+++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/vector_winds.asset
@@ -16,7 +16,7 @@ from a given area on the ocean surface]]
 local URL = "https://sos.noaa.gov/catalog/datasets/ocean-surface-winds/"
 
 
-local syncedDirectory = asset.syncedResource({
+local syncedDirectory = asset.resource({
   Name = Name,
   Type = "HttpSynchronization",
   Identifier = Identifier,
diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/vent_discoveries_animation.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/vent_discoveries_animation.asset
index 9354c87045..3e5ef81dc7 100644
--- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/vent_discoveries_animation.asset
+++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/vent_discoveries_animation.asset
@@ -13,7 +13,7 @@ with human-occupied, remotely-operated, and autonomous vehicles]]
 local URL = "https://sos.noaa.gov/catalog/datasets/deep-sea-vent-discoveries/"
 
 
-local syncedDirectory = asset.syncedResource({
+local syncedDirectory = asset.resource({
   Name = Name,
   Type = "HttpSynchronization",
   Identifier = Identifier,
diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/vent_locations.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/vent_locations.asset
index 521acfc12a..30bd1411c8 100644
--- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/vent_locations.asset
+++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/vent_locations.asset
@@ -13,7 +13,7 @@ otherwise cold, dark, deep sea]]
 local URL = "https://sos.noaa.gov/catalog/datasets/deep-sea-vent-locations/"
 
 
-local syncedDirectory = asset.syncedResource({
+local syncedDirectory = asset.resource({
   Name = Name,
   Type = "HttpSynchronization",
   Identifier = Identifier,
diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/vorticity.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/vorticity.asset
index 20a3fb3f8a..fd43cf69c1 100644
--- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/vorticity.asset
+++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/vorticity.asset
@@ -14,7 +14,7 @@ chemical constituents (such as carbon dioxide) throughout the globe]]
 local URL = "https://sos.noaa.gov/catalog/datasets/ocean-surface-vorticity/"
 
 
-local syncedDirectory = asset.syncedResource({
+local syncedDirectory = asset.resource({
   Name = Name,
   Type = "HttpSynchronization",
   Identifier = Identifier,
diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/waves-wave_height_2012.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/waves-wave_height_2012.asset
index aae1c3c290..2dd68ccffc 100644
--- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/waves-wave_height_2012.asset
+++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/waves-wave_height_2012.asset
@@ -11,7 +11,7 @@ numerical models to make these predictions]]
 local URL = "https://sos.noaa.gov/catalog/datasets/wave-heights-2012/"
 
 
-local syncedDirectory = asset.syncedResource({
+local syncedDirectory = asset.resource({
   Name = Name,
   Type = "HttpSynchronization",
   Identifier = Identifier,
diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/waves-wave_height_katrina.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/waves-wave_height_katrina.asset
index 3b9e4435e6..52f41c1189 100644
--- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/waves-wave_height_katrina.asset
+++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/waves-wave_height_katrina.asset
@@ -13,7 +13,7 @@ though the Gulf of Mexico. Finally it hit the southeast Louisiana coast on Monda
 local URL = "https://sos.noaa.gov/catalog/datasets/wave-heights-hurricane-katrina-2005/"
 
 
-local syncedDirectory = asset.syncedResource({
+local syncedDirectory = asset.resource({
   Name = Name,
   Type = "HttpSynchronization",
   Identifier = Identifier,
diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/waves-wave_height_sandy.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/waves-wave_height_sandy.asset
index 174650547f..44d1229ed5 100644
--- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/waves-wave_height_sandy.asset
+++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/waves-wave_height_sandy.asset
@@ -13,7 +13,7 @@ a wave model called 'WAVEWATCH III'. The movie shows 3 hourly model output over
 local URL = "https://sos.noaa.gov/catalog/datasets/wave-heights-hurricane-sandy-2012/"
 
 
-local syncedDirectory = asset.syncedResource({
+local syncedDirectory = asset.resource({
   Name = Name,
   Type = "HttpSynchronization",
   Identifier = Identifier,
diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/waves-wave_power_2012.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/waves-wave_power_2012.asset
index c1fbc68467..18f19e88dc 100644
--- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/waves-wave_power_2012.asset
+++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/waves-wave_power_2012.asset
@@ -11,7 +11,7 @@ numerical models to make these predictions]]
 local URL = "https://sos.noaa.gov/catalog/datasets/wave-power-2012/"
 
 
-local syncedDirectory = asset.syncedResource({
+local syncedDirectory = asset.resource({
   Name = Name,
   Type = "HttpSynchronization",
   Identifier = Identifier,
diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/weeklyseaice-10day_seaice.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/weeklyseaice-10day_seaice.asset
index 6d5533fd1a..8c6b7ce635 100644
--- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/weeklyseaice-10day_seaice.asset
+++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/weeklyseaice-10day_seaice.asset
@@ -17,7 +17,7 @@ cell size grid covering both Arctic and Antarctic polar regions]]
 local URL = "https://sos.noaa.gov/catalog/datasets/sea-ice-extent-1978-present/"
 
 
-local syncedDirectory = asset.syncedResource({
+local syncedDirectory = asset.resource({
   Name = Name,
   Type = "HttpSynchronization",
   Identifier = Identifier,
diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/weeklyseaice-sept_seaice.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/weeklyseaice-sept_seaice.asset
index b299b2de26..47dcb5639e 100644
--- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/weeklyseaice-sept_seaice.asset
+++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/weeklyseaice-sept_seaice.asset
@@ -25,7 +25,7 @@ Arctic is shrinking, while the Antarctic sea ice is not trending downward]]
 local URL = "https://sos.noaa.gov/catalog/datasets/sea-ice-extent-september-only/"
 
 
-local syncedDirectory = asset.syncedResource({
+local syncedDirectory = asset.resource({
   Name = Name,
   Type = "HttpSynchronization",
   Identifier = Identifier,
diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/overlays/cables.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/overlays/cables.asset
index 33f6b2be4c..b322a4e284 100644
--- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/overlays/cables.asset
+++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/overlays/cables.asset
@@ -11,7 +11,7 @@ at Wikipedia]]
 local URL = "https://sos.noaa.gov/catalog/datasets/undersea-communication-cables/"
 
 
-local syncedDirectory = asset.syncedResource({
+local syncedDirectory = asset.resource({
   Name = Name,
   Type = "HttpSynchronization",
   Identifier = Identifier,
diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/overlays/capitals.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/overlays/capitals.asset
index 8b8024c36d..ad77528a18 100644
--- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/overlays/capitals.asset
+++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/overlays/capitals.asset
@@ -10,7 +10,7 @@ country capitals onto any dataset that you are viewing]]
 local URL = "https://sos.noaa.gov/catalog/datasets/capital-city-names/"
 
 
-local syncedDirectory = asset.syncedResource({
+local syncedDirectory = asset.resource({
   Name = Name,
   Type = "HttpSynchronization",
   Identifier = Identifier,
diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/overlays/city_names.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/overlays/city_names.asset
index 53ba464dfc..606da418d8 100644
--- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/overlays/city_names.asset
+++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/overlays/city_names.asset
@@ -11,7 +11,7 @@ are viewing]]
 local URL = "https://sos.noaa.gov/catalog/datasets/city-names/"
 
 
-local syncedDirectory = asset.syncedResource({
+local syncedDirectory = asset.resource({
   Name = Name,
   Type = "HttpSynchronization",
   Identifier = Identifier,
diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/overlays/continent_borders-black.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/overlays/continent_borders-black.asset
index 03280e3dd0..6766fb74d3 100644
--- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/overlays/continent_borders-black.asset
+++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/overlays/continent_borders-black.asset
@@ -10,7 +10,7 @@ continent borders in black onto any dataset that you are viewing]]
 local URL = "https://sos.noaa.gov/catalog/datasets/continent-borders-black/"
 
 
-local syncedDirectory = asset.syncedResource({
+local syncedDirectory = asset.resource({
   Name = Name,
   Type = "HttpSynchronization",
   Identifier = Identifier,
diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/overlays/continent_borders-white.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/overlays/continent_borders-white.asset
index ef85f6be2c..68b85bc6d9 100644
--- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/overlays/continent_borders-white.asset
+++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/overlays/continent_borders-white.asset
@@ -10,7 +10,7 @@ continent borders in white onto any dataset that you are viewing]]
 local URL = "https://sos.noaa.gov/catalog/datasets/continent-borders-white/"
 
 
-local syncedDirectory = asset.syncedResource({
+local syncedDirectory = asset.resource({
   Name = Name,
   Type = "HttpSynchronization",
   Identifier = Identifier,
diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/overlays/continent_names.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/overlays/continent_names.asset
index 5b9e415137..3cd2185ac8 100644
--- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/overlays/continent_names.asset
+++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/overlays/continent_names.asset
@@ -10,7 +10,7 @@ continent continent names onto any dataset that you are viewing]]
 local URL = "https://sos.noaa.gov/catalog/datasets/continent-names/"
 
 
-local syncedDirectory = asset.syncedResource({
+local syncedDirectory = asset.resource({
   Name = Name,
   Type = "HttpSynchronization",
   Identifier = Identifier,
diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/overlays/country_borders-black.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/overlays/country_borders-black.asset
index 2e9bdcf181..d16306a91e 100644
--- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/overlays/country_borders-black.asset
+++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/overlays/country_borders-black.asset
@@ -10,7 +10,7 @@ country borders onto any dataset that you are viewing]]
 local URL = "https://sos.noaa.gov/catalog/datasets/country-borders-black/"
 
 
-local syncedDirectory = asset.syncedResource({
+local syncedDirectory = asset.resource({
   Name = Name,
   Type = "HttpSynchronization",
   Identifier = Identifier,
diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/overlays/country_borders-white.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/overlays/country_borders-white.asset
index 66e2d411e0..57907d639b 100644
--- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/overlays/country_borders-white.asset
+++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/overlays/country_borders-white.asset
@@ -10,7 +10,7 @@ country borders onto any dataset that you are viewing]]
 local URL = "https://sos.noaa.gov/catalog/datasets/country-borders-white/"
 
 
-local syncedDirectory = asset.syncedResource({
+local syncedDirectory = asset.resource({
   Name = Name,
   Type = "HttpSynchronization",
   Identifier = Identifier,
diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/overlays/country_pop_names.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/overlays/country_pop_names.asset
index 5475e86771..68ac357cfd 100644
--- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/overlays/country_pop_names.asset
+++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/overlays/country_pop_names.asset
@@ -11,7 +11,7 @@ viewing]]
 local URL = "https://sos.noaa.gov/catalog/datasets/country-names/"
 
 
-local syncedDirectory = asset.syncedResource({
+local syncedDirectory = asset.resource({
   Name = Name,
   Type = "HttpSynchronization",
   Identifier = Identifier,
diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/overlays/currents.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/overlays/currents.asset
index b786993321..6cc7217b16 100644
--- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/overlays/currents.asset
+++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/overlays/currents.asset
@@ -10,7 +10,7 @@ of ocean currents, taken from the Ocean Circulation dataset]]
 local URL = "https://sos.noaa.gov/catalog/datasets/ocean-currents/"
 
 
-local syncedDirectory = asset.syncedResource({
+local syncedDirectory = asset.resource({
   Name = Name,
   Type = "HttpSynchronization",
   Identifier = Identifier,
diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/overlays/general_circulation.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/overlays/general_circulation.asset
index 1189f61cf8..48bd3641d2 100644
--- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/overlays/general_circulation.asset
+++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/overlays/general_circulation.asset
@@ -12,7 +12,7 @@ rain shadow effect as well as cloud movement or when describing the coriolis eff
 local URL = "https://sos.noaa.gov/catalog/datasets/atmospheric-general-circulation/"
 
 
-local syncedDirectory = asset.syncedResource({
+local syncedDirectory = asset.resource({
   Name = Name,
   Type = "HttpSynchronization",
   Identifier = Identifier,
diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/overlays/land_mask-black.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/overlays/land_mask-black.asset
index 3bbb7af600..eda460e77e 100644
--- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/overlays/land_mask-black.asset
+++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/overlays/land_mask-black.asset
@@ -10,7 +10,7 @@ black mask over all the land on any dataset that you are viewing]]
 local URL = "https://sos.noaa.gov/catalog/datasets/land-mask-black/"
 
 
-local syncedDirectory = asset.syncedResource({
+local syncedDirectory = asset.resource({
   Name = Name,
   Type = "HttpSynchronization",
   Identifier = Identifier,
diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/overlays/land_mask-veg.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/overlays/land_mask-veg.asset
index 7b9f28a9d6..0e86d919fc 100644
--- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/overlays/land_mask-veg.asset
+++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/overlays/land_mask-veg.asset
@@ -11,7 +11,7 @@ viewing]]
 local URL = "https://sos.noaa.gov/catalog/datasets/land-mask-vegetation/"
 
 
-local syncedDirectory = asset.syncedResource({
+local syncedDirectory = asset.resource({
   Name = Name,
   Type = "HttpSynchronization",
   Identifier = Identifier,
diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/overlays/latlon_grid-black.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/overlays/latlon_grid-black.asset
index 1488b37544..630c38028e 100644
--- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/overlays/latlon_grid-black.asset
+++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/overlays/latlon_grid-black.asset
@@ -10,7 +10,7 @@ latitude and longitude grid in black onto any dataset that you are viewing]]
 local URL = "https://sos.noaa.gov/catalog/datasets/latlong-grid-black/"
 
 
-local syncedDirectory = asset.syncedResource({
+local syncedDirectory = asset.resource({
   Name = Name,
   Type = "HttpSynchronization",
   Identifier = Identifier,
diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/overlays/latlon_grid-white.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/overlays/latlon_grid-white.asset
index 8e4b62c7c9..88e05c2f12 100644
--- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/overlays/latlon_grid-white.asset
+++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/overlays/latlon_grid-white.asset
@@ -10,7 +10,7 @@ latitude and longitude grid in white onto any dataset that you are viewing]]
 local URL = "https://sos.noaa.gov/catalog/datasets/latlong-grid-white/"
 
 
-local syncedDirectory = asset.syncedResource({
+local syncedDirectory = asset.resource({
   Name = Name,
   Type = "HttpSynchronization",
   Identifier = Identifier,
diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/overlays/ocean_names.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/overlays/ocean_names.asset
index 6173829747..25ea1e94e2 100644
--- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/overlays/ocean_names.asset
+++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/overlays/ocean_names.asset
@@ -10,7 +10,7 @@ names onto any dataset that you are viewing]]
 local URL = "https://sos.noaa.gov/catalog/datasets/ocean-names/"
 
 
-local syncedDirectory = asset.syncedResource({
+local syncedDirectory = asset.resource({
   Name = Name,
   Type = "HttpSynchronization",
   Identifier = Identifier,
diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/overlays/plate_boundary-color.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/overlays/plate_boundary-color.asset
index 90bad9ed82..d06a4b533b 100644
--- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/overlays/plate_boundary-color.asset
+++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/overlays/plate_boundary-color.asset
@@ -11,7 +11,7 @@ dataset that you are viewing]]
 local URL = "https://sos.noaa.gov/catalog/datasets/plate-boundaries-colorized/"
 
 
-local syncedDirectory = asset.syncedResource({
+local syncedDirectory = asset.resource({
   Name = Name,
   Type = "HttpSynchronization",
   Identifier = Identifier,
diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/overlays/plate_boundary-white.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/overlays/plate_boundary-white.asset
index e0567faf4d..00e2d4dd0d 100644
--- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/overlays/plate_boundary-white.asset
+++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/overlays/plate_boundary-white.asset
@@ -10,7 +10,7 @@ tectonic plate boundaries in white onto any dataset that you are viewing]]
 local URL = "https://sos.noaa.gov/catalog/datasets/plate-boundaries-white/"
 
 
-local syncedDirectory = asset.syncedResource({
+local syncedDirectory = asset.resource({
   Name = Name,
   Type = "HttpSynchronization",
   Identifier = Identifier,
diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/overlays/plate_names.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/overlays/plate_names.asset
index f8bd0a3842..57b509e1ec 100644
--- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/overlays/plate_names.asset
+++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/overlays/plate_names.asset
@@ -10,7 +10,7 @@ tectonic plate names onto any dataset that you are viewing]]
 local URL = "https://sos.noaa.gov/catalog/datasets/plate-names/"
 
 
-local syncedDirectory = asset.syncedResource({
+local syncedDirectory = asset.resource({
   Name = Name,
   Type = "HttpSynchronization",
   Identifier = Identifier,
diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/overlays/railroad.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/overlays/railroad.asset
index 8efbb458c6..9301f1f4b5 100644
--- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/overlays/railroad.asset
+++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/overlays/railroad.asset
@@ -11,7 +11,7 @@ Data]]
 local URL = "https://sos.noaa.gov/catalog/datasets/railroads/"
 
 
-local syncedDirectory = asset.syncedResource({
+local syncedDirectory = asset.resource({
   Name = Name,
   Type = "HttpSynchronization",
   Identifier = Identifier,
diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/overlays/rivers.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/overlays/rivers.asset
index 76bb1a1eb6..bef5758229 100644
--- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/overlays/rivers.asset
+++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/overlays/rivers.asset
@@ -11,7 +11,7 @@ indicated by the size of the lines. The data was found at Natural Earth Data]]
 local URL = "https://sos.noaa.gov/catalog/datasets/rivers/"
 
 
-local syncedDirectory = asset.syncedResource({
+local syncedDirectory = asset.resource({
   Name = Name,
   Type = "HttpSynchronization",
   Identifier = Identifier,
diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/overlays/roads-black.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/overlays/roads-black.asset
index 02272f9cf5..c0085795cf 100644
--- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/overlays/roads-black.asset
+++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/overlays/roads-black.asset
@@ -11,7 +11,7 @@ Data]]
 local URL = "https://sos.noaa.gov/catalog/datasets/roads-black/"
 
 
-local syncedDirectory = asset.syncedResource({
+local syncedDirectory = asset.resource({
   Name = Name,
   Type = "HttpSynchronization",
   Identifier = Identifier,
diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/overlays/roads-white.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/overlays/roads-white.asset
index 1c2755289f..a97330d44e 100644
--- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/overlays/roads-white.asset
+++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/overlays/roads-white.asset
@@ -11,7 +11,7 @@ Data]]
 local URL = "https://sos.noaa.gov/catalog/datasets/roads-white/"
 
 
-local syncedDirectory = asset.syncedResource({
+local syncedDirectory = asset.resource({
   Name = Name,
   Type = "HttpSynchronization",
   Identifier = Identifier,
diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/overlays/state_borders-black.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/overlays/state_borders-black.asset
index fe201024ab..08359476c0 100644
--- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/overlays/state_borders-black.asset
+++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/overlays/state_borders-black.asset
@@ -10,7 +10,7 @@ country and North American state borders onto any dataset that you are viewing]]
 local URL = "https://sos.noaa.gov/catalog/datasets/country-borders-with-north-american-states-black/"
 
 
-local syncedDirectory = asset.syncedResource({
+local syncedDirectory = asset.resource({
   Name = Name,
   Type = "HttpSynchronization",
   Identifier = Identifier,
diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/overlays/state_borders-white.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/overlays/state_borders-white.asset
index 23163d7e99..42a19b0e29 100644
--- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/overlays/state_borders-white.asset
+++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/overlays/state_borders-white.asset
@@ -10,7 +10,7 @@ country and North American state borders onto any dataset that you are viewing]]
 local URL = "https://sos.noaa.gov/catalog/datasets/country-borders-with-north-american-states-white/"
 
 
-local syncedDirectory = asset.syncedResource({
+local syncedDirectory = asset.resource({
   Name = Name,
   Type = "HttpSynchronization",
   Identifier = Identifier,
diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/overlays/timezones.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/overlays/timezones.asset
index a771fb0f5e..69518b1167 100644
--- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/overlays/timezones.asset
+++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/overlays/timezones.asset
@@ -10,7 +10,7 @@ timezones onto any dataset that you are viewing]]
 local URL = "https://sos.noaa.gov/catalog/datasets/time-zones/"
 
 
-local syncedDirectory = asset.syncedResource({
+local syncedDirectory = asset.resource({
   Name = Name,
   Type = "HttpSynchronization",
   Identifier = Identifier,
diff --git a/data/assets/scene/solarsystem/planets/earth/satellites/communications/amateur.asset b/data/assets/scene/solarsystem/planets/earth/satellites/communications/amateur.asset
index 8c53e2fa68..4e4f755a3f 100644
--- a/data/assets/scene/solarsystem/planets/earth/satellites/communications/amateur.asset
+++ b/data/assets/scene/solarsystem/planets/earth/satellites/communications/amateur.asset
@@ -2,7 +2,7 @@ local transforms = asset.require("scene/solarsystem/planets/earth/transforms")
 
 
 
-local omm = asset.syncedResource({
+local omm = asset.resource({
   Name = "Satellite OMM Data (Amateur Radio)",
   Type = "UrlSynchronization",
   Identifier = "satellite_omm_data_amateur_radio",
diff --git a/data/assets/scene/solarsystem/planets/earth/satellites/communications/experimental.asset b/data/assets/scene/solarsystem/planets/earth/satellites/communications/experimental.asset
index 5307b4938b..654c64564a 100644
--- a/data/assets/scene/solarsystem/planets/earth/satellites/communications/experimental.asset
+++ b/data/assets/scene/solarsystem/planets/earth/satellites/communications/experimental.asset
@@ -2,7 +2,7 @@ local transforms = asset.require("scene/solarsystem/planets/earth/transforms")
 
 
 
-local omm = asset.syncedResource({
+local omm = asset.resource({
   Name = "Satellite OMM Data (Experimental)",
   Type = "UrlSynchronization",
   Identifier = "satellite_omm_data_x-comm",
diff --git a/data/assets/scene/solarsystem/planets/earth/satellites/communications/geostationary.asset b/data/assets/scene/solarsystem/planets/earth/satellites/communications/geostationary.asset
index c0e562027e..b6668e7ef2 100644
--- a/data/assets/scene/solarsystem/planets/earth/satellites/communications/geostationary.asset
+++ b/data/assets/scene/solarsystem/planets/earth/satellites/communications/geostationary.asset
@@ -2,7 +2,7 @@ local transforms = asset.require("scene/solarsystem/planets/earth/transforms")
 
 
 
-local omm = asset.syncedResource({
+local omm = asset.resource({
   Name = "Satellite OMM Data (Geostationary)",
   Type = "UrlSynchronization",
   Identifier = "satellite_omm_data_geo",
diff --git a/data/assets/scene/solarsystem/planets/earth/satellites/communications/globalstar.asset b/data/assets/scene/solarsystem/planets/earth/satellites/communications/globalstar.asset
index f4304a159a..e3d54ba07c 100644
--- a/data/assets/scene/solarsystem/planets/earth/satellites/communications/globalstar.asset
+++ b/data/assets/scene/solarsystem/planets/earth/satellites/communications/globalstar.asset
@@ -2,7 +2,7 @@ local transforms = asset.require("scene/solarsystem/planets/earth/transforms")
 
 
 
-local omm = asset.syncedResource({
+local omm = asset.resource({
   Name = "Satellite OMM Data (GlobalStar)",
   Type = "UrlSynchronization",
   Identifier = "satellite_omm_data_globalstar",
diff --git a/data/assets/scene/solarsystem/planets/earth/satellites/communications/gorizont.asset b/data/assets/scene/solarsystem/planets/earth/satellites/communications/gorizont.asset
index 8e81b4c2cb..0ab12c2d39 100644
--- a/data/assets/scene/solarsystem/planets/earth/satellites/communications/gorizont.asset
+++ b/data/assets/scene/solarsystem/planets/earth/satellites/communications/gorizont.asset
@@ -2,7 +2,7 @@ local transforms = asset.require("scene/solarsystem/planets/earth/transforms")
 
 
 
-local omm = asset.syncedResource({
+local omm = asset.resource({
   Name = "Satellite OMM Data (Gorizont)",
   Type = "UrlSynchronization",
   Identifier = "satellite_omm_data_gorizont",
diff --git a/data/assets/scene/solarsystem/planets/earth/satellites/communications/intelsat.asset b/data/assets/scene/solarsystem/planets/earth/satellites/communications/intelsat.asset
index 1a7f0d21b5..b54b81e4f4 100644
--- a/data/assets/scene/solarsystem/planets/earth/satellites/communications/intelsat.asset
+++ b/data/assets/scene/solarsystem/planets/earth/satellites/communications/intelsat.asset
@@ -2,7 +2,7 @@ local transforms = asset.require("scene/solarsystem/planets/earth/transforms")
 
 
 
-local omm = asset.syncedResource({
+local omm = asset.resource({
   Name = "Satellite OMM Data (Intelsat)",
   Type = "UrlSynchronization",
   Identifier = "satellite_omm_data_intelsat",
diff --git a/data/assets/scene/solarsystem/planets/earth/satellites/communications/iridium.asset b/data/assets/scene/solarsystem/planets/earth/satellites/communications/iridium.asset
index b5181a5086..c5a623371a 100644
--- a/data/assets/scene/solarsystem/planets/earth/satellites/communications/iridium.asset
+++ b/data/assets/scene/solarsystem/planets/earth/satellites/communications/iridium.asset
@@ -2,7 +2,7 @@ local transforms = asset.require("scene/solarsystem/planets/earth/transforms")
 
 
 
-local omm = asset.syncedResource({
+local omm = asset.resource({
   Name = "Satellite OMM Data (Iridium)",
   Type = "UrlSynchronization",
   Identifier = "satellite_omm_data_iridium",
diff --git a/data/assets/scene/solarsystem/planets/earth/satellites/communications/iridium_next.asset b/data/assets/scene/solarsystem/planets/earth/satellites/communications/iridium_next.asset
index 69856e3174..b56bb45a39 100644
--- a/data/assets/scene/solarsystem/planets/earth/satellites/communications/iridium_next.asset
+++ b/data/assets/scene/solarsystem/planets/earth/satellites/communications/iridium_next.asset
@@ -2,7 +2,7 @@ local transforms = asset.require("scene/solarsystem/planets/earth/transforms")
 
 
 
-local omm = asset.syncedResource({
+local omm = asset.resource({
   Name = "Satellite OMM Data (Iridium NEXT)",
   Type = "UrlSynchronization",
   Identifier = "satellite_omm_data_iridium-NEXT",
diff --git a/data/assets/scene/solarsystem/planets/earth/satellites/communications/molniya.asset b/data/assets/scene/solarsystem/planets/earth/satellites/communications/molniya.asset
index 5937017024..5be8ee8886 100644
--- a/data/assets/scene/solarsystem/planets/earth/satellites/communications/molniya.asset
+++ b/data/assets/scene/solarsystem/planets/earth/satellites/communications/molniya.asset
@@ -2,7 +2,7 @@ local transforms = asset.require("scene/solarsystem/planets/earth/transforms")
 
 
 
-local omm = asset.syncedResource({
+local omm = asset.resource({
   Name = "Satellite OMM Data (Molniya)",
   Type = "UrlSynchronization",
   Identifier = "satellite_omm_data_molniya",
diff --git a/data/assets/scene/solarsystem/planets/earth/satellites/communications/orbcomm.asset b/data/assets/scene/solarsystem/planets/earth/satellites/communications/orbcomm.asset
index 06a4b3ddc4..8f00be9cac 100644
--- a/data/assets/scene/solarsystem/planets/earth/satellites/communications/orbcomm.asset
+++ b/data/assets/scene/solarsystem/planets/earth/satellites/communications/orbcomm.asset
@@ -2,7 +2,7 @@ local transforms = asset.require("scene/solarsystem/planets/earth/transforms")
 
 
 
-local omm = asset.syncedResource({
+local omm = asset.resource({
   Name = "Satellite OMM Data (Orbcomm)",
   Type = "UrlSynchronization",
   Identifier = "satellite_omm_data_orbcomm",
diff --git a/data/assets/scene/solarsystem/planets/earth/satellites/communications/other_comm.asset b/data/assets/scene/solarsystem/planets/earth/satellites/communications/other_comm.asset
index 613a9a1933..99e98cc528 100644
--- a/data/assets/scene/solarsystem/planets/earth/satellites/communications/other_comm.asset
+++ b/data/assets/scene/solarsystem/planets/earth/satellites/communications/other_comm.asset
@@ -2,7 +2,7 @@ local transforms = asset.require("scene/solarsystem/planets/earth/transforms")
 
 
 
-local omm = asset.syncedResource({
+local omm = asset.resource({
   Name = "Satellite OMM Data (Other comm)",
   Type = "UrlSynchronization",
   Identifier = "satellite_omm_data_other-comm",
diff --git a/data/assets/scene/solarsystem/planets/earth/satellites/communications/raduga.asset b/data/assets/scene/solarsystem/planets/earth/satellites/communications/raduga.asset
index f212a9f1a0..589e70850f 100644
--- a/data/assets/scene/solarsystem/planets/earth/satellites/communications/raduga.asset
+++ b/data/assets/scene/solarsystem/planets/earth/satellites/communications/raduga.asset
@@ -2,7 +2,7 @@ local transforms = asset.require("scene/solarsystem/planets/earth/transforms")
 
 
 
-local omm = asset.syncedResource({
+local omm = asset.resource({
   Name = "Satellite OMM Data (Raduga)",
   Type = "UrlSynchronization",
   Identifier = "satellite_omm_data_raduga",
diff --git a/data/assets/scene/solarsystem/planets/earth/satellites/communications/ses.asset b/data/assets/scene/solarsystem/planets/earth/satellites/communications/ses.asset
index 9da29c13c7..68ff8c2343 100644
--- a/data/assets/scene/solarsystem/planets/earth/satellites/communications/ses.asset
+++ b/data/assets/scene/solarsystem/planets/earth/satellites/communications/ses.asset
@@ -2,7 +2,7 @@ local transforms = asset.require("scene/solarsystem/planets/earth/transforms")
 
 
 
-local omm = asset.syncedResource({
+local omm = asset.resource({
   Name = "Satellite OMM Data (SES)",
   Type = "UrlSynchronization",
   Identifier = "satellite_omm_data_ses",
diff --git a/data/assets/scene/solarsystem/planets/earth/satellites/communications/starlink.asset b/data/assets/scene/solarsystem/planets/earth/satellites/communications/starlink.asset
index 3e6538001f..d9ae0f3fa4 100644
--- a/data/assets/scene/solarsystem/planets/earth/satellites/communications/starlink.asset
+++ b/data/assets/scene/solarsystem/planets/earth/satellites/communications/starlink.asset
@@ -2,7 +2,7 @@ local transforms = asset.require("scene/solarsystem/planets/earth/transforms")
 
 
 
-local omm = asset.syncedResource({
+local omm = asset.resource({
   Name = "Satellite OMM Data (Starlink)",
   Type = "UrlSynchronization",
   Identifier = "satellite_omm_data_starlink",
diff --git a/data/assets/scene/solarsystem/planets/earth/satellites/debris/debris_asat.asset b/data/assets/scene/solarsystem/planets/earth/satellites/debris/debris_asat.asset
index 524ea1b36e..197d0817b1 100644
--- a/data/assets/scene/solarsystem/planets/earth/satellites/debris/debris_asat.asset
+++ b/data/assets/scene/solarsystem/planets/earth/satellites/debris/debris_asat.asset
@@ -2,7 +2,7 @@ local transforms = asset.require("scene/solarsystem/planets/earth/transforms")
 
 
 
-local omm = asset.syncedResource({
+local omm = asset.resource({
   Name = "Satellite OMM Data (Indian ASAT test Debris)",
   Type = "UrlSynchronization",
   Identifier = "satellite_omm_data_2019-006",
diff --git a/data/assets/scene/solarsystem/planets/earth/satellites/debris/debris_breezem.asset b/data/assets/scene/solarsystem/planets/earth/satellites/debris/debris_breezem.asset
index 48990cb89b..429d75054b 100644
--- a/data/assets/scene/solarsystem/planets/earth/satellites/debris/debris_breezem.asset
+++ b/data/assets/scene/solarsystem/planets/earth/satellites/debris/debris_breezem.asset
@@ -2,7 +2,7 @@ local transforms = asset.require("scene/solarsystem/planets/earth/transforms")
 
 
 
-local omm = asset.syncedResource({
+local omm = asset.resource({
   Name = "Satellite OMM Data (Breeze-M Breakup)",
   Type = "UrlSynchronization",
   Identifier = "satellite_omm_data_2012-044",
diff --git a/data/assets/scene/solarsystem/planets/earth/satellites/debris/debris_fengyun.asset b/data/assets/scene/solarsystem/planets/earth/satellites/debris/debris_fengyun.asset
index f7164e36fa..6de5152b47 100644
--- a/data/assets/scene/solarsystem/planets/earth/satellites/debris/debris_fengyun.asset
+++ b/data/assets/scene/solarsystem/planets/earth/satellites/debris/debris_fengyun.asset
@@ -2,7 +2,7 @@ local transforms = asset.require("scene/solarsystem/planets/earth/transforms")
 
 
 
-local omm = asset.syncedResource({
+local omm = asset.resource({
   Name = "Satellite OMM Data (Fengyun Debris)",
   Type = "UrlSynchronization",
   Identifier = "satellite_omm_data_1999-025",
diff --git a/data/assets/scene/solarsystem/planets/earth/satellites/debris/debris_iridium33.asset b/data/assets/scene/solarsystem/planets/earth/satellites/debris/debris_iridium33.asset
index d31e5d3cc6..2745a39fbf 100644
--- a/data/assets/scene/solarsystem/planets/earth/satellites/debris/debris_iridium33.asset
+++ b/data/assets/scene/solarsystem/planets/earth/satellites/debris/debris_iridium33.asset
@@ -2,7 +2,7 @@ local transforms = asset.require("scene/solarsystem/planets/earth/transforms")
 
 
 
-local omm = asset.syncedResource({
+local omm = asset.resource({
   Name = "Satellite OMM Data (Iridium 33 Debris)",
   Type = "UrlSynchronization",
   Identifier = "satellite_omm_data_iridium-33-debris",
diff --git a/data/assets/scene/solarsystem/planets/earth/satellites/debris/debris_kosmos2251.asset b/data/assets/scene/solarsystem/planets/earth/satellites/debris/debris_kosmos2251.asset
index ae4e4c7658..8681bf7bc7 100644
--- a/data/assets/scene/solarsystem/planets/earth/satellites/debris/debris_kosmos2251.asset
+++ b/data/assets/scene/solarsystem/planets/earth/satellites/debris/debris_kosmos2251.asset
@@ -2,7 +2,7 @@ local transforms = asset.require("scene/solarsystem/planets/earth/transforms")
 
 
 
-local omm = asset.syncedResource({
+local omm = asset.resource({
   Name = "Satellite OMM Data (Kosmos 2251 Debris)",
   Type = "UrlSynchronization",
   Identifier = "satellite_omm_data_cosmos-2251-debris",
diff --git a/data/assets/scene/solarsystem/planets/earth/satellites/debris/volume/cartesian_volume.asset b/data/assets/scene/solarsystem/planets/earth/satellites/debris/volume/cartesian_volume.asset
index 165c09f43e..9fd06ffed6 100644
--- a/data/assets/scene/solarsystem/planets/earth/satellites/debris/volume/cartesian_volume.asset
+++ b/data/assets/scene/solarsystem/planets/earth/satellites/debris/volume/cartesian_volume.asset
@@ -18,8 +18,8 @@ local DebrisVolumeCartesian = {
   },
   Renderable = {
     Type = "RenderableTimeVaryingVolume",
-    SourceDirectory = asset.localResource("generatedCartesian"),
-    TransferFunction = asset.localResource("transferfunction.txt"),
+    SourceDirectory = asset.resource("generatedCartesian"),
+    TransferFunction = asset.resource("transferfunction.txt"),
     StepSize = 0.01,
     MinValue = 0,
     MaxValue = 1,
diff --git a/data/assets/scene/solarsystem/planets/earth/satellites/debris/volume/spherical_volume.asset b/data/assets/scene/solarsystem/planets/earth/satellites/debris/volume/spherical_volume.asset
index fa9884a66b..7b007b20a2 100644
--- a/data/assets/scene/solarsystem/planets/earth/satellites/debris/volume/spherical_volume.asset
+++ b/data/assets/scene/solarsystem/planets/earth/satellites/debris/volume/spherical_volume.asset
@@ -18,8 +18,8 @@ local DebrisVolumeSpherical = {
   },
   Renderable = {
     Type = "RenderableTimeVaryingVolume",
-    SourceDirectory = asset.localResource("generated"),
-    TransferFunction = asset.localResource("transferfunction.txt"),
+    SourceDirectory = asset.resource("generated"),
+    TransferFunction = asset.resource("transferfunction.txt"),
     StepSize = 0.01,
     MinValue = 0,
     MaxValue = 1,
diff --git a/data/assets/scene/solarsystem/planets/earth/satellites/misc/active.asset b/data/assets/scene/solarsystem/planets/earth/satellites/misc/active.asset
index eef6c9b559..d146a2a599 100644
--- a/data/assets/scene/solarsystem/planets/earth/satellites/misc/active.asset
+++ b/data/assets/scene/solarsystem/planets/earth/satellites/misc/active.asset
@@ -2,7 +2,7 @@ local transforms = asset.require("scene/solarsystem/planets/earth/transforms")
 
 
 
-local omm = asset.syncedResource({
+local omm = asset.resource({
   Name = "Satellite OMM Data (Active)",
   Type = "UrlSynchronization",
   Identifier = "satellite_omm_data_active",
diff --git a/data/assets/scene/solarsystem/planets/earth/satellites/misc/brightest.asset b/data/assets/scene/solarsystem/planets/earth/satellites/misc/brightest.asset
index 79bb4e7dab..95870e8de3 100644
--- a/data/assets/scene/solarsystem/planets/earth/satellites/misc/brightest.asset
+++ b/data/assets/scene/solarsystem/planets/earth/satellites/misc/brightest.asset
@@ -2,7 +2,7 @@ local transforms = asset.require("scene/solarsystem/planets/earth/transforms")
 
 
 
-local omm = asset.syncedResource({
+local omm = asset.resource({
   Name = "Satellite OMM Data (100 Brightest)",
   Type = "UrlSynchronization",
   Identifier = "satellite_omm_data_visual",
diff --git a/data/assets/scene/solarsystem/planets/earth/satellites/misc/cubesats.asset b/data/assets/scene/solarsystem/planets/earth/satellites/misc/cubesats.asset
index c1a86fe27f..7f7a66fc55 100644
--- a/data/assets/scene/solarsystem/planets/earth/satellites/misc/cubesats.asset
+++ b/data/assets/scene/solarsystem/planets/earth/satellites/misc/cubesats.asset
@@ -2,7 +2,7 @@ local transforms = asset.require("scene/solarsystem/planets/earth/transforms")
 
 
 
-local omm = asset.syncedResource({
+local omm = asset.resource({
   Name = "Satellite OMM Data (CubeSat)",
   Type = "UrlSynchronization",
   Identifier = "satellite_omm_data_cubesat",
diff --git a/data/assets/scene/solarsystem/planets/earth/satellites/misc/hubble_trail.asset b/data/assets/scene/solarsystem/planets/earth/satellites/misc/hubble_trail.asset
index 881f564cd7..4166915558 100644
--- a/data/assets/scene/solarsystem/planets/earth/satellites/misc/hubble_trail.asset
+++ b/data/assets/scene/solarsystem/planets/earth/satellites/misc/hubble_trail.asset
@@ -2,7 +2,7 @@ local transforms = asset.require("scene/solarsystem/planets/earth/transforms")
 
 
 
-local omm = asset.syncedResource({
+local omm = asset.resource({
   Name = "Satellite OMM Data (Hubble)",
   Type = "UrlSynchronization",
   Identifier = "satellite_omm_data_hst",
diff --git a/data/assets/scene/solarsystem/planets/earth/satellites/misc/iss.asset b/data/assets/scene/solarsystem/planets/earth/satellites/misc/iss.asset
index e113c31ed8..d8a069c31a 100644
--- a/data/assets/scene/solarsystem/planets/earth/satellites/misc/iss.asset
+++ b/data/assets/scene/solarsystem/planets/earth/satellites/misc/iss.asset
@@ -3,14 +3,14 @@ local sun = asset.require("scene/solarsystem/sun/sun")
 
 
 
-local models = asset.syncedResource({
+local models = asset.resource({
   Name = "ISS Models",
   Type = "HttpSynchronization",
   Identifier = "iss_model",
   Version = 3
 })
 
-local omm = asset.syncedResource({
+local omm = asset.resource({
   Name = "Satellite OMM Data (ISS)",
   Type = "UrlSynchronization",
   Identifier = "satellite_omm_data_iss",
diff --git a/data/assets/scene/solarsystem/planets/earth/satellites/misc/military.asset b/data/assets/scene/solarsystem/planets/earth/satellites/misc/military.asset
index 72a6ad19d4..ac741d8d11 100644
--- a/data/assets/scene/solarsystem/planets/earth/satellites/misc/military.asset
+++ b/data/assets/scene/solarsystem/planets/earth/satellites/misc/military.asset
@@ -2,7 +2,7 @@ local transforms = asset.require("scene/solarsystem/planets/earth/transforms")
 
 
 
-local omm = asset.syncedResource({
+local omm = asset.resource({
   Name = "Satellite OMM Data (Military)",
   Type = "UrlSynchronization",
   Identifier = "satellite_omm_data_military",
diff --git a/data/assets/scene/solarsystem/planets/earth/satellites/misc/other.asset b/data/assets/scene/solarsystem/planets/earth/satellites/misc/other.asset
index 4ed0818184..786a10b15f 100644
--- a/data/assets/scene/solarsystem/planets/earth/satellites/misc/other.asset
+++ b/data/assets/scene/solarsystem/planets/earth/satellites/misc/other.asset
@@ -2,7 +2,7 @@ local transforms = asset.require("scene/solarsystem/planets/earth/transforms")
 
 
 
-local omm = asset.syncedResource({
+local omm = asset.resource({
   Name = "Satellite OMM Data (Other)",
   Type = "UrlSynchronization",
   Identifier = "satellite_omm_data_other",
diff --git a/data/assets/scene/solarsystem/planets/earth/satellites/misc/radar.asset b/data/assets/scene/solarsystem/planets/earth/satellites/misc/radar.asset
index 8dc45113ad..83143280f9 100644
--- a/data/assets/scene/solarsystem/planets/earth/satellites/misc/radar.asset
+++ b/data/assets/scene/solarsystem/planets/earth/satellites/misc/radar.asset
@@ -2,7 +2,7 @@ local transforms = asset.require("scene/solarsystem/planets/earth/transforms")
 
 
 
-local omm = asset.syncedResource({
+local omm = asset.resource({
   Name = "Satellite OMM Data (Radar Calibration)",
   Type = "UrlSynchronization",
   Identifier = "satellite_omm_data_radar",
diff --git a/data/assets/scene/solarsystem/planets/earth/satellites/misc/spacestations.asset b/data/assets/scene/solarsystem/planets/earth/satellites/misc/spacestations.asset
index dbc992f377..167d2b2cd9 100644
--- a/data/assets/scene/solarsystem/planets/earth/satellites/misc/spacestations.asset
+++ b/data/assets/scene/solarsystem/planets/earth/satellites/misc/spacestations.asset
@@ -2,7 +2,7 @@ local transforms = asset.require("scene/solarsystem/planets/earth/transforms")
 
 
 
-local omm = asset.syncedResource({
+local omm = asset.resource({
   Name = "Satellite OMM Data (SpaceStations)",
   Type = "UrlSynchronization",
   Identifier = "satellite_omm_data_stations",
diff --git a/data/assets/scene/solarsystem/planets/earth/satellites/misc/tle-new.asset b/data/assets/scene/solarsystem/planets/earth/satellites/misc/tle-new.asset
index 98b734ffa1..71336d51c1 100644
--- a/data/assets/scene/solarsystem/planets/earth/satellites/misc/tle-new.asset
+++ b/data/assets/scene/solarsystem/planets/earth/satellites/misc/tle-new.asset
@@ -2,7 +2,7 @@ local transforms = asset.require("scene/solarsystem/planets/earth/transforms")
 
 
 
-local omm = asset.syncedResource({
+local omm = asset.resource({
   Name = "Satellite OMM Data (Last 30 Days)",
   Type = "UrlSynchronization",
   Identifier = "satellite_omm_data_tle-new",
diff --git a/data/assets/scene/solarsystem/planets/earth/satellites/navigation/beidou.asset b/data/assets/scene/solarsystem/planets/earth/satellites/navigation/beidou.asset
index a49d2358e7..94429c0294 100644
--- a/data/assets/scene/solarsystem/planets/earth/satellites/navigation/beidou.asset
+++ b/data/assets/scene/solarsystem/planets/earth/satellites/navigation/beidou.asset
@@ -2,7 +2,7 @@ local transforms = asset.require("scene/solarsystem/planets/earth/transforms")
 
 
 
-local omm = asset.syncedResource({
+local omm = asset.resource({
   Name = "Satellite OMM Data (Beidou)",
   Type = "UrlSynchronization",
   Identifier = "satellite_omm_data_beidou",
diff --git a/data/assets/scene/solarsystem/planets/earth/satellites/navigation/galileo.asset b/data/assets/scene/solarsystem/planets/earth/satellites/navigation/galileo.asset
index baecdb65a8..36cc8d0572 100644
--- a/data/assets/scene/solarsystem/planets/earth/satellites/navigation/galileo.asset
+++ b/data/assets/scene/solarsystem/planets/earth/satellites/navigation/galileo.asset
@@ -2,7 +2,7 @@ local transforms = asset.require("scene/solarsystem/planets/earth/transforms")
 
 
 
-local omm = asset.syncedResource({
+local omm = asset.resource({
   Name = "Satellite OMM Data (Galileo)",
   Type = "UrlSynchronization",
   Identifier = "satellite_omm_data_galileo",
diff --git a/data/assets/scene/solarsystem/planets/earth/satellites/navigation/glosnass.asset b/data/assets/scene/solarsystem/planets/earth/satellites/navigation/glosnass.asset
index f086cf4c6b..3e29b0f1c9 100644
--- a/data/assets/scene/solarsystem/planets/earth/satellites/navigation/glosnass.asset
+++ b/data/assets/scene/solarsystem/planets/earth/satellites/navigation/glosnass.asset
@@ -2,7 +2,7 @@ local transforms = asset.require("scene/solarsystem/planets/earth/transforms")
 
 
 
-local omm = asset.syncedResource({
+local omm = asset.resource({
   Name = "Satellite OMM Data (Glosnass)",
   Type = "UrlSynchronization",
   Identifier = "satellite_omm_data_glo-ops",
diff --git a/data/assets/scene/solarsystem/planets/earth/satellites/navigation/gps.asset b/data/assets/scene/solarsystem/planets/earth/satellites/navigation/gps.asset
index 4a605cae9e..0e1cf3c5c5 100644
--- a/data/assets/scene/solarsystem/planets/earth/satellites/navigation/gps.asset
+++ b/data/assets/scene/solarsystem/planets/earth/satellites/navigation/gps.asset
@@ -2,7 +2,7 @@ local transforms = asset.require("scene/solarsystem/planets/earth/transforms")
 
 
 
-local omm = asset.syncedResource({
+local omm = asset.resource({
   Name = "Satellite OMM Data (GPS)",
   Type = "UrlSynchronization",
   Identifier = "satellite_omm_data_gps-ops",
diff --git a/data/assets/scene/solarsystem/planets/earth/satellites/navigation/musson.asset b/data/assets/scene/solarsystem/planets/earth/satellites/navigation/musson.asset
index 5bf78083f5..89df6c73c3 100644
--- a/data/assets/scene/solarsystem/planets/earth/satellites/navigation/musson.asset
+++ b/data/assets/scene/solarsystem/planets/earth/satellites/navigation/musson.asset
@@ -2,7 +2,7 @@ local transforms = asset.require("scene/solarsystem/planets/earth/transforms")
 
 
 
-local omm = asset.syncedResource({
+local omm = asset.resource({
   Name = "Satellite OMM Data (Russian LEO Navigation)",
   Type = "UrlSynchronization",
   Identifier = "satellite_omm_data_musson",
diff --git a/data/assets/scene/solarsystem/planets/earth/satellites/navigation/nnss.asset b/data/assets/scene/solarsystem/planets/earth/satellites/navigation/nnss.asset
index a6755ef248..a478d319c9 100644
--- a/data/assets/scene/solarsystem/planets/earth/satellites/navigation/nnss.asset
+++ b/data/assets/scene/solarsystem/planets/earth/satellites/navigation/nnss.asset
@@ -2,7 +2,7 @@ local transforms = asset.require("scene/solarsystem/planets/earth/transforms")
 
 
 
-local omm = asset.syncedResource({
+local omm = asset.resource({
   Name = "Satellite OMM Data (Navy Navigation Satellite System)",
   Type = "UrlSynchronization",
   Identifier = "satellite_omm_data_nnss",
diff --git a/data/assets/scene/solarsystem/planets/earth/satellites/navigation/sbas.asset b/data/assets/scene/solarsystem/planets/earth/satellites/navigation/sbas.asset
index 9f46740e3b..181722c5c1 100644
--- a/data/assets/scene/solarsystem/planets/earth/satellites/navigation/sbas.asset
+++ b/data/assets/scene/solarsystem/planets/earth/satellites/navigation/sbas.asset
@@ -2,7 +2,7 @@ local transforms = asset.require("scene/solarsystem/planets/earth/transforms")
 
 
 
-local omm = asset.syncedResource({
+local omm = asset.resource({
   Name = "Satellite OMM Data (Satellite Based Augmentation System)",
   Type = "UrlSynchronization",
   Identifier = "satellite_omm_data_sbas",
diff --git a/data/assets/scene/solarsystem/planets/earth/satellites/science/education.asset b/data/assets/scene/solarsystem/planets/earth/satellites/science/education.asset
index a58e5a28de..84d4d1ad16 100644
--- a/data/assets/scene/solarsystem/planets/earth/satellites/science/education.asset
+++ b/data/assets/scene/solarsystem/planets/earth/satellites/science/education.asset
@@ -2,7 +2,7 @@ local transforms = asset.require("scene/solarsystem/planets/earth/transforms")
 
 
 
-local omm = asset.syncedResource({
+local omm = asset.resource({
   Name = "Satellite OMM Data (Education)",
   Type = "UrlSynchronization",
   Identifier = "satellite_omm_data_education",
diff --git a/data/assets/scene/solarsystem/planets/earth/satellites/science/engineering.asset b/data/assets/scene/solarsystem/planets/earth/satellites/science/engineering.asset
index 332735fc3a..1277fa0e99 100644
--- a/data/assets/scene/solarsystem/planets/earth/satellites/science/engineering.asset
+++ b/data/assets/scene/solarsystem/planets/earth/satellites/science/engineering.asset
@@ -2,7 +2,7 @@ local transforms = asset.require("scene/solarsystem/planets/earth/transforms")
 
 
 
-local omm = asset.syncedResource({
+local omm = asset.resource({
   Name = "Satellite OMM Data (Engineering)",
   Type = "UrlSynchronization",
   Identifier = "satellite_omm_data_engineering",
diff --git a/data/assets/scene/solarsystem/planets/earth/satellites/science/geodetic.asset b/data/assets/scene/solarsystem/planets/earth/satellites/science/geodetic.asset
index 809fe9f451..6b5bc0468b 100644
--- a/data/assets/scene/solarsystem/planets/earth/satellites/science/geodetic.asset
+++ b/data/assets/scene/solarsystem/planets/earth/satellites/science/geodetic.asset
@@ -2,7 +2,7 @@ local transforms = asset.require("scene/solarsystem/planets/earth/transforms")
 
 
 
-local omm = asset.syncedResource({
+local omm = asset.resource({
   Name = "Satellite OMM Data (Geodetic)",
   Type = "UrlSynchronization",
   Identifier = "satellite_omm_data_geodetic",
diff --git a/data/assets/scene/solarsystem/planets/earth/satellites/science/spaceearth.asset b/data/assets/scene/solarsystem/planets/earth/satellites/science/spaceearth.asset
index 2bdda691a2..1f222f6c5a 100644
--- a/data/assets/scene/solarsystem/planets/earth/satellites/science/spaceearth.asset
+++ b/data/assets/scene/solarsystem/planets/earth/satellites/science/spaceearth.asset
@@ -2,7 +2,7 @@ local transforms = asset.require("scene/solarsystem/planets/earth/transforms")
 
 
 
-local omm = asset.syncedResource({
+local omm = asset.resource({
   Name = "Satellite OMM Data (Space & Earth Science)",
   Type = "UrlSynchronization",
   Identifier = "satellite_omm_data_science",
diff --git a/data/assets/scene/solarsystem/planets/earth/satellites/weather/aqua.asset b/data/assets/scene/solarsystem/planets/earth/satellites/weather/aqua.asset
index f82ed45578..abe707e3c8 100644
--- a/data/assets/scene/solarsystem/planets/earth/satellites/weather/aqua.asset
+++ b/data/assets/scene/solarsystem/planets/earth/satellites/weather/aqua.asset
@@ -2,7 +2,7 @@ local transforms = asset.require("scene/solarsystem/planets/earth/transforms")
 
 
 
-local omm = asset.syncedResource({
+local omm = asset.resource({
   Name = "Satellite OMM Data (Aqua)",
   Type = "UrlSynchronization",
   Identifier = "satellite_omm_data_aqua",
diff --git a/data/assets/scene/solarsystem/planets/earth/satellites/weather/argos.asset b/data/assets/scene/solarsystem/planets/earth/satellites/weather/argos.asset
index a6586c21a8..f4632ee3e3 100644
--- a/data/assets/scene/solarsystem/planets/earth/satellites/weather/argos.asset
+++ b/data/assets/scene/solarsystem/planets/earth/satellites/weather/argos.asset
@@ -2,7 +2,7 @@ local transforms = asset.require("scene/solarsystem/planets/earth/transforms")
 
 
 
-local omm = asset.syncedResource({
+local omm = asset.resource({
   Name = "Satellite OMM Data (ARGOS)",
   Type = "UrlSynchronization",
   Identifier = "satellite_omm_data_argos",
diff --git a/data/assets/scene/solarsystem/planets/earth/satellites/weather/dmc.asset b/data/assets/scene/solarsystem/planets/earth/satellites/weather/dmc.asset
index 88a3f46446..7ecdebfb9e 100644
--- a/data/assets/scene/solarsystem/planets/earth/satellites/weather/dmc.asset
+++ b/data/assets/scene/solarsystem/planets/earth/satellites/weather/dmc.asset
@@ -2,7 +2,7 @@ local transforms = asset.require("scene/solarsystem/planets/earth/transforms")
 
 
 
-local omm = asset.syncedResource({
+local omm = asset.resource({
   Name = "Satellite OMM Data (Disaster Monitoring)",
   Type = "UrlSynchronization",
   Identifier = "satellite_omm_data_dmc",
diff --git a/data/assets/scene/solarsystem/planets/earth/satellites/weather/earth_resources.asset b/data/assets/scene/solarsystem/planets/earth/satellites/weather/earth_resources.asset
index ca16489efd..6451aace49 100644
--- a/data/assets/scene/solarsystem/planets/earth/satellites/weather/earth_resources.asset
+++ b/data/assets/scene/solarsystem/planets/earth/satellites/weather/earth_resources.asset
@@ -2,7 +2,7 @@ local transforms = asset.require("scene/solarsystem/planets/earth/transforms")
 
 
 
-local omm = asset.syncedResource({
+local omm = asset.resource({
   Name = "Satellite OMM Data (Earth Resources)",
   Type = "UrlSynchronization",
   Identifier = "satellite_omm_data_resource",
diff --git a/data/assets/scene/solarsystem/planets/earth/satellites/weather/goes.asset b/data/assets/scene/solarsystem/planets/earth/satellites/weather/goes.asset
index 6e1e91de04..fc24bdd839 100644
--- a/data/assets/scene/solarsystem/planets/earth/satellites/weather/goes.asset
+++ b/data/assets/scene/solarsystem/planets/earth/satellites/weather/goes.asset
@@ -2,7 +2,7 @@ local transforms = asset.require("scene/solarsystem/planets/earth/transforms")
 
 
 
-local omm = asset.syncedResource({
+local omm = asset.resource({
   Name = "Satellite OMM Data (GOES)",
   Type = "UrlSynchronization",
   Identifier = "satellite_omm_data_goes",
diff --git a/data/assets/scene/solarsystem/planets/earth/satellites/weather/noaa.asset b/data/assets/scene/solarsystem/planets/earth/satellites/weather/noaa.asset
index 30d7b3b906..65b1a6cf81 100644
--- a/data/assets/scene/solarsystem/planets/earth/satellites/weather/noaa.asset
+++ b/data/assets/scene/solarsystem/planets/earth/satellites/weather/noaa.asset
@@ -2,7 +2,7 @@ local transforms = asset.require("scene/solarsystem/planets/earth/transforms")
 
 
 
-local omm = asset.syncedResource({
+local omm = asset.resource({
   Name = "Satellite OMM Data (NOAA)",
   Type = "UrlSynchronization",
   Identifier = "satellite_omm_data_noaa",
diff --git a/data/assets/scene/solarsystem/planets/earth/satellites/weather/planet.asset b/data/assets/scene/solarsystem/planets/earth/satellites/weather/planet.asset
index 857be0486b..b56b882db8 100644
--- a/data/assets/scene/solarsystem/planets/earth/satellites/weather/planet.asset
+++ b/data/assets/scene/solarsystem/planets/earth/satellites/weather/planet.asset
@@ -2,7 +2,7 @@ local transforms = asset.require("scene/solarsystem/planets/earth/transforms")
 
 
 
-local omm = asset.syncedResource({
+local omm = asset.resource({
   Name = "Satellite OMM Data (Planet)",
   Type = "UrlSynchronization",
   Identifier = "satellite_omm_data_planet",
diff --git a/data/assets/scene/solarsystem/planets/earth/satellites/weather/sarsat.asset b/data/assets/scene/solarsystem/planets/earth/satellites/weather/sarsat.asset
index 5f2eab355a..4b3b9dc29e 100644
--- a/data/assets/scene/solarsystem/planets/earth/satellites/weather/sarsat.asset
+++ b/data/assets/scene/solarsystem/planets/earth/satellites/weather/sarsat.asset
@@ -2,7 +2,7 @@ local transforms = asset.require("scene/solarsystem/planets/earth/transforms")
 
 
 
-local omm = asset.syncedResource({
+local omm = asset.resource({
   Name = "Satellite OMM Data (Search & Rescue (SARSAT))",
   Type = "UrlSynchronization",
   Identifier = "satellite_omm_data_sarsat",
diff --git a/data/assets/scene/solarsystem/planets/earth/satellites/weather/snpp.asset b/data/assets/scene/solarsystem/planets/earth/satellites/weather/snpp.asset
index 8bcb7aa50c..b1a4f7cd7b 100644
--- a/data/assets/scene/solarsystem/planets/earth/satellites/weather/snpp.asset
+++ b/data/assets/scene/solarsystem/planets/earth/satellites/weather/snpp.asset
@@ -2,7 +2,7 @@ local transforms = asset.require("scene/solarsystem/planets/earth/transforms")
 
 
 
-local omm = asset.syncedResource({
+local omm = asset.resource({
   Name = "Satellite OMM Data (SNPP)",
   Type = "UrlSynchronization",
   Identifier = "satellite_omm_data_snpp",
diff --git a/data/assets/scene/solarsystem/planets/earth/satellites/weather/spire.asset b/data/assets/scene/solarsystem/planets/earth/satellites/weather/spire.asset
index 56e8f279e5..ee3267a8e1 100644
--- a/data/assets/scene/solarsystem/planets/earth/satellites/weather/spire.asset
+++ b/data/assets/scene/solarsystem/planets/earth/satellites/weather/spire.asset
@@ -2,7 +2,7 @@ local transforms = asset.require("scene/solarsystem/planets/earth/transforms")
 
 
 
-local omm = asset.syncedResource({
+local omm = asset.resource({
   Name = "Satellite OMM Data (Spire)",
   Type = "UrlSynchronization",
   Identifier = "satellite_omm_data_spire",
diff --git a/data/assets/scene/solarsystem/planets/earth/satellites/weather/tdrss.asset b/data/assets/scene/solarsystem/planets/earth/satellites/weather/tdrss.asset
index b77f8f5104..c8cfc79075 100644
--- a/data/assets/scene/solarsystem/planets/earth/satellites/weather/tdrss.asset
+++ b/data/assets/scene/solarsystem/planets/earth/satellites/weather/tdrss.asset
@@ -2,7 +2,7 @@ local transforms = asset.require("scene/solarsystem/planets/earth/transforms")
 
 
 
-local omm = asset.syncedResource({
+local omm = asset.resource({
   Name = "Satellite OMM Data (Tracking and Data Relay Satellite System (TDRSS))",
   Type = "UrlSynchronization",
   Identifier = "satellite_omm_data_tdrss",
diff --git a/data/assets/scene/solarsystem/planets/earth/satellites/weather/terra.asset b/data/assets/scene/solarsystem/planets/earth/satellites/weather/terra.asset
index aefe0d0ae2..b4d4791ab1 100644
--- a/data/assets/scene/solarsystem/planets/earth/satellites/weather/terra.asset
+++ b/data/assets/scene/solarsystem/planets/earth/satellites/weather/terra.asset
@@ -2,7 +2,7 @@ local transforms = asset.require("scene/solarsystem/planets/earth/transforms")
 
 
 
-local omm = asset.syncedResource({
+local omm = asset.resource({
   Name = "Satellite OMM Data (Terra)",
   Type = "UrlSynchronization",
   Identifier = "satellite_omm_data_terra",
diff --git a/data/assets/scene/solarsystem/planets/earth/satellites/weather/weather.asset b/data/assets/scene/solarsystem/planets/earth/satellites/weather/weather.asset
index b9e48e5cc9..3993910bfa 100644
--- a/data/assets/scene/solarsystem/planets/earth/satellites/weather/weather.asset
+++ b/data/assets/scene/solarsystem/planets/earth/satellites/weather/weather.asset
@@ -2,7 +2,7 @@ local transforms = asset.require("scene/solarsystem/planets/earth/transforms")
 
 
 
-local omm = asset.syncedResource({
+local omm = asset.resource({
   Name = "Satellite OMM Data (Weather)",
   Type = "UrlSynchronization",
   Identifier = "satellite_omm_data_weather",
diff --git a/data/assets/scene/solarsystem/planets/jupiter/callisto/callisto.asset b/data/assets/scene/solarsystem/planets/jupiter/callisto/callisto.asset
index 9c3860b697..162d176067 100644
--- a/data/assets/scene/solarsystem/planets/jupiter/callisto/callisto.asset
+++ b/data/assets/scene/solarsystem/planets/jupiter/callisto/callisto.asset
@@ -5,7 +5,7 @@ local kernel = asset.require("../kernels")
 
 
 
-local labelsPath = asset.syncedResource({
+local labelsPath = asset.resource({
   Name = "Jupiter Labels",
   Type = "HttpSynchronization",
   Identifier = "jupiter_labels",
diff --git a/data/assets/scene/solarsystem/planets/jupiter/callisto/layers/colorlayers/callisto_texture.asset b/data/assets/scene/solarsystem/planets/jupiter/callisto/layers/colorlayers/callisto_texture.asset
index e3997574c9..804a5838d9 100644
--- a/data/assets/scene/solarsystem/planets/jupiter/callisto/layers/colorlayers/callisto_texture.asset
+++ b/data/assets/scene/solarsystem/planets/jupiter/callisto/layers/colorlayers/callisto_texture.asset
@@ -2,7 +2,7 @@ local globe = asset.require("../../callisto")
 
 
 
-local texturesPath = asset.syncedResource({
+local texturesPath = asset.resource({
   Name = "Callisto Textures",
   Type = "HttpSynchronization",
   Identifier = "callisto_textures",
diff --git a/data/assets/scene/solarsystem/planets/jupiter/europa/europa.asset b/data/assets/scene/solarsystem/planets/jupiter/europa/europa.asset
index ca760934d4..524ada7573 100644
--- a/data/assets/scene/solarsystem/planets/jupiter/europa/europa.asset
+++ b/data/assets/scene/solarsystem/planets/jupiter/europa/europa.asset
@@ -5,7 +5,7 @@ local kernel = asset.require("../kernels")
 
 
 
-local labelsPath = asset.syncedResource({
+local labelsPath = asset.resource({
   Name = "Jupiter Labels",
   Type = "HttpSynchronization",
   Identifier = "jupiter_labels",
diff --git a/data/assets/scene/solarsystem/planets/jupiter/europa/layers/colorlayers/europa_texture.asset b/data/assets/scene/solarsystem/planets/jupiter/europa/layers/colorlayers/europa_texture.asset
index ab3034ed9b..e0f15f1f0b 100644
--- a/data/assets/scene/solarsystem/planets/jupiter/europa/layers/colorlayers/europa_texture.asset
+++ b/data/assets/scene/solarsystem/planets/jupiter/europa/layers/colorlayers/europa_texture.asset
@@ -2,7 +2,7 @@ local globe = asset.require("../../europa")
 
 
 
-local texturesPath = asset.syncedResource({
+local texturesPath = asset.resource({
   Name = "Europa Textures",
   Type = "HttpSynchronization",
   Identifier = "europa_textures",
diff --git a/data/assets/scene/solarsystem/planets/jupiter/europa/layers/colorlayers/voyager_global_mosaic_local.asset b/data/assets/scene/solarsystem/planets/jupiter/europa/layers/colorlayers/voyager_global_mosaic_local.asset
index 0fba860a00..5ceec9e9b1 100644
--- a/data/assets/scene/solarsystem/planets/jupiter/europa/layers/colorlayers/voyager_global_mosaic_local.asset
+++ b/data/assets/scene/solarsystem/planets/jupiter/europa/layers/colorlayers/voyager_global_mosaic_local.asset
@@ -2,7 +2,7 @@ local globe = asset.require("../../europa")
 
 
 
-local texturesPath = asset.syncedResource({
+local texturesPath = asset.resource({
   Name = "Europa Textures",
   Type = "HttpSynchronization",
   Identifier = "europa_textures",
diff --git a/data/assets/scene/solarsystem/planets/jupiter/europa/layers/colorlayers/voyager_global_mosaic_newyork.asset b/data/assets/scene/solarsystem/planets/jupiter/europa/layers/colorlayers/voyager_global_mosaic_newyork.asset
index fea34cd307..9bdc27c2b4 100644
--- a/data/assets/scene/solarsystem/planets/jupiter/europa/layers/colorlayers/voyager_global_mosaic_newyork.asset
+++ b/data/assets/scene/solarsystem/planets/jupiter/europa/layers/colorlayers/voyager_global_mosaic_newyork.asset
@@ -6,7 +6,7 @@ local Layer = {
   Identifier = "Voyager_Global_Mosaic_NewYork",
   Name = "Voyager Global Mosaic [New York]",
   Enabled = asset.enabled,
-  FilePath = asset.localResource("voyager_global_mosaic_newyork.wms"),
+  FilePath = asset.resource("voyager_global_mosaic_newyork.wms"),
   BlendMode = "Color"
 }
 
diff --git a/data/assets/scene/solarsystem/planets/jupiter/europa/layers/colorlayers/voyager_global_mosaic_sweden.asset b/data/assets/scene/solarsystem/planets/jupiter/europa/layers/colorlayers/voyager_global_mosaic_sweden.asset
index bc210bef54..3687982f7d 100644
--- a/data/assets/scene/solarsystem/planets/jupiter/europa/layers/colorlayers/voyager_global_mosaic_sweden.asset
+++ b/data/assets/scene/solarsystem/planets/jupiter/europa/layers/colorlayers/voyager_global_mosaic_sweden.asset
@@ -6,7 +6,7 @@ local Layer = {
   Identifier = "Voyager_Global_Mosaic_sweden",
   Name = "Voyager Global Mosaic [Sweden]",
   Enabled = asset.enabled,
-  FilePath = asset.localResource("voyager_global_mosaic_sweden.wms"),
+  FilePath = asset.resource("voyager_global_mosaic_sweden.wms"),
   BlendMode = "Color"
 }
 
diff --git a/data/assets/scene/solarsystem/planets/jupiter/ganymede/ganymede.asset b/data/assets/scene/solarsystem/planets/jupiter/ganymede/ganymede.asset
index 5a0340b7e8..84b03b030a 100644
--- a/data/assets/scene/solarsystem/planets/jupiter/ganymede/ganymede.asset
+++ b/data/assets/scene/solarsystem/planets/jupiter/ganymede/ganymede.asset
@@ -5,7 +5,7 @@ local kernel = asset.require("../kernels")
 
 
 
-local labelsPath = asset.syncedResource({
+local labelsPath = asset.resource({
   Name = "Jupiter Labels",
   Type = "HttpSynchronization",
   Identifier = "jupiter_labels",
diff --git a/data/assets/scene/solarsystem/planets/jupiter/ganymede/layers/colorlayers/ganymede_texture.asset b/data/assets/scene/solarsystem/planets/jupiter/ganymede/layers/colorlayers/ganymede_texture.asset
index c13cba2e90..ab2bebba5e 100644
--- a/data/assets/scene/solarsystem/planets/jupiter/ganymede/layers/colorlayers/ganymede_texture.asset
+++ b/data/assets/scene/solarsystem/planets/jupiter/ganymede/layers/colorlayers/ganymede_texture.asset
@@ -2,7 +2,7 @@ local globe = asset.require("../../ganymede")
 
 
 
-local texturesPath = asset.syncedResource({
+local texturesPath = asset.resource({
   Name = "Ganymede Textures",
   Type = "HttpSynchronization",
   Identifier = "ganymede_textures",
diff --git a/data/assets/scene/solarsystem/planets/jupiter/io/io.asset b/data/assets/scene/solarsystem/planets/jupiter/io/io.asset
index b25fe4e33e..c4a7ee85fd 100644
--- a/data/assets/scene/solarsystem/planets/jupiter/io/io.asset
+++ b/data/assets/scene/solarsystem/planets/jupiter/io/io.asset
@@ -5,7 +5,7 @@ local kernel = asset.require("../kernels")
 
 
 
-local labelsPath = asset.syncedResource({
+local labelsPath = asset.resource({
   Name = "Jupiter Labels",
   Type = "HttpSynchronization",
   Identifier = "jupiter_labels",
diff --git a/data/assets/scene/solarsystem/planets/jupiter/io/layers/colorlayers/io_texture.asset b/data/assets/scene/solarsystem/planets/jupiter/io/layers/colorlayers/io_texture.asset
index d28283f7f2..406767562b 100644
--- a/data/assets/scene/solarsystem/planets/jupiter/io/layers/colorlayers/io_texture.asset
+++ b/data/assets/scene/solarsystem/planets/jupiter/io/layers/colorlayers/io_texture.asset
@@ -2,7 +2,7 @@ local globe = asset.require("../../io")
 
 
 
-local texturesPath = asset.syncedResource({
+local texturesPath = asset.resource({
   Name = "Io Textures",
   Type = "HttpSynchronization",
   Identifier = "io_textures",
diff --git a/data/assets/scene/solarsystem/planets/jupiter/kernels.asset b/data/assets/scene/solarsystem/planets/jupiter/kernels.asset
index d336e1b908..ac4a956c60 100644
--- a/data/assets/scene/solarsystem/planets/jupiter/kernels.asset
+++ b/data/assets/scene/solarsystem/planets/jupiter/kernels.asset
@@ -1,4 +1,4 @@
-local kernels = asset.syncedResource({
+local kernels = asset.resource({
   Name = "Jupiter Spice Kernels",
   Type = "HttpSynchronization",
   Identifier = "jupiter_kernels",
diff --git a/data/assets/scene/solarsystem/planets/jupiter/layers/colorlayers/jupiter_texture.asset b/data/assets/scene/solarsystem/planets/jupiter/layers/colorlayers/jupiter_texture.asset
index 3b8eaf3ee3..2a88336998 100644
--- a/data/assets/scene/solarsystem/planets/jupiter/layers/colorlayers/jupiter_texture.asset
+++ b/data/assets/scene/solarsystem/planets/jupiter/layers/colorlayers/jupiter_texture.asset
@@ -2,7 +2,7 @@ local globe = asset.require("../../jupiter")
 
 
 
-local texturesPath = asset.syncedResource({
+local texturesPath = asset.resource({
   Name = "Jupiter Textures",
   Type = "HttpSynchronization",
   Identifier = "jupiter_textures",
diff --git a/data/assets/scene/solarsystem/planets/jupiter/layers/colorlayers/jupiter_video.asset b/data/assets/scene/solarsystem/planets/jupiter/layers/colorlayers/jupiter_video.asset
index 2f71fadc12..9d9a0aae62 100644
--- a/data/assets/scene/solarsystem/planets/jupiter/layers/colorlayers/jupiter_video.asset
+++ b/data/assets/scene/solarsystem/planets/jupiter/layers/colorlayers/jupiter_video.asset
@@ -2,7 +2,7 @@ local globe = asset.require("../../jupiter")
 
 
 
-local data = asset.syncedResource({
+local data = asset.resource({
   Name = "Jupiter Video Layer",
   Type = "HttpSynchronization",
   Identifier = "jupiter_videos",
diff --git a/data/assets/scene/solarsystem/planets/mars/layers/colorlayers/ctx_blended.asset b/data/assets/scene/solarsystem/planets/mars/layers/colorlayers/ctx_blended.asset
index 99ae7f2feb..e9dd435845 100644
--- a/data/assets/scene/solarsystem/planets/mars/layers/colorlayers/ctx_blended.asset
+++ b/data/assets/scene/solarsystem/planets/mars/layers/colorlayers/ctx_blended.asset
@@ -6,7 +6,7 @@ local Layer = {
   Identifier = "CTX_blended",
   Name = "CTX Blended",
   Enabled = asset.enabled,
-  FilePath = asset.localResource("ctx_blended.vrt"),
+  FilePath = asset.resource("ctx_blended.vrt"),
   BlendMode = "Color",
   Description = [[The Bruce Murray Laboratory for Planetary Visualization has completed a
     5.7 terapixel mosaic of the surface of Mars rendered at 5.0 m/px. Each pixel in the
diff --git a/data/assets/scene/solarsystem/planets/mars/layers/colorlayers/ctx_blended_beta01.asset b/data/assets/scene/solarsystem/planets/mars/layers/colorlayers/ctx_blended_beta01.asset
index 5f0cd47132..9a71f5cd2e 100644
--- a/data/assets/scene/solarsystem/planets/mars/layers/colorlayers/ctx_blended_beta01.asset
+++ b/data/assets/scene/solarsystem/planets/mars/layers/colorlayers/ctx_blended_beta01.asset
@@ -6,7 +6,7 @@ local Layer = {
   Identifier = "CTX_blended_01",
   Name = "CTX Blended beta01",
   Enabled = asset.enabled,
-  FilePath = asset.localResource("ctx_blended_beta01.vrt"),
+  FilePath = asset.resource("ctx_blended_beta01.vrt"),
   BlendMode = "Color",
   Settings = {
     Gamma = 2.14,
diff --git a/data/assets/scene/solarsystem/planets/mars/layers/colorlayers/ctx_mosaic_newyork.asset b/data/assets/scene/solarsystem/planets/mars/layers/colorlayers/ctx_mosaic_newyork.asset
index 554bd605fa..cd89d5bc20 100644
--- a/data/assets/scene/solarsystem/planets/mars/layers/colorlayers/ctx_mosaic_newyork.asset
+++ b/data/assets/scene/solarsystem/planets/mars/layers/colorlayers/ctx_mosaic_newyork.asset
@@ -6,7 +6,7 @@ local Layer = {
   Identifier = "CTX_Mosaic_NewYork",
   Name = "CTX Mosaic [New York]",
   Enabled = asset.enabled,
-  FilePath = asset.localResource("ctx_mosaic_newyork.wms"),
+  FilePath = asset.resource("ctx_mosaic_newyork.wms"),
   BlendMode = "Color"
 }
 
diff --git a/data/assets/scene/solarsystem/planets/mars/layers/colorlayers/ctx_mosaic_sweden.asset b/data/assets/scene/solarsystem/planets/mars/layers/colorlayers/ctx_mosaic_sweden.asset
index b4a64f4359..20e912abf4 100644
--- a/data/assets/scene/solarsystem/planets/mars/layers/colorlayers/ctx_mosaic_sweden.asset
+++ b/data/assets/scene/solarsystem/planets/mars/layers/colorlayers/ctx_mosaic_sweden.asset
@@ -6,7 +6,7 @@ local Layer = {
   Identifier = "CTX_Mosaic_Sweden",
   Name = "CTX Mosaic [Sweden]",
   Enabled = asset.enabled,
-  FilePath = asset.localResource("ctx_mosaic_sweden.wms"),
+  FilePath = asset.resource("ctx_mosaic_sweden.wms"),
   BlendMode = "Color"
 }
 
diff --git a/data/assets/scene/solarsystem/planets/mars/layers/colorlayers/ctx_mosaic_utah.asset b/data/assets/scene/solarsystem/planets/mars/layers/colorlayers/ctx_mosaic_utah.asset
index 9369fc1225..70820e690f 100644
--- a/data/assets/scene/solarsystem/planets/mars/layers/colorlayers/ctx_mosaic_utah.asset
+++ b/data/assets/scene/solarsystem/planets/mars/layers/colorlayers/ctx_mosaic_utah.asset
@@ -6,7 +6,7 @@ local Layer = {
   Identifier = "CTX_Mosaic_Utah",
   Name = "CTX Mosaic [Utah]",
   Enabled = asset.enabled,
-  FilePath = asset.localResource("ctx_mosaic_utah.wms"),
+  FilePath = asset.resource("ctx_mosaic_utah.wms"),
   BlendMode = "Color"
 }
 
diff --git a/data/assets/scene/solarsystem/planets/mars/layers/colorlayers/hirise.asset b/data/assets/scene/solarsystem/planets/mars/layers/colorlayers/hirise.asset
index 84a3635ec0..05660ad98e 100644
--- a/data/assets/scene/solarsystem/planets/mars/layers/colorlayers/hirise.asset
+++ b/data/assets/scene/solarsystem/planets/mars/layers/colorlayers/hirise.asset
@@ -6,7 +6,7 @@ local Layer = {
   Identifier = "HiRISE-PSP",
   Name = "HiRISE",
   Enabled = asset.enabled,
-  FilePath = asset.localResource("hirise.vrt"),
+  FilePath = asset.resource("hirise.vrt"),
   BlendMode = "Color",
   Settings = {
     Gamma = 1.0,
diff --git a/data/assets/scene/solarsystem/planets/mars/layers/colorlayers/hirisels.asset b/data/assets/scene/solarsystem/planets/mars/layers/colorlayers/hirisels.asset
index ce3ba7880e..37b7be2a60 100644
--- a/data/assets/scene/solarsystem/planets/mars/layers/colorlayers/hirisels.asset
+++ b/data/assets/scene/solarsystem/planets/mars/layers/colorlayers/hirisels.asset
@@ -6,7 +6,7 @@ local Layer = {
   Identifier = "HiRISE-LS",
   Name = "HiRISE Local Set",
   Enabled = asset.enabled,
-  FilePath = asset.localResource("hirisels.vrt"),
+  FilePath = asset.resource("hirisels.vrt"),
   BlendMode = "Color",
   Description = [[HiRISE (High Resolution Imaging Science Experiment) is the most
     powerful camera ever sent to another planet, one of six instruments onboard the
diff --git a/data/assets/scene/solarsystem/planets/mars/layers/colorlayers/mars_texture.asset b/data/assets/scene/solarsystem/planets/mars/layers/colorlayers/mars_texture.asset
index 090565e026..00cf598ee1 100644
--- a/data/assets/scene/solarsystem/planets/mars/layers/colorlayers/mars_texture.asset
+++ b/data/assets/scene/solarsystem/planets/mars/layers/colorlayers/mars_texture.asset
@@ -2,7 +2,7 @@ local globe = asset.require("../../mars")
 
 
 
-local texturesPath = asset.syncedResource({
+local texturesPath = asset.resource({
   Name = "Mars Textures",
   Type = "HttpSynchronization",
   Identifier = "mars_textures",
diff --git a/data/assets/scene/solarsystem/planets/mars/layers/colorlayers/moc_wa_color_newyork.asset b/data/assets/scene/solarsystem/planets/mars/layers/colorlayers/moc_wa_color_newyork.asset
index e482dfd72f..9e38603835 100644
--- a/data/assets/scene/solarsystem/planets/mars/layers/colorlayers/moc_wa_color_newyork.asset
+++ b/data/assets/scene/solarsystem/planets/mars/layers/colorlayers/moc_wa_color_newyork.asset
@@ -6,7 +6,7 @@ local Layer = {
   Identifier = "MOC_WA_Color_NewYork",
   Name = "MOC WA Color [New York]",
   Enabled = asset.enabled,
-  FilePath = asset.localResource("moc_wa_color_newyork.wms"),
+  FilePath = asset.resource("moc_wa_color_newyork.wms"),
   Settings = {
     Gamma = 1.6,
     Multiplier = 1.07
diff --git a/data/assets/scene/solarsystem/planets/mars/layers/colorlayers/moc_wa_color_sweden.asset b/data/assets/scene/solarsystem/planets/mars/layers/colorlayers/moc_wa_color_sweden.asset
index 9cf95b8188..0256b37974 100644
--- a/data/assets/scene/solarsystem/planets/mars/layers/colorlayers/moc_wa_color_sweden.asset
+++ b/data/assets/scene/solarsystem/planets/mars/layers/colorlayers/moc_wa_color_sweden.asset
@@ -6,7 +6,7 @@ local Layer = {
   Identifier = "MOC_WA_Color_LiU",
   Name = "MOC WA Color [Sweden]",
   Enabled = asset.enabled,
-  FilePath = asset.localResource("moc_wa_color_sweden.wms"),
+  FilePath = asset.resource("moc_wa_color_sweden.wms"),
   Settings = {
     Gamma = 1.6,
     Multiplier = 1.07
diff --git a/data/assets/scene/solarsystem/planets/mars/layers/colorlayers/moc_wa_color_utah.asset b/data/assets/scene/solarsystem/planets/mars/layers/colorlayers/moc_wa_color_utah.asset
index dbb028af29..b84870c532 100644
--- a/data/assets/scene/solarsystem/planets/mars/layers/colorlayers/moc_wa_color_utah.asset
+++ b/data/assets/scene/solarsystem/planets/mars/layers/colorlayers/moc_wa_color_utah.asset
@@ -6,7 +6,7 @@ local Layer = {
   Identifier = "MOC_WA_Color_Utah",
   Name = "MOC WA Color [Utah]",
   Enabled = asset.enabled,
-  FilePath = asset.localResource("moc_wa_color_utah.wms"),
+  FilePath = asset.resource("moc_wa_color_utah.wms"),
   Settings = {
     Gamma = 1.6,
     Multiplier = 1.07
diff --git a/data/assets/scene/solarsystem/planets/mars/layers/colorlayers/mola_hrsc_newyork.asset b/data/assets/scene/solarsystem/planets/mars/layers/colorlayers/mola_hrsc_newyork.asset
index 6cb33b8698..96d96527c3 100644
--- a/data/assets/scene/solarsystem/planets/mars/layers/colorlayers/mola_hrsc_newyork.asset
+++ b/data/assets/scene/solarsystem/planets/mars/layers/colorlayers/mola_hrsc_newyork.asset
@@ -6,7 +6,7 @@ local Layer = {
   Identifier = "MOLA_HRSC_NewYork",
   Name = "MOLA HRSC [New York]",
   Enabled = asset.enabled,
-  FilePath = asset.localResource("mola_hrsc_newyork.wms"),
+  FilePath = asset.resource("mola_hrsc_newyork.wms"),
   Description = [[This map layer is colorzied based elevation data from MOLA and HRSC.
     Compared to MOLA Psuedo Color, this layer has no terrain shading, which is
     suitable for use when combing with other layers. Data Reference:
diff --git a/data/assets/scene/solarsystem/planets/mars/layers/colorlayers/mola_hrsc_sweden.asset b/data/assets/scene/solarsystem/planets/mars/layers/colorlayers/mola_hrsc_sweden.asset
index 222504b621..5360c598f5 100644
--- a/data/assets/scene/solarsystem/planets/mars/layers/colorlayers/mola_hrsc_sweden.asset
+++ b/data/assets/scene/solarsystem/planets/mars/layers/colorlayers/mola_hrsc_sweden.asset
@@ -6,7 +6,7 @@ local Layer = {
   Identifier = "MOLA_HRSC_Sweden",
   Name = "MOLA HRSC [Sweden]",
   Enabled = asset.enabled,
-  FilePath = asset.localResource("mola_hrsc_sweden.wms"),
+  FilePath = asset.resource("mola_hrsc_sweden.wms"),
   Description = [[This map layer is colorzied based elevation data from MOLA and HRSC.
     Compared to MOLA Psuedo Color, this layer has no terrain shading, which is
     suitable for use when combing with other layers. Data Reference:
diff --git a/data/assets/scene/solarsystem/planets/mars/layers/colorlayers/mola_hrsc_utah.asset b/data/assets/scene/solarsystem/planets/mars/layers/colorlayers/mola_hrsc_utah.asset
index e4f719418b..b1286cdd5b 100644
--- a/data/assets/scene/solarsystem/planets/mars/layers/colorlayers/mola_hrsc_utah.asset
+++ b/data/assets/scene/solarsystem/planets/mars/layers/colorlayers/mola_hrsc_utah.asset
@@ -6,7 +6,7 @@ local Layer = {
   Identifier = "MOLA_HRSC_Utah",
   Name = "MOLA HRSC [Utah]",
   Enabled = asset.enabled,
-  FilePath = asset.localResource("mola_hrsc_utah.wms"),
+  FilePath = asset.resource("mola_hrsc_utah.wms"),
   Description = [[This map layer is colorzied based elevation data from MOLA and HRSC.
     Compared to MOLA Psuedo Color, this layer has no terrain shading, which is
     suitable for use when combing with other layers. Data Reference:
diff --git a/data/assets/scene/solarsystem/planets/mars/layers/colorlayers/mola_pseudo_color_newyork.asset b/data/assets/scene/solarsystem/planets/mars/layers/colorlayers/mola_pseudo_color_newyork.asset
index ec584d0ea4..1af1376a92 100644
--- a/data/assets/scene/solarsystem/planets/mars/layers/colorlayers/mola_pseudo_color_newyork.asset
+++ b/data/assets/scene/solarsystem/planets/mars/layers/colorlayers/mola_pseudo_color_newyork.asset
@@ -6,7 +6,7 @@ local Layer = {
   Identifier = "MOLA_Pseudo_Color_NewYork",
   Name = "MOLA Pseudo Color [New York]",
   Enabled = asset.enabled,
-  FilePath = asset.localResource("mola_pseudo_color_newyork.wms"),
+  FilePath = asset.resource("mola_pseudo_color_newyork.wms"),
   Description = [[This map is based on data from the Mars Orbiter Laser Altimeter (MOLA)
     (Smith, et al., 2001), an instrument on NASA's Mars Global Surveyor (MGS)
     spacecraft (Albee, et al., 2001). The image used for the base of this map
diff --git a/data/assets/scene/solarsystem/planets/mars/layers/colorlayers/mola_pseudo_color_sweden.asset b/data/assets/scene/solarsystem/planets/mars/layers/colorlayers/mola_pseudo_color_sweden.asset
index ddfcb02653..df09e62929 100644
--- a/data/assets/scene/solarsystem/planets/mars/layers/colorlayers/mola_pseudo_color_sweden.asset
+++ b/data/assets/scene/solarsystem/planets/mars/layers/colorlayers/mola_pseudo_color_sweden.asset
@@ -6,7 +6,7 @@ local Layer = {
   Identifier = "MOLA_Pseudo_Color_Sweden",
   Name = "MOLA Pseudo Color [Sweden]",
   Enabled = asset.enabled,
-  FilePath = asset.localResource("mola_pseudo_color_sweden.wms"),
+  FilePath = asset.resource("mola_pseudo_color_sweden.wms"),
   Description = [[This map is based on data from the Mars Orbiter Laser Altimeter (MOLA)
     (Smith, et al., 2001), an instrument on NASA's Mars Global Surveyor (MGS)
     spacecraft (Albee, et al., 2001). The image used for the base of this map
diff --git a/data/assets/scene/solarsystem/planets/mars/layers/colorlayers/mola_pseudo_color_utah.asset b/data/assets/scene/solarsystem/planets/mars/layers/colorlayers/mola_pseudo_color_utah.asset
index e67262bd3a..b7e21a1bc6 100644
--- a/data/assets/scene/solarsystem/planets/mars/layers/colorlayers/mola_pseudo_color_utah.asset
+++ b/data/assets/scene/solarsystem/planets/mars/layers/colorlayers/mola_pseudo_color_utah.asset
@@ -6,7 +6,7 @@ local Layer = {
   Identifier = "MOLA_Pseudo_Color_Utah",
   Name = "MOLA Pseudo Color [Utah]",
   Enabled = asset.enabled,
-  FilePath = asset.localResource("mola_pseudo_color_utah.wms"),
+  FilePath = asset.resource("mola_pseudo_color_utah.wms"),
   Description = [[This map is based on data from the Mars Orbiter Laser Altimeter (MOLA)
     (Smith, et al., 2001), an instrument on NASA's Mars Global Surveyor (MGS)
     spacecraft (Albee, et al., 2001). The image used for the base of this map
diff --git a/data/assets/scene/solarsystem/planets/mars/layers/colorlayers/themis_ir_day_newyork.asset b/data/assets/scene/solarsystem/planets/mars/layers/colorlayers/themis_ir_day_newyork.asset
index a5dc285c20..e2b0de6b2c 100644
--- a/data/assets/scene/solarsystem/planets/mars/layers/colorlayers/themis_ir_day_newyork.asset
+++ b/data/assets/scene/solarsystem/planets/mars/layers/colorlayers/themis_ir_day_newyork.asset
@@ -6,7 +6,7 @@ local Layer = {
   Identifier = "Themis_IR_Day_NewYork",
   Name = "Themis IR Day [New York]",
   Enabled = asset.enabled,
-  FilePath = asset.localResource("themis_ir_day_newyork.wms"),
+  FilePath = asset.resource("themis_ir_day_newyork.wms"),
   BlendMode = "Color",
   Description = [[This mosaic represents the Thermal Emission Imaging System (THEMIS)
     -daytime infrared (IR) 100 meter/pixel mosaic (version 12) released in the summer
diff --git a/data/assets/scene/solarsystem/planets/mars/layers/colorlayers/themis_ir_day_sweden.asset b/data/assets/scene/solarsystem/planets/mars/layers/colorlayers/themis_ir_day_sweden.asset
index 24886ae828..efbc859e78 100644
--- a/data/assets/scene/solarsystem/planets/mars/layers/colorlayers/themis_ir_day_sweden.asset
+++ b/data/assets/scene/solarsystem/planets/mars/layers/colorlayers/themis_ir_day_sweden.asset
@@ -6,7 +6,7 @@ local Layer = {
   Identifier = "Themis_IR_Day_Sweden",
   Name = "Themis IR Day [Sweden]",
   Enabled = asset.enabled,
-  FilePath = asset.localResource("themis_ir_day_sweden.wms"),
+  FilePath = asset.resource("themis_ir_day_sweden.wms"),
   BlendMode = "Color",
   Description = [[This mosaic represents the Thermal Emission Imaging System (THEMIS)
     -daytime infrared (IR) 100 meter/pixel mosaic (version 12) released in the summer
diff --git a/data/assets/scene/solarsystem/planets/mars/layers/colorlayers/themis_ir_day_utah.asset b/data/assets/scene/solarsystem/planets/mars/layers/colorlayers/themis_ir_day_utah.asset
index dad2f6d283..a1ff8ac6a1 100644
--- a/data/assets/scene/solarsystem/planets/mars/layers/colorlayers/themis_ir_day_utah.asset
+++ b/data/assets/scene/solarsystem/planets/mars/layers/colorlayers/themis_ir_day_utah.asset
@@ -6,7 +6,7 @@ local Layer = {
   Identifier = "Themis_IR_Day_Utah",
   Name = "Themis IR Day [Utah]",
   Enabled = asset.enabled,
-  FilePath = asset.localResource("themis_ir_day_utah.wms"),
+  FilePath = asset.resource("themis_ir_day_utah.wms"),
   BlendMode = "Color",
   Description = [[This mosaic represents the Thermal Emission Imaging System (THEMIS)
     -daytime infrared (IR) 100 meter/pixel mosaic (version 12) released in the summer
diff --git a/data/assets/scene/solarsystem/planets/mars/layers/colorlayers/themis_ir_night_newyork.asset b/data/assets/scene/solarsystem/planets/mars/layers/colorlayers/themis_ir_night_newyork.asset
index 4a650074f1..1c6c2f6ae1 100644
--- a/data/assets/scene/solarsystem/planets/mars/layers/colorlayers/themis_ir_night_newyork.asset
+++ b/data/assets/scene/solarsystem/planets/mars/layers/colorlayers/themis_ir_night_newyork.asset
@@ -6,7 +6,7 @@ local Layer = {
   Identifier = "Themis_IR_Night_NewYork",
   Name = "Themis IR Night [New York]",
   Enabled = asset.enabled,
-  FilePath = asset.localResource("themis_ir_night_newyork.vrt"),
+  FilePath = asset.resource("themis_ir_night_newyork.vrt"),
   BlendMode = "Color",
   Description = [[This mosaic represents the Thermal Emission Imaging System (THEMIS)
     -nighttime infrared (IR) 100 meter/pixel mosaic (version 12) released in the
diff --git a/data/assets/scene/solarsystem/planets/mars/layers/colorlayers/themis_ir_night_sweden.asset b/data/assets/scene/solarsystem/planets/mars/layers/colorlayers/themis_ir_night_sweden.asset
index aa288c5ffe..13f20e95c9 100644
--- a/data/assets/scene/solarsystem/planets/mars/layers/colorlayers/themis_ir_night_sweden.asset
+++ b/data/assets/scene/solarsystem/planets/mars/layers/colorlayers/themis_ir_night_sweden.asset
@@ -6,7 +6,7 @@ local Layer = {
   Identifier = "Themis_IR_Night_Sweden",
   Name = "Themis IR Night [Sweden]",
   Enabled = asset.enabled,
-  FilePath = asset.localResource("themis_ir_night_sweden.vrt"),
+  FilePath = asset.resource("themis_ir_night_sweden.vrt"),
   BlendMode = "Color",
   Description = [[This mosaic represents the Thermal Emission Imaging System (THEMIS)
     -nighttime infrared (IR) 100 meter/pixel mosaic (version 12) released in the
diff --git a/data/assets/scene/solarsystem/planets/mars/layers/colorlayers/themis_ir_night_utah.asset b/data/assets/scene/solarsystem/planets/mars/layers/colorlayers/themis_ir_night_utah.asset
index 441ce32631..7b9e3004c9 100644
--- a/data/assets/scene/solarsystem/planets/mars/layers/colorlayers/themis_ir_night_utah.asset
+++ b/data/assets/scene/solarsystem/planets/mars/layers/colorlayers/themis_ir_night_utah.asset
@@ -6,7 +6,7 @@ local Layer = {
   Identifier = "Themis_IR_Night_Utah",
   Name = "Themis IR Night [Utah]",
   Enabled = asset.enabled,
-  FilePath = asset.localResource("themis_ir_night_utah.vrt"),
+  FilePath = asset.resource("themis_ir_night_utah.vrt"),
   BlendMode = "Color",
   Description = [[This mosaic represents the Thermal Emission Imaging System (THEMIS)
     -nighttime infrared (IR) 100 meter/pixel mosaic (version 12) released in the
diff --git a/data/assets/scene/solarsystem/planets/mars/layers/colorlayers/viking_mdim_newyork.asset b/data/assets/scene/solarsystem/planets/mars/layers/colorlayers/viking_mdim_newyork.asset
index 85b475603d..b4e0ffb44f 100644
--- a/data/assets/scene/solarsystem/planets/mars/layers/colorlayers/viking_mdim_newyork.asset
+++ b/data/assets/scene/solarsystem/planets/mars/layers/colorlayers/viking_mdim_newyork.asset
@@ -6,7 +6,7 @@ local Layer = {
   Identifier = "Viking_MDIM_NewYork",
   Name = "Viking MDIM [New York]",
   Enabled = asset.enabled,
-  FilePath = asset.localResource("viking_mdim_newyork.wms"),
+  FilePath = asset.resource("viking_mdim_newyork.wms"),
   Description = [[This global image map of Mars has a resolution of 256 pixels/degree
     (scale approximately 232 meters per pixel (m) at the equator). The colorized
     mosaic was completed by NASA AMES which warped the original Viking colorized
diff --git a/data/assets/scene/solarsystem/planets/mars/layers/colorlayers/viking_mdim_sweden.asset b/data/assets/scene/solarsystem/planets/mars/layers/colorlayers/viking_mdim_sweden.asset
index 5c40e44373..d9c2ff518e 100644
--- a/data/assets/scene/solarsystem/planets/mars/layers/colorlayers/viking_mdim_sweden.asset
+++ b/data/assets/scene/solarsystem/planets/mars/layers/colorlayers/viking_mdim_sweden.asset
@@ -6,7 +6,7 @@ local Layer = {
   Identifier = "Viking_MDIM_Sweden",
   Name = "Viking MDIM [Sweden]",
   Enabled = asset.enabled,
-  FilePath = asset.localResource("viking_mdim_sweden.wms"),
+  FilePath = asset.resource("viking_mdim_sweden.wms"),
   Description = [[This global image map of Mars has a resolution of 256 pixels/degree
     (scale approximately 232 meters per pixel (m) at the equator). The colorized
     mosaic was completed by NASA AMES which warped the original Viking colorized
diff --git a/data/assets/scene/solarsystem/planets/mars/layers/colorlayers/viking_mdim_utah.asset b/data/assets/scene/solarsystem/planets/mars/layers/colorlayers/viking_mdim_utah.asset
index 0b795a883c..6d958b52c6 100644
--- a/data/assets/scene/solarsystem/planets/mars/layers/colorlayers/viking_mdim_utah.asset
+++ b/data/assets/scene/solarsystem/planets/mars/layers/colorlayers/viking_mdim_utah.asset
@@ -6,7 +6,7 @@ local Layer = {
   Identifier = "Viking_MDIM_Utah",
   Name = "Viking MDIM [Utah]",
   Enabled = asset.enabled,
-  FilePath = asset.localResource("viking_mdim_utah.wms"),
+  FilePath = asset.resource("viking_mdim_utah.wms"),
   Description = [[This global image map of Mars has a resolution of 256 pixels/degree
     (scale approximately 232 meters per pixel (m) at the equator). The colorized
     mosaic was completed by NASA AMES which warped the original Viking colorized
diff --git a/data/assets/scene/solarsystem/planets/mars/layers/heightlayers/hirisels.asset b/data/assets/scene/solarsystem/planets/mars/layers/heightlayers/hirisels.asset
index af7a51b238..743d1b68f3 100644
--- a/data/assets/scene/solarsystem/planets/mars/layers/heightlayers/hirisels.asset
+++ b/data/assets/scene/solarsystem/planets/mars/layers/heightlayers/hirisels.asset
@@ -6,7 +6,7 @@ local Layer = {
   Identifier = "HiRISE-LS-DEM",
   Name = "HiRISE Local Set DEM",
   Enabled = asset.enabled,
-  FilePath = asset.localResource("hirisels.wms"),
+  FilePath = asset.resource("hirisels.wms"),
   TilePixelSize = 129,
   Description = [[HiRISE (High Resolution Imaging Science Experiment) is the most
     powerful camera ever sent to another planet, one of six instruments onboard the
diff --git a/data/assets/scene/solarsystem/planets/mars/layers/heightlayers/mdem200m.asset b/data/assets/scene/solarsystem/planets/mars/layers/heightlayers/mdem200m.asset
index 8206a3a70c..1868b7f580 100644
--- a/data/assets/scene/solarsystem/planets/mars/layers/heightlayers/mdem200m.asset
+++ b/data/assets/scene/solarsystem/planets/mars/layers/heightlayers/mdem200m.asset
@@ -6,7 +6,7 @@ local Layer = {
   Identifier = "MDEM200M",
   Name = "HRSC MOLA Blended DEM Global 200m v2",
   Enabled = asset.enabled,
-  FilePath = asset.localResource("mdem200m.wms"),
+  FilePath = asset.resource("mdem200m.wms"),
   TilePixelSize = 129,
   Description = [[Blend of data derived from the Mars Orbiter Laser Altimeter
     (MOLA, an instrument aboard NASA's Mars Global Surveyor spacecraft), and data derived
diff --git a/data/assets/scene/solarsystem/planets/mars/layers/heightlayers/mola_amnh.asset b/data/assets/scene/solarsystem/planets/mars/layers/heightlayers/mola_amnh.asset
index 37dc40350d..6c006e38ff 100644
--- a/data/assets/scene/solarsystem/planets/mars/layers/heightlayers/mola_amnh.asset
+++ b/data/assets/scene/solarsystem/planets/mars/layers/heightlayers/mola_amnh.asset
@@ -6,7 +6,7 @@ local Layer = {
   Identifier = "Mola_AMNH",
   Name = "Mola Elevation [New York]",
   Enabled = asset.enabled,
-  FilePath = asset.localResource("mola_amnh.wms"),
+  FilePath = asset.resource("mola_amnh.wms"),
   TilePixelSize = 360,
   Description = [[This digital elevation model (DEM) is based on data from the Mars
     Orbiter Laser Altimeter (MOLA; Smith et al., 2001), an instrument on NASA's Mars
diff --git a/data/assets/scene/solarsystem/planets/mars/layers/heightlayers/mola_sweden.asset b/data/assets/scene/solarsystem/planets/mars/layers/heightlayers/mola_sweden.asset
index 8b6b7c044a..6d39acc71d 100644
--- a/data/assets/scene/solarsystem/planets/mars/layers/heightlayers/mola_sweden.asset
+++ b/data/assets/scene/solarsystem/planets/mars/layers/heightlayers/mola_sweden.asset
@@ -6,7 +6,7 @@ local Layer = {
   Identifier = "Mola_Europe",
   Name = "Mola Elevation [Sweden]",
   Enabled = asset.enabled,
-  FilePath = asset.localResource("mola_sweden.wms"),
+  FilePath = asset.resource("mola_sweden.wms"),
   TilePixelSize = 360,
   Description = [[This digital elevation model (DEM) is based on data from the Mars
     Orbiter Laser Altimeter (MOLA; Smith et al., 2001), an instrument on NASA's Mars
diff --git a/data/assets/scene/solarsystem/planets/mars/layers/heightlayers/mola_utah.asset b/data/assets/scene/solarsystem/planets/mars/layers/heightlayers/mola_utah.asset
index 23545537a2..4d1cb1c87c 100644
--- a/data/assets/scene/solarsystem/planets/mars/layers/heightlayers/mola_utah.asset
+++ b/data/assets/scene/solarsystem/planets/mars/layers/heightlayers/mola_utah.asset
@@ -6,7 +6,7 @@ local Layer = {
   Identifier = "Mola_Utah",
   Name = "Mola Elevation [Utah]",
   Enabled = asset.enabled,
-  FilePath = asset.localResource("mola_utah.wms"),
+  FilePath = asset.resource("mola_utah.wms"),
   TilePixelSize = 360,
   Description = [[This digital elevation model (DEM) is based on data from the Mars
     Orbiter Laser Altimeter (MOLA; Smith et al., 2001), an instrument on NASA's Mars
diff --git a/data/assets/scene/solarsystem/planets/mars/layers/nasa-treks/MEX_HRSC.asset b/data/assets/scene/solarsystem/planets/mars/layers/nasa-treks/MEX_HRSC.asset
index 3223495309..56d8c117dd 100644
--- a/data/assets/scene/solarsystem/planets/mars/layers/nasa-treks/MEX_HRSC.asset
+++ b/data/assets/scene/solarsystem/planets/mars/layers/nasa-treks/MEX_HRSC.asset
@@ -9,14 +9,14 @@ local globeIdentifier = asset.require("scene/solarsystem//planets/mars/mars").Ma
 local treks_hrsc_dem_martian_east = {
   Identifier = "hrsc_dem_martian_east",
   Name = [[MEX HRSC, Martian Path Eastern Section DEM]],
-  FilePath = asset.localResource("MEX_HRSC/Martian_Path_Eastern_Section_DEM.vrt"),
+  FilePath = asset.resource("MEX_HRSC/Martian_Path_Eastern_Section_DEM.vrt"),
   Description = [[This layer is a greyscale mosaic assembled using data from the High Resolution Stereo Camera aboard the European Space Agency's Mars Express orbiter. HRSC is being used to obtain color and stereo images that will map 100% of Mars' surface at resolution better than 30 m/pixel, and 50% of the surface at better than 15 m/pixel. Each of the nine CCD lines of HRSC, a linescan imager (pushbroom camera), contains 5184 pixels. The channels consist of red, green, blue, near-infrared, three stereo channels (backward, nadir, and forward) and two photometric channels. The digital elevation model used for this layer is a combination of data derived from the HRSC and the Mars Orbiter Laser Altimeter.]]
 }
 
 local treks_MC11E11_HRDTMAR_DA5 = {
   Identifier = "MC11E11_HRDTMAR_DA5",
   Name = [[MEX HRSC, Martian Path MC11 Quad DEM]],
-  FilePath = asset.localResource("MEX_HRSC/Martian_Path_MC11_Quad_DEM.vrt"),
+  FilePath = asset.resource("MEX_HRSC/Martian_Path_MC11_Quad_DEM.vrt"),
   Description = [[This layer is a greyscale mosaic assembled using data from the High Resolution Stereo Camera aboard the European Space Agency's Mars Express orbiter. HRSC is being used to obtain color and stereo images that will map 100% of Mars' surface at resolution better than 30 m/pixel, and 50% of the surface at better than 15 m/pixel. Each of the nine CCD lines of HRSC, a linescan imager (pushbroom camera), contains 5184 pixels. The channels consist of red, green, blue, near-infrared, three stereo channels (backward, nadir, and forward) and two photometric channels. The digital elevation model used for this layer is a combination of data derived from the HRSC and the Mars Orbiter Laser Altimeter.]]
 }
 
diff --git a/data/assets/scene/solarsystem/planets/mars/layers/nasa-treks/MGS_MOC_Atlas.asset b/data/assets/scene/solarsystem/planets/mars/layers/nasa-treks/MGS_MOC_Atlas.asset
index d15e6a2ed9..0c3471dcc9 100644
--- a/data/assets/scene/solarsystem/planets/mars/layers/nasa-treks/MGS_MOC_Atlas.asset
+++ b/data/assets/scene/solarsystem/planets/mars/layers/nasa-treks/MGS_MOC_Atlas.asset
@@ -9,7 +9,7 @@ local globeIdentifier = asset.require("scene/solarsystem//planets/mars/mars").Ma
 local treks_msss_atlas_simp_clon = {
   Identifier = "msss_atlas_simp_clon",
   Name = [[MGS MOC Atlas, Global Color Mosaic]],
-  FilePath = asset.localResource("MGS_MOC_Atlas/Global_Color_Mosaic.vrt"),
+  FilePath = asset.resource("MGS_MOC_Atlas/Global_Color_Mosaic.vrt"),
   Description = [[This data was acquired using the Mars Orbiter Camera instrument aboard NASA's Mars Global Surveyor spacecraft (MGS). MGS was launched on November 7, 1996 and arrived at Mars on September 11, 1997. It maintained a circular polar orbit, completing an orbital revolution every 117.65 minutes at an average altitude of 378 km (235 mi). Until November 2, 2006, MGS characterized and mapped Mars' surface features, properties, topography, composition, and processes, as well as studied Mars' weather and atmospheric structure.
 
 The Mars Orbiter Camera (MOC) consisted of 3 instruments. A black-and-white narrow angle camera captured high resolution images (typically 1.5 to 12 m per pixel) and red and blue wide angle cameras for context (240 m per pixel) and daily global imaging (7.5 km per pixel). This mosaic was assembled from Wide Angle red images (primarily those acquired in May-June 1999) from the Mars Orbiter Camera.]]
diff --git a/data/assets/scene/solarsystem/planets/mars/layers/nasa-treks/MGS_MOLA.asset b/data/assets/scene/solarsystem/planets/mars/layers/nasa-treks/MGS_MOLA.asset
index 1c052b65d4..164cc565cf 100644
--- a/data/assets/scene/solarsystem/planets/mars/layers/nasa-treks/MGS_MOLA.asset
+++ b/data/assets/scene/solarsystem/planets/mars/layers/nasa-treks/MGS_MOLA.asset
@@ -9,7 +9,7 @@ local globeIdentifier = asset.require("scene/solarsystem//planets/mars/mars").Ma
 local treks_Mars_MGS_MOLA_ClrShade_merge_global_463m = {
   Identifier = "Mars_MGS_MOLA_ClrShade_merge_global_463m",
   Name = [[MGS MOLA, Global Color Hillshade]],
-  FilePath = asset.localResource("MGS_MOLA/Global_Color_Hillshade.vrt"),
+  FilePath = asset.resource("MGS_MOLA/Global_Color_Hillshade.vrt"),
   Description = [[This data was acquired using the Mars Orbiter Laser Altimeter instrument aboard NASA's Mars Global Surveyor spacecraft (MGS). MGS was launched on November 7, 1996 and arrived at Mars on September 11, 1997. It maintained a circular polar orbit, completing an orbital revolution every 117.65 minutes at an average altitude of 378 km (235 mi). Until November 2, 2006, MGS characterized and mapped Mars' surface features, properties, topography, composition, and processes, as well as studied Mars' weather and atmospheric structure.
 
 The Mars Orbiter Laser Altimeter (MOLA) made precise measurements of the heights and depths of surface features on Mars. MOLA fired infrared laser pulses downward 10 times per second, and measured the time it took for the reflected pulses to return from the surface. Converting this data to a colorized hillshade makes it particularly easy to visualize surface topography. The image used for the base of this map represents more than 600 million measurements gathered between 1999 and 2001. The average accuracy of each point is originally ~100 meters in horizontal position and the total elevation uncertainty is at least ±3 m.]]
@@ -18,7 +18,7 @@ The Mars Orbiter Laser Altimeter (MOLA) made precise measurements of the heights
 local treks_mola128_mola64_merge_90Nto90S_SimpleC_clon0 = {
   Identifier = "mola128_mola64_merge_90Nto90S_SimpleC_clon0",
   Name = [[MGS MOLA, Global DEM]],
-  FilePath = asset.localResource("MGS_MOLA/Global_DEM.vrt"),
+  FilePath = asset.resource("MGS_MOLA/Global_DEM.vrt"),
   Description = [[This data was acquired using the Mars Orbiter Laser Altimeter instrument aboard NASA's Mars Global Surveyor spacecraft (MGS). MGS was launched on November 7, 1996 and arrived at Mars on September 11, 1997. It maintained a circular polar orbit, completing an orbital revolution every 117.65 minutes at an average altitude of 378 km (235 mi). Until November 2, 2006, MGS characterized and mapped Mars' surface features, properties, topography, composition, and processes, as well as studied Mars' weather and atmospheric structure.
 
 The DEM represents more than 600 million measurements gathered between 1999 and 2001, adjusted for consistency and converted to planetary radii. These have been converted to elevations above the areoid as determined from a Martian gravity field solution GMM-2B, truncated to degree and order 50, and oriented according to current standards. The average accuracy of each point is originally ~100 meters in horizontal position and ~1 meter in radius. However, the total elevation uncertainty is at least ±3 m due to the global error in the areoid (±1.8 meters) and regional uncertainties in its shape. This DEM is a blend of data obtained with a resolution of 128 pixels per degree and 64 pixels per degree. The majority of the surface is covered at the higher resolution 128 pixels per degree. In projection, these pixels are 463 meters in size at the equator. However, these higher resolution data are very sparse near the two poles (above 87° north and below 87° south latitude) because these areas were sampled by only a few off-nadir altimetry tracks. Gaps between tracks of 1-2 km are common, and some gaps of up to 12 km occur near the equator.This data was acquired using the Mars Orbiter Laser Altimeter instrument aboard NASA's Mars Global Surveyor spacecraft (MGS). MGS was launched on November 7, 1996 and arrived at Mars on September 11, 1997. It maintained a circular polar orbit, completing an orbital revolution every 117.65 minutes at an average altitude of 378 km (235 mi). Until November 2, 2006, MGS characterized and mapped Mars' surface features, properties, topography, composition, and processes, as well as studied Mars' weather and atmospheric structure.
@@ -29,7 +29,7 @@ The DEM represents more than 600 million measurements gathered between 1999 and
 local treks_mola_roughness = {
   Identifier = "mola_roughness",
   Name = [[MGS MOLA, Global Surface Roughness]],
-  FilePath = asset.localResource("MGS_MOLA/Global_Surface_Roughness.vrt"),
+  FilePath = asset.resource("MGS_MOLA/Global_Surface_Roughness.vrt"),
   Description = [[The Mars Orbiter Laser Altimeter (MOLA) aboard the Mars Global Surveyor (MGS) spacecraft, made precise altimetry measurements from orbit around Mars from September 1997 to June, 2001. The MOLA instrument transmitted infrared laser pulses towards Mars at a rate of 10 times per second, and measured the time of flight to determine the range (distance) of the MGS spacecraft to the Martian surface. The range measurements resulted in precise topographic maps of Mars. This kilometer-scale global roughness map is presented as an RGB composite image. The Blue, Green and Red channels contain roughness at 0.6 km, 2.4 km, and 9.2 km baselines. Brighter shades denote rougher surface. Thus, general brightness denotes general roughness, and color hue denotes the nature of the scale dependence of roughness. Map resolution/scale: 8 ppd/7.5km. Kreslavsky and Head, 2000, JGR, VOL. 105, NO. Ell, PAGES 26,695-26,711]]
 }
 
diff --git a/data/assets/scene/solarsystem/planets/mars/layers/nasa-treks/MGS_MOLA_and_Mars_Express_HRSC.asset b/data/assets/scene/solarsystem/planets/mars/layers/nasa-treks/MGS_MOLA_and_Mars_Express_HRSC.asset
index e68e1850b3..7b333499b9 100644
--- a/data/assets/scene/solarsystem/planets/mars/layers/nasa-treks/MGS_MOLA_and_Mars_Express_HRSC.asset
+++ b/data/assets/scene/solarsystem/planets/mars/layers/nasa-treks/MGS_MOLA_and_Mars_Express_HRSC.asset
@@ -9,7 +9,7 @@ local globeIdentifier = asset.require("scene/solarsystem//planets/mars/mars").Ma
 local treks_Mars_MOLA_blend200ppx_HRSC_ClrShade_clon0dd_200mpp_lzw = {
   Identifier = "Mars_MOLA_blend200ppx_HRSC_ClrShade_clon0dd_200mpp_lzw",
   Name = [[MGS MOLA and Mars Express HRSC, Color Hillshade Blend]],
-  FilePath = asset.localResource("MGS_MOLA_and_Mars_Express_HRSC/Color_Hillshade_Blend.vrt"),
+  FilePath = asset.resource("MGS_MOLA_and_Mars_Express_HRSC/Color_Hillshade_Blend.vrt"),
   Description = [[This data product is a blend of digital terrain model (DTM) data derived from the Mars Orbiter Laser Altimeter (MOLA) instrument aboard NASA's Mars Global Surveyor spacecraft (MGS), and the High-Resolution Stereo Camera (HRSC) aboard the European Space Agency's Mars Express spacecraft.
 
 MOLA fired infrared laser pulses downward 10 times per second, and measured the time it took for the reflected pulses to return from the surface. The image used for the MOLA base of this map represents more than 600 million measurements gathered between 1999 and 2001. The average accuracy of each point is originally ~100 meters in horizontal position and the total elevation uncertainty is at least ±3 m. MOLA produced global topographic coverage with a spatial resolution of about 300 x 1000 m at the equator, and better near the poles.
@@ -22,7 +22,7 @@ R. Jaumann, et al. (2007), The high-resolution stereo camera (HRSC) experiment o
 local treks_Mars_MOLA_blend200ppx_HRSC_Shade_clon0dd_200mpp_lzw = {
   Identifier = "Mars_MOLA_blend200ppx_HRSC_Shade_clon0dd_200mpp_lzw",
   Name = [[MGS MOLA and Mars Express HRSC, Hillshade Blend]],
-  FilePath = asset.localResource("MGS_MOLA_and_Mars_Express_HRSC/Hillshade_Blend.vrt"),
+  FilePath = asset.resource("MGS_MOLA_and_Mars_Express_HRSC/Hillshade_Blend.vrt"),
   Description = [[This data product is a blend of digital terrain model (DTM) data derived from the Mars Orbiter Laser Altimeter (MOLA) instrument aboard NASA's Mars Global Surveyor spacecraft (MGS), and the High-Resolution Stereo Camera (HRSC) aboard the European Space Agency's Mars Express spacecraft.
 
 MOLA fired infrared laser pulses downward 10 times per second, and measured the time it took for the reflected pulses to return from the surface. The image used for the MOLA base of this map represents more than 600 million measurements gathered between 1999 and 2001. The average accuracy of each point is originally ~100 meters in horizontal position and the total elevation uncertainty is at least ±3 m. MOLA produced global topographic coverage with a spatial resolution of about 300 x 1000 m at the equator, and better near the poles.
diff --git a/data/assets/scene/solarsystem/planets/mars/layers/nasa-treks/MGS_TES.asset b/data/assets/scene/solarsystem/planets/mars/layers/nasa-treks/MGS_TES.asset
index 163522a292..fa0d856950 100644
--- a/data/assets/scene/solarsystem/planets/mars/layers/nasa-treks/MGS_TES.asset
+++ b/data/assets/scene/solarsystem/planets/mars/layers/nasa-treks/MGS_TES.asset
@@ -9,42 +9,42 @@ local globeIdentifier = asset.require("scene/solarsystem//planets/mars/mars").Ma
 local treks_TES_Dust = {
   Identifier = "TES_Dust",
   Name = [[MGS TES, Global Dust]],
-  FilePath = asset.localResource("MGS_TES/Global_Dust.vrt"),
+  FilePath = asset.resource("MGS_TES/Global_Dust.vrt"),
   Description = [[The Thermal Emission Spectrometer (TES) is one of the instruments aboard the Mars Global Surveyor spacecraft. TES is designed to measure the thermal infrared energy (heat) emitted from Mars. This technique, called thermal emission spectroscopy, can tell us much about the geology and atmosphere of Mars. Dust is widespread and abundant across the surface of Mars. However, in the wind-blown environment of Mars, dust accumulates tickly in some areas and is blown clear of other areas. Thick accumulations of dust mask the underlying surface, making measurements of surface composition from orbit difficult or even impossible. Preferred landing site candidates will ideally be relatively dust free. An index of the relative abundance of spectrally obscuring dust across the Martian surface was developed using data from TES. While closely correlated with albedo, the TES dust cover index (DCI) is a more direct metric for the presence or absence of dust on a particular surface and is independent of albedo. This becomes important for the types of light-toned layered deposits and surfaces that likely will be among the candidates for future landing sites. Map resolution/scale: 16ppd/3.5km. Ruff and Christensen, 2002, JGR, VOL. 107, NO. E12, 5127]]
 }
 
 local treks_tes_ruffdust = {
   Identifier = "tes_ruffdust",
   Name = [[MGS TES, Global Dust Index]],
-  FilePath = asset.localResource("MGS_TES/Global_Dust_Index.vrt"),
+  FilePath = asset.resource("MGS_TES/Global_Dust_Index.vrt"),
   Description = [[The Thermal Emission Spectrometer (TES) is one of the instruments aboard the Mars Global Surveyor spacecraft. TES is designed to measure the thermal infrared energy (heat) emitted from Mars. This technique, called thermal emission spectroscopy, can tell us much about the geology and atmosphere of Mars. Dust is widespread and abundant across the surface of Mars. However, in the wind-blown environment of Mars, dust accumulates tickly in some areas and is blown clear of other areas. Thick accumulations of dust mask the underlying surface, making measurements of surface composition from orbit difficult or even impossible. Preferred landing site candidates will ideally be relatively dust free. An index of the relative abundance of spectrally obscuring dust across the Martian surface was developed using data from TES. While closely correlated with albedo, the TES dust cover index (DCI) is a more direct metric for the presence or absence of dust on a particular surface and is independent of albedo. This becomes important for the types of light-toned layered deposits and surfaces that likely will be among the candidates for future landing sites. Map resolution/scale: 16ppd/3.5km. Ruff and Christensen, 2002, JGR, VOL. 107, NO. E12, 5127]]
 }
 
 local treks_TES_Clinopyroxene = {
   Identifier = "TES_Clinopyroxene",
   Name = [[MGS TES, Global High-Ca Pyroxene Abundance]],
-  FilePath = asset.localResource("MGS_TES/Global_High-Ca_Pyroxene_Abundance.vrt"),
+  FilePath = asset.resource("MGS_TES/Global_High-Ca_Pyroxene_Abundance.vrt"),
   Description = [[The Thermal Emission Spectrometer (TES) is one of the instruments aboard the Mars Global Surveyor spacecraft. TES is designed to measure the thermal infrared energy (heat) emitted from Mars. This technique, called thermal emission spectroscopy, can tell us much about the geology and atmosphere of Mars. A deconvolution method was used to remove atmospheric components and determine surface mineralogy from TES data at 1 pixel per degree (ppd). Minerals were grouped into categories on the basis of compositional and spectral similarity, and global concentration maps were produced. High-Ca pyroxenes are identified in concentrations of 0.10 - 0.20 in equatorial low albedo regions. The highest concentrations are present in Syrtis Major. High-latitude, low-albedo regions are characterized by concentrations of 0 - 0.10. Light regions have 0 - 0.05 high-Ca pyroxene concentrations. Only equatorial low-albedo regions have pyroxene concentrations above the detection limit. Map resolution/scale: 4 ppd/16km. Joshua L. Bandfield, 2002, JGR, VOL. 107, NO. E6, 5042]]
 }
 
 local treks_TES_Plagioclase = {
   Identifier = "TES_Plagioclase",
   Name = [[MGS TES, Global Plagioclase Abundance]],
-  FilePath = asset.localResource("MGS_TES/Global_Plagioclase_Abundance.vrt"),
+  FilePath = asset.resource("MGS_TES/Global_Plagioclase_Abundance.vrt"),
   Description = [[The Thermal Emission Spectrometer (TES) is one of the instruments aboard the Mars Global Surveyor spacecraft. TES is designed to measure the thermal infrared energy (heat) emitted from Mars. This technique, called thermal emission spectroscopy, can tell us much about the geology and atmosphere of Mars. A deconvolution method was used to remove atmospheric components and determine surface mineralogy from TES data at 1 pixel per degree (ppd). Minerals were grouped into categories on the basis of compositional and spectral similarity, and global concentration maps were produced. Plagioclase is present in high concentrations in low-albedo regions. High-latitude, low albedo regions have concentrations of 0.05 - 0.15. Equatorial low-albedo regions display concentrations of 0.10 - 0.20 with the highest concentrations in the Syrtis Major region. High-albedo surfaces have plagioclase concentrations of 0 - 0.05, well below the detectable limit. Where there are significant concentrations, average plagioclase compositions are intermediate to calcic. Map resolution/scale: 4 ppd/16km. Joshua L. Bandfield, 2002, JGR, VOL. 107, NO. E6, 5042]]
 }
 
 local treks_TES_Glass_Clay = {
   Identifier = "TES_Glass_Clay",
   Name = [[MGS TES, Global Sheet Silicates/High-Si Glass]],
-  FilePath = asset.localResource("MGS_TES/Global_Sheet_SilicatesHigh-Si_Glass.vrt"),
+  FilePath = asset.resource("MGS_TES/Global_Sheet_SilicatesHigh-Si_Glass.vrt"),
   Description = [[The Thermal Emission Spectrometer (TES) is one of the instruments aboard the Mars Global Surveyor spacecraft. TES is designed to measure the thermal infrared energy (heat) emitted from Mars. This technique, called thermal emission spectroscopy, can tell us much about the geology and atmosphere of Mars. A deconvolution method was used to remove atmospheric components and determine surface mineralogy from TES data at 1 pixel per degree (ppd). Minerals were grouped into categories on the basis of compositional and spectral similarity, and global concentration maps were produced. The sheet silicate and high-Si glass map is slightly noisier than the other mineralogy maps. This is likely due to the spectral similarity between the sheet silicate and high-Si glass end-member group and the atmospheric dust spectral shapes. The highest concentrations are located in northern hemisphere low-albedo regions with concentrations of 0.05 - 0.20. High concentrations are also present in several isolated regions south of Solis Planum, southeast of Hellas Basin, and along the edge of the southern polar cap. High albedo regions contain 0 - 0.10 sheet silicate and high-Si glass concentrations. Equatorial and southern hemisphere low-albedo regions typically have concentrations of 0.05 - 0.15 with the exception of some isolated areas. Map resolution/scale: 4 ppd/16km. Joshua L. Bandfield, 2002, JGR, VOL. 107, NO. E6, 5042]]
 }
 
 local treks_TES_Thermal_Inertia = {
   Identifier = "TES_Thermal_Inertia",
   Name = [[MGS TES, Global Thermal Inertia]],
-  FilePath = asset.localResource("MGS_TES/Global_Thermal_Inertia.vrt"),
+  FilePath = asset.resource("MGS_TES/Global_Thermal_Inertia.vrt"),
   Description = [[The Thermal Emission Spectrometer (TES) is one of the instruments aboard the Mars Global Surveyor spacecraft. TES is designed to measure the thermal infrared energy (heat) emitted from Mars. This technique, called thermal emission spectroscopy, can tell us much about the geology and atmosphere of Mars. One of the objectives of the MGS TES instrument is the derivation of thermal inertia of the surface at 3-km spatial resolution. Thermal inertia represents the ability of a material to conduct and store heat, and in the context of planetary science, it is a measure of the subsurface's ability to store heat during the day and reradiate it during the night. While compositional differences (ie, mineralogy) will have some effect, for a terrestrial planetary surface such as that of Mars, thermal inertia will depend predominantly on the physical properties of the near surface materials such as particle size, degree of induration (ie, cementation of grains), rock abundance, and exposure of bedrock (rocks will have a much higher thermal inertia than sand or dust - that is, it takes longer to heat rocks up during the day and to cool them off at night). For example, on a visit to the desert you may notice that sandy areas are much hotter at midday than adjacent rocks, and the sand cools off quickly after sunset whereas the rocks remain warm well into the evening. Map resolution/scale: 20 ppd/3km. Putzig et al, 2005, Icarus 173, 325-341]]
 }
 
diff --git a/data/assets/scene/solarsystem/planets/mars/layers/nasa-treks/MO_THEMIS-IR_Day.asset b/data/assets/scene/solarsystem/planets/mars/layers/nasa-treks/MO_THEMIS-IR_Day.asset
index d2740f48c7..45238136bf 100644
--- a/data/assets/scene/solarsystem/planets/mars/layers/nasa-treks/MO_THEMIS-IR_Day.asset
+++ b/data/assets/scene/solarsystem/planets/mars/layers/nasa-treks/MO_THEMIS-IR_Day.asset
@@ -9,7 +9,7 @@ local globeIdentifier = asset.require("scene/solarsystem//planets/mars/mars").Ma
 local treks_THEMIS_DayIR_ControlledMosaics_100m_v2_oct2018 = {
   Identifier = "THEMIS_DayIR_ControlledMosaics_100m_v2_oct2018",
   Name = [[MO THEMIS-IR Day, Global Mosaic]],
-  FilePath = asset.localResource("MO_THEMIS-IR_Day/Global_Mosaic.vrt"),
+  FilePath = asset.resource("MO_THEMIS-IR_Day/Global_Mosaic.vrt"),
   Description = [[This data was acquired using the Thermal Emission Imaging System instrument aboard NASA's Mars Odyssey spacecraft. Odyssey was launched on April 7, 2001 and arrived at Mars on October 24, 2001. It maintains a polar orbit around Mars with an altitude of about 3,800 km or 2,400 miles. Odyssey's mission includes studying the mineralogy of Mars' surface (especially looking at minerals formed in the presence of water), detecting water and shallow buried ice, and studying the radiation environment. The Thermal Emission Imaging System (THEMIS) instrument is a camera system that gathers data in infrared and visible light. The infrared images sample nine different wavelengths allowing spectra to be constructed and compositions of imaged surfaces to be inferred. Daytime infrared Themis images typically emphasize topography, with warmer sunward slopes being brighter than cooler shaded slopes. Nighttime Themis images emphasize differences in thermal inertia between areas being observed, giving insights into the physical characteristics of the surfaces. This map is a THEMIS daytime infrared map. The 2017 release featured preliminary geodetically controlled mosaics tied to a known coordinate system (USGS Viking Orbiter MDIM 2.1), spatially adjusted to align feature boundaries, and orthoprojected at 100 m/pixel scale. Further adjustments have been processed for the 2018 release of this final mosaic.]]
 }
 
diff --git a/data/assets/scene/solarsystem/planets/mars/layers/nasa-treks/MO_THEMIS-IR_Night.asset b/data/assets/scene/solarsystem/planets/mars/layers/nasa-treks/MO_THEMIS-IR_Night.asset
index 8f92f0682d..ea58be5f16 100644
--- a/data/assets/scene/solarsystem/planets/mars/layers/nasa-treks/MO_THEMIS-IR_Night.asset
+++ b/data/assets/scene/solarsystem/planets/mars/layers/nasa-treks/MO_THEMIS-IR_Night.asset
@@ -9,7 +9,7 @@ local globeIdentifier = asset.require("scene/solarsystem//planets/mars/mars").Ma
 local treks_THEMIS_NightIR_ControlledMosaics_100m_v2_oct2018 = {
   Identifier = "THEMIS_NightIR_ControlledMosaics_100m_v2_oct2018",
   Name = [[MO THEMIS-IR Night, Global Mosaic]],
-  FilePath = asset.localResource("MO_THEMIS-IR_Night/Global_Mosaic.vrt"),
+  FilePath = asset.resource("MO_THEMIS-IR_Night/Global_Mosaic.vrt"),
   Description = [[This data was acquired using the Thermal Emission Imaging System instrument aboard NASA's Mars Odyssey spacecraft. Odyssey was launched on April 7, 2001 and arrived at Mars on October 24, 2001. It maintains a polar orbit around Mars with an altitude of about 3,800 km or 2,400 miles. Odyssey's mission includes studying the mineralogy of Mars' surface (especially looking at minerals formed in the presence of water), detecting water and shallow buried ice, and studying the radiation environment. The Thermal Emission Imaging System (THEMIS) instrument is a camera system that gathers data in infrared and visible light. The infrared images sample nine different wavelengths allowing spectra to be constructed and compositions of imaged surfaces to be inferred. Daytime infrared Themis images typically emphasize topography, with warmer sunward slopes being brighter than cooler shaded slopes. Nighttime Themis images emphasize differences in thermal inertia between areas being observed, giving insights into the physical characteristics of the surfaces. This map is a THEMIS nighttime infrared map. The 2017 release featured preliminary geodetically controlled mosaics tied to a known coordinate system (USGS Viking Orbiter MDIM 2.1), spatially adjusted to align feature boundaries, and orthoprojected at 100 m/pixel scale. Further adjustments have been processed for the 2018 release of this final mosaic.]]
 }
 
diff --git a/data/assets/scene/solarsystem/planets/mars/layers/nasa-treks/MRO_CTX.asset b/data/assets/scene/solarsystem/planets/mars/layers/nasa-treks/MRO_CTX.asset
index 66362550a2..d96569bee0 100644
--- a/data/assets/scene/solarsystem/planets/mars/layers/nasa-treks/MRO_CTX.asset
+++ b/data/assets/scene/solarsystem/planets/mars/layers/nasa-treks/MRO_CTX.asset
@@ -9,7 +9,7 @@ local globeIdentifier = asset.require("scene/solarsystem//planets/mars/mars").Ma
 local treks_b21_017819_2025_xn_22n048w = {
   Identifier = "b21_017819_2025_xn_22n048w",
   Name = [[MRO CTX, 22n048w Mosaic]],
-  FilePath = asset.localResource("MRO_CTX/22n048w_Mosaic.vrt"),
+  FilePath = asset.resource("MRO_CTX/22n048w_Mosaic.vrt"),
   Description = [[This data was acquired using the Context Camera aboard NASA's Mars Reconnaissance Orbiter spacecraft (MRO). MRO was launched on August 12, 2005 and arrived at Mars on March 10, 2006. It maintains a nearly circular orbit, completing an orbital revolution about every 112 minutes at an altitude of approximately 250 to 316 km or 155 to 196 miles. MRO carries a sophisticated suite of instruments used to analyze and map the landforms, stratigraphy, minerals, and ice of Mars.
 
 The Context Camera (CTX) provides black-and-white images with resolutions up to 6 meters/pixel. It provides broader context maps for the higher resolution but narrower fields of view of the HiRISE camera, as well as for other instruments aboard MRO, and is useful for producing mosaicked images of larger areas on Mars' surface.]]
@@ -18,7 +18,7 @@ The Context Camera (CTX) provides black-and-white images with resolutions up to
 local treks_Acheron_Fossae_CTX_BlockAdj_dd = {
   Identifier = "Acheron_Fossae_CTX_BlockAdj_dd",
   Name = [[MRO CTX, Acheron Fossae Mosaic]],
-  FilePath = asset.localResource("MRO_CTX/Acheron_Fossae_Mosaic.vrt"),
+  FilePath = asset.resource("MRO_CTX/Acheron_Fossae_Mosaic.vrt"),
   Description = [[This data was acquired using the Context Camera aboard NASA's Mars Reconnaissance Orbiter spacecraft (MRO). MRO was launched on August 12, 2005 and arrived at Mars on March 10, 2006. It maintains a nearly circular orbit, completing an orbital revolution about every 112 minutes at an altitude of approximately 250 to 316 km or 155 to 196 miles. MRO carries a sophisticated suite of instruments used to analyze and map the landforms, stratigraphy, minerals, and ice of Mars.
 
 The Context Camera (CTX) provides black-and-white images with resolutions up to 6 meters/pixel. It provides broader context maps for the higher resolution but narrower fields of view of the HiRISE camera, as well as for other instruments aboard MRO, and is useful for producing mosaicked images of larger areas on Mars' surface.]]
@@ -27,7 +27,7 @@ The Context Camera (CTX) provides black-and-white images with resolutions up to
 local treks_Acidalia_Plantia_CTX_BlockAdj_dd = {
   Identifier = "Acidalia_Plantia_CTX_BlockAdj_dd",
   Name = [[MRO CTX, Acidalia Plantia Mosaic]],
-  FilePath = asset.localResource("MRO_CTX/Acidalia_Plantia_Mosaic.vrt"),
+  FilePath = asset.resource("MRO_CTX/Acidalia_Plantia_Mosaic.vrt"),
   Description = [[This data was acquired using the Context Camera aboard NASA's Mars Reconnaissance Orbiter spacecraft (MRO). MRO was launched on August 12, 2005 and arrived at Mars on March 10, 2006. It maintains a nearly circular orbit, completing an orbital revolution about every 112 minutes at an altitude of approximately 250 to 316 km or 155 to 196 miles. MRO carries a sophisticated suite of instruments used to analyze and map the landforms, stratigraphy, minerals, and ice of Mars.
 
 The Context Camera (CTX) provides black-and-white images with resolutions up to 6 meters/pixel. It provides broader context maps for the higher resolution but narrower fields of view of the HiRISE camera, as well as for other instruments aboard MRO, and is useful for producing mosaicked images of larger areas on Mars' surface.]]
@@ -36,7 +36,7 @@ The Context Camera (CTX) provides black-and-white images with resolutions up to
 local treks_Arabia_Terra_CTX_BlockAdj_dd = {
   Identifier = "Arabia_Terra_CTX_BlockAdj_dd",
   Name = [[MRO CTX, Arabia Terra Mosaic]],
-  FilePath = asset.localResource("MRO_CTX/Arabia_Terra_Mosaic.vrt"),
+  FilePath = asset.resource("MRO_CTX/Arabia_Terra_Mosaic.vrt"),
   Description = [[This data was acquired using the Context Camera aboard NASA's Mars Reconnaissance Orbiter spacecraft (MRO). MRO was launched on August 12, 2005 and arrived at Mars on March 10, 2006. It maintains a nearly circular orbit, completing an orbital revolution about every 112 minutes at an altitude of approximately 250 to 316 km or 155 to 196 miles. MRO carries a sophisticated suite of instruments used to analyze and map the landforms, stratigraphy, minerals, and ice of Mars.
 
 The Context Camera (CTX) provides black-and-white images with resolutions up to 6 meters/pixel. It provides broader context maps for the higher resolution but narrower fields of view of the HiRISE camera, as well as for other instruments aboard MRO, and is useful for producing mosaicked images of larger areas on Mars' surface.]]
@@ -45,7 +45,7 @@ The Context Camera (CTX) provides black-and-white images with resolutions up to
 local treks_Aram_Chaos_CTX_BlockAdj_dd = {
   Identifier = "Aram_Chaos_CTX_BlockAdj_dd",
   Name = [[MRO CTX, Aram Chaos Mosaic]],
-  FilePath = asset.localResource("MRO_CTX/Aram_Chaos_Mosaic.vrt"),
+  FilePath = asset.resource("MRO_CTX/Aram_Chaos_Mosaic.vrt"),
   Description = [[This data was acquired using the Context Camera aboard NASA's Mars Reconnaissance Orbiter spacecraft (MRO). MRO was launched on August 12, 2005 and arrived at Mars on March 10, 2006. It maintains a nearly circular orbit, completing an orbital revolution about every 112 minutes at an altitude of approximately 250 to 316 km or 155 to 196 miles. MRO carries a sophisticated suite of instruments used to analyze and map the landforms, stratigraphy, minerals, and ice of Mars.
 
 The Context Camera (CTX) provides black-and-white images with resolutions up to 6 meters/pixel. It provides broader context maps for the higher resolution but narrower fields of view of the HiRISE camera, as well as for other instruments aboard MRO, and is useful for producing mosaicked images of larger areas on Mars' surface.]]
@@ -54,7 +54,7 @@ The Context Camera (CTX) provides black-and-white images with resolutions up to
 local treks_Arcadia_CTX_BlockAdj_dd = {
   Identifier = "Arcadia_CTX_BlockAdj_dd",
   Name = [[MRO CTX, Arcadia Mosaic]],
-  FilePath = asset.localResource("MRO_CTX/Arcadia_Mosaic.vrt"),
+  FilePath = asset.resource("MRO_CTX/Arcadia_Mosaic.vrt"),
   Description = [[This data was acquired using the Context Camera aboard NASA's Mars Reconnaissance Orbiter spacecraft (MRO). MRO was launched on August 12, 2005 and arrived at Mars on March 10, 2006. It maintains a nearly circular orbit, completing an orbital revolution about every 112 minutes at an altitude of approximately 250 to 316 km or 155 to 196 miles. MRO carries a sophisticated suite of instruments used to analyze and map the landforms, stratigraphy, minerals, and ice of Mars.
 
 The Context Camera (CTX) provides black-and-white images with resolutions up to 6 meters/pixel. It provides broader context maps for the higher resolution but narrower fields of view of the HiRISE camera, as well as for other instruments aboard MRO, and is useful for producing mosaicked images of larger areas on Mars' surface.]]
@@ -63,7 +63,7 @@ The Context Camera (CTX) provides black-and-white images with resolutions up to
 local treks_Arcadia_Planitia_CTX_BlockAdj_dd = {
   Identifier = "Arcadia_Planitia_CTX_BlockAdj_dd",
   Name = [[MRO CTX, Arcadia Planitia Mosaic]],
-  FilePath = asset.localResource("MRO_CTX/Arcadia_Planitia_Mosaic.vrt"),
+  FilePath = asset.resource("MRO_CTX/Arcadia_Planitia_Mosaic.vrt"),
   Description = [[This data was acquired using the Context Camera aboard NASA's Mars Reconnaissance Orbiter spacecraft (MRO). MRO was launched on August 12, 2005 and arrived at Mars on March 10, 2006. It maintains a nearly circular orbit, completing an orbital revolution about every 112 minutes at an altitude of approximately 250 to 316 km or 155 to 196 miles. MRO carries a sophisticated suite of instruments used to analyze and map the landforms, stratigraphy, minerals, and ice of Mars.
 
 The Context Camera (CTX) provides black-and-white images with resolutions up to 6 meters/pixel. It provides broader context maps for the higher resolution but narrower fields of view of the HiRISE camera, as well as for other instruments aboard MRO, and is useful for producing mosaicked images of larger areas on Mars' surface.]]
@@ -72,7 +72,7 @@ The Context Camera (CTX) provides black-and-white images with resolutions up to
 local treks_Ausonia_CTX_BlockAdj_dd = {
   Identifier = "Ausonia_CTX_BlockAdj_dd",
   Name = [[MRO CTX, Ausonia Mosaic]],
-  FilePath = asset.localResource("MRO_CTX/Ausonia_Mosaic.vrt"),
+  FilePath = asset.resource("MRO_CTX/Ausonia_Mosaic.vrt"),
   Description = [[This data was acquired using the Context Camera aboard NASA's Mars Reconnaissance Orbiter spacecraft (MRO). MRO was launched on August 12, 2005 and arrived at Mars on March 10, 2006. It maintains a nearly circular orbit, completing an orbital revolution about every 112 minutes at an altitude of approximately 250 to 316 km or 155 to 196 miles. MRO carries a sophisticated suite of instruments used to analyze and map the landforms, stratigraphy, minerals, and ice of Mars.
 
 The Context Camera (CTX) provides black-and-white images with resolutions up to 6 meters/pixel. It provides broader context maps for the higher resolution but narrower fields of view of the HiRISE camera, as well as for other instruments aboard MRO, and is useful for producing mosaicked images of larger areas on Mars' surface.]]
@@ -81,7 +81,7 @@ The Context Camera (CTX) provides black-and-white images with resolutions up to
 local treks_Cerberus_CTX_BlockAdj_dd = {
   Identifier = "Cerberus_CTX_BlockAdj_dd",
   Name = [[MRO CTX, Cerberus Mosaic]],
-  FilePath = asset.localResource("MRO_CTX/Cerberus_Mosaic.vrt"),
+  FilePath = asset.resource("MRO_CTX/Cerberus_Mosaic.vrt"),
   Description = [[This data was acquired using the Context Camera aboard NASA's Mars Reconnaissance Orbiter spacecraft (MRO). MRO was launched on August 12, 2005 and arrived at Mars on March 10, 2006. It maintains a nearly circular orbit, completing an orbital revolution about every 112 minutes at an altitude of approximately 250 to 316 km or 155 to 196 miles. MRO carries a sophisticated suite of instruments used to analyze and map the landforms, stratigraphy, minerals, and ice of Mars.
 
 The Context Camera (CTX) provides black-and-white images with resolutions up to 6 meters/pixel. It provides broader context maps for the higher resolution but narrower fields of view of the HiRISE camera, as well as for other instruments aboard MRO, and is useful for producing mosaicked images of larger areas on Mars' surface.]]
@@ -90,7 +90,7 @@ The Context Camera (CTX) provides black-and-white images with resolutions up to
 local treks_DEM_1m_ColumbiaHills_fixed = {
   Identifier = "DEM_1m_ColumbiaHills_fixed",
   Name = [[MRO CTX, Columbia Hills DEM]],
-  FilePath = asset.localResource("MRO_CTX/Columbia_Hills_DEM.vrt"),
+  FilePath = asset.resource("MRO_CTX/Columbia_Hills_DEM.vrt"),
   Description = [[This data was acquired using the Context Camera aboard NASA's Mars Reconnaissance Orbiter spacecraft (MRO). MRO was launched on August 12, 2005 and arrived at Mars on March 10, 2006. It maintains a nearly circular orbit, completing an orbital revolution about every 112 minutes at an altitude of approximately 250 to 316 km or 155 to 196 miles. MRO carries a sophisticated suite of instruments used to analyze and map the landforms, stratigraphy, minerals, and ice of Mars.
 
 The Context Camera (CTX) provides black-and-white images with resolutions up to 6 meters/pixel. It provides broader context maps for the higher resolution but narrower fields of view of the HiRISE camera, as well as for other instruments aboard MRO, and is useful for producing mosaicked images of larger areas on Mars' surface.]]
@@ -99,7 +99,7 @@ The Context Camera (CTX) provides black-and-white images with resolutions up to
 local treks_Columbus_Crater_CTX_BlockAdj_dd = {
   Identifier = "Columbus_Crater_CTX_BlockAdj_dd",
   Name = [[MRO CTX, Columbus Crater Mosaic]],
-  FilePath = asset.localResource("MRO_CTX/Columbus_Crater_Mosaic.vrt"),
+  FilePath = asset.resource("MRO_CTX/Columbus_Crater_Mosaic.vrt"),
   Description = [[This data was acquired using the Context Camera aboard NASA's Mars Reconnaissance Orbiter spacecraft (MRO). MRO was launched on August 12, 2005 and arrived at Mars on March 10, 2006. It maintains a nearly circular orbit, completing an orbital revolution about every 112 minutes at an altitude of approximately 250 to 316 km or 155 to 196 miles. MRO carries a sophisticated suite of instruments used to analyze and map the landforms, stratigraphy, minerals, and ice of Mars.
 
 The Context Camera (CTX) provides black-and-white images with resolutions up to 6 meters/pixel. It provides broader context maps for the higher resolution but narrower fields of view of the HiRISE camera, as well as for other instruments aboard MRO, and is useful for producing mosaicked images of larger areas on Mars' surface.]]
@@ -108,7 +108,7 @@ The Context Camera (CTX) provides black-and-white images with resolutions up to
 local treks_Copernicus_Crater_CTX_BlockAdj_dd = {
   Identifier = "Copernicus_Crater_CTX_BlockAdj_dd",
   Name = [[MRO CTX, Copernicus Crater Mosaic]],
-  FilePath = asset.localResource("MRO_CTX/Copernicus_Crater_Mosaic.vrt"),
+  FilePath = asset.resource("MRO_CTX/Copernicus_Crater_Mosaic.vrt"),
   Description = [[This data was acquired using the Context Camera aboard NASA's Mars Reconnaissance Orbiter spacecraft (MRO). MRO was launched on August 12, 2005 and arrived at Mars on March 10, 2006. It maintains a nearly circular orbit, completing an orbital revolution about every 112 minutes at an altitude of approximately 250 to 316 km or 155 to 196 miles. MRO carries a sophisticated suite of instruments used to analyze and map the landforms, stratigraphy, minerals, and ice of Mars.
 
 The Context Camera (CTX) provides black-and-white images with resolutions up to 6 meters/pixel. It provides broader context maps for the higher resolution but narrower fields of view of the HiRISE camera, as well as for other instruments aboard MRO, and is useful for producing mosaicked images of larger areas on Mars' surface.]]
@@ -117,7 +117,7 @@ The Context Camera (CTX) provides black-and-white images with resolutions up to
 local treks_Coprates_EMelas_Chasm_CTX_BlockAdj_dd = {
   Identifier = "Coprates_EMelas_Chasm_CTX_BlockAdj_dd",
   Name = [[MRO CTX, Coprates EMelas Chasm Mosaic]],
-  FilePath = asset.localResource("MRO_CTX/Coprates_EMelas_Chasm_Mosaic.vrt"),
+  FilePath = asset.resource("MRO_CTX/Coprates_EMelas_Chasm_Mosaic.vrt"),
   Description = [[This data was acquired using the Context Camera aboard NASA's Mars Reconnaissance Orbiter spacecraft (MRO). MRO was launched on August 12, 2005 and arrived at Mars on March 10, 2006. It maintains a nearly circular orbit, completing an orbital revolution about every 112 minutes at an altitude of approximately 250 to 316 km or 155 to 196 miles. MRO carries a sophisticated suite of instruments used to analyze and map the landforms, stratigraphy, minerals, and ice of Mars.
 
 The Context Camera (CTX) provides black-and-white images with resolutions up to 6 meters/pixel. It provides broader context maps for the higher resolution but narrower fields of view of the HiRISE camera, as well as for other instruments aboard MRO, and is useful for producing mosaicked images of larger areas on Mars' surface.]]
@@ -126,7 +126,7 @@ The Context Camera (CTX) provides black-and-white images with resolutions up to
 local treks_curiosity_ctx_mosaic = {
   Identifier = "curiosity_ctx_mosaic",
   Name = [[MRO CTX, Curiosity Roving Site Mosaic]],
-  FilePath = asset.localResource("MRO_CTX/Curiosity_Roving_Site_Mosaic.vrt"),
+  FilePath = asset.resource("MRO_CTX/Curiosity_Roving_Site_Mosaic.vrt"),
   Description = [[This data was acquired using the Context Camera aboard NASA's Mars Reconnaissance Orbiter spacecraft (MRO). MRO was launched on August 12, 2005 and arrived at Mars on March 10, 2006. It maintains a nearly circular orbit, completing an orbital revolution about every 112 minutes at an altitude of approximately 250 to 316 km or 155 to 196 miles. MRO carries a sophisticated suite of instruments used to analyze and map the landforms, stratigraphy, minerals, and ice of Mars.
 
 The Context Camera (CTX) provides black-and-white images with resolutions up to 6 meters/pixel. It provides broader context maps for the higher resolution but narrower fields of view of the HiRISE camera, as well as for other instruments aboard MRO, and is useful for producing mosaicked images of larger areas on Mars' surface.]]
@@ -135,7 +135,7 @@ The Context Camera (CTX) provides black-and-white images with resolutions up to
 local treks_Deuteronilus1_2_CTX_BlockAdj_dd = {
   Identifier = "Deuteronilus1_2_CTX_BlockAdj_dd",
   Name = [[MRO CTX, Deuteronilus Mensae Mosaic]],
-  FilePath = asset.localResource("MRO_CTX/Deuteronilus_Mensae_Mosaic.vrt"),
+  FilePath = asset.resource("MRO_CTX/Deuteronilus_Mensae_Mosaic.vrt"),
   Description = [[This data was acquired using the Context Camera aboard NASA's Mars Reconnaissance Orbiter spacecraft (MRO). MRO was launched on August 12, 2005 and arrived at Mars on March 10, 2006. It maintains a nearly circular orbit, completing an orbital revolution about every 112 minutes at an altitude of approximately 250 to 316 km or 155 to 196 miles. MRO carries a sophisticated suite of instruments used to analyze and map the landforms, stratigraphy, minerals, and ice of Mars.
 
 The Context Camera (CTX) provides black-and-white images with resolutions up to 6 meters/pixel. It provides broader context maps for the higher resolution but narrower fields of view of the HiRISE camera, as well as for other instruments aboard MRO, and is useful for producing mosaicked images of larger areas on Mars' surface.]]
@@ -144,21 +144,21 @@ The Context Camera (CTX) provides black-and-white images with resolutions up to
 local treks_CTX_DEM_East_Melas = {
   Identifier = "CTX_DEM_East_Melas",
   Name = [[MRO CTX, East Melas DEM]],
-  FilePath = asset.localResource("MRO_CTX/East_Melas_DEM.vrt"),
+  FilePath = asset.resource("MRO_CTX/East_Melas_DEM.vrt"),
   Description = [[This is a digital elevation model (DEM) for the Eastern Melas Chasma region of Valles Marineris. It is one of the areas identified as a potential Exploration Zone (EZ) for human exploration of Mars. This DEM was generated by combining 9 stereographic pairs of CTX images. Each individual pair was taken of the same area but from different angles. The nine pairs were joined together to cover a broad area of the EZ. This data was acquired using the Context Camera aboard NASA's Mars Reconnaissance Orbiter spacecraft (MRO). MRO was launched on August 12, 2005 and arrived at Mars on March 10, 2006. It maintains a nearly circular orbit, completing an orbital revolution about every 112 minutes at an altitude of approximately 250 to 316 km or 155 to 196 miles. MRO carries a sophisticated suite of instruments used to analyze and map the landforms, stratigraphy, minerals, and ice of Mars. The Context Camera (CTX) provides black-and-white images with resolutions up to 6 meters/pixel. It provides broader context maps for the higher resolution but narrower fields of view of the HiRISE camera, as well as for other instruments aboard MRO, and is useful for producing mosaicked images of larger areas on Mars' surface.]]
 }
 
 local treks_CTX_Shade_East_Melas = {
   Identifier = "CTX_Shade_East_Melas",
   Name = [[MRO CTX, East Melas Hillshade]],
-  FilePath = asset.localResource("MRO_CTX/East_Melas_Hillshade.vrt"),
+  FilePath = asset.resource("MRO_CTX/East_Melas_Hillshade.vrt"),
   Description = [[This is a hillshade rendition of the digital elevation model (DEM) for the Eastern Melas Chasma region of Valles Marineris. It is one of the areas identified as a potential Exploration Zone (EZ) for human exploration of Mars. The hillshade layer is a shaded relief view of the DEM, making it particularly easy to visualize surface topography. The DEM was generated by combining 9 stereographic pairs of CTX images. Each individual pair was taken of the same area but from different angles. The nine pairs were joined together to cover a broad area of the EZ. This data was acquired using the Context Camera aboard NASA's Mars Reconnaissance Orbiter spacecraft (MRO). MRO was launched on August 12, 2005 and arrived at Mars on March 10, 2006. It maintains a nearly circular orbit, completing an orbital revolution about every 112 minutes at an altitude of approximately 250 to 316 km or 155 to 196 miles. MRO carries a sophisticated suite of instruments used to analyze and map the landforms, stratigraphy, minerals, and ice of Mars. The Context Camera (CTX) provides black-and-white images with resolutions up to 6 meters/pixel. It provides broader context maps for the higher resolution but narrower fields of view of the HiRISE camera, as well as for other instruments aboard MRO, and is useful for producing mosaicked images of larger areas on Mars' surface.]]
 }
 
 local treks_NE_Marineris_Crater_CTX_BlockAdj_dd = {
   Identifier = "NE_Marineris_Crater_CTX_BlockAdj_dd",
   Name = [[MRO CTX, Eastern Valles Marineris Mosaic]],
-  FilePath = asset.localResource("MRO_CTX/Eastern_Valles_Marineris_Mosaic.vrt"),
+  FilePath = asset.resource("MRO_CTX/Eastern_Valles_Marineris_Mosaic.vrt"),
   Description = [[This data was acquired using the Context Camera aboard NASA's Mars Reconnaissance Orbiter spacecraft (MRO). MRO was launched on August 12, 2005 and arrived at Mars on March 10, 2006. It maintains a nearly circular orbit, completing an orbital revolution about every 112 minutes at an altitude of approximately 250 to 316 km or 155 to 196 miles. MRO carries a sophisticated suite of instruments used to analyze and map the landforms, stratigraphy, minerals, and ice of Mars.
 
 The Context Camera (CTX) provides black-and-white images with resolutions up to 6 meters/pixel. It provides broader context maps for the higher resolution but narrower fields of view of the HiRISE camera, as well as for other instruments aboard MRO, and is useful for producing mosaicked images of larger areas on Mars' surface.]]
@@ -167,7 +167,7 @@ The Context Camera (CTX) provides black-and-white images with resolutions up to
 local treks_SE_Marineris_CTX_BlockAdj_dd = {
   Identifier = "SE_Marineris_CTX_BlockAdj_dd",
   Name = [[MRO CTX, Equatorial Valles Marineries Mosaic]],
-  FilePath = asset.localResource("MRO_CTX/Equatorial_Valles_Marineries_Mosaic.vrt"),
+  FilePath = asset.resource("MRO_CTX/Equatorial_Valles_Marineries_Mosaic.vrt"),
   Description = [[This data was acquired using the Context Camera aboard NASA's Mars Reconnaissance Orbiter spacecraft (MRO). MRO was launched on August 12, 2005 and arrived at Mars on March 10, 2006. It maintains a nearly circular orbit, completing an orbital revolution about every 112 minutes at an altitude of approximately 250 to 316 km or 155 to 196 miles. MRO carries a sophisticated suite of instruments used to analyze and map the landforms, stratigraphy, minerals, and ice of Mars.
 
 The Context Camera (CTX) provides black-and-white images with resolutions up to 6 meters/pixel. It provides broader context maps for the higher resolution but narrower fields of view of the HiRISE camera, as well as for other instruments aboard MRO, and is useful for producing mosaicked images of larger areas on Mars' surface.]]
@@ -176,7 +176,7 @@ The Context Camera (CTX) provides black-and-white images with resolutions up to
 local treks_Erebus_Montes_CTX_BlockAdj_dd = {
   Identifier = "Erebus_Montes_CTX_BlockAdj_dd",
   Name = [[MRO CTX, Erebus Montes Mosaic]],
-  FilePath = asset.localResource("MRO_CTX/Erebus_Montes_Mosaic.vrt"),
+  FilePath = asset.resource("MRO_CTX/Erebus_Montes_Mosaic.vrt"),
   Description = [[This data was acquired using the Context Camera aboard NASA's Mars Reconnaissance Orbiter spacecraft (MRO). MRO was launched on August 12, 2005 and arrived at Mars on March 10, 2006. It maintains a nearly circular orbit, completing an orbital revolution about every 112 minutes at an altitude of approximately 250 to 316 km or 155 to 196 miles. MRO carries a sophisticated suite of instruments used to analyze and map the landforms, stratigraphy, minerals, and ice of Mars.
 
 The Context Camera (CTX) provides black-and-white images with resolutions up to 6 meters/pixel. It provides broader context maps for the higher resolution but narrower fields of view of the HiRISE camera, as well as for other instruments aboard MRO, and is useful for producing mosaicked images of larger areas on Mars' surface.]]
@@ -185,7 +185,7 @@ The Context Camera (CTX) provides black-and-white images with resolutions up to
 local treks_Gale_CTX_BlockAdj_dd = {
   Identifier = "Gale_CTX_BlockAdj_dd",
   Name = [[MRO CTX, Gale Crater Mosaic]],
-  FilePath = asset.localResource("MRO_CTX/Gale_Crater_Mosaic.vrt"),
+  FilePath = asset.resource("MRO_CTX/Gale_Crater_Mosaic.vrt"),
   Description = [[This data was acquired using the Context Camera aboard NASA's Mars Reconnaissance Orbiter spacecraft (MRO). MRO was launched on August 12, 2005 and arrived at Mars on March 10, 2006. It maintains a nearly circular orbit, completing an orbital revolution about every 112 minutes at an altitude of approximately 250 to 316 km or 155 to 196 miles. MRO carries a sophisticated suite of instruments used to analyze and map the landforms, stratigraphy, minerals, and ice of Mars.
 
 The Context Camera (CTX) provides black-and-white images with resolutions up to 6 meters/pixel. It provides broader context maps for the higher resolution but narrower fields of view of the HiRISE camera, as well as for other instruments aboard MRO, and is useful for producing mosaicked images of larger areas on Mars' surface.]]
@@ -194,7 +194,7 @@ The Context Camera (CTX) provides black-and-white images with resolutions up to
 local treks_Gusev_CTX_BlockAdj_dd = {
   Identifier = "Gusev_CTX_BlockAdj_dd",
   Name = [[MRO CTX, Gusev Crater Mosaic]],
-  FilePath = asset.localResource("MRO_CTX/Gusev_Crater_Mosaic.vrt"),
+  FilePath = asset.resource("MRO_CTX/Gusev_Crater_Mosaic.vrt"),
   Description = [[This data was acquired using the Context Camera aboard NASA's Mars Reconnaissance Orbiter spacecraft (MRO). MRO was launched on August 12, 2005 and arrived at Mars on March 10, 2006. It maintains a nearly circular orbit, completing an orbital revolution about every 112 minutes at an altitude of approximately 250 to 316 km or 155 to 196 miles. MRO carries a sophisticated suite of instruments used to analyze and map the landforms, stratigraphy, minerals, and ice of Mars.
 
 The Context Camera (CTX) provides black-and-white images with resolutions up to 6 meters/pixel. It provides broader context maps for the higher resolution but narrower fields of view of the HiRISE camera, as well as for other instruments aboard MRO, and is useful for producing mosaicked images of larger areas on Mars' surface.]]
@@ -203,7 +203,7 @@ The Context Camera (CTX) provides black-and-white images with resolutions up to
 local treks_Hadriacus_CTX_BlockAdj_dd = {
   Identifier = "Hadriacus_CTX_BlockAdj_dd",
   Name = [[MRO CTX, Hadriacus Mosaic]],
-  FilePath = asset.localResource("MRO_CTX/Hadriacus_Mosaic.vrt"),
+  FilePath = asset.resource("MRO_CTX/Hadriacus_Mosaic.vrt"),
   Description = [[This data was acquired using the Context Camera aboard NASA's Mars Reconnaissance Orbiter spacecraft (MRO). MRO was launched on August 12, 2005 and arrived at Mars on March 10, 2006. It maintains a nearly circular orbit, completing an orbital revolution about every 112 minutes at an altitude of approximately 250 to 316 km or 155 to 196 miles. MRO carries a sophisticated suite of instruments used to analyze and map the landforms, stratigraphy, minerals, and ice of Mars.
 
 The Context Camera (CTX) provides black-and-white images with resolutions up to 6 meters/pixel. It provides broader context maps for the higher resolution but narrower fields of view of the HiRISE camera, as well as for other instruments aboard MRO, and is useful for producing mosaicked images of larger areas on Mars' surface.]]
@@ -212,7 +212,7 @@ The Context Camera (CTX) provides black-and-white images with resolutions up to
 local treks_Hale_Crater_CTX_BlockAdj_dd = {
   Identifier = "Hale_Crater_CTX_BlockAdj_dd",
   Name = [[MRO CTX, Hale Crater Mosaic]],
-  FilePath = asset.localResource("MRO_CTX/Hale_Crater_Mosaic.vrt"),
+  FilePath = asset.resource("MRO_CTX/Hale_Crater_Mosaic.vrt"),
   Description = [[This data was acquired using the Context Camera aboard NASA's Mars Reconnaissance Orbiter spacecraft (MRO). MRO was launched on August 12, 2005 and arrived at Mars on March 10, 2006. It maintains a nearly circular orbit, completing an orbital revolution about every 112 minutes at an altitude of approximately 250 to 316 km or 155 to 196 miles. MRO carries a sophisticated suite of instruments used to analyze and map the landforms, stratigraphy, minerals, and ice of Mars.
 
 The Context Camera (CTX) provides black-and-white images with resolutions up to 6 meters/pixel. It provides broader context maps for the higher resolution but narrower fields of view of the HiRISE camera, as well as for other instruments aboard MRO, and is useful for producing mosaicked images of larger areas on Mars' surface.]]
@@ -221,7 +221,7 @@ The Context Camera (CTX) provides black-and-white images with resolutions up to
 local treks_Hebrus_CTX_BlockAdj_dd = {
   Identifier = "Hebrus_CTX_BlockAdj_dd",
   Name = [[MRO CTX, Hebrus Valles Mosaic]],
-  FilePath = asset.localResource("MRO_CTX/Hebrus_Valles_Mosaic.vrt"),
+  FilePath = asset.resource("MRO_CTX/Hebrus_Valles_Mosaic.vrt"),
   Description = [[This data was acquired using the Context Camera aboard NASA's Mars Reconnaissance Orbiter spacecraft (MRO). MRO was launched on August 12, 2005 and arrived at Mars on March 10, 2006. It maintains a nearly circular orbit, completing an orbital revolution about every 112 minutes at an altitude of approximately 250 to 316 km or 155 to 196 miles. MRO carries a sophisticated suite of instruments used to analyze and map the landforms, stratigraphy, minerals, and ice of Mars.
 
 The Context Camera (CTX) provides black-and-white images with resolutions up to 6 meters/pixel. It provides broader context maps for the higher resolution but narrower fields of view of the HiRISE camera, as well as for other instruments aboard MRO, and is useful for producing mosaicked images of larger areas on Mars' surface.]]
@@ -230,7 +230,7 @@ The Context Camera (CTX) provides black-and-white images with resolutions up to
 local treks_Hellas_Hellas2_CTX_BlockAdj_dd = {
   Identifier = "Hellas_Hellas2_CTX_BlockAdj_dd",
   Name = [[MRO CTX, Hellas Eastern Rim Mosaic]],
-  FilePath = asset.localResource("MRO_CTX/Hellas_Eastern_Rim_Mosaic.vrt"),
+  FilePath = asset.resource("MRO_CTX/Hellas_Eastern_Rim_Mosaic.vrt"),
   Description = [[This data was acquired using the Context Camera aboard NASA's Mars Reconnaissance Orbiter spacecraft (MRO). MRO was launched on August 12, 2005 and arrived at Mars on March 10, 2006. It maintains a nearly circular orbit, completing an orbital revolution about every 112 minutes at an altitude of approximately 250 to 316 km or 155 to 196 miles. MRO carries a sophisticated suite of instruments used to analyze and map the landforms, stratigraphy, minerals, and ice of Mars.
 
 The Context Camera (CTX) provides black-and-white images with resolutions up to 6 meters/pixel. It provides broader context maps for the higher resolution but narrower fields of view of the HiRISE camera, as well as for other instruments aboard MRO, and is useful for producing mosaicked images of larger areas on Mars' surface.]]
@@ -239,7 +239,7 @@ The Context Camera (CTX) provides black-and-white images with resolutions up to
 local treks_Hellas3_CTX_BlockAdj_dd = {
   Identifier = "Hellas3_CTX_BlockAdj_dd",
   Name = [[MRO CTX, Hellas Mesopotamia Mosaic]],
-  FilePath = asset.localResource("MRO_CTX/Hellas_Mesopotamia_Mosaic.vrt"),
+  FilePath = asset.resource("MRO_CTX/Hellas_Mesopotamia_Mosaic.vrt"),
   Description = [[This data was acquired using the Context Camera aboard NASA's Mars Reconnaissance Orbiter spacecraft (MRO). MRO was launched on August 12, 2005 and arrived at Mars on March 10, 2006. It maintains a nearly circular orbit, completing an orbital revolution about every 112 minutes at an altitude of approximately 250 to 316 km or 155 to 196 miles. MRO carries a sophisticated suite of instruments used to analyze and map the landforms, stratigraphy, minerals, and ice of Mars.
 
 The Context Camera (CTX) provides black-and-white images with resolutions up to 6 meters/pixel. It provides broader context maps for the higher resolution but narrower fields of view of the HiRISE camera, as well as for other instruments aboard MRO, and is useful for producing mosaicked images of larger areas on Mars' surface.]]
@@ -248,7 +248,7 @@ The Context Camera (CTX) provides black-and-white images with resolutions up to
 local treks_Huygens_CTX_BlockAdj_dd = {
   Identifier = "Huygens_CTX_BlockAdj_dd",
   Name = [[MRO CTX, Huygens Crater Mosaic]],
-  FilePath = asset.localResource("MRO_CTX/Huygens_Crater_Mosaic.vrt"),
+  FilePath = asset.resource("MRO_CTX/Huygens_Crater_Mosaic.vrt"),
   Description = [[This data was acquired using the Context Camera aboard NASA's Mars Reconnaissance Orbiter spacecraft (MRO). MRO was launched on August 12, 2005 and arrived at Mars on March 10, 2006. It maintains a nearly circular orbit, completing an orbital revolution about every 112 minutes at an altitude of approximately 250 to 316 km or 155 to 196 miles. MRO carries a sophisticated suite of instruments used to analyze and map the landforms, stratigraphy, minerals, and ice of Mars.
 
 The Context Camera (CTX) provides black-and-white images with resolutions up to 6 meters/pixel. It provides broader context maps for the higher resolution but narrower fields of view of the HiRISE camera, as well as for other instruments aboard MRO, and is useful for producing mosaicked images of larger areas on Mars' surface.]]
@@ -257,7 +257,7 @@ The Context Camera (CTX) provides black-and-white images with resolutions up to
 local treks_Hypanis_Delta_CTX_BlockAdj_dd = {
   Identifier = "Hypanis_Delta_CTX_BlockAdj_dd",
   Name = [[MRO CTX, Hypanis Delta Mosaic]],
-  FilePath = asset.localResource("MRO_CTX/Hypanis_Delta_Mosaic.vrt"),
+  FilePath = asset.resource("MRO_CTX/Hypanis_Delta_Mosaic.vrt"),
   Description = [[This data was acquired using the Context Camera aboard NASA's Mars Reconnaissance Orbiter spacecraft (MRO). MRO was launched on August 12, 2005 and arrived at Mars on March 10, 2006. It maintains a nearly circular orbit, completing an orbital revolution about every 112 minutes at an altitude of approximately 250 to 316 km or 155 to 196 miles. MRO carries a sophisticated suite of instruments used to analyze and map the landforms, stratigraphy, minerals, and ice of Mars.
 
 The Context Camera (CTX) provides black-and-white images with resolutions up to 6 meters/pixel. It provides broader context maps for the higher resolution but narrower fields of view of the HiRISE camera, as well as for other instruments aboard MRO, and is useful for producing mosaicked images of larger areas on Mars' surface.]]
@@ -266,7 +266,7 @@ The Context Camera (CTX) provides black-and-white images with resolutions up to
 local treks_Ismenius_Cavus_CTX_BlockAdj_dd = {
   Identifier = "Ismenius_Cavus_CTX_BlockAdj_dd",
   Name = [[MRO CTX, Ismenius Cavus Mosaic]],
-  FilePath = asset.localResource("MRO_CTX/Ismenius_Cavus_Mosaic.vrt"),
+  FilePath = asset.resource("MRO_CTX/Ismenius_Cavus_Mosaic.vrt"),
   Description = [[This data was acquired using the Context Camera aboard NASA's Mars Reconnaissance Orbiter spacecraft (MRO). MRO was launched on August 12, 2005 and arrived at Mars on March 10, 2006. It maintains a nearly circular orbit, completing an orbital revolution about every 112 minutes at an altitude of approximately 250 to 316 km or 155 to 196 miles. MRO carries a sophisticated suite of instruments used to analyze and map the landforms, stratigraphy, minerals, and ice of Mars.
 
 The Context Camera (CTX) provides black-and-white images with resolutions up to 6 meters/pixel. It provides broader context maps for the higher resolution but narrower fields of view of the HiRISE camera, as well as for other instruments aboard MRO, and is useful for producing mosaicked images of larger areas on Mars' surface.]]
@@ -275,7 +275,7 @@ The Context Camera (CTX) provides black-and-white images with resolutions up to
 local treks_Jezero_CTX_BlockAdj_dd = {
   Identifier = "Jezero_CTX_BlockAdj_dd",
   Name = [[MRO CTX, Jezero Mosaic, Preliminary]],
-  FilePath = asset.localResource("MRO_CTX/Jezero_Mosaic.vrt"),
+  FilePath = asset.resource("MRO_CTX/Jezero_Mosaic.vrt"),
   Description = [[This data was acquired using the Context Camera aboard NASA's Mars Reconnaissance Orbiter spacecraft (MRO). MRO was launched on August 12, 2005 and arrived at Mars on March 10, 2006. It maintains a nearly circular orbit, completing an orbital revolution about every 112 minutes at an altitude of approximately 250 to 316 km or 155 to 196 miles. MRO carries a sophisticated suite of instruments used to analyze and map the landforms, stratigraphy, minerals, and ice of Mars.
 
 The Context Camera (CTX) provides black-and-white images with resolutions up to 6 meters/pixel. It provides broader context maps for the higher resolution but narrower fields of view of the HiRISE camera, as well as for other instruments aboard MRO, and is useful for producing mosaicked images of larger areas on Mars' surface.]]
@@ -284,7 +284,7 @@ The Context Camera (CTX) provides black-and-white images with resolutions up to
 local treks_Kasei_Valles_CTX_BlockAdj_dd = {
   Identifier = "Kasei_Valles_CTX_BlockAdj_dd",
   Name = [[MRO CTX, Kasei Valles Mosaic]],
-  FilePath = asset.localResource("MRO_CTX/Kasei_Valles_Mosaic.vrt"),
+  FilePath = asset.resource("MRO_CTX/Kasei_Valles_Mosaic.vrt"),
   Description = [[This data was acquired using the Context Camera aboard NASA's Mars Reconnaissance Orbiter spacecraft (MRO). MRO was launched on August 12, 2005 and arrived at Mars on March 10, 2006. It maintains a nearly circular orbit, completing an orbital revolution about every 112 minutes at an altitude of approximately 250 to 316 km or 155 to 196 miles. MRO carries a sophisticated suite of instruments used to analyze and map the landforms, stratigraphy, minerals, and ice of Mars.
 
 The Context Camera (CTX) provides black-and-white images with resolutions up to 6 meters/pixel. It provides broader context maps for the higher resolution but narrower fields of view of the HiRISE camera, as well as for other instruments aboard MRO, and is useful for producing mosaicked images of larger areas on Mars' surface.]]
@@ -293,7 +293,7 @@ The Context Camera (CTX) provides black-and-white images with resolutions up to
 local treks_Mawrth_Valles_CTX_BlockAdj_dd = {
   Identifier = "Mawrth_Valles_CTX_BlockAdj_dd",
   Name = [[MRO CTX, Mawrth Vallis Mosaic]],
-  FilePath = asset.localResource("MRO_CTX/Mawrth_Vallis_Mosaic.vrt"),
+  FilePath = asset.resource("MRO_CTX/Mawrth_Vallis_Mosaic.vrt"),
   Description = [[This data was acquired using the Context Camera aboard NASA's Mars Reconnaissance Orbiter spacecraft (MRO). MRO was launched on August 12, 2005 and arrived at Mars on March 10, 2006. It maintains a nearly circular orbit, completing an orbital revolution about every 112 minutes at an altitude of approximately 250 to 316 km or 155 to 196 miles. MRO carries a sophisticated suite of instruments used to analyze and map the landforms, stratigraphy, minerals, and ice of Mars.
 
 The Context Camera (CTX) provides black-and-white images with resolutions up to 6 meters/pixel. It provides broader context maps for the higher resolution but narrower fields of view of the HiRISE camera, as well as for other instruments aboard MRO, and is useful for producing mosaicked images of larger areas on Mars' surface.]]
@@ -302,7 +302,7 @@ The Context Camera (CTX) provides black-and-white images with resolutions up to
 local treks_McLaughlin_Crater_CTX_BlockAdj_dd = {
   Identifier = "McLaughlin_Crater_CTX_BlockAdj_dd",
   Name = [[MRO CTX, McLaughlin Crater Mosaic]],
-  FilePath = asset.localResource("MRO_CTX/McLaughlin_Crater_Mosaic.vrt"),
+  FilePath = asset.resource("MRO_CTX/McLaughlin_Crater_Mosaic.vrt"),
   Description = [[This data was acquired using the Context Camera aboard NASA's Mars Reconnaissance Orbiter spacecraft (MRO). MRO was launched on August 12, 2005 and arrived at Mars on March 10, 2006. It maintains a nearly circular orbit, completing an orbital revolution about every 112 minutes at an altitude of approximately 250 to 316 km or 155 to 196 miles. MRO carries a sophisticated suite of instruments used to analyze and map the landforms, stratigraphy, minerals, and ice of Mars.
 
 The Context Camera (CTX) provides black-and-white images with resolutions up to 6 meters/pixel. It provides broader context maps for the higher resolution but narrower fields of view of the HiRISE camera, as well as for other instruments aboard MRO, and is useful for producing mosaicked images of larger areas on Mars' surface.]]
@@ -311,7 +311,7 @@ The Context Camera (CTX) provides black-and-white images with resolutions up to
 local treks_S_Meridiani_Sinus_Planium_CTX_BlockAdj_dd = {
   Identifier = "S_Meridiani_Sinus_Planium_CTX_BlockAdj_dd",
   Name = [[MRO CTX, Meridiani Planum - Sinus Meridiani Mosaic]],
-  FilePath = asset.localResource("MRO_CTX/Meridiani_Planum_-_Sinus_Meridiani_Mosaic.vrt"),
+  FilePath = asset.resource("MRO_CTX/Meridiani_Planum_-_Sinus_Meridiani_Mosaic.vrt"),
   Description = [[This data was acquired using the Context Camera aboard NASA's Mars Reconnaissance Orbiter spacecraft (MRO). MRO was launched on August 12, 2005 and arrived at Mars on March 10, 2006. It maintains a nearly circular orbit, completing an orbital revolution about every 112 minutes at an altitude of approximately 250 to 316 km or 155 to 196 miles. MRO carries a sophisticated suite of instruments used to analyze and map the landforms, stratigraphy, minerals, and ice of Mars.
 
 The Context Camera (CTX) provides black-and-white images with resolutions up to 6 meters/pixel. It provides broader context maps for the higher resolution but narrower fields of view of the HiRISE camera, as well as for other instruments aboard MRO, and is useful for producing mosaicked images of larger areas on Mars' surface.]]
@@ -320,7 +320,7 @@ The Context Camera (CTX) provides black-and-white images with resolutions up to
 local treks_CTX_beta01_uncontrolled_5m_Caltech = {
   Identifier = "CTX_beta01_uncontrolled_5m_Caltech",
   Name = [[MRO CTX, Mosaic Global Uncontrolled (Caltech)]],
-  FilePath = asset.localResource("MRO_CTX/Mosaic_Global_Uncontrolled_Caltech.vrt"),
+  FilePath = asset.resource("MRO_CTX/Mosaic_Global_Uncontrolled_Caltech.vrt"),
   Description = [[This is a preliminary uncontrolled Context Camera (CTX) mosaic, called beta01, that the Murray Lab at Caltech has created to (1) generate a list of orbits that will be included in the final mosaic, (2) decipher challenges involved with generating a product of this unprecedented scale, and (3) solicit feedback from the Mars science community for how best to generate the mosaic in a way that helps as diverse a group of scientists as possible. The CTX camera, as managed by Malin Space Science Systems (MSSS), has attained near global coverage of Mars at the scale of ~5 m/pixel. All data used in the construction of this CTX global mosaic have been publicly released and are freely available via the NASA Planetary Data System. The Murray Lab/Caltech grants free use of the beta01 version of the mosaic for all purposes. When used, data credit should be: NASA/JPL/MSSS/The Caltech Murray Lab/Esri. This tiled web service, as hosted by Esri, is made available using lossy Jpeg compression at an 8 bit data range.
 
 To access Esri's Tiled Web Service for this mosaic, go to https://usgs.maps.arcgis.com/home/item.html?id=b164957a19544f55a8d6a001c952a590. To download the data, go to  http://murray-lab.caltech.edu/CTX/.
@@ -332,14 +332,14 @@ Credit: NASA/JPL/MSSS/The Caltech Murray Lab/Esri]]
 local treks_InSightCTXMosaic_112917 = {
   Identifier = "InSightCTXMosaic_112917",
   Name = [[MRO CTX, Mosaic InSight]],
-  FilePath = asset.localResource("MRO_CTX/Mosaic_InSight.vrt"),
+  FilePath = asset.resource("MRO_CTX/Mosaic_InSight.vrt"),
   Description = [[This is a 5m/px CTX orthophoto mosaic of the InSight Landing Site.  After being transformed using a spline transformation, each image had the exterior 100m of pixels removed and was detrended by fitting a third order polynomial and subtracting it from each image. All of the detrended images were then mosaiced into a single image and color balanced using Distributed Gradient-Domain processing.]]
 }
 
 local treks_olympus_monseq = {
   Identifier = "olympus_monseq",
   Name = [[MRO CTX, Mosaic Olympus Mons]],
-  FilePath = asset.localResource("MRO_CTX/Mosaic_Olympus_Mons.vrt"),
+  FilePath = asset.resource("MRO_CTX/Mosaic_Olympus_Mons.vrt"),
   Description = [[This is a beta section of a CTX global mosaic produced by Jay Dickson. It was created by map projecting CT
 X images with ISIS3, and color balancing/stitching the images with Adobe Photoshop. A footprint layer shows the seams
  of image boundaries.
@@ -350,7 +350,7 @@ Dickson et al. 2018 LPSC programs with abstracts https://www.hou.usra.edu/meetin
 local treks_Newton_Crater_CTX_BlockAdj_dd = {
   Identifier = "Newton_Crater_CTX_BlockAdj_dd",
   Name = [[MRO CTX, Newton Crater Mosaic]],
-  FilePath = asset.localResource("MRO_CTX/Newton_Crater_Mosaic.vrt"),
+  FilePath = asset.resource("MRO_CTX/Newton_Crater_Mosaic.vrt"),
   Description = [[This data was acquired using the Context Camera aboard NASA's Mars Reconnaissance Orbiter spacecraft (MRO). MRO was launched on August 12, 2005 and arrived at Mars on March 10, 2006. It maintains a nearly circular orbit, completing an orbital revolution about every 112 minutes at an altitude of approximately 250 to 316 km or 155 to 196 miles. MRO carries a sophisticated suite of instruments used to analyze and map the landforms, stratigraphy, minerals, and ice of Mars.
 
 The Context Camera (CTX) provides black-and-white images with resolutions up to 6 meters/pixel. It provides broader context maps for the higher resolution but narrower fields of view of the HiRISE camera, as well as for other instruments aboard MRO, and is useful for producing mosaicked images of larger areas on Mars' surface.]]
@@ -359,7 +359,7 @@ The Context Camera (CTX) provides black-and-white images with resolutions up to
 local treks_Noactis_Landing_CTX_BlockAdj_dd = {
   Identifier = "Noactis_Landing_CTX_BlockAdj_dd",
   Name = [[MRO CTX, Noctis Landing Mosaic]],
-  FilePath = asset.localResource("MRO_CTX/Noctis_Landing_Mosaic.vrt"),
+  FilePath = asset.resource("MRO_CTX/Noctis_Landing_Mosaic.vrt"),
   Description = [[This data was acquired using the Context Camera aboard NASA's Mars Reconnaissance Orbiter spacecraft (MRO). MRO was launched on August 12, 2005 and arrived at Mars on March 10, 2006. It maintains a nearly circular orbit, completing an orbital revolution about every 112 minutes at an altitude of approximately 250 to 316 km or 155 to 196 miles. MRO carries a sophisticated suite of instruments used to analyze and map the landforms, stratigraphy, minerals, and ice of Mars.
 
 The Context Camera (CTX) provides black-and-white images with resolutions up to 6 meters/pixel. It provides broader context maps for the higher resolution but narrower fields of view of the HiRISE camera, as well as for other instruments aboard MRO, and is useful for producing mosaicked images of larger areas on Mars' surface.]]
@@ -368,7 +368,7 @@ The Context Camera (CTX) provides black-and-white images with resolutions up to
 local treks_Protonilus_CTX_BlockAdj_dd = {
   Identifier = "Protonilus_CTX_BlockAdj_dd",
   Name = [[MRO CTX, Protonilus Mensae Mosaic]],
-  FilePath = asset.localResource("MRO_CTX/Protonilus_Mensae_Mosaic.vrt"),
+  FilePath = asset.resource("MRO_CTX/Protonilus_Mensae_Mosaic.vrt"),
   Description = [[This data was acquired using the Context Camera aboard NASA's Mars Reconnaissance Orbiter spacecraft (MRO). MRO was launched on August 12, 2005 and arrived at Mars on March 10, 2006. It maintains a nearly circular orbit, completing an orbital revolution about every 112 minutes at an altitude of approximately 250 to 316 km or 155 to 196 miles. MRO carries a sophisticated suite of instruments used to analyze and map the landforms, stratigraphy, minerals, and ice of Mars.
 
 The Context Camera (CTX) provides black-and-white images with resolutions up to 6 meters/pixel. It provides broader context maps for the higher resolution but narrower fields of view of the HiRISE camera, as well as for other instruments aboard MRO, and is useful for producing mosaicked images of larger areas on Mars' surface.]]
@@ -377,7 +377,7 @@ The Context Camera (CTX) provides black-and-white images with resolutions up to
 local treks_S_Nectaris_Fossae_CTX_BlockAdj_dd = {
   Identifier = "S_Nectaris_Fossae_CTX_BlockAdj_dd",
   Name = [[MRO CTX, Southern Nectaris Fossae Mosaic]],
-  FilePath = asset.localResource("MRO_CTX/Southern_Nectaris_Fossae_Mosaic.vrt"),
+  FilePath = asset.resource("MRO_CTX/Southern_Nectaris_Fossae_Mosaic.vrt"),
   Description = [[This data was acquired using the Context Camera aboard NASA's Mars Reconnaissance Orbiter spacecraft (MRO). MRO was launched on August 12, 2005 and arrived at Mars on March 10, 2006. It maintains a nearly circular orbit, completing an orbital revolution about every 112 minutes at an altitude of approximately 250 to 316 km or 155 to 196 miles. MRO carries a sophisticated suite of instruments used to analyze and map the landforms, stratigraphy, minerals, and ice of Mars.
 
 The Context Camera (CTX) provides black-and-white images with resolutions up to 6 meters/pixel. It provides broader context maps for the higher resolution but narrower fields of view of the HiRISE camera, as well as for other instruments aboard MRO, and is useful for producing mosaicked images of larger areas on Mars' surface.]]
@@ -386,7 +386,7 @@ The Context Camera (CTX) provides black-and-white images with resolutions up to
 local treks_DEM_1m_VictoriaCrater = {
   Identifier = "DEM_1m_VictoriaCrater",
   Name = [[MRO CTX, Victoria Crater DEM]],
-  FilePath = asset.localResource("MRO_CTX/Victoria_Crater_DEM.vrt"),
+  FilePath = asset.resource("MRO_CTX/Victoria_Crater_DEM.vrt"),
   Description = [[This data was acquired using the Context Camera aboard NASA's Mars Reconnaissance Orbiter spacecraft (MRO). MRO was launched on August 12, 2005 and arrived at Mars on March 10, 2006. It maintains a nearly circular orbit, completing an orbital revolution about every 112 minutes at an altitude of approximately 250 to 316 km or 155 to 196 miles. MRO carries a sophisticated suite of instruments used to analyze and map the landforms, stratigraphy, minerals, and ice of Mars.
 
 The Context Camera (CTX) provides black-and-white images with resolutions up to 6 meters/pixel. It provides broader context maps for the higher resolution but narrower fields of view of the HiRISE camera, as well as for other instruments aboard MRO, and is useful for producing mosaicked images of larger areas on Mars' surface.]]
@@ -395,7 +395,7 @@ The Context Camera (CTX) provides black-and-white images with resolutions up to
 local treks_Viking_CTX_BlockAdj_dd = {
   Identifier = "Viking_CTX_BlockAdj_dd",
   Name = [[MRO CTX, Viking 1 Landing Site Mosaic]],
-  FilePath = asset.localResource("MRO_CTX/Viking_1_Landing_Site_Mosaic.vrt"),
+  FilePath = asset.resource("MRO_CTX/Viking_1_Landing_Site_Mosaic.vrt"),
   Description = [[This data was acquired using the Context Camera aboard NASA's Mars Reconnaissance Orbiter spacecraft (MRO). MRO was launched on August 12, 2005 and arrived at Mars on March 10, 2006. It maintains a nearly circular orbit, completing an orbital revolution about every 112 minutes at an altitude of approximately 250 to 316 km or 155 to 196 miles. MRO carries a sophisticated suite of instruments used to analyze and map the landforms, stratigraphy, minerals, and ice of Mars.
 
 The Context Camera (CTX) provides black-and-white images with resolutions up to 6 meters/pixel. It provides broader context maps for the higher resolution but narrower fields of view of the HiRISE camera, as well as for other instruments aboard MRO, and is useful for producing mosaicked images of larger areas on Mars' surface.]]
@@ -404,7 +404,7 @@ The Context Camera (CTX) provides black-and-white images with resolutions up to
 local treks_b16_015887_2280_xn_48n225w = {
   Identifier = "b16_015887_2280_xn_48n225w",
   Name = [[MRO CTX, Viking 2 Landing Site Mosaic]],
-  FilePath = asset.localResource("MRO_CTX/Viking_2_Landing_Site_Mosaic.vrt"),
+  FilePath = asset.resource("MRO_CTX/Viking_2_Landing_Site_Mosaic.vrt"),
   Description = [[This data was acquired using the Context Camera aboard NASA's Mars Reconnaissance Orbiter spacecraft (MRO). MRO was launched on August 12, 2005 and arrived at Mars on March 10, 2006. It maintains a nearly circular orbit, completing an orbital revolution about every 112 minutes at an altitude of approximately 250 to 316 km or 155 to 196 miles. MRO carries a sophisticated suite of instruments used to analyze and map the landforms, stratigraphy, minerals, and ice of Mars.
 
 The Context Camera (CTX) provides black-and-white images with resolutions up to 6 meters/pixel. It provides broader context maps for the higher resolution but narrower fields of view of the HiRISE camera, as well as for other instruments aboard MRO, and is useful for producing mosaicked images of larger areas on Mars' surface.]]
@@ -413,7 +413,7 @@ The Context Camera (CTX) provides black-and-white images with resolutions up to
 local treks_West_Candor_Chasma_longlat = {
   Identifier = "West_Candor_Chasma_longlat",
   Name = [[MRO CTX, West Candor Chasma Mosaic]],
-  FilePath = asset.localResource("MRO_CTX/West_Candor_Chasma_Mosaic.vrt"),
+  FilePath = asset.resource("MRO_CTX/West_Candor_Chasma_Mosaic.vrt"),
   Description = [[This data was acquired using the Context Camera aboard NASA's Mars Reconnaissance Orbiter spacecraft (MRO). MRO was launched on August 12, 2005 and arrived at Mars on March 10, 2006. It maintains a nearly circular orbit, completing an orbital revolution about every 112 minutes at an altitude of approximately 250 to 316 km or 155 to 196 miles. MRO carries a sophisticated suite of instruments used to analyze and map the landforms, stratigraphy, minerals, and ice of Mars.
 
 The Context Camera (CTX) provides black-and-white images with resolutions up to 6 meters/pixel. It provides broader context maps for the higher resolution but narrower fields of view of the HiRISE camera, as well as for other instruments aboard MRO, and is useful for producing mosaicked images of larger areas on Mars' surface.]]
@@ -422,7 +422,7 @@ The Context Camera (CTX) provides black-and-white images with resolutions up to
 local treks_West_Candor_Chasma_DEM_longlat = {
   Identifier = "West_Candor_Chasma_DEM_longlat",
   Name = [[MRO CTX, West Candor DEM]],
-  FilePath = asset.localResource("MRO_CTX/West_Candor_DEM.vrt"),
+  FilePath = asset.resource("MRO_CTX/West_Candor_DEM.vrt"),
   Description = [[This data was acquired using the Context Camera aboard NASA's Mars Reconnaissance Orbiter spacecraft (MRO). MRO was launched on August 12, 2005 and arrived at Mars on March 10, 2006. It maintains a nearly circular orbit, completing an orbital revolution about every 112 minutes at an altitude of approximately 250 to 316 km or 155 to 196 miles. MRO carries a sophisticated suite of instruments used to analyze and map the landforms, stratigraphy, minerals, and ice of Mars.
 
 The Context Camera (CTX) provides black-and-white images with resolutions up to 6 meters/pixel. It provides broader context maps for the higher resolution but narrower fields of view of the HiRISE camera, as well as for other instruments aboard MRO, and is useful for producing mosaicked images of larger areas on Mars' surface.]]
@@ -431,7 +431,7 @@ The Context Camera (CTX) provides black-and-white images with resolutions up to
 local treks_Noachis_CTX_BlockAdj_dd = {
   Identifier = "Noachis_CTX_BlockAdj_dd",
   Name = [[MRO CTX, Western Noachis Terra Mosaic]],
-  FilePath = asset.localResource("MRO_CTX/Western_Noachis_Terra_Mosaic.vrt"),
+  FilePath = asset.resource("MRO_CTX/Western_Noachis_Terra_Mosaic.vrt"),
   Description = [[This data was acquired using the Context Camera aboard NASA's Mars Reconnaissance Orbiter spacecraft (MRO). MRO was launched on August 12, 2005 and arrived at Mars on March 10, 2006. It maintains a nearly circular orbit, completing an orbital revolution about every 112 minutes at an altitude of approximately 250 to 316 km or 155 to 196 miles. MRO carries a sophisticated suite of instruments used to analyze and map the landforms, stratigraphy, minerals, and ice of Mars.
 
 The Context Camera (CTX) provides black-and-white images with resolutions up to 6 meters/pixel. It provides broader context maps for the higher resolution but narrower fields of view of the HiRISE camera, as well as for other instruments aboard MRO, and is useful for producing mosaicked images of larger areas on Mars' surface.]]
@@ -440,7 +440,7 @@ The Context Camera (CTX) provides black-and-white images with resolutions up to
 local treks_Zephyria_CTX_BlockAdj_dd = {
   Identifier = "Zephyria_CTX_BlockAdj_dd",
   Name = [[MRO CTX, Zephyria Planum Mosaic]],
-  FilePath = asset.localResource("MRO_CTX/Zephyria_Planum_Mosaic.vrt"),
+  FilePath = asset.resource("MRO_CTX/Zephyria_Planum_Mosaic.vrt"),
   Description = [[This data was acquired using the Context Camera aboard NASA's Mars Reconnaissance Orbiter spacecraft (MRO). MRO was launched on August 12, 2005 and arrived at Mars on March 10, 2006. It maintains a nearly circular orbit, completing an orbital revolution about every 112 minutes at an altitude of approximately 250 to 316 km or 155 to 196 miles. MRO carries a sophisticated suite of instruments used to analyze and map the landforms, stratigraphy, minerals, and ice of Mars.
 
 The Context Camera (CTX) provides black-and-white images with resolutions up to 6 meters/pixel. It provides broader context maps for the higher resolution but narrower fields of view of the HiRISE camera, as well as for other instruments aboard MRO, and is useful for producing mosaicked images of larger areas on Mars' surface.]]
diff --git a/data/assets/scene/solarsystem/planets/mars/layers/nasa-treks/MRO_HiRISE.asset b/data/assets/scene/solarsystem/planets/mars/layers/nasa-treks/MRO_HiRISE.asset
index cbb6529f34..469d7d5e58 100644
--- a/data/assets/scene/solarsystem/planets/mars/layers/nasa-treks/MRO_HiRISE.asset
+++ b/data/assets/scene/solarsystem/planets/mars/layers/nasa-treks/MRO_HiRISE.asset
@@ -9,7 +9,7 @@ local globeIdentifier = asset.require("scene/solarsystem//planets/mars/mars").Ma
 local treks_DTEEC_001918_1735_001984_1735_U01_longlat = {
   Identifier = "DTEEC_001918_1735_001984_1735_U01_longlat",
   Name = [[MRO HiRISE, 001918_1735_001984_1735 DEM]],
-  FilePath = asset.localResource("MRO_HiRISE/001918_1735_001984_1735_DEM.vrt"),
+  FilePath = asset.resource("MRO_HiRISE/001918_1735_001984_1735_DEM.vrt"),
   Description = [[This data was acquired using the High Resolution Imaging Science Experiment camera aboard NASA's Mars Reconnaissance Orbiter spacecraft (MRO). MRO was launched on August 12, 2005 and arrived at Mars on March 10, 2006. It maintains a nearly circular orbit, completing an orbital revolution about every 112 minutes at an altitude of approximately 250 to 316 km or 155 to 196 miles. MRO carries a sophisticated suite of instruments used to analyze and map the landforms, stratigraphy, minerals, and ice of Mars.
 
 The High Resolution Imaging Science Experiment (HiRISE) camera utilizes a 0.5-meter telescope to obtain very high resolution images of Martian landforms and terrains. From an altitude of 300 km, HiRISE has a resolution of 0.3 meters per pixel. In addition to being used for getting very detailed images of surface features, pairs of slightly offset HiRISE images are combined to produce precise digital elevation models of Martian topography.]]
@@ -18,7 +18,7 @@ The High Resolution Imaging Science Experiment (HiRISE) camera utilizes a 0.5-me
 local treks_DTEED_042014_1760_042647_1760_A01 = {
   Identifier = "DTEED_042014_1760_042647_1760_A01",
   Name = [[MRO HiRISE, 042014_1760_042647_1760 DEM]],
-  FilePath = asset.localResource("MRO_HiRISE/042014_1760_042647_1760_DEM.vrt"),
+  FilePath = asset.resource("MRO_HiRISE/042014_1760_042647_1760_DEM.vrt"),
   Description = [[This data was acquired using the High Resolution Imaging Science Experiment camera aboard NASA's Mars Reconnaissance Orbiter spacecraft (MRO). MRO was launched on August 12, 2005 and arrived at Mars on March 10, 2006. It maintains a nearly circular orbit, completing an orbital revolution about every 112 minutes at an altitude of approximately 250 to 316 km or 155 to 196 miles. MRO carries a sophisticated suite of instruments used to analyze and map the landforms, stratigraphy, minerals, and ice of Mars.
 
 The High Resolution Imaging Science Experiment (HiRISE) camera utilizes a 0.5-meter telescope to obtain very high resolution images of Martian landforms and terrains. From an altitude of 300 km, HiRISE has a resolution of 0.3 meters per pixel. In addition to being used for getting very detailed images of surface features, pairs of slightly offset HiRISE images are combined to produce precise digital elevation models of Martian topography.]]
@@ -27,7 +27,7 @@ The High Resolution Imaging Science Experiment (HiRISE) camera utilizes a 0.5-me
 local treks_DTEED_042753_1930_042252_1930_A01 = {
   Identifier = "DTEED_042753_1930_042252_1930_A01",
   Name = [[MRO HiRISE, 042753_1930_042252_1930 DEM]],
-  FilePath = asset.localResource("MRO_HiRISE/042753_1930_042252_1930_DEM.vrt"),
+  FilePath = asset.resource("MRO_HiRISE/042753_1930_042252_1930_DEM.vrt"),
   Description = [[This data was acquired using the High Resolution Imaging Science Experiment camera aboard NASA's Mars Reconnaissance Orbiter spacecraft (MRO). MRO was launched on August 12, 2005 and arrived at Mars on March 10, 2006. It maintains a nearly circular orbit, completing an orbital revolution about every 112 minutes at an altitude of approximately 250 to 316 km or 155 to 196 miles. MRO carries a sophisticated suite of instruments used to analyze and map the landforms, stratigraphy, minerals, and ice of Mars.
 
 The High Resolution Imaging Science Experiment (HiRISE) camera utilizes a 0.5-meter telescope to obtain very high resolution images of Martian landforms and terrains. From an altitude of 300 km, HiRISE has a resolution of 0.3 meters per pixel. In addition to being used for getting very detailed images of surface features, pairs of slightly offset HiRISE images are combined to produce precise digital elevation models of Martian topography.]]
@@ -36,7 +36,7 @@ The High Resolution Imaging Science Experiment (HiRISE) camera utilizes a 0.5-me
 local treks_h1183_0000_da4 = {
   Identifier = "h1183_0000_da4",
   Name = [[MRO HiRISE, 1183_0000 DEM]],
-  FilePath = asset.localResource("MRO_HiRISE/1183_0000_DEM.vrt"),
+  FilePath = asset.resource("MRO_HiRISE/1183_0000_DEM.vrt"),
   Description = [[This data was acquired using the High Resolution Imaging Science Experiment camera aboard NASA's Mars Reconnaissance Orbiter spacecraft (MRO). MRO was launched on August 12, 2005 and arrived at Mars on March 10, 2006. It maintains a nearly circular orbit, completing an orbital revolution about every 112 minutes at an altitude of approximately 250 to 316 km or 155 to 196 miles. MRO carries a sophisticated suite of instruments used to analyze and map the landforms, stratigraphy, minerals, and ice of Mars.
 
 The High Resolution Imaging Science Experiment (HiRISE) camera utilizes a 0.5-meter telescope to obtain very high resolution images of Martian landforms and terrains. From an altitude of 300 km, HiRISE has a resolution of 0.3 meters per pixel. In addition to being used for getting very detailed images of surface features, pairs of slightly offset HiRISE images are combined to produce precise digital elevation models of Martian topography.]]
@@ -45,7 +45,7 @@ The High Resolution Imaging Science Experiment (HiRISE) camera utilizes a 0.5-me
 local treks_HiRISE_ColumbiaHills = {
   Identifier = "HiRISE_ColumbiaHills",
   Name = [[MRO HiRISE, Columbia Hills Mosaic]],
-  FilePath = asset.localResource("MRO_HiRISE/Columbia_Hills_Mosaic.vrt"),
+  FilePath = asset.resource("MRO_HiRISE/Columbia_Hills_Mosaic.vrt"),
   Description = [[This data was acquired using the High Resolution Imaging Science Experiment camera aboard NASA's Mars Reconnaissance Orbiter spacecraft (MRO). MRO was launched on August 12, 2005 and arrived at Mars on March 10, 2006. It maintains a nearly circular orbit, completing an orbital revolution about every 112 minutes at an altitude of approximately 250 to 316 km or 155 to 196 miles. MRO carries a sophisticated suite of instruments used to analyze and map the landforms, stratigraphy, minerals, and ice of Mars.
 
 The High Resolution Imaging Science Experiment (HiRISE) camera utilizes a 0.5-meter telescope to obtain very high resolution images of Martian landforms and terrains. From an altitude of 300 km, HiRISE has a resolution of 0.3 meters per pixel. In addition to being used for getting very detailed images of surface features, pairs of slightly offset HiRISE images are combined to produce precise digital elevation models of Martian topography.]]
@@ -54,7 +54,7 @@ The High Resolution Imaging Science Experiment (HiRISE) camera utilizes a 0.5-me
 local treks_curiosity_hirise_mosaic = {
   Identifier = "curiosity_hirise_mosaic",
   Name = [[MRO HiRISE, Curiosity Roving Site Mosaic]],
-  FilePath = asset.localResource("MRO_HiRISE/Curiosity_Roving_Site_Mosaic.vrt"),
+  FilePath = asset.resource("MRO_HiRISE/Curiosity_Roving_Site_Mosaic.vrt"),
   Description = [[This data was acquired using the High Resolution Imaging Science Experiment camera aboard NASA's Mars Reconnaissance Orbiter spacecraft (MRO). MRO was launched on August 12, 2005 and arrived at Mars on March 10, 2006. It maintains a nearly circular orbit, completing an orbital revolution about every 112 minutes at an altitude of approximately 250 to 316 km or 155 to 196 miles. MRO carries a sophisticated suite of instruments used to analyze and map the landforms, stratigraphy, minerals, and ice of Mars.
 
 The High Resolution Imaging Science Experiment (HiRISE) camera utilizes a 0.5-meter telescope to obtain very high resolution images of Martian landforms and terrains. From an altitude of 300 km, HiRISE has a resolution of 0.3 meters per pixel. In addition to being used for getting very detailed images of surface features, pairs of slightly offset HiRISE images are combined to produce precise digital elevation models of Martian topography.]]
@@ -63,7 +63,7 @@ The High Resolution Imaging Science Experiment (HiRISE) camera utilizes a 0.5-me
 local treks_Gale_DEM_SMG_1m = {
   Identifier = "Gale_DEM_SMG_1m",
   Name = [[MRO HiRISE, Gale Crater DEM]],
-  FilePath = asset.localResource("MRO_HiRISE/Gale_Crater_DEM.vrt"),
+  FilePath = asset.resource("MRO_HiRISE/Gale_Crater_DEM.vrt"),
   Description = [[This data was acquired using the High Resolution Imaging Science Experiment camera aboard NASA's Mars Reconnaissance Orbiter spacecraft (MRO). MRO was launched on August 12, 2005 and arrived at Mars on March 10, 2006. It maintains a nearly circular orbit, completing an orbital revolution about every 112 minutes at an altitude of approximately 250 to 316 km or 155 to 196 miles. MRO carries a sophisticated suite of instruments used to analyze and map the landforms, stratigraphy, minerals, and ice of Mars.
 
 The High Resolution Imaging Science Experiment (HiRISE) camera utilizes a 0.5-meter telescope to obtain very high resolution images of Martian landforms and terrains. From an altitude of 300 km, HiRISE has a resolution of 0.3 meters per pixel. In addition to being used for getting very detailed images of surface features, pairs of slightly offset HiRISE images are combined to produce precise digital elevation models of Martian topography.]]
@@ -72,7 +72,7 @@ The High Resolution Imaging Science Experiment (HiRISE) camera utilizes a 0.5-me
 local treks_ESP_042252_1930_RED_B_01_ORTHO = {
   Identifier = "ESP_042252_1930_RED_B_01_ORTHO",
   Name = [[MRO HiRISE, Marth Crater West Rim Mosaic]],
-  FilePath = asset.localResource("MRO_HiRISE/Marth_Crater_West_Rim_Mosaic.vrt"),
+  FilePath = asset.resource("MRO_HiRISE/Marth_Crater_West_Rim_Mosaic.vrt"),
   Description = [[This data was acquired using the High Resolution Imaging Science Experiment camera aboard NASA's Mars Reconnaissance Orbiter spacecraft (MRO). MRO was launched on August 12, 2005 and arrived at Mars on March 10, 2006. It maintains a nearly circular orbit, completing an orbital revolution about every 112 minutes at an altitude of approximately 250 to 316 km or 155 to 196 miles. MRO carries a sophisticated suite of instruments used to analyze and map the landforms, stratigraphy, minerals, and ice of Mars.
 
 The High Resolution Imaging Science Experiment (HiRISE) camera utilizes a 0.5-meter telescope to obtain very high resolution images of Martian landforms and terrains. From an altitude of 300 km, HiRISE has a resolution of 0.3 meters per pixel. In addition to being used for getting very detailed images of surface features, pairs of slightly offset HiRISE images are combined to produce precise digital elevation models of Martian topography.]]
@@ -81,7 +81,7 @@ The High Resolution Imaging Science Experiment (HiRISE) camera utilizes a 0.5-me
 local treks_ESP_040776_2115_RED_A_01_ORTHO = {
   Identifier = "ESP_040776_2115_RED_A_01_ORTHO",
   Name = [[MRO HiRISE, Martian Ares 3 Landing Site Mosaic]],
-  FilePath = asset.localResource("MRO_HiRISE/Martian_Ares_3_Landing_Site_Mosaic.vrt"),
+  FilePath = asset.resource("MRO_HiRISE/Martian_Ares_3_Landing_Site_Mosaic.vrt"),
   Description = [[This data was acquired using the High Resolution Imaging Science Experiment camera aboard NASA's Mars Reconnaissance Orbiter spacecraft (MRO). MRO was launched on August 12, 2005 and arrived at Mars on March 10, 2006. It maintains a nearly circular orbit, completing an orbital revolution about every 112 minutes at an altitude of approximately 250 to 316 km or 155 to 196 miles. MRO carries a sophisticated suite of instruments used to analyze and map the landforms, stratigraphy, minerals, and ice of Mars.
 
 The High Resolution Imaging Science Experiment (HiRISE) camera utilizes a 0.5-meter telescope to obtain very high resolution images of Martian landforms and terrains. From an altitude of 300 km, HiRISE has a resolution of 0.3 meters per pixel. In addition to being used for getting very detailed images of surface features, pairs of slightly offset HiRISE images are combined to produce precise digital elevation models of Martian topography.]]
@@ -90,7 +90,7 @@ The High Resolution Imaging Science Experiment (HiRISE) camera utilizes a 0.5-me
 local treks_ESP_042647_1760_RED_B_01_ORTHO = {
   Identifier = "ESP_042647_1760_RED_B_01_ORTHO",
   Name = [[MRO HiRISE, Martian Ares 4 Landing Site Mosaic]],
-  FilePath = asset.localResource("MRO_HiRISE/Martian_Ares_4_Landing_Site_Mosaic.vrt"),
+  FilePath = asset.resource("MRO_HiRISE/Martian_Ares_4_Landing_Site_Mosaic.vrt"),
   Description = [[This data was acquired using the High Resolution Imaging Science Experiment camera aboard NASA's Mars Reconnaissance Orbiter spacecraft (MRO). MRO was launched on August 12, 2005 and arrived at Mars on March 10, 2006. It maintains a nearly circular orbit, completing an orbital revolution about every 112 minutes at an altitude of approximately 250 to 316 km or 155 to 196 miles. MRO carries a sophisticated suite of instruments used to analyze and map the landforms, stratigraphy, minerals, and ice of Mars.
 
 The High Resolution Imaging Science Experiment (HiRISE) camera utilizes a 0.5-meter telescope to obtain very high resolution images of Martian landforms and terrains. From an altitude of 300 km, HiRISE has a resolution of 0.3 meters per pixel. In addition to being used for getting very detailed images of surface features, pairs of slightly offset HiRISE images are combined to produce precise digital elevation models of Martian topography.]]
@@ -99,7 +99,7 @@ The High Resolution Imaging Science Experiment (HiRISE) camera utilizes a 0.5-me
 local treks_CLH_Visible_Mosaic_HiRISE_CTX_HRSC_GCS_MARS_07102018 = {
   Identifier = "CLH_Visible_Mosaic_HiRISE_CTX_HRSC_GCS_MARS_07102018",
   Name = [[MRO HiRISE, Mosaic Columbia Hills]],
-  FilePath = asset.localResource("MRO_HiRISE/Mosaic_Columbia_Hills.vrt"),
+  FilePath = asset.resource("MRO_HiRISE/Mosaic_Columbia_Hills.vrt"),
   Description = [[Preliminary visible orthoimage mosaic for Columbia Hills candidate landing site for the Mars 2020 rover.
 HRSC orthoimages and DEMs were downloaded from the Planetary Data System archives. HiRISE and CTX orthoimages and DEMs were created by the USGS Astrogeology and HiRISE teams,
 and compiled and georeferenced at JPL/Caltech by the Advanced Laboratory for Landing Site Terrain Analysis and Reconnaissance (ALLSTAR) group including Nathan Williams,
@@ -121,14 +121,14 @@ When analyzing images, please ensure that the correct projection system is being
 local treks_ESP_058005_1845_RED_spline_rect = {
   Identifier = "ESP_058005_1845_RED_spline_rect",
   Name = [[MRO HiRISE, Mosaic Insight Landing Site]],
-  FilePath = asset.localResource("MRO_HiRISE/Mosaic_Insight_Landing_Site.vrt"),
+  FilePath = asset.resource("MRO_HiRISE/Mosaic_Insight_Landing_Site.vrt"),
   Description = [[This image (ESP_058005_1845) was acquired with the Mars HiRISE Camera aboard NASA's Mars Reconnaissance Orbiter. It shows the Mars InSight lander (4.5024°, 135.62345°), heat shield (4.50834°, 135.63481°), and backshell with parachute (4.49415°, 135.62778°). The image was acquired on December 11, 2018 at 14:02 local Mars time. The image is centered at 4.495° lat and 135.623° lon. The spacecraft altitude was 271.5 km. Original image scale range is 27.9 cm/pixel (with 1 x 1 binning) so objects about 84 cm across are resolved. The emission angle was 13.7°, phase angle was 51.0°, and solar incidence angle was 39°, with the Sun about 51° above the horizon. Solar longitude was 304.3°, Northern Winter.]]
 }
 
 local treks_NES_JEZ_MID_Visible_Mosaic_HiRISE_CTX_HRSC_GCS_MARS_07102018 = {
   Identifier = "NES_JEZ_MID_Visible_Mosaic_HiRISE_CTX_HRSC_GCS_MARS_07102018",
   Name = [[MRO HiRISE, Mosaic Jezero NE Syrtis Midway]],
-  FilePath = asset.localResource("MRO_HiRISE/Mosaic_Jezero_NE_Syrtis_Midway.vrt"),
+  FilePath = asset.resource("MRO_HiRISE/Mosaic_Jezero_NE_Syrtis_Midway.vrt"),
   Description = [[Preliminary visible orthoimage mosaic for Jezero Crater, NE Syrtis, and Midway candidate landing sites for the Mars 2020 rover.
 HRSC orthoimages and DEMs were downloaded from the Planetary Data System archives. HiRISE and CTX orthoimages and DEMs were created by the USGS Astrogeology and HiRISE teams,
 and compiled and georeferenced at JPL/Caltech by the Advanced Laboratory for Landing Site Terrain Analysis and Reconnaissance (ALLSTAR) group including Nathan Williams,
@@ -150,14 +150,14 @@ When analyzing images, please ensure that the correct projection system is being
 local treks_HiRISE_Opportunity = {
   Identifier = "HiRISE_Opportunity",
   Name = [[MRO HiRISE, Mosaic Opportunity]],
-  FilePath = asset.localResource("MRO_HiRISE/Mosaic_Opportunity.vrt"),
+  FilePath = asset.resource("MRO_HiRISE/Mosaic_Opportunity.vrt"),
   Description = [[This data was acquired using the High Resolution Imaging Science Experiment camera aboard NASA's Mars Reconnaissance Orbiter spacecraft (MRO). MRO was launched on August 12, 2005 and arrived at Mars on March 10, 2006. It maintains a nearly circular orbit, completing an orbital revolution about every 112 minutes at an altitude of approximately 250 to 316 km or 155 to 196 miles. MRO carries a sophisticated suite of instruments used to analyze and map the landforms, stratigraphy, minerals, and ice of Mars. The High Resolution Imaging Science Experiment (HiRISE) camera utilizes a 0.5-meter telescope to obtain very high resolution images of Martian landforms and terrains. From an altitude of 300 km, HiRISE has a resolution of 0.3 meters per pixel. In addition to being used for getting very detailed images of surface features, pairs of slightly offset HiRISE images are combined to produce precise digital elevation models of Martian topography.]]
 }
 
 local treks_opportunity_hirise_mosaic = {
   Identifier = "opportunity_hirise_mosaic",
   Name = [[MRO HiRISE, Opportunity Roving Site Mosaic]],
-  FilePath = asset.localResource("MRO_HiRISE/Opportunity_Roving_Site_Mosaic.vrt"),
+  FilePath = asset.resource("MRO_HiRISE/Opportunity_Roving_Site_Mosaic.vrt"),
   Description = [[This data was acquired using the High Resolution Imaging Science Experiment camera aboard NASA's Mars Reconnaissance Orbiter spacecraft (MRO). MRO was launched on August 12, 2005 and arrived at Mars on March 10, 2006. It maintains a nearly circular orbit, completing an orbital revolution about every 112 minutes at an altitude of approximately 250 to 316 km or 155 to 196 miles. MRO carries a sophisticated suite of instruments used to analyze and map the landforms, stratigraphy, minerals, and ice of Mars.
 
 The High Resolution Imaging Science Experiment (HiRISE) camera utilizes a 0.5-meter telescope to obtain very high resolution images of Martian landforms and terrains. From an altitude of 300 km, HiRISE has a resolution of 0.3 meters per pixel. In addition to being used for getting very detailed images of surface features, pairs of slightly offset HiRISE images are combined to produce precise digital elevation models of Martian topography.]]
@@ -166,7 +166,7 @@ The High Resolution Imaging Science Experiment (HiRISE) camera utilizes a 0.5-me
 local treks_phoenix_hirise_mosaic = {
   Identifier = "phoenix_hirise_mosaic",
   Name = [[MRO HiRISE, Phoenix Landing Site Mosaic]],
-  FilePath = asset.localResource("MRO_HiRISE/Phoenix_Landing_Site_Mosaic.vrt"),
+  FilePath = asset.resource("MRO_HiRISE/Phoenix_Landing_Site_Mosaic.vrt"),
   Description = [[This data was acquired using the High Resolution Imaging Science Experiment camera aboard NASA's Mars Reconnaissance Orbiter spacecraft (MRO). MRO was launched on August 12, 2005 and arrived at Mars on March 10, 2006. It maintains a nearly circular orbit, completing an orbital revolution about every 112 minutes at an altitude of approximately 250 to 316 km or 155 to 196 miles. MRO carries a sophisticated suite of instruments used to analyze and map the landforms, stratigraphy, minerals, and ice of Mars.
 
 The High Resolution Imaging Science Experiment (HiRISE) camera utilizes a 0.5-meter telescope to obtain very high resolution images of Martian landforms and terrains. From an altitude of 300 km, HiRISE has a resolution of 0.3 meters per pixel. In addition to being used for getting very detailed images of surface features, pairs of slightly offset HiRISE images are combined to produce precise digital elevation models of Martian topography.]]
@@ -175,7 +175,7 @@ The High Resolution Imaging Science Experiment (HiRISE) camera utilizes a 0.5-me
 local treks_sojourner_hirise_mosaic = {
   Identifier = "sojourner_hirise_mosaic",
   Name = [[MRO HiRISE, Sojourner Roving Site Mosaic]],
-  FilePath = asset.localResource("MRO_HiRISE/Sojourner_Roving_Site_Mosaic.vrt"),
+  FilePath = asset.resource("MRO_HiRISE/Sojourner_Roving_Site_Mosaic.vrt"),
   Description = [[This data was acquired using the High Resolution Imaging Science Experiment camera aboard NASA's Mars Reconnaissance Orbiter spacecraft (MRO). MRO was launched on August 12, 2005 and arrived at Mars on March 10, 2006. It maintains a nearly circular orbit, completing an orbital revolution about every 112 minutes at an altitude of approximately 250 to 316 km or 155 to 196 miles. MRO carries a sophisticated suite of instruments used to analyze and map the landforms, stratigraphy, minerals, and ice of Mars.
 
 The High Resolution Imaging Science Experiment (HiRISE) camera utilizes a 0.5-meter telescope to obtain very high resolution images of Martian landforms and terrains. From an altitude of 300 km, HiRISE has a resolution of 0.3 meters per pixel. In addition to being used for getting very detailed images of surface features, pairs of slightly offset HiRISE images are combined to produce precise digital elevation models of Martian topography.]]
@@ -184,14 +184,14 @@ The High Resolution Imaging Science Experiment (HiRISE) camera utilizes a 0.5-me
 local treks_PSP_001918_1735_RED_A_01_ORTHO_longlat = {
   Identifier = "PSP_001918_1735_RED_A_01_ORTHO_longlat",
   Name = [[MRO HiRISE, Southwest Candor Chasma Mosaic]],
-  FilePath = asset.localResource("MRO_HiRISE/Southwest_Candor_Chasma_Mosaic.vrt"),
+  FilePath = asset.resource("MRO_HiRISE/Southwest_Candor_Chasma_Mosaic.vrt"),
   Description = [[This data was acquired using the High Resolution Imaging Science Experiment camera aboard NASA's Mars Reconnaissance Orbiter spacecraft (MRO). MRO was launched on August 12, 2005 and arrived at Mars on March 10, 2006. It maintains a nearly circular orbit, completing an orbital revolution about every 112 minutes at an altitude of approximately 250 to 316 km or 155 to 196 miles. MRO carries a sophisticated suite of instruments used to analyze and map the landforms, stratigraphy, minerals, and ice of Mars. The High Resolution Imaging Science Experiment (HiRISE) camera utilizes a 0.5-meter telescope to obtain very high resolution images of Martian landforms and terrains. From an altitude of 300 km, HiRISE has a resolution of 0.3 meters per pixel. In addition to being used for getting very detailed images of surface features, pairs of slightly offset HiRISE images are combined to produce precise digital elevation models of Martian topography.]]
 }
 
 local treks_spirit_hirise_mosaic = {
   Identifier = "spirit_hirise_mosaic",
   Name = [[MRO HiRISE, Spirit Roving Site Mosaic]],
-  FilePath = asset.localResource("MRO_HiRISE/Spirit_Roving_Site_Mosaic.vrt"),
+  FilePath = asset.resource("MRO_HiRISE/Spirit_Roving_Site_Mosaic.vrt"),
   Description = [[This data was acquired using the High Resolution Imaging Science Experiment camera aboard NASA's Mars Reconnaissance Orbiter spacecraft (MRO). MRO was launched on August 12, 2005 and arrived at Mars on March 10, 2006. It maintains a nearly circular orbit, completing an orbital revolution about every 112 minutes at an altitude of approximately 250 to 316 km or 155 to 196 miles. MRO carries a sophisticated suite of instruments used to analyze and map the landforms, stratigraphy, minerals, and ice of Mars.
 
 The High Resolution Imaging Science Experiment (HiRISE) camera utilizes a 0.5-meter telescope to obtain very high resolution images of Martian landforms and terrains. From an altitude of 300 km, HiRISE has a resolution of 0.3 meters per pixel. In addition to being used for getting very detailed images of surface features, pairs of slightly offset HiRISE images are combined to produce precise digital elevation models of Martian topography.]]
@@ -200,7 +200,7 @@ The High Resolution Imaging Science Experiment (HiRISE) camera utilizes a 0.5-me
 local treks_PSP_001521_2025_RED = {
   Identifier = "PSP_001521_2025_RED",
   Name = [[MRO HiRISE, Viking 1 Landing Site Mosaic]],
-  FilePath = asset.localResource("MRO_HiRISE/Viking_1_Landing_Site_Mosaic.vrt"),
+  FilePath = asset.resource("MRO_HiRISE/Viking_1_Landing_Site_Mosaic.vrt"),
   Description = [[This data was acquired using the High Resolution Imaging Science Experiment camera aboard NASA's Mars Reconnaissance Orbiter spacecraft (MRO). MRO was launched on August 12, 2005 and arrived at Mars on March 10, 2006. It maintains a nearly circular orbit, completing an orbital revolution about every 112 minutes at an altitude of approximately 250 to 316 km or 155 to 196 miles. MRO carries a sophisticated suite of instruments used to analyze and map the landforms, stratigraphy, minerals, and ice of Mars.
 
 The High Resolution Imaging Science Experiment (HiRISE) camera utilizes a 0.5-meter telescope to obtain very high resolution images of Martian landforms and terrains. From an altitude of 300 km, HiRISE has a resolution of 0.3 meters per pixel. In addition to being used for getting very detailed images of surface features, pairs of slightly offset HiRISE images are combined to produce precise digital elevation models of Martian topography.]]
@@ -209,7 +209,7 @@ The High Resolution Imaging Science Experiment (HiRISE) camera utilizes a 0.5-me
 local treks_PSP_001501_2280_RED = {
   Identifier = "PSP_001501_2280_RED",
   Name = [[MRO HiRISE, Viking 2 Landing Site Mosaic]],
-  FilePath = asset.localResource("MRO_HiRISE/Viking_2_Landing_Site_Mosaic.vrt"),
+  FilePath = asset.resource("MRO_HiRISE/Viking_2_Landing_Site_Mosaic.vrt"),
   Description = [[This data was acquired using the High Resolution Imaging Science Experiment camera aboard NASA's Mars Reconnaissance Orbiter spacecraft (MRO). MRO was launched on August 12, 2005 and arrived at Mars on March 10, 2006. It maintains a nearly circular orbit, completing an orbital revolution about every 112 minutes at an altitude of approximately 250 to 316 km or 155 to 196 miles. MRO carries a sophisticated suite of instruments used to analyze and map the landforms, stratigraphy, minerals, and ice of Mars.
 
 The High Resolution Imaging Science Experiment (HiRISE) camera utilizes a 0.5-meter telescope to obtain very high resolution images of Martian landforms and terrains. From an altitude of 300 km, HiRISE has a resolution of 0.3 meters per pixel. In addition to being used for getting very detailed images of surface features, pairs of slightly offset HiRISE images are combined to produce precise digital elevation models of Martian topography.]]
diff --git a/data/assets/scene/solarsystem/planets/mars/layers/nasa-treks/MSL.asset b/data/assets/scene/solarsystem/planets/mars/layers/nasa-treks/MSL.asset
index 4423e5fe35..076401270c 100644
--- a/data/assets/scene/solarsystem/planets/mars/layers/nasa-treks/MSL.asset
+++ b/data/assets/scene/solarsystem/planets/mars/layers/nasa-treks/MSL.asset
@@ -9,7 +9,7 @@ local globeIdentifier = asset.require("scene/solarsystem//planets/mars/mars").Ma
 local treks_mars_pahrump_patch_8k_256m = {
   Identifier = "mars_pahrump_patch_8k_256m",
   Name = [[MSL, Pahrump Hills]],
-  FilePath = asset.localResource("MSL/Pahrump_Hills.vrt"),
+  FilePath = asset.resource("MSL/Pahrump_Hills.vrt"),
   Description = [[This layer is a greyscale mosaic assembled using data from the High Resolution Stereo Camera aboard the European Space Agency's Mars Express orbiter. HRSC is being used to obtain color and stereo images that will map 100% of Mars' surface at resolution better than 30 m/pixel, and 50% of the surface at better than 15 m/pixel. Each of the nine CCD lines of HRSC, a linescan imager (pushbroom camera), contains 5184 pixels. The channels consist of red, green, blue, near-infrared, three stereo channels (backward, nadir, and forward) and two photometric channels. The digital elevation model used for this layer is a combination of data derived from the HRSC and the Mars Orbiter Laser Altimeter.]]
 }
 
diff --git a/data/assets/scene/solarsystem/planets/mars/layers/nasa-treks/Mars_Express_HRSC.asset b/data/assets/scene/solarsystem/planets/mars/layers/nasa-treks/Mars_Express_HRSC.asset
index 18609103be..06f430aece 100644
--- a/data/assets/scene/solarsystem/planets/mars/layers/nasa-treks/Mars_Express_HRSC.asset
+++ b/data/assets/scene/solarsystem/planets/mars/layers/nasa-treks/Mars_Express_HRSC.asset
@@ -9,49 +9,49 @@ local globeIdentifier = asset.require("scene/solarsystem//planets/mars/mars").Ma
 local treks_HRSC_Martian_east = {
   Identifier = "HRSC_Martian_east",
   Name = [[Mars Express HRSC, Martian Path Eastern Section Color Mosaic]],
-  FilePath = asset.localResource("Mars_Express_HRSC/Martian_Path_Eastern_Section_Color_Mosaic.vrt"),
+  FilePath = asset.resource("Mars_Express_HRSC/Martian_Path_Eastern_Section_Color_Mosaic.vrt"),
   Description = [[This layer is a greyscale mosaic assembled using data from the High Resolution Stereo Camera aboard the European Space Agency's Mars Express orbiter. HRSC is being used to obtain color and stereo images that will map 100% of Mars' surface at resolution better than 30 m/pixel, and 50% of the surface at better than 15 m/pixel. Each of the nine CCD lines of HRSC, a linescan imager (pushbroom camera), contains 5184 pixels. The channels consist of red, green, blue, near-infrared, three stereo channels (backward, nadir, and forward) and two photometric channels. The digital elevation model used for this layer is a combination of data derived from the HRSC and the Mars Orbiter Laser Altimeter.]]
 }
 
 local treks_MC11E_HRMOSCO_COL = {
   Identifier = "MC11E_HRMOSCO_COL",
   Name = [[Mars Express HRSC, Martian Path MC11 Quad Color Mosaic]],
-  FilePath = asset.localResource("Mars_Express_HRSC/Martian_Path_MC11_Quad_Color_Mosaic.vrt"),
+  FilePath = asset.resource("Mars_Express_HRSC/Martian_Path_MC11_Quad_Color_Mosaic.vrt"),
   Description = [[This layer is a combined color mosaic and 50 meter digital terrain model assembled using data from the High Resolution Stereo Camera (HRSC) aboard the European Space Agency's Mars Express orbiter. It covers the MC-11 quadrangle on Mars. For the purposes of mapping, the United States Geological Survey (USGS) has divided the surface of Mars into 30 quadrangles, labeled MC-1 through MC-30 (MC for Mars Chart). Each of the quadrangles also has a proper name derived from a prominent surface feature within the quadrangle. Much of the story of the Martian takes place within MC-11, also known as Oxia Palus. Fortunately, MC-11 happens to be the first complete quadrangle the European Space Agency produced as an HRSC 50m digital terrain model and image mosaic. HRSC is being used to obtain color and stereo images that will map 100% of Mars' surface at resolution better than 30 m/pixel, and 50% of the surface at better than 15 m/pixel. Each of the nine CCD lines of HRSC, a linescan imager (pushbroom camera), contains 5184 pixels. The channels consist of red, green, blue, near-infrared, three stereo channels (backward, nadir, and forward) and two photometric channels. This mosaic was produced by the Global Topography and Mosaic Generation Task Group of the HRSC-Team by joining nearly 100 contiguous HRSC stereo strips. HRSC data provided by ESA/DLR/FU Berlin and the Mars Express HRSC-Team.]]
 }
 
 local treks_MC11E_HRMOSND_ND5 = {
   Identifier = "MC11E_HRMOSND_ND5",
   Name = [[Mars Express HRSC, Martian Path MC11 Quad Mosaic]],
-  FilePath = asset.localResource("Mars_Express_HRSC/Martian_Path_MC11_Quad_Mosaic.vrt"),
+  FilePath = asset.resource("Mars_Express_HRSC/Martian_Path_MC11_Quad_Mosaic.vrt"),
   Description = [[This layer is a combined greyscale mosaic and 50 meter digital terrain model assembled using data from the High Resolution Stereo Camera (HRSC) aboard the European Space Agency's Mars Express orbiter. It covers the MC-11 quadrangle on Mars. For the purposes of mapping, the United States Geological Survey (USGS) has divided the surface of Mars into 30 quadrangles, labeled MC-1 through MC-30 (MC for Mars Chart). Each of the quadrangles also has a proper name derived from a prominent surface feature within the quadrangle. Much of the story of the Martian takes place within MC-11, also known as Oxia Palus. Fortunately, MC-11 happens to be the first complete quadrangle the European Space Agency produced as an HRSC 50m digital terrain model and image mosaic. HRSC is being used to obtain color and stereo images that will map 100% of Mars' surface at resolution better than 30 m/pixel, and 50% of the surface at better than 15 m/pixel. Each of the nine CCD lines of HRSC, a linescan imager (pushbroom camera), contains 5184 pixels. The channels consist of red, green, blue, near-infrared, three stereo channels (backward, nadir, and forward) and two photometric channels. While this mosaic lacks the color information shown in the color mosaic, it does show finer detail. This mosaic was produced by the Global Topography and Mosaic Generation Task Group of the HRSC-Team by joining nearly 100 contiguous HRSC stereo strips. HRSC data provided by ESA/DLR/FU Berlin and the Mars Express HRSC-Team.]]
 }
 
 local treks_hrsc_mawrth_vallis_color = {
   Identifier = "hrsc_mawrth_vallis_color",
   Name = [[Mars Express HRSC, Mawrth Vallis Color Mosaic]],
-  FilePath = asset.localResource("Mars_Express_HRSC/Mawrth_Vallis_Color_Mosaic.vrt"),
+  FilePath = asset.resource("Mars_Express_HRSC/Mawrth_Vallis_Color_Mosaic.vrt"),
   Description = [[This layer is a greyscale mosaic assembled using data from the High Resolution Stereo Camera aboard the European Space Agency's Mars Express orbiter. HRSC is being used to obtain color and stereo images that will map 100% of Mars' surface at resolution better than 30 m/pixel, and 50% of the surface at better than 15 m/pixel. Each of the nine CCD lines of HRSC, a linescan imager (pushbroom camera), contains 5184 pixels. The channels consist of red, green, blue, near-infrared, three stereo channels (backward, nadir, and forward) and two photometric channels. The digital elevation model used for this layer is a combination of data derived from the HRSC and the Mars Orbiter Laser Altimeter.]]
 }
 
 local treks_hrsc_mawrth_vallis = {
   Identifier = "hrsc_mawrth_vallis",
   Name = [[Mars Express HRSC, Mawrth Vallis Mosaic]],
-  FilePath = asset.localResource("Mars_Express_HRSC/Mawrth_Vallis_Mosaic.vrt"),
+  FilePath = asset.resource("Mars_Express_HRSC/Mawrth_Vallis_Mosaic.vrt"),
   Description = [[This layer is a greyscale mosaic assembled using data from the High Resolution Stereo Camera aboard the European Space Agency's Mars Express orbiter. HRSC is being used to obtain color and stereo images that will map 100% of Mars' surface at resolution better than 30 m/pixel, and 50% of the surface at better than 15 m/pixel. Each of the nine CCD lines of HRSC, a linescan imager (pushbroom camera), contains 5184 pixels. The channels consist of red, green, blue, near-infrared, three stereo channels (backward, nadir, and forward) and two photometric channels. The digital elevation model used for this layer is a combination of data derived from the HRSC and the Mars Orbiter Laser Altimeter.]]
 }
 
 local treks_h2942_0000_nd3 = {
   Identifier = "h2942_0000_nd3",
   Name = [[Mars Express HRSC, Viking 1 Landing Site Mosaic]],
-  FilePath = asset.localResource("Mars_Express_HRSC/Viking_1_Landing_Site_Mosaic.vrt"),
+  FilePath = asset.resource("Mars_Express_HRSC/Viking_1_Landing_Site_Mosaic.vrt"),
   Description = [[This layer is a greyscale mosaic assembled using data from the High Resolution Stereo Camera aboard the European Space Agency's Mars Express orbiter. HRSC is being used to obtain color and stereo images that will map 100% of Mars' surface at resolution better than 30 m/pixel, and 50% of the surface at better than 15 m/pixel. Each of the nine CCD lines of HRSC, a linescan imager (pushbroom camera), contains 5184 pixels. The channels consist of red, green, blue, near-infrared, three stereo channels (backward, nadir, and forward) and two photometric channels. The digital elevation model used for this layer is a combination of data derived from the HRSC and the Mars Orbiter Laser Altimeter.]]
 }
 
 local treks_h1394_0000_nd3 = {
   Identifier = "h1394_0000_nd3",
   Name = [[Mars Express HRSC, Viking 2 Landing Site Mosaic]],
-  FilePath = asset.localResource("Mars_Express_HRSC/Viking_2_Landing_Site_Mosaic.vrt"),
+  FilePath = asset.resource("Mars_Express_HRSC/Viking_2_Landing_Site_Mosaic.vrt"),
   Description = [[This layer is a greyscale mosaic assembled using data from the High Resolution Stereo Camera aboard the European Space Agency's Mars Express orbiter. HRSC is being used to obtain color and stereo images that will map 100% of Mars' surface at resolution better than 30 m/pixel, and 50% of the surface at better than 15 m/pixel. Each of the nine CCD lines of HRSC, a linescan imager (pushbroom camera), contains 5184 pixels. The channels consist of red, green, blue, near-infrared, three stereo channels (backward, nadir, and forward) and two photometric channels. The digital elevation model used for this layer is a combination of data derived from the HRSC and the Mars Orbiter Laser Altimeter.]]
 }
 
diff --git a/data/assets/scene/solarsystem/planets/mars/layers/nasa-treks/Mars_Reconnaissance_Orbiter_CTX.asset b/data/assets/scene/solarsystem/planets/mars/layers/nasa-treks/Mars_Reconnaissance_Orbiter_CTX.asset
index 8a13ebcd68..bcf434effe 100644
--- a/data/assets/scene/solarsystem/planets/mars/layers/nasa-treks/Mars_Reconnaissance_Orbiter_CTX.asset
+++ b/data/assets/scene/solarsystem/planets/mars/layers/nasa-treks/Mars_Reconnaissance_Orbiter_CTX.asset
@@ -9,7 +9,7 @@ local globeIdentifier = asset.require("scene/solarsystem//planets/mars/mars").Ma
 local treks_CTX_ClrSlope_8bit_12S182E_24mp_P22_009609_1674_B02_010453_1675 = {
   Identifier = "CTX_ClrSlope_8bit_12S182E_24mp_P22_009609_1674_B02_010453_1675",
   Name = [[Mars Reconnaissance Orbiter CTX, Color Slope Apollinaris 12S182E]],
-  FilePath = asset.localResource("Mars_Reconnaissance_Orbiter_CTX/Color_Slope_Apollinaris_12S182E.vrt"),
+  FilePath = asset.resource("Mars_Reconnaissance_Orbiter_CTX/Color_Slope_Apollinaris_12S182E.vrt"),
   Description = [[This is a colorized version of the original 2x2 pixel slope in degrees (also called a 1 baseline slope). This was produced as part of an effort to characterize topography within candidate Human Exploration Zones for Mars. The DEM was constructed from a pair of CTX images using the stereo photogrammetry software AMES Stereo Pipeline (ASP). THe DEM has been tied to MOLA and can be considered resarch- and visualization-ready. Because it has not been manually edited using a full 3D editing environment, ASP DEMs cannot currently be considered true engineering-ready for performing landings.
 
 References:
@@ -23,7 +23,7 @@ Slopes were derived using the Python script called gdal_baseline_slope.py: https
 local treks_CTX_ClrSlope_8bit_13S182E_24mp_G15_024127_1673_G16_024483_1673 = {
   Identifier = "CTX_ClrSlope_8bit_13S182E_24mp_G15_024127_1673_G16_024483_1673",
   Name = [[Mars Reconnaissance Orbiter CTX, Color Slope Apollinaris 13S182E]],
-  FilePath = asset.localResource("Mars_Reconnaissance_Orbiter_CTX/Color_Slope_Apollinaris_13S182E.vrt"),
+  FilePath = asset.resource("Mars_Reconnaissance_Orbiter_CTX/Color_Slope_Apollinaris_13S182E.vrt"),
   Description = [[This is a colorized version of the original 2x2 pixel slope in degrees (also called a 1 baseline slope). This was produced as part of an effort to characterize topography within candidate Human Exploration Zones for Mars. The DEM was constructed from a pair of CTX images using the stereo photogrammetry software AMES Stereo Pipeline (ASP). THe DEM has been tied to MOLA and can be considered resarch- and visualization-ready. Because it has not been manually edited using a full 3D editing environment, ASP DEMs cannot currently be considered true engineering-ready for performing landings.
 
 References:
@@ -37,7 +37,7 @@ Slopes were derived using the Python script called gdal_baseline_slope.py: https
 local treks_CTX_ClrSlope_8bit_14S184E_24mp_B01_009886_1658_P21_009385_1658 = {
   Identifier = "CTX_ClrSlope_8bit_14S184E_24mp_B01_009886_1658_P21_009385_1658",
   Name = [[Mars Reconnaissance Orbiter CTX, Color Slope Apollinaris 14S184E]],
-  FilePath = asset.localResource("Mars_Reconnaissance_Orbiter_CTX/Color_Slope_Apollinaris_14S184E.vrt"),
+  FilePath = asset.resource("Mars_Reconnaissance_Orbiter_CTX/Color_Slope_Apollinaris_14S184E.vrt"),
   Description = [[This is a colorized version of the original 2x2 pixel slope in degrees (also called a 1 baseline slope). This was produced as part of an effort to characterize topography within candidate Human Exploration Zones for Mars. The DEM was constructed from a pair of CTX images using the stereo photogrammetry software AMES Stereo Pipeline (ASP). THe DEM has been tied to MOLA and can be considered resarch- and visualization-ready. Because it has not been manually edited using a full 3D editing environment, ASP DEMs cannot currently be considered true engineering-ready for performing landings.
 
 References:
@@ -51,7 +51,7 @@ Slopes were derived using the Python script called gdal_baseline_slope.py: https
 local treks_CTX_ClrSlope_8bit_10S291E_24mp_P22_009684_1699_B02_010396_1699 = {
   Identifier = "CTX_ClrSlope_8bit_10S291E_24mp_P22_009684_1699_B02_010396_1699",
   Name = [[Mars Reconnaissance Orbiter CTX, Color Slope Coprates 10S291E]],
-  FilePath = asset.localResource("Mars_Reconnaissance_Orbiter_CTX/Color_Slope_Coprates_10S291E.vrt"),
+  FilePath = asset.resource("Mars_Reconnaissance_Orbiter_CTX/Color_Slope_Coprates_10S291E.vrt"),
   Description = [[This is a colorized version of the original 2x2 pixel slope in degrees (also called a 1 baseline slope). This was produced as part of an effort to characterize topography within candidate Human Exploration Zones for Mars. The DEM was constructed from a pair of CTX images using the stereo photogrammetry software AMES Stereo Pipeline (ASP). THe DEM has been tied to MOLA and can be considered resarch- and visualization-ready. Because it has not been manually edited using a full 3D editing environment, ASP DEMs cannot currently be considered true engineering-ready for performing landings.
 
 References:
@@ -65,7 +65,7 @@ Slopes were derived using the Python script called gdal_baseline_slope.py: https
 local treks_CTX_ClrSlope_8bit_11S293E_24mp_B09_013231_1696_B11_013732_1690 = {
   Identifier = "CTX_ClrSlope_8bit_11S293E_24mp_B09_013231_1696_B11_013732_1690",
   Name = [[Mars Reconnaissance Orbiter CTX, Color Slope Coprates 11S293E]],
-  FilePath = asset.localResource("Mars_Reconnaissance_Orbiter_CTX/Color_Slope_Coprates_11S293E.vrt"),
+  FilePath = asset.resource("Mars_Reconnaissance_Orbiter_CTX/Color_Slope_Coprates_11S293E.vrt"),
   Description = [[This is a colorized version of the original 2x2 pixel slope in degrees (also called a 1 baseline slope). This was produced as part of an effort to characterize topography within candidate Human Exploration Zones for Mars. The DEM was constructed from a pair of CTX images using the stereo photogrammetry software AMES Stereo Pipeline (ASP). THe DEM has been tied to MOLA and can be considered resarch- and visualization-ready. Because it has not been manually edited using a full 3D editing environment, ASP DEMs cannot currently be considered true engineering-ready for performing landings.
 
 References:
@@ -79,7 +79,7 @@ Slopes were derived using the Python script called gdal_baseline_slope.py: https
 local treks_CTX_ClrSlope_8bit_13S293E_24mp_G07_020879_1669_G09_021657_1665 = {
   Identifier = "CTX_ClrSlope_8bit_13S293E_24mp_G07_020879_1669_G09_021657_1665",
   Name = [[Mars Reconnaissance Orbiter CTX, Color Slope Coprates 13S293E]],
-  FilePath = asset.localResource("Mars_Reconnaissance_Orbiter_CTX/Color_Slope_Coprates_13S293E.vrt"),
+  FilePath = asset.resource("Mars_Reconnaissance_Orbiter_CTX/Color_Slope_Coprates_13S293E.vrt"),
   Description = [[This is a colorized version of the original 2x2 pixel slope in degrees (also called a 1 baseline slope). This was produced as part of an effort to characterize topography within candidate Human Exploration Zones for Mars. The DEM was constructed from a pair of CTX images using the stereo photogrammetry software AMES Stereo Pipeline (ASP). THe DEM has been tied to MOLA and can be considered resarch- and visualization-ready. Because it has not been manually edited using a full 3D editing environment, ASP DEMs cannot currently be considered true engineering-ready for performing landings.
 
 References:
@@ -93,7 +93,7 @@ Slopes were derived using the Python script called gdal_baseline_slope.py: https
 local treks_CTX_ClrSlope_8bit_37N024E_24mp_G05_020203_2178_G22_026994_2170 = {
   Identifier = "CTX_ClrSlope_8bit_37N024E_24mp_G05_020203_2178_G22_026994_2170",
   Name = [[Mars Reconnaissance Orbiter CTX, Color Slope Deuteronius 37N024E]],
-  FilePath = asset.localResource("Mars_Reconnaissance_Orbiter_CTX/Color_Slope_Deuteronius_37N024E.vrt"),
+  FilePath = asset.resource("Mars_Reconnaissance_Orbiter_CTX/Color_Slope_Deuteronius_37N024E.vrt"),
   Description = [[This is a colorized version of the original 2x2 pixel slope in degrees (also called a 1 baseline slope). This was produced as part of an effort to characterize topography within candidate Human Exploration Zones for Mars. The DEM was constructed from a pair of CTX images using the stereo photogrammetry software AMES Stereo Pipeline (ASP). THe DEM has been tied to MOLA and can be considered resarch- and visualization-ready. Because it has not been manually edited using a full 3D editing environment, ASP DEMs cannot currently be considered true engineering-ready for performing landings.
 
 References:
@@ -107,7 +107,7 @@ Slopes were derived using the Python script called gdal_baseline_slope.py: https
 local treks_CTX_ClrSlope_8bit_38N024E_24mp_B17_016168_2181_G16_024594_2181 = {
   Identifier = "CTX_ClrSlope_8bit_38N024E_24mp_B17_016168_2181_G16_024594_2181",
   Name = [[Mars Reconnaissance Orbiter CTX, Color Slope Deuteronius 38N024E]],
-  FilePath = asset.localResource("Mars_Reconnaissance_Orbiter_CTX/Color_Slope_Deuteronius_38N024E.vrt"),
+  FilePath = asset.resource("Mars_Reconnaissance_Orbiter_CTX/Color_Slope_Deuteronius_38N024E.vrt"),
   Description = [[This is a colorized version of the original 2x2 pixel slope in degrees (also called a 1 baseline slope). This was produced as part of an effort to characterize topography within candidate Human Exploration Zones for Mars. The DEM was constructed from a pair of CTX images using the stereo photogrammetry software AMES Stereo Pipeline (ASP). THe DEM has been tied to MOLA and can be considered resarch- and visualization-ready. Because it has not been manually edited using a full 3D editing environment, ASP DEMs cannot currently be considered true engineering-ready for performing landings.
 
 References:
@@ -121,7 +121,7 @@ Slopes were derived using the Python script called gdal_baseline_slope.py: https
 local treks_CTX_ClrSlope_8bit_39N024E_24mp_D15_032875_2196_D15_033165_2196 = {
   Identifier = "CTX_ClrSlope_8bit_39N024E_24mp_D15_032875_2196_D15_033165_2196",
   Name = [[Mars Reconnaissance Orbiter CTX, Color Slope Deuteronius 39N024E]],
-  FilePath = asset.localResource("Mars_Reconnaissance_Orbiter_CTX/Color_Slope_Deuteronius_39N024E.vrt"),
+  FilePath = asset.resource("Mars_Reconnaissance_Orbiter_CTX/Color_Slope_Deuteronius_39N024E.vrt"),
   Description = [[This is a colorized version of the original 2x2 pixel slope in degrees (also called a 1 baseline slope). This was produced as part of an effort to characterize topography within candidate Human Exploration Zones for Mars. The DEM was constructed from a pair of CTX images using the stereo photogrammetry software AMES Stereo Pipeline (ASP). THe DEM has been tied to MOLA and can be considered resarch- and visualization-ready. Because it has not been manually edited using a full 3D editing environment, ASP DEMs cannot currently be considered true engineering-ready for performing landings.
 
 References:
@@ -135,7 +135,7 @@ Slopes were derived using the Python script called gdal_baseline_slope.py: https
 local treks_CTX_ClrSlope_8bit_40N022E_24mp_B18_016656_2206_B18_016801_2206 = {
   Identifier = "CTX_ClrSlope_8bit_40N022E_24mp_B18_016656_2206_B18_016801_2206",
   Name = [[Mars Reconnaissance Orbiter CTX, Color Slope Deuteronius 40N024E]],
-  FilePath = asset.localResource("Mars_Reconnaissance_Orbiter_CTX/Color_Slope_Deuteronius_40N024E.vrt"),
+  FilePath = asset.resource("Mars_Reconnaissance_Orbiter_CTX/Color_Slope_Deuteronius_40N024E.vrt"),
   Description = [[This is a colorized version of the original 2x2 pixel slope in degrees (also called a 1 baseline slope). This was produced as part of an effort to characterize topography within candidate Human Exploration Zones for Mars. The DEM was constructed from a pair of CTX images using the stereo photogrammetry software AMES Stereo Pipeline (ASP). THe DEM has been tied to MOLA and can be considered resarch- and visualization-ready. Because it has not been manually edited using a full 3D editing environment, ASP DEMs cannot currently be considered true engineering-ready for performing landings.
 
 References:
@@ -149,7 +149,7 @@ Slopes were derived using the Python script called gdal_baseline_slope.py: https
 local treks_CTX_ClrSlope_8bit_11S289E_24mp_F23_044971_1685_F21_043995_1685 = {
   Identifier = "CTX_ClrSlope_8bit_11S289E_24mp_F23_044971_1685_F21_043995_1685",
   Name = [[Mars Reconnaissance Orbiter CTX, Color Slope East Melas 11S289E]],
-  FilePath = asset.localResource("Mars_Reconnaissance_Orbiter_CTX/Color_Slope_East_Melas_11S289E.vrt"),
+  FilePath = asset.resource("Mars_Reconnaissance_Orbiter_CTX/Color_Slope_East_Melas_11S289E.vrt"),
   Description = [[This is a colorized version of the original 2x2 pixel slope in degrees (also called a 1 baseline slope). This was produced as part of an effort to characterize topography within candidate Human Exploration Zones for Mars. The DEM was constructed from a pair of CTX images using the stereo photogrammetry software AMES Stereo Pipeline (ASP). THe DEM has been tied to MOLA and can be considered resarch- and visualization-ready. Because it has not been manually edited using a full 3D editing environment, ASP DEMs cannot currently be considered true engineering-ready for performing landings.
 
 References:
@@ -163,7 +163,7 @@ Slopes were derived using the Python script called gdal_baseline_slope.py: https
 local treks_CTX_ClrSlope_8bit_11S291E_24mp_B19_017187_1685_B19_016976_1685 = {
   Identifier = "CTX_ClrSlope_8bit_11S291E_24mp_B19_017187_1685_B19_016976_1685",
   Name = [[Mars Reconnaissance Orbiter CTX, Color Slope East Melas 11S291E]],
-  FilePath = asset.localResource("Mars_Reconnaissance_Orbiter_CTX/Color_Slope_East_Melas_11S291E.vrt"),
+  FilePath = asset.resource("Mars_Reconnaissance_Orbiter_CTX/Color_Slope_East_Melas_11S291E.vrt"),
   Description = [[This is a colorized version of the original 2x2 pixel slope in degrees (also called a 1 baseline slope). This was produced as part of an effort to characterize topography within candidate Human Exploration Zones for Mars. The DEM was constructed from a pair of CTX images using the stereo photogrammetry software AMES Stereo Pipeline (ASP). THe DEM has been tied to MOLA and can be considered resarch- and visualization-ready. Because it has not been manually edited using a full 3D editing environment, ASP DEMs cannot currently be considered true engineering-ready for performing landings.
 
 References:
@@ -177,7 +177,7 @@ Slopes were derived using the Python script called gdal_baseline_slope.py: https
 local treks_CTX_ClrSlope_8bit_12S289E_24mp_D01_027446_1678_D01_027723_1677 = {
   Identifier = "CTX_ClrSlope_8bit_12S289E_24mp_D01_027446_1678_D01_027723_1677",
   Name = [[Mars Reconnaissance Orbiter CTX, Color Slope East Melas 12S289E_D01]],
-  FilePath = asset.localResource("Mars_Reconnaissance_Orbiter_CTX/Color_Slope_East_Melas_12S289E_D01.vrt"),
+  FilePath = asset.resource("Mars_Reconnaissance_Orbiter_CTX/Color_Slope_East_Melas_12S289E_D01.vrt"),
   Description = [[This is a colorized version of the original 2x2 pixel slope in degrees (also called a 1 baseline slope). This was produced as part of an effort to characterize topography within candidate Human Exploration Zones for Mars. The DEM was constructed from a pair of CTX images using the stereo photogrammetry software AMES Stereo Pipeline (ASP). THe DEM has been tied to MOLA and can be considered resarch- and visualization-ready. Because it has not been manually edited using a full 3D editing environment, ASP DEMs cannot currently be considered true engineering-ready for performing landings.
 
 References:
@@ -191,7 +191,7 @@ Slopes were derived using the Python script called gdal_baseline_slope.py: https
 local treks_CTX_ClrSlope_8bit_12S289E_24mp_F18_042927_1681_J02_045749_1694 = {
   Identifier = "CTX_ClrSlope_8bit_12S289E_24mp_F18_042927_1681_J02_045749_1694",
   Name = [[Mars Reconnaissance Orbiter CTX, Color Slope East Melas 12S289E_F18]],
-  FilePath = asset.localResource("Mars_Reconnaissance_Orbiter_CTX/Color_Slope_East_Melas_12S289E_F18.vrt"),
+  FilePath = asset.resource("Mars_Reconnaissance_Orbiter_CTX/Color_Slope_East_Melas_12S289E_F18.vrt"),
   Description = [[This is a colorized version of the original 2x2 pixel slope in degrees (also called a 1 baseline slope). This was produced as part of an effort to characterize topography within candidate Human Exploration Zones for Mars. The DEM was constructed from a pair of CTX images using the stereo photogrammetry software AMES Stereo Pipeline (ASP). THe DEM has been tied to MOLA and can be considered resarch- and visualization-ready. Because it has not been manually edited using a full 3D editing environment, ASP DEMs cannot currently be considered true engineering-ready for performing landings.
 
 References:
@@ -205,7 +205,7 @@ Slopes were derived using the Python script called gdal_baseline_slope.py: https
 local treks_CTX_ClrSlope_8bit_12S290E_24mp_D18_034250_1676_D21_035450_1674 = {
   Identifier = "CTX_ClrSlope_8bit_12S290E_24mp_D18_034250_1676_D21_035450_1674",
   Name = [[Mars Reconnaissance Orbiter CTX, Color Slope East Melas 12S290E]],
-  FilePath = asset.localResource("Mars_Reconnaissance_Orbiter_CTX/Color_Slope_East_Melas_12S290E.vrt"),
+  FilePath = asset.resource("Mars_Reconnaissance_Orbiter_CTX/Color_Slope_East_Melas_12S290E.vrt"),
   Description = [[This is a colorized version of the original 2x2 pixel slope in degrees (also called a 1 baseline slope). This was produced as part of an effort to characterize topography within candidate Human Exploration Zones for Mars. The DEM was constructed from a pair of CTX images using the stereo photogrammetry software AMES Stereo Pipeline (ASP). THe DEM has been tied to MOLA and can be considered resarch- and visualization-ready. Because it has not been manually edited using a full 3D editing environment, ASP DEMs cannot currently be considered true engineering-ready for performing landings.
 
 References:
@@ -219,7 +219,7 @@ Slopes were derived using the Python script called gdal_baseline_slope.py: https
 local treks_CTX_ClrSlope_8bit_12S291E_24mp_F14_041292_1682_F16_041938_1682 = {
   Identifier = "CTX_ClrSlope_8bit_12S291E_24mp_F14_041292_1682_F16_041938_1682",
   Name = [[Mars Reconnaissance Orbiter CTX, Color Slope East Melas 12S291E_F14]],
-  FilePath = asset.localResource("Mars_Reconnaissance_Orbiter_CTX/Color_Slope_East_Melas_12S291E_F14.vrt"),
+  FilePath = asset.resource("Mars_Reconnaissance_Orbiter_CTX/Color_Slope_East_Melas_12S291E_F14.vrt"),
   Description = [[This is a colorized version of the original 2x2 pixel slope in degrees (also called a 1 baseline slope). This was produced as part of an effort to characterize topography within candidate Human Exploration Zones for Mars. The DEM was constructed from a pair of CTX images using the stereo photogrammetry software AMES Stereo Pipeline (ASP). THe DEM has been tied to MOLA and can be considered resarch- and visualization-ready. Because it has not been manually edited using a full 3D editing environment, ASP DEMs cannot currently be considered true engineering-ready for performing landings.
 
 References:
@@ -233,7 +233,7 @@ Slopes were derived using the Python script called gdal_baseline_slope.py: https
 local treks_CTX_ClrSlope_8bit_12S291E_24mp_F21_043850_1684_F21_043916_1685 = {
   Identifier = "CTX_ClrSlope_8bit_12S291E_24mp_F21_043850_1684_F21_043916_1685",
   Name = [[Mars Reconnaissance Orbiter CTX, Color Slope East Melas 12S291E_F21]],
-  FilePath = asset.localResource("Mars_Reconnaissance_Orbiter_CTX/Color_Slope_East_Melas_12S291E_F21.vrt"),
+  FilePath = asset.resource("Mars_Reconnaissance_Orbiter_CTX/Color_Slope_East_Melas_12S291E_F21.vrt"),
   Description = [[This is a colorized version of the original 2x2 pixel slope in degrees (also called a 1 baseline slope). This was produced as part of an effort to characterize topography within candidate Human Exploration Zones for Mars. The DEM was constructed from a pair of CTX images using the stereo photogrammetry software AMES Stereo Pipeline (ASP). THe DEM has been tied to MOLA and can be considered resarch- and visualization-ready. Because it has not been manually edited using a full 3D editing environment, ASP DEMs cannot currently be considered true engineering-ready for performing landings.
 
 References:
@@ -247,7 +247,7 @@ Slopes were derived using the Python script called gdal_baseline_slope.py: https
 local treks_CTX_ClrSlope_8bit_12S291E_24mp_J01_045116_1677_J03_046039_1676 = {
   Identifier = "CTX_ClrSlope_8bit_12S291E_24mp_J01_045116_1677_J03_046039_1676",
   Name = [[Mars Reconnaissance Orbiter CTX, Color Slope East Melas 12S291E_J01]],
-  FilePath = asset.localResource("Mars_Reconnaissance_Orbiter_CTX/Color_Slope_East_Melas_12S291E_J01.vrt"),
+  FilePath = asset.resource("Mars_Reconnaissance_Orbiter_CTX/Color_Slope_East_Melas_12S291E_J01.vrt"),
   Description = [[This is a colorized version of the original 2x2 pixel slope in degrees (also called a 1 baseline slope). This was produced as part of an effort to characterize topography within candidate Human Exploration Zones for Mars. The DEM was constructed from a pair of CTX images using the stereo photogrammetry software AMES Stereo Pipeline (ASP). THe DEM has been tied to MOLA and can be considered resarch- and visualization-ready. Because it has not been manually edited using a full 3D editing environment, ASP DEMs cannot currently be considered true engineering-ready for performing landings.
 
 References:
@@ -261,7 +261,7 @@ Slopes were derived using the Python script called gdal_baseline_slope.py: https
 local treks_CTX_ClrSlope_8bit_13S289E_24mp_D10_031125_1673_D12_031903_1669 = {
   Identifier = "CTX_ClrSlope_8bit_13S289E_24mp_D10_031125_1673_D12_031903_1669",
   Name = [[Mars Reconnaissance Orbiter CTX, Color Slope East Melas 13S289E]],
-  FilePath = asset.localResource("Mars_Reconnaissance_Orbiter_CTX/Color_Slope_East_Melas_13S289E.vrt"),
+  FilePath = asset.resource("Mars_Reconnaissance_Orbiter_CTX/Color_Slope_East_Melas_13S289E.vrt"),
   Description = [[This is a colorized version of the original 2x2 pixel slope in degrees (also called a 1 baseline slope). This was produced as part of an effort to characterize topography within candidate Human Exploration Zones for Mars. The DEM was constructed from a pair of CTX images using the stereo photogrammetry software AMES Stereo Pipeline (ASP). THe DEM has been tied to MOLA and can be considered resarch- and visualization-ready. Because it has not been manually edited using a full 3D editing environment, ASP DEMs cannot currently be considered true engineering-ready for performing landings.
 
 References:
@@ -275,7 +275,7 @@ Slopes were derived using the Python script called gdal_baseline_slope.py: https
 local treks_CTX_ClrSlope_8bit_16S291E_24mp_D22_035951_1644_F01_036307_1644 = {
   Identifier = "CTX_ClrSlope_8bit_16S291E_24mp_D22_035951_1644_F01_036307_1644",
   Name = [[Mars Reconnaissance Orbiter CTX, Color Slope East Melas 16S291E_D22]],
-  FilePath = asset.localResource("Mars_Reconnaissance_Orbiter_CTX/Color_Slope_East_Melas_16S291E_D22.vrt"),
+  FilePath = asset.resource("Mars_Reconnaissance_Orbiter_CTX/Color_Slope_East_Melas_16S291E_D22.vrt"),
   Description = [[This is a colorized version of the original 2x2 pixel slope in degrees (also called a 1 baseline slope). This was produced as part of an effort to characterize topography within candidate Human Exploration Zones for Mars. The DEM was constructed from a pair of CTX images using the stereo photogrammetry software AMES Stereo Pipeline (ASP). THe DEM has been tied to MOLA and can be considered resarch- and visualization-ready. Because it has not been manually edited using a full 3D editing environment, ASP DEMs cannot currently be considered true engineering-ready for performing landings.
 
 References:
@@ -289,7 +289,7 @@ Slopes were derived using the Python script called gdal_baseline_slope.py: https
 local treks_CTX_Shade_12S182E_24mp_P22_009609_1674_B02_010453_1675 = {
   Identifier = "CTX_Shade_12S182E_24mp_P22_009609_1674_B02_010453_1675",
   Name = [[Mars Reconnaissance Orbiter CTX, HillShade Apollinaris 12S182E]],
-  FilePath = asset.localResource("Mars_Reconnaissance_Orbiter_CTX/HillShade_Apollinaris_12S182E.vrt"),
+  FilePath = asset.resource("Mars_Reconnaissance_Orbiter_CTX/HillShade_Apollinaris_12S182E.vrt"),
   Description = [[This is a grayscale shaded relief (hillshade) for the original digital elevation model (DEM/DTM) as produced as part of an effort to characterize topography within candidate Human Exploration Zones for Mars. The DEM was constructed from a pair of CTX images using the stereo photogrammetry software AMES Stereo Pipeline (ASP). THe DEM has been tied to MOLA and can be considered resarch- and visualization-ready. Because it has not been manually edited using a full 3D editing environment, ASP DEMs cannot currently be considered true engineering-ready for performing landings.
 
 References:
@@ -301,7 +301,7 @@ Mayer, D. P., E. S. Kite, 2016, An Integrated Workflow for Producing Digital Ter
 local treks_CTX_Shade_13S182E_24mp_G15_024127_1673_G16_024483_1673 = {
   Identifier = "CTX_Shade_13S182E_24mp_G15_024127_1673_G16_024483_1673",
   Name = [[Mars Reconnaissance Orbiter CTX, HillShade Apollinaris 13S182E]],
-  FilePath = asset.localResource("Mars_Reconnaissance_Orbiter_CTX/HillShade_Apollinaris_13S182E.vrt"),
+  FilePath = asset.resource("Mars_Reconnaissance_Orbiter_CTX/HillShade_Apollinaris_13S182E.vrt"),
   Description = [[This is a grayscale shaded relief (hillshade) for the original digital elevation model (DEM/DTM) as produced as part of an effort to characterize topography within candidate Human Exploration Zones for Mars. The DEM was constructed from a pair of CTX images using the stereo photogrammetry software AMES Stereo Pipeline (ASP). THe DEM has been tied to MOLA and can be considered resarch- and visualization-ready. Because it has not been manually edited using a full 3D editing environment, ASP DEMs cannot currently be considered true engineering-ready for performing landings.
 
 References:
@@ -313,7 +313,7 @@ Mayer, D. P., E. S. Kite, 2016, An Integrated Workflow for Producing Digital Ter
 local treks_CTX_Shade_14S184E_24mp_B01_009886_1658_P21_009385_1658 = {
   Identifier = "CTX_Shade_14S184E_24mp_B01_009886_1658_P21_009385_1658",
   Name = [[Mars Reconnaissance Orbiter CTX, HillShade Apollinaris 14S184E]],
-  FilePath = asset.localResource("Mars_Reconnaissance_Orbiter_CTX/HillShade_Apollinaris_14S184E.vrt"),
+  FilePath = asset.resource("Mars_Reconnaissance_Orbiter_CTX/HillShade_Apollinaris_14S184E.vrt"),
   Description = [[This is a grayscale shaded relief (hillshade) for the original digital elevation model (DEM/DTM) as produced as part of an effort to characterize topography within candidate Human Exploration Zones for Mars. The DEM was constructed from a pair of CTX images using the stereo photogrammetry software AMES Stereo Pipeline (ASP). THe DEM has been tied to MOLA and can be considered resarch- and visualization-ready. Because it has not been manually edited using a full 3D editing environment, ASP DEMs cannot currently be considered true engineering-ready for performing landings.
 
 References:
@@ -325,7 +325,7 @@ Mayer, D. P., E. S. Kite, 2016, An Integrated Workflow for Producing Digital Ter
 local treks_CTX_Shade_10S291E_24mp_P22_009684_1699_B02_010396_1699 = {
   Identifier = "CTX_Shade_10S291E_24mp_P22_009684_1699_B02_010396_1699",
   Name = [[Mars Reconnaissance Orbiter CTX, HillShade Coprates 10S291E]],
-  FilePath = asset.localResource("Mars_Reconnaissance_Orbiter_CTX/HillShade_Coprates_10S291E.vrt"),
+  FilePath = asset.resource("Mars_Reconnaissance_Orbiter_CTX/HillShade_Coprates_10S291E.vrt"),
   Description = [[This is a grayscale shaded relief (hillshade) for the original digital elevation model (DEM/DTM) as produced as part of an effort to characterize topography within candidate Human Exploration Zones for Mars. The DEM was constructed from a pair of CTX images using the stereo photogrammetry software AMES Stereo Pipeline (ASP). THe DEM has been tied to MOLA and can be considered resarch- and visualization-ready. Because it has not been manually edited using a full 3D editing environment, ASP DEMs cannot currently be considered true engineering-ready for performing landings.
 
 References:
@@ -337,7 +337,7 @@ Mayer, D. P., E. S. Kite, 2016, An Integrated Workflow for Producing Digital Ter
 local treks_CTX_Shade_11S293E_24mp_B09_013231_1696_B11_013732_1690 = {
   Identifier = "CTX_Shade_11S293E_24mp_B09_013231_1696_B11_013732_1690",
   Name = [[Mars Reconnaissance Orbiter CTX, HillShade Coprates 11S293E]],
-  FilePath = asset.localResource("Mars_Reconnaissance_Orbiter_CTX/HillShade_Coprates_11S293E.vrt"),
+  FilePath = asset.resource("Mars_Reconnaissance_Orbiter_CTX/HillShade_Coprates_11S293E.vrt"),
   Description = [[This is a grayscale shaded relief (hillshade) for the original digital elevation model (DEM/DTM) as produced as part of an effort to characterize topography within candidate Human Exploration Zones for Mars. The DEM was constructed from a pair of CTX images using the stereo photogrammetry software AMES Stereo Pipeline (ASP). THe DEM has been tied to MOLA and can be considered resarch- and visualization-ready. Because it has not been manually edited using a full 3D editing environment, ASP DEMs cannot currently be considered true engineering-ready for performing landings.
 
 References:
@@ -349,7 +349,7 @@ Mayer, D. P., E. S. Kite, 2016, An Integrated Workflow for Producing Digital Ter
 local treks_CTX_Shade_13S293E_24mp_G07_020879_1669_G09_021657_1665 = {
   Identifier = "CTX_Shade_13S293E_24mp_G07_020879_1669_G09_021657_1665",
   Name = [[Mars Reconnaissance Orbiter CTX, HillShade Coprates 13S293E]],
-  FilePath = asset.localResource("Mars_Reconnaissance_Orbiter_CTX/HillShade_Coprates_13S293E.vrt"),
+  FilePath = asset.resource("Mars_Reconnaissance_Orbiter_CTX/HillShade_Coprates_13S293E.vrt"),
   Description = [[This is a grayscale shaded relief (hillshade) for the original digital elevation model (DEM/DTM) as produced as part of an effort to characterize topography within candidate Human Exploration Zones for Mars. The DEM was constructed from a pair of CTX images using the stereo photogrammetry software AMES Stereo Pipeline (ASP). THe DEM has been tied to MOLA and can be considered resarch- and visualization-ready. Because it has not been manually edited using a full 3D editing environment, ASP DEMs cannot currently be considered true engineering-ready for performing landings.
 
 References:
@@ -361,7 +361,7 @@ Mayer, D. P., E. S. Kite, 2016, An Integrated Workflow for Producing Digital Ter
 local treks_CTX_Shade_37N024E_24mp_G05_020203_2178_G22_026994_2170 = {
   Identifier = "CTX_Shade_37N024E_24mp_G05_020203_2178_G22_026994_2170",
   Name = [[Mars Reconnaissance Orbiter CTX, HillShade Deuteronius 37N024E]],
-  FilePath = asset.localResource("Mars_Reconnaissance_Orbiter_CTX/HillShade_Deuteronius_37N024E.vrt"),
+  FilePath = asset.resource("Mars_Reconnaissance_Orbiter_CTX/HillShade_Deuteronius_37N024E.vrt"),
   Description = [[This is a grayscale shaded relief (hillshade) for the original digital elevation model (DEM/DTM) as produced as part of an effort to characterize topography within candidate Human Exploration Zones for Mars. The DEM was constructed from a pair of CTX images using the stereo photogrammetry software AMES Stereo Pipeline (ASP). THe DEM has been tied to MOLA and can be considered resarch- and visualization-ready. Because it has not been manually edited using a full 3D editing environment, ASP DEMs cannot currently be considered true engineering-ready for performing landings.
 
 References:
@@ -373,7 +373,7 @@ Mayer, D. P., E. S. Kite, 2016, An Integrated Workflow for Producing Digital Ter
 local treks_CTX_Shade_38N024E_24mp_B17_016168_2181_G16_024594_2181 = {
   Identifier = "CTX_Shade_38N024E_24mp_B17_016168_2181_G16_024594_2181",
   Name = [[Mars Reconnaissance Orbiter CTX, HillShade Deuteronius 38N024E]],
-  FilePath = asset.localResource("Mars_Reconnaissance_Orbiter_CTX/HillShade_Deuteronius_38N024E.vrt"),
+  FilePath = asset.resource("Mars_Reconnaissance_Orbiter_CTX/HillShade_Deuteronius_38N024E.vrt"),
   Description = [[This is a grayscale shaded relief (hillshade) for the original digital elevation model (DEM/DTM) as produced as part of an effort to characterize topography within candidate Human Exploration Zones for Mars. The DEM was constructed from a pair of CTX images using the stereo photogrammetry software AMES Stereo Pipeline (ASP). THe DEM has been tied to MOLA and can be considered resarch- and visualization-ready. Because it has not been manually edited using a full 3D editing environment, ASP DEMs cannot currently be considered true engineering-ready for performing landings.
 
 References:
@@ -385,7 +385,7 @@ Mayer, D. P., E. S. Kite, 2016, An Integrated Workflow for Producing Digital Ter
 local treks_CTX_Shade_39N024E_24mp_D15_032875_2196_D15_033165_2196 = {
   Identifier = "CTX_Shade_39N024E_24mp_D15_032875_2196_D15_033165_2196",
   Name = [[Mars Reconnaissance Orbiter CTX, HillShade Deuteronius 39N024E]],
-  FilePath = asset.localResource("Mars_Reconnaissance_Orbiter_CTX/HillShade_Deuteronius_39N024E.vrt"),
+  FilePath = asset.resource("Mars_Reconnaissance_Orbiter_CTX/HillShade_Deuteronius_39N024E.vrt"),
   Description = [[This is a grayscale shaded relief (hillshade) for the original digital elevation model (DEM/DTM) as produced as part of an effort to characterize topography within candidate Human Exploration Zones for Mars. The DEM was constructed from a pair of CTX images using the stereo photogrammetry software AMES Stereo Pipeline (ASP). THe DEM has been tied to MOLA and can be considered resarch- and visualization-ready. Because it has not been manually edited using a full 3D editing environment, ASP DEMs cannot currently be considered true engineering-ready for performing landings.
 
 References:
@@ -397,7 +397,7 @@ Mayer, D. P., E. S. Kite, 2016, An Integrated Workflow for Producing Digital Ter
 local treks_CTX_Shade_40N022E_24mp_B18_016656_2206_B18_016801_2206 = {
   Identifier = "CTX_Shade_40N022E_24mp_B18_016656_2206_B18_016801_2206",
   Name = [[Mars Reconnaissance Orbiter CTX, HillShade Deuteronius 40N024E]],
-  FilePath = asset.localResource("Mars_Reconnaissance_Orbiter_CTX/HillShade_Deuteronius_40N024E.vrt"),
+  FilePath = asset.resource("Mars_Reconnaissance_Orbiter_CTX/HillShade_Deuteronius_40N024E.vrt"),
   Description = [[This is a grayscale shaded relief (hillshade) for the original digital elevation model (DEM/DTM) as produced as part of an effort to characterize topography within candidate Human Exploration Zones for Mars. The DEM was constructed from a pair of CTX images using the stereo photogrammetry software AMES Stereo Pipeline (ASP). THe DEM has been tied to MOLA and can be considered resarch- and visualization-ready. Because it has not been manually edited using a full 3D editing environment, ASP DEMs cannot currently be considered true engineering-ready for performing landings.
 
 References:
@@ -409,7 +409,7 @@ Mayer, D. P., E. S. Kite, 2016, An Integrated Workflow for Producing Digital Ter
 local treks_CTX_Shade_11S289E_24mp_F23_044971_1685_F21_043995_1685 = {
   Identifier = "CTX_Shade_11S289E_24mp_F23_044971_1685_F21_043995_1685",
   Name = [[Mars Reconnaissance Orbiter CTX, HillShade East Melas 11S289E]],
-  FilePath = asset.localResource("Mars_Reconnaissance_Orbiter_CTX/HillShade_East_Melas_11S289E.vrt"),
+  FilePath = asset.resource("Mars_Reconnaissance_Orbiter_CTX/HillShade_East_Melas_11S289E.vrt"),
   Description = [[This is a grayscale shaded relief (hillshade) for the original digital elevation model (DEM/DTM) as produced as part of an effort to characterize topography within candidate Human Exploration Zones for Mars. The DEM was constructed from a pair of CTX images using the stereo photogrammetry software AMES Stereo Pipeline (ASP). THe DEM has been tied to MOLA and can be considered resarch- and visualization-ready. Because it has not been manually edited using a full 3D editing environment, ASP DEMs cannot currently be considered true engineering-ready for performing landings.
 
 References:
@@ -421,7 +421,7 @@ Mayer, D. P., E. S. Kite, 2016, An Integrated Workflow for Producing Digital Ter
 local treks_CTX_Shade_11S291E_24mp_B19_017187_1685_B19_016976_1685 = {
   Identifier = "CTX_Shade_11S291E_24mp_B19_017187_1685_B19_016976_1685",
   Name = [[Mars Reconnaissance Orbiter CTX, HillShade East Melas 11S291E]],
-  FilePath = asset.localResource("Mars_Reconnaissance_Orbiter_CTX/HillShade_East_Melas_11S291E.vrt"),
+  FilePath = asset.resource("Mars_Reconnaissance_Orbiter_CTX/HillShade_East_Melas_11S291E.vrt"),
   Description = [[This is a grayscale shaded relief (hillshade) for the original digital elevation model (DEM/DTM) as produced as part of an effort to characterize topography within candidate Human Exploration Zones for Mars. The DEM was constructed from a pair of CTX images using the stereo photogrammetry software AMES Stereo Pipeline (ASP). THe DEM has been tied to MOLA and can be considered resarch- and visualization-ready. Because it has not been manually edited using a full 3D editing environment, ASP DEMs cannot currently be considered true engineering-ready for performing landings.
 
 References:
@@ -433,7 +433,7 @@ Mayer, D. P., E. S. Kite, 2016, An Integrated Workflow for Producing Digital Ter
 local treks_CTX_Shade_12S289E_24mp_D01_027446_1678_D01_027723_1677 = {
   Identifier = "CTX_Shade_12S289E_24mp_D01_027446_1678_D01_027723_1677",
   Name = [[Mars Reconnaissance Orbiter CTX, HillShade East Melas 12S289E_D01]],
-  FilePath = asset.localResource("Mars_Reconnaissance_Orbiter_CTX/HillShade_East_Melas_12S289E_D01.vrt"),
+  FilePath = asset.resource("Mars_Reconnaissance_Orbiter_CTX/HillShade_East_Melas_12S289E_D01.vrt"),
   Description = [[This is a grayscale shaded relief (hillshade) for the original digital elevation model (DEM/DTM) as produced as part of an effort to characterize topography within candidate Human Exploration Zones for Mars. The DEM was constructed from a pair of CTX images using the stereo photogrammetry software AMES Stereo Pipeline (ASP). THe DEM has been tied to MOLA and can be considered resarch- and visualization-ready. Because it has not been manually edited using a full 3D editing environment, ASP DEMs cannot currently be considered true engineering-ready for performing landings.
 
 References:
@@ -445,7 +445,7 @@ Mayer, D. P., E. S. Kite, 2016, An Integrated Workflow for Producing Digital Ter
 local treks_CTX_Shade_12S289E_24mp_F18_042927_1681_J02_045749_1694 = {
   Identifier = "CTX_Shade_12S289E_24mp_F18_042927_1681_J02_045749_1694",
   Name = [[Mars Reconnaissance Orbiter CTX, HillShade East Melas 12S289E_F18]],
-  FilePath = asset.localResource("Mars_Reconnaissance_Orbiter_CTX/HillShade_East_Melas_12S289E_F18.vrt"),
+  FilePath = asset.resource("Mars_Reconnaissance_Orbiter_CTX/HillShade_East_Melas_12S289E_F18.vrt"),
   Description = [[This is a grayscale shaded relief (hillshade) for the original digital elevation model (DEM/DTM) as produced as part of an effort to characterize topography within candidate Human Exploration Zones for Mars. The DEM was constructed from a pair of CTX images using the stereo photogrammetry software AMES Stereo Pipeline (ASP). THe DEM has been tied to MOLA and can be considered resarch- and visualization-ready. Because it has not been manually edited using a full 3D editing environment, ASP DEMs cannot currently be considered true engineering-ready for performing landings.
 
 References:
@@ -457,7 +457,7 @@ Mayer, D. P., E. S. Kite, 2016, An Integrated Workflow for Producing Digital Ter
 local treks_CTX_Shade_12S290E_24mp_D18_034250_1676_D21_035450_1674 = {
   Identifier = "CTX_Shade_12S290E_24mp_D18_034250_1676_D21_035450_1674",
   Name = [[Mars Reconnaissance Orbiter CTX, HillShade East Melas 12S290E]],
-  FilePath = asset.localResource("Mars_Reconnaissance_Orbiter_CTX/HillShade_East_Melas_12S290E.vrt"),
+  FilePath = asset.resource("Mars_Reconnaissance_Orbiter_CTX/HillShade_East_Melas_12S290E.vrt"),
   Description = [[This is a grayscale shaded relief (hillshade) for the original digital elevation model (DEM/DTM) as produced as part of an effort to characterize topography within candidate Human Exploration Zones for Mars. The DEM was constructed from a pair of CTX images using the stereo photogrammetry software AMES Stereo Pipeline (ASP). THe DEM has been tied to MOLA and can be considered resarch- and visualization-ready. Because it has not been manually edited using a full 3D editing environment, ASP DEMs cannot currently be considered true engineering-ready for performing landings.
 
 References:
@@ -469,7 +469,7 @@ Mayer, D. P., E. S. Kite, 2016, An Integrated Workflow for Producing Digital Ter
 local treks_CTX_Shade_12S291E_24mp_F14_041292_1682_F16_041938_1682 = {
   Identifier = "CTX_Shade_12S291E_24mp_F14_041292_1682_F16_041938_1682",
   Name = [[Mars Reconnaissance Orbiter CTX, HillShade East Melas 12S291E_F14]],
-  FilePath = asset.localResource("Mars_Reconnaissance_Orbiter_CTX/HillShade_East_Melas_12S291E_F14.vrt"),
+  FilePath = asset.resource("Mars_Reconnaissance_Orbiter_CTX/HillShade_East_Melas_12S291E_F14.vrt"),
   Description = [[This is a grayscale shaded relief (hillshade) for the original digital elevation model (DEM/DTM) as produced as part of an effort to characterize topography within candidate Human Exploration Zones for Mars. The DEM was constructed from a pair of CTX images using the stereo photogrammetry software AMES Stereo Pipeline (ASP). THe DEM has been tied to MOLA and can be considered resarch- and visualization-ready. Because it has not been manually edited using a full 3D editing environment, ASP DEMs cannot currently be considered true engineering-ready for performing landings.
 
 References:
@@ -481,7 +481,7 @@ Mayer, D. P., E. S. Kite, 2016, An Integrated Workflow for Producing Digital Ter
 local treks_CTX_Shade_12S291E_24mp_F21_043850_1684_F21_043916_1685 = {
   Identifier = "CTX_Shade_12S291E_24mp_F21_043850_1684_F21_043916_1685",
   Name = [[Mars Reconnaissance Orbiter CTX, HillShade East Melas 12S291E_F21]],
-  FilePath = asset.localResource("Mars_Reconnaissance_Orbiter_CTX/HillShade_East_Melas_12S291E_F21.vrt"),
+  FilePath = asset.resource("Mars_Reconnaissance_Orbiter_CTX/HillShade_East_Melas_12S291E_F21.vrt"),
   Description = [[This is a grayscale shaded relief (hillshade) for the original digital elevation model (DEM/DTM) as produced as part of an effort to characterize topography within candidate Human Exploration Zones for Mars. The DEM was constructed from a pair of CTX images using the stereo photogrammetry software AMES Stereo Pipeline (ASP). THe DEM has been tied to MOLA and can be considered resarch- and visualization-ready. Because it has not been manually edited using a full 3D editing environment, ASP DEMs cannot currently be considered true engineering-ready for performing landings.
 
 References:
@@ -493,7 +493,7 @@ Mayer, D. P., E. S. Kite, 2016, An Integrated Workflow for Producing Digital Ter
 local treks_CTX_Shade_12S291E_24mp_J01_045116_1677_J03_046039_1676 = {
   Identifier = "CTX_Shade_12S291E_24mp_J01_045116_1677_J03_046039_1676",
   Name = [[Mars Reconnaissance Orbiter CTX, HillShade East Melas 12S291E_J01]],
-  FilePath = asset.localResource("Mars_Reconnaissance_Orbiter_CTX/HillShade_East_Melas_12S291E_J01.vrt"),
+  FilePath = asset.resource("Mars_Reconnaissance_Orbiter_CTX/HillShade_East_Melas_12S291E_J01.vrt"),
   Description = [[This is a grayscale shaded relief (hillshade) for the original digital elevation model (DEM/DTM) as produced as part of an effort to characterize topography within candidate Human Exploration Zones for Mars. The DEM was constructed from a pair of CTX images using the stereo photogrammetry software AMES Stereo Pipeline (ASP). THe DEM has been tied to MOLA and can be considered resarch- and visualization-ready. Because it has not been manually edited using a full 3D editing environment, ASP DEMs cannot currently be considered true engineering-ready for performing landings.
 
 References:
@@ -505,7 +505,7 @@ Mayer, D. P., E. S. Kite, 2016, An Integrated Workflow for Producing Digital Ter
 local treks_CTX_Shade_13S289E_24mp_D10_031125_1673_D12_031903_1669 = {
   Identifier = "CTX_Shade_13S289E_24mp_D10_031125_1673_D12_031903_1669",
   Name = [[Mars Reconnaissance Orbiter CTX, HillShade East Melas 13S289E_D10]],
-  FilePath = asset.localResource("Mars_Reconnaissance_Orbiter_CTX/HillShade_East_Melas_13S289E_D10.vrt"),
+  FilePath = asset.resource("Mars_Reconnaissance_Orbiter_CTX/HillShade_East_Melas_13S289E_D10.vrt"),
   Description = [[This is a grayscale shaded relief (hillshade) for the original digital elevation model (DEM/DTM) as produced as part of an effort to characterize topography within candidate Human Exploration Zones for Mars. The DEM was constructed from a pair of CTX images using the stereo photogrammetry software AMES Stereo Pipeline (ASP). THe DEM has been tied to MOLA and can be considered resarch- and visualization-ready. Because it has not been manually edited using a full 3D editing environment, ASP DEMs cannot currently be considered true engineering-ready for performing landings.
 
 References:
@@ -517,7 +517,7 @@ Mayer, D. P., E. S. Kite, 2016, An Integrated Workflow for Producing Digital Ter
 local treks_CTX_Shade_16S291E_24mp_D22_035951_1644_F01_036307_1644 = {
   Identifier = "CTX_Shade_16S291E_24mp_D22_035951_1644_F01_036307_1644",
   Name = [[Mars Reconnaissance Orbiter CTX, HillShade East Melas 16S291E_D22]],
-  FilePath = asset.localResource("Mars_Reconnaissance_Orbiter_CTX/HillShade_East_Melas_16S291E_D22.vrt"),
+  FilePath = asset.resource("Mars_Reconnaissance_Orbiter_CTX/HillShade_East_Melas_16S291E_D22.vrt"),
   Description = [[This is a grayscale shaded relief (hillshade) for the original digital elevation model (DEM/DTM) as produced as part of an effort to characterize topography within candidate Human Exploration Zones for Mars. The DEM was constructed from a pair of CTX images using the stereo photogrammetry software AMES Stereo Pipeline (ASP). THe DEM has been tied to MOLA and can be considered resarch- and visualization-ready. Because it has not been manually edited using a full 3D editing environment, ASP DEMs cannot currently be considered true engineering-ready for performing landings.
 
 References:
@@ -529,7 +529,7 @@ Mayer, D. P., E. S. Kite, 2016, An Integrated Workflow for Producing Digital Ter
 local treks_Deuteronilus_CTX_Shade_v0_20171112 = {
   Identifier = "Deuteronilus_CTX_Shade_v0_20171112",
   Name = [[Mars Reconnaissance Orbiter CTX, Hilllshade Deuteronilus]],
-  FilePath = asset.localResource("Mars_Reconnaissance_Orbiter_CTX/Hilllshade_Deuteronilus.vrt"),
+  FilePath = asset.resource("Mars_Reconnaissance_Orbiter_CTX/Hilllshade_Deuteronilus.vrt"),
   Description = [[This is a grayscale shaded relief (hillshade) for the original digital elevation model (DEM/DTM) as produced as part of an effort to characterize topography within candidate Human Exploration Zones for Mars. The DEM was constructed from a pair of CTX images using the stereo photogrammetry software AMES Stereo Pipeline (ASP). THe DEM has been tied to MOLA and can be considered resarch- and visualization-ready. Because it has not been manually edited using a full 3D editing environment, ASP DEMs cannot currently be considered true engineering-ready for performing landings.
 
 References:
@@ -541,7 +541,7 @@ Mayer, D. P., E. S. Kite, 2016, An Integrated Workflow for Producing Digital Ter
 local treks_CTX_Ortho_12S182E_24mp_P22_009609_1674 = {
   Identifier = "CTX_Ortho_12S182E_24mp_P22_009609_1674",
   Name = [[Mars Reconnaissance Orbiter CTX, Mosaic Apollinaris 12S182E]],
-  FilePath = asset.localResource("Mars_Reconnaissance_Orbiter_CTX/Mosaic_Apollinaris_12S182E.vrt"),
+  FilePath = asset.resource("Mars_Reconnaissance_Orbiter_CTX/Mosaic_Apollinaris_12S182E.vrt"),
   Description = [[This is a CTX orthorectified image, geometrically corrected using its own source digital elevation model (DEM/DTM), as produced as part of an effort to characterize candidate Human Exploration Zones for Mars. The original DEM was constructed from a pair of CTX images using the stereo photogrammetry software AMES Stereo Pipeline (ASP). The DEM, and thus orthoimage, has been tied to MOLA and can be considered resarch- and visualization-ready. Because it has not been manually edited using a full 3D editing environment, ASP DEMs cannot currently be considered true engineering-ready for performing landings.
 
 References:
@@ -553,7 +553,7 @@ Mayer, D. P., E. S. Kite, 2016, An Integrated Workflow for Producing Digital Ter
 local treks_CTX_Ortho_13S182E_24mp_G15_024127_1673 = {
   Identifier = "CTX_Ortho_13S182E_24mp_G15_024127_1673",
   Name = [[Mars Reconnaissance Orbiter CTX, Mosaic Apollinaris 13S182E]],
-  FilePath = asset.localResource("Mars_Reconnaissance_Orbiter_CTX/Mosaic_Apollinaris_13S182E.vrt"),
+  FilePath = asset.resource("Mars_Reconnaissance_Orbiter_CTX/Mosaic_Apollinaris_13S182E.vrt"),
   Description = [[This is a CTX orthorectified image, geometrically corrected using its own source digital elevation model (DEM/DTM), as produced as part of an effort to characterize candidate Human Exploration Zones for Mars. The original DEM was constructed from a pair of CTX images using the stereo photogrammetry software AMES Stereo Pipeline (ASP). The DEM, and thus orthoimage, has been tied to MOLA and can be considered resarch- and visualization-ready. Because it has not been manually edited using a full 3D editing environment, ASP DEMs cannot currently be considered true engineering-ready for performing landings.
 
 References:
@@ -565,7 +565,7 @@ Mayer, D. P., E. S. Kite, 2016, An Integrated Workflow for Producing Digital Ter
 local treks_CTX_Ortho_14S184E_24mp_B01_009886_1658 = {
   Identifier = "CTX_Ortho_14S184E_24mp_B01_009886_1658",
   Name = [[Mars Reconnaissance Orbiter CTX, Mosaic Apollinaris 14S184E]],
-  FilePath = asset.localResource("Mars_Reconnaissance_Orbiter_CTX/Mosaic_Apollinaris_14S184E.vrt"),
+  FilePath = asset.resource("Mars_Reconnaissance_Orbiter_CTX/Mosaic_Apollinaris_14S184E.vrt"),
   Description = [[This is a CTX orthorectified image, geometrically corrected using its own source digital elevation model (DEM/DTM), as produced as part of an effort to characterize candidate Human Exploration Zones for Mars. The original DEM was constructed from a pair of CTX images using the stereo photogrammetry software AMES Stereo Pipeline (ASP). The DEM, and thus orthoimage, has been tied to MOLA and can be considered resarch- and visualization-ready. Because it has not been manually edited using a full 3D editing environment, ASP DEMs cannot currently be considered true engineering-ready for performing landings.
 
 References:
@@ -577,7 +577,7 @@ Mayer, D. P., E. S. Kite, 2016, An Integrated Workflow for Producing Digital Ter
 local treks_CTX_Ortho_10S291E_24mp_P22_009684_1699 = {
   Identifier = "CTX_Ortho_10S291E_24mp_P22_009684_1699",
   Name = [[Mars Reconnaissance Orbiter CTX, Mosaic Coprates 10S291E]],
-  FilePath = asset.localResource("Mars_Reconnaissance_Orbiter_CTX/Mosaic_Coprates_10S291E.vrt"),
+  FilePath = asset.resource("Mars_Reconnaissance_Orbiter_CTX/Mosaic_Coprates_10S291E.vrt"),
   Description = [[This is a CTX orthorectified image, geometrically corrected using its own source digital elevation model (DEM/DTM), as produced as part of an effort to characterize candidate Human Exploration Zones for Mars. The original DEM was constructed from a pair of CTX images using the stereo photogrammetry software AMES Stereo Pipeline (ASP). The DEM, and thus orthoimage, has been tied to MOLA and can be considered resarch- and visualization-ready. Because it has not been manually edited using a full 3D editing environment, ASP DEMs cannot currently be considered true engineering-ready for performing landings.
 
 References:
@@ -589,7 +589,7 @@ Mayer, D. P., E. S. Kite, 2016, An Integrated Workflow for Producing Digital Ter
 local treks_CTX_Ortho_11S293E_24mp_B09_013231_1696 = {
   Identifier = "CTX_Ortho_11S293E_24mp_B09_013231_1696",
   Name = [[Mars Reconnaissance Orbiter CTX, Mosaic Coprates 11S293E]],
-  FilePath = asset.localResource("Mars_Reconnaissance_Orbiter_CTX/Mosaic_Coprates_11S293E.vrt"),
+  FilePath = asset.resource("Mars_Reconnaissance_Orbiter_CTX/Mosaic_Coprates_11S293E.vrt"),
   Description = [[This is a CTX orthorectified image, geometrically corrected using its own source digital elevation model (DEM/DTM), as produced as part of an effort to characterize candidate Human Exploration Zones for Mars. The original DEM was constructed from a pair of CTX images using the stereo photogrammetry software AMES Stereo Pipeline (ASP). The DEM, and thus orthoimage, has been tied to MOLA and can be considered resarch- and visualization-ready. Because it has not been manually edited using a full 3D editing environment, ASP DEMs cannot currently be considered true engineering-ready for performing landings.
 
 References:
@@ -601,7 +601,7 @@ Mayer, D. P., E. S. Kite, 2016, An Integrated Workflow for Producing Digital Ter
 local treks_CTX_Ortho_13S293E_24mp_G07_020879_1669 = {
   Identifier = "CTX_Ortho_13S293E_24mp_G07_020879_1669",
   Name = [[Mars Reconnaissance Orbiter CTX, Mosaic Coprates 13S293E]],
-  FilePath = asset.localResource("Mars_Reconnaissance_Orbiter_CTX/Mosaic_Coprates_13S293E.vrt"),
+  FilePath = asset.resource("Mars_Reconnaissance_Orbiter_CTX/Mosaic_Coprates_13S293E.vrt"),
   Description = [[This is a CTX orthorectified image, geometrically corrected using its own source digital elevation model (DEM/DTM), as produced as part of an effort to characterize candidate Human Exploration Zones for Mars. The original DEM was constructed from a pair of CTX images using the stereo photogrammetry software AMES Stereo Pipeline (ASP). The DEM, and thus orthoimage, has been tied to MOLA and can be considered resarch- and visualization-ready. Because it has not been manually edited using a full 3D editing environment, ASP DEMs cannot currently be considered true engineering-ready for performing landings.
 
 References:
@@ -613,7 +613,7 @@ Mayer, D. P., E. S. Kite, 2016, An Integrated Workflow for Producing Digital Ter
 local treks_CTX_Ortho_38N024E_6mp_B17_016168_2181 = {
   Identifier = "CTX_Ortho_38N024E_6mp_B17_016168_2181",
   Name = [[Mars Reconnaissance Orbiter CTX, Mosaic Deuteronius 38N024E]],
-  FilePath = asset.localResource("Mars_Reconnaissance_Orbiter_CTX/Mosaic_Deuteronius_38N024E.vrt"),
+  FilePath = asset.resource("Mars_Reconnaissance_Orbiter_CTX/Mosaic_Deuteronius_38N024E.vrt"),
   Description = [[This is a CTX orthorectified image, geometrically corrected using its own source digital elevation model (DEM/DTM), as produced as part of an effort to characterize candidate Human Exploration Zones for Mars. The original DEM was constructed from a pair of CTX images using the stereo photogrammetry software AMES Stereo Pipeline (ASP). The DEM, and thus orthoimage, has been tied to MOLA and can be considered resarch- and visualization-ready. Because it has not been manually edited using a full 3D editing environment, ASP DEMs cannot currently be considered true engineering-ready for performing landings.
 
 References:
@@ -625,7 +625,7 @@ Mayer, D. P., E. S. Kite, 2016, An Integrated Workflow for Producing Digital Ter
 local treks_CTX_Ortho_39N024E_6mp_D15_032875_2196 = {
   Identifier = "CTX_Ortho_39N024E_6mp_D15_032875_2196",
   Name = [[Mars Reconnaissance Orbiter CTX, Mosaic Deuteronius 39N024E]],
-  FilePath = asset.localResource("Mars_Reconnaissance_Orbiter_CTX/Mosaic_Deuteronius_39N024E.vrt"),
+  FilePath = asset.resource("Mars_Reconnaissance_Orbiter_CTX/Mosaic_Deuteronius_39N024E.vrt"),
   Description = [[This is a CTX orthorectified image, geometrically corrected using its own source digital elevation model (DEM/DTM), as produced as part of an effort to characterize candidate Human Exploration Zones for Mars. The original DEM was constructed from a pair of CTX images using the stereo photogrammetry software AMES Stereo Pipeline (ASP). The DEM, and thus orthoimage, has been tied to MOLA and can be considered resarch- and visualization-ready. Because it has not been manually edited using a full 3D editing environment, ASP DEMs cannot currently be considered true engineering-ready for performing landings.
 
 References:
@@ -637,7 +637,7 @@ Mayer, D. P., E. S. Kite, 2016, An Integrated Workflow for Producing Digital Ter
 local treks_CTX_Ortho_40N022E_6mp_B18_016656_2206 = {
   Identifier = "CTX_Ortho_40N022E_6mp_B18_016656_2206",
   Name = [[Mars Reconnaissance Orbiter CTX, Mosaic Deuteronius 40N024E]],
-  FilePath = asset.localResource("Mars_Reconnaissance_Orbiter_CTX/Mosaic_Deuteronius_40N024E.vrt"),
+  FilePath = asset.resource("Mars_Reconnaissance_Orbiter_CTX/Mosaic_Deuteronius_40N024E.vrt"),
   Description = [[This is a CTX orthorectified image, geometrically corrected using its own source digital elevation model (DEM/DTM), as produced as part of an effort to characterize candidate Human Exploration Zones for Mars. The original DEM was constructed from a pair of CTX images using the stereo photogrammetry software AMES Stereo Pipeline (ASP). The DEM, and thus orthoimage, has been tied to MOLA and can be considered resarch- and visualization-ready. Because it has not been manually edited using a full 3D editing environment, ASP DEMs cannot currently be considered true engineering-ready for performing landings.
 
 References:
@@ -649,7 +649,7 @@ Mayer, D. P., E. S. Kite, 2016, An Integrated Workflow for Producing Digital Ter
 local treks_CTX_Ortho_11S289E_6mp_F23_044971_1685 = {
   Identifier = "CTX_Ortho_11S289E_6mp_F23_044971_1685",
   Name = [[Mars Reconnaissance Orbiter CTX, Mosaic East Melas 11S289E]],
-  FilePath = asset.localResource("Mars_Reconnaissance_Orbiter_CTX/Mosaic_East_Melas_11S289E.vrt"),
+  FilePath = asset.resource("Mars_Reconnaissance_Orbiter_CTX/Mosaic_East_Melas_11S289E.vrt"),
   Description = [[This is a CTX orthorectified image, geometrically corrected using its own source digital elevation model (DEM/DTM), as produced as part of an effort to characterize candidate Human Exploration Zones for Mars. The original DEM was constructed from a pair of CTX images using the stereo photogrammetry software AMES Stereo Pipeline (ASP). The DEM, and thus orthoimage, has been tied to MOLA and can be considered resarch- and visualization-ready. Because it has not been manually edited using a full 3D editing environment, ASP DEMs cannot currently be considered true engineering-ready for performing landings.
 
 References:
@@ -661,7 +661,7 @@ Mayer, D. P., E. S. Kite, 2016, An Integrated Workflow for Producing Digital Ter
 local treks_CTX_Ortho_11S291E_6mp_B19_017187_1685 = {
   Identifier = "CTX_Ortho_11S291E_6mp_B19_017187_1685",
   Name = [[Mars Reconnaissance Orbiter CTX, Mosaic East Melas 11S291E]],
-  FilePath = asset.localResource("Mars_Reconnaissance_Orbiter_CTX/Mosaic_East_Melas_11S291E.vrt"),
+  FilePath = asset.resource("Mars_Reconnaissance_Orbiter_CTX/Mosaic_East_Melas_11S291E.vrt"),
   Description = [[This is a CTX orthorectified image, geometrically corrected using its own source digital elevation model (DEM/DTM), as produced as part of an effort to characterize candidate Human Exploration Zones for Mars. The original DEM was constructed from a pair of CTX images using the stereo photogrammetry software AMES Stereo Pipeline (ASP). The DEM, and thus orthoimage, has been tied to MOLA and can be considered resarch- and visualization-ready. Because it has not been manually edited using a full 3D editing environment, ASP DEMs cannot currently be considered true engineering-ready for performing landings.
 
 References:
@@ -673,7 +673,7 @@ Mayer, D. P., E. S. Kite, 2016, An Integrated Workflow for Producing Digital Ter
 local treks_CTX_Ortho_12S289E_6mp_D01_027446_1678 = {
   Identifier = "CTX_Ortho_12S289E_6mp_D01_027446_1678",
   Name = [[Mars Reconnaissance Orbiter CTX, Mosaic East Melas 12S289E_D01]],
-  FilePath = asset.localResource("Mars_Reconnaissance_Orbiter_CTX/Mosaic_East_Melas_12S289E_D01.vrt"),
+  FilePath = asset.resource("Mars_Reconnaissance_Orbiter_CTX/Mosaic_East_Melas_12S289E_D01.vrt"),
   Description = [[This is a CTX orthorectified image, geometrically corrected using its own source digital elevation model (DEM/DTM), as produced as part of an effort to characterize candidate Human Exploration Zones for Mars. The original DEM was constructed from a pair of CTX images using the stereo photogrammetry software AMES Stereo Pipeline (ASP). The DEM, and thus orthoimage, has been tied to MOLA and can be considered resarch- and visualization-ready. Because it has not been manually edited using a full 3D editing environment, ASP DEMs cannot currently be considered true engineering-ready for performing landings.
 
 References:
@@ -685,7 +685,7 @@ Mayer, D. P., E. S. Kite, 2016, An Integrated Workflow for Producing Digital Ter
 local treks_CTX_Ortho_12S289E_6mp_F18_042927_1681 = {
   Identifier = "CTX_Ortho_12S289E_6mp_F18_042927_1681",
   Name = [[Mars Reconnaissance Orbiter CTX, Mosaic East Melas 12S289E_F18]],
-  FilePath = asset.localResource("Mars_Reconnaissance_Orbiter_CTX/Mosaic_East_Melas_12S289E_F18.vrt"),
+  FilePath = asset.resource("Mars_Reconnaissance_Orbiter_CTX/Mosaic_East_Melas_12S289E_F18.vrt"),
   Description = [[This is a CTX orthorectified image, geometrically corrected using its own source digital elevation model (DEM/DTM), as produced as part of an effort to characterize candidate Human Exploration Zones for Mars. The original DEM was constructed from a pair of CTX images using the stereo photogrammetry software AMES Stereo Pipeline (ASP). The DEM, and thus orthoimage, has been tied to MOLA and can be considered resarch- and visualization-ready. Because it has not been manually edited using a full 3D editing environment, ASP DEMs cannot currently be considered true engineering-ready for performing landings.
 
 References:
@@ -697,7 +697,7 @@ Mayer, D. P., E. S. Kite, 2016, An Integrated Workflow for Producing Digital Ter
 local treks_CTX_Ortho_12S290E_6mp_D18_034250_1676 = {
   Identifier = "CTX_Ortho_12S290E_6mp_D18_034250_1676",
   Name = [[Mars Reconnaissance Orbiter CTX, Mosaic East Melas 12S290E]],
-  FilePath = asset.localResource("Mars_Reconnaissance_Orbiter_CTX/Mosaic_East_Melas_12S290E.vrt"),
+  FilePath = asset.resource("Mars_Reconnaissance_Orbiter_CTX/Mosaic_East_Melas_12S290E.vrt"),
   Description = [[This is a CTX orthorectified image, geometrically corrected using its own source digital elevation model (DEM/DTM), as produced as part of an effort to characterize candidate Human Exploration Zones for Mars. The original DEM was constructed from a pair of CTX images using the stereo photogrammetry software AMES Stereo Pipeline (ASP). The DEM, and thus orthoimage, has been tied to MOLA and can be considered resarch- and visualization-ready. Because it has not been manually edited using a full 3D editing environment, ASP DEMs cannot currently be considered true engineering-ready for performing landings.
 
 References:
@@ -709,7 +709,7 @@ Mayer, D. P., E. S. Kite, 2016, An Integrated Workflow for Producing Digital Ter
 local treks_F14_041292_1682_map_ba_align_6_fill500DRG = {
   Identifier = "F14_041292_1682_map_ba_align_6_fill500DRG",
   Name = [[Mars Reconnaissance Orbiter CTX, Mosaic East Melas 12S291E_F14]],
-  FilePath = asset.localResource("Mars_Reconnaissance_Orbiter_CTX/Mosaic_East_Melas_12S291E_F14.vrt"),
+  FilePath = asset.resource("Mars_Reconnaissance_Orbiter_CTX/Mosaic_East_Melas_12S291E_F14.vrt"),
   Description = [[This is a CTX orthorectified image, geometrically corrected using its own source digital elevation model (DEM/DTM), as produced as part of an effort to characterize candidate Human Exploration Zones for Mars. The original DEM was constructed from a pair of CTX images using the stereo photogrammetry software AMES Stereo Pipeline (ASP). The DEM, and thus orthoimage, has been tied to MOLA and can be considered resarch- and visualization-ready. Because it has not been manually edited using a full 3D editing environment, ASP DEMs cannot currently be considered true engineering-ready for performing landings.
 
 References:
@@ -721,7 +721,7 @@ Mayer, D. P., E. S. Kite, 2016, An Integrated Workflow for Producing Digital Ter
 local treks_CTX_Ortho_12S291E_6mp_F21_043850_1684 = {
   Identifier = "CTX_Ortho_12S291E_6mp_F21_043850_1684",
   Name = [[Mars Reconnaissance Orbiter CTX, Mosaic East Melas 12S291E_F21]],
-  FilePath = asset.localResource("Mars_Reconnaissance_Orbiter_CTX/Mosaic_East_Melas_12S291E_F21.vrt"),
+  FilePath = asset.resource("Mars_Reconnaissance_Orbiter_CTX/Mosaic_East_Melas_12S291E_F21.vrt"),
   Description = [[This is a CTX orthorectified image, geometrically corrected using its own source digital elevation model (DEM/DTM), as produced as part of an effort to characterize candidate Human Exploration Zones for Mars. The original DEM was constructed from a pair of CTX images using the stereo photogrammetry software AMES Stereo Pipeline (ASP). The DEM, and thus orthoimage, has been tied to MOLA and can be considered resarch- and visualization-ready. Because it has not been manually edited using a full 3D editing environment, ASP DEMs cannot currently be considered true engineering-ready for performing landings.
 
 References:
@@ -733,7 +733,7 @@ Mayer, D. P., E. S. Kite, 2016, An Integrated Workflow for Producing Digital Ter
 local treks_CTX_Ortho_12S291E_6mp_J01_045116_1677 = {
   Identifier = "CTX_Ortho_12S291E_6mp_J01_045116_1677",
   Name = [[Mars Reconnaissance Orbiter CTX, Mosaic East Melas 12S291E_J01]],
-  FilePath = asset.localResource("Mars_Reconnaissance_Orbiter_CTX/Mosaic_East_Melas_12S291E_J01.vrt"),
+  FilePath = asset.resource("Mars_Reconnaissance_Orbiter_CTX/Mosaic_East_Melas_12S291E_J01.vrt"),
   Description = [[This is a CTX orthorectified image, geometrically corrected using its own source digital elevation model (DEM/DTM), as produced as part of an effort to characterize candidate Human Exploration Zones for Mars. The original DEM was constructed from a pair of CTX images using the stereo photogrammetry software AMES Stereo Pipeline (ASP). The DEM, and thus orthoimage, has been tied to MOLA and can be considered resarch- and visualization-ready. Because it has not been manually edited using a full 3D editing environment, ASP DEMs cannot currently be considered true engineering-ready for performing landings.
 
 References:
@@ -745,7 +745,7 @@ Mayer, D. P., E. S. Kite, 2016, An Integrated Workflow for Producing Digital Ter
 local treks_CTX_Ortho_13S289E_6mp_D10_031125_1673 = {
   Identifier = "CTX_Ortho_13S289E_6mp_D10_031125_1673",
   Name = [[Mars Reconnaissance Orbiter CTX, Mosaic East Melas 13S289E_D10]],
-  FilePath = asset.localResource("Mars_Reconnaissance_Orbiter_CTX/Mosaic_East_Melas_13S289E_D10.vrt"),
+  FilePath = asset.resource("Mars_Reconnaissance_Orbiter_CTX/Mosaic_East_Melas_13S289E_D10.vrt"),
   Description = [[This is a CTX orthorectified image, geometrically corrected using its own source digital elevation model (DEM/DTM), as produced as part of an effort to characterize candidate Human Exploration Zones for Mars. The original DEM was constructed from a pair of CTX images using the stereo photogrammetry software AMES Stereo Pipeline (ASP). The DEM, and thus orthoimage, has been tied to MOLA and can be considered resarch- and visualization-ready. Because it has not been manually edited using a full 3D editing environment, ASP DEMs cannot currently be considered true engineering-ready for performing landings.
 
 References:
@@ -757,7 +757,7 @@ Mayer, D. P., E. S. Kite, 2016, An Integrated Workflow for Producing Digital Ter
 local treks_CTX_Ortho_16S291E_6mp_D22_035951_1644 = {
   Identifier = "CTX_Ortho_16S291E_6mp_D22_035951_1644",
   Name = [[Mars Reconnaissance Orbiter CTX, Mosaic East Melas 16S291E]],
-  FilePath = asset.localResource("Mars_Reconnaissance_Orbiter_CTX/Mosaic_East_Melas_16S291E.vrt"),
+  FilePath = asset.resource("Mars_Reconnaissance_Orbiter_CTX/Mosaic_East_Melas_16S291E.vrt"),
   Description = [[This is a CTX orthorectified image, geometrically corrected using its own source digital elevation model (DEM/DTM), as produced as part of an effort to characterize candidate Human Exploration Zones for Mars. The original DEM was constructed from a pair of CTX images using the stereo photogrammetry software AMES Stereo Pipeline (ASP). The DEM, and thus orthoimage, has been tied to MOLA and can be considered resarch- and visualization-ready. Because it has not been manually edited using a full 3D editing environment, ASP DEMs cannot currently be considered true engineering-ready for performing landings.
 
 References:
@@ -769,7 +769,7 @@ Mayer, D. P., E. S. Kite, 2016, An Integrated Workflow for Producing Digital Ter
 local treks_CTX_Slope_12S182E_24mp_P22_009609_1674_B02_010453_1675 = {
   Identifier = "CTX_Slope_12S182E_24mp_P22_009609_1674_B02_010453_1675",
   Name = [[Mars Reconnaissance Orbiter CTX, Slope Apollinaris 12S182E]],
-  FilePath = asset.localResource("Mars_Reconnaissance_Orbiter_CTX/Slope_Apollinaris_12S182E.vrt"),
+  FilePath = asset.resource("Mars_Reconnaissance_Orbiter_CTX/Slope_Apollinaris_12S182E.vrt"),
   Description = [[This is a colorized version of the original 2x2 pixel slope in degrees (also called a 1 baseline slope). This was produced as part of an effort to characterize topography within candidate Human Exploration Zones for Mars. The DEM was constructed from a pair of CTX images using the stereo photogrammetry software AMES Stereo Pipeline (ASP). THe DEM has been tied to MOLA and can be considered resarch- and visualization-ready. Because it has not been manually edited using a full 3D editing environment, ASP DEMs cannot currently be considered true engineering-ready for performing landings.
 
 References:
@@ -783,7 +783,7 @@ Slopes were derived using the Python script called gdal_baseline_slope.py: https
 local treks_CTX_Slope_13S182E_24mp_G15_024127_1673_G16_024483_1673 = {
   Identifier = "CTX_Slope_13S182E_24mp_G15_024127_1673_G16_024483_1673",
   Name = [[Mars Reconnaissance Orbiter CTX, Slope Apollinaris 13S182E]],
-  FilePath = asset.localResource("Mars_Reconnaissance_Orbiter_CTX/Slope_Apollinaris_13S182E.vrt"),
+  FilePath = asset.resource("Mars_Reconnaissance_Orbiter_CTX/Slope_Apollinaris_13S182E.vrt"),
   Description = [[This is a colorized version of the original 2x2 pixel slope in degrees (also called a 1 baseline slope). This was produced as part of an effort to characterize topography within candidate Human Exploration Zones for Mars. The DEM was constructed from a pair of CTX images using the stereo photogrammetry software AMES Stereo Pipeline (ASP). THe DEM has been tied to MOLA and can be considered resarch- and visualization-ready. Because it has not been manually edited using a full 3D editing environment, ASP DEMs cannot currently be considered true engineering-ready for performing landings.
 
 References:
@@ -797,7 +797,7 @@ Slopes were derived using the Python script called gdal_baseline_slope.py: https
 local treks_CTX_Slope_14S184E_24mp_B01_009886_1658_P21_009385_1658 = {
   Identifier = "CTX_Slope_14S184E_24mp_B01_009886_1658_P21_009385_1658",
   Name = [[Mars Reconnaissance Orbiter CTX, Slope Apollinaris 14S184E]],
-  FilePath = asset.localResource("Mars_Reconnaissance_Orbiter_CTX/Slope_Apollinaris_14S184E.vrt"),
+  FilePath = asset.resource("Mars_Reconnaissance_Orbiter_CTX/Slope_Apollinaris_14S184E.vrt"),
   Description = [[This is a colorized version of the original 2x2 pixel slope in degrees (also called a 1 baseline slope). This was produced as part of an effort to characterize topography within candidate Human Exploration Zones for Mars. The DEM was constructed from a pair of CTX images using the stereo photogrammetry software AMES Stereo Pipeline (ASP). THe DEM has been tied to MOLA and can be considered resarch- and visualization-ready. Because it has not been manually edited using a full 3D editing environment, ASP DEMs cannot currently be considered true engineering-ready for performing landings.
 
 References:
diff --git a/data/assets/scene/solarsystem/planets/mars/mars.asset b/data/assets/scene/solarsystem/planets/mars/mars.asset
index 1ae86ee846..6f25b031d1 100644
--- a/data/assets/scene/solarsystem/planets/mars/mars.asset
+++ b/data/assets/scene/solarsystem/planets/mars/mars.asset
@@ -4,7 +4,7 @@ local transforms = asset.require("./transforms")
 
 
 
-local labelsPath = asset.syncedResource({
+local labelsPath = asset.resource({
   Name = "Mars Labels",
   Type = "HttpSynchronization",
   Identifier = "mars_labels",
diff --git a/data/assets/scene/solarsystem/planets/mars/moons/deimos.asset b/data/assets/scene/solarsystem/planets/mars/moons/deimos.asset
index b1b383ab17..0c30512f58 100644
--- a/data/assets/scene/solarsystem/planets/mars/moons/deimos.asset
+++ b/data/assets/scene/solarsystem/planets/mars/moons/deimos.asset
@@ -4,14 +4,14 @@ local sun = asset.require("scene/solarsystem/sun/sun")
 
 
 
-local model = asset.syncedResource({
+local model = asset.resource({
   Name = "Deimos Model",
   Type = "HttpSynchronization",
   Identifier = "deimos_model",
   Version = 1
 })
 
-local kernels = asset.syncedResource({
+local kernels = asset.resource({
   Name = "Mars Spice Kernels",
   Type = "HttpSynchronization",
   Identifier = "mars_kernels",
diff --git a/data/assets/scene/solarsystem/planets/mars/moons/deimos_globe.asset b/data/assets/scene/solarsystem/planets/mars/moons/deimos_globe.asset
index ceb6eaa5c4..2c63a40743 100644
--- a/data/assets/scene/solarsystem/planets/mars/moons/deimos_globe.asset
+++ b/data/assets/scene/solarsystem/planets/mars/moons/deimos_globe.asset
@@ -2,7 +2,7 @@ local transforms = asset.require("../transforms")
 
 
 
-local kernels = asset.syncedResource({
+local kernels = asset.resource({
   Name = "Mars Spice Kernels",
   Type = "HttpSynchronization",
   Identifier = "mars_kernels",
diff --git a/data/assets/scene/solarsystem/planets/mars/moons/phobos.asset b/data/assets/scene/solarsystem/planets/mars/moons/phobos.asset
index c26d2a2ad5..722dd5c975 100644
--- a/data/assets/scene/solarsystem/planets/mars/moons/phobos.asset
+++ b/data/assets/scene/solarsystem/planets/mars/moons/phobos.asset
@@ -4,14 +4,14 @@ local sun = asset.require("scene/solarsystem/sun/sun")
 
 
 
-local model = asset.syncedResource({
+local model = asset.resource({
   Name = "Phobos Model",
   Type = "HttpSynchronization",
   Identifier = "phobos_model",
   Version = 1
 })
 
-local kernels = asset.syncedResource({
+local kernels = asset.resource({
   Name = "Mars Spice Kernels",
   Type = "HttpSynchronization",
   Identifier = "mars_kernels",
diff --git a/data/assets/scene/solarsystem/planets/mars/moons/phobos_globe.asset b/data/assets/scene/solarsystem/planets/mars/moons/phobos_globe.asset
index e8bfc26a0d..84623a9151 100644
--- a/data/assets/scene/solarsystem/planets/mars/moons/phobos_globe.asset
+++ b/data/assets/scene/solarsystem/planets/mars/moons/phobos_globe.asset
@@ -2,7 +2,7 @@ local transforms = asset.require("../transforms")
 
 
 
-local kernels = asset.syncedResource({
+local kernels = asset.resource({
   Name = "Mars Spice Kernels",
   Type = "HttpSynchronization",
   Identifier = "mars_kernels",
diff --git a/data/assets/scene/solarsystem/planets/mercury/layers/colorlayers/alsimap_02122015.asset b/data/assets/scene/solarsystem/planets/mercury/layers/colorlayers/alsimap_02122015.asset
index e27c699f95..42e3405ce4 100644
--- a/data/assets/scene/solarsystem/planets/mercury/layers/colorlayers/alsimap_02122015.asset
+++ b/data/assets/scene/solarsystem/planets/mercury/layers/colorlayers/alsimap_02122015.asset
@@ -2,7 +2,7 @@ local globe = asset.require("../../mercury")
 
 
 
-local texturesPath = asset.syncedResource({
+local texturesPath = asset.resource({
   Name = "Mercury Textures",
   Type = "HttpSynchronization",
   Identifier = "mercury_abundance_textures",
diff --git a/data/assets/scene/solarsystem/planets/mercury/layers/colorlayers/casimap_02122015.asset b/data/assets/scene/solarsystem/planets/mercury/layers/colorlayers/casimap_02122015.asset
index dc5e3e71c7..8021eea9cf 100644
--- a/data/assets/scene/solarsystem/planets/mercury/layers/colorlayers/casimap_02122015.asset
+++ b/data/assets/scene/solarsystem/planets/mercury/layers/colorlayers/casimap_02122015.asset
@@ -2,7 +2,7 @@ local globe = asset.require("../../mercury")
 
 
 
-local texturesPath = asset.syncedResource({
+local texturesPath = asset.resource({
   Name = "Mercury Textures",
   Type = "HttpSynchronization",
   Identifier = "mercury_abundance_textures",
diff --git a/data/assets/scene/solarsystem/planets/mercury/layers/colorlayers/fesimap_02122015.asset b/data/assets/scene/solarsystem/planets/mercury/layers/colorlayers/fesimap_02122015.asset
index fb397287a7..deb23dad40 100644
--- a/data/assets/scene/solarsystem/planets/mercury/layers/colorlayers/fesimap_02122015.asset
+++ b/data/assets/scene/solarsystem/planets/mercury/layers/colorlayers/fesimap_02122015.asset
@@ -2,7 +2,7 @@ local globe = asset.require("../../mercury")
 
 
 
-local texturesPath = asset.syncedResource({
+local texturesPath = asset.resource({
   Name = "Mercury Textures",
   Type = "HttpSynchronization",
   Identifier = "mercury_abundance_textures",
diff --git a/data/assets/scene/solarsystem/planets/mercury/layers/colorlayers/mercury_texture.asset b/data/assets/scene/solarsystem/planets/mercury/layers/colorlayers/mercury_texture.asset
index 363bef5186..499c73e013 100644
--- a/data/assets/scene/solarsystem/planets/mercury/layers/colorlayers/mercury_texture.asset
+++ b/data/assets/scene/solarsystem/planets/mercury/layers/colorlayers/mercury_texture.asset
@@ -2,7 +2,7 @@ local globe = asset.require("../../mercury")
 
 
 
-local texturesPath = asset.syncedResource({
+local texturesPath = asset.resource({
   Name = "Mercury Textures",
   Type = "HttpSynchronization",
   Identifier = "mercury_textures",
diff --git a/data/assets/scene/solarsystem/planets/mercury/layers/colorlayers/messenger_bdr_newyork.asset b/data/assets/scene/solarsystem/planets/mercury/layers/colorlayers/messenger_bdr_newyork.asset
index 72cbc12107..67263d4464 100644
--- a/data/assets/scene/solarsystem/planets/mercury/layers/colorlayers/messenger_bdr_newyork.asset
+++ b/data/assets/scene/solarsystem/planets/mercury/layers/colorlayers/messenger_bdr_newyork.asset
@@ -6,7 +6,7 @@ local Layer = {
   Identifier = "Messenger_BDR_NewYork",
   Name = "Messenger BDR [New York]",
   Enabled = asset.enabled,
-  FilePath = asset.localResource("messenger_bdr_newyork.wms"),
+  FilePath = asset.resource("messenger_bdr_newyork.wms"),
   TilePixelSize = 360,
   Description = [[The Map Projected Basemap RDR (BDR) data set consists of a global
   monochrome map of reflectance at a resolution of 256 pixels per degree (~166 m/p).
diff --git a/data/assets/scene/solarsystem/planets/mercury/layers/colorlayers/messenger_bdr_sweden.asset b/data/assets/scene/solarsystem/planets/mercury/layers/colorlayers/messenger_bdr_sweden.asset
index 3e6e91190b..521eddf06b 100644
--- a/data/assets/scene/solarsystem/planets/mercury/layers/colorlayers/messenger_bdr_sweden.asset
+++ b/data/assets/scene/solarsystem/planets/mercury/layers/colorlayers/messenger_bdr_sweden.asset
@@ -6,7 +6,7 @@ local Layer = {
   Identifier = "Messenger_BDR_Sweden",
   Name = "Messenger BDR [Sweden]",
   Enabled = asset.enabled,
-  FilePath = asset.localResource("messenger_bdr_sweden.wms"),
+  FilePath = asset.resource("messenger_bdr_sweden.wms"),
   TilePixelSize = 360,
   Description = [[The Map Projected Basemap RDR (BDR) data set consists of a global
   monochrome map of reflectance at a resolution of 256 pixels per degree (~166 m/p).
diff --git a/data/assets/scene/solarsystem/planets/mercury/layers/colorlayers/messenger_bdr_utah.asset b/data/assets/scene/solarsystem/planets/mercury/layers/colorlayers/messenger_bdr_utah.asset
index cdceb42207..5d31e934e2 100644
--- a/data/assets/scene/solarsystem/planets/mercury/layers/colorlayers/messenger_bdr_utah.asset
+++ b/data/assets/scene/solarsystem/planets/mercury/layers/colorlayers/messenger_bdr_utah.asset
@@ -6,7 +6,7 @@ local Layer = {
   Identifier = "Messenger_BDR_Utah",
   Name = "Messenger BDR [Utah]",
   Enabled = asset.enabled,
-  FilePath = asset.localResource("messenger_bdr_utah.wms"),
+  FilePath = asset.resource("messenger_bdr_utah.wms"),
   TilePixelSize = 360,
   Description = [[The Map Projected Basemap RDR (BDR) data set consists of a global
   monochrome map of reflectance at a resolution of 256 pixels per degree (~166 m/p).
diff --git a/data/assets/scene/solarsystem/planets/mercury/layers/colorlayers/messenger_hie_newyork.asset b/data/assets/scene/solarsystem/planets/mercury/layers/colorlayers/messenger_hie_newyork.asset
index 15453f5a02..5e2b5b9bc9 100644
--- a/data/assets/scene/solarsystem/planets/mercury/layers/colorlayers/messenger_hie_newyork.asset
+++ b/data/assets/scene/solarsystem/planets/mercury/layers/colorlayers/messenger_hie_newyork.asset
@@ -6,7 +6,7 @@ local Layer = {
   Identifier = "Messenger_HIE_NewYork",
   Name = "Messenger HIE [New York]",
   Enabled = asset.enabled,
-  FilePath = asset.localResource("messenger_hie_newyork.wms")
+  FilePath = asset.resource("messenger_hie_newyork.wms")
 }
 
 
diff --git a/data/assets/scene/solarsystem/planets/mercury/layers/colorlayers/messenger_hie_sweden.asset b/data/assets/scene/solarsystem/planets/mercury/layers/colorlayers/messenger_hie_sweden.asset
index 15888a81ec..4f78dd33ac 100644
--- a/data/assets/scene/solarsystem/planets/mercury/layers/colorlayers/messenger_hie_sweden.asset
+++ b/data/assets/scene/solarsystem/planets/mercury/layers/colorlayers/messenger_hie_sweden.asset
@@ -6,7 +6,7 @@ local Layer = {
   Identifier = "Messenger_HIE_Sweden",
   Name = "Messenger HIE [Sweden]",
   Enabled = asset.enabled,
-  FilePath = asset.localResource("messenger_hie_sweden.wms")
+  FilePath = asset.resource("messenger_hie_sweden.wms")
 }
 
 
diff --git a/data/assets/scene/solarsystem/planets/mercury/layers/colorlayers/messenger_hie_utah.asset b/data/assets/scene/solarsystem/planets/mercury/layers/colorlayers/messenger_hie_utah.asset
index 014e5b07b7..f7576fdbc8 100644
--- a/data/assets/scene/solarsystem/planets/mercury/layers/colorlayers/messenger_hie_utah.asset
+++ b/data/assets/scene/solarsystem/planets/mercury/layers/colorlayers/messenger_hie_utah.asset
@@ -6,7 +6,7 @@ local Layer = {
   Identifier = "Messenger_HIE_Utah",
   Name = "Messenger HIE [Utah]",
   Enabled = asset.enabled,
-  FilePath = asset.localResource("messenger_hie_utah.wms")
+  FilePath = asset.resource("messenger_hie_utah.wms")
 }
 
 
diff --git a/data/assets/scene/solarsystem/planets/mercury/layers/colorlayers/messenger_hiw_newyork.asset b/data/assets/scene/solarsystem/planets/mercury/layers/colorlayers/messenger_hiw_newyork.asset
index 93797ac107..2fcdaeda8f 100644
--- a/data/assets/scene/solarsystem/planets/mercury/layers/colorlayers/messenger_hiw_newyork.asset
+++ b/data/assets/scene/solarsystem/planets/mercury/layers/colorlayers/messenger_hiw_newyork.asset
@@ -6,7 +6,7 @@ local Layer = {
   Identifier = "Messenger_HIW_NewYork",
   Name = "Messenger HIW [New York]",
   Enabled = asset.enabled,
-  FilePath = asset.localResource("messenger_hiw_newyork.wms")
+  FilePath = asset.resource("messenger_hiw_newyork.wms")
 }
 
 
diff --git a/data/assets/scene/solarsystem/planets/mercury/layers/colorlayers/messenger_hiw_sweden.asset b/data/assets/scene/solarsystem/planets/mercury/layers/colorlayers/messenger_hiw_sweden.asset
index 9a70a4a628..18ef239562 100644
--- a/data/assets/scene/solarsystem/planets/mercury/layers/colorlayers/messenger_hiw_sweden.asset
+++ b/data/assets/scene/solarsystem/planets/mercury/layers/colorlayers/messenger_hiw_sweden.asset
@@ -6,7 +6,7 @@ local Layer = {
   Identifier = "Messenger_HIW_Sweden",
   Name = "Messenger HIW [Sweden]",
   Enabled = asset.enabled,
-  FilePath = asset.localResource("messenger_hiw_sweden.wms")
+  FilePath = asset.resource("messenger_hiw_sweden.wms")
 }
 
 
diff --git a/data/assets/scene/solarsystem/planets/mercury/layers/colorlayers/messenger_hiw_utah.asset b/data/assets/scene/solarsystem/planets/mercury/layers/colorlayers/messenger_hiw_utah.asset
index 17eaaed762..1942be658b 100644
--- a/data/assets/scene/solarsystem/planets/mercury/layers/colorlayers/messenger_hiw_utah.asset
+++ b/data/assets/scene/solarsystem/planets/mercury/layers/colorlayers/messenger_hiw_utah.asset
@@ -6,7 +6,7 @@ local Layer = {
   Identifier = "Messenger_HIW_Utah",
   Name = "Messenger HIW [Utah]",
   Enabled = asset.enabled,
-  FilePath = asset.localResource("messenger_hiw_utah.wms")
+  FilePath = asset.resource("messenger_hiw_utah.wms")
 }
 
 
diff --git a/data/assets/scene/solarsystem/planets/mercury/layers/colorlayers/messenger_loi_newyork.asset b/data/assets/scene/solarsystem/planets/mercury/layers/colorlayers/messenger_loi_newyork.asset
index 0d100c0d6a..d7cdc01fe0 100644
--- a/data/assets/scene/solarsystem/planets/mercury/layers/colorlayers/messenger_loi_newyork.asset
+++ b/data/assets/scene/solarsystem/planets/mercury/layers/colorlayers/messenger_loi_newyork.asset
@@ -6,7 +6,7 @@ local Layer = {
   Identifier = "Messenger_LOI_NewYork",
   Name = "Messenger LOI [New York]",
   Enabled = asset.enabled,
-  FilePath = asset.localResource("messenger_loi_newyork.wms")
+  FilePath = asset.resource("messenger_loi_newyork.wms")
 }
 
 
diff --git a/data/assets/scene/solarsystem/planets/mercury/layers/colorlayers/messenger_loi_sweden.asset b/data/assets/scene/solarsystem/planets/mercury/layers/colorlayers/messenger_loi_sweden.asset
index 30d3a78057..6bcb79dd88 100644
--- a/data/assets/scene/solarsystem/planets/mercury/layers/colorlayers/messenger_loi_sweden.asset
+++ b/data/assets/scene/solarsystem/planets/mercury/layers/colorlayers/messenger_loi_sweden.asset
@@ -6,7 +6,7 @@ local Layer = {
   Identifier = "Messenger_LOI_Sweden",
   Name = "Messenger LOI [Sweden]",
   Enabled = asset.enabled,
-  FilePath = asset.localResource("messenger_loi_sweden.wms")
+  FilePath = asset.resource("messenger_loi_sweden.wms")
 }
 
 
diff --git a/data/assets/scene/solarsystem/planets/mercury/layers/colorlayers/messenger_loi_utah.asset b/data/assets/scene/solarsystem/planets/mercury/layers/colorlayers/messenger_loi_utah.asset
index 5675282a4a..befeeeb9c6 100644
--- a/data/assets/scene/solarsystem/planets/mercury/layers/colorlayers/messenger_loi_utah.asset
+++ b/data/assets/scene/solarsystem/planets/mercury/layers/colorlayers/messenger_loi_utah.asset
@@ -6,7 +6,7 @@ local Layer = {
   Identifier = "Messenger_LOI_Utah",
   Name = "Messenger LOI [Utah]",
   Enabled = asset.enabled,
-  FilePath = asset.localResource("messenger_loi_utah.wms")
+  FilePath = asset.resource("messenger_loi_utah.wms")
 }
 
 
diff --git a/data/assets/scene/solarsystem/planets/mercury/layers/colorlayers/messenger_mdis_newyork.asset b/data/assets/scene/solarsystem/planets/mercury/layers/colorlayers/messenger_mdis_newyork.asset
index 0487181d7e..7a92448daa 100644
--- a/data/assets/scene/solarsystem/planets/mercury/layers/colorlayers/messenger_mdis_newyork.asset
+++ b/data/assets/scene/solarsystem/planets/mercury/layers/colorlayers/messenger_mdis_newyork.asset
@@ -6,7 +6,7 @@ local Layer = {
   Identifier = "Messenger_MDIS_NewYork",
   Name = "Messenger MDIS [New York]",
   Enabled = asset.enabled,
-  FilePath = asset.localResource("messenger_mdis_newyork.wms"),
+  FilePath = asset.resource("messenger_mdis_newyork.wms"),
   Description = [[This May 2013 basemap is a combination of the following mosaics; (1)
   The 2013-05-10 version of the monochrome global mosaic, made from Applied Coherent
   Technology (ACT) Corporation tiles, (2) An average north polar mosaic from 90N to 82.5N,
diff --git a/data/assets/scene/solarsystem/planets/mercury/layers/colorlayers/messenger_mdis_sweden.asset b/data/assets/scene/solarsystem/planets/mercury/layers/colorlayers/messenger_mdis_sweden.asset
index 2237e17076..d65e4b7471 100644
--- a/data/assets/scene/solarsystem/planets/mercury/layers/colorlayers/messenger_mdis_sweden.asset
+++ b/data/assets/scene/solarsystem/planets/mercury/layers/colorlayers/messenger_mdis_sweden.asset
@@ -6,7 +6,7 @@ local Layer = {
   Identifier = "Messenger_MDIS_Sweden",
   Name = "Messenger MDIS [Sweden]",
   Enabled = asset.enabled,
-  FilePath = asset.localResource("messenger_mdis_sweden.wms"),
+  FilePath = asset.resource("messenger_mdis_sweden.wms"),
   Description = [[This May 2013 basemap is a combination of the following mosaics; (1)
   The 2013-05-10 version of the monochrome global mosaic, made from Applied Coherent
   Technology (ACT) Corporation tiles, (2) An average north polar mosaic from 90N to 82.5N,
diff --git a/data/assets/scene/solarsystem/planets/mercury/layers/colorlayers/messenger_mdis_utah.asset b/data/assets/scene/solarsystem/planets/mercury/layers/colorlayers/messenger_mdis_utah.asset
index 67b6009903..db7bca90ec 100644
--- a/data/assets/scene/solarsystem/planets/mercury/layers/colorlayers/messenger_mdis_utah.asset
+++ b/data/assets/scene/solarsystem/planets/mercury/layers/colorlayers/messenger_mdis_utah.asset
@@ -6,7 +6,7 @@ local Layer = {
   Identifier = "Messenger_MDIS_Utah",
   Name = "Messenger MDIS [Utah]",
   Enabled = asset.enabled,
-  FilePath = asset.localResource("messenger_mdis_utah.wms"),
+  FilePath = asset.resource("messenger_mdis_utah.wms"),
   Description = [[This May 2013 basemap is a combination of the following mosaics; (1)
   The 2013-05-10 version of the monochrome global mosaic, made from Applied Coherent
   Technology (ACT) Corporation tiles, (2) An average north polar mosaic from 90N to 82.5N,
diff --git a/data/assets/scene/solarsystem/planets/mercury/layers/colorlayers/messenger_mdr_utah.asset b/data/assets/scene/solarsystem/planets/mercury/layers/colorlayers/messenger_mdr_utah.asset
index 2dfcb6222b..57e05220a3 100644
--- a/data/assets/scene/solarsystem/planets/mercury/layers/colorlayers/messenger_mdr_utah.asset
+++ b/data/assets/scene/solarsystem/planets/mercury/layers/colorlayers/messenger_mdr_utah.asset
@@ -6,7 +6,7 @@ local Layer = {
   Identifier = "Messenger_MDR_Utah",
   Name = "Messenger MDR [Utah]",
   Enabled = asset.enabled,
-  FilePath = asset.localResource("messenger_mdr_utah.wms")
+  FilePath = asset.resource("messenger_mdr_utah.wms")
 }
 
 
diff --git a/data/assets/scene/solarsystem/planets/mercury/layers/colorlayers/messenger_mosaic2_newyork.asset b/data/assets/scene/solarsystem/planets/mercury/layers/colorlayers/messenger_mosaic2_newyork.asset
index 6418f9a6c6..b4e5dca288 100644
--- a/data/assets/scene/solarsystem/planets/mercury/layers/colorlayers/messenger_mosaic2_newyork.asset
+++ b/data/assets/scene/solarsystem/planets/mercury/layers/colorlayers/messenger_mosaic2_newyork.asset
@@ -6,7 +6,7 @@ local Layer = {
   Identifier = "Messenger_Mosaic2_NewYork",
   Name = "Messenger Mosaic2 [New York]",
   Enabled = asset.enabled,
-  FilePath = asset.localResource("messenger_mosaic2_newyork.wms")
+  FilePath = asset.resource("messenger_mosaic2_newyork.wms")
 }
 
 
diff --git a/data/assets/scene/solarsystem/planets/mercury/layers/colorlayers/messenger_mosaic2_sweden.asset b/data/assets/scene/solarsystem/planets/mercury/layers/colorlayers/messenger_mosaic2_sweden.asset
index d568d7a4ce..600f13eb81 100644
--- a/data/assets/scene/solarsystem/planets/mercury/layers/colorlayers/messenger_mosaic2_sweden.asset
+++ b/data/assets/scene/solarsystem/planets/mercury/layers/colorlayers/messenger_mosaic2_sweden.asset
@@ -6,7 +6,7 @@ local Layer = {
   Identifier = "Messenger_Mosaic2_Sweden",
   Name = "Messenger Mosaic2 [Sweden]",
   Enabled = asset.enabled,
-  FilePath = asset.localResource("messenger_mosaic2_sweden.wms")
+  FilePath = asset.resource("messenger_mosaic2_sweden.wms")
 }
 
 
diff --git a/data/assets/scene/solarsystem/planets/mercury/layers/colorlayers/messenger_mosaic2_utah.asset b/data/assets/scene/solarsystem/planets/mercury/layers/colorlayers/messenger_mosaic2_utah.asset
index f2e53e59fc..19d6d6f797 100644
--- a/data/assets/scene/solarsystem/planets/mercury/layers/colorlayers/messenger_mosaic2_utah.asset
+++ b/data/assets/scene/solarsystem/planets/mercury/layers/colorlayers/messenger_mosaic2_utah.asset
@@ -6,7 +6,7 @@ local Layer = {
   Identifier = "Messenger_Mosaic2_Utah",
   Name = "Messenger Mosaic2 [Utah]",
   Enabled = asset.enabled,
-  FilePath = asset.localResource("messenger_mosaic2_utah.wms")
+  FilePath = asset.resource("messenger_mosaic2_utah.wms")
 }
 
 
diff --git a/data/assets/scene/solarsystem/planets/mercury/layers/colorlayers/messenger_mosaic_newyork.asset b/data/assets/scene/solarsystem/planets/mercury/layers/colorlayers/messenger_mosaic_newyork.asset
index 7f71d22800..c48f3ede53 100644
--- a/data/assets/scene/solarsystem/planets/mercury/layers/colorlayers/messenger_mosaic_newyork.asset
+++ b/data/assets/scene/solarsystem/planets/mercury/layers/colorlayers/messenger_mosaic_newyork.asset
@@ -6,7 +6,7 @@ local Layer = {
   Identifier = "Messenger_Mosaic_NewYork",
   Name = "Messenger Mosaic [New York]",
   Enabled = asset.enabled,
-  FilePath = asset.localResource("messenger_mosaic_newyork.wms")
+  FilePath = asset.resource("messenger_mosaic_newyork.wms")
 }
 
 
diff --git a/data/assets/scene/solarsystem/planets/mercury/layers/colorlayers/messenger_mosaic_sweden.asset b/data/assets/scene/solarsystem/planets/mercury/layers/colorlayers/messenger_mosaic_sweden.asset
index 9c4e6d6643..a86565b630 100644
--- a/data/assets/scene/solarsystem/planets/mercury/layers/colorlayers/messenger_mosaic_sweden.asset
+++ b/data/assets/scene/solarsystem/planets/mercury/layers/colorlayers/messenger_mosaic_sweden.asset
@@ -6,7 +6,7 @@ local Layer = {
   Identifier = "Messenger_Mosaic_Sweden",
   Name = "Messenger Mosaic [Sweden]",
   Enabled = asset.enabled,
-  FilePath = asset.localResource("messenger_mosaic_sweden.wms")
+  FilePath = asset.resource("messenger_mosaic_sweden.wms")
 }
 
 
diff --git a/data/assets/scene/solarsystem/planets/mercury/layers/colorlayers/messenger_mosaic_utah.asset b/data/assets/scene/solarsystem/planets/mercury/layers/colorlayers/messenger_mosaic_utah.asset
index 1c40788bc0..7c2ded983f 100644
--- a/data/assets/scene/solarsystem/planets/mercury/layers/colorlayers/messenger_mosaic_utah.asset
+++ b/data/assets/scene/solarsystem/planets/mercury/layers/colorlayers/messenger_mosaic_utah.asset
@@ -6,7 +6,7 @@ local Layer = {
   Identifier = "Messenger_Mosaic_Utah",
   Name = "Messenger Mosaic [Utah]",
   Enabled = asset.enabled,
-  FilePath = asset.localResource("messenger_mosaic_utah.wms")
+  FilePath = asset.resource("messenger_mosaic_utah.wms")
 }
 
 
diff --git a/data/assets/scene/solarsystem/planets/mercury/layers/colorlayers/messenger_mp3_utah.asset b/data/assets/scene/solarsystem/planets/mercury/layers/colorlayers/messenger_mp3_utah.asset
index c1fdab7108..40d072c688 100644
--- a/data/assets/scene/solarsystem/planets/mercury/layers/colorlayers/messenger_mp3_utah.asset
+++ b/data/assets/scene/solarsystem/planets/mercury/layers/colorlayers/messenger_mp3_utah.asset
@@ -6,7 +6,7 @@ local Layer = {
   Identifier = "Messenger_MP3_Utah",
   Name = "Messenger MP3 [Utah]",
   Enabled = asset.enabled,
-  FilePath = asset.localResource("messenger_mp3_utah.wms")
+  FilePath = asset.resource("messenger_mp3_utah.wms")
 }
 
 
diff --git a/data/assets/scene/solarsystem/planets/mercury/layers/colorlayers/messenger_shade_newyork.asset b/data/assets/scene/solarsystem/planets/mercury/layers/colorlayers/messenger_shade_newyork.asset
index 2fbb37357e..1ad76bca02 100644
--- a/data/assets/scene/solarsystem/planets/mercury/layers/colorlayers/messenger_shade_newyork.asset
+++ b/data/assets/scene/solarsystem/planets/mercury/layers/colorlayers/messenger_shade_newyork.asset
@@ -6,7 +6,7 @@ local Layer = {
   Identifier = "Messenger_SHADE_NewYork",
   Name = "Messenger SHADE [New York]",
   Enabled = asset.enabled,
-  FilePath = asset.localResource("messenger_shade_newyork.wms"),
+  FilePath = asset.resource("messenger_shade_newyork.wms"),
   Settings = {
     Gamma = 1.33,
     Multiplier = 1.15
diff --git a/data/assets/scene/solarsystem/planets/mercury/layers/colorlayers/messenger_shade_sweden.asset b/data/assets/scene/solarsystem/planets/mercury/layers/colorlayers/messenger_shade_sweden.asset
index 61c8169d8e..e1bb4260f8 100644
--- a/data/assets/scene/solarsystem/planets/mercury/layers/colorlayers/messenger_shade_sweden.asset
+++ b/data/assets/scene/solarsystem/planets/mercury/layers/colorlayers/messenger_shade_sweden.asset
@@ -6,7 +6,7 @@ local Layer = {
   Identifier = "Messenger_SHADE_Sweden",
   Name = "Messenger SHADE [Sweden]",
   Enabled = asset.enabled,
-  FilePath = asset.localResource("messenger_shade_sweden.wms"),
+  FilePath = asset.resource("messenger_shade_sweden.wms"),
   Settings = {
     Gamma = 1.33,
     Multiplier = 1.15
diff --git a/data/assets/scene/solarsystem/planets/mercury/layers/colorlayers/messenger_shade_utah.asset b/data/assets/scene/solarsystem/planets/mercury/layers/colorlayers/messenger_shade_utah.asset
index d213ca77ea..01cc5a9d1a 100644
--- a/data/assets/scene/solarsystem/planets/mercury/layers/colorlayers/messenger_shade_utah.asset
+++ b/data/assets/scene/solarsystem/planets/mercury/layers/colorlayers/messenger_shade_utah.asset
@@ -6,7 +6,7 @@ local Layer = {
   Identifier = "Messenger_SHADE_Utah",
   Name = "Messenger SHADE [Utah]",
   Enabled = asset.enabled,
-  FilePath = asset.localResource("messenger_shade_utah.wms"),
+  FilePath = asset.resource("messenger_shade_utah.wms"),
   Settings = {
     Gamma = 1.33,
     Multiplier = 1.15
diff --git a/data/assets/scene/solarsystem/planets/mercury/layers/colorlayers/mgsimap_02122015.asset b/data/assets/scene/solarsystem/planets/mercury/layers/colorlayers/mgsimap_02122015.asset
index f83de8ebad..35fff60e83 100644
--- a/data/assets/scene/solarsystem/planets/mercury/layers/colorlayers/mgsimap_02122015.asset
+++ b/data/assets/scene/solarsystem/planets/mercury/layers/colorlayers/mgsimap_02122015.asset
@@ -2,7 +2,7 @@ local globe = asset.require("../../mercury")
 
 
 
-local texturesPath = asset.syncedResource({
+local texturesPath = asset.resource({
   Name = "Mercury Textures",
   Type = "HttpSynchronization",
   Identifier = "mercury_abundance_textures",
diff --git a/data/assets/scene/solarsystem/planets/mercury/layers/colorlayers/ssimap_02122015.asset b/data/assets/scene/solarsystem/planets/mercury/layers/colorlayers/ssimap_02122015.asset
index 52f6cc4076..fb5cb61f04 100644
--- a/data/assets/scene/solarsystem/planets/mercury/layers/colorlayers/ssimap_02122015.asset
+++ b/data/assets/scene/solarsystem/planets/mercury/layers/colorlayers/ssimap_02122015.asset
@@ -2,7 +2,7 @@ local globe = asset.require("../../mercury")
 
 
 
-local texturesPath = asset.syncedResource({
+local texturesPath = asset.resource({
   Name = "Mercury Textures",
   Type = "HttpSynchronization",
   Identifier = "mercury_abundance_textures",
diff --git a/data/assets/scene/solarsystem/planets/mercury/layers/heightlayers/messenger_dem_utah.asset b/data/assets/scene/solarsystem/planets/mercury/layers/heightlayers/messenger_dem_utah.asset
index 00a172afda..05e9d1276e 100644
--- a/data/assets/scene/solarsystem/planets/mercury/layers/heightlayers/messenger_dem_utah.asset
+++ b/data/assets/scene/solarsystem/planets/mercury/layers/heightlayers/messenger_dem_utah.asset
@@ -4,7 +4,7 @@ local Layer = {
   Identifier = "Messenger_DEM_Utah",
   Name = "Messenger DEM [Utah]",
   Enabled = asset.enabled,
-  FilePath = asset.localResource("messenger_dem_utah.wms"),
+  FilePath = asset.resource("messenger_dem_utah.wms"),
   Settings = {
     Gamma = 1.59,
     Multiplier = 1.38
diff --git a/data/assets/scene/solarsystem/planets/mercury/layers/nasa-treks/MSGR_MDIS.asset b/data/assets/scene/solarsystem/planets/mercury/layers/nasa-treks/MSGR_MDIS.asset
index b45e33a0cc..ab0423cc61 100644
--- a/data/assets/scene/solarsystem/planets/mercury/layers/nasa-treks/MSGR_MDIS.asset
+++ b/data/assets/scene/solarsystem/planets/mercury/layers/nasa-treks/MSGR_MDIS.asset
@@ -9,21 +9,21 @@ local globeIdentifier = asset.require("scene/solarsystem//planets/mercury/mercur
 local treks_Mercury_Messenger_USGS_DEM_665m_v2_HillshadeColor = {
   Identifier = "Mercury_Messenger_USGS_DEM_665m_v2_HillshadeColor",
   Name = [[MSGR MDIS, ColorHillshade Global]],
-  FilePath = asset.localResource("MSGR_MDIS/ColorHillshade_Global.vrt"),
+  FilePath = asset.resource("MSGR_MDIS/ColorHillshade_Global.vrt"),
   Description = [[This is a colorized shaded-relief generated from the USGS Astrogeology Science Center's Mercury MESSENGER Global DEM 665m v2 data product providing global coverage of Mercury. This color hillshade was generated in ArcPro with the shaded-relief raster function. The resolution of the original DEM used to create this product is 64 pixels/degree (665 m/pixel). The control network used for registration contains tie points that are sample/line coordinates with geometric locations (derived from SPICE) that are automatically measured across the overlapping image areas. Elevation values are in meters and referred to a radius of 2439400m. The legend conveys the mapping colors to elevation values (meters).]]
 }
 
 local treks_Mercury_Messenger_USGS_DEM_665m_v2_Hillshade = {
   Identifier = "Mercury_Messenger_USGS_DEM_665m_v2_Hillshade",
   Name = [[MSGR MDIS, Hillshade Global]],
-  FilePath = asset.localResource("MSGR_MDIS/Hillshade_Global.vrt"),
+  FilePath = asset.resource("MSGR_MDIS/Hillshade_Global.vrt"),
   Description = [[This is a shaded-relief generated from the USGS Astrogeology Science Center's Mercury MESSENGER Global DEM 665m v2 data product providing global coverage of Mercury. This shaded-relief data product was generated in ArcPro with the hillshade raster function. The resolution of the original DEM used to create this product is 64 pixels/degree (665 m/pixel). The control network used for registration contains tie points that are sample/line coordinates with geometric locations (derived from SPICE) that are automatically measured across the overlapping image areas. Elevation values are in meters and referred to a radius of 2439400m.]]
 }
 
 local treks_Mercury_Messenger_USGS_DEM_665m_v2_SlopeColor = {
   Identifier = "Mercury_Messenger_USGS_DEM_665m_v2_SlopeColor",
   Name = [[MSGR MDIS, Slope Colorized Global]],
-  FilePath = asset.localResource("MSGR_MDIS/Slope_Colorized_Global.vrt"),
+  FilePath = asset.resource("MSGR_MDIS/Slope_Colorized_Global.vrt"),
   Description = [[This is a colorized slope data product of the USGS Astrogeology Science Center's Mercury MESSENGER Global DEM 665m v2 data product providing global coverage of Mercury. This slope data product was generated in ArcMap with the slope spatial analysis tool. The resolution of this product is 64 pixels/degree (665 m/pixel). The control network used for registration contains tie points that are sample/line coordinates with geometric locations (derived from SPICE) that are automatically measured across the overlapping image areas. Slope values are in degrees and referred to a radius of 2439400m. Slope values range from a minimum value of 0 to a maximum value of 71.0409. The legend conveys the mapping colors to slope values (degrees).]]
 }
 
diff --git a/data/assets/scene/solarsystem/planets/mercury/layers/nasa-treks/MSGR_MDIS_Mosaic.asset b/data/assets/scene/solarsystem/planets/mercury/layers/nasa-treks/MSGR_MDIS_Mosaic.asset
index 36c95e6edb..2af7a78ceb 100644
--- a/data/assets/scene/solarsystem/planets/mercury/layers/nasa-treks/MSGR_MDIS_Mosaic.asset
+++ b/data/assets/scene/solarsystem/planets/mercury/layers/nasa-treks/MSGR_MDIS_Mosaic.asset
@@ -9,70 +9,70 @@ local globeIdentifier = asset.require("scene/solarsystem//planets/mercury/mercur
 local treks_MSGR_Aksakov_Crater_Peak_Ring_Ortho_29m = {
   Identifier = "MSGR_Aksakov_Crater_Peak_Ring_Ortho_29m",
   Name = [[MSGR MDIS Mosaic, Aksakov Crater Peak Ring]],
-  FilePath = asset.localResource("MSGR_MDIS_Mosaic/Aksakov_Crater_Peak_Ring.vrt"),
+  FilePath = asset.resource("MSGR_MDIS_Mosaic/Aksakov_Crater_Peak_Ring.vrt"),
   Description = [[This is a visible orthoimage for the Aksakov Crater Peak Ring region on Mercury. This data product class of this data is observational and has been constructed to examine the visible and topographic settings of landforms around Mercury's hollows. Observations of topography, specifically the relationships of hollows to their surroundings, can be used to investigate hollow formation. The visible image has been orthorectified using a digital elevation model (DEM) created from Mercury Dual Imaging System (MDIS) stereo pair images. The DEM used to generate the orthoimage has been aligned and controlled to Mercury Laser Altimeter (MLA) individual elevation points. The orthoimage was then projected onto the DEM and exported. This ortho image has been generated at a resolution of 29m/pixel.]]
 }
 
 local treks_MSGR_near_Dali_Crater_Ortho_20m = {
   Identifier = "MSGR_near_Dali_Crater_Ortho_20m",
   Name = [[MSGR MDIS Mosaic, Crater near Dali Crater]],
-  FilePath = asset.localResource("MSGR_MDIS_Mosaic/Crater_near_Dali_Crater.vrt"),
+  FilePath = asset.resource("MSGR_MDIS_Mosaic/Crater_near_Dali_Crater.vrt"),
   Description = [[This is a visible orthoimage for the Crater Near Dali Crater region on Mercury. This data product class of this data is observational and has been constructed to examine the visible and topographic settings of landforms around Mercury's hollows. Observations of topography, specifically the relationships of hollows to their surroundings, can be used to investigate hollow formation. The visible image has been orthorectified using a digital elevation model (DEM) created from Mercury Dual Imaging System (MDIS) stereo pair images. The DEM used to generate the orthoimage has been aligned and controlled to Mercury Laser Altimeter (MLA) individual elevation points. The orthoimage was then projected onto the DEM and exported. This ortho image has been generated at a resolution of 20m/pixel.]]
 }
 
 local treks_MSGR_near_Geddes_Crater_Ortho_33m = {
   Identifier = "MSGR_near_Geddes_Crater_Ortho_33m",
   Name = [[MSGR MDIS Mosaic, Crater near Geddes Crater]],
-  FilePath = asset.localResource("MSGR_MDIS_Mosaic/Crater_near_Geddes_Crater.vrt"),
+  FilePath = asset.resource("MSGR_MDIS_Mosaic/Crater_near_Geddes_Crater.vrt"),
   Description = [[This is a visible orthoimage for the Crater Near Geddes Crater region on Mercury. This data product class of this data is observational and has been constructed to examine the visible and topographic settings of landforms around Mercury's hollows. Observations of topography, specifically the relationships of hollows to their surroundings, can be used to investigate hollow formation. The visible image has been orthorectified using a digital elevation model (DEM) created from Mercury Dual Imaging System (MDIS) stereo pair images. The DEM used to generate the orthoimage has been aligned and controlled to Mercury Laser Altimeter (MLA) individual elevation points. The orthoimage was then projected onto the DEM and exported. This ortho image has been generated at a resolution of 33m/pixel.]]
 }
 
 local treks_MSGR_Degas_Crater_Ortho_30m = {
   Identifier = "MSGR_Degas_Crater_Ortho_30m",
   Name = [[MSGR MDIS Mosaic, Degas Crater]],
-  FilePath = asset.localResource("MSGR_MDIS_Mosaic/Degas_Crater.vrt"),
+  FilePath = asset.resource("MSGR_MDIS_Mosaic/Degas_Crater.vrt"),
   Description = [[This is a visible orthoimage for the Degas Crater region on Mercury. This data product class of this data is observational and has been constructed to examine the visible and topographic settings of landforms around Mercury's hollows. Observations of topography, specifically the relationships of hollows to their surroundings, can be used to investigate hollow formation. The visible image has been orthorectified using a digital elevation model (DEM) created from Mercury Dual Imaging System (MDIS) stereo pair images. The DEM used to generate the orthoimage has been aligned and controlled to Mercury Laser Altimeter (MLA) individual elevation points. The orthoimage was then projected onto the DEM and exported. This ortho image has been generated at a resolution of 30m/pixel.]]
 }
 
 local treks_MSGR_Kertesz_Crater_Ortho_30m = {
   Identifier = "MSGR_Kertesz_Crater_Ortho_30m",
   Name = [[MSGR MDIS Mosaic, Kertesz Crater]],
-  FilePath = asset.localResource("MSGR_MDIS_Mosaic/Kertesz_Crater.vrt"),
+  FilePath = asset.resource("MSGR_MDIS_Mosaic/Kertesz_Crater.vrt"),
   Description = [[This is a visible orthoimage for the KerteszCrater region on Mercury. This data product class of this data is observational and has been constructed to examine the visible and topographic settings of landforms around Mercury's hollows. Observations of topography, specifically the relationships of hollows to their surroundings, can be used to investigate hollow formation. The visible image has been orthorectified using a digital elevation model (DEM) created from Mercury Dual Imaging System (MDIS) stereo pair images. The DEM used to generate the orthoimage has been aligned and controlled to Mercury Laser Altimeter (MLA) individual elevation points. The orthoimage was then projected onto the DEM and exported. This ortho image has been generated at a resolution of 30m/pixel.]]
 }
 
 local treks_MSGR_nw_Degas_Crater_Ortho_26m = {
   Identifier = "MSGR_nw_Degas_Crater_Ortho_26m",
   Name = [[MSGR MDIS Mosaic, North-West of Degas Crater]],
-  FilePath = asset.localResource("MSGR_MDIS_Mosaic/North-West_of_Degas_Crater.vrt"),
+  FilePath = asset.resource("MSGR_MDIS_Mosaic/North-West_of_Degas_Crater.vrt"),
   Description = [[This is a visible orthoimage for the region northwest of Degas Crater on Mercury. This data product class of this data is observational and has been constructed to examine the visible and topographic settings of landforms around Mercury's hollows. Observations of topography, specifically the relationships of hollows to their surroundings, can be used to investigate hollow formation. The visible image has been orthorectified using a digital elevation model (DEM) created from Mercury Dual Imaging System (MDIS) stereo pair images. The DEM used to generate the orthoimage has been aligned and controlled to Mercury Laser Altimeter (MLA) individual elevation points. The orthoimage was then projected onto the DEM and exported. This ortho image has been generated at a resolution of 26m/pixel.]]
 }
 
 local treks_MSGR_Praxiteles_Peak_Ring_Ortho_20m = {
   Identifier = "MSGR_Praxiteles_Peak_Ring_Ortho_20m",
   Name = [[MSGR MDIS Mosaic, Praxiteles Peak Ring]],
-  FilePath = asset.localResource("MSGR_MDIS_Mosaic/Praxiteles_Peak_Ring.vrt"),
+  FilePath = asset.resource("MSGR_MDIS_Mosaic/Praxiteles_Peak_Ring.vrt"),
   Description = [[This is a visible orthoimage for the Praxiteles Peak Ring region on Mercury. This data product class of this data is observational and has been constructed to examine the visible and topographic settings of landforms around Mercury's hollows. Observations of topography, specifically the relationships of hollows to their surroundings, can be used to investigate hollow formation. The visible image has been orthorectified using a digital elevation model (DEM) created from Mercury Dual Imaging System (MDIS) stereo pair images. The DEM used to generate the orthoimage has been aligned and controlled to Mercury Laser Altimeter (MLA) individual elevation points. The orthoimage was then projected onto the DEM and exported. This ortho image has been generated at a resolution of 20m/pixel.]]
 }
 
 local treks_MSGR_Raditladi_Crater_Ortho_40m = {
   Identifier = "MSGR_Raditladi_Crater_Ortho_40m",
   Name = [[MSGR MDIS Mosaic, Raditladi Crater]],
-  FilePath = asset.localResource("MSGR_MDIS_Mosaic/Raditladi_Crater.vrt"),
+  FilePath = asset.resource("MSGR_MDIS_Mosaic/Raditladi_Crater.vrt"),
   Description = [[This is a visible orthoimage for the Raditladi Crater region on Mercury. This data product class of this data is observational and has been constructed to examine the visible and topographic settings of landforms around Mercury's hollows. Observations of topography, specifically the relationships of hollows to their surroundings, can be used to investigate hollow formation. The visible image has been orthorectified using a digital elevation model (DEM) created from Mercury Dual Imaging System (MDIS) stereo pair images. The DEM used to generate the orthoimage has been aligned and controlled to Mercury Laser Altimeter (MLA) individual elevation points. The orthoimage was then projected onto the DEM and exported. This ortho image has been generated at a resolution of 40m/pixel.]]
 }
 
 local treks_MSGR_Sander_Crater_Ortho_22m = {
   Identifier = "MSGR_Sander_Crater_Ortho_22m",
   Name = [[MSGR MDIS Mosaic, Sander Crater]],
-  FilePath = asset.localResource("MSGR_MDIS_Mosaic/Sander_Crater.vrt"),
+  FilePath = asset.resource("MSGR_MDIS_Mosaic/Sander_Crater.vrt"),
   Description = [[This is a visible orthoimage for the Sander Crater region on Mercury. This data product class of this data is observational and has been constructed to examine the visible and topographic settings of landforms around Mercury's hollows. Observations of topography, specifically the relationships of hollows to their surroundings, can be used to investigate hollow formation. The visible image has been orthorectified using a digital elevation model (DEM) created from Mercury Dual Imaging System (MDIS) stereo pair images. The DEM used to generate the orthoimage has been aligned and controlled to Mercury Laser Altimeter (MLA) individual elevation points. The orthoimage was then projected onto the DEM and exported. This ortho image has been generated at a resolution of 22m/pixel.]]
 }
 
 local treks_MSGR_Sholem_Aleichem_Crater_Wall_Ortho_8m = {
   Identifier = "MSGR_Sholem_Aleichem_Crater_Wall_Ortho_8m",
   Name = [[MSGR MDIS Mosaic, Sholem Aleichem Crater Wall]],
-  FilePath = asset.localResource("MSGR_MDIS_Mosaic/Sholem_Aleichem_Crater_Wall.vrt"),
+  FilePath = asset.resource("MSGR_MDIS_Mosaic/Sholem_Aleichem_Crater_Wall.vrt"),
   Description = [[This is a visible orthoimage for the Sholem Aleichem Crater Wall region on Mercury. This data product class of this data is observational and has been constructed to examine the visible and topographic settings of landforms around Mercury's hollows. Observations of topography, specifically the relationships of hollows to their surroundings, can be used to investigate hollow formation. The visible image has been orthorectified using a digital elevation model (DEM) created from Mercury Dual Imaging System (MDIS) stereo pair images. The DEM used to generate the orthoimage has been aligned and controlled to Mercury Laser Altimeter (MLA) individual elevation points. The orthoimage was then projected onto the DEM and exported. This ortho image has been generated at a resolution of 8m/pixel.]]
 }
 
diff --git a/data/assets/scene/solarsystem/planets/mercury/layers/nasa-treks/MSGR_MDIS_Slope.asset b/data/assets/scene/solarsystem/planets/mercury/layers/nasa-treks/MSGR_MDIS_Slope.asset
index a86bf3230a..0149e2d412 100644
--- a/data/assets/scene/solarsystem/planets/mercury/layers/nasa-treks/MSGR_MDIS_Slope.asset
+++ b/data/assets/scene/solarsystem/planets/mercury/layers/nasa-treks/MSGR_MDIS_Slope.asset
@@ -9,70 +9,70 @@ local globeIdentifier = asset.require("scene/solarsystem//planets/mercury/mercur
 local treks_MSGR_Aksakov_Crater_Peak_Ring_Slope_100m = {
   Identifier = "MSGR_Aksakov_Crater_Peak_Ring_Slope_100m",
   Name = [[MSGR MDIS Slope, Aksakov Crater Peak Ring]],
-  FilePath = asset.localResource("MSGR_MDIS_Slope/Aksakov_Crater_Peak_Ring.vrt"),
+  FilePath = asset.resource("MSGR_MDIS_Slope/Aksakov_Crater_Peak_Ring.vrt"),
   Description = [[This is a slope product of the digital elevation model (DEM) for the Aksakov Crater Peak Ring region on Mercury. This data product class of this data is observational and has been constructed to examine the topographic settings of landforms around Mercury's hollows. Observations of topography, specifically the relationships of hollows to their surroundings, can be used to investigate hollow formation. This DEM has been derived from Mercury Dual Imaging System (MDIS) data and has been generated at a resolution of 100m/pixel. The DEM has been aligned and controlled to Mercury Laser Altimeter (MLA) individual elevation points. Vertical offsets in this DEM have been roughly corrected relative to the USGS's 665m Global DEM of Mercury. DEM elevation values are in meters and referred to a radius of 2440000m. Slope values are in degrees with a minimum value of 0 and a maximum value of 41.818.]]
 }
 
 local treks_MSGR_near_Dali_Crater_Slope_60m = {
   Identifier = "MSGR_near_Dali_Crater_Slope_60m",
   Name = [[MSGR MDIS Slope, Crater near Dali Crater]],
-  FilePath = asset.localResource("MSGR_MDIS_Slope/Crater_near_Dali_Crater.vrt"),
+  FilePath = asset.resource("MSGR_MDIS_Slope/Crater_near_Dali_Crater.vrt"),
   Description = [[This is a slope product of the digital elevation model (DEM) for the Crater Near Dali Crater region on Mercury. This data product class of this data is observational and has been constructed to examine the topographic settings of landforms around Mercury's hollows. Observations of topography, specifically the relationships of hollows to their surroundings, can be used to investigate hollow formation. This DEM has been derived from Mercury Dual Imaging System (MDIS) data and has been generated at a resolution of 60m/pixel. The DEM has been aligned and controlled to Mercury Laser Altimeter (MLA) individual elevation points. Vertical offsets in this DEM have been roughly corrected relative to the USGS's 665m Global DEM of Mercury. DEM elevation values are in meters and referred to a radius of 2440000m. Slope values are in degrees with a minimum value of 0 and a maximum value of 50.112.]]
 }
 
 local treks_MSGR_near_Geddes_Crater_Slope_100m = {
   Identifier = "MSGR_near_Geddes_Crater_Slope_100m",
   Name = [[MSGR MDIS Slope, Crater near Geddes Crater]],
-  FilePath = asset.localResource("MSGR_MDIS_Slope/Crater_near_Geddes_Crater.vrt"),
+  FilePath = asset.resource("MSGR_MDIS_Slope/Crater_near_Geddes_Crater.vrt"),
   Description = [[This is a slope product of the digital elevation model (DEM) for the Crater Near Geddes Crater region on Mercury. This data product class of this data is observational and has been constructed to examine the topographic settings of landforms around Mercury's hollows. Observations of topography, specifically the relationships of hollows to their surroundings, can be used to investigate hollow formation. This DEM has been derived from Mercury Dual Imaging System (MDIS) data and has been generated at a resolution of 100m/pixel. The DEM has been aligned and controlled to Mercury Laser Altimeter (MLA) individual elevation points. Vertical offsets in this DEM have been roughly corrected relative to the USGS's 665m Global DEM of Mercury. DEM elevation values are in meters and referred to a radius of 2440000m. Slope values are in degrees with a minimum value of 0 and a maximum value of 42.451.]]
 }
 
 local treks_MSGR_Degas_Crater_Slope_90m = {
   Identifier = "MSGR_Degas_Crater_Slope_90m",
   Name = [[MSGR MDIS Slope, Degas Crater]],
-  FilePath = asset.localResource("MSGR_MDIS_Slope/Degas_Crater.vrt"),
+  FilePath = asset.resource("MSGR_MDIS_Slope/Degas_Crater.vrt"),
   Description = [[This is a slope product of the digital elevation model (DEM) for the Degas Crater region on Mercury. This data product class of this data is observational and has been constructed to examine the topographic settings of landforms around Mercury's hollows. Observations of topography, specifically the relationships of hollows to their surroundings, can be used to investigate hollow formation. This DEM has been derived from Mercury Dual Imaging System (MDIS) data and has been generated at a resolution of 90m/pixel. The DEM has been aligned and controlled to Mercury Laser Altimeter (MLA) individual elevation points. Vertical offsets in this DEM have been roughly corrected relative to the USGS's 665m Global DEM of Mercury. DEM elevation values are in meters and referred to a radius of 2440000m. Slope values are in degrees with a minimum value of 0 and a maximum value of 53.812.]]
 }
 
 local treks_MSGR_Kertesz_Crater_Slope_100m = {
   Identifier = "MSGR_Kertesz_Crater_Slope_100m",
   Name = [[MSGR MDIS Slope, Kertesz Crater]],
-  FilePath = asset.localResource("MSGR_MDIS_Slope/Kertesz_Crater.vrt"),
+  FilePath = asset.resource("MSGR_MDIS_Slope/Kertesz_Crater.vrt"),
   Description = [[This is a slope product of the digital elevation model (DEM) for the Kertesz Crater region on Mercury. This data product class of this data is observational and has been constructed to examine the topographic settings of landforms around Mercury's hollows. Observations of topography, specifically the relationships of hollows to their surroundings, can be used to investigate hollow formation. This DEM has been derived from Mercury Dual Imaging System (MDIS) data and has been generated at a resolution of 100m/pixel. The DEM has been aligned and controlled to Mercury Laser Altimeter (MLA) individual elevation points. Vertical offsets in this DEM have been roughly corrected relative to the USGS's 665m Global DEM of Mercury. DEM elevation values are in meters and referred to a radius of 2440000m. Slope values are in degrees with a minimum value of 0 and a maximum value of 51.033.]]
 }
 
 local treks_MSGR_nw_Degas_Crater_Slope_80m = {
   Identifier = "MSGR_nw_Degas_Crater_Slope_80m",
   Name = [[MSGR MDIS Slope, North-West of Degas Crater]],
-  FilePath = asset.localResource("MSGR_MDIS_Slope/North-West_of_Degas_Crater.vrt"),
+  FilePath = asset.resource("MSGR_MDIS_Slope/North-West_of_Degas_Crater.vrt"),
   Description = [[This is a slope product of the digital elevation model (DEM) for the northwest region of Degas Crater on Mercury. This data product class of this data is observational and has been constructed to examine the topographic settings of landforms around Mercury's hollows. Observations of topography, specifically the relationships of hollows to their surroundings, can be used to investigate hollow formation. This DEM has been derived from Mercury Dual Imaging System (MDIS) data and has been generated at a resolution of 80m/pixel. The DEM has been aligned and controlled to Mercury Laser Altimeter (MLA) individual elevation points. Vertical offsets in this DEM have been roughly corrected relative to the USGS's 665m Global DEM of Mercury. DEM elevation values are in meters and referred to a radius of 2440000m. Slope values are in degrees with a minimum value of 0 and a maximum value of 42.616.]]
 }
 
 local treks_MSGR_Praxiteles_Peak_Ring_Slope_60m = {
   Identifier = "MSGR_Praxiteles_Peak_Ring_Slope_60m",
   Name = [[MSGR MDIS Slope, Praxiteles Peak Ring]],
-  FilePath = asset.localResource("MSGR_MDIS_Slope/Praxiteles_Peak_Ring.vrt"),
+  FilePath = asset.resource("MSGR_MDIS_Slope/Praxiteles_Peak_Ring.vrt"),
   Description = [[This is a colorized slope product of the digital elevation model (DEM) for the Praxiteles Peak Ring region on Mercury. This data product class of this data is observational and has been constructed to examine the topographic settings of landforms around Mercury's hollows. Observations of topography, specifically the relationships of hollows to their surroundings, can be used to investigate hollow formation. This DEM has been derived from Mercury Dual Imaging System (MDIS) data and has been generated at a resolution of 60m/pixel. The DEM has been aligned and controlled to Mercury Laser Altimeter (MLA) individual elevation points. Vertical offsets in this DEM have been roughly corrected relative to the USGS's 665m Global DEM of Mercury. DEM elevation values are in meters and referred to a radius of 2440000m. Slope values are in degrees with a minimum value of 0 and a maximum value of 46.484.]]
 }
 
 local treks_MSGR_Raditladi_Crater_Slope_120m = {
   Identifier = "MSGR_Raditladi_Crater_Slope_120m",
   Name = [[MSGR MDIS Slope, Raditladi Crater]],
-  FilePath = asset.localResource("MSGR_MDIS_Slope/Raditladi_Crater.vrt"),
+  FilePath = asset.resource("MSGR_MDIS_Slope/Raditladi_Crater.vrt"),
   Description = [[This is a slope product of the digital elevation model (DEM) for the Raditladi Crater region on Mercury. This data product class of this data is observational and has been constructed to examine the topographic settings of landforms around Mercury's hollows. Observations of topography, specifically the relationships of hollows to their surroundings, can be used to investigate hollow formation. This DEM has been derived from Mercury Dual Imaging System (MDIS) data and has been generated at a resolution of 120m/pixel. The DEM has been aligned and controlled to Mercury Laser Altimeter (MLA) individual elevation points. Vertical offsets in this DEM have been roughly corrected relative to the USGS's 665m Global DEM of Mercury. DEM elevation values are in meters and referred to a radius of 2440000m. Slope values are in degrees with a minimum value of 0 and a maximum value of 39.538.]]
 }
 
 local treks_MSGR_Sander_Crater_Slope_80m = {
   Identifier = "MSGR_Sander_Crater_Slope_80m",
   Name = [[MSGR MDIS Slope, Sander Crater]],
-  FilePath = asset.localResource("MSGR_MDIS_Slope/Sander_Crater.vrt"),
+  FilePath = asset.resource("MSGR_MDIS_Slope/Sander_Crater.vrt"),
   Description = [[This is a slope product of the digital elevation model (DEM) for the Sander Crater region on Mercury. This data product class of this data is observational and has been constructed to examine the topographic settings of landforms around Mercury's hollows. Observations of topography, specifically the relationships of hollows to their surroundings, can be used to investigate hollow formation. This DEM has been derived from Mercury Dual Imaging System (MDIS) data and has been generated at a resolution of 80m/pixel. The DEM has been aligned and controlled to Mercury Laser Altimeter (MLA) individual elevation points. Vertical offsets in this DEM have been roughly corrected relative to the USGS's 665m Global DEM of Mercury. DEM elevation values are in meters and referred to a radius of 2440000m. Slope values are in degrees with a minimum value of 0 and a maximum value of 41.517.]]
 }
 
 local treks_MSGR_Sholem_Aleichem_Crater_Wall_Slope_25m = {
   Identifier = "MSGR_Sholem_Aleichem_Crater_Wall_Slope_25m",
   Name = [[MSGR MDIS Slope, Sholem Aleichem Crater Wall]],
-  FilePath = asset.localResource("MSGR_MDIS_Slope/Sholem_Aleichem_Crater_Wall.vrt"),
+  FilePath = asset.resource("MSGR_MDIS_Slope/Sholem_Aleichem_Crater_Wall.vrt"),
   Description = [[This is a colorized slope product of the digital elevation model (DEM) for the Sholem Aleichem Crater Wall region on Mercury. This data product class of this data is observational and has been constructed to examine the topographic settings of landforms around Mercury's hollows. Observations of topography, specifically the relationships of hollows to their surroundings, can be used to investigate hollow formation. This DEM has been derived from Mercury Dual Imaging System (MDIS) data and has been generated at a resolution of 25m/pixel. The DEM has been aligned and controlled to Mercury Laser Altimeter (MLA) individual elevation points. Vertical offsets in this DEM have been roughly corrected relative to the USGS's 665m Global DEM of Mercury. DEM elevation values are in meters and referred to a radius of 2440000m. Slope values are in degrees with a minimum value of 0 and a maximum value of 40.746.]]
 }
 
diff --git a/data/assets/scene/solarsystem/planets/mercury/mercury.asset b/data/assets/scene/solarsystem/planets/mercury/mercury.asset
index 3a4cacf78e..6dde12aa39 100644
--- a/data/assets/scene/solarsystem/planets/mercury/mercury.asset
+++ b/data/assets/scene/solarsystem/planets/mercury/mercury.asset
@@ -4,7 +4,7 @@ local transforms = asset.require("./transforms")
 
 
 
-local labelsPath = asset.syncedResource({
+local labelsPath = asset.resource({
   Name = "Mercury Labels",
   Type = "HttpSynchronization",
   Identifier = "mercury_labels",
diff --git a/data/assets/scene/solarsystem/planets/neptune/kernels.asset b/data/assets/scene/solarsystem/planets/neptune/kernels.asset
index 4bfad9a74f..e1c2feb317 100644
--- a/data/assets/scene/solarsystem/planets/neptune/kernels.asset
+++ b/data/assets/scene/solarsystem/planets/neptune/kernels.asset
@@ -1,4 +1,4 @@
-local kernels = asset.syncedResource({
+local kernels = asset.resource({
   Name = "Neptune Spice Kernels",
   Type = "HttpSynchronization",
   Identifier = "neptune_kernels",
diff --git a/data/assets/scene/solarsystem/planets/neptune/layers/colorlayers/neptune_texture.asset b/data/assets/scene/solarsystem/planets/neptune/layers/colorlayers/neptune_texture.asset
index 1e5705d57f..428d3bae4b 100644
--- a/data/assets/scene/solarsystem/planets/neptune/layers/colorlayers/neptune_texture.asset
+++ b/data/assets/scene/solarsystem/planets/neptune/layers/colorlayers/neptune_texture.asset
@@ -2,7 +2,7 @@ local globe = asset.require("../../neptune")
 
 
 
-local texturesPath = asset.syncedResource({
+local texturesPath = asset.resource({
   Name = "Neptune textures",
   Type = "HttpSynchronization",
   Identifier = "neptune_textures",
diff --git a/data/assets/scene/solarsystem/planets/neptune/triton/layers/colorlayers/triton_voyager2_clrmosaic_globalfill_600m.asset b/data/assets/scene/solarsystem/planets/neptune/triton/layers/colorlayers/triton_voyager2_clrmosaic_globalfill_600m.asset
index 46e83c352b..34b6996f44 100644
--- a/data/assets/scene/solarsystem/planets/neptune/triton/layers/colorlayers/triton_voyager2_clrmosaic_globalfill_600m.asset
+++ b/data/assets/scene/solarsystem/planets/neptune/triton/layers/colorlayers/triton_voyager2_clrmosaic_globalfill_600m.asset
@@ -2,7 +2,7 @@ local globe = asset.require("../../triton")
 
 
 
-local texturesPath = asset.syncedResource({
+local texturesPath = asset.resource({
   Name = "Triton Textures",
   Type = "HttpSynchronization",
   Identifier = "triton_textures",
diff --git a/data/assets/scene/solarsystem/planets/saturn/dione/dione.asset b/data/assets/scene/solarsystem/planets/saturn/dione/dione.asset
index a7a939eec5..fd6705e03c 100644
--- a/data/assets/scene/solarsystem/planets/saturn/dione/dione.asset
+++ b/data/assets/scene/solarsystem/planets/saturn/dione/dione.asset
@@ -4,7 +4,7 @@ local kernel = asset.require("../kernels")
 
 
 
-local labelsPath = asset.syncedResource({
+local labelsPath = asset.resource({
   Name = "Saturn Labels",
   Type = "HttpSynchronization",
   Identifier = "saturn_labels",
diff --git a/data/assets/scene/solarsystem/planets/saturn/dione/layers/colorlayers/dione_texture.asset b/data/assets/scene/solarsystem/planets/saturn/dione/layers/colorlayers/dione_texture.asset
index caca2f9069..7d5fdb4020 100644
--- a/data/assets/scene/solarsystem/planets/saturn/dione/layers/colorlayers/dione_texture.asset
+++ b/data/assets/scene/solarsystem/planets/saturn/dione/layers/colorlayers/dione_texture.asset
@@ -2,7 +2,7 @@ local globe = asset.require("../../dione")
 
 
 
-local texturesPath = asset.syncedResource({
+local texturesPath = asset.resource({
   Name = "Dione textures",
   Type = "HttpSynchronization",
   Identifier = "dione_textures",
diff --git a/data/assets/scene/solarsystem/planets/saturn/enceladus/enceladus.asset b/data/assets/scene/solarsystem/planets/saturn/enceladus/enceladus.asset
index 8cde73ffd0..26f5465764 100644
--- a/data/assets/scene/solarsystem/planets/saturn/enceladus/enceladus.asset
+++ b/data/assets/scene/solarsystem/planets/saturn/enceladus/enceladus.asset
@@ -4,7 +4,7 @@ local kernel = asset.require("../kernels")
 
 
 
-local labelsPath = asset.syncedResource({
+local labelsPath = asset.resource({
   Name = "Saturn Labels",
   Type = "HttpSynchronization",
   Identifier = "saturn_labels",
diff --git a/data/assets/scene/solarsystem/planets/saturn/enceladus/layers/colorlayers/enceladus_texture.asset b/data/assets/scene/solarsystem/planets/saturn/enceladus/layers/colorlayers/enceladus_texture.asset
index 0dd079b028..e14e4cf7c4 100644
--- a/data/assets/scene/solarsystem/planets/saturn/enceladus/layers/colorlayers/enceladus_texture.asset
+++ b/data/assets/scene/solarsystem/planets/saturn/enceladus/layers/colorlayers/enceladus_texture.asset
@@ -2,7 +2,7 @@ local globe = asset.require("../../enceladus")
 
 
 
-local texturesPath = asset.syncedResource({
+local texturesPath = asset.resource({
   Name = "Enceladus textures",
   Type = "HttpSynchronization",
   Identifier = "enceladus_textures",
diff --git a/data/assets/scene/solarsystem/planets/saturn/enceladus/layers/colorlayers/global_mosaic_100m_hpf_newyork.asset b/data/assets/scene/solarsystem/planets/saturn/enceladus/layers/colorlayers/global_mosaic_100m_hpf_newyork.asset
index 2f886bfc0e..2591573846 100644
--- a/data/assets/scene/solarsystem/planets/saturn/enceladus/layers/colorlayers/global_mosaic_100m_hpf_newyork.asset
+++ b/data/assets/scene/solarsystem/planets/saturn/enceladus/layers/colorlayers/global_mosaic_100m_hpf_newyork.asset
@@ -6,7 +6,7 @@ local Layer = {
   Identifier = "Global_Mosaic_100m_HPF_NewYork",
   Name = "Cassini Global Mosaic 100m HPF [New York]",
   Enabled = asset.enabled,
-  FilePath = asset.localResource("global_mosaic_100m_hpf_newyork.wms"),
+  FilePath = asset.resource("global_mosaic_100m_hpf_newyork.wms"),
   Description = [[This mosaic represents the completion of a global control network of
     Enceladus containing Cassini Imaging Science Subsystem (ISS) images. A total of
     586 images in CLR, GRN, UV3, and IR3 filters were selected for the control
diff --git a/data/assets/scene/solarsystem/planets/saturn/enceladus/layers/colorlayers/global_mosaic_100m_hpf_sweden.asset b/data/assets/scene/solarsystem/planets/saturn/enceladus/layers/colorlayers/global_mosaic_100m_hpf_sweden.asset
index fbfdbb5193..e3fc211cc3 100644
--- a/data/assets/scene/solarsystem/planets/saturn/enceladus/layers/colorlayers/global_mosaic_100m_hpf_sweden.asset
+++ b/data/assets/scene/solarsystem/planets/saturn/enceladus/layers/colorlayers/global_mosaic_100m_hpf_sweden.asset
@@ -6,7 +6,7 @@ local Layer = {
   Identifier = "Global_Mosaic_100m_HPF_Sweden",
   Name = "Cassini Global Mosaic 100m HPF [Sweden]",
   Enabled = asset.enabled,
-  FilePath = asset.localResource("global_mosaic_100m_hpf_sweden.wms"),
+  FilePath = asset.resource("global_mosaic_100m_hpf_sweden.wms"),
   Description = [[This mosaic represents the completion of a global control network of
     Enceladus containing Cassini Imaging Science Subsystem (ISS) images. A total of
     586 images in CLR, GRN, UV3, and IR3 filters were selected for the control
diff --git a/data/assets/scene/solarsystem/planets/saturn/hyperion/hyperion.asset b/data/assets/scene/solarsystem/planets/saturn/hyperion/hyperion.asset
index 3652eef7fc..97c95a15b3 100644
--- a/data/assets/scene/solarsystem/planets/saturn/hyperion/hyperion.asset
+++ b/data/assets/scene/solarsystem/planets/saturn/hyperion/hyperion.asset
@@ -4,7 +4,7 @@ local kernel = asset.require("../kernels")
 
 
 
-local labelsPath = asset.syncedResource({
+local labelsPath = asset.resource({
   Name = "Saturn Labels",
   Type = "HttpSynchronization",
   Identifier = "saturn_labels",
diff --git a/data/assets/scene/solarsystem/planets/saturn/iapetus/iapetus.asset b/data/assets/scene/solarsystem/planets/saturn/iapetus/iapetus.asset
index c8ac165115..bac29a64f0 100644
--- a/data/assets/scene/solarsystem/planets/saturn/iapetus/iapetus.asset
+++ b/data/assets/scene/solarsystem/planets/saturn/iapetus/iapetus.asset
@@ -4,7 +4,7 @@ local kernel = asset.require("../kernels")
 
 
 
-local labelsPath = asset.syncedResource({
+local labelsPath = asset.resource({
   Name = "Saturn Labels",
   Type = "HttpSynchronization",
   Identifier = "saturn_labels",
diff --git a/data/assets/scene/solarsystem/planets/saturn/iapetus/layers/colorlayers/iapetus_texture.asset b/data/assets/scene/solarsystem/planets/saturn/iapetus/layers/colorlayers/iapetus_texture.asset
index b3b19e7464..9a228ca1c2 100644
--- a/data/assets/scene/solarsystem/planets/saturn/iapetus/layers/colorlayers/iapetus_texture.asset
+++ b/data/assets/scene/solarsystem/planets/saturn/iapetus/layers/colorlayers/iapetus_texture.asset
@@ -2,7 +2,7 @@ local globe = asset.require("../../iapetus")
 
 
 
-local texturesPath = asset.syncedResource({
+local texturesPath = asset.resource({
   Name = "Iapetus textures",
   Type = "HttpSynchronization",
   Identifier = "iapetus_textures",
diff --git a/data/assets/scene/solarsystem/planets/saturn/kernels.asset b/data/assets/scene/solarsystem/planets/saturn/kernels.asset
index 5a659764a9..a1dcf4b882 100644
--- a/data/assets/scene/solarsystem/planets/saturn/kernels.asset
+++ b/data/assets/scene/solarsystem/planets/saturn/kernels.asset
@@ -1,4 +1,4 @@
-local kernels = asset.syncedResource({
+local kernels = asset.resource({
   Name = "Saturn Spice Kernels",
   Type = "HttpSynchronization",
   Identifier = "saturn_kernels",
diff --git a/data/assets/scene/solarsystem/planets/saturn/layers/colorlayers/saturn_texture.asset b/data/assets/scene/solarsystem/planets/saturn/layers/colorlayers/saturn_texture.asset
index a3e7ca57ad..fd266c5ff1 100644
--- a/data/assets/scene/solarsystem/planets/saturn/layers/colorlayers/saturn_texture.asset
+++ b/data/assets/scene/solarsystem/planets/saturn/layers/colorlayers/saturn_texture.asset
@@ -2,7 +2,7 @@ local globe = asset.require("../../saturn")
 
 
 
-local texturesPath = asset.syncedResource({
+local texturesPath = asset.resource({
   Type = "HttpSynchronization",
   Name = "Saturn textures",
   Identifier = "saturn_textures",
diff --git a/data/assets/scene/solarsystem/planets/saturn/mimas/layers/colorlayers/mimas_texture.asset b/data/assets/scene/solarsystem/planets/saturn/mimas/layers/colorlayers/mimas_texture.asset
index 6c000042f2..5de7b88fe3 100644
--- a/data/assets/scene/solarsystem/planets/saturn/mimas/layers/colorlayers/mimas_texture.asset
+++ b/data/assets/scene/solarsystem/planets/saturn/mimas/layers/colorlayers/mimas_texture.asset
@@ -2,7 +2,7 @@ local globe = asset.require("../../mimas")
 
 
 
-local texturesPath = asset.syncedResource({
+local texturesPath = asset.resource({
   Name = "Mimas textures",
   Type = "HttpSynchronization",
   Identifier = "mimas_textures",
diff --git a/data/assets/scene/solarsystem/planets/saturn/mimas/mimas.asset b/data/assets/scene/solarsystem/planets/saturn/mimas/mimas.asset
index 36aad15d4c..31da7dcaa2 100644
--- a/data/assets/scene/solarsystem/planets/saturn/mimas/mimas.asset
+++ b/data/assets/scene/solarsystem/planets/saturn/mimas/mimas.asset
@@ -4,7 +4,7 @@ local kernel = asset.require("../kernels")
 
 
 
-local labelsPath = asset.syncedResource({
+local labelsPath = asset.resource({
   Name = "Saturn Labels",
   Type = "HttpSynchronization",
   Identifier = "saturn_labels",
diff --git a/data/assets/scene/solarsystem/planets/saturn/minor/shepherd_group.asset b/data/assets/scene/solarsystem/planets/saturn/minor/shepherd_group.asset
index 734d32c3e3..0ffa5bd9b2 100644
--- a/data/assets/scene/solarsystem/planets/saturn/minor/shepherd_group.asset
+++ b/data/assets/scene/solarsystem/planets/saturn/minor/shepherd_group.asset
@@ -2,7 +2,7 @@ local transforms = asset.require("../transforms")
 
 
 
-local syncedKernels = asset.syncedResource({
+local syncedKernels = asset.resource({
   Name = "Saturn Shepherd Moons Spice Kernels",
   Type = "HttpSynchronization",
   Identifier = "saturn_shepherd_kernels",
diff --git a/data/assets/scene/solarsystem/planets/saturn/rhea/layers/colorlayers/rhea_texture.asset b/data/assets/scene/solarsystem/planets/saturn/rhea/layers/colorlayers/rhea_texture.asset
index 9ff9287019..5c27a33a62 100644
--- a/data/assets/scene/solarsystem/planets/saturn/rhea/layers/colorlayers/rhea_texture.asset
+++ b/data/assets/scene/solarsystem/planets/saturn/rhea/layers/colorlayers/rhea_texture.asset
@@ -2,7 +2,7 @@ local globe = asset.require("../../rhea")
 
 
 
-local texturesPath = asset.syncedResource({
+local texturesPath = asset.resource({
   Name = "Rhea textures",
   Type = "HttpSynchronization",
   Identifier = "rhea_textures",
diff --git a/data/assets/scene/solarsystem/planets/saturn/rhea/rhea.asset b/data/assets/scene/solarsystem/planets/saturn/rhea/rhea.asset
index 9aaf757c80..64f3c2263c 100644
--- a/data/assets/scene/solarsystem/planets/saturn/rhea/rhea.asset
+++ b/data/assets/scene/solarsystem/planets/saturn/rhea/rhea.asset
@@ -4,7 +4,7 @@ local kernel = asset.require("../kernels")
 
 
 
-local labelsPath = asset.syncedResource({
+local labelsPath = asset.resource({
   Name = "Saturn Labels",
   Type = "HttpSynchronization",
   Identifier = "saturn_labels",
diff --git a/data/assets/scene/solarsystem/planets/saturn/saturn.asset b/data/assets/scene/solarsystem/planets/saturn/saturn.asset
index 188a5c824f..68753c4355 100644
--- a/data/assets/scene/solarsystem/planets/saturn/saturn.asset
+++ b/data/assets/scene/solarsystem/planets/saturn/saturn.asset
@@ -4,7 +4,7 @@ local transforms = asset.require("./transforms")
 
 
 
-local texturesPath = asset.syncedResource({
+local texturesPath = asset.resource({
   Type = "HttpSynchronization",
   Name = "Saturn textures",
   Identifier = "saturn_textures",
diff --git a/data/assets/scene/solarsystem/planets/saturn/tethys/layers/colorlayers/tethys_texture.asset b/data/assets/scene/solarsystem/planets/saturn/tethys/layers/colorlayers/tethys_texture.asset
index 5e76f7b274..ceecd82b78 100644
--- a/data/assets/scene/solarsystem/planets/saturn/tethys/layers/colorlayers/tethys_texture.asset
+++ b/data/assets/scene/solarsystem/planets/saturn/tethys/layers/colorlayers/tethys_texture.asset
@@ -2,7 +2,7 @@ local globe = asset.require("../../tethys")
 
 
 
-local texturesPath = asset.syncedResource({
+local texturesPath = asset.resource({
   Name = "Tethys textures",
   Type = "HttpSynchronization",
   Identifier = "tethys_textures",
diff --git a/data/assets/scene/solarsystem/planets/saturn/tethys/tethys.asset b/data/assets/scene/solarsystem/planets/saturn/tethys/tethys.asset
index ec844427cf..0f66813926 100644
--- a/data/assets/scene/solarsystem/planets/saturn/tethys/tethys.asset
+++ b/data/assets/scene/solarsystem/planets/saturn/tethys/tethys.asset
@@ -4,7 +4,7 @@ local kernel = asset.require("../kernels")
 
 
 
-local labelsPath = asset.syncedResource({
+local labelsPath = asset.resource({
   Name = "Saturn Labels",
   Type = "HttpSynchronization",
   Identifier = "saturn_labels",
diff --git a/data/assets/scene/solarsystem/planets/saturn/titan/layers/colorlayers/cassini_iss_global_mosaic_4km_local.asset b/data/assets/scene/solarsystem/planets/saturn/titan/layers/colorlayers/cassini_iss_global_mosaic_4km_local.asset
index 2e069072a2..06cbdfaccb 100644
--- a/data/assets/scene/solarsystem/planets/saturn/titan/layers/colorlayers/cassini_iss_global_mosaic_4km_local.asset
+++ b/data/assets/scene/solarsystem/planets/saturn/titan/layers/colorlayers/cassini_iss_global_mosaic_4km_local.asset
@@ -2,7 +2,7 @@ local globe = asset.require("../../titan")
 
 
 
-local texturesPath = asset.syncedResource({
+local texturesPath = asset.resource({
   Type = "HttpSynchronization",
   Name = "Titan textures",
   Identifier = "titan_textures",
diff --git a/data/assets/scene/solarsystem/planets/saturn/titan/layers/colorlayers/cassini_iss_global_mosaic_4km_newyork.asset b/data/assets/scene/solarsystem/planets/saturn/titan/layers/colorlayers/cassini_iss_global_mosaic_4km_newyork.asset
index 8084c7797f..aba41f9d82 100644
--- a/data/assets/scene/solarsystem/planets/saturn/titan/layers/colorlayers/cassini_iss_global_mosaic_4km_newyork.asset
+++ b/data/assets/scene/solarsystem/planets/saturn/titan/layers/colorlayers/cassini_iss_global_mosaic_4km_newyork.asset
@@ -6,7 +6,7 @@ local Layer = {
   Identifier = "Cassini_ISS_Global_Mosaic_4km_NewYork",
   Name = "Cassini ISS Global Mosaic [New York]",
   Enabled = asset.enabled,
-  FilePath = asset.localResource("cassini_iss_global_mosaic_4km_newyork.wms"),
+  FilePath = asset.resource("cassini_iss_global_mosaic_4km_newyork.wms"),
   Description = [[This global digital map of Saturn's moon Titan was created using
     images taken by the Cassini spacecraft's Imaging Science Subsystem (ISS). The map
     was produced in June 2015 using data collected through Cassini's flyby on April 7,
diff --git a/data/assets/scene/solarsystem/planets/saturn/titan/layers/colorlayers/cassini_iss_global_mosaic_4km_sweden.asset b/data/assets/scene/solarsystem/planets/saturn/titan/layers/colorlayers/cassini_iss_global_mosaic_4km_sweden.asset
index bf3cee518d..0e658e9e61 100644
--- a/data/assets/scene/solarsystem/planets/saturn/titan/layers/colorlayers/cassini_iss_global_mosaic_4km_sweden.asset
+++ b/data/assets/scene/solarsystem/planets/saturn/titan/layers/colorlayers/cassini_iss_global_mosaic_4km_sweden.asset
@@ -6,7 +6,7 @@ local Layer = {
   Identifier = "Cassini_ISS_Global_Mosaic_4km_LiU",
   Name = "Cassini ISS Global Mosaic [Sweden]",
   Enabled = asset.enabled,
-  FilePath = asset.localResource("cassini_iss_global_mosaic_4km_sweden.wms"),
+  FilePath = asset.resource("cassini_iss_global_mosaic_4km_sweden.wms"),
   Description = [[This global digital map of Saturn's moon Titan was created using
     images taken by the Cassini spacecraft's Imaging Science Subsystem (ISS). The map
     was produced in June 2015 using data collected through Cassini's flyby on April 7,
diff --git a/data/assets/scene/solarsystem/planets/saturn/titan/titan.asset b/data/assets/scene/solarsystem/planets/saturn/titan/titan.asset
index 53b332a6f6..6347aeeaa0 100644
--- a/data/assets/scene/solarsystem/planets/saturn/titan/titan.asset
+++ b/data/assets/scene/solarsystem/planets/saturn/titan/titan.asset
@@ -4,7 +4,7 @@ local kernel = asset.require("../kernels")
 
 
 
-local labelsPath = asset.syncedResource({
+local labelsPath = asset.resource({
   Name = "Saturn Labels",
   Type = "HttpSynchronization",
   Identifier = "saturn_labels",
diff --git a/data/assets/scene/solarsystem/planets/uranus/kernels.asset b/data/assets/scene/solarsystem/planets/uranus/kernels.asset
index d7dcbf10c6..22ebcd1447 100644
--- a/data/assets/scene/solarsystem/planets/uranus/kernels.asset
+++ b/data/assets/scene/solarsystem/planets/uranus/kernels.asset
@@ -1,4 +1,4 @@
-local kernels = asset.syncedResource({
+local kernels = asset.resource({
   Name = "Uranus Spice Kernels",
   Type = "HttpSynchronization",
   Identifier = "uranus_kernels",
diff --git a/data/assets/scene/solarsystem/planets/uranus/layers/colorlayers/uranus_texture.asset b/data/assets/scene/solarsystem/planets/uranus/layers/colorlayers/uranus_texture.asset
index b8702a1d72..a351c817a9 100644
--- a/data/assets/scene/solarsystem/planets/uranus/layers/colorlayers/uranus_texture.asset
+++ b/data/assets/scene/solarsystem/planets/uranus/layers/colorlayers/uranus_texture.asset
@@ -2,7 +2,7 @@ local globe = asset.require("../../uranus")
 
 
 
-local texturesPath = asset.syncedResource({
+local texturesPath = asset.resource({
   Name = "Uranus Textures",
   Type = "HttpSynchronization",
   Identifier = "uranus_textures",
diff --git a/data/assets/scene/solarsystem/planets/venus/layers/colorlayers/clouds_magellan_combo.asset b/data/assets/scene/solarsystem/planets/venus/layers/colorlayers/clouds_magellan_combo.asset
index 504cdfad08..2086f4ee46 100644
--- a/data/assets/scene/solarsystem/planets/venus/layers/colorlayers/clouds_magellan_combo.asset
+++ b/data/assets/scene/solarsystem/planets/venus/layers/colorlayers/clouds_magellan_combo.asset
@@ -2,7 +2,7 @@ local globe = asset.require("../../venus")
 
 
 
-local texturesPath = asset.syncedResource({
+local texturesPath = asset.resource({
   Name = "Venus Textures",
   Type = "HttpSynchronization",
   Identifier = "venus_textures",
@@ -30,7 +30,7 @@ local Layer = {
       TileProvider = {
         Identifier = "Magellan_Mosaic_Utah",
         Name = "Magellan Mosaic [Utah]",
-        FilePath = asset.localResource("magellan_mosaic_utah.vrt"),
+        FilePath = asset.resource("magellan_mosaic_utah.vrt"),
         BlendMode = "Color",
         Settings = { Gamma = 2.0 }
       }
diff --git a/data/assets/scene/solarsystem/planets/venus/layers/colorlayers/clouds_magellan_combo_newyork.asset b/data/assets/scene/solarsystem/planets/venus/layers/colorlayers/clouds_magellan_combo_newyork.asset
index 172fee7f3a..79c648a45d 100644
--- a/data/assets/scene/solarsystem/planets/venus/layers/colorlayers/clouds_magellan_combo_newyork.asset
+++ b/data/assets/scene/solarsystem/planets/venus/layers/colorlayers/clouds_magellan_combo_newyork.asset
@@ -2,7 +2,7 @@ local globe = asset.require("../../venus")
 
 
 
-local texturesPath = asset.syncedResource({
+local texturesPath = asset.resource({
   Name = "Venus Textures",
   Type = "HttpSynchronization",
   Identifier = "venus_textures",
@@ -30,7 +30,7 @@ local Layer = {
       TileProvider = {
         Identifier = "Magellan_Mosaic_NewYork",
         Name = "Magellan Mosaic [New York]",
-        FilePath = asset.localResource("magellan_mosaic_newyork.vrt"),
+        FilePath = asset.resource("magellan_mosaic_newyork.vrt"),
         BlendMode = "Color",
         Settings = { Gamma = 2.0 }
       }
diff --git a/data/assets/scene/solarsystem/planets/venus/layers/colorlayers/magellan_mosaic_newyork.asset b/data/assets/scene/solarsystem/planets/venus/layers/colorlayers/magellan_mosaic_newyork.asset
index 5b4a771047..8c01b2e223 100644
--- a/data/assets/scene/solarsystem/planets/venus/layers/colorlayers/magellan_mosaic_newyork.asset
+++ b/data/assets/scene/solarsystem/planets/venus/layers/colorlayers/magellan_mosaic_newyork.asset
@@ -6,7 +6,7 @@ local Layer = {
   Identifier = "Magellan_Mosaic_NewYork",
   Name = "Magellan Mosaic [New York]",
   Enabled = asset.enabled,
-  FilePath = asset.localResource("magellan_mosaic_newyork.vrt"),
+  FilePath = asset.resource("magellan_mosaic_newyork.vrt"),
   BlendMode = "Color",
   Settings = { Gamma = 2.0 },
   Description = [[Color layer for Venus. This mosaic was created from the Magellan
diff --git a/data/assets/scene/solarsystem/planets/venus/layers/colorlayers/magellan_mosaic_utah.asset b/data/assets/scene/solarsystem/planets/venus/layers/colorlayers/magellan_mosaic_utah.asset
index 45d05e246e..bb0655c803 100644
--- a/data/assets/scene/solarsystem/planets/venus/layers/colorlayers/magellan_mosaic_utah.asset
+++ b/data/assets/scene/solarsystem/planets/venus/layers/colorlayers/magellan_mosaic_utah.asset
@@ -6,7 +6,7 @@ local Layer = {
   Identifier = "Magellan_Mosaic_Utah",
   Name = "Magellan Mosaic [Utah]",
   Enabled = asset.enabled,
-  FilePath = asset.localResource("magellan_mosaic_utah.vrt"),
+  FilePath = asset.resource("magellan_mosaic_utah.vrt"),
   BlendMode = "Color",
   Settings = { Gamma = 2.0 },
   Description = [[Color layer for Venus. This mosaic was created from the Magellan
diff --git a/data/assets/scene/solarsystem/planets/venus/layers/colorlayers/venus_texture.asset b/data/assets/scene/solarsystem/planets/venus/layers/colorlayers/venus_texture.asset
index d327130a11..2343b4ca84 100644
--- a/data/assets/scene/solarsystem/planets/venus/layers/colorlayers/venus_texture.asset
+++ b/data/assets/scene/solarsystem/planets/venus/layers/colorlayers/venus_texture.asset
@@ -2,7 +2,7 @@ local globe = asset.require("../../venus")
 
 
 
-local texturesPath = asset.syncedResource({
+local texturesPath = asset.resource({
   Name = "Venus Textures",
   Type = "HttpSynchronization",
   Identifier = "venus_textures",
diff --git a/data/assets/scene/solarsystem/planets/venus/layers/heightlayers/magellan_newyork.asset b/data/assets/scene/solarsystem/planets/venus/layers/heightlayers/magellan_newyork.asset
index 102ea3fcaa..a783800fbc 100644
--- a/data/assets/scene/solarsystem/planets/venus/layers/heightlayers/magellan_newyork.asset
+++ b/data/assets/scene/solarsystem/planets/venus/layers/heightlayers/magellan_newyork.asset
@@ -6,7 +6,7 @@ local Layer = {
   Identifier = "MagellanElevation_NewYork",
   Name = "Magellan Elevation [New York]",
   Enabled = asset.enabled,
-  FilePath = asset.localResource("magellan_newyork.wms"),
+  FilePath = asset.resource("magellan_newyork.wms"),
   TilePixelSize = 129,
   Settings = {
     Gamma = 1.72,
diff --git a/data/assets/scene/solarsystem/planets/venus/layers/heightlayers/magellan_utah.asset b/data/assets/scene/solarsystem/planets/venus/layers/heightlayers/magellan_utah.asset
index 83a7c0125a..54a22bf790 100644
--- a/data/assets/scene/solarsystem/planets/venus/layers/heightlayers/magellan_utah.asset
+++ b/data/assets/scene/solarsystem/planets/venus/layers/heightlayers/magellan_utah.asset
@@ -6,7 +6,7 @@ local Layer = {
   Identifier = "MagellanElevation_Utah",
   Name = "Magellan Elevation [Utah]",
   Enabled = asset.enabled,
-  FilePath = asset.localResource("magellan_utah.wms"),
+  FilePath = asset.resource("magellan_utah.wms"),
   TilePixelSize = 129,
   Settings = {
     Gamma = 1.72,
diff --git a/data/assets/scene/solarsystem/planets/venus/venus.asset b/data/assets/scene/solarsystem/planets/venus/venus.asset
index 5b2d452429..7cc76365aa 100644
--- a/data/assets/scene/solarsystem/planets/venus/venus.asset
+++ b/data/assets/scene/solarsystem/planets/venus/venus.asset
@@ -4,7 +4,7 @@ local transforms = asset.require("./transforms")
 
 
 
-local labelsPath = asset.syncedResource({
+local labelsPath = asset.resource({
   Name = "Venus Labels",
   Type = "HttpSynchronization",
   Identifier = "venus_labels",
diff --git a/data/assets/scene/solarsystem/sssb/amor_asteroid.asset b/data/assets/scene/solarsystem/sssb/amor_asteroid.asset
index 2c5d7f0979..62ffe4b0a1 100644
--- a/data/assets/scene/solarsystem/sssb/amor_asteroid.asset
+++ b/data/assets/scene/solarsystem/sssb/amor_asteroid.asset
@@ -2,7 +2,7 @@ local transforms = asset.require("scene/solarsystem/sun/transforms")
 
 
 
-local sssb = asset.syncedResource({
+local sssb = asset.resource({
   Name = "Small SolarSystem Body Data (Amor Asteroid)",
   Type = "HttpSynchronization",
   Identifier = "sssb_data_amor_asteroid",
diff --git a/data/assets/scene/solarsystem/sssb/apollo_asteroid.asset b/data/assets/scene/solarsystem/sssb/apollo_asteroid.asset
index 4b051e11ff..675eefbcb8 100644
--- a/data/assets/scene/solarsystem/sssb/apollo_asteroid.asset
+++ b/data/assets/scene/solarsystem/sssb/apollo_asteroid.asset
@@ -2,7 +2,7 @@ local transforms = asset.require("scene/solarsystem/sun/transforms")
 
 
 
-local sssb = asset.syncedResource({
+local sssb = asset.resource({
   Name = "Small SolarSystem Body Data (Apollo Asteroid)",
   Type = "HttpSynchronization",
   Identifier = "sssb_data_apollo_asteroid",
diff --git a/data/assets/scene/solarsystem/sssb/astraea.asset b/data/assets/scene/solarsystem/sssb/astraea.asset
index bb8c721d1a..b46aaa56c3 100644
--- a/data/assets/scene/solarsystem/sssb/astraea.asset
+++ b/data/assets/scene/solarsystem/sssb/astraea.asset
@@ -2,7 +2,7 @@ local transforms = asset.require("scene/solarsystem/sun/transforms")
 
 
 
-local horizons = asset.syncedResource({
+local horizons = asset.resource({
   Name = "5 Astraea Trajectory",
   Type = "HttpSynchronization",
   Identifier = "astraea_horizons",
diff --git a/data/assets/scene/solarsystem/sssb/aten_asteroid.asset b/data/assets/scene/solarsystem/sssb/aten_asteroid.asset
index ae3d5f0f72..57a63305a2 100644
--- a/data/assets/scene/solarsystem/sssb/aten_asteroid.asset
+++ b/data/assets/scene/solarsystem/sssb/aten_asteroid.asset
@@ -2,7 +2,7 @@ local transforms = asset.require("scene/solarsystem/sun/transforms")
 
 
 
-local sssb = asset.syncedResource({
+local sssb = asset.resource({
   Name = "Small SolarSystem Body Data (Aten Asteroid)",
   Type = "HttpSynchronization",
   Identifier = "sssb_data_aten_asteroid",
diff --git a/data/assets/scene/solarsystem/sssb/atira_asteroid.asset b/data/assets/scene/solarsystem/sssb/atira_asteroid.asset
index ac1f7023ec..e9119fbe3e 100644
--- a/data/assets/scene/solarsystem/sssb/atira_asteroid.asset
+++ b/data/assets/scene/solarsystem/sssb/atira_asteroid.asset
@@ -2,7 +2,7 @@ local transforms = asset.require("scene/solarsystem/sun/transforms")
 
 
 
-local sssb = asset.syncedResource({
+local sssb = asset.resource({
   Name = "Small SolarSystem Body Data (Atira Asteroid)",
   Type = "HttpSynchronization",
   Identifier = "sssb_data_atira_asteroid",
diff --git a/data/assets/scene/solarsystem/sssb/c2019y4atlas.asset b/data/assets/scene/solarsystem/sssb/c2019y4atlas.asset
index 8704ad96e6..dcf5dda490 100644
--- a/data/assets/scene/solarsystem/sssb/c2019y4atlas.asset
+++ b/data/assets/scene/solarsystem/sssb/c2019y4atlas.asset
@@ -2,7 +2,7 @@ local sunTransforms = asset.require("scene/solarsystem/sun/transforms")
 
 
 
-local orbit = asset.syncedResource({
+local orbit = asset.resource({
   Name = "Comet C/2019 Y4 ATLAS",
   Type = "HttpSynchronization",
   Identifier = "horizons_c2019y4atlas",
diff --git a/data/assets/scene/solarsystem/sssb/centaur_asteroid.asset b/data/assets/scene/solarsystem/sssb/centaur_asteroid.asset
index 8b2468a1bf..b34557cfba 100644
--- a/data/assets/scene/solarsystem/sssb/centaur_asteroid.asset
+++ b/data/assets/scene/solarsystem/sssb/centaur_asteroid.asset
@@ -2,7 +2,7 @@ local transforms = asset.require("scene/solarsystem/sun/transforms")
 
 
 
-local sssb = asset.syncedResource({
+local sssb = asset.resource({
   Name = "Small SolarSystem Body Data (Centaur Asteroid)",
   Type = "HttpSynchronization",
   Identifier = "sssb_data_centaur_asteroid",
diff --git a/data/assets/scene/solarsystem/sssb/chiron-type_comet.asset b/data/assets/scene/solarsystem/sssb/chiron-type_comet.asset
index 48b7f01a89..fb3b172b15 100644
--- a/data/assets/scene/solarsystem/sssb/chiron-type_comet.asset
+++ b/data/assets/scene/solarsystem/sssb/chiron-type_comet.asset
@@ -2,7 +2,7 @@ local transforms = asset.require("scene/solarsystem/sun/transforms")
 
 
 
-local sssb = asset.syncedResource({
+local sssb = asset.resource({
   Name = "Small SolarSystem Body Data (Chiron-type Comet)",
   Type = "HttpSynchronization",
   Identifier = "sssb_data_chiron-type_comet",
diff --git a/data/assets/scene/solarsystem/sssb/encke-type_comet.asset b/data/assets/scene/solarsystem/sssb/encke-type_comet.asset
index 6ebc6a16a8..932eaeac9a 100644
--- a/data/assets/scene/solarsystem/sssb/encke-type_comet.asset
+++ b/data/assets/scene/solarsystem/sssb/encke-type_comet.asset
@@ -2,7 +2,7 @@ local transforms = asset.require("scene/solarsystem/sun/transforms")
 
 
 
-local sssb = asset.syncedResource({
+local sssb = asset.resource({
   Name = "Small SolarSystem Body Data (Encke-type Comet)",
   Type = "HttpSynchronization",
   Identifier = "sssb_data_encke-type_comet",
diff --git a/data/assets/scene/solarsystem/sssb/halley-type_comet.asset b/data/assets/scene/solarsystem/sssb/halley-type_comet.asset
index 81b8efafec..92a5fd4b5c 100644
--- a/data/assets/scene/solarsystem/sssb/halley-type_comet.asset
+++ b/data/assets/scene/solarsystem/sssb/halley-type_comet.asset
@@ -2,7 +2,7 @@ local transforms = asset.require("scene/solarsystem/sun/transforms")
 
 
 
-local sssb = asset.syncedResource({
+local sssb = asset.resource({
   Name = "Small SolarSystem Body Data (Halley-type Comet)",
   Type = "HttpSynchronization",
   Identifier = "sssb_data_halley-type_comet",
diff --git a/data/assets/scene/solarsystem/sssb/inner_main_belt_asteroid.asset b/data/assets/scene/solarsystem/sssb/inner_main_belt_asteroid.asset
index 17ea63d52d..fb4fb38c7b 100644
--- a/data/assets/scene/solarsystem/sssb/inner_main_belt_asteroid.asset
+++ b/data/assets/scene/solarsystem/sssb/inner_main_belt_asteroid.asset
@@ -2,7 +2,7 @@ local transforms = asset.require("scene/solarsystem/sun/transforms")
 
 
 
-local sssb = asset.syncedResource({
+local sssb = asset.resource({
   Name = "Small SolarSystem Body Data (Inner Main Belt Asteroid)",
   Type = "HttpSynchronization",
   Identifier = "sssb_data_inner_main_belt_asteroid",
diff --git a/data/assets/scene/solarsystem/sssb/itokawa.asset b/data/assets/scene/solarsystem/sssb/itokawa.asset
index 743ff3747f..758ff32a7f 100644
--- a/data/assets/scene/solarsystem/sssb/itokawa.asset
+++ b/data/assets/scene/solarsystem/sssb/itokawa.asset
@@ -3,14 +3,14 @@ local sun = asset.require("scene/solarsystem/sun/sun")
 
 
 
-local orbit = asset.syncedResource({
+local orbit = asset.resource({
   Name = "Itokawa Orbit",
   Type = "HttpSynchronization",
   Identifier = "itokawa_horizons",
   Version = 2
 })
 
-local model = asset.syncedResource({
+local model = asset.resource({
   Name = "Itokawa Model",
   Type = "HttpSynchronization",
   Identifier = "itokawa_model",
diff --git a/data/assets/scene/solarsystem/sssb/jupiter-family_comet.asset b/data/assets/scene/solarsystem/sssb/jupiter-family_comet.asset
index fc9aa2e9e2..3382de82d3 100644
--- a/data/assets/scene/solarsystem/sssb/jupiter-family_comet.asset
+++ b/data/assets/scene/solarsystem/sssb/jupiter-family_comet.asset
@@ -2,7 +2,7 @@ local transforms = asset.require("scene/solarsystem/sun/transforms")
 
 
 
-local sssb = asset.syncedResource({
+local sssb = asset.resource({
   Name = "Small SolarSystem Body Data (Jupiter Family Comet)",
   Type = "HttpSynchronization",
   Identifier = "sssb_data_jupiter-family_comet",
diff --git a/data/assets/scene/solarsystem/sssb/jupiter_trojan_asteroid.asset b/data/assets/scene/solarsystem/sssb/jupiter_trojan_asteroid.asset
index f2ad637137..26312b1a70 100644
--- a/data/assets/scene/solarsystem/sssb/jupiter_trojan_asteroid.asset
+++ b/data/assets/scene/solarsystem/sssb/jupiter_trojan_asteroid.asset
@@ -2,7 +2,7 @@ local transforms = asset.require("scene/solarsystem/sun/transforms")
 
 
 
-local sssb = asset.syncedResource({
+local sssb = asset.resource({
   Name = "Small SolarSystem Body Data (Jupiter Trojan Asteroid)",
   Type = "HttpSynchronization",
   Identifier = "sssb_data_jupiter_trojan_asteroid",
diff --git a/data/assets/scene/solarsystem/sssb/main_belt_asteroid.asset b/data/assets/scene/solarsystem/sssb/main_belt_asteroid.asset
index 850e3d9b9a..546adb701b 100644
--- a/data/assets/scene/solarsystem/sssb/main_belt_asteroid.asset
+++ b/data/assets/scene/solarsystem/sssb/main_belt_asteroid.asset
@@ -2,7 +2,7 @@ local transforms = asset.require("scene/solarsystem/sun/transforms")
 
 
 
-local sssb = asset.syncedResource({
+local sssb = asset.resource({
   Name = "Small SolarSystem Body Data (Main Belt Asteroid)",
   Type = "HttpSynchronization",
   Identifier = "sssb_data_main_belt_asteroid",
diff --git a/data/assets/scene/solarsystem/sssb/mars-crossing_asteroid.asset b/data/assets/scene/solarsystem/sssb/mars-crossing_asteroid.asset
index ed44f28a94..2b54bdce9a 100644
--- a/data/assets/scene/solarsystem/sssb/mars-crossing_asteroid.asset
+++ b/data/assets/scene/solarsystem/sssb/mars-crossing_asteroid.asset
@@ -2,7 +2,7 @@ local transforms = asset.require("scene/solarsystem/sun/transforms")
 
 
 
-local sssb = asset.syncedResource({
+local sssb = asset.resource({
   Name = "Small SolarSystem Body Data (Mars-Crossing Asteroid)",
   Type = "HttpSynchronization",
   Identifier = "sssb_data_mars-crossing_asteroid",
diff --git a/data/assets/scene/solarsystem/sssb/outer_main_belt_asteroid.asset b/data/assets/scene/solarsystem/sssb/outer_main_belt_asteroid.asset
index 3047d60dfa..34e8062385 100644
--- a/data/assets/scene/solarsystem/sssb/outer_main_belt_asteroid.asset
+++ b/data/assets/scene/solarsystem/sssb/outer_main_belt_asteroid.asset
@@ -2,7 +2,7 @@ local transforms = asset.require("scene/solarsystem/sun/transforms")
 
 
 
-local sssb = asset.syncedResource({
+local sssb = asset.resource({
   Name = "Small SolarSystem Body Data (Outer Main Belt Asteroid)",
   Type = "HttpSynchronization",
   Identifier = "sssb_data_outer_main_belt_asteroid",
diff --git a/data/assets/scene/solarsystem/sssb/pha.asset b/data/assets/scene/solarsystem/sssb/pha.asset
index ddc49f421e..6061eb8b9c 100644
--- a/data/assets/scene/solarsystem/sssb/pha.asset
+++ b/data/assets/scene/solarsystem/sssb/pha.asset
@@ -2,7 +2,7 @@ local transforms = asset.require("scene/solarsystem/sun/transforms")
 
 
 
-local sssb = asset.syncedResource({
+local sssb = asset.resource({
   Name = "Small SolarSystem Body Data (Potentially hazardous Asteroids)",
   Type = "HttpSynchronization",
   Identifier = "sssb_data_pha",
diff --git a/data/assets/scene/solarsystem/sssb/swifttuttle.asset b/data/assets/scene/solarsystem/sssb/swifttuttle.asset
index e4c119e08f..c19c962dec 100644
--- a/data/assets/scene/solarsystem/sssb/swifttuttle.asset
+++ b/data/assets/scene/solarsystem/sssb/swifttuttle.asset
@@ -2,7 +2,7 @@ local sunTransforms = asset.require("scene/solarsystem/sun/transforms")
 
 
 
-local sync = asset.syncedResource({
+local sync = asset.resource({
   Name = "Swift Tuttle Orbit",
   Type = "HttpSynchronization",
   Identifier = "swift_tuttle_horizons",
diff --git a/data/assets/scene/solarsystem/sssb/tesla_roadster.asset b/data/assets/scene/solarsystem/sssb/tesla_roadster.asset
index b1fd429a34..0afdadd5ae 100644
--- a/data/assets/scene/solarsystem/sssb/tesla_roadster.asset
+++ b/data/assets/scene/solarsystem/sssb/tesla_roadster.asset
@@ -2,7 +2,7 @@ local transforms = asset.require("scene/solarsystem/sun/transforms")
 
 
 
-local orbit = asset.syncedResource({
+local orbit = asset.resource({
   Name = "Tesla Roadster Orbit",
   Type = "HttpSynchronization",
   Identifier = "tesla_horizons",
diff --git a/data/assets/scene/solarsystem/sssb/transneptunian_object_asteroid.asset b/data/assets/scene/solarsystem/sssb/transneptunian_object_asteroid.asset
index 33de963562..4bee354119 100644
--- a/data/assets/scene/solarsystem/sssb/transneptunian_object_asteroid.asset
+++ b/data/assets/scene/solarsystem/sssb/transneptunian_object_asteroid.asset
@@ -2,7 +2,7 @@ local transforms = asset.require("scene/solarsystem/sun/transforms")
 
 
 
-local sssb = asset.syncedResource({
+local sssb = asset.resource({
   Name = "Small SolarSystem Body Data (Trans-Neptunian Object Asteroid)",
   Type = "HttpSynchronization",
   Identifier = "sssb_data_transneptunian_object_asteroid",
diff --git a/data/assets/scene/solarsystem/sun/EUV_layer.asset b/data/assets/scene/solarsystem/sun/EUV_layer.asset
index 2bb83577d3..bd42a64afc 100644
--- a/data/assets/scene/solarsystem/sun/EUV_layer.asset
+++ b/data/assets/scene/solarsystem/sun/EUV_layer.asset
@@ -4,7 +4,7 @@ local transforms = asset.require("./transforms")
 
 
 
-local textureSourcePath = asset.syncedResource({
+local textureSourcePath = asset.resource({
   Type = "HttpSynchronization",
   Name = "euv_textures_bastille_event",
   Identifier = "euv_textures_bastille_event",
diff --git a/data/assets/scene/solarsystem/sun/glare.asset b/data/assets/scene/solarsystem/sun/glare.asset
index de5227e4f5..d519859748 100644
--- a/data/assets/scene/solarsystem/sun/glare.asset
+++ b/data/assets/scene/solarsystem/sun/glare.asset
@@ -3,7 +3,7 @@ local transforms = asset.require("./transforms")
 
 
 
-local textures = asset.syncedResource({
+local textures = asset.resource({
   Type = "HttpSynchronization",
   Name = "Sun textures",
   Identifier = "sun_textures",
diff --git a/data/assets/scene/solarsystem/sun/layers/colorlayers/sun_texture.asset b/data/assets/scene/solarsystem/sun/layers/colorlayers/sun_texture.asset
index e0a558a030..c53274744c 100644
--- a/data/assets/scene/solarsystem/sun/layers/colorlayers/sun_texture.asset
+++ b/data/assets/scene/solarsystem/sun/layers/colorlayers/sun_texture.asset
@@ -2,7 +2,7 @@ local globe = asset.require("../../sun")
 
 
 
-local texturesPath = asset.syncedResource({
+local texturesPath = asset.resource({
   Type = "HttpSynchronization",
   Name = "Sun textures",
   Identifier = "sun_textures",
diff --git a/data/assets/scene/solarsystem/sun/marker.asset b/data/assets/scene/solarsystem/sun/marker.asset
index d1623e569c..b4fe9cc5c0 100644
--- a/data/assets/scene/solarsystem/sun/marker.asset
+++ b/data/assets/scene/solarsystem/sun/marker.asset
@@ -3,7 +3,7 @@ local transforms = asset.require("./transforms")
 
 
 
-local textures = asset.syncedResource({
+local textures = asset.resource({
   Type = "HttpSynchronization",
   Name = "Sun textures",
   Identifier = "sun_textures",
diff --git a/data/assets/scene/solarsystem/sun/transforms_heliosphere.asset b/data/assets/scene/solarsystem/sun/transforms_heliosphere.asset
index eb7447a536..2ebbf05274 100644
--- a/data/assets/scene/solarsystem/sun/transforms_heliosphere.asset
+++ b/data/assets/scene/solarsystem/sun/transforms_heliosphere.asset
@@ -16,7 +16,7 @@ local HEEQ180ReferenceFrame = {
       Type = "SpiceRotation",
       SourceFrame = "HEEQ180",
       DestinationFrame = "GALACTIC",
-      Kernels = asset.localResource("kernels/HEEQ180.tf")
+      Kernels = asset.resource("kernels/HEEQ180.tf")
     }
   },
   GUI = {
diff --git a/data/assets/scene/solarsystem/telescopes/gaia/gaia.asset b/data/assets/scene/solarsystem/telescopes/gaia/gaia.asset
index f23ee9bb27..70de7b2c03 100644
--- a/data/assets/scene/solarsystem/telescopes/gaia/gaia.asset
+++ b/data/assets/scene/solarsystem/telescopes/gaia/gaia.asset
@@ -3,7 +3,7 @@ local sun = asset.require("scene/solarsystem/sun/sun")
 
 
 
-local model = asset.syncedResource({
+local model = asset.resource({
   Name = "Gaia Model",
   Type = "HttpSynchronization",
   Identifier = "gaia_model",
diff --git a/data/assets/scene/solarsystem/telescopes/gaia/trail.asset b/data/assets/scene/solarsystem/telescopes/gaia/trail.asset
index a1ba231f95..8f0173dbe1 100644
--- a/data/assets/scene/solarsystem/telescopes/gaia/trail.asset
+++ b/data/assets/scene/solarsystem/telescopes/gaia/trail.asset
@@ -3,7 +3,7 @@ local sunTransforms = asset.require("scene/solarsystem/sun/transforms")
 
 
 
-local trail = asset.syncedResource({
+local trail = asset.resource({
   Name = "Gaia Trail",
   Type = "HttpSynchronization",
   Identifier = "gaia_trail",
diff --git a/data/assets/scene/solarsystem/telescopes/gaia/transforms.asset b/data/assets/scene/solarsystem/telescopes/gaia/transforms.asset
index 9d2375f100..920d928b04 100644
--- a/data/assets/scene/solarsystem/telescopes/gaia/transforms.asset
+++ b/data/assets/scene/solarsystem/telescopes/gaia/transforms.asset
@@ -2,7 +2,7 @@ local earthTransforms = asset.require("scene/solarsystem/planets/earth/transform
 
 
 
-local trail = asset.syncedResource({
+local trail = asset.resource({
   Name = "Gaia Trail",
   Type = "HttpSynchronization",
   Identifier = "gaia_trail",
diff --git a/data/assets/scene/solarsystem/telescopes/jwst/jwst.asset b/data/assets/scene/solarsystem/telescopes/jwst/jwst.asset
index 4c992a9fcf..e0c49a2b6d 100644
--- a/data/assets/scene/solarsystem/telescopes/jwst/jwst.asset
+++ b/data/assets/scene/solarsystem/telescopes/jwst/jwst.asset
@@ -7,14 +7,14 @@ local transforms = asset.require("./transforms")
 
 
 
-local models = asset.syncedResource({
+local models = asset.resource({
   Name = "JWST Model",
   Type = "HttpSynchronization",
   Identifier = "jwst_model",
   Version = 3
 })
 
-local band = asset.syncedResource({
+local band = asset.resource({
   Name = "JWST band texture",
   Type = "HttpSynchronization",
   Identifier = "jwst_band_texture",
diff --git a/data/assets/scene/solarsystem/telescopes/jwst/targets/crab_image.asset b/data/assets/scene/solarsystem/telescopes/jwst/targets/crab_image.asset
index fb77d04dcf..ebde46633a 100644
--- a/data/assets/scene/solarsystem/telescopes/jwst/targets/crab_image.asset
+++ b/data/assets/scene/solarsystem/telescopes/jwst/targets/crab_image.asset
@@ -1,4 +1,4 @@
-local image = asset.syncedResource({
+local image = asset.resource({
   Name = "Crab Nebula Image",
   Type = "HttpSynchronization",
   Identifier = "crab_image",
diff --git a/data/assets/scene/solarsystem/telescopes/jwst/targets/hd84406_image.asset b/data/assets/scene/solarsystem/telescopes/jwst/targets/hd84406_image.asset
index c119d7cd01..a126e76547 100644
--- a/data/assets/scene/solarsystem/telescopes/jwst/targets/hd84406_image.asset
+++ b/data/assets/scene/solarsystem/telescopes/jwst/targets/hd84406_image.asset
@@ -1,4 +1,4 @@
-local image = asset.syncedResource({
+local image = asset.resource({
   Name = "HD 84406 Star Image",
   Type = "HttpSynchronization",
   Identifier = "hd84406_image",
diff --git a/data/assets/scene/solarsystem/telescopes/jwst/targets/hh212_image.asset b/data/assets/scene/solarsystem/telescopes/jwst/targets/hh212_image.asset
index 775e2dddf9..0f9cb45f3e 100644
--- a/data/assets/scene/solarsystem/telescopes/jwst/targets/hh212_image.asset
+++ b/data/assets/scene/solarsystem/telescopes/jwst/targets/hh212_image.asset
@@ -1,4 +1,4 @@
-local image = asset.syncedResource({
+local image = asset.resource({
   Name = "HH 212 Image",
   Type = "HttpSynchronization",
   Identifier = "hh212_image",
diff --git a/data/assets/scene/solarsystem/telescopes/jwst/targets/hudf_image.asset b/data/assets/scene/solarsystem/telescopes/jwst/targets/hudf_image.asset
index a2deb3c480..a3c4f9c2f1 100644
--- a/data/assets/scene/solarsystem/telescopes/jwst/targets/hudf_image.asset
+++ b/data/assets/scene/solarsystem/telescopes/jwst/targets/hudf_image.asset
@@ -1,4 +1,4 @@
-local image = asset.syncedResource({
+local image = asset.resource({
   Name = "HUDF Image",
   Type = "HttpSynchronization",
   Identifier = "hudf_image",
diff --git a/data/assets/scene/solarsystem/telescopes/jwst/targets/m51_image.asset b/data/assets/scene/solarsystem/telescopes/jwst/targets/m51_image.asset
index 5526cfe9d3..e0b91f84f9 100644
--- a/data/assets/scene/solarsystem/telescopes/jwst/targets/m51_image.asset
+++ b/data/assets/scene/solarsystem/telescopes/jwst/targets/m51_image.asset
@@ -1,4 +1,4 @@
-local image = asset.syncedResource({
+local image = asset.resource({
   Name = "M51 Galaxy Image",
   Type = "HttpSynchronization",
   Identifier = "m51_image",
diff --git a/data/assets/scene/solarsystem/telescopes/jwst/targets/m82_image.asset b/data/assets/scene/solarsystem/telescopes/jwst/targets/m82_image.asset
index adf6985ee0..306d7cbae2 100644
--- a/data/assets/scene/solarsystem/telescopes/jwst/targets/m82_image.asset
+++ b/data/assets/scene/solarsystem/telescopes/jwst/targets/m82_image.asset
@@ -1,4 +1,4 @@
-local image = asset.syncedResource({
+local image = asset.resource({
   Name = "M82 Galaxy Image",
   Type = "HttpSynchronization",
   Identifier = "m82_image",
diff --git a/data/assets/scene/solarsystem/telescopes/jwst/targets/orion_image.asset b/data/assets/scene/solarsystem/telescopes/jwst/targets/orion_image.asset
index d719b6a388..0aa94d7e76 100644
--- a/data/assets/scene/solarsystem/telescopes/jwst/targets/orion_image.asset
+++ b/data/assets/scene/solarsystem/telescopes/jwst/targets/orion_image.asset
@@ -1,4 +1,4 @@
-local image = asset.syncedResource({
+local image = asset.resource({
   Name = "Orion Image",
   Type = "HttpSynchronization",
   Identifier = "orion_image",
diff --git a/data/assets/scene/solarsystem/telescopes/jwst/targets/ring_image.asset b/data/assets/scene/solarsystem/telescopes/jwst/targets/ring_image.asset
index f2824dead8..9efc570156 100644
--- a/data/assets/scene/solarsystem/telescopes/jwst/targets/ring_image.asset
+++ b/data/assets/scene/solarsystem/telescopes/jwst/targets/ring_image.asset
@@ -1,4 +1,4 @@
-local image = asset.syncedResource({
+local image = asset.resource({
   Name = "Ring Nebula Image",
   Type = "HttpSynchronization",
   Identifier = "ring_image",
diff --git a/data/assets/scene/solarsystem/telescopes/jwst/targets/sn1987a_image.asset b/data/assets/scene/solarsystem/telescopes/jwst/targets/sn1987a_image.asset
index 9816a43368..49fa958ce1 100644
--- a/data/assets/scene/solarsystem/telescopes/jwst/targets/sn1987a_image.asset
+++ b/data/assets/scene/solarsystem/telescopes/jwst/targets/sn1987a_image.asset
@@ -1,4 +1,4 @@
-local image = asset.syncedResource({
+local image = asset.resource({
   Name = "Supernova SN 1987a Image",
   Type = "HttpSynchronization",
   Identifier = "sn1987a_image",
diff --git a/data/assets/scene/solarsystem/telescopes/jwst/targets/trifid_image.asset b/data/assets/scene/solarsystem/telescopes/jwst/targets/trifid_image.asset
index b0a6896142..2150250c01 100644
--- a/data/assets/scene/solarsystem/telescopes/jwst/targets/trifid_image.asset
+++ b/data/assets/scene/solarsystem/telescopes/jwst/targets/trifid_image.asset
@@ -1,4 +1,4 @@
-local image = asset.syncedResource({
+local image = asset.resource({
   Name = "Trifid Nebula Image",
   Type = "HttpSynchronization",
   Identifier = "trifid_image",
diff --git a/data/assets/scene/solarsystem/telescopes/jwst/trail.asset b/data/assets/scene/solarsystem/telescopes/jwst/trail.asset
index bacd2e67cb..070f11312c 100644
--- a/data/assets/scene/solarsystem/telescopes/jwst/trail.asset
+++ b/data/assets/scene/solarsystem/telescopes/jwst/trail.asset
@@ -5,7 +5,7 @@ local sunTransforms = asset.require("scene/solarsystem/sun/transforms")
 
 
 
-local kernels = asset.syncedResource({
+local kernels = asset.resource({
   Name = "JWST Kernel",
   Type = "HttpSynchronization",
   Identifier = "jwst_kernels",
diff --git a/data/assets/scene/solarsystem/telescopes/jwst/transforms.asset b/data/assets/scene/solarsystem/telescopes/jwst/transforms.asset
index 421a9a91f5..e77f23d6f4 100644
--- a/data/assets/scene/solarsystem/telescopes/jwst/transforms.asset
+++ b/data/assets/scene/solarsystem/telescopes/jwst/transforms.asset
@@ -5,7 +5,7 @@ local sunTransforms = asset.require("scene/solarsystem/sun/transforms")
 
 
 
-local kernels = asset.syncedResource({
+local kernels = asset.resource({
   Name = "JWST Kernel",
   Type = "HttpSynchronization",
   Identifier = "jwst_kernels",
diff --git a/data/assets/spice/base.asset b/data/assets/spice/base.asset
index 31fd1fef3a..24408b5898 100644
--- a/data/assets/spice/base.asset
+++ b/data/assets/spice/base.asset
@@ -1,18 +1,18 @@
-local lsk = asset.syncedResource({
+local lsk = asset.resource({
   Name = "General LSK Kernels",
   Type = "HttpSynchronization",
   Identifier = "general_lsk",
   Version = 1
 })
 
-local pck = asset.syncedResource({
+local pck = asset.resource({
   Name = "General PCK Kernels",
   Type = "HttpSynchronization",
   Identifier = "general_pck",
   Version = 1
 })
 
-local spk = asset.syncedResource({
+local spk = asset.resource({
   Name = "General SPK Kernels",
   Type = "HttpSynchronization",
   Identifier = "general_spk",
diff --git a/data/assets/util/add_marker.asset b/data/assets/util/add_marker.asset
index d7424f417a..f287a79b22 100644
--- a/data/assets/util/add_marker.asset
+++ b/data/assets/util/add_marker.asset
@@ -1,4 +1,4 @@
-local icons = asset.syncedResource({
+local icons = asset.resource({
   Name = "Icons",
   Type = "HttpSynchronization",
   Identifier = "icons",
diff --git a/data/assets/util/constellations_helper.asset b/data/assets/util/constellations_helper.asset
index 8e3b8e7627..ffbce5157c 100644
--- a/data/assets/util/constellations_helper.asset
+++ b/data/assets/util/constellations_helper.asset
@@ -1,4 +1,4 @@
-local data = asset.syncedResource({
+local data = asset.resource({
   Name = "Constellation Files",
   Type = "HttpSynchronization",
   Identifier = "digitaluniverse_constellations_data",
diff --git a/data/assets/util/launcher_images.asset b/data/assets/util/launcher_images.asset
index 01a474b765..9801bea354 100644
--- a/data/assets/util/launcher_images.asset
+++ b/data/assets/util/launcher_images.asset
@@ -1,4 +1,4 @@
-local DataPath = asset.syncedResource({
+local DataPath = asset.resource({
   Name = "Launcher Images",
   Type = "HttpSynchronization",
   Identifier = "launcher_images",
diff --git a/data/assets/util/static_server.asset b/data/assets/util/static_server.asset
index b894061f56..b6a4c39804 100644
--- a/data/assets/util/static_server.asset
+++ b/data/assets/util/static_server.asset
@@ -1,6 +1,6 @@
 local BackendHash = "7ca0a34e9c4c065b7bfad0623db0e322bf3e0af9"
 
-local backend = asset.syncedResource({
+local backend = asset.resource({
   Identifier = "WebGuiBackend",
   Name = "Web Gui Backend",
   Type = "UrlSynchronization",
diff --git a/data/assets/util/webgui.asset b/data/assets/util/webgui.asset
index 19902055cd..35f0e17cd4 100644
--- a/data/assets/util/webgui.asset
+++ b/data/assets/util/webgui.asset
@@ -6,7 +6,7 @@ local guiCustomization = asset.require("customization/gui")
 -- Select which commit hashes to use for the frontend and backend
 local frontendHash = "c4fccbef3051522c7b8bcd96aeb20b8126ac2286"
 
-local frontend = asset.syncedResource({
+local frontend = asset.resource({
   Identifier = "WebGuiFrontend",
   Name = "Web Gui Frontend",
   Type = "UrlSynchronization",
diff --git a/src/scene/assetmanager.cpp b/src/scene/assetmanager.cpp
index f29e23fb14..1a9c0ec6a7 100644
--- a/src/scene/assetmanager.cpp
+++ b/src/scene/assetmanager.cpp
@@ -460,8 +460,7 @@ void AssetManager::setUpAssetLuaTable(Asset* asset) {
     // AssetInfo
     // |- Exports (table<name, exported data>)
     // |- Asset
-    // |  |- localResource
-    // |  |- syncedResource
+    // |  |- resource
     // |  |- require
     // |  |- exists
     // |  |- export
@@ -498,31 +497,7 @@ void AssetManager::setUpAssetLuaTable(Asset* asset) {
     const int assetTableIndex = lua_gettop(*_luaState);
 
     // Register local resource function
-    // string localResource(string path)
-    ghoul::lua::push(*_luaState, asset);
-    lua_pushcclosure(
-        *_luaState,
-        [](lua_State* L) {
-            ZoneScoped;
-
-            Asset* thisAsset = ghoul::lua::userData<Asset>(L, 1);
-            ghoul::lua::checkArgumentsAndThrow(L, { 0, 1 }, "lua::localResourceLua");
-
-            auto [name] = ghoul::lua::values<std::optional<std::string>>(L);
-            std::filesystem::path path =
-                name.has_value() ?
-                thisAsset->path().parent_path() / *name :
-                thisAsset->path().parent_path();
-
-            ghoul::lua::push(L, path);
-            return 1;
-        },
-        1
-    );
-    lua_setfield(*_luaState, assetTableIndex, "localResource");
-
-    // Register synced resource function
-    // string syncedResource(table)
+    // string resource(string path or table)
     ghoul::lua::push(*_luaState, this, asset);
     lua_pushcclosure(
         *_luaState,
@@ -531,40 +506,82 @@ void AssetManager::setUpAssetLuaTable(Asset* asset) {
 
             AssetManager* manager = ghoul::lua::userData<AssetManager>(L, 1);
             Asset* thisAsset = ghoul::lua::userData<Asset>(L, 2);
-            ghoul::lua::checkArgumentsAndThrow(L, 1, "lua::syncedResourceLua");
-            ghoul::Dictionary d = ghoul::lua::value<ghoul::Dictionary>(L);
-            std::unique_ptr<ResourceSynchronization> s =
-                ResourceSynchronization::createFromDictionary(d);
+            ghoul::lua::checkArgumentsAndThrow(L, { 0, 1 }, "lua::resource");
 
-            std::string uid = d.value<std::string>("Type") + "/" + s->generateUid();
-            SyncItem* syncItem = nullptr;
-            auto it = manager->_synchronizations.find(uid);
-            if (it == manager->_synchronizations.end()) {
-                auto si = std::make_unique<SyncItem>();
-                si->synchronization = std::move(s);
-                si->assets.push_back(thisAsset);
-                syncItem = si.get();
-                manager->_synchronizations[uid] = std::move(si);
+            if (ghoul::lua::hasValue<ghoul::Dictionary>(L)) {
+                ghoul::Dictionary d = ghoul::lua::value<ghoul::Dictionary>(L);
+                std::unique_ptr<ResourceSynchronization> s =
+                    ResourceSynchronization::createFromDictionary(d);
+
+                std::string uid = d.value<std::string>("Type") + "/" + s->generateUid();
+                SyncItem* syncItem = nullptr;
+                auto it = manager->_synchronizations.find(uid);
+                if (it == manager->_synchronizations.end()) {
+                    auto si = std::make_unique<SyncItem>();
+                    si->synchronization = std::move(s);
+                    si->assets.push_back(thisAsset);
+                    syncItem = si.get();
+                    manager->_synchronizations[uid] = std::move(si);
+                }
+                else {
+                    syncItem = it->second.get();
+                    syncItem->assets.push_back(thisAsset);
+                }
+
+                if (!syncItem->synchronization->isResolved()) {
+                    manager->_unfinishedSynchronizations.push_back(syncItem);
+                }
+
+                thisAsset->addSynchronization(syncItem->synchronization.get());
+                std::filesystem::path path = syncItem->synchronization->directory();
+                path += std::filesystem::path::preferred_separator;
+                ghoul::lua::push(L, path);
+            }
+            else if (ghoul::lua::hasValue<std::optional<std::string>>(L)) {
+                auto [name] = ghoul::lua::values<std::optional<std::string>>(L);
+                std::filesystem::path path =
+                    name.has_value() ?
+                    thisAsset->path().parent_path() / *name :
+                    thisAsset->path().parent_path();
+                ghoul::lua::push(L, path);
             }
             else {
-                syncItem = it->second.get();
-                syncItem->assets.push_back(thisAsset);
+                ghoul::lua::luaError(L, "Invalid parameter");
             }
 
-            if (!syncItem->synchronization->isResolved()) {
-                manager->_unfinishedSynchronizations.push_back(syncItem);
-            }
-
-            thisAsset->addSynchronization(syncItem->synchronization.get());
-            std::filesystem::path path = syncItem->synchronization->directory();
-            path += std::filesystem::path::preferred_separator;
-            ghoul::lua::push(L, path);
             return 1;
         },
         2
     );
+    lua_setfield(*_luaState, assetTableIndex, "resource");
+
+    lua_pushcclosure(
+        *_luaState,
+        [](lua_State* L) {
+            return ghoul::lua::luaError(
+                L,
+                "'asset.localResource' has been deprecrated and should be replaced with "
+                "'asset.resource' instead. No change to the parameters are needed"
+            );
+        },
+        0
+    );
+    lua_setfield(*_luaState, assetTableIndex, "localResource");
+
+    lua_pushcclosure(
+        *_luaState,
+        [](lua_State* L) {
+            return ghoul::lua::luaError(
+                L,
+                "'asset.syncedResource' has been deprecrated and should be replaced with "
+                "'asset.resource' instead. No change to the parameters are needed"
+            );
+        },
+        0
+    );
     lua_setfield(*_luaState, assetTableIndex, "syncedResource");
 
+
     // Register require function
     // Asset require(string path, bool? explicitEnable = true)
     ghoul::lua::push(*_luaState, this, asset);
diff --git a/tests/AssetLoaderTest/assetfunctionsexist.asset b/tests/AssetLoaderTest/assetfunctionsexist.asset
index 3eb012cb33..ef16c5c9bf 100644
--- a/tests/AssetLoaderTest/assetfunctionsexist.asset
+++ b/tests/AssetLoaderTest/assetfunctionsexist.asset
@@ -1,6 +1,6 @@
 assert(type(asset.require) == "function", "require should be function")
-assert(type(asset.localResource) == "function", "localResource should be function")
-assert(type(asset.syncedResource) == "function", "syncedResource should be function")
+assert(type(asset.resource) == "function", "localResource should be function")
+assert(type(asset.resource) == "function", "syncedResource should be function")
 assert(type(asset.export) == "function", "export should be function")
 assert(type(asset.onInitialize) == "function", "onInitialize should be function")
-assert(type(asset.onDeinitialize) == "function", "onDeinitialize should be function")
\ No newline at end of file
+assert(type(asset.onDeinitialize) == "function", "onDeinitialize should be function")

From af24a98940c8f343a2654d925c8e6c03d719a96b Mon Sep 17 00:00:00 2001
From: Alexander Bock <alexander.bock@liu.se>
Date: Thu, 19 Oct 2023 12:06:52 +0200
Subject: [PATCH 152/701] Ask for version in bug report template

---
 .github/ISSUE_TEMPLATE/bug_report.md | 16 +++++++++++++++-
 1 file changed, 15 insertions(+), 1 deletion(-)

diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md
index cd840e9382..b99f755ddc 100644
--- a/.github/ISSUE_TEMPLATE/bug_report.md
+++ b/.github/ISSUE_TEMPLATE/bug_report.md
@@ -4,7 +4,21 @@ about: Create a report to help us improve
 title: ''
 labels: 'Type: Bug'
 assignees: ''
-
+body:
+ - type: dropdown
+   id: version
+   attributes:
+     label: Version
+     description: What version of OpenSpace are you running?
+     options:
+       - `master` branch
+       - 0.19.2 
+       - 0.19.1 
+       - 0.19.0 
+       - 0.18.2 
+       - 0.18.1 
+       - 0.18.0
+     default: 0
 ---
 
 **Describe the bug**

From 63c339af581d3786f385b63bee043755eaccce7d Mon Sep 17 00:00:00 2001
From: Alexander Bock <alexander.bock@liu.se>
Date: Thu, 19 Oct 2023 12:07:24 +0200
Subject: [PATCH 153/701] Update bug_report.md

---
 .github/ISSUE_TEMPLATE/bug_report.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md
index b99f755ddc..31613c3feb 100644
--- a/.github/ISSUE_TEMPLATE/bug_report.md
+++ b/.github/ISSUE_TEMPLATE/bug_report.md
@@ -11,7 +11,7 @@ body:
      label: Version
      description: What version of OpenSpace are you running?
      options:
-       - `master` branch
+       - master branch
        - 0.19.2 
        - 0.19.1 
        - 0.19.0 

From 6ef7fba5c3fff1a23621b902479de18f356c36fb Mon Sep 17 00:00:00 2001
From: Alexander Bock <alexander.bock@liu.se>
Date: Mon, 30 Oct 2023 13:44:13 +1100
Subject: [PATCH 154/701] Clarify Code of Conduct

---
 CODE_OF_CONDUCT.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/CODE_OF_CONDUCT.md b/CODE_OF_CONDUCT.md
index f8489b2b7a..c6c9c1b098 100644
--- a/CODE_OF_CONDUCT.md
+++ b/CODE_OF_CONDUCT.md
@@ -4,11 +4,11 @@ In the interest of fostering an open and welcoming environment, we as contributo
 ## Our Standards
 Examples of behavior that contributes to creating a positive environment include:
 
-  - Using welcoming and inclusive language
+  - Using welcoming and inclusive language. Politeness is expected at all times. Be kind and courteous.
   - Being respectful of differing viewpoints and experiences
   - Gracefully accepting constructive criticism
   - Focusing on what is best for the community
-  - Showing empathy towards other community members
+  - Showing empathy towards other community members and always assume positive intent from others.
 
 Examples of unacceptable behavior by participants include:
 

From ad99d01046ce1181ce3d727a9c764b16e00a6169 Mon Sep 17 00:00:00 2001
From: Alexander Bock <mail@alexanderbock.eu>
Date: Mon, 30 Oct 2023 14:35:28 +1100
Subject: [PATCH 155/701] Add first version of mailmap script

---
 .mailmap | 84 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 84 insertions(+)
 create mode 100644 .mailmap

diff --git a/.mailmap b/.mailmap
new file mode 100644
index 0000000000..fb93aab2ef
--- /dev/null
+++ b/.mailmap
@@ -0,0 +1,84 @@
+Adam Rohdin <adam.rohdin@outlook.com> <adam.rohdin@liu.se>
+Adam Rohdin <adam.rohdin@outlook.com> Arohdin <adam.rohdin@liu.se>
+Adam Rohdin <adam.rohdin@outlook.com> Arohdin <adam.rohdin@visualiseringscenter.se>
+
+Alexander Bock <mail@alexanderbock.eu> <alexander.bock@liu.se>
+Alexander Bock <mail@alexanderbock.eu> <alexander.bock@me.com>
+
+Anton Arbring <antar420@student.liu.se> antar420 <antar420@student.liu.se>
+
+Elon Olsson <olssonelon@gmail.com> Elon <olssonelon@gmail.com>
+Elon Olsson <olssonelon@gmail.com> ElonOlsson <olssonelon@gmail.com>
+Elon Olsson <olssonelon@gmail.com> OLSSON <eolsson@ndc.nasa.gov>
+
+Emil Axelsson <nils.emil.axelsson@gmail.com> <mail@emilaxelsson.se>
+Emil Axelsson <nils.emil.axelsson@gmail.com> = <emil.axelsson@liu.se>
+Emil Axelsson <nils.emil.axelsson@gmail.com> <emiax775@student.liu.se>
+Emil Axelsson <nils.emil.axelsson@gmail.com> <emil@Emils-MBP.lan>
+
+Emilie Ho <emeliewho@gmail.com> Emilie <emeliewho@gmail.com>
+
+Emma Broman <emmabroman740@gmail.com> <emma95.broman@hotmail.com>
+Emma Broman <emmabroman740@gmail.com> <emma.broman@liu.se> 
+Emma Broman <emmabroman740@gmail.com> <emmbr740@student.liu.se>
+
+Eric Myers <EricMyers47@gmail.com> <myers@EricMyers.com>
+
+Erik Broberg <erikbroberg90@gmail.com> <Erik Broberg>
+Erik Broberg <erikbroberg90@gmail.com> nusic <erikbroberg90@gmail.com>
+
+Erik Sunden <eriksunden85@gmail.com> eriksunden <eriksunden85@gmail.com>
+Erik Sunden <eriksunden85@gmail.com> eriksunden <eriksunden@users.noreply.github.com>
+
+Gene Payne <payne.gene@gmail.com> GPayne <payne.gene@gmail.com> 
+Gene Payne <payne.gene@gmail.com> <gpayne@c-67-216.eduroam.liu.se> 
+Gene Payne <payne.gene@gmail.com> <gpayne@dhcp19217.sci.utah.edu>
+
+Hans-Christian Helltegen <hanhe945@student.liu.se> HC Helltegen <hanhe945@student.liu.se>
+Hans-Christian Helltegen <hanhe945@student.liu.se> <hhellteg@gs674-ccmcviz2.gsfc.nasa.gov>
+
+Ingela Rossing <pringela@gmail.com> Lingis <pringela@gmail.com>
+Ingela Rossing <pringela@gmail.com> unknown <pringela@gmail.com>
+
+Joakim Kilby <jockekilby@gmail.com> <joakim.kilby@liu.se>
+
+Jonas Strandstedt <jonas.strandstedt@gmail.com> jonasstrandstedt <jonas.strandstedt@gmail.com>
+
+Jonathas Costa <jon.costa@gmail.com> <jon.costa@gmailcom>
+
+Kalle Bladin <kallebladin@gmail.com> kalbl <kallebladin@gmail.com>
+Kalle Bladin <kallebladin@gmail.com> Kalle <kallebladin@gmail.com>
+Kalle Bladin <kallebladin@gmail.com> kbladin <kallebladin@gmail.com>
+Kalle Bladin <kallebladin@gmail.com> Karl Bladin <Karl Bladin>
+
+Karin Reidarman <karin_lr@hotmail.com> KarRei <karin_lr@hotmail.com> 
+
+Lovisa Hassler <lovisa.hassler@liu.se> liuloppan <lovisa.hassler@liu.se>
+Lovisa Hassler <lovisa.hassler@liu.se> <lovha71@liu.se>
+Lovisa Hassler <lovisa.hassler@liu.se> Your Name <you@example.com>
+
+Malin Ejdbo <malin.ejdbo@gmail.com> Malin E <malin.ejdbo@gmail.com>
+
+Matthew Territo <github@mterrito.com> <territo-sci@users.noreply.github.com>
+Matthew Territo <github@mterrito.com> <wundahful@users.noreply.github.com>
+Matthew Territo <github@mterrito.com> <Matthew Territo>
+Matthew Territo <github@mterrito.com> <wundahful@d>
+Matthew Territo <github@mterrito.com> wundahlful <github@mterrito.com>
+Matthew Territo <github@mterrito.com> wundahful <wundahful@no-reply.github.com>
+Matthew Territo <github@mterrito.com> <mterrito@WundahfulMacBook-2.local>
+
+Micah Acinapura <micahnyc@gmail.com> <micahnyc@nyu.edu> 
+Micah Acinapura <micahnyc@gmail.com> micahnyc <micahnyc@gmail.com> 
+Micah Acinapura <micahnyc@gmail.com> Micah <micahnyc@gmail.com> 
+Micah Acinapura <micahnyc@gmail.com> Micah <micah@Opens-MacBook-Pro.local> 
+
+Michal Marcinkowski <michal.j.marcinkowski@gmail.com> michal <michal.j.marcinkowski@gmail.com>
+
+Sebastian Piwell <sebastian.piwell@gmail.com> piwell <sebastian.piwell@gmail.com>
+
+Stefan Seibert <mail@stefanseibert.com> <stefan.seibert@liu.se>
+
+Ylva Selling <ylva.selling@gmail.com> <ylvse560@student.liu.se> 
+Ylva Selling <ylva.selling@gmail.com> <ys5140@nyu.edu>
+Ylva Selling <ylva.selling@gmail.com> ENG-VIDAVIZ-0\ylvas <ylva.selling@gmail.com>
+Ylva Selling <ylva.selling@gmail.com> sylvass <ylva.selling@gmail.com>

From 549f360be6c058931a9f20b6ba3a79cc8ff69cc1 Mon Sep 17 00:00:00 2001
From: Joakim Kilby <jockekilby@gmail.com>
Date: Mon, 30 Oct 2023 08:38:32 +0100
Subject: [PATCH 156/701] update ghoul submodule to include hasValue optional
 support (#2929)

---
 ext/ghoul | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ext/ghoul b/ext/ghoul
index fb549390c1..16d676f1d9 160000
--- a/ext/ghoul
+++ b/ext/ghoul
@@ -1 +1 @@
-Subproject commit fb549390c101cfcaac34f490185854faeb18911d
+Subproject commit 16d676f1d9b33d7fea3d01ec9d183b6310c18ba7

From 870850db07030d55d5b802981c8443a8dc9d15b1 Mon Sep 17 00:00:00 2001
From: Alexander Bock <mail@alexanderbock.eu>
Date: Sun, 5 Nov 2023 22:16:06 +0100
Subject: [PATCH 157/701] Enable warnings for missing case labels and
 subsequent cleanup.  Updated ghoul, sgct, and codegen repository for same

---
 apps/OpenSpace/ext/sgct                       |  2 +-
 ext/ghoul                                     |  2 +-
 modules/base/rendering/renderablelabel.cpp    | 50 +++++++++----------
 modules/base/rendering/renderablemodel.cpp    |  6 +--
 modules/base/rendering/renderableplane.cpp    |  9 ++--
 .../rendering/renderableplanescloud.cpp       |  5 +-
 .../rendering/renderablefieldlines.cpp        |  2 -
 modules/globebrowsing/src/geodeticpatch.cpp   |  8 +--
 modules/globebrowsing/src/gpulayergroup.cpp   |  4 --
 modules/globebrowsing/src/layer.cpp           | 20 ++------
 modules/globebrowsing/src/layeradjustment.cpp |  2 -
 modules/globebrowsing/src/layergroupid.h      | 27 +++++++---
 .../globebrowsing/src/rawtiledatareader.cpp   |  9 ++--
 .../src/tileprovider/temporaltileprovider.cpp |  9 ++--
 .../src/tileprovider/tileproviderbyindex.cpp  |  8 ---
 .../src/tileprovider/tileproviderbylevel.cpp  |  4 --
 .../globebrowsing/src/tiletextureinitdata.cpp |  5 +-
 modules/server/src/topics/enginemodetopic.cpp |  2 -
 modules/space/horizonsfile.cpp                |  4 +-
 modules/space/kepler.cpp                      |  2 -
 modules/video/src/videoplayer.cpp             | 15 +++---
 src/events/event.cpp                          | 12 ++---
 src/navigation/orbitalnavigator.cpp           | 12 ++---
 src/navigation/path.cpp                       | 24 +++++----
 src/util/timemanager.cpp                      |  2 -
 .../set_openspace_compile_settings.cmake      | 16 ++++--
 support/coding/codegen                        |  2 +-
 27 files changed, 116 insertions(+), 147 deletions(-)

diff --git a/apps/OpenSpace/ext/sgct b/apps/OpenSpace/ext/sgct
index cfd94f0e6a..d0003e83eb 160000
--- a/apps/OpenSpace/ext/sgct
+++ b/apps/OpenSpace/ext/sgct
@@ -1 +1 @@
-Subproject commit cfd94f0e6af50772d1ed27136cf5190d105c6b35
+Subproject commit d0003e83eb1d4e98d84867c2ca8cf1f51bed5f95
diff --git a/ext/ghoul b/ext/ghoul
index 16d676f1d9..84675b277a 160000
--- a/ext/ghoul
+++ b/ext/ghoul
@@ -1 +1 @@
-Subproject commit 16d676f1d9b33d7fea3d01ec9d183b6310c18ba7
+Subproject commit 84675b277a1a6e2880661fe1c830a392a24a3636
diff --git a/modules/base/rendering/renderablelabel.cpp b/modules/base/rendering/renderablelabel.cpp
index 54e1bbba80..06b91995c4 100644
--- a/modules/base/rendering/renderablelabel.cpp
+++ b/modules/base/rendering/renderablelabel.cpp
@@ -292,8 +292,6 @@ RenderableLabel::RenderableLabel(const ghoul::Dictionary& dictionary)
             case BlendMode::Additive:
                 setRenderBin(Renderable::RenderBin::PreDeferredTransparent);
                 break;
-            default:
-                throw ghoul::MissingCaseException();
         }
     });
 
@@ -505,37 +503,37 @@ float RenderableLabel::computeFadeFactor(float distanceNodeToCamera) const {
 
 float RenderableLabel::unit(int unit) const {
     switch (static_cast<Unit>(unit)) {
-        case Meter: return 1.f;
-        case Kilometer: return 1e3f;
-        case Megameter: return  1e6f;
-        case Gigameter: return 1e9f;
+        case Meter:           return 1.f;
+        case Kilometer:        return 1e3f;
+        case Megameter:        return  1e6f;
+        case Gigameter:        return 1e9f;
         case AstronomicalUnit: return 149597870700.f;
-        case Terameter: return 1e12f;
-        case Petameter: return 1e15f;
-        case Parsec: return static_cast<float>(PARSEC);
-        case KiloParsec: return static_cast<float>(1e3 * PARSEC);
-        case MegaParsec: return static_cast<float>(1e6 * PARSEC);
-        case GigaParsec: return static_cast<float>(1e9 * PARSEC);
-        case GigaLightyear: return static_cast<float>(306391534.73091 * PARSEC);
-        default: throw std::logic_error("Missing case label");
+        case Terameter:        return 1e12f;
+        case Petameter:        return 1e15f;
+        case Parsec:           return static_cast<float>(PARSEC);
+        case KiloParsec:       return static_cast<float>(1e3 * PARSEC);
+        case MegaParsec:       return static_cast<float>(1e6 * PARSEC);
+        case GigaParsec:       return static_cast<float>(1e9 * PARSEC);
+        case GigaLightyear:    return static_cast<float>(306391534.73091 * PARSEC);
+        default:               throw ghoul::MissingCaseException();
     }
 }
 
 std::string_view RenderableLabel::toString(int unit) const {
     switch (static_cast<Unit>(unit)) {
-        case Meter: return MeterUnit;
-        case Kilometer: return KilometerUnit;
-        case Megameter: return  MegameterUnit;
-        case Gigameter: return GigameterUnit;
+        case Meter:            return MeterUnit;
+        case Kilometer:        return KilometerUnit;
+        case Megameter:        return MegameterUnit;
+        case Gigameter:        return GigameterUnit;
         case AstronomicalUnit: return AstronomicalUnitUnit;
-        case Terameter: return TerameterUnit;
-        case Petameter: return PetameterUnit;
-        case Parsec: return ParsecUnit;
-        case KiloParsec: return KiloparsecUnit;
-        case MegaParsec: return MegaparsecUnit;
-        case GigaParsec: return GigaparsecUnit;
-        case GigaLightyear: return GigalightyearUnit;
-        default: throw std::logic_error("Missing case label");
+        case Terameter:        return TerameterUnit;
+        case Petameter:        return PetameterUnit;
+        case Parsec:           return ParsecUnit;
+        case KiloParsec:       return KiloparsecUnit;
+        case MegaParsec:       return MegaparsecUnit;
+        case GigaParsec:       return GigaparsecUnit;
+        case GigaLightyear:    return GigalightyearUnit;
+        default:               throw ghoul::MissingCaseException();
     }
 }
 
diff --git a/modules/base/rendering/renderablemodel.cpp b/modules/base/rendering/renderablemodel.cpp
index e9d9d0d1a9..c745d57273 100644
--- a/modules/base/rendering/renderablemodel.cpp
+++ b/modules/base/rendering/renderablemodel.cpp
@@ -430,8 +430,6 @@ RenderableModel::RenderableModel(const ghoul::Dictionary& dictionary)
             case Parameters::AnimationMode::Once:
                 _animationMode = AnimationMode::Once;
                 break;
-            default:
-                throw ghoul::MissingCaseException();
         }
     }
 
@@ -1048,7 +1046,7 @@ void RenderableModel::update(const UpdateData& data) {
 
 
     if (_geometry->hasAnimation() && !_animationStart.empty()) {
-        double relativeTime;
+        double relativeTime = 0.0;
         double now = data.time.j2000Seconds();
         double startTime = data.time.convertTime(_animationStart);
         double duration = _geometry->animationDuration();
@@ -1109,8 +1107,6 @@ void RenderableModel::update(const UpdateData& data) {
                     relativeTime = duration;
                 }
                 break;
-            default:
-                throw ghoul::MissingCaseException();
         }
         _geometry->update(relativeTime);
     }
diff --git a/modules/base/rendering/renderableplane.cpp b/modules/base/rendering/renderableplane.cpp
index 37e688e08f..ae5cb7d3e5 100644
--- a/modules/base/rendering/renderableplane.cpp
+++ b/modules/base/rendering/renderableplane.cpp
@@ -156,15 +156,14 @@ RenderablePlane::RenderablePlane(const ghoul::Dictionary& dictionary)
         { static_cast<int>(BlendMode::Additive), "Additive"}
     });
     _blendMode.onChange([this]() {
-        switch (_blendMode) {
-            case static_cast<int>(BlendMode::Normal):
+        BlendMode m = static_cast<BlendMode>(_blendMode.value());
+        switch (m) {
+            case BlendMode::Normal:
                 setRenderBinFromOpacity();
                 break;
-            case static_cast<int>(BlendMode::Additive):
+            case BlendMode::Additive:
                 setRenderBin(Renderable::RenderBin::PreDeferredTransparent);
                 break;
-            default:
-                throw ghoul::MissingCaseException();
         }
     });
 
diff --git a/modules/digitaluniverse/rendering/renderableplanescloud.cpp b/modules/digitaluniverse/rendering/renderableplanescloud.cpp
index c599f429fb..ac884fe09f 100644
--- a/modules/digitaluniverse/rendering/renderableplanescloud.cpp
+++ b/modules/digitaluniverse/rendering/renderableplanescloud.cpp
@@ -266,15 +266,14 @@ RenderablePlanesCloud::RenderablePlanesCloud(const ghoul::Dictionary& dictionary
         { BlendModeAdditive, "Additive" }
     });
     _blendMode.onChange([this]() {
-        switch (_blendMode) {
+        BlendMode m = static_cast<BlendMode>(_blendMode.value());
+        switch (m) {
             case BlendModeNormal:
                 setRenderBin(Renderable::RenderBin::Opaque);
                 break;
             case BlendModeAdditive:
                 setRenderBin(Renderable::RenderBin::PreDeferredTransparent);
                 break;
-            default:
-                throw ghoul::MissingCaseException();
         }
     });
 
diff --git a/modules/fieldlines/rendering/renderablefieldlines.cpp b/modules/fieldlines/rendering/renderablefieldlines.cpp
index 220a68a6b8..6a2c56b0ce 100644
--- a/modules/fieldlines/rendering/renderablefieldlines.cpp
+++ b/modules/fieldlines/rendering/renderablefieldlines.cpp
@@ -359,8 +359,6 @@ void RenderableFieldlines::loadSeedPoints() {
         case SeedPointSourceTable:
             loadSeedPointsFromTable();
             break;
-        default:
-            throw ghoul::MissingCaseException();
     }
 }
 
diff --git a/modules/globebrowsing/src/geodeticpatch.cpp b/modules/globebrowsing/src/geodeticpatch.cpp
index 7d8167f8dd..1dd0102f3d 100644
--- a/modules/globebrowsing/src/geodeticpatch.cpp
+++ b/modules/globebrowsing/src/geodeticpatch.cpp
@@ -106,10 +106,10 @@ Geodetic2 GeodeticPatch::size() const {
 
 Geodetic2 GeodeticPatch::corner(Quad q) const {
     switch (q) {
-        case NORTH_WEST:  return Geodetic2{ maxLat(), minLon() };// northWestCorner();
-        case NORTH_EAST:  return Geodetic2{ maxLat(), maxLon() };// northEastCorner();
-        case SOUTH_WEST:  return Geodetic2{ minLat(), minLon() };// southWestCorner();
-        case SOUTH_EAST:  return Geodetic2{ minLat(), maxLon() };// southEastCorner();
+        case NORTH_WEST:  return Geodetic2{ maxLat(), minLon() }; // northWestCorner();
+        case NORTH_EAST:  return Geodetic2{ maxLat(), maxLon() }; // northEastCorner();
+        case SOUTH_WEST:  return Geodetic2{ minLat(), minLon() }; // southWestCorner();
+        case SOUTH_EAST:  return Geodetic2{ minLat(), maxLon() }; // southEastCorner();
         default:          throw ghoul::MissingCaseException();
     }
 }
diff --git a/modules/globebrowsing/src/gpulayergroup.cpp b/modules/globebrowsing/src/gpulayergroup.cpp
index 8aa8a347b1..c94916a6e3 100644
--- a/modules/globebrowsing/src/gpulayergroup.cpp
+++ b/modules/globebrowsing/src/gpulayergroup.cpp
@@ -99,8 +99,6 @@ void GPULayerGroup::setValue(ghoul::opengl::ProgramObject& program,
             case layers::Layer::ID::SolidColor:
                 program.setUniform(galuc.color, al.solidColor());
                 break;
-            default:
-                throw ghoul::MissingCaseException();
         }
 
         if (gal.isHeightLayer) {
@@ -165,8 +163,6 @@ void GPULayerGroup::bind(ghoul::opengl::ProgramObject& p, const LayerGroup& laye
             case layers::Layer::ID::SolidColor:
                 galuc.color = p.uniformLocation(name + "color");
                 break;
-            default:
-                throw ghoul::MissingCaseException();
         }
 
         if (gal.isHeightLayer) {
diff --git a/modules/globebrowsing/src/layer.cpp b/modules/globebrowsing/src/layer.cpp
index 867bfcbc94..f82930fe5d 100644
--- a/modules/globebrowsing/src/layer.cpp
+++ b/modules/globebrowsing/src/layer.cpp
@@ -209,16 +209,10 @@ Layer::Layer(layers::Group::ID id, const ghoul::Dictionary& layerDict, LayerGrou
 {
     const Parameters p = codegen::bake<Parameters>(layerDict);
 
-    layers::Layer::ID typeID;
-    if (p.type.has_value()) {
-        typeID = ghoul::from_string<layers::Layer::ID>(*p.type);
-        if (typeID == layers::Layer::ID::Unknown) {
-            throw ghoul::RuntimeError("Unknown layer type");
-        }
-    }
-    else {
-        typeID = layers::Layer::ID::DefaultTileProvider;
-    }
+    layers::Layer::ID typeID =
+        p.type.has_value() ?
+        ghoul::from_string<layers::Layer::ID>(*p.type) :
+        layers::Layer::ID::DefaultTileProvider;
 
     initializeBasedOnType(typeID, layerDict);
 
@@ -330,8 +324,6 @@ Layer::Layer(layers::Group::ID id, const ghoul::Dictionary& layerDict, LayerGrou
             case layers::Layer::ID::SolidColor:
                 removeProperty(_solidColor);
                 break;
-            default:
-                throw ghoul::MissingCaseException();
         }
 
         _typeId = static_cast<layers::Layer::ID>(_typeOption.value());
@@ -502,8 +494,6 @@ void Layer::initializeBasedOnType(layers::Layer::ID id, ghoul::Dictionary initDi
                 _solidColor = initDict.value<glm::dvec3>(ColorInfo.identifier);
             }
             break;
-        default:
-            throw ghoul::MissingCaseException();
     }
 }
 
@@ -527,8 +517,6 @@ void Layer::addVisibleProperties() {
         case layers::Layer::ID::SolidColor:
             addProperty(_solidColor);
             break;
-        default:
-            throw ghoul::MissingCaseException();
     }
 }
 
diff --git a/modules/globebrowsing/src/layeradjustment.cpp b/modules/globebrowsing/src/layeradjustment.cpp
index 7df1815327..448acee1ae 100644
--- a/modules/globebrowsing/src/layeradjustment.cpp
+++ b/modules/globebrowsing/src/layeradjustment.cpp
@@ -126,8 +126,6 @@ void LayerAdjustment::setValuesFromDictionary(const ghoul::Dictionary& adjustmen
             case Parameters::Type::TransferFunction:
                 _typeOption = static_cast<int>(layers::Adjustment::ID::TransferFunction);
                 break;
-            default:
-                throw ghoul::MissingCaseException();
         }
     }
 
diff --git a/modules/globebrowsing/src/layergroupid.h b/modules/globebrowsing/src/layergroupid.h
index 146482621f..525c859d8f 100644
--- a/modules/globebrowsing/src/layergroupid.h
+++ b/modules/globebrowsing/src/layergroupid.h
@@ -88,8 +88,7 @@ struct Layer {
         TileProviderByLevel,
         SolidColor,
         SpoutImageProvider,
-        VideoTileProvider,
-        Unknown
+        VideoTileProvider
     };
 
     ID id;
@@ -206,9 +205,15 @@ constexpr openspace::globebrowsing::layers::Layer::ID from_string(std::string_vi
             return li.identifier == string;
         }
     );
-    return it != openspace::globebrowsing::layers::Layers.end() ?
-        it->id :
-        openspace::globebrowsing::layers::Layer::ID::Unknown;
+
+    if (it != openspace::globebrowsing::layers::Layers.end()) {
+        return it->id;
+    }
+    else {
+        throw ghoul::RuntimeError(fmt::format(
+            "Could not find Layer of type '{}'", string
+        ));
+    }
 }
 
 template <>
@@ -221,9 +226,15 @@ constexpr openspace::globebrowsing::layers::Group::ID from_string(std::string_vi
             return gi.identifier == string;
         }
     );
-    return it != openspace::globebrowsing::layers::Groups.end() ?
-        it->id :
-        openspace::globebrowsing::layers::Group::ID::Unknown;
+
+    if (it != openspace::globebrowsing::layers::Groups.end()) {
+        return it->id;
+    }
+    else {
+        throw ghoul::RuntimeError(fmt::format(
+            "Could not find Group of type '{}'", string
+        ));
+    }
 }
 
 template <>
diff --git a/modules/globebrowsing/src/rawtiledatareader.cpp b/modules/globebrowsing/src/rawtiledatareader.cpp
index c0678b88e1..14fe3a01a8 100644
--- a/modules/globebrowsing/src/rawtiledatareader.cpp
+++ b/modules/globebrowsing/src/rawtiledatareader.cpp
@@ -109,9 +109,12 @@ GDALDataType toGDALDataType(GLenum glType) {
         case GL_DOUBLE:
             return GDT_Float64;
         default:
-            LERRORC("GDALRawTileDataReader", fmt::format(
-                "OpenGL data type unknown to GDAL: {}", static_cast<int>(glType)
-            ));
+            LERRORC(
+                "GDALRawTileDataReader",
+                fmt::format(
+                    "OpenGL data type unknown to GDAL: {}", static_cast<int>(glType)
+                )
+            );
             throw ghoul::MissingCaseException();
     }
 }
diff --git a/modules/globebrowsing/src/tileprovider/temporaltileprovider.cpp b/modules/globebrowsing/src/tileprovider/temporaltileprovider.cpp
index e080d59bc7..8124b89df0 100644
--- a/modules/globebrowsing/src/tileprovider/temporaltileprovider.cpp
+++ b/modules/globebrowsing/src/tileprovider/temporaltileprovider.cpp
@@ -452,7 +452,8 @@ DefaultTileProvider* TemporalTileProvider::retrieveTileProvider(const Time& t) {
                 );
                 return std::string_view(it->second);
             }
-            default:  throw ghoul::MissingCaseException();
+            default:
+                throw ghoul::MissingCaseException();
         };
     }();
 
@@ -650,7 +651,8 @@ TileProvider* TemporalTileProvider::tileProvider(const Time& time) {
                 return tileProvider<Mode::Folder, true>(time);
             case Mode::Prototype:
                 return tileProvider<Mode::Prototype, true>(time);
-            default: throw ghoul::MissingCaseException();
+            default:
+                throw ghoul::MissingCaseException();
         }
     }
     else {
@@ -659,7 +661,8 @@ TileProvider* TemporalTileProvider::tileProvider(const Time& time) {
                 return tileProvider<Mode::Folder, false>(time);
             case Mode::Prototype:
                 return tileProvider<Mode::Prototype, false>(time);
-            default: throw ghoul::MissingCaseException();
+            default:
+                throw ghoul::MissingCaseException();
         }
     }
 }
diff --git a/modules/globebrowsing/src/tileprovider/tileproviderbyindex.cpp b/modules/globebrowsing/src/tileprovider/tileproviderbyindex.cpp
index 4b05839083..4b603e88df 100644
--- a/modules/globebrowsing/src/tileprovider/tileproviderbyindex.cpp
+++ b/modules/globebrowsing/src/tileprovider/tileproviderbyindex.cpp
@@ -73,10 +73,6 @@ TileProviderByIndex::TileProviderByIndex(const ghoul::Dictionary& dictionary) {
     if (p.defaultProvider.hasValue<std::string>("Type")) {
         std::string type = p.defaultProvider.value<std::string>("Type");
         typeID = ghoul::from_string<layers::Layer::ID>(type);
-
-        if (typeID == layers::Layer::ID::Unknown) {
-            throw ghoul::RuntimeError("Unknown layer type: " + type);
-        }
     }
 
     _defaultTileProvider = createFromDictionary(typeID, p.defaultProvider);
@@ -92,10 +88,6 @@ TileProviderByIndex::TileProviderByIndex(const ghoul::Dictionary& dictionary) {
         if (ip.tileProvider.hasValue<std::string>("Type")) {
             std::string type = ip.tileProvider.value<std::string>("Type");
             providerID = ghoul::from_string<layers::Layer::ID>(type);
-
-            if (providerID == layers::Layer::ID::Unknown) {
-                throw ghoul::RuntimeError("Unknown layer type: " + type);
-            }
         }
 
         std::unique_ptr<TileProvider> stp = createFromDictionary(
diff --git a/modules/globebrowsing/src/tileprovider/tileproviderbylevel.cpp b/modules/globebrowsing/src/tileprovider/tileproviderbylevel.cpp
index 0e0f439bfc..7683db051d 100644
--- a/modules/globebrowsing/src/tileprovider/tileproviderbylevel.cpp
+++ b/modules/globebrowsing/src/tileprovider/tileproviderbylevel.cpp
@@ -67,10 +67,6 @@ TileProviderByLevel::TileProviderByLevel(const ghoul::Dictionary& dictionary) {
         if (tileProviderDict.hasValue<std::string>("Type")) {
             std::string type = tileProviderDict.value<std::string>("Type");
             typeID = ghoul::from_string<layers::Layer::ID>(type);
-
-            if (typeID == layers::Layer::ID::Unknown) {
-                throw ghoul::RuntimeError("Unknown layer type: " + type);
-            }
         }
 
         std::unique_ptr<TileProvider> tp = createFromDictionary(typeID, tileProviderDict);
diff --git a/modules/globebrowsing/src/tiletextureinitdata.cpp b/modules/globebrowsing/src/tiletextureinitdata.cpp
index 6b195aae4b..052a0b1168 100644
--- a/modules/globebrowsing/src/tiletextureinitdata.cpp
+++ b/modules/globebrowsing/src/tiletextureinitdata.cpp
@@ -39,7 +39,6 @@ size_t numberOfRasters(ghoul::opengl::Texture::Format format) {
         case ghoul::opengl::Texture::Format::BGRA:
             return 4;
         default:
-            ghoul_assert(false, "Unknown format");
             throw ghoul::MissingCaseException();
     }
 }
@@ -56,7 +55,6 @@ size_t numberOfBytes(GLenum glType) {
         case GL_FLOAT:          return sizeof(GLfloat);
         case GL_DOUBLE:         return sizeof(GLdouble);
         default:
-            ghoul_assert(false, "Unknown data type");
             throw ghoul::MissingCaseException();
     }
 }
@@ -151,9 +149,8 @@ TileTextureInitData tileTextureInitData(layers::Group::ID id,
                 ghoul::opengl::Texture::Format::BGRA
             );
         }
-        default: {
+        default:
             throw ghoul::MissingCaseException();
-        }
     }
 }
 
diff --git a/modules/server/src/topics/enginemodetopic.cpp b/modules/server/src/topics/enginemodetopic.cpp
index 0cae8f820d..843ba71dce 100644
--- a/modules/server/src/topics/enginemodetopic.cpp
+++ b/modules/server/src/topics/enginemodetopic.cpp
@@ -101,8 +101,6 @@ void EngineModeTopic::sendJsonData() {
         case OpenSpaceEngine::Mode::CameraPath:
             modeString = "camera_path";
             break;
-        default:
-            throw ghoul::MissingCaseException();
     }
     stateJson["mode"] = modeString;
 
diff --git a/modules/space/horizonsfile.cpp b/modules/space/horizonsfile.cpp
index 83ceae3953..08442195ee 100644
--- a/modules/space/horizonsfile.cpp
+++ b/modules/space/horizonsfile.cpp
@@ -92,8 +92,8 @@ std::string constructHorizonsUrl(HorizonsType type, const std::string& target,
         case HorizonsType::Observer:
             url = ObserverUrl;
             break;
-        default:
-            throw ghoul::MissingCaseException();
+        case HorizonsType::Invalid:
+            break;
     }
 
     url += fmt::format(
diff --git a/modules/space/kepler.cpp b/modules/space/kepler.cpp
index 1af07182bb..ef5e40e508 100644
--- a/modules/space/kepler.cpp
+++ b/modules/space/kepler.cpp
@@ -756,8 +756,6 @@ std::vector<Parameters> readFile(std::filesystem::path file, Format format) {
         case Format::SBDB:
             res = readSbdbFile(file);
             break;
-        default:
-            throw ghoul::MissingCaseException();
     }
 
     LINFO(fmt::format("Saving cache {} for Kepler file {}", cachedFile, file));
diff --git a/modules/video/src/videoplayer.cpp b/modules/video/src/videoplayer.cpp
index ca44dc492c..32e9a81b06 100644
--- a/modules/video/src/videoplayer.cpp
+++ b/modules/video/src/videoplayer.cpp
@@ -266,15 +266,12 @@ VideoPlayer::VideoPlayer(const ghoul::Dictionary& dictionary)
 
     if (p.playbackMode.has_value()) {
         switch (*p.playbackMode) {
-        case Parameters::PlaybackMode::RealTimeLoop:
-            _playbackMode = PlaybackMode::RealTimeLoop;
-            break;
-        case Parameters::PlaybackMode::MapToSimulationTime:
-            _playbackMode = PlaybackMode::MapToSimulationTime;
-            break;
-        default:
-            LERROR("Missing playback mode in VideoTileProvider");
-            throw ghoul::MissingCaseException();
+            case Parameters::PlaybackMode::RealTimeLoop:
+                _playbackMode = PlaybackMode::RealTimeLoop;
+                break;
+            case Parameters::PlaybackMode::MapToSimulationTime:
+                _playbackMode = PlaybackMode::MapToSimulationTime;
+                break;
         }
     }
 
diff --git a/src/events/event.cpp b/src/events/event.cpp
index 1bcc037f4e..587e9079cd 100644
--- a/src/events/event.cpp
+++ b/src/events/event.cpp
@@ -107,7 +107,8 @@ void log(int i, const EventCameraFocusTransition& e) {
                 return "Receding";
             case EventCameraFocusTransition::Transition::Exiting:
                 return "Exiting";
-            default:                                  throw ghoul::MissingCaseException();
+            default:
+                throw ghoul::MissingCaseException();
         }
     }(e.transition);
 
@@ -349,8 +350,6 @@ ghoul::Dictionary toParameter(const Event& e) {
                 case EventParallelConnection::State::HostshipLost:
                     d.setValue("State", "HostshipLost"s);
                     break;
-                default:
-                    throw ghoul::MissingCaseException();
             }
             break;
         case Event::Type::ApplicationShutdown:
@@ -400,8 +399,6 @@ ghoul::Dictionary toParameter(const Event& e) {
                 case EventCameraFocusTransition::Transition::Exiting:
                     d.setValue("Transition", "Exiting"s);
                     break;
-                default:
-                    throw ghoul::MissingCaseException();
             }
             break;
         case Event::Type::PlanetEclipsed:
@@ -592,11 +589,12 @@ void logAllEvents(const Event* e) {
             case Event::Type::CameraPathFinished:
                 log(i, *static_cast<const EventCameraPathFinished*>(e));
                 break;
+            case Event::Type::CameraMovedPosition:
+                log(i, *static_cast<const EventCameraMovedPosition*>(e));
+                break;
             case Event::Type::Custom:
                 log(i, *static_cast<const CustomEvent*>(e));
                 break;
-            default:
-                throw ghoul::MissingCaseException();
         }
 
         i++;
diff --git a/src/navigation/orbitalnavigator.cpp b/src/navigation/orbitalnavigator.cpp
index cb194b3047..d4b663dae6 100644
--- a/src/navigation/orbitalnavigator.cpp
+++ b/src/navigation/orbitalnavigator.cpp
@@ -1634,14 +1634,10 @@ void OrbitalNavigator::rotateAroundAnchorUp(double deltaTime, double speedScale,
 {
     const glm::dvec3 axis = [](UpDirectionChoice upAxis) {
         switch (upAxis) {
-            case UpDirectionChoice::XAxis:
-                return glm::dvec3(1.0, 0.0, 0.0);
-            case UpDirectionChoice::YAxis:
-                return glm::dvec3(0.0, 1.0, 0.0);
-            case UpDirectionChoice::ZAxis:
-                return glm::dvec3(0.0, 0.0, 1.0);
-            default:
-                throw ghoul::MissingCaseException();
+            case UpDirectionChoice::XAxis: return glm::dvec3(1.0, 0.0, 0.0);
+            case UpDirectionChoice::YAxis: return glm::dvec3(0.0, 1.0, 0.0);
+            case UpDirectionChoice::ZAxis: return glm::dvec3(0.0, 0.0, 1.0);
+            default:                       throw ghoul::MissingCaseException();
         }
     }(UpDirectionChoice(_upToUseForRotation.value()));
 
diff --git a/src/navigation/path.cpp b/src/navigation/path.cpp
index d6cd9b1a04..e4a723c08f 100644
--- a/src/navigation/path.cpp
+++ b/src/navigation/path.cpp
@@ -96,9 +96,10 @@ namespace {
 
 namespace openspace::interaction {
 
-Path::Path(Waypoint start, Waypoint end, Type type,
-           std::optional<double> duration)
-    : _start(start), _end(end), _type(type)
+Path::Path(Waypoint start, Waypoint end, Type type, std::optional<double> duration)
+    : _start(start)
+    , _end(end)
+    , _type(type)
 {
     switch (_type) {
         case Type::AvoidCollision:
@@ -111,9 +112,6 @@ Path::Path(Waypoint start, Waypoint end, Type type,
         case Type::ZoomOutOverview:
             _curve = std::make_unique<ZoomOutOverviewCurve>(_start, _end);
             break;
-        default:
-            LERROR("Could not create curve. Type does not exist");
-            throw ghoul::MissingCaseException();
     }
 
     _prevPose = _start.pose();
@@ -133,11 +131,17 @@ Path::Path(Waypoint start, Waypoint end, Type type,
     }
 }
 
-Waypoint Path::startPoint() const { return _start; }
+Waypoint Path::startPoint() const {
+    return _start;
+}
 
-Waypoint Path::endPoint() const { return _end; }
+Waypoint Path::endPoint() const {
+    return _end;
+}
 
-double Path::pathLength() const { return _curve->length(); }
+double Path::pathLength() const {
+    return _curve->length();
+}
 
 std::vector<glm::dvec3> Path::controlPoints() const {
     return _curve->points();
@@ -570,8 +574,6 @@ Path createPathFromDictionary(const ghoul::Dictionary& dictionary,
             waypoints = { computeWaypointFromNodeInfo(info, startPoint, isLinear) };
             break;
         }
-        default:
-            throw ghoul::MissingCaseException();
     }
 
     // @TODO (emmbr) Allow for an instruction to represent a list of multiple waypoints
diff --git a/src/util/timemanager.cpp b/src/util/timemanager.cpp
index 94ed7f7700..c25030813a 100644
--- a/src/util/timemanager.cpp
+++ b/src/util/timemanager.cpp
@@ -952,8 +952,6 @@ void TimeManager::setTimeFromProfile(const Profile& p) {
             case Profile::Time::Type::Absolute:
                 _currentTime.data() = Time(p.time->value);
                 break;
-            default:
-                throw ghoul::MissingCaseException();
         }
 
         setPause(p.time->startPaused);
diff --git a/support/cmake/set_openspace_compile_settings.cmake b/support/cmake/set_openspace_compile_settings.cmake
index 7c5aa040f0..ed62bc3fdf 100644
--- a/support/cmake/set_openspace_compile_settings.cmake
+++ b/support/cmake/set_openspace_compile_settings.cmake
@@ -28,6 +28,11 @@ function (set_openspace_compile_settings target)
   set(MSVC_WARNINGS
     "/MP"       # Multi-threading support
     "/W4"       # Highest warning level
+    "/w44062"   # missing case label
+    "/w44289"   # using for-loop variable outside of loop
+    "/w44296"   # expression is always true/false
+    "/w45041"   # out-of-line definition for constexpr data is deprecated
+    "/w45204"   # virtual class has non-virtual trivial destructor
     "/wd4127"   # conditional expression is constant [raised by: websocketpp]
     "/wd4201"   # nonstandard extension used : nameless struct/union  [raised by: GLM]
     "/wd5030"   # attribute 'attribute' is not recognized  [raised by: codegen]
@@ -185,10 +190,13 @@ function (set_openspace_compile_settings target)
     target_compile_options(${target} PRIVATE ${MSVC_WARNINGS})
 
     # Boost as of 1.64 still uses unary_function unless we define this
-    target_compile_definitions(${target} PRIVATE "_HAS_AUTO_PTR_ETC")
-    target_compile_definitions(${target} PRIVATE "NOMINMAX")
-    target_compile_definitions(${target} PRIVATE "WIN32_LEAN_AND_MEAN")
-    target_compile_definitions(${target} PRIVATE "VC_EXTRALEAN")
+    target_compile_definitions(${target}
+      PRIVATE "_HAS_AUTO_PTR_ETC"
+      PUBLIC "_CRT_SECURE_NO_WARNINGS"
+      PRIVATE "NOMINMAX"
+      PRIVATE "WIN32_LEAN_AND_MEAN"
+      PRIVATE "VC_EXTRALEAN"
+    )
   elseif (NOT LINUX AND CMAKE_CXX_COMPILER_ID MATCHES "Clang")
     # Apple has "deprecated" OpenGL and offers nothing but warnings instead
     target_compile_definitions(${target} PRIVATE "GL_SILENCE_DEPRECATION")
diff --git a/support/coding/codegen b/support/coding/codegen
index 4c174e8c13..abe1b74019 160000
--- a/support/coding/codegen
+++ b/support/coding/codegen
@@ -1 +1 @@
-Subproject commit 4c174e8c13c758cde84cdcfda9dc6d62c8d09cff
+Subproject commit abe1b74019f332c1e5a62774776bf11d42cf8f85

From e5672e2652f3a0e058f553538301c2c6b9d1b9f4 Mon Sep 17 00:00:00 2001
From: Andreas Engberg <48772850+engbergandreas@users.noreply.github.com>
Date: Mon, 6 Nov 2023 11:06:35 +0100
Subject: [PATCH 158/701] Update HttpSynchronization to keep track of files
 downloaded (#2587) (#2930)

* Update HttpSynchronization to keep track of files downloaded (#2587)

Reads ossync file on synchronization and download files that are missing

* Apply suggestions from code review

Co-authored-by: Alexander Bock <alexander.bock@liu.se>

* Apply suggestions from code review

* Fixed merge conflict errors

* Fixed asset being rejected on successful sync

* Add enum for download fail/success, sleep between download retries.

Removed comments and todos

* Fixed PR comments

---------

Co-authored-by: Alexander Bock <alexander.bock@liu.se>
---
 .../openspace/util/resourcesynchronization.h  |   2 +-
 modules/sync/syncs/httpsynchronization.cpp    | 168 ++++++++++++++++--
 modules/sync/syncs/httpsynchronization.h      |  24 ++-
 src/util/resourcesynchronization.cpp          |   2 +-
 4 files changed, 182 insertions(+), 14 deletions(-)

diff --git a/include/openspace/util/resourcesynchronization.h b/include/openspace/util/resourcesynchronization.h
index 6dcd442f24..1849a4b7ba 100644
--- a/include/openspace/util/resourcesynchronization.h
+++ b/include/openspace/util/resourcesynchronization.h
@@ -181,7 +181,7 @@ protected:
 
     /// Creates a file next to the directory that indicates that this
     /// ResourceSynchronization has successfully synchronized its contents
-    void createSyncFile() const;
+    virtual void createSyncFile(bool isFullySynchronized = true) const;
 
     /// Returns whether the synchronization file create in #createSyncFile exists
     bool hasSyncFile() const;
diff --git a/modules/sync/syncs/httpsynchronization.cpp b/modules/sync/syncs/httpsynchronization.cpp
index 6404c86f18..75999567ed 100644
--- a/modules/sync/syncs/httpsynchronization.cpp
+++ b/modules/sync/syncs/httpsynchronization.cpp
@@ -29,6 +29,7 @@
 #include <openspace/util/httprequest.h>
 #include <ghoul/ext/assimp/contrib/zip/src/zip.h>
 #include <ghoul/logging/logmanager.h>
+#include <fstream>
 #include <unordered_map>
 
 namespace {
@@ -36,6 +37,9 @@ namespace {
 
     constexpr int ApplicationVersion = 1;
 
+    constexpr std::string_view OssyncVersionNumber = "1.0";
+    constexpr std::string_view SynchronizationToken = "Synchronized";
+
     struct [[codegen::Dictionary(HttpSynchronization)]] Parameters {
         // The unique identifier for this resource that is used to request a set of files
         // from the synchronization servers
@@ -97,11 +101,16 @@ void HttpSynchronization::start() {
     }
     _state = State::Syncing;
 
-    if (hasSyncFile()) {
+    bool isSynced = isEachFileDownloaded();
+    if (isSynced) {
         _state = State::Resolved;
         return;
     }
 
+    if (isRejected()) {
+        return;
+    }
+
     std::string query = fmt::format(
         "?identifier={}&file_version={}&application_version={}",
         _identifier, _version, ApplicationVersion
@@ -110,14 +119,32 @@ void HttpSynchronization::start() {
     _syncThread = std::thread(
         [this](const std::string& q) {
             for (const std::string& url : _syncRepositories) {
-                const bool success = trySyncFromUrl(url + q);
-                if (success) {
-                    createSyncFile();
-                    _state = State::Resolved;
-                    return;
+                const SynchronizationState syncState = trySyncFromUrl(url + q);
+
+                // Could not get this sync repository list of files. 
+                if (syncState == SynchronizationState::ListDownloadFail) {
+                    continue;
                 }
+
+                if (syncState == SynchronizationState::Success) {
+                    _state = State::Resolved;
+                    createSyncFile(true);
+                }
+                else if (syncState == SynchronizationState::FileDownloadFail) {
+                    // If it was not successful we should add any files that were 
+                    // potentially downloaded to avoid downloading from other repositories
+                    _existingSyncedFiles.insert(
+                        _existingSyncedFiles.end(),
+                        _newSyncedFiles.begin(),
+                        _newSyncedFiles.end()
+                    );
+                    _newSyncedFiles.clear();
+                    createSyncFile(false);
+                }
+                break;
             }
-            if (!_shouldCancel) {
+            
+            if (!isResolved() && !_shouldCancel) {
                 _state = State::Rejected;
             }
         },
@@ -134,7 +161,88 @@ std::string HttpSynchronization::generateUid() {
     return fmt::format("{}/{}", _identifier, _version);
 }
 
-bool HttpSynchronization::trySyncFromUrl(std::string listUrl) {
+void HttpSynchronization::createSyncFile(bool isFullySynchronized) const {
+    std::filesystem::path dir = directory();
+    std::filesystem::create_directories(dir);
+
+    dir.replace_extension("ossync");
+    std::ofstream syncFile(dir, std::ofstream::out);
+
+    syncFile << fmt::format(
+        "{}\n{}\n",
+        OssyncVersionNumber,
+        (isFullySynchronized ? SynchronizationToken : "Partial Synchronized")
+    );
+
+    if (isFullySynchronized) {
+        // All files successfully downloaded, no need to write anything else to file
+        return;
+    }
+
+    // Store all files that successfully downloaded
+    for (const std::string& fileURL : _existingSyncedFiles) {
+        syncFile << fileURL << '\n';
+    }
+}
+
+bool HttpSynchronization::isEachFileDownloaded() {
+    std::filesystem::path path = directory();
+    path.replace_extension("ossync");
+    // Check if file exists at all
+    if (!std::filesystem::is_regular_file(path)) {
+        return false;
+    }
+
+    // Read contents of file
+    std::ifstream file(path);
+    std::string line;
+
+    file >> line;
+    // Ossync files that does not have a version number are already resolved
+    // As they are of the previous format.
+    if (line == SynchronizationToken) {
+        return true;
+    }
+    // Otherwise first line is the version number.
+    std::string ossyncVersion = line;
+
+    /*
+    Format of 1.0 ossync:
+    Version number: E.g., 1.0
+    Synchronization status: Synchronized or Partial Synchronized
+    Optionally list of already synched files
+    */
+
+    if (ossyncVersion == OssyncVersionNumber) {
+        std::getline(file >> std::ws, line); // Read synchronization status
+        if (line == SynchronizationToken) {
+            return true;
+        }
+        // File is only partially synchronized,
+        // store file urls that have been synched already
+        while (file >> line) {
+            if (line.empty() || line[0] == '#') {
+                // Skip all empty lines and commented out lines
+                continue;
+            }
+            _existingSyncedFiles.push_back(line);
+        }
+    }
+    else {
+        LERROR(fmt::format(
+            "{}: Unknown ossync version number read."
+            "Got {} while {} and below are valid.",
+            _identifier,
+            ossyncVersion,
+            OssyncVersionNumber
+        ));
+        _state = State::Rejected;
+    }
+    return false;
+}
+
+HttpSynchronization::SynchronizationState
+HttpSynchronization::trySyncFromUrl(std::string listUrl) {
     HttpMemoryDownload fileListDownload(std::move(listUrl));
     fileListDownload.onProgress([&c = _shouldCancel](int64_t, std::optional<int64_t>) {
         return !c;
@@ -145,7 +253,7 @@ bool HttpSynchronization::trySyncFromUrl(std::string listUrl) {
     const std::vector<char>& buffer = fileListDownload.downloadedData();
     if (!success) {
         LERRORC("HttpSynchronization", std::string(buffer.begin(), buffer.end()));
-        return false;
+        return SynchronizationState::ListDownloadFail;
     }
 
     _nSynchronizedBytes = 0;
@@ -184,6 +292,18 @@ bool HttpSynchronization::trySyncFromUrl(std::string listUrl) {
             continue;
         }
 
+        // If the file is among the stored files in ossync we ignore that download
+        auto it = std::find(
+            _existingSyncedFiles.begin(),
+            _existingSyncedFiles.end(),
+            line
+        );
+
+        if (it != _existingSyncedFiles.end()) {
+            // File has already been synced
+            continue;
+        }
+
         auto download = std::make_unique<HttpFileDownload>(
             line,
             destination,
@@ -222,6 +342,28 @@ bool HttpSynchronization::trySyncFromUrl(std::string listUrl) {
     }
     startedAllDownloads = true;
 
+    constexpr int MaxDownloadRetries = 5;
+    int downloadTry = 0;
+    // If a download has failed try to restart it
+    while (downloadTry < MaxDownloadRetries) {
+        bool downloadSucceeded = true;
+
+        for (const std::unique_ptr<HttpFileDownload>& d : downloads) {
+            d->wait();
+            if (d->hasFailed()) {
+                d->start();
+                downloadSucceeded = false;
+            }
+        }
+        if (downloadSucceeded) {
+            break;
+        }
+        else {
+            ++downloadTry;
+            std::this_thread::sleep_for(std::chrono::seconds(1));
+        }
+    }
+
     bool failed = false;
     for (const std::unique_ptr<HttpFileDownload>& d : downloads) {
         d->wait();
@@ -278,10 +420,14 @@ bool HttpSynchronization::trySyncFromUrl(std::string listUrl) {
     }
     if (failed) {
         for (const std::unique_ptr<HttpFileDownload>& d : downloads) {
-            d->cancel();
+            // Store all files that were synced to the ossync 
+            if (d->hasSucceeded()) {
+                _newSyncedFiles.push_back(d->url());
+            }
         }
+        return SynchronizationState::FileDownloadFail;
     }
-    return !failed;
+    return SynchronizationState::Success;
 }
 
 } // namespace openspace
diff --git a/modules/sync/syncs/httpsynchronization.h b/modules/sync/syncs/httpsynchronization.h
index fa7d768221..ed7c6c0317 100644
--- a/modules/sync/syncs/httpsynchronization.h
+++ b/modules/sync/syncs/httpsynchronization.h
@@ -92,9 +92,25 @@ public:
 
     static documentation::Documentation Documentation();
 
+protected:
+    /// Creates a file next to the directory that indicates that this
+    /// ResourceSynchronization has successfully synchronized its contents
+    void createSyncFile(bool isFullySynchronized = true) const override;
+
+    /// Check ossync file and returns true if all files are downloaded or false
+    /// if partially synched or if there is an ossync file error (rejected)
+    bool isEachFileDownloaded();
+
+    /// Representation of 'global' synchronization state that encodes where a fail happen.
+    enum class SynchronizationState {
+        Success,
+        ListDownloadFail,
+        FileDownloadFail
+    };
+
 private:
     /// Tries to get a reply from the provided URL and returns that success to the caller
-    bool trySyncFromUrl(std::string url);
+    SynchronizationState trySyncFromUrl(std::string url);
 
     /// Contains a flag whether the current transfer should be cancelled
     std::atomic_bool _shouldCancel = false;
@@ -110,6 +126,12 @@ private:
 
     // The thread that will be doing the synchronization
     std::thread _syncThread;
+
+    // The files that have already been synchronized
+    std::vector<std::string> _existingSyncedFiles;
+
+    // The files that have been synchronized this time
+    std::vector<std::string> _newSyncedFiles;
 };
 
 } // namespace openspace
diff --git a/src/util/resourcesynchronization.cpp b/src/util/resourcesynchronization.cpp
index 1a7165bb7f..411719457b 100644
--- a/src/util/resourcesynchronization.cpp
+++ b/src/util/resourcesynchronization.cpp
@@ -105,7 +105,7 @@ const std::string& ResourceSynchronization::name() const {
     return _name;
 }
 
-void ResourceSynchronization::createSyncFile() const {
+void ResourceSynchronization::createSyncFile(bool isFullySynchronized) const {
     std::filesystem::path dir = directory();
     std::filesystem::create_directories(dir);
 

From d0efe88aa2d1564da2e0c2f3c40e38bd17e6090e Mon Sep 17 00:00:00 2001
From: Alexander Bock <alexander.bock@liu.se>
Date: Mon, 6 Nov 2023 16:25:41 +0100
Subject: [PATCH 159/701] Fix capitalization of lagrange points GuiPath (closes
 #2934)

---
 .../solarsystem/planets/earth/lagrange_points/l5.asset      | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/data/assets/scene/solarsystem/planets/earth/lagrange_points/l5.asset b/data/assets/scene/solarsystem/planets/earth/lagrange_points/l5.asset
index b0368bd06c..952e5efe30 100644
--- a/data/assets/scene/solarsystem/planets/earth/lagrange_points/l5.asset
+++ b/data/assets/scene/solarsystem/planets/earth/lagrange_points/l5.asset
@@ -33,7 +33,7 @@ local L5Position = {
   Tag = { "lagrange_points_earth", "lagrange_points_earth_l5" },
   GUI = {
     Name = "L5 Position",
-    Path = "/Solar System/Planets/Earth/Lagrange points",
+    Path = "/Solar System/Planets/Earth/Lagrange Points",
     Hidden = true
   }
 }
@@ -51,7 +51,7 @@ local L5 = {
   Tag = { "lagrange_points_earth", "lagrange_points_earth_l5" },
   GUI = {
     Name = "L5",
-    Path = "/Solar System/Planets/Earth/Lagrange points"
+    Path = "/Solar System/Planets/Earth/Lagrange Points"
   }
 }
 
@@ -71,7 +71,7 @@ local L5Label = {
   Tag = { "lagrange_points_earth", "lagrange_points_earth_l5" },
   GUI = {
     Name = "L5 Label",
-    Path = "/Solar System/Planets/Earth/Lagrange points",
+    Path = "/Solar System/Planets/Earth/Lagrange Points",
     Description = "Main label for L5"
   }
 }

From d38f2583caaab7b8f93db48745c886685ab07ceb Mon Sep 17 00:00:00 2001
From: Andreas Engberg <adde.engberg@gmail.com>
Date: Tue, 7 Nov 2023 09:19:22 +0100
Subject: [PATCH 160/701] Fixed: Stopping all http downloads if user exits
 program

---
 modules/sync/syncs/httpsynchronization.cpp | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/modules/sync/syncs/httpsynchronization.cpp b/modules/sync/syncs/httpsynchronization.cpp
index 75999567ed..199e78c7f9 100644
--- a/modules/sync/syncs/httpsynchronization.cpp
+++ b/modules/sync/syncs/httpsynchronization.cpp
@@ -350,12 +350,18 @@ HttpSynchronization::trySyncFromUrl(std::string listUrl) {
 
         for (const std::unique_ptr<HttpFileDownload>& d : downloads) {
             d->wait();
+
+            // If the user exits the program we don't want to start new downloads
+            if (_shouldCancel) {
+                break;
+            }
+
             if (d->hasFailed()) {
                 d->start();
                 downloadSucceeded = false;
             }
         }
-        if (downloadSucceeded) {
+        if (downloadSucceeded || _shouldCancel) {
             break;
         }
         else {

From eeb536c9e1c1bddbfe130b1f4ec0eaa10fadb8af Mon Sep 17 00:00:00 2001
From: Alexander Bock <alexander.bock@liu.se>
Date: Tue, 7 Nov 2023 16:19:59 +0100
Subject: [PATCH 161/701] Add the ability to set individual commandline options
 at the expense of a generic Lua script

Note breaking change: Previously `--config` specified one or more Lua scripts that were executed to update the configuration state, now the `--config` sets the path to the window configuration instead
---
 .../ext/launcher/include/launcherwindow.h     |   2 +-
 apps/OpenSpace/main.cpp                       | 109 ++-
 ext/ghoul                                     |   2 +-
 include/openspace/engine/configuration.h      |   2 +-
 include/openspace/engine/openspaceengine.h    |   7 +-
 src/engine/configuration.cpp                  |   9 +-
 tests/CMakeLists.txt                          |   1 -
 tests/main.cpp                                |   3 +-
 tests/test_configuration.cpp                  | 650 ------------------
 9 files changed, 81 insertions(+), 704 deletions(-)
 delete mode 100644 tests/test_configuration.cpp

diff --git a/apps/OpenSpace/ext/launcher/include/launcherwindow.h b/apps/OpenSpace/ext/launcher/include/launcherwindow.h
index f925167355..840aabb6e4 100644
--- a/apps/OpenSpace/ext/launcher/include/launcherwindow.h
+++ b/apps/OpenSpace/ext/launcher/include/launcherwindow.h
@@ -55,7 +55,7 @@ public:
      */
     LauncherWindow(bool profileEnabled,
         const openspace::configuration::Configuration& globalConfig,
-        bool sgctConfigEnabled,  std::string sgctConfigName, QWidget* parent);
+        bool sgctConfigEnabled, std::string sgctConfigName, QWidget* parent);
 
     /**
       * Returns bool for whether "start OpenSpace" was chosen when this window closed.
diff --git a/apps/OpenSpace/main.cpp b/apps/OpenSpace/main.cpp
index 5906e528fc..f618d43216 100644
--- a/apps/OpenSpace/main.cpp
+++ b/apps/OpenSpace/main.cpp
@@ -1047,16 +1047,14 @@ void checkCommandLineForSettings(int& argc, char** argv, bool& hasSGCT, bool& ha
 }
 
 std::string setWindowConfigPresetForGui(const std::string labelFromCfgFile,
-                                        bool haveCliSGCTConfig,
-                                        const std::string& sgctFunctionName)
+                                        bool haveCliSGCTConfig)
 {
     configuration::Configuration& config = *global::configuration;
 
     std::string preset;
     bool sgctConfigFileSpecifiedByLuaFunction = !config.sgctConfigNameInitialized.empty();
     if (haveCliSGCTConfig) {
-        preset = sgctFunctionName.empty() ? config.windowConfiguration : sgctFunctionName;
-        preset += " (from CLI)";
+        preset = fmt::format("{} (from CLI)", config.windowConfiguration);
     }
     else if (sgctConfigFileSpecifiedByLuaFunction) {
         preset = config.sgctConfigNameInitialized + labelFromCfgFile;
@@ -1162,23 +1160,35 @@ int main(int argc, char* argv[]) {
 
     CommandlineArguments commandlineArguments;
     parser.addCommand(std::make_unique<ghoul::cmdparser::SingleCommand<std::string>>(
-        commandlineArguments.configurationName, "--file", "-f",
+        commandlineArguments.configuration, "--file", "-f",
         "Provides the path to the OpenSpace configuration file. Only the '${TEMPORARY}' "
         "path token is available and any other path has to be specified relative to the "
         "current working directory"
     ));
-
-    parser.addCommand(std::make_unique<ghoul::cmdparser::MultipleCommand<std::string>>(
-        commandlineArguments.configurationOverride, "--config", "-c",
-        "Provides the ability to pass arbitrary Lua code to the application that will be "
-        "evaluated after the configuration file has been loaded but before the other "
-        "commandline arguments are triggered. This can be used to manipulate the "
-        "configuration file without editing the file on disk, for example in a "
-        "planetarium environment. Please not that the Lua script must not contain any - "
-        "or they will be interpreted as a new command. Similar, in Bash, ${...} will be "
-        "evaluated before it is passed to OpenSpace. Windows does not approve of using \""
-        "either, so it is recommended to deliniate strings with [[ ]] instead. For "
-        "example:  OpenSpace --config Profile=[[jwst]]"
+    parser.addCommand(std::make_unique<ghoul::cmdparser::SingleCommand<std::string>>(
+        commandlineArguments.windowConfig, "--config", "-c",
+        "Specifies the window configuration file that should be used to start OpenSpace "
+        "and that will override whatever is specified in the `openspace.cfg` or the "
+        "settings. This value can include path tokens, so for example "
+        "`${CONFIG}/single.json` is a valid value."
+    ));
+    parser.addCommand(std::make_unique<ghoul::cmdparser::SingleCommand<std::string>>(
+        commandlineArguments.profile, "--profile", "-p",
+        "Specifies the profile that should be used to start OpenSpace and that overrides "
+        "the profile specified in the `openspace.cfg` and the settings."
+    ));
+    parser.addCommand(std::make_unique<ghoul::cmdparser::SingleCommand<std::string>>(
+        commandlineArguments.propertyVisibility, "--propertyVisibility", "",
+        "Specifies UI visibility settings for properties that this OpenSpace is using. "
+        "This value overrides the values specified in the `openspace.cfg` and the "
+        "settings and also the environment variable, if that value is provided. Allowed "
+        "values for this parameter are: `Developer`, `AdvancedUser`, `User`, and "
+        "`NoviceUser`."
+    ));
+    parser.addCommand(std::make_unique<ghoul::cmdparser::SingleCommandZeroArguments>(
+        commandlineArguments.bypassLauncher, "--bypassLauncher", "-b",
+        "Specifies whether the Launcher should be shown at startup or not. This value "
+        "overrides the value specified in the `openspace.cfg` and the settings."
     ));
 
     // setCommandLine returns a reference to the vector that will be filled later
@@ -1210,8 +1220,8 @@ int main(int argc, char* argv[]) {
     try {
         // Find configuration
         std::filesystem::path configurationFilePath;
-        if (!commandlineArguments.configurationName.empty()) {
-            configurationFilePath = absPath(commandlineArguments.configurationName);
+        if (commandlineArguments.configuration.has_value()) {
+            configurationFilePath = absPath(*commandlineArguments.configuration);
         }
         else {
             LDEBUG("Finding configuration");
@@ -1249,16 +1259,47 @@ int main(int argc, char* argv[]) {
 
         // Loading configuration from disk
         LDEBUG("Loading configuration from disk");
-        std::string override;
-        for (const std::string& arg : commandlineArguments.configurationOverride) {
-            override += arg + ";";
-        }
         *global::configuration = configuration::loadConfigurationFromFile(
             configurationFilePath.string(),
-            size,
-            override
+            size
         );
 
+        // Override configuration with commandline arguments
+        if (commandlineArguments.windowConfig.has_value()) {
+            global::configuration->windowConfiguration =
+                *commandlineArguments.windowConfig;
+        }
+        if (commandlineArguments.profile.has_value()) {
+            global::configuration->profile = *commandlineArguments.profile;
+        }
+        if (commandlineArguments.propertyVisibility.has_value()) {
+            if (commandlineArguments.propertyVisibility == "NoviceUser") {
+                global::configuration->propertyVisibility =
+                    properties::Property::Visibility::NoviceUser;
+            }
+            else if (commandlineArguments.propertyVisibility == "User") {
+                global::configuration->propertyVisibility =
+                    properties::Property::Visibility::User;
+            }
+            else if (commandlineArguments.propertyVisibility == "AdvancedUser") {
+                global::configuration->propertyVisibility =
+                    properties::Property::Visibility::AdvancedUser;
+            }
+            else if (commandlineArguments.propertyVisibility == "Developer") {
+                global::configuration->propertyVisibility =
+                    properties::Property::Visibility::Developer;
+            }
+            else {
+                throw ghoul::RuntimeError(fmt::format(
+                    "Unknown property visibility value '{}'",
+                    *commandlineArguments.propertyVisibility
+                ));
+            }
+        }
+        if (commandlineArguments.bypassLauncher.has_value()) {
+            global::configuration->bypassLauncher = *commandlineArguments.bypassLauncher;
+        }
+
         // Determining SGCT configuration file
         LDEBUG("SGCT Configuration file: " + global::configuration->windowConfiguration);
 
@@ -1282,17 +1323,11 @@ int main(int argc, char* argv[]) {
 
     global::openSpaceEngine->registerPathTokens();
 
-    bool hasSGCTConfig = false;
-    bool hasProfile = false;
-    std::string sgctFunctionName;
-    checkCommandLineForSettings(argc, argv, hasSGCTConfig, hasProfile, sgctFunctionName);
-
     // Call profile GUI
     const std::string labelFromCfgFile = " (from .cfg)";
     std::string windowCfgPreset = setWindowConfigPresetForGui(
         labelFromCfgFile,
-        hasSGCTConfig,
-        sgctFunctionName
+        commandlineArguments.windowConfig.has_value()
     );
 
     //TODO consider LFATAL if ${USER} doens't exist rather then recurisve create.
@@ -1308,9 +1343,7 @@ int main(int argc, char* argv[]) {
     QApplication app(qac, nullptr);
 #endif // __APPLE__
 
-    bool skipLauncher =
-        (hasProfile && hasSGCTConfig) || global::configuration->bypassLauncher;
-    if (!skipLauncher) {
+    if (!global::configuration->bypassLauncher) {
 #ifndef __APPLE__
         int qac = 0;
         QApplication app(qac, nullptr);
@@ -1330,9 +1363,9 @@ int main(int argc, char* argv[]) {
         }
 
         LauncherWindow win(
-            !hasProfile,
+            !commandlineArguments.profile.has_value(),
             *global::configuration,
-            !hasSGCTConfig,
+            !commandlineArguments.windowConfig.has_value(),
             windowCfgPreset,
             nullptr
         );
@@ -1347,7 +1380,7 @@ int main(int argc, char* argv[]) {
         global::configuration->profile = win.selectedProfile();
         windowConfiguration = selectedSgctProfileFromLauncher(
             win,
-            hasSGCTConfig,
+            commandlineArguments.windowConfig.has_value(),
             windowConfiguration,
             labelFromCfgFile
         );
diff --git a/ext/ghoul b/ext/ghoul
index 84675b277a..412e90e49a 160000
--- a/ext/ghoul
+++ b/ext/ghoul
@@ -1 +1 @@
-Subproject commit 84675b277a1a6e2880661fe1c830a392a24a3636
+Subproject commit 412e90e49aaf12a8ae974acd93755514af61fd48
diff --git a/include/openspace/engine/configuration.h b/include/openspace/engine/configuration.h
index 3445f8a5b9..16e301e43c 100644
--- a/include/openspace/engine/configuration.h
+++ b/include/openspace/engine/configuration.h
@@ -148,7 +148,7 @@ struct Configuration {
 std::filesystem::path findConfiguration(const std::string& filename = "openspace.cfg");
 
 Configuration loadConfigurationFromFile(const std::filesystem::path& filename,
-    const glm::ivec2& primaryMonitorResolution, std::string_view overrideScript);
+    const glm::ivec2& primaryMonitorResolution);
 
 } // namespace openspace::configuration
 
diff --git a/include/openspace/engine/openspaceengine.h b/include/openspace/engine/openspaceengine.h
index b21c04cba3..73a97a54e8 100644
--- a/include/openspace/engine/openspaceengine.h
+++ b/include/openspace/engine/openspaceengine.h
@@ -64,8 +64,11 @@ struct ShutdownInformation {
 };
 
 struct CommandlineArguments {
-    std::string configurationName;
-    std::vector<std::string> configurationOverride;
+    std::optional<std::string> configuration;
+    std::optional<std::string> windowConfig;
+    std::optional<std::string> profile;
+    std::optional<std::string> propertyVisibility;
+    std::optional<bool> bypassLauncher;
 };
 
 class OpenSpaceEngine : public properties::PropertyOwner {
diff --git a/src/engine/configuration.cpp b/src/engine/configuration.cpp
index 8646d7849b..8ddb7a6711 100644
--- a/src/engine/configuration.cpp
+++ b/src/engine/configuration.cpp
@@ -484,8 +484,7 @@ std::filesystem::path findConfiguration(const std::string& filename) {
 }
 
 Configuration loadConfigurationFromFile(const std::filesystem::path& filename,
-                                        const glm::ivec2& primaryMonitorResolution,
-                                        std::string_view overrideScript)
+                                        const glm::ivec2& primaryMonitorResolution)
 {
     ghoul_assert(std::filesystem::is_regular_file(filename), "File must exist");
 
@@ -506,12 +505,6 @@ Configuration loadConfigurationFromFile(const std::filesystem::path& filename,
     // Load the configuration file into the state
     ghoul::lua::runScriptFile(result.state, filename.string());
 
-    if (!overrideScript.empty()) {
-        LDEBUGC("Configuration", "Executing Lua script passed through the commandline:");
-        LDEBUGC("Configuration", overrideScript);
-        ghoul::lua::runScript(result.state, overrideScript);
-    }
-
     parseLuaState(result);
 
     return result;
diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
index 7aa711c631..ed0d17c326 100644
--- a/tests/CMakeLists.txt
+++ b/tests/CMakeLists.txt
@@ -28,7 +28,6 @@ add_executable(
   test_assetloader.cpp
   test_concurrentqueue.cpp
   test_distanceconversion.cpp
-  test_configuration.cpp
   test_documentation.cpp
   test_horizons.cpp
   test_iswamanager.cpp
diff --git a/tests/main.cpp b/tests/main.cpp
index 0da1022ff9..a6afbb6ad7 100644
--- a/tests/main.cpp
+++ b/tests/main.cpp
@@ -65,8 +65,7 @@ int main(int argc, char** argv) {
 
     *global::configuration = configuration::loadConfigurationFromFile(
         configFile.string(),
-        glm::ivec2(0),
-        ""
+        glm::ivec2(0)
     );
     global::openSpaceEngine->registerPathTokens();
     global::openSpaceEngine->initialize();
diff --git a/tests/test_configuration.cpp b/tests/test_configuration.cpp
deleted file mode 100644
index 01cd0b8839..0000000000
--- a/tests/test_configuration.cpp
+++ /dev/null
@@ -1,650 +0,0 @@
-/*****************************************************************************************
- *                                                                                       *
- * OpenSpace                                                                             *
- *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
- *                                                                                       *
- * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
- * software and associated documentation files (the "Software"), to deal in the Software *
- * without restriction, including without limitation the rights to use, copy, modify,    *
- * merge, publish, distribute, sublicense, and/or sell copies of the Software, and to    *
- * permit persons to whom the Software is furnished to do so, subject to the following   *
- * conditions:                                                                           *
- *                                                                                       *
- * The above copyright notice and this permission notice shall be included in all copies *
- * or substantial portions of the Software.                                              *
- *                                                                                       *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED,   *
- * INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A         *
- * PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT    *
- * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF  *
- * CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE  *
- * OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                                         *
- ****************************************************************************************/
-
-#include <catch2/catch_test_macros.hpp>
-
-#include <openspace/engine/configuration.h>
-#include <ghoul/fmt.h>
-#include <filesystem>
-#include <fstream>
-
-using namespace openspace::configuration;
-
-namespace {
-    // The absolute minimal configuration that is still expected to be loaded
-    std::string MinimalConfig = R"(
-Paths = {}
-FontSize = {
-  FrameInfo = 1.0,
-  Shutdown = 2.0,
-  Log = 3.0,
-  CameraInfo = 4.0,
-  VersionInfo = 5.0
-}
-)";
-
-    void writeConfig(const std::string& filename, std::string_view content) {
-        std::ofstream f(filename);
-        f << MinimalConfig << '\n' << MinimalConfig << content;
-    }
-
-    Configuration loadConfiguration(const std::string& tag, std::string_view content) {
-        std::string filename = fmt::format("test_configuration_{}.cfg", tag);
-        std::filesystem::path path = std::filesystem::temp_directory_path();
-        std::string file = (path / filename).string();
-        writeConfig(file, content);
-        try {
-            Configuration conf = loadConfigurationFromFile(file, glm::ivec2(0), content);
-            std::filesystem::remove(file);
-            return conf;
-        }
-        catch (...) {
-            std::filesystem::remove(file);
-            throw;
-        }
-    }
-} // namespace
-
-TEST_CASE("Configuration: minimal", "[configuration]") {
-    loadConfiguration("minimal", "");
-}
-
-TEST_CASE("Configuration: windowConfiguration", "[configuration]") {
-    constexpr std::string_view Extra = R"(SGCTConfig = "foobar")";
-    const Configuration c = loadConfiguration("windowConfiguration", Extra);
-    CHECK(c.windowConfiguration == "foobar");
-}
-
-TEST_CASE("Configuration: asset", "[configuration]") {
-    constexpr std::string_view Extra = R"(Asset = "foobar")";
-    const Configuration c = loadConfiguration("asset", Extra);
-    CHECK(c.asset == "foobar");
-}
-
-TEST_CASE("Configuration: profile", "[configuration]") {
-    constexpr std::string_view Extra = R"(Profile = "foobar")";
-    const Configuration c = loadConfiguration("profile", Extra);
-    CHECK(c.profile == "foobar");
-}
-
-TEST_CASE("Configuration: globalCustomizationScripts", "[configuration]") {
-    constexpr std::string_view Extra = R"(GlobalCustomizationScripts = { "foo", "bar" })";
-    const Configuration c = loadConfiguration("globalCustomization", Extra);
-    CHECK(c.globalCustomizationScripts.size() == 2);
-    CHECK(c.globalCustomizationScripts == std::vector<std::string>{ "foo", "bar" });
-}
-
-TEST_CASE("Configuration: paths", "[configuration]") {
-    constexpr std::string_view Extra = R"(Paths = { foo = "1", bar = "2" })";
-    const Configuration c = loadConfiguration("paths", Extra);
-    CHECK(c.pathTokens.size() == 2);
-    CHECK(
-        c.pathTokens ==
-        std::map<std::string, std::string>{ { "foo", "1" }, { "bar", "2" } }
-    );
-}
-
-TEST_CASE("Configuration: fonts", "[configuration]") {
-    constexpr std::string_view Extra = R"(Fonts = { foo = "1", bar = "2" })";
-    const Configuration c = loadConfiguration("fonts", Extra);
-    CHECK(c.fonts.size() == 2);
-    CHECK(
-        c.fonts ==
-        std::map<std::string, std::string>{ { "foo", "1" }, { "bar", "2" } }
-    );
-}
-
-TEST_CASE("Configuration: logging", "[configuration]") {
-    Configuration defaultConf;
-    {
-        // Empty
-        constexpr std::string_view Extra = R"(Logging = {})";
-        const Configuration c = loadConfiguration("logging1", Extra);
-
-        CHECK(c.logging.level == defaultConf.logging.level);
-        CHECK(c.logging.forceImmediateFlush == defaultConf.logging.forceImmediateFlush);
-        CHECK(
-            c.logging.capabilitiesVerbosity ==
-            defaultConf.logging.capabilitiesVerbosity
-        );
-        CHECK(c.logging.logs == defaultConf.logging.logs);
-    }
-    {
-        // level
-        constexpr std::string_view Extra = R"(Logging = { LogLevel = "Fatal" })";
-        const Configuration c = loadConfiguration("logging2", Extra);
-
-        CHECK(c.logging.level == "Fatal");
-        CHECK(c.logging.forceImmediateFlush == defaultConf.logging.forceImmediateFlush);
-        CHECK(
-            c.logging.capabilitiesVerbosity ==
-            defaultConf.logging.capabilitiesVerbosity
-        );
-        CHECK(c.logging.logs == defaultConf.logging.logs);
-    }
-    {
-        // forceimmediate
-        constexpr std::string_view Extra = R"(Logging = { ImmediateFlush = false })";
-        const Configuration c = loadConfiguration("logging3", Extra);
-
-        CHECK(c.logging.level == defaultConf.logging.level);
-        CHECK(c.logging.forceImmediateFlush == false);
-        CHECK(
-            c.logging.capabilitiesVerbosity ==
-            defaultConf.logging.capabilitiesVerbosity
-        );
-        CHECK(c.logging.logs == defaultConf.logging.logs);
-    }
-    {
-        // logs
-        constexpr std::string_view Extra = R"(
-Logging = {
-    Logs = {
-        { Type = "html", File = "foobar", Append = false }
-    }
-}
-)";
-        const Configuration c = loadConfiguration("logging4", Extra);
-
-        CHECK(c.logging.level == defaultConf.logging.level);
-        CHECK(c.logging.forceImmediateFlush == defaultConf.logging.forceImmediateFlush);
-        CHECK(
-            c.logging.capabilitiesVerbosity ==
-            defaultConf.logging.capabilitiesVerbosity
-        );
-        REQUIRE(c.logging.logs.size() == 1);
-        const ghoul::Dictionary& d = c.logging.logs[0];
-        REQUIRE(d.hasValue<std::string>("Type"));
-        CHECK(d.value<std::string>("Type") == "html");
-        REQUIRE(d.hasValue<std::string>("File"));
-        CHECK(d.value<std::string>("File") == "foobar");
-        REQUIRE(d.hasValue<bool>("Append"));
-        CHECK(d.value<bool>("Append") == false);
-    }
-    {
-        // capabilities verbosity
-        constexpr std::string_view Extra = R"(Logging = { CapabilitiesVerbosity = "Full" })";
-        const Configuration c = loadConfiguration("logging5", Extra);
-
-        CHECK(c.logging.level == defaultConf.logging.level);
-        CHECK(c.logging.forceImmediateFlush == defaultConf.logging.forceImmediateFlush);
-        CHECK(c.logging.capabilitiesVerbosity == "Full");
-        CHECK(c.logging.logs == defaultConf.logging.logs);
-    }
-}
-
-TEST_CASE("Configuration: scriptlog", "[configuration]") {
-    constexpr std::string_view Extra = R"(ScriptLog = "foobar")";
-    const Configuration c = loadConfiguration("scriptlog", Extra);
-    CHECK(c.scriptLog == "foobar");
-}
-
-TEST_CASE("Configuration: documentationpath", "[configuration]") {
-    constexpr std::string_view Extra = R"(Documentation = { Path = "foobar" })";
-    const Configuration c = loadConfiguration("documentationpath", Extra);
-    CHECK(c.documentation.path == "foobar");
-}
-
-TEST_CASE("Configuration: versioncheckurl", "[configuration]") {
-    constexpr std::string_view Extra = R"(VersionCheckUrl = "foobar")";
-    const Configuration c = loadConfiguration("versioncheckurl", Extra);
-    CHECK(c.versionCheckUrl == "foobar");
-}
-
-TEST_CASE("Configuration: useMultithreadedInit", "[configuration]") {
-    constexpr std::string_view Extra = R"(UseMultithreadedInitialization = true)";
-    const Configuration c = loadConfiguration("useMultithreadedInit", Extra);
-    CHECK(c.useMultithreadedInitialization == true);
-}
-
-TEST_CASE("Configuration: loadingscreen", "[configuration]") {
-    Configuration defaultConf;
-
-    {
-        // empty
-        constexpr std::string_view Extra = R"(LoadingScreen = {})";
-        const Configuration c = loadConfiguration("loadingscreen1", Extra);
-        CHECK(
-            c.loadingScreen.isShowingMessages ==
-            defaultConf.loadingScreen.isShowingMessages
-        );
-        CHECK(
-            c.loadingScreen.isShowingProgressbar ==
-            defaultConf.loadingScreen.isShowingProgressbar
-        );
-        CHECK(
-            c.loadingScreen.isShowingNodeNames ==
-            defaultConf.loadingScreen.isShowingNodeNames
-        );
-    }
-    {
-        // isShowingMessages
-        constexpr std::string_view Extra = R"(LoadingScreen = { ShowMessage = true })";
-        const Configuration c = loadConfiguration("loadingscreen2", Extra);
-        CHECK(c.loadingScreen.isShowingMessages == true);
-        CHECK(
-            c.loadingScreen.isShowingProgressbar ==
-            defaultConf.loadingScreen.isShowingProgressbar
-        );
-        CHECK(
-            c.loadingScreen.isShowingNodeNames ==
-            defaultConf.loadingScreen.isShowingNodeNames
-        );
-    }
-    {
-        // isShowingProgressbar
-        constexpr std::string_view Extra = R"(LoadingScreen = { ShowProgressbar = true })";
-        const Configuration c = loadConfiguration("loadingscreen3", Extra);
-        CHECK(
-            c.loadingScreen.isShowingMessages ==
-            defaultConf.loadingScreen.isShowingMessages
-        );
-        CHECK(c.loadingScreen.isShowingProgressbar == true);
-        CHECK(
-            c.loadingScreen.isShowingNodeNames ==
-            defaultConf.loadingScreen.isShowingNodeNames
-        );
-    }
-    {
-        // isShowingNodeNames
-        constexpr std::string_view Extra = R"(LoadingScreen = { ShowNodeNames = true })";
-        const Configuration c = loadConfiguration("loadingscreen4", Extra);
-        CHECK(
-            c.loadingScreen.isShowingMessages ==
-            defaultConf.loadingScreen.isShowingMessages
-        );
-        CHECK(
-            c.loadingScreen.isShowingProgressbar ==
-            defaultConf.loadingScreen.isShowingProgressbar
-        );
-        CHECK(c.loadingScreen.isShowingNodeNames == true);
-    }
-}
-
-TEST_CASE("Configuration: isCheckingOpenGLState", "[configuration]") {
-    constexpr std::string_view Extra = R"(CheckOpenGLState = true)";
-    const Configuration c = loadConfiguration("isCheckingOpenGLState", Extra);
-    CHECK(c.isCheckingOpenGLState == true);
-}
-
-TEST_CASE("Configuration: isLoggingOpenGLCalls", "[configuration]") {
-    constexpr std::string_view Extra = R"(LogEachOpenGLCall = true)";
-    const Configuration c = loadConfiguration("isLoggingOpenGLCalls", Extra);
-    CHECK(c.isLoggingOpenGLCalls == true);
-}
-
-TEST_CASE("Configuration: shutdownCountdown", "[configuration]") {
-    constexpr std::string_view Extra = R"(ShutdownCountdown = 0.5)";
-    const Configuration c = loadConfiguration("shutdownCountdown", Extra);
-    CHECK(c.shutdownCountdown == 0.5f);
-}
-
-TEST_CASE("Configuration: shouldUseScreenshotDate", "[configuration]") {
-    constexpr std::string_view Extra = R"(ScreenshotUseDate = true)";
-    const Configuration c = loadConfiguration("shouldUseScreenshotDate", Extra);
-    CHECK(c.shouldUseScreenshotDate == true);
-}
-
-TEST_CASE("Configuration: onScreenTextScaling", "[configuration]") {
-    constexpr std::string_view Extra = R"(OnScreenTextScaling = "framebuffer")";
-    const Configuration c = loadConfiguration("onScreenTextScaling", Extra);
-    CHECK(c.onScreenTextScaling == "framebuffer");
-}
-
-TEST_CASE("Configuration: usePerProfileCache", "[configuration]") {
-    constexpr std::string_view Extra = R"(PerProfileCache = true)";
-    const Configuration c = loadConfiguration("usePerProfileCache", Extra);
-    CHECK(c.usePerProfileCache == true);
-}
-
-TEST_CASE("Configuration: isRenderingOnMasterDisabled", "[configuration]") {
-    constexpr std::string_view Extra = R"(DisableRenderingOnMaster = true)";
-    const Configuration c = loadConfiguration("isRenderingOnMasterDisabled", Extra);
-    CHECK(c.isRenderingOnMasterDisabled == true);
-}
-
-TEST_CASE("Configuration: globalRotation", "[configuration]") {
-    constexpr std::string_view Extra = R"(GlobalRotation = { 1.0, 2.0, 3.0 })";
-    const Configuration c = loadConfiguration("globalRotation", Extra);
-    CHECK(c.globalRotation == glm::vec3(1.0, 2.0, 3.0));
-}
-
-TEST_CASE("Configuration: screenSpaceRotation", "[configuration]") {
-    constexpr std::string_view Extra = R"(ScreenSpaceRotation = { 1.0, 2.0, 3.0 })";
-    const Configuration c = loadConfiguration("screenSpaceRotation", Extra);
-    CHECK(c.screenSpaceRotation == glm::vec3(1.0, 2.0, 3.0));
-}
-
-TEST_CASE("Configuration: masterRotation", "[configuration]") {
-    constexpr std::string_view Extra = R"(MasterRotation = { 1.0, 2.0, 3.0 })";
-    const Configuration c = loadConfiguration("masterRotation", Extra);
-    CHECK(c.masterRotation == glm::vec3(1.0, 2.0, 3.0));
-}
-
-TEST_CASE("Configuration: isConsoleDisabled", "[configuration]") {
-    constexpr std::string_view Extra = R"(DisableInGameConsole = true)";
-    const Configuration c = loadConfiguration("isConsoleDisabled", Extra);
-    CHECK(c.isConsoleDisabled == true);
-}
-
-TEST_CASE("Configuration: bypassLauncher", "[configuration]") {
-    constexpr std::string_view Extra = R"(BypassLauncher = true)";
-    const Configuration c = loadConfiguration("bypassLauncher", Extra);
-    CHECK(c.bypassLauncher == true);
-}
-
-TEST_CASE("Configuration: moduleConfigurations", "[configuration]") {
-    {
-        // empty
-        constexpr std::string_view Extra = R"(ModuleConfigurations = {})";
-        const Configuration c = loadConfiguration("moduleConfigurations", Extra);
-        CHECK(c.moduleConfigurations.empty());
-    }
-    {
-        // values
-        constexpr std::string_view Extra = R"(
-ModuleConfigurations = {
-    Foo = {
-        Foo2 = 1.0,
-        Foo3 = "abc"
-    },
-    Bar = {
-        Bar2 = true,
-        Bar3 = { 1.0, 2.0, 3.0 }
-    }
-}
-)";
-        const Configuration c = loadConfiguration("moduleConfigurations", Extra);
-        REQUIRE(c.moduleConfigurations.size() == 2);
-        ghoul::Dictionary foo = c.moduleConfigurations.at("Foo");
-        REQUIRE(foo.size() == 2);
-        REQUIRE(foo.hasValue<double>("Foo2"));
-        CHECK(foo.value<double>("Foo2") == 1.0);
-        REQUIRE(foo.hasValue<std::string>("Foo3"));
-        CHECK(foo.value<std::string>("Foo3") == std::string("abc"));
-
-        ghoul::Dictionary bar = c.moduleConfigurations.at("Bar");
-        REQUIRE(bar.size() == 2);
-        REQUIRE(bar.hasValue<bool>("Bar2"));
-        CHECK(bar.value<bool>("Bar2") == true);
-        REQUIRE(bar.hasValue<glm::dvec3>("Bar3"));
-        CHECK(bar.value<glm::dvec3>("Bar3") == glm::dvec3(1.0, 2.0, 3.0));
-    }
-}
-
-TEST_CASE("Configuration: openGLDebugContext", "[configuration]") {
-    Configuration defaultConf;
-    {
-        // empty-ish / activate
-        constexpr std::string_view Extra = R"(OpenGLDebugContext = { Activate = true })";
-        const Configuration c = loadConfiguration("openGLDebugContext1", Extra);
-        CHECK(c.openGLDebugContext.isActive == true);
-        CHECK(c.openGLDebugContext.printStacktrace == false);
-        CHECK(
-            c.openGLDebugContext.isSynchronous ==
-            defaultConf.openGLDebugContext.isSynchronous
-        );
-        REQUIRE(
-            c.openGLDebugContext.identifierFilters.size() ==
-            defaultConf.openGLDebugContext.identifierFilters.size()
-        );
-        for (size_t i = 0; i < c.openGLDebugContext.identifierFilters.size(); i += 1) {
-            CHECK(
-                c.openGLDebugContext.identifierFilters[i].identifier ==
-                defaultConf.openGLDebugContext.identifierFilters[i].identifier
-            );
-            CHECK(
-                c.openGLDebugContext.identifierFilters[i].source ==
-                defaultConf.openGLDebugContext.identifierFilters[i].source
-            );
-            CHECK(
-                c.openGLDebugContext.identifierFilters[i].type ==
-                defaultConf.openGLDebugContext.identifierFilters[i].type
-            );
-        }
-        CHECK(
-            c.openGLDebugContext.severityFilters ==
-            defaultConf.openGLDebugContext.severityFilters
-        );
-    }
-    {
-        // isSynchronous
-        constexpr std::string_view Extra = R"(
-OpenGLDebugContext = { Activate = true, Synchronous = true }
-)";
-        const Configuration c = loadConfiguration("openGLDebugContext2", Extra);
-        CHECK(c.openGLDebugContext.isActive == true);
-        CHECK(c.openGLDebugContext.isSynchronous == true);
-        REQUIRE(
-            c.openGLDebugContext.identifierFilters.size() ==
-            defaultConf.openGLDebugContext.identifierFilters.size()
-        );
-        for (size_t i = 0; i < c.openGLDebugContext.identifierFilters.size(); i += 1) {
-            CHECK(
-                c.openGLDebugContext.identifierFilters[i].identifier ==
-                defaultConf.openGLDebugContext.identifierFilters[i].identifier
-            );
-            CHECK(
-                c.openGLDebugContext.identifierFilters[i].source ==
-                defaultConf.openGLDebugContext.identifierFilters[i].source
-            );
-            CHECK(
-                c.openGLDebugContext.identifierFilters[i].type ==
-                defaultConf.openGLDebugContext.identifierFilters[i].type
-            );
-        }
-        CHECK(
-            c.openGLDebugContext.severityFilters ==
-            defaultConf.openGLDebugContext.severityFilters
-        );
-    }
-    {
-        // identifierFilters
-        constexpr std::string_view Extra = R"(
-OpenGLDebugContext = {
-    Activate = true,
-    PrintStacktrace = true,
-    FilterIdentifier = {
-        { Identifier = 1, Source = "API", Type = "Error" },
-        { Identifier = 2, Source = "Window System", Type = "Deprecated" },
-        { Identifier = 3, Source = "Shader Compiler", Type = "Undefined" },
-        { Identifier = 4, Source = "Third Party", Type = "Portability" },
-        { Identifier = 5, Source = "Application", Type = "Performance" },
-        { Identifier = 6, Source = "Other", Type = "Marker" },
-        { Identifier = 7, Source = "Don't care", Type = "Push group" },
-        { Identifier = 8, Source = "API", Type = "Pop group" },
-        { Identifier = 9, Source = "Window System", Type = "Other" },
-        { Identifier = 10, Source = "Shader Compiler", Type = "Don't care" }
-    }
-}
-)";
-        const Configuration c = loadConfiguration("openGLDebugContext3", Extra);
-        CHECK(c.openGLDebugContext.isActive == true);
-        CHECK(c.openGLDebugContext.printStacktrace == true);
-        CHECK(
-            c.openGLDebugContext.isSynchronous ==
-            defaultConf.openGLDebugContext.isSynchronous
-        );
-        REQUIRE(c.openGLDebugContext.identifierFilters.size() == 10);
-        CHECK(c.openGLDebugContext.identifierFilters[0].identifier == 1);
-        CHECK(c.openGLDebugContext.identifierFilters[0].source == "API");
-        CHECK(c.openGLDebugContext.identifierFilters[0].type == "Error");
-        CHECK(c.openGLDebugContext.identifierFilters[1].identifier == 2);
-        CHECK(c.openGLDebugContext.identifierFilters[1].source == "Window System");
-        CHECK(c.openGLDebugContext.identifierFilters[1].type == "Deprecated");
-        CHECK(c.openGLDebugContext.identifierFilters[2].identifier == 3);
-        CHECK(c.openGLDebugContext.identifierFilters[2].source == "Shader Compiler");
-        CHECK(c.openGLDebugContext.identifierFilters[2].type == "Undefined");
-        CHECK(c.openGLDebugContext.identifierFilters[3].identifier == 4);
-        CHECK(c.openGLDebugContext.identifierFilters[3].source == "Third Party");
-        CHECK(c.openGLDebugContext.identifierFilters[3].type == "Portability");
-        CHECK(c.openGLDebugContext.identifierFilters[4].identifier == 5);
-        CHECK(c.openGLDebugContext.identifierFilters[4].source == "Application");
-        CHECK(c.openGLDebugContext.identifierFilters[4].type == "Performance");
-        CHECK(c.openGLDebugContext.identifierFilters[5].identifier == 6);
-        CHECK(c.openGLDebugContext.identifierFilters[5].source == "Other");
-        CHECK(c.openGLDebugContext.identifierFilters[5].type == "Marker");
-        CHECK(c.openGLDebugContext.identifierFilters[6].identifier == 7);
-        CHECK(c.openGLDebugContext.identifierFilters[6].source == "Don't care");
-        CHECK(c.openGLDebugContext.identifierFilters[6].type == "Push group");
-        CHECK(c.openGLDebugContext.identifierFilters[7].identifier == 8);
-        CHECK(c.openGLDebugContext.identifierFilters[7].source == "API");
-        CHECK(c.openGLDebugContext.identifierFilters[7].type == "Pop group");
-        CHECK(c.openGLDebugContext.identifierFilters[8].identifier == 9);
-        CHECK(c.openGLDebugContext.identifierFilters[8].source == "Window System");
-        CHECK(c.openGLDebugContext.identifierFilters[8].type == "Other");
-        CHECK(c.openGLDebugContext.identifierFilters[9].identifier == 10);
-        CHECK(c.openGLDebugContext.identifierFilters[9].source == "Shader Compiler");
-        CHECK(c.openGLDebugContext.identifierFilters[9].type == "Don't care");
-
-        CHECK(
-            c.openGLDebugContext.severityFilters ==
-            defaultConf.openGLDebugContext.severityFilters
-        );
-    }
-    {
-        // filterSeverity
-        constexpr std::string_view Extra = R"(
-OpenGLDebugContext = { Activate = true, FilterSeverity = { "High", "Medium" } }
-)";
-        const Configuration c = loadConfiguration("openGLDebugContext4", Extra);
-        CHECK(c.openGLDebugContext.isActive == true);
-        CHECK(c.openGLDebugContext.printStacktrace == false);
-        CHECK(
-            c.openGLDebugContext.isSynchronous ==
-            defaultConf.openGLDebugContext.isSynchronous
-        );
-        REQUIRE(
-            c.openGLDebugContext.identifierFilters.size() ==
-            defaultConf.openGLDebugContext.identifierFilters.size()
-        );
-        for (size_t i = 0; i < c.openGLDebugContext.identifierFilters.size(); i += 1) {
-            CHECK(
-                c.openGLDebugContext.identifierFilters[i].identifier ==
-                defaultConf.openGLDebugContext.identifierFilters[i].identifier
-            );
-            CHECK(
-                c.openGLDebugContext.identifierFilters[i].source ==
-                defaultConf.openGLDebugContext.identifierFilters[i].source
-            );
-            CHECK(
-                c.openGLDebugContext.identifierFilters[i].type ==
-                defaultConf.openGLDebugContext.identifierFilters[i].type
-            );
-        }
-        REQUIRE(c.openGLDebugContext.severityFilters.size() == 2);
-        CHECK(
-            c.openGLDebugContext.severityFilters ==
-            std::vector<std::string>{ "High", "Medium" }
-        );
-    }
-}
-
-TEST_CASE("Configuration: httpProxy", "[configuration]") {
-    Configuration defaultConf;
-    {
-        // empty-ish / address + port
-        constexpr std::string_view Extra = R"(
-HttpProxy = {
-    Address = "foobar",
-    Port = 1234
-}
-)";
-        const Configuration c = loadConfiguration("httpProxy1", Extra);
-        CHECK(c.httpProxy.usingHttpProxy == defaultConf.httpProxy.usingHttpProxy);
-        CHECK(c.httpProxy.address == "foobar");
-        CHECK(c.httpProxy.port == 1234);
-        CHECK(c.httpProxy.authentication == defaultConf.httpProxy.authentication);
-        CHECK(c.httpProxy.user == defaultConf.httpProxy.user);
-        CHECK(c.httpProxy.password == defaultConf.httpProxy.password);
-    }
-    {
-        // activate
-        constexpr std::string_view Extra = R"(
-HttpProxy = {
-    Activate = true,
-    Address = "foobar",
-    Port = 1234
-}
-)";
-        const Configuration c = loadConfiguration("httpProxy2", Extra);
-        CHECK(c.httpProxy.usingHttpProxy == true);
-        CHECK(c.httpProxy.address == "foobar");
-        CHECK(c.httpProxy.port == 1234);
-        CHECK(c.httpProxy.authentication == defaultConf.httpProxy.authentication);
-        CHECK(c.httpProxy.user == defaultConf.httpProxy.user);
-        CHECK(c.httpProxy.password == defaultConf.httpProxy.password);
-    }
-    {
-        // authentication
-        constexpr std::string_view Extra = R"(
-HttpProxy = {
-    Address = "foobar",
-    Port = 1234,
-    Authentication = "ntlm"
-}
-)";
-        const Configuration c = loadConfiguration("httpProxy3", Extra);
-        CHECK(c.httpProxy.usingHttpProxy == defaultConf.httpProxy.usingHttpProxy);
-        CHECK(c.httpProxy.address == "foobar");
-        CHECK(c.httpProxy.port == 1234);
-        CHECK(c.httpProxy.authentication == "ntlm");
-        CHECK(c.httpProxy.user == defaultConf.httpProxy.user);
-        CHECK(c.httpProxy.password == defaultConf.httpProxy.password);
-    }
-    {
-        // user
-        constexpr std::string_view Extra = R"(
-HttpProxy = {
-    Address = "foobar",
-    Port = 1234,
-    User = "user-bar"
-}
-)";
-        const Configuration c = loadConfiguration("httpProxy4", Extra);
-        CHECK(c.httpProxy.usingHttpProxy == defaultConf.httpProxy.usingHttpProxy);
-        CHECK(c.httpProxy.address == "foobar");
-        CHECK(c.httpProxy.port == 1234);
-        CHECK(c.httpProxy.authentication == defaultConf.httpProxy.authentication);
-        CHECK(c.httpProxy.user == "user-bar");
-        CHECK(c.httpProxy.password == defaultConf.httpProxy.password);
-    }
-    {
-        // password
-        constexpr std::string_view Extra = R"(
-HttpProxy = {
-    Address = "foobar",
-    Port = 1234,
-    Password = "password-bar"
-}
-)";
-        const Configuration c = loadConfiguration("httpProxy5", Extra);
-        CHECK(c.httpProxy.usingHttpProxy == defaultConf.httpProxy.usingHttpProxy);
-        CHECK(c.httpProxy.address == "foobar");
-        CHECK(c.httpProxy.port == 1234);
-        CHECK(c.httpProxy.authentication == defaultConf.httpProxy.authentication);
-        CHECK(c.httpProxy.user == defaultConf.httpProxy.user);
-        CHECK(c.httpProxy.password == "password-bar");
-    }
-}

From f2524c27c4b814abba6c031d90e5862ad71e7758 Mon Sep 17 00:00:00 2001
From: Alexander Bock <alexander.bock@liu.se>
Date: Wed, 8 Nov 2023 07:40:14 +0100
Subject: [PATCH 162/701] Fix Tracy

---
 apps/OpenSpace/ext/sgct | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/apps/OpenSpace/ext/sgct b/apps/OpenSpace/ext/sgct
index d0003e83eb..287e0b3b2d 160000
--- a/apps/OpenSpace/ext/sgct
+++ b/apps/OpenSpace/ext/sgct
@@ -1 +1 @@
-Subproject commit d0003e83eb1d4e98d84867c2ca8cf1f51bed5f95
+Subproject commit 287e0b3b2dd96d0fcabed3528589feb0ff27fc6b

From 49106c336e5d985f75a54450e5342cec15ff2f7a Mon Sep 17 00:00:00 2001
From: Alexander Bock <alexander.bock@liu.se>
Date: Wed, 8 Nov 2023 10:26:34 +0100
Subject: [PATCH 163/701] Update Tracy submodules

---
 apps/OpenSpace/ext/sgct | 2 +-
 ext/ghoul               | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/apps/OpenSpace/ext/sgct b/apps/OpenSpace/ext/sgct
index 287e0b3b2d..a5f0b01420 160000
--- a/apps/OpenSpace/ext/sgct
+++ b/apps/OpenSpace/ext/sgct
@@ -1 +1 @@
-Subproject commit 287e0b3b2dd96d0fcabed3528589feb0ff27fc6b
+Subproject commit a5f0b014207b2e518e4f2dd5f5ed004855fff1b8
diff --git a/ext/ghoul b/ext/ghoul
index 412e90e49a..f658ead151 160000
--- a/ext/ghoul
+++ b/ext/ghoul
@@ -1 +1 @@
-Subproject commit 412e90e49aaf12a8ae974acd93755514af61fd48
+Subproject commit f658ead151995fe77830b43b6559f95b6eaa2981

From 709cb24bbb2ac37ad1fe87f8b3aac47a4e4d3363 Mon Sep 17 00:00:00 2001
From: Emma Broman <emma.broman@liu.se>
Date: Thu, 9 Nov 2023 11:18:45 +0100
Subject: [PATCH 164/701] Simplify Apollo LEM Model Rotation - Allows using
 IdleBehavior to orbit around up (#2916)

* Simplify Apollo LEM Model Rotation and allow using IdleBehavior to orbit around up-vector

* Add rotation values from Carter
---
 .../assets/scene/solarsystem/missions/apollo/11/lem.asset | 8 +++++++-
 .../assets/scene/solarsystem/missions/apollo/17/lem.asset | 8 +++++++-
 2 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/data/assets/scene/solarsystem/missions/apollo/11/lem.asset b/data/assets/scene/solarsystem/missions/apollo/11/lem.asset
index 4be3fd6f8c..17ddb2c21b 100644
--- a/data/assets/scene/solarsystem/missions/apollo/11/lem.asset
+++ b/data/assets/scene/solarsystem/missions/apollo/11/lem.asset
@@ -22,6 +22,12 @@ local Apollo11Lem = {
       Latitude = 0.67402,
       Altitude = -1927.65,
       UseHeightMap = false
+    },
+    Rotation = {
+      Type = "GlobeRotation",
+      Globe = moon_asset.Moon.Identifier,
+      Longitude = -360+23.47306,
+      Latitude = 0.67402,
     }
   },
   GUI = {
@@ -42,7 +48,7 @@ local Apollo11LemModel = {
   Renderable = {
     Type = "RenderableModel",
     GeometryFile = lem_model .. "LM-2_ver2clean.obj",
-    RotationVector = { 91.044090, 171.229706, 111.666664 },
+    RotationVector = { -90.0, 283.86999, 0 },
     LightSources = {
       sun.LightSource,
       {
diff --git a/data/assets/scene/solarsystem/missions/apollo/17/lem.asset b/data/assets/scene/solarsystem/missions/apollo/17/lem.asset
index 10a72ddd3c..eb7158df4f 100644
--- a/data/assets/scene/solarsystem/missions/apollo/17/lem.asset
+++ b/data/assets/scene/solarsystem/missions/apollo/17/lem.asset
@@ -21,6 +21,12 @@ local Apollo17Lem = {
       Longitude = -329.22833,
       Latitude = 20.19092,
       UseHeightmap = true
+    },
+    Rotation = {
+      Type = "GlobeRotation",
+      Globe = moonAsset.Moon.Identifier,
+      Longitude = -329.22833,
+      Latitude = 20.19092,
     }
   },
   GUI = {
@@ -43,7 +49,7 @@ local Apollo17LemModel = {
     Type = "RenderableModel",
     GeometryFile = model .. "LM-2_ver2clean.obj",
     SpecularIntensity = 0.0,
-    RotationVector = { 110.255219, 171.229706, 126.666664 },
+    RotationVector = { -90.0, 283.86999, 0 },
     LightSources = {
       sun.LightSource,
       {

From b62e604b2e5aad8ee387cd9b26150c738eb800cd Mon Sep 17 00:00:00 2001
From: Alexander Bock <alexander.bock@liu.se>
Date: Mon, 13 Nov 2023 08:52:51 +0100
Subject: [PATCH 165/701] Adds a persistent file used to store user settings
 (#2931)

* Enable the loading of settings
* Add a user interface for changing the settings in the launcher


Co-authored-by: Emma Broman <emma.broman@liu.se>
---
 .gitignore                                    |   1 +
 apps/OpenSpace/ext/launcher/CMakeLists.txt    |   2 +
 .../ext/launcher/include/launcherwindow.h     |   6 +-
 .../ext/launcher/include/settingsdialog.h     |  74 ++
 .../resources/images/cogwheel-highlight.png   | Bin 0 -> 8227 bytes
 .../launcher/resources/images/cogwheel.png    | Bin 0 -> 9197 bytes
 .../ext/launcher/resources/qss/launcher.qss   |  19 +
 .../ext/launcher/resources/resources.qrc      |   4 +-
 .../ext/launcher/src/launcherwindow.cpp       |  36 +-
 .../ext/launcher/src/settingsdialog.cpp       | 410 +++++++++
 apps/OpenSpace/main.cpp                       |  39 +-
 include/openspace/engine/configuration.h      |   9 +-
 include/openspace/engine/globals.h            |   4 +-
 include/openspace/engine/settings.h           |  62 ++
 openspace.cfg                                 |   8 -
 src/CMakeLists.txt                            |   2 +
 src/engine/configuration.cpp                  |  51 +-
 src/engine/globals.cpp                        |   8 +-
 src/engine/openspaceengine.cpp                |   4 +-
 src/engine/settings.cpp                       | 184 ++++
 src/rendering/renderengine.cpp                |   2 +-
 tests/CMakeLists.txt                          |   1 +
 tests/main.cpp                                |   5 +-
 tests/test_settings.cpp                       | 863 ++++++++++++++++++
 tests/test_sgctedit.cpp                       |   2 +-
 25 files changed, 1754 insertions(+), 42 deletions(-)
 create mode 100644 apps/OpenSpace/ext/launcher/include/settingsdialog.h
 create mode 100644 apps/OpenSpace/ext/launcher/resources/images/cogwheel-highlight.png
 create mode 100644 apps/OpenSpace/ext/launcher/resources/images/cogwheel.png
 create mode 100644 apps/OpenSpace/ext/launcher/src/settingsdialog.cpp
 create mode 100644 include/openspace/engine/settings.h
 create mode 100644 src/engine/settings.cpp
 create mode 100644 tests/test_settings.cpp

diff --git a/.gitignore b/.gitignore
index 78bfbc5a7d..bb70a3b337 100644
--- a/.gitignore
+++ b/.gitignore
@@ -42,3 +42,4 @@ COMMIT.md
 /modules/skybrowser/wwtimagedata
 doc
 config/schema/sgct.schema.json
+settings.json
diff --git a/apps/OpenSpace/ext/launcher/CMakeLists.txt b/apps/OpenSpace/ext/launcher/CMakeLists.txt
index f7a465bd3c..42b1c0f042 100644
--- a/apps/OpenSpace/ext/launcher/CMakeLists.txt
+++ b/apps/OpenSpace/ext/launcher/CMakeLists.txt
@@ -27,6 +27,7 @@ include(${PROJECT_SOURCE_DIR}/support/cmake/set_openspace_compile_settings.cmake
 set(HEADER_FILES
   include/filesystemaccess.h
   include/launcherwindow.h
+  include/settingsdialog.h
   include/profile/actiondialog.h
   include/profile/additionalscriptsdialog.h
   include/profile/assetsdialog.h
@@ -55,6 +56,7 @@ set(HEADER_FILES
 set(SOURCE_FILES
   src/launcherwindow.cpp
   src/filesystemaccess.cpp
+  src/settingsdialog.cpp
   src/profile/actiondialog.cpp
   src/profile/additionalscriptsdialog.cpp
   src/profile/assetsdialog.cpp
diff --git a/apps/OpenSpace/ext/launcher/include/launcherwindow.h b/apps/OpenSpace/ext/launcher/include/launcherwindow.h
index 840aabb6e4..f5efc4c1b6 100644
--- a/apps/OpenSpace/ext/launcher/include/launcherwindow.h
+++ b/apps/OpenSpace/ext/launcher/include/launcherwindow.h
@@ -34,7 +34,7 @@
 #include <QApplication>
 #include <optional>
 
-namespace openspace::configuration { struct Configuration; }
+namespace openspace { struct Configuration; }
 
 class QComboBox;
 class QLabel;
@@ -54,8 +54,8 @@ public:
      *                   in the tree structure.
      */
     LauncherWindow(bool profileEnabled,
-        const openspace::configuration::Configuration& globalConfig,
-        bool sgctConfigEnabled, std::string sgctConfigName, QWidget* parent);
+        const openspace::Configuration& globalConfig, bool sgctConfigEnabled,
+        std::string sgctConfigName, QWidget* parent);
 
     /**
       * Returns bool for whether "start OpenSpace" was chosen when this window closed.
diff --git a/apps/OpenSpace/ext/launcher/include/settingsdialog.h b/apps/OpenSpace/ext/launcher/include/settingsdialog.h
new file mode 100644
index 0000000000..eb06e92b0d
--- /dev/null
+++ b/apps/OpenSpace/ext/launcher/include/settingsdialog.h
@@ -0,0 +1,74 @@
+/*****************************************************************************************
+ *                                                                                       *
+ * OpenSpace                                                                             *
+ *                                                                                       *
+ * Copyright (c) 2014-2023                                                               *
+ *                                                                                       *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
+ * software and associated documentation files (the "Software"), to deal in the Software *
+ * without restriction, including without limitation the rights to use, copy, modify,    *
+ * merge, publish, distribute, sublicense, and/or sell copies of the Software, and to    *
+ * permit persons to whom the Software is furnished to do so, subject to the following   *
+ * conditions:                                                                           *
+ *                                                                                       *
+ * The above copyright notice and this permission notice shall be included in all copies *
+ * or substantial portions of the Software.                                              *
+ *                                                                                       *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED,   *
+ * INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A         *
+ * PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT    *
+ * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF  *
+ * CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE  *
+ * OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                                         *
+ ****************************************************************************************/
+
+#ifndef __OPENSPACE_UI_LAUNCHER___SETTINGSDIALOG___H__
+#define __OPENSPACE_UI_LAUNCHER___SETTINGSDIALOG___H__
+
+#include <QDialog>
+
+#include <openspace/engine/settings.h>
+
+class QCheckBox;
+class QComboBox;
+class QDialogButtonBox;
+class QLabel;
+class QLineEdit;
+
+class SettingsDialog : public QDialog {
+Q_OBJECT
+public:
+    SettingsDialog(openspace::Settings settings,
+        QWidget* parent = nullptr);
+
+signals:
+    void saveSettings(openspace::Settings settings);
+
+private:
+    void createWidgets();
+    void loadFromSettings(const openspace::Settings& settings);
+    void updateSaveButton();
+
+    void save();
+    void reject();
+
+    QLineEdit* _configuration = nullptr;
+    QCheckBox* _rememberLastConfiguration = nullptr;
+    QLineEdit* _profile = nullptr;
+    QCheckBox* _rememberLastProfile = nullptr;
+    QComboBox* _propertyVisibility = nullptr;
+    QCheckBox* _bypassLauncher = nullptr;
+    QLabel* _bypassInformation = nullptr;
+
+    struct {
+        QCheckBox* isEnabled = nullptr;
+        QLineEdit* location = nullptr;
+    } _mrf;
+
+    QDialogButtonBox* _dialogButtons = nullptr;
+
+    // The set of settings that we have while editing
+    openspace::Settings _currentEdit;
+};
+
+#endif // __OPENSPACE_UI_LAUNCHER___SETTINGSDIALOG___H__
diff --git a/apps/OpenSpace/ext/launcher/resources/images/cogwheel-highlight.png b/apps/OpenSpace/ext/launcher/resources/images/cogwheel-highlight.png
new file mode 100644
index 0000000000000000000000000000000000000000..c4b46943ced9e205ad874c36f3b918e43ba7411d
GIT binary patch
literal 8227
zcmbVx2UJtvvUfu7O+mUb^d34ykluSyx)MTwNC||{rAiT{iV&m*Q2|k!6zK?pG(kFu
zbOfXbQlyCZ9sX^-`>lK5d+TMb<eVfkvuDrDp83t3cvE8?S}Jxb5C}x8r>kiWToZtI
z6a^XZ`KT9S3|uI^b!~h>AnFU}Z!jn;hZO`OZA4pI<E)Jg;Yf_9IKmm@gc1+*^aiLw
zASIPRZv@gEg@ZVuT+v?2(Cx-nC<N`S47HLqf*E;hpxn^9!B~_<u(2gF*d3|p3{|-X
zQ3`|u0z6ST1SHVY!^;;Qs0{r>E*!W&|5*YG`GW-Kt_)Q>Ul3w#WD3#1U{Mf7aY->G
z3?>PY2kvC#q!bhtMIll!DQO9qoP?CDm=p{SlZ4C4LjHO|f#tByE^u>A?Y|ZSz9~c9
za5!(cghW6<fOvqkI0ow~A*raSC;^j_kdhJuD8zh&yl{v>F)v@9za?m*e34kRHx7;Q
zf}Bf4IAQ#7%1}VnKlkA2{f}5L-@ohxSWF@i;VmI44m;n|AB4`xf9SmZupWOb?u?W`
zd7wN|UN~QXR`MTOZ#N7M<Lid`52FA1`(G9SY-?on&l>+$7f;WBmhi=C`2*Yd%OL-j
z+SfA38zo_m^2PXJkti*HKuw<W-FU+_uqXr$gSEt9JpT5S>E9|tq-4b9A%a$DFK0}E
zuh4&CKxrayC}rrm*Tf`YV$zb9QqpiqDYzs|1f~Fo!TuyQ!Z@Q{g8m(;loVW6{$EIe
zm~lqn5dR~wGZOBC!FnQq4Wm5~t|$p_FIOn!A2Y%=Fdi5zurQ#V^dDLn8Nv0ud~pab
zBuY<H84B!K9F2B{!xUv;k}|T+VkqDurXVc?6GOPjx`-i=Qqm|XX$3hKIfcLZH8DuP
zbI<<G?+ozED9FkyC`v1eDY!UGia8-<oPZBmNijv36GA}}=_Ds5>-;yr2^I|;EriGa
zS<d-^I}ZuCF4`AxR?uH3!UE;<*PRC%@<$ZF5y<oCR)!+a-HHM<`15D<zp=poZU=wz
z2e_dCq5qA$|0MIpxZna1Sd^M8V6Fc#oFx8}^1cZF|6cX~o%8;)>i-gc{}<K&GAq&z
z;pK_~a-{_Hd@~Z~N##$cNc{i)`s2U<l7Rju2eR7v?LYYx`0`IiMtK3Eu|U3cb3Seb
zf!OKvG}SBvbGC9raF*9Iy249%Rn@r}xUakeF`6-$wy}`e4ONnAsy+=ZkP>VdefC3P
zl5Y4%!f<;6y(4=ZVn=pyGOE3L=AKD4BSVU+sVWn9Bn2;6JpvR2iYnPWMox$sdoewH
zVLA3H`i}cddPDjPi=Uf&GkcS(o6S6$BoX)SQHV2Wf+|%xQ|9Z*?~&U_jP3-1dn5G+
zL!Pzi4PNgd1w9Zjqw8bz&?MrDyf_aX9P9C&qjNL)MQIWHkcUWtjFXfusElYHWV%*g
zPH`h9N85tmkbeH=JUc;JKS@rt6!d$*W}ZZ!aJP+RUc*r%B3wX}VMsIXDY$Jra(eLa
z3cgRv-kvi)KAxA4kCB;K3xz_}3|ii}f!&;x)YsP+6cOpz@}D^Pxe*ag+~TIn)lOv;
zq}xD|8LgI4>p4AKs6&6U|5c;>X0xt=0gs~MV{wOukM+K;wlyzq75T38v)#Xcf3gm9
zSxZZ6bFMW%Cx^4Ds;axEr{K+-$&)qNwzRfujye#LRRzs=eR=#*c9Fl<nlx4hazzT-
zho2en!Qr+_tqwE^0p^U6(Rcx)6j-ayDzjAB=}}5*XZvzbnpiu<4io&l*M3FdBGxtq
z#6#sEtV6v2bwps9Xn$>}qsa)mljfl_G)iGXdAfPL(XDw+_(gB^j_V7F5f0fbc0?AV
zb9A3@3CBnBwU_~wT4K9M=;gi=&HOd*N=6FPRrV$_Uhpro+;<?wHu|=_w)mCHIsAsy
zjx;+EZ|2*fuSn>K!--eGkFRCeEDG^(@@GG5W4qkyOS;1fW0F;9h*)alcLd+QsKlnq
z78;cn{WXaRrS!2ga4tr8Jq*H?N%itY;Y;gz^Lgxk3C*Q_)s0H7$#^e`9Qsz!b1;v`
zwg6Zj92yzc_8T-!B;*#la1jv;ZdJ>NUQ+$}W2=5OFGRs-kz~8|cMHmhD@xd#e<%J`
z0>!+OBg9)7M)8JZ#u7&(ccC-ajq4CJSMY8QwE6tR)Q@L}2KM>qm#f>nVq%GhbK&_K
zadcqbLhYWGHv4&`dh;=x(^W&F9fcEI;1+Y;XY7MV85zNzY^7G^a-M8a{_lAbv0>m-
z>I$Z<vaNjl(NW;>;sXhFuehG>?v&-_<=eY~W#;pCj_@6W0orVh2-y`^yr|8h*vOWD
z-_iG_Ez}m6zc9pEEl$DljRCO>;cD~j{lR>dR_)GmhsGPWwH|2UHI8|@M}pZy0@e4K
z${W^&A1jB{Zhoo}AsJOr+1=fBo^1-kZq-bTYv*mXwGtzTW=DRuCSN-#?vlcbI|#qB
zt&!?eh#%M!r}babyGJ>4IkzIW(_$)5Ii$BG^yfh7esjp7zLV3FXF2-&6mQWqU-$(C
z`d$xS6A3x|M(dqMP8SmsBNcjr(=#x5owg#{kcgOaUvAuPxr(vTN#;(EBqsmVcTBNW
z8AV2U1yM%a@~(KEm|n>ggK~9sH83|fuMwyY|9y77VXG_ZOCNq>azj&FyH|ehj>R_i
zx#43c38dJVKp*&S^gWn-;T{d9^JeJ5_55^udwbE6k`kis`L}mb9kI06@QhyF0|Oa|
zj#x^Fq@?7-?CcF+Hfk2piZuQ-coOc2ni7nNEo9!gu?FbAXZQB;<Hw0rIwjQkVJ9Uo
zZEJeBw=t6yYEDR`(XfZcYA`s4<T0!x@_=<_YkjPg`01j{WNLakA0;IvKf0F5aafmu
z(jrDw%(gn^<x5dl*<kQ|TO{#tB~s@qnn+GbFNH#yNjYzgukX20cFx!`Y4o`ffhYuo
zgTL{ELfn~1+G$9ob|^TwxWwkde>cBoZvvSSqicy;z1)`cBPgXQtQQzfot&JU_f|e6
z34c@X0-UiqzG66UwV<A95UIk^uBWXX`<mT7c5}9Qx+T~)*2^BQpIO`HK_eaN>9XY#
z&Al=H>h&~wrO^0J5<^!^gE?mnNtPrM;JK|W+jKY^!jI^U4DU?#?P3D8e@^fsP(qSb
z&fdJvLTkSYT!^`3IJ`;xjY<{~OyIal)D3JecT87${atq|kJ0c;P5J0h{)E=Jwz$Q|
zemYuOm5y(TR34zUi+8>?ZV$IKAFlP+tWhjTpI$Mf@#f1*^OR^gdNOmVhz)Vif9sQ^
z?~37u9Mu-$)3I%mN_0Fq+*+QPjAp0so{K`HNO{w6lV@D*Gn1V-7@wOpHE8^$&5{n|
z2X7+xi85IX^$?7&MeQ_ue>T}?6#HXyD#>^)%S_(G)z!E#t|xRg{zxZNybY=W3R+5(
z&jED4-T9EuV3VwA(5&cf3M1KQe-i`kAYX*xW2sJ?4>E=9E+4X(Q}$XH7xXlEOb<Y3
z5wT>%j=hhBnof87&K`YX1v0xr;0`2?{&LrrzlE)>J_^ML)Bqq(hYK{wfe_Z!*T>pg
z=I^YRmhX;Qm^{XWQYpo8hwM<Ym=IMS2P*E6t?xnzJ~qO_!Z~*;1|ATT({*QKT7)j}
z8>WDX$#g9(Eo(HUeuzM!>Sb>hsp<jWpayaj5nIn7P$~2<uf^HxH8=0{)<jY8wb_&e
zvcc~S5u&$RKHDTtncCV415uuGMI&}pFX`l_)veH)rh{=i?EacrQK=QFU7eTgmzSEM
zc*6ka{3~F7Ly=LTKHBvjR&fQ~T8h%iS|Jl7qnSlvz7`&D7g27ibNE{;6hB8c3qGS)
zX0M<;cmTK1P?YletT6T3HF;$0VDaqdw)~f$7)a$6T2U~6znE$npQA!fTuE_paZi9w
zM1F+mBi2?e<f22&2|7TXYi>HQtk!M&agwdJ4$*IlrkLPcdDZyeYlX@BK|%E+WBAXX
z?S1O)GwjJDeQ42+ln?~dkYWM|JK+$ZSSrMLo-LpHZH)Ur;Uvl+6v&*6z>0pcj$S!a
zbChJCocd`ejyGTtwVtnLU+xjem)U4#4TYRWk)*)n2?biDDVWw@<7Rxyr#l_~PaYAx
z8d|#sJ2d<V#Gm$>NI50LfBu-p1mJdC-6zB?=#Skn>z8;{qvN%SS*?hq?i_i)f8@K|
z&G>buu`XA%&#V+D2<7A@tQuZ>TVeF<=~G=}<0NG8V;CYTRD5agjFBV>)(mU66usFr
z$@mPY-?u*1xVvs&Us*KtE-;9|O9p2b7Yj}`_?7ZB*t~X0EWwMpDRBWlf%dD+Pg$%_
zl;`tM2?+|OJbHA|LP)VqrNE@g;vSe=U7(9-U9S?=$D)Ii!L6AZ$QOM?)?CwA*JHf|
zH*4VBG71hZ!x2PwbPTQlhs>#)+04|`F?n-G8E!?1C*13R1<wNu>*($cT;0xuXC?oL
zno*d@YyK!_{48TK!aVs^WUGdNo)uQyx}ftV#lEUf)++f_C6Zh@<cCK^Y^d7rvtLtH
zs0V(HY>AuIyie6f6ARk*)`aBEEi9&LJvrjzX{8<<MI+xQrRL=sqtQZc%P;J4;>cQ8
zUiJ^}<ZyaBL<Zvf(^_s9UUtmWn=FIwW%c~aCW)T1)oGx>LsCYKp;;49JrJ`RW#y8{
zuF+C4<q3X|fm3YWm9N4c&hd$f>F?fY#wRD2V>>%LDIw)eyZX8!t!_im*I1p8Z-N%M
zp9U*6R5R~L7#nMxrynZFE4#X~@gyKw&(_M6(Iik-<;1~SJCSEe4<4kMTszhj77_U}
zT4G^tYiqj&_gRcSJ>46;QW~hG6@%NJop~`j*d{tE%<=7>TEP82FnZ*9BBvsj_i3<*
zkWfh_tx2Ae5ERNG?<I4I!3!rydRxFybm#dhH6loG9Y7h<`BB$Zw@qsTK_6+Y?^h-=
zcpc5(r8oQ~u3o2qo6nHFVTj)}Afm;zu%hCl%<(1S<k+ej;%Fb%<D7Oef8(&QmU{B^
z$W`aO(M7y7-{@1ou1Qam6))cm|K(?#x36t<i}KD2LE&r>v!+4W_PO4d>*6!`@bGZ|
zn3s;nPZR%kT>Db#L%<V#8De+E2@=+CybBJhSQDd~=M>SWv3w!mwkKK-6v9s5yk?q8
z$;<O<_IMEc{jl9Qb0CmEWv0Q8y2`o*0XTelWyQA6?&G~riOd|zm-zVj?wo#qPxrur
z8GkFR{y>Ubb|uJcB;_LU$Hsub4}1WWxZV6x^HotuZrby=f|@+p`DE5ryiFd7u>$TF
zgSm@i4r28(S#i2pFz%cEGXX4T?1gc){jVOIY+qZ6cR}Ojw+6qC6mhYva>8+Ij<fzG
zws!LT2wO*wPyqn}a)*i&r}s%*&aSR@bs-TBboVa^Zfd>GGPSgP*Okce2bbRqsli0@
zrZk&0*o_uV(5Gtj1&{jmL;ytZ`O{}blvWn9&WwN^C(3q$$PxtU39cbc&GmYj)-(^$
zfaJSkR?U^JCh7ftq@%gTFC^zhZSk)ortZR%jC0|SxwMJ$g2XKO3@_&O7&$xh0`bLf
zpMuA`HY;`1GoX#YIz!UJn{$`1u|!QyS_2^B)ig`sFkIu{N>6@thMJC9s=U=2TbA~=
zQvv6JQ$-SYG>>ozN|(xxwHJr%f1L#i>)K0+l|;NCm@#yzk}UXUi8Jhs>qOzB1PN{z
zqxE!mxCd*DV`Z5&7twc3^V-}g>}w|wQ><N5<$QFmiL|iAok@ko#r9fTahkl$=#n;R
z74OEG9JrtGJM0)8@>VJHy27|+?6V(%FN-fZ;8HuD<a7YmHtO?@StWYGv~p3q|22<J
zQnY$)Z~*}8Ry^5_3i0vU8^c5d%v{TWK9W#e-2GWiCDQdP{a73?W^wO=fN`{H^~u6R
z193^r2&Gxs3WSG}76h^k5#;O~D%ANfEqI&l;lLArFya1IhtK}jH2!9D)0L^=p>C^0
zuCIZ+Ms=9EJhi)IilPIGlb>2RlV#ZfMP%3)R6%r{3Jg?J>xmm>jRV1tWAne|A!2V4
zT<@?c1$tZCjC)2aCJd!c;>Y5?Cs<9_VdxtiTO9i{CC3de!AJ_PVxo1)%5)C5-)z-R
zb24|)EfKOf1fOJZlkGd2P+Cs!_;T`SClCN6G481%Lv4@jyxulO_$gPYlk9Ju^8zNP
z-Uo{c)c6oBMAkhxSoGvcl((9uCduJUK)&BJnAM1wXj$Q&T=Av@7zjL9m5ODB-Mzh6
z`1eCF&sE6v8N&ub<tzzBV?xF8@$qmK%3x&a`&&~%Slb(}4q~a#ID2brK>#&Y;F|K_
zpAD0oa?(F^cT*%%ZNyhs%kUdzInUIRe=GD+ta?@;RRlK7QAj=e6{>G{5$EywP3mjc
zW{ZqpYj=a_%xA9qGsTv^w2(Bq-O-aK@XU90VElqN3+>@2R+^xpHfLOtAb{*2Mnw@7
zjoFaa*Vhl%xLb|vedkjeVNp!R9HbXhzmR{fXKS1Fw5Z5nqRgSx-k|}<sJhbs_`>l0
zsa;lX&AW%uSHHcxCv!4vAQ5Bf`rwiTiz<+4Uepwh)ea2}J-=C3U?vdJKundWZL%^U
zqVx^`A?mh4jHy4rH4Z+y!okY?G?tFUOLdi)sM|<><{~z9#^*g(OZ3lf?ZO8^hnr8i
z!7*N{$g+Ly50f`uAe2aRHM!=*!IRA)bu-bIErGUrxcrt1&;h@!lOurHRcIeG9CXmS
zjmC0-0n7z}eLD1P)bOzR@W_aw|0Zj(d*3x2tNgSy6PNgFGp;c7Y3pn~*^{9!x57t%
z_&i%(kIAa}Jz`PZpQ9+fZ1UmTOydW(<}XUuo-7E{vBnZwMsKoByt2E5Ri47~H9v?I
zXiV_knxbco@Uj|RyDSE#y05@E^WhN?u`%|HQ0R26XPTVnr%bA2a3E_k^Vk*5LbjVy
zqV-T79@N45Skjss&`@W1g{d$7KBA#yK%8Xi9|M?&)2w?S_bQ*9+&J$CGe@%dcP!q*
zFlO1nAe3#R|0|w`p8kHBgNLLvKZ?wmAnnzf$YCl-p>`rx6R0>rK|$E>otLtEeF~A^
zXQKJluXDo4j-*d`sUdoLdR0MtF7NkuKWflFh6iz}q*>~MG~Uy9T8qO=I2lvT3bm(P
zPqnzUX!opa{0OoQsR|r+1Cej<l3&d#hN`H{^^^KB*by{tLBPC*b}~OoK~jizlJ^&#
z5ew}xKYA(%ESoWHB)H+(7hpfH$h@BVX^TUL+BvFv&lmiLc}i1{zLrm_2OJSmdY@!V
zu9+J}R8-L6@%U+9G8-$Ql=!ZhaMmN{hTFPoab@Gh?rt=2A7f2<#gHck%kgfQU9kp5
zt7oS`?eAXbh|4W&xp?uSZt0CzqV;rz^!MjdKo|H~a-DAwN%?PDyVjr}5)vlg8aB#4
z(O4FlJ;A8nWs?BiBtE15a2-Z}bb-AaModd$DyG8(0nT~K)^y!f2L}o6pk+pj7Wtvn
zHjHirW!k+mnx@{<la2D+u}oS3R7fGaXugiW%9dam+`E|z_j_1kQPc|<C%5b-voi`c
zCGb03bE)Zw7C@&B#N|%7LBJ;utE!}2Yy7!AW}9q)Q^Nxk>huQ^Et4&A=1a_MY(fr=
z{^@|(d-@+sqkf$nEc!R*mgy$~Y5B*(5pULD&$b}`9DAJ*sIy`NpB!`{la;%gg7!|+
z`xrS@!g2t10LMj4Z#{qcvOha^@(VUKD@#9_Te<xk!NMU^&Xe7u$XIsngkk3S<X3ka
z78Ca2j(zP5=)BI3<@cAvKlhNAvdPXLujb2#Wa-PK&yAfiXtTq3{j}3Of@6G~Budy0
z?xwr8y*ay|e8U?JL39<mhLffMMd4~`s>^8n#I5j|YemOK#S|k%Nc_pyqI~}w7d{lr
zyYy!w9<G=iIUZ-&4(yMU$45-~-Z|P?2)j5$BLD;7>7E?3%8$v@EB!(;gFK+C0Vhfe
zUa=aJmB_fD5KgYFJ9m%d<Bk(o-}8!#8v~g$cgsE7OrW>7clpT!ajC>0i^1vknw@uZ
z6qdIN3kHQGBwSCAzK5}lB$y%=-^IH;9l(5-zmRZ*iDOHwH2B#sJ*e=LLbmWmf0k@t
z&gM6r(8AND_#=}{!FhCoSmeabkPm-!cp0KLPIDf)v6tUl@u`OBZ4Eg%l$+*<pVb4s
zaO@=j%2ji0&UP&MeZ7cK9efzL$Etqx?5vR?6{zqkoWEtmJSa)-!U%dz%_R?}tI<4H
z{WraDATPmyaowhPxm`py$8Z~yV|xU@&TqQp6dxa-4^MqSadcc#_(38Mo#cmd6hONV
zO6c^i^yD{k^I7|N1sIk{_f*mP1$la(q9~aVs`%--B}VwQYd5jJzPZ4_AYyUR3FA#N
zSVR0qz%)@<jhALpccj5@V<q03;rmjuN*3FeSk-5aZnAX91+qsn+21Xp!ovDD%Iv?^
znTH)MkRJoRC{f`8ti3l~gpY@(V|)AeP6z$NM~|EzqAr2?siR|IpgN)rSjJ~e%klF;
zeZbQA{e2wRd9nh5z#Gk8K0R7Wo@L+!Ff?|)4V>S1)OYL5sqVFhS`X9C#}g)KJLq$?
zOXcB>etcmLP+or6w1Up3OuhG+Mef|F8tLxue+0C+^|qmlOG}~bwM9nRE)qy$Z@UV1
zGj(0okE;FQEA|O&Y%oXFT)JE2^xTi=xZs(qX36uEMJ^5i3{3-IrVSM}HOFw0T4($P
z0cW5g#(sT<|HN_ZI@<G+C}nNUt!H518ph_!moHeL(+8$ZoJT($<p|N4FhXSJDj_c}
zN=NN-*byS}{!}$Ot=e;X+_D$G@3w{;tu@^eYCb#J`0}c5cDFQyUM7iC5xU)cn3upR
zsctWBC2M0AzW*E4<s%-Ltf{5dv-_pbUDUVpKJ&xOOt*~h7uH{J?6;*Xf)J`aHp($8
z?muqa`TWKQ3ruj!oq(#~e3&?}Xdkda6c(?Y-K%<+-pV~?bkx$O=Js{LH)f>Sa-I+S
z#2a7oM^OYHZC-WcXHV^=n%xsgNO6e}wX1!pUvHxHJ-YcN(I|?SZ~m1f@w+SS5ysux
zNTur$yuk2nJM8dk&|<s*FF${mWq+_t?JKU-VvApzGB1YZaPs3nXRK}p@hwLO{oJbC
zq75PI244ella{r058s}5af~@o#`p2jEA2#_F3^V;qXq5m{xFnHzi?4OkCnPP!p4pD
z{-?a|1J+c|!Mh|fk52EpMaNQcLi<mT_l%D5pkzXb=K<yI0NRREr4vEz&{hrZ&l8J!
zmNS=W+5HI)>n!tOGL1SMgTL<&O?sDuOE=7J2sP+WM!<9B1GjlqCzBeA#}DJ}$qm8W
z<X&pO3LMrdvJ-ziy-YapBQa(o!%^5o{NVjHl)|3Awo}CzlJoQAO6rbYSXM;Cmz?hl
zSLcWapOp3j&m&4X9Ys!3u8*IM&3B;Nt-BBGX=A8!c_<fBFAdL$zKM%O<%zsx5I1p>
zW~T%O*Y<0@Z%Nrt6-O(?AWc;=%rYgtgwn#LK&g9QmY1XLLDQIwrRh_?(}npexHW5H
zgE@t1DW4+i(Qcmv9~9bdOO)SsFMDJX=wl1OG3|_Bi$hl@#yPm)I7eXahuauW1mMI-
z9p)C?Z(S3B2I%QpvC7JWy@n$oaRR-T0?=VB?JRV7OxGsPGzO&M@j5Op{J`LJ<-H2|
z8JokDOmJY(FbO5`ZU1oY#C$to5(K@MoGbu5A^_sXw%RRndaG=g4c`|7)PstOl=gOY
zeFK9HY587~o2q&vydOs?iPz12<Zm+=f<G0=WvON}eJ;N8ij@}H%$T@aeXXr^Nl=`m
zJ)+DU9#SSFW2kq3RbO4t`MMIf1IeTSF2kXSMm9@}FeH*x5Y$3Fq-X(d_~64Zqvd7(
z#+1V10@MuquE37*jA4bOfk;@x%EgGA#pLX=LWtjE;mI!Q^T+slTE?1X>W)$W4<jkD
A2><{9

literal 0
HcmV?d00001

diff --git a/apps/OpenSpace/ext/launcher/resources/images/cogwheel.png b/apps/OpenSpace/ext/launcher/resources/images/cogwheel.png
new file mode 100644
index 0000000000000000000000000000000000000000..9f3465f332762f485ec9a7055abda85dddcc84c1
GIT binary patch
literal 9197
zcmb_?2{@F0*Z<gehV1(qV@xv`+aNoUJ^MZwTbRLElC>s;NQNYYvLqz?ZbHhQB^0tH
zq_UJGOYiOX{C>adeg4<;yzhHG*MF|-p8KBrKHu{_=X}rke9t-e+%z{eV4~-x2Z2CL
zh8J`#fpaQwT%)B1zKH|Erof2~cfmdc1Y$UIdXRx~^SD7E>Lgz)JG`BVG0FoQa1QN>
zb;q2G2*3f<Ads3y1P<+S8G{#g$9Ve&s*7&5b%_f5da8@sDwrTla5@+t-wTn!m`jnS
zRvwX;JybkJHO>pGMW6r%0T?`5I3mD5Fa#B$F8T*w6mWfd8!jsR2MPYNx~SIagu-?v
z=E6GIV2rTJIa!zo0wF7`1Y98%<&;%aWQ64qa`JG5B3w=ZCWk;FWKjwV!he25f$4%h
zy-=3A`hQLa{8AV7!Q*i#I6OQ&{9L&FIc%^uTvkOz1&)w|%gMn23RuXMKs-7E78oM-
z7YAKTh)1w54)2Q%6h7sMcE^U|)kOhO|Di(w?r*k%A%EHluoyf7jf2acL!9dL2cf6O
z-*mXpVE;cR_w;~c{4oKTKzs;5EBiMs&IgOfhWKFr4eP%j|I-A3ZB0!6p5tH25)knB
z6d`!MFhGqz4e~FkL#(dgFmOvu2sSj>1EUuPh$(ie4GyIfj6vhE!B$wT|6eO*{+GzY
za>#Q^!cw-rfu7j#5XgTUfYC+cG3uhHs|J%rz~p7E<m6GZawu5@6rqelApSvWg7x(E
zy7I3`<&h|be<lTd#uJT4|F6WJ9w;wtZ~z)m*f#*}je+9=y+wupHX}+0>yHfvCI+OF
z|3eBB6O>_K2p%2ificuo7X@@a=j-c<Qa~aVl)O|hFf>L%7N+EZRD`L>p_O4?NLh@M
zhk_ykDX09`cwMYV=;_M-HQo~#k5pDrQdW^yfhl`=%EH{yNO#~1;G}|ZM=Q&ExGTyj
zc>XosEZ7$aEwulC%;z-VPF(_Z!8Zh0tSf&;#3fA7pI83A!hd)H3hi;~-Rhzqr^|`~
zB>2Z|-+y6&|C<K?7$5F~0hs;|%l!|s5UdwI9370&@&>H+zq%9r-w7Xr4*Q=)N2nkX
zvPcC_7zQ}Ol;x2K7}`t03x@WPlgG%(D=T^_0*m+WMVFI9DJcErssD-SfAaS5K?izc
z0IY<I{^!d4-#qc(EAvmW^#4y8_$fmE!^7bJuk-!!?7yKYu#kV;0wDVI^6$+7`0@Al
zf(Zod6bx)03ZJ{#Kp+7ILtQPah`cZPS0mW1bNgcFIk;P>#M$==xHFXOtdtllE3edI
z`PLQ2k&MrA@+;MCHw(q%$So8vaAwCPWJQD<2&gx2N`3m7de^&`kC`5givv@VWpNj3
zfAH#-nD2<qt0)~OJi=~N^tO*qus9cOet-O_sWW6GymRYVEnX7@N`KkILMd3N{+jiI
zVmcX$%thFIbd7=}OTwOfq22B{*!@Nk_aaj~@o;SNb=+4?c;VB7Pria>pn2K{2m^}`
z+aPOAiJH-<XbK_)$H$<6OU}0^eEJDIjC0hfG?5QqjZrB}jx2<*DHB9rH<8XRViqTq
zW7DCFkFgi-SfbuMXx5|+l0|SemlTceeSVu+?c8?f&K>P^LG=qpM%`OaRl6fPT#jNi
zXqfp6YisXZr(v;lbWA~WGbtR?Z5I-E;m=%BGQrxE3r#a3hO}c`&3u_Mt<@8C-e&q~
z{QU=O56qsrbofkH3*?qAeLE=r#cVRMeRw=MIf+{&ku?U)_LZ94mx9Bal8}Nq=Lj=m
zC3Bo*7elBV_|b7G@s~9-N@{9u17rm|MLzxR8vA)6BO)-^t@?VToSfWtWXFdOA8Nw4
zT;iUQd<ykg`!?}3xgas~GtRZOwVxy|UV6T@FMsui|7Hyo;Y3>`QAt6knIf7B7Nu*j
z3Z!`5gk2!)FU^IFHVB1DoMieNj1|*fclc2t_dB$=>BHVsOG%k>$i4TKW8<_F$!8Ow
zXFIf$@RM^ZQAF2=>^~EU!Lj0BE<ld8lR#zpL8f9LU9~n&Z9J8J(N{xNH`VPHVz6yg
z8<z^dL@Kx#hC8$EIGHR;rI5!Dde5QFei5RPQuDUQi!U(8UogY6An608Nbe0&7nxEa
zf11mps@p^Gayn_ya$sxa{RCo(8%+RHSm^dsj{E;!)tfJWtQjlPOJO;%&*%F@9Vduj
z+_P$>x_$$E$%3=a*yu`q5etJzALxLzC-VCZ$4@#O87>3741ugpm9FDFaJ>^yLNn(p
zeRVw-=V?O|6U+b+!mk>Z`cm*}YH~9D=86#6#S$WxP`^Y*U3esLCN791JXtCVGSfIl
zewl5;j$fv`F}fxuFF$co=I6#$Llz;_fT__jviB}$({`d5qL$M<xc#+xg}F6+D~))^
zxh?E%$6zd#AeqZuOU1Vzy`u}>6WH`=Gg51%?4>TpRd0HFdC7%+o>^Q&nutN6gE7}n
zm_Hao7Lc<%*IS=yke$>1!b(-NiGn~NAJ*1heke?#&Mke0-?04g`7H&w^#+c8hOwQd
zovJd^@)rSYOP&%psI~Vy!$9zHoyoK4!!Vm_Ctoa9X<KSr!*XDtw3*X@PK<DY>MMB+
zOWu=B6o^IR2)Ay@ZmtwFRcUW!YwM`Ap|jW(FG7OHGsxOrv2i>jX(}!zc0KINJ1Y2V
z!#q@IGRyg&anr7`0?OCbX5(xvve%kOx6C!{Wq@$`+OhAFCZOuoV9lh)pe9ptB>Mh1
zJQbmxWTDB7;PH95iCXEq<pG%dRzVwXN!#e+MXf4j=^B+DytAabdcN;O=~%<%>E<6Q
z@0BCJOO0y$R>NR0Vas{iCfip*hOO0g!K(xMRm=CWo&B@et^n+s!emW{VnK8m0hj|C
zcR*?=jQOxJQ6}&6y0B(sKeB_JoqhXD(*ia2cJ-!H^xm7f;6d2l`I~_WrM~UQKW5uc
zer<-zm;!++B`r;VmA0y~Qd~o0;eDTjn}u5Vt23tDBE6v`{zYkXjql?n7Z1kLW7vZn
z)75rqU88oWGS8YUC-4Pc_&F#39*D@Oqn($P4h_ks`6vr>bMOv=mzFX|)*~Swxfw5E
zIiT_4VLBZU5TX=zv`*wq>BCE!6G-xS&AK|NThBN5mUklD=^JuX!_TRPf2}{UqE{0x
ziBg&Bd}EMv_AM`>e^)5SbK}huE~ssF>c-0-2T`yznZmGU52gmYdLP!F1g5&PzkA{i
zZ-Bc}ZH2xhsiOTod1!8DXZQ86Xv}?11S|Dy?PuP-YY-XPs+Y@P{>T@xjNt9f0_?^Y
zM^kf(HZ^(<)JpCjhweQpEq!O0DM@I4gAeYb3KB~NFPD|Sd5tM_x1eWWaD-jFCVP2G
zM%7oJ{99aXvh87zNGjN!A18!^kmATF>^h^aK<)XvEA8tpn3**(!$Ds;w2e~@W@XRl
z(*_CNW^iKiQ>c&FS+=QFPR+~XZ+p7Q=9Ud!F1DM!brTRL#KLi>D{kWA8t^<_Q&>|=
zOA9wk*|4wZOgje64tsbu72M5mRCloJkX;gbZBy`P)cNG(<j;@pF&>%HvWDgb$#8yj
zSTq&Zn-29FEy&+Czh;AE2DX~(Ea!bPN-6xl?XQhBa&Z8ta^1pHMMzjotS5u^*oKh!
z;e)4~ygY3DJH^TH95{`8%pvCi`5Cfb-#2=0DZS^$$X8up?@JT7=;v1v8li%7Mt;#X
z<`&Uao&41)rWq5{33WGf7*h@o4z6r6BuR<r8a)co^+2P@p4(fMndTS!6myssn%r0X
z(ZfE8<zX!r8A1~)sX*4&))vSydP(z3mpn8oHT#LWgd{qTQj<!9lJmFk-hH{V@=`3I
zl!H!R7%Z%$G>uYY_P=c@m|UOlBiV5|E?o1)<B<aO`|sXyLR%+4FYQI@P*hEUum*2z
zkdlUwE^1B+IQjV=M2<?x*{m!Rw)XeQ+`vpaVPRoDM_a`{p_hxp<_sZ9WDIe4HSKec
zj*h%8@;;qTDfRWq<xIU+C!}P+uMv}{67q4Tf7jbhOXm5qY@!dnNCKI>`GNkIP-jUf
zG(|)wL3g%{P}ta*J>M37$-!a3Kq$JmKT~p4TBmdqC77NFt!}=?DyENcBgGLujp$yF
zKKucMh@0~SWbt?0s^!2P+^kP+j*Eyc3(<IHo}{u=dQqG=UNcVN@>EUap5J1sT2T%9
z%dpecFAYwy$9q1xeB;e#J)3*)5{p3F+%+?KMuc0Xlg)K(i?ieaptdH<xW*nU3}(Z`
zz_f%rAJ}o=ne+h`)V1-IDm{p1gvBAeU&{K4pr%p};vISWb~i)&w-Hs)+?BO_Mm|Lu
zS*}T1VB?=CGn0hFSxg7}1k(&=cSMI2NL4v)Q+J)i?m=liR=;WrTn;9mAtQo*gTjiD
zVO=^Hwt^4!c6Bs+;Ch3Sl^^=6A+EHkWFzv757o;Fs?O8>!^0A=;cD0-BQ=Yl@o0hi
z+a|0~c~V<?ob|ItzH}91@5QdTSh5@?te}{_GPJPJm-pMp;g#1#I$_11X-*P?X)1Lj
zdWBL-qeHHGf~64<ijv&7T$8vGU*5sH@Ng&Rj^g5L_vF1D5`Qxc-M0M7uzys_dq<zl
z_FAjGm_ZtTvi0-Zy2RDNyR$cgDI+K%sD9oj)-G2{CelGLOwx~I>cGoP#B067q~QcK
zo&ta_>aO3%TP=WjJdRt-$J)ZNc;}|CFECyjuIVMic4A-O6|%D@fR27mcZCsUp4e2;
zOANZkZ;<9K2W*$Mvdu3*m@Zk1(v%qOcpEQFUNTeHv#`kU$UY0E#Z5bh+b2HOOaP0P
z4tLqXhJ=ZVDF)M_ed$6%9wB2M{dXk7(5qskZzK=P0ocu-F_2Z(#n>BQzW6HA7Gux4
z7dJJ~YLId5oXha(Ez(JRS2dJwA#0pb5lO}R#K4ac!M|AXq&oT8<8=!wD^JNmF48e+
zPB-HPGi24&N_3&4yp@7@_io5S^u9{%5rCz}1!`|mYAo_~Vh%{<4TY7kwuj=1<aya(
z^>_!vA<$Q{h~0k4jTu>~6Cy&!rG2LQa}BG+(6<WW_>Qo^C0{7ZC8=_=2j|tkzt*7>
zYCMk72w#Y93Qa$uk<x5ouAFg6KR_{luA6)&n){tz<ec7%m^8pqiuS}J%ukZ7%robK
zWR7ru&erA13)AebhxFR*xvx!;Ajqm}X~o(xX%+aeb8uwj=jXqU0e0EL8YJ2J_2e7R
zei!f#G}M^T?j#U*JAS>ZnC>pDU;C<a>&h+nclExWo}Rif60*Xc3iSdClpS|on-b{c
zp?F!`v+7Obd{oxhLj%cr7Cxmw&yDetrI@2FDJZ*DoX@N7)INPq=jn~P7WshLM)jU+
zl;mU;6&20P$xzYGI6Ji1MTr`6yZmi{9b~ob;}64lH234t^M^8G`l(4ql9CRoybAQd
z`0<iKo)8ECCZlT)D=G$B%d*{PrU}NkH^qi1jqjxasB!zjgRNGlhu#HO`dVuoh<&pu
zCXdhZNFLFxvkb{HKGZ>@MSuXfICJ-^nxIXk-PoeHOyWvw=%(g@f3+9^QS{`|50d$i
zdeOnRwYD^wL}mf^iBglPB?n^i2a%U3_Or&`3*V#`z=!)=YnxBS-ZA(G1Dl1{P!2kv
zI?}>HKD3uYhc5FPq_%Q1QrpC<xrRy4Iu38NsLXo-vJYaDQewQ`-K}lg_iiSkGNznq
zT3Gw)WsXU4b@h1;zN9ez^HDiEiOlwim*bT3H%%rZxJt%=@<2=7Rq1)@y*UAED}^NU
z?(e$xJPFJK?>-2mus`kmRe^D4F1D)KN6nQaiIk`%y&FBCUVQ8QAhc0u&ux(uKQ$X-
zq555mz*eeMS`pS2bDZ1i%BnSiR1BQ+5eU>CcFl!O-G?*w;O5ny#r{5-nl+VrU;^G_
zGW-I%>QDl$xw;=X*!t7rnLu0q7mM!*B`pn*A7f9A*|Ia4qjih;B>!3NbU#UB)ydl*
zsMY~sxz@@hI8-87F5bE~?8Y<Ctq5`@YyW+6IPycBQe<af-oheL)499;MK+4(j?IRY
z46EmvHgmqzVSzS_j936oURnn|7jgM*s)=jymrS*WKkLloPlWYhxTH@STULan)!2Iw
z%2#$D^~|d<buD1IL@HMCulxkM?Sh`Hw|=d-X%`yWaJ<cD#dFV#39@Q9*^o!6j3cR!
zY6^o34blq_C3r$y7((eX2`VjyMn=I|gqJ{Md3UIjS+$DbMNG?esR|78cgL+Rn3^`e
zZ+s!M$>_~&_;q*kUJXPyuaL@)i!ZH+ZAB&cLsE~k3iK!sb0HX(Cdd@rn;1~=h8#!#
zO(awn{i)C%+(!+St1J<YP!G%{M-sfWxbF{Saqvu87NSq6^HsycnxRY2`F7uDY3ScQ
z=UmyO(QTv9NL46Sn%;9WVjZ#cqVJ3<+D~?krlFysdbelhlS%=_`cCD@5~39yY0(zG
z^%ZCPsap|Sso)CO)5^oIfG1(8LirZ>`MQ-uT$XGm=#s26PoP-py-cR$Gg=0A>$lk%
z-{L34hgNoG)YFeG%)CMjY^~h8Hm|)wn$#WMxT8FH8_%}N1;S-{<u7cljbFTeV0#?@
zoH<O=Wj)<UModBBjrDUsk-lZ_QYGF`Y^BsQiT9rD9`7$m7Gu#XFEyCG+8-5@6Ys0`
zfi^(4uF(y3>U7T^UkY_{rm5k%^ZMoh+0c&PmP<HQ-QL#1f?!@$3D`ZZ$2pnTYoMRf
z_-2#E!{R%~Sh<--_b91*#7G#U)U$=2Lh|f6%C3dc?WLZoo)pBUk>aJ)KI2sYO6s0y
z^MQaO0@I<MY|_j3NpeUlPCzvbdF7?(i>EPr(7}Oq(kKC}&ZqJs6s(OWi%Cd+wf18c
z8(y!m_nb55M8GH?n)EB-Q8dUk=AdLVXQAP;?IGJ?8A+U`?F{T}v1P_sX#Vr-^GdOB
z2pxTZpe9d-ur}SLn>^6V+zC*LrI3&i7<7UuN0h+*{uQJ;9xTd{L;mPf>qsh(yi)^;
zoMYbSiD3;_`I&H5qZ~gszK`PGW5s&ab#n8qp>-NrwxE03w9~4)#s>3GWjBpOKhKO6
zj4aVds0j*2f4693@uHDNBa(gvKbbD<rI7Sr=*++RwMA0Olm8bIKu@5~fyl@hm%k1Q
z3sY1L`%FTlDw3?M%2y`nHZ}3hJU?xP?Wgw$AFUm8&PSsFP*Lxp^~p^bUGrEQ$^Y>t
z2(m5MXveMGHurMWJol_e_r@!M@VVy-(@tlG6?AXa*2*QPq*Rrmp}42S-BG$Px;bEN
zryF+;xyv?DnUZE7cL(8SK0=Dv_r^dj-7K^~FGF^cv~jmC!g4DigSgA&#<{&9l^vkH
z@h%YIDnUxj(HeSU`_%NO*D8PzUzDPi5w5gLtq#}D+V3LfK@>F1#>)1f_fhgW)<+!D
zlG5Mz=R8lMB`TP&+?EN;vyL}1I_Lzu!=(A-tZF}t4?NDKG6s<J(<i@oz?#K+m=GMX
z9a(qouwA4=^CQe?mohC+B#H!77*5OAZ|2?8>#ZY0_vFu<A7i2<k2(x^oxe*q5c#tl
zYX4CW_OMIgviqA1nY!17$)&_y_T&uLH~YV}lT4%xT-ShX5#ej;ZrcK6jwKiG)&dn~
zqyJlSqiyUna4~%Q8nL!@i8Gh_Bjvs=$=U0{I#5mN>FK3aCL0+URTdpm0)2~G<hw@q
zTWGs<2kV_FN304P+tU7F|KOm<>q4!m;6v?2jd&{UBm!KA0FI7pAz2#N0x-sHk2G0n
zSu3bx4lm?HT8K@#M$ioOqPeLbL~}MAT{Z^VJ~B?tw=={H93B~J83uCDi3BQiJTajc
z(KQh1H6is#^*6oGmTS$-at`}C=j(d*sa{n~vA&ug(-C_FJNJ4*trDN2|KjNk3y&yB
zPoy?}nw1cP9)Ch>(T<Td<hJwtlxWPQI4wt8H;biN1e88}{AlUo!aU%i>TGlnELKK2
zX4OEgSZHHR!PHY&Svh18z7M2#-11(GAs>f|N=vDG5Umf7gm_4j+DT0oIvaryj8(P2
zh_2(L%j*|jZFfET*6re5ZvHTNlX#nbF0@yfU+ak8f1Z+^?0C)%Bl8(Z6{IMA>XZ%Q
z<=A}{i-H@V=1>B!l~Y~EkqMtwg%208RWEi@%~!^VqB`YG4Um7_SG<)1?`-a`hOiCg
zt4=4Q5OGeB)sS0xmNX{zZkx_lSF)UX5NZ+<5>EIry&ykSBqJ{}i34g=gBj#3h*+ir
z0cjwC9@b2m725n@f~t}EAuR@8^M-YOXoK8Q-TcZr$u}i<HlRs1<|tzN!=u=}H@5t$
zoT*nGZdI(a$uH~WD3bQeCF_snN7Yt%p%e)BURof<&<YJzfVXdx-&evm%8aO#7fHCc
zz?`Rf5N@ERg_x^|vR5$AoyZOu$Ht*^Bs`;I3|=Pb<)d)nfdvG|dhsTz>tGnmEq}Js
znaTjj-W3!Sh}qeemX_M~_B@iNc|J84d@L>5bP^cR-`B?&h0f;z&63uS@#QR2IDeN*
z3KgDs3vnvdWfyTP+KdEgy(rakK2@O9p6<`TLGefX5CD^?^Fn}sKYAptCTM03X=_<}
zl_56tKx5%VxSbK`91V7>be-?k{gNoVVlJqeC8YmH89Xo3Pflq_o~&kQ=vUuJJISAs
zmuC#rtm=AeoQoO+@Lk<mFDnA8_ILdN(-Y3qM$N@+nIh~$=h%;j943Tw&aLJ^BAwAk
zVNCrsWr{(t>P8DS2YGz;ri??q)DmBM6|E3Z=AD)nFcWHAG%`TXn0vxEl&+Ne_~_u<
zmrwLnI0(>PwQG-f7CIxyec6UGjdsi~XC&t<*1WBz%14m)O3k5L2r41PhxXDf*vJGY
zVvhc<nCI?^z(6=BtLWKO;_lVOkRir?+U^sFCB!M<HO08q5o_hf6^rw~pK!=m7FARv
z@4tW2q~->7A`IVGx@5zN@2Zp-FhW?c>KnB%ag5jWAQ)|)x|m=vy`BMj*MLH}C)4b_
zugdm7{L2y|U$HMV8&uH+N~cI<>=D+`&_Hf>ah!{r-o%XLsc_n-QH&NYUoXB4e|M&Y
zXw&h6OY;T`khnJ+wR}nhn!B$?MwsV$BjmE})^cK;L&mLArMYjQxjntT+s--eCMF*p
zMXB1qr?9yI>AG1moHHEH6W_^Rx0t1%*5JVFz4LP=y)O25%;t88+hbyIbmf=6Rog7f
znAGG+IN3}shGBmpHWup3uN@R5>(~_7P&uf$r~x!8Up)NMd|YffpcJoH&h6TWU3hQA
zOJnZjWNdGLPcPeY@;ZOmVz@`r=2J*X6vrzX#cQI&6fA0s(!&ecr#;Uh(`>m#Ey(IO
z%Yo(>-o3{=O5bX^-0qZCR;ISMw@=-~oq1SZo-{sgscO$TaN*%Wk7i~nm*TiTxkPN(
zsQP}dF3>EP6*VmLbr{;m>@2^ibZi<C9b{&=cLBOkn^CTpkn~#PYH{}%F1fgv+Su4k
z{^~MQ+o80#w~qoUDwvl`{grQCK+D>$#!bs=4M_8A>*@}UzKvFCM5jfXuLRm(Ti{7=
zf0Q6h_(^B<d{J6iV1OqOU+{7Ty*iNf;~9_h^ufVstf{`fejUSuN#re{d$_xt0-tIr
zAQIVkzkTcJEQnkV)zGO*uzC69X%Gu}`eMq<Vr^6`SwyI__j2#eIsAmltpZ0oJD;21
zsm$pg^ymCKYOM}=PQ`@-z@w$wKUm7NK&`*R`pHZU`ued!wcZULJXL*X^kJ?4+gkkz
z>+?t3IxaB>n5(L>S_k%1y>+8$tbIqjWTbf#vM{scsjHox9o89$Ub|+T$l;GKb%8?*
z<}Rxu<!&FpRgF3nB`PgM$)7oEj2m{61k-MBls(uTzX%837-&z}byB+MVBFp_J2AX2
zGZPYwTrY}*-758!v8w^~AU^L3z{v+65gk|NV-4s$!V00%u^S8VT7@y6RkzwR(LD)N
z8fCt`EiEnC=3o-1Rb;Q92!X4aks}ku${k<TdQ-0eXnKsYW*M1G{Ol1rA^qALc+9JP
zhnI-;WEzmJ%(5&1Ya8nx)bz!-CcM@q?d}F=%h<bPvG8rmZ6dKY4e8gusEi&mjfmrm
z_a7=VnhqVGn7D@um42BnRMy-)Q>}jt8JIhPJQ85Co?Eh<Jn~_zKqZw_^iG&*2soh1
z`T-?h4Gq=*-Vm>$S@nt#!a$ntxtnOwid0j0QP@&^2VTllR?6U=*BYi>7z75+>l>yV
zL+bM*x;Y5XLO(_=hLZwFZ^^G~=-Fq7^Z7z~6m*#k?DHMThUvP09><g#-*XqJ*0;Z7
zS!iWsAKLg0L;$Z?q>bM6KDfXkop=lsuL~>VO9_W(qJ*|QkAQM)?kwSz&VgTPv5YR)
zw=R}qwj&`R0=e}a4a`6MvZ4(-my8J1gh=NJS1w<&955q*L(Fx4h!a6^ToT|KDh^Z8
z;muIWG*)U&BYTP?3)*MQ+*FKuFYX6YO<jZx@}YjqtfyX0e&7IYJ+o9GTq47&Jx6mS
zRJP_l8y{PkAZH+dA|R1U1#~Ek>89=6Oq0~hC7SsZYl<tbK}*y??U+s{swTCYRX%5Z
zd<i?nc=Pr}<N1NxTZ}(SN(%LyQ+d3P1iXT7B`2Q^GDFfjD#)8_pGS|n=2AGYqm7B~
z+5Yy=-1W3Qf@HSpZ}yO~OTT9-li3<auB5`sC4K-U<zjW)S5e>%6ZC2Oo%7MZZUgVa
zfQp)ylHB5A>Xi-`H9;0&JL6Z2xDC7}Isa>2tn+Ah(A;D$bf-mpzwpH=!aCAEW0Ux*
z_WWJ=Gix3SV))yYo!3>4O5@|>>(ft#PJ0PrN8LcDd;jolTR0pjib{dV?~E=okD{(b
zo;h(~AF(+pl~`mWQeYVeGV`wOj`bdj?2s9lkMtdv5BJ{nK~I%DuZrg+D3<%lbXe?F
z9~QrwVBoO4-R&D|A~~6N4)2RO2u&-_OBN)ibkbW3)sZ)_{$#2k-)t&p?BTp2M34S-
vJwepKVA4hxNl+m;klE*U!UQ?ZPK3^l5{uJ+mv5c^A;(b9RJU5&?b?3<hyX1`

literal 0
HcmV?d00001

diff --git a/apps/OpenSpace/ext/launcher/resources/qss/launcher.qss b/apps/OpenSpace/ext/launcher/resources/qss/launcher.qss
index a22ab8a331..68d95a4b84 100644
--- a/apps/OpenSpace/ext/launcher/resources/qss/launcher.qss
+++ b/apps/OpenSpace/ext/launcher/resources/qss/launcher.qss
@@ -92,6 +92,16 @@ LauncherWindow  QPushButton#small:disabled {
   background: rgb(160, 160, 160);
 }
 
+LauncherWindow  QPushButton#settings {
+  border-image: url(:/images/cogwheel);
+  background-repeat: no-repeat;
+}
+
+LauncherWindow  QPushButton#settings:hover {
+  border-image: url(:/images/cogwheel-highlight);
+}
+
+
 /*
  * ProfileEdit
  */
@@ -209,3 +219,12 @@ WindowControl QLabel#notice {
   font-weight: normal;
   font-size: 11pt;
 }
+
+/*
+ * Settings
+ */
+SettingsWidget  QLabel#information {
+  font-style: italic;
+  font-weight: normal;
+  font-size: 8pt;
+}
diff --git a/apps/OpenSpace/ext/launcher/resources/resources.qrc b/apps/OpenSpace/ext/launcher/resources/resources.qrc
index 6942acaf81..e0c8417403 100644
--- a/apps/OpenSpace/ext/launcher/resources/resources.qrc
+++ b/apps/OpenSpace/ext/launcher/resources/resources.qrc
@@ -1,8 +1,10 @@
 <!DOCTYPE RCC><RCC version="1.0">
   <qresource>
     <file>qss/launcher.qss</file>
-    <file>images/openspace-horiz-logo-small.png</file>
+    <file>images/cogwheel.png</file>
+    <file>images/cogwheel-highlight.png</file>
     <file>images/launcher-background.png</file>
+    <file>images/openspace-horiz-logo-small.png</file>
     <file>images/outline_locked.png</file>
     <file>images/outline_unlocked.png</file>
   </qresource>
diff --git a/apps/OpenSpace/ext/launcher/src/launcherwindow.cpp b/apps/OpenSpace/ext/launcher/src/launcherwindow.cpp
index f1352e7444..75525bdf7f 100644
--- a/apps/OpenSpace/ext/launcher/src/launcherwindow.cpp
+++ b/apps/OpenSpace/ext/launcher/src/launcherwindow.cpp
@@ -25,6 +25,7 @@
 #include "launcherwindow.h"
 
 #include "profile/profileedit.h"
+#include "settingsdialog.h"
 
 #include <openspace/engine/configuration.h>
 #include <openspace/openspace.h>
@@ -60,6 +61,8 @@ namespace {
     constexpr int SmallItemWidth = 100;
     constexpr int SmallItemHeight = SmallItemWidth / 4;
 
+    constexpr int SettingsIconSize = 35;
+
     namespace geometry {
         constexpr QRect BackgroundImage(0, 0, ScreenWidth, ScreenHeight);
         constexpr QRect LogoImage(LeftRuler, TopRuler, ItemWidth, ItemHeight);
@@ -85,6 +88,12 @@ namespace {
         constexpr QRect VersionString(
             5, ScreenHeight - SmallItemHeight, ItemWidth, SmallItemHeight
         );
+        constexpr QRect SettingsButton(
+            ScreenWidth - SettingsIconSize - 5,
+            ScreenHeight - SettingsIconSize - 5,
+            SettingsIconSize,
+            SettingsIconSize
+        );
     } // geometry
 
     std::optional<Profile> loadProfileFromFile(QWidget* parent, std::string filename) {
@@ -204,7 +213,7 @@ namespace {
 using namespace openspace;
 
 LauncherWindow::LauncherWindow(bool profileEnabled,
-                               const configuration::Configuration& globalConfig,
+                               const Configuration& globalConfig,
                                bool sgctConfigEnabled, std::string sgctConfigName,
                                QWidget* parent)
     : QMainWindow(parent)
@@ -376,6 +385,31 @@ QWidget* LauncherWindow::createCentralWidget() {
     versionLabel->setObjectName("version-info");
     versionLabel->setGeometry(geometry::VersionString);
 
+    QPushButton* settingsButton = new QPushButton(centralWidget);
+    settingsButton->setObjectName("settings");
+    settingsButton->setGeometry(geometry::SettingsButton);
+    settingsButton->setIconSize(QSize(SettingsIconSize, SettingsIconSize));
+    connect(
+        settingsButton,
+        &QPushButton::released,
+        [this]() {
+            using namespace openspace;
+
+            Settings settings = loadSettings();
+
+            SettingsDialog dialog(std::move(settings), this);
+            connect(
+                &dialog,
+                &SettingsDialog::saveSettings,
+                [](Settings settings) {
+                    saveSettings(settings, findSettings());
+                }
+            );
+
+            dialog.exec();
+        }
+    );
+
     return centralWidget;
 }
 
diff --git a/apps/OpenSpace/ext/launcher/src/settingsdialog.cpp b/apps/OpenSpace/ext/launcher/src/settingsdialog.cpp
new file mode 100644
index 0000000000..42ea8a0c70
--- /dev/null
+++ b/apps/OpenSpace/ext/launcher/src/settingsdialog.cpp
@@ -0,0 +1,410 @@
+/*****************************************************************************************
+ *                                                                                       *
+ * OpenSpace                                                                             *
+ *                                                                                       *
+ * Copyright (c) 2014-2023                                                               *
+ *                                                                                       *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
+ * software and associated documentation files (the "Software"), to deal in the Software *
+ * without restriction, including without limitation the rights to use, copy, modify,    *
+ * merge, publish, distribute, sublicense, and/or sell copies of the Software, and to    *
+ * permit persons to whom the Software is furnished to do so, subject to the following   *
+ * conditions:                                                                           *
+ *                                                                                       *
+ * The above copyright notice and this permission notice shall be included in all copies *
+ * or substantial portions of the Software.                                              *
+ *                                                                                       *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED,   *
+ * INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A         *
+ * PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT    *
+ * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF  *
+ * CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE  *
+ * OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                                         *
+ ****************************************************************************************/
+
+#include "settingsdialog.h"
+
+#include "profile/line.h"
+
+#include <QCheckBox>
+#include <QComboBox>
+#include <QDialogButtonBox>
+#include <QGridLayout>
+#include <QLabel>
+#include <QLineEdit>
+#include <QMessageBox>
+#include <QPushButton>
+
+SettingsDialog::SettingsDialog(openspace::Settings settings,
+                               QWidget* parent)
+    : QDialog(parent)
+    , _currentEdit(settings)
+{
+    setWindowTitle("Settings");
+    createWidgets();
+    loadFromSettings(settings);
+
+    // Setting the startup values for the control will have caused the Save button to be
+    // enabled, so we need to manually disable it again here
+    _dialogButtons->button(QDialogButtonBox::Save)->setEnabled(false);
+}
+
+void SettingsDialog::createWidgets() {
+    // Layout of this dialog:
+    //
+    // -------------------------------------------------------
+    // | Profile                                             |
+    // | Starting Profile:          | [oooooooooooooooooooo] |
+    // | [] Keep Last Profile                                |
+    // | Configuration                                       |
+    // | Starting Configuration:    | [oooooooooooooooooooo] |
+    // | [] Keep Last Configuration                          |
+    // | User Interface                                      |
+    // | Property Visibility        | DDDDDDDDDDDDDDDDDDDDD> |
+    // | [] Bypass Launcher                                  |
+    // | Informational text about undoing the bypass setting |
+    // | MRF Caching                                         |
+    // | [] Enable caching                                   |
+    // | Cache location             | [oooooooooooooooooooo] |
+    // |                            | <Save>        <Cancel> |
+    // -------------------------------------------------------
+
+    QGridLayout* layout = new QGridLayout(this);
+    layout->setSizeConstraint(QLayout::SetFixedSize);
+    
+    {
+        QLabel* label = new QLabel("Profile");
+        label->setObjectName("heading");
+        layout->addWidget(label, 0, 0, 1, 2);
+
+        QLabel* conf = new QLabel("Starting Profile");
+        conf->setToolTip(
+            "With this setting, you can choose a profile that will be loaded the next "
+            "time you start the application"
+        );
+        layout->addWidget(conf, 1, 0);
+
+        _profile = new QLineEdit;
+        _profile->setToolTip(conf->toolTip());
+        connect(
+            _profile,
+            &QLineEdit::textChanged,
+            [this]() {
+                std::string v = _profile->text().toStdString();
+                if (v.empty()) {
+                    _currentEdit.profile = std::nullopt;
+                }
+                else {
+                    _currentEdit.profile = v;
+                }
+
+                updateSaveButton();
+            }
+        );
+        layout->addWidget(_profile, 1, 1);
+
+        _rememberLastProfile = new QCheckBox("Keep Last Profile");
+        _rememberLastProfile->setToolTip(
+            "If this setting is checked, the application will remember the profile that "
+            "was loaded into OpenSpace and will use it at the next startup as well"
+        );
+        connect(
+            _rememberLastProfile,
+            &QCheckBox::stateChanged,
+            [this]() {
+                if (_rememberLastProfile->isChecked()) {
+                    _currentEdit.rememberLastProfile = true;
+                }
+                else {
+                    _currentEdit.rememberLastProfile = std::nullopt;
+                }
+
+                _profile->setDisabled(_rememberLastProfile->isChecked());
+                updateSaveButton();
+            }
+        );
+        layout->addWidget(_rememberLastProfile, 2, 0, 1, 2);
+    }
+
+    layout->addWidget(new Line(), 3, 0, 1, 2);
+
+    {
+        QLabel* label = new QLabel("Configuration");
+        label->setObjectName("heading");
+        layout->addWidget(label, 4, 0, 1, 2);
+
+        QLabel* conf = new QLabel("Starting Configuration");
+        conf->setToolTip(
+            "With this setting, you can choose a window configuration that will be "
+            "loaded the next time you start the application"
+        );
+        layout->addWidget(conf, 5, 0);
+
+        _configuration = new QLineEdit;
+        _configuration->setToolTip(conf->toolTip());
+        connect(
+            _configuration,
+            &QLineEdit::textChanged,
+            [this]() {
+                std::string v = _configuration->text().toStdString();
+                if (v.empty()) {
+                    _currentEdit.configuration = std::nullopt;
+                }
+                else {
+                    _currentEdit.configuration = v;
+                }
+
+                updateSaveButton();
+            }
+        );
+        layout->addWidget(_configuration, 5, 1);
+
+        _rememberLastConfiguration = new QCheckBox("Keep Last Configuration");
+        _rememberLastConfiguration->setToolTip(
+            "If this setting is checked, the application will remember the window "
+            "configuration and will use it at the next startup as well"
+        );
+        connect(
+            _rememberLastConfiguration,
+            &QCheckBox::stateChanged,
+            [this]() {
+                if (_rememberLastConfiguration->isChecked()) {
+                    _currentEdit.rememberLastConfiguration = true;
+                }
+                else {
+                    _currentEdit.rememberLastConfiguration = std::nullopt;
+                }
+                _configuration->setDisabled(_rememberLastConfiguration->isChecked());
+                updateSaveButton();
+            }
+        );
+        layout->addWidget(_rememberLastConfiguration, 6, 0, 1, 2);
+    }
+
+    layout->addWidget(new Line(), 7, 0, 1, 2);
+
+    {
+        QLabel* label = new QLabel("User Interface");
+        label->setObjectName("heading");
+        layout->addWidget(label, 8, 0, 1, 2);
+
+        QLabel* conf = new QLabel("Property Visibility");
+        conf->setToolTip(
+            "This setting sets the default visibility for properties in the application. "
+            "Note that these values are ordered, so all properties shown as a 'Novice "
+            "User' are also visible when selecting 'User', etc."
+        );
+        layout->addWidget(conf, 9, 0);
+
+        _propertyVisibility = new QComboBox;
+        _propertyVisibility->setToolTip(conf->toolTip());
+        _propertyVisibility->addItems({
+            "Novice User",
+            "User",
+            "Advanced User",
+            "Developer"
+        });
+        _propertyVisibility->setCurrentText("User");
+        connect(
+            _propertyVisibility,
+            &QComboBox::textActivated,
+            [this](const QString& value) {
+                using Visibility = openspace::properties::Property::Visibility;
+                if (value == "Novice User") {
+                    _currentEdit.visibility = Visibility::NoviceUser;
+                }
+                else if (value == "User") {
+                    // This is the default value
+                    _currentEdit.visibility = std::nullopt;
+                }
+                else if (value == "Advanced User") {
+                    _currentEdit.visibility = Visibility::AdvancedUser;
+                }
+                else if (value == "Developer") {
+                    _currentEdit.visibility = Visibility::Developer;
+                }
+                else {
+                    throw ghoul::MissingCaseException();
+                }
+
+                updateSaveButton();
+            }
+        );
+        layout->addWidget(_propertyVisibility, 9, 1);
+
+        _bypassLauncher = new QCheckBox("Bypass Launcher");
+        _bypassLauncher->setToolTip(
+            "If this value is selected, the Launcher will no longer be shown at startup. "
+            "Note that this also means that it will not be easy to get back to this "
+            "setting to reenable the Launcher either."
+        );
+        connect(
+            _bypassLauncher,
+            &QCheckBox::stateChanged,
+            [this]() {
+                if (_bypassLauncher->isChecked()) {
+                    _currentEdit.bypassLauncher = _bypassLauncher->isChecked();
+                }
+                else {
+                    _currentEdit.bypassLauncher = std::nullopt;
+                }
+                _bypassInformation->setVisible(_bypassLauncher->isChecked());
+                updateSaveButton();
+            }
+        );
+        layout->addWidget(_bypassLauncher, 10, 0, 1, 2);
+
+        _bypassInformation = new QLabel(
+            "Saving the settings with the bypass launcher enabled will cause this window "
+            "to not show up again, making it harder to undo this change. In case you "
+            "need to undo it, you need to open the settings.json and remove the line "
+            "that says '\"bypass\": true,'"
+        );
+        _bypassInformation->setObjectName("information");
+        _bypassInformation->setHidden(true);
+        _bypassInformation->setWordWrap(true);
+        layout->addWidget(_bypassInformation, 11, 0, 1, 2);
+    }
+
+    layout->addWidget(new Line(), 12, 0, 1, 2);
+
+    {
+        QLabel* label = new QLabel("MRF Caching");
+        label->setObjectName("heading");
+        layout->addWidget(label, 13, 0, 1, 2);
+
+        _mrf.isEnabled = new QCheckBox("Enable Caching");
+        _mrf.isEnabled->setToolTip(
+            "If this setting is checked, the MRF caching for globe layers will be "
+            "enabled. This means that all planetary images that are loaded over the "
+            "internet will also be cached locally and stored between application runs. "
+            "This will speedup the loading the second time at the expense of hard disk "
+            "space."
+        );
+        connect(
+            _mrf.isEnabled,
+            &QCheckBox::stateChanged,
+            [this]() {
+                if (_mrf.isEnabled->isChecked()) {
+                    _currentEdit.mrf.isEnabled = _mrf.isEnabled->isChecked();
+                }
+                else {
+                    _currentEdit.mrf.isEnabled = std::nullopt;
+                }
+
+                _mrf.location->setDisabled(!_mrf.isEnabled->isChecked());
+                updateSaveButton();
+            }
+        );
+        layout->addWidget(_mrf.isEnabled, 14, 0, 1, 2);
+
+        QLabel* conf = new QLabel("Cache Location");
+        conf->setToolTip(
+            "This is the place where the MRF cache files are located. Please note that "
+            "these files can potentially become quite large when using OpenSpace for a "
+            "long while and when visiting new places regularly. If this value is left "
+            "blank, the cached files will be stored in the 'mrf_cache' folder in the "
+            "OpenSpace base folder."
+        );
+        layout->addWidget(conf, 15, 0);
+
+        _mrf.location = new QLineEdit;
+        _mrf.location->setToolTip(conf->toolTip());
+        _mrf.location->setDisabled(true);
+        connect(
+            _mrf.location,
+            &QLineEdit::editingFinished,
+            [this]() {
+                if (_mrf.location->text().isEmpty()) {
+                    _currentEdit.mrf.location = std::nullopt;
+                }
+                else {
+                    _currentEdit.mrf.location = _mrf.location->text().toStdString();
+                }
+                updateSaveButton();
+            }
+        );
+        layout->addWidget(_mrf.location, 15, 1);
+    }
+
+    layout->addWidget(new Line(), 16, 0, 1, 2);
+
+    _dialogButtons = new QDialogButtonBox;
+    _dialogButtons->setStandardButtons(
+        QDialogButtonBox::Save | QDialogButtonBox::Cancel
+    );
+    QObject::connect(
+        _dialogButtons, &QDialogButtonBox::accepted,
+        this, &SettingsDialog::save
+    );
+    QObject::connect(
+        _dialogButtons, &QDialogButtonBox::rejected,
+        this, &SettingsDialog::reject
+    );
+    layout->addWidget(_dialogButtons, 17, 1, 1, 1, Qt::AlignRight);
+}
+
+void SettingsDialog::loadFromSettings(const openspace::Settings& settings) {
+    using namespace openspace;
+
+    if (settings.configuration.has_value()) {
+        _configuration->setText(QString::fromStdString(*settings.configuration));
+    }
+    if (settings.rememberLastConfiguration.has_value()) {
+        _rememberLastConfiguration->setChecked(*settings.rememberLastConfiguration);
+    }
+
+    if (settings.profile.has_value()) {
+        _profile->setText(QString::fromStdString(*settings.profile));
+    }
+    if (settings.rememberLastProfile.has_value()) {
+        _rememberLastProfile->setChecked(*settings.rememberLastProfile);
+    }
+
+    if (settings.visibility.has_value()) {
+        using Visibility = openspace::properties::Property::Visibility;
+        Visibility vis = *settings.visibility;
+        switch (vis) {
+            case Visibility::NoviceUser:
+                _propertyVisibility->setCurrentText("Novice User");
+                break;
+            case Visibility::User:
+                _propertyVisibility->setCurrentText("User");
+                break;
+            case Visibility::AdvancedUser:
+                _propertyVisibility->setCurrentText("Advanced User");
+                break;
+            case Visibility::Developer:
+                _propertyVisibility->setCurrentText("Developer");
+                break;
+            case Visibility::Always:
+            case Visibility::Hidden:
+                break;
+        }
+    }
+
+    if (settings.bypassLauncher.has_value()) {
+        _bypassLauncher->setChecked(*settings.bypassLauncher);
+    }
+
+    if (settings.mrf.isEnabled.has_value()) {
+        _mrf.isEnabled->setChecked(*settings.mrf.isEnabled);
+    }
+    if (settings.mrf.location.has_value()) {
+        _mrf.location->setText(QString::fromStdString(*settings.mrf.location));
+    }
+}
+
+void SettingsDialog::updateSaveButton() {
+    _dialogButtons->button(QDialogButtonBox::Save)->setEnabled(true);
+}
+
+void SettingsDialog::save() {
+    emit saveSettings(_currentEdit);
+    _dialogButtons->button(QDialogButtonBox::Save)->setEnabled(false);
+    QDialog::accept();
+}
+
+void SettingsDialog::reject() {
+    QDialog::reject();
+}
diff --git a/apps/OpenSpace/main.cpp b/apps/OpenSpace/main.cpp
index f618d43216..5618fc3522 100644
--- a/apps/OpenSpace/main.cpp
+++ b/apps/OpenSpace/main.cpp
@@ -22,10 +22,11 @@
  * OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                                         *
  ****************************************************************************************/
 
-#include <openspace/engine/configuration.h>
 #include <openspace/documentation/documentation.h>
+#include <openspace/engine/configuration.h>
 #include <openspace/engine/globals.h>
 #include <openspace/engine/openspaceengine.h>
+#include <openspace/engine/settings.h>
 #include <openspace/engine/windowdelegate.h>
 #include <openspace/interaction/joystickinputstate.h>
 #include <openspace/openspace.h>
@@ -288,7 +289,7 @@ void mainInitFunc(GLFWwindow*) {
     // to them later in the RenderEngine
     std::filesystem::path screenshotPath = absPath("${SCREENSHOTS}");
     FileSys.registerPathToken("${STARTUP_SCREENSHOT}", screenshotPath);
-    Settings::instance().setCapturePath(screenshotPath.string());
+    sgct::Settings::instance().setCapturePath(screenshotPath.string());
 
     LDEBUG("Initializing OpenSpace Engine started");
     global::openSpaceEngine->initialize();
@@ -899,7 +900,7 @@ void setSgctDelegateFunctions() {
     sgctDelegate.takeScreenshot = [](bool applyWarping, std::vector<int> windowIds) {
         ZoneScoped;
 
-        Settings::instance().setCaptureFromBackBuffer(applyWarping);
+        sgct::Settings::instance().setCaptureFromBackBuffer(applyWarping);
         Engine::instance().takeScreenshot(std::move(windowIds));
         return Engine::instance().screenShotNumber();
     };
@@ -976,7 +977,7 @@ void setSgctDelegateFunctions() {
         return currentWindow->swapGroupFrameNumber();
     };
     sgctDelegate.setScreenshotFolder = [](std::string path) {
-        Settings::instance().setCapturePath(std::move(path));
+        sgct::Settings::instance().setCapturePath(std::move(path));
     };
     sgctDelegate.showStatistics = [](bool enabled) {
         Engine::instance().setStatsGraphVisibility(enabled);
@@ -1049,7 +1050,7 @@ void checkCommandLineForSettings(int& argc, char** argv, bool& hasSGCT, bool& ha
 std::string setWindowConfigPresetForGui(const std::string labelFromCfgFile,
                                         bool haveCliSGCTConfig)
 {
-    configuration::Configuration& config = *global::configuration;
+    openspace::Configuration& config = *global::configuration;
 
     std::string preset;
     bool sgctConfigFileSpecifiedByLuaFunction = !config.sgctConfigNameInitialized.empty();
@@ -1225,7 +1226,7 @@ int main(int argc, char* argv[]) {
         }
         else {
             LDEBUG("Finding configuration");
-            configurationFilePath = configuration::findConfiguration();
+            configurationFilePath = findConfiguration();
         }
 
         if (!std::filesystem::is_regular_file(configurationFilePath)) {
@@ -1259,8 +1260,9 @@ int main(int argc, char* argv[]) {
 
         // Loading configuration from disk
         LDEBUG("Loading configuration from disk");
-        *global::configuration = configuration::loadConfigurationFromFile(
+        *global::configuration = loadConfigurationFromFile(
             configurationFilePath.string(),
+            findSettings(),
             size
         );
 
@@ -1413,7 +1415,7 @@ int main(int argc, char* argv[]) {
 
     LDEBUG("Creating SGCT Engine");
     std::vector<std::string> arg(argv + 1, argv + argc);
-    Configuration config = parseArguments(arg);
+    sgct::Configuration config = parseArguments(arg);
     config::Cluster cluster = loadCluster(absPath(windowConfiguration).string());
 
     Engine::Callbacks callbacks;
@@ -1479,6 +1481,27 @@ int main(int argc, char* argv[]) {
     // Only timeout after 15 minutes
     Engine::instance().setSyncParameters(false, 15.f * 60.f);
 
+    {
+        openspace::Settings settings = loadSettings();
+        settings.hasStartedBefore = true;
+
+        if (settings.rememberLastProfile) {
+            std::filesystem::path p = global::configuration->profile;
+            std::filesystem::path reducedName = p.filename().replace_extension();
+            settings.profile = reducedName.string();
+        }
+
+        if (settings.rememberLastConfiguration &&
+            !global::configuration->sgctConfigNameInitialized.empty())
+        {
+            // We only want to store the window configuration if it was not a dynamically
+            // created one
+            settings.configuration = global::configuration->windowConfiguration;
+        }
+
+        saveSettings(settings, findSettings());
+    }
+
     LINFO("Starting rendering loop");
     Engine::instance().exec();
     LINFO("Ending rendering loop");
diff --git a/include/openspace/engine/configuration.h b/include/openspace/engine/configuration.h
index 16e301e43c..20232bf756 100644
--- a/include/openspace/engine/configuration.h
+++ b/include/openspace/engine/configuration.h
@@ -34,9 +34,9 @@
 #include <string>
 #include <vector>
 
-namespace openspace::documentation { struct Documentation; }
+namespace openspace {
 
-namespace openspace::configuration {
+namespace documentation { struct Documentation; }
 
 struct Configuration {
     Configuration() = default;
@@ -147,9 +147,10 @@ struct Configuration {
 
 std::filesystem::path findConfiguration(const std::string& filename = "openspace.cfg");
 
-Configuration loadConfigurationFromFile(const std::filesystem::path& filename,
+Configuration loadConfigurationFromFile(const std::filesystem::path& configurationFile,
+    const std::filesystem::path& settingsFile,
     const glm::ivec2& primaryMonitorResolution);
 
-} // namespace openspace::configuration
+} // namespace openspace
 
 #endif // __OPENSPACE_CORE___CONFIGURATION___H__
diff --git a/include/openspace/engine/globals.h b/include/openspace/engine/globals.h
index f6e294552b..55a1cda83e 100644
--- a/include/openspace/engine/globals.h
+++ b/include/openspace/engine/globals.h
@@ -33,6 +33,7 @@ namespace ghoul::fontrendering { class FontManager; }
 
 namespace openspace {
 
+struct Configuration;
 class Dashboard;
 class DeferredcasterManager;
 class DownloadManager;
@@ -50,7 +51,6 @@ class SyncEngine;
 class TimeManager;
 class VersionChecker;
 struct WindowDelegate;
-namespace configuration { struct Configuration; }
 namespace interaction {
     struct JoystickInputStates;
     struct WebsocketInputStates;
@@ -88,7 +88,7 @@ inline SyncEngine* syncEngine;
 inline TimeManager* timeManager;
 inline VersionChecker* versionChecker;
 inline WindowDelegate* windowDelegate;
-inline configuration::Configuration* configuration;
+inline Configuration* configuration;
 inline interaction::ActionManager* actionManager;
 inline interaction::InteractionMonitor* interactionMonitor;
 inline interaction::JoystickInputStates* joystickInputStates;
diff --git a/include/openspace/engine/settings.h b/include/openspace/engine/settings.h
new file mode 100644
index 0000000000..c43178def4
--- /dev/null
+++ b/include/openspace/engine/settings.h
@@ -0,0 +1,62 @@
+/*****************************************************************************************
+ *                                                                                       *
+ * OpenSpace                                                                             *
+ *                                                                                       *
+ * Copyright (c) 2014-2023                                                               *
+ *                                                                                       *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
+ * software and associated documentation files (the "Software"), to deal in the Software *
+ * without restriction, including without limitation the rights to use, copy, modify,    *
+ * merge, publish, distribute, sublicense, and/or sell copies of the Software, and to    *
+ * permit persons to whom the Software is furnished to do so, subject to the following   *
+ * conditions:                                                                           *
+ *                                                                                       *
+ * The above copyright notice and this permission notice shall be included in all copies *
+ * or substantial portions of the Software.                                              *
+ *                                                                                       *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED,   *
+ * INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A         *
+ * PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT    *
+ * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF  *
+ * CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE  *
+ * OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                                         *
+ ****************************************************************************************/
+
+#ifndef __OPENSPACE_CORE___SETTINGS___H__
+#define __OPENSPACE_CORE___SETTINGS___H__
+
+#include <openspace/properties/property.h>
+#include <filesystem>
+#include <optional>
+
+namespace openspace {
+
+struct Settings {
+    auto operator<=>(const Settings&) const = default;
+
+    std::optional<bool> hasStartedBefore;
+
+    std::optional<std::string> configuration;
+    std::optional<bool> rememberLastConfiguration;
+    std::optional<std::string> profile;
+    std::optional<bool> rememberLastProfile;
+    std::optional<properties::Property::Visibility> visibility;
+    std::optional<bool> bypassLauncher;
+
+    struct MRF {
+        auto operator<=>(const MRF&) const = default;
+
+        std::optional<bool> isEnabled;
+        std::optional<std::string> location;
+    };
+    MRF mrf;
+};
+
+std::filesystem::path findSettings(const std::string& filename = "settings.json");
+
+Settings loadSettings(const std::filesystem::path& filename = findSettings());
+void saveSettings(const Settings& settings, const std::filesystem::path& filename);
+
+} // namespace openspace
+
+#endif // __OPENSPACE_CORE___SETTINGS___H__
diff --git a/openspace.cfg b/openspace.cfg
index 9d39a87a04..29ad549d1e 100644
--- a/openspace.cfg
+++ b/openspace.cfg
@@ -161,19 +161,11 @@ ModuleConfigurations = {
             }
         }
     },
-    WebBrowser = {
-        Enabled = true
-    },
     WebGui = {
         Address = "localhost",
         HttpPort = 4680,
         WebSocketInterface = "DefaultWebSocketInterface"
     },
-    CefWebGui = {
-        -- GuiScale = 2.0,
-        Enabled = true,
-        Visible = true
-    },
     Space = {
         ShowExceptions = false
     }
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index c54bb478af..c0c383cbe2 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -40,6 +40,7 @@ set(OPENSPACE_SOURCE
   engine/moduleengine_lua.inl
   engine/openspaceengine.cpp
   engine/openspaceengine_lua.inl
+  engine/settings.cpp
   engine/syncengine.cpp
   events/event.cpp
   events/eventengine.cpp
@@ -221,6 +222,7 @@ set(OPENSPACE_HEADER
   ${PROJECT_SOURCE_DIR}/include/openspace/engine/moduleengine.h
   ${PROJECT_SOURCE_DIR}/include/openspace/engine/moduleengine.inl
   ${PROJECT_SOURCE_DIR}/include/openspace/engine/openspaceengine.h
+  ${PROJECT_SOURCE_DIR}/include/openspace/engine/settings.h
   ${PROJECT_SOURCE_DIR}/include/openspace/engine/syncengine.h
   ${PROJECT_SOURCE_DIR}/include/openspace/engine/windowdelegate.h
   ${PROJECT_SOURCE_DIR}/include/openspace/events/event.h
diff --git a/src/engine/configuration.cpp b/src/engine/configuration.cpp
index 8ddb7a6711..780a4298c6 100644
--- a/src/engine/configuration.cpp
+++ b/src/engine/configuration.cpp
@@ -25,12 +25,14 @@
 #include <openspace/engine/configuration.h>
 
 #include <openspace/documentation/documentation.h>
+#include <openspace/engine/settings.h>
 #include <ghoul/filesystem/file.h>
 #include <ghoul/filesystem/filesystem.h>
 #include <ghoul/logging/logmanager.h>
 #include <ghoul/lua/ghoul_lua.h>
 #include <ghoul/lua/lua_helper.h>
 #include <ghoul/misc/assert.h>
+#include <json/json.hpp>
 #include <optional>
 
 namespace {
@@ -309,7 +311,7 @@ namespace {
 #include "configuration_codegen.cpp"
 } // namespace
 
-namespace openspace::configuration {
+namespace openspace {
 
 void parseLuaState(Configuration& configuration) {
     using namespace ghoul::lua;
@@ -456,6 +458,38 @@ void parseLuaState(Configuration& configuration) {
     c.bypassLauncher = p.bypassLauncher.value_or(c.bypassLauncher);
 }
 
+void patchConfiguration(Configuration& configuration, const Settings& settings) {
+    if (settings.configuration.has_value()) {
+        configuration.windowConfiguration = *settings.configuration;
+        configuration.sgctConfigNameInitialized.clear();
+    }
+    if (settings.profile.has_value()) {
+        configuration.profile = *settings.profile;
+    }
+    if (settings.visibility.has_value()) {
+        configuration.propertyVisibility = *settings.visibility;
+    }
+    if (settings.bypassLauncher.has_value()) {
+        configuration.bypassLauncher = *settings.bypassLauncher;
+    }
+    auto it = configuration.moduleConfigurations.find("GlobeBrowsing");
+    // Just in case we have a configuration file that does not specify anything
+    // about the globebrowsing module
+    if (it == configuration.moduleConfigurations.end()) {
+        configuration.moduleConfigurations["GlobeBrowsing"] = ghoul::Dictionary();
+    }
+    if (settings.mrf.isEnabled.has_value()) {
+        configuration.moduleConfigurations["GlobeBrowsing"].setValue(
+            "MRFCacheEnabled", *settings.mrf.isEnabled
+        );
+    }
+    if (settings.mrf.location.has_value()) {
+        configuration.moduleConfigurations["GlobeBrowsing"].setValue(
+            "MRFCacheLocation", *settings.mrf.location
+        );
+    }
+}
+
 documentation::Documentation Configuration::Documentation =
     codegen::doc<Parameters>("core_configuration");
 
@@ -483,10 +517,11 @@ std::filesystem::path findConfiguration(const std::string& filename) {
     }
 }
 
-Configuration loadConfigurationFromFile(const std::filesystem::path& filename,
+Configuration loadConfigurationFromFile(const std::filesystem::path& configurationFile,
+                                        const std::filesystem::path& settingsFile,
                                         const glm::ivec2& primaryMonitorResolution)
 {
-    ghoul_assert(std::filesystem::is_regular_file(filename), "File must exist");
+    ghoul_assert(std::filesystem::is_regular_file(configurationFile), "File must exist");
 
     Configuration result;
 
@@ -503,11 +538,17 @@ Configuration loadConfigurationFromFile(const std::filesystem::path& filename,
     }
 
     // Load the configuration file into the state
-    ghoul::lua::runScriptFile(result.state, filename.string());
+    ghoul::lua::runScriptFile(result.state, configurationFile.string());
 
     parseLuaState(result);
 
+    if (std::filesystem::is_regular_file(settingsFile)) {
+        Settings settings = loadSettings(settingsFile);
+
+        patchConfiguration(result, settings);
+    }
+
     return result;
 }
 
-} // namespace openspace::configuration
+} // namespace openspace
diff --git a/src/engine/globals.cpp b/src/engine/globals.cpp
index 0d88e41d5f..047fd8a6a5 100644
--- a/src/engine/globals.cpp
+++ b/src/engine/globals.cpp
@@ -89,7 +89,7 @@ namespace {
         sizeof(TimeManager) +
         sizeof(VersionChecker) +
         sizeof(WindowDelegate) +
-        sizeof(configuration::Configuration) +
+        sizeof(Configuration) +
         sizeof(interaction::ActionManager) +
         sizeof(interaction::InteractionMonitor) +
         sizeof(interaction::WebsocketInputStates) +
@@ -266,11 +266,11 @@ void create() {
 #endif // WIN32
 
 #ifdef WIN32
-    configuration = new (currentPos) configuration::Configuration;
+    configuration = new (currentPos) Configuration;
     ghoul_assert(configuration, "No configuration");
-    currentPos += sizeof(configuration::Configuration);
+    currentPos += sizeof(Configuration);
 #else // ^^^ WIN32 / !WIN32 vvv
-    configuration = new configuration::Configuration;
+    configuration = new Configuration;
 #endif // WIN32
 
 #ifdef WIN32
diff --git a/src/engine/openspaceengine.cpp b/src/engine/openspaceengine.cpp
index b6eb9c8103..c273cf3bcc 100644
--- a/src/engine/openspaceengine.cpp
+++ b/src/engine/openspaceengine.cpp
@@ -321,7 +321,7 @@ void OpenSpaceEngine::initialize() {
             DocEng.addDocumentation(doc);
         }
     }
-    DocEng.addDocumentation(configuration::Configuration::Documentation);
+    DocEng.addDocumentation(Configuration::Documentation);
 
     // Register the provided shader directories
     ghoul::opengl::ShaderPreprocessor::addIncludePath(absPath("${SHADERS}"));
@@ -519,7 +519,7 @@ void OpenSpaceEngine::initializeGL() {
         bool synchronous = global::configuration->openGLDebugContext.isSynchronous;
         setDebugOutput(DebugOutput(debugActive), SynchronousOutput(synchronous));
 
-        for (const configuration::Configuration::OpenGLDebugContext::IdentifierFilter& f :
+        for (const Configuration::OpenGLDebugContext::IdentifierFilter& f :
             global::configuration->openGLDebugContext.identifierFilters)
         {
             setDebugMessageControl(
diff --git a/src/engine/settings.cpp b/src/engine/settings.cpp
new file mode 100644
index 0000000000..6ae9451721
--- /dev/null
+++ b/src/engine/settings.cpp
@@ -0,0 +1,184 @@
+/*****************************************************************************************
+ *                                                                                       *
+ * OpenSpace                                                                             *
+ *                                                                                       *
+ * Copyright (c) 2014-2023                                                               *
+ *                                                                                       *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
+ * software and associated documentation files (the "Software"), to deal in the Software *
+ * without restriction, including without limitation the rights to use, copy, modify,    *
+ * merge, publish, distribute, sublicense, and/or sell copies of the Software, and to    *
+ * permit persons to whom the Software is furnished to do so, subject to the following   *
+ * conditions:                                                                           *
+ *                                                                                       *
+ * The above copyright notice and this permission notice shall be included in all copies *
+ * or substantial portions of the Software.                                              *
+ *                                                                                       *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED,   *
+ * INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A         *
+ * PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT    *
+ * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF  *
+ * CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE  *
+ * OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                                         *
+ ****************************************************************************************/
+
+#include <openspace/engine/settings.h>
+
+#include <openspace/engine/configuration.h>
+
+namespace openspace {
+
+namespace {
+template <typename T>
+std::optional<T> get_to(nlohmann::json& obj, const std::string& key)
+{
+    auto it = obj.find(key);
+    if (it != obj.end()) {
+        return it->get<T>();
+    }
+    else {
+        return std::nullopt;
+    }
+}
+} // namespace
+
+namespace version1 {
+    Settings parseSettings(nlohmann::json json) {
+        ghoul_assert(json.at("version").get<int>() == 1, "Wrong value");
+
+        Settings settings;
+        settings.hasStartedBefore = get_to<bool>(json, "started-before");
+        settings.configuration = get_to<std::string>(json, "config");
+        settings.rememberLastConfiguration = get_to<bool>(json, "config-remember");
+        settings.profile = get_to<std::string>(json, "profile");
+        settings.rememberLastProfile = get_to<bool>(json, "profile-remember");
+        std::optional<std::string> visibility = get_to<std::string>(json, "visibility");
+        if (visibility.has_value()) {
+            if (*visibility == "NoviceUser") {
+                settings.visibility = properties::Property::Visibility::NoviceUser;
+            }
+            else if (*visibility == "User") {
+                settings.visibility = properties::Property::Visibility::User;
+            }
+            else if (*visibility == "AdvancedUser") {
+                settings.visibility = properties::Property::Visibility::AdvancedUser;
+            }
+            else if (*visibility == "Developer") {
+                settings.visibility = properties::Property::Visibility::Developer;
+            }
+            else {
+                throw ghoul::RuntimeError(fmt::format(
+                    "Unknown visibility value {}", *visibility
+                ));
+            }
+        }
+        settings.bypassLauncher = get_to<bool>(json, "bypass");
+
+        if (auto it = json.find("mrf");  it != json.end()) {
+            if (!it->is_object()) {
+                throw ghoul::RuntimeError("'mrf' is not an object");
+            }
+            Settings::MRF mrf;
+            mrf.isEnabled = get_to<bool>(*it, "enabled");
+            mrf.location = get_to<std::string>(*it, "location");
+
+            if (mrf.isEnabled.has_value() || mrf.location.has_value()) {
+                settings.mrf = mrf;
+            }
+        }
+
+        return settings;
+    }
+} // namespace version1
+
+std::filesystem::path findSettings(const std::string& filename) {
+    // Right now the settings file lives next to the openspace.cfg file
+
+    std::filesystem::path path = findConfiguration();
+    std::filesystem::path result = path.parent_path() / filename;
+    return result;
+}
+
+Settings loadSettings(const std::filesystem::path& filename) {
+    if (!std::filesystem::is_regular_file(filename)) {
+        return Settings();
+    }
+
+    std::ifstream f(filename);
+    std::stringstream buffer;
+    buffer << f.rdbuf();
+    std::string contents = buffer.str();
+
+    nlohmann::json setting = nlohmann::json::parse(contents);
+    if (setting.empty()) {
+        return Settings();
+    }
+
+    int version = setting.at("version").get<int>();
+    if (version == 1) {
+        return version1::parseSettings(setting);
+    }
+
+    throw ghoul::RuntimeError(fmt::format(
+        "Unrecognized version for setting: {}", version
+    ));
+}
+
+void saveSettings(const Settings& settings, const std::filesystem::path& filename) {
+    nlohmann::json json = nlohmann::json::object();
+
+    json["version"] = 1;
+
+    if (settings.hasStartedBefore.has_value()) {
+        json["started-before"] = *settings.hasStartedBefore;
+    }
+    if (settings.configuration.has_value()) {
+        json["config"] = *settings.configuration;
+    }
+    if (settings.rememberLastConfiguration.has_value()) {
+        json["config-remember"] = *settings.rememberLastConfiguration;
+    }
+    if (settings.profile.has_value()) {
+        json["profile"] = *settings.profile;
+    }
+    if (settings.rememberLastProfile.has_value()) {
+        json["profile-remember"] = *settings.rememberLastProfile;
+    }
+    if (settings.visibility.has_value()) {
+        switch (*settings.visibility) {
+            case properties::Property::Visibility::NoviceUser:
+                json["visibility"] = "NoviceUser";
+                break;
+            case properties::Property::Visibility::User:
+                json["visibility"] = "User";
+                break;
+            case properties::Property::Visibility::AdvancedUser:
+                json["visibility"] = "AdvancedUser";
+                break;
+            case properties::Property::Visibility::Developer:
+                json["visibility"] = "Developer";
+                break;
+
+        }
+    }
+    if (settings.bypassLauncher.has_value()) {
+        json["bypass"] = *settings.bypassLauncher;
+    }
+    nlohmann::json mrf = nlohmann::json::object();
+    if (settings.mrf.isEnabled.has_value()) {
+        mrf["enabled"] = *settings.mrf.isEnabled;
+    }
+    if (settings.mrf.location.has_value()) {
+        mrf["location"] = *settings.mrf.location;
+    }
+
+    if (!mrf.empty()) {
+        json["mrf"] = mrf;
+    }
+
+    std::string content = json.dump(2);
+    std::ofstream f(filename);
+    f << content;
+}
+
+} // namespace openspace
diff --git a/src/rendering/renderengine.cpp b/src/rendering/renderengine.cpp
index 2061c8b5e1..ec526678e3 100644
--- a/src/rendering/renderengine.cpp
+++ b/src/rendering/renderengine.cpp
@@ -523,7 +523,7 @@ void RenderEngine::initializeGL() {
     // initialized window
     _horizFieldOfView = static_cast<float>(global::windowDelegate->getHorizFieldOfView());
 
-    configuration::Configuration::FontSizes fontSize = global::configuration->fontSize;
+    Configuration::FontSizes fontSize = global::configuration->fontSize;
     {
         ZoneScopedN("Fonts");
         TracyGpuZone("Fonts");
diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
index ed0d17c326..98bc129461 100644
--- a/tests/CMakeLists.txt
+++ b/tests/CMakeLists.txt
@@ -38,6 +38,7 @@ add_executable(
   test_profile.cpp
   test_rawvolumeio.cpp
   test_scriptscheduler.cpp
+  test_settings.cpp
   test_sgctedit.cpp
   test_spicemanager.cpp
   test_timeconversion.cpp
diff --git a/tests/main.cpp b/tests/main.cpp
index a6afbb6ad7..0aa736f681 100644
--- a/tests/main.cpp
+++ b/tests/main.cpp
@@ -58,13 +58,14 @@ int main(int argc, char** argv) {
         ghoul::filesystem::FileSystem::Override::Yes
     );
 
-    std::filesystem::path configFile = configuration::findConfiguration();
+    std::filesystem::path configFile = findConfiguration();
     // Register the base path as the directory where 'filename' lives
     std::filesystem::path base = configFile.parent_path();
     FileSys.registerPathToken("${BASE}", base);
 
-    *global::configuration = configuration::loadConfigurationFromFile(
+    *global::configuration = loadConfigurationFromFile(
         configFile.string(),
+        "",
         glm::ivec2(0)
     );
     global::openSpaceEngine->registerPathTokens();
diff --git a/tests/test_settings.cpp b/tests/test_settings.cpp
new file mode 100644
index 0000000000..81875594be
--- /dev/null
+++ b/tests/test_settings.cpp
@@ -0,0 +1,863 @@
+/*****************************************************************************************
+ *                                                                                       *
+ * OpenSpace                                                                             *
+ *                                                                                       *
+ * Copyright (c) 2014-2023                                                               *
+ *                                                                                       *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
+ * software and associated documentation files (the "Software"), to deal in the Software *
+ * without restriction, including without limitation the rights to use, copy, modify,    *
+ * merge, publish, distribute, sublicense, and/or sell copies of the Software, and to    *
+ * permit persons to whom the Software is furnished to do so, subject to the following   *
+ * conditions:                                                                           *
+ *                                                                                       *
+ * The above copyright notice and this permission notice shall be included in all copies *
+ * or substantial portions of the Software.                                              *
+ *                                                                                       *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED,   *
+ * INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A         *
+ * PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT    *
+ * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF  *
+ * CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE  *
+ * OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                                         *
+ ****************************************************************************************/
+
+#include <catch2/catch_test_macros.hpp>
+#include <catch2/matchers/catch_matchers_exception.hpp>
+#include <catch2/matchers/catch_matchers_string.hpp>
+
+#include <openspace/engine/settings.h>
+#include <json/json.hpp>
+#include <filesystem>
+#include <fstream>
+
+using namespace openspace;
+
+TEST_CASE("Settings Load: Empty", "[settings]") {
+    constexpr std::string_view Source = R"(
+{
+    "version": 1
+}
+)";
+
+    std::filesystem::path path = std::filesystem::temp_directory_path();
+    std::filesystem::path file = path / "test_settings_load_empty.json";
+    {
+        std::ofstream f(file);
+        f << Source;
+    }
+
+    Settings settings = loadSettings(file);
+
+    CHECK(!settings.hasStartedBefore.has_value());
+    CHECK(!settings.configuration.has_value());
+    CHECK(!settings.rememberLastConfiguration.has_value());
+    CHECK(!settings.profile.has_value());
+    CHECK(!settings.rememberLastProfile.has_value());
+    CHECK(!settings.visibility.has_value());
+    CHECK(!settings.bypassLauncher.has_value());
+    CHECK(!settings.mrf.isEnabled.has_value());
+    CHECK(!settings.mrf.location.has_value());
+}
+
+TEST_CASE("Settings Load: Really Empty", "[settings]") {
+    constexpr std::string_view Source = R"(
+{
+}
+)";
+
+    std::filesystem::path path = std::filesystem::temp_directory_path();
+    std::filesystem::path file = path / "test_settings_load_really-empty.json";
+    {
+        std::ofstream f(file);
+        f << Source;
+    }
+
+    Settings settings = loadSettings(file);
+
+    CHECK(!settings.hasStartedBefore.has_value());
+    CHECK(!settings.configuration.has_value());
+    CHECK(!settings.rememberLastConfiguration.has_value());
+    CHECK(!settings.profile.has_value());
+    CHECK(!settings.rememberLastProfile.has_value());
+    CHECK(!settings.visibility.has_value());
+    CHECK(!settings.bypassLauncher.has_value());
+    CHECK(!settings.mrf.isEnabled.has_value());
+    CHECK(!settings.mrf.location.has_value());
+}
+
+TEST_CASE("Settings Save: Empty", "[settings]") {
+    std::filesystem::path path = std::filesystem::temp_directory_path();
+    std::filesystem::path file = path / "test_settings_save_empty.json";
+
+    Settings srcSettings;
+    saveSettings(srcSettings, file);
+
+    Settings cmpSettings = loadSettings(file);
+    CHECK(srcSettings == cmpSettings);
+}
+
+TEST_CASE("Settings Load: Started Before", "[settings]") {
+    constexpr std::string_view Source = R"(
+{
+    "version": 1,
+    "started-before": false
+}
+)";
+
+    std::filesystem::path path = std::filesystem::temp_directory_path();
+    std::filesystem::path file = path / "test_settings_load_started-before.json";
+    {
+        std::ofstream f(file);
+        f << Source;
+    }
+
+    Settings settings = loadSettings(file);
+
+    REQUIRE(settings.hasStartedBefore.has_value());
+    CHECK(*settings.hasStartedBefore == false);
+    CHECK(!settings.configuration.has_value());
+    CHECK(!settings.rememberLastConfiguration.has_value());
+    CHECK(!settings.profile.has_value());
+    CHECK(!settings.rememberLastProfile.has_value());
+    CHECK(!settings.visibility.has_value());
+    CHECK(!settings.bypassLauncher.has_value());
+    CHECK(!settings.mrf.isEnabled.has_value());
+    CHECK(!settings.mrf.location.has_value());
+}
+
+TEST_CASE("Settings Save: Started Before", "[settings]") {
+    std::filesystem::path path = std::filesystem::temp_directory_path();
+    std::filesystem::path file = path / "test_settings_save_started-before.json";
+
+    Settings srcSettings = {
+        .hasStartedBefore = false
+    };
+    saveSettings(srcSettings, file);
+
+    Settings cmpSettings = loadSettings(file);
+    CHECK(srcSettings == cmpSettings);
+}
+
+TEST_CASE("Settings Load: Configuration", "[settings]") {
+    constexpr std::string_view Source = R"(
+{
+    "version": 1,
+    "config": "abc"
+}
+)";
+
+    std::filesystem::path path = std::filesystem::temp_directory_path();
+    std::filesystem::path file = path / "test_settings_load_config.json";
+    {
+        std::ofstream f(file);
+        f << Source;
+    }
+
+    Settings settings = loadSettings(file);
+
+    CHECK(!settings.hasStartedBefore.has_value());
+    REQUIRE(settings.configuration.has_value());
+    CHECK(*settings.configuration == "abc");
+    CHECK(!settings.rememberLastConfiguration.has_value());
+    CHECK(!settings.profile.has_value());
+    CHECK(!settings.rememberLastProfile.has_value());
+    CHECK(!settings.visibility.has_value());
+    CHECK(!settings.bypassLauncher.has_value());
+    CHECK(!settings.mrf.isEnabled.has_value());
+    CHECK(!settings.mrf.location.has_value());
+}
+
+TEST_CASE("Settings Save: Configuration", "[settings]") {
+    std::filesystem::path path = std::filesystem::temp_directory_path();
+    std::filesystem::path file = path / "test_settings_save_config.json";
+
+    Settings srcSettings = {
+        .configuration = "abc"
+    };
+    saveSettings(srcSettings, file);
+
+    Settings cmpSettings = loadSettings(file);
+    CHECK(srcSettings == cmpSettings);
+}
+
+TEST_CASE("Settings Load: Configuration Remember", "[settings]") {
+    constexpr std::string_view Source = R"(
+{
+    "version": 1,
+    "config-remember": true
+}
+)";
+
+    std::filesystem::path path = std::filesystem::temp_directory_path();
+    std::filesystem::path file = path / "test_settings_load_config_remember.json";
+    {
+        std::ofstream f(file);
+        f << Source;
+    }
+
+    Settings settings = loadSettings(file);
+
+    CHECK(!settings.hasStartedBefore.has_value());
+    CHECK(!settings.configuration.has_value());
+    REQUIRE(settings.rememberLastConfiguration.has_value());
+    CHECK(*settings.rememberLastConfiguration == true);
+    CHECK(!settings.profile.has_value());
+    CHECK(!settings.rememberLastProfile.has_value());
+    CHECK(!settings.visibility.has_value());
+    CHECK(!settings.bypassLauncher.has_value());
+    CHECK(!settings.mrf.isEnabled.has_value());
+    CHECK(!settings.mrf.location.has_value());
+}
+
+TEST_CASE("Settings Save: Configuration Remember", "[settings]") {
+    std::filesystem::path path = std::filesystem::temp_directory_path();
+    std::filesystem::path file = path / "test_settings_save_config_remember.json";
+
+    Settings srcSettings = {
+        .rememberLastConfiguration = true
+    };
+    saveSettings(srcSettings, file);
+
+    Settings cmpSettings = loadSettings(file);
+    CHECK(srcSettings == cmpSettings);
+}
+
+TEST_CASE("Settings Load: Profile", "[settings]") {
+    constexpr std::string_view Source = R"(
+{
+    "version": 1,
+    "profile": "def"
+}
+)";
+
+    std::filesystem::path path = std::filesystem::temp_directory_path();
+    std::filesystem::path file = path / "test_settings_load_profile.json";
+    {
+        std::ofstream f(file);
+        f << Source;
+    }
+
+    Settings settings = loadSettings(file);
+
+    CHECK(!settings.hasStartedBefore.has_value());
+    CHECK(!settings.configuration.has_value());
+    CHECK(!settings.rememberLastConfiguration.has_value());
+    REQUIRE(settings.profile.has_value());
+    CHECK(*settings.profile == "def");
+    CHECK(!settings.rememberLastProfile.has_value());
+    CHECK(!settings.visibility.has_value());
+    CHECK(!settings.bypassLauncher.has_value());
+    CHECK(!settings.mrf.isEnabled.has_value());
+    CHECK(!settings.mrf.location.has_value());
+}
+
+TEST_CASE("Settings Save: Profile", "[settings]") {
+    std::filesystem::path path = std::filesystem::temp_directory_path();
+    std::filesystem::path file = path / "test_settings_save_profile.json";
+
+    Settings srcSettings = {
+        .profile = "def"
+    };
+    saveSettings(srcSettings, file);
+
+    Settings cmpSettings = loadSettings(file);
+    CHECK(srcSettings == cmpSettings);
+}
+
+TEST_CASE("Settings Load: Profile Remember", "[settings]") {
+    constexpr std::string_view Source = R"(
+{
+    "version": 1,
+    "profile-remember": false
+}
+)";
+
+    std::filesystem::path path = std::filesystem::temp_directory_path();
+    std::filesystem::path file = path / "test_settings_load_profile_remember.json";
+    {
+        std::ofstream f(file);
+        f << Source;
+    }
+
+    Settings settings = loadSettings(file);
+
+    CHECK(!settings.hasStartedBefore.has_value());
+    CHECK(!settings.configuration.has_value());
+    CHECK(!settings.rememberLastConfiguration.has_value());
+    CHECK(!settings.profile.has_value());
+    REQUIRE(settings.rememberLastProfile.has_value());
+    CHECK(*settings.rememberLastProfile == false);
+    CHECK(!settings.visibility.has_value());
+    CHECK(!settings.bypassLauncher.has_value());
+    CHECK(!settings.mrf.isEnabled.has_value());
+    CHECK(!settings.mrf.location.has_value());
+}
+
+TEST_CASE("Settings Save: Profile Remember", "[settings]") {
+    std::filesystem::path path = std::filesystem::temp_directory_path();
+    std::filesystem::path file = path / "test_settings_save_profile.json";
+
+    Settings srcSettings = {
+        .rememberLastProfile = false
+    };
+    saveSettings(srcSettings, file);
+
+    Settings cmpSettings = loadSettings(file);
+    CHECK(srcSettings == cmpSettings);
+}
+
+TEST_CASE("Settings Load: Visibility/NoviceUser", "[settings]") {
+    constexpr std::string_view Source = R"(
+{
+    "version": 1,
+    "visibility": "NoviceUser"
+}
+)";
+
+    std::filesystem::path path = std::filesystem::temp_directory_path();
+    std::filesystem::path file = path / "test_settings_load_visibility_novice.json";
+    {
+        std::ofstream f(file);
+        f << Source;
+    }
+
+    Settings settings = loadSettings(file);
+
+    CHECK(!settings.hasStartedBefore.has_value());
+    CHECK(!settings.configuration.has_value());
+    CHECK(!settings.rememberLastConfiguration.has_value());
+    CHECK(!settings.profile.has_value());
+    CHECK(!settings.rememberLastProfile.has_value());
+    REQUIRE(settings.visibility.has_value());
+    CHECK(*settings.visibility == properties::Property::Visibility::NoviceUser);
+    CHECK(!settings.bypassLauncher.has_value());
+    CHECK(!settings.mrf.isEnabled.has_value());
+    CHECK(!settings.mrf.location.has_value());
+}
+
+TEST_CASE("Settings Save: Visibility/NoviceUser", "[settings]") {
+    std::filesystem::path path = std::filesystem::temp_directory_path();
+    std::filesystem::path file = path / "test_settings_save_noviceuser.json";
+
+    Settings srcSettings = {
+        .visibility = openspace::properties::Property::Visibility::NoviceUser
+    };
+    saveSettings(srcSettings, file);
+
+    Settings cmpSettings = loadSettings(file);
+    CHECK(srcSettings == cmpSettings);
+}
+
+TEST_CASE("Settings Load: Visibility/User", "[settings]") {
+    constexpr std::string_view Source = R"(
+{
+    "version": 1,
+    "visibility": "User"
+}
+)";
+
+    std::filesystem::path path = std::filesystem::temp_directory_path();
+    std::filesystem::path file = path / "test_settings_load_visibility_user.json";
+    {
+        std::ofstream f(file);
+        f << Source;
+    }
+
+    Settings settings = loadSettings(file);
+
+    CHECK(!settings.hasStartedBefore.has_value());
+    CHECK(!settings.configuration.has_value());
+    CHECK(!settings.rememberLastConfiguration.has_value());
+    CHECK(!settings.profile.has_value());
+    CHECK(!settings.rememberLastProfile.has_value());
+    REQUIRE(settings.visibility.has_value());
+    CHECK(*settings.visibility == properties::Property::Visibility::User);
+    CHECK(!settings.bypassLauncher.has_value());
+    CHECK(!settings.mrf.isEnabled.has_value());
+    CHECK(!settings.mrf.location.has_value());
+}
+
+TEST_CASE("Settings Save: Visibility/User", "[settings]") {
+    std::filesystem::path path = std::filesystem::temp_directory_path();
+    std::filesystem::path file = path / "test_settings_save_user.json";
+
+    Settings srcSettings = {
+        .visibility = openspace::properties::Property::Visibility::User
+    };
+    saveSettings(srcSettings, file);
+
+    Settings cmpSettings = loadSettings(file);
+    CHECK(srcSettings == cmpSettings);
+}
+
+TEST_CASE("Settings Load: Visibility/AdvancedUser", "[settings]") {
+    constexpr std::string_view Source = R"(
+{
+    "version": 1,
+    "visibility": "AdvancedUser"
+}
+)";
+
+    std::filesystem::path path = std::filesystem::temp_directory_path();
+    std::filesystem::path file = path / "test_settings_load_visibility_advanced.json";
+    {
+        std::ofstream f(file);
+        f << Source;
+    }
+
+    Settings settings = loadSettings(file);
+
+    CHECK(!settings.hasStartedBefore.has_value());
+    CHECK(!settings.configuration.has_value());
+    CHECK(!settings.rememberLastConfiguration.has_value());
+    CHECK(!settings.profile.has_value());
+    CHECK(!settings.rememberLastProfile.has_value());
+    REQUIRE(settings.visibility.has_value());
+    CHECK(*settings.visibility == properties::Property::Visibility::AdvancedUser);
+    CHECK(!settings.bypassLauncher.has_value());
+    CHECK(!settings.mrf.isEnabled.has_value());
+    CHECK(!settings.mrf.location.has_value());
+}
+
+TEST_CASE("Settings Save: Visibility/AdvancedUser", "[settings]") {
+    std::filesystem::path path = std::filesystem::temp_directory_path();
+    std::filesystem::path file = path / "test_settings_save_advanceduser.json";
+
+    Settings srcSettings = {
+        .visibility = openspace::properties::Property::Visibility::AdvancedUser
+    };
+    saveSettings(srcSettings, file);
+
+    Settings cmpSettings = loadSettings(file);
+    CHECK(srcSettings == cmpSettings);
+}
+
+TEST_CASE("Settings Load: Visibility/Developer", "[settings]") {
+    constexpr std::string_view Source = R"(
+{
+    "version": 1,
+    "visibility": "Developer"
+}
+)";
+
+    std::filesystem::path path = std::filesystem::temp_directory_path();
+    std::filesystem::path file = path / "test_settings_load_visibility_developer.json";
+    {
+        std::ofstream f(file);
+        f << Source;
+    }
+
+    Settings settings = loadSettings(file);
+
+    CHECK(!settings.hasStartedBefore.has_value());
+    CHECK(!settings.configuration.has_value());
+    CHECK(!settings.rememberLastConfiguration.has_value());
+    CHECK(!settings.profile.has_value());
+    CHECK(!settings.rememberLastProfile.has_value());
+    REQUIRE(settings.visibility.has_value());
+    CHECK(*settings.visibility == properties::Property::Visibility::Developer);
+    CHECK(!settings.bypassLauncher.has_value());
+    CHECK(!settings.mrf.isEnabled.has_value());
+    CHECK(!settings.mrf.location.has_value());
+}
+
+TEST_CASE("Settings Save: Visibility/Developer", "[settings]") {
+    std::filesystem::path path = std::filesystem::temp_directory_path();
+    std::filesystem::path file = path / "test_settings_save_developer.json";
+
+    Settings srcSettings = {
+        .visibility = openspace::properties::Property::Visibility::Developer
+    };
+    saveSettings(srcSettings, file);
+
+    Settings cmpSettings = loadSettings(file);
+    CHECK(srcSettings == cmpSettings);
+}
+
+TEST_CASE("Settings Load: Bypass Launcher", "[settings]") {
+    constexpr std::string_view Source = R"(
+{
+    "version": 1,
+    "bypass": false
+}
+)";
+
+    std::filesystem::path path = std::filesystem::temp_directory_path();
+    std::filesystem::path file = path / "test_settings_load_bypass.json";
+    {
+        std::ofstream f(file);
+        f << Source;
+    }
+
+    Settings settings = loadSettings(file);
+
+    CHECK(!settings.hasStartedBefore.has_value());
+    CHECK(!settings.configuration.has_value());
+    CHECK(!settings.rememberLastConfiguration.has_value());
+    CHECK(!settings.profile.has_value());
+    CHECK(!settings.rememberLastProfile.has_value());
+    CHECK(!settings.visibility.has_value());
+    REQUIRE(settings.bypassLauncher.has_value());
+    CHECK(*settings.bypassLauncher == false);
+    CHECK(!settings.mrf.isEnabled.has_value());
+    CHECK(!settings.mrf.location.has_value());
+}
+
+TEST_CASE("Settings Save: Bypass Launcher", "[settings]") {
+    std::filesystem::path path = std::filesystem::temp_directory_path();
+    std::filesystem::path file = path / "test_settings_save_bypass.json";
+
+    Settings srcSettings = {
+        .bypassLauncher = false
+    };
+    saveSettings(srcSettings, file);
+
+    Settings cmpSettings = loadSettings(file);
+    CHECK(srcSettings == cmpSettings);
+}
+
+TEST_CASE("Settings Load: MRF IsEnabled", "[settings]") {
+    constexpr std::string_view Source = R"(
+{
+    "version": 1,
+    "mrf": {
+        "enabled": true
+    }
+}
+)";
+
+    std::filesystem::path path = std::filesystem::temp_directory_path();
+    std::filesystem::path file = path / "test_settings_load_mrf_isenabled.json";
+    {
+        std::ofstream f(file);
+        f << Source;
+    }
+
+    Settings settings = loadSettings(file);
+
+    CHECK(!settings.hasStartedBefore.has_value());
+    CHECK(!settings.configuration.has_value());
+    CHECK(!settings.rememberLastConfiguration.has_value());
+    CHECK(!settings.profile.has_value());
+    CHECK(!settings.rememberLastProfile.has_value());
+    CHECK(!settings.visibility.has_value());
+    CHECK(!settings.bypassLauncher.has_value());
+    REQUIRE(settings.mrf.isEnabled.has_value());
+    CHECK(*settings.mrf.isEnabled == true);
+    CHECK(!settings.mrf.location.has_value());
+}
+
+TEST_CASE("Settings Save: MRF IsEnabled", "[settings]") {
+    std::filesystem::path path = std::filesystem::temp_directory_path();
+    std::filesystem::path file = path / "test_settings_save_mrf_isenabled.json";
+
+    Settings srcSettings = {
+        .mrf = Settings::MRF {
+            .isEnabled = true
+        }
+    };
+    saveSettings(srcSettings, file);
+
+    Settings cmpSettings = loadSettings(file);
+    CHECK(srcSettings == cmpSettings);
+}
+
+TEST_CASE("Settings Load: MRF Location", "[settings]") {
+    constexpr std::string_view Source = R"(
+{
+    "version": 1,
+    "mrf": {
+        "location": "ghi"
+    }
+}
+)";
+
+    std::filesystem::path path = std::filesystem::temp_directory_path();
+    std::filesystem::path file = path / "test_settings_load_mrf_location.json";
+    {
+        std::ofstream f(file);
+        f << Source;
+    }
+
+    Settings settings = loadSettings(file);
+
+    CHECK(!settings.hasStartedBefore.has_value());
+    CHECK(!settings.configuration.has_value());
+    CHECK(!settings.rememberLastConfiguration.has_value());
+    CHECK(!settings.profile.has_value());
+    CHECK(!settings.rememberLastProfile.has_value());
+    CHECK(!settings.visibility.has_value());
+    CHECK(!settings.bypassLauncher.has_value());
+    CHECK(!settings.mrf.isEnabled.has_value());
+    REQUIRE(settings.mrf.location.has_value());
+    CHECK(*settings.mrf.location == "ghi");
+}
+
+TEST_CASE("Settings Save: MRF Location", "[settings]") {
+    std::filesystem::path path = std::filesystem::temp_directory_path();
+    std::filesystem::path file = path / "test_settings_save_mrf_location.json";
+
+    Settings srcSettings = {
+        .mrf = Settings::MRF {
+            .location = "ghi"
+        }
+    };
+    saveSettings(srcSettings, file);
+
+    Settings cmpSettings = loadSettings(file);
+    CHECK(srcSettings == cmpSettings);
+}
+
+TEST_CASE("Settings Load: Full", "[settings]") {
+    constexpr std::string_view Source = R"(
+{
+    "version": 1,
+    "started-before": false,
+    "config": "abc",
+    "config-remember": true,
+    "profile": "def",
+    "profile-remember": false,
+    "visibility": "NoviceUser",
+    "bypass": false,
+    "mrf": {
+        "enabled": true,
+        "location": "ghi"
+    }
+}
+)";
+
+    std::filesystem::path path = std::filesystem::temp_directory_path();
+    std::filesystem::path file = path / "test_settings_load_full.json";
+    {
+        std::ofstream f(file);
+        f << Source;
+    }
+
+    Settings settings = loadSettings(file);
+
+    REQUIRE(settings.hasStartedBefore.has_value());
+    CHECK(*settings.hasStartedBefore == false);
+    REQUIRE(settings.configuration.has_value());
+    CHECK(*settings.configuration == "abc");
+    REQUIRE(settings.rememberLastConfiguration.has_value());
+    CHECK(*settings.rememberLastConfiguration == true);
+    REQUIRE(settings.profile.has_value());
+    CHECK(*settings.profile == "def");
+    REQUIRE(settings.rememberLastProfile.has_value());
+    CHECK(*settings.rememberLastProfile == false);
+    REQUIRE(settings.visibility.has_value());
+    CHECK(*settings.visibility == properties::Property::Visibility::NoviceUser);
+    REQUIRE(settings.bypassLauncher.has_value());
+    CHECK(*settings.bypassLauncher == false);
+    REQUIRE(settings.mrf.isEnabled.has_value());
+    CHECK(*settings.mrf.isEnabled == true);
+    REQUIRE(settings.mrf.location.has_value());
+    CHECK(*settings.mrf.location == "ghi");
+}
+
+TEST_CASE("Settings Save: Full", "[settings]") {
+    std::filesystem::path path = std::filesystem::temp_directory_path();
+    std::filesystem::path file = path / "test_settings_save_full.json";
+
+    Settings srcSettings = {
+        .hasStartedBefore = false,
+        .configuration = "abc",
+        .rememberLastConfiguration = true,
+        .profile = "def",
+        .rememberLastProfile = false,
+        .visibility = openspace::properties::Property::Visibility::NoviceUser,
+        .bypassLauncher = false,
+        .mrf = Settings::MRF {
+            .isEnabled = true,
+            .location = "ghi"
+        }
+    };
+    saveSettings(srcSettings, file);
+
+    Settings cmpSettings = loadSettings(file);
+    CHECK(srcSettings == cmpSettings);
+}
+
+TEST_CASE("Settings Load Fail: Illegal version", "[settings]") {
+    constexpr std::string_view Source = R"(
+{
+    "version": -1
+}
+)";
+
+    std::filesystem::path path = std::filesystem::temp_directory_path();
+    std::filesystem::path file = path / "test_settings_load_fail_illegal_version.json";
+    {
+        std::ofstream f(file);
+        f << Source;
+    }
+
+    CHECK_THROWS(loadSettings(file));
+}
+
+TEST_CASE("Settings Load Fail: Started before", "[settings]") {
+    constexpr std::string_view Source = R"(
+{
+    "version": 1,
+    "started-before": "abc"
+}
+)";
+
+    std::filesystem::path path = std::filesystem::temp_directory_path();
+    std::filesystem::path file = path / "test_settings_load_fail_started-before.json";
+    {
+        std::ofstream f(file);
+        f << Source;
+    }
+
+    CHECK_THROWS(loadSettings(file));
+}
+
+TEST_CASE("Settings Load Fail: Config", "[settings]") {
+    constexpr std::string_view Source = R"(
+{
+    "version": 1,
+    "config": 1
+}
+)";
+
+    std::filesystem::path path = std::filesystem::temp_directory_path();
+    std::filesystem::path file = path / "test_settings_load_fail_config.json";
+    {
+        std::ofstream f(file);
+        f << Source;
+    }
+
+    CHECK_THROWS(loadSettings(file));
+}
+
+TEST_CASE("Settings Load Fail: Profile", "[settings]") {
+    constexpr std::string_view Source = R"(
+{
+    "version": 1,
+    "profile": 1
+}
+)";
+
+    std::filesystem::path path = std::filesystem::temp_directory_path();
+    std::filesystem::path file = path / "test_settings_load_fail_profile.json";
+    {
+        std::ofstream f(file);
+        f << Source;
+    }
+
+    CHECK_THROWS(loadSettings(file));
+}
+
+TEST_CASE("Settings Load Fail: Visibility type", "[settings]") {
+    constexpr std::string_view Source = R"(
+{
+    "version": 1,
+    "visibility": 1
+}
+)";
+
+    std::filesystem::path path = std::filesystem::temp_directory_path();
+    std::filesystem::path file = path / "test_settings_load_fail_visibility_type.json";
+    {
+        std::ofstream f(file);
+        f << Source;
+    }
+
+    CHECK_THROWS(loadSettings(file));
+}
+
+TEST_CASE("Settings Load Fail: Visibility value", "[settings]") {
+    constexpr std::string_view Source = R"(
+{
+    "version": 1,
+    "visibility": "abc"
+}
+)";
+
+    std::filesystem::path path = std::filesystem::temp_directory_path();
+    std::filesystem::path file = path / "test_settings_load_fail_visibility_value.json";
+    {
+        std::ofstream f(file);
+        f << Source;
+    }
+
+    CHECK_THROWS(loadSettings(file));
+}
+
+TEST_CASE("Settings Load Fail: Bypass Launcher", "[settings]") {
+    constexpr std::string_view Source = R"(
+{
+    "version": 1,
+    "bypass": 1
+}
+)";
+
+    std::filesystem::path path = std::filesystem::temp_directory_path();
+    std::filesystem::path file = path / "test_settings_load_fail_bypass.json";
+    {
+        std::ofstream f(file);
+        f << Source;
+    }
+
+    CHECK_THROWS(loadSettings(file));
+}
+
+TEST_CASE("Settings Load Fail: MRF", "[settings]") {
+    constexpr std::string_view Source = R"(
+{
+    "version": 1,
+    "mrf": 1
+}
+)";
+
+    std::filesystem::path path = std::filesystem::temp_directory_path();
+    std::filesystem::path file = path / "test_settings_load_fail_mrf.json";
+    {
+        std::ofstream f(file);
+        f << Source;
+    }
+
+    CHECK_THROWS(loadSettings(file));
+}
+
+TEST_CASE("Settings Load Fail: MRF/enabled", "[settings]") {
+    constexpr std::string_view Source = R"(
+{
+    "version": 1,
+    "mrf": {
+        "enabled": 1
+    }
+}
+)";
+
+    std::filesystem::path path = std::filesystem::temp_directory_path();
+    std::filesystem::path file = path / "test_settings_load_fail_mrf_enabled.json";
+    {
+        std::ofstream f(file);
+        f << Source;
+    }
+
+    CHECK_THROWS(loadSettings(file));
+}
+
+TEST_CASE("Settings Load Fail: MRF/location", "[settings]") {
+    constexpr std::string_view Source = R"(
+{
+    "version": 1,
+    "mrf": {
+        "location": 1
+    }
+}
+)";
+
+    std::filesystem::path path = std::filesystem::temp_directory_path();
+    std::filesystem::path file = path / "test_settings_load_fail_mrf_location.json";
+    {
+        std::ofstream f(file);
+        f << Source;
+    }
+
+    CHECK_THROWS(loadSettings(file));
+}
diff --git a/tests/test_sgctedit.cpp b/tests/test_sgctedit.cpp
index ea224bf9c0..bca8b65e8d 100644
--- a/tests/test_sgctedit.cpp
+++ b/tests/test_sgctedit.cpp
@@ -34,7 +34,7 @@
 #include <filesystem>
 #include <fstream>
 
-using namespace openspace::configuration;
+using namespace openspace;
 
 namespace {
     std::string stringify(const std::string filename) {

From 098cced1e735728df6b21f309a836719c4057dac Mon Sep 17 00:00:00 2001
From: Alexander Bock <alexander.bock@liu.se>
Date: Mon, 13 Nov 2023 10:17:22 +0100
Subject: [PATCH 166/701] Undo accidental removal of UI code

---
 openspace.cfg | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/openspace.cfg b/openspace.cfg
index 29ad549d1e..9d39a87a04 100644
--- a/openspace.cfg
+++ b/openspace.cfg
@@ -161,11 +161,19 @@ ModuleConfigurations = {
             }
         }
     },
+    WebBrowser = {
+        Enabled = true
+    },
     WebGui = {
         Address = "localhost",
         HttpPort = 4680,
         WebSocketInterface = "DefaultWebSocketInterface"
     },
+    CefWebGui = {
+        -- GuiScale = 2.0,
+        Enabled = true,
+        Visible = true
+    },
     Space = {
         ShowExceptions = false
     }

From 72bb6d3cc48141c5be43cf768a143efb2df8e9f0 Mon Sep 17 00:00:00 2001
From: Emma Broman <emma.broman@liu.se>
Date: Mon, 13 Nov 2023 15:32:11 +0100
Subject: [PATCH 167/701] Update GUI hash

- Rewrite final classes to functional https://github.com/OpenSpace/OpenSpace-WebGuiFrontend/commit/8c0740c66e41742d7b7636b98e7591d9b7ab32a1
- Fix some things that broke wiht that rewrite
- Update dependencies
- Fix for issue #2893
---
 data/assets/util/webgui.asset | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/data/assets/util/webgui.asset b/data/assets/util/webgui.asset
index 35f0e17cd4..49068e90d9 100644
--- a/data/assets/util/webgui.asset
+++ b/data/assets/util/webgui.asset
@@ -4,7 +4,7 @@ local guiCustomization = asset.require("customization/gui")
 
 
 -- Select which commit hashes to use for the frontend and backend
-local frontendHash = "c4fccbef3051522c7b8bcd96aeb20b8126ac2286"
+local frontendHash = "061fc129f72a145e8f8182b32113188b13722e67"
 
 local frontend = asset.resource({
   Identifier = "WebGuiFrontend",

From c54e72136da59fdd6d7afd723a245cd2356aba09 Mon Sep 17 00:00:00 2001
From: Emma Broman <emma.broman@liu.se>
Date: Mon, 13 Nov 2023 16:08:17 +0100
Subject: [PATCH 168/701] Update GUI hash again (closes #2908)

---
 data/assets/util/webgui.asset | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/data/assets/util/webgui.asset b/data/assets/util/webgui.asset
index 49068e90d9..2059d900f5 100644
--- a/data/assets/util/webgui.asset
+++ b/data/assets/util/webgui.asset
@@ -4,7 +4,7 @@ local guiCustomization = asset.require("customization/gui")
 
 
 -- Select which commit hashes to use for the frontend and backend
-local frontendHash = "061fc129f72a145e8f8182b32113188b13722e67"
+local frontendHash = "26e709be4e4b17d7fcdbd8f53cf681f4f4126b29"
 
 local frontend = asset.resource({
   Identifier = "WebGuiFrontend",

From 9343c6315dabab2cf17a4ceafd8af02a6e52573d Mon Sep 17 00:00:00 2001
From: Andreas Engberg <48772850+engbergandreas@users.noreply.github.com>
Date: Tue, 14 Nov 2023 15:40:30 +0100
Subject: [PATCH 169/701] Adds warning and error messages on loading screen
 (#2941)

Fixes task 1 of (#494)

* Removed loading screen progress bar

It was removed because it does not show an accurate estimation of load times and is rarely used (off by default)

* Add status info to the loading screen on warnings and errors

Add: Warning logs and above to loading screen, fixes task 1 of (#494)
Removed code duplication in openspanceengine.cpp
Fixed some bugs where completed assets would not disappear from the screen

* Update the design & address PR comments

* Address PR comments & add bool to show/hide log msg

* Delete test_configuration.cpp

* Update Ghoul submodule

* Renders number of warnings and errors to screen

* Update renderengine.cpp

* Adapt new function to the coding style

---------

Co-authored-by: Alexander Bock <mail@alexanderbock.eu>
---
 ext/ghoul                                   |   2 +-
 include/openspace/engine/configuration.h    |   2 +-
 include/openspace/rendering/loadingscreen.h |  24 +-
 openspace.cfg                               |   3 +-
 src/engine/configuration.cpp                |  10 +-
 src/engine/openspaceengine.cpp              |  94 +++-----
 src/rendering/loadingscreen.cpp             | 232 +++++++++++---------
 src/rendering/renderengine.cpp              |  16 +-
 src/scene/sceneinitializer.cpp              |   1 -
 9 files changed, 192 insertions(+), 192 deletions(-)

diff --git a/ext/ghoul b/ext/ghoul
index f658ead151..50cf606576 160000
--- a/ext/ghoul
+++ b/ext/ghoul
@@ -1 +1 @@
-Subproject commit f658ead151995fe77830b43b6559f95b6eaa2981
+Subproject commit 50cf6065769420d36c07dad0c9c5a7f60cfa7bd6
diff --git a/include/openspace/engine/configuration.h b/include/openspace/engine/configuration.h
index 20232bf756..9d7a64c433 100644
--- a/include/openspace/engine/configuration.h
+++ b/include/openspace/engine/configuration.h
@@ -88,7 +88,7 @@ struct Configuration {
     struct LoadingScreen {
         bool isShowingMessages = true;
         bool isShowingNodeNames = true;
-        bool isShowingProgressbar = true;
+        bool isShowingLogMessages = true;
     };
     LoadingScreen loadingScreen;
 
diff --git a/include/openspace/rendering/loadingscreen.h b/include/openspace/rendering/loadingscreen.h
index 0dec3d3986..dc3049ce8e 100644
--- a/include/openspace/rendering/loadingscreen.h
+++ b/include/openspace/rendering/loadingscreen.h
@@ -25,6 +25,7 @@
 #ifndef __OPENSPACE_CORE___LOADINGSCREEN___H__
 #define __OPENSPACE_CORE___LOADINGSCREEN___H__
 
+#include <openspace/util/screenlog.h>
 #include <ghoul/glm.h>
 #include <ghoul/misc/boolean.h>
 #include <ghoul/opengl/ghoul_gl.h>
@@ -49,11 +50,11 @@ class LoadingScreen {
 public:
     BooleanType(ShowMessage);
     BooleanType(ShowNodeNames);
-    BooleanType(ShowProgressbar);
+    BooleanType(ShowLogMessages);
     BooleanType(CatastrophicError);
 
     LoadingScreen(ShowMessage showMessage, ShowNodeNames showNodeNames,
-        ShowProgressbar showProgressbar);
+        ShowLogMessages showLogMessages);
     ~LoadingScreen();
 
     void render();
@@ -63,10 +64,6 @@ public:
 
     void finalize();
 
-    void setItemNumber(int nItems);
-    int itemNumber();
-    void tickItem();
-
     enum class Phase {
         PreStart,
         Construction,
@@ -94,19 +91,21 @@ public:
         ItemStatus newStatus, ProgressInfo progressInfo);
 
 private:
-    bool _showMessage;
-    bool _showNodeNames;
-    bool _showProgressbar;
+
+    void renderLogMessages() const;
+
+    bool _showMessage = true;
+    bool _showNodeNames = true;
+    bool _showLog = true;
 
     Phase _phase = Phase::PreStart;
-    std::atomic_int _iProgress = 0;
-    std::atomic_int _nItems = 0;
 
     std::unique_ptr<ghoul::opengl::Texture> _logoTexture;
 
     std::shared_ptr<ghoul::fontrendering::Font> _loadingFont;
     std::shared_ptr<ghoul::fontrendering::Font> _messageFont;
     std::shared_ptr<ghoul::fontrendering::Font> _itemFont;
+    std::shared_ptr<ghoul::fontrendering::Font> _logFont;
 
     bool _hasCatastrophicErrorOccurred = false;
     std::string _message;
@@ -130,6 +129,9 @@ private:
 
     std::random_device _randomDevice;
     std::default_random_engine _randomEngine;
+
+    // Non owning but we remove the log from LogManager on destruction
+    ScreenLog* _log = nullptr;
 };
 
 } // namespace openspace
diff --git a/openspace.cfg b/openspace.cfg
index 9d39a87a04..987762dc5f 100644
--- a/openspace.cfg
+++ b/openspace.cfg
@@ -217,8 +217,7 @@ VersionCheckUrl = "http://data.openspaceproject.com/latest-version"
 UseMultithreadedInitialization = true
 LoadingScreen = {
     ShowMessage = true,
-    ShowNodeNames = true,
-    ShowProgressbar = false
+    ShowNodeNames = true
 }
 CheckOpenGLState = false
 LogEachOpenGLCall = false
diff --git a/src/engine/configuration.cpp b/src/engine/configuration.cpp
index 780a4298c6..d33f041821 100644
--- a/src/engine/configuration.cpp
+++ b/src/engine/configuration.cpp
@@ -297,9 +297,9 @@ namespace {
             // initialized)
             std::optional<bool> showNodeNames;
 
-            // If this value is set to 'true', the loading screen will contain a progress
-            // bar that gives an estimate of the loading progression
-            std::optional<bool> showProgressbar;
+            // If this value is set to 'true', the loading screen will display a list of
+            // warning and error messages
+            std::optional<bool> showLogMessages;
         };
         // Values in this table describe the behavior of the loading screen that is
         // displayed while the scene graph is created and initialized
@@ -413,10 +413,10 @@ void parseLuaState(Configuration& configuration) {
         const Parameters::LoadingScreen& l = *p.loadingScreen;
         c.loadingScreen.isShowingMessages =
             l.showMessage.value_or(c.loadingScreen.isShowingMessages);
-        c.loadingScreen.isShowingProgressbar =
-            l.showProgressbar.value_or(c.loadingScreen.isShowingProgressbar);
         c.loadingScreen.isShowingNodeNames =
             l.showNodeNames.value_or(c.loadingScreen.isShowingNodeNames);
+        c.loadingScreen.isShowingLogMessages =
+            l.showLogMessages.value_or(c.loadingScreen.isShowingLogMessages);
     }
 
     c.moduleConfigurations = p.moduleConfigurations.value_or(c.moduleConfigurations);
diff --git a/src/engine/openspaceengine.cpp b/src/engine/openspaceengine.cpp
index c273cf3bcc..0d79e58b38 100644
--- a/src/engine/openspaceengine.cpp
+++ b/src/engine/openspaceengine.cpp
@@ -62,6 +62,7 @@
 #include <openspace/scripting/scriptengine.h>
 #include <openspace/util/factorymanager.h>
 #include <openspace/util/memorymanager.h>
+#include <openspace/util/screenlog.h>
 #include <openspace/util/spicemanager.h>
 #include <openspace/util/timemanager.h>
 #include <openspace/util/transformationmanager.h>
@@ -477,17 +478,13 @@ void OpenSpaceEngine::initializeGL() {
         LoadingScreen::ShowNodeNames(
             global::configuration->loadingScreen.isShowingNodeNames
         ),
-        LoadingScreen::ShowProgressbar(
-            global::configuration->loadingScreen.isShowingProgressbar
+        LoadingScreen::ShowLogMessages(
+            global::configuration->loadingScreen.isShowingLogMessages
         )
-        );
+    );
 
     _loadingScreen->render();
 
-
-
-
-
     LTRACE("OpenSpaceEngine::initializeGL::Console::initialize(begin)");
     try {
         global::luaConsole->initialize();
@@ -743,6 +740,8 @@ void OpenSpaceEngine::loadAssets() {
     _loadingScreen->setPhase(LoadingScreen::Phase::Construction);
     _loadingScreen->postMessage("Loading assets");
 
+    std::unordered_set<const ResourceSynchronization*> finishedSynchronizations;
+
     while (true) {
         _loadingScreen->render();
         _assetManager->update();
@@ -752,59 +751,20 @@ void OpenSpaceEngine::loadAssets() {
         std::vector<const ResourceSynchronization*> allSyncs =
             _assetManager->allSynchronizations();
 
-        for (const ResourceSynchronization* sync : allSyncs) {
-            ZoneScopedN("Update resource synchronization");
-
-            if (sync->isSyncing()) {
-                LoadingScreen::ProgressInfo progressInfo;
-
-                progressInfo.progress = [](const ResourceSynchronization* s) {
-                    if (!s->nTotalBytesIsKnown()) {
-                        return 0.f;
-                    }
-                    if (s->nTotalBytes() == 0) {
-                        return 1.f;
-                    }
-                    return
-                        static_cast<float>(s->nSynchronizedBytes()) /
-                        static_cast<float>(s->nTotalBytes());
-                }(sync);
-
-                _loadingScreen->updateItem(
-                    sync->identifier(),
-                    sync->name(),
-                    LoadingScreen::ItemStatus::Started,
-                    progressInfo
-                );
+        // Filter already synchronized assets so we don't check them anymore
+        auto syncIt = std::remove_if(
+            allSyncs.begin(),
+            allSyncs.end(),
+            [&finishedSynchronizations](const ResourceSynchronization* sync) {
+                return finishedSynchronizations.contains(sync);
             }
-
-            if (sync->isRejected()) {
-                _loadingScreen->updateItem(
-                    sync->identifier(), sync->name(), LoadingScreen::ItemStatus::Failed,
-                    LoadingScreen::ProgressInfo()
-                );
-            }
-        }
-
-        _loadingScreen->setItemNumber(static_cast<int>(allSyncs.size()));
-
-        if (_shouldAbortLoading) {
-            global::windowDelegate->terminate();
-            break;
-        }
-
-        bool finishedLoading = std::all_of(
-            allAssets.begin(),
-            allAssets.end(),
-            [](const Asset* asset) { return asset->isInitialized() || asset->isFailed(); }
         );
-
-        if (finishedLoading) {
-            break;
-        }
+        allSyncs.erase(syncIt, allSyncs.end());
 
         auto it = allSyncs.begin();
         while (it != allSyncs.end()) {
+            ZoneScopedN("Update resource synchronization");
+
             if ((*it)->isSyncing()) {
                 LoadingScreen::ProgressInfo progressInfo;
 
@@ -835,7 +795,9 @@ void OpenSpaceEngine::loadAssets() {
             }
             else if ((*it)->isRejected()) {
                 _loadingScreen->updateItem(
-                    (*it)->identifier(), (*it)->name(), LoadingScreen::ItemStatus::Failed,
+                    (*it)->identifier(),
+                    (*it)->name(),
+                    LoadingScreen::ItemStatus::Failed,
                     LoadingScreen::ProgressInfo()
                 );
                 ++it;
@@ -844,17 +806,33 @@ void OpenSpaceEngine::loadAssets() {
                 LoadingScreen::ProgressInfo progressInfo;
                 progressInfo.progress = 1.f;
 
-                _loadingScreen->tickItem();
                 _loadingScreen->updateItem(
                     (*it)->identifier(),
                     (*it)->name(),
                     LoadingScreen::ItemStatus::Finished,
                     progressInfo
                 );
+                finishedSynchronizations.insert(*it);
                 it = allSyncs.erase(it);
             }
         }
-    }
+       
+        if (_shouldAbortLoading) {
+            global::windowDelegate->terminate();
+            break;
+        }
+
+        bool finishedLoading = std::all_of(
+            allAssets.begin(),
+            allAssets.end(),
+            [](const Asset* asset) { return asset->isInitialized() || asset->isFailed(); }
+        );
+
+        if (finishedLoading) {
+            break;
+        }        
+    } // while(true)
+
     if (_shouldAbortLoading) {
         _loadingScreen = nullptr;
         return;
diff --git a/src/rendering/loadingscreen.cpp b/src/rendering/loadingscreen.cpp
index ba8672113f..a50aed0e92 100644
--- a/src/rendering/loadingscreen.cpp
+++ b/src/rendering/loadingscreen.cpp
@@ -47,16 +47,11 @@ namespace {
     constexpr float LoadingFontSize = 25.f;
     constexpr float MessageFontSize = 22.f;
     constexpr float ItemFontSize = 10.f;
+    constexpr float LogFontSize = 10.f;
 
     constexpr glm::vec2 LogoCenter = glm::vec2(0.f, 0.525f);  // in NDC
     constexpr glm::vec2 LogoSize = glm::vec2(0.275f, 0.275);  // in NDC
 
-    constexpr glm::vec2 ProgressbarCenter = glm::vec2(0.f, -0.75f);  // in NDC
-    constexpr glm::vec2 ProgressbarSize = glm::vec2(0.7f, 0.0075f);  // in NDC
-    constexpr float ProgressbarLineWidth = 0.0025f;  // in NDC
-
-    constexpr glm::vec4 ProgressbarOutlineColor = glm::vec4(0.9f, 0.9f, 0.9f, 1.f);
-
     constexpr glm::vec4 PhaseColorConstruction = glm::vec4(0.7f, 0.7f, 0.f, 1.f);
     constexpr glm::vec4 PhaseColorSynchronization = glm::vec4(0.9f, 0.9f, 0.9f, 1.f);
     constexpr glm::vec4 PhaseColorInitialization = glm::vec4(0.1f, 0.75f, 0.1f, 1.f);
@@ -70,6 +65,7 @@ namespace {
 
     constexpr float LoadingTextPosition = 0.275f;  // in NDC
     constexpr float StatusMessageOffset = 0.225f;  // in NDC
+    constexpr float LogBackgroundPosition = 0.125f; // in NDC
 
     constexpr int MaxNumberLocationSamples = 1000;
 
@@ -103,15 +99,25 @@ namespace {
 namespace openspace {
 
 LoadingScreen::LoadingScreen(ShowMessage showMessage, ShowNodeNames showNodeNames,
-                             ShowProgressbar showProgressbar)
+                             ShowLogMessages showLogMessages)
     : _showMessage(showMessage)
     , _showNodeNames(showNodeNames)
-    , _showProgressbar(showProgressbar)
+    , _showLog(showLogMessages)
     , _randomEngine(_randomDevice())
 {
+    constexpr std::chrono::seconds ScreenLogTimeToLive(20);
+    std::unique_ptr<ScreenLog> log = std::make_unique<ScreenLog>(
+        ScreenLogTimeToLive,
+        ScreenLog::LogLevel::Warning
+    );
+    _log = log.get();
+    ghoul::logging::LogManager::ref().addLog(std::move(log));
+
+    const float fontScaling = global::windowDelegate->osDpiScaling();
+
     _loadingFont = global::fontManager->font(
         "Loading",
-        LoadingFontSize,
+        LoadingFontSize * fontScaling,
         ghoul::fontrendering::FontManager::Outline::No,
         ghoul::fontrendering::FontManager::LoadGlyphs::No
     );
@@ -119,7 +125,7 @@ LoadingScreen::LoadingScreen(ShowMessage showMessage, ShowNodeNames showNodeName
     if (_showMessage) {
         _messageFont = global::fontManager->font(
             "Loading",
-            MessageFontSize,
+            MessageFontSize * fontScaling,
             ghoul::fontrendering::FontManager::Outline::No,
             ghoul::fontrendering::FontManager::LoadGlyphs::No
         );
@@ -128,7 +134,16 @@ LoadingScreen::LoadingScreen(ShowMessage showMessage, ShowNodeNames showNodeName
     if (_showNodeNames) {
         _itemFont = global::fontManager->font(
             "Loading",
-            ItemFontSize,
+            ItemFontSize * fontScaling,
+            ghoul::fontrendering::FontManager::Outline::No,
+            ghoul::fontrendering::FontManager::LoadGlyphs::No
+        );
+    }
+
+    if (_showLog) {
+        _logFont = global::fontManager->font(
+            "Loading",
+            LogFontSize * fontScaling,
             ghoul::fontrendering::FontManager::Outline::No,
             ghoul::fontrendering::FontManager::LoadGlyphs::No
         );
@@ -150,6 +165,8 @@ LoadingScreen::~LoadingScreen() {
     _loadingFont = nullptr;
     _messageFont = nullptr;
     _itemFont = nullptr;
+    ghoul::logging::LogManager::ref().removeLog(_log);
+    _log = nullptr;
 }
 
 void LoadingScreen::render() {
@@ -201,59 +218,6 @@ void LoadingScreen::render() {
         rendering::helper::Anchor::Center
     );
 
-    //
-    // Render progress bar
-    //
-    const glm::vec2 progressbarSize = glm::vec2(
-        ProgressbarSize.x,
-        ProgressbarSize.y * screenAspectRatio
-    );
-
-    if (_showProgressbar) {
-        const float progress = _nItems != 0 ?
-            static_cast<float>(_iProgress) / static_cast<float>(_nItems) :
-            0.f;
-
-        const float w = ProgressbarLineWidth / screenAspectRatio;
-        const float h = ProgressbarLineWidth;
-        rendering::helper::renderBox(
-            glm::vec2(1.f) - ((ProgressbarCenter + glm::vec2(1.f)) / 2.f),
-            progressbarSize + glm::vec2(2 * w, 2 * h),
-            ProgressbarOutlineColor,
-            rendering::helper::Anchor::Center
-        );
-
-        rendering::helper::renderBox(
-            glm::vec2(1.f) - ((ProgressbarCenter + glm::vec2(1.f)) / 2.f),
-            progressbarSize,
-            glm::vec4(0.f, 0.f, 0.f, 1.f),
-            rendering::helper::Anchor::Center
-        );
-
-        glm::vec4 color = glm::vec4(0.f);
-        switch (_phase) {
-            case Phase::PreStart:
-                break;
-            case Phase::Construction:
-                color = PhaseColorConstruction;
-                break;
-            case Phase::Synchronization:
-                color = PhaseColorSynchronization;
-                break;
-            case Phase::Initialization:
-                color = PhaseColorInitialization;
-                break;
-        }
-
-        glm::vec2 p = glm::vec2(1.f) - ((ProgressbarCenter + glm::vec2(1.f)) / 2.f);
-        rendering::helper::renderBox(
-            p - progressbarSize / 2.f,
-            progressbarSize * glm::vec2(progress, 1.f),
-            color,
-            rendering::helper::Anchor::NW
-        );
-    }
-
     //
     // "Loading" text
     //
@@ -295,6 +259,21 @@ void LoadingScreen::render() {
         renderer.render(*_messageFont, messageLl, _message);
     }
 
+    glm::vec2 logLl = glm::vec2(0.f, 0.f);
+    glm::vec2 logUr = glm::vec2(res.x, res.y * (LogBackgroundPosition + 0.015));
+
+    // Font rendering enables depth testing so we disable again to render the log box
+    glDisable(GL_DEPTH_TEST);
+    if (_showLog) {
+        constexpr glm::vec4 DarkGray = glm::vec4(glm::vec3(0.04f), 1.f);
+        rendering::helper::renderBox(
+            glm::vec2(0.f, 1.f),
+            glm::vec2(1.f, LogBackgroundPosition),
+            DarkGray,
+            rendering::helper::Anchor::SW
+        );
+    }
+
     if (_showNodeNames) {
         std::lock_guard guard(_itemsMutex);
 
@@ -303,15 +282,6 @@ void LoadingScreen::render() {
         const glm::vec2 logoLl = glm::vec2(LogoCenter.x - size.x,  LogoCenter.y - size.y);
         const glm::vec2 logoUr = glm::vec2(LogoCenter.x + size.x,  LogoCenter.y + size.y);
 
-        const glm::vec2 progressbarLl = glm::vec2(
-            ProgressbarCenter.x - progressbarSize.x,
-            ProgressbarCenter.y - progressbarSize.y
-        );
-        const glm::vec2 progressbarUr = glm::vec2(
-            ProgressbarCenter.x + progressbarSize.x ,
-            ProgressbarCenter.y + progressbarSize.y
-        );
-
         for (Item& item : _items) {
             if (!item.hasLocation) {
                 // Compute a new location
@@ -351,16 +321,12 @@ void LoadingScreen::render() {
                         rectOverlaps(messageLl, messageUr, ll, ur) :
                         false;
 
-                    const bool barOverlap = _showProgressbar ?
-                        rectOverlaps(
-                            ndcToScreen(progressbarLl, res),
-                            ndcToScreen(progressbarUr, res),
-                            ll,
-                            ur
-                        ) :
-                        false;
+                    const bool logOverlap = rectOverlaps(
+                        logLl, logUr,
+                        ll, ur
+                    );
 
-                    if (logoOverlap || loadingOverlap || messageOverlap || barOverlap) {
+                    if (logoOverlap || loadingOverlap || messageOverlap || logOverlap) {
                         // We never want to have an overlap with these, so this try didn't
                         // count against the maximum, thus ensuring that (if there has to
                         // be an overlap, it's over other text that might disappear before
@@ -462,7 +428,7 @@ void LoadingScreen::render() {
                 _items.end(),
                 [now](const Item& i) {
                     if (i.status == ItemStatus::Finished) {
-                        return i.finishedTime > now + TTL;
+                        return (i.finishedTime + TTL) < now;
                     }
                     else {
                         return false;
@@ -474,6 +440,11 @@ void LoadingScreen::render() {
 
     }
 
+    // Render log messages last to make them slightly more visible if a download item
+    // is slightly overlapping
+    if (_showLog) {
+        renderLogMessages();
+    }
     glEnable(GL_CULL_FACE);
     glEnable(GL_DEPTH_TEST);
 
@@ -482,6 +453,82 @@ void LoadingScreen::render() {
     FrameMarkEnd("Loading");
 }
 
+void LoadingScreen::renderLogMessages() const {
+    ZoneScoped;
+
+    constexpr size_t MaxNumberMessages = 6;
+    constexpr int MessageLength = 209;
+
+    using FR = ghoul::fontrendering::FontRenderer;
+    const FR& renderer = FR::defaultRenderer();
+
+    const std::vector<ScreenLog::LogEntry>& entries = _log->entries();
+
+    size_t nRows = 0;
+    size_t j = std::min(MaxNumberMessages, entries.size());
+    for (size_t i = 1; i <= j; i++) {
+        ZoneScopedN("Entry");
+
+        // Show only the j:th first log entries
+        const ScreenLog::LogEntry& it = entries[j - i];
+
+        std::ostringstream result;
+        // Split really long messages into multiple lines for better readability
+        if (it.message.size() > MessageLength) {
+            std::istringstream is(it.message);
+
+            int charactersSinceNewLine = 0;
+            std::string word;
+            while (is >> word) {
+                charactersSinceNewLine += static_cast<int>(word.size());
+                // Insert a new line when we exceede messageLength
+                if (charactersSinceNewLine > MessageLength) {
+                    result << '\n';
+                    charactersSinceNewLine = static_cast<int>(word.size());
+                    ++nRows;
+                }
+                result << word << ' ';
+                ++charactersSinceNewLine;
+            }
+        }
+
+        renderer.render(
+            *_logFont,
+            glm::vec2(
+                10,
+                10 + _logFont->pointSize() * nRows * 2
+            ),
+            it.message.size() < MessageLength ? it.message : result.str(),
+            ghoul::toColor(it.level)
+        );
+        ++nRows;
+    }
+
+    const glm::vec2 dpiScaling = global::windowDelegate->dpiScaling();
+    const glm::ivec2 res =
+        glm::vec2(global::windowDelegate->firstWindowResolution()) * dpiScaling;
+
+    // Render # of warnings and error messages
+    std::map<ghoul::logging::LogLevel, size_t> numberOfErrorsPerLevel;
+    for (auto& entry : _log->entries()) {
+        numberOfErrorsPerLevel[entry.level]++;
+    }
+    size_t row = 0;
+    for (auto& [level, amount] : numberOfErrorsPerLevel) {
+        const std::string text = fmt::format("{}: {}", ghoul::to_string(level), amount);
+        renderer.render(
+            *_logFont,
+            glm::vec2(
+                res.x - 0.07 * res.x,
+                10 + _logFont->pointSize() * row * 2
+            ),
+            text,
+            ghoul::toColor(level)
+        );
+        ++row;
+    }
+}
+
 void LoadingScreen::postMessage(std::string message) {
     std::lock_guard guard(_messageMutex);
     _message = std::move(message);
@@ -502,26 +549,13 @@ void LoadingScreen::finalize() {
         ),
         _items.end()
     );
-
+    _log->removeExpiredEntries();
+    _showLog = _showLog && !_log->entries().empty();
     render();
 }
 
-
-void LoadingScreen::setItemNumber(int nItems) {
-    _nItems = nItems;
-}
-
-int LoadingScreen::itemNumber() {
-    return _nItems;
-}
-
-void LoadingScreen::tickItem() {
-    ++_iProgress;
-}
-
 void LoadingScreen::setPhase(Phase phase) {
     _phase = phase;
-    _iProgress = 0;
 }
 
 void LoadingScreen::updateItem(const std::string& itemIdentifier,
@@ -555,7 +589,7 @@ void LoadingScreen::updateItem(const std::string& itemIdentifier,
         Item item = {
             .identifier = itemIdentifier,
             .name = itemName,
-            .status = ItemStatus::Started,
+            .status = newStatus,
             .progress = std::move(progressInfo),
             .hasLocation = false,
             .finishedTime = std::chrono::system_clock::from_time_t(0)
diff --git a/src/rendering/renderengine.cpp b/src/rendering/renderengine.cpp
index ec526678e3..a7d50bb032 100644
--- a/src/rendering/renderengine.cpp
+++ b/src/rendering/renderengine.cpp
@@ -1395,20 +1395,8 @@ void RenderEngine::renderScreenLog() {
         }
 
         {
-            const glm::vec4 color = [alpha, white](ScreenLog::LogLevel level) {
-                switch (level) {
-                    case ghoul::logging::LogLevel::Debug:
-                        return glm::vec4(0.f, 1.f, 0.f, alpha);
-                    case ghoul::logging::LogLevel::Warning:
-                        return glm::vec4(1.f, 1.f, 0.f, alpha);
-                    case ghoul::logging::LogLevel::Error:
-                        return glm::vec4(1.f, 0.f, 0.f, alpha);
-                    case ghoul::logging::LogLevel::Fatal:
-                        return glm::vec4(0.3f, 0.3f, 0.85f, alpha);
-                    default:
-                        return white;
-                }
-            }(it.level);
+            glm::vec4 color = ghoul::toColor(it.level);
+            color.a = alpha;
 
             const std::string_view lvl = ghoul::to_string(it.level);
             std::fill(buf.begin(), buf.end(), char(0));
diff --git a/src/scene/sceneinitializer.cpp b/src/scene/sceneinitializer.cpp
index 6728338be7..7353a020fb 100644
--- a/src/scene/sceneinitializer.cpp
+++ b/src/scene/sceneinitializer.cpp
@@ -90,7 +90,6 @@ void MultiThreadedSceneInitializer::initializeNode(SceneGraphNode* node) {
 
     LoadingScreen* loadingScreen = global::openSpaceEngine->loadingScreen();
     if (loadingScreen) {
-        loadingScreen->setItemNumber(loadingScreen->itemNumber() + 1);
         loadingScreen->updateItem(
             node->identifier(),
             node->guiName(),

From f3c4fc54dbce0a848b3fa445058eb10b51e78fee Mon Sep 17 00:00:00 2001
From: Andreas Engberg <48772850+engbergandreas@users.noreply.github.com>
Date: Tue, 14 Nov 2023 17:08:38 +0100
Subject: [PATCH 170/701] Update UrlSynchronization to limit amount of
 downloads (#2586) (#2933)

Limits the number of URL synchronization downloads by time stamping files for X seconds fixes (#2586).
Also, show the amount of downloaded data as soon as the download is started fix (#2460)

* Adds time validity to UrlSynchronized files (#2586)

Updated affected asset files. Satellite asset files lasts for 24h by default now. Other assets are updated to work as before. Obs timestamp is computed using UTC time.

* Code cleanup

* Update httpsynchronization.cpp

* Applied suggestions from code review

* Update multi-line comment to `//`

* Remove accidental commas in .asset files

Co-authored-by: Emma Broman <emma.broman@liu.se>

* Fixed PR comments + bug in .asset file

* Refactor code

* Reports downloaded data as early as possible, fixes (#2460)

* More files

---------

Co-authored-by: Alexander Bock <alexander.bock@liu.se>
Co-authored-by: Emma Broman <emma.broman@liu.se>
---
 .../educational/scale/burj_khalifa.asset      |   3 +-
 data/assets/examples/urlsynchronization.asset |  30 +-
 data/assets/global/openspacebookmarks.asset   |   2 +-
 .../satellites/communications/amateur.asset   |   2 +-
 .../communications/experimental.asset         |   2 +-
 .../communications/geostationary.asset        |   2 +-
 .../communications/globalstar.asset           |   2 +-
 .../satellites/communications/gorizont.asset  |   2 +-
 .../satellites/communications/intelsat.asset  |   2 +-
 .../satellites/communications/iridium.asset   |   2 +-
 .../communications/iridium_next.asset         |   2 +-
 .../satellites/communications/molniya.asset   |   2 +-
 .../satellites/communications/orbcomm.asset   |   2 +-
 .../communications/other_comm.asset           |   2 +-
 .../satellites/communications/raduga.asset    |   2 +-
 .../earth/satellites/communications/ses.asset |   2 +-
 .../satellites/communications/starlink.asset  |   2 +-
 .../earth/satellites/debris/debris_asat.asset |   2 +-
 .../satellites/debris/debris_breezem.asset    |   2 +-
 .../satellites/debris/debris_fengyun.asset    |   2 +-
 .../satellites/debris/debris_iridium33.asset  |   2 +-
 .../satellites/debris/debris_kosmos2251.asset |   2 +-
 .../earth/satellites/misc/active.asset        |   2 +-
 .../earth/satellites/misc/brightest.asset     |   2 +-
 .../earth/satellites/misc/cubesats.asset      |   2 +-
 .../earth/satellites/misc/hubble_trail.asset  |   2 +-
 .../planets/earth/satellites/misc/iss.asset   |   2 +-
 .../earth/satellites/misc/military.asset      |   2 +-
 .../planets/earth/satellites/misc/other.asset |   2 +-
 .../planets/earth/satellites/misc/radar.asset |   2 +-
 .../earth/satellites/misc/spacestations.asset |   2 +-
 .../earth/satellites/misc/tle-new.asset       |   2 +-
 .../earth/satellites/navigation/beidou.asset  |   2 +-
 .../earth/satellites/navigation/galileo.asset |   2 +-
 .../satellites/navigation/glosnass.asset      |   2 +-
 .../earth/satellites/navigation/gps.asset     |   2 +-
 .../earth/satellites/navigation/musson.asset  |   2 +-
 .../earth/satellites/navigation/nnss.asset    |   2 +-
 .../earth/satellites/navigation/sbas.asset    |   2 +-
 .../earth/satellites/science/education.asset  |   2 +-
 .../satellites/science/engineering.asset      |   2 +-
 .../earth/satellites/science/geodetic.asset   |   2 +-
 .../earth/satellites/science/spaceearth.asset |   2 +-
 .../earth/satellites/weather/aqua.asset       |   2 +-
 .../earth/satellites/weather/argos.asset      |   2 +-
 .../earth/satellites/weather/dmc.asset        |   2 +-
 .../satellites/weather/earth_resources.asset  |   2 +-
 .../earth/satellites/weather/goes.asset       |   2 +-
 .../earth/satellites/weather/noaa.asset       |   2 +-
 .../earth/satellites/weather/planet.asset     |   2 +-
 .../earth/satellites/weather/sarsat.asset     |   2 +-
 .../earth/satellites/weather/snpp.asset       |   2 +-
 .../earth/satellites/weather/spire.asset      |   2 +-
 .../earth/satellites/weather/tdrss.asset      |   2 +-
 .../earth/satellites/weather/terra.asset      |   2 +-
 .../earth/satellites/weather/weather.asset    |   2 +-
 data/assets/spice/base.asset                  |  10 -
 include/openspace/util/spicemanager.h         |   3 +
 modules/sync/syncs/httpsynchronization.cpp    |  10 +-
 modules/sync/syncs/urlsynchronization.cpp     | 344 ++++++++++++------
 modules/sync/syncs/urlsynchronization.h       |  17 +
 src/engine/openspaceengine.cpp                |   2 +-
 src/rendering/loadingscreen.cpp               |  15 +-
 src/util/spicemanager.cpp                     | 167 +++++++++
 64 files changed, 526 insertions(+), 183 deletions(-)

diff --git a/data/assets/educational/scale/burj_khalifa.asset b/data/assets/educational/scale/burj_khalifa.asset
index ff46cd6976..5215a971d7 100644
--- a/data/assets/educational/scale/burj_khalifa.asset
+++ b/data/assets/educational/scale/burj_khalifa.asset
@@ -8,8 +8,7 @@ local modelFolder = asset.resource({
   Type = "UrlSynchronization",
   Identifier = "scale_model_burj_khalifa",
   Url = "https://wms.openspace.amnh.org/static/sync/url/scalemodels/Burj_Khalifa.osmodel",
-  Filename = "Burj_Khalifa.osmodel",
-  Override = false
+  Filename = "Burj_Khalifa.osmodel"
 })
 
 
diff --git a/data/assets/examples/urlsynchronization.asset b/data/assets/examples/urlsynchronization.asset
index e45895f791..98bf9554dd 100644
--- a/data/assets/examples/urlsynchronization.asset
+++ b/data/assets/examples/urlsynchronization.asset
@@ -19,8 +19,32 @@ asset.resource({
   Name = "Example Large",
   Type = "UrlSynchronization",
   Identifier = "example_large",
-  Url = "http://ipv4.download.thinkbroadband.com/100MB.zip",
-  Override = true
+  Url = {
+    "http://speedtest.tele2.net/1000GB.zip",
+    "https://speedtest.tele2.net/100GB.zip",
+    "https://speedtest.tele2.net/50GB.zip",
+    "http://speedtest.tele2.net/10GB.zip",
+    "http://speedtest.tele2.net/1GB.zip",
+    "http://speedtest.tele2.net/100MB.zip",
+
+    "https://proof.ovh.net/files/10Gb.dat",
+    "https://proof.ovh.net/files/1Gb.dat",
+    "https://proof.ovh.net/files/100Mb.dat",
+
+    "https://speed.hetzner.de/10GB.bin",
+    "https://speed.hetzner.de/1GB.bin",
+    "https://speed.hetzner.de/100MB.bin",
+
+    "http://ipv4.download.thinkbroadband.com/1GB.zip",
+    "http://ipv4.download.thinkbroadband.com/512MB.zip",
+    "http://ipv4.download.thinkbroadband.com/200MB.zip",
+    "http://ipv4.download.thinkbroadband.com/100MB.zip",
+    "http://ipv4.download.thinkbroadband.com/50MB.zip",
+    "http://ipv4.download.thinkbroadband.com/20MB.zip",
+    "http://ipv4.download.thinkbroadband.com/10MB.zip",
+    "http://ipv4.download.thinkbroadband.com/5MB.zip",
+  },
+  SecondsUntilResync = 0
 })
 
 asset.resource({
@@ -28,7 +52,7 @@ asset.resource({
   Type = "UrlSynchronization",
   Identifier = "example_medium",
   Url = "http://ipv4.download.thinkbroadband.com/5MB.zip",
-  Override = true
+  SecondsUntilResync = 0
 })
 
 -- Load a resource without hashing, meaning that the bare directory name will be
diff --git a/data/assets/global/openspacebookmarks.asset b/data/assets/global/openspacebookmarks.asset
index d8770c2e20..bf554226c1 100644
--- a/data/assets/global/openspacebookmarks.asset
+++ b/data/assets/global/openspacebookmarks.asset
@@ -7,7 +7,7 @@ local bookmarksCSV = asset.resource({
   Name = "OpenSpace Bookmarks",
   Type = "UrlSynchronization",
   UseHash = false,
-  Override = true,
+  SecondsUntilResync = 0
   Url = dataProvider
 })
 
diff --git a/data/assets/scene/solarsystem/planets/earth/satellites/communications/amateur.asset b/data/assets/scene/solarsystem/planets/earth/satellites/communications/amateur.asset
index 4e4f755a3f..ee6c80271d 100644
--- a/data/assets/scene/solarsystem/planets/earth/satellites/communications/amateur.asset
+++ b/data/assets/scene/solarsystem/planets/earth/satellites/communications/amateur.asset
@@ -8,7 +8,7 @@ local omm = asset.resource({
   Identifier = "satellite_omm_data_amateur_radio",
   Url = "https://www.celestrak.com/NORAD/elements/gp.php?GROUP=amateur&FORMAT=kvn",
   Filename = "amateur.txt",
-  Override = true
+  SecondsUntilResync = 24 * 60 * 60
 })
 
 
diff --git a/data/assets/scene/solarsystem/planets/earth/satellites/communications/experimental.asset b/data/assets/scene/solarsystem/planets/earth/satellites/communications/experimental.asset
index 654c64564a..7541fbbca9 100644
--- a/data/assets/scene/solarsystem/planets/earth/satellites/communications/experimental.asset
+++ b/data/assets/scene/solarsystem/planets/earth/satellites/communications/experimental.asset
@@ -8,7 +8,7 @@ local omm = asset.resource({
   Identifier = "satellite_omm_data_x-comm",
   Url = "https://www.celestrak.com/NORAD/elements/gp.php?GROUP=x-comm&FORMAT=kvn",
   Filename = "x-comm.txt",
-  Override = true
+  SecondsUntilResync = 24 * 60 * 60
 })
 
 
diff --git a/data/assets/scene/solarsystem/planets/earth/satellites/communications/geostationary.asset b/data/assets/scene/solarsystem/planets/earth/satellites/communications/geostationary.asset
index b6668e7ef2..0d4097fecf 100644
--- a/data/assets/scene/solarsystem/planets/earth/satellites/communications/geostationary.asset
+++ b/data/assets/scene/solarsystem/planets/earth/satellites/communications/geostationary.asset
@@ -8,7 +8,7 @@ local omm = asset.resource({
   Identifier = "satellite_omm_data_geo",
   Url = "https://www.celestrak.com/NORAD/elements/gp.php?GROUP=geo&FORMAT=kvn",
   Filename = "geo.txt",
-  Override = true
+  SecondsUntilResync = 24 * 60 * 60
 })
 
 
diff --git a/data/assets/scene/solarsystem/planets/earth/satellites/communications/globalstar.asset b/data/assets/scene/solarsystem/planets/earth/satellites/communications/globalstar.asset
index e3d54ba07c..2203bd564c 100644
--- a/data/assets/scene/solarsystem/planets/earth/satellites/communications/globalstar.asset
+++ b/data/assets/scene/solarsystem/planets/earth/satellites/communications/globalstar.asset
@@ -8,7 +8,7 @@ local omm = asset.resource({
   Identifier = "satellite_omm_data_globalstar",
   Url = "https://www.celestrak.com/NORAD/elements/gp.php?GROUP=globalstar&FORMAT=kvn",
   Filename = "globalstar.txt",
-  Override = true
+  SecondsUntilResync = 24 * 60 * 60
 })
 
 
diff --git a/data/assets/scene/solarsystem/planets/earth/satellites/communications/gorizont.asset b/data/assets/scene/solarsystem/planets/earth/satellites/communications/gorizont.asset
index 0ab12c2d39..13811ce9d8 100644
--- a/data/assets/scene/solarsystem/planets/earth/satellites/communications/gorizont.asset
+++ b/data/assets/scene/solarsystem/planets/earth/satellites/communications/gorizont.asset
@@ -8,7 +8,7 @@ local omm = asset.resource({
   Identifier = "satellite_omm_data_gorizont",
   Url = "https://www.celestrak.com/NORAD/elements/gp.php?GROUP=gorizont&FORMAT=kvn",
   Filename = "gorizont.txt",
-  Override = true
+  SecondsUntilResync = 24 * 60 * 60
 })
 
 
diff --git a/data/assets/scene/solarsystem/planets/earth/satellites/communications/intelsat.asset b/data/assets/scene/solarsystem/planets/earth/satellites/communications/intelsat.asset
index b54b81e4f4..7198b46408 100644
--- a/data/assets/scene/solarsystem/planets/earth/satellites/communications/intelsat.asset
+++ b/data/assets/scene/solarsystem/planets/earth/satellites/communications/intelsat.asset
@@ -8,7 +8,7 @@ local omm = asset.resource({
   Identifier = "satellite_omm_data_intelsat",
   Url = "https://www.celestrak.com/NORAD/elements/gp.php?GROUP=intelsat&FORMAT=kvn",
   Filename = "intelsat.txt",
-  Override = true
+  SecondsUntilResync = 24 * 60 * 60
 })
 
 
diff --git a/data/assets/scene/solarsystem/planets/earth/satellites/communications/iridium.asset b/data/assets/scene/solarsystem/planets/earth/satellites/communications/iridium.asset
index c5a623371a..132919987f 100644
--- a/data/assets/scene/solarsystem/planets/earth/satellites/communications/iridium.asset
+++ b/data/assets/scene/solarsystem/planets/earth/satellites/communications/iridium.asset
@@ -8,7 +8,7 @@ local omm = asset.resource({
   Identifier = "satellite_omm_data_iridium",
   Url = "https://www.celestrak.com/NORAD/elements/gp.php?GROUP=iridium&FORMAT=kvn",
   Filename = "iridium.txt",
-  Override = true
+  SecondsUntilResync = 24 * 60 * 60
 })
 
 
diff --git a/data/assets/scene/solarsystem/planets/earth/satellites/communications/iridium_next.asset b/data/assets/scene/solarsystem/planets/earth/satellites/communications/iridium_next.asset
index b56bb45a39..5019ebd3e6 100644
--- a/data/assets/scene/solarsystem/planets/earth/satellites/communications/iridium_next.asset
+++ b/data/assets/scene/solarsystem/planets/earth/satellites/communications/iridium_next.asset
@@ -8,7 +8,7 @@ local omm = asset.resource({
   Identifier = "satellite_omm_data_iridium-NEXT",
   Url = "https://www.celestrak.com/NORAD/elements/gp.php?GROUP=iridium-NEXT&FORMAT=kvn",
   Filename = "iridium-NEXT.txt",
-  Override = true
+  SecondsUntilResync = 24 * 60 * 60
 })
 
 
diff --git a/data/assets/scene/solarsystem/planets/earth/satellites/communications/molniya.asset b/data/assets/scene/solarsystem/planets/earth/satellites/communications/molniya.asset
index 5be8ee8886..31632e7ad5 100644
--- a/data/assets/scene/solarsystem/planets/earth/satellites/communications/molniya.asset
+++ b/data/assets/scene/solarsystem/planets/earth/satellites/communications/molniya.asset
@@ -8,7 +8,7 @@ local omm = asset.resource({
   Identifier = "satellite_omm_data_molniya",
   Url = "https://www.celestrak.com/NORAD/elements/gp.php?GROUP=molniya&FORMAT=kvn",
   Filename = "molniya.txt",
-  Override = true
+  SecondsUntilResync = 24 * 60 * 60
 })
 
 
diff --git a/data/assets/scene/solarsystem/planets/earth/satellites/communications/orbcomm.asset b/data/assets/scene/solarsystem/planets/earth/satellites/communications/orbcomm.asset
index 8f00be9cac..c1a759df97 100644
--- a/data/assets/scene/solarsystem/planets/earth/satellites/communications/orbcomm.asset
+++ b/data/assets/scene/solarsystem/planets/earth/satellites/communications/orbcomm.asset
@@ -8,7 +8,7 @@ local omm = asset.resource({
   Identifier = "satellite_omm_data_orbcomm",
   Url = "https://www.celestrak.com/NORAD/elements/gp.php?GROUP=orbcomm&FORMAT=kvn",
   Filename = "orbcomm.txt",
-  Override = true
+  SecondsUntilResync = 24 * 60 * 60
 })
 
 
diff --git a/data/assets/scene/solarsystem/planets/earth/satellites/communications/other_comm.asset b/data/assets/scene/solarsystem/planets/earth/satellites/communications/other_comm.asset
index 99e98cc528..5fda8ec905 100644
--- a/data/assets/scene/solarsystem/planets/earth/satellites/communications/other_comm.asset
+++ b/data/assets/scene/solarsystem/planets/earth/satellites/communications/other_comm.asset
@@ -8,7 +8,7 @@ local omm = asset.resource({
   Identifier = "satellite_omm_data_other-comm",
   Url = "https://www.celestrak.com/NORAD/elements/gp.php?GROUP=other-comm&FORMAT=kvn",
   Filename = "other-comm.txt",
-  Override = true
+  SecondsUntilResync = 24 * 60 * 60
 })
 
 
diff --git a/data/assets/scene/solarsystem/planets/earth/satellites/communications/raduga.asset b/data/assets/scene/solarsystem/planets/earth/satellites/communications/raduga.asset
index 589e70850f..cecf990b27 100644
--- a/data/assets/scene/solarsystem/planets/earth/satellites/communications/raduga.asset
+++ b/data/assets/scene/solarsystem/planets/earth/satellites/communications/raduga.asset
@@ -8,7 +8,7 @@ local omm = asset.resource({
   Identifier = "satellite_omm_data_raduga",
   Url = "https://www.celestrak.com/NORAD/elements/gp.php?GROUP=raduga&FORMAT=kvn",
   Filename = "raduga.txt",
-  Override = true
+  SecondsUntilResync = 24 * 60 * 60
 })
 
 
diff --git a/data/assets/scene/solarsystem/planets/earth/satellites/communications/ses.asset b/data/assets/scene/solarsystem/planets/earth/satellites/communications/ses.asset
index 68ff8c2343..532977a477 100644
--- a/data/assets/scene/solarsystem/planets/earth/satellites/communications/ses.asset
+++ b/data/assets/scene/solarsystem/planets/earth/satellites/communications/ses.asset
@@ -8,7 +8,7 @@ local omm = asset.resource({
   Identifier = "satellite_omm_data_ses",
   Url = "https://www.celestrak.com/NORAD/elements/gp.php?GROUP=ses&FORMAT=kvn",
   Filename = "ses.txt",
-  Override = true
+  SecondsUntilResync = 24 * 60 * 60
 })
 
 
diff --git a/data/assets/scene/solarsystem/planets/earth/satellites/communications/starlink.asset b/data/assets/scene/solarsystem/planets/earth/satellites/communications/starlink.asset
index d9ae0f3fa4..a0ad96956b 100644
--- a/data/assets/scene/solarsystem/planets/earth/satellites/communications/starlink.asset
+++ b/data/assets/scene/solarsystem/planets/earth/satellites/communications/starlink.asset
@@ -8,7 +8,7 @@ local omm = asset.resource({
   Identifier = "satellite_omm_data_starlink",
   Url = "https://www.celestrak.com/NORAD/elements/gp.php?GROUP=starlink&FORMAT=kvn",
   Filename = "starlink.txt",
-  Override = true
+  SecondsUntilResync = 24 * 60 * 60
 })
 
 
diff --git a/data/assets/scene/solarsystem/planets/earth/satellites/debris/debris_asat.asset b/data/assets/scene/solarsystem/planets/earth/satellites/debris/debris_asat.asset
index 197d0817b1..d220142513 100644
--- a/data/assets/scene/solarsystem/planets/earth/satellites/debris/debris_asat.asset
+++ b/data/assets/scene/solarsystem/planets/earth/satellites/debris/debris_asat.asset
@@ -8,7 +8,7 @@ local omm = asset.resource({
   Identifier = "satellite_omm_data_2019-006",
   Url = "https://www.celestrak.com/NORAD/elements/gp.php?INTDES=2019-006&FORMAT=kvn",
   Filename = "2019-006.txt",
-  Override = true
+  SecondsUntilResync = 24 * 60 * 60
 })
 
 
diff --git a/data/assets/scene/solarsystem/planets/earth/satellites/debris/debris_breezem.asset b/data/assets/scene/solarsystem/planets/earth/satellites/debris/debris_breezem.asset
index 429d75054b..6820d20e93 100644
--- a/data/assets/scene/solarsystem/planets/earth/satellites/debris/debris_breezem.asset
+++ b/data/assets/scene/solarsystem/planets/earth/satellites/debris/debris_breezem.asset
@@ -8,7 +8,7 @@ local omm = asset.resource({
   Identifier = "satellite_omm_data_2012-044",
   Url = "https://www.celestrak.com/NORAD/elements/gp.php?INTDES=2012-044&FORMAT=kvn",
   Filename = "2012-044.txt",
-  Override = true
+  SecondsUntilResync = 24 * 60 * 60
 })
 
 
diff --git a/data/assets/scene/solarsystem/planets/earth/satellites/debris/debris_fengyun.asset b/data/assets/scene/solarsystem/planets/earth/satellites/debris/debris_fengyun.asset
index 6de5152b47..78ae414dfa 100644
--- a/data/assets/scene/solarsystem/planets/earth/satellites/debris/debris_fengyun.asset
+++ b/data/assets/scene/solarsystem/planets/earth/satellites/debris/debris_fengyun.asset
@@ -8,7 +8,7 @@ local omm = asset.resource({
   Identifier = "satellite_omm_data_1999-025",
   Url = "https://www.celestrak.com/NORAD/elements/gp.php?INTDES=1999-025&FORMAT=kvn",
   Filename = "1999-025.txt",
-  Override = true
+  SecondsUntilResync = 24 * 60 * 60
 })
 
 
diff --git a/data/assets/scene/solarsystem/planets/earth/satellites/debris/debris_iridium33.asset b/data/assets/scene/solarsystem/planets/earth/satellites/debris/debris_iridium33.asset
index 2745a39fbf..24176b22e9 100644
--- a/data/assets/scene/solarsystem/planets/earth/satellites/debris/debris_iridium33.asset
+++ b/data/assets/scene/solarsystem/planets/earth/satellites/debris/debris_iridium33.asset
@@ -8,7 +8,7 @@ local omm = asset.resource({
   Identifier = "satellite_omm_data_iridium-33-debris",
   Url = "https://www.celestrak.com/NORAD/elements/gp.php?GROUP=iridium-33-debris&FORMAT=kvn",
   Filename = "iridium-33-debris.txt",
-  Override = true
+  SecondsUntilResync = 24 * 60 * 60
 })
 
 
diff --git a/data/assets/scene/solarsystem/planets/earth/satellites/debris/debris_kosmos2251.asset b/data/assets/scene/solarsystem/planets/earth/satellites/debris/debris_kosmos2251.asset
index 8681bf7bc7..d91337ce68 100644
--- a/data/assets/scene/solarsystem/planets/earth/satellites/debris/debris_kosmos2251.asset
+++ b/data/assets/scene/solarsystem/planets/earth/satellites/debris/debris_kosmos2251.asset
@@ -8,7 +8,7 @@ local omm = asset.resource({
   Identifier = "satellite_omm_data_cosmos-2251-debris",
   Url = "https://www.celestrak.com/NORAD/elements/gp.php?GROUP=cosmos-2251-debris&FORMAT=kvn",
   Filename = "cosmos-2251-debris.txt",
-  Override = true
+  SecondsUntilResync = 24 * 60 * 60
 })
 
 
diff --git a/data/assets/scene/solarsystem/planets/earth/satellites/misc/active.asset b/data/assets/scene/solarsystem/planets/earth/satellites/misc/active.asset
index d146a2a599..a01b2a68fb 100644
--- a/data/assets/scene/solarsystem/planets/earth/satellites/misc/active.asset
+++ b/data/assets/scene/solarsystem/planets/earth/satellites/misc/active.asset
@@ -8,7 +8,7 @@ local omm = asset.resource({
   Identifier = "satellite_omm_data_active",
   Url = "https://www.celestrak.com/NORAD/elements/gp.php?GROUP=active&FORMAT=kvn",
   Filename = "active.txt",
-  Override = true
+  SecondsUntilResync = 24 * 60 * 60
 })
 
 
diff --git a/data/assets/scene/solarsystem/planets/earth/satellites/misc/brightest.asset b/data/assets/scene/solarsystem/planets/earth/satellites/misc/brightest.asset
index 95870e8de3..a9fc480c3a 100644
--- a/data/assets/scene/solarsystem/planets/earth/satellites/misc/brightest.asset
+++ b/data/assets/scene/solarsystem/planets/earth/satellites/misc/brightest.asset
@@ -8,7 +8,7 @@ local omm = asset.resource({
   Identifier = "satellite_omm_data_visual",
   Url = "https://www.celestrak.com/NORAD/elements/gp.php?GROUP=visual&FORMAT=kvn",
   Filename = "visual.txt",
-  Override = true
+  SecondsUntilResync = 24 * 60 * 60
 })
 
 
diff --git a/data/assets/scene/solarsystem/planets/earth/satellites/misc/cubesats.asset b/data/assets/scene/solarsystem/planets/earth/satellites/misc/cubesats.asset
index 7f7a66fc55..e95fbb3df7 100644
--- a/data/assets/scene/solarsystem/planets/earth/satellites/misc/cubesats.asset
+++ b/data/assets/scene/solarsystem/planets/earth/satellites/misc/cubesats.asset
@@ -8,7 +8,7 @@ local omm = asset.resource({
   Identifier = "satellite_omm_data_cubesat",
   Url = "https://www.celestrak.com/NORAD/elements/gp.php?GROUP=cubesat&FORMAT=kvn",
   Filename = "cubesat.txt",
-  Override = true
+  SecondsUntilResync = 24 * 60 * 60
 })
 
 
diff --git a/data/assets/scene/solarsystem/planets/earth/satellites/misc/hubble_trail.asset b/data/assets/scene/solarsystem/planets/earth/satellites/misc/hubble_trail.asset
index 4166915558..bfe34c64f3 100644
--- a/data/assets/scene/solarsystem/planets/earth/satellites/misc/hubble_trail.asset
+++ b/data/assets/scene/solarsystem/planets/earth/satellites/misc/hubble_trail.asset
@@ -8,7 +8,7 @@ local omm = asset.resource({
   Identifier = "satellite_omm_data_hst",
   Url = "https://www.celestrak.com/NORAD/elements/gp.php?CATNR=20580&FORMAT=kvn",
   Filename = "hst.txt",
-  Override = true
+  SecondsUntilResync = 24 * 60 * 60
 })
 
 
diff --git a/data/assets/scene/solarsystem/planets/earth/satellites/misc/iss.asset b/data/assets/scene/solarsystem/planets/earth/satellites/misc/iss.asset
index d8a069c31a..b95f913208 100644
--- a/data/assets/scene/solarsystem/planets/earth/satellites/misc/iss.asset
+++ b/data/assets/scene/solarsystem/planets/earth/satellites/misc/iss.asset
@@ -16,7 +16,7 @@ local omm = asset.resource({
   Identifier = "satellite_omm_data_iss",
   Url = "https://www.celestrak.com/NORAD/elements/gp.php?CATNR=25544&FORMAT=kvn",
   Filename = "ISS.txt",
-  Override = true
+  SecondsUntilResync = 24 * 60 * 60
 })
 
 
diff --git a/data/assets/scene/solarsystem/planets/earth/satellites/misc/military.asset b/data/assets/scene/solarsystem/planets/earth/satellites/misc/military.asset
index ac741d8d11..cadb37ead3 100644
--- a/data/assets/scene/solarsystem/planets/earth/satellites/misc/military.asset
+++ b/data/assets/scene/solarsystem/planets/earth/satellites/misc/military.asset
@@ -8,7 +8,7 @@ local omm = asset.resource({
   Identifier = "satellite_omm_data_military",
   Url = "https://www.celestrak.com/NORAD/elements/gp.php?GROUP=military&FORMAT=kvn",
   Filename = "military.txt",
-  Override = true
+  SecondsUntilResync = 24 * 60 * 60
 })
 
 
diff --git a/data/assets/scene/solarsystem/planets/earth/satellites/misc/other.asset b/data/assets/scene/solarsystem/planets/earth/satellites/misc/other.asset
index 786a10b15f..ad63db30b2 100644
--- a/data/assets/scene/solarsystem/planets/earth/satellites/misc/other.asset
+++ b/data/assets/scene/solarsystem/planets/earth/satellites/misc/other.asset
@@ -8,7 +8,7 @@ local omm = asset.resource({
   Identifier = "satellite_omm_data_other",
   Url = "https://www.celestrak.com/NORAD/elements/gp.php?GROUP=other&FORMAT=kvn",
   Filename = "other.txt",
-  Override = true
+  SecondsUntilResync = 24 * 60 * 60
 })
 
 
diff --git a/data/assets/scene/solarsystem/planets/earth/satellites/misc/radar.asset b/data/assets/scene/solarsystem/planets/earth/satellites/misc/radar.asset
index 83143280f9..74b5cdcc6f 100644
--- a/data/assets/scene/solarsystem/planets/earth/satellites/misc/radar.asset
+++ b/data/assets/scene/solarsystem/planets/earth/satellites/misc/radar.asset
@@ -8,7 +8,7 @@ local omm = asset.resource({
   Identifier = "satellite_omm_data_radar",
   Url = "https://www.celestrak.com/NORAD/elements/gp.php?GROUP=radar&FORMAT=kvn",
   Filename = "radar.txt",
-  Override = true
+  SecondsUntilResync = 24 * 60 * 60
 })
 
 
diff --git a/data/assets/scene/solarsystem/planets/earth/satellites/misc/spacestations.asset b/data/assets/scene/solarsystem/planets/earth/satellites/misc/spacestations.asset
index 167d2b2cd9..c1c3286224 100644
--- a/data/assets/scene/solarsystem/planets/earth/satellites/misc/spacestations.asset
+++ b/data/assets/scene/solarsystem/planets/earth/satellites/misc/spacestations.asset
@@ -8,7 +8,7 @@ local omm = asset.resource({
   Identifier = "satellite_omm_data_stations",
   Url = "https://www.celestrak.com/NORAD/elements/gp.php?GROUP=stations&FORMAT=kvn",
   Filename = "stations.txt",
-  Override = true
+  SecondsUntilResync = 24 * 60 * 60
 })
 
 
diff --git a/data/assets/scene/solarsystem/planets/earth/satellites/misc/tle-new.asset b/data/assets/scene/solarsystem/planets/earth/satellites/misc/tle-new.asset
index 71336d51c1..d616a0de3e 100644
--- a/data/assets/scene/solarsystem/planets/earth/satellites/misc/tle-new.asset
+++ b/data/assets/scene/solarsystem/planets/earth/satellites/misc/tle-new.asset
@@ -8,7 +8,7 @@ local omm = asset.resource({
   Identifier = "satellite_omm_data_tle-new",
   Url = "https://www.celestrak.com/NORAD/elements/gp.php?GROUP=last-30-days&FORMAT=kvn",
   Filename = "tle-new.txt",
-  Override = true
+  SecondsUntilResync = 24 * 60 * 60
 })
 
 
diff --git a/data/assets/scene/solarsystem/planets/earth/satellites/navigation/beidou.asset b/data/assets/scene/solarsystem/planets/earth/satellites/navigation/beidou.asset
index 94429c0294..f2b5412ba3 100644
--- a/data/assets/scene/solarsystem/planets/earth/satellites/navigation/beidou.asset
+++ b/data/assets/scene/solarsystem/planets/earth/satellites/navigation/beidou.asset
@@ -8,7 +8,7 @@ local omm = asset.resource({
   Identifier = "satellite_omm_data_beidou",
   Url = "https://www.celestrak.com/NORAD/elements/gp.php?GROUP=beidou&FORMAT=kvn",
   Filename = "beidou.txt",
-  Override = true
+  SecondsUntilResync = 24 * 60 * 60
 })
 
 
diff --git a/data/assets/scene/solarsystem/planets/earth/satellites/navigation/galileo.asset b/data/assets/scene/solarsystem/planets/earth/satellites/navigation/galileo.asset
index 36cc8d0572..8d81d92302 100644
--- a/data/assets/scene/solarsystem/planets/earth/satellites/navigation/galileo.asset
+++ b/data/assets/scene/solarsystem/planets/earth/satellites/navigation/galileo.asset
@@ -8,7 +8,7 @@ local omm = asset.resource({
   Identifier = "satellite_omm_data_galileo",
   Url = "https://www.celestrak.com/NORAD/elements/gp.php?GROUP=galileo&FORMAT=kvn",
   Filename = "galileo.txt",
-  Override = true
+  SecondsUntilResync = 24 * 60 * 60
 })
 
 
diff --git a/data/assets/scene/solarsystem/planets/earth/satellites/navigation/glosnass.asset b/data/assets/scene/solarsystem/planets/earth/satellites/navigation/glosnass.asset
index 3e29b0f1c9..fc6933875b 100644
--- a/data/assets/scene/solarsystem/planets/earth/satellites/navigation/glosnass.asset
+++ b/data/assets/scene/solarsystem/planets/earth/satellites/navigation/glosnass.asset
@@ -8,7 +8,7 @@ local omm = asset.resource({
   Identifier = "satellite_omm_data_glo-ops",
   Url = "https://www.celestrak.com/NORAD/elements/gp.php?GROUP=glo-ops&FORMAT=kvn",
   Filename = "glo-ops.txt",
-  Override = true
+  SecondsUntilResync = 24 * 60 * 60
 })
 
 
diff --git a/data/assets/scene/solarsystem/planets/earth/satellites/navigation/gps.asset b/data/assets/scene/solarsystem/planets/earth/satellites/navigation/gps.asset
index 0e1cf3c5c5..2d147c8e04 100644
--- a/data/assets/scene/solarsystem/planets/earth/satellites/navigation/gps.asset
+++ b/data/assets/scene/solarsystem/planets/earth/satellites/navigation/gps.asset
@@ -8,7 +8,7 @@ local omm = asset.resource({
   Identifier = "satellite_omm_data_gps-ops",
   Url = "https://www.celestrak.com/NORAD/elements/gp.php?GROUP=gps-ops&FORMAT=kvn",
   Filename = "gps-ops.txt",
-  Override = true
+  SecondsUntilResync = 24 * 60 * 60
 })
 
 
diff --git a/data/assets/scene/solarsystem/planets/earth/satellites/navigation/musson.asset b/data/assets/scene/solarsystem/planets/earth/satellites/navigation/musson.asset
index 89df6c73c3..35664b2186 100644
--- a/data/assets/scene/solarsystem/planets/earth/satellites/navigation/musson.asset
+++ b/data/assets/scene/solarsystem/planets/earth/satellites/navigation/musson.asset
@@ -8,7 +8,7 @@ local omm = asset.resource({
   Identifier = "satellite_omm_data_musson",
   Url = "https://www.celestrak.com/NORAD/elements/gp.php?GROUP=musson&FORMAT=kvn",
   Filename = "musson.txt",
-  Override = true
+  SecondsUntilResync = 24 * 60 * 60
 })
 
 
diff --git a/data/assets/scene/solarsystem/planets/earth/satellites/navigation/nnss.asset b/data/assets/scene/solarsystem/planets/earth/satellites/navigation/nnss.asset
index a478d319c9..665d5a24cf 100644
--- a/data/assets/scene/solarsystem/planets/earth/satellites/navigation/nnss.asset
+++ b/data/assets/scene/solarsystem/planets/earth/satellites/navigation/nnss.asset
@@ -8,7 +8,7 @@ local omm = asset.resource({
   Identifier = "satellite_omm_data_nnss",
   Url = "https://www.celestrak.com/NORAD/elements/gp.php?GROUP=nnss&FORMAT=kvn",
   Filename = "nnss.txt",
-  Override = true
+  SecondsUntilResync = 24 * 60 * 60
 })
 
 
diff --git a/data/assets/scene/solarsystem/planets/earth/satellites/navigation/sbas.asset b/data/assets/scene/solarsystem/planets/earth/satellites/navigation/sbas.asset
index 181722c5c1..10d5dffa5c 100644
--- a/data/assets/scene/solarsystem/planets/earth/satellites/navigation/sbas.asset
+++ b/data/assets/scene/solarsystem/planets/earth/satellites/navigation/sbas.asset
@@ -8,7 +8,7 @@ local omm = asset.resource({
   Identifier = "satellite_omm_data_sbas",
   Url = "https://www.celestrak.com/NORAD/elements/gp.php?GROUP=sbas&FORMAT=kvn",
   Filename = "sbas.txt",
-  Override = true
+  SecondsUntilResync = 24 * 60 * 60
 })
 
 
diff --git a/data/assets/scene/solarsystem/planets/earth/satellites/science/education.asset b/data/assets/scene/solarsystem/planets/earth/satellites/science/education.asset
index 84d4d1ad16..f7e003db03 100644
--- a/data/assets/scene/solarsystem/planets/earth/satellites/science/education.asset
+++ b/data/assets/scene/solarsystem/planets/earth/satellites/science/education.asset
@@ -8,7 +8,7 @@ local omm = asset.resource({
   Identifier = "satellite_omm_data_education",
   Url = "https://www.celestrak.com/NORAD/elements/gp.php?GROUP=education&FORMAT=kvn",
   Filename = "education.txt",
-  Override = true
+  SecondsUntilResync = 24 * 60 * 60
 })
 
 
diff --git a/data/assets/scene/solarsystem/planets/earth/satellites/science/engineering.asset b/data/assets/scene/solarsystem/planets/earth/satellites/science/engineering.asset
index 1277fa0e99..3ba32d83f4 100644
--- a/data/assets/scene/solarsystem/planets/earth/satellites/science/engineering.asset
+++ b/data/assets/scene/solarsystem/planets/earth/satellites/science/engineering.asset
@@ -8,7 +8,7 @@ local omm = asset.resource({
   Identifier = "satellite_omm_data_engineering",
   Url = "https://www.celestrak.com/NORAD/elements/gp.php?GROUP=engineering&FORMAT=kvn",
   Filename = "engineering.txt",
-  Override = true
+  SecondsUntilResync = 24 * 60 * 60
 })
 
 
diff --git a/data/assets/scene/solarsystem/planets/earth/satellites/science/geodetic.asset b/data/assets/scene/solarsystem/planets/earth/satellites/science/geodetic.asset
index 6b5bc0468b..d9bb14f901 100644
--- a/data/assets/scene/solarsystem/planets/earth/satellites/science/geodetic.asset
+++ b/data/assets/scene/solarsystem/planets/earth/satellites/science/geodetic.asset
@@ -8,7 +8,7 @@ local omm = asset.resource({
   Identifier = "satellite_omm_data_geodetic",
   Url = "https://www.celestrak.com/NORAD/elements/gp.php?GROUP=geodetic&FORMAT=kvn",
   Filename = "geodetic.txt",
-  Override = true
+  SecondsUntilResync = 24 * 60 * 60
 })
 
 
diff --git a/data/assets/scene/solarsystem/planets/earth/satellites/science/spaceearth.asset b/data/assets/scene/solarsystem/planets/earth/satellites/science/spaceearth.asset
index 1f222f6c5a..a314217808 100644
--- a/data/assets/scene/solarsystem/planets/earth/satellites/science/spaceearth.asset
+++ b/data/assets/scene/solarsystem/planets/earth/satellites/science/spaceearth.asset
@@ -8,7 +8,7 @@ local omm = asset.resource({
   Identifier = "satellite_omm_data_science",
   Url = "https://www.celestrak.com/NORAD/elements/gp.php?GROUP=science&FORMAT=kvn",
   Filename = "science.txt",
-  Override = true
+  SecondsUntilResync = 24 * 60 * 60
 })
 
 
diff --git a/data/assets/scene/solarsystem/planets/earth/satellites/weather/aqua.asset b/data/assets/scene/solarsystem/planets/earth/satellites/weather/aqua.asset
index abe707e3c8..38c187bc96 100644
--- a/data/assets/scene/solarsystem/planets/earth/satellites/weather/aqua.asset
+++ b/data/assets/scene/solarsystem/planets/earth/satellites/weather/aqua.asset
@@ -8,7 +8,7 @@ local omm = asset.resource({
   Identifier = "satellite_omm_data_aqua",
   Url = "https://www.celestrak.com/NORAD/elements/gp.php?CATNR=27424&FORMAT=kvn",
   Filename = "Aqua.txt",
-  Override = true
+  SecondsUntilResync = 24 * 60 * 60
 })
 
 
diff --git a/data/assets/scene/solarsystem/planets/earth/satellites/weather/argos.asset b/data/assets/scene/solarsystem/planets/earth/satellites/weather/argos.asset
index f4632ee3e3..071d3d616d 100644
--- a/data/assets/scene/solarsystem/planets/earth/satellites/weather/argos.asset
+++ b/data/assets/scene/solarsystem/planets/earth/satellites/weather/argos.asset
@@ -8,7 +8,7 @@ local omm = asset.resource({
   Identifier = "satellite_omm_data_argos",
   Url = "https://www.celestrak.com/NORAD/elements/gp.php?GROUP=argos&FORMAT=kvn",
   Filename = "argos.txt",
-  Override = true
+  SecondsUntilResync = 24 * 60 * 60
 })
 
 
diff --git a/data/assets/scene/solarsystem/planets/earth/satellites/weather/dmc.asset b/data/assets/scene/solarsystem/planets/earth/satellites/weather/dmc.asset
index 7ecdebfb9e..3c1fbd90c8 100644
--- a/data/assets/scene/solarsystem/planets/earth/satellites/weather/dmc.asset
+++ b/data/assets/scene/solarsystem/planets/earth/satellites/weather/dmc.asset
@@ -8,7 +8,7 @@ local omm = asset.resource({
   Identifier = "satellite_omm_data_dmc",
   Url = "https://www.celestrak.com/NORAD/elements/gp.php?GROUP=dmc&FORMAT=kvn",
   Filename = "dmc.txt",
-  Override = true
+  SecondsUntilResync = 24 * 60 * 60
 })
 
 
diff --git a/data/assets/scene/solarsystem/planets/earth/satellites/weather/earth_resources.asset b/data/assets/scene/solarsystem/planets/earth/satellites/weather/earth_resources.asset
index 6451aace49..835560ac3a 100644
--- a/data/assets/scene/solarsystem/planets/earth/satellites/weather/earth_resources.asset
+++ b/data/assets/scene/solarsystem/planets/earth/satellites/weather/earth_resources.asset
@@ -8,7 +8,7 @@ local omm = asset.resource({
   Identifier = "satellite_omm_data_resource",
   Url = "https://www.celestrak.com/NORAD/elements/gp.php?GROUP=resource&FORMAT=kvn",
   Filename = "resource.txt",
-  Override = true
+  SecondsUntilResync = 24 * 60 * 60
 })
 
 
diff --git a/data/assets/scene/solarsystem/planets/earth/satellites/weather/goes.asset b/data/assets/scene/solarsystem/planets/earth/satellites/weather/goes.asset
index fc24bdd839..42a26fad92 100644
--- a/data/assets/scene/solarsystem/planets/earth/satellites/weather/goes.asset
+++ b/data/assets/scene/solarsystem/planets/earth/satellites/weather/goes.asset
@@ -8,7 +8,7 @@ local omm = asset.resource({
   Identifier = "satellite_omm_data_goes",
   Url = "https://www.celestrak.com/NORAD/elements/gp.php?GROUP=goes&FORMAT=kvn",
   Filename = "goes.txt",
-  Override = true
+  SecondsUntilResync = 24 * 60 * 60
 })
 
 
diff --git a/data/assets/scene/solarsystem/planets/earth/satellites/weather/noaa.asset b/data/assets/scene/solarsystem/planets/earth/satellites/weather/noaa.asset
index 65b1a6cf81..4d8324c9a5 100644
--- a/data/assets/scene/solarsystem/planets/earth/satellites/weather/noaa.asset
+++ b/data/assets/scene/solarsystem/planets/earth/satellites/weather/noaa.asset
@@ -8,7 +8,7 @@ local omm = asset.resource({
   Identifier = "satellite_omm_data_noaa",
   Url = "https://www.celestrak.com/NORAD/elements/gp.php?GROUP=noaa&FORMAT=kvn",
   Filename = "noaa.txt",
-  Override = true
+  SecondsUntilResync = 24 * 60 * 60
 })
 
 
diff --git a/data/assets/scene/solarsystem/planets/earth/satellites/weather/planet.asset b/data/assets/scene/solarsystem/planets/earth/satellites/weather/planet.asset
index b56b882db8..a8a9df324b 100644
--- a/data/assets/scene/solarsystem/planets/earth/satellites/weather/planet.asset
+++ b/data/assets/scene/solarsystem/planets/earth/satellites/weather/planet.asset
@@ -8,7 +8,7 @@ local omm = asset.resource({
   Identifier = "satellite_omm_data_planet",
   Url = "https://www.celestrak.com/NORAD/elements/gp.php?GROUP=planet&FORMAT=kvn",
   Filename = "planet.txt",
-  Override = true
+  SecondsUntilResync = 24 * 60 * 60
 })
 
 
diff --git a/data/assets/scene/solarsystem/planets/earth/satellites/weather/sarsat.asset b/data/assets/scene/solarsystem/planets/earth/satellites/weather/sarsat.asset
index 4b3b9dc29e..151c23c4dc 100644
--- a/data/assets/scene/solarsystem/planets/earth/satellites/weather/sarsat.asset
+++ b/data/assets/scene/solarsystem/planets/earth/satellites/weather/sarsat.asset
@@ -8,7 +8,7 @@ local omm = asset.resource({
   Identifier = "satellite_omm_data_sarsat",
   Url = "https://www.celestrak.com/NORAD/elements/gp.php?GROUP=sarsat&FORMAT=kvn",
   Filename = "sarsat.txt",
-  Override = true
+  SecondsUntilResync = 24 * 60 * 60
 })
 
 
diff --git a/data/assets/scene/solarsystem/planets/earth/satellites/weather/snpp.asset b/data/assets/scene/solarsystem/planets/earth/satellites/weather/snpp.asset
index b1a4f7cd7b..89e19db0fd 100644
--- a/data/assets/scene/solarsystem/planets/earth/satellites/weather/snpp.asset
+++ b/data/assets/scene/solarsystem/planets/earth/satellites/weather/snpp.asset
@@ -8,7 +8,7 @@ local omm = asset.resource({
   Identifier = "satellite_omm_data_snpp",
   Url = "https://www.celestrak.com/NORAD/elements/gp.php?CATNR=37849&FORMAT=kvn",
   Filename = "SNPP.txt",
-  Override = true
+  SecondsUntilResync = 24 * 60 * 60
 })
 
 
diff --git a/data/assets/scene/solarsystem/planets/earth/satellites/weather/spire.asset b/data/assets/scene/solarsystem/planets/earth/satellites/weather/spire.asset
index ee3267a8e1..e991a56c90 100644
--- a/data/assets/scene/solarsystem/planets/earth/satellites/weather/spire.asset
+++ b/data/assets/scene/solarsystem/planets/earth/satellites/weather/spire.asset
@@ -8,7 +8,7 @@ local omm = asset.resource({
   Identifier = "satellite_omm_data_spire",
   Url = "https://www.celestrak.com/NORAD/elements/gp.php?GROUP=spire&FORMAT=kvn",
   Filename = "spire.txt",
-  Override = true
+  SecondsUntilResync = 24 * 60 * 60
 })
 
 
diff --git a/data/assets/scene/solarsystem/planets/earth/satellites/weather/tdrss.asset b/data/assets/scene/solarsystem/planets/earth/satellites/weather/tdrss.asset
index c8cfc79075..71da56bcda 100644
--- a/data/assets/scene/solarsystem/planets/earth/satellites/weather/tdrss.asset
+++ b/data/assets/scene/solarsystem/planets/earth/satellites/weather/tdrss.asset
@@ -8,7 +8,7 @@ local omm = asset.resource({
   Identifier = "satellite_omm_data_tdrss",
   Url = "https://www.celestrak.com/NORAD/elements/gp.php?GROUP=tdrss&FORMAT=kvn",
   Filename = "tdrss.txt",
-  Override = true
+  SecondsUntilResync = 24 * 60 * 60
 })
 
 
diff --git a/data/assets/scene/solarsystem/planets/earth/satellites/weather/terra.asset b/data/assets/scene/solarsystem/planets/earth/satellites/weather/terra.asset
index b4d4791ab1..d8a3693079 100644
--- a/data/assets/scene/solarsystem/planets/earth/satellites/weather/terra.asset
+++ b/data/assets/scene/solarsystem/planets/earth/satellites/weather/terra.asset
@@ -8,7 +8,7 @@ local omm = asset.resource({
   Identifier = "satellite_omm_data_terra",
   Url = "https://www.celestrak.com/NORAD/elements/gp.php?CATNR=25994&FORMAT=kvn",
   Filename = "Terra.txt",
-  Override = true
+  SecondsUntilResync = 24 * 60 * 60
 })
 
 
diff --git a/data/assets/scene/solarsystem/planets/earth/satellites/weather/weather.asset b/data/assets/scene/solarsystem/planets/earth/satellites/weather/weather.asset
index 3993910bfa..23ff2d1e37 100644
--- a/data/assets/scene/solarsystem/planets/earth/satellites/weather/weather.asset
+++ b/data/assets/scene/solarsystem/planets/earth/satellites/weather/weather.asset
@@ -8,7 +8,7 @@ local omm = asset.resource({
   Identifier = "satellite_omm_data_weather",
   Url = "https://www.celestrak.com/NORAD/elements/gp.php?GROUP=weather&FORMAT=kvn",
   Filename = "weather.txt",
-  Override = true
+  SecondsUntilResync = 24 * 60 * 60
 })
 
 
diff --git a/data/assets/spice/base.asset b/data/assets/spice/base.asset
index 24408b5898..7f651af46f 100644
--- a/data/assets/spice/base.asset
+++ b/data/assets/spice/base.asset
@@ -1,10 +1,3 @@
-local lsk = asset.resource({
-  Name = "General LSK Kernels",
-  Type = "HttpSynchronization",
-  Identifier = "general_lsk",
-  Version = 1
-})
-
 local pck = asset.resource({
   Name = "General PCK Kernels",
   Type = "HttpSynchronization",
@@ -21,14 +14,12 @@ local spk = asset.resource({
 
 
 local kernels = {
-  lsk .. "naif0012.tls",
   pck .. "pck00011.tpc",
   spk .. "de430.bsp"
 }
 
 
 asset.onInitialize(function()
-  openspace.spice.loadKernel(lsk .. "naif0012.tls")
   openspace.spice.loadKernel(pck .. "pck00011.tpc")
   openspace.spice.loadKernel(spk .. "de430.bsp")
 end)
@@ -36,7 +27,6 @@ end)
 asset.onDeinitialize(function()
   openspace.spice.unloadKernel(spk .. "de430.bsp")
   openspace.spice.unloadKernel(pck .. "pck00011.tpc")
-  openspace.spice.unloadKernel(lsk .. "naif0012.tls")
 end)
 
 
diff --git a/include/openspace/util/spicemanager.h b/include/openspace/util/spicemanager.h
index 17bacf348d..eec285c09f 100644
--- a/include/openspace/util/spicemanager.h
+++ b/include/openspace/util/spicemanager.h
@@ -1085,6 +1085,9 @@ private:
     glm::dmat3 getEstimatedTransformMatrix(const std::string& fromFrame,
         const std::string& toFrame, double time) const;
 
+    /// Loads pre defined leap seconds time kernel (naif00012.tls).
+    void loadLeapSecondsSpiceKernel();
+
     /// A list of all loaded kernels
     std::vector<KernelInformation> _loadedKernels;
 
diff --git a/modules/sync/syncs/httpsynchronization.cpp b/modules/sync/syncs/httpsynchronization.cpp
index 199e78c7f9..7b71f7dea3 100644
--- a/modules/sync/syncs/httpsynchronization.cpp
+++ b/modules/sync/syncs/httpsynchronization.cpp
@@ -206,12 +206,10 @@ bool HttpSynchronization::isEachFileDownloaded() {
     // Otherwise first line is the version number.
     std::string ossyncVersion = line;
 
-    /*
-    Format of 1.0 ossync:
-    Version number: E.g., 1.0
-    Synchronization status: Synchronized or Partial Synchronized
-    Optionally list of already synched files
-    */
+    //Format of 1.0 ossync:
+    //Version number: E.g., 1.0
+    //Synchronization status: Synchronized or Partial Synchronized
+    //Optionally list of already synched files
 
     if (ossyncVersion == OssyncVersionNumber) {
         std::getline(file >> std::ws, line); // Read synchronization status
diff --git a/modules/sync/syncs/urlsynchronization.cpp b/modules/sync/syncs/urlsynchronization.cpp
index 855b814504..ca0fda73f5 100644
--- a/modules/sync/syncs/urlsynchronization.cpp
+++ b/modules/sync/syncs/urlsynchronization.cpp
@@ -27,6 +27,9 @@
 #include <openspace/documentation/documentation.h>
 #include <openspace/documentation/verifier.h>
 #include <openspace/util/httprequest.h>
+#include <openspace/util/spicemanager.h>
+#include <openspace/util/time.h>
+#include <ghoul/filesystem/filesystem.h>
 #include <ghoul/logging/logmanager.h>
 #include <numeric>
 #include <mutex>
@@ -35,6 +38,10 @@
 #include <variant>
 
 namespace {
+    constexpr std::string_view _loggerCat = "UrlSynchronization";
+    constexpr std::string_view OssyncVersionNumber = "1.0";
+    constexpr std::string_view SynchronizationToken = "Synchronized";
+
     struct [[codegen::Dictionary(UrlSynchronization)]] Parameters {
         // The URL or urls from where the files are downloaded. If multiple URLs are
         // provided, all files will be downloaded to the same directory and the filename
@@ -45,10 +52,7 @@ namespace {
         // manually find the downloaded folder in the synchronization folder
         std::string identifier [[codegen::identifier()]];
 
-        // If this value is set to 'true' and it is not overwritten by the global
-        // settings, the file(s) pointed to by this URLSynchronization will always be
-        // downloaded, thus overwriting the local files. This is useful for files that are
-        // updated regularly remotely and should be fetch at every startup
+        // Deprecated, use SecondsUntilResync instead
         std::optional<bool> forceOverride [[codegen::key("Override")]];
 
         // If this value is set to 'true' (the default), the hash of the URL is appended
@@ -62,6 +66,11 @@ namespace {
         // automatically created from the url. If this value is specified, the url
         // parameter only only contain exactly one URL
         std::optional<std::string> filename;
+
+        // This variable determines the validity period of a file(s) in seconds before it 
+        // needs to be re-downloaded. The default value keeps the file permanently cached, 
+        // while a value of 0 forces the file to be downloaded on every startup.
+        std::optional<double> secondsUntilResync [[codegen::greaterequal(0.0)]];
     };
 #include "urlsynchronization_codegen.cpp"
 } // namespace
@@ -99,6 +108,14 @@ UrlSynchronization::UrlSynchronization(const ghoul::Dictionary& dictionary,
     _filename = p.filename.value_or(_filename);
     _forceOverride = p.forceOverride.value_or(_forceOverride);
 
+    // (anden88 2023-11-03) TODO: When we decide to remove override variable this should
+    // be cleaned up.
+    // Mimic behavior of time to live if override is specified (true => force download,
+    // false keeps the file permanently (default behavior)).
+    _secondsUntilResync = _forceOverride ? 0 : MaxDateAsJ2000;
+    // Disregard override variable if user specified a specific time to live.
+    _secondsUntilResync = p.secondsUntilResync.value_or(_secondsUntilResync);
+
     const bool useHash = p.useHash.value_or(true);
 
     _identifier = p.identifier;
@@ -113,6 +130,14 @@ UrlSynchronization::UrlSynchronization(const ghoul::Dictionary& dictionary,
         );
         _identifier += fmt::format("({})", hash);
     }
+
+    if (p.forceOverride.has_value()) {
+        LWARNING(fmt::format(
+            "{}: The variable ForceOverride has been deprecated."
+            "Optionally, use SecondsUntilResync instead to specify file validity date.",
+            p.identifier
+        ));
+    }
 }
 
 UrlSynchronization::~UrlSynchronization() {
@@ -132,115 +157,25 @@ void UrlSynchronization::start() {
     }
     _state = State::Syncing;
 
-    if (hasSyncFile() && !_forceOverride) {
+    if (isEachFileValid()) {
         _state = State::Resolved;
         return;
     }
 
+    if (isRejected()) {
+        return;
+    }
+
     _syncThread = std::thread([this]() {
-        std::unordered_map<std::string, size_t> fileSizes;
-        std::mutex fileSizeMutex;
-        size_t nDownloads = 0;
-        std::atomic_bool startedAllDownloads = false;
-        std::vector<std::unique_ptr<HttpFileDownload>> downloads;
+        const bool success = trySyncUrls();
 
-        for (const std::string& url : _urls) {
-            if (_filename.empty() || _urls.size() > 1) {
-                std::filesystem::path fn = std::filesystem::path(url).filename();
-                if (fn.empty() && url.back() == '/') {
-                    // If the user provided a path that ends in / the `filename` will
-                    // result in an empty path with causes the downloading to fail
-                    fn = std::filesystem::path(url).parent_path().filename();
-                }
-                std::string name = fn.string();
-
-                // We can not create filenames with question marks
-                name.erase(std::remove(name.begin(), name.end(), '?'), name.end());
-                _filename = name;
-            }
-            std::filesystem::path destination = directory() / (_filename + ".tmp");
-
-            auto download = std::make_unique<HttpFileDownload>(
-                url,
-                destination,
-                HttpFileDownload::Overwrite::Yes
-            );
-            HttpFileDownload* dl = download.get();
-
-            downloads.push_back(std::move(download));
-
-            ++nDownloads;
-
-            dl->onProgress(
-                [this, url, &fileSizes, &fileSizeMutex,
-                &startedAllDownloads, &nDownloads](int64_t,
-                                                   std::optional<int64_t> totalBytes)
-            {
-                if (!totalBytes.has_value()) {
-                    return !_shouldCancel;
-                }
-
-                std::lock_guard guard(fileSizeMutex);
-                fileSizes[url] = *totalBytes;
-
-                if (!_nTotalBytesKnown && startedAllDownloads &&
-                    fileSizes.size() == nDownloads)
-                {
-                    _nTotalBytesKnown = true;
-                    _nTotalBytes = 0;
-                    for (const std::pair<const std::string, size_t>& fs : fileSizes) {
-                        _nTotalBytes += fs.second;
-                    }
-                }
-                return !_shouldCancel;
-            });
-
-            dl->start();
-        }
-
-        startedAllDownloads = true;
-
-        bool failed = false;
-        for (const std::unique_ptr<HttpFileDownload>& d : downloads) {
-            d->wait();
-            if (!d->hasSucceeded()) {
-                failed = true;
-                continue;
-            }
-
-            // If we are forcing the override, we download to a temporary file first, so
-            // when we are done here, we need to rename the file to the original name
-
-            std::filesystem::path tempName = d->destination();
-            std::filesystem::path originalName = tempName;
-            // Remove the .tmp extension
-            originalName.replace_extension("");
-
-            if (std::filesystem::is_regular_file(originalName)) {
-                std::filesystem::remove(originalName);
-            }
-
-            std::error_code ec;
-            std::filesystem::rename(tempName, originalName, ec);
-            if (ec) {
-                LERRORC(
-                    "URLSynchronization",
-                    fmt::format("Error renaming file {} to {}", tempName, originalName)
-                );
-
-                failed = true;
-            }
-        }
-
-        if (!failed) {
+        if (success) {
             createSyncFile();
+            _state = State::Resolved;
         }
         else {
-            for (const std::unique_ptr<HttpFileDownload>& d : downloads) {
-                d->cancel();
-            }
+            _state = State::Rejected;
         }
-        _state = State::Resolved;
     });
 }
 
@@ -253,4 +188,207 @@ std::string UrlSynchronization::generateUid() {
     return _identifier;
 }
 
+bool UrlSynchronization::isEachFileValid() {
+    std::filesystem::path path = directory();
+    path.replace_extension("ossync");
+    // Check if file exists at all
+    if (!std::filesystem::is_regular_file(path)) {
+        return false;
+    }
+
+    std::ifstream file(path);
+    std::string line;
+
+    file >> line;
+    // Update ossync files that does not have a version number to new format
+    if (line == SynchronizationToken) {
+        if (_secondsUntilResync == 0) {
+            return false; // Force download new file
+        }
+
+        // We must close file early because createSyncFile writes to it
+        file.close();
+        createSyncFile();
+        // File is valid until some date
+        return true; 
+    }
+    // Otherwise first line is the version number.
+    std::string ossyncVersion = line;
+
+    // Format of 1.0 ossync:
+    // Version number: e.g., 1.0
+    // Date that specifies how long the files are valid for in ISO8601 format
+    // Valid to: yyyy-mm-ddThr:mn:sc.xxx
+
+    if (ossyncVersion == "1.0") {
+        std::getline(file >> std::ws, line);
+        std::string& fileIsValidToDate = line;
+        double fileValidAsJ2000 = Time::convertTime(fileIsValidToDate);
+
+        std::string todaysDate = Time::currentWallTime();
+        double todaysDateAsJ2000 = Time::convertTime(todaysDate);
+
+        // Issue warning if file is kept but user changed setting to download on startup.
+        if ((fileValidAsJ2000 > todaysDateAsJ2000) && _secondsUntilResync == 0) {
+            LWARNING(fmt::format(
+                "{}: File is valid to {} but asset specifies SecondsUntilResync = {} "
+                "Did you mean to re-download the file? If so, remove file from sync "
+                "folder to resync",
+                _identifier,
+                fileIsValidToDate,
+                _secondsUntilResync
+            ));
+        }
+
+        // Returns true if date in ossync file is 'larger' than todays date,
+        // i.e. no sync needed.
+        return fileValidAsJ2000 > todaysDateAsJ2000;
+    }
+    else {
+        LERROR(fmt::format(
+            "{}: Unknown ossync version number read. Got {} while {} and below are valid",
+            _identifier, ossyncVersion, OssyncVersionNumber
+        ));
+        _state = State::Rejected;
+    }
+
+    return false;
+}
+
+void UrlSynchronization::createSyncFile(bool) const {
+    std::filesystem::path dir = directory();
+    std::filesystem::create_directories(dir);
+
+    dir.replace_extension("ossync");
+    std::ofstream syncFile(dir, std::ofstream::out);
+
+    std::string currentTimeAsISO8601 = Time::currentWallTime();
+    double currentTimeAsJ2000 = Time::convertTime(currentTimeAsISO8601);
+
+    // With the format YYYY-MM... any year thats larger than 4 digits throws an error
+    // Limit the future date to year 9999
+    double futureTimeAsJ2000 = std::min(
+        currentTimeAsJ2000 + _secondsUntilResync,
+        MaxDateAsJ2000
+    );
+
+    std::string fileIsValidTo = SpiceManager::ref().dateFromEphemerisTime(
+        futureTimeAsJ2000,
+        "YYYY-MM-DDTHR:MN:SC.###"
+    );
+
+    const std::string msg = fmt::format("{}\n{}\n", OssyncVersionNumber, fileIsValidTo);
+    syncFile << msg;
+}
+
+bool UrlSynchronization::trySyncUrls() {
+    struct SizeData {
+        int64_t downloadedBytes = 0;
+        std::optional<int64_t> totalBytes;
+    };
+
+    std::unordered_map<std::string, SizeData> sizeData;
+    std::mutex fileSizeMutex;
+    size_t nDownloads = 0;
+    std::atomic_bool startedAllDownloads = false;
+    std::vector<std::unique_ptr<HttpFileDownload>> downloads;
+
+    for (const std::string& url : _urls) {
+        if (_filename.empty() || _urls.size() > 1) {
+            std::filesystem::path fn = std::filesystem::path(url).filename();
+            if (fn.empty() && url.back() == '/') {
+                // If the user provided a path that ends in / the `filename` will
+                // result in an empty path with causes the downloading to fail
+                fn = std::filesystem::path(url).parent_path().filename();
+            }
+            std::string name = fn.string();
+
+            // We can not create filenames with question marks
+            name.erase(std::remove(name.begin(), name.end(), '?'), name.end());
+            _filename = name;
+        }
+        std::filesystem::path destination = directory() / (_filename + ".tmp");
+
+        if (sizeData.find(url) != sizeData.end()) {
+            LWARNING(fmt::format("{}: Duplicate entry for {}", _identifier, url));
+            continue;
+        }
+
+        auto download = std::make_unique<HttpFileDownload>(
+            url,
+            destination,
+            HttpFileDownload::Overwrite::Yes
+        );
+        HttpFileDownload* dl = download.get();
+
+        downloads.push_back(std::move(download));
+
+        ++nDownloads;
+        sizeData[url] = SizeData();
+
+        dl->onProgress(
+            [this, url, &sizeData, &fileSizeMutex](int64_t downloadedBytes,
+                                                std::optional<int64_t> totalBytes)
+            {
+                if (!totalBytes.has_value()) {
+                    return !_shouldCancel;
+                }
+
+                std::lock_guard guard(fileSizeMutex);
+                sizeData[url] = { downloadedBytes, totalBytes };
+
+                _nTotalBytesKnown = true;
+                _nTotalBytes = 0;
+                _nSynchronizedBytes = 0;
+                for (const std::pair<const std::string, SizeData>& sd : sizeData) {
+                    _nTotalBytesKnown = _nTotalBytesKnown &&
+                                        sd.second.totalBytes.has_value();
+                    _nTotalBytes += sd.second.totalBytes.value_or(0);
+                    _nSynchronizedBytes += sd.second.downloadedBytes;
+                }
+
+                return !_shouldCancel;
+            });
+
+        dl->start();
+    }
+
+    startedAllDownloads = true;
+
+    bool failed = false;
+    for (const std::unique_ptr<HttpFileDownload>& d : downloads) {
+        d->wait();
+        if (!d->hasSucceeded()) {
+            failed = true;
+            LERROR(fmt::format("Error downloading file from URL {}", d->url()));
+            continue;
+        }
+
+        // If we are forcing the override, we download to a temporary file first, so
+        // when we are done here, we need to rename the file to the original name
+
+        std::filesystem::path tempName = d->destination();
+        std::filesystem::path originalName = tempName;
+        // Remove the .tmp extension
+        originalName.replace_extension("");
+
+        if (std::filesystem::is_regular_file(originalName)) {
+            std::filesystem::remove(originalName);
+        }
+
+        std::error_code ec;
+        std::filesystem::rename(tempName, originalName, ec);
+        if (ec) {
+            LERRORC(
+                "URLSynchronization",
+                fmt::format("Error renaming file {} to {}", tempName, originalName)
+            );
+
+            failed = true;
+        }
+    }
+
+    return !failed;
+}
+
 } // namespace openspace
diff --git a/modules/sync/syncs/urlsynchronization.h b/modules/sync/syncs/urlsynchronization.h
index 0b0f85463c..0545d2c6a1 100644
--- a/modules/sync/syncs/urlsynchronization.h
+++ b/modules/sync/syncs/urlsynchronization.h
@@ -77,7 +77,21 @@ public:
 
     static documentation::Documentation Documentation();
 
+protected:
+    /// Read the `ossync` file and check if the downloaded files can be used. Returns 
+    /// `true` if they are valid and `false` if we should download them again
+    bool isEachFileValid();
+
 private:
+    static constexpr double MaxDateAsJ2000 = 252424036869.18289;
+
+    /// Creates a file next to the directory that indicates that this
+    /// ResourceSynchronization has successfully synchronized its contents
+    void createSyncFile(bool isFullySynchronized = true) const override;
+
+    /// Tries to get a reply from the asset URLs and returns that success to the caller
+    bool trySyncUrls(); 
+
     /// The list of URLs that will be downloaded
     std::vector<std::string> _urls;
 
@@ -93,6 +107,9 @@ private:
 
     // The thread that will be doing the synchronization
     std::thread _syncThread;
+
+    /// Determines how long the file is valid before it should be downloaded again
+    double _secondsUntilResync = MaxDateAsJ2000;
 };
 
 } // namespace openspace
diff --git a/src/engine/openspaceengine.cpp b/src/engine/openspaceengine.cpp
index 0d79e58b38..84cf70c4d3 100644
--- a/src/engine/openspaceengine.cpp
+++ b/src/engine/openspaceengine.cpp
@@ -780,8 +780,8 @@ void OpenSpaceEngine::loadAssets() {
                         static_cast<float>(sync->nTotalBytes());
                 }(*it);
 
+                progressInfo.currentSize = (*it)->nSynchronizedBytes();
                 if ((*it)->nTotalBytesIsKnown()) {
-                    progressInfo.currentSize = (*it)->nSynchronizedBytes();
                     progressInfo.totalSize = (*it)->nTotalBytes();
                 }
 
diff --git a/src/rendering/loadingscreen.cpp b/src/rendering/loadingscreen.cpp
index a50aed0e92..c01e39e9cd 100644
--- a/src/rendering/loadingscreen.cpp
+++ b/src/rendering/loadingscreen.cpp
@@ -392,12 +392,12 @@ void LoadingScreen::render() {
 #endif // LOADINGSCREEN_DEBUGGING
 
             std::string text = item.name;
-            if (item.status == ItemStatus::Started && item.progress.progress > 0) {
+            if (item.status == ItemStatus::Started && item.progress.currentSize > 0) {
                 ProgressInfo& info = item.progress;
-                bool hasSecondLine = (info.totalSize != -1 && info.currentSize != -1);
+                const bool isTotalSizeKnown = info.totalSize != -1;
 
                 int p = static_cast<int>(std::round(info.progress * 100));
-                if (hasSecondLine) {
+                if (isTotalSizeKnown) {
                     if (info.totalSize < 1024 * 1024) { // 1MB
                         text = fmt::format(
                             "{} ({}%)\n{}/{} {}",
@@ -415,7 +415,14 @@ void LoadingScreen::render() {
                     }
                 }
                 else {
-                    text = fmt::format("{} ({}%)", text, p);
+                    // We don't know the total size but we have started downloading data
+                    if (info.currentSize < 1024 * 1024) {
+                        text = fmt::format("{}\n{} {}", text, info.currentSize, "bytes");
+                    }
+                    else {
+                        float curr = info.currentSize / (1024.f * 1024.f);
+                        text = fmt::format("{}\n{:.3f} {}", text, curr, "MB");
+                    }
                 }
             }
 
diff --git a/src/util/spicemanager.cpp b/src/util/spicemanager.cpp
index 23fc6c29be..01cd152654 100644
--- a/src/util/spicemanager.cpp
+++ b/src/util/spicemanager.cpp
@@ -154,6 +154,8 @@ SpiceManager::SpiceManager() {
     erract_c("SET", 0, const_cast<char*>("REPORT"));
     // But we do not want SPICE to print the errors, we will fetch them ourselves
     errprt_c("SET", 0, const_cast<char*>("NONE"));
+
+    loadLeapSecondsSpiceKernel();
 }
 
 SpiceManager::~SpiceManager() {
@@ -1349,6 +1351,171 @@ glm::dmat3 SpiceManager::getEstimatedTransformMatrix(const std::string& fromFram
     return result;
 }
 
+void SpiceManager::loadLeapSecondsSpiceKernel() {
+    constexpr std::string_view Naif00012tlsSource = R"(
+KPL/LSK
+
+
+LEAPSECONDS KERNEL FILE
+===========================================================================
+
+Modifications:
+--------------
+
+2016, Jul. 14   NJB  Modified file to account for the leapsecond that
+                     will occur on December 31, 2016.
+
+2015, Jan. 5    NJB  Modified file to account for the leapsecond that
+                     will occur on June 30, 2015.
+
+2012, Jan. 5    NJB  Modified file to account for the leapsecond that
+                     will occur on June 30, 2012.
+                     
+2008, Jul. 7    NJB  Modified file to account for the leapsecond that
+                     will occur on December 31, 2008.
+                     
+2005, Aug. 3    NJB  Modified file to account for the leapsecond that
+                     will occur on December 31, 2005.
+                     
+1998, Jul  17   WLT  Modified file to account for the leapsecond that
+                     will occur on December 31, 1998.
+                     
+1997, Feb  22   WLT  Modified file to account for the leapsecond that
+                     will occur on June 30, 1997.
+                     
+1995, Dec  14   KSZ  Corrected date of last leapsecond from 1-1-95
+                     to 1-1-96.
+
+1995, Oct  25   WLT  Modified file to account for the leapsecond that
+                     will occur on Dec 31, 1995.
+
+1994, Jun  16   WLT  Modified file to account for the leapsecond on
+                     June 30, 1994.
+
+1993, Feb. 22  CHA   Modified file to account for the leapsecond on
+                     June 30, 1993.
+
+1992, Mar. 6   HAN   Modified file to account for the leapsecond on
+                     June 30, 1992.
+
+1990, Oct. 8   HAN   Modified file to account for the leapsecond on 
+                     Dec. 31, 1990.  
+
+
+Explanation:
+------------
+
+The contents of this file are used by the routine DELTET to compute the 
+time difference
+
+[1]       DELTA_ET  =  ET - UTC                                         
+          
+the increment to be applied to UTC to give ET. 
+
+The difference between UTC and TAI,
+
+[2]       DELTA_AT  =  TAI - UTC
+
+is always an integral number of seconds. The value of DELTA_AT was 10
+seconds in January 1972, and increases by one each time a leap second
+is declared. Combining [1] and [2] gives
+
+[3]       DELTA_ET  =  ET - (TAI - DELTA_AT)
+
+                    =  (ET - TAI) + DELTA_AT
+
+The difference (ET - TAI) is periodic, and is given by
+
+[4]       ET - TAI  =  DELTA_T_A  + K sin E 
+
+where DELTA_T_A and K are constant, and E is the eccentric anomaly of the 
+heliocentric orbit of the Earth-Moon barycenter. Equation [4], which ignores 
+small-period fluctuations, is accurate to about 0.000030 seconds.
+
+The eccentric anomaly E is given by 
+
+[5]       E = M + EB sin M
+
+where M is the mean anomaly, which in turn is given by 
+
+[6]       M = M  +  M t
+               0     1
+
+where t is the number of ephemeris seconds past J2000.
+
+Thus, in order to compute DELTA_ET, the following items are necessary.
+
+          DELTA_TA
+          K
+          EB
+          M0
+          M1
+          DELTA_AT      after each leap second.
+
+The numbers, and the formulation, are taken from the following sources.
+
+     1) Moyer, T.D., Transformation from Proper Time on Earth to 
+        Coordinate Time in Solar System Barycentric Space-Time Frame
+        of Reference, Parts 1 and 2, Celestial Mechanics 23 (1981),
+        33-56 and 57-68.
+
+     2) Moyer, T.D., Effects of Conversion to the J2000 Astronomical
+        Reference System on Algorithms for Computing Time Differences
+        and Clock Rates, JPL IOM 314.5--942, 1 October 1985.
+
+The variable names used above are consistent with those used in the 
+Astronomical Almanac.
+
+\begindata
+
+DELTET/DELTA_T_A       =   32.184
+DELTET/K               =    1.657D-3
+DELTET/EB              =    1.671D-2
+DELTET/M               = (  6.239996D0   1.99096871D-7 )
+
+DELTET/DELTA_AT        = ( 10,   @1972-JAN-1
+                           11,   @1972-JUL-1     
+                           12,   @1973-JAN-1     
+                           13,   @1974-JAN-1     
+                           14,   @1975-JAN-1          
+                           15,   @1976-JAN-1          
+                           16,   @1977-JAN-1          
+                           17,   @1978-JAN-1          
+                           18,   @1979-JAN-1          
+                           19,   @1980-JAN-1          
+                           20,   @1981-JUL-1          
+                           21,   @1982-JUL-1          
+                           22,   @1983-JUL-1          
+                           23,   @1985-JUL-1          
+                           24,   @1988-JAN-1 
+                           25,   @1990-JAN-1
+                           26,   @1991-JAN-1 
+                           27,   @1992-JUL-1
+                           28,   @1993-JUL-1
+                           29,   @1994-JUL-1
+                           30,   @1996-JAN-1 
+                           31,   @1997-JUL-1
+                           32,   @1999-JAN-1
+                           33,   @2006-JAN-1
+                           34,   @2009-JAN-1
+                           35,   @2012-JUL-1
+                           36,   @2015-JUL-1 
+                           37,   @2017-JAN-1 )
+
+\begintext
+
+
+)";
+    std::filesystem::path path = std::filesystem::temp_directory_path();
+    std::filesystem::path file = path / "naif0012.tls";
+    {
+        std::ofstream f(file);
+        f << Naif00012tlsSource;
+    }
+    loadKernel(file.string());
+    std::filesystem::remove(file);
+}
+
 void SpiceManager::setExceptionHandling(UseException useException) {
     _useExceptions = useException;
 }

From 639419a51b2d40e91b66990571fdbd21922afc4f Mon Sep 17 00:00:00 2001
From: Emma Broman <emma.broman@liu.se>
Date: Wed, 15 Nov 2023 14:18:04 +0100
Subject: [PATCH 171/701] Issue/1440 - Exoplanet Panel and settings update
 (#2943)

* Add tags that can be used to set object visibility from UI

* Add module property for hiding/showing orbiting uncertainty disc

* Add tag for 1 AU ring and change color to something that's different from orbits

* Add property for circle color

* Add temporary gui hash for easier testing

* Update modules/exoplanets/exoplanetsmodule.cpp

Co-authored-by: Alexander Bock <alexander.bock@liu.se>

* Update GUI hash to correct commit on webgui master

---------

Co-authored-by: Alexander Bock <alexander.bock@liu.se>
---
 data/assets/util/webgui.asset               |  2 +-
 modules/exoplanets/exoplanetsmodule.cpp     | 43 +++++++++++++++++++++
 modules/exoplanets/exoplanetsmodule.h       |  5 +++
 modules/exoplanets/exoplanetsmodule_lua.inl | 20 +++++-----
 4 files changed, 60 insertions(+), 10 deletions(-)

diff --git a/data/assets/util/webgui.asset b/data/assets/util/webgui.asset
index 2059d900f5..4464eff324 100644
--- a/data/assets/util/webgui.asset
+++ b/data/assets/util/webgui.asset
@@ -4,7 +4,7 @@ local guiCustomization = asset.require("customization/gui")
 
 
 -- Select which commit hashes to use for the frontend and backend
-local frontendHash = "26e709be4e4b17d7fcdbd8f53cf681f4f4126b29"
+local frontendHash = "ab3222e9b281ba9964205426a134d6ce5b404d43"
 
 local frontend = asset.resource({
   Identifier = "WebGuiFrontend",
diff --git a/modules/exoplanets/exoplanetsmodule.cpp b/modules/exoplanets/exoplanetsmodule.cpp
index a724c68c5f..b3923b27b4 100644
--- a/modules/exoplanets/exoplanetsmodule.cpp
+++ b/modules/exoplanets/exoplanetsmodule.cpp
@@ -110,6 +110,15 @@ namespace {
         openspace::properties::Property::Visibility::AdvancedUser
     };
 
+    constexpr openspace::properties::Property::PropertyInfo ComparisonCircleColorInfo = {
+        "ComparisonCircleColor",
+        "Comparison Circle Color",
+        "Decides the color of the 1 AU size comparison circles that are generated as part "
+        "of an exoplanet system. Changing the color will not modify already existing "
+        "circles",
+        openspace::properties::Property::Visibility::NoviceUser
+    };
+
     constexpr openspace::properties::Property::PropertyInfo ShowComparisonCircleInfo = {
         "ShowComparisonCircle",
         "Show Comparison Circle",
@@ -119,6 +128,14 @@ namespace {
         openspace::properties::Property::Visibility::NoviceUser
     };
 
+    constexpr openspace::properties::Property::PropertyInfo ShowOrbitUncertaintyInfo = {
+        "ShowOrbitUncertainty",
+        "Show Orbit Uncertainty",
+        "If true, a disc showing the uncertainty for each planetary orbit is enabled per "
+        "default when an exoplanet system is created",
+        openspace::properties::Property::Visibility::User
+    };
+
     constexpr openspace::properties::Property::PropertyInfo ShowHabitableZoneInfo = {
         "ShowHabitableZone",
         "Show Habitable Zone",
@@ -174,9 +191,15 @@ namespace {
        // [[codegen::verbatim(HabitableZoneTextureInfo.description)]]
        std::optional<std::filesystem::path> habitableZoneTexture;
 
+       // [[codegen::verbatim(ComparisonCircleColorInfo.description)]]
+       std::optional<glm::vec3> comparisonCircleColor [[codegen::color()]];
+
        // [[codegen::verbatim(ShowComparisonCircleInfo.description)]]
        std::optional<bool> showComparisonCircle;
 
+       // [[codegen::verbatim(ShowOrbitUncertaintyInfo.description)]]
+       std::optional<bool> showOrbitUncertainty;
+
        // [[codegen::verbatim(ShowHabitableZoneInfo.description)]]
        std::optional<bool> showHabitableZone;
 
@@ -203,7 +226,14 @@ ExoplanetsModule::ExoplanetsModule()
     , _noDataTexturePath(NoDataTextureInfo)
     , _orbitDiscTexturePath(OrbitDiscTextureInfo)
     , _habitableZoneTexturePath(HabitableZoneTextureInfo)
+    , _comparisonCircleColor(
+        ComparisonCircleColorInfo,
+        glm::vec3(0.f, 0.8f, 0.8f),
+        glm::vec3(0.f),
+        glm::vec3(1.f)
+    )
     , _showComparisonCircle(ShowComparisonCircleInfo, false)
+    , _showOrbitUncertainty(ShowOrbitUncertaintyInfo, true)
     , _showHabitableZone(ShowHabitableZoneInfo, true)
     , _useOptimisticZone(UseOptimisticZoneInfo, true)
     , _habitableZoneOpacity(HabitableZoneOpacityInfo, 0.1f, 0.f, 1.f)
@@ -220,7 +250,10 @@ ExoplanetsModule::ExoplanetsModule()
     addProperty(_orbitDiscTexturePath);
     addProperty(_habitableZoneTexturePath);
 
+    _comparisonCircleColor.setViewOption(properties::Property::ViewOptions::Color);
+    addProperty(_comparisonCircleColor);
     addProperty(_showComparisonCircle);
+    addProperty(_showOrbitUncertainty);
     addProperty(_showHabitableZone);
     addProperty(_useOptimisticZone);
 
@@ -279,10 +312,18 @@ std::string ExoplanetsModule::habitableZoneTexturePath() const {
     return _habitableZoneTexturePath;
 }
 
+glm::vec3 ExoplanetsModule::comparisonCircleColor() const {
+    return _comparisonCircleColor;
+}
+
 bool ExoplanetsModule::showComparisonCircle() const {
     return _showComparisonCircle;
 }
 
+bool ExoplanetsModule::showOrbitUncertainty() const {
+    return _showOrbitUncertainty;
+}
+
 bool ExoplanetsModule::showHabitableZone() const {
     return _showHabitableZone;
 }
@@ -328,7 +369,9 @@ void ExoplanetsModule::internalInitialize(const ghoul::Dictionary& dict) {
         _habitableZoneTexturePath = p.habitableZoneTexture.value().string();
     }
 
+    _comparisonCircleColor = p.comparisonCircleColor.value_or(_comparisonCircleColor);
     _showComparisonCircle = p.showComparisonCircle.value_or(_showComparisonCircle);
+    _showOrbitUncertainty = p.showOrbitUncertainty.value_or(_showOrbitUncertainty);
     _showHabitableZone = p.showHabitableZone.value_or(_showHabitableZone);
     _useOptimisticZone = p.useOptimisticZone.value_or(_useOptimisticZone);
 
diff --git a/modules/exoplanets/exoplanetsmodule.h b/modules/exoplanets/exoplanetsmodule.h
index a77b6a43b5..61c748740e 100644
--- a/modules/exoplanets/exoplanetsmodule.h
+++ b/modules/exoplanets/exoplanetsmodule.h
@@ -31,6 +31,7 @@
 #include <openspace/properties/scalar/boolproperty.h>
 #include <openspace/properties/scalar/floatproperty.h>
 #include <openspace/properties/stringproperty.h>
+#include <openspace/properties/vector/vec3property.h>
 
 namespace openspace {
 
@@ -51,7 +52,9 @@ public:
     std::string noDataTexturePath() const;
     std::string orbitDiscTexturePath() const;
     std::string habitableZoneTexturePath() const;
+    glm::vec3 comparisonCircleColor() const;
     bool showComparisonCircle() const;
+    bool showOrbitUncertainty() const;
     bool showHabitableZone() const;
     bool useOptimisticZone() const;
     float habitableZoneOpacity() const;
@@ -71,7 +74,9 @@ protected:
     properties::StringProperty _orbitDiscTexturePath;
     properties::StringProperty _habitableZoneTexturePath;
 
+    properties::Vec3Property _comparisonCircleColor;
     properties::BoolProperty _showComparisonCircle;
+    properties::BoolProperty _showOrbitUncertainty;
     properties::BoolProperty _showHabitableZone;
     properties::BoolProperty _useOptimisticZone;
 
diff --git a/modules/exoplanets/exoplanetsmodule_lua.inl b/modules/exoplanets/exoplanetsmodule_lua.inl
index a7aa2d4f15..9b4677e3f6 100644
--- a/modules/exoplanets/exoplanetsmodule_lua.inl
+++ b/modules/exoplanets/exoplanetsmodule_lua.inl
@@ -355,11 +355,14 @@ void createExoplanetSystem(const std::string& starName,
 
             const std::string discTexture = module->orbitDiscTexturePath();
 
+            bool isDiscEnabled = module->showOrbitUncertainty();
+
             const std::string discNode = "{"
                 "Identifier = '" + planetIdentifier + "_Disc',"
                 "Parent = '" + starIdentifier + "',"
                 "Renderable = {"
                     "Type = 'RenderableOrbitDisc',"
+                    "Enabled = " + (isDiscEnabled ? "true" : "false") +  ","
                     "Texture = openspace.absPath('" +
                         formatPathToLua(discTexture) +
                     "'),"
@@ -377,6 +380,7 @@ void createExoplanetSystem(const std::string& starName,
                         "Rotation = " + ghoul::to_string(rotationMat3) + ""
                     "}"
                 "},"
+                "Tag = {'exoplanet_uncertainty_disc'},"
                 "GUI = {"
                     "Name = '" + planetName + " Disc',"
                     "Path = '" + guiPath + "'"
@@ -402,7 +406,7 @@ void createExoplanetSystem(const std::string& starName,
     const glm::dmat3 meanOrbitPlaneRotationMatrix = static_cast<glm::dmat3>(rotation);
 
     bool isCircleEnabled = module->showComparisonCircle();
-    const std::string isCircleEnabledString = isCircleEnabled ? "true" : "false";
+    glm::vec3 circleColor = module->comparisonCircleColor();
 
     // 1 AU Size Comparison Circle
     const std::string circle = "{"
@@ -410,8 +414,9 @@ void createExoplanetSystem(const std::string& starName,
         "Parent = '" + starIdentifier + "',"
         "Renderable = {"
             "Type = 'RenderableRadialGrid',"
-            "Enabled = " + isCircleEnabledString + ","
+            "Enabled = " + (isCircleEnabled ? "true" : "false") + ","
             "Radii = { 0.0, 1.0 },"
+            "Color = " + ghoul::to_string(circleColor) + ","
             "CircleSegments = 64,"
             "LineWidth = 2.0,"
         "},"
@@ -425,6 +430,7 @@ void createExoplanetSystem(const std::string& starName,
                 "Scale = " + std::to_string(distanceconstants::AstronomicalUnit) + ""
             "}"
         "},"
+        "Tag = {'exoplanet_1au_ring'},"
         "GUI = {"
             "Name = '1 AU Size Comparison Circle',"
             "Path = '" + guiPath + "'"
@@ -455,13 +461,8 @@ void createExoplanetSystem(const std::string& starName,
             "above freezing anywhere on the planet";
 
         const std::string hzTexture = module->habitableZoneTexturePath();
-
         bool isHzEnabled = module->showHabitableZone();
-        const std::string isHzEnabledString = isHzEnabled ? "true" : "false";
-
         bool useOptimistic = module->useOptimisticZone();
-        const std::string useOptimisticString = useOptimistic ? "true" : "false";
-
         float opacity = module->habitableZoneOpacity();
 
         const std::string zoneDiscNode = "{"
@@ -469,11 +470,11 @@ void createExoplanetSystem(const std::string& starName,
             "Parent = '" + starIdentifier + "',"
             "Renderable = {"
                 "Type = 'RenderableHabitableZone',"
-                "Enabled = " + isHzEnabledString + ","
+                "Enabled = " + (isHzEnabled ? "true" : "false") + ","
                 "Texture = openspace.absPath('" + formatPathToLua(hzTexture) + "'),"
                 "Luminosity = " + std::to_string(system.starData.luminosity) + ","
                 "EffectiveTemperature = " + std::to_string(system.starData.teff) + ","
-                "Optimistic = " + useOptimisticString + ","
+                "Optimistic = " + (useOptimistic ? "true" : "false") + ","
                 "Opacity = " + std::to_string(opacity) + ""
             "},"
             "Transform = {"
@@ -482,6 +483,7 @@ void createExoplanetSystem(const std::string& starName,
                     "Rotation = " + ghoul::to_string(meanOrbitPlaneRotationMatrix) + ""
                 "}"
             "},"
+            "Tag = {'exoplanet_habitable_zone'},"
             "GUI = {"
                 "Name = '" + starName + " Habitable Zone',"
                 "Path = '" + guiPath + "',"

From aae4d04c43ef820b58ed5bf76aff13472eac1cff Mon Sep 17 00:00:00 2001
From: Emma Broman <emma.broman@liu.se>
Date: Wed, 15 Nov 2023 16:00:36 +0100
Subject: [PATCH 172/701] Add documentation for camera path instruction
 dictionary

used as input for `openspace.pathnavigation.createPath`
---
 include/openspace/navigation/path.h     | 3 +++
 src/documentation/core_registration.cpp | 8 ++++++--
 src/navigation/path.cpp                 | 6 ++++++
 3 files changed, 15 insertions(+), 2 deletions(-)

diff --git a/include/openspace/navigation/path.h b/include/openspace/navigation/path.h
index 4c984dd10c..0d9851f6c1 100644
--- a/include/openspace/navigation/path.h
+++ b/include/openspace/navigation/path.h
@@ -25,6 +25,7 @@
 #ifndef __OPENSPACE_CORE___PATH___H__
 #define __OPENSPACE_CORE___PATH___H__
 
+#include <openspace/documentation/documentation.h>
 #include <openspace/navigation/pathcurve.h>
 #include <openspace/navigation/waypoint.h>
 #include <ghoul/misc/dictionary.h>
@@ -110,6 +111,8 @@ public:
      */
     void resetPlaybackVariables();
 
+    static documentation::Documentation Documentation();
+
 private:
     /**
      * Interpolate between the paths start and end rotation using the approach that
diff --git a/src/documentation/core_registration.cpp b/src/documentation/core_registration.cpp
index bf1d77309f..5e8b02345c 100644
--- a/src/documentation/core_registration.cpp
+++ b/src/documentation/core_registration.cpp
@@ -36,6 +36,7 @@
 #include <openspace/mission/missionmanager.h>
 #include <openspace/navigation/navigationhandler.h>
 #include <openspace/navigation/navigationstate.h>
+#include <openspace/navigation/path.h>
 #include <openspace/network/parallelpeer.h>
 #include <openspace/rendering/dashboard.h>
 #include <openspace/rendering/renderable.h>
@@ -60,8 +61,9 @@ namespace openspace {
 
 void registerCoreClasses(documentation::DocumentationEngine& engine) {
     engine.addDocumentation(LogFactoryDocumentation());
+
+    engine.addDocumentation(LightSource::Documentation());
     engine.addDocumentation(Mission::Documentation());
-    engine.addDocumentation(interaction::NavigationState::Documentation());
     engine.addDocumentation(Renderable::Documentation());
     engine.addDocumentation(Rotation::Documentation());
     engine.addDocumentation(Scale::Documentation());
@@ -70,7 +72,9 @@ void registerCoreClasses(documentation::DocumentationEngine& engine) {
     engine.addDocumentation(TimeRange::Documentation());
     engine.addDocumentation(Translation::Documentation());
     engine.addDocumentation(TimeFrame::Documentation());
-    engine.addDocumentation(LightSource::Documentation());
+
+    engine.addDocumentation(interaction::NavigationState::Documentation());
+    engine.addDocumentation(interaction::Path::Documentation());
 }
 
 // NOTE: should this be in the documentation/core_reg.cpp file? Seems to be here just
diff --git a/src/navigation/path.cpp b/src/navigation/path.cpp
index e4a723c08f..04c5cfdd1b 100644
--- a/src/navigation/path.cpp
+++ b/src/navigation/path.cpp
@@ -49,6 +49,8 @@ namespace {
     // It's nice to have these to interpret the dictionary when creating the path, but
     // maybe it's not really necessary
     struct [[codegen::Dictionary(PathInstruction)]] Parameters {
+        // The type of the instruction. Decides what other parameters are
+        // handled/available
         enum class TargetType {
             Node,
             NavigationState
@@ -96,6 +98,10 @@ namespace {
 
 namespace openspace::interaction {
 
+documentation::Documentation Path::Documentation() {
+    return codegen::doc<Parameters>("core_path_instruction");
+}
+
 Path::Path(Waypoint start, Waypoint end, Type type, std::optional<double> duration)
     : _start(start)
     , _end(end)

From 5fc9058f76b31884c7c80b70a77c4e5c563e29b0 Mon Sep 17 00:00:00 2001
From: Emma Broman <emma.broman@liu.se>
Date: Wed, 15 Nov 2023 17:19:43 +0100
Subject: [PATCH 173/701] More explicit handling of zero duration paths (#2947)

* More explicit handling of zero duration paths

* Update src/navigation/path.cpp

Co-authored-by: Alexander Bock <alexander.bock@liu.se>

---------

Co-authored-by: Alexander Bock <alexander.bock@liu.se>
---
 src/navigation/path.cpp | 27 ++++++++++++++++++++-------
 1 file changed, 20 insertions(+), 7 deletions(-)

diff --git a/src/navigation/path.cpp b/src/navigation/path.cpp
index 04c5cfdd1b..a796b46595 100644
--- a/src/navigation/path.cpp
+++ b/src/navigation/path.cpp
@@ -126,14 +126,20 @@ Path::Path(Waypoint start, Waypoint end, Type type, std::optional<double> durati
     // computing how much faster/slower it should be
     _speedFactorFromDuration = 1.0;
     if (duration.has_value()) {
-        constexpr double dt = 0.05; // 20 fps
-        while (!hasReachedEnd()) {
-            traversePath(dt);
-        }
+        if (*duration > 0.0) {
+            constexpr double dt = 0.05; // 20 fps
+            while (!hasReachedEnd()) {
+                traversePath(dt);
+            }
 
-        // We now know how long it took to traverse the path. Use that
-        _speedFactorFromDuration = _progressedTime / *duration;
-        resetPlaybackVariables();
+            // We now know how long it took to traverse the path. Use that
+            _speedFactorFromDuration = _progressedTime / *duration;
+            resetPlaybackVariables();
+        }
+        else {
+            // A duration of zero means infinite speed. Handle this explicity
+            _speedFactorFromDuration = std::numeric_limits<double>::infinity();
+        }
     }
 }
 
@@ -154,6 +160,13 @@ std::vector<glm::dvec3> Path::controlPoints() const {
 }
 
 CameraPose Path::traversePath(double dt, float speedScale) {
+    if (std::isinf(_speedFactorFromDuration)) {
+        _shouldQuit = true;
+        _prevPose = _start.pose();
+        _traveledDistance = pathLength();
+        return _end.pose();
+    }
+
     double speed = speedAlongPath(_traveledDistance);
     speed *= static_cast<double>(speedScale);
     double displacement = dt * speed;

From 94ab3332d0c2e9d5b7a6e6d1ed58673664d9ee53 Mon Sep 17 00:00:00 2001
From: Emma Broman <emma.broman@liu.se>
Date: Fri, 17 Nov 2023 13:07:14 +0100
Subject: [PATCH 174/701] Update GUI hash to fix optionproperty rendering bug

---
 data/assets/util/webgui.asset | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/data/assets/util/webgui.asset b/data/assets/util/webgui.asset
index 4464eff324..d3872b531a 100644
--- a/data/assets/util/webgui.asset
+++ b/data/assets/util/webgui.asset
@@ -4,7 +4,7 @@ local guiCustomization = asset.require("customization/gui")
 
 
 -- Select which commit hashes to use for the frontend and backend
-local frontendHash = "ab3222e9b281ba9964205426a134d6ce5b404d43"
+local frontendHash = "d7bac0d84b0a17de7f822fa776a7298b3d4ef372"
 
 local frontend = asset.resource({
   Identifier = "WebGuiFrontend",

From d6369edd18e45f8250d596c98c32f86b4636e2b7 Mon Sep 17 00:00:00 2001
From: Emma Broman <emma.broman@liu.se>
Date: Fri, 17 Nov 2023 15:53:16 +0100
Subject: [PATCH 175/701] Update ghoul (trimming whitespaces in csv)

---
 ext/ghoul | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ext/ghoul b/ext/ghoul
index 50cf606576..e03f640bee 160000
--- a/ext/ghoul
+++ b/ext/ghoul
@@ -1 +1 @@
-Subproject commit 50cf6065769420d36c07dad0c9c5a7f60cfa7bd6
+Subproject commit e03f640bee6200bf38bf9cb37b5e6b155edcf497

From 3c35d230626eca211d6e3295ab9377e048a4a1db Mon Sep 17 00:00:00 2001
From: Alexander Bock <alexander.bock@liu.se>
Date: Sun, 19 Nov 2023 11:51:19 +0100
Subject: [PATCH 176/701] Verifier cleanup (#2952)

* Add a description to structs
* Cleanup
---
 ext/ghoul                                     |   2 +-
 .../openspace/documentation/documentation.h   | 120 ++--
 include/openspace/documentation/verifier.h    | 473 ++++++----------
 include/openspace/documentation/verifier.inl  | 395 -------------
 modules/base/dashboard/dashboarditemangle.cpp |   3 +
 modules/globebrowsing/src/layermanager.cpp    |   1 +
 modules/server/src/serverinterface.cpp        |   6 +-
 modules/spout/renderablespherespout.cpp       |   1 +
 modules/volume/transferfunctionhandler.cpp    |   2 +-
 src/documentation/documentation.cpp           |  14 -
 src/documentation/documentationengine.cpp     |   4 +-
 src/documentation/verifier.cpp                | 114 +---
 .../tasks/convertrecfileversiontask.cpp       |   1 +
 .../tasks/convertrecformattask.cpp            |   1 +
 src/util/factorymanager.cpp                   |   4 +-
 support/coding/codegen                        |   2 +-
 tests/test_documentation.cpp                  | 535 ++++++++----------
 17 files changed, 510 insertions(+), 1168 deletions(-)

diff --git a/ext/ghoul b/ext/ghoul
index e03f640bee..fbd80eae0f 160000
--- a/ext/ghoul
+++ b/ext/ghoul
@@ -1 +1 @@
-Subproject commit e03f640bee6200bf38bf9cb37b5e6b155edcf497
+Subproject commit fbd80eae0ff589a9fa2fb5e2c8af8e4491fe4e2d
diff --git a/include/openspace/documentation/documentation.h b/include/openspace/documentation/documentation.h
index 15ec83ce52..c8c7385613 100644
--- a/include/openspace/documentation/documentation.h
+++ b/include/openspace/documentation/documentation.h
@@ -36,6 +36,8 @@ namespace ghoul { class Dictionary; }
 
 namespace openspace::documentation {
 
+class Verifier;
+
 BooleanType(Optional);
 
 /**
@@ -52,9 +54,7 @@ struct TestResult {
      * offense.
      */
     struct Offense {
-        /**
-         * The Reason for the offense
-         */
+        /// The Reason for the offense
         enum class Reason {
             Unknown,          ///< Unknown reason
             MissingKey,       ///< The offending key that was requested was not found
@@ -78,9 +78,7 @@ struct TestResult {
      * might be removed in a latter version.
      */
     struct Warning {
-        /**
-         * The reason for the warning
-         */
+        /// The reason for the warning
         enum class Reason {
             Deprecated ///< The value is marked as deprecated and should not used
         };
@@ -124,8 +122,6 @@ struct SpecificationError : public ghoul::RuntimeError {
 
 void logError(const SpecificationError& error, std::string component = "");
 
-struct Verifier;
-
 /**
  * A DocumentationEntry provides the specification for a single key, which is tested using
  * the provided Verifier. Each DocumentationEntry can contain a textual documentation that
@@ -172,28 +168,28 @@ struct DocumentationEntry {
         Optional opt, std::string doc = "");
 
     /**
-    * The constructor for a DocumentationEntry describing a key \p k in a Documentation.
-    * The value for the key (or each value in the case of the
-    * DocumentationEntry::Wildcard) is tested using the verifier \p v, that specifies the
-    * conditions that the \p k%'s value has to fulfill. The textual documentation
-    * \p doc shall describe the usage of the key-value pair and will be printed for human
-    * consumption for example in the DocumentationEngine. Each DocumentationEntry can
-    * further be \p opt.
-    *
-    * \param k The key for which this DocumentationEntry is valid. If this valid is
-    *        equal to DocumentationEntry::Wildcard, each entry in the Documentation that
-    *        contains this DocumentationEntry will be matched
-    * \param v The Verifier that is used to test the \p key%'s value to determine if it is
-    *        a valid value. The DocumentationEntry will take ownership of the passed
-    *        object
-    * \param doc The textual documentation that describes the DocumentationEntry in a
-    *        human readable format
-    * \param opt Determines whether the Documentation containing this DocumentationEntry
-    *        must have a key \p key, or whether it is optional
-    *
-    * \pre \p k must not be empty
-    * \pre \p v must not be nullptr
-    */
+     * The constructor for a DocumentationEntry describing a key \p k in a Documentation.
+     * The value for the key (or each value in the case of the
+     * DocumentationEntry::Wildcard) is tested using the verifier \p v, that specifies the
+     * conditions that the \p k%'s value has to fulfill. The textual documentation
+     * \p doc shall describe the usage of the key-value pair and will be printed for human
+     * consumption for example in the DocumentationEngine. Each DocumentationEntry can
+     * further be \p opt.
+     *
+     * \param k The key for which this DocumentationEntry is valid. If this valid is
+     *        equal to DocumentationEntry::Wildcard, each entry in the Documentation that
+     *        contains this DocumentationEntry will be matched
+     * \param v The Verifier that is used to test the \p key%'s value to determine if it
+     *        is a valid value. The DocumentationEntry will take ownership of the passed
+     *        object
+     * \param doc The textual documentation that describes the DocumentationEntry in a
+     *        human readable format
+     * \param opt Determines whether the Documentation containing this DocumentationEntry
+     *        must have a key \p key, or whether it is optional
+     *
+     * \pre \p k must not be empty
+     * \pre \p v must not be nullptr
+     */
     DocumentationEntry(std::string k, Verifier* v, Optional opt,
         std::string doc = "");
 
@@ -232,43 +228,14 @@ Documentation doc = {
  * both the wildcard and the specialized entry will be evaluated.
  */
 struct Documentation {
-    using DocumentationEntries = std::vector<documentation::DocumentationEntry>;
-
-    /**
-     * Creates a Documentation with a human-readable name \p n and a list of entries
-     * \p ents.
-     *
-     * \param n The human-readable name of this Documentation
-     * \param i A unique identifier which can be used by applications (or other
-     *        Documentation%s to reference this entry
-     * \param ents A list of DocumentationEntry%s that describe the individual keys for
-     *        this entrie Documentation
-     */
-    Documentation(std::string n, std::string i, DocumentationEntries ents = {});
-
-    /**
-    * Creates a Documentation with a human-readable name \p n.
-    *
-    * \param n The human-readable name of this Documentation
-    * \param ents A list of DocumentationEntry%s that describe the individual keys for
-    *        this entrie Documentation
-    */
-    Documentation(std::string n, DocumentationEntries ents = {});
-
-    /**
-    * Creates a Documentation.
-    *
-    * \param entries A list of DocumentationEntry%s that describe the individual keys for
-    *        this entrie Documentation
-    */
-    Documentation(DocumentationEntries ents = {});
-
     /// The human-readable name of the Documentation
     std::string name;
     /// A unique identifier which can be used to reference this Documentation
     std::string id;
+    /// A general description for the entire documented entity
+    std::string description;
     /// A list of specifications that are describing this Documentation
-    DocumentationEntries entries;
+    std::vector<documentation::DocumentationEntry> entries;
 };
 
 /**
@@ -287,20 +254,21 @@ TestResult testSpecification(const Documentation& documentation,
     const ghoul::Dictionary& dictionary);
 
 /**
-* This method tests whether a provided ghoul::Dictionary \p dictionary adheres to the
-* specification \p documentation. If the \p dictionary does not adhere to the
-* specification a SpecificationError is thrown, and the exception contains the TestResult
-* that contains more information about the offending keys. If the \p dictionary adheres to
-* the \p documentation, the method returns normally.
-*
-* \param documentation The Documentation that the \p dictionary is tested against
-* \param dictionary The ghoul::Dictionary that is to be tested against the
-*        \p documentation
-* \param component The component that is using this method; this argument is passed to the
-*        SpecificationError that is thrown in case of not adhering to the \p documentation
-*
-* \throw SpecificationError If the \p dictionary does not adhere to the \p documentation
-*/
+ * This method tests whether a provided ghoul::Dictionary \p dictionary adheres to the
+ * specification \p documentation. If the \p dictionary does not adhere to the
+ * specification a SpecificationError is thrown, and the exception contains the TestResult
+ * that contains more information about the offending keys. If the \p dictionary adheres
+ * to the \p documentation, the method returns normally.
+ *
+ * \param documentation The Documentation that the \p dictionary is tested against
+ * \param dictionary The ghoul::Dictionary that is to be tested against the
+ *        \p documentation
+ * \param component The component that is using this method; this argument is passed to
+ *        the SpecificationError that is thrown in case of not adhering to the
+ *        \p documentation
+ *
+ * \throw SpecificationError If the \p dictionary does not adhere to the \p documentation
+ */
 void testSpecificationAndThrow(const Documentation& documentation,
     const ghoul::Dictionary& dictionary, std::string component);
 
diff --git a/include/openspace/documentation/verifier.h b/include/openspace/documentation/verifier.h
index dd263a6ea5..6bc3d302f9 100644
--- a/include/openspace/documentation/verifier.h
+++ b/include/openspace/documentation/verifier.h
@@ -41,7 +41,8 @@ namespace openspace::documentation {
  * Verifier. Furthermore, the Verifier::documentation method returns a human-readable
  * description of the Verifier subclass and what it tests for.
  */
-struct Verifier {
+class Verifier {
+public:
     virtual ~Verifier() = default;
 
     /**
@@ -100,7 +101,8 @@ struct Verifier {
  * \tparam T The type against which the key's value is tested
  */
 template <typename T>
-struct TemplateVerifier : public Verifier {
+class TemplateVerifier : public Verifier {
+public:
     using Type = T;
 
     /**
@@ -126,7 +128,8 @@ struct TemplateVerifier : public Verifier {
  * A Verifier that checks whether a given key inside a ghoul::Dictionary is of type
  * `bool`. No implicit conversion is considered in this testing.
  */
-struct BoolVerifier : public TemplateVerifier<bool> {
+class BoolVerifier : public TemplateVerifier<bool> {
+public:
     std::string type() const override;
 };
 
@@ -134,7 +137,8 @@ struct BoolVerifier : public TemplateVerifier<bool> {
  * A Verifier that checks whether a given key inside a ghoul::Dictionary is of type
  * `double`. No implicit conversion is considered in this testing.
  */
-struct DoubleVerifier : public TemplateVerifier<double> {
+class DoubleVerifier : public TemplateVerifier<double> {
+public:
     std::string type() const override;
 };
 
@@ -143,7 +147,8 @@ struct DoubleVerifier : public TemplateVerifier<double> {
  * `int`. It will also return `true` if the key's value is of type `double`, but is a
  * integer value (for example, `0.0`, `12.0`, but not `0.5`).
  */
-struct IntVerifier : public TemplateVerifier<int> {
+class IntVerifier : public TemplateVerifier<int> {
+public:
     TestResult operator()(const ghoul::Dictionary& dict,
         const std::string& key) const override;
 
@@ -154,7 +159,8 @@ struct IntVerifier : public TemplateVerifier<int> {
  * A Verifier that checks whether a given key inside a ghoul::Dictionary is of type
  * `std::string`. No implicit conversion is considered in this testing.
  */
-struct StringVerifier : public TemplateVerifier<std::string> {
+class StringVerifier : public TemplateVerifier<std::string> {
+public:
     StringVerifier(bool mustBeNotEmpty = false);
 
     TestResult operator()(const ghoul::Dictionary& dictionary,
@@ -172,7 +178,8 @@ private:
  * A Verifier that checks whether a given string is a valid identifier, meaning that is
  * does not contain any whitespaces or dots
  */
-struct IdentifierVerifier : public StringVerifier {
+class IdentifierVerifier : public StringVerifier {
+public:
     IdentifierVerifier();
 
     TestResult operator()(const ghoul::Dictionary& dict,
@@ -187,7 +194,8 @@ struct IdentifierVerifier : public StringVerifier {
  * A Verifier that checks whether a given key inside a ghoul::Dictionary is a string and
  * refers to an existing file on disk.
  */
-struct FileVerifier : public StringVerifier {
+class FileVerifier : public StringVerifier {
+public:
     FileVerifier();
 
     TestResult operator()(const ghoul::Dictionary& dict,
@@ -197,10 +205,11 @@ struct FileVerifier : public StringVerifier {
 };
 
 /**
-* A Verifier that checks whether a given key inside a ghoul::Dictionary is a string and
-* refers to an existing directory on disk.
-*/
-struct DirectoryVerifier : public StringVerifier {
+ * A Verifier that checks whether a given key inside a ghoul::Dictionary is a string and
+ * refers to an existing directory on disk.
+ */
+class DirectoryVerifier : public StringVerifier {
+public:
     DirectoryVerifier();
 
     TestResult operator()(const ghoul::Dictionary& dict,
@@ -213,7 +222,8 @@ struct DirectoryVerifier : public StringVerifier {
  * A Verifier that checks whether a given key inside a ghoul::Dictionary is a string and
  * a valid date time
  */
-struct DateTimeVerifier : public StringVerifier {
+class DateTimeVerifier : public StringVerifier {
+public:
     DateTimeVerifier();
 
     TestResult operator()(const ghoul::Dictionary& dict,
@@ -232,7 +242,8 @@ struct DateTimeVerifier : public StringVerifier {
  * DocumentationEntry checks for a nested key `a` and this does not comply, this Verifier
  * will return `Table.a` as an offender.
  */
-struct TableVerifier : public TemplateVerifier<ghoul::Dictionary> {
+class TableVerifier : public TemplateVerifier<ghoul::Dictionary> {
+public:
     /**
      * This constructor takes a list of DocumentationEntry%s that are used recursively to
      * check the table (= ghoul::Dictionary) contained in the key's value. Similar to the
@@ -270,7 +281,8 @@ struct TableVerifier : public TemplateVerifier<ghoul::Dictionary> {
 /**
  * A Verifier that checks whether all values contained in a Table are of type `string`.
  */
-struct StringListVerifier : public TableVerifier {
+class StringListVerifier : public TableVerifier {
+public:
     /**
      * Constructor for a StringListVerifier.
      *
@@ -284,7 +296,8 @@ struct StringListVerifier : public TableVerifier {
 /**
  * A Verifier that checks whether all values contained in a Table are of type `int`.
  */
-struct IntListVerifier : public TableVerifier {
+class IntListVerifier : public TableVerifier {
+public:
     /**
      * Constructor for a IntListVerifier.
      *
@@ -299,40 +312,37 @@ struct IntListVerifier : public TableVerifier {
 // Vector verifiers
 //----------------------------------------------------------------------------------------
 
-/**
- * This struct is the base class for all Verifier%s that check for `glm` vector types.
- * The template parameter for the subclasses is the containing type, not the full vector
- * type. For example to check for `glm::dvec3`, one would create a
- * `Vector3Verifier<double>`.
- */
-struct VectorVerifier {};
-
 /// This Verifier checks whether the value is of type `glm::tvec2<T>`
 template <typename T>
-struct Vector2Verifier : public TemplateVerifier<glm::tvec2<T>>, public VectorVerifier {
+class Vector2Verifier : public TemplateVerifier<glm::tvec2<T>> {
+public:
     std::string type() const override;
 };
 
 /// This Verifier checks whether the value is of type `glm::tvec3<T>`
 template <typename T>
-struct Vector3Verifier : public TemplateVerifier<glm::tvec3<T>>, public VectorVerifier {
+class Vector3Verifier : public TemplateVerifier<glm::tvec3<T>> {
+public:
     std::string type() const override;
 };
 
 /// This Verifier checks whether the value is of type `glm::tvec4<T>`
 template <typename T>
-struct Vector4Verifier : public TemplateVerifier<glm::tvec4<T>>, public VectorVerifier {
+class Vector4Verifier : public TemplateVerifier<glm::tvec4<T>> {
+public:
     std::string type() const override;
 };
 
-struct Color3Verifier : public Vector3Verifier<double> {
+class Color3Verifier : public Vector3Verifier<double> {
+public:
     TestResult operator()(const ghoul::Dictionary& dictionary,
         const std::string& key) const override;
 
     std::string type() const override;
 };
 
-struct Color4Verifier : public Vector4Verifier<double> {
+class Color4Verifier : public Vector4Verifier<double> {
+public:
     TestResult operator()(const ghoul::Dictionary& dictionary,
         const std::string& key) const override;
 
@@ -344,7 +354,8 @@ struct Color4Verifier : public Vector4Verifier<double> {
  * type `glm::tvec2<T>`
  */
 template <typename T>
-struct Vector2ListVerifier : public TableVerifier {
+class Vector2ListVerifier : public TableVerifier {
+public:
     Vector2ListVerifier(std::string elementDocumentation = "")
         : TableVerifier({
             { "*", new Vector2Verifier<T>, Optional::No, std::move(elementDocumentation) }
@@ -361,7 +372,8 @@ struct Vector2ListVerifier : public TableVerifier {
  * type `glm::tvec3<T>`
  */
 template <typename T>
-struct Vector3ListVerifier : public TableVerifier {
+class Vector3ListVerifier : public TableVerifier {
+public:
     Vector3ListVerifier(std::string elementDocumentation = "")
         : TableVerifier({
             { "*", new Vector3Verifier<T>, Optional::No, std::move(elementDocumentation) }
@@ -378,7 +390,8 @@ struct Vector3ListVerifier : public TableVerifier {
  * type `glm::tvec4<T>`
  */
 template <typename T>
-struct Vector4ListVerifier : public TableVerifier {
+class Vector4ListVerifier : public TableVerifier {
+public:
     Vector4ListVerifier(std::string elementDocumentation = "")
         : TableVerifier({
             { "*", new Vector4Verifier<T>, Optional::No, std::move(elementDocumentation) }
@@ -394,20 +407,12 @@ struct Vector4ListVerifier : public TableVerifier {
 // Matrix verifiers
 //----------------------------------------------------------------------------------------
 
-/**
- * This struct is the base class for all Verifier%s that check for `glm` matrix types.
- * The template parameter for the subclasses is the containing type, not the full matrix
- * type. For example to check for `glm::dmat4x3`, one would create a
- * `Matrix4x3Verifier<double>`.
- */
-struct MatrixVerifier {};
-
 /**
  * This Verifier checks whether the value is of type `glm::mat2x2<T>`
  */
 template <typename T>
-struct Matrix2x2Verifier : public TemplateVerifier<glm::tmat2x2<T>>, public MatrixVerifier
-{
+class Matrix2x2Verifier : public TemplateVerifier<glm::tmat2x2<T>> {
+public:
     std::string type() const override;
 };
 
@@ -415,8 +420,8 @@ struct Matrix2x2Verifier : public TemplateVerifier<glm::tmat2x2<T>>, public Matr
  * This Verifier checks whether the value is of type `glm::mat2x3<T>`
  */
 template <typename T>
-struct Matrix2x3Verifier : public TemplateVerifier<glm::tmat2x3<T>>, public MatrixVerifier
-{
+class Matrix2x3Verifier : public TemplateVerifier<glm::tmat2x3<T>> {
+public:
     std::string type() const override;
 };
 
@@ -424,8 +429,8 @@ struct Matrix2x3Verifier : public TemplateVerifier<glm::tmat2x3<T>>, public Matr
  * This Verifier checks whether the value is of type `glm::mat2x4<T>`
  */
 template <typename T>
-struct Matrix2x4Verifier : public TemplateVerifier<glm::tmat2x4<T>>, public MatrixVerifier
-{
+class Matrix2x4Verifier : public TemplateVerifier<glm::tmat2x4<T>> {
+public:
     std::string type() const override;
 };
 
@@ -433,8 +438,8 @@ struct Matrix2x4Verifier : public TemplateVerifier<glm::tmat2x4<T>>, public Matr
  * This Verifier checks whether the value is of type `glm::mat3x2<T>`
  */
 template <typename T>
-struct Matrix3x2Verifier : public TemplateVerifier<glm::tmat3x2<T>>, public MatrixVerifier
-{
+class Matrix3x2Verifier : public TemplateVerifier<glm::tmat3x2<T>> {
+public:
     std::string type() const override;
 };
 
@@ -442,8 +447,8 @@ struct Matrix3x2Verifier : public TemplateVerifier<glm::tmat3x2<T>>, public Matr
  * This Verifier checks whether the value is of type `glm::mat3x3<T>`
  */
 template <typename T>
-struct Matrix3x3Verifier : public TemplateVerifier<glm::tmat3x3<T>>, public MatrixVerifier
-{
+class Matrix3x3Verifier : public TemplateVerifier<glm::tmat3x3<T>> {
+public:
     std::string type() const override;
 };
 
@@ -451,8 +456,8 @@ struct Matrix3x3Verifier : public TemplateVerifier<glm::tmat3x3<T>>, public Matr
  * This Verifier checks whether the value is of type `glm::mat3x4<T>`
  */
 template <typename T>
-struct Matrix3x4Verifier : public TemplateVerifier<glm::tmat3x4<T>>, public MatrixVerifier
-{
+class Matrix3x4Verifier : public TemplateVerifier<glm::tmat3x4<T>> {
+public:
     std::string type() const override;
 };
 
@@ -460,8 +465,8 @@ struct Matrix3x4Verifier : public TemplateVerifier<glm::tmat3x4<T>>, public Matr
  * This Verifier checks whether the value is of type `glm::mat4x2<T>`
  */
 template <typename T>
-struct Matrix4x2Verifier : public TemplateVerifier<glm::tmat4x2<T>>, public MatrixVerifier
-{
+class Matrix4x2Verifier : public TemplateVerifier<glm::tmat4x2<T>> {
+public:
     std::string type() const override;
 };
 
@@ -469,8 +474,8 @@ struct Matrix4x2Verifier : public TemplateVerifier<glm::tmat4x2<T>>, public Matr
  * This Verifier checks whether the value is of type `glm::mat4x3<T>`
  */
 template <typename T>
-struct Matrix4x3Verifier : public TemplateVerifier<glm::tmat4x3<T>>, public MatrixVerifier
-{
+class Matrix4x3Verifier : public TemplateVerifier<glm::tmat4x3<T>> {
+public:
     std::string type() const override;
 };
 
@@ -478,8 +483,8 @@ struct Matrix4x3Verifier : public TemplateVerifier<glm::tmat4x3<T>>, public Matr
  * This Verifier checks whether the value is of type `glm::mat4x4<T>`
  */
 template <typename T>
-struct Matrix4x4Verifier : public TemplateVerifier<glm::tmat4x4<T>>, public MatrixVerifier
-{
+class Matrix4x4Verifier : public TemplateVerifier<glm::tmat4x4<T>> {
+public:
     std::string type() const override;
 };
 
@@ -503,7 +508,8 @@ struct Matrix4x4Verifier : public TemplateVerifier<glm::tmat4x4<T>>, public Matr
  * reason TestResult::Offense::Verification is returned instead.
  */
 template <typename T, typename Operator>
-struct OperatorVerifier : public T {
+class OperatorVerifier : public T {
+public:
     /**
      * Constructor for an OperatorVerifier. As all operators need to compare the incoming
      * value to a stored value, we require the comparison \p value to be passed in here.
@@ -539,18 +545,17 @@ struct OperatorVerifier : public T {
  * as) BoolVerifier, StringVerifier, TableVerifier, or VectorVerifier.
  */
 template <typename T>
-struct LessVerifier : public OperatorVerifier<T, std::less<typename T::Type>> {
-    static_assert(!std::is_base_of<BoolVerifier, T>::value, "T cannot be BoolVerifier");
-    static_assert(
-        !std::is_base_of<StringVerifier, T>::value, "T cannot be StringVerifier"
-    );
-    static_assert(!std::is_base_of<TableVerifier, T>::value, "T cannot be TableVerifier");
-
+class LessVerifier : public OperatorVerifier<T, std::less<typename T::Type>> {
+public:
     using OperatorVerifier<T, std::less<typename T::Type>>::OperatorVerifier;
+    using OperatorVerifier<T, std::less<typename T::Type>>::value;
 
     std::string documentation() const override;
 
-    using OperatorVerifier<T, std::less<typename T::Type>>::value;
+private:
+    static_assert(!std::is_base_of_v<BoolVerifier, T>, "T cannot be BoolVerifier");
+    static_assert(!std::is_base_of_v<StringVerifier, T>, "T cannot be StringVerifier");
+    static_assert(!std::is_base_of_v<TableVerifier, T>, "T cannot be TableVerifier");
 };
 
 /**
@@ -559,19 +564,17 @@ struct LessVerifier : public OperatorVerifier<T, std::less<typename T::Type>> {
  * as) BoolVerifier, StringVerifier, TableVerifier, or VectorVerifier.
  */
 template <typename T>
-struct LessEqualVerifier : public OperatorVerifier<T, std::less_equal<typename T::Type>> {
-    static_assert(!std::is_base_of<BoolVerifier, T>::value, "T cannot be BoolVerifier");
-    static_assert(
-        !std::is_base_of<StringVerifier, T>::value,
-        "T cannot be StringVerifier"
-    );
-    static_assert(!std::is_base_of<TableVerifier, T>::value, "T cannot be TableVerifier");
-
+class LessEqualVerifier : public OperatorVerifier<T, std::less_equal<typename T::Type>> {
+public:
     using OperatorVerifier<T, std::less_equal<typename T::Type>>::OperatorVerifier;
+    using OperatorVerifier<T, std::less_equal<typename T::Type>>::value;
 
     std::string documentation() const override;
 
-    using OperatorVerifier<T, std::less_equal<typename T::Type>>::value;
+private:
+    static_assert(!std::is_base_of_v<BoolVerifier, T>, "T cannot be BoolVerifier");
+    static_assert(!std::is_base_of_v<StringVerifier, T>, "T cannot be StringVerifier");
+    static_assert(!std::is_base_of_v<TableVerifier, T>, "T cannot be TableVerifier");
 };
 
 /**
@@ -580,19 +583,17 @@ struct LessEqualVerifier : public OperatorVerifier<T, std::less_equal<typename T
  * as) BoolVerifier, StringVerifier, TableVerifier, or VectorVerifier.
  */
 template <typename T>
-struct GreaterVerifier : public OperatorVerifier<T, std::greater<typename T::Type>> {
-    static_assert(!std::is_base_of<BoolVerifier, T>::value, "T cannot be BoolVerifier");
-    static_assert(
-        !std::is_base_of<StringVerifier, T>::value,
-        "T cannot be StringVerifier"
-    );
-    static_assert(!std::is_base_of<TableVerifier, T>::value, "T cannot be TableVerifier");
-
+class GreaterVerifier : public OperatorVerifier<T, std::greater<typename T::Type>> {
+public:
     using OperatorVerifier<T, std::greater<typename T::Type>>::OperatorVerifier;
+    using OperatorVerifier<T, std::greater<typename T::Type>>::value;
 
     std::string documentation() const override;
 
-    using OperatorVerifier<T, std::greater<typename T::Type>>::value;
+private:
+    static_assert(!std::is_base_of_v<BoolVerifier, T>, "T cannot be BoolVerifier");
+    static_assert(!std::is_base_of_v<StringVerifier, T>, "T cannot be StringVerifier");
+    static_assert(!std::is_base_of_v<TableVerifier, T>, "T cannot be TableVerifier");
 };
 
 /**
@@ -601,21 +602,19 @@ struct GreaterVerifier : public OperatorVerifier<T, std::greater<typename T::Typ
  * as) BoolVerifier, StringVerifier, TableVerifier, or VectorVerifier.
  */
 template <typename T>
-struct GreaterEqualVerifier : public OperatorVerifier<T,
+class GreaterEqualVerifier : public OperatorVerifier<T,
                                                      std::greater_equal<typename T::Type>>
 {
-    static_assert(!std::is_base_of<BoolVerifier, T>::value, "T cannot be BoolVerifier");
-    static_assert(
-        !std::is_base_of<StringVerifier, T>::value,
-        "T cannot be StringVerifier"
-    );
-    static_assert(!std::is_base_of<TableVerifier, T>::value, "T cannot be TableVerifier");
-
+public:
     using OperatorVerifier<T, std::greater_equal<typename T::Type>>::OperatorVerifier;
+    using OperatorVerifier<T, std::greater_equal<typename T::Type>>::value;
 
     std::string documentation() const override;
 
-    using OperatorVerifier<T, std::greater_equal<typename T::Type>>::value;
+private:
+    static_assert(!std::is_base_of_v<BoolVerifier, T>, "T cannot be BoolVerifier");
+    static_assert(!std::is_base_of_v<StringVerifier, T>, "T cannot be StringVerifier");
+    static_assert(!std::is_base_of_v<TableVerifier, T>, "T cannot be TableVerifier");
 };
 
 /**
@@ -624,14 +623,15 @@ struct GreaterEqualVerifier : public OperatorVerifier<T,
  * TableVerifier.
  */
 template <typename T>
-struct EqualVerifier : public OperatorVerifier<T, std::equal_to<typename T::Type>> {
-    static_assert(!std::is_base_of<TableVerifier, T>::value, "T cannot be TableVerifier");
-
+class EqualVerifier : public OperatorVerifier<T, std::equal_to<typename T::Type>> {
+public:
     using OperatorVerifier<T, std::equal_to<typename T::Type>>::OperatorVerifier;
+    using OperatorVerifier<T, std::equal_to<typename T::Type>>::value;
 
     std::string documentation() const override;
 
-    using OperatorVerifier<T, std::equal_to<typename T::Type>>::value;
+private:
+    static_assert(!std::is_base_of_v<TableVerifier, T>, "T cannot be TableVerifier");
 };
 
 /**
@@ -640,14 +640,15 @@ struct EqualVerifier : public OperatorVerifier<T, std::equal_to<typename T::Type
  * TableVerifier.
  */
 template <typename T>
-struct UnequalVerifier : public OperatorVerifier<T, std::not_equal_to<typename T::Type>> {
-    static_assert(!std::is_base_of<TableVerifier, T>::value, "T cannot be TableVerifier");
-
+class UnequalVerifier : public OperatorVerifier<T, std::not_equal_to<typename T::Type>> {
+public:
     using OperatorVerifier<T, std::not_equal_to<typename T::Type>>::OperatorVerifier;
+    using OperatorVerifier<T, std::not_equal_to<typename T::Type>>::value;
 
     std::string documentation() const override;
 
-    using OperatorVerifier<T, std::not_equal_to<typename T::Type>>::value;
+private:
+    static_assert(!std::is_base_of_v<TableVerifier, T>, "T cannot be TableVerifier");
 };
 
 //----------------------------------------------------------------------------------------
@@ -661,9 +662,8 @@ struct UnequalVerifier : public OperatorVerifier<T, std::not_equal_to<typename T
  * be a subclass of (or the same as) TableVerifier.
  */
 template <typename T>
-struct InListVerifier : public T {
-    static_assert(!std::is_base_of<TableVerifier, T>::value, "T cannot be TableVerifier");
-
+class InListVerifier : public T {
+public:
     /**
      * Constructs an InListVerifier that checks whether the incoming value is of the
      * correct type and whether the value is part of the list passed as \p values.
@@ -692,6 +692,9 @@ struct InListVerifier : public T {
 
     /// The list of values against which the incoming value is tested
     std::vector<typename T::Type> values;
+
+private:
+    static_assert(!std::is_base_of_v<TableVerifier, T>, "T cannot be TableVerifier");
 };
 
 /**
@@ -701,9 +704,8 @@ struct InListVerifier : public T {
  * be a subclass of (or the same as) TableVerifier.
  */
 template <typename T>
-struct NotInListVerifier : public T {
-    static_assert(!std::is_base_of<TableVerifier, T>::value, "T cannot be TableVerifier");
-
+class NotInListVerifier : public T {
+public:
     /**
      * Constructs a NotInListVerifier that checks whether the incoming value is of the
      * correct type and whether the value is not part of the list passed as \p values.
@@ -731,6 +733,9 @@ struct NotInListVerifier : public T {
     std::string documentation() const override;
 
     std::vector<typename T::Type> values;
+
+private:
+    static_assert(!std::is_base_of_v<TableVerifier, T>, "T cannot be TableVerifier");
 };
 
 //----------------------------------------------------------------------------------------
@@ -745,20 +750,8 @@ struct NotInListVerifier : public T {
  * TableVerifier, or VectorVerifier. Both the lower and the higher limit are inclusive).
  */
 template <typename T>
-struct InRangeVerifier : public T {
-    static_assert(
-        !std::is_base_of<BoolVerifier, T>::value,
-        "T cannot be BoolVerifier"
-    );
-    static_assert(
-        !std::is_base_of<StringVerifier, T>::value,
-        "T cannot be StringVerifier"
-    );
-    static_assert(
-        !std::is_base_of<TableVerifier, T>::value,
-        "T cannot be TableVerifier"
-    );
-
+class InRangeVerifier : public T {
+public:
     /**
      * Constructs a InRangeVerifier that checks whether the incoming value is of the
      * correct type and whether the value is greater or equal to \p lower and less or
@@ -793,6 +786,11 @@ struct InRangeVerifier : public T {
 
     typename T::Type lower;
     typename T::Type upper;
+
+private:
+    static_assert(!std::is_base_of_v<BoolVerifier, T>, "T cannot be BoolVerifier");
+    static_assert(!std::is_base_of_v<StringVerifier, T>, "T cannot be StringVerifier");
+    static_assert(!std::is_base_of_v<TableVerifier, T>, "T cannot be TableVerifier");
 };
 
 /**
@@ -803,20 +801,8 @@ struct InRangeVerifier : public T {
  * TableVerifier, or VectorVerifier. Both the lower and the higher limit are exclusive).
  */
 template <typename T>
-struct NotInRangeVerifier : public T {
-    static_assert(
-        !std::is_base_of<BoolVerifier, T>::value,
-        "T cannot be BoolVerifier"
-    );
-    static_assert(
-        !std::is_base_of<StringVerifier, T>::value,
-        "T cannot be StringVerifier"
-    );
-    static_assert(
-        !std::is_base_of<TableVerifier, T>::value,
-        "T cannot be TableVerifier"
-    );
-
+class NotInRangeVerifier : public T {
+public:
     /**
      * Constructs a InRangeVerifier that checks whether the incoming value is of the
      * correct type and whether the value is less then \p lower and greater than \p upper.
@@ -850,6 +836,11 @@ struct NotInRangeVerifier : public T {
 
     typename T::Type lower;
     typename T::Type upper;
+
+private:
+    static_assert(!std::is_base_of_v<BoolVerifier, T>, "T cannot be BoolVerifier");
+    static_assert(!std::is_base_of_v<StringVerifier, T>, "T cannot be StringVerifier");
+    static_assert(!std::is_base_of_v<TableVerifier, T>, "T cannot be TableVerifier");
 };
 
 
@@ -865,7 +856,8 @@ struct NotInRangeVerifier : public T {
  * the user that the parameter should be a file of a specific type.
  */
 template <typename T>
-struct AnnotationVerifier : public T {
+class AnnotationVerifier : public T {
+public:
     /**
      * Constructs an AnnotationVerifier that contains the passed \p annotation which is
      * passed to the user when a documentation is requested.
@@ -883,34 +875,6 @@ struct AnnotationVerifier : public T {
     std::string annotation;
 };
 
-/**
- * This Verifier is a marker that performs the same testing as the `T` parameter, but
- * also adds a warning to the test result informing the user of the deprecation.
- * Furthermore, the documentation will contain the word `(deprecated)` in
- * addition to the documentation returned by `T`
- * \tparam T The Verifier that is to be marked deprecated
- */
-template <typename T>
-struct DeprecatedVerifier : public T {
-    /**
-     * Tests the \p dictionary%s \p key using the Verifier `T` and adds a warning to the
-     * TestResult informing the caller of the deprecation.
-     *
-     * \param dictionary The ghoul::Dictionary whose \p key should be tested
-     * \param key The key inside the \p dictionary that is to be tested
-     * \return A TestResult that contains the results of the testing
-     */
-    TestResult operator()(const ghoul::Dictionary& dictionary,
-                          const std::string& key) const override;
-
-    /**
-     * Returns the documentation as reported by `T` and adds the word
-     * `(deprecated)` to it.
-     * \return The deprecated version of `T`%'s documentation
-     */
-    std::string documentation() const override;
-};
-
 /**
  * This Verifier can reference and apply other Documentation%s that have been registered
  * with a DocumentationEngine. The dependency is only resolved when the operator() is
@@ -919,7 +883,8 @@ struct DeprecatedVerifier : public T {
  * If the referenced Documentation exists, the stored Table will be checked against that
  * Documentation.
  */
-struct ReferencingVerifier : public TableVerifier {
+class ReferencingVerifier : public TableVerifier {
+public:
     /**
      * Creates a ReferencingVerifier that references a documentation with the provided
      * identifier \p identifier. The ReferencingVerifier will use the static
@@ -958,54 +923,14 @@ struct ReferencingVerifier : public TableVerifier {
 // Misc verifiers
 //----------------------------------------------------------------------------------------
 
-/**
- * This Verifier takes two Verifiers and performs a boolean `and` operation on their
- * results. In essence, a value only passes this Verifier if it passes both Verifier%s
- * that are passed in the constructor. Opposed to the `C++` `&&`
- * operator, the AndVerifier does not perform any short-circut evaluation.
- */
-struct AndVerifier : public Verifier {
-    /**
-     * Constructs an AndVerifier with Verifiers that must be cleared by incoming values in
-     * order to pass this Verifier.
-     *
-     * \param values The list of Verifiers that are to be tested
-     *
-     * \pre values must contain at least two values
-     */
-    AndVerifier(const std::vector<Verifier*> values);
-
-    /**
-     * Checks whether the \p dictionary contains the \p key and whether this key passes
-     * all Verifier%s that were passed in the constructor. If the value fails at least
-     * one Verifiers, it is only added once to the TestResult::offenses list with a reason
-     * of TestResult::Offense::Reason::Verification.
-     *
-     * \param dictionary The ghoul::Dictionary that is to be tested
-     * \param key The key contained in \p dictionary that is to be tested
-     * \return A TestResult object that contains the test results. If the value fails
-     *         any passed  Verifiers, TestResult::success is `false` and the
-     *         TestResult::offenses list contains \p with a reason of
-     *         TestResult::Offense::Reason::Verification. If \p key%'s value passes both
-     *         Verifier%s, the result's TestResult::success is `true` and the
-     *         TestResult::offenses is empty.
-     */
-    TestResult operator()(const ghoul::Dictionary& dictionary,
-        const std::string& key) const override;
-
-    std::string type() const override;
-    std::string documentation() const override;
-
-    std::vector<std::shared_ptr<Verifier>> values;
-};
-
 /**
  * This Verifier takes two Verifiers and performs a boolean `or` operation on their
  * results. In essence, a value only passes this Verifier if it passes either of the two
  * Verifier%s that are passed in the constructor. Opposed to the `C++` `||` operator, the
  * OrVerifier does not perform any short-circut evaluation.
  */
-struct OrVerifier : public Verifier {
+class OrVerifier : public Verifier {
+public:
     /**
      * Constructs an OrVerifier with Verifiers that must be cleared by incoming values in
      * order to pass this Verifier.
@@ -1161,92 +1086,68 @@ using StringAnnotationVerifier = AnnotationVerifier<StringVerifier>;
 /// `ghoul::Dictionary`
 using TableAnnotationVerifier = AnnotationVerifier<TableVerifier>;
 
-/// A short-hand definition for a DeprecatedVerifier with a type check for `bool`
-using BoolDeprecatedVerifier = DeprecatedVerifier<BoolVerifier>;
-/// A short-hand definition for a DeprecatedVerifier with a type check for `int`
-using IntDeprecatedVerifier = DeprecatedVerifier<IntVerifier>;
-/// A short-hand definition for a DeprecatedVerifier with a type check for `double`
-using DoubleDeprecatedVerifier = DeprecatedVerifier<DoubleVerifier>;
-/// A short-hand definition for a DeprecatedVerifier with a type check for `string`
-using StringDeprecatedVerifier = DeprecatedVerifier<StringVerifier>;
-/// A short-hand definition for a DeprecatedVerifier with a type check for
-/// `ghoul::Dictionary`
-using TableDeprecatedVerifier = DeprecatedVerifier<TableVerifier>;
-
 // Definitions of external templates that are instantiated in the cpp file
 // This cuts down the compilation times as almost all of the possible template types do
 // not need to be instantiated multiple times
-extern template struct Vector2Verifier<int>;
-extern template struct Vector2Verifier<double>;
-extern template struct Vector3Verifier<int>;
-extern template struct Vector3Verifier<double>;
-extern template struct Vector4Verifier<int>;
-extern template struct Vector4Verifier<double>;
+extern template class Vector2Verifier<int>;
+extern template class Vector2Verifier<double>;
+extern template class Vector3Verifier<int>;
+extern template class Vector3Verifier<double>;
+extern template class Vector4Verifier<int>;
+extern template class Vector4Verifier<double>;
 
-extern template struct Matrix2x2Verifier<double>;
-extern template struct Matrix2x3Verifier<double>;
-extern template struct Matrix2x4Verifier<double>;
-extern template struct Matrix3x2Verifier<double>;
-extern template struct Matrix3x3Verifier<double>;
-extern template struct Matrix3x4Verifier<double>;
-extern template struct Matrix4x2Verifier<double>;
-extern template struct Matrix4x3Verifier<double>;
-extern template struct Matrix4x4Verifier<double>;
+extern template class Matrix2x2Verifier<double>;
+extern template class Matrix2x3Verifier<double>;
+extern template class Matrix2x4Verifier<double>;
+extern template class Matrix3x2Verifier<double>;
+extern template class Matrix3x3Verifier<double>;
+extern template class Matrix3x4Verifier<double>;
+extern template class Matrix4x2Verifier<double>;
+extern template class Matrix4x3Verifier<double>;
+extern template class Matrix4x4Verifier<double>;
 
-extern template struct LessVerifier<IntVerifier>;
-extern template struct LessVerifier<DoubleVerifier>;
-extern template struct LessEqualVerifier<IntVerifier>;
-extern template struct LessEqualVerifier<DoubleVerifier>;
-extern template struct GreaterVerifier<IntVerifier>;
-extern template struct GreaterVerifier<DoubleVerifier>;
-extern template struct GreaterEqualVerifier<IntVerifier>;
-extern template struct GreaterEqualVerifier<DoubleVerifier>;
-extern template struct EqualVerifier<BoolVerifier>;
-extern template struct EqualVerifier<IntVerifier>;
-extern template struct EqualVerifier<DoubleVerifier>;
-extern template struct EqualVerifier<StringVerifier>;
-extern template struct UnequalVerifier<BoolVerifier>;
-extern template struct UnequalVerifier<IntVerifier>;
-extern template struct UnequalVerifier<DoubleVerifier>;
-extern template struct UnequalVerifier<StringVerifier>;
+extern template class LessVerifier<IntVerifier>;
+extern template class LessVerifier<DoubleVerifier>;
+extern template class LessEqualVerifier<IntVerifier>;
+extern template class LessEqualVerifier<DoubleVerifier>;
+extern template class GreaterVerifier<IntVerifier>;
+extern template class GreaterVerifier<DoubleVerifier>;
+extern template class GreaterEqualVerifier<IntVerifier>;
+extern template class GreaterEqualVerifier<DoubleVerifier>;
+extern template class EqualVerifier<BoolVerifier>;
+extern template class EqualVerifier<IntVerifier>;
+extern template class EqualVerifier<DoubleVerifier>;
+extern template class EqualVerifier<StringVerifier>;
+extern template class UnequalVerifier<BoolVerifier>;
+extern template class UnequalVerifier<IntVerifier>;
+extern template class UnequalVerifier<DoubleVerifier>;
+extern template class UnequalVerifier<StringVerifier>;
 
-extern template struct InListVerifier<BoolVerifier>;
-extern template struct InListVerifier<IntVerifier>;
-extern template struct InListVerifier<DoubleVerifier>;
-extern template struct InListVerifier<StringVerifier>;
-extern template struct NotInListVerifier<BoolVerifier>;
-extern template struct NotInListVerifier<IntVerifier>;
-extern template struct NotInListVerifier<DoubleVerifier>;
-extern template struct NotInListVerifier<StringVerifier>;
+extern template class InListVerifier<BoolVerifier>;
+extern template class InListVerifier<IntVerifier>;
+extern template class InListVerifier<DoubleVerifier>;
+extern template class InListVerifier<StringVerifier>;
+extern template class NotInListVerifier<BoolVerifier>;
+extern template class NotInListVerifier<IntVerifier>;
+extern template class NotInListVerifier<DoubleVerifier>;
+extern template class NotInListVerifier<StringVerifier>;
 
-extern template struct InRangeVerifier<IntVerifier>;
-extern template struct InRangeVerifier<DoubleVerifier>;
-extern template struct NotInRangeVerifier<IntVerifier>;
-extern template struct NotInRangeVerifier<DoubleVerifier>;
+extern template class InRangeVerifier<IntVerifier>;
+extern template class InRangeVerifier<DoubleVerifier>;
+extern template class NotInRangeVerifier<IntVerifier>;
+extern template class NotInRangeVerifier<DoubleVerifier>;
 
-extern template struct AnnotationVerifier<BoolVerifier>;
-extern template struct AnnotationVerifier<IntVerifier>;
-extern template struct AnnotationVerifier<DoubleVerifier>;
-extern template struct AnnotationVerifier<StringVerifier>;
-extern template struct AnnotationVerifier<TableVerifier>;
-extern template struct AnnotationVerifier<IntVector2Verifier>;
-extern template struct AnnotationVerifier<DoubleVector2Verifier>;
-extern template struct AnnotationVerifier<IntVector3Verifier>;
-extern template struct AnnotationVerifier<DoubleVector3Verifier>;
-extern template struct AnnotationVerifier<IntVector4Verifier>;
-extern template struct AnnotationVerifier<DoubleVector4Verifier>;
-
-extern template struct DeprecatedVerifier<BoolVerifier>;
-extern template struct DeprecatedVerifier<IntVerifier>;
-extern template struct DeprecatedVerifier<DoubleVerifier>;
-extern template struct DeprecatedVerifier<StringVerifier>;
-extern template struct DeprecatedVerifier<TableVerifier>;
-extern template struct DeprecatedVerifier<IntVector2Verifier>;
-extern template struct DeprecatedVerifier<DoubleVector2Verifier>;
-extern template struct DeprecatedVerifier<IntVector3Verifier>;
-extern template struct DeprecatedVerifier<DoubleVector3Verifier>;
-extern template struct DeprecatedVerifier<IntVector4Verifier>;
-extern template struct DeprecatedVerifier<DoubleVector4Verifier>;
+extern template class AnnotationVerifier<BoolVerifier>;
+extern template class AnnotationVerifier<IntVerifier>;
+extern template class AnnotationVerifier<DoubleVerifier>;
+extern template class AnnotationVerifier<StringVerifier>;
+extern template class AnnotationVerifier<TableVerifier>;
+extern template class AnnotationVerifier<IntVector2Verifier>;
+extern template class AnnotationVerifier<DoubleVector2Verifier>;
+extern template class AnnotationVerifier<IntVector3Verifier>;
+extern template class AnnotationVerifier<DoubleVector3Verifier>;
+extern template class AnnotationVerifier<IntVector4Verifier>;
+extern template class AnnotationVerifier<DoubleVector4Verifier>;
 
 } // namespace openspace::documentation
 
diff --git a/include/openspace/documentation/verifier.inl b/include/openspace/documentation/verifier.inl
index 4fc3cc9671..298ca7f1fd 100644
--- a/include/openspace/documentation/verifier.inl
+++ b/include/openspace/documentation/verifier.inl
@@ -30,384 +30,6 @@
 #include <numeric>
 #include <sstream>
 
-template <>
-struct std::less<glm::vec2> {
-    bool operator()(const glm::vec2& a, const glm::vec2& b) const {
-        return a.x < b.x && a.x < b.y;
-    }
-};
-
-template <>
-struct std::less<glm::vec3> {
-    bool operator()(const glm::vec3& a, const glm::vec3& b) const {
-        return a.x < b.x && a.x < b.y && a.z < b.z;
-    }
-};
-
-template <>
-struct std::less<glm::vec4> {
-    bool operator()(const glm::vec4& a, const glm::vec4& b) const {
-        return a.x < b.x && a.x < b.y && a.z < b.z && a.w < b.w;
-    }
-};
-
-template <>
-struct std::less<glm::ivec2> {
-    bool operator()(const glm::ivec2& a, const glm::ivec2& b) const {
-        return a.x < b.x && a.x < b.y;
-    }
-};
-
-template <>
-struct std::less<glm::ivec3> {
-    bool operator()(const glm::ivec3& a, const glm::ivec3& b) const {
-        return a.x < b.x && a.x < b.y && a.z < b.z;
-    }
-};
-
-template <>
-struct std::less<glm::ivec4> {
-    bool operator()(const glm::ivec4& a, const glm::ivec4& b) const {
-        return a.x < b.x && a.x < b.y && a.z < b.z && a.w < b.w;
-    }
-};
-
-template <>
-struct std::less<glm::dvec2> {
-    bool operator()(const glm::dvec2& a, const glm::dvec2& b) const {
-        return a.x < b.x && a.x < b.y;
-    }
-};
-
-template <>
-struct std::less<glm::dvec3> {
-    bool operator()(const glm::dvec3& a, const glm::dvec3& b) const {
-        return a.x < b.x && a.x < b.y && a.z < b.z;
-    }
-};
-
-template <>
-struct std::less<glm::dvec4> {
-    bool operator()(const glm::dvec4& a, const glm::dvec4& b) const {
-        return a.x < b.x && a.x < b.y && a.z < b.z && a.w < b.w;
-    }
-};
-
-template <>
-struct std::less_equal<glm::vec2> {
-    bool operator()(const glm::vec2& a, const glm::vec2& b) const {
-        return a.x <= b.x && a.x <= b.y;
-    }
-};
-
-template <>
-struct std::less_equal<glm::vec3> {
-    bool operator()(const glm::vec3& a, const glm::vec3& b) const {
-        return a.x <= b.x && a.x <= b.y && a.z <= b.z;
-    }
-};
-
-template <>
-struct std::less_equal<glm::vec4> {
-    bool operator()(const glm::vec4& a, const glm::vec4& b) const {
-        return a.x <= b.x && a.x <= b.y && a.z <= b.z && a.w <= b.w;
-    }
-};
-
-template <>
-struct std::less_equal<glm::ivec2> {
-    bool operator()(const glm::ivec2& a, const glm::ivec2& b) const {
-        return a.x <= b.x && a.x <= b.y;
-    }
-};
-
-template <>
-struct std::less_equal<glm::ivec3> {
-    bool operator()(const glm::ivec3& a, const glm::ivec3& b) const {
-        return a.x <= b.x && a.x <= b.y && a.z <= b.z;
-    }
-};
-
-template <>
-struct std::less_equal<glm::ivec4> {
-    bool operator()(const glm::ivec4& a, const glm::ivec4& b) const {
-        return a.x <= b.x && a.x <= b.y && a.z <= b.z && a.w <= b.w;
-    }
-};
-
-template <>
-struct std::less_equal<glm::dvec2> {
-    bool operator()(const glm::dvec2& a, const glm::dvec2& b) const {
-        return a.x <= b.x && a.x <= b.y;
-    }
-};
-
-template <>
-struct std::less_equal<glm::dvec3> {
-    bool operator()(const glm::dvec3& a, const glm::dvec3& b) const {
-        return a.x <= b.x && a.x <= b.y && a.z <= b.z;
-    }
-};
-
-template <>
-struct std::less_equal<glm::dvec4> {
-    bool operator()(const glm::dvec4& a, const glm::dvec4& b) const {
-        return a.x <= b.x && a.x <= b.y && a.z <= b.z && a.w <= b.w;
-    }
-};
-
-template <>
-struct std::greater<glm::vec2> {
-    bool operator()(const glm::vec2& a, const glm::vec2& b) const {
-        return a.x > b.x && a.x > b.y;
-    }
-};
-
-template <>
-struct std::greater<glm::vec3> {
-    bool operator()(const glm::vec3& a, const glm::vec3& b) const {
-        return a.x > b.x && a.x > b.y && a.z > b.z;
-    }
-};
-
-template <>
-struct std::greater<glm::vec4> {
-    bool operator()(const glm::vec4& a, const glm::vec4& b) const {
-        return a.x > b.x && a.x > b.y && a.z > b.z && a.w > b.w;
-    }
-};
-
-template <>
-struct std::greater<glm::ivec2> {
-    bool operator()(const glm::ivec2& a, const glm::ivec2& b) const {
-        return a.x > b.x && a.x > b.y;
-    }
-};
-
-template <>
-struct std::greater<glm::ivec3> {
-    bool operator()(const glm::ivec3& a, const glm::ivec3& b) const {
-        return a.x > b.x && a.x > b.y && a.z > b.z;
-    }
-};
-
-template <>
-struct std::greater<glm::ivec4> {
-    bool operator()(const glm::ivec4& a, const glm::ivec4& b) const {
-        return a.x > b.x && a.x > b.y && a.z > b.z && a.w > b.w;
-    }
-};
-
-template <>
-struct std::greater<glm::dvec2> {
-    bool operator()(const glm::dvec2& a, const glm::dvec2& b) const {
-        return a.x > b.x && a.x > b.y;
-    }
-};
-
-template <>
-struct std::greater<glm::dvec3> {
-    bool operator()(const glm::dvec3& a, const glm::dvec3& b) const {
-        return a.x > b.x && a.x > b.y && a.z > b.z;
-    }
-};
-
-template <>
-struct std::greater<glm::dvec4> {
-    bool operator()(const glm::dvec4& a, const glm::dvec4& b) const {
-        return a.x > b.x && a.x > b.y && a.z > b.z && a.w > b.w;
-    }
-};
-
-template <>
-struct std::greater_equal<glm::vec2> {
-    bool operator()(const glm::vec2& a, const glm::vec2& b) const {
-        return a.x >= b.x && a.x >= b.y;
-    }
-};
-
-template <>
-struct std::greater_equal<glm::vec3> {
-    bool operator()(const glm::vec3& a, const glm::vec3& b) const {
-        return a.x >= b.x && a.x >= b.y && a.z >= b.z;
-    }
-};
-
-template <>
-struct std::greater_equal<glm::vec4> {
-    bool operator()(const glm::vec4& a, const glm::vec4& b) const {
-        return a.x >= b.x && a.x >= b.y && a.z >= b.z && a.w >= b.w;
-    }
-};
-
-template <>
-struct std::greater_equal<glm::ivec2> {
-    bool operator()(const glm::ivec2& a, const glm::ivec2& b) const {
-        return a.x >= b.x && a.x >= b.y;
-    }
-};
-
-template <>
-struct std::greater_equal<glm::ivec3> {
-    bool operator()(const glm::ivec3& a, const glm::ivec3& b) const {
-        return a.x >= b.x && a.x >= b.y && a.z >= b.z;
-    }
-};
-
-template <>
-struct std::greater_equal<glm::ivec4> {
-    bool operator()(const glm::ivec4& a, const glm::ivec4& b) const {
-        return a.x >= b.x && a.x >= b.y && a.z >= b.z && a.w >= b.w;
-    }
-};
-
-template <>
-struct std::greater_equal<glm::dvec2> {
-    bool operator()(const glm::dvec2& a, const glm::dvec2& b) const {
-        return a.x >= b.x && a.x >= b.y;
-    }
-};
-
-template <>
-struct std::greater_equal<glm::dvec3> {
-    bool operator()(const glm::dvec3& a, const glm::dvec3& b) const {
-        return a.x >= b.x && a.x >= b.y && a.z >= b.z;
-    }
-};
-
-template <>
-struct std::greater_equal<glm::dvec4> {
-    bool operator()(const glm::dvec4& a, const glm::dvec4& b) const {
-        return a.x >= b.x && a.x >= b.y && a.z >= b.z && a.w >= b.w;
-    }
-};
-
-template <>
-struct std::equal_to<glm::vec2> {
-    bool operator()(const glm::vec2& a, const glm::vec2& b) const {
-        return a.x == b.x && a.x == b.y;
-    }
-};
-
-template <>
-struct std::equal_to<glm::vec3> {
-    bool operator()(const glm::vec3& a, const glm::vec3& b) const {
-        return a.x == b.x && a.x == b.y && a.z == b.z;
-    }
-};
-
-template <>
-struct std::equal_to<glm::vec4> {
-    bool operator()(const glm::vec4& a, const glm::vec4& b) const {
-        return a.x == b.x && a.x == b.y && a.z == b.z && a.w == b.w;
-    }
-};
-
-template <>
-struct std::equal_to<glm::ivec2> {
-    bool operator()(const glm::ivec2& a, const glm::ivec2& b) const {
-        return a.x == b.x && a.x == b.y;
-    }
-};
-
-template <>
-struct std::equal_to<glm::ivec3> {
-    bool operator()(const glm::ivec3& a, const glm::ivec3& b) const {
-        return a.x == b.x && a.x == b.y && a.z == b.z;
-    }
-};
-
-template <>
-struct std::equal_to<glm::ivec4> {
-    bool operator()(const glm::ivec4& a, const glm::ivec4& b) const {
-        return a.x == b.x && a.x == b.y && a.z == b.z && a.w == b.w;
-    }
-};
-
-template <>
-struct std::equal_to<glm::dvec2> {
-    bool operator()(const glm::dvec2& a, const glm::dvec2& b) const {
-        return a.x == b.x && a.x == b.y;
-    }
-};
-
-template <>
-struct std::equal_to<glm::dvec3> {
-    bool operator()(const glm::dvec3& a, const glm::dvec3& b) const {
-        return a.x == b.x && a.x == b.y && a.z == b.z;
-    }
-};
-
-template <>
-struct std::equal_to<glm::dvec4> {
-    bool operator()(const glm::dvec4& a, const glm::dvec4& b) const {
-        return a.x == b.x && a.x == b.y && a.z == b.z && a.w == b.w;
-    }
-};
-
-template <>
-struct std::not_equal_to<glm::vec2> {
-    bool operator()(const glm::vec2& a, const glm::vec2& b) const {
-        return a.x != b.x && a.x != b.y;
-    }
-};
-
-template <>
-struct std::not_equal_to<glm::vec3> {
-    bool operator()(const glm::vec3& a, const glm::vec3& b) const {
-        return a.x != b.x && a.x != b.y && a.z != b.z;
-    }
-};
-
-template <>
-struct std::not_equal_to<glm::vec4> {
-    bool operator()(const glm::vec4& a, const glm::vec4& b) const {
-        return a.x != b.x && a.x != b.y && a.z != b.z && a.w != b.w;
-    }
-};
-
-template <>
-struct std::not_equal_to<glm::ivec2> {
-    bool operator()(const glm::ivec2& a, const glm::ivec2& b) const {
-        return a.x != b.x && a.x != b.y;
-    }
-};
-
-template <>
-struct std::not_equal_to<glm::ivec3> {
-    bool operator()(const glm::ivec3& a, const glm::ivec3& b) const {
-        return a.x != b.x && a.x != b.y && a.z != b.z;
-    }
-};
-
-template <>
-struct std::not_equal_to<glm::ivec4> {
-    bool operator()(const glm::ivec4& a, const glm::ivec4& b) const {
-        return a.x != b.x && a.x != b.y && a.z != b.z && a.w != b.w;
-    }
-};
-
-template <>
-struct std::not_equal_to<glm::dvec2> {
-    bool operator()(const glm::dvec2& a, const glm::dvec2& b) const {
-        return a.x != b.x && a.x != b.y;
-    }
-};
-
-template <>
-struct std::not_equal_to<glm::dvec3> {
-    bool operator()(const glm::dvec3& a, const glm::dvec3& b) const {
-        return a.x != b.x && a.x != b.y && a.z != b.z;
-    }
-};
-
-template <>
-struct std::not_equal_to<glm::dvec4> {
-    bool operator()(const glm::dvec4& a, const glm::dvec4& b) const {
-        return a.x != b.x && a.x != b.y && a.z != b.z && a.w != b.w;
-    }
-};
-
 namespace openspace::documentation {
 
 template <>
@@ -1073,21 +695,4 @@ std::string AnnotationVerifier<T>::documentation() const {
     return annotation;
 }
 
-template <typename T>
-TestResult DeprecatedVerifier<T>::operator()(const ghoul::Dictionary& dict,
-                                             const std::string& key) const
-{
-    TestResult res = T::operator()(dict, key);
-    TestResult::Warning w;
-    w.offender = key;
-    w.reason = TestResult::Warning::Reason::Deprecated;
-    res.warnings.push_back(w);
-    return res;
-}
-
-template <typename T>
-std::string DeprecatedVerifier<T>::documentation() const {
-    return T::documentation() + " (deprecated)";
-}
-
 } // namespace openspace::documentation
diff --git a/modules/base/dashboard/dashboarditemangle.cpp b/modules/base/dashboard/dashboarditemangle.cpp
index 12217ef19d..83b1b493c5 100644
--- a/modules/base/dashboard/dashboarditemangle.cpp
+++ b/modules/base/dashboard/dashboarditemangle.cpp
@@ -104,6 +104,9 @@ namespace {
         openspace::properties::Property::Visibility::User
     };
 
+    // This DashboardItem shows the angle between two scenegraph nodes relative to a
+    // reference node. The angle is calculated in the plane that is defined by the
+    // 'SourceNodeName', 'DestinationNodeName', and the 'ReferenceNodeName'.
     struct [[codegen::Dictionary(DashboardItemAngle)]] Parameters {
         enum class [[codegen::map(Type)]] Type {
             Node,
diff --git a/modules/globebrowsing/src/layermanager.cpp b/modules/globebrowsing/src/layermanager.cpp
index df3ce27a73..fd56646c63 100644
--- a/modules/globebrowsing/src/layermanager.cpp
+++ b/modules/globebrowsing/src/layermanager.cpp
@@ -40,6 +40,7 @@ documentation::Documentation LayerManager::Documentation() {
     return {
         "LayerManager",
         "globebrowsing_layermanager",
+        "",
         {
             {
                 "*",
diff --git a/modules/server/src/serverinterface.cpp b/modules/server/src/serverinterface.cpp
index 88bd9cd3cb..048adb7283 100644
--- a/modules/server/src/serverinterface.cpp
+++ b/modules/server/src/serverinterface.cpp
@@ -171,9 +171,9 @@ ServerInterface::ServerInterface(const ghoul::Dictionary& config)
     readList(DenyAddressesInfo.identifier, _denyAddresses);
     readList(RequirePasswordAddressesInfo.identifier, _requirePasswordAddresses);
 
-    this->setIdentifier(identifier);
-    this->setGuiName(identifier);
-    this->setDescription("Settings for server interface " + identifier);
+    setIdentifier(identifier);
+    setGuiName(identifier);
+    setDescription("Settings for server interface " + identifier);
 
     const std::string type = config.value<std::string>(TypeInfo.identifier);
     if (type == TcpSocketType) {
diff --git a/modules/spout/renderablespherespout.cpp b/modules/spout/renderablespherespout.cpp
index 9aaf5cffc2..d68cf9b2ab 100644
--- a/modules/spout/renderablespherespout.cpp
+++ b/modules/spout/renderablespherespout.cpp
@@ -38,6 +38,7 @@ documentation::Documentation RenderableSphereSpout::Documentation() {
     return {
         "Renderable Sphere Spout",
         "spout_sphere_spout",
+        "",
         {
             {
                 "Name",
diff --git a/modules/volume/transferfunctionhandler.cpp b/modules/volume/transferfunctionhandler.cpp
index c6968542cb..405a670c77 100644
--- a/modules/volume/transferfunctionhandler.cpp
+++ b/modules/volume/transferfunctionhandler.cpp
@@ -90,7 +90,7 @@ void TransferFunctionHandler::initialize() {
     addProperty(_maxValue);
     addProperty(_saveTransferFunction);
 
-    this->addTag("TF");
+    addTag("TF");
     _texture = std::make_shared<ghoul::opengl::Texture>(
         glm::uvec3(1024, 1, 1),
         GL_TEXTURE_1D,
diff --git a/src/documentation/documentation.cpp b/src/documentation/documentation.cpp
index 794d00ddfb..9918bb4044 100644
--- a/src/documentation/documentation.cpp
+++ b/src/documentation/documentation.cpp
@@ -189,20 +189,6 @@ DocumentationEntry::DocumentationEntry(std::string k, Verifier* v, Optional opt,
                          std::move(doc))
 {}
 
-Documentation::Documentation(std::string n, std::string i, DocumentationEntries ents)
-    : name(std::move(n))
-    , id(std::move(i))
-    , entries(std::move(ents))
-{}
-
-Documentation::Documentation(std::string n, DocumentationEntries ents)
-    : Documentation(std::move(n), "", std::move(ents))
-{}
-
-Documentation::Documentation(DocumentationEntries ents)
-    : Documentation("", "", std::move(ents))
-{}
-
 TestResult testSpecification(const Documentation& documentation,
                              const ghoul::Dictionary& dictionary)
 {
diff --git a/src/documentation/documentationengine.cpp b/src/documentation/documentationengine.cpp
index 6096c5007d..1a0f2f0c8d 100644
--- a/src/documentation/documentationengine.cpp
+++ b/src/documentation/documentationengine.cpp
@@ -77,6 +77,7 @@ nlohmann::json generateJsonDocumentation(const Documentation& d) {
 
     json["name"] = d.name;
     json["id"] = d.id;
+    json["description"] = d.description;
     json["properties"] = nlohmann::json::array();
 
     for (const DocumentationEntry& p : d.entries) {
@@ -110,7 +111,8 @@ nlohmann::json generateJsonDocumentation(const Documentation& d) {
             }
         }
         else if (tv) {
-            nlohmann::json restrictions = generateJsonDocumentation(tv->documentations);
+            Documentation doc = { .entries = tv->documentations };
+            nlohmann::json restrictions = generateJsonDocumentation(doc);
             // We have a TableVerifier, so we need to recurse
             entry["restrictions"] = restrictions;
         }
diff --git a/src/documentation/verifier.cpp b/src/documentation/verifier.cpp
index 4c26f3a181..30536b6cdd 100644
--- a/src/documentation/verifier.cpp
+++ b/src/documentation/verifier.cpp
@@ -119,21 +119,6 @@ template struct AnnotationVerifier<DoubleVector3Verifier>;
 template struct AnnotationVerifier<IntVector4Verifier>;
 template struct AnnotationVerifier<DoubleVector4Verifier>;
 
-template struct DeprecatedVerifier<BoolVerifier>;
-template struct DeprecatedVerifier<IntVerifier>;
-template struct DeprecatedVerifier<DoubleVerifier>;
-template struct DeprecatedVerifier<StringVerifier>;
-template struct DeprecatedVerifier<TableVerifier>;
-//template struct DeprecatedVerifier<BoolVector2Verifier>;
-template struct DeprecatedVerifier<IntVector2Verifier>;
-template struct DeprecatedVerifier<DoubleVector2Verifier>;
-//template struct DeprecatedVerifier<BoolVector3Verifier>;
-template struct DeprecatedVerifier<IntVector3Verifier>;
-template struct DeprecatedVerifier<DoubleVector3Verifier>;
-//template struct DeprecatedVerifier<BoolVector4Verifier>;
-template struct DeprecatedVerifier<IntVector4Verifier>;
-template struct DeprecatedVerifier<DoubleVector4Verifier>;
-
 std::string BoolVerifier::type() const {
     return "Boolean";
 }
@@ -143,7 +128,7 @@ std::string DoubleVerifier::type() const {
 }
 
 TestResult IntVerifier::operator()(const ghoul::Dictionary& dict,
-                                   const std::string & key) const
+                                   const std::string& key) const
 {
     if (dict.hasValue<int>(key)) {
         // We have a key and the value is int, we are done
@@ -201,8 +186,7 @@ std::string IntVerifier::type() const {
 }
 
 StringVerifier::StringVerifier(bool mustBeNotEmpty)
-    : TemplateVerifier<std::string>()
-    , _mustBeNotEmpty(mustBeNotEmpty)
+    : _mustBeNotEmpty(mustBeNotEmpty)
 {}
 
 TestResult StringVerifier::operator()(const ghoul::Dictionary& dictionary,
@@ -612,16 +596,17 @@ TestResult TableVerifier::operator()(const ghoul::Dictionary& dictionary,
 {
     if (dictionary.hasValue<Type>(key)) {
         ghoul::Dictionary d = dictionary.value<ghoul::Dictionary>(key);
-        TestResult res = testSpecification({documentations}, d);
+        Documentation doc = { .entries = documentations };
+        TestResult res = testSpecification(doc, d);
 
         // Add the 'key' as a prefix to make the new offender a fully qualified identifer
         for (TestResult::Offense& s : res.offenses) {
-            s.offender = key + "." + s.offender;
+            s.offender = fmt::format("{}.{}", key, s.offender);
         }
 
         // Add the 'key' as a prefix to make the new warning a fully qualified identifer
         for (TestResult::Warning& w : res.warnings) {
-            w.offender = key + "." + w.offender;
+            w.offender = fmt::format("{}.{}", key, w.offender);
         }
 
         return res;
@@ -700,22 +685,17 @@ TestResult ReferencingVerifier::operator()(const ghoul::Dictionary& dictionary,
             return res;
         }
 
-        //ghoul_assert(
-        //    it != docs.end(),
-        //    "Did not find referencing identifier '" + identifier + "'"
-        //);
-
         ghoul::Dictionary d = dictionary.value<ghoul::Dictionary>(key);
         TestResult r = testSpecification(*it, d);
 
         // Add the 'key' as a prefix to make the offender a fully qualified identifer
         for (TestResult::Offense& s : r.offenses) {
-            s.offender = key + "." + s.offender;
+            s.offender = fmt::format("{}.{}", key, s.offender);
         }
 
         // Add the 'key' as a prefix to make the warning a fully qualified identifer
         for (TestResult::Warning& w : r.warnings) {
-            w.offender = key + "." + w.offender;
+            w.offender = fmt::format("{}.{}", key, w.offender);
         }
 
         return r;
@@ -729,86 +709,16 @@ std::string ReferencingVerifier::documentation() const {
     return "Referencing Documentation: '" + identifier + "'";
 }
 
-AndVerifier::AndVerifier(const std::vector<Verifier*> values_) {
-    ghoul_assert(!values_.empty(), "values must not be empty");
-    for (Verifier* v : values_) {
-        this->values.push_back(std::shared_ptr<Verifier>(v));
-    }
-}
-
-TestResult AndVerifier::operator()(const ghoul::Dictionary& dictionary,
-                                   const std::string& key) const
-{
-    std::vector<TestResult> res(values.size());
-    std::transform(
-        values.cbegin(),
-        values.cend(),
-        res.begin(),
-        [dictionary, key](const std::shared_ptr<Verifier>& v) {
-            return v->operator()(dictionary, key);
-        }
-    );
-
-    const bool success = std::all_of(
-        res.cbegin(),
-        res.cend(),
-        std::mem_fn(&TestResult::success)
-    );
-
-    if (success) {
-        TestResult r;
-        r.success = true;
-        return r;
-    }
-    else {
-        TestResult r;
-        r.success = false;
-        TestResult::Offense o;
-        o.offender = key;
-        o.reason = TestResult::Offense::Reason::Verification;
-        r.offenses.push_back(o);
-        return r;
-    }
-}
-
-std::string AndVerifier::type() const {
-    // Dirty hack to get an "and " inserted before the last element
-    std::vector<std::string> types(values.size() - 1);
-    std::transform(
-        values.cbegin(),
-        values.cend() - 1,
-        types.begin(),
-        std::mem_fn(&Verifier::type)
-    );
-    types.push_back(std::string("and ") + values.back()->type());
-
-    return ghoul::join(types, ", ");
-}
-
-std::string AndVerifier::documentation() const {
-    // Dirty hack to get an "and " inserted before the last element
-    std::vector<std::string> documentations(values.size() - 1);
-    std::transform(
-        values.cbegin(),
-        values.cend() - 1,
-        documentations.begin(),
-        std::mem_fn(&Verifier::documentation)
-    );
-    documentations.push_back(std::string("and ") + values.back()->documentation());
-
-    return ghoul::join(documentations, ", ");
-}
-
 OrVerifier::OrVerifier(
             const std::vector<std::variant<Verifier*, std::shared_ptr<Verifier>>> values_)
 {
     ghoul_assert(!values_.empty(), "values must not be empty");
     for (const std::variant<Verifier*, std::shared_ptr<Verifier>>& v : values_) {
         if (std::holds_alternative<Verifier*>(v)) {
-            this->values.push_back(std::shared_ptr<Verifier>(std::get<Verifier*>(v)));
+            values.push_back(std::shared_ptr<Verifier>(std::get<Verifier*>(v)));
         }
         else {
-            this->values.push_back(std::get<std::shared_ptr<Verifier>>(v));
+            values.push_back(std::get<std::shared_ptr<Verifier>>(v));
         }
     }
 }
@@ -857,7 +767,7 @@ std::string OrVerifier::type() const {
         types.begin(),
         std::mem_fn(&Verifier::type)
     );
-    types.push_back(std::string("or ") + values.back()->type());
+    types.push_back(fmt::format("or {}", values.back()->type()));
 
     return ghoul::join(types, ", ");
 }
@@ -871,7 +781,7 @@ std::string OrVerifier::documentation() const {
         documentations.begin(),
         std::mem_fn(&Verifier::documentation)
     );
-    documentations.push_back(std::string("or ") + values.back()->documentation());
+    documentations.push_back(fmt::format("or {}", values.back()->documentation()));
 
     return ghoul::join(documentations, ", ");
 }
diff --git a/src/interaction/tasks/convertrecfileversiontask.cpp b/src/interaction/tasks/convertrecfileversiontask.cpp
index 6f700fc6dd..717f4d8053 100644
--- a/src/interaction/tasks/convertrecfileversiontask.cpp
+++ b/src/interaction/tasks/convertrecfileversiontask.cpp
@@ -103,6 +103,7 @@ documentation::Documentation ConvertRecFileVersionTask::documentation() {
     return {
         "ConvertRecFileVersionTask",
         "convert_file_version_task",
+        "",
         {
             {
                 "InputFilePath",
diff --git a/src/interaction/tasks/convertrecformattask.cpp b/src/interaction/tasks/convertrecformattask.cpp
index 52bc0bda3a..3e4f998483 100644
--- a/src/interaction/tasks/convertrecformattask.cpp
+++ b/src/interaction/tasks/convertrecformattask.cpp
@@ -314,6 +314,7 @@ documentation::Documentation ConvertRecFormatTask::documentation() {
     return {
         "ConvertRecFormatTask",
         "convert_format_task",
+        "",
         {
             {
                 "InputFilePath",
diff --git a/src/util/factorymanager.cpp b/src/util/factorymanager.cpp
index 5a5c3d006a..755b1e3efa 100644
--- a/src/util/factorymanager.cpp
+++ b/src/util/factorymanager.cpp
@@ -47,6 +47,7 @@ nlohmann::json generateJsonDocumentation(const Documentation& d) {
 
     json["name"] = d.name;
     json["identifier"] = d.id;
+    json["description"] = d.description;
     json["members"] = nlohmann::json::array();
 
     for (const DocumentationEntry& p : d.entries) {
@@ -80,7 +81,8 @@ nlohmann::json generateJsonDocumentation(const Documentation& d) {
             }
         }
         else if (tv) {
-            nlohmann::json restrictions = generateJsonDocumentation(tv->documentations);
+            Documentation doc = { .entries = tv->documentations };
+            nlohmann::json restrictions = generateJsonDocumentation(doc);
             // We have a TableVerifier, so we need to recurse
             entry["restrictions"] = restrictions;
         }
diff --git a/support/coding/codegen b/support/coding/codegen
index abe1b74019..b38743ad76 160000
--- a/support/coding/codegen
+++ b/support/coding/codegen
@@ -1 +1 @@
-Subproject commit abe1b74019f332c1e5a62774776bf11d42cf8f85
+Subproject commit b38743ad76edb7affe7db8e77445450b15face72
diff --git a/tests/test_documentation.cpp b/tests/test_documentation.cpp
index bae134b1b9..debd5ed418 100644
--- a/tests/test_documentation.cpp
+++ b/tests/test_documentation.cpp
@@ -277,8 +277,8 @@ TEST_CASE("Documentation: Constructor", "[documentation]") {
 TEST_CASE("Documentation: Initializer Constructor", "[documentation]") {
     using namespace openspace::documentation;
 
-    Documentation doc {
-        {
+    Documentation doc = {
+        .entries = {
             // Basic Verifiers
             {"BoolVerifier", new BoolVerifier, Optional::No },
             {"DoubleVerifier", new DoubleVerifier, Optional::No },
@@ -344,8 +344,10 @@ TEST_CASE("Documentation: Initializer Constructor", "[documentation]") {
 TEST_CASE("Documentation: BoolVerifier", "[documentation]") {
     using namespace openspace::documentation;
 
-    Documentation doc {
-        {{ "Bool", new BoolVerifier, Optional::No }}
+    Documentation doc = {
+        .entries = {
+            { "Bool", new BoolVerifier, Optional::No }
+        }
     };
 
     ghoul::Dictionary positive;
@@ -376,8 +378,10 @@ TEST_CASE("Documentation: BoolVerifier", "[documentation]") {
 TEST_CASE("Documentation: DoubleVerifier", "[documentation]") {
     using namespace openspace::documentation;
 
-    Documentation doc {
-        {{ "Double", new DoubleVerifier, Optional::No }}
+    Documentation doc = {
+        .entries = {
+            { "Double", new DoubleVerifier, Optional::No }
+        }
     };
 
     ghoul::Dictionary positive;
@@ -407,8 +411,10 @@ TEST_CASE("Documentation: DoubleVerifier", "[documentation]") {
 TEST_CASE("Documentation: IntVerifier", "[documentation]") {
     using namespace openspace::documentation;
 
-    Documentation doc {
-        {{ "Int", new IntVerifier, Optional::No }}
+    Documentation doc = {
+        .entries = {
+            { "Int", new IntVerifier, Optional::No }
+        }
     };
 
     ghoul::Dictionary positive;
@@ -444,8 +450,10 @@ TEST_CASE("Documentation: StringVerifier", "[documentation]") {
     using namespace openspace::documentation;
     using namespace std::string_literals;
 
-    Documentation doc {
-        {{ "String", new StringVerifier, Optional::No }}
+    Documentation doc = {
+        .entries = {
+            { "String", new StringVerifier, Optional::No }
+        }
     };
 
     ghoul::Dictionary positive;
@@ -475,8 +483,10 @@ TEST_CASE("Documentation: IdentifierVerifier", "[documentation]") {
     using namespace openspace::documentation;
     using namespace std::string_literals;
 
-    Documentation doc{
-        {{ "Identifier", new IdentifierVerifier, Optional::No }}
+    Documentation doc = {
+        .entries = {
+            { "Identifier", new IdentifierVerifier, Optional::No }
+        }
     };
 
     ghoul::Dictionary positive;
@@ -538,8 +548,10 @@ TEST_CASE("Documentation: FileVerifier", "[documentation]") {
     using namespace openspace::documentation;
     using namespace std::string_literals;
 
-    Documentation doc {
-        {{ "File", new FileVerifier, Optional::No }}
+    Documentation doc = {
+        .entries = {
+            { "File", new FileVerifier, Optional::No }
+        }
     };
 
     ghoul::Dictionary positive;
@@ -577,8 +589,10 @@ TEST_CASE("Documentation: DirectoryVerifier", "[documentation]") {
     using namespace openspace::documentation;
     using namespace std::string_literals;
 
-    Documentation doc{
-        {{ "Dir", new DirectoryVerifier, Optional::No }}
+    Documentation doc = {
+        .entries = {
+            { "Dir", new DirectoryVerifier, Optional::No }
+        }
     };
 
     ghoul::Dictionary positive;
@@ -616,8 +630,10 @@ TEST_CASE("Documentation: DateTimeVerifier", "[documentation]") {
     using namespace openspace::documentation;
     using namespace std::string_literals;
 
-    Documentation doc{
-        {{ "DateTime", new DateTimeVerifier, Optional::No }}
+    Documentation doc = {
+        .entries = {
+            { "DateTime", new DateTimeVerifier, Optional::No }
+        }
     };
 
     ghoul::Dictionary positive;
@@ -654,8 +670,10 @@ TEST_CASE("Documentation: DateTimeVerifier", "[documentation]") {
 TEST_CASE("Documentation: TableVerifierType", "[documentation]") {
     using namespace openspace::documentation;
 
-    Documentation doc {
-        {{ "Table", new TableVerifier, Optional::No }}
+    Documentation doc = {
+        .entries = {
+            { "Table", new TableVerifier, Optional::No }
+        }
     };
 
     ghoul::Dictionary positive;
@@ -685,8 +703,10 @@ TEST_CASE("Documentation: StringListVerifierType", "[documentation]") {
     using namespace openspace::documentation;
     using namespace std::string_literals;
 
-    Documentation doc {
-        { { "StringList", new StringListVerifier, Optional::No } }
+    Documentation doc = {
+        .entries = {
+            { "StringList", new StringListVerifier, Optional::No }
+        }
     };
 
     ghoul::Dictionary positive;
@@ -737,8 +757,10 @@ TEST_CASE("Documentation: IntListVerifierType", "[documentation]") {
     using namespace openspace::documentation;
     using namespace std::string_literals;
 
-    Documentation doc {
-        { { "IntList", new IntListVerifier, Optional::No } }
+    Documentation doc = {
+        .entries = {
+            { "IntList", new IntListVerifier, Optional::No }
+        }
     };
 
     ghoul::Dictionary positive;
@@ -788,8 +810,8 @@ TEST_CASE("Documentation: MixedVerifiers", "[documentation]") {
     using namespace openspace::documentation;
     using namespace std::string_literals;
 
-    Documentation doc {
-        {
+    Documentation doc = {
+        .entries = {
             { "Bool", new BoolVerifier, Optional::No },
             { "Double", new DoubleVerifier, Optional::No },
             { "Int", new IntVerifier, Optional::No },
@@ -839,8 +861,8 @@ TEST_CASE("Documentation: NestedTables", "[documentation]") {
     using namespace openspace::documentation;
     using namespace std::string_literals;
 
-    Documentation doc {
-        {
+    Documentation doc = {
+        .entries = {
             { "Outer_Int", new IntVerifier, Optional::No },
             { "Outer_Table", new TableVerifier({
                 { "Inner_Double", new DoubleVerifier, Optional::No },
@@ -1018,8 +1040,8 @@ TEST_CASE("Documentation: NestedTables", "[documentation]") {
 TEST_CASE("Documentation: Optional", "[documentation]") {
     using namespace openspace::documentation;
 
-    Documentation doc {
-        {
+    Documentation doc = {
+        .entries = {
             { "Bool_Force", new BoolVerifier, Optional::No },
             { "Bool_Optional", new BoolVerifier, Optional::Yes }
         }
@@ -1066,23 +1088,25 @@ TEST_CASE("Documentation: Optional", "[documentation]") {
 TEST_CASE("Documentation: Required In Optional", "[documentation]") {
     using namespace openspace::documentation;
 
-    Documentation doc {
-        {{
-            "a",
-            new TableVerifier({
-                {
-                    "b",
-                    new IntVerifier,
-                    Optional::No
-                },
-                {
-                    "c",
-                    new IntVerifier,
-                    Optional::Yes
-                }
-            }),
-            Optional::Yes
-        }}
+    Documentation doc = {
+        .entries = {
+            {
+                "a",
+                new TableVerifier({
+                    {
+                        "b",
+                        new IntVerifier,
+                        Optional::No
+                    },
+                    {
+                        "c",
+                        new IntVerifier,
+                        Optional::Yes
+                    }
+                }),
+                Optional::Yes
+            }
+        }
     };
 
     ghoul::Dictionary positive;
@@ -1127,8 +1151,10 @@ TEST_CASE("Documentation: Required In Optional", "[documentation]") {
 TEST_CASE("Documentation: Exhaustive", "[documentation]") {
     using namespace openspace::documentation;
 
-    Documentation doc {
-        {{ "Int", new IntVerifier, Optional::No }}
+    Documentation doc = {
+        .entries = {
+            { "Int", new IntVerifier, Optional::No }
+        }
     };
 
     ghoul::Dictionary positive;
@@ -1157,11 +1183,14 @@ TEST_CASE("Documentation: Exhaustive", "[documentation]") {
 TEST_CASE("Documentation: Nested Exhaustive", "[documentation]") {
     using namespace openspace::documentation;
 
-    Documentation doc {
-        {{ "Table", new TableVerifier(
-            { { "a", new IntVerifier, Optional::No } }
-        ), Optional::No
-        }}
+    Documentation doc = {
+        .entries = {
+            {
+                "Table",
+                new TableVerifier({ { "a", new IntVerifier, Optional::No } }),
+                Optional::No
+            }
+        }
     };
 
     ghoul::Dictionary positive;
@@ -1207,12 +1236,10 @@ TEST_CASE("Documentation: Empty Entries Non Exhaustive", "[documentation]") {
 TEST_CASE("Documentation: Empty Nested Exhaustive", "[documentation]") {
     using namespace openspace::documentation;
 
-    Documentation doc {
-        {{
-            "Table",
-            new TableVerifier(),
-            Optional::No,
-        }}
+    Documentation doc = {
+        .entries = {
+            { "Table", new TableVerifier(), Optional::No }
+        }
     };
 
     ghoul::Dictionary positive;
@@ -1235,8 +1262,10 @@ TEST_CASE("Documentation: Empty Nested Exhaustive", "[documentation]") {
 TEST_CASE("Documentation: Less Int", "[documentation]") {
     using namespace openspace::documentation;
 
-    Documentation doc {
-        {{ "Int", new IntLessVerifier(5), Optional::No }}
+    Documentation doc = {
+        .entries = {
+            { "Int", new IntLessVerifier(5), Optional::No }
+        }
     };
 
     ghoul::Dictionary positive;
@@ -1257,8 +1286,8 @@ TEST_CASE("Documentation: Less Int", "[documentation]") {
 TEST_CASE("Documentation: Less Double", "[documentation]") {
     using namespace openspace::documentation;
 
-    Documentation doc {
-        {{ "Double", new DoubleLessVerifier(5.0), Optional::No }}
+    Documentation doc = {
+        .entries = { { "Double", new DoubleLessVerifier(5.0), Optional::No } }
     };
 
     ghoul::Dictionary positive;
@@ -1279,8 +1308,8 @@ TEST_CASE("Documentation: Less Double", "[documentation]") {
 TEST_CASE("Documentation: LessEqual Int", "[documentation]") {
     using namespace openspace::documentation;
 
-    Documentation doc {
-        {{ "Int", new IntLessEqualVerifier(5), Optional::No }}
+    Documentation doc = {
+        .entries = { { "Int", new IntLessEqualVerifier(5), Optional::No } }
     };
 
     ghoul::Dictionary positive;
@@ -1307,8 +1336,8 @@ TEST_CASE("Documentation: LessEqual Int", "[documentation]") {
 TEST_CASE("Documentation: LessEqual Double", "[documentation]") {
     using namespace openspace::documentation;
 
-    Documentation doc {
-        {{ "Double", new DoubleLessEqualVerifier(5.0), Optional::No }}
+    Documentation doc = {
+        .entries = { { "Double", new DoubleLessEqualVerifier(5.0), Optional::No } }
     };
 
     ghoul::Dictionary positive;
@@ -1335,8 +1364,8 @@ TEST_CASE("Documentation: LessEqual Double", "[documentation]") {
 TEST_CASE("Documentation: Greater Int", "[documentation]") {
     using namespace openspace::documentation;
 
-    Documentation doc {
-        {{ "Int", new IntGreaterVerifier(5), Optional::No }}
+    Documentation doc = {
+        .entries = { { "Int", new IntGreaterVerifier(5), Optional::No } }
     };
 
     ghoul::Dictionary positive;
@@ -1357,8 +1386,8 @@ TEST_CASE("Documentation: Greater Int", "[documentation]") {
 TEST_CASE("Documentation: Greater Double", "[documentation]") {
     using namespace openspace::documentation;
 
-    Documentation doc {
-        {{ "Double", new DoubleGreaterVerifier(5.0), Optional::No }}
+    Documentation doc = {
+        .entries = { { "Double", new DoubleGreaterVerifier(5.0), Optional::No } }
     };
 
     ghoul::Dictionary positive;
@@ -1379,8 +1408,8 @@ TEST_CASE("Documentation: Greater Double", "[documentation]") {
 TEST_CASE("Documentation: GreaterEqual Int", "[documentation]") {
     using namespace openspace::documentation;
 
-    Documentation doc {
-        {{ "Int", new IntGreaterEqualVerifier(5), Optional::No }}
+    Documentation doc = {
+        .entries = { { "Int", new IntGreaterEqualVerifier(5), Optional::No } }
     };
 
     ghoul::Dictionary positive;
@@ -1407,8 +1436,8 @@ TEST_CASE("Documentation: GreaterEqual Int", "[documentation]") {
 TEST_CASE("Documentation: GreaterEqual Double", "[documentation]") {
     using namespace openspace::documentation;
 
-    Documentation doc {
-        {{ "Double", new DoubleGreaterEqualVerifier(5.0), Optional::No }}
+    Documentation doc = {
+        .entries = { { "Double", new DoubleGreaterEqualVerifier(5.0), Optional::No } }
     };
 
     ghoul::Dictionary positive;
@@ -1435,8 +1464,8 @@ TEST_CASE("Documentation: GreaterEqual Double", "[documentation]") {
 TEST_CASE("Documentation: Equal Bool", "[documentation]") {
     using namespace openspace::documentation;
 
-    Documentation doc {
-        {{ "Bool", new BoolEqualVerifier(true), Optional::No }}
+    Documentation doc = {
+        .entries = { { "Bool", new BoolEqualVerifier(true), Optional::No } }
     };
 
     ghoul::Dictionary positive;
@@ -1457,8 +1486,8 @@ TEST_CASE("Documentation: Equal Bool", "[documentation]") {
 TEST_CASE("Documentation: Equal Int", "[documentation]") {
     using namespace openspace::documentation;
 
-    Documentation doc {
-        {{ "Int", new IntEqualVerifier(1), Optional::No }}
+    Documentation doc = {
+        .entries = { { "Int", new IntEqualVerifier(1), Optional::No } }
     };
 
     ghoul::Dictionary positive;
@@ -1479,8 +1508,8 @@ TEST_CASE("Documentation: Equal Int", "[documentation]") {
 TEST_CASE("Documentation: Equal Double", "[documentation]") {
     using namespace openspace::documentation;
 
-    Documentation doc {
-        {{ "Double", new DoubleEqualVerifier(1.0), Optional::No }}
+    Documentation doc = {
+        .entries = { { "Double", new DoubleEqualVerifier(1.0), Optional::No } }
     };
 
     ghoul::Dictionary positive;
@@ -1502,8 +1531,8 @@ TEST_CASE("Documentation: Equal String", "[documentation]") {
     using namespace openspace::documentation;
     using namespace std::string_literals;
 
-    Documentation doc {
-        {{ "String", new StringEqualVerifier("string"s), Optional::No }}
+    Documentation doc = {
+        .entries = { { "String", new StringEqualVerifier("string"s), Optional::No } }
     };
 
     ghoul::Dictionary positive;
@@ -1524,8 +1553,8 @@ TEST_CASE("Documentation: Equal String", "[documentation]") {
 TEST_CASE("Documentation: Unequal Bool", "[documentation]") {
     using namespace openspace::documentation;
 
-    Documentation doc {
-        {{ "Bool", new BoolUnequalVerifier(true), Optional::No }}
+    Documentation doc = {
+        .entries = { { "Bool", new BoolUnequalVerifier(true), Optional::No } }
     };
 
     ghoul::Dictionary positive;
@@ -1546,8 +1575,8 @@ TEST_CASE("Documentation: Unequal Bool", "[documentation]") {
 TEST_CASE("Documentation: Unequal Int", "[documentation]") {
     using namespace openspace::documentation;
 
-    Documentation doc {
-        {{ "Int", new IntUnequalVerifier(1), Optional::No }}
+    Documentation doc = {
+        .entries = { { "Int", new IntUnequalVerifier(1), Optional::No } }
     };
 
     ghoul::Dictionary positive;
@@ -1568,8 +1597,8 @@ TEST_CASE("Documentation: Unequal Int", "[documentation]") {
 TEST_CASE("Documentation: Unequal Double", "[documentation]") {
     using namespace openspace::documentation;
 
-    Documentation doc {
-        {{ "Double", new DoubleUnequalVerifier(1.0), Optional::No }}
+    Documentation doc = {
+        .entries = { { "Double", new DoubleUnequalVerifier(1.0), Optional::No } }
     };
 
     ghoul::Dictionary positive;
@@ -1591,8 +1620,8 @@ TEST_CASE("Documentation: Unequal String", "[documentation]") {
     using namespace openspace::documentation;
     using namespace std::string_literals;
 
-    Documentation doc {
-        {{ "String", new StringUnequalVerifier("string"s), Optional::No }}
+    Documentation doc = {
+        .entries = { { "String", new StringUnequalVerifier("string"s), Optional::No } }
     };
 
     ghoul::Dictionary positive;
@@ -1613,8 +1642,8 @@ TEST_CASE("Documentation: Unequal String", "[documentation]") {
 TEST_CASE("Documentation: List Bool", "[documentation]") {
     using namespace openspace::documentation;
 
-    Documentation doc {
-        {{ "Bool" , new BoolInListVerifier({ true }), Optional::No }}
+    Documentation doc = {
+        .entries = { { "Bool" , new BoolInListVerifier({ true }), Optional::No } }
     };
 
     ghoul::Dictionary positive;
@@ -1635,8 +1664,8 @@ TEST_CASE("Documentation: List Bool", "[documentation]") {
 TEST_CASE("Documentation: List Int", "[documentation]") {
     using namespace openspace::documentation;
 
-    Documentation doc {
-        {{ "Int" , new IntInListVerifier({ 0, 1, 2 }), Optional::No }}
+    Documentation doc = {
+        .entries = { { "Int" , new IntInListVerifier({ 0, 1, 2 }), Optional::No } }
     };
 
     ghoul::Dictionary positive;
@@ -1663,8 +1692,10 @@ TEST_CASE("Documentation: List Int", "[documentation]") {
 TEST_CASE("Documentation: List Double", "[documentation]") {
     using namespace openspace::documentation;
 
-    Documentation doc {
-        {{ "Double" , new DoubleInListVerifier({ 0.0, 1.0, 2.0 }), Optional::No }}
+    Documentation doc = {
+        .entries = {
+            { "Double" , new DoubleInListVerifier({ 0.0, 1.0, 2.0 }), Optional::No }
+        }
     };
 
     ghoul::Dictionary positive;
@@ -1692,8 +1723,10 @@ TEST_CASE("Documentation: List String", "[documentation]") {
     using namespace openspace::documentation;
     using namespace std::string_literals;
 
-    Documentation doc {
-        {{ "String" , new StringInListVerifier({ "0"s, "1"s, "2"s }), Optional::No }}
+    Documentation doc = {
+        .entries = {
+            { "String" , new StringInListVerifier({ "0"s, "1"s, "2"s }), Optional::No }
+        }
     };
 
     ghoul::Dictionary positive;
@@ -1720,8 +1753,8 @@ TEST_CASE("Documentation: List String", "[documentation]") {
 TEST_CASE("Documentation: NotList Bool", "[documentation]") {
     using namespace openspace::documentation;
 
-    Documentation doc {
-        {{ "Bool" , new BoolNotInListVerifier({ true }), Optional::No }}
+    Documentation doc = {
+        .entries = { { "Bool" , new BoolNotInListVerifier({ true }), Optional::No } }
     };
 
     ghoul::Dictionary positive;
@@ -1742,8 +1775,8 @@ TEST_CASE("Documentation: NotList Bool", "[documentation]") {
 TEST_CASE("Documentation: NotList Int", "[documentation]") {
     using namespace openspace::documentation;
 
-    Documentation doc {
-        {{ "Int" , new IntNotInListVerifier({ 0, 1, 2 }), Optional::No }}
+    Documentation doc = {
+        .entries = { { "Int" , new IntNotInListVerifier({ 0, 1, 2 }), Optional::No } }
     };
 
     ghoul::Dictionary positive;
@@ -1770,8 +1803,10 @@ TEST_CASE("Documentation: NotList Int", "[documentation]") {
 TEST_CASE("Documentation: NotList Double", "[documentation]") {
     using namespace openspace::documentation;
 
-    Documentation doc {
-        {{ "Double" , new DoubleNotInListVerifier({ 0.0, 1.0, 2.0 }), Optional::No }}
+    Documentation doc = {
+        .entries = {
+            { "Double" , new DoubleNotInListVerifier({ 0.0, 1.0, 2.0 }), Optional::No }
+        }
     };
 
     ghoul::Dictionary positive;
@@ -1799,8 +1834,10 @@ TEST_CASE("Documentation: NotList String", "[documentation]") {
     using namespace openspace::documentation;
     using namespace std::string_literals;
 
-    Documentation doc {
-        {{ "String" , new StringNotInListVerifier({ "0"s, "1"s, "2"s }), Optional::No }}
+    Documentation doc = {
+        .entries = {
+            { "String" , new StringNotInListVerifier({ "0"s, "1"s, "2"s }), Optional::No }
+        }
     };
 
     ghoul::Dictionary positive;
@@ -1827,8 +1864,8 @@ TEST_CASE("Documentation: NotList String", "[documentation]") {
 TEST_CASE("Documentation: Annotation Bool", "[documentation]") {
     using namespace openspace::documentation;
 
-    Documentation doc {
-        {{ "Bool", new BoolAnnotationVerifier("Bool"), Optional::No }}
+    Documentation doc = {
+        .entries = { { "Bool", new BoolAnnotationVerifier("Bool"), Optional::No } }
     };
 
     ghoul::Dictionary positive;
@@ -1849,8 +1886,8 @@ TEST_CASE("Documentation: Annotation Bool", "[documentation]") {
 TEST_CASE("Documentation: Annotation Int", "[documentation]") {
     using namespace openspace::documentation;
 
-    Documentation doc {
-        {{ "Int", new IntAnnotationVerifier("Int"), Optional::No }}
+    Documentation doc = {
+        .entries = { { "Int", new IntAnnotationVerifier("Int"), Optional::No } }
     };
 
     ghoul::Dictionary positive;
@@ -1871,8 +1908,8 @@ TEST_CASE("Documentation: Annotation Int", "[documentation]") {
 TEST_CASE("Documentation: Annotation Double", "[documentation]") {
     using namespace openspace::documentation;
 
-    Documentation doc {
-        {{ "Double", new DoubleAnnotationVerifier("Double"), Optional::No }}
+    Documentation doc = {
+        .entries = { { "Double", new DoubleAnnotationVerifier("Double"), Optional::No } }
     };
 
     ghoul::Dictionary positive;
@@ -1894,8 +1931,8 @@ TEST_CASE("Documentation: Annotation String", "[documentation]") {
     using namespace openspace::documentation;
     using namespace std::string_literals;
 
-    Documentation doc {
-        {{ "String", new StringAnnotationVerifier("String"), Optional::No }}
+    Documentation doc = {
+        .entries = { { "String", new StringAnnotationVerifier("String"), Optional::No } }
     };
 
     ghoul::Dictionary positive;
@@ -1916,8 +1953,8 @@ TEST_CASE("Documentation: Annotation String", "[documentation]") {
 TEST_CASE("Documentation: Annotation Table", "[documentation]") {
     using namespace openspace::documentation;
 
-    Documentation doc {
-        {{ "Table", new TableAnnotationVerifier("Table"), Optional::No }}
+    Documentation doc = {
+        .entries = { { "Table", new TableAnnotationVerifier("Table"), Optional::No } }
     };
 
     ghoul::Dictionary positive;
@@ -1938,8 +1975,8 @@ TEST_CASE("Documentation: Annotation Table", "[documentation]") {
 TEST_CASE("Documentation: InRange Int", "[documentation]") {
     using namespace openspace::documentation;
 
-    Documentation doc {
-        {{ "Int", new InRangeVerifier<IntVerifier>(0, 5), Optional::No }}
+    Documentation doc = {
+        .entries = { { "Int", new InRangeVerifier<IntVerifier>(0, 5), Optional::No } }
     };
 
     ghoul::Dictionary positive;
@@ -1972,8 +2009,10 @@ TEST_CASE("Documentation: InRange Int", "[documentation]") {
 TEST_CASE("Documentation: InRange Double", "[documentation]") {
     using namespace openspace::documentation;
 
-    Documentation doc {
-        {{ "Double", new InRangeVerifier<DoubleVerifier>(0.0, 5.0), Optional::No }}
+    Documentation doc = {
+        .entries = {
+            { "Double", new InRangeVerifier<DoubleVerifier>(0.0, 5.0), Optional::No }
+        }
     };
 
     ghoul::Dictionary positive;
@@ -2012,8 +2051,8 @@ TEST_CASE("Documentation: InRange Double", "[documentation]") {
 TEST_CASE("Documentation: NotInRange Int", "[documentation]") {
     using namespace openspace::documentation;
 
-    Documentation doc {
-        {{ "Int", new NotInRangeVerifier<IntVerifier>(0, 5), Optional::No }}
+    Documentation doc = {
+        .entries = { { "Int", new NotInRangeVerifier<IntVerifier>(0, 5), Optional::No } }
     };
 
     ghoul::Dictionary positive;
@@ -2056,8 +2095,10 @@ TEST_CASE("Documentation: NotInRange Int", "[documentation]") {
 TEST_CASE("Documentation: NotInRange Double", "[documentation]") {
     using namespace openspace::documentation;
 
-    Documentation doc {
-        {{ "Double", new NotInRangeVerifier<DoubleVerifier>(0.0, 5.0), Optional::No }}
+    Documentation doc = {
+        .entries = {
+            { "Double", new NotInRangeVerifier<DoubleVerifier>(0.0, 5.0), Optional::No }
+        }
     };
 
     ghoul::Dictionary positive;
@@ -2100,8 +2141,8 @@ TEST_CASE("Documentation: NotInRange Double", "[documentation]") {
 TEST_CASE("Documentation: Wildcard", "[documentation]") {
     using namespace openspace::documentation;
 
-    Documentation doc {
-        {{ DocumentationEntry::Wildcard, new IntVerifier, Optional::No }}
+    Documentation doc = {
+        .entries = { { DocumentationEntry::Wildcard, new IntVerifier, Optional::No } }
     };
 
     ghoul::Dictionary positive;
@@ -2152,9 +2193,9 @@ TEST_CASE("Documentation: Wildcard", "[documentation]") {
 TEST_CASE("Documentation: Wildcard Mixed", "[documentation]") {
     using namespace openspace::documentation;
 
-    Documentation doc {
-        {
-            { DocumentationEntry::Wildcard, new IntVerifier, Optional::No},
+    Documentation doc = {
+        .entries = {
+            { DocumentationEntry::Wildcard, new IntVerifier, Optional::No },
             { "b", new IntGreaterVerifier(5), Optional::No }
         }
     };
@@ -2221,9 +2262,10 @@ TEST_CASE("Documentation: Wildcard Mixed", "[documentation]") {
 TEST_CASE("Documentation: Referencing", "[documentation]") {
     using namespace openspace::documentation;
 
-    Documentation referenced {
+    Documentation referenced = {
         "Referenced Name",
         "referenced_id",
+        "",
         {
             { "a", new IntVerifier, Optional::No },
             { "b", new DoubleVerifier, Optional::No }
@@ -2231,9 +2273,11 @@ TEST_CASE("Documentation: Referencing", "[documentation]") {
     };
     DocEng.addDocumentation(referenced);
 
-    Documentation doc {{
-        { "Table", new ReferencingVerifier("referenced_id"), Optional::No }
-    }};
+    Documentation doc = {
+        .entries = {
+            { "Table", new ReferencingVerifier("referenced_id"), Optional::No }
+        }
+    };
 
     ghoul::Dictionary positive;
     {
@@ -2268,9 +2312,11 @@ TEST_CASE("Documentation: Referencing", "[documentation]") {
     CHECK(negativeRes.offenses[0].reason == TestResult::Offense::Reason::WrongType);
 
 
-    Documentation wrongDoc {{
-        { "Table", new ReferencingVerifier("WRONG"), Optional::No }
-    } };
+    Documentation wrongDoc = {
+        .entries = {
+            { "Table", new ReferencingVerifier("WRONG"), Optional::No }
+        }
+    };
     ghoul::Dictionary wrongNegative;
     {
         ghoul::Dictionary inner;
@@ -2287,50 +2333,14 @@ TEST_CASE("Documentation: Referencing", "[documentation]") {
     );
 }
 
-TEST_CASE("Documentation: AndOperator", "[documentation]") {
-    using namespace openspace::documentation;
-
-    Documentation doc {
-        {
-            {
-                "a",
-                new AndVerifier({
-                    new IntGreaterEqualVerifier(2), new IntLessEqualVerifier(5)
-                }),
-                Optional::No
-            }
-        }
-    };
-
-    ghoul::Dictionary positive;
-    positive.setValue("a", 4.0);
-    TestResult positiveRes = testSpecification(doc, positive);
-    CHECK(positiveRes.success);
-    CHECK(positiveRes.offenses.empty());
-
-    ghoul::Dictionary negative;
-    negative.setValue("a", 0.0);
-    TestResult negativeRes = testSpecification(doc, negative);
-    CHECK_FALSE(negativeRes.success);
-    REQUIRE(negativeRes.offenses.size() == 1);
-    CHECK(negativeRes.offenses[0].offender == "a");
-    CHECK(negativeRes.offenses[0].reason == TestResult::Offense::Reason::Verification);
-
-    ghoul::Dictionary negative2;
-    negative2.setValue("a", 8.0);
-    negativeRes = testSpecification(doc, negative2);
-    CHECK_FALSE(negativeRes.success);
-    REQUIRE(negativeRes.offenses.size() == 1);
-    CHECK(negativeRes.offenses[0].offender == "a");
-    CHECK(negativeRes.offenses[0].reason == TestResult::Offense::Reason::Verification);
-}
-
 TEST_CASE("Documentation: OrOperator", "[documentation]") {
     using namespace openspace::documentation;
     using namespace std::string_literals;
 
-    Documentation doc {
-        {{ "a", new OrVerifier({ new StringVerifier, new IntVerifier }), Optional::No }}
+    Documentation doc = {
+        .entries = {
+            { "a", new OrVerifier({ new StringVerifier, new IntVerifier }), Optional::No }
+        }
     };
 
     ghoul::Dictionary positive;
@@ -2357,8 +2367,10 @@ TEST_CASE("Documentation: OrOperator", "[documentation]") {
 TEST_CASE("Documentation: IntVector2Verifier", "[documentation]") {
     using namespace openspace::documentation;
 
-    Documentation doc {
-        { { "a", new IntVector2Verifier, Optional::No } }
+    Documentation doc = {
+        .entries = {
+            { "a", new IntVector2Verifier, Optional::No }
+        }
     };
 
     ghoul::Dictionary positive;
@@ -2392,8 +2404,10 @@ TEST_CASE("Documentation: IntVector2Verifier", "[documentation]") {
 TEST_CASE("Documentation: DoubleVector2Verifier", "[documentation]") {
     using namespace openspace::documentation;
 
-    Documentation doc {
-        { { "a", new DoubleVector2Verifier, Optional::No } }
+    Documentation doc = {
+        .entries = {
+            { "a", new DoubleVector2Verifier, Optional::No }
+        }
     };
 
     ghoul::Dictionary positive;
@@ -2428,8 +2442,10 @@ TEST_CASE("Documentation: IntVector3Verifier", "[documentation]") {
     using namespace openspace::documentation;
     using namespace std::string_literals;
 
-    Documentation doc {
-        { { "a", new IntVector3Verifier, Optional::No } }
+    Documentation doc = {
+        .entries = {
+            { "a", new IntVector3Verifier, Optional::No }
+        }
     };
 
     ghoul::Dictionary positive;
@@ -2465,8 +2481,10 @@ TEST_CASE("Documentation: DoubleVector3Verifier", "[documentation]") {
     using namespace openspace::documentation;
     using namespace std::string_literals;
 
-    Documentation doc {
-        { { "a", new DoubleVector3Verifier, Optional::No } }
+    Documentation doc = {
+        .entries = {
+            { "a", new DoubleVector3Verifier, Optional::No }
+        }
     };
 
     ghoul::Dictionary positive;
@@ -2502,8 +2520,10 @@ TEST_CASE("Documentation: IntVector4Verifier", "[documentation]") {
     using namespace openspace::documentation;
     using namespace std::string_literals;
 
-    Documentation doc {
-        { { "a", new IntVector4Verifier, Optional::No } }
+    Documentation doc = {
+        .entries = {
+            { "a", new IntVector4Verifier, Optional::No }
+        }
     };
 
     ghoul::Dictionary positive;
@@ -2540,8 +2560,10 @@ TEST_CASE("Documentation: DoubleVector4Verifier", "[documentation]") {
     using namespace openspace::documentation;
     using namespace std::string_literals;
 
-    Documentation doc {
-        { { "a", new DoubleVector4Verifier, Optional::No } }
+    Documentation doc = {
+        .entries = {
+            { "a", new DoubleVector4Verifier, Optional::No }
+        }
     };
 
     ghoul::Dictionary positive;
@@ -2578,8 +2600,10 @@ TEST_CASE("Documentation: DoubleMatrix2x2Verifier", "[documentation]") {
     using namespace openspace::documentation;
     using namespace std::string_literals;
 
-    Documentation doc {
-        { { "a", new DoubleMatrix2x2Verifier, Optional::No } }
+    Documentation doc = {
+        .entries = {
+            { "a", new DoubleMatrix2x2Verifier, Optional::No }
+        }
     };
 
     ghoul::Dictionary positive;
@@ -2615,8 +2639,10 @@ TEST_CASE("Documentation: DoubleMatrix2x3Verifier", "[documentation]") {
     using namespace openspace::documentation;
     using namespace std::string_literals;
 
-    Documentation doc {
-        { { "a", new DoubleMatrix2x3Verifier, Optional::No } }
+    Documentation doc = {
+        .entries = {
+            { "a", new DoubleMatrix2x3Verifier, Optional::No }
+        }
     };
 
     ghoul::Dictionary positive;
@@ -2652,8 +2678,10 @@ TEST_CASE("Documentation: DoubleMatrix2x4Verifier", "[documentation]") {
     using namespace openspace::documentation;
     using namespace std::string_literals;
 
-    Documentation doc {
-        { { "a", new DoubleMatrix2x4Verifier, Optional::No } }
+    Documentation doc = {
+        .entries = {
+            { "a", new DoubleMatrix2x4Verifier, Optional::No }
+        }
     };
 
     ghoul::Dictionary positive;
@@ -2689,8 +2717,10 @@ TEST_CASE("Documentation: DoubleMatrix3x2Verifier", "[documentation]") {
     using namespace openspace::documentation;
     using namespace std::string_literals;
 
-    Documentation doc {
-        { { "a", new DoubleMatrix3x2Verifier, Optional::No } }
+    Documentation doc = {
+        .entries = {
+            { "a", new DoubleMatrix3x2Verifier, Optional::No }
+        }
     };
 
     ghoul::Dictionary positive;
@@ -2726,8 +2756,10 @@ TEST_CASE("Documentation: DoubleMatrix3x3Verifier", "[documentation]") {
     using namespace openspace::documentation;
     using namespace std::string_literals;
 
-    Documentation doc {
-        { { "a", new DoubleMatrix3x3Verifier, Optional::No } }
+    Documentation doc = {
+        .entries = {
+            { "a", new DoubleMatrix3x3Verifier, Optional::No }
+        }
     };
 
     ghoul::Dictionary positive;
@@ -2763,8 +2795,10 @@ TEST_CASE("Documentation: DoubleMatrix3x4Verifier", "[documentation]") {
     using namespace openspace::documentation;
     using namespace std::string_literals;
 
-    Documentation doc {
-        { { "a", new DoubleMatrix3x4Verifier, Optional::No } }
+    Documentation doc = {
+        .entries = {
+            { "a", new DoubleMatrix3x4Verifier, Optional::No }
+        }
     };
 
     ghoul::Dictionary positive;
@@ -2800,8 +2834,10 @@ TEST_CASE("Documentation: DoubleMatrix4x2Verifier", "[documentation]") {
     using namespace openspace::documentation;
     using namespace std::string_literals;
 
-    Documentation doc {
-        { { "a", new DoubleMatrix4x2Verifier, Optional::No } }
+    Documentation doc = {
+        .entries = {
+            { "a", new DoubleMatrix4x2Verifier, Optional::No }
+        }
     };
 
     ghoul::Dictionary positive;
@@ -2837,8 +2873,10 @@ TEST_CASE("Documentation: DoubleMatrix4x3Verifier", "[documentation]") {
     using namespace openspace::documentation;
     using namespace std::string_literals;
 
-    Documentation doc {
-        { { "a", new DoubleMatrix4x3Verifier, Optional::No } }
+    Documentation doc = {
+        .entries = {
+            { "a", new DoubleMatrix4x3Verifier, Optional::No }
+        }
     };
 
     ghoul::Dictionary positive;
@@ -2874,8 +2912,10 @@ TEST_CASE("Documentation: DoubleMatrix4x4Verifier", "[documentation]") {
     using namespace openspace::documentation;
     using namespace std::string_literals;
 
-    Documentation doc {
-        { { "a", new DoubleMatrix4x4Verifier, Optional::No } }
+    Documentation doc = {
+        .entries = {
+            { "a", new DoubleMatrix4x4Verifier, Optional::No }
+        }
     };
 
     ghoul::Dictionary positive;
@@ -2907,61 +2947,6 @@ TEST_CASE("Documentation: DoubleMatrix4x4Verifier", "[documentation]") {
     CHECK(negativeRes.offenses[0].reason == TestResult::Offense::Reason::WrongType);
 }
 
-TEST_CASE("Documentation: DeprecatedVerifier", "[documentation]") {
-    using namespace openspace::documentation;
-    using namespace std::string_literals;
-
-    Documentation doc { {
-        { "bool", new BoolDeprecatedVerifier, Optional::No },
-        { "int" , new IntDeprecatedVerifier, Optional::No },
-        { "double", new DoubleDeprecatedVerifier, Optional::No },
-        { "string" , new StringDeprecatedVerifier, Optional::No },
-        { "intvec2", new DeprecatedVerifier<IntVector2Verifier>, Optional::No },
-        { "doublevec2", new DeprecatedVerifier<DoubleVector2Verifier>, Optional::No },
-        { "intvec3", new DeprecatedVerifier<IntVector3Verifier>, Optional::No },
-        { "doublevec3", new DeprecatedVerifier<DoubleVector3Verifier>, Optional::No },
-        { "intvec4", new DeprecatedVerifier<IntVector4Verifier>, Optional::No },
-        { "doublevec4", new DeprecatedVerifier<DoubleVector4Verifier>, Optional::No }
-    }};
-
-    ghoul::Dictionary positive;
-    positive.setValue("bool", true);
-    positive.setValue("int", 1);
-    positive.setValue("double", 2.0);
-    positive.setValue("string", ""s);
-    positive.setValue("intvec2", glm::ivec2(0));
-    positive.setValue("doublevec2", glm::dvec2(0.0));
-    positive.setValue("intvec3", glm::ivec3(0));
-    positive.setValue("doublevec3", glm::dvec3(0.0));
-    positive.setValue("intvec4", glm::ivec4(0));
-    positive.setValue("doublevec4", glm::dvec4(0.0));
-    TestResult positiveRes = testSpecification(doc, positive);
-    CHECK(positiveRes.success);
-    CHECK(positiveRes.offenses.empty());
-    REQUIRE(positiveRes.warnings.size() == 10);
-
-    CHECK(positiveRes.warnings[0].offender == "bool");
-    CHECK(positiveRes.warnings[0].reason == TestResult::Warning::Reason::Deprecated);
-    CHECK(positiveRes.warnings[1].offender == "double");
-    CHECK(positiveRes.warnings[1].reason == TestResult::Warning::Reason::Deprecated);
-    CHECK(positiveRes.warnings[2].offender == "doublevec2");
-    CHECK(positiveRes.warnings[2].reason == TestResult::Warning::Reason::Deprecated);
-    CHECK(positiveRes.warnings[3].offender == "doublevec3");
-    CHECK(positiveRes.warnings[3].reason == TestResult::Warning::Reason::Deprecated);
-    CHECK(positiveRes.warnings[4].offender == "doublevec4");
-    CHECK(positiveRes.warnings[4].reason == TestResult::Warning::Reason::Deprecated);
-    CHECK(positiveRes.warnings[5].offender == "int");
-    CHECK(positiveRes.warnings[5].reason == TestResult::Warning::Reason::Deprecated);
-    CHECK(positiveRes.warnings[6].offender == "intvec2");
-    CHECK(positiveRes.warnings[6].reason == TestResult::Warning::Reason::Deprecated);
-    CHECK(positiveRes.warnings[7].offender == "intvec3");
-    CHECK(positiveRes.warnings[7].reason == TestResult::Warning::Reason::Deprecated);
-    CHECK(positiveRes.warnings[8].offender == "intvec4");
-    CHECK(positiveRes.warnings[8].reason == TestResult::Warning::Reason::Deprecated);
-    CHECK(positiveRes.warnings[9].offender == "string");
-    CHECK(positiveRes.warnings[9].reason == TestResult::Warning::Reason::Deprecated);
-}
-
 TEST_CASE("Documentation: Verifier Type Post Conditions", "[documentation]") {
     using namespace openspace::documentation;
     using namespace std::string_literals;
@@ -3023,18 +3008,6 @@ TEST_CASE("Documentation: Verifier Type Post Conditions", "[documentation]") {
     CHECK(AnnotationVerifier<IntVector4Verifier>("A"s).type() != "");
     CHECK(AnnotationVerifier<DoubleVector4Verifier>("A"s).type() != "");
 
-    CHECK(BoolDeprecatedVerifier().type() != "");
-    CHECK(IntDeprecatedVerifier().type() != "");
-    CHECK(DoubleDeprecatedVerifier().type() != "");
-    CHECK(StringDeprecatedVerifier().type() != "");
-    CHECK(TableDeprecatedVerifier().type() != "");
-    CHECK(DeprecatedVerifier<IntVector2Verifier>().type() != "");
-    CHECK(DeprecatedVerifier<DoubleVector2Verifier>().type() != "");
-    CHECK(DeprecatedVerifier<IntVector3Verifier>().type() != "");
-    CHECK(DeprecatedVerifier<DoubleVector3Verifier>().type() != "");
-    CHECK(DeprecatedVerifier<IntVector4Verifier>().type() != "");
-    CHECK(DeprecatedVerifier<DoubleVector4Verifier>().type() != "");
-
     CHECK(ReferencingVerifier("identifier"s).type() != "");
 }
 
@@ -3099,17 +3072,5 @@ TEST_CASE("Documentation: Verifier Documentation Post Conditions", "[documentati
     CHECK(AnnotationVerifier<IntVector4Verifier>("A"s).documentation() != "");
     CHECK(AnnotationVerifier<DoubleVector4Verifier>("A"s).documentation() != "");
 
-    CHECK(BoolDeprecatedVerifier().documentation() != "");
-    CHECK(IntDeprecatedVerifier().documentation() != "");
-    CHECK(DoubleDeprecatedVerifier().documentation() != "");
-    CHECK(StringDeprecatedVerifier().documentation() != "");
-    CHECK(TableDeprecatedVerifier().documentation() != "");
-    CHECK(DeprecatedVerifier<IntVector2Verifier>().documentation() != "");
-    CHECK(DeprecatedVerifier<DoubleVector2Verifier>().documentation() != "");
-    CHECK(DeprecatedVerifier<IntVector3Verifier>().documentation() != "");
-    CHECK(DeprecatedVerifier<DoubleVector3Verifier>().documentation() != "");
-    CHECK(DeprecatedVerifier<IntVector4Verifier>().documentation() != "");
-    CHECK(DeprecatedVerifier<DoubleVector4Verifier>().documentation() != "");
-
     CHECK(ReferencingVerifier("identifier"s).documentation() != "");
 }

From 4a1fe3f4a9291c72ff3ea6dfe5b2490103e3e3db Mon Sep 17 00:00:00 2001
From: Alexander Bock <alexander.bock@liu.se>
Date: Sun, 19 Nov 2023 14:10:47 +0100
Subject: [PATCH 177/701] Fix logo URL

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index b15ef66fb1..b609d2e277 100644
--- a/README.md
+++ b/README.md
@@ -52,4 +52,4 @@ The contents of this repository provided under an [MIT license](https://github.c
 # Support
 OpenSpace is supported by the following institutions:
 
-![Image](https://github.com/OpenSpace/openspace.github.io/raw/master/assets/logos/sponsors.png)
+![Image](https://docs.openspaceproject.com/en/latest/_static/logos/sponsors.png)

From 4ee078502b4e8c7942359d08b99a29c61e7949fa Mon Sep 17 00:00:00 2001
From: Alexander Bock <alexander.bock@liu.se>
Date: Sun, 19 Nov 2023 16:35:14 +0100
Subject: [PATCH 178/701] Doxygen (#2953)

* Update Doxygen and add new CSS file
* Remove Doxygen warnings
---
 .gitmodules                                   |   3 +
 Doxyfile                                      | 775 ++++++++++--------
 apps/OpenSpace-MinVR/main.cpp                 |   3 +-
 include/openspace/documentation/verifier.h    |   2 +-
 include/openspace/mission/missionmanager.h    |  12 +-
 include/openspace/navigation/waypoint.h       |   4 +-
 .../openspace/properties/templateproperty.h   |   1 -
 .../openspace/properties/triggerproperty.h    |   5 +-
 include/openspace/rendering/renderable.h      |  11 +-
 include/openspace/scene/scene.h               |  19 +-
 include/openspace/util/json_helper.h          |   1 -
 include/openspace/util/spicemanager.h         |   2 -
 modules/base/rendering/renderabletrail.h      |   4 +-
 .../util/kameleonfieldlinehelper.cpp          |  17 +-
 .../util/kameleonfieldlinehelper.h            |  17 +
 modules/gaia/rendering/octreemanager.h        | 128 ++-
 modules/gaia/tasks/constructoctreetask.h      |   5 +-
 modules/gaia/tasks/readfilejob.h              |  19 +-
 modules/gaia/tasks/readfitstask.h             |  10 +-
 .../globebrowsing/src/asynctiledataprovider.h |   3 +-
 .../globebrowsing/src/memoryawaretilecache.h  |   2 +-
 modules/globebrowsing/src/rawtiledatareader.h |   9 +-
 modules/globebrowsing/src/skirtedgrid.h       |   6 -
 modules/globebrowsing/src/timequantizer.h     | 220 ++---
 modules/space/translation/gptranslation.h     |   3 +-
 modules/space/translation/keplertranslation.h |   2 +-
 modules/webbrowser/include/browserinstance.h  |   2 +-
 modules/webbrowser/include/eventhandler.h     |   2 +
 src/documentation/verifier.cpp                | 152 ++--
 src/engine/settings.cpp                       |   3 +-
 support/doxygen/README.md                     |   0
 support/doxygen/css                           |   1 +
 32 files changed, 788 insertions(+), 655 deletions(-)
 create mode 100644 support/doxygen/README.md
 create mode 160000 support/doxygen/css

diff --git a/.gitmodules b/.gitmodules
index 76c093dc48..d98a1a3adf 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -38,3 +38,6 @@
 [submodule "documentation"]
 	path = documentation
 	url = https://github.com/OpenSpace/OpenSpace-Documentation-Dist.git
+[submodule "support/doxygen/css"]
+	path = support/doxygen/css
+	url = https://github.com/jothepro/doxygen-awesome-css.git
diff --git a/Doxyfile b/Doxyfile
index 8166b80b51..44468a071b 100644
--- a/Doxyfile
+++ b/Doxyfile
@@ -34,7 +34,7 @@
 # https://www.gnu.org/software/libiconv/ for the list of possible encodings.
 # The default value is: UTF-8.
 
-DOXYFILE_ENCODING      = UTF-8
+DOXYFILE_ENCODING = UTF-8
 
 # The PROJECT_NAME tag is a single word (or a sequence of words surrounded by
 # double-quotes, unless you are using Doxywizard) that should identify the
@@ -42,33 +42,33 @@ DOXYFILE_ENCODING      = UTF-8
 # title of most generated pages and in a few other places.
 # The default value is: My Project.
 
-PROJECT_NAME           = OpenSpace
+PROJECT_NAME = OpenSpace
 
 # The PROJECT_NUMBER tag can be used to enter a project or revision number. This
 # could be handy for archiving the generated documentation or if some version
 # control system is used.
 
-PROJECT_NUMBER         =
+PROJECT_NUMBER =
 
 # Using the PROJECT_BRIEF tag one can provide an optional one line description
 # for a project that appears at the top of each page and should give viewer a
 # quick idea about the purpose of the project. Keep the description short.
 
-PROJECT_BRIEF          =
+PROJECT_BRIEF =
 
 # With the PROJECT_LOGO tag one can specify a logo or an icon that is included
 # in the documentation. The maximum height of the logo should not exceed 55
 # pixels and the maximum width should not exceed 200 pixels. Doxygen will copy
 # the logo to the output directory.
 
-PROJECT_LOGO           = data/openspace-icon.png
+PROJECT_LOGO = data/openspace-icon.png
 
 # The OUTPUT_DIRECTORY tag is used to specify the (relative or absolute) path
 # into which the generated documentation will be written. If a relative path is
 # entered, it will be relative to the location where doxygen was started. If
 # left blank the current directory will be used.
 
-OUTPUT_DIRECTORY       = doc/
+OUTPUT_DIRECTORY = doc/
 
 # If the CREATE_SUBDIRS tag is set to YES then doxygen will create up to 4096
 # sub-directories (in 2 levels) under the output directory of each output format
@@ -79,7 +79,7 @@ OUTPUT_DIRECTORY       = doc/
 # control the number of sub-directories.
 # The default value is: NO.
 
-CREATE_SUBDIRS         = YES
+CREATE_SUBDIRS = YES
 
 # Controls the number of sub-directories that will be created when
 # CREATE_SUBDIRS tag is set to YES. Level 0 represents 16 directories, and every
@@ -90,7 +90,7 @@ CREATE_SUBDIRS         = YES
 # Minimum value: 0, maximum value: 8, default value: 8.
 # This tag requires that the tag CREATE_SUBDIRS is set to YES.
 
-CREATE_SUBDIRS_LEVEL   = 8
+CREATE_SUBDIRS_LEVEL = 8
 
 # If the ALLOW_UNICODE_NAMES tag is set to YES, doxygen will allow non-ASCII
 # characters to appear in the names of generated files. If set to NO, non-ASCII
@@ -98,7 +98,7 @@ CREATE_SUBDIRS_LEVEL   = 8
 # U+3044.
 # The default value is: NO.
 
-ALLOW_UNICODE_NAMES    = NO
+ALLOW_UNICODE_NAMES = NO
 
 # The OUTPUT_LANGUAGE tag is used to specify the language in which all
 # documentation generated by doxygen is written. Doxygen will use this
@@ -113,14 +113,14 @@ ALLOW_UNICODE_NAMES    = NO
 # Swedish, Turkish, Ukrainian and Vietnamese.
 # The default value is: English.
 
-OUTPUT_LANGUAGE        = English
+OUTPUT_LANGUAGE = English
 
 # If the BRIEF_MEMBER_DESC tag is set to YES, doxygen will include brief member
 # descriptions after the members that are listed in the file and class
 # documentation (similar to Javadoc). Set to NO to disable this.
 # The default value is: YES.
 
-BRIEF_MEMBER_DESC      = YES
+BRIEF_MEMBER_DESC = YES
 
 # If the REPEAT_BRIEF tag is set to YES, doxygen will prepend the brief
 # description of a member or function before the detailed description
@@ -129,7 +129,7 @@ BRIEF_MEMBER_DESC      = YES
 # brief descriptions will be completely suppressed.
 # The default value is: YES.
 
-REPEAT_BRIEF           = YES
+REPEAT_BRIEF = YES
 
 # This tag implements a quasi-intelligent brief description abbreviator that is
 # used to form the text in various listings. Each string in this list, if found
@@ -140,24 +140,24 @@ REPEAT_BRIEF           = YES
 # the entity):The $name class, The $name widget, The $name file, is, provides,
 # specifies, contains, represents, a, an and the.
 
-ABBREVIATE_BRIEF       = "The $name class" \
-                         "The $name widget" \
-                         "The $name file" \
-                         is \
-                         provides \
-                         specifies \
-                         contains \
-                         represents \
-                         a \
-                         an \
-                         the
+ABBREVIATE_BRIEF = "The $name class" \
+                   "The $name widget" \
+                   "The $name file" \
+                   is \
+                   provides \
+                   specifies \
+                   contains \
+                   represents \
+                   a \
+                   an \
+                   the
 
 # If the ALWAYS_DETAILED_SEC and REPEAT_BRIEF tags are both set to YES then
 # doxygen will generate a detailed section even if there is only a brief
 # description.
 # The default value is: NO.
 
-ALWAYS_DETAILED_SEC    = YES
+ALWAYS_DETAILED_SEC = YES
 
 # If the INLINE_INHERITED_MEMB tag is set to YES, doxygen will show all
 # inherited members of a class in the documentation of that class as if those
@@ -165,14 +165,14 @@ ALWAYS_DETAILED_SEC    = YES
 # operators of the base classes will not be shown.
 # The default value is: NO.
 
-INLINE_INHERITED_MEMB  = NO
+INLINE_INHERITED_MEMB = NO
 
 # If the FULL_PATH_NAMES tag is set to YES, doxygen will prepend the full path
 # before files name in the file list and in the header files. If set to NO the
 # shortest path that makes the file name unique will be used
 # The default value is: YES.
 
-FULL_PATH_NAMES        = YES
+FULL_PATH_NAMES = YES
 
 # The STRIP_FROM_PATH tag can be used to strip a user-defined part of the path.
 # Stripping is only done if one of the specified strings matches the left-hand
@@ -184,7 +184,7 @@ FULL_PATH_NAMES        = YES
 # will be relative from the directory where doxygen is started.
 # This tag requires that the tag FULL_PATH_NAMES is set to YES.
 
-STRIP_FROM_PATH        =
+STRIP_FROM_PATH =
 
 # The STRIP_FROM_INC_PATH tag can be used to strip a user-defined part of the
 # path mentioned in the documentation of a class, which tells the reader which
@@ -193,14 +193,14 @@ STRIP_FROM_PATH        =
 # specify the list of include paths that are normally passed to the compiler
 # using the -I flag.
 
-STRIP_FROM_INC_PATH    =
+STRIP_FROM_INC_PATH =
 
 # If the SHORT_NAMES tag is set to YES, doxygen will generate much shorter (but
 # less readable) file names. This can be useful is your file systems doesn't
 # support long names like on DOS, Mac, or CD-ROM.
 # The default value is: NO.
 
-SHORT_NAMES            = NO
+SHORT_NAMES = NO
 
 # If the JAVADOC_AUTOBRIEF tag is set to YES then doxygen will interpret the
 # first line (until the first dot) of a Javadoc-style comment as the brief
@@ -209,7 +209,7 @@ SHORT_NAMES            = NO
 # description.)
 # The default value is: NO.
 
-JAVADOC_AUTOBRIEF      = YES
+JAVADOC_AUTOBRIEF = YES
 
 # If the JAVADOC_BANNER tag is set to YES then doxygen will interpret a line
 # such as
@@ -219,7 +219,7 @@ JAVADOC_AUTOBRIEF      = YES
 # interpreted by doxygen.
 # The default value is: NO.
 
-JAVADOC_BANNER         = NO
+JAVADOC_BANNER = NO
 
 # If the QT_AUTOBRIEF tag is set to YES then doxygen will interpret the first
 # line (until the first dot) of a Qt-style comment as the brief description. If
@@ -227,7 +227,7 @@ JAVADOC_BANNER         = NO
 # requiring an explicit \brief command for a brief description.)
 # The default value is: NO.
 
-QT_AUTOBRIEF           = YES
+QT_AUTOBRIEF = YES
 
 # The MULTILINE_CPP_IS_BRIEF tag can be set to YES to make doxygen treat a
 # multi-line C++ special comment block (i.e. a block of //! or /// comments) as
@@ -247,26 +247,26 @@ MULTILINE_CPP_IS_BRIEF = NO
 # documentation blocks is shown as doxygen documentation.
 # The default value is: YES.
 
-PYTHON_DOCSTRING       = YES
+PYTHON_DOCSTRING = YES
 
 # If the INHERIT_DOCS tag is set to YES then an undocumented member inherits the
 # documentation from any documented member that it re-implements.
 # The default value is: YES.
 
-INHERIT_DOCS           = YES
+INHERIT_DOCS = YES
 
 # If the SEPARATE_MEMBER_PAGES tag is set to YES then doxygen will produce a new
 # page for each member. If set to NO, the documentation of a member will be part
 # of the file/class/namespace that contains it.
 # The default value is: NO.
 
-SEPARATE_MEMBER_PAGES  = NO
+SEPARATE_MEMBER_PAGES = NO
 
 # The TAB_SIZE tag can be used to set the number of spaces in a tab. Doxygen
 # uses this value to replace tabs by spaces in code fragments.
 # Minimum value: 1, maximum value: 16, default value: 4.
 
-TAB_SIZE               = 4
+TAB_SIZE = 4
 
 # This tag can be used to specify a number of aliases that act as commands in
 # the documentation. An alias has the form:
@@ -283,7 +283,7 @@ TAB_SIZE               = 4
 # with the commands \{ and \} for these it is advised to use the version @{ and
 # @} or use a double escape (\\{ and \\})
 
-ALIASES                =
+ALIASES =
 
 # Set the OPTIMIZE_OUTPUT_FOR_C tag to YES if your project consists of C sources
 # only. Doxygen will then generate output that is more tailored for C. For
@@ -291,7 +291,7 @@ ALIASES                =
 # members will be omitted, etc.
 # The default value is: NO.
 
-OPTIMIZE_OUTPUT_FOR_C  = NO
+OPTIMIZE_OUTPUT_FOR_C = NO
 
 # Set the OPTIMIZE_OUTPUT_JAVA tag to YES if your project consists of Java or
 # Python sources only. Doxygen will then generate output that is more tailored
@@ -299,19 +299,19 @@ OPTIMIZE_OUTPUT_FOR_C  = NO
 # qualified scopes will look different, etc.
 # The default value is: NO.
 
-OPTIMIZE_OUTPUT_JAVA   = NO
+OPTIMIZE_OUTPUT_JAVA = NO
 
 # Set the OPTIMIZE_FOR_FORTRAN tag to YES if your project consists of Fortran
 # sources. Doxygen will then generate output that is tailored for Fortran.
 # The default value is: NO.
 
-OPTIMIZE_FOR_FORTRAN   = NO
+OPTIMIZE_FOR_FORTRAN = NO
 
 # Set the OPTIMIZE_OUTPUT_VHDL tag to YES if your project consists of VHDL
 # sources. Doxygen will then generate output that is tailored for VHDL.
 # The default value is: NO.
 
-OPTIMIZE_OUTPUT_VHDL   = NO
+OPTIMIZE_OUTPUT_VHDL = NO
 
 # Set the OPTIMIZE_OUTPUT_SLICE tag to YES if your project consists of Slice
 # sources only. Doxygen will then generate output that is more tailored for that
@@ -319,7 +319,7 @@ OPTIMIZE_OUTPUT_VHDL   = NO
 # separated into more groups, etc.
 # The default value is: NO.
 
-OPTIMIZE_OUTPUT_SLICE  = NO
+OPTIMIZE_OUTPUT_SLICE = NO
 
 # Doxygen selects the parser to use depending on the extension of the files it
 # parses. With this tag you can assign which parser to use for a given
@@ -342,7 +342,7 @@ OPTIMIZE_OUTPUT_SLICE  = NO
 #
 # Note see also the list of default file extension mappings.
 
-EXTENSION_MAPPING      = inl=C++
+EXTENSION_MAPPING = inl=C++
 
 # If the MARKDOWN_SUPPORT tag is enabled then doxygen pre-processes all comments
 # according to the Markdown format, which allows for more readable
@@ -352,7 +352,7 @@ EXTENSION_MAPPING      = inl=C++
 # case of backward compatibilities issues.
 # The default value is: YES.
 
-MARKDOWN_SUPPORT       = YES
+MARKDOWN_SUPPORT = YES
 
 # When the TOC_INCLUDE_HEADINGS tag is set to a non-zero value, all headings up
 # to that level are automatically included in the table of contents, even if
@@ -361,7 +361,18 @@ MARKDOWN_SUPPORT       = YES
 # Minimum value: 0, maximum value: 99, default value: 5.
 # This tag requires that the tag MARKDOWN_SUPPORT is set to YES.
 
-TOC_INCLUDE_HEADINGS   = 5
+TOC_INCLUDE_HEADINGS = 5
+
+# The MARKDOWN_ID_STYLE tag can be used to specify the algorithm used to
+# generate identifiers for the Markdown headings. Note: Every identifier is
+# unique.
+# Possible values are: DOXYGEN use a fixed 'autotoc_md' string followed by a
+# sequence number starting at 0 and GITHUB use the lower case version of title
+# with any whitespace replaced by '-' and punctuation characters removed.
+# The default value is: DOXYGEN.
+# This tag requires that the tag MARKDOWN_SUPPORT is set to YES.
+
+MARKDOWN_ID_STYLE = DOXYGEN
 
 # When enabled doxygen tries to link words that correspond to documented
 # classes, or namespaces to their corresponding documentation. Such a link can
@@ -369,7 +380,7 @@ TOC_INCLUDE_HEADINGS   = 5
 # globally by setting AUTOLINK_SUPPORT to NO.
 # The default value is: YES.
 
-AUTOLINK_SUPPORT       = YES
+AUTOLINK_SUPPORT = YES
 
 # If you use STL classes (i.e. std::string, std::vector, etc.) but do not want
 # to include (a tag file for) the STL sources as input, then you should set this
@@ -379,13 +390,13 @@ AUTOLINK_SUPPORT       = YES
 # diagrams that involve STL classes more complete and accurate.
 # The default value is: NO.
 
-BUILTIN_STL_SUPPORT    = YES
+BUILTIN_STL_SUPPORT = YES
 
 # If you use Microsoft's C++/CLI language, you should set this option to YES to
 # enable parsing support.
 # The default value is: NO.
 
-CPP_CLI_SUPPORT        = NO
+CPP_CLI_SUPPORT = NO
 
 # Set the SIP_SUPPORT tag to YES if your project consists of sip (see:
 # https://www.riverbankcomputing.com/software/sip/intro) sources only. Doxygen
@@ -393,7 +404,7 @@ CPP_CLI_SUPPORT        = NO
 # of private inheritance when no explicit protection keyword is present.
 # The default value is: NO.
 
-SIP_SUPPORT            = NO
+SIP_SUPPORT = NO
 
 # For Microsoft's IDL there are propget and propput attributes to indicate
 # getter and setter methods for a property. Setting this option to YES will make
@@ -403,7 +414,7 @@ SIP_SUPPORT            = NO
 # should set this option to NO.
 # The default value is: YES.
 
-IDL_PROPERTY_SUPPORT   = YES
+IDL_PROPERTY_SUPPORT = YES
 
 # If member grouping is used in the documentation and the DISTRIBUTE_GROUP_DOC
 # tag is set to YES then doxygen will reuse the documentation of the first
@@ -411,7 +422,7 @@ IDL_PROPERTY_SUPPORT   = YES
 # all members of a group must be documented explicitly.
 # The default value is: NO.
 
-DISTRIBUTE_GROUP_DOC   = NO
+DISTRIBUTE_GROUP_DOC = NO
 
 # If one adds a struct or class to a group and this option is enabled, then also
 # any nested class or struct is added to the same group. By default this option
@@ -427,7 +438,7 @@ GROUP_NESTED_COMPOUNDS = NO
 # \nosubgrouping command.
 # The default value is: YES.
 
-SUBGROUPING            = YES
+SUBGROUPING = YES
 
 # When the INLINE_GROUPED_CLASSES tag is set to YES, classes, structs and unions
 # are shown inside the group in which they are included (e.g. using \ingroup)
@@ -448,7 +459,7 @@ INLINE_GROUPED_CLASSES = NO
 # Man pages) or section (for LaTeX and RTF).
 # The default value is: NO.
 
-INLINE_SIMPLE_STRUCTS  = YES
+INLINE_SIMPLE_STRUCTS = YES
 
 # When TYPEDEF_HIDES_STRUCT tag is enabled, a typedef of a struct, union, or
 # enum is documented as struct, union, or enum with the name of the typedef. So
@@ -459,7 +470,7 @@ INLINE_SIMPLE_STRUCTS  = YES
 # types are typedef'ed and only the typedef is referenced, never the tag name.
 # The default value is: NO.
 
-TYPEDEF_HIDES_STRUCT   = NO
+TYPEDEF_HIDES_STRUCT = NO
 
 # The size of the symbol lookup cache can be set using LOOKUP_CACHE_SIZE. This
 # cache is used to resolve symbols given their name and scope. Since this can be
@@ -472,7 +483,7 @@ TYPEDEF_HIDES_STRUCT   = NO
 # the optimal cache size from a speed point of view.
 # Minimum value: 0, maximum value: 9, default value: 0.
 
-LOOKUP_CACHE_SIZE      = 9
+LOOKUP_CACHE_SIZE = 9
 
 # The NUM_PROC_THREADS specifies the number of threads doxygen is allowed to use
 # during processing. When set to 0 doxygen will based this on the number of
@@ -485,7 +496,15 @@ LOOKUP_CACHE_SIZE      = 9
 # DOT_NUM_THREADS setting.
 # Minimum value: 0, maximum value: 32, default value: 1.
 
-NUM_PROC_THREADS       = 1
+NUM_PROC_THREADS = 1
+
+# If the TIMESTAMP tag is set different from NO then each generated page will
+# contain the date or date and time when the page was generated. Setting this to
+# NO can help when comparing the output of multiple runs.
+# Possible values are: YES, NO, DATETIME and DATE.
+# The default value is: NO.
+
+TIMESTAMP = DATE
 
 #---------------------------------------------------------------------------
 # Build related configuration options
@@ -499,31 +518,31 @@ NUM_PROC_THREADS       = 1
 # normally produced when WARNINGS is set to YES.
 # The default value is: NO.
 
-EXTRACT_ALL            = YES
+EXTRACT_ALL = YES
 
 # If the EXTRACT_PRIVATE tag is set to YES, all private members of a class will
 # be included in the documentation.
 # The default value is: NO.
 
-EXTRACT_PRIVATE        = YES
+EXTRACT_PRIVATE = YES
 
 # If the EXTRACT_PRIV_VIRTUAL tag is set to YES, documented private virtual
 # methods of a class will be included in the documentation.
 # The default value is: NO.
 
-EXTRACT_PRIV_VIRTUAL   = YES
+EXTRACT_PRIV_VIRTUAL = YES
 
 # If the EXTRACT_PACKAGE tag is set to YES, all members with package or internal
 # scope will be included in the documentation.
 # The default value is: NO.
 
-EXTRACT_PACKAGE        = NO
+EXTRACT_PACKAGE = NO
 
 # If the EXTRACT_STATIC tag is set to YES, all static members of a file will be
 # included in the documentation.
 # The default value is: NO.
 
-EXTRACT_STATIC         = YES
+EXTRACT_STATIC = YES
 
 # If the EXTRACT_LOCAL_CLASSES tag is set to YES, classes (and structs) defined
 # locally in source files will be included in the documentation. If set to NO,
@@ -531,7 +550,7 @@ EXTRACT_STATIC         = YES
 # for Java sources.
 # The default value is: YES.
 
-EXTRACT_LOCAL_CLASSES  = YES
+EXTRACT_LOCAL_CLASSES = YES
 
 # This flag is only useful for Objective-C code. If set to YES, local methods,
 # which are defined in the implementation section but not in the interface are
@@ -539,7 +558,7 @@ EXTRACT_LOCAL_CLASSES  = YES
 # included.
 # The default value is: NO.
 
-EXTRACT_LOCAL_METHODS  = NO
+EXTRACT_LOCAL_METHODS = NO
 
 # If this flag is set to YES, the members of anonymous namespaces will be
 # extracted and appear in the documentation as a namespace called
@@ -548,7 +567,7 @@ EXTRACT_LOCAL_METHODS  = NO
 # are hidden.
 # The default value is: NO.
 
-EXTRACT_ANON_NSPACES   = NO
+EXTRACT_ANON_NSPACES = NO
 
 # If this flag is set to YES, the name of an unnamed parameter in a declaration
 # will be determined by the corresponding definition. By default unnamed
@@ -563,7 +582,7 @@ RESOLVE_UNNAMED_PARAMS = YES
 # section is generated. This option has no effect if EXTRACT_ALL is enabled.
 # The default value is: NO.
 
-HIDE_UNDOC_MEMBERS     = NO
+HIDE_UNDOC_MEMBERS = NO
 
 # If the HIDE_UNDOC_CLASSES tag is set to YES, doxygen will hide all
 # undocumented classes that are normally visible in the class hierarchy. If set
@@ -572,28 +591,28 @@ HIDE_UNDOC_MEMBERS     = NO
 # if EXTRACT_ALL is enabled.
 # The default value is: NO.
 
-HIDE_UNDOC_CLASSES     = NO
+HIDE_UNDOC_CLASSES = NO
 
 # If the HIDE_FRIEND_COMPOUNDS tag is set to YES, doxygen will hide all friend
 # declarations. If set to NO, these declarations will be included in the
 # documentation.
 # The default value is: NO.
 
-HIDE_FRIEND_COMPOUNDS  = NO
+HIDE_FRIEND_COMPOUNDS = NO
 
 # If the HIDE_IN_BODY_DOCS tag is set to YES, doxygen will hide any
 # documentation blocks found inside the body of a function. If set to NO, these
 # blocks will be appended to the function's detailed documentation block.
 # The default value is: NO.
 
-HIDE_IN_BODY_DOCS      = NO
+HIDE_IN_BODY_DOCS = NO
 
 # The INTERNAL_DOCS tag determines if documentation that is typed after a
 # \internal command is included. If the tag is set to NO then the documentation
 # will be excluded. Set it to YES to include the internal documentation.
 # The default value is: NO.
 
-INTERNAL_DOCS          = NO
+INTERNAL_DOCS = NO
 
 # With the correct setting of option CASE_SENSE_NAMES doxygen will better be
 # able to match the capabilities of the underlying filesystem. In case the
@@ -610,59 +629,59 @@ INTERNAL_DOCS          = NO
 # Possible values are: SYSTEM, NO and YES.
 # The default value is: SYSTEM.
 
-CASE_SENSE_NAMES       = SYSTEM
+CASE_SENSE_NAMES = SYSTEM
 
 # If the HIDE_SCOPE_NAMES tag is set to NO then doxygen will show members with
 # their full class and namespace scopes in the documentation. If set to YES, the
 # scope will be hidden.
 # The default value is: NO.
 
-HIDE_SCOPE_NAMES       = YES
+HIDE_SCOPE_NAMES = YES
 
 # If the HIDE_COMPOUND_REFERENCE tag is set to NO (default) then doxygen will
 # append additional text to a page's title, such as Class Reference. If set to
 # YES the compound reference will be hidden.
 # The default value is: NO.
 
-HIDE_COMPOUND_REFERENCE= NO
+HIDE_COMPOUND_REFERENCE = NO
 
 # If the SHOW_HEADERFILE tag is set to YES then the documentation for a class
 # will show which file needs to be included to use the class.
 # The default value is: YES.
 
-SHOW_HEADERFILE        = YES
+SHOW_HEADERFILE = YES
 
 # If the SHOW_INCLUDE_FILES tag is set to YES then doxygen will put a list of
 # the files that are included by a file in the documentation of that file.
 # The default value is: YES.
 
-SHOW_INCLUDE_FILES     = YES
+SHOW_INCLUDE_FILES = YES
 
 # If the SHOW_GROUPED_MEMB_INC tag is set to YES then Doxygen will add for each
 # grouped member an include statement to the documentation, telling the reader
 # which file to include in order to use the member.
 # The default value is: NO.
 
-SHOW_GROUPED_MEMB_INC  = NO
+SHOW_GROUPED_MEMB_INC = NO
 
 # If the FORCE_LOCAL_INCLUDES tag is set to YES then doxygen will list include
 # files with double quotes in the documentation rather than with sharp brackets.
 # The default value is: NO.
 
-FORCE_LOCAL_INCLUDES   = NO
+FORCE_LOCAL_INCLUDES = NO
 
 # If the INLINE_INFO tag is set to YES then a tag [inline] is inserted in the
 # documentation for inline members.
 # The default value is: YES.
 
-INLINE_INFO            = YES
+INLINE_INFO = YES
 
 # If the SORT_MEMBER_DOCS tag is set to YES then doxygen will sort the
 # (detailed) documentation of file and class members alphabetically by member
 # name. If set to NO, the members will appear in declaration order.
 # The default value is: YES.
 
-SORT_MEMBER_DOCS       = YES
+SORT_MEMBER_DOCS = YES
 
 # If the SORT_BRIEF_DOCS tag is set to YES then doxygen will sort the brief
 # descriptions of file, namespace and class members alphabetically by member
@@ -670,7 +689,7 @@ SORT_MEMBER_DOCS       = YES
 # this will also influence the order of the classes in the class list.
 # The default value is: NO.
 
-SORT_BRIEF_DOCS        = YES
+SORT_BRIEF_DOCS = YES
 
 # If the SORT_MEMBERS_CTORS_1ST tag is set to YES then doxygen will sort the
 # (brief and detailed) documentation of class members so that constructors and
@@ -689,7 +708,7 @@ SORT_MEMBERS_CTORS_1ST = YES
 # appear in their defined order.
 # The default value is: NO.
 
-SORT_GROUP_NAMES       = NO
+SORT_GROUP_NAMES = NO
 
 # If the SORT_BY_SCOPE_NAME tag is set to YES, the class list will be sorted by
 # fully-qualified names, including namespaces. If set to NO, the class list will
@@ -699,7 +718,7 @@ SORT_GROUP_NAMES       = NO
 # list.
 # The default value is: NO.
 
-SORT_BY_SCOPE_NAME     = NO
+SORT_BY_SCOPE_NAME = NO
 
 # If the STRICT_PROTO_MATCHING option is enabled and doxygen fails to do proper
 # type resolution of all parameters of a function it will reject a match between
@@ -709,38 +728,38 @@ SORT_BY_SCOPE_NAME     = NO
 # accept a match between prototype and implementation in such cases.
 # The default value is: NO.
 
-STRICT_PROTO_MATCHING  = NO
+STRICT_PROTO_MATCHING = NO
 
 # The GENERATE_TODOLIST tag can be used to enable (YES) or disable (NO) the todo
 # list. This list is created by putting \todo commands in the documentation.
 # The default value is: YES.
 
-GENERATE_TODOLIST      = YES
+GENERATE_TODOLIST = YES
 
 # The GENERATE_TESTLIST tag can be used to enable (YES) or disable (NO) the test
 # list. This list is created by putting \test commands in the documentation.
 # The default value is: YES.
 
-GENERATE_TESTLIST      = NO
+GENERATE_TESTLIST = NO
 
 # The GENERATE_BUGLIST tag can be used to enable (YES) or disable (NO) the bug
 # list. This list is created by putting \bug commands in the documentation.
 # The default value is: YES.
 
-GENERATE_BUGLIST       = NO
+GENERATE_BUGLIST = NO
 
 # The GENERATE_DEPRECATEDLIST tag can be used to enable (YES) or disable (NO)
 # the deprecated list. This list is created by putting \deprecated commands in
 # the documentation.
 # The default value is: YES.
 
-GENERATE_DEPRECATEDLIST= YES
+GENERATE_DEPRECATEDLIST = YES
 
 # The ENABLED_SECTIONS tag can be used to enable conditional documentation
 # sections, marked by \if <section_label> ... \endif and \cond <section_label>
 # ... \endcond blocks.
 
-ENABLED_SECTIONS       =
+ENABLED_SECTIONS =
 
 # The MAX_INITIALIZER_LINES tag determines the maximum number of lines that the
 # initial value of a variable or macro / define can have for it to appear in the
@@ -751,28 +770,28 @@ ENABLED_SECTIONS       =
 # documentation regardless of this setting.
 # Minimum value: 0, maximum value: 10000, default value: 30.
 
-MAX_INITIALIZER_LINES  = 30
+MAX_INITIALIZER_LINES = 30
 
 # Set the SHOW_USED_FILES tag to NO to disable the list of files generated at
 # the bottom of the documentation of classes and structs. If set to YES, the
 # list will mention the files that were used to generate the documentation.
 # The default value is: YES.
 
-SHOW_USED_FILES        = NO
+SHOW_USED_FILES = NO
 
 # Set the SHOW_FILES tag to NO to disable the generation of the Files page. This
 # will remove the Files entry from the Quick Index and from the Folder Tree View
 # (if specified).
 # The default value is: YES.
 
-SHOW_FILES             = YES
+SHOW_FILES = YES
 
 # Set the SHOW_NAMESPACES tag to NO to disable the generation of the Namespaces
 # page. This will remove the Namespaces entry from the Quick Index and from the
 # Folder Tree View (if specified).
 # The default value is: YES.
 
-SHOW_NAMESPACES        = YES
+SHOW_NAMESPACES = YES
 
 # The FILE_VERSION_FILTER tag can be used to specify a program or script that
 # doxygen should invoke to get the current version for each file (typically from
@@ -782,7 +801,7 @@ SHOW_NAMESPACES        = YES
 # by doxygen. Whatever the program writes to standard output is used as the file
 # version. For an example see the documentation.
 
-FILE_VERSION_FILTER    =
+FILE_VERSION_FILTER =
 
 # The LAYOUT_FILE tag can be used to specify a layout file which will be parsed
 # by doxygen. The layout file controls the global structure of the generated
@@ -796,7 +815,7 @@ FILE_VERSION_FILTER    =
 # DoxygenLayout.xml, doxygen will parse it automatically even if the LAYOUT_FILE
 # tag is left empty.
 
-LAYOUT_FILE            =
+LAYOUT_FILE =
 
 # The CITE_BIB_FILES tag can be used to specify one or more bib files containing
 # the reference definitions. This must be a list of .bib files. The .bib
@@ -806,7 +825,7 @@ LAYOUT_FILE            =
 # LATEX_BIB_STYLE. To use this feature you need bibtex and perl available in the
 # search path. See also \cite for info how to create references.
 
-CITE_BIB_FILES         =
+CITE_BIB_FILES =
 
 #---------------------------------------------------------------------------
 # Configuration options related to warning and progress messages
@@ -817,7 +836,7 @@ CITE_BIB_FILES         =
 # messages are off.
 # The default value is: NO.
 
-QUIET                  = YES
+QUIET = YES
 
 # The WARNINGS tag can be used to turn on/off the warning messages that are
 # generated to standard error (stderr) by doxygen. If WARNINGS is set to YES
@@ -826,14 +845,14 @@ QUIET                  = YES
 # Tip: Turn warnings on while writing the documentation.
 # The default value is: YES.
 
-WARNINGS               = YES
+WARNINGS = YES
 
 # If the WARN_IF_UNDOCUMENTED tag is set to YES then doxygen will generate
 # warnings for undocumented members. If EXTRACT_ALL is set to YES then this flag
 # will automatically be disabled.
 # The default value is: YES.
 
-WARN_IF_UNDOCUMENTED   = YES
+WARN_IF_UNDOCUMENTED = YES
 
 # If the WARN_IF_DOC_ERROR tag is set to YES, doxygen will generate warnings for
 # potential errors in the documentation, such as documenting some parameters in
@@ -841,7 +860,7 @@ WARN_IF_UNDOCUMENTED   = YES
 # using markup commands wrongly.
 # The default value is: YES.
 
-WARN_IF_DOC_ERROR      = YES
+WARN_IF_DOC_ERROR = YES
 
 # If WARN_IF_INCOMPLETE_DOC is set to YES, doxygen will warn about incomplete
 # function parameter documentation. If set to NO, doxygen will accept that some
@@ -858,7 +877,7 @@ WARN_IF_INCOMPLETE_DOC = YES
 # WARN_IF_INCOMPLETE_DOC
 # The default value is: NO.
 
-WARN_NO_PARAMDOC       = NO
+WARN_NO_PARAMDOC = NO
 
 # If WARN_IF_UNDOC_ENUM_VAL option is set to YES, doxygen will warn about
 # undocumented enumeration values. If set to NO, doxygen will accept
@@ -872,10 +891,17 @@ WARN_IF_UNDOC_ENUM_VAL = YES
 # a warning is encountered. If the WARN_AS_ERROR tag is set to FAIL_ON_WARNINGS
 # then doxygen will continue running as if WARN_AS_ERROR tag is set to NO, but
 # at the end of the doxygen process doxygen will return with a non-zero status.
-# Possible values are: NO, YES and FAIL_ON_WARNINGS.
+# If the WARN_AS_ERROR tag is set to FAIL_ON_WARNINGS_PRINT then doxygen behaves
+# like FAIL_ON_WARNINGS but in case no WARN_LOGFILE is defined doxygen will not
+# write the warning messages in between other messages but write them at the end
+# of a run, in case a WARN_LOGFILE is defined the warning messages will be
+# besides being in the defined file also be shown at the end of a run, unless
+# the WARN_LOGFILE is defined as - i.e. standard output (stdout) in that case
+# the behavior will remain as with the setting FAIL_ON_WARNINGS.
+# Possible values are: NO, YES, FAIL_ON_WARNINGS and FAIL_ON_WARNINGS_PRINT.
 # The default value is: NO.
 
-WARN_AS_ERROR          = NO
+WARN_AS_ERROR = NO
 
 # The WARN_FORMAT tag determines the format of the warning messages that doxygen
 # can produce. The string should contain the $file, $line, and $text tags, which
@@ -886,7 +912,7 @@ WARN_AS_ERROR          = NO
 # See also: WARN_LINE_FORMAT
 # The default value is: $file:$line: $text.
 
-WARN_FORMAT            = "$file:$line: $text"
+WARN_FORMAT = "$file:$line: $text"
 
 # In the $text part of the WARN_FORMAT command it is possible that a reference
 # to a more specific place is given. To make it easier to jump to this place
@@ -896,7 +922,7 @@ WARN_FORMAT            = "$file:$line: $text"
 # See also: WARN_FORMAT
 # The default value is: at line $line of file $file.
 
-WARN_LINE_FORMAT       = "at line $line of file $file"
+WARN_LINE_FORMAT = "at line $line of file $file"
 
 # The WARN_LOGFILE tag can be used to specify a file to which warning and error
 # messages should be written. If left blank the output is written to standard
@@ -905,7 +931,7 @@ WARN_LINE_FORMAT       = "at line $line of file $file"
 # specified the warning and error messages are written to standard output
 # (stdout).
 
-WARN_LOGFILE           =
+WARN_LOGFILE =
 
 #---------------------------------------------------------------------------
 # Configuration options related to the input files
@@ -917,10 +943,11 @@ WARN_LOGFILE           =
 # spaces. See also FILE_PATTERNS and EXTENSION_MAPPING
 # Note: If this tag is empty the current directory is searched.
 
-INPUT                  = src \
-                         include \
-                         modules \
-                         apps
+INPUT = src \
+        include \
+        modules \
+        apps \
+        support/doxygen/README.md
 
 # This tag can be used to specify the character encoding of the source files
 # that doxygen parses. Internally doxygen uses the UTF-8 encoding. Doxygen uses
@@ -930,7 +957,7 @@ INPUT                  = src \
 # See also: INPUT_FILE_ENCODING
 # The default value is: UTF-8.
 
-INPUT_ENCODING         = UTF-8
+INPUT_ENCODING = UTF-8
 
 # This tag can be used to specify the character encoding of the source files
 # that doxygen parses The INPUT_FILE_ENCODING tag can be used to specify
@@ -940,7 +967,7 @@ INPUT_ENCODING         = UTF-8
 # form: pattern=encoding (like *.php=ISO-8859-1). See cfg_input_encoding
 # "INPUT_ENCODING" for further information on supported encodings.
 
-INPUT_FILE_ENCODING    =
+INPUT_FILE_ENCODING =
 
 # If the value of the INPUT tag contains directories, you can use the
 # FILE_PATTERNS tag to specify one or more wildcard patterns (like *.cpp and
@@ -953,22 +980,22 @@ INPUT_FILE_ENCODING    =
 # Note the list of default checked file patterns might differ from the list of
 # default file extension mappings.
 #
-# If left blank the following patterns are tested:*.c, *.cc, *.cxx, *.cpp,
-# *.c++, *.java, *.ii, *.ixx, *.ipp, *.i++, *.inl, *.idl, *.ddl, *.odl, *.h,
-# *.hh, *.hxx, *.hpp, *.h++, *.l, *.cs, *.d, *.php, *.php4, *.php5, *.phtml,
-# *.inc, *.m, *.markdown, *.md, *.mm, *.dox (to be provided as doxygen C
-# comment), *.py, *.pyw, *.f90, *.f95, *.f03, *.f08, *.f18, *.f, *.for, *.vhd,
-# *.vhdl, *.ucf, *.qsf and *.ice.
+# If left blank the following patterns are tested:*.c, *.cc, *.cxx, *.cxxm,
+# *.cpp, *.cppm, *.c++, *.c++m, *.java, *.ii, *.ixx, *.ipp, *.i++, *.inl, *.idl,
+# *.ddl, *.odl, *.h, *.hh, *.hxx, *.hpp, *.h++, *.ixx, *.l, *.cs, *.d, *.php,
+# *.php4, *.php5, *.phtml, *.inc, *.m, *.markdown, *.md, *.mm, *.dox (to be
+# provided as doxygen C comment), *.py, *.pyw, *.f90, *.f95, *.f03, *.f08,
+# *.f18, *.f, *.for, *.vhd, *.vhdl, *.ucf, *.qsf and *.ice.
 
-FILE_PATTERNS          = *.cpp \
-                         *.h \
-                         *.inl
+FILE_PATTERNS = *.cpp \
+                *.h \
+                *.inl
 
 # The RECURSIVE tag can be used to specify whether or not subdirectories should
 # be searched for input files as well.
 # The default value is: NO.
 
-RECURSIVE              = YES
+RECURSIVE = YES
 
 # The EXCLUDE tag can be used to specify files and/or directories that should be
 # excluded from the INPUT source files. This way you can easily exclude a
@@ -977,14 +1004,14 @@ RECURSIVE              = YES
 # Note that relative paths are relative to the directory from which doxygen is
 # run.
 
-EXCLUDE                =
+EXCLUDE =
 
 # The EXCLUDE_SYMLINKS tag can be used to select whether or not files or
 # directories that are symbolic links (a Unix file system feature) are excluded
 # from the input.
 # The default value is: NO.
 
-EXCLUDE_SYMLINKS       = NO
+EXCLUDE_SYMLINKS = NO
 
 # If the value of the INPUT tag contains directories, you can use the
 # EXCLUDE_PATTERNS tag to specify one or more wildcard patterns to exclude
@@ -993,53 +1020,50 @@ EXCLUDE_SYMLINKS       = NO
 # Note that the wildcards are matched against the file with absolute path, so to
 # exclude all test directories for example use the pattern */test/*
 
-EXCLUDE_PATTERNS       = ext/* \
-                         bin/* \
-                         build/* \
-                         config/* \
-                         gui/* \
-                         kernels/* \
-                         data/* \
-                         scripts/* \
-                         shaders/* \
-                         **/ext/**
+EXCLUDE_PATTERNS = ext/* \
+                   bin/* \
+                   build/* \
+                   config/* \
+                   gui/* \
+                   kernels/* \
+                   data/* \
+                   scripts/* \
+                   shaders/* \
+                   **/ext/**
 
 # The EXCLUDE_SYMBOLS tag can be used to specify one or more symbol names
 # (namespaces, classes, functions, etc.) that should be excluded from the
 # output. The symbol name can be a fully qualified name, a word, or if the
 # wildcard * is used, a substring. Examples: ANamespace, AClass,
 # ANamespace::AClass, ANamespace::*Test
-#
-# Note that the wildcards are matched against the file with absolute path, so to
-# exclude all test directories use the pattern */test/*
 
-EXCLUDE_SYMBOLS        =
+EXCLUDE_SYMBOLS =
 
 # The EXAMPLE_PATH tag can be used to specify one or more files or directories
 # that contain example code fragments that are included (see the \include
 # command).
 
-EXAMPLE_PATH           =
+EXAMPLE_PATH =
 
 # If the value of the EXAMPLE_PATH tag contains directories, you can use the
 # EXAMPLE_PATTERNS tag to specify one or more wildcard pattern (like *.cpp and
 # *.h) to filter out the source-files in the directories. If left blank all
 # files are included.
 
-EXAMPLE_PATTERNS       = *
+EXAMPLE_PATTERNS = *
 
 # If the EXAMPLE_RECURSIVE tag is set to YES then subdirectories will be
 # searched for input files to be used with the \include or \dontinclude commands
 # irrespective of the value of the RECURSIVE tag.
 # The default value is: NO.
 
-EXAMPLE_RECURSIVE      = NO
+EXAMPLE_RECURSIVE = NO
 
 # The IMAGE_PATH tag can be used to specify one or more files or directories
 # that contain images that are to be included in the documentation (see the
 # \image command).
 
-IMAGE_PATH             =
+IMAGE_PATH =
 
 # The INPUT_FILTER tag can be used to specify a program that doxygen should
 # invoke to filter for each input file. Doxygen will invoke the filter program
@@ -1065,7 +1089,7 @@ IMAGE_PATH             =
 # need to set EXTENSION_MAPPING for the extension otherwise the files are not
 # properly processed by doxygen.
 
-INPUT_FILTER           =
+INPUT_FILTER =
 
 # The FILTER_PATTERNS tag can be used to specify filters on a per file pattern
 # basis. Doxygen will compare the file name with each pattern and apply the
@@ -1078,14 +1102,14 @@ INPUT_FILTER           =
 # need to set EXTENSION_MAPPING for the extension otherwise the files are not
 # properly processed by doxygen.
 
-FILTER_PATTERNS        =
+FILTER_PATTERNS =
 
 # If the FILTER_SOURCE_FILES tag is set to YES, the input filter (if set using
 # INPUT_FILTER) will also be used to filter the input files that are used for
 # producing the source files to browse (i.e. when SOURCE_BROWSER is set to YES).
 # The default value is: NO.
 
-FILTER_SOURCE_FILES    = NO
+FILTER_SOURCE_FILES = NO
 
 # The FILTER_SOURCE_PATTERNS tag can be used to specify source filters per file
 # pattern. A pattern will override the setting for FILTER_PATTERN (if any) and
@@ -1100,7 +1124,7 @@ FILTER_SOURCE_PATTERNS =
 # (index.html). This can be useful if you have a project on for instance GitHub
 # and want to reuse the introduction page also for the doxygen output.
 
-USE_MDFILE_AS_MAINPAGE = README.md
+USE_MDFILE_AS_MAINPAGE = support/doxygen/README.md
 
 # The Fortran standard specifies that for fixed formatted Fortran code all
 # characters from position 72 are to be considered as comment. A common
@@ -1109,7 +1133,7 @@ USE_MDFILE_AS_MAINPAGE = README.md
 # be processed before the automatic comment starts.
 # Minimum value: 7, maximum value: 10000, default value: 72.
 
-FORTRAN_COMMENT_AFTER  = 72
+FORTRAN_COMMENT_AFTER = 72
 
 #---------------------------------------------------------------------------
 # Configuration options related to source browsing
@@ -1122,20 +1146,20 @@ FORTRAN_COMMENT_AFTER  = 72
 # also VERBATIM_HEADERS is set to NO.
 # The default value is: NO.
 
-SOURCE_BROWSER         = YES
+SOURCE_BROWSER = YES
 
 # Setting the INLINE_SOURCES tag to YES will include the body of functions,
 # classes and enums directly into the documentation.
 # The default value is: NO.
 
-INLINE_SOURCES         = NO
+INLINE_SOURCES = NO
 
 # Setting the STRIP_CODE_COMMENTS tag to YES will instruct doxygen to hide any
 # special comment blocks from generated source code fragments. Normal C, C++ and
 # Fortran comments will always remain visible.
 # The default value is: YES.
 
-STRIP_CODE_COMMENTS    = YES
+STRIP_CODE_COMMENTS = YES
 
 # If the REFERENCED_BY_RELATION tag is set to YES then for each documented
 # entity all documented functions referencing it will be listed.
@@ -1147,7 +1171,7 @@ REFERENCED_BY_RELATION = NO
 # all documented entities called/used by that function will be listed.
 # The default value is: NO.
 
-REFERENCES_RELATION    = NO
+REFERENCES_RELATION = NO
 
 # If the REFERENCES_LINK_SOURCE tag is set to YES and SOURCE_BROWSER tag is set
 # to YES then the hyperlinks from functions in REFERENCES_RELATION and
@@ -1165,7 +1189,7 @@ REFERENCES_LINK_SOURCE = YES
 # The default value is: YES.
 # This tag requires that the tag SOURCE_BROWSER is set to YES.
 
-SOURCE_TOOLTIPS        = YES
+SOURCE_TOOLTIPS = YES
 
 # If the USE_HTAGS tag is set to YES then the references to source code will
 # point to the HTML generated by the htags(1) tool instead of doxygen built-in
@@ -1187,7 +1211,7 @@ SOURCE_TOOLTIPS        = YES
 # The default value is: NO.
 # This tag requires that the tag SOURCE_BROWSER is set to YES.
 
-USE_HTAGS              = NO
+USE_HTAGS = NO
 
 # If the VERBATIM_HEADERS tag is set the YES then doxygen will generate a
 # verbatim copy of the header file for each class for which an include is
@@ -1195,7 +1219,7 @@ USE_HTAGS              = NO
 # See also: Section \class.
 # The default value is: YES.
 
-VERBATIM_HEADERS       = NO
+VERBATIM_HEADERS = NO
 
 # If the CLANG_ASSISTED_PARSING tag is set to YES then doxygen will use the
 # clang parser (see:
@@ -1214,7 +1238,7 @@ CLANG_ASSISTED_PARSING = NO
 # The default value is: YES.
 # This tag requires that the tag CLANG_ASSISTED_PARSING is set to YES.
 
-CLANG_ADD_INC_PATHS    = YES
+CLANG_ADD_INC_PATHS = YES
 
 # If clang assisted parsing is enabled you can provide the compiler with command
 # line options that you would normally use when invoking the compiler. Note that
@@ -1222,7 +1246,7 @@ CLANG_ADD_INC_PATHS    = YES
 # specified with INPUT and INCLUDE_PATH.
 # This tag requires that the tag CLANG_ASSISTED_PARSING is set to YES.
 
-CLANG_OPTIONS          =
+CLANG_OPTIONS =
 
 # If clang assisted parsing is enabled you can provide the clang parser with the
 # path to the directory containing a file called compile_commands.json. This
@@ -1235,7 +1259,7 @@ CLANG_OPTIONS          =
 # Note: The availability of this option depends on whether or not doxygen was
 # generated with the -Duse_libclang=ON option for CMake.
 
-CLANG_DATABASE_PATH    =
+CLANG_DATABASE_PATH =
 
 #---------------------------------------------------------------------------
 # Configuration options related to the alphabetical class index
@@ -1246,7 +1270,7 @@ CLANG_DATABASE_PATH    =
 # classes, structs, unions or interfaces.
 # The default value is: YES.
 
-ALPHABETICAL_INDEX     = YES
+ALPHABETICAL_INDEX = YES
 
 # The IGNORE_PREFIX tag can be used to specify a prefix (or a list of prefixes)
 # that should be ignored while generating the index headers. The IGNORE_PREFIX
@@ -1255,7 +1279,7 @@ ALPHABETICAL_INDEX     = YES
 # after removing the prefix.
 # This tag requires that the tag ALPHABETICAL_INDEX is set to YES.
 
-IGNORE_PREFIX          =
+IGNORE_PREFIX =
 
 #---------------------------------------------------------------------------
 # Configuration options related to the HTML output
@@ -1264,7 +1288,7 @@ IGNORE_PREFIX          =
 # If the GENERATE_HTML tag is set to YES, doxygen will generate HTML output
 # The default value is: YES.
 
-GENERATE_HTML          = YES
+GENERATE_HTML = YES
 
 # The HTML_OUTPUT tag is used to specify where the HTML docs will be put. If a
 # relative path is entered the value of OUTPUT_DIRECTORY will be put in front of
@@ -1272,14 +1296,14 @@ GENERATE_HTML          = YES
 # The default directory is: html.
 # This tag requires that the tag GENERATE_HTML is set to YES.
 
-HTML_OUTPUT            = html
+HTML_OUTPUT = html
 
 # The HTML_FILE_EXTENSION tag can be used to specify the file extension for each
 # generated HTML page (for example: .htm, .php, .asp).
 # The default value is: .html.
 # This tag requires that the tag GENERATE_HTML is set to YES.
 
-HTML_FILE_EXTENSION    = .html
+HTML_FILE_EXTENSION = .html
 
 # The HTML_HEADER tag can be used to specify a user-defined HTML header file for
 # each generated HTML page. If the tag is left blank doxygen will generate a
@@ -1299,7 +1323,7 @@ HTML_FILE_EXTENSION    = .html
 # of the possible markers and block names see the documentation.
 # This tag requires that the tag GENERATE_HTML is set to YES.
 
-HTML_HEADER            =
+HTML_HEADER =
 
 # The HTML_FOOTER tag can be used to specify a user-defined HTML footer for each
 # generated HTML page. If the tag is left blank doxygen will generate a standard
@@ -1309,7 +1333,7 @@ HTML_HEADER            =
 # that doxygen normally uses.
 # This tag requires that the tag GENERATE_HTML is set to YES.
 
-HTML_FOOTER            =
+HTML_FOOTER =
 
 # The HTML_STYLESHEET tag can be used to specify a user-defined cascading style
 # sheet that is used by each HTML page. It can be used to fine-tune the look of
@@ -1321,7 +1345,7 @@ HTML_FOOTER            =
 # obsolete.
 # This tag requires that the tag GENERATE_HTML is set to YES.
 
-HTML_STYLESHEET        =
+HTML_STYLESHEET =
 
 # The HTML_EXTRA_STYLESHEET tag can be used to specify additional user-defined
 # cascading style sheets that are included after the standard style sheets
@@ -1339,7 +1363,7 @@ HTML_STYLESHEET        =
 # documentation.
 # This tag requires that the tag GENERATE_HTML is set to YES.
 
-HTML_EXTRA_STYLESHEET  =
+HTML_EXTRA_STYLESHEET = support/doxygen/css/doxygen-awesome.css
 
 # The HTML_EXTRA_FILES tag can be used to specify one or more extra images or
 # other source files which should be copied to the HTML output directory. Note
@@ -1349,7 +1373,7 @@ HTML_EXTRA_STYLESHEET  =
 # files will be copied as-is; there are no commands or markers available.
 # This tag requires that the tag GENERATE_HTML is set to YES.
 
-HTML_EXTRA_FILES       =
+HTML_EXTRA_FILES =
 
 # The HTML_COLORSTYLE tag can be used to specify if the generated HTML output
 # should be rendered with a dark or light theme.
@@ -1362,7 +1386,7 @@ HTML_EXTRA_FILES       =
 # The default value is: AUTO_LIGHT.
 # This tag requires that the tag GENERATE_HTML is set to YES.
 
-HTML_COLORSTYLE        = DARK
+HTML_COLORSTYLE = DARK
 
 # The HTML_COLORSTYLE_HUE tag controls the color of the HTML output. Doxygen
 # will adjust the colors in the style sheet and background images according to
@@ -1373,7 +1397,7 @@ HTML_COLORSTYLE        = DARK
 # Minimum value: 0, maximum value: 359, default value: 220.
 # This tag requires that the tag GENERATE_HTML is set to YES.
 
-HTML_COLORSTYLE_HUE    = 225
+HTML_COLORSTYLE_HUE = 225
 
 # The HTML_COLORSTYLE_SAT tag controls the purity (or saturation) of the colors
 # in the HTML output. For a value of 0 the output will use gray-scales only. A
@@ -1381,7 +1405,7 @@ HTML_COLORSTYLE_HUE    = 225
 # Minimum value: 0, maximum value: 255, default value: 100.
 # This tag requires that the tag GENERATE_HTML is set to YES.
 
-HTML_COLORSTYLE_SAT    = 18
+HTML_COLORSTYLE_SAT = 18
 
 # The HTML_COLORSTYLE_GAMMA tag controls the gamma correction applied to the
 # luminance component of the colors in the HTML output. Values below 100
@@ -1392,16 +1416,7 @@ HTML_COLORSTYLE_SAT    = 18
 # Minimum value: 40, maximum value: 240, default value: 80.
 # This tag requires that the tag GENERATE_HTML is set to YES.
 
-HTML_COLORSTYLE_GAMMA  = 100
-
-# If the HTML_TIMESTAMP tag is set to YES then the footer of each generated HTML
-# page will contain the date and time when the page was generated. Setting this
-# to YES can help to show when doxygen was last run and thus if the
-# documentation is up to date.
-# The default value is: NO.
-# This tag requires that the tag GENERATE_HTML is set to YES.
-
-HTML_TIMESTAMP         = YES
+HTML_COLORSTYLE_GAMMA = 100
 
 # If the HTML_DYNAMIC_MENUS tag is set to YES then the generated HTML
 # documentation will contain a main index with vertical navigation menus that
@@ -1412,7 +1427,7 @@ HTML_TIMESTAMP         = YES
 # The default value is: YES.
 # This tag requires that the tag GENERATE_HTML is set to YES.
 
-HTML_DYNAMIC_MENUS     = YES
+HTML_DYNAMIC_MENUS = YES
 
 # If the HTML_DYNAMIC_SECTIONS tag is set to YES then the generated HTML
 # documentation will contain sections that can be hidden and shown after the
@@ -1420,7 +1435,14 @@ HTML_DYNAMIC_MENUS     = YES
 # The default value is: NO.
 # This tag requires that the tag GENERATE_HTML is set to YES.
 
-HTML_DYNAMIC_SECTIONS  = YES
+HTML_DYNAMIC_SECTIONS = YES
+
+# If the HTML_CODE_FOLDING tag is set to YES then classes and functions can be
+# dynamically folded and expanded in the generated HTML source code.
+# The default value is: YES.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+HTML_CODE_FOLDING = YES
 
 # With HTML_INDEX_NUM_ENTRIES one can control the preferred number of entries
 # shown in the various tree structured indices initially; the user can expand
@@ -1448,7 +1470,7 @@ HTML_INDEX_NUM_ENTRIES = 100
 # The default value is: NO.
 # This tag requires that the tag GENERATE_HTML is set to YES.
 
-GENERATE_DOCSET        = NO
+GENERATE_DOCSET = NO
 
 # This tag determines the name of the docset feed. A documentation feed provides
 # an umbrella under which multiple documentation sets from a single provider
@@ -1456,14 +1478,14 @@ GENERATE_DOCSET        = NO
 # The default value is: Doxygen generated docs.
 # This tag requires that the tag GENERATE_DOCSET is set to YES.
 
-DOCSET_FEEDNAME        = "Doxygen generated docs"
+DOCSET_FEEDNAME = "Doxygen generated docs"
 
 # This tag determines the URL of the docset feed. A documentation feed provides
 # an umbrella under which multiple documentation sets from a single provider
 # (such as a company or product suite) can be grouped.
 # This tag requires that the tag GENERATE_DOCSET is set to YES.
 
-DOCSET_FEEDURL         =
+DOCSET_FEEDURL =
 
 # This tag specifies a string that should uniquely identify the documentation
 # set bundle. This should be a reverse domain-name style string, e.g.
@@ -1471,7 +1493,7 @@ DOCSET_FEEDURL         =
 # The default value is: org.doxygen.Project.
 # This tag requires that the tag GENERATE_DOCSET is set to YES.
 
-DOCSET_BUNDLE_ID       = org.doxygen.Project
+DOCSET_BUNDLE_ID = org.doxygen.Project
 
 # The DOCSET_PUBLISHER_ID tag specifies a string that should uniquely identify
 # the documentation publisher. This should be a reverse domain-name style
@@ -1479,13 +1501,13 @@ DOCSET_BUNDLE_ID       = org.doxygen.Project
 # The default value is: org.doxygen.Publisher.
 # This tag requires that the tag GENERATE_DOCSET is set to YES.
 
-DOCSET_PUBLISHER_ID    = org.doxygen.Publisher
+DOCSET_PUBLISHER_ID = org.doxygen.Publisher
 
 # The DOCSET_PUBLISHER_NAME tag identifies the documentation publisher.
 # The default value is: Publisher.
 # This tag requires that the tag GENERATE_DOCSET is set to YES.
 
-DOCSET_PUBLISHER_NAME  = Publisher
+DOCSET_PUBLISHER_NAME = Publisher
 
 # If the GENERATE_HTMLHELP tag is set to YES then doxygen generates three
 # additional HTML index files: index.hhp, index.hhc, and index.hhk. The
@@ -1507,14 +1529,14 @@ DOCSET_PUBLISHER_NAME  = Publisher
 # The default value is: NO.
 # This tag requires that the tag GENERATE_HTML is set to YES.
 
-GENERATE_HTMLHELP      = NO
+GENERATE_HTMLHELP = NO
 
 # The CHM_FILE tag can be used to specify the file name of the resulting .chm
 # file. You can add a path in front of the file if the result should not be
 # written to the html output directory.
 # This tag requires that the tag GENERATE_HTMLHELP is set to YES.
 
-CHM_FILE               =
+CHM_FILE =
 
 # The HHC_LOCATION tag can be used to specify the location (absolute path
 # including file name) of the HTML help compiler (hhc.exe). If non-empty,
@@ -1522,20 +1544,20 @@ CHM_FILE               =
 # The file has to be specified with full path.
 # This tag requires that the tag GENERATE_HTMLHELP is set to YES.
 
-HHC_LOCATION           =
+HHC_LOCATION =
 
 # The GENERATE_CHI flag controls if a separate .chi index file is generated
 # (YES) or that it should be included in the main .chm file (NO).
 # The default value is: NO.
 # This tag requires that the tag GENERATE_HTMLHELP is set to YES.
 
-GENERATE_CHI           = NO
+GENERATE_CHI = NO
 
 # The CHM_INDEX_ENCODING is used to encode HtmlHelp index (hhk), content (hhc)
 # and project file content.
 # This tag requires that the tag GENERATE_HTMLHELP is set to YES.
 
-CHM_INDEX_ENCODING     =
+CHM_INDEX_ENCODING =
 
 # The BINARY_TOC flag controls whether a binary table of contents is generated
 # (YES) or a normal table of contents (NO) in the .chm file. Furthermore it
@@ -1543,14 +1565,24 @@ CHM_INDEX_ENCODING     =
 # The default value is: NO.
 # This tag requires that the tag GENERATE_HTMLHELP is set to YES.
 
-BINARY_TOC             = NO
+BINARY_TOC = NO
 
 # The TOC_EXPAND flag can be set to YES to add extra items for group members to
 # the table of contents of the HTML help documentation and to the tree view.
 # The default value is: NO.
 # This tag requires that the tag GENERATE_HTMLHELP is set to YES.
 
-TOC_EXPAND             = NO
+TOC_EXPAND = NO
+
+# The SITEMAP_URL tag is used to specify the full URL of the place where the
+# generated documentation will be placed on the server by the user during the
+# deployment of the documentation. The generated sitemap is called sitemap.xml
+# and placed on the directory specified by HTML_OUTPUT. In case no SITEMAP_URL
+# is specified no sitemap is generated. For information about the sitemap
+# protocol see https://www.sitemaps.org
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+SITEMAP_URL =
 
 # If the GENERATE_QHP tag is set to YES and both QHP_NAMESPACE and
 # QHP_VIRTUAL_FOLDER are set, an additional index file will be generated that
@@ -1559,14 +1591,14 @@ TOC_EXPAND             = NO
 # The default value is: NO.
 # This tag requires that the tag GENERATE_HTML is set to YES.
 
-GENERATE_QHP           = NO
+GENERATE_QHP = NO
 
 # If the QHG_LOCATION tag is specified, the QCH_FILE tag can be used to specify
 # the file name of the resulting .qch file. The path specified is relative to
 # the HTML output folder.
 # This tag requires that the tag GENERATE_QHP is set to YES.
 
-QCH_FILE               =
+QCH_FILE =
 
 # The QHP_NAMESPACE tag specifies the namespace to use when generating Qt Help
 # Project output. For more information please see Qt Help Project / Namespace
@@ -1575,7 +1607,7 @@ QCH_FILE               =
 # The default value is: org.doxygen.Project.
 # This tag requires that the tag GENERATE_QHP is set to YES.
 
-QHP_NAMESPACE          = org.doxygen.Project
+QHP_NAMESPACE = org.doxygen.Project
 
 # The QHP_VIRTUAL_FOLDER tag specifies the namespace to use when generating Qt
 # Help Project output. For more information please see Qt Help Project / Virtual
@@ -1584,7 +1616,7 @@ QHP_NAMESPACE          = org.doxygen.Project
 # The default value is: doc.
 # This tag requires that the tag GENERATE_QHP is set to YES.
 
-QHP_VIRTUAL_FOLDER     = doc
+QHP_VIRTUAL_FOLDER = doc
 
 # If the QHP_CUST_FILTER_NAME tag is set, it specifies the name of a custom
 # filter to add. For more information please see Qt Help Project / Custom
@@ -1592,7 +1624,7 @@ QHP_VIRTUAL_FOLDER     = doc
 # https://doc.qt.io/archives/qt-4.8/qthelpproject.html#custom-filters).
 # This tag requires that the tag GENERATE_QHP is set to YES.
 
-QHP_CUST_FILTER_NAME   =
+QHP_CUST_FILTER_NAME =
 
 # The QHP_CUST_FILTER_ATTRS tag specifies the list of the attributes of the
 # custom filter to add. For more information please see Qt Help Project / Custom
@@ -1600,21 +1632,21 @@ QHP_CUST_FILTER_NAME   =
 # https://doc.qt.io/archives/qt-4.8/qthelpproject.html#custom-filters).
 # This tag requires that the tag GENERATE_QHP is set to YES.
 
-QHP_CUST_FILTER_ATTRS  =
+QHP_CUST_FILTER_ATTRS =
 
 # The QHP_SECT_FILTER_ATTRS tag specifies the list of the attributes this
 # project's filter section matches. Qt Help Project / Filter Attributes (see:
 # https://doc.qt.io/archives/qt-4.8/qthelpproject.html#filter-attributes).
 # This tag requires that the tag GENERATE_QHP is set to YES.
 
-QHP_SECT_FILTER_ATTRS  =
+QHP_SECT_FILTER_ATTRS =
 
 # The QHG_LOCATION tag can be used to specify the location (absolute path
 # including file name) of Qt's qhelpgenerator. If non-empty doxygen will try to
 # run qhelpgenerator on the generated .qhp file.
 # This tag requires that the tag GENERATE_QHP is set to YES.
 
-QHG_LOCATION           =
+QHG_LOCATION =
 
 # If the GENERATE_ECLIPSEHELP tag is set to YES, additional index files will be
 # generated, together with the HTML files, they form an Eclipse help plugin. To
@@ -1626,7 +1658,7 @@ QHG_LOCATION           =
 # The default value is: NO.
 # This tag requires that the tag GENERATE_HTML is set to YES.
 
-GENERATE_ECLIPSEHELP   = NO
+GENERATE_ECLIPSEHELP = NO
 
 # A unique identifier for the Eclipse help plugin. When installing the plugin
 # the directory name containing the HTML and XML files should also have this
@@ -1634,7 +1666,7 @@ GENERATE_ECLIPSEHELP   = NO
 # The default value is: org.doxygen.Project.
 # This tag requires that the tag GENERATE_ECLIPSEHELP is set to YES.
 
-ECLIPSE_DOC_ID         = org.doxygen.Project
+ECLIPSE_DOC_ID  = org.doxygen.Project
 
 # If you want full control over the layout of the generated HTML pages it might
 # be necessary to disable the index and replace it with your own. The
@@ -1645,7 +1677,7 @@ ECLIPSE_DOC_ID         = org.doxygen.Project
 # The default value is: NO.
 # This tag requires that the tag GENERATE_HTML is set to YES.
 
-DISABLE_INDEX          = NO
+DISABLE_INDEX = NO
 
 # The GENERATE_TREEVIEW tag is used to specify whether a tree-like index
 # structure should be generated to display hierarchical information. If the tag
@@ -1662,7 +1694,7 @@ DISABLE_INDEX          = NO
 # The default value is: NO.
 # This tag requires that the tag GENERATE_HTML is set to YES.
 
-GENERATE_TREEVIEW      = YES
+GENERATE_TREEVIEW = YES
 
 # When both GENERATE_TREEVIEW and DISABLE_INDEX are set to YES, then the
 # FULL_SIDEBAR option determines if the side bar is limited to only the treeview
@@ -1674,7 +1706,7 @@ GENERATE_TREEVIEW      = YES
 # The default value is: NO.
 # This tag requires that the tag GENERATE_HTML is set to YES.
 
-FULL_SIDEBAR           = NO
+FULL_SIDEBAR = NO
 
 # The ENUM_VALUES_PER_LINE tag can be used to set the number of enum values that
 # doxygen will group on one line in the generated HTML documentation.
@@ -1684,28 +1716,28 @@ FULL_SIDEBAR           = NO
 # Minimum value: 0, maximum value: 20, default value: 4.
 # This tag requires that the tag GENERATE_HTML is set to YES.
 
-ENUM_VALUES_PER_LINE   = 6
+ENUM_VALUES_PER_LINE = 6
 
 # If the treeview is enabled (see GENERATE_TREEVIEW) then this tag can be used
 # to set the initial width (in pixels) of the frame in which the tree is shown.
 # Minimum value: 0, maximum value: 1500, default value: 250.
 # This tag requires that the tag GENERATE_HTML is set to YES.
 
-TREEVIEW_WIDTH         = 300
+TREEVIEW_WIDTH = 300
 
 # If the EXT_LINKS_IN_WINDOW option is set to YES, doxygen will open links to
 # external symbols imported via tag files in a separate window.
 # The default value is: NO.
 # This tag requires that the tag GENERATE_HTML is set to YES.
 
-EXT_LINKS_IN_WINDOW    = NO
+EXT_LINKS_IN_WINDOW = NO
 
 # If the OBFUSCATE_EMAILS tag is set to YES, doxygen will obfuscate email
 # addresses.
 # The default value is: YES.
 # This tag requires that the tag GENERATE_HTML is set to YES.
 
-OBFUSCATE_EMAILS       = NO
+OBFUSCATE_EMAILS = NO
 
 # If the HTML_FORMULA_FORMAT option is set to svg, doxygen will use the pdf2svg
 # tool (see https://github.com/dawbarton/pdf2svg) or inkscape (see
@@ -1716,7 +1748,7 @@ OBFUSCATE_EMAILS       = NO
 # The default value is: png.
 # This tag requires that the tag GENERATE_HTML is set to YES.
 
-HTML_FORMULA_FORMAT    = png
+HTML_FORMULA_FORMAT = png
 
 # Use this tag to change the font size of LaTeX formulas included as images in
 # the HTML documentation. When you change the font size after a successful
@@ -1725,13 +1757,13 @@ HTML_FORMULA_FORMAT    = png
 # Minimum value: 8, maximum value: 50, default value: 10.
 # This tag requires that the tag GENERATE_HTML is set to YES.
 
-FORMULA_FONTSIZE       = 10
+FORMULA_FONTSIZE = 10
 
 # The FORMULA_MACROFILE can contain LaTeX \newcommand and \renewcommand commands
 # to create new LaTeX commands to be used in formulas as building blocks. See
 # the section "Including formulas" for details.
 
-FORMULA_MACROFILE      =
+FORMULA_MACROFILE =
 
 # Enable the USE_MATHJAX option to render LaTeX formulas using MathJax (see
 # https://www.mathjax.org) which uses client side JavaScript for the rendering
@@ -1742,7 +1774,7 @@ FORMULA_MACROFILE      =
 # The default value is: NO.
 # This tag requires that the tag GENERATE_HTML is set to YES.
 
-USE_MATHJAX            = NO
+USE_MATHJAX = NO
 
 # With MATHJAX_VERSION it is possible to specify the MathJax version to be used.
 # Note that the different versions of MathJax have different requirements with
@@ -1753,7 +1785,7 @@ USE_MATHJAX            = NO
 # The default value is: MathJax_2.
 # This tag requires that the tag USE_MATHJAX is set to YES.
 
-MATHJAX_VERSION        = MathJax_2
+MATHJAX_VERSION = MathJax_2
 
 # When MathJax is enabled you can set the default output format to be used for
 # the MathJax output. For more details about the output format see MathJax
@@ -1770,7 +1802,7 @@ MATHJAX_VERSION        = MathJax_2
 # The default value is: HTML-CSS.
 # This tag requires that the tag USE_MATHJAX is set to YES.
 
-MATHJAX_FORMAT         = HTML-CSS
+MATHJAX_FORMAT = HTML-CSS
 
 # When MathJax is enabled you need to specify the location relative to the HTML
 # output directory using the MATHJAX_RELPATH option. The destination directory
@@ -1784,7 +1816,7 @@ MATHJAX_FORMAT         = HTML-CSS
 # - in case of MathJax version 3: https://cdn.jsdelivr.net/npm/mathjax@3
 # This tag requires that the tag USE_MATHJAX is set to YES.
 
-MATHJAX_RELPATH        =
+MATHJAX_RELPATH =
 
 # The MATHJAX_EXTENSIONS tag can be used to specify one or more MathJax
 # extension names that should be enabled during MathJax rendering. For example
@@ -1796,7 +1828,7 @@ MATHJAX_RELPATH        =
 # MATHJAX_EXTENSIONS = ams
 # This tag requires that the tag USE_MATHJAX is set to YES.
 
-MATHJAX_EXTENSIONS     =
+MATHJAX_EXTENSIONS =
 
 # The MATHJAX_CODEFILE tag can be used to specify a file with javascript pieces
 # of code that will be used on startup of the MathJax code. See the MathJax site
@@ -1805,7 +1837,7 @@ MATHJAX_EXTENSIONS     =
 # example see the documentation.
 # This tag requires that the tag USE_MATHJAX is set to YES.
 
-MATHJAX_CODEFILE       =
+MATHJAX_CODEFILE =
 
 # When the SEARCHENGINE tag is enabled doxygen will generate a search box for
 # the HTML output. The underlying search engine uses javascript and DHTML and
@@ -1826,7 +1858,7 @@ MATHJAX_CODEFILE       =
 # The default value is: YES.
 # This tag requires that the tag GENERATE_HTML is set to YES.
 
-SEARCHENGINE           = YES
+SEARCHENGINE = YES
 
 # When the SERVER_BASED_SEARCH tag is enabled the search engine will be
 # implemented using a web server instead of a web client using JavaScript. There
@@ -1838,7 +1870,7 @@ SEARCHENGINE           = YES
 # The default value is: NO.
 # This tag requires that the tag SEARCHENGINE is set to YES.
 
-SERVER_BASED_SEARCH    = NO
+SERVER_BASED_SEARCH = NO
 
 # When EXTERNAL_SEARCH tag is enabled doxygen will no longer generate the PHP
 # script for searching. Instead the search results are written to an XML file
@@ -1855,7 +1887,7 @@ SERVER_BASED_SEARCH    = NO
 # The default value is: NO.
 # This tag requires that the tag SEARCHENGINE is set to YES.
 
-EXTERNAL_SEARCH        = NO
+EXTERNAL_SEARCH = NO
 
 # The SEARCHENGINE_URL should point to a search engine hosted by a web server
 # which will return the search results when EXTERNAL_SEARCH is enabled.
@@ -1867,7 +1899,7 @@ EXTERNAL_SEARCH        = NO
 # details.
 # This tag requires that the tag SEARCHENGINE is set to YES.
 
-SEARCHENGINE_URL       =
+SEARCHENGINE_URL =
 
 # When SERVER_BASED_SEARCH and EXTERNAL_SEARCH are both enabled the unindexed
 # search data is written to a file for indexing by an external tool. With the
@@ -1875,7 +1907,7 @@ SEARCHENGINE_URL       =
 # The default file is: searchdata.xml.
 # This tag requires that the tag SEARCHENGINE is set to YES.
 
-SEARCHDATA_FILE        = searchdata.xml
+SEARCHDATA_FILE = searchdata.xml
 
 # When SERVER_BASED_SEARCH and EXTERNAL_SEARCH are both enabled the
 # EXTERNAL_SEARCH_ID tag can be used as an identifier for the project. This is
@@ -1883,7 +1915,7 @@ SEARCHDATA_FILE        = searchdata.xml
 # projects and redirect the results back to the right project.
 # This tag requires that the tag SEARCHENGINE is set to YES.
 
-EXTERNAL_SEARCH_ID     =
+EXTERNAL_SEARCH_ID =
 
 # The EXTRA_SEARCH_MAPPINGS tag can be used to enable searching through doxygen
 # projects other than the one defined by this configuration file, but that are
@@ -1893,7 +1925,7 @@ EXTERNAL_SEARCH_ID     =
 # EXTRA_SEARCH_MAPPINGS = tagname1=loc1 tagname2=loc2 ...
 # This tag requires that the tag SEARCHENGINE is set to YES.
 
-EXTRA_SEARCH_MAPPINGS  =
+EXTRA_SEARCH_MAPPINGS =
 
 #---------------------------------------------------------------------------
 # Configuration options related to the LaTeX output
@@ -1902,7 +1934,7 @@ EXTRA_SEARCH_MAPPINGS  =
 # If the GENERATE_LATEX tag is set to YES, doxygen will generate LaTeX output.
 # The default value is: YES.
 
-GENERATE_LATEX         = NO
+GENERATE_LATEX = NO
 
 # The LATEX_OUTPUT tag is used to specify where the LaTeX docs will be put. If a
 # relative path is entered the value of OUTPUT_DIRECTORY will be put in front of
@@ -1910,7 +1942,7 @@ GENERATE_LATEX         = NO
 # The default directory is: latex.
 # This tag requires that the tag GENERATE_LATEX is set to YES.
 
-LATEX_OUTPUT           = latex
+LATEX_OUTPUT = latex
 
 # The LATEX_CMD_NAME tag can be used to specify the LaTeX command name to be
 # invoked.
@@ -1922,7 +1954,7 @@ LATEX_OUTPUT           = latex
 # the output language.
 # This tag requires that the tag GENERATE_LATEX is set to YES.
 
-LATEX_CMD_NAME         =
+LATEX_CMD_NAME =
 
 # The MAKEINDEX_CMD_NAME tag can be used to specify the command name to generate
 # index for LaTeX.
@@ -1932,7 +1964,7 @@ LATEX_CMD_NAME         =
 # The default file is: makeindex.
 # This tag requires that the tag GENERATE_LATEX is set to YES.
 
-MAKEINDEX_CMD_NAME     = makeindex
+MAKEINDEX_CMD_NAME = makeindex
 
 # The LATEX_MAKEINDEX_CMD tag can be used to specify the command name to
 # generate index for LaTeX. In case there is no backslash (\) as first character
@@ -1942,7 +1974,7 @@ MAKEINDEX_CMD_NAME     = makeindex
 # The default value is: makeindex.
 # This tag requires that the tag GENERATE_LATEX is set to YES.
 
-LATEX_MAKEINDEX_CMD    = makeindex
+LATEX_MAKEINDEX_CMD = makeindex
 
 # If the COMPACT_LATEX tag is set to YES, doxygen generates more compact LaTeX
 # documents. This may be useful for small projects and may help to save some
@@ -1950,7 +1982,7 @@ LATEX_MAKEINDEX_CMD    = makeindex
 # The default value is: NO.
 # This tag requires that the tag GENERATE_LATEX is set to YES.
 
-COMPACT_LATEX          = NO
+COMPACT_LATEX = NO
 
 # The PAPER_TYPE tag can be used to set the paper type that is used by the
 # printer.
@@ -1959,7 +1991,7 @@ COMPACT_LATEX          = NO
 # The default value is: a4.
 # This tag requires that the tag GENERATE_LATEX is set to YES.
 
-PAPER_TYPE             = a4
+PAPER_TYPE = a4
 
 # The EXTRA_PACKAGES tag can be used to specify one or more LaTeX package names
 # that should be included in the LaTeX output. The package can be specified just
@@ -1971,7 +2003,7 @@ PAPER_TYPE             = a4
 # If left blank no extra packages will be included.
 # This tag requires that the tag GENERATE_LATEX is set to YES.
 
-EXTRA_PACKAGES         =
+EXTRA_PACKAGES =
 
 # The LATEX_HEADER tag can be used to specify a user-defined LaTeX header for
 # the generated LaTeX document. The header should contain everything until the
@@ -1988,7 +2020,7 @@ EXTRA_PACKAGES         =
 # description of the possible markers and block names see the documentation.
 # This tag requires that the tag GENERATE_LATEX is set to YES.
 
-LATEX_HEADER           =
+LATEX_HEADER =
 
 # The LATEX_FOOTER tag can be used to specify a user-defined LaTeX footer for
 # the generated LaTeX document. The footer should contain everything after the
@@ -2000,7 +2032,7 @@ LATEX_HEADER           =
 # doing!
 # This tag requires that the tag GENERATE_LATEX is set to YES.
 
-LATEX_FOOTER           =
+LATEX_FOOTER =
 
 # The LATEX_EXTRA_STYLESHEET tag can be used to specify additional user-defined
 # LaTeX style sheets that are included after the standard style sheets created
@@ -2019,7 +2051,7 @@ LATEX_EXTRA_STYLESHEET =
 # markers available.
 # This tag requires that the tag GENERATE_LATEX is set to YES.
 
-LATEX_EXTRA_FILES      =
+LATEX_EXTRA_FILES =
 
 # If the PDF_HYPERLINKS tag is set to YES, the LaTeX that is generated is
 # prepared for conversion to PDF (using ps2pdf or pdflatex). The PDF file will
@@ -2028,7 +2060,7 @@ LATEX_EXTRA_FILES      =
 # The default value is: YES.
 # This tag requires that the tag GENERATE_LATEX is set to YES.
 
-PDF_HYPERLINKS         = YES
+PDF_HYPERLINKS = YES
 
 # If the USE_PDFLATEX tag is set to YES, doxygen will use the engine as
 # specified with LATEX_CMD_NAME to generate the PDF file directly from the LaTeX
@@ -2038,22 +2070,29 @@ PDF_HYPERLINKS         = YES
 # The default value is: YES.
 # This tag requires that the tag GENERATE_LATEX is set to YES.
 
-USE_PDFLATEX           = YES
+USE_PDFLATEX = YES
 
-# If the LATEX_BATCHMODE tag is set to YES, doxygen will add the \batchmode
-# command to the generated LaTeX files. This will instruct LaTeX to keep running
-# if errors occur, instead of asking the user for help.
+# The LATEX_BATCHMODE tag signals the behavior of LaTeX in case of an error.
+# Possible values are: NO same as ERROR_STOP, YES same as BATCH, BATCH In batch
+# mode nothing is printed on the terminal, errors are scrolled as if <return> is
+# hit at every error; missing files that TeX tries to input or request from
+# keyboard input (\read on a not open input stream) cause the job to abort,
+# NON_STOP In nonstop mode the diagnostic message will appear on the terminal,
+# but there is no possibility of user interaction just like in batch mode,
+# SCROLL In scroll mode, TeX will stop only for missing files to input or if
+# keyboard input is necessary and ERROR_STOP In errorstop mode, TeX will stop at
+# each error, asking for user intervention.
 # The default value is: NO.
 # This tag requires that the tag GENERATE_LATEX is set to YES.
 
-LATEX_BATCHMODE        = NO
+LATEX_BATCHMODE = NO
 
 # If the LATEX_HIDE_INDICES tag is set to YES then doxygen will not include the
 # index chapters (such as File Index, Compound Index, etc.) in the output.
 # The default value is: NO.
 # This tag requires that the tag GENERATE_LATEX is set to YES.
 
-LATEX_HIDE_INDICES     = NO
+LATEX_HIDE_INDICES = NO
 
 # The LATEX_BIB_STYLE tag can be used to specify the style to use for the
 # bibliography, e.g. plainnat, or ieeetr. See
@@ -2061,15 +2100,7 @@ LATEX_HIDE_INDICES     = NO
 # The default value is: plain.
 # This tag requires that the tag GENERATE_LATEX is set to YES.
 
-LATEX_BIB_STYLE        = plain
-
-# If the LATEX_TIMESTAMP tag is set to YES then the footer of each generated
-# page will contain the date and time when the page was generated. Setting this
-# to NO can help when comparing the output of multiple runs.
-# The default value is: NO.
-# This tag requires that the tag GENERATE_LATEX is set to YES.
-
-LATEX_TIMESTAMP        = NO
+LATEX_BIB_STYLE = plain
 
 # The LATEX_EMOJI_DIRECTORY tag is used to specify the (relative or absolute)
 # path from which the emoji images will be read. If a relative path is entered,
@@ -2077,7 +2108,7 @@ LATEX_TIMESTAMP        = NO
 # LATEX_OUTPUT directory will be used.
 # This tag requires that the tag GENERATE_LATEX is set to YES.
 
-LATEX_EMOJI_DIRECTORY  =
+LATEX_EMOJI_DIRECTORY =
 
 #---------------------------------------------------------------------------
 # Configuration options related to the RTF output
@@ -2088,7 +2119,7 @@ LATEX_EMOJI_DIRECTORY  =
 # readers/editors.
 # The default value is: NO.
 
-GENERATE_RTF           = NO
+GENERATE_RTF = NO
 
 # The RTF_OUTPUT tag is used to specify where the RTF docs will be put. If a
 # relative path is entered the value of OUTPUT_DIRECTORY will be put in front of
@@ -2096,7 +2127,7 @@ GENERATE_RTF           = NO
 # The default directory is: rtf.
 # This tag requires that the tag GENERATE_RTF is set to YES.
 
-RTF_OUTPUT             = rtf
+RTF_OUTPUT = rtf
 
 # If the COMPACT_RTF tag is set to YES, doxygen generates more compact RTF
 # documents. This may be useful for small projects and may help to save some
@@ -2104,7 +2135,7 @@ RTF_OUTPUT             = rtf
 # The default value is: NO.
 # This tag requires that the tag GENERATE_RTF is set to YES.
 
-COMPACT_RTF            = NO
+COMPACT_RTF = NO
 
 # If the RTF_HYPERLINKS tag is set to YES, the RTF that is generated will
 # contain hyperlink fields. The RTF file will contain links (just like the HTML
@@ -2116,7 +2147,7 @@ COMPACT_RTF            = NO
 # The default value is: NO.
 # This tag requires that the tag GENERATE_RTF is set to YES.
 
-RTF_HYPERLINKS         = NO
+RTF_HYPERLINKS = NO
 
 # Load stylesheet definitions from file. Syntax is similar to doxygen's
 # configuration file, i.e. a series of assignments. You only have to provide
@@ -2126,14 +2157,14 @@ RTF_HYPERLINKS         = NO
 # default style sheet that doxygen normally uses.
 # This tag requires that the tag GENERATE_RTF is set to YES.
 
-RTF_STYLESHEET_FILE    =
+RTF_STYLESHEET_FILE =
 
 # Set optional variables used in the generation of an RTF document. Syntax is
 # similar to doxygen's configuration file. A template extensions file can be
 # generated using doxygen -e rtf extensionFile.
 # This tag requires that the tag GENERATE_RTF is set to YES.
 
-RTF_EXTENSIONS_FILE    =
+RTF_EXTENSIONS_FILE =
 
 #---------------------------------------------------------------------------
 # Configuration options related to the man page output
@@ -2143,7 +2174,7 @@ RTF_EXTENSIONS_FILE    =
 # classes and files.
 # The default value is: NO.
 
-GENERATE_MAN           = NO
+GENERATE_MAN = NO
 
 # The MAN_OUTPUT tag is used to specify where the man pages will be put. If a
 # relative path is entered the value of OUTPUT_DIRECTORY will be put in front of
@@ -2152,7 +2183,7 @@ GENERATE_MAN           = NO
 # The default directory is: man.
 # This tag requires that the tag GENERATE_MAN is set to YES.
 
-MAN_OUTPUT             = man
+MAN_OUTPUT = man
 
 # The MAN_EXTENSION tag determines the extension that is added to the generated
 # man pages. In case the manual section does not start with a number, the number
@@ -2161,14 +2192,14 @@ MAN_OUTPUT             = man
 # The default value is: .3.
 # This tag requires that the tag GENERATE_MAN is set to YES.
 
-MAN_EXTENSION          = .3
+MAN_EXTENSION = .3
 
 # The MAN_SUBDIR tag determines the name of the directory created within
 # MAN_OUTPUT in which the man pages are placed. If defaults to man followed by
 # MAN_EXTENSION with the initial . removed.
 # This tag requires that the tag GENERATE_MAN is set to YES.
 
-MAN_SUBDIR             =
+MAN_SUBDIR =
 
 # If the MAN_LINKS tag is set to YES and doxygen generates man output, then it
 # will generate one additional man file for each entity documented in the real
@@ -2177,7 +2208,7 @@ MAN_SUBDIR             =
 # The default value is: NO.
 # This tag requires that the tag GENERATE_MAN is set to YES.
 
-MAN_LINKS              = NO
+MAN_LINKS = NO
 
 #---------------------------------------------------------------------------
 # Configuration options related to the XML output
@@ -2187,7 +2218,7 @@ MAN_LINKS              = NO
 # captures the structure of the code including all documentation.
 # The default value is: NO.
 
-GENERATE_XML           = NO
+GENERATE_XML = NO
 
 # The XML_OUTPUT tag is used to specify where the XML pages will be put. If a
 # relative path is entered the value of OUTPUT_DIRECTORY will be put in front of
@@ -2195,7 +2226,7 @@ GENERATE_XML           = NO
 # The default directory is: xml.
 # This tag requires that the tag GENERATE_XML is set to YES.
 
-XML_OUTPUT             = xml
+XML_OUTPUT = xml
 
 # If the XML_PROGRAMLISTING tag is set to YES, doxygen will dump the program
 # listings (including syntax highlighting and cross-referencing information) to
@@ -2204,7 +2235,7 @@ XML_OUTPUT             = xml
 # The default value is: YES.
 # This tag requires that the tag GENERATE_XML is set to YES.
 
-XML_PROGRAMLISTING     = YES
+XML_PROGRAMLISTING = YES
 
 # If the XML_NS_MEMB_FILE_SCOPE tag is set to YES, doxygen will include
 # namespace members in file scope as well, matching the HTML output.
@@ -2221,7 +2252,7 @@ XML_NS_MEMB_FILE_SCOPE = NO
 # that can be used to generate PDF.
 # The default value is: NO.
 
-GENERATE_DOCBOOK       = NO
+GENERATE_DOCBOOK = NO
 
 # The DOCBOOK_OUTPUT tag is used to specify where the Docbook pages will be put.
 # If a relative path is entered the value of OUTPUT_DIRECTORY will be put in
@@ -2229,7 +2260,7 @@ GENERATE_DOCBOOK       = NO
 # The default directory is: docbook.
 # This tag requires that the tag GENERATE_DOCBOOK is set to YES.
 
-DOCBOOK_OUTPUT         = docbook
+DOCBOOK_OUTPUT = docbook
 
 #---------------------------------------------------------------------------
 # Configuration options for the AutoGen Definitions output
@@ -2241,12 +2272,34 @@ DOCBOOK_OUTPUT         = docbook
 # is still experimental and incomplete at the moment.
 # The default value is: NO.
 
-GENERATE_AUTOGEN_DEF   = NO
+GENERATE_AUTOGEN_DEF = NO
 
 #---------------------------------------------------------------------------
 # Configuration options related to Sqlite3 output
 #---------------------------------------------------------------------------
 
+# If the GENERATE_SQLITE3 tag is set to YES doxygen will generate a Sqlite3
+# database with symbols found by doxygen stored in tables.
+# The default value is: NO.
+
+GENERATE_SQLITE3 = NO
+
+# The SQLITE3_OUTPUT tag is used to specify where the Sqlite3 database will be
+# put. If a relative path is entered the value of OUTPUT_DIRECTORY will be put
+# in front of it.
+# The default directory is: sqlite3.
+# This tag requires that the tag GENERATE_SQLITE3 is set to YES.
+
+SQLITE3_OUTPUT = sqlite3
+
+# The SQLITE3_OVERWRITE_DB tag is set to YES, the existing doxygen_sqlite3.db
+# database file will be recreated with each doxygen run. If set to NO, doxygen
+# will warn if an a database file is already found and not modify it.
+# The default value is: YES.
+# This tag requires that the tag GENERATE_SQLITE3 is set to YES.
+
+SQLITE3_RECREATE_DB = YES
+
 #---------------------------------------------------------------------------
 # Configuration options related to the Perl module output
 #---------------------------------------------------------------------------
@@ -2257,7 +2310,7 @@ GENERATE_AUTOGEN_DEF   = NO
 # Note that this feature is still experimental and incomplete at the moment.
 # The default value is: NO.
 
-GENERATE_PERLMOD       = NO
+GENERATE_PERLMOD = NO
 
 # If the PERLMOD_LATEX tag is set to YES, doxygen will generate the necessary
 # Makefile rules, Perl scripts and LaTeX code to be able to generate PDF and DVI
@@ -2265,7 +2318,7 @@ GENERATE_PERLMOD       = NO
 # The default value is: NO.
 # This tag requires that the tag GENERATE_PERLMOD is set to YES.
 
-PERLMOD_LATEX          = NO
+PERLMOD_LATEX = NO
 
 # If the PERLMOD_PRETTY tag is set to YES, the Perl module output will be nicely
 # formatted so it can be parsed by a human reader. This is useful if you want to
@@ -2275,7 +2328,7 @@ PERLMOD_LATEX          = NO
 # The default value is: YES.
 # This tag requires that the tag GENERATE_PERLMOD is set to YES.
 
-PERLMOD_PRETTY         = YES
+PERLMOD_PRETTY = YES
 
 # The names of the make variables in the generated doxyrules.make file are
 # prefixed with the string contained in PERLMOD_MAKEVAR_PREFIX. This is useful
@@ -2293,7 +2346,7 @@ PERLMOD_MAKEVAR_PREFIX =
 # C-preprocessor directives found in the sources and include files.
 # The default value is: YES.
 
-ENABLE_PREPROCESSING   = YES
+ENABLE_PREPROCESSING = YES
 
 # If the MACRO_EXPANSION tag is set to YES, doxygen will expand all macro names
 # in the source code. If set to NO, only conditional compilation will be
@@ -2302,7 +2355,7 @@ ENABLE_PREPROCESSING   = YES
 # The default value is: NO.
 # This tag requires that the tag ENABLE_PREPROCESSING is set to YES.
 
-MACRO_EXPANSION        = YES
+MACRO_EXPANSION = YES
 
 # If the EXPAND_ONLY_PREDEF and MACRO_EXPANSION tags are both set to YES then
 # the macro expansion is limited to the macros specified with the PREDEFINED and
@@ -2310,14 +2363,14 @@ MACRO_EXPANSION        = YES
 # The default value is: NO.
 # This tag requires that the tag ENABLE_PREPROCESSING is set to YES.
 
-EXPAND_ONLY_PREDEF     = YES
+EXPAND_ONLY_PREDEF = YES
 
 # If the SEARCH_INCLUDES tag is set to YES, the include files in the
 # INCLUDE_PATH will be searched if a #include is found.
 # The default value is: YES.
 # This tag requires that the tag ENABLE_PREPROCESSING is set to YES.
 
-SEARCH_INCLUDES        = YES
+SEARCH_INCLUDES = YES
 
 # The INCLUDE_PATH tag can be used to specify one or more directories that
 # contain include files that are not input files but should be processed by the
@@ -2325,7 +2378,7 @@ SEARCH_INCLUDES        = YES
 # RECURSIVE has no effect here.
 # This tag requires that the tag SEARCH_INCLUDES is set to YES.
 
-INCLUDE_PATH           =
+INCLUDE_PATH =
 
 # You can use the INCLUDE_FILE_PATTERNS tag to specify one or more wildcard
 # patterns (like *.h and *.hpp) to filter out the header-files in the
@@ -2333,7 +2386,7 @@ INCLUDE_PATH           =
 # used.
 # This tag requires that the tag ENABLE_PREPROCESSING is set to YES.
 
-INCLUDE_FILE_PATTERNS  =
+INCLUDE_FILE_PATTERNS =
 
 # The PREDEFINED tag can be used to specify one or more macro names that are
 # defined before the preprocessor is started (similar to the -D option of e.g.
@@ -2343,7 +2396,7 @@ INCLUDE_FILE_PATTERNS  =
 # recursively expanded use the := operator instead of the = operator.
 # This tag requires that the tag ENABLE_PREPROCESSING is set to YES.
 
-PREDEFINED             =
+PREDEFINED =
 
 # If the MACRO_EXPANSION and EXPAND_ONLY_PREDEF tags are set to YES then this
 # tag can be used to specify a list of macro names that should be expanded. The
@@ -2352,7 +2405,7 @@ PREDEFINED             =
 # definition found in the source code.
 # This tag requires that the tag ENABLE_PREPROCESSING is set to YES.
 
-EXPAND_AS_DEFINED      = YES
+EXPAND_AS_DEFINED = YES
 
 # If the SKIP_FUNCTION_MACROS tag is set to YES then doxygen's preprocessor will
 # remove all references to function-like macros that are alone on a line, have
@@ -2362,7 +2415,7 @@ EXPAND_AS_DEFINED      = YES
 # The default value is: YES.
 # This tag requires that the tag ENABLE_PREPROCESSING is set to YES.
 
-SKIP_FUNCTION_MACROS   = NO
+SKIP_FUNCTION_MACROS = NO
 
 #---------------------------------------------------------------------------
 # Configuration options related to external references
@@ -2381,51 +2434,44 @@ SKIP_FUNCTION_MACROS   = NO
 # the path). If a tag file is not located in the directory in which doxygen is
 # run, you must also specify the path to the tagfile here.
 
-TAGFILES               =
+TAGFILES =
 
 # When a file name is specified after GENERATE_TAGFILE, doxygen will create a
 # tag file that is based on the input files it reads. See section "Linking to
 # external documentation" for more information about the usage of tag files.
 
-GENERATE_TAGFILE       =
+GENERATE_TAGFILE =
 
-# If the ALLEXTERNALS tag is set to YES, all external class will be listed in
-# the class index. If set to NO, only the inherited external classes will be
-# listed.
+# If the ALLEXTERNALS tag is set to YES, all external classes and namespaces
+# will be listed in the class and namespace index. If set to NO, only the
+# inherited external classes will be listed.
 # The default value is: NO.
 
-ALLEXTERNALS           = NO
+ALLEXTERNALS = NO
 
 # If the EXTERNAL_GROUPS tag is set to YES, all external groups will be listed
 # in the modules index. If set to NO, only the current project's groups will be
 # listed.
 # The default value is: YES.
 
-EXTERNAL_GROUPS        = YES
+EXTERNAL_GROUPS = YES
 
 # If the EXTERNAL_PAGES tag is set to YES, all external pages will be listed in
 # the related pages index. If set to NO, only the current project's pages will
 # be listed.
 # The default value is: YES.
 
-EXTERNAL_PAGES         = YES
+EXTERNAL_PAGES = YES
 
 #---------------------------------------------------------------------------
 # Configuration options related to the dot tool
 #---------------------------------------------------------------------------
 
-# You can include diagrams made with dia in doxygen documentation. Doxygen will
-# then run dia to produce the diagram and insert it in the documentation. The
-# DIA_PATH tag allows you to specify the directory where the dia binary resides.
-# If left empty dia is assumed to be found in the default search path.
-
-DIA_PATH               =
-
 # If set to YES the inheritance and collaboration graphs will hide inheritance
 # and usage relations if the target is undocumented or is not a class.
 # The default value is: YES.
 
-HIDE_UNDOC_RELATIONS   = YES
+HIDE_UNDOC_RELATIONS = YES
 
 # If you set the HAVE_DOT tag to YES then doxygen will assume the dot tool is
 # available from the path. This tool is part of Graphviz (see:
@@ -2434,7 +2480,7 @@ HIDE_UNDOC_RELATIONS   = YES
 # set to NO
 # The default value is: NO.
 
-HAVE_DOT               = NO
+HAVE_DOT = NO
 
 # The DOT_NUM_THREADS specifies the number of dot invocations doxygen is allowed
 # to run in parallel. When set to 0 doxygen will base this on the number of
@@ -2444,7 +2490,7 @@ HAVE_DOT               = NO
 # Minimum value: 0, maximum value: 32, default value: 0.
 # This tag requires that the tag HAVE_DOT is set to YES.
 
-DOT_NUM_THREADS        = 0
+DOT_NUM_THREADS = 0
 
 # DOT_COMMON_ATTR is common attributes for nodes, edges and labels of
 # subgraphs. When you want a differently looking font in the dot files that
@@ -2457,7 +2503,7 @@ DOT_NUM_THREADS        = 0
 # The default value is: fontname=Helvetica,fontsize=10.
 # This tag requires that the tag HAVE_DOT is set to YES.
 
-DOT_COMMON_ATTR        = "fontname=Helvetica,fontsize=10"
+DOT_COMMON_ATTR = "fontname=Helvetica,fontsize=10"
 
 # DOT_EDGE_ATTR is concatenated with DOT_COMMON_ATTR. For elegant style you can
 # add 'arrowhead=open, arrowtail=open, arrowsize=0.5'. <a
@@ -2466,7 +2512,7 @@ DOT_COMMON_ATTR        = "fontname=Helvetica,fontsize=10"
 # The default value is: labelfontname=Helvetica,labelfontsize=10.
 # This tag requires that the tag HAVE_DOT is set to YES.
 
-DOT_EDGE_ATTR          = "labelfontname=Helvetica,labelfontsize=10"
+DOT_EDGE_ATTR = "labelfontname=Helvetica,labelfontsize=10"
 
 # DOT_NODE_ATTR is concatenated with DOT_COMMON_ATTR. For view without boxes
 # around nodes set 'shape=plain' or 'shape=plaintext' <a
@@ -2474,41 +2520,48 @@ DOT_EDGE_ATTR          = "labelfontname=Helvetica,labelfontsize=10"
 # The default value is: shape=box,height=0.2,width=0.4.
 # This tag requires that the tag HAVE_DOT is set to YES.
 
-DOT_NODE_ATTR          = "shape=box,height=0.2,width=0.4"
+DOT_NODE_ATTR = "shape=box,height=0.2,width=0.4"
 
 # You can set the path where dot can find font specified with fontname in
 # DOT_COMMON_ATTR and others dot attributes.
 # This tag requires that the tag HAVE_DOT is set to YES.
 
-DOT_FONTPATH           =
+DOT_FONTPATH =
 
-# If the CLASS_GRAPH tag is set to YES (or GRAPH) then doxygen will generate a
-# graph for each documented class showing the direct and indirect inheritance
-# relations. In case HAVE_DOT is set as well dot will be used to draw the graph,
-# otherwise the built-in generator will be used. If the CLASS_GRAPH tag is set
-# to TEXT the direct and indirect inheritance relations will be shown as texts /
-# links.
-# Possible values are: NO, YES, TEXT and GRAPH.
-# The default value is: YES.
+# If the CLASS_GRAPH tag is set to YES or GRAPH or BUILTIN then doxygen will
+# generate a graph for each documented class showing the direct and indirect
+# inheritance relations. In case the CLASS_GRAPH tag is set to YES or GRAPH and
+# HAVE_DOT is enabled as well, then dot will be used to draw the graph. In case
+# the CLASS_GRAPH tag is set to YES and HAVE_DOT is disabled or if the
+# CLASS_GRAPH tag is set to BUILTIN, then the built-in generator will be used.
+# If the CLASS_GRAPH tag is set to TEXT the direct and indirect inheritance
+# relations will be shown as texts / links.
+# Possible values are: NO, YES, TEXT, GRAPH and BUILTIN.
 
-CLASS_GRAPH            = YES
+CLASS_GRAPH = YES
 
 # If the COLLABORATION_GRAPH tag is set to YES then doxygen will generate a
 # graph for each documented class showing the direct and indirect implementation
 # dependencies (inheritance, containment, and class references variables) of the
-# class with other documented classes.
+# class with other documented classes. Explicit enabling a collaboration graph,
+# when COLLABORATION_GRAPH is set to NO, can be accomplished by means of the
+# command \collaborationgraph. Disabling a collaboration graph can be
+# accomplished by means of the command \hidecollaborationgraph.
 # The default value is: YES.
 # This tag requires that the tag HAVE_DOT is set to YES.
 
-COLLABORATION_GRAPH    = YES
+COLLABORATION_GRAPH = YES
 
 # If the GROUP_GRAPHS tag is set to YES then doxygen will generate a graph for
-# groups, showing the direct groups dependencies. See also the chapter Grouping
-# in the manual.
+# groups, showing the direct groups dependencies. Explicit enabling a group
+# dependency graph, when GROUP_GRAPHS is set to NO, can be accomplished by means
+# of the command \groupgraph. Disabling a directory graph can be accomplished by
+# means of the command \hidegroupgraph. See also the chapter Grouping in the
+# manual.
 # The default value is: YES.
 # This tag requires that the tag HAVE_DOT is set to YES.
 
-GROUP_GRAPHS           = YES
+GROUP_GRAPHS = YES
 
 # If the UML_LOOK tag is set to YES, doxygen will generate inheritance and
 # collaboration diagrams in a style similar to the OMG's Unified Modeling
@@ -2516,7 +2569,7 @@ GROUP_GRAPHS           = YES
 # The default value is: NO.
 # This tag requires that the tag HAVE_DOT is set to YES.
 
-UML_LOOK               = NO
+UML_LOOK = NO
 
 # If the UML_LOOK tag is enabled, the fields and methods are shown inside the
 # class node. If there are many fields or methods and many nodes the graph may
@@ -2529,7 +2582,7 @@ UML_LOOK               = NO
 # Minimum value: 0, maximum value: 100, default value: 10.
 # This tag requires that the tag UML_LOOK is set to YES.
 
-UML_LIMIT_NUM_FIELDS   = 10
+UML_LIMIT_NUM_FIELDS = 10
 
 # If the DOT_UML_DETAILS tag is set to NO, doxygen will show attributes and
 # methods without types and arguments in the UML graphs. If the DOT_UML_DETAILS
@@ -2542,7 +2595,7 @@ UML_LIMIT_NUM_FIELDS   = 10
 # The default value is: NO.
 # This tag requires that the tag UML_LOOK is set to YES.
 
-DOT_UML_DETAILS        = NO
+DOT_UML_DETAILS = NO
 
 # The DOT_WRAP_THRESHOLD tag can be used to set the maximum number of characters
 # to display on a single line. If the actual line length exceeds this threshold
@@ -2551,7 +2604,7 @@ DOT_UML_DETAILS        = NO
 # Minimum value: 0, maximum value: 1000, default value: 17.
 # This tag requires that the tag HAVE_DOT is set to YES.
 
-DOT_WRAP_THRESHOLD     = 17
+DOT_WRAP_THRESHOLD = 17
 
 # If the TEMPLATE_RELATIONS tag is set to YES then the inheritance and
 # collaboration graphs will show the relations between templates and their
@@ -2559,16 +2612,18 @@ DOT_WRAP_THRESHOLD     = 17
 # The default value is: NO.
 # This tag requires that the tag HAVE_DOT is set to YES.
 
-TEMPLATE_RELATIONS     = NO
+TEMPLATE_RELATIONS = NO
 
 # If the INCLUDE_GRAPH, ENABLE_PREPROCESSING and SEARCH_INCLUDES tags are set to
 # YES then doxygen will generate a graph for each documented file showing the
 # direct and indirect include dependencies of the file with other documented
-# files.
+# files. Explicit enabling an include graph, when INCLUDE_GRAPH is is set to NO,
+# can be accomplished by means of the command \includegraph. Disabling an
+# include graph can be accomplished by means of the command \hideincludegraph.
 # The default value is: YES.
 # This tag requires that the tag HAVE_DOT is set to YES.
 
-INCLUDE_GRAPH          = YES
+INCLUDE_GRAPH = YES
 
 # If the INCLUDED_BY_GRAPH, ENABLE_PREPROCESSING and SEARCH_INCLUDES tags are
 # set to YES then doxygen will generate a graph for each documented file showing
@@ -2577,7 +2632,7 @@ INCLUDE_GRAPH          = YES
 # The default value is: YES.
 # This tag requires that the tag HAVE_DOT is set to YES.
 
-INCLUDED_BY_GRAPH      = YES
+INCLUDED_BY_GRAPH = YES
 
 # If the CALL_GRAPH tag is set to YES then doxygen will generate a call
 # dependency graph for every global function or class method.
@@ -2589,7 +2644,7 @@ INCLUDED_BY_GRAPH      = YES
 # The default value is: NO.
 # This tag requires that the tag HAVE_DOT is set to YES.
 
-CALL_GRAPH             = NO
+CALL_GRAPH = NO
 
 # If the CALLER_GRAPH tag is set to YES then doxygen will generate a caller
 # dependency graph for every global function or class method.
@@ -2601,30 +2656,33 @@ CALL_GRAPH             = NO
 # The default value is: NO.
 # This tag requires that the tag HAVE_DOT is set to YES.
 
-CALLER_GRAPH           = NO
+CALLER_GRAPH = NO
 
 # If the GRAPHICAL_HIERARCHY tag is set to YES then doxygen will graphical
 # hierarchy of all classes instead of a textual one.
 # The default value is: YES.
 # This tag requires that the tag HAVE_DOT is set to YES.
 
-GRAPHICAL_HIERARCHY    = YES
+GRAPHICAL_HIERARCHY = YES
 
 # If the DIRECTORY_GRAPH tag is set to YES then doxygen will show the
 # dependencies a directory has on other directories in a graphical way. The
 # dependency relations are determined by the #include relations between the
-# files in the directories.
+# files in the directories. Explicit enabling a directory graph, when
+# DIRECTORY_GRAPH is set to NO, can be accomplished by means of the command
+# \directorygraph. Disabling a directory graph can be accomplished by means of
+# the command \hidedirectorygraph.
 # The default value is: YES.
 # This tag requires that the tag HAVE_DOT is set to YES.
 
-DIRECTORY_GRAPH        = YES
+DIRECTORY_GRAPH = YES
 
 # The DIR_GRAPH_MAX_DEPTH tag can be used to limit the maximum number of levels
 # of child directories generated in directory dependency graphs by dot.
 # Minimum value: 1, maximum value: 25, default value: 1.
 # This tag requires that the tag DIRECTORY_GRAPH is set to YES.
 
-DIR_GRAPH_MAX_DEPTH    = 1
+DIR_GRAPH_MAX_DEPTH = 1
 
 # The DOT_IMAGE_FORMAT tag can be used to set the image format of the images
 # generated by dot. For an explanation of the image formats see the section
@@ -2639,7 +2697,7 @@ DIR_GRAPH_MAX_DEPTH    = 1
 # The default value is: png.
 # This tag requires that the tag HAVE_DOT is set to YES.
 
-DOT_IMAGE_FORMAT       = png
+DOT_IMAGE_FORMAT = png
 
 # If DOT_IMAGE_FORMAT is set to svg, then this option can be set to YES to
 # enable generation of interactive SVG images that allow zooming and panning.
@@ -2651,32 +2709,33 @@ DOT_IMAGE_FORMAT       = png
 # The default value is: NO.
 # This tag requires that the tag HAVE_DOT is set to YES.
 
-INTERACTIVE_SVG        = NO
+INTERACTIVE_SVG = NO
 
 # The DOT_PATH tag can be used to specify the path where the dot tool can be
 # found. If left blank, it is assumed the dot tool can be found in the path.
 # This tag requires that the tag HAVE_DOT is set to YES.
 
-DOT_PATH               =
+DOT_PATH =
 
 # The DOTFILE_DIRS tag can be used to specify one or more directories that
 # contain dot files that are included in the documentation (see the \dotfile
 # command).
 # This tag requires that the tag HAVE_DOT is set to YES.
 
-DOTFILE_DIRS           =
+DOTFILE_DIRS =
 
-# The MSCFILE_DIRS tag can be used to specify one or more directories that
-# contain msc files that are included in the documentation (see the \mscfile
-# command).
+# You can include diagrams made with dia in doxygen documentation. Doxygen will
+# then run dia to produce the diagram and insert it in the documentation. The
+# DIA_PATH tag allows you to specify the directory where the dia binary resides.
+# If left empty dia is assumed to be found in the default search path.
 
-MSCFILE_DIRS           =
+DIA_PATH =
 
 # The DIAFILE_DIRS tag can be used to specify one or more directories that
 # contain dia files that are included in the documentation (see the \diafile
 # command).
 
-DIAFILE_DIRS           =
+DIAFILE_DIRS =
 
 # When using plantuml, the PLANTUML_JAR_PATH tag should be used to specify the
 # path where java can find the plantuml.jar file or to the filename of jar file
@@ -2684,17 +2743,17 @@ DIAFILE_DIRS           =
 # a preprocessing step. Doxygen will generate a warning when it encounters a
 # \startuml command in this case and will not generate output for the diagram.
 
-PLANTUML_JAR_PATH      =
+PLANTUML_JAR_PATH =
 
 # When using plantuml, the PLANTUML_CFG_FILE tag can be used to specify a
 # configuration file for plantuml.
 
-PLANTUML_CFG_FILE      =
+PLANTUML_CFG_FILE =
 
 # When using plantuml, the specified paths are searched for files specified by
 # the !include statement in a plantuml block.
 
-PLANTUML_INCLUDE_PATH  =
+PLANTUML_INCLUDE_PATH =
 
 # The DOT_GRAPH_MAX_NODES tag can be used to set the maximum number of nodes
 # that will be shown in the graph. If the number of nodes in a graph becomes
@@ -2706,7 +2765,7 @@ PLANTUML_INCLUDE_PATH  =
 # Minimum value: 0, maximum value: 10000, default value: 50.
 # This tag requires that the tag HAVE_DOT is set to YES.
 
-DOT_GRAPH_MAX_NODES    = 50
+DOT_GRAPH_MAX_NODES = 50
 
 # The MAX_DOT_GRAPH_DEPTH tag can be used to set the maximum depth of the graphs
 # generated by dot. A depth value of 3 means that only nodes reachable from the
@@ -2718,7 +2777,7 @@ DOT_GRAPH_MAX_NODES    = 50
 # Minimum value: 0, maximum value: 1000, default value: 0.
 # This tag requires that the tag HAVE_DOT is set to YES.
 
-MAX_DOT_GRAPH_DEPTH    = 0
+MAX_DOT_GRAPH_DEPTH = 0
 
 # Set the DOT_MULTI_TARGETS tag to YES to allow dot to generate multiple output
 # files in one run (i.e. multiple -o and -T options on the command line). This
@@ -2727,7 +2786,7 @@ MAX_DOT_GRAPH_DEPTH    = 0
 # The default value is: NO.
 # This tag requires that the tag HAVE_DOT is set to YES.
 
-DOT_MULTI_TARGETS      = NO
+DOT_MULTI_TARGETS = NO
 
 # If the GENERATE_LEGEND tag is set to YES doxygen will generate a legend page
 # explaining the meaning of the various boxes and arrows in the dot generated
@@ -2737,7 +2796,7 @@ DOT_MULTI_TARGETS      = NO
 # The default value is: YES.
 # This tag requires that the tag HAVE_DOT is set to YES.
 
-GENERATE_LEGEND        = YES
+GENERATE_LEGEND = YES
 
 # If the DOT_CLEANUP tag is set to YES, doxygen will remove the intermediate
 # files that are used to generate the various graphs.
@@ -2746,4 +2805,20 @@ GENERATE_LEGEND        = YES
 # files.
 # The default value is: YES.
 
-DOT_CLEANUP            = YES
+DOT_CLEANUP = YES
+
+# You can define message sequence charts within doxygen comments using the \msc
+# command. If the MSCGEN_TOOL tag is left empty (the default), then doxygen will
+# use a built-in version of mscgen tool to produce the charts. Alternatively,
+# the MSCGEN_TOOL tag can also specify the name an external tool. For instance,
+# specifying prog as the value, doxygen will call the tool as prog -T
+# <outfile_format> -o <outputfile> <inputfile>. The external tool should support
+# output file formats "png", "eps", "svg", and "ismap".
+
+MSCGEN_TOOL =
+
+# The MSCFILE_DIRS tag can be used to specify one or more directories that
+# contain msc files that are included in the documentation (see the \mscfile
+# command).
+
+MSCFILE_DIRS =
diff --git a/apps/OpenSpace-MinVR/main.cpp b/apps/OpenSpace-MinVR/main.cpp
index 6b43cfa748..8dcabe23c2 100644
--- a/apps/OpenSpace-MinVR/main.cpp
+++ b/apps/OpenSpace-MinVR/main.cpp
@@ -49,7 +49,6 @@
 using namespace MinVR;
 using namespace openspace;
 
-namespace {
 
 class Handler : public VREventHandler, public VRRenderHandler, public VRInputDevice {
 public:
@@ -60,6 +59,8 @@ public:
     void appendNewInputEventsSinceLastCall(VRDataQueue* queue) override;
 };
 
+namespace {
+
 constexpr std::string_view _loggerCat = "main_minvr";
 
 VRMain engine;
diff --git a/include/openspace/documentation/verifier.h b/include/openspace/documentation/verifier.h
index 6bc3d302f9..5eeeba1c1b 100644
--- a/include/openspace/documentation/verifier.h
+++ b/include/openspace/documentation/verifier.h
@@ -497,7 +497,7 @@ public:
  * takes two template parameters. The first is the Verifier that one would use to only
  * check for the type of the object, for example IntVerifier. The second argument is a
  * function object that has its `operator()` function overloaded and returns a boolean
- * value. In these cases, the `std` function objects `std::less`, `std::equal_to, etc are
+ * value. In these cases, the `std` function objects `std::less`, `std::equal_to`, etc are
  * used.
  *
  * This verifier will apply the `Operator` to the stored value and the incoming value
diff --git a/include/openspace/mission/missionmanager.h b/include/openspace/mission/missionmanager.h
index 4942941853..6e7d395b34 100644
--- a/include/openspace/mission/missionmanager.h
+++ b/include/openspace/mission/missionmanager.h
@@ -48,15 +48,11 @@ public:
     MissionManager();
 
     /**
-    * Reads a mission from file and maps the mission name to the Mission object. If
-    * this is the first mission to be loaded, the mission will also be set as the
-    * current active mission.
+    * Loads the provided mission. If this is the first mission to be loaded, the mission
+    * will also be set as the current active mission.
     *
-    * \param filename The file that contains the mission that is to be loaded
+    * \param mission The file that contains the mission that is to be loaded
     * \return The name of the mission that was loaded
-    * \pre \p filename must not be empty
-    * \pre \p filename must not contain tokens
-    * \pre \p filename must exist
     */
     std::string loadMission(Mission mission);
 
@@ -64,7 +60,7 @@ public:
      * Unloads a previously loaded mission identified by the provided \p missionName.
      *
      * \param missionName The name of the mission that should be unloded
-     * \pre \p filename must not be empty
+     *
      * \pre \p missionName must be a valid mission that has previously been loaded
      */
     void unloadMission(const std::string& missionName);
diff --git a/include/openspace/navigation/waypoint.h b/include/openspace/navigation/waypoint.h
index 34c6e4151e..c884adad20 100644
--- a/include/openspace/navigation/waypoint.h
+++ b/include/openspace/navigation/waypoint.h
@@ -81,8 +81,8 @@ struct NodeCameraStateSpec {
  *             above the bounding sphere may also be given.
  * \param startPoint an optional previous waypoint. If not specified, the current camera
  *                   position will be used.
- * \param userLinear if true, the new waypoint will be computed along a straight line
- *                   from the start waypoint to the scene graph node or position.
+ * \param useLinear if true, the new waypoint will be computed along a straight line
+ *                  from the start waypoint to the scene graph node or position.
  * \return the computed WayPoint
  */
 Waypoint computeWaypointFromNodeInfo(const NodeCameraStateSpec& spec,
diff --git a/include/openspace/properties/templateproperty.h b/include/openspace/properties/templateproperty.h
index 73c161f267..9d80a58d5d 100644
--- a/include/openspace/properties/templateproperty.h
+++ b/include/openspace/properties/templateproperty.h
@@ -113,7 +113,6 @@ public:
      * decoding is successful, the new value is set, otherwise it remains unchanged.
      *
      * \param state The Lua state from which the value will be decoded
-     * \return `true` if the decoding succeeded; `false` otherwise
      */
     virtual void setLuaValue(lua_State* state) override;
 
diff --git a/include/openspace/properties/triggerproperty.h b/include/openspace/properties/triggerproperty.h
index 54311a57af..35bd620414 100644
--- a/include/openspace/properties/triggerproperty.h
+++ b/include/openspace/properties/triggerproperty.h
@@ -38,6 +38,7 @@ public:
     /**
      * Initializes the TriggerProperty by delegating the `identifier` and
      * `guiName` to the Property constructor.
+     *
      * \param info The PropertyInfo structure that contains all the required static
      *        information for initializing this Property.
      * \pre \p info.identifier must not be empty
@@ -47,6 +48,7 @@ public:
 
     /**
      * Returns the class name `TriggerProperty`.
+     *
      * \return The class name `TriggerProperty`
      */
     std::string_view className() const override;
@@ -54,14 +56,15 @@ public:
     /**
      * Accepts only the `LUA_TNIL` type and will notify all the listeners
      * that the event has been triggered.
+     *
      * \param state The unused Lua state
-     * \return Returns always `true`
      */
     void setLuaValue(lua_State* state) override;
 
     /**
      * Silently ignores any value that is passed into this function and will trigger the
      * listeners regardless of the value
+     *
      * \param value The ignored value
      */
     void set(std::any value) override;
diff --git a/include/openspace/rendering/renderable.h b/include/openspace/rendering/renderable.h
index 9ca5adfbd7..cb41bf07b4 100644
--- a/include/openspace/rendering/renderable.h
+++ b/include/openspace/rendering/renderable.h
@@ -44,15 +44,14 @@ namespace ghoul::opengl {
 
 namespace openspace {
 
+class Camera;
 struct RenderData;
-struct UpdateData;
 struct RendererTasks;
 struct SurfacePositionHandle;
+struct UpdateData;
 
 namespace documentation { struct Documentation; }
 
-class Camera;
-
 // Unfortunately we can't move this struct into the Renderable until
 // https://bugs.llvm.org/show_bug.cgi?id=36684 is fixed
 struct RenderableSettings {
@@ -102,7 +101,7 @@ public:
     // representation is, the 'surface' is always the sphere around which interaction is
     // handled
     virtual SurfacePositionHandle calculateSurfacePositionHandle(
-                                                const glm::dvec3& targetModelSpace) const;
+        const glm::dvec3& targetModelSpace) const;
 
     virtual bool renderedWithDesiredData() const;
 
@@ -211,6 +210,8 @@ protected:
         }) const;
 
 private:
+    void registerUpdateRenderBinFromOpacity();
+
     double _boundingSphere = 0.0;
     double _interactionSphere = 0.0;
     SceneGraphNode* _parent = nullptr;
@@ -218,8 +219,6 @@ private:
     bool _automaticallyUpdateRenderBin = true;
     bool _hasOverrideRenderBin = false;
 
-    void registerUpdateRenderBinFromOpacity();
-
     // We only want the SceneGraphNode to be able manipulate the parent, so we don't want
     // to provide a set method for this. Otherwise, anyone might mess around with our
     // parentage and that's no bueno
diff --git a/include/openspace/scene/scene.h b/include/openspace/scene/scene.h
index 188d20bad6..f6c6bd6fc6 100644
--- a/include/openspace/scene/scene.h
+++ b/include/openspace/scene/scene.h
@@ -67,8 +67,8 @@ public:
 
     struct InvalidSceneError : ghoul::RuntimeError {
         /**
-         * \param message The reason that caused this exception to be thrown
-         * \param component The optional compoment that caused this exception to be thrown
+         * \param msg The reason that caused this exception to be thrown
+         * \param comp The optional compoment that caused this exception to be thrown
          * \pre message may not be empty
          */
         explicit InvalidSceneError(std::string msg, std::string comp = "");
@@ -195,7 +195,7 @@ public:
      *
      * \param prop The Property that should not longer be updated
      *
-     * \pre \prop must not be nullptr
+     * \pre \p prop must not be nullptr
      * \post No interpolation record exists for \p prop
      */
     void removePropertyInterpolation(properties::Property* prop);
@@ -203,11 +203,11 @@ public:
     /**
      * Informs all Property%s with active interpolations about applying a new update tick
      * using the Property::interpolateValue method, passing a parameter `t` which is `0`
-     * if no time has passed between the #addInterpolation method and `1` if an amount of
-     * time equal to the requested interpolation time has passed. The parameter `t` is
-     * updated with a resolution of 1 microsecond, which means that if this function is
-     * called twice within 1 microsecond, the passed parameter `t` might be the same for
-     * both calls
+     * if no time has passed between the #addPropertyInterpolation method and `1` if an
+     * amount of time equal to the requested interpolation time has passed. The parameter
+     * `t` is updated with a resolution of 1 microsecond, which means that if this
+     * function is called twice within 1 microsecond, the passed parameter `t` might be
+     * the same for both calls.
      */
     void updateInterpolations();
 
@@ -281,9 +281,6 @@ private:
      *
      * \param L the lua state to (eventually) push to
      * \param value string representation of the value with which to set property
-     * \param didPushToLua Bool reference that represents the lua push state at the end
-     *        of this function call. This will be set to true if the value (e.g. table)
-     *        has already been pushed to the lua stack
      * \return The ProfilePropertyLua variant type translated from string representation
      */
     ProfilePropertyLua propertyProcessValue(ghoul::lua::LuaState& L,
diff --git a/include/openspace/util/json_helper.h b/include/openspace/util/json_helper.h
index f3692dbeab..6761e6bfcf 100644
--- a/include/openspace/util/json_helper.h
+++ b/include/openspace/util/json_helper.h
@@ -72,7 +72,6 @@ std::string formatJson(T value);
  *
  * \param json The json to sort
  * \param key The key the json should be sorted by
- * \return The sorted JSON
  */
 void sortJson(nlohmann::json& json, const std::string& key);
 
diff --git a/include/openspace/util/spicemanager.h b/include/openspace/util/spicemanager.h
index eec285c09f..aad2c1f737 100644
--- a/include/openspace/util/spicemanager.h
+++ b/include/openspace/util/spicemanager.h
@@ -1008,7 +1008,6 @@ private:
      * by using mainly the `ckcov_c` and `ckobj_c` functions.
      *
      * \param path The path to the kernel that should be examined
-     * \return true if the operation was successful
      *
      * \pre \p path must be nonempty and be an existing file
      * \post Coverage times are stored only if loading was successful
@@ -1023,7 +1022,6 @@ private:
      * by using mainly the `spkcov_c` and `spkobj_c` functions.
      *
      * \param path The path to the kernel that should be examined
-     * \return true if the operation was successful
      *
      * \pre \p path must be nonempty and be an existing file
      * \post Coverage times are stored only if loading was successful
diff --git a/modules/base/rendering/renderabletrail.h b/modules/base/rendering/renderabletrail.h
index a6a8a39188..d0635b0444 100644
--- a/modules/base/rendering/renderabletrail.h
+++ b/modules/base/rendering/renderabletrail.h
@@ -101,8 +101,10 @@ struct Appearance : properties::PropertyOwner {
     /**
      * The render method will set up the shader information and then render first the
      * information contained in the the `_primaryRenderInformation`, then the optional
-     * `_floatingRenderInformation` using the provided \p data
+     * `_floatingRenderInformation` using the provided \p data.
+     *
      * \param data The data that is necessary to render this Renderable
+     * \param rendererTask A place to store render tasks from this Renderable
      */
     void render(const RenderData& data, RendererTasks& rendererTask) override;
 
diff --git a/modules/fieldlinessequence/util/kameleonfieldlinehelper.cpp b/modules/fieldlinessequence/util/kameleonfieldlinehelper.cpp
index 53e7a2cbb3..e17157b7e9 100644
--- a/modules/fieldlinessequence/util/kameleonfieldlinehelper.cpp
+++ b/modules/fieldlinessequence/util/kameleonfieldlinehelper.cpp
@@ -35,7 +35,7 @@
 
 #ifdef _MSC_VER
 #pragma warning (push)
- // Boost throws #pragma warning: there is no warning number '4675'
+// Boost throws #pragma warning: there is no warning number '4675'
 #pragma warning (disable : 4619)
 #endif // _MSC_VER
 
@@ -74,21 +74,6 @@ namespace openspace::fls {
 #endif // OPENSPACE_MODULE_KAMELEON_ENABLED
 // ------------------------------------------------------------------------------------ //
 
-/** Traces field lines from the provided cdf file using kameleon and stores the data in
- * the provided FieldlinesState.
- * Returns `false` if it fails to create a valid state. Requires the kameleon module to
- * be activated!
- * \param state, FieldlineState which should hold the extracted data
- * \param cdfPath, std::string of the absolute path to a .cdf file
- * \param seedPoints, vector of seed points from which to trace field lines
- * \param tracingVar, which quantity to trace lines from. Typically "b" for magnetic field
- *        lines and "u" for velocity flow lines
- * \param extraVars, extra scalar quantities to be stored in the FieldlinesState; e.g. "T"
- *        for temperature, "rho" for density or "P" for pressure
- * \param extraMagVars, variables which should be used for extracting magnitudes, must be
- *        a multiple of 3; e.g. "ux", "uy" & "uz" to get the magnitude of the velocity
- *        vector at each line vertex
- */
 bool convertCdfToFieldlinesState(FieldlinesState& state, const std::string& cdfPath,
                                  const std::unordered_map<std::string,
                                  std::vector<glm::vec3>>& seedMap,
diff --git a/modules/fieldlinessequence/util/kameleonfieldlinehelper.h b/modules/fieldlinessequence/util/kameleonfieldlinehelper.h
index af06f94365..8381a2a204 100644
--- a/modules/fieldlinessequence/util/kameleonfieldlinehelper.h
+++ b/modules/fieldlinessequence/util/kameleonfieldlinehelper.h
@@ -36,6 +36,23 @@ class FieldlinesState;
 
 namespace fls {
 
+/** Traces field lines from the provided cdf file using kameleon and stores the data in
+ * the provided FieldlinesState.
+ * Returns `false` if it fails to create a valid state. Requires the kameleon module to
+ * be activated!
+ *
+ * \param state FieldlineState which should hold the extracted data
+ * \param cdfPath std::string of the absolute path to a .cdf file
+ * \param seedMap vector of seed points from which to trace field lines
+ * \param manualTimeOffset an offset that is applied to all fieldlines
+ * \param tracingVar which quantity to trace lines from. Typically "b" for magnetic field
+ *        lines and "u" for velocity flow lines
+ * \param extraVars extra scalar quantities to be stored in the FieldlinesState; e.g. "T"
+ *        for temperature, "rho" for density or "P" for pressure
+ * \param extraMagVars variables which should be used for extracting magnitudes, must be
+ *        a multiple of 3; e.g. "ux", "uy" & "uz" to get the magnitude of the velocity
+ *        vector at each line vertex
+ */
 bool convertCdfToFieldlinesState(FieldlinesState& state, const std::string& cdfPath,
     const std::unordered_map<std::string, std::vector<glm::vec3>>& seedMap,
     double manualTimeOffset, const std::string& tracingVar,
diff --git a/modules/gaia/rendering/octreemanager.h b/modules/gaia/rendering/octreemanager.h
index 6deac38b55..e15aae9cf7 100644
--- a/modules/gaia/rendering/octreemanager.h
+++ b/modules/gaia/rendering/octreemanager.h
@@ -64,16 +64,13 @@ public:
 
     /**
      * Initializes a one layer Octree with root and 8 children that covers all stars.
-     *
-     * \param maxDist together with \param maxstarsPerNode (if defined) determines the
-     * depth of the tree as well as how many nodes will be created.
      */
     void initOctree(long long cpuRamBudget = 0, int maxDist = 0, int maxStarsPerNode = 0);
 
     /**
-     * Initializes a stack of size \param maxNodes that keeps track of all free spot in
-     * buffer stream. Can be used to trigger a rebuild of buffer(s).
+     * Initializes a stack. Can be used to trigger a rebuild of buffer(s).
      *
+     * \param maxNodes the maximum number of nodes in the buffer
      * \param useVBO defines if VBO or SSBO is used as buffer(s)
      * \param datasetFitInMemory defines if streaming of nodes during runtime is used
      */
@@ -113,8 +110,8 @@ public:
      * Builds render data structure by traversing the Octree and checking for intersection
      * with view frustum. Every vector in map contains data for one node.
      * The corresponding integer key is the index where chunk should be inserted into
-     * streaming buffer. Calls `checkNodeIntersection()` for every branch.
-     * \pdeltaStars keeps track of how many stars that were added/removed this render
+     * streaming buffer. Calls #checkNodeIntersection for every branch.
+     * \p deltaStars keeps track of how many stars that were added/removed this render
      * call.
      */
     std::map<int, std::vector<float>> traverseData(const glm::dmat4& mvp,
@@ -133,27 +130,33 @@ public:
     void clearAllData(int branchIndex = -1);
 
     /**
-     * Write entire Octree structure to a binary file. \param writeData defines if data
-     * should be included or if only structure should be written to the file.
-     * Calls `writeNodeToFile()` which recursively writes all nodes.
+     * Write entire Octree structure to a binary file.
+     *
+     * \param outFileStream the stream to which the file will be written
+     * \param writeData defines if data should be included or if only structure should be
+     *        written to the file. Calls #writeNodeToFile which recursively writes all
+     *        nodes
      */
     void writeToFile(std::ofstream& outFileStream, bool writeData);
 
     /**
-     * Read a constructed Octree from a file. \returns the total number of (distinct)
-     * stars read.
+     * Read a constructed Octree from a file.
      *
+     * \param inFileStream the stream from which the octree should be loaded
      * \param readData defines if full data or only structure should be read.
-     *        Calls `readNodeFromFile()` which recursively reads all nodes.
+     *        Calls `readNodeFromFile()` which recursively reads all nodes
+     * \param folderPath the path to the folder where the binary files are located
+     * \return the total number of (distinct) stars read
      */
     int readFromFile(std::ifstream& inFileStream, bool readData,
         const std::string& folderPath = std::string());
 
     /**
      * Write specified part of Octree to multiple files, including all data.
-     * \param branchIndex defines which branch to write.
-     * Clears specified branch after writing is done.
-     * Calls `writeNodeToMultipleFiles()` for the specified branch.
+     *
+     * \param outFolderPath The path where files should be written
+     * \param branchIndex Defines which branch to write. Clears specified branch after
+     *        writing is done. Calls `writeNodeToMultipleFiles()` for the specified branch
      */
     void writeToMultipleFiles(const std::string& outFolderPath, size_t branchIndex);
 
@@ -171,7 +174,7 @@ public:
     bool isRebuildOngoing() const;
 
     /**
-     * \returns current CPU RAM budget in bytes.
+     * \return current CPU RAM budget in bytes.
      */
     long long cpuRamBudget() const;
 
@@ -230,6 +233,8 @@ private:
     /**
      * Private help function for `printStarsPerNode()`.
      *
+     * \param node the node for which the stars should be printed
+     * \param prefix the prefix that should be added to the string
      * \return an accumulated string containing all descendant nodes.
      */
     std::string printStarsPerNode(const OctreeNode& node,
@@ -239,8 +244,14 @@ private:
      * Private help function for `traverseData()`. Recursively checks which
      * nodes intersect with the view frustum (interpreted as an AABB) and decides if data
      * should be optimized away or not. Keeps track of which nodes that are visible and
-     * loaded (if streaming). \param deltaStars keeps track of how many stars that were
-     * added/removed this render call.
+     * loaded (if streaming).
+     *
+     * \param node the node that should be checked
+     * \param mvp the model-view-projection matrix used to check intersection
+     * \param screenSize the size of the screen in pixels
+     * \param deltaStars keeps track of how many stars that were added/removed this render
+     *        call
+     * \param mode the render mode that should be used
      */
     std::map<int, std::vector<float>> checkNodeIntersection(OctreeNode& node,
         const glm::dmat4& mvp, const glm::vec2& screenSize, int& deltaStars,
@@ -249,8 +260,11 @@ private:
     /**
      * Checks if specified node existed in cache, and removes it if that's the case.
      * If node is an inner node then all children will be checked recursively as well as
-     * long as \param recursive is not set to false. \param deltaStars keeps track of how
-     * many stars that were removed.
+     * long as \p recursive is not set to false.
+     *
+     * \param node the node that should be removed
+     * \param deltaStars keeps track of how many stars that were removed.
+     * \param recursive defines if decentents should be removed as well
      */
     std::map<int, std::vector<float>> removeNodeFromCache(OctreeNode& node,
         int& deltaStars, bool recursive = true);
@@ -271,40 +285,52 @@ private:
     void createNodeChildren(OctreeNode& node);
 
     /**
-     * Checks if node should be inserted into stream or not. \returns true if it should,
-     * (i.e. it doesn't already exists, there is room for it in the buffer and node data
-     * is loaded if streaming). \returns false otherwise.
+     * Checks if node should be inserted into stream or not.
+     *
+     * \return `true` if it should, (i.e. it doesn't already exists, there is room for it
+     *         in the buffer and node data is loaded if streaming), `false` otherwise
      */
     bool updateBufferIndex(OctreeNode& node);
 
     /**
-     * Node should be inserted into stream. This function \returns the data to be
-     * inserted. If VBOs are used then the chunks will be appended by zeros, otherwise
-     * only the star data corresponding to RenderOption \param option will be inserted.
+     * Node should be inserted into stream.
      *
+     * \param node the node that should be inserted
+     * \param mode the render mode that should be used
      * \param deltaStars keeps track of how many stars that were added.
+     * \returns the data to be inserted
      */
     std::vector<float> constructInsertData(const OctreeNode& node,
         gaia::RenderMode mode, int& deltaStars);
 
     /**
-     * Write a node to outFileStream. \param writeData defines if data should be included
-     * or if only structure should be written.
+     * Write a node to outFileStream.
+     *
+     * \param outFileStream the stream to which the node will be written
+     * \param node the OctreeNode that should be written to file
+     * \param writeData defines if data should be included or if only structure should be
+     *        written
      */
     void writeNodeToFile(std::ofstream& outFileStream, const OctreeNode& node,
         bool writeData);
 
     /**
-     * Read a node from file and its potential children. \param readData defines if full
-     * data or only structure should be read.
-     * \returns accumulated sum of all read stars in node and its descendants.
+     * Read a node from file and its potential children.
+     *
+     * \param inFileStream the stream from which the node will be read
+     * \param node the file will be read into this node
+     * \param readData defines if full data or only structure should be read
+     * \return accumulated sum of all read stars in node and its descendants.
      */
     int readNodeFromFile(std::ifstream& inFileStream, OctreeNode& node, bool readData);
 
     /**
-     * Write node data to a file. \param outFilePrefix specifies the accumulated path
-     * and name of the file. If \param threadWrites is set to true then one new thread
-     * will be created for each child to write its descendents.
+     * Write node data to a file.
+     *
+     * \param outFilePrefix specifies the accumulated path and name of the file
+     * \param node the OctreeNode that should be written to file
+     * \param threadWrites is set to true then one new thread will be created for each
+     *        child to write its descendents
      */
     void writeNodeToMultipleFiles(const std::string& outFilePrefix, OctreeNode& node,
         bool threadWrites);
@@ -312,19 +338,27 @@ private:
     /**
      * Finds the neighboring node on the same level (or a higher level if there is no
      * corresponding level) in the specified direction. Also fetches data from found node
-     * if it's not already loaded. \param additionalLevelsToFetch determines if any
-     * descendants of the found node should be fetched as well (if they exists).
+     * if it's not already loaded.
+     *
+     * \param firstParentId the id of the first parent node that should be checked
+     * \param x the x coordinate of the node that should be found
+     * \param y the y coordinate of the node that should be found
+     * \param z the z coordinate of the node that should be found
+     * \param additionalLevelsToFetch determines if any descendants of the found node
+     *        should be fetched as well (if they exists).
      */
     void findAndFetchNeighborNode(unsigned long long firstParentId, int x, int y, int z,
         int additionalLevelsToFetch);
 
     /**
-     * Fetches data from all children of \param parentNode, as long as it's not already
+     * Fetches data from all children of the \p parentNode, as long as it's not already
      * fetched, it exists and it can fit in RAM.
+     *
+     * \param parentNode the node whose children should be fetched
      * \param additionalLevelsToFetch determines how many levels of descendants to fetch.
-     * If it is set to 0 no additional level will be fetched.
-     * If it is set to a negative value then all descendants will be fetched recursively.
-     * Calls `fetchNodeDataFromFile()` for every child that passes the tests.
+     *        If it is set to 0 no additional level will be fetched. If it is set to a
+     *        negative value then all descendants will be fetched recursively. Calls
+     *        #fetchNodeDataFromFile for every child that passes the tests
      */
     void fetchChildrenNodes(OctreeNode& parentNode, int additionalLevelsToFetch);
 
@@ -336,9 +370,11 @@ private:
     void fetchNodeDataFromFile(OctreeNode& node);
 
     /**
-    * Loops though all nodes in \param nodesToRemove and clears them from RAM.
-    * Also checks if any ancestor should change the `hasLoadedDescendant` flag
-    * by calling `propagateUnloadedNodes()` with all ancestors.
+    * Loops though all nodes in \p nodesToRemove and clears them from RAM. Also checks if
+    * any ancestor should change the `hasLoadedDescendant` flag by calling
+    * #propagateUnloadedNodes() with all ancestors.
+    *
+    * \param nodesToRemove list of the nodes that should be deleted
     */
     void removeNodesFromRam(const std::vector<unsigned long long>& nodesToRemove);
 
@@ -349,9 +385,11 @@ private:
     void removeNode(OctreeNode& node);
 
     /**
-     * Loops through \param ancestorNodes backwards and checks if parent node has any
+     * Loops through \p ancestorNodes backwards and checks if parent node has any
      * loaded descendants left. If not, then flag `hasLoadedDescendant` will be
      * set to false for that parent node and next parent in line will be checked.
+     *
+     * \param ancestorNodes the list of ancestors that should be checked
      */
     void propagateUnloadedNodes(std::vector<std::shared_ptr<OctreeNode>> ancestorNodes);
 
diff --git a/modules/gaia/tasks/constructoctreetask.h b/modules/gaia/tasks/constructoctreetask.h
index fc4e08ea82..1aa1d49adf 100644
--- a/modules/gaia/tasks/constructoctreetask.h
+++ b/modules/gaia/tasks/constructoctreetask.h
@@ -74,10 +74,11 @@ private:
     bool checkAllFilters(const std::vector<float>& filterValues);
 
     /**
-     * \returns true if star should be filtered away and false if all filters passed.
-     * \param range contains ]min, max[ and \param filterValue corresponding value in
+     * \p range contains ]min, max[ and \p filterValue corresponding value in
      * star. Star is filtered either if min = max = filterValue or if filterValue < min
      * (when min != 0.0) or filterValue > max (when max != 0.0).
+     *
+     * \return true if star should be filtered away and false if all filters passed.
      */
     bool filterStar(const glm::vec2& range, float filterValue, float normValue = 0.f);
 
diff --git a/modules/gaia/tasks/readfilejob.h b/modules/gaia/tasks/readfilejob.h
index 7661ef6154..f1fa487b43 100644
--- a/modules/gaia/tasks/readfilejob.h
+++ b/modules/gaia/tasks/readfilejob.h
@@ -35,14 +35,19 @@ struct ReadFileJob : public Job<std::vector<std::vector<float>>> {
     /**
      * Constructs a Job that will read a single FITS file in a concurrent thread and
      * divide the star data into 8 octants depending on position.
+     *
+     * \param filePath the file from which to load the data
      * \param allColumns define which columns that will be read, it should correspond
-     * to the pre-defined order in the job. If additional columns are defined they will
-     * be read but slow down the process.
-     * Proper conversions of positions and velocities will take place and all values
-     * will be checked for NaNs.
-     * If \param firstRow is < 1 then reading will begin at first row in table.
-     * If \param lastRow < firstRow then entire table will be read.
-     * \param nValuesPerStar defines how many values that will be stored per star.
+     *        to the pre-defined order in the job. If additional columns are defined they
+     *        will be read but slow down the process. Proper conversions of positions and
+     *        velocities will take place and all values will be checked for NaNs. If
+     *        \p firstRow is < 1 then reading will begin at first row in table. If
+     *        \p lastRow < firstRow then entire table will be read
+     * \param firstRow the index of the first row to be read
+     * \param lastRow the index of the last row to be read
+     * \param nDefaultCols defines how many columns that will be read per star
+     * \param nValuesPerStar defines how many values that will be stored per star
+     * \param fitsReader the reader that should be used in this job
      */
     ReadFileJob(std::string filePath, std::vector<std::string> allColumns, int firstRow,
         int lastRow, size_t nDefaultCols, int nValuesPerStar,
diff --git a/modules/gaia/tasks/readfitstask.h b/modules/gaia/tasks/readfitstask.h
index a3d4838f38..8236a572ba 100644
--- a/modules/gaia/tasks/readfitstask.h
+++ b/modules/gaia/tasks/readfitstask.h
@@ -61,10 +61,14 @@ private:
     void readAllFitsFilesFromFolder(const Task::ProgressCallback& progressCallback);
 
     /**
-     * Writes \param data to octant [\param index] file.
+     * Writes data to an octant file.
+     *
+     * \param data the data that should be be written to file
+     * \param index the index of the octant that should be written
      * \param isFirstWrite defines if this is the first write to specified octant, if so
-     * the file is created, otherwise the accumulated data is appended to the end of the
-     * file.
+     *        the file is created, otherwise the accumulated data is appended to the end
+     *        of the file
+     * \param nValuesPerStar the number of values that should be stored per star
      */
     int writeOctantToFile(const std::vector<float>& data, int index,
         std::vector<bool>& isFirstWrite, int nValuesPerStar);
diff --git a/modules/globebrowsing/src/asynctiledataprovider.h b/modules/globebrowsing/src/asynctiledataprovider.h
index d7d68681af..10f5dcc204 100644
--- a/modules/globebrowsing/src/asynctiledataprovider.h
+++ b/modules/globebrowsing/src/asynctiledataprovider.h
@@ -44,8 +44,9 @@ struct RawTile;
 class AsyncTileDataProvider {
 public:
     /**
+     * \param name is the name for this provider
      * \param rawTileDataReader is the reader that will be used for the asynchronous
-     * tile loading.
+     *        tile loading
      */
     AsyncTileDataProvider(std::string name,
         std::unique_ptr<RawTileDataReader> rawTileDataReader);
diff --git a/modules/globebrowsing/src/memoryawaretilecache.h b/modules/globebrowsing/src/memoryawaretilecache.h
index 10cf9f9115..0a9f6f5431 100644
--- a/modules/globebrowsing/src/memoryawaretilecache.h
+++ b/modules/globebrowsing/src/memoryawaretilecache.h
@@ -57,7 +57,7 @@ struct ProviderTileHasher {
      * Creates a hash which can be used as key in hash maps.
      * First set the bits to be unique for all tiles.
      * +-------+------------+-------+------------+
-     * | USAGE | BIT RANGE  | #BITS | MAX VALUE  |
+     * | USAGE | BIT RANGE  |  BITS | MAX VALUE  |
      * +-------+------------+-------+------------+
      * | level |   0 -  5   |   5   |         31 |
      * |     x |   5 - 35   |  30   | 1073741824 |
diff --git a/modules/globebrowsing/src/rawtiledatareader.h b/modules/globebrowsing/src/rawtiledatareader.h
index f2860846d5..42739cf63c 100644
--- a/modules/globebrowsing/src/rawtiledatareader.h
+++ b/modules/globebrowsing/src/rawtiledatareader.h
@@ -49,9 +49,12 @@ public:
      * Opens a GDALDataset in readonly mode and calculates meta data required for
      * reading tile using a TileIndex.
      *
-     * \param filePath, a path to a specific file GDAL can read
-     * \param config, Configuration used for initialization
-     * \param baseDirectory, the base directory to use in future loading operations
+     * \param filePath the path to a specific file GDAL can read
+     * \param initData information about the textures that will be creatd by this reader
+     * \param cacheProperties contains settings about whether the reader should
+     *        utilize cache
+     * \param preprocess whether the loaded data should be calculate meta data about the
+     *        dataset
      */
     RawTileDataReader(std::string filePath, TileTextureInitData initData,
         TileCacheProperties cacheProperties,
diff --git a/modules/globebrowsing/src/skirtedgrid.h b/modules/globebrowsing/src/skirtedgrid.h
index 49ce527d53..ed5bd54885 100644
--- a/modules/globebrowsing/src/skirtedgrid.h
+++ b/modules/globebrowsing/src/skirtedgrid.h
@@ -41,12 +41,6 @@ public:
     /**
      * \param xSegments is the number of grid cells in the x direction.
      * \param ySegments is the number of grid cells in the y direction.
-     * \param usePositions determines whether or not to upload any vertex position data
-     * to the GPU.
-     * \param useTextureCoordinates determines whether or not to upload any vertex texture
-     * coordinate data to the GPU.
-     * \param useNormals determines whether or not to upload any vertex normal data
-     * to the GPU.
      */
     SkirtedGrid(unsigned int xSegments, unsigned int ySegments);
     ~SkirtedGrid() = default;
diff --git a/modules/globebrowsing/src/timequantizer.h b/modules/globebrowsing/src/timequantizer.h
index 0f788dde9d..cae3ea89e1 100644
--- a/modules/globebrowsing/src/timequantizer.h
+++ b/modules/globebrowsing/src/timequantizer.h
@@ -33,7 +33,8 @@ namespace openspace { class Time; }
 
 namespace openspace::globebrowsing {
 
-/* RangedTime class is used to define an acceptable time range. Functionality includes
+/**
+ * RangedTime class is used to define an acceptable time range. Functionality includes
  * checking if a given date/time is within that range, or clamping a date to enforce
  * this range.
  */
@@ -41,8 +42,8 @@ class RangedTime {
 public:
     RangedTime() {}
 
-    /*
-     * Constructor that accepts an ISO8601 date/time string (YYYY-MM-DDTHH:mm:ss) for an
+    /**
+     * Constructor that accepts an ISO8601 date/time string (`YYYY-MM-DDTHH:mm:ss`) for an
      * allowable time range defined by start and end values.
      *
      * \param start The date/time start of the time range.
@@ -50,52 +51,50 @@ public:
      */
     RangedTime(std::string start, std::string end);
 
-    /*
+    /**
      * Checks if a date/time value falls within the start/end range defined in this
      * instance of the class.
      *
      * \param checkTime The time to test if it falls within the range
-     *
-     * \returns true if the input date/time falls between the start and end date/times
+     * \return true if the input date/time falls between the start and end date/times
     */
     bool includes(const Time& checkTime) const;
 
-    /*
+    /**
      * Enforces the start/end range on a given date/time string by clamping the value
      *
      * \param checkTime An ISO8601 date/time string to clamp if falls outside of range
-     *
-     * \returns clamped value of input parameter, will be equal to the start value if
-     *          less than start, equal to end if greater than end, or equal to input
-     *          parameter if falls in-between
+     * \return clamped value of input parameter, will be equal to the start value if
+     *         less than start, equal to end if greater than end, or equal to input
+     *         parameter if falls in-between
     */
     const char* clamp(const char* checkTime);
 
-    /*
+    /**
      * Get the start date/time of the time range
      *
-     * \returns The ISO8601 date/time string that defines the start of the range
+     * \return The ISO8601 date/time string that defines the start of the range
      */
     std::string_view start() const;
 
-    /*
+    /**
      * Get the end date/time of the time range
      *
-     * \returns The ISO8601 date/time string that defines the end of the range
+     * \return The ISO8601 date/time string that defines the end of the range
      */
     std::string_view end() const;
 
-    /*
+    /**
      * Set the start date/time of the time range
      *
-     * \param The ISO8601 date/time string that defines the start of the range
+     * \param start The ISO8601 date/time string that defines the start of the range
      */
     void setStart(const std::string start);
 
-    /*
+    /**
      * Set the end date/time of the time range
      *
-     * \param The ISO8601 date/time string that defines the end of the range
+     * \param start The ISO8601 date/time string that defines the end of the range
      */
     void setEnd(const std::string start);
 
@@ -106,7 +105,8 @@ private:
     double _endJ2000;
 };
 
-/* DateTime class is used to manage a date/time value and provide methods for increment/
+/**
+ * DateTime class is used to manage a date/time value and provide methods for increment/
  * decrementing the value, which gets complicated because of the varying days of the
  * different months, leap years, etc.
  * This class exists to handle date/time values within a "people-friendly" calendar
@@ -117,108 +117,120 @@ private:
 class DateTime {
 public:
     DateTime() = default;
-    /*
-     * Constructor that initializes with date/time string
+    /**
+     * Constructor that initializes with date/time string.
      *
-     * \params initDateTime the ISO8601 date/time string (YYYY-MM-DDTHH:mm:ss)
+     * \param initDateTime the ISO8601 date/time string (`YYYY-MM-DDTHH:mm:ss`)
      */
     DateTime(std::string_view initDateTime);
 
-    /*
-     * Set the date/time value
+    /**
+     * Set the date/time value.
      *
-     * \params input the ISO8601 date/time string (YYYY-MM-DDTHH:mm:ss) to set
+     * \param input the ISO8601 date/time string (`YYYY-MM-DDTHH:mm:ss`) to set
      */
     void setTime(std::string_view input);
 
-    /*
-     * Get the date/time value in ISO8601 format
+    /**
+     * Get the date/time value in ISO8601 format.
      *
-     * \returns the date/time value string
+     * \return the date/time value string
      */
     std::string ISO8601() const;
 
-    /*
+    /**
      * Get the J2000 seconds equivalent of the object's date/time, using
-     * the loaded SPICE kernel
+     * the loaded SPICE kernel.
      *
-     * \returns J2000 seconds of date/time
+     * \return J2000 seconds of date/time
      */
     double J2000() const;
 
-    /*
-     * Get the year of the object's date/time (YYYY format)
-     * \returns integer value of the year
+    /**
+     * Get the year of the object's date/time (YYYY format).
+     *
+     * \return integer value of the year
      */
     int year() const;
 
-    /*
-     * Get the month of the object's date/time (1 - 12)
-     * \returns integer value of the month
+    /**
+     * Get the month of the object's date/time (1 - 12).
+     *
+     * \return integer value of the month
      */
     int month() const;
 
-    /*
-     * Get the day-of-month of the object's date/time (1 - 31)
-     * \returns integer value of the day
+    /**
+     * Get the day-of-month of the object's date/time (1 - 31).
+     *
+     * \return integer value of the day
      */
     int day() const;
 
-    /*
+    /**
      * Get the hour of the object's date/time
-     * \returns integer value of the hour (0 - 23)
+     *
+     * \return integer value of the hour (0 - 23)
      */
     int hour() const;
 
-    /*
+    /**
      * Get the minute of the object's date/time
-     * \returns integer value of the minutes
+     *
+     * \return integer value of the minutes
      */
     int minute() const;
 
-    /*
+    /**
      * Get the seconds of the object's date/time
-     * \returns integer value of the seconds
+     *
+     * \return integer value of the seconds
      */
     int second() const;
 
-    /*
+    /**
      * Set the year of the object's date/time
+     *
      * \param y integer value of the year
      */
     void setYear(int y);
 
-    /*
+    /**
      * Set the month of the object's date/time (1 - 12)
+     *
      * \param m integer value of the year
      */
     void setMonth(int m);
 
-    /*
+    /**
      * Set the day-of-month of the object's date/time (1 - 31)
+     *
      * \param d integer value of the day
      */
     void setDay(int d);
 
-    /*
+    /**
      * Set the hour of the object's date/time (0 - 23)
+     *
      * \param h integer value of the hour
      */
     void setHour(int h);
 
-    /*
+    /**
      * Set the minute of the object's date/time
+     *
      * \param m integer value of the minute
      */
     void setMinute(int m);
 
-    /*
+    /**
      * Set the seconds of the object's date/time
+     *
      * \param s integer value of the seconds
      */
     void setSecond(int s);
 
-    /*
+    /**
      * Increment operation for the date/time
      *
      * \param value integer value for number of units in an operation
@@ -227,14 +239,13 @@ public:
      * \param error The difference in J2000 seconds from current date/time to target
      *              (a positive value means target is in the future)
      * \param resolution The J2000 seconds of the interval defined by the value & unit
-     *
-     * \returns The number of increments that were performed in order to get as close as
-     *          possible to the target, where each increment is defined by the value &
-     *          unit (and approximated but not fixed by the resolution param)
+     * \return The number of increments that were performed in order to get as close as
+     *         possible to the target, where each increment is defined by the value &
+     *         unit (and approximated but not fixed by the resolution param)
      */
     int increment(int value, char unit, double error, double resolution);
 
-    /*
+    /**
      * Decrement operation for the date/time
      *
      * \param value integer value for number of units in an operation
@@ -243,14 +254,13 @@ public:
      * \param error The difference in J2000 seconds from current date/time to target
      *              (a positive value means target is in the future)
      * \param resolution The J2000 seconds of the interval defined by the value & unit
-     *
-     * \returns The number of decrements that were performed in order to get as close as
-     *          possible to the target, where each decrement is defined by the value &
-     *          unit (and approximated but not fixed by the resolution param)
+     * \return The number of decrements that were performed in order to get as close as
+     *         possible to the target, where each decrement is defined by the value &
+     *         unit (and approximated but not fixed by the resolution param)
      */
     int decrement(int value, char unit, double error, double resolution);
 
-    /*
+    /**
      * Single increment operation for the date/time
      *
      * \param value integer value for number of units in an operation
@@ -259,7 +269,7 @@ public:
      */
     void incrementOnce(int value, char unit);
 
-    /*
+    /**
      * Single decrement operation for the date/time
      *
      * \param value integer value for number of units in an operation
@@ -278,74 +288,74 @@ private:
 };
 
 /**
-* Used to quantize time to discrete values.
-*/
+ * Used to quantize time to discrete values.
+ */
 class TimeQuantizer {
 public:
     TimeQuantizer() = default;
-    /*
+
+    /**
      * Constructor that initializes with formatted strings for start & ends date/times,
      * and a time resolution within that range
      *
-     * \params start the ISO8601 date/time string (YYYY-MM-DDTHH:mm:ss) for start
-     * \params end the ISO8601 date/time string (YYYY-MM-DDTHH:mm:ss) for end
-     * \params resolution the formatted resolution, which consists of an integer & unit
-     *         character. The acceptable unit characters are:
-     *         (y)ear   Example: '1y' = 1 year. No range limitations
-     *         (M)onth  Example: '4M' = 4 months.    Allowable values: 1, 2, 3, 4, 6
-     *         (d)ay    Example: '10d' = 10 days.    Allowable values: 1 - 28
-     *         (h)our   Example: '12h' = 12 hours.   Allowable values: 1, 2, 3, 4, 6, 12
-     *         (m)inute Example: '15m' = 15 minutes. Allowable values: 0, 15, 30
+     * \param start the ISO8601 date/time string (YYYY-MM-DDTHH:mm:ss) for start
+     * \param end the ISO8601 date/time string (YYYY-MM-DDTHH:mm:ss) for end
+     * \param resolution the formatted resolution, which consists of an integer & unit
+     *        character. The acceptable unit characters are:
+     *        (y)ear   Example: '1y' = 1 year. No range limitations
+     *        (M)onth  Example: '4M' = 4 months.    Allowable values: 1, 2, 3, 4, 6
+     *        (d)ay    Example: '10d' = 10 days.    Allowable values: 1 - 28
+     *        (h)our   Example: '12h' = 12 hours.   Allowable values: 1, 2, 3, 4, 6, 12
+     *        (m)inute Example: '15m' = 15 minutes. Allowable values: 0, 15, 30
      */
     TimeQuantizer(std::string start, std::string end, const std::string& resolution);
 
-    /*
+    /**
      * Set the time range start & end date/time range.
      *
      * \param start The ISO8601 date/time string for start of the time range
-     * \param end   The ISO8601 date/time string for end of the time range.
+     * \param end The ISO8601 date/time string for end of the time range.
      */
     void setStartEndRange(const std::string& start, const std::string& end);
 
-    /*
+    /**
      * Set the time resolution
      *
      * \param resolutionString String that defines the resolution within the time range.
-     *                         see comment header for constructor for the allowable
-     *                         values and ranges.
+     *        see comment header for constructor for the allowable values and ranges.
      */
     void setResolution(const std::string& resolutionString);
 
     /**
-    * Takes a time resulition string and parses it into a double
-    * value representing the time resolution as seconds.
-    *
-    * Example: parseTimeResolutionStr("1d");
-    *
-    * \param resolutionStr with the format {number}{unit} where supported units are:
-    *        (s)econds, (m)inutes, (h)ours, (d)ays, (y)ears
-    * \return the time resolution in seconds
-    */
+     * Takes a time resulition string and parses it into a double
+     * value representing the time resolution as seconds.
+     *
+     * Example: parseTimeResolutionStr("1d");
+     *
+     * \param resolutionStr with the format {number}{unit} where supported units are:
+     *        (s)econds, (m)inutes, (h)ours, (d)ays, (y)ears
+     * \return the time resolution in seconds
+     */
     double parseTimeResolutionStr(const std::string& resolutionStr);
 
     /**
-    * Quantizes a OpenSpace Time into descrete values. If the provided Time \p t is
-    * outside the time range, it will be clamped to the the time range.
-    *
-    * \param t Time instance, which will be quantized
-    * \param clamp Whether or not time should be clamped if not t is in the time range
-    * \return wether or not time was quantized
-    */
+     * Quantizes a OpenSpace Time into descrete values. If the provided Time \p t is
+     * outside the time range, it will be clamped to the the time range.
+     *
+     * \param t Time instance, which will be quantized
+     * \param clamp Whether or not time should be clamped if not t is in the time range
+     * \return wether or not time was quantized
+     */
     bool quantize(Time& t, bool clamp);
 
     /**
-    * Returns a list of quantized Time strings that represent all the valid quantized
-    * time%s between \p start and \p end.
-    *
-    * \param start The start time for the time range quantization
-    * \param end The end time for the time range quantization
-    * \return A list of quantized times between \p start and \end
-    */
+     * Returns a list of quantized Time strings that represent all the valid quantized
+     * time%s between \p start and \p end.
+     *
+     * \param start The start time for the time range quantization
+     * \param end The end time for the time range quantization
+     * \return A list of quantized times between \p start and \p end
+     */
     std::vector<std::string> quantized(Time& start, Time& end);
 
 private:
diff --git a/modules/space/translation/gptranslation.h b/modules/space/translation/gptranslation.h
index b93ddee990..e07d2925a0 100644
--- a/modules/space/translation/gptranslation.h
+++ b/modules/space/translation/gptranslation.h
@@ -40,7 +40,8 @@ public:
      * the file that contains the general pertubation information as well as the file
      * format that is to be used.
      *
-     * \param The ghoul::Dictionary that contains the information for this TLETranslation
+     * \param dictionary The ghoul::Dictionary that contains the information for this
+     *        TLETranslation
      */
     explicit GPTranslation(const ghoul::Dictionary& dictionary);
 
diff --git a/modules/space/translation/keplertranslation.h b/modules/space/translation/keplertranslation.h
index e68e0a67de..99f4c375cb 100644
--- a/modules/space/translation/keplertranslation.h
+++ b/modules/space/translation/keplertranslation.h
@@ -66,7 +66,7 @@ public:
     /**
     * Method returning the translation vector at a given time.
     *
-    * \param time The time to use when doing the position lookup
+    * \param data provides information from the engine about, for example, the time
     */
     glm::dvec3 position(const UpdateData& data) const override;
 
diff --git a/modules/webbrowser/include/browserinstance.h b/modules/webbrowser/include/browserinstance.h
index aa2d1c46c7..73fc907c0d 100644
--- a/modules/webbrowser/include/browserinstance.h
+++ b/modules/webbrowser/include/browserinstance.h
@@ -75,7 +75,7 @@ public:
     /**
      * Call when the window has been reshaped.
      *
-     * \param wrapper the windowWrapper capable of
+     * \param windowSize the size of the window in pixels
      */
     void reshape(const glm::ivec2& windowSize);
 
diff --git a/modules/webbrowser/include/eventhandler.h b/modules/webbrowser/include/eventhandler.h
index 683a60fbc9..b2754eb7ef 100644
--- a/modules/webbrowser/include/eventhandler.h
+++ b/modules/webbrowser/include/eventhandler.h
@@ -73,6 +73,8 @@ private:
      * sent to CEF.
      *
      * \param key the pressed key
+     * \param mods the key modifier that was pressed
+     * \param action the action that was performed that triggered this event
      * \return true if event found, false otherwise
      */
     bool specialKeyEvent(Key key, KeyModifier mods, KeyAction action);
diff --git a/src/documentation/verifier.cpp b/src/documentation/verifier.cpp
index 30536b6cdd..ebbfec3dff 100644
--- a/src/documentation/verifier.cpp
+++ b/src/documentation/verifier.cpp
@@ -35,89 +35,87 @@ namespace openspace::documentation {
 
 // The explicit template instantiations for many of the commonly used template values
 // This cuts down on the compilation time by only compiling these once
-template struct Vector2Verifier<int>;
-template struct Vector2Verifier<double>;
-template struct Vector3Verifier<int>;
-template struct Vector3Verifier<double>;
-template struct Vector4Verifier<int>;
-template struct Vector4Verifier<double>;
+template class Vector2Verifier<int>;
+template class Vector2Verifier<double>;
+template class Vector3Verifier<int>;
+template class Vector3Verifier<double>;
+template class Vector4Verifier<int>;
+template class Vector4Verifier<double>;
 
-template struct Vector2ListVerifier<int>;
-template struct Vector2ListVerifier<double>;
-template struct Vector3ListVerifier<int>;
-template struct Vector3ListVerifier<double>;
-template struct Vector4ListVerifier<int>;
-template struct Vector4ListVerifier<double>;
+template class Vector2ListVerifier<int>;
+template class Vector2ListVerifier<double>;
+template class Vector3ListVerifier<int>;
+template class Vector3ListVerifier<double>;
+template class Vector4ListVerifier<int>;
+template class Vector4ListVerifier<double>;
 
+template class Matrix2x2Verifier<double>;
+template class Matrix2x3Verifier<double>;
+template class Matrix2x4Verifier<double>;
+template class Matrix3x2Verifier<double>;
+template class Matrix3x3Verifier<double>;
+template class Matrix3x4Verifier<double>;
+template class Matrix4x2Verifier<double>;
+template class Matrix4x3Verifier<double>;
+template class Matrix4x4Verifier<double>;
 
-template struct Matrix2x2Verifier<double>;
-template struct Matrix2x3Verifier<double>;
-template struct Matrix2x4Verifier<double>;
-template struct Matrix3x2Verifier<double>;
-template struct Matrix3x3Verifier<double>;
-template struct Matrix3x4Verifier<double>;
-template struct Matrix4x2Verifier<double>;
-template struct Matrix4x3Verifier<double>;
-template struct Matrix4x4Verifier<double>;
+template class LessVerifier<IntVerifier>;
+template class LessVerifier<DoubleVerifier>;
+template class LessEqualVerifier<IntVerifier>;
+template class LessEqualVerifier<DoubleVerifier>;
+template class GreaterVerifier<IntVerifier>;
+template class GreaterVerifier<DoubleVerifier>;
+template class GreaterEqualVerifier<IntVerifier>;
+template class GreaterEqualVerifier<DoubleVerifier>;
+template class EqualVerifier<BoolVerifier>;
+template class EqualVerifier<IntVerifier>;
+template class EqualVerifier<DoubleVerifier>;
+template class EqualVerifier<StringVerifier>;
+template class UnequalVerifier<BoolVerifier>;
+template class UnequalVerifier<IntVerifier>;
+template class UnequalVerifier<DoubleVerifier>;
+template class UnequalVerifier<StringVerifier>;
 
-template struct LessVerifier<IntVerifier>;
-template struct LessVerifier<DoubleVerifier>;
-template struct LessEqualVerifier<IntVerifier>;
-template struct LessEqualVerifier<DoubleVerifier>;
-template struct GreaterVerifier<IntVerifier>;
-template struct GreaterVerifier<DoubleVerifier>;
-template struct GreaterEqualVerifier<IntVerifier>;
-template struct GreaterEqualVerifier<DoubleVerifier>;
-template struct EqualVerifier<BoolVerifier>;
-template struct EqualVerifier<IntVerifier>;
-template struct EqualVerifier<DoubleVerifier>;
-template struct EqualVerifier<StringVerifier>;
-template struct UnequalVerifier<BoolVerifier>;
-template struct UnequalVerifier<IntVerifier>;
-template struct UnequalVerifier<DoubleVerifier>;
-template struct UnequalVerifier<StringVerifier>;
+template class InListVerifier<BoolVerifier>;
+template class InListVerifier<IntVerifier>;
+template class InListVerifier<DoubleVerifier>;
+template class InListVerifier<StringVerifier>;
+template class NotInListVerifier<BoolVerifier>;
+template class NotInListVerifier<IntVerifier>;
+template class NotInListVerifier<DoubleVerifier>;
+template class NotInListVerifier<StringVerifier>;
 
-template struct InListVerifier<BoolVerifier>;
-template struct InListVerifier<IntVerifier>;
-template struct InListVerifier<DoubleVerifier>;
-template struct InListVerifier<StringVerifier>;
-template struct NotInListVerifier<BoolVerifier>;
-template struct NotInListVerifier<IntVerifier>;
-template struct NotInListVerifier<DoubleVerifier>;
-template struct NotInListVerifier<StringVerifier>;
+template class InRangeVerifier<IntVerifier>;
+template class InRangeVerifier<DoubleVerifier>;
+template class InRangeVerifier<DoubleVector2Verifier>;
+template class InRangeVerifier<DoubleVector3Verifier>;
+template class InRangeVerifier<DoubleVector4Verifier>;
+template class InRangeVerifier<IntVector2Verifier>;
+template class InRangeVerifier<IntVector3Verifier>;
+template class InRangeVerifier<IntVector4Verifier>;
+template class NotInRangeVerifier<IntVerifier>;
+template class NotInRangeVerifier<DoubleVerifier>;
+template class NotInRangeVerifier<DoubleVector2Verifier>;
+template class NotInRangeVerifier<DoubleVector3Verifier>;
+template class NotInRangeVerifier<DoubleVector4Verifier>;
+template class NotInRangeVerifier<IntVector2Verifier>;
+template class NotInRangeVerifier<IntVector3Verifier>;
+template class NotInRangeVerifier<IntVector4Verifier>;
 
-template struct InRangeVerifier<IntVerifier>;
-template struct InRangeVerifier<DoubleVerifier>;
-template struct InRangeVerifier<DoubleVector2Verifier>;
-template struct InRangeVerifier<DoubleVector3Verifier>;
-template struct InRangeVerifier<DoubleVector4Verifier>;
-template struct InRangeVerifier<IntVector2Verifier>;
-template struct InRangeVerifier<IntVector3Verifier>;
-template struct InRangeVerifier<IntVector4Verifier>;
-template struct NotInRangeVerifier<IntVerifier>;
-template struct NotInRangeVerifier<DoubleVerifier>;
-template struct NotInRangeVerifier<DoubleVector2Verifier>;
-template struct NotInRangeVerifier<DoubleVector3Verifier>;
-template struct NotInRangeVerifier<DoubleVector4Verifier>;
-template struct NotInRangeVerifier<IntVector2Verifier>;
-template struct NotInRangeVerifier<IntVector3Verifier>;
-template struct NotInRangeVerifier<IntVector4Verifier>;
-
-
-template struct AnnotationVerifier<BoolVerifier>;
-template struct AnnotationVerifier<IntVerifier>;
-template struct AnnotationVerifier<DoubleVerifier>;
-template struct AnnotationVerifier<StringVerifier>;
-template struct AnnotationVerifier<TableVerifier>;
-//template struct AnnotationVerifier<BoolVector2Verifier>;
-template struct AnnotationVerifier<IntVector2Verifier>;
-template struct AnnotationVerifier<DoubleVector2Verifier>;
-//template struct AnnotationVerifier<BoolVector3Verifier>;
-template struct AnnotationVerifier<IntVector3Verifier>;
-template struct AnnotationVerifier<DoubleVector3Verifier>;
-//template struct AnnotationVerifier<BoolVector4Verifier>;
-template struct AnnotationVerifier<IntVector4Verifier>;
-template struct AnnotationVerifier<DoubleVector4Verifier>;
+template class AnnotationVerifier<BoolVerifier>;
+template class AnnotationVerifier<IntVerifier>;
+template class AnnotationVerifier<DoubleVerifier>;
+template class AnnotationVerifier<StringVerifier>;
+template class AnnotationVerifier<TableVerifier>;
+//template class AnnotationVerifier<BoolVector2Verifier>;
+template class AnnotationVerifier<IntVector2Verifier>;
+template class AnnotationVerifier<DoubleVector2Verifier>;
+//template class AnnotationVerifier<BoolVector3Verifier>;
+template class AnnotationVerifier<IntVector3Verifier>;
+template class AnnotationVerifier<DoubleVector3Verifier>;
+//template class AnnotationVerifier<BoolVector4Verifier>;
+template class AnnotationVerifier<IntVector4Verifier>;
+template class AnnotationVerifier<DoubleVector4Verifier>;
 
 std::string BoolVerifier::type() const {
     return "Boolean";
diff --git a/src/engine/settings.cpp b/src/engine/settings.cpp
index 6ae9451721..1f433b30ac 100644
--- a/src/engine/settings.cpp
+++ b/src/engine/settings.cpp
@@ -158,7 +158,8 @@ void saveSettings(const Settings& settings, const std::filesystem::path& filenam
             case properties::Property::Visibility::Developer:
                 json["visibility"] = "Developer";
                 break;
-
+            default:
+                throw ghoul::MissingCaseException();
         }
     }
     if (settings.bypassLauncher.has_value()) {
diff --git a/support/doxygen/README.md b/support/doxygen/README.md
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/support/doxygen/css b/support/doxygen/css
new file mode 160000
index 0000000000..8cea9a073e
--- /dev/null
+++ b/support/doxygen/css
@@ -0,0 +1 @@
+Subproject commit 8cea9a073ecd50a5b2c0958a3df100292d6c7374

From 7db7c4084108d8d1f40bd75e63452c46cc459d35 Mon Sep 17 00:00:00 2001
From: Alexander Bock <alexander.bock@liu.se>
Date: Mon, 20 Nov 2023 23:39:17 +0100
Subject: [PATCH 179/701] Doxygen style overhaul (#2954)

Reformatting the existing Doxygen comments to be unified
---
 Doxyfile                                      |  25 +-
 ext/ghoul                                     |   2 +-
 .../openspace/documentation/documentation.h   |  51 +--
 .../documentation/documentationengine.h       |   4 +-
 include/openspace/documentation/verifier.h    | 317 ++++++++++----
 include/openspace/engine/globalscallbacks.h   |   9 +-
 include/openspace/engine/logfactory.h         |  12 +-
 include/openspace/engine/moduleengine.h       |  21 +-
 include/openspace/engine/openspaceengine.h    |  35 +-
 include/openspace/engine/syncengine.h         |  37 +-
 include/openspace/events/event.h              |  42 +-
 include/openspace/events/eventengine.h        |  19 +-
 .../interaction/camerainteractionstates.h     |  12 +-
 .../openspace/interaction/delayedvariable.h   |   6 +-
 .../interaction/interactionmonitor.h          |   2 +-
 include/openspace/interaction/interpolator.h  |   2 +-
 .../interaction/joystickinputstate.h          |   6 +-
 .../openspace/interaction/sessionrecording.h  | 305 +++++++------
 .../interaction/websocketinputstate.h         |   2 +-
 include/openspace/mission/mission.h           |   7 +-
 include/openspace/mission/missionmanager.h    |   9 +-
 .../openspace/navigation/keyframenavigator.h  |  15 +-
 .../openspace/navigation/navigationhandler.h  |  10 +-
 .../openspace/navigation/orbitalnavigator.h   |  78 ++--
 include/openspace/navigation/path.h           |  84 ++--
 include/openspace/navigation/pathcurve.h      |  19 +-
 include/openspace/navigation/pathnavigator.h  |  19 +-
 include/openspace/navigation/waypoint.h       |  14 +-
 include/openspace/network/messagestructures.h |   2 +-
 .../network/messagestructureshelper.h         |  22 +-
 include/openspace/network/parallelpeer.h      |   6 +-
 .../openspace/properties/numericalproperty.h  |   7 +-
 include/openspace/properties/optionproperty.h |  23 +-
 include/openspace/properties/property.h       | 107 ++---
 include/openspace/properties/propertyowner.h  |  43 +-
 .../properties/scalar/shortproperty.h         |  13 -
 .../openspace/properties/selectionproperty.h  |  18 +-
 .../openspace/properties/templateproperty.h   |  75 ++--
 .../openspace/properties/triggerproperty.h    |  10 +-
 include/openspace/rendering/dashboard.h       |   6 +-
 include/openspace/rendering/fadeable.h        |   2 +-
 .../openspace/rendering/framebufferrenderer.h |  21 +-
 include/openspace/rendering/helper.h          |   2 +-
 include/openspace/rendering/renderable.h      |  39 +-
 include/openspace/rendering/renderengine.h    |   8 +-
 .../rendering/screenspacerenderable.h         |  10 +-
 include/openspace/rendering/volume.h          | 133 ------
 include/openspace/rendering/volumeraycaster.h |  58 ++-
 include/openspace/scene/asset.h               |  37 +-
 include/openspace/scene/assetmanager.h        |  26 +-
 include/openspace/scene/profile.h             |   7 +-
 include/openspace/scene/scene.h               |  71 +--
 include/openspace/scripting/lualibrary.h      |  12 +-
 include/openspace/scripting/scriptengine.h    |   9 +-
 include/openspace/scripting/scriptscheduler.h |  56 ++-
 include/openspace/util/collisionhelper.h      |  12 +-
 include/openspace/util/concurrentjobmanager.h |   4 +-
 include/openspace/util/concurrentqueue.h      |   2 +-
 include/openspace/util/coordinateconversion.h |  16 +-
 include/openspace/util/factorymanager.h       |  24 +-
 include/openspace/util/histogram.h            |  12 +-
 include/openspace/util/httprequest.h          |  62 +--
 include/openspace/util/job.h                  |   6 +-
 include/openspace/util/json_helper.h          |  18 +-
 include/openspace/util/openspacemodule.h      |  29 +-
 .../openspace/util/resourcesynchronization.h  |  39 +-
 include/openspace/util/screenlog.h            |  15 +-
 include/openspace/util/spicemanager.h         | 408 ++++++++++--------
 include/openspace/util/syncable.h             |   4 +-
 include/openspace/util/syncbuffer.h           |   3 -
 include/openspace/util/syncdata.h             |  21 +-
 include/openspace/util/time.h                 |  76 ++--
 include/openspace/util/timeline.h             |  24 +-
 include/openspace/util/timemanager.h          |   6 +-
 include/openspace/util/timerange.h            |   6 +-
 include/openspace/util/touch.h                |  37 +-
 include/openspace/util/tstring.h              |  19 +-
 include/openspace/util/universalhelpers.h     |  18 +-
 modules/base/rendering/renderablenodearrow.h  |   3 +-
 modules/base/rendering/renderabletrail.h      |  25 +-
 modules/base/rendering/renderabletrailorbit.h |  15 +-
 .../rendering/renderabletrailtrajectory.h     |   4 +-
 modules/base/rendering/screenspacedashboard.h |   4 -
 .../base/rendering/screenspaceframebuffer.h   |  10 +-
 modules/debugging/rendering/debugrenderer.h   |  97 ++---
 .../rendering/renderablebillboardscloud.h     |   1 -
 modules/exoplanets/exoplanetshelper.h         | 101 +++--
 .../rendering/renderableorbitdisc.h           |   4 +-
 .../tasks/exoplanetsdatapreparationtask.h     |  26 +-
 modules/fieldlinessequence/util/commons.h     |   6 +-
 .../util/kameleonfieldlinehelper.h            |  22 +-
 .../fitsfilereader/include/fitsfilereader.h   |  18 +-
 modules/gaia/rendering/octreeculler.h         |  13 +-
 modules/gaia/rendering/octreemanager.h        |  38 +-
 modules/gaia/rendering/renderablegaiastars.h  |  12 +-
 modules/gaia/tasks/constructoctreetask.h      |  29 +-
 modules/gaia/tasks/readfilejob.h              |  16 +-
 modules/gaia/tasks/readfitstask.h             |  10 +-
 modules/galaxy/tasks/milkywayconversiontask.h |   4 +-
 .../tasks/milkywaypointsconversiontask.h      |   4 +-
 .../globebrowsing/src/asynctiledataprovider.h |   6 +-
 modules/globebrowsing/src/basictypes.h        |  28 +-
 modules/globebrowsing/src/ellipsoid.h         |  20 +-
 modules/globebrowsing/src/gdalwrapper.h       |   9 +-
 modules/globebrowsing/src/geodeticpatch.h     |  18 +-
 .../src/geojson/geojsoncomponent.h            |  12 +-
 .../src/geojson/geojsonmanager.h              |   2 +-
 .../src/geojson/geojsonproperties.h           |  16 +-
 .../src/geojson/globegeometryfeature.h        |  56 ++-
 .../src/geojson/globegeometryhelper.h         |  17 +-
 modules/globebrowsing/src/gpulayergroup.h     |   6 +-
 modules/globebrowsing/src/layergroup.h        |  16 +-
 .../globebrowsing/src/layerrendersettings.h   |  11 +-
 modules/globebrowsing/src/lrucache.h          |   9 +-
 modules/globebrowsing/src/lruthreadpool.h     |  16 +-
 .../globebrowsing/src/memoryawaretilecache.h  |   4 +-
 .../src/prioritizingconcurrentjobmanager.h    |  16 +-
 modules/globebrowsing/src/renderableglobe.h   |  59 ++-
 modules/globebrowsing/src/shadowcomponent.h   |   1 -
 modules/globebrowsing/src/skirtedgrid.h       |  13 +-
 modules/globebrowsing/src/tileloadjob.h       |  15 +-
 .../src/tileprovider/temporaltileprovider.h   |   5 +-
 .../src/tileprovider/tileprovider.h           |  10 +-
 .../globebrowsing/src/tiletextureinitdata.h   |   5 +-
 modules/globebrowsing/src/timequantizer.h     | 131 +++---
 modules/imgui/include/guicomponent.h          |  24 +-
 modules/iswa/rendering/datacygnet.h           |   6 +-
 modules/iswa/rendering/dataplane.h            |   2 +-
 modules/iswa/rendering/datasphere.h           |   2 +-
 modules/iswa/rendering/iswacygnet.h           |   4 +-
 modules/iswa/rendering/kameleonplane.h        |   9 +-
 modules/iswa/rendering/texturecygnet.h        |   7 +-
 modules/iswa/rendering/textureplane.h         |   6 +-
 modules/iswa/util/dataprocessor.h             |   2 -
 modules/kameleon/include/kameleonwrapper.h    |   4 +-
 modules/multiresvolume/rendering/tsp.h        |  17 +-
 .../include/topics/flightcontrollertopic.h    |   2 +-
 modules/skybrowser/include/utility.h          |  28 +-
 modules/space/horizonsfile.h                  |  15 +-
 modules/space/kepler.h                        |   6 +-
 .../rendering/renderableconstellationbounds.h |  20 +-
 .../rendering/renderableconstellationlines.h  |   2 +-
 .../rendering/renderableconstellationsbase.h  |  35 +-
 .../space/rendering/renderablehabitablezone.h |   8 +-
 .../space/rendering/renderabletravelspeed.h   |   4 +-
 .../space/tasks/generatedebrisvolumetask.h    |  16 +-
 modules/space/translation/gptranslation.h     |   4 +-
 .../space/translation/horizonstranslation.h   |  15 +-
 modules/space/translation/keplertranslation.h |  14 +-
 .../rendering/renderablefov.h                 |  31 +-
 .../util/imagesequencer.h                     |  17 +-
 modules/statemachine/include/statemachine.h   |   7 +-
 modules/statemachine/statemachinemodule.h     |   2 +-
 modules/sync/syncs/httpsynchronization.h      |  28 +-
 modules/sync/syncs/urlsynchronization.h       |  30 +-
 modules/touch/include/directinputsolver.h     |  21 +-
 modules/touch/include/touchinteraction.h      |  66 +--
 modules/touch/include/tuioear.h               |   8 +-
 modules/touch/touchmodule.h                   |  10 +-
 .../rendering/renderabletimevaryingvolume.h   |   1 -
 modules/webbrowser/include/browserinstance.h  |  12 +-
 modules/webbrowser/include/eventhandler.h     |   4 +-
 src/CMakeLists.txt                            |   1 -
 163 files changed, 2266 insertions(+), 2035 deletions(-)
 delete mode 100644 include/openspace/rendering/volume.h

diff --git a/Doxyfile b/Doxyfile
index 44468a071b..6417b0167a 100644
--- a/Doxyfile
+++ b/Doxyfile
@@ -947,6 +947,7 @@ INPUT = src \
         include \
         modules \
         apps \
+        ext/ghoul \
         support/doxygen/README.md
 
 # This tag can be used to specify the character encoding of the source files
@@ -987,9 +988,7 @@ INPUT_FILE_ENCODING =
 # provided as doxygen C comment), *.py, *.pyw, *.f90, *.f95, *.f03, *.f08,
 # *.f18, *.f, *.for, *.vhd, *.vhdl, *.ucf, *.qsf and *.ice.
 
-FILE_PATTERNS = *.cpp \
-                *.h \
-                *.inl
+FILE_PATTERNS = *.cpp *.h *.inl
 
 # The RECURSIVE tag can be used to specify whether or not subdirectories should
 # be searched for input files as well.
@@ -1020,16 +1019,16 @@ EXCLUDE_SYMLINKS = NO
 # Note that the wildcards are matched against the file with absolute path, so to
 # exclude all test directories for example use the pattern */test/*
 
-EXCLUDE_PATTERNS = ext/* \
-                   bin/* \
-                   build/* \
-                   config/* \
-                   gui/* \
-                   kernels/* \
-                   data/* \
-                   scripts/* \
-                   shaders/* \
-                   **/ext/**
+EXCLUDE_PATTERNS = */ext/curl \
+                   */ext/date \
+                   */ext/json \
+                   */ext/spice \
+                   */ext/vld \
+                   */ext/tinythread \
+                   */ext/ghoul/ext/* \
+                   */modules/*/ext/* \
+                   */apps/OpenSpace-MinVR/ext/* \
+                   */apps/OpenSpace/ext/sgct/ext/*
 
 # The EXCLUDE_SYMBOLS tag can be used to specify one or more symbol names
 # (namespaces, classes, functions, etc.) that should be excluded from the
diff --git a/ext/ghoul b/ext/ghoul
index fbd80eae0f..c2992bd52f 160000
--- a/ext/ghoul
+++ b/ext/ghoul
@@ -1 +1 @@
-Subproject commit fbd80eae0ff589a9fa2fb5e2c8af8e4491fe4e2d
+Subproject commit c2992bd52f7c4e29a85dcbe44e3e6a89ffec0c19
diff --git a/include/openspace/documentation/documentation.h b/include/openspace/documentation/documentation.h
index c8c7385613..28d2029922 100644
--- a/include/openspace/documentation/documentation.h
+++ b/include/openspace/documentation/documentation.h
@@ -56,11 +56,16 @@ struct TestResult {
     struct Offense {
         /// The Reason for the offense
         enum class Reason {
-            Unknown,          ///< Unknown reason
-            MissingKey,       ///< The offending key that was requested was not found
-            WrongType,        ///< The key's value was not of the expected type
-            Verification,     ///< The value did not pass a necessary non-type verifier
-            UnknownIdentifier ///< The identifier for a ReferencingVerifier did not exist
+            /// Unknown reason
+            Unknown,
+            /// The offending key that was requested was not found
+            MissingKey,
+            /// The key's value was not of the expected type
+            WrongType,
+            /// The value did not pass a necessary non-type verifier
+            Verification,
+            /// The identifier for a ReferencingVerifier did not exist
+            UnknownIdentifier
         };
         /// The offending key that caused the Offense. In the case of a nested table,
         /// this value will be the fully qualified name of the key
@@ -80,7 +85,8 @@ struct TestResult {
     struct Warning {
         /// The reason for the warning
         enum class Reason {
-            Deprecated ///< The value is marked as deprecated and should not used
+            /// The value is marked as deprecated and should not used
+            Deprecated
         };
 
         /// The offending key that caused the Warning. In the case of a nested table,
@@ -90,7 +96,6 @@ struct TestResult {
         Reason reason;
     };
 
-
     /// Is `true` if the TestResult is positive, `false` otherwise
     bool success = false;
     /// Contains a list of offenses that were found in the test. Is empty if
@@ -130,10 +135,10 @@ void logError(const SpecificationError& error, std::string component = "");
  * DocumentationEntry::Wildcard, any key in the containing Documentation will be tested
  * against the provided verifier. The most convenient way of creating DocumentationEntry%s
  * is by using an inline initializer list such as:
- *\verbatim
-DocumentationEntry e = { "key", new IntVerifier, "Documentation text", Optional::Yes };
-\endverbatim
-
+ * ```
+ * DocumentationEntry e = { "key", new IntVerifier, "Documentation text", Optional::Yes };
+ * ```
+ *
  * Furthermore, these initializer lists can be crated all at once for a Documentation.
  * Even if the Verifier%s are specified using the `new` operators, they will not leak
  * memory as the DocumentationEntry takes ownership of them in the constructor.
@@ -190,8 +195,7 @@ struct DocumentationEntry {
      * \pre \p k must not be empty
      * \pre \p v must not be nullptr
      */
-    DocumentationEntry(std::string k, Verifier* v, Optional opt,
-        std::string doc = "");
+    DocumentationEntry(std::string k, Verifier* v, Optional opt, std::string doc = "");
 
     /// The key that is described by this DocumentationEntry
     std::string key;
@@ -203,7 +207,6 @@ struct DocumentationEntry {
     std::string documentation;
 };
 
-
 /**
  * This struct contains the documentation and specification for a ghoul::Dictionary. It is
  * used to impose restrictions on keys and values and determine whether a given
@@ -211,16 +214,16 @@ struct DocumentationEntry {
  * #testSpecificationAndThrow methods). Each Documentation consists of a human-readable
  * `name`, and a list of DocumentationEntry%s that each describe a single key value. The
  * most convenient way of creating a Documentation is by using nested initializer lists:
- *\verbatim
-Documentation doc = {
-    "Documentation for an arbitrary dictionary",
-    { // A list of DocumentationEntry%s; also specified using initializer lists
-        { "key1", new IntVerifier, "Documentation key1", Optional::Yes },
-        { "key2", new FloatVerifier, "Documentation key2" },
-        { "key3", new StringVerifier }
-    }
-};
-\endverbatim
+ * ```
+ * Documentation doc = {
+ *     "Documentation for an arbitrary dictionary",
+ *     { // A list of DocumentationEntry%s; also specified using initializer lists
+ *         { "key1", new IntVerifier, "Documentation key1", Optional::Yes },
+ *         { "key2", new FloatVerifier, "Documentation key2" },
+ *         { "key3", new StringVerifier }
+ *     }
+ * };
+ * ```
  *
  * If multiple DocumentationEntries cover the same key, they are all evaluated for that
  * specific key. The same holds true if there is a DocumentationEntry with a
diff --git a/include/openspace/documentation/documentationengine.h b/include/openspace/documentation/documentationengine.h
index 88ec3042c7..a21f563b90 100644
--- a/include/openspace/documentation/documentationengine.h
+++ b/include/openspace/documentation/documentationengine.h
@@ -47,8 +47,7 @@ public:
          * Constructor of a DuplicateDocumentationException storing the offending
          * Documentation for later use.
          *
-         * \param doc The Documentation whose identifier was previously
-         *        registered
+         * \param doc The Documentation whose identifier was previously registered
          */
         DuplicateDocumentationException(Documentation doc);
 
@@ -92,7 +91,6 @@ public:
     nlohmann::json generateJsonJson() const;
 
 private:
-
     /// The list of all Documentation%s that are stored by the DocumentationEngine
     std::vector<Documentation> _documentations;
 
diff --git a/include/openspace/documentation/verifier.h b/include/openspace/documentation/verifier.h
index 5eeeba1c1b..fc7cc06b71 100644
--- a/include/openspace/documentation/verifier.h
+++ b/include/openspace/documentation/verifier.h
@@ -58,7 +58,7 @@ public:
      * \return A TestResult struct that contains information about whether the key adheres
      *         to the demands of the specific Verifier. If it does not,
      *         TestResult::offenders will either contain \p key or, in the case of a
-     *         TableVerifier, a list of all offending subkeys as fully qualified names.
+     *         TableVerifier, a list of all offending subkeys as fully qualified names
      *
      * \post If the return values' TestResult::success is `true`, its
      *      TestResult::offenders is empty
@@ -98,6 +98,7 @@ public:
  * The base class Verifier for all Verifier%s that have to test against a specific value
  * type. This Verifier tests whether a given key exists and whether it has the same type
  * as the template parameter `T`.
+ *
  * \tparam T The type against which the key's value is tested
  */
 template <typename T>
@@ -112,7 +113,7 @@ public:
      * \param dictionary The ghoul::Dictionary that contains the \p key to be tested
      * \param key The key inside the \p dictinoary that is to be tested
      * \return A TestResult that contains the information whether the \p key exists in the
-     *         \p dictionary and whether the key's value's type agrees with `T`.
+     *         \p dictionary and whether the key's value's type agrees with `T`
      *
      * \post The return values' TestResult::success is either `true` and
      *       TestResult::offenders is empty, or it is `false` and TestResult::offenders
@@ -220,7 +221,7 @@ public:
 
 /**
  * A Verifier that checks whether a given key inside a ghoul::Dictionary is a string and
- * a valid date time
+ * a valid date time.
  */
 class DateTimeVerifier : public StringVerifier {
 public:
@@ -312,21 +313,27 @@ public:
 // Vector verifiers
 //----------------------------------------------------------------------------------------
 
-/// This Verifier checks whether the value is of type `glm::tvec2<T>`
+/**
+ * This Verifier checks whether the value is of type `glm::tvec2<T>`.
+ */
 template <typename T>
 class Vector2Verifier : public TemplateVerifier<glm::tvec2<T>> {
 public:
     std::string type() const override;
 };
 
-/// This Verifier checks whether the value is of type `glm::tvec3<T>`
+/**
+ * This Verifier checks whether the value is of type `glm::tvec3<T>`.
+ */
 template <typename T>
 class Vector3Verifier : public TemplateVerifier<glm::tvec3<T>> {
 public:
     std::string type() const override;
 };
 
-/// This Verifier checks whether the value is of type `glm::tvec4<T>`
+/**
+ * This Verifier checks whether the value is of type `glm::tvec4<T>`.
+ */
 template <typename T>
 class Vector4Verifier : public TemplateVerifier<glm::tvec4<T>> {
 public:
@@ -351,7 +358,7 @@ public:
 
 /**
  * A Verifier that checks whether all values contained in a Table are of
- * type `glm::tvec2<T>`
+ * type `glm::tvec2<T>`.
  */
 template <typename T>
 class Vector2ListVerifier : public TableVerifier {
@@ -369,7 +376,7 @@ public:
 
 /**
  * A Verifier that checks whether all values contained in a Table are of
- * type `glm::tvec3<T>`
+ * type `glm::tvec3<T>`.
  */
 template <typename T>
 class Vector3ListVerifier : public TableVerifier {
@@ -387,7 +394,7 @@ public:
 
 /**
  * A Verifier that checks whether all values contained in a Table are of
- * type `glm::tvec4<T>`
+ * type `glm::tvec4<T>`.
  */
 template <typename T>
 class Vector4ListVerifier : public TableVerifier {
@@ -408,7 +415,7 @@ public:
 //----------------------------------------------------------------------------------------
 
 /**
- * This Verifier checks whether the value is of type `glm::mat2x2<T>`
+ * This Verifier checks whether the value is of type `glm::mat2x2<T>`.
  */
 template <typename T>
 class Matrix2x2Verifier : public TemplateVerifier<glm::tmat2x2<T>> {
@@ -417,7 +424,7 @@ public:
 };
 
 /**
- * This Verifier checks whether the value is of type `glm::mat2x3<T>`
+ * This Verifier checks whether the value is of type `glm::mat2x3<T>`.
  */
 template <typename T>
 class Matrix2x3Verifier : public TemplateVerifier<glm::tmat2x3<T>> {
@@ -426,7 +433,7 @@ public:
 };
 
 /**
- * This Verifier checks whether the value is of type `glm::mat2x4<T>`
+ * This Verifier checks whether the value is of type `glm::mat2x4<T>`.
  */
 template <typename T>
 class Matrix2x4Verifier : public TemplateVerifier<glm::tmat2x4<T>> {
@@ -435,7 +442,7 @@ public:
 };
 
 /**
- * This Verifier checks whether the value is of type `glm::mat3x2<T>`
+ * This Verifier checks whether the value is of type `glm::mat3x2<T>`.
  */
 template <typename T>
 class Matrix3x2Verifier : public TemplateVerifier<glm::tmat3x2<T>> {
@@ -444,7 +451,7 @@ public:
 };
 
 /**
- * This Verifier checks whether the value is of type `glm::mat3x3<T>`
+ * This Verifier checks whether the value is of type `glm::mat3x3<T>`.
  */
 template <typename T>
 class Matrix3x3Verifier : public TemplateVerifier<glm::tmat3x3<T>> {
@@ -453,7 +460,7 @@ public:
 };
 
 /**
- * This Verifier checks whether the value is of type `glm::mat3x4<T>`
+ * This Verifier checks whether the value is of type `glm::mat3x4<T>`.
  */
 template <typename T>
 class Matrix3x4Verifier : public TemplateVerifier<glm::tmat3x4<T>> {
@@ -462,7 +469,7 @@ public:
 };
 
 /**
- * This Verifier checks whether the value is of type `glm::mat4x2<T>`
+ * This Verifier checks whether the value is of type `glm::mat4x2<T>`.
  */
 template <typename T>
 class Matrix4x2Verifier : public TemplateVerifier<glm::tmat4x2<T>> {
@@ -471,7 +478,7 @@ public:
 };
 
 /**
- * This Verifier checks whether the value is of type `glm::mat4x3<T>`
+ * This Verifier checks whether the value is of type `glm::mat4x3<T>`.
  */
 template <typename T>
 class Matrix4x3Verifier : public TemplateVerifier<glm::tmat4x3<T>> {
@@ -480,7 +487,7 @@ public:
 };
 
 /**
- * This Verifier checks whether the value is of type `glm::mat4x4<T>`
+ * This Verifier checks whether the value is of type `glm::mat4x4<T>`.
  */
 template <typename T>
 class Matrix4x4Verifier : public TemplateVerifier<glm::tmat4x4<T>> {
@@ -513,6 +520,7 @@ public:
     /**
      * Constructor for an OperatorVerifier. As all operators need to compare the incoming
      * value to a stored value, we require the comparison \p value to be passed in here.
+     *
      * \param value The value against which the tested value is compared using the
      *        `Operator`
      */
@@ -530,7 +538,7 @@ public:
      *         \p key%'s value has the wrong type, it will be added to the TestResult's
      *         offense list with the reason TestResult::Offense::Reason::WrongType; if the
      *         `Operator` returns false, it will be added with the reason
-     *         TestResult::Offense::Verification instead.
+     *         TestResult::Offense::Verification instead
      */
     TestResult operator()(const ghoul::Dictionary& dictionary,
         const std::string& key) const override;
@@ -683,7 +691,7 @@ public:
      *         \p key%'s value has the wrong type, it will be added to the TestResult's
      *         offense list with the reason TestResult::Offense::Reason::WrongType; if the
      *         value is not in the list, it will be added with the reason
-     *         TestResult::Offense::Verification instead.
+     *         TestResult::Offense::Verification instead
      */
     TestResult operator()(const ghoul::Dictionary& dictionary,
         const std::string& key) const override;
@@ -725,7 +733,7 @@ public:
      *         \p key%'s value has the wrong type, it will be added to the TestResult's
      *         offense list with the reason TestResult::Offense::Reason::WrongType; if the
      *         value is in the list, it will be added with the reason
-     *         TestResult::Offense::Verification instead.
+     *         TestResult::Offense::Verification instead
      */
     TestResult operator()(const ghoul::Dictionary& dictionary,
         const std::string& key) const override;
@@ -777,7 +785,7 @@ public:
      *         offense list with the reason TestResult::Offense::Reason::WrongType; if the
      *         value is outside the range defined by the lower and upper limits passed to
      *         the constructor, it will be added with the reason
-     *         TestResult::Offense::Verification instead.
+     *         TestResult::Offense::Verification instead
      */
     TestResult operator()(const ghoul::Dictionary& dictionary,
         const std::string& key) const override;
@@ -827,7 +835,7 @@ public:
      *         offense list with the reason TestResult::Offense::Reason::WrongType; if the
      *         value is greater or equal to the lower limit and less or equal to the upper
      *         limit, it will be added with the reason TestResult::Offense::Verification
-     *         instead.
+     *         instead
      */
     TestResult operator()(const ghoul::Dictionary& dictionary,
         const std::string& key) const override;
@@ -863,7 +871,7 @@ public:
      * passed to the user when a documentation is requested.
      *
      * \param annotation The annotation that is stored and returned to the user when it
-     *        is requested.
+     *        is requested
      *
      * \pre annotation must not be empty
      */
@@ -961,7 +969,7 @@ public:
      *         TestResult::offenses list contains \p with a reason of
      *         TestResult::Offense::Reason::Verification. If \p key%'s value passes either
      *         of the two Verifier%s, the result's TestResult::success is `true` and the
-     *         TestResult::offenses is empty.
+     *         TestResult::offenses is empty
      */
     TestResult operator()(const ghoul::Dictionary& dictionary,
         const std::string& key) const override;
@@ -972,118 +980,271 @@ public:
     std::vector<std::shared_ptr<Verifier>> values;
 };
 
-/// A short-hand definition for a Verifier checking for `glm::bvec2`
+/**
+ * A short-hand definition for a Verifier checking for `glm::bvec2`.
+ */
 using BoolVector2Verifier = Vector2Verifier<bool>;
-/// A short-hand definition for a Verifier checking for `glm::ivec2`
+
+/**
+ * A short-hand definition for a Verifier checking for `glm::ivec2`.
+ */
 using IntVector2Verifier = Vector2Verifier<int>;
-/// A short-hand definition for a Verifier checking for `glm::dvec2`
+
+/**
+ * A short-hand definition for a Verifier checking for `glm::dvec2`.
+ */
 using DoubleVector2Verifier = Vector2Verifier<double>;
-/// A short-hand definition for a Verifier checking for `glm::bvec3`
+
+/**
+ * A short-hand definition for a Verifier checking for `glm::bvec3`.
+ */
 using BoolVector3Verifier = Vector3Verifier<bool>;
-/// A short-hand definition for a Verifier checking for `glm::ivec3`
+
+/**
+ * A short-hand definition for a Verifier checking for `glm::ivec3`.
+ */
 using IntVector3Verifier = Vector3Verifier<int>;
-/// A short-hand definition for a Verifier checking for `glm::dvec3`
+
+/**
+ * A short-hand definition for a Verifier checking for `glm::dvec3`.
+ */
 using DoubleVector3Verifier = Vector3Verifier<double>;
-/// A short-hand definition for a Verifier checking for `glm::bvec4`
+
+/**
+ * A short-hand definition for a Verifier checking for `glm::bvec4`.
+ */
 using BoolVector4Verifier = Vector4Verifier<bool>;
-/// A short-hand definition for a Verifier checking for `glm::ivec4`
+
+/**
+ * A short-hand definition for a Verifier checking for `glm::ivec4`.
+ */
 using IntVector4Verifier = Vector4Verifier<int>;
-/// A short-hand definition for a Verifier checking for `glm::dvec4`
+
+/**
+ * A short-hand definition for a Verifier checking for `glm::dvec4`.
+ */
 using DoubleVector4Verifier = Vector4Verifier<double>;
 
-/// A short-hand definition for a Verifier checking for `glm::dmat2x2`
+/**
+ * A short-hand definition for a Verifier checking for `glm::dmat2x2`.
+ */
 using DoubleMatrix2x2Verifier = Matrix2x2Verifier<double>;
+
 using DoubleMatrix2Verifier = DoubleMatrix2x2Verifier;
-/// A short-hand definition for a Verifier checking for `glm::dmat2x3`
+
+/**
+ * A short-hand definition for a Verifier checking for `glm::dmat2x3`.
+ */
 using DoubleMatrix2x3Verifier = Matrix2x3Verifier<double>;
-/// A short-hand definition for a Verifier checking for `glm::dmat2x4`
+
+/**
+ * A short-hand definition for a Verifier checking for `glm::dmat2x4`.
+ */
 using DoubleMatrix2x4Verifier = Matrix2x4Verifier<double>;
-/// A short-hand definition for a Verifier checking for `glm::dmat3x2`
+
+/**
+ * A short-hand definition for a Verifier checking for `glm::dmat3x2`.
+ */
 using DoubleMatrix3x2Verifier = Matrix3x2Verifier<double>;
-/// A short-hand definition for a Verifier checking for `glm::dmat3x3`
+
+/**
+ * A short-hand definition for a Verifier checking for `glm::dmat3x3`.
+ */
 using DoubleMatrix3x3Verifier = Matrix3x3Verifier<double>;
+
 using DoubleMatrix3Verifier = DoubleMatrix3x3Verifier;
-/// A short-hand definition for a Verifier checking for `glm::dmat3x4`
+
+/**
+ * A short-hand definition for a Verifier checking for `glm::dmat3x4`.
+ */
 using DoubleMatrix3x4Verifier = Matrix3x4Verifier<double>;
-/// A short-hand definition for a Verifier checking for `glm::dmat4x2`
+
+/**
+ * A short-hand definition for a Verifier checking for `glm::dmat4x2`.
+ */
 using DoubleMatrix4x2Verifier = Matrix4x2Verifier<double>;
-/// A short-hand definition for a Verifier checking for `glm::dmat4x3`
+
+/**
+ * A short-hand definition for a Verifier checking for `glm::dmat4x3`.
+ */
 using DoubleMatrix4x3Verifier = Matrix4x3Verifier<double>;
-/// A short-hand definition for a Verifier checking for `glm::dmat4x4`
+
+/**
+ * A short-hand definition for a Verifier checking for `glm::dmat4x4`.
+ */
 using DoubleMatrix4x4Verifier = Matrix4x4Verifier<double>;
+
 using DoubleMatrix4Verifier = DoubleMatrix4x4Verifier;
 
-/// A short-hand definition for a LessVerifier with a type check for `int`
+/**
+ * A short-hand definition for a LessVerifier with a type check for `int`.
+ */
 using IntLessVerifier = LessVerifier<IntVerifier>;
-/// A short-hand definition for a LessVerifier with a type check for `double`
+
+/**
+ * A short-hand definition for a LessVerifier with a type check for `double`.
+ */
 using DoubleLessVerifier = LessVerifier<DoubleVerifier>;
-/// A short-hand definition for a LessEqualVerifier with a type check for `int`
+
+/**
+ * A short-hand definition for a LessEqualVerifier with a type check for `int`.
+ */
 using IntLessEqualVerifier = LessEqualVerifier<IntVerifier>;
-/// A short-hand definition for a LessEqualVerifier with a type check for `double`
+
+/**
+ * A short-hand definition for a LessEqualVerifier with a type check for `double`.
+ */
 using DoubleLessEqualVerifier = LessEqualVerifier<DoubleVerifier>;
-/// A short-hand definition for a GreaterVerifier with a type check for `int`
+
+/**
+ * A short-hand definition for a GreaterVerifier with a type check for `int`.
+ */
 using IntGreaterVerifier = GreaterVerifier<IntVerifier>;
-/// A short-hand definition for a GreaterVerifier with a type check for `double`
+
+/**
+ * A short-hand definition for a GreaterVerifier with a type check for `double`.
+ */
 using DoubleGreaterVerifier = GreaterVerifier<DoubleVerifier>;
-/// A short-hand definition for a GreaterEqualVerifier with a type check for `int`
+
+/**
+ * A short-hand definition for a GreaterEqualVerifier with a type check for `int`.
+ */
 using IntGreaterEqualVerifier = GreaterEqualVerifier<IntVerifier>;
-/// A short-hand definition for a GreaterEqualVerifier with a type check for `double`
+
+/**
+ * A short-hand definition for a GreaterEqualVerifier with a type check for `double`.
+ */
 using DoubleGreaterEqualVerifier = GreaterEqualVerifier<DoubleVerifier>;
-/// A short-hand definition for a EqualVerifier with a type check for `bool`
+
+/**
+ * A short-hand definition for a EqualVerifier with a type check for `bool`.
+ */
 using BoolEqualVerifier = EqualVerifier<BoolVerifier>;
-/// A short-hand definition for a EqualVerifier with a type check for `int`
+
+/**
+ * A short-hand definition for a EqualVerifier with a type check for `int`.
+ */
 using IntEqualVerifier = EqualVerifier<IntVerifier>;
-/// A short-hand definition for a EqualVerifier with a type check for `double`
+
+/**
+ * A short-hand definition for a EqualVerifier with a type check for `double`.
+ */
 using DoubleEqualVerifier = EqualVerifier<DoubleVerifier>;
-/// A short-hand definition for a EqualVerifier with a type check for `string`
+
+/**
+ * A short-hand definition for a EqualVerifier with a type check for `string`.
+ */
 using StringEqualVerifier = EqualVerifier<StringVerifier>;
-/// A short-hand definition for a UnequalVerifier with a type check for `bool`
+
+/**
+ * A short-hand definition for a UnequalVerifier with a type check for `bool`.
+ */
 using BoolUnequalVerifier = UnequalVerifier<BoolVerifier>;
-/// A short-hand definition for a UnequalVerifier with a type check for `int`
+
+/**
+ * A short-hand definition for a UnequalVerifier with a type check for `int`.
+ */
 using IntUnequalVerifier = UnequalVerifier<IntVerifier>;
-/// A short-hand definition for a UnequalVerifier with a type check for `double`
+
+/**
+ * A short-hand definition for a UnequalVerifier with a type check for `double`.
+ */
 using DoubleUnequalVerifier = UnequalVerifier<DoubleVerifier>;
-/// A short-hand definition for a UnequalVerifier with a type check for `string`
+
+/**
+ * A short-hand definition for a UnequalVerifier with a type check for `string`.
+ */
 using StringUnequalVerifier = UnequalVerifier<StringVerifier>;
 
-/// A short-hand definition for a InListVerifier with a type check for `bool`
+/**
+ * A short-hand definition for a InListVerifier with a type check for `bool`.
+ */
 using BoolInListVerifier = InListVerifier<BoolVerifier>;
-/// A short-hand definition for a InListVerifier with a type check for `int`
+
+/**
+ * A short-hand definition for a InListVerifier with a type check for `int`.
+ */
 using IntInListVerifier = InListVerifier<IntVerifier>;
-/// A short-hand definition for a InListVerifier with a type check for `double`
+
+/**
+ * A short-hand definition for a InListVerifier with a type check for `double`.
+ */
 using DoubleInListVerifier = InListVerifier<DoubleVerifier>;
-/// A short-hand definition for a InListVerifier with a type check for `string`
+
+/**
+ * A short-hand definition for a InListVerifier with a type check for `string`.
+ */
 using StringInListVerifier = InListVerifier<StringVerifier>;
-/// A short-hand definition for a NotInListVerifier with a type check for `bool`
+
+/**
+ * A short-hand definition for a NotInListVerifier with a type check for `bool`.
+ */
 using BoolNotInListVerifier = NotInListVerifier<BoolVerifier>;
-/// A short-hand definition for a NotInListVerifier with a type check for `int`
+
+/**
+ * A short-hand definition for a NotInListVerifier with a type check for `int`.
+ */
 using IntNotInListVerifier = NotInListVerifier<IntVerifier>;
-/// A short-hand definition for a NotInListVerifier with a type check for `double`
+
+/**
+ * A short-hand definition for a NotInListVerifier with a type check for `double`.
+ */
 using DoubleNotInListVerifier = NotInListVerifier<DoubleVerifier>;
-/// A short-hand definition for a NotInListVerifier with a type check for `string`
+
+/**
+ * A short-hand definition for a NotInListVerifier with a type check for `string`.
+ */
 using StringNotInListVerifier = NotInListVerifier<StringVerifier>;
 
-/// A short-hand definition for a InRangeVerifier with a type check for `int`
+/**
+ * A short-hand definition for a InRangeVerifier with a type check for `int`.
+ */
 using IntInRangeVerifier = InRangeVerifier<IntVerifier>;
-/// A short-hand definition for a InRangeVerifier with a type check for `double`
+
+/**
+ * A short-hand definition for a InRangeVerifier with a type check for `double`.
+ */
 using DoubleInRangeVerifier = InRangeVerifier<DoubleVerifier>;
-/// A short-hand definition for a InRangeVerifier with a type check for `vec2`
+
+/**
+ * A short-hand definition for a InRangeVerifier with a type check for `vec2`.
+ */
 using Vec2InRangeVerifier = InRangeVerifier<DoubleVector2Verifier>;
-/// A short-hand definition for a NotInRangeVerifier with a type check for `int`
+
+/**
+ * A short-hand definition for a NotInRangeVerifier with a type check for `int`.
+ */
 using IntNotInRangeVerifier = NotInRangeVerifier<IntVerifier>;
-/// A short-hand definition for a NotInRangeVerifier with a type check for `double`
+
+/**
+ * A short-hand definition for a NotInRangeVerifier with a type check for `double`.
+ */
 using DoubleNotInRangeVerifier = NotInRangeVerifier<DoubleVerifier>;
 
-/// A short-hand definition for a AnnotationVerifier with a type check for `bool`
+/**
+ * A short-hand definition for a AnnotationVerifier with a type check for `bool`.
+ */
 using BoolAnnotationVerifier = AnnotationVerifier<BoolVerifier>;
-/// A short-hand definition for a AnnotationVerifier with a type check for `int`
+
+/**
+ * A short-hand definition for a AnnotationVerifier with a type check for `int`.
+ */
 using IntAnnotationVerifier = AnnotationVerifier<IntVerifier>;
-/// A short-hand definition for a AnnotationVerifier with a type check for `double`
+
+/**
+ * A short-hand definition for a AnnotationVerifier with a type check for `double`.
+ */
 using DoubleAnnotationVerifier = AnnotationVerifier<DoubleVerifier>;
-/// A short-hand definition for a AnnotationVerifier with a type check for `string`
+
+/**
+ * A short-hand definition for a AnnotationVerifier with a type check for `string`.
+ */
 using StringAnnotationVerifier = AnnotationVerifier<StringVerifier>;
-/// A short-hand definition for a AnnotationVerifier with a type check for
-/// `ghoul::Dictionary`
+
+/**
+ * A short-hand definition for a AnnotationVerifier with a type check for
+ * `ghoul::Dictionary`
+ */
 using TableAnnotationVerifier = AnnotationVerifier<TableVerifier>;
 
 // Definitions of external templates that are instantiated in the cpp file
diff --git a/include/openspace/engine/globalscallbacks.h b/include/openspace/engine/globalscallbacks.h
index a0f606b65c..4dba55e44e 100644
--- a/include/openspace/engine/globalscallbacks.h
+++ b/include/openspace/engine/globalscallbacks.h
@@ -66,11 +66,10 @@ inline std::vector<std::function<void(TouchInput)>>* touchExit;
 /**
  * If the framerate becomes slow, Chromium Embedded Framework (used in Web Browser Module)
  * needs to perform its message loop work more frequently than once per frame. If this
- * method is not called frequently enough, the GUI will become much less responsive.
- * A future more long-term may decouple the browser's message work loop from the main
- * render loop altogehter using a separate thread.
- * Currently, this method is called from within the RenderEngine,
- * between calls to individual renderables.
+ * method is not called frequently enough, the GUI will become much less responsive. A
+ * future more long-term may decouple the browser's message work loop from the main render
+ * loop altogehter using a separate thread. Currently, this method is called from within
+ * the RenderEngine, between calls to individual renderables.
  */
 extern void (*webBrowserPerformanceHotfix)();
 
diff --git a/include/openspace/engine/logfactory.h b/include/openspace/engine/logfactory.h
index 3216e44e32..e4cce1ba43 100644
--- a/include/openspace/engine/logfactory.h
+++ b/include/openspace/engine/logfactory.h
@@ -43,12 +43,14 @@ namespace documentation { struct Documentation; }
  * logfile should be created. Both logs can be customized using the `Append`,
  * `TimeStamping`, `DateStamping`, `CategoryStamping`, and `LogLevelStamping` values.
  *
- * \param  dictionary The dictionary from which the ghoul::logging::Log should be created
+ * \param dictionary The dictionary from which the ghoul::logging::Log should be created
  * \return The created ghoul::logging::Log
- * \post   The return value will not be `nullptr`
- * \throw  ghoul::RuntimeError If there was an error creating the ghoul::logging::Log
- * \sa     ghoul::logging::TextLog
- * \sa     ghoul::logging::HTMLLog
+ *
+ * \post The return value will not be `nullptr`
+ * \throw ghoul::RuntimeError If there was an error creating the ghoul::logging::Log
+ *
+ * \sa ghoul::logging::TextLog
+ * \sa ghoul::logging::HTMLLog
  */
 std::unique_ptr<ghoul::logging::Log> createLog(const ghoul::Dictionary& dictionary);
 
diff --git a/include/openspace/engine/moduleengine.h b/include/openspace/engine/moduleengine.h
index 8a37586007..4bfe52c166 100644
--- a/include/openspace/engine/moduleengine.h
+++ b/include/openspace/engine/moduleengine.h
@@ -45,9 +45,9 @@ namespace scripting { struct LuaLibrary; }
  * The ModuleEngine is the central repository for registering and accessing
  * OpenSpaceModule for the current application run. By initializing (#initialize) the
  * ModuleEngine, the default set of OpenSpaceModule%s as generated by CMake in the
- * `moduleregistration.h` file is automatically registered and created.
- * Additional OpenSpaceModule%s can be registered with the #registerModule function, which
- * will internally call the OpenSpaceModule::initialize method.
+ * `moduleregistration.h` file is automatically registered and created. Additional
+ * OpenSpaceModule%s can be registered with the #registerModule function, which will
+ * internally call the OpenSpaceModule::initialize method.
  */
 class ModuleEngine : public properties::PropertyOwner {
 public:
@@ -55,11 +55,10 @@ public:
 
     /**
      * Registers all of the OpenSpaceModule%s which are created by the CMake configuration
-     * and stored in the `moduleregistration.h` file. For all of those modules
-     * the OpenSpaceModule::initialize method with will called.
+     * and stored in the `moduleregistration.h` file. For all of those modules the
+     * OpenSpaceModule::initialize method with will called.
      *
-     * \throw ghoul::RuntimeError If two modules in the default modules have the same
-     *        name
+     * \throw ghoul::RuntimeError If two modules in the default modules have the same name
     */
     void initialize(const std::map<std::string, ghoul::Dictionary>& moduleConfigurations);
 
@@ -104,7 +103,7 @@ public:
      * to have the public static member variable `name` which must be equal to
      * the name of the module used in its constructor.
      *
-     * \return a pointer to the module of the given subclass
+     * \return A pointer to the module of the given subclass
      */
     template <class ModuleSubClass>
     ModuleSubClass* module() const;
@@ -118,9 +117,9 @@ public:
     ghoul::systemcapabilities::Version requiredOpenGLVersion() const;
 
     /**
-    * Returns the Lua library that contains all Lua functions available to affect the
-    * modules.
-    */
+     * Returns the Lua library that contains all Lua functions available to affect the
+     * modules.
+     */
     static scripting::LuaLibrary luaLibrary();
 
 private:
diff --git a/include/openspace/engine/openspaceengine.h b/include/openspace/engine/openspaceengine.h
index 73a97a54e8..291a65aefa 100644
--- a/include/openspace/engine/openspaceengine.h
+++ b/include/openspace/engine/openspaceengine.h
@@ -51,15 +51,17 @@ class Scene;
 
 namespace scripting { struct LuaLibrary; }
 
-  // Structure that is responsible for the delayed shutdown of the application
+/**
+ * Structure that is responsible for the delayed shutdown of the application.
+ */
 struct ShutdownInformation {
-    // Whether the application is currently in shutdown mode (i.e. counting down the
-    // timer and closing it at '0'
+    /// Whether the application is currently in shutdown mode (i.e. counting down the
+    /// timer and closing it at '0'
     bool inShutdown = false;
-    // Total amount of time the application will wait before actually shutting down
+    /// Total amount of time the application will wait before actually shutting down
     float waitTime = 0.f;
-    // Current state of the countdown; if it reaches '0', the application will
-    // close
+    /// Current state of the countdown; if it reaches '0', the application will
+    /// close
     float timer = 0.f;
 };
 
@@ -73,9 +75,11 @@ struct CommandlineArguments {
 
 class OpenSpaceEngine : public properties::PropertyOwner {
 public:
-    // A mode that specifies which part of the system is currently in control.
-    // The mode can be used to limit certain features, like setting time, navigation
-    // or triggering scripts
+    /**
+     * A mode that specifies which part of the system is currently in control. The mode
+     * can be used to limit certain features, like setting time, navigation or triggering
+     * scripts.
+     */
     enum class Mode {
         UserControl = 0,
         SessionRecordingPlayback,
@@ -180,7 +184,8 @@ private:
  * Sets the camera position using the time contents of a profile. The function will
  * set an absolute position or a go-to-geolocation command using the globebrowsing
  * module.
- * \param p The Profile to be read.
+ *
+ * \param p The Profile to be read
  */
 void setCameraFromProfile(const Profile& p);
 
@@ -188,21 +193,21 @@ void setCameraFromProfile(const Profile& p);
  * Reads a list of modules from a profile, and executes scripts based on whether or
  * not the corresponding module is loaded.
  *
- * \param p The Profile to be read.
+ * \param p The Profile to be read
  */
 void setModulesFromProfile(const Profile& p);
 
 /**
  * Registers actions from the contents of a profile.
  *
- * \param p The Profile to be read.
+ * \param p The Profile to be read
  */
 void setActionsFromProfile(const Profile& p);
 
 /**
  * Registers keybindings from the contents of a profile.
  *
- * \param p The Profile to be read.
+ * \param p The Profile to be read
  */
 void setKeybindingsFromProfile(const Profile& p);
 
@@ -211,7 +216,7 @@ void setKeybindingsFromProfile(const Profile& p);
  * If any nodes are listed, a script to mark these will be queued with the
  * script engine.
  *
- * \param p The Profile to be read.
+ * \param p The Profile to be read
  */
 void setMarkInterestingNodesFromProfile(const Profile& p);
 
@@ -220,7 +225,7 @@ void setMarkInterestingNodesFromProfile(const Profile& p);
  * at the end of the initialization. Any openspace lua commands are allowed,
  * and will be added to the script queue.
  *
- * \param p The Profile to be read.
+ * \param p The Profile to be read
  */
 void setAdditionalScriptsFromProfile(const Profile& p);
 
diff --git a/include/openspace/engine/syncengine.h b/include/openspace/engine/syncengine.h
index 1b5107d4ba..fb6d9933f2 100644
--- a/include/openspace/engine/syncengine.h
+++ b/include/openspace/engine/syncengine.h
@@ -36,72 +36,71 @@ namespace openspace {
 class Syncable;
 
 /**
- * Manages a collection of `Syncable`s and ensures they are synchronized
- * over SGCT nodes. Encoding/Decoding order is handles internally.
+ * Manages a collection of `Syncable`s and ensures they are synchronized over SGCT nodes.
+ * Encoding/Decoding order is handles internally.
  */
 class SyncEngine {
 public:
     BooleanType(IsMaster);
 
     /**
-     * Creates a new SyncEngine which a buffer size of \p syncBufferSize
+     * Creates a new SyncEngine which a buffer size of \p syncBufferSize.
+     *
      * \pre syncBufferSize must be bigger than 0
      */
     SyncEngine(unsigned int syncBufferSize);
 
     /**
-     * Encodes all added Syncables in the injected `SyncBuffer`.
-     * This method is only called on the SGCT master node
+     * Encodes all added Syncables in the injected `SyncBuffer`. This method is only
+     * called on the SGCT master node.
      */
     std::vector<std::byte> encodeSyncables();
 
     /**
-     * Decodes the `SyncBuffer` into the added Syncables.
-     * This method is only called on the SGCT client nodes
+     * Decodes the `SyncBuffer` into the added Syncables. This method is only called on
+     * the SGCT client nodes.
      */
     void decodeSyncables(std::vector<std::byte> data);
 
     /**
-     * Invokes the presync method of all added Syncables
+     * Invokes the presync method of all added Syncables.
      */
     void preSynchronization(IsMaster isMaster);
 
     /**
-     * Invokes the postsync method of all added Syncables
+     * Invokes the postsync method of all added Syncables.
      */
     void postSynchronization(IsMaster isMaster);
 
     /**
      * Add a Syncable to be synchronized over the SGCT cluster.
-     * \pre syncable must not be nullptr
+     *
+     * \pre syncable must not be `nullptr`
      */
     void addSyncable(Syncable* syncable);
 
     /**
-     * Add multiple Syncables to be synchronized over the SGCT cluster
+     * Add multiple Syncables to be synchronized over the SGCT cluster.
+     *
      * \pre syncables must not contain any nullptr
      */
     void addSyncables(const std::vector<Syncable*>& syncables);
 
     /**
-     * Remove a Syncable from being synchronized over the SGCT cluster
+     * Remove a Syncable from being synchronized over the SGCT cluster.
      */
     void removeSyncable(Syncable* syncable);
 
     /**
-    * Remove multiple Syncables from being synchronized over the SGCT cluster
+    * Remove multiple Syncables from being synchronized over the SGCT cluster.
     */
     void removeSyncables(const std::vector<Syncable*>& syncables);
 
 private:
-    /**
-     * Vector of Syncables. The vectors ensures consistent encode/decode order
-     */
+    /// Vector of Syncables. The vectors ensures consistent encode/decode order.
     std::vector<Syncable*> _syncables;
 
-    /**
-     * Databuffer used in encoding/decoding
-     */
+    /// Databuffer used in encoding/decoding
     SyncBuffer _syncBuffer;
 };
 
diff --git a/include/openspace/events/event.h b/include/openspace/events/event.h
index 08f15512d9..9f2f344bae 100644
--- a/include/openspace/events/event.h
+++ b/include/openspace/events/event.h
@@ -111,7 +111,7 @@ void logAllEvents(const Event* e);
 //
 
 /**
- * This event is created whenever a new scene graph node is added to the system.  By the
+ * This event is created whenever a new scene graph node is added to the system. By the
  * time this event is signalled, the scene graph node has already been created and added
  * to the scene.
  */
@@ -130,7 +130,7 @@ struct EventSceneGraphNodeAdded : public Event {
 };
 
 /**
- * This event is created whenever a scene graph node was removed.  By the time this event
+ * This event is created whenever a scene graph node was removed. By the time this event
  * is signalled, the scene graph node has already been removed.
  */
 struct EventSceneGraphNodeRemoved : public Event {
@@ -164,7 +164,7 @@ struct EventParallelConnection : public Event {
     /**
      * Creates an instance of an EventParallelConnection event.
      *
-     * \param state_ The new state of the parallel connection system;  is one of
+     * \param state_ The new state of the parallel connection system; is one of
      *        `Established`, `Lost`, `HostshipGained`, or `HostshipLost`
      */
     explicit EventParallelConnection(State state_);
@@ -201,8 +201,8 @@ struct EventApplicationShutdown : public Event {
     /**
      * Creates an instance of an EventApplicationShutdown event.
      *
-     * \param state_ The next state of the application shutdown sequence;  is one of
-     *        `Started`, `Aborted`,  or `Finished`
+     * \param state_ The next state of the application shutdown sequence; is one of
+     *        `Started`, `Aborted`, or `Finished`
      */
     explicit EventApplicationShutdown(State state_);
     const State state;
@@ -210,7 +210,7 @@ struct EventApplicationShutdown : public Event {
 
 /**
  * This event is created when a new screenspace renderable has been created.  By the time
- * this event is craeted, the screenspace renderable is already registered and available.
+ * this event is created, the screenspace renderable is already registered and available.
  */
 struct EventScreenSpaceRenderableAdded : public Event {
     static constexpr Type Type = Event::Type::ScreenSpaceRenderableAdded;
@@ -229,7 +229,7 @@ struct EventScreenSpaceRenderableAdded : public Event {
 /**
  * This event is created when a screenspace renderable has been removed from the system.
  * When this event is created, the screenspace renderable has already been removed and is
- * no longer available
+ * no longer available.
  */
 struct EventScreenSpaceRenderableRemoved : public Event {
     static constexpr Type Type = Event::Type::ScreenSpaceRenderableRemoved;
@@ -248,18 +248,18 @@ struct EventScreenSpaceRenderableRemoved : public Event {
  * distances. Right now, only movement relative to camera's focus node is considered.
  * Each scene graph node has an interaction sphere radius that serves as the reference
  * distance for all spheres.
-```
-Diagram of events for a camera moving from right-to-left. Interaction sphere is 'O' in
-middle, and ')' are spherical boundaries. The approach factor, reach factor, and
-interaction sphere radius are all taken from the current focus node.
-
-|<------------------->|  Approach factor * Interaction sphere
-             |<------>|  Reach Factor * Interaction sphere
-
-(                       (           O          )                       )
-^                       ^                      ^                       ^
-Exiting                 Receding               Reaching                Approaching
-```
+ * ```
+ * Diagram of events for a camera moving from right-to-left. Interaction sphere is 'O' in
+ * middle, and ')' are spherical boundaries. The approach factor, reach factor, and
+ * interaction sphere radius are all taken from the current focus node.
+ *
+ * |<------------------->|  Approach factor * Interaction sphere
+ *              |<------>|  Reach Factor * Interaction sphere
+ *
+ * (                       (           O          )                       )
+ * ^                       ^                      ^                       ^
+ * Exiting                 Receding               Reaching                Approaching
+ * ```
  */
 struct EventCameraFocusTransition : public Event {
     static constexpr Type Type = Event::Type::CameraFocusTransition;
@@ -347,7 +347,7 @@ struct EventPlanetEclipsed : public Event {
 
 /**
  * This event is created when the interpolation of a property value is finished. If the
- * interpolation time of a property change is 0s, this event is not fired
+ * interpolation time of a property change is 0s, this event is not fired.
  */
 struct EventInterpolationFinished : public Event {
     static constexpr Type Type = Event::Type::InterpolationFinished;
@@ -562,7 +562,7 @@ struct EventCameraPathFinished : public Event {
 };
 
 /**
- * This event is created when the a camera moves location
+ * This event is created when the a camera moves location.
  */
 struct EventCameraMovedPosition : public Event {
     static constexpr Type Type = Event::Type::CameraMovedPosition;
diff --git a/include/openspace/events/eventengine.h b/include/openspace/events/eventengine.h
index 212a0305af..b0a84b79c3 100644
--- a/include/openspace/events/eventengine.h
+++ b/include/openspace/events/eventengine.h
@@ -48,7 +48,7 @@ public:
      * This function returns the first event stored in the EventEngine, or `nullptr` if
      * no event exists. To navigate the full list of events, you can access the returned
      * Event's next function. If the end of the list is reached, the next pointer will be
-     * a nullptr
+     * a `nullptr`.
      *
      * \return The first event stored in the EventEngine or nullptr if no event exists
      */
@@ -57,11 +57,11 @@ public:
     /**
      * Publish a new event of type T by providing optional arguments Args to the Event's
      * constructor. An example of usage is
-     * `engine.publishEvent<MyEvent>("a", 2.0);` which would call the
-     * constructor of `MyEvent` with a `const char*` and `double` parameter.
+     * `engine.publishEvent<MyEvent>("a", 2.0);` which would call the constructor of
+     * `MyEvent` with a `const char*` and `double` parameter.
      *
-     * \param args The arguments that are passed to the constructor of T
      * \tparam T The subclass of Event that is to be published
+     * \param args The arguments that are passed to the constructor of T
      */
     template <typename T, typename... Args>
     void publishEvent(Args&&... args);
@@ -101,7 +101,7 @@ public:
     /**
      * Removing registration for a specific event identified by the \p identifier.
      *
-     * \param identifier The unique identifier of the event that should be removed.
+     * \param identifier The unique identifier of the event that should be removed
      */
     void unregisterEventAction(uint32_t identifier);
 
@@ -130,7 +130,7 @@ public:
 
     /**
      * Triggers all actions that are registered for events that are in the current event
-     * queue
+     * queue.
      */
     void triggerActions() const;
 
@@ -144,10 +144,9 @@ private:
     /// The last event in the chain of events stored in the memory pool
     events::Event* _lastEvent = nullptr;
 
-
-    // The type is duplicated in the ActionInfo as well, but we want it in the ActionInfo
-    // to be able to return them to a caller and we want it in this unordered_map to make
-    // the lookup really fast. So having this extra wasted memory is probably worth it
+    /// The type is duplicated in the ActionInfo as well, but we want it in the ActionInfo
+    /// to be able to return them to a caller and we want it in this unordered_map to make
+    /// the lookup really fast. So having this extra wasted memory is probably worth it
     std::unordered_map<events::Event::Type, std::vector<ActionInfo>> _eventActions;
 
     static uint32_t nextRegisteredEventId;
diff --git a/include/openspace/interaction/camerainteractionstates.h b/include/openspace/interaction/camerainteractionstates.h
index b220db6115..5e31c37c5f 100644
--- a/include/openspace/interaction/camerainteractionstates.h
+++ b/include/openspace/interaction/camerainteractionstates.h
@@ -33,9 +33,9 @@ namespace openspace::interaction {
 class CameraInteractionStates {
 public:
     /**
-     * \param sensitivity
-     * \param velocityScaleFactor can be set to 60 to remove the inertia of the
-     * interaction. Lower value will make it harder to move the camera.
+     * \param sensitivity Interaction sensitivity
+     * \param velocityScaleFactor Can be set to 60 to remove the inertia of the
+     *        interaction. Lower value will make it harder to move the camera
      */
     CameraInteractionStates(double sensitivity, double velocityScaleFactor);
     virtual ~CameraInteractionStates() = default;
@@ -54,9 +54,9 @@ public:
 
     void resetVelocities();
 
-    /*
-     * Returns true if any of the velocities are larger than zero,
-     * i.e. wether an interaction happened
+    /**
+     * Returns true if any of the velocities are larger than zero, i.e. wether an
+     * interaction happened.
      */
     bool hasNonZeroVelocities(bool checkOnlyMovement = false);
 
diff --git a/include/openspace/interaction/delayedvariable.h b/include/openspace/interaction/delayedvariable.h
index 7f71c8f13b..67046c7bdf 100644
--- a/include/openspace/interaction/delayedvariable.h
+++ b/include/openspace/interaction/delayedvariable.h
@@ -28,9 +28,9 @@
 namespace openspace::interaction {
 
 /**
- * Class that acts as a smoothing filter to a variable. The filter has a step
- * response on a form that resembles the function y = 1-e^(-t/scale). The variable
- * will be updated as soon as it is set to a value (calling the set() function).
+ * Class that acts as a smoothing filter to a variable. The filter has a step response on
+ * a form that resembles the function y = 1-e^(-t/scale). The variable will be updated as
+ * soon as it is set to a value (calling the set() function).
  */
 template <typename T, typename ScaleType>
 class DelayedVariable {
diff --git a/include/openspace/interaction/interactionmonitor.h b/include/openspace/interaction/interactionmonitor.h
index 9cd80e210d..6cc2907a0e 100644
--- a/include/openspace/interaction/interactionmonitor.h
+++ b/include/openspace/interaction/interactionmonitor.h
@@ -52,7 +52,7 @@ public:
 
     /*
      * Called from all places we want to mark activity from. Updates the last registered
-     * interaction time
+     * interaction time.
      */
     void markInteraction();
 
diff --git a/include/openspace/interaction/interpolator.h b/include/openspace/interaction/interpolator.h
index 867b63ab66..d017bd8618 100644
--- a/include/openspace/interaction/interpolator.h
+++ b/include/openspace/interaction/interpolator.h
@@ -29,7 +29,7 @@
 
 namespace openspace::interaction {
 
-/*
+/**
  * Interpolates a typename T using a transfer function.
  */
 template <typename T>
diff --git a/include/openspace/interaction/joystickinputstate.h b/include/openspace/interaction/joystickinputstate.h
index 76f68ff437..6c9cd42fa0 100644
--- a/include/openspace/interaction/joystickinputstate.h
+++ b/include/openspace/interaction/joystickinputstate.h
@@ -37,7 +37,7 @@ namespace openspace::interaction {
 
 /**
  * Actions that any button of a joystick can have. Each button must be in one of these
- * states
+ * states.
  */
 enum class JoystickAction : uint8_t {
     /// Idle state if the button is unpressed and has been unpressed since last frame
@@ -81,7 +81,7 @@ struct JoystickInputStates : public std::array<JoystickInputState, MaxJoysticks>
     static constexpr int MaxNumJoysticks = 16;
 
     /**
-     * This function return the number of axes the joystick with the given name has
+     * This function return the number of axes the joystick with the given name has.
      *
      * \param joystickName The name of the joystick to check how many axes it has,
      *        if empty the max number of axes for all joysticks are returned
@@ -90,7 +90,7 @@ struct JoystickInputStates : public std::array<JoystickInputState, MaxJoysticks>
     int numAxes(const std::string& joystickName = "") const;
 
     /**
-     * This function return the number of buttons the joystick with the given name has
+     * This function return the number of buttons the joystick with the given name has.
      *
      * \param joystickName The name of the joystick to check how many buttons it has,
      *        if empty the max number of buttons for all joysticks are returned
diff --git a/include/openspace/interaction/sessionrecording.h b/include/openspace/interaction/sessionrecording.h
index 0741e4e6f6..284ea1e459 100644
--- a/include/openspace/interaction/sessionrecording.h
+++ b/include/openspace/interaction/sessionrecording.h
@@ -72,9 +72,9 @@ public:
         double timeSim;
     };
 
-    /*
-     * Struct for storing a script substring that, if found in a saved script,
-     * will be replaced by its substringReplacement counterpart.
+    /**
+     * Struct for storing a script substring that, if found in a saved script, will be
+     * replaced by its substringReplacement counterpart.
      */
     struct ScriptSubstringReplace {
         std::string substringFound;
@@ -110,9 +110,9 @@ public:
     void deinitialize();
 
     /**
-     * This is called with every rendered frame. If in recording state, the camera
-     * state will be saved to the recording file (if its state has changed since last).
-     * If in playback state, the next keyframe will be used (if it is time to do so).
+     * This is called with every rendered frame. If in recording state, the camera state
+     * will be saved to the recording file (if its state has changed since last). If in
+     * playback state, the next keyframe will be used (if it is time to do so).
      */
     void preSynchronization();
 
@@ -123,12 +123,12 @@ public:
     void render();
 
     /**
-     * Current time based on playback mode
+     * Current time based on playback mode.
      */
     double currentTime() const;
 
     /**
-     * Fixed delta time set by user for use during saving of frame during playback mode
+     * Fixed delta time set by user for use during saving of frame during playback mode.
      */
     double fixedDeltaTimeDuringFrameOutput() const;
 
@@ -140,9 +140,8 @@ public:
      * However, during playback it is incremented by the fixed framerate of the playback
      * rather than the actual clock value (as in normal operation).
      *
-     * \returns number of microseconds elapsed since playback started in terms of the
-     *          number of rendered frames multiplied by the fixed time increment per
-     *          frame
+     * \return Number of microseconds elapsed since playback started in terms of the
+     *         number of rendered frames multiplied by the fixed time increment per frame
      */
     std::chrono::steady_clock::time_point currentPlaybackInterpolationTime() const;
 
@@ -151,28 +150,27 @@ public:
      * used when playback is set to be in the mode where a screenshot is captured with
      * every rendered frame (enableTakeScreenShotDuringPlayback() is used to enable this
      * mode). At the start of playback, this timer is set to the value of the current
-     * applicationTime function provided by the window delegate (used during normal
-     * mode or playback). However, during playback it is incremented by the fixed
-     * framerate of the playback rather than the actual clock value.
+     * applicationTime function provided by the window delegate (used during normal mode
+     * or playback). However, during playback it is incremented by the fixed framerate of
+     * the playback rather than the actual clock value.
      *
-     * \returns application time in seconds, for use in playback-with-frames mode
+     * \return Application time in seconds, for use in playback-with-frames mode
      */
     double currentApplicationInterpolationTime() const;
 
     /**
-     * Starts a recording session, which will save data to the provided filename
-     * according to the data format specified, and will continue until recording is
-     * stopped using stopRecording() method.
+     * Starts a recording session, which will save data to the provided filename according
+     * to the data format specified, and will continue until recording is stopped using
+     * stopRecording() method.
      *
-     * \param filename file saved with recorded keyframes.
-     *
-     * \returns true if recording to file starts without errors.
+     * \param filename File saved with recorded keyframes
+     * \return `true` if recording to file starts without errors
      */
     bool startRecording(const std::string& filename);
 
     /**
-     * Starts a recording session, which will save data to the provided filename
-     * in ASCII data format until recording is stopped using stopRecording() method.
+     * Starts a recording session, which will save data to the provided filename in ASCII
+     * data format until recording is stopped using stopRecording() method.
      *
      * \param dataMode The format in which the session recording is stored
      */
@@ -187,23 +185,23 @@ public:
     /**
      * Used to check if a session recording is in progress.
      *
-     * \return true if recording is in progress
+     * \return `true` if recording is in progress
      */
     bool isRecording() const;
 
     /**
      * Starts a playback session, which can run in one of three different time modes.
      *
-     * \param filename file containing recorded keyframes to play back. The file path
-     *                 is relative to the base recordings directory specified in the
-     *                 config file by the RECORDINGS variable
-     * \param timeMode which of the 3 time modes to use for time reference during
-     * \param forceSimTimeAtStart if true simulation time is forced to that of playback
+     * \param filename File containing recorded keyframes to play back. The file path is
+     *                 relative to the base recordings directory specified in the config
+     *                 file by the RECORDINGS variable
+     * \param timeMode Which of the 3 time modes to use for time reference during
+     * \param forceSimTimeAtStart If true simulation time is forced to that of playback
      *        playback: recorded time, application time, or simulation time. See the
      *        LuaLibrary entry for SessionRecording for details on these time modes
-     * \param loop if true then the file will playback in loop mode, continuously
-     *             looping back to the beginning until it is manually stopped
-     * \param shouldWaitForFinishedTiles if true, the playback will wait for tiles to be
+     * \param loop If true then the file will playback in loop mode, continuously looping
+     *        back to the beginning until it is manually stopped
+     * \param shouldWaitForFinishedTiles If true, the playback will wait for tiles to be
      *        finished before progressing to the next frame. This value is only used when
      *        `enableTakeScreenShotDuringPlayback` was called before. Otherwise this value
      *        will be ignored
@@ -214,8 +212,8 @@ public:
         bool forceSimTimeAtStart, bool loop, bool shouldWaitForFinishedTiles);
 
     /**
-     * Used to stop a playback in progress. If open, the playback file will be closed,
-     * and all keyframes deleted from memory.
+     * Used to stop a playback in progress. If open, the playback file will be closed, and
+     * all keyframes deleted from memory.
      */
     void stopPlayback();
 
@@ -227,33 +225,34 @@ public:
     bool isPlaybackPaused();
 
     /**
-     * Pauses a playback session. This does both the normal pause functionality of
-     * setting simulation delta time to zero, and pausing the progression through the
-     * timeline.
+     * Pauses a playback session. This does both the normal pause functionality of setting
+     * simulation delta time to zero, and pausing the progression through the timeline.
      *
-     * \param pause if true, then will set playback timeline progression to zero
+     * \param pause If `true`, then will set playback timeline progression to zero
      */
     void setPlaybackPause(bool pause);
 
     /**
-     * Enables that rendered frames should be saved during playback
+     * Enables that rendered frames should be saved during playback.
+     *
      * \param fps Number of frames per second.
      */
     void enableTakeScreenShotDuringPlayback(int fps);
 
     /**
-     * Used to disable that renderings are saved during playback
+     * Used to disable that renderings are saved during playback.
      */
     void disableTakeScreenShotDuringPlayback();
 
     /**
      * Used to check if a session playback is in progress.
-     * \returns true if playback is in progress.
+     *
+     * \return `true` if playback is in progress
      */
     bool isPlayingBack() const;
 
     /**
-     * Is saving frames during playback
+     * Is saving frames during playback.
      */
     bool isSavingFramesDuringPlayback() const;
 
@@ -289,15 +288,14 @@ public:
 
     /**
      * \return The Lua library that contains all Lua functions available to affect the
-     * interaction
+     *         interaction
      */
     static openspace::scripting::LuaLibrary luaLibrary();
 
     /**
      * Used to request a callback for notification of playback state change.
      *
-     * \param cb function handle for callback
-     *
+     * \param cb Function handle for callback
      * \return CallbackHandle value of callback number
      */
     CallbackHandle addStateChangeCallback(StateChangeCallback cb);
@@ -305,14 +303,14 @@ public:
     /**
      * Removes the callback for notification of playback state change.
      *
-     * \param callback function handle for the callback
+     * \param callback Function handle for the callback
      */
     void removeStateChangeCallback(CallbackHandle callback);
 
     /**
      * Provides list of available playback files.
      *
-     * \return vector of filenames in recordings dir
+     * \return Vector of filenames in recordings dir
      */
     std::vector<std::string> playbackList() const;
 
@@ -320,12 +318,11 @@ public:
      * Reads a camera keyframe from a binary format playback file, and populates input
      * references with the parameters of the keyframe.
      *
-     * \param times reference to a timestamps structure which contains recorded times
-     * \param kf reference to a camera keyframe which contains camera details
-     * \param file an ifstream reference to the playback file being read
-     * \param lineN keyframe number in playback file where this keyframe resides
-     *
-     * \return true if data read has no errors
+     * \param times Reference to a timestamps structure which contains recorded times
+     * \param kf Reference to a camera keyframe which contains camera details
+     * \param file An ifstream reference to the playback file being read
+     * \param lineN Keyframe number in playback file where this keyframe resides
+     * \return `true` if data read has no errors
      */
     bool readCameraKeyframeBinary(Timestamps& times,
         datamessagestructures::CameraKeyframe& kf, std::ifstream& file, int lineN);
@@ -334,12 +331,11 @@ public:
      * Reads a camera keyframe from an ascii format playback file, and populates input
      * references with the parameters of the keyframe.
      *
-     * \param times reference to a timestamps structure which contains recorded times
-     * \param kf reference to a camera keyframe which contains camera details
-     * \param currentParsingLine string containing the most current line that was read
-     * \param lineN line number in playback file where this keyframe resides
-     *
-     * \return true if data read has no errors
+     * \param times Reference to a timestamps structure which contains recorded times
+     * \param kf Reference to a camera keyframe which contains camera details
+     * \param currentParsingLine String containing the most current line that was read
+     * \param lineN Line number in playback file where this keyframe resides
+     * \return `true` if data read has no errors
      */
     bool readCameraKeyframeAscii(Timestamps& times,
         datamessagestructures::CameraKeyframe& kf, std::string currentParsingLine,
@@ -349,12 +345,11 @@ public:
      * Reads a time keyframe from a binary format playback file, and populates input
      * references with the parameters of the keyframe.
      *
-     * \param times reference to a timestamps structure which contains recorded times
-     * \param kf reference to a time keyframe which contains time details
-     * \param file an ifstream reference to the playback file being read
-     * \param lineN keyframe number in playback file where this keyframe resides
-     *
-     * \return true if data read has no errors
+     * \param times Reference to a timestamps structure which contains recorded times
+     * \param kf Reference to a time keyframe which contains time details
+     * \param file An ifstream reference to the playback file being read
+     * \param lineN Keyframe number in playback file where this keyframe resides
+     * \return `true` if data read has no errors
      */
     bool readTimeKeyframeBinary(Timestamps& times,
         datamessagestructures::TimeKeyframe& kf, std::ifstream& file, int lineN);
@@ -363,12 +358,11 @@ public:
      * Reads a time keyframe from an ascii format playback file, and populates input
      * references with the parameters of the keyframe.
      *
-     * \param times reference to a timestamps structure which contains recorded times
-     * \param kf reference to a time keyframe which contains time details
-     * \param currentParsingLine string containing the most current line that was read
-     * \param lineN line number in playback file where this keyframe resides
-     *
-     * \return true if data read has no errors
+     * \param times Reference to a timestamps structure which contains recorded times
+     * \param kf Reference to a time keyframe which contains time details
+     * \param currentParsingLine String containing the most current line that was read
+     * \param lineN Line number in playback file where this keyframe resides
+     * \return `true` if data read has no errors
      */
     bool readTimeKeyframeAscii(Timestamps& times,
         datamessagestructures::TimeKeyframe& kf, std::string currentParsingLine,
@@ -378,13 +372,12 @@ public:
      * Reads a script keyframe from a binary format playback file, and populates input
      * references with the parameters of the keyframe.
      *
-     * \param times reference to a timestamps structure which contains recorded times
-     * \param kf reference to a script keyframe which contains the size of the script
-     *        (in chars) and the text itself
-     * \param file an ifstream reference to the playback file being read
-     * \param lineN keyframe number in playback file where this keyframe resides
-     *
-     * \return true if data read has no errors
+     * \param times Reference to a timestamps structure which contains recorded times
+     * \param kf Reference to a script keyframe which contains the size of the script (in
+     *        chars) and the text itself
+     * \param file An ifstream reference to the playback file being read
+     * \param lineN Keyframe number in playback file where this keyframe resides
+     * \return `true` if data read has no errors
      */
     bool readScriptKeyframeBinary(Timestamps& times,
         datamessagestructures::ScriptMessage& kf, std::ifstream& file, int lineN);
@@ -393,36 +386,35 @@ public:
      * Reads a script keyframe from an ascii format playback file, and populates input
      * references with the parameters of the keyframe.
      *
-     * \param times reference to a timestamps structure which contains recorded times
-     * \param kf reference to a script keyframe which contains the size of the script
-     *        (in chars) and the text itself
-     * \param currentParsingLine string containing the most current line that was read
-     * \param lineN line number in playback file where this keyframe resides
-     *
-     * \return true if data read has no errors
+     * \param times Reference to a timestamps structure which contains recorded times
+     * \param kf Reference to a script keyframe which contains the size of the script (in
+     *        chars) and the text itself
+     * \param currentParsingLine String containing the most current line that was read
+     * \param lineN Line number in playback file where this keyframe resides
+     * \return `true` if data read has no errors
      */
     bool readScriptKeyframeAscii(Timestamps& times,
         datamessagestructures::ScriptMessage& kf, std::string currentParsingLine,
         int lineN);
 
     /**
-     * Writes a camera keyframe to a binary format recording file using a CameraKeyframe
+     * Writes a camera keyframe to a binary format recording file using a CameraKeyframe.
      *
-     * \param times reference to a timestamps structure which contains recorded times
-     * \param kf reference to a camera keyframe which contains the camera details
-     * \param kfBuffer a buffer temporarily used for preparing data to be written
-     * \param file an ofstream reference to the recording file being written-to
+     * \param times Reference to a timestamps structure which contains recorded times
+     * \param kf Reference to a camera keyframe which contains the camera details
+     * \param kfBuffer A buffer temporarily used for preparing data to be written
+     * \param file An ofstream reference to the recording file being written-to
      */
     void saveCameraKeyframeBinary(Timestamps& times,
         datamessagestructures::CameraKeyframe& kf, unsigned char* kfBuffer,
         std::ofstream& file);
 
     /**
-     * Writes a camera keyframe to an ascii format recording file using a CameraKeyframe
+     * Writes a camera keyframe to an ascii format recording file using a CameraKeyframe.
      *
-     * \param times reference to a timestamps structure which contains recorded times
-     * \param kf reference to a camera keyframe which contains the camera details
-     * \param file an ofstream reference to the recording file being written-to
+     * \param times Reference to a timestamps structure which contains recorded times
+     * \param kf Reference to a camera keyframe which contains the camera details
+     * \param file An ofstream reference to the recording file being written-to
      */
     void saveCameraKeyframeAscii(Timestamps& times,
         datamessagestructures::CameraKeyframe& kf, std::ofstream& file);
@@ -430,113 +422,111 @@ public:
     /**
      * Writes a time keyframe to a binary format recording file using a TimeKeyframe
      *
-     * \param times reference to a timestamps structure which contains recorded times
-     * \param kf reference to a time keyframe which contains the time details
-     * \param kfBuffer a buffer temporarily used for preparing data to be written
-     * \param file an ofstream reference to the recording file being written-to
+     * \param times Reference to a timestamps structure which contains recorded times
+     * \param kf Reference to a time keyframe which contains the time details
+     * \param kfBuffer A buffer temporarily used for preparing data to be written
+     * \param file An ofstream reference to the recording file being written-to
      */
     void saveTimeKeyframeBinary(Timestamps& times,
         datamessagestructures::TimeKeyframe& kf, unsigned char* kfBuffer,
         std::ofstream& file);
 
     /**
-     * Writes a time keyframe to an ascii format recording file using a TimeKeyframe
+     * Writes a time keyframe to an ascii format recording file using a TimeKeyframe.
      *
-     * \param times reference to a timestamps structure which contains recorded times
-     * \param kf reference to a time keyframe which contains the time details
-     * \param file an ofstream reference to the recording file being written-to
+     * \param times Reference to a timestamps structure which contains recorded times
+     * \param kf Reference to a time keyframe which contains the time details
+     * \param file An ofstream reference to the recording file being written-to
      */
     void saveTimeKeyframeAscii(Timestamps& times,
         datamessagestructures::TimeKeyframe& kf, std::ofstream& file);
 
     /**
-     * Writes a script keyframe to a binary format recording file using a ScriptMessage
+     * Writes a script keyframe to a binary format recording file using a ScriptMessage.
      *
-     * \param times reference to a timestamps structure which contains recorded times
-     * \param sm reference to a ScriptMessage object which contains the script details
-     * \param smBuffer a buffer temporarily used for preparing data to be written
-     * \param file an ofstream reference to the recording file being written-to
+     * \param times Reference to a timestamps structure which contains recorded times
+     * \param sm Reference to a ScriptMessage object which contains the script details
+     * \param smBuffer A buffer temporarily used for preparing data to be written
+     * \param file An ofstream reference to the recording file being written-to
      */
     void saveScriptKeyframeBinary(Timestamps& times,
         datamessagestructures::ScriptMessage& sm, unsigned char* smBuffer,
         std::ofstream& file);
 
     /**
-     * Writes a script keyframe to an ascii format recording file using a ScriptMessage
+     * Writes a script keyframe to an ascii format recording file using a ScriptMessage.
      *
-     * \param times reference to a timestamps structure which contains recorded times
-     * \param sm reference to a ScriptMessage which contains the script details
-     * \param file an ofstream reference to the recording file being written-to
+     * \param times Reference to a timestamps structure which contains recorded times
+     * \param sm Reference to a ScriptMessage which contains the script details
+     * \param file An ofstream reference to the recording file being written-to
      */
     void saveScriptKeyframeAscii(Timestamps& times,
         datamessagestructures::ScriptMessage& sm, std::ofstream& file);
 
     /**
      * Since session recordings only record changes, the initial conditions aren't
-     * preserved when a playback starts. This function is called whenever a property
-     * value is set and a recording is in progress. Before the set happens, this
-     * function will read the current value of the property and store it so that when
-     * the recording is finished, the initial state will be added as a set property
-     * command at the beginning of the recording file, to be applied when playback
-     * starts.
+     * preserved when a playback starts. This function is called whenever a property value
+     * is set and a recording is in progress. Before the set happens, this function will
+     * read the current value of the property and store it so that when the recording is
+     * finished, the initial state will be added as a set property command at the
+     * beginning of the recording file, to be applied when playback starts.
      *
      * \param prop The property being set
      */
     void savePropertyBaseline(properties::Property& prop);
 
     /**
-     * Reads header information from a session recording file
+     * Reads header information from a session recording file.
      *
-     * \param stream reference to ifstream that contains the session recording file data
-     * \param readLen_chars number of characters to be read, which may be the expected
+     * \param stream Reference to ifstream that contains the session recording file data
+     * \param readLen_chars Number of characters to be read, which may be the expected
      *        length of the header line, or an arbitrary number of characters within it
      */
     static std::string readHeaderElement(std::ifstream& stream, size_t readLen_chars);
 
     /**
-     * Reads header information from a session recording file
+     * Reads header information from a session recording file.
      *
-     * \param stream reference to ifstream that contains the session recording file
-     *        data
-     * \param readLen_chars number of characters to be read, which may be the expected
+     * \param stream Reference to ifstream that contains the session recording file data
+     * \param readLen_chars Number of characters to be read, which may be the expected
      *        length of the header line, or an arbitrary number of characters within it
      */
     static std::string readHeaderElement(std::stringstream& stream, size_t readLen_chars);
 
     /**
-     * Writes a header to a binary recording file buffer
+     * Writes a header to a binary recording file buffer.
      *
-     * \param times reference to a timestamps structure which contains recorded times
-     * \param type single character signifying the keyframe type
-     * \param kfBuffer the char buffer holding the recording info to be written
-     * \param idx index into write buffer (this is updated with the num of chars written)
+     * \param times Reference to a timestamps structure which contains recorded times
+     * \param type Single character signifying the keyframe type
+     * \param kfBuffer The char buffer holding the recording info to be written
+     * \param idx Index into write buffer (this is updated with the num of chars written)
      */
     static void saveHeaderBinary(Timestamps& times, char type, unsigned char* kfBuffer,
         size_t& idx);
 
     /**
-     * Writes a header to an ascii recording file buffer
+     * Writes a header to an ASCII recording file buffer.
      *
-     * \param times reference to a timestamps structure which contains recorded times
-     * \param type string signifying the keyframe type
-     * \param line the stringstream buffer being written to
+     * \param times Reference to a timestamps structure which contains recorded times
+     * \param type String signifying the keyframe type
+     * \param line The stringstream buffer being written to
      */
     static void saveHeaderAscii(Timestamps& times, const std::string& type,
         std::stringstream& line);
 
     /**
-     * Saves a keyframe to an ascii recording file
+     * Saves a keyframe to an ASCII recording file.
      *
-     * \param entry the ascii string version of the keyframe (any type)
-     * \param file ofstream object to write to
+     * \param entry The ASCII string version of the keyframe (any type)
+     * \param file `std::ofstream` object to write to
      */
     static void saveKeyframeToFile(std::string entry, std::ofstream& file);
 
     /**
-     * Checks if a specified recording file ends with a particular file extension
+     * Checks if a specified recording file ends with a particular file extension.
      *
-     * \param filename the name of the file to record to
-     * \param extension the file extension to check for
+     * \param filename The name of the file to record to
+     * \param extension The file extension to check for
      */
     static bool hasFileExtension(std::string filename, std::string extension);
 
@@ -545,10 +535,9 @@ public:
      * (will determine the file format conversion to convert from based on the file's
      * header version number).
      *
-     * \param filename name of the file to convert
+     * \param filename Name of the file to convert
      * \param depth iteration number to prevent runaway recursion (init call with zero)
-     *
-     * \return string containing the filename of the previous conversion step. This is
+     * \return String containing the filename of the previous conversion step. This is
      *         used if there are multiple conversion steps where each step has to use
      *         the output of the previous.
      */
@@ -558,43 +547,42 @@ public:
      * Converts file format of a session recording file to the current format version
      * (will determine the file format conversion to convert from based on the file's
      * header version number). Accepts a relative path (currently from task runner dir)
-     * rather than a path assumed to be relative to ${RECORDINGS}.
+     * rather than a path assumed to be relative to `${RECORDINGS}`.
      *
      * \param filenameRelative name of the file to convert
      */
     void convertFileRelativePath(std::string filenameRelative);
 
     /**
-     * Goes to legacy session recording inherited class, and calls its convertFile()
+     * Goes to legacy session recording inherited class, and calls its #convertFile
      * method, and then returns the resulting conversion filename.
      *
-     * \param filename name of the file to convert
-     * \param depth iteration number to prevent runaway recursion (init call with zero)
-     *
+     * \param filename Name of the file to convert
+     * \param depth Iteration number to prevent runaway recursion (init call with zero)
      * \return string containing the filename of the conversion
      */
     virtual std::string getLegacyConversionResult(std::string filename, int depth);
 
-    /*
-     * Version string for file format version currently supported by this class
+    /**
+     * Version string for file format version currently supported by this class.
      *
      * \return string of the file format version this class supports
      */
     virtual std::string fileFormatVersion();
 
-    /*
-     * Version string for file format version that a conversion operation will convert
-     * to (e.g. upgrades to this version). This is only relevant for inherited classes
-     * that support conversion from legacy versions (if called in the base class, it
-     * will return its own current version).
+    /**
+     * Version string for file format version that a conversion operation will convert to
+     * (e.g. upgrades to this version). This is only relevant for inherited classes that
+     * support conversion from legacy versions (if called in the base class, it will
+     * return its own current version).
      *
      * \return string of the file format version this class supports
      */
     virtual std::string targetFileFormatVersion();
 
-    /*
-     * Determines a filename for the conversion result based on the original filename
-     * and the file format version number.
+    /**
+     * Determines a filename for the conversion result based on the original filename and
+     the file format version number.
      *
      * \param filename source filename to be converted
      *
@@ -776,6 +764,7 @@ protected:
         "NavigationHandler.OrbitalNavigator.RetargetAnchor",
         "NavigationHandler.OrbitalNavigator.RetargetAim"
     };
+
     //A script that begins with an exact match of any of the strings contained in
     // _scriptRejects will not be recorded
     const std::vector<std::string> _scriptRejects = {
@@ -791,12 +780,14 @@ protected:
         "Anchor",
         "Aim"
     };
+
     //Any script snippet included in this vector will be trimmed from any script
     // from the script manager, before it is recorded in the session recording file.
     // The remainder of the script will be retained.
     const std::vector<std::string> _scriptsToBeTrimmed = {
         "openspace.sessionRecording.togglePlaybackPause"
     };
+
     //Any script snippet included in this vector will be trimmed from any script
     // from the script manager, before it is recorded in the session recording file.
     // The remainder of the script will be retained.
diff --git a/include/openspace/interaction/websocketinputstate.h b/include/openspace/interaction/websocketinputstate.h
index af010226e7..0b57864a23 100644
--- a/include/openspace/interaction/websocketinputstate.h
+++ b/include/openspace/interaction/websocketinputstate.h
@@ -37,7 +37,7 @@ namespace openspace::interaction {
 
 /**
  * Actions that any button of a websocket can have. Each button must be in one of these
- * states
+ * states.
  */
 enum class WebsocketAction : uint8_t {
     /// Idle state if the button is unpressed and has been unpressed since last frame
diff --git a/include/openspace/mission/mission.h b/include/openspace/mission/mission.h
index 281fe107ae..731e1951a3 100644
--- a/include/openspace/mission/mission.h
+++ b/include/openspace/mission/mission.h
@@ -51,8 +51,8 @@ struct Milestone {
  * phases within phases. Designed for WORM usage (Write Once, Read Multiple), and,
  * therefore, has only accessors.
  *
- * Each MissionPhase is characterized by its MissionPhase::name, a TimeRange, an
- * optional MissionPhase::description, and optional subphases.
+ * Each MissionPhase is characterized by its MissionPhase::name, a TimeRange, an optional
+ * MissionPhase::description, and optional subphases.
  */
 class MissionPhase {
 public:
@@ -147,6 +147,7 @@ public:
     /**
      * Returns the Documentation that describes the ghoul::Dictionarty that this
      * MissionPhase can be constructed from.
+     *
      * \return The Documentation that describes the required structure for a Dictionary
      */
     static documentation::Documentation Documentation();
@@ -161,7 +162,7 @@ protected:
      * \param trace The list of MissionPhase%s that are active during the time \p time
      * \param maxDepth The maximum depth of levels that will be considered
      *
-     * \pre maxDepth must not be negative
+     * \pre \p maxDepth must not be negative
      */
     void phaseTrace(double time, Trace& trace, int maxDepth) const;
 
diff --git a/include/openspace/mission/missionmanager.h b/include/openspace/mission/missionmanager.h
index 6e7d395b34..e7a3f9f1bc 100644
--- a/include/openspace/mission/missionmanager.h
+++ b/include/openspace/mission/missionmanager.h
@@ -78,18 +78,18 @@ public:
     * Sets the mission with the name \p missionName as the current mission. The current
     * mission is what is return by `currentMission()`.
     *
-    * \pre missionName must not be empty
+    * \pre \p missionName must not be empty
     */
     void setCurrentMission(const std::string& missionName);
 
     /**
-     * Returns true if a current mission exists
+     * Returns true if a current mission exists.
      */
     bool hasCurrentMission() const;
 
     /**
-     * Returns the latest mission specified to `setCurrentMission()`. If no mission has
-     * been specified, the first mission loaded will be returned. If no mission has been
+     * Returns the latest mission specified to #setCurrentMission. If no mission has been
+     * specified, the first mission loaded will be returned. If no mission has been
      * loaded, a warning will be printed and a dummy mission will be returned.
      */
     const Mission& currentMission();
@@ -99,7 +99,6 @@ public:
      */
     const std::map<std::string, Mission>& missionMap();
 
-
     static scripting::LuaLibrary luaLibrary();
 
 private:
diff --git a/include/openspace/navigation/keyframenavigator.h b/include/openspace/navigation/keyframenavigator.h
index e38fba0bfb..9bb1a3ee4f 100644
--- a/include/openspace/navigation/keyframenavigator.h
+++ b/include/openspace/navigation/keyframenavigator.h
@@ -60,13 +60,14 @@ public:
     };
 
     /**
-    * Update camera position using the next camera pose keyframe from the timeline.
-    * Returns true if camera was set to a pose from the next keyframe.
-    * Returns false if no keyframes are available after the current time.
-    * \param camera A reference to the camera object to have its pose updated.
-    * \param ignoreFutureKeyframes true if only past keyframes are to be used.
-    * \returns true only if a new future keyframe is available to set camera pose.
-    */
+     * Update camera position using the next camera pose keyframe from the timeline.
+     * Returns true if camera was set to a pose from the next keyframe. Returns false if
+     * no keyframes are available after the current time.
+     *
+     * \param camera A reference to the camera object to have its pose updated
+     * \param ignoreFutureKeyframes `true` if only past keyframes are to be used
+     * \return true only if a new future keyframe is available to set camera pose
+     */
     bool updateCamera(Camera& camera, bool ignoreFutureKeyframes);
     static bool updateCamera(Camera* camera, const CameraPose prevPose,
         const CameraPose nextPose, double t, bool ignoreFutureKeyframes);
diff --git a/include/openspace/navigation/navigationhandler.h b/include/openspace/navigation/navigationhandler.h
index fa32df0e4d..ebec211fd3 100644
--- a/include/openspace/navigation/navigationhandler.h
+++ b/include/openspace/navigation/navigationhandler.h
@@ -151,7 +151,7 @@ public:
      * Set camera state from a provided navigation state next frame. The actual position
      * will computed from the scene in the same frame as it is set.
      *
-     * \param state the navigation state to compute a camera positon from
+     * \param state The navigation state to compute a camera positon from
      */
     void setNavigationStateNextFrame(const NavigationState& state);
 
@@ -161,14 +161,14 @@ public:
      * node info. The actual position will computed from the scene in the same frame as
      * it is set.
      *
-     * \param spec the node specification from which to compute the resulting camera pose
+     * \param spec The node specification from which to compute the resulting camera pose
      */
     void setCameraFromNodeSpecNextFrame(NodeCameraStateSpec spec);
 
     /**
-    * \return The Lua library that contains all Lua functions available to affect the
-    * interaction
-    */
+     * \return The Lua library that contains all Lua functions available to affect the
+     *         interaction
+     */
     static scripting::LuaLibrary luaLibrary();
 
 private:
diff --git a/include/openspace/navigation/orbitalnavigator.h b/include/openspace/navigation/orbitalnavigator.h
index 0d5f440cb9..334c8cb400 100644
--- a/include/openspace/navigation/orbitalnavigator.h
+++ b/include/openspace/navigation/orbitalnavigator.h
@@ -43,9 +43,9 @@
 #include <optional>
 
 namespace openspace {
-    class SceneGraphNode;
     class Camera;
     struct CameraPose;
+    class SceneGraphNode;
     struct SurfacePositionHandle;
 } // namespace
 
@@ -87,10 +87,10 @@ public:
     void updateCameraScalingFromAnchor(double deltaTime);
     void resetVelocities();
 
-    /*
+    /**
      * This function should be called on every camera interaction: for example when
-     * navigating using an input device, changing the focus node or starting a path or
-     * a session recording playback
+     * navigating using an input device, changing the focus node or starting a path or a
+     * session recording playback
      */
     void updateOnCameraInteraction();
 
@@ -143,16 +143,15 @@ public:
     glm::quat anchorNodeToCameraRotation() const;
 
     /**
-     * Compute a camera position that pushed the camera position to
-     * a valid position over the anchor node, accounting for the
-     * minimal allowed distance
+     * Compute a camera position that pushed the camera position to a valid position over
+     * the anchor node, accounting for the minimal allowed distance
      */
     glm::dvec3 pushToSurfaceOfAnchor(const glm::dvec3& cameraPosition) const;
 
     /**
-    * \return the Lua library that contains all Lua functions available to affect the
-    * OrbitalNavigator
-    */
+     * \return The Lua library that contains all Lua functions available to affect the
+     *         OrbitalNavigator
+     */
     static scripting::LuaLibrary luaLibrary();
 
 private:
@@ -184,12 +183,11 @@ private:
 
     Friction _friction;
 
-    // Anchor: Node to follow and orbit
+    /// Anchor: Node to follow and orbit
     properties::StringProperty _anchor;
 
-    // Aim: Node to look at (when camera direction is reset),
-    // Empty string means same as anchor.
-    // If these are the same node we call it the `focus` node
+    /// Aim: Node to look at (when camera direction is reset), empty string means same as
+    /// anchor. If these are the same node we call it the `focus` node
     properties::StringProperty _aim;
 
     // Reset camera direction to the anchor node.
@@ -283,6 +281,7 @@ private:
      * Decomposes the camera's rotation in to a global and a local rotation defined by
      * CameraRotationDecomposition. The global rotation defines the rotation so that the
      * camera points towards the reference position.
+     *
      * The local rotation defines the differential from the global to the current total
      * rotation so that `cameraRotation = globalRotation * localRotation`.
      */
@@ -290,40 +289,42 @@ private:
         glm::dvec3 reference);
 
     /**
-     * Composes a pair of global and local rotations into a quaternion that can be used
-     * as the world rotation for a camera.
+     * Composes a pair of global and local rotations into a quaternion that can be used as
+     * the world rotation for a camera.
      */
     glm::dquat composeCameraRotation(const CameraRotationDecomposition& composition);
 
-    /*
-     * Moves and rotates the camera around the anchor node in order to maintain the
-     * screen space position of the aim node. Also interpolates to the aim node, when
-     * retargeting the aim.
+    /**
+     * Moves and rotates the camera around the anchor node in order to maintain the screen
+     * space position of the aim node. Also interpolates to the aim node, when retargeting
+     * the aim.
      */
     CameraPose followAim(CameraPose pose, glm::dvec3 cameraToAnchor,
         Displacement anchorToAim);
 
-    /*
-     * Perform a camera roll on the local camera rotation
-     * \returns a local camera rotation modified with a roll.
+    /**
+     * Perform a camera roll on the local camera rotation.
+     *
+     * \return A local camera rotation modified with a roll
      */
     glm::dquat roll(double deltaTime, const glm::dquat& localCameraRotation) const;
 
     /**
      * Performs rotation around the cameras x and y axes.
-     * \returns a local camera rotation modified with two degrees of freedom.
+     *
+     * \return A local camera rotation modified with two degrees of freedom
      */
     glm::dquat rotateLocally(double deltaTime,
         const glm::dquat& localCameraRotation) const;
 
     /**
      * Interpolates the camera rotation based on active interpolators.
-     * \returns a new rotation quaternion
+     *
+     * \return A new rotation quaternion
      */
     glm::dquat interpolateLocalRotation(double deltaTime,
         const glm::dquat& localCameraRotation);
 
-
     Displacement interpolateRetargetAim(double deltaTime, CameraPose pose,
         glm::dvec3 cameraToAnchor, Displacement anchorToAim);
 
@@ -332,7 +333,7 @@ private:
 
     /**
      * Modify the camera position and global rotation to rotate around the up vector
-     * of the current anchor based on x-wise input
+     * of the current anchor based on x-wise input.
      *
      * The up-vector to rotate around is determined by the "_upToUseForRotation" property
      */
@@ -344,18 +345,18 @@ private:
      * result in an orbital rotation around the object. This function does not affect the
      * rotation but only the position.
      *
-     * \return a position vector adjusted in the horizontal direction.
+     * \return A position vector adjusted in the horizontal direction.
      */
     glm::dvec3 translateHorizontally(double deltaTime, double speedScale,
         const glm::dvec3& cameraPosition, const glm::dvec3& objectPosition,
         const glm::dquat& globalCameraRotation,
         const SurfacePositionHandle& positionHandle) const;
 
-    /*
+    /**
      * Adds rotation to the camera position so that it follows the rotation of the anchor
-     * node defined by the differential anchorNodeRotationDiff.
+     * node defined by the differential \p anchorNodeRotationDiff.
      *
-     * \return a position updated with the rotation defined by anchorNodeRotationDiff
+     * \return A position updated with the rotation defined by \p anchorNodeRotationDiff
      */
     glm::dvec3 followAnchorNodeRotation(const glm::dvec3& cameraPosition,
         const glm::dvec3& objectPosition, const glm::dquat& anchorNodeRotationDiff) const;
@@ -363,7 +364,7 @@ private:
     /**
      * Updates the global rotation so that it points towards the anchor node.
      *
-     * \return a global rotation quaternion defining a rotation towards the anchor node
+     * \return A global rotation quaternion defining a rotation towards the anchor node
      */
     glm::dquat rotateGlobally(const glm::dquat& globalCameraRotation,
         const glm::dquat& aimNodeRotationDiff,
@@ -371,7 +372,8 @@ private:
 
     /**
      * Translates the camera position towards or away from the anchor node.
-     * \returns a position vector adjusted in the vertical direction.
+     *
+     * \return A position vector adjusted in the vertical direction.
      */
     glm::dvec3 translateVertically(double deltaTime, const glm::dvec3& cameraPosition,
         const glm::dvec3& objectPosition,
@@ -380,7 +382,7 @@ private:
     /**
      * Rotates the camera around the out vector of the surface.
      *
-     * \return a quaternion adjusted to rotate around the out vector of the surface
+     * \return A quaternion adjusted to rotate around the out vector of the surface
      */
     glm::dquat rotateHorizontally(double deltaTime,
         const glm::dquat& globalCameraRotation,
@@ -389,7 +391,7 @@ private:
     /**
      * Push the camera out to the surface of the object.
      *
-     * \return a position vector adjusted to be at least _minimumAllowedDistance meters
+     * \return A position vector adjusted to be at least _minimumAllowedDistance meters
      *         above the actual surface of the object
      */
     glm::dvec3 pushToSurface(const glm::dvec3& cameraPosition,
@@ -417,7 +419,7 @@ private:
     void resetIdleBehavior();
 
     /**
-     * Apply the currently selected idle behavior to the position and rotations
+     * Apply the currently selected idle behavior to the position and rotations.
      */
     void applyIdleBehavior(double deltaTime, glm::dvec3& position,
         glm::dquat& localRotation, glm::dquat& globalRotation);
@@ -441,8 +443,8 @@ private:
      * vector coincides with the axis, and should be used with care.
      *
      * Used for:
-     * IdleBehavior::Behavior::OrbitAtConstantLat (axis = north = z-axis) and
-     * IdleBehavior::Behavior::OrbitAroundUp (axis = up = y-axis)
+     *   - IdleBehavior::Behavior::OrbitAtConstantLat (axis = north = z-axis) and
+     *   - IdleBehavior::Behavior::OrbitAroundUp (axis = up = y-axis)
      *
      * \param axis The axis to arbit around, given in model coordinates of the anchor
      * \param angle The rotation angle to use for the motion
diff --git a/include/openspace/navigation/path.h b/include/openspace/navigation/path.h
index 0d9851f6c1..5be7c88fca 100644
--- a/include/openspace/navigation/path.h
+++ b/include/openspace/navigation/path.h
@@ -44,12 +44,12 @@ public:
         AvoidCollision = 0,
         ZoomOutOverview,
         Linear,
-        AvoidCollisionWithLookAt // @TODO (2021-08-13, emmbr) This type right now leads
-                                 // to rapid rotations, but is useful in specific
-                                 // scenarios, e.g. close to surfaces. Later we want to
-                                 // remove it, and create a curve type that looks nicely
-                                 // at the targets when moving, avoids collisions and
-                                 // doesn't introduce sudden large changes in rotation
+
+        // @TODO (2021-08-13, emmbr) This type right now leads to rapid rotations, but is
+        // useful in specific scenarios, e.g. close to surfaces. Later we want to remove
+        // it, and create a curve type that looks nicely at the targets when moving,
+        // avoids collisions and doesn't introduce sudden large changes in rotation
+        AvoidCollisionWithLookAt
     };
 
     Path(Waypoint start, Waypoint end, Type type,
@@ -59,55 +59,55 @@ public:
     Waypoint endPoint() const;
 
     /**
-     * Return the total length of the the curve for the path, in meters
+     * Return the total length of the the curve for the path, in meters.
      */
     double pathLength() const;
 
     /**
      * Return a vector of positions corresponding to the control points of the path's
-     * spline curve
+     * spline curve.
      */
     std::vector<glm::dvec3> controlPoints() const;
 
     /**
      * Take a step along the current path, corresponding to the delta time step \p dt, and
      * return the resulting camera pose. The \p speedScale is a factor that will be
-     * multiplied with the traversal speed
+     * multiplied with the traversal speed.
      */
     CameraPose traversePath(double dt, float speedScale = 1.f);
 
     /**
      * Function that can be used to permaturely quit a path, for example when skipping
-     * to the end
+     * to the end.
      */
     void quitPath();
 
     /**
      * Return the identifer of the node that is the current appropriate anchor node, of
      * the start and end waypoint's reference node. Dtermined based on how far along the
-     * path we have traveled
+     * path we have traveled.
      */
     std::string currentAnchor() const;
 
     /**
-     * Return wether the path has reached its end point or not
+     * Return wether the path has reached its end point or not.
      */
     bool hasReachedEnd() const;
 
     /**
      * Compute the interpolated camera pose at a certain distance along a *linear*
      * path. Note that the linear path is a special case, to avoid risks of precision
-     * problems for long paths
+     * problems for long paths.
      */
     CameraPose linearInterpolatedPose(double distance, double displacement);
 
     /**
-     * Compute the interpolated camera pose at a certain distance along the path
+     * Compute the interpolated camera pose at a certain distance along the path.
      */
     CameraPose interpolatedPose(double distance) const;
 
     /**
-     * Reset variables used to play back path
+     * Reset variables used to play back path.
      */
     void resetPlaybackVariables();
 
@@ -116,49 +116,49 @@ public:
 private:
     /**
      * Interpolate between the paths start and end rotation using the approach that
-     * corresponds to the path's curve type. The interpolation parameter \p t is the
-     * same as for the position interpolation, i.e. the relative traveled distance
-     * along the path, in [0, 1]
+     * corresponds to the path's curve type. The interpolation parameter \p t is the same
+     * as for the position interpolation, i.e. the relative traveled distance along the
+     * path, in [0, 1].
      *
-     * \param t The interpolation parameter, given as the relative traveled distance
-                along the path, in [0, 1]
+     * \param t The interpolation parameter, given as the relative traveled distance along
+     *        the path, in [0, 1]
      */
     glm::dquat interpolateRotation(double t) const;
 
     /**
-     * Compute the interpolated rotation quaternion using an eased SLERP approach
+     * Compute the interpolated rotation quaternion using an eased SLERP approach.
      *
-     * \param t The interpolation variable for the rotatation interpolation.
-     *          Should be the relative traveled distance, in [0, 1]
+     * \param t The interpolation variable for the rotatation interpolation. Should be the
+     *        relative traveled distance, in [0, 1]
      */
     glm::dquat easedSlerpRotation(double t) const;
 
     /**
-     * Compute the interpolated rotation quaternion using a method that is customized
-     * for linear paths. The camera will first interpoalte to look at the targetted
-     * node, and keep doing so for most of the path. At the end, when within a certain
-     * distance from the target, the rotation is interpolated so that the camera ends up
-     * in the target pose at the end of the path.
+     * Compute the interpolated rotation quaternion using a method that is customized for
+     * linear paths. The camera will first interpoalte to look at the targetted node, and
+     * keep doing so for most of the path. At the end, when within a certain distance from
+     * the target, the rotation is interpolated so that the camera ends up in the target
+     * pose at the end of the path.
      *
-     * \param t The interpolation variable for the rotatation interpolation.
-     *          Should be the relative traveled distance, in [0, 1]
+     * \param t The interpolation variable for the rotatation interpolation. Should be the
+     *        relative traveled distance, in [0, 1]
      */
     glm::dquat linearPathRotation(double t) const;
 
     /**
      * Compute the interpolated rotation quaternion using an approach that first
-     * interpolates to look at the start node, and then the end node, before
-     * interpolating to the end rotation
+     * interpolates to look at the start node, and then the end node, before interpolating
+     * to the end rotation.
      *
-     * \param t The interpolation variable for the rotatation interpolation.
-     *          Should be the relative traveled distance, in [0, 1]
+     * \param t The interpolation variable for the rotatation interpolation. Should be the
+     *        relative traveled distance, in [0, 1]
      */
     glm::dquat lookAtTargetsRotation(double t) const;
 
     /**
      * Evaluate the current traversal speed along the path, based on the currently
-     * traveled distance. The final speed will be scaled to match the desired duration
-     * for the path (which might have been specified by the user)
+     * traveled distance. The final speed will be scaled to match the desired duration for
+     * the path (which might have been specified by the user).
      *
      * \param traveledDistance The current distance traveled along the path, in meters
      */
@@ -180,13 +180,13 @@ private:
 };
 
 /**
- * Create a path based on an instruction given as a dictionary. (See top of cpp file
- * for documentation on keys and values for the dictionary.)
- * If /p forceType is specified, that type will primarily be used as the type for the
- * created path. Secondly, the type will be read from the dictionary, and lastly it will
- * use the default from PathNavigator.
+ * Create a path based on an instruction given as a dictionary (see top of cpp file
+ * for documentation on keys and values for the dictionary). If \p forceType is specified,
+ * that type will primarily be used as the type for the created path. Secondly, the type
+ * will be read from the dictionary, and lastly it will use the default from
+ * PathNavigator.
  *
- * \return the created path
+ * \return The created path
  */
 Path createPathFromDictionary(const ghoul::Dictionary& dictionary,
     std::optional<Path::Type> forceType = std::nullopt);
diff --git a/include/openspace/navigation/pathcurve.h b/include/openspace/navigation/pathcurve.h
index 7e8e549e71..5aa8deed13 100644
--- a/include/openspace/navigation/pathcurve.h
+++ b/include/openspace/navigation/pathcurve.h
@@ -46,7 +46,7 @@ public:
     virtual ~PathCurve() = 0;
 
     /**
-     * Return the length of the curve, in meters
+     * Return the length of the curve, in meters.
      */
     double length() const;
 
@@ -56,7 +56,7 @@ public:
      * the full length of the path.
      *
      * Can be overridden by subclasses that want more control over the position
-     * interpolation
+     * interpolation.
      */
     virtual glm::dvec3 positionAt(double relativeDistance) const;
 
@@ -66,27 +66,26 @@ public:
      * position. Note that u does not correspond to the relatively traveled distance.
      *
      * Can be overridden by subclasses that want more control over the position
-     * interpolation
+     * interpolation.
      */
     virtual glm::dvec3 interpolate(double u) const;
 
     /**
-     * Return the positions defining the control points for the spline interpolation
+     * Return the positions defining the control points for the spline interpolation.
      */
     std::vector<glm::dvec3> points() const;
 
 protected:
     /**
-     * Precompute information related to the spline parameters that are
-     * needed for arc length reparameterization. Must be called after
-     * control point creation.
+     * Precompute information related to the spline parameters that are needed for arc
+     * length reparameterization. Must be called after control point creation.
      */
     void initializeParameterData();
 
     /**
-     * Compute curve parameter u that matches the input arc length s.
-     * Input s is a length value in meters, in the range [0, _totalLength].
-     * The returned curve parameter u is in range [0, 1].
+     * Compute curve parameter u that matches the input arc length s. Input s is a length
+     * value in meters, in the range [0, _totalLength]. The returned curve parameter u is
+     * in range [0, 1].
      */
     double curveParameter(double s) const;
 
diff --git a/include/openspace/navigation/pathnavigator.h b/include/openspace/navigation/pathnavigator.h
index 97a19ba703..1cd6082035 100644
--- a/include/openspace/navigation/pathnavigator.h
+++ b/include/openspace/navigation/pathnavigator.h
@@ -81,24 +81,25 @@ public:
     const std::vector<SceneGraphNode*>& relevantNodes();
 
     /**
-    * Find a node close to the given node. Closeness is determined by a factor times
-    * the bounding sphere of the object
-    * \return pointer to the SGN if one was found, nullptr otherwise
-    */
+     * Find a node close to the given node. Closeness is determined by a factor times
+     * the bounding sphere of the object.
+     *
+     * \return Pointer to the SGN if one was found, nullptr otherwise
+     */
     static SceneGraphNode* findNodeNearTarget(const SceneGraphNode* node);
 
     /**
-    * \return The Lua library that contains all Lua functions available to affect the
-    * path navigation
-    */
+     * \return The Lua library that contains all Lua functions available to affect the
+     *         path navigation
+     */
     static scripting::LuaLibrary luaLibrary();
 
 private:
     void handlePathEnd();
 
     /**
-    * Populate list of nodes that are relevant for collision checks, etc
-    */
+     * Populate list of nodes that are relevant for collision checks, etc.
+     */
     void findRelevantNodes();
 
     void removeRollRotation(CameraPose& pose, double deltaTime);
diff --git a/include/openspace/navigation/waypoint.h b/include/openspace/navigation/waypoint.h
index c884adad20..57dca42b10 100644
--- a/include/openspace/navigation/waypoint.h
+++ b/include/openspace/navigation/waypoint.h
@@ -59,7 +59,7 @@ private:
 /**
  * Compute a waypoint from the current camera position.
  *
- * \return the computed WayPoint
+ * \return The computed WayPoint
  */
 Waypoint waypointFromCamera();
 
@@ -76,14 +76,14 @@ struct NodeCameraStateSpec {
  * where the camera will be facing the given node. If there is a 'Sun' node in the scene,
  * it will possibly be used to compute a position on the lit side of the object.
  *
- * \param spec details about the node and state to create the waypoint from. Minimal
- *             information is the identifier of the node, but a position or height
- *             above the bounding sphere may also be given.
- * \param startPoint an optional previous waypoint. If not specified, the current camera
+ * \param spec Details about the node and state to create the waypoint from. Minimal
+ *             information is the identifier of the node, but a position or height above
+ *             the bounding sphere may also be given.
+ * \param startPoint An optional previous waypoint. If not specified, the current camera
  *                   position will be used.
- * \param useLinear if true, the new waypoint will be computed along a straight line
+ * \param useLinear If `true`, the new waypoint will be computed along a straight line
  *                  from the start waypoint to the scene graph node or position.
- * \return the computed WayPoint
+ * \return The computed WayPoint
  */
 Waypoint computeWaypointFromNodeInfo(const NodeCameraStateSpec& spec,
     std::optional<Waypoint> startPoint = std::nullopt, bool useLinear = false);
diff --git a/include/openspace/network/messagestructures.h b/include/openspace/network/messagestructures.h
index 909e7284bd..2e6999523e 100644
--- a/include/openspace/network/messagestructures.h
+++ b/include/openspace/network/messagestructures.h
@@ -66,7 +66,7 @@ struct CameraKeyframe {
 
     double _timestamp = 0.0;
 
-    void serialize(std::vector<char> &buffer) const {
+    void serialize(std::vector<char>& buffer) const {
         // Add position
         buffer.insert(
             buffer.end(),
diff --git a/include/openspace/network/messagestructureshelper.h b/include/openspace/network/messagestructureshelper.h
index 3c0c2678d2..3133c87923 100644
--- a/include/openspace/network/messagestructureshelper.h
+++ b/include/openspace/network/messagestructureshelper.h
@@ -30,25 +30,27 @@
 namespace openspace::datamessagestructures {
 
 /**
- * Method that creates a CameraKeyframe object and populates
- * it with the current properties of the camera from the navigation handler.
- * \returns CameraKeyframe with current state from NavigationHandler
+ * Method that creates a CameraKeyframe object and populates it with the current
+ * properties of the camera from the navigation handler.
+ *
+ * \return CameraKeyframe with current state from NavigationHandler
 */
 CameraKeyframe generateCameraKeyframe();
 
 /**
- * Method that creates a TimeKeyframe object and populates
- * it with the current time values from the application time manager.
- * \returns TimeKeyframe The time keyframe
+ * Method that creates a TimeKeyframe object and populates it with the current time values
+ * from the application time manager.
+ *
+ * \return TimeKeyframe The time keyframe
  */
 TimeKeyframe generateTimeKeyframe();
 
 /**
- * Method that creates a ScriptMessage object from a given script
- * string, and populates the ScriptMessage with the script and timestamp
- * of the current application time.
+ * Method that creates a ScriptMessage object from a given script string, and populates
+ * the ScriptMessage with the script and timestamp of the current application time.
+ *
  * \param script The script to execute in std::string form
- * \returns ScriptMessage The ScriptMessage data structure with script
+ * \return ScriptMessage The ScriptMessage data structure with script
  */
 ScriptMessage generateScriptMessage(std::string script);
 
diff --git a/include/openspace/network/parallelpeer.h b/include/openspace/network/parallelpeer.h
index 9a0d3ab599..2e852d2808 100644
--- a/include/openspace/network/parallelpeer.h
+++ b/include/openspace/network/parallelpeer.h
@@ -66,9 +66,9 @@ public:
     double latencyStandardDeviation() const;
 
     /**
-    * Returns the Lua library that contains all Lua functions available to affect the
-    * remote OS parallel connection.
-    */
+     * Returns the Lua library that contains all Lua functions available to affect the
+     * remote OS parallel connection.
+     */
     static scripting::LuaLibrary luaLibrary();
     ParallelConnection::Status status();
     int nConnections();
diff --git a/include/openspace/properties/numericalproperty.h b/include/openspace/properties/numericalproperty.h
index 2ae25ae160..dc7cc814c1 100644
--- a/include/openspace/properties/numericalproperty.h
+++ b/include/openspace/properties/numericalproperty.h
@@ -73,9 +73,10 @@ protected:
     std::string generateAdditionalJsonDescription() const override;
 
     /**
-     * convert a lua formatted value to a JSON formatted value
-     * @param luaValue
-     * @return a json formatted string representation of the given lua value
+     * convert a lua formatted value to a JSON formatted value.
+     *
+     * \param luaValue
+     * \return A JSON formatted string representation of the given Lua value
      */
     std::string luaToJson(std::string luaValue) const;
 
diff --git a/include/openspace/properties/optionproperty.h b/include/openspace/properties/optionproperty.h
index 2bb2366324..f115c05608 100644
--- a/include/openspace/properties/optionproperty.h
+++ b/include/openspace/properties/optionproperty.h
@@ -33,15 +33,15 @@ namespace openspace::properties {
 
 /**
  * The OptionProperty is a property that provides a number of predefined (using the
- * addOption method) options consisting of a `description` and a `value`. The available
+ * #addOption method) options consisting of a `description` and a `value`. The available
  * options can be queried using the options method. Only values representing valid options
- * can be used to set this property, or an error will be logged
+ * can be used to set this property, or an error will be logged.
  */
 class OptionProperty : public IntProperty {
 public:
     /**
-     * The struct storing a single option consisting of an integer `value` and a
-     * `string` description.
+     * The struct storing a single option consisting of an integer `value` and a `string`
+     * description.
      */
     struct Option {
         int value;
@@ -57,7 +57,8 @@ public:
      * The constructor delegating the `identifier` and the `guiName` to its super class.
      *
      * \param info The PropertyInfo structure that contains all the required static
-     *        information for initializing this Property.
+     *        information for initializing this Property
+     *
      * \pre \p info.identifier must not be empty
      * \pre \p info.guiName must not be empty
      */
@@ -67,7 +68,7 @@ public:
     * The constructor delegating the `identifier` and the `guiName` to its super class.
     *
     * \param info The PropertyInfo structure that contains all the required static
-    *        information for initializing this Property.
+    *        information for initializing this Property
     * \param displayType Optional DisplayType for GUI (default RADIO)
     *
     * \pre \p info.identifier must not be empty
@@ -123,7 +124,7 @@ public:
     const std::vector<Option>& options() const;
 
     /**
-     * This function removes all previous options from the OptionProperty
+     * This function removes all previous options from the OptionProperty.
      */
     void clearOptions();
 
@@ -151,10 +152,10 @@ public:
     const Option& option() const;
 
     /**
-    * Get the description of the option that matches `value`.
-    *
-    * \param value The value of the option
-    */
+     * Get the description of the option that matches `value`.
+     *
+     * \param value The value of the option
+     */
     std::string getDescriptionByValue(int value);
 
 private:
diff --git a/include/openspace/properties/property.h b/include/openspace/properties/property.h
index 4a5fc2a18c..3ec4521a14 100644
--- a/include/openspace/properties/property.h
+++ b/include/openspace/properties/property.h
@@ -41,8 +41,8 @@ class PropertyOwner;
 /**
  * A property encapsulates a value which should be user-changeable. A property almost
  * always belongs to a PropertyOwner who has taken ownership (setPropertyOwner) of the
- * Property. Per PropertyOwner, the `identifier` needs to be unique and can be
- * used as a URI. This class is an abstract base class and each subclass (most notable
+ * Property. Per PropertyOwner, the `identifier` needs to be unique and can be used as a
+ * URI. This class is an abstract base class and each subclass (most notable
  * TemplateProperty) needs to implement the methods Property::className, Property::get,
  * Property::set, Property::type(), Property::getLuaValue, Property::setLuaValue,
  * Property::getStringValue, and Property::typeLua to make full use of the infrastructure.
@@ -56,24 +56,32 @@ class PropertyOwner;
  * which might be used in GUI representations. One example would be a glm::vec4 property,
  * (Vec4Property) that can either represent a 4-dimensional position, a powerscaled
  * coordinate, a light position, or other things, requiring different GUI representations.
+ *
  * \see TemplateProperty
  * \see PropertyOwner
  */
 class Property {
 public:
     /**
-    * The visibility classes for Property%s. The classes are strictly ordered as
-    * Hidden > Developer > AdvancedUser > User > NoviceUser > Always
-    */
+     * The visibility classes for Property%s. The classes are strictly ordered as
+     * Hidden > Developer > AdvancedUser > User > NoviceUser > Always
+     */
     enum class Visibility {
-        Hidden = 5, ///< Never visible
-        Developer = 4, ///< Visible in Developer mode
-        AdvancedUser = 3, ///< Visible in Advanced User mode
-        User = 2, ///< Visible in User mode
-        NoviceUser = 1, ///< Visible in Novice User mode
-        Always = 0,  ///< Visible for all types, no matter what
+        /// Never visible
+        Hidden = 5,
+        /// Visible in Developer mode
+        Developer = 4,
+        /// Visible in Advanced User mode
+        AdvancedUser = 3,
+        /// Visible in User mode
+        User = 2,
+        /// Visible in Novice User mode
+        NoviceUser = 1,
+        /// Visible for all types, no matter what
+        Always = 0,
 
-        Default = Always ///< The default visibility for properties
+        /// The default visibility for properties
+        Default = Always
     };
 
     /**
@@ -81,8 +89,10 @@ public:
      * identifier, a GUI name and descriptive text that are both user facing.
      */
     struct PropertyInfo {
-        /// GCC requires an explicit constructor here, as it does not handle the default
-        /// argument for the struct initialization
+        /**
+         * GCC requires an explicit constructor here, as it does not handle the default
+         * argument for the struct initialization.
+         */
         constexpr PropertyInfo(const char* ident, const char* gui, const char* desc)
             : identifier(ident)
             , guiName(gui)
@@ -208,9 +218,9 @@ public:
      * Returns the Lua type that will be put onto the stack in the Property::getLua method
      * and which will be consumed by the Property::setLuaValue method. The returned value
      * can belong to the set of Lua types: `LUA_TNONE`, `LUA_TNIL`, `LUA_TBOOLEAN`,
-     * `LUA_TLIGHTUSERDATA`, `LUA_TNUMBER`, `LUA_TSTRING`, `LUA_TTABLE`,
-     * `LUA_TFUNCTION`, `LUA_TUSERDATA`, or `LUA_TTHREAD`. The default implementation
-     * will return `LUA_TNONE`.
+     * `LUA_TLIGHTUSERDATA`, `LUA_TNUMBER`, `LUA_TSTRING`, `LUA_TTABLE`, `LUA_TFUNCTION`,
+     * `LUA_TUSERDATA`, or `LUA_TTHREAD`. The default implementation will return
+     * `LUA_TNONE`.
      *
      * \return The Lua type that will be consumed or produced by the Property::getLuaValue
      *         and Property::setLuaValue methods.
@@ -237,18 +247,18 @@ public:
      *        Property::setLuaValue methods.
      * \return An OnChangeHandle that can be used in subsequent calls to remove a callback
      *
-     * \pre The callback must not be empty
+     * \pre The \p callback must not be empty
      */
     OnChangeHandle onChange(std::function<void()> callback);
 
     /**
-    * This method registers a \p callback function that will be called when the property
-    * is destructed.
-    *
-    * \return An OnDeleteHandle that can be used in subsequent calls to remove a callback
-    *
-    * \pre The callback must not be empty
-    */
+     * This method registers a \p callback function that will be called when the property
+     * is destructed.
+     *
+     * \return An OnDeleteHandle that can be used in subsequent calls to remove a callback
+     *
+     * \pre The \p callback must not be empty
+     */
     OnDeleteHandle onDelete(std::function<void()> callback);
 
     /**
@@ -265,15 +275,15 @@ public:
     void removeOnChange(OnChangeHandle handle);
 
     /**
-    * This method deregisters a callback that was previously registered with the onDelete
-    * method.
-    *
-    * \param handle An OnDeleteHandle that was returned from a previous call to onDelete
-    *        by this property.
-    *
-    * \pre \p handle must refer to a callback that has been previously registred
-    * \pre \p handle must refer to a callback that has not been removed previously
-    */
+     * This method deregisters a callback that was previously registered with the onDelete
+     * method.
+     *
+     * \param handle An OnDeleteHandle that was returned from a previous call to onDelete
+     *        by this property.
+     *
+     * \pre \p handle must refer to a callback that has been previously registred
+     * \pre \p handle must refer to a callback that has not been removed previously
+     */
     void removeOnDelete(OnDeleteHandle handle);
 
     /**
@@ -296,7 +306,7 @@ public:
      * Returns the PropertyOwner of this Property or `nullptr`, if it does not have an
      * owner.
      *
-     * \return The Property of this Property
+     * \return The PropertyOwner of this Property
      */
     PropertyOwner* owner() const;
 
@@ -337,8 +347,9 @@ public:
     void setGroupIdentifier(std::string groupId);
 
     /**
-     * Returns the group idenfier that this Property belongs to, or `""` if it
-     * belongs to no group.
+     * Returns the group idenfier that this Property belongs to, or `""` if it belongs to
+     * no group.
+     *
      * \return The group identifier that this Property belongs to
      */
     std::string groupIdentifier() const;
@@ -363,8 +374,8 @@ public:
      * This method determines if this Property should be read-only in external
      * applications. This setting is only a hint and does not need to be followed by GUI
      * applications and does not have any effect on the Property::set or
-     * Property::setLuaValue methods. The value is stored in the metaData Dictionary
-     * with the key: `isReadOnly`. The default value is `false`.
+     * Property::setLuaValue methods. The value is stored in the metaData Dictionary with
+     * the key: `isReadOnly`. The default value is `false`.
      *
      * \param state `true` if the Property should be read only, `false` otherwise
      */
@@ -373,8 +384,8 @@ public:
     /**
      * Default view options that can be used in the Property::setViewOption method. The
      * values are:
-     * - Property::ViewOptions::Color = `Color` (Intended for Vec3 and Vec4),
-     * - Property::ViewOptions::MinMaxRange = `MinMaxRange` (Intended for Vec2)
+     *   - Property::ViewOptions::Color = `Color` (Intended for Vec3 and Vec4),
+     *   - Property::ViewOptions::MinMaxRange = `MinMaxRange` (Intended for Vec2)
      */
     struct ViewOptions {
         static const char* Color;
@@ -385,9 +396,10 @@ public:
      * This method allows the developer to give hints to the GUI about different
      * representations for the GUI. The same Property (for example Vec4Property) can be
      * used in different ways, each requiring a different input method. These values are
-     * stored in the metaData object under `ViewOptions`.
-     * See Property::ViewOptions for a default list of possible options. As these are
-     * only hints, the GUI is free to ignore any suggestion by the developer.
+     * stored in the metaData object under `ViewOptions`. See Property::ViewOptions for a
+     * default list of possible options. As these are only hints, the GUI is free to
+     * ignore any suggestion by the developer.
+     *
      * \param option The view option that should be modified
      * \param value Determines if the view option should be active (`true`) or
      *        deactivated (`false`)
@@ -401,7 +413,6 @@ public:
      *
      * \param option The view option that should be retrieved
      * \param defaultValue The value that is returned if the \p option was not set
-     *
      * \return The view option's value
      */
     bool viewOption(const std::string& option, bool defaultValue = false) const;
@@ -418,7 +429,7 @@ public:
     /**
      * Get a valid JSON formatted representation of the Property's value.
      *
-     * \return the value in a json compatible format
+     * \return The value in a JSON compatible format
      */
     virtual std::string jsonValue() const;
 
@@ -431,8 +442,8 @@ public:
 
     /**
      * Creates the information that is general to every Property and adds the
-     * `Identifier`, `Name`, `Type`, and `MetaData` keys and their values. The meta
-     * data is handles by the generateMetaDataJsonDescription method, which has to be
+     * `Identifier`, `Name`, `Type`, and `MetaData` keys and their values. The meta data
+     * is handles by the generateMetaDataJsonDescription method, which has to be
      * overloaded if a concrete base class wants to add meta data that is not curated by
      * the Property class.
      *
diff --git a/include/openspace/properties/propertyowner.h b/include/openspace/properties/propertyowner.h
index e803fa8930..7fc6e03858 100644
--- a/include/openspace/properties/propertyowner.h
+++ b/include/openspace/properties/propertyowner.h
@@ -54,8 +54,8 @@ public:
 
     struct PropertyOwnerInfo {
         std::string identifier;
-        std::string guiName = "";
-        std::string description = "";
+        std::string guiName;
+        std::string description;
     };
 
     /**
@@ -63,7 +63,7 @@ public:
      *
      * \param info The PropertyOwnerInfo struct that contains the
      *             #PropertyOwnerInfo::identifier, #PropertyOwnerInfo::guiName, and
-     *             #PropertyOwnerInfo::description of this PropertyOwner.
+     *             #PropertyOwnerInfo::description of this PropertyOwner
      *
      * \pre The \p info 's #PropertyOwnerInfo::identifier must not contain any whitespaces
      * \pre The \p info 's #PropertyOwnerInfo::identifier must not contain any `.`
@@ -141,11 +141,11 @@ public:
 
     /**
      * Retrieves a Property identified by \p uri from this PropertyOwner. If \p uri does
-     * not contain a `.` the identifier must refer to a Property directly owned
-     * by this PropertyOwner. If the identifier contains one or more `.`, the
-     * first part of the name will be recursively extracted and used as a name for a
-     * sub-owner and only the last part of the identifier is referring to a Property owned
-     * by PropertyOwner named by the second-but-last name.
+     * not contain a `.` the identifier must refer to a Property directly owned by this
+     * PropertyOwner. If the identifier contains one or more `.`, the first part of the
+     * name will be recursively extracted and used as a name for a sub-owner and only the
+     * last part of the identifier is referring to a Property owned by PropertyOwner named
+     * by the second-but-last name.
      *
      * \param uri The identifier of the Property that should be extracted
      * \return If the Property cannot be found, `nullptr` is returned, otherwise the
@@ -155,19 +155,20 @@ public:
 
     /**
      * This method checks if a Property with the provided \p uri exists in this
-     * PropertyOwner (or any sub-owner). If the identifier contains one or more
-     * `.`, the first part of the name will be recursively extracted and is
-     * used as a name for a sub-owner and only the last part of the identifier is
-     * referring to a Property owned by PropertyOwner named by the second-but-last name.
+     * PropertyOwner (or any sub-owner). If the identifier contains one or more `.`, the
+     * first part of the name will be recursively extracted and is used as a name for a
+     * sub-owner and only the last part of the identifier is referring to a Property owned
+     * by PropertyOwner named by the second-but-last name.
      *
-     * \return `true` if the \p uri refers to a Property; `false` otherwise.
+     * \return `true` if the \p uri refers to a Property; `false` otherwise
      */
     bool hasProperty(const std::string& uri) const;
 
     /**
-    * This method checks if a Property exists in this PropertyOwner.
-    * \return `true` if the Property existed, `false` otherwise.
-    */
+     * This method checks if a Property exists in this PropertyOwner.
+     *
+     * \return `true` if the Property existed, `false` otherwise
+     */
     bool hasProperty(const Property* prop) const;
 
     void setPropertyOwner(PropertyOwner* owner) { _owner = owner; }
@@ -185,11 +186,11 @@ public:
     /**
      * This method returns the direct sub-owner of this PropertyOwner with the provided
      * \p identifier. This means that `identifier` cannot contain any `.` as this
-     * character is not allowed in PropertyOwner names. If the \p name does not name a
-     * valid sub-owner of this PropertyOwner, a `nullptr` will be returned.
+     * character is not allowed in PropertyOwner names. If the \p identifier does not name
+     * a valid sub-owner of this PropertyOwner, a `nullptr` will be returned.
      *
      * \param identifier The identifier of the sub-owner that should be returned
-     * \return The PropertyOwner with the given \p name, or `nullptr`
+     * \return The PropertyOwner with the given \p identifier, or `nullptr`
      */
     PropertyOwner* propertySubOwner(const std::string& identifier) const;
 
@@ -294,7 +295,9 @@ public:
      */
     void removeTag(const std::string& tag);
 
-    // Generate JSON for documentation
+    /**
+     * Generate JSON for documentation.
+     */
     nlohmann::json generateJson() const;
 
 protected:
diff --git a/include/openspace/properties/scalar/shortproperty.h b/include/openspace/properties/scalar/shortproperty.h
index c91c3999eb..be258b07ca 100644
--- a/include/openspace/properties/scalar/shortproperty.h
+++ b/include/openspace/properties/scalar/shortproperty.h
@@ -25,19 +25,6 @@
 #ifndef __OPENSPACE_CORE___SHORTPROPERTY___H__
 #define __OPENSPACE_CORE___SHORTPROPERTY___H__
 
- /**
- * \file shortproperty.h
- *
- * \addtogroup openspace
- * @{
- * \addtogroup properties
- * @{
-
- * \class ShortProperty
-
- * @} @}
- */
-
 #include <openspace/properties/numericalproperty.h>
 #include <limits>
 
diff --git a/include/openspace/properties/selectionproperty.h b/include/openspace/properties/selectionproperty.h
index 2207317070..45cca8b4c8 100644
--- a/include/openspace/properties/selectionproperty.h
+++ b/include/openspace/properties/selectionproperty.h
@@ -41,10 +41,10 @@ public:
     int typeLua() const override;
 
     /**
-     * This method sets the stored value to the provided value `val`.
-     * If the value is different, the listeners are notified. It also removes any
-     * invalid keys in the input set. A key is invalid if it does not correspond to
-     * an existing option in the SelectionProperty
+     * This method sets the stored value to the provided value `val`. If the value is
+     * different, the listeners are notified. It also removes any invalid keys in the
+     * input set. A key is invalid if it does not correspond to an existing option in the
+     * SelectionProperty.
      *
      * \param val The new value for this SelectionProperty
      */
@@ -67,16 +67,16 @@ public:
     bool isSelected(const std::string& key) const;
 
     /**
-     * Checks if the SelectionProperty has any selected values, that is, if its
-     * value is empty.
+     * Checks if the SelectionProperty has any selected values, that is, if its value is
+     * empty.
      *
      * \return `true` if there are selected options; `false` otherwise
      */
     bool hasSelected() const;
 
     /**
-     * Returns all available options for this SelectionProperty. Should be
-     * sorted alphabetically.
+     * Returns all available options for this SelectionProperty. Should be sorted
+     * alphabetically.
      *
      * \return A list of all available options
      */
@@ -99,7 +99,7 @@ public:
     void addOption(const std::string& key);
 
     /**
-     * This method clears the selection list, that is the value of this SelectionProperty
+     * This method clears the selection list, that is the value of this SelectionProperty.
      */
     void clearSelection();
 
diff --git a/include/openspace/properties/templateproperty.h b/include/openspace/properties/templateproperty.h
index 9d80a58d5d..b4e7318635 100644
--- a/include/openspace/properties/templateproperty.h
+++ b/include/openspace/properties/templateproperty.h
@@ -30,20 +30,21 @@
 namespace openspace::properties {
 
 /**
- * This subclass of Property handles a single parameter value that is of type
- * `T`. It provides all the necessary methods to automatically access the
- * value. One notable instantiation of this class is StringProperty, using
- * `T = std::string` while NumericalProperty is a templated subclass dealing
- * with numerical parameter types.
+ * This subclass of Property handles a single parameter value that is of type `T`. It
+ * provides all the necessary methods to automatically access the value. One notable
+ * instantiation of this class is StringProperty, using `T = std::string` while
+ * NumericalProperty is a templated subclass dealing with numerical parameter types.
+ *
  * The accessor operator and assignment operators are overloaded, so that the
  * TemplateProperty can be used just in the same way as a regular member variable. In the
  * case that these cannot not be used inline, the Property::get method will work.
  *
  * Each instantiation of this class should provide a constructor that deals with the
- * default value for that specific type `T`, so that a property can be
- * created from just a Property::PropertyInfo object.
+ * default value for that specific type `T`, so that a property can be created from just a
+ * Property::PropertyInfo object.
  *
  * \tparam T The type of value that is stored in this TemplateProperty
+ *
  * \see Property
  * \see NumericalProperty
  */
@@ -66,33 +67,31 @@ public:
     TemplateProperty(Property::PropertyInfo info, T value);
 
     /**
-     * Returns the class name for this TemplateProperty. This method has to be
-     * specialized for each new type.
+     * Returns the class name for this TemplateProperty. This method has to be specialized
+     * for each new type.
      *
      * \return The class name for the TemplateProperty
      */
     virtual std::string_view className() const override = 0;
 
     /**
-     * Returns the stored value packed into a ghoul::any object.
+     * Returns the stored value packed into a `std::any` object.
      *
-     * \return The stored value packed into a ghoul::any object
+     * \return The stored value packed into a `std::any` object
      */
     virtual std::any get() const override;
 
     /**
-     * Sets the value from the provided ghoul::any object. If the types between
-     * `T` and `value` disagree, an error is logged and the stored
-     * value remains unchanged.
+     * Sets the value from the provided ghoul::any object. If the types between `T` and
+     * `value` disagree, an error is logged and the stored value remains unchanged.
      *
      * \param value The value that is used to set this Property
      */
     virtual void set(std::any value) final;
 
     /**
-     * Returns the `std::type_info` describing the template parameter
-     * `T`. It can be used to test against a ghoul::any value before trying to
-     * assign it.
+     * Returns the `std::type_info` describing the template parameter `T`. It can be used
+     * to test against a ghoul::any value before trying to assign it.
      *
      * \return The type info object describing the template parameter `T`
      */
@@ -127,19 +126,11 @@ public:
      */
     virtual std::string stringValue() const override;
 
-    /**
-     * Returns the description for this TemplateProperty as a Lua script that returns a
-     * table on execution.
-     *
-     * \return The description for this TemplateProperty
-     */
-    //virtual std::string description() override;
-
     /**
      * This operator allows the TemplateProperty to be used almost transparently as if it
-     * was of the type `T`. It makes assignments such as
-     * `T v = property;` possible by allowing implicit casts (even though,
-     * internally, not casts are performed. This method is next to zero overhead).
+     * was of the type `T`. It makes assignments such as `T v = property;` possible by
+     * allowing implicit casts (even though, internally, not casts are performed. This
+     * method is next to zero overhead).
      *
      * \return The internal representation of the Property
      */
@@ -147,9 +138,9 @@ public:
 
     /**
      * This operator allows the TemplateProperty to be used almost transparently as if it
-     * was of the type `T`. It makes assignments such as
-     * `T v = property;` possible by allowing implicit casts (even though,
-     * internally, not casts are performed. This method is next to zero overhead).
+     * was of the type `T`. It makes assignments such as `T v = property;` possible by
+     * allowing implicit casts (even though, internally, not casts are performed. This
+     * method is next to zero overhead).
      *
      * \return The internal representation of the Property
      */
@@ -165,10 +156,10 @@ public:
     TemplateProperty<T>& operator=(T val);
 
     /**
-     * This method sets the stored value to the provided value `val`,
-     * moving it into place. The move only happens if the provided value `val`
-     * is different from the stored value, which needs an operator== to exist for the type
-     * `T`. If the value is different, the listeners are notified.
+     * This method sets the stored value to the provided value `val`, moving it into
+     * place. The move only happens if the provided value `val` is different from the
+     * stored value, which needs an operator== to exist for the type `T`. If the value is
+     * different, the listeners are notified.
      *
      * \param val The new value for this TemplateProperty
      */
@@ -183,17 +174,17 @@ public:
 
 protected:
     /**
-     * Decodes the object at the top of the stack to a value of the type `T`
-     * and returns it. This method has to be specialized for each new type.
+     * Decodes the object at the top of the stack to a value of the type `T` and returns
+     * it. This method has to be specialized for each new type.
      *
      * \param state The Lua state from which the value will be decoded
-     * \return the decoded value
+     * \return The decoded value
      */
     virtual T fromLuaConversion(lua_State* state) const = 0;
 
     /**
-     * Encodes the stored value into a Lua object and pushes that object onto
-     * the stack. This method has to be specialized for each new type.
+     * Encodes the stored value into a Lua object and pushes that object onto the stack.
+     * This method has to be specialized for each new type.
      *
      * \param state The Lua state onto which the encoded object will be pushed
      */
@@ -201,8 +192,8 @@ protected:
 
     /**
      * Encodes the stored value into a std::string object, in a format that is a valid
-     * JSON representation of the property. This method has to be specialized for each
-     * new type.
+     * JSON representation of the property. This method has to be specialized for each new
+     * type.
      *
      * \return The resulting encoding
      */
diff --git a/include/openspace/properties/triggerproperty.h b/include/openspace/properties/triggerproperty.h
index 35bd620414..6e5210cbd7 100644
--- a/include/openspace/properties/triggerproperty.h
+++ b/include/openspace/properties/triggerproperty.h
@@ -36,11 +36,11 @@ namespace openspace::properties {
 class TriggerProperty : public Property {
 public:
     /**
-     * Initializes the TriggerProperty by delegating the `identifier` and
-     * `guiName` to the Property constructor.
+     * Initializes the TriggerProperty by delegating the `identifier` and `guiName` to the
+     * Property constructor.
      *
      * \param info The PropertyInfo structure that contains all the required static
-     *        information for initializing this Property.
+     *        information for initializing this Property
      * \pre \p info.identifier must not be empty
      * \pre \p info.guiName must not be empty
      */
@@ -54,8 +54,8 @@ public:
     std::string_view className() const override;
 
     /**
-     * Accepts only the `LUA_TNIL` type and will notify all the listeners
-     * that the event has been triggered.
+     * Accepts only the `LUA_TNIL` type and will notify all the listeners that the event
+     * has been triggered.
      *
      * \param state The unused Lua state
      */
diff --git a/include/openspace/rendering/dashboard.h b/include/openspace/rendering/dashboard.h
index 64603cc36d..2f0fcf1131 100644
--- a/include/openspace/rendering/dashboard.h
+++ b/include/openspace/rendering/dashboard.h
@@ -54,9 +54,9 @@ public:
     glm::vec2 getStartPositionOffset();
 
     /**
-    * Returns the Lua library that contains all Lua functions available to affect the
-    * rendering.
-    */
+     * Returns the Lua library that contains all Lua functions available to affect the
+     * rendering.
+     */
     static scripting::LuaLibrary luaLibrary();
 
 private:
diff --git a/include/openspace/rendering/fadeable.h b/include/openspace/rendering/fadeable.h
index 7ded6d8b1b..d26108c14a 100644
--- a/include/openspace/rendering/fadeable.h
+++ b/include/openspace/rendering/fadeable.h
@@ -31,7 +31,7 @@ namespace openspace {
 
 /**
  * This class is an interface for all things fadeable in the software; things that need
- * a fade and opacity property, which will be combined into a final opacity value
+ * a fade and opacity property, which will be combined into a final opacity value.
  *
  * A Fadeable can also be dependent on the fade value from a specified parent fadeable,
  * so that it fades out together with the parent
diff --git a/include/openspace/rendering/framebufferrenderer.h b/include/openspace/rendering/framebufferrenderer.h
index 429c5c48db..e89f2ec76d 100644
--- a/include/openspace/rendering/framebufferrenderer.h
+++ b/include/openspace/rendering/framebufferrenderer.h
@@ -67,11 +67,11 @@ public:
      * for all RenderBins. However, it cannot be used at the same time as the Deferred
      * Caster Tasks. The size of the texture is the resolution of the viewport.
      *
-     * NOTE (malej 2023-FEB-21): The currently NOT used pingPongTexture might change
+     * NOTE (malej 2023-02-21): The currently NOT used pingPongTexture might change
      * depending on where in the render cycle you are. Especially after the Deferred
      * Caster Tasks.
      *
-     * \return identifier of the currently NOT used pingPongTexture
+     * \return The identifier of the currently NOT used pingPongTexture
      */
     GLuint additionalColorTexture1() const;
 
@@ -80,7 +80,7 @@ public:
      * However, it cannot be used at the same time as the Raycaster Tasks. The size of the
      * texture is the resolution of the viewport.
      *
-     * \return identifier of the exitColorTexture
+     * \return The identifier of the exitColorTexture
      */
     GLuint additionalColorTexture2() const;
 
@@ -89,7 +89,7 @@ public:
      * However, it cannot be used at the same time as the FXAA Task. The size of the
      * texture is the resolution of the viewport.
      *
-     * \return identifier of the fxaaTexture
+     * \return The identifier of the fxaaTexture
      */
     GLuint additionalColorTexture3() const;
 
@@ -98,7 +98,7 @@ public:
      * However, it cannot be used at the same time as the Raycaster Tasks. The size of the
      * texture is the resolution of the viewport.
      *
-     * \return identifier of the exitDepthTexture
+     * \return The identifier of the exitDepthTexture
      */
     GLuint additionalDepthTexture() const;
 
@@ -111,7 +111,7 @@ public:
      * the majority of rendering the scene and might be already in use. Use CAUTION when
      * using this function. The size of the texture is the resolution of the viewport.
      *
-     * \return identifier of the color texture of the G-buffer
+     * \return The identifier of the color texture of the G-buffer
      */
     GLuint gBufferColorTexture() const;
 
@@ -121,7 +121,7 @@ public:
      * when using this function. The size of the texture is the resolution of the
      * viewport.
      *
-     * \return identifier of the position texture of the G-buffer
+     * \return The identifier of the position texture of the G-buffer
      */
     GLuint gBufferPositionTexture() const;
 
@@ -130,7 +130,7 @@ public:
      * the majority of rendering the scene and might be already in use. Use CAUTION when
      * using this function. The size of the texture is the resolution of the viewport.
      *
-     * \return identifier of the normal texture of the G-buffer
+     * \return The identifier of the normal texture of the G-buffer
      */
     GLuint gBufferNormalTexture() const;
 
@@ -139,7 +139,7 @@ public:
      * the majority of rendering the scene and might be already in use. Use CAUTION when
      * using this function. The size of the texture is the resolution of the viewport.
      *
-     * \return identifier of the depth texture of the G-buffer
+     * \return The identifier of the depth texture of the G-buffer
      */
     GLuint gBufferDepthTexture() const;
 
@@ -171,8 +171,7 @@ public:
     void render(Scene* scene, Camera* camera, float blackoutFactor);
 
     /**
-     * Update render data
-     * Responsible for calling renderEngine::setRenderData
+     * Update render data. Responsible for calling renderEngine::setRenderData
      */
     virtual void updateRendererData();
 
diff --git a/include/openspace/rendering/helper.h b/include/openspace/rendering/helper.h
index ddff046cd4..b12b0cd390 100644
--- a/include/openspace/rendering/helper.h
+++ b/include/openspace/rendering/helper.h
@@ -160,7 +160,7 @@ VertexIndexListCombo<VertexXYZNormal> createCone(unsigned int nSegments, float r
     float height);
 
 /**
- * Data structure that can be used for rendering using multiple light directions
+ * Data structure that can be used for rendering using multiple light directions.
  */
 struct LightSourceRenderData {
     unsigned int nLightSources = 0;
diff --git a/include/openspace/rendering/renderable.h b/include/openspace/rendering/renderable.h
index cb41bf07b4..c143e15a96 100644
--- a/include/openspace/rendering/renderable.h
+++ b/include/openspace/rendering/renderable.h
@@ -127,7 +127,9 @@ protected:
 
     void setRenderBinFromOpacity();
 
-    /// Returns the full opacity constructed from the _opacity and _fade property values
+    /**
+     * Returns the full opacity constructed from the _opacity and _fade property values.
+     */
     float opacity() const noexcept override;
 
     SceneGraphNode* parent() const noexcept;
@@ -148,15 +150,15 @@ protected:
     };
 
     /**
-     * Calculates the model transformation matrix with the given data and returns it
+     * Calculates the model transformation matrix with the given data and returns it.
      *
-     * \param data the RenderData for the object that the model transformation matrix
+     * \param data The RenderData for the object that the model transformation matrix
      *        should be calculated for
-     * \param altTransform an object containing alternative transformations to use instead
+     * \param altTransform An object containing alternative transformations to use instead
      *        of those given in data. The transforms can be translation, rotation and
      *        scale.
      *
-     * \return the resulting model transformation matrix in double precision
+     * \return The resulting model transformation matrix in double precision
      */
     glm::dmat4 calcModelTransform(const RenderData& data,
         const AlternativeTransform& altTransform = {
@@ -164,28 +166,26 @@ protected:
         }) const;
 
     /**
-     * Calculates the model view transformation matrix with the given data and returns it
+     * Calculates the model view transformation matrix with the given data and returns it.
      *
-     * \param data the RenderData for the object that the model view transformation matrix
+     * \param data The RenderData for the object that the model view transformation matrix
      *        should be calculated for
-     * \param modelTransform an alternative model transformation matrix to use. If not
+     * \param modelTransform An alternative model transformation matrix to use. If not
      *        provided the function will calculate a new one.
-     *
-     * \return the resulting model view transformation matrix in double precision
+     * \return The resulting model view transformation matrix in double precision
      */
     glm::dmat4 calcModelViewTransform(const RenderData& data,
         std::optional<glm::dmat4> modelTransform = std::nullopt) const;
 
     /**
      * Calculates the model view projection transformation matrix with the given data and
-     * returns it
+     * returns it.
      *
-     * \param data the RenderData for the object that the model view projection
+     * \param data The RenderData for the object that the model view projection
      *        transformation matrix should be calculated for
-     * \param modelTransform an alternative model transformation matrix to use. If not
+     * \param modelTransform An alternative model transformation matrix to use. If not
      *        provided the function will calculate a new one.
-     *
-     * \return the resulting model view projection transformation matrix in double
+     * \return The resulting model view projection transformation matrix in double
      *         precision
      */
     glm::dmat4 calcModelViewProjectionTransform(const RenderData& data,
@@ -193,15 +193,14 @@ protected:
 
     /**
      * Calculates the model, model view, and the model view projection transformation
-     * matricies with the given data and returns them in a tuple object
+     * matricies with the given data and returns them in a tuple object.
      *
-     * \param data the RenderData for the object that the transforms should be
+     * \param data The RenderData for the object that the transforms should be
      *        calculated for
-     * \param altModelTransform an object containing alternative transformations to use
+     * \param altModelTransform An object containing alternative transformations to use
      *        instead of those given in data. The transforms can be translation, rotation
      *        and scale.
-     *
-     * \return a tuple object containing the resulting model, model view, and the
+     * \return A tuple object containing the resulting model, model view, and the
      *         model view projection transformation matrices
      */
     std::tuple<glm::dmat4, glm::dmat4, glm::dmat4> calcAllTransforms(
diff --git a/include/openspace/rendering/renderengine.h b/include/openspace/rendering/renderengine.h
index 9465ada77d..6905679375 100644
--- a/include/openspace/rendering/renderengine.h
+++ b/include/openspace/rendering/renderengine.h
@@ -113,7 +113,7 @@ public:
     void removeRenderProgram(ghoul::opengl::ProgramObject* program);
 
     /**
-     * Set the camera to use for rendering
+     * Set the camera to use for rendering.
      */
     void setCamera(Camera* camera);
 
@@ -130,17 +130,17 @@ public:
     void setResolveData(ghoul::Dictionary resolveData);
 
     /**
-     * Take a screenshot and store in the ${SCREENSHOTS} directory
+     * Take a screenshot and store in the ${SCREENSHOTS} directory.
      */
     void takeScreenshot();
 
     /**
-     * Resets the screenshot index to 0
+     * Resets the screenshot index to 0.
      */
     void resetScreenshotNumber();
 
     /**
-     * Get the filename of the latest screenshot
+     * Get the filename of the latest screenshot.
      */
     unsigned int latestScreenshotNumber() const;
 
diff --git a/include/openspace/rendering/screenspacerenderable.h b/include/openspace/rendering/screenspacerenderable.h
index 0d832a7b68..e2b1e0f8fd 100644
--- a/include/openspace/rendering/screenspacerenderable.h
+++ b/include/openspace/rendering/screenspacerenderable.h
@@ -44,11 +44,11 @@ namespace openspace {
 namespace documentation { struct Documentation; }
 
 /**
- * The base class for screen space images and screen space framebuffers.
- * This base class handles general functionality specific to planes that are rendered in
- * front of the camera. It implements protected methods and properties for converting
- * the planes from Spherical to Cartesian coordinates and back. It also specifies the
- * interface that its children need to implement.
+ * The base class for screen space images and screen space framebuffers. This base class
+ * handles general functionality specific to planes that are rendered in front of the
+ * camera. It implements protected methods and properties for converting the planes from
+ * Spherical to Cartesian coordinates and back. It also specifies the interface that its
+ * children need to implement.
  */
 class ScreenSpaceRenderable : public properties::PropertyOwner, public Fadeable {
 public:
diff --git a/include/openspace/rendering/volume.h b/include/openspace/rendering/volume.h
deleted file mode 100644
index d1d63778da..0000000000
--- a/include/openspace/rendering/volume.h
+++ /dev/null
@@ -1,133 +0,0 @@
-/*****************************************************************************************
- *                                                                                       *
- * OpenSpace                                                                             *
- *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
- *                                                                                       *
- * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
- * software and associated documentation files (the "Software"), to deal in the Software *
- * without restriction, including without limitation the rights to use, copy, modify,    *
- * merge, publish, distribute, sublicense, and/or sell copies of the Software, and to    *
- * permit persons to whom the Software is furnished to do so, subject to the following   *
- * conditions:                                                                           *
- *                                                                                       *
- * The above copyright notice and this permission notice shall be included in all copies *
- * or substantial portions of the Software.                                              *
- *                                                                                       *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED,   *
- * INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A         *
- * PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT    *
- * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF  *
- * CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE  *
- * OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                                         *
- ****************************************************************************************/
-
-#ifndef __OPENSPACE_CORE___VOLUME___H__
-#define __OPENSPACE_CORE___VOLUME___H__
-
-#include <string>
-#include <vector>
-
-namespace ghoul::opengl {
-    class Texture;
-    class ProgramObject;
-} // namespace ghoul::opengl
-
-namespace openspace {
-
-class Volume {
-public:
-    /**
-     * Constructor
-     */
-    Volume() = default;
-
-    /**
-     * Destructor
-     */
-    virtual ~Volume() = default;
-
-    /**
-     * Render the volume's entry points (front face of the bounding geometry)
-     */
-    //virtual void renderEntryPoints(const RenderData& data,
-    //    ghoul::opengl::ProgramObject* program) = 0;
-
-    /**
-     * Render the volume's exit points (back face of the bounding geometry)
-     */
-    //virtual void renderExitPoints(const RenderData& data,
-    //    ghoul::opengl::ProgramObject* program) = 0;
-
-    /**
-     * Prepare the volume for the ABuffer's resolve step.
-     * Make sure textures are up to date, bind them to texture units, set program uniforms
-     * etc.
-     */
-    //virtual void preRayCast(ghoul::opengl::ProgramObject* program) {};
-
-    /**
-     * Clean up for the volume after the ABuffer's resolve step.
-     * Make sure texture units are deinitialized, etc.
-     */
-    //virtual void postRayCast(ghoul::opengl::ProgramObject* program) {};
-
-    /**
-     * Return a path to a file with the uniforms, per-vertex variables, functions etc
-     * required to transform the vertices of the bounding geometry to view space.
-     * It could also set other vertex out variables for the fragment shader to access.
-     *
-     * The shader preprocessor will have acceess to
-     *   A #{namespace} variable (unique per helper file)
-     *
-     * Should define the function:
-     * vec4 getVertex()
-     */
-    //virtual std::string boundsVertexShaderPath() = 0;
-
-    /*
-     * Return a path to a file with the functions, uniforms and fragment shader in
-     * variables required to generate the fragment color and depth.
-     *
-     * Should define the function:
-     * Fragment getFragment()
-     *
-     * The shader preprocessor will have acceess to
-     *   A #{namespace} variable (unique per helper file)
-     */
-    //virtual std::string boundsFragmentShaderPath() = 0;
-
-    /**
-     * Return a path to a file with all the uniforms, functions etc
-     * required to perform ray casting through this volume.
-     *
-     * The header should define the following two functions:
-     *   vec4 sampler#{id}(vec3 samplePos, vec3 dir, float occludingAlpha,
-     *                     inout float maxStepSize)
-     *      (return color of sample)
-     *   float stepSize#{id}(vec3 samplePos, vec3 dir)
-     *      (return the preferred step size at this sample position)
-     *
-     * The shader preprocessor will have acceess to
-     *   An #{id} variable (unique per volume)
-     *   A #{namespace} variable (unique per helper file)
-     */
-    //virtual std::string getRayCastPath() = 0;
-
-    /**
-     * Return a path to a glsl file with helper functions required for the
-     * transformation and raycast steps.
-     * This file will be included once per shader program generated,
-     * regardless of how many volumes say they require the file.
-     * Ideal to avoid redefinitions of helper functions.
-     *
-     * The shader preprocessor will have access to the #{namespace} variable (unique per
-     * helper file) which should be a prefix to all symbols defined by the helper
-     */
-    //virtual std::string helperPath() = 0;
-
-};
-
-} // namespace openspace
-
-#endif // __OPENSPACE_CORE___VOLUME___H__
diff --git a/include/openspace/rendering/volumeraycaster.h b/include/openspace/rendering/volumeraycaster.h
index cd4163f18c..da1e7e2eea 100644
--- a/include/openspace/rendering/volumeraycaster.h
+++ b/include/openspace/rendering/volumeraycaster.h
@@ -42,87 +42,85 @@ struct RaycastData;
 class VolumeRaycaster {
 public:
     /**
-     * Destructor
+     * Destructor.
      */
     virtual ~VolumeRaycaster() = default;
 
     /**
-     * Render the volume's entry points (front face of the bounding geometry)
+     * Render the volume's entry points (front face of the bounding geometry).
      */
     virtual void renderEntryPoints(const RenderData& /*data*/,
         ghoul::opengl::ProgramObject& /*program*/) = 0;
 
     /**
-     * Render the volume's exit points (back face of the bounding geometry)
+     * Render the volume's exit points (back face of the bounding geometry).
      */
     virtual void renderExitPoints(const RenderData& /*data*/,
         ghoul::opengl::ProgramObject& /*program*/) = 0;
 
     /**
-     * Prepare the volume for the ABuffer's resolve step.
-     * Make sure textures are up to date, bind them to texture units, set program uniforms
-     * etc.
+     * Prepare the volume for the ABuffer's resolve step. Make sure textures are up to
+     * date, bind them to texture units, set program uniforms etc.
      */
     virtual void preRaycast(const RaycastData& data,
         ghoul::opengl::ProgramObject& program);
 
     /**
-     * Clean up for the volume after the ABuffer's resolve step.
-     * Make sure texture units are deinitialized, etc.
+     * Clean up for the volume after the ABuffer's resolve step. Make sure texture units
+     * are deinitialized, etc.
      */
     virtual void postRaycast(const RaycastData& data,
         ghoul::opengl::ProgramObject& program);
 
     /**
-    * Return true if the camera is inside the volume.
-    * Also set localPosition to the camera position in the volume's local coordinate
-    * system.
-    */
+     * Return true if the camera is inside the volume. Also set localPosition to the
+     * camera position in the volume's local coordinate system.
+     */
     virtual bool isCameraInside(const RenderData& data, glm::vec3& localPosition);
 
     /**
-     * Return a path the file to use as vertex shader
+     * Return a path the file to use as vertex shader.
      *
-     * The shader preprocessor will have acceess to
-     *   A #{namespace} variable (unique per helper file)
+     * The shader preprocessor will have access to:
+     *   - A `#{namespace}` variable (unique per helper file)
      */
     virtual std::string boundsVertexShaderPath() const = 0;
 
-    /*
+    /**
      * Return a path to a file with the functions, uniforms and fragment shader in
      * variables required to generate the fragment color and depth.
      *
-     * Should define the function:
-     * Fragment getFragment()
+     * Should define the function: `Fragment getFragment()`
      *
-     * The shader preprocessor will have acceess to
-     *   A #{namespace} variable (unique per helper file)
+     * The shader preprocessor will have access to:
+     *   - A `#{namespace}` variable (unique per helper file)
      */
     virtual std::string boundsFragmentShaderPath() const = 0;
 
     /**
-     * Return a path to a file with all the uniforms, functions etc
-     * required to perform ray casting through this volume.
+     * Return a path to a file with all the uniforms, functions, etc. Required to perform
+     * ray casting through this volume.
      *
      * The header should define the following two functions:
+     * ```
      *   vec4 sample#{id}(vec3 samplePos, vec3 dir, float occludingAlpha,
      *                    inout float maxStepSize)
      *      (return color of sample)
      *   float stepSize#{id}(vec3 samplePos, vec3 dir)
      *      (return the preferred step size at this sample position)
+     * ```
      *
-     * The shader preprocessor will have acceess to
-     *   An #{id} variable (unique per volume)
-     *   A #{namespace} variable (unique per helper file)
+     * The shader preprocessor will have access to:
+     *   - An #{id} variable (unique per volume)
+     *   - A #{namespace} variable (unique per helper file)
      */
     virtual std::string raycasterPath() const = 0;
 
     /**
-     * Return a path to a glsl file with helper functions required for the
-     * transformation and raycast steps.
-     * This file will be included once per shader program generated,
-     * regardless of how many volumes say they require the file.
-     * Ideal to avoid redefinitions of helper functions.
+     * Return a path to a glsl file with helper functions required for the transformation
+     * and raycast steps. This file will be included once per shader program generated,
+     * regardless of how many volumes say they require the file. Ideal to avoid
+     * redefinitions of helper functions.
      *
      * The shader preprocessor will have access to the #{namespace} variable (unique per
      * helper file) which should be a prefix to all symbols defined by the helper
diff --git a/include/openspace/scene/asset.h b/include/openspace/scene/asset.h
index 9d2841c51a..164419746a 100644
--- a/include/openspace/scene/asset.h
+++ b/include/openspace/scene/asset.h
@@ -41,15 +41,16 @@ class AssetManager;
  * 0-* number of other Assets that this Asset requires (through the `require` function in
  * Lua. There also is a list of requiring assets that contain all assets which require
  * this asset.
+ *
  * An asset goes through three external states. Starting out as unloaded when the instance
  * is newly created but the file has not been processed. In this case the #isLoaded,
  * #isSynchronized and the #isInitialized functions all return `false`. After the asset
- * has been loaded it is in the `Loaded` state (#isLoaded = true,
- * #isSynchronized = false, #isInitialized = false). After all registered synchronizations
- * finish successfully, the Asset transitions into the Synchronized state
- * (#isLoaded = true, #isSynchronized = true, #isInitialized = false) and after the final
- * initialization step, the asset is initialized (#isLoaded = true,
- * #isSynchronized = true and #isInitialized = true)
+ * has been loaded it is in the `Loaded` state (#isLoaded = true, #isSynchronized = false,
+ * #isInitialized = false). After all registered synchronizations finish successfully, the
+ * Asset transitions into the Synchronized state (#isLoaded = true,
+ * #isSynchronized = true, #isInitialized = false) and after the final initialization
+ * step, the asset is initialized (#isLoaded = true, #isSynchronized = true and
+ * #isInitialized = true)
  */
 class Asset {
 public:
@@ -109,21 +110,22 @@ public:
     /**
      * Updates the state of this Asset based on the latest synchronization being
      * successfully resolved. Depending on the sum state of all registered
-     * synchronizations this Asset's state changes to successfully Synchronized, or Failed
+     * synchronizations this Asset's state changes to successfully Synchronized, or
+     * Failed.
      */
     void setSynchronizationStateResolved();
 
     /**
      * Updates the state of this Asset based on the latest synchronization being rejected.
      * Depending on the sum state of all registered synchronizations this Asset's state
-     * changes to successfully Synchronized, or Failed
+     * changes to successfully Synchronized, or Failed.
      */
     void setSynchronizationStateRejected();
 
 
     /**
-     * Register a SceneGraphNodeIdentifier with the asset
-     * (used to associate Nodes with asset meta)
+     * Register a SceneGraphNodeIdentifier with the asset (used to associate Nodes with
+     * asset meta).
      */
     void addIdentifier(std::string identifier);
 
@@ -213,10 +215,11 @@ public:
     void deinitialize();
 
     /**
-     * Marks the passed \p child as being required by \p this Asset. If the \p child is
+     * Marks the passed \p child as being required by this Asset. If the \p child is
      * already required by this asset, this function does nothing.
      *
      * \param child The asset that is required by this asset
+     *
      * \pre \p child must not be nullptr
      */
     void require(Asset* child);
@@ -296,12 +299,16 @@ private:
      */
     void setState(State state);
 
-    /// Returns whether the Asset is synchronizing or has successfully synchronized
+    /**
+     * Returns whether the Asset is synchronizing or has successfully synchronized.
+     */
     bool isSyncingOrResolved() const;
 
-    /// Returns whether the Asset has been successfully synchronized, meaning that both
-    /// its own resource synchronizations are finished as well as all requiered assets are
-    /// finished synchronizing
+    /**
+     * Returns whether the Asset has been successfully synchronized, meaning that both its
+     * own resource synchronizations are finished as well as all requiered assets are
+     * finished synchronizing.
+     */
     bool isSyncResolveReady() const;
 
     /// The state that this Asset is currently in
diff --git a/include/openspace/scene/assetmanager.h b/include/openspace/scene/assetmanager.h
index 6343d07653..2bf660e95c 100644
--- a/include/openspace/scene/assetmanager.h
+++ b/include/openspace/scene/assetmanager.h
@@ -43,6 +43,7 @@ class ResourceSynchronization;
  * loaded in OpenSpace. Most actions of this class are operating in a two-step process
  * where first the intent of an action is registered, which is then executed in the next
  * call to the #update function.
+ *
  * All assets are loading through the same Lua state.
  */
 class AssetManager {
@@ -120,6 +121,7 @@ public:
      * \param asset The asset that should be loaded
      * \param parent The parent of the loaded asset file or `nullptr` if the asset is a
      *        root asset
+     *
      * \pre \p asset must not be a nullptr
      */
     bool loadAsset(Asset* asset, Asset* parent);
@@ -130,6 +132,7 @@ public:
      * will not actually get destroyed until the next #update call to the AssetManager.
      *
      * \param asset The asset that should get unloaded
+     *
      * \pre \p asset must not be a nullptr
      */
     void unloadAsset(Asset* asset);
@@ -151,21 +154,29 @@ public:
     void callOnDeinitialize(Asset* asset) const;
 
 private:
-    /// Creates and registers all of the callback functions that the asset is expected to
-    /// call in the file, for example the `localResource`, `require`, etc.
+    /**
+     * Creates and registers all of the callback functions that the asset is expected to
+     * call in the file, for example the `localResource`, `require`, etc.
+     */
     void setUpAssetLuaTable(Asset* asset);
 
-    /// Returns the loaded Asset by either trying to load the asset at the provided path
-    /// or returning a previously loaded copy
+    /**
+     * Returns the loaded Asset by either trying to load the asset at the provided path
+     * or returning a previously loaded copy.
+     */
     Asset* retrieveAsset(const std::filesystem::path& path,
         const std::filesystem::path& retriever,
         std::optional<bool> explicitEnable = std::nullopt);
 
-    /// Setup the asset table of the provided asset in the shared Lua state
+    /**
+     * Setup the asset table of the provided asset in the shared Lua state.
+     */
     void setCurrentAsset(Asset* asset);
 
-    /// Takes the asset path, determines the type of path (relative to base, relative to
-    /// root or absolute and returns fully formed path
+    /**
+     * Takes the asset path, determines the type of path (relative to base, relative to
+     * root or absolute and returns fully formed path.
+     */
     std::filesystem::path generateAssetPath(const std::filesystem::path& baseDirectory,
         const std::string& assetPath) const;
 
@@ -204,6 +215,7 @@ private:
     /// Authoritative list over all ResourceSynchronizations that have been requested by
     /// any asset
     std::unordered_map<std::string, std::unique_ptr<SyncItem>> _synchronizations;
+
     /// The list of ResourceSynchronizations that were not finished in the last update
     /// call
     std::vector<SyncItem*> _unfinishedSynchronizations;
diff --git a/include/openspace/scene/profile.h b/include/openspace/scene/profile.h
index c1dbdeca07..436dafa67b 100644
--- a/include/openspace/scene/profile.h
+++ b/include/openspace/scene/profile.h
@@ -147,8 +147,10 @@ public:
     void saveCurrentSettingsToProfile(const properties::PropertyOwner& rootOwner,
         std::string currentTime, interaction::NavigationState navState);
 
-    /// Adds a new asset and checks for duplicates unless the `ignoreUpdates` member is
-    /// set to `true`
+    /**
+     * Adds a new asset and checks for duplicates unless the `ignoreUpdates` member is
+     * set to `true`.
+     */
     void addAsset(const std::string& path);
 
     /// Removes an asset unless the `ignoreUpdates` member is set to `true`
@@ -174,6 +176,7 @@ public:
     /**
      * Returns the Lua library that contains all Lua functions available to provide
      * profile functionality.
+     *
      * \return The Lua library that contains all Lua functions available for profiles
      */
     static scripting::LuaLibrary luaLibrary();
diff --git a/include/openspace/scene/scene.h b/include/openspace/scene/scene.h
index f6c6bd6fc6..7aed9df083 100644
--- a/include/openspace/scene/scene.h
+++ b/include/openspace/scene/scene.h
@@ -69,39 +69,41 @@ public:
         /**
          * \param msg The reason that caused this exception to be thrown
          * \param comp The optional compoment that caused this exception to be thrown
+         *
          * \pre message may not be empty
          */
         explicit InvalidSceneError(std::string msg, std::string comp = "");
     };
 
-    /// This struct describes a time that has some intrinsic interesting-ness to this
-    /// scene.
+    /**
+     * This struct describes a time that has some intrinsic interesting-ness to this
+     * scene.
+     */
     struct InterestingTime {
         std::string name;
         std::string time;
     };
 
-    // constructors & destructor
     Scene(std::unique_ptr<SceneInitializer> initializer);
     virtual ~Scene() override;
 
     /**
-     * Attach node to the root
+     * Attach node to the root.
      */
     void attachNode(ghoul::mm_unique_ptr<SceneGraphNode> node);
 
     /**
-     * Detach node from the root
+     * Detach node from the root.
      */
     ghoul::mm_unique_ptr<SceneGraphNode> detachNode(SceneGraphNode& node);
 
     /**
-     * Return the camera
+     * Return the camera.
      */
     Camera* camera() const;
 
     /**
-     * Updates all SceneGraphNodes relative positions
+     * Updates all SceneGraphNodes relative positions.
      */
     void update(const UpdateData& data);
 
@@ -121,8 +123,8 @@ public:
     const SceneGraphNode* root() const;
 
     /**
-     * Return the scenegraph node with the specified name or `nullptr` if that
-     * name does not exist.
+     * Return the scenegraph node with the specified name or `nullptr` if that name does
+     * not exist.
      */
     SceneGraphNode* sceneGraphNode(const std::string& name) const;
 
@@ -137,7 +139,7 @@ public:
     void unregisterNode(SceneGraphNode* node);
 
     /**
-     * Mark the node registry as dirty
+     * Mark the node registry as dirty.
      */
     void markNodeRegistryDirty();
 
@@ -162,7 +164,7 @@ public:
     void initializeNode(SceneGraphNode* node);
 
     /**
-     * Return true if the scene is initializing
+     * Return true if the scene is initializing.
      */
     bool isInitializing() const;
 
@@ -191,7 +193,7 @@ public:
 
     /**
      * Removes the passed \p prop from the list of Property%s that are update each time
-     * the #updateInterpolations method is called
+     * the #updateInterpolations method is called.
      *
      * \param prop The Property that should not longer be updated
      *
@@ -232,16 +234,17 @@ public:
     /**
      * Returns the Lua library that contains all Lua functions available to change the
      * scene graph.
+     *
      * \return The Lua library that contains all Lua functions available to change the
-     * scene graph
+     *         scene graph
      */
     static scripting::LuaLibrary luaLibrary();
 
     /**
      * Sets a property using the 'properties' contents of a profile. The function will
-     * loop through each setProperty command. A property may be set to a bool, float,
-     * or string value (which must be converted because a Profile stores all values
-     * as strings)
+     * loop through each setProperty command. A property may be set to a bool, float, or
+     * string value (which must be converted because a Profile stores all values as
+     * strings).
      *
      * \param p The Profile to be read.
      */
@@ -251,7 +254,7 @@ public:
      * Searches for any properties that match the regex propertyString, and returns
      * the results in a vector.
      *
-     * \param propertyString the regex string that is intended to match one or more
+     * \param propertyString The regex string that is intended to match one or more
      *        properties in the currently-available properties
      * \return Vector of Property objs containing property names that matched the regex
      */
@@ -268,19 +271,19 @@ public:
 private:
     /**
      * Accepts string version of a property value from a profile, converts it to the
-     * appropriate type, and then pushes the value onto the lua state.
+     * appropriate type, and then pushes the value onto the Lua state.
      *
-     * \param L the lua state to push value to
-     * \param value string representation of the value with which to set property
+     * \param L The Lua state to push value to
+     * \param value String representation of the value with which to set property
      */
     void propertyPushProfileValueToLua(ghoul::lua::LuaState& L, const std::string& value);
 
     /**
      * Accepts string version of a property value from a profile, and processes it
-     * according to the data type of the value
+     * according to the data type of the value.
      *
-     * \param L the lua state to (eventually) push to
-     * \param value string representation of the value with which to set property
+     * \param L The Lua state to (eventually) push to
+     * \param value String representation of the value with which to set property
      * \return The ProfilePropertyLua variant type translated from string representation
      */
     ProfilePropertyLua propertyProcessValue(ghoul::lua::LuaState& L,
@@ -288,31 +291,31 @@ private:
 
     /**
      * Accepts string version of a property value from a profile, and returns the
-     * supported data types that can be pushed to a lua state. Currently, the full
-     * range of possible lua values is not supported.
+     * supported data types that can be pushed to a Lua state. Currently, the full range
+     * of possible Lua values is not supported.
      *
-     * \param value string representation of the value with which to set property
+     * \param value String representation of the value with which to set property
      */
     PropertyValueType propertyValueType(const std::string& value);
 
     /**
      * Accepts string version of a property value from a profile, and adds it to a vector
-     * which will later be used to push as a lua table containing values of type T
+     * which will later be used to push as a Lua table containing values of type T
      *
-     * \param L the lua state to (eventually) push to
-     * \param value string representation of the value with which to set property
-     * \param table the std::vector container which has elements of type T for a lua table
+     * \param L The Lua state to (eventually) push to
+     * \param value String representation of the value with which to set property
+     * \param table The std::vector container which has elements of type T for a Lua table
      */
     template <typename T>
     void processPropertyValueTableEntries(ghoul::lua::LuaState& L,
         const std::string& value, std::vector<T>& table);
 
     /**
-     * Handles a lua table entry, creating a vector of the correct variable type based
-     * on the profile string, and pushes this vector to the lua stack.
+     * Handles a Lua table entry, creating a vector of the correct variable type based
+     * on the profile string, and pushes this vector to the Lua stack.
      *
-     * \param L the lua state to (eventually) push to
-     * \param value string representation of the value with which to set property
+     * \param L The Lua state to (eventually) push to
+     * \param value String representation of the value with which to set property
      */
     void handlePropertyLuaTableEntry(ghoul::lua::LuaState& L, const std::string& value);
 
diff --git a/include/openspace/scripting/lualibrary.h b/include/openspace/scripting/lualibrary.h
index 03427c595b..7e2fff2241 100644
--- a/include/openspace/scripting/lualibrary.h
+++ b/include/openspace/scripting/lualibrary.h
@@ -33,15 +33,15 @@
 namespace openspace::scripting {
 
 /**
- * This structure represents a Lua library, itself consisting of a unique #name and
- * an arbitrary number of #functions
+ * This structure represents a Lua library, itself consisting of a unique #name and an
+ * arbitrary number of #functions.
  */
 struct LuaLibrary {
     /**
-    * This structure represents a Lua function with its #name, #function pointer
-    * #arguments describe the arguments this function takes, and the #helpText describing
-    * the function.
-    */
+     * This structure represents a Lua function with its #name, #function pointer
+     * #arguments describe the arguments this function takes, and the #helpText describing
+     * the function.
+     */
     struct Function {
         /// The name of the function
         std::string name;
diff --git a/include/openspace/scripting/scriptengine.h b/include/openspace/scripting/scriptengine.h
index 65e6703fe9..d8ebac7f97 100644
--- a/include/openspace/scripting/scriptengine.h
+++ b/include/openspace/scripting/scriptengine.h
@@ -44,9 +44,9 @@ namespace openspace::scripting {
  * The ScriptEngine is responsible for handling the execution of custom Lua functions and
  * executing scripts (#runScript and #runScriptFile). Before usage, it has to be
  * #initialize%d and #deinitialize%d. New ScriptEngine::Library%s consisting of
- * ScriptEngine::Library::Function%s have to be added which can then be called using the
- * `openspace` namespace prefix in Lua. The same functions can be exposed to
- * other Lua states by passing them to the #initializeLuaState method.
+ * Library::Function%s have to be added which can then be called using the
+ * `openspace` namespace prefix in Lua. The same functions can be exposed to other Lua
+ * states by passing them to the #initializeLuaState method.
  */
 class ScriptEngine : public Syncable {
 public:
@@ -66,7 +66,8 @@ public:
     ScriptEngine();
 
     /**
-     * Initializes the internal Lua state and registers a common set of library functions
+     * Initializes the internal Lua state and registers a common set of library functions.
+     *
      * \throw LuaRuntimeException If the creation of the new Lua state fails
      */
     void initialize();
diff --git a/include/openspace/scripting/scriptscheduler.h b/include/openspace/scripting/scriptscheduler.h
index 8c6d9a70f5..76b26c3710 100644
--- a/include/openspace/scripting/scriptscheduler.h
+++ b/include/openspace/scripting/scriptscheduler.h
@@ -45,8 +45,8 @@ namespace openspace::scripting {
 struct LuaLibrary;
 
 /**
- * Maintains an ordered list of `ScheduledScript`s and provides a simple
- * interface for retrieveing scheduled scripts
+ * Maintains an ordered list of `ScheduledScript`s and provides a simple interface for
+ * retrieveing scheduled scripts.
  */
 class ScriptScheduler : public properties::PropertyOwner {
 public:
@@ -69,8 +69,9 @@ public:
      * ScheduledScript%s to the list of stored scripts.
      *
      * \param scheduledScripts The scripts that should be loaded
+     *
      * \throw SpecificationError If the dictionary does not adhere to the Documentation as
-     * specified in the openspace::Documentation function
+     *        specified in the openspace::Documentation function
      */
     void loadScripts(std::vector<ScheduledScript> scheduledScripts);
 
@@ -84,51 +85,48 @@ public:
      * Removes all scripts for the schedule.
      *
      * \param group An int that specifies which group to clear. If none given then all
-     *              scripts
-     *        is cleared from the schedule.
+     *              scripts are cleared from the schedule
      */
     void clearSchedule(std::optional<int> group = std::nullopt);
 
     /**
-    * Progresses the script schedulers time and returns all scripts that has been
-    * scheduled to run between \p newTime and the time provided in the last invocation
-    * of this method.
-    *
-    * \param newTime A j2000 time value specifying the new time stamp that
-    * the script scheduler should progress to.
-    *
-    * \returns vector with the scheduled scripts that should be run from begining to end.
-    */
+     * Progresses the script schedulers time and returns all scripts that has been
+     * scheduled to run between \p newTime and the time provided in the last invocation
+     * of this method.
+     *
+     * \param newTime A j2000 time value specifying the new time stamp that the script
+     *        scheduler should progress to.
+     * \return vector with the scheduled scripts that should be run from begining to end
+     */
     std::vector<std::string> progressTo(double newTime);
 
     /**
-     * Returns the the j2000 time value that the script scheduler is currently at
+     * Returns the the j2000 time value that the script scheduler is currently at.
      */
     double currentTime() const;
 
     /**
-     * Updates the current time to the given j2000 time value
+     * Updates the current time to the given J2000 time value.
      */
     void setCurrentTime(double time);
 
     /**
-    * Function that returns all scripts currently loaded in the script scheduler
-    *
-    * \param group An int specifying which group to return, if empty all scripts
-    *              will be returned
-    *
-    * \returns a vector of all scripts that has been loaded
-    */
+     * Function that returns all scripts currently loaded in the script scheduler.
+     *
+     * \param group An int specifying which group to return, if empty all scripts
+     *              will be returned
+     * \return a vector of all scripts that has been loaded
+     */
     std::vector<ScheduledScript> allScripts(
         std::optional<int> group = std::nullopt) const;
 
     /**
-    * Sets the mode for how each scheduled script's timestamp will be interpreted.
-    * \param refType reference mode (for exact syntax, see definition of
-    * openspace::interaction::KeyframeTimeRef) which is either relative to the
-    * application start time, relative to the recorded session playback start time,
-    * or according to the absolute simulation time in seconds from J2000 epoch.
-    */
+     * Sets the mode for how each scheduled script's timestamp will be interpreted.
+     * \param refType reference mode (for exact syntax, see definition of
+     * interaction::KeyframeTimeRef) which is either relative to the application start
+     * time, relative to the recorded session playback start time, or according to the
+     * absolute simulation time in seconds from J2000 epoch.
+     */
     void setTimeReferenceMode(openspace::interaction::KeyframeTimeRef refType);
 
     static LuaLibrary luaLibrary();
diff --git a/include/openspace/util/collisionhelper.h b/include/openspace/util/collisionhelper.h
index 166c7767d5..2cf906211d 100644
--- a/include/openspace/util/collisionhelper.h
+++ b/include/openspace/util/collisionhelper.h
@@ -29,11 +29,11 @@
 
 namespace openspace::collision {
 
-/*
- * Calculate the intersection of a line segment and a sphere.
- * The line segment is defined from \p p1 to \p p2.
- * The sphere is defined by the radius \p r and center point \p center.
- * The resulting intersection point is stored in the \p intersectionPoint parameter.
+/**
+ * Calculate the intersection of a line segment and a sphere. The line segment is defined
+ * from \p p1 to \p p2. The sphere is defined by the radius \p r and center point
+ * \p center. The resulting intersection point is stored in the \p intersectionPoint
+ * parameter.
  *
  * In the case of two intersection points, only care about the first one.
  *
@@ -48,7 +48,7 @@ namespace openspace::collision {
 bool lineSphereIntersection(glm::dvec3 p1, glm::dvec3 p2, glm::dvec3 center,
     double r, glm::dvec3& intersectionPoint);
 
-/*
+/**
  * Check if the point \p p is inside of the sphere defined by radius \p r and center
  * point \p c
  */
diff --git a/include/openspace/util/concurrentjobmanager.h b/include/openspace/util/concurrentjobmanager.h
index 32dacfa3cf..ee92a92038 100644
--- a/include/openspace/util/concurrentjobmanager.h
+++ b/include/openspace/util/concurrentjobmanager.h
@@ -34,9 +34,9 @@ namespace openspace {
 
 template <typename T> struct Job;
 
-/*
+/**
  * Templated Concurrent Job Manager
- * This class is used execute specific jobs on one (1) parallell thread
+ * This class is used execute specific jobs on one (1) parallel thread
  */
 template<typename P>
 class ConcurrentJobManager {
diff --git a/include/openspace/util/concurrentqueue.h b/include/openspace/util/concurrentqueue.h
index ded68bcc66..86f2345169 100644
--- a/include/openspace/util/concurrentqueue.h
+++ b/include/openspace/util/concurrentqueue.h
@@ -32,7 +32,7 @@
 namespace openspace {
 
 /**
- * Templated thread-safe queue based on std::thread and std::queue
+ * Templated thread-safe queue based on std::thread and std::queue.
  */
 template <typename T>
 class ConcurrentQueue {
diff --git a/include/openspace/util/coordinateconversion.h b/include/openspace/util/coordinateconversion.h
index 56d50ddf4c..66e07a6dbc 100644
--- a/include/openspace/util/coordinateconversion.h
+++ b/include/openspace/util/coordinateconversion.h
@@ -32,16 +32,18 @@ namespace openspace {
 
 /**
  * Converts from ICRS decimal degrees coordinates to galactic cartesian coordinates.
+ *
  * \param ra Right ascension, given in decimal degrees
  * \param dec Declination, given in decimal degrees
- * \param distance The distance, or radius, to the position given in any unit.
+ * \param distance The distance, or radius, to the position given in any unit
  * \return A position in galactic cartesian coordinates, given in the same unit as the
- *         distance parameter.
+ *         distance parameter
  */
 glm::dvec3 icrsToGalacticCartesian(double ra, double dec, double distance);
 
 /**
  * Converts from ICRS (hms and dms) coordinates to decimal degrees.
+ *
  * \param ra Right ascension, given as a string in format 'XhYmZs'
  * \param dec Declination, given as a string in format 'XdYmZs'
  * \return The decimal degrees coordinate in degrees
@@ -51,18 +53,18 @@ glm::dvec2 icrsToDecimalDegrees(const std::string& ra, const std::string& dec);
 /**
  * Converts from galactic cartesian coordinates to ICRS decimal degrees coordinates
  * and distance.
- * \param x X coordinate
- * \param y Y coordinate
- * \param z Z coordinate
- * \return A vector with the ra and dec decimal degrees in degrees and distance.
+ *
+ * \param x, y, z X, Y, and Z coordinates
+ * \return A vector with the ra and dec decimal degrees in degrees and distance
  */
 glm::dvec3 galacticCartesianToIcrs(double x, double y, double z);
 
 /**
  * Converts from ICRS decimal degrees coordinates to ICRS hms and dms coordinates.
+ *
  * \param ra Right ascension, given in decimal degrees
  * \param dec Declination, given in decimal degrees
- * \return A pair with the ra and dec strings in hms and dms format.
+ * \return A pair with the ra and dec strings in hms and dms format
  */
 std::pair<std::string, std::string> decimalDegreesToIcrs(double ra, double dec);
 
diff --git a/include/openspace/util/factorymanager.h b/include/openspace/util/factorymanager.h
index fcf8ef7eac..d16c4c9e6b 100644
--- a/include/openspace/util/factorymanager.h
+++ b/include/openspace/util/factorymanager.h
@@ -39,13 +39,16 @@ namespace openspace {
  */
 class FactoryManager {
 public:
-    /// This exception is thrown if the ghoul::TemplateFactory could not be found in the
-    /// #factory method
+    /**
+     * This exception is thrown if the ghoul::TemplateFactory could not be found in the
+     * #factory method.
+     */
     struct FactoryNotFoundError : public ghoul::RuntimeError {
         /**
          * Constructor for FactoryNotFoundError, the \p type is a human-readable (-ish)
          * type descriptor for the type `T` for the TemplateFactory that could
          * not be found.
+         *
          * \param t The type `T` for the `TemplateFactory<T>` that could not be found
          * \pre \p t must not be empty
          */
@@ -60,36 +63,41 @@ public:
     /**
      * Static initializer that initializes the static member. This needs to be done before
      * the FactoryManager can be used.
+     *
      * \pre The FactoryManager must not have been initialized before
      */
     static void initialize();
 
     /**
      * Deinitializes the static member and all the registered ghoul::TemplateFactory%s.
+     *
      * \pre The FactoryManager must have been initialized before
      */
     static void deinitialize();
 
     /**
-     * Returns `true` if the static FactoryManager has already been
-     * initiailzed, `false` otherwise.
+     * Returns `true` if the static FactoryManager has already been initialized, `false`
+     * otherwise.
+     *
      * \return The initialization status of the static FactoryManager
      */
     static bool isInitialized();
 
     /**
      * This method returns a reference to the initialized FactoryManager.
+     *
      * \return An initialized reference to the singleton manager
+     *
      * \pre The FactoryManager must have been initialized before
      */
     static FactoryManager& ref();
 
     /**
      * Adds the passed \p factory to the FactoryManager. Factories may only be added once.
-     * \param name A user-readable name for the registered factory.
      *
      * \tparam Factory The type for which a factory should be created and added
-     *
+     * \param name A user-readable name for the registered factory
+     *     *
      * \pre \p name must not be empty
      */
     template <typename T>
@@ -99,10 +107,12 @@ public:
      * This method provides access to all registered ghoul::TemplateFactory%s through
      * their type. The method will always return a proper ghoul::TemplateFactory or throw
      * an error if the appropriate ghoul::TemplateFactory was not registered.
+     *
      * \tparam T The type that the requested ghoul::TemplateFactory should create
      * \return The ghoul::TemplateFactory that will create the pass type `T`
+     *
      * \throw FactoryNotFoundError If the requested ghoul::TemplateFactory could not be
-     * found
+     *        found
      */
     template <class T>
     ghoul::TemplateFactory<T>* factory() const;
diff --git a/include/openspace/util/histogram.h b/include/openspace/util/histogram.h
index 4ce1fb2c5f..784f3b553f 100644
--- a/include/openspace/util/histogram.h
+++ b/include/openspace/util/histogram.h
@@ -44,14 +44,12 @@ public:
     bool isValid() const;
 
     /**
-     * Enter value into the histogram. The add method takes the given
-     * value, works out which bin this corresponds to, and increments
-     * this bin by 'repeat'.
+     * Enter value into the histogram. The add method takes the given value, works out
+     * which bin this corresponds to, and increments this bin by 'repeat'.
      *
-     * @param value The Value to insert into the histogram
-     * @param repeat How many times you want to insert it
-     *
-     * @return Returns true if succesful insertion, otherwise return false
+     * \param value The Value to insert into the histogram
+     * \param repeat How many times you want to insert it
+     * \return Returns `true` if succesful insertion, otherwise return `false`
      */
     bool add(float value, float repeat = 1.0f);
     bool add(const Histogram& histogram);
diff --git a/include/openspace/util/httprequest.h b/include/openspace/util/httprequest.h
index 0fc5c4c03a..026f544398 100644
--- a/include/openspace/util/httprequest.h
+++ b/include/openspace/util/httprequest.h
@@ -43,14 +43,14 @@ namespace openspace {
  * This class performs a synchronous HTTP request to the provided URL. Any result that is
  * returned based on this request is returned through three callback functions that can be
  * registered using the #onHeader, #onProgress, and #onData functions. Calling these
- * functions will overwrite any previously registered handler.
- * The ProgressCallback can be used to stop the download if the handler returns `false`.
+ * functions will overwrite any previously registered handler. The ProgressCallback can be
+ * used to stop the download if the handler returns `false`.
  *
  * The workflow for this class:
- * 1. Create a new object with the URL that points to the location from which the data
- *    should be loaded
- * 2. Register the callbacks that are needed (at least the #onData callback)
- * 3. Start the download with the #perform function
+ *   1. Create a new object with the URL that points to the location from which the data
+ *      should be loaded
+ *   2. Register the callbacks that are needed (at least the #onData callback)
+ *   3. Start the download with the #perform function
  */
 class HttpRequest {
 public:
@@ -77,8 +77,8 @@ public:
      * that have arrived. The buffer pointed to will most likely only be valid during the
      * time of the callback and it is the callbacks responsibility to store the contents
      * of the buffer before the callback returns. If the return value is `true`, the
-     * download continues, if it is `false`, this signals to the library that an error
-     * has occurred from which recovery is not possible.
+     * download continues, if it is `false`, this signals to the library that an error has
+     * occurred from which recovery is not possible.
      *
      * \param buffer The pointer to the beginning of the buffer where the new incoming
      *        data is located. This buffer is only valid during the execution of this
@@ -95,9 +95,9 @@ public:
      * for the response. The buffer pointed to will most likely only be valid during the
      * time of the callback and it is the callbacks responsibility to store the contents
      * of the buffer before the callback returns. If the return value is `true`, the
-     * download continues, if it is `false`, this signals to the library that an error
-     * has occurred from which recovery is not possible. If this function returns
-     * `false`, it will cause the main download to not start at all.
+     * download continues, if it is `false`, this signals to the library that an error has
+     * occurred from which recovery is not possible. If this function returns `false`, it
+     * will cause the main download to not start at all.
      *
      * \param buffer The pointer to the beginning of the buffer where the header
      *        information is located. This buffer is only valid during the execution of
@@ -164,7 +164,6 @@ public:
      * \param timeout The amount of time the request will wait before aborting due to the
      *        server not responding. If this value is 0, there is no timeout on the
      *        request.
-     *
      * \return `true` if the request completed successfully, `false` otherwise
      */
     bool perform(std::chrono::milliseconds timeout = std::chrono::milliseconds(0));
@@ -287,13 +286,12 @@ protected:
      * pointed to will most likely only be valid during the time of the callback and it is
      * the callbacks responsibility to store the contents of the buffer before the
      * callback returns. If the return value is `true`, the download continues, if it is
-     * `false`, this signals to the library that an error has occurred from which
-     * recovery is not possible. This function will be called on a different thread from
-     * the one that called the #start method.
+     * `false`, this signals to the library that an error has occurred from which recovery
+     * is not possible. This function will be called on a different thread from the one
+     * that called the #start method.
      *
      * \param buffer The beginning of the buffer of this chunk of data
      * \param size The number of bytes that the \p buffer contains
-     *
      * \return The implementation should return `true` if the downloading should continue
      *         and `false` if the handling of the data caused some error that the
      *         subclass is incapable of recovering from
@@ -303,8 +301,8 @@ protected:
     /**
      * This function is called before the downloading starts and can be used by subclasses
      * to perform one-time setup functions, such as opening a file, reserving a block of
-     * storage, etc. This function guaranteed to be only called once per HttpDownload.
-     * The return value determines if the setup operation completed successfully or if an
+     * storage, etc. This function guaranteed to be only called once per HttpDownload. The
+     * return value determines if the setup operation completed successfully or if an
      * error occurred that will cause the download to be terminated. This function will be
      * called on a different thread from the one that called the #start method.
      *
@@ -386,15 +384,21 @@ public:
     std::filesystem::path destination() const;
 
 private:
-    /// Will create all directories that are necessary to reach _destination and then
-    /// fight with other HttpFileDownloads to get one of a limited number of file handles
-    /// to open _file
+    /**
+     * Will create all directories that are necessary to reach _destination and then
+     * fight with other HttpFileDownloads to get one of a limited number of file handles
+     * to open _file.
+     */
     bool setup() override;
 
-    /// Closes the _file and returns the handle back to the pool of available handles
+    /**
+     * Closes the _file and returns the handle back to the pool of available handles.
+     */
     bool teardown() override;
 
-    /// Stores the chunk of data into the _file handle
+    /**
+     * Stores the chunk of data into the _file handle.
+     */
     bool handleData(char* buffer, size_t size) override;
 
     /// A flag whether this HttpFileDownload got a handle from the limited supply of
@@ -402,7 +406,7 @@ private:
     /// handles from the operating system as that resource is limited and downloads would
     /// fail unrecoverably if no handles are available. So we limit the maximum number and
     /// if that number is exceeded, the HttpFileDownload will wait until a handle is
-    /// available.
+    /// available
     std::atomic_bool _hasHandle = false;
 
     /// The destination path where the contents of the URL provided in the constructor
@@ -433,7 +437,7 @@ class HttpMemoryDownload : public HttpDownload {
 public:
     /**
      * Creates an instance of a HttpMemoryDownload that will download the contents of the
-     * \p url into memory
+     * \p url into memory.
      *
      * \param url The URL whose contents should be downloaded
      */
@@ -449,15 +453,17 @@ public:
      * Returns a reference to the buffer that is used to store the contents of the URL
      * passed in the constructor. Please observe that while the HttpDownload::hasFinished
      * method returns `false`, this buffer will be changed by a different thread and
-     * access is not thread-safe. After that function returns `true`, it is safe to
-     * access the buffer.
+     * access is not thread-safe. After that function returns `true`, it is safe to access
+     * the buffer.
      *
      * \return A reference to the buffer used to hold the contents of the URL
      */
     const std::vector<char>& downloadedData() const;
 
 private:
-    /// Stores each downloaded chunk into the stored buffer
+    /**
+     * Stores each downloaded chunk into the stored buffer.
+     */
     bool handleData(char* buffer, size_t size) override;
 
     /// The buffer where the downloaded chunks are accumulated
diff --git a/include/openspace/util/job.h b/include/openspace/util/job.h
index ba7da7c906..13dc5fcc06 100644
--- a/include/openspace/util/job.h
+++ b/include/openspace/util/job.h
@@ -29,8 +29,10 @@
 
 namespace openspace {
 
-// Templated abstract base class representing a job to be done.
-// Client code derive from this class and implement the virtual execute() method
+/**
+ * Templated abstract base class representing a job to be done. Client code derive from
+ * this class and implement the virtual execute() method.
+ */
 template <typename P>
 struct Job {
     Job() = default;
diff --git a/include/openspace/util/json_helper.h b/include/openspace/util/json_helper.h
index 6761e6bfcf..4042599c36 100644
--- a/include/openspace/util/json_helper.h
+++ b/include/openspace/util/json_helper.h
@@ -31,8 +31,8 @@
 namespace openspace {
 
 /**
- * This function takes a \p text and escapes all necessary characters () that JSON
- * does not want in its strings.
+ * This function takes a \p text and escapes all necessary characters that JSON does not
+ * want in its strings.
  *
  * \param text The text that is to be escaped
  * \return The same text with all required characteres escaped
@@ -40,8 +40,8 @@ namespace openspace {
 std::string escapedJson(const std::string& text);
 
 /**
- * This function takes a \p list of text and escapes all necessary characters () that
- * JSON does not want in its strings.
+ * This function takes a \p list of text and escapes all necessary characters that JSON
+ * does not want in its strings.
  *
  * \param list The list of text that is to be escaped
  * \return The same text with all required characteres escaped
@@ -49,8 +49,8 @@ std::string escapedJson(const std::string& text);
 std::string escapedJson(const std::vector<std::string>& list);
 
 /**
- * Convert the input value to a valid JSON formatted string. Nan and Inf values
- * are not vald JSON and will be represented by 'null'.
+ * Convert the input value to a valid JSON formatted string. Nan and Inf values are not
+ * valid JSON and will be represented by `null`.
  *
  * \param d The value to format
  * \return The resulting JSON formatted string
@@ -68,10 +68,10 @@ std::string formatJson(T value);
 
 /**
  * Sort a json object that is an array of objects with the structure
- * [ key = {}, key = {} ...]. Sorts it by the provided key
+ * `[ key = {}, key = {} ...]`. Sorts it by the provided key.
  *
- * \param json The json to sort
- * \param key The key the json should be sorted by
+ * \param json The JSON object to sort
+ * \param key The key the JSON should be sorted by
  */
 void sortJson(nlohmann::json& json, const std::string& key);
 
diff --git a/include/openspace/util/openspacemodule.h b/include/openspace/util/openspacemodule.h
index 7ba1b3c019..7e626f5f90 100644
--- a/include/openspace/util/openspacemodule.h
+++ b/include/openspace/util/openspacemodule.h
@@ -62,26 +62,26 @@ public:
 
     /**
      * Initialization method that will register a token of the form
-     * `${MODULE_<<NAME>>}` for a specific `<<NAME>>` that
-     * is set in the OpenSpaceModule constructor. This method will call the
-     * internalInitialize method for further customization for each subclass.
+     * `${MODULE_<<NAME>>}` for a specific `<<NAME>>` that is set in the OpenSpaceModule
+     * constructor. This method will call the #internalInitialize method for further
+     * customization for each subclass.
      */
     void initialize(const ghoul::Dictionary& configuration);
 
     /**
-     * This method calls the internalInitializeGL method for further customization for
+     * This method calls the #internalInitializeGL method for further customization for
      * each subclass.
      */
     void initializeGL();
 
     /**
-     * Empty deinitialization method that will call the internalDeinitialize method for
+     * Empty deinitialization method that will call the #internalDeinitialize method for
      * module-specific customization.
      */
     void deinitialize();
 
     /**
-     * This method will call the internalDeinitializeGL method for each subclass.
+     * This method will call the #internalDeinitializeGL method for each subclass.
      */
     void deinitializeGL();
 
@@ -122,15 +122,14 @@ public:
      * Returns the list of required OpenGL extensions for this OpenSpaceModule. Unless
      * overwritten, this function returns an empty list.
      *
-     * \return The list of required OpenGL extensions necessary to use this
-     *         OpenSpaceModule
+     * \return The list of required OpenGL extensions necessary to use this module
      */
     virtual std::vector<std::string> requiredOpenGLExtensions() const;
 
 protected:
     /**
-     * Customization point for each derived class. The internalInitialize method is called
-     * by the initialize method.
+     * Customization point for each derived class. The #internalInitialize method is
+     * called by the initialize method.
      *
      * \param configuration The configuration options that were read from the
      *        configuration file
@@ -138,21 +137,21 @@ protected:
     virtual void internalInitialize(const ghoul::Dictionary& configuration);
 
     /**
-     * Customization point for each derived class. The internalInitializeGL method is
-     * called by the initializeGL method at a time when a valid OpenGL state is
+     * Customization point for each derived class. The #internalInitializeGL method is
+     * called by the #initializeGL method at a time when a valid OpenGL state is
      * guaranteed.
      */
     virtual void internalInitializeGL();
 
     /**
-     * Customization point for each derived class. The internalDeinitialize method is
+     * Customization point for each derived class. The #internalDeinitialize method is
      * called by the deinitialize method.
      */
     virtual void internalDeinitialize();
 
     /**
-     * Customization point for each derived class. The internalDeinitializeGL method is
-     * called by the deinitializeGL method at a time when a valid OpenGL state is
+     * Customization point for each derived class. The #internalDeinitializeGL method is
+     * called by the #deinitializeGL method at a time when a valid OpenGL state is
      * guaranteed.
      */
     virtual void internalDeinitializeGL();
diff --git a/include/openspace/util/resourcesynchronization.h b/include/openspace/util/resourcesynchronization.h
index 1849a4b7ba..699940ed93 100644
--- a/include/openspace/util/resourcesynchronization.h
+++ b/include/openspace/util/resourcesynchronization.h
@@ -42,13 +42,14 @@ namespace documentation { struct Documentation; }
  * function, whose dictionary must contain at least a `Type` value that specifies which
  * type of ResourceSynchronization should be create. Any type that is registered to the
  * global factory is a valid type here.
+ *
  * A ResourceSynchronization state can be in one of four states that can be queried
  * through the #isSyncing, #isResolved, and #isRejected functions. The available states
  * are:
- *  - `Unsynchronized` (#isSyncing = false, #isResolved = false, #isRejected = false)
- *  - `Syncing` (#isSyncing = true, #isResolved = false, #isRejected = false)
- *  - `Resolved` (#isSyncing = false, #isResolved = true, #isRejected = false)
- *  - `Rejected` (#isSyncing = false, #isResolved = false, #isRejected = true)
+ *   - `Unsynchronized` (#isSyncing = false, #isResolved = false, #isRejected = false)
+ *   - `Syncing` (#isSyncing = true, #isResolved = false, #isRejected = false)
+ *   - `Resolved` (#isSyncing = false, #isResolved = true, #isRejected = false)
+ *   - `Rejected` (#isSyncing = false, #isResolved = false, #isRejected = true)
  */
 class ResourceSynchronization {
 public:
@@ -74,7 +75,9 @@ public:
      */
     virtual std::string generateUid() = 0;
 
-    /// Defaulted virtual constructor
+    /**
+     * Defaulted virtual constructor.
+     */
     virtual ~ResourceSynchronization() = default;
 
     /**
@@ -85,10 +88,14 @@ public:
      */
     virtual std::filesystem::path directory() const = 0;
 
-    /// Starts the synchronization for this ResourceSynchronization
+    /**
+     * Starts the synchronization for this ResourceSynchronization.
+     */
     virtual void start() = 0;
 
-    /// Cancels any ongoing synchronization of this ResourceSynchronization
+    /**
+     * Cancels any ongoing synchronization of this ResourceSynchronization.
+     */
     virtual void cancel() = 0;
 
     /**
@@ -168,10 +175,14 @@ public:
     static documentation::Documentation Documentation();
 
 protected:
-    /// Empty constructor that just sets the synchronization root
+    /**
+     * Empty constructor that just sets the synchronization root.
+     */
     ResourceSynchronization(std::filesystem::path synchronizationRoot);
 
-    /// Representation of the state that this object can be in
+    /**
+     * Representation of the state that this object can be in.
+     */
     enum class State {
         Unsynced,
         Syncing,
@@ -179,11 +190,15 @@ protected:
         Rejected
     };
 
-    /// Creates a file next to the directory that indicates that this
-    /// ResourceSynchronization has successfully synchronized its contents
+    /**
+     * Creates a file next to the directory that indicates that this.
+     * ResourceSynchronization has successfully synchronized its contents.
+     */
     virtual void createSyncFile(bool isFullySynchronized = true) const;
 
-    /// Returns whether the synchronization file create in #createSyncFile exists
+    /**
+     * Returns whether the synchronization file create in #createSyncFile exists.
+     */
     bool hasSyncFile() const;
 
     /// The internal identifier for this ResourceSynchronization. It is not enforced but
diff --git a/include/openspace/util/screenlog.h b/include/openspace/util/screenlog.h
index 4fbd047955..e82cc92201 100644
--- a/include/openspace/util/screenlog.h
+++ b/include/openspace/util/screenlog.h
@@ -36,10 +36,9 @@ namespace openspace {
 
 /**
  * The ScreenLog is an implementation of the ghoul::logging::Log abstract interface that
- * can be used to present log messages in an on-screen GUI. For this, every incoming
- * log message (#log) is tagged with the current time and all stored log messages can
- * expire based on the time-to-live as specified in the constructor
- * (#removeExpiredEntries).
+ * can be used to present log messages in an on-screen GUI. For this, every incoming log
+ * message (#log) is tagged with the current time and all stored log messages can expire
+ * based on the time-to-live as specified in the constructor (#removeExpiredEntries).
  */
 class ScreenLog : public ghoul::logging::Log {
 public:
@@ -99,9 +98,9 @@ public:
      * This method removes all the stored LogEntry%s that have expired, calculated by
      * their `timeStamp` and the #_timeToLive value.
      *
-     * \post All entries retrieved by the #entries function have a `timeStamp`
-     *       that is lower than the current time + #_timeToLive. The current time used is
-     *       the time when this method was last called
+     * \post All entries retrieved by the #entries function have a `timeStamp` that is
+     *       lower than the current time + #_timeToLive. The current time used is the time
+     *       when this method was last called
      */
     void removeExpiredEntries();
 
@@ -117,7 +116,7 @@ private:
     std::vector<LogEntry> _entries;
 
     /// The time-to-live for the LogEntry%s in this ScreenLog. Is used by the
-    /// #removeExpiredEntries method to remove expired entries.
+    /// #removeExpiredEntries method to remove expired entries
     std::chrono::seconds _timeToLive;
 
     /// The minimum LogLevel of messages
diff --git a/include/openspace/util/spicemanager.h b/include/openspace/util/spicemanager.h
index aad2c1f737..30e5b4845e 100644
--- a/include/openspace/util/spicemanager.h
+++ b/include/openspace/util/spicemanager.h
@@ -72,19 +72,29 @@ public:
 
     /**
      * Specifies the aberration correction method for the #targetPosition function.
+     *
      * \sa http://naif.jpl.nasa.gov/pub/naif/toolkit_docs/C/cspice/spkpos_c.html
      */
     struct AberrationCorrection {
     public:
-        /// The type of the aberration correction
+        /**
+         * The type of the aberration correction.
+         */
         enum class Type {
-            None = 0, ///< No correction (`NONE`)
-            LightTime, ///< One-way light time (`LT`)
-            LightTimeStellar, ///< One-way light time and stellar (`LT+S`)
-            ConvergedNewtonian, ///< Converged newtonian light time (`CN`)
-            ConvergedNewtonianStellar ///< Converged newtonian+stellar (`CN+S`)
+            /// No correction (`NONE`)
+            None = 0,
+            /// One-way light time (`LT`)
+            LightTime,
+            /// One-way light time and stellar (`LT+S`)
+            LightTimeStellar,
+            /// Converged newtonian light time (`CN`)
+            ConvergedNewtonian,
+            /// Converged newtonian+stellar (`CN+S`)
+            ConvergedNewtonianStellar
         };
-        /// The direction of the aberration correct
+        /**
+         * The direction of the aberration correct.
+         */
         enum class Direction {
             Reception = 0,
             Transmission
@@ -92,13 +102,13 @@ public:
 
         /**
          * Default constructor initializing the AberrationCorrection to Type::None with a
-         * Direction::Reception
+         * Direction::Reception.
          */
         AberrationCorrection() = default;
 
         /**
          * Constructor initializing the AberrationCorrection to the provided \p type and
-         * \p direction
+         * \p direction.
          *
          * \param t The type of the aberration correction (AberrationCorrection::Type)
          * \param d The used direction (AberrationCorrection::Direction)
@@ -108,16 +118,15 @@ public:
         /**
          * Converts one of the valid aberration correction strings into its enumeration
          * format. The valid strings are:
-         *
-         *  - `NONE`
-         *  - `LT`
-         *  - `LT+S`
-         *  - `CN`
-         *  - `CN+S`
-         *  - `XLT`
-         *  - `XLT+S`
-         *  - `XCN`
-         *  - XCN+S.
+         *   - `NONE`
+         *   - `LT`
+         *   - `LT+S`
+         *   - `CN`
+         *   - `CN+S`
+         *   - `XLT`
+         *   - `XLT+S`
+         *   - `XCN`
+         *   - XCN+S
          *
          * \param identifier The identifier that should be converted into the enumeration
          *        Type and Direction
@@ -139,7 +148,9 @@ public:
         Direction direction = Direction::Reception;
     };
 
-    /// The possible values for the method parameter of the targetInFieldOfView method
+    /**
+     * The possible values for the method parameter of the targetInFieldOfView method.
+     */
     enum class FieldOfViewMethod {
         Ellipsoid = 0,
         Point
@@ -157,15 +168,17 @@ public:
      */
     static FieldOfViewMethod fieldOfViewMethodFromString(const std::string& method);
 
-    /// The possible values for terminator type method of the terminatorEllipse method
+    /**
+     * The possible values for terminator type method of the terminatorEllipse method.
+     */
     enum class TerminatorType {
         Umbral = 0,
         Penumbral
     };
 
     /**
-     * Returns the TerminatorType for the passed string. The allowed strings are
-     * `UMBRAL` and `PENUMBRAL`. All other values will result in an exception.
+     * Returns the TerminatorType for the passed string. The allowed strings are `UMBRAL`
+     * and `PENUMBRAL`. All other values will result in an exception.
      *
      * \param type The terminator type
      * \return The terminator type enum
@@ -187,12 +200,12 @@ public:
      * safely be loaded multiple times and are reference counted.
      *
      * \param filePath The path to the kernel that should be loaded. This path will be
-     *        passed to `absPath` to convert a relative path to an absolute
-     *        path before usage
+     *        passed to `absPath` to convert a relative path to an absolute path before
+     *        usage
      * \return The loaded kernel's unique identifier that can be used to unload the kernel
      *
-     * \throw SpiceException If the loading of the kernel \p filePath failed if,
-     *        for example, \p filePath is not a valid SPICE kernel
+     * \throw SpiceException If the loading of the kernel \p filePath failed if, for
+     *        example, \p filePath is not a valid SPICE kernel
      * \pre \p filePath must not be empty.
      * \pre \p filePath must be an absolute or relative path pointing to an existing file.
      * \post The kernel is loaded or has its reference counter incremented and the handle
@@ -205,11 +218,12 @@ public:
 
     /**
      * Unloads a SPICE kernel identified by the \p kernelId which was returned by the
-     * loading call to #loadKernel. The unloading is done by calling the
-     * `unload_c` function.
+     * loading call to #loadKernel. The unloading is done by calling the `unload_c`
+     * function.
      *
      * \param kernelId The unique identifier that was returned from the call to
      *        #loadKernel which loaded the kernel
+     *
      * \pre \p kernelId must be a valid handle.
      * \pre \p kernelId cannot be equal to `KernelHandle(0)`.
      * \post The kernel identified by \p kernelId is unloaded.
@@ -220,10 +234,10 @@ public:
 
     /**
      * Unloads a SPICE kernel identified by the \p filePath which was used in the
-     * loading call to #loadKernel. The unloading is done by calling the
-     * `unload_c` function.
+     * loading call to #loadKernel. The unloading is done by calling the `unload_c`
+     * function.
      *
-     * \param filePath The path of the kernel that should be unloaded.
+     * \param filePath The path of the kernel that should be unloaded
      *
      * \throw SpiceException If the \p filePath has not been previously used to
      *        successfully load a kernel.
@@ -235,26 +249,26 @@ public:
     void unloadKernel(std::string filePath);
 
     /**
-     * Returns whether a given \p target has an Spk kernel covering it at the designated
+     * Returns whether a given \p target has an SPK kernel covering it at the designated
      * \p et ephemeris time.
      *
      * \param target The body to be examined. The target has to name a valid SPICE object
      *        with respect to the kernels that have been loaded
      * \param et The time for which the coverage should be checked
-     * \return `true` if SPK kernels have been loaded to cover \p target at the
-     *         time \p et, `false` otherwise.
+     * \return `true` if SPK kernels have been loaded to cover \p target at the time
+     *         \p et, `false` otherwise
      *
      * \throw SpiceException If \p target does not name a valid SPICE object
-     * \pre \p target must not be empty.
+     * \pre \p target must not be empty
      */
     bool hasSpkCoverage(const std::string& target, double et) const;
 
     /**
-     * Returns a list of loaded SPK coverage intervals for \p target
+     * Returns a list of loaded SPK coverage intervals for \p target.
      *
      * \param target The body to be examined. The target has to name a valid SPICE object
      *        with respect to the kernels that have been loaded
-     * \return `list` of SPK kernels for \p target , `empty` list if none loaded.
+     * \return `list` of SPK kernels for \p target, `empty` list if none loaded
      *
      * \throw SpiceException If \p target does not name a valid SPICE object
      * \pre \p target must not be empty.
@@ -268,34 +282,33 @@ public:
      * \param frame The frame to be examined. The \p frame has to name a valid frame with
      *        respect to the kernels that have been loaded
      * \param et The time for which the coverage should be checked
-     * \return `true` if SPK kernels have been loaded to cover \p target at the
-     *         time \p et, false otherwise.
+     * \return `true` if SPK kernels have been loaded to cover \p target at the time
+     *         \p et, false otherwise
      *
      * \throw SpiceException If \p target does not name a valid SPICE object or \p frame
      *        is not a valid frame
-     * \pre \p target must not be empty.
+     * \pre \p target must not be empty
      */
     bool hasCkCoverage(const std::string& frame, double et) const;
 
     /**
-    * Returns a list of loaded CK coverage intervals for \p target
-    *
-    * \param target The body to be examined. The target has to name a valid SPICE object
-    *        with respect to the kernels that have been loaded
-    * \return `list` of CK kernels for \p target , `empty` list if none loaded.
-    *
-    * \throw SpiceException If \p target does not name a valid SPICE object
-    * \pre \p target must not be empty.
-    */
+     * Returns a list of loaded CK coverage intervals for \p target.
+     *
+     * \param target The body to be examined. The target has to name a valid SPICE object
+     *        with respect to the kernels that have been loaded
+     * \return `list` of CK kernels for \p target, `empty` list if none loaded
+     *
+     * \throw SpiceException If \p target does not name a valid SPICE object
+     * \pre \p target must not be empty.
+     */
     std::vector<std::pair<double, double>> ckCoverage(const std::string& target) const;
 
     /**
-   * Returns a list of loaded spice frames,
-   *
-   * \param builtInFrames Boolean representing if builtIn or LoadedFrames should be used
-   * \return `list` of Spice frames with ID(int) and Name(string).
-   *
-   */
+     * Returns a list of loaded spice frames.
+     *
+     * \param builtInFrames Boolean representing if builtIn or LoadedFrames should be used
+     * \return `list` of Spice frames with ID(int) and Name(string)
+     */
     std::vector<std::pair<int, std::string>> spiceBodies(bool builtInFrames) const;
 
     /**
@@ -319,9 +332,9 @@ public:
      * \param item The item to find in the \p body
      * \return `true` if the function succeeded, `false` otherwise
      *
-     * \throw SpiceException If \p body does not name a valid SPICE object.
-     * \pre \p body must not be empty.
-     * \pre \p item must not be empty.
+     * \throw SpiceException If \p body does not name a valid SPICE object
+     * \pre \p body must not be empty
+     * \pre \p item must not be empty
      *
      * \sa http://naif.jpl.nasa.gov/pub/naif/toolkit_docs/C/cspice/bodfnd_c.html
      */
@@ -331,11 +344,11 @@ public:
      * Returns the NAIF ID for a specific \p body using the `bods2c_c` function.
      *
      * \param body The body name that should be retrieved
-     * \return The ID of the `body` will be stored in this variable. The
-     *         value will only be changed if the retrieval was successful
+     * \return The ID of the `body` will be stored in this variable. The value will only
+     *         be changed if the retrieval was successful
      *
-     * \throw SpiceException If \p body does not name a valid SPICE object.
-     * \pre \p body must not be empty.
+     * \throw SpiceException If \p body does not name a valid SPICE object
+     * \pre \p body must not be empty
      *
      * \sa http://naif.jpl.nasa.gov/pub/naif/toolkit_docs/C/cspice/bods2c_c.html
      * \sa http://naif.jpl.nasa.gov/pub/naif/toolkit_docs/C/req/naif_ids.html
@@ -359,8 +372,8 @@ public:
      * \param frame The frame name that should be retrieved
      * \return The NAIF ID of the \p frame
      *
-     * \throw SpiceException If \p frame is not a valid frame.
-     * \pre \p frame must not be empty.
+     * \throw SpiceException If \p frame is not a valid frame
+     * \pre \p frame must not be empty
      *
      * \sa http://naif.jpl.nasa.gov/pub/naif/toolkit_docs/C/cspice/namfrm_c.html
      */
@@ -373,7 +386,7 @@ public:
      * \param frame The frame for which the presence of a valid ID should be checked
      * \return `true` if the \p frame has a NAIF ID, `false` otherwise
      *
-     * \pre \p frame must not be empty.
+     * \pre \p frame must not be empty
      */
     bool hasFrameId(const std::string& frame) const;
 
@@ -388,11 +401,10 @@ public:
      * \param value The value that should be retrieved, this value is case-sensitive
      * \param v The destination for the retrieved value
      *
-     * \throw SpiceException If the \p body does not name a valid body, \p value
-     *        is not a valid item for the \p body or the retrieved value is not a single
-     *        value.
-     * \pre \p body must not be empty.
-     * \pre \p value must not be empty.
+     * \throw SpiceException If the \p body does not name a valid body, \p value is not a
+     *        valid item for the \p body or the retrieved value is not a single value
+     * \pre \p body must not be empty
+     * \pre \p value must not be empty
      *
      * \sa http://naif.jpl.nasa.gov/pub/naif/toolkit_docs/C/cspice/bodvrd_c.html
      * \sa http://naif.jpl.nasa.gov/pub/naif/toolkit_docs/C/req/naif_ids.html
@@ -410,11 +422,11 @@ public:
      * \param value The value that should be retrieved, this value is case-sensitive
      * \param v The destination for the retrieved value
      *
-     * \throw SpiceException If the \p body does not name a valid body, \p value
-     *        is not a valid item for the \p body or the retrieved value is not a
-     *        two-component value.
-     * \pre \p body must not be empty.
-     * \pre \p value must not be empty.
+     * \throw SpiceException If the \p body does not name a valid body, \p value is not a
+     *        valid item for the \p body or the retrieved value is not a two-component
+     *        value
+     * \pre \p body must not be empty
+     * \pre \p value must not be empty
      *
      * \sa http://naif.jpl.nasa.gov/pub/naif/toolkit_docs/C/cspice/bodvrd_c.html
      * \sa http://naif.jpl.nasa.gov/pub/naif/toolkit_docs/C/req/naif_ids.html
@@ -432,11 +444,11 @@ public:
      * \param value The value that should be retrieved, this value is case-sensitive
      * \param v The destination for the retrieved value
      *
-     * \throw SpiceException If the \p body does not name a valid body, \p value
-     *        is not a valid item for the \p body or the retrieved value is not a
-     *        three-component value.
-     * \pre \p body must not be empty.
-     * \pre \p value must not be empty.
+     * \throw SpiceException If the \p body does not name a valid body, \p value is not a
+     *        valid item for the \p body or the retrieved value is not a three-component
+     *        value
+     * \pre \p body must not be empty
+     * \pre \p value must not be empty
      *
      * \sa http://naif.jpl.nasa.gov/pub/naif/toolkit_docs/C/cspice/bodvrd_c.html
      * \sa http://naif.jpl.nasa.gov/pub/naif/toolkit_docs/C/req/naif_ids.html
@@ -454,9 +466,9 @@ public:
      * \param value The value that should be retrieved, this value is case-sensitive
      * \param v The destination for the retrieved value
      *
-     * \throw SpiceException If the \p body does not name a valid body, \p value
-     *        is not a valid item for the \p body or the retrieved value is not a
-     *        four-component value.
+     * \throw SpiceException If the \p body does not name a valid body, \p value is not a
+     *        valid item for the \p body or the retrieved value is not a four-component
+     *        value
      * \pre \p body must not be empty.
      * \pre \p value must not be empty.
      *
@@ -468,9 +480,9 @@ public:
     /**
      * Retrieves a \p value with an arbitrary number of components for a certain \p body.
      * This method succeeds iff \p body is the name of a valid body, \p value is a value
-     * associated with the body, and the value consists of the correct number of
-     * `double` values. If all conditions are true, the value is retrieved using the
-     * method `bodvrd_c` and stored in \p v.
+     * associated with the body, and the value consists of the correct number of `double`
+     * values. If all conditions are true, the value is retrieved using the method
+     * `bodvrd_c` and stored in \p v.
      *
      * \param body The name of the body whose value should be retrieved or the NAIF ID of
      *        this body
@@ -478,9 +490,9 @@ public:
      * \param v The destination for the retrieved value. The `vector` must be
      *          preallocated to the correct size of components that should be retrieved
      *
-     * \throw SpiceException If the \p body does not name a valid body, \p value
-     *        is not a valid item for the \p body or the retrieved value does not contain
-     *        the correct number of components
+     * \throw SpiceException If the \p body does not name a valid body, \p value is not a
+     *        valid item for the \p body or the retrieved value does not contain the
+     *        correct number of components
      * \pre \p body must not be empty.
      * \pre \p value must not be empty.
      *
@@ -498,26 +510,25 @@ public:
      * \param craftTicks The internal clock ticks for the specified craft
      * \return The converted ephemeris time
      *
-     * \throw SpiceException If the name \p craft is not a valid name
-     *        available through all loaded kernels, if the craft is not supported by any
-     *        of the loaded kernel, or if the provided \p craftTicks is not a valid tick
-     *        time for the specific spacecraft
+     * \throw SpiceException If the name \p craft is not a valid name available through
+     *        all loaded kernels, if the craft is not supported by any of the loaded
+     *        kernel, or if the provided \p craftTicks is not a valid tick time for the
+     *        specific spacecraft
      * \pre \p craft must not be empty
      */
     double spacecraftClockToET(const std::string& craft, double craftTicks);
 
     /**
-     * Converts the \p timeString representing a date to a double precision
-     * value representing the ephemeris time; that is the number of TDB
-     * seconds past the J2000 epoch.
+     * Converts the \p timeString representing a date to a double precision value
+     * representing the ephemeris time; that is the number of TDB seconds past the J2000
+     * epoch.
      *
      * \param timeString A string representing the time to be converted
      * \return The converted time; the number of TDB seconds past the J2000 epoch,
      *         representing the passed \p timeString
      *
-     * \throw SpiceException If \p timeString is not a valid timestring according
-     *        to the `str2et_c` function (see the Particulars section of the linked
-     *        webpage).
+     * \throw SpiceException If \p timeString is not a valid timestring according to the
+     *        `str2et_c` function (see the Particulars section of the linked webpage)
      * \pre \p timeString must not be empty
      *
      * \sa http://naif.jpl.nasa.gov/pub/naif/toolkit_docs/C/cspice/str2et_c.html
@@ -532,7 +543,7 @@ public:
      * \param ephemerisTime The ephemeris time, that is the number of TDB seconds past the
      *        J2000 epoch
      * \param format The format string describing the output format
-     * \return The destination for the converted date.
+     * \return The destination for the converted date
      *
      * \pre \p format must not be empty
      *
@@ -587,18 +598,18 @@ public:
      * \param ephemerisTime The time at which the position is to be queried
      * \param lightTime If the \p aberrationCorrection is different from
      *        AbberationCorrection::Type::None, this variable will contain the light time
-     *        between the observer and the target.
+     *        between the observer and the target
      * \return The position of the \p target relative to the \p observer in the specified
      *         \p referenceFrame
      *
-     * \throw SpiceException If the \p target or \p observer do not name a valid
-     *        NAIF object, \p referenceFrame does not name a valid reference frame or if
-     *        there is not sufficient data available to compute the position or neither
-     *        the target nor the observer have coverage.
-     * \pre \p target must not be empty.
-     * \pre \p observer must not be empty.
-     * \pre \p referenceFrame must not be empty.
-     * \post If an exception is thrown, \p lightTime will not be modified.
+     * \throw SpiceException If the \p target or \p observer do not name a valid NAIF
+     *        object, \p referenceFrame does not name a valid reference frame or if there
+     *        is not sufficient data available to compute the position or neither the
+     *        target nor the observer have coverage.
+     * \pre \p target must not be empty
+     * \pre \p observer must not be empty
+     * \pre \p referenceFrame must not be empty
+     * \post If an exception is thrown, \p lightTime will not be modified
      *
      * \sa http://naif.jpl.nasa.gov/pub/naif/toolkit_docs/C/cspice/spkpos_c.html
      * \sa http://naif.jpl.nasa.gov/pub/naif/toolkit_docs/C/req/naif_ids.html
@@ -621,14 +632,14 @@ public:
      * \return The position of the \p target relative to the \p observer in the specified
      *         \p referenceFrame
      *
-     * \throw SpiceException If the \p target or \p observer do not name a valid
-     *        NAIF object, \p referenceFrame does not name a valid reference frame or if
-     *        there is not sufficient data available to compute the position or neither
-     *        the target nor the observer have coverage.
-     * \pre \p target must not be empty.
-     * \pre \p observer must not be empty.
-     * \pre \p referenceFrame must not be empty.
-     * \post If an exception is thrown, \p lightTime will not be modified.
+     * \throw SpiceException If the \p target or \p observer do not name a valid NAIF
+     *        object, \p referenceFrame does not name a valid reference frame or if there
+     *        is not sufficient data available to compute the position or neither the
+     *        target nor the observer have coverage
+     * \pre \p target must not be empty
+     * \pre \p observer must not be empty
+     * \pre \p referenceFrame must not be empty
+     * \post If an exception is thrown, \p lightTime will not be modified
      *
      * \sa http://naif.jpl.nasa.gov/pub/naif/toolkit_docs/C/cspice/spkpos_c.html
      * \sa http://naif.jpl.nasa.gov/pub/naif/toolkit_docs/C/req/naif_ids.html
@@ -648,32 +659,28 @@ public:
      * \return The transformation matrix
      *
      * \throw SpiceException If the transformation matrix between \p from and \p to
-     *        cannot be determined.
-     * \pre \p from must not be empty.
-     * \pre \p to must not be empty.
+     *        cannot be determined
+     * \pre \p from must not be empty
+     * \pre \p to must not be empty
      */
     glm::dmat3 frameTransformationMatrix(const std::string& from,
         const std::string& to, double ephemerisTime) const;
 
-    /// Struct that is used as the return value from the #surfaceIntercept method
+    /**
+     * Struct that is used as the return value from the #surfaceIntercept method.
+     */
     struct SurfaceInterceptResult {
-        /**
-         * The closest surface intercept point on the target body in Cartesian Coordinates
-         * relative to the reference frame.
-         */
+        /// The closest surface intercept point on the target body in Cartesian Coordinates
+        /// relative to the reference frame
         glm::dvec3 surfaceIntercept = glm::dvec3(0.0);
 
-        /**
-         * If the aberration correction is not AberrationCorrection::Type::None, this
-         * value contains the time for which the intercept was computed. Otherwise it is
-         * the same as the ephemerisTime.
-         */
+        /// If the aberration correction is not AberrationCorrection::Type::None, this
+        /// value contains the time for which the intercept was computed. Otherwise it is
+        /// the same as the ephemerisTime
         double interceptEpoch = 0.0;
 
-        /**
-         * The vector from the observer's position to the \p surfaceIntercept position in
-         * the provided reference frame.
-         */
+        /// The vector from the observer's position to the \p surfaceIntercept position in
+        /// the provided reference frame
         glm::dvec3 surfaceVector = glm::dvec3(0.0);
 
         /// `true` if the ray intersects the body, `false` otherwise
@@ -697,17 +704,17 @@ public:
      * \return A SurfaceInterceptResult structure that contains all information about the
      *         intercept, including whether an intercept was found
      *
-     * \throw SpiceException If the \p target or \p observer do not name the same
-     *        NAIF object, the \p target or \p observer name the same NAIF object or are
-     *        in the same location, the \p referenceFrame or \p fovFrame are not
-     *        recognized, insufficient kernel information has been loaded.
-     * \pre \p target must not be empty.
-     * \pre \p observer must not be empty.
+     * \throw SpiceException If the \p target or \p observer do not name the same NAIF
+     *        object, the \p target or \p observer name the same NAIF object or are in the
+     *        same location, the \p referenceFrame or \p fovFrame are not recognized,
+     *        insufficient kernel information has been loaded.
+     * \pre \p target must not be empty
+     * \pre \p observer must not be empty
      * \pre \p The \p target and \p observer must be different strings
-     * \pre \p fovFrame must not be empty.
-     * \pre \p referenceFrame must not be empty.
+     * \pre \p fovFrame must not be empty
+     * \pre \p referenceFrame must not be empty
      * \pre \p directionVector must not be the null vector
-     * \post The SurfaceInterceptResult does not contain any uninitialized values.
+     * \post The SurfaceInterceptResult does not contain any uninitialized values
      *
      * \sa http://naif.jpl.nasa.gov/pub/naif/toolkit_docs/C/cspice/sincpt_c.html
      */
@@ -730,15 +737,15 @@ public:
      * \param ephemerisTime Time of the observation (seconds past J2000)
      * \return `true` if the target is visible, `false` otherwise
      *
-     * \throw SpiceException If the \p target or \p observer do not name valid
-     *        NAIF objects, the \p target or \p observer name the same NAIF object, the
+     * \throw SpiceException If the \p target or \p observer do not name valid NAIF
+     *        objects, the \p target or \p observer name the same NAIF object, the
      *        \p instrument does not name a valid NAIF object, or insufficient kernel
-     *        information has been loaded.
-     * \pre \p target must not be empty.
-     * \pre \p observer must not be empty.
+     *        information has been loaded
+     * \pre \p target must not be empty
+     * \pre \p observer must not be empty
      * \pre \p target and \p observer must not be different strings
-     * \pre \p referenceFrame must not be empty.
-     * \pre \p instrument must not be empty.
+     * \pre \p referenceFrame must not be empty
+     * \pre \p instrument must not be empty
      *
      * \sa http://naif.jpl.nasa.gov/pub/naif/toolkit_docs/C/cspice/fovtrg_c.html
      */
@@ -747,7 +754,9 @@ public:
         FieldOfViewMethod method, AberrationCorrection aberrationCorrection,
         double& ephemerisTime) const;
 
-    /// Struct that is used as the return value from the #targetState method
+    /**
+     * Struct that is used as the return value from the #targetState method.
+     */
     struct TargetStateResult {
         /// The target position
         glm::dvec3 position = glm::dvec3(0.0);
@@ -755,8 +764,8 @@ public:
         /// The target velocity
         glm::dvec3 velocity = glm::dvec3(0.0);
 
-        /// One-way light time between `target` and `observer` if
-        /// the aberration correction is enabled
+        /// One-way light time between `target` and `observer` if the aberration
+        /// correction is enabled
         double lightTime = 0.0;
     };
 
@@ -777,15 +786,15 @@ public:
      *         \p aberrationCorrection is set to a valid different from
      *         AberrationCorrection::None
      *
-     * \throw SpiceException If the \p target or \p observer do not name a valid
-     *        NAIF object, the \p referenceFrame is not a valid frame, or if there is
-     *        insufficient kernel information.
-     * \pre \p target must not be empty.
-     * \pre \p observer must not be empty.
-     * \pre \p referenceFrame must not be empty.
-     * \post The resulting TargetStateResult is set to valid values; the
-     *       `lightTime` is only set to a valid different from `0.0` if the
-     *       \p aberrationCorrection is not AberrationCorrection::None.
+     * \throw SpiceException If the \p target or \p observer do not name a valid NAIF
+     *        object, the \p referenceFrame is not a valid frame, or if there is
+     *        insufficient kernel information
+     * \pre \p target must not be empty
+     * \pre \p observer must not be empty
+     * \pre \p referenceFrame must not be empty
+     * \post The resulting TargetStateResult is set to valid values; the `lightTime` is
+     *       only set to a valid different from `0.0` if the \p aberrationCorrection is
+     *       not AberrationCorrection::None
      *
      * \sa http://naif.jpl.nasa.gov/pub/naif/toolkit_docs/C/cspice/spkezr_c.html
      * \sa http://naif.jpl.nasa.gov/pub/naif/toolkit_docs/C/req/naif_ids.html
@@ -807,8 +816,8 @@ public:
      *
      * \throw SpiceException If the \p sourceFrame or the \p destinationFrame is
      *        not a valid frame
-     * \pre \p sourceFrame must not be empty.
-     * \pre \p destinatoinFrame must not be empty.
+     * \pre \p sourceFrame must not be empty
+     * \pre \p destinatoinFrame must not be empty
      *
      * \sa http://naif.jpl.nasa.gov/pub/naif/toolkit_docs/C/cspice/sxform_c.html
      */
@@ -847,12 +856,12 @@ public:
      * \param ephemerisTimeTo The time for the destination reference frame
      * \return The transformation matrix that maps between the \p sourceFrame at time
      *         \p ephemerisTimeFrom to the \p destinationFrame at the time
-     *         \p ephemerisTimeTo.
+     *         \p ephemerisTimeTo
      *
      * \throw SpiceException If there is no coverage available for the specified
-     *         \p sourceFrame and \p destinationFrame
-     * \pre \p sourceFrame must not be empty.
-     * \pre \p destinationFrame must not be empty.
+     *        \p sourceFrame and \p destinationFrame
+     * \pre \p sourceFrame must not be empty
+     * \pre \p destinationFrame must not be empty
      */
     glm::dmat3 positionTransformMatrix(const std::string& sourceFrame,
         const std::string& destinationFrame, double ephemerisTimeFrom,
@@ -860,12 +869,18 @@ public:
 
     /// The structure returned by the #fieldOfView methods
     struct FieldOfViewResult {
-        /// The rough shape of the returned field of view
+        /**
+         * The rough shape of the returned field of view.
+         */
         enum class Shape {
-            Polygon = 0, ///< The shape is a pyramedal polyhedron
-            Rectangle, ///< The shape is a rectangular pyramid
-            Circle, ///< The shape is circular
-            Ellipse ///< The shape is an ellipse
+            /// The shape is a pyramedal polyhedron
+            Polygon = 0,
+            /// The shape is a rectangular pyramid
+            Rectangle,
+            /// The shape is circular
+            Circle,
+            /// The shape is an ellipse
+            Ellipse
         };
 
         /// The shape of the returned field of view
@@ -887,7 +902,7 @@ public:
      *
      * \param instrument The name of the instrument for which the FOV is to be retrieved
      * \return The FieldOfViewResult structure that contains information about the field
-     *         of view.
+     *         of view
      *
      * \throw SpiceException If \p instrument does not name a valid NAIF object
      * \pre \p instrument must not be empty
@@ -904,7 +919,7 @@ public:
      *
      * \param instrument The name of the instrument for which the FOV is to be retrieved
      * \return The FieldOfViewResult structure that contains information about the field
-     *         of view.
+     *         of view
      *
      * \throw SpiceException If \p instrument does not name a valid NAIF object
      * \post The returned structure has all its values initialized
@@ -913,7 +928,9 @@ public:
      */
     FieldOfViewResult fieldOfView(int instrument) const;
 
-    /// The structure retuned by the #terminatorEllipse method
+    /**
+     * The structure retuned by the #terminatorEllipse method.
+     */
     struct TerminatorEllipseResult {
         /// The vector from the target body at #targetEphemerisTime to the observer at
         /// the original time
@@ -941,16 +958,16 @@ public:
      *        surface in total shadow. TerminatorType::Penumbral is the boundary of the
      *        portion of the surface that is completely illuminated. Note that in
      *        astronomy references, the unqualified word "terminator" refers to the umbral
-     *        terminator.
+     *        terminator
      * \param aberrationCorrection The aberration correction method that is used
      * \param ephemerisTime The time at which the terminator ellipse shall be computed
      * \param numberOfTerminatorPoints The number of points along terminator that should
      *        be computed by this method
      * \return A TerminatorEllipseResult structure that contains all outputs of this
-     * function
+     *         function
      *
-     * \throw SpiceException If the \p target, \p observer, or \p lightSource are
-     *        not valid NAIF names, the \p frame is not a valid NAIF frame or there is
+     * \throw SpiceException If the \p target, \p observer, or \p lightSource are not
+     *        valid NAIF names, the \p frame is not a valid NAIF frame or there is
      *        insufficient kernel data loaded
      * \pre \p target must not be empty
      * \pre \p observer must not be empty
@@ -987,20 +1004,29 @@ public:
     static scripting::LuaLibrary luaLibrary();
 
 private:
-    /// Struct storing the information about all loaded kernels
+    /**
+     * Struct storing the information about all loaded kernels.
+     */
     struct KernelInformation {
-        std::string path; /// The path from which the kernel was loaded
-        KernelHandle id; /// A unique identifier for each kernel
-        int refCount; /// How many parts loaded this kernel and are interested in it
+        /// The path from which the kernel was loaded
+        std::string path;
+        /// A unique identifier for each kernel
+        KernelHandle id;
+        /// How many parts loaded this kernel and are interested in it
+        int refCount;
     };
 
-    /// Default constructor setting values for SPICE to not terminate on error
+    /**
+     * Default constructor setting values for SPICE to not terminate on error.
+     */
     SpiceManager();
     SpiceManager(const SpiceManager& c) = delete;
     SpiceManager& operator=(const SpiceManager& r) = delete;
     SpiceManager(SpiceManager&& r) = delete;
 
-    /// Default destructor that resets the SPICE settings
+    /**
+     * Default destructor that resets the SPICE settings.
+     */
     ~SpiceManager();
 
     /**
@@ -1066,8 +1092,8 @@ private:
      * If a transform matrix is requested for an uncovered time in the CK kernels, this
      * function will an estimated matrix. If the coverage has not yet started, the first
      * transform matrix will be retrieved. If the coverage has ended, the last transform
-     * matrix will be retrieved. If \p time is in a coverage gap, the transform
-     * matrix will be interpolated.
+     * matrix will be retrieved. If \p time is in a coverage gap, the transform matrix
+     * will be interpolated.
      *
      * \param fromFrame The transform matrix will be retrieved in relation to this frame
      * \param toFrame The reference frame into which the resulting matrix will transformed
@@ -1083,7 +1109,9 @@ private:
     glm::dmat3 getEstimatedTransformMatrix(const std::string& fromFrame,
         const std::string& toFrame, double time) const;
 
-    /// Loads pre defined leap seconds time kernel (naif00012.tls).
+    /**
+     * Loads pre defined leap seconds time kernel (naif00012.tls).
+     */
     void loadLeapSecondsSpiceKernel();
 
     /// A list of all loaded kernels
diff --git a/include/openspace/util/syncable.h b/include/openspace/util/syncable.h
index 8910423d45..9789a97525 100644
--- a/include/openspace/util/syncable.h
+++ b/include/openspace/util/syncable.h
@@ -30,9 +30,7 @@ namespace openspace {
 class SyncBuffer;
 
 /**
- * Interface for synchronizable data
- *
- * Used by `SyncEngine`
+ * Interface for synchronizable data. Used by #SyncEngine.
  */
 class Syncable {
 public:
diff --git a/include/openspace/util/syncbuffer.h b/include/openspace/util/syncbuffer.h
index 22e6dfc2b9..35e63daefc 100644
--- a/include/openspace/util/syncbuffer.h
+++ b/include/openspace/util/syncbuffer.h
@@ -59,9 +59,6 @@ public:
 
     void reset();
 
-    //void write();
-    //void read();
-
     void setData(std::vector<std::byte> data);
     std::vector<std::byte> data();
 
diff --git a/include/openspace/util/syncdata.h b/include/openspace/util/syncdata.h
index a51b7627cf..6f88f96915 100644
--- a/include/openspace/util/syncdata.h
+++ b/include/openspace/util/syncdata.h
@@ -32,16 +32,15 @@
 namespace openspace {
 
 /**
- * A double buffered implementation of the Syncable interface.
- * Users are encouraged to used this class as a default way to synchronize different
- * C++ data types using the SyncEngine.
+ * A double buffered implementation of the Syncable interface. Users are encouraged to
+ * used this class as a default way to synchronize different C++ data types using the
+ * SyncEngine.
  *
  * This class aims to handle the synchronization parts and yet act like a regular
  * instance of T. Implicit casts are supported, however, when accessing member functions
  * or variables, user may have to do explicit casts.
  *
- * ((T&) t).method();
- *
+ * `((T&) t).method();`
  */
 template<class T>
 class SyncData : public Syncable {
@@ -51,28 +50,28 @@ public:
     SyncData(const SyncData<T>& o);
 
     /**
-     * Allowing assignment of data as if
+     * Allowing assignment of data as if.
      */
     SyncData& operator=(const T& rhs);
 
     /**
-     * Allow implicit cast to referenced T
+     * Allow implicit cast to referenced T.
      */
     operator T&();
 
     /**
-     * Allow implicit cast to const referenced T
+     * Allow implicit cast to const referenced T.
      */
     operator const T&() const;
 
     /**
-     * Explicitly access data
+     * Explicitly access data.
      */
     T& data();
 
     /**
-    * Explicitly access const data
-    */
+     * Explicitly access const data.
+     */
     const T& data() const;
 
 protected:
diff --git a/include/openspace/util/time.h b/include/openspace/util/time.h
index 48d70ef3b7..2499431517 100644
--- a/include/openspace/util/time.h
+++ b/include/openspace/util/time.h
@@ -32,36 +32,32 @@ namespace openspace {
 namespace scripting { struct LuaLibrary; }
 
 /**
- * This singleton class represents the current simulation time in OpenSpace. It
- * internally stores the time and provides methods to set the time directly
- * (setTime(double), setTime(std::string)) using a `double` value using the
- * number of seconds passed since the J2000 epoch or a `string` that denotes
- * a valid date string in accordance to the Spice library
- * (http://naif.jpl.nasa.gov/pub/naif/toolkit_docs/C/cspice/str2et_c.html). The time can
- * be retrieved as the number of seconds since the J2000 epoch with currentTime() or as a
- * UTC string following ISO 8601 with the method UTC().
+ * This singleton class represents the current simulation time in OpenSpace. It internally
+ * stores the time and provides methods to set the time directly (setTime(double),
+ * setTime(std::string)) using a `double` value using the number of seconds passed since
+ * the J2000 epoch or a `string` that denotes a valid date string in accordance to the
+ * SPICE library (http://naif.jpl.nasa.gov/pub/naif/toolkit_docs/C/cspice/str2et_c.html).
+ * The time can be retrieved as the number of seconds since the J2000 epoch with
+ * #currentTime or as a UTC string following ISO 8601 with the method #UTC.
  *
  * In addition to the time itself, it also stores a delta time value. This value denotes
  * the number of seconds that pass for each real-time second. This value is set with
- * setDeltaTime(double), retrieved with deltaTime() and solely used in the
- * advanceTime(double), which takes a `tickTime` parameter. The value of the
- * parameter is dependent on the usage of the class and must be equal to the real-world
- * time that has passed since the last call to the method. For example, if the
- * advanceTime(double) method is called each frame, the `tickTime` has to be
- * equal to the frame time.
- *
- * The synchronization of the simulation time requires
+ * #setDeltaTime(double), retrieved with deltaTime() and solely used in the
+ * #advanceTime(double), which takes a `tickTime` parameter. The value of the parameter is
+ * dependent on the usage of the class and must be equal to the real-world time that has
+ * passed since the last call to the method. For example, if the #advanceTime(double)
+ * method is called each frame, the `tickTime` has to be equal to the frame time.
  */
 class Time {
 public:
     /**
-     * Converts the \p timeString representing a date to a double precision
-     * value representing the ephemeris time; that is the number of TDB
-     * seconds past the J2000 epoch.
+     * Converts the \p timeString representing a date to a double precision value
+     * representing the ephemeris time; that is the number of TDB seconds past the J2000
+     * epoch.
      *
      * \param time A string representing the time to be converted
      * \return The converted time; the number of TDB seconds past the J2000 epoch,
-     * representing the passed \p timeString
+     *         representing the passed \p timeString
      *
      * \pre \p timeString must not be empty
      */
@@ -92,6 +88,7 @@ public:
     /**
      * Deinitializes the Time singleton. This method will not unload the kernel that was
      * possibly loaded during the initialize method.
+     *
      * \pre The Time singleton must have been initialized
      */
     static void deinitialize();
@@ -107,39 +104,44 @@ public:
     void setTime(double j2000Seconds);
 
     /**
-     * Sets the current time to the specified value given as a Spice compliant string as
-     * described in the Spice documentation
-     * (http://naif.jpl.nasa.gov/pub/naif/toolkit_docs/C/cspice/str2et_c.html)
+     * Sets the current time to the specified value given as a SPICE compliant string as
+     * described in the SPICE documentation.
      *
      * \param time The time to be set as a date string
+     *
+     * \sa http://naif.jpl.nasa.gov/pub/naif/toolkit_docs/C/cspice/str2et_c.html
      */
     void setTime(const std::string& time);
 
     /**
-     * Sets the current time to the specified value given as a Spice compliant string as
-     * described in the Spice documentation
-     * (http://naif.jpl.nasa.gov/pub/naif/toolkit_docs/C/cspice/str2et_c.html)
+     * Sets the current time to the specified value given as a SPICE compliant string as
+     * described in the SPICE documentation.
      *
      * \param time The time to be set as a date string
+     *
+     * \sa http://naif.jpl.nasa.gov/pub/naif/toolkit_docs/C/cspice/str2et_c.html
      */
     void setTime(const char* time);
 
     /**
      * Returns the current time as the number of seconds past the J2000 epoch. If the
      * current time is a date before that epoch, the returned value will be negative.
+     *
      * \return The current time as the number of seconds past the J2000 epoch
      */
     double j2000Seconds() const;
 
     /**
      * Returns the current time as a formatted date string compliant with ISO 8601 and
-     * thus also compliant with the Spice library.
+     * thus also compliant with the SPICE library.
+     *
      * \return The current time as a formatted date string
      */
     std::string_view UTC() const;
 
     /**
-     * Returns the current time as a ISO 8601 formatted, i.e YYYY-MM-DDThh:mm:ssZ
+     * Returns the current time as a ISO 8601 formatted, i.e YYYY-MM-DDThh:mm:ssZ.
+     *
      * \return The current time as a ISO 8601 formatted string
      */
     std::string_view ISO8601() const;
@@ -151,13 +153,14 @@ public:
     void ISO8601(char* buffer) const;
 
     /**
-     * Advances the simulation time using the deltaTime() and the `tickTime`.
-     * The deltaTime() is the number of simulation seconds that pass for each real-time
-     * second. `tickTime` is the number of real-time seconds that passed since
-     * the last call to this method. If this method is called in the render loop, the
-     * \p tickTime should be equivalent to the frame time.
-     * \param tickTime The number of real-time seconds that passed since the last call
-     *        to this method
+     * Advances the simulation time using the #deltaTime and the `tickTime`. The
+     * #deltaTime is the number of simulation seconds that pass for each real-time second.
+     * `tickTime` is the number of real-time seconds that passed since the last call to
+     * this method. If this method is called in the render loop, the \p tickTime should be
+     * equivalent to the frame time.
+     *
+     * \param tickTime The number of real-time seconds that passed since the last call to
+     *        this method
      * \return The new time value after advancing the time
      */
     double advanceTime(double tickTime);
@@ -174,8 +177,9 @@ public:
     /**
      * Returns the Lua library that contains all Lua functions available to change the
      * current time, retrieve the current time etc.
+     *
      * \return The Lua library that contains all Lua functions available to change the
-     * time
+     *         time
      */
     static scripting::LuaLibrary luaLibrary();
 
diff --git a/include/openspace/util/timeline.h b/include/openspace/util/timeline.h
index d5747d9704..466caea613 100644
--- a/include/openspace/util/timeline.h
+++ b/include/openspace/util/timeline.h
@@ -32,7 +32,7 @@
 namespace openspace {
 
 /**
- * Base class for keyframes
+ * Base class for keyframes.
  */
 struct KeyframeBase {
     size_t id;
@@ -40,7 +40,7 @@ struct KeyframeBase {
 };
 
 /**
- * Templated class for keyframes containing data
+ * Templated class for keyframes containing data.
  */
 template <typename T>
 struct Keyframe : public KeyframeBase {
@@ -54,7 +54,7 @@ struct Keyframe : public KeyframeBase {
 };
 
 /**
- * Templated class for timelines
+ * Templated class for timelines.
  */
 template <typename T>
 class Timeline {
@@ -81,27 +81,27 @@ private:
 };
 
 /**
- * Return true if the timestamp of a is smaller the timestamp of b.
+ * Return `true` if the timestamp of a is smaller the timestamp of b.
  */
 bool compareKeyframeTimes(const KeyframeBase& a, const KeyframeBase& b);
 
 /**
- * Return true if a is smaller than the timestamp of b.
+ * Return `true` if a is smaller than the timestamp of b.
  */
 bool compareTimeWithKeyframeTime(double a, const KeyframeBase& b);
 
 /**
- * Return true if the timestamp of a is smaller than b.
+ * Return `true` if the timestamp of a is smaller than b.
  */
 bool compareKeyframeTimeWithTime(const KeyframeBase& a, double b);
 
 /**
- * Return true if the timestamp of a is smaller than or equal to b.
- * This is used only in the mode of saving render frames during session recording
- * playback. This was necessary to correct a small timing issue caused by fixing
- * the application time according to the playback framerate. In normal operation,
- * the application time at the instant the keyframes are evaluated is always a
- * little bit newer than the first keyframe in the timeline.
+ * Return true if the timestamp of a is smaller than or equal to b. This is used only in
+ * the mode of saving render frames during session recording playback. This was necessary
+ * to correct a small timing issue caused by fixing the application time according to the
+ * playback framerate. In normal operation, the application time at the instant the
+ * keyframes are evaluated is always a little bit newer than the first keyframe in the
+ * timeline.
  */
 bool compareKeyframeTimeWithTime_playbackWithFrames(const KeyframeBase& a, double b);
 
diff --git a/include/openspace/util/timemanager.h b/include/openspace/util/timemanager.h
index d440041a22..bf8305f619 100644
--- a/include/openspace/util/timemanager.h
+++ b/include/openspace/util/timemanager.h
@@ -70,12 +70,12 @@ public:
     void setDeltaTimeSteps(const std::vector<double> deltaTimes);
 
     /**
-     * Returns the delta time, unaffected by pause
+     * Returns the delta time, unaffected by pause.
      */
     double targetDeltaTime() const;
 
     /*
-     * Returns the current delta time, as affected by pause
+     * Returns the current delta time, as affected by pause.
      */
     double deltaTime() const;
 
@@ -83,7 +83,7 @@ public:
      * Sets the simulation time using the time contents of a profile. The function will
      * set either a relative or absolute time.
      *
-     * \param p The Profile to be read.
+     * \param p The Profile to be read
      */
     void setTimeFromProfile(const Profile& p);
 
diff --git a/include/openspace/util/timerange.h b/include/openspace/util/timerange.h
index 89a568ab2f..9c87e8dab3 100644
--- a/include/openspace/util/timerange.h
+++ b/include/openspace/util/timerange.h
@@ -46,13 +46,13 @@ struct TimeRange {
     TimeRange(double startTime, double endTime);
 
     /**
-     * Throws exception if unable to parse the provided \class ghoul::Dictionary
+     * Throws exception if unable to parse the provided \class ghoul::Dictionary.
      */
     TimeRange(const ghoul::Dictionary& dict);
 
     /**
-     * \return `true` if timeRange could be initialized from the dictionary, `false`
-     *         otherwise.
+     * \return `true` if \p timeRange could be initialized from the dictionary, `false`
+     *         otherwise
      */
     static bool initializeFromDictionary(const ghoul::Dictionary& dict,
         TimeRange& timeRange);
diff --git a/include/openspace/util/touch.h b/include/openspace/util/touch.h
index 0c200acd74..c6e94a0e8f 100644
--- a/include/openspace/util/touch.h
+++ b/include/openspace/util/touch.h
@@ -32,9 +32,11 @@
 
 namespace openspace {
 
-// The TouchInput represents a single finger/device-input at a specific point in time.
-// the fingerId and touchDeviceId coupled with the timestamp allows this to be compared
-// with other TouchInputs in order to calculate gesture-like behaviour.
+/**
+ * The TouchInput represents a single finger/device-input at a specific point in time. The
+ * fingerId and touchDeviceId coupled with the timestamp allows this to be compared with
+ * other TouchInputs in order to calculate gesture-like behavior.
+ */
 struct TouchInput {
     TouchInput(size_t touchDeviceId, size_t fingerId, float x, float y, double timestamp);
     glm::vec2 screenCoordinates(glm::vec2 resolution) const;
@@ -47,27 +49,32 @@ struct TouchInput {
     size_t fingerId;
     float x;
     float y;
-    float dx = 0.f;         // movement in x direction since last touch input
-    float dy = 0.f;         // movement in y direction since last touch input
-    double timestamp;       // timestamp in seconds from global touch initialization
+    float dx = 0.f; // movement in x direction since last touch input
+    float dy = 0.f; // movement in y direction since last touch input
+    double timestamp; // timestamp in seconds from global touch initialization
 };
 
-// The TouchInputHolder holds one or many TouchInputs, in order to track the history of
-// the finger/input device
+/**
+ * The TouchInputHolder holds one or many TouchInputs, in order to track the history of
+ * the finger/input device.
+ */
 class TouchInputHolder {
 public:
     TouchInputHolder(TouchInput input);
 
-    // Succeeds upon a different input than last.
-    // Fails upon a too similar input as last.
-    // Updates time for the last input if same position.
+    /**
+     * Succeeds upon a different input than last. Fails upon a too similar input as last.
+     * Updates time for the last input if same position.
+     */
     bool tryAddInput(TouchInput input);
 
     void clearInputs();
 
-    // Checks whether or not this Holder actually holds a specific input (based on IDs)
-    // Succeeds when `input` is held by this Holder
-    // Fails if `input` is not held by this Holder
+    /**
+     * Checks whether or not this Holder actually holds a specific input (based on IDs).
+     * Succeeds when `input` is held by this Holder. Fails if `input` is not held by this
+     * Holder.
+     */
     bool holdsInput(const TouchInput &input) const;
 
     size_t touchDeviceId() const;
@@ -86,7 +93,7 @@ public:
     const std::deque<TouchInput>& peekInputs() const;
 
 private:
-    //A deque of recorded inputs. Adding newer points to the front of the queue
+    /// A deque of recorded inputs. Adding newer points to the front of the queue
     std::deque<TouchInput> _inputs;
     TouchInput _firstInput;
 
diff --git a/include/openspace/util/tstring.h b/include/openspace/util/tstring.h
index 59c2fca1b2..c0c9936994 100644
--- a/include/openspace/util/tstring.h
+++ b/include/openspace/util/tstring.h
@@ -31,17 +31,16 @@
 namespace openspace {
 
 /**
- * This string is a temporary string that is generated using the temporary memory
- * storage. This means that under no circumstances must an instance of a tstring be kept
- * across frame boundaries as the temporary storage is reset at between frames. In
- * exchange, the allocation of these objects is extreme fast and with barely any overhead
- * associated with it. The memory accessed through a tstring object shall never be
- * released manually.
+ * This string is a temporary string that is generated using the temporary memory storage.
+ * This means that under no circumstances must an instance of a tstring be kept across
+ * frame boundaries as the temporary storage is reset at between frames. In exchange, the
+ * allocation of these objects is extreme fast and with barely any overhead associated
+ * with it. The memory accessed through a tstring object shall never be released manually.
  */
 using tstring = std::string_view;
 
 /**
- * Allocate and create a temporary string from the passed std::string.
+ * Allocate and create a temporary string from the passed `std::string`.
  *
  * \param str The string to be copied into a newly allocated tstring
  * \return The copy of the str as a temporary string
@@ -49,9 +48,9 @@ using tstring = std::string_view;
 tstring temporaryString(const std::string& str);
 
 /**
- * Allocate and create a temporary string from the passed std::string_view.
+ * Allocate and create a temporary string from the passed `std::string_view`.
  *
- * \param str The string to be copied into a newly allocated tstring
+ * \param str The string to be copied into a newly allocated #tstring
  * \return The copy of the str as a temporary string
  */
 tstring temporaryString(std::string_view str);
@@ -59,7 +58,7 @@ tstring temporaryString(std::string_view str);
 /**
  * Allocate and create a temporary string from the passed char array.
  *
- * \param str The string to be copied into a newly allocated tstring
+ * \param str The string to be copied into a newly allocated #tstring
  * \return The copy of the str as a temporary string
  */
 tstring temporaryString(const char str[]);
diff --git a/include/openspace/util/universalhelpers.h b/include/openspace/util/universalhelpers.h
index b27dba6d15..8b1b23ecc1 100644
--- a/include/openspace/util/universalhelpers.h
+++ b/include/openspace/util/universalhelpers.h
@@ -25,21 +25,21 @@
 #ifndef __OPENSPACE_CORE___UNIVERSALHELPERS___H__
 #define __OPENSPACE_CORE___UNIVERSALHELPERS___H__
 
-/*
- * This file is meant to contain generally useful functions that is used a bit all over
- * the place but that do not belong in any other, more specific, file.
- *
- * If you implement a function that can be useful in several other situations, feel free
- * to document it and put it this file
- */
+//
+// This file is meant to contain generally useful functions that is used a bit all over
+// the place but that do not belong in any other, more specific, file.
+//
+// If you implement a function that can be useful in several other situations, feel free
+// to document it and put it this file
+//
 
 namespace openspace::helpers {
 
-/*
+/**
  * Remap a parameter t in [0,1] to a subinterval [start, end], by shifting and scaling
  * the value to match the interval. If \p t is smaller than \p start, the return value
  * will be 0 and if bigger than \p end it will be 1. Other values will be linearly
- * interpolated within the range [start, end]
+ * interpolated within the range [start, end].
  */
 double shiftAndScale(double t, double start, double end);
 
diff --git a/modules/base/rendering/renderablenodearrow.h b/modules/base/rendering/renderablenodearrow.h
index f51bafbc28..d020fafd9f 100644
--- a/modules/base/rendering/renderablenodearrow.h
+++ b/modules/base/rendering/renderablenodearrow.h
@@ -42,8 +42,7 @@ namespace documentation { struct Documentation; }
 class Translation;
 
 /**
- * Generates an arrow shape that points from the start node to the
- * end node
+ * Generates an arrow shape that points from the start node to the end node.
  */
 class RenderableNodeArrow : public Renderable {
 public:
diff --git a/modules/base/rendering/renderabletrail.h b/modules/base/rendering/renderabletrail.h
index d0635b0444..032c80a2cd 100644
--- a/modules/base/rendering/renderabletrail.h
+++ b/modules/base/rendering/renderabletrail.h
@@ -72,10 +72,9 @@ class Translation;
  */
 class RenderableTrail : public Renderable {
 public:
+    const double DISTANCE_CULLING_RADII = 800.0;
 
-const double DISTANCE_CULLING_RADII = 800.0;
-
-struct Appearance : properties::PropertyOwner {
+    struct Appearance : properties::PropertyOwner {
         Appearance();
         /// Specifies the base color of the line before fading
         properties::Vec3Property lineColor;
@@ -111,10 +110,11 @@ struct Appearance : properties::PropertyOwner {
 protected:
     explicit RenderableTrail(const ghoul::Dictionary& dictionary);
 
-    /// Returns the documentation entries that the con
     static documentation::Documentation Documentation();
 
-    /// The layout of the VBOs
+    /**
+     * The layout of the VBOs.
+     */
     struct TrailVBOLayout {
         float x, y, z;
     };
@@ -130,13 +130,18 @@ protected:
     /// The Translation object that provides the position of the individual trail points
     ghoul::mm_unique_ptr<Translation> _translation;
 
-    /// The RenderInformation contains information filled in by the concrete subclasses to
-    /// be used by this class.
+    /**
+     * The RenderInformation contains information filled in by the concrete subclasses to
+     * be used by this class.
+     */
     struct RenderInformation {
         enum class VertexSorting {
-            NewestFirst = 0,    ///< Newer vertices have a lower index than older ones
-            OldestFirst,        ///< Older vertices have a lower index than newer ones
-            NoSorting           ///< No ordering in the vertices; no fading applied
+            /// Newer vertices have a lower index than older ones
+            NewestFirst = 0,
+            /// Older vertices have a lower index than newer ones
+            OldestFirst,
+            /// No ordering in the vertices; no fading applied
+            NoSorting
         };
         /// The first element in the vertex buffer to be rendered
         GLint first = 0;
diff --git a/modules/base/rendering/renderabletrailorbit.h b/modules/base/rendering/renderabletrailorbit.h
index b938b9aeda..358af448d4 100644
--- a/modules/base/rendering/renderabletrailorbit.h
+++ b/modules/base/rendering/renderabletrailorbit.h
@@ -58,14 +58,18 @@ public:
 private:
     /**
      * Performs a full sweep of the orbit and fills the entire vertex buffer object.
+     *
      * \param time The current time up to which the full sweep should be performed
      */
     void fullSweep(double time);
 
-    /// This structure is returned from the #updateTrails method and gives information
-    /// about which parts of the vertex array to update
+    /**
+     * This structure is returned from the #updateTrails method and gives information
+     * about which parts of the vertex array to update.
+     */
     struct UpdateReport {
-        static constexpr int All = 0; ///< The entire array was touched in the update
+        /// The entire array was touched in the update
+        static constexpr int All = 0;
 
         /// If `true` the floating point needs to be updated
         bool floatingPointNeedsUpdate;
@@ -73,8 +77,8 @@ private:
         /// If `true` at least one of their permanent point were touched
         bool permanentPointsNeedUpdate;
 
-        /// Returns the number of fixed points that were touched in the update method
-        /// If this value is negative, the newest values were replaced, if positive the
+        /// Returns the number of fixed points that were touched in the update method. If
+        /// this value is negative, the newest values were replaced, if positive the
         /// oldest
         int nUpdated;
     };
@@ -82,6 +86,7 @@ private:
      * Updates the trail based on the new incoming UpdateData information. This function
      * might update an arbitrary number of values in the vertex buffer and returns an
      * UpdateReport that will tell the #update method how many values were modified.
+     *
      * \param data The UpdateData struct that comes from the #update method
      * \return The UpdateReport containing information which array parts were touched
      */
diff --git a/modules/base/rendering/renderabletrailtrajectory.h b/modules/base/rendering/renderabletrailtrajectory.h
index 018b5f6b58..3484b4afa3 100644
--- a/modules/base/rendering/renderabletrailtrajectory.h
+++ b/modules/base/rendering/renderabletrailtrajectory.h
@@ -61,7 +61,9 @@ public:
 
 private:
 
-    /// Reset some variables to default state
+    /**
+     * Reset some variables to default state.
+     */
     void reset();
 
     /// The number of vertices that we calculate during each frame of the full sweep pass
diff --git a/modules/base/rendering/screenspacedashboard.h b/modules/base/rendering/screenspacedashboard.h
index 425adf9859..86e155947d 100644
--- a/modules/base/rendering/screenspacedashboard.h
+++ b/modules/base/rendering/screenspacedashboard.h
@@ -61,10 +61,6 @@ public:
 private:
     Dashboard _dashboard;
     properties::BoolProperty _useMainDashboard;
-    //std::unique_ptr<ghoul::fontrendering::FontRenderer> _fontRenderer;
-
-    //std::shared_ptr<ghoul::fontrendering::Font> _fontDate;
-    //std::shared_ptr<ghoul::fontrendering::Font> _fontInfo;
 };
 
 } // namespace openspace
diff --git a/modules/base/rendering/screenspaceframebuffer.h b/modules/base/rendering/screenspaceframebuffer.h
index 96ad201faf..bf190cf4e1 100644
--- a/modules/base/rendering/screenspaceframebuffer.h
+++ b/modules/base/rendering/screenspaceframebuffer.h
@@ -39,12 +39,10 @@ namespace openspace {
 namespace documentation { struct Documentation; }
 
 /**
- * @brief Creates a texture by rendering to a framebuffer, this is then used on a screen
- *        space plane.
- * @details This class lets you ass renderfunctions that should render to a framebuffer
- *          with an attached texture.
- * The texture is then used on a screen space plane that works both in fisheye and flat
- * screens.
+ * Creates a texture by rendering to a framebuffer, this is then used on a screen space
+ * plane. This class lets you ass renderfunctions that should render to a framebuffer with
+ * an attached texture. The texture is then used on a screen space plane that works both
+ * in fisheye and flat screens.
  */
 class ScreenSpaceFramebuffer : public ScreenSpaceRenderable {
 public:
diff --git a/modules/debugging/rendering/debugrenderer.h b/modules/debugging/rendering/debugrenderer.h
index b0132ec3ce..b5c0229358 100644
--- a/modules/debugging/rendering/debugrenderer.h
+++ b/modules/debugging/rendering/debugrenderer.h
@@ -37,93 +37,91 @@ namespace ghoul::opengl { class ProgramObject; }
 namespace openspace {
 
 /**
- * A helper class for quick rendering of vertices IN clipping space.
- * The class is practically stateless. It only stores a ghoul::opengl::ProgramObject
- * which can be reused despite the fact that rendering calls are invoked from different
- * callers. Therefore a static reference is provided for convenience which is accessed
- * through ref(). Note: That constructors are still public and the class is not a strict
- * singleton.
+ * A helper class for quick rendering of vertices IN clipping space. The class is
+ * practically stateless. It only stores a ghoul::opengl::ProgramObject which can be
+ * reused despite the fact that rendering calls are invoked from different callers.
+ * Therefore a static reference is provided for convenience which is accessed through
+ * #ref. Note: That constructors are still public and the class is not a strict singleton.
  */
 class DebugRenderer {
 public:
     using Vertices = std::vector<glm::vec4>;
 
     /**
-     *  Consider using ref() before creating a new default instance!
+     * Consider using ref() before creating a new default instance.
      */
     DebugRenderer();
 
     /**
-     *  Instantiate a new DebugRenderer with a custom shader program
+     * Instantiate a new DebugRenderer with a custom shader program.
      */
     DebugRenderer(std::unique_ptr<ghoul::opengl::ProgramObject> programObject);
     ~DebugRenderer() = default;
 
     /**
-     *  Access the static reference
+     * Access the static reference.
      */
     static const DebugRenderer& ref();
 
     /**
-     *  Render the vector of clipping space points in the specified mode and color.
+     * Render the vector of clipping space points in the specified mode and color.
      */
     void renderVertices(const Vertices& clippingSpacePoints, GLenum mode,
         const glm::vec4& color = glm::vec4(1.f, 0.f, 0.f, 1.f)) const;
 
     /**
-     *  Takes a vector of exactly 8 vertices, i.e. corner points in a box.
-     *  The box corners should be ordered from smaller to larger,
-     *  first by x, the, y and finally z.
-     *
-     *  6-------7
-     *  |\      |\
-     *  | 2-------3
-     *  4 | - - 5 |
-     *   \|      \|
-     *    0-------1
+     * Takes a vector of exactly 8 vertices, i.e. corner points in a box. The box corners
+     * should be ordered from smaller to larger, first by x, the, y and finally z.
      *
+     * ```
+     * 6-------7
+     * |\      |\
+     * | 2-------3
+     * 4 | - - 5 |
+     *  \|      \|
+     *   0-------1
+     * ```
      */
     void renderBoxFaces(const Vertices& clippingSpaceBoxCorners,
         const glm::vec4& rgba = glm::vec4(1.f, 0.f, 0.f, 1.f)) const;
 
     /**
-     *  Takes a vector of exactly 8 vertices, i.e. corner points in a box.
-     *  The box corners should be ordered from smaller to larger,
-     *  first by x, the, y and finally z.
-     *
-     *  6-------7
-     *  |\      |\
-     *  | 2-------3
-     *  4 | - - 5 |
-     *   \|      \|
-     *    0-------1
+     * Takes a vector of exactly 8 vertices, i.e. corner points in a box. The box corners
+     * should be ordered from smaller to larger, first by x, the, y and finally z.
      *
+     * ```
+     * 6-------7
+     * |\      |\
+     * | 2-------3
+     * 4 | - - 5 |
+     *  \|      \|
+     *   0-------1
+     * ```
      */
     void renderBoxEdges(const Vertices& clippingSpaceBoxCorners,
         const glm::vec4& rgba = glm::vec4(1.f, 0.f, 0.f, 1.f)) const;
 
     /**
-      *  Takes a vector of exactly 8 vertices, i.e. corner points in a box.
-      *  The box corners should be ordered from smaller to larger,
-      *  first by x, the, y and finally z.
-      *
-      *  6-------7
-      *  |\      |\
-      *  | 2-------3
-      *  4 | - - 5 |
-      *   \|      \|
-      *    0-------1
-      *
-      */
+     * Takes a vector of exactly 8 vertices, i.e. corner points in a box. The box corners
+     * should be ordered from smaller to larger, first by x, the, y and finally z.
+     *
+     * ```
+     * 6-------7
+     * |\      |\
+     * | 2-------3
+     * 4 | - - 5 |
+     *  \|      \|
+     *   0-------1
+     * ```
+     */
     void renderNiceBox(const Vertices& clippingSpaceBoxCorners,
         const glm::vec4& rgba = glm::vec4(1.f, 0.f, 0.f, 0.3f)) const;
 
     /**
-     *  Input arguments:
-     *  1. const RenderData& data:     defines position and camera that we will see the
-     *                                 other cameras view frustum from
-     *  2. const Camera& otherCamera:  The camera who's view frustum is to be rendered
-     *  3. RGBA rgba                   Color to draw the view frustum with
+     * \param data Defines position and camera that we will see the other cameras view
+     *             frustum from
+     * \param otherCamera The camera who's view frustum is to be rendered
+     * \param rgba Color to draw the view frustum with
      */
     void renderCameraFrustum(const RenderData& data, const Camera& otherCamera,
         const glm::vec4& rgba = glm::vec4(1.f, 1.f, 1.f, 0.3f)) const;
@@ -131,9 +129,8 @@ public:
 protected:
     std::unique_ptr<ghoul::opengl::ProgramObject> _programObject;
 
-
-    // A raw pointer for the reason that it should not be deleted by the static
-    // destructor and the normal destructor. This class has ownership
+    /// A raw pointer for the reason that it should not be deleted by the static
+    /// destructor and the normal destructor. This class has ownership
     static DebugRenderer* _reference;
 };
 
diff --git a/modules/digitaluniverse/rendering/renderablebillboardscloud.h b/modules/digitaluniverse/rendering/renderablebillboardscloud.h
index 142275c5fb..93701b6aea 100644
--- a/modules/digitaluniverse/rendering/renderablebillboardscloud.h
+++ b/modules/digitaluniverse/rendering/renderablebillboardscloud.h
@@ -69,7 +69,6 @@ public:
     static documentation::Documentation Documentation();
 
 private:
-
     std::vector<float> createDataSlice();
     void createPolygonTexture();
     void renderToTexture(GLuint textureToRenderTo, GLuint textureWidth,
diff --git a/modules/exoplanets/exoplanetshelper.h b/modules/exoplanets/exoplanetshelper.h
index 83368d4f7d..8eda2ad51b 100644
--- a/modules/exoplanets/exoplanetshelper.h
+++ b/modules/exoplanets/exoplanetshelper.h
@@ -33,100 +33,100 @@
 namespace openspace::exoplanets {
 
 struct ExoplanetDataEntry {
-    // Orbital semi-major axis in AU
+    /// Orbital semi-major axis in AU
     float a = std::numeric_limits<float>::quiet_NaN();
-    // Upper uncertainty of orbital semi-major axis
+    /// Upper uncertainty of orbital semi-major axis
     double aUpper = std::numeric_limits<double>::quiet_NaN();
-    // Lower uncertainty of orbital semi-major axis
+    /// Lower uncertainty of orbital semi-major axis
     double aLower = std::numeric_limits<double>::quiet_NaN();
 
-    // Longitude of ascending node in degrees
+    /// Longitude of ascending node in degrees
     float bigOmega = std::numeric_limits<float>::quiet_NaN();
-    // Upper uncertainty of longitude of ascending node
+    /// Upper uncertainty of longitude of ascending node
     float bigOmegaUpper = std::numeric_limits<float>::quiet_NaN();
-    // Lower uncertainty of longitude of ascending node
+    /// Lower uncertainty of longitude of ascending node
     float bigOmegaLower = std::numeric_limits<float>::quiet_NaN();
 
-    // Star known to be binary?
+    /// Star known to be binary?
     bool binary = false;
 
-    // Star B − V color
+    /// Star B − V color
     float bmv = std::numeric_limits<float>::quiet_NaN();
 
-    // Orbital eccentricity
+    /// Orbital eccentricity
     float ecc = std::numeric_limits<float>::quiet_NaN();
-    // Upper uncertainty of orbital eccentricity
+    /// Upper uncertainty of orbital eccentricity
     float eccUpper = std::numeric_limits<float>::quiet_NaN();
-    // Lower uncertainty of orbital eccentricity
+    /// Lower uncertainty of orbital eccentricity
     float eccLower = std::numeric_limits<float>::quiet_NaN();
 
-    // Orbital inclination in degrees (for transiting systems only)
+    /// Orbital inclination in degrees (for transiting systems only)
     float i = std::numeric_limits<float>::quiet_NaN();
-    // Upper uncertainty of orbital inclination
+    /// Upper uncertainty of orbital inclination
     float iUpper = std::numeric_limits<float>::quiet_NaN();
-    // Lower uncertainty of orbital inclination
+    /// Lower uncertainty of orbital inclination
     float iLower = std::numeric_limits<float>::quiet_NaN();
 
-    // Number of known planets in the planetary system
+    /// Number of known planets in the planetary system
     int nPlanets = std::numeric_limits<int>::quiet_NaN();
 
-    // Number of stars in the planetary system
+    /// Number of stars in the planetary system
     int nStars = std::numeric_limits<int>::quiet_NaN();
 
-    // Argument of periastron in degrees
+    /// Argument of periastron in degrees
     float omega = std::numeric_limits<float>::quiet_NaN();
-    // Upper uncertainty of argument of periastron
+    /// Upper uncertainty of argument of periastron
     float omegaUpper = std::numeric_limits<float>::quiet_NaN();
-    // Lower uncertainty of argument of periastron
+    /// Lower uncertainty of argument of periastron
     float omegaLower = std::numeric_limits<float>::quiet_NaN();
 
-    // Orbital period in days
+    /// Orbital period in days
     double per = std::numeric_limits<double>::quiet_NaN();
-    // Upper uncertainty of period
+    /// Upper uncertainty of period
     float perUpper = std::numeric_limits<float>::quiet_NaN();
-    // Lower uncertainty of period
+    /// Lower uncertainty of period
     float perLower = std::numeric_limits<float>::quiet_NaN();
 
-    // Radius of the planet in Jupiter radii
+    /// Radius of the planet in Jupiter radii
     double r = std::numeric_limits<double>::quiet_NaN();
-    // Upper uncertainty of radius of the planet
+    /// Upper uncertainty of radius of the planet
     double rUpper = std::numeric_limits<double>::quiet_NaN();
-    // Lower uncertainty of radius of the planet
+    /// Lower uncertainty of radius of the planet
     double rLower = std::numeric_limits<double>::quiet_NaN();
 
-    // Estimated radius of the star in solar radii
+    /// Estimated radius of the star in solar radii
     float rStar = std::numeric_limits<float>::quiet_NaN();
-    // Upper uncertainty of estimated star radius
+    /// Upper uncertainty of estimated star radius
     float rStarUpper = std::numeric_limits<float>::quiet_NaN();
-    // Lower uncertainty of estimated star radius
+    /// Lower uncertainty of estimated star radius
     float rStarLower = std::numeric_limits<float>::quiet_NaN();
 
-    // Star luminosity, in units of solar luminosities
+    /// Star luminosity, in units of solar luminosities
     float luminosity = std::numeric_limits<float>::quiet_NaN();
-    // Upper uncertainty of star luminosity
+    /// Upper uncertainty of star luminosity
     float luminosityUpper = std::numeric_limits<float>::quiet_NaN();
-    // Lower uncertainty of star luminosity
+    /// Lower uncertainty of star luminosity
     float luminosityLower = std::numeric_limits<float>::quiet_NaN();
 
-    // Star's effective temperature in Kelvin
+    /// Star's effective temperature in Kelvin
     float teff = std::numeric_limits<float>::quiet_NaN();
-    // Upper uncertainty of effective temperature
+    /// Upper uncertainty of effective temperature
     float teffUpper = std::numeric_limits<float>::quiet_NaN();
-    // Lower uncertainty of effective temperature
+    /// Lower uncertainty of effective temperature
     float teffLower = std::numeric_limits<float>::quiet_NaN();
 
-    // Epoch of transit center in HJD-2440000
+    /// Epoch of transit center in HJD-2440000
     double tt = std::numeric_limits<double>::quiet_NaN();
-    // Upper uncertainty of epoch of transit center
+    /// Upper uncertainty of epoch of transit center
     float ttUpper = std::numeric_limits<float>::quiet_NaN();
-    // Lower uncertainty of epoch of transit center
+    /// Lower uncertainty of epoch of transit center
     float ttLower = std::numeric_limits<float>::quiet_NaN();
 
-    // Star position's X-coordinate in parsec
+    /// Star position's X-coordinate in parsec
     float positionX = std::numeric_limits<float>::quiet_NaN();
-    // Star position's Y-coordinate in parsec
+    /// Star position's Y-coordinate in parsec
     float positionY = std::numeric_limits<float>::quiet_NaN();
-    // Star position's Z-coordinate in parsec
+    /// Star position's Z-coordinate in parsec
     float positionZ = std::numeric_limits<float>::quiet_NaN();
 };
 
@@ -147,24 +147,31 @@ struct ExoplanetSystem {
 
 bool isValidPosition(const glm::vec3& pos);
 
-// Check if the exoplanet p has sufficient data for visualization
+/**
+ * Check if the exoplanet p has sufficient data for visualization.
+ */
 bool hasSufficientData(const ExoplanetDataEntry& p);
 
-// Compute star color in RGB from b-v color index
+/**
+ * Compute star color in RGB from b-v color index.
+ */
 glm::vec3 computeStarColor(float bv);
 
 glm::dmat4 computeOrbitPlaneRotationMatrix(float i, float bigom = 180.f,
     float omega = 90.f);
 
-// Rotate the original coordinate system (where x is pointing to First Point of Aries)
-// so that x is pointing from star to the sun.
+/**
+ * Rotate the original coordinate system (where x is pointing to First Point of Aries) so
+ * that x is pointing from star to the Sun.
+ */
 glm::dmat3 computeSystemRotation(glm::dvec3 starPosition);
 
 void sanitizeNameString(std::string& s);
 
-// Star data should not vary between planets, but one data entry might lack data
-// for the host star while another does not. So for every planet, update star data
-// if needed
+/**
+ * Star data should not vary between planets, but one data entry might lack data for the
+ * host star while another does not. So for every planet, update star data if needed.
+ */
 void updateStarDataFromNewPlanet(StarData& starData, const ExoplanetDataEntry& p);
 
 } // namespace openspace::exoplanets
diff --git a/modules/exoplanets/rendering/renderableorbitdisc.h b/modules/exoplanets/rendering/renderableorbitdisc.h
index 43f30b3ce8..271b20b724 100644
--- a/modules/exoplanets/rendering/renderableorbitdisc.h
+++ b/modules/exoplanets/rendering/renderableorbitdisc.h
@@ -58,7 +58,9 @@ public:
     static documentation::Documentation Documentation();
 
 private:
-    // Computes the size of the plane quad using the relevant properties
+    /**
+     * Computes the size of the plane quad using the relevant properties.
+     */
     float planeSize() const;
 
     properties::StringProperty _texturePath;
diff --git a/modules/exoplanets/tasks/exoplanetsdatapreparationtask.h b/modules/exoplanets/tasks/exoplanetsdatapreparationtask.h
index 5d0542af28..7de2bb7e6d 100644
--- a/modules/exoplanets/tasks/exoplanetsdatapreparationtask.h
+++ b/modules/exoplanets/tasks/exoplanetsdatapreparationtask.h
@@ -51,29 +51,31 @@ public:
 
     /**
      * The exoplanet file includes a set of commented lines in the beginning. This
-     * funciton skips those lines, as well as any empty lines, and continues reading
-     * until it find the first valid data line (which will be the column names).
+     * function skips those lines, as well as any empty lines, and continues reading until
+     * it find the first valid data line (which will be the column names).
      *
      * \param file The input file stream used for reading the file
-     * \return The content of the first data row (i.e. the column names).
+     * \return The content of the first data row (i.e. the column names)
      */
     static std::vector<std::string> readFirstDataRow(std::ifstream& file);
 
     /**
-     * Parse a row in the CSV file of exoplanets. Assumes the same format and column
-     * names as provided by the NASA Exoplanet Archive.
-     * (https://exoplanetarchive.ipac.caltech.edu/)
+     * Parse a row in the CSV file of exoplanets. Assumes the same format and column names
+     * as provided by the NASA Exoplanet Archive.
      *
      * \param row The row to parse, given as a string
      * \param columnNames The list of column names in the file, from the CSV header
      * \param positionSourceFile A SPECK file to use for getting the position of the star.
-     *        This is used to make sure the position of the star matches those of other star
-     *        datasets. If no file is provided, the position from the CSV data file is read
-     *        and used instead
+     *        This is used to make sure the position of the star matches those of other
+     *        star datasets. If no file is provided, the position from the CSV data file
+     *        is read and used instead
      * \param bvFromTeffConversionFile A text file containing a mapping between effective
-     *        temperature (teff) values and B-V color index values. Each line should include
-     *        two values separated by a comma: first the teff value and hten the B-V value
-     * \return An object containing the parsed information.
+     *        temperature (teff) values and B-V color index values. Each line should
+     *        include two values separated by a comma: first the teff value and then the
+     *        B-V value
+     * \return An object containing the parsed information
+     *
+     * /sa https://exoplanetarchive.ipac.caltech.edu/
      */
     static PlanetData parseDataRow(std::string row,
         const std::vector<std::string>& columnNames,
diff --git a/modules/fieldlinessequence/util/commons.h b/modules/fieldlinessequence/util/commons.h
index 9b517a72b7..695743d5a4 100644
--- a/modules/fieldlinessequence/util/commons.h
+++ b/modules/fieldlinessequence/util/commons.h
@@ -38,9 +38,9 @@ enum class Model : int {
 
 Model stringToModel(const std::string& s);
 
-constexpr float AuToMeter = 149597870700.f;  // Astronomical Units
-constexpr float ReToMeter = 6371000.f;       // Earth radius
-constexpr float RsToMeter = 695700000.f;     // Sun radius
+constexpr float AuToMeter = 149597870700.f; // Astronomical Units
+constexpr float ReToMeter = 6371000.f; // Earth radius
+constexpr float RsToMeter = 695700000.f; // Sun radius
 
 } // namespace openspace::fls
 
diff --git a/modules/fieldlinessequence/util/kameleonfieldlinehelper.h b/modules/fieldlinessequence/util/kameleonfieldlinehelper.h
index 8381a2a204..5599f6914c 100644
--- a/modules/fieldlinessequence/util/kameleonfieldlinehelper.h
+++ b/modules/fieldlinessequence/util/kameleonfieldlinehelper.h
@@ -36,21 +36,21 @@ class FieldlinesState;
 
 namespace fls {
 
-/** Traces field lines from the provided cdf file using kameleon and stores the data in
- * the provided FieldlinesState.
- * Returns `false` if it fails to create a valid state. Requires the kameleon module to
- * be activated!
+/**
+ * Traces field lines from the provided cdf file using kameleon and stores the data in the
+ * provided FieldlinesState. Returns `false` if it fails to create a valid state. Requires
+ * the kameleon module to be activated.
  *
  * \param state FieldlineState which should hold the extracted data
- * \param cdfPath std::string of the absolute path to a .cdf file
- * \param seedMap vector of seed points from which to trace field lines
- * \param manualTimeOffset an offset that is applied to all fieldlines
- * \param tracingVar which quantity to trace lines from. Typically "b" for magnetic field
+ * \param cdfPath `std::string` of the absolute path to a .cdf file
+ * \param seedMap Vector of seed points from which to trace field lines
+ * \param manualTimeOffset An offset that is applied to all fieldlines
+ * \param tracingVar Which quantity to trace lines from. Typically "b" for magnetic field
  *        lines and "u" for velocity flow lines
- * \param extraVars extra scalar quantities to be stored in the FieldlinesState; e.g. "T"
+ * \param extraVars Extra scalar quantities to be stored in the FieldlinesState; e.g. "T"
  *        for temperature, "rho" for density or "P" for pressure
- * \param extraMagVars variables which should be used for extracting magnitudes, must be
- *        a multiple of 3; e.g. "ux", "uy" & "uz" to get the magnitude of the velocity
+ * \param extraMagVars Variables which should be used for extracting magnitudes, must be a
+ *        multiple of 3; e.g. "ux", "uy" & "uz" to get the magnitude of the velocity
  *        vector at each line vertex
  */
 bool convertCdfToFieldlinesState(FieldlinesState& state, const std::string& cdfPath,
diff --git a/modules/fitsfilereader/include/fitsfilereader.h b/modules/fitsfilereader/include/fitsfilereader.h
index 9f3078c924..a98a3b970f 100644
--- a/modules/fitsfilereader/include/fitsfilereader.h
+++ b/modules/fitsfilereader/include/fitsfilereader.h
@@ -73,10 +73,10 @@ public:
     std::shared_ptr<T> readHeaderValue(const std::string key);
 
     /**
-     * Read specified table columns from fits file.
-     * If `readAll` is set to true the entire table will be read before the
-     * selected columns, which makes the function take a lot longer if it's a big file.
-     * If no HDU index is given the current Extension HDU will be read from.
+     * Read specified table columns from fits file. If `readAll` is set to true the entire
+     * table will be read before the selected columns, which makes the function take a lot
+     * longer if it's a big file. If no HDU index is given the current Extension HDU will
+     * be read from.
      */
     template<typename T>
     std::shared_ptr<TableData<T>> readTable(const std::filesystem::path& path,
@@ -85,17 +85,17 @@ public:
 
     /**
      * Reads a single FITS file with pre-defined columns (defined for Viennas TGAS-file).
-     * Returns a vector with all read stars with `nValuesPerStar`.
-     * If additional columns are given by `filterColumnNames`, they will be
-     * read but it will slow doen the reading tremendously.
+     * Returns a vector with all read stars with `nValuesPerStar`. If additional columns
+     * are given by `filterColumnNames`, they will be read but it will slow doen the
+     * reading tremendously.
      */
     std::vector<float> readFitsFile(std::filesystem::path filePath, int& nValuesPerStar,
         int firstRow, int lastRow, std::vector<std::string> filterColumnNames,
         int multiplier = 1);
 
     /**
-     * Reads a single SPECK file and returns a vector with `nRenderValues`
-     * per star. Reads data in pre-defined order based on AMNH's star data files.
+     * Reads a single SPECK file and returns a vector with `nRenderValues` per star. Reads
+     * data in pre-defined order based on AMNH's star data files.
      */
     std::vector<float> readSpeckFile(const std::filesystem::path& filePath,
         int& nRenderValues);
diff --git a/modules/gaia/rendering/octreeculler.h b/modules/gaia/rendering/octreeculler.h
index 87dc6aee12..307385df00 100644
--- a/modules/gaia/rendering/octreeculler.h
+++ b/modules/gaia/rendering/octreeculler.h
@@ -35,28 +35,27 @@ namespace openspace {
 /**
  * Culls all octree nodes that are completely outside the view frustum.
  *
- * The frustum culling uses a 2D axis aligned bounding box for the OctreeNode in
- * screen space.
+ * The frustum culling uses a 2D axis aligned bounding box for the OctreeNode in screen
+ * space.
  */
-
 class OctreeCuller {
 public:
 
     /**
-     * \param viewFrustum is the view space in normalized device coordinates space.
-     *                    Hence it is an axis aligned bounding box and not a real frustum.
+     * \param viewFrustum This is the view space in normalized device coordinates space.
+     *        Hence it is an axis aligned bounding box and not a real frustum
      */
     OctreeCuller(globebrowsing::AABB3 viewFrustum);
 
     ~OctreeCuller() = default;
 
     /**
-     * \return true if any part of the node is visible in the current view.
+     * \return `true` if any part of the node is visible in the current view
      */
     bool isVisible(const std::vector<glm::dvec4>& corners, const glm::dmat4& mvp);
 
     /**
-     * \return the size [in pixels] of the node in clipping space.
+     * \return The size [in pixels] of the node in clipping space
      */
     glm::vec2 getNodeSizeInPixels(const std::vector<glm::dvec4>& corners,
         const glm::dmat4& mvp, const glm::vec2& screenSize);
diff --git a/modules/gaia/rendering/octreemanager.h b/modules/gaia/rendering/octreemanager.h
index e15aae9cf7..997ddad1a9 100644
--- a/modules/gaia/rendering/octreemanager.h
+++ b/modules/gaia/rendering/octreemanager.h
@@ -70,49 +70,48 @@ public:
     /**
      * Initializes a stack. Can be used to trigger a rebuild of buffer(s).
      *
-     * \param maxNodes the maximum number of nodes in the buffer
-     * \param useVBO defines if VBO or SSBO is used as buffer(s)
-     * \param datasetFitInMemory defines if streaming of nodes during runtime is used
+     * \param maxNodes The maximum number of nodes in the buffer
+     * \param useVBO Defines if VBO or SSBO is used as buffer(s)
+     * \param datasetFitInMemory Defines if streaming of nodes during runtime is used
      */
     void initBufferIndexStack(long long maxNodes, bool useVBO, bool datasetFitInMemory);
 
     /**
      * Inserts star values in correct position in Octree. Makes use of a recursive
-     * traversal strategy. Internally calls `insertInNode()`
+     * traversal strategy. Internally calls #insertInNode.
      */
     void insert(const std::vector<float>& starValues);
 
     /**
      * Slices LOD data so only the MAX_STARS_PER_NODE brightest stars are stored in inner
-     * nodes. If \p branchIndex is defined then only that branch will be sliced.
-     * Calls `sliceNodeLodCache()` internally.
+     * nodes. If \p branchIndex is defined then only that branch will be sliced. Calls
+     * #sliceNodeLodCache internally.
      */
     void sliceLodData(size_t branchIndex = 8);
 
     /**
      * Prints the whole tree structure, including number of stars per node, number of
-     * nodes, tree depth and if node is a leaf.
-     * Calls `printStarsPerNode(node, prefix)` internally.
+     * nodes, tree depth and if node is a leaf. Calls #printStarsPerNode(node, prefix)
+     * internally.
      */
     void printStarsPerNode() const;
 
     /**
      * Used while streaming nodes from files. Checks if any nodes need to be loaded or
      * unloaded. If entire dataset fits in RAM then the whole dataset will be loaded
-     * asynchronously. Otherwise only nodes close to the camera will be fetched.
-     * When RAM stars to fill up least-recently used nodes will start to unload.
-     * Calls `findAndFetchNeighborNode()` and `removeNodesFromRam()` internally.
+     * asynchronously. Otherwise only nodes close to the camera will be fetched. When RAM
+     * stars to fill up least-recently used nodes will start to unload. Calls
+     * #findAndFetchNeighborNode and #removeNodesFromRam internally.
      */
     void fetchSurroundingNodes(const glm::dvec3& cameraPos, size_t chunkSizeInBytes,
         const glm::ivec2& additionalNodes);
 
     /**
      * Builds render data structure by traversing the Octree and checking for intersection
-     * with view frustum. Every vector in map contains data for one node.
-     * The corresponding integer key is the index where chunk should be inserted into
-     * streaming buffer. Calls #checkNodeIntersection for every branch.
-     * \p deltaStars keeps track of how many stars that were added/removed this render
-     * call.
+     * with view frustum. Every vector in map contains data for one node. The
+     * corresponding integer key is the index where chunk should be inserted into
+     * streaming buffer. Calls #checkNodeIntersection for every branch. \p deltaStars
+     * keeps track of how many stars that were added/removed this render call.
      */
     std::map<int, std::vector<float>> traverseData(const glm::dmat4& mvp,
         const glm::vec2& screenSize, int& deltaStars, gaia::RenderMode mode,
@@ -125,7 +124,8 @@ public:
 
     /**
      * Removes all data from Octree, or only from a specific branch if specified.
-     * \param branchIndex defined which branch to clear if defined.
+     *
+     * \param branchIndex Defined which branch to clear if defined
      */
     void clearAllData(int branchIndex = -1);
 
@@ -202,7 +202,7 @@ private:
     const std::string BINARY_SUFFIX = ".bin";
 
     /**
-     * \returns the correct index of child node. Maps [1,1,1] to 0 and [-1,-1,-1] to 7.
+     * \return the correct index of child node. Maps [1,1,1] to 0 and [-1,-1,-1] to 7.
      */
     size_t getChildIndex(float posX, float posY, float posZ, float origX = 0.f,
         float origY = 0.f, float origZ = 0.f);
@@ -298,7 +298,7 @@ private:
      * \param node the node that should be inserted
      * \param mode the render mode that should be used
      * \param deltaStars keeps track of how many stars that were added.
-     * \returns the data to be inserted
+     * \return the data to be inserted
      */
     std::vector<float> constructInsertData(const OctreeNode& node,
         gaia::RenderMode mode, int& deltaStars);
diff --git a/modules/gaia/rendering/renderablegaiastars.h b/modules/gaia/rendering/renderablegaiastars.h
index 0476cb223a..8424d84be0 100644
--- a/modules/gaia/rendering/renderablegaiastars.h
+++ b/modules/gaia/rendering/renderablegaiastars.h
@@ -69,35 +69,35 @@ private:
     /**
      * Reads data file in format defined by FileReaderOption.
      *
-     * \return true if data was successfully read.
+     * \return `true` if data was successfully read
      */
     bool readDataFile();
 
     /**
      * Reads a FITS file by using FitsFileReader.readFitsFile() and constructs an octree.
      *
-     * \return the number of stars read.
+     * \return The number of stars read
      */
     int readFitsFile(const std::filesystem::path& filePath);
 
     /**
      * Read a SPECK file by using FitsFileReader.readSpeckFile() and constructs an octree.
      *
-     * \return the number of stars read.
+     * \return The number of stars read
      */
     int readSpeckFile(const std::filesystem::path& filePath);
 
     /**
      * Reads a preprocessed binary file and constructs an octree.
      *
-     * \return the number of stars read.
+     * \return The number of stars read
      */
     int readBinaryRawFile(const std::filesystem::path& filePath);
 
     /**
      * Reads a pre-constructed octree, with all data, from a binary file.
      *
-     * \return the number of stars read.
+     * \return The number of stars read
      */
     int readBinaryOctreeFile(const std::filesystem::path& filePath);
 
@@ -105,7 +105,7 @@ private:
      * Reads the structure of a pre-constructed octree from a binary file, without any
      * data.
      *
-     * \return the number of stars read.
+     * \return The number of stars read
      */
     int readBinaryOctreeStructureFile(const std::filesystem::path& folderPath);
 
diff --git a/modules/gaia/tasks/constructoctreetask.h b/modules/gaia/tasks/constructoctreetask.h
index 1aa1d49adf..0269569d92 100644
--- a/modules/gaia/tasks/constructoctreetask.h
+++ b/modules/gaia/tasks/constructoctreetask.h
@@ -49,36 +49,35 @@ private:
 
     /**
      * Reads a single binary file with preprocessed star data and insert the render values
-     * into an octree structure (if star data passed all defined filters).
-     * Stores the entire octree in one binary file.
+     * into an octree structure (if star data passed all defined filters). Stores the
+     * entire octree in one binary file.
      */
     void constructOctreeFromSingleFile(const Task::ProgressCallback& progressCallback);
 
     /**
-     *  Reads binary star data from 8 preprocessed files (one per branch) in specified
-     * folder, prepared by ReadFitsTask, and inserts star render data into an octree
-     * (if star data passed all defined filters).
-     * Stores octree structure in a binary index file and stores all render data
-     * separate files, one file per node in the octree.
+     * Reads binary star data from 8 preprocessed files (one per branch) in specified
+     * folder, prepared by ReadFitsTask, and inserts star render data into an octree (if
+     * star data passed all defined filters). Stores octree structure in a binary index
+     * file and stores all render data separate files, one file per node in the octree.
      */
     void constructOctreeFromFolder(const Task::ProgressCallback& progressCallback);
 
     /**
-     * Checks all defined filter ranges and \returns true if any of the corresponding
-     * `filterValues` are outside of the defined range.
+     * Checks all defined filter ranges and returns true if any of the corresponding
+     * \p filterValues are outside of the defined range.
      *
-     * \param filterValues are all read filter values in binary file.
+     * \param filterValues Are all read filter values in binary file
      *
-     * \returns false if value should be inserted into Octree.
+     * \return `false` if value should be inserted into Octree
      */
     bool checkAllFilters(const std::vector<float>& filterValues);
 
     /**
-     * \p range contains ]min, max[ and \p filterValue corresponding value in
-     * star. Star is filtered either if min = max = filterValue or if filterValue < min
-     * (when min != 0.0) or filterValue > max (when max != 0.0).
+     * \p range contains ]min, max[ and \p filterValue corresponding value in star. Star
+     * is filtered either if `min = max = filterValue` or if `filterValue < min` (when
+     * `min != 0.0`) or `filterValue > max` (when `max != 0.0`).
      *
-     * \return true if star should be filtered away and false if all filters passed.
+     * \return `true` if star should be filtered away and `false` if all filters passed
      */
     bool filterStar(const glm::vec2& range, float filterValue, float normValue = 0.f);
 
diff --git a/modules/gaia/tasks/readfilejob.h b/modules/gaia/tasks/readfilejob.h
index f1fa487b43..53451b5c1b 100644
--- a/modules/gaia/tasks/readfilejob.h
+++ b/modules/gaia/tasks/readfilejob.h
@@ -36,18 +36,18 @@ struct ReadFileJob : public Job<std::vector<std::vector<float>>> {
      * Constructs a Job that will read a single FITS file in a concurrent thread and
      * divide the star data into 8 octants depending on position.
      *
-     * \param filePath the file from which to load the data
-     * \param allColumns define which columns that will be read, it should correspond
-     *        to the pre-defined order in the job. If additional columns are defined they
+     * \param filePath The file from which to load the data
+     * \param allColumns Define which columns that will be read, it should correspond to
+     *        the pre-defined order in the job. If additional columns are defined they
      *        will be read but slow down the process. Proper conversions of positions and
      *        velocities will take place and all values will be checked for NaNs. If
      *        \p firstRow is < 1 then reading will begin at first row in table. If
      *        \p lastRow < firstRow then entire table will be read
-     * \param firstRow the index of the first row to be read
-     * \param lastRow the index of the last row to be read
-     * \param nDefaultCols defines how many columns that will be read per star
-     * \param nValuesPerStar defines how many values that will be stored per star
-     * \param fitsReader the reader that should be used in this job
+     * \param firstRow The index of the first row to be read
+     * \param lastRow The index of the last row to be read
+     * \param nDefaultCols Defines how many columns that will be read per star
+     * \param nValuesPerStar Defines how many values that will be stored per star
+     * \param fitsReader The reader that should be used in this job
      */
     ReadFileJob(std::string filePath, std::vector<std::string> allColumns, int firstRow,
         int lastRow, size_t nDefaultCols, int nValuesPerStar,
diff --git a/modules/gaia/tasks/readfitstask.h b/modules/gaia/tasks/readfitstask.h
index 8236a572ba..ad60b60cd6 100644
--- a/modules/gaia/tasks/readfitstask.h
+++ b/modules/gaia/tasks/readfitstask.h
@@ -50,7 +50,7 @@ private:
     //const size_t MAX_SIZE_BEFORE_WRITE = 9000000; // ~34MB -> 0,5 stars with 18 values
 
     /**
-     *  Reads a single FITS file and stores ordered star data in one binary file.
+     * Reads a single FITS file and stores ordered star data in one binary file.
      */
     void readSingleFitsFile(const Task::ProgressCallback& progressCallback);
 
@@ -63,12 +63,12 @@ private:
     /**
      * Writes data to an octant file.
      *
-     * \param data the data that should be be written to file
-     * \param index the index of the octant that should be written
-     * \param isFirstWrite defines if this is the first write to specified octant, if so
+     * \param data The data that should be be written to file
+     * \param index The index of the octant that should be written
+     * \param isFirstWrite Defines if this is the first write to specified octant, if so
      *        the file is created, otherwise the accumulated data is appended to the end
      *        of the file
-     * \param nValuesPerStar the number of values that should be stored per star
+     * \param nValuesPerStar The number of values that should be stored per star
      */
     int writeOctantToFile(const std::vector<float>& data, int index,
         std::vector<bool>& isFirstWrite, int nValuesPerStar);
diff --git a/modules/galaxy/tasks/milkywayconversiontask.h b/modules/galaxy/tasks/milkywayconversiontask.h
index 77ad77d821..cce9b9433b 100644
--- a/modules/galaxy/tasks/milkywayconversiontask.h
+++ b/modules/galaxy/tasks/milkywayconversiontask.h
@@ -35,8 +35,8 @@ namespace openspace {
 namespace documentation { struct Documentation; }
 
 /**
- * Converts a set of exr image slices to a raw volume
- * with floating point RGBA data (32 bit per channel).
+ * Converts a set of exr image slices to a raw volume with floating point RGBA data (32
+ * bit per channel).
  */
 class MilkywayConversionTask : public Task {
 public:
diff --git a/modules/galaxy/tasks/milkywaypointsconversiontask.h b/modules/galaxy/tasks/milkywaypointsconversiontask.h
index a9d866da23..3551443d12 100644
--- a/modules/galaxy/tasks/milkywaypointsconversiontask.h
+++ b/modules/galaxy/tasks/milkywaypointsconversiontask.h
@@ -34,9 +34,11 @@ namespace openspace {
 namespace documentation { struct Documentation; }
 
 /**
- * Converts ascii based point data
+ * Converts ASCII based point data
+ * ```
  * int64_t n
  * (float x, float y, float z, float r, float g, float b) * n
+ * ```
  * to a binary (floating point) representation with the same layout.
  */
 class MilkywayPointsConversionTask : public Task {
diff --git a/modules/globebrowsing/src/asynctiledataprovider.h b/modules/globebrowsing/src/asynctiledataprovider.h
index 10f5dcc204..6f971a52c8 100644
--- a/modules/globebrowsing/src/asynctiledataprovider.h
+++ b/modules/globebrowsing/src/asynctiledataprovider.h
@@ -45,8 +45,8 @@ class AsyncTileDataProvider {
 public:
     /**
      * \param name is the name for this provider
-     * \param rawTileDataReader is the reader that will be used for the asynchronous
-     *        tile loading
+     * \param rawTileDataReader is the reader that will be used for the asynchronous tile
+     *        loading
      */
     AsyncTileDataProvider(std::string name,
         std::unique_ptr<RawTileDataReader> rawTileDataReader);
@@ -81,7 +81,7 @@ protected:
     };
 
     /**
-     * \returns true if tile of index `tileIndex` is not already enqueued.
+     * \return `true` if tile of index \p tileIndex is not already enqueued
      */
     bool satisfiesEnqueueCriteria(const TileIndex& tileIndex);
 
diff --git a/modules/globebrowsing/src/basictypes.h b/modules/globebrowsing/src/basictypes.h
index 6655d2611a..d153c710be 100644
--- a/modules/globebrowsing/src/basictypes.h
+++ b/modules/globebrowsing/src/basictypes.h
@@ -110,7 +110,7 @@ struct TileMetaData {
 
 
 /**
- * Defines a status and may have a Texture and TileMetaData
+ * Defines a status and may have a Texture and TileMetaData.
  */
 class Tile {
 public:
@@ -118,29 +118,21 @@ public:
      * Describe if this Tile is good for usage (OK) or otherwise the reason why it is not.
      */
     enum class Status {
-        /**
-         * E.g when texture data is not currently in memory.
-         * texture and tileMetaData are both null
-         */
+        /// E.g when texture data is not currently in memory.
+        /// `texture` and `tileMetaData` are both `nullptr`
         Unavailable,
 
-        /**
-         * Can be set by `TileProvider`s if the requested `TileIndex` is undefined for
-         * that particular provider.
-         * texture and metaData are both null
-         */
+        /// Can be set by `TileProvider`s if the requested `TileIndex` is undefined for
+        /// that particular provider.
+        /// `texture` and `metaData` are both `nullptr`
         OutOfRange,
 
-        /**
-         * An IO Error happend
-         * texture and metaData are both null
-         */
+        /// An IO Error happend
+        /// `texture` and `metaData` are both `nullptr`
         IOError,
 
-        /**
-         * The Texture is uploaded to the GPU and good for usage.
-         * texture is defined. metaData may be defined.
-         */
+        /// The Texture is uploaded to the GPU and good for usage.
+        /// `texture` is defined. `metaData` may be defined.
         OK
     };
 
diff --git a/modules/globebrowsing/src/ellipsoid.h b/modules/globebrowsing/src/ellipsoid.h
index e7b8c6ec2a..5eea9b2afc 100644
--- a/modules/globebrowsing/src/ellipsoid.h
+++ b/modules/globebrowsing/src/ellipsoid.h
@@ -37,15 +37,17 @@ struct Geodetic3;
 /**
  * This class is based largely on the Ellipsoid class defined in the book
  * "3D Engine Design for Virtual Globes". Most planets or planetary objects are better
- * described using ellipsoids than spheres. All inputs and outputs to this class is
- * based on the WGS84 standard coordinate system where the x-axis points towards
- * geographic (lat = 0, lon = 0), the y-axis points towards (lat = 0, lon = 90deg) and the
- * z-axis points towards the north pole. For other globes than earth of course the radii
- * can differ.
+ * described using ellipsoids than spheres. All inputs and outputs to this class is based
+ * on the WGS84 standard coordinate system where the x-axis points towards geographic
+ * (lat = 0, lon = 0), the y-axis points towards (lat = 0, lon = 90deg) and the z-axis
+ * points towards the north pole. For other globes than earth of course the radii can
+ * differ.
  */
 class Ellipsoid {
 public:
-    // Shadow configuration structure
+    /**
+     * Shadow configuration structure.
+     */
     struct ShadowConfiguration {
         std::pair<std::string, double> source;
         std::pair<std::string, double> caster;
@@ -59,16 +61,18 @@ public:
     /**
      * Scales a point along the geocentric normal and places it on the surface of the
      * Ellipsoid.
+     *
      * \param p is a point in the cartesian coordinate system to be placed on the surface
-     * of the Ellipsoid
+     *        of the Ellipsoid
      */
     glm::dvec3 geocentricSurfaceProjection(const glm::dvec3& p) const;
 
     /**
      * Scales a point along the geodetic normal and places it on the surface of the
      * Ellipsoid.
+     *
      * \param p is a point in the cartesian coordinate system to be placed on the surface
-     * of the Ellipsoid
+     *        of the Ellipsoid
      */
     glm::dvec3 geodeticSurfaceProjection(const glm::dvec3& p) const;
 
diff --git a/modules/globebrowsing/src/gdalwrapper.h b/modules/globebrowsing/src/gdalwrapper.h
index 219dd16661..7db5edad04 100644
--- a/modules/globebrowsing/src/gdalwrapper.h
+++ b/modules/globebrowsing/src/gdalwrapper.h
@@ -41,10 +41,11 @@ class GdalWrapper : public properties::PropertyOwner {
 public:
     /**
      * Create the singleton. Must be called before the class can be used.
-     * \param maximumCacheSize is the current maximum cache size GDAL can use
-     * for caching blocks in memory given in bytes.
-     * \param maximumMaximumCacheSize is the maximum cache size GDAL can use
-     * for caching blocks in memory given in bytes.
+     *
+     * \param maximumCacheSize is the current maximum cache size GDAL can use for caching
+     *        blocks in memory given in bytes
+     * \param maximumMaximumCacheSize is the maximum cache size GDAL can use for caching
+     *        blocks in memory given in bytes
      */
     static void create(size_t maximumCacheSize, size_t maximumMaximumCacheSize);
     static void destroy();
diff --git a/modules/globebrowsing/src/geodeticpatch.h b/modules/globebrowsing/src/geodeticpatch.h
index a3783e033e..3ce392ba82 100644
--- a/modules/globebrowsing/src/geodeticpatch.h
+++ b/modules/globebrowsing/src/geodeticpatch.h
@@ -46,12 +46,12 @@ public:
     void setHalfSize(Geodetic2 halfSize);
 
     /**
-     * Returns the latitude boundary which is closest to the equator
+     * Returns the latitude boundary which is closest to the equator.
      */
     double edgeLatitudeNearestEquator() const;
 
     /**
-     * Returns `true` if the center above the equator
+     * Returns `true` if the center above the equator.
      */
     double isNorthern() const;
 
@@ -63,34 +63,34 @@ public:
     double maxLon() const;
 
     /**
-     * Returns `true` if the specified coordinate is contained within the patch
+     * Returns `true` if the specified coordinate is contained within the patch.
      */
     bool contains(const Geodetic2& p) const;
 
 
     /**
-     * Clamps a point to the patch region
+     * Clamps a point to the patch region.
      */
     Geodetic2 clamp(const Geodetic2& p) const;
 
     /**
-     * Returns the corner of the patch that is closest to the given point p
+     * Returns the corner of the patch that is closest to the given point p.
      */
     Geodetic2 closestCorner(const Geodetic2& p) const;
 
     /**
-     * Returns a point on the patch that minimizes the great-circle distance to
-     * the given point p.
+     * Returns a point on the patch that minimizes the great-circle distance to the given
+     * point p.
      */
     Geodetic2 closestPoint(const Geodetic2& p) const;
 
     /**
-     * Returns the minimum tile level of the patch (based on largest side)
+     * Returns the minimum tile level of the patch (based on largest side).
      */
     double minimumTileLevel() const;
 
     /**
-     * Returns the maximum level of the patch (based on smallest side)
+     * Returns the maximum level of the patch (based on smallest side).
      */
     double maximumTileLevel() const;
 
diff --git a/modules/globebrowsing/src/geojson/geojsoncomponent.h b/modules/globebrowsing/src/geojson/geojsoncomponent.h
index cad6eb9fbb..74747ddfe1 100644
--- a/modules/globebrowsing/src/geojson/geojsoncomponent.h
+++ b/modules/globebrowsing/src/geojson/geojsoncomponent.h
@@ -61,7 +61,7 @@ class RenderableGlobe;
 
 /**
  * A component representing a collection of globe geometry features, whose details
- * are read from a GeoJson file
+ * are read from a GeoJson file.
  */
 class GeoJsonComponent : public properties::PropertyOwner, public Fadeable {
 public:
@@ -82,9 +82,9 @@ public:
 
 private:
     /**
-     * Small helper class whose purpose is to encapsulate properties related to a
-     * specific geomoetry feature, and allow things like flying to or fadin out
-     * individual subfeatures
+     * Small helper class whose purpose is to encapsulate properties related to a specific
+     * geomoetry feature, and allow things like flying to or fadin out individual
+     * subfeatures.
      */
     class SubFeatureProps : public properties::PropertyOwner, public Fadeable {
     public:
@@ -101,8 +101,8 @@ private:
     void parseSingleFeature(const geos::io::GeoJSONFeature& feature, int indexInFile);
 
     /**
-     * Add meta properties to the feature, to allow things like flying to it,
-     * identifying its location, etc
+     * Add meta properties to the feature, to allow things like flying to it, identifying
+     * its location, etc.
      */
     void addMetaPropertiesToFeature(SubFeatureProps& feature, int index,
         const geos::geom::Geometry* geometry);
diff --git a/modules/globebrowsing/src/geojson/geojsonmanager.h b/modules/globebrowsing/src/geojson/geojsonmanager.h
index 7349f60875..6eade5a73d 100644
--- a/modules/globebrowsing/src/geojson/geojsonmanager.h
+++ b/modules/globebrowsing/src/geojson/geojsonmanager.h
@@ -42,7 +42,7 @@ namespace openspace::globebrowsing {
 class RenderableGlobe;
 
 /**
- * Manages multiple GeoJSON objects of a globe
+ * Manages multiple GeoJSON objects of a globe.
  */
 class GeoJsonManager : public properties::PropertyOwner {
 public:
diff --git a/modules/globebrowsing/src/geojson/geojsonproperties.h b/modules/globebrowsing/src/geojson/geojsonproperties.h
index cad7fe5dd1..90ab578079 100644
--- a/modules/globebrowsing/src/geojson/geojsonproperties.h
+++ b/modules/globebrowsing/src/geojson/geojsonproperties.h
@@ -50,14 +50,16 @@ struct GeoJsonProperties : public properties::PropertyOwner {
 
     static documentation::Documentation Documentation();
 
-    // These are based on the KML specification
+    /**
+     * These are based on the KML specification.
+     */
     enum class AltitudeMode {
-        // Compute position as an altitude above the reference ellipsoid
+        /// Compute position as an altitude above the reference ellipsoid
         Absolute = 0,
-        // Compute position using altitude above the height map
+        /// Compute position using altitude above the height map
         RelativeToGround
-        // Stick to planet surface (TODO: use GDAL to render layer instead and use as
-        // default)
+        /// Stick to planet surface (TODO: use GDAL to render layer instead and use as
+        /// default)
         // ClampToGround
     };
 
@@ -120,9 +122,9 @@ struct GeoJsonOverrideProperties {
 GeoJsonOverrideProperties propsFromGeoJson(const geos::io::GeoJSONFeature& feature);
 
 struct PropertySet {
-    // This value set should be a reference to the main component's propertyowner
+    /// This value set should be a reference to the main component's propertyowner
     GeoJsonProperties& defaultValues;
-    // This is a unique set of properties to use for overriding the default values
+    /// This is a unique set of properties to use for overriding the default values
     GeoJsonOverrideProperties overrideValues;
 
     float opacity() const;
diff --git a/modules/globebrowsing/src/geojson/globegeometryfeature.h b/modules/globebrowsing/src/geojson/globegeometryfeature.h
index 07d1c5b634..909abeca76 100644
--- a/modules/globebrowsing/src/geojson/globegeometryfeature.h
+++ b/modules/globebrowsing/src/geojson/globegeometryfeature.h
@@ -49,8 +49,8 @@ namespace openspace::globebrowsing {
 class RenderableGlobe;
 
 /**
- * This class is responsible for rendering the geomoetry features of globes,
- * created e.g. from GeoJson files
+ * This class is responsible for rendering the geomoetry features of globes, created e.g.
+ * from GeoJson files.
  */
 class GlobeGeometryFeature {
 public:
@@ -87,7 +87,9 @@ public:
         Uninitialized
     };
 
-    // Each geometry feature might translate into several render features
+    /**
+     * Each geometry feature might translate into several render features.
+     */
     struct RenderFeature {
         void initializeBuffers();
 
@@ -97,15 +99,17 @@ public:
         size_t nVertices = 0;
         bool isExtrusionFeature = false;
 
-        // Store the geodetic lat long coordinates of each vertex, so we can quickly
-        // recompute the height values for these points
+        /// Store the geodetic lat long coordinates of each vertex, so we can quickly
+        /// recompute the height values for these points
         std::vector<Geodetic2> vertices;
 
-        // Keep the heights around
+        /// Keep the heights around
         std::vector<float> heights;
     };
 
-    // Some extra data that we need for doing the rendering
+    /**
+     * Some extra data that we need for doing the rendering.
+     */
     struct ExtraRenderData {
         float pointSizeScale;
         float lineWidthScale;
@@ -149,58 +153,66 @@ private:
         int renderPass) const;
 
     /**
-     * Create the vertex information for any line parts of the feature.
-     * Returns the resulting vertex positions, so we can use them for extrusion
+     * Create the vertex information for any line parts of the feature. Returns the
+     * resulting vertex positions, so we can use them for extrusion.
      */
     std::vector<std::vector<glm::vec3>> createLineGeometry();
 
     /**
-     * Create the vertex information for any point parts of the feature. Also creates
-     * the features for extruded lines for the points
+     * Create the vertex information for any point parts of the feature. Also creates the
+     * features for extruded lines for the points.
      */
     void createPointGeometry();
 
     /**
-     * Create the triangle geometry for the extruded edges of lines/polygons
+     * Create the triangle geometry for the extruded edges of lines/polygons.
      */
     void createExtrudedGeometry(const std::vector<std::vector<glm::vec3>>& edgeVertices);
 
     /**
      * Create the triangle geometry for the polygon part of the feature (the area
-     * contained by the shape)
+     * contained by the shape).
      */
     void createPolygonGeometry();
 
     void initializeRenderFeature(RenderFeature& feature,
         const std::vector<Vertex>& vertices);
 
-    /// Get the distance that shall be used for tessellation, based on the properties
+    /**
+     * Get the distance that shall be used for tessellation, based on the properties.
+     */
     float tessellationStepSize() const;
 
-    /// Compute the heights to the surface at the reference points
+    /**
+     * Compute the heights to the surface at the reference points.
+     */
     std::vector<double> getCurrentReferencePointsHeights() const;
 
-    /// Buffer the static data for the vertices
+    /**
+     * Buffer the static data for the vertices.
+     */
     void bufferVertexData(const RenderFeature& feature,
         const std::vector<Vertex>& vertexData);
 
-    /// Buffer the dynamic height data for the vertices, based on the height map
+    /**
+     * Buffer the dynamic height data for the vertices, based on the height map.
+     */
     void bufferDynamicHeightData(const RenderFeature& feature);
 
     GeometryType _type = GeometryType::Error;
     const RenderableGlobe& _globe;
 
-    // Coordinates for geometry. For polygons, the first is always the outer ring
-    // and any following are the inner rings (holes)
+    /// Coordinates for geometry. For polygons, the first is always the outer ring and any
+    /// following are the inner rings (holes)
     std::vector<std::vector<Geodetic3>> _geoCoordinates;
 
-    // Coordinates for any triangles representing the geometry (only relevant for
-    // polygons)
+    /// Coordinates for any triangles representing the geometry (only relevant for
+    /// polygons)
     std::vector<Geodetic3> _triangleCoordinates;
 
     std::vector<RenderFeature> _renderFeatures;
 
-    // lat, long, distance (meters). Passed from parent on property change
+    /// lat, long, distance (meters). Passed from parent on property change
     glm::vec3 _offsets = glm::vec3(0.f);
 
     std::string _key;
diff --git a/modules/globebrowsing/src/geojson/globegeometryhelper.h b/modules/globebrowsing/src/geojson/globegeometryhelper.h
index ce1cf8a491..d2a6281a54 100644
--- a/modules/globebrowsing/src/geojson/globegeometryhelper.h
+++ b/modules/globebrowsing/src/geojson/globegeometryhelper.h
@@ -60,21 +60,20 @@ std::vector<Geodetic2> geodetic2FromVertexList(const RenderableGlobe& globe,
 std::vector<float> heightMapHeightsFromGeodetic2List(const RenderableGlobe& globe,
     const std::vector<Geodetic2>& list);
 
-
 /**
- * Create triangle geometry for the extruded edge, given the provided edge vertices
+ * Create triangle geometry for the extruded edge, given the provided edge vertices.
  */
 std::vector<rendering::helper::VertexXYZNormal> createExtrudedGeometryVertices(
     const std::vector<std::vector<glm::vec3>>& edgeVertices);
 
 /**
- * Get height contribution from reference surface of the globe, based on the height map
+ * Get height contribution from reference surface of the globe, based on the height map.
  */
 double getHeightToReferenceSurface(const Geodetic2& geo, const RenderableGlobe& globe);
 
 /**
  * Compute model space cordinate from geodetic coordinate, and account for lat, long
- * offsets
+ * offsets.
  */
 glm::dvec3 computeOffsetedModelCoordinate(const Geodetic3& geo,
     const RenderableGlobe& globe, float latOffset, float lonOffset);
@@ -86,11 +85,11 @@ struct PosHeightPair {
 };
 
 /**
- * Subdivide line between position v0 and v1 so that it fullfils the maxDistance
- * criteria. Interpolate the height value from * h0 to h1, as well as add the
- * given offset and account for the height map if that should be done.
+ * Subdivide line between position v0 and v1 so that it fullfils the maxDistance criteria.
+ * Interpolate the height value from * h0 to h1, as well as add the given offset and
+ * account for the height map if that should be done.
  *
- * Returns pairs of position and height values
+ * \return Pairs of position and height values
  */
 std::vector<PosHeightPair> subdivideLine(const glm::dvec3& v0, const glm::dvec3& v1,
     double h0, double h1, double maxDistance);
@@ -98,7 +97,7 @@ std::vector<PosHeightPair> subdivideLine(const glm::dvec3& v0, const glm::dvec3&
 /**
  * Subdivide triangle consisting of vertex positions v0, v1 and v2, with height values
  * h0, h1 and h2 into smaller triangles. maxDistance specifies tha maximum distance
- * between two vertices in the subdivided mesh
+ * between two vertices in the subdivided mesh.
  */
 std::vector<rendering::helper::VertexXYZNormal> subdivideTriangle(
     const glm::vec3& v0, const glm::vec3& v1, const glm::vec3& v2,
diff --git a/modules/globebrowsing/src/gpulayergroup.h b/modules/globebrowsing/src/gpulayergroup.h
index dd9f4697a7..b72d4b0a36 100644
--- a/modules/globebrowsing/src/gpulayergroup.h
+++ b/modules/globebrowsing/src/gpulayergroup.h
@@ -45,7 +45,7 @@ struct LayerGroup;
 struct TileIndex;
 
 /**
- * Manages a GPU representation of a `LayerGroup`
+ * Manages a GPU representation of a `LayerGroup`.
  */
 class GPULayerGroup {
 public:
@@ -64,8 +64,8 @@ public:
     void bind(ghoul::opengl::ProgramObject& programObject, const LayerGroup& layerGroup);
 
     /**
-    * Deactivates any `TextureUnit`s assigned by this object.
-    * This method should be called after the OpenGL draw call.
+    * Deactivates any `TextureUnit`s assigned by this object. This method should be called
+    * after the OpenGL draw call.
     */
     void deactivate();
 
diff --git a/modules/globebrowsing/src/layergroup.h b/modules/globebrowsing/src/layergroup.h
index 899fbbeac0..8ca76d6c31 100644
--- a/modules/globebrowsing/src/layergroup.h
+++ b/modules/globebrowsing/src/layergroup.h
@@ -46,20 +46,28 @@ struct LayerGroup : public properties::PropertyOwner {
     void initialize();
     void deinitialize();
 
-    /// Updates all layers tile providers within this group
+    /**
+     * Updates all layers tile providers within this group.
+     */
     void update();
 
     Layer* addLayer(const ghoul::Dictionary& layerDict);
     void deleteLayer(const std::string& layerName);
     void moveLayer(int oldPosition, int newPosition);
 
-    /// @returns const vector of all layers
+    /**
+     * \return const vector of all layers
+     */
     std::vector<Layer*> layers() const;
 
-    /// @returns const vector of all active layers
+    /**
+     * \return const vector of all active layers
+     */
     const std::vector<Layer*>& activeLayers() const;
 
-    /// @returns the size of the pile to be used in rendering of this layer
+    /**
+     * \return the size of the pile to be used in rendering of this layer
+     */
     int pileSize() const;
 
     bool layerBlendingEnabled() const;
diff --git a/modules/globebrowsing/src/layerrendersettings.h b/modules/globebrowsing/src/layerrendersettings.h
index 69ffad1a50..493a65170f 100644
--- a/modules/globebrowsing/src/layerrendersettings.h
+++ b/modules/globebrowsing/src/layerrendersettings.h
@@ -42,11 +42,14 @@ struct LayerRenderSettings : public properties::PropertyOwner {
 
     void onChange(std::function<void()> callback);
 
-    /// This function matches the function with the same name in the
-    /// shader code
+    /**
+     * This function matches the function with the same name in the shader code.
+     */
     float performLayerSettings(float value) const;
-    /// This function matches the function with the same name in the
-    /// shader code
+
+    /**
+     * This function matches the function with the same name in the shader code.
+     */
     glm::vec4 performLayerSettings(const glm::vec4& currentValue) const;
 };
 
diff --git a/modules/globebrowsing/src/lrucache.h b/modules/globebrowsing/src/lrucache.h
index ed9e21ef74..3212cf75bf 100644
--- a/modules/globebrowsing/src/lrucache.h
+++ b/modules/globebrowsing/src/lrucache.h
@@ -32,8 +32,8 @@
 namespace openspace::globebrowsing::cache {
 
 /**
- * Templated class implementing a Least-Recently-Used Cache.
- * `KeyType` needs to be an enumerable type.
+ * Templated class implementing a Least-Recently-Used Cache. `KeyType` needs to be an
+ * enumerable type.
  */
 template <typename KeyType, typename ValueType, typename HasherType>
 class LRUCache {
@@ -42,7 +42,7 @@ public:
     using Items = std::list<Item>;
 
     /**
-     * \param size is the maximum size of the cache given in number of cached items.
+     * \param size This is the maximum size of the cache given in number of cached items
      */
     LRUCache(size_t size);
 
@@ -53,7 +53,8 @@ public:
 
     /**
      * If value exists, the value is bumped to the front of the queue.
-     * \returns true if value of this key exists.
+     *
+     * \return `true` if value of this key exists
      */
     bool touch(const KeyType& key);
     bool isEmpty() const;
diff --git a/modules/globebrowsing/src/lruthreadpool.h b/modules/globebrowsing/src/lruthreadpool.h
index 3b64ab386e..a86fc02d2e 100644
--- a/modules/globebrowsing/src/lruthreadpool.h
+++ b/modules/globebrowsing/src/lruthreadpool.h
@@ -49,14 +49,14 @@ private:
 };
 
 /**
- * The `LRUThreadPool` will only enqueue a certain number of tasks. The most
- * recently enqueued task is the one that will be executed first. This class is templated
- * on a key type which used as an identifier to determine wheter or not a task with the
- * given key has been enqueued or not. This means that a task can be enqueued several
- * times. The user must ensure that an enqueued task with a given key should be equal in
- * outcome to a second enqueued task with the same key. This is because a second enqueued
- * task with the same key will simply be bumped and prioritised before other enqueued
- * tasks. The given task will be ignored.
+ * The `LRUThreadPool` will only enqueue a certain number of tasks. The most recently
+ * enqueued task is the one that will be executed first. This class is templated on a key
+ * type which used as an identifier to determine wheter or not a task with the given key
+ * has been enqueued or not. This means that a task can be enqueued several times. The
+ * user must ensure that an enqueued task with a given key should be equal in outcome to a
+ * second enqueued task with the same key. This is because a second enqueued task with the
+ * same key will simply be bumped and prioritised before other enqueued tasks. The given
+ * task will be ignored.
  */
 template<typename KeyType>
 class LRUThreadPool {
diff --git a/modules/globebrowsing/src/memoryawaretilecache.h b/modules/globebrowsing/src/memoryawaretilecache.h
index 0a9f6f5431..4bd2810f9e 100644
--- a/modules/globebrowsing/src/memoryawaretilecache.h
+++ b/modules/globebrowsing/src/memoryawaretilecache.h
@@ -107,8 +107,8 @@ private:
     class TextureContainer {
     public:
         /**
-         * \param initData is the description of the texture type.
-         * \param numTextures is the number of textures to allocate.
+         * \param initData is the description of the texture type
+         * \param numTextures is the number of textures to allocate
          */
         TextureContainer(TileTextureInitData initData, size_t numTextures);
 
diff --git a/modules/globebrowsing/src/prioritizingconcurrentjobmanager.h b/modules/globebrowsing/src/prioritizingconcurrentjobmanager.h
index f16ba1a79a..6f452f888d 100644
--- a/modules/globebrowsing/src/prioritizingconcurrentjobmanager.h
+++ b/modules/globebrowsing/src/prioritizingconcurrentjobmanager.h
@@ -45,7 +45,7 @@ public:
     PrioritizingConcurrentJobManager(LRUThreadPool<KeyType> pool);
 
     /**
-     * Enqueues a job which is identified using a given key
+     * Enqueues a job which is identified using a given key.
      */
     void enqueueJob(std::shared_ptr<Job<P>> job, KeyType key);
 
@@ -60,11 +60,11 @@ public:
     std::vector<KeyType> keysToEnqueuedJobs();
 
     /**
-     * Bumps the job identified with `key` to the beginning of the queue.
-     * In case the job was not already enqueued the function simply returns false and
-     * no state is changed.
-     * \param key is the identifier of the job to bump.
-     * \returns true if the job was found, else returns false.
+     * Bumps the job identified with `key` to the beginning of the queue. In case the job
+     * was not already enqueued the function simply returns false and no state is changed.
+     *
+     * \param key this is the identifier of the job to bump
+     * \return `true` if the job was found, else returns false
      */
     bool touch(KeyType key);
 
@@ -76,7 +76,7 @@ public:
     void clearEnqueuedJobs();
 
     /**
-     * \returns one finished job.
+     * \return one finished job
      */
     std::shared_ptr<Job<P>> popFinishedJob();
 
@@ -85,7 +85,7 @@ public:
 private:
     ConcurrentQueue<std::shared_ptr<Job<P>>> _finishedJobs;
     std::mutex _finishedJobsMutex;
-    /// An LRU thread pool is used since the jobs can be bumped and hence prioritized.
+    /// An LRU thread pool is used since the jobs can be bumped and hence prioritized
     LRUThreadPool<KeyType> _threadPool;
 };
 
diff --git a/modules/globebrowsing/src/renderableglobe.h b/modules/globebrowsing/src/renderableglobe.h
index 5c0654f5a4..7d5a6927ba 100644
--- a/modules/globebrowsing/src/renderableglobe.h
+++ b/modules/globebrowsing/src/renderableglobe.h
@@ -156,38 +156,35 @@ private:
     properties::PropertyOwner _shadowMappingPropertyOwner;
 
     /**
-     * Test if a specific chunk can safely be culled without affecting the rendered
-     * image.
+     * Test if a specific chunk can safely be culled without affecting the rendered image.
      *
-     * Goes through all available `ChunkCuller`s and check if any of them
-     * allows culling of the `Chunk`s in question.
+     * Goes through all available `ChunkCuller`s and check if any of them allows culling
+     * of the `Chunk`s in question.
      */
     bool testIfCullable(const Chunk& chunk, const RenderData& renderData,
         const BoundingHeights& heights, const glm::dmat4& mvp) const;
 
     /**
-     * Gets the desired level which can be used to determine if a chunk should split
-     * or merge.
+     * Gets the desired level which can be used to determine if a chunk should split or
+     * merge.
      *
-     * Using `ChunkLevelEvaluator`s, the desired level can be higher or
-     * lower than the current level of the `Chunks`s
-     * `TileIndex`. If the desired level is higher than that of the
-     * `Chunk`, it wants to split. If it is lower, it wants to merge with
-     * its siblings.
+     * Using `ChunkLevelEvaluator`s, the desired level can be higher or lower than the
+     * current level of the `Chunks`s `TileIndex`. If the desired level is higher than
+     * that of the `Chunk`, it wants to split. If it is lower, it wants to merge with its
+     * siblings.
      */
     int desiredLevel(const Chunk& chunk, const RenderData& renderData,
         const BoundingHeights& heights) const;
 
     /**
-     * Calculates the height from the surface of the reference ellipsoid to the
-     * height mapped surface.
+     * Calculates the height from the surface of the reference ellipsoid to the height
+     * mapped surface.
      *
      * The height can be negative if the height map contains negative values.
      *
-     * \param `position` is the position of a point that gets geodetically
-     * projected on the reference ellipsoid. `position` must be in
-     * cartesian model space.
-     * \returns the height from the reference ellipsoid to the globe surface.
+     * \param `position` is the position of a point that gets geodetically projected on
+     *        the reference ellipsoid. `position` must be in Cartesian model space
+     * \return The height from the reference ellipsoid to the globe surface
      */
     float getHeight(const glm::dvec3& position) const;
 
@@ -197,26 +194,26 @@ private:
 
     /**
      * Chunks can be rendered either globally or locally. Global rendering is performed
-     * in the model space of the globe. With global rendering, the vertex positions
-     * of a chunk are calculated in the vertex shader by transforming the geodetic
-     * coordinates of the chunk to model space coordinates. We can only achieve floating
-     * point precision by doing this which means that the camera too close to a global
-     * tile will lead to jagging. We only render global chunks for lower chunk levels.
+     * in the model space of the globe. With global rendering, the vertex positions of a
+     * chunk are calculated in the vertex shader by transforming the geodetic coordinates
+     * of the chunk to model space coordinates. We can only achieve floating point
+     * precision by doing this which means that the camera too close to a global tile will
+     * lead to jagging. We only render global chunks for lower chunk levels.
      */
     void renderChunkGlobally(const Chunk& chunk, const RenderData& data,
         const ShadowComponent::ShadowMapData& shadowData = {}, bool renderGeomOnly = false
     );
 
     /**
-     * Local rendering of chunks are done using linear interpolation in camera space.
-     * All four corner points of the chunk are calculated in double precision on the
-     * CPU and transformed to camera space with double precision matrix transforms.
-     * These positions can then be cast to floats and uploaded to the vertex shader.
-     * The vertex shader rendering performs linear interpolation between the four
-     * corner points to get the resulting chunk. This means that there will be an error
-     * due to the curvature of the globe. The smaller the patch is (with higher chunk
-     * levels) the better the approximation becomes. This is why we only render local
-     * chunks for higher chunk levels.
+     * Local rendering of chunks are done using linear interpolation in camera space. All
+     * four corner points of the chunk are calculated in double precision on the CPU and
+     * transformed to camera space with double precision matrix transforms. These
+     * positions can then be cast to floats and uploaded to the vertex shader. The vertex
+     * shader rendering performs linear interpolation between the four corner points to
+     * get the resulting chunk. This means that there will be an error due to the
+     * curvature of the globe. The smaller the patch is (with higher chunk levels) the
+     * better the approximation becomes. This is why we only render local chunks for
+     * higher chunk levels.
      */
     void renderChunkLocally(const Chunk& chunk, const RenderData& data,
         const ShadowComponent::ShadowMapData& shadowData = {}, bool renderGeomOnly = false
diff --git a/modules/globebrowsing/src/shadowcomponent.h b/modules/globebrowsing/src/shadowcomponent.h
index 8293e0e82a..89beb5f598 100644
--- a/modules/globebrowsing/src/shadowcomponent.h
+++ b/modules/globebrowsing/src/shadowcomponent.h
@@ -63,7 +63,6 @@ public:
     void initialize();
     void initializeGL();
     void deinitializeGL();
-    //bool deinitialize();
 
     bool isReady() const;
 
diff --git a/modules/globebrowsing/src/skirtedgrid.h b/modules/globebrowsing/src/skirtedgrid.h
index ed5bd54885..4175f66b8a 100644
--- a/modules/globebrowsing/src/skirtedgrid.h
+++ b/modules/globebrowsing/src/skirtedgrid.h
@@ -39,8 +39,8 @@ namespace openspace::globebrowsing {
 class SkirtedGrid {
 public:
     /**
-     * \param xSegments is the number of grid cells in the x direction.
-     * \param ySegments is the number of grid cells in the y direction.
+     * \param xSegments is the number of grid cells in the x direction
+     * \param ySegments is the number of grid cells in the y direction
      */
     SkirtedGrid(unsigned int xSegments, unsigned int ySegments);
     ~SkirtedGrid() = default;
@@ -50,11 +50,10 @@ public:
 
     /**
      * Calls OpenGL's draw function to draw the triangles defined in the vertex buffers
-     * using the current bound program object.
-     * The vertex buffer attribute input locations to the shader program comes in the
-     * order of positions (0), texture coordinates (1) and normals (2).
-     * The input locations in the shader program should be specified to match these
-     * locations.
+     * using the current bound program object. The vertex buffer attribute input locations
+     * to the shader program comes in the order of positions (0), texture coordinates (1)
+     * and normals (2). The input locations in the shader program should be specified to
+     * match these locations.
      */
     void drawUsingActiveProgram() const;
 
diff --git a/modules/globebrowsing/src/tileloadjob.h b/modules/globebrowsing/src/tileloadjob.h
index b09c9ef827..ab728afd98 100644
--- a/modules/globebrowsing/src/tileloadjob.h
+++ b/modules/globebrowsing/src/tileloadjob.h
@@ -36,10 +36,10 @@ class RawTileDataReader;
 
 struct TileLoadJob : public Job<RawTile> {
     /**
-     * Allocates enough data for one tile. When calling `product()`, the
-     * ownership of this data will be released. If `product()` has not been
-     * called before the TileLoadJob is finished, the data will be deleted as it has not
-     * been exposed outside of this object.
+     * Allocates enough data for one tile. When calling #product, the ownership of this
+     * data will be released. If `product()` has not been called before the TileLoadJob is
+     * finished, the data will be deleted as it has not been exposed outside of this
+     * object.
      */
     TileLoadJob(RawTileDataReader& rawTileDataReader, TileIndex tileIndex);
 
@@ -57,10 +57,9 @@ struct TileLoadJob : public Job<RawTile> {
     void execute() override;
 
     /**
-    * Marks the job as finised and releases ownership of the data.
-    * Unless the job is marked as finished, the pixel data will be deallocated
-    * when the job is deleted.
-    */
+     * Marks the job as finised and releases ownership of the data. Unless the job is
+     * marked as finished, the pixel data will be deallocated when the job is deleted.
+     */
     RawTile product() override;
 
 protected:
diff --git a/modules/globebrowsing/src/tileprovider/temporaltileprovider.h b/modules/globebrowsing/src/tileprovider/temporaltileprovider.h
index 5c62fe68aa..7abb920d5d 100644
--- a/modules/globebrowsing/src/tileprovider/temporaltileprovider.h
+++ b/modules/globebrowsing/src/tileprovider/temporaltileprovider.h
@@ -39,8 +39,9 @@ namespace openspace::globebrowsing {
  * filepath to a Openspace Temporal dataset description file. This is an xml-file that
  * defines the same meta data as the GDAL wms description
  * (http://www.gdal.org/frmt_wms.html), but augmented with some extra tags describing the
- * temporal properties of the dataset. See
- * `TemporalTileProvider::TemporalXMLTags`
+ * temporal properties of the dataset.
+ *
+ * \sa TemporalTileProvider::TemporalXMLTags
  */
 class TemporalTileProvider : public TileProvider {
 public:
diff --git a/modules/globebrowsing/src/tileprovider/tileprovider.h b/modules/globebrowsing/src/tileprovider/tileprovider.h
index 3aef466827..33a1c58c42 100644
--- a/modules/globebrowsing/src/tileprovider/tileprovider.h
+++ b/modules/globebrowsing/src/tileprovider/tileprovider.h
@@ -115,19 +115,19 @@ struct TileProvider : public properties::PropertyOwner {
     virtual void reset() = 0;
 
     /**
-     * \return The minimum level as defined by the `TileIndex` that this
-     *         TileProvider is capable of providing.
+     * \return The minimum level as defined by the `TileIndex` that this TileProvider is
+     *         capable of providing
      */
     virtual int minLevel() = 0;
 
     /**
-     * \return The maximum level as defined by `TileIndex` that this
-     *         TileProvider is able provide.
+     * \return The maximum level as defined by `TileIndex` that this TileProvider is able
+     *         to provide
      */
     virtual int maxLevel() = 0;
 
     /**
-     * \return the no data value for the dataset. Default is the minimum float value.
+     * \return The no data value for the dataset. Default is the minimum float value
      */
     virtual float noDataValueAsFloat() = 0;
 
diff --git a/modules/globebrowsing/src/tiletextureinitdata.h b/modules/globebrowsing/src/tiletextureinitdata.h
index 2aa7925098..201a004e82 100644
--- a/modules/globebrowsing/src/tiletextureinitdata.h
+++ b/modules/globebrowsing/src/tiletextureinitdata.h
@@ -33,8 +33,9 @@
 
 namespace openspace::globebrowsing {
 
-
-/// All information needed to create a texture used for a Tile.
+/**
+ * All information needed to create a texture used for a Tile.
+ */
 class TileTextureInitData {
 public:
     using HashKey = uint64_t;
diff --git a/modules/globebrowsing/src/timequantizer.h b/modules/globebrowsing/src/timequantizer.h
index cae3ea89e1..b56e1dfc10 100644
--- a/modules/globebrowsing/src/timequantizer.h
+++ b/modules/globebrowsing/src/timequantizer.h
@@ -35,8 +35,8 @@ namespace openspace::globebrowsing {
 
 /**
  * RangedTime class is used to define an acceptable time range. Functionality includes
- * checking if a given date/time is within that range, or clamping a date to enforce
- * this range.
+ * checking if a given date/time is within that range, or clamping a date to enforce this
+ * range.
  */
 class RangedTime {
 public:
@@ -46,8 +46,8 @@ public:
      * Constructor that accepts an ISO8601 date/time string (`YYYY-MM-DDTHH:mm:ss`) for an
      * allowable time range defined by start and end values.
      *
-     * \param start The date/time start of the time range.
-     * \param end   The date/time ending of the time range.
+     * \param start The date/time start of the time range
+     * \param end The date/time ending of the time range
      */
     RangedTime(std::string start, std::string end);
 
@@ -56,18 +56,18 @@ public:
      * instance of the class.
      *
      * \param checkTime The time to test if it falls within the range
-     * \return true if the input date/time falls between the start and end date/times
-    */
+     * \return `true` if the input date/time falls between the start and end date/times
+     */
     bool includes(const Time& checkTime) const;
 
     /**
-     * Enforces the start/end range on a given date/time string by clamping the value
+     * Enforces the start/end range on a given date/time string by clamping the value.
      *
      * \param checkTime An ISO8601 date/time string to clamp if falls outside of range
-     * \return clamped value of input parameter, will be equal to the start value if
-     *         less than start, equal to end if greater than end, or equal to input
-     *         parameter if falls in-between
-    */
+     * \return Clamped value of input parameter, will be equal to the start value if less
+     *         than start, equal to end if greater than end, or equal to input parameter
+     *         if falls in-between
+     */
     const char* clamp(const char* checkTime);
 
     /**
@@ -78,21 +78,21 @@ public:
     std::string_view start() const;
 
     /**
-     * Get the end date/time of the time range
+     * Get the end date/time of the time range.
      *
      * \return The ISO8601 date/time string that defines the end of the range
      */
     std::string_view end() const;
 
     /**
-     * Set the start date/time of the time range
+     * Set the start date/time of the time range.
      *
      * \param start The ISO8601 date/time string that defines the start of the range
      */
     void setStart(const std::string start);
 
     /**
-     * Set the end date/time of the time range
+     * Set the end date/time of the time range.
      *
      * \param start The ISO8601 date/time string that defines the end of the range
      */
@@ -109,6 +109,7 @@ private:
  * DateTime class is used to manage a date/time value and provide methods for increment/
  * decrementing the value, which gets complicated because of the varying days of the
  * different months, leap years, etc.
+ *
  * This class exists to handle date/time values within a "people-friendly" calendar
  * schedule. For example, a temporal data set that's updated on the 10th of every month
  * will sometimes be updated in 28 days, other times in 31 days. The intent of the class
@@ -120,27 +121,27 @@ public:
     /**
      * Constructor that initializes with date/time string.
      *
-     * \param initDateTime the ISO8601 date/time string (`YYYY-MM-DDTHH:mm:ss`)
+     * \param initDateTime The ISO8601 date/time string (`YYYY-MM-DDTHH:mm:ss`)
      */
     DateTime(std::string_view initDateTime);
 
     /**
      * Set the date/time value.
      *
-     * \param input the ISO8601 date/time string (`YYYY-MM-DDTHH:mm:ss`) to set
+     * \param input The ISO8601 date/time string (`YYYY-MM-DDTHH:mm:ss`) to set
      */
     void setTime(std::string_view input);
 
     /**
      * Get the date/time value in ISO8601 format.
      *
-     * \return the date/time value string
+     * \return The date/time value string
      */
     std::string ISO8601() const;
 
     /**
-     * Get the J2000 seconds equivalent of the object's date/time, using
-     * the loaded SPICE kernel.
+     * Get the J2000 seconds equivalent of the object's date/time, using the loaded
+     * SPICE kernel.
      *
      * \return J2000 seconds of date/time
      */
@@ -149,110 +150,110 @@ public:
     /**
      * Get the year of the object's date/time (YYYY format).
      *
-     * \return integer value of the year
+     * \return Integer value of the year
      */
     int year() const;
 
     /**
      * Get the month of the object's date/time (1 - 12).
      *
-     * \return integer value of the month
+     * \return Integer value of the month
      */
     int month() const;
 
     /**
      * Get the day-of-month of the object's date/time (1 - 31).
      *
-     * \return integer value of the day
+     * \return Integer value of the day
      */
     int day() const;
 
     /**
-     * Get the hour of the object's date/time
+     * Get the hour of the object's date/time.
      *
-     * \return integer value of the hour (0 - 23)
+     * \return Integer value of the hour (0 - 23)
      */
     int hour() const;
 
     /**
-     * Get the minute of the object's date/time
+     * Get the minute of the object's date/time.
      *
-     * \return integer value of the minutes
+     * \return Integer value of the minutes
      */
     int minute() const;
 
     /**
-     * Get the seconds of the object's date/time
+     * Get the seconds of the object's date/time.
      *
-     * \return integer value of the seconds
+     * \return Integer value of the seconds
      */
     int second() const;
 
     /**
-     * Set the year of the object's date/time
+     * Set the year of the object's date/time.
      *
-     * \param y integer value of the year
+     * \param y Integer value of the year
      */
     void setYear(int y);
 
     /**
-     * Set the month of the object's date/time (1 - 12)
+     * Set the month of the object's date/time (1 - 12).
      *
-     * \param m integer value of the year
+     * \param m Integer value of the year
      */
     void setMonth(int m);
 
     /**
-     * Set the day-of-month of the object's date/time (1 - 31)
+     * Set the day-of-month of the object's date/time (1 - 31).
      *
-     * \param d integer value of the day
+     * \param d Integer value of the day
      */
     void setDay(int d);
 
     /**
-     * Set the hour of the object's date/time (0 - 23)
+     * Set the hour of the object's date/time (0 - 23).
      *
-     * \param h integer value of the hour
+     * \param h Integer value of the hour
      */
     void setHour(int h);
 
     /**
-     * Set the minute of the object's date/time
+     * Set the minute of the object's date/time.
      *
-     * \param m integer value of the minute
+     * \param m Integer value of the minute
      */
     void setMinute(int m);
 
     /**
-     * Set the seconds of the object's date/time
+     * Set the seconds of the object's date/time.
      *
-     * \param s integer value of the seconds
+     * \param s Integer value of the seconds
      */
     void setSecond(int s);
 
     /**
-     * Increment operation for the date/time
+     * Increment operation for the date/time.
      *
      * \param value integer value for number of units in an operation
      * \param unit single char that specifies the unit of increment. Allowable units are:
-     *             (y)ear, (M)onth, (d)ay, (h)our, (m)inute, (s)econd
-     * \param error The difference in J2000 seconds from current date/time to target
-     *              (a positive value means target is in the future)
+     *        (y)ear, (M)onth, (d)ay, (h)our, (m)inute, (s)econd
+     * \param error The difference in J2000 seconds from current date/time to target (a
+     *        positive value means target is in the future)
      * \param resolution The J2000 seconds of the interval defined by the value & unit
      * \return The number of increments that were performed in order to get as close as
-     *         possible to the target, where each increment is defined by the value &
-     *         unit (and approximated but not fixed by the resolution param)
+     *         possible to the target, where each increment is defined by the value & unit
+     *         (and approximated but not fixed by the resolution param)
      */
     int increment(int value, char unit, double error, double resolution);
 
     /**
-     * Decrement operation for the date/time
+     * Decrement operation for the date/time.
      *
      * \param value integer value for number of units in an operation
      * \param unit single char that specifies the unit of decrement. Allowable units are:
-     *             (y)ear, (M)onth, (d)ay, (h)our, (m)inute, (s)econd
-     * \param error The difference in J2000 seconds from current date/time to target
-     *              (a positive value means target is in the future)
+     *        (y)ear, (M)onth, (d)ay, (h)our, (m)inute, (s)econd
+     * \param error The difference in J2000 seconds from current date/time to target (a
+     *        positive value means target is in the future)
      * \param resolution The J2000 seconds of the interval defined by the value & unit
      * \return The number of decrements that were performed in order to get as close as
      *         possible to the target, where each decrement is defined by the value &
@@ -261,20 +262,20 @@ public:
     int decrement(int value, char unit, double error, double resolution);
 
     /**
-     * Single increment operation for the date/time
+     * Single increment operation for the date/time.
      *
      * \param value integer value for number of units in an operation
      * \param unit single char that specifies the unit of increment. Allowable units are:
-     *             (y)ear, (M)onth, (d)ay, (h)our, (m)inute, (s)econd
+     *        (y)ear, (M)onth, (d)ay, (h)our, (m)inute, (s)econd
      */
     void incrementOnce(int value, char unit);
 
     /**
-     * Single decrement operation for the date/time
+     * Single decrement operation for the date/time.
      *
      * \param value integer value for number of units in an operation
      * \param unit single char that specifies the unit of decrement. Allowable units are:
-     *             (y)ear, (M)onth, (d)ay, (h)our, (m)inute, (s)econd
+     *        (y)ear, (M)onth, (d)ay, (h)our, (m)inute, (s)econd
      */
     void decrementOnce(int value, char unit);
 
@@ -296,7 +297,7 @@ public:
 
     /**
      * Constructor that initializes with formatted strings for start & ends date/times,
-     * and a time resolution within that range
+     * and a time resolution within that range.
      *
      * \param start the ISO8601 date/time string (YYYY-MM-DDTHH:mm:ss) for start
      * \param end the ISO8601 date/time string (YYYY-MM-DDTHH:mm:ss) for end
@@ -314,27 +315,27 @@ public:
      * Set the time range start & end date/time range.
      *
      * \param start The ISO8601 date/time string for start of the time range
-     * \param end The ISO8601 date/time string for end of the time range.
+     * \param end The ISO8601 date/time string for end of the time range
      */
     void setStartEndRange(const std::string& start, const std::string& end);
 
     /**
-     * Set the time resolution
+     * Set the time resolution.
      *
-     * \param resolutionString String that defines the resolution within the time range.
-     *        see comment header for constructor for the allowable values and ranges.
+     * \param resolutionString String that defines the resolution within the time range
+     *        see comment header for constructor for the allowable values and ranges
      */
     void setResolution(const std::string& resolutionString);
 
     /**
-     * Takes a time resulition string and parses it into a double
-     * value representing the time resolution as seconds.
+     * Takes a time resulition string and parses it into a double value representing the
+     * time resolution as seconds.
      *
      * Example: parseTimeResolutionStr("1d");
      *
-     * \param resolutionStr with the format {number}{unit} where supported units are:
-     *        (s)econds, (m)inutes, (h)ours, (d)ays, (y)ears
-     * \return the time resolution in seconds
+     * \param resolutionStr String with the format {number}{unit} where supported units
+     *        are: (s)econds, (m)inutes, (h)ours, (d)ays, (y)ears
+     * \return The time resolution in seconds
      */
     double parseTimeResolutionStr(const std::string& resolutionStr);
 
@@ -344,7 +345,7 @@ public:
      *
      * \param t Time instance, which will be quantized
      * \param clamp Whether or not time should be clamped if not t is in the time range
-     * \return wether or not time was quantized
+     * \return Whether or not time was quantized
      */
     bool quantize(Time& t, bool clamp);
 
diff --git a/modules/imgui/include/guicomponent.h b/modules/imgui/include/guicomponent.h
index dbbc30592c..75c42f6224 100644
--- a/modules/imgui/include/guicomponent.h
+++ b/modules/imgui/include/guicomponent.h
@@ -37,7 +37,9 @@ class GUI;
  */
 class GuiComponent : public properties::PropertyOwner {
 public:
-    /// Constructor that initializes this components member variables
+    /**
+     * Constructor that initializes this components member variables.
+     */
     GuiComponent(std::string identifier, std::string guiName = "");
 
     /**
@@ -56,19 +58,29 @@ public:
      */
     void setEnabled(bool enabled);
 
-    /// Initializes the component with everything that does not require an OpenGL context
+    /**
+     * Initializes the component with everything that does not require an OpenGL context.
+     */
     virtual void initialize();
 
-    /// Initializes the component with everything that requires an OpenGL context
+    /**
+     * Initializes the component with everything that requires an OpenGL context.
+     */
     virtual void initializeGL();
 
-    /// Deinitializes the component with things that do not require an OpenGL context
+    /**
+     * Deinitializes the component with things that do not require an OpenGL context.
+     */
     virtual void deinitialize();
 
-    /// Deinitializes the component with things that require an OpenGL context
+    /**
+     * Deinitializes the component with things that require an OpenGL context.
+     */
     virtual void deinitializeGL();
 
-    /// Renders the individual subcomponents to the screen
+    /**
+     * Renders the individual subcomponents to the screen.
+     */
     virtual void render() = 0;
 
     void setShowHelpTooltip(bool showHelpTooltip);
diff --git a/modules/iswa/rendering/datacygnet.h b/modules/iswa/rendering/datacygnet.h
index b0b8d5d502..6398262ccc 100644
--- a/modules/iswa/rendering/datacygnet.h
+++ b/modules/iswa/rendering/datacygnet.h
@@ -39,7 +39,7 @@ class DataProcessor;
 /**
  * This class abstracts away the the loading of data and creation of textures for all data
  * cygnets. It specifies the interface that needs to be implemented for all concrete
- * subclasses
+ * subclasses.
  */
 class DataCygnet : public IswaCygnet {
 public:
@@ -69,13 +69,13 @@ protected:
     void setPropertyCallbacks();
 
     /**
-     * Subscribes to the group events that are shared by all DataCygnets
+     * Subscribes to the group events that are shared by all DataCygnets.
      */
     void subscribeToGroup();
 
     /**
      * Optional interface method. this has an implementation in datacygnet.cpp, but needs
-     * to be overriden for kameleonplane
+     * to be overriden for KameleonPlane.
      */
     virtual bool updateTextureResource() override;
 
diff --git a/modules/iswa/rendering/dataplane.h b/modules/iswa/rendering/dataplane.h
index 630ca66216..6d1f8dbf65 100644
--- a/modules/iswa/rendering/dataplane.h
+++ b/modules/iswa/rendering/dataplane.h
@@ -46,7 +46,7 @@ public:
 
 private:
     /**
-     * Creates a plane geometry
+     * Creates a plane geometry.
      */
     bool createGeometry() override;
     bool destroyGeometry() override;
diff --git a/modules/iswa/rendering/datasphere.h b/modules/iswa/rendering/datasphere.h
index 8bbe370496..91244a6120 100644
--- a/modules/iswa/rendering/datasphere.h
+++ b/modules/iswa/rendering/datasphere.h
@@ -45,7 +45,7 @@ public:
 
 protected:
     /**
-     * Creates a sphere geometry
+     * Creates a sphere geometry.
      */
     bool createGeometry() override;
     bool destroyGeometry() override;
diff --git a/modules/iswa/rendering/iswacygnet.h b/modules/iswa/rendering/iswacygnet.h
index 946ac3fa8d..2a765b9b90 100644
--- a/modules/iswa/rendering/iswacygnet.h
+++ b/modules/iswa/rendering/iswacygnet.h
@@ -74,7 +74,7 @@ protected:
 
     /**
      * Registers the properties that are equal in all IswaCygnets regardless of being part
-     * of a group or not
+     * of a group or not.
      */
     virtual void registerProperties();
     virtual void unregisterProperties();
@@ -114,7 +114,7 @@ protected:
     virtual bool readyToRender() const = 0;
 
     /**
-     * Should set all uniforms needed to render
+     * Should set all uniforms needed to render.
      */
     virtual void setUniforms() = 0;
 
diff --git a/modules/iswa/rendering/kameleonplane.h b/modules/iswa/rendering/kameleonplane.h
index 547fe3204d..945428b776 100644
--- a/modules/iswa/rendering/kameleonplane.h
+++ b/modules/iswa/rendering/kameleonplane.h
@@ -49,7 +49,7 @@ public:
 
 private:
     /**
-     * Creates a plane geometry
+     * Creates a plane geometry.
      */
     bool createGeometry() override;
     bool destroyGeometry() override;
@@ -62,7 +62,7 @@ private:
 
     /**
      * Given a path to the json index of seedpoints file, this method reads, parses and
-     * adds them as checkbox options in the _fieldlines SelectionProperty
+     * adds them as checkbox options in the _fieldlines SelectionProperty.
      *
      * \param indexFile Path to json index file
      */
@@ -94,9 +94,8 @@ private:
     /**
      * _fieldlineState maps the checkbox value of each fieldline seedpoint file to a tuple
      * containing information that is needed to either add or remove a fieldline from the
-     * scenegraph.
-     * This is the name, path to seedpoints file and a boolean to determine if it is
-     * active or inactive.
+     * scenegraph. This is the name, path to seedpoints file and a boolean to determine if
+     * it is active or inactive.
      */
     std::map<int, std::tuple<std::string, std::string, bool>> _fieldlineState;
     std::string _fieldlineIndexFile;
diff --git a/modules/iswa/rendering/texturecygnet.h b/modules/iswa/rendering/texturecygnet.h
index 6613390945..95e38d06e6 100644
--- a/modules/iswa/rendering/texturecygnet.h
+++ b/modules/iswa/rendering/texturecygnet.h
@@ -30,10 +30,9 @@
 namespace openspace {
 
 /**
- * This class exist to abstract away the loading of images
- * from iSWA and updating of the textures for child geometries.
- * The class specifies the minimum interface that child classes
- * needs to implement.
+ * This class exist to abstract away the loading of images from iSWA and updating of the
+ * textures for child geometries. The class specifies the minimum interface that child
+ * classes needs to implement.
  */
 class TextureCygnet : public IswaCygnet {
 public:
diff --git a/modules/iswa/rendering/textureplane.h b/modules/iswa/rendering/textureplane.h
index ff4b3f7747..66e5431a4b 100644
--- a/modules/iswa/rendering/textureplane.h
+++ b/modules/iswa/rendering/textureplane.h
@@ -32,9 +32,9 @@
 namespace openspace {
 
 /**
- * TexturePlane is a "concrete" IswaCygnet with texture as its input source.
- * It handles the creation, destruction and rendering of a plane geometry.
- * It also specifies which shaders to use and the uniforms that it needs.
+ * TexturePlane is a "concrete" IswaCygnet with texture as its input source. It handles
+ * the creation, destruction and rendering of a plane geometry. It also specifies which
+ * shaders to use and the uniforms that it needs.
  */
 class TexturePlane : public TextureCygnet {
 public:
diff --git a/modules/iswa/util/dataprocessor.h b/modules/iswa/util/dataprocessor.h
index 1a54139f1b..dc27d8697c 100644
--- a/modules/iswa/util/dataprocessor.h
+++ b/modules/iswa/util/dataprocessor.h
@@ -39,8 +39,6 @@ namespace properties { class SelectionProperty; }
 class Histogram;
 
 class DataProcessor {
-    //friend class IswaBaseGroup;
-
 public:
     DataProcessor() = default;
     virtual ~DataProcessor() = default;
diff --git a/modules/kameleon/include/kameleonwrapper.h b/modules/kameleon/include/kameleonwrapper.h
index 9293c7a84d..15bf2a232b 100644
--- a/modules/kameleon/include/kameleonwrapper.h
+++ b/modules/kameleon/include/kameleonwrapper.h
@@ -50,8 +50,8 @@ class KameleonWrapper {
 public:
     enum class Model {
         OpenGGCM,
-        BATSRUS,        // Magnetosphere
-        ENLIL,          // Heliosphere
+        BATSRUS, // Magnetosphere
+        ENLIL, // Heliosphere
         MAS,
         Adapt3D,
         SWMF,
diff --git a/modules/multiresvolume/rendering/tsp.h b/modules/multiresvolume/rendering/tsp.h
index a38cef48b3..b5b8fff25d 100644
--- a/modules/multiresvolume/rendering/tsp.h
+++ b/modules/multiresvolume/rendering/tsp.h
@@ -96,16 +96,21 @@ public:
     bool isOctreeLeaf(unsigned int brickIndex) const;
 
 private:
-    // Returns a list of the octree leaf nodes that a given input
-    // brick covers. If the input is already a leaf, the list will
-    // only contain that one index.
+    /**
+     * Returns a list of the octree leaf nodes that a given input brick covers. If the
+     * input is already a leaf, the list will only contain that one index.
+     */
     std::list<unsigned int> coveredLeafBricks(unsigned int brickIndex) const;
 
-    // Returns a list of the BST leaf nodes that a given input brick
-    // covers (at the same spatial subdivision level).
+    /**
+     * Returns a list of the BST leaf nodes that a given input brick covers (at the same
+     * spatial subdivision level).
+     */
     std::list<unsigned int> coveredBSTLeafBricks(unsigned int brickIndex) const;
 
-    // Return a list of eight children brick incices given a brick index
+    /**
+     * Return a list of eight children brick incices given a brick index.
+     */
     std::list<unsigned int> childBricks(unsigned int brickIndex);
 
     std::string _filename;
diff --git a/modules/server/include/topics/flightcontrollertopic.h b/modules/server/include/topics/flightcontrollertopic.h
index ec839c624e..4a58a30696 100644
--- a/modules/server/include/topics/flightcontrollertopic.h
+++ b/modules/server/include/topics/flightcontrollertopic.h
@@ -32,7 +32,7 @@
 namespace openspace::interaction {
     struct WebsocketInputStates;
     struct WebsocketInputState;
-}
+} // namespace openspace::interaction
 
 namespace openspace {
 
diff --git a/modules/skybrowser/include/utility.h b/modules/skybrowser/include/utility.h
index ee69dbbc03..1e574bc42f 100644
--- a/modules/skybrowser/include/utility.h
+++ b/modules/skybrowser/include/utility.h
@@ -37,6 +37,7 @@ constexpr double CelestialSphereRadius = 4.0 * distanceconstants::Parsec;
 
 /**
  * Converts from Cartesian coordinates to spherical coordinates with unit length.
+ *
  * \param coords Cartesian coordinates
  * \return Spherical coordinates with unit length in degrees
  */
@@ -44,15 +45,16 @@ glm::dvec2 cartesianToSpherical(const glm::dvec3& coords);
 
 /**
  * Converts from spherical coordinates to Cartesian coordinates with unit length.
+ *
  * \param coords Spherical coordinates in degrees
  * \return Cartesian coordinates with unit length
  */
 glm::dvec3 sphericalToCartesian(const glm::dvec2& coords);
 
-// Conversion J2000 equatorial <-> galactic
 /**
  * Converts from Cartesian galactic coordinates to Cartesian equatorial coordinates in
  * epoch J2000 with unit length.
+ *
  * \param coords Cartesian galactic coordinates
  * \return Cartesian equatorial coordinates in the epoch of J2000 with unit length
  */
@@ -61,6 +63,7 @@ glm::dvec3 galacticToEquatorial(const glm::dvec3& coords);
 /**
  * Converts from Cartesian equatorial coordinates to Cartesian galactic coordinates. The
  * galactic coordinates vector has the length of the radius of the Celestial sphere.
+ *
  * \param coords Cartesian equatorial coordinates
  * \return Cartesian galactic coordinates placed on the Celestial sphere
  */
@@ -70,6 +73,7 @@ glm::dvec3 equatorialToGalactic(const glm::dvec3& coords);
 /**
  * Converts from local camera coordinates to screenspace coordinates. The screenspace
  * coordinates are placed on the screenspace plane which has the z-coordinate as -2.1.
+ *
  * \param coords Cartesian local camera coordinates
  * \return Cartesian galactic coordinates placed on the Celestial sphere
  */
@@ -77,6 +81,7 @@ glm::dvec3 localCameraToScreenSpace3d(const glm::dvec3& coords);
 
 /**
  * Converts from pixel coordinates to screenspace coordinates in 2D.
+ *
  * \param mouseCoordinate Pixel coordinate
  * \return Cartesian ScreenSpace coordinate
  */
@@ -85,6 +90,7 @@ glm::vec2 pixelToScreenSpace2d(const glm::vec2& mouseCoordinate);
 // Conversion local camera space <-> galactic / equatorial
 /**
  * Converts from Cartesian equatorial coordinates in epoch J2000 to local camera space.
+ *
  * \param coords Cartesian equatorial coordinates in epoch J2000
  * \return Local camera coordinates with unit length
  */
@@ -92,6 +98,7 @@ glm::dvec3 equatorialToLocalCamera(const glm::dvec3& coords);
 
 /**
  * Converts from Cartesian galactic coordinates to local camera space with unit length.
+ *
  * \param coords Cartesian galactic coordinates
  * \return Cartesian local camera coordinates with unit length
  */
@@ -99,6 +106,7 @@ glm::dvec3 galacticToLocalCamera(const glm::dvec3& coords);
 
 /**
  * Converts from Cartesian local camera coordinates to galactic coordinates.
+ *
  * \param coords Cartesian local camera coordinates
  * \return Cartesian galactic coordinates placed on the Celestial sphere
  */
@@ -107,6 +115,7 @@ glm::dvec3 localCameraToGalactic(const glm::dvec3& coords);
 /**
  * Converts from local camera coordinates to Cartesian equatorial coordinates in the epoch
  * J2000.
+ *
  * \param coords Cartesian local camera coordinates
  * \return Cartesian equatorial coordinates with unit length
  */
@@ -116,8 +125,9 @@ glm::dvec3 localCameraToEquatorial(const glm::dvec3& coords);
 /**
  * Returns the angle between the up direction of the OpenSpace camera and the equatorial
  * North Pole direction.
+ *
  * \return Angle in degrees between the OpenSpace camera's up direction vector and the
- * equatorial North Pole direction.
+ *         equatorial North Pole direction.
  */
 double targetRoll(const glm::dvec3& up, const glm::dvec3& forward);
 
@@ -130,35 +140,39 @@ glm::dvec3 cameraDirectionGalactic();
 /**
  * Returns the view direction of the OpenSpace camera in equatorial coordinates in epoch
  * J2000.
+ *
  * \return View direction of the OpenSpace camera in Cartesian equatorial coordinates in
  *         epoch J2000.
  */
 glm::dvec3 cameraDirectionEquatorial();
 
-// Window and field of view
 /**
  * Returns the window ratio r which is calculated as x / y.
+ *
  * \return The window ratio x / y
  */
 float windowRatio();
 
 /**
  * Returns the vertical and horizontal field of view of the OpenSpace window.
- * \return The horizontal and vertical field of view in degrees.
+ *
+ * \return The horizontal and vertical field of view in degrees
  */
 glm::dvec2 fovWindow();
 
 /**
  * Returns true if the Cartesian equatorial coordinate is in the current view of the
  * camera.
+ *
  * \param equatorial Cartesian equatorial coordinates in epoch J2000
- * \return True if the coordinates are in the camera's current field of view
+ * \return `true` if the coordinates are in the camera's current field of view
  */
 bool isCoordinateInView(const glm::dvec3& equatorial);
 
 // Animation for target and camera
 /**
  * Returns the angle between two vectors.
+ *
  * \param start Cartesian vector
  * \param end Cartesian vector
  * \return Angle between two vectors in radians
@@ -168,10 +182,11 @@ double angleBetweenVectors(const glm::dvec3& start, const glm::dvec3& end);
 /**
  * Returns a 4x4 matrix for an incremental rotation of a vector. The matrix should be used
  * multiple times in order to animate.
+ *
  * \param start Cartesian vector
  * \param end Cartesian vector
  * \param percentage Percentage of the angle between the vectors that the matrix should
- * rotate
+ *        rotate
  * \return 4x4 matrix for incremental rotation animation of a vector
  */
 glm::dmat4 incrementalAnimationMatrix(const glm::dvec3& start, const glm::dvec3& end,
@@ -180,6 +195,7 @@ glm::dmat4 incrementalAnimationMatrix(const glm::dvec3& start, const glm::dvec3&
 /**
  * Returns the size in meters that for example a plane would need to have in order to
  * display a specified field of view.
+ *
  * \param fov The set field of view
  * \param worldPosition The galactic position of the plane
  * \return Field of view
diff --git a/modules/space/horizonsfile.h b/modules/space/horizonsfile.h
index cd3eaf6078..c492e7486a 100644
--- a/modules/space/horizonsfile.h
+++ b/modules/space/horizonsfile.h
@@ -36,7 +36,7 @@ namespace openspace {
 /**
  * A Horizons file is a text file generated from NASA JPL HORIZONS Website
  * (https://ssd.jpl.nasa.gov/horizons.cgi). The implementation supports both Vector
- * and Observer as Horizons data table
+ * and Observer as Horizons data table.
  *
  * In case of Vector table data the implementation expects a file with format:
  * TIME(JulianDayNumber = A.D. YYYY-MM-DD HH:MM:SS TDB)
@@ -46,8 +46,9 @@ namespace openspace {
  * Y - Y position in kilometers in Ecliptic J2000 reference frame
  * Z - Z position in kilometers in Ecliptic J2000 reference frame
  * Changes required in the "Table Settings" for compatible data:
- * 1. Under "Select Output Quantities" choose option "Position components {x, y, z} only"
- * 2. Uncheck the "Vector labels" options
+ *   1. Under "Select Output Quantities" choose option "Position components {x, y, z}
+ *      only"
+ *   2. Uncheck the "Vector labels" options
  *
  * In case of Observer table data the implementation expects a file with format:
  * TIME(YYYY-MM-DD HH:MM:SS) Range(km) GalLon(degrees) GalLat(degrees)
@@ -55,10 +56,10 @@ namespace openspace {
  * GalLon - Galactic Longitude in degrees
  * GalLat - Galactic Latitude in degrees
  * Changes required in the "Table Settings" for compatible data:
- * 1. Under "Observer Table Settings" uncheck all options except
- *    "Observer range & range-rate" and "Galactic longitude & latitude"
- * 2. Change "Range units" to "kilometers (km)" instead of "astronomical units (au)"
- * 3. Check the "Suppress range-rate" option
+ *   1. Under "Observer Table Settings" uncheck all options except
+ *      "Observer range & range-rate" and "Galactic longitude & latitude"
+ *   2. Change "Range units" to "kilometers (km)" instead of "astronomical units (au)"
+ *   3. Check the "Suppress range-rate" option
  */
 enum class HorizonsResultCode {
     Valid,
diff --git a/modules/space/kepler.h b/modules/space/kepler.h
index 0911587ccd..7786e0c48c 100644
--- a/modules/space/kepler.h
+++ b/modules/space/kepler.h
@@ -32,10 +32,10 @@
 namespace openspace::kepler {
 
 struct Parameters {
-    // Some human-readable name for the object represented by this kepler parameter set
+    /// Some human-readable name for the object represented by this kepler parameter set
     std::string name;
 
-    // Some form of unique identifier for the object represented by this data
+    /// Some form of unique identifier for the object represented by this data
     std::string id;
 
     double inclination = 0.0;
@@ -86,7 +86,7 @@ std::vector<Parameters> readOmmFile(std::filesystem::path file);
 std::vector<Parameters> readSbdbFile(std::filesystem::path file);
 
 /**
- * The different formats that the readFile function is capable of loading
+ * The different formats that the readFile function is capable of loading.
  */
 enum class Format {
     TLE,
diff --git a/modules/space/rendering/renderableconstellationbounds.h b/modules/space/rendering/renderableconstellationbounds.h
index f331bfdfeb..bfccd0cca9 100644
--- a/modules/space/rendering/renderableconstellationbounds.h
+++ b/modules/space/rendering/renderableconstellationbounds.h
@@ -38,9 +38,10 @@ namespace documentation { struct Documentation; }
  * http://cdsarc.u-strasbg.fr/viz-bin/Cat?cat=VI%2F49. It contains the bounds on the
  * celestial sky for the different constellations and is used to determine in which region
  * of the sky a specific object is located.
- * The bounds are drawn as lines on a sphere with variable radius, set by the
- * `_distance` property. Currently, all constellation bounds are lines, which
- * leads to artifacts if the radius is very small.
+ *
+ * The bounds are drawn as lines on a sphere with variable radius, set by the `_distance`
+ * property. Currently, all constellation bounds are lines, which leads to artifacts if
+ * the radius is very small.
  */
 class RenderableConstellationBounds : public RenderableConstellationsBase {
 public:
@@ -57,13 +58,18 @@ public:
     static documentation::Documentation Documentation();
 
 private:
-    /// Stores the constellation bounds
+    /**
+     * Stores the constellation bounds.
+     */
     struct ConstellationBound {
-        std::string constellationAbbreviation; ///< The abbreviation of the constellation
+        /// The abbreviation of the constellation
+        std::string constellationAbbreviation;
         std::string constellationFullName;
         bool isEnabled = false;
-        GLsizei startIndex; ///< The index of the first vertex describing the bounds
-        GLsizei nVertices; ///< The number of vertices describing the bounds
+        /// The index of the first vertex describing the bounds
+        GLsizei startIndex;
+        /// The number of vertices describing the bounds
+        GLsizei nVertices;
     };
 
     /**
diff --git a/modules/space/rendering/renderableconstellationlines.h b/modules/space/rendering/renderableconstellationlines.h
index d659811990..74a2795ebb 100644
--- a/modules/space/rendering/renderableconstellationlines.h
+++ b/modules/space/rendering/renderableconstellationlines.h
@@ -77,7 +77,7 @@ private:
     bool readSpeckFile();
 
     /**
-     * Callback method that gets triggered when `_constellationSelection` changes
+     * Callback method that gets triggered when `_constellationSelection` changes.
      */
     void selectionPropertyHasChanged() override;
 
diff --git a/modules/space/rendering/renderableconstellationsbase.h b/modules/space/rendering/renderableconstellationsbase.h
index 13a013dfd2..7c86c12e4b 100644
--- a/modules/space/rendering/renderableconstellationsbase.h
+++ b/modules/space/rendering/renderableconstellationsbase.h
@@ -45,7 +45,7 @@ namespace openspace {
 namespace documentation { struct Documentation; }
 
 /**
- * This is a base class for constellation lines and bounds
+ * This is a base class for constellation lines and bounds.
  */
 class RenderableConstellationsBase : public Renderable {
 public:
@@ -65,44 +65,47 @@ protected:
     explicit RenderableConstellationsBase(const ghoul::Dictionary& dictionary);
 
     /**
-     * Callback method that gets triggered when `_constellationSelection` changes
+     * Callback method that gets triggered when `_constellationSelection` changes.
      */
     virtual void selectionPropertyHasChanged() = 0;
 
-    /// Takes the given constellation `identifier` and returns the corresponding
-    /// full name
+    /**
+     * Takes the given constellation `identifier` and returns the corresponding full name.
+     */
     std::string constellationFullName(const std::string& identifier) const;
 
-    // Width for the rendered lines
+    /// Width for the rendered lines
     properties::FloatProperty _lineWidth;
 
-    // Property that stores all constellations chosen by the user to be drawn
+    /// Property that stores all constellations chosen by the user to be drawn
     properties::SelectionProperty _selection;
 
-    // Temporary storage of which constellations should be rendered as stated in the
-    // asset file
+    /// Temporary storage of which constellations should be rendered as stated in the
+    /// asset file
     std::vector<std::string> _assetSelection;
 
-    // Labels
+    /// Labels
     bool _hasLabels = false;
-    // Everything related to the labels is handled by LabelsComponent
+    /// Everything related to the labels is handled by LabelsComponent
     std::unique_ptr<LabelsComponent> _labels;
 
 private:
-    // Map over the constellations names and their abbreviations
-    // key = abbreviation, value = full name
+    /// Map over the constellations names and their abbreviations
+    /// key = abbreviation, value = full name
     std::map<std::string, std::string> _namesTranslation;
 
     /**
-     * Loads the file specified in `_constellationNamesFilename` that contains
-     * the mapping between abbreviations and full names of constellations
+     * Loads the file specified in `_constellationNamesFilename` that contains the mapping
+     * between abbreviations and full names of constellations.
      */
     void loadConstellationFile();
 
-    /// Fills the `_constellationSelection` property with all constellations
+    /**
+     * Fills the `_constellationSelection` property with all constellations.
+     */
     void fillSelectionProperty();
 
-    // The file containing constellation names and abbreviations
+    /// The file containing constellation names and abbreviations
     properties::StringProperty _namesFilename;
 };
 
diff --git a/modules/space/rendering/renderablehabitablezone.h b/modules/space/rendering/renderablehabitablezone.h
index 296cc0de53..fc24ab26f9 100644
--- a/modules/space/rendering/renderablehabitablezone.h
+++ b/modules/space/rendering/renderablehabitablezone.h
@@ -49,12 +49,14 @@ private:
 
     /**
      * Compute the inner and outer boundary of the habitable zone of a star, according to
-     * formula and coefficients by Kopparapu et al. (2015) https://arxiv.org/abs/1404.5292
+     * formula and coefficients by Kopparapu et al. (2015).
      *
      * \param teff The effective temperature of the star, in Kelvin
      * \param luminosity The luminosity of the star, in solar luminosities
-     * \return A vec4 with the boundaries in atronomical units, in the order:
-               optimistic inner, conservative inner, conservative outer, optimistic outer
+     * \return A vec4 with the boundaries in atronomical units, in the order: optimistic
+     *         inner, conservative inner, conservative outer, optimistic outer
+     *
+     * \sa https://arxiv.org/abs/1404.5292
      */
     glm::dvec4 computeKopparapuZoneBoundaries(float teff, float luminosity);
 
diff --git a/modules/space/rendering/renderabletravelspeed.h b/modules/space/rendering/renderabletravelspeed.h
index e2a62b0a54..d379ef064a 100644
--- a/modules/space/rendering/renderabletravelspeed.h
+++ b/modules/space/rendering/renderabletravelspeed.h
@@ -84,8 +84,8 @@ private:
     double _timeSinceStart = -1.0;
 
     ghoul::opengl::ProgramObject* _shaderProgram = nullptr;
-    // The vertex attribute location for position
-    // must correlate to layout location in vertex shader
+    // The vertex attribute location for position must correlate to layout location in
+    // vertex shader
     GLuint _vaoId = 0;
     GLuint _vBufferId = 0;
 };
diff --git a/modules/space/tasks/generatedebrisvolumetask.h b/modules/space/tasks/generatedebrisvolumetask.h
index f36045c8a5..adcca2e02a 100644
--- a/modules/space/tasks/generatedebrisvolumetask.h
+++ b/modules/space/tasks/generatedebrisvolumetask.h
@@ -26,20 +26,16 @@
 #define __OPENSPACE_MODULE_SPACE___GENERATEDEBRISVOLUMETASK___H__
 
 #include <openspace/util/task.h>
-#include <openspace/util/time.h>
+
 
 #include <modules/space/rendering/renderableorbitalkepler.h>
 #include <modules/space/translation/keplertranslation.h>
-
-
+#include <openspace/util/time.h>
 #include <ghoul/glm.h>
-
 #include <string>
 #include <vector>
 
-namespace openspace {
-namespace volume {
-
+namespace openspace::volume {
 
 class GenerateDebrisVolumeTask : public Task {
 public:
@@ -65,12 +61,8 @@ private:
     std::vector<KeplerParameters> _TLEDataVector;
 
     float _maxApogee;
-
-    // not sure if it should be local function or hidden function.
-    //std::vector<KeplerParameters> readTLEFile(const std::string& filename);
 };
 
-} // namespace volume
-} // namespace openspace
+} // namespace openspace::volume
 
 #endif // __OPENSPACE_MODULE_SPACE___GENERATEDEBRISVOLUMETASK___H__
diff --git a/modules/space/translation/gptranslation.h b/modules/space/translation/gptranslation.h
index e07d2925a0..7aa68679f6 100644
--- a/modules/space/translation/gptranslation.h
+++ b/modules/space/translation/gptranslation.h
@@ -31,7 +31,7 @@ namespace openspace {
 
 /**
  * A specialization of the KeplerTranslation that utilizes general pertubation file
- * formats to extracts the Keplerian elements
+ * formats to extracts the Keplerian elements.
  */
 class GPTranslation : public KeplerTranslation {
 public:
@@ -50,7 +50,7 @@ public:
      * that can be passed to the constructor.
      *
      * \return The openspace::Documentation that describes the ghoul::Dicitonary that can
-     * be passed to the constructor
+     *         be passed to the constructor
      */
     static documentation::Documentation Documentation();
 };
diff --git a/modules/space/translation/horizonstranslation.h b/modules/space/translation/horizonstranslation.h
index 76562a2643..5542b286fa 100644
--- a/modules/space/translation/horizonstranslation.h
+++ b/modules/space/translation/horizonstranslation.h
@@ -42,7 +42,7 @@ namespace documentation { struct Documentation; }
 /**
  * The HorizonsTranslation is based on text files generated from NASA JPL HORIZONS Website
  * (https://ssd.jpl.nasa.gov/horizons.cgi). The implementation supports both Vector
- * and Observer as Horizons data table
+ * and Observer as Horizons data table.
  *
  * In case of Vector table data the implementation expects a file with format:
  * TIME(JulianDayNumber = A.D. YYYY-MM-DD HH:MM:SS TDB)
@@ -52,8 +52,9 @@ namespace documentation { struct Documentation; }
  * Y - Y position in kilometers in Ecliptic J2000 reference frame
  * Z - Z position in kilometers in Ecliptic J2000 reference frame
  * Changes required in the "Table Settings" for compatible data:
- * 1. Under "Select Output Quantities" choose option "Position components {x, y, z} only"
- * 2. Uncheck the "Vector labels" options
+ *   1. Under "Select Output Quantities" choose option "Position components {x, y, z}
+ *      only"
+ *   2. Uncheck the "Vector labels" options
  *
  * In case of Observer table data the implementation expects a file with format:
  * TIME(YYYY-MM-DD HH:MM:SS) Range(km) GalLon(degrees) GalLat(degrees)
@@ -61,10 +62,10 @@ namespace documentation { struct Documentation; }
  * GalLon - Galactic Longitude in degrees
  * GalLat - Galactic Latitude in degrees
  * Changes required in the "Table Settings" for compatible data:
- * 1. Under "Observer Table Settings" uncheck all options except
- *    "Observer range & range-rate" and "Galactic longitude & latitude"
- * 2. Change "Range units" to "kilometers (km)" instead of "astronomical units (au)"
- * 3. Check the "Suppress range-rate" option
+ *   1. Under "Observer Table Settings" uncheck all options except
+ *      "Observer range & range-rate" and "Galactic longitude & latitude"
+ *   2. Change "Range units" to "kilometers (km)" instead of "astronomical units (au)"
+ *   3. Check the "Suppress range-rate" option
  */
 class HorizonsTranslation : public Translation {
 public:
diff --git a/modules/space/translation/keplertranslation.h b/modules/space/translation/keplertranslation.h
index 99f4c375cb..79cf251142 100644
--- a/modules/space/translation/keplertranslation.h
+++ b/modules/space/translation/keplertranslation.h
@@ -52,8 +52,8 @@ public:
     /**
      * The constructor that retrieves the required Keplerian elements from the passed
      * \p dictionary. These values are then apssed to the setKeplerElements method for
-     * further processing.
-     * The \p dictionary is tested against the Documentation for conformance.
+     * further processing. The \p dictionary is tested against the Documentation for
+     * conformance.
      *
      * \param dictionary The ghoul::Dictionary containing all the information about the
      *        Keplerian elements (see Documentation)
@@ -66,7 +66,7 @@ public:
     /**
     * Method returning the translation vector at a given time.
     *
-    * \param data provides information from the engine about, for example, the time
+    * \param data Provides information from the engine about, for example, the time
     */
     glm::dvec3 position(const UpdateData& data) const override;
 
@@ -121,10 +121,14 @@ public:
         double ascendingNode, double argumentOfPeriapsis, double meanAnomalyAtEpoch,
         double orbitalPeriod, double epoch);
 
-    /// Default construct that initializes all the properties and member variables
+    /**
+     * Default construct that initializes all the properties and member variables.
+     */
     KeplerTranslation();
 
-    /// Recombutes the rotation matrix used in the update method
+    /**
+     * Recombutes the rotation matrix used in the update method.
+     */
     void computeOrbitPlane() const;
 
 private:
diff --git a/modules/spacecraftinstruments/rendering/renderablefov.h b/modules/spacecraftinstruments/rendering/renderablefov.h
index 92a45ce93d..42f539c5b1 100644
--- a/modules/spacecraftinstruments/rendering/renderablefov.h
+++ b/modules/spacecraftinstruments/rendering/renderablefov.h
@@ -60,10 +60,12 @@ public:
     static documentation::Documentation Documentation();
 
 private:
-    // Checks the field of view of the instrument for the current \p time against all of
-    // the potential targets are returns the first name of the target that is in field of
-    // view, the previous target, or the closest target to the space craft. The second
-    // return value is whether the target is currently in the field of view
+    /**
+     * Checks the field of view of the instrument for the current \p time against all of
+     * the potential targets are returns the first name of the target that is in field of
+     * view, the previous target, or the closest target to the space craft. The second
+     * return value is whether the target is currently in the field of view.
+     */
     std::pair<std::string, bool> determineTarget(double time);
 
     void updateGPU();
@@ -129,13 +131,20 @@ private:
     RenderInformation _fieldOfViewBounds;
 
     struct {
-        properties::Vec3Property defaultStart; // Start color for uninteresting times
-        properties::Vec3Property defaultEnd; // End color for uninteresting times
-        properties::Vec3Property active; // Color use when a field-of-view is projecting
-        properties::Vec3Property targetInFieldOfView; // Color to use for target in fov
-        properties::Vec3Property intersectionStart; // Color at the start of intersection
-        properties::Vec3Property intersectionEnd; // Color at the end of intersection
-        properties::Vec3Property square; // Color for the orthogonal square
+        /// Start color for uninteresting times
+        properties::Vec3Property defaultStart;
+        /// End color for uninteresting times
+        properties::Vec3Property defaultEnd;
+        /// Color use when a field-of-view is projecting
+        properties::Vec3Property active;
+        /// Color to use for target in fov
+        properties::Vec3Property targetInFieldOfView;
+        /// Color at the start of intersection
+        properties::Vec3Property intersectionStart;
+        /// Color at the end of intersection
+        properties::Vec3Property intersectionEnd;
+        /// Color for the orthogonal square
+        properties::Vec3Property square;
     } _colors;
 };
 
diff --git a/modules/spacecraftinstruments/util/imagesequencer.h b/modules/spacecraftinstruments/util/imagesequencer.h
index ed8c1f2947..fd79fa3f71 100644
--- a/modules/spacecraftinstruments/util/imagesequencer.h
+++ b/modules/spacecraftinstruments/util/imagesequencer.h
@@ -47,13 +47,13 @@ class SequenceParser;
  * to function the client must provide or write a parser that fills the ImageSequencers
  * private members.
  *
- * \see SequenceParser
- * \see ImageSequencer::runSequenceParser(SequenceParser* parser)
+ * \sa SequenceParser
+ * \sa ImageSequencer::runSequenceParser(SequenceParser* parser)
  */
 class ImageSequencer {
 public:
     /**
-     * Singleton instantiation
+     * Singleton instantiation.
      */
     static ImageSequencer* _instance;
 
@@ -82,6 +82,7 @@ public:
 
     /**
      * Runs parser and recieves the datastructures filled by it.
+     *
      * \see SequenceParser
      */
     void runSequenceParser(SequenceParser& parser);
@@ -128,7 +129,7 @@ public:
     float instrumentActiveTime(double time, const std::string& instrumentID) const;
 
     /**
-     * Returns latest captured image
+     * Returns latest captured image.
      */
     Image latestImageForInstrument(const std::string& instrumentID) const;
 
@@ -141,14 +142,16 @@ private:
      * This handles any types of ambiguities between the data and SPICE calls. This map is
      * composed of a key that is a string in the data to be translated and a Decoder that
      * holds the corresponding translation provided through as asset.
-     * \see Decoder
+     *
+     * \sa Decoder
      */
     std::map<std::string, std::unique_ptr<Decoder>> _fileTranslation;
 
     /**
      * This is the main container of image data. The key is the target name, the value is
      * a subset of images.
-     * \see SequenceParser
+     *
+     * \sa SequenceParser
      */
     std::map<std::string, ImageSubset> _subsetMap;
 
@@ -168,7 +171,7 @@ private:
 
     /**
      * Holds the time ranges of each instruments on and off periods. An instrument
-     * rendering class may ask the ImageSequencer whether or not it
+     * rendering class may ask the ImageSequencer whether or not it.
      */
     std::vector<std::pair<std::string, TimeRange>> _instrumentTimes;
 
diff --git a/modules/statemachine/include/statemachine.h b/modules/statemachine/include/statemachine.h
index b78e36bf84..346290607b 100644
--- a/modules/statemachine/include/statemachine.h
+++ b/modules/statemachine/include/statemachine.h
@@ -44,14 +44,15 @@ public:
     bool canTransitionTo(const std::string& state) const;
 
     /**
-     * Return the identifiers of all possible transitions from the current state
+     * Return the identifiers of all possible transitions from the current state.
      */
     std::vector<std::string> possibleTransitions() const;
 
     /**
      * Saves the state machine to a .dot file, as a directed graph.
-     * filename is the full name of the file, including the directory,
-     * but without the extension.
+     *
+     * \param filename This is the full name of the file, including the directory,
+     *        but without the extension
      */
     void saveToDotFile(const std::string& filename) const;
 
diff --git a/modules/statemachine/statemachinemodule.h b/modules/statemachine/statemachinemodule.h
index 08b9359647..1521dc1f92 100644
--- a/modules/statemachine/statemachinemodule.h
+++ b/modules/statemachine/statemachinemodule.h
@@ -56,7 +56,7 @@ public:
 
     /**
      * Save the state machine to a file given by the name and optional directory.
-     * If no directory is given, the TEMP folder is used
+     * If no directory is given, the TEMP folder is used.
      */
     void saveToFile(const std::string& fileName,
         std::string directory = "${TEMPORARY}/") const;
diff --git a/modules/sync/syncs/httpsynchronization.h b/modules/sync/syncs/httpsynchronization.h
index ed7c6c0317..d1d1744f98 100644
--- a/modules/sync/syncs/httpsynchronization.h
+++ b/modules/sync/syncs/httpsynchronization.h
@@ -41,6 +41,7 @@ namespace openspace {
  * of this synchronization. That list of files can have empty lines and commented out
  * lines (starting with a #) that will be ignored. Every other line is URL that will be
  * downloaded into the #directory.
+ *
  * Each requested set of files is identified by a triplet of (identifier, file version,
  * application version). The identifier is denoting the group of files that is requested,
  * the file version is the specific version of this set of files, and the application
@@ -67,7 +68,9 @@ public:
         std::filesystem::path synchronizationRoot,
         std::vector<std::string> synchronizationRepositories);
 
-    /// Destructor that will close the asynchronous file transfer, if it is still ongoing
+    /**
+     * Destructor that will close the asynchronous file transfer, if it is still ongoing.
+     */
     ~HttpSynchronization() override;
 
     /**
@@ -85,7 +88,9 @@ public:
      */
     void start() override;
 
-    /// Cancels any ongoing synchronization of this ResourceSynchronization
+    /**
+     * Cancels any ongoing synchronization of this ResourceSynchronization.
+     */
     void cancel() override;
 
     std::string generateUid() override;
@@ -93,15 +98,20 @@ public:
     static documentation::Documentation Documentation();
 
 protected:
-    /// Creates a file next to the directory that indicates that this
-    /// ResourceSynchronization has successfully synchronized its contents
+    /** Creates a file next to the directory that indicates that this
+     * ResourceSynchronization has successfully synchronized its contents.
+     */
     void createSyncFile(bool isFullySynchronized = true) const override;
 
-    /// Check ossync file and returns true if all files are downloaded or false
-    /// if partially synched or if there is an ossync file error (rejected)
+    /**
+     * Check ossync file and returns true if all files are downloaded or false if
+     * partially synched or if there is an ossync file error (rejected).
+     */
     bool isEachFileDownloaded();
 
-    /// Representation of 'global' synchronization state that encodes where a fail happen.
+    /**
+     * Representation of 'global' synchronization state that encodes where a fail happen.
+     */
     enum class SynchronizationState {
         Success,
         ListDownloadFail,
@@ -109,7 +119,9 @@ protected:
     };
 
 private:
-    /// Tries to get a reply from the provided URL and returns that success to the caller
+    /**
+     * Tries to get a reply from the provided URL and returns that success to the caller.
+     */
     SynchronizationState trySyncFromUrl(std::string url);
 
     /// Contains a flag whether the current transfer should be cancelled
diff --git a/modules/sync/syncs/urlsynchronization.h b/modules/sync/syncs/urlsynchronization.h
index 0545d2c6a1..3691150f00 100644
--- a/modules/sync/syncs/urlsynchronization.h
+++ b/modules/sync/syncs/urlsynchronization.h
@@ -56,7 +56,9 @@ public:
     UrlSynchronization(const ghoul::Dictionary& dictionary,
         std::filesystem::path synchronizationRoot);
 
-    /// Contructor that will terminate the synchronization thread if it is still running
+    /**
+     * Contructor that will terminate the synchronization thread if it is still running.
+     */
     ~UrlSynchronization() override;
 
     /**
@@ -67,10 +69,14 @@ public:
      */
     std::filesystem::path directory() const override;
 
-    /// Starts the synchronization for this ResourceSynchronization
+    /**
+     * Starts the synchronization for this ResourceSynchronization.
+     */
     void start() override;
 
-    /// Cancels any ongoing synchronization of this ResourceSynchronization
+    /**
+     * Cancels any ongoing synchronization of this ResourceSynchronization.
+     */
     void cancel() override;
 
     std::string generateUid() override;
@@ -78,19 +84,25 @@ public:
     static documentation::Documentation Documentation();
 
 protected:
-    /// Read the `ossync` file and check if the downloaded files can be used. Returns 
-    /// `true` if they are valid and `false` if we should download them again
+    /**
+     * Read the `ossync` file and check if the downloaded files can be used. Returns
+     * `true` if they are valid and `false` if we should download them again.
+     */
     bool isEachFileValid();
 
 private:
     static constexpr double MaxDateAsJ2000 = 252424036869.18289;
 
-    /// Creates a file next to the directory that indicates that this
-    /// ResourceSynchronization has successfully synchronized its contents
+    /**
+     * Creates a file next to the directory that indicates that this
+     * ResourceSynchronization has successfully synchronized its contents.
+     */
     void createSyncFile(bool isFullySynchronized = true) const override;
 
-    /// Tries to get a reply from the asset URLs and returns that success to the caller
-    bool trySyncUrls(); 
+    /**
+     * Tries to get a reply from the asset URLs and returns that success to the caller.
+     */
+    bool trySyncUrls();
 
     /// The list of URLs that will be downloaded
     std::vector<std::string> _urls;
diff --git a/modules/touch/include/directinputsolver.h b/modules/touch/include/directinputsolver.h
index 062f2d9561..b142c8ea9a 100644
--- a/modules/touch/include/directinputsolver.h
+++ b/modules/touch/include/directinputsolver.h
@@ -29,20 +29,21 @@
 #include <modules/touch/ext/levmarq.h>
 #include <vector>
 
-
 namespace openspace {
 
 class Camera;
 class SceneGraphNode;
 
 /**
- * The DirectInputSolver is used to minimize the L2 error of touch input
- * to 3D camera position. It uses the levmarq algorithm in order to do this.
- * */
+ * The DirectInputSolver is used to minimize the L2 error of touch input to 3D camera
+ * position. It uses the levmarq algorithm in order to do this.
+ */
 class DirectInputSolver {
 public:
-    // Stores the selected node, the cursor ID as well as the surface coordinates the
-    // cursor touched
+    /**
+     * Stores the selected node, the cursor ID as well as the surface coordinates the
+     * cursor touched
+     */
     struct SelectedBody {
         size_t id = 0;
         SceneGraphNode* node = nullptr;
@@ -52,10 +53,10 @@ public:
     DirectInputSolver();
 
     /**
-     * Returns true if the error could be minimized within certain bounds.
-     * If the error is found to be outside the bounds after a certain amount of
-     * iterations, this function fails.
-     * */
+     * Returns true if the error could be minimized within certain bounds. If the error is
+     * found to be outside the bounds after a certain amount of iterations, this function
+     * fails.
+     */
     bool solve(const std::vector<TouchInputHolder>& list,
         const std::vector<SelectedBody>& selectedBodies,
         std::vector<double>* calculatedValues, const Camera& camera);
diff --git a/modules/touch/include/touchinteraction.h b/modules/touch/include/touchinteraction.h
index 4d79add788..8278e600d4 100644
--- a/modules/touch/include/touchinteraction.h
+++ b/modules/touch/include/touchinteraction.h
@@ -83,17 +83,17 @@ public:
     };
 
     /**
-     * Main function call
-     * 1 Checks if doubleTap occured
-     * 2 If the node in focus is large enough and all contact points have selected it,
-     *   calls directControl() function for direct-manipulation
-     * 3 Updates std::vector<SelectedBody> _selectedContactPoints (only if LMA
-     *   successfully converged, avoids interaction to snap on LMA fails)
-     * 4 If directControl() wasn't called this frame, interpret the incoming
-     *   list and decide what type of interaction this frame should do
-     * 5 Compute the new total velocities after interaction
-     * 6 Evaluate if directControl should be called next frame- true if all contact points
-     *   select the same node and said node is larger than _nodeRadiusThreshold
+     * Main function call:
+     *   1. Checks if doubleTap occured
+     *   2. If the node in focus is large enough and all contact points have selected it,
+     *     calls directControl() function for direct-manipulation
+     *   3. Updates std::vector<SelectedBody> _selectedContactPoints (only if LMA
+     *     successfully converged, avoids interaction to snap on LMA fails)
+     *   4. If directControl() wasn't called this frame, interpret the incoming
+     *      list and decide what type of interaction this frame should do
+     *   5. Compute the new total velocities after interaction
+     *   6. Evaluate if directControl should be called next frame- true if all contact
+     *      points select the same node and said node is larger than _nodeRadiusThreshold
      */
 
     void updateStateFromInput(const std::vector<TouchInputHolder>& list,
@@ -101,13 +101,19 @@ public:
 
     bool hasNonZeroVelocities() const;
 
-    // Calculates the new camera state with velocities and time since last frame
+    /**
+     * Calculates the new camera state with velocities and time since last frame.
+     */
     void step(double dt, bool directTouch = false);
 
-    // Called each frame we have no new input, used to reset data
+    /**
+     * Called each frame we have no new input, used to reset data.
+     */
     void resetAfterInput();
 
-    // Sets _tap to true, called if tap occured current frame (called from touchmodule)
+    /**
+     * Sets _tap to true, called if tap occured current frame (called from touchmodule).
+     */
     void tap();
 
     void setCamera(Camera* camera);
@@ -115,33 +121,39 @@ public:
 private:
     /**
      * Function that calculates the new camera state such that it minimizes the L2 error
-     * in screenspace
-     * between contact points and surface coordinates projected to clip space using LMA
+     * in screenspace between contact points and surface coordinates projected to clip
+     * space using LMA.
      */
     void directControl(const std::vector<TouchInputHolder>& list);
 
     /**
-     * Traces each contact point into the scene as a ray and find the intersection
-     * points on the surface of the current anchor node, if any. Saves the input id
-     * the node and surface coordinates the cursor hit
+     * Traces each contact point into the scene as a ray and find the intersection points
+     * on the surface of the current anchor node, if any. Saves the input id the node and
+     * surface coordinates the cursor hit.
      */
     void updateNodeSurfacePoints(const std::vector<TouchInputHolder>& list);
 
     /**
      * Returns an enum for what interaction to be used, depending on what input was
-     * received
+     * received.
      */
     InteractionType interpretInteraction(const std::vector<TouchInputHolder>& list,
         const std::vector<TouchInput>& lastProcessed);
 
-    // Compute new velocity according to the interpreted action
+    /**
+     * Compute new velocity according to the interpreted action.
+     */
     void computeVelocities(const std::vector<TouchInputHolder>& list,
         const std::vector<TouchInput>& lastProcessed);
 
-    // Compute velocity based on double-tap for zooming
+    /**
+     * Compute velocity based on double-tap for zooming.
+     */
     double computeTapZoomDistance(double zoomGain);
 
-    // Compute coefficient for velocity decay to be applied in decceleration
+    /**
+     * Compute coefficient for velocity decay to be applied in decceleration.
+     */
     double computeConstTimeDecayCoefficient(double velocity);
 
     /**
@@ -150,10 +162,14 @@ private:
      */
     void decelerate(double dt);
 
-    // Resets all properties that can be changed in the GUI to default
+    /**
+     * Resets all properties that can be changed in the GUI to default.
+     */
     void resetPropertiesToDefault();
 
-    // Set all velocities to zero
+    /**
+     * Set all velocities to zero.
+     */
     void resetVelocities();
 
     Camera* _camera = nullptr;
diff --git a/modules/touch/include/tuioear.h b/modules/touch/include/tuioear.h
index 55ec2d5b15..3ec380cc83 100644
--- a/modules/touch/include/tuioear.h
+++ b/modules/touch/include/tuioear.h
@@ -58,8 +58,8 @@ public:
     ~TuioEar();
 
     /**
-    * Callback functions, listens to the TUIO server
-    */
+     * Callback functions, listens to the TUIO server.
+     */
     void addTuioObject(TUIO::TuioObject *tobj);
     void updateTuioObject(TUIO::TuioObject *tobj);
     void removeTuioObject(TUIO::TuioObject *tobj);
@@ -75,8 +75,8 @@ public:
     void refresh(TUIO::TuioTime frameTime);
 
     /**
-        * Lock-swap the containers of this listener
-        */
+     * Lock-swap the containers of this listener.
+     */
     std::vector<TouchInput> takeInput();
     std::vector<TouchInput> takeRemovals();
 
diff --git a/modules/touch/touchmodule.h b/modules/touch/touchmodule.h
index 7600a42c16..eb263060f7 100644
--- a/modules/touch/touchmodule.h
+++ b/modules/touch/touchmodule.h
@@ -48,15 +48,19 @@ public:
     TouchModule();
     ~TouchModule();
 
-    // Function to check if the given renderable type is one that should
-    // use direct maniuplation
+    /**
+     * Function to check if the given renderable type is one that should use direct
+     * manipulation.
+     */
     bool isDefaultDirectTouchType(std::string_view renderableType) const;
 
 protected:
     void internalInitialize(const ghoul::Dictionary& dictionary) override;
 
 private:
-    /// Returns true if new touch input occured since the last frame
+    /**
+     * Returns true if new touch input occured since the last frame.
+     */
     bool processNewInput();
 
     void clearInputs();
diff --git a/modules/volume/rendering/renderabletimevaryingvolume.h b/modules/volume/rendering/renderabletimevaryingvolume.h
index d3f9bb1a9d..66e3cfaf99 100644
--- a/modules/volume/rendering/renderabletimevaryingvolume.h
+++ b/modules/volume/rendering/renderabletimevaryingvolume.h
@@ -42,7 +42,6 @@ namespace openspace {
 
 namespace openspace::volume {
 
-//class TransferFunction;
 class BasicVolumeRaycaster;
 template <typename T> class RawVolume;
 class VolumeClipPlanes;
diff --git a/modules/webbrowser/include/browserinstance.h b/modules/webbrowser/include/browserinstance.h
index 73fc907c0d..9c15eaf6fe 100644
--- a/modules/webbrowser/include/browserinstance.h
+++ b/modules/webbrowser/include/browserinstance.h
@@ -75,12 +75,12 @@ public:
     /**
      * Call when the window has been reshaped.
      *
-     * \param windowSize the size of the window in pixels
+     * \param windowSize The size of the window in pixels
      */
     void reshape(const glm::ivec2& windowSize);
 
     /**
-     * Encapsulate renderHandler's draw method
+     * Encapsulate renderHandler's draw method.
      */
     void draw();
     void close(bool force = false);
@@ -97,15 +97,17 @@ public:
     bool sendMouseMoveEvent(const CefMouseEvent& event);
 
     /**
-     * Send scroll wheel event to browser
+     * Send scroll wheel event to browser.
      *
      * \param event Key event with position
      * \param delta The scroll amount in pixels
-     * \return if this scroll should be blocked or not
+     * \return `true` if this scroll should be blocked or not
      */
     bool sendMouseWheelEvent(const CefMouseEvent& event, const glm::ivec2& delta);
 
-    /// Set the browser zoom level. 1.0 = default, 2.0 = double, etc.
+    /**
+     * Set the browser zoom level. 1.0 = default, 2.0 = double, etc.
+     */
     void setZoom(float ratio);
 
     void reloadBrowser();
diff --git a/modules/webbrowser/include/eventhandler.h b/modules/webbrowser/include/eventhandler.h
index b2754eb7ef..fdc904c038 100644
--- a/modules/webbrowser/include/eventhandler.h
+++ b/modules/webbrowser/include/eventhandler.h
@@ -75,7 +75,7 @@ private:
      * \param key the pressed key
      * \param mods the key modifier that was pressed
      * \param action the action that was performed that triggered this event
-     * \return true if event found, false otherwise
+     * \return `true` if event found, `false` otherwise
      */
     bool specialKeyEvent(Key key, KeyModifier mods, KeyAction action);
 
@@ -116,7 +116,7 @@ private:
     MouseButtonState _leftButton;
     MouseButtonState _rightButton;
 
-    // This vector assumes first element to be the active one:
+    /// This vector assumes first element to be the active one
     std::vector<TouchInput> _validTouchStates;
 
     /**
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index c0c383cbe2..a147c084dc 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -326,7 +326,6 @@ set(OPENSPACE_HEADER
   ${PROJECT_SOURCE_DIR}/include/openspace/rendering/screenspacerenderable.h
   ${PROJECT_SOURCE_DIR}/include/openspace/rendering/texturecomponent.h
   ${PROJECT_SOURCE_DIR}/include/openspace/rendering/transferfunction.h
-  ${PROJECT_SOURCE_DIR}/include/openspace/rendering/volume.h
   ${PROJECT_SOURCE_DIR}/include/openspace/rendering/volumeraycaster.h
   ${PROJECT_SOURCE_DIR}/include/openspace/scene/asset.h
   ${PROJECT_SOURCE_DIR}/include/openspace/scene/assetmanager.h

From 131b8f48868cdf7dbb4a3a970bfd832b7e170cc1 Mon Sep 17 00:00:00 2001
From: Alexander Bock <alexander.bock@liu.se>
Date: Tue, 21 Nov 2023 10:49:39 +0100
Subject: [PATCH 180/701] Doxygen update

---
 apps/OpenSpace/ext/sgct               |  2 +-
 ext/ghoul                             |  2 +-
 include/openspace/engine/logfactory.h |  4 +-
 include/openspace/util/spicemanager.h | 78 +++++++++++++--------------
 4 files changed, 43 insertions(+), 43 deletions(-)

diff --git a/apps/OpenSpace/ext/sgct b/apps/OpenSpace/ext/sgct
index a5f0b01420..05b292bdfb 160000
--- a/apps/OpenSpace/ext/sgct
+++ b/apps/OpenSpace/ext/sgct
@@ -1 +1 @@
-Subproject commit a5f0b014207b2e518e4f2dd5f5ed004855fff1b8
+Subproject commit 05b292bdfb10bfc22a2bd1ed02d36877062f65b4
diff --git a/ext/ghoul b/ext/ghoul
index c2992bd52f..dc58feeaf8 160000
--- a/ext/ghoul
+++ b/ext/ghoul
@@ -1 +1 @@
-Subproject commit c2992bd52f7c4e29a85dcbe44e3e6a89ffec0c19
+Subproject commit dc58feeaf82e8dd0a3655e84f179e38f5cf48fae
diff --git a/include/openspace/engine/logfactory.h b/include/openspace/engine/logfactory.h
index e4cce1ba43..f206ccd738 100644
--- a/include/openspace/engine/logfactory.h
+++ b/include/openspace/engine/logfactory.h
@@ -49,8 +49,8 @@ namespace documentation { struct Documentation; }
  * \post The return value will not be `nullptr`
  * \throw ghoul::RuntimeError If there was an error creating the ghoul::logging::Log
  *
- * \sa ghoul::logging::TextLog
- * \sa ghoul::logging::HTMLLog
+ * \see ghoul::logging::TextLog
+ * \see ghoul::logging::HTMLLog
  */
 std::unique_ptr<ghoul::logging::Log> createLog(const ghoul::Dictionary& dictionary);
 
diff --git a/include/openspace/util/spicemanager.h b/include/openspace/util/spicemanager.h
index 30e5b4845e..9b045426c3 100644
--- a/include/openspace/util/spicemanager.h
+++ b/include/openspace/util/spicemanager.h
@@ -73,7 +73,7 @@ public:
     /**
      * Specifies the aberration correction method for the #targetPosition function.
      *
-     * \sa http://naif.jpl.nasa.gov/pub/naif/toolkit_docs/C/cspice/spkpos_c.html
+     * \see http://naif.jpl.nasa.gov/pub/naif/toolkit_docs/C/cspice/spkpos_c.html
      */
     struct AberrationCorrection {
     public:
@@ -212,7 +212,7 @@ public:
      *       to the kernel is returned. The returned value is never equal to
      *       `KernelHandle(0)`.
      *
-     * \sa http://naif.jpl.nasa.gov/pub/naif/toolkit_docs/C/cspice/furnsh_c.html
+     * \see http://naif.jpl.nasa.gov/pub/naif/toolkit_docs/C/cspice/furnsh_c.html
      */
     KernelHandle loadKernel(std::string filePath);
 
@@ -228,7 +228,7 @@ public:
      * \pre \p kernelId cannot be equal to `KernelHandle(0)`.
      * \post The kernel identified by \p kernelId is unloaded.
      *
-     * \sa http://naif.jpl.nasa.gov/pub/naif/toolkit_docs/C/cspice/unload_c.html
+     * \see http://naif.jpl.nasa.gov/pub/naif/toolkit_docs/C/cspice/unload_c.html
      */
     void unloadKernel(KernelHandle kernelId);
 
@@ -244,7 +244,7 @@ public:
      * \pre \p filePath must not be empty.
      * \post The kernel identified by \p filePath is unloaded.
      *
-     * \sa http://naif.jpl.nasa.gov/pub/naif/toolkit_docs/C/cspice/unload_c.html
+     * \see http://naif.jpl.nasa.gov/pub/naif/toolkit_docs/C/cspice/unload_c.html
      */
     void unloadKernel(std::string filePath);
 
@@ -319,8 +319,8 @@ public:
      * \param item The item to find
      * \return `true` if the function succeeded, `false` otherwise
      *
-     * \sa http://naif.jpl.nasa.gov/pub/naif/toolkit_docs/C/cspice/bodfnd_c.html
-     * \sa http://naif.jpl.nasa.gov/pub/naif/toolkit_docs/C/req/naif_ids.html
+     * \see http://naif.jpl.nasa.gov/pub/naif/toolkit_docs/C/cspice/bodfnd_c.html
+     * \see http://naif.jpl.nasa.gov/pub/naif/toolkit_docs/C/req/naif_ids.html
      */
     bool hasValue(int naifId, const std::string& item) const;
 
@@ -336,7 +336,7 @@ public:
      * \pre \p body must not be empty
      * \pre \p item must not be empty
      *
-     * \sa http://naif.jpl.nasa.gov/pub/naif/toolkit_docs/C/cspice/bodfnd_c.html
+     * \see http://naif.jpl.nasa.gov/pub/naif/toolkit_docs/C/cspice/bodfnd_c.html
      */
     bool hasValue(const std::string& body, const std::string& item) const;
 
@@ -350,8 +350,8 @@ public:
      * \throw SpiceException If \p body does not name a valid SPICE object
      * \pre \p body must not be empty
      *
-     * \sa http://naif.jpl.nasa.gov/pub/naif/toolkit_docs/C/cspice/bods2c_c.html
-     * \sa http://naif.jpl.nasa.gov/pub/naif/toolkit_docs/C/req/naif_ids.html
+     * \see http://naif.jpl.nasa.gov/pub/naif/toolkit_docs/C/cspice/bods2c_c.html
+     * \see http://naif.jpl.nasa.gov/pub/naif/toolkit_docs/C/req/naif_ids.html
      */
     int naifId(const std::string& body) const;
 
@@ -375,7 +375,7 @@ public:
      * \throw SpiceException If \p frame is not a valid frame
      * \pre \p frame must not be empty
      *
-     * \sa http://naif.jpl.nasa.gov/pub/naif/toolkit_docs/C/cspice/namfrm_c.html
+     * \see http://naif.jpl.nasa.gov/pub/naif/toolkit_docs/C/cspice/namfrm_c.html
      */
     int frameId(const std::string& frame) const;
 
@@ -406,8 +406,8 @@ public:
      * \pre \p body must not be empty
      * \pre \p value must not be empty
      *
-     * \sa http://naif.jpl.nasa.gov/pub/naif/toolkit_docs/C/cspice/bodvrd_c.html
-     * \sa http://naif.jpl.nasa.gov/pub/naif/toolkit_docs/C/req/naif_ids.html
+     * \see http://naif.jpl.nasa.gov/pub/naif/toolkit_docs/C/cspice/bodvrd_c.html
+     * \see http://naif.jpl.nasa.gov/pub/naif/toolkit_docs/C/req/naif_ids.html
      */
     void getValue(const std::string& body, const std::string& value, double& v) const;
 
@@ -428,8 +428,8 @@ public:
      * \pre \p body must not be empty
      * \pre \p value must not be empty
      *
-     * \sa http://naif.jpl.nasa.gov/pub/naif/toolkit_docs/C/cspice/bodvrd_c.html
-     * \sa http://naif.jpl.nasa.gov/pub/naif/toolkit_docs/C/req/naif_ids.html
+     * \see http://naif.jpl.nasa.gov/pub/naif/toolkit_docs/C/cspice/bodvrd_c.html
+     * \see http://naif.jpl.nasa.gov/pub/naif/toolkit_docs/C/req/naif_ids.html
      */
     void getValue(const std::string& body, const std::string& value, glm::dvec2& v) const;
 
@@ -450,8 +450,8 @@ public:
      * \pre \p body must not be empty
      * \pre \p value must not be empty
      *
-     * \sa http://naif.jpl.nasa.gov/pub/naif/toolkit_docs/C/cspice/bodvrd_c.html
-     * \sa http://naif.jpl.nasa.gov/pub/naif/toolkit_docs/C/req/naif_ids.html
+     * \see http://naif.jpl.nasa.gov/pub/naif/toolkit_docs/C/cspice/bodvrd_c.html
+     * \see http://naif.jpl.nasa.gov/pub/naif/toolkit_docs/C/req/naif_ids.html
      */
     void getValue(const std::string& body, const std::string& value, glm::dvec3& v) const;
 
@@ -472,8 +472,8 @@ public:
      * \pre \p body must not be empty.
      * \pre \p value must not be empty.
      *
-     * \sa http://naif.jpl.nasa.gov/pub/naif/toolkit_docs/C/cspice/bodvrd_c.html
-     * \sa http://naif.jpl.nasa.gov/pub/naif/toolkit_docs/C/req/naif_ids.html
+     * \see http://naif.jpl.nasa.gov/pub/naif/toolkit_docs/C/cspice/bodvrd_c.html
+     * \see http://naif.jpl.nasa.gov/pub/naif/toolkit_docs/C/req/naif_ids.html
      */
     void getValue(const std::string& body, const std::string& value, glm::dvec4& v) const;
 
@@ -496,8 +496,8 @@ public:
      * \pre \p body must not be empty.
      * \pre \p value must not be empty.
      *
-     * \sa http://naif.jpl.nasa.gov/pub/naif/toolkit_docs/C/cspice/bodvrd_c.html
-     * \sa http://naif.jpl.nasa.gov/pub/naif/toolkit_docs/C/req/naif_ids.html
+     * \see http://naif.jpl.nasa.gov/pub/naif/toolkit_docs/C/cspice/bodvrd_c.html
+     * \see http://naif.jpl.nasa.gov/pub/naif/toolkit_docs/C/req/naif_ids.html
      */
     void getValue(const std::string& body, const std::string& value,
         std::vector<double>& v) const;
@@ -531,7 +531,7 @@ public:
      *        `str2et_c` function (see the Particulars section of the linked webpage)
      * \pre \p timeString must not be empty
      *
-     * \sa http://naif.jpl.nasa.gov/pub/naif/toolkit_docs/C/cspice/str2et_c.html
+     * \see http://naif.jpl.nasa.gov/pub/naif/toolkit_docs/C/cspice/str2et_c.html
      */
     double ephemerisTimeFromDate(const std::string& timeString) const;
     double ephemerisTimeFromDate(const char* timeString) const;
@@ -547,7 +547,7 @@ public:
      *
      * \pre \p format must not be empty
      *
-     * \sa http://naif.jpl.nasa.gov/pub/naif/toolkit_docs/C/cspice/timout_c.html
+     * \see http://naif.jpl.nasa.gov/pub/naif/toolkit_docs/C/cspice/timout_c.html
      */
     template <int N = 31>
     std::string dateFromEphemerisTime(double ephemerisTime,
@@ -611,8 +611,8 @@ public:
      * \pre \p referenceFrame must not be empty
      * \post If an exception is thrown, \p lightTime will not be modified
      *
-     * \sa http://naif.jpl.nasa.gov/pub/naif/toolkit_docs/C/cspice/spkpos_c.html
-     * \sa http://naif.jpl.nasa.gov/pub/naif/toolkit_docs/C/req/naif_ids.html
+     * \see http://naif.jpl.nasa.gov/pub/naif/toolkit_docs/C/cspice/spkpos_c.html
+     * \see http://naif.jpl.nasa.gov/pub/naif/toolkit_docs/C/req/naif_ids.html
      */
     glm::dvec3 targetPosition(const std::string& target, const std::string& observer,
         const std::string& referenceFrame, AberrationCorrection aberrationCorrection,
@@ -641,8 +641,8 @@ public:
      * \pre \p referenceFrame must not be empty
      * \post If an exception is thrown, \p lightTime will not be modified
      *
-     * \sa http://naif.jpl.nasa.gov/pub/naif/toolkit_docs/C/cspice/spkpos_c.html
-     * \sa http://naif.jpl.nasa.gov/pub/naif/toolkit_docs/C/req/naif_ids.html
+     * \see http://naif.jpl.nasa.gov/pub/naif/toolkit_docs/C/cspice/spkpos_c.html
+     * \see http://naif.jpl.nasa.gov/pub/naif/toolkit_docs/C/req/naif_ids.html
      */
     glm::dvec3 targetPosition(const std::string& target,
         const std::string& observer, const std::string& referenceFrame,
@@ -716,7 +716,7 @@ public:
      * \pre \p directionVector must not be the null vector
      * \post The SurfaceInterceptResult does not contain any uninitialized values
      *
-     * \sa http://naif.jpl.nasa.gov/pub/naif/toolkit_docs/C/cspice/sincpt_c.html
+     * \see http://naif.jpl.nasa.gov/pub/naif/toolkit_docs/C/cspice/sincpt_c.html
      */
     SurfaceInterceptResult surfaceIntercept(const std::string& target,
         const std::string& observer, const std::string& fovFrame,
@@ -747,7 +747,7 @@ public:
      * \pre \p referenceFrame must not be empty
      * \pre \p instrument must not be empty
      *
-     * \sa http://naif.jpl.nasa.gov/pub/naif/toolkit_docs/C/cspice/fovtrg_c.html
+     * \see http://naif.jpl.nasa.gov/pub/naif/toolkit_docs/C/cspice/fovtrg_c.html
      */
     bool isTargetInFieldOfView(const std::string& target, const std::string& observer,
         const std::string& referenceFrame, const std::string& instrument,
@@ -796,8 +796,8 @@ public:
      *       only set to a valid different from `0.0` if the \p aberrationCorrection is
      *       not AberrationCorrection::None
      *
-     * \sa http://naif.jpl.nasa.gov/pub/naif/toolkit_docs/C/cspice/spkezr_c.html
-     * \sa http://naif.jpl.nasa.gov/pub/naif/toolkit_docs/C/req/naif_ids.html
+     * \see http://naif.jpl.nasa.gov/pub/naif/toolkit_docs/C/cspice/spkezr_c.html
+     * \see http://naif.jpl.nasa.gov/pub/naif/toolkit_docs/C/req/naif_ids.html
      */
     TargetStateResult targetState(const std::string& target,
         const std::string& observer, const std::string& referenceFrame,
@@ -819,7 +819,7 @@ public:
      * \pre \p sourceFrame must not be empty
      * \pre \p destinatoinFrame must not be empty
      *
-     * \sa http://naif.jpl.nasa.gov/pub/naif/toolkit_docs/C/cspice/sxform_c.html
+     * \see http://naif.jpl.nasa.gov/pub/naif/toolkit_docs/C/cspice/sxform_c.html
      */
     TransformMatrix stateTransformMatrix(const std::string& sourceFrame,
         const std::string& destinationFrame, double ephemerisTime) const;
@@ -840,7 +840,7 @@ public:
      * \pre \p sourceFrame must not be empty
      * \pre \p destinationFrame must not be empty
      *
-     * \sa http://naif.jpl.nasa.gov/pub/naif/toolkit_docs/C/cspice/pxform_c.html
+     * \see http://naif.jpl.nasa.gov/pub/naif/toolkit_docs/C/cspice/pxform_c.html
      */
     glm::dmat3 positionTransformMatrix(const std::string& sourceFrame,
         const std::string& destinationFrame, double ephemerisTime) const;
@@ -908,7 +908,7 @@ public:
      * \pre \p instrument must not be empty
      * \post The returned structure has all its values initialized
      *
-     * \sa http://naif.jpl.nasa.gov/pub/naif/toolkit_docs/C/cspice/getfov_c.html
+     * \see http://naif.jpl.nasa.gov/pub/naif/toolkit_docs/C/cspice/getfov_c.html
      */
     FieldOfViewResult fieldOfView(const std::string& instrument) const;
 
@@ -924,7 +924,7 @@ public:
      * \throw SpiceException If \p instrument does not name a valid NAIF object
      * \post The returned structure has all its values initialized
      *
-     * \sa http://naif.jpl.nasa.gov/pub/naif/toolkit_docs/C/cspice/getfov_c.html
+     * \see http://naif.jpl.nasa.gov/pub/naif/toolkit_docs/C/cspice/getfov_c.html
      */
     FieldOfViewResult fieldOfView(int instrument) const;
 
@@ -976,7 +976,7 @@ public:
      * \pre \p numberOfTerminatorPoints must be bigger or equal to 1
      * \post The returned structure has all its values initialized
      *
-     * \sa http://naif.jpl.nasa.gov/pub/naif/toolkit_docs/C/cspice/edterm_c.html
+     * \see http://naif.jpl.nasa.gov/pub/naif/toolkit_docs/C/cspice/edterm_c.html
      */
     TerminatorEllipseResult terminatorEllipse(const std::string& target,
         const std::string& observer, const std::string& frame,
@@ -1038,8 +1038,8 @@ private:
      * \pre \p path must be nonempty and be an existing file
      * \post Coverage times are stored only if loading was successful
      *
-     * \sa http://naif.jpl.nasa.gov/pub/naif/toolkit_docs/C/cspice/ckobj_c.html
-     * \sa http://naif.jpl.nasa.gov/pub/naif/toolkit_docs/C/cspice/ckcov_c.html
+     * \see http://naif.jpl.nasa.gov/pub/naif/toolkit_docs/C/cspice/ckobj_c.html
+     * \see http://naif.jpl.nasa.gov/pub/naif/toolkit_docs/C/cspice/ckcov_c.html
      */
     void findCkCoverage(const std::string& path);
 
@@ -1052,8 +1052,8 @@ private:
      * \pre \p path must be nonempty and be an existing file
      * \post Coverage times are stored only if loading was successful
      *
-     * \sa http://naif.jpl.nasa.gov/pub/naif/toolkit_docs/C/cspice/spkobj_c.html
-     * \sa http://naif.jpl.nasa.gov/pub/naif/toolkit_docs/C/cspice/spkcov_c.html
+     * \see http://naif.jpl.nasa.gov/pub/naif/toolkit_docs/C/cspice/spkobj_c.html
+     * \see http://naif.jpl.nasa.gov/pub/naif/toolkit_docs/C/cspice/spkcov_c.html
      */
     void findSpkCoverage(const std::string& path);
 

From 320f349ad161a471e5865f99961ccfd68f1a5985 Mon Sep 17 00:00:00 2001
From: Emma Broman <emma.broman@liu.se>
Date: Tue, 21 Nov 2023 11:44:13 +0100
Subject: [PATCH 181/701] Update ghoul (toLowerCase & toUpperCase)

---
 ext/ghoul | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ext/ghoul b/ext/ghoul
index dc58feeaf8..a5f9918f57 160000
--- a/ext/ghoul
+++ b/ext/ghoul
@@ -1 +1 @@
-Subproject commit dc58feeaf82e8dd0a3655e84f179e38f5cf48fae
+Subproject commit a5f9918f5757eefd7c10b338797de6cf21ec8f9a

From 722c58f50a2331a0872387f9faa682103aa26dd0 Mon Sep 17 00:00:00 2001
From: Emma Broman <emma.broman@liu.se>
Date: Tue, 21 Nov 2023 13:59:05 +0100
Subject: [PATCH 182/701] Allow zero duration when flying to globe position

Consistent with other fly to functions
---
 modules/globebrowsing/globebrowsingmodule_lua.inl | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/modules/globebrowsing/globebrowsingmodule_lua.inl b/modules/globebrowsing/globebrowsingmodule_lua.inl
index 78d9cd7c61..ab315063bc 100644
--- a/modules/globebrowsing/globebrowsingmodule_lua.inl
+++ b/modules/globebrowsing/globebrowsingmodule_lua.inl
@@ -391,9 +391,8 @@ namespace {
     instruction.setValue("PathType", std::string("ZoomOutOverview"));
 
     if (duration.has_value()) {
-        constexpr double Epsilon = 1e-5;
-        if (*duration <= Epsilon) {
-            throw ghoul::lua::LuaError("Duration must be larger than zero");
+        if (*duration < 0) {
+            throw ghoul::lua::LuaError("Duration must be a positive value");
         }
         instruction.setValue("Duration", *duration);
     }

From 162b47d297e904066820b0439bb7a9ed4a69bf98 Mon Sep 17 00:00:00 2001
From: Alexander Bock <alexander.bock@liu.se>
Date: Tue, 21 Nov 2023 14:45:12 +0100
Subject: [PATCH 183/701] Fix TaskRunner that was broken after configuration
 change

---
 apps/TaskRunner/main.cpp | 21 ++++++++++++---------
 1 file changed, 12 insertions(+), 9 deletions(-)

diff --git a/apps/TaskRunner/main.cpp b/apps/TaskRunner/main.cpp
index bc4190f4f6..a4b4ced21f 100644
--- a/apps/TaskRunner/main.cpp
+++ b/apps/TaskRunner/main.cpp
@@ -39,6 +39,7 @@
 
 #include <openspace/engine/configuration.h>
 #include <openspace/engine/globals.h>
+#include <openspace/engine/settings.h>
 #include <openspace/engine/windowdelegate.h>
 #include <openspace/scripting/scriptengine.h>
 #include <openspace/rendering/renderable.h>
@@ -108,7 +109,7 @@ int main(int argc, char** argv) {
         ghoul::filesystem::FileSystem::Override::Yes
     );
 
-    std::filesystem::path configFile = configuration::findConfiguration();
+    std::filesystem::path configFile = findConfiguration();
 
     // Register the base path as the directory where the configuration file lives
     std::filesystem::path base = configFile.parent_path();
@@ -127,10 +128,11 @@ int main(int argc, char** argv) {
     }
 #endif // WIN32
 
-    *global::configuration = configuration::loadConfigurationFromFile(
+    std::filesystem::path settings = findSettings();
+    *global::configuration = loadConfigurationFromFile(
         configFile.string(),
-        size,
-        ""
+        settings,
+        size
     );
     openspace::global::openSpaceEngine->registerPathTokens();
     global::openSpaceEngine->initialize();
@@ -140,7 +142,7 @@ int main(int argc, char** argv) {
         ghoul::cmdparser::CommandlineParser::AllowUnknownCommands::Yes
     );
 
-    std::string tasksPath;
+    std::optional<std::string> tasksPath;
     commandlineParser.addCommand(
         std::make_unique<ghoul::cmdparser::SingleCommand<std::string>>(
             tasksPath,
@@ -155,8 +157,8 @@ int main(int argc, char** argv) {
 
     //FileSys.setCurrentDirectory(launchDirectory);
 
-    if (!tasksPath.empty()) {
-        performTasks(tasksPath);
+    if (tasksPath.has_value()) {
+        performTasks(*tasksPath);
         return 0;
     }
 
@@ -166,8 +168,9 @@ int main(int argc, char** argv) {
     std::filesystem::current_path(absPath("${TASKS}"));
 
     std::cout << "TASK > ";
-    while (std::cin >> tasksPath) {
-        performTasks(tasksPath);
+    std::string t;
+    while (std::cin >> t) {
+        performTasks(t);
         std::cout << "TASK > ";
     }
 

From eca9d375e75ae0d8c0f6d68b84c2746fd1b1a6c3 Mon Sep 17 00:00:00 2001
From: Micah Acinapura <micahnyc@gmail.com>
Date: Tue, 21 Nov 2023 19:15:42 -0500
Subject: [PATCH 184/701] update to new chlorophyll layer from gibs (#2959)

---
 .../layers/colorlayers/modis_terra_chlorophyll_a_temporal.asset | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/data/assets/scene/solarsystem/planets/earth/layers/colorlayers/modis_terra_chlorophyll_a_temporal.asset b/data/assets/scene/solarsystem/planets/earth/layers/colorlayers/modis_terra_chlorophyll_a_temporal.asset
index dda1ca392f..e6275f00ce 100644
--- a/data/assets/scene/solarsystem/planets/earth/layers/colorlayers/modis_terra_chlorophyll_a_temporal.asset
+++ b/data/assets/scene/solarsystem/planets/earth/layers/colorlayers/modis_terra_chlorophyll_a_temporal.asset
@@ -16,7 +16,7 @@ local Layer = {
     TemporalResolution = "1d",
     TimeFormat = "YYYY-MM-DD",
     Prototype = openspace.globebrowsing.createTemporalGibsGdalXml(
-      "MODIS_Terra_Chlorophyll_A",
+      "MODIS_Terra_L2_Chlorophyll_A",
       "1km",
       "png"
     )

From c559444e76c2d6f66422e34857cbb338d209eccc Mon Sep 17 00:00:00 2001
From: Alexander Bock <alexander.bock@liu.se>
Date: Thu, 23 Nov 2023 15:10:04 +0100
Subject: [PATCH 185/701] Update images on Readme page to new URL

---
 README.md | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/README.md b/README.md
index b609d2e277..22f0d4d176 100644
--- a/README.md
+++ b/README.md
@@ -11,12 +11,12 @@
 ![Contributors](https://img.shields.io/github/contributors/OpenSpace/OpenSpace?style=flat-square)
 ![Commits](https://img.shields.io/github/commit-activity/m/OpenSpace/OpenSpace?color=green&style=flat-square)
 
-![Image](https://github.com/OpenSpace/openspace.github.io/raw/master/assets/images/collection.jpg)
+![Image](https://docs.openspaceproject.com/en/latest/_static/images/collection.jpg)
 
 # Background
-OpenSpace started as a collaboration between Sweden's [Linköping University](https://scivis.github.io) (LiU) and the [American Museum of Natural History](https://www.amnh.org) (AMNH).  Development of the software began several years ago through a close collaboration with NASA Goddard's [Community Coordinated Modeling Center](https://ccmc.gsfc.nasa.gov) (CCMC) to model space weather forecasting and continued with visualizations of NASA's New Horizons mission to Pluto and ESA's Rosetta mission to 67P/Churyumov-Gerasimenko.  This promising set of preliminary work provided a foundation for continued funding from NASA, the Swedish eScience Research Centre, and the Knut and Alice Wallenberg foundation, which has extended the collaboration to include the University of Utah's [Scientific Computing and Imaging](https://www.sci.utah.edu) (SCI) Institute, [New York University](https://www.nyu.edu)'s Tandon School of Engineering, multiple informal science institutions across the world, and multiple, international vendors.
+OpenSpace started as a collaboration between Sweden's [Linköping University](https://immvis.github.io) (LiU) and the [American Museum of Natural History](https://www.amnh.org) (AMNH).  Development of the software began several years ago through a close collaboration with NASA Goddard's [Community Coordinated Modeling Center](https://ccmc.gsfc.nasa.gov) (CCMC) to model space weather forecasting and continued with visualizations of NASA's New Horizons mission to Pluto and ESA's Rosetta mission to 67P/Churyumov-Gerasimenko.  This promising set of preliminary work provided a foundation for continued funding from NASA, the Swedish eScience Research Centre, and the Knut and Alice Wallenberg foundation, which has extended the collaboration to include the University of Utah's [Scientific Computing and Imaging](https://www.sci.utah.edu) (SCI) Institute, [New York University](https://www.nyu.edu)'s Tandon School of Engineering, multiple informal science institutions across the world, and multiple, international vendors.
 
-![Image](https://github.com/OpenSpace/openspace.github.io/raw/master/assets/images/presentation.jpg)
+![Image](https://docs.openspaceproject.com/en/latest/_static/images/presentation.jpg)
 
 # Features
 Some of the high-level features supported in OpenSpace are:
@@ -31,7 +31,7 @@ Some of the high-level features supported in OpenSpace are:
 
 OpenSpace requires at least support for [OpenGL](https://www.opengl.org/) version 3.3, some custom components require at least version 4.2.
 
-![Image](https://github.com/OpenSpace/openspace.github.io/raw/master/assets/images/display-systems.jpg)
+![Image](https://docs.openspaceproject.com/en/latest/_static/images/display-systems.jpg)
 
 # Getting Started
 This repository contains the source code and example profiles for OpenSpace, but does not contain any data.  To build and install the application, please check out the [GitHub Wiki](https://github.com/OpenSpace/OpenSpace/wiki).  Here, you will find two pages, a [build instruction](https://github.com/OpenSpace/OpenSpace/wiki/Compiling) for all operating systems and then additional instructions for [Windows](https://github.com/OpenSpace/OpenSpace/wiki/Compiling-Windows), [Linux (Ubuntu)](https://github.com/OpenSpace/OpenSpace/wiki/Compiling-Ubuntu), and [MacOS](https://github.com/OpenSpace/OpenSpace/wiki/Compiling-MacOS). Please note that the Apple Silicon series of chips do not support OpenGL natively and Metal 2 does not support `double` precision accuracy (see [here](https://developer.apple.com/metal/Metal-Shading-Language-Specification.pdf) Section 2.1), therefore only the Intel processors for MacOS are supported and maintained.
@@ -44,7 +44,7 @@ Requirements for compiling are:
 
 Feel free to create issues for missing features, bug reports, or compile problems or contact us via [email](mailto:openspace@amnh.org?subject=OpenSpace:).  Regarding any issues, you are very welcome on our [Slack support channel](https://openspacesupport.slack.com) to which you can freely [sign-up](https://join.slack.com/t/openspacesupport/shared_invite/zt-37niq6y9-T0JaCIk4UoFLI4VF5U9Vsw).
 
-![Image](https://github.com/OpenSpace/openspace.github.io/raw/master/assets/images/himalaya-nkpg-dome.jpg)
+![Image](https://docs.openspaceproject.com/en/latest/_static/images/himalaya-nkpg-dome.jpg)
 
 # License
 The contents of this repository provided under an [MIT license](https://github.com/OpenSpace/OpenSpace/blob/master/LICENSE.md).

From 0b23df0d43607978c78709efb14adc333abb0673 Mon Sep 17 00:00:00 2001
From: Emma Broman <emma.broman@liu.se>
Date: Tue, 28 Nov 2023 10:59:58 +0100
Subject: [PATCH 186/701] Update GUI hash

---
 data/assets/util/webgui.asset | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/data/assets/util/webgui.asset b/data/assets/util/webgui.asset
index d3872b531a..84fc2876bd 100644
--- a/data/assets/util/webgui.asset
+++ b/data/assets/util/webgui.asset
@@ -4,7 +4,7 @@ local guiCustomization = asset.require("customization/gui")
 
 
 -- Select which commit hashes to use for the frontend and backend
-local frontendHash = "d7bac0d84b0a17de7f822fa776a7298b3d4ef372"
+local frontendHash = "dab34b102b76fd266cff11201c5606c3af74e79e"
 
 local frontend = asset.resource({
   Identifier = "WebGuiFrontend",

From 77084147dc0df1e90a9124ef8d28b523d676690c Mon Sep 17 00:00:00 2001
From: Emma Broman <emma.broman@liu.se>
Date: Tue, 28 Nov 2023 11:36:51 +0100
Subject: [PATCH 187/701] Update GUI hash

Fix bugs from functional rewrite: right-click on NumericInput and hover issues with MinMaxRangeInput
---
 data/assets/util/webgui.asset | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/data/assets/util/webgui.asset b/data/assets/util/webgui.asset
index 84fc2876bd..3465233474 100644
--- a/data/assets/util/webgui.asset
+++ b/data/assets/util/webgui.asset
@@ -4,7 +4,7 @@ local guiCustomization = asset.require("customization/gui")
 
 
 -- Select which commit hashes to use for the frontend and backend
-local frontendHash = "dab34b102b76fd266cff11201c5606c3af74e79e"
+local frontendHash = "6f98035816407646a88cf1f5156ef5be553f9ff1"
 
 local frontend = asset.resource({
   Identifier = "WebGuiFrontend",

From c525565e849d1c06b30eba85f446c480a8a4c9e1 Mon Sep 17 00:00:00 2001
From: Emma Broman <emma.broman@liu.se>
Date: Tue, 28 Nov 2023 14:57:01 +0100
Subject: [PATCH 188/701] Utilize new functions for converting strings to
 upper/lower case (#2956)

* Utilize new functions for converting strings to upper/lower case

* Adapt to updated file name

* Use new function signature

* Update ghoul
---
 ext/ghoul                                     |  2 +-
 .../dashboard/dashboarditeminputstate.cpp     |  2 +-
 .../renderablefieldlinessequence.cpp          | 15 +++---------
 .../globebrowsing/globebrowsingmodule_lua.inl |  4 ++--
 modules/globebrowsing/src/gdalwrapper.cpp     |  8 ++-----
 modules/imgui/src/guipropertycomponent.cpp    |  2 +-
 modules/imgui/src/guiscenecomponent.cpp       |  2 +-
 modules/imgui/src/renderproperties.cpp        |  2 +-
 modules/kameleon/src/kameleonwrapper.cpp      | 23 ++++---------------
 modules/skybrowser/src/wwtdatahandler.cpp     |  2 +-
 modules/space/horizonsfile.cpp                |  2 +-
 modules/space/kepler.cpp                      |  2 +-
 .../renderableconstellationlines.cpp          |  2 +-
 .../renderableconstellationsbase.cpp          |  2 +-
 .../util/hongkangparser.cpp                   |  8 ++-----
 .../util/instrumentdecoder.cpp                |  8 ++-----
 modules/statemachine/statemachinemodule.cpp   |  2 +-
 src/documentation/verifier.cpp                |  2 +-
 src/engine/openspaceengine.cpp                | 12 ++++------
 src/properties/list/doublelistproperty.cpp    |  2 +-
 src/properties/list/intlistproperty.cpp       |  2 +-
 src/properties/list/stringlistproperty.cpp    |  2 +-
 src/properties/selectionproperty.cpp          |  2 +-
 src/rendering/luaconsole.cpp                  | 17 ++++----------
 src/scene/profile.cpp                         |  2 +-
 src/scene/scene.cpp                           |  2 +-
 src/scripting/systemcapabilitiesbinding.cpp   |  2 +-
 src/util/json_helper.cpp                      | 18 ++++-----------
 src/util/keys.cpp                             |  9 ++------
 src/util/openspacemodule.cpp                  | 17 +++-----------
 src/util/time.cpp                             |  2 +-
 src/util/versionchecker.cpp                   |  2 +-
 32 files changed, 54 insertions(+), 127 deletions(-)

diff --git a/ext/ghoul b/ext/ghoul
index a5f9918f57..b9c9a031f8 160000
--- a/ext/ghoul
+++ b/ext/ghoul
@@ -1 +1 @@
-Subproject commit a5f9918f5757eefd7c10b338797de6cf21ec8f9a
+Subproject commit b9c9a031f8169f13349c458815ecf34e9f6990d6
diff --git a/modules/base/dashboard/dashboarditeminputstate.cpp b/modules/base/dashboard/dashboarditeminputstate.cpp
index ea0758154e..eecc6e0da4 100644
--- a/modules/base/dashboard/dashboarditeminputstate.cpp
+++ b/modules/base/dashboard/dashboarditeminputstate.cpp
@@ -31,7 +31,7 @@
 #include <ghoul/font/font.h>
 #include <ghoul/font/fontmanager.h>
 #include <ghoul/font/fontrenderer.h>
-#include <ghoul/misc/misc.h>
+#include <ghoul/misc/stringhelper.h>
 
 namespace {
     constexpr openspace::properties::Property::PropertyInfo ShowWhenEnabledInfo = {
diff --git a/modules/fieldlinessequence/rendering/renderablefieldlinessequence.cpp b/modules/fieldlinessequence/rendering/renderablefieldlinessequence.cpp
index 92b10d7c1c..a660a15456 100644
--- a/modules/fieldlinessequence/rendering/renderablefieldlinessequence.cpp
+++ b/modules/fieldlinessequence/rendering/renderablefieldlinessequence.cpp
@@ -36,6 +36,7 @@
 #include <openspace/util/updatestructures.h>
 #include <ghoul/filesystem/filesystem.h>
 #include <ghoul/logging/logmanager.h>
+#include <ghoul/misc/stringhelper.h>
 #include <ghoul/opengl/openglstatecache.h>
 #include <ghoul/opengl/programobject.h>
 #include <ghoul/opengl/textureunit.h>
@@ -411,12 +412,7 @@ RenderableFieldlinesSequence::RenderableFieldlinesSequence(
             [&fileTypeString](const std::string& str) {
                 const size_t extLength = fileTypeString.length();
                 std::string sub = str.substr(str.length() - extLength, extLength);
-                std::transform(
-                    sub.begin(),
-                    sub.end(),
-                    sub.begin(),
-                    [](char c) { return static_cast<char>(::tolower(c)); }
-                );
+                sub = ghoul::toLowerCase(sub);
                 return sub != fileTypeString;
             }
         ),
@@ -570,12 +566,7 @@ void RenderableFieldlinesSequence::initializeGL() {
 
 // Returns fls::Model::Invalid if it fails to extract mandatory information
 fls::Model stringToModel(std::string str) {
-    std::transform(
-        str.begin(),
-        str.end(),
-        str.begin(),
-        [](char c) { return static_cast<char>(::tolower(c)); }
-    );
+    str = ghoul::toLowerCase(str);
     return fls::stringToModel(str);
 }
 
diff --git a/modules/globebrowsing/globebrowsingmodule_lua.inl b/modules/globebrowsing/globebrowsingmodule_lua.inl
index ab315063bc..3d51d058cd 100644
--- a/modules/globebrowsing/globebrowsingmodule_lua.inl
+++ b/modules/globebrowsing/globebrowsingmodule_lua.inl
@@ -23,6 +23,7 @@
  ****************************************************************************************/
 
 #include <openspace/util/collisionhelper.h>
+#include <ghoul/misc/stringhelper.h>
 
 namespace {
 
@@ -673,8 +674,7 @@ geoPositionForCameraDeprecated(bool useEyePosition = false)
     }
 
     std::string extension = path.extension().string();
-    std::transform(extension.begin(), extension.end(), extension.begin(),
-        [](unsigned char c) { return std::tolower(c); });
+    extension = ghoul::toLowerCase(extension);
 
     if (extension != ".geojson" && extension != ".json") {
         throw ghoul::lua::LuaError(fmt::format(
diff --git a/modules/globebrowsing/src/gdalwrapper.cpp b/modules/globebrowsing/src/gdalwrapper.cpp
index 980bddbcb3..fe2787fd48 100644
--- a/modules/globebrowsing/src/gdalwrapper.cpp
+++ b/modules/globebrowsing/src/gdalwrapper.cpp
@@ -31,6 +31,7 @@
 #include <ghoul/logging/consolelog.h>
 #include <ghoul/logging/logmanager.h>
 #include <ghoul/misc/profiling.h>
+#include <ghoul/misc/stringhelper.h>
 #include <cpl_conv.h>
 #include <gdal.h>
 
@@ -135,12 +136,7 @@ void GdalWrapper::setGdalProxyConfiguration() {
         const std::string user = global::configuration->httpProxy.user;
         const std::string password = global::configuration->httpProxy.password;
         std::string auth = global::configuration->httpProxy.authentication;
-        std::transform(
-            auth.begin(),
-            auth.end(),
-            auth.begin(),
-            [](char c) { return static_cast<char>(::toupper(c)); }
-        );
+        auth = ghoul::toUpperCase(auth);
 
         const std::string proxy = address + ":" + std::to_string(port);
         CPLSetConfigOption("GDAL_HTTP_PROXY", proxy.c_str());
diff --git a/modules/imgui/src/guipropertycomponent.cpp b/modules/imgui/src/guipropertycomponent.cpp
index 8f38f0dda8..834e58aedc 100644
--- a/modules/imgui/src/guipropertycomponent.cpp
+++ b/modules/imgui/src/guipropertycomponent.cpp
@@ -29,7 +29,7 @@
 #include <openspace/engine/globals.h>
 #include <openspace/engine/openspaceengine.h>
 #include <openspace/scene/scenegraphnode.h>
-#include <ghoul/misc/misc.h>
+#include <ghoul/misc/stringhelper.h>
 #include <algorithm>
 
 //#define Debugging_ImGui_TreeNode_Indices
diff --git a/modules/imgui/src/guiscenecomponent.cpp b/modules/imgui/src/guiscenecomponent.cpp
index 992b0bbe91..7cd8ac9dbc 100644
--- a/modules/imgui/src/guiscenecomponent.cpp
+++ b/modules/imgui/src/guiscenecomponent.cpp
@@ -32,7 +32,7 @@
 #include <openspace/scene/scenegraphnode.h>
 #include <openspace/scene/scene.h>
 #include <openspace/util/timemanager.h>
-#include <ghoul/misc/misc.h>
+#include <ghoul/misc/stringhelper.h>
 #include <algorithm>
 
 namespace {
diff --git a/modules/imgui/src/renderproperties.cpp b/modules/imgui/src/renderproperties.cpp
index 6e49500b36..81b8aa6e8a 100644
--- a/modules/imgui/src/renderproperties.cpp
+++ b/modules/imgui/src/renderproperties.cpp
@@ -50,7 +50,7 @@
 #include <openspace/scripting/scriptengine.h>
 #include <ghoul/filesystem/filesystem.h>
 #include <ghoul/misc/dictionaryluaformatter.h>
-#include <ghoul/misc/misc.h>
+#include <ghoul/misc/stringhelper.h>
 
 namespace openspace {
 
diff --git a/modules/kameleon/src/kameleonwrapper.cpp b/modules/kameleon/src/kameleonwrapper.cpp
index d1515b89af..555cc17a98 100644
--- a/modules/kameleon/src/kameleonwrapper.cpp
+++ b/modules/kameleon/src/kameleonwrapper.cpp
@@ -30,7 +30,7 @@
 #include <ghoul/fmt.h>
 #include <ghoul/glm.h>
 #include <ghoul/misc/assert.h>
-#include <ghoul/misc/misc.h>
+#include <ghoul/misc/stringhelper.h>
 #include <filesystem>
 
 #ifdef WIN32
@@ -83,24 +83,9 @@ std::array<std::string, 3> gridVariables(ccmc::Model* model) {
     std::string y = std::move(tokens.at(1));
     std::string z = std::move(tokens.at(2));
 
-    std::transform(
-        x.cbegin(),
-        x.cend(),
-        x.begin(),
-        [](char c) { return static_cast<char>(tolower(c)); }
-    );
-    std::transform(
-        y.cbegin(),
-        y.cend(),
-        y.begin(),
-        [](char c) { return static_cast<char>(tolower(c)); }
-    );
-    std::transform(
-        z.cbegin(),
-        z.cend(),
-        z.begin(),
-        [](char c) { return static_cast<char>(tolower(c)); }
-    );
+    x = ghoul::toLowerCase(x);
+    y = ghoul::toLowerCase(y);
+    z = ghoul::toLowerCase(z);
 
     return { x, y, z };
 }
diff --git a/modules/skybrowser/src/wwtdatahandler.cpp b/modules/skybrowser/src/wwtdatahandler.cpp
index b661fc6887..a000d3e17c 100644
--- a/modules/skybrowser/src/wwtdatahandler.cpp
+++ b/modules/skybrowser/src/wwtdatahandler.cpp
@@ -204,7 +204,7 @@ namespace {
         // Collect name, image url and credits
         std::string name = attribute(node, Name);
         if (std::islower(name[0])) {
-            // convert string to upper case
+            // convert first character in string to upper case
             name[0] = static_cast<char>(std::toupper(name[0]));
         }
 
diff --git a/modules/space/horizonsfile.cpp b/modules/space/horizonsfile.cpp
index 08442195ee..f2635c70a8 100644
--- a/modules/space/horizonsfile.cpp
+++ b/modules/space/horizonsfile.cpp
@@ -30,7 +30,7 @@
 #include <ghoul/filesystem/filesystem.h>
 #include <ghoul/fmt.h>
 #include <ghoul/logging/logmanager.h>
-#include <ghoul/misc/misc.h>
+#include <ghoul/misc/stringhelper.h>
 #include <filesystem>
 #include <fstream>
 
diff --git a/modules/space/kepler.cpp b/modules/space/kepler.cpp
index ef5e40e508..45d5ba5b1f 100644
--- a/modules/space/kepler.cpp
+++ b/modules/space/kepler.cpp
@@ -27,7 +27,7 @@
 #include <ghoul/filesystem/cachemanager.h>
 #include <ghoul/filesystem/filesystem.h>
 #include <ghoul/logging/logmanager.h>
-#include <ghoul/misc/misc.h>
+#include <ghoul/misc/stringhelper.h>
 #include <scn/scn.h>
 #include <scn/tuple_return.h>
 #include <fstream>
diff --git a/modules/space/rendering/renderableconstellationlines.cpp b/modules/space/rendering/renderableconstellationlines.cpp
index 01529fad9d..de1cc76e19 100644
--- a/modules/space/rendering/renderableconstellationlines.cpp
+++ b/modules/space/rendering/renderableconstellationlines.cpp
@@ -31,7 +31,7 @@
 #include <ghoul/filesystem/filesystem.h>
 #include <ghoul/glm.h>
 #include <ghoul/logging/logmanager.h>
-#include <ghoul/misc/misc.h>
+#include <ghoul/misc/stringhelper.h>
 #include <ghoul/opengl/openglstatecache.h>
 #include <ghoul/opengl/programobject.h>
 #include <scn/scn.h>
diff --git a/modules/space/rendering/renderableconstellationsbase.cpp b/modules/space/rendering/renderableconstellationsbase.cpp
index fd77b5bc64..fb75c8fb5a 100644
--- a/modules/space/rendering/renderableconstellationsbase.cpp
+++ b/modules/space/rendering/renderableconstellationsbase.cpp
@@ -31,7 +31,7 @@
 #include <openspace/util/updatestructures.h>
 #include <ghoul/filesystem/filesystem.h>
 #include <ghoul/glm.h>
-#include <ghoul/misc/misc.h>
+#include <ghoul/misc/stringhelper.h>
 #include <ghoul/opengl/programobject.h>
 #include <fstream>
 #include <optional>
diff --git a/modules/spacecraftinstruments/util/hongkangparser.cpp b/modules/spacecraftinstruments/util/hongkangparser.cpp
index f895523c67..a96f4ac582 100644
--- a/modules/spacecraftinstruments/util/hongkangparser.cpp
+++ b/modules/spacecraftinstruments/util/hongkangparser.cpp
@@ -31,6 +31,7 @@
 
 #include <ghoul/logging/logmanager.h>
 #include <ghoul/misc/dictionary.h>
+#include <ghoul/misc/stringhelper.h>
 #include <ghoul/filesystem/file.h>
 #include <ghoul/filesystem/filesystem.h>
 #include <ghoul/fmt.h>
@@ -109,12 +110,7 @@ HongKangParser::HongKangParser(std::string name, std::string fileName,
 
 std::string HongKangParser::findPlaybookSpecifiedTarget(std::string line) {
     //remembto add this lua later...
-    std::transform(
-        line.begin(),
-        line.end(),
-        line.begin(),
-        [](char v) { return static_cast<char>(toupper(v)); }
-    );
+    line = ghoul::toUpperCase(line);
     const std::vector<std::string>& ptarg = _potentialTargets;
     std::string target;
     for (const std::string& p : ptarg) {
diff --git a/modules/spacecraftinstruments/util/instrumentdecoder.cpp b/modules/spacecraftinstruments/util/instrumentdecoder.cpp
index 5fa03edf2a..30ab3af502 100644
--- a/modules/spacecraftinstruments/util/instrumentdecoder.cpp
+++ b/modules/spacecraftinstruments/util/instrumentdecoder.cpp
@@ -27,6 +27,7 @@
 #include <openspace/documentation/documentation.h>
 #include <openspace/documentation/verifier.h>
 #include <ghoul/misc/assert.h>
+#include <ghoul/misc/stringhelper.h>
 #include <ghoul/logging/logmanager.h>
 #include <ghoul/misc/dictionary.h>
 #include <optional>
@@ -46,12 +47,7 @@ namespace openspace {
 
 InstrumentDecoder::InstrumentDecoder(const ghoul::Dictionary& dictionary) {
     const Parameters p = codegen::bake<Parameters>(dictionary);
-    _type = p.detectorType;
-    std::for_each(
-        _type.begin(),
-        _type.end(),
-        [](char& in) { in = static_cast<char>(toupper(in)); }
-    );
+    _type = ghoul::toUpperCase(p.detectorType);
 
     if (p.stopCommand.has_value() && _type == "SCANNER") {
         _stopCommand = *p.stopCommand;
diff --git a/modules/statemachine/statemachinemodule.cpp b/modules/statemachine/statemachinemodule.cpp
index 3a4a15b807..69aa15f995 100644
--- a/modules/statemachine/statemachinemodule.cpp
+++ b/modules/statemachine/statemachinemodule.cpp
@@ -34,7 +34,7 @@
 #include <openspace/scripting/scriptengine.h>
 #include <ghoul/filesystem/filesystem.h>
 #include <ghoul/logging/logmanager.h>
-#include <ghoul/misc/misc.h>
+#include <ghoul/misc/stringhelper.h>
 #include <string>
 #include <optional>
 
diff --git a/src/documentation/verifier.cpp b/src/documentation/verifier.cpp
index ebbfec3dff..1bb3580355 100644
--- a/src/documentation/verifier.cpp
+++ b/src/documentation/verifier.cpp
@@ -25,7 +25,7 @@
 #include <openspace/documentation/verifier.h>
 
 #include <openspace/documentation/documentationengine.h>
-#include <ghoul/misc/misc.h>
+#include <ghoul/misc/stringhelper.h>
 #include <algorithm>
 #include <filesystem>
 #include <iomanip>
diff --git a/src/engine/openspaceengine.cpp b/src/engine/openspaceengine.cpp
index 84cf70c4d3..aff5c8289b 100644
--- a/src/engine/openspaceengine.cpp
+++ b/src/engine/openspaceengine.cpp
@@ -77,6 +77,7 @@
 #include <ghoul/misc/profiling.h>
 #include <ghoul/misc/stacktrace.h>
 #include <ghoul/misc/stringconversion.h>
+#include <ghoul/misc/stringhelper.h>
 #include <ghoul/opengl/ghoul_gl.h>
 #include <ghoul/opengl/debugcontext.h>
 #include <ghoul/opengl/shaderpreprocessor.h>
@@ -816,7 +817,7 @@ void OpenSpaceEngine::loadAssets() {
                 it = allSyncs.erase(it);
             }
         }
-       
+
         if (_shouldAbortLoading) {
             global::windowDelegate->terminate();
             break;
@@ -830,7 +831,7 @@ void OpenSpaceEngine::loadAssets() {
 
         if (finishedLoading) {
             break;
-        }        
+        }
     } // while(true)
 
     if (_shouldAbortLoading) {
@@ -1533,11 +1534,8 @@ void OpenSpaceEngine::handleDragDrop(std::filesystem::path file) {
     lua_setglobal(s, "basename");
 
     std::string extension = file.extension().string();
-    std::transform(
-        extension.begin(), extension.end(),
-        extension.begin(),
-        [](char c) { return static_cast<char>(::tolower(c)); }
-    );
+    extension = ghoul::toLowerCase(extension);
+
     ghoul::lua::push(s, extension);
     lua_setglobal(s, "extension");
 
diff --git a/src/properties/list/doublelistproperty.cpp b/src/properties/list/doublelistproperty.cpp
index 0baf967fd2..f0e74faca6 100644
--- a/src/properties/list/doublelistproperty.cpp
+++ b/src/properties/list/doublelistproperty.cpp
@@ -28,7 +28,7 @@
 #include <ghoul/logging/logmanager.h>
 #include <ghoul/lua/ghoul_lua.h>
 #include <ghoul/lua/lua_helper.h>
-#include <ghoul/misc/misc.h>
+#include <ghoul/misc/stringhelper.h>
 
 namespace openspace::properties {
 
diff --git a/src/properties/list/intlistproperty.cpp b/src/properties/list/intlistproperty.cpp
index dffad58a5b..57a85ab51b 100644
--- a/src/properties/list/intlistproperty.cpp
+++ b/src/properties/list/intlistproperty.cpp
@@ -28,7 +28,7 @@
 #include <ghoul/logging/logmanager.h>
 #include <ghoul/lua/ghoul_lua.h>
 #include <ghoul/lua/lua_helper.h>
-#include <ghoul/misc/misc.h>
+#include <ghoul/misc/stringhelper.h>
 
 namespace openspace::properties {
 
diff --git a/src/properties/list/stringlistproperty.cpp b/src/properties/list/stringlistproperty.cpp
index 7e3bd7caf5..99192273a4 100644
--- a/src/properties/list/stringlistproperty.cpp
+++ b/src/properties/list/stringlistproperty.cpp
@@ -28,7 +28,7 @@
 #include <ghoul/logging/logmanager.h>
 #include <ghoul/lua/ghoul_lua.h>
 #include <ghoul/lua/lua_helper.h>
-#include <ghoul/misc/misc.h>
+#include <ghoul/misc/stringhelper.h>
 
 namespace openspace::properties {
 
diff --git a/src/properties/selectionproperty.cpp b/src/properties/selectionproperty.cpp
index d86e0e04b6..be82af68b5 100644
--- a/src/properties/selectionproperty.cpp
+++ b/src/properties/selectionproperty.cpp
@@ -28,7 +28,7 @@
 #include <ghoul/logging/logmanager.h>
 #include <ghoul/lua/ghoul_lua.h>
 #include <ghoul/lua/lua_helper.h>
-#include <ghoul/misc/misc.h>
+#include <ghoul/misc/stringhelper.h>
 #include <string>
 
 namespace {
diff --git a/src/rendering/luaconsole.cpp b/src/rendering/luaconsole.cpp
index 19ff81c7c9..9d98a997d3 100644
--- a/src/rendering/luaconsole.cpp
+++ b/src/rendering/luaconsole.cpp
@@ -36,6 +36,7 @@
 #include <ghoul/font/fontrenderer.h>
 #include <ghoul/misc/clipboard.h>
 #include <ghoul/misc/profiling.h>
+#include <ghoul/misc/stringhelper.h>
 #include <ghoul/logging/logmanager.h>
 #include <ghoul/opengl/ghoul_gl.h>
 #include <ghoul/opengl/programobject.h>
@@ -507,20 +508,10 @@ bool LuaConsole::keyboardCallback(Key key, KeyModifier modifier, KeyAction actio
             const size_t fullLength = _autoCompleteInfo.initialValue.length();
             const bool correctLength = command.length() >= fullLength;
 
-            std::string commandLowerCase;
-            std::transform(
-                command.begin(), command.end(),
-                std::back_inserter(commandLowerCase),
-                [](char v) { return static_cast<char>(tolower(v)); }
-            );
+            std::string commandLowerCase = ghoul::toLowerCase(command);
 
-            std::string initialValueLowerCase;
-            std::transform(
-                _autoCompleteInfo.initialValue.begin(),
-                _autoCompleteInfo.initialValue.end(),
-                std::back_inserter(initialValueLowerCase),
-                [](char v) { return static_cast<char>(tolower(v)); }
-            );
+            std::string initialValueLowerCase =
+                ghoul::toLowerCase(_autoCompleteInfo.initialValue);
 
             const bool correctCommand =
                 commandLowerCase.substr(0, fullLength) == initialValueLowerCase;
diff --git a/src/scene/profile.cpp b/src/scene/profile.cpp
index e2d72bfd9d..647c8de15e 100644
--- a/src/scene/profile.cpp
+++ b/src/scene/profile.cpp
@@ -38,8 +38,8 @@
 #include <ghoul/fmt.h>
 #include <ghoul/misc/assert.h>
 #include <ghoul/logging/logmanager.h>
-#include <ghoul/misc/misc.h>
 #include <ghoul/misc/profiling.h>
+#include <ghoul/misc/stringhelper.h>
 #include <ctime>
 #include <filesystem>
 #include <set>
diff --git a/src/scene/scene.cpp b/src/scene/scene.cpp
index 1fd7efcdc6..5b020fb8df 100644
--- a/src/scene/scene.cpp
+++ b/src/scene/scene.cpp
@@ -49,8 +49,8 @@
 #include <ghoul/lua/lua_helper.h>
 #include <ghoul/misc/defer.h>
 #include <ghoul/misc/easing.h>
-#include <ghoul/misc/misc.h>
 #include <ghoul/misc/profiling.h>
+#include <ghoul/misc/stringhelper.h>
 #include <ghoul/opengl/ghoul_gl.h>
 #include <string>
 #include <stack>
diff --git a/src/scripting/systemcapabilitiesbinding.cpp b/src/scripting/systemcapabilitiesbinding.cpp
index e8f32cc3f0..86e3424bff 100644
--- a/src/scripting/systemcapabilitiesbinding.cpp
+++ b/src/scripting/systemcapabilitiesbinding.cpp
@@ -26,7 +26,7 @@
 
 #include <openspace/scripting/lualibrary.h>
 #include <ghoul/logging/logmanager.h>
-#include <ghoul/misc/misc.h>
+#include <ghoul/misc/stringhelper.h>
 #include <ghoul/systemcapabilities/generalcapabilitiescomponent.h>
 #include <ghoul/systemcapabilities/openglcapabilitiescomponent.h>
 #include <cctype>
diff --git a/src/util/json_helper.cpp b/src/util/json_helper.cpp
index 6ec2a6b81b..8f4e6475fd 100644
--- a/src/util/json_helper.cpp
+++ b/src/util/json_helper.cpp
@@ -24,6 +24,8 @@
 
 #include <openspace/util/json_helper.h>
 
+#include <ghoul/misc/stringhelper.h>
+
 namespace openspace {
 
 std::string escapedJson(const std::string& text) {
@@ -89,20 +91,8 @@ void sortJson(nlohmann::json& json, const std::string& key) {
         json.begin(),
         json.end(),
         [&key](const nlohmann::json& lhs, const nlohmann::json& rhs) {
-            std::string lhsString = lhs[key];
-            std::string rhsString = rhs[key];
-            std::transform(
-                lhsString.begin(),
-                lhsString.end(),
-                lhsString.begin(),
-                [](unsigned char c) { return std::tolower(c); }
-            );
-            std::transform(
-                rhsString.begin(),
-                rhsString.end(),
-                rhsString.begin(),
-                [](unsigned char c) { return std::tolower(c); }
-            );
+            std::string lhsString = ghoul::toLowerCase(lhs[key]);
+            std::string rhsString = ghoul::toLowerCase(rhs[key]);
 
             return rhsString > lhsString;
         }
diff --git a/src/util/keys.cpp b/src/util/keys.cpp
index 6533d59360..b6e647d2ad 100644
--- a/src/util/keys.cpp
+++ b/src/util/keys.cpp
@@ -28,7 +28,7 @@
 #include <ghoul/logging/logmanager.h>
 #include <ghoul/misc/assert.h>
 #include <ghoul/misc/exception.h>
-#include <ghoul/misc/misc.h>
+#include <ghoul/misc/stringhelper.h>
 #include <algorithm>
 #include <vector>
 
@@ -43,12 +43,7 @@ KeyWithModifier stringToKey(std::string str) {
 
     std::vector<std::string> originalTokens = tokens;
     for (std::string& t : tokens) {
-        std::transform(
-            t.begin(), t.end(),
-            t.begin(),
-            [](char v) { return static_cast<char>(toupper(v)); }
-        );
-
+        t = ghoul::toUpperCase(t);
     }
 
     // default is unknown
diff --git a/src/util/openspacemodule.cpp b/src/util/openspacemodule.cpp
index 2072f9c26b..3189634580 100644
--- a/src/util/openspacemodule.cpp
+++ b/src/util/openspacemodule.cpp
@@ -31,6 +31,7 @@
 #include <ghoul/logging/logmanager.h>
 #include <ghoul/misc/dictionary.h>
 #include <ghoul/misc/profiling.h>
+#include <ghoul/misc/stringhelper.h>
 #include <algorithm>
 #include <filesystem>
 
@@ -49,13 +50,7 @@ void OpenSpaceModule::initialize(const ghoul::Dictionary& configuration) {
     ZoneScoped;
     ZoneName(identifier().c_str(), identifier().size());
 
-    std::string upperIdentifier = identifier();
-    std::transform(
-        upperIdentifier.begin(),
-        upperIdentifier.end(),
-        upperIdentifier.begin(),
-        [](char v) { return static_cast<char>(toupper(v)); }
-    );
+    std::string upperIdentifier = ghoul::toUpperCase(identifier());
 
     std::string moduleToken = "${" + std::string(ModuleBaseToken) + upperIdentifier + "}";
 
@@ -110,13 +105,7 @@ std::vector<std::string> OpenSpaceModule::requiredOpenGLExtensions() const {
 }
 
 std::filesystem::path OpenSpaceModule::modulePath() const {
-    std::string moduleIdentifier = identifier();
-    std::transform(
-        moduleIdentifier.begin(),
-        moduleIdentifier.end(),
-        moduleIdentifier.begin(),
-        [](char v) { return static_cast<char>(tolower(v)); }
-    );
+    std::string moduleIdentifier = ghoul::toLowerCase(identifier());
 
     // First try the internal module directory
     std::filesystem::path path = absPath("${MODULES}/" + moduleIdentifier);
diff --git a/src/util/time.cpp b/src/util/time.cpp
index d83b6378da..87810e03ba 100644
--- a/src/util/time.cpp
+++ b/src/util/time.cpp
@@ -40,8 +40,8 @@
 #include <ghoul/filesystem/filesystem.h>
 #include <ghoul/fmt.h>
 #include <ghoul/misc/assert.h>
-#include <ghoul/misc/misc.h>
 #include <ghoul/misc/profiling.h>
+#include <ghoul/misc/stringhelper.h>
 #include <cctype>
 #include <ctime>
 #include <mutex>
diff --git a/src/util/versionchecker.cpp b/src/util/versionchecker.cpp
index de72a3af4f..70ad442d80 100644
--- a/src/util/versionchecker.cpp
+++ b/src/util/versionchecker.cpp
@@ -27,7 +27,7 @@
 #include <openspace/openspace.h>
 #include <ghoul/fmt.h>
 #include <ghoul/logging/logmanager.h>
-#include <ghoul/misc/misc.h>
+#include <ghoul/misc/stringhelper.h>
 #include <ghoul/systemcapabilities/systemcapabilities.h>
 #include <ghoul/systemcapabilities/generalcapabilitiescomponent.h>
 #include <sstream>

From 7fb48baf2fc4e3047942fab46b926ad108eade60 Mon Sep 17 00:00:00 2001
From: Emma Broman <emma.broman@liu.se>
Date: Tue, 28 Nov 2023 15:00:05 +0100
Subject: [PATCH 189/701] Update codegen

---
 support/coding/codegen | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/support/coding/codegen b/support/coding/codegen
index b38743ad76..60b97c04cc 160000
--- a/support/coding/codegen
+++ b/support/coding/codegen
@@ -1 +1 @@
-Subproject commit b38743ad76edb7affe7db8e77445450b15face72
+Subproject commit 60b97c04cce28a51aedc46dc74db63f7bc1cc930

From 7b081bd8cf9dd19e4a501a02eeeeb5b044c2efe5 Mon Sep 17 00:00:00 2001
From: Alexander Bock <alexander.bock@liu.se>
Date: Tue, 28 Nov 2023 16:33:04 +0100
Subject: [PATCH 190/701] Prevent crash when using old joystick asset (closes
 #2927)

---
 apps/OpenSpace/ext/sgct                       |  2 +-
 .../interaction/joystickcamerastates.h        | 26 +++++++++----------
 src/scene/asset.cpp                           |  2 +-
 3 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/apps/OpenSpace/ext/sgct b/apps/OpenSpace/ext/sgct
index 05b292bdfb..2c151bbffe 160000
--- a/apps/OpenSpace/ext/sgct
+++ b/apps/OpenSpace/ext/sgct
@@ -1 +1 @@
-Subproject commit 05b292bdfb10bfc22a2bd1ed02d36877062f65b4
+Subproject commit 2c151bbffe768f6ac91cd81a5cee92fffb83b5cd
diff --git a/include/openspace/interaction/joystickcamerastates.h b/include/openspace/interaction/joystickcamerastates.h
index c3dcdd9ad9..ac418e1ee5 100644
--- a/include/openspace/interaction/joystickcamerastates.h
+++ b/include/openspace/interaction/joystickcamerastates.h
@@ -163,19 +163,19 @@ inline std::string to_string(
 {
     using T = openspace::interaction::JoystickCameraStates::AxisType;
     switch (value) {
-        case T::None:        return "None";
-        case T::OrbitX:      return "Orbit X";
-        case T::OrbitY:      return "Orbit Y";
-        case T::ZoomIn:      return "Zoom In";
-        case T::ZoomOut:     return "Zoom Out";
-        case T::Zoom:        return "Zoom In and Out";
+        case T::None:       return "None";
+        case T::OrbitX:     return "Orbit X";
+        case T::OrbitY:     return "Orbit Y";
+        case T::ZoomIn:     return "Zoom In";
+        case T::ZoomOut:    return "Zoom Out";
+        case T::Zoom:       return "Zoom In and Out";
         case T::LocalRoll:  return "LocalRoll";
         case T::GlobalRoll: return "GlobalRoll";
-        case T::PanX:        return "Pan X";
-        case T::PanY:        return "Pan Y";
-        case T::Property:    return "Property";
-        default:             return "";
-        }
+        case T::PanX:       return "Pan X";
+        case T::PanY:       return "Pan Y";
+        case T::Property:   return "Property";
+        default:            return "";
+    }
 }
 
 template <>
@@ -196,7 +196,7 @@ from_string(std::string_view string)
     if (string == "Pan Y") { return T::PanY; }
     if (string == "Property") { return T::Property; }
 
-    throw RuntimeError("Unkonwn axis type '" + std::string(string) + "'");
+    throw RuntimeError(fmt::format("Unknown axis type '{}'", string), "Joystick");
 }
 
 template <>
@@ -220,7 +220,7 @@ from_string(std::string_view string)
     if (string == "JoystickLike") { return T::JoystickLike; }
     if (string == "TriggerLike") { return T::TriggerLike; }
 
-    throw RuntimeError("Unkonwn joystick type '" + std::string(string) + "'");
+    throw RuntimeError(fmt::format("Unknown joystick type '{}'", string), "Joystick");
 }
 
 } // namespace ghoul
diff --git a/src/scene/asset.cpp b/src/scene/asset.cpp
index e25f119d12..77a455f474 100644
--- a/src/scene/asset.cpp
+++ b/src/scene/asset.cpp
@@ -292,7 +292,7 @@ void Asset::initialize() {
     try {
         _manager.callOnInitialize(this);
     }
-    catch (const ghoul::lua::LuaRuntimeException& e) {
+    catch (const ghoul::RuntimeError& e) {
         LERROR(fmt::format("Failed to initialize asset {}", path()));
         LERROR(fmt::format("{}: {}", e.component, e.message));
         setState(State::InitializationFailed);

From 56ad7a3365d681ba72f3eb775ad4f15c8bce97cd Mon Sep 17 00:00:00 2001
From: Alexander Bock <alexander.bock@liu.se>
Date: Tue, 28 Nov 2023 16:49:50 +0100
Subject: [PATCH 191/701] Right-justify warning/error/fatal messages in the
 launcher text box

---
 src/rendering/loadingscreen.cpp | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/rendering/loadingscreen.cpp b/src/rendering/loadingscreen.cpp
index c01e39e9cd..231099eca2 100644
--- a/src/rendering/loadingscreen.cpp
+++ b/src/rendering/loadingscreen.cpp
@@ -523,10 +523,11 @@ void LoadingScreen::renderLogMessages() const {
     size_t row = 0;
     for (auto& [level, amount] : numberOfErrorsPerLevel) {
         const std::string text = fmt::format("{}: {}", ghoul::to_string(level), amount);
+        glm::vec2 bbox = _logFont->boundingBox(text);
         renderer.render(
             *_logFont,
             glm::vec2(
-                res.x - 0.07 * res.x,
+                res.x - bbox.x - 10,
                 10 + _logFont->pointSize() * row * 2
             ),
             text,

From 3a9716a535b34c7a44aeb970f819b0d106ec2ee7 Mon Sep 17 00:00:00 2001
From: Alexander Bock <alexander.bock@liu.se>
Date: Tue, 28 Nov 2023 21:37:52 +0100
Subject: [PATCH 192/701] No need to use the .set method of properties directly

---
 include/openspace/properties/triggerproperty.h            | 5 +++++
 modules/base/rendering/renderablemodel.cpp                | 2 +-
 modules/base/rendering/screenspaceframebuffer.cpp         | 2 +-
 .../digitaluniverse/rendering/renderableplanescloud.cpp   | 2 +-
 modules/server/src/serverinterface.cpp                    | 2 +-
 modules/skybrowser/src/browser.cpp                        | 2 +-
 modules/space/translation/horizonstranslation.cpp         | 2 +-
 modules/spout/spoutwrapper.cpp                            | 2 +-
 src/navigation/orbitalnavigator.cpp                       | 8 ++++----
 src/properties/triggerproperty.cpp                        | 4 ++++
 10 files changed, 20 insertions(+), 11 deletions(-)

diff --git a/include/openspace/properties/triggerproperty.h b/include/openspace/properties/triggerproperty.h
index 6e5210cbd7..225663e965 100644
--- a/include/openspace/properties/triggerproperty.h
+++ b/include/openspace/properties/triggerproperty.h
@@ -69,6 +69,11 @@ public:
      */
     void set(std::any value) override;
 
+    /**
+     * Triggers this TriggerProperty.
+     */
+    void trigger();
+
     std::string jsonValue() const override;
 };
 
diff --git a/modules/base/rendering/renderablemodel.cpp b/modules/base/rendering/renderablemodel.cpp
index c745d57273..1264099bd2 100644
--- a/modules/base/rendering/renderablemodel.cpp
+++ b/modules/base/rendering/renderablemodel.cpp
@@ -526,7 +526,7 @@ RenderableModel::RenderableModel(const ghoul::Dictionary& dictionary)
 
     if (p.blendingOption.has_value()) {
         const std::string blendingOpt = *p.blendingOption;
-        _blendingFuncOption.set(BlendingMapping[blendingOpt]);
+        _blendingFuncOption = BlendingMapping[blendingOpt];
     }
 
     _originalRenderBin = renderBin();
diff --git a/modules/base/rendering/screenspaceframebuffer.cpp b/modules/base/rendering/screenspaceframebuffer.cpp
index 5da3fffb18..8628def58c 100644
--- a/modules/base/rendering/screenspaceframebuffer.cpp
+++ b/modules/base/rendering/screenspaceframebuffer.cpp
@@ -82,7 +82,7 @@ ScreenSpaceFramebuffer::ScreenSpaceFramebuffer(const ghoul::Dictionary& dictiona
 
     glm::vec2 resolution = global::windowDelegate->currentDrawBufferResolution();
     addProperty(_size);
-    _size.set(glm::vec4(0.f, 0.f, resolution.x, resolution.y));
+    _size = glm::vec4(0.f, 0.f, resolution.x, resolution.y);
 }
 
 ScreenSpaceFramebuffer::~ScreenSpaceFramebuffer() {}
diff --git a/modules/digitaluniverse/rendering/renderableplanescloud.cpp b/modules/digitaluniverse/rendering/renderableplanescloud.cpp
index ac884fe09f..fe16144353 100644
--- a/modules/digitaluniverse/rendering/renderableplanescloud.cpp
+++ b/modules/digitaluniverse/rendering/renderableplanescloud.cpp
@@ -238,7 +238,7 @@ RenderablePlanesCloud::RenderablePlanesCloud(const ghoul::Dictionary& dictionary
     _renderOption.addOption(1, "Camera Position Normal");
     _renderOption.addOption(2, "Screen center Position Normal");
     addProperty(_renderOption);
-    //_renderOption.set(1);
+    //_renderOption = 1;
 
     if (p.unit.has_value()) {
         _unit = codegen::map<DistanceUnit>(*p.unit);
diff --git a/modules/server/src/serverinterface.cpp b/modules/server/src/serverinterface.cpp
index 048adb7283..ce666a402f 100644
--- a/modules/server/src/serverinterface.cpp
+++ b/modules/server/src/serverinterface.cpp
@@ -163,7 +163,7 @@ ServerInterface::ServerInterface(const ghoul::Dictionary& config)
                 for (std::string_view k : dict.keys()) {
                     v.push_back(dict.value<std::string>(k));
                 }
-                list.set(v);
+                list = v;
             }
         };
 
diff --git a/modules/skybrowser/src/browser.cpp b/modules/skybrowser/src/browser.cpp
index 2250c609cc..3dd9ae04a0 100644
--- a/modules/skybrowser/src/browser.cpp
+++ b/modules/skybrowser/src/browser.cpp
@@ -185,7 +185,7 @@ void Browser::updateBrowserSize() {
 }
 
 void Browser::reload() {
-    _reload.set(true);
+    _reload.trigger();
 }
 
 void Browser::setRatio(float ratio) {
diff --git a/modules/space/translation/horizonstranslation.cpp b/modules/space/translation/horizonstranslation.cpp
index 8065361403..f65ecfe5fd 100644
--- a/modules/space/translation/horizonstranslation.cpp
+++ b/modules/space/translation/horizonstranslation.cpp
@@ -91,7 +91,7 @@ HorizonsTranslation::HorizonsTranslation(const ghoul::Dictionary& dictionary)
 
         std::vector<std::string> files;
         files.push_back(file);
-        _horizonsTextFiles.set(files);
+        _horizonsTextFiles = files;
     }
     else if (std::holds_alternative<std::vector<std::string>>(p.horizonsTextFile)) {
         std::vector<std::string> files =
diff --git a/modules/spout/spoutwrapper.cpp b/modules/spout/spoutwrapper.cpp
index 543a339fd0..ff51447a49 100644
--- a/modules/spout/spoutwrapper.cpp
+++ b/modules/spout/spoutwrapper.cpp
@@ -387,7 +387,7 @@ SpoutReceiverPropertyProxy::SpoutReceiverPropertyProxy(properties::PropertyOwner
     });
     owner.addProperty(_updateSelection);
 
-    _updateSelection.set(0);
+    _updateSelection.trigger();
 }
 
 SpoutReceiverPropertyProxy::~SpoutReceiverPropertyProxy() {}
diff --git a/src/navigation/orbitalnavigator.cpp b/src/navigation/orbitalnavigator.cpp
index d4b663dae6..bfbf5df90c 100644
--- a/src/navigation/orbitalnavigator.cpp
+++ b/src/navigation/orbitalnavigator.cpp
@@ -1089,8 +1089,8 @@ void OrbitalNavigator::setFocusNode(const SceneGraphNode* focusNode,
 }
 
 void OrbitalNavigator::setFocusNode(const std::string& focusNode, bool) {
-    _anchor.set(focusNode);
-    _aim.set(std::string(""));
+    _anchor = focusNode;
+    _aim = std::string("");
 }
 
 void OrbitalNavigator::setAnchorNode(const SceneGraphNode* anchorNode,
@@ -1128,11 +1128,11 @@ void OrbitalNavigator::setAimNode(const SceneGraphNode* aimNode) {
 }
 
 void OrbitalNavigator::setAnchorNode(const std::string& anchorNode) {
-    _anchor.set(anchorNode);
+    _anchor = anchorNode;
 }
 
 void OrbitalNavigator::setAimNode(const std::string& aimNode) {
-    _aim.set(aimNode);
+    _aim = aimNode;
 }
 
 void OrbitalNavigator::updatePreviousAnchorState() {
diff --git a/src/properties/triggerproperty.cpp b/src/properties/triggerproperty.cpp
index 9399c839ec..f2c738b352 100644
--- a/src/properties/triggerproperty.cpp
+++ b/src/properties/triggerproperty.cpp
@@ -42,6 +42,10 @@ void TriggerProperty::set(std::any) {
     notifyChangeListeners();
 }
 
+void TriggerProperty::trigger() {
+    notifyChangeListeners();
+}
+
 std::string TriggerProperty::jsonValue() const {
     return "true";
 }

From 95e42d5343d2fb86580897db55b95e0ceef49772 Mon Sep 17 00:00:00 2001
From: Emma Broman <emma.broman@liu.se>
Date: Wed, 29 Nov 2023 09:40:49 +0100
Subject: [PATCH 193/701] Update GUI hash

https://github.com/OpenSpace/OpenSpace-WebGuiFrontend/commit/17af9032d000a9865a00afe88eff88a822167eea
---
 data/assets/util/webgui.asset | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/data/assets/util/webgui.asset b/data/assets/util/webgui.asset
index 3465233474..c7243a5f5e 100644
--- a/data/assets/util/webgui.asset
+++ b/data/assets/util/webgui.asset
@@ -4,7 +4,7 @@ local guiCustomization = asset.require("customization/gui")
 
 
 -- Select which commit hashes to use for the frontend and backend
-local frontendHash = "6f98035816407646a88cf1f5156ef5be553f9ff1"
+local frontendHash = "17af9032d000a9865a00afe88eff88a822167eea"
 
 local frontend = asset.resource({
   Identifier = "WebGuiFrontend",

From 3dadf9c5fa3a0c3f26141296354baf5f1fb762ff Mon Sep 17 00:00:00 2001
From: Alexander Bock <alexander.bock@liu.se>
Date: Tue, 28 Nov 2023 15:44:49 +0100
Subject: [PATCH 194/701] Only create RingComponents and ShadowComponents when
 they are actually needed

---
 .../rendering/renderableatmosphere.cpp        |  2 +-
 modules/base/rendering/renderablemodel.h      |  2 +-
 .../base/rendering/renderablenodearrow.cpp    |  2 +-
 .../tasks/exoplanetsdatapreparationtask.cpp   |  2 +-
 .../galaxy/tasks/milkywayconversiontask.cpp   |  4 +-
 .../tasks/milkywaypointsconversiontask.cpp    |  4 +-
 modules/globebrowsing/src/renderableglobe.cpp | 80 +++++++++----------
 modules/globebrowsing/src/renderableglobe.h   |  7 +-
 modules/globebrowsing/src/shadowcomponent.cpp | 12 ++-
 modules/globebrowsing/src/shadowcomponent.h   | 12 +--
 src/navigation/orbitalnavigator.cpp           |  8 +-
 src/query/query.cpp                           |  9 +--
 src/rendering/loadingscreen.cpp               |  4 -
 src/rendering/luaconsole.cpp                  |  2 +-
 src/rendering/screenspacerenderable.cpp       |  4 +-
 15 files changed, 70 insertions(+), 84 deletions(-)

diff --git a/modules/atmosphere/rendering/renderableatmosphere.cpp b/modules/atmosphere/rendering/renderableatmosphere.cpp
index cb3b74c070..2cd94dc6fb 100644
--- a/modules/atmosphere/rendering/renderableatmosphere.cpp
+++ b/modules/atmosphere/rendering/renderableatmosphere.cpp
@@ -310,12 +310,12 @@ RenderableAtmosphere::RenderableAtmosphere(const ghoul::Dictionary& dictionary)
     , _sunIntensity(SunIntensityInfo, 5.f, 0.1f, 1000.f)
     , _sunFollowingCameraEnabled(EnableSunOnCameraPositionInfo, false)
     , _hardShadowsEnabled(EclipseHardShadowsInfo, false)
+    , _sunAngularSize(SunAngularSize, 0.3f, 0.f, 180.f)
     , _atmosphereDimmingHeight(AtmosphereDimmingHeightInfo, 0.7f, 0.f, 1.f)
     , _atmosphereDimmingSunsetAngle(
         SunsetAngleInfo,
         glm::vec2(95.f, 100.f), glm::vec2(0.f), glm::vec2(180.f)
     )
-    , _sunAngularSize(SunAngularSize, 0.3f, 0.f, 180.f)
  {
     auto updateWithCalculation = [this]() {
         _deferredCasterNeedsUpdate = true;
diff --git a/modules/base/rendering/renderablemodel.h b/modules/base/rendering/renderablemodel.h
index fd963a7a0d..133f65e9c8 100644
--- a/modules/base/rendering/renderablemodel.h
+++ b/modules/base/rendering/renderablemodel.h
@@ -80,7 +80,6 @@ private:
 
     std::filesystem::path _file;
     std::unique_ptr<ghoul::modelgeometry::ModelGeometry> _geometry;
-    properties::DoubleProperty _modelScale;
     bool _invertModelScale = false;
     bool _forceRenderInvisible = false;
     bool _notifyInvisibleDropped = true;
@@ -98,6 +97,7 @@ private:
     properties::BoolProperty _enableFaceCulling;
     properties::DMat4Property _modelTransform;
     properties::Vec3Property _pivot;
+    properties::DoubleProperty _modelScale;
     properties::Vec3Property _rotationVec;
 
     properties::BoolProperty _enableDepthTest;
diff --git a/modules/base/rendering/renderablenodearrow.cpp b/modules/base/rendering/renderablenodearrow.cpp
index 1a6983874d..e44c1cf2ea 100644
--- a/modules/base/rendering/renderablenodearrow.cpp
+++ b/modules/base/rendering/renderablenodearrow.cpp
@@ -252,7 +252,7 @@ namespace {
             prop.setMaxValue(1000.f);
         }
         // @TODO (emmbr, 2022-08-22): make GUI update when min/max value is updated
-    };
+    }
 } // namespace
 
 namespace openspace {
diff --git a/modules/exoplanets/tasks/exoplanetsdatapreparationtask.cpp b/modules/exoplanets/tasks/exoplanetsdatapreparationtask.cpp
index 621c287dac..98fe89286f 100644
--- a/modules/exoplanets/tasks/exoplanetsdatapreparationtask.cpp
+++ b/modules/exoplanets/tasks/exoplanetsdatapreparationtask.cpp
@@ -185,7 +185,7 @@ ExoplanetsDataPreparationTask::readFirstDataRow(std::ifstream& file)
     }
 
     return columnNames;
-};
+}
 
 ExoplanetsDataPreparationTask::PlanetData
 ExoplanetsDataPreparationTask::parseDataRow(std::string row,
diff --git a/modules/galaxy/tasks/milkywayconversiontask.cpp b/modules/galaxy/tasks/milkywayconversiontask.cpp
index 2eb0b40dd5..69883870c0 100644
--- a/modules/galaxy/tasks/milkywayconversiontask.cpp
+++ b/modules/galaxy/tasks/milkywayconversiontask.cpp
@@ -108,10 +108,10 @@ void MilkywayConversionTask::perform(const Task::ProgressCallback& onProgress) {
 }
 
 documentation::Documentation MilkywayConversionTask::Documentation() {
-    return documentation::Documentation(
+    return {
         "MilkywayConversionTask",
         "galaxy_milkywayconversiontask"
-    );
+    };
 }
 
 } // namespace openspace
diff --git a/modules/galaxy/tasks/milkywaypointsconversiontask.cpp b/modules/galaxy/tasks/milkywaypointsconversiontask.cpp
index ac2b12bfcf..e7d34f8ba5 100644
--- a/modules/galaxy/tasks/milkywaypointsconversiontask.cpp
+++ b/modules/galaxy/tasks/milkywaypointsconversiontask.cpp
@@ -91,10 +91,10 @@ void MilkywayPointsConversionTask::perform(const Task::ProgressCallback& progres
 }
 
 documentation::Documentation MilkywayPointsConversionTask::Documentation() {
-    return documentation::Documentation(
+    return {
         "MilkywayPointsConversionTask",
         "galaxy_milkywaypointsconversiontask"
-    );
+    };
 }
 
 } // namespace openspace
diff --git a/modules/globebrowsing/src/renderableglobe.cpp b/modules/globebrowsing/src/renderableglobe.cpp
index b94a63780b..475679d262 100644
--- a/modules/globebrowsing/src/renderableglobe.cpp
+++ b/modules/globebrowsing/src/renderableglobe.cpp
@@ -574,8 +574,6 @@ RenderableGlobe::RenderableGlobe(const ghoul::Dictionary& dictionary)
     , _grid(DefaultSkirtedGridSegments, DefaultSkirtedGridSegments)
     , _leftRoot(Chunk(LeftHemisphereIndex))
     , _rightRoot(Chunk(RightHemisphereIndex))
-    , _ringsComponent(dictionary)
-    , _shadowComponent(dictionary)
 {
     const Parameters p = codegen::bake<Parameters>(dictionary);
 
@@ -691,17 +689,17 @@ RenderableGlobe::RenderableGlobe(const ghoul::Dictionary& dictionary)
     addPropertySubOwner(_geoJsonManager);
 
     // Components
-    _hasRings = p.rings.has_value();
-    if (_hasRings) {
-        _ringsComponent.setParentFadeable(this);
-        _ringsComponent.initialize();
-        addPropertySubOwner(_ringsComponent);
+    if (p.rings.has_value()) {
+        _ringsComponent = std::make_unique<RingsComponent>(dictionary);
+        _ringsComponent->setParentFadeable(this);
+        _ringsComponent->initialize();
+        addPropertySubOwner(_ringsComponent.get());
     }
 
-    _hasShadows = p.shadows.has_value();
-    if (_hasShadows) {
-        _shadowComponent.initialize();
-        addPropertySubOwner(_shadowComponent);
+    if (p.shadows.has_value()) {
+        _shadowComponent = std::make_unique<ShadowComponent>(dictionary);
+        _shadowComponent->initialize();
+        addPropertySubOwner(_shadowComponent.get());
         _generalProperties.shadowMapping = true;
     }
     _generalProperties.shadowMapping.onChange(notifyShaderRecompilation);
@@ -724,12 +722,12 @@ void RenderableGlobe::initializeGL() {
 
     _grid.initializeGL();
 
-    if (_hasRings) {
-        _ringsComponent.initializeGL();
+    if (_ringsComponent) {
+        _ringsComponent->initializeGL();
     }
 
-    if (_hasShadows) {
-        _shadowComponent.initializeGL();
+    if (_shadowComponent) {
+        _shadowComponent->initializeGL();
     }
 
     // Recompile the shaders directly so that it is not done the first time the render
@@ -756,12 +754,12 @@ void RenderableGlobe::deinitializeGL() {
 
     _grid.deinitializeGL();
 
-    if (_hasRings) {
-        _ringsComponent.deinitializeGL();
+    if (_ringsComponent) {
+        _ringsComponent->deinitializeGL();
     }
 
-    if (_hasShadows) {
-        _shadowComponent.deinitializeGL();
+    if (_shadowComponent) {
+        _shadowComponent->deinitializeGL();
     }
 }
 
@@ -785,18 +783,18 @@ void RenderableGlobe::render(const RenderData& data, RendererTasks& rendererTask
 
     if ((distanceToCamera < distance) || (_generalProperties.renderAtDistance)) {
         try {
-            if (_hasShadows && _shadowComponent.isEnabled()) {
+            if (_shadowComponent && _shadowComponent->isEnabled()) {
                 // Set matrices and other GL states
-                RenderData lightRenderData(_shadowComponent.begin(data));
+                RenderData lightRenderData(_shadowComponent->begin(data));
 
                 glDisable(GL_BLEND);
 
                 // Render from light source point of view
                 renderChunks(lightRenderData, rendererTask, {}, true);
-                if (_hasRings && _ringsComponent.isEnabled() &&
-                    _ringsComponent.isVisible())
+                if (_ringsComponent && _ringsComponent->isEnabled() &&
+                    _ringsComponent->isVisible())
                 {
-                    _ringsComponent.draw(
+                    _ringsComponent->draw(
                         lightRenderData,
                         RingsComponent::RenderPass::GeometryOnly
                     );
@@ -804,26 +802,26 @@ void RenderableGlobe::render(const RenderData& data, RendererTasks& rendererTask
 
                 glEnable(GL_BLEND);
 
-                _shadowComponent.end();
+                _shadowComponent->end();
 
                 // Render again from original point of view
-                renderChunks(data, rendererTask, _shadowComponent.shadowMapData());
-                if (_hasRings && _ringsComponent.isEnabled() &&
-                    _ringsComponent.isVisible())
+                renderChunks(data, rendererTask, _shadowComponent->shadowMapData());
+                if (_ringsComponent && _ringsComponent->isEnabled() &&
+                    _ringsComponent->isVisible())
                 {
-                    _ringsComponent.draw(
+                    _ringsComponent->draw(
                         data,
                         RingsComponent::RenderPass::GeometryAndShading,
-                        _shadowComponent.shadowMapData()
+                        _shadowComponent->shadowMapData()
                     );
                 }
             }
             else {
                 renderChunks(data, rendererTask);
-                if (_hasRings && _ringsComponent.isEnabled() &&
-                    _ringsComponent.isVisible())
+                if (_ringsComponent && _ringsComponent->isEnabled() &&
+                    _ringsComponent->isVisible())
                 {
-                    _ringsComponent.draw(
+                    _ringsComponent->draw(
                         data,
                         RingsComponent::RenderPass::GeometryAndShading
                     );
@@ -910,8 +908,8 @@ void RenderableGlobe::update(const UpdateData& data) {
     }
 
     double bs = _ellipsoid.maximumRadius() * glm::compMax(data.modelTransform.scale);
-    if (_hasRings) {
-        const double ringSize = _ringsComponent.size();
+    if (_ringsComponent) {
+        const double ringSize = _ringsComponent->size();
         if (ringSize > bs) {
             bs = ringSize;
         }
@@ -932,12 +930,12 @@ void RenderableGlobe::update(const UpdateData& data) {
         _debugProperties.resetTileProviders = false;
     }
 
-    if (_hasRings) {
-        _ringsComponent.update(data);
+    if (_ringsComponent) {
+        _ringsComponent->update(data);
     }
 
-    if (_hasShadows) {
-        _shadowComponent.update(data);
+    if (_shadowComponent) {
+        _shadowComponent->update(data);
     }
 
     // abock (2020-08-21)
@@ -1390,7 +1388,7 @@ void RenderableGlobe::renderChunkGlobally(const Chunk& chunk, const RenderData&
         shadowMapUnit.activate();
         // JCC: Avoiding a to recompiling the shaders or having more than one
         // set of shaders for this step.
-        glBindTexture(GL_TEXTURE_2D, _shadowComponent.dDepthTexture());
+        glBindTexture(GL_TEXTURE_2D, _shadowComponent->dDepthTexture());
         program.setUniform("shadowMapTexture", shadowMapUnit);
     }
 
@@ -1529,7 +1527,7 @@ void RenderableGlobe::renderChunkLocally(const Chunk& chunk, const RenderData& d
         shadowMapUnit.activate();
         // JCC: Avoiding a to recompiling the shaders or having more than one
         // set of shaders for this step.
-        glBindTexture(GL_TEXTURE_2D, _shadowComponent.dDepthTexture());
+        glBindTexture(GL_TEXTURE_2D, _shadowComponent->dDepthTexture());
         program.setUniform("shadowMapTexture", shadowMapUnit);
     }
 
diff --git a/modules/globebrowsing/src/renderableglobe.h b/modules/globebrowsing/src/renderableglobe.h
index 7d5a6927ba..99851af26c 100644
--- a/modules/globebrowsing/src/renderableglobe.h
+++ b/modules/globebrowsing/src/renderableglobe.h
@@ -43,6 +43,7 @@
 #include <ghoul/misc/memorypool.h>
 #include <ghoul/opengl/uniformcache.h>
 #include <cstddef>
+#include <memory>
 
 namespace openspace::documentation { struct Documentation; }
 
@@ -298,10 +299,8 @@ private:
     Layer* _lastChangedLayer = nullptr;
 
     // Components
-    RingsComponent _ringsComponent;
-    ShadowComponent _shadowComponent;
-    bool _hasRings = false;
-    bool _hasShadows = false;
+    std::unique_ptr<RingsComponent> _ringsComponent;
+    std::unique_ptr<ShadowComponent> _shadowComponent;
 
     // Labels
     GlobeLabelsComponent _globeLabelsComponent;
diff --git a/modules/globebrowsing/src/shadowcomponent.cpp b/modules/globebrowsing/src/shadowcomponent.cpp
index 43439e41f5..73707bfce0 100644
--- a/modules/globebrowsing/src/shadowcomponent.cpp
+++ b/modules/globebrowsing/src/shadowcomponent.cpp
@@ -54,6 +54,14 @@
 namespace {
     constexpr std::string_view _loggerCat = "ShadowComponent";
 
+    // Texture coords in [0, 1], while clip coords in [-1, 1]
+    const glm::dmat4 ToTextureCoordsMatrix = glm::dmat4(
+        glm::dvec4(0.5, 0.0, 0.0, 0.0),
+        glm::dvec4(0.0, 0.5, 0.0, 0.0),
+        glm::dvec4(0.0, 0.0, 1.0, 0.0),
+        glm::dvec4(0.5, 0.5, 0.0, 1.0)
+    );
+
     constexpr openspace::properties::Property::PropertyInfo EnabledInfo = {
         "Enabled",
         "Enabled",
@@ -156,7 +164,7 @@ namespace {
         std::optional<int> distanceFraction;
 
         // [[codegen::verbatim(DepthMapSizeInfo.description)]]
-        std::optional<glm::ivec2> depthMapSize;
+        std::optional<glm::ivec2> depthMapSize [[codegen::greater({ 1280, 720 })]];
     };
 #include "shadowcomponent_codegen.cpp"
 } // namespace
@@ -312,7 +320,7 @@ RenderData ShadowComponent::begin(const RenderData& data) {
     // The model transformation missing in the final shadow matrix is add when rendering
     // each object (using its transformations provided by the RenderData structure)
     _shadowData.shadowMatrix =
-        _toTextureCoordsMatrix * lightProjectionMatrix *
+        ToTextureCoordsMatrix * lightProjectionMatrix *
         _lightCamera->combinedViewMatrix();
 
 
diff --git a/modules/globebrowsing/src/shadowcomponent.h b/modules/globebrowsing/src/shadowcomponent.h
index 89beb5f598..07f50cf116 100644
--- a/modules/globebrowsing/src/shadowcomponent.h
+++ b/modules/globebrowsing/src/shadowcomponent.h
@@ -58,7 +58,7 @@ public:
         GLuint shadowDepthTexture = 0;
     };
 
-    ShadowComponent(const ghoul::Dictionary& dictionary);
+    explicit ShadowComponent(const ghoul::Dictionary& dictionary);
 
     void initialize();
     void initializeGL();
@@ -74,7 +74,7 @@ public:
 
     bool isEnabled() const;
 
-    ShadowComponent::ShadowMapData shadowMapData() const;
+    ShadowMapData shadowMapData() const;
 
     GLuint dDepthTexture() const;
 
@@ -89,14 +89,6 @@ private:
 
     ShadowMapData _shadowData;
 
-    // Texture coords in [0, 1], while clip coords in [-1, 1]
-    const glm::dmat4 _toTextureCoordsMatrix = glm::dmat4(
-        glm::dvec4(0.5, 0.0, 0.0, 0.0),
-        glm::dvec4(0.0, 0.5, 0.0, 0.0),
-        glm::dvec4(0.0, 0.0, 1.0, 0.0),
-        glm::dvec4(0.5, 0.5, 0.0, 1.0)
-    );
-
     // DEBUG
     properties::TriggerProperty _saveDepthTexture;
     properties::IntProperty _distanceFraction;
diff --git a/src/navigation/orbitalnavigator.cpp b/src/navigation/orbitalnavigator.cpp
index bfbf5df90c..dd1659a763 100644
--- a/src/navigation/orbitalnavigator.cpp
+++ b/src/navigation/orbitalnavigator.cpp
@@ -495,6 +495,8 @@ OrbitalNavigator::OrbitalNavigator()
     , _retargetAim(RetargetAimInfo)
     , _followAnchorNodeRotation(FollowAnchorNodeInfo, true)
     , _followAnchorNodeRotationDistance(FollowAnchorNodeDistanceInfo, 5.f, 0.f, 20.f)
+    , _disableZoom(DisableZoomInfo, false)
+    , _disableRoll(DisableRollInfo, false)
     , _mouseSensitivity(MouseSensitivityInfo, 15.f, 1.f, 50.f)
     , _joystickSensitivity(JoystickSensitivityInfo, 10.f, 1.0f, 50.f)
     , _websocketSensitivity(WebsocketSensitivityInfo, 5.f, 1.0f, 50.f)
@@ -511,13 +513,11 @@ OrbitalNavigator::OrbitalNavigator()
     , _stereoInterpolationTime(StereoInterpolationTimeInfo, 8.0, 0.0, 10.0)
     , _followRotationInterpolationTime(FollowRotationInterpTimeInfo, 1.0, 0.0, 10.0)
     , _invertMouseButtons(InvertMouseButtons, false)
+    , _shouldRotateAroundUp(ShouldRotateAroundUpInfo, false)
+    , _upToUseForRotation(UpToUseForRotationInfo)
     , _mouseStates(_mouseSensitivity * 0.0001, 1 / (_friction.friction + 0.0000001))
     , _joystickStates(_joystickSensitivity * 0.1, 1 / (_friction.friction + 0.0000001))
     , _websocketStates(_websocketSensitivity, 1 / (_friction.friction + 0.0000001))
-    , _disableZoom(DisableZoomInfo, false)
-    , _disableRoll(DisableRollInfo, false)
-    , _shouldRotateAroundUp(ShouldRotateAroundUpInfo, false)
-    , _upToUseForRotation(UpToUseForRotationInfo)
 {
     _anchor.onChange([this]() {
         if (_anchor.value().empty()) {
diff --git a/src/query/query.cpp b/src/query/query.cpp
index f563993e22..4b9cdafb1d 100644
--- a/src/query/query.cpp
+++ b/src/query/query.cpp
@@ -56,14 +56,7 @@ properties::Property* property(const std::string& uri) {
 }
 
 std::vector<properties::Property*> allProperties() {
-    std::vector<properties::Property*> properties;
-
-    std::vector<properties::Property*> p =
-        global::rootPropertyOwner->propertiesRecursive();
-
-    properties.insert(properties.end(), p.begin(), p.end());
-
-    return properties;
+    return global::rootPropertyOwner->propertiesRecursive();
 }
 
 }  // namespace
diff --git a/src/rendering/loadingscreen.cpp b/src/rendering/loadingscreen.cpp
index 231099eca2..39cb7b0cec 100644
--- a/src/rendering/loadingscreen.cpp
+++ b/src/rendering/loadingscreen.cpp
@@ -52,10 +52,6 @@ namespace {
     constexpr glm::vec2 LogoCenter = glm::vec2(0.f, 0.525f);  // in NDC
     constexpr glm::vec2 LogoSize = glm::vec2(0.275f, 0.275);  // in NDC
 
-    constexpr glm::vec4 PhaseColorConstruction = glm::vec4(0.7f, 0.7f, 0.f, 1.f);
-    constexpr glm::vec4 PhaseColorSynchronization = glm::vec4(0.9f, 0.9f, 0.9f, 1.f);
-    constexpr glm::vec4 PhaseColorInitialization = glm::vec4(0.1f, 0.75f, 0.1f, 1.f);
-
     constexpr glm::vec4 ItemStatusColorStarted = glm::vec4(0.5f, 0.5f, 0.5f, 1.f);
     constexpr glm::vec4 ItemStatusColorInitializing = glm::vec4(0.7f, 0.7f, 0.f, 1.f);
     constexpr glm::vec4 ItemStatusColorFinished = glm::vec4(0.1f, 0.75f, 0.1f, 1.f);
diff --git a/src/rendering/luaconsole.cpp b/src/rendering/luaconsole.cpp
index 9d98a997d3..5bc9ecbb66 100644
--- a/src/rendering/luaconsole.cpp
+++ b/src/rendering/luaconsole.cpp
@@ -145,8 +145,8 @@ namespace openspace {
 LuaConsole::LuaConsole()
     : properties::PropertyOwner({ "LuaConsole", "Lua Console" })
     , _isVisible(VisibleInfo, false)
-    , _shouldSendToRemote(ShouldSendToRemoteInfo, false)
     , _shouldBeSynchronized(ShouldBeSynchronizedInfo, true)
+    , _shouldSendToRemote(ShouldSendToRemoteInfo, false)
     , _backgroundColor(
         BackgroundColorInfo,
         glm::vec4(21.f / 255.f, 23.f / 255.f, 28.f / 255.f, 0.8f),
diff --git a/src/rendering/screenspacerenderable.cpp b/src/rendering/screenspacerenderable.cpp
index 2ddfcacca8..e228ad989a 100644
--- a/src/rendering/screenspacerenderable.cpp
+++ b/src/rendering/screenspacerenderable.cpp
@@ -317,6 +317,8 @@ ScreenSpaceRenderable::ScreenSpaceRenderable(const ghoul::Dictionary& dictionary
         glm::vec3(-glm::pi<float>()),
         glm::vec3(glm::pi<float>())
     )
+    , _borderWidth(BorderWidthInfo, 0.f, 0.f, 1000.f)
+    , _borderColor(BorderColorInfo, glm::vec3(0.f), glm::vec3(0.f), glm::vec3(1.f))
     , _scale(ScaleInfo, 0.25f, 0.f, 2.f)
     , _gamma(GammaInfo, 1.f, 0.000001f, 10.f)
     , _multiplyColor(MultiplyColorInfo, glm::vec3(1.f), glm::vec3(0.f), glm::vec3(1.f))
@@ -327,8 +329,6 @@ ScreenSpaceRenderable::ScreenSpaceRenderable(const ghoul::Dictionary& dictionary
         glm::vec4(1.f)
     )
     , _delete(DeleteInfo)
-    , _borderWidth(BorderWidthInfo, 0.f, 0.f, 1000.f)
-    , _borderColor(BorderColorInfo, glm::vec3(0.f), glm::vec3(0.f), glm::vec3(1.f))
 {
     const Parameters p = codegen::bake<Parameters>(dictionary);
 

From b41c48861b2366ef00988c41375d66e966187605 Mon Sep 17 00:00:00 2001
From: Emma Broman <emma.broman@liu.se>
Date: Fri, 1 Dec 2023 10:00:42 +0100
Subject: [PATCH 195/701] Add property for actual bounding and interaction
 sphere value (#2967)

* Add property for actual bounding and interaction sphere value

* Apply suggestions from code review (no "Read Only" in name)

Co-authored-by: Alexander Bock <alexander.bock@liu.se>
---
 include/openspace/scene/scenegraphnode.h |  2 ++
 src/scene/scenegraphnode.cpp             | 34 ++++++++++++++++++++++++
 2 files changed, 36 insertions(+)

diff --git a/include/openspace/scene/scenegraphnode.h b/include/openspace/scene/scenegraphnode.h
index 15388e12d2..e71e4a2a54 100644
--- a/include/openspace/scene/scenegraphnode.h
+++ b/include/openspace/scene/scenegraphnode.h
@@ -197,7 +197,9 @@ private:
     glm::dmat4 _modelTransformCached = glm::dmat4(1.0);
 
     properties::DoubleProperty _boundingSphere;
+    properties::DoubleProperty _evaluatedBoundingSphere;
     properties::DoubleProperty _interactionSphere;
+    properties::DoubleProperty _evaluatedInteractionSphere;
     properties::DoubleProperty _approachFactor;
     properties::DoubleProperty _reachFactor;
     properties::BoolProperty _computeScreenSpaceValues;
diff --git a/src/scene/scenegraphnode.cpp b/src/scene/scenegraphnode.cpp
index 8e0970d1cc..1939463388 100644
--- a/src/scene/scenegraphnode.cpp
+++ b/src/scene/scenegraphnode.cpp
@@ -109,6 +109,26 @@ namespace {
         openspace::properties::Property::Visibility::AdvancedUser
     };
 
+    constexpr openspace::properties::Property::PropertyInfo EvalBoundingSphereInfo = {
+        "EvaluatedBoundingSphere",
+        "Evaluated Bounding Sphere",
+        "This read-only property contains the evaluated value for the bounding sphere. "
+        "This is the actual value that is used internally within the software. If the "
+        "BoundingSphere property is set to -1, it is the computed value, otherwise it "
+        "matches the one set in the property",
+        openspace::properties::Property::Visibility::AdvancedUser
+    };
+
+    constexpr openspace::properties::Property::PropertyInfo EvalInteractionSphereInfo = {
+        "EvaluatedInteractionSphere",
+        "Evaluated Interaction Sphere",
+        "This read-only property contains the evaluated value for the interaction sphere. "
+        "This is the actual value that is used internally within the software. If the "
+        "InteractionSphere property is set to -1, it is the computed value, otherwise it "
+        "matches the one set in the property",
+        openspace::properties::Property::Visibility::AdvancedUser
+    };
+
     constexpr openspace::properties::Property::PropertyInfo ApproachFactorInfo = {
         "ApproachFactor",
         "Approach Factor",
@@ -528,7 +548,9 @@ SceneGraphNode::SceneGraphNode()
         )
     }
     , _boundingSphere(BoundingSphereInfo, -1.0, -1.0, 1e12)
+    , _evaluatedBoundingSphere(EvalBoundingSphereInfo)
     , _interactionSphere(InteractionSphereInfo, -1.0, -1.0, 1e12)
+    , _evaluatedInteractionSphere(EvalInteractionSphereInfo)
     , _approachFactor(ApproachFactorInfo, 5.0, 0.0, 1e4)
     , _reachFactor(ReachFactorInfo, 1.25, 0.0, 1e4)
     , _computeScreenSpaceValues(ComputeScreenSpaceInfo, false)
@@ -548,6 +570,7 @@ SceneGraphNode::SceneGraphNode()
     addProperty(_distFromCamToNode);
     addProperty(_screenSizeRadius);
     addProperty(_visibilityDistance);
+
     _boundingSphere.onChange([this]() {
         if (_boundingSphere >= 0.0) {
             _overrideBoundingSphere = _boundingSphere;
@@ -555,11 +578,15 @@ SceneGraphNode::SceneGraphNode()
         else {
             _overrideBoundingSphere = std::nullopt;
         }
+        _evaluatedBoundingSphere = boundingSphere();
     });
     // @TODO (2021-06-30, emmbr) Uncomment this when exponential sliders support
     // negative values
     //_boundingSphere.setExponent(10.f);
     addProperty(_boundingSphere);
+    _evaluatedBoundingSphere.setReadOnly(true);
+    addProperty(_evaluatedBoundingSphere);
+
     _interactionSphere.onChange([this]() {
         if (_interactionSphere >= 0.0) {
             _overrideInteractionSphere = _interactionSphere;
@@ -567,11 +594,14 @@ SceneGraphNode::SceneGraphNode()
         else {
             _overrideInteractionSphere = std::nullopt;
         }
+        _evaluatedInteractionSphere = interactionSphere();
     });
     // @TODO (2021-06-30, emmbr) Uncomment this when exponential sliders support
     // negative values
     //_interactionSphere.setExponent(10.f);
     addProperty(_interactionSphere);
+    _evaluatedInteractionSphere.setReadOnly(true);
+    addProperty(_evaluatedInteractionSphere);
 
     _reachFactor.setExponent(3.f);
     addProperty(_reachFactor);
@@ -607,6 +637,10 @@ void SceneGraphNode::initialize() {
     }
     _state = State::Initialized;
 
+    // Want this computed after the renderable and transforms have been initialized
+    _evaluatedBoundingSphere = boundingSphere();
+    _evaluatedInteractionSphere = interactionSphere();
+
     LDEBUG(fmt::format("Finished initializing: {}", identifier()));
 }
 

From a81ba35834b164e039c53d3c9d6c6a7f1f87719a Mon Sep 17 00:00:00 2001
From: Alexander Bock <mail@alexanderbock.eu>
Date: Fri, 1 Dec 2023 13:18:54 +0100
Subject: [PATCH 196/701] Add a function to return a list of scheduled scripts
 (closes #1891)

---
 src/scripting/scriptscheduler.cpp     |  3 ++-
 src/scripting/scriptscheduler_lua.inl | 30 +++++++++++++++++++++++++++
 2 files changed, 32 insertions(+), 1 deletion(-)

diff --git a/src/scripting/scriptscheduler.cpp b/src/scripting/scriptscheduler.cpp
index 3a1d8244e4..c34784df24 100644
--- a/src/scripting/scriptscheduler.cpp
+++ b/src/scripting/scriptscheduler.cpp
@@ -302,7 +302,8 @@ LuaLibrary ScriptScheduler::luaLibrary() {
             codegen::lua::SetModeApplicationTime,
             codegen::lua::SetModeRecordedTime,
             codegen::lua::SetModeSimulationTime,
-            codegen::lua::Clear
+            codegen::lua::Clear,
+            codegen::lua::ScheduledScripts
         }
     };
 }
diff --git a/src/scripting/scriptscheduler_lua.inl b/src/scripting/scriptscheduler_lua.inl
index cc05280c0b..ccc05c774d 100644
--- a/src/scripting/scriptscheduler_lua.inl
+++ b/src/scripting/scriptscheduler_lua.inl
@@ -107,6 +107,36 @@ namespace {
     openspace::global::scriptScheduler->clearSchedule(group);
 }
 
+// Returns the list of all scheduled scripts
+[[codegen::luawrap]] std::vector<ghoul::Dictionary> scheduledScripts() {
+    using namespace openspace;
+
+    std::vector<scripting::ScriptScheduler::ScheduledScript> scripts =
+        global::scriptScheduler->allScripts();
+
+    std::vector<ghoul::Dictionary> result;
+    result.reserve(scripts.size());
+
+    for (const scripting::ScriptScheduler::ScheduledScript& script : scripts) {
+        ghoul::Dictionary d;
+        d.setValue("Time", script.time);
+        if (!script.forwardScript.empty()) {
+            d.setValue("ForwardScript", script.forwardScript);
+        }
+        if (!script.backwardScript.empty()) {
+            d.setValue("BackwardScript", script.backwardScript);
+        }
+        if (!script.universalScript.empty()) {
+            d.setValue("UniversalScript", script.universalScript);
+        }
+        d.setValue("Group", script.group);
+
+        result.push_back(d);
+    }
+
+    return result;
+}
+
 #include "scriptscheduler_lua_codegen.cpp"
 
 } // namespace

From a8675abed8c8cb6007ae7e94f009c0d88c28fa6d Mon Sep 17 00:00:00 2001
From: Alexander Bock <mail@alexanderbock.eu>
Date: Mon, 4 Dec 2023 14:15:09 +0100
Subject: [PATCH 197/701] Harmonize quotation symboles for asset require

---
 .../planets/earth/eclipses/paths/annular/2003-05-31.asset     | 4 ++--
 .../planets/earth/eclipses/paths/annular/2005-10-03.asset     | 4 ++--
 .../planets/earth/eclipses/paths/annular/2006-09-22.asset     | 4 ++--
 .../planets/earth/eclipses/paths/annular/2008-02-07.asset     | 4 ++--
 .../planets/earth/eclipses/paths/annular/2009-01-26.asset     | 4 ++--
 .../planets/earth/eclipses/paths/annular/2010-01-15.asset     | 4 ++--
 .../planets/earth/eclipses/paths/annular/2012-05-20.asset     | 4 ++--
 .../planets/earth/eclipses/paths/annular/2013-05-10.asset     | 4 ++--
 .../planets/earth/eclipses/paths/annular/2014-04-29.asset     | 4 ++--
 .../planets/earth/eclipses/paths/annular/2016-09-01.asset     | 4 ++--
 .../planets/earth/eclipses/paths/annular/2017-02-26.asset     | 4 ++--
 .../planets/earth/eclipses/paths/annular/2019-12-26.asset     | 4 ++--
 .../planets/earth/eclipses/paths/annular/2020-06-21.asset     | 4 ++--
 .../planets/earth/eclipses/paths/annular/2021-06-10.asset     | 4 ++--
 .../planets/earth/eclipses/paths/annular/2023-10-14.asset     | 4 ++--
 .../planets/earth/eclipses/paths/annular/2024-10-02.asset     | 4 ++--
 .../planets/earth/eclipses/paths/annular/2026-02-17.asset     | 4 ++--
 .../planets/earth/eclipses/paths/annular/2027-02-06.asset     | 4 ++--
 .../planets/earth/eclipses/paths/annular/2028-01-26.asset     | 4 ++--
 .../planets/earth/eclipses/paths/annular/2030-06-01.asset     | 4 ++--
 .../planets/earth/eclipses/paths/hybrid/2005-04-08.asset      | 4 ++--
 .../planets/earth/eclipses/paths/hybrid/2013-11-03.asset      | 4 ++--
 .../planets/earth/eclipses/paths/hybrid/2023-04-20.asset      | 4 ++--
 .../planets/earth/eclipses/paths/hybrid/2031-11-14.asset      | 4 ++--
 .../planets/earth/eclipses/paths/total/2003-11-23.asset       | 4 ++--
 .../planets/earth/eclipses/paths/total/2006-03-29.asset       | 4 ++--
 .../planets/earth/eclipses/paths/total/2008-08-01.asset       | 4 ++--
 .../planets/earth/eclipses/paths/total/2009-07-22.asset       | 4 ++--
 .../planets/earth/eclipses/paths/total/2010-07-11.asset       | 4 ++--
 .../planets/earth/eclipses/paths/total/2012-11-13.asset       | 4 ++--
 .../planets/earth/eclipses/paths/total/2015-03-20.asset       | 4 ++--
 .../planets/earth/eclipses/paths/total/2016-03-09.asset       | 4 ++--
 .../planets/earth/eclipses/paths/total/2017-08-21.asset       | 4 ++--
 .../planets/earth/eclipses/paths/total/2019-07-02.asset       | 4 ++--
 .../planets/earth/eclipses/paths/total/2020-12-14.asset       | 4 ++--
 .../planets/earth/eclipses/paths/total/2021-12-04.asset       | 4 ++--
 .../planets/earth/eclipses/paths/total/2024-04-08.asset       | 4 ++--
 .../planets/earth/eclipses/paths/total/2026-08-12.asset       | 4 ++--
 .../planets/earth/eclipses/paths/total/2027-08-02.asset       | 4 ++--
 .../planets/earth/eclipses/paths/total/2028-07-22.asset       | 4 ++--
 .../planets/earth/eclipses/paths/total/2030-11-25.asset       | 4 ++--
 .../planets/earth/eclipses/paths/total/2033-03-30.asset       | 4 ++--
 .../planets/earth/eclipses/paths/total/2034-03-20.asset       | 4 ++--
 .../planets/earth/eclipses/paths/total/2035-09-02.asset       | 4 ++--
 .../planets/earth/eclipses/paths/total/2037-07-13.asset       | 4 ++--
 .../planets/earth/eclipses/paths/total/2038-12-26.asset       | 4 ++--
 .../planets/earth/eclipses/paths/total/2039-12-15.asset       | 4 ++--
 .../planets/earth/eclipses/paths/total/2041-04-30.asset       | 4 ++--
 .../planets/earth/eclipses/paths/total/2042-04-20.asset       | 4 ++--
 .../planets/earth/eclipses/paths/total/2043-04-09.asset       | 4 ++--
 tests/AssetLoaderTest/require.asset                           | 4 ++--
 51 files changed, 102 insertions(+), 102 deletions(-)

diff --git a/data/assets/scene/solarsystem/planets/earth/eclipses/paths/annular/2003-05-31.asset b/data/assets/scene/solarsystem/planets/earth/eclipses/paths/annular/2003-05-31.asset
index e34c8017b3..2aa2cb23b8 100644
--- a/data/assets/scene/solarsystem/planets/earth/eclipses/paths/annular/2003-05-31.asset
+++ b/data/assets/scene/solarsystem/planets/earth/eclipses/paths/annular/2003-05-31.asset
@@ -1,5 +1,5 @@
-local earth = asset.require('scene/solarsystem/planets/earth/earth')
-local data = asset.require('../annular_data')
+local earth = asset.require("scene/solarsystem/planets/earth/earth")
+local data = asset.require("../annular_data")
 
 
 
diff --git a/data/assets/scene/solarsystem/planets/earth/eclipses/paths/annular/2005-10-03.asset b/data/assets/scene/solarsystem/planets/earth/eclipses/paths/annular/2005-10-03.asset
index 7166488752..ca362137ba 100644
--- a/data/assets/scene/solarsystem/planets/earth/eclipses/paths/annular/2005-10-03.asset
+++ b/data/assets/scene/solarsystem/planets/earth/eclipses/paths/annular/2005-10-03.asset
@@ -1,5 +1,5 @@
-local earth = asset.require('scene/solarsystem/planets/earth/earth')
-local data = asset.require('../annular_data')
+local earth = asset.require("scene/solarsystem/planets/earth/earth")
+local data = asset.require("../annular_data")
 
 
 
diff --git a/data/assets/scene/solarsystem/planets/earth/eclipses/paths/annular/2006-09-22.asset b/data/assets/scene/solarsystem/planets/earth/eclipses/paths/annular/2006-09-22.asset
index b5c981dc97..db868e1b91 100644
--- a/data/assets/scene/solarsystem/planets/earth/eclipses/paths/annular/2006-09-22.asset
+++ b/data/assets/scene/solarsystem/planets/earth/eclipses/paths/annular/2006-09-22.asset
@@ -1,5 +1,5 @@
-local earth = asset.require('scene/solarsystem/planets/earth/earth')
-local data = asset.require('../annular_data')
+local earth = asset.require("scene/solarsystem/planets/earth/earth")
+local data = asset.require("../annular_data")
 
 
 
diff --git a/data/assets/scene/solarsystem/planets/earth/eclipses/paths/annular/2008-02-07.asset b/data/assets/scene/solarsystem/planets/earth/eclipses/paths/annular/2008-02-07.asset
index 178dc65054..88f7dba82a 100644
--- a/data/assets/scene/solarsystem/planets/earth/eclipses/paths/annular/2008-02-07.asset
+++ b/data/assets/scene/solarsystem/planets/earth/eclipses/paths/annular/2008-02-07.asset
@@ -1,5 +1,5 @@
-local earth = asset.require('scene/solarsystem/planets/earth/earth')
-local data = asset.require('../annular_data')
+local earth = asset.require("scene/solarsystem/planets/earth/earth")
+local data = asset.require("../annular_data")
 
 
 
diff --git a/data/assets/scene/solarsystem/planets/earth/eclipses/paths/annular/2009-01-26.asset b/data/assets/scene/solarsystem/planets/earth/eclipses/paths/annular/2009-01-26.asset
index 327ebe3704..5730d18679 100644
--- a/data/assets/scene/solarsystem/planets/earth/eclipses/paths/annular/2009-01-26.asset
+++ b/data/assets/scene/solarsystem/planets/earth/eclipses/paths/annular/2009-01-26.asset
@@ -1,5 +1,5 @@
-local earth = asset.require('scene/solarsystem/planets/earth/earth')
-local data = asset.require('../annular_data')
+local earth = asset.require("scene/solarsystem/planets/earth/earth")
+local data = asset.require("../annular_data")
 
 
 
diff --git a/data/assets/scene/solarsystem/planets/earth/eclipses/paths/annular/2010-01-15.asset b/data/assets/scene/solarsystem/planets/earth/eclipses/paths/annular/2010-01-15.asset
index 19f8f72b25..597df058ab 100644
--- a/data/assets/scene/solarsystem/planets/earth/eclipses/paths/annular/2010-01-15.asset
+++ b/data/assets/scene/solarsystem/planets/earth/eclipses/paths/annular/2010-01-15.asset
@@ -1,5 +1,5 @@
-local earth = asset.require('scene/solarsystem/planets/earth/earth')
-local data = asset.require('../annular_data')
+local earth = asset.require("scene/solarsystem/planets/earth/earth")
+local data = asset.require("../annular_data")
 
 
 
diff --git a/data/assets/scene/solarsystem/planets/earth/eclipses/paths/annular/2012-05-20.asset b/data/assets/scene/solarsystem/planets/earth/eclipses/paths/annular/2012-05-20.asset
index 02b08d1105..c4e9007a92 100644
--- a/data/assets/scene/solarsystem/planets/earth/eclipses/paths/annular/2012-05-20.asset
+++ b/data/assets/scene/solarsystem/planets/earth/eclipses/paths/annular/2012-05-20.asset
@@ -1,5 +1,5 @@
-local earth = asset.require('scene/solarsystem/planets/earth/earth')
-local data = asset.require('../annular_data')
+local earth = asset.require("scene/solarsystem/planets/earth/earth")
+local data = asset.require("../annular_data")
 
 
 
diff --git a/data/assets/scene/solarsystem/planets/earth/eclipses/paths/annular/2013-05-10.asset b/data/assets/scene/solarsystem/planets/earth/eclipses/paths/annular/2013-05-10.asset
index 36b1a91dc0..cd7c1c5965 100644
--- a/data/assets/scene/solarsystem/planets/earth/eclipses/paths/annular/2013-05-10.asset
+++ b/data/assets/scene/solarsystem/planets/earth/eclipses/paths/annular/2013-05-10.asset
@@ -1,5 +1,5 @@
-local earth = asset.require('scene/solarsystem/planets/earth/earth')
-local data = asset.require('../annular_data')
+local earth = asset.require("scene/solarsystem/planets/earth/earth")
+local data = asset.require("../annular_data")
 
 
 
diff --git a/data/assets/scene/solarsystem/planets/earth/eclipses/paths/annular/2014-04-29.asset b/data/assets/scene/solarsystem/planets/earth/eclipses/paths/annular/2014-04-29.asset
index 453eb7c081..0a9d108862 100644
--- a/data/assets/scene/solarsystem/planets/earth/eclipses/paths/annular/2014-04-29.asset
+++ b/data/assets/scene/solarsystem/planets/earth/eclipses/paths/annular/2014-04-29.asset
@@ -1,5 +1,5 @@
-local earth = asset.require('scene/solarsystem/planets/earth/earth')
-local data = asset.require('../annular_data')
+local earth = asset.require("scene/solarsystem/planets/earth/earth")
+local data = asset.require("../annular_data")
 
 
 
diff --git a/data/assets/scene/solarsystem/planets/earth/eclipses/paths/annular/2016-09-01.asset b/data/assets/scene/solarsystem/planets/earth/eclipses/paths/annular/2016-09-01.asset
index 5a4ce9bb14..f8cd52c01c 100644
--- a/data/assets/scene/solarsystem/planets/earth/eclipses/paths/annular/2016-09-01.asset
+++ b/data/assets/scene/solarsystem/planets/earth/eclipses/paths/annular/2016-09-01.asset
@@ -1,5 +1,5 @@
-local earth = asset.require('scene/solarsystem/planets/earth/earth')
-local data = asset.require('../annular_data')
+local earth = asset.require("scene/solarsystem/planets/earth/earth")
+local data = asset.require("../annular_data")
 
 
 
diff --git a/data/assets/scene/solarsystem/planets/earth/eclipses/paths/annular/2017-02-26.asset b/data/assets/scene/solarsystem/planets/earth/eclipses/paths/annular/2017-02-26.asset
index 12567c9071..8d53dbe89f 100644
--- a/data/assets/scene/solarsystem/planets/earth/eclipses/paths/annular/2017-02-26.asset
+++ b/data/assets/scene/solarsystem/planets/earth/eclipses/paths/annular/2017-02-26.asset
@@ -1,5 +1,5 @@
-local earth = asset.require('scene/solarsystem/planets/earth/earth')
-local data = asset.require('../annular_data')
+local earth = asset.require("scene/solarsystem/planets/earth/earth")
+local data = asset.require("../annular_data")
 
 
 
diff --git a/data/assets/scene/solarsystem/planets/earth/eclipses/paths/annular/2019-12-26.asset b/data/assets/scene/solarsystem/planets/earth/eclipses/paths/annular/2019-12-26.asset
index 47a13fc598..9afd763979 100644
--- a/data/assets/scene/solarsystem/planets/earth/eclipses/paths/annular/2019-12-26.asset
+++ b/data/assets/scene/solarsystem/planets/earth/eclipses/paths/annular/2019-12-26.asset
@@ -1,5 +1,5 @@
-local earth = asset.require('scene/solarsystem/planets/earth/earth')
-local data = asset.require('../annular_data')
+local earth = asset.require("scene/solarsystem/planets/earth/earth")
+local data = asset.require("../annular_data")
 
 
 
diff --git a/data/assets/scene/solarsystem/planets/earth/eclipses/paths/annular/2020-06-21.asset b/data/assets/scene/solarsystem/planets/earth/eclipses/paths/annular/2020-06-21.asset
index 9686af3657..a22da7250d 100644
--- a/data/assets/scene/solarsystem/planets/earth/eclipses/paths/annular/2020-06-21.asset
+++ b/data/assets/scene/solarsystem/planets/earth/eclipses/paths/annular/2020-06-21.asset
@@ -1,5 +1,5 @@
-local earth = asset.require('scene/solarsystem/planets/earth/earth')
-local data = asset.require('../annular_data')
+local earth = asset.require("scene/solarsystem/planets/earth/earth")
+local data = asset.require("../annular_data")
 
 
 
diff --git a/data/assets/scene/solarsystem/planets/earth/eclipses/paths/annular/2021-06-10.asset b/data/assets/scene/solarsystem/planets/earth/eclipses/paths/annular/2021-06-10.asset
index 144334625b..e738e2ade3 100644
--- a/data/assets/scene/solarsystem/planets/earth/eclipses/paths/annular/2021-06-10.asset
+++ b/data/assets/scene/solarsystem/planets/earth/eclipses/paths/annular/2021-06-10.asset
@@ -1,5 +1,5 @@
-local earth = asset.require('scene/solarsystem/planets/earth/earth')
-local data = asset.require('../annular_data')
+local earth = asset.require("scene/solarsystem/planets/earth/earth")
+local data = asset.require("../annular_data")
 
 
 
diff --git a/data/assets/scene/solarsystem/planets/earth/eclipses/paths/annular/2023-10-14.asset b/data/assets/scene/solarsystem/planets/earth/eclipses/paths/annular/2023-10-14.asset
index 9ed1bbc35c..f6caf3f267 100644
--- a/data/assets/scene/solarsystem/planets/earth/eclipses/paths/annular/2023-10-14.asset
+++ b/data/assets/scene/solarsystem/planets/earth/eclipses/paths/annular/2023-10-14.asset
@@ -1,5 +1,5 @@
-local earth = asset.require('scene/solarsystem/planets/earth/earth')
-local data = asset.require('../annular_data')
+local earth = asset.require("scene/solarsystem/planets/earth/earth")
+local data = asset.require("../annular_data")
 
 
 
diff --git a/data/assets/scene/solarsystem/planets/earth/eclipses/paths/annular/2024-10-02.asset b/data/assets/scene/solarsystem/planets/earth/eclipses/paths/annular/2024-10-02.asset
index ffdd14f68f..0c274acebd 100644
--- a/data/assets/scene/solarsystem/planets/earth/eclipses/paths/annular/2024-10-02.asset
+++ b/data/assets/scene/solarsystem/planets/earth/eclipses/paths/annular/2024-10-02.asset
@@ -1,5 +1,5 @@
-local earth = asset.require('scene/solarsystem/planets/earth/earth')
-local data = asset.require('../annular_data')
+local earth = asset.require("scene/solarsystem/planets/earth/earth")
+local data = asset.require("../annular_data")
 
 
 
diff --git a/data/assets/scene/solarsystem/planets/earth/eclipses/paths/annular/2026-02-17.asset b/data/assets/scene/solarsystem/planets/earth/eclipses/paths/annular/2026-02-17.asset
index f9b7e5158a..ccef3360ba 100644
--- a/data/assets/scene/solarsystem/planets/earth/eclipses/paths/annular/2026-02-17.asset
+++ b/data/assets/scene/solarsystem/planets/earth/eclipses/paths/annular/2026-02-17.asset
@@ -1,5 +1,5 @@
-local earth = asset.require('scene/solarsystem/planets/earth/earth')
-local data = asset.require('../annular_data')
+local earth = asset.require("scene/solarsystem/planets/earth/earth")
+local data = asset.require("../annular_data")
 
 
 
diff --git a/data/assets/scene/solarsystem/planets/earth/eclipses/paths/annular/2027-02-06.asset b/data/assets/scene/solarsystem/planets/earth/eclipses/paths/annular/2027-02-06.asset
index 788110b461..ca51e864a0 100644
--- a/data/assets/scene/solarsystem/planets/earth/eclipses/paths/annular/2027-02-06.asset
+++ b/data/assets/scene/solarsystem/planets/earth/eclipses/paths/annular/2027-02-06.asset
@@ -1,5 +1,5 @@
-local earth = asset.require('scene/solarsystem/planets/earth/earth')
-local data = asset.require('../annular_data')
+local earth = asset.require("scene/solarsystem/planets/earth/earth")
+local data = asset.require("../annular_data")
 
 
 
diff --git a/data/assets/scene/solarsystem/planets/earth/eclipses/paths/annular/2028-01-26.asset b/data/assets/scene/solarsystem/planets/earth/eclipses/paths/annular/2028-01-26.asset
index 1376c23149..1e952643d2 100644
--- a/data/assets/scene/solarsystem/planets/earth/eclipses/paths/annular/2028-01-26.asset
+++ b/data/assets/scene/solarsystem/planets/earth/eclipses/paths/annular/2028-01-26.asset
@@ -1,5 +1,5 @@
-local earth = asset.require('scene/solarsystem/planets/earth/earth')
-local data = asset.require('../annular_data')
+local earth = asset.require("scene/solarsystem/planets/earth/earth")
+local data = asset.require("../annular_data")
 
 
 
diff --git a/data/assets/scene/solarsystem/planets/earth/eclipses/paths/annular/2030-06-01.asset b/data/assets/scene/solarsystem/planets/earth/eclipses/paths/annular/2030-06-01.asset
index 02a48e3f28..8019f416bd 100644
--- a/data/assets/scene/solarsystem/planets/earth/eclipses/paths/annular/2030-06-01.asset
+++ b/data/assets/scene/solarsystem/planets/earth/eclipses/paths/annular/2030-06-01.asset
@@ -1,5 +1,5 @@
-local earth = asset.require('scene/solarsystem/planets/earth/earth')
-local data = asset.require('../annular_data')
+local earth = asset.require("scene/solarsystem/planets/earth/earth")
+local data = asset.require("../annular_data")
 
 
 
diff --git a/data/assets/scene/solarsystem/planets/earth/eclipses/paths/hybrid/2005-04-08.asset b/data/assets/scene/solarsystem/planets/earth/eclipses/paths/hybrid/2005-04-08.asset
index 232028e33e..2a1d4822be 100644
--- a/data/assets/scene/solarsystem/planets/earth/eclipses/paths/hybrid/2005-04-08.asset
+++ b/data/assets/scene/solarsystem/planets/earth/eclipses/paths/hybrid/2005-04-08.asset
@@ -1,5 +1,5 @@
-local earth = asset.require('scene/solarsystem/planets/earth/earth')
-local data = asset.require('../hybrid_data')
+local earth = asset.require("scene/solarsystem/planets/earth/earth")
+local data = asset.require("../hybrid_data")
 
 
 
diff --git a/data/assets/scene/solarsystem/planets/earth/eclipses/paths/hybrid/2013-11-03.asset b/data/assets/scene/solarsystem/planets/earth/eclipses/paths/hybrid/2013-11-03.asset
index c199f77c5e..a965cc3720 100644
--- a/data/assets/scene/solarsystem/planets/earth/eclipses/paths/hybrid/2013-11-03.asset
+++ b/data/assets/scene/solarsystem/planets/earth/eclipses/paths/hybrid/2013-11-03.asset
@@ -1,5 +1,5 @@
-local earth = asset.require('scene/solarsystem/planets/earth/earth')
-local data = asset.require('../hybrid_data')
+local earth = asset.require("scene/solarsystem/planets/earth/earth")
+local data = asset.require("../hybrid_data")
 
 
 
diff --git a/data/assets/scene/solarsystem/planets/earth/eclipses/paths/hybrid/2023-04-20.asset b/data/assets/scene/solarsystem/planets/earth/eclipses/paths/hybrid/2023-04-20.asset
index 0ef81475a5..7d70a61da2 100644
--- a/data/assets/scene/solarsystem/planets/earth/eclipses/paths/hybrid/2023-04-20.asset
+++ b/data/assets/scene/solarsystem/planets/earth/eclipses/paths/hybrid/2023-04-20.asset
@@ -1,5 +1,5 @@
-local earth = asset.require('scene/solarsystem/planets/earth/earth')
-local data = asset.require('../hybrid_data')
+local earth = asset.require("scene/solarsystem/planets/earth/earth")
+local data = asset.require("../hybrid_data")
 
 
 
diff --git a/data/assets/scene/solarsystem/planets/earth/eclipses/paths/hybrid/2031-11-14.asset b/data/assets/scene/solarsystem/planets/earth/eclipses/paths/hybrid/2031-11-14.asset
index 086ff2fefc..35419833de 100644
--- a/data/assets/scene/solarsystem/planets/earth/eclipses/paths/hybrid/2031-11-14.asset
+++ b/data/assets/scene/solarsystem/planets/earth/eclipses/paths/hybrid/2031-11-14.asset
@@ -1,5 +1,5 @@
-local earth = asset.require('scene/solarsystem/planets/earth/earth')
-local data = asset.require('../hybrid_data')
+local earth = asset.require("scene/solarsystem/planets/earth/earth")
+local data = asset.require("../hybrid_data")
 
 
 
diff --git a/data/assets/scene/solarsystem/planets/earth/eclipses/paths/total/2003-11-23.asset b/data/assets/scene/solarsystem/planets/earth/eclipses/paths/total/2003-11-23.asset
index 82dee12ec2..170334ffbe 100644
--- a/data/assets/scene/solarsystem/planets/earth/eclipses/paths/total/2003-11-23.asset
+++ b/data/assets/scene/solarsystem/planets/earth/eclipses/paths/total/2003-11-23.asset
@@ -1,5 +1,5 @@
-local earth = asset.require('scene/solarsystem/planets/earth/earth')
-local data = asset.require('../total_data')
+local earth = asset.require("scene/solarsystem/planets/earth/earth")
+local data = asset.require("../total_data")
 
 
 
diff --git a/data/assets/scene/solarsystem/planets/earth/eclipses/paths/total/2006-03-29.asset b/data/assets/scene/solarsystem/planets/earth/eclipses/paths/total/2006-03-29.asset
index 93642d6571..e2e7cb5bd1 100644
--- a/data/assets/scene/solarsystem/planets/earth/eclipses/paths/total/2006-03-29.asset
+++ b/data/assets/scene/solarsystem/planets/earth/eclipses/paths/total/2006-03-29.asset
@@ -1,5 +1,5 @@
-local earth = asset.require('scene/solarsystem/planets/earth/earth')
-local data = asset.require('../total_data')
+local earth = asset.require("scene/solarsystem/planets/earth/earth")
+local data = asset.require("../total_data")
 
 
 
diff --git a/data/assets/scene/solarsystem/planets/earth/eclipses/paths/total/2008-08-01.asset b/data/assets/scene/solarsystem/planets/earth/eclipses/paths/total/2008-08-01.asset
index 03df58c887..7db288b54e 100644
--- a/data/assets/scene/solarsystem/planets/earth/eclipses/paths/total/2008-08-01.asset
+++ b/data/assets/scene/solarsystem/planets/earth/eclipses/paths/total/2008-08-01.asset
@@ -1,5 +1,5 @@
-local earth = asset.require('scene/solarsystem/planets/earth/earth')
-local data = asset.require('../total_data')
+local earth = asset.require("scene/solarsystem/planets/earth/earth")
+local data = asset.require("../total_data")
 
 
 
diff --git a/data/assets/scene/solarsystem/planets/earth/eclipses/paths/total/2009-07-22.asset b/data/assets/scene/solarsystem/planets/earth/eclipses/paths/total/2009-07-22.asset
index 74d7bc9812..733d556fde 100644
--- a/data/assets/scene/solarsystem/planets/earth/eclipses/paths/total/2009-07-22.asset
+++ b/data/assets/scene/solarsystem/planets/earth/eclipses/paths/total/2009-07-22.asset
@@ -1,5 +1,5 @@
-local earth = asset.require('scene/solarsystem/planets/earth/earth')
-local data = asset.require('../total_data')
+local earth = asset.require("scene/solarsystem/planets/earth/earth")
+local data = asset.require("../total_data")
 
 
 
diff --git a/data/assets/scene/solarsystem/planets/earth/eclipses/paths/total/2010-07-11.asset b/data/assets/scene/solarsystem/planets/earth/eclipses/paths/total/2010-07-11.asset
index 7d6324f10c..2a2d486526 100644
--- a/data/assets/scene/solarsystem/planets/earth/eclipses/paths/total/2010-07-11.asset
+++ b/data/assets/scene/solarsystem/planets/earth/eclipses/paths/total/2010-07-11.asset
@@ -1,5 +1,5 @@
-local earth = asset.require('scene/solarsystem/planets/earth/earth')
-local data = asset.require('../total_data')
+local earth = asset.require("scene/solarsystem/planets/earth/earth")
+local data = asset.require("../total_data")
 
 
 
diff --git a/data/assets/scene/solarsystem/planets/earth/eclipses/paths/total/2012-11-13.asset b/data/assets/scene/solarsystem/planets/earth/eclipses/paths/total/2012-11-13.asset
index bdcf752c8f..32d7f607b6 100644
--- a/data/assets/scene/solarsystem/planets/earth/eclipses/paths/total/2012-11-13.asset
+++ b/data/assets/scene/solarsystem/planets/earth/eclipses/paths/total/2012-11-13.asset
@@ -1,5 +1,5 @@
-local earth = asset.require('scene/solarsystem/planets/earth/earth')
-local data = asset.require('../total_data')
+local earth = asset.require("scene/solarsystem/planets/earth/earth")
+local data = asset.require("../total_data")
 
 
 
diff --git a/data/assets/scene/solarsystem/planets/earth/eclipses/paths/total/2015-03-20.asset b/data/assets/scene/solarsystem/planets/earth/eclipses/paths/total/2015-03-20.asset
index 4c23180746..5693f8b715 100644
--- a/data/assets/scene/solarsystem/planets/earth/eclipses/paths/total/2015-03-20.asset
+++ b/data/assets/scene/solarsystem/planets/earth/eclipses/paths/total/2015-03-20.asset
@@ -1,5 +1,5 @@
-local earth = asset.require('scene/solarsystem/planets/earth/earth')
-local data = asset.require('../total_data')
+local earth = asset.require("scene/solarsystem/planets/earth/earth")
+local data = asset.require("../total_data")
 
 
 
diff --git a/data/assets/scene/solarsystem/planets/earth/eclipses/paths/total/2016-03-09.asset b/data/assets/scene/solarsystem/planets/earth/eclipses/paths/total/2016-03-09.asset
index 80dedefe8a..b708462ed8 100644
--- a/data/assets/scene/solarsystem/planets/earth/eclipses/paths/total/2016-03-09.asset
+++ b/data/assets/scene/solarsystem/planets/earth/eclipses/paths/total/2016-03-09.asset
@@ -1,5 +1,5 @@
-local earth = asset.require('scene/solarsystem/planets/earth/earth')
-local data = asset.require('../total_data')
+local earth = asset.require("scene/solarsystem/planets/earth/earth")
+local data = asset.require("../total_data")
 
 
 
diff --git a/data/assets/scene/solarsystem/planets/earth/eclipses/paths/total/2017-08-21.asset b/data/assets/scene/solarsystem/planets/earth/eclipses/paths/total/2017-08-21.asset
index a33a876600..f193b3ec36 100644
--- a/data/assets/scene/solarsystem/planets/earth/eclipses/paths/total/2017-08-21.asset
+++ b/data/assets/scene/solarsystem/planets/earth/eclipses/paths/total/2017-08-21.asset
@@ -1,5 +1,5 @@
-local earth = asset.require('scene/solarsystem/planets/earth/earth')
-local data = asset.require('../total_data')
+local earth = asset.require("scene/solarsystem/planets/earth/earth")
+local data = asset.require("../total_data")
 
 
 
diff --git a/data/assets/scene/solarsystem/planets/earth/eclipses/paths/total/2019-07-02.asset b/data/assets/scene/solarsystem/planets/earth/eclipses/paths/total/2019-07-02.asset
index 49f39e18dd..9d6b3decf8 100644
--- a/data/assets/scene/solarsystem/planets/earth/eclipses/paths/total/2019-07-02.asset
+++ b/data/assets/scene/solarsystem/planets/earth/eclipses/paths/total/2019-07-02.asset
@@ -1,5 +1,5 @@
-local earth = asset.require('scene/solarsystem/planets/earth/earth')
-local data = asset.require('../total_data')
+local earth = asset.require("scene/solarsystem/planets/earth/earth")
+local data = asset.require("../total_data")
 
 
 
diff --git a/data/assets/scene/solarsystem/planets/earth/eclipses/paths/total/2020-12-14.asset b/data/assets/scene/solarsystem/planets/earth/eclipses/paths/total/2020-12-14.asset
index 116351bc69..a5d78dbfd5 100644
--- a/data/assets/scene/solarsystem/planets/earth/eclipses/paths/total/2020-12-14.asset
+++ b/data/assets/scene/solarsystem/planets/earth/eclipses/paths/total/2020-12-14.asset
@@ -1,5 +1,5 @@
-local earth = asset.require('scene/solarsystem/planets/earth/earth')
-local data = asset.require('../total_data')
+local earth = asset.require("scene/solarsystem/planets/earth/earth")
+local data = asset.require("../total_data")
 
 
 
diff --git a/data/assets/scene/solarsystem/planets/earth/eclipses/paths/total/2021-12-04.asset b/data/assets/scene/solarsystem/planets/earth/eclipses/paths/total/2021-12-04.asset
index b01e33b354..e8350dc988 100644
--- a/data/assets/scene/solarsystem/planets/earth/eclipses/paths/total/2021-12-04.asset
+++ b/data/assets/scene/solarsystem/planets/earth/eclipses/paths/total/2021-12-04.asset
@@ -1,5 +1,5 @@
-local earth = asset.require('scene/solarsystem/planets/earth/earth')
-local data = asset.require('../total_data')
+local earth = asset.require("scene/solarsystem/planets/earth/earth")
+local data = asset.require("../total_data")
 
 
 
diff --git a/data/assets/scene/solarsystem/planets/earth/eclipses/paths/total/2024-04-08.asset b/data/assets/scene/solarsystem/planets/earth/eclipses/paths/total/2024-04-08.asset
index 47e8efd726..c1fe33eb8d 100644
--- a/data/assets/scene/solarsystem/planets/earth/eclipses/paths/total/2024-04-08.asset
+++ b/data/assets/scene/solarsystem/planets/earth/eclipses/paths/total/2024-04-08.asset
@@ -1,5 +1,5 @@
-local earth = asset.require('scene/solarsystem/planets/earth/earth')
-local data = asset.require('../total_data')
+local earth = asset.require("scene/solarsystem/planets/earth/earth")
+local data = asset.require("../total_data")
 
 
 
diff --git a/data/assets/scene/solarsystem/planets/earth/eclipses/paths/total/2026-08-12.asset b/data/assets/scene/solarsystem/planets/earth/eclipses/paths/total/2026-08-12.asset
index e73db56245..c53ae9ed10 100644
--- a/data/assets/scene/solarsystem/planets/earth/eclipses/paths/total/2026-08-12.asset
+++ b/data/assets/scene/solarsystem/planets/earth/eclipses/paths/total/2026-08-12.asset
@@ -1,5 +1,5 @@
-local earth = asset.require('scene/solarsystem/planets/earth/earth')
-local data = asset.require('../total_data')
+local earth = asset.require("scene/solarsystem/planets/earth/earth")
+local data = asset.require("../total_data")
 
 
 
diff --git a/data/assets/scene/solarsystem/planets/earth/eclipses/paths/total/2027-08-02.asset b/data/assets/scene/solarsystem/planets/earth/eclipses/paths/total/2027-08-02.asset
index b13e5035b3..b6c7d96f5e 100644
--- a/data/assets/scene/solarsystem/planets/earth/eclipses/paths/total/2027-08-02.asset
+++ b/data/assets/scene/solarsystem/planets/earth/eclipses/paths/total/2027-08-02.asset
@@ -1,5 +1,5 @@
-local earth = asset.require('scene/solarsystem/planets/earth/earth')
-local data = asset.require('../total_data')
+local earth = asset.require("scene/solarsystem/planets/earth/earth")
+local data = asset.require("../total_data")
 
 
 
diff --git a/data/assets/scene/solarsystem/planets/earth/eclipses/paths/total/2028-07-22.asset b/data/assets/scene/solarsystem/planets/earth/eclipses/paths/total/2028-07-22.asset
index e886f56326..52ebc1eee9 100644
--- a/data/assets/scene/solarsystem/planets/earth/eclipses/paths/total/2028-07-22.asset
+++ b/data/assets/scene/solarsystem/planets/earth/eclipses/paths/total/2028-07-22.asset
@@ -1,5 +1,5 @@
-local earth = asset.require('scene/solarsystem/planets/earth/earth')
-local data = asset.require('../total_data')
+local earth = asset.require("scene/solarsystem/planets/earth/earth")
+local data = asset.require("../total_data")
 
 
 
diff --git a/data/assets/scene/solarsystem/planets/earth/eclipses/paths/total/2030-11-25.asset b/data/assets/scene/solarsystem/planets/earth/eclipses/paths/total/2030-11-25.asset
index b33981bb1e..1dbc700ac3 100644
--- a/data/assets/scene/solarsystem/planets/earth/eclipses/paths/total/2030-11-25.asset
+++ b/data/assets/scene/solarsystem/planets/earth/eclipses/paths/total/2030-11-25.asset
@@ -1,5 +1,5 @@
-local earth = asset.require('scene/solarsystem/planets/earth/earth')
-local data = asset.require('../total_data')
+local earth = asset.require("scene/solarsystem/planets/earth/earth")
+local data = asset.require("../total_data")
 
 
 
diff --git a/data/assets/scene/solarsystem/planets/earth/eclipses/paths/total/2033-03-30.asset b/data/assets/scene/solarsystem/planets/earth/eclipses/paths/total/2033-03-30.asset
index aae1ac71f0..c60844b6cd 100644
--- a/data/assets/scene/solarsystem/planets/earth/eclipses/paths/total/2033-03-30.asset
+++ b/data/assets/scene/solarsystem/planets/earth/eclipses/paths/total/2033-03-30.asset
@@ -1,5 +1,5 @@
-local earth = asset.require('scene/solarsystem/planets/earth/earth')
-local data = asset.require('../total_data')
+local earth = asset.require("scene/solarsystem/planets/earth/earth")
+local data = asset.require("../total_data")
 
 
 
diff --git a/data/assets/scene/solarsystem/planets/earth/eclipses/paths/total/2034-03-20.asset b/data/assets/scene/solarsystem/planets/earth/eclipses/paths/total/2034-03-20.asset
index c5a662ddab..b9b834d796 100644
--- a/data/assets/scene/solarsystem/planets/earth/eclipses/paths/total/2034-03-20.asset
+++ b/data/assets/scene/solarsystem/planets/earth/eclipses/paths/total/2034-03-20.asset
@@ -1,5 +1,5 @@
-local earth = asset.require('scene/solarsystem/planets/earth/earth')
-local data = asset.require('../total_data')
+local earth = asset.require("scene/solarsystem/planets/earth/earth")
+local data = asset.require("../total_data")
 
 
 
diff --git a/data/assets/scene/solarsystem/planets/earth/eclipses/paths/total/2035-09-02.asset b/data/assets/scene/solarsystem/planets/earth/eclipses/paths/total/2035-09-02.asset
index ea1110a5b4..ea0113e141 100644
--- a/data/assets/scene/solarsystem/planets/earth/eclipses/paths/total/2035-09-02.asset
+++ b/data/assets/scene/solarsystem/planets/earth/eclipses/paths/total/2035-09-02.asset
@@ -1,5 +1,5 @@
-local earth = asset.require('scene/solarsystem/planets/earth/earth')
-local data = asset.require('../total_data')
+local earth = asset.require("scene/solarsystem/planets/earth/earth")
+local data = asset.require("../total_data")
 
 
 
diff --git a/data/assets/scene/solarsystem/planets/earth/eclipses/paths/total/2037-07-13.asset b/data/assets/scene/solarsystem/planets/earth/eclipses/paths/total/2037-07-13.asset
index 9d3b1ba1d3..fcbdd873df 100644
--- a/data/assets/scene/solarsystem/planets/earth/eclipses/paths/total/2037-07-13.asset
+++ b/data/assets/scene/solarsystem/planets/earth/eclipses/paths/total/2037-07-13.asset
@@ -1,5 +1,5 @@
-local earth = asset.require('scene/solarsystem/planets/earth/earth')
-local data = asset.require('../total_data')
+local earth = asset.require("scene/solarsystem/planets/earth/earth")
+local data = asset.require("../total_data")
 
 
 
diff --git a/data/assets/scene/solarsystem/planets/earth/eclipses/paths/total/2038-12-26.asset b/data/assets/scene/solarsystem/planets/earth/eclipses/paths/total/2038-12-26.asset
index 19964c89ce..2c64b21f7e 100644
--- a/data/assets/scene/solarsystem/planets/earth/eclipses/paths/total/2038-12-26.asset
+++ b/data/assets/scene/solarsystem/planets/earth/eclipses/paths/total/2038-12-26.asset
@@ -1,5 +1,5 @@
-local earth = asset.require('scene/solarsystem/planets/earth/earth')
-local data = asset.require('../total_data')
+local earth = asset.require("scene/solarsystem/planets/earth/earth")
+local data = asset.require("../total_data")
 
 
 
diff --git a/data/assets/scene/solarsystem/planets/earth/eclipses/paths/total/2039-12-15.asset b/data/assets/scene/solarsystem/planets/earth/eclipses/paths/total/2039-12-15.asset
index 46c2d0c9b8..269621d93c 100644
--- a/data/assets/scene/solarsystem/planets/earth/eclipses/paths/total/2039-12-15.asset
+++ b/data/assets/scene/solarsystem/planets/earth/eclipses/paths/total/2039-12-15.asset
@@ -1,5 +1,5 @@
-local earth = asset.require('scene/solarsystem/planets/earth/earth')
-local data = asset.require('../total_data')
+local earth = asset.require("scene/solarsystem/planets/earth/earth")
+local data = asset.require("../total_data")
 
 
 
diff --git a/data/assets/scene/solarsystem/planets/earth/eclipses/paths/total/2041-04-30.asset b/data/assets/scene/solarsystem/planets/earth/eclipses/paths/total/2041-04-30.asset
index 7b215343c7..52274697e5 100644
--- a/data/assets/scene/solarsystem/planets/earth/eclipses/paths/total/2041-04-30.asset
+++ b/data/assets/scene/solarsystem/planets/earth/eclipses/paths/total/2041-04-30.asset
@@ -1,5 +1,5 @@
-local earth = asset.require('scene/solarsystem/planets/earth/earth')
-local data = asset.require('../total_data')
+local earth = asset.require("scene/solarsystem/planets/earth/earth")
+local data = asset.require("../total_data")
 
 
 
diff --git a/data/assets/scene/solarsystem/planets/earth/eclipses/paths/total/2042-04-20.asset b/data/assets/scene/solarsystem/planets/earth/eclipses/paths/total/2042-04-20.asset
index 952a43a8a9..748002f7ca 100644
--- a/data/assets/scene/solarsystem/planets/earth/eclipses/paths/total/2042-04-20.asset
+++ b/data/assets/scene/solarsystem/planets/earth/eclipses/paths/total/2042-04-20.asset
@@ -1,5 +1,5 @@
-local earth = asset.require('scene/solarsystem/planets/earth/earth')
-local data = asset.require('../total_data')
+local earth = asset.require("scene/solarsystem/planets/earth/earth")
+local data = asset.require("../total_data")
 
 
 
diff --git a/data/assets/scene/solarsystem/planets/earth/eclipses/paths/total/2043-04-09.asset b/data/assets/scene/solarsystem/planets/earth/eclipses/paths/total/2043-04-09.asset
index 96a3637e8d..045d553789 100644
--- a/data/assets/scene/solarsystem/planets/earth/eclipses/paths/total/2043-04-09.asset
+++ b/data/assets/scene/solarsystem/planets/earth/eclipses/paths/total/2043-04-09.asset
@@ -1,5 +1,5 @@
-local earth = asset.require('scene/solarsystem/planets/earth/earth')
-local data = asset.require('../total_data')
+local earth = asset.require("scene/solarsystem/planets/earth/earth")
+local data = asset.require("../total_data")
 
 
 
diff --git a/tests/AssetLoaderTest/require.asset b/tests/AssetLoaderTest/require.asset
index 584c7ac4a8..7a5f7dc704 100644
--- a/tests/AssetLoaderTest/require.asset
+++ b/tests/AssetLoaderTest/require.asset
@@ -1,2 +1,2 @@
-local exports, dep = asset.require('export');
-assert (exports.data == 'foo')
\ No newline at end of file
+local exports, dep = asset.require("export");
+assert (exports.data == 'foo')

From 690878bc87760dded42ca8eb349a8efc2ba73b9f Mon Sep 17 00:00:00 2001
From: Malin E <malin.ejdbo@gmail.com>
Date: Wed, 6 Dec 2023 16:17:23 +0100
Subject: [PATCH 198/701] Layers maintenance (#2917)

* Separate layers for the Moon and Earth

* One asset each for each server, New York, Utah, and Sweden

* Add the layers asset files for Earth and Moon

* Add new layers structure for Mars and Europa

* Add layers assets for Mercury and Enceladus

* Add more layer assets for all servers

* Add layer assets for each server on the top asset level

* Rename Venus Utah cloud combo layer asset (breaking change)

* Clean up layer asset descriptions

* Update layer asset version name

* Fix base layers error

* Add configuration option to choose layers server

* Add Lua functions to access configuration settings

* Extend configuration Lua function

* Add layer server setting in setting gui + add 'None' as a server option

* Add base layers when server 'None' is used

* Add tests for the new Layer Server setting
---
 .../ext/launcher/include/settingsdialog.h     |   1 +
 .../ext/launcher/src/settingsdialog.cpp       |  62 +++-
 data/assets/base.asset                        |  18 +-
 .../solarsystem/planets/base_layers.asset     |  39 +++
 .../solarsystem/planets/default_layers.asset  |  40 +--
 .../planets/earth/default_layers.asset        |  56 ++--
 .../planets/earth/layers/base_layers.asset    |  44 +++
 .../planets/earth/layers/newyork_layers.asset |  25 ++
 .../planets/earth/layers/sweden_layers.asset  |  25 ++
 .../planets/earth/layers/utah_layers.asset    |  25 ++
 .../planets/earth/moon/default_layers.asset   |  34 +--
 .../earth/moon/layers/newyork_layers.asset    |  24 ++
 .../earth/moon/layers/sweden_layers.asset     |  24 ++
 .../earth/moon/layers/utah_layers.asset       |  24 ++
 .../jupiter/europa/default_layers.asset       |  16 +-
 .../jupiter/europa/layers/base_layers.asset   |  12 +
 .../jupiter/europa/layers/local_layers.asset  |  17 ++
 .../europa/layers/newyork_layers.asset        |  17 ++
 .../jupiter/europa/layers/sweden_layers.asset |  17 ++
 .../planets/mars/default_layers.asset         |  50 +---
 .../planets/mars/layers/base_layers.asset     |  24 ++
 .../planets/mars/layers/newyork_layers.asset  |  29 ++
 .../planets/mars/layers/sweden_layers.asset   |  28 ++
 .../planets/mars/layers/utah_layers.asset     |  28 ++
 .../planets/mercury/default_layers.asset      |  61 +---
 .../planets/mercury/layers/base_layers.asset  |  21 ++
 .../mercury/layers/newyork_layers.asset       |  31 ++
 .../mercury/layers/sweden_layers.asset        |  31 ++
 .../planets/mercury/layers/utah_layers.asset  |  29 ++
 .../solarsystem/planets/newyork_layers.asset  |  25 ++
 .../saturn/enceladus/default_layers.asset     |  16 +-
 .../saturn/enceladus/layers/base_layers.asset |  12 +
 .../enceladus/layers/newyork_layers.asset     |  18 ++
 .../enceladus/layers/sweden_layers.asset      |  18 ++
 .../solarsystem/planets/sweden_layers.asset   |  27 ++
 .../solarsystem/planets/utah_layers.asset     |  27 ++
 .../planets/venus/default_layers.asset        |  20 +-
 .../planets/venus/layers/base_layers.asset    |  12 +
 ...asset => clouds_magellan_combo_utah.asset} |   4 +-
 .../planets/venus/layers/newyork_layers.asset |  21 ++
 .../planets/venus/layers/utah_layers.asset    |  21 ++
 include/openspace/engine/configuration.h      |  14 +
 include/openspace/engine/settings.h           |   2 +
 openspace.cfg                                 |   6 +
 src/engine/configuration.cpp                  | 180 ++++++++++++
 src/engine/openspaceengine.cpp                |   4 +-
 src/engine/openspaceengine_lua.inl            |  16 ++
 src/engine/settings.cpp                       |   8 +
 tests/test_settings.cpp                       | 269 ++++++++++++++++++
 49 files changed, 1355 insertions(+), 217 deletions(-)
 create mode 100644 data/assets/scene/solarsystem/planets/base_layers.asset
 create mode 100644 data/assets/scene/solarsystem/planets/earth/layers/base_layers.asset
 create mode 100644 data/assets/scene/solarsystem/planets/earth/layers/newyork_layers.asset
 create mode 100644 data/assets/scene/solarsystem/planets/earth/layers/sweden_layers.asset
 create mode 100644 data/assets/scene/solarsystem/planets/earth/layers/utah_layers.asset
 create mode 100644 data/assets/scene/solarsystem/planets/earth/moon/layers/newyork_layers.asset
 create mode 100644 data/assets/scene/solarsystem/planets/earth/moon/layers/sweden_layers.asset
 create mode 100644 data/assets/scene/solarsystem/planets/earth/moon/layers/utah_layers.asset
 create mode 100644 data/assets/scene/solarsystem/planets/jupiter/europa/layers/base_layers.asset
 create mode 100644 data/assets/scene/solarsystem/planets/jupiter/europa/layers/local_layers.asset
 create mode 100644 data/assets/scene/solarsystem/planets/jupiter/europa/layers/newyork_layers.asset
 create mode 100644 data/assets/scene/solarsystem/planets/jupiter/europa/layers/sweden_layers.asset
 create mode 100644 data/assets/scene/solarsystem/planets/mars/layers/base_layers.asset
 create mode 100644 data/assets/scene/solarsystem/planets/mars/layers/newyork_layers.asset
 create mode 100644 data/assets/scene/solarsystem/planets/mars/layers/sweden_layers.asset
 create mode 100644 data/assets/scene/solarsystem/planets/mars/layers/utah_layers.asset
 create mode 100644 data/assets/scene/solarsystem/planets/mercury/layers/base_layers.asset
 create mode 100644 data/assets/scene/solarsystem/planets/mercury/layers/newyork_layers.asset
 create mode 100644 data/assets/scene/solarsystem/planets/mercury/layers/sweden_layers.asset
 create mode 100644 data/assets/scene/solarsystem/planets/mercury/layers/utah_layers.asset
 create mode 100644 data/assets/scene/solarsystem/planets/newyork_layers.asset
 create mode 100644 data/assets/scene/solarsystem/planets/saturn/enceladus/layers/base_layers.asset
 create mode 100644 data/assets/scene/solarsystem/planets/saturn/enceladus/layers/newyork_layers.asset
 create mode 100644 data/assets/scene/solarsystem/planets/saturn/enceladus/layers/sweden_layers.asset
 create mode 100644 data/assets/scene/solarsystem/planets/sweden_layers.asset
 create mode 100644 data/assets/scene/solarsystem/planets/utah_layers.asset
 create mode 100644 data/assets/scene/solarsystem/planets/venus/layers/base_layers.asset
 rename data/assets/scene/solarsystem/planets/venus/layers/colorlayers/{clouds_magellan_combo.asset => clouds_magellan_combo_utah.asset} (92%)
 create mode 100644 data/assets/scene/solarsystem/planets/venus/layers/newyork_layers.asset
 create mode 100644 data/assets/scene/solarsystem/planets/venus/layers/utah_layers.asset

diff --git a/apps/OpenSpace/ext/launcher/include/settingsdialog.h b/apps/OpenSpace/ext/launcher/include/settingsdialog.h
index eb06e92b0d..54ba955ec0 100644
--- a/apps/OpenSpace/ext/launcher/include/settingsdialog.h
+++ b/apps/OpenSpace/ext/launcher/include/settingsdialog.h
@@ -59,6 +59,7 @@ private:
     QComboBox* _propertyVisibility = nullptr;
     QCheckBox* _bypassLauncher = nullptr;
     QLabel* _bypassInformation = nullptr;
+    QComboBox* _layerServer = nullptr;
 
     struct {
         QCheckBox* isEnabled = nullptr;
diff --git a/apps/OpenSpace/ext/launcher/src/settingsdialog.cpp b/apps/OpenSpace/ext/launcher/src/settingsdialog.cpp
index 42ea8a0c70..dff09d8fc3 100644
--- a/apps/OpenSpace/ext/launcher/src/settingsdialog.cpp
+++ b/apps/OpenSpace/ext/launcher/src/settingsdialog.cpp
@@ -63,15 +63,16 @@ void SettingsDialog::createWidgets() {
     // | Property Visibility        | DDDDDDDDDDDDDDDDDDDDD> |
     // | [] Bypass Launcher                                  |
     // | Informational text about undoing the bypass setting |
-    // | MRF Caching                                         |
-    // | [] Enable caching                                   |
-    // | Cache location             | [oooooooooooooooooooo] |
+    // | Layer Settings                                      |
+    // | Layer Server               | DDDDDDDDDDDDDDDDDDDDD> |
+    // | [] Enable MRF caching                               |
+    // | MRF Cache Location         | [oooooooooooooooooooo] |
     // |                            | <Save>        <Cancel> |
     // -------------------------------------------------------
 
     QGridLayout* layout = new QGridLayout(this);
     layout->setSizeConstraint(QLayout::SetFixedSize);
-    
+
     {
         QLabel* label = new QLabel("Profile");
         label->setObjectName("heading");
@@ -269,11 +270,39 @@ void SettingsDialog::createWidgets() {
     layout->addWidget(new Line(), 12, 0, 1, 2);
 
     {
-        QLabel* label = new QLabel("MRF Caching");
+        QLabel* label = new QLabel("Layer Settings");
         label->setObjectName("heading");
         layout->addWidget(label, 13, 0, 1, 2);
 
-        _mrf.isEnabled = new QCheckBox("Enable Caching");
+        QLabel* conf = new QLabel("Layer Server");
+        conf->setToolTip(
+            "This setting sets the default server to be used for the layers that "
+            "are hosted by the OpenSpace team"
+        );
+        layout->addWidget(conf, 14, 0);
+
+        _layerServer = new QComboBox;
+        _layerServer->setToolTip(conf->toolTip());
+        _layerServer->addItems({
+            "All",
+            "NewYork",
+            "Sweden",
+            "Utah",
+            "None"
+        });
+        _layerServer->setCurrentText("All");
+        connect(
+            _layerServer,
+            &QComboBox::textActivated,
+            [this](const QString& value) {
+                _currentEdit.layerServer =
+                    openspace::stringToLayerServer(value.toStdString());
+                updateSaveButton();
+            }
+        );
+        layout->addWidget(_layerServer, 14, 1);
+
+        _mrf.isEnabled = new QCheckBox("Enable MRF Caching");
         _mrf.isEnabled->setToolTip(
             "If this setting is checked, the MRF caching for globe layers will be "
             "enabled. This means that all planetary images that are loaded over the "
@@ -296,9 +325,9 @@ void SettingsDialog::createWidgets() {
                 updateSaveButton();
             }
         );
-        layout->addWidget(_mrf.isEnabled, 14, 0, 1, 2);
+        layout->addWidget(_mrf.isEnabled, 16, 0, 1, 2);
 
-        QLabel* conf = new QLabel("Cache Location");
+        QLabel* mrfConf = new QLabel("MRF Cache Location");
         conf->setToolTip(
             "This is the place where the MRF cache files are located. Please note that "
             "these files can potentially become quite large when using OpenSpace for a "
@@ -306,10 +335,10 @@ void SettingsDialog::createWidgets() {
             "blank, the cached files will be stored in the 'mrf_cache' folder in the "
             "OpenSpace base folder."
         );
-        layout->addWidget(conf, 15, 0);
+        layout->addWidget(mrfConf, 17, 0);
 
         _mrf.location = new QLineEdit;
-        _mrf.location->setToolTip(conf->toolTip());
+        _mrf.location->setToolTip(mrfConf->toolTip());
         _mrf.location->setDisabled(true);
         connect(
             _mrf.location,
@@ -324,10 +353,10 @@ void SettingsDialog::createWidgets() {
                 updateSaveButton();
             }
         );
-        layout->addWidget(_mrf.location, 15, 1);
+        layout->addWidget(_mrf.location, 17, 1);
     }
 
-    layout->addWidget(new Line(), 16, 0, 1, 2);
+    layout->addWidget(new Line(), 18, 0, 1, 2);
 
     _dialogButtons = new QDialogButtonBox;
     _dialogButtons->setStandardButtons(
@@ -341,7 +370,7 @@ void SettingsDialog::createWidgets() {
         _dialogButtons, &QDialogButtonBox::rejected,
         this, &SettingsDialog::reject
     );
-    layout->addWidget(_dialogButtons, 17, 1, 1, 1, Qt::AlignRight);
+    layout->addWidget(_dialogButtons, 19, 1, 1, 1, Qt::AlignRight);
 }
 
 void SettingsDialog::loadFromSettings(const openspace::Settings& settings) {
@@ -387,6 +416,13 @@ void SettingsDialog::loadFromSettings(const openspace::Settings& settings) {
         _bypassLauncher->setChecked(*settings.bypassLauncher);
     }
 
+    if (settings.layerServer.has_value()) {
+        openspace::Configuration::LayerServer server = *settings.layerServer;
+        _layerServer->setCurrentText(
+            QString::fromStdString(openspace::layerServerToString(server))
+        );
+    }
+
     if (settings.mrf.isEnabled.has_value()) {
         _mrf.isEnabled->setChecked(*settings.mrf.isEnabled);
     }
diff --git a/data/assets/base.asset b/data/assets/base.asset
index 7437c06163..3c3b08a2d6 100644
--- a/data/assets/base.asset
+++ b/data/assets/base.asset
@@ -10,7 +10,6 @@ asset.require("scene/solarsystem/sun/glare")
 asset.require("scene/solarsystem/sun/habitablezone")
 asset.require("scene/solarsystem/sun/default_layers")
 asset.require("scene/solarsystem/planets/planets")
-asset.require("scene/solarsystem/planets/default_layers")
 asset.require("scene/solarsystem/dwarf_planets/pluto/system")
 asset.require("scene/solarsystem/dwarf_planets/pluto/default_layers")
 asset.require("scene/solarsystem/dwarf_planets/pluto/charon/default_layers")
@@ -18,6 +17,23 @@ asset.require("scene/milkyway/milkyway/volume")
 asset.require("scene/milkyway/constellations/constellation_art")
 asset.require("scene/milkyway/constellations/constellation_keybinds")
 
+-- Planet layers
+local server = openspace.layerServer();
+if (server == "All") then
+  asset.require("scene/solarsystem/planets/default_layers")
+elseif (server == "NewYork") then
+  asset.require("scene/solarsystem/planets/newyork_layers")
+elseif (server == "Sweden") then
+  asset.require("scene/solarsystem/planets/sweden_layers")
+elseif (server == "Utah") then
+  asset.require("scene/solarsystem/planets/utah_layers")
+elseif (server == "None") then
+  asset.require("scene/solarsystem/planets/base_layers")
+else
+  openspace.printWarning("Did not recognize the specified Layer server, defaults to 'All'")
+  asset.require("scene/solarsystem/planets/default_layers")
+end
+
 asset.require("scene/digitaluniverse/2dF")
 asset.require("scene/digitaluniverse/2mass")
 asset.require("scene/digitaluniverse/6dF")
diff --git a/data/assets/scene/solarsystem/planets/base_layers.asset b/data/assets/scene/solarsystem/planets/base_layers.asset
new file mode 100644
index 0000000000..a925ac4ec2
--- /dev/null
+++ b/data/assets/scene/solarsystem/planets/base_layers.asset
@@ -0,0 +1,39 @@
+asset.require("./mercury/layers/base_layers")
+
+asset.require("./venus/layers/base_layers")
+
+asset.require("./earth/layers/base_layers")
+
+asset.require("./mars/layers/base_layers")
+
+asset.require("./jupiter/default_layers")
+asset.require("./jupiter/callisto/default_layers")
+asset.require("./jupiter/ganymede/default_layers")
+asset.require("./jupiter/io/default_layers")
+
+asset.require("./saturn/default_layers")
+asset.require("./saturn/dione/default_layers")
+asset.require("./saturn/hyperion/default_layers")
+asset.require("./saturn/iapetus/default_layers")
+asset.require("./saturn/mimas/default_layers")
+asset.require("./saturn/rhea/default_layers")
+asset.require("./saturn/tethys/default_layers")
+asset.require("./saturn/titan/default_layers")
+
+asset.require("./uranus/default_layers")
+
+asset.require("./neptune/default_layers")
+
+
+asset.meta = {
+  Name = "Base Solar System Layers",
+  Version = "1.0",
+  Description = [[Adds base layers for all planets. Remove this asset and include
+    individual layers for planets to customize planet layers.
+    The base layers do not depend on any particular OpenSpace server but are still
+    dependent on internet access.
+  ]],
+  Author = "OpenSpace Team",
+  URL = "http://openspaceproject.com",
+  License = "MIT license"
+}
diff --git a/data/assets/scene/solarsystem/planets/default_layers.asset b/data/assets/scene/solarsystem/planets/default_layers.asset
index b3f332561e..9420959e1d 100644
--- a/data/assets/scene/solarsystem/planets/default_layers.asset
+++ b/data/assets/scene/solarsystem/planets/default_layers.asset
@@ -1,39 +1,19 @@
-asset.require("./earth/default_layers")
-asset.require("./earth/moon/default_layers")
-
-asset.require("./jupiter/default_layers")
-asset.require("./jupiter/callisto/default_layers")
-asset.require("./jupiter/europa/default_layers")
-asset.require("./jupiter/ganymede/default_layers")
-asset.require("./jupiter/io/default_layers")
-
-asset.require("./mars/default_layers")
-
-asset.require("./mercury/default_layers")
-
-asset.require("./neptune/default_layers")
-
-asset.require("./saturn/default_layers")
-asset.require("./saturn/dione/default_layers")
-asset.require("./saturn/enceladus/default_layers")
-asset.require("./saturn/hyperion/default_layers")
-asset.require("./saturn/iapetus/default_layers")
-asset.require("./saturn/mimas/default_layers")
-asset.require("./saturn/rhea/default_layers")
-asset.require("./saturn/tethys/default_layers")
-asset.require("./saturn/titan/default_layers")
-
-asset.require("./uranus/default_layers")
-
-asset.require("./venus/default_layers")
+asset.require("./base_layers")
+asset.require("./utah_layers")
+asset.require("./sweden_layers")
+asset.require("./newyork_layers")
 
 
 
 asset.meta = {
   Name = "Default Solar System Layers",
-  Version = "1.0",
+  Version = "1.1",
   Description = [[Adds default layers for all planets. Remove this asset and include
-    individual layers for planets to customize planet layers]],
+    individual layers for planets to customize planet layers
+
+
+    Layers loaded from all servers
+  ]],
   Author = "OpenSpace Team",
   URL = "http://openspaceproject.com",
   License = "MIT license"
diff --git a/data/assets/scene/solarsystem/planets/earth/default_layers.asset b/data/assets/scene/solarsystem/planets/earth/default_layers.asset
index ace0e7a0d7..cd16ed15e3 100644
--- a/data/assets/scene/solarsystem/planets/earth/default_layers.asset
+++ b/data/assets/scene/solarsystem/planets/earth/default_layers.asset
@@ -1,47 +1,25 @@
-asset.require("./layers/colorlayers/blue_marble", false)
-asset.require("./layers/colorlayers/esri_viirs_combo", true)
-asset.require("./layers/colorlayers/esri_noaa20_combo", false)
-asset.require("./layers/colorlayers/esri_world_imagery", false)
-asset.require("./layers/colorlayers/viirs_snpp_temporal", false)
-asset.require("./layers/colorlayers/aqua_modis_temporal", false)
-asset.require("./layers/colorlayers/terra_modis_temporal", false)
-asset.require("./layers/colorlayers/bmng_utah", false)
-asset.require("./layers/colorlayers/bmng_sweden", false)
-asset.require("./layers/colorlayers/bmng_newyork", false)
-asset.require("./layers/colorlayers/amsr2_gcom_w1_sea_ice_concentration_temporal", false)
-asset.require("./layers/colorlayers/modis_terra_chlorophyll_a_temporal", false)
-asset.require("./layers/colorlayers/ghrsst_l4_mur_sea_surface_temperature_temporal", false)
-
-asset.require("./layers/heightlayers/blue_marble_height", false)
-asset.require("./layers/heightlayers/terrain_tileset", true)
-
-asset.require("./layers/nightlayers/earth_at_night_2012", true)
-asset.require("./layers/nightlayers/earth_night_texture", false)
-asset.require("./layers/nightlayers/earth_at_night_temporal", false)
-
-asset.require("./layers/overlays/coastlines", false)
-asset.require("./layers/overlays/reference_features", false)
-asset.require("./layers/overlays/reference_labels", false)
-asset.require("./layers/overlays/tile_indices", false)
-asset.require("./layers/overlays/size_reference", false)
-
-asset.require("./layers/watermasks/gebco_sweden", false)
-asset.require("./layers/watermasks/gebco_utah", false)
-asset.require("./layers/watermasks/gebco_newyork", false)
-asset.require("./layers/watermasks/modis_water_mask", true)
+asset.require("./layers/base_layers", true)
+asset.require("./layers/utah_layers", false)
+asset.require("./layers/sweden_layers", false)
+asset.require("./layers/newyork_layers", false)
 
 
 
 asset.meta = {
   Name = "Default Earth Layers",
-  Version = "1.0",
-  Description = [[Default Earth layers are: ESRI VIIRS Combo, ESRI World Imagery, VIIRS
-    SNPP (Temporal), Aqua Modis (Temporal), Terra Modis (Temporal), BMNG, AMSR2 GCOM
-    W1 Sea Ice Concentration (Temporal), MODIS Terra Chlorophyll A (Temporal), GHRSST,
-    L4 G1SST Sea Surface Temperature (Temporal), GHRSST L4 MUR Sea Surface Temperature
-    (Temporal), World Elevation (3D), Earth at Night 2012, Coastlines, Reference
-    Features, Reference Labels, Tile Indicies, Size Reference, Gebco, and Modis Water
-    Mask]],
+  Version = "1.1",
+  Description = [[Default Earth layers are: Blue Marble,
+    ESRI VIIRS Combo, ESRI NOAA20 Combo, ESRI World Imagery, VIIRS SNPP (Temporal),
+    Aqua Modis (Temporal), Terra Modis (Temporal),
+    AMSR2 GCOM W1 Sea Ice Concentration (Temporal), MODIS Terra Chlorophyll A (Temporal),
+    GHRSST L4 MUR Sea Surface Temperature (Temporal), BMNG, Blue Marble Height (3D),
+    World Elevation (3D), Earth at Night 2012, Earth at Night Texture,
+    Earth at Night (Temporal), Coastlines, Reference Features, Reference Labels,
+    Tile Indicies, Size Reference, Gebco and Modis Water Mask.
+
+
+    Layers loaded from all servers
+  ]],
   Author = "OpenSpace Team",
   URL = "http://openspaceproject.com",
   License = "MIT license"
diff --git a/data/assets/scene/solarsystem/planets/earth/layers/base_layers.asset b/data/assets/scene/solarsystem/planets/earth/layers/base_layers.asset
new file mode 100644
index 0000000000..741f6d1d23
--- /dev/null
+++ b/data/assets/scene/solarsystem/planets/earth/layers/base_layers.asset
@@ -0,0 +1,44 @@
+asset.require("./colorlayers/blue_marble", false)
+asset.require("./colorlayers/esri_viirs_combo", asset.enabled)
+asset.require("./colorlayers/esri_noaa20_combo", false)
+asset.require("./colorlayers/esri_world_imagery", false)
+asset.require("./colorlayers/viirs_snpp_temporal", false)
+asset.require("./colorlayers/aqua_modis_temporal", false)
+asset.require("./colorlayers/terra_modis_temporal", false)
+asset.require("./colorlayers/amsr2_gcom_w1_sea_ice_concentration_temporal", false)
+asset.require("./colorlayers/modis_terra_chlorophyll_a_temporal", false)
+asset.require("./colorlayers/ghrsst_l4_mur_sea_surface_temperature_temporal", false)
+
+asset.require("./heightlayers/blue_marble_height", false)
+asset.require("./heightlayers/terrain_tileset", asset.enabled)
+
+asset.require("./nightlayers/earth_at_night_2012", asset.enabled)
+asset.require("./nightlayers/earth_night_texture", false)
+asset.require("./nightlayers/earth_at_night_temporal", false)
+
+asset.require("./overlays/coastlines", false)
+asset.require("./overlays/reference_features", false)
+asset.require("./overlays/reference_labels", false)
+asset.require("./overlays/tile_indices", false)
+asset.require("./overlays/size_reference", false)
+
+asset.require("./watermasks/modis_water_mask", asset.enabled)
+
+
+
+asset.meta = {
+  Name = "Base Earth Layers",
+  Version = "1.0",
+  Description = [[Base Earth layers are: Blue Marble, ESRI VIIRS Combo, ESRI NOAA20 Combo,
+    ESRI World Imagery, VIIRS SNPP (Temporal), Aqua Modis (Temporal),
+    Terra Modis (Temporal), AMSR2 GCOM W1 Sea Ice Concentration (Temporal),
+    MODIS Terra Chlorophyll A (Temporal),
+    GHRSST L4 MUR Sea Surface Temperature (Temporal), Blue Marble Height (3D),
+    World Elevation (3D), Earth at Night 2012, Earth at Night Texture,
+    Earth at Night (Temporal), Coastlines, Reference Features, Reference Labels,
+    Tile Indicies, Size Reference, and Modis Water Mask.
+  ]],
+  Author = "OpenSpace Team",
+  URL = "http://openspaceproject.com",
+  License = "MIT license"
+}
diff --git a/data/assets/scene/solarsystem/planets/earth/layers/newyork_layers.asset b/data/assets/scene/solarsystem/planets/earth/layers/newyork_layers.asset
new file mode 100644
index 0000000000..6b0f27d377
--- /dev/null
+++ b/data/assets/scene/solarsystem/planets/earth/layers/newyork_layers.asset
@@ -0,0 +1,25 @@
+asset.require("./base_layers", true)
+asset.require("./colorlayers/bmng_newyork", false)
+asset.require("./watermasks/gebco_newyork", false)
+
+
+
+asset.meta = {
+  Name = "Default Earth Layers (New York)",
+  Version = "1.0",
+  Description = [[Default Earth layers are: Blue Marble,
+    ESRI VIIRS Combo, ESRI NOAA20 Combo, ESRI World Imagery, VIIRS SNPP (Temporal),
+    Aqua Modis (Temporal), Terra Modis (Temporal),
+    AMSR2 GCOM W1 Sea Ice Concentration (Temporal), MODIS Terra Chlorophyll A (Temporal),
+    GHRSST L4 MUR Sea Surface Temperature (Temporal), BMNG, Blue Marble Height (3D),
+    World Elevation (3D), Earth at Night 2012, Earth at Night Texture,
+    Earth at Night (Temporal), Coastlines, Reference Features, Reference Labels,
+    Tile Indicies, Size Reference, Gebco and Modis Water Mask.
+
+
+    Layers only loaded from the New York server
+  ]],
+  Author = "OpenSpace Team",
+  URL = "http://openspaceproject.com",
+  License = "MIT license"
+}
diff --git a/data/assets/scene/solarsystem/planets/earth/layers/sweden_layers.asset b/data/assets/scene/solarsystem/planets/earth/layers/sweden_layers.asset
new file mode 100644
index 0000000000..95381f748e
--- /dev/null
+++ b/data/assets/scene/solarsystem/planets/earth/layers/sweden_layers.asset
@@ -0,0 +1,25 @@
+asset.require("./base_layers", true)
+asset.require("./colorlayers/bmng_sweden", false)
+asset.require("./watermasks/gebco_sweden", false)
+
+
+
+asset.meta = {
+  Name = "Default Earth Layers (Sweden)",
+  Version = "1.0",
+  Description = [[Default Earth layers are: Blue Marble,
+    ESRI VIIRS Combo, ESRI NOAA20 Combo, ESRI World Imagery, VIIRS SNPP (Temporal),
+    Aqua Modis (Temporal), Terra Modis (Temporal),
+    AMSR2 GCOM W1 Sea Ice Concentration (Temporal), MODIS Terra Chlorophyll A (Temporal),
+    GHRSST L4 MUR Sea Surface Temperature (Temporal), BMNG, Blue Marble Height (3D),
+    World Elevation (3D), Earth at Night 2012, Earth at Night Texture,
+    Earth at Night (Temporal), Coastlines, Reference Features, Reference Labels,
+    Tile Indicies, Size Reference, Gebco and Modis Water Mask.
+
+
+    Layers only loaded from the Sweden server
+  ]],
+  Author = "OpenSpace Team",
+  URL = "http://openspaceproject.com",
+  License = "MIT license"
+}
diff --git a/data/assets/scene/solarsystem/planets/earth/layers/utah_layers.asset b/data/assets/scene/solarsystem/planets/earth/layers/utah_layers.asset
new file mode 100644
index 0000000000..91e5287594
--- /dev/null
+++ b/data/assets/scene/solarsystem/planets/earth/layers/utah_layers.asset
@@ -0,0 +1,25 @@
+asset.require("./base_layers", true)
+asset.require("./colorlayers/bmng_utah", false)
+asset.require("./watermasks/gebco_utah", false)
+
+
+
+asset.meta = {
+  Name = "Default Earth Layers (Utah)",
+  Version = "1.0",
+  Description = [[Default Earth layers are: Blue Marble,
+    ESRI VIIRS Combo, ESRI NOAA20 Combo, ESRI World Imagery, VIIRS SNPP (Temporal),
+    Aqua Modis (Temporal), Terra Modis (Temporal),
+    AMSR2 GCOM W1 Sea Ice Concentration (Temporal), MODIS Terra Chlorophyll A (Temporal),
+    GHRSST L4 MUR Sea Surface Temperature (Temporal), BMNG, Blue Marble Height (3D),
+    World Elevation (3D), Earth at Night 2012, Earth at Night Texture,
+    Earth at Night (Temporal), Coastlines, Reference Features, Reference Labels,
+    Tile Indicies, Size Reference, Gebco and Modis Water Mask.
+
+
+    Layers only loaded from the Utah server
+  ]],
+  Author = "OpenSpace Team",
+  URL = "http://openspaceproject.com",
+  License = "MIT license"
+}
diff --git a/data/assets/scene/solarsystem/planets/earth/moon/default_layers.asset b/data/assets/scene/solarsystem/planets/earth/moon/default_layers.asset
index 590c938ca1..23bcccc083 100644
--- a/data/assets/scene/solarsystem/planets/earth/moon/default_layers.asset
+++ b/data/assets/scene/solarsystem/planets/earth/moon/default_layers.asset
@@ -1,32 +1,18 @@
-asset.require("./layers/colorlayers/wac_utah", true)
-asset.require("./layers/colorlayers/wac_sweden", false)
-asset.require("./layers/colorlayers/wac_newyork", false)
-asset.require("./layers/colorlayers/clemuvvis_utah", false)
-asset.require("./layers/colorlayers/clemuvvis_sweden", false)
-asset.require("./layers/colorlayers/clemuvvis_newyork", false)
-asset.require("./layers/colorlayers/uvvishybrid_utah", false)
-asset.require("./layers/colorlayers/uvvishybrid_sweden", false)
-asset.require("./layers/colorlayers/uvvishybrid_newyork", false)
-asset.require("./layers/colorlayers/kaguya_utah", false)
-asset.require("./layers/colorlayers/kaguya_sweden", false)
-asset.require("./layers/colorlayers/kaguya_newyork", false)
-asset.require("./layers/colorlayers/lola_clr_shade_utah", false)
-asset.require("./layers/colorlayers/lola_clr_shade_sweden", false)
-asset.require("./layers/colorlayers/lola_clr_shade_newyork", false)
-asset.require("./layers/colorlayers/lola_shade_utah", false)
-asset.require("./layers/colorlayers/lola_shade_sweden", false)
-asset.require("./layers/colorlayers/lola_shade_newyork", false)
-
-asset.require("./layers/heightlayers/loladem_utah", true)
-asset.require("./layers/heightlayers/loladem_sweden", false)
-asset.require("./layers/heightlayers/loladem_newyork", false)
+asset.require("./layers/utah_layers", true)
+asset.require("./layers/sweden_layers", false)
+asset.require("./layers/newyork_layers", false)
 
 
 
 asset.meta = {
   Name = "Default Moon layers",
-  Version = "1.0",
-  Description = "This asset adds the default layers to the Moon globe",
+  Version = "1.1",
+  Description = [[Default Moon layers are: WAC, Clem Uvvis, Uvvis Hybrid, Kaguya,
+    LRO LOLA Color Shaded Relief 388m v4, Lola Shade, and Lola DEM (3D).
+
+
+    Layers loaded from all servers
+  ]],
   Author = "OpenSpace Team",
   URL = "http://openspaceproject.com",
   License = "MIT license"
diff --git a/data/assets/scene/solarsystem/planets/earth/moon/layers/newyork_layers.asset b/data/assets/scene/solarsystem/planets/earth/moon/layers/newyork_layers.asset
new file mode 100644
index 0000000000..fc56a47032
--- /dev/null
+++ b/data/assets/scene/solarsystem/planets/earth/moon/layers/newyork_layers.asset
@@ -0,0 +1,24 @@
+asset.require("./colorlayers/wac_newyork", asset.enabled)
+asset.require("./colorlayers/clemuvvis_newyork", false)
+asset.require("./colorlayers/uvvishybrid_newyork", false)
+asset.require("./colorlayers/kaguya_newyork", false)
+asset.require("./colorlayers/lola_clr_shade_newyork", false)
+asset.require("./colorlayers/lola_shade_newyork", false)
+
+asset.require("./heightlayers/loladem_newyork", asset.enabled)
+
+
+
+asset.meta = {
+  Name = "Default Moon layers (New York)",
+  Version = "1.0",
+  Description = [[Default Moon layers are: WAC, Clem Uvvis, Uvvis Hybrid, Kaguya,
+    LRO LOLA Color Shaded Relief 388m v4, Lola Shade, and Lola DEM (3D).
+
+
+    Layers only loaded from the New York server
+  ]],
+  Author = "OpenSpace Team",
+  URL = "http://openspaceproject.com",
+  License = "MIT license"
+}
diff --git a/data/assets/scene/solarsystem/planets/earth/moon/layers/sweden_layers.asset b/data/assets/scene/solarsystem/planets/earth/moon/layers/sweden_layers.asset
new file mode 100644
index 0000000000..5c63b86ff2
--- /dev/null
+++ b/data/assets/scene/solarsystem/planets/earth/moon/layers/sweden_layers.asset
@@ -0,0 +1,24 @@
+asset.require("./colorlayers/wac_sweden", asset.enabled)
+asset.require("./colorlayers/clemuvvis_sweden", false)
+asset.require("./colorlayers/uvvishybrid_sweden", false)
+asset.require("./colorlayers/kaguya_sweden", false)
+asset.require("./colorlayers/lola_clr_shade_sweden", false)
+asset.require("./colorlayers/lola_shade_sweden", false)
+
+asset.require("./heightlayers/loladem_sweden", asset.enabled)
+
+
+
+asset.meta = {
+  Name = "Default Moon layers (Sweden)",
+  Version = "1.0",
+  Description = [[Default Moon layers are: WAC, Clem Uvvis, Uvvis Hybrid, Kaguya,
+    LRO LOLA Color Shaded Relief 388m v4, Lola Shade, and Lola DEM (3D).
+
+
+    Layers only loaded from the Sweden server
+  ]],
+  Author = "OpenSpace Team",
+  URL = "http://openspaceproject.com",
+  License = "MIT license"
+}
diff --git a/data/assets/scene/solarsystem/planets/earth/moon/layers/utah_layers.asset b/data/assets/scene/solarsystem/planets/earth/moon/layers/utah_layers.asset
new file mode 100644
index 0000000000..a3a4e4768f
--- /dev/null
+++ b/data/assets/scene/solarsystem/planets/earth/moon/layers/utah_layers.asset
@@ -0,0 +1,24 @@
+asset.require("./colorlayers/wac_utah", asset.enabled)
+asset.require("./colorlayers/clemuvvis_utah", false)
+asset.require("./colorlayers/uvvishybrid_utah", false)
+asset.require("./colorlayers/kaguya_utah", false)
+asset.require("./colorlayers/lola_clr_shade_utah", false)
+asset.require("./colorlayers/lola_shade_utah", false)
+
+asset.require("./heightlayers/loladem_utah", asset.enabled)
+
+
+
+asset.meta = {
+  Name = "Default Moon layers (Utah)",
+  Version = "1.0",
+  Description = [[Default Moon layers are: WAC, Clem Uvvis, Uvvis Hybrid, Kaguya,
+    LRO LOLA Color Shaded Relief 388m v4, Lola Shade, and Lola DEM (3D).
+
+
+    Layers only loaded from the Utah server
+  ]],
+  Author = "OpenSpace Team",
+  URL = "http://openspaceproject.com",
+  License = "MIT license"
+}
diff --git a/data/assets/scene/solarsystem/planets/jupiter/europa/default_layers.asset b/data/assets/scene/solarsystem/planets/jupiter/europa/default_layers.asset
index 19438c0567..2913c56a2b 100644
--- a/data/assets/scene/solarsystem/planets/jupiter/europa/default_layers.asset
+++ b/data/assets/scene/solarsystem/planets/jupiter/europa/default_layers.asset
@@ -1,14 +1,18 @@
-asset.require("./layers/colorlayers/europa_texture", false)
-asset.require("./layers/colorlayers/voyager_global_mosaic_local", true)
-asset.require("./layers/colorlayers/voyager_global_mosaic_sweden", false)
-asset.require("./layers/colorlayers/voyager_global_mosaic_newyork", false)
+asset.require("./layers/base_layers", false)
+asset.require("./layers/local_layers", true)
+asset.require("./layers/sweden_layers", false)
+asset.require("./layers/newyork_layers", false)
 
 
 
 asset.meta = {
   Name = "Default Europa Layers",
-  Version = "1.1",
-  Description = "Default Europa layers are: Europa Texture",
+  Version = "1.2",
+  Description = [[Default Europa layers are: Europa Texture & Voyager Global Mosaic.
+
+
+    Layers loaded from all available servers
+  ]],
   Author = "OpenSpace Team",
   URL = "http://openspaceproject.com",
   License = "MIT license"
diff --git a/data/assets/scene/solarsystem/planets/jupiter/europa/layers/base_layers.asset b/data/assets/scene/solarsystem/planets/jupiter/europa/layers/base_layers.asset
new file mode 100644
index 0000000000..bfc02aca0a
--- /dev/null
+++ b/data/assets/scene/solarsystem/planets/jupiter/europa/layers/base_layers.asset
@@ -0,0 +1,12 @@
+asset.require("./colorlayers/europa_texture", false)
+
+
+
+asset.meta = {
+  Name = "Base Europa Layers",
+  Version = "1.0",
+  Description = "Base Europa layers are: Europa Texture",
+  Author = "OpenSpace Team",
+  URL = "http://openspaceproject.com",
+  License = "MIT license"
+}
diff --git a/data/assets/scene/solarsystem/planets/jupiter/europa/layers/local_layers.asset b/data/assets/scene/solarsystem/planets/jupiter/europa/layers/local_layers.asset
new file mode 100644
index 0000000000..906e0f74fd
--- /dev/null
+++ b/data/assets/scene/solarsystem/planets/jupiter/europa/layers/local_layers.asset
@@ -0,0 +1,17 @@
+asset.require("./base_layers", false)
+asset.require("./colorlayers/voyager_global_mosaic_local", asset.enabled)
+
+
+
+asset.meta = {
+  Name = "Default Europa Layers (Local)",
+  Version = "1.0",
+  Description = [[Default Europa layers are: Europa Texture & Voyager Global Mosaic.
+
+
+    Layers only loaded locally
+  ]],
+  Author = "OpenSpace Team",
+  URL = "http://openspaceproject.com",
+  License = "MIT license"
+}
diff --git a/data/assets/scene/solarsystem/planets/jupiter/europa/layers/newyork_layers.asset b/data/assets/scene/solarsystem/planets/jupiter/europa/layers/newyork_layers.asset
new file mode 100644
index 0000000000..091189c520
--- /dev/null
+++ b/data/assets/scene/solarsystem/planets/jupiter/europa/layers/newyork_layers.asset
@@ -0,0 +1,17 @@
+asset.require("./base_layers", false)
+asset.require("./colorlayers/voyager_global_mosaic_newyork", asset.enabled)
+
+
+
+asset.meta = {
+  Name = "Default Europa Layers (New York)",
+  Version = "1.0",
+  Description = [[Default Europa layers are: Europa Texture & Voyager Global Mosaic.
+
+
+    Layers only loaded from the New York server
+  ]],
+  Author = "OpenSpace Team",
+  URL = "http://openspaceproject.com",
+  License = "MIT license"
+}
diff --git a/data/assets/scene/solarsystem/planets/jupiter/europa/layers/sweden_layers.asset b/data/assets/scene/solarsystem/planets/jupiter/europa/layers/sweden_layers.asset
new file mode 100644
index 0000000000..1a7a661a93
--- /dev/null
+++ b/data/assets/scene/solarsystem/planets/jupiter/europa/layers/sweden_layers.asset
@@ -0,0 +1,17 @@
+asset.require("./base_layers", false)
+asset.require("./colorlayers/voyager_global_mosaic_sweden", asset.enabled)
+
+
+
+asset.meta = {
+  Name = "Default Europa Layers (Sweden)",
+  Version = "1.0",
+  Description = [[Default Europa layers are: Europa Texture & Voyager Global Mosaic.
+
+
+    Layers only loaded from the Sweden server
+  ]],
+  Author = "OpenSpace Team",
+  URL = "http://openspaceproject.com",
+  License = "MIT license"
+}
diff --git a/data/assets/scene/solarsystem/planets/mars/default_layers.asset b/data/assets/scene/solarsystem/planets/mars/default_layers.asset
index 564c87875c..96c0b8b135 100644
--- a/data/assets/scene/solarsystem/planets/mars/default_layers.asset
+++ b/data/assets/scene/solarsystem/planets/mars/default_layers.asset
@@ -1,45 +1,21 @@
-asset.require("./layers/colorlayers/mars_texture", false)
-asset.require("./layers/colorlayers/moc_wa_color_utah", true)
-asset.require("./layers/colorlayers/moc_wa_color_sweden", false)
-asset.require("./layers/colorlayers/moc_wa_color_newyork", false)
-asset.require("./layers/colorlayers/viking_mdim_utah", false)
-asset.require("./layers/colorlayers/viking_mdim_sweden", false)
-asset.require("./layers/colorlayers/viking_mdim_newyork", false)
-asset.require("./layers/colorlayers/mola_pseudo_color_utah", false)
-asset.require("./layers/colorlayers/mola_pseudo_color_sweden", false)
-asset.require("./layers/colorlayers/mola_pseudo_color_newyork", false)
-asset.require("./layers/colorlayers/mola_hrsc_utah", false)
-asset.require("./layers/colorlayers/mola_hrsc_sweden", false)
-asset.require("./layers/colorlayers/mola_hrsc_newyork", false)
-asset.require("./layers/colorlayers/themis_ir_day_utah", false)
-asset.require("./layers/colorlayers/themis_ir_day_sweden", false)
-asset.require("./layers/colorlayers/themis_ir_day_newyork", false)
-asset.require("./layers/colorlayers/themis_ir_night_utah", false)
-asset.require("./layers/colorlayers/themis_ir_night_sweden", false)
-asset.require("./layers/colorlayers/themis_ir_night_newyork", false)
-asset.require("./layers/colorlayers/ctx_mosaic_utah", false)
-asset.require("./layers/colorlayers/ctx_mosaic_sweden", false)
-asset.require("./layers/colorlayers/ctx_mosaic_newyork", false)
-asset.require("./layers/colorlayers/ctx_blended", false)
-asset.require("./layers/colorlayers/hirise", false)
-asset.require("./layers/colorlayers/hirisels", false)
-
-asset.require("./layers/heightlayers/mola_utah", false)
-asset.require("./layers/heightlayers/mola_sweden", false)
-asset.require("./layers/heightlayers/mdem200m", true)
-asset.require("./layers/heightlayers/hirisels", false)
-
-asset.require("./layers/overlays/indices", false)
-asset.require("./layers/overlays/size_reference", false)
+asset.require("./layers/base_layers", true)
+asset.require("./layers/utah_layers", true)
+asset.require("./layers/sweden_layers", false)
+asset.require("./layers/newyork_layers", false)
 
 
 
 asset.meta = {
   Name = "Default Mars Layers",
-  Version = "1.1",
-  Description = [[Default Mars layers are: MOC WA Color, Viking MDIM, MOLA Pseudo Color,
-    MOLA HRSC, Themis IR Day, Themis IR Night, CTX Mosaic, CTX Blended beta01, HiRISE, and
-    HiRISE Local Set]],
+  Version = "1.2",
+  Description = [[Default Mars layers are: Mars texture, CTX Blended, HiRISE,
+    HiRISE Local Set, MOC WA Color, Viking MDIM, MOLA Pseudo Color, MOLA HRSC,
+    Themis IR Day, Themis IR Night, CTX Mosaic, MDEM200M (3D), HiRISE Local Set DEM (3D),
+    Mola Elevation (3D), Tile Indicies, and Size Reference.
+
+
+    Layers loaded from all servers
+  ]],
   Author = "OpenSpace Team",
   URL = "http://openspaceproject.com",
   License = "MIT license"
diff --git a/data/assets/scene/solarsystem/planets/mars/layers/base_layers.asset b/data/assets/scene/solarsystem/planets/mars/layers/base_layers.asset
new file mode 100644
index 0000000000..6b017c3997
--- /dev/null
+++ b/data/assets/scene/solarsystem/planets/mars/layers/base_layers.asset
@@ -0,0 +1,24 @@
+asset.require("./colorlayers/mars_texture", false)
+asset.require("./colorlayers/ctx_blended", false)
+asset.require("./colorlayers/hirise", false)
+asset.require("./colorlayers/hirisels", false)
+
+asset.require("./heightlayers/mdem200m", asset.enabled)
+asset.require("./heightlayers/hirisels", false)
+
+asset.require("./overlays/indices", false)
+asset.require("./overlays/size_reference", false)
+
+
+
+asset.meta = {
+  Name = "Base Mars Layers",
+  Version = "1.0",
+  Description = [[Base Mars layers are: Mars texture, CTX Blended, HiRISE,
+    HiRISE Local Set, MDEM200M (3D), HiRISE Local Set DEM (3D), Tile Indicies,
+    and Size Reference.
+  ]],
+  Author = "OpenSpace Team",
+  URL = "http://openspaceproject.com",
+  License = "MIT license"
+}
diff --git a/data/assets/scene/solarsystem/planets/mars/layers/newyork_layers.asset b/data/assets/scene/solarsystem/planets/mars/layers/newyork_layers.asset
new file mode 100644
index 0000000000..9355ab2007
--- /dev/null
+++ b/data/assets/scene/solarsystem/planets/mars/layers/newyork_layers.asset
@@ -0,0 +1,29 @@
+asset.require("./base_layers", true)
+asset.require("./colorlayers/moc_wa_color_newyork", asset.enabled)
+asset.require("./colorlayers/viking_mdim_newyork", false)
+asset.require("./colorlayers/mola_pseudo_color_newyork", false)
+asset.require("./colorlayers/mola_hrsc_newyork", false)
+asset.require("./colorlayers/themis_ir_day_newyork", false)
+asset.require("./colorlayers/themis_ir_night_newyork", false)
+asset.require("./colorlayers/ctx_mosaic_newyork", false)
+
+-- The New York server does not have this map, use the Utah server for now
+asset.require("./heightlayers/mola_utah", false)
+
+
+
+asset.meta = {
+  Name = "Default Mars Layers (New York)",
+  Version = "1.0",
+  Description = [[Default Mars layers are: Mars texture, CTX Blended, HiRISE,
+    HiRISE Local Set, MOC WA Color, Viking MDIM, MOLA Pseudo Color, MOLA HRSC,
+    Themis IR Day, Themis IR Night, CTX Mosaic, MDEM200M (3D), HiRISE Local Set DEM (3D),
+    Mola Elevation (3D), Tile Indicies, and Size Reference.
+
+
+    Layers only loaded from the New York server
+  ]],
+  Author = "OpenSpace Team",
+  URL = "http://openspaceproject.com",
+  License = "MIT license"
+}
diff --git a/data/assets/scene/solarsystem/planets/mars/layers/sweden_layers.asset b/data/assets/scene/solarsystem/planets/mars/layers/sweden_layers.asset
new file mode 100644
index 0000000000..50885a04dd
--- /dev/null
+++ b/data/assets/scene/solarsystem/planets/mars/layers/sweden_layers.asset
@@ -0,0 +1,28 @@
+asset.require("./base_layers", true)
+asset.require("./colorlayers/moc_wa_color_sweden", asset.enabled)
+asset.require("./colorlayers/viking_mdim_sweden", false)
+asset.require("./colorlayers/mola_pseudo_color_sweden", false)
+asset.require("./colorlayers/mola_hrsc_sweden", false)
+asset.require("./colorlayers/themis_ir_day_sweden", false)
+asset.require("./colorlayers/themis_ir_night_sweden", false)
+asset.require("./colorlayers/ctx_mosaic_sweden", false)
+
+asset.require("./heightlayers/mola_sweden", false)
+
+
+
+asset.meta = {
+  Name = "Default Mars Layers (Sweden)",
+  Version = "1.0",
+  Description = [[Default Mars layers are: Mars texture, CTX Blended, HiRISE,
+    HiRISE Local Set, MOC WA Color, Viking MDIM, MOLA Pseudo Color, MOLA HRSC,
+    Themis IR Day, Themis IR Night, CTX Mosaic, MDEM200M (3D), HiRISE Local Set DEM (3D),
+    Mola Elevation (3D), Tile Indicies, and Size Reference.
+
+
+    Layers only loaded from the Sweden server
+  ]],
+  Author = "OpenSpace Team",
+  URL = "http://openspaceproject.com",
+  License = "MIT license"
+}
diff --git a/data/assets/scene/solarsystem/planets/mars/layers/utah_layers.asset b/data/assets/scene/solarsystem/planets/mars/layers/utah_layers.asset
new file mode 100644
index 0000000000..83d15a6a1c
--- /dev/null
+++ b/data/assets/scene/solarsystem/planets/mars/layers/utah_layers.asset
@@ -0,0 +1,28 @@
+asset.require("./base_layers", true)
+asset.require("./colorlayers/moc_wa_color_utah", asset.enabled)
+asset.require("./colorlayers/viking_mdim_utah", false)
+asset.require("./colorlayers/mola_pseudo_color_utah", false)
+asset.require("./colorlayers/mola_hrsc_utah", false)
+asset.require("./colorlayers/themis_ir_day_utah", false)
+asset.require("./colorlayers/themis_ir_night_utah", false)
+asset.require("./colorlayers/ctx_mosaic_utah", false)
+
+asset.require("./heightlayers/mola_utah", false)
+
+
+
+asset.meta = {
+  Name = "Default Mars Layers (Utah)",
+  Version = "1.0",
+  Description = [[Default Mars layers are: Mars texture, CTX Blended, HiRISE,
+    HiRISE Local Set, MOC WA Color, Viking MDIM, MOLA Pseudo Color, MOLA HRSC,
+    Themis IR Day, Themis IR Night, CTX Mosaic, MDEM200M (3D), HiRISE Local Set DEM (3D),
+    Mola Elevation (3D), Tile Indicies, and Size Reference.
+
+
+    Layers only loaded from the Utah server
+  ]],
+  Author = "OpenSpace Team",
+  URL = "http://openspaceproject.com",
+  License = "MIT license"
+}
diff --git a/data/assets/scene/solarsystem/planets/mercury/default_layers.asset b/data/assets/scene/solarsystem/planets/mercury/default_layers.asset
index 30aaccf7b7..e50d077b08 100644
--- a/data/assets/scene/solarsystem/planets/mercury/default_layers.asset
+++ b/data/assets/scene/solarsystem/planets/mercury/default_layers.asset
@@ -1,56 +1,21 @@
-asset.require("./layers/colorlayers/messenger_mdis_utah", false)
-asset.require("./layers/colorlayers/messenger_mdis_sweden", false)
-asset.require("./layers/colorlayers/messenger_mdis_newyork", false)
-
-asset.require("./layers/colorlayers/messenger_mosaic_utah", false)
-asset.require("./layers/colorlayers/messenger_mosaic_sweden", false)
-asset.require("./layers/colorlayers/messenger_mosaic_newyork", false)
-
-asset.require("./layers/colorlayers/messenger_mosaic2_utah", false)
-asset.require("./layers/colorlayers/messenger_mosaic2_sweden", false)
-asset.require("./layers/colorlayers/messenger_mosaic2_newyork", false)
-
-asset.require("./layers/colorlayers/messenger_bdr_utah", true)
-asset.require("./layers/colorlayers/messenger_bdr_sweden", false)
-asset.require("./layers/colorlayers/messenger_bdr_newyork", false)
-
-asset.require("./layers/colorlayers/messenger_mdr_utah", false)
-
-asset.require("./layers/colorlayers/messenger_mp3_utah", false)
-
-asset.require("./layers/colorlayers/messenger_hie_utah", false)
-asset.require("./layers/colorlayers/messenger_hie_sweden", false)
-asset.require("./layers/colorlayers/messenger_hie_newyork", false)
-
-asset.require("./layers/colorlayers/messenger_hiw_utah", false)
-asset.require("./layers/colorlayers/messenger_hiw_sweden", false)
-asset.require("./layers/colorlayers/messenger_hiw_newyork", false)
-
-asset.require("./layers/colorlayers/messenger_loi_utah", false)
-asset.require("./layers/colorlayers/messenger_loi_sweden", false)
-asset.require("./layers/colorlayers/messenger_loi_newyork", false)
-
-asset.require("./layers/colorlayers/messenger_shade_utah", false)
-asset.require("./layers/colorlayers/messenger_shade_sweden", false)
-asset.require("./layers/colorlayers/messenger_shade_newyork", false)
-
-asset.require("./layers/colorlayers/alsimap_02122015", false)
-asset.require("./layers/colorlayers/casimap_02122015", false)
-asset.require("./layers/colorlayers/fesimap_02122015", false)
-asset.require("./layers/colorlayers/mgsimap_02122015", false)
-asset.require("./layers/colorlayers/ssimap_02122015", false)
-
-asset.require("./layers/heightlayers/messenger_dem_utah", true)
+asset.require("./layers/base_layers", true)
+asset.require("./layers/utah_layers", true)
+asset.require("./layers/sweden_layers", false)
+asset.require("./layers/newyork_layers", false)
 
 
 
 asset.meta = {
   Name = "Default Mercury Layers",
-  Version = "1.0",
-  Description = [[Default Mercury layers are: Messenger MDIS, Messenger Mosaic2,
-    Messenger BDR, Messenger MDR, Messenger MP3, Messenger Hie, Messenger Hiw,
-    Messenger LOI, Messenger SHADE, Aluminum Abundance, Calcium Abundance, Iron
-    Abundance, Magnesium Abundance, and Silicon Abundance]],
+  Version = "1.1",
+  Description = [[Default Mercury layers are: Aluminium Abundance, Calcium Abundance,
+    Iron Abundance, Magnesium Abundance, Silicon Abundance, Messenger MDIS,
+    Messenger Mosaic, Messenger Mosaic2, Messenger BDR, Messenger HIE, Messenger HIW,
+    Messenger LOI, Messenger SHADE, Messenger MDR, Messenger MP3, and Messenger DEM (3D).
+
+
+    Layers loaded from all servers
+  ]],
   Author = "OpenSpace Team",
   URL = "http://openspaceproject.com",
   License = "MIT license"
diff --git a/data/assets/scene/solarsystem/planets/mercury/layers/base_layers.asset b/data/assets/scene/solarsystem/planets/mercury/layers/base_layers.asset
new file mode 100644
index 0000000000..4842464e01
--- /dev/null
+++ b/data/assets/scene/solarsystem/planets/mercury/layers/base_layers.asset
@@ -0,0 +1,21 @@
+asset.require("./colorlayers/alsimap_02122015", false)
+asset.require("./colorlayers/casimap_02122015", false)
+asset.require("./colorlayers/fesimap_02122015", false)
+asset.require("./colorlayers/mgsimap_02122015", false)
+asset.require("./colorlayers/ssimap_02122015", false)
+
+-- Only the Utah server have this map, use it for now
+asset.require("./heightlayers/messenger_dem_utah", asset.enabled)
+
+
+
+asset.meta = {
+  Name = "Base Mercury Layers",
+  Version = "1.0",
+  Description = [[Base Mercury layers are: Aluminium Abundance, Calcium Abundance,
+    Iron Abundance, Magnesium Abundance, Silicon Abundance, and Messenger DEM (3D).
+  ]],
+  Author = "OpenSpace Team",
+  URL = "http://openspaceproject.com",
+  License = "MIT license"
+}
diff --git a/data/assets/scene/solarsystem/planets/mercury/layers/newyork_layers.asset b/data/assets/scene/solarsystem/planets/mercury/layers/newyork_layers.asset
new file mode 100644
index 0000000000..5162b6ac47
--- /dev/null
+++ b/data/assets/scene/solarsystem/planets/mercury/layers/newyork_layers.asset
@@ -0,0 +1,31 @@
+asset.require("./base_layers", true)
+asset.require("./colorlayers/messenger_mdis_newyork", false)
+asset.require("./colorlayers/messenger_mosaic_newyork", false)
+asset.require("./colorlayers/messenger_mosaic2_newyork", false)
+asset.require("./colorlayers/messenger_bdr_newyork", asset.enabled)
+asset.require("./colorlayers/messenger_hie_newyork", false)
+asset.require("./colorlayers/messenger_hiw_newyork", false)
+asset.require("./colorlayers/messenger_loi_newyork", false)
+asset.require("./colorlayers/messenger_shade_newyork", false)
+
+-- The New York server does not have these maps, use the Utah server for now
+asset.require("./colorlayers/messenger_mdr_utah", false)
+asset.require("./colorlayers/messenger_mp3_utah", false)
+
+
+
+asset.meta = {
+  Name = "Default Mercury Layers (New York)",
+  Version = "1.0",
+  Description = [[Default Mercury layers are: Aluminium Abundance, Calcium Abundance,
+    Iron Abundance, Magnesium Abundance, Silicon Abundance, Messenger MDIS,
+    Messenger Mosaic, Messenger Mosaic2, Messenger BDR, Messenger HIE, Messenger HIW,
+    Messenger LOI, Messenger SHADE, Messenger MDR, Messenger MP3, and Messenger DEM (3D).
+
+
+    Layers only loaded from the New York server
+  ]],
+  Author = "OpenSpace Team",
+  URL = "http://openspaceproject.com",
+  License = "MIT license"
+}
diff --git a/data/assets/scene/solarsystem/planets/mercury/layers/sweden_layers.asset b/data/assets/scene/solarsystem/planets/mercury/layers/sweden_layers.asset
new file mode 100644
index 0000000000..20aeff7e71
--- /dev/null
+++ b/data/assets/scene/solarsystem/planets/mercury/layers/sweden_layers.asset
@@ -0,0 +1,31 @@
+asset.require("./base_layers", true)
+asset.require("./colorlayers/messenger_mdis_sweden", false)
+asset.require("./colorlayers/messenger_mosaic_sweden", false)
+asset.require("./colorlayers/messenger_mosaic2_sweden", false)
+asset.require("./colorlayers/messenger_bdr_sweden", asset.enabled)
+asset.require("./colorlayers/messenger_hie_sweden", false)
+asset.require("./colorlayers/messenger_hiw_sweden", false)
+asset.require("./colorlayers/messenger_loi_sweden", false)
+asset.require("./colorlayers/messenger_shade_sweden", false)
+
+-- The Sweden server does not have these maps, use the Utah server for now
+asset.require("./colorlayers/messenger_mdr_utah", false)
+asset.require("./colorlayers/messenger_mp3_utah", false)
+
+
+
+asset.meta = {
+  Name = "Default Mercury Layers (Sweden)",
+  Version = "1.0",
+  Description = [[Default Mercury layers are: Aluminium Abundance, Calcium Abundance,
+    Iron Abundance, Magnesium Abundance, Silicon Abundance, Messenger MDIS,
+    Messenger Mosaic, Messenger Mosaic2, Messenger BDR, Messenger HIE, Messenger HIW,
+    Messenger LOI, Messenger SHADE, Messenger MDR, Messenger MP3, and Messenger DEM (3D).
+
+
+    Layers only loaded from the Sweden server
+  ]],
+  Author = "OpenSpace Team",
+  URL = "http://openspaceproject.com",
+  License = "MIT license"
+}
diff --git a/data/assets/scene/solarsystem/planets/mercury/layers/utah_layers.asset b/data/assets/scene/solarsystem/planets/mercury/layers/utah_layers.asset
new file mode 100644
index 0000000000..cf1f301309
--- /dev/null
+++ b/data/assets/scene/solarsystem/planets/mercury/layers/utah_layers.asset
@@ -0,0 +1,29 @@
+asset.require("./base_layers", true)
+asset.require("./colorlayers/messenger_mdis_utah", false)
+asset.require("./colorlayers/messenger_mosaic_utah", false)
+asset.require("./colorlayers/messenger_mosaic2_utah", false)
+asset.require("./colorlayers/messenger_bdr_utah", asset.enabled)
+asset.require("./colorlayers/messenger_hie_utah", false)
+asset.require("./colorlayers/messenger_hiw_utah", false)
+asset.require("./colorlayers/messenger_loi_utah", false)
+asset.require("./colorlayers/messenger_shade_utah", false)
+asset.require("./colorlayers/messenger_mdr_utah", false)
+asset.require("./colorlayers/messenger_mp3_utah", false)
+
+
+
+asset.meta = {
+  Name = "Default Mercury Layers (Utah)",
+  Version = "1.0",
+  Description = [[Default Mercury layers are: Aluminium Abundance, Calcium Abundance,
+    Iron Abundance, Magnesium Abundance, Silicon Abundance, Messenger MDIS,
+    Messenger Mosaic, Messenger Mosaic2, Messenger BDR, Messenger HIE, Messenger HIW,
+    Messenger LOI, Messenger SHADE, Messenger MDR, Messenger MP3, and Messenger DEM (3D).
+
+
+    Layers only loaded from the Utah server
+  ]],
+  Author = "OpenSpace Team",
+  URL = "http://openspaceproject.com",
+  License = "MIT license"
+}
diff --git a/data/assets/scene/solarsystem/planets/newyork_layers.asset b/data/assets/scene/solarsystem/planets/newyork_layers.asset
new file mode 100644
index 0000000000..66f41604be
--- /dev/null
+++ b/data/assets/scene/solarsystem/planets/newyork_layers.asset
@@ -0,0 +1,25 @@
+asset.require("./base_layers")
+
+asset.require("./earth/layers/newyork_layers")
+asset.require("./earth/moon/layers/newyork_layers")
+asset.require("./jupiter/europa/layers/newyork_layers")
+asset.require("./mars/layers/newyork_layers")
+asset.require("./mercury/layers/newyork_layers")
+asset.require("./saturn/enceladus/layers/newyork_layers")
+asset.require("./venus/layers/newyork_layers")
+
+
+
+asset.meta = {
+  Name = "Default Solar System Layers (New York)",
+  Version = "1.0",
+  Description = [[Adds default layers for all planets. Remove this asset and include
+    individual layers for planets to customize planet layers
+
+
+    Layers only loaded from the New York server
+  ]],
+  Author = "OpenSpace Team",
+  URL = "http://openspaceproject.com",
+  License = "MIT license"
+}
diff --git a/data/assets/scene/solarsystem/planets/saturn/enceladus/default_layers.asset b/data/assets/scene/solarsystem/planets/saturn/enceladus/default_layers.asset
index 2d36fe9a58..fe7fbadcc1 100644
--- a/data/assets/scene/solarsystem/planets/saturn/enceladus/default_layers.asset
+++ b/data/assets/scene/solarsystem/planets/saturn/enceladus/default_layers.asset
@@ -1,14 +1,18 @@
-asset.require("./layers/colorlayers/enceladus_texture", false)
-asset.require("./layers/colorlayers/global_mosaic_100m_hpf_sweden", false)
-asset.require("./layers/colorlayers/global_mosaic_100m_hpf_newyork", true)
+asset.require("./layers/base_layers", false)
+asset.require("./layers/sweden_layers", false)
+asset.require("./layers/newyork_layers", true)
 
 
 
 asset.meta = {
   Name = "Default Enceladus Layers",
-  Version = "1.0",
-  Description = [[Default Enceladus layers are: Enceladus Texture and Cassini Global
-    Mosaic 100m HPF]],
+  Version = "1.1",
+  Description = [[Default Enceladus layers are: Enceladus Texture,
+    and Cassini Global Mosaic 100m HPF.
+
+
+    Layers loaded from all available servers
+  ]],
   Author = "OpenSpace Team",
   URL = "http://openspaceproject.com",
   License = "MIT license"
diff --git a/data/assets/scene/solarsystem/planets/saturn/enceladus/layers/base_layers.asset b/data/assets/scene/solarsystem/planets/saturn/enceladus/layers/base_layers.asset
new file mode 100644
index 0000000000..0385f2b6c3
--- /dev/null
+++ b/data/assets/scene/solarsystem/planets/saturn/enceladus/layers/base_layers.asset
@@ -0,0 +1,12 @@
+asset.require("./colorlayers/enceladus_texture", false)
+
+
+
+asset.meta = {
+  Name = "Base Enceladus Layers",
+  Version = "1.0",
+  Description = "Base Enceladus layers are: Enceladus Texture",
+  Author = "OpenSpace Team",
+  URL = "http://openspaceproject.com",
+  License = "MIT license"
+}
diff --git a/data/assets/scene/solarsystem/planets/saturn/enceladus/layers/newyork_layers.asset b/data/assets/scene/solarsystem/planets/saturn/enceladus/layers/newyork_layers.asset
new file mode 100644
index 0000000000..11baca14c5
--- /dev/null
+++ b/data/assets/scene/solarsystem/planets/saturn/enceladus/layers/newyork_layers.asset
@@ -0,0 +1,18 @@
+asset.require("./base_layers", false)
+asset.require("./colorlayers/global_mosaic_100m_hpf_newyork", asset.enabled)
+
+
+
+asset.meta = {
+  Name = "Default Enceladus Layers (New York)",
+  Version = "1.0",
+  Description = [[Default Enceladus layers are: Enceladus Texture,
+    and Cassini Global Mosaic 100m HPF.
+
+
+    Layers only loaded from the New York server
+  ]],
+  Author = "OpenSpace Team",
+  URL = "http://openspaceproject.com",
+  License = "MIT license"
+}
diff --git a/data/assets/scene/solarsystem/planets/saturn/enceladus/layers/sweden_layers.asset b/data/assets/scene/solarsystem/planets/saturn/enceladus/layers/sweden_layers.asset
new file mode 100644
index 0000000000..3908e58697
--- /dev/null
+++ b/data/assets/scene/solarsystem/planets/saturn/enceladus/layers/sweden_layers.asset
@@ -0,0 +1,18 @@
+asset.require("./base_layers", false)
+asset.require("./colorlayers/global_mosaic_100m_hpf_sweden", asset.enabled)
+
+
+
+asset.meta = {
+  Name = "Default Enceladus Layers (Sweden)",
+  Version = "1.0",
+  Description = [[Default Enceladus layers are: Enceladus Texture,
+    and Cassini Global Mosaic 100m HPF.
+
+
+    Layers only loaded from the Sweden server
+  ]],
+  Author = "OpenSpace Team",
+  URL = "http://openspaceproject.com",
+  License = "MIT license"
+}
diff --git a/data/assets/scene/solarsystem/planets/sweden_layers.asset b/data/assets/scene/solarsystem/planets/sweden_layers.asset
new file mode 100644
index 0000000000..bc8f51ad6a
--- /dev/null
+++ b/data/assets/scene/solarsystem/planets/sweden_layers.asset
@@ -0,0 +1,27 @@
+asset.require("./base_layers")
+
+asset.require("./earth/layers/sweden_layers")
+asset.require("./earth/moon/layers/sweden_layers")
+asset.require("./jupiter/europa/layers/sweden_layers")
+asset.require("./mars/layers/sweden_layers")
+asset.require("./mercury/layers/sweden_layers")
+asset.require("./saturn/enceladus/layers/sweden_layers")
+
+-- The Sweden server does not have these layers, use the New York server for now
+asset.require("./venus/layers/newyork_layers")
+
+
+
+asset.meta = {
+  Name = "Default Solar System Layers (Sweden)",
+  Version = "1.0",
+  Description = [[Adds default layers for all planets. Remove this asset and include
+    individual layers for planets to customize planet layers
+
+
+    Layers only loaded from the Sweden server
+  ]],
+  Author = "OpenSpace Team",
+  URL = "http://openspaceproject.com",
+  License = "MIT license"
+}
diff --git a/data/assets/scene/solarsystem/planets/utah_layers.asset b/data/assets/scene/solarsystem/planets/utah_layers.asset
new file mode 100644
index 0000000000..95b51f16e3
--- /dev/null
+++ b/data/assets/scene/solarsystem/planets/utah_layers.asset
@@ -0,0 +1,27 @@
+asset.require("./base_layers")
+
+asset.require("./earth/layers/utah_layers")
+asset.require("./earth/moon/layers/utah_layers")
+asset.require("./mars/layers/utah_layers")
+asset.require("./mercury/layers/utah_layers")
+asset.require("./venus/layers/utah_layers")
+
+-- The Utah server does not have these layers, use the New York server for now
+asset.require("./jupiter/europa/layers/newyork_layers")
+asset.require("./saturn/enceladus/layers/newyork_layers")
+
+
+
+asset.meta = {
+  Name = "Default Solar System Layers (Utah)",
+  Version = "1.0",
+  Description = [[Adds default layers for all planets. Remove this asset and include
+    individual layers for planets to customize planet layers
+
+
+    Layers only loaded from the Utah server
+  ]],
+  Author = "OpenSpace Team",
+  URL = "http://openspaceproject.com",
+  License = "MIT license"
+}
diff --git a/data/assets/scene/solarsystem/planets/venus/default_layers.asset b/data/assets/scene/solarsystem/planets/venus/default_layers.asset
index 957149d5a2..4347bbf910 100644
--- a/data/assets/scene/solarsystem/planets/venus/default_layers.asset
+++ b/data/assets/scene/solarsystem/planets/venus/default_layers.asset
@@ -1,18 +1,18 @@
-asset.require("./layers/colorlayers/magellan_mosaic_utah", false)
-asset.require("./layers/colorlayers/magellan_mosaic_newyork", false)
-asset.require("./layers/colorlayers/venus_texture", false)
-asset.require("./layers/colorlayers/clouds_magellan_combo", true)
-asset.require("./layers/colorlayers/clouds_magellan_combo_newyork", false)
-
-asset.require("./layers/heightlayers/magellan_utah", true)
-asset.require("./layers/heightlayers/magellan_newyork", false)
+asset.require("./layers/base_layers", false)
+asset.require("./layers/newyork_layers", false)
+asset.require("./layers/utah_layers", true)
 
 
 
 asset.meta = {
   Name = "Default Venus Layers",
-  Version = "1.1",
-  Description = "Default Venus layers are: Venus Magellan Mosaic and Venus Magellan DEM",
+  Version = "1.2",
+  Description = [[Default Venus layers are: Venus Texture, Magellan Mosaic,
+    Clouds Magellan Combo, and Magellan Elevation (3D).
+
+
+    Layers loaded from all available servers
+  ]],
   Author = "OpenSpace Team",
   URL = "http://openspaceproject.com",
   License = "MIT license"
diff --git a/data/assets/scene/solarsystem/planets/venus/layers/base_layers.asset b/data/assets/scene/solarsystem/planets/venus/layers/base_layers.asset
new file mode 100644
index 0000000000..312ac584d8
--- /dev/null
+++ b/data/assets/scene/solarsystem/planets/venus/layers/base_layers.asset
@@ -0,0 +1,12 @@
+asset.require("./colorlayers/venus_texture", false)
+
+
+
+asset.meta = {
+  Name = "Base Venus Layers",
+  Version = "1.0",
+  Description = "Base Venus layers are: Venus Texture",
+  Author = "OpenSpace Team",
+  URL = "http://openspaceproject.com",
+  License = "MIT license"
+}
diff --git a/data/assets/scene/solarsystem/planets/venus/layers/colorlayers/clouds_magellan_combo.asset b/data/assets/scene/solarsystem/planets/venus/layers/colorlayers/clouds_magellan_combo_utah.asset
similarity index 92%
rename from data/assets/scene/solarsystem/planets/venus/layers/colorlayers/clouds_magellan_combo.asset
rename to data/assets/scene/solarsystem/planets/venus/layers/colorlayers/clouds_magellan_combo_utah.asset
index 2086f4ee46..f2b4efdc1b 100644
--- a/data/assets/scene/solarsystem/planets/venus/layers/colorlayers/clouds_magellan_combo.asset
+++ b/data/assets/scene/solarsystem/planets/venus/layers/colorlayers/clouds_magellan_combo_utah.asset
@@ -11,8 +11,8 @@ local texturesPath = asset.resource({
 
 
 local Layer = {
-  Identifier = "Clouds_Magellan_Combo",
-  Name = "Clouds Magellan Combo",
+  Identifier = "Clouds_Magellan_Combo_Utah",
+  Name = "Clouds Magellan Combo [Utah]",
   Enabled = asset.enabled,
   Type = "TileProviderByLevel",
   LevelTileProviders = {
diff --git a/data/assets/scene/solarsystem/planets/venus/layers/newyork_layers.asset b/data/assets/scene/solarsystem/planets/venus/layers/newyork_layers.asset
new file mode 100644
index 0000000000..45464d42a3
--- /dev/null
+++ b/data/assets/scene/solarsystem/planets/venus/layers/newyork_layers.asset
@@ -0,0 +1,21 @@
+asset.require("./base_layers", false)
+asset.require("./colorlayers/magellan_mosaic_newyork", false)
+asset.require("./colorlayers/clouds_magellan_combo_newyork", asset.enabled)
+
+asset.require("./heightlayers/magellan_newyork", asset.enabled)
+
+
+
+asset.meta = {
+  Name = "Default Venus Layers (New York)",
+  Version = "1.0",
+  Description = [[Default Venus layers are: Venus Texture, Magellan Mosaic,
+    Clouds Magellan Combo, and Magellan Elevation (3D).
+
+
+    Layers only loaded from the New York server
+  ]],
+  Author = "OpenSpace Team",
+  URL = "http://openspaceproject.com",
+  License = "MIT license"
+}
diff --git a/data/assets/scene/solarsystem/planets/venus/layers/utah_layers.asset b/data/assets/scene/solarsystem/planets/venus/layers/utah_layers.asset
new file mode 100644
index 0000000000..4c00a6e01d
--- /dev/null
+++ b/data/assets/scene/solarsystem/planets/venus/layers/utah_layers.asset
@@ -0,0 +1,21 @@
+asset.require("./base_layers", false)
+asset.require("./colorlayers/magellan_mosaic_utah", false)
+asset.require("./colorlayers/clouds_magellan_combo_utah", asset.enabled)
+
+asset.require("./heightlayers/magellan_utah", asset.enabled)
+
+
+
+asset.meta = {
+  Name = "Default Venus Layers (Utah)",
+  Version = "1.0",
+  Description = [[Default Venus layers are: Venus Texture, Magellan Mosaic,
+    Clouds Magellan Combo, and Magellan Elevation (3D).
+
+
+    Layers only loaded from the Utah server
+  ]],
+  Author = "OpenSpace Team",
+  URL = "http://openspaceproject.com",
+  License = "MIT license"
+}
diff --git a/include/openspace/engine/configuration.h b/include/openspace/engine/configuration.h
index 9d7a64c433..b6174030bf 100644
--- a/include/openspace/engine/configuration.h
+++ b/include/openspace/engine/configuration.h
@@ -45,6 +45,8 @@ struct Configuration {
     Configuration& operator=(const Configuration&) = delete;
     Configuration& operator=(Configuration&&) = default;
 
+    ghoul::Dictionary createDictionary();
+
     std::string windowConfiguration = "${CONFIG}/single.xml";
     std::string asset;
     std::string profile;
@@ -112,6 +114,15 @@ struct Configuration {
     bool isConsoleDisabled = false;
     bool bypassLauncher = false;
 
+    enum LayerServer {
+        All = 0,
+        NewYork,
+        Sweden,
+        Utah,
+        None
+    };
+    LayerServer layerServer = LayerServer::All;
+
     std::map<std::string, ghoul::Dictionary> moduleConfigurations;
 
     struct OpenGLDebugContext {
@@ -151,6 +162,9 @@ Configuration loadConfigurationFromFile(const std::filesystem::path& configurati
     const std::filesystem::path& settingsFile,
     const glm::ivec2& primaryMonitorResolution);
 
+Configuration::LayerServer stringToLayerServer(std::string_view server);
+std::string layerServerToString(Configuration::LayerServer server);
+
 } // namespace openspace
 
 #endif // __OPENSPACE_CORE___CONFIGURATION___H__
diff --git a/include/openspace/engine/settings.h b/include/openspace/engine/settings.h
index c43178def4..7ccaee7d11 100644
--- a/include/openspace/engine/settings.h
+++ b/include/openspace/engine/settings.h
@@ -25,6 +25,7 @@
 #ifndef __OPENSPACE_CORE___SETTINGS___H__
 #define __OPENSPACE_CORE___SETTINGS___H__
 
+#include <openspace/engine/configuration.h>
 #include <openspace/properties/property.h>
 #include <filesystem>
 #include <optional>
@@ -42,6 +43,7 @@ struct Settings {
     std::optional<bool> rememberLastProfile;
     std::optional<properties::Property::Visibility> visibility;
     std::optional<bool> bypassLauncher;
+    std::optional<Configuration::LayerServer> layerServer;
 
     struct MRF {
         auto operator<=>(const MRF&) const = default;
diff --git a/openspace.cfg b/openspace.cfg
index 987762dc5f..28ef256f33 100644
--- a/openspace.cfg
+++ b/openspace.cfg
@@ -228,6 +228,12 @@ ShutdownCountdown = 3
 ScreenshotUseDate = true
 BypassLauncher = false
 
+LayerServer = "All"
+-- LayerServer = "NewYork"
+-- LayerServer = "Sweden"
+-- LayerServer = "Utah"
+-- LayerServer = "None"
+
 -- OnScreenTextScaling = "framebuffer"
 -- PerProfileCache = true
 -- DisableRenderingOnMaster = true
diff --git a/src/engine/configuration.cpp b/src/engine/configuration.cpp
index d33f041821..cdec76b78b 100644
--- a/src/engine/configuration.cpp
+++ b/src/engine/configuration.cpp
@@ -283,6 +283,11 @@ namespace {
         // multiprojector setups where a launcher window would be undesired
         std::optional<bool> bypassLauncher;
 
+        // Set which layer server should be preferd to be used, the options are
+        // \"All\", \"NewYork\", \"Sweden\", \"Utah\" and \"None\".
+        std::optional<std::string> layerServer [[codegen::inlist("All", "NewYork",
+            "Sweden", "Utah", "None")]];
+
         // The URL that is pinged to check which version of OpenSpace is the most current
         // if you don't want this request to happen, this value should not be set at all
         std::optional<std::string> versionCheckUrl;
@@ -313,6 +318,152 @@ namespace {
 
 namespace openspace {
 
+ghoul::Dictionary Configuration::createDictionary() {
+    ghoul::Dictionary res;
+
+    res.setValue("WindowConfiguration", windowConfiguration);
+    res.setValue("Asset", asset);
+    res.setValue("Profile", profile);
+    res.setValue("PropertyVisibility", static_cast<int>(propertyVisibility));
+
+    ghoul::Dictionary globalCustomizationScriptsDict;
+    for (size_t i = 0; i < globalCustomizationScripts.size(); ++i) {
+        globalCustomizationScriptsDict.setValue(
+            std::to_string(i),
+            globalCustomizationScripts[i]
+        );
+    }
+    res.setValue("GlobalCustomizationScripts", globalCustomizationScriptsDict);
+
+    ghoul::Dictionary fontsDict;
+    for (auto it = fonts.begin(); it != fonts.end(); ++it) {
+        fontsDict.setValue(it->first, it->second);
+    }
+    res.setValue("Fonts", fontsDict);
+
+    {
+        ghoul::Dictionary fontSizeDict;
+        fontSizeDict.setValue("FrameInfo", static_cast<double>(fontSize.frameInfo));
+        fontSizeDict.setValue("Shutdown", static_cast<double>(fontSize.shutdown));
+        fontSizeDict.setValue("Log", static_cast<double>(fontSize.log));
+        fontSizeDict.setValue("CameraInfo", static_cast<double>(fontSize.cameraInfo));
+        fontSizeDict.setValue("VersionInfo", static_cast<double>(fontSize.versionInfo));
+
+        res.setValue("FontSize", fontSizeDict);
+    }
+
+    {
+        ghoul::Dictionary loggingDict;
+        loggingDict.setValue("Level", logging.level);
+        loggingDict.setValue("ForceImmediateFlush", logging.forceImmediateFlush);
+        loggingDict.setValue("CapabilitiesVerbosity", logging.capabilitiesVerbosity);
+
+        ghoul::Dictionary logsDict;
+        for (size_t i = 0; i < logging.logs.size(); ++i) {
+            logsDict.setValue(std::to_string(i), logging.logs[i]);
+        }
+        loggingDict.setValue("Logs", logsDict);
+
+        res.setValue("Logging", loggingDict);
+    }
+
+    res.setValue("ScriptLog", scriptLog);
+
+    {
+        ghoul::Dictionary documentationDict;
+        documentationDict.setValue("Path", documentation.path);
+
+        res.setValue("Documentation", documentationDict);
+    }
+
+    res.setValue("VersionCheckUrl", versionCheckUrl);
+    res.setValue("UseMultithreadedInitialization", useMultithreadedInitialization);
+
+    {
+        ghoul::Dictionary loadingScreenDict;
+        loadingScreenDict.setValue("IsShowingMessages", loadingScreen.isShowingMessages);
+        loadingScreenDict.setValue("IsShowingNodeNames", loadingScreen.isShowingNodeNames);
+        loadingScreenDict.setValue(
+            "IsShowingLogMessages",
+            loadingScreen.isShowingLogMessages
+        );
+
+        res.setValue("LoadingScreen", loadingScreenDict);
+    }
+
+    res.setValue("IsCheckingOpenGLState", isCheckingOpenGLState);
+    res.setValue("IsLoggingOpenGLCalls", isLoggingOpenGLCalls);
+    res.setValue("IsPrintingEvents", isPrintingEvents);
+    res.setValue("ConsoleKey", ghoul::to_string(consoleKey));
+    res.setValue("ShutdownCountdown", static_cast<double>(shutdownCountdown));
+    res.setValue("shouldUseScreenshotDate", shouldUseScreenshotDate);
+    res.setValue("OnScreenTextScaling", onScreenTextScaling);
+    res.setValue("UsePerProfileCache", usePerProfileCache);
+    res.setValue("IsRenderingOnMasterDisabled", isRenderingOnMasterDisabled);
+    res.setValue("GlobalRotation", static_cast<glm::dvec3>(globalRotation));
+    res.setValue("ScreenSpaceRotation", static_cast<glm::dvec3>(screenSpaceRotation));
+    res.setValue("MasterRotation", static_cast<glm::dvec3>(masterRotation));
+    res.setValue("IsConsoleDisabled", isConsoleDisabled);
+    res.setValue("BypassLauncher", bypassLauncher);
+    res.setValue("LayerServer", layerServerToString(layerServer));
+
+    ghoul::Dictionary moduleConfigurationsDict;
+    for (auto it = moduleConfigurations.begin(); it != moduleConfigurations.end(); ++it) {
+        moduleConfigurationsDict.setValue(it->first, it->second);
+    }
+    res.setValue("ModuleConfigurations", moduleConfigurationsDict);
+
+    {
+        ghoul::Dictionary openGLDebugContextDict;
+        openGLDebugContextDict.setValue("IsActive", openGLDebugContext.isActive);
+        openGLDebugContextDict.setValue("PrintStacktrace", openGLDebugContext.printStacktrace);
+        openGLDebugContextDict.setValue("IsSynchronous", openGLDebugContext.isSynchronous);
+
+        ghoul::Dictionary identifierFiltersDict;
+        for (size_t i = 0; i < openGLDebugContext.severityFilters.size(); ++i) {
+            {
+                ghoul::Dictionary identifierFilterDict;
+                identifierFilterDict.setValue("Type", openGLDebugContext.identifierFilters[i].type);
+                identifierFilterDict.setValue("Source", openGLDebugContext.identifierFilters[i].source);
+                identifierFilterDict.setValue(
+                    "Identifier",
+                    static_cast<int>(openGLDebugContext.identifierFilters[i].identifier)
+                );
+
+                openGLDebugContextDict.setValue(std::to_string(i), identifierFilterDict);
+            }
+        }
+        openGLDebugContextDict.setValue("IdentifierFilters", identifierFiltersDict);
+
+        ghoul::Dictionary severityFiltersDict;
+        for (size_t i = 0; i < openGLDebugContext.severityFilters.size(); ++i) {
+            severityFiltersDict.setValue(
+                std::to_string(i),
+                openGLDebugContext.severityFilters[i]
+            );
+        }
+        openGLDebugContextDict.setValue("SeverityFilters", severityFiltersDict);
+
+        res.setValue("OpenGLDebugContext", openGLDebugContextDict);
+    }
+
+    {
+        ghoul::Dictionary httpProxyDict;
+        httpProxyDict.setValue("UsingHttpProxy", httpProxy.usingHttpProxy);
+        httpProxyDict.setValue("Address", httpProxy.address);
+        httpProxyDict.setValue("Port", static_cast<int>(httpProxy.port));
+        httpProxyDict.setValue("Authentication", httpProxy.authentication);
+        httpProxyDict.setValue("User", httpProxy.user);
+        httpProxyDict.setValue("Password", httpProxy.password);
+
+        res.setValue("HttpProxy", httpProxyDict);
+    }
+
+    res.setValue("SgctConfigNameInitialized", sgctConfigNameInitialized);
+
+    return res;
+}
+
 void parseLuaState(Configuration& configuration) {
     using namespace ghoul::lua;
 
@@ -456,6 +607,10 @@ void parseLuaState(Configuration& configuration) {
     }
 
     c.bypassLauncher = p.bypassLauncher.value_or(c.bypassLauncher);
+
+    if (p.layerServer.has_value()) {
+        c.layerServer = stringToLayerServer(*p.layerServer);
+    }
 }
 
 void patchConfiguration(Configuration& configuration, const Settings& settings) {
@@ -472,6 +627,9 @@ void patchConfiguration(Configuration& configuration, const Settings& settings)
     if (settings.bypassLauncher.has_value()) {
         configuration.bypassLauncher = *settings.bypassLauncher;
     }
+    if (settings.layerServer.has_value()) {
+        configuration.layerServer = *settings.layerServer;
+    }
     auto it = configuration.moduleConfigurations.find("GlobeBrowsing");
     // Just in case we have a configuration file that does not specify anything
     // about the globebrowsing module
@@ -551,4 +709,26 @@ Configuration loadConfigurationFromFile(const std::filesystem::path& configurati
     return result;
 }
 
+openspace::Configuration::LayerServer stringToLayerServer(std::string_view server) {
+    using Server = openspace::Configuration::LayerServer;
+    if (server == "All") { return Server::All; }
+    else if (server == "NewYork") { return Server::NewYork; }
+    else if (server == "Sweden") { return Server::Sweden; }
+    else if (server == "Utah") { return Server::Utah; }
+    else if (server == "None") { return Server::None; }
+    else { throw ghoul::MissingCaseException(); }
+}
+
+std::string layerServerToString(openspace::Configuration::LayerServer server) {
+    using Server = openspace::Configuration::LayerServer;
+    switch (server) {
+        case Server::All: return "All";
+        case Server::NewYork: return "NewYork";
+        case Server::Sweden: return "Sweden";
+        case Server::Utah: return "Utah";
+        case Server::None: return "None";
+        default: throw ghoul::MissingCaseException();
+    }
+}
+
 } // namespace openspace
diff --git a/src/engine/openspaceengine.cpp b/src/engine/openspaceengine.cpp
index aff5c8289b..2637341fef 100644
--- a/src/engine/openspaceengine.cpp
+++ b/src/engine/openspaceengine.cpp
@@ -1669,7 +1669,9 @@ scripting::LuaLibrary OpenSpaceEngine::luaLibrary() {
             codegen::lua::IsMaster,
             codegen::lua::Version,
             codegen::lua::ReadCSVFile,
-            codegen::lua::ResetCamera
+            codegen::lua::ResetCamera,
+            codegen::lua::Configuration,
+            codegen::lua::LayerServer
         },
         {
             absPath("${SCRIPTS}/core_scripts.lua")
diff --git a/src/engine/openspaceengine_lua.inl b/src/engine/openspaceengine_lua.inl
index 8c57caf881..8bf6c7be75 100644
--- a/src/engine/openspaceengine_lua.inl
+++ b/src/engine/openspaceengine_lua.inl
@@ -235,4 +235,20 @@ namespace {
     openspace::setCameraFromProfile(*openspace::global::profile);
 }
 
+/**
+ * Returns the whole configuration object as a Dictionary
+ */
+[[codegen::luawrap]] ghoul::Dictionary configuration() {
+    openspace::Configuration& config = *openspace::global::configuration;
+    return config.createDictionary();
+}
+
+/**
+ * Returns the current layer server from the configuration
+ */
+[[codegen::luawrap]] std::string layerServer() {
+    openspace::Configuration& config = *openspace::global::configuration;
+    return layerServerToString(config.layerServer);
+}
+
 #include "openspaceengine_lua_codegen.cpp"
diff --git a/src/engine/settings.cpp b/src/engine/settings.cpp
index 1f433b30ac..e1df61f429 100644
--- a/src/engine/settings.cpp
+++ b/src/engine/settings.cpp
@@ -74,6 +74,11 @@ namespace version1 {
         }
         settings.bypassLauncher = get_to<bool>(json, "bypass");
 
+        std::optional<std::string> layerServer = get_to<std::string>(json, "layerserver");
+        if (layerServer.has_value()) {
+            settings.layerServer = stringToLayerServer(*layerServer);
+        }
+
         if (auto it = json.find("mrf");  it != json.end()) {
             if (!it->is_object()) {
                 throw ghoul::RuntimeError("'mrf' is not an object");
@@ -165,6 +170,9 @@ void saveSettings(const Settings& settings, const std::filesystem::path& filenam
     if (settings.bypassLauncher.has_value()) {
         json["bypass"] = *settings.bypassLauncher;
     }
+    if (settings.layerServer.has_value()) {
+        json["layerserver"] = layerServerToString(*settings.layerServer);
+    }
     nlohmann::json mrf = nlohmann::json::object();
     if (settings.mrf.isEnabled.has_value()) {
         mrf["enabled"] = *settings.mrf.isEnabled;
diff --git a/tests/test_settings.cpp b/tests/test_settings.cpp
index 81875594be..1a7ab36608 100644
--- a/tests/test_settings.cpp
+++ b/tests/test_settings.cpp
@@ -56,6 +56,7 @@ TEST_CASE("Settings Load: Empty", "[settings]") {
     CHECK(!settings.rememberLastProfile.has_value());
     CHECK(!settings.visibility.has_value());
     CHECK(!settings.bypassLauncher.has_value());
+    CHECK(!settings.layerServer.has_value());
     CHECK(!settings.mrf.isEnabled.has_value());
     CHECK(!settings.mrf.location.has_value());
 }
@@ -82,6 +83,7 @@ TEST_CASE("Settings Load: Really Empty", "[settings]") {
     CHECK(!settings.rememberLastProfile.has_value());
     CHECK(!settings.visibility.has_value());
     CHECK(!settings.bypassLauncher.has_value());
+    CHECK(!settings.layerServer.has_value());
     CHECK(!settings.mrf.isEnabled.has_value());
     CHECK(!settings.mrf.location.has_value());
 }
@@ -122,6 +124,7 @@ TEST_CASE("Settings Load: Started Before", "[settings]") {
     CHECK(!settings.rememberLastProfile.has_value());
     CHECK(!settings.visibility.has_value());
     CHECK(!settings.bypassLauncher.has_value());
+    CHECK(!settings.layerServer.has_value());
     CHECK(!settings.mrf.isEnabled.has_value());
     CHECK(!settings.mrf.location.has_value());
 }
@@ -164,6 +167,7 @@ TEST_CASE("Settings Load: Configuration", "[settings]") {
     CHECK(!settings.rememberLastProfile.has_value());
     CHECK(!settings.visibility.has_value());
     CHECK(!settings.bypassLauncher.has_value());
+    CHECK(!settings.layerServer.has_value());
     CHECK(!settings.mrf.isEnabled.has_value());
     CHECK(!settings.mrf.location.has_value());
 }
@@ -206,6 +210,7 @@ TEST_CASE("Settings Load: Configuration Remember", "[settings]") {
     CHECK(!settings.rememberLastProfile.has_value());
     CHECK(!settings.visibility.has_value());
     CHECK(!settings.bypassLauncher.has_value());
+    CHECK(!settings.layerServer.has_value());
     CHECK(!settings.mrf.isEnabled.has_value());
     CHECK(!settings.mrf.location.has_value());
 }
@@ -248,6 +253,7 @@ TEST_CASE("Settings Load: Profile", "[settings]") {
     CHECK(!settings.rememberLastProfile.has_value());
     CHECK(!settings.visibility.has_value());
     CHECK(!settings.bypassLauncher.has_value());
+    CHECK(!settings.layerServer.has_value());
     CHECK(!settings.mrf.isEnabled.has_value());
     CHECK(!settings.mrf.location.has_value());
 }
@@ -290,6 +296,7 @@ TEST_CASE("Settings Load: Profile Remember", "[settings]") {
     CHECK(*settings.rememberLastProfile == false);
     CHECK(!settings.visibility.has_value());
     CHECK(!settings.bypassLauncher.has_value());
+    CHECK(!settings.layerServer.has_value());
     CHECK(!settings.mrf.isEnabled.has_value());
     CHECK(!settings.mrf.location.has_value());
 }
@@ -332,6 +339,7 @@ TEST_CASE("Settings Load: Visibility/NoviceUser", "[settings]") {
     REQUIRE(settings.visibility.has_value());
     CHECK(*settings.visibility == properties::Property::Visibility::NoviceUser);
     CHECK(!settings.bypassLauncher.has_value());
+    CHECK(!settings.layerServer.has_value());
     CHECK(!settings.mrf.isEnabled.has_value());
     CHECK(!settings.mrf.location.has_value());
 }
@@ -374,6 +382,7 @@ TEST_CASE("Settings Load: Visibility/User", "[settings]") {
     REQUIRE(settings.visibility.has_value());
     CHECK(*settings.visibility == properties::Property::Visibility::User);
     CHECK(!settings.bypassLauncher.has_value());
+    CHECK(!settings.layerServer.has_value());
     CHECK(!settings.mrf.isEnabled.has_value());
     CHECK(!settings.mrf.location.has_value());
 }
@@ -416,6 +425,7 @@ TEST_CASE("Settings Load: Visibility/AdvancedUser", "[settings]") {
     REQUIRE(settings.visibility.has_value());
     CHECK(*settings.visibility == properties::Property::Visibility::AdvancedUser);
     CHECK(!settings.bypassLauncher.has_value());
+    CHECK(!settings.layerServer.has_value());
     CHECK(!settings.mrf.isEnabled.has_value());
     CHECK(!settings.mrf.location.has_value());
 }
@@ -458,6 +468,7 @@ TEST_CASE("Settings Load: Visibility/Developer", "[settings]") {
     REQUIRE(settings.visibility.has_value());
     CHECK(*settings.visibility == properties::Property::Visibility::Developer);
     CHECK(!settings.bypassLauncher.has_value());
+    CHECK(!settings.layerServer.has_value());
     CHECK(!settings.mrf.isEnabled.has_value());
     CHECK(!settings.mrf.location.has_value());
 }
@@ -500,6 +511,7 @@ TEST_CASE("Settings Load: Bypass Launcher", "[settings]") {
     CHECK(!settings.visibility.has_value());
     REQUIRE(settings.bypassLauncher.has_value());
     CHECK(*settings.bypassLauncher == false);
+    CHECK(!settings.layerServer.has_value());
     CHECK(!settings.mrf.isEnabled.has_value());
     CHECK(!settings.mrf.location.has_value());
 }
@@ -517,6 +529,221 @@ TEST_CASE("Settings Save: Bypass Launcher", "[settings]") {
     CHECK(srcSettings == cmpSettings);
 }
 
+TEST_CASE("Settings Load: LayerServer/All", "[settings]") {
+    constexpr std::string_view Source = R"(
+{
+    "version": 1,
+    "layerserver": "All"
+}
+)";
+
+    std::filesystem::path path = std::filesystem::temp_directory_path();
+    std::filesystem::path file = path / "test_settings_load_layerserver_all.json";
+    {
+        std::ofstream f(file);
+        f << Source;
+    }
+
+    Settings settings = loadSettings(file);
+
+    CHECK(!settings.hasStartedBefore.has_value());
+    CHECK(!settings.configuration.has_value());
+    CHECK(!settings.rememberLastConfiguration.has_value());
+    CHECK(!settings.profile.has_value());
+    CHECK(!settings.rememberLastProfile.has_value());
+    CHECK(!settings.visibility.has_value());
+    CHECK(!settings.bypassLauncher.has_value());
+    REQUIRE(settings.layerServer.has_value());
+    CHECK(*settings.layerServer == Configuration::LayerServer::All);
+    CHECK(!settings.mrf.isEnabled.has_value());
+    CHECK(!settings.mrf.location.has_value());
+}
+
+TEST_CASE("Settings Save: LayerServer/All", "[settings]") {
+    std::filesystem::path path = std::filesystem::temp_directory_path();
+    std::filesystem::path file = path / "test_settings_save_layerserver_all.json";
+
+    Settings srcSettings = {
+        .layerServer = openspace::Configuration::LayerServer::All
+    };
+    saveSettings(srcSettings, file);
+
+    Settings cmpSettings = loadSettings(file);
+    CHECK(srcSettings == cmpSettings);
+}
+
+TEST_CASE("Settings Load: LayerServer/NewYork", "[settings]") {
+    constexpr std::string_view Source = R"(
+{
+    "version": 1,
+    "layerserver": "NewYork"
+}
+)";
+
+    std::filesystem::path path = std::filesystem::temp_directory_path();
+    std::filesystem::path file = path / "test_settings_load_layerserver_newyork.json";
+    {
+        std::ofstream f(file);
+        f << Source;
+    }
+
+    Settings settings = loadSettings(file);
+
+    CHECK(!settings.hasStartedBefore.has_value());
+    CHECK(!settings.configuration.has_value());
+    CHECK(!settings.rememberLastConfiguration.has_value());
+    CHECK(!settings.profile.has_value());
+    CHECK(!settings.rememberLastProfile.has_value());
+    CHECK(!settings.visibility.has_value());
+    CHECK(!settings.bypassLauncher.has_value());
+    REQUIRE(settings.layerServer.has_value());
+    CHECK(*settings.layerServer == Configuration::LayerServer::NewYork);
+    CHECK(!settings.mrf.isEnabled.has_value());
+    CHECK(!settings.mrf.location.has_value());
+}
+
+TEST_CASE("Settings Save: LayerServer/NewYork", "[settings]") {
+    std::filesystem::path path = std::filesystem::temp_directory_path();
+    std::filesystem::path file = path / "test_settings_save_layerserver_newyork.json";
+
+    Settings srcSettings = {
+        .layerServer = openspace::Configuration::LayerServer::NewYork
+    };
+    saveSettings(srcSettings, file);
+
+    Settings cmpSettings = loadSettings(file);
+    CHECK(srcSettings == cmpSettings);
+}
+
+TEST_CASE("Settings Load: LayerServer/Sweden", "[settings]") {
+    constexpr std::string_view Source = R"(
+{
+    "version": 1,
+    "layerserver": "Sweden"
+}
+)";
+
+    std::filesystem::path path = std::filesystem::temp_directory_path();
+    std::filesystem::path file = path / "test_settings_load_layerserver_sweden.json";
+    {
+        std::ofstream f(file);
+        f << Source;
+    }
+
+    Settings settings = loadSettings(file);
+
+    CHECK(!settings.hasStartedBefore.has_value());
+    CHECK(!settings.configuration.has_value());
+    CHECK(!settings.rememberLastConfiguration.has_value());
+    CHECK(!settings.profile.has_value());
+    CHECK(!settings.rememberLastProfile.has_value());
+    CHECK(!settings.visibility.has_value());
+    CHECK(!settings.bypassLauncher.has_value());
+    REQUIRE(settings.layerServer.has_value());
+    CHECK(*settings.layerServer == Configuration::LayerServer::Sweden);
+    CHECK(!settings.mrf.isEnabled.has_value());
+    CHECK(!settings.mrf.location.has_value());
+}
+
+TEST_CASE("Settings Save: LayerServer/Sweden", "[settings]") {
+    std::filesystem::path path = std::filesystem::temp_directory_path();
+    std::filesystem::path file = path / "test_settings_save_layerserver_sweden.json";
+
+    Settings srcSettings = {
+        .layerServer = openspace::Configuration::LayerServer::Sweden
+    };
+    saveSettings(srcSettings, file);
+
+    Settings cmpSettings = loadSettings(file);
+    CHECK(srcSettings == cmpSettings);
+}
+
+TEST_CASE("Settings Load: LayerServer/Utah", "[settings]") {
+    constexpr std::string_view Source = R"(
+{
+    "version": 1,
+    "layerserver": "Utah"
+}
+)";
+
+    std::filesystem::path path = std::filesystem::temp_directory_path();
+    std::filesystem::path file = path / "test_settings_load_layerserver_utah.json";
+    {
+        std::ofstream f(file);
+        f << Source;
+    }
+
+    Settings settings = loadSettings(file);
+
+    CHECK(!settings.hasStartedBefore.has_value());
+    CHECK(!settings.configuration.has_value());
+    CHECK(!settings.rememberLastConfiguration.has_value());
+    CHECK(!settings.profile.has_value());
+    CHECK(!settings.rememberLastProfile.has_value());
+    CHECK(!settings.visibility.has_value());
+    CHECK(!settings.bypassLauncher.has_value());
+    REQUIRE(settings.layerServer.has_value());
+    CHECK(*settings.layerServer == Configuration::LayerServer::Utah);
+    CHECK(!settings.mrf.isEnabled.has_value());
+    CHECK(!settings.mrf.location.has_value());
+}
+
+TEST_CASE("Settings Save: LayerServer/Utah", "[settings]") {
+    std::filesystem::path path = std::filesystem::temp_directory_path();
+    std::filesystem::path file = path / "test_settings_save_layerserver_utah.json";
+
+    Settings srcSettings = {
+        .layerServer = openspace::Configuration::LayerServer::Utah
+    };
+    saveSettings(srcSettings, file);
+
+    Settings cmpSettings = loadSettings(file);
+    CHECK(srcSettings == cmpSettings);
+}
+
+TEST_CASE("Settings Load: LayerServer/None", "[settings]") {
+    constexpr std::string_view Source = R"(
+{
+    "version": 1,
+    "layerserver": "None"
+}
+)";
+
+    std::filesystem::path path = std::filesystem::temp_directory_path();
+    std::filesystem::path file = path / "test_settings_load_layerserver_none.json";
+    {
+        std::ofstream f(file);
+        f << Source;
+    }
+
+    Settings settings = loadSettings(file);
+
+    CHECK(!settings.hasStartedBefore.has_value());
+    CHECK(!settings.configuration.has_value());
+    CHECK(!settings.rememberLastConfiguration.has_value());
+    CHECK(!settings.profile.has_value());
+    CHECK(!settings.rememberLastProfile.has_value());
+    CHECK(!settings.visibility.has_value());
+    CHECK(!settings.bypassLauncher.has_value());
+    REQUIRE(settings.layerServer.has_value());
+    CHECK(*settings.layerServer == Configuration::LayerServer::None);
+    CHECK(!settings.mrf.isEnabled.has_value());
+    CHECK(!settings.mrf.location.has_value());
+}
+
+TEST_CASE("Settings Save: LayerServer/None", "[settings]") {
+    std::filesystem::path path = std::filesystem::temp_directory_path();
+    std::filesystem::path file = path / "test_settings_save_layerserver_none.json";
+
+    Settings srcSettings = {
+        .layerServer = openspace::Configuration::LayerServer::None
+    };
+    saveSettings(srcSettings, file);
+
+    Settings cmpSettings = loadSettings(file);
+    CHECK(srcSettings == cmpSettings);
+}
+
 TEST_CASE("Settings Load: MRF IsEnabled", "[settings]") {
     constexpr std::string_view Source = R"(
 {
@@ -543,6 +770,7 @@ TEST_CASE("Settings Load: MRF IsEnabled", "[settings]") {
     CHECK(!settings.rememberLastProfile.has_value());
     CHECK(!settings.visibility.has_value());
     CHECK(!settings.bypassLauncher.has_value());
+    CHECK(!settings.layerServer.has_value());
     REQUIRE(settings.mrf.isEnabled.has_value());
     CHECK(*settings.mrf.isEnabled == true);
     CHECK(!settings.mrf.location.has_value());
@@ -589,6 +817,7 @@ TEST_CASE("Settings Load: MRF Location", "[settings]") {
     CHECK(!settings.rememberLastProfile.has_value());
     CHECK(!settings.visibility.has_value());
     CHECK(!settings.bypassLauncher.has_value());
+    CHECK(!settings.layerServer.has_value());
     CHECK(!settings.mrf.isEnabled.has_value());
     REQUIRE(settings.mrf.location.has_value());
     CHECK(*settings.mrf.location == "ghi");
@@ -620,6 +849,7 @@ TEST_CASE("Settings Load: Full", "[settings]") {
     "profile-remember": false,
     "visibility": "NoviceUser",
     "bypass": false,
+    "layerserver": "All",
     "mrf": {
         "enabled": true,
         "location": "ghi"
@@ -650,6 +880,8 @@ TEST_CASE("Settings Load: Full", "[settings]") {
     CHECK(*settings.visibility == properties::Property::Visibility::NoviceUser);
     REQUIRE(settings.bypassLauncher.has_value());
     CHECK(*settings.bypassLauncher == false);
+    REQUIRE(settings.layerServer.has_value());
+    CHECK(*settings.layerServer == Configuration::LayerServer::All);
     REQUIRE(settings.mrf.isEnabled.has_value());
     CHECK(*settings.mrf.isEnabled == true);
     REQUIRE(settings.mrf.location.has_value());
@@ -668,6 +900,7 @@ TEST_CASE("Settings Save: Full", "[settings]") {
         .rememberLastProfile = false,
         .visibility = openspace::properties::Property::Visibility::NoviceUser,
         .bypassLauncher = false,
+        .layerServer = openspace::Configuration::LayerServer::All,
         .mrf = Settings::MRF {
             .isEnabled = true,
             .location = "ghi"
@@ -804,6 +1037,42 @@ TEST_CASE("Settings Load Fail: Bypass Launcher", "[settings]") {
     CHECK_THROWS(loadSettings(file));
 }
 
+TEST_CASE("Settings Load Fail: LayerServer type", "[settings]") {
+    constexpr std::string_view Source = R"(
+{
+    "version": 1,
+    "layerserver": 1
+}
+)";
+
+    std::filesystem::path path = std::filesystem::temp_directory_path();
+    std::filesystem::path file = path / "test_settings_load_fail_layerserver_type.json";
+    {
+        std::ofstream f(file);
+        f << Source;
+    }
+
+    CHECK_THROWS(loadSettings(file));
+}
+
+TEST_CASE("Settings Load Fail: LayerServer value", "[settings]") {
+    constexpr std::string_view Source = R"(
+{
+    "version": 1,
+    "layerserver": "abc"
+}
+)";
+
+    std::filesystem::path path = std::filesystem::temp_directory_path();
+    std::filesystem::path file = path / "test_settings_load_fail_layerserver_value.json";
+    {
+        std::ofstream f(file);
+        f << Source;
+    }
+
+    CHECK_THROWS(loadSettings(file));
+}
+
 TEST_CASE("Settings Load Fail: MRF", "[settings]") {
     constexpr std::string_view Source = R"(
 {

From 19f8e7082238f74c9ab4778322d017a0ab781aca Mon Sep 17 00:00:00 2001
From: Emma Broman <emma.broman@liu.se>
Date: Fri, 8 Dec 2023 11:51:23 +0100
Subject: [PATCH 199/701] Issue/2955 (#2972)

* Fix up-direction not being correctly computed in all cases (issue #2955)

Might be some precision-related problem going on, not sure. But since we know that up (or North) is always positive z for globes, we can just use that as up-vector directly

* Replace another place where we do the same calculation (although this function is never used)

* Remove unused function
---
 modules/globebrowsing/globebrowsingmodule.cpp | 37 ++-----------------
 modules/globebrowsing/globebrowsingmodule.h   |  3 --
 2 files changed, 4 insertions(+), 36 deletions(-)

diff --git a/modules/globebrowsing/globebrowsingmodule.cpp b/modules/globebrowsing/globebrowsingmodule.cpp
index 285a692dfe..31fb387ed5 100644
--- a/modules/globebrowsing/globebrowsingmodule.cpp
+++ b/modules/globebrowsing/globebrowsingmodule.cpp
@@ -513,47 +513,18 @@ void GlobeBrowsingModule::goToGeodetic3(const globebrowsing::RenderableGlobe& gl
     using namespace globebrowsing;
     const glm::dvec3 positionModelSpace = globe.ellipsoid().cartesianPosition(geo3);
 
-
-    const glm::dvec3 slightlyNorth = globe.ellipsoid().cartesianSurfacePosition(
-        Geodetic2{ geo3.geodetic2.lat + 0.001, geo3.geodetic2.lon }
-    );
-
     interaction::NavigationState state;
     state.anchor = globe.owner()->identifier();
     state.referenceFrame = globe.owner()->identifier();
     state.position = positionModelSpace;
-    state.up = slightlyNorth;
+    // For globes, we know that the up-direction will always be positive Z.
+    // @TODO (2023-12-06 emmbr) Eventually, we want each scene graph node to be aware of
+    // its own preferred up-direction. At that time, this should no longer be hardcoded
+    state.up = glm::dvec3(0.0, 0.0, 1.0);
 
     global::navigationHandler->setNavigationStateNextFrame(state);
 }
 
-glm::dquat GlobeBrowsingModule::lookDownCameraRotation(
-                                              const globebrowsing::RenderableGlobe& globe,
-                                                              glm::dvec3 cameraModelSpace,
-                                                            globebrowsing::Geodetic2 geo2)
-{
-    using namespace globebrowsing;
-
-    // Lookup vector
-    const glm::dvec3 positionModelSpace = globe.ellipsoid().cartesianSurfacePosition(
-        geo2
-    );
-    const glm::dvec3 slightlyNorth = globe.ellipsoid().cartesianSurfacePosition(
-        Geodetic2{ geo2.lat + 0.001, geo2.lon }
-    );
-    const glm::dvec3 lookUpModelSpace = glm::normalize(
-        slightlyNorth - positionModelSpace
-    );
-
-    // Matrix
-    const glm::dmat4 lookAtMatrix =
-        glm::lookAt(cameraModelSpace, positionModelSpace, lookUpModelSpace);
-
-    // Set rotation
-    const glm::dquat rotation = glm::quat_cast(inverse(lookAtMatrix));
-    return rotation;
-}
-
 const globebrowsing::RenderableGlobe*
 GlobeBrowsingModule::castFocusNodeRenderableToGlobe()
 {
diff --git a/modules/globebrowsing/globebrowsingmodule.h b/modules/globebrowsing/globebrowsingmodule.h
index 783e027f2c..e859e811ee 100644
--- a/modules/globebrowsing/globebrowsingmodule.h
+++ b/modules/globebrowsing/globebrowsingmodule.h
@@ -111,9 +111,6 @@ private:
     void goToGeodetic3(const globebrowsing::RenderableGlobe& globe,
         globebrowsing::Geodetic3 geo3, bool doResetCameraDirection);
 
-    glm::dquat lookDownCameraRotation(const globebrowsing::RenderableGlobe& globe,
-        glm::dvec3 cameraPositionModelSpace, globebrowsing::Geodetic2 geo2);
-
     properties::UIntProperty _tileCacheSizeMB;
 
     properties::StringProperty _defaultGeoPointTexturePath;

From 0cf0fe492b486aa65090de918d5a90d849dddc7e Mon Sep 17 00:00:00 2001
From: Alexander Bock <mail@alexanderbock.eu>
Date: Sat, 9 Dec 2023 00:16:25 +0100
Subject: [PATCH 200/701] Doxygen fixes

---
 .../ext/launcher/include/filesystemaccess.h   | 19 ++--
 .../ext/launcher/include/launcherwindow.h     | 36 ++++---
 .../include/profile/additionalscriptsdialog.h | 10 +-
 .../launcher/include/profile/assetsdialog.h   | 21 ++--
 .../launcher/include/profile/assettreeitem.h  | 50 +++++-----
 .../launcher/include/profile/assettreemodel.h | 96 +++++++++----------
 .../launcher/include/profile/cameradialog.h   |  6 +-
 .../include/profile/deltatimesdialog.h        | 20 ++--
 .../include/profile/marknodesdialog.h         | 10 +-
 .../ext/launcher/include/profile/metadialog.h |  4 +-
 .../launcher/include/profile/modulesdialog.h  | 10 +-
 .../launcher/include/profile/profileedit.h    | 14 +--
 .../include/profile/propertiesdialog.h        | 10 +-
 .../include/profile/scriptlogdialog.h         |  4 +-
 .../ext/launcher/include/profile/timedialog.h |  6 +-
 .../include/sgctedit/displaywindowunion.h     | 32 +++----
 .../launcher/include/sgctedit/monitorbox.h    | 16 ++--
 .../include/sgctedit/orientationdialog.h      |  8 +-
 .../include/sgctedit/settingswidget.h         | 69 +++++++------
 .../ext/launcher/include/sgctedit/sgctedit.h  | 18 ++--
 .../launcher/include/sgctedit/windowcontrol.h | 91 +++++++++---------
 apps/OpenSpace/ext/sgct                       |  2 +-
 ext/ghoul                                     |  2 +-
 .../openspace/interaction/sessionrecording.h  |  1 +
 include/openspace/util/time.h                 | 26 ++---
 modules/gaia/rendering/octreemanager.h        |  4 +-
 26 files changed, 291 insertions(+), 294 deletions(-)

diff --git a/apps/OpenSpace/ext/launcher/include/filesystemaccess.h b/apps/OpenSpace/ext/launcher/include/filesystemaccess.h
index 9db6b4d972..99c12b6e6a 100644
--- a/apps/OpenSpace/ext/launcher/include/filesystemaccess.h
+++ b/apps/OpenSpace/ext/launcher/include/filesystemaccess.h
@@ -30,22 +30,21 @@
 class FileSystemAccess {
 public:
     /**
-     * Constructor for filesystemAccess class
+     * Constructor for filesystemAccess class.
      *
-     * \param fileExtension string that defines the filter used to find files. Only
-     *                      files with this extension will be recognized (e.g. '.xml')
-     * \param hideFileExtensions if true then file extensions will be removed from the
-     *                           listed files in the output
-     * \param useCheckboxes if true then the text output format will contain a '0' as
-     *                      the first character in the line (this first character is
-     *                      used to represent checked ('1'), uncheck ('0') or doesn't
-     *                      exist in filesystem ('x') states.
+     * \param fileExtension The file extensiopn filter used to find files. Only files with
+     *        this extension will be recognized (e.g. '.xml')
+     * \param hideFileExtensions If `true` then file extensions will be removed from the
+     *        listed files in the output
+     * \param useCheckboxes If `true` then the text output format will contain a '0' as
+     *        the first character in the line (this first character is used to represent
+     *        checked ('1'), uncheck ('0') or doesn't exist in filesystem ('x') states
      */
     FileSystemAccess(std::string fileExtension, bool hideFileExtensions,
         bool useCheckboxes);
 
     /**
-     * Function that uses the #QtFileSystemModel class to search the given directory
+     * Function that uses the #QtFileSystemModel class to search the given directory.
      *
      * \param dir The directory from which to start the search from
      */
diff --git a/apps/OpenSpace/ext/launcher/include/launcherwindow.h b/apps/OpenSpace/ext/launcher/include/launcherwindow.h
index f5efc4c1b6..7d4456d12f 100644
--- a/apps/OpenSpace/ext/launcher/include/launcherwindow.h
+++ b/apps/OpenSpace/ext/launcher/include/launcherwindow.h
@@ -43,49 +43,47 @@ class LauncherWindow final : public QMainWindow {
 Q_OBJECT
 public:
     /**
-     * Constructor for LauncherWindow class
+     * Constructor for LauncherWindow class.
      *
-     * \param profileEnabled true if profile selection combo box will be enabled
-     * \param globalConfig reference to global configuration for OpenSpace settings
-     * \param sgctConfigEnabled true if window selection combo box will be enabled
-     * \param sgctConfigName the name of the sgct configuration function used to
-     *                       generate window config (blank if file is used)
+     * \param profileEnabled `true` if profile selection combo box will be enabled
+     * \param globalConfig Reference to global configuration for OpenSpace settings
+     * \param sgctConfigEnabled `true` if window selection combo box will be enabled
+     * \param sgctConfigName The name of the sgct configuration function used to generate
+     *        window config (blank if file is used)
      * \param parentItem The parent that contains this (and possibly other) children
      *                   in the tree structure.
      */
-    LauncherWindow(bool profileEnabled,
-        const openspace::Configuration& globalConfig, bool sgctConfigEnabled,
-        std::string sgctConfigName, QWidget* parent);
+    LauncherWindow(bool profileEnabled, const openspace::Configuration& globalConfig,
+        bool sgctConfigEnabled, std::string sgctConfigName, QWidget* parent);
 
     /**
-      * Returns bool for whether "start OpenSpace" was chosen when this window closed.
-      * OpenSpace will not start if false
+      * Returns whether "Start OpenSpace" was chosen when this window closed.
       *
-      * \return true if the "start OpenSpace" button was clicked
+      * \return `true` if the "Start OpenSpace" button was clicked
       */
     bool wasLaunchSelected() const;
 
     /**
-      * Returns the selected profile name when launcher window closed
+      * Returns the selected profile name when launcher window closed.
       *
-      * \return name of selected profile (this is only the name without file extension
+      * \return The name of selected profile (this is only the name without file extension
       *         and without path)
       */
     std::string selectedProfile() const;
 
     /**
-      * Returns the selected sgct window configuration when launcher window closed
+      * Returns the selected sgct window configuration when launcher window closed.
       *
-      * \return name of selected profile (this is only the name without file extension
+      * \return The name of selected profile (this is only the name without file extension
       *         and without path)
       */
     std::string selectedWindowConfig() const;
 
     /**
-      * Returns true if the window configuration filename selected in the combo box
-      * is a file in the user configurations section
+      * Returns `true` if the window configuration filename selected in the combo box
+      * is a file in the user configurations section.
       *
-      * \return true if window configuration is a user configuration file
+      * \return `true` if window configuration is a user configuration file
       */
     bool isUserConfigSelected() const;
 
diff --git a/apps/OpenSpace/ext/launcher/include/profile/additionalscriptsdialog.h b/apps/OpenSpace/ext/launcher/include/profile/additionalscriptsdialog.h
index bfde6ff809..6d39e86c08 100644
--- a/apps/OpenSpace/ext/launcher/include/profile/additionalscriptsdialog.h
+++ b/apps/OpenSpace/ext/launcher/include/profile/additionalscriptsdialog.h
@@ -33,11 +33,11 @@ class AdditionalScriptsDialog final : public QDialog {
 Q_OBJECT
 public:
     /**
-     * Constructor for addedScripts class
+     * Constructor for addedScripts class.
      *
-     * \param profile The #openspace::Profile object containing all data of the
-     *                new or imported profile.
      * \param parent Pointer to parent Qt widget
+     * \param scripts The list of scripts containing all data of the new or imported
+     *        profile
      */
     AdditionalScriptsDialog(QWidget* parent, std::vector<std::string>* scripts);
 
@@ -48,9 +48,9 @@ private:
     void chooseScripts();
 
     /**
-     * Adds scripts to the _scriptEdit from outside dialogs
+     * Adds scripts to the _scriptEdit from outside dialogs.
      *
-     * \param scripts #std::string scripts to be appended
+     * \param scripts The scripts to be appended
      */
     void appendScriptsToTextfield(std::vector<std::string> scripts);
 
diff --git a/apps/OpenSpace/ext/launcher/include/profile/assetsdialog.h b/apps/OpenSpace/ext/launcher/include/profile/assetsdialog.h
index 0ca2607aa5..f5d89817d0 100644
--- a/apps/OpenSpace/ext/launcher/include/profile/assetsdialog.h
+++ b/apps/OpenSpace/ext/launcher/include/profile/assetsdialog.h
@@ -37,17 +37,17 @@ class SearchProxyModel : public QSortFilterProxyModel {
 Q_OBJECT
 public:
     /**
-     * Constructor for SearchProxyModel class
+     * Constructor for SearchProxyModel class.
      *
-     * \param parent The QObject* object that is the Qt parent of this object
+     * \param parent The parent object of this object
      */
     SearchProxyModel(QObject* parent = nullptr);
 
 public slots:
     /**
-     * Sets the regular expression pattern to apply to the filter
+     * Sets the regular expression pattern to apply to the filter.
      *
-     * \param pattern The QString reference containing the regex pattern
+     * \param pattern The regex pattern used for filtering
      */
     void setFilterRegularExpression(const QString& pattern);
 
@@ -64,14 +64,14 @@ class AssetsDialog final : public QDialog {
 Q_OBJECT
 public:
     /**
-     * Constructor for assets class
+     * Constructor for assets class.
      *
-     * \param profile The #openspace::Profile object containing all data of the
-     *                new or imported profile.
+     * \param parent Pointer to parent Qt widget
+     * \param profile The #openspace::Profile object containing all data of the new or
+     *        imported profile
      * \param assetBasePath The path to the folder in which all of the assets are living
      * \param userAssetBasePath The path to the folder in which the users' assets are
      *        living
-     * \param parent Pointer to parent Qt widget
      */
     AssetsDialog(QWidget* parent, openspace::Profile* profile,
         const std::string& assetBasePath, const std::string& userAssetBasePath);
@@ -84,7 +84,10 @@ private:
     void setViewToBaseModel();
     void parseSelections();
     void selected(const QModelIndex&);
-    /// Creates a text summary of all assets and their paths
+
+    /**
+     * Creates a text summary of all assets and their paths.
+     */
     QString createTextSummary();
     void openAssetEditor();
 
diff --git a/apps/OpenSpace/ext/launcher/include/profile/assettreeitem.h b/apps/OpenSpace/ext/launcher/include/profile/assettreeitem.h
index 0e1055bcbc..9d8b8169bb 100644
--- a/apps/OpenSpace/ext/launcher/include/profile/assettreeitem.h
+++ b/apps/OpenSpace/ext/launcher/include/profile/assettreeitem.h
@@ -36,8 +36,8 @@ public:
      * Constructor for assetTreeItem class.
      *
      * \param data QVector containing the data contained in this tree view item
-     * \param parentItem The parent that contains this (and possibly other) children
-     *                   in the tree structure (optional).
+     * \param parentItem The parent that contains this (and possibly other) children in
+     *        the tree structure (optional)
      */
     AssetTreeItem(std::vector<QVariant> data, AssetTreeItem* parentItem = nullptr);
 
@@ -49,7 +49,7 @@ public:
     /**
       * Returns pointer to this tree item's child at position \p row.
       *
-      * \param row int of the row number of the child to get pointer
+      * \param row The row number of the child to get pointer
       */
     AssetTreeItem* child(int row) const;
 
@@ -78,27 +78,27 @@ public:
     /**
       * Inserts children item(s) to the current item.
       *
-      * \param position where in this item's children to insert new children
-      * \param count number of children to insert
-      * \param columns number of data columns in each child
+      * \param position Where in this item's children to insert new children
+      * \param count Number of children to insert
+      * \param columns Number of data columns in each child
       *
-      * \return true if new children were successfully inserted
+      * \return `true` if new children were successfully inserted
       */
     bool insertChildren(int position, int count, int columns);
 
     /**
       * Inserts data column(s) in the current item.
       *
-      * \param position column number at which to insert column(s)
-      * \param columns number of columns to insert
-      * \return true if columns were successfully inserted
+      * \param position Column number at which to insert column(s)
+      * \param columns Number of columns to insert
+      * \return `true` if columns were successfully inserted
       */
     bool insertColumns(int position, int columns);
 
     /**
       * Returns a pointer to the current item's parent.
       *
-      * \return pointer to the \p assetTreeItem parent
+      * \return Pointer to the \p assetTreeItem parent
       */
     AssetTreeItem* parent();
 
@@ -112,10 +112,10 @@ public:
     /**
       * Returns the data at column \p column of this item.
       *
-      * \param position The position of the child(ren) to remove from the current
-      *                 item (which is parent)
+      * \param position The position of the child(ren) to remove from the current item
+      *        (which is parent)
       * \param count The number of children to remove
-      * \return true if child item(s) successfully removed
+      * \return `true` if child item(s) successfully removed
       */
     bool removeChildren(int position, int count);
 
@@ -124,7 +124,7 @@ public:
       *
       * \param column The data column number to set
       * \param value The #QVariant data element to store at column \p column
-      * \return true if the data set was successful
+      * \return `true` if the data set was successful
       */
     bool setData(int column, const QVariant& value);
 
@@ -132,30 +132,30 @@ public:
       * Returns the checked state of this item. If an asset is selected to be included
       * in a profile, then it is checked.
       *
-      * \return true if this item is checked
+      * \return `true` if this item is checked
       */
     bool isChecked() const;
 
     /**
       * Sets the checked state of this item (whether or not it is selected for a profile).
       *
-      * \param set bool for whether or not this is checked
+      * \param set Whether or not this item is checked
       */
     void setChecked(bool set);
 
     /**
-      * Returns a bool for whether or not this is an asset. If it is a file
-      * (has no children in the filesystem tree), then it is an asset.
+      * Returns a bool for whether or not this is an asset. If it is a file (has no
+      * children in the filesystem tree), then it is an asset.
       *
-      * \return true if this is an asset file and not a directory containing asset(s)
+      * \return `true` if this is an asset file and not a directory containing asset(s)
       */
     bool isAsset() const;
 
     /**
-      * Returns a bool for whether or not this is a category. If it is a directory
-      * and not an asset (file), then it is a category.
+      * Returns a bool for whether or not this is a category. If it is a directory and not
+      * an asset (file), then it is a category.
       *
-      * \return true if this is a category
+      * \return `true` if this is a category
       */
     bool isCategory() const;
 
@@ -164,14 +164,14 @@ public:
       * possible that an imported profile lists an asset from another system that is not
       * included on the current filesystem.
       *
-      * \param set to true if the asset file exists in the current filesystem
+      * \param fileExists `true` if the asset file exists in the current filesystem
       */
     void setExistsInFilesystem(bool fileExists);
 
     /**
       * Returns bool for whether or not the asset exists in the current filesystem.
       *
-      * \return true if the asset exists in the current filesystem
+      * \return `true` if the asset exists in the current filesystem
       */
     bool doesExistInFilesystem() const;
 
diff --git a/apps/OpenSpace/ext/launcher/include/profile/assettreemodel.h b/apps/OpenSpace/ext/launcher/include/profile/assettreemodel.h
index 6103897deb..299d3a0d4c 100644
--- a/apps/OpenSpace/ext/launcher/include/profile/assettreemodel.h
+++ b/apps/OpenSpace/ext/launcher/include/profile/assettreemodel.h
@@ -39,9 +39,9 @@ public:
     /**
       * Returns the data contained at an index.
       *
-      * \param index that defines where the item is located in the tree model
-      * \param role Qt-defined role that describes the reason Qt is calling the
-      *             function (can be multiple times)
+      * \param index The index defining where the item is located in the tree model
+      * \param role Qt-defined role that describes the reason Qt is calling the function
+      *        (can be multiple times)
       * \return QVariant data object
       */
     QVariant data(const QModelIndex& index, int role) const final;
@@ -49,10 +49,10 @@ public:
     /**
       * Returns the header data of the tree view.
       *
-      * \param section of data to be obtained from header
-      * \param orientation of the query (e.g. Qt::horizontal)
-      * \param role Qt-defined role that describes the reason Qt is calling the
-      *             function (can be multiple times)
+      * \param section The data to be obtained from header
+      * \param orientation The orientation of the query (e.g. Qt::horizontal)
+      * \param role Qt-defined role that describes the reason Qt is calling the function
+      *        (can be multiple times)
       * \return QVariant data object in the header
       */
     QVariant headerData(int section, Qt::Orientation orientation,
@@ -61,10 +61,10 @@ public:
     /**
       * Returns the index of item in #QModelIndex object form.
       *
-      * \param row the row number
-      * \param column the column number
-      * \param parent index of parent
-      * \return #QModelIndex index of the item at specified position
+      * \param row The row number
+      * \param column The column number
+      * \param parent Index of parent
+      * \return QModelIndex index of the item at specified position
       */
     QModelIndex index(int row, int column,
         const QModelIndex& parent = QModelIndex()) const final;
@@ -72,18 +72,18 @@ public:
     /**
       * Returns the index of the parent of the item specified by input param.
       *
-      * \param index of item that is a child of the parent
-      * \return #QModelIndex index of the parent
+      * \param index The index of item that is a child of the parent
+      * \return QModelIndex index of the parent
       */
     QModelIndex parent(const QModelIndex& index) const final;
 
     /**
       * Returns the index of the parent of the item specified by the input params.
       *
-      * \param row the row number
-      * \param column the column number
-      * \param parent index of parent
-      * \return #QModelIndex index of the parent
+      * \param row The row number
+      * \param column The column number
+      * \param parent Index of parent
+      * \return QModelIndex index of the parent
       */
     QModelIndex parent(int row, int column,
         const QModelIndex& parent = QModelIndex()) const;
@@ -91,24 +91,24 @@ public:
     /**
       * Returns asset item at specified index.
       *
-      * \param index of item that is a child of the parent
-      * \return #assetTreeItem pointer to the item at the provided index
+      * \param index The index of item that is a child of the parent
+      * \return Pointer to the item at the provided index
       */
     AssetTreeItem* assetItem(const QModelIndex& index);
 
     /**
       * Returns number of children/rows of the parent.
       *
-      * \param parent #QModelIndex of the parent item
-      * \return number of children/rows of this parent
+      * \param parent QModelIndex of the parent item
+      * \return The number of children/rows of this parent
       */
     int rowCount(const QModelIndex& parent = QModelIndex()) const final;
 
     /**
       * Returns the number of columns of data in each item of the tree.
       *
-      * \param parent specified by the #QModelIndex index
-      * \return the number of data columns
+      * \param parent The parent specified by the QModelIndex index
+      * \return The number of data columns
       */
     int columnCount(const QModelIndex& parent = QModelIndex()) const final;
 
@@ -116,18 +116,18 @@ public:
       * Return the Qt flags of the item specified by index, which can include
       * Qt::ItemIsEnabled, Qt::ItemIsSelectable.
       *
-      * \param index specified by the #QModelIndex index
-      * \return the Qt flags
+      * \param index The index specified by the #QModelIndex index
+      * \return The Qt flags
       */
     Qt::ItemFlags flags(const QModelIndex& index) const final;
 
     /**
       * Set data at index \p index.
       *
-      * \param index location of the item to set
+      * \param index Location of the item to set
       * \param value The #QVariant data element to store at column \p column
       * \param role Qt-specific role to define context of the call
-      * \return true if the data set was successful
+      * \return `true` if the data set was successful
       */
     bool setData(const QModelIndex& index, const QVariant& value,
         int role = Qt::EditRole) final;
@@ -135,9 +135,8 @@ public:
     /**
       * Returns a vector of all #Assets selected in the tree view.
       *
-      * \param outputPaths vector of #openspace::Profile::Asset objects, each of which are
-      *                    selected
-      * \param outputItems vector of #assetTreeItem * objects, each of which are selected
+      * \param outputPaths The vector of paths that were selected
+      * \param outputItems The vector of AssetTreeItem that were selected
       */
     void getSelectedAssets(std::vector<std::string>& outputPaths,
         std::vector<AssetTreeItem*>& outputItems);
@@ -145,6 +144,7 @@ public:
     /**
       * Imports asset tree data for this model by recursively traversing the folder
       * structure.
+      *
       * \param assetBasePath The base path where to find all assets
       * \param assetBasePath The base path where to find user assets
       */
@@ -154,72 +154,72 @@ public:
     /**
       * Returns bool for if item is checked/selected.
       *
-      * \param index location of the item to set
-      * \return true if the item is checked
+      * \param index Location of the item to set
+      * \return `true` if the item is checked
       */
     bool isChecked(QModelIndex& index) const;
 
     /**
       * Answers query about whether or not item is an asset.
       *
-      * \param index location of the item to query
-      * \return true if the item is an asset (and not a directory)
+      * \param index Location of the item to query
+      * \return `true` if the item is an asset (and not a directory)
       */
     bool isAsset(QModelIndex& index) const;
 
     /**
       * Answers query about whether or not item is in the current filesystem.
       *
-      * \param index location of the item to query
-      * \return true if the data is in the filesystem
+      * \param index Location of the item to query
+      * \return `true` if the data is in the filesystem
       */
     bool inFilesystem(QModelIndex& index) const;
 
     /**
       * Returns number of child items of referenced item.
       *
-      * \param index location of the item to query
-      * \return number of child items
+      * \param index Location of the item to query
+      * \return Number of child items
       */
     int childCount(QModelIndex& index) const;
 
     /**
       * Returns a pointer to a child item of the current item.
       *
-      * \param row the child number of the current item
-      * \return assetTreeItem pointer to the child
+      * \param row The child number of the current item
+      * \return The pointer to the child
       */
     AssetTreeItem* child(int row) const;
 
     /**
       * Returns the asset name of the specified item.
       *
-      * \param index location of the item to query
-      * \return the asset name of the item
+      * \param index Location of the item to query
+      * \return The asset name of the item
       */
     QString name(QModelIndex& index) const;
 
     /**
       * Set asset name at specified index.
       *
-      * \param index location of the item to set
-      * \param name the asset name to set
+      * \param index Location of the item to set
+      * \param name The asset name to set
       */
     void setName(QModelIndex& index, QString name);
 
     /**
       * Set state of checked/selected of an item.
       *
-      * \param index location of the item to set
-      * \param checked true if item is checked/selected
+      * \param index Location of the item to set
+      * \param checked `true` if item is checked/selected
       */
     void setChecked(QModelIndex& index, bool checked);
 
     /**
       * Set state of whether or not asset exists in filesystem.
       *
-      * \param index location of the item to set
-      * \param fileExists true if asset exists in filesystem
+      * \param index Location of the item to set
+      * \param fileExists `true` if asset exists in filesystem
       */
     void setExistenceInFilesystem(QModelIndex& index, bool fileExists);
 
diff --git a/apps/OpenSpace/ext/launcher/include/profile/cameradialog.h b/apps/OpenSpace/ext/launcher/include/profile/cameradialog.h
index aa6c018e4a..85eef19954 100644
--- a/apps/OpenSpace/ext/launcher/include/profile/cameradialog.h
+++ b/apps/OpenSpace/ext/launcher/include/profile/cameradialog.h
@@ -40,9 +40,9 @@ public:
     /**
      * Constructor for camera gui class
      *
-     * \param profile The #openspace::Profile object containing all data of the
-     *                new or imported profile.
-     * \param parent Pointer to parent Qt widget (optional)
+     * \param parent Pointer to parent Qt widget
+     * \param profile The #openspace::Profile::CameraType object containing all data of
+     *        the new or imported profile
      */
     CameraDialog(QWidget* parent, std::optional<openspace::Profile::CameraType>* camera);
 
diff --git a/apps/OpenSpace/ext/launcher/include/profile/deltatimesdialog.h b/apps/OpenSpace/ext/launcher/include/profile/deltatimesdialog.h
index 8061117d30..40fbaf004a 100644
--- a/apps/OpenSpace/ext/launcher/include/profile/deltatimesdialog.h
+++ b/apps/OpenSpace/ext/launcher/include/profile/deltatimesdialog.h
@@ -37,27 +37,27 @@ class DeltaTimesDialog final : public QDialog {
 Q_OBJECT
 public:
     /**
-     * Constructor for deltaTimes class
+     * Constructor for deltaTimes class.
      *
-     * \param profile The #openspace::Profile object containing all data of the
-     *                 new or imported profile.
      * \param parent Pointer to parent Qt widget
+     * \param profile The list of delta times containing all data of the new or imported
+     *        profile
      */
     DeltaTimesDialog(QWidget* parent, std::vector<double>* deltaTimes);
 
     /**
-     * Returns a text summary of the delta time list for display purposes
+     * Returns a text summary of the delta time list for display purposes.
      *
      * \param idx index in dt list
-     * \param forListView true if this summary is for the Qt list view, false if
-     *                    it is used for a different display mode
+     * \param forListView true if this summary is for the Qt list view, false if it is
+     *        used for a different display mode
      */
     std::string createSummaryForDeltaTime(size_t idx, bool forListView);
 
     /**
-     * Handles keypress while the Qt dialog window is open
+     * Handles keypress while the Qt dialog window is open.
      *
-     * \param evt #QKeyEvent object for the key press event
+     * \param evt QKeyEvent object for the key press event
      */
     virtual void keyPressEvent(QKeyEvent* evt) override;
 
@@ -73,9 +73,9 @@ private:
     void parseSelections();
 
     /**
-     * Called to transition to editing a particular dt value (gui settings)
+     * Called to transition to editing a particular dt value (gui settings).
      *
-     * \param index index in dt list
+     * \param index Index in dt list
      * \param state `true` if the edit mode should be turned on, `false` otherwise
      */
     void transitionEditMode(int index, bool state);
diff --git a/apps/OpenSpace/ext/launcher/include/profile/marknodesdialog.h b/apps/OpenSpace/ext/launcher/include/profile/marknodesdialog.h
index 89cfd94a08..5a7f29faf9 100644
--- a/apps/OpenSpace/ext/launcher/include/profile/marknodesdialog.h
+++ b/apps/OpenSpace/ext/launcher/include/profile/marknodesdialog.h
@@ -36,18 +36,18 @@ class MarkNodesDialog final : public QDialog {
 Q_OBJECT
 public:
     /**
-     * Constructor for markNodes class
+     * Constructor for markNodes class.
      *
-     * \param profile The #openspace::Profile object containing all data of the
-     *                new or imported profile.
      * \param parent Pointer to parent Qt widget
+     * \param profile The list of marked nodes containing all data of the new or imported
+     *        profile
      */
     MarkNodesDialog(QWidget* parent, std::vector<std::string>* markedNodes);
 
     /**
-     * Handles keypress while the Qt dialog window is open
+     * Handles keypress while the Qt dialog window is open.
      *
-     * \param evt #QKeyEvent object for the key press event
+     * \param evt QKeyEvent object for the key press event
      */
     void keyPressEvent(QKeyEvent* evt) override;
 
diff --git a/apps/OpenSpace/ext/launcher/include/profile/metadialog.h b/apps/OpenSpace/ext/launcher/include/profile/metadialog.h
index a496605a81..46545b6d08 100644
--- a/apps/OpenSpace/ext/launcher/include/profile/metadialog.h
+++ b/apps/OpenSpace/ext/launcher/include/profile/metadialog.h
@@ -39,9 +39,9 @@ public:
    /**
     * Constructor for meta class.
     *
-    * \param profile The #openspace::Profile object containing all data of the
-    *                new or imported profile.
     * \param parent Pointer to parent Qt widget
+    * \param profile The #openspace::Profile::Meta object containing all data of the
+    *        new or imported profile
     */
     MetaDialog(QWidget* parent, std::optional<openspace::Profile::Meta>* meta);
 
diff --git a/apps/OpenSpace/ext/launcher/include/profile/modulesdialog.h b/apps/OpenSpace/ext/launcher/include/profile/modulesdialog.h
index f334a786dd..fd1f856336 100644
--- a/apps/OpenSpace/ext/launcher/include/profile/modulesdialog.h
+++ b/apps/OpenSpace/ext/launcher/include/profile/modulesdialog.h
@@ -39,18 +39,18 @@ class ModulesDialog final : public QDialog {
 Q_OBJECT
 public:
     /**
-     * Constructor for osmodules class
+     * Constructor for modules class.
      *
-     * \param profile The #openspace::Profile object containing all data of the
-     *                new or imported profile.
      * \param parent Pointer to parent Qt widget
+     * \param profile The #openspace::Profile::Module object containing all data of the
+     *        new or imported profile
      */
     ModulesDialog(QWidget* parent, std::vector<openspace::Profile::Module>* modules);
 
     /**
-     * Handles keypress while the Qt dialog window is open
+     * Handles keypress while the Qt dialog window is open.
      *
-     * \param evt #QKeyEvent object for the key press event
+     * \param evt QKeyEvent object for the key press event
      */
     virtual void keyPressEvent(QKeyEvent* evt) override;
 
diff --git a/apps/OpenSpace/ext/launcher/include/profile/profileedit.h b/apps/OpenSpace/ext/launcher/include/profile/profileedit.h
index 5f79490fd8..d2e1e90925 100644
--- a/apps/OpenSpace/ext/launcher/include/profile/profileedit.h
+++ b/apps/OpenSpace/ext/launcher/include/profile/profileedit.h
@@ -40,10 +40,10 @@ class ProfileEdit final : public QDialog {
 Q_OBJECT
 public:
     /**
-     * Constructor for ProfileEdit class
+     * Constructor for ProfileEdit class.
      *
-     * \param profile The #openspace::Profile object containing all data of the
-     *                new or imported profile.
+     * \param profile The #openspace::Profile object containing all data of the new or
+     *        imported profile
      * \param profileName The name of the profile to create
      * \param assetBasePath The path to the folder where the assets live
      * \param userAssetBasePath The path to the folder where the user assets live
@@ -59,7 +59,7 @@ public:
     /**
      * Gets the status of the save when the window is closed; was the file saved?
      *
-     * \return true if the file was saved (false if cancel)
+     * \return `true` if the file was saved (false if cancel)
      */
     bool wasSaved() const;
 
@@ -67,14 +67,14 @@ public:
      * Gets the profile name from the top save/edit window. This can be changed by user in
      * order to save to a different file.
      *
-     * \return the profile name
+     * \return The profile name
      */
     std::string specifiedFilename() const;
 
     /**
-     * Handles keypress while the Qt dialog window is open
+     * Handles keypress while the Qt dialog window is open.
      *
-     * \param evt #QKeyEvent object for the key press event
+     * \param evt The QKeyEvent object for the key press event
      */
     virtual void keyPressEvent(QKeyEvent* evt) override;
 
diff --git a/apps/OpenSpace/ext/launcher/include/profile/propertiesdialog.h b/apps/OpenSpace/ext/launcher/include/profile/propertiesdialog.h
index 6522de4035..a8900b0209 100644
--- a/apps/OpenSpace/ext/launcher/include/profile/propertiesdialog.h
+++ b/apps/OpenSpace/ext/launcher/include/profile/propertiesdialog.h
@@ -40,19 +40,19 @@ class PropertiesDialog final : public QDialog {
 Q_OBJECT
 public:
     /**
-     * Constructor for properties class
+     * Constructor for properties class.
      *
-     * \param profile The #openspace::Profile object containing all data of the
-     *                new or imported profile.
      * \param parent Pointer to parent Qt widget
+     * \param properties The #openspace::Profile::Property object containing all data of
+     *        the new or imported profile
      */
     PropertiesDialog(QWidget* parent,
         std::vector<openspace::Profile::Property>* properties);
 
     /**
-     * Handles keypress while the Qt dialog window is open
+     * Handles keypress while the Qt dialog window is open.
      *
-     * \param evt #QKeyEvent object for the key press event
+     * \param evt The QKeyEvent object for the key press event
      */
     virtual void keyPressEvent(QKeyEvent* evt) override;
 
diff --git a/apps/OpenSpace/ext/launcher/include/profile/scriptlogdialog.h b/apps/OpenSpace/ext/launcher/include/profile/scriptlogdialog.h
index b3014f0e31..b85f4a678e 100644
--- a/apps/OpenSpace/ext/launcher/include/profile/scriptlogdialog.h
+++ b/apps/OpenSpace/ext/launcher/include/profile/scriptlogdialog.h
@@ -41,10 +41,10 @@ signals:
 
 private:
     void createWidgets();
-    
+
     void loadScriptFile();
     void saveChosenScripts();
-    
+
     void updateScriptList();
 
     QListWidget* _scriptlogList = nullptr;
diff --git a/apps/OpenSpace/ext/launcher/include/profile/timedialog.h b/apps/OpenSpace/ext/launcher/include/profile/timedialog.h
index 268c688976..0fd18a8aba 100644
--- a/apps/OpenSpace/ext/launcher/include/profile/timedialog.h
+++ b/apps/OpenSpace/ext/launcher/include/profile/timedialog.h
@@ -39,11 +39,11 @@ class TimeDialog final : public QDialog {
 Q_OBJECT
 public:
     /**
-     * Constructor for ostime class
+     * Constructor for ostime class.
      *
-     * \param profile The #openspace::Profile object containing all data of the
-     *                new or imported profile.
      * \param parent Pointer to parent Qt widget
+     * \param time The #openspace::Profile::Time object containing all data of the new or
+     *        imported profile.
      */
     TimeDialog(QWidget* parent, std::optional<openspace::Profile::Time>* time);
 
diff --git a/apps/OpenSpace/ext/launcher/include/sgctedit/displaywindowunion.h b/apps/OpenSpace/ext/launcher/include/sgctedit/displaywindowunion.h
index d4d67968c3..bd3c0f824e 100644
--- a/apps/OpenSpace/ext/launcher/include/sgctedit/displaywindowunion.h
+++ b/apps/OpenSpace/ext/launcher/include/sgctedit/displaywindowunion.h
@@ -39,27 +39,27 @@ Q_OBJECT
 public:
     /**
      * Constructor for DisplayWindowUnion class, which manages the overall control layout
-     * including monitorBox, multiple WindowControl columns, and additional controls
+     * including monitorBox, multiple WindowControl columns, and additional controls.
      *
-     * \param monitorSizeList A vector containing QRect objects containing pixel dims
-     *                        of each monitor
-     * \param nMaxWindows The maximum number of windows allowed (depends on the number
-     *                    of monitors in the system)
-     * \param winColors An array of QColor objects for window colors. The indexing of
-     *                  this array matches the window indexing used elsewhere in the
-     *                  class. This allows for a unique color for each window.
+     * \param monitorSizeList A vector containing QRect objects containing pixel dims of
+     *        each monitor
+     * \param nMaxWindows The maximum number of windows allowed (depends on the number of
+     *        monitors in the system)
+     * \param winColors An array of QColor objects for window colors. The indexing of this
+     *        array matches the window indexing used elsewhere in the class. This allows
+     *        for a unique color for each window
      * \param resetToDefault If set to true, all display and window settings will be
-     *                       initialized to their default values.
+     *        initialized to their default values
      * \param parent The parent to which this widget belongs
      */
     DisplayWindowUnion(const std::vector<QRect>& monitorSizeList,
         int nMaxWindows, const std::array<QColor, 4>& windowColors, bool resetToDefault,
         QWidget* parent = nullptr);
-    
+
     /**
      * Returns a vector of pointers to the WindowControl objects for all visible windows.
      *
-     * \return vector of pointers of WindowControl objects
+     * \return The vector of pointers of WindowControl objects
      */
     std::vector<WindowControl*> activeWindowControls() const;
 
@@ -67,7 +67,7 @@ public:
      * Returns a vector of pointers to the WindowControl objects for all windows, whether
      * they are visible or not.
      *
-     * \return vector of pointers of all WindowControl objects
+     * \return The vector of pointers of all WindowControl objects
      */
     std::vector<WindowControl*>& windowControls();
 
@@ -87,14 +87,14 @@ public:
      * Returns the number of windows that are displayed (there can be more window
      * objects than are currently displayed).
      *
-     * \return the number of displayed windows in the current configuration
+     * \return The number of displayed windows in the current configuration
      */
     unsigned int numWindowsDisplayed() const;
 
 signals:
     /**
-     * This signal is emitted when a windowhas changed.
-     * 
+     * This signal is emitted when a window has changed.
+     *
      * \param monitorIndex The 0-based index of the monitor to which the window belongs to
      * \param windowIndex The 0-based index of the window that was changed
      * \param newDimensions The pixel sizes of the window after the change
@@ -103,7 +103,7 @@ signals:
 
     /**
      * This signal is emitted when the total number of windows has changed.
-     * 
+     *
      * \param newCount The new total number of windows
      */
     void nWindowsChanged(int newCount);
diff --git a/apps/OpenSpace/ext/launcher/include/sgctedit/monitorbox.h b/apps/OpenSpace/ext/launcher/include/sgctedit/monitorbox.h
index c8f080fc24..7819ae58dc 100644
--- a/apps/OpenSpace/ext/launcher/include/sgctedit/monitorbox.h
+++ b/apps/OpenSpace/ext/launcher/include/sgctedit/monitorbox.h
@@ -35,16 +35,16 @@ class MonitorBox final : public QWidget {
 Q_OBJECT
 public:
     /**
-     * Constructor for MonitorBox class, which displays the system's monitor(s),
-     * their relative position and size, and window(s) that they contain
+     * Constructor for MonitorBox class, which displays the system's monitor(s), their
+     * relative position and size, and window(s) that they contain.
      *
      * \param widgetDims The size of the display widget in pixels, stored in QRect
-     * \param monitorResolution A vector containing the monitor's maximum display
-     *                          size in pixels in a QRect object
+     * \param monitorResolution A vector containing the monitor's maximum display size in
+     *        pixels in a QRect object
      * \param nWindows The current number of windows that has been selected by the user
-     * \param winColors An array of QColor objects for window colors. The indexing of
-     *                  this array matches the window indexing used elsewhere in the
-     *                  class. This allows for a unique color for each window.
+     * \param winColors An array of QColor objects for window colors. The indexing of this
+     *        array matches the window indexing used elsewhere in the class. This allows
+     *        for a unique color for each window
      * \param parent The parent which to which this MonitorBox belongs
      */
     MonitorBox(QRect widgetDims, const std::vector<QRect>& monitorResolutions,
@@ -65,7 +65,7 @@ public:
 
     /**
      * Called when the number of windows that should be displayed changes.
-     * 
+     *
      * \param newCount The new number of windows included
      */
     void nWindowsDisplayedChanged(int newCount);
diff --git a/apps/OpenSpace/ext/launcher/include/sgctedit/orientationdialog.h b/apps/OpenSpace/ext/launcher/include/sgctedit/orientationdialog.h
index 5e4f62d370..498cf7cb20 100644
--- a/apps/OpenSpace/ext/launcher/include/sgctedit/orientationdialog.h
+++ b/apps/OpenSpace/ext/launcher/include/sgctedit/orientationdialog.h
@@ -37,16 +37,16 @@ Q_OBJECT
 public:
     /**
      * Constructor for OrientationDialog object which contains the input text boxes for
-     * orientation x,y,z values
+     * orientation x,y,z values,
      *
-     * \param orientation x,y,z angles in degrees contained in sgct::quat object
-     * \param parent pointer to Qt QWidget parent object
+     * \param orientation The x,y,z angles in degrees contained in sgct::quat object
+     * \param parent Pointer to Qt QWidget parent object
      */
     OrientationDialog(sgct::quat& orientation, QWidget* parent);
 
 private:
     void ok();
-    
+
     QLineEdit* _linePitch = nullptr;
     QLineEdit* _lineRoll = nullptr;
     QLineEdit* _lineYaw = nullptr;
diff --git a/apps/OpenSpace/ext/launcher/include/sgctedit/settingswidget.h b/apps/OpenSpace/ext/launcher/include/sgctedit/settingswidget.h
index 393f739837..6c15ff4094 100644
--- a/apps/OpenSpace/ext/launcher/include/sgctedit/settingswidget.h
+++ b/apps/OpenSpace/ext/launcher/include/sgctedit/settingswidget.h
@@ -39,45 +39,44 @@ Q_OBJECT
 public:
     /**
      * Constructor for Orientation class, which manages the overall control layout
-     * including monitorBox, multiple WindowControl columns, and additional controls
+     * including monitorBox, multiple WindowControl columns, and additional controls.
      */
     SettingsWidget(sgct::quat orientation, QWidget* parent = nullptr);
-   
+
     /**
-     * Gets the user-provided x,y,z orientation values (degrees)
+     * Gets the user-provided x,y,z orientation values (degrees).
      *
-     * \return the orientation angles provided in sgct::quat object
+     * \return The orientation angles provided in sgct::quat object
      */
     sgct::quat orientation() const;
-   
+
     /**
-     * Gets the value for if VSync is enabled
+     * Gets the value for if VSync is enabled.
      *
-     * \return true if the VSync option is checked/enabled
+     * \return `true` if the VSync option is checked/enabled
      */
     bool vsync() const;
 
     /**
-     * Gets whether the UI should be restricted to the first window
-     * 
-     * \return true if the UI should only be on the first window
+     * Gets whether the UI should be restricted to the first window.
+     *
+     * \return `true` if the UI should only be on the first window
      */
     bool showUiOnFirstWindow() const;
 
     /**
-     * Sets the value of the checkbox for putting the GUI only on the first window.
-     * If this is enabled, then the first window will draw2D but not draw3D. All
-     * subsequent windows will be the opposite of this.
-     * 
-     * \param setUiOnFirstWindow boolean value, if set true then the GUI will only
-     *                           be on the first window
+     * Sets the value of the checkbox for putting the GUI only on the first window. If
+     * this is enabled, then the first window will draw2D but not draw3D. All subsequent
+     * windows will be the opposite of this.
+     *
+     * \param setUiOnFirstWindow If `true` then the GUI will only be on the first window
      */
     void setShowUiOnFirstWindow(bool setUiOnFirstWindow);
 
     /**
      * Sets value for whether or not the checkbox for having the UI only on the first
      * window is enabled. This checkbox should only be clickable if the number of
-     * windows is 2 or more. 
+     * windows is 2 or more.
      */
     void setEnableShowUiOnFirstWindowCheckbox(bool enable);
 
@@ -85,48 +84,48 @@ public:
      * Gets the value of the selection for which display first window should mirror if
      * the option to show the Ui in the first window is enabled. Note that this will
      * return a value even if the checkbox is not enabled.
-     * 
-     * \return -1 if in a disabled state (e.g. when showUiOnFirstWindow() returns false)
-     *          0 if no window graphics are selected (only the UI will appear)
-     *          (1-4) for which window's setting will be used for window 1 graphics
+     *
+     * \return `-1` if in a disabled state (e.g. when showUiOnFirstWindow() returns
+     *         false). `0` if no window graphics are selected (only the UI will appear).
+     *          `(1-4)` for which window's setting will be used for window 1 graphics
      */
     int graphicsSelectionForShowUiOnFirstWindow() const;
 
     /**
      * Sets value of the graphics selection combo box for which other window that the
      * first window will mirror.
-     * 
-     * \param selection int value for the combo box selection.
-     *                  0 if no window graphics are selected (only the UI will appear)
-     *                  (1-4) for which window's setting to use for window 1 graphics
+     *
+     * \param selection integer value for the combo box selection. `0` if no window
+     *        graphics are selected (only the UI will appear). `(1-4)` for which window's
+     *        setting to use for window 1 graphics
      */
     void setGraphicsSelectionForShowUiOnFirstWindow(int selection);
 
     /**
      * Sets the value of the checkbox for enabling VSync.
-     * 
-     * \param enableVsync boolean value, if set true then VSync is enabled
+     *
+     * \param enableVsync If set `true` then VSync is enabled
      */
     void setVsync(bool enableVsync);
 
     /**
      * Called when the number of windows that should be displayed changes.
-     * 
+     *
      * \param newCount The new number of windows included
      */
     void nWindowsDisplayedChanged(int newCount);
 
     /**
-     * Gets the pointer to the QComboBox that selects the graphics for first window
-     * 
-     * \return pointer to the QComboBox object
+     * Gets the pointer to the QComboBox that selects the graphics for first window.
+     *
+     * \return Pointer to the QComboBox object
      */
     QComboBox* firstWindowGraphicsSelection();
 
     /**
-     * Gets the pointer to the QCheckBox that selects if UI is in first window only
-     * 
-     * \return pointer to the QCheckBox object
+     * Gets the pointer to the QCheckBox that selects if UI is in first window only.
+     *
+     * \return Pointer to the QCheckBox object
      */
     QCheckBox* showUiOnFirstWindowCheckbox();
 
@@ -135,7 +134,7 @@ signals:
 
 private:
     void showUiOnFirstWindowClicked(bool checked);
-    void firstWindowGraphicsSelectionChanged(const QString &text);
+    void firstWindowGraphicsSelectionChanged(const QString& text);
 
     sgct::quat _orientationValue = sgct::quat(0.f, 0.f, 0.f, 0.f);
     QCheckBox* _checkBoxVsync = nullptr;
diff --git a/apps/OpenSpace/ext/launcher/include/sgctedit/sgctedit.h b/apps/OpenSpace/ext/launcher/include/sgctedit/sgctedit.h
index 8168f17bf5..96f01ab007 100644
--- a/apps/OpenSpace/ext/launcher/include/sgctedit/sgctedit.h
+++ b/apps/OpenSpace/ext/launcher/include/sgctedit/sgctedit.h
@@ -52,7 +52,7 @@ public:
      *
      * \param parent The Qt QWidget parent object
      * \param userConfigPath A string containing the file path of the user config
-     *                       directory where all window configs are stored
+     *        directory where all window configs are stored
      */
     SgctEdit(QWidget* parent, std::string userConfigPath);
 
@@ -70,37 +70,37 @@ public:
         std::string& configBasePath, QWidget* parent);
 
     /**
-     * Returns the saved filename
+     * Returns the saved filename.
      *
-     * \return saved filename in std::string
+     * \return The saved filename in std::string
      */
     std::filesystem::path saveFilename() const;
 
     /**
      * Returns the generated Cluster object.
-     * 
+     *
      * \return The generated Cluster object
      */
     sgct::config::Cluster cluster() const;
 
     /**
      * Called when the number of windows that should be displayed changes.
-     * 
+     *
      * \param newCount The new number of windows included
      */
     void nWindowsDisplayedChanged(int newCount);
 
     /**
      * Called when the checkbox for GUI only on first window is clicked.
-     * 
-     * \param checked true if GUI is selected for first window only.
+     *
+     * \param checked `true` if GUI is selected for first window only.
      */
     void firstWindowGuiOptionClicked(bool checked);
 
     /**
      * Called when the QComboBox is selected and has a new value
-     * 
-     * \param text the QString of the selected value
+     *
+     * \param text The QString of the selected value
      */
     void firstWindowGraphicsSelectionChanged(const QString& text);
 
diff --git a/apps/OpenSpace/ext/launcher/include/sgctedit/windowcontrol.h b/apps/OpenSpace/ext/launcher/include/sgctedit/windowcontrol.h
index f7ae463f5f..2433a618d5 100644
--- a/apps/OpenSpace/ext/launcher/include/sgctedit/windowcontrol.h
+++ b/apps/OpenSpace/ext/launcher/include/sgctedit/windowcontrol.h
@@ -50,55 +50,58 @@ public:
     };
 
     /**
-     * Constructor for WindowControl class, which contains settings and configuration
-     * for individual windows
+     * Constructor for WindowControl class, which contains settings and configuration for
+     * individual windows.
      *
      * \param monitorIndex The zero-based index for monitor number that this window
-     *                     resides in
+     *        resides in
      * \param windowIndex The zero-based window index
      * \param monitorDims Vector of monitor dimensions in QRect form
      * \param winColor A QColor object for this window's unique color
+     * \param resetToDefault If this is `true`, the widgets will be initialized to their
+     *        default values
+     * \param parent The parent widget
      */
     WindowControl(int monitorIndex, int windowIndex,
         const std::vector<QRect>& monitorDims, const QColor& winColor,
         bool resetToDefault, QWidget* parent);
-    
+
     /**
-     * Makes the window label at top of a window control column visible
+     * Makes the window label at top of a window control column visible.
      *
-     * \param bool Shows the window label if true
+     * \param show Shows the window label if true
      */
     void showWindowLabel(bool show);
 
     /**
-     * Resets all controls for this window to default settings
+     * Resets all controls for this window to default settings.
      */
     void resetToDefaults();
 
     /**
-     * Sets the window dimensions
+     * Sets the window dimensions.
      *
      * \param newDims The x, y dimensions to set the window to
      */
     void setDimensions(QRectF newDims);
-                                   
+
     /**
-     * Sets the monitor selection combobox
+     * Sets the monitor selection combobox.
      *
      * \param monitorIndex The zero-based monitor index to set the combobox selection to
      */
     void setMonitorSelection(int monitorIndex);
 
     /**
-     * Sets the window name in the text edit box
+     * Sets the window name in the text edit box.
      *
      * \param windowName The window title to set
      */
     void setWindowName(const std::string& windowName);
 
     /**
-     * Sets the window's decoration status. If set to true, then the window has a
-     * border. If false it is borderless
+     * Sets the window's decoration status. If set to true, then the window has a border.
+     * If false it is borderless.
      *
      * \param hasWindowDecoration boolean for if window has decoration (border)
      */
@@ -106,10 +109,10 @@ public:
 
     /**
      * Generates window configuration (sgct::config::Window struct) based on the
-     * GUI settings. 
+     * GUI settings.
      *
-     * \param window The sgct::config::Window struct that is passed into the function
-     *               and modified with the generated window content
+     * \param window The sgct::config::Window struct that is passed into the function and
+     *        modified with the generated window content
      */
     void generateWindowInformation(sgct::config::Window& window) const;
 
@@ -117,67 +120,67 @@ public:
      * Sets the window's projection type to planar, with the accompanying parameters
      * for horizontal and vertical FOV.
      *
-     * \param hfov float value for horizontal field of view angle (degrees)
-     * \param vfov float value for vertical field of view angle (degrees)
+     * \param hfov The horizontal field of view angle in degrees
+     * \param vfov The vertical field of view angle in degrees
      */
     void setProjectionPlanar(float hfov, float vfov);
 
     /**
      * Sets the window's projection type to fisheye, with the accompanying quality
-     * setting and spout option
+     * setting and spout option.
      *
-     * \param quality int value for number of vertical lines of resolution. This will
-     *                be compared against the QualityValues array in order to set the
-     *                correct combobox index
-     * \param spoutOutput bool for enabling the spout output option
+     * \param quality The value for number of vertical lines of resolution. This will be
+     *        compared against the QualityValues array in order to set the correct
+     *       combobox index
+     * \param spoutOutput Enabling the spout output option
      */
     void setProjectionFisheye(int quality, bool spoutOutput);
 
     /**
      * Sets the window's projection type to spherical mirror, with the accompanying
-     * quality setting
+     * quality setting.
      *
-     * \param quality int value for number of vertical lines of resolution. This will
-     *                be compared against the QualityValues array in order to set the
-     *                correct combobox index
+     * \param quality The value for number of vertical lines of resolution. This will be
+     *        compared against the QualityValues array in order to set the correct
+     *        combobox index
      */
     void setProjectionSphericalMirror(int quality);
 
     /**
      * Sets the window's projection type to cylindrical, with the accompanying quality
-     * setting and height offset value
+     * setting and height offset value.
      *
-     * \param quality int value for number of vertical lines of resolution. This will
-     *                be compared against the QualityValues array in order to set the
-     *                correct combobox index
-     * \param heightOffset float value for height offset to be applied
+     * \param quality The value for number of vertical lines of resolution. This will be
+     *        compared against the QualityValues array in order to set the correct
+     *        combobox index
+     * \param heightOffset The height offset to be applied
      */
     void setProjectionCylindrical(int quality, float heightOffset);
 
     /**
      * Sets the window's projection type to equirectangular, with the accompanying
-     * quality setting and spout option
+     * quality setting and spout option.
      *
-     * \param quality int value for number of vertical lines of resolution. This will
-     *                be compared against the QualityValues array in order to set the
-     *                correct combobox index
-     * \param spoutOutput bool for enabling the spout output option
+     * \param quality The value for number of vertical lines of resolution. This will be
+     *        compared against the QualityValues array in order to set the correct
+     *        combobox index
+     * \param spoutOutput Enabling the spout output option
      */
     void setProjectionEquirectangular(int quality, bool spoutOutput);
 
     /**
-     * Controls the visibility of all projection controls, including those
-     * that are only shown when the projection type is set to certain values.
+     * Controls the visibility of all projection controls, including those that are only
+     * shown when the projection type is set to certain values.
      *
-     * \param enable bool true if the projections controls should be visible
+     * \param enable `true` if the projections controls should be visible
      */
     void setVisibilityOfProjectionGui(bool enable);
 
     /**
-     * Returns an sgct::config::Projections struct containing the projection
-     * information for this window.
+     * Returns an #sgct::config::Projections struct containing the projection information
+     * for this window.
      *
-     * \return sgct::config::Projections object containing the projection information
+     * \return The object containing the projection information
      */
     sgct::config::Projections generateProjectionInformation() const;
 
@@ -213,7 +216,7 @@ private:
     bool _fovLocked = true;
     std::vector<QRect> _monitorResolutions;
     QRectF _windowDimensions;
-    
+
     QLabel* _windowNumber = nullptr;
     QLineEdit* _windowName = nullptr;
     QComboBox* _monitor = nullptr;
diff --git a/apps/OpenSpace/ext/sgct b/apps/OpenSpace/ext/sgct
index 2c151bbffe..e2e1b99a2d 160000
--- a/apps/OpenSpace/ext/sgct
+++ b/apps/OpenSpace/ext/sgct
@@ -1 +1 @@
-Subproject commit 2c151bbffe768f6ac91cd81a5cee92fffb83b5cd
+Subproject commit e2e1b99a2de784d1774d8b72262fc4def2f0b5ce
diff --git a/ext/ghoul b/ext/ghoul
index b9c9a031f8..82f83b40fd 160000
--- a/ext/ghoul
+++ b/ext/ghoul
@@ -1 +1 @@
-Subproject commit b9c9a031f8169f13349c458815ecf34e9f6990d6
+Subproject commit 82f83b40fda985e9adc25ab94f253fe127bdeee0
diff --git a/include/openspace/interaction/sessionrecording.h b/include/openspace/interaction/sessionrecording.h
index 284ea1e459..7579e9d28e 100644
--- a/include/openspace/interaction/sessionrecording.h
+++ b/include/openspace/interaction/sessionrecording.h
@@ -585,6 +585,7 @@ public:
      the file format version number.
      *
      * \param filename source filename to be converted
+     * \param mode Whether the file is binary or text-based
      *
      * \return pathname of the converted version of the file
      */
diff --git a/include/openspace/util/time.h b/include/openspace/util/time.h
index 2499431517..2f8aae1d18 100644
--- a/include/openspace/util/time.h
+++ b/include/openspace/util/time.h
@@ -38,15 +38,12 @@ namespace scripting { struct LuaLibrary; }
  * the J2000 epoch or a `string` that denotes a valid date string in accordance to the
  * SPICE library (http://naif.jpl.nasa.gov/pub/naif/toolkit_docs/C/cspice/str2et_c.html).
  * The time can be retrieved as the number of seconds since the J2000 epoch with
- * #currentTime or as a UTC string following ISO 8601 with the method #UTC.
+ * #j2000Seconds or as a UTC string following ISO 8601 with the method #UTC.
  *
- * In addition to the time itself, it also stores a delta time value. This value denotes
- * the number of seconds that pass for each real-time second. This value is set with
- * #setDeltaTime(double), retrieved with deltaTime() and solely used in the
- * #advanceTime(double), which takes a `tickTime` parameter. The value of the parameter is
- * dependent on the usage of the class and must be equal to the real-world time that has
- * passed since the last call to the method. For example, if the #advanceTime(double)
- * method is called each frame, the `tickTime` has to be equal to the frame time.
+ * The value of the parameter is dependent on the usage of the class and must be equal to
+ * the real-world time that has passed since the last call to the method. For example, if
+ * the #advanceTime(double) method is called each frame, the `tickTime` has to be equal to
+ * the frame time.
  */
 class Time {
 public:
@@ -153,17 +150,14 @@ public:
     void ISO8601(char* buffer) const;
 
     /**
-     * Advances the simulation time using the #deltaTime and the `tickTime`. The
-     * #deltaTime is the number of simulation seconds that pass for each real-time second.
-     * `tickTime` is the number of real-time seconds that passed since the last call to
-     * this method. If this method is called in the render loop, the \p tickTime should be
-     * equivalent to the frame time.
+     * Advances the simulation time using the \p deltaTime. The \p deltaTime is the number
+     * of seconds that the time should be advanced by. If this method is called in the
+     * render loop, the \p deltaTime should be equivalent to the frame time.
      *
-     * \param tickTime The number of real-time seconds that passed since the last call to
-     *        this method
+     * \param deltaTime The number of seconds that this time should be advanced by
      * \return The new time value after advancing the time
      */
-    double advanceTime(double tickTime);
+    double advanceTime(double deltaTime);
 
     /**
      * Modifies the passed time (first argument) by the delta time (second argument). The
diff --git a/modules/gaia/rendering/octreemanager.h b/modules/gaia/rendering/octreemanager.h
index 997ddad1a9..89710ced51 100644
--- a/modules/gaia/rendering/octreemanager.h
+++ b/modules/gaia/rendering/octreemanager.h
@@ -91,8 +91,8 @@ public:
 
     /**
      * Prints the whole tree structure, including number of stars per node, number of
-     * nodes, tree depth and if node is a leaf. Calls #printStarsPerNode(node, prefix)
-     * internally.
+     * nodes, tree depth and if node is a leaf. Calls
+     * #printStarsPerNode(const OctreeNode&, const std::string&) const internally.
      */
     void printStarsPerNode() const;
 

From f238bf8780f57714776bc0cddbd5f9b93b50794b Mon Sep 17 00:00:00 2001
From: Alexander Bock <mail@alexanderbock.eu>
Date: Mon, 4 Dec 2023 19:53:10 +0100
Subject: [PATCH 201/701] Fix VideoTileLayer -> VideoTileProvider

---
 data/assets/examples/video/videostretchedtotime.asset         | 4 ++--
 .../planets/jupiter/layers/colorlayers/jupiter_video.asset    | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/data/assets/examples/video/videostretchedtotime.asset b/data/assets/examples/video/videostretchedtotime.asset
index 747470b7a7..553733069a 100644
--- a/data/assets/examples/video/videostretchedtotime.asset
+++ b/data/assets/examples/video/videostretchedtotime.asset
@@ -1,4 +1,4 @@
--- To learn how you can include your own video, see the wiki 
+-- To learn how you can include your own video, see the wiki
 -- http://wiki.openspaceproject.com/docs/builders/assets/resources.html
 
 local earth = asset.require("scene/solarsystem/planets/earth/earth")
@@ -8,7 +8,7 @@ local earth = asset.require("scene/solarsystem/planets/earth/earth")
 local Layer = {
   Name = "Stretched Video Example",
   Identifier = "StretchedVideoExample",
-  Type = "VideoTileLayer",
+  Type = "VideoTileProvider",
   Video = asset.resource("examplevideo.mp4"),
   StartTime = "2023 01 29 20:00:00",
   EndTime = "2023 01 29 21:00:00",
diff --git a/data/assets/scene/solarsystem/planets/jupiter/layers/colorlayers/jupiter_video.asset b/data/assets/scene/solarsystem/planets/jupiter/layers/colorlayers/jupiter_video.asset
index 9d9a0aae62..61f18baa2a 100644
--- a/data/assets/scene/solarsystem/planets/jupiter/layers/colorlayers/jupiter_video.asset
+++ b/data/assets/scene/solarsystem/planets/jupiter/layers/colorlayers/jupiter_video.asset
@@ -15,7 +15,7 @@ local Layer = {
   Video = data .. "/jupiter_movie_3600.mp4",
   Name = "Jupiter Video",
   Enabled = true,
-  Type = "VideoTileLayer"
+  Type = "VideoTileProvider"
 }
 
 

From 5038c55e1b332d2c188960a4ad18c2b02820559c Mon Sep 17 00:00:00 2001
From: Alexander Bock <mail@alexanderbock.eu>
Date: Tue, 5 Dec 2023 21:33:18 +0100
Subject: [PATCH 202/701] General asset cleanup and organization

---
 .../dwarf_planets/ceres/ceres.asset           |   2 +-
 .../dwarf_planets/eris/label.asset            |   2 +-
 .../dwarf_planets/eris/trail.asset            |   6 +-
 .../dwarf_planets/gonggong/label.asset        |   2 +-
 .../dwarf_planets/gonggong/planet.asset       |   4 +-
 .../dwarf_planets/gonggong/trail.asset        |   2 +-
 .../dwarf_planets/haumea/label.asset          |   2 +-
 .../dwarf_planets/haumea/trail.asset          |   6 +-
 .../dwarf_planets/makemake/label.asset        |   2 +-
 .../dwarf_planets/makemake/trail.asset        |   6 +-
 .../dwarf_planets/orcus/label.asset           |   2 +-
 .../dwarf_planets/orcus/trail.asset           |   6 +-
 .../dwarf_planets/pluto/charon/charon.asset   |   2 +-
 .../dwarf_planets/pluto/minor/hydra.asset     |   2 +-
 .../dwarf_planets/pluto/minor/kerberos.asset  |   2 +-
 .../dwarf_planets/pluto/minor/nix.asset       |   2 +-
 .../dwarf_planets/pluto/minor/styx.asset      |   2 +-
 .../dwarf_planets/pluto/pluto.asset           |   2 +-
 .../pluto/pluto_trail_kepler.asset            |   4 +-
 .../dwarf_planets/quaoar/label.asset          |   2 +-
 .../dwarf_planets/quaoar/trail.asset          |   6 +-
 .../dwarf_planets/sedna/label.asset           |   2 +-
 .../dwarf_planets/sedna/trail.asset           |   6 +-
 .../dwarf_planets/vesta/label.asset           |   2 +-
 .../dwarf_planets/vesta/trail.asset           |   6 +-
 .../solarsystem/missions/apollo/17/lem.asset  |   4 +-
 .../missions/apollo/8/launch_model.asset      |   4 +-
 .../solarsystem/missions/apollo/8/model.asset |   4 +-
 .../solarsystem/missions/insight/edl.asset    | 291 +++++++++---------
 .../solarsystem/missions/juice/model.asset    |   1 -
 .../solarsystem/missions/juice/plane.asset    |  56 ++--
 .../messenger/mercurymagnetosphere.asset      |   4 +-
 .../missions/newhorizons/label.asset          |   1 -
 .../missions/newhorizons/othermoons.asset     |   2 +-
 .../missions/osirisrex/bennu.asset            |   3 +-
 .../missions/osirisrex/model.asset            |   3 -
 .../missions/perseverance/trail.asset         |   4 +-
 .../missions/voyager/voyager2.asset           |  19 +-
 .../solarsystem/planets/earth/earth.asset     |   2 +-
 .../planets/earth/satellites/misc/iss.asset   |   2 +-
 .../earth/satellites/weather/aqua.asset       |   2 +-
 .../earth/satellites/weather/snpp.asset       |   2 +-
 .../earth/satellites/weather/terra.asset      |   2 +-
 .../solarsystem/planets/earth/trail.asset     |   2 +-
 .../planets/earth/trail_barycenter.asset      |   4 +-
 .../planets/jupiter/callisto/callisto.asset   |   2 +-
 .../planets/jupiter/europa/europa.asset       |   2 +-
 .../planets/jupiter/ganymede/ganymede.asset   |   2 +-
 .../solarsystem/planets/jupiter/io/io.asset   |   2 +-
 .../solarsystem/planets/jupiter/jupiter.asset |   2 +-
 .../layers/colorlayers/jupiter_video.asset    |   4 +-
 .../planets/jupiter/minor/ananke_group.asset  |  40 +--
 .../planets/jupiter/minor/carme_group.asset   |  56 ++--
 .../planets/jupiter/minor/carpo_group.asset   |   8 +-
 .../planets/jupiter/minor/himalia_group.asset |  18 +-
 .../planets/jupiter/minor/inner_group.asset   |   8 +-
 .../planets/jupiter/minor/other_groups.asset  |   6 +-
 .../jupiter/minor/pasiphae_group.asset        |  46 +--
 .../jupiter/minor/themisto_group.asset        |   2 +-
 .../planets/jupiter/trail_barycenter.asset    |   4 +-
 .../planets/jupiter/trail_earth.asset         |   4 +-
 .../scene/solarsystem/planets/mars/mars.asset |   2 +-
 .../planets/mars/moons/deimos.asset           |  12 +-
 .../planets/mars/moons/deimos_globe.asset     |  10 +-
 .../planets/mars/moons/phobos.asset           |  12 +-
 .../planets/mars/moons/phobos_globe.asset     |  10 +-
 .../planets/mars/trail_barycenter.asset       |   4 +-
 .../planets/mars/trail_earth.asset            |   4 +-
 .../solarsystem/planets/mars/transforms.asset |   3 +-
 .../solarsystem/planets/mercury/mercury.asset |   2 +-
 .../planets/mercury/trail_barycenter.asset    |   4 +-
 .../planets/mercury/trail_earth.asset         |   4 +-
 .../planets/neptune/inner_moons.asset         |  14 +-
 .../planets/neptune/irregular_moons.asset     |  10 +-
 .../solarsystem/planets/neptune/neptune.asset |   2 +-
 .../planets/neptune/nereid/nereid.asset       |   2 +-
 .../planets/neptune/trail_barycenter.asset    |   4 +-
 .../planets/neptune/trail_earth.asset         |   4 +-
 .../planets/neptune/transforms.asset          |   3 +-
 .../planets/neptune/triton/triton.asset       |  12 +-
 .../planets/saturn/dione/dione.asset          |   2 +-
 .../planets/saturn/enceladus/enceladus.asset  |   2 +-
 .../planets/saturn/hyperion/hyperion.asset    |   2 +-
 .../planets/saturn/iapetus/iapetus.asset      |   2 +-
 .../planets/saturn/mimas/mimas.asset          |   4 +-
 .../planets/saturn/minor/gallic_group.asset   |   8 +-
 .../planets/saturn/minor/inuit_group.asset    |  16 +-
 .../planets/saturn/minor/norse_group.asset    |  94 +++---
 .../planets/saturn/minor/other_group.asset    |  18 +-
 .../planets/saturn/minor/shepherd_group.asset |  14 +-
 .../planets/saturn/rhea/rhea.asset            |   2 +-
 .../solarsystem/planets/saturn/saturn.asset   |   2 +-
 .../planets/saturn/tethys/tethys.asset        |   2 +-
 .../planets/saturn/titan/titan.asset          |   2 +-
 .../planets/saturn/trail_barycenter.asset     |   4 +-
 .../planets/saturn/trail_earth.asset          |   4 +-
 .../planets/saturn/transforms.asset           |   3 +-
 .../planets/uranus/inner_moons.asset          |  26 +-
 .../uranus/irregular_prograde_moons.asset     |   2 +-
 .../uranus/irregular_retrograde_moons.asset   |  16 +-
 .../planets/uranus/major_moons.asset          |  10 +-
 .../planets/uranus/trail_barycenter.asset     |   4 +-
 .../planets/uranus/trail_earth.asset          |   4 +-
 .../planets/uranus/transforms.asset           |   3 +-
 .../solarsystem/planets/uranus/uranus.asset   |   2 +-
 .../planets/venus/trail_barycenter.asset      |   4 +-
 .../planets/venus/trail_earth.asset           |   4 +-
 .../planets/venus/transforms.asset            |   3 +-
 .../solarsystem/planets/venus/venus.asset     |   2 +-
 data/assets/scene/solarsystem/sun/glare.asset |   2 +-
 .../assets/scene/solarsystem/sun/marker.asset |   2 +-
 data/assets/scene/solarsystem/sun/sun.asset   |   2 +-
 .../scene/solarsystem/sun/transforms.asset    |   3 -
 .../solarsystem/telescopes/gaia/gaia.asset    |   1 -
 .../telescopes/jwst/deployment.mission        |  25 --
 .../telescopes/jwst/transforms.asset          |  10 +-
 116 files changed, 538 insertions(+), 586 deletions(-)
 delete mode 100644 data/assets/scene/solarsystem/telescopes/jwst/deployment.mission

diff --git a/data/assets/scene/solarsystem/dwarf_planets/ceres/ceres.asset b/data/assets/scene/solarsystem/dwarf_planets/ceres/ceres.asset
index d7d52f6171..656ba98de8 100644
--- a/data/assets/scene/solarsystem/dwarf_planets/ceres/ceres.asset
+++ b/data/assets/scene/solarsystem/dwarf_planets/ceres/ceres.asset
@@ -22,8 +22,8 @@ local CeresLabel = {
   Identifier = "CeresLabel",
   Parent = Ceres.Identifier,
   Renderable = {
-    Enabled = false,
     Type = "RenderableLabel",
+    Enabled = false,
     Text = "Ceres",
     FontSize = 70.0,
     Size = 8.66,
diff --git a/data/assets/scene/solarsystem/dwarf_planets/eris/label.asset b/data/assets/scene/solarsystem/dwarf_planets/eris/label.asset
index 46e1349ff3..1df4710d62 100644
--- a/data/assets/scene/solarsystem/dwarf_planets/eris/label.asset
+++ b/data/assets/scene/solarsystem/dwarf_planets/eris/label.asset
@@ -6,8 +6,8 @@ local Label = {
   Identifier = "ErisLabel",
   Parent = transforms.Position.Identifier,
   Renderable = {
-    Enabled = asset.enabled,
     Type = "RenderableLabel",
+    Enabled = asset.enabled,
     Text = "Eris",
     FontSize = 70.0,
     Size = 9.10,
diff --git a/data/assets/scene/solarsystem/dwarf_planets/eris/trail.asset b/data/assets/scene/solarsystem/dwarf_planets/eris/trail.asset
index 4fc0bbb860..ffdd0d45d2 100644
--- a/data/assets/scene/solarsystem/dwarf_planets/eris/trail.asset
+++ b/data/assets/scene/solarsystem/dwarf_planets/eris/trail.asset
@@ -8,12 +8,12 @@ local Trail = {
   Parent = sunTransforms.SunECLIPJ2000.Identifier,
   Renderable = {
     Type = "RenderableTrailOrbit",
+    Enabled = asset.enabled,
+    Translation = transforms.Translation,
     Color = { 0.2, 0.8, 0.3 },
     Period = 205472.1258735657,
     Resolution = 10000,
-    Enabled = asset.enabled,
-    Fade = 1.24,
-    Translation = transforms.Translation
+    Fade = 1.24
   },
   Tag = { "planetTrail_dwarf" },
   GUI = {
diff --git a/data/assets/scene/solarsystem/dwarf_planets/gonggong/label.asset b/data/assets/scene/solarsystem/dwarf_planets/gonggong/label.asset
index 9d53dea400..bfb3ae9826 100644
--- a/data/assets/scene/solarsystem/dwarf_planets/gonggong/label.asset
+++ b/data/assets/scene/solarsystem/dwarf_planets/gonggong/label.asset
@@ -6,8 +6,8 @@ local Label = {
   Identifier = "GonggongLabel",
   Parent = transforms.Position.Identifier,
   Renderable = {
-    Enabled = asset.enabled,
     Type = "RenderableLabel",
+    Enabled = asset.enabled,
     Text = "Gonggong",
     FontSize = 70.0,
     Size = 9.10,
diff --git a/data/assets/scene/solarsystem/dwarf_planets/gonggong/planet.asset b/data/assets/scene/solarsystem/dwarf_planets/gonggong/planet.asset
index 89b0015e6f..e07a4d695f 100644
--- a/data/assets/scene/solarsystem/dwarf_planets/gonggong/planet.asset
+++ b/data/assets/scene/solarsystem/dwarf_planets/gonggong/planet.asset
@@ -9,13 +9,13 @@ local Planet = {
   Transform = {
     Rotation = {
       Type = "ConstantRotation",
-      RotationAxis = {0.0, 0.0, 1.0},
+      RotationAxis = { 0.0, 0.0, 1.0 },
       RotationRate = 1.0 / (22.4 * 60.0 * 60.0)
     }
   },
   Renderable = {
     Type = "RenderableGlobe",
-    Radii = { 615.0E3, 615.0E3, 615.0E3 },
+    Radii = { 615000, 615000, 615000 },
     SegmentsPerPatch = 64,
     Layers = {}
   },
diff --git a/data/assets/scene/solarsystem/dwarf_planets/gonggong/trail.asset b/data/assets/scene/solarsystem/dwarf_planets/gonggong/trail.asset
index a0bbac0870..11da10bf3d 100644
--- a/data/assets/scene/solarsystem/dwarf_planets/gonggong/trail.asset
+++ b/data/assets/scene/solarsystem/dwarf_planets/gonggong/trail.asset
@@ -8,10 +8,10 @@ local Trail = {
   Parent = sunTransforms.SunECLIPJ2000.Identifier,
   Renderable = {
     Type = "RenderableTrailOrbit",
+    Enabled = asset.enabled,
     Color = { 0.2, 0.8, 0.3 },
     Period = 201582.9642396014,
     Resolution = 10000,
-    Enabled = asset.enabled,
     Fade = 1.24,
     Translation = transforms.Translation
   },
diff --git a/data/assets/scene/solarsystem/dwarf_planets/haumea/label.asset b/data/assets/scene/solarsystem/dwarf_planets/haumea/label.asset
index cb2ac20474..99c6f84507 100644
--- a/data/assets/scene/solarsystem/dwarf_planets/haumea/label.asset
+++ b/data/assets/scene/solarsystem/dwarf_planets/haumea/label.asset
@@ -6,8 +6,8 @@ local Label = {
   Identifier = "HaumeaLabel",
   Parent = transforms.Position.Identifier,
   Renderable = {
-    Enabled = asset.enabled,
     Type = "RenderableLabel",
+    Enabled = asset.enabled,
     Text = "Haumea",
     FontSize = 70.0,
     Size = 9.10,
diff --git a/data/assets/scene/solarsystem/dwarf_planets/haumea/trail.asset b/data/assets/scene/solarsystem/dwarf_planets/haumea/trail.asset
index edb2269d8d..eb7f914ac3 100644
--- a/data/assets/scene/solarsystem/dwarf_planets/haumea/trail.asset
+++ b/data/assets/scene/solarsystem/dwarf_planets/haumea/trail.asset
@@ -8,12 +8,12 @@ local Trail = {
   Parent = sunTransforms.SunECLIPJ2000.Identifier,
   Renderable = {
     Type = "RenderableTrailOrbit",
+    Enabled = asset.enabled,
+    Translation = transforms.Translation,
     Color = { 0.2, 0.8, 0.3 },
     Period = 90487.27692706819,
     Resolution = 10000,
-    Enabled = asset.enabled,
-    Fade = 1.24,
-    Translation = transforms.Translation
+    Fade = 1.24
   },
   Tag = { "planetTrail_dwarf" },
   GUI = {
diff --git a/data/assets/scene/solarsystem/dwarf_planets/makemake/label.asset b/data/assets/scene/solarsystem/dwarf_planets/makemake/label.asset
index 218bef1370..a85b62f8e2 100644
--- a/data/assets/scene/solarsystem/dwarf_planets/makemake/label.asset
+++ b/data/assets/scene/solarsystem/dwarf_planets/makemake/label.asset
@@ -6,8 +6,8 @@ local Label = {
   Identifier = "MakemakeLabel",
   Parent = transforms.Position.Identifier,
   Renderable = {
-    Enabled = asset.enabled,
     Type = "RenderableLabel",
+    Enabled = asset.enabled,
     Text = "Makemake",
     FontSize = 70.0,
     Size = 9.10,
diff --git a/data/assets/scene/solarsystem/dwarf_planets/makemake/trail.asset b/data/assets/scene/solarsystem/dwarf_planets/makemake/trail.asset
index f9fcf61293..37ae323c2e 100644
--- a/data/assets/scene/solarsystem/dwarf_planets/makemake/trail.asset
+++ b/data/assets/scene/solarsystem/dwarf_planets/makemake/trail.asset
@@ -8,12 +8,12 @@ local Trail = {
   Parent = sunTransforms.SunECLIPJ2000.Identifier,
   Renderable = {
     Type = "RenderableTrailOrbit",
+    Enabled = asset.enabled,
+    Translation = transforms.Translation,
     Color = { 0.2, 0.8, 0.3 },
     Period = 111233.3435553189,
     Resolution = 10000,
-    Enabled = asset.enabled,
-    Fade = 1.24,
-    Translation = transforms.Translation
+    Fade = 1.24
   },
   Tag = { "planetTrail_dwarf" },
   GUI = {
diff --git a/data/assets/scene/solarsystem/dwarf_planets/orcus/label.asset b/data/assets/scene/solarsystem/dwarf_planets/orcus/label.asset
index d1022926c5..ff57d1b905 100644
--- a/data/assets/scene/solarsystem/dwarf_planets/orcus/label.asset
+++ b/data/assets/scene/solarsystem/dwarf_planets/orcus/label.asset
@@ -6,8 +6,8 @@ local Label = {
   Identifier = "OrcusLabel",
   Parent = transforms.Position.Identifier,
   Renderable = {
-    Enabled = asset.enabled,
     Type = "RenderableLabel",
+    Enabled = asset.enabled,
     Text = "Orcus",
     FontSize = 70.0,
     Size = 9.10,
diff --git a/data/assets/scene/solarsystem/dwarf_planets/orcus/trail.asset b/data/assets/scene/solarsystem/dwarf_planets/orcus/trail.asset
index f4c33eeb28..568f0fbc8b 100644
--- a/data/assets/scene/solarsystem/dwarf_planets/orcus/trail.asset
+++ b/data/assets/scene/solarsystem/dwarf_planets/orcus/trail.asset
@@ -8,12 +8,12 @@ local Trail = {
   Parent = sunTransforms.SunECLIPJ2000.Identifier,
   Renderable = {
     Type = "RenderableTrailOrbit",
+    Enabled = asset.enabled,
+    Translation = transforms.Translation,
     Color = { 0.2, 0.8, 0.3 },
     Period = 89359.12208173508,
     Resolution = 10000,
-    Enabled = asset.enabled,
-    Fade = 1.24,
-    Translation = transforms.Translation
+    Fade = 1.24
   },
   Tag = { "planetTrail_dwarf" },
   GUI = {
diff --git a/data/assets/scene/solarsystem/dwarf_planets/pluto/charon/charon.asset b/data/assets/scene/solarsystem/dwarf_planets/pluto/charon/charon.asset
index 9ecc4c16f6..f5ae2edd82 100644
--- a/data/assets/scene/solarsystem/dwarf_planets/pluto/charon/charon.asset
+++ b/data/assets/scene/solarsystem/dwarf_planets/pluto/charon/charon.asset
@@ -54,8 +54,8 @@ local CharonLabel = {
   Identifier = "CharonLabel",
   Parent = Charon.Identifier,
   Renderable = {
-    Enabled = false,
     Type = "RenderableLabel",
+    Enabled = false,
     Text = "Charon",
     FontSize = 70.0,
     Size = 6.0,
diff --git a/data/assets/scene/solarsystem/dwarf_planets/pluto/minor/hydra.asset b/data/assets/scene/solarsystem/dwarf_planets/pluto/minor/hydra.asset
index 8dfa6a0743..463d27575e 100644
--- a/data/assets/scene/solarsystem/dwarf_planets/pluto/minor/hydra.asset
+++ b/data/assets/scene/solarsystem/dwarf_planets/pluto/minor/hydra.asset
@@ -56,8 +56,8 @@ local HydraLabel = {
   Identifier = "HydraLabel",
   Parent = Hydra.Identifier,
   Renderable = {
-    Enabled = false,
     Type = "RenderableLabel",
+    Enabled = false,
     Text = "Hydra",
     FontSize = 70.0,
     Size = 6.0,
diff --git a/data/assets/scene/solarsystem/dwarf_planets/pluto/minor/kerberos.asset b/data/assets/scene/solarsystem/dwarf_planets/pluto/minor/kerberos.asset
index 9594d8dfc4..a337b494cf 100644
--- a/data/assets/scene/solarsystem/dwarf_planets/pluto/minor/kerberos.asset
+++ b/data/assets/scene/solarsystem/dwarf_planets/pluto/minor/kerberos.asset
@@ -55,8 +55,8 @@ local KerberosLabel = {
   Identifier = "KerberosLabel",
   Parent = Kerberos.Identifier,
   Renderable = {
-    Enabled = false,
     Type = "RenderableLabel",
+    Enabled = false,
     Text = "Kerberos",
     FontSize = 70.0,
     Size = 6.0,
diff --git a/data/assets/scene/solarsystem/dwarf_planets/pluto/minor/nix.asset b/data/assets/scene/solarsystem/dwarf_planets/pluto/minor/nix.asset
index 8c1dbea469..2baada586a 100644
--- a/data/assets/scene/solarsystem/dwarf_planets/pluto/minor/nix.asset
+++ b/data/assets/scene/solarsystem/dwarf_planets/pluto/minor/nix.asset
@@ -55,8 +55,8 @@ local NixLabel = {
   Identifier = "NixLabel",
   Parent = Nix.Identifier,
   Renderable = {
-    Enabled = false,
     Type = "RenderableLabel",
+    Enabled = false,
     Text = "Nix",
     FontSize = 70.0,
     Size = 6.0,
diff --git a/data/assets/scene/solarsystem/dwarf_planets/pluto/minor/styx.asset b/data/assets/scene/solarsystem/dwarf_planets/pluto/minor/styx.asset
index 3385785481..ac6549056e 100644
--- a/data/assets/scene/solarsystem/dwarf_planets/pluto/minor/styx.asset
+++ b/data/assets/scene/solarsystem/dwarf_planets/pluto/minor/styx.asset
@@ -54,8 +54,8 @@ local StyxLabel = {
   Identifier = "StyxLabel",
   Parent = Styx.Identifier,
   Renderable = {
-    Enabled = false,
     Type = "RenderableLabel",
+    Enabled = false,
     Text = "Styx",
     FontSize = 70.0,
     Size = 6.0,
diff --git a/data/assets/scene/solarsystem/dwarf_planets/pluto/pluto.asset b/data/assets/scene/solarsystem/dwarf_planets/pluto/pluto.asset
index 9b6125e14f..bdeff0a895 100644
--- a/data/assets/scene/solarsystem/dwarf_planets/pluto/pluto.asset
+++ b/data/assets/scene/solarsystem/dwarf_planets/pluto/pluto.asset
@@ -55,8 +55,8 @@ local PlutoLabel = {
   Identifier = "PlutoLabel",
   Parent = Pluto.Identifier,
   Renderable = {
-    Enabled = false,
     Type = "RenderableLabel",
+    Enabled = false,
     Text = "Pluto",
     FontSize = 70.0,
     Size = 9.10,
diff --git a/data/assets/scene/solarsystem/dwarf_planets/pluto/pluto_trail_kepler.asset b/data/assets/scene/solarsystem/dwarf_planets/pluto/pluto_trail_kepler.asset
index 0d7ff1af20..8066fa5c40 100644
--- a/data/assets/scene/solarsystem/dwarf_planets/pluto/pluto_trail_kepler.asset
+++ b/data/assets/scene/solarsystem/dwarf_planets/pluto/pluto_trail_kepler.asset
@@ -12,6 +12,7 @@ local PlutoKeplerianTrail = {
   Parent = transforms.SunECLIPJ2000.Identifier,
   Renderable = {
     Type = "RenderableTrailOrbit",
+    Enabled = false,
     Translation = {
       Type = "KeplerTranslation",
       Eccentricity = 0.2543033082909471,
@@ -25,8 +26,7 @@ local PlutoKeplerianTrail = {
     },
     Color = { 0.2, 0.8, 0.3 },
     Period = 90487.27692706819,
-    Resolution = 1000,
-    Enabled = false
+    Resolution = 1000
   },
   GUI = {
     Name = "Pluto Keplerian Trail",
diff --git a/data/assets/scene/solarsystem/dwarf_planets/quaoar/label.asset b/data/assets/scene/solarsystem/dwarf_planets/quaoar/label.asset
index 571f695279..3a0f3d26d2 100644
--- a/data/assets/scene/solarsystem/dwarf_planets/quaoar/label.asset
+++ b/data/assets/scene/solarsystem/dwarf_planets/quaoar/label.asset
@@ -6,8 +6,8 @@ local Label = {
   Identifier = "QuaoarLabel",
   Parent = transforms.Position.Identifier,
   Renderable = {
-    Enabled = asset.enabled,
     Type = "RenderableLabel",
+    Enabled = asset.enabled,
     Text = "Quaoar",
     FontSize = 70.0,
     Size = 9.10,
diff --git a/data/assets/scene/solarsystem/dwarf_planets/quaoar/trail.asset b/data/assets/scene/solarsystem/dwarf_planets/quaoar/trail.asset
index 1e7c5bfa6c..34fbb9809b 100644
--- a/data/assets/scene/solarsystem/dwarf_planets/quaoar/trail.asset
+++ b/data/assets/scene/solarsystem/dwarf_planets/quaoar/trail.asset
@@ -8,12 +8,12 @@ local Trail = {
   Parent = sunTransforms.SunECLIPJ2000.Identifier,
   Renderable = {
     Type = "RenderableTrailOrbit",
+    Enabled = asset.enabled,
+    Translation = transforms.Translation,
     Color = { 0.2, 0.8, 0.3 },
     Period = 104691.8599963541,
     Resolution = 10000,
-    Enabled = asset.enabled,
-    Fade = 1.24,
-    Translation = transforms.Translation
+    Fade = 1.24
   },
   Tag = { "planetTrail_dwarf" },
   GUI = {
diff --git a/data/assets/scene/solarsystem/dwarf_planets/sedna/label.asset b/data/assets/scene/solarsystem/dwarf_planets/sedna/label.asset
index 2aca0deb20..09e93a7e6e 100644
--- a/data/assets/scene/solarsystem/dwarf_planets/sedna/label.asset
+++ b/data/assets/scene/solarsystem/dwarf_planets/sedna/label.asset
@@ -6,8 +6,8 @@ local Label = {
   Identifier = "SednaLabel",
   Parent = transforms.Position.Identifier,
   Renderable = {
-    Enabled = asset.enabled,
     Type = "RenderableLabel",
+    Enabled = asset.enabled,
     Text = "Sedna",
     FontSize = 70.0,
     Size = 9.10,
diff --git a/data/assets/scene/solarsystem/dwarf_planets/sedna/trail.asset b/data/assets/scene/solarsystem/dwarf_planets/sedna/trail.asset
index 3586cef71e..adc3c531a1 100644
--- a/data/assets/scene/solarsystem/dwarf_planets/sedna/trail.asset
+++ b/data/assets/scene/solarsystem/dwarf_planets/sedna/trail.asset
@@ -8,12 +8,12 @@ local Trail = {
   Parent = sunTransforms.SunECLIPJ2000.Identifier,
   Renderable = {
     Type = "RenderableTrailOrbit",
+    Enabled = asset.enabled,
+    Translation = transforms.Translation,
     Color = { 0.2, 0.8, 0.3 },
     Period = 4485811.755507208,
     Resolution = 10000,
-    Enabled = asset.enabled,
-    Fade = 1.24,
-    Translation = transforms.Translation
+    Fade = 1.24
   },
   Tag = { "planetTrail_dwarf" },
   GUI = {
diff --git a/data/assets/scene/solarsystem/dwarf_planets/vesta/label.asset b/data/assets/scene/solarsystem/dwarf_planets/vesta/label.asset
index 2b80ab524e..4ce5616c9d 100644
--- a/data/assets/scene/solarsystem/dwarf_planets/vesta/label.asset
+++ b/data/assets/scene/solarsystem/dwarf_planets/vesta/label.asset
@@ -6,8 +6,8 @@ local Label = {
   Identifier = "VestaLabel",
   Parent = transforms.Position.Identifier,
   Renderable = {
-    Enabled = asset.enabled,
     Type = "RenderableLabel",
+    Enabled = asset.enabled,
     Text = "Vesta",
     FontSize = 50.0,
     Size = 8.5,
diff --git a/data/assets/scene/solarsystem/dwarf_planets/vesta/trail.asset b/data/assets/scene/solarsystem/dwarf_planets/vesta/trail.asset
index a246933e18..cb9c3dab5c 100644
--- a/data/assets/scene/solarsystem/dwarf_planets/vesta/trail.asset
+++ b/data/assets/scene/solarsystem/dwarf_planets/vesta/trail.asset
@@ -8,12 +8,12 @@ local Trail = {
   Parent = sunTransforms.SunECLIPJ2000.Identifier,
   Renderable = {
     Type = "RenderableTrailOrbit",
+    Enabled = asset.enabled,
+    Translation = transforms.Translation,
     Color = { 0.2, 0.8, 0.3 },
     Period = 1326.797192349944,
     Resolution = 10000,
-    Enabled = asset.enabled,
-    Fade = 1.24,
-    Translation = transforms.Translation
+    Fade = 1.24
   },
   Tag = { "planetTrail_dwarf" },
   GUI = {
diff --git a/data/assets/scene/solarsystem/missions/apollo/17/lem.asset b/data/assets/scene/solarsystem/missions/apollo/17/lem.asset
index eb7158df4f..17472962c1 100644
--- a/data/assets/scene/solarsystem/missions/apollo/17/lem.asset
+++ b/data/assets/scene/solarsystem/missions/apollo/17/lem.asset
@@ -30,9 +30,9 @@ local Apollo17Lem = {
     }
   },
   GUI = {
-    Hidden = true,
     Name = "Apollo 17 Lem Position",
-    Path = "/Solar System/Missions/Apollo/17"
+    Path = "/Solar System/Missions/Apollo/17",
+    Hidden = true
   }
 }
 
diff --git a/data/assets/scene/solarsystem/missions/apollo/8/launch_model.asset b/data/assets/scene/solarsystem/missions/apollo/8/launch_model.asset
index 1fa667b234..cfede06cac 100644
--- a/data/assets/scene/solarsystem/missions/apollo/8/launch_model.asset
+++ b/data/assets/scene/solarsystem/missions/apollo/8/launch_model.asset
@@ -60,9 +60,9 @@ local Apollo8LaunchModel = {
     PerformShading = true
   },
   GUI = {
-    Hidden = true,
     Name = "Apollo 8 Launch Model",
-    Path = "/Solar System/Missions/Apollo/8"
+    Path = "/Solar System/Missions/Apollo/8",
+    Hidden = true
   }
 }
 
diff --git a/data/assets/scene/solarsystem/missions/apollo/8/model.asset b/data/assets/scene/solarsystem/missions/apollo/8/model.asset
index c93b47c34a..5b7f80883e 100644
--- a/data/assets/scene/solarsystem/missions/apollo/8/model.asset
+++ b/data/assets/scene/solarsystem/missions/apollo/8/model.asset
@@ -72,9 +72,9 @@ local Apollo8Model = {
     PerformShading = true
   },
   GUI = {
-    Hidden = true,
     Name = "Apollo 8 Model",
-    Path = "/Solar System/Missions/Apollo/8"
+    Path = "/Solar System/Missions/Apollo/8",
+    Hidden = true
   }
 }
 
diff --git a/data/assets/scene/solarsystem/missions/insight/edl.asset b/data/assets/scene/solarsystem/missions/insight/edl.asset
index 41f0a9a093..907d793404 100644
--- a/data/assets/scene/solarsystem/missions/insight/edl.asset
+++ b/data/assets/scene/solarsystem/missions/insight/edl.asset
@@ -148,7 +148,7 @@ local InsightParent = {
   Identifier = "InsightParent",
   Parent = mars.Mars.Identifier,
   Transform = {
-    Translation ={
+    Translation = {
       Type = "TimelineTranslation",
       Keyframes = TranslationKeyframes,
     },
@@ -163,9 +163,9 @@ local InsightParent = {
   --   End = SpiceRotationEndTime
   -- },
   GUI = {
-    Hidden = true,
     Name = "InsightParent",
-    Path = "/Solar System/Missions/Insight"
+    Path = "/Solar System/Missions/Insight",
+    Hidden = true
   }
 }
 
@@ -188,206 +188,206 @@ local Insight = {
 local Insight_Entry_CapsuleA = {
   Identifier = "Insight_Entry_CapsuleA",
   Parent = Insight.Identifier,
+  TimeFrame = {
+    Type = "TimeFrameInterval",
+    End = LanderSeparationTime
+  },
   Renderable = {
     Type = "RenderableModel",
     GeometryFile = models .. "cruise_insight_doubleside2_newcapsule_diffuse.obj",
     ModelTransform = RotationMatrix,
     LightSources = LightSources
   },
-  TimeFrame = {
-    Type = "TimeFrameInterval",
-    End = LanderSeparationTime
-  },
   GUI = {
-    Hidden = true,
     Name = "Insight Entry CapsuleA",
-    Path = "/Solar System/Missions/Insight"
+    Path = "/Solar System/Missions/Insight",
+    Hidden = true
   }
 }
 
 local Insight_Entry_Capsule_Ring = {
   Identifier = "Insight_Entry_Capsule_Ring",
   Parent = Insight.Identifier,
+  TimeFrame = {
+    Type = "TimeFrameInterval",
+    End = LanderSeparationTime
+  },
   Renderable = {
     Type = "RenderableModel",
     GeometryFile = models .. "insight_cruise_cone_ring_foil_gold.obj",
     ModelTransform = RotationMatrix,
     LightSources = LightSources
   },
-  TimeFrame = {
-    Type = "TimeFrameInterval",
-    End = LanderSeparationTime
-  },
   GUI = {
-    Hidden = true,
     Name = "Insight Entry Capsule Ring",
-    Path = "/Solar System/Missions/Insight"
+    Path = "/Solar System/Missions/Insight",
+    Hidden = true
   }
 }
 
 local Insight_Entry_Capsule_Plugs = {
   Identifier = "Insight_Entry_Capsule_Plugs",
   Parent = Insight.Identifier,
+  TimeFrame = {
+    Type = "TimeFrameInterval",
+    End = LanderSeparationTime
+  },
   Renderable = {
     Type = "RenderableModel",
     GeometryFile = models .. "insight_cruise_cone_capsule_diffuse.obj",
     ModelTransform = RotationMatrix,
     LightSources = LightSources
   },
-  TimeFrame = {
-    Type = "TimeFrameInterval",
-    End = LanderSeparationTime
-  },
   GUI = {
-    Hidden = true,
     Name = "Insight Entry Capsule Plugs",
-    Path = "/Solar System/Missions/Insight"
+    Path = "/Solar System/Missions/Insight",
+    Hidden = true
   }
 }
 
 local Insight_Entry_Heatshield = {
   Identifier = "Insight_Entry_Heatshield",
   Parent = Insight.Identifier,
+  TimeFrame = {
+    Type = "TimeFrameInterval",
+    End = HeatShieldSeparationTime
+  },
   Renderable = {
     Type = "RenderableModel",
     GeometryFile = models .. "insight_cruise_heatshield_foil_gold.obj",
     ModelTransform = RotationMatrix,
     LightSources = LightSources
   },
-  TimeFrame = {
-    Type = "TimeFrameInterval",
-    End = HeatShieldSeparationTime
-  },
   GUI = {
-    Hidden = true,
     Name = "Insight Entry Heatshield",
-    Path = "/Solar System/Missions/Insight"
+    Path = "/Solar System/Missions/Insight",
+    Hidden = true
   }
 }
 
 local Insight_Parachute_0 = {
   Identifier = "Insight_Parachute_0",
   Parent = Insight.Identifier,
+  TimeFrame = {
+    Type = "TimeFrameInterval",
+    Start = ParachuteDeployTime1,
+    End = ParachuteDeployTime20
+  },
   Renderable = {
     Type = "RenderableModel",
     GeometryFile = models .. "insight_chute_frame01_diff1.obj",
     ModelTransform = RotationMatrix,
     LightSources = LightSources
   },
-  TimeFrame = {
-    Type = "TimeFrameInterval",
-    Start = ParachuteDeployTime1,
-    End = ParachuteDeployTime20
-  },
   GUI = {
-    Hidden = true,
     Name = "Insight Parachute0",
-    Path = "/Solar System/Missions/Insight"
+    Path = "/Solar System/Missions/Insight",
+    Hidden = true
   }
 }
 
 local Insight_Parachute_Cords_0 = {
   Identifier = "Insight_Parachute_Cords_0",
   Parent = Insight.Identifier,
+  TimeFrame = {
+    Type = "TimeFrameInterval",
+    Start = ParachuteDeployTime1,
+    End = ParachuteDeployTime20
+  },
   Renderable = {
     Type = "RenderableModel",
     GeometryFile = models .. "insight_chute_frame01_cords1.obj",
     ModelTransform = RotationMatrix,
     LightSources = LightSources
   },
-  TimeFrame = {
-    Type = "TimeFrameInterval",
-    Start = ParachuteDeployTime1,
-    End = ParachuteDeployTime20
-  },
   GUI = {
-    Hidden = true,
     Name = "Insight ParachuteC0",
-    Path = "/Solar System/Missions/Insight"
+    Path = "/Solar System/Missions/Insight",
+    Hidden = true
   }
 }
 
 local Insight_Parachute_20 = {
   Identifier = "Insight_Parachute_20",
   Parent = Insight.Identifier,
+  TimeFrame = {
+    Type = "TimeFrameInterval",
+    Start = ParachuteDeployTime20,
+    End = ParachuteDeployTime40
+  },
   Renderable = {
     Type = "RenderableModel",
     GeometryFile = models .. "insight_chute_frame20_diff1.obj",
     ModelTransform = RotationMatrix,
     LightSources = LightSources
   },
-  TimeFrame = {
-    Type = "TimeFrameInterval",
-    Start = ParachuteDeployTime20,
-    End = ParachuteDeployTime40
-  },
   GUI = {
-    Hidden = true,
     Name = "Insight Parachute20",
-    Path = "/Solar System/Missions/Insight"
+    Path = "/Solar System/Missions/Insight",
+    Hidden = true
   }
 }
 
 local Insight_Parachute_Cords_20 = {
   Identifier = "Insight_Parachute_Cords_20",
   Parent = Insight.Identifier,
+  TimeFrame = {
+    Type = "TimeFrameInterval",
+    Start = ParachuteDeployTime20,
+    End = ParachuteDeployTime40
+  },
   Renderable = {
     Type = "RenderableModel",
     GeometryFile = models .. "insight_chute_frame20_cords1.obj",
     ModelTransform = RotationMatrix,
     LightSources = LightSources
   },
-  TimeFrame = {
-    Type = "TimeFrameInterval",
-    Start = ParachuteDeployTime20,
-    End = ParachuteDeployTime40
-  },
   GUI = {
-    Hidden = true,
     Name = "Insight ParachuteC20",
-    Path = "/Solar System/Missions/Insight"
+    Path = "/Solar System/Missions/Insight",
+    Hidden = true
   }
 }
 
 local Insight_Parachute_40 = {
   Identifier = "Insight_Parachute_40",
   Parent = Insight.Identifier,
+  TimeFrame = {
+    Type = "TimeFrameInterval",
+    Start = ParachuteDeployTime40,
+    End = LanderSeparationTime
+  },
   Renderable = {
     Type = "RenderableModel",
     GeometryFile = models .. "chute_doubleside_frame40_diff.obj",
     ModelTransform = RotationMatrix,
     LightSources = LightSources
   },
-  TimeFrame = {
-    Type = "TimeFrameInterval",
-    Start = ParachuteDeployTime40,
-    End = LanderSeparationTime
-  },
   GUI = {
-    Hidden = true,
     Name = "Insight Parachute40",
-    Path = "/Solar System/Missions/Insight"
+    Path = "/Solar System/Missions/Insight",
+    Hidden = true
   }
 }
 
 local Insight_Parachute_Cords_40 = {
   Identifier = "Insight_Parachute_Cords_40",
   Parent = Insight.Identifier,
+  TimeFrame = {
+    Type = "TimeFrameInterval",
+    Start = ParachuteDeployTime40,
+    End = LanderSeparationTime
+  },
   Renderable = {
     Type = "RenderableModel",
     GeometryFile = models .. "insight_chute_frame40_cords1.obj",
     ModelTransform = RotationMatrix,
     LightSources = LightSources
   },
-  TimeFrame = {
-    Type = "TimeFrameInterval",
-    Start = ParachuteDeployTime40,
-    End = LanderSeparationTime
-  },
   GUI = {
-    Hidden = true,
     Name = "Insight ParachuteC40",
-    Path = "/Solar System/Missions/Insight"
+    Path = "/Solar System/Missions/Insight",
+    Hidden = true
   }
 }
 
@@ -401,9 +401,9 @@ local Insight_Lander_A001 = {
     LightSources = LightSources
   },
   GUI = {
-    Hidden = true,
     Name = "Insight Lander A001",
-    Path = "/Solar System/Missions/Insight"
+    Path = "/Solar System/Missions/Insight",
+    Hidden = true
   }
 }
 
@@ -417,9 +417,9 @@ local Insight_Lander_A002 = {
     LightSources = LightSources
   },
   GUI = {
-    Hidden = true,
     Name = "Insight Lander A002",
-    Path = "/Solar System/Missions/Insight"
+    Path = "/Solar System/Missions/Insight",
+    Hidden = true
   }
 }
 
@@ -433,9 +433,9 @@ local Insight_Lander_A003 = {
     LightSources = LightSources
   },
   GUI = {
-    Hidden = true,
     Name = "Insight Lander A003",
-    Path = "/Solar System/Missions/Insight"
+    Path = "/Solar System/Missions/Insight",
+    Hidden = true
   }
 }
 
@@ -449,9 +449,9 @@ local Insight_Lander_A004 = {
     LightSources = LightSources
   },
   GUI = {
-    Hidden = true,
     Name = "Insight Lander A004",
-    Path = "/Solar System/Missions/Insight"
+    Path = "/Solar System/Missions/Insight",
+    Hidden = true
   }
 }
 
@@ -465,9 +465,9 @@ local Insight_Lander_A005 = {
     LightSources = LightSources
   },
   GUI = {
-    Hidden = true,
     Name = "Insight Lander A005",
-    Path = "/Solar System/Missions/Insight"
+    Path = "/Solar System/Missions/Insight",
+    Hidden = true
   }
 }
 
@@ -481,9 +481,9 @@ local Insight_Lander_A006 = {
     LightSources = LightSources
   },
   GUI = {
-    Hidden = true,
     Name = "Insight Lander A006",
-    Path = "/Solar System/Missions/Insight"
+    Path = "/Solar System/Missions/Insight",
+    Hidden = true
   }
 }
 
@@ -497,9 +497,9 @@ local Insight_Lander_A007 = {
     LightSources = LightSources
   },
   GUI = {
-    Hidden = true,
     Name = "Insight Lander A007",
-    Path = "/Solar System/Missions/Insight"
+    Path = "/Solar System/Missions/Insight",
+    Hidden = true
   }
 }
 
@@ -513,9 +513,9 @@ local Insight_Lander_A008 = {
     LightSources = LightSources
   },
   GUI = {
-    Hidden = true,
     Name = "Insight Lander A008",
-    Path = "/Solar System/Missions/Insight"
+    Path = "/Solar System/Missions/Insight",
+    Hidden = true
   }
 }
 
@@ -529,9 +529,9 @@ local Insight_Lander_foil1 = {
     LightSources = LightSources
   },
   GUI = {
-    Hidden = true,
     Name = "Insight Lander foil",
-    Path = "/Solar System/Missions/Insight"
+    Path = "/Solar System/Missions/Insight",
+    Hidden = true
   }
 }
 
@@ -545,9 +545,9 @@ local Insight_Lander_Tex01 = {
     LightSources = LightSources
   },
   GUI = {
-    Hidden = true,
     Name = "Insight Lander Tex01",
-    Path = "/Solar System/Missions/Insight"
+    Path = "/Solar System/Missions/Insight",
+    Hidden = true
   }
 }
 
@@ -561,91 +561,91 @@ local Insight_Lander_Tex02 = {
     LightSources = LightSources
   },
   GUI = {
-    Hidden = true,
     Name = "Insight Lander Tex02",
-    Path = "/Solar System/Missions/Insight"
+    Path = "/Solar System/Missions/Insight",
+    Hidden = true
   }
 }
 
 local Insight_Legs_Stowed_tex = {
   Identifier = "Insight_Legs_Stowed_tex",
   Parent = Insight.Identifier,
+  TimeFrame = {
+    Type = "TimeFrameInterval",
+    Start = HeatShieldSeparationTime,
+    End = LegDeployTime
+  },
   Renderable = {
     Type = "RenderableModel",
     GeometryFile = models .. "insight_lander_legs_stow_tex01.obj",
     ModelTransform = RotationMatrix,
     LightSources = LightSources
   },
-  TimeFrame = {
-    Type = "TimeFrameInterval",
-    Start = HeatShieldSeparationTime,
-    End = LegDeployTime
-  },
   GUI = {
-    Hidden = true,
     Name = "Insight legs_stow_tex",
-    Path = "/Solar System/Missions/Insight"
+    Path = "/Solar System/Missions/Insight",
+    Hidden = true
   }
 }
 
 local Insight_Legs_Stowed_AO06 = {
   Identifier = "Insight_Legs_Stowed_AO",
   Parent = Insight.Identifier,
+  TimeFrame = {
+    Type = "TimeFrameInterval",
+    Start = HeatShieldSeparationTime,
+    End = LegDeployTime
+  },
   Renderable = {
     Type = "RenderableModel",
     GeometryFile = models .. "insight_lander_legs_stow_AO06.obj",
     ModelTransform = RotationMatrix,
     LightSources = LightSources
   },
-  TimeFrame = {
-    Type = "TimeFrameInterval",
-    Start = HeatShieldSeparationTime,
-    End = LegDeployTime
-  },
   GUI = {
-    Hidden = true,
     Name = "Insight legs_stow_AO",
-    Path = "/Solar System/Missions/Insight"
+    Path = "/Solar System/Missions/Insight",
+    Hidden = true
   }
 }
 
 local Insight_Legs_Deployed_tex = {
   Identifier = "Insight_Legs_Deployed_tex",
   Parent = Insight.Identifier,
+  TimeFrame = {
+    Type = "TimeFrameInterval",
+    Start = LegDeployTime
+  },
   Renderable = {
     Type = "RenderableModel",
     GeometryFile = models .. "insight_lander_legs_deploy_tex01.obj",
     ModelTransform = RotationMatrix,
     LightSources = LightSources
   },
-  TimeFrame = {
-    Type = "TimeFrameInterval",
-    Start = LegDeployTime
-  },
   GUI = {
-    Hidden = true,
     Name = "Insight legs_deploy_tex",
-    Path = "/Solar System/Missions/Insight"
+    Path = "/Solar System/Missions/Insight",
+    Hidden = true
   }
 }
 
 local Insight_Legs_Deployed_AO06 = {
   Identifier = "Insight_Legs_Deployed_AO",
   Parent = Insight.Identifier,
+  TimeFrame = {
+    Type = "TimeFrameInterval",
+    Start = LegDeployTime
+  },
   Renderable = {
     Type = "RenderableModel",
     GeometryFile = models .. "insight_lander_legs_deploy_AO06.obj",
     ModelTransform = RotationMatrix,
     LightSources = LightSources
   },
-  TimeFrame = {
-    Type = "TimeFrameInterval",
-    Start = LegDeployTime
-  },
   GUI = {
-    Hidden = true,
     Name = "Insight legs_deploy_AO",
-    Path = "/Solar System/Missions/Insight"
+    Path = "/Solar System/Missions/Insight",
+    Hidden = true
   }
 }
 
@@ -659,9 +659,9 @@ local Insight_Panels_Stowed_tex = {
     LightSources = LightSources
   },
   GUI = {
-    Hidden = true,
     Name = "Insight panels_stow_tex",
-    Path = "/Solar System/Missions/Insight"
+    Path = "/Solar System/Missions/Insight",
+    Hidden = true
   }
 }
 
@@ -675,9 +675,9 @@ local Insight_Panels_Stowed_tex2 = {
     LightSources = LightSources
   },
   GUI = {
-    Hidden = true,
     Name = "Insight panels_stow_tex2",
-    Path = "/Solar System/Missions/Insight"
+    Path = "/Solar System/Missions/Insight",
+    Hidden = true
   }
 }
 
@@ -691,47 +691,46 @@ local Insight_Panels_Stowed_AO01 = {
     LightSources = LightSources
   },
   GUI = {
-    Hidden = true,
     Name = "Insight panels_stow_AO",
-    Path = "/Solar System/Missions/Insight"
+    Path = "/Solar System/Missions/Insight",
+    Hidden = true
   }
 }
 
 local Insight_Panels_Deployed_tex = {
   Identifier = "Insight_panels_Deployed_tex",
   Parent = Insight.Identifier,
+  TimeFrame = {
+    Type = "TimeFrameInterval",
+    Start = PanelDeployTime
+  },
   Renderable = {
       Type = "RenderableModel",
       GeometryFile = models .. "insight_lander_panels_deploy_tex01.obj",
       ModelTransform = RotationMatrix,
       LightSources = LightSources
   },
-  TimeFrame = {
-    Type = "TimeFrameInterval",
-    Start = PanelDeployTime
-  },
   GUI = {
-    Hidden = true,
     Name = "Insight panels_deploy_tex",
-    Path = "/Solar System/Missions/Insight"
+    Path = "/Solar System/Missions/Insight",
+    Hidden = true
   }
 }
 
 local Insight_Panels_Deployed_tex2 = {
   Identifier = "Insight_panels_Deployed_tex2",
   Parent = Insight.Identifier,
+  TimeFrame = {
+    Type = "TimeFrameInterval",
+    Start = PanelDeployTime
+  },
   Renderable = {
     Type = "RenderableModel",
     GeometryFile = models .. "insight_lander_panels_deploy_tex02.obj",
     ModelTransform = RotationMatrix,
     LightSources = LightSources
   },
-  TimeFrame = {
-    Type = "TimeFrameInterval",
-    Start = PanelDeployTime
-  },
   GUI = {
-    -- Hidden = true,
     Name = "Insight panels_deploy_tex2",
     Path = "/Solar System/Missions/Insight"
   }
@@ -740,29 +739,34 @@ local Insight_Panels_Deployed_tex2 = {
 local Insight_Panels_Deployed_AO06 = {
   Identifier = "Insight_panels_Deployed_AO",
   Parent = Insight.Identifier,
+  TimeFrame = {
+    Type = "TimeFrameInterval",
+    Start = PanelDeployTime
+  },
   Renderable = {
     Type = "RenderableModel",
     GeometryFile = models .. "insight_lander_panels_deploy_AO01.obj",
     ModelTransform = RotationMatrix,
     LightSources = LightSources
   },
-  TimeFrame = {
-    Type = "TimeFrameInterval",
-    Start = PanelDeployTime
-  },
   GUI = {
-    Hidden = true,
     Name = "Insight panels_deploy_AO",
-    Path = "/Solar System/Missions/Insight"
+    Path = "/Solar System/Missions/Insight",
+    Hidden = true
   }
 }
 
 local Insight_Trail = {
   Identifier = "InsightTrail",
   Parent = "Mars",
+  TimeFrame = {
+    Type = "TimeFrameInterval",
+    Start = EntryTimeStart,
+    End = LanderSeparationTime
+  },
   Renderable = {
-    Enabled = false,
     Type = "RenderableTrailTrajectory",
+    Enabled = false,
     Translation = {
       Type = "SpiceTranslation",
       Target = -189,
@@ -774,11 +778,6 @@ local Insight_Trail = {
     EndTime = "2018 NOV 26 19:51:40.890",
     SampleInterval = 2
   },
-  TimeFrame = {
-    Type = "TimeFrameInterval",
-    Start = EntryTimeStart,
-    End = LanderSeparationTime
-  },
   GUI = {
     Name = "Insight Trail",
     Path = "/Solar System/Missions/Insight"
diff --git a/data/assets/scene/solarsystem/missions/juice/model.asset b/data/assets/scene/solarsystem/missions/juice/model.asset
index 29ca6ccde6..bc1de316b6 100644
--- a/data/assets/scene/solarsystem/missions/juice/model.asset
+++ b/data/assets/scene/solarsystem/missions/juice/model.asset
@@ -27,7 +27,6 @@ local JuiceModel = {
   },
   Renderable = {
     Type = "RenderableModel",
-    Body = "JUICE",
     GeometryFile = model .. "juice.fbx",
     ModelScale = "Centimeter",
     LightSources = {
diff --git a/data/assets/scene/solarsystem/missions/juice/plane.asset b/data/assets/scene/solarsystem/missions/juice/plane.asset
index f7cccdf666..81fbaee0ec 100644
--- a/data/assets/scene/solarsystem/missions/juice/plane.asset
+++ b/data/assets/scene/solarsystem/missions/juice/plane.asset
@@ -21,9 +21,9 @@ local xy_n = {
   Parent = transforms.GPHIO.Identifier,
   Renderable = {
     Type = "RenderablePlaneImageLocal",
+    Enabled = false,
     Size = Size,
-    Texture = data .. "XY-n.png",
-    Enabled = false
+    Texture = data .. "XY-n.png"
   },
   GUI = {
     Name = "Ganymede XY Plane N",
@@ -37,9 +37,9 @@ local xy_t = {
   Parent = transforms.GPHIO.Identifier,
   Renderable = {
     Type = "RenderablePlaneImageLocal",
+    Enabled = false,
     Size = Size,
-    Texture = data .. "XY-T.png",
-    Enabled = false
+    Texture = data .. "XY-T.png"
   },
   GUI = {
     Name = "Ganymede XY Plane T",
@@ -53,9 +53,9 @@ local xy_u = {
   Parent = transforms.GPHIO.Identifier,
   Renderable = {
     Type = "RenderablePlaneImageLocal",
+    Enabled = false,
     Size = Size,
-    Texture = data .. "XY-U.png",
-    Enabled = false
+    Texture = data .. "XY-U.png"
   },
   GUI = {
     Name = "Ganymede XY Plane U",
@@ -70,9 +70,9 @@ local xy_utot = {
   Parent = transforms.GPHIO.Identifier,
   Renderable = {
     Type = "RenderablePlaneImageLocal",
+    Enabled = false,
     Size = Size,
-    Texture = data .. "XY-Utot.png",
-    Enabled = false
+    Texture = data .. "XY-Utot.png"
   },
   GUI = {
     Name = "Ganymede XY Plane U_tot",
@@ -87,9 +87,9 @@ local xy_ux = {
   Parent = transforms.GPHIO.Identifier,
   Renderable = {
     Type = "RenderablePlaneImageLocal",
+    Enabled = false,
     Size = Size,
-    Texture = data .. "XY-Ux.png",
-    Enabled = false
+    Texture = data .. "XY-Ux.png"
   },
   GUI = {
     Name = "Ganymede XY Plane Ux",
@@ -104,9 +104,9 @@ local xy_uy = {
   Parent = transforms.GPHIO.Identifier,
   Renderable = {
     Type = "RenderablePlaneImageLocal",
+    Enabled = false,
     Size = Size,
-    Texture = data .. "XY-Uy.png",
-    Enabled = false
+    Texture = data .. "XY-Uy.png"
   },
   GUI = {
     Name = "Ganymede XY Plane Uy",
@@ -121,9 +121,9 @@ local xy_uz = {
   Parent = transforms.GPHIO.Identifier,
   Renderable = {
     Type = "RenderablePlaneImageLocal",
+    Enabled = false,
     Size = Size,
-    Texture = data .. "XY-Uz.png",
-    Enabled = false
+    Texture = data .. "XY-Uz.png"
   },
   GUI = {
     Name = "Ganymede XY Plane Uz",
@@ -144,9 +144,9 @@ local xz_n = {
   },
   Renderable = {
     Type = "RenderablePlaneImageLocal",
+    Enabled = false,
     Size = Size,
-    Texture = data .. "XZ-n.png",
-    Enabled = false
+    Texture = data .. "XZ-n.png"
   },
   GUI = {
     Name = "Ganymede XZ Plane N",
@@ -166,9 +166,9 @@ local xz_t = {
   },
   Renderable = {
     Type = "RenderablePlaneImageLocal",
+    Enabled = false,
     Size = Size,
-    Texture = data .. "XZ-T.png",
-    Enabled = false
+    Texture = data .. "XZ-T.png"
   },
   GUI = {
     Name = "Ganymede XZ Plane T",
@@ -188,9 +188,9 @@ local xz_u = {
   },
   Renderable = {
     Type = "RenderablePlaneImageLocal",
+    Enabled = false,
     Size = Size,
-    Texture = data .. "XZ-U.png",
-    Enabled = false
+    Texture = data .. "XZ-U.png"
   },
   GUI = {
     Name = "Ganymede XZ Plane U",
@@ -211,9 +211,9 @@ local xz_utot = {
   },
   Renderable = {
     Type = "RenderablePlaneImageLocal",
+    Enabled = false,
     Size = Size,
-    Texture = data .. "XZ-Utot.png",
-    Enabled = false
+    Texture = data .. "XZ-Utot.png"
   },
   GUI = {
     Name = "Ganymede XZ Plane U_tot",
@@ -234,9 +234,9 @@ local xz_ux = {
   },
   Renderable = {
     Type = "RenderablePlaneImageLocal",
+    Enabled = false,
     Size = Size,
-    Texture = data .. "XZ-Ux.png",
-    Enabled = false
+    Texture = data .. "XZ-Ux.png"
   },
   GUI = {
     Name = "Ganymede XZ Plane Ux",
@@ -257,9 +257,9 @@ local xz_uy = {
   },
   Renderable = {
     Type = "RenderablePlaneImageLocal",
+    Enabled = false,
     Size = Size,
-    Texture = data .. "XZ-Uy.png",
-    Enabled = false
+    Texture = data .. "XZ-Uy.png"
   },
   GUI = {
     Name = "Ganymede XZ Plane Uy",
@@ -280,9 +280,9 @@ local xz_uz = {
   },
   Renderable = {
     Type = "RenderablePlaneImageLocal",
+    Enabled = false,
     Size = Size,
-    Texture = data .. "XZ-Uz.png",
-    Enabled = false
+    Texture = data .. "XZ-Uz.png"
   },
   GUI = {
     Name = "Ganymede XZ Plane Uz",
diff --git a/data/assets/scene/solarsystem/missions/messenger/mercurymagnetosphere.asset b/data/assets/scene/solarsystem/missions/messenger/mercurymagnetosphere.asset
index 90973b583d..1f100bdb70 100644
--- a/data/assets/scene/solarsystem/missions/messenger/mercurymagnetosphere.asset
+++ b/data/assets/scene/solarsystem/missions/messenger/mercurymagnetosphere.asset
@@ -32,6 +32,7 @@ local Magnetosphere = {
   },
   Renderable = {
     Type = "RenderableTimeVaryingVolume",
+    Enabled = false,
     SourceDirectory = localFolder,
     TransferFunction = localFolder .. "transferfunction.txt",
     Variable = "rho",
@@ -39,8 +40,7 @@ local Magnetosphere = {
     Dimensions = { 64, 64, 64 },
     GridType = "Cartesian",
     SecondsBefore = 24 * 60 * 60 * 365 * 100,
-    SecondsAfter = 24 * 60 * 60 * 365 * 100,
-    Enabled = false
+    SecondsAfter = 24 * 60 * 60 * 365 * 100
   },
   GUI = {
     Name = "Mercury Magnetosphere",
diff --git a/data/assets/scene/solarsystem/missions/newhorizons/label.asset b/data/assets/scene/solarsystem/missions/newhorizons/label.asset
index 3d1ccfdd95..b41125e178 100644
--- a/data/assets/scene/solarsystem/missions/newhorizons/label.asset
+++ b/data/assets/scene/solarsystem/missions/newhorizons/label.asset
@@ -14,7 +14,6 @@ local Labels = {
   Parent = NewHorizonsModel.NewHorizons.Identifier,
   Renderable = {
     Type = "RenderableModel",
-    Body = "NEW HORIZONS",
     GeometryFile = models .. "Labels.obj",
     AmbientIntensity = 0.8
   },
diff --git a/data/assets/scene/solarsystem/missions/newhorizons/othermoons.asset b/data/assets/scene/solarsystem/missions/newhorizons/othermoons.asset
index fca0413850..3c58d84824 100644
--- a/data/assets/scene/solarsystem/missions/newhorizons/othermoons.asset
+++ b/data/assets/scene/solarsystem/missions/newhorizons/othermoons.asset
@@ -45,7 +45,7 @@ local HydraText = {
   },
   Renderable = {
     Type = "RenderablePlaneImageLocal",
-    Size = 10.0^6.3,
+    Size = 1995262.315,
     Origin = "Center",
     Billboard = true,
     Texture = hydraTextures .. "Hydra-Text.png",
diff --git a/data/assets/scene/solarsystem/missions/osirisrex/bennu.asset b/data/assets/scene/solarsystem/missions/osirisrex/bennu.asset
index 264df9361e..d4d9c7adbd 100644
--- a/data/assets/scene/solarsystem/missions/osirisrex/bennu.asset
+++ b/data/assets/scene/solarsystem/missions/osirisrex/bennu.asset
@@ -24,9 +24,8 @@ local Bennu = {
     }
   },
   Renderable = {
-    Enabled = false,
     Type = "RenderableModel",
-    Body = BennuBodyId,
+    Enabled = false,
     GeometryFile = models .. "Bennu_v20_200k_an.obj",
     LightSources = {
       sun.LightSource
diff --git a/data/assets/scene/solarsystem/missions/osirisrex/model.asset b/data/assets/scene/solarsystem/missions/osirisrex/model.asset
index ed47b8928d..0f80545668 100644
--- a/data/assets/scene/solarsystem/missions/osirisrex/model.asset
+++ b/data/assets/scene/solarsystem/missions/osirisrex/model.asset
@@ -33,7 +33,6 @@ local OsirisRex = {
   },
   Renderable = {
     Type = "RenderableModel",
-    Body = "OSIRIS-REX",
     GeometryFile = models .. "orx_base_resized_12_sep_2016.obj",
     LightSources = {
       sun.LightSource,
@@ -66,7 +65,6 @@ local PolyCam = {
   },
   Renderable = {
     Type = "RenderableModel",
-    Body = "OSIRIS-REX",
     GeometryFile = models .. "orx_polycam_resized_12_sep_2016.obj",
     LightSources = {
       sun.LightSource,
@@ -88,7 +86,6 @@ local Rexis = {
   Parent = OsirisRex.Identifier,
   Renderable = {
     Type = "RenderableModel",
-    Body = "OSIRIS-REX",
     GeometryFile = models .. "orx_rexis_resized_12_sep_2016.obj",
     LightSources = {
       sun.LightSource,
diff --git a/data/assets/scene/solarsystem/missions/perseverance/trail.asset b/data/assets/scene/solarsystem/missions/perseverance/trail.asset
index 912a7222c6..ad276b361e 100644
--- a/data/assets/scene/solarsystem/missions/perseverance/trail.asset
+++ b/data/assets/scene/solarsystem/missions/perseverance/trail.asset
@@ -35,6 +35,7 @@ local PerseveranceTrailMars = {
   Parent = marsTransforms.MarsBarycenter.Identifier,
   Renderable = {
     Type = "RenderableTrailTrajectory",
+    Enabled = false,
     Translation = {
       Type = "SpiceTranslation",
       Target = spice.ID,
@@ -43,8 +44,7 @@ local PerseveranceTrailMars = {
     Color = { 0.7, 0.9, 0.6 },
     StartTime = ApproachMars,
     EndTime = "2021 FEB 18 20:43:48",
-    SampleInterval = 100,
-    Enabled = false
+    SampleInterval = 100
   },
   GUI = {
     Name = "Perseverance Trail (Mars)",
diff --git a/data/assets/scene/solarsystem/missions/voyager/voyager2.asset b/data/assets/scene/solarsystem/missions/voyager/voyager2.asset
index 8a06f6db83..b7c8a5b60d 100644
--- a/data/assets/scene/solarsystem/missions/voyager/voyager2.asset
+++ b/data/assets/scene/solarsystem/missions/voyager/voyager2.asset
@@ -43,6 +43,11 @@ local RotationMatrix = {
 local Voyager2 = {
   Identifier = "Voyager_2",
   Parent = sunTransforms.SolarSystemBarycenter.Identifier,
+  TimeFrame = {
+    Type = "TimeFrameInterval",
+    Start = "1977-AUG-20 16:07:06.535",
+    End = "2027-DEC-27"
+  },
   Transform = {
     Translation = {
       Type = "SpiceTranslation",
@@ -52,12 +57,7 @@ local Voyager2 = {
     Rotation = {
       Type = "SpiceRotation",
       SourceFrame = "VG2_SC_BUS",
-      DestinationFrame = "GALACTIC",
-      TimeFrame = {
-        Type = "TimeFrameInterval",
-        Start = "1977-AUG-20 16:07:06.535",
-        End = "2027-DEC-27"
-      }
+      DestinationFrame = "GALACTIC"
     }
   },
   GUI = {
@@ -123,6 +123,7 @@ local VoyagerTrailCruiseEarthJupiter = {
   Parent = sunTransforms.SolarSystemBarycenter.Identifier,
   Renderable = {
     Type = "RenderableTrailTrajectory",
+    Enabled = asset.enabled,
     Translation = {
       Type = "SpiceTranslation",
       Target = "VOYAGER 2",
@@ -132,8 +133,7 @@ local VoyagerTrailCruiseEarthJupiter = {
     StartTime = "1977-AUG-20 16:07:06.535",
     EndTime = "1979 JUL 06",
     -- 669 is the number of days between the Start and End time
-    SampleInterval = 669 * 2,
-    Enabled = asset.enabled
+    SampleInterval = 669 * 2
   },
   Tag = { "voyager2_trail" },
   GUI = {
@@ -308,8 +308,7 @@ local VoyagerTrailEncounterNeptune = {
     -- @TODO: Probably an off-by-one bug in RenderableTrailTrajectory?
     StartTime = "1989 AUG 23 22:30:00",
     EndTime = "1989 AUG 26",
-    SampleInterval = 100,
-    Enabled = asset.enabled
+    SampleInterval = 100
   },
   Tag = { "voyager2_trail" },
   GUI = {
diff --git a/data/assets/scene/solarsystem/planets/earth/earth.asset b/data/assets/scene/solarsystem/planets/earth/earth.asset
index 23c2ee9806..ba942a061f 100644
--- a/data/assets/scene/solarsystem/planets/earth/earth.asset
+++ b/data/assets/scene/solarsystem/planets/earth/earth.asset
@@ -55,8 +55,8 @@ local EarthLabel = {
   Identifier = "EarthLabel",
   Parent = Earth.Identifier,
   Renderable = {
-    Enabled = false,
     Type = "RenderableLabel",
+    Enabled = false,
     Text = "Earth",
     FontSize = 70.0,
     Size = 8.50,
diff --git a/data/assets/scene/solarsystem/planets/earth/satellites/misc/iss.asset b/data/assets/scene/solarsystem/planets/earth/satellites/misc/iss.asset
index b95f913208..b47c12f15e 100644
--- a/data/assets/scene/solarsystem/planets/earth/satellites/misc/iss.asset
+++ b/data/assets/scene/solarsystem/planets/earth/satellites/misc/iss.asset
@@ -101,8 +101,8 @@ local IssLabel = {
   Identifier = "IssLabel",
   Parent = IssPosition.Identifier,
   Renderable = {
-    Enabled = false,
     Type = "RenderableLabel",
+    Enabled = false,
     Text = "ISS",
     FontSize = 70.0,
     Size = 3.4,
diff --git a/data/assets/scene/solarsystem/planets/earth/satellites/weather/aqua.asset b/data/assets/scene/solarsystem/planets/earth/satellites/weather/aqua.asset
index 38c187bc96..82ee18135d 100644
--- a/data/assets/scene/solarsystem/planets/earth/satellites/weather/aqua.asset
+++ b/data/assets/scene/solarsystem/planets/earth/satellites/weather/aqua.asset
@@ -65,8 +65,8 @@ local AquaLabel = {
   Identifier = "AquaLabel",
   Parent = Aqua.Identifier,
   Renderable = {
-    Enabled = false,
     Type = "RenderableLabel",
+    Enabled = false,
     Text = "Aqua",
     FontSize = 70.0,
     Size = 4.0,
diff --git a/data/assets/scene/solarsystem/planets/earth/satellites/weather/snpp.asset b/data/assets/scene/solarsystem/planets/earth/satellites/weather/snpp.asset
index 89e19db0fd..abd07a5570 100644
--- a/data/assets/scene/solarsystem/planets/earth/satellites/weather/snpp.asset
+++ b/data/assets/scene/solarsystem/planets/earth/satellites/weather/snpp.asset
@@ -63,8 +63,8 @@ local SNPPLabel = {
   Identifier = "SNPPLabel",
   Parent = SNPP.Identifier,
   Renderable = {
-    Enabled = false,
     Type = "RenderableLabel",
+    Enabled = false,
     Text = "SNPP",
     FontSize = 70.0,
     Size = 4.0,
diff --git a/data/assets/scene/solarsystem/planets/earth/satellites/weather/terra.asset b/data/assets/scene/solarsystem/planets/earth/satellites/weather/terra.asset
index d8a3693079..8a36392b3c 100644
--- a/data/assets/scene/solarsystem/planets/earth/satellites/weather/terra.asset
+++ b/data/assets/scene/solarsystem/planets/earth/satellites/weather/terra.asset
@@ -65,8 +65,8 @@ local TerraLabel = {
   Identifier = "TerraLabel",
   Parent = Terra.Identifier,
   Renderable = {
-    Enabled = false,
     Type = "RenderableLabel",
+    Enabled = false,
     Text = "Terra",
     FontSize = 70.0,
     Size = 4.0,
diff --git a/data/assets/scene/solarsystem/planets/earth/trail.asset b/data/assets/scene/solarsystem/planets/earth/trail.asset
index df0a24beca..2b1951f8d8 100644
--- a/data/assets/scene/solarsystem/planets/earth/trail.asset
+++ b/data/assets/scene/solarsystem/planets/earth/trail.asset
@@ -15,7 +15,7 @@ local EarthTrail = {
     },
     Color = { 0.5, 0.8, 1.0 },
     Period = 365.242,
-    Resolution = 1000,
+    Resolution = 1000
   },
   Tag = { "planetTrail_solarSystem", "planetTrail_terrestrial" },
   GUI = {
diff --git a/data/assets/scene/solarsystem/planets/earth/trail_barycenter.asset b/data/assets/scene/solarsystem/planets/earth/trail_barycenter.asset
index 7721f8fc50..9f02fd484a 100644
--- a/data/assets/scene/solarsystem/planets/earth/trail_barycenter.asset
+++ b/data/assets/scene/solarsystem/planets/earth/trail_barycenter.asset
@@ -8,6 +8,7 @@ local EarthBarycenterTrail = {
   Parent = transforms.SolarSystemBarycenter.Identifier,
   Renderable = {
     Type = "RenderableTrailOrbit",
+    Enabled = false,
     Translation = {
       Type = "SpiceTranslation",
       Target = "EARTH BARYCENTER",
@@ -15,8 +16,7 @@ local EarthBarycenterTrail = {
     },
     Color = { 0.5, 0.8, 1.0 },
     Period = 365.242,
-    Resolution = 1000,
-    Enabled = false
+    Resolution = 1000
   },
   Tag = { "planetTrail_solarSystem", "planetTrail_terrestrial" },
   GUI = {
diff --git a/data/assets/scene/solarsystem/planets/jupiter/callisto/callisto.asset b/data/assets/scene/solarsystem/planets/jupiter/callisto/callisto.asset
index 162d176067..c51afd21a6 100644
--- a/data/assets/scene/solarsystem/planets/jupiter/callisto/callisto.asset
+++ b/data/assets/scene/solarsystem/planets/jupiter/callisto/callisto.asset
@@ -57,8 +57,8 @@ local CallistoLabel = {
   Identifier = "CallistoLabel",
   Parent = Callisto.Identifier,
   Renderable = {
-    Enabled = false,
     Type = "RenderableLabel",
+    Enabled = false,
     Text = "Callisto",
     FontSize = 70.0,
     Size = 6.0,
diff --git a/data/assets/scene/solarsystem/planets/jupiter/europa/europa.asset b/data/assets/scene/solarsystem/planets/jupiter/europa/europa.asset
index 524ada7573..15911782d0 100644
--- a/data/assets/scene/solarsystem/planets/jupiter/europa/europa.asset
+++ b/data/assets/scene/solarsystem/planets/jupiter/europa/europa.asset
@@ -56,8 +56,8 @@ local EuropaLabel = {
   Identifier = "EuropaLabel",
   Parent = Europa.Identifier,
   Renderable = {
-    Enabled = false,
     Type = "RenderableLabel",
+    Enabled = false,
     Text = "Europa",
     FontSize = 70.0,
     Size = 6.0,
diff --git a/data/assets/scene/solarsystem/planets/jupiter/ganymede/ganymede.asset b/data/assets/scene/solarsystem/planets/jupiter/ganymede/ganymede.asset
index 84b03b030a..be7996b5d7 100644
--- a/data/assets/scene/solarsystem/planets/jupiter/ganymede/ganymede.asset
+++ b/data/assets/scene/solarsystem/planets/jupiter/ganymede/ganymede.asset
@@ -56,8 +56,8 @@ local GanymedeLabel = {
   Identifier = "GanymedeLabel",
   Parent = Ganymede.Identifier,
   Renderable = {
-    Enabled = false,
     Type = "RenderableLabel",
+    Enabled = false,
     Text = "Ganymede",
     FontSize = 70.0,
     Size = 6.0,
diff --git a/data/assets/scene/solarsystem/planets/jupiter/io/io.asset b/data/assets/scene/solarsystem/planets/jupiter/io/io.asset
index c4a7ee85fd..5f93bba501 100644
--- a/data/assets/scene/solarsystem/planets/jupiter/io/io.asset
+++ b/data/assets/scene/solarsystem/planets/jupiter/io/io.asset
@@ -56,8 +56,8 @@ local IoLabel = {
   Identifier = "IoLabel",
   Parent = Io.Identifier,
   Renderable = {
-    Enabled = false,
     Type = "RenderableLabel",
+    Enabled = false,
     Text = "Io",
     FontSize = 70.0,
     Size = 6.0,
diff --git a/data/assets/scene/solarsystem/planets/jupiter/jupiter.asset b/data/assets/scene/solarsystem/planets/jupiter/jupiter.asset
index be3dfee2bc..6c17b0ba70 100644
--- a/data/assets/scene/solarsystem/planets/jupiter/jupiter.asset
+++ b/data/assets/scene/solarsystem/planets/jupiter/jupiter.asset
@@ -46,8 +46,8 @@ local JupiterLabel = {
   Identifier = "JupiterLabel",
   Parent = Jupiter.Identifier,
   Renderable = {
-    Enabled = false,
     Type = "RenderableLabel",
+    Enabled = false,
     Text = "Jupiter",
     FontSize = 70.0,
     Size = 8.75,
diff --git a/data/assets/scene/solarsystem/planets/jupiter/layers/colorlayers/jupiter_video.asset b/data/assets/scene/solarsystem/planets/jupiter/layers/colorlayers/jupiter_video.asset
index 61f18baa2a..bb189fbade 100644
--- a/data/assets/scene/solarsystem/planets/jupiter/layers/colorlayers/jupiter_video.asset
+++ b/data/assets/scene/solarsystem/planets/jupiter/layers/colorlayers/jupiter_video.asset
@@ -11,11 +11,11 @@ local data = asset.resource({
 
 
 local Layer = {
+  Type = "VideoTileProvider",
   Identifier = "JupiterVideo",
-  Video = data .. "/jupiter_movie_3600.mp4",
   Name = "Jupiter Video",
   Enabled = true,
-  Type = "VideoTileProvider"
+  Video = data .. "/jupiter_movie_3600.mp4"
 }
 
 
diff --git a/data/assets/scene/solarsystem/planets/jupiter/minor/ananke_group.asset b/data/assets/scene/solarsystem/planets/jupiter/minor/ananke_group.asset
index 99a6b75c5b..71371df2d8 100644
--- a/data/assets/scene/solarsystem/planets/jupiter/minor/ananke_group.asset
+++ b/data/assets/scene/solarsystem/planets/jupiter/minor/ananke_group.asset
@@ -64,8 +64,8 @@ local S2010J2Label = {
   Identifier = "S2010J2Label",
   Parent = S2010J2.Identifier,
   Renderable = {
-    Enabled = false,
     Type = "RenderableLabel",
+    Enabled = false,
     Text = "S/2010 J 2",
     FontSize = 70.0,
     Size = 7.1,
@@ -146,8 +146,8 @@ local ThelxinoeLabel = {
   Identifier = "ThelxinoeLabel",
   Parent = Thelxinoe.Identifier,
   Renderable = {
-    Enabled = false,
     Type = "RenderableLabel",
+    Enabled = false,
     Text = "Thelxinoe",
     FontSize = 70.0,
     Size = 7.1,
@@ -228,8 +228,8 @@ local EuantheLabel = {
   Identifier = "EuantheLabel",
   Parent = Euanthe.Identifier,
   Renderable = {
-    Enabled = false,
     Type = "RenderableLabel",
+    Enabled = false,
     Text = "Euanthe",
     FontSize = 70.0,
     Size = 7.1,
@@ -310,8 +310,8 @@ local IocasteLabel = {
   Identifier = "IocasteLabel",
   Parent = Iocaste.Identifier,
   Renderable = {
-    Enabled = false,
     Type = "RenderableLabel",
+    Enabled = false,
     Text = "Iocaste",
     FontSize = 70.0,
     Size = 7.1,
@@ -392,8 +392,8 @@ local S2003J16Label = {
   Identifier = "S2003J16Label",
   Parent = S2003J16.Identifier,
   Renderable = {
-    Enabled = false,
     Type = "RenderableLabel",
+    Enabled = false,
     Text = "S/2003 J 16",
     FontSize = 70.0,
     Size = 7.1,
@@ -474,8 +474,8 @@ local PraxidikeLabel = {
   Identifier = "PraxidikeLabel",
   Parent = Praxidike.Identifier,
   Renderable = {
-    Enabled = false,
     Type = "RenderableLabel",
+    Enabled = false,
     Text = "Praxidike",
     FontSize = 70.0,
     Size = 7.1,
@@ -556,8 +556,8 @@ local HarpalykeLabel = {
   Identifier = "HarpalykeLabel",
   Parent = Harpalyke.Identifier,
   Renderable = {
-    Enabled = false,
     Type = "RenderableLabel",
+    Enabled = false,
     Text = "Harpalyke",
     FontSize = 70.0,
     Size = 7.1,
@@ -638,8 +638,8 @@ local MnemeLabel = {
   Identifier = "MnemeLabel",
   Parent = Mneme.Identifier,
   Renderable = {
-    Enabled = false,
     Type = "RenderableLabel",
+    Enabled = false,
     Text = "Mneme",
     FontSize = 70.0,
     Size = 7.1,
@@ -720,8 +720,8 @@ local HermippeLabel = {
   Identifier = "HermippeLabel",
   Parent = Hermippe.Identifier,
   Renderable = {
-    Enabled = false,
     Type = "RenderableLabel",
+    Enabled = false,
     Text = "Hermippe",
     FontSize = 70.0,
     Size = 7.1,
@@ -802,8 +802,8 @@ local ThyoneLabel = {
   Identifier = "ThyoneLabel",
   Parent = Thyone.Identifier,
   Renderable = {
-    Enabled = false,
     Type = "RenderableLabel",
+    Enabled = false,
     Text = "Thyone",
     FontSize = 70.0,
     Size = 7.1,
@@ -884,8 +884,8 @@ local AnankeLabel = {
   Identifier = "AnankeLabel",
   Parent = Ananke.Identifier,
   Renderable = {
-    Enabled = false,
     Type = "RenderableLabel",
+    Enabled = false,
     Text = "Ananke",
     FontSize = 70.0,
     Size = 7.1,
@@ -966,8 +966,8 @@ local S2021J1Label = {
   Identifier = "S2021J1Label",
   Parent = S2021J1.Identifier,
   Renderable = {
-    Enabled = false,
     Type = "RenderableLabel",
+    Enabled = false,
     Text = "S/2021 J 1",
     FontSize = 70.0,
     Size = 7.1,
@@ -1048,8 +1048,8 @@ local S2021J2Label = {
   Identifier = "S2021J2Label",
   Parent = S2021J2.Identifier,
   Renderable = {
-    Enabled = false,
     Type = "RenderableLabel",
+    Enabled = false,
     Text = "S/2021 J 2",
     FontSize = 70.0,
     Size = 7.1,
@@ -1130,8 +1130,8 @@ local S2021J3Label = {
   Identifier = "S2021J3Label",
   Parent = S2021J3.Identifier,
   Renderable = {
-    Enabled = false,
     Type = "RenderableLabel",
+    Enabled = false,
     Text = "S/2021 J 3",
     FontSize = 70.0,
     Size = 7.1,
@@ -1212,8 +1212,8 @@ local S2022J3Label = {
   Identifier = "S2022J3Label",
   Parent = S2022J3.Identifier,
   Renderable = {
-    Enabled = false,
     Type = "RenderableLabel",
+    Enabled = false,
     Text = "S/2022 J 3",
     FontSize = 70.0,
     Size = 7.1,
@@ -1294,8 +1294,8 @@ local S2017J3Label = {
   Identifier = "S2017J3Label",
   Parent = S2017J3.Identifier,
   Renderable = {
-    Enabled = false,
     Type = "RenderableLabel",
+    Enabled = false,
     Text = "S/2017 J 3",
     FontSize = 70.0,
     Size = 7.1,
@@ -1376,8 +1376,8 @@ local S2017J7Label = {
   Identifier = "S2017J7Label",
   Parent = S2017J7.Identifier,
   Renderable = {
-    Enabled = false,
     Type = "RenderableLabel",
+    Enabled = false,
     Text = "S/2017 J 7",
     FontSize = 70.0,
     Size = 7.1,
@@ -1458,8 +1458,8 @@ local S2017J9Label = {
   Identifier = "S2017J9Label",
   Parent = S2017J9.Identifier,
   Renderable = {
-    Enabled = false,
     Type = "RenderableLabel",
+    Enabled = false,
     Text = "S/2017 J 9",
     FontSize = 70.0,
     Size = 7.1,
@@ -1540,8 +1540,8 @@ local S2003J2Label = {
   Identifier = "S2003J2Label",
   Parent = S2003J2.Identifier,
   Renderable = {
-    Enabled = false,
     Type = "RenderableLabel",
+    Enabled = false,
     Text = "S/2003 J 2",
     FontSize = 70.0,
     Size = 7.1,
@@ -1622,8 +1622,8 @@ local S2003J12Label = {
   Identifier = "S2003J12Label",
   Parent = S2003J12.Identifier,
   Renderable = {
-    Enabled = false,
     Type = "RenderableLabel",
+    Enabled = false,
     Text = "S/2003 J 12",
     FontSize = 70.0,
     Size = 7.1,
diff --git a/data/assets/scene/solarsystem/planets/jupiter/minor/carme_group.asset b/data/assets/scene/solarsystem/planets/jupiter/minor/carme_group.asset
index 057110afa5..429b30578c 100644
--- a/data/assets/scene/solarsystem/planets/jupiter/minor/carme_group.asset
+++ b/data/assets/scene/solarsystem/planets/jupiter/minor/carme_group.asset
@@ -64,8 +64,8 @@ local HerseLabel = {
   Identifier = "HerseLabel",
   Parent = Herse.Identifier,
   Renderable = {
-    Enabled = false,
     Type = "RenderableLabel",
+    Enabled = false,
     Text = "Herse",
     FontSize = 70.0,
     Size = 7.1,
@@ -146,8 +146,8 @@ local AitneLabel = {
   Identifier = "AitneLabel",
   Parent = Aitne.Identifier,
   Renderable = {
-    Enabled = false,
     Type = "RenderableLabel",
+    Enabled = false,
     Text = "Aitne",
     FontSize = 70.0,
     Size = 7.1,
@@ -228,8 +228,8 @@ local KaleLabel = {
   Identifier = "KaleLabel",
   Parent = Kale.Identifier,
   Renderable = {
-    Enabled = false,
     Type = "RenderableLabel",
+    Enabled = false,
     Text = "Kale",
     FontSize = 70.0,
     Size = 7.1,
@@ -310,8 +310,8 @@ local TaygeteLabel = {
   Identifier = "TaygeteLabel",
   Parent = Taygete.Identifier,
   Renderable = {
-    Enabled = false,
     Type = "RenderableLabel",
+    Enabled = false,
     Text = "Taygete",
     FontSize = 70.0,
     Size = 7.1,
@@ -392,8 +392,8 @@ local ChaldeneLabel = {
   Identifier = "ChaldeneLabel",
   Parent = Chaldene.Identifier,
   Renderable = {
-    Enabled = false,
     Type = "RenderableLabel",
+    Enabled = false,
     Text = "Chaldene",
     FontSize = 70.0,
     Size = 7.1,
@@ -474,8 +474,8 @@ local ErinomeLabel = {
   Identifier = "ErinomeLabel",
   Parent = Erinome.Identifier,
   Renderable = {
-    Enabled = false,
     Type = "RenderableLabel",
+    Enabled = false,
     Text = "Erinome",
     FontSize = 70.0,
     Size = 7.1,
@@ -556,8 +556,8 @@ local KallichoreLabel = {
   Identifier = "KallichoreLabel",
   Parent = Kallichore.Identifier,
   Renderable = {
-    Enabled = false,
     Type = "RenderableLabel",
+    Enabled = false,
     Text = "Kallichore",
     FontSize = 70.0,
     Size = 7.1,
@@ -638,8 +638,8 @@ local KalykeLabel = {
   Identifier = "KalykeLabel",
   Parent = Kalyke.Identifier,
   Renderable = {
-    Enabled = false,
     Type = "RenderableLabel",
+    Enabled = false,
     Text = "Kalyke",
     FontSize = 70.0,
     Size = 7.1,
@@ -720,8 +720,8 @@ local PasitheeLabel = {
   Identifier = "PasitheeLabel",
   Parent = Pasithee.Identifier,
   Renderable = {
-    Enabled = false,
     Type = "RenderableLabel",
+    Enabled = false,
     Text = "Pasithee",
     FontSize = 70.0,
     Size = 7.1,
@@ -802,8 +802,8 @@ local S2010J1Label = {
   Identifier = "S2010J1Label",
   Parent = S2010J1.Identifier,
   Renderable = {
-    Enabled = false,
     Type = "RenderableLabel",
+    Enabled = false,
     Text = "S/2010 J 1",
     FontSize = 70.0,
     Size = 7.1,
@@ -884,8 +884,8 @@ local EukeladeLabel = {
   Identifier = "EukeladeLabel",
   Parent = Eukelade.Identifier,
   Renderable = {
-    Enabled = false,
     Type = "RenderableLabel",
+    Enabled = false,
     Text = "Eukelade",
     FontSize = 70.0,
     Size = 7.1,
@@ -966,8 +966,8 @@ local ArcheLabel = {
   Identifier = "ArcheLabel",
   Parent = Arche.Identifier,
   Renderable = {
-    Enabled = false,
     Type = "RenderableLabel",
+    Enabled = false,
     Text = "Arche",
     FontSize = 70.0,
     Size = 7.1,
@@ -1048,8 +1048,8 @@ local IsonoeLabel = {
   Identifier = "IsonoeLabel",
   Parent = Isonoe.Identifier,
   Renderable = {
-    Enabled = false,
     Type = "RenderableLabel",
+    Enabled = false,
     Text = "Isonoe",
     FontSize = 70.0,
     Size = 7.1,
@@ -1130,8 +1130,8 @@ local CarmeLabel = {
   Identifier = "CarmeLabel",
   Parent = Carme.Identifier,
   Renderable = {
-    Enabled = false,
     Type = "RenderableLabel",
+    Enabled = false,
     Text = "Carme",
     FontSize = 70.0,
     Size = 7.1,
@@ -1212,8 +1212,8 @@ local S2003J5Label = {
   Identifier = "S2003J5Label",
   Parent = S2003J5.Identifier,
   Renderable = {
-    Enabled = false,
     Type = "RenderableLabel",
+    Enabled = false,
     Text = "S/2003 J 5",
     FontSize = 70.0,
     Size = 7.1,
@@ -1294,8 +1294,8 @@ local S2018J3Label = {
   Identifier = "S2018J3Label",
   Parent = S2018J3.Identifier,
   Renderable = {
-    Enabled = false,
     Type = "RenderableLabel",
+    Enabled = false,
     Text = "S/2018 J 3",
     FontSize = 70.0,
     Size = 7.1,
@@ -1376,8 +1376,8 @@ local S2021J4Label = {
   Identifier = "S2021J4Label",
   Parent = S2021J4.Identifier,
   Renderable = {
-    Enabled = false,
     Type = "RenderableLabel",
+    Enabled = false,
     Text = "S/2021 J 4",
     FontSize = 70.0,
     Size = 7.1,
@@ -1458,8 +1458,8 @@ local S2021J5Label = {
   Identifier = "S2021J5Label",
   Parent = S2021J5.Identifier,
   Renderable = {
-    Enabled = false,
     Type = "RenderableLabel",
+    Enabled = false,
     Text = "S/2021 J 5",
     FontSize = 70.0,
     Size = 7.1,
@@ -1540,8 +1540,8 @@ local S2021J6Label = {
   Identifier = "S2021J6Label",
   Parent = S2021J6.Identifier,
   Renderable = {
-    Enabled = false,
     Type = "RenderableLabel",
+    Enabled = false,
     Text = "S/2021 J 6",
     FontSize = 70.0,
     Size = 7.1,
@@ -1622,8 +1622,8 @@ local S2016J3Label = {
   Identifier = "S2016J3Label",
   Parent = S2016J3.Identifier,
   Renderable = {
-    Enabled = false,
     Type = "RenderableLabel",
+    Enabled = false,
     Text = "S/2016 J 3",
     FontSize = 70.0,
     Size = 7.1,
@@ -1704,8 +1704,8 @@ local S2022J1Label = {
   Identifier = "S2022J1Label",
   Parent = S2022J1.Identifier,
   Renderable = {
-    Enabled = false,
     Type = "RenderableLabel",
+    Enabled = false,
     Text = "S/2022 J 1",
     FontSize = 70.0,
     Size = 7.1,
@@ -1786,8 +1786,8 @@ local S2022J2Label = {
   Identifier = "S2022J2Label",
   Parent = S2022J2.Identifier,
   Renderable = {
-    Enabled = false,
     Type = "RenderableLabel",
+    Enabled = false,
     Text = "S/2022 J 2",
     FontSize = 70.0,
     Size = 7.1,
@@ -1868,8 +1868,8 @@ local S2017J2Label = {
   Identifier = "S2017J2Label",
   Parent = S2017J2.Identifier,
   Renderable = {
-    Enabled = false,
     Type = "RenderableLabel",
+    Enabled = false,
     Text = "S/2017 J 2",
     FontSize = 70.0,
     Size = 7.1,
@@ -1950,8 +1950,8 @@ local S2017J5Label = {
   Identifier = "S2017J5Label",
   Parent = S2017J5.Identifier,
   Renderable = {
-    Enabled = false,
     Type = "RenderableLabel",
+    Enabled = false,
     Text = "S/2017 J 5",
     FontSize = 70.0,
     Size = 7.1,
@@ -2032,8 +2032,8 @@ local S2017J8Label = {
   Identifier = "S2017J8Label",
   Parent = S2017J8.Identifier,
   Renderable = {
-    Enabled = false,
     Type = "RenderableLabel",
+    Enabled = false,
     Text = "S/2017 J 8",
     FontSize = 70.0,
     Size = 7.1,
@@ -2114,8 +2114,8 @@ local S2011J1Label = {
   Identifier = "S2011J1Label",
   Parent = S2011J1.Identifier,
   Renderable = {
-    Enabled = false,
     Type = "RenderableLabel",
+    Enabled = false,
     Text = "S/2011 J 1",
     FontSize = 70.0,
     Size = 7.1,
@@ -2196,8 +2196,8 @@ local S2003J9Label = {
   Identifier = "S2003J9Label",
   Parent = S2003J9.Identifier,
   Renderable = {
-    Enabled = false,
     Type = "RenderableLabel",
+    Enabled = false,
     Text = "S/2003 J 9",
     FontSize = 70.0,
     Size = 7.1,
@@ -2278,8 +2278,8 @@ local S2003J10Label = {
   Identifier = "S2003J10Label",
   Parent = S2003J10.Identifier,
   Renderable = {
-    Enabled = false,
     Type = "RenderableLabel",
+    Enabled = false,
     Text = "S/2003 J 10",
     FontSize = 70.0,
     Size = 7.1,
diff --git a/data/assets/scene/solarsystem/planets/jupiter/minor/carpo_group.asset b/data/assets/scene/solarsystem/planets/jupiter/minor/carpo_group.asset
index 1402dada48..14ba43eb87 100644
--- a/data/assets/scene/solarsystem/planets/jupiter/minor/carpo_group.asset
+++ b/data/assets/scene/solarsystem/planets/jupiter/minor/carpo_group.asset
@@ -64,8 +64,8 @@ local CarpoLabel = {
   Identifier = "CarpoLabel",
   Parent = Carpo.Identifier,
   Renderable = {
-    Enabled = false,
     Type = "RenderableLabel",
+    Enabled = false,
     Text = "Carpo",
     FontSize = 70.0,
     Size = 7.1,
@@ -89,8 +89,8 @@ local CarpoLabelNear = {
   Identifier = "CarpoLabelNear",
   Parent = Carpo.Identifier,
   Renderable = {
-    Enabled = false,
     Type = "RenderableLabel",
+    Enabled = false,
     Text = "Carpo",
     FontSize = 70.0,
     Size = 5.5,
@@ -171,8 +171,8 @@ local S2018J4Label = {
   Identifier = "S2018J4Label",
   Parent = S2018J4.Identifier,
   Renderable = {
-    Enabled = false,
     Type = "RenderableLabel",
+    Enabled = false,
     Text = "S/2018 J 4",
     FontSize = 70.0,
     Size = 7.1,
@@ -196,8 +196,8 @@ local S2018J4LabelNear = {
   Identifier = "S2018J4LabelNear",
   Parent = S2018J4.Identifier,
   Renderable = {
-    Enabled = false,
     Type = "RenderableLabel",
+    Enabled = false,
     Text = "S2018J4",
     FontSize = 70.0,
     Size = 5.5,
diff --git a/data/assets/scene/solarsystem/planets/jupiter/minor/himalia_group.asset b/data/assets/scene/solarsystem/planets/jupiter/minor/himalia_group.asset
index 973332f077..4fc3675d13 100644
--- a/data/assets/scene/solarsystem/planets/jupiter/minor/himalia_group.asset
+++ b/data/assets/scene/solarsystem/planets/jupiter/minor/himalia_group.asset
@@ -64,8 +64,8 @@ local LedaLabel = {
   Identifier = "LedaLabel",
   Parent = Leda.Identifier,
   Renderable = {
-    Enabled = false,
     Type = "RenderableLabel",
+    Enabled = false,
     Text = "Leda",
     FontSize = 70.0,
     Size = 7.1,
@@ -146,8 +146,8 @@ local HimaliaLabel = {
   Identifier = "HimaliaLabel",
   Parent = Himalia.Identifier,
   Renderable = {
-    Enabled = false,
     Type = "RenderableLabel",
+    Enabled = false,
     Text = "Himalia",
     FontSize = 70.0,
     Size = 7.1,
@@ -228,8 +228,8 @@ local LysitheaLabel = {
   Identifier = "LysitheaLabel",
   Parent = Lysithea.Identifier,
   Renderable = {
-    Enabled = false,
     Type = "RenderableLabel",
+    Enabled = false,
     Text = "Lysithea",
     FontSize = 70.0,
     Size = 7.1,
@@ -310,8 +310,8 @@ local ElaraLabel = {
   Identifier = "ElaraLabel",
   Parent = Elara.Identifier,
   Renderable = {
-    Enabled = false,
     Type = "RenderableLabel",
+    Enabled = false,
     Text = "Elara",
     FontSize = 70.0,
     Size = 7.1,
@@ -392,8 +392,8 @@ local DiaLabel = {
   Identifier = "DiaLabel",
   Parent = Dia.Identifier,
   Renderable = {
-    Enabled = false,
     Type = "RenderableLabel",
+    Enabled = false,
     Text = "Dia",
     FontSize = 70.0,
     Size = 7.1,
@@ -474,8 +474,8 @@ local S2011J3Label = {
   Identifier = "S2011J3Label",
   Parent = S2011J3.Identifier,
   Renderable = {
-    Enabled = false,
     Type = "RenderableLabel",
+    Enabled = false,
     Text = "S/2011 J 3",
     FontSize = 70.0,
     Size = 7.1,
@@ -556,8 +556,8 @@ local S2018J2Label = {
   Identifier = "S2018J2Label",
   Parent = S2018J2.Identifier,
   Renderable = {
-    Enabled = false,
     Type = "RenderableLabel",
+    Enabled = false,
     Text = "S/2018 J 2",
     FontSize = 70.0,
     Size = 7.1,
@@ -638,8 +638,8 @@ local PandiaLabel = {
   Identifier = "PandiaLabel",
   Parent = Pandia.Identifier,
   Renderable = {
-    Enabled = false,
     Type = "RenderableLabel",
+    Enabled = false,
     Text = "Pandia",
     FontSize = 70.0,
     Size = 7.1,
@@ -720,8 +720,8 @@ local ErsaLabel = {
   Identifier = "ErsaLabel",
   Parent = Ersa.Identifier,
   Renderable = {
-    Enabled = false,
     Type = "RenderableLabel",
+    Enabled = false,
     Text = "Ersa",
     FontSize = 70.0,
     Size = 7.1,
diff --git a/data/assets/scene/solarsystem/planets/jupiter/minor/inner_group.asset b/data/assets/scene/solarsystem/planets/jupiter/minor/inner_group.asset
index f7228a5d26..f07135e154 100644
--- a/data/assets/scene/solarsystem/planets/jupiter/minor/inner_group.asset
+++ b/data/assets/scene/solarsystem/planets/jupiter/minor/inner_group.asset
@@ -64,8 +64,8 @@ local MetisLabel = {
   Identifier = "MetisLabel",
   Parent = Metis.Identifier,
   Renderable = {
-    Enabled = false,
     Type = "RenderableLabel",
+    Enabled = false,
     Text = "Metis",
     FontSize = 50.0,
     Size = 5.6,
@@ -146,8 +146,8 @@ local AdrasteaLabel = {
   Identifier = "AdrasteaLabel",
   Parent = Adrastea.Identifier,
   Renderable = {
-    Enabled = false,
     Type = "RenderableLabel",
+    Enabled = false,
     Text = "Adrastea",
     FontSize = 50.0,
     Size = 5.6,
@@ -228,8 +228,8 @@ local AmaltheaLabel = {
   Identifier = "AmaltheaLabel",
   Parent = Amalthea.Identifier,
   Renderable = {
-    Enabled = false,
     Type = "RenderableLabel",
+    Enabled = false,
     Text = "Amalthea",
     FontSize = 50.0,
     Size = 5.6,
@@ -310,8 +310,8 @@ local ThebeLabel = {
   Identifier = "ThebeLabel",
   Parent = Thebe.Identifier,
   Renderable = {
-    Enabled = false,
     Type = "RenderableLabel",
+    Enabled = false,
     Text = "Thebe",
     FontSize = 50.0,
     Size = 5.6,
diff --git a/data/assets/scene/solarsystem/planets/jupiter/minor/other_groups.asset b/data/assets/scene/solarsystem/planets/jupiter/minor/other_groups.asset
index 6e605f5c9a..5b601ff7d6 100644
--- a/data/assets/scene/solarsystem/planets/jupiter/minor/other_groups.asset
+++ b/data/assets/scene/solarsystem/planets/jupiter/minor/other_groups.asset
@@ -64,8 +64,8 @@ local EuphemeLabel = {
   Identifier = "EuphemeLabel",
   Parent = Eupheme.Identifier,
   Renderable = {
-    Enabled = false,
     Type = "RenderableLabel",
+    Enabled = false,
     Text = "Eupheme",
     FontSize = 70.0,
     Size = 7.1,
@@ -146,8 +146,8 @@ local S2003J19Label = {
   Identifier = "S2003J19Label",
   Parent = S2003J19.Identifier,
   Renderable = {
-    Enabled = false,
     Type = "RenderableLabel",
+    Enabled = false,
     Text = "S/2003 J 19",
     FontSize = 70.0,
     Size = 7.1,
@@ -228,8 +228,8 @@ local ValetudoLabel = {
   Identifier = "ValetudoLabel",
   Parent = Valetudo.Identifier,
   Renderable = {
-    Enabled = false,
     Type = "RenderableLabel",
+    Enabled = false,
     Text = "Valetudo",
     FontSize = 70.0,
     Size = 7.1,
diff --git a/data/assets/scene/solarsystem/planets/jupiter/minor/pasiphae_group.asset b/data/assets/scene/solarsystem/planets/jupiter/minor/pasiphae_group.asset
index 981e3c628b..79da80391a 100644
--- a/data/assets/scene/solarsystem/planets/jupiter/minor/pasiphae_group.asset
+++ b/data/assets/scene/solarsystem/planets/jupiter/minor/pasiphae_group.asset
@@ -64,8 +64,8 @@ local EuporieLabel = {
   Identifier = "EuporieLabel",
   Parent = Euporie.Identifier,
   Renderable = {
-    Enabled = false,
     Type = "RenderableLabel",
+    Enabled = false,
     Text = "Euporie",
     FontSize = 70.0,
     Size = 7.1,
@@ -146,8 +146,8 @@ local S2003J18Label = {
   Identifier = "S2003J18Label",
   Parent = S2003J18.Identifier,
   Renderable = {
-    Enabled = false,
     Type = "RenderableLabel",
+    Enabled = false,
     Text = "S/2003 J 18",
     FontSize = 70.0,
     Size = 7.1,
@@ -228,8 +228,8 @@ local HelikeLabel = {
   Identifier = "HelikeLabel",
   Parent = Helike.Identifier,
   Renderable = {
-    Enabled = false,
     Type = "RenderableLabel",
+    Enabled = false,
     Text = "Helike",
     FontSize = 70.0,
     Size = 7.1,
@@ -310,8 +310,8 @@ local OrthosieLabel = {
   Identifier = "OrthosieLabel",
   Parent = Orthosie.Identifier,
   Renderable = {
-    Enabled = false,
     Type = "RenderableLabel",
+    Enabled = false,
     Text = "Orthosie",
     FontSize = 70.0,
     Size = 7.1,
@@ -392,8 +392,8 @@ local S2016J1Label = {
   Identifier = "S2016J1Label",
   Parent = S2016J1.Identifier,
   Renderable = {
-    Enabled = false,
     Type = "RenderableLabel",
+    Enabled = false,
     Text = "S/2016 J 1",
     FontSize = 70.0,
     Size = 7.1,
@@ -474,8 +474,8 @@ local S2003J15Label = {
   Identifier = "S2003J15Label",
   Parent = S2003J15.Identifier,
   Renderable = {
-    Enabled = false,
     Type = "RenderableLabel",
+    Enabled = false,
     Text = "S/2003 J 15",
     FontSize = 70.0,
     Size = 7.1,
@@ -556,8 +556,8 @@ local AoedeLabel = {
   Identifier = "AoedeLabel",
   Parent = Aoede.Identifier,
   Renderable = {
-    Enabled = false,
     Type = "RenderableLabel",
+    Enabled = false,
     Text = "Aoede",
     FontSize = 70.0,
     Size = 7.1,
@@ -638,8 +638,8 @@ local CallirrhoeLabel = {
   Identifier = "CallirrhoeLabel",
   Parent = Callirrhoe.Identifier,
   Renderable = {
-    Enabled = false,
     Type = "RenderableLabel",
+    Enabled = false,
     Text = "Callirrhoe",
     FontSize = 70.0,
     Size = 7.1,
@@ -720,8 +720,8 @@ local EurydomeLabel = {
   Identifier = "EurydomeLabel",
   Parent = Eurydome.Identifier,
   Renderable = {
-    Enabled = false,
     Type = "RenderableLabel",
+    Enabled = false,
     Text = "Eurydome",
     FontSize = 70.0,
     Size = 7.1,
@@ -802,8 +802,8 @@ local KoreLabel = {
   Identifier = "KoreLabel",
   Parent = Kore.Identifier,
   Renderable = {
-    Enabled = false,
     Type = "RenderableLabel",
+    Enabled = false,
     Text = "Kore",
     FontSize = 70.0,
     Size = 7.1,
@@ -884,8 +884,8 @@ local CylleneLabel = {
   Identifier = "CylleneLabel",
   Parent = Cyllene.Identifier,
   Renderable = {
-    Enabled = false,
     Type = "RenderableLabel",
+    Enabled = false,
     Text = "Cyllene",
     FontSize = 70.0,
     Size = 7.1,
@@ -966,8 +966,8 @@ local S2011J2Label = {
   Identifier = "S2011J2Label",
   Parent = S2011J2.Identifier,
   Renderable = {
-    Enabled = false,
     Type = "RenderableLabel",
+    Enabled = false,
     Text = "S/2011 J 2",
     FontSize = 70.0,
     Size = 7.1,
@@ -1048,8 +1048,8 @@ local S2017J1Label = {
   Identifier = "S2017J1Label",
   Parent = S2017J1.Identifier,
   Renderable = {
-    Enabled = false,
     Type = "RenderableLabel",
+    Enabled = false,
     Text = "S/2017 J 1",
     FontSize = 70.0,
     Size = 7.1,
@@ -1130,8 +1130,8 @@ local S2003J4Label = {
   Identifier = "S2003J4Label",
   Parent = S2003J4.Identifier,
   Renderable = {
-    Enabled = false,
     Type = "RenderableLabel",
+    Enabled = false,
     Text = "S/2003 J 4",
     FontSize = 70.0,
     Size = 7.1,
@@ -1212,8 +1212,8 @@ local PasiphaeLabel = {
   Identifier = "PasiphaeLabel",
   Parent = Pasiphae.Identifier,
   Renderable = {
-    Enabled = false,
     Type = "RenderableLabel",
+    Enabled = false,
     Text = "Pasiphae",
     FontSize = 70.0,
     Size = 7.1,
@@ -1294,8 +1294,8 @@ local HegemoneLabel = {
   Identifier = "HegemoneLabel",
   Parent = Hegemone.Identifier,
   Renderable = {
-    Enabled = false,
     Type = "RenderableLabel",
+    Enabled = false,
     Text = "Hegemone",
     FontSize = 70.0,
     Size = 7.1,
@@ -1376,8 +1376,8 @@ local SinopeLabel = {
   Identifier = "SinopeLabel",
   Parent = Sinope.Identifier,
   Renderable = {
-    Enabled = false,
     Type = "RenderableLabel",
+    Enabled = false,
     Text = "Sinope",
     FontSize = 70.0,
     Size = 7.1,
@@ -1458,8 +1458,8 @@ local SpondeLabel = {
   Identifier = "SpondeLabel",
   Parent = Sponde.Identifier,
   Renderable = {
-    Enabled = false,
     Type = "RenderableLabel",
+    Enabled = false,
     Text = "Sponde",
     FontSize = 70.0,
     Size = 7.1,
@@ -1540,8 +1540,8 @@ local AutonoeLabel = {
   Identifier = "AutonoeLabel",
   Parent = Autonoe.Identifier,
   Renderable = {
-    Enabled = false,
     Type = "RenderableLabel",
+    Enabled = false,
     Text = "Autonoe",
     FontSize = 70.0,
     Size = 7.1,
@@ -1622,8 +1622,8 @@ local MegacliteLabel = {
   Identifier = "MegacliteLabel",
   Parent = Megaclite.Identifier,
   Renderable = {
-    Enabled = false,
     Type = "RenderableLabel",
+    Enabled = false,
     Text = "Megaclite",
     FontSize = 70.0,
     Size = 7.1,
@@ -1704,8 +1704,8 @@ local S2016J4Label = {
   Identifier = "S2016J4Label",
   Parent = S2016J4.Identifier,
   Renderable = {
-    Enabled = false,
     Type = "RenderableLabel",
+    Enabled = false,
     Text = "S/2016 J 4",
     FontSize = 70.0,
     Size = 7.1,
@@ -1786,8 +1786,8 @@ local S2017J6Label = {
   Identifier = "S2017J6Label",
   Parent = S2017J6.Identifier,
   Renderable = {
-    Enabled = false,
     Type = "RenderableLabel",
+    Enabled = false,
     Text = "S/2017 J 6",
     FontSize = 70.0,
     Size = 7.1,
@@ -1868,8 +1868,8 @@ local S2003J23Label = {
   Identifier = "S2003J23Label",
   Parent = S2003J23.Identifier,
   Renderable = {
-    Enabled = false,
     Type = "RenderableLabel",
+    Enabled = false,
     Text = "S/2003 J 23",
     FontSize = 70.0,
     Size = 7.1,
diff --git a/data/assets/scene/solarsystem/planets/jupiter/minor/themisto_group.asset b/data/assets/scene/solarsystem/planets/jupiter/minor/themisto_group.asset
index 3f56ed269f..14d26fed81 100644
--- a/data/assets/scene/solarsystem/planets/jupiter/minor/themisto_group.asset
+++ b/data/assets/scene/solarsystem/planets/jupiter/minor/themisto_group.asset
@@ -64,8 +64,8 @@ local ThemistoLabel = {
   Identifier = "ThemistoLabel",
   Parent = Themisto.Identifier,
   Renderable = {
-    Enabled = false,
     Type = "RenderableLabel",
+    Enabled = false,
     Text = "Themisto",
     FontSize = 70.0,
     Size = 7.1,
diff --git a/data/assets/scene/solarsystem/planets/jupiter/trail_barycenter.asset b/data/assets/scene/solarsystem/planets/jupiter/trail_barycenter.asset
index a5616525b6..ed2eb9f195 100644
--- a/data/assets/scene/solarsystem/planets/jupiter/trail_barycenter.asset
+++ b/data/assets/scene/solarsystem/planets/jupiter/trail_barycenter.asset
@@ -8,6 +8,7 @@ local JupiterBarycenterTrail = {
   Parent = transforms.SolarSystemBarycenter.Identifier,
   Renderable = {
     Type = "RenderableTrailOrbit",
+    Enabled = false,
     Translation = {
       Type = "SpiceTranslation",
       Target = "JUPITER BARYCENTER",
@@ -15,8 +16,7 @@ local JupiterBarycenterTrail = {
     },
     Color = { 0.8, 0.7, 0.7 },
     Period = 4330.595,
-    Resolution = 1000,
-    Enabled = false
+    Resolution = 1000
   },
   Tag = { "planetTrail_solarSystem", "planetTrail_giants" },
   GUI = {
diff --git a/data/assets/scene/solarsystem/planets/jupiter/trail_earth.asset b/data/assets/scene/solarsystem/planets/jupiter/trail_earth.asset
index 2b86d42e8e..1150e90a6a 100644
--- a/data/assets/scene/solarsystem/planets/jupiter/trail_earth.asset
+++ b/data/assets/scene/solarsystem/planets/jupiter/trail_earth.asset
@@ -9,6 +9,7 @@ local JupiterTrailEarth = {
   Parent = earthTransforms.EarthBarycenter.Identifier,
   Renderable = {
     Type = "RenderableTrailOrbit",
+    Enabled = false,
     Translation = {
       Type = "SpiceTranslation",
       Target = "JUPITER",
@@ -16,8 +17,7 @@ local JupiterTrailEarth = {
     },
     Color = { 1.0, 0.5, 0.2 },
     Period = 224.695,
-    Resolution = 1000,
-    Enabled = false
+    Resolution = 1000
   },
   Tag = { "planetTrail_solarSystem_alt", "planetTrail_terrestrial_alt" },
   GUI = {
diff --git a/data/assets/scene/solarsystem/planets/mars/mars.asset b/data/assets/scene/solarsystem/planets/mars/mars.asset
index 6f25b031d1..12d03f46d4 100644
--- a/data/assets/scene/solarsystem/planets/mars/mars.asset
+++ b/data/assets/scene/solarsystem/planets/mars/mars.asset
@@ -60,8 +60,8 @@ local MarsLabel = {
   Identifier = "MarsLabel",
   Parent = Mars.Identifier,
   Renderable = {
-    Enabled = false,
     Type = "RenderableLabel",
+    Enabled = false,
     Text = "Mars",
     FontSize = 70.0,
     Size = 8.50,
diff --git a/data/assets/scene/solarsystem/planets/mars/moons/deimos.asset b/data/assets/scene/solarsystem/planets/mars/moons/deimos.asset
index 0c30512f58..bcaf61ac8c 100644
--- a/data/assets/scene/solarsystem/planets/mars/moons/deimos.asset
+++ b/data/assets/scene/solarsystem/planets/mars/moons/deimos.asset
@@ -24,15 +24,15 @@ local Deimos = {
   Parent = transforms.MarsBarycenter.Identifier,
   InteractionSphere = 8000,
   Transform = {
-    Rotation = {
-      Type = "SpiceRotation",
-      SourceFrame = "IAU_DEIMOS",
-      DestinationFrame = "GALACTIC"
-    },
     Translation = {
       Type = "SpiceTranslation",
       Target = "DEIMOS",
       Observer = "MARS BARYCENTER"
+    },
+    Rotation = {
+      Type = "SpiceRotation",
+      SourceFrame = "IAU_DEIMOS",
+      DestinationFrame = "GALACTIC"
     }
   },
   Renderable = {
@@ -81,8 +81,8 @@ local DeimosLabel = {
   Identifier = "DeimosLabel",
   Parent = Deimos.Identifier,
   Renderable = {
-    Enabled = false,
     Type = "RenderableLabel",
+    Enabled = false,
     Text = "Deimos",
     FontSize = 70.0,
     Size = 5.0,
diff --git a/data/assets/scene/solarsystem/planets/mars/moons/deimos_globe.asset b/data/assets/scene/solarsystem/planets/mars/moons/deimos_globe.asset
index 2c63a40743..6becb727ca 100644
--- a/data/assets/scene/solarsystem/planets/mars/moons/deimos_globe.asset
+++ b/data/assets/scene/solarsystem/planets/mars/moons/deimos_globe.asset
@@ -14,15 +14,15 @@ local DeimosGlobe = {
   Identifier = "Deimos_Globe",
   Parent = transforms.MarsBarycenter.Identifier,
   Transform = {
-    Rotation = {
-      Type = "SpiceRotation",
-      SourceFrame = "IAU_DEIMOS",
-      DestinationFrame = "GALACTIC"
-    },
     Translation = {
       Type = "SpiceTranslation",
       Target = "DEIMOS",
       Observer = "MARS BARYCENTER"
+    },
+    Rotation = {
+      Type = "SpiceRotation",
+      SourceFrame = "IAU_DEIMOS",
+      DestinationFrame = "GALACTIC"
     }
   },
   Renderable = {
diff --git a/data/assets/scene/solarsystem/planets/mars/moons/phobos.asset b/data/assets/scene/solarsystem/planets/mars/moons/phobos.asset
index 722dd5c975..e726196159 100644
--- a/data/assets/scene/solarsystem/planets/mars/moons/phobos.asset
+++ b/data/assets/scene/solarsystem/planets/mars/moons/phobos.asset
@@ -24,15 +24,15 @@ local Phobos = {
   Parent = transforms.MarsBarycenter.Identifier,
   InteractionSphere = 15000,
   Transform = {
-    Rotation = {
-      Type = "SpiceRotation",
-      SourceFrame = "IAU_PHOBOS",
-      DestinationFrame = "GALACTIC"
-    },
     Translation = {
       Type = "SpiceTranslation",
       Target = "PHOBOS",
       Observer = "MARS BARYCENTER"
+    },
+    Rotation = {
+      Type = "SpiceRotation",
+      SourceFrame = "IAU_PHOBOS",
+      DestinationFrame = "GALACTIC"
     }
   },
   Renderable = {
@@ -81,8 +81,8 @@ local PhobosLabel = {
   Identifier = "PhobosLabel",
   Parent = Phobos.Identifier,
   Renderable = {
-    Enabled = false,
     Type = "RenderableLabel",
+    Enabled = false,
     Text = "Phobos",
     FontSize = 70.0,
     Size = 5.0,
diff --git a/data/assets/scene/solarsystem/planets/mars/moons/phobos_globe.asset b/data/assets/scene/solarsystem/planets/mars/moons/phobos_globe.asset
index 84623a9151..147136e331 100644
--- a/data/assets/scene/solarsystem/planets/mars/moons/phobos_globe.asset
+++ b/data/assets/scene/solarsystem/planets/mars/moons/phobos_globe.asset
@@ -14,16 +14,16 @@ local PhobosGlobe = {
   Identifier = "Phobos_Globe",
   Parent = transforms.MarsBarycenter.Identifier,
   Transform = {
+    Translation = {
+      Type = "SpiceTranslation",
+      Target = "PHOBOS",
+      Observer = "MARS BARYCENTER"
+    },
     Rotation = {
       Type = "SpiceRotation",
       SourceFrame = "IAU_PHOBOS",
       DestinationFrame = "GALACTIC"
     },
-    Translation = {
-      Type = "SpiceTranslation",
-      Target = "PHOBOS",
-      Observer = "MARS BARYCENTER"
-    }
   },
   Renderable = {
     Type = "RenderableGlobe",
diff --git a/data/assets/scene/solarsystem/planets/mars/trail_barycenter.asset b/data/assets/scene/solarsystem/planets/mars/trail_barycenter.asset
index 325745d6ed..7aa361676a 100644
--- a/data/assets/scene/solarsystem/planets/mars/trail_barycenter.asset
+++ b/data/assets/scene/solarsystem/planets/mars/trail_barycenter.asset
@@ -8,6 +8,7 @@ local MarsBarycenterTrail = {
   Parent = transforms.SolarSystemBarycenter.Identifier,
   Renderable = {
     Type = "RenderableTrailOrbit",
+    Enabled = false,
     Translation = {
       Type = "SpiceTranslation",
       Target = "MARS BARYCENTER",
@@ -15,8 +16,7 @@ local MarsBarycenterTrail = {
     },
     Color = { 0.814, 0.305, 0.220 },
     Period = 686.973,
-    Resolution = 1000,
-    Enabled = false
+    Resolution = 1000
   },
   Tag = { "planetTrail_solarSystem", "planetTrail_terrestrial" },
   GUI = {
diff --git a/data/assets/scene/solarsystem/planets/mars/trail_earth.asset b/data/assets/scene/solarsystem/planets/mars/trail_earth.asset
index 0885f3b79d..e77711aa8d 100644
--- a/data/assets/scene/solarsystem/planets/mars/trail_earth.asset
+++ b/data/assets/scene/solarsystem/planets/mars/trail_earth.asset
@@ -8,6 +8,7 @@ local MarsTrailEarth = {
   Parent = transforms.EarthBarycenter.Identifier,
   Renderable = {
     Type = "RenderableTrailOrbit",
+    Enabled = false,
     Translation = {
       Type = "SpiceTranslation",
       Target = "MARS",
@@ -15,8 +16,7 @@ local MarsTrailEarth = {
     },
     Color = { 1.0, 0.5, 0.2 },
     Period = 224.695,
-    Resolution = 1000,
-    Enabled = false
+    Resolution = 1000
   },
   Tag = { "planetTrail_solarSystem_alt", "planetTrail_terrestrial_alt" },
   GUI = {
diff --git a/data/assets/scene/solarsystem/planets/mars/transforms.asset b/data/assets/scene/solarsystem/planets/mars/transforms.asset
index d17172c11d..dadc6d49c6 100644
--- a/data/assets/scene/solarsystem/planets/mars/transforms.asset
+++ b/data/assets/scene/solarsystem/planets/mars/transforms.asset
@@ -16,8 +16,7 @@ local MarsBarycenter = {
   GUI = {
     Name = "Mars Barycenter",
     Path = "/Solar System/Planets/Mars",
-    Hidden = true,
-    Description = "SPICE Translation for targeting Mars Barycenter"
+    Hidden = true
   }
 }
 
diff --git a/data/assets/scene/solarsystem/planets/mercury/mercury.asset b/data/assets/scene/solarsystem/planets/mercury/mercury.asset
index 6dde12aa39..4b74997ff2 100644
--- a/data/assets/scene/solarsystem/planets/mercury/mercury.asset
+++ b/data/assets/scene/solarsystem/planets/mercury/mercury.asset
@@ -58,8 +58,8 @@ local MercuryLabel = {
   Identifier = "MercuryLabel",
   Parent = Mercury.Identifier,
   Renderable = {
-    Enabled = false,
     Type = "RenderableLabel",
+    Enabled = false,
     Text = "Mercury",
     FontSize = 70.0,
     Size = 8.5,
diff --git a/data/assets/scene/solarsystem/planets/mercury/trail_barycenter.asset b/data/assets/scene/solarsystem/planets/mercury/trail_barycenter.asset
index 5f66705e6e..a628148e8a 100644
--- a/data/assets/scene/solarsystem/planets/mercury/trail_barycenter.asset
+++ b/data/assets/scene/solarsystem/planets/mercury/trail_barycenter.asset
@@ -8,6 +8,7 @@ local MercuryBarycenterTrail = {
   Parent = transforms.SolarSystemBarycenter.Identifier,
   Renderable = {
     Type = "RenderableTrailOrbit",
+    Enabled = false,
     Translation = {
       Type = "SpiceTranslation",
       Target = "MERCURY BARYCENTER",
@@ -15,8 +16,7 @@ local MercuryBarycenterTrail = {
     },
     Color = { 0.6, 0.5, 0.5 },
     Period = 87.968,
-    Resolution = 1000,
-    Enabled = false
+    Resolution = 1000
   },
   Tag = { "planetTrail_solarSystem", "planetTrail_terrestrial" },
   GUI = {
diff --git a/data/assets/scene/solarsystem/planets/mercury/trail_earth.asset b/data/assets/scene/solarsystem/planets/mercury/trail_earth.asset
index e151c31ccb..259460e939 100644
--- a/data/assets/scene/solarsystem/planets/mercury/trail_earth.asset
+++ b/data/assets/scene/solarsystem/planets/mercury/trail_earth.asset
@@ -9,6 +9,7 @@ local MercuryTrailEarth = {
   Parent = earthTransforms.EarthBarycenter.Identifier,
   Renderable = {
     Type = "RenderableTrailOrbit",
+    Enabled = false,
     Translation = {
       Type = "SpiceTranslation",
       Target = "MERCURY",
@@ -16,8 +17,7 @@ local MercuryTrailEarth = {
     },
     Color = { 1.0, 0.5, 0.2 },
     Period = 224.695,
-    Resolution = 1000,
-    Enabled = false
+    Resolution = 1000
   },
   Tag = { "planetTrail_solarSystem_alt", "planetTrail_terrestrial_alt" },
   GUI = {
diff --git a/data/assets/scene/solarsystem/planets/neptune/inner_moons.asset b/data/assets/scene/solarsystem/planets/neptune/inner_moons.asset
index 6c4e57b39a..7b74e64e61 100644
--- a/data/assets/scene/solarsystem/planets/neptune/inner_moons.asset
+++ b/data/assets/scene/solarsystem/planets/neptune/inner_moons.asset
@@ -64,8 +64,8 @@ local NaiadLabel = {
   Identifier = "NaiadLabel",
   Parent = Naiad.Identifier,
   Renderable = {
-    Enabled = false,
     Type = "RenderableLabel",
+    Enabled = false,
     Text = "Naiad",
     FontSize = 70.0,
     Size = 5.2,
@@ -146,8 +146,8 @@ local ThalassaLabel = {
   Identifier = "ThalassaLabel",
   Parent = Thalassa.Identifier,
   Renderable = {
-    Enabled = false,
     Type = "RenderableLabel",
+    Enabled = false,
     Text = "Thalassa",
     FontSize = 70.0,
     Size = 5.2,
@@ -228,8 +228,8 @@ local DespinaLabel = {
   Identifier = "DespinaLabel",
   Parent = Despina.Identifier,
   Renderable = {
-    Enabled = false,
     Type = "RenderableLabel",
+    Enabled = false,
     Text = "Despina",
     FontSize = 70.0,
     Size = 5.2,
@@ -310,8 +310,8 @@ local GalateaLabel = {
   Identifier = "GalateaLabel",
   Parent = Galatea.Identifier,
   Renderable = {
-    Enabled = false,
     Type = "RenderableLabel",
+    Enabled = false,
     Text = "Galatea",
     FontSize = 70.0,
     Size = 5.2,
@@ -392,8 +392,8 @@ local LarissaLabel = {
   Identifier = "LarissaLabel",
   Parent = Larissa.Identifier,
   Renderable = {
-    Enabled = false,
     Type = "RenderableLabel",
+    Enabled = false,
     Text = "Larissa",
     FontSize = 70.0,
     Size = 5.2,
@@ -474,8 +474,8 @@ local HippocampLabel = {
   Identifier = "HippocampLabel",
   Parent = Hippocamp.Identifier,
   Renderable = {
-    Enabled = false,
     Type = "RenderableLabel",
+    Enabled = false,
     Text = "Hippocamp",
     FontSize = 70.0,
     Size = 5.2,
@@ -556,8 +556,8 @@ local ProteusLabel = {
   Identifier = "ProteusLabel",
   Parent = Proteus.Identifier,
   Renderable = {
-    Enabled = false,
     Type = "RenderableLabel",
+    Enabled = false,
     Text = "Proteus",
     FontSize = 70.0,
     Size = 5.2,
diff --git a/data/assets/scene/solarsystem/planets/neptune/irregular_moons.asset b/data/assets/scene/solarsystem/planets/neptune/irregular_moons.asset
index 93262f0f38..6b1f13d4fc 100644
--- a/data/assets/scene/solarsystem/planets/neptune/irregular_moons.asset
+++ b/data/assets/scene/solarsystem/planets/neptune/irregular_moons.asset
@@ -64,8 +64,8 @@ local HalimedeLabel = {
   Identifier = "HalimedeLabel",
   Parent = Halimede.Identifier,
   Renderable = {
-    Enabled = false,
     Type = "RenderableLabel",
+    Enabled = false,
     Text = "Halimede",
     FontSize = 70.0,
     Size = 7.4,
@@ -146,8 +146,8 @@ local PsamatheLabel = {
   Identifier = "PsamatheLabel",
   Parent = Psamathe.Identifier,
   Renderable = {
-    Enabled = false,
     Type = "RenderableLabel",
+    Enabled = false,
     Text = "Psamathe",
     FontSize = 70.0,
     Size = 7.4,
@@ -228,8 +228,8 @@ local SaoLabel = {
   Identifier = "SaoLabel",
   Parent = Sao.Identifier,
   Renderable = {
-    Enabled = false,
     Type = "RenderableLabel",
+    Enabled = false,
     Text = "Sao",
     FontSize = 70.0,
     Size = 7.4,
@@ -310,8 +310,8 @@ local LaomedeiaLabel = {
   Identifier = "LaomedeiaLabel",
   Parent = Laomedeia.Identifier,
   Renderable = {
-    Enabled = false,
     Type = "RenderableLabel",
+    Enabled = false,
     Text = "Laomedeia",
     FontSize = 70.0,
     Size = 7.4,
@@ -392,8 +392,8 @@ local NesoLabel = {
   Identifier = "NesoLabel",
   Parent = Neso.Identifier,
   Renderable = {
-    Enabled = false,
     Type = "RenderableLabel",
+    Enabled = false,
     Text = "Neso",
     FontSize = 70.0,
     Size = 7.4,
diff --git a/data/assets/scene/solarsystem/planets/neptune/neptune.asset b/data/assets/scene/solarsystem/planets/neptune/neptune.asset
index 02dae1bef3..08a80ed703 100644
--- a/data/assets/scene/solarsystem/planets/neptune/neptune.asset
+++ b/data/assets/scene/solarsystem/planets/neptune/neptune.asset
@@ -38,8 +38,8 @@ local NeptuneLabel = {
   Identifier = "NeptuneLabel",
   Parent = Neptune.Identifier,
   Renderable = {
-    Enabled = false,
     Type = "RenderableLabel",
+    Enabled = false,
     Text = "Neptune",
     FontSize = 70.0,
     Size = 9.0,
diff --git a/data/assets/scene/solarsystem/planets/neptune/nereid/nereid.asset b/data/assets/scene/solarsystem/planets/neptune/nereid/nereid.asset
index 3a37ab72a3..889f01cc3b 100644
--- a/data/assets/scene/solarsystem/planets/neptune/nereid/nereid.asset
+++ b/data/assets/scene/solarsystem/planets/neptune/nereid/nereid.asset
@@ -51,8 +51,8 @@ local NereidLabel = {
   Identifier = "NereidLabel",
   Parent = Nereid.Identifier,
   Renderable = {
-    Enabled = false,
     Type = "RenderableLabel",
+    Enabled = false,
     Text = "Nereid",
     FontSize = 50.0,
     Size = 7.0,
diff --git a/data/assets/scene/solarsystem/planets/neptune/trail_barycenter.asset b/data/assets/scene/solarsystem/planets/neptune/trail_barycenter.asset
index 6e2466aac5..4a5de693f7 100644
--- a/data/assets/scene/solarsystem/planets/neptune/trail_barycenter.asset
+++ b/data/assets/scene/solarsystem/planets/neptune/trail_barycenter.asset
@@ -9,6 +9,7 @@ local NeptuneBarycenterTrail = {
   Parent = transforms.SolarSystemBarycenter.Identifier,
   Renderable = {
     Type = "RenderableTrailOrbit",
+    Enabled = false,
     Translation = {
       Type = "SpiceTranslation",
       Target = "NEPTUNE BARYCENTER",
@@ -16,8 +17,7 @@ local NeptuneBarycenterTrail = {
     },
     Color = { 0.2, 0.5, 1.0 },
     Period = 60266,
-    Resolution = 1000,
-    Enabled = false
+    Resolution = 1000
   },
   Tag = { "planetTrail_solarSystem", "planetTrail_giants" },
   GUI = {
diff --git a/data/assets/scene/solarsystem/planets/neptune/trail_earth.asset b/data/assets/scene/solarsystem/planets/neptune/trail_earth.asset
index f417553bed..9becaa7d4a 100644
--- a/data/assets/scene/solarsystem/planets/neptune/trail_earth.asset
+++ b/data/assets/scene/solarsystem/planets/neptune/trail_earth.asset
@@ -10,6 +10,7 @@ local NeptuneTrailEarth = {
   Parent = earthTransforms.EarthBarycenter.Identifier,
   Renderable = {
     Type = "RenderableTrailOrbit",
+    Enabled = false,
     Translation = {
       Type = "SpiceTranslation",
       Target = "NEPTUNE",
@@ -17,8 +18,7 @@ local NeptuneTrailEarth = {
     },
     Color = { 1.0, 0.5, 0.2 },
     Period = 224.695,
-    Resolution = 1000,
-    Enabled = false
+    Resolution = 1000
   },
   Tag = { "planetTrail_solarSystem_alt", "planetTrail_terrestrial_alt" },
   GUI = {
diff --git a/data/assets/scene/solarsystem/planets/neptune/transforms.asset b/data/assets/scene/solarsystem/planets/neptune/transforms.asset
index fdf44cb772..93e780ad6d 100644
--- a/data/assets/scene/solarsystem/planets/neptune/transforms.asset
+++ b/data/assets/scene/solarsystem/planets/neptune/transforms.asset
@@ -17,8 +17,7 @@ local NeptuneBarycenter = {
   GUI = {
     Name = "Neptune Barycenter",
     Path = "/Solar System/Planets/Neptune",
-    Hidden = true,
-    Description = "Neptune Barycenter position"
+    Hidden = true
   }
 }
 
diff --git a/data/assets/scene/solarsystem/planets/neptune/triton/triton.asset b/data/assets/scene/solarsystem/planets/neptune/triton/triton.asset
index fd46b06dbf..2d4b5f88f8 100644
--- a/data/assets/scene/solarsystem/planets/neptune/triton/triton.asset
+++ b/data/assets/scene/solarsystem/planets/neptune/triton/triton.asset
@@ -7,15 +7,15 @@ local Triton = {
   Identifier = "Triton",
   Parent = transforms.NeptuneBarycenter.Identifier,
   Transform = {
-    Rotation = {
-      Type = "SpiceRotation",
-      SourceFrame = "IAU_TRITON",
-      DestinationFrame = "GALACTIC",
-    },
     Translation = {
       Type = "SpiceTranslation",
       Target = "TRITON",
       Observer = "NEPTUNE BARYCENTER"
+    },
+    Rotation = {
+      Type = "SpiceRotation",
+      SourceFrame = "IAU_TRITON",
+      DestinationFrame = "GALACTIC",
     }
   },
   Renderable = {
@@ -56,8 +56,8 @@ local TritonLabel = {
   Identifier = "TritonLabel",
   Parent = Triton.Identifier,
   Renderable = {
-    Enabled = false,
     Type = "RenderableLabel",
+    Enabled = false,
     Text = "Triton",
     FontSize = 50.0,
     Size = 7.0,
diff --git a/data/assets/scene/solarsystem/planets/saturn/dione/dione.asset b/data/assets/scene/solarsystem/planets/saturn/dione/dione.asset
index fd6705e03c..059a8978b8 100644
--- a/data/assets/scene/solarsystem/planets/saturn/dione/dione.asset
+++ b/data/assets/scene/solarsystem/planets/saturn/dione/dione.asset
@@ -56,8 +56,8 @@ local DioneLabel = {
   Identifier = "DioneLabel",
   Parent = Dione.Identifier,
   Renderable = {
-    Enabled = false,
     Type = "RenderableLabel",
+    Enabled = false,
     Text = "Dione",
     FontSize = 70.0,
     Size = 6.0,
diff --git a/data/assets/scene/solarsystem/planets/saturn/enceladus/enceladus.asset b/data/assets/scene/solarsystem/planets/saturn/enceladus/enceladus.asset
index 26f5465764..b18131ccef 100644
--- a/data/assets/scene/solarsystem/planets/saturn/enceladus/enceladus.asset
+++ b/data/assets/scene/solarsystem/planets/saturn/enceladus/enceladus.asset
@@ -57,8 +57,8 @@ local EnceladusLabel = {
   Identifier = "EnceladusLabel",
   Parent = Enceladus.Identifier,
   Renderable = {
-    Enabled = false,
     Type = "RenderableLabel",
+    Enabled = false,
     Text = "Enceladus",
     FontSize = 70.0,
     Size = 6.0,
diff --git a/data/assets/scene/solarsystem/planets/saturn/hyperion/hyperion.asset b/data/assets/scene/solarsystem/planets/saturn/hyperion/hyperion.asset
index 97c95a15b3..ade8c4a622 100644
--- a/data/assets/scene/solarsystem/planets/saturn/hyperion/hyperion.asset
+++ b/data/assets/scene/solarsystem/planets/saturn/hyperion/hyperion.asset
@@ -55,8 +55,8 @@ local HyperionLabel = {
   Identifier = "HyperionLabel",
   Parent = Hyperion.Identifier,
   Renderable = {
-    Enabled = false,
     Type = "RenderableLabel",
+    Enabled = false,
     Text = "Hyperion",
     FontSize = 70.0,
     Size = 6.2,
diff --git a/data/assets/scene/solarsystem/planets/saturn/iapetus/iapetus.asset b/data/assets/scene/solarsystem/planets/saturn/iapetus/iapetus.asset
index bac29a64f0..6ed3d230a8 100644
--- a/data/assets/scene/solarsystem/planets/saturn/iapetus/iapetus.asset
+++ b/data/assets/scene/solarsystem/planets/saturn/iapetus/iapetus.asset
@@ -57,8 +57,8 @@ local IapetusLabel = {
   Identifier = "IapetusLabel",
   Parent = Iapetus.Identifier,
   Renderable = {
-    Enabled = false,
     Type = "RenderableLabel",
+    Enabled = false,
     Text = "Iapetus",
     FontSize = 70.0,
     Size = 6.2,
diff --git a/data/assets/scene/solarsystem/planets/saturn/mimas/mimas.asset b/data/assets/scene/solarsystem/planets/saturn/mimas/mimas.asset
index 31da7dcaa2..09f4794b2f 100644
--- a/data/assets/scene/solarsystem/planets/saturn/mimas/mimas.asset
+++ b/data/assets/scene/solarsystem/planets/saturn/mimas/mimas.asset
@@ -31,7 +31,7 @@ local Mimas = {
     Type = "RenderableGlobe",
     Radii = { 207000, 197000, 191000 },
     SegmentsPerPatch = 64,
-    Layers = { },
+    Layers = {},
     Labels = {
       Enabled = false,
       FileName = labelsPath .. "mimas.labels",
@@ -57,8 +57,8 @@ local MimasLabel = {
   Identifier = "MimasLabel",
   Parent = Mimas.Identifier,
   Renderable = {
-    Enabled = false,
     Type = "RenderableLabel",
+    Enabled = false,
     Text = "Mimas",
     FontSize = 70.0,
     Size = 6.0,
diff --git a/data/assets/scene/solarsystem/planets/saturn/minor/gallic_group.asset b/data/assets/scene/solarsystem/planets/saturn/minor/gallic_group.asset
index 8babea3120..a7124b52c9 100644
--- a/data/assets/scene/solarsystem/planets/saturn/minor/gallic_group.asset
+++ b/data/assets/scene/solarsystem/planets/saturn/minor/gallic_group.asset
@@ -64,8 +64,8 @@ local AlbiorixLabel = {
   Identifier = "AlbiorixLabel",
   Parent = Albiorix.Identifier,
   Renderable = {
-    Enabled = false,
     Type = "RenderableLabel",
+    Enabled = false,
     Text = "Albiorix",
     FontSize = 70.0,
     Size = 7.1,
@@ -146,8 +146,8 @@ local BebhionnLabel = {
   Identifier = "BebhionnLabel",
   Parent = Bebhionn.Identifier,
   Renderable = {
-    Enabled = false,
     Type = "RenderableLabel",
+    Enabled = false,
     Text = "Bebhionn",
     FontSize = 70.0,
     Size = 7.1,
@@ -228,8 +228,8 @@ local ErriapusLabel = {
   Identifier = "ErriapusLabel",
   Parent = Erriapus.Identifier,
   Renderable = {
-    Enabled = false,
     Type = "RenderableLabel",
+    Enabled = false,
     Text = "Erriapus",
     FontSize = 70.0,
     Size = 7.1,
@@ -310,8 +310,8 @@ local TarvosLabel = {
   Identifier = "TarvosLabel",
   Parent = Tarvos.Identifier,
   Renderable = {
-    Enabled = false,
     Type = "RenderableLabel",
+    Enabled = false,
     Text = "Tarvos",
     FontSize = 70.0,
     Size = 7.1,
diff --git a/data/assets/scene/solarsystem/planets/saturn/minor/inuit_group.asset b/data/assets/scene/solarsystem/planets/saturn/minor/inuit_group.asset
index f5b99049eb..b2847dad69 100644
--- a/data/assets/scene/solarsystem/planets/saturn/minor/inuit_group.asset
+++ b/data/assets/scene/solarsystem/planets/saturn/minor/inuit_group.asset
@@ -64,8 +64,8 @@ local KiviuqLabel = {
   Identifier = "KiviuqLabel",
   Parent = Kiviuq.Identifier,
   Renderable = {
-    Enabled = false,
     Type = "RenderableLabel",
+    Enabled = false,
     Text = "Kiviuq",
     FontSize = 70.0,
     Size = 7.1,
@@ -146,8 +146,8 @@ local IjiraqLabel = {
   Identifier = "IjiraqLabel",
   Parent = Ijiraq.Identifier,
   Renderable = {
-    Enabled = false,
     Type = "RenderableLabel",
+    Enabled = false,
     Text = "Ijiraq",
     FontSize = 70.0,
     Size = 7.1,
@@ -228,8 +228,8 @@ local PaaliaqLabel = {
   Identifier = "PaaliaqLabel",
   Parent = Paaliaq.Identifier,
   Renderable = {
-    Enabled = false,
     Type = "RenderableLabel",
+    Enabled = false,
     Text = "Paaliaq",
     FontSize = 70.0,
     Size = 7.1,
@@ -310,8 +310,8 @@ local SiarnaqLabel = {
   Identifier = "SiarnaqLabel",
   Parent = Siarnaq.Identifier,
   Renderable = {
-    Enabled = false,
     Type = "RenderableLabel",
+    Enabled = false,
     Text = "Siarnaq",
     FontSize = 70.0,
     Size = 7.1,
@@ -392,8 +392,8 @@ local TarqeqLabel = {
   Identifier = "TarqeqLabel",
   Parent = Tarqeq.Identifier,
   Renderable = {
-    Enabled = false,
     Type = "RenderableLabel",
+    Enabled = false,
     Text = "Tarqeq",
     FontSize = 70.0,
     Size = 7.1,
@@ -474,8 +474,8 @@ local S2004S29Label = {
   Identifier = "S2004S29Label",
   Parent = S2004S29.Identifier,
   Renderable = {
-    Enabled = false,
     Type = "RenderableLabel",
+    Enabled = false,
     Text = "S/2004 S 29",
     FontSize = 70.0,
     Size = 7.1,
@@ -556,8 +556,8 @@ local S2004S31Label = {
   Identifier = "S2004S31Label",
   Parent = S2004S31.Identifier,
   Renderable = {
-    Enabled = false,
     Type = "RenderableLabel",
+    Enabled = false,
     Text = "S/2004 S 31",
     FontSize = 70.0,
     Size = 7.1,
@@ -638,8 +638,8 @@ local S2019S01Label = {
   Identifier = "S2019S01Label",
   Parent = S2019S01.Identifier,
   Renderable = {
-    Enabled = false,
     Type = "RenderableLabel",
+    Enabled = false,
     Text = "S/2019 S 01",
     FontSize = 70.0,
     Size = 7.1,
diff --git a/data/assets/scene/solarsystem/planets/saturn/minor/norse_group.asset b/data/assets/scene/solarsystem/planets/saturn/minor/norse_group.asset
index 3a7dff2fab..d7da7ce2b7 100644
--- a/data/assets/scene/solarsystem/planets/saturn/minor/norse_group.asset
+++ b/data/assets/scene/solarsystem/planets/saturn/minor/norse_group.asset
@@ -64,8 +64,8 @@ local PhoebeLabel = {
   Identifier = "PhoebeLabel",
   Parent = Phoebe.Identifier,
   Renderable = {
-    Enabled = false,
     Type = "RenderableLabel",
+    Enabled = false,
     Text = "Phoebe",
     FontSize = 70.0,
     Size = 7.1,
@@ -146,8 +146,8 @@ local SkathiLabel = {
   Identifier = "SkathiLabel",
   Parent = Skathi.Identifier,
   Renderable = {
-    Enabled = false,
     Type = "RenderableLabel",
+    Enabled = false,
     Text = "Skathi",
     FontSize = 70.0,
     Size = 7.1,
@@ -228,8 +228,8 @@ local S2007S2Label = {
   Identifier = "S2007S2Label",
   Parent = S2007S2.Identifier,
   Renderable = {
-    Enabled = false,
     Type = "RenderableLabel",
+    Enabled = false,
     Text = "S/2007 S 2",
     FontSize = 70.0,
     Size = 7.1,
@@ -310,8 +310,8 @@ local SkollLabel = {
   Identifier = "SkollLabel",
   Parent = Skoll.Identifier,
   Renderable = {
-    Enabled = false,
     Type = "RenderableLabel",
+    Enabled = false,
     Text = "Skoll",
     FontSize = 70.0,
     Size = 7.1,
@@ -392,8 +392,8 @@ local S2004S13Label = {
   Identifier = "S2004S13Label",
   Parent = S2004S13.Identifier,
   Renderable = {
-    Enabled = false,
     Type = "RenderableLabel",
+    Enabled = false,
     Text = "S/2004 S 13",
     FontSize = 70.0,
     Size = 7.1,
@@ -474,8 +474,8 @@ local GreipLabel = {
   Identifier = "GreipLabel",
   Parent = Greip.Identifier,
   Renderable = {
-    Enabled = false,
     Type = "RenderableLabel",
+    Enabled = false,
     Text = "Greip",
     FontSize = 70.0,
     Size = 7.1,
@@ -556,8 +556,8 @@ local HyrrokkinLabel = {
   Identifier = "HyrrokkinLabel",
   Parent = Hyrrokkin.Identifier,
   Renderable = {
-    Enabled = false,
     Type = "RenderableLabel",
+    Enabled = false,
     Text = "Hyrrokkin",
     FontSize = 70.0,
     Size = 7.1,
@@ -638,8 +638,8 @@ local JarnsaxaLabel = {
   Identifier = "JarnsaxaLabel",
   Parent = Jarnsaxa.Identifier,
   Renderable = {
-    Enabled = false,
     Type = "RenderableLabel",
+    Enabled = false,
     Text = "Jarnsaxa",
     FontSize = 70.0,
     Size = 7.1,
@@ -720,8 +720,8 @@ local MundilfariLabel = {
   Identifier = "MundilfariLabel",
   Parent = Mundilfari.Identifier,
   Renderable = {
-    Enabled = false,
     Type = "RenderableLabel",
+    Enabled = false,
     Text = "Mundilfari",
     FontSize = 70.0,
     Size = 7.1,
@@ -802,8 +802,8 @@ local S2006S1Label = {
   Identifier = "S2006S1Label",
   Parent = S2006S1.Identifier,
   Renderable = {
-    Enabled = false,
     Type = "RenderableLabel",
+    Enabled = false,
     Text = "S/2006 S 1",
     FontSize = 70.0,
     Size = 7.1,
@@ -884,8 +884,8 @@ local S2004S17Label = {
   Identifier = "S2004S17Label",
   Parent = S2004S17.Identifier,
   Renderable = {
-    Enabled = false,
     Type = "RenderableLabel",
+    Enabled = false,
     Text = "S/2004 S 17",
     FontSize = 70.0,
     Size = 7.1,
@@ -966,8 +966,8 @@ local BergelmirLabel = {
   Identifier = "BergelmirLabel",
   Parent = Bergelmir.Identifier,
   Renderable = {
-    Enabled = false,
     Type = "RenderableLabel",
+    Enabled = false,
     Text = "Bergelmir",
     FontSize = 70.0,
     Size = 7.1,
@@ -1048,8 +1048,8 @@ local NarviLabel = {
   Identifier = "NarviLabel",
   Parent = Narvi.Identifier,
   Renderable = {
-    Enabled = false,
     Type = "RenderableLabel",
+    Enabled = false,
     Text = "Narvi",
     FontSize = 70.0,
     Size = 7.1,
@@ -1130,8 +1130,8 @@ local SuttungrLabel = {
   Identifier = "SuttungrLabel",
   Parent = Suttungr.Identifier,
   Renderable = {
-    Enabled = false,
     Type = "RenderableLabel",
+    Enabled = false,
     Text = "Suttungr",
     FontSize = 70.0,
     Size = 7.1,
@@ -1212,8 +1212,8 @@ local HatiLabel = {
   Identifier = "HatiLabel",
   Parent = Hati.Identifier,
   Renderable = {
-    Enabled = false,
     Type = "RenderableLabel",
+    Enabled = false,
     Text = "Hati",
     FontSize = 70.0,
     Size = 7.1,
@@ -1294,8 +1294,8 @@ local S2004S12Label = {
   Identifier = "S2004S12Label",
   Parent = S2004S12.Identifier,
   Renderable = {
-    Enabled = false,
     Type = "RenderableLabel",
+    Enabled = false,
     Text = "S/2004 S 12",
     FontSize = 70.0,
     Size = 7.1,
@@ -1376,8 +1376,8 @@ local FarbautiLabel = {
   Identifier = "FarbautiLabel",
   Parent = Farbauti.Identifier,
   Renderable = {
-    Enabled = false,
     Type = "RenderableLabel",
+    Enabled = false,
     Text = "Farbauti",
     FontSize = 70.0,
     Size = 7.1,
@@ -1458,8 +1458,8 @@ local ThrymrLabel = {
   Identifier = "ThrymrLabel",
   Parent = Thrymr.Identifier,
   Renderable = {
-    Enabled = false,
     Type = "RenderableLabel",
+    Enabled = false,
     Text = "Thrymr",
     FontSize = 70.0,
     Size = 7.1,
@@ -1540,8 +1540,8 @@ local AegirLabel = {
   Identifier = "AegirLabel",
   Parent = Aegir.Identifier,
   Renderable = {
-    Enabled = false,
     Type = "RenderableLabel",
+    Enabled = false,
     Text = "Aegir",
     FontSize = 70.0,
     Size = 7.1,
@@ -1622,8 +1622,8 @@ local S2007S3Label = {
   Identifier = "S2007S3Label",
   Parent = S2007S3.Identifier,
   Renderable = {
-    Enabled = false,
     Type = "RenderableLabel",
+    Enabled = false,
     Text = "S/2007 S 3",
     FontSize = 70.0,
     Size = 7.1,
@@ -1704,8 +1704,8 @@ local BestlaLabel = {
   Identifier = "BestlaLabel",
   Parent = Bestla.Identifier,
   Renderable = {
-    Enabled = false,
     Type = "RenderableLabel",
+    Enabled = false,
     Text = "Bestla",
     FontSize = 70.0,
     Size = 7.1,
@@ -1786,8 +1786,8 @@ local S2004S7Label = {
   Identifier = "S2004S7Label",
   Parent = S2004S7.Identifier,
   Renderable = {
-    Enabled = false,
     Type = "RenderableLabel",
+    Enabled = false,
     Text = "S/2004 S 7",
     FontSize = 70.0,
     Size = 7.1,
@@ -1868,8 +1868,8 @@ local S2006S3Label = {
   Identifier = "S2006S3Label",
   Parent = S2006S3.Identifier,
   Renderable = {
-    Enabled = false,
     Type = "RenderableLabel",
+    Enabled = false,
     Text = "S/2006 S 3",
     FontSize = 70.0,
     Size = 7.1,
@@ -1950,8 +1950,8 @@ local FenrirLabel = {
   Identifier = "FenrireLabel",
   Parent = Fenrir.Identifier,
   Renderable = {
-    Enabled = false,
     Type = "RenderableLabel",
+    Enabled = false,
     Text = "Fenrir",
     FontSize = 70.0,
     Size = 7.1,
@@ -2032,8 +2032,8 @@ local SurturLabel = {
   Identifier = "SurturLabel",
   Parent = Surtur.Identifier,
   Renderable = {
-    Enabled = false,
     Type = "RenderableLabel",
+    Enabled = false,
     Text = "Surtur",
     FontSize = 70.0,
     Size = 7.1,
@@ -2114,8 +2114,8 @@ local KariLabel = {
   Identifier = "KariLabel",
   Parent = Kari.Identifier,
   Renderable = {
-    Enabled = false,
     Type = "RenderableLabel",
+    Enabled = false,
     Text = "Kari",
     FontSize = 70.0,
     Size = 7.1,
@@ -2196,8 +2196,8 @@ local YmirLabel = {
   Identifier = "YmirLabel",
   Parent = Ymir.Identifier,
   Renderable = {
-    Enabled = false,
     Type = "RenderableLabel",
+    Enabled = false,
     Text = "Ymir",
     FontSize = 70.0,
     Size = 7.1,
@@ -2278,8 +2278,8 @@ local LogeLabel = {
   Identifier = "LogeLabel",
   Parent = Loge.Identifier,
   Renderable = {
-    Enabled = false,
     Type = "RenderableLabel",
+    Enabled = false,
     Text = "Cyllene",
     FontSize = 70.0,
     Size = 7.1,
@@ -2360,8 +2360,8 @@ local FornjotLabel = {
   Identifier = "FornjotLabel",
   Parent = Fornjot.Identifier,
   Renderable = {
-    Enabled = false,
     Type = "RenderableLabel",
+    Enabled = false,
     Text = "Fornjot",
     FontSize = 70.0,
     Size = 7.1,
@@ -2442,8 +2442,8 @@ local SkadiLabel = {
   Identifier = "SkadiLabel",
   Parent = Skadi.Identifier,
   Renderable = {
-    Enabled = false,
     Type = "RenderableLabel",
+    Enabled = false,
     Text = "Skadi",
     FontSize = 70.0,
     Size = 7.1,
@@ -2524,8 +2524,8 @@ local GridrLabel = {
   Identifier = "GridrLabel",
   Parent = Gridr.Identifier,
   Renderable = {
-    Enabled = false,
     Type = "RenderableLabel",
+    Enabled = false,
     Text = "Gridr",
     FontSize = 70.0,
     Size = 7.1,
@@ -2606,8 +2606,8 @@ local AngrbodaLabel = {
   Identifier = "AngrbodaLabel",
   Parent = Angrboda.Identifier,
   Renderable = {
-    Enabled = false,
     Type = "RenderableLabel",
+    Enabled = false,
     Text = "Angrboda",
     FontSize = 70.0,
     Size = 7.1,
@@ -2688,8 +2688,8 @@ local SkrymirLabel = {
   Identifier = "SkrymirLabel",
   Parent = Skrymir.Identifier,
   Renderable = {
-    Enabled = false,
     Type = "RenderableLabel",
+    Enabled = false,
     Text = "Skrymir",
     FontSize = 70.0,
     Size = 7.1,
@@ -2770,8 +2770,8 @@ local GerdLabel = {
   Identifier = "GerdLabel",
   Parent = Gerd.Identifier,
   Renderable = {
-    Enabled = false,
     Type = "RenderableLabel",
+    Enabled = false,
     Text = "Gerd",
     FontSize = 70.0,
     Size = 7.1,
@@ -2852,8 +2852,8 @@ local S2004S26Label = {
   Identifier = "S2004S26Label",
   Parent = S2004S26.Identifier,
   Renderable = {
-    Enabled = false,
     Type = "RenderableLabel",
+    Enabled = false,
     Text = "S/2004 S 26",
     FontSize = 70.0,
     Size = 7.1,
@@ -2934,8 +2934,8 @@ local EggtherLabel = {
   Identifier = "EggtherLabel",
   Parent = Eggther.Identifier,
   Renderable = {
-    Enabled = false,
     Type = "RenderableLabel",
+    Enabled = false,
     Text = "Eggther",
     FontSize = 70.0,
     Size = 7.1,
@@ -3016,8 +3016,8 @@ local BeliLabel = {
   Identifier = "BeliLabel",
   Parent = Beli.Identifier,
   Renderable = {
-    Enabled = false,
     Type = "RenderableLabel",
+    Enabled = false,
     Text = "Beli",
     FontSize = 70.0,
     Size = 7.1,
@@ -3098,8 +3098,8 @@ local GunnlodLabel = {
   Identifier = "GunnlodLabel",
   Parent = Gunnlod.Identifier,
   Renderable = {
-    Enabled = false,
     Type = "RenderableLabel",
+    Enabled = false,
     Text = "Gunnlod",
     FontSize = 70.0,
     Size = 7.1,
@@ -3180,8 +3180,8 @@ local ThiazziLabel = {
   Identifier = "ThiazziLabel",
   Parent = Thiazzi.Identifier,
   Renderable = {
-    Enabled = false,
     Type = "RenderableLabel",
+    Enabled = false,
     Text = "Thiazzi",
     FontSize = 70.0,
     Size = 7.1,
@@ -3262,8 +3262,8 @@ local S2004S34Label = {
   Identifier = "S2004S34Label",
   Parent = S2004S34.Identifier,
   Renderable = {
-    Enabled = false,
     Type = "RenderableLabel",
+    Enabled = false,
     Text = "S/2004 S 34",
     FontSize = 70.0,
     Size = 7.1,
@@ -3344,8 +3344,8 @@ local AlvaldiLabel = {
   Identifier = "AlvaldiLabel",
   Parent = Alvaldi.Identifier,
   Renderable = {
-    Enabled = false,
     Type = "RenderableLabel",
+    Enabled = false,
     Text = "Alvaldi",
     FontSize = 70.0,
     Size = 7.1,
@@ -3426,8 +3426,8 @@ local GeirrodLabel = {
   Identifier = "GeirrodLabel",
   Parent = Geirrod.Identifier,
   Renderable = {
-    Enabled = false,
     Type = "RenderableLabel",
+    Enabled = false,
     Text = "Geirrod",
     FontSize = 70.0,
     Size = 7.1,
@@ -3508,8 +3508,8 @@ local S2004S28Label = {
   Identifier = "S2004S28Label",
   Parent = S2004S28.Identifier,
   Renderable = {
-    Enabled = false,
     Type = "RenderableLabel",
+    Enabled = false,
     Text = "S/2004 S 28",
     FontSize = 70.0,
     Size = 7.1,
@@ -3590,8 +3590,8 @@ local S2004S21Label = {
   Identifier = "S2004S21Label",
   Parent = S2004S21.Identifier,
   Renderable = {
-    Enabled = false,
     Type = "RenderableLabel",
+    Enabled = false,
     Text = "S/2004 S 21",
     FontSize = 70.0,
     Size = 7.1,
@@ -3672,8 +3672,8 @@ local S2004S36Label = {
   Identifier = "S2004S36Label",
   Parent = S2004S36.Identifier,
   Renderable = {
-    Enabled = false,
     Type = "RenderableLabel",
+    Enabled = false,
     Text = "S/2004 S 36",
     FontSize = 70.0,
     Size = 7.1,
@@ -3754,8 +3754,8 @@ local S2004S37Label = {
   Identifier = "S2004S37Label",
   Parent = S2004S37.Identifier,
   Renderable = {
-    Enabled = false,
     Type = "RenderableLabel",
+    Enabled = false,
     Text = "S/2004 S 37",
     FontSize = 70.0,
     Size = 7.1,
@@ -3836,8 +3836,8 @@ local S2004S39Label = {
   Identifier = "S2004S39Label",
   Parent = S2004S39.Identifier,
   Renderable = {
-    Enabled = false,
     Type = "RenderableLabel",
+    Enabled = false,
     Text = "S/2004 S 39",
     FontSize = 70.0,
     Size = 7.1,
diff --git a/data/assets/scene/solarsystem/planets/saturn/minor/other_group.asset b/data/assets/scene/solarsystem/planets/saturn/minor/other_group.asset
index 7d87adba94..e4119e6abe 100644
--- a/data/assets/scene/solarsystem/planets/saturn/minor/other_group.asset
+++ b/data/assets/scene/solarsystem/planets/saturn/minor/other_group.asset
@@ -64,8 +64,8 @@ local AegaeonLabel = {
   Identifier = "AegaeonLabel",
   Parent = Aegaeon.Identifier,
   Renderable = {
-    Enabled = false,
     Type = "RenderableLabel",
+    Enabled = false,
     Text = "Aegaeon",
     FontSize = 70.0,
     Size = 5.5,
@@ -146,8 +146,8 @@ local MethoneLabel = {
   Identifier = "MethoneLabel",
   Parent = Methone.Identifier,
   Renderable = {
-    Enabled = false,
     Type = "RenderableLabel",
+    Enabled = false,
     Text = "Methone",
     FontSize = 70.0,
     Size = 5.5,
@@ -228,8 +228,8 @@ local AntheLabel = {
   Identifier = "AntheLabel",
   Parent = Anthe.Identifier,
   Renderable = {
-    Enabled = false,
     Type = "RenderableLabel",
+    Enabled = false,
     Text = "Anthe",
     FontSize = 70.0,
     Size = 5.5,
@@ -310,8 +310,8 @@ local PalleneLabel = {
   Identifier = "PalleneLabel",
   Parent = Pallene.Identifier,
   Renderable = {
-    Enabled = false,
     Type = "RenderableLabel",
+    Enabled = false,
     Text = "Pallene",
     FontSize = 70.0,
     Size = 5.5,
@@ -392,8 +392,8 @@ local TelestoLabel = {
   Identifier = "TelestoLabel",
   Parent = Telesto.Identifier,
   Renderable = {
-    Enabled = false,
     Type = "RenderableLabel",
+    Enabled = false,
     Text = "Telesto",
     FontSize = 70.0,
     Size = 5.5,
@@ -474,8 +474,8 @@ local CalypsoLabel = {
   Identifier = "CalypsoLabel",
   Parent = Calypso.Identifier,
   Renderable = {
-    Enabled = false,
     Type = "RenderableLabel",
+    Enabled = false,
     Text = "Calypso",
     FontSize = 70.0,
     Size = 5.5,
@@ -556,8 +556,8 @@ local HeleneLabel = {
   Identifier = "HeleneLabel",
   Parent = Helene.Identifier,
   Renderable = {
-    Enabled = false,
     Type = "RenderableLabel",
+    Enabled = false,
     Text = "Helene",
     FontSize = 70.0,
     Size = 5.5,
@@ -638,8 +638,8 @@ local PolydeucesLabel = {
   Identifier = "PolydeucesLabel",
   Parent = Polydeuces.Identifier,
   Renderable = {
-    Enabled = false,
     Type = "RenderableLabel",
+    Enabled = false,
     Text = "Polydeuces",
     FontSize = 70.0,
     Size = 5.5,
@@ -720,8 +720,8 @@ local S2004S24Label = {
   Identifier = "S2004S24Label",
   Parent = S2004S24.Identifier,
   Renderable = {
-    Enabled = false,
     Type = "RenderableLabel",
+    Enabled = false,
     Text = "S/2004 S 24",
     FontSize = 70.0,
     Size = 5.5,
diff --git a/data/assets/scene/solarsystem/planets/saturn/minor/shepherd_group.asset b/data/assets/scene/solarsystem/planets/saturn/minor/shepherd_group.asset
index 0ffa5bd9b2..cee798aee0 100644
--- a/data/assets/scene/solarsystem/planets/saturn/minor/shepherd_group.asset
+++ b/data/assets/scene/solarsystem/planets/saturn/minor/shepherd_group.asset
@@ -77,8 +77,8 @@ local PrometheusLabel = {
   Identifier = "PrometheusLabel",
   Parent = Prometheus.Identifier,
   Renderable = {
-    Enabled = false,
     Type = "RenderableLabel",
+    Enabled = false,
     Text = "Prometheus",
     FontSize = 70.0,
     Size = 5.5,
@@ -159,8 +159,8 @@ local PandoraLabel = {
   Identifier = "PandoraLabel",
   Parent = Pandora.Identifier,
   Renderable = {
-    Enabled = false,
     Type = "RenderableLabel",
+    Enabled = false,
     Text = "Pandora",
     FontSize = 70.0,
     Size = 5.5,
@@ -241,8 +241,8 @@ local AtlasLabel = {
   Identifier = "AtlasLabel",
   Parent = Atlas.Identifier,
   Renderable = {
-    Enabled = false,
     Type = "RenderableLabel",
+    Enabled = false,
     Text = "Atlas",
     FontSize = 70.0,
     Size = 5.5,
@@ -323,8 +323,8 @@ local JanusLabel = {
   Identifier = "JanusLabel",
   Parent = Janus.Identifier,
   Renderable = {
-    Enabled = false,
     Type = "RenderableLabel",
+    Enabled = false,
     Text = "Janus",
     FontSize = 70.0,
     Size = 5.5,
@@ -405,8 +405,8 @@ local EpimetheusLabel = {
   Identifier = "EpimetheusLabel",
   Parent = Epimetheus.Identifier,
   Renderable = {
-    Enabled = false,
     Type = "RenderableLabel",
+    Enabled = false,
     Text = "Epimetheus",
     FontSize = 70.0,
     Size = 5.5,
@@ -487,8 +487,8 @@ local DaphnisLabel = {
   Identifier = "DaphnisLabel",
   Parent = Daphnis.Identifier,
   Renderable = {
-    Enabled = false,
     Type = "RenderableLabel",
+    Enabled = false,
     Text = "Daphnis",
     FontSize = 70.0,
     Size = 5.5,
@@ -569,8 +569,8 @@ local PanLabel = {
   Identifier = "PanLabel",
   Parent = Pan.Identifier,
   Renderable = {
-    Enabled = false,
     Type = "RenderableLabel",
+    Enabled = false,
     Text = "Pan",
     FontSize = 70.0,
     Size = 5.5,
diff --git a/data/assets/scene/solarsystem/planets/saturn/rhea/rhea.asset b/data/assets/scene/solarsystem/planets/saturn/rhea/rhea.asset
index 64f3c2263c..d8f9983b5d 100644
--- a/data/assets/scene/solarsystem/planets/saturn/rhea/rhea.asset
+++ b/data/assets/scene/solarsystem/planets/saturn/rhea/rhea.asset
@@ -57,8 +57,8 @@ local RheaLabel = {
   Identifier = "RheaLabel",
   Parent = Rhea.Identifier,
   Renderable = {
-    Enabled = false,
     Type = "RenderableLabel",
+    Enabled = false,
     Text = "Rhea",
     FontSize = 70.0,
     Size = 6.0,
diff --git a/data/assets/scene/solarsystem/planets/saturn/saturn.asset b/data/assets/scene/solarsystem/planets/saturn/saturn.asset
index 68753c4355..2039e3c9a9 100644
--- a/data/assets/scene/solarsystem/planets/saturn/saturn.asset
+++ b/data/assets/scene/solarsystem/planets/saturn/saturn.asset
@@ -66,8 +66,8 @@ local SaturnLabel = {
   Identifier = "SaturnLabel",
   Parent = Saturn.Identifier,
   Renderable = {
-    Enabled = false,
     Type = "RenderableLabel",
+    Enabled = false,
     Text = "Saturn",
     FontSize = 70.0,
     Size = 8.9,
diff --git a/data/assets/scene/solarsystem/planets/saturn/tethys/tethys.asset b/data/assets/scene/solarsystem/planets/saturn/tethys/tethys.asset
index 0f66813926..73caeb2422 100644
--- a/data/assets/scene/solarsystem/planets/saturn/tethys/tethys.asset
+++ b/data/assets/scene/solarsystem/planets/saturn/tethys/tethys.asset
@@ -55,8 +55,8 @@ local TethysLabel = {
   Identifier = "TethysLabel",
   Parent = Tethys.Identifier,
   Renderable = {
-    Enabled = false,
     Type = "RenderableLabel",
+    Enabled = false,
     Text = "Tethys",
     FontSize = 70.0,
     Size = 6.0,
diff --git a/data/assets/scene/solarsystem/planets/saturn/titan/titan.asset b/data/assets/scene/solarsystem/planets/saturn/titan/titan.asset
index 6347aeeaa0..ae597cbc2a 100644
--- a/data/assets/scene/solarsystem/planets/saturn/titan/titan.asset
+++ b/data/assets/scene/solarsystem/planets/saturn/titan/titan.asset
@@ -57,8 +57,8 @@ local TitanLabel = {
   Identifier = "TitanLabel",
   Parent = Titan.Identifier,
   Renderable = {
-    Enabled = false,
     Type = "RenderableLabel",
+    Enabled = false,
     Text = "Titan",
     FontSize = 70.0,
     Size = 6.2,
diff --git a/data/assets/scene/solarsystem/planets/saturn/trail_barycenter.asset b/data/assets/scene/solarsystem/planets/saturn/trail_barycenter.asset
index 5e9fdcbe94..163618be21 100644
--- a/data/assets/scene/solarsystem/planets/saturn/trail_barycenter.asset
+++ b/data/assets/scene/solarsystem/planets/saturn/trail_barycenter.asset
@@ -7,6 +7,7 @@ local SaturnBarycenterTrail = {
   Parent = transforms.SolarSystemBarycenter.Identifier,
   Renderable = {
     Type = "RenderableTrailOrbit",
+    Enabled = false,
     Translation = {
       Type = "SpiceTranslation",
       Target = "SATURN BARYCENTER",
@@ -14,8 +15,7 @@ local SaturnBarycenterTrail = {
     },
     Color = { 0.85, 0.75, 0.51 },
     Period = 10746.94,
-    Resolution = 1000,
-    Enabled = false
+    Resolution = 1000
   },
   Tag = { "planetTrail_solarSystem", "planetTrail_giants" },
   GUI = {
diff --git a/data/assets/scene/solarsystem/planets/saturn/trail_earth.asset b/data/assets/scene/solarsystem/planets/saturn/trail_earth.asset
index 42acbb752c..162419e53d 100644
--- a/data/assets/scene/solarsystem/planets/saturn/trail_earth.asset
+++ b/data/assets/scene/solarsystem/planets/saturn/trail_earth.asset
@@ -8,6 +8,7 @@ local SaturnTrailEarth = {
   Parent = transforms.EarthBarycenter.Identifier,
   Renderable = {
     Type = "RenderableTrailOrbit",
+    Enabled = false,
     Translation = {
       Type = "SpiceTranslation",
       Target = "SATURN",
@@ -15,8 +16,7 @@ local SaturnTrailEarth = {
     },
     Color = { 1.0, 0.5, 0.2 },
     Period = 224.695,
-    Resolution = 1000,
-    Enabled = false
+    Resolution = 1000
   },
   Tag = { "planetTrail_solarSystem_alt", "planetTrail_terrestrial_alt" },
   GUI = {
diff --git a/data/assets/scene/solarsystem/planets/saturn/transforms.asset b/data/assets/scene/solarsystem/planets/saturn/transforms.asset
index 2ac76b0b3d..2543e1eb57 100644
--- a/data/assets/scene/solarsystem/planets/saturn/transforms.asset
+++ b/data/assets/scene/solarsystem/planets/saturn/transforms.asset
@@ -16,8 +16,7 @@ local SaturnBarycenter = {
   GUI = {
     Name = "Saturn Barycenter",
     Path = "/Solar System/Planets/Saturn",
-    Hidden = true,
-    Description = "Saturn Barycenter position"
+    Hidden = true
   }
 }
 
diff --git a/data/assets/scene/solarsystem/planets/uranus/inner_moons.asset b/data/assets/scene/solarsystem/planets/uranus/inner_moons.asset
index 7d0428f8cd..d1cb322f91 100644
--- a/data/assets/scene/solarsystem/planets/uranus/inner_moons.asset
+++ b/data/assets/scene/solarsystem/planets/uranus/inner_moons.asset
@@ -64,8 +64,8 @@ local CordeliaLabel = {
   Identifier = "CordeliaLabel",
   Parent = Cordelia.Identifier,
   Renderable = {
-    Enabled = false,
     Type = "RenderableLabel",
+    Enabled = false,
     Text = "Cordelia",
     FontSize = 70.0,
     Size = 5.5,
@@ -146,8 +146,8 @@ local OpheliaLabel = {
   Identifier = "OpheliaLabel",
   Parent = Ophelia.Identifier,
   Renderable = {
-    Enabled = false,
     Type = "RenderableLabel",
+    Enabled = false,
     Text = "Ophelia",
     FontSize = 70.0,
     Size = 5.5,
@@ -228,8 +228,8 @@ local BiancaLabel = {
   Identifier = "BiancaLabel",
   Parent = Bianca.Identifier,
   Renderable = {
-    Enabled = false,
     Type = "RenderableLabel",
+    Enabled = false,
     Text = "Bianca",
     FontSize = 70.0,
     Size = 5.5,
@@ -310,8 +310,8 @@ local CressidaLabel = {
   Identifier = "CressidaLabel",
   Parent = Cressida.Identifier,
   Renderable = {
-    Enabled = false,
     Type = "RenderableLabel",
+    Enabled = false,
     Text = "Cressida",
     FontSize = 70.0,
     Size = 5.5,
@@ -392,8 +392,8 @@ local DesdemonaLabel = {
   Identifier = "DesdemonaLabel",
   Parent = Desdemona.Identifier,
   Renderable = {
-    Enabled = false,
     Type = "RenderableLabel",
+    Enabled = false,
     Text = "Desdemona",
     FontSize = 70.0,
     Size = 5.5,
@@ -474,8 +474,8 @@ local JulietLabel = {
   Identifier = "JulietLabel",
   Parent = Juliet.Identifier,
   Renderable = {
-    Enabled = false,
     Type = "RenderableLabel",
+    Enabled = false,
     Text = "Juliet",
     FontSize = 70.0,
     Size = 5.5,
@@ -556,8 +556,8 @@ local PortiaLabel = {
   Identifier = "PortiaLabel",
   Parent = Portia.Identifier,
   Renderable = {
-    Enabled = false,
     Type = "RenderableLabel",
+    Enabled = false,
     Text = "Portia",
     FontSize = 70.0,
     Size = 5.5,
@@ -638,8 +638,8 @@ local RosalindLabel = {
   Identifier = "RosalindLabel",
   Parent = Rosalind.Identifier,
   Renderable = {
-    Enabled = false,
     Type = "RenderableLabel",
+    Enabled = false,
     Text = "Rosalind",
     FontSize = 70.0,
     Size = 5.5,
@@ -720,8 +720,8 @@ local CupidLabel = {
   Identifier = "CupidLabel",
   Parent = Cupid.Identifier,
   Renderable = {
-    Enabled = false,
     Type = "RenderableLabel",
+    Enabled = false,
     Text = "Cupid",
     FontSize = 70.0,
     Size = 5.5,
@@ -802,8 +802,8 @@ local BelindaLabel = {
   Identifier = "BelindaLabel",
   Parent = Belinda.Identifier,
   Renderable = {
-    Enabled = false,
     Type = "RenderableLabel",
+    Enabled = false,
     Text = "Belinda",
     FontSize = 70.0,
     Size = 5.5,
@@ -884,8 +884,8 @@ local PerditaLabel = {
   Identifier = "PerditaLabel",
   Parent = Perdita.Identifier,
   Renderable = {
-    Enabled = false,
     Type = "RenderableLabel",
+    Enabled = false,
     Text = "Perdita",
     FontSize = 70.0,
     Size = 5.5,
@@ -966,8 +966,8 @@ local PuckLabel = {
   Identifier = "PuckLabel",
   Parent = Puck.Identifier,
   Renderable = {
-    Enabled = false,
     Type = "RenderableLabel",
+    Enabled = false,
     Text = "Puck",
     FontSize = 70.0,
     Size = 5.5,
@@ -1048,8 +1048,8 @@ local MabLabel = {
   Identifier = "MabLabel",
   Parent = Mab.Identifier,
   Renderable = {
-    Enabled = false,
     Type = "RenderableLabel",
+    Enabled = false,
     Text = "Mab",
     FontSize = 70.0,
     Size = 5.5,
diff --git a/data/assets/scene/solarsystem/planets/uranus/irregular_prograde_moons.asset b/data/assets/scene/solarsystem/planets/uranus/irregular_prograde_moons.asset
index 5d4785be17..d48fb2a3d9 100644
--- a/data/assets/scene/solarsystem/planets/uranus/irregular_prograde_moons.asset
+++ b/data/assets/scene/solarsystem/planets/uranus/irregular_prograde_moons.asset
@@ -64,8 +64,8 @@ local MargaretLabel = {
   Identifier = "MargaretLabel",
   Parent = Margaret.Identifier,
   Renderable = {
-    Enabled = false,
     Type = "RenderableLabel",
+    Enabled = false,
     Text = "Margaret",
     FontSize = 70.0,
     Size = 7.0,
diff --git a/data/assets/scene/solarsystem/planets/uranus/irregular_retrograde_moons.asset b/data/assets/scene/solarsystem/planets/uranus/irregular_retrograde_moons.asset
index da897c3dff..17a6c962ae 100644
--- a/data/assets/scene/solarsystem/planets/uranus/irregular_retrograde_moons.asset
+++ b/data/assets/scene/solarsystem/planets/uranus/irregular_retrograde_moons.asset
@@ -64,8 +64,8 @@ local FranciscoLabel = {
   Identifier = "FranciscoLabel",
   Parent = Francisco.Identifier,
   Renderable = {
-    Enabled = false,
     Type = "RenderableLabel",
+    Enabled = false,
     Text = "Francisco",
     FontSize = 70.0,
     Size = 7.0,
@@ -146,8 +146,8 @@ local CalibanLabel = {
   Identifier = "CalibanLabel",
   Parent = Caliban.Identifier,
   Renderable = {
-    Enabled = false,
     Type = "RenderableLabel",
+    Enabled = false,
     Text = "Caliban",
     FontSize = 70.0,
     Size = 7.0,
@@ -228,8 +228,8 @@ local StephanoLabel = {
   Identifier = "StephanoLabel",
   Parent = Stephano.Identifier,
   Renderable = {
-    Enabled = false,
     Type = "RenderableLabel",
+    Enabled = false,
     Text = "Stephano",
     FontSize = 70.0,
     Size = 7.0,
@@ -310,8 +310,8 @@ local TrinculoLabel = {
   Identifier = "TrinculoLabel",
   Parent = Trinculo.Identifier,
   Renderable = {
-    Enabled = false,
     Type = "RenderableLabel",
+    Enabled = false,
     Text = "Trinculo",
     FontSize = 70.0,
     Size = 7.0,
@@ -392,8 +392,8 @@ local SycoraxLabel = {
   Identifier = "SycoraxLabel",
   Parent = Sycorax.Identifier,
   Renderable = {
-    Enabled = false,
     Type = "RenderableLabel",
+    Enabled = false,
     Text = "Sycorax",
     FontSize = 70.0,
     Size = 7.0,
@@ -474,8 +474,8 @@ local ProsperoLabel = {
   Identifier = "ProsperoLabel",
   Parent = Prospero.Identifier,
   Renderable = {
-    Enabled = false,
     Type = "RenderableLabel",
+    Enabled = false,
     Text = "Prospero",
     FontSize = 70.0,
     Size = 7.0,
@@ -556,8 +556,8 @@ local SetebosLabel = {
   Identifier = "SetebosLabel",
   Parent = Setebos.Identifier,
   Renderable = {
-    Enabled = false,
     Type = "RenderableLabel",
+    Enabled = false,
     Text = "Setebos",
     FontSize = 70.0,
     Size = 7.0,
@@ -638,8 +638,8 @@ local FerdinandLabel = {
   Identifier = "FerdinandLabel",
   Parent = Ferdinand.Identifier,
   Renderable = {
-    Enabled = false,
     Type = "RenderableLabel",
+    Enabled = false,
     Text = "Ferdinand",
     FontSize = 70.0,
     Size = 7.0,
diff --git a/data/assets/scene/solarsystem/planets/uranus/major_moons.asset b/data/assets/scene/solarsystem/planets/uranus/major_moons.asset
index 53550d4f6c..4a4d5f4d46 100644
--- a/data/assets/scene/solarsystem/planets/uranus/major_moons.asset
+++ b/data/assets/scene/solarsystem/planets/uranus/major_moons.asset
@@ -51,8 +51,8 @@ local MirandaLabel = {
   Identifier = "MirandaLabel",
   Parent = Miranda.Identifier,
   Renderable = {
-    Enabled = false,
     Type = "RenderableLabel",
+    Enabled = false,
     Text = "Miranda",
     FontSize = 70.0,
     Size = 7.4,
@@ -120,8 +120,8 @@ local ArielLabel = {
   Identifier = "ArielLabel",
   Parent = Ariel.Identifier,
   Renderable = {
-    Enabled = false,
     Type = "RenderableLabel",
+    Enabled = false,
     Text = "Ariel",
     FontSize = 70.0,
     Size = 7.4,
@@ -189,8 +189,8 @@ local UmbrielLabel = {
   Identifier = "UmbrielLabel",
   Parent = Umbriel.Identifier,
   Renderable = {
-    Enabled = false,
     Type = "RenderableLabel",
+    Enabled = false,
     Text = "Umbriel",
     FontSize = 70.0,
     Size = 7.4,
@@ -258,8 +258,8 @@ local TitaniaLabel = {
   Identifier = "TitaniaLabel",
   Parent = Titania.Identifier,
   Renderable = {
-    Enabled = false,
     Type = "RenderableLabel",
+    Enabled = false,
     Text = "Titania",
     FontSize = 70.0,
     Size = 7.4,
@@ -327,8 +327,8 @@ local OberonLabel = {
   Identifier = "OberonLabel",
   Parent = Oberon.Identifier,
   Renderable = {
-    Enabled = false,
     Type = "RenderableLabel",
+    Enabled = false,
     Text = "Oberon",
     FontSize = 70.0,
     Size = 7.4,
diff --git a/data/assets/scene/solarsystem/planets/uranus/trail_barycenter.asset b/data/assets/scene/solarsystem/planets/uranus/trail_barycenter.asset
index 6744b2dc0e..a636df6a17 100644
--- a/data/assets/scene/solarsystem/planets/uranus/trail_barycenter.asset
+++ b/data/assets/scene/solarsystem/planets/uranus/trail_barycenter.asset
@@ -7,6 +7,7 @@ local UranusBarycenterTrail = {
   Parent = transforms.SolarSystemBarycenter.Identifier,
   Renderable = {
     Type = "RenderableTrailOrbit",
+    Enabled = false,
     Translation = {
       Type = "SpiceTranslation",
       Target = "URANUS BARYCENTER",
@@ -14,8 +15,7 @@ local UranusBarycenterTrail = {
     },
     Color = { 0.60, 0.95, 1.00 },
     Period = 30588.740,
-    Resolution = 1000,
-    Enabled = false
+    Resolution = 1000
   },
   Tag = { "planetTrail_solarSystem", "planetTrail_giants" },
   GUI = {
diff --git a/data/assets/scene/solarsystem/planets/uranus/trail_earth.asset b/data/assets/scene/solarsystem/planets/uranus/trail_earth.asset
index 373c601692..e18276cff8 100644
--- a/data/assets/scene/solarsystem/planets/uranus/trail_earth.asset
+++ b/data/assets/scene/solarsystem/planets/uranus/trail_earth.asset
@@ -8,6 +8,7 @@ local UranusTrailEarth = {
   Parent = transforms.EarthBarycenter.Identifier,
   Renderable = {
     Type = "RenderableTrailOrbit",
+    Enabled = false,
     Translation = {
       Type = "SpiceTranslation",
       Target = "URANUS",
@@ -15,8 +16,7 @@ local UranusTrailEarth = {
     },
     Color = { 1.0, 0.5, 0.2 },
     Period = 224.695,
-    Resolution = 1000,
-    Enabled = false
+    Resolution = 1000
   },
   Tag = { "planetTrail_solarSystem_alt", "planetTrail_terrestrial_alt" },
   GUI = {
diff --git a/data/assets/scene/solarsystem/planets/uranus/transforms.asset b/data/assets/scene/solarsystem/planets/uranus/transforms.asset
index 0ff002020a..9f9ece5ef3 100644
--- a/data/assets/scene/solarsystem/planets/uranus/transforms.asset
+++ b/data/assets/scene/solarsystem/planets/uranus/transforms.asset
@@ -16,8 +16,7 @@ local UranusBarycenter = {
   GUI = {
     Name = "Uranus Barycenter",
     Path = "/Solar System/Planets/Uranus",
-    Hidden = true,
-    Description = "Uranus Barycenter position"
+    Hidden = true
   }
 }
 
diff --git a/data/assets/scene/solarsystem/planets/uranus/uranus.asset b/data/assets/scene/solarsystem/planets/uranus/uranus.asset
index 1f86f751b7..e9bc9d07c4 100644
--- a/data/assets/scene/solarsystem/planets/uranus/uranus.asset
+++ b/data/assets/scene/solarsystem/planets/uranus/uranus.asset
@@ -37,8 +37,8 @@ local UranusLabel = {
   Identifier = "UranusLabel",
   Parent = Uranus.Identifier,
   Renderable = {
-    Enabled = false,
     Type = "RenderableLabel",
+    Enabled = false,
     Text = "Uranus",
     FontSize = 70.0,
     Size = 9.0,
diff --git a/data/assets/scene/solarsystem/planets/venus/trail_barycenter.asset b/data/assets/scene/solarsystem/planets/venus/trail_barycenter.asset
index 5ef709e293..f777915426 100644
--- a/data/assets/scene/solarsystem/planets/venus/trail_barycenter.asset
+++ b/data/assets/scene/solarsystem/planets/venus/trail_barycenter.asset
@@ -8,6 +8,7 @@ local VenusBarycenterTrail = {
   Parent = transforms.SolarSystemBarycenter.Identifier,
   Renderable = {
     Type = "RenderableTrailOrbit",
+    Enabled = false,
     Translation = {
       Type = "SpiceTranslation",
       Target = "VENUS BARYCENTER",
@@ -15,8 +16,7 @@ local VenusBarycenterTrail = {
     },
     Color = { 1.0, 0.5, 0.2 },
     Period = 224.695,
-    Resolution = 1000,
-    Enabled = false
+    Resolution = 1000
   },
   Tag = { "planetTrail_solarSystem", "planetTrail_terrestrial" },
   GUI = {
diff --git a/data/assets/scene/solarsystem/planets/venus/trail_earth.asset b/data/assets/scene/solarsystem/planets/venus/trail_earth.asset
index 0f11f3006f..0b305eb592 100644
--- a/data/assets/scene/solarsystem/planets/venus/trail_earth.asset
+++ b/data/assets/scene/solarsystem/planets/venus/trail_earth.asset
@@ -9,6 +9,7 @@ local VenusTrailEarth = {
   Parent = earthTransforms.EarthBarycenter.Identifier,
   Renderable = {
     Type = "RenderableTrailOrbit",
+    Enabled = false,
     Translation = {
       Type = "SpiceTranslation",
       Target = "VENUS",
@@ -16,8 +17,7 @@ local VenusTrailEarth = {
     },
     Color = { 1.0, 0.5, 0.2 },
     Period = 224.695,
-    Resolution = 1000,
-    Enabled = false
+    Resolution = 1000
   },
   Tag = { "planetTrail_solarSystem_alt", "planetTrail_terrestrial_alt" },
   GUI = {
diff --git a/data/assets/scene/solarsystem/planets/venus/transforms.asset b/data/assets/scene/solarsystem/planets/venus/transforms.asset
index c521ac5940..719509e795 100644
--- a/data/assets/scene/solarsystem/planets/venus/transforms.asset
+++ b/data/assets/scene/solarsystem/planets/venus/transforms.asset
@@ -16,8 +16,7 @@ local VenusBarycenter = {
   GUI = {
     Name = "Venus Barycenter",
     Path = "/Solar System/Planets/Venus",
-    Hidden = true,
-    Description = "Position for Venus Barycenter"
+    Hidden = true
   }
 }
 
diff --git a/data/assets/scene/solarsystem/planets/venus/venus.asset b/data/assets/scene/solarsystem/planets/venus/venus.asset
index 7cc76365aa..43a94091ce 100644
--- a/data/assets/scene/solarsystem/planets/venus/venus.asset
+++ b/data/assets/scene/solarsystem/planets/venus/venus.asset
@@ -58,8 +58,8 @@ local VenusLabel = {
   Identifier = "VenusLabel",
   Parent = Venus.Identifier,
   Renderable = {
-    Enabled = false,
     Type = "RenderableLabel",
+    Enabled = false,
     Text = "Venus",
     FontSize = 70.0,
     Size = 8.5,
diff --git a/data/assets/scene/solarsystem/sun/glare.asset b/data/assets/scene/solarsystem/sun/glare.asset
index d519859748..054f014004 100644
--- a/data/assets/scene/solarsystem/sun/glare.asset
+++ b/data/assets/scene/solarsystem/sun/glare.asset
@@ -16,7 +16,7 @@ local SunGlare = {
   Parent = transforms.SunIAU.Identifier,
   Renderable = {
     Type = "RenderablePlaneImageLocal",
-    Size = 1.3*10^10.5,
+    Size = 41109609582.189,
     Origin = "Center",
     Billboard = true,
     Texture = textures .. "halo.png",
diff --git a/data/assets/scene/solarsystem/sun/marker.asset b/data/assets/scene/solarsystem/sun/marker.asset
index b4fe9cc5c0..778c3c235c 100644
--- a/data/assets/scene/solarsystem/sun/marker.asset
+++ b/data/assets/scene/solarsystem/sun/marker.asset
@@ -15,8 +15,8 @@ local SunMarker = {
   Identifier = "SunMarker",
   Parent = transforms.SolarSystemBarycenter.Identifier,
   Renderable = {
-    Enabled = false,
     Type = "RenderablePlaneImageLocal",
+    Enabled = false,
     Size = 3.0E11,
     Origin = "Center",
     Billboard = true,
diff --git a/data/assets/scene/solarsystem/sun/sun.asset b/data/assets/scene/solarsystem/sun/sun.asset
index 350c6f51b0..fb927a495a 100644
--- a/data/assets/scene/solarsystem/sun/sun.asset
+++ b/data/assets/scene/solarsystem/sun/sun.asset
@@ -26,8 +26,8 @@ local SunLabel = {
   Identifier = "SunLabel",
   Parent = Sun.Identifier,
   Renderable = {
-    Enabled = false,
     Type = "RenderableLabel",
+    Enabled = false,
     Text = "Sun",
     FontSize = 70.0,
     Size = 14.17,
diff --git a/data/assets/scene/solarsystem/sun/transforms.asset b/data/assets/scene/solarsystem/sun/transforms.asset
index 67ccf36166..f7da873d52 100644
--- a/data/assets/scene/solarsystem/sun/transforms.asset
+++ b/data/assets/scene/solarsystem/sun/transforms.asset
@@ -14,7 +14,6 @@ local SolarSystemBarycenter = {
   GUI = {
     Name = "Solar System Barycenter",
     Path = "/Solar System",
-    Description = "Barycenter of the solar system, expressed in the Galactic frame",
     Hidden = true
   }
 }
@@ -56,7 +55,6 @@ local SunIAU = {
   GUI = {
     Name = "SUN IAU",
     Path = "/Solar System/Sun",
-    Description = "Spice frame for the Sun",
     Hidden = true
   }
 }
@@ -79,7 +77,6 @@ local SunECLIPJ2000 = {
   GUI = {
     Name = "SUN J2000",
     Path = "/Solar System/Sun",
-    Description = "Spice rotation for Mean ecliptic and equinox of J2000",
     Hidden = true
   }
 }
diff --git a/data/assets/scene/solarsystem/telescopes/gaia/gaia.asset b/data/assets/scene/solarsystem/telescopes/gaia/gaia.asset
index 70de7b2c03..2ac0f14efc 100644
--- a/data/assets/scene/solarsystem/telescopes/gaia/gaia.asset
+++ b/data/assets/scene/solarsystem/telescopes/gaia/gaia.asset
@@ -31,7 +31,6 @@ local Gaia = {
   -- X Orthogonal
   Renderable = {
     Type = "RenderableModel",
-    Body = "GAIA",
     GeometryFile = model .. "gaia.obj",
     LightSources = {
       sun.LightSource,
diff --git a/data/assets/scene/solarsystem/telescopes/jwst/deployment.mission b/data/assets/scene/solarsystem/telescopes/jwst/deployment.mission
deleted file mode 100644
index 6b51256d55..0000000000
--- a/data/assets/scene/solarsystem/telescopes/jwst/deployment.mission
+++ /dev/null
@@ -1,25 +0,0 @@
-return
-{
-  Name = "JWST_Deployment",
-  Phases = {
-    { Name = "Solar_Array_Deploy", TimeRange = { Start = "2021-DEC-25 12:50:20", End = "2021-DEC-25 12:50:42" },
-    { Name = "Communication_Antenna_Deploy", TimeRange = { Start = "2021-DEC-26 06:20:00", End = "2021-DEC-26 11:59:00" },
-    { Name = "Front_Palette_Deploy", TimeRange = { Start = "2021-DEC-28 06:40:35", End = "2021-DEC-28 18:20:00" },
-    { Name = "Rear_Palette_Deploy", TimeRange = { Start = "2021-DEC-28 21:11:00", End = "2021-DEC-29 00:20:00" },
-    { Name = "Base_Rise_Deploy", TimeRange = { Start = "2021-DEC-29 00:42:00", End = "2021-DEC-30 05:55:00" },
-    { Name = "Aft_Flap_Deploy", TimeRange = { Start = "2021-DEC-30 09:20:00", End = "2021-DEC-30 13:57:00" },
-    { Name = "Front_Right_Membrane_Restraints_Release", TimeRange = { Start = "2021-DEC-30 14:29:00", End = "2021-DEC-30 15:15:39" },
-    { Name = "Front_Left_Membrane_Restraints_Release", TimeRange = { Start = "2021-DEC-30 15:29:13", End = "2021-DEC-30 16:58:20" },
-    { Name = "Rear_Membrane_Restraints_Release", TimeRange = { Start = "2021-DEC-30 17:17:00", End = "2021-DEC-30 20:50:56" },
-    { Name = "Core_Cover_Release", TimeRange = { Start = "2021-DEC-30 21:35:49", End = "2021-DEC-30 22:20:00" },
-    { Name = "Right_Mid_Boom_Extend", TimeRange = { Start = "2021-DEC-30 23:49:43", End = "2021-DEC-31 06:02:05" },
-    { Name = "Left_Mid_Boom_Extend", TimeRange = { Start = "2021-DEC-31 06:02:05", End = "2021-DEC-31 10:26:00" },
-    { Name = "Sun_Shield_Membrane_Stretching", TimeRange = { Start = "2021-DEC-31 10:29:14", End = "2021-DEC-31 10:40:00" },
-    { Name = "Sun_Shield_Layers_Separate", TimeRange = { Start = "2022-JAN-01 00:56:49", End = "2022-JAN-01 03:16:02" },
-    { Name = "Bottom_Panel_Deploy", TimeRange = { Start = "2022-JAN-01 04:05:00", End = "2022-JAN-01 05:10:00" },
-    { Name = "Secondary_Mirror_Deploy", TimeRange = { Start = "2022-JAN-01 12:20:00", End = "2022-JAN-05 22:53:00" },
-    { Name = "Aft_Radiator_Delopy", TimeRange = { Start = "2022-JAN-06 00:40:48", End = "2022-JAN-06 04:25:00" },
-    { Name = "Right_Main_Mirror_Deploy", TimeRange = { Start = "2022-JAN-06 21:50:00", End = "2022-JAN-08 01:00:48" },
-    { Name = "Left_Main_Mirror_Deploy", TimeRange = { Start = "2022-JAN-08 11:20:00", End = "2022-JAN-09 07:20:00" }
-  }
-}
diff --git a/data/assets/scene/solarsystem/telescopes/jwst/transforms.asset b/data/assets/scene/solarsystem/telescopes/jwst/transforms.asset
index e77f23d6f4..a61ef50bfd 100644
--- a/data/assets/scene/solarsystem/telescopes/jwst/transforms.asset
+++ b/data/assets/scene/solarsystem/telescopes/jwst/transforms.asset
@@ -49,10 +49,7 @@ local JWSTPosition = {
   GUI = {
     Name = "JWST Position",
     Path = "/Solar System/Telescopes/JWST",
-    Hidden = true,
-    Description = [[
-      James Webb Space Telescope Position relative to Earth.
-    ]]
+    Hidden = true
   }
 }
 
@@ -72,10 +69,7 @@ local JWSTRotation = {
   GUI = {
     Name = "JWST Rotation",
     Path = "/Solar System/Telescopes/JWST",
-    Hidden = true,
-    Description = [[
-      James Webb Space Telescope Rotation so the sunshield always faces the Sun.
-    ]]
+    Hidden = true
   }
 }
 

From e3870b8f11322cbbe7a1582ba07c1dd642c50b5f Mon Sep 17 00:00:00 2001
From: Alexander Bock <mail@alexanderbock.eu>
Date: Thu, 7 Dec 2023 13:58:57 +0100
Subject: [PATCH 203/701] Asset cleanup

# Conflicts:
#	data/assets/scene/solarsystem/missions/apollo/11/lem.asset
---
 data/assets/examples/galaxyshader/volume.asset   |  2 +-
 data/assets/examples/grids.asset                 |  2 +-
 .../scene/digitaluniverse/constellations.asset   |  4 ++--
 .../constellations/constellation_art.asset       |  2 +-
 data/assets/scene/milkyway/milkyway/volume.asset |  2 +-
 .../2012/sun_earth_2012_fieldlines_batsrus.asset |  2 +-
 .../2012/sun_earth_2012_fieldlines_enlil.asset   | 12 ++++++------
 .../2012/sun_earth_2012_fieldlines_pfss.asset    |  2 +-
 .../missions/apollo/11/apollo11.asset            |  4 ++--
 .../solarsystem/missions/apollo/11/lem.asset     |  4 ++--
 .../solarsystem/missions/apollo/17/lem.asset     |  2 +-
 .../solarsystem/missions/apollo/8/trails.asset   |  8 ++++----
 .../solarsystem/missions/apollo/mission.asset    |  6 +++---
 .../solarsystem/missions/artemis/mission.asset   |  4 ++--
 .../solarsystem/missions/dawn/mission.asset      |  2 +-
 .../solarsystem/missions/juice/mission.asset     | 16 ++++++++--------
 .../solarsystem/missions/juno/mission.asset      |  2 +-
 .../solarsystem/missions/newhorizons/model.asset |  1 -
 .../missions/perseverance/shortcuts.asset        |  8 ++++----
 .../solarsystem/missions/voyager/mission.asset   |  4 ++--
 .../solarsystem/planets/earth/atmosphere.asset   |  2 +-
 .../earth/satellites/misc/hubble_trail.asset     |  2 +-
 .../planets/earth/satellites/misc/iss.asset      |  2 +-
 .../planets/earth/satellites/weather/aqua.asset  |  2 +-
 .../planets/earth/satellites/weather/snpp.asset  |  2 +-
 .../planets/earth/satellites/weather/terra.asset |  2 +-
 .../planets/neptune/triton/triton.asset          |  2 +-
 .../solarsystem/telescopes/jwst/mission.asset    |  4 ++--
 28 files changed, 53 insertions(+), 54 deletions(-)

diff --git a/data/assets/examples/galaxyshader/volume.asset b/data/assets/examples/galaxyshader/volume.asset
index 17db8fe4ee..6621c6a786 100644
--- a/data/assets/examples/galaxyshader/volume.asset
+++ b/data/assets/examples/galaxyshader/volume.asset
@@ -36,7 +36,7 @@ local MilkyWayVolume = {
       Filename = data .. "MilkyWayRGBAVolume1024x1024x128.raw",
       Dimensions = { 1024, 1024, 128 },
       Size = { 1.2E21, 1.2E21, 0.15E21 },
-      Downscale = 0.4,
+      Downscale = 0.4
     },
     Points = {
       Type = "Points",
diff --git a/data/assets/examples/grids.asset b/data/assets/examples/grids.asset
index 4f7e699f13..738b68dd64 100644
--- a/data/assets/examples/grids.asset
+++ b/data/assets/examples/grids.asset
@@ -80,10 +80,10 @@ local BoxGrid = {
   },
   Renderable = {
     Type = "RenderableBoxGrid",
+    Enabled = false,
     Color = { 0.5, 0.0, 1.0 },
     LineWidth = 2.0,
     Size = { 2, 2, 2 },
-    Enabled = false
   },
   GUI = {
     Name = "Example Box Grid",
diff --git a/data/assets/scene/digitaluniverse/constellations.asset b/data/assets/scene/digitaluniverse/constellations.asset
index 301112a2ff..a0806e714c 100644
--- a/data/assets/scene/digitaluniverse/constellations.asset
+++ b/data/assets/scene/digitaluniverse/constellations.asset
@@ -46,7 +46,7 @@ local ConstellationsExtragalactic = {
       Color = { 0.8, 0.8, 0.8 },
       Size = 20.0,
       MinMaxSize = { 20, 30 },
-      Unit = "Mpc",
+      Unit = "Mpc"
     },
     Opacity = 0.4,
     File = speck .. "constellationsEXGAL.speck",
@@ -72,7 +72,7 @@ local Constellations = {
       Color = { 0.8, 0.8, 0.8 },
       Size = 14.5,
       MinMaxSize = { 8, 170 },
-      Unit = "pc",
+      Unit = "pc"
     },
     Opacity = 0.3,
     File = speck .. "constellations.speck",
diff --git a/data/assets/scene/milkyway/constellations/constellation_art.asset b/data/assets/scene/milkyway/constellations/constellation_art.asset
index d81539ee8a..10a7785267 100644
--- a/data/assets/scene/milkyway/constellations/constellation_art.asset
+++ b/data/assets/scene/milkyway/constellations/constellation_art.asset
@@ -71,8 +71,8 @@ local function createConstellations(baseIdentifier, guiPath, constellationfile)
         },
         Renderable = {
           Type = "RenderablePlaneImageLocal",
-          Size = tonumber(baseScale * scale * distanceMultiplier / 10),
           Enabled = false,
+          Size = tonumber(baseScale * scale * distanceMultiplier / 10),
           Origin = "Center",
           Billboard = false,
           LazyLoading = true,
diff --git a/data/assets/scene/milkyway/milkyway/volume.asset b/data/assets/scene/milkyway/milkyway/volume.asset
index 88b151040d..115088893d 100644
--- a/data/assets/scene/milkyway/milkyway/volume.asset
+++ b/data/assets/scene/milkyway/milkyway/volume.asset
@@ -35,7 +35,7 @@ local MilkyWayVolume = {
       Filename = data .. "MilkyWayRGBAVolume1024x1024x128.raw",
       Dimensions = { 1024, 1024, 128 },
       Size = { 1.2E21, 1.2E21, 0.15E21 },
-      Downscale = 0.4,
+      Downscale = 0.4
     },
     Points = {
       Type = "Points",
diff --git a/data/assets/scene/solarsystem/heliosphere/2012/sun_earth_2012_fieldlines_batsrus.asset b/data/assets/scene/solarsystem/heliosphere/2012/sun_earth_2012_fieldlines_batsrus.asset
index a7dbc5bcad..eef87d0315 100644
--- a/data/assets/scene/solarsystem/heliosphere/2012/sun_earth_2012_fieldlines_batsrus.asset
+++ b/data/assets/scene/solarsystem/heliosphere/2012/sun_earth_2012_fieldlines_batsrus.asset
@@ -120,8 +120,8 @@ local BatsrusAsherStaticSeedsFlowLines = {
   InteractionSphere = InteractionSphere,
   Renderable = {
     Type = "RenderableFieldlinesSequence",
-    SourceFolder = unzippedDataDestination.asherStatic,
     Enabled = false,
+    SourceFolder = unzippedDataDestination.asherStatic,
     InputFileType = "Osfls",
     ColorTablePaths = {
       batsrusTemperatureColorTable,
diff --git a/data/assets/scene/solarsystem/heliosphere/2012/sun_earth_2012_fieldlines_enlil.asset b/data/assets/scene/solarsystem/heliosphere/2012/sun_earth_2012_fieldlines_enlil.asset
index 65288f08ce..191aac9599 100644
--- a/data/assets/scene/solarsystem/heliosphere/2012/sun_earth_2012_fieldlines_enlil.asset
+++ b/data/assets/scene/solarsystem/heliosphere/2012/sun_earth_2012_fieldlines_enlil.asset
@@ -66,7 +66,7 @@ local ENLILSliceEqPlane11AU1 = {
     ColorQuantity = 1, -- Velocity
     ColorTablePaths = {
       enlilDensityColorTable,
-      enlilVelocityColorTable,
+      enlilVelocityColorTable
     },
     ColorTableRanges = colorRanges
   },
@@ -89,7 +89,7 @@ local ENLILSliceEqPlane11AU2 = {
     ColorQuantity = 1, -- Velocity
     ColorTablePaths = {
       enlilDensityColorTable,
-      enlilVelocityColorTable,
+      enlilVelocityColorTable
     },
     ColorTableRanges = colorRanges
   },
@@ -113,7 +113,7 @@ local ENLILSliceLat411AU1 = {
     ColorQuantity = 1, -- Velocity
     ColorTablePaths = {
       enlilDensityColorTable,
-      enlilVelocityColorTable,
+      enlilVelocityColorTable
     },
     ColorTableRanges = colorRanges
   },
@@ -137,7 +137,7 @@ local ENLILSliceLat411AU2 = {
     ColorQuantity = 1, -- Velocity
     ColorTablePaths = {
       enlilDensityColorTable,
-      enlilVelocityColorTable,
+      enlilVelocityColorTable
     },
     ColorTableRanges = colorRanges
   },
@@ -158,7 +158,7 @@ local ENLILEarth = {
     Color = { 1.0, 1.0, 1.0, 0.6 },
     ColorTablePaths = {
       enlilDensityColorTable,
-      enlilVelocityColorTable,
+      enlilVelocityColorTable
     },
     ColorTableRanges = colorRanges
   },
@@ -179,7 +179,7 @@ local ENLILStereoA = {
     Color = { 1.0, 1.0, 1.0, 0.6 },
     ColorTablePaths = {
       enlilDensityColorTable,
-      enlilVelocityColorTable,
+      enlilVelocityColorTable
     },
     ColorTableRanges = colorRanges,
     FlowEnabled = true,
diff --git a/data/assets/scene/solarsystem/heliosphere/2012/sun_earth_2012_fieldlines_pfss.asset b/data/assets/scene/solarsystem/heliosphere/2012/sun_earth_2012_fieldlines_pfss.asset
index 271a84b9bb..3a6943fb56 100644
--- a/data/assets/scene/solarsystem/heliosphere/2012/sun_earth_2012_fieldlines_pfss.asset
+++ b/data/assets/scene/solarsystem/heliosphere/2012/sun_earth_2012_fieldlines_pfss.asset
@@ -62,7 +62,7 @@ local PFSS = {
     FlowSpeed = 75,
     ColorTablePaths = {
       pfssTopologyColorTable,
-      pfssBsignColorTable,
+      pfssBsignColorTable
     },
     ColorTableRanges = {
       { 0, 2 },
diff --git a/data/assets/scene/solarsystem/missions/apollo/11/apollo11.asset b/data/assets/scene/solarsystem/missions/apollo/11/apollo11.asset
index 288734c935..9b09298bad 100644
--- a/data/assets/scene/solarsystem/missions/apollo/11/apollo11.asset
+++ b/data/assets/scene/solarsystem/missions/apollo/11/apollo11.asset
@@ -88,6 +88,7 @@ local Apollo11MoonTrail = {
   Parent = moonTransforms.Moon.Identifier,
   Renderable = {
     Type = "RenderableTrailTrajectory",
+    Enabled = false,
     Translation = {
       Type = "SpiceTranslation",
       Target = ApolloSpiceId,
@@ -98,8 +99,7 @@ local Apollo11MoonTrail = {
     StartTime = "1969 JUL 19 19:38:29.183",
     EndTime = "1969 JUL 22 04:55:35.183",
     SampleInterval = 60,
-    EnableFade = false,
-    Enabled = false
+    EnableFade = false
   },
   GUI = {
     Name = "Apollo 11 Moon Orbits",
diff --git a/data/assets/scene/solarsystem/missions/apollo/11/lem.asset b/data/assets/scene/solarsystem/missions/apollo/11/lem.asset
index 17ddb2c21b..0c6e953ef1 100644
--- a/data/assets/scene/solarsystem/missions/apollo/11/lem.asset
+++ b/data/assets/scene/solarsystem/missions/apollo/11/lem.asset
@@ -26,8 +26,8 @@ local Apollo11Lem = {
     Rotation = {
       Type = "GlobeRotation",
       Globe = moon_asset.Moon.Identifier,
-      Longitude = -360+23.47306,
-      Latitude = 0.67402,
+      Longitude = -360 + 23.47306,
+      Latitude = 0.67402
     }
   },
   GUI = {
diff --git a/data/assets/scene/solarsystem/missions/apollo/17/lem.asset b/data/assets/scene/solarsystem/missions/apollo/17/lem.asset
index 17472962c1..a5b5189c44 100644
--- a/data/assets/scene/solarsystem/missions/apollo/17/lem.asset
+++ b/data/assets/scene/solarsystem/missions/apollo/17/lem.asset
@@ -26,7 +26,7 @@ local Apollo17Lem = {
       Type = "GlobeRotation",
       Globe = moonAsset.Moon.Identifier,
       Longitude = -329.22833,
-      Latitude = 20.19092,
+      Latitude = 20.19092
     }
   },
   GUI = {
diff --git a/data/assets/scene/solarsystem/missions/apollo/8/trails.asset b/data/assets/scene/solarsystem/missions/apollo/8/trails.asset
index 793623406d..ec04998ee4 100644
--- a/data/assets/scene/solarsystem/missions/apollo/8/trails.asset
+++ b/data/assets/scene/solarsystem/missions/apollo/8/trails.asset
@@ -34,6 +34,7 @@ local MoonTrail = {
   Parent = moon_transforms.Moon.Identifier,
   Renderable = {
     Type = "RenderableTrailTrajectory",
+    Enabled = false,
     Translation = {
       Type = "SpiceTranslation",
       Target = ApolloSpiceId,
@@ -43,8 +44,7 @@ local MoonTrail = {
     Color = { 0.70, 0.50, 0.20 },
     StartTime = "1968 DEC 23",
     EndTime = "1968 DEC 26",
-    SampleInterval = 30,
-    Enabled = false
+    SampleInterval = 30
   },
   GUI = {
     Name = "Apollo 8 Moon Trail",
@@ -57,6 +57,7 @@ local EarthBarycenterTrail = {
   Parent = earth_transforms.EarthCenter.Identifier,
   Renderable = {
     Type = "RenderableTrailTrajectory",
+    Enabled = false,
     Translation = {
       Type = "SpiceTranslation",
       Target = ApolloSpiceId,
@@ -66,8 +67,7 @@ local EarthBarycenterTrail = {
     Color = { 0.8, 0.2, 0.2 },
     StartTime = "1968 DEC 21",
     EndTime = "1968 DEC 28",
-    SampleInterval = 30,
-    Enabled = false
+    SampleInterval = 30
   },
   GUI = {
     Name = "Apollo 8 Earth Barycenter Trail",
diff --git a/data/assets/scene/solarsystem/missions/apollo/mission.asset b/data/assets/scene/solarsystem/missions/apollo/mission.asset
index 0271d3f71a..6c1e4543d7 100644
--- a/data/assets/scene/solarsystem/missions/apollo/mission.asset
+++ b/data/assets/scene/solarsystem/missions/apollo/mission.asset
@@ -8,13 +8,13 @@ local Mission = {
       Name = "First image of Earthrise",
       Date = "1968 DEC 24 12:20:00",
       Image = "https://www.nasa.gov/sites/default/files/thumbnails/image/apollo_8_earthrise_1968_as08-14-2383.jpg",
-      Description = "On Dec. 24, 1968, Apollo 8 astronauts Frank Borman, Jim Lovell, and Bill Anders became the first humans to orbit the Moon, and the first to witness the magnificent sight called 'Earthrise'. As the spacecraft was in the process of rotating, Anders took this iconic picture showing Earth rising over the Moon's horizon.",
+      Description = "On Dec. 24, 1968, Apollo 8 astronauts Frank Borman, Jim Lovell, and Bill Anders became the first humans to orbit the Moon, and the first to witness the magnificent sight called 'Earthrise'. As the spacecraft was in the process of rotating, Anders took this iconic picture showing Earth rising over the Moon's horizon."
     },
     {
       Name = "One giant leap for mankind",
       Date = "1969 JUL 20 02:56:00",
       Description = "At 02:56 a.m. UTC Neil Armstrong is ready to plant the first human foot on another world. With more than half a billion people watching on television, he climbs down the ladder and proclaims: 'That's one small step for a man, one giant leap for mankind'. Aldrin joins him shortly, and offers a simple but powerful description of the lunar surface: 'magnificent desolation'. They explore the surface for two and a half hours, collecting samples and taking photographs. They leave behind an American flag, a patch honoring the fallen Apollo 1 crew, and a plaque on one of Eagle's legs. It reads, 'Here men from the planet Earth first set foot upon the moon. July 1969 A.D. We came in peace for all mankind.'",
-      Image = "https://www.nasa.gov/sites/default/files/images/464487main_AS11-40-5886_full.jpg",
+      Image = "https://www.nasa.gov/sites/default/files/images/464487main_AS11-40-5886_full.jpg"
     }
   },
   Phases = {
@@ -30,7 +30,7 @@ local Mission = {
       Description = "Apollo 11 was the first mission to land on the moon. The crew consisted of Neil Armstrong, Commander, Edwin E. 'Buzz' Aldrin Jr., Lunar Module Pilot, and Michael Collins, Command Module Pilot",
       Image = "https://www.nasa.gov/sites/default/files/styles/full_width_feature/public/thumbnails/image/s69-31739orig.jpg",
       Link = "https://www.nasa.gov/mission_pages/apollo/missions/apollo11.html",
-      Actions = { "os.apollo11.setup.LandingSite", "os.apollo.DisableApolloSites" },
+      Actions = { "os.apollo11.setup.LandingSite", "os.apollo.DisableApolloSites" }
     },
     {
       Name = "Apollo Flight 15",
diff --git a/data/assets/scene/solarsystem/missions/artemis/mission.asset b/data/assets/scene/solarsystem/missions/artemis/mission.asset
index 195351017a..676a92cc15 100644
--- a/data/assets/scene/solarsystem/missions/artemis/mission.asset
+++ b/data/assets/scene/solarsystem/missions/artemis/mission.asset
@@ -36,7 +36,7 @@ local Mission = {
   Phases = {
     {
       Name = "Launch",
-      TimeRange = { Start = "2022 NOV 16 06:47:44", End = "2022 NOV 16 10:09:20" },
+      TimeRange = { Start = "2022 NOV 16 06:47:44", End = "2022 NOV 16 10:09:20" }
     },
     {
       Name = "Outbound coasting phase",
@@ -63,7 +63,7 @@ local Mission = {
     },
     {
       Name = "Return transit",
-      TimeRange = { Start = "2022 DEC 06 07:29:00", End = "2022 DEC 11 17:40:30" },
+      TimeRange = { Start = "2022 DEC 06 07:29:00", End = "2022 DEC 11 17:40:30" }
     }
   }
 }
diff --git a/data/assets/scene/solarsystem/missions/dawn/mission.asset b/data/assets/scene/solarsystem/missions/dawn/mission.asset
index 9ce396a251..cf1e6f2dac 100644
--- a/data/assets/scene/solarsystem/missions/dawn/mission.asset
+++ b/data/assets/scene/solarsystem/missions/dawn/mission.asset
@@ -13,7 +13,7 @@ local Mission = {
       Name = "Flyby of Mars",
       Date = "2009 FEB 18 00:27:58",
       Image = "https://www.nasa.gov/sites/default/files/styles/full_width_feature/public/thumbnails/image/pj41_full.gif" ,
-      Description = "On Dec. 24, 1968, Apollo 8 astronauts Frank Borman, Jim Lovell, and Bill Anders became the first humans to orbit the Moon, and the first to witness the magnificent sight called 'Earthrise'. As the spacecraft was in the process of rotating, Anders took this iconic picture showing Earth rising over the Moon's horizon.",
+      Description = "On Dec. 24, 1968, Apollo 8 astronauts Frank Borman, Jim Lovell, and Bill Anders became the first humans to orbit the Moon, and the first to witness the magnificent sight called 'Earthrise'. As the spacecraft was in the process of rotating, Anders took this iconic picture showing Earth rising over the Moon's horizon."
     }
   },
   Phases = {
diff --git a/data/assets/scene/solarsystem/missions/juice/mission.asset b/data/assets/scene/solarsystem/missions/juice/mission.asset
index 7197776353..87306365ac 100644
--- a/data/assets/scene/solarsystem/missions/juice/mission.asset
+++ b/data/assets/scene/solarsystem/missions/juice/mission.asset
@@ -5,37 +5,37 @@ local Mission = {
   Milestones = {
     {
       Name = "Earth flyby 1",
-      Date = "2024 AUG 01 00:00:00",
+      Date = "2024 AUG 01 00:00:00"
     },
     {
       Name = "Venus flyby",
-      Date = "2025 AUG 01 00:00:00",
+      Date = "2025 AUG 01 00:00:00"
     },
     {
       Name = "Earth flyby 2",
-      Date = "2026 SEP 01 00:00:00",
+      Date = "2026 SEP 01 00:00:00"
     },
     {
       Name = "Earth flyby 3",
-      Date = "2029 JAN 01 00:00:00",
+      Date = "2029 JAN 01 00:00:00"
     },
     {
       Name = "Arrival at Jupiter",
-      Date = "2031 JUL 01 00:00:00",
+      Date = "2031 JUL 01 00:00:00"
     },
     {
       Name = "Europa flyby 1",
-      Date = "2032 JUL 02 16:21:51",
+      Date = "2032 JUL 02 16:21:51"
     },
     {
       Name = "Europa flyby 2",
-      Date = "2032 JUL 16 22:18:22",
+      Date = "2032 JUL 16 22:18:22"
     }
   },
   Phases = {
     {
       Name = "Journey to Jupiter",
-      TimeRange = { Start = "2023 APR 05 16:25:00", End = "2031 JUL 01 00:00:00" },
+      TimeRange = { Start = "2023 APR 05 16:25:00", End = "2031 JUL 01 00:00:00" }
     },
     {
       Name = "Jupiter orbit",
diff --git a/data/assets/scene/solarsystem/missions/juno/mission.asset b/data/assets/scene/solarsystem/missions/juno/mission.asset
index 9daee794a8..2d09c4a3f9 100644
--- a/data/assets/scene/solarsystem/missions/juno/mission.asset
+++ b/data/assets/scene/solarsystem/missions/juno/mission.asset
@@ -7,7 +7,7 @@ local Mission = {
       Name = "Arrival at Jupiter",
       Date = "2016 JUL 04 00:00:00",
       Image = "https://www.nasa.gov/sites/default/files/styles/full_width_feature/public/thumbnails/image/pj41_full.gif" ,
-      Description = "On Dec. 24, 1968, Apollo 8 astronauts Frank Borman, Jim Lovell, and Bill Anders became the first humans to orbit the Moon, and the first to witness the magnificent sight called 'Earthrise'. As the spacecraft was in the process of rotating, Anders took this iconic picture showing Earth rising over the Moon's horizon.",
+      Description = "On Dec. 24, 1968, Apollo 8 astronauts Frank Borman, Jim Lovell, and Bill Anders became the first humans to orbit the Moon, and the first to witness the magnificent sight called 'Earthrise'. As the spacecraft was in the process of rotating, Anders took this iconic picture showing Earth rising over the Moon's horizon."
     }
   },
   Phases = {
diff --git a/data/assets/scene/solarsystem/missions/newhorizons/model.asset b/data/assets/scene/solarsystem/missions/newhorizons/model.asset
index 7805cd6674..da1e5f6901 100644
--- a/data/assets/scene/solarsystem/missions/newhorizons/model.asset
+++ b/data/assets/scene/solarsystem/missions/newhorizons/model.asset
@@ -16,7 +16,6 @@ local NewHorizons = {
   Parent = transforms.NewHorizonsPosition.Identifier,
   Renderable = {
     Type = "RenderableModel",
-    Body = "NEW HORIZONS",
     GeometryFile = models .. "NewHorizonsCleanModel.obj",
     AmbientIntensity = 0.2,
     DiffuseIntensity = 1.0,
diff --git a/data/assets/scene/solarsystem/missions/perseverance/shortcuts.asset b/data/assets/scene/solarsystem/missions/perseverance/shortcuts.asset
index 20eb2f1d94..83654bb2f3 100644
--- a/data/assets/scene/solarsystem/missions/perseverance/shortcuts.asset
+++ b/data/assets/scene/solarsystem/missions/perseverance/shortcuts.asset
@@ -4,11 +4,11 @@ local PerseveranceLandingTime = "2021 FEB 18 20:32:16"
 local PerseveranceNavigationState = [[
 {
   Anchor = "Perseverance",
-  Pitch = 0.567457E-4,
-  Position = { 1.240506E1,-1.369270E1,-2.423553E0 },
+  Pitch = 0.0000567457,
+  Position = { 12.40506, -13.69270, -2.423553 },
   ReferenceFrame = "Root",
-  Up = { 0.441211E0,0.247019E0,0.862737E0 },
-  Yaw = -0.446853E-4
+  Up = { 0.441211, 0.247019, 0.862737 },
+  Yaw = -0.0000446853
 }
 ]]
 
diff --git a/data/assets/scene/solarsystem/missions/voyager/mission.asset b/data/assets/scene/solarsystem/missions/voyager/mission.asset
index 9431085a89..4efd6cea00 100644
--- a/data/assets/scene/solarsystem/missions/voyager/mission.asset
+++ b/data/assets/scene/solarsystem/missions/voyager/mission.asset
@@ -56,11 +56,11 @@ local Mission = {
     },
     {
       Name = "Reached 100 astronomical units",
-      Date = "2006 AUG 16 00:00:00",
+      Date = "2006 AUG 16 00:00:00"
     },
     {
       Name = "Voyager 1 enters interstellar space",
-      Date = "2012 AUG 01 00:00:00",
+      Date = "2012 AUG 01 00:00:00"
     }
   },
   Phases = {
diff --git a/data/assets/scene/solarsystem/planets/earth/atmosphere.asset b/data/assets/scene/solarsystem/planets/earth/atmosphere.asset
index 16805b0950..43b940130b 100644
--- a/data/assets/scene/solarsystem/planets/earth/atmosphere.asset
+++ b/data/assets/scene/solarsystem/planets/earth/atmosphere.asset
@@ -32,7 +32,7 @@ local Atmosphere = {
         -- Extinction coefficients
         Extinction = {3.426, 8.298, 0.356}
       },
-      H_O = 8.0,
+      H_O = 8.0
     },
     ]]
     -- Default
diff --git a/data/assets/scene/solarsystem/planets/earth/satellites/misc/hubble_trail.asset b/data/assets/scene/solarsystem/planets/earth/satellites/misc/hubble_trail.asset
index bfe34c64f3..8b7afd1918 100644
--- a/data/assets/scene/solarsystem/planets/earth/satellites/misc/hubble_trail.asset
+++ b/data/assets/scene/solarsystem/planets/earth/satellites/misc/hubble_trail.asset
@@ -25,7 +25,7 @@ local HubblePosition = {
     Rotation = {
       Type = "SpiceRotation",
       SourceFrame = "GALACTIC",
-      DestinationFrame = "J2000",
+      DestinationFrame = "J2000"
     }
   },
   Tag = { "earth_satellite", "hubble" },
diff --git a/data/assets/scene/solarsystem/planets/earth/satellites/misc/iss.asset b/data/assets/scene/solarsystem/planets/earth/satellites/misc/iss.asset
index b47c12f15e..440486aaad 100644
--- a/data/assets/scene/solarsystem/planets/earth/satellites/misc/iss.asset
+++ b/data/assets/scene/solarsystem/planets/earth/satellites/misc/iss.asset
@@ -34,7 +34,7 @@ local IssPosition = {
     Rotation = {
       Type = "SpiceRotation",
       SourceFrame = "GALACTIC",
-      DestinationFrame = "J2000",
+      DestinationFrame = "J2000"
     }
   },
   Tag = { "earth_satellite", "ISS" },
diff --git a/data/assets/scene/solarsystem/planets/earth/satellites/weather/aqua.asset b/data/assets/scene/solarsystem/planets/earth/satellites/weather/aqua.asset
index 82ee18135d..864ab19e77 100644
--- a/data/assets/scene/solarsystem/planets/earth/satellites/weather/aqua.asset
+++ b/data/assets/scene/solarsystem/planets/earth/satellites/weather/aqua.asset
@@ -26,7 +26,7 @@ local Aqua = {
     Rotation = {
       Type = "SpiceRotation",
       SourceFrame = "GALACTIC",
-      DestinationFrame = "J2000",
+      DestinationFrame = "J2000"
     }
   },
   Tag = { "earth_satellite", "Aqua" },
diff --git a/data/assets/scene/solarsystem/planets/earth/satellites/weather/snpp.asset b/data/assets/scene/solarsystem/planets/earth/satellites/weather/snpp.asset
index abd07a5570..4c0c6262b6 100644
--- a/data/assets/scene/solarsystem/planets/earth/satellites/weather/snpp.asset
+++ b/data/assets/scene/solarsystem/planets/earth/satellites/weather/snpp.asset
@@ -26,7 +26,7 @@ local SNPP = {
     Rotation = {
       Type = "SpiceRotation",
       SourceFrame = "GALACTIC",
-      DestinationFrame = "J2000",
+      DestinationFrame = "J2000"
     }
   },
   Tag = { "earth_satellite", "SNPP" },
diff --git a/data/assets/scene/solarsystem/planets/earth/satellites/weather/terra.asset b/data/assets/scene/solarsystem/planets/earth/satellites/weather/terra.asset
index 8a36392b3c..25c4cfee6c 100644
--- a/data/assets/scene/solarsystem/planets/earth/satellites/weather/terra.asset
+++ b/data/assets/scene/solarsystem/planets/earth/satellites/weather/terra.asset
@@ -26,7 +26,7 @@ local Terra = {
     Rotation = {
       Type = "SpiceRotation",
       SourceFrame = "GALACTIC",
-      DestinationFrame = "J2000",
+      DestinationFrame = "J2000"
     }
   },
   Tag = { "earth_satellite", "Terra" },
diff --git a/data/assets/scene/solarsystem/planets/neptune/triton/triton.asset b/data/assets/scene/solarsystem/planets/neptune/triton/triton.asset
index 2d4b5f88f8..df573a0ee9 100644
--- a/data/assets/scene/solarsystem/planets/neptune/triton/triton.asset
+++ b/data/assets/scene/solarsystem/planets/neptune/triton/triton.asset
@@ -15,7 +15,7 @@ local Triton = {
     Rotation = {
       Type = "SpiceRotation",
       SourceFrame = "IAU_TRITON",
-      DestinationFrame = "GALACTIC",
+      DestinationFrame = "GALACTIC"
     }
   },
   Renderable = {
diff --git a/data/assets/scene/solarsystem/telescopes/jwst/mission.asset b/data/assets/scene/solarsystem/telescopes/jwst/mission.asset
index 47b21b254b..9224b52ff4 100644
--- a/data/assets/scene/solarsystem/telescopes/jwst/mission.asset
+++ b/data/assets/scene/solarsystem/telescopes/jwst/mission.asset
@@ -20,7 +20,7 @@ local Mission = {
       Date = "2022 JAN 24 00:00:00",
       Description = "When you ask an astronomer about the James Webb Space Telescope's orbit, they'll tell you something that sounds like it came from a science-fiction novel. The Webb won't be orbiting the Earth - instead we will send it almost a million miles out into space to a place called 'L2'. L2 is short-hand for the second Lagrange Point, a wonderful accident of gravity and orbital mechanics, and the perfect place to park the Webb telescope in space. There are five so-called 'Lagrange Points' - areas where gravity from the sun and Earth balance the orbital motion of a satellite. Putting a spacecraft at any of these points allows it to stay in a fixed position relative to the Earth and sun with a minimal amount of energy needed for course correction.",
       Image = "https://www.nasa.gov/images/content/463480main_lagrange_point_lg_1.jpg",
-      Link = "https://www.nasa.gov/topics/universe/features/webb-l2.html",
+      Link = "https://www.nasa.gov/topics/universe/features/webb-l2.html"
     },
     {
       Name = "NIRCam detected the first photons",
@@ -50,7 +50,7 @@ local Mission = {
   Phases = {
     {
       Name = "Launch",
-      TimeRange = { Start = "2021 DEC 25 12:20:00", End = "2021 DEC 25 12:47:00" },
+      TimeRange = { Start = "2021 DEC 25 12:20:00", End = "2021 DEC 25 12:47:00" }
     },
     {
       Name = "Preparation for science operations",

From bc71bd6186978597765d1ab0cdb6a1d0515c34bb Mon Sep 17 00:00:00 2001
From: Alexander Bock <alexander.bock@liu.se>
Date: Mon, 11 Dec 2023 13:34:51 +0100
Subject: [PATCH 204/701] More small asset fixes

---
 data/assets/examples/galaxyshader/volume.asset   |  2 +-
 .../examples/volume/generated/cartesian.asset    |  2 +-
 .../volume/generated/cartesiansequence.asset     |  2 +-
 .../examples/volume/generated/spherical.asset    |  2 +-
 .../objects/orionnebula/transforms.asset         |  3 +--
 .../solarsystem/dwarf_planets/ceres/ceres.asset  |  3 +--
 .../solarsystem/dwarf_planets/eris/trail.asset   |  2 +-
 .../dwarf_planets/eris/transforms.asset          |  2 +-
 .../dwarf_planets/gonggong/trail.asset           |  2 +-
 .../dwarf_planets/gonggong/transforms.asset      |  2 +-
 .../solarsystem/dwarf_planets/haumea/trail.asset |  2 +-
 .../dwarf_planets/haumea/transforms.asset        |  2 +-
 .../dwarf_planets/makemake/trail.asset           |  2 +-
 .../dwarf_planets/makemake/transforms.asset      |  2 +-
 .../solarsystem/dwarf_planets/orcus/trail.asset  |  2 +-
 .../dwarf_planets/orcus/transforms.asset         |  2 +-
 .../dwarf_planets/pluto/pluto_trail_kepler.asset |  2 +-
 .../solarsystem/dwarf_planets/quaoar/trail.asset |  2 +-
 .../dwarf_planets/quaoar/transforms.asset        |  2 +-
 .../solarsystem/dwarf_planets/sedna/trail.asset  |  2 +-
 .../dwarf_planets/sedna/transforms.asset         |  2 +-
 .../solarsystem/dwarf_planets/vesta/trail.asset  |  2 +-
 .../dwarf_planets/vesta/transforms.asset         |  2 +-
 .../scene/solarsystem/missions/insight/edl.asset |  4 ++--
 .../missions/perseverance/model.asset            |  1 -
 .../solarsystem/planets/mercury/mercury.asset    |  2 --
 .../solarsystem/planets/mercury/transforms.asset |  3 +--
 .../planets/saturn/hyperion/hyperion.asset       |  6 ++----
 .../scene/solarsystem/sssb/amor_asteroid.asset   |  2 +-
 .../scene/solarsystem/sssb/apollo_asteroid.asset |  2 +-
 .../scene/solarsystem/sssb/aten_asteroid.asset   |  2 +-
 .../scene/solarsystem/sssb/atira_asteroid.asset  |  2 +-
 .../solarsystem/sssb/centaur_asteroid.asset      |  2 +-
 .../solarsystem/sssb/chiron-type_comet.asset     |  2 +-
 .../solarsystem/sssb/encke-type_comet.asset      |  2 +-
 .../solarsystem/sssb/halley-type_comet.asset     |  2 +-
 .../sssb/inner_main_belt_asteroid.asset          |  2 +-
 .../solarsystem/sssb/jupiter-family_comet.asset  |  2 +-
 .../sssb/jupiter_trojan_asteroid.asset           |  2 +-
 .../solarsystem/sssb/main_belt_asteroid.asset    |  2 +-
 .../sssb/mars-crossing_asteroid.asset            |  2 +-
 .../sssb/outer_main_belt_asteroid.asset          |  2 +-
 data/assets/scene/solarsystem/sssb/pha.asset     |  2 +-
 .../sssb/transneptunian_object_asteroid.asset    |  2 +-
 .../scene/solarsystem/sun/habitablezone.asset    |  2 +-
 .../scene/solarsystem/sun/transforms.asset       | 16 ++++++++--------
 46 files changed, 53 insertions(+), 61 deletions(-)

diff --git a/data/assets/examples/galaxyshader/volume.asset b/data/assets/examples/galaxyshader/volume.asset
index 6621c6a786..0636e4b21d 100644
--- a/data/assets/examples/galaxyshader/volume.asset
+++ b/data/assets/examples/galaxyshader/volume.asset
@@ -30,7 +30,7 @@ local MilkyWayVolume = {
     AbsorptionMultiply = 200,
     EmissionMultiply = 250,
     Rotation = { math.pi, 3.1248, 4.45741 },
-    RaycastingShader = asset.resource("galaxyraycast2.glsl"),
+    RaycastingShader = asset.resource("galaxyraycast.glsl"),
     Volume = {
       Type = "Volume",
       Filename = data .. "MilkyWayRGBAVolume1024x1024x128.raw",
diff --git a/data/assets/examples/volume/generated/cartesian.asset b/data/assets/examples/volume/generated/cartesian.asset
index 30ad1dc7ed..f9c84e35f1 100644
--- a/data/assets/examples/volume/generated/cartesian.asset
+++ b/data/assets/examples/volume/generated/cartesian.asset
@@ -9,7 +9,7 @@ local transforms = asset.require("scene/solarsystem/sun/transforms")
 local SunRadius = 695508000
 
 local Volume = {
-  Identifier = "GeneratedVolume",
+  Identifier = "GeneratedVolumeCartesian",
   Parent = transforms.SolarSystemBarycenter.Identifier,
   Transform = {
     Scale = {
diff --git a/data/assets/examples/volume/generated/cartesiansequence.asset b/data/assets/examples/volume/generated/cartesiansequence.asset
index a9cc344384..24d0877da5 100644
--- a/data/assets/examples/volume/generated/cartesiansequence.asset
+++ b/data/assets/examples/volume/generated/cartesiansequence.asset
@@ -9,7 +9,7 @@ local transforms = asset.require("scene/solarsystem/sun/transforms")
 local SunRadius = 695508000
 
 local Volume = {
-  Identifier = "GeneratedVolume",
+  Identifier = "GeneratedVolumeCartesianSequence",
   Parent = transforms.SolarSystemBarycenter.Identifier,
   Renderable = {
     Type = "RenderableTimeVaryingVolume",
diff --git a/data/assets/examples/volume/generated/spherical.asset b/data/assets/examples/volume/generated/spherical.asset
index d61e070962..82c61fede8 100644
--- a/data/assets/examples/volume/generated/spherical.asset
+++ b/data/assets/examples/volume/generated/spherical.asset
@@ -9,7 +9,7 @@ local transforms = asset.require("scene/solarsystem/sun/transforms")
 local AstronomicalUnit = 149597870700
 
 local Volume = {
-  Identifier = "GeneratedVolume",
+  Identifier = "GeneratedVolumeSpherical",
   Parent = transforms.SolarSystemBarycenter.Identifier,
   Transform = {
     Scale = {
diff --git a/data/assets/scene/milkyway/objects/orionnebula/transforms.asset b/data/assets/scene/milkyway/objects/orionnebula/transforms.asset
index 1a182cafda..4df9846534 100644
--- a/data/assets/scene/milkyway/objects/orionnebula/transforms.asset
+++ b/data/assets/scene/milkyway/objects/orionnebula/transforms.asset
@@ -20,8 +20,7 @@ local NebulaPosition = {
   GUI = {
     Name = "Orion Nebula Position",
     Path = "/Milky Way/Orion",
-    Hidden = true,
-    Description = "Static position for Orion Nebula"
+    Hidden = true
   }
 }
 
diff --git a/data/assets/scene/solarsystem/dwarf_planets/ceres/ceres.asset b/data/assets/scene/solarsystem/dwarf_planets/ceres/ceres.asset
index 656ba98de8..215555d0e5 100644
--- a/data/assets/scene/solarsystem/dwarf_planets/ceres/ceres.asset
+++ b/data/assets/scene/solarsystem/dwarf_planets/ceres/ceres.asset
@@ -1,4 +1,3 @@
-asset.require("spice/base")
 local transforms = asset.require("./transforms")
 
 
@@ -8,7 +7,7 @@ local Ceres = {
   Parent = transforms.CeresPosition.Identifier,
   Renderable = {
     Type = "RenderableGlobe",
-    Radii = { 487.3E3, 487.3E3, 454.7E3 },
+    Radii = { 487300, 487300, 454700 },
     SegmentsPerPatch = 64,
     Layers = {}
   },
diff --git a/data/assets/scene/solarsystem/dwarf_planets/eris/trail.asset b/data/assets/scene/solarsystem/dwarf_planets/eris/trail.asset
index ffdd0d45d2..6882b339b2 100644
--- a/data/assets/scene/solarsystem/dwarf_planets/eris/trail.asset
+++ b/data/assets/scene/solarsystem/dwarf_planets/eris/trail.asset
@@ -5,7 +5,7 @@ local transforms = asset.require("./transforms")
 
 local Trail = {
   Identifier = "ErisTrail",
-  Parent = sunTransforms.SunECLIPJ2000.Identifier,
+  Parent = sunTransforms.SunEclipJ2000.Identifier,
   Renderable = {
     Type = "RenderableTrailOrbit",
     Enabled = asset.enabled,
diff --git a/data/assets/scene/solarsystem/dwarf_planets/eris/transforms.asset b/data/assets/scene/solarsystem/dwarf_planets/eris/transforms.asset
index 10bb268507..522436903d 100644
--- a/data/assets/scene/solarsystem/dwarf_planets/eris/transforms.asset
+++ b/data/assets/scene/solarsystem/dwarf_planets/eris/transforms.asset
@@ -17,7 +17,7 @@ local Translation = {
 
 local Position = {
   Identifier = "ErisPosition",
-  Parent = transforms.SunECLIPJ2000.Identifier,
+  Parent = transforms.SunEclipJ2000.Identifier,
   Transform = {
     Translation = Translation
   },
diff --git a/data/assets/scene/solarsystem/dwarf_planets/gonggong/trail.asset b/data/assets/scene/solarsystem/dwarf_planets/gonggong/trail.asset
index 11da10bf3d..138406a737 100644
--- a/data/assets/scene/solarsystem/dwarf_planets/gonggong/trail.asset
+++ b/data/assets/scene/solarsystem/dwarf_planets/gonggong/trail.asset
@@ -5,7 +5,7 @@ local transforms = asset.require("./transforms")
 
 local Trail = {
   Identifier = "GonggongTrail",
-  Parent = sunTransforms.SunECLIPJ2000.Identifier,
+  Parent = sunTransforms.SunEclipJ2000.Identifier,
   Renderable = {
     Type = "RenderableTrailOrbit",
     Enabled = asset.enabled,
diff --git a/data/assets/scene/solarsystem/dwarf_planets/gonggong/transforms.asset b/data/assets/scene/solarsystem/dwarf_planets/gonggong/transforms.asset
index 17e1c3c760..e9b5136158 100644
--- a/data/assets/scene/solarsystem/dwarf_planets/gonggong/transforms.asset
+++ b/data/assets/scene/solarsystem/dwarf_planets/gonggong/transforms.asset
@@ -17,7 +17,7 @@ local Translation = {
 
 local Position = {
   Identifier = "GonggongPosition",
-  Parent = transforms.SunECLIPJ2000.Identifier,
+  Parent = transforms.SunEclipJ2000.Identifier,
   Transform = {
     Translation = Translation
   },
diff --git a/data/assets/scene/solarsystem/dwarf_planets/haumea/trail.asset b/data/assets/scene/solarsystem/dwarf_planets/haumea/trail.asset
index eb7f914ac3..7c1ad3b861 100644
--- a/data/assets/scene/solarsystem/dwarf_planets/haumea/trail.asset
+++ b/data/assets/scene/solarsystem/dwarf_planets/haumea/trail.asset
@@ -5,7 +5,7 @@ local transforms = asset.require("./transforms")
 
 local Trail = {
   Identifier = "HaumeaTrail",
-  Parent = sunTransforms.SunECLIPJ2000.Identifier,
+  Parent = sunTransforms.SunEclipJ2000.Identifier,
   Renderable = {
     Type = "RenderableTrailOrbit",
     Enabled = asset.enabled,
diff --git a/data/assets/scene/solarsystem/dwarf_planets/haumea/transforms.asset b/data/assets/scene/solarsystem/dwarf_planets/haumea/transforms.asset
index 25f96a0193..315458f7c6 100644
--- a/data/assets/scene/solarsystem/dwarf_planets/haumea/transforms.asset
+++ b/data/assets/scene/solarsystem/dwarf_planets/haumea/transforms.asset
@@ -18,7 +18,7 @@ local Translation = {
 
 local Position = {
   Identifier = "HaumeaPosition",
-  Parent = transforms.SunECLIPJ2000.Identifier,
+  Parent = transforms.SunEclipJ2000.Identifier,
   Transform = {
     Translation = Translation
   },
diff --git a/data/assets/scene/solarsystem/dwarf_planets/makemake/trail.asset b/data/assets/scene/solarsystem/dwarf_planets/makemake/trail.asset
index 37ae323c2e..3bba06a15a 100644
--- a/data/assets/scene/solarsystem/dwarf_planets/makemake/trail.asset
+++ b/data/assets/scene/solarsystem/dwarf_planets/makemake/trail.asset
@@ -5,7 +5,7 @@ local transforms = asset.require("./transforms")
 
 local Trail = {
   Identifier = "MakemakeTrail",
-  Parent = sunTransforms.SunECLIPJ2000.Identifier,
+  Parent = sunTransforms.SunEclipJ2000.Identifier,
   Renderable = {
     Type = "RenderableTrailOrbit",
     Enabled = asset.enabled,
diff --git a/data/assets/scene/solarsystem/dwarf_planets/makemake/transforms.asset b/data/assets/scene/solarsystem/dwarf_planets/makemake/transforms.asset
index 18131e56d3..c0d8d94f03 100644
--- a/data/assets/scene/solarsystem/dwarf_planets/makemake/transforms.asset
+++ b/data/assets/scene/solarsystem/dwarf_planets/makemake/transforms.asset
@@ -18,7 +18,7 @@ local Translation = {
 
 local Position = {
   Identifier = "MakemakePosition",
-  Parent = transforms.SunECLIPJ2000.Identifier,
+  Parent = transforms.SunEclipJ2000.Identifier,
   Transform = {
     Translation = Translation
   },
diff --git a/data/assets/scene/solarsystem/dwarf_planets/orcus/trail.asset b/data/assets/scene/solarsystem/dwarf_planets/orcus/trail.asset
index 568f0fbc8b..213f5c09d0 100644
--- a/data/assets/scene/solarsystem/dwarf_planets/orcus/trail.asset
+++ b/data/assets/scene/solarsystem/dwarf_planets/orcus/trail.asset
@@ -5,7 +5,7 @@ local transforms = asset.require("./transforms")
 
 local Trail = {
   Identifier = "OrcusTrail",
-  Parent = sunTransforms.SunECLIPJ2000.Identifier,
+  Parent = sunTransforms.SunEclipJ2000.Identifier,
   Renderable = {
     Type = "RenderableTrailOrbit",
     Enabled = asset.enabled,
diff --git a/data/assets/scene/solarsystem/dwarf_planets/orcus/transforms.asset b/data/assets/scene/solarsystem/dwarf_planets/orcus/transforms.asset
index 53be119447..7eff3c0251 100644
--- a/data/assets/scene/solarsystem/dwarf_planets/orcus/transforms.asset
+++ b/data/assets/scene/solarsystem/dwarf_planets/orcus/transforms.asset
@@ -18,7 +18,7 @@ local Translation = {
 
 local Position = {
   Identifier = "OrcusPosition",
-  Parent = transforms.SunECLIPJ2000.Identifier,
+  Parent = transforms.SunEclipJ2000.Identifier,
   Transform = {
     Translation = Translation
   },
diff --git a/data/assets/scene/solarsystem/dwarf_planets/pluto/pluto_trail_kepler.asset b/data/assets/scene/solarsystem/dwarf_planets/pluto/pluto_trail_kepler.asset
index 8066fa5c40..92cb24cf89 100644
--- a/data/assets/scene/solarsystem/dwarf_planets/pluto/pluto_trail_kepler.asset
+++ b/data/assets/scene/solarsystem/dwarf_planets/pluto/pluto_trail_kepler.asset
@@ -9,7 +9,7 @@ local AU = 1.496e+8
 
 local PlutoKeplerianTrail = {
   Identifier = "PlutoKeplerianTrail",
-  Parent = transforms.SunECLIPJ2000.Identifier,
+  Parent = transforms.SunEclipJ2000.Identifier,
   Renderable = {
     Type = "RenderableTrailOrbit",
     Enabled = false,
diff --git a/data/assets/scene/solarsystem/dwarf_planets/quaoar/trail.asset b/data/assets/scene/solarsystem/dwarf_planets/quaoar/trail.asset
index 34fbb9809b..f08ac43126 100644
--- a/data/assets/scene/solarsystem/dwarf_planets/quaoar/trail.asset
+++ b/data/assets/scene/solarsystem/dwarf_planets/quaoar/trail.asset
@@ -5,7 +5,7 @@ local transforms = asset.require("./transforms")
 
 local Trail = {
   Identifier = "QuaoarTrail",
-  Parent = sunTransforms.SunECLIPJ2000.Identifier,
+  Parent = sunTransforms.SunEclipJ2000.Identifier,
   Renderable = {
     Type = "RenderableTrailOrbit",
     Enabled = asset.enabled,
diff --git a/data/assets/scene/solarsystem/dwarf_planets/quaoar/transforms.asset b/data/assets/scene/solarsystem/dwarf_planets/quaoar/transforms.asset
index 938c66a7ae..a1b23e1939 100644
--- a/data/assets/scene/solarsystem/dwarf_planets/quaoar/transforms.asset
+++ b/data/assets/scene/solarsystem/dwarf_planets/quaoar/transforms.asset
@@ -18,7 +18,7 @@ local Translation = {
 
 local Position = {
   Identifier = "QuaoarPosition",
-  Parent = transforms.SunECLIPJ2000.Identifier,
+  Parent = transforms.SunEclipJ2000.Identifier,
   Transform = {
     Translation = Translation
   },
diff --git a/data/assets/scene/solarsystem/dwarf_planets/sedna/trail.asset b/data/assets/scene/solarsystem/dwarf_planets/sedna/trail.asset
index adc3c531a1..ab66aca72d 100644
--- a/data/assets/scene/solarsystem/dwarf_planets/sedna/trail.asset
+++ b/data/assets/scene/solarsystem/dwarf_planets/sedna/trail.asset
@@ -5,7 +5,7 @@ local transforms = asset.require("./transforms")
 
 local Trail = {
   Identifier = "SednaTrail",
-  Parent = sunTransforms.SunECLIPJ2000.Identifier,
+  Parent = sunTransforms.SunEclipJ2000.Identifier,
   Renderable = {
     Type = "RenderableTrailOrbit",
     Enabled = asset.enabled,
diff --git a/data/assets/scene/solarsystem/dwarf_planets/sedna/transforms.asset b/data/assets/scene/solarsystem/dwarf_planets/sedna/transforms.asset
index a1c062e0f1..85c691938a 100644
--- a/data/assets/scene/solarsystem/dwarf_planets/sedna/transforms.asset
+++ b/data/assets/scene/solarsystem/dwarf_planets/sedna/transforms.asset
@@ -18,7 +18,7 @@ local Translation = {
 
 local Position = {
   Identifier = "SednaPosition",
-  Parent = transforms.SunECLIPJ2000.Identifier,
+  Parent = transforms.SunEclipJ2000.Identifier,
   Transform = {
     Translation = Translation
   },
diff --git a/data/assets/scene/solarsystem/dwarf_planets/vesta/trail.asset b/data/assets/scene/solarsystem/dwarf_planets/vesta/trail.asset
index cb9c3dab5c..3f89412242 100644
--- a/data/assets/scene/solarsystem/dwarf_planets/vesta/trail.asset
+++ b/data/assets/scene/solarsystem/dwarf_planets/vesta/trail.asset
@@ -5,7 +5,7 @@ local transforms = asset.require("./transforms")
 
 local Trail = {
   Identifier = "VestaTrail",
-  Parent = sunTransforms.SunECLIPJ2000.Identifier,
+  Parent = sunTransforms.SunEclipJ2000.Identifier,
   Renderable = {
     Type = "RenderableTrailOrbit",
     Enabled = asset.enabled,
diff --git a/data/assets/scene/solarsystem/dwarf_planets/vesta/transforms.asset b/data/assets/scene/solarsystem/dwarf_planets/vesta/transforms.asset
index 1501b776ae..1380560818 100644
--- a/data/assets/scene/solarsystem/dwarf_planets/vesta/transforms.asset
+++ b/data/assets/scene/solarsystem/dwarf_planets/vesta/transforms.asset
@@ -18,7 +18,7 @@ local Translation = {
 
 local Position = {
     Identifier = "VestaPosition",
-    Parent = transforms.SunECLIPJ2000.Identifier,
+    Parent = transforms.SunEclipJ2000.Identifier,
     Transform = {
       Translation = Translation
     },
diff --git a/data/assets/scene/solarsystem/missions/insight/edl.asset b/data/assets/scene/solarsystem/missions/insight/edl.asset
index 907d793404..8f99555919 100644
--- a/data/assets/scene/solarsystem/missions/insight/edl.asset
+++ b/data/assets/scene/solarsystem/missions/insight/edl.asset
@@ -150,11 +150,11 @@ local InsightParent = {
   Transform = {
     Translation = {
       Type = "TimelineTranslation",
-      Keyframes = TranslationKeyframes,
+      Keyframes = TranslationKeyframes
     },
     Rotation = {
       Type = "TimelineRotation",
-      Keyframes = RotationKeyframes,
+      Keyframes = RotationKeyframes
     }
   },
   -- TimeFrame = {
diff --git a/data/assets/scene/solarsystem/missions/perseverance/model.asset b/data/assets/scene/solarsystem/missions/perseverance/model.asset
index 717ed59314..640ce53ede 100644
--- a/data/assets/scene/solarsystem/missions/perseverance/model.asset
+++ b/data/assets/scene/solarsystem/missions/perseverance/model.asset
@@ -110,7 +110,6 @@ local Body = {
   Parent = PerseveranceModel.Identifier,
   Renderable = {
     Type = "RenderableModel",
-    Body = "MARS SCIENCE LABORATORY",
     GeometryFile = models .. "Perseverance.obj",
     LightSources = {
       sun.LightSource,
diff --git a/data/assets/scene/solarsystem/planets/mercury/mercury.asset b/data/assets/scene/solarsystem/planets/mercury/mercury.asset
index 4b74997ff2..a884cef006 100644
--- a/data/assets/scene/solarsystem/planets/mercury/mercury.asset
+++ b/data/assets/scene/solarsystem/planets/mercury/mercury.asset
@@ -30,8 +30,6 @@ local Mercury = {
   Renderable = {
     Type = "RenderableGlobe",
     Radii = 2439700,
-    Frame = "IAU_MERCURY",
-    Body = "MERCURY",
     CameraMinHeight = 300,
     SegmentsPerPatch = 64,
     Layers = {},
diff --git a/data/assets/scene/solarsystem/planets/mercury/transforms.asset b/data/assets/scene/solarsystem/planets/mercury/transforms.asset
index e242f52519..072de7b715 100644
--- a/data/assets/scene/solarsystem/planets/mercury/transforms.asset
+++ b/data/assets/scene/solarsystem/planets/mercury/transforms.asset
@@ -16,8 +16,7 @@ local MercuryBarycenter = {
   GUI = {
     Name = "Mercury Barycenter",
     Path = "/Solar System/Planets/Mercury",
-    Hidden = true,
-    Description = "Mercury Barycenter position"
+    Hidden = true
   }
 }
 
diff --git a/data/assets/scene/solarsystem/planets/saturn/hyperion/hyperion.asset b/data/assets/scene/solarsystem/planets/saturn/hyperion/hyperion.asset
index ade8c4a622..5be4586437 100644
--- a/data/assets/scene/solarsystem/planets/saturn/hyperion/hyperion.asset
+++ b/data/assets/scene/solarsystem/planets/saturn/hyperion/hyperion.asset
@@ -21,10 +21,8 @@ local Hyperion = {
       Target = "HYPERION",
       Observer = "SATURN BARYCENTER"
     }
-    --[[
-      The IAU report does not give an orientation model for Hyperion.
-      Hyperion's rotation is chaotic and not predictable for long periods.
-    ]]--
+    -- The IAU report does not give an orientation model for Hyperion.
+    -- Hyperion's rotation is chaotic and not predictable for long periods.
   },
   Renderable = {
     Type = "RenderableGlobe",
diff --git a/data/assets/scene/solarsystem/sssb/amor_asteroid.asset b/data/assets/scene/solarsystem/sssb/amor_asteroid.asset
index 62ffe4b0a1..309bb069a0 100644
--- a/data/assets/scene/solarsystem/sssb/amor_asteroid.asset
+++ b/data/assets/scene/solarsystem/sssb/amor_asteroid.asset
@@ -12,7 +12,7 @@ local sssb = asset.resource({
 
 local Object = {
   Identifier = "sssb_amor_asteroid",
-  Parent = transforms.SunECLIPJ2000.Identifier,
+  Parent = transforms.SunEclipJ2000.Identifier,
   Renderable = {
     Type = "RenderableOrbitalKepler",
     Path = sssb .. "sssb_data_amor_asteroid.csv",
diff --git a/data/assets/scene/solarsystem/sssb/apollo_asteroid.asset b/data/assets/scene/solarsystem/sssb/apollo_asteroid.asset
index 675eefbcb8..15e7af6a75 100644
--- a/data/assets/scene/solarsystem/sssb/apollo_asteroid.asset
+++ b/data/assets/scene/solarsystem/sssb/apollo_asteroid.asset
@@ -12,7 +12,7 @@ local sssb = asset.resource({
 
 local Object = {
   Identifier = "sssb_apollo_asteroid",
-  Parent = transforms.SunECLIPJ2000.Identifier,
+  Parent = transforms.SunEclipJ2000.Identifier,
   Renderable = {
     Type = "RenderableOrbitalKepler",
     Path = sssb .. "sssb_data_apollo_asteroid.csv",
diff --git a/data/assets/scene/solarsystem/sssb/aten_asteroid.asset b/data/assets/scene/solarsystem/sssb/aten_asteroid.asset
index 57a63305a2..f7ebb3b37e 100644
--- a/data/assets/scene/solarsystem/sssb/aten_asteroid.asset
+++ b/data/assets/scene/solarsystem/sssb/aten_asteroid.asset
@@ -12,7 +12,7 @@ local sssb = asset.resource({
 
 local Object = {
   Identifier = "sssb_aten_asteroid",
-  Parent = transforms.SunECLIPJ2000.Identifier,
+  Parent = transforms.SunEclipJ2000.Identifier,
   Renderable = {
     Type = "RenderableOrbitalKepler",
     Path = sssb .. "sssb_data_aten_asteroid.csv",
diff --git a/data/assets/scene/solarsystem/sssb/atira_asteroid.asset b/data/assets/scene/solarsystem/sssb/atira_asteroid.asset
index e9119fbe3e..6fd377dec0 100644
--- a/data/assets/scene/solarsystem/sssb/atira_asteroid.asset
+++ b/data/assets/scene/solarsystem/sssb/atira_asteroid.asset
@@ -12,7 +12,7 @@ local sssb = asset.resource({
 
 local Object = {
   Identifier = "sssb_atira_asteroid",
-  Parent = transforms.SunECLIPJ2000.Identifier,
+  Parent = transforms.SunEclipJ2000.Identifier,
   Renderable = {
     Type = "RenderableOrbitalKepler",
     Path = sssb .. "sssb_data_atira_asteroid.csv",
diff --git a/data/assets/scene/solarsystem/sssb/centaur_asteroid.asset b/data/assets/scene/solarsystem/sssb/centaur_asteroid.asset
index b34557cfba..e17785d9b3 100644
--- a/data/assets/scene/solarsystem/sssb/centaur_asteroid.asset
+++ b/data/assets/scene/solarsystem/sssb/centaur_asteroid.asset
@@ -12,7 +12,7 @@ local sssb = asset.resource({
 
 local Object = {
   Identifier = "sssb_centaur_asteroid",
-  Parent = transforms.SunECLIPJ2000.Identifier,
+  Parent = transforms.SunEclipJ2000.Identifier,
   Renderable = {
     Type = "RenderableOrbitalKepler",
     Path = sssb .. "sssb_data_centaur_asteroid.csv",
diff --git a/data/assets/scene/solarsystem/sssb/chiron-type_comet.asset b/data/assets/scene/solarsystem/sssb/chiron-type_comet.asset
index fb3b172b15..2718642c73 100644
--- a/data/assets/scene/solarsystem/sssb/chiron-type_comet.asset
+++ b/data/assets/scene/solarsystem/sssb/chiron-type_comet.asset
@@ -12,7 +12,7 @@ local sssb = asset.resource({
 
 local Object = {
   Identifier = "sssb_chiron-type_comet",
-  Parent = transforms.SunECLIPJ2000.Identifier,
+  Parent = transforms.SunEclipJ2000.Identifier,
   Renderable = {
     Type = "RenderableOrbitalKepler",
     Path = sssb .. "sssb_data_chiron-type_comet.csv",
diff --git a/data/assets/scene/solarsystem/sssb/encke-type_comet.asset b/data/assets/scene/solarsystem/sssb/encke-type_comet.asset
index 932eaeac9a..41774601dd 100644
--- a/data/assets/scene/solarsystem/sssb/encke-type_comet.asset
+++ b/data/assets/scene/solarsystem/sssb/encke-type_comet.asset
@@ -12,7 +12,7 @@ local sssb = asset.resource({
 
 local Object = {
   Identifier = "sssb_encke-type_comet",
-  Parent = transforms.SunECLIPJ2000.Identifier,
+  Parent = transforms.SunEclipJ2000.Identifier,
   Renderable = {
     Type = "RenderableOrbitalKepler",
     Path = sssb .. "sssb_data_encke-type_comet.csv",
diff --git a/data/assets/scene/solarsystem/sssb/halley-type_comet.asset b/data/assets/scene/solarsystem/sssb/halley-type_comet.asset
index 92a5fd4b5c..b90e5f1e20 100644
--- a/data/assets/scene/solarsystem/sssb/halley-type_comet.asset
+++ b/data/assets/scene/solarsystem/sssb/halley-type_comet.asset
@@ -12,7 +12,7 @@ local sssb = asset.resource({
 
 local Object = {
   Identifier = "sssb_halley-type_comet",
-  Parent = transforms.SunECLIPJ2000.Identifier,
+  Parent = transforms.SunEclipJ2000.Identifier,
   Renderable = {
     Type = "RenderableOrbitalKepler",
     Path = sssb .. "sssb_data_halley-type_comet.csv",
diff --git a/data/assets/scene/solarsystem/sssb/inner_main_belt_asteroid.asset b/data/assets/scene/solarsystem/sssb/inner_main_belt_asteroid.asset
index fb4fb38c7b..263f4c8680 100644
--- a/data/assets/scene/solarsystem/sssb/inner_main_belt_asteroid.asset
+++ b/data/assets/scene/solarsystem/sssb/inner_main_belt_asteroid.asset
@@ -12,7 +12,7 @@ local sssb = asset.resource({
 
 local Object = {
   Identifier = "sssb_inner_main_belt_asteroid",
-  Parent = transforms.SunECLIPJ2000.Identifier,
+  Parent = transforms.SunEclipJ2000.Identifier,
   Renderable = {
     Type = "RenderableOrbitalKepler",
     Path = sssb .. "sssb_data_inner_main_belt_asteroid.csv",
diff --git a/data/assets/scene/solarsystem/sssb/jupiter-family_comet.asset b/data/assets/scene/solarsystem/sssb/jupiter-family_comet.asset
index 3382de82d3..138eaf3442 100644
--- a/data/assets/scene/solarsystem/sssb/jupiter-family_comet.asset
+++ b/data/assets/scene/solarsystem/sssb/jupiter-family_comet.asset
@@ -12,7 +12,7 @@ local sssb = asset.resource({
 
 local Object = {
   Identifier = "sssb_jupiter-family_comet",
-  Parent = transforms.SunECLIPJ2000.Identifier,
+  Parent = transforms.SunEclipJ2000.Identifier,
   Renderable = {
     Type = "RenderableOrbitalKepler",
     Path = sssb .. "sssb_data_jupiter-family_comet.csv",
diff --git a/data/assets/scene/solarsystem/sssb/jupiter_trojan_asteroid.asset b/data/assets/scene/solarsystem/sssb/jupiter_trojan_asteroid.asset
index 26312b1a70..a95b1e3913 100644
--- a/data/assets/scene/solarsystem/sssb/jupiter_trojan_asteroid.asset
+++ b/data/assets/scene/solarsystem/sssb/jupiter_trojan_asteroid.asset
@@ -12,7 +12,7 @@ local sssb = asset.resource({
 
 local Object = {
   Identifier = "sssb_jupiter_trojan_asteroid",
-  Parent = transforms.SunECLIPJ2000.Identifier,
+  Parent = transforms.SunEclipJ2000.Identifier,
   Renderable = {
     Type = "RenderableOrbitalKepler",
     Path = sssb .. "sssb_data_jupiter_trojan_asteroid.csv",
diff --git a/data/assets/scene/solarsystem/sssb/main_belt_asteroid.asset b/data/assets/scene/solarsystem/sssb/main_belt_asteroid.asset
index 546adb701b..d9407c163b 100644
--- a/data/assets/scene/solarsystem/sssb/main_belt_asteroid.asset
+++ b/data/assets/scene/solarsystem/sssb/main_belt_asteroid.asset
@@ -12,7 +12,7 @@ local sssb = asset.resource({
 
 local Object = {
   Identifier = "sssb_main_belt_asteroid",
-  Parent = transforms.SunECLIPJ2000.Identifier,
+  Parent = transforms.SunEclipJ2000.Identifier,
   Renderable = {
     Type = "RenderableOrbitalKepler",
     Path = sssb .. "sssb_data_main_belt_asteroid.csv",
diff --git a/data/assets/scene/solarsystem/sssb/mars-crossing_asteroid.asset b/data/assets/scene/solarsystem/sssb/mars-crossing_asteroid.asset
index 2b54bdce9a..f6a13af867 100644
--- a/data/assets/scene/solarsystem/sssb/mars-crossing_asteroid.asset
+++ b/data/assets/scene/solarsystem/sssb/mars-crossing_asteroid.asset
@@ -12,7 +12,7 @@ local sssb = asset.resource({
 
 local Object = {
   Identifier = "sssb_mars-crossing_asteroid",
-  Parent = transforms.SunECLIPJ2000.Identifier,
+  Parent = transforms.SunEclipJ2000.Identifier,
   Renderable = {
     Type = "RenderableOrbitalKepler",
     Path = sssb .. "sssb_data_mars-crossing_asteroid.csv",
diff --git a/data/assets/scene/solarsystem/sssb/outer_main_belt_asteroid.asset b/data/assets/scene/solarsystem/sssb/outer_main_belt_asteroid.asset
index 34e8062385..23fa484398 100644
--- a/data/assets/scene/solarsystem/sssb/outer_main_belt_asteroid.asset
+++ b/data/assets/scene/solarsystem/sssb/outer_main_belt_asteroid.asset
@@ -12,7 +12,7 @@ local sssb = asset.resource({
 
 local Object = {
   Identifier = "sssb_outer_main_belt_asteroid",
-  Parent = transforms.SunECLIPJ2000.Identifier,
+  Parent = transforms.SunEclipJ2000.Identifier,
   Renderable = {
     Type = "RenderableOrbitalKepler",
     Path = sssb .. "sssb_data_outer_main_belt_asteroid.csv",
diff --git a/data/assets/scene/solarsystem/sssb/pha.asset b/data/assets/scene/solarsystem/sssb/pha.asset
index 6061eb8b9c..f3c2e2e00e 100644
--- a/data/assets/scene/solarsystem/sssb/pha.asset
+++ b/data/assets/scene/solarsystem/sssb/pha.asset
@@ -12,7 +12,7 @@ local sssb = asset.resource({
 
 local Object = {
   Identifier = "sssb_pha",
-  Parent = transforms.SunECLIPJ2000.Identifier,
+  Parent = transforms.SunEclipJ2000.Identifier,
   Renderable = {
     Type = "RenderableOrbitalKepler",
     Path = sssb .. "sssb_data_pha.csv",
diff --git a/data/assets/scene/solarsystem/sssb/transneptunian_object_asteroid.asset b/data/assets/scene/solarsystem/sssb/transneptunian_object_asteroid.asset
index 4bee354119..b5b6ce65ae 100644
--- a/data/assets/scene/solarsystem/sssb/transneptunian_object_asteroid.asset
+++ b/data/assets/scene/solarsystem/sssb/transneptunian_object_asteroid.asset
@@ -12,7 +12,7 @@ local sssb = asset.resource({
 
 local Object = {
   Identifier = "sssb_transneptunian_object_asteroid",
-  Parent = transforms.SunECLIPJ2000.Identifier,
+  Parent = transforms.SunEclipJ2000.Identifier,
   Renderable = {
     Type = "RenderableOrbitalKepler",
     Path = sssb .. "sssb_data_transneptunian_object_asteroid.csv",
diff --git a/data/assets/scene/solarsystem/sun/habitablezone.asset b/data/assets/scene/solarsystem/sun/habitablezone.asset
index 3266e75daa..9bd5f09e82 100644
--- a/data/assets/scene/solarsystem/sun/habitablezone.asset
+++ b/data/assets/scene/solarsystem/sun/habitablezone.asset
@@ -5,7 +5,7 @@ local textures = asset.require("scene/milkyway/habitable_zones/habitable_zone_te
 
 local HabitableZone = {
   Identifier = "SunHabitableZone",
-  Parent = transforms.SunECLIPJ2000.Identifier,
+  Parent = transforms.SunEclipJ2000.Identifier,
   Renderable = {
     Type = "RenderableHabitableZone",
     Enabled = false,
diff --git a/data/assets/scene/solarsystem/sun/transforms.asset b/data/assets/scene/solarsystem/sun/transforms.asset
index f7da873d52..8c6de68de8 100644
--- a/data/assets/scene/solarsystem/sun/transforms.asset
+++ b/data/assets/scene/solarsystem/sun/transforms.asset
@@ -29,7 +29,7 @@ local SunCenter = {
     }
   },
   GUI = {
-    Name = "SUN Center",
+    Name = "Sun Center",
     Path = "/Solar System/Sun",
     Description = "Spice frame for the Sun",
     Hidden = true
@@ -53,14 +53,14 @@ local SunIAU = {
     }
   },
   GUI = {
-    Name = "SUN IAU",
+    Name = "Sun IAU",
     Path = "/Solar System/Sun",
     Hidden = true
   }
 }
 
-local SunECLIPJ2000 = {
-  Identifier = "SunECLIPJ2000",
+local SunEclipJ2000 = {
+  Identifier = "SunEclipJ2000",
   Parent = SolarSystemBarycenter.Identifier,
   Transform = {
     Translation = {
@@ -75,7 +75,7 @@ local SunECLIPJ2000 = {
     }
   },
   GUI = {
-    Name = "SUN J2000",
+    Name = "Sun J2000",
     Path = "/Solar System/Sun",
     Hidden = true
   }
@@ -86,11 +86,11 @@ asset.onInitialize(function()
   openspace.addSceneGraphNode(SolarSystemBarycenter)
   openspace.addSceneGraphNode(SunCenter)
   openspace.addSceneGraphNode(SunIAU)
-  openspace.addSceneGraphNode(SunECLIPJ2000)
+  openspace.addSceneGraphNode(SunEclipJ2000)
 end)
 
 asset.onDeinitialize(function()
-  openspace.removeSceneGraphNode(SunECLIPJ2000)
+  openspace.removeSceneGraphNode(SunEclipJ2000)
   openspace.removeSceneGraphNode(SunIAU)
   openspace.removeSceneGraphNode(SunCenter)
   openspace.removeSceneGraphNode(SolarSystemBarycenter)
@@ -99,7 +99,7 @@ end)
 asset.export(SolarSystemBarycenter)
 asset.export(SunCenter)
 asset.export(SunIAU)
-asset.export(SunECLIPJ2000)
+asset.export(SunEclipJ2000)
 
 
 

From bc986fa887c8e603680ff16fa3e4869b79ef6667 Mon Sep 17 00:00:00 2001
From: Alexander Bock <alexander.bock@liu.se>
Date: Mon, 11 Dec 2023 13:57:07 +0100
Subject: [PATCH 205/701] Gracefully deal with empty ossync files in
 UrlSynchronization

---
 modules/sync/syncs/urlsynchronization.cpp | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/modules/sync/syncs/urlsynchronization.cpp b/modules/sync/syncs/urlsynchronization.cpp
index ca0fda73f5..df3b67acd4 100644
--- a/modules/sync/syncs/urlsynchronization.cpp
+++ b/modules/sync/syncs/urlsynchronization.cpp
@@ -210,7 +210,7 @@ bool UrlSynchronization::isEachFileValid() {
         file.close();
         createSyncFile();
         // File is valid until some date
-        return true; 
+        return true;
     }
     // Otherwise first line is the version number.
     std::string ossyncVersion = line;
@@ -244,6 +244,10 @@ bool UrlSynchronization::isEachFileValid() {
         // i.e. no sync needed.
         return fileValidAsJ2000 > todaysDateAsJ2000;
     }
+    else if (ossyncVersion.empty()) {
+        // For some reason we ended up with an empty synchronization file
+        return false;
+    }
     else {
         LERROR(fmt::format(
             "{}: Unknown ossync version number read. Got {} while {} and below are valid",

From dbc1403be62867a45714b69542ab10b95f39d22c Mon Sep 17 00:00:00 2001
From: Alexander Bock <alexander.bock@liu.se>
Date: Mon, 11 Dec 2023 14:11:08 +0100
Subject: [PATCH 206/701] Remove asset initialization warnings

---
 .../scene/solarsystem/planets/earth/layers/newyork_layers.asset | 2 +-
 .../scene/solarsystem/planets/earth/layers/sweden_layers.asset  | 2 +-
 .../scene/solarsystem/planets/earth/layers/utah_layers.asset    | 2 +-
 .../scene/solarsystem/planets/mars/layers/newyork_layers.asset  | 2 +-
 .../scene/solarsystem/planets/mars/layers/sweden_layers.asset   | 2 +-
 .../scene/solarsystem/planets/mars/layers/utah_layers.asset     | 2 +-
 .../solarsystem/planets/mercury/layers/newyork_layers.asset     | 2 +-
 .../solarsystem/planets/mercury/layers/sweden_layers.asset      | 2 +-
 .../scene/solarsystem/planets/mercury/layers/utah_layers.asset  | 2 +-
 .../scene/solarsystem/planets/venus/layers/newyork_layers.asset | 2 +-
 .../scene/solarsystem/planets/venus/layers/utah_layers.asset    | 2 +-
 11 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/data/assets/scene/solarsystem/planets/earth/layers/newyork_layers.asset b/data/assets/scene/solarsystem/planets/earth/layers/newyork_layers.asset
index 6b0f27d377..d691d33868 100644
--- a/data/assets/scene/solarsystem/planets/earth/layers/newyork_layers.asset
+++ b/data/assets/scene/solarsystem/planets/earth/layers/newyork_layers.asset
@@ -1,4 +1,4 @@
-asset.require("./base_layers", true)
+asset.require("./base_layers")
 asset.require("./colorlayers/bmng_newyork", false)
 asset.require("./watermasks/gebco_newyork", false)
 
diff --git a/data/assets/scene/solarsystem/planets/earth/layers/sweden_layers.asset b/data/assets/scene/solarsystem/planets/earth/layers/sweden_layers.asset
index 95381f748e..87d858ee0c 100644
--- a/data/assets/scene/solarsystem/planets/earth/layers/sweden_layers.asset
+++ b/data/assets/scene/solarsystem/planets/earth/layers/sweden_layers.asset
@@ -1,4 +1,4 @@
-asset.require("./base_layers", true)
+asset.require("./base_layers")
 asset.require("./colorlayers/bmng_sweden", false)
 asset.require("./watermasks/gebco_sweden", false)
 
diff --git a/data/assets/scene/solarsystem/planets/earth/layers/utah_layers.asset b/data/assets/scene/solarsystem/planets/earth/layers/utah_layers.asset
index 91e5287594..d496dd78df 100644
--- a/data/assets/scene/solarsystem/planets/earth/layers/utah_layers.asset
+++ b/data/assets/scene/solarsystem/planets/earth/layers/utah_layers.asset
@@ -1,4 +1,4 @@
-asset.require("./base_layers", true)
+asset.require("./base_layers")
 asset.require("./colorlayers/bmng_utah", false)
 asset.require("./watermasks/gebco_utah", false)
 
diff --git a/data/assets/scene/solarsystem/planets/mars/layers/newyork_layers.asset b/data/assets/scene/solarsystem/planets/mars/layers/newyork_layers.asset
index 9355ab2007..4f2f01d580 100644
--- a/data/assets/scene/solarsystem/planets/mars/layers/newyork_layers.asset
+++ b/data/assets/scene/solarsystem/planets/mars/layers/newyork_layers.asset
@@ -1,4 +1,4 @@
-asset.require("./base_layers", true)
+asset.require("./base_layers")
 asset.require("./colorlayers/moc_wa_color_newyork", asset.enabled)
 asset.require("./colorlayers/viking_mdim_newyork", false)
 asset.require("./colorlayers/mola_pseudo_color_newyork", false)
diff --git a/data/assets/scene/solarsystem/planets/mars/layers/sweden_layers.asset b/data/assets/scene/solarsystem/planets/mars/layers/sweden_layers.asset
index 50885a04dd..b6c49e0d44 100644
--- a/data/assets/scene/solarsystem/planets/mars/layers/sweden_layers.asset
+++ b/data/assets/scene/solarsystem/planets/mars/layers/sweden_layers.asset
@@ -1,4 +1,4 @@
-asset.require("./base_layers", true)
+asset.require("./base_layers")
 asset.require("./colorlayers/moc_wa_color_sweden", asset.enabled)
 asset.require("./colorlayers/viking_mdim_sweden", false)
 asset.require("./colorlayers/mola_pseudo_color_sweden", false)
diff --git a/data/assets/scene/solarsystem/planets/mars/layers/utah_layers.asset b/data/assets/scene/solarsystem/planets/mars/layers/utah_layers.asset
index 83d15a6a1c..2edd601b81 100644
--- a/data/assets/scene/solarsystem/planets/mars/layers/utah_layers.asset
+++ b/data/assets/scene/solarsystem/planets/mars/layers/utah_layers.asset
@@ -1,4 +1,4 @@
-asset.require("./base_layers", true)
+asset.require("./base_layers")
 asset.require("./colorlayers/moc_wa_color_utah", asset.enabled)
 asset.require("./colorlayers/viking_mdim_utah", false)
 asset.require("./colorlayers/mola_pseudo_color_utah", false)
diff --git a/data/assets/scene/solarsystem/planets/mercury/layers/newyork_layers.asset b/data/assets/scene/solarsystem/planets/mercury/layers/newyork_layers.asset
index 5162b6ac47..e309463063 100644
--- a/data/assets/scene/solarsystem/planets/mercury/layers/newyork_layers.asset
+++ b/data/assets/scene/solarsystem/planets/mercury/layers/newyork_layers.asset
@@ -1,4 +1,4 @@
-asset.require("./base_layers", true)
+asset.require("./base_layers")
 asset.require("./colorlayers/messenger_mdis_newyork", false)
 asset.require("./colorlayers/messenger_mosaic_newyork", false)
 asset.require("./colorlayers/messenger_mosaic2_newyork", false)
diff --git a/data/assets/scene/solarsystem/planets/mercury/layers/sweden_layers.asset b/data/assets/scene/solarsystem/planets/mercury/layers/sweden_layers.asset
index 20aeff7e71..bcf87bde48 100644
--- a/data/assets/scene/solarsystem/planets/mercury/layers/sweden_layers.asset
+++ b/data/assets/scene/solarsystem/planets/mercury/layers/sweden_layers.asset
@@ -1,4 +1,4 @@
-asset.require("./base_layers", true)
+asset.require("./base_layers")
 asset.require("./colorlayers/messenger_mdis_sweden", false)
 asset.require("./colorlayers/messenger_mosaic_sweden", false)
 asset.require("./colorlayers/messenger_mosaic2_sweden", false)
diff --git a/data/assets/scene/solarsystem/planets/mercury/layers/utah_layers.asset b/data/assets/scene/solarsystem/planets/mercury/layers/utah_layers.asset
index cf1f301309..ff2e5738bb 100644
--- a/data/assets/scene/solarsystem/planets/mercury/layers/utah_layers.asset
+++ b/data/assets/scene/solarsystem/planets/mercury/layers/utah_layers.asset
@@ -1,4 +1,4 @@
-asset.require("./base_layers", true)
+asset.require("./base_layers")
 asset.require("./colorlayers/messenger_mdis_utah", false)
 asset.require("./colorlayers/messenger_mosaic_utah", false)
 asset.require("./colorlayers/messenger_mosaic2_utah", false)
diff --git a/data/assets/scene/solarsystem/planets/venus/layers/newyork_layers.asset b/data/assets/scene/solarsystem/planets/venus/layers/newyork_layers.asset
index 45464d42a3..fb3daf02c0 100644
--- a/data/assets/scene/solarsystem/planets/venus/layers/newyork_layers.asset
+++ b/data/assets/scene/solarsystem/planets/venus/layers/newyork_layers.asset
@@ -1,4 +1,4 @@
-asset.require("./base_layers", false)
+asset.require("./base_layers")
 asset.require("./colorlayers/magellan_mosaic_newyork", false)
 asset.require("./colorlayers/clouds_magellan_combo_newyork", asset.enabled)
 
diff --git a/data/assets/scene/solarsystem/planets/venus/layers/utah_layers.asset b/data/assets/scene/solarsystem/planets/venus/layers/utah_layers.asset
index 4c00a6e01d..26174639b3 100644
--- a/data/assets/scene/solarsystem/planets/venus/layers/utah_layers.asset
+++ b/data/assets/scene/solarsystem/planets/venus/layers/utah_layers.asset
@@ -1,4 +1,4 @@
-asset.require("./base_layers", false)
+asset.require("./base_layers")
 asset.require("./colorlayers/magellan_mosaic_utah", false)
 asset.require("./colorlayers/clouds_magellan_combo_utah", asset.enabled)
 

From aaa6522029f5bb400cc6e725819e1e2861dc4c61 Mon Sep 17 00:00:00 2001
From: Alexander Bock <alexander.bock@liu.se>
Date: Mon, 11 Dec 2023 20:37:55 +0100
Subject: [PATCH 207/701] Add Euclid mission (#2970)

---
 .../telescopes/euclid/euclid.asset            |  14 ++
 .../telescopes/euclid/mission.asset           |  89 ++++++++++++
 .../solarsystem/telescopes/euclid/model.asset |  73 ++++++++++
 .../solarsystem/telescopes/euclid/spice.asset |  38 +++++
 .../telescopes/euclid/trails.asset            | 135 ++++++++++++++++++
 data/profiles/euclid.profile                  |  89 ++++++++++++
 6 files changed, 438 insertions(+)
 create mode 100644 data/assets/scene/solarsystem/telescopes/euclid/euclid.asset
 create mode 100644 data/assets/scene/solarsystem/telescopes/euclid/mission.asset
 create mode 100644 data/assets/scene/solarsystem/telescopes/euclid/model.asset
 create mode 100644 data/assets/scene/solarsystem/telescopes/euclid/spice.asset
 create mode 100644 data/assets/scene/solarsystem/telescopes/euclid/trails.asset
 create mode 100644 data/profiles/euclid.profile

diff --git a/data/assets/scene/solarsystem/telescopes/euclid/euclid.asset b/data/assets/scene/solarsystem/telescopes/euclid/euclid.asset
new file mode 100644
index 0000000000..5fced2cf7c
--- /dev/null
+++ b/data/assets/scene/solarsystem/telescopes/euclid/euclid.asset
@@ -0,0 +1,14 @@
+asset.require("./model")
+asset.require("./trails")
+asset.require("./mission")
+
+
+
+asset.meta = {
+  Name = "Euclid",
+  Version = "1.0",
+  Description = "This asset includes all of the other assets for the Euclid mission.",
+  Author = "OpenSpace Team",
+  URL = "http://openspaceproject.com",
+  License = "MIT license"
+}
diff --git a/data/assets/scene/solarsystem/telescopes/euclid/mission.asset b/data/assets/scene/solarsystem/telescopes/euclid/mission.asset
new file mode 100644
index 0000000000..240e909f94
--- /dev/null
+++ b/data/assets/scene/solarsystem/telescopes/euclid/mission.asset
@@ -0,0 +1,89 @@
+local Mission = {
+  Name = "Euclid",
+  Image = "https://www.esa.int/var/esa/storage/images/esa_multimedia/images/2013/01/euclid_logo/12493233-3-eng-GB/Euclid_logo_pillars.png",
+  Description = [[Euclid is designed to explore the evolution of the dark universe. It will make a 3D-map of the universe (with time as the third dimension) by observing billions of galaxies out to 10 billion light-years, across more than a third of the sky.
+
+  While dark energy accelerates the expansion of the universe and dark matter governs the growth of cosmic structures, scientists remain unsure about what dark energy and dark matter actually are.
+
+  By observing the universe evolving over the past 10 billion years, Euclid will reveal how it has expanded and how structure has formed over cosmic history - and from this, astronomers can infer the properties of dark energy, dark matter and gravity, to reveal more about their precise nature.]],
+  Milestones = {
+    {
+      Name = "Launch",
+      Date = "2023 JUL 01 15:12:00"
+    },
+    {
+      Name = "Start of Trajectory Information",
+      Date = "2023 JUL 01 15:53:08.239"
+    },
+    {
+      Name = "Quality Release Q1",
+      Date = "2024 DEC 01"
+    },
+    {
+      Name = "Data Release DR1",
+      Date = "2025 DEC 01"
+    },
+    {
+      Name = "Quality Release Q2",
+      Date = "2026 DEC 01"
+    },
+    {
+      Name = "Data Release DR2",
+      Date = "2027 DEC 01"
+    },
+    {
+      Name = "Quality Release Q3",
+      Date = "2028 DEC 01"
+    },
+    {
+      Name = "Quality Release Q4",
+      Date = "2029 DEC 01"
+    },
+    {
+      Name = "Data Release DR3",
+      Date = "2030 DEC 01"
+    }
+  },
+  Phases = {
+    {
+      Name = "Cruise phase",
+      TimeRange = { Start = "2023 JUL 01 15:12:00", End = "2023 AUG 01" },
+      Description = "Following a cruise of 30 days, Euclid will operate in a large halo orbit around the L2 point of the Sun-Earth system, which is located 1.5 million km from the Earth in the anti-Sun direction. The orbit will not suffer from any Earth eclipses and will have a radius of 1 million kilometers. An operational lifetime of 6 years is planned."
+    },
+    {
+      Name = "Commissioning & Performance Verification phase",
+      TimeRange = { Start = "2023 AUG 01", End = "2023 OCT 01" },
+      Description = "During commissioning a mission's instruments and subsystems are deployed, turned on, tested and calibrated. The Performance Verification will ensure that the science instruments are all rigorously tested and that the expected performances of the Euclid project are in line with the core science objectives."
+    },
+    {
+      Name = "Operational phase",
+      TimeRange = { Start = "2023 OCT 01", End = "2028 AUG 01" },
+      Description = [[Euclid was selected for implementation in June 2012 by ESA's Science Programme Committee. It's main scientific objectives are:
+
+        - To investigate whether Dark Energy is real, or whether the apparent acceleration of the Universe is caused by a breakdown of General Relativity on the largest scales, or a failure of our assumption that the universe is more or less uniform in density.
+        - If dark energy is real, to investigate whether it is a constant energy spread across space, which would make it the Cosmological Constant found in Einstein's General Relativity, or a new force of nature that evolves with the expansion of the Universe.
+        - To investigate the nature of Dark Matter, the mass of neutrino particles and whether there are other, so-far undetected fast moving particle species in the Universe.
+        - To investigate the conditions in the Universe after the Big Bang that seeded the large-scale structure of the universe that we observe today.]]
+    }
+  }
+}
+
+
+asset.onInitialize(function()
+  openspace.loadMission(Mission)
+end)
+
+asset.onDeinitialize(function()
+  openspace.unloadMission(Mission.Name)
+end)
+
+
+
+asset.meta = {
+  Name = "Euclid Mission",
+  Version = "1.0",
+  Description = "This asset contains the mission profile information for ESA's Euclid mission. The data in this file has been combined from multiple sources, including https://sci.esa.int/web/euclid, https://www.esa.int/Science_Exploration/Space_Science/Euclid_overview, https://www.euclid-ec.org/, https://sci.esa.int/web/euclid, https://indico.in2p3.fr/event/14206/contributions/17189/attachments/14299/17526/Euclid-MSauvage-LSSTFrance-MAR2017.pdf, and https://euclid.caltech.edu/page/data-release-timeline",
+  Author = "OpenSpace Team",
+  URL = "http://openspaceproject.com",
+  License = "MIT license"
+}
diff --git a/data/assets/scene/solarsystem/telescopes/euclid/model.asset b/data/assets/scene/solarsystem/telescopes/euclid/model.asset
new file mode 100644
index 0000000000..c837d8a779
--- /dev/null
+++ b/data/assets/scene/solarsystem/telescopes/euclid/model.asset
@@ -0,0 +1,73 @@
+local transform = asset.require("scene/solarsystem/planets/earth/transforms")
+local sun = asset.require("scene/solarsystem/sun/sun")
+local spice = asset.require("./spice")
+
+
+
+local modelFolder = asset.resource({
+  Name = "Euclid Model",
+  Type = "HttpSynchronization",
+  Identifier = "euclid_model",
+  Version = 1
+})
+
+
+local Euclid = {
+  Identifier = "Euclid",
+  Parent = transform.EarthBarycenter.Identifier,
+  TimeFrame = {
+    Type = "TimeFrameInterval",
+    Start = "2023 JUL 01 15:53:08.239",
+    End = "2031 OCT 13 00:37:22.437"
+  },
+  Transform = {
+    Translation = {
+      Type = "SpiceTranslation",
+      Target = spice.ID.Euclid,
+      Observer = "EARTH BARYCENTER"
+    },
+    Rotation = {
+      Type = "FixedRotation",
+      Attached = "Euclid",
+      ZAxis = "Sun",
+      YAxis = { 0.0, 1.0, 0.0 },
+      YAxisOrthogonal = true
+    }
+  },
+  Renderable = {
+    Type = "RenderableModel",
+    GeometryFile = modelFolder .. "euclid.fbx",
+    ModelScale = 30.0,
+    LightSources = {
+      sun.LightSource
+    },
+    PerformShading = true,
+    AmbientIntensity = 0.075
+  },
+  GUI = {
+    Name = "Euclid",
+    Path = "/Solar System/Telescopes/Euclid"
+  }
+}
+
+
+asset.onInitialize(function()
+  openspace.addSceneGraphNode(Euclid)
+end)
+
+asset.onDeinitialize(function()
+  openspace.removeSceneGraphNode(Euclid)
+end)
+
+asset.export(Euclid)
+
+
+
+asset.meta = {
+  Name = "Euclid Model",
+  Version = "1.0",
+  Description = "This asset contains the model of ESA's Euclid spacecraft. The model is retrieved from https://scifleet.esa.int",
+  Author = "OpenSpace Team",
+  URL = "http://openspaceproject.com",
+  License = "MIT license"
+}
diff --git a/data/assets/scene/solarsystem/telescopes/euclid/spice.asset b/data/assets/scene/solarsystem/telescopes/euclid/spice.asset
new file mode 100644
index 0000000000..c2ff6c3129
--- /dev/null
+++ b/data/assets/scene/solarsystem/telescopes/euclid/spice.asset
@@ -0,0 +1,38 @@
+local kernels = asset.resource({
+  Name = "Euclid Kernels",
+  Type = "HttpSynchronization",
+  Identifier = "euclid_kernels",
+  Version = 1
+})
+
+
+local EuclidKernels = {
+  kernels .. "de432s.bsp",
+  kernels .. "euclid_flp_00044_20230701_20311013_v01.bsp"
+}
+
+local ID = {
+  Euclid = -680
+}
+
+
+asset.onInitialize(function()
+  openspace.spice.loadKernel(EuclidKernels)
+end)
+
+asset.onDeinitialize(function()
+  openspace.spice.unloadKernel(EuclidKernels)
+end)
+
+asset.export("ID", ID)
+
+
+
+asset.meta = {
+  Name = "Euclid Kernels",
+  Version = "1.0",
+  Description = "This asset contains the SPICE kernels for ESA's Euclid mission.",
+  Author = "OpenSpace Team",
+  URL = "http://openspaceproject.com",
+  License = "MIT license"
+}
diff --git a/data/assets/scene/solarsystem/telescopes/euclid/trails.asset b/data/assets/scene/solarsystem/telescopes/euclid/trails.asset
new file mode 100644
index 0000000000..b00a11b34e
--- /dev/null
+++ b/data/assets/scene/solarsystem/telescopes/euclid/trails.asset
@@ -0,0 +1,135 @@
+local spice = asset.require("./spice")
+local earth = asset.require("scene/solarsystem/planets/earth/transforms")
+local solarsystem = asset.require("scene/solarsystem/sun/transforms")
+local transforms = asset.require("scene/solarsystem/planets/earth/lagrange_points/l2")
+
+
+local StartTime = "2023 JUL 01 15:53:08.239"
+local EndTime = "2031 OCT 13 00:37:22.437"
+
+local EuclidTrailSun = {
+  Identifier = "EuclidTrailSun",
+  Parent = solarsystem.SolarSystemBarycenter.Identifier,
+  Renderable = {
+    Type = "RenderableTrailTrajectory",
+    Translation = {
+      Type = "SpiceTranslation",
+      Target = spice.ID.Euclid,
+      Observer = "SSB"
+    },
+    Color = { 0.70, 0.50, 0.20 },
+    StartTime = StartTime,
+    EndTime = EndTime,
+    SampleInterval = 60000
+  },
+  GUI = {
+    Name = "Euclid Trail (Sun)",
+    Path = "/Solar System/Telescopes/Euclid"
+  }
+}
+
+local EuclidTrailEarth = {
+  Identifier = "EuclidTrailEarth",
+  Parent = earth.EarthBarycenter.Identifier,
+  Renderable = {
+    Type = "RenderableTrailTrajectory",
+    Translation = {
+      Type = "SpiceTranslation",
+      Target = spice.ID.Euclid,
+      Observer = "EARTH BARYCENTER"
+    },
+    Color = { 0.325, 0.65, 0.55 },
+    StartTime = StartTime,
+    EndTime = EndTime,
+    SampleInterval = 60000
+  },
+  GUI = {
+    Name = "Euclid Trail (Earth)",
+    Path = "/Solar System/Telescopes/Euclid"
+  }
+}
+
+local EuclidTrailOrbit = {
+  Identifier = "EuclidTrailOrbit",
+  Parent = transforms.L2Position.Identifier,
+  TimeFrame = {
+    Type = "TimeFrameInterval",
+    Start = StartTime,
+    End = EndTime
+  },
+  Renderable = {
+    Type = "RenderableTrailOrbit",
+    Translation = {
+      Type = "SpiceTranslation",
+      Target = spice.ID.Euclid,
+      Observer = 392, -- L2
+      Frame = "GALACTIC"
+    },
+    Color = { 0.863, 0.0, 0.902 },
+    Period = 182.621099, -- About 6 months
+    Resolution = 183 -- About a sample rate of once per day
+  },
+  GUI = {
+    Name = "Euclid Orbit Trail",
+    Path = "/Solar System/Telescopes/Euclid",
+    Description = "Euclid Orbit Trail relative to L2"
+  }
+}
+
+local EuclidTrailCoRevOrbit = {
+  Identifier = "EuclidTrailCoRevOrbit",
+  Parent = transforms.L2CoRevFrame.Identifier,
+  TimeFrame = {
+    Type = "TimeFrameInterval",
+    Start = StartTime,
+    End = EndTime
+  },
+  Renderable = {
+    Type = "RenderableTrailOrbit",
+    Translation = {
+      Type = "SpiceTranslation",
+      Target = spice.ID.Euclid,
+      Observer = 392, -- L2
+      Frame = "L2_COREV"
+    },
+    Color = { 0.863, 0.0, 0.902 },
+    Period = 182.621099, -- About 6 months
+    Resolution = 183 -- About a sample rate of once per day
+  },
+  GUI = {
+    Name = "Euclid L2 Co-Revolving Orbit Trail",
+    Path = "/Solar System/Telescopes/Euclid",
+    Description = "Euclid Orbit Trail relative to L2"
+  }
+}
+
+
+asset.onInitialize(function()
+  openspace.addSceneGraphNode(EuclidTrailSun)
+  openspace.addSceneGraphNode(EuclidTrailEarth)
+  openspace.addSceneGraphNode(EuclidTrailOrbit)
+  openspace.addSceneGraphNode(EuclidTrailCoRevOrbit)
+end)
+
+asset.onDeinitialize(function()
+  openspace.removeSceneGraphNode(EuclidTrailCoRevOrbit)
+  openspace.removeSceneGraphNode(EuclidTrailOrbit)
+  openspace.removeSceneGraphNode(EuclidTrailEarth)
+  openspace.removeSceneGraphNode(EuclidTrailSun)
+end)
+
+asset.export(EuclidTrailSun)
+asset.export(EuclidTrailEarth)
+asset.export(EuclidTrailOrbit)
+asset.export(EuclidTrailCoRevOrbit)
+
+
+
+asset.meta = {
+  Name = "Euclid Trails",
+  Version = "1.0",
+  Description = "This asset contains the trails for the Euclid spacecraft relative to the Earth and the Sun.",
+  Author = "OpenSpace Team",
+  URL = "http://openspaceproject.com",
+  License = "MIT license"
+}
diff --git a/data/profiles/euclid.profile b/data/profiles/euclid.profile
new file mode 100644
index 0000000000..8db9bcf69c
--- /dev/null
+++ b/data/profiles/euclid.profile
@@ -0,0 +1,89 @@
+{
+  "assets": [
+    "base",
+    "base_keybindings",
+    "events/toggle_sun",
+    "scene/solarsystem/telescopes/euclid/euclid",
+    "scene/solarsystem/planets/earth/earth"
+  ],
+  "camera": {
+    "anchor": "Euclid",
+    "type": "goToNode"
+  },
+  "delta_times": [
+    1.0,
+    5.0,
+    30.0,
+    60.0,
+    300.0,
+    1800.0,
+    3600.0,
+    43200.0,
+    86400.0,
+    604800.0,
+    1209600.0,
+    2592000.0,
+    5184000.0,
+    7776000.0,
+    15552000.0,
+    31536000.0,
+    63072000.0,
+    157680000.0,
+    315360000.0,
+    630720000.0
+  ],
+  "mark_nodes": [
+    "Earth",
+    "Sun",
+    "Euclid"
+  ],
+  "meta": {
+    "author": "OpenSpace Team",
+    "description": "A profile showing the trajectory of ESA's Euclid mission",
+    "license": "MIT License",
+    "name": "Euclid",
+    "url": "https://www.openspaceproject.com",
+    "version": "1.0"
+  },
+  "properties": [
+    {
+      "name": "Scene.L2.Renderable.Enabled",
+      "type": "setPropertyValueSingle",
+      "value": "false"
+    },
+    {
+      "name": "Scene.L2Label.Renderable.Enabled",
+      "type": "setPropertyValueSingle",
+      "value": "false"
+    },
+    {
+      "name": "Scene.L2SmallLabel.Renderable.Enabled",
+      "type": "setPropertyValueSingle",
+      "value": "false"
+    },
+    {
+      "name": "Scene.EuclidTrailSun.Renderable.Enabled",
+      "type": "setPropertyValueSingle",
+      "value": "false"
+    },
+    {
+      "name": "Scene.EuclidTrailEarth.Renderable.Enabled",
+      "type": "setPropertyValueSingle",
+      "value": "false"
+    },
+    {
+      "name": "Scene.EuclidTrailOrbit.Renderable.Enabled",
+      "type": "setPropertyValueSingle",
+      "value": "false"
+    }
+  ],
+  "time": {
+    "is_paused": false,
+    "type": "relative",
+    "value": "-1d"
+  },
+  "version": {
+    "major": 1,
+    "minor": 3
+  }
+}

From 6fee06aa4e1eea2c51458f01fd7f2eb022e275c4 Mon Sep 17 00:00:00 2001
From: Alexander Bock <alexander.bock@liu.se>
Date: Tue, 12 Dec 2023 10:57:24 +0100
Subject: [PATCH 208/701] Reorganization of Spice file handling (#2975)

* Fix VideoTileLayer -> VideoTileProvider
* Move kernel loading into spice files
* Define Spice IDs inside assets
* General asset cleanup and organization
---
 data/assets/base_blank.asset                  |   2 +-
 data/assets/global/openspacebookmarks.asset   |   2 +-
 .../digitaluniverse/constellationbounds.asset |   8 +-
 .../dwarf_planets/ceres/kernels.asset         |  40 +-
 .../dwarf_planets/ceres/trail.asset           |  10 +-
 .../dwarf_planets/ceres/transforms.asset      |  16 +-
 .../dwarf_planets/pluto/charon/charon.asset   |  11 +-
 .../pluto/charon/charon_trail.asset           |  10 +-
 .../dwarf_planets/pluto/kernels.asset         |  46 ++-
 .../dwarf_planets/pluto/minor/hydra.asset     |  15 +-
 .../dwarf_planets/pluto/minor/kerberos.asset  |  12 +-
 .../dwarf_planets/pluto/minor/nix.asset       |  12 +-
 .../dwarf_planets/pluto/minor/styx.asset      |  13 +-
 .../dwarf_planets/pluto/pluto.asset           |  10 +-
 .../dwarf_planets/pluto/pluto_trail.asset     |   9 +-
 .../pluto/pluto_trail_kepler.asset            |   2 -
 .../dwarf_planets/pluto/trail.asset           |  14 +-
 .../dwarf_planets/pluto/transforms.asset      |  11 +-
 .../bastille_day/fluxnodeslegend.asset        |   4 -
 .../bastille_day/lightindicator.asset         |   5 +-
 .../missions/apollo/11/apollo11.asset         |  34 +-
 .../missions/apollo/11/kernels.asset          |  33 +-
 .../solarsystem/missions/apollo/11/lem.asset  |   2 +-
 .../missions/apollo/15/apollo15.asset         |  24 +-
 .../missions/apollo/15/kernels.asset          | 100 +----
 .../missions/apollo/8/kernels.asset           |  35 +-
 .../missions/apollo/8/launch_model.asset      |  11 +-
 .../solarsystem/missions/apollo/8/model.asset |  17 +-
 .../missions/apollo/8/trails.asset            |  25 +-
 .../missions/artemis/kernels.asset            |  22 +
 .../solarsystem/missions/artemis/trail.asset  |  28 +-
 .../missions/artemis/transforms.asset         |  26 +-
 .../solarsystem/missions/dawn/dawn.asset      |  76 +---
 .../solarsystem/missions/dawn/kernels.asset   |  89 ++++
 .../solarsystem/missions/dawn/vesta.asset     |  29 +-
 .../solarsystem/missions/insight/edl.asset    |  82 ++--
 .../missions/insight/kernels.asset            |  36 ++
 .../solarsystem/missions/juice/fov/gala.asset |   4 +-
 .../missions/juice/fov/janus.asset            |   4 +-
 .../solarsystem/missions/juice/fov/jmc.asset  |   9 +-
 .../missions/juice/fov/majis.asset            |  28 +-
 .../missions/juice/fov/navcam.asset           |   4 +-
 .../solarsystem/missions/juice/fov/rime.asset |   8 +-
 .../missions/juice/fov/startracker.asset      |  12 +-
 .../solarsystem/missions/juice/fov/swi.asset  |  12 +-
 .../solarsystem/missions/juice/fov/uvs.asset  |   4 +-
 .../solarsystem/missions/juice/kernels.asset  | 123 ++++--
 .../missions/juice/trails/earth.asset         |   9 +-
 .../missions/juice/trails/ganymede.asset      |   9 +-
 .../missions/juice/trails/jupiter.asset       |   9 +-
 .../missions/juice/trails/ssb.asset           |   9 +-
 .../missions/juice/transforms.asset           |  22 +-
 .../solarsystem/missions/juno/juno.asset      |  17 +-
 .../solarsystem/missions/juno/kernels.asset   | 238 ++++++-----
 .../missions/messenger/kernels.asset          |  71 ++--
 .../messenger/mercurymagnetosphere.asset      |   9 +-
 .../missions/messenger/messenger.asset        |  13 +-
 .../missions/newhorizons/charon.asset         |  28 +-
 .../missions/newhorizons/fov.asset            | 129 +++---
 .../missions/newhorizons/kernels.asset        | 105 +++--
 .../missions/newhorizons/pluto.asset          |  67 ++-
 .../missions/newhorizons/trail.asset          |   5 +-
 .../missions/newhorizons/transforms.asset     |  19 +-
 .../missions/osirisrex/bennu.asset            |   8 +-
 .../missions/osirisrex/bennu_projection.asset |  22 +-
 .../missions/osirisrex/dashboard.asset        |   9 +-
 .../missions/osirisrex/imageplane.asset       |   7 +-
 .../missions/osirisrex/kernels.asset          | 240 ++++++-----
 .../missions/osirisrex/model.asset            |  53 ++-
 .../missions/osirisrex/trail.asset            |  18 +-
 .../missions/osirisrex/transforms.asset       |   8 +-
 .../missions/perseverance/kernels.asset       |  50 +++
 .../missions/perseverance/model.asset         |  51 ++-
 .../missions/perseverance/spice.asset         |  26 --
 .../missions/perseverance/trail.asset         |  19 +-
 .../missions/pioneer/pioneer10.asset          |   5 +-
 .../missions/pioneer/pioneer11.asset          |   5 +-
 .../solarsystem/missions/rosetta/67p.asset    |  22 +-
 .../missions/rosetta/dashboard.asset          |   7 +-
 .../missions/rosetta/kernels.asset            |  80 ++++
 .../missions/rosetta/rosetta.asset            |  99 +----
 .../missions/voyager/dashboard.asset          |  13 +-
 .../missions/voyager/voyager1.asset           |  13 +-
 .../planets/earth/eclipse_shadow.asset        |  11 +-
 .../solarsystem/planets/earth/grids.asset     |   9 +-
 .../planets/earth/lagrange_points/l1.asset    |  11 +-
 .../planets/earth/lagrange_points/l2.asset    |  26 +-
 .../planets/earth/lagrange_points/l4.asset    |  12 +-
 .../planets/earth/lagrange_points/l5.asset    |  12 +-
 .../transforms_magnetosphere.asset            |  11 +-
 .../solarsystem/planets/earth/moon/moon.asset |  10 +-
 .../planets/earth/moon/trail.asset            |   9 +-
 .../earth/satellites/misc/hubble_trail.asset  |   5 +-
 .../planets/earth/satellites/misc/iss.asset   |   5 +-
 .../earth/satellites/weather/aqua.asset       |   5 +-
 .../earth/satellites/weather/snpp.asset       |   5 +-
 .../earth/satellites/weather/terra.asset      |   5 +-
 .../solarsystem/planets/earth/trail.asset     |   9 +-
 .../planets/earth/trail_barycenter.asset      |   9 +-
 .../planets/earth/transforms.asset            |  18 +-
 .../planets/jupiter/callisto/callisto.asset   |  22 +-
 .../planets/jupiter/callisto/trail.asset      |  15 +-
 .../planets/jupiter/europa/europa.asset       |  22 +-
 .../planets/jupiter/europa/trail.asset        |  15 +-
 .../planets/jupiter/ganymede/ganymede.asset   |  22 +-
 .../planets/jupiter/ganymede/trail.asset      |  15 +-
 .../solarsystem/planets/jupiter/io/io.asset   |  16 +-
 .../planets/jupiter/io/trail.asset            |  15 +-
 .../solarsystem/planets/jupiter/jupiter.asset |  10 +-
 .../solarsystem/planets/jupiter/kernels.asset |  30 +-
 .../planets/jupiter/kernels344.asset          | 137 +++++++
 .../planets/jupiter/kernels346.asset          |  47 +++
 .../planets/jupiter/minor/ananke_group.asset  | 172 ++++----
 .../planets/jupiter/minor/carme_group.asset   | 236 ++++++-----
 .../planets/jupiter/minor/carpo_group.asset   |  25 +-
 .../planets/jupiter/minor/himalia_group.asset |  84 ++--
 .../planets/jupiter/minor/inner_group.asset   |  41 +-
 .../planets/jupiter/minor/other_groups.asset  |  33 +-
 .../jupiter/minor/pasiphae_group.asset        | 196 +++++----
 .../jupiter/minor/themisto_group.asset        |  17 +-
 .../solarsystem/planets/jupiter/trail.asset   |   9 +-
 .../planets/jupiter/trail_barycenter.asset    |   9 +-
 .../planets/jupiter/trail_earth.asset         |   9 +-
 .../planets/jupiter/transforms.asset          |   6 +-
 .../scene/solarsystem/planets/mars/mars.asset |  10 +-
 .../planets/mars/moons/deimos.asset           |  25 +-
 .../planets/mars/moons/deimos_globe.asset     |  22 +-
 .../planets/mars/moons/kernels.asset          |  33 ++
 .../planets/mars/moons/phobos.asset           |  25 +-
 .../planets/mars/moons/phobos_globe.asset     |  22 +-
 .../solarsystem/planets/mars/trail.asset      |   9 +-
 .../planets/mars/trail_barycenter.asset       |   9 +-
 .../planets/mars/trail_earth.asset            |   9 +-
 .../solarsystem/planets/mars/transforms.asset |   6 +-
 .../solarsystem/planets/mercury/mercury.asset |  10 +-
 .../solarsystem/planets/mercury/trail.asset   |   8 +-
 .../planets/mercury/trail_barycenter.asset    |   9 +-
 .../planets/mercury/trail_earth.asset         |   6 +-
 .../planets/mercury/transforms.asset          |   6 +-
 .../planets/neptune/inner_moons.asset         |  67 ++-
 .../planets/neptune/irregular_moons.asset     |  49 +--
 .../planets/neptune/kernels095.asset          |  53 +++
 .../{kernels.asset => kernels102.asset}       |  22 +-
 .../solarsystem/planets/neptune/neptune.asset |  15 +-
 .../planets/neptune/nereid/nereid.asset       |  20 +-
 .../solarsystem/planets/neptune/trail.asset   |  13 +-
 .../planets/neptune/trail_barycenter.asset    |  14 +-
 .../planets/neptune/trail_earth.asset         |  11 +-
 .../planets/neptune/transforms.asset          |  11 +-
 .../planets/neptune/triton/trail.asset        |  53 ---
 .../planets/neptune/triton/triton.asset       |  22 +-
 .../planets/saturn/dione/dione.asset          |  15 +-
 .../planets/saturn/dione/trail.asset          |  13 +-
 .../planets/saturn/enceladus/enceladus.asset  |  15 +-
 .../planets/saturn/enceladus/trail.asset      |  13 +-
 .../planets/saturn/hyperion/hyperion.asset    |  11 +-
 .../planets/saturn/hyperion/trail.asset       |  14 +-
 .../planets/saturn/iapetus/iapetus.asset      |  15 +-
 .../planets/saturn/iapetus/trail.asset        |  13 +-
 .../solarsystem/planets/saturn/kernels.asset  |  43 +-
 .../planets/saturn/kernels415.asset           |  58 +++
 .../planets/saturn/kernels452.asset           |  91 +++++
 .../planets/saturn/mimas/mimas.asset          |  15 +-
 .../planets/saturn/mimas/trail.asset          |  13 +-
 .../planets/saturn/minor/gallic_group.asset   |  41 +-
 .../planets/saturn/minor/inuit_group.asset    |  73 ++--
 .../planets/saturn/minor/norse_group.asset    | 385 +++++++++---------
 .../planets/saturn/minor/other_group.asset    |  86 ++--
 .../planets/saturn/minor/shepherd_group.asset |  58 +--
 .../planets/saturn/rhea/rhea.asset            |  15 +-
 .../planets/saturn/rhea/trail.asset           |  13 +-
 .../solarsystem/planets/saturn/saturn.asset   |  10 +-
 .../planets/saturn/tethys/tethys.asset        |  15 +-
 .../planets/saturn/tethys/trail.asset         |  13 +-
 .../planets/saturn/titan/titan.asset          |  15 +-
 .../planets/saturn/titan/trail.asset          |  13 +-
 .../solarsystem/planets/saturn/trail.asset    |   7 +-
 .../planets/saturn/trail_barycenter.asset     |   8 +-
 .../planets/saturn/trail_earth.asset          |   9 +-
 .../planets/saturn/transforms.asset           |   6 +-
 .../planets/uranus/inner_moons.asset          | 113 +++--
 .../uranus/irregular_prograde_moons.asset     |  17 +-
 .../uranus/irregular_retrograde_moons.asset   |  73 ++--
 .../solarsystem/planets/uranus/kernels.asset  |  33 +-
 .../planets/uranus/kernels115.asset           |  62 +++
 .../planets/uranus/kernels116.asset           |  41 ++
 .../planets/uranus/major_moons.asset          |  49 +--
 .../solarsystem/planets/uranus/trail.asset    |   7 +-
 .../planets/uranus/trail_barycenter.asset     |   8 +-
 .../planets/uranus/trail_earth.asset          |   9 +-
 .../planets/uranus/transforms.asset           |   6 +-
 .../solarsystem/planets/uranus/uranus.asset   |  10 +-
 .../solarsystem/planets/venus/trail.asset     |   9 +-
 .../planets/venus/trail_barycenter.asset      |   9 +-
 .../planets/venus/trail_earth.asset           |   9 +-
 .../planets/venus/transforms.asset            |   6 +-
 .../solarsystem/planets/venus/venus.asset     |  10 +-
 .../scene/solarsystem/sun/EUV_layer.asset     |   1 -
 data/assets/scene/solarsystem/sun/glare.asset |   1 -
 .../assets/scene/solarsystem/sun/marker.asset |   1 -
 data/assets/scene/solarsystem/sun/sun.asset   |   1 -
 .../scene/solarsystem/sun/transforms.asset    |  22 +-
 .../sun/transforms_heliosphere.asset          |  11 +-
 .../solarsystem/telescopes/gaia/gaia.asset    |   2 +-
 .../solarsystem/telescopes/jwst/jwst.asset    |   1 -
 .../solarsystem/telescopes/jwst/kernels.asset |  22 +
 .../telescopes/jwst/targets/hudf.asset        |   5 +-
 .../telescopes/jwst/timelapse.asset           |   2 +-
 .../solarsystem/telescopes/jwst/trail.asset   |  40 +-
 .../telescopes/jwst/transforms.asset          |  35 +-
 data/assets/spice/base.asset                  |  42 --
 data/assets/spice/core.asset                  | 191 +++++++++
 212 files changed, 3616 insertions(+), 2905 deletions(-)
 create mode 100644 data/assets/scene/solarsystem/missions/artemis/kernels.asset
 create mode 100644 data/assets/scene/solarsystem/missions/dawn/kernels.asset
 create mode 100644 data/assets/scene/solarsystem/missions/insight/kernels.asset
 create mode 100644 data/assets/scene/solarsystem/missions/perseverance/kernels.asset
 delete mode 100644 data/assets/scene/solarsystem/missions/perseverance/spice.asset
 create mode 100644 data/assets/scene/solarsystem/missions/rosetta/kernels.asset
 create mode 100644 data/assets/scene/solarsystem/planets/jupiter/kernels344.asset
 create mode 100644 data/assets/scene/solarsystem/planets/jupiter/kernels346.asset
 create mode 100644 data/assets/scene/solarsystem/planets/mars/moons/kernels.asset
 create mode 100644 data/assets/scene/solarsystem/planets/neptune/kernels095.asset
 rename data/assets/scene/solarsystem/planets/neptune/{kernels.asset => kernels102.asset} (54%)
 delete mode 100644 data/assets/scene/solarsystem/planets/neptune/triton/trail.asset
 create mode 100644 data/assets/scene/solarsystem/planets/saturn/kernels415.asset
 create mode 100644 data/assets/scene/solarsystem/planets/saturn/kernels452.asset
 create mode 100644 data/assets/scene/solarsystem/planets/uranus/kernels115.asset
 create mode 100644 data/assets/scene/solarsystem/planets/uranus/kernels116.asset
 create mode 100644 data/assets/scene/solarsystem/telescopes/jwst/kernels.asset
 delete mode 100644 data/assets/spice/base.asset
 create mode 100644 data/assets/spice/core.asset

diff --git a/data/assets/base_blank.asset b/data/assets/base_blank.asset
index 1f371d2beb..12f43b97ed 100644
--- a/data/assets/base_blank.asset
+++ b/data/assets/base_blank.asset
@@ -1,7 +1,7 @@
 -- This is a blank scene that that just sets up the default menus/dasboard/keys, etc.
 
 -- Specifying which other assets should be loaded in this scene
-asset.require("spice/base")
+asset.require("spice/core")
 
 asset.require("dashboard/default_dashboard")
 -- Load default key bindings applicable to most scenes
diff --git a/data/assets/global/openspacebookmarks.asset b/data/assets/global/openspacebookmarks.asset
index bf554226c1..8c95d8af1b 100644
--- a/data/assets/global/openspacebookmarks.asset
+++ b/data/assets/global/openspacebookmarks.asset
@@ -7,7 +7,7 @@ local bookmarksCSV = asset.resource({
   Name = "OpenSpace Bookmarks",
   Type = "UrlSynchronization",
   UseHash = false,
-  SecondsUntilResync = 0
+  SecondsUntilResync = 0,
   Url = dataProvider
 })
 
diff --git a/data/assets/scene/digitaluniverse/constellationbounds.asset b/data/assets/scene/digitaluniverse/constellationbounds.asset
index 892b38b156..39d9910e07 100644
--- a/data/assets/scene/digitaluniverse/constellationbounds.asset
+++ b/data/assets/scene/digitaluniverse/constellationbounds.asset
@@ -1,3 +1,7 @@
+local coreKernels = asset.require("spice/core")
+
+
+
 local data = asset.resource({
   Name = "Constellation Files",
   Type = "HttpSynchronization",
@@ -22,8 +26,8 @@ local Object = {
   Transform = {
     Rotation = {
       Type = "SpiceRotation",
-      SourceFrame = "J2000",
-      DestinationFrame = "GALACTIC"
+      SourceFrame = coreKernels.Frame.J2000,
+      DestinationFrame = coreKernels.Frame.Galactic
     },
     Scale = {
       Type = "StaticScale",
diff --git a/data/assets/scene/solarsystem/dwarf_planets/ceres/kernels.asset b/data/assets/scene/solarsystem/dwarf_planets/ceres/kernels.asset
index bc0488e33f..2a901039f9 100644
--- a/data/assets/scene/solarsystem/dwarf_planets/ceres/kernels.asset
+++ b/data/assets/scene/solarsystem/dwarf_planets/ceres/kernels.asset
@@ -1,18 +1,40 @@
-local kernels = asset.resource({
+local coreKernels = asset.require("spice/core")
+
+
+
+local data = asset.resource({
   Name = "Ceres Kernels",
   Type = "HttpSynchronization",
   Identifier = "ceres_kernels",
   Version = 1
 })
 
-asset.export(
-  "CeresKernels",
-  {
-    kernels .. "ceres_v01.tpc",
-    kernels .. "sb_ceres_140724.bsp",
-    kernels .. "sb_ceres_110211.bsp"
-  }
-)
+
+local kernels = {
+  data .. "ceres_v01.tpc",
+  data .. "sb_ceres_140724.bsp",
+  data .. "sb_ceres_110211.bsp"
+}
+
+local ID = {
+  Ceres = "CERES"
+}
+
+local Frame = {
+  Ceres = coreKernels.Frame.Ceres
+}
+
+
+asset.onInitialize(function()
+  openspace.spice.loadKernel(kernels)
+end)
+
+asset.onDeinitialize(function()
+  openspace.spice.unloadKernel(kernels)
+end)
+
+asset.export("ID", ID)
+asset.export("Frame", Frame)
 
 
 
diff --git a/data/assets/scene/solarsystem/dwarf_planets/ceres/trail.asset b/data/assets/scene/solarsystem/dwarf_planets/ceres/trail.asset
index bc6cbaaccf..58d0a66228 100644
--- a/data/assets/scene/solarsystem/dwarf_planets/ceres/trail.asset
+++ b/data/assets/scene/solarsystem/dwarf_planets/ceres/trail.asset
@@ -1,6 +1,6 @@
 local transforms = asset.require("scene/solarsystem/sun/transforms")
 local kernels = asset.require("./kernels")
-asset.require("spice/base")
+local coreKernels = asset.require("spice/core")
 
 
 
@@ -11,8 +11,8 @@ local CeresTrail = {
     Type = "RenderableTrailOrbit",
     Translation = {
       Type = "SpiceTranslation",
-      Target = "CERES",
-      Observer = "SSB"
+      Target = kernels.ID.Ceres,
+      Observer = coreKernels.ID.SolarSystemBarycenter
     },
     Color = { 0.2, 0.8, 0.3 },
     Period = 1680,
@@ -27,15 +27,11 @@ local CeresTrail = {
 
 
 asset.onInitialize(function()
-  openspace.spice.loadKernel(kernels.CeresKernels)
-
   openspace.addSceneGraphNode(CeresTrail)
 end)
 
 asset.onDeinitialize(function()
   openspace.removeSceneGraphNode(CeresTrail)
-
-  openspace.spice.unloadKernel(kernels.CeresKernels)
 end)
 
 asset.export(CeresTrail)
diff --git a/data/assets/scene/solarsystem/dwarf_planets/ceres/transforms.asset b/data/assets/scene/solarsystem/dwarf_planets/ceres/transforms.asset
index 510131b2de..5a778e8c13 100644
--- a/data/assets/scene/solarsystem/dwarf_planets/ceres/transforms.asset
+++ b/data/assets/scene/solarsystem/dwarf_planets/ceres/transforms.asset
@@ -1,6 +1,8 @@
 local transforms = asset.require("scene/solarsystem/sun/transforms")
 local kernels = asset.require("./kernels")
-asset.require("spice/base")
+local coreKernels = asset.require("spice/core")
+
+
 
 local CeresPosition = {
   Identifier = "CeresPosition",
@@ -8,13 +10,13 @@ local CeresPosition = {
   Transform = {
     Translation = {
       Type = "SpiceTranslation",
-      Target = "CERES",
-      Observer = "SSB"
+      Target = kernels.ID.Ceres,
+      Observer = coreKernels.ID.SolarSystemBarycenter
     },
     Rotation = {
       Type = "SpiceRotation",
-      SourceFrame = "IAU_CERES",
-      DestinationFrame = "GALACTIC"
+      SourceFrame = kernels.Frame.Ceres,
+      DestinationFrame = coreKernels.Frame.Galactic
     }
   },
   GUI = {
@@ -26,15 +28,11 @@ local CeresPosition = {
 
 
 asset.onInitialize(function()
-  openspace.spice.loadKernel(kernels.CeresKernels)
-
   openspace.addSceneGraphNode(CeresPosition)
 end)
 
 asset.onDeinitialize(function()
   openspace.removeSceneGraphNode(CeresPosition)
-
-  openspace.spice.unloadKernel(kernels.CeresKernels)
 end)
 
 asset.export(CeresPosition)
diff --git a/data/assets/scene/solarsystem/dwarf_planets/pluto/charon/charon.asset b/data/assets/scene/solarsystem/dwarf_planets/pluto/charon/charon.asset
index f5ae2edd82..f08c0da15e 100644
--- a/data/assets/scene/solarsystem/dwarf_planets/pluto/charon/charon.asset
+++ b/data/assets/scene/solarsystem/dwarf_planets/pluto/charon/charon.asset
@@ -1,6 +1,7 @@
 local transforms = asset.require("../transforms")
-asset.require("spice/base")
 asset.require("../trail")
+local kernels = asset.require("../kernels")
+local coreKernels = asset.require("spice/core")
 
 
 
@@ -17,13 +18,13 @@ local Charon = {
   Transform = {
     Translation = {
       Type = "SpiceTranslation",
-      Target = "CHARON",
-      Observer = "PLUTO BARYCENTER"
+      Target = kernels.ID.Charon,
+      Observer = kernels.ID.PlutoBarycenter
     },
     Rotation = {
       Type = "SpiceRotation",
-      SourceFrame = "IAU_CHARON",
-      DestinationFrame = "GALACTIC"
+      SourceFrame = kernels.Frame.Charon,
+      DestinationFrame = coreKernels.Frame.Galactic
     }
   },
   Renderable = {
diff --git a/data/assets/scene/solarsystem/dwarf_planets/pluto/charon/charon_trail.asset b/data/assets/scene/solarsystem/dwarf_planets/pluto/charon/charon_trail.asset
index d24adb6466..471971a723 100644
--- a/data/assets/scene/solarsystem/dwarf_planets/pluto/charon/charon_trail.asset
+++ b/data/assets/scene/solarsystem/dwarf_planets/pluto/charon/charon_trail.asset
@@ -1,6 +1,5 @@
 local transforms = asset.require("../transforms")
-asset.require("spice/base")
-
+local kernels = asset.require("../kernels")
 
 
 local CharonBarycentricTrail = {
@@ -10,8 +9,8 @@ local CharonBarycentricTrail = {
     Type = "RenderableTrailOrbit",
     Translation = {
       Type = "SpiceTranslation",
-      Target = "CHARON",
-      Observer = "PLUTO BARYCENTER"
+      Target = kernels.ID.Charon,
+      Observer = kernels.ID.PlutoBarycenter
     },
     Color = { 0.00, 0.62, 1.00 },
     Period = 6.38723,
@@ -46,8 +45,7 @@ asset.export(CharonBarycentricTrail)
 asset.meta = {
   Name = "Charon Barycentric Trail",
   Version = "1.0",
-  Description = [[Trail of Charon as observed by Pluto Barycenter. Data from
-    NASA Spice (see base spice asset)]],
+  Description = "Trail of Charon as observed by Pluto Barycenter",
   Author = "OpenSpace Team",
   URL = "http://openspaceproject.com",
   License = "MIT license"
diff --git a/data/assets/scene/solarsystem/dwarf_planets/pluto/kernels.asset b/data/assets/scene/solarsystem/dwarf_planets/pluto/kernels.asset
index b4dfc571e6..4e2c7ae1b7 100644
--- a/data/assets/scene/solarsystem/dwarf_planets/pluto/kernels.asset
+++ b/data/assets/scene/solarsystem/dwarf_planets/pluto/kernels.asset
@@ -1,17 +1,51 @@
-local kernels = asset.resource({
+local coreKernels = asset.require("spice/core")
+
+
+
+local data = asset.resource({
   Name = "Pluto Kernels",
   Type = "HttpSynchronization",
   Identifier = "pluto_kernels",
   Version = 1
 })
 
-local PlutoKernels = {
-  kernels .. "NavPE_de433_od122.bsp",
-  kernels .. "NavSE_plu047_od122.bsp",
-  kernels .. "ssd_jpl_nasa_gov_plu043.bsp"
+
+local kernels = {
+  data .. "NavPE_de433_od122.bsp",
+  data .. "NavSE_plu047_od122.bsp",
+  data .. "ssd_jpl_nasa_gov_plu043.bsp"
 }
 
-asset.export("PlutoKernels", PlutoKernels)
+local ID = {
+  PlutoBarycenter = coreKernels.ID.PlutoBarycenter,
+  Charon = "CHARON",
+  Hydra = "HYDRA",
+  Styx = "STYX",
+  Nix = "NIX",
+  Kerberos = "KERBEROS",
+  Pluto = coreKernels.ID.Pluto
+}
+
+local Frame = {
+  Pluto = coreKernels.Frame.Pluto,
+  Charon = coreKernels.Frame.Charon,
+  Hydra = coreKernels.Frame.Hydra,
+  Styx = coreKernels.Frame.Styx,
+  Nix = coreKernels.Frame.Nix,
+  Kerberos = coreKernels.Frame.Kerberos
+}
+
+
+asset.onInitialize(function()
+  openspace.spice.loadKernel(kernels)
+end)
+
+asset.onDeinitialize(function()
+  openspace.spice.unloadKernel(kernels)
+end)
+
+asset.export("ID", ID)
+asset.export("Frame", Frame)
 
 
 
diff --git a/data/assets/scene/solarsystem/dwarf_planets/pluto/minor/hydra.asset b/data/assets/scene/solarsystem/dwarf_planets/pluto/minor/hydra.asset
index 463d27575e..f41c15e100 100644
--- a/data/assets/scene/solarsystem/dwarf_planets/pluto/minor/hydra.asset
+++ b/data/assets/scene/solarsystem/dwarf_planets/pluto/minor/hydra.asset
@@ -9,8 +9,8 @@ local Hydra = {
   Transform = {
     Translation = {
       Type = "SpiceTranslation",
-      Target = "HYDRA",
-      Observer = "PLUTO BARYCENTER"
+      Target = kernels.ID.Hydra,
+      Observer = kernels.ID.PlutoBarycenter
     }
   },
   Renderable = {
@@ -32,8 +32,8 @@ local HydraTrail = {
     Type = "RenderableTrailOrbit",
     Translation = {
       Type = "SpiceTranslation",
-      Target = "HYDRA",
-      Observer = "PLUTO BARYCENTER",
+      Target = kernels.ID.Hydra,
+      Observer = kernels.ID.PlutoBarycenter
     },
     Color = { 0.00, 0.62, 1.00 },
     Period = 38.20177,
@@ -79,8 +79,6 @@ local HydraLabel = {
 
 
 asset.onInitialize(function()
-  openspace.spice.loadKernel(kernels.PlutoKernels)
-
   openspace.addSceneGraphNode(Hydra)
   openspace.addSceneGraphNode(HydraTrail)
   openspace.addSceneGraphNode(HydraLabel)
@@ -90,8 +88,6 @@ asset.onDeinitialize(function()
   openspace.removeSceneGraphNode(HydraLabel)
   openspace.removeSceneGraphNode(HydraTrail)
   openspace.removeSceneGraphNode(Hydra)
-
-  openspace.spice.unloadKernel(kernels.PlutoKernels)
 end)
 
 asset.export(Hydra)
@@ -102,8 +98,7 @@ asset.export(HydraTrail)
 asset.meta = {
   Name = "Hydra",
   Version = "1.0",
-  Description = [[Globe and trail for Pluto's moon Hydra. Data from NASA Spice (see base
-    spice asset)]],
+  Description = "Globe and trail for Pluto's moon Hydra",
   Author = "OpenSpace Team",
   URL = "http://openspaceproject.com",
   License = "MIT license"
diff --git a/data/assets/scene/solarsystem/dwarf_planets/pluto/minor/kerberos.asset b/data/assets/scene/solarsystem/dwarf_planets/pluto/minor/kerberos.asset
index a337b494cf..086060ddef 100644
--- a/data/assets/scene/solarsystem/dwarf_planets/pluto/minor/kerberos.asset
+++ b/data/assets/scene/solarsystem/dwarf_planets/pluto/minor/kerberos.asset
@@ -1,4 +1,5 @@
 local transforms = asset.require("../transforms")
+local kernels = asset.require("../kernels")
 
 
 
@@ -8,8 +9,8 @@ local Kerberos = {
   Transform = {
     Translation = {
       Type = "SpiceTranslation",
-      Target = "KERBEROS",
-      Observer = "PLUTO BARYCENTER"
+      Target = kernels.ID.Kerberos,
+      Observer = kernels.ID.PlutoBarycenter
     }
   },
   Renderable = {
@@ -31,8 +32,8 @@ local KerberosTrail = {
     Type = "RenderableTrailOrbit",
     Translation = {
       Type = "SpiceTranslation",
-      Target = "KERBEROS",
-      Observer = "PLUTO BARYCENTER",
+      Target = kernels.ID.Kerberos,
+      Observer = kernels.ID.PlutoBarycenter
     },
     Color = { 0.00, 0.62, 1.00 },
     Period = 32.16756,
@@ -98,8 +99,7 @@ asset.export(KerberosLabel)
 asset.meta = {
   Name = "Kerberos",
   Version = "1.0",
-  Description = [[Globe and trail for Pluto's moon Kerberos. Data from NASA Spice (see
-    base spice asset)]],
+  Description = "Globe and trail for Pluto's moon Kerberos",
   Author = "OpenSpace Team",
   URL = "http://openspaceproject.com",
   License = "MIT license"
diff --git a/data/assets/scene/solarsystem/dwarf_planets/pluto/minor/nix.asset b/data/assets/scene/solarsystem/dwarf_planets/pluto/minor/nix.asset
index 2baada586a..9fe7fede30 100644
--- a/data/assets/scene/solarsystem/dwarf_planets/pluto/minor/nix.asset
+++ b/data/assets/scene/solarsystem/dwarf_planets/pluto/minor/nix.asset
@@ -1,4 +1,5 @@
 local transforms = asset.require("../transforms")
+local kernels = asset.require("../kernels")
 
 
 
@@ -8,8 +9,8 @@ local Nix = {
   Transform = {
     Translation = {
       Type = "SpiceTranslation",
-      Target = "NIX",
-      Observer = "PLUTO BARYCENTER"
+      Target = kernels.ID.Nix,
+      Observer = kernels.ID.PlutoBarycenter
     }
   },
   Renderable = {
@@ -31,8 +32,8 @@ local NixTrail = {
     Type = "RenderableTrailOrbit",
     Translation = {
       Type = "SpiceTranslation",
-      Target = "NIX",
-      Observer = "PLUTO BARYCENTER",
+      Target = kernels.ID.Nix,
+      Observer = kernels.ID.PlutoBarycenter
     },
     Color = { 0.00, 0.62, 1.00 },
     Period = 24.85463,
@@ -98,8 +99,7 @@ asset.export(NixLabel)
 asset.meta = {
   Name = "Nix",
   Version = "1.0",
-  Description = [[Globe and trail for Pluto's moon Nix. Data from NASA Spice (see base
-    spice asset)]],
+  Description = "Globe and trail for Pluto's moon Nix",
   Author = "OpenSpace Team",
   URL = "http://openspaceproject.com",
   License = "MIT license"
diff --git a/data/assets/scene/solarsystem/dwarf_planets/pluto/minor/styx.asset b/data/assets/scene/solarsystem/dwarf_planets/pluto/minor/styx.asset
index ac6549056e..65285bd6c7 100644
--- a/data/assets/scene/solarsystem/dwarf_planets/pluto/minor/styx.asset
+++ b/data/assets/scene/solarsystem/dwarf_planets/pluto/minor/styx.asset
@@ -1,4 +1,6 @@
 local transforms = asset.require("../transforms")
+local kernels = asset.require("../kernels")
+
 
 
 local Styx = {
@@ -7,8 +9,8 @@ local Styx = {
   Transform = {
     Translation = {
       Type = "SpiceTranslation",
-      Target = "STYX",
-      Observer = "PLUTO BARYCENTER"
+      Target = kernels.ID.Styx,
+      Observer = kernels.ID.PlutoBarycenter
     }
   },
   Renderable = {
@@ -30,8 +32,8 @@ local StyxTrail = {
     Type = "RenderableTrailOrbit",
     Translation = {
       Type = "SpiceTranslation",
-      Target = "STYX",
-      Observer = "PLUTO BARYCENTER",
+      Target = kernels.ID.Styx,
+      Observer = kernels.ID.PlutoBarycenter
     },
     Color = { 0.00, 0.62, 1.00 },
     Period = 20.16155,
@@ -97,8 +99,7 @@ asset.export(StyxLabel)
 asset.meta = {
   Name = "Styx",
   Version = "1.0",
-  Description = [[Globe and trail for Pluto's moon Styx. Data from NASA Spice (see base
-    spice asset)]],
+  Description = "Globe and trail for Pluto's moon Styx",
   Author = "OpenSpace Team",
   URL = "http://openspaceproject.com",
   License = "MIT license"
diff --git a/data/assets/scene/solarsystem/dwarf_planets/pluto/pluto.asset b/data/assets/scene/solarsystem/dwarf_planets/pluto/pluto.asset
index bdeff0a895..6c720107f6 100644
--- a/data/assets/scene/solarsystem/dwarf_planets/pluto/pluto.asset
+++ b/data/assets/scene/solarsystem/dwarf_planets/pluto/pluto.asset
@@ -1,5 +1,5 @@
 local transforms = asset.require("./transforms")
-asset.require("spice/base")
+local coreKernels = asset.require("spice/core")
 asset.require("./trail")
 
 
@@ -18,13 +18,13 @@ local Pluto = {
   Transform = {
     Translation = {
       Type = "SpiceTranslation",
-      Target = "PLUTO",
-      Observer = "PLUTO BARYCENTER"
+      Target = coreKernels.ID.Pluto,
+      Observer = coreKernels.ID.PlutoBarycenter
     },
     Rotation = {
       Type = "SpiceRotation",
-      SourceFrame = "IAU_PLUTO",
-      DestinationFrame = "GALACTIC"
+      SourceFrame = coreKernels.Frame.Pluto,
+      DestinationFrame = coreKernels.Frame.Galactic
     }
   },
   Renderable = {
diff --git a/data/assets/scene/solarsystem/dwarf_planets/pluto/pluto_trail.asset b/data/assets/scene/solarsystem/dwarf_planets/pluto/pluto_trail.asset
index 44eec87c01..da4367d2c5 100644
--- a/data/assets/scene/solarsystem/dwarf_planets/pluto/pluto_trail.asset
+++ b/data/assets/scene/solarsystem/dwarf_planets/pluto/pluto_trail.asset
@@ -1,5 +1,5 @@
 local transforms = asset.require("./transforms")
-asset.require("spice/base")
+local coreKernels = asset.require("spice/core")
 
 
 
@@ -10,8 +10,8 @@ local PlutoTrailBarycentric = {
     Type = "RenderableTrailOrbit",
     Translation = {
       Type = "SpiceTranslation",
-      Target = "PLUTO",
-      Observer = "PLUTO BARYCENTER"
+      Target = coreKernels.ID.Pluto,
+      Observer = coreKernels.ID.PlutoBarycenter
     },
     Color = { 0.00, 0.62, 1.00 },
     Period = 6.38723,
@@ -41,8 +41,7 @@ asset.export(PlutoTrailBarycentric)
 asset.meta = {
   Name = "Pluto Barycentric Trail",
   Version = "1.0",
-  Description = [[Trail of Pluto as observed by it's Barrycenter. Data from NASA Spice
-    (see base spice asset)]],
+  Description = "Trail of Pluto as observed by its Barycenter",
   Author = "OpenSpace Team",
   URL = "http://openspaceproject.com",
   License = "MIT license"
diff --git a/data/assets/scene/solarsystem/dwarf_planets/pluto/pluto_trail_kepler.asset b/data/assets/scene/solarsystem/dwarf_planets/pluto/pluto_trail_kepler.asset
index 92cb24cf89..cffe0b9fac 100644
--- a/data/assets/scene/solarsystem/dwarf_planets/pluto/pluto_trail_kepler.asset
+++ b/data/assets/scene/solarsystem/dwarf_planets/pluto/pluto_trail_kepler.asset
@@ -1,6 +1,4 @@
 local transforms = asset.require("scene/solarsystem/sun/transforms")
-local kernels = asset.require("./kernels").PlutoKernels
-asset.require("spice/base")
 
 
 
diff --git a/data/assets/scene/solarsystem/dwarf_planets/pluto/trail.asset b/data/assets/scene/solarsystem/dwarf_planets/pluto/trail.asset
index ef1632c31c..c468223b9f 100644
--- a/data/assets/scene/solarsystem/dwarf_planets/pluto/trail.asset
+++ b/data/assets/scene/solarsystem/dwarf_planets/pluto/trail.asset
@@ -1,6 +1,5 @@
 local transforms = asset.require("scene/solarsystem/sun/transforms")
-local kernels = asset.require("./kernels")
-asset.require("spice/base")
+local coreKernels = asset.require("spice/core")
 
 
 
@@ -11,8 +10,8 @@ local PlutoBarycenterTrail = {
     Type = "RenderableTrailOrbit",
     Translation = {
       Type = "SpiceTranslation",
-      Target = "PLUTO BARYCENTER",
-      Observer = "SSB"
+      Target = coreKernels.ID.PlutoBarycenter,
+      Observer = coreKernels.ID.SolarSystemBarycenter
     },
     Color = { 0.3, 0.7, 0.3 },
     Period = 365.25,
@@ -29,15 +28,11 @@ local PlutoBarycenterTrail = {
 
 
 asset.onInitialize(function()
-  openspace.spice.loadKernel(kernels.PlutoKernels)
-
   openspace.addSceneGraphNode(PlutoBarycenterTrail)
 end)
 
 asset.onDeinitialize(function()
   openspace.removeSceneGraphNode(PlutoBarycenterTrail)
-
-  openspace.spice.unloadKernel(kernels.PlutoKernels)
 end)
 
 asset.export(PlutoBarycenterTrail)
@@ -47,8 +42,7 @@ asset.export(PlutoBarycenterTrail)
 asset.meta = {
   Name = "Pluto Barycenter Trail",
   Version = "1.0",
-  Description = [[Trail of Pluto Barycenter as observed by the Sun. Data from NASA Spice
-    (see base spice asset)]],
+  Description = "Trail of Pluto Barycenter as observed by the Sun",
   Author = "OpenSpace Team",
   URL = "http://openspaceproject.com",
   License = "MIT license"
diff --git a/data/assets/scene/solarsystem/dwarf_planets/pluto/transforms.asset b/data/assets/scene/solarsystem/dwarf_planets/pluto/transforms.asset
index 58c15ccaed..ae5b779e88 100644
--- a/data/assets/scene/solarsystem/dwarf_planets/pluto/transforms.asset
+++ b/data/assets/scene/solarsystem/dwarf_planets/pluto/transforms.asset
@@ -1,6 +1,5 @@
 local transforms = asset.require("scene/solarsystem/sun/transforms")
-local kernels = asset.require("./kernels")
-asset.require("spice/base")
+local coreKernels = asset.require("spice/core")
 
 
 
@@ -10,8 +9,8 @@ local PlutoBarycenter = {
   Transform = {
     Translation = {
       Type = "SpiceTranslation",
-      Target = "PLUTO BARYCENTER",
-      Observer = "SSB"
+      Target = coreKernels.ID.PlutoBarycenter,
+      Observer = coreKernels.ID.SolarSystemBarycenter
     }
   },
   GUI = {
@@ -22,15 +21,11 @@ local PlutoBarycenter = {
 
 
 asset.onInitialize(function()
-  openspace.spice.loadKernel(kernels.PlutoKernels)
-
   openspace.addSceneGraphNode(PlutoBarycenter)
 end)
 
 asset.onDeinitialize(function()
   openspace.removeSceneGraphNode(PlutoBarycenter)
-
-  openspace.spice.unloadKernel(kernels.PlutoKernels)
 end)
 
 asset.export(PlutoBarycenter)
diff --git a/data/assets/scene/solarsystem/heliosphere/bastille_day/fluxnodeslegend.asset b/data/assets/scene/solarsystem/heliosphere/bastille_day/fluxnodeslegend.asset
index 1f0fd9ede1..696976215e 100644
--- a/data/assets/scene/solarsystem/heliosphere/bastille_day/fluxnodeslegend.asset
+++ b/data/assets/scene/solarsystem/heliosphere/bastille_day/fluxnodeslegend.asset
@@ -1,7 +1,3 @@
-asset.require("spice/base")
-
-
-
 local TexturesPath = asset.resource({
   Type = "HttpSynchronization",
   Name = "Streamnodes textures",
diff --git a/data/assets/scene/solarsystem/heliosphere/bastille_day/lightindicator.asset b/data/assets/scene/solarsystem/heliosphere/bastille_day/lightindicator.asset
index bcba565b53..eeac33b452 100644
--- a/data/assets/scene/solarsystem/heliosphere/bastille_day/lightindicator.asset
+++ b/data/assets/scene/solarsystem/heliosphere/bastille_day/lightindicator.asset
@@ -1,5 +1,6 @@
 local sunTransforms = asset.require("scene/solarsystem/sun/transforms")
 local earthTransforms = asset.require("scene/solarsystem/planets/earth/transforms")
+local coreKernels = asset.require("spice/core")
 
 
 
@@ -13,8 +14,8 @@ local TravelSpeedIndicator = {
   Transform = {
     Translation = {
       Type = "SpiceTranslation",
-      Target = "SUN",
-      Observer = "SSB"
+      Target = coreKernels.ID.Sun,
+      Observer = coreKernels.ID.SolarSystemBarycenter
     }
   },
   Renderable = {
diff --git a/data/assets/scene/solarsystem/missions/apollo/11/apollo11.asset b/data/assets/scene/solarsystem/missions/apollo/11/apollo11.asset
index 9b09298bad..94bc748185 100644
--- a/data/assets/scene/solarsystem/missions/apollo/11/apollo11.asset
+++ b/data/assets/scene/solarsystem/missions/apollo/11/apollo11.asset
@@ -1,4 +1,3 @@
-asset.require("spice/base")
 asset.require("../actions")
 asset.require("./actions")
 local sun = asset.require("scene/solarsystem/sun/sun")
@@ -6,6 +5,7 @@ local moonTransforms = asset.require("scene/solarsystem/planets/earth/moon/moon"
 local descentKeyframes = asset.require("./lem_descent")
 local descentRotationKeyframes = asset.require("./lem_descent_rotation")
 local kernels = asset.require("./kernels")
+local coreKernels = asset.require("spice/core")
 
 
 
@@ -25,8 +25,6 @@ local lemModel = asset.resource({
 
 
 --landing - 1969-07-20T20:17:40
-local ApolloSpiceId = -911
-local ApolloLemSpiceId = -911500
 
 local Apollo11Position = {
   Identifier = "Apollo11Position",
@@ -39,15 +37,15 @@ local Apollo11Position = {
   Transform = {
     Translation = {
       Type = "SpiceTranslation",
-      Target = ApolloSpiceId,
-      Observer = "MOON",
-      Frame = "MOON_ME"
+      Target = kernels.ID.Apollo11,
+      Observer = coreKernels.ID.Moon,
+      Frame = kernels.ID.MoonME
     }
   },
   GUI = {
-    Hidden = true,
     Name = "Apollo 11",
-    Path = "/Solar System/Missions/Apollo/11"
+    Path = "/Solar System/Missions/Apollo/11",
+    Hidden = true
   }
 }
 
@@ -91,9 +89,9 @@ local Apollo11MoonTrail = {
     Enabled = false,
     Translation = {
       Type = "SpiceTranslation",
-      Target = ApolloSpiceId,
-      Observer = "MOON",
-      Frame = "IAU_MOON"
+      Target = kernels.ID.Apollo11,
+      Observer = coreKernels.ID.Moon,
+      Frame = coreKernels.Frame.Moon
     },
     Color = { 0.180000,0.510000,0.750000 },
     StartTime = "1969 JUL 19 19:38:29.183",
@@ -116,9 +114,9 @@ local lemTranslation = {
     -- a 10s linear transition to the location where the descentKeyframes start.
     ["1969 JUL 20 20:14:30"] = {
       Type = "SpiceTranslation",
-      Target = ApolloLemSpiceId,
-      Observer = "MOON",
-      Frame = "IAU_MOON"
+      Target = kernels.ID.Apollo11LEM,
+      Observer = coreKernels.ID.Moon,
+      Frame = coreKernels.Frame.Moon
     },
     ["1969 JUL 20 20:14:40"] = {
       Type = "TimelineTranslation",
@@ -139,13 +137,13 @@ local Apollo11LemTrail = {
   Parent = moonTransforms.Moon.Identifier,
   Renderable = {
     Type = "RenderableTrailTrajectory",
+    Enabled = false,
     Translation = lemTranslation,
     Color = { 0.780000,0.940000,0.340000 },
     StartTime = "1969 JUL 20 19:10:25.183",
     EndTime = "1969 JUL 20 20:17:46.183",
     SampleInterval = 2,
-    EnableFade = false,
-    Enabled = false
+    EnableFade = false
   },
   GUI = {
     Name = "Apollo 11 Lunar Lander Trail",
@@ -240,8 +238,6 @@ local Apollo11LemLandedModel = {
 
 
 asset.onInitialize(function()
-  openspace.spice.loadKernel(kernels.kernels)
-
   openspace.addSceneGraphNode(Apollo11Position)
   openspace.addSceneGraphNode(Apollo11LemPosition)
   openspace.addSceneGraphNode(Apollo11Model)
@@ -259,8 +255,6 @@ asset.onDeinitialize(function()
   openspace.removeSceneGraphNode(Apollo11Model)
   openspace.removeSceneGraphNode(Apollo11LemPosition)
   openspace.removeSceneGraphNode(Apollo11Position)
-
-  openspace.spice.unloadKernel(kernels.kernels)
 end)
 
 asset.export(Apollo11Position)
diff --git a/data/assets/scene/solarsystem/missions/apollo/11/kernels.asset b/data/assets/scene/solarsystem/missions/apollo/11/kernels.asset
index 819532dae2..7a7e60f90b 100644
--- a/data/assets/scene/solarsystem/missions/apollo/11/kernels.asset
+++ b/data/assets/scene/solarsystem/missions/apollo/11/kernels.asset
@@ -1,4 +1,4 @@
-local kernelsFolder = asset.resource({
+local data = asset.resource({
   Name = "Apollo Kernels",
   Type = "HttpSynchronization",
   Identifier = "apollo_11_spice",
@@ -7,11 +7,30 @@ local kernelsFolder = asset.resource({
 
 
 local kernels = {
-  kernelsFolder .. "moon_080317.tf",
-  kernelsFolder .. "apollo_naif_ids.tf",
-  kernelsFolder .. "moon_pa_de421_1900-2050.bpc",
-  kernelsFolder .. "apollo11_orbits_full9km.bsp",
-  kernelsFolder .. "apollo11_orbits_lm9km.bsp"
+  data .. "moon_080317.tf",
+  data .. "apollo_naif_ids.tf",
+  data .. "moon_pa_de421_1900-2050.bpc",
+  data .. "apollo11_orbits_full9km.bsp",
+  data .. "apollo11_orbits_lm9km.bsp"
 }
 
-asset.export("kernels", kernels)
+local ID = {
+  Apollo11 = -911,
+  Apollo11LEM = -911500
+}
+
+local Frame = {
+  MoonME = "MOON_ME"
+}
+
+
+asset.onInitialize(function()
+  openspace.spice.loadKernel(kernels)
+end)
+
+asset.onDeinitialize(function()
+  openspace.spice.unloadKernel(kernels)
+end)
+
+asset.export("ID", ID)
+asset.export("Frame", Frame)
diff --git a/data/assets/scene/solarsystem/missions/apollo/11/lem.asset b/data/assets/scene/solarsystem/missions/apollo/11/lem.asset
index 0c6e953ef1..74e36012d0 100644
--- a/data/assets/scene/solarsystem/missions/apollo/11/lem.asset
+++ b/data/assets/scene/solarsystem/missions/apollo/11/lem.asset
@@ -18,7 +18,7 @@ local Apollo11Lem = {
     Translation = {
       Type = "GlobeTranslation",
       Globe = moon_asset.Moon.Identifier,
-      Longitude = -360+23.47306,
+      Longitude = -360 + 23.47306,
       Latitude = 0.67402,
       Altitude = -1927.65,
       UseHeightMap = false
diff --git a/data/assets/scene/solarsystem/missions/apollo/15/apollo15.asset b/data/assets/scene/solarsystem/missions/apollo/15/apollo15.asset
index 8dfc61ccab..cf6ee7602f 100644
--- a/data/assets/scene/solarsystem/missions/apollo/15/apollo15.asset
+++ b/data/assets/scene/solarsystem/missions/apollo/15/apollo15.asset
@@ -1,8 +1,8 @@
-asset.require("spice/base")
 asset.require("../actions")
 local moonTransforms = asset.require("scene/solarsystem/planets/earth/moon/moon")
 local sun = asset.require("scene/solarsystem/sun/sun")
-local kernels = asset.require("scene/solarsystem/missions/apollo/15/kernels")
+local kernels = asset.require("./kernels")
+local coreKernels = asset.require("spice/core")
 
 
 
@@ -20,14 +20,14 @@ local Apollo15 = {
   Transform = {
     Translation = {
       Type = "SpiceTranslation",
-      Target = "APOLLO 15",
-      Observer = "MOON",
-      Frame = "IAU_MOON"
+      Target = kernels.ID.Apollo15,
+      Observer = coreKernels.ID.Moon,
+      Frame = coreKernels.Frame.Moon
     },
     Rotation = {
       Type = "SpiceRotation",
-      SourceFrame = "A15_METRIC",
-      DestinationFrame = "GALACTIC"
+      SourceFrame = kernels.ID.Apollo15Metric,
+      DestinationFrame = coreKernels.Frame.Galactic
     }
   },
   Renderable = {
@@ -57,9 +57,9 @@ local Apollo15Trail = {
     Type = "RenderableTrailTrajectory",
     Translation = {
       Type = "SpiceTranslation",
-      Target = "APOLLO 15",
-      Observer = "MOON",
-      Frame = "IAU_MOON"
+      Target = kernels.ID.Apollo15,
+      Observer = coreKernels.ID.Moon,
+      Frame = coreKernels.Frame.Moon
     },
     Color = { 0.70, 0.50, 0.20 },
     StartTime = "1971 JUL 26",
@@ -73,8 +73,6 @@ local Apollo15Trail = {
 }
 
 asset.onInitialize(function()
-  openspace.spice.loadKernel(kernels.kernels)
-
   openspace.addSceneGraphNode(Apollo15)
   openspace.addSceneGraphNode(Apollo15Trail)
 end)
@@ -82,8 +80,6 @@ end)
 asset.onDeinitialize(function()
   openspace.removeSceneGraphNode(Apollo15Trail)
   openspace.removeSceneGraphNode(Apollo15)
-
-  openspace.spice.unloadKernel(kernels.kernels)
 end)
 
 asset.export(Apollo15)
diff --git a/data/assets/scene/solarsystem/missions/apollo/15/kernels.asset b/data/assets/scene/solarsystem/missions/apollo/15/kernels.asset
index 0c6dacf3ff..6b092ae8f9 100644
--- a/data/assets/scene/solarsystem/missions/apollo/15/kernels.asset
+++ b/data/assets/scene/solarsystem/missions/apollo/15/kernels.asset
@@ -1,4 +1,4 @@
-local folder = asset.resource({
+local data = asset.resource({
   Name = "Apollo Kernels",
   Type = "HttpSynchronization",
   Identifier = "apollo_spice",
@@ -7,87 +7,31 @@ local folder = asset.resource({
 
 
 local kernels = {
-  folder .. "apollo15.0001.tsc",
-
-  -- folder .. "AS15-P_v01.bc",
-  folder .. "apollo15.0001.tf",
-  folder .. "apollo15MetricAddendum002.ti",
-  -- folder .. "apollo15PanoramicAddendum001.ti",
-  folder .. "apollo15_metric.0002.ti",
-  -- folder .. "apollo15_panoramic.0001.ti",
-  folder .. "apollo15-1.bsp",
-  folder .. "AS15-M_v01.bc"
-  -- folder .. "AS15-M_v01.bsp"
+  data .. "apollo15.0001.tsc",
+  data .. "apollo15.0001.tf",
+  data .. "apollo15MetricAddendum002.ti",
+  data .. "apollo15_metric.0002.ti",
+  data .. "apollo15-1.bsp",
+  data .. "AS15-M_v01.bc"
 }
 
--- local kernels = {
--- --sclk
--- folder .. "apollo15.0001.tsc",
+local ID = {
+  Apollo15 = -915
+}
 
--- --pck
--- folder .. "moon_080317.tf",
--- folder .. "moon_assoc_me.tf",
+local Frame = {
+  Apollo15Nadir = -915240,
+  Apollo15Metric = "A15_METRIC"
+}
 
--- --ik
--- folder .. "apollo15_metric_v2.0001.ti",
--- folder .. "apollo15_panoramic.0001.ti",
 
--- --tspk
--- folder .. "de421.bsp",
--- folder .. "moon_pa_de421_1900-2050.bpc",
+asset.onInitialize(function()
+  openspace.spice.loadKernel(kernels)
+end)
 
--- --iak
--- folder .. "apollo15MetricAddendum002.ti",
--- folder .. "apolloPanAddendum001.ti",
+asset.onDeinitialize(function()
+  openspace.spice.unloadKernel(kernels)
+end)
 
--- --fk
--- folder .. "apollo15_v2.0001.tf",
--- folder .. "apollo15_v2.0002.tf",
-
--- --spk
--- folder .. "AS15_M_REV23_SMITHED_V01.bsp",
--- folder .. "AS15_M_REV4.bsp             ",
--- folder .. "AS15_M_REV70_SMITHED_V01.bsp",
--- folder .. "AS15_M_REV04_v2.bsp         ",
--- folder .. "AS15_M_REV27_SMITHED_V01.bsp",
--- folder .. "AS15_M_REV44_SMITHED_V01.bsp",
--- folder .. "AS15_M_REV71_SMITHED_V01.bsp",
--- folder .. "AS15_M_REV15_SMITHED_V01.bsp",
--- folder .. "AS15_M_REV33_SMITHED_V01.bsp",
--- folder .. "AS15_M_REV50_SMITHED_V01.bsp",
--- folder .. "AS15_M_REV71_SMITHED_V02.bsp",
--- folder .. "AS15_M_REV15_v2.bsp         ",
--- folder .. "AS15_M_REV34_SMITHED_V01.bsp",
--- folder .. "AS15_M_REV60_SMITHED_V01.bsp",
--- folder .. "AS15_M_REV72_v2.bsp",
--- folder .. "AS15_M_REV16_SMITHED_V01.bsp",
--- folder .. "AS15_M_REV35_SMITHED_V02.bsp",
--- folder .. "AS15_M_REV62_SMITHED_V01.bsp",
--- folder .. "AS15_M_REV22_SMITHED_V01.bsp",
--- folder .. "AS15_M_REV38_SMITHED_V01.bsp",
--- folder .. "AS15_M_REV63_SMITHED_V01.bsp",
-
--- --ck
--- folder .. "AS15_M_REV04_SMITHED_V01.bc",
--- folder .. "AS15_M_REV15_SMITHED_V01.bc",
--- folder .. "AS15_M_REV16_SMITHED_V01.bc",
--- folder .. "AS15_M_REV22_SMITHED_V01.bc",
--- folder .. "AS15_M_REV23_SMITHED_V01.bc",
--- folder .. "AS15_M_REV27_SMITHED_V01.bc",
--- folder .. "AS15_M_REV33_SMITHED_V01.bc",
--- folder .. "AS15_M_REV34_SMITHED_V01.bc",
--- folder .. "AS15_M_REV35_SMITHED_V01.bc",
--- folder .. "AS15_M_REV35_SMITHED_V02.bc",
--- folder .. "AS15_M_REV38_SMITHED_V01.bc",
--- folder .. "AS15_M_REV44_SMITHED_V01.bc",
--- folder .. "AS15_M_REV50_SMITHED_V01.bc",
--- folder .. "AS15_M_REV60_SMITHED_V01.bc",
--- folder .. "AS15_M_REV62_SMITHED_V01.bc",
--- folder .. "AS15_M_REV63_SMITHED_V01.bc",
--- folder .. "AS15_M_REV70_SMITHED_V01.bc",
--- folder .. "AS15_M_REV71_SMITHED_V01.bc",
--- folder .. "AS15_M_REV71_SMITHED_V02.bc",
--- folder .. "AS15_M_REV72_v2.bc",
--- }
-
-asset.export("kernels", kernels)
+asset.export("ID", ID)
+asset.export("Frame", Frame)
diff --git a/data/assets/scene/solarsystem/missions/apollo/8/kernels.asset b/data/assets/scene/solarsystem/missions/apollo/8/kernels.asset
index 538effcfdf..1474dba208 100644
--- a/data/assets/scene/solarsystem/missions/apollo/8/kernels.asset
+++ b/data/assets/scene/solarsystem/missions/apollo/8/kernels.asset
@@ -1,4 +1,4 @@
-local kernelsFolder = asset.resource({
+local data = asset.resource({
   Name = "Apollo Kernels",
   Type = "HttpSynchronization",
   Identifier = "apollo_spice",
@@ -7,12 +7,31 @@ local kernelsFolder = asset.resource({
 
 
 local kernels = {
-  kernelsFolder .. "moon_080317.tf",
-  kernelsFolder .. "apollo8.tf",
-  kernelsFolder .. "moon_pa_de421_1900-2050.bpc",
-  kernelsFolder .. "apollo8.tsc",
-  kernelsFolder .. "apollo8.bsp",
-  kernelsFolder .. "apollo8_earthrise.bc"
+  data .. "moon_080317.tf",
+  data .. "apollo8.tf",
+  data .. "moon_pa_de421_1900-2050.bpc",
+  data .. "apollo8.tsc",
+  data .. "apollo8.bsp",
+  data .. "apollo8_earthrise.bc"
 }
 
-asset.export("kernels", kernels)
+local ID = {
+  Apollo8 = -908
+}
+
+local Frame = {
+  Apollo8 = -908000,
+  Apollo8Earthrise = "A8_EARTHRISE"
+}
+
+
+asset.onInitialize(function()
+  openspace.spice.loadKernel(kernels)
+end)
+
+asset.onDeinitialize(function()
+  openspace.spice.unloadKernel(kernels)
+end)
+
+asset.export("ID", ID)
+asset.export("Frame", Frame)
diff --git a/data/assets/scene/solarsystem/missions/apollo/8/launch_model.asset b/data/assets/scene/solarsystem/missions/apollo/8/launch_model.asset
index cfede06cac..5ea9f835e5 100644
--- a/data/assets/scene/solarsystem/missions/apollo/8/launch_model.asset
+++ b/data/assets/scene/solarsystem/missions/apollo/8/launch_model.asset
@@ -1,6 +1,7 @@
 local earth_transforms = asset.require("scene/solarsystem/planets/earth/transforms")
 local sun = asset.require("scene/solarsystem/sun/sun")
 local kernels = asset.require("./kernels")
+local coreKernels = asset.require("spice/core")
 
 
 
@@ -25,9 +26,9 @@ local Apollo8Launch = {
   Transform = {
     Translation = {
       Type = "SpiceTranslation",
-      Target = ApolloSpiceId,
-      Observer = "EARTH",
-      Frame = "IAU_EARTH"
+      Target = kernels.ID.Apollo8,
+      Observer = coreKernels.ID.Earth,
+      Frame = coreKernels.Frame.Earth
     }
   },
   GUI = {
@@ -68,8 +69,6 @@ local Apollo8LaunchModel = {
 
 
 asset.onInitialize(function()
-  openspace.spice.loadKernel(kernels.kernels)
-
   openspace.addSceneGraphNode(Apollo8Launch)
   openspace.addSceneGraphNode(Apollo8LaunchModel)
 end)
@@ -77,8 +76,6 @@ end)
 asset.onDeinitialize(function()
   openspace.removeSceneGraphNode(Apollo8LaunchModel)
   openspace.removeSceneGraphNode(Apollo8Launch)
-
-  openspace.spice.unloadKernel(kernels.kernels)
 end)
 
 asset.export(Apollo8Launch)
diff --git a/data/assets/scene/solarsystem/missions/apollo/8/model.asset b/data/assets/scene/solarsystem/missions/apollo/8/model.asset
index 5b7f80883e..ca61a6c91e 100644
--- a/data/assets/scene/solarsystem/missions/apollo/8/model.asset
+++ b/data/assets/scene/solarsystem/missions/apollo/8/model.asset
@@ -1,6 +1,7 @@
 local earth_transforms = asset.require("scene/solarsystem/planets/earth/transforms")
 local sun = asset.require("scene/solarsystem/sun/sun")
 local kernels = asset.require("./kernels")
+local coreKernels = asset.require("spice/core")
 
 
 
@@ -12,8 +13,6 @@ local models = asset.resource({
 })
 
 
-local ApolloSpiceId = -908
-
 local Apollo8 = {
   Identifier = "Apollo8",
   Parent = earth_transforms.EarthBarycenter.Identifier,
@@ -25,14 +24,14 @@ local Apollo8 = {
   Transform = {
     Translation = {
       Type = "SpiceTranslation",
-      Target = ApolloSpiceId,
-      Observer = "EARTH BARYCENTER",
-      Frame = "GALACTIC"
+      Target = kernels.ID.Apollo8,
+      Observer = coreKernels.ID.EarthBarycenter,
+      Frame = coreKernels.Frame.Galactic
     },
     Rotation = {
       Type = "SpiceRotation",
-      SourceFrame = "A8_EARTHRISE",
-      DestinationFrame = "GALACTIC",
+      SourceFrame = kernels.Frame.Apollo8Earthrise,
+      DestinationFrame = coreKernels.Frame.Galactic,
       TimeFrame = {
         -- The orientation of Apollo 8 is only available during the few minutes
         -- when the Earthrise picture was taken.
@@ -96,8 +95,6 @@ local Apollo8Pivot = {
 
 
 asset.onInitialize(function()
-  openspace.spice.loadKernel(kernels.kernels)
-
   openspace.addSceneGraphNode(Apollo8)
   openspace.addSceneGraphNode(Apollo8Model)
   openspace.addSceneGraphNode(Apollo8Pivot)
@@ -107,8 +104,6 @@ asset.onDeinitialize(function()
   openspace.removeSceneGraphNode(Apollo8Pivot)
   openspace.removeSceneGraphNode(Apollo8Model)
   openspace.removeSceneGraphNode(Apollo8)
-
-  openspace.spice.unloadKernel(kernels.kernels)
 end)
 
 asset.export(Apollo8)
diff --git a/data/assets/scene/solarsystem/missions/apollo/8/trails.asset b/data/assets/scene/solarsystem/missions/apollo/8/trails.asset
index ec04998ee4..baf3c51688 100644
--- a/data/assets/scene/solarsystem/missions/apollo/8/trails.asset
+++ b/data/assets/scene/solarsystem/missions/apollo/8/trails.asset
@@ -1,11 +1,10 @@
 local earth_transforms = asset.require("scene/solarsystem/planets/earth/transforms")
 local moon_transforms = asset.require("scene/solarsystem/planets/earth/moon/moon")
 local kernels = asset.require("./kernels")
+local coreKernels = asset.require("spice/core")
 
 
 
-local ApolloSpiceId = -908
-
 local LaunchTrail = {
   Identifier = "Apollo8LaunchTrail",
   Parent = earth_transforms.EarthIAU.Identifier,
@@ -13,9 +12,9 @@ local LaunchTrail = {
     Type = "RenderableTrailTrajectory",
     Translation = {
       Type = "SpiceTranslation",
-      Target = ApolloSpiceId,
-      Observer = "EARTH",
-      Frame = "IAU_EARTH"
+      Target = kernels.ID.Apollo8,
+      Observer = coreKernels.ID.Earth,
+      Frame = coreKernels.Frame.Earth
     },
     Color = { 0.70, 0.50, 0.20 },
     StartTime = "1968 DEC 21 12:51:00",
@@ -37,9 +36,9 @@ local MoonTrail = {
     Enabled = false,
     Translation = {
       Type = "SpiceTranslation",
-      Target = ApolloSpiceId,
-      Observer = "MOON",
-      Frame = "IAU_MOON"
+      Target = kernels.ID.Apollo8,
+      Observer = coreKernels.ID.Moon,
+      Frame = coreKernels.Frame.Moon
     },
     Color = { 0.70, 0.50, 0.20 },
     StartTime = "1968 DEC 23",
@@ -60,9 +59,9 @@ local EarthBarycenterTrail = {
     Enabled = false,
     Translation = {
       Type = "SpiceTranslation",
-      Target = ApolloSpiceId,
-      Observer = "EARTH",
-      Frame = "GALACTIC"
+      Target = kernels.ID.Apollo8,
+      Observer = coreKernels.ID.Earth,
+      Frame = coreKernels.Frame.Galactic
     },
     Color = { 0.8, 0.2, 0.2 },
     StartTime = "1968 DEC 21",
@@ -77,8 +76,6 @@ local EarthBarycenterTrail = {
 
 
 asset.onInitialize(function()
-  openspace.spice.loadKernel(kernels.kernels)
-
   openspace.addSceneGraphNode(LaunchTrail)
   openspace.addSceneGraphNode(MoonTrail)
   openspace.addSceneGraphNode(EarthBarycenterTrail)
@@ -88,8 +85,6 @@ asset.onDeinitialize(function()
   openspace.removeSceneGraphNode(EarthBarycenterTrail)
   openspace.removeSceneGraphNode(MoonTrail)
   openspace.removeSceneGraphNode(LaunchTrail)
-
-  openspace.spice.unloadKernel(kernels.kernels)
 end)
 
 asset.export(LaunchTrail)
diff --git a/data/assets/scene/solarsystem/missions/artemis/kernels.asset b/data/assets/scene/solarsystem/missions/artemis/kernels.asset
new file mode 100644
index 0000000000..6572ce320c
--- /dev/null
+++ b/data/assets/scene/solarsystem/missions/artemis/kernels.asset
@@ -0,0 +1,22 @@
+local data = asset.resource({
+  Name = "Artemis Kernels",
+  Type = "HttpSynchronization",
+  Identifier = "artemis_1_kernels",
+  Version = 1
+})
+
+
+local ID = {
+  Artemis = -1023
+}
+
+
+asset.onInitialize(function()
+  openspace.spice.loadKernel(data .. "artemis.bsp")
+end)
+
+asset.onDeinitialize(function()
+  openspace.spice.unloadKernel(data .. "artemis.bsp")
+end)
+
+asset.export("ID", ID)
diff --git a/data/assets/scene/solarsystem/missions/artemis/trail.asset b/data/assets/scene/solarsystem/missions/artemis/trail.asset
index 2077cc21f6..4b6dfa931a 100644
--- a/data/assets/scene/solarsystem/missions/artemis/trail.asset
+++ b/data/assets/scene/solarsystem/missions/artemis/trail.asset
@@ -1,18 +1,10 @@
-asset.require("spice/base")
 local earthTransforms = asset.require("scene/solarsystem/planets/earth/transforms")
 local moonTransforms = asset.require("scene/solarsystem/planets/earth/moon/moon")
+local kernels = asset.require("./kernels")
+local coreKernels = asset.require("spice/core")
 
 
 
-local ArtemisSpiceId = "-1023"
-
-local kernels = asset.resource({
-  Name = "Artemis Kernels",
-  Type = "HttpSynchronization",
-  Identifier = "artemis_1_kernels",
-  Version = 1
-})
-
 local ArtemisEarthTrail = {
   Identifier = "ArtemisEarthTrail",
   Parent = earthTransforms.EarthCenter.Identifier,
@@ -20,9 +12,9 @@ local ArtemisEarthTrail = {
     Type = "RenderableTrailTrajectory",
     Translation = {
       Type = "SpiceTranslation",
-      Target = ArtemisSpiceId,
-      Observer = "EARTH",
-      Frame = "GALACTIC"
+      Target = kernels.ID.Artemis,
+      Observer = coreKernels.ID.Earth,
+      Frame = coreKernels.ID.Galactic
     },
     Color = { 0.2, 0.78, 0.635 },
     Fade = 7.0,
@@ -44,9 +36,9 @@ local ArtemisMoonTrail= {
     Type = "RenderableTrailTrajectory",
     Translation = {
       Type = "SpiceTranslation",
-      Target = ArtemisSpiceId,
-      Observer = "MOON",
-      Frame = "IAU_MOON"
+      Target = kernels.ID.Artemis,
+      Observer = coreKernels.ID.Moon,
+      Frame = coreKernels.Frame.Moon
     },
     Color = { 0.78, 0.43, 0.20 },
     Fade = 7.0,
@@ -63,8 +55,6 @@ local ArtemisMoonTrail= {
 
 
 asset.onInitialize(function()
-  openspace.spice.loadKernel(kernels .. "artemis.bsp")
-
   openspace.addSceneGraphNode(ArtemisEarthTrail)
   openspace.addSceneGraphNode(ArtemisMoonTrail)
 end)
@@ -72,8 +62,6 @@ end)
 asset.onDeinitialize(function()
   openspace.removeSceneGraphNode(ArtemisMoonTrail)
   openspace.removeSceneGraphNode(ArtemisEarthTrail)
-
-  openspace.spice.unloadKernel(kernels .. "artemis.bsp")
 end)
 
 asset.export(ArtemisEarthTrail)
diff --git a/data/assets/scene/solarsystem/missions/artemis/transforms.asset b/data/assets/scene/solarsystem/missions/artemis/transforms.asset
index 59df655a91..83d4bc6166 100644
--- a/data/assets/scene/solarsystem/missions/artemis/transforms.asset
+++ b/data/assets/scene/solarsystem/missions/artemis/transforms.asset
@@ -1,48 +1,34 @@
-asset.require("spice/base")
 local earthTransforms = asset.require("scene/solarsystem/planets/earth/transforms")
+local kernels = asset.require("./kernels")
+local coreKernels = asset.require("spice/core")
 
 
 
-local kernels = asset.resource({
-  Name = "Artemis Kernels",
-  Type = "HttpSynchronization",
-  Identifier = "artemis_1_kernels",
-  Version = 1
-})
-
-
-local ArtemisSpiceId = "-1023"
-
 local ArtemisPosition = {
   Identifier = "ArtemisPosition",
   Parent = earthTransforms.EarthCenter.Identifier,
   Transform = {
     Translation = {
       Type = "SpiceTranslation",
-      Target = ArtemisSpiceId,
-      Observer = "EARTH",
-      Frame = "GALACTIC"
+      Target = kernels.ID.Artemis,
+      Observer = coreKernels.ID.Earth,
+      Frame = coreKernels.Frame.Galactic
     }
   },
   GUI = {
     Name = "Artemis-1 Position",
     Path = "/Solar System/Missions/Artemis",
-    Hidden = true,
-    Description = "Artemis-1 position relative to Earth"
+    Hidden = true
   }
 }
 
 
 asset.onInitialize(function()
-  openspace.spice.loadKernel(kernels .. "artemis.bsp")
-
   openspace.addSceneGraphNode(ArtemisPosition)
 end)
 
 asset.onDeinitialize(function()
   openspace.removeSceneGraphNode(ArtemisPosition)
-
-  openspace.spice.unloadKernel(kernels .. "artemis.bsp")
 end)
 
 asset.export(ArtemisPosition)
diff --git a/data/assets/scene/solarsystem/missions/dawn/dawn.asset b/data/assets/scene/solarsystem/missions/dawn/dawn.asset
index b9c66b0ec6..3a841bdb9d 100644
--- a/data/assets/scene/solarsystem/missions/dawn/dawn.asset
+++ b/data/assets/scene/solarsystem/missions/dawn/dawn.asset
@@ -1,16 +1,11 @@
 asset.require("scene/solarsystem/missions/dawn/mission")
 local transforms = asset.require("scene/solarsystem/sun/transforms")
 local sun = asset.require("scene/solarsystem/sun/sun")
+local kernels = asset.require("./kernels")
+local coreKernels = asset.require("spice/core")
 
 
 
-local kernels = asset.resource({
-  Name = "Dawn Kernels",
-  Type = "HttpSynchronization",
-  Identifier = "dawn_kernels",
-  Version = 3
-})
-
 local textures = asset.resource({
   Name = "Dawn Textures",
   Type = "HttpSynchronization",
@@ -26,49 +21,6 @@ local models = asset.resource({
 })
 
 
-local KernelFiles = {
-  kernels .. "dawn_ref_070926-150201_070829.bsp",
-
-  --ik
-  kernels .. "dawn_fc_v10.ti",
-
-  -- SPK
-  kernels .. "dawn_rec_070927_070930_081218_v1.bsp",
-  -- kernels .. "dawn_rec_110201_110328_110328_v1.bsp",
-  -- kernels .. "dawn_rec_110328_110419_110420_v1.bsp",
-  kernels .. "dawn_rec_110416_110802_110913_v1.bsp",
-  kernels .. "dawn_rec_110802_110831_110922_v1.bsp",
-  -- kernels .. "spk/dawn_rec_110831_110928_111221_v1.bsp",
-  -- kernels .. "dawn_rec_110928_111102_120615_v1.bsp",
-  -- kernels .. "dawn_rec_111102_111210_120618_v1.bsp",
-  -- kernels .. "dawn_rec_111211_120501_120620_v1.bsp",
-  kernels .. "dawn_rec_120724_120913_121213_v1.bsp",
-
-  -- FK
-  kernels .. "dawn_v12.tf",
-
-  --SCLK
-  kernels .. "dawn_203_sclkscet_00039.tsc",
-
-  -- CK
-  kernels .. "dawn_sc_070927_070930.bc",
-  kernels .. "dawn_sc_110801_110807.bc",
-  kernels .. "dawn_sc_110808_110814.bc",
-  kernels .. "dawn_sc_120910_120916.bc",
-
-  -- space craft CK files
-  -- kernels .. "dawn_sc_070927_070930.bc",
-  -- kernels .. "dawn_sc_110801_110807.bc",
-  -- kernels .. "dawn_sc_110808_110814.bc",
-  -- kernels .. "dawn_sc_120910_120916.bc",
-
-  -- Solar array rotation kernels
-  kernels .. "dawn_sa_070927_070930.bc",
-  -- kernels .. "dawn_sa_110801_110807.bc",
-  -- kernels .. "dawn_sa_110808_110814.bc",
-  -- kernels .. "dawn_sa_120910_120916.bc"
-}
-
 local LightSources = {
   sun.LightSource,
   {
@@ -84,8 +36,8 @@ local DawnPosition = {
   Transform = {
     Translation = {
       Type = "SpiceTranslation",
-      Target = "DAWN",
-      Observer = "SSB"
+      Target = kernels.ID.Dawn,
+      Observer = coreKernels.ID.SolarSystemBarycenter
     },
     -- Rotation for model version 2
     Rotation = {
@@ -106,8 +58,8 @@ local Dawn = {
   Transform = {
     Rotation = {
       Type = "SpiceRotation",
-      SourceFrame = "DAWN_SPACECRAFT",
-      DestinationFrame = "GALACTIC"
+      SourceFrame = kernels.Frame.Dawn,
+      DestinationFrame = coreKernels.Frame.Galactic
     }
   },
   Renderable = {
@@ -128,8 +80,8 @@ local DawnTrail = {
     Type = "RenderableTrailTrajectory",
     Translation = {
       Type = "SpiceTranslation",
-      Target = "DAWN",
-      Observer = "SSB"
+      Target = kernels.ID.Dawn,
+      Observer = coreKernels.ID.SolarSystemBarycenter
     },
     Color = { 1.0, 0.8, 0.4 },
     ShowFullTrail = false,
@@ -153,8 +105,8 @@ local DawnFramingCamera1 = {
   Parent = Dawn.Identifier,
   Renderable = {
     Type = "RenderableFov",
-    Body = "DAWN",
-    Frame = "DAWN_SPACECRAFT",
+    Body = kernels.ID.Dawn,
+    Frame = kernels.Frame.Dawn,
     Color = { 0.8, 0.7, 0.7 },
     Instrument = {
       Name = "DAWN_FC1",
@@ -174,8 +126,8 @@ local DawnFramingCamera2 = {
   Parent = Dawn.Identifier,
   Renderable = {
     Type = "RenderableFov",
-    Body = "DAWN",
-    Frame = "DAWN_SPACECRAFT",
+    Body = kernels.ID.Dawn,
+    Frame = kernels.Frame.Dawn,
     Color = { 0.8, 0.7, 0.7 },
     Instrument = {
       Name = "DAWN_FC2",
@@ -192,8 +144,6 @@ local DawnFramingCamera2 = {
 
 
 asset.onInitialize(function()
-  openspace.spice.loadKernel(KernelFiles)
-
   openspace.addSceneGraphNode(DawnPosition)
   openspace.addSceneGraphNode(Dawn)
   openspace.addSceneGraphNode(DawnTrail)
@@ -207,8 +157,6 @@ asset.onDeinitialize(function()
   openspace.removeSceneGraphNode(DawnTrail)
   openspace.removeSceneGraphNode(Dawn)
   openspace.removeSceneGraphNode(DawnPosition)
-
-  openspace.spice.unloadKernel(KernelFiles)
 end)
 
 asset.export(DawnPosition)
diff --git a/data/assets/scene/solarsystem/missions/dawn/kernels.asset b/data/assets/scene/solarsystem/missions/dawn/kernels.asset
new file mode 100644
index 0000000000..e01bcf7b53
--- /dev/null
+++ b/data/assets/scene/solarsystem/missions/dawn/kernels.asset
@@ -0,0 +1,89 @@
+local coreKernels = asset.require("spice/core")
+
+
+
+local dawn = asset.resource({
+  Name = "Dawn Kernels",
+  Type = "HttpSynchronization",
+  Identifier = "dawn_kernels",
+  Version = 3
+})
+
+local vesta = asset.resource({
+  Name = "Vesta Kernels",
+  Type = "HttpSynchronization",
+  Identifier = "vesta_kernels",
+  Version = 1
+})
+
+
+local DawnKernels = {
+  dawn .. "dawn_ref_070926-150201_070829.bsp",
+
+  -- IK
+  dawn .. "dawn_fc_v10.ti",
+
+  -- SPK
+  dawn .. "dawn_rec_070927_070930_081218_v1.bsp",
+  -- dawn .. "dawn_rec_110201_110328_110328_v1.bsp",
+  -- dawn .. "dawn_rec_110328_110419_110420_v1.bsp",
+  dawn .. "dawn_rec_110416_110802_110913_v1.bsp",
+  dawn .. "dawn_rec_110802_110831_110922_v1.bsp",
+  -- dawn .. "spk/dawn_rec_110831_110928_111221_v1.bsp",
+  -- dawn .. "dawn_rec_110928_111102_120615_v1.bsp",
+  -- dawn .. "dawn_rec_111102_111210_120618_v1.bsp",
+  -- dawn .. "dawn_rec_111211_120501_120620_v1.bsp",
+  dawn .. "dawn_rec_120724_120913_121213_v1.bsp",
+
+  -- FK
+  dawn .. "dawn_v12.tf",
+
+  dawn .. "dawn_203_sclkscet_00039.tsc",
+
+  dawn .. "dawn_sc_070927_070930.bc",
+  dawn .. "dawn_sc_110801_110807.bc",
+  dawn .. "dawn_sc_110808_110814.bc",
+  dawn .. "dawn_sc_120910_120916.bc",
+
+  -- dawn .. "dawn_sc_070927_070930.bc",
+  -- dawn .. "dawn_sc_110801_110807.bc",
+  -- dawn .. "dawn_sc_110808_110814.bc",
+  -- dawn .. "dawn_sc_120910_120916.bc",
+
+
+  -- Solar array rotation kernels
+  dawn .. "dawn_sa_070927_070930.bc",
+  -- dawn .. "dawn_sa_110801_110807.bc",
+  -- dawn .. "dawn_sa_110808_110814.bc",
+  -- dawn .. "dawn_sa_120910_120916.bc"
+}
+
+local VestaKernels = {
+  vesta .. "sb_vesta_071107.bsp"
+}
+
+local ID = {
+  Dawn = "DAWN",
+  Vesta = "VESTA"
+}
+
+local Frame = {
+  Dawn = "DAWN_SPACECRAFT",
+  DawnSolarArray1 = -203010,
+  DawnSolarArray2 = -203020,
+  Vesta = coreKernels.Frame.Vesta
+}
+
+
+asset.onInitialize(function()
+  openspace.spice.loadKernel(DawnKernels)
+  openspace.spice.loadKernel(VestaKernels)
+end)
+
+asset.onDeinitialize(function()
+  openspace.spice.unloadKernel(VestaKernels)
+  openspace.spice.unloadKernel(DawnKernels)
+end)
+
+asset.export("ID", ID)
+asset.export("Frame", Frame)
diff --git a/data/assets/scene/solarsystem/missions/dawn/vesta.asset b/data/assets/scene/solarsystem/missions/dawn/vesta.asset
index a3bb63553a..fd50231e85 100644
--- a/data/assets/scene/solarsystem/missions/dawn/vesta.asset
+++ b/data/assets/scene/solarsystem/missions/dawn/vesta.asset
@@ -1,14 +1,9 @@
 local transforms = asset.require("scene/solarsystem/sun/transforms")
+local kernels = asset.require("./kernels")
+local coreKernels = asset.require("spice/core")
 
 
 
-local kernels = asset.resource({
-  Name = "Vesta Kernels",
-  Type = "HttpSynchronization",
-  Identifier = "vesta_kernels",
-  Version = 1
-})
-
 local textures = asset.resource({
   Name = "Vesta Textures",
   Type = "HttpSynchronization",
@@ -37,13 +32,13 @@ local Vesta = {
   Transform = {
     Translation = {
       Type = "SpiceTranslation",
-      Target = "VESTA",
-      Observer = "SSB"
+      Target = kernels.ID.Vesta,
+      Observer = coreKernels.ID.SolarSystemBarycenter
     },
     Rotation = {
       Type = "SpiceRotation",
-      SourceFrame = "IAU_VESTA",
-      DestinationFrame = "GALACTIC"
+      SourceFrame = kernels.Frame.Vesta,
+      DestinationFrame = coreKernels.Frame.Galactic
     }
   },
   BoundingSphere = 262000,
@@ -54,8 +49,8 @@ local Vesta = {
     Projection = {
       Sequence = images,
       SequenceType = "image-sequence",
-      Observer = "DAWN",
-      Target = "VESTA",
+      Observer = kernels.ID.Dawn,
+      Target = kernels.ID.Vesta,
       Aberration = "NONE",
 
       DataInputTranslation = {
@@ -121,8 +116,8 @@ local VestaTrail = {
     Type = "RenderableTrailOrbit",
     Translation = {
       Type = "SpiceTranslation",
-      Target = "VESTA",
-      Observer = "SSB"
+      Target = kernels.ID.Vesta,
+      Observer = coreKernels.ID.SolarSystemBarycenter
     },
     Color = { 0.7, 0.8, 0.7 },
     StartTime = "2007 JUL 20 12:00:00",
@@ -138,8 +133,6 @@ local VestaTrail = {
 
 
 asset.onInitialize(function()
-  openspace.spice.loadKernel(kernels .. "sb_vesta_071107.bsp")
-
   openspace.addSceneGraphNode(Vesta)
   openspace.addSceneGraphNode(VestaTrail)
 end)
@@ -147,8 +140,6 @@ end)
 asset.onDeinitialize(function()
   openspace.removeSceneGraphNode(VestaTrail)
   openspace.removeSceneGraphNode(Vesta)
-
-  openspace.spice.unloadKernel(kernels .. "sb_vesta_071107.bsp")
 end)
 
 asset.export(Vesta)
diff --git a/data/assets/scene/solarsystem/missions/insight/edl.asset b/data/assets/scene/solarsystem/missions/insight/edl.asset
index 8f99555919..0e69fdb4a2 100644
--- a/data/assets/scene/solarsystem/missions/insight/edl.asset
+++ b/data/assets/scene/solarsystem/missions/insight/edl.asset
@@ -1,8 +1,9 @@
-asset.require("spice/base")
 asset.require("./actions")
 asset.require("scene/solarsystem/planets/mars/default_layers")
 local sun = asset.require("scene/solarsystem/sun/sun")
 local mars = asset.require("scene/solarsystem/planets/mars/mars")
+local kernels = asset.require("./kernels")
+local coreKernels = asset.require("spice/core")
 
 
 
@@ -13,21 +14,6 @@ local models = asset.resource({
   Version = 2
 })
 
-local ikernels = asset.resource({
-  Name = "Insight Kernels",
-  Type = "HttpSynchronization",
-  Identifier = "insight_kernels",
-  Version = 1
-})
-
-
-local iKernels = {
-  ikernels .. "nsyt_spk_cruise_od063_v1_approach2surface_SC_Lander.tsc",
-  ikernels .. "insight_v02.tfr",
-  ikernels .. "mar085s.bsp",
-  ikernels .. "nsyt_spk_cruise_POST_approach2surface_SC_Lander.bsp",
-  ikernels .. "nsyt_spk_cruise_POST_approach2surface_SC_Lander.bck"
-}
 
 local RotationMatrix = {
   -1,  0,  0, 0,
@@ -68,41 +54,41 @@ local SpiceRotationEndTime = "2018 NOV 26 19:51:39"
 local TranslationKeyframes = {
   ["1850 JAN 01 00:00:00"] = {
       Type = "SpiceTranslation",
-      Target = "INSIGHT",
-      Observer = "MARS",
-      Frame = "IAU_MARS",
+      Target = kernels.ID.Insight,
+      Observer = coreKernels.ID.Mars,
+      Frame = coreKernels.Frame.Mars,
       FixedDate = "2018 NOV 26 19:39:03"
   },
   ["2018 NOV 26 19:39:02"] = {
       Type = "SpiceTranslation",
-      Target = "INSIGHT",
-      Observer = "MARS",
-      Frame = "IAU_MARS",
+      Target = kernels.ID.Insight,
+      Observer = coreKernels.ID.Mars,
+      Frame = coreKernels.Frame.Mars,
       FixedDate = "2018 NOV 26 19:39:03"
   },
   ["2018 NOV 26 19:39:03"] = {
     Type = "SpiceTranslation",
-    Target = "INSIGHT",
-    Observer = "MARS",
-    Frame = "IAU_MARS"
+    Target = kernels.ID.Insight,
+    Observer = coreKernels.ID.Mars,
+    Frame = coreKernels.Frame.Mars
   },
   ["2018 NOV 26 19:39:04"] = {
     Type = "SpiceTranslation",
-    Target = "INSIGHT",
-    Observer = "MARS",
-    Frame = "IAU_MARS"
+    Target = kernels.ID.Insight,
+    Observer = coreKernels.ID.Mars,
+    Frame = coreKernels.Frame.Mars
   },
  ["2018 NOV 26 19:45:34"] = {
     Type = "SpiceTranslation",
-    Target = "INSIGHT",
-    Observer = "MARS",
-    Frame = "IAU_MARS"
+    Target = kernels.ID.Insight,
+    Observer = coreKernels.ID.Mars,
+    Frame = coreKernels.Frame.Mars
   },
   ["2018 NOV 26 19:45:35"] = {
       Type = "SpiceTranslation",
-      Target = "INSIGHT",
-      Observer = "MARS",
-      Frame = "IAU_MARS",
+      Target = kernels.ID.Insight,
+      Observer = coreKernels.ID.Mars,
+      Frame = coreKernels.Frame.Mars,
       FixedDate = "2018 NOV 26 19:45:34"
   }
 }
@@ -110,35 +96,35 @@ local TranslationKeyframes = {
 local RotationKeyframes = {
   ["1850 JAN 01 00:00:00"] = {
     Type = "SpiceRotation",
-    SourceFrame = "INSIGHT_LANDER_CRUISE",
-    DestinationFrame = "IAU_MARS",
+    SourceFrame = kernels.Frame.InsightCruise,
+    DestinationFrame = coreKernels.Frame.Mars,
     FixedDate = "2018 NOV 26 19:39:02"
   },
   ["2018 NOV 26 19:39:02"] = {
     Type = "SpiceRotation",
-    SourceFrame = "INSIGHT_LANDER_CRUISE",
-    DestinationFrame = "IAU_MARS",
+    SourceFrame = kernels.Frame.InsightCruise,
+    DestinationFrame = coreKernels.Frame.Mars,
     FixedDate = "2018 NOV 26 19:39:02"
   },
   ["2018 NOV 26 19:39:03"] = {
     Type = "SpiceRotation",
-    SourceFrame = "INSIGHT_LANDER_CRUISE",
-    DestinationFrame = "IAU_MARS"
+    SourceFrame = kernels.Frame.InsightCruise,
+    DestinationFrame = coreKernels.Frame.Mars
   },
   ["2018 NOV 26 19:39:04"] = {
     Type = "SpiceRotation",
-    SourceFrame = "INSIGHT_LANDER_CRUISE",
-    DestinationFrame = "IAU_MARS"
+    SourceFrame = kernels.Frame.InsightCruise,
+    DestinationFrame = coreKernels.Frame.Mars
   },
  ["2018 NOV 26 19:45:34"] = {
     Type = "SpiceRotation",
-    SourceFrame = "INSIGHT_LANDER_CRUISE",
-    DestinationFrame = "IAU_MARS"
+    SourceFrame = kernels.Frame.InsightCruise,
+    DestinationFrame = coreKernels.Frame.Mars
   },
   ["2018 NOV 26 19:45:35"] = {
     Type = "SpiceRotation",
-    SourceFrame = "INSIGHT_LANDER_CRUISE",
-    DestinationFrame = "IAU_MARS",
+    SourceFrame = kernels.Frame.InsightCruise,
+    DestinationFrame = coreKernels.Frame.Mars,
     FixedDate = "2018 NOV 26 19:45:34"
   }
 }
@@ -785,8 +771,6 @@ local Insight_Trail = {
 }
 
 asset.onInitialize(function()
-  openspace.spice.loadKernel(iKernels)
-
   openspace.addSceneGraphNode(InsightParent)
   openspace.addSceneGraphNode(Insight)
   openspace.addSceneGraphNode(Insight_Entry_CapsuleA)
@@ -858,8 +842,6 @@ asset.onDeinitialize(function()
   openspace.removeSceneGraphNode(Insight_Entry_CapsuleA)
   openspace.removeSceneGraphNode(Insight)
   openspace.removeSceneGraphNode(InsightParent)
-
-  openspace.spice.unloadKernel(iKernels)
 end)
 
 asset.export(InsightParent)
diff --git a/data/assets/scene/solarsystem/missions/insight/kernels.asset b/data/assets/scene/solarsystem/missions/insight/kernels.asset
new file mode 100644
index 0000000000..010c3cefa8
--- /dev/null
+++ b/data/assets/scene/solarsystem/missions/insight/kernels.asset
@@ -0,0 +1,36 @@
+local data = asset.resource({
+  Name = "Insight Kernels",
+  Type = "HttpSynchronization",
+  Identifier = "insight_kernels",
+  Version = 1
+})
+
+
+local Kernels = {
+  data .. "nsyt_spk_cruise_od063_v1_approach2surface_SC_Lander.tsc",
+  data .. "insight_v02.tfr",
+  data .. "mar085s.bsp",
+  data .. "nsyt_spk_cruise_POST_approach2surface_SC_Lander.bsp",
+  data .. "nsyt_spk_cruise_POST_approach2surface_SC_Lander.bck"
+}
+
+local ID = {
+  Insight = "INSIGHT"
+}
+
+local Frame = {
+  Insight = -189000,
+  InsightCruise = "INSIGHT_LANDER_CRUISE"
+}
+
+
+asset.onInitialize(function()
+  openspace.spice.loadKernel(Kernels)
+end)
+
+asset.onDeinitialize(function()
+  openspace.spice.unloadKernel(Kernels)
+end)
+
+asset.export("ID", ID)
+asset.export("Frame", Frame)
diff --git a/data/assets/scene/solarsystem/missions/juice/fov/gala.asset b/data/assets/scene/solarsystem/missions/juice/fov/gala.asset
index 355903784f..77d091a62e 100644
--- a/data/assets/scene/solarsystem/missions/juice/fov/gala.asset
+++ b/data/assets/scene/solarsystem/missions/juice/fov/gala.asset
@@ -13,8 +13,8 @@ local Gala = {
   },
   Renderable = {
     Type = "RenderableFov",
-    Body = "JUICE",
-    Frame = "JUICE_GALA_RXT",
+    Body = kernels.ID.Juice,
+    Frame = kernels.Frame.Gala,
     RGB = { 0.8, 0.7, 0.7 },
     Instrument = {
       Name = "JUICE_GALA_RXT",
diff --git a/data/assets/scene/solarsystem/missions/juice/fov/janus.asset b/data/assets/scene/solarsystem/missions/juice/fov/janus.asset
index bca6d46432..f06c8f91da 100644
--- a/data/assets/scene/solarsystem/missions/juice/fov/janus.asset
+++ b/data/assets/scene/solarsystem/missions/juice/fov/janus.asset
@@ -19,8 +19,8 @@ local Janus = {
   },
   Renderable = {
     Type = "RenderableFov",
-    Body = "JUICE",
-    Frame = "JUICE_JANUS",
+    Body = kernels.ID.Juice,
+    Frame = kernels.Frame.Janus,
     RGB = { 0.8, 0.7, 0.7 },
     Instrument = {
       Name = "JUICE_JANUS",
diff --git a/data/assets/scene/solarsystem/missions/juice/fov/jmc.asset b/data/assets/scene/solarsystem/missions/juice/fov/jmc.asset
index 6ca3e491a7..e1b9379b7b 100644
--- a/data/assets/scene/solarsystem/missions/juice/fov/jmc.asset
+++ b/data/assets/scene/solarsystem/missions/juice/fov/jmc.asset
@@ -13,8 +13,8 @@ local JMC1 = {
   },
   Renderable = {
     Type = "RenderableFov",
-    Body = "JUICE",
-    Frame = "JUICE_JMC-1",
+    Body = kernels.ID.Juice,
+    Frame = kernels.Frame.JMC1,
     RGB = { 0.8, 0.7, 0.7 },
     Instrument = {
       Name = "JUICE_JMC-1",
@@ -42,8 +42,8 @@ local JMC2 = {
   },
   Renderable = {
     Type = "RenderableFov",
-    Body = "JUICE",
-    Frame = "JUICE_JMC-2",
+    Body = kernels.ID.Juice,
+    Frame = kernels.Frame.JMC2,
     RGB = { 0.8, 0.7, 0.7 },
     Instrument = {
       Name = "JUICE_JMC-2",
@@ -62,7 +62,6 @@ local JMC2 = {
 }
 
 
-
 asset.onInitialize(function()
   openspace.addSceneGraphNode(JMC1)
   openspace.addSceneGraphNode(JMC2)
diff --git a/data/assets/scene/solarsystem/missions/juice/fov/majis.asset b/data/assets/scene/solarsystem/missions/juice/fov/majis.asset
index 0b62bdd2c1..03dacf43bf 100644
--- a/data/assets/scene/solarsystem/missions/juice/fov/majis.asset
+++ b/data/assets/scene/solarsystem/missions/juice/fov/majis.asset
@@ -13,8 +13,8 @@ local MajisVisnir = {
   },
   Renderable = {
     Type = "RenderableFov",
-    Body = "JUICE",
-    Frame = "JUICE_MAJIS_VISNIR",
+    Body = kernels.ID.Juice,
+    Frame = kernels.Frame.MajisVisnir,
     RGB = { 0.8, 0.7, 0.7 },
     Instrument = {
       Name = "JUICE_MAJIS_VISNIR",
@@ -45,8 +45,8 @@ local MajisVisnirB2 = {
   },
   Renderable = {
     Type = "RenderableFov",
-    Body = "JUICE",
-    Frame = "JUICE_MAJIS_VISNIR_B2",
+    Body = kernels.ID.Juice,
+    Frame = kernels.Frame.MajisVisnirB2,
     RGB = { 0.8, 0.7, 0.7 },
     Instrument = {
       Name = "JUICE_MAJIS_VISNIR_B2",
@@ -73,8 +73,8 @@ local MajisVisnirB4 = {
   },
   Renderable = {
     Type = "RenderableFov",
-    Body = "JUICE",
-    Frame = "JUICE_MAJIS_VISNIR_B4",
+    Body = kernels.ID.Juice,
+    Frame = kernels.Frame.MajisVisnirB4,
     RGB = { 0.8, 0.7, 0.7 },
     Instrument = {
       Name = "JUICE_MAJIS_VISNIR_B4",
@@ -101,8 +101,8 @@ local MajisIr = {
   },
   Renderable = {
     Type = "RenderableFov",
-    Body = "JUICE",
-    Frame = "JUICE_MAJIS_IR",
+    Body = kernels.ID.Juice,
+    Frame = kernels.Frame.MajisIR,
     RGB = { 0.8, 0.7, 0.7 },
     Instrument = {
       Name = "JUICE_MAJIS_IR",
@@ -129,8 +129,8 @@ local MajisIrB2 = {
   },
   Renderable = {
     Type = "RenderableFov",
-    Body = "JUICE",
-    Frame = "JUICE_MAJIS_IR_B2",
+    Body = kernels.ID.Juice,
+    Frame = kernels.Frame.MajisIRB2,
     RGB = { 0.8, 0.7, 0.7 },
     Instrument = {
       Name = "JUICE_MAJIS_IR_B2",
@@ -157,8 +157,8 @@ local MajisIrB4 = {
   },
   Renderable = {
     Type = "RenderableFov",
-    Body = "JUICE",
-    Frame = "JUICE_MAJIS_IR_B4",
+    Body = kernels.ID.Juice,
+    Frame = kernels.Frame.MajisIRB4,
     RGB = { 0.8, 0.7, 0.7 },
     Instrument = {
       Name = "JUICE_MAJIS_IR_B4",
@@ -185,8 +185,8 @@ local Majis = {
   },
   Renderable = {
     Type = "RenderableFov",
-    Body = "JUICE",
-    Frame = "JUICE_MAJIS",
+    Body = kernels.ID.Juice,
+    Frame = kernels.Frame.Majis,
     RGB = { 0.8, 0.7, 0.7 },
     Instrument = {
       Name = "JUICE_MAJIS",
diff --git a/data/assets/scene/solarsystem/missions/juice/fov/navcam.asset b/data/assets/scene/solarsystem/missions/juice/fov/navcam.asset
index b976099c87..95cfd38267 100644
--- a/data/assets/scene/solarsystem/missions/juice/fov/navcam.asset
+++ b/data/assets/scene/solarsystem/missions/juice/fov/navcam.asset
@@ -13,8 +13,8 @@ local NavCam = {
   },
   Renderable = {
     Type = "RenderableFov",
-    Body = "JUICE",
-    Frame = "JUICE_NAVCAM-1",
+    Body = kernels.ID.Juice,
+    Frame = kernels.Frame.NavCam,
     RGB = { 0.8, 0.7, 0.7 },
     Instrument = {
       Name = "JUICE_NAVCAM-1",
diff --git a/data/assets/scene/solarsystem/missions/juice/fov/rime.asset b/data/assets/scene/solarsystem/missions/juice/fov/rime.asset
index e0b5cf14cc..6e6bd3c276 100644
--- a/data/assets/scene/solarsystem/missions/juice/fov/rime.asset
+++ b/data/assets/scene/solarsystem/missions/juice/fov/rime.asset
@@ -14,8 +14,8 @@ local RimeBase = {
   },
   Renderable = {
     Type = "RenderableFov",
-    Body = "JUICE",
-    Frame = "JUICE_RIME_BASE",
+    Body = kernels.ID.Juice,
+    Frame = kernels.Frame.RimeBase,
     RGB = { 0.8, 0.7, 0.7 },
     Instrument = {
       Name = "JUICE_RIME_BASE",
@@ -44,8 +44,8 @@ local Rime = {
   },
   Renderable = {
     Type = "RenderableFov",
-    Body = "JUICE",
-    Frame = "JUICE_RIME",
+    Body = kernels.ID.Juice,
+    Frame = kernels.Frame.Rime,
     RGB = { 0.8, 0.7, 0.7 },
     Instrument = {
       Name = "JUICE_RIME",
diff --git a/data/assets/scene/solarsystem/missions/juice/fov/startracker.asset b/data/assets/scene/solarsystem/missions/juice/fov/startracker.asset
index 466393fa49..a0e5f55e06 100644
--- a/data/assets/scene/solarsystem/missions/juice/fov/startracker.asset
+++ b/data/assets/scene/solarsystem/missions/juice/fov/startracker.asset
@@ -13,8 +13,8 @@ local StarOh1 = {
   },
   Renderable = {
     Type = "RenderableFov",
-    Body = "JUICE",
-    Frame = "JUICE_STR-OH1",
+    Body = kernels.ID.Juice,
+    Frame = kernels.Frame.StarTrackerOH1,
     RGB = { 0.0, 0.0, 0.0 },
     Instrument = {
       Name = "JUICE_STR-OH1",
@@ -42,8 +42,8 @@ local StarOh2 = {
   },
   Renderable = {
     Type = "RenderableFov",
-    Body = "JUICE",
-    Frame = "JUICE_STR-OH2",
+    Body = kernels.ID.Juice,
+    Frame = kernels.Frame.StarTrackerOH2,
     RGB = { 0.0, 0.0, 0.0 },
     Instrument = {
       Name = "JUICE_STR-OH2",
@@ -71,8 +71,8 @@ local StarOh3 = {
   },
   Renderable = {
     Type = "RenderableFov",
-    Body = "JUICE",
-    Frame = "JUICE_STR-OH3",
+    Body = kernels.ID.Juice,
+    Frame = kernels.Frame.StarTrackerOH3,
     RGB = { 0.0, 0.0, 0.0 },
     Instrument = {
       Name = "JUICE_STR-OH3",
diff --git a/data/assets/scene/solarsystem/missions/juice/fov/swi.asset b/data/assets/scene/solarsystem/missions/juice/fov/swi.asset
index 0daa1ec8e3..5bd2388bd7 100644
--- a/data/assets/scene/solarsystem/missions/juice/fov/swi.asset
+++ b/data/assets/scene/solarsystem/missions/juice/fov/swi.asset
@@ -14,8 +14,8 @@ local SwiCh2 = {
   },
   Renderable = {
     Type = "RenderableFov",
-    Body = "JUICE",
-    Frame = "JUICE_SWI_CH2",
+    Body = kernels.ID.Juice,
+    Frame = kernels.Frame.SwiCH2,
     RGB = { 0.0, 0.0, 0.0 },
     Instrument = {
       Name = "JUICE_SWI_CH2",
@@ -49,8 +49,8 @@ local SwiFull = {
   },
   Renderable = {
     Type = "RenderableFov",
-    Body = "JUICE",
-    Frame = "JUICE_SWI_FULL",
+    Body = kernels.ID.Juice,
+    Frame = kernels.Frame.SwiFull,
     RGB = { 0.0, 0.0, 0.0 },
     Instrument = {
       Name = "JUICE_SWI_FULL",
@@ -87,8 +87,8 @@ local SwiFullGCO500 = {
   },
   Renderable = {
     Type = "RenderableFov",
-    Body = "JUICE",
-    Frame = "JUICE_SWI_FULL_GCO500",
+    Body = kernels.ID.Juice,
+    Frame = kernels.Frame.SwiFullGCO500,
     RGB = { 0.0, 0.0, 0.0 },
     Instrument = {
       Name = "JUICE_SWI_FULL_GCO500",
diff --git a/data/assets/scene/solarsystem/missions/juice/fov/uvs.asset b/data/assets/scene/solarsystem/missions/juice/fov/uvs.asset
index ba26479825..9753a7710e 100644
--- a/data/assets/scene/solarsystem/missions/juice/fov/uvs.asset
+++ b/data/assets/scene/solarsystem/missions/juice/fov/uvs.asset
@@ -13,8 +13,8 @@ local UVS = {
   },
   Renderable = {
     Type = "RenderableFov",
-    Body = "JUICE",
-    Frame = "JUICE_UVS",
+    Body = kernels.ID.Juice,
+    Frame = kernels.Frame.UVS,
     RGB = { 0.8, 0.7, 0.7 },
     Instrument = {
       Name = "JUICE_UVS",
diff --git a/data/assets/scene/solarsystem/missions/juice/kernels.asset b/data/assets/scene/solarsystem/missions/juice/kernels.asset
index 8e83a877c4..f20ca7d17d 100644
--- a/data/assets/scene/solarsystem/missions/juice/kernels.asset
+++ b/data/assets/scene/solarsystem/missions/juice/kernels.asset
@@ -1,4 +1,4 @@
-local kernels = asset.resource({
+local data = asset.resource({
   Name = "JUICE Kernels",
   Type = "HttpSynchronization",
   Identifier = "juice_kernels",
@@ -9,52 +9,95 @@ local kernels = asset.resource({
 -- Kernels downloaded aon 2023-04-18
 -- + GPHIO from Ronan
 local Kernels = {
-  kernels .. "juice_sc_attc_000031_230414_230503_v03.bc",
-  kernels .. "juice_lpbooms_s160326_v01.bc",
-  kernels .. "juice_magboom_s160326_v01.bc",
-  kernels .. "juice_majis_scan_zero_v01.bc",
-  kernels .. "juice_mga_meas_230413_230415_s230414_v01.bc",
-  kernels .. "juice_mga_zero_v02.bc",
-  kernels .. "juice_sa_meas_230413_230415_s230414_v01.bc",
-  kernels .. "juice_sa_zero_v01.bc",
-  kernels .. "juice_sc_meas_230413_230415_s230414_v01.bc",
-  kernels .. "juice_swi_scan_zero_v01.bc",
+  data .. "juice_sc_attc_000031_230414_230503_v03.bc",
+  data .. "juice_lpbooms_s160326_v01.bc",
+  data .. "juice_magboom_s160326_v01.bc",
+  data .. "juice_majis_scan_zero_v01.bc",
+  data .. "juice_mga_meas_230413_230415_s230414_v01.bc",
+  data .. "juice_mga_zero_v02.bc",
+  data .. "juice_sa_meas_230413_230415_s230414_v01.bc",
+  data .. "juice_sa_zero_v01.bc",
+  data .. "juice_sc_meas_230413_230415_s230414_v01.bc",
+  data .. "juice_swi_scan_zero_v01.bc",
 
-  kernels .. "juice_v32.tf",
-  kernels .. "juice_roi_v02.tf",
-  kernels .. "gphio.tf",
+  data .. "juice_v32.tf",
+  data .. "juice_roi_v02.tf",
+  data .. "gphio.tf",
 
-  kernels .. "juice_aux_v02.ti",
-  kernels .. "juice_gala_v05.ti",
-  kernels .. "juice_janus_v07.ti",
-  kernels .. "juice_jmag_v02.ti",
-  kernels .. "juice_jmc_v02.ti",
-  kernels .. "juice_majis_v07.ti",
-  kernels .. "juice_navcam_v01.ti",
-  kernels .. "juice_pep_v12.ti",
-  kernels .. "juice_radem_v01.ti",
-  kernels .. "juice_rime_v04.ti",
-  kernels .. "juice_rpwi_v03.ti",
-  kernels .. "juice_str_v01.ti",
-  kernels .. "juice_swi_v07.ti",
-  kernels .. "juice_uvs_v06.ti",
+  data .. "juice_aux_v02.ti",
+  data .. "juice_gala_v05.ti",
+  data .. "juice_janus_v07.ti",
+  data .. "juice_jmag_v02.ti",
+  data .. "juice_jmc_v02.ti",
+  data .. "juice_majis_v07.ti",
+  data .. "juice_navcam_v01.ti",
+  data .. "juice_pep_v12.ti",
+  data .. "juice_radem_v01.ti",
+  data .. "juice_rime_v04.ti",
+  data .. "juice_rpwi_v03.ti",
+  data .. "juice_str_v01.ti",
+  data .. "juice_swi_v07.ti",
+  data .. "juice_uvs_v06.ti",
 
-  kernels .. "juice_jup010.tpc",
-  kernels .. "juice_roi_v01.tpc",
+  data .. "juice_jup010.tpc",
+  data .. "juice_roi_v01.tpc",
 
-  kernels .. "juice_step_230414_v01.tsc",
+  data .. "juice_step_230414_v01.tsc",
 
-  kernels .. "juice_crema_5_1_150lb_23_1_v01.bsp",
-  kernels .. "juice_orbc_000031_230414_310721_v03.bsp",
-  kernels .. "jup343_19900101_20500101.bsp",
-  kernels .. "jup344-s2003_j24_19900101_20500101.bsp",
-  kernels .. "jup346_19900101_20500101.bsp",
-  kernels .. "jup365_19900101_20500101.bsp",
-  kernels .. "juice_struct_v17.bsp",
-  kernels .. "juice_roi_v02.bsp"
+  data .. "juice_crema_5_1_150lb_23_1_v01.bsp",
+  data .. "juice_orbc_000031_230414_310721_v03.bsp",
+  data .. "jup343_19900101_20500101.bsp",
+  data .. "jup344-s2003_j24_19900101_20500101.bsp",
+  data .. "jup346_19900101_20500101.bsp",
+  data .. "jup365_19900101_20500101.bsp",
+  data .. "juice_struct_v17.bsp",
+  data .. "juice_roi_v02.bsp"
 }
 
-asset.export("Kernels", Kernels)
+
+local ID = {
+  Juice = "JUICE"
+}
+
+local Frame = {
+  Juice = "JUICE_SPACECRAFT",
+
+  Gala = "JUICE_GALA_RXT",
+  Janus = "JUICE_JANUS",
+  JMC1 = "JUICE_JMC-1",
+  JMC2 = "JUICE_JMC-2",
+  MajisVisnir = "JUICE_MAJIS_VISNIR",
+  MajisVisnirB2 = "JUICE_MAJIS_VISNIR_B2",
+  MajisVisnirB4 = "JUICE_MAJIS_VISNIR_B4",
+  MajisIR = "JUICE_MAJIS_IR",
+  MajisIRB2 = "JUICE_MAJIS_IR_B2",
+  MajisIRB4 = "JUICE_MAJIS_IR_B4",
+  Majis = "JUICE_MAJIS",
+  NavCam = "JUICE_NAVCAM-1",
+  RimeBase = "JUICE_RIME_BASE",
+  Rime = "JUICE_RIME",
+  StarTrackerOH1 = "JUICE_STR-OH1",
+  StarTrackerOH2 = "JUICE_STR-OH2",
+  StarTrackerOH3 = "JUICE_STR-OH3",
+  SwiCH2 = "JUICE_SWI_CH2",
+  SwiFull = "JUICE_SWI_FULL",
+  SwiFullGCO500 = "JUICE_SWI_FULL_GCO500",
+  UVS = "JUICE_UVS",
+
+  GPHIO = "GPHIO"
+}
+
+
+asset.onInitialize(function()
+  openspace.spice.loadKernel(Kernels)
+end)
+
+asset.onDeinitialize(function()
+  openspace.spice.unloadKernel(Kernels)
+end)
+
+asset.export("ID", ID)
+asset.export("Frame", Frame)
 
 
 
diff --git a/data/assets/scene/solarsystem/missions/juice/trails/earth.asset b/data/assets/scene/solarsystem/missions/juice/trails/earth.asset
index 08d7316072..40a2330f25 100644
--- a/data/assets/scene/solarsystem/missions/juice/trails/earth.asset
+++ b/data/assets/scene/solarsystem/missions/juice/trails/earth.asset
@@ -1,5 +1,6 @@
 local transforms = asset.require("scene/solarsystem/planets/earth/transforms")
 local kernels = asset.require("../kernels")
+local coreKernels = asset.require("spice/core")
 
 
 
@@ -10,8 +11,8 @@ local JuiceTrailEarth = {
     Type = "RenderableTrailTrajectory",
     Translation = {
       Type = "SpiceTranslation",
-      Target = "JUICE",
-      Observer = "EARTH BARYCENTER"
+      Target = kernels.ID.Juice,
+      Observer = coreKernels.ID.EarthBarycenter
     },
     Color = { 0.30, 0.70, 0.20 },
     StartTime = "2023 APR 05 12:00:00.000",
@@ -27,15 +28,11 @@ local JuiceTrailEarth = {
 
 
 asset.onInitialize(function()
-  openspace.spice.loadKernel(kernels.Kernels)
-
   openspace.addSceneGraphNode(JuiceTrailEarth)
 end)
 
 asset.onDeinitialize(function()
   openspace.removeSceneGraphNode(JuiceTrailEarth)
-
-  openspace.spice.unloadKernel(kernels.Kernels)
 end)
 
 asset.export(JuiceTrailEarth)
diff --git a/data/assets/scene/solarsystem/missions/juice/trails/ganymede.asset b/data/assets/scene/solarsystem/missions/juice/trails/ganymede.asset
index 3618fcdb92..2213134616 100644
--- a/data/assets/scene/solarsystem/missions/juice/trails/ganymede.asset
+++ b/data/assets/scene/solarsystem/missions/juice/trails/ganymede.asset
@@ -1,4 +1,5 @@
 local transforms = asset.require("../transforms")
+local kernelsJup = asset.require("scene/solarsystem/planets/jupiter/kernels")
 local kernels = asset.require("../kernels")
 
 
@@ -10,8 +11,8 @@ local JuiceTrailGanymede = {
     Type = "RenderableTrailTrajectory",
     Translation = {
       Type = "SpiceTranslation",
-      Target = "JUICE",
-      Observer = "GANYMEDE"
+      Target = kernels.ID.Juice,
+      Observer = kernelsJup.ID.Ganymede
     },
     Color = { 0.70, 0.770, 0.35 },
     StartTime = "2034 DEC 01 00:00:00.000",
@@ -27,15 +28,11 @@ local JuiceTrailGanymede = {
 
 
 asset.onInitialize(function()
-  openspace.spice.loadKernel(kernels.Kernels)
-
   openspace.addSceneGraphNode(JuiceTrailGanymede)
 end)
 
 asset.onDeinitialize(function()
   openspace.removeSceneGraphNode(JuiceTrailGanymede)
-
-  openspace.spice.unloadKernel(kernels.Kernels)
 end)
 
 asset.export(JuiceTrailGanymede)
diff --git a/data/assets/scene/solarsystem/missions/juice/trails/jupiter.asset b/data/assets/scene/solarsystem/missions/juice/trails/jupiter.asset
index 4d7fbf2ea9..dd350e7ebf 100644
--- a/data/assets/scene/solarsystem/missions/juice/trails/jupiter.asset
+++ b/data/assets/scene/solarsystem/missions/juice/trails/jupiter.asset
@@ -1,5 +1,6 @@
 local transforms = asset.require("scene/solarsystem/planets/jupiter/transforms")
 local kernels = asset.require("../kernels")
+local coreKernels = asset.require("spice/core")
 
 
 
@@ -10,8 +11,8 @@ local JuiceTrailJupiter = {
     Type = "RenderableTrailTrajectory",
     Translation = {
       Type = "SpiceTranslation",
-      Target = "JUICE",
-      Observer = "JUPITER BARYCENTER"
+      Target = kernels.ID.Juice,
+      Observer = coreKernels.ID.JupiterBarycenter
     },
     Color = { 0.70, 0.370, 0.45 },
     StartTime = "2031 JUL 02 00:00:00.000",
@@ -27,15 +28,11 @@ local JuiceTrailJupiter = {
 
 
 asset.onInitialize(function()
-  openspace.spice.loadKernel(kernels.Kernels)
-
   openspace.addSceneGraphNode(JuiceTrailJupiter)
 end)
 
 asset.onDeinitialize(function()
   openspace.removeSceneGraphNode(JuiceTrailJupiter)
-
-  openspace.spice.unloadKernel(kernels.Kernels)
 end)
 
 asset.export(JuiceTrailJupiter)
diff --git a/data/assets/scene/solarsystem/missions/juice/trails/ssb.asset b/data/assets/scene/solarsystem/missions/juice/trails/ssb.asset
index ea0da1b5e1..5007b7fb6f 100644
--- a/data/assets/scene/solarsystem/missions/juice/trails/ssb.asset
+++ b/data/assets/scene/solarsystem/missions/juice/trails/ssb.asset
@@ -1,5 +1,6 @@
 local transforms = asset.require("scene/solarsystem/sun/transforms")
 local kernels = asset.require("../kernels")
+local coreKernels = asset.require("spice/core")
 
 
 
@@ -10,8 +11,8 @@ local JuiceTrail = {
     Type = "RenderableTrailTrajectory",
     Translation = {
       Type = "SpiceTranslation",
-      Target = "JUICE",
-      Observer = "SSB"
+      Target = kernels.ID.Juice,
+      Observer = coreKernels.ID.SolarSystemBarycenter
     },
     Color = { 0.85, 0.85, 0.85 },
     StartTime = "2023 APR 05 12:00:00.000",
@@ -27,15 +28,11 @@ local JuiceTrail = {
 
 
 asset.onInitialize(function()
-  openspace.spice.loadKernel(kernels.Kernels)
-
   openspace.addSceneGraphNode(JuiceTrail)
 end)
 
 asset.onDeinitialize(function()
   openspace.removeSceneGraphNode(JuiceTrail)
-
-  openspace.spice.unloadKernel(kernels.Kernels)
 end)
 
 asset.export(JuiceTrail)
diff --git a/data/assets/scene/solarsystem/missions/juice/transforms.asset b/data/assets/scene/solarsystem/missions/juice/transforms.asset
index 2d625b021c..466e163e0c 100644
--- a/data/assets/scene/solarsystem/missions/juice/transforms.asset
+++ b/data/assets/scene/solarsystem/missions/juice/transforms.asset
@@ -1,5 +1,7 @@
 local jupiterTransforms = asset.require("scene/solarsystem/planets/jupiter/transforms")
+local kernelsJup = asset.require("scene/solarsystem/planets/jupiter/kernels")
 local kernels = asset.require("./kernels")
+local coreKernels = asset.require("spice/core")
 
 
 
@@ -14,13 +16,13 @@ local Juice = {
   Transform = {
     Translation = {
       Type = "SpiceTranslation",
-      Target = "JUICE",
-      Observer = "JUPITER BARYCENTER"
+      Target = kernels.ID.Juice,
+      Observer = coreKernels.ID.JupiterBarycenter
     },
     Rotation = {
       Type = "SpiceRotation",
-      SourceFrame = "JUICE_SPACECRAFT",
-      DestinationFrame = "GALACTIC"
+      SourceFrame = kernels.Frame.Juice,
+      DestinationFrame = coreKernels.Frame.Galactic
     }
   },
   GUI = {
@@ -36,8 +38,8 @@ local GanymedePosition = {
   Transform = {
     Translation = {
       Type = "SpiceTranslation",
-      Target = "GANYMEDE",
-      Observer = "JUPITER BARYCENTER"
+      Target = kernelsJup.ID.Ganymede,
+      Observer = coreKernels.ID.JupiterBarycenter
     }
   },
   GUI = {
@@ -52,8 +54,8 @@ local GPHIO = {
   Transform = {
     Rotation = {
       Type = "SpiceRotation",
-      SourceFrame = "GPHIO",
-      DestinationFrame = "GALACTIC"
+      SourceFrame = kernels.Frame.GPHIO,
+      DestinationFrame = coreKernels.Frame.Galactic
     }
   },
   GUI = {
@@ -69,8 +71,6 @@ local GPHIO = {
 
 
 asset.onInitialize(function()
-  openspace.spice.loadKernel(kernels.Kernels)
-
   openspace.addSceneGraphNode(Juice)
   openspace.addSceneGraphNode(GanymedePosition)
   openspace.addSceneGraphNode(GPHIO)
@@ -80,8 +80,6 @@ asset.onDeinitialize(function()
   openspace.removeSceneGraphNode(GPHIO)
   openspace.removeSceneGraphNode(GanymedePosition)
   openspace.removeSceneGraphNode(Juice)
-
-  openspace.spice.unloadKernel(kernels.Kernels)
 end)
 
 asset.export(Juice)
diff --git a/data/assets/scene/solarsystem/missions/juno/juno.asset b/data/assets/scene/solarsystem/missions/juno/juno.asset
index 750f1c6e42..2dd5272206 100644
--- a/data/assets/scene/solarsystem/missions/juno/juno.asset
+++ b/data/assets/scene/solarsystem/missions/juno/juno.asset
@@ -3,6 +3,7 @@ asset.require("scene/solarsystem/planets/jupiter/layers/colorlayers/jupiter_vide
 local transforms = asset.require("scene/solarsystem/planets/jupiter/transforms")
 local sun = asset.require("scene/solarsystem/sun/sun")
 local kernels = asset.require("./kernels")
+local coreKernels = asset.require("spice/core")
 
 
 
@@ -31,13 +32,13 @@ local Juno = {
   Transform = {
     Translation = {
       Type = "SpiceTranslation",
-      Target = "JUNO",
-      Observer = "JUPITER BARYCENTER"
+      Target = kernels.ID.Juno,
+      Observer = coreKernels.ID.JupiterBarycenter
     },
     Rotation = {
       Type = "SpiceRotation",
-      SourceFrame = "JUNO_SPACECRAFT",
-      DestinationFrame = "GALACTIC"
+      SourceFrame = kernels.Frame.Juno,
+      DestinationFrame = coreKernels.Frame.Galactic
     }
   },
   Renderable = {
@@ -65,8 +66,8 @@ local JunoTrail = {
     Type = "RenderableTrailTrajectory",
     Translation = {
       Type = "SpiceTranslation",
-      Target = "JUNO",
-      Observer = "JUPITER BARYCENTER"
+      Target = kernels.ID.Juno,
+      Observer = coreKernels.ID.JupiterBarycenter
     },
     Color = { 0.70, 0.50, 0.20 },
     StartTime = "2016 JUL 01",
@@ -81,8 +82,6 @@ local JunoTrail = {
 
 
 asset.onInitialize(function()
-  openspace.spice.loadKernel(kernels.kernels)
-
   openspace.addSceneGraphNode(Juno)
   openspace.addSceneGraphNode(JunoTrail)
 end)
@@ -90,8 +89,6 @@ end)
 asset.onDeinitialize(function()
   openspace.removeSceneGraphNode(JunoTrail)
   openspace.removeSceneGraphNode(Juno)
-
-  openspace.spice.unloadKernel(kernels.kernels)
 end)
 
 asset.export(Juno)
diff --git a/data/assets/scene/solarsystem/missions/juno/kernels.asset b/data/assets/scene/solarsystem/missions/juno/kernels.asset
index e21f711bcb..f660655afd 100644
--- a/data/assets/scene/solarsystem/missions/juno/kernels.asset
+++ b/data/assets/scene/solarsystem/missions/juno/kernels.asset
@@ -1,5 +1,4 @@
-
-local kernels = asset.resource({
+local data = asset.resource({
   Name = "Juno Kernels",
   Type = "HttpSynchronization",
   Identifier = "juno_kernels",
@@ -7,113 +6,132 @@ local kernels = asset.resource({
 })
 
 
-local JunoKernels = {
-  kernels .. "juno_v12.tf",
-  kernels .. "JNO_SCLKSCET.00039.tsc",
-  kernels .. "juno_jade_v00.ti",
-  kernels .. "juno_jedi_v00.ti",
-  kernels .. "juno_jiram_v01.ti",
-  kernels .. "juno_junocam_v00.ti",
-  kernels .. "juno_mag_v00.ti",
-  kernels .. "juno_mwr_v01.ti",
-  kernels .. "juno_struct_v01.ti",
-  kernels .. "juno_uvs_v00.ti",
-  kernels .. "juno_waves_v00.ti",
-  kernels .. "juno_mwr_v01.ti",
-  kernels .. "spk_merge_110805_171017_130515.bsp",
-  kernels .. "spk_ref_210111_251021_210111.bsp",
-  kernels .. "juno_sc_nom_110807_171016_v01.bc",
-  kernels .. "juno_sc_prl_110930_111028_jc003c01_v01.bc",
-  kernels .. "juno_sc_prl_111028_111125_jc004b00_v01.bc",
-  kernels .. "juno_sc_prl_111125_111223_jc005b00_v01.bc",
-  kernels .. "juno_sc_prl_111223_120127_jc006a02_v01.bc",
-  kernels .. "juno_sc_prl_120127_120217_jc007a00_v01.bc",
-  kernels .. "juno_sc_prl_120217_120316_jc008b00_v02.bc",
-  kernels .. "juno_sc_prl_120316_120413_jc009a00_v01.bc",
-  kernels .. "juno_sc_prl_120413_120511_jc010a04_v01.bc",
-  kernels .. "juno_sc_prl_120511_120608_jc011a01_v02.bc",
-  kernels .. "juno_sc_prl_120608_120706_jc012b01_v01.bc",
-  kernels .. "juno_sc_prl_120706_120802_jc013a01_v01.bc",
-  kernels .. "juno_sc_prl_120802_120824_jc014b01_v01.bc",
-  kernels .. "juno_sc_prl_120824_120928_jc015m00_v01.bc",
-  kernels .. "juno_sc_prl_120919_120928_jc015o00_v01.bc",
-  kernels .. "juno_sc_prl_120928_121026_jc016c03_v01.bc",
-  kernels .. "juno_sc_prl_121026_121123_jc017a01_v01.bc",
-  kernels .. "juno_sc_prl_121123_121221_jc018b01_v01.bc",
-  kernels .. "juno_sc_prl_121221_130118_jc019a01_v01.bc",
-  kernels .. "juno_sc_prl_130118_130215_jc020b01_v01.bc",
-  kernels .. "juno_sc_prl_130315_130412_jc022b01_v01.bc",
-  kernels .. "juno_sc_prl_130412_130510_jc023b03_v01.bc",
-  kernels .. "juno_sc_prl_130510_130607_jc024a01_v01.bc",
-  kernels .. "juno_sc_prl_130607_130705_jc025a00_v01.bc",
-  kernels .. "juno_sc_prl_130705_130802_jc026a01_v01.bc",
-  kernels .. "juno_sc_prl_130726_131020_jx024a02_EFB_v03.bc",
-  kernels .. "juno_sc_prl_130802_130830_jc027a02_v01.bc",
-  kernels .. "juno_sc_prl_130830_130927_jc028a01_v01.bc",
-  kernels .. "juno_sc_prl_130926_131025_jc029a00_v01.bc",
-  kernels .. "juno_sc_prl_130927_131025_jc029c01_v01.bc",
-  kernels .. "juno_sc_prl_131022_131025_jc029f00_v01.bc",
-  kernels .. "juno_sc_prl_131025_131122_jc030b04_v01.bc",
-  kernels .. "juno_sc_prl_131122_131220_jc031b01_v01.bc",
-  kernels .. "juno_sc_prl_131220_140124_jc032a01_v01.bc",
-  kernels .. "juno_sc_prl_140124_140214_jc033a01_v01.bc",
-  kernels .. "juno_sc_prl_140214_140314_jc034b01_v01.bc",
-  kernels .. "juno_sc_prl_140314_140411_jc035a01_v01.bc",
-  kernels .. "juno_sc_prl_140411_140509_jc036b01_v01.bc",
-  kernels .. "juno_sc_prl_140509_140606_jc037b02_v01.bc",
-  kernels .. "juno_sc_prl_140606_140704_jc038a01_v01.bc",
-  kernels .. "juno_sc_prl_140704_140801_jc039b01_v01.bc",
-  kernels .. "juno_sc_prl_140801_140829_jc040a01_v01.bc",
-  kernels .. "juno_sc_prl_140829_140926_jc041a01_v01.bc",
-  kernels .. "juno_sc_prl_140926_141024_jc042a01_v01.bc",
-  kernels .. "juno_sc_prl_141024_141121_jc043a01_v01.bc",
-  kernels .. "juno_sc_prl_141105_141121_jc043m01_v01.bc",
-  kernels .. "juno_sc_prl_141107_141121_jc043s01_v01.bc",
-  kernels .. "juno_sc_prl_141121_141219_jc044a01_v01.bc",
-  kernels .. "juno_sc_prl_141219_150123_jc045a01_v01.bc",
-  kernels .. "juno_sc_prl_150123_150213_jc046a01_v01.bc",
-  kernels .. "juno_sc_prl_150213_150313_jc047a01_v01.bc",
-  kernels .. "juno_sc_prl_150312_150409_jc048a01_v01.bc",
-  kernels .. "juno_sc_prl_150410_150508_jc049a01_v01.bc",
-  kernels .. "juno_sc_prl_150508_150605_jc050a01_v01.bc",
-  kernels .. "juno_sc_prl_150605_150703_jc051a01_v01.bc",
-  kernels .. "juno_sc_prl_150703_150731_jc052a01_v01.bc",
-  kernels .. "juno_sc_prl_150731_150828_jc053a01_v01.bc",
-  kernels .. "juno_sc_prl_150805_150828_jc053m00_v01.bc",
-  kernels .. "juno_sc_prl_150807_150828_jc053s00_v01.bc",
-  kernels .. "juno_sc_prl_150828_150924_jc054a00_v01.bc",
-  kernels .. "juno_sc_prl_150924_151023_jc055a00_v01.bc",
-  kernels .. "juno_sc_prl_151023_151120_jc056a00_v01.bc",
-  kernels .. "juno_sc_prl_151120_151218_jc057a00_v01.bc",
-  kernels .. "juno_sc_prl_151218_160115_jc058a00_v01.bc",
-  kernels .. "juno_sc_prl_160115_160212_jc059a00_v01.bc",
-  kernels .. "juno_sc_prl_160212_160311_jc060a00_v01.bc",
-  kernels .. "juno_sc_prl_160311_160408_jc061a00_v01.bc",
-  kernels .. "juno_sc_prl_160408_160506_jc062a00_v01.bc",
-  kernels .. "juno_sc_prl_160506_160603_jc063a00_v01.bc",
-  kernels .. "juno_sc_prl_160603_160630_jc064a00_v01.bc",
-  kernels .. "juno_sc_prl_160708_160729_jm0001rp_v02.bc",
-  kernels .. "juno_sc_prl_160729_160826_jm0002rp_v01.bc",
-  kernels .. "juno_sc_prl_160827_160920_jm0003a00_v01.bc",
-  kernels .. "juno_sc_prl_160924_161019_jm0004a00_v01.bc",
-  kernels .. "juno_sc_prl_161014_161115_jm0005a00_v01.bc",
-  kernels .. "juno_sc_prl_161022_161115_jm0005b00_v01.bc",
-  kernels .. "juno_sc_prl_161115_161213_jx0405rp_v01.bc",
-  kernels .. "juno_sc_prl_161210_170115_jm0031a00_v01.bc",
-  kernels .. "juno_sc_prl_170115_170201_jm0032a00_v01.bc",
-  kernels .. "juno_sc_prl_170201_170309_jm0041a00_v01.bc",
-  kernels .. "juno_sc_prl_170309_170326_jm0042rp_v01.bc",
-  kernels .. "juno_sc_prl_170326_170427_jm0051rp_v01.bc",
-  kernels .. "juno_sc_prl_170427_170518_jm0052rp_v01.bc",
-  kernels .. "juno_sc_prl_170518_170615_jm0061a00_v01.bc",
-  kernels .. "juno_sc_prl_170615_170710_jm0062a00_v01.bc",
-  kernels .. "juno_sc_prl_170710_170805_jm0071a00_v01.bc",
-  kernels .. "juno_sc_prl_170805_170831_jm0072a00_v01.bc",
-  kernels .. "juno_sc_prl_170831_170927_jm0081a00_v01.bc",
-  kernels .. "juno_sc_prl_170927_171023_jm0082a00_v01.bc",
-  kernels .. "juno_sc_prl_171023_171030_jm0091a00_v01.bc",
-  kernels .. "juno_sc_prl_171023_171030_jm0091a00_v01.bc",
-  kernels .. "juno_sc_prl_230228_230407_jm0490rp_v01.bc"
+local Kernels = {
+  data .. "juno_v12.tf",
+  data .. "JNO_SCLKSCET.00039.tsc",
+  data .. "juno_jade_v00.ti",
+  data .. "juno_jedi_v00.ti",
+  data .. "juno_jiram_v01.ti",
+  data .. "juno_junocam_v00.ti",
+  data .. "juno_mag_v00.ti",
+  data .. "juno_mwr_v01.ti",
+  data .. "juno_struct_v01.ti",
+  data .. "juno_uvs_v00.ti",
+  data .. "juno_waves_v00.ti",
+  data .. "juno_mwr_v01.ti",
+  data .. "spk_merge_110805_171017_130515.bsp",
+  data .. "spk_ref_210111_251021_210111.bsp",
+  data .. "juno_sc_nom_110807_171016_v01.bc",
+  data .. "juno_sc_prl_110930_111028_jc003c01_v01.bc",
+  data .. "juno_sc_prl_111028_111125_jc004b00_v01.bc",
+  data .. "juno_sc_prl_111125_111223_jc005b00_v01.bc",
+  data .. "juno_sc_prl_111223_120127_jc006a02_v01.bc",
+  data .. "juno_sc_prl_120127_120217_jc007a00_v01.bc",
+  data .. "juno_sc_prl_120217_120316_jc008b00_v02.bc",
+  data .. "juno_sc_prl_120316_120413_jc009a00_v01.bc",
+  data .. "juno_sc_prl_120413_120511_jc010a04_v01.bc",
+  data .. "juno_sc_prl_120511_120608_jc011a01_v02.bc",
+  data .. "juno_sc_prl_120608_120706_jc012b01_v01.bc",
+  data .. "juno_sc_prl_120706_120802_jc013a01_v01.bc",
+  data .. "juno_sc_prl_120802_120824_jc014b01_v01.bc",
+  data .. "juno_sc_prl_120824_120928_jc015m00_v01.bc",
+  data .. "juno_sc_prl_120919_120928_jc015o00_v01.bc",
+  data .. "juno_sc_prl_120928_121026_jc016c03_v01.bc",
+  data .. "juno_sc_prl_121026_121123_jc017a01_v01.bc",
+  data .. "juno_sc_prl_121123_121221_jc018b01_v01.bc",
+  data .. "juno_sc_prl_121221_130118_jc019a01_v01.bc",
+  data .. "juno_sc_prl_130118_130215_jc020b01_v01.bc",
+  data .. "juno_sc_prl_130315_130412_jc022b01_v01.bc",
+  data .. "juno_sc_prl_130412_130510_jc023b03_v01.bc",
+  data .. "juno_sc_prl_130510_130607_jc024a01_v01.bc",
+  data .. "juno_sc_prl_130607_130705_jc025a00_v01.bc",
+  data .. "juno_sc_prl_130705_130802_jc026a01_v01.bc",
+  data .. "juno_sc_prl_130726_131020_jx024a02_EFB_v03.bc",
+  data .. "juno_sc_prl_130802_130830_jc027a02_v01.bc",
+  data .. "juno_sc_prl_130830_130927_jc028a01_v01.bc",
+  data .. "juno_sc_prl_130926_131025_jc029a00_v01.bc",
+  data .. "juno_sc_prl_130927_131025_jc029c01_v01.bc",
+  data .. "juno_sc_prl_131022_131025_jc029f00_v01.bc",
+  data .. "juno_sc_prl_131025_131122_jc030b04_v01.bc",
+  data .. "juno_sc_prl_131122_131220_jc031b01_v01.bc",
+  data .. "juno_sc_prl_131220_140124_jc032a01_v01.bc",
+  data .. "juno_sc_prl_140124_140214_jc033a01_v01.bc",
+  data .. "juno_sc_prl_140214_140314_jc034b01_v01.bc",
+  data .. "juno_sc_prl_140314_140411_jc035a01_v01.bc",
+  data .. "juno_sc_prl_140411_140509_jc036b01_v01.bc",
+  data .. "juno_sc_prl_140509_140606_jc037b02_v01.bc",
+  data .. "juno_sc_prl_140606_140704_jc038a01_v01.bc",
+  data .. "juno_sc_prl_140704_140801_jc039b01_v01.bc",
+  data .. "juno_sc_prl_140801_140829_jc040a01_v01.bc",
+  data .. "juno_sc_prl_140829_140926_jc041a01_v01.bc",
+  data .. "juno_sc_prl_140926_141024_jc042a01_v01.bc",
+  data .. "juno_sc_prl_141024_141121_jc043a01_v01.bc",
+  data .. "juno_sc_prl_141105_141121_jc043m01_v01.bc",
+  data .. "juno_sc_prl_141107_141121_jc043s01_v01.bc",
+  data .. "juno_sc_prl_141121_141219_jc044a01_v01.bc",
+  data .. "juno_sc_prl_141219_150123_jc045a01_v01.bc",
+  data .. "juno_sc_prl_150123_150213_jc046a01_v01.bc",
+  data .. "juno_sc_prl_150213_150313_jc047a01_v01.bc",
+  data .. "juno_sc_prl_150312_150409_jc048a01_v01.bc",
+  data .. "juno_sc_prl_150410_150508_jc049a01_v01.bc",
+  data .. "juno_sc_prl_150508_150605_jc050a01_v01.bc",
+  data .. "juno_sc_prl_150605_150703_jc051a01_v01.bc",
+  data .. "juno_sc_prl_150703_150731_jc052a01_v01.bc",
+  data .. "juno_sc_prl_150731_150828_jc053a01_v01.bc",
+  data .. "juno_sc_prl_150805_150828_jc053m00_v01.bc",
+  data .. "juno_sc_prl_150807_150828_jc053s00_v01.bc",
+  data .. "juno_sc_prl_150828_150924_jc054a00_v01.bc",
+  data .. "juno_sc_prl_150924_151023_jc055a00_v01.bc",
+  data .. "juno_sc_prl_151023_151120_jc056a00_v01.bc",
+  data .. "juno_sc_prl_151120_151218_jc057a00_v01.bc",
+  data .. "juno_sc_prl_151218_160115_jc058a00_v01.bc",
+  data .. "juno_sc_prl_160115_160212_jc059a00_v01.bc",
+  data .. "juno_sc_prl_160212_160311_jc060a00_v01.bc",
+  data .. "juno_sc_prl_160311_160408_jc061a00_v01.bc",
+  data .. "juno_sc_prl_160408_160506_jc062a00_v01.bc",
+  data .. "juno_sc_prl_160506_160603_jc063a00_v01.bc",
+  data .. "juno_sc_prl_160603_160630_jc064a00_v01.bc",
+  data .. "juno_sc_prl_160708_160729_jm0001rp_v02.bc",
+  data .. "juno_sc_prl_160729_160826_jm0002rp_v01.bc",
+  data .. "juno_sc_prl_160827_160920_jm0003a00_v01.bc",
+  data .. "juno_sc_prl_160924_161019_jm0004a00_v01.bc",
+  data .. "juno_sc_prl_161014_161115_jm0005a00_v01.bc",
+  data .. "juno_sc_prl_161022_161115_jm0005b00_v01.bc",
+  data .. "juno_sc_prl_161115_161213_jx0405rp_v01.bc",
+  data .. "juno_sc_prl_161210_170115_jm0031a00_v01.bc",
+  data .. "juno_sc_prl_170115_170201_jm0032a00_v01.bc",
+  data .. "juno_sc_prl_170201_170309_jm0041a00_v01.bc",
+  data .. "juno_sc_prl_170309_170326_jm0042rp_v01.bc",
+  data .. "juno_sc_prl_170326_170427_jm0051rp_v01.bc",
+  data .. "juno_sc_prl_170427_170518_jm0052rp_v01.bc",
+  data .. "juno_sc_prl_170518_170615_jm0061a00_v01.bc",
+  data .. "juno_sc_prl_170615_170710_jm0062a00_v01.bc",
+  data .. "juno_sc_prl_170710_170805_jm0071a00_v01.bc",
+  data .. "juno_sc_prl_170805_170831_jm0072a00_v01.bc",
+  data .. "juno_sc_prl_170831_170927_jm0081a00_v01.bc",
+  data .. "juno_sc_prl_170927_171023_jm0082a00_v01.bc",
+  data .. "juno_sc_prl_171023_171030_jm0091a00_v01.bc",
+  data .. "juno_sc_prl_171023_171030_jm0091a00_v01.bc",
+  data .. "juno_sc_prl_230228_230407_jm0490rp_v01.bc"
 }
 
-asset.export("kernels", JunoKernels)
+
+local ID = {
+  Juno = "JUNO"
+}
+
+local Frame = {
+  Juno = "JUNO_SPACECRAFT"
+}
+
+asset.onInitialize(function()
+  openspace.spice.loadKernel(Kernels)
+end)
+
+asset.onDeinitialize(function()
+  openspace.spice.unloadKernel(Kernels)
+end)
+
+
+asset.export("ID", ID)
+asset.export("Frame", Frame)
diff --git a/data/assets/scene/solarsystem/missions/messenger/kernels.asset b/data/assets/scene/solarsystem/missions/messenger/kernels.asset
index 35920865e2..7890c05f28 100644
--- a/data/assets/scene/solarsystem/missions/messenger/kernels.asset
+++ b/data/assets/scene/solarsystem/missions/messenger/kernels.asset
@@ -1,4 +1,4 @@
-local kernels = asset.resource({
+local data = asset.resource({
   Name = "Messenger Kernels",
   Type = "HttpSynchronization",
   Identifier = "messenger_spice",
@@ -7,35 +7,52 @@ local kernels = asset.resource({
 
 
 local Kernels = {
-  kernels .. "messenger_2548.tsc",
-  kernels .. "msgr_v231.tf",
+  data .. "messenger_2548.tsc",
+  data .. "msgr_v231.tf",
 
-  kernels .. "de405.bsp",
-  kernels .. "msgr_040803_150430_150430_od431sc_2.bsp",
-  kernels .. "msgr_antenna_v000.bsp",
-  kernels .. "msgr_de405_de423s.bsp",
+  data .. "de405.bsp",
+  data .. "msgr_040803_150430_150430_od431sc_2.bsp",
+  data .. "msgr_antenna_v000.bsp",
+  data .. "msgr_de405_de423s.bsp",
 
-  kernels .. "msgr_epps_v100.ti",
-  kernels .. "msgr_grns_v110.ti",
-  kernels .. "msgr_mag_v021.ti",
-  kernels .. "msgr_mascs_v100.ti",
-  kernels .. "msgr_mdis_v160.ti",
-  kernels .. "msgr_mla_v010.ti",
-  kernels .. "msgr_rs_v111.ti",
-  kernels .. "msgr_xrs_v001.ti",
+  data .. "msgr_epps_v100.ti",
+  data .. "msgr_grns_v110.ti",
+  data .. "msgr_mag_v021.ti",
+  data .. "msgr_mascs_v100.ti",
+  data .. "msgr_mdis_v160.ti",
+  data .. "msgr_mla_v010.ti",
+  data .. "msgr_rs_v111.ti",
+  data .. "msgr_xrs_v001.ti",
 
+  data .. "pck00008.tpc",
+  data .. "pck00008_msgr.tpc",
+  data .. "pck00009_msgr_v10.tpc",
+  data .. "pck00010_msgr_v10.tpc",
+  data .. "pck00010_msgr_v23.tpc",
+  data .. "pck00010.tpc",
 
-  kernels .. "pck00008.tpc",
-  kernels .. "pck00008_msgr.tpc",
-  kernels .. "pck00009_msgr_v10.tpc",
-  kernels .. "pck00010_msgr_v10.tpc",
-  kernels .. "pck00010_msgr_v23.tpc",
-  kernels .. "pck00010.tpc",
-
-  kernels .. "msgr_1103_v02.bc",
-  kernels .. "msgr_1104_v02.bc",
-  kernels .. "msgr_1105_v02.bc",
-  kernels .. "msgr_1106_v02.bc"
+  data .. "msgr_1103_v02.bc",
+  data .. "msgr_1104_v02.bc",
+  data .. "msgr_1105_v02.bc",
+  data .. "msgr_1106_v02.bc"
 }
 
-asset.export("Kernels", Kernels)
+local ID = {
+  Messenger = "MESSENGER"
+}
+
+local Frame = {
+  Messenger = "MSGR_SPACECRAFT"
+}
+
+
+asset.onInitialize(function()
+  openspace.spice.loadKernel(Kernels)
+end)
+
+asset.onDeinitialize(function()
+  openspace.spice.unloadKernel(Kernels)
+end)
+
+asset.export("ID", ID)
+asset.export("Frame", Frame)
diff --git a/data/assets/scene/solarsystem/missions/messenger/mercurymagnetosphere.asset b/data/assets/scene/solarsystem/missions/messenger/mercurymagnetosphere.asset
index 1f100bdb70..0d20153a15 100644
--- a/data/assets/scene/solarsystem/missions/messenger/mercurymagnetosphere.asset
+++ b/data/assets/scene/solarsystem/missions/messenger/mercurymagnetosphere.asset
@@ -1,4 +1,7 @@
 local mercuryTransforms = asset.require("scene/solarsystem/planets/mercury/transforms")
+local coreKernels = asset.require("spice/core")
+
+
 
 local localFolder = asset.resource({
   Name = "Mercury Magnetosphere",
@@ -17,13 +20,13 @@ local Magnetosphere = {
   Transform = {
     Translation = {
       Type = "SpiceTranslation",
-      Target = "MERCURY",
-      Observer = "MERCURY BARYCENTER"
+      Target = coreKernels.ID.Mercury,
+      Observer = coreKernels.ID.MercuryBarycenter
     },
     Rotation = {
       Type = "SpiceRotation",
       SourceFrame = "MERCURYSE",
-      DestinationFrame = "GALACTIC"
+      DestinationFrame = coreKernels.Frame.Galactic
     },
     Scale = {
       Type = "StaticScale",
diff --git a/data/assets/scene/solarsystem/missions/messenger/messenger.asset b/data/assets/scene/solarsystem/missions/messenger/messenger.asset
index 8c47e7f462..e2b6821054 100644
--- a/data/assets/scene/solarsystem/missions/messenger/messenger.asset
+++ b/data/assets/scene/solarsystem/missions/messenger/messenger.asset
@@ -2,6 +2,7 @@ local sun = asset.require("scene/solarsystem/sun/sun")
 local sunTransforms = asset.require("scene/solarsystem/sun/transforms")
 local mercuryTransforms = asset.require("scene/solarsystem/planets/mercury/transforms")
 local kernels = asset.require("./kernels")
+local coreKernels = asset.require("spice/core")
 
 
 local models = asset.resource({
@@ -30,13 +31,13 @@ local Messenger = {
   Transform = {
     Translation = {
       Type = "SpiceTranslation",
-      Target = "MESSENGER",
-      Observer = "SSB"
+      Target = kernels.ID.Messenger,
+      Observer = coreKernels.ID.SolarSystemBarycenter
     },
     Rotation = {
       Type = "SpiceRotation",
-      SourceFrame = "MSGR_SPACECRAFT",
-      DestinationFrame = "GALACTIC"
+      SourceFrame = kernels.Frame.Messenger,
+      DestinationFrame = coreKernels.Frame.Galactic
     }
   },
   GUI = {
@@ -153,8 +154,6 @@ local MessengerTrail = {
 
 
 asset.onInitialize(function()
-  openspace.spice.loadKernel(kernels.Kernels)
-
   openspace.addSceneGraphNode(Messenger)
   openspace.addSceneGraphNode(MessengerProbeBlack)
   openspace.addSceneGraphNode(MessengerProbeFoil)
@@ -172,8 +171,6 @@ asset.onDeinitialize(function()
   openspace.removeSceneGraphNode(MessengerProbeFoil)
   openspace.removeSceneGraphNode(MessengerProbeBlack)
   openspace.removeSceneGraphNode(Messenger)
-
-  openspace.spice.unloadKernel(kernels.Kernels)
 end)
 
 asset.export(Messenger)
diff --git a/data/assets/scene/solarsystem/missions/newhorizons/charon.asset b/data/assets/scene/solarsystem/missions/newhorizons/charon.asset
index 8c2c09ed59..dfd4699df4 100644
--- a/data/assets/scene/solarsystem/missions/newhorizons/charon.asset
+++ b/data/assets/scene/solarsystem/missions/newhorizons/charon.asset
@@ -1,5 +1,7 @@
 local transforms = asset.require("./transforms")
 local sunTransforms = asset.require("scene/solarsystem/sun/transforms")
+local kernels = asset.require("./kernels")
+local coreKernels = asset.require("spice/core")
 
 
 
@@ -19,13 +21,13 @@ local CharonProjection = {
   Transform = {
     Translation = {
       Type = "SpiceTranslation",
-      Target = "CHARON",
-      Observer = "PLUTO BARYCENTER"
+      Target = kernels.ID.Charon,
+      Observer = kernels.ID.PlutoBarycenter
     },
     Rotation = {
       Type = "SpiceRotation",
-      SourceFrame = "IAU_CHARON",
-      DestinationFrame = "GALACTIC"
+      SourceFrame = kernels.Frame.Charon,
+      DestinationFrame = coreKernels.Frame.Galactic
     }
   },
   Renderable = {
@@ -42,12 +44,12 @@ local CharonProjection = {
     },
     MeridianShift = true,
     Projection = {
-      Observer = "NEW HORIZONS",
-      Target = "CHARON",
+      Observer = kernels.ID.NewHorizons,
+      Target = kernels.ID.Charon,
       Aberration = "NONE",
       AspectRatio = 2,
       Instrument = {
-        Name = "NH_LORRI",
+        Name = kernels.Frame.Lorri,
         Method = "ELLIPSOID",
         Aberration = "NONE",
         Fovy = 0.2907,
@@ -56,8 +58,8 @@ local CharonProjection = {
         Far = 10000
       },
       PotentialTargets = {
-        "PLUTO",
-        "CHARON"
+        kernels.ID.Pluto,
+        kernels.ID.Charon
       }
     }
   },
@@ -97,10 +99,10 @@ local CharonShadow = {
     Type = "RenderableShadowCylinder",
     Opacity = 0.25,
     TerminatorType = "PENUMBRAL",
-    LightSource = "SUN",
-    Observer = "NEW HORIZONS",
-    Body = "CHARON",
-    BodyFrame = "IAU_CHARON",
+    LightSource = coreKernels.ID.Sun,
+    Observer = kernels.ID.NewHorizons,
+    Body = kernels.ID.Charon,
+    BodyFrame = kernels.Frame.Charon,
     Aberration = "NONE"
   },
   GUI = {
diff --git a/data/assets/scene/solarsystem/missions/newhorizons/fov.asset b/data/assets/scene/solarsystem/missions/newhorizons/fov.asset
index 6dd28a8226..149e8c4ec7 100644
--- a/data/assets/scene/solarsystem/missions/newhorizons/fov.asset
+++ b/data/assets/scene/solarsystem/missions/newhorizons/fov.asset
@@ -1,4 +1,6 @@
 local transforms = asset.require("./transforms")
+local kernels = asset.require("./kernels")
+local coreKernels = asset.require("spice/core")
 
 
 
@@ -18,17 +20,16 @@ local Lorri = {
   },
   Renderable = {
     Type = "RenderableFov",
-    Body = "NEW HORIZONS",
-    Frame = "NH_SPACECRAFT",
+    Body = kernels.ID.NewHorizons,
+    Frame = kernels.Frame.NewHorizons,
     Color = { 0.8, 0.7, 0.7 },
     Instrument = {
-      Name = "NH_LORRI",
+      Name = kernels.Frame.Lorri,
       Aberration = "NONE"
     },
     PotentialTargets = {
-      "Pluto",
-      "Charon",
-      -- "Jupiter", "Io", "Europa", "Ganymede", "Callisto"
+      kernels.ID.Pluto,
+      kernels.ID.Charon
     }
   },
   GUI = {
@@ -48,17 +49,16 @@ local RalphLeisa = {
   },
   Renderable = {
     Type = "RenderableFov",
-    Body = "NEW HORIZONS",
-    Frame = "NH_SPACECRAFT",
+    Body = kernels.ID.NewHorizons,
+    Frame = kernels.Frame.NewHorizons,
     RGB = { 0.8, 0.7, 0.7 },
     Instrument = {
-      Name = "NH_RALPH_LEISA",
+      Name = kernels.Frame.RalphLeisa,
       Aberration = "NONE"
     },
     PotentialTargets = {
-      "Pluto",
-      "Charon",
-      -- "Jupiter", "Io", "Europa", "Ganymede", "Callisto"
+      kernels.ID.Pluto,
+      kernels.ID.Charon
     }
   },
   GUI = {
@@ -78,17 +78,16 @@ local RalphMvicPan1 = {
   },
   Renderable = {
     Type = "RenderableFov",
-    Body = "NEW HORIZONS",
-    Frame = "NH_SPACECRAFT",
+    Body = kernels.ID.NewHorizons,
+    Frame = kernels.Frame.NewHorizons,
     RGB = { 0.8, 0.7, 0.7 },
     Instrument = {
-      Name = "NH_RALPH_MVIC_PAN1",
+      Name = kernels.Frame.RalphMvicPan1,
       Aberration = "NONE"
     },
     PotentialTargets = {
-      "Pluto",
-      "Charon",
-      -- "Jupiter", "Io", "Europa", "Ganymede", "Callisto"
+      kernels.ID.Pluto,
+      kernels.ID.Charon
     }
   },
   GUI = {
@@ -108,17 +107,16 @@ local RalphMvicPan2 = {
   },
   Renderable = {
     Type = "RenderableFov",
-    Body = "NEW HORIZONS",
-    Frame = "NH_SPACECRAFT",
+    Body = kernels.ID.NewHorizons,
+    Frame = kernels.Frame.NewHorizons,
     RGB = { 0.8, 0.7, 0.7 },
     Instrument = {
-      Name = "NH_RALPH_MVIC_PAN2",
+      Name = kernels.Frame.RalphMvicPan2,
       Aberration = "NONE"
     },
     PotentialTargets = {
-      "Pluto",
-      "Charon",
-      -- "Jupiter", "Io", "Europa", "Ganymede", "Callisto"
+      kernels.ID.Pluto,
+      kernels.ID.Charon
     }
   },
   GUI = {
@@ -138,17 +136,16 @@ local RalphMvicRed = {
   },
   Renderable = {
     Type = "RenderableFov",
-    Body = "NEW HORIZONS",
-    Frame = "NH_SPACECRAFT",
+    Body = kernels.ID.NewHorizons,
+    Frame = kernels.Frame.NewHorizons,
     RGB = { 0.8, 0.7, 0.7 },
     Instrument = {
-      Name = "NH_RALPH_MVIC_RED",
+      Name = kernels.Frame.RalphMvicRed,
       Aberration = "NONE"
     },
     PotentialTargets = {
-      "Pluto",
-      "Charon",
-      -- "Jupiter", "Io", "Europa", "Ganymede", "Callisto"
+      kernels.ID.Pluto,
+      kernels.ID.Charon
     }
   },
   GUI = {
@@ -168,17 +165,16 @@ local RalphMvicBlue = {
   },
   Renderable = {
     Type = "RenderableFov",
-    Body = "NEW HORIZONS",
-    Frame = "NH_SPACECRAFT",
+    Body = kernels.ID.NewHorizons,
+    Frame = kernels.Frame.NewHorizons,
     RGB = { 0.8, 0.7, 0.7 },
     Instrument = {
-      Name = "NH_RALPH_MVIC_BLUE",
+      Name = kernels.Frame.RalphMvicBlue,
       Aberration = "NONE"
     },
     PotentialTargets = {
-      "Pluto",
-      "Charon",
-      -- "Jupiter", "Io", "Europa", "Ganymede", "Callisto"
+      kernels.ID.Pluto,
+      kernels.ID.Charon
     }
   },
   GUI = {
@@ -198,17 +194,16 @@ local RalphMvicFt = {
   },
   Renderable = {
     Type = "RenderableFov",
-    Body = "NEW HORIZONS",
-    Frame = "NH_SPACECRAFT",
+    Body = kernels.ID.NewHorizons,
+    Frame = kernels.Frame.NewHorizons,
     RGB = { 0.8, 0.7, 0.7 },
     Instrument = {
-      Name = "NH_RALPH_MVIC_FT",
+      Name = kernels.Frame.RalphMvicFT,
       Aberration = "NONE"
     },
     PotentialTargets = {
-      "Pluto",
-      "Charon",
-      -- "Jupiter", "Io", "Europa", "Ganymede", "Callisto"
+      kernels.ID.Pluto,
+      kernels.ID.Charon
     }
   },
   GUI = {
@@ -228,17 +223,16 @@ local RalphMvicMethane = {
   },
   Renderable = {
     Type = "RenderableFov",
-    Body = "NEW HORIZONS",
-    Frame = "NH_SPACECRAFT",
+    Body = kernels.ID.NewHorizons,
+    Frame = kernels.Frame.NewHorizons,
     RGB = { 0.8, 0.7, 0.7 },
     Instrument = {
-      Name = "NH_RALPH_MVIC_METHANE",
+      Name = kernels.Frame.RalphMvicMethane,
       Aberration = "NONE"
     },
     PotentialTargets = {
-      "Pluto",
-      "Charon",
-      -- "Jupiter", "Io", "Europa", "Ganymede", "Callisto"
+      kernels.ID.Pluto,
+      kernels.ID.Charon
     }
   },
   GUI = {
@@ -258,17 +252,16 @@ local RalphMvicNir = {
   },
   Renderable = {
     Type = "RenderableFov",
-    Body = "NEW HORIZONS",
-    Frame = "NH_SPACECRAFT",
+    Body = kernels.ID.NewHorizons,
+    Frame = kernels.Frame.NewHorizons,
     RGB = { 0.8, 0.7, 0.7 },
     Instrument = {
-      Name = "NH_RALPH_MVIC_NIR",
+      Name = kernels.Frame.RalphMvicNIR,
       Aberration = "NONE"
     },
     PotentialTargets = {
-      "Pluto",
-      "Charon",
-      -- "Jupiter", "Io", "Europa", "Ganymede", "Callisto"
+      kernels.ID.Pluto,
+      kernels.ID.Charon
     }
   },
   GUI = {
@@ -288,17 +281,16 @@ local AliceAirglow = {
   },
   Renderable = {
     Type = "RenderableFov",
-    Body = "NEW HORIZONS",
-    Frame = "NH_SPACECRAFT",
+    Body = kernels.ID.NewHorizons,
+    Frame = kernels.Frame.NewHorizons,
     RGB = { 0.8, 0.7, 0.7 },
     Instrument = {
-      Name = "NH_ALICE_AIRGLOW",
+      Name = kernels.Frame.AliceAirglow,
       Aberration = "NONE"
     },
     PotentialTargets = {
-      "Pluto",
-      "Charon",
-      -- "Jupiter", "Io", "Europa", "Ganymede", "Callisto"
+      kernels.ID.Pluto,
+      kernels.ID.Charon
     },
     SimplifyBounds = true
   },
@@ -319,17 +311,16 @@ local AliceSoc = {
   },
   Renderable = {
     Type = "RenderableFov",
-    Body = "NEW HORIZONS",
-    Frame = "NH_SPACECRAFT",
+    Body = kernels.ID.NewHorizons,
+    Frame = kernels.Frame.NewHorizons,
     RGB = { 0.8, 0.7, 0.7 },
     Instrument = {
-      Name = "NH_ALICE_SOC",
+      Name = kernels.Frame.AliceSOC,
       Aberration = "NONE"
     },
     PotentialTargets = {
-      "Pluto",
-      "Charon",
-      -- "Jupiter", "Io", "Europa", "Ganymede", "Callisto"
+      kernels.ID.Pluto,
+      kernels.ID.Charon
     }
   },
   GUI = {
@@ -353,9 +344,9 @@ local Rex = {
   },
   Renderable = {
     Type = "RenderableCrawlingLine",
-    Source = "NH_REX",
-    Target = "EARTH",
-    Instrument = "NH_REX",
+    Source = kernels.ID.Rex,
+    Target = coreKernels.ID.Earth,
+    Instrument = kernels.Frame.Rex,
     Color = {
       Start = { 1.0, 0.7, 0.0, 1.0 },
       End = { 0.0, 0.0, 0.0, 0.0 }
diff --git a/data/assets/scene/solarsystem/missions/newhorizons/kernels.asset b/data/assets/scene/solarsystem/missions/newhorizons/kernels.asset
index 435d5c9a49..81742b78e1 100644
--- a/data/assets/scene/solarsystem/missions/newhorizons/kernels.asset
+++ b/data/assets/scene/solarsystem/missions/newhorizons/kernels.asset
@@ -1,4 +1,8 @@
-local Kernels = asset.resource({
+local coreKernels = asset.require("spice/core")
+
+
+
+local data = asset.resource({
   Name = "New Horizons Kernels",
   Type = "HttpSynchronization",
   Identifier = "newhorizons_kernels",
@@ -7,41 +11,88 @@ local Kernels = asset.resource({
 
 
 local NewHorizonsKernels = {
-  Kernels .. "nh_pred_20141201_20190301_od122.bsp",
-  Kernels .. "NavSE_plu047_od122.bsp",
-  Kernels .. "NavPE_de433_od122.bsp",
+  data .. "nh_pred_20141201_20190301_od122.bsp",
+  data .. "NavSE_plu047_od122.bsp",
+  data .. "NavPE_de433_od122.bsp",
 
-  Kernels .. "new-horizons_1121.tsc",
+  data .. "new-horizons_1121.tsc",
 
-  Kernels .. "nh_scispi_2015_pred.bc",
-  Kernels .. "nh_scispi_2015_recon.bc",
-  Kernels .. "nh_lorri_wcs.bc",
+  data .. "nh_scispi_2015_pred.bc",
+  data .. "nh_scispi_2015_recon.bc",
+  data .. "nh_lorri_wcs.bc",
 
-  Kernels .. "PLU_LORRI_ALL_161216.bc",
+  data .. "PLU_LORRI_ALL_161216.bc",
 
-  Kernels .. "nh_targets_v001.tpc",
-  Kernels .. "nh_pcnh_005.tpc",
+  data .. "nh_targets_v001.tpc",
+  data .. "nh_pcnh_005.tpc",
 
-  Kernels .. "nh_v220.tf",
-  Kernels .. "nh_allinstruments_v002.ti",
-  Kernels .. "nh_alice_v200.ti",
-  Kernels .. "nh_lorri_v201.ti",
-  Kernels .. "nh_pepssi_v110.ti",
-  Kernels .. "nh_ralph_v100.ti",
-  Kernels .. "nh_rex_v100.ti",
-  Kernels .. "nh_sdc_v101.ti",
-  Kernels .. "nh_swap_v100.ti",
-  Kernels .. "nh_astr_v000.ti",
-  Kernels .. "nh_fss_v000.ti",
-  Kernels .. "nh_soc_misc_v001.tf",
-  Kernels .. "nh_stars.bsp"
+  data .. "nh_v220.tf",
+  data .. "nh_allinstruments_v002.ti",
+  data .. "nh_alice_v200.ti",
+  data .. "nh_lorri_v201.ti",
+  data .. "nh_pepssi_v110.ti",
+  data .. "nh_ralph_v100.ti",
+  data .. "nh_rex_v100.ti",
+  data .. "nh_sdc_v101.ti",
+  data .. "nh_swap_v100.ti",
+  data .. "nh_astr_v000.ti",
+  data .. "nh_fss_v000.ti",
+  data .. "nh_soc_misc_v001.tf",
+  data .. "nh_stars.bsp"
 }
 
 local PlutoKernels = {
-  Kernels .. "NavPE_de433_od122.bsp",
-  Kernels .. "NavSE_plu047_od122.bsp"
+  data .. "NavPE_de433_od122.bsp",
+  data .. "NavSE_plu047_od122.bsp"
 }
 
-asset.export("Kernels", Kernels)
+local ID = {
+  NewHorizons = "NEW HORIZONS",
+  Rex = "NH_REX",
+  PlutoBarycenter = coreKernels.ID.PlutoBarycenter,
+  Pluto = coreKernels.ID.Pluto,
+  Charon = "CHARON",
+  Nix = "NIX",
+  Hydra = "HYDRA",
+  Kerberos = "KERBEROS",
+  Styx = "SYNX"
+}
+
+local Frame = {
+  NewHorizons = "NH_SPACECRAFT",
+  Lorri = "NH_LORRI",
+  RalphLeisa = "NH_RALPH_LEISA",
+  RalphMvicPan1 = "NH_RALPH_MVIC_PAN1",
+  RalphMvicPan2 = "NH_RALPH_MVIC_PAN2",
+  RalphMvicRed = "NH_RALPH_MVIC_RED",
+  RalphMvicBlue = "NH_RALPH_MVIC_BLUE",
+  RalphMvicFT = "NH_RALPH_MVIC_FT",
+  RalphMvicMethane = "NH_RALPH_MVIC_METHANE",
+  RalphMvicNIR = "NH_RALPH_MVIC_NIR",
+  AliceAirglow = "NH_ALICE_AIRGLOW",
+  AliceSOC = "NH_ALICE_SOC",
+  Rex = "NH_REX",
+
+  Pluto = coreKernels.Frame.Pluto,
+  Charon = coreKernels.Frame.Charon,
+  Hydra = coreKernels.Frame.Hydra,
+  Styx = coreKernels.Frame.Styx,
+  Nix = coreKernels.Frame.Nix,
+  Kerberos = coreKernels.Frame.Kerberos
+}
+
+
+asset.onInitialize(function()
+  openspace.spice.loadKernel(NewHorizonsKernels)
+  openspace.spice.loadKernel(PlutoKernels)
+end)
+
+asset.onDeinitialize(function()
+  openspace.spice.unloadKernel(PlutoKernels)
+  openspace.spice.unloadKernel(NewHorizonsKernels)
+end)
+
+asset.export("ID", ID)
+asset.export("Frame", Frame)
 asset.export("NewHorizonsKernels", NewHorizonsKernels)
 asset.export("PlutoKernels", PlutoKernels)
diff --git a/data/assets/scene/solarsystem/missions/newhorizons/pluto.asset b/data/assets/scene/solarsystem/missions/newhorizons/pluto.asset
index 040af9beef..747fa0adfe 100644
--- a/data/assets/scene/solarsystem/missions/newhorizons/pluto.asset
+++ b/data/assets/scene/solarsystem/missions/newhorizons/pluto.asset
@@ -1,6 +1,7 @@
 local transforms = asset.require("./transforms")
 local sunTransforms = asset.require("scene/solarsystem/sun/transforms")
 local kernels = asset.require("./kernels")
+local coreKernels = asset.require("spice/core")
 
 
 
@@ -41,13 +42,13 @@ local PlutoProjection = {
   Transform = {
     Translation = {
       Type = "SpiceTranslation",
-      Target = "PLUTO",
-      Observer = "PLUTO BARYCENTER"
+      Target = kernels.ID.Pluto,
+      Observer = kernels.ID.PlutoBarycenter
     },
     Rotation = {
       Type = "SpiceRotation",
-      SourceFrame = "IAU_PLUTO",
-      DestinationFrame = "GALACTIC"
+      SourceFrame = kernels.Frame.Pluto,
+      DestinationFrame = coreKernels.Frame.Galactic
     }
   },
   Renderable = {
@@ -71,70 +72,70 @@ local PlutoProjection = {
       EventFile = assets .. "core_v9h_obs_getmets_v8_time_fix_nofrcd_mld.txt",
       -- SequenceType = "hybrid",
       SequenceType = "image-sequence",
-      Observer = "NEW HORIZONS",
-      Target = "PLUTO",
+      Observer = kernels.ID.NewHorizons,
+      Target = kernels.ID.Pluto,
       Aberration = "NONE",
       AspectRatio = 2,
       DataInputTranslation = {
         Instrument = {
           LORRI = {
             DetectorType = "Camera",
-            Spice = { "NH_LORRI" }
+            Spice = { kernels.Frame.Lorri }
           },
           RALPH_MVIC_PAN_FRAME = {
             DetectorType = "Scanner",
             StopCommand = "RALPH_ABORT",
-            Spice = { "NH_RALPH_MVIC_FT" }
+            Spice = { kernels.Frame.RalphMvicFT }
           },
           RALPH_MVIC_COLOR = {
             DetectorType = "Scanner",
             StopCommand = "END_NOM",
             Spice = {
-              "NH_RALPH_MVIC_NIR",
-              "NH_RALPH_MVIC_METHANE",
-              "NH_RALPH_MVIC_RED",
-              "NH_RALPH_MVIC_BLUE"
+              kernels.Frame.RalphMvicNIR,
+              kernels.Frame.RalphMvicMethane,
+              kernels.Frame.RalphMvicRed,
+              kernels.Frame.RalphMvicBlue
             }
           },
           RALPH_LEISA = {
             DetectorType = "Scanner",
             StopCommand = "END_NOM",
-            Spice = { "NH_RALPH_LEISA" }
+            Spice = { kernels.Frame.RalphLeisa }
           },
           RALPH_MVIC_PAN1 = {
             DetectorType = "Scanner",
             StopCommand = "END_NOM",
-            Spice = { "NH_RALPH_MVIC_PAN1" }
+            Spice = { kernels.Frame.RalphMvicPan1 }
           },
           RALPH_MVIC_PAN2 = {
             DetectorType = "Scanner",
             StopCommand = "END_NOM",
-            Spice = { "NH_RALPH_MVIC_PAN2" }
+            Spice = { kernels.Frame.RalphMvicPan2 }
           },
           ALICE_Use_AIRGLOW = {
             DetectorType = "Scanner",
             StopCommand = "ALICE_END_PIXELLIST",
-            Spice = { "NH_ALICE_AIRGLOW" }
+            Spice = { kernels.Frame.AliceAirglow }
           },
           ALICE_Use_AIRGLOW = {
             DetectorType = "Scanner",
             StopCommand = "ALICE_END_HISTOGRAM",
-            Spice = { "NH_ALICE_AIRGLOW" }
+            Spice = { kernels.Frame.AliceAirglow }
           },
           ALICE_Use_SOCC = {
             DetectorType = "Scanner",
             StopCommand = "ALICE_END_PIXELLIST",
-            Spice = { "NH_ALICE_SOC" }
+            Spice = { kernels.Frame.AliceSOC }
           },
           ALICE_Use_SOCC = {
             DetectorType = "Scanner",
             StopCommand = "ALICE_END_HISTOGRAM",
-            Spice = { "NH_ALICE_SOC" }
+            Spice = { kernels.Frame.AliceSOC }
           },
           REX_START = {
             DetectorType = "Scanner",
             StopCommand = "REX_MODE_OFF",
-            Spice = { "NH_REX" }
+            Spice = { kernels.Frame.Rex }
           }
         },
         Target = {
@@ -155,7 +156,7 @@ local PlutoProjection = {
         }
       },
       Instrument = {
-        Name = "NH_LORRI",
+        Name = kernels.Frame.Lorri,
         Method = "ELLIPSOID",
         Aberration = "NONE",
         Fovy = 0.2907,
@@ -164,12 +165,12 @@ local PlutoProjection = {
         Far = 10000
       },
       PotentialTargets = {
-        "PLUTO",
-        "CHARON",
-        "NIX",
-        "HYDRA",
-        "P5",
-        "P4"
+        kernels.ID.Pluto,
+        kernels.ID.Charon,
+        kernels.ID.Nix,
+        kernels.ID.Hydra,
+        kernels.ID.Styx,
+        kernels.ID.Kerberos
       }
     }
   },
@@ -225,10 +226,10 @@ local PlutoShadow = {
     Type = "RenderableShadowCylinder",
     Opacity = 0.25,
     TerminatorType = "PENUMBRAL",
-    LightSource = "SUN",
-    Observer = "NEW HORIZONS",
-    Body = "PLUTO",
-    BodyFrame = "IAU_PLUTO",
+    LightSource = coreKernels.ID.Sun,
+    Observer = kernels.ID.NewHorizons,
+    Body = kernels.ID.Pluto,
+    BodyFrame = kernels.Frame.Pluto,
     Aberration = "NONE"
   },
   GUI = {
@@ -239,8 +240,6 @@ local PlutoShadow = {
 
 
 asset.onInitialize(function()
-  openspace.spice.loadKernel(kernels.NewHorizonsKernels)
-
   openspace.addSceneGraphNode(PlutoProjection)
   openspace.addSceneGraphNode(PlutoBarycenterLabel)
   openspace.addSceneGraphNode(PlutoText)
@@ -252,8 +251,6 @@ asset.onDeinitialize(function()
   openspace.removeSceneGraphNode(PlutoText)
   openspace.removeSceneGraphNode(PlutoBarycenterLabel)
   openspace.removeSceneGraphNode(PlutoProjection)
-
-  openspace.spice.unloadKernel(kernels.NewHorizonsKernels)
 end)
 
 asset.export(PlutoProjection)
diff --git a/data/assets/scene/solarsystem/missions/newhorizons/trail.asset b/data/assets/scene/solarsystem/missions/newhorizons/trail.asset
index c6c1753240..6abb7c6966 100644
--- a/data/assets/scene/solarsystem/missions/newhorizons/trail.asset
+++ b/data/assets/scene/solarsystem/missions/newhorizons/trail.asset
@@ -1,4 +1,5 @@
 local transforms = asset.require("./transforms")
+local kernels = asset.require("./kernels")
 
 
 
@@ -9,8 +10,8 @@ local TrailAtPluto = {
     Type = "RenderableTrailTrajectory",
     Translation = {
       Type = "SpiceTranslation",
-      Target = "NEW HORIZONS",
-      Observer = "PLUTO BARYCENTER"
+      Target = kernels.ID.NewHorizons,
+      Observer = kernels.ID.PlutoBarycenter
     },
     Color = { 1.0, 0.8, 0.4 },
     ShowFullTrail = true,
diff --git a/data/assets/scene/solarsystem/missions/newhorizons/transforms.asset b/data/assets/scene/solarsystem/missions/newhorizons/transforms.asset
index 62dd6bcd64..347db1f371 100644
--- a/data/assets/scene/solarsystem/missions/newhorizons/transforms.asset
+++ b/data/assets/scene/solarsystem/missions/newhorizons/transforms.asset
@@ -1,5 +1,6 @@
 local sunTransforms = asset.require("scene/solarsystem/sun/transforms")
 local kernels = asset.require("./kernels")
+local coreKernels = asset.require("spice/core")
 
 
 
@@ -14,8 +15,8 @@ local PlutoBarycenterAccurate = {
   Transform = {
     Translation = {
       Type = "SpiceTranslation",
-      Target = "PLUTO BARYCENTER",
-      Observer = "SSB"
+      Target = kernels.ID.PlutoBarycenter,
+      Observer = coreKernels.ID.SolarSystemBarycenter
     }
   },
   GUI = {
@@ -30,13 +31,13 @@ local NewHorizonsPosition = {
   Transform = {
     Translation = {
       Type = "SpiceTranslation",
-      Target = "NEW HORIZONS",
-      Observer = "PLUTO BARYCENTER"
+      Target = kernels.ID.NewHorizons,
+      Observer = kernels.ID.PlutoBarycenter
     },
     Rotation = {
       Type = "SpiceRotation",
-      SourceFrame = "NH_SPACECRAFT",
-      DestinationFrame = "GALACTIC"
+      SourceFrame = kernels.Frame.NewHorizons,
+      DestinationFrame = coreKernels.Frame.Galactic
     }
   },
   GUI = {
@@ -47,9 +48,6 @@ local NewHorizonsPosition = {
 
 
 asset.onInitialize(function()
-  openspace.spice.loadKernel(kernels.PlutoKernels)
-  openspace.spice.loadKernel(kernels.NewHorizonsKernels)
-
   openspace.addSceneGraphNode(PlutoBarycenterAccurate)
   openspace.addSceneGraphNode(NewHorizonsPosition)
 end)
@@ -57,9 +55,6 @@ end)
 asset.onDeinitialize(function()
   openspace.removeSceneGraphNode(NewHorizonsPosition)
   openspace.removeSceneGraphNode(PlutoBarycenterAccurate)
-
-  openspace.spice.unloadKernel(kernels.NewHorizonsKernels)
-  openspace.spice.unloadKernel(kernels.PlutoKernels)
 end)
 
 asset.export(PlutoBarycenterAccurate)
diff --git a/data/assets/scene/solarsystem/missions/osirisrex/bennu.asset b/data/assets/scene/solarsystem/missions/osirisrex/bennu.asset
index d4d9c7adbd..9c7e223645 100644
--- a/data/assets/scene/solarsystem/missions/osirisrex/bennu.asset
+++ b/data/assets/scene/solarsystem/missions/osirisrex/bennu.asset
@@ -1,5 +1,7 @@
 local transforms = asset.require("./transforms")
 local sun = asset.require("scene/solarsystem/sun/sun")
+local kernels = asset.require("./kernels")
+local coreKernels = asset.require("spice/core")
 
 
 
@@ -11,16 +13,14 @@ local models = asset.resource({
 })
 
 
-local BennuBodyId = "2101955"
-
 local Bennu = {
   Identifier = "Bennu",
   Parent = transforms.BennuBarycenter.Identifier,
   Transform = {
     Rotation = {
       Type = "SpiceRotation",
-      SourceFrame = "IAU_BENNU",
-      DestinationFrame = "GALACTIC"
+      SourceFrame = kernels.Frame.Bennu,
+      DestinationFrame = coreKernels.Frame.Galactic
     }
   },
   Renderable = {
diff --git a/data/assets/scene/solarsystem/missions/osirisrex/bennu_projection.asset b/data/assets/scene/solarsystem/missions/osirisrex/bennu_projection.asset
index 45b2c0b99d..2b7e392ea6 100644
--- a/data/assets/scene/solarsystem/missions/osirisrex/bennu_projection.asset
+++ b/data/assets/scene/solarsystem/missions/osirisrex/bennu_projection.asset
@@ -1,5 +1,7 @@
 local transforms = asset.require("./transforms")
 local sunTransforms = asset.require("scene/solarsystem/sun/transforms")
+local kernels = asset.require("./kernels")
+local coreKernels = asset.require("spice/core")
 
 
 
@@ -25,35 +27,33 @@ local imagesA = asset.resource({
 })
 
 
-local BennuBodyId = "2101955"
-
 local BennuProjection = {
   Identifier = "BennuProjection",
   Parent = transforms.BennuBarycenter.Identifier,
   Transform = {
     Rotation = {
       Type = "SpiceRotation",
-      SourceFrame = "IAU_BENNU",
-      DestinationFrame = "GALACTIC"
+      SourceFrame = kernels.Frame.Bennu,
+      DestinationFrame = coreKernels.Frame.Galactic
     }
   },
   Renderable = {
     Enabled = true,
     Type = "RenderableModelProjection",
-    Body = BennuBodyId,
+    Body = kernels.ID.Bennu,
     GeometryFile = models .. "Bennu_v20_200k_an.obj",
     Projection = {
       Sequence = { images, imagesA },
       SequenceType = "image-sequence",
-      Observer = "OSIRIS-REX",
-      Target = BennuBodyId,
+      Observer = kernels.ID.OsirisRex,
+      Target = kernels.ID.Bennu,
       Aberration = "NONE",
       TextureMap = true,
       DataInputTranslation = {
         Instruments = {
           ORX_OCAMS_POLYCAM = {
             DetectorType = "Camera",
-            Spice = { "ORX_OCAMS_POLYCAM" },
+            Spice = { kernels.Frame.Polycam },
           },
         },
         Target = {
@@ -72,7 +72,7 @@ local BennuProjection = {
         }
       },
       Instrument = { -- INVALID DATA - JUST FOR TESTING
-        Name = "ORX_OCAMS_POLYCAM",
+        Name = kernels.Frame.Polycam,
         Method = "ELLIPSOID",
         Aberration = "NONE",
         Fovy = 0.792,
@@ -95,8 +95,8 @@ local BennuTrail = {
     Type = "RenderableTrailTrajectory",
     Translation = {
       Type = "SpiceTranslation",
-      Target = BennuBodyId,
-      Observer = "SSB"
+      Target = kernels.ID.Bennu,
+      Observer = coreKernels.ID.SolarSystemBarycenter
     },
     Color = { 0.4, 0.0, 0.7 },
     StartTime = "2015 JAN 01 00:00:00.000",
diff --git a/data/assets/scene/solarsystem/missions/osirisrex/dashboard.asset b/data/assets/scene/solarsystem/missions/osirisrex/dashboard.asset
index 14dc377f73..5427a98485 100644
--- a/data/assets/scene/solarsystem/missions/osirisrex/dashboard.asset
+++ b/data/assets/scene/solarsystem/missions/osirisrex/dashboard.asset
@@ -1,3 +1,8 @@
+local transforms = asset.require("./transforms")
+local model = asset.require("./model")
+
+
+
 local Spacing = {
   Type = "DashboardItemSpacing",
   Identifier = "OsirisRexSpacing",
@@ -10,9 +15,9 @@ local Distance = {
   Identifier = "OsirisRexBennuDistance",
   GuiName = "OSIRIS-REx Bennu Distance",
   SourceType = "Node",
-  SourceNodeName = "OsirisRex",
+  SourceNodeName = model.OsirisRex.Identifier,
   DestinationType = "Node",
-  DestinationNodeName = "BennuBarycenter"
+  DestinationNodeName = transforms.BennuBarycenter.Identifier
 }
 
 local Instruments = {
diff --git a/data/assets/scene/solarsystem/missions/osirisrex/imageplane.asset b/data/assets/scene/solarsystem/missions/osirisrex/imageplane.asset
index 5c4f091058..529a9e19f2 100644
--- a/data/assets/scene/solarsystem/missions/osirisrex/imageplane.asset
+++ b/data/assets/scene/solarsystem/missions/osirisrex/imageplane.asset
@@ -1,4 +1,5 @@
 local transforms = asset.require("./transforms")
+local kernels = asset.require("./kernels")
 
 
 
@@ -17,10 +18,10 @@ local ImagePlane = {
   Parent = transforms.BennuBarycenter.Identifier,
   Renderable = {
     Type = "RenderablePlaneProjection",
-    Frame = "IAU_BENNU",
+    Frame = kernels.Frame.Bennu,
     DefaultTarget = BennuBodyId,
-    Spacecraft = "OSIRIS-REX",
-    Instrument = "ORX_OCAMS_POLYCAM",
+    Spacecraft = kernels.ID.OsirisRex,
+    Instrument = kernels.Frame.Polycam,
     Moving = false,
     Texture = textures .. "defaultProj.png"
   },
diff --git a/data/assets/scene/solarsystem/missions/osirisrex/kernels.asset b/data/assets/scene/solarsystem/missions/osirisrex/kernels.asset
index ac9468e85b..c7cd4915f7 100644
--- a/data/assets/scene/solarsystem/missions/osirisrex/kernels.asset
+++ b/data/assets/scene/solarsystem/missions/osirisrex/kernels.asset
@@ -1,4 +1,8 @@
-local kernels = asset.resource({
+local coreKernels = asset.require("spice/core")
+
+
+
+local data = asset.resource({
   Name = "Osiris Rex Kernels",
   Type = "HttpSynchronization",
   Identifier = "osirisrex_kernels",
@@ -6,111 +10,133 @@ local kernels = asset.resource({
 })
 
 
-local OsirisRexKernels = {
-  kernels .. "orx_v14.tf",
-  kernels .. "orx_ocams_v07.ti",
-  kernels .. "orx_rexis_v01.ti",
-  kernels .. "ORX_SCLKSCET.00061.tsc",
-  kernels .. "bennu_v17.tpc",
-  kernels .. "orx_struct_v04.bsp",
-  kernels .. "orx_sa_red_200106_v02.bc",
-  kernels .. "orx_sa_red_200107_v02.bc",
-  kernels .. "orx_sa_red_200108_v02.bc",
-  kernels .. "orx_sa_red_200109_v02.bc",
-  kernels .. "orx_sa_red_200110_v02.bc",
-  kernels .. "orx_sa_rel_200106_200112_v01.bc",
-  kernels .. "orx_sc_rel_160909_160911_v01.bc",
-  kernels .. "orx_sc_rel_160912_160918_v01.bc",
-  kernels .. "orx_sc_rel_160919_160925_v01.bc",
-  kernels .. "orx_sc_rel_160926_161002_v01.bc",
-  kernels .. "orx_sc_rel_181029_181104_v02.bc",
-  kernels .. "orx_sc_rel_190218_190224_v02.bc",
-  kernels .. "orx_sc_rel_200106_200112_v01.bc",
-  kernels .. "orx_sc_rel_201019_201025_v01.bc",
-  kernels .. "orx_sc_rel_201012_201018_v01.bc",
-  kernels .. "orx_sc_red_200106_v02.bc",
-  kernels .. "orx_sc_red_200107_v02.bc",
-  kernels .. "orx_sc_red_200108_v02.bc",
-  kernels .. "orx_sc_red_200109_v02.bc",
-  kernels .. "orx_sc_red_201020_v02.bc",
-  kernels .. "orx_sc_red_201017_v03.bc",
-  kernels .. "orx_sc_red_201018_v02.bc",
-  kernels .. "orx_sc_red_201019_v02.bc",
-  kernels .. "orx_r_160909_160910_v01.bc",
-  kernels .. "orx_r_160910_160913_v01.bc",
-  kernels .. "orx_r_160913_160915_v01.bc",
-  kernels .. "orx_r_160915_160919_v01.bc",
-  kernels .. "orx_r_160918_160922_v01.bc",
-  kernels .. "orx_r_160919_160922_v01.bc",
-  kernels .. "orx_r_200105_200107_v02.bc",
-  kernels .. "orx_r_200106_200108_v02.bc",
-  kernels .. "orx_r_200107_200109_v02.bc",
-  kernels .. "orx_r_200107_200112_v01.bc",
-  kernels .. "orx_r_200108_200110_v02.bc",
-  kernels .. "orx_r_200109_200111_v02.bc",
-  kernels .. "orx_r_201019_201021_v06.bc",
-  kernels .. "orx_r_201018_201021_v02.bc",
-  kernels .. "orx_r_201018_201020_v03.bc",
-  kernels .. "orx_r_201017_201019_v03.bc",
-  kernels .. "orx_p_160910_161005_xc001b_v01.bc",
-  kernels .. "orx_p_200106_200113_2002_od205_v01.bc",
-  kernels .. "orx_p_200106_200113_2002_od209_v01.bc",
-  kernels .. "orx_p_200106_200113_2002_od210_v01.bc",
-  kernels .. "orx_p_201019_201026_2043tag_od293_v03.bc",
-  kernels .. "orx_p_201012_201019_2042_od291_v04.bc",
-  kernels .. "orx_p_210411_210510_xq006_od297_v05.bc",
-  kernels .. "orx_p_210509_210513_xr001_adm_final_mod_od311_v01.bc",
-  kernels .. "orx_p_210509_210607_xr001_od298_v00.bc",
-  kernels .. "orx_p_230824_231008_src_release_od298_v00.bc",
-  kernels .. "OREX_20160904_M45_complete.bsp",
-  kernels .. "OREX_20160908_M60_complete.bsp",
-  kernels .. "orx_struct_polycam_v01.bc",
-  kernels .. "de424.bsp",
-  kernels .. "bennu_refdrmc_v1.bsp",
-  kernels .. "orx_160908_231024_pgaa2_day06m60.bsp",
-  kernels .. "orx_160908_231024_pgaa3_day06m60_v1.bsp",
-  kernels .. "orx_160909_161228_160919_od005_tcm1_v2.bsp",
-  kernels .. "orx_160909_161228_160930_od006_tcm1_v1.bsp",
-  kernels .. "orx_160909_170101_160912_od004_v1.bsp",
-  kernels .. "orx_160909_170101_161010_od008_v1.bsp",
-  kernels .. "spk_orx_160908_231024_pgaa2_day06m60_v3.bsp",
-  kernels .. "orx_160909_231024_refod009_v2.bsp",
-  kernels .. "orx_171006_231024_171005_refod027_v1.bsp",
-  kernels .. "orx_180301_181201_180921_od044_v1.bsp",
-  kernels .. "orx_180801_190302_181218_od077_v1.bsp",
-  kernels .. "orx_181203_190302_190104_od085_v1.bsp",
-  kernels .. "orx_181231_190305_190215_od099_v1.bsp",
-  kernels .. "orx_190201_190327_190315_od110_v1.bsp",
-  kernels .. "orx_190301_190424_190412_od125_v1.bsp",
-  kernels .. "orx_190401_190522_190508_od137_v1.bsp",
-  kernels .. "orx_190426_190605_190522_od143_v1.bsp",
-  kernels .. "orx_190511_190619_190603_od148_v1.bsp",
-  kernels .. "orx_190601_190625_190614_od154_v1.bsp",
-  kernels .. "orx_190612_190917_190730_od170_v1.bsp",
-  kernels .. "orx_190712_190917_190814_od175_v1.bsp",
-  kernels .. "orx_190809_191008_190923_od182_v1.bsp",
-  kernels .. "orx_190809_191015_191004_od187_v1.bsp",
-  kernels .. "orx_190915_191029_191014_od191_v1.bsp",
-  kernels .. "orx_191001_191105_191021_od194_v1.bsp",
-  kernels .. "orx_191015_191112_191030_od198_v1.bsp",
-  kernels .. "orx_191027_200101_191104_od200_v1.bsp",
-  kernels .. "orx_191101_200225_200214_od223_v1.bsp",
-  kernels .. "orx_200127_200324_200311_od232_v1.bsp",
-  kernels .. "orx_200305_200421_200410_od239_v1.bsp",
-  kernels .. "orx_200401_200418_200418_od242_v2.bsp",
-  kernels .. "orx_200414_200519_200504_od248_v1.bsp",
-  kernels .. "orx_200430_200714_200701_od263_v1.bsp",
-  kernels .. "orx_200616_200811_200727_od269_v1.bsp",
-  kernels .. "orx_200709_200814_200814_od276_v1.bsp",
-  kernels .. "orx_200811_200908_200828_od280_v1.bsp",
-  kernels .. "orx_200827_201020_201020_od294_v1.bsp",
-  kernels .. "orx_201020_201020_201020_od294_v1.bsp",
-  kernels .. "orx_201020_201109_201020_od294_v1.bsp",
-  kernels .. "orx_201020_210524_210103_od297_v1.bsp",
-  kernels .. "orx_210101_210330_210310_od302_v1.bsp",
-  kernels .. "orx_210115_210701_210426_od310-N-ADM-P_v1.bsp",
-  kernels .. "orx_210408_210701_210503_od311-N-ADM-F_v1.bsp",
-  kernels .. "orx_210509_231025_210119_od298-R-ADM1-P-DB1_v1.bsp"
+local Kernels = {
+  data .. "orx_v14.tf",
+  data .. "orx_ocams_v07.ti",
+  data .. "orx_rexis_v01.ti",
+  data .. "ORX_SCLKSCET.00061.tsc",
+  data .. "bennu_v17.tpc",
+  data .. "orx_struct_v04.bsp",
+  data .. "orx_sa_red_200106_v02.bc",
+  data .. "orx_sa_red_200107_v02.bc",
+  data .. "orx_sa_red_200108_v02.bc",
+  data .. "orx_sa_red_200109_v02.bc",
+  data .. "orx_sa_red_200110_v02.bc",
+  data .. "orx_sa_rel_200106_200112_v01.bc",
+  data .. "orx_sc_rel_160909_160911_v01.bc",
+  data .. "orx_sc_rel_160912_160918_v01.bc",
+  data .. "orx_sc_rel_160919_160925_v01.bc",
+  data .. "orx_sc_rel_160926_161002_v01.bc",
+  data .. "orx_sc_rel_181029_181104_v02.bc",
+  data .. "orx_sc_rel_190218_190224_v02.bc",
+  data .. "orx_sc_rel_200106_200112_v01.bc",
+  data .. "orx_sc_rel_201019_201025_v01.bc",
+  data .. "orx_sc_rel_201012_201018_v01.bc",
+  data .. "orx_sc_red_200106_v02.bc",
+  data .. "orx_sc_red_200107_v02.bc",
+  data .. "orx_sc_red_200108_v02.bc",
+  data .. "orx_sc_red_200109_v02.bc",
+  data .. "orx_sc_red_201020_v02.bc",
+  data .. "orx_sc_red_201017_v03.bc",
+  data .. "orx_sc_red_201018_v02.bc",
+  data .. "orx_sc_red_201019_v02.bc",
+  data .. "orx_r_160909_160910_v01.bc",
+  data .. "orx_r_160910_160913_v01.bc",
+  data .. "orx_r_160913_160915_v01.bc",
+  data .. "orx_r_160915_160919_v01.bc",
+  data .. "orx_r_160918_160922_v01.bc",
+  data .. "orx_r_160919_160922_v01.bc",
+  data .. "orx_r_200105_200107_v02.bc",
+  data .. "orx_r_200106_200108_v02.bc",
+  data .. "orx_r_200107_200109_v02.bc",
+  data .. "orx_r_200107_200112_v01.bc",
+  data .. "orx_r_200108_200110_v02.bc",
+  data .. "orx_r_200109_200111_v02.bc",
+  data .. "orx_r_201019_201021_v06.bc",
+  data .. "orx_r_201018_201021_v02.bc",
+  data .. "orx_r_201018_201020_v03.bc",
+  data .. "orx_r_201017_201019_v03.bc",
+  data .. "orx_p_160910_161005_xc001b_v01.bc",
+  data .. "orx_p_200106_200113_2002_od205_v01.bc",
+  data .. "orx_p_200106_200113_2002_od209_v01.bc",
+  data .. "orx_p_200106_200113_2002_od210_v01.bc",
+  data .. "orx_p_201019_201026_2043tag_od293_v03.bc",
+  data .. "orx_p_201012_201019_2042_od291_v04.bc",
+  data .. "orx_p_210411_210510_xq006_od297_v05.bc",
+  data .. "orx_p_210509_210513_xr001_adm_final_mod_od311_v01.bc",
+  data .. "orx_p_210509_210607_xr001_od298_v00.bc",
+  data .. "orx_p_230824_231008_src_release_od298_v00.bc",
+  data .. "OREX_20160904_M45_complete.bsp",
+  data .. "OREX_20160908_M60_complete.bsp",
+  data .. "orx_struct_polycam_v01.bc",
+  data .. "de424.bsp",
+  data .. "bennu_refdrmc_v1.bsp",
+  data .. "orx_160908_231024_pgaa2_day06m60.bsp",
+  data .. "orx_160908_231024_pgaa3_day06m60_v1.bsp",
+  data .. "orx_160909_161228_160919_od005_tcm1_v2.bsp",
+  data .. "orx_160909_161228_160930_od006_tcm1_v1.bsp",
+  data .. "orx_160909_170101_160912_od004_v1.bsp",
+  data .. "orx_160909_170101_161010_od008_v1.bsp",
+  data .. "spk_orx_160908_231024_pgaa2_day06m60_v3.bsp",
+  data .. "orx_160909_231024_refod009_v2.bsp",
+  data .. "orx_171006_231024_171005_refod027_v1.bsp",
+  data .. "orx_180301_181201_180921_od044_v1.bsp",
+  data .. "orx_180801_190302_181218_od077_v1.bsp",
+  data .. "orx_181203_190302_190104_od085_v1.bsp",
+  data .. "orx_181231_190305_190215_od099_v1.bsp",
+  data .. "orx_190201_190327_190315_od110_v1.bsp",
+  data .. "orx_190301_190424_190412_od125_v1.bsp",
+  data .. "orx_190401_190522_190508_od137_v1.bsp",
+  data .. "orx_190426_190605_190522_od143_v1.bsp",
+  data .. "orx_190511_190619_190603_od148_v1.bsp",
+  data .. "orx_190601_190625_190614_od154_v1.bsp",
+  data .. "orx_190612_190917_190730_od170_v1.bsp",
+  data .. "orx_190712_190917_190814_od175_v1.bsp",
+  data .. "orx_190809_191008_190923_od182_v1.bsp",
+  data .. "orx_190809_191015_191004_od187_v1.bsp",
+  data .. "orx_190915_191029_191014_od191_v1.bsp",
+  data .. "orx_191001_191105_191021_od194_v1.bsp",
+  data .. "orx_191015_191112_191030_od198_v1.bsp",
+  data .. "orx_191027_200101_191104_od200_v1.bsp",
+  data .. "orx_191101_200225_200214_od223_v1.bsp",
+  data .. "orx_200127_200324_200311_od232_v1.bsp",
+  data .. "orx_200305_200421_200410_od239_v1.bsp",
+  data .. "orx_200401_200418_200418_od242_v2.bsp",
+  data .. "orx_200414_200519_200504_od248_v1.bsp",
+  data .. "orx_200430_200714_200701_od263_v1.bsp",
+  data .. "orx_200616_200811_200727_od269_v1.bsp",
+  data .. "orx_200709_200814_200814_od276_v1.bsp",
+  data .. "orx_200811_200908_200828_od280_v1.bsp",
+  data .. "orx_200827_201020_201020_od294_v1.bsp",
+  data .. "orx_201020_201020_201020_od294_v1.bsp",
+  data .. "orx_201020_201109_201020_od294_v1.bsp",
+  data .. "orx_201020_210524_210103_od297_v1.bsp",
+  data .. "orx_210101_210330_210310_od302_v1.bsp",
+  data .. "orx_210115_210701_210426_od310-N-ADM-P_v1.bsp",
+  data .. "orx_210408_210701_210503_od311-N-ADM-F_v1.bsp",
+  data .. "orx_210509_231025_210119_od298-R-ADM1-P-DB1_v1.bsp"
 }
 
-asset.export("kernels", OsirisRexKernels)
+local ID = {
+  OsirisRex = "OSIRIS-REX",
+  Bennu = "2101955"
+}
+
+local Frame = {
+  OsirisRex = "ORX_SPACECRAFT",
+  Polycam = "ORX_OCAMS_POLYCAM",
+  Rexis = "ORX_REXIS",
+  Bennu = coreKernels.Frame.Bennu
+}
+
+
+asset.onInitialize(function()
+  openspace.spice.loadKernel(Kernels)
+end)
+
+asset.onDeinitialize(function()
+  openspace.spice.unloadKernel(Kernels)
+end)
+
+asset.export("ID", ID)
+asset.export("Frame", Frame)
diff --git a/data/assets/scene/solarsystem/missions/osirisrex/model.asset b/data/assets/scene/solarsystem/missions/osirisrex/model.asset
index 0f80545668..2d1da05bc7 100644
--- a/data/assets/scene/solarsystem/missions/osirisrex/model.asset
+++ b/data/assets/scene/solarsystem/missions/osirisrex/model.asset
@@ -3,6 +3,7 @@ local sun = asset.require("scene/solarsystem/sun/sun")
 local sunTransforms = asset.require("scene/solarsystem/sun/transforms")
 local earthTransforms = asset.require("scene/solarsystem/planets/earth/transforms")
 local kernels = asset.require("./kernels")
+local coreKernels = asset.require("spice/core")
 
 
 
@@ -22,13 +23,13 @@ local OsirisRex = {
   Transform = {
     Translation = {
       Type = "SpiceTranslation",
-      Target = "OSIRIS-REX",
-      Observer = "SSB"
+      Target = kernels.ID.OsirisRex,
+      Observer = coreKernels.ID.SolarSystemBarycenter
     },
     Rotation = {
       Type = "SpiceRotation",
-      SourceFrame = "ORX_SPACECRAFT",
-      DestinationFrame = "GALACTIC"
+      SourceFrame = kernels.Frame.OsirisRex,
+      DestinationFrame = coreKernels.Frame.Galactic
     }
   },
   Renderable = {
@@ -59,8 +60,8 @@ local PolyCam = {
     },
     Rotation = {
       Type = "SpiceRotation",
-      SourceFrame = "ORX_OCAMS_POLYCAM",
-      DestinationFrame = "ORX_SPACECRAFT"
+      SourceFrame = kernels.Frame.Polycam,
+      DestinationFrame = kernels.Frame.OsirisRex
     }
   },
   Renderable = {
@@ -84,6 +85,17 @@ local PolyCam = {
 local Rexis = {
   Identifier = "ORX_REXIS",
   Parent = OsirisRex.Identifier,
+  Transform = {
+    Translation = {
+      Type = "StaticTranslation",
+      Position = { 0, 0.3371, 0.2712 }
+    },
+    Rotation = {
+      Type = "SpiceRotation",
+      SourceFrame = kernels.Frame.Rexis,
+      DestinationFrame = kernels.Frame.OsirisRex
+    }
+  },
   Renderable = {
     Type = "RenderableModel",
     GeometryFile = models .. "orx_rexis_resized_12_sep_2016.obj",
@@ -96,17 +108,6 @@ local Rexis = {
       }
     }
   },
-  Transform = {
-    Translation = {
-      Type = "StaticTranslation",
-      Position = { 0, 0.3371, 0.2712 }
-    },
-    Rotation = {
-      Type = "SpiceRotation",
-      SourceFrame = "ORX_REXIS",
-      DestinationFrame = "ORX_SPACECRAFT"
-    }
-  },
   GUI = {
     Name = "REXIS",
     Path = "/Solar System/Missions/OSIRIS REx/Instruments"
@@ -119,14 +120,14 @@ local PolyCamFov = {
   Renderable = {
     Type = "RenderableFov",
     Body = "OSIRIS-REX",
-    Frame = "ORX_OCAMS_POLYCAM",
+    Frame = kernels.Frame.Polycam,
     RGB = { 0.8, 0.7, 0.7 },
     Instrument = {
-      Name = "ORX_OCAMS_POLYCAM",
+      Name = kernels.Frame.Polycam,
       Method = "ELLIPSOID",
       Aberration = "NONE"
     },
-    PotentialTargets = { BennuBodyId }
+    PotentialTargets = { kernels.ID.Bennu }
   },
   GUI = {
     Name = "POLYCAM FOV",
@@ -141,17 +142,17 @@ local PolyCamFov = {
 --   Parent = Rexis.Identifier,
 --   Renderable = {
 --     Type = "RenderableFov",
---     Body = "OSIRIS-REX",
---     Frame = "ORX_REXIS",
+--     Body = kernels.Frame.OsirisRex,
+--     Frame = kernels.Frame.Rexis,
 --     RGB = { 0.8, 0.7, 0.7 },
 --     Instrument = {
 --       Name = "ORX_REXIS",
 --       Method = "ELLIPSOID",
 --       Aberration = "NONE"
 --     },
---     PotentialTargets = { BennuBodyId },
+--     PotentialTargets = { kernels.ID.Bennu },
 --     FrameConversions = {
---       [BennuBodyId] = "IAU_BENNU"
+--       [kernels.ID.Bennu] = kernels.Frame.Bennu
 --     }
 --   },
 --   GUI = {
@@ -161,8 +162,6 @@ local PolyCamFov = {
 -- }
 
 asset.onInitialize(function()
-  openspace.spice.loadKernel(kernels.kernels)
-
   openspace.addSceneGraphNode(OsirisRex)
   openspace.addSceneGraphNode(PolyCam)
   openspace.addSceneGraphNode(Rexis)
@@ -176,8 +175,6 @@ asset.onDeinitialize(function()
   openspace.removeSceneGraphNode(Rexis)
   openspace.removeSceneGraphNode(PolyCam)
   openspace.removeSceneGraphNode(OsirisRex)
-
-  openspace.spice.unloadKernel(kernels.kernels)
 end)
 
 asset.export(OsirisRex)
diff --git a/data/assets/scene/solarsystem/missions/osirisrex/trail.asset b/data/assets/scene/solarsystem/missions/osirisrex/trail.asset
index 21b220636a..e3502cedd8 100644
--- a/data/assets/scene/solarsystem/missions/osirisrex/trail.asset
+++ b/data/assets/scene/solarsystem/missions/osirisrex/trail.asset
@@ -1,11 +1,11 @@
 local transforms = asset.require("./transforms")
 local sunTransforms = asset.require("scene/solarsystem/sun/transforms")
 local earthTransforms = asset.require("scene/solarsystem/planets/earth/transforms")
+local kernels = asset.require("./kernels")
+local coreKernels = asset.require("spice/core")
 
 
 
-local BennuBodyId = 2101955
-
 local OsirisRexTrailEarth = {
   Identifier = "OsirisRexTrailEarth",
   Parent = earthTransforms.EarthIAU.Identifier,
@@ -13,9 +13,9 @@ local OsirisRexTrailEarth = {
     Type = "RenderableTrailTrajectory",
     Translation = {
       Type = "SpiceTranslation",
-      Target = "OSIRIS-REX",
-      Frame = "IAU_EARTH",
-      Observer = "EARTH"
+      Target = kernels.Frame.OsirisRex,
+      Frame = coreKernels.Frame.Earth,
+      Observer = coreKernels.ID.Earth
     },
     Color = { 0.9, 0.9, 0.0 },
     StartTime = "2016 SEP 8 23:05:00.50",
@@ -35,8 +35,8 @@ local OsirisRexTrailSolarSystem = {
     Type = "RenderableTrailTrajectory",
     Translation = {
       Type = "SpiceTranslation",
-      Target = "OSIRIS-REX",
-      Observer = "SSB"
+      Target = kernels.ID.OsirisRex,
+      Observer = coreKernels.ID.SolarSystemBarycenter
     },
     Color = { 0.2, 0.9, 0.2 },
     StartTime = "2016 SEP 8 23:05:00.50",
@@ -56,8 +56,8 @@ local OsirisRexTrailBennu = {
     Type = "RenderableTrailTrajectory",
     Translation = {
       Type = "SpiceTranslation",
-      Target = "OSIRIS-REX",
-      Observer = BennuBodyId
+      Target = kernels.ID.OsirisRex,
+      Observer = kernels.ID.Bennu
     },
     Color = { 0.9, 0.2, 0.9 },
     StartTime = "2018 SEP 4 00:00:00",
diff --git a/data/assets/scene/solarsystem/missions/osirisrex/transforms.asset b/data/assets/scene/solarsystem/missions/osirisrex/transforms.asset
index c4a34ec9e5..7820cade83 100644
--- a/data/assets/scene/solarsystem/missions/osirisrex/transforms.asset
+++ b/data/assets/scene/solarsystem/missions/osirisrex/transforms.asset
@@ -1,17 +1,17 @@
 local transforms = asset.require("scene/solarsystem/sun/transforms")
+local kernels = asset.require("./kernels")
+local coreKernels = asset.require("spice/core")
 
 
 
-local BennuBodyId = 2101955
-
 local BennuBarycenter = {
   Identifier = "BennuBarycenter",
   Parent = transforms.SolarSystemBarycenter.Identifier,
   Transform = {
     Translation = {
       Type = "SpiceTranslation",
-      Target = BennuBodyId,
-      Observer = "SSB"
+      Target = kernels.ID.Bennu,
+      Observer = coreKernels.ID.SolarSystemBarycenter
     }
   },
   GUI = {
diff --git a/data/assets/scene/solarsystem/missions/perseverance/kernels.asset b/data/assets/scene/solarsystem/missions/perseverance/kernels.asset
new file mode 100644
index 0000000000..ec5204db90
--- /dev/null
+++ b/data/assets/scene/solarsystem/missions/perseverance/kernels.asset
@@ -0,0 +1,50 @@
+local coreKernels = asset.require("spice/core")
+
+
+
+local data = asset.resource({
+  Name = "Mars 2020 Kernels",
+  Type = "HttpSynchronization",
+  Identifier = "perseverance_kernels",
+  Version = 2
+})
+
+
+local Kernels = {
+  data .. "m2020.tf",
+  data .. "m2020.tsc",
+  data .. "m2020_v04.tf",
+
+  data .. "m2020_cruise_recon_nospin_v1.bc",
+  data .. "m2020_cruise_recon_rawrt_v1.bc",
+  data .. "m2020_cruise_recon_raweng_v1.bc",
+  data .. "m2020_edl_v01.bc",
+
+  data .. "m2020_cruise_od138_v1.bsp",
+  data .. "m2020_edl_v01.bsp",
+  data .. "m2020_surf_rover_loc_0000_0089_v1.bsp"
+}
+
+local ID = {
+  Perseverance = -168,
+
+  Mars = coreKernels.ID.Mars,
+  MarsBarycenter = coreKernels.ID.MarsBarycenter
+}
+
+local Frame = {
+  Mars = coreKernels.Frame.Mars
+}
+
+
+asset.onInitialize(function()
+  openspace.spice.loadKernel(Kernels)
+end)
+
+asset.onDeinitialize(function()
+  openspace.spice.unloadKernel(Kernels)
+end)
+
+asset.export("ID", ID)
+asset.export("Frame", Frame)
+
diff --git a/data/assets/scene/solarsystem/missions/perseverance/model.asset b/data/assets/scene/solarsystem/missions/perseverance/model.asset
index 640ce53ede..dc2cc3d92b 100644
--- a/data/assets/scene/solarsystem/missions/perseverance/model.asset
+++ b/data/assets/scene/solarsystem/missions/perseverance/model.asset
@@ -1,7 +1,8 @@
 local trail = asset.require("./trail")
 local marsTransforms = asset.require("scene/solarsystem/planets/mars/transforms")
 local sun = asset.require("scene/solarsystem/sun/sun")
-local spice = asset.require("./spice")
+local kernels = asset.require("./kernels")
+local coreKernels = asset.require("spice/core")
 
 
 
@@ -16,41 +17,41 @@ local models = asset.resource({
 local TranslationKeyframes = {
   ["1850 JAN 01 00:00:00"] = {
     Type = "SpiceTranslation",
-    Target = spice.ID,
-    Observer = "MARS",
-    Frame = "IAU_MARS",
+    Target = kernels.ID.Perseverance,
+    Observer = kernels.ID.Mars,
+    Frame = kernels.Frame.Mars,
     FixedDate = "2020 JUL 17 13:56:43"
   },
   ["2020 JUL 17 13:56:42"] = {
     Type = "SpiceTranslation",
-    Target = spice.ID,
-    Observer = "MARS",
-    Frame = "IAU_MARS",
+    Target = kernels.ID.Perseverance,
+    Observer = kernels.ID.Mars,
+    Frame = kernels.Frame.Mars,
     FixedDate = "2020 JUL 17 13:56:43"
   },
   ["2020 JUL 17 13:56:43"] = {
     Type = "SpiceTranslation",
-    Target = spice.ID,
-    Observer = "MARS",
-    Frame = "IAU_MARS"
+    Target = kernels.ID.Perseverance,
+    Observer = kernels.ID.Mars,
+    Frame = kernels.Frame.Mars
   },
   ["2020 JUL 17 13:56:44"] = {
     Type = "SpiceTranslation",
-    Target = spice.ID,
-    Observer = "MARS",
-    Frame = "IAU_MARS"
+    Target = kernels.ID.Perseverance,
+    Observer = kernels.ID.Mars,
+    Frame = kernels.Frame.Mars
   },
   ["2021 FEB 18 20:43:48"] = {
     Type = "SpiceTranslation",
-    Target = spice.ID,
-    Observer = "MARS",
-    Frame = "IAU_MARS"
+    Target = kernels.ID.Perseverance,
+    Observer = kernels.ID.Mars,
+    Frame = kernels.Frame.Mars
   },
   ["2021 FEB 18 20:43:49"] = {
     Type = "SpiceTranslation",
-    Target = spice.ID,
-    Observer = "MARS",
-    Frame = "IAU_MARS",
+    Target = kernels.ID.Perseverance,
+    Observer = kernels.ID.Mars,
+    Frame = kernels.Frame.Mars,
     FixedDate = "2021 FEB 18 20:43:48"
   }
 }
@@ -61,13 +62,13 @@ local PerseveranceNode = {
   Transform = {
     Translation = {
       Type = "SpiceTranslation",
-      Target = "MARS",
-      Observer = "MARS BARYCENTER"
+      Target = kernels.ID.Mars,
+      Observer = kernels.ID.MarsBarycenter
     },
     Rotation = {
       Type = "SpiceRotation",
-      SourceFrame = "IAU_MARS",
-      DestinationFrame = "GALACTIC"
+      SourceFrame = kernels.Frame.Mars,
+      DestinationFrame = coreKernels.Frame.Galactic
     }
   },
   GUI = {
@@ -129,8 +130,6 @@ local Body = {
 
 
 asset.onInitialize(function()
-  openspace.spice.loadKernel(spice.Kernels)
-
   openspace.addSceneGraphNode(PerseveranceNode)
   openspace.addSceneGraphNode(Perseverance)
   openspace.addSceneGraphNode(PerseveranceModel)
@@ -142,8 +141,6 @@ asset.onDeinitialize(function()
   openspace.removeSceneGraphNode(PerseveranceModel)
   openspace.removeSceneGraphNode(Perseverance)
   openspace.removeSceneGraphNode(PerseveranceNode)
-
-  openspace.spice.unloadKernel(spice.Kernels)
 end)
 
 asset.export(PerseveranceNode)
diff --git a/data/assets/scene/solarsystem/missions/perseverance/spice.asset b/data/assets/scene/solarsystem/missions/perseverance/spice.asset
deleted file mode 100644
index dd0f679a9c..0000000000
--- a/data/assets/scene/solarsystem/missions/perseverance/spice.asset
+++ /dev/null
@@ -1,26 +0,0 @@
-local kernels = asset.resource({
-  Name = "Mars 2020 Kernels",
-  Type = "HttpSynchronization",
-  Identifier = "perseverance_kernels",
-  Version = 2
-})
-
-
-local m2020_kernels = {
-  kernels .. "m2020.tf",
-  kernels .. "m2020.tsc",
-  kernels .. "m2020_v04.tf",
-
-  kernels .. "m2020_cruise_recon_nospin_v1.bc",
-  kernels .. "m2020_cruise_recon_rawrt_v1.bc",
-  kernels .. "m2020_cruise_recon_raweng_v1.bc",
-  kernels .. "m2020_edl_v01.bc",
-
-  kernels .. "m2020_cruise_od138_v1.bsp",
-  kernels .. "m2020_edl_v01.bsp",
-  kernels .. "m2020_surf_rover_loc_0000_0089_v1.bsp"
-}
-
-asset.export("Kernels", m2020_kernels)
-asset.export("ID", -168)
-
diff --git a/data/assets/scene/solarsystem/missions/perseverance/trail.asset b/data/assets/scene/solarsystem/missions/perseverance/trail.asset
index ad276b361e..97d4c232d8 100644
--- a/data/assets/scene/solarsystem/missions/perseverance/trail.asset
+++ b/data/assets/scene/solarsystem/missions/perseverance/trail.asset
@@ -1,6 +1,7 @@
 local sunTransforms = asset.require("scene/solarsystem/sun/transforms")
 local marsTransforms = asset.require("scene/solarsystem/planets/mars/transforms")
-local spice = asset.require("./spice")
+local kernels = asset.require("./kernels")
+local coreKernels = asset.require("spice/core")
 
 
 
@@ -13,16 +14,16 @@ local PerseveranceTrailSun = {
   Parent = sunTransforms.SolarSystemBarycenter.Identifier,
   Renderable = {
     Type = "RenderableTrailTrajectory",
+    Enabled = false,
     Translation = {
       Type = "SpiceTranslation",
-      Target = spice.ID,
-      Observer = "SSB"
+      Target = kernels.ID.Perseverance,
+      Observer = coreKernels.ID.SolarSystemBarycenter
     },
     Color = { 0.2, 0.7, 0.1 },
     StartTime = StartTime,
     EndTime = EndTime,
-    SampleInterval = 100,
-    Enabled = false
+    SampleInterval = 100
   },
   GUI = {
     Name = "Perseverance Trail (Sun)",
@@ -38,8 +39,8 @@ local PerseveranceTrailMars = {
     Enabled = false,
     Translation = {
       Type = "SpiceTranslation",
-      Target = spice.ID,
-      Observer = "MARS BARYCENTER"
+      Target = kernels.ID.Perseverance,
+      Observer = kernels.ID.MarsBarycenter
     },
     Color = { 0.7, 0.9, 0.6 },
     StartTime = ApproachMars,
@@ -54,8 +55,6 @@ local PerseveranceTrailMars = {
 
 
 asset.onInitialize(function()
-  openspace.spice.loadKernel(spice.Kernels)
-
   openspace.addSceneGraphNode(PerseveranceTrailSun)
   openspace.addSceneGraphNode(PerseveranceTrailMars)
 end)
@@ -63,8 +62,6 @@ end)
 asset.onDeinitialize(function()
   openspace.removeSceneGraphNode(PerseveranceTrailMars)
   openspace.removeSceneGraphNode(PerseveranceTrailSun)
-
-  openspace.spice.unloadKernel(spice.Kernels)
 end)
 
 asset.export(PerseveranceTrailSun)
diff --git a/data/assets/scene/solarsystem/missions/pioneer/pioneer10.asset b/data/assets/scene/solarsystem/missions/pioneer/pioneer10.asset
index c42dc91827..2842f40f52 100644
--- a/data/assets/scene/solarsystem/missions/pioneer/pioneer10.asset
+++ b/data/assets/scene/solarsystem/missions/pioneer/pioneer10.asset
@@ -1,5 +1,6 @@
 local sunTransforms = asset.require("scene/solarsystem/sun/transforms")
 local model = asset.require("scene/solarsystem/missions/pioneer/pioneermodel")
+local coreKernels = asset.require("spice/core")
 
 
 
@@ -20,7 +21,7 @@ local Pioneer10 = {
     Translation = {
       Type = "SpiceTranslation",
       Target = Pioneer10ID,
-      Observer = "SSB"
+      Observer = coreKernels.ID.SolarSystemBarycenter
     }
   },
   Renderable = model.PioneerModel,
@@ -39,7 +40,7 @@ local Pioneer10Trail = {
     Translation = {
       Type = "SpiceTranslation",
       Target = Pioneer10ID,
-      Observer = "SSB"
+      Observer = coreKernels.ID.SolarSystemBarycenter
     },
     Color = { 0.70, 0.50, 0.20 },
     StartTime = "1972 MAR 03 02:04:00",
diff --git a/data/assets/scene/solarsystem/missions/pioneer/pioneer11.asset b/data/assets/scene/solarsystem/missions/pioneer/pioneer11.asset
index 083552a11d..7aac80f72f 100644
--- a/data/assets/scene/solarsystem/missions/pioneer/pioneer11.asset
+++ b/data/assets/scene/solarsystem/missions/pioneer/pioneer11.asset
@@ -1,5 +1,6 @@
 local sunTransforms = asset.require("scene/solarsystem/sun/transforms")
 local model = asset.require("scene/solarsystem/missions/pioneer/pioneermodel")
+local coreKernels = asset.require("spice/core")
 
 
 
@@ -25,7 +26,7 @@ local Pioneer11 = {
     Translation = {
       Type = "SpiceTranslation",
       Target = Pioneer11ID,
-      Observer = "SSB"
+      Observer = coreKernels.ID.SolarSystemBarycenter
     }
   },
   Renderable = model.PioneerModel,
@@ -44,7 +45,7 @@ local Pioneer11Trail = {
     Translation = {
       Type = "SpiceTranslation",
       Target = Pioneer11ID,
-      Observer = "SSB"
+      Observer = coreKernels.ID.SolarSystemBarycenter
     },
     Color = { 0.70, 0.50, 0.20 },
     StartTime = "1973 APR 06 02:25:00.000",
diff --git a/data/assets/scene/solarsystem/missions/rosetta/67p.asset b/data/assets/scene/solarsystem/missions/rosetta/67p.asset
index d906c582a9..09770c0aa8 100644
--- a/data/assets/scene/solarsystem/missions/rosetta/67p.asset
+++ b/data/assets/scene/solarsystem/missions/rosetta/67p.asset
@@ -1,4 +1,6 @@
 local transforms = asset.require("scene/solarsystem/sun/transforms")
+local kernels = asset.require("./kernels")
+local coreKernels = asset.require("spice/core")
 
 
 
@@ -34,8 +36,8 @@ local Barycenter = {
   Transform = {
     Translation = {
       Type = "SpiceTranslation",
-      Target = "CHURYUMOV-GERASIMENKO",
-      Observer = "SSB"
+      Target = kernels.ID.ChurymovGerasimenko,
+      Observer = coreKernels.ID.SolarSystemBarycenter
     }
   },
   GUI = {
@@ -50,8 +52,8 @@ local Comet67P = {
   Transform = {
     Rotation = {
       Type = "SpiceRotation",
-      SourceFrame = "67P/C-G_CK",
-      DestinationFrame = "GALACTIC"
+      SourceFrame = kernels.Frame.ChurymovGerasimenko,
+      DestinationFrame = coreKernels.Frame.Galactic
     }
   },
   BoundingSphere = 5000.0,
@@ -61,8 +63,8 @@ local Comet67P = {
     Projection = {
       Sequence = { imagesDestination },
       SequenceType = "image-sequence",
-      Observer = "ROSETTA",
-      Target = "CHURYUMOV-GERASIMENKO",
+      Observer = kernels.ID.Rosetta,
+      Target = kernels.ID.ChurymovGerasimenko,
       Aberration = "NONE",
       TextureMap = true,
       ShadowMap = true,
@@ -70,7 +72,7 @@ local Comet67P = {
         Instrument = {
           NAVCAM = {
             DetectorType = "Camera",
-            Spice = { "ROS_NAVCAM-A" }
+            Spice = { kernels.Frame.NavCam }
           }
         },
         Target = {
@@ -95,7 +97,7 @@ local Comet67P = {
         }
       },
       Instrument = {
-        Name = "ROS_NAVCAM-A",
+        Name = kernels.Frame.NavCam,
         Method = "ELLIPSOID",
         Aberration = "NONE",
         Fovy = 5.00,
@@ -116,8 +118,8 @@ local Trail67P = {
     Type = "RenderableTrailTrajectory",
     Translation = {
       Type = "SpiceTranslation",
-      Target = "CHURYUMOV-GERASIMENKO",
-      Observer = "SSB"
+      Target = kernels.ID.ChurymovGerasimenko,
+      Observer = coreKernels.ID.SolarSystemBarycenter
     },
     Color = { 0.1, 0.9, 0.2 },
     StartTime = "2014 JAN 01 00:00:00.000",
diff --git a/data/assets/scene/solarsystem/missions/rosetta/dashboard.asset b/data/assets/scene/solarsystem/missions/rosetta/dashboard.asset
index 04c76ffb27..6091b75d85 100644
--- a/data/assets/scene/solarsystem/missions/rosetta/dashboard.asset
+++ b/data/assets/scene/solarsystem/missions/rosetta/dashboard.asset
@@ -1,4 +1,5 @@
-asset.require("./rosetta")
+local rosetta = asset.require("./rosetta")
+local cg = asset.require("./67p")
 
 
 
@@ -14,9 +15,9 @@ local Distance = {
   Identifier = "Rosetta67PDistance",
   GuiName = "Rosetta 67P Distance",
   SourceType = "Node",
-  SourceNodeName = "Rosetta",
+  SourceNodeName = rosetta.Rosetta.Identifier,
   DestinationType = "Node",
-  DestinationNodeName = "67P"
+  DestinationNodeName = cg.Comet67P.Identifier
 }
 
 local Instruments = {
diff --git a/data/assets/scene/solarsystem/missions/rosetta/kernels.asset b/data/assets/scene/solarsystem/missions/rosetta/kernels.asset
new file mode 100644
index 0000000000..1c3b9f0f67
--- /dev/null
+++ b/data/assets/scene/solarsystem/missions/rosetta/kernels.asset
@@ -0,0 +1,80 @@
+local data = asset.resource({
+  Name = "Rosetta Kernels",
+  Type = "HttpSynchronization",
+  Identifier = "rosetta_kernels",
+  Version = 1
+})
+
+
+local Kernels = {
+  data .. "ROS_160718_STEP.TSC",
+  data .. "ros_triv.tsc",
+
+  data .. "CORB_DV_243_01___T19_00325.BSP",
+  data .. "CORB_DV_223_01___T19_00302.BSP",
+  data .. "CORB_DV_145_01___T19_00216.BSP",
+
+  data .. "LORB_DV_236_01___T19_00318.BSP",
+  data .. "LORB_DV_223_01___T19_00302.BSP",
+  data .. "LORB_DV_145_01___T19_00216.BSP",
+
+  data .. "RORB_DV_243_01___T19_00325.BSP",
+  data .. "RORB_DV_223_01___T19_00302.BSP",
+  data .. "RORB_DV_145_01___T19_00216.BSP",
+
+  data .. "ATNR_P040302093352_00127.BC",
+
+  data .. "ROS_STRUCT_V5.BSP",
+
+  data .. "ROS_NAVCAM_V01.TI",
+
+  data .. "ROS_CHURYUMOV_V01.TF",
+  data .. "ROS_V26.TF",
+
+  -- CK
+  -- Rosetta attitude
+  data .. "RATT_DV_243_01_01____00325.BC",
+  data .. "RATT_DV_223_01_01____00302.BC",
+  data .. "RATT_DV_145_01_01____00216.BC",
+
+  -- Comet attitude
+  data .. "CATT_DV_243_01_______00325.BC",
+  data .. "CATT_DV_223_01_______00302.BC",
+  data .. "CATT_DV_145_01_______00216.BC",
+
+  -- High gain antenna
+  data .. "ROS_HGA_2016_V0035.BC",
+  data .. "ROS_HGA_2015_V0053.BC",
+  data .. "ROS_HGA_2014_V0044.BC",
+
+  -- Solar arrays
+  data .. "ROS_SA_2016_V0034.BC",
+  data .. "ROS_SA_2015_V0042.BC",
+  data .. "ROS_SA_2014_V0047.BC",
+
+  data .. "ROS_CGS_RSOC_V03.TPC"
+}
+
+local ID = {
+  Rosetta = "ROSETTA",
+  Philae = "PHILAE",
+  ChurymovGerasimenko = "CHURYUMOV-GERASIMENKO"
+}
+
+local Frame = {
+  Rosetta = "ROS_SPACECRAFT",
+  NavCam = "ROS_NAVCAM-A",
+  ChurymovGerasimenko = "67P/C-G_CK"
+}
+
+
+asset.onInitialize(function()
+  openspace.spice.loadKernel(Kernels)
+end)
+
+asset.onDeinitialize(function()
+  openspace.spice.unloadKernel(Kernels)
+end)
+
+asset.export("ID", ID)
+asset.export("Frame", Frame)
diff --git a/data/assets/scene/solarsystem/missions/rosetta/rosetta.asset b/data/assets/scene/solarsystem/missions/rosetta/rosetta.asset
index 9c85324cd9..c2bed9f39b 100644
--- a/data/assets/scene/solarsystem/missions/rosetta/rosetta.asset
+++ b/data/assets/scene/solarsystem/missions/rosetta/rosetta.asset
@@ -1,6 +1,8 @@
 local sun = asset.require("scene/solarsystem/sun/sun")
 local sunTransforms = asset.require("scene/solarsystem/sun/transforms")
 local transforms = asset.require("./67p")
+local kernels = asset.require("./kernels")
+local coreKernels = asset.require("spice/core")
 
 
 
@@ -11,63 +13,6 @@ local models = asset.resource({
   Version = 5
 })
 
-local kernels = asset.resource({
-  Name = "Rosetta Kernels",
-  Type = "HttpSynchronization",
-  Identifier = "rosetta_kernels",
-  Version = 1
-})
-
-
-local RosettaKernels = {
-  kernels .. "ROS_160718_STEP.TSC",
-  kernels .. "ros_triv.tsc",
-
-  kernels .. "CORB_DV_243_01___T19_00325.BSP",
-  kernels .. "CORB_DV_223_01___T19_00302.BSP",
-  kernels .. "CORB_DV_145_01___T19_00216.BSP",
-
-  kernels .. "LORB_DV_236_01___T19_00318.BSP",
-  kernels .. "LORB_DV_223_01___T19_00302.BSP",
-  kernels .. "LORB_DV_145_01___T19_00216.BSP",
-
-  kernels .. "RORB_DV_243_01___T19_00325.BSP",
-  kernels .. "RORB_DV_223_01___T19_00302.BSP",
-  kernels .. "RORB_DV_145_01___T19_00216.BSP",
-
-  kernels .. "ATNR_P040302093352_00127.BC",
-
-  kernels .. "ROS_STRUCT_V5.BSP",
-
-  kernels .. "ROS_NAVCAM_V01.TI",
-
-  kernels .. "ROS_CHURYUMOV_V01.TF",
-  kernels .. "ROS_V26.TF",
-
-  -- CK
-  -- Rosetta attitude
-  kernels .. "RATT_DV_243_01_01____00325.BC",
-  kernels .. "RATT_DV_223_01_01____00302.BC",
-  kernels .. "RATT_DV_145_01_01____00216.BC",
-
-  -- Comet attitude
-  kernels .. "CATT_DV_243_01_______00325.BC",
-  kernels .. "CATT_DV_223_01_______00302.BC",
-  kernels .. "CATT_DV_145_01_______00216.BC",
-
-  -- High gain antenna
-  kernels .. "ROS_HGA_2016_V0035.BC",
-  kernels .. "ROS_HGA_2015_V0053.BC",
-  kernels .. "ROS_HGA_2014_V0044.BC",
-
-  -- Solar arrays
-  kernels .. "ROS_SA_2016_V0034.BC",
-  kernels .. "ROS_SA_2015_V0042.BC",
-  kernels .. "ROS_SA_2014_V0047.BC",
-
-  kernels .. "ROS_CGS_RSOC_V03.TPC"
-}
-
 local RotationMatrix = {
   0, 1, 0, 0,
   0, 0, 1, 0,
@@ -81,13 +26,13 @@ local RosettaPosition = {
   Transform = {
     Translation = {
       Type = "SpiceTranslation",
-      Target = "ROSETTA",
-      Observer = "SSB"
+      Target = kernels.ID.Rosetta,
+      Observer = coreKernels.ID.SolarSystemBarycenter
     },
     Rotation = {
       Type = "SpiceRotation",
-      SourceFrame = "ROS_SPACECRAFT",
-      DestinationFrame = "GALACTIC"
+      SourceFrame = kernels.Frame.Rosetta,
+      DestinationFrame = coreKernels.Frame.Galactic
     }
   },
   GUI = {
@@ -132,13 +77,13 @@ local PhilaePosition = {
   Transform = {
     Translation = {
       Type = "SpiceTranslation",
-      Target = "PHILAE",
-      Observer = "CHURYUMOV-GERASIMENKO"
+      Target = kernels.ID.Philae,
+      Observer = kernels.ID.ChurymovGerasimenko
     },
     Rotation = {
       Type = "SpiceRotation",
-      SourceFrame = "ROS_SPACECRAFT",
-      DestinationFrame = "GALACTIC",
+      SourceFrame = kernels.Frame.Rosetta,
+      DestinationFrame = coreKernels.Frame.Galactic
     }
   },
   GUI = {
@@ -189,11 +134,11 @@ local NavCamFov = {
   Parent = NavCam.Identifier,
   Renderable = {
     Type = "RenderableFov",
-    Body = "ROSETTA",
-    Frame = "ROS_NAVCAM-A",
+    Body = kernels.ID.Rosetta,
+    Frame = kernels.Frame.NavCam,
     RGB = { 0.8, 0.7, 0.7 },
     Instrument = {
-      Name = "ROS_NAVCAM-A",
+      Name = kernels.Frame.NavCam,
       Method = "ELLIPSOID",
       Aberration = "NONE"
     },
@@ -213,10 +158,10 @@ local ImagePlane = {
   Parent = transforms.Comet67P.Identifier,
   Renderable = {
     Type = "RenderablePlaneProjection",
-    Frame = "67P/C-G_CK",
+    Frame = kernels.Frame.ChurymovGerasimenko,
     DefaultTarget = "CHURYUMOV-GERASIMENKO",
-    Spacecraft = "ROSETTA",
-    Instrument = "ROS_NAVCAM-A",
+    Spacecraft = kernels.ID.Rosetta,
+    Instrument = kernels.Frame.NavCam,
     Moving = false,
     Texture = models .. "defaultProj.png"
   },
@@ -233,8 +178,8 @@ local RosettaCometTrail = {
     Type = "RenderableTrailTrajectory",
     Translation = {
       Type = "SpiceTranslation",
-      Target = "ROSETTA",
-      Observer = "CHURYUMOV-GERASIMENKO"
+      Target = kernels.ID.Rosetta,
+      Observer = kernels.ID.ChurymovGerasimenko
     },
     Color = { 0.288, 0.375, 0.934 },
     StartTime = "2014 AUG 01 12:00:00",
@@ -254,8 +199,8 @@ local PhilaeTrail = {
     Type = "RenderableTrailTrajectory",
     Translation = {
       Type = "SpiceTranslation",
-      Target = "PHILAE",
-      Observer = "CHURYUMOV-GERASIMENKO"
+      Target = kernels.ID.Philae,
+      Observer = kernels.ID.ChurymovGerasimenko
     },
     Color = { 0.8, 0.5, 1.0 },
     StartTime = "2014 NOV 12 08:35:00",
@@ -322,8 +267,6 @@ local TogglePhilaeTrail = {
 
 
 asset.onInitialize(function()
-  openspace.spice.loadKernel(RosettaKernels)
-
   openspace.addSceneGraphNode(RosettaPosition)
   openspace.addSceneGraphNode(Rosetta)
   openspace.addSceneGraphNode(PhilaePosition)
@@ -355,8 +298,6 @@ asset.onDeinitialize(function()
   openspace.removeSceneGraphNode(PhilaePosition)
   openspace.removeSceneGraphNode(Rosetta)
   openspace.removeSceneGraphNode(RosettaPosition)
-
-  openspace.spice.unloadKernel(RosettaKernels)
 end)
 
 asset.export(RosettaPosition)
diff --git a/data/assets/scene/solarsystem/missions/voyager/dashboard.asset b/data/assets/scene/solarsystem/missions/voyager/dashboard.asset
index 45307f17fc..64ab43fa87 100644
--- a/data/assets/scene/solarsystem/missions/voyager/dashboard.asset
+++ b/data/assets/scene/solarsystem/missions/voyager/dashboard.asset
@@ -1,11 +1,16 @@
+local voyager1 = asset.require("./voyager1")
+local voyager2 = asset.require("./voyager2")
+local earth = asset.require("scene/solarsystem/planets/earth/earth")
+
+
 local DistanceVoyager1 = {
   Type = "DashboardItemDistance",
   Identifier = "Voyager1Distance",
   GuiName = "Voyager 1 - Earth Distance",
   SourceType = "Node",
-  SourceNodeName = "Voyager_1",
+  SourceNodeName = voyager1.Voyager_1.Identifier,
   DestinationType = "Node",
-  DestinationNodeName = "Earth",
+  DestinationNodeName = earth.Earth.Identifier,
   Enabled = asset.enabled
 }
 
@@ -14,9 +19,9 @@ local DistanceVoyager2 = {
   Identifier = "Voyager2Distance",
   GuiName = "Voyager 2 - Earth Distance",
   SourceType = "Node",
-  SourceNodeName = "Voyager_2",
+  SourceNodeName = voyager2.Voyager_2.Identifier,
   DestinationType = "Node",
-  DestinationNodeName = "Earth",
+  DestinationNodeName = earth.Earth.Identifier,
   Enabled = asset.enabled
 }
 
diff --git a/data/assets/scene/solarsystem/missions/voyager/voyager1.asset b/data/assets/scene/solarsystem/missions/voyager/voyager1.asset
index e9325eb7a9..0fafe2af1d 100644
--- a/data/assets/scene/solarsystem/missions/voyager/voyager1.asset
+++ b/data/assets/scene/solarsystem/missions/voyager/voyager1.asset
@@ -1,5 +1,6 @@
 local sun = asset.require("scene/solarsystem/sun/sun")
 local sunTransforms = asset.require("scene/solarsystem/sun/transforms")
+local coreKernels = asset.require("spice/core")
 
 
 
@@ -49,7 +50,7 @@ local Voyager1 = {
     Rotation = {
       Type = "SpiceRotation",
       SourceFrame = "VG1_SC_BUS",
-      DestinationFrame = "GALACTIC",
+      DestinationFrame = coreKernels.Frame.Galactic,
       TimeFrame = {
         Type = "TimeFrameInterval",
         Start = "1977-SEP-05 14:10:11.786",
@@ -124,7 +125,7 @@ local VoyagerTrailCruiseEarthJupiter = {
     Translation = {
       Type = "SpiceTranslation",
       Target = "VOYAGER 1",
-      Observer = "SSB"
+      Observer = coreKernels.ID.SolarSystemBarycenter
     },
     Color = { 0.70, 0.50, 0.20 },
     StartTime = "1977 SEP 05",
@@ -148,7 +149,7 @@ local VoyagerTrailEncounterJupiter = {
     Translation = {
       Type = "SpiceTranslation",
       Target = "VOYAGER 1",
-      Observer = "SSB"
+      Observer = coreKernels.ID.SolarSystemBarycenter
     },
     Color = { 0.70, 0.50, 0.20 },
     EnableFade = false,
@@ -173,7 +174,7 @@ local VoyagerTrailCruiseJupiterSaturn = {
     Translation = {
       Type = "SpiceTranslation",
       Target = "VOYAGER 1",
-      Observer = "SSB"
+      Observer = coreKernels.ID.SolarSystemBarycenter
     },
     EnableFade = false,
     Color = { 0.70, 0.50, 0.20 },
@@ -198,7 +199,7 @@ local VoyagerTrailEncounterSaturn = {
     Translation = {
       Type = "SpiceTranslation",
       Target = "VOYAGER 1",
-      Observer = "SSB"
+      Observer = coreKernels.ID.SolarSystemBarycenter
     },
     EnableFade = false,
     Color = { 0.70, 0.50, 0.20 },
@@ -223,7 +224,7 @@ local VoyagerTrailCruiseSaturnInf = {
     Translation = {
       Type = "SpiceTranslation",
       Target = "VOYAGER 1",
-      Observer = "SSB"
+      Observer = coreKernels.ID.SolarSystemBarycenter
     },
     EnableFade = false,
     Color = { 0.70, 0.50, 0.20 },
diff --git a/data/assets/scene/solarsystem/planets/earth/eclipse_shadow.asset b/data/assets/scene/solarsystem/planets/earth/eclipse_shadow.asset
index a3ea5e0a1d..f417d60f6c 100644
--- a/data/assets/scene/solarsystem/planets/earth/eclipse_shadow.asset
+++ b/data/assets/scene/solarsystem/planets/earth/eclipse_shadow.asset
@@ -1,4 +1,5 @@
 local transforms = asset.require("scene/solarsystem/planets/earth/moon/moon")
+local coreKernels = asset.require("spice/core")
 
 local EarthMoonShadow = {
   Identifier = "EarthMoonShadow",
@@ -9,11 +10,11 @@ local EarthMoonShadow = {
     ShadowLength = 1.0,
     UmbralShadowColor = { 0.85, 1.0, 1.0, 0.20 },
     PenumbralShadowColor = { 0.35, 0.35, 0.35, 0.29 },
-    LightSource = "SUN",
-    LightSourceFrame = "IAU_SUN",
-    Shadower = "MOON",
-    ShadowerFrame = "IAU_MOON",
-    Shadowee = "EARTH"
+    LightSource = coreKernels.ID.Sun,
+    LightSourceFrame = coreKernels.Frame.Sun,
+    Shadower = coreKernels.ID.Moon,
+    ShadowerFrame = coreKernels.Frame.Moon,
+    Shadowee = coreKernels.ID.Earth
   },
   GUI = {
     Name = "Earth/Moon Shadow",
diff --git a/data/assets/scene/solarsystem/planets/earth/grids.asset b/data/assets/scene/solarsystem/planets/earth/grids.asset
index 86f1a74494..18ba878fa2 100644
--- a/data/assets/scene/solarsystem/planets/earth/grids.asset
+++ b/data/assets/scene/solarsystem/planets/earth/grids.asset
@@ -1,4 +1,5 @@
 local transforms = asset.require("./transforms")
+local coreKernels = asset.require("spice/core")
 
 
 
@@ -20,8 +21,8 @@ local plane1lsec = {
     },
     Translation = {
       Type = "SpiceTranslation",
-      Target = "EARTH BARYCENTER",
-      Observer = "SSB"
+      Target = coreKernels.ID.EarthBarycenter,
+      Observer = coreKernels.ID.SolarSystemBarycenter
     }
   },
   Renderable = {
@@ -48,8 +49,8 @@ local plane1lmin = {
     },
     Translation = {
       Type = "SpiceTranslation",
-      Target = "EARTH BARYCENTER",
-      Observer = "SSB"
+      Target = coreKernels.ID.EarthBarycenter,
+      Observer = coreKernels.ID.SolarSystemBarycenter
     }
   },
   Renderable = {
diff --git a/data/assets/scene/solarsystem/planets/earth/lagrange_points/l1.asset b/data/assets/scene/solarsystem/planets/earth/lagrange_points/l1.asset
index d558c956f5..c70f723fb6 100644
--- a/data/assets/scene/solarsystem/planets/earth/lagrange_points/l1.asset
+++ b/data/assets/scene/solarsystem/planets/earth/lagrange_points/l1.asset
@@ -1,5 +1,5 @@
-asset.require("spice/base")
 local transforms = asset.require("scene/solarsystem/sun/transforms")
+local coreKernels = asset.require("spice/core")
 
 
 
@@ -18,7 +18,9 @@ local kernels = asset.resource({
 })
 
 
-local L1 = 391
+local ID = {
+  L1 = 391
+}
 
 local L1Position = {
   Identifier = "L1Position",
@@ -26,8 +28,8 @@ local L1Position = {
   Transform = {
     Translation = {
       Type = "SpiceTranslation",
-      Target = L1,
-      Observer = "SSB"
+      Target = ID.L1,
+      Observer = coreKernels.ID.SolarSystemBarycenter
     }
   },
   Tag = { "lagrange_points_earth" , "lagrange_points_earth_l1" },
@@ -93,6 +95,7 @@ asset.onDeinitialize(function()
   openspace.spice.unloadKernel(kernels .. "L1_de431.bsp")
 end)
 
+asset.export("ID", ID)
 asset.export(L1Position)
 asset.export(L1)
 asset.export(L1Label)
diff --git a/data/assets/scene/solarsystem/planets/earth/lagrange_points/l2.asset b/data/assets/scene/solarsystem/planets/earth/lagrange_points/l2.asset
index d819543680..cf970ed160 100644
--- a/data/assets/scene/solarsystem/planets/earth/lagrange_points/l2.asset
+++ b/data/assets/scene/solarsystem/planets/earth/lagrange_points/l2.asset
@@ -1,6 +1,6 @@
-asset.require("scene/solarsystem/sun/sun")
-asset.require("spice/base")
+local sun = asset.require("scene/solarsystem/sun/sun")
 local transforms = asset.require("scene/solarsystem/sun/transforms")
+local coreKernels = asset.require("spice/core")
 
 
 
@@ -19,7 +19,13 @@ local kernels = asset.resource({
 })
 
 
-local L2 = 392
+local ID = {
+  L2 = 392
+}
+
+local Frame = {
+  L2Corevolving = "L2_COREV"
+}
 
 local L2Position = {
   Identifier = "L2Position",
@@ -27,8 +33,8 @@ local L2Position = {
   Transform = {
     Translation = {
       Type = "SpiceTranslation",
-      Target = L2,
-      Observer = "SSB"
+      Target = ID.L2,
+      Observer = coreKernels.ID.SolarSystemBarycenter
     }
   },
   Tag = { "lagrange_points_earth", "lagrange_points_earth_l2" },
@@ -47,8 +53,8 @@ local L2CoRevFrame = {
   Transform = {
     Rotation = {
       Type = "SpiceRotation",
-      SourceFrame = "L2_COREV",
-      DestinationFrame = "GALACTIC"
+      SourceFrame = Frame.L2Corevolving,
+      DestinationFrame = coreKernels.Frame.Galactic
     }
   },
   Tag = { "lagrange_points_earth", "lagrange_points_earth_l2" },
@@ -140,8 +146,8 @@ local L2SunLine = {
   Parent = transforms.SolarSystemBarycenter.Identifier,
   Renderable = {
     Type = "RenderableNodeLine",
-    StartNode = "Sun",
-    EndNode = "L2Small",
+    StartNode = sun.Sun.Identifier,
+    EndNode = L2Small.Identifier,
     Color = { 0.5, 0.5, 0.5 },
     LineWidth = 2
   },
@@ -179,6 +185,8 @@ asset.onDeinitialize(function()
   openspace.spice.unloadKernel(kernels .. "L2_de431.bsp")
 end)
 
+asset.export("ID", ID)
+asset.export("Frame", Frame)
 asset.export(L2Position)
 asset.export(L2CoRevFrame)
 asset.export(L2Small)
diff --git a/data/assets/scene/solarsystem/planets/earth/lagrange_points/l4.asset b/data/assets/scene/solarsystem/planets/earth/lagrange_points/l4.asset
index 6ac6259cf5..674ab5d5df 100644
--- a/data/assets/scene/solarsystem/planets/earth/lagrange_points/l4.asset
+++ b/data/assets/scene/solarsystem/planets/earth/lagrange_points/l4.asset
@@ -1,5 +1,5 @@
-asset.require("spice/base")
 local transforms = asset.require("scene/solarsystem/sun/transforms")
+local coreKernels = asset.require("spice/core")
 
 
 
@@ -18,7 +18,9 @@ local kernels = asset.resource({
 })
 
 
-local L4 = 394
+local ID = {
+  L4 = 394
+}
 
 local L4Position = {
   Identifier = "L4Position",
@@ -26,8 +28,8 @@ local L4Position = {
   Transform = {
     Translation = {
       Type = "SpiceTranslation",
-      Target = L4,
-      Observer = "SSB"
+      Target = ID.L4,
+      Observer = coreKernels.ID.SolarSystemBarycenter
     }
   },
   Tag = { "lagrange_points_earth", "lagrange_points_earth_l4" },
@@ -77,6 +79,7 @@ local L4Label = {
 }
 
 
+
 asset.onInitialize(function()
   openspace.spice.loadKernel(kernels .. "L4_de431.bsp")
 
@@ -93,6 +96,7 @@ asset.onDeinitialize(function()
   openspace.spice.unloadKernel(kernels .. "L4_de431.bsp")
 end)
 
+asset.export("ID", ID)
 asset.export(L4Position)
 asset.export(L4)
 asset.export(L4Label)
diff --git a/data/assets/scene/solarsystem/planets/earth/lagrange_points/l5.asset b/data/assets/scene/solarsystem/planets/earth/lagrange_points/l5.asset
index 952e5efe30..6ccb055f41 100644
--- a/data/assets/scene/solarsystem/planets/earth/lagrange_points/l5.asset
+++ b/data/assets/scene/solarsystem/planets/earth/lagrange_points/l5.asset
@@ -1,5 +1,5 @@
-asset.require("spice/base")
 local transforms = asset.require("scene/solarsystem/sun/transforms")
+local coreKernels = asset.require("spice/core")
 
 
 
@@ -18,7 +18,9 @@ local kernels = asset.resource({
 })
 
 
-local L5 = 395
+local ID = {
+  L5 = 395
+}
 
 local L5Position = {
   Identifier = "L5Position",
@@ -26,8 +28,8 @@ local L5Position = {
   Transform = {
     Translation = {
       Type = "SpiceTranslation",
-      Target = L5,
-      Observer = "SSB"
+      Target = ID.L5,
+      Observer = coreKernels.ID.SolarSystemBarycenter
     }
   },
   Tag = { "lagrange_points_earth", "lagrange_points_earth_l5" },
@@ -77,6 +79,7 @@ local L5Label = {
 }
 
 
+
 asset.onInitialize(function()
   openspace.spice.loadKernel(kernels .. "L5_de431.bsp")
 
@@ -93,6 +96,7 @@ asset.onDeinitialize(function()
   openspace.spice.unloadKernel(kernels .. "L5_de431.bsp")
 end)
 
+asset.export("ID", ID)
 asset.export(L5Position)
 asset.export(L5)
 asset.export(L5Label)
diff --git a/data/assets/scene/solarsystem/planets/earth/magnetosphere/transforms_magnetosphere.asset b/data/assets/scene/solarsystem/planets/earth/magnetosphere/transforms_magnetosphere.asset
index d13e5aed46..d9c1f670df 100644
--- a/data/assets/scene/solarsystem/planets/earth/magnetosphere/transforms_magnetosphere.asset
+++ b/data/assets/scene/solarsystem/planets/earth/magnetosphere/transforms_magnetosphere.asset
@@ -1,18 +1,22 @@
 local transforms = asset.require("scene/solarsystem/planets/earth/transforms")
-asset.require("spice/base")
+local coreKernels = asset.require("spice/core")
 
 
 
 local GSMKernel = asset.resource("../kernels/GSM.ti")
 
+local Frame = {
+  GSM = "GSM" -- Geocentric Solar Magnetospheric
+}
+
 local GSMReferenceFrame = {
   Identifier = "GSMReferenceFrame",
   Parent = transforms.EarthCenter.Identifier,
   Transform = {
     Rotation = {
       Type = "SpiceRotation",
-      SourceFrame = "GSM", -- Geocentric Solar Magnetospheric
-      DestinationFrame = "GALACTIC"
+      SourceFrame = Frame.GSM,
+      DestinationFrame = coreKernels.Frame.Galactic
     }
   },
   GUI = {
@@ -35,6 +39,7 @@ asset.onDeinitialize(function()
   openspace.spice.unloadKernel(GSMKernel)
 end)
 
+asset.export("Frame", Frame)
 asset.export(GSMReferenceFrame)
 
 
diff --git a/data/assets/scene/solarsystem/planets/earth/moon/moon.asset b/data/assets/scene/solarsystem/planets/earth/moon/moon.asset
index a2a23e1dff..f3955832e8 100644
--- a/data/assets/scene/solarsystem/planets/earth/moon/moon.asset
+++ b/data/assets/scene/solarsystem/planets/earth/moon/moon.asset
@@ -1,7 +1,7 @@
-asset.require("spice/base")
 local transforms = asset.require("scene/solarsystem/planets/earth/transforms")
 local sunAsset = asset.require("scene/solarsystem/sun/sun")
 local earthAsset = asset.require("../earth")
+local coreKernels = asset.require("spice/core")
 
 
 
@@ -19,13 +19,13 @@ local Moon = {
   Transform = {
     Translation = {
       Type = "SpiceTranslation",
-      Target = "MOON",
-      Observer = "EARTH BARYCENTER"
+      Target = coreKernels.ID.Moon,
+      Observer = coreKernels.ID.EarthBarycenter
     },
     Rotation = {
       Type = "SpiceRotation",
-      SourceFrame = "IAU_MOON",
-      DestinationFrame = "GALACTIC"
+      SourceFrame = coreKernels.Frame.Moon,
+      DestinationFrame = coreKernels.Frame.Galactic
     }
   },
   Renderable = {
diff --git a/data/assets/scene/solarsystem/planets/earth/moon/trail.asset b/data/assets/scene/solarsystem/planets/earth/moon/trail.asset
index ae4011265d..0291bc7a0a 100644
--- a/data/assets/scene/solarsystem/planets/earth/moon/trail.asset
+++ b/data/assets/scene/solarsystem/planets/earth/moon/trail.asset
@@ -1,5 +1,5 @@
-asset.require("spice/base")
 local transforms = asset.require("../transforms")
+local coreKernels = asset.require("spice/core")
 
 
 
@@ -10,8 +10,8 @@ local MoonTrail = {
     Type = "RenderableTrailOrbit",
     Translation = {
       Type = "SpiceTranslation",
-      Target = "MOON",
-      Observer = "EARTH BARYCENTER"
+      Target = coreKernels.ID.Moon,
+      Observer = coreKernels.ID.EarthBarycenter
     },
     Color = { 0.5, 0.3, 0.3 },
     Period = 27,
@@ -40,8 +40,7 @@ asset.export(MoonTrail)
 asset.meta = {
   Name = "Moon Trail",
   Version = "1.1",
-  Description = [[Moon Trail - This asset contains the trail of the Moon. Data from NASA
-    Spice (see base spice asset)]],
+  Description = "Moon Trail - This asset contains the trail of the Moon",
   Author = "OpenSpace Team",
   URL = "http://openspaceproject.com",
   License = "MIT license"
diff --git a/data/assets/scene/solarsystem/planets/earth/satellites/misc/hubble_trail.asset b/data/assets/scene/solarsystem/planets/earth/satellites/misc/hubble_trail.asset
index 8b7afd1918..c4e7f9870c 100644
--- a/data/assets/scene/solarsystem/planets/earth/satellites/misc/hubble_trail.asset
+++ b/data/assets/scene/solarsystem/planets/earth/satellites/misc/hubble_trail.asset
@@ -1,4 +1,5 @@
 local transforms = asset.require("scene/solarsystem/planets/earth/transforms")
+local coreKernels = asset.require("spice/core")
 
 
 
@@ -24,8 +25,8 @@ local HubblePosition = {
     },
     Rotation = {
       Type = "SpiceRotation",
-      SourceFrame = "GALACTIC",
-      DestinationFrame = "J2000"
+      SourceFrame = coreKernels.Frame.Galactic,
+      DestinationFrame = coreKernels.Frame.J2000
     }
   },
   Tag = { "earth_satellite", "hubble" },
diff --git a/data/assets/scene/solarsystem/planets/earth/satellites/misc/iss.asset b/data/assets/scene/solarsystem/planets/earth/satellites/misc/iss.asset
index 440486aaad..f6a5d79657 100644
--- a/data/assets/scene/solarsystem/planets/earth/satellites/misc/iss.asset
+++ b/data/assets/scene/solarsystem/planets/earth/satellites/misc/iss.asset
@@ -1,5 +1,6 @@
 local transforms = asset.require("scene/solarsystem/planets/earth/transforms")
 local sun = asset.require("scene/solarsystem/sun/sun")
+local coreKernels = asset.require("spice/core")
 
 
 
@@ -33,8 +34,8 @@ local IssPosition = {
     },
     Rotation = {
       Type = "SpiceRotation",
-      SourceFrame = "GALACTIC",
-      DestinationFrame = "J2000"
+      SourceFrame = coreKernels.Frame.Galactic,
+      DestinationFrame = coreKernels.Frame.J2000
     }
   },
   Tag = { "earth_satellite", "ISS" },
diff --git a/data/assets/scene/solarsystem/planets/earth/satellites/weather/aqua.asset b/data/assets/scene/solarsystem/planets/earth/satellites/weather/aqua.asset
index 864ab19e77..4f83510772 100644
--- a/data/assets/scene/solarsystem/planets/earth/satellites/weather/aqua.asset
+++ b/data/assets/scene/solarsystem/planets/earth/satellites/weather/aqua.asset
@@ -1,4 +1,5 @@
 local transforms = asset.require("scene/solarsystem/planets/earth/transforms")
+local coreKernels = asset.require("spice/core")
 
 
 
@@ -25,8 +26,8 @@ local Aqua = {
     },
     Rotation = {
       Type = "SpiceRotation",
-      SourceFrame = "GALACTIC",
-      DestinationFrame = "J2000"
+      SourceFrame = coreKernels.Frame.Galactic,
+      DestinationFrame = coreKernels.Frame.J2000
     }
   },
   Tag = { "earth_satellite", "Aqua" },
diff --git a/data/assets/scene/solarsystem/planets/earth/satellites/weather/snpp.asset b/data/assets/scene/solarsystem/planets/earth/satellites/weather/snpp.asset
index 4c0c6262b6..db49be9f8c 100644
--- a/data/assets/scene/solarsystem/planets/earth/satellites/weather/snpp.asset
+++ b/data/assets/scene/solarsystem/planets/earth/satellites/weather/snpp.asset
@@ -1,4 +1,5 @@
 local transforms = asset.require("scene/solarsystem/planets/earth/transforms")
+local coreKernels = asset.require("spice/core")
 
 
 
@@ -25,8 +26,8 @@ local SNPP = {
     },
     Rotation = {
       Type = "SpiceRotation",
-      SourceFrame = "GALACTIC",
-      DestinationFrame = "J2000"
+      SourceFrame = coreKernels.Frame.Galactic,
+      DestinationFrame = coreKernels.Frame.J2000
     }
   },
   Tag = { "earth_satellite", "SNPP" },
diff --git a/data/assets/scene/solarsystem/planets/earth/satellites/weather/terra.asset b/data/assets/scene/solarsystem/planets/earth/satellites/weather/terra.asset
index 25c4cfee6c..ce5b6c02cf 100644
--- a/data/assets/scene/solarsystem/planets/earth/satellites/weather/terra.asset
+++ b/data/assets/scene/solarsystem/planets/earth/satellites/weather/terra.asset
@@ -1,4 +1,5 @@
 local transforms = asset.require("scene/solarsystem/planets/earth/transforms")
+local coreKernels = asset.require("spice/core")
 
 
 
@@ -25,8 +26,8 @@ local Terra = {
     },
     Rotation = {
       Type = "SpiceRotation",
-      SourceFrame = "GALACTIC",
-      DestinationFrame = "J2000"
+      SourceFrame = coreKernels.Frame.Galactic,
+      DestinationFrame = coreKernels.Frame.J2000
     }
   },
   Tag = { "earth_satellite", "Terra" },
diff --git a/data/assets/scene/solarsystem/planets/earth/trail.asset b/data/assets/scene/solarsystem/planets/earth/trail.asset
index 2b1951f8d8..8d024b1124 100644
--- a/data/assets/scene/solarsystem/planets/earth/trail.asset
+++ b/data/assets/scene/solarsystem/planets/earth/trail.asset
@@ -1,5 +1,5 @@
-asset.require("spice/base")
 local transforms = asset.require("scene/solarsystem/sun/transforms")
+local coreKernels = asset.require("spice/core")
 
 
 
@@ -10,8 +10,8 @@ local EarthTrail = {
     Type = "RenderableTrailOrbit",
     Translation = {
       Type = "SpiceTranslation",
-      Target = "EARTH",
-      Observer = "SSB"
+      Target = coreKernels.ID.Earth,
+      Observer = coreKernels.ID.SolarSystemBarycenter
     },
     Color = { 0.5, 0.8, 1.0 },
     Period = 365.242,
@@ -40,8 +40,7 @@ asset.export(EarthTrail)
 asset.meta = {
   Name = "Earth Trail",
   Version = "1.1",
-  Description = [[Trail of Earth as observed by the Sun. Data from NASA Spice (see base
-    spice asset)]],
+  Description = "Trail of Earth as observed by the Sun",
   Author = "OpenSpace Team",
   URL = "http://openspaceproject.com",
   License = "MIT license"
diff --git a/data/assets/scene/solarsystem/planets/earth/trail_barycenter.asset b/data/assets/scene/solarsystem/planets/earth/trail_barycenter.asset
index 9f02fd484a..04377f7598 100644
--- a/data/assets/scene/solarsystem/planets/earth/trail_barycenter.asset
+++ b/data/assets/scene/solarsystem/planets/earth/trail_barycenter.asset
@@ -1,5 +1,5 @@
-asset.require("spice/base")
 local transforms = asset.require("scene/solarsystem/sun/transforms")
+local coreKernels = asset.require("spice/core")
 
 
 
@@ -11,8 +11,8 @@ local EarthBarycenterTrail = {
     Enabled = false,
     Translation = {
       Type = "SpiceTranslation",
-      Target = "EARTH BARYCENTER",
-      Observer = "SSB"
+      Target = coreKernels.ID.EarthBarycenter,
+      Observer = coreKernels.ID.SolarSystemBarycenter
     },
     Color = { 0.5, 0.8, 1.0 },
     Period = 365.242,
@@ -41,8 +41,7 @@ asset.export(EarthBarycenterTrail)
 asset.meta = {
   Name = "Earth Trail",
   Version = "1.1",
-  Description = [[Trail of Earth's Barycenter as observed by the Sun. Data from NASA Spice
-    (see base spice asset)]],
+  Description = "Trail of Earth's Barycenter as observed by the Sun",
   Author = "OpenSpace Team",
   URL = "http://openspaceproject.com",
   License = "MIT license"
diff --git a/data/assets/scene/solarsystem/planets/earth/transforms.asset b/data/assets/scene/solarsystem/planets/earth/transforms.asset
index 67a91464ab..364bf7ffe9 100644
--- a/data/assets/scene/solarsystem/planets/earth/transforms.asset
+++ b/data/assets/scene/solarsystem/planets/earth/transforms.asset
@@ -1,5 +1,5 @@
-asset.require("spice/base")
 local transforms = asset.require("scene/solarsystem/sun/transforms")
+local coreKernels = asset.require("spice/core")
 
 
 
@@ -9,8 +9,8 @@ local EarthBarycenter = {
   Transform = {
     Translation = {
       Type = "SpiceTranslation",
-      Target = "EARTH BARYCENTER",
-      Observer = "SSB"
+      Target = coreKernels.ID.EarthBarycenter,
+      Observer = coreKernels.ID.SolarSystemBarycenter
     }
   },
   GUI = {
@@ -26,8 +26,8 @@ local EarthCenter = {
   Transform = {
     Translation = {
       Type = "SpiceTranslation",
-      Target = "EARTH",
-      Observer = "EARTH BARYCENTER"
+      Target = coreKernels.ID.Earth,
+      Observer = coreKernels.ID.EarthBarycenter
     }
   },
   GUI = {
@@ -44,8 +44,8 @@ local EarthInertial = {
   Transform = {
     Rotation = {
       Type = "SpiceRotation",
-      SourceFrame = "J2000",
-      DestinationFrame = "GALACTIC",
+      SourceFrame = coreKernels.Frame.J2000,
+      DestinationFrame = coreKernels.Frame.Galactic
     }
   },
   GUI = {
@@ -61,8 +61,8 @@ local EarthIAU = {
   Transform = {
     Rotation = {
       Type = "SpiceRotation",
-      SourceFrame = "IAU_EARTH",
-      DestinationFrame = "GALACTIC",
+      SourceFrame = coreKernels.Frame.Earth,
+      DestinationFrame = coreKernels.Frame.Galactic
     }
   },
   GUI = {
diff --git a/data/assets/scene/solarsystem/planets/jupiter/callisto/callisto.asset b/data/assets/scene/solarsystem/planets/jupiter/callisto/callisto.asset
index c51afd21a6..a355ce50a9 100644
--- a/data/assets/scene/solarsystem/planets/jupiter/callisto/callisto.asset
+++ b/data/assets/scene/solarsystem/planets/jupiter/callisto/callisto.asset
@@ -1,7 +1,7 @@
-asset.require("spice/base")
 asset.require("./trail")
 local transforms = asset.require("../transforms")
-local kernel = asset.require("../kernels")
+local kernels = asset.require("../kernels")
+local coreKernels = asset.require("spice/core")
 
 
 
@@ -17,15 +17,15 @@ local Callisto = {
   Identifier = "Callisto",
   Parent = transforms.JupiterBarycenter.Identifier,
   Transform = {
-    Rotation = {
-      Type = "SpiceRotation",
-      SourceFrame = "IAU_CALLISTO",
-      DestinationFrame = "GALACTIC"
-    },
     Translation = {
       Type = "SpiceTranslation",
-      Target = "CALLISTO",
-      Observer = "JUPITER BARYCENTER"
+      Target = kernels.ID.Callisto,
+      Observer = coreKernels.ID.JupiterBarycenter
+    },
+    Rotation = {
+      Type = "SpiceRotation",
+      SourceFrame = coreKernels.Frame.Callisto,
+      DestinationFrame = coreKernels.Frame.Galactic
     }
   },
   Renderable = {
@@ -80,8 +80,6 @@ local CallistoLabel = {
 
 
 asset.onInitialize(function()
-  openspace.spice.loadKernel(kernel.jup365)
-
   openspace.addSceneGraphNode(Callisto)
   openspace.addSceneGraphNode(CallistoLabel)
 end)
@@ -89,8 +87,6 @@ end)
 asset.onDeinitialize(function()
   openspace.removeSceneGraphNode(CallistoLabel)
   openspace.removeSceneGraphNode(Callisto)
-
-  openspace.spice.unloadKernel(kernel.jup365)
 end)
 
 asset.export(Callisto)
diff --git a/data/assets/scene/solarsystem/planets/jupiter/callisto/trail.asset b/data/assets/scene/solarsystem/planets/jupiter/callisto/trail.asset
index 472933bf3f..fe613e3c0d 100644
--- a/data/assets/scene/solarsystem/planets/jupiter/callisto/trail.asset
+++ b/data/assets/scene/solarsystem/planets/jupiter/callisto/trail.asset
@@ -1,6 +1,6 @@
-asset.require("spice/base")
 local transforms = asset.require("../transforms")
-local kernel = asset.require("../kernels")
+local kernels = asset.require("../kernels")
+local coreKernels = asset.require("spice/core")
 
 
 
@@ -11,8 +11,8 @@ local CallistoTrail = {
     Type = "RenderableTrailOrbit",
     Translation = {
       Type = "SpiceTranslation",
-      Target = "CALLISTO",
-      Observer = "JUPITER BARYCENTER"
+      Target = kernels.ID.Callisto,
+      Observer = coreKernels.ID.JupiterBarycenter
     },
     Color = { 0.4, 0.3, 0.01 },
     Period = 17.0,
@@ -27,15 +27,11 @@ local CallistoTrail = {
 
 
 asset.onInitialize(function()
-  openspace.spice.loadKernel(kernel.jup365)
-
   openspace.addSceneGraphNode(CallistoTrail)
 end)
 
 asset.onDeinitialize(function()
   openspace.removeSceneGraphNode(CallistoTrail)
-
-  openspace.spice.unloadKernel(kernel.jup365)
 end)
 
 asset.export(CallistoTrail)
@@ -45,8 +41,7 @@ asset.export(CallistoTrail)
 asset.meta = {
   Name = "Callisto Trail",
   Version = "1.1",
-  Description = [[Trail of Callisto as observed by the Jupiter. Data from NASA Spice
-    (see base spice asset)]],
+  Description = "Trail of Callisto as observed by the Jupiter",
   Author = "OpenSpace Team",
   URL = "http://openspaceproject.com",
   License = "MIT license"
diff --git a/data/assets/scene/solarsystem/planets/jupiter/europa/europa.asset b/data/assets/scene/solarsystem/planets/jupiter/europa/europa.asset
index 15911782d0..308d81031f 100644
--- a/data/assets/scene/solarsystem/planets/jupiter/europa/europa.asset
+++ b/data/assets/scene/solarsystem/planets/jupiter/europa/europa.asset
@@ -1,7 +1,7 @@
-asset.require("spice/base")
 asset.require("./trail")
 local transforms = asset.require("../transforms")
-local kernel = asset.require("../kernels")
+local kernels = asset.require("../kernels")
+local coreKernels = asset.require("spice/core")
 
 
 
@@ -17,15 +17,15 @@ local Europa = {
   Identifier = "Europa",
   Parent = transforms.JupiterBarycenter.Identifier,
   Transform = {
-    Rotation = {
-      Type = "SpiceRotation",
-      SourceFrame = "IAU_EUROPA",
-      DestinationFrame = "GALACTIC"
-    },
     Translation = {
       Type = "SpiceTranslation",
-      Target = "EUROPA",
-      Observer = "JUPITER BARYCENTER"
+      Target = kernels.ID.Europa,
+      Observer = coreKernels.ID.JupiterBarycenter
+    },
+    Rotation = {
+      Type = "SpiceRotation",
+      SourceFrame = kernels.Frame.Europa,
+      DestinationFrame = coreKernels.Frame.Galactic
     }
   },
   Renderable = {
@@ -79,8 +79,6 @@ local EuropaLabel = {
 
 
 asset.onInitialize(function()
-  openspace.spice.loadKernel(kernel.jup365)
-
   openspace.addSceneGraphNode(Europa)
   openspace.addSceneGraphNode(EuropaLabel)
 end)
@@ -88,8 +86,6 @@ end)
 asset.onDeinitialize(function()
   openspace.removeSceneGraphNode(EuropaLabel)
   openspace.removeSceneGraphNode(Europa)
-
-  openspace.spice.unloadKernel(kernel.jup365)
 end)
 
 asset.export(Europa)
diff --git a/data/assets/scene/solarsystem/planets/jupiter/europa/trail.asset b/data/assets/scene/solarsystem/planets/jupiter/europa/trail.asset
index e2288b8bf6..f6e9e6033e 100644
--- a/data/assets/scene/solarsystem/planets/jupiter/europa/trail.asset
+++ b/data/assets/scene/solarsystem/planets/jupiter/europa/trail.asset
@@ -1,6 +1,6 @@
-asset.require("spice/base")
 local transforms = asset.require("../transforms")
-local kernel = asset.require("../kernels")
+local kernels = asset.require("../kernels")
+local coreKernels = asset.require("spice/core")
 
 
 
@@ -11,8 +11,8 @@ local EuropaTrail = {
     Type = "RenderableTrailOrbit",
     Translation = {
       Type = "SpiceTranslation",
-      Target = "EUROPA",
-      Observer = "JUPITER BARYCENTER"
+      Target = kernels.ID.Europa,
+      Observer = coreKernels.ID.JupiterBarycenter
     },
     Color = { 0.5, 0.3, 0.3 },
     Period = 85.0 / 24.0,
@@ -27,15 +27,11 @@ local EuropaTrail = {
 
 
 asset.onInitialize(function()
-  openspace.spice.loadKernel(kernel.jup365)
-
   openspace.addSceneGraphNode(EuropaTrail)
 end)
 
 asset.onDeinitialize(function()
   openspace.removeSceneGraphNode(EuropaTrail)
-
-  openspace.spice.unloadKernel(kernel.jup365)
 end)
 
 asset.export(EuropaTrail)
@@ -45,8 +41,7 @@ asset.export(EuropaTrail)
 asset.meta = {
   Name = "Europa Trail",
   Version = "1.1",
-  Description = [[Trail of Europa as observed by the Jupiter. Data from NASA Spice (see
-    base spice asset)]],
+  Description = "Trail of Europa as observed by the Jupiter",
   Author = "OpenSpace Team",
   URL = "http://openspaceproject.com",
   License = "MIT license"
diff --git a/data/assets/scene/solarsystem/planets/jupiter/ganymede/ganymede.asset b/data/assets/scene/solarsystem/planets/jupiter/ganymede/ganymede.asset
index be7996b5d7..1affabb3aa 100644
--- a/data/assets/scene/solarsystem/planets/jupiter/ganymede/ganymede.asset
+++ b/data/assets/scene/solarsystem/planets/jupiter/ganymede/ganymede.asset
@@ -1,7 +1,7 @@
-asset.require("spice/base")
 asset.require("./trail")
 local transforms = asset.require("../transforms")
-local kernel = asset.require("../kernels")
+local kernels = asset.require("../kernels")
+local coreKernels = asset.require("spice/core")
 
 
 
@@ -17,15 +17,15 @@ local Ganymede = {
   Identifier = "Ganymede",
   Parent = transforms.JupiterBarycenter.Identifier,
   Transform = {
-    Rotation = {
-      Type = "SpiceRotation",
-      SourceFrame = "IAU_GANYMEDE",
-      DestinationFrame = "GALACTIC"
-    },
     Translation = {
       Type = "SpiceTranslation",
-      Target = "GANYMEDE",
-      Observer = "JUPITER BARYCENTER"
+      Target = kernels.ID.Ganymede,
+      Observer = coreKernels.ID.JupiterBarycenter
+    },
+    Rotation = {
+      Type = "SpiceRotation",
+      SourceFrame = kernels.Frame.Ganymede,
+      DestinationFrame = coreKernels.Frame.Galactic
     }
   },
   Renderable = {
@@ -79,8 +79,6 @@ local GanymedeLabel = {
 
 
 asset.onInitialize(function()
-  openspace.spice.loadKernel(kernel.jup365)
-
   openspace.addSceneGraphNode(Ganymede)
   openspace.addSceneGraphNode(GanymedeLabel)
 end)
@@ -88,8 +86,6 @@ end)
 asset.onDeinitialize(function()
   openspace.removeSceneGraphNode(GanymedeLabel)
   openspace.removeSceneGraphNode(Ganymede)
-
-  openspace.spice.unloadKernel(kernel.jup365)
 end)
 
 asset.export(Ganymede)
diff --git a/data/assets/scene/solarsystem/planets/jupiter/ganymede/trail.asset b/data/assets/scene/solarsystem/planets/jupiter/ganymede/trail.asset
index 24f9d1e486..42e92748c1 100644
--- a/data/assets/scene/solarsystem/planets/jupiter/ganymede/trail.asset
+++ b/data/assets/scene/solarsystem/planets/jupiter/ganymede/trail.asset
@@ -1,6 +1,6 @@
-asset.require("spice/base")
 local transforms = asset.require("../transforms")
-local kernel = asset.require("../kernels")
+local kernels = asset.require("../kernels")
+local coreKernels = asset.require("spice/core")
 
 
 
@@ -11,8 +11,8 @@ local GanymedeTrail = {
     Type = "RenderableTrailOrbit",
     Translation = {
       Type = "SpiceTranslation",
-      Target = "GANYMEDE",
-      Observer = "JUPITER BARYCENTER"
+      Target = kernels.ID.Ganymede,
+      Observer = coreKernels.ID.JupiterBarycenter
     },
     Color = { 0.4, 0.3, 0.3 },
     Period = 172.0 / 24.0,
@@ -27,15 +27,11 @@ local GanymedeTrail = {
 
 
 asset.onInitialize(function()
-  openspace.spice.loadKernel(kernel.jup365)
-
   openspace.addSceneGraphNode(GanymedeTrail)
 end)
 
 asset.onDeinitialize(function()
   openspace.removeSceneGraphNode(GanymedeTrail)
-
-  openspace.spice.unloadKernel(kernel.jup365)
 end)
 
 asset.export(GanymedeTrail)
@@ -45,8 +41,7 @@ asset.export(GanymedeTrail)
 asset.meta = {
   Name = "Ganymede Trail",
   Version = "1.1",
-  Description = [[Trail of Ganymede as observed by the Jupiter. Data from NASA Spice
-    (see base spice asset)]],
+  Description = "Trail of Ganymede as observed by the Jupiter",
   Author = "OpenSpace Team",
   URL = "http://openspaceproject.com",
   License = "MIT license"
diff --git a/data/assets/scene/solarsystem/planets/jupiter/io/io.asset b/data/assets/scene/solarsystem/planets/jupiter/io/io.asset
index 5f93bba501..a30db8cfe7 100644
--- a/data/assets/scene/solarsystem/planets/jupiter/io/io.asset
+++ b/data/assets/scene/solarsystem/planets/jupiter/io/io.asset
@@ -1,7 +1,7 @@
-asset.require("spice/base")
 asset.require("./trail")
 local transforms = asset.require("../transforms")
-local kernel = asset.require("../kernels")
+local kernels = asset.require("../kernels")
+local coreKernels = asset.require("spice/core")
 
 
 
@@ -19,13 +19,13 @@ local Io = {
   Transform = {
     Translation = {
       Type = "SpiceTranslation",
-      Target = "IO",
-      Observer = "JUPITER BARYCENTER"
+      Target = kernels.ID.Io,
+      Observer = coreKernels.ID.JupiterBarycenter
     },
     Rotation = {
       Type = "SpiceRotation",
-      SourceFrame = "IAU_IO",
-      DestinationFrame = "GALACTIC"
+      SourceFrame = kernels.Frame.Io,
+      DestinationFrame = coreKernels.Frame.Galactic
     }
   },
   Renderable = {
@@ -79,8 +79,6 @@ local IoLabel = {
 
 
 asset.onInitialize(function()
-  openspace.spice.loadKernel(kernel.jup365)
-
   openspace.addSceneGraphNode(Io)
   openspace.addSceneGraphNode(IoLabel)
 end)
@@ -88,8 +86,6 @@ end)
 asset.onDeinitialize(function()
   openspace.removeSceneGraphNode(IoLabel)
   openspace.removeSceneGraphNode(Io)
-
-  openspace.spice.unloadKernel(kernel.jup365)
 end)
 
 asset.export(Io)
diff --git a/data/assets/scene/solarsystem/planets/jupiter/io/trail.asset b/data/assets/scene/solarsystem/planets/jupiter/io/trail.asset
index 37ce9a5c30..c145f47407 100644
--- a/data/assets/scene/solarsystem/planets/jupiter/io/trail.asset
+++ b/data/assets/scene/solarsystem/planets/jupiter/io/trail.asset
@@ -1,6 +1,6 @@
-asset.require("spice/base")
 local transforms = asset.require("../transforms")
-local kernel = asset.require("../kernels")
+local kernels = asset.require("../kernels")
+local coreKernels = asset.require("spice/core")
 
 
 
@@ -11,8 +11,8 @@ local IoTrail = {
     Type = "RenderableTrailOrbit",
     Translation = {
       Type = "SpiceTranslation",
-      Target = "IO",
-      Observer = "JUPITER BARYCENTER"
+      Target = kernels.ID.Io,
+      Observer = coreKernels.ID.JupiterBarycenter
     },
     Color = { 0.4, 0.4, 0.2 },
     Period = 42.0 / 24.0,
@@ -27,15 +27,11 @@ local IoTrail = {
 
 
 asset.onInitialize(function()
-  openspace.spice.loadKernel(kernel.jup365)
-
   openspace.addSceneGraphNode(IoTrail)
 end)
 
 asset.onDeinitialize(function()
   openspace.removeSceneGraphNode(IoTrail)
-
-  openspace.spice.unloadKernel(kernel.jup365)
 end)
 
 asset.export(IoTrail)
@@ -45,8 +41,7 @@ asset.export(IoTrail)
 asset.meta = {
   Name = "Io Trail",
   Version = "1.1",
-  Description = [[Trail of Io as observed by the Jupiter. Data from NASA Spice (see
-    base spice asset)]],
+  Description = "Trail of Io as observed by the Jupiter",
   Author = "OpenSpace Team",
   URL = "http://openspaceproject.com",
   License = "MIT license"
diff --git a/data/assets/scene/solarsystem/planets/jupiter/jupiter.asset b/data/assets/scene/solarsystem/planets/jupiter/jupiter.asset
index 6c17b0ba70..561332d4bd 100644
--- a/data/assets/scene/solarsystem/planets/jupiter/jupiter.asset
+++ b/data/assets/scene/solarsystem/planets/jupiter/jupiter.asset
@@ -1,6 +1,6 @@
-asset.require("spice/base")
 asset.require("./trail")
 local transforms = asset.require("./transforms")
+local coreKernels = asset.require("spice/core")
 
 
 
@@ -10,13 +10,13 @@ local Jupiter = {
   Transform = {
     Translation = {
       Type = "SpiceTranslation",
-      Target = "JUPITER",
-      Observer = "JUPITER BARYCENTER"
+      Target = coreKernels.ID.Jupiter,
+      Observer = coreKernels.ID.JupiterBarycenter
     },
     Rotation = {
       Type = "SpiceRotation",
-      SourceFrame = "IAU_JUPITER",
-      DestinationFrame = "GALACTIC"
+      SourceFrame = coreKernels.Frame.Jupiter,
+      DestinationFrame = coreKernels.Frame.Galactic
     }
   },
   Renderable = {
diff --git a/data/assets/scene/solarsystem/planets/jupiter/kernels.asset b/data/assets/scene/solarsystem/planets/jupiter/kernels.asset
index ac4a956c60..075a9afbd5 100644
--- a/data/assets/scene/solarsystem/planets/jupiter/kernels.asset
+++ b/data/assets/scene/solarsystem/planets/jupiter/kernels.asset
@@ -1,3 +1,7 @@
+local coreKernels = asset.require("spice/core")
+
+
+
 local kernels = asset.resource({
   Name = "Jupiter Spice Kernels",
   Type = "HttpSynchronization",
@@ -5,12 +9,32 @@ local kernels = asset.resource({
   Version = 2
 })
 
+local ID = {
+  Callisto = "CALLISTO",
+  Europa = "EUROPA",
+  Ganymede = "GANYMEDE",
+  Io = "IO"
+}
 
-asset.export("jup344", kernels .. "jup344.bsp")
-asset.export("jup346", kernels .. "jup346.bsp")
-asset.export("jup365", kernels .. "jup365.bsp")
+local Frame = {
+  Callisto = coreKernels.Frame.Callisto,
+  Europa = coreKernels.Frame.Europa,
+  Ganymede = coreKernels.Frame.Ganymede,
+  Io = coreKernels.Frame.Io
+}
 
 
+asset.onInitialize(function()
+  openspace.spice.loadKernel(kernels .. "jup365.bsp")
+end)
+
+asset.onDeinitialize(function()
+  openspace.spice.unloadKernel(kernels .. "jup365.bsp")
+end)
+
+asset.export("ID", ID)
+asset.export("Frame", Frame)
+
 
 asset.meta = {
   Name = "Jupiter Spice Kernels",
diff --git a/data/assets/scene/solarsystem/planets/jupiter/kernels344.asset b/data/assets/scene/solarsystem/planets/jupiter/kernels344.asset
new file mode 100644
index 0000000000..6d58a7a524
--- /dev/null
+++ b/data/assets/scene/solarsystem/planets/jupiter/kernels344.asset
@@ -0,0 +1,137 @@
+local coreKernels = asset.require("spice/core")
+
+
+
+local kernels = asset.resource({
+  Name = "Jupiter Spice Kernels",
+  Type = "HttpSynchronization",
+  Identifier = "jupiter_kernels",
+  Version = 2
+})
+
+local ID = {
+  Adrastea = "ADRASTEA",
+  Aitne = "AITNE",
+  Amalthea = "AMALTHEA",
+  Ananke = "ANANKE",
+  Aoede = "AOEDE",
+  Arche = "ARCHE",
+  Autonoe = "AUTONOE",
+  Callirrhoe = "CALLIRRHOE",
+  Carme = "CARME",
+  Carpo = "CARPO",
+  Chaldene = "CHALDENE",
+  Cyllene = "CYLLENE",
+  Dia = "DIA",
+  Elara = "ELARA",
+  Erinome = "ERINOME",
+  Ersa = 571,
+  Euanthe = "EUANTHE",
+  Eukelade = "EUKELADE",
+  Eupheme = 560,
+  Euporie = "EUPORIE",
+  Eurydome = "EURYDOME",
+  Harpalyke = "HARPALYKE",
+  Hegemone = "HEGEMONE",
+  Helike = "HELIKE",
+  Hermippe = "HERMIPPE",
+  Herse = "HERSE",
+  Himalia = "HIMALIA",
+  Iocaste = "IOCASTE",
+  Isonoe = "ISONOE",
+  Kale = "KALE",
+  Kallichore = "KALLICHORE",
+  Kalyke = "KALYKE",
+  Kore = "KORE",
+  Leda = "LEDA",
+  Lysithea = "LYSITHEA",
+  Megaclite = "MEGACLITE",
+  Metis = "METIS",
+  Mneme = "MNEME",
+  Orthosie = "ORTHOSIE",
+  Pandia = 565,
+  Pasiphae = "PASIPHAE",
+  Pasithee = "PASITHEE",
+  Praxidike = "PRAXIDIKE",
+  S2003J2 = 55501,
+  S2003J4 = 55502,
+  S2003J5 = 557,
+  S2003J9 = 55503,
+  S2003J10 = 55504,
+  S2003J12 = 55505,
+  S2003J15 = 558,
+  S2003J16 = 55506,
+  S2003J18 = 555,
+  S2003J19 = 561,
+  S2003J23 = 55507,
+  S2010J1 = 551,
+  S2010J2 = 552,
+  S2011J1 = 572,
+  S2011J2 = 556,
+  S2016J1 = 554,
+  S2017J1 = 559,
+  S2017J2 = 563,
+  S2017J3 = 564,
+  S2017J5 = 566,
+  S2017J6 = 567,
+  S2017J7 = 568,
+  S2017J8 = 569,
+  S2017J9 = 570,
+  Sinope = "SINOPE",
+  Sponde = "SPONDE",
+  Taygete = "TAYGETE",
+  Thebe = "THEBE",
+  Thelxinoe = "THELXINOE",
+  Themisto = "THEMISTO",
+  Thyone = "THYONE",
+  Valetudo = 562
+}
+
+local Frame = {
+  Adrastea = coreKernels.Frame.Adrastea,
+  Amalthea = coreKernels.Frame.Amalthea,
+  Ananke = coreKernels.Frame.Ananke,
+  Callirrhoe = coreKernels.Frame.Callirrhoe,
+  Carme = coreKernels.Frame.Carme,
+  Chaldene = coreKernels.Frame.Chaldene,
+  Elara = coreKernels.Frame.Elara,
+  Erinome = coreKernels.Frame.Erinome,
+  Harpalyke = coreKernels.Frame.Harpalyke,
+  Himalia = coreKernels.Frame.Himalia,
+  Iocaste = coreKernels.Frame.Iocaste,
+  Isonoe = coreKernels.Frame.Isonoe,
+  Kalyke = coreKernels.Frame.Kalyke,
+  Leda = coreKernels.Frame.Leda,
+  Lysithea = coreKernels.Frame.Lysithea,
+  Megaclite = coreKernels.Frame.Magaclite,
+  Metis = coreKernels.Frame.Metis,
+  Pasiphae = coreKernels.Frame.Pasiphae,
+  Praxidike = coreKernels.Frame.Praxidike,
+  Sinope = coreKernels.Frame.Sinope,
+  Taygete = coreKernels.Frame.Taygete,
+  Thebe = coreKernels.Frame.Thebe,
+  Themisto = coreKernels.Frame.Themisto
+}
+
+
+asset.onInitialize(function()
+  openspace.spice.loadKernel(kernels .. "jup344.bsp")
+end)
+
+asset.onDeinitialize(function()
+  openspace.spice.unloadKernel(kernels .. "jup344.bsp")
+end)
+
+asset.export("ID", ID)
+asset.export("Frame", Frame)
+
+
+
+asset.meta = {
+  Name = "Jupiter Spice Kernels",
+  Version = "1.0",
+  Description = "Generic SPICE kernels for Jupiter",
+  Author = "OpenSpace Team",
+  URL = "https://naif.jpl.nasa.gov/pub/naif/pds/wgc/kernels/spk/",
+  License = "NASA"
+}
diff --git a/data/assets/scene/solarsystem/planets/jupiter/kernels346.asset b/data/assets/scene/solarsystem/planets/jupiter/kernels346.asset
new file mode 100644
index 0000000000..4eb996ae53
--- /dev/null
+++ b/data/assets/scene/solarsystem/planets/jupiter/kernels346.asset
@@ -0,0 +1,47 @@
+local kernels = asset.resource({
+  Name = "Jupiter Spice Kernels",
+  Type = "HttpSynchronization",
+  Identifier = "jupiter_kernels",
+  Version = 2
+})
+
+
+local ID = {
+  S2011J3 = 55509,
+  S2018J2 = 55510,
+  S2018J3 = 55511,
+  S2021J1 = 55512,
+  S2021J2 = 55513,
+  S2021J3 = 55514,
+  S2021J4 = 55515,
+  S2021J5 = 55516,
+  S2021J6 = 55517,
+  S2016J3 = 55518,
+  S2016J4 = 55519,
+  S2018J4 = 55520,
+  S2022J1 = 55521,
+  S2022J2 = 55522,
+  S2022J3 = 55523
+}
+
+
+asset.onInitialize(function()
+  openspace.spice.loadKernel(kernels .. "jup346.bsp")
+end)
+
+asset.onDeinitialize(function()
+  openspace.spice.unloadKernel(kernels .. "jup346.bsp")
+end)
+
+asset.export("ID", ID)
+
+
+
+asset.meta = {
+  Name = "Jupiter Spice Kernels",
+  Version = "1.0",
+  Description = "Generic SPICE kernels for Jupiter",
+  Author = "OpenSpace Team",
+  URL = "https://naif.jpl.nasa.gov/pub/naif/pds/wgc/kernels/spk/",
+  License = "NASA"
+}
diff --git a/data/assets/scene/solarsystem/planets/jupiter/minor/ananke_group.asset b/data/assets/scene/solarsystem/planets/jupiter/minor/ananke_group.asset
index 71371df2d8..f010823a60 100644
--- a/data/assets/scene/solarsystem/planets/jupiter/minor/ananke_group.asset
+++ b/data/assets/scene/solarsystem/planets/jupiter/minor/ananke_group.asset
@@ -1,5 +1,7 @@
 local transforms = asset.require("../transforms")
-local kernel = asset.require("../kernels")
+local kernels344 = asset.require("../kernels344")
+local kernels346 = asset.require("../kernels346")
+local coreKernels = asset.require("spice/core")
 
 
 
@@ -9,8 +11,8 @@ local S2010J2 = {
   Transform = {
     Translation = {
       Type = "SpiceTranslation",
-      Target = "552",
-      Observer = "JUPITER BARYCENTER"
+      Target = kernels344.ID.S2010J2,
+      Observer = coreKernels.ID.JupiterBarycenter
     }
   },
   Renderable = {
@@ -40,8 +42,8 @@ local S2010J2Trail = {
     Type = "RenderableTrailOrbit",
     Translation = {
       Type = "SpiceTranslation",
-      Target = "552",
-      Observer = "JUPITER BARYCENTER"
+      Target = kernels344.ID.S2010J2,
+      Observer = coreKernels.ID.JupiterBarycenter
     },
     Color = { 0.4, 0.3, 0.01 },
     Period = 588.36,
@@ -91,8 +93,8 @@ local Thelxinoe = {
   Transform = {
     Translation = {
       Type = "SpiceTranslation",
-      Target = "THELXINOE",
-      Observer = "JUPITER BARYCENTER"
+      Target = kernels344.ID.Thelxinoe,
+      Observer = coreKernels.ID.JupiterBarycenter
     }
   },
   Renderable = {
@@ -122,8 +124,8 @@ local ThelxinoeTrail = {
     Type = "RenderableTrailOrbit",
     Translation = {
       Type = "SpiceTranslation",
-      Target = "THELXINOE",
-      Observer = "JUPITER BARYCENTER"
+      Target = kernels344.ID.Thelxinoe,
+      Observer = coreKernels.ID.JupiterBarycenter
     },
     Color = { 0.4, 0.3, 0.01 },
     Period = 597.61,
@@ -173,8 +175,8 @@ local Euanthe = {
   Transform = {
     Translation = {
       Type = "SpiceTranslation",
-      Target = "EUANTHE",
-      Observer = "JUPITER BARYCENTER"
+      Target = kernels344.ID.Euanthe,
+      Observer = coreKernels.ID.JupiterBarycenter
     }
   },
   Renderable = {
@@ -204,8 +206,8 @@ local EuantheTrail = {
     Type = "RenderableTrailOrbit",
     Translation = {
       Type = "SpiceTranslation",
-      Target = "EUANTHE",
-      Observer = "JUPITER BARYCENTER"
+      Target = kernels344.ID.Euanthe,
+      Observer = coreKernels.ID.JupiterBarycenter
     },
     Color = { 0.4, 0.3, 0.01 },
     Period = 598.09,
@@ -255,8 +257,8 @@ local Iocaste = {
   Transform = {
     Translation = {
       Type = "SpiceTranslation",
-      Target = "IOCASTE",
-      Observer = "JUPITER BARYCENTER"
+      Target = kernels344.ID.Iocaste,
+      Observer = coreKernels.ID.JupiterBarycenter
     }
   },
   Renderable = {
@@ -286,8 +288,8 @@ local IocasteTrail = {
     Type = "RenderableTrailOrbit",
     Translation = {
       Type = "SpiceTranslation",
-      Target = "IOCASTE",
-      Observer = "JUPITER BARYCENTER"
+      Target = kernels344.ID.Iocaste,
+      Observer = coreKernels.ID.JupiterBarycenter
     },
     Color = { 0.4, 0.3, 0.01 },
     Period = 609.43,
@@ -337,8 +339,8 @@ local S2003J16 = {
   Transform = {
     Translation = {
       Type = "SpiceTranslation",
-      Target = "55506",
-      Observer = "JUPITER BARYCENTER"
+      Target = kernels344.ID.S2003J16,
+      Observer = coreKernels.ID.JupiterBarycenter
     }
   },
   Renderable = {
@@ -368,8 +370,8 @@ local S2003J16Trail = {
     Type = "RenderableTrailOrbit",
     Translation = {
       Type = "SpiceTranslation",
-      Target = "55506",
-      Observer = "JUPITER BARYCENTER"
+      Target = kernels344.ID.S2003J16,
+      Observer = coreKernels.ID.JupiterBarycenter
     },
     Color = { 0.4, 0.3, 0.01 },
     Period = 610.36,
@@ -419,8 +421,8 @@ local Praxidike = {
   Transform = {
     Translation = {
       Type = "SpiceTranslation",
-      Target = "PRAXIDIKE",
-      Observer = "JUPITER BARYCENTER"
+      Target = kernels344.ID.Praxidike,
+      Observer = coreKernels.ID.JupiterBarycenter
     }
   },
   Renderable = {
@@ -450,8 +452,8 @@ local PraxidikeTrail = {
     Type = "RenderableTrailOrbit",
     Translation = {
       Type = "SpiceTranslation",
-      Target = "PRAXIDIKE",
-      Observer = "JUPITER BARYCENTER"
+      Target = kernels344.ID.Praxidike,
+      Observer = coreKernels.ID.JupiterBarycenter
     },
     Color = { 0.4, 0.3, 0.01 },
     Period = 613.90,
@@ -501,8 +503,8 @@ local Harpalyke = {
   Transform = {
     Translation = {
       Type = "SpiceTranslation",
-      Target = "HARPALYKE",
-      Observer = "JUPITER BARYCENTER"
+      Target = kernels344.ID.Harpalyke,
+      Observer = coreKernels.ID.JupiterBarycenter
     }
   },
   Renderable = {
@@ -532,8 +534,8 @@ local HarpalykeTrail = {
     Type = "RenderableTrailOrbit",
     Translation = {
       Type = "SpiceTranslation",
-      Target = "HARPALYKE",
-      Observer = "JUPITER BARYCENTER"
+      Target = kernels344.ID.Harpalyke,
+      Observer = coreKernels.ID.JupiterBarycenter
     },
     Color = { 0.4, 0.3, 0.01 },
     Period = 624.54,
@@ -583,8 +585,8 @@ local Mneme = {
   Transform = {
     Translation = {
       Type = "SpiceTranslation",
-      Target = "MNEME",
-      Observer = "JUPITER BARYCENTER"
+      Target = kernels344.ID.Mneme,
+      Observer = coreKernels.ID.JupiterBarycenter
     }
   },
   Renderable = {
@@ -614,8 +616,8 @@ local MnemeTrail = {
     Type = "RenderableTrailOrbit",
     Translation = {
       Type = "SpiceTranslation",
-      Target = "MNEME",
-      Observer = "JUPITER BARYCENTER"
+      Target = kernels344.ID.Mneme,
+      Observer = coreKernels.ID.JupiterBarycenter
     },
     Color = { 0.4, 0.3, 0.01 },
     Period = 627.48,
@@ -665,8 +667,8 @@ local Hermippe = {
   Transform = {
     Translation = {
       Type = "SpiceTranslation",
-      Target = "HERMIPPE",
-      Observer = "JUPITER BARYCENTER"
+      Target = kernels344.ID.Hermippe,
+      Observer = coreKernels.ID.JupiterBarycenter
     }
   },
   Renderable = {
@@ -696,8 +698,8 @@ local HermippeTrail = {
     Type = "RenderableTrailOrbit",
     Translation = {
       Type = "SpiceTranslation",
-      Target = "HERMIPPE",
-      Observer = "JUPITER BARYCENTER"
+      Target = kernels344.ID.Hermippe,
+      Observer = coreKernels.ID.JupiterBarycenter
     },
     Color = { 0.4, 0.3, 0.01 },
     Period = 629.81,
@@ -747,8 +749,8 @@ local Thyone = {
   Transform = {
     Translation = {
       Type = "SpiceTranslation",
-      Target = "THYONE",
-      Observer = "JUPITER BARYCENTER"
+      Target = kernels344.ID.Thyone,
+      Observer = coreKernels.ID.JupiterBarycenter
     }
   },
   Renderable = {
@@ -778,8 +780,8 @@ local ThyoneTrail = {
     Type = "RenderableTrailOrbit",
     Translation = {
       Type = "SpiceTranslation",
-      Target = "THYONE",
-      Observer = "JUPITER BARYCENTER"
+      Target = kernels344.ID.Thyone,
+      Observer = coreKernels.ID.JupiterBarycenter
     },
     Color = { 0.4, 0.3, 0.01 },
     Period = 639.80,
@@ -829,8 +831,8 @@ local Ananke = {
   Transform = {
     Translation = {
       Type = "SpiceTranslation",
-      Target = "ANANKE",
-      Observer = "JUPITER BARYCENTER"
+      Target = kernels344.ID.Ananke,
+      Observer = coreKernels.ID.JupiterBarycenter
     }
   },
   Renderable = {
@@ -860,8 +862,8 @@ local AnankeTrail = {
     Type = "RenderableTrailOrbit",
     Translation = {
       Type = "SpiceTranslation",
-      Target = "ANANKE",
-      Observer = "JUPITER BARYCENTER"
+      Target = kernels344.ID.Ananke,
+      Observer = coreKernels.ID.JupiterBarycenter
     },
     Color = { 0.4, 0.3, 0.01 },
     Period = 640.38,
@@ -911,8 +913,8 @@ local S2021J1 = {
   Transform = {
     Translation = {
       Type = "SpiceTranslation",
-      Target = "55512",
-      Observer = "JUPITER BARYCENTER"
+      Target = kernels346.ID.S2021J1,
+      Observer = coreKernels.ID.JupiterBarycenter
     }
   },
   Renderable = {
@@ -942,8 +944,8 @@ local S2021J1Trail = {
     Type = "RenderableTrailOrbit",
     Translation = {
       Type = "SpiceTranslation",
-      Target = "55512",
-      Observer = "JUPITER BARYCENTER"
+      Target = kernels346.ID.S2021J1,
+      Observer = coreKernels.ID.JupiterBarycenter
     },
     Color = { 0.4, 0.3, 0.01 },
     Period = 606.99,
@@ -993,8 +995,8 @@ local S2021J2 = {
   Transform = {
     Translation = {
       Type = "SpiceTranslation",
-      Target = "55513",
-      Observer = "JUPITER BARYCENTER"
+      Target = kernels346.ID.S2021J2,
+      Observer = coreKernels.ID.JupiterBarycenter
     }
   },
   Renderable = {
@@ -1024,8 +1026,8 @@ local S2021J2Trail = {
     Type = "RenderableTrailOrbit",
     Translation = {
       Type = "SpiceTranslation",
-      Target = "55513",
-      Observer = "JUPITER BARYCENTER"
+      Target = kernels346.ID.S2021J2,
+      Observer = coreKernels.ID.JupiterBarycenter
     },
     Color = { 0.4, 0.3, 0.01 },
     Period = 627.96,
@@ -1075,8 +1077,8 @@ local S2021J3 = {
   Transform = {
     Translation = {
       Type = "SpiceTranslation",
-      Target = "55514",
-      Observer = "JUPITER BARYCENTER"
+      Target = kernels346.ID.S2021J3,
+      Observer = coreKernels.ID.JupiterBarycenter
     }
   },
   Renderable = {
@@ -1106,8 +1108,8 @@ local S2021J3Trail = {
     Type = "RenderableTrailOrbit",
     Translation = {
       Type = "SpiceTranslation",
-      Target = "55514",
-      Observer = "JUPITER BARYCENTER"
+      Target = kernels346.ID.S2021J3,
+      Observer = coreKernels.ID.JupiterBarycenter
     },
     Color = { 0.4, 0.3, 0.01 },
     Period = 643.85,
@@ -1157,8 +1159,8 @@ local S2022J3 = {
   Transform = {
     Translation = {
       Type = "SpiceTranslation",
-      Target = "55523",
-      Observer = "JUPITER BARYCENTER"
+      Target = kernels346.ID.S2022J3,
+      Observer = coreKernels.ID.JupiterBarycenter
     }
   },
   Renderable = {
@@ -1188,8 +1190,8 @@ local S2022J3Trail = {
     Type = "RenderableTrailOrbit",
     Translation = {
       Type = "SpiceTranslation",
-      Target = "55523",
-      Observer = "JUPITER BARYCENTER"
+      Target = kernels346.ID.S2022J3,
+      Observer = coreKernels.ID.JupiterBarycenter
     },
     Color = { 0.4, 0.3, 0.01 },
     Period = 617.82,
@@ -1239,8 +1241,8 @@ local S2017J3 = {
   Transform = {
     Translation = {
       Type = "SpiceTranslation",
-      Target = "564",
-      Observer = "JUPITER BARYCENTER"
+      Target = kernels344.ID.S2017J3,
+      Observer = coreKernels.ID.JupiterBarycenter
     }
   },
   Renderable = {
@@ -1270,8 +1272,8 @@ local S2017J3Trail = {
     Type = "RenderableTrailOrbit",
     Translation = {
       Type = "SpiceTranslation",
-      Target = "564",
-      Observer = "JUPITER BARYCENTER"
+      Target = kernels344.ID.S2017J3,
+      Observer = coreKernels.ID.JupiterBarycenter
     },
     Color = { 0.4, 0.3, 0.01 },
     Period = 606.3,
@@ -1321,8 +1323,8 @@ local S2017J7 = {
   Transform = {
     Translation = {
       Type = "SpiceTranslation",
-      Target = "568",
-      Observer = "JUPITER BARYCENTER"
+      Target = kernels344.ID.S2017J7,
+      Observer = coreKernels.ID.JupiterBarycenter
     }
   },
   Renderable = {
@@ -1352,8 +1354,8 @@ local S2017J7Trail = {
     Type = "RenderableTrailOrbit",
     Translation = {
       Type = "SpiceTranslation",
-      Target = "568",
-      Observer = "JUPITER BARYCENTER"
+      Target = kernels344.ID.S2017J7,
+      Observer = coreKernels.ID.JupiterBarycenter
     },
     Color = { 0.4, 0.3, 0.01 },
     Period = 602.6,
@@ -1403,8 +1405,8 @@ local S2017J9 = {
   Transform = {
     Translation = {
       Type = "SpiceTranslation",
-      Target = "570",
-      Observer = "JUPITER BARYCENTER"
+      Target = kernels344.ID.S2017J9,
+      Observer = coreKernels.ID.JupiterBarycenter
     }
   },
   Renderable = {
@@ -1434,8 +1436,8 @@ local S2017J9Trail = {
     Type = "RenderableTrailOrbit",
     Translation = {
       Type = "SpiceTranslation",
-      Target = "570",
-      Observer = "JUPITER BARYCENTER"
+      Target = kernels344.ID.S2017J9,
+      Observer = coreKernels.ID.JupiterBarycenter
     },
     Color = { 0.4, 0.3, 0.01 },
     Period = 639.2,
@@ -1485,8 +1487,8 @@ local S2003J2 = {
   Transform = {
     Translation = {
       Type = "SpiceTranslation",
-      Target = "55501",
-      Observer = "JUPITER BARYCENTER"
+      Target = kernels344.ID.S2003J2,
+      Observer = coreKernels.ID.JupiterBarycenter
     }
   },
   Renderable = {
@@ -1516,8 +1518,8 @@ local S2003J2Trail = {
     Type = "RenderableTrailOrbit",
     Translation = {
       Type = "SpiceTranslation",
-      Target = "55501",
-      Observer = "JUPITER BARYCENTER"
+      Target = kernels344.ID.S2003J2,
+      Observer = coreKernels.ID.JupiterBarycenter
     },
     Color = { 0.4, 0.3, 0.01 },
     Period = 602.02,
@@ -1567,8 +1569,8 @@ local S2003J12 = {
   Transform = {
     Translation = {
       Type = "SpiceTranslation",
-      Target = "55505",
-      Observer = "JUPITER BARYCENTER"
+      Target = kernels344.ID.S2003J12,
+      Observer = coreKernels.ID.JupiterBarycenter
     }
   },
   Renderable = {
@@ -1598,8 +1600,8 @@ local S2003J12Trail = {
     Type = "RenderableTrailOrbit",
     Translation = {
       Type = "SpiceTranslation",
-      Target = "55505",
-      Observer = "JUPITER BARYCENTER"
+      Target = kernels344.ID.S2003J12,
+      Observer = coreKernels.ID.JupiterBarycenter
     },
     Color = { 0.4, 0.3, 0.01 },
     Period = 646.64,
@@ -1644,10 +1646,6 @@ local S2003J12Label = {
 }
 
 asset.onInitialize(function()
-  openspace.spice.loadKernel(kernel.jup344)
-  openspace.spice.loadKernel(kernel.jup346)
-
-
   openspace.addSceneGraphNode(S2010J2)
   openspace.addSceneGraphNode(S2010J2Trail)
   openspace.addSceneGraphNode(S2010J2Label)
@@ -1809,10 +1807,6 @@ asset.onDeinitialize(function()
   openspace.removeSceneGraphNode(S2010J2Label)
   openspace.removeSceneGraphNode(S2010J2Trail)
   openspace.removeSceneGraphNode(S2010J2)
-
-
-  openspace.spice.unloadKernel(kernel.jup346)
-  openspace.spice.unloadKernel(kernel.jup344)
 end)
 
 asset.export(S2010J2)
diff --git a/data/assets/scene/solarsystem/planets/jupiter/minor/carme_group.asset b/data/assets/scene/solarsystem/planets/jupiter/minor/carme_group.asset
index 429b30578c..eef55cec46 100644
--- a/data/assets/scene/solarsystem/planets/jupiter/minor/carme_group.asset
+++ b/data/assets/scene/solarsystem/planets/jupiter/minor/carme_group.asset
@@ -1,5 +1,7 @@
 local transforms = asset.require("../transforms")
-local kernel = asset.require("../kernels")
+local kernels344 = asset.require("../kernels344")
+local kernels346 = asset.require("../kernels346")
+local coreKernels = asset.require("spice/core")
 
 
 
@@ -9,8 +11,8 @@ local Herse = {
   Transform = {
     Translation = {
       Type = "SpiceTranslation",
-      Target = "HERSE",
-      Observer = "JUPITER BARYCENTER"
+      Target = kernels344.ID.Herse,
+      Observer = coreKernels.ID.JupiterBarycenter
     }
   },
   Renderable = {
@@ -40,8 +42,8 @@ local HerseTrail = {
     Type = "RenderableTrailOrbit",
     Translation = {
       Type = "SpiceTranslation",
-      Target = "HERSE",
-      Observer = "JUPITER BARYCENTER"
+      Target = kernels344.ID.Herse,
+      Observer = coreKernels.ID.JupiterBarycenter
     },
     Color = { 0.4, 0.3, 0.01 },
     Period = 672.75,
@@ -91,8 +93,8 @@ local Aitne = {
   Transform = {
     Translation = {
       Type = "SpiceTranslation",
-      Target = "AITNE",
-      Observer = "JUPITER BARYCENTER"
+      Target = kernels344.ID.Aitne,
+      Observer = coreKernels.ID.JupiterBarycenter
     }
   },
   Renderable = {
@@ -122,8 +124,8 @@ local AitneTrail = {
     Type = "RenderableTrailOrbit",
     Translation = {
       Type = "SpiceTranslation",
-      Target = "AITNE",
-      Observer = "JUPITER BARYCENTER"
+      Target = kernels344.ID.Aitne,
+      Observer = coreKernels.ID.JupiterBarycenter
     },
     Color = { 0.4, 0.3, 0.01 },
     Period = 679.64,
@@ -173,8 +175,8 @@ local Kale = {
   Transform = {
     Translation = {
       Type = "SpiceTranslation",
-      Target = "KALE",
-      Observer = "JUPITER BARYCENTER"
+      Target = kernels344.ID.Kale,
+      Observer = coreKernels.ID.JupiterBarycenter
     }
   },
   Renderable = {
@@ -204,8 +206,8 @@ local KaleTrail = {
     Type = "RenderableTrailOrbit",
     Translation = {
       Type = "SpiceTranslation",
-      Target = "KALE",
-      Observer = "JUPITER BARYCENTER"
+      Target = kernels344.ID.Kale,
+      Observer = coreKernels.ID.JupiterBarycenter
     },
     Color = { 0.4, 0.3, 0.01 },
     Period = 685.32,
@@ -255,8 +257,8 @@ local Taygete = {
   Transform = {
     Translation = {
       Type = "SpiceTranslation",
-      Target = "TAYGETE",
-      Observer = "JUPITER BARYCENTER"
+      Target = kernels344.ID.Taygete,
+      Observer = coreKernels.ID.JupiterBarycenter
     }
   },
   Renderable = {
@@ -286,8 +288,8 @@ local TaygeteTrail = {
     Type = "RenderableTrailOrbit",
     Translation = {
       Type = "SpiceTranslation",
-      Target = "TAYGETE",
-      Observer = "JUPITER BARYCENTER"
+      Target = kernels344.ID.Taygete,
+      Observer = coreKernels.ID.JupiterBarycenter
     },
     Color = { 0.4, 0.3, 0.01 },
     Period = 686.67,
@@ -337,8 +339,8 @@ local Chaldene = {
   Transform = {
     Translation = {
       Type = "SpiceTranslation",
-      Target = "CHALDENE",
-      Observer = "JUPITER BARYCENTER"
+      Target = kernels344.ID.Chaldene,
+      Observer = coreKernels.ID.JupiterBarycenter
     }
   },
   Renderable = {
@@ -368,8 +370,8 @@ local ChaldeneTrail = {
     Type = "RenderableTrailOrbit",
     Translation = {
       Type = "SpiceTranslation",
-      Target = "CHALDENE",
-      Observer = "JUPITER BARYCENTER"
+      Target = kernels344.ID.Chaldene,
+      Observer = coreKernels.ID.JupiterBarycenter
     },
     Color = { 0.4, 0.3, 0.01 },
     Period = 699.33,
@@ -419,8 +421,8 @@ local Erinome = {
   Transform = {
     Translation = {
       Type = "SpiceTranslation",
-      Target = "ERINOME",
-      Observer = "JUPITER BARYCENTER"
+      Target = kernels344.ID.Erinome,
+      Observer = coreKernels.ID.JupiterBarycenter
     }
   },
   Renderable = {
@@ -450,8 +452,8 @@ local ErinomeTrail = {
     Type = "RenderableTrailOrbit",
     Translation = {
       Type = "SpiceTranslation",
-      Target = "ERINOME",
-      Observer = "JUPITER BARYCENTER"
+      Target = kernels344.ID.Erinome,
+      Observer = coreKernels.ID.JupiterBarycenter
     },
     Color = { 0.4, 0.3, 0.01 },
     Period = 711.96,
@@ -501,8 +503,8 @@ local Kallichore = {
   Transform = {
     Translation = {
       Type = "SpiceTranslation",
-      Target = "KALLICHORE",
-      Observer = "JUPITER BARYCENTER"
+      Target = kernels344.ID.Kallichore,
+      Observer = coreKernels.ID.JupiterBarycenter
     }
   },
   Renderable = {
@@ -532,8 +534,8 @@ local KallichoreTrail = {
     Type = "RenderableTrailOrbit",
     Translation = {
       Type = "SpiceTranslation",
-      Target = "KALLICHORE",
-      Observer = "JUPITER BARYCENTER"
+      Target = kernels344.ID.Kallichore,
+      Observer = coreKernels.ID.JupiterBarycenter
     },
     Color = { 0.4, 0.3, 0.01 },
     Period = 717.81,
@@ -583,8 +585,8 @@ local Kalyke = {
   Transform = {
     Translation = {
       Type = "SpiceTranslation",
-      Target = "KALYKE",
-      Observer = "JUPITER BARYCENTER"
+      Target = kernels344.ID.Kalyke,
+      Observer = coreKernels.ID.JupiterBarycenter
     }
   },
   Renderable = {
@@ -614,8 +616,8 @@ local KalykeTrail = {
     Type = "RenderableTrailOrbit",
     Translation = {
       Type = "SpiceTranslation",
-      Target = "KALYKE",
-      Observer = "JUPITER BARYCENTER"
+      Target = kernels344.ID.Kalyke,
+      Observer = coreKernels.ID.JupiterBarycenter
     },
     Color = { 0.4, 0.3, 0.01 },
     Period = 721.02,
@@ -665,8 +667,8 @@ local Pasithee = {
   Transform = {
     Translation = {
       Type = "SpiceTranslation",
-      Target = "PASITHEE",
-      Observer = "JUPITER BARYCENTER"
+      Target = kernels344.ID.Pasithee,
+      Observer = coreKernels.ID.JupiterBarycenter
     }
   },
   Renderable = {
@@ -696,8 +698,8 @@ local PasitheeTrail = {
     Type = "RenderableTrailOrbit",
     Translation = {
       Type = "SpiceTranslation",
-      Target = "PASITHEE",
-      Observer = "JUPITER BARYCENTER"
+      Target = kernels344.ID.Pasithee,
+      Observer = coreKernels.ID.JupiterBarycenter
     },
     Color = { 0.4, 0.3, 0.01 },
     Period = 726.93,
@@ -747,8 +749,8 @@ local S2010J1 = {
   Transform = {
     Translation = {
       Type = "SpiceTranslation",
-      Target = "551",
-      Observer = "JUPITER BARYCENTER"
+      Target = kernels344.ID.S2010J1,
+      Observer = coreKernels.ID.JupiterBarycenter
     }
   },
   Renderable = {
@@ -778,8 +780,8 @@ local S2010J1Trail = {
     Type = "RenderableTrailOrbit",
     Translation = {
       Type = "SpiceTranslation",
-      Target = "551",
-      Observer = "JUPITER BARYCENTER"
+      Target = kernels344.ID.S2010J1,
+      Observer = coreKernels.ID.JupiterBarycenter
     },
     Color = { 0.4, 0.3, 0.01 },
     Period = 722.83,
@@ -829,8 +831,8 @@ local Eukelade = {
   Transform = {
     Translation = {
       Type = "SpiceTranslation",
-      Target = "EUKELADE",
-      Observer = "JUPITER BARYCENTER"
+      Target = kernels344.ID.Eukelade,
+      Observer = coreKernels.ID.JupiterBarycenter
     }
   },
   Renderable = {
@@ -860,8 +862,8 @@ local EukeladeTrail = {
     Type = "RenderableTrailOrbit",
     Translation = {
       Type = "SpiceTranslation",
-      Target = "EUKELADE",
-      Observer = "JUPITER BARYCENTER"
+      Target = kernels344.ID.Eukelade,
+      Observer = coreKernels.ID.JupiterBarycenter
     },
     Color = { 0.4, 0.3, 0.01 },
     Period = 735.20,
@@ -911,8 +913,8 @@ local Arche = {
   Transform = {
     Translation = {
       Type = "SpiceTranslation",
-      Target = "ARCHE",
-      Observer = "JUPITER BARYCENTER"
+      Target = kernels344.ID.Arche,
+      Observer = coreKernels.ID.JupiterBarycenter
     }
   },
   Renderable = {
@@ -942,8 +944,8 @@ local ArcheTrail = {
     Type = "RenderableTrailOrbit",
     Translation = {
       Type = "SpiceTranslation",
-      Target = "ARCHE",
-      Observer = "JUPITER BARYCENTER"
+      Target = kernels344.ID.Arche,
+      Observer = coreKernels.ID.JupiterBarycenter
     },
     Color = { 0.4, 0.3, 0.01 },
     Period = 746.19,
@@ -993,8 +995,8 @@ local Isonoe = {
   Transform = {
     Translation = {
       Type = "SpiceTranslation",
-      Target = "ISONOE",
-      Observer = "JUPITER BARYCENTER"
+      Target = kernels344.ID.Isonoe,
+      Observer = coreKernels.ID.JupiterBarycenter
     }
   },
   Renderable = {
@@ -1024,8 +1026,8 @@ local IsonoeTrail = {
     Type = "RenderableTrailOrbit",
     Translation = {
       Type = "SpiceTranslation",
-      Target = "ISONOE",
-      Observer = "JUPITER BARYCENTER"
+      Target = kernels344.ID.Isonoe,
+      Observer = coreKernels.ID.JupiterBarycenter
     },
     Color = { 0.4, 0.3, 0.01 },
     Period = 750.13,
@@ -1075,8 +1077,8 @@ local Carme = {
   Transform = {
     Translation = {
       Type = "SpiceTranslation",
-      Target = "CARME",
-      Observer = "JUPITER BARYCENTER"
+      Target = kernels344.ID.Carme,
+      Observer = coreKernels.ID.JupiterBarycenter
     }
   },
   Renderable = {
@@ -1106,8 +1108,8 @@ local CarmeTrail = {
     Type = "RenderableTrailOrbit",
     Translation = {
       Type = "SpiceTranslation",
-      Target = "CARME",
-      Observer = "JUPITER BARYCENTER"
+      Target = kernels344.ID.Carme,
+      Observer = coreKernels.ID.JupiterBarycenter
     },
     Color = { 0.4, 0.3, 0.01 },
     Period = 763.95,
@@ -1157,8 +1159,8 @@ local S2003J5 = {
   Transform = {
     Translation = {
       Type = "SpiceTranslation",
-      Target = "557",
-      Observer = "JUPITER BARYCENTER"
+      Target = kernels344.ID.S2003J5,
+      Observer = coreKernels.ID.JupiterBarycenter
     }
   },
   Renderable = {
@@ -1188,8 +1190,8 @@ local S2003J5Trail = {
     Type = "RenderableTrailOrbit",
     Translation = {
       Type = "SpiceTranslation",
-      Target = "557",
-      Observer = "JUPITER BARYCENTER"
+      Target = kernels344.ID.S2003J5,
+      Observer = coreKernels.ID.JupiterBarycenter
     },
     Color = { 0.4, 0.3, 0.01 },
     Period = 758.34,
@@ -1239,8 +1241,8 @@ local S2018J3 = {
   Transform = {
     Translation = {
       Type = "SpiceTranslation",
-      Target = "55511",
-      Observer = "JUPITER BARYCENTER"
+      Target = kernels346.ID.S2018J3,
+      Observer = coreKernels.ID.JupiterBarycenter
     }
   },
   Renderable = {
@@ -1270,8 +1272,8 @@ local S2018J3Trail = {
     Type = "RenderableTrailOrbit",
     Translation = {
       Type = "SpiceTranslation",
-      Target = "55511",
-      Observer = "JUPITER BARYCENTER"
+      Target = kernels346.ID.S2018J3,
+      Observer = coreKernels.ID.JupiterBarycenter
     },
     Color = { 0.4, 0.3, 0.01 },
     Period = 704.56,
@@ -1321,8 +1323,8 @@ local S2021J4 = {
   Transform = {
     Translation = {
       Type = "SpiceTranslation",
-      Target = "55515",
-      Observer = "JUPITER BARYCENTER"
+      Target = kernels346.ID.S2021J4,
+      Observer = coreKernels.ID.JupiterBarycenter
     }
   },
   Renderable = {
@@ -1352,8 +1354,8 @@ local S2021J4Trail = {
     Type = "RenderableTrailOrbit",
     Translation = {
       Type = "SpiceTranslation",
-      Target = "55515",
-      Observer = "JUPITER BARYCENTER"
+      Target = kernels346.ID.S2021J4,
+      Observer = coreKernels.ID.JupiterBarycenter
     },
     Color = { 0.4, 0.3, 0.01 },
     Period = 710.13,
@@ -1403,8 +1405,8 @@ local S2021J5 = {
   Transform = {
     Translation = {
       Type = "SpiceTranslation",
-      Target = "55516",
-      Observer = "JUPITER BARYCENTER"
+      Target = kernels346.ID.S2021J5,
+      Observer = coreKernels.ID.JupiterBarycenter
     }
   },
   Renderable = {
@@ -1434,8 +1436,8 @@ local S2021J5Trail = {
     Type = "RenderableTrailOrbit",
     Translation = {
       Type = "SpiceTranslation",
-      Target = "55516",
-      Observer = "JUPITER BARYCENTER"
+      Target = kernels346.ID.S2021J5,
+      Observer = coreKernels.ID.JupiterBarycenter
     },
     Color = { 0.4, 0.3, 0.01 },
     Period = 704.80,
@@ -1485,8 +1487,8 @@ local S2021J6 = {
   Transform = {
     Translation = {
       Type = "SpiceTranslation",
-      Target = "55517",
-      Observer = "JUPITER BARYCENTER"
+      Target = kernels346.ID.S2021J6,
+      Observer = coreKernels.ID.JupiterBarycenter
     }
   },
   Renderable = {
@@ -1516,8 +1518,8 @@ local S2021J6Trail = {
     Type = "RenderableTrailOrbit",
     Translation = {
       Type = "SpiceTranslation",
-      Target = "55517",
-      Observer = "JUPITER BARYCENTER"
+      Target = kernels346.ID.S2021J6,
+      Observer = coreKernels.ID.JupiterBarycenter
     },
     Color = { 0.4, 0.3, 0.01 },
     Period = 732.55,
@@ -1567,8 +1569,8 @@ local S2016J3 = {
   Transform = {
     Translation = {
       Type = "SpiceTranslation",
-      Target = "55518",
-      Observer = "JUPITER BARYCENTER"
+      Target = kernels346.ID.S2016J3,
+      Observer = coreKernels.ID.JupiterBarycenter
     }
   },
   Renderable = {
@@ -1598,8 +1600,8 @@ local S2016J3Trail = {
     Type = "RenderableTrailOrbit",
     Translation = {
       Type = "SpiceTranslation",
-      Target = "55518",
-      Observer = "JUPITER BARYCENTER"
+      Target = kernels346.ID.S2016J3,
+      Observer = coreKernels.ID.JupiterBarycenter
     },
     Color = { 0.4, 0.3, 0.01 },
     Period = 676.37,
@@ -1649,8 +1651,8 @@ local S2022J1 = {
   Transform = {
     Translation = {
       Type = "SpiceTranslation",
-      Target = "55521",
-      Observer = "JUPITER BARYCENTER"
+      Target = kernels346.ID.S2022J1,
+      Observer = coreKernels.ID.JupiterBarycenter
     }
   },
   Renderable = {
@@ -1680,8 +1682,8 @@ local S2022J1Trail = {
     Type = "RenderableTrailOrbit",
     Translation = {
       Type = "SpiceTranslation",
-      Target = "55521",
-      Observer = "JUPITER BARYCENTER"
+      Target = kernels346.ID.S2022J1,
+      Observer = coreKernels.ID.JupiterBarycenter
     },
     Color = { 0.4, 0.3, 0.01 },
     Period = 667.34,
@@ -1731,8 +1733,8 @@ local S2022J2 = {
   Transform = {
     Translation = {
       Type = "SpiceTranslation",
-      Target = "55522",
-      Observer = "JUPITER BARYCENTER"
+      Target = kernels346.ID.S2022J2,
+      Observer = coreKernels.ID.JupiterBarycenter
     }
   },
   Renderable = {
@@ -1762,8 +1764,8 @@ local S2022J2Trail = {
     Type = "RenderableTrailOrbit",
     Translation = {
       Type = "SpiceTranslation",
-      Target = "55522",
-      Observer = "JUPITER BARYCENTER"
+      Target = kernels346.ID.S2022J2,
+      Observer = coreKernels.ID.JupiterBarycenter
     },
     Color = { 0.4, 0.3, 0.01 },
     Period = 685.51,
@@ -1813,8 +1815,8 @@ local S2017J2 = {
   Transform = {
     Translation = {
       Type = "SpiceTranslation",
-      Target = "563",
-      Observer = "JUPITER BARYCENTER"
+      Target = kernels344.ID.S2017J2,
+      Observer = coreKernels.ID.JupiterBarycenter
     }
   },
   Renderable = {
@@ -1844,8 +1846,8 @@ local S2017J2Trail = {
     Type = "RenderableTrailOrbit",
     Translation = {
       Type = "SpiceTranslation",
-      Target = "563",
-      Observer = "JUPITER BARYCENTER"
+      Target = kernels344.ID.S2017J2,
+      Observer = coreKernels.ID.JupiterBarycenter
     },
     Color = { 0.4, 0.3, 0.01 },
     Period = 723.1,
@@ -1895,8 +1897,8 @@ local S2017J5 = {
   Transform = {
     Translation = {
       Type = "SpiceTranslation",
-      Target = "566",
-      Observer = "JUPITER BARYCENTER"
+      Target = kernels344.ID.S2017J5,
+      Observer = coreKernels.ID.JupiterBarycenter
     }
   },
   Renderable = {
@@ -1926,8 +1928,8 @@ local S2017J5Trail = {
     Type = "RenderableTrailOrbit",
     Translation = {
       Type = "SpiceTranslation",
-      Target = "566",
-      Observer = "JUPITER BARYCENTER"
+      Target = kernels344.ID.S2017J5,
+      Observer = coreKernels.ID.JupiterBarycenter
     },
     Color = { 0.4, 0.3, 0.01 },
     Period = 719.5,
@@ -1977,8 +1979,8 @@ local S2017J8 = {
   Transform = {
     Translation = {
       Type = "SpiceTranslation",
-      Target = "569",
-      Observer = "JUPITER BARYCENTER"
+      Target = kernels344.ID.S2017J8,
+      Observer = coreKernels.ID.JupiterBarycenter
     }
   },
   Renderable = {
@@ -2008,8 +2010,8 @@ local S2017J8Trail = {
     Type = "RenderableTrailOrbit",
     Translation = {
       Type = "SpiceTranslation",
-      Target = "569",
-      Observer = "JUPITER BARYCENTER"
+      Target = kernels344.ID.S2017J8,
+      Observer = coreKernels.ID.JupiterBarycenter
     },
     Color = { 0.4, 0.3, 0.01 },
     Period = 719.6,
@@ -2059,8 +2061,8 @@ local S2011J1 = {
   Transform = {
     Translation = {
       Type = "SpiceTranslation",
-      Target = "572",
-      Observer = "JUPITER BARYCENTER"
+      Target = kernels344.ID.S2011J1,
+      Observer = coreKernels.ID.JupiterBarycenter
     }
   },
   Renderable = {
@@ -2090,8 +2092,8 @@ local S2011J1Trail = {
     Type = "RenderableTrailOrbit",
     Translation = {
       Type = "SpiceTranslation",
-      Target = "572",
-      Observer = "JUPITER BARYCENTER"
+      Target = kernels344.ID.S2011J1,
+      Observer = coreKernels.ID.JupiterBarycenter
     },
     Color = { 0.4, 0.3, 0.01 },
     Period = 686.6,
@@ -2141,8 +2143,8 @@ local S2003J9 = {
   Transform = {
     Translation = {
       Type = "SpiceTranslation",
-      Target = "55503",
-      Observer = "JUPITER BARYCENTER"
+      Target = kernels344.ID.S2003J9,
+      Observer = coreKernels.ID.JupiterBarycenter
     }
   },
   Renderable = {
@@ -2172,8 +2174,8 @@ local S2003J9Trail = {
     Type = "RenderableTrailOrbit",
     Translation = {
       Type = "SpiceTranslation",
-      Target = "55503",
-      Observer = "JUPITER BARYCENTER"
+      Target = kernels344.ID.S2003J9,
+      Observer = coreKernels.ID.JupiterBarycenter
     },
     Color = { 0.4, 0.3, 0.01 },
     Period = 767.6,
@@ -2223,8 +2225,8 @@ local S2003J10 = {
   Transform = {
     Translation = {
       Type = "SpiceTranslation",
-      Target = "55504",
-      Observer = "JUPITER BARYCENTER"
+      Target = kernels344.ID.S2003J10,
+      Observer = coreKernels.ID.JupiterBarycenter
     }
   },
   Renderable = {
@@ -2254,8 +2256,8 @@ local S2003J10Trail = {
     Type = "RenderableTrailOrbit",
     Translation = {
       Type = "SpiceTranslation",
-      Target = "55504",
-      Observer = "JUPITER BARYCENTER"
+      Target = kernels344.ID.S2003J10,
+      Observer = coreKernels.ID.JupiterBarycenter
     },
     Color = { 0.4, 0.3, 0.01 },
     Period = 705.96,
@@ -2301,10 +2303,6 @@ local S2003J10Label = {
 
 
 asset.onInitialize(function()
-  openspace.spice.loadKernel(kernel.jup344)
-  openspace.spice.loadKernel(kernel.jup346)
-
-
   openspace.addSceneGraphNode(Herse)
   openspace.addSceneGraphNode(HerseTrail)
   openspace.addSceneGraphNode(HerseLabel)
@@ -2530,10 +2528,6 @@ asset.onDeinitialize(function()
   openspace.removeSceneGraphNode(HerseLabel)
   openspace.removeSceneGraphNode(HerseTrail)
   openspace.removeSceneGraphNode(Herse)
-
-
-  openspace.spice.loadKernel(kernel.jup346)
-  openspace.spice.loadKernel(kernel.jup344)
 end)
 
 asset.export(Herse)
diff --git a/data/assets/scene/solarsystem/planets/jupiter/minor/carpo_group.asset b/data/assets/scene/solarsystem/planets/jupiter/minor/carpo_group.asset
index 14ba43eb87..8517d24a7d 100644
--- a/data/assets/scene/solarsystem/planets/jupiter/minor/carpo_group.asset
+++ b/data/assets/scene/solarsystem/planets/jupiter/minor/carpo_group.asset
@@ -1,5 +1,7 @@
 local transforms = asset.require("../transforms")
-local kernel = asset.require("../kernels")
+local kernels344 = asset.require("../kernels344")
+local kernels346 = asset.require("../kernels346")
+local coreKernels = asset.require("spice/core")
 
 
 
@@ -9,8 +11,8 @@ local Carpo = {
   Transform = {
     Translation = {
       Type = "SpiceTranslation",
-      Target = "CARPO",
-      Observer = "JUPITER BARYCENTER"
+      Target = kernels344.ID.Carpo,
+      Observer = coreKernels.ID.JupiterBarycenter
     }
   },
   Renderable = {
@@ -40,8 +42,8 @@ local CarpoTrail = {
     Type = "RenderableTrailOrbit",
     Translation = {
       Type = "SpiceTranslation",
-      Target = "CARPO",
-      Observer = "JUPITER BARYCENTER"
+      Target = kernels344.ID.Carpo,
+      Observer = coreKernels.ID.JupiterBarycenter
     },
     Color = { 0.4, 0.3, 0.01 },
     Period = 458.62,
@@ -116,8 +118,8 @@ local S2018J4 = {
   Transform = {
     Translation = {
       Type = "SpiceTranslation",
-      Target = "55520",
-      Observer = "JUPITER BARYCENTER"
+      Target = kernels346.ID.S2018J4,
+      Observer = coreKernels.ID.JupiterBarycenter
     }
   },
   Renderable = {
@@ -147,8 +149,8 @@ local S2018J4Trail = {
     Type = "RenderableTrailOrbit",
     Translation = {
       Type = "SpiceTranslation",
-      Target = "55520",
-      Observer = "JUPITER BARYCENTER"
+      Target = kernels346.ID.S2018J4,
+      Observer = coreKernels.ID.JupiterBarycenter
     },
     Color = { 0.4, 0.3, 0.01 },
     Period = 458.62,
@@ -219,9 +221,6 @@ local S2018J4LabelNear = {
 
 
 asset.onInitialize(function()
-  openspace.spice.loadKernel(kernel.jup344)
-
-
   openspace.addSceneGraphNode(Carpo)
   openspace.addSceneGraphNode(CarpoTrail)
   openspace.addSceneGraphNode(CarpoLabel)
@@ -239,8 +238,6 @@ asset.onDeinitialize(function()
   openspace.removeSceneGraphNode(CarpoLabel)
   openspace.removeSceneGraphNode(CarpoTrail)
   openspace.removeSceneGraphNode(Carpo)
-
-  openspace.spice.unloadKernel(kernel.jup344)
 end)
 
 asset.export(Carpo)
diff --git a/data/assets/scene/solarsystem/planets/jupiter/minor/himalia_group.asset b/data/assets/scene/solarsystem/planets/jupiter/minor/himalia_group.asset
index 4fc3675d13..909b69dc87 100644
--- a/data/assets/scene/solarsystem/planets/jupiter/minor/himalia_group.asset
+++ b/data/assets/scene/solarsystem/planets/jupiter/minor/himalia_group.asset
@@ -1,5 +1,7 @@
 local transforms = asset.require("../transforms")
-local kernel = asset.require("../kernels")
+local kernels344 = asset.require("../kernels344")
+local kernels346 = asset.require("../kernels346")
+local coreKernels = asset.require("spice/core")
 
 
 
@@ -9,8 +11,8 @@ local Leda = {
   Transform = {
     Translation = {
       Type = "SpiceTranslation",
-      Target = "LEDA",
-      Observer = "JUPITER BARYCENTER"
+      Target = kernels344.ID.Leda,
+      Observer = coreKernels.ID.JupiterBarycenter
     }
   },
   Renderable = {
@@ -40,8 +42,8 @@ local LedaTrail = {
     Type = "RenderableTrailOrbit",
     Translation = {
       Type = "SpiceTranslation",
-      Target = "LEDA",
-      Observer = "JUPITER BARYCENTER"
+      Target = kernels344.ID.Leda,
+      Observer = coreKernels.ID.JupiterBarycenter
     },
     Color = { 0.4, 0.3, 0.01 },
     Period = 240.82,
@@ -91,8 +93,8 @@ local Himalia = {
   Transform = {
     Translation = {
       Type = "SpiceTranslation",
-      Target = "HIMALIA",
-      Observer = "JUPITER BARYCENTER"
+      Target = kernels344.ID.Himalia,
+      Observer = coreKernels.ID.JupiterBarycenter
     }
   },
   Renderable = {
@@ -122,8 +124,8 @@ local HimaliaTrail = {
     Type = "RenderableTrailOrbit",
     Translation = {
       Type = "SpiceTranslation",
-      Target = "HIMALIA",
-      Observer = "JUPITER BARYCENTER"
+      Target = kernels344.ID.Himalia,
+      Observer = coreKernels.ID.JupiterBarycenter
     },
     Color = { 0.4, 0.3, 0.01 },
     Period = 250.23,
@@ -173,8 +175,8 @@ local Lysithea = {
   Transform = {
     Translation = {
       Type = "SpiceTranslation",
-      Target = "LYSITHEA",
-      Observer = "JUPITER BARYCENTER"
+      Target = kernels344.ID.Lysithea,
+      Observer = coreKernels.ID.JupiterBarycenter
     }
   },
   Renderable = {
@@ -204,8 +206,8 @@ local LysitheaTrail = {
     Type = "RenderableTrailOrbit",
     Translation = {
       Type = "SpiceTranslation",
-      Target = "LYSITHEA",
-      Observer = "JUPITER BARYCENTER"
+      Target = kernels344.ID.Lysithea,
+      Observer = coreKernels.ID.JupiterBarycenter
     },
     Color = { 0.4, 0.3, 0.01 },
     Period = 259.89,
@@ -255,8 +257,8 @@ local Elara = {
   Transform = {
     Translation = {
       Type = "SpiceTranslation",
-      Target = "ELARA",
-      Observer = "JUPITER BARYCENTER"
+      Target = kernels344.ID.Elara,
+      Observer = coreKernels.ID.JupiterBarycenter
     }
   },
   Renderable = {
@@ -286,8 +288,8 @@ local ElaraTrail = {
     Type = "RenderableTrailOrbit",
     Translation = {
       Type = "SpiceTranslation",
-      Target = "ELARA",
-      Observer = "JUPITER BARYCENTER"
+      Target = kernels344.ID.Elara,
+      Observer = coreKernels.ID.JupiterBarycenter
     },
     Color = { 0.4, 0.3, 0.01 },
     Period = 257.62,
@@ -337,8 +339,8 @@ local Dia = {
   Transform = {
     Translation = {
       Type = "SpiceTranslation",
-      Target = "DIA",
-      Observer = "JUPITER BARYCENTER"
+      Target = kernels344.ID.Dia,
+      Observer = coreKernels.ID.JupiterBarycenter
     }
   },
   Renderable = {
@@ -368,8 +370,8 @@ local DiaTrail = {
     Type = "RenderableTrailOrbit",
     Translation = {
       Type = "SpiceTranslation",
-      Target = "DIA",
-      Observer = "JUPITER BARYCENTER"
+      Target = kernels344.ID.Dia,
+      Observer = coreKernels.ID.JupiterBarycenter
     },
     Color = { 0.4, 0.3, 0.01 },
     Period = 287.93,
@@ -419,8 +421,8 @@ local S2011J3 = {
   Transform = {
     Translation = {
       Type = "SpiceTranslation",
-      Target = "55509",
-      Observer = "JUPITER BARYCENTER"
+      Target = kernels346.ID.S2011J3,
+      Observer = coreKernels.ID.JupiterBarycenter
     }
   },
   Renderable = {
@@ -450,8 +452,8 @@ local S2011J3Trail = {
     Type = "RenderableTrailOrbit",
     Translation = {
       Type = "SpiceTranslation",
-      Target = "55509",
-      Observer = "JUPITER BARYCENTER"
+      Target = kernels346.ID.S2011J3,
+      Observer = coreKernels.ID.JupiterBarycenter
     },
     Color = { 0.4, 0.3, 0.01 },
     Period = 261.77,
@@ -501,8 +503,8 @@ local S2018J2 = {
   Transform = {
     Translation = {
       Type = "SpiceTranslation",
-      Target = "55510",
-      Observer = "JUPITER BARYCENTER"
+      Target = kernels346.ID.S2018J2,
+      Observer = coreKernels.ID.JupiterBarycenter
     }
   },
   Renderable = {
@@ -532,8 +534,8 @@ local S2018J2Trail = {
     Type = "RenderableTrailOrbit",
     Translation = {
       Type = "SpiceTranslation",
-      Target = "55510",
-      Observer = "JUPITER BARYCENTER"
+      Target = kernels346.ID.S2018J2,
+      Observer = coreKernels.ID.JupiterBarycenter
     },
     Color = { 0.4, 0.3, 0.01 },
     Period = 250.88,
@@ -583,8 +585,8 @@ local Pandia = {
   Transform = {
     Translation = {
       Type = "SpiceTranslation",
-      Target = "565",
-      Observer = "JUPITER BARYCENTER"
+      Target = kernels344.ID.Pandia,
+      Observer = coreKernels.ID.JupiterBarycenter
     }
   },
   Renderable = {
@@ -614,8 +616,8 @@ local PandiaTrail = {
     Type = "RenderableTrailOrbit",
     Translation = {
       Type = "SpiceTranslation",
-      Target = "565",
-      Observer = "JUPITER BARYCENTER"
+      Target = kernels344.ID.Pandia,
+      Observer = coreKernels.ID.JupiterBarycenter
     },
     Color = { 0.4, 0.3, 0.01 },
     Period = 251.911,
@@ -665,8 +667,8 @@ local Ersa = {
   Transform = {
     Translation = {
       Type = "SpiceTranslation",
-      Target = "571",
-      Observer = "JUPITER BARYCENTER"
+      Target = kernels344.ID.Ersa,
+      Observer = coreKernels.ID.JupiterBarycenter
     }
   },
   Renderable = {
@@ -696,8 +698,8 @@ local ErsaTrail = {
     Type = "RenderableTrailOrbit",
     Translation = {
       Type = "SpiceTranslation",
-      Target = "571",
-      Observer = "JUPITER BARYCENTER"
+      Target = kernels344.ID.Ersa,
+      Observer = coreKernels.ID.JupiterBarycenter
     },
     Color = { 0.4, 0.3, 0.01 },
     Period = 249.229,
@@ -743,10 +745,6 @@ local ErsaLabel = {
 
 
 asset.onInitialize(function()
-  openspace.spice.loadKernel(kernel.jup344)
-  openspace.spice.loadKernel(kernel.jup346)
-
-
   openspace.addSceneGraphNode(Leda)
   openspace.addSceneGraphNode(LedaTrail)
   openspace.addSceneGraphNode(LedaLabel)
@@ -820,10 +818,6 @@ asset.onDeinitialize(function()
   openspace.removeSceneGraphNode(LedaLabel)
   openspace.removeSceneGraphNode(LedaTrail)
   openspace.removeSceneGraphNode(Leda)
-
-
-  openspace.spice.unloadKernel(kernel.jup346)
-  openspace.spice.unloadKernel(kernel.jup344)
 end)
 
 asset.export(Leda)
diff --git a/data/assets/scene/solarsystem/planets/jupiter/minor/inner_group.asset b/data/assets/scene/solarsystem/planets/jupiter/minor/inner_group.asset
index f07135e154..6a4f892747 100644
--- a/data/assets/scene/solarsystem/planets/jupiter/minor/inner_group.asset
+++ b/data/assets/scene/solarsystem/planets/jupiter/minor/inner_group.asset
@@ -1,5 +1,6 @@
 local transforms = asset.require("../transforms")
-local kernel = asset.require("../kernels")
+local kernels344 = asset.require("../kernels344")
+local coreKernels = asset.require("spice/core")
 
 
 
@@ -9,8 +10,8 @@ local Metis = {
   Transform = {
     Translation = {
       Type = "SpiceTranslation",
-      Target = "METIS",
-      Observer = "JUPITER BARYCENTER"
+      Target = kernels344.ID.Metis,
+      Observer = coreKernels.ID.JupiterBarycenter
     }
   },
   Renderable = {
@@ -40,8 +41,8 @@ local MetisTrail = {
     Type = "RenderableTrailOrbit",
     Translation = {
       Type = "SpiceTranslation",
-      Target = "METIS",
-      Observer = "JUPITER BARYCENTER"
+      Target = kernels344.ID.Metis,
+      Observer = coreKernels.ID.JupiterBarycenter
     },
     Color = { 0.4, 0.3, 0.01 },
     Period = 0.117912037,
@@ -91,8 +92,8 @@ local Adrastea = {
   Transform = {
     Translation = {
       Type = "SpiceTranslation",
-      Target = "ADRASTEA",
-      Observer = "JUPITER BARYCENTER"
+      Target = kernels344.ID.Adrastea,
+      Observer = coreKernels.ID.JupiterBarycenter
     }
   },
   Renderable = {
@@ -122,8 +123,8 @@ local AdrasteaTrail = {
     Type = "RenderableTrailOrbit",
     Translation = {
       Type = "SpiceTranslation",
-      Target = "ADRASTEA",
-      Observer = "JUPITER BARYCENTER"
+      Target = kernels344.ID.Adrastea,
+      Observer = coreKernels.ID.JupiterBarycenter
     },
     Color = { 0.4, 0.3, 0.01 },
     Period = 0.2982638889,
@@ -173,8 +174,8 @@ local Amalthea = {
   Transform = {
     Translation = {
       Type = "SpiceTranslation",
-      Target = "AMALTHEA",
-      Observer = "JUPITER BARYCENTER"
+      Target = kernels344.ID.Amalthea,
+      Observer = coreKernels.ID.JupiterBarycenter
     }
   },
   Renderable = {
@@ -204,8 +205,8 @@ local AmaltheaTrail = {
     Type = "RenderableTrailOrbit",
     Translation = {
       Type = "SpiceTranslation",
-      Target = "AMALTHEA",
-      Observer = "JUPITER BARYCENTER"
+      Target = kernels344.ID.Amalthea,
+      Observer = coreKernels.ID.JupiterBarycenter
     },
     Color = { 0.4, 0.3, 0.01 },
     Period = 0.4981828704,
@@ -255,8 +256,8 @@ local Thebe = {
   Transform = {
     Translation = {
       Type = "SpiceTranslation",
-      Target = "THEBE",
-      Observer = "JUPITER BARYCENTER"
+      Target = kernels344.ID.Thebe,
+      Observer = coreKernels.ID.JupiterBarycenter
     }
   },
   Renderable = {
@@ -286,8 +287,8 @@ local ThebeTrail = {
     Type = "RenderableTrailOrbit",
     Translation = {
       Type = "SpiceTranslation",
-      Target = "THEBE",
-      Observer = "JUPITER BARYCENTER"
+      Target = kernels344.ID.Thebe,
+      Observer = coreKernels.ID.JupiterBarycenter
     },
     Color = { 0.4, 0.3, 0.01 },
     Period = 0.6745023148,
@@ -333,9 +334,6 @@ local ThebeLabel = {
 
 
 asset.onInitialize(function()
-  openspace.spice.loadKernel(kernel.jup365)
-
-
   openspace.addSceneGraphNode(Metis)
   openspace.addSceneGraphNode(MetisTrail)
   openspace.addSceneGraphNode(MetisLabel)
@@ -370,9 +368,6 @@ asset.onDeinitialize(function()
   openspace.removeSceneGraphNode(ThebeLabel)
   openspace.removeSceneGraphNode(ThebeTrail)
   openspace.removeSceneGraphNode(Thebe)
-
-
-  openspace.spice.unloadKernel(kernel.jup365)
 end)
 
 
diff --git a/data/assets/scene/solarsystem/planets/jupiter/minor/other_groups.asset b/data/assets/scene/solarsystem/planets/jupiter/minor/other_groups.asset
index 5b601ff7d6..1ff300f7f2 100644
--- a/data/assets/scene/solarsystem/planets/jupiter/minor/other_groups.asset
+++ b/data/assets/scene/solarsystem/planets/jupiter/minor/other_groups.asset
@@ -1,5 +1,6 @@
 local transforms = asset.require("../transforms")
-local kernel = asset.require("../kernels")
+local kernels344 = asset.require("../kernels344")
+local coreKernels = asset.require("spice/core")
 
 
 
@@ -9,8 +10,8 @@ local Eupheme = {
   Transform = {
     Translation = {
       Type = "SpiceTranslation",
-      Target = "560",
-      Observer = "JUPITER BARYCENTER"
+      Target = kernels344.ID.Eupheme,
+      Observer = coreKernels.ID.JupiterBarycenter
     }
   },
   Renderable = {
@@ -40,8 +41,8 @@ local EuphemeTrail = {
     Type = "RenderableTrailOrbit",
     Translation = {
       Type = "SpiceTranslation",
-      Target = "560",
-      Observer = "JUPITER BARYCENTER"
+      Target = kernels344.ID.Eupheme,
+      Observer = coreKernels.ID.JupiterBarycenter
     },
     Color = { 0.4, 0.3, 0.01 },
     Period = 628.06,
@@ -91,8 +92,8 @@ local S2003J19 = {
   Transform = {
     Translation = {
       Type = "SpiceTranslation",
-      Target = "561",
-      Observer = "JUPITER BARYCENTER"
+      Target = kernels344.ID.S2003J19,
+      Observer = coreKernels.ID.JupiterBarycenter
     }
   },
   Renderable = {
@@ -122,8 +123,8 @@ local S2003J19Trail = {
     Type = "RenderableTrailOrbit",
     Translation = {
       Type = "SpiceTranslation",
-      Target = "561",
-      Observer = "JUPITER BARYCENTER"
+      Target = kernels344.ID.S2003J19,
+      Observer = coreKernels.ID.JupiterBarycenter
     },
     Color = { 0.4, 0.3, 0.01 },
     Period = 699.12,
@@ -173,8 +174,8 @@ local Valetudo = {
   Transform = {
     Translation = {
       Type = "SpiceTranslation",
-      Target = "562",
-      Observer = "JUPITER BARYCENTER"
+      Target = kernels344.ID.Valetudo,
+      Observer = coreKernels.ID.JupiterBarycenter
     }
   },
   Renderable = {
@@ -204,8 +205,8 @@ local ValetudoTrail = {
     Type = "RenderableTrailOrbit",
     Translation = {
       Type = "SpiceTranslation",
-      Target = "562",
-      Observer = "JUPITER BARYCENTER"
+      Target = kernels344.ID.Valetudo,
+      Observer = coreKernels.ID.JupiterBarycenter
     },
     Color = { 0.4, 0.3, 0.01 },
     Period = 527.41,
@@ -251,9 +252,6 @@ local ValetudoLabel = {
 
 
 asset.onInitialize(function()
-  openspace.spice.loadKernel(kernel.jup344)
-
-
   openspace.addSceneGraphNode(Eupheme)
   openspace.addSceneGraphNode(EuphemeTrail)
   openspace.addSceneGraphNode(EuphemeLabel)
@@ -279,9 +277,6 @@ asset.onDeinitialize(function()
   openspace.removeSceneGraphNode(EuphemeLabel)
   openspace.removeSceneGraphNode(EuphemeTrail)
   openspace.removeSceneGraphNode(Eupheme)
-
-
-  openspace.spice.unloadKernel(kernel.jup344)
 end)
 
 asset.export(Eupheme)
diff --git a/data/assets/scene/solarsystem/planets/jupiter/minor/pasiphae_group.asset b/data/assets/scene/solarsystem/planets/jupiter/minor/pasiphae_group.asset
index 79da80391a..d2a93c6345 100644
--- a/data/assets/scene/solarsystem/planets/jupiter/minor/pasiphae_group.asset
+++ b/data/assets/scene/solarsystem/planets/jupiter/minor/pasiphae_group.asset
@@ -1,5 +1,7 @@
 local transforms = asset.require("../transforms")
-local kernel = asset.require("../kernels")
+local kernels344 = asset.require("../kernels344")
+local kernels346 = asset.require("../kernels346")
+local coreKernels = asset.require("spice/core")
 
 
 
@@ -9,8 +11,8 @@ local Euporie = {
   Transform = {
     Translation = {
       Type = "SpiceTranslation",
-      Target = "EUPORIE",
-      Observer = "JUPITER BARYCENTER"
+      Target = kernels344.ID.Euporie,
+      Observer = coreKernels.ID.JupiterBarycenter
     }
   },
   Renderable = {
@@ -40,8 +42,8 @@ local EuporieTrail = {
     Type = "RenderableTrailOrbit",
     Translation = {
       Type = "SpiceTranslation",
-      Target = "EUPORIE",
-      Observer = "JUPITER BARYCENTER"
+      Target = kernels344.ID.Euporie,
+      Observer = coreKernels.ID.JupiterBarycenter
     },
     Color = { 0.4, 0.3, 0.01 },
     Period = 538.78,
@@ -91,8 +93,8 @@ local S2003J18 = {
   Transform = {
     Translation = {
       Type = "SpiceTranslation",
-      Target = "555",
-      Observer = "JUPITER BARYCENTER"
+      Target = kernels344.ID.S2003J18,
+      Observer = coreKernels.ID.JupiterBarycenter
     }
   },
   Renderable = {
@@ -122,8 +124,8 @@ local S2003J18Trail = {
     Type = "RenderableTrailOrbit",
     Translation = {
       Type = "SpiceTranslation",
-      Target = "555",
-      Observer = "JUPITER BARYCENTER"
+      Target = kernels344.ID.S2003J18,
+      Observer = coreKernels.ID.JupiterBarycenter
     },
     Color = { 0.4, 0.3, 0.01 },
     Period = 587.38,
@@ -173,8 +175,8 @@ local Helike = {
   Transform = {
     Translation = {
       Type = "SpiceTranslation",
-      Target = "HELIKE",
-      Observer = "JUPITER BARYCENTER"
+      Target = kernels344.ID.Helike,
+      Observer = coreKernels.ID.JupiterBarycenter
     }
   },
   Renderable = {
@@ -204,8 +206,8 @@ local HelikeTrail = {
     Type = "RenderableTrailOrbit",
     Translation = {
       Type = "SpiceTranslation",
-      Target = "HELIKE",
-      Observer = "JUPITER BARYCENTER"
+      Target = kernels344.ID.Helike,
+      Observer = coreKernels.ID.JupiterBarycenter
     },
     Color = { 0.4, 0.3, 0.01 },
     Period = 601.40,
@@ -255,8 +257,8 @@ local Orthosie = {
   Transform = {
     Translation = {
       Type = "SpiceTranslation",
-      Target = "ORTHOSIE",
-      Observer = "JUPITER BARYCENTER"
+      Target = kernels344.ID.Orthosie,
+      Observer = coreKernels.ID.JupiterBarycenter
     }
   },
   Renderable = {
@@ -286,8 +288,8 @@ local OrthosieTrail = {
     Type = "RenderableTrailOrbit",
     Translation = {
       Type = "SpiceTranslation",
-      Target = "ORTHOSIE",
-      Observer = "JUPITER BARYCENTER"
+      Target = kernels344.ID.Orthosie,
+      Observer = coreKernels.ID.JupiterBarycenter
     },
     Color = { 0.4, 0.3, 0.01 },
     Period = 602.62,
@@ -337,8 +339,8 @@ local S2016J1 = {
   Transform = {
     Translation = {
       Type = "SpiceTranslation",
-      Target = "554",
-      Observer = "JUPITER BARYCENTER"
+      Target = kernels344.ID.S2016J1,
+      Observer = coreKernels.ID.JupiterBarycenter
     }
   },
   Renderable = {
@@ -368,8 +370,8 @@ local S2016J1Trail = {
     Type = "RenderableTrailOrbit",
     Translation = {
       Type = "SpiceTranslation",
-      Target = "554",
-      Observer = "JUPITER BARYCENTER"
+      Target = kernels344.ID.S2016J1,
+      Observer = coreKernels.ID.JupiterBarycenter
     },
     Color = { 0.4, 0.3, 0.01 },
     Period = 603.83,
@@ -419,8 +421,8 @@ local S2003J15 = {
   Transform = {
     Translation = {
       Type = "SpiceTranslation",
-      Target = "558",
-      Observer = "JUPITER BARYCENTER"
+      Target = kernels344.ID.S2003J15,
+      Observer = coreKernels.ID.JupiterBarycenter
     }
   },
   Renderable = {
@@ -450,8 +452,8 @@ local S2003J15Trail = {
     Type = "RenderableTrailOrbit",
     Translation = {
       Type = "SpiceTranslation",
-      Target = "558",
-      Observer = "JUPITER BARYCENTER"
+      Target = kernels344.ID.S2003J15,
+      Observer = coreKernels.ID.JupiterBarycenter
     },
     Color = { 0.4, 0.3, 0.01 },
     Period = 699.68,
@@ -501,8 +503,8 @@ local Aoede = {
   Transform = {
     Translation = {
       Type = "SpiceTranslation",
-      Target = "AOEDE",
-      Observer = "JUPITER BARYCENTER"
+      Target = kernels344.ID.Aoede,
+      Observer = coreKernels.ID.JupiterBarycenter
     }
   },
   Renderable = {
@@ -532,8 +534,8 @@ local AoedeTrail = {
     Type = "RenderableTrailOrbit",
     Translation = {
       Type = "SpiceTranslation",
-      Target = "AOEDE",
-      Observer = "JUPITER BARYCENTER"
+      Target = kernels344.ID.Aoede,
+      Observer = coreKernels.ID.JupiterBarycenter
     },
     Color = { 0.4, 0.3, 0.01 },
     Period = 714.66,
@@ -583,8 +585,8 @@ local Callirrhoe = {
   Transform = {
     Translation = {
       Type = "SpiceTranslation",
-      Target = "CALLIRRHOE",
-      Observer = "JUPITER BARYCENTER"
+      Target = kernels344.ID.Callirrhoe,
+      Observer = coreKernels.ID.JupiterBarycenter
     }
   },
   Renderable = {
@@ -614,8 +616,8 @@ local CallirrhoeTrail = {
     Type = "RenderableTrailOrbit",
     Translation = {
       Type = "SpiceTranslation",
-      Target = "CALLIRRHOE",
-      Observer = "JUPITER BARYCENTER"
+      Target = kernels344.ID.Callirrhoe,
+      Observer = coreKernels.ID.JupiterBarycenter
     },
     Color = { 0.4, 0.3, 0.01 },
     Period = 727.11,
@@ -665,8 +667,8 @@ local Eurydome = {
   Transform = {
     Translation = {
       Type = "SpiceTranslation",
-      Target = "EURYDOME",
-      Observer = "JUPITER BARYCENTER"
+      Target = kernels344.ID.Eurydome,
+      Observer = coreKernels.ID.JupiterBarycenter
     }
   },
   Renderable = {
@@ -696,8 +698,8 @@ local EurydomeTrail = {
     Type = "RenderableTrailOrbit",
     Translation = {
       Type = "SpiceTranslation",
-      Target = "EURYDOME",
-      Observer = "JUPITER BARYCENTER"
+      Target = kernels344.ID.Eurydome,
+      Observer = coreKernels.ID.JupiterBarycenter
     },
     Color = { 0.4, 0.3, 0.01 },
     Period = 723.36,
@@ -747,8 +749,8 @@ local Kore = {
   Transform = {
     Translation = {
       Type = "SpiceTranslation",
-      Target = "KORE",
-      Observer = "JUPITER BARYCENTER"
+      Target = kernels344.ID.Kore,
+      Observer = coreKernels.ID.JupiterBarycenter
     }
   },
   Renderable = {
@@ -778,8 +780,8 @@ local KoreTrail = {
     Type = "RenderableTrailOrbit",
     Translation = {
       Type = "SpiceTranslation",
-      Target = "KORE",
-      Observer = "JUPITER BARYCENTER"
+      Target = kernels344.ID.Kore,
+      Observer = coreKernels.ID.JupiterBarycenter
     },
     Color = { 0.4, 0.3, 0.01 },
     Period = 776.02,
@@ -829,8 +831,8 @@ local Cyllene = {
   Transform = {
     Translation = {
       Type = "SpiceTranslation",
-      Target = "CYLLENE",
-      Observer = "JUPITER BARYCENTER"
+      Target = kernels344.ID.Cyllene,
+      Observer = coreKernels.ID.JupiterBarycenter
     }
   },
   Renderable = {
@@ -860,8 +862,8 @@ local CylleneTrail = {
     Type = "RenderableTrailOrbit",
     Translation = {
       Type = "SpiceTranslation",
-      Target = "CYLLENE",
-      Observer = "JUPITER BARYCENTER"
+      Target = kernels344.ID.Cyllene,
+      Observer = coreKernels.ID.JupiterBarycenter
     },
     Color = { 0.4, 0.3, 0.01 },
     Period = 731.10,
@@ -911,8 +913,8 @@ local S2011J2 = {
   Transform = {
     Translation = {
       Type = "SpiceTranslation",
-      Target = "556",
-      Observer = "JUPITER BARYCENTER"
+      Target = kernels344.ID.S2011J2,
+      Observer = coreKernels.ID.JupiterBarycenter
     }
   },
   Renderable = {
@@ -942,8 +944,8 @@ local S2011J2Trail = {
     Type = "RenderableTrailOrbit",
     Translation = {
       Type = "SpiceTranslation",
-      Target = "556",
-      Observer = "JUPITER BARYCENTER"
+      Target = kernels344.ID.S2011J2,
+      Observer = coreKernels.ID.JupiterBarycenter
     },
     Color = { 0.4, 0.3, 0.01 },
     Period = 731.32,
@@ -993,8 +995,8 @@ local S2017J1 = {
   Transform = {
     Translation = {
       Type = "SpiceTranslation",
-      Target = "559",
-      Observer = "JUPITER BARYCENTER"
+      Target = kernels344.ID.S2017J1,
+      Observer = coreKernels.ID.JupiterBarycenter
     }
   },
   Renderable = {
@@ -1024,8 +1026,8 @@ local S2017J1Trail = {
     Type = "RenderableTrailOrbit",
     Translation = {
       Type = "SpiceTranslation",
-      Target = "559",
-      Observer = "JUPITER BARYCENTER"
+      Target = kernels344.ID.S2017J1,
+      Observer = coreKernels.ID.JupiterBarycenter
     },
     Color = { 0.4, 0.3, 0.01 },
     Period = 734.15,
@@ -1075,8 +1077,8 @@ local S2003J4 = {
   Transform = {
     Translation = {
       Type = "SpiceTranslation",
-      Target = "55502",
-      Observer = "JUPITER BARYCENTER"
+      Target = kernels344.ID.S2003J4,
+      Observer = coreKernels.ID.JupiterBarycenter
     }
   },
   Renderable = {
@@ -1106,8 +1108,8 @@ local S2003J4Trail = {
     Type = "RenderableTrailOrbit",
     Translation = {
       Type = "SpiceTranslation",
-      Target = "55502",
-      Observer = "JUPITER BARYCENTER"
+      Target = kernels344.ID.S2003J4,
+      Observer = coreKernels.ID.JupiterBarycenter
     },
     Color = { 0.4, 0.3, 0.01 },
     Period = 739.29,
@@ -1157,8 +1159,8 @@ local Pasiphae = {
   Transform = {
     Translation = {
       Type = "SpiceTranslation",
-      Target = "PASIPHAE",
-      Observer = "JUPITER BARYCENTER"
+      Target = kernels344.ID.Pasiphae,
+      Observer = coreKernels.ID.JupiterBarycenter
     }
   },
   Renderable = {
@@ -1188,8 +1190,8 @@ local PasiphaeTrail = {
     Type = "RenderableTrailOrbit",
     Translation = {
       Type = "SpiceTranslation",
-      Target = "PASIPHAE",
-      Observer = "JUPITER BARYCENTER"
+      Target = kernels344.ID.Pasiphae,
+      Observer = coreKernels.ID.JupiterBarycenter
     },
     Color = { 0.4, 0.3, 0.01 },
     Period = 731.10,
@@ -1239,8 +1241,8 @@ local Hegemone = {
   Transform = {
     Translation = {
       Type = "SpiceTranslation",
-      Target = "HEGEMONE",
-      Observer = "JUPITER BARYCENTER"
+      Target = kernels344.ID.Hegemone,
+      Observer = coreKernels.ID.JupiterBarycenter
     }
   },
   Renderable = {
@@ -1270,8 +1272,8 @@ local HegemoneTrail = {
     Type = "RenderableTrailOrbit",
     Translation = {
       Type = "SpiceTranslation",
-      Target = "HEGEMONE",
-      Observer = "JUPITER BARYCENTER"
+      Target = kernels344.ID.Hegemone,
+      Observer = coreKernels.ID.JupiterBarycenter
     },
     Color = { 0.4, 0.3, 0.01 },
     Period = 745.50,
@@ -1321,8 +1323,8 @@ local Sinope = {
   Transform = {
     Translation = {
       Type = "SpiceTranslation",
-      Target = "SINOPE",
-      Observer = "JUPITER BARYCENTER"
+      Target = kernels344.ID.Sinope,
+      Observer = coreKernels.ID.JupiterBarycenter
     }
   },
   Renderable = {
@@ -1352,8 +1354,8 @@ local SinopeTrail = {
     Type = "RenderableTrailOrbit",
     Translation = {
       Type = "SpiceTranslation",
-      Target = "SINOPE",
-      Observer = "JUPITER BARYCENTER"
+      Target = kernels344.ID.Sinope,
+      Observer = coreKernels.ID.JupiterBarycenter
     },
     Color = { 0.4, 0.3, 0.01 },
     Period = 739.33,
@@ -1403,8 +1405,8 @@ local Sponde = {
   Transform = {
     Translation = {
       Type = "SpiceTranslation",
-      Target = "SPONDE",
-      Observer = "JUPITER BARYCENTER"
+      Target = kernels344.ID.Sponde,
+      Observer = coreKernels.ID.JupiterBarycenter
     }
   },
   Renderable = {
@@ -1434,8 +1436,8 @@ local SpondeTrail = {
     Type = "RenderableTrailOrbit",
     Translation = {
       Type = "SpiceTranslation",
-      Target = "SPONDE",
-      Observer = "JUPITER BARYCENTER"
+      Target = kernels344.ID.Sponde,
+      Observer = coreKernels.ID.JupiterBarycenter
     },
     Color = { 0.4, 0.3, 0.01 },
     Period = 771.60,
@@ -1485,8 +1487,8 @@ local Autonoe = {
   Transform = {
     Translation = {
       Type = "SpiceTranslation",
-      Target = "AUTONOE",
-      Observer = "JUPITER BARYCENTER"
+      Target = kernels344.ID.Autonoe,
+      Observer = coreKernels.ID.JupiterBarycenter
     }
   },
   Renderable = {
@@ -1516,8 +1518,8 @@ local AutonoeTrail = {
     Type = "RenderableTrailOrbit",
     Translation = {
       Type = "SpiceTranslation",
-      Target = "AUTONOE",
-      Observer = "JUPITER BARYCENTER"
+      Target = kernels344.ID.Autonoe,
+      Observer = coreKernels.ID.JupiterBarycenter
     },
     Color = { 0.4, 0.3, 0.01 },
     Period = 772.17,
@@ -1567,8 +1569,8 @@ local Megaclite = {
   Transform = {
     Translation = {
       Type = "SpiceTranslation",
-      Target = "MEGACLITE",
-      Observer = "JUPITER BARYCENTER"
+      Target = kernels344.ID.Megaclite,
+      Observer = coreKernels.ID.JupiterBarycenter
     }
   },
   Renderable = {
@@ -1598,8 +1600,8 @@ local MegacliteTrail = {
     Type = "RenderableTrailOrbit",
     Translation = {
       Type = "SpiceTranslation",
-      Target = "MEGACLITE",
-      Observer = "JUPITER BARYCENTER"
+      Target = kernels344.ID.Megaclite,
+      Observer = coreKernels.ID.JupiterBarycenter
     },
     Color = { 0.4, 0.3, 0.01 },
     Period = 792.44,
@@ -1649,8 +1651,8 @@ local S2016J4 = {
   Transform = {
     Translation = {
       Type = "SpiceTranslation",
-      Target = "55519",
-      Observer = "JUPITER BARYCENTER"
+      Target = kernels346.ID.S2016J4,
+      Observer = coreKernels.ID.JupiterBarycenter
     }
   },
   Renderable = {
@@ -1680,8 +1682,8 @@ local S2016J4Trail = {
     Type = "RenderableTrailOrbit",
     Translation = {
       Type = "SpiceTranslation",
-      Target = "55519",
-      Observer = "JUPITER BARYCENTER"
+      Target = kernels346.ID.S2016J4,
+      Observer = coreKernels.ID.JupiterBarycenter
     },
     Color = { 0.4, 0.3, 0.01 },
     Period = 743.69,
@@ -1731,8 +1733,8 @@ local S2017J6 = {
   Transform = {
     Translation = {
       Type = "SpiceTranslation",
-      Target = "567",
-      Observer = "JUPITER BARYCENTER"
+      Target = kernels344.ID.S2017J6,
+      Observer = coreKernels.ID.JupiterBarycenter
     }
   },
   Renderable = {
@@ -1762,8 +1764,8 @@ local S2017J6Trail = {
     Type = "RenderableTrailOrbit",
     Translation = {
       Type = "SpiceTranslation",
-      Target = "567",
-      Observer = "JUPITER BARYCENTER"
+      Target = kernels344.ID.S2017J6,
+      Observer = coreKernels.ID.JupiterBarycenter
     },
     Color = { 0.4, 0.3, 0.01 },
     Period = 683.0,
@@ -1813,8 +1815,8 @@ local S2003J23 = {
   Transform = {
     Translation = {
       Type = "SpiceTranslation",
-      Target = "55507",
-      Observer = "JUPITER BARYCENTER"
+      Target = kernels344.ID.S2003J23,
+      Observer = coreKernels.ID.JupiterBarycenter
     }
   },
   Renderable = {
@@ -1844,8 +1846,8 @@ local S2003J23Trail = {
     Type = "RenderableTrailOrbit",
     Translation = {
       Type = "SpiceTranslation",
-      Target = "55507",
-      Observer = "JUPITER BARYCENTER"
+      Target = kernels344.ID.S2003J23,
+      Observer = coreKernels.ID.JupiterBarycenter
     },
     Color = { 0.4, 0.3, 0.01 },
     Period = 792.00,
@@ -1891,10 +1893,6 @@ local S2003J23Label = {
 
 
 asset.onInitialize(function()
-  openspace.spice.loadKernel(kernel.jup344)
-  openspace.spice.loadKernel(kernel.jup346)
-
-
   openspace.addSceneGraphNode(Euporie)
   openspace.addSceneGraphNode(EuporieTrail)
   openspace.addSceneGraphNode(EuporieLabel)
@@ -2080,10 +2078,6 @@ asset.onDeinitialize(function()
   openspace.removeSceneGraphNode(EuporieLabel)
   openspace.removeSceneGraphNode(EuporieTrail)
   openspace.removeSceneGraphNode(Euporie)
-
-
-  openspace.spice.unloadKernel(kernel.jup346)
-  openspace.spice.unloadKernel(kernel.jup344)
 end)
 
 asset.export(Euporie)
diff --git a/data/assets/scene/solarsystem/planets/jupiter/minor/themisto_group.asset b/data/assets/scene/solarsystem/planets/jupiter/minor/themisto_group.asset
index 14d26fed81..6f992cd43b 100644
--- a/data/assets/scene/solarsystem/planets/jupiter/minor/themisto_group.asset
+++ b/data/assets/scene/solarsystem/planets/jupiter/minor/themisto_group.asset
@@ -1,5 +1,6 @@
 local transforms = asset.require("../transforms")
-local kernel = asset.require("../kernels")
+local kernels344 = asset.require("../kernels344")
+local coreKernels = asset.require("spice/core")
 
 
 
@@ -9,8 +10,8 @@ local Themisto = {
   Transform = {
     Translation = {
       Type = "SpiceTranslation",
-      Target = "THEMISTO",
-      Observer = "JUPITER BARYCENTER"
+      Target = kernels344.ID.Themisto,
+      Observer = coreKernels.ID.JupiterBarycenter
     }
   },
   Renderable = {
@@ -40,8 +41,8 @@ local ThemistoTrail = {
     Type = "RenderableTrailOrbit",
     Translation = {
       Type = "SpiceTranslation",
-      Target = "THEMISTO",
-      Observer = "JUPITER BARYCENTER"
+      Target = kernels344.ID.Themisto,
+      Observer = coreKernels.ID.JupiterBarycenter
     },
     Color = { 0.4, 0.3, 0.01 },
     Period = 129.87,
@@ -87,9 +88,6 @@ local ThemistoLabel = {
 
 
 asset.onInitialize(function()
-  openspace.spice.loadKernel(kernel.jup344)
-
-
   openspace.addSceneGraphNode(Themisto)
   openspace.addSceneGraphNode(ThemistoTrail)
   openspace.addSceneGraphNode(ThemistoLabel)
@@ -99,9 +97,6 @@ asset.onDeinitialize(function()
   openspace.removeSceneGraphNode(ThemistoLabel)
   openspace.removeSceneGraphNode(ThemistoTrail)
   openspace.removeSceneGraphNode(Themisto)
-
-
-  openspace.spice.unloadKernel(kernel.jup344)
 end)
 
 asset.export(Themisto)
diff --git a/data/assets/scene/solarsystem/planets/jupiter/trail.asset b/data/assets/scene/solarsystem/planets/jupiter/trail.asset
index 79947ce385..983a630479 100644
--- a/data/assets/scene/solarsystem/planets/jupiter/trail.asset
+++ b/data/assets/scene/solarsystem/planets/jupiter/trail.asset
@@ -1,5 +1,5 @@
-asset.require("spice/base")
 local transforms = asset.require("scene/solarsystem/sun/transforms")
+local coreKernels = asset.require("spice/core")
 
 
 
@@ -10,8 +10,8 @@ local JupiterTrail = {
     Type = "RenderableTrailOrbit",
     Translation = {
       Type = "SpiceTranslation",
-      Target = "JUPITER",
-      Observer = "SSB"
+      Target = coreKernels.ID.Jupiter,
+      Observer = coreKernels.ID.SolarSystemBarycenter
     },
     Color = { 0.8, 0.7, 0.7 },
     Period = 4330.595,
@@ -40,8 +40,7 @@ asset.export(JupiterTrail)
 asset.meta = {
   Name = "Jupiter Trail",
   Version = "1.1",
-  Description = [[Trail of Jupiter as observed by the Sun. Data from NASA Spice (see
-    base spice asset)]],
+  Description = "Trail of Jupiter as observed by the Sun",
   Author = "OpenSpace Team",
   URL = "http://openspaceproject.com",
   License = "MIT license"
diff --git a/data/assets/scene/solarsystem/planets/jupiter/trail_barycenter.asset b/data/assets/scene/solarsystem/planets/jupiter/trail_barycenter.asset
index ed2eb9f195..fd819f7f82 100644
--- a/data/assets/scene/solarsystem/planets/jupiter/trail_barycenter.asset
+++ b/data/assets/scene/solarsystem/planets/jupiter/trail_barycenter.asset
@@ -1,5 +1,5 @@
-asset.require("spice/base")
 local transforms = asset.require("scene/solarsystem/sun/transforms")
+local coreKernels = asset.require("spice/core")
 
 
 
@@ -11,8 +11,8 @@ local JupiterBarycenterTrail = {
     Enabled = false,
     Translation = {
       Type = "SpiceTranslation",
-      Target = "JUPITER BARYCENTER",
-      Observer = "SSB"
+      Target = coreKernels.ID.JupiterBarycenter,
+      Observer = coreKernels.Frame.SolarSystemBarycenter
     },
     Color = { 0.8, 0.7, 0.7 },
     Period = 4330.595,
@@ -41,8 +41,7 @@ asset.export(JupiterBarycenterTrail)
 asset.meta = {
   Name = "Jupiter Trail",
   Version = "1.1",
-  Description = [[Trail of Jupiter's Barycenter as observed by the Sun. Data from NASA
-    Spice (see base spice asset)]],
+  Description = "Trail of Jupiter's Barycenter as observed by the Sun",
   Author = "OpenSpace Team",
   URL = "http://openspaceproject.com",
   License = "MIT license"
diff --git a/data/assets/scene/solarsystem/planets/jupiter/trail_earth.asset b/data/assets/scene/solarsystem/planets/jupiter/trail_earth.asset
index 1150e90a6a..5d8e9fc196 100644
--- a/data/assets/scene/solarsystem/planets/jupiter/trail_earth.asset
+++ b/data/assets/scene/solarsystem/planets/jupiter/trail_earth.asset
@@ -1,6 +1,6 @@
-asset.require("spice/base")
 local transforms = asset.require("scene/solarsystem/sun/transforms")
 local earthTransforms = asset.require("scene/solarsystem/planets/earth/transforms")
+local coreKernels = asset.require("spice/core")
 
 
 
@@ -12,8 +12,8 @@ local JupiterTrailEarth = {
     Enabled = false,
     Translation = {
       Type = "SpiceTranslation",
-      Target = "JUPITER",
-      Observer = "EARTH"
+      Target = coreKernels.ID.Jupiter,
+      Observer = coreKernels.ID.Earth
     },
     Color = { 1.0, 0.5, 0.2 },
     Period = 224.695,
@@ -42,8 +42,7 @@ asset.export(JupiterTrailEarth)
 asset.meta = {
   Name = "Jupiter Trail from Earth",
   Version = "1.1",
-  Description = [[Trail of Jupiter as observed by the Earth. Data from NASA SPICE (see
-    base spice asset)]],
+  Description = "Trail of Jupiter as observed by the Earth",
   Author = "OpenSpace Team",
   URL = "http://openspaceproject.com",
   License = "MIT license"
diff --git a/data/assets/scene/solarsystem/planets/jupiter/transforms.asset b/data/assets/scene/solarsystem/planets/jupiter/transforms.asset
index b821473516..0292ae1395 100644
--- a/data/assets/scene/solarsystem/planets/jupiter/transforms.asset
+++ b/data/assets/scene/solarsystem/planets/jupiter/transforms.asset
@@ -1,5 +1,5 @@
-asset.require("spice/base")
 local transforms = asset.require("scene/solarsystem/sun/transforms")
+local coreKernels = asset.require("spice/core")
 
 
 
@@ -9,8 +9,8 @@ local JupiterBarycenter = {
   Transform = {
     Translation = {
       Type = "SpiceTranslation",
-      Target = "JUPITER BARYCENTER",
-      Observer = "SSB"
+      Target = coreKernels.ID.JupiterBarycenter,
+      Observer = coreKernels.ID.SolarSystemBarycenter
     }
   },
   GUI = {
diff --git a/data/assets/scene/solarsystem/planets/mars/mars.asset b/data/assets/scene/solarsystem/planets/mars/mars.asset
index 12d03f46d4..5e30ec3758 100644
--- a/data/assets/scene/solarsystem/planets/mars/mars.asset
+++ b/data/assets/scene/solarsystem/planets/mars/mars.asset
@@ -1,6 +1,6 @@
-asset.require("spice/base")
 asset.require("./trail")
 local transforms = asset.require("./transforms")
+local coreKernels = asset.require("spice/core")
 
 
 
@@ -21,13 +21,13 @@ local Mars = {
   Transform = {
     Translation = {
       Type = "SpiceTranslation",
-      Target = "MARS",
-      Observer = "MARS BARYCENTER"
+      Target = coreKernels.ID.Mars,
+      Observer = coreKernels.ID.MarsBarycenter
     },
     Rotation = {
       Type = "SpiceRotation",
-      SourceFrame = "IAU_MARS",
-      DestinationFrame = "GALACTIC"
+      SourceFrame = coreKernels.Frame.Mars,
+      DestinationFrame = coreKernels.Frame.Galactic
     }
   },
   Renderable = {
diff --git a/data/assets/scene/solarsystem/planets/mars/moons/deimos.asset b/data/assets/scene/solarsystem/planets/mars/moons/deimos.asset
index bcaf61ac8c..b4d428b8cf 100644
--- a/data/assets/scene/solarsystem/planets/mars/moons/deimos.asset
+++ b/data/assets/scene/solarsystem/planets/mars/moons/deimos.asset
@@ -1,6 +1,8 @@
 local transforms = asset.require("scene/solarsystem/planets/mars/transforms")
 local sunTransforms = asset.require("scene/solarsystem/sun/transforms")
 local sun = asset.require("scene/solarsystem/sun/sun")
+local kernels = asset.require("./kernels")
+local coreKernels = asset.require("spice/core")
 
 
 
@@ -11,13 +13,6 @@ local model = asset.resource({
   Version = 1
 })
 
-local kernels = asset.resource({
-  Name = "Mars Spice Kernels",
-  Type = "HttpSynchronization",
-  Identifier = "mars_kernels",
-  Version = 1
-})
-
 
 local Deimos = {
   Identifier = "Deimos",
@@ -26,13 +21,13 @@ local Deimos = {
   Transform = {
     Translation = {
       Type = "SpiceTranslation",
-      Target = "DEIMOS",
-      Observer = "MARS BARYCENTER"
+      Target = kernels.ID.Deimos,
+      Observer = coreKernels.ID.MarsBarycenter
     },
     Rotation = {
       Type = "SpiceRotation",
-      SourceFrame = "IAU_DEIMOS",
-      DestinationFrame = "GALACTIC"
+      SourceFrame = kernels.Frame.Deimos,
+      DestinationFrame = coreKernels.Frame.Galactic
     }
   },
   Renderable = {
@@ -62,8 +57,8 @@ local DeimosTrail = {
     Type = "RenderableTrailOrbit",
     Translation = {
       Type = "SpiceTranslation",
-      Target = "DEIMOS",
-      Observer = "MARS BARYCENTER"
+      Target = kernels.ID.Deimos,
+      Observer = coreKernels.ID.MarsBarycenter
     },
     Color = { 1.0, 0.605, 0.420 },
     Period = 1.263,
@@ -104,8 +99,6 @@ local DeimosLabel = {
 
 
 asset.onInitialize(function()
-  openspace.spice.loadKernel(kernels .. "mar097.bsp")
-
   openspace.addSceneGraphNode(Deimos)
   openspace.addSceneGraphNode(DeimosTrail)
   openspace.addSceneGraphNode(DeimosLabel)
@@ -115,8 +108,6 @@ asset.onDeinitialize(function()
   openspace.removeSceneGraphNode(DeimosLabel)
   openspace.removeSceneGraphNode(DeimosTrail)
   openspace.removeSceneGraphNode(Deimos)
-
-  openspace.spice.unloadKernel(kernels .. "mar097.bsp")
 end)
 
 asset.export(Deimos)
diff --git a/data/assets/scene/solarsystem/planets/mars/moons/deimos_globe.asset b/data/assets/scene/solarsystem/planets/mars/moons/deimos_globe.asset
index 6becb727ca..66f0e13563 100644
--- a/data/assets/scene/solarsystem/planets/mars/moons/deimos_globe.asset
+++ b/data/assets/scene/solarsystem/planets/mars/moons/deimos_globe.asset
@@ -1,28 +1,22 @@
 local transforms = asset.require("../transforms")
+local kernels = asset.require("./kernels")
+local coreKernels = asset.require("spice/core")
 
 
 
-local kernels = asset.resource({
-  Name = "Mars Spice Kernels",
-  Type = "HttpSynchronization",
-  Identifier = "mars_kernels",
-  Version = 1
-})
-
-
 local DeimosGlobe = {
   Identifier = "Deimos_Globe",
   Parent = transforms.MarsBarycenter.Identifier,
   Transform = {
     Translation = {
       Type = "SpiceTranslation",
-      Target = "DEIMOS",
-      Observer = "MARS BARYCENTER"
+      Target = kernels.ID.Deimos,
+      Observer = coreKernels.ID.MarsBarycenter
     },
     Rotation = {
       Type = "SpiceRotation",
-      SourceFrame = "IAU_DEIMOS",
-      DestinationFrame = "GALACTIC"
+      SourceFrame = kernels.Frame.Deimos,
+      DestinationFrame = coreKernels.Frame.Galactic
     }
   },
   Renderable = {
@@ -43,15 +37,11 @@ local DeimosGlobe = {
 
 
 asset.onInitialize(function()
-  openspace.spice.loadKernel(kernels .. "mar097.bsp")
-
   openspace.addSceneGraphNode(DeimosGlobe)
 end)
 
 asset.onDeinitialize(function()
   openspace.removeSceneGraphNode(DeimosGlobe)
-
-  openspace.spice.unloadKernel(kernels .. "mar097.bsp")
 end)
 
 asset.export(DeimosGlobe)
diff --git a/data/assets/scene/solarsystem/planets/mars/moons/kernels.asset b/data/assets/scene/solarsystem/planets/mars/moons/kernels.asset
new file mode 100644
index 0000000000..d090f96459
--- /dev/null
+++ b/data/assets/scene/solarsystem/planets/mars/moons/kernels.asset
@@ -0,0 +1,33 @@
+local coreKernels = asset.require("spice/core")
+
+
+
+local kernels = asset.resource({
+  Name = "Mars Spice Kernels",
+  Type = "HttpSynchronization",
+  Identifier = "mars_kernels",
+  Version = 1
+})
+
+
+local ID = {
+  Deimos = "DEIMOS",
+  Phobos = "PHOBOS"
+}
+
+local Frame = {
+  Deimos = coreKernels.Frame.Deimos,
+  Phobos = coreKernels.Frame.Phobos
+}
+
+
+asset.onInitialize(function()
+  openspace.spice.loadKernel(kernels .. "mar097.bsp")
+end)
+
+asset.onDeinitialize(function()
+  openspace.spice.unloadKernel(kernels .. "mar097.bsp")
+end)
+
+asset.export("ID", ID)
+asset.export("Frame", Frame)
diff --git a/data/assets/scene/solarsystem/planets/mars/moons/phobos.asset b/data/assets/scene/solarsystem/planets/mars/moons/phobos.asset
index e726196159..8e3fb4ecd8 100644
--- a/data/assets/scene/solarsystem/planets/mars/moons/phobos.asset
+++ b/data/assets/scene/solarsystem/planets/mars/moons/phobos.asset
@@ -1,6 +1,8 @@
 local transforms = asset.require("scene/solarsystem/planets/mars/transforms")
 local sunTransforms = asset.require("scene/solarsystem/sun/transforms")
 local sun = asset.require("scene/solarsystem/sun/sun")
+local kernels = asset.require("./kernels")
+local coreKernels = asset.require("spice/core")
 
 
 
@@ -11,13 +13,6 @@ local model = asset.resource({
   Version = 1
 })
 
-local kernels = asset.resource({
-  Name = "Mars Spice Kernels",
-  Type = "HttpSynchronization",
-  Identifier = "mars_kernels",
-  Version = 1
-})
-
 
 local Phobos = {
   Identifier = "Phobos",
@@ -26,13 +21,13 @@ local Phobos = {
   Transform = {
     Translation = {
       Type = "SpiceTranslation",
-      Target = "PHOBOS",
-      Observer = "MARS BARYCENTER"
+      Target = kernels.ID.Phobos,
+      Observer = coreKernels.ID.MarsBarycenter
     },
     Rotation = {
       Type = "SpiceRotation",
-      SourceFrame = "IAU_PHOBOS",
-      DestinationFrame = "GALACTIC"
+      SourceFrame = kernels.Frame.Phobos,
+      DestinationFrame = coreKernels.Frame.Galactic
     }
   },
   Renderable = {
@@ -62,8 +57,8 @@ local PhobosTrail = {
     Type = "RenderableTrailOrbit",
     Translation = {
       Type = "SpiceTranslation",
-      Target = "PHOBOS",
-      Observer = "MARS BARYCENTER"
+      Target = kernels.ID.Phobos,
+      Observer = coreKernels.ID.MarsBarycenter
     },
     Color = { 1.0, 0.605, 0.420 },
     Period = 0.31891023,
@@ -104,8 +99,6 @@ local PhobosLabel = {
 
 
 asset.onInitialize(function()
-  openspace.spice.loadKernel(kernels .. "mar097.bsp")
-
   openspace.addSceneGraphNode(Phobos)
   openspace.addSceneGraphNode(PhobosTrail)
   openspace.addSceneGraphNode(PhobosLabel)
@@ -115,8 +108,6 @@ asset.onDeinitialize(function()
   openspace.removeSceneGraphNode(PhobosLabel)
   openspace.removeSceneGraphNode(PhobosTrail)
   openspace.removeSceneGraphNode(Phobos)
-
-  openspace.spice.unloadKernel(kernels .. "mar097.bsp")
 end)
 
 asset.export(Phobos)
diff --git a/data/assets/scene/solarsystem/planets/mars/moons/phobos_globe.asset b/data/assets/scene/solarsystem/planets/mars/moons/phobos_globe.asset
index 147136e331..ec0eab634c 100644
--- a/data/assets/scene/solarsystem/planets/mars/moons/phobos_globe.asset
+++ b/data/assets/scene/solarsystem/planets/mars/moons/phobos_globe.asset
@@ -1,28 +1,22 @@
 local transforms = asset.require("../transforms")
+local kernels = asset.require("./kernels")
+local coreKernels = asset.require("spice/core")
 
 
 
-local kernels = asset.resource({
-  Name = "Mars Spice Kernels",
-  Type = "HttpSynchronization",
-  Identifier = "mars_kernels",
-  Version = 1
-})
-
-
 local PhobosGlobe = {
   Identifier = "Phobos_Globe",
   Parent = transforms.MarsBarycenter.Identifier,
   Transform = {
     Translation = {
       Type = "SpiceTranslation",
-      Target = "PHOBOS",
-      Observer = "MARS BARYCENTER"
+      Target = kernels.ID.Phobos,
+      Observer = coreKernels.ID.MarsBarycenter
     },
     Rotation = {
       Type = "SpiceRotation",
-      SourceFrame = "IAU_PHOBOS",
-      DestinationFrame = "GALACTIC"
+      SourceFrame = kernels.Frame.Phobos,
+      DestinationFrame = coreKernels.Frame.Galactic
     },
   },
   Renderable = {
@@ -43,15 +37,11 @@ local PhobosGlobe = {
 
 
 asset.onInitialize(function()
-  openspace.spice.loadKernel(kernels .. "mar097.bsp")
-
   openspace.addSceneGraphNode(PhobosGlobe)
 end)
 
 asset.onDeinitialize(function()
   openspace.removeSceneGraphNode(PhobosGlobe)
-
-  openspace.spice.unloadKernel(kernels .. "mar097.bsp")
 end)
 
 asset.export(PhobosGlobe)
diff --git a/data/assets/scene/solarsystem/planets/mars/trail.asset b/data/assets/scene/solarsystem/planets/mars/trail.asset
index 2a8c8785b8..c432c5cb0d 100644
--- a/data/assets/scene/solarsystem/planets/mars/trail.asset
+++ b/data/assets/scene/solarsystem/planets/mars/trail.asset
@@ -1,5 +1,5 @@
-asset.require("spice/base")
 local transforms = asset.require("scene/solarsystem/sun/transforms")
+local coreKernels = asset.require("spice/core")
 
 
 
@@ -10,8 +10,8 @@ local MarsTrail = {
     Type = "RenderableTrailOrbit",
     Translation = {
       Type = "SpiceTranslation",
-      Target = "MARS",
-      Observer = "SSB"
+      Target = coreKernels.ID.Mars,
+      Observer = coreKernels.ID.SolarSystemBarycenter
     },
     Color = { 0.814, 0.305, 0.220 },
     Period = 686.973,
@@ -21,8 +21,7 @@ local MarsTrail = {
   GUI = {
     Name = "Mars Trail",
     Path = "/Solar System/Planets/Mars",
-    Description = [[Trail of Mars as observed by the Sun. Data from NASA Spice (see
-      base spice asset)]]
+    Description = "Trail of Mars as observed by the Sun"
   }
 }
 
diff --git a/data/assets/scene/solarsystem/planets/mars/trail_barycenter.asset b/data/assets/scene/solarsystem/planets/mars/trail_barycenter.asset
index 7aa361676a..775a83d4b6 100644
--- a/data/assets/scene/solarsystem/planets/mars/trail_barycenter.asset
+++ b/data/assets/scene/solarsystem/planets/mars/trail_barycenter.asset
@@ -1,5 +1,5 @@
-asset.require("spice/base")
 local transforms = asset.require("scene/solarsystem/sun/transforms")
+local coreKernels = asset.require("spice/core")
 
 
 
@@ -11,8 +11,8 @@ local MarsBarycenterTrail = {
     Enabled = false,
     Translation = {
       Type = "SpiceTranslation",
-      Target = "MARS BARYCENTER",
-      Observer = "SSB"
+      Target = coreKernels.ID.MarsBarycenter,
+      Observer = coreKernels.ID.SolarSystemBarycenter
     },
     Color = { 0.814, 0.305, 0.220 },
     Period = 686.973,
@@ -22,8 +22,7 @@ local MarsBarycenterTrail = {
   GUI = {
     Name = "Mars Barycenter Trail",
     Path = "/Solar System/Planets/Mars",
-    Description = [[Trail of Mars' Barycenter as observed by the Sun. Data from NASA Spice
-      (see base spice asset)]]
+    Description = "Trail of Mars' Barycenter as observed by the Sun"
   }
 }
 
diff --git a/data/assets/scene/solarsystem/planets/mars/trail_earth.asset b/data/assets/scene/solarsystem/planets/mars/trail_earth.asset
index e77711aa8d..8498ffc6ec 100644
--- a/data/assets/scene/solarsystem/planets/mars/trail_earth.asset
+++ b/data/assets/scene/solarsystem/planets/mars/trail_earth.asset
@@ -1,5 +1,5 @@
-asset.require("spice/base")
 local transforms = asset.require("scene/solarsystem/planets/earth/transforms")
+local coreKernels = asset.require("spice/core")
 
 
 
@@ -11,8 +11,8 @@ local MarsTrailEarth = {
     Enabled = false,
     Translation = {
       Type = "SpiceTranslation",
-      Target = "MARS",
-      Observer = "EARTH"
+      Target = coreKernels.ID.Mars,
+      Observer = coreKernels.ID.Earth
     },
     Color = { 1.0, 0.5, 0.2 },
     Period = 224.695,
@@ -42,8 +42,7 @@ asset.export(MarsTrailEarth)
 asset.meta = {
   Name = "Mars Trail from Earth",
   Version = "1.1",
-  Description = [[Trail of Mars, parented to Earth with Earth as the SPICE observer. Data
-    from NASA SPICE (see base spice asset)]],
+  Description = "Trail of Mars, parented to Earth with Earth as the SPICE observer",
   Author = "OpenSpace Team",
   URL = "http://openspaceproject.com",
   License = "MIT license"
diff --git a/data/assets/scene/solarsystem/planets/mars/transforms.asset b/data/assets/scene/solarsystem/planets/mars/transforms.asset
index dadc6d49c6..8a7a90041a 100644
--- a/data/assets/scene/solarsystem/planets/mars/transforms.asset
+++ b/data/assets/scene/solarsystem/planets/mars/transforms.asset
@@ -1,5 +1,5 @@
-asset.require("spice/base")
 local transforms = asset.require("scene/solarsystem/sun/transforms")
+local coreKernels = asset.require("spice/core")
 
 
 
@@ -9,8 +9,8 @@ local MarsBarycenter = {
   Transform = {
     Translation = {
       Type = "SpiceTranslation",
-      Target = "MARS BARYCENTER",
-      Observer = "SSB"
+      Target = coreKernels.ID.MarsBarycenter,
+      Observer = coreKernels.ID.SolarSystemBarycenter
     }
   },
   GUI = {
diff --git a/data/assets/scene/solarsystem/planets/mercury/mercury.asset b/data/assets/scene/solarsystem/planets/mercury/mercury.asset
index a884cef006..4fc7a2b520 100644
--- a/data/assets/scene/solarsystem/planets/mercury/mercury.asset
+++ b/data/assets/scene/solarsystem/planets/mercury/mercury.asset
@@ -1,6 +1,6 @@
-asset.require("spice/base")
 asset.require("./trail")
 local transforms = asset.require("./transforms")
+local coreKernels = asset.require("spice/core")
 
 
 
@@ -18,13 +18,13 @@ local Mercury = {
   Transform = {
     Translation = {
       Type = "SpiceTranslation",
-      Target = "MERCURY",
-      Observer = "MERCURY BARYCENTER"
+      Target = coreKernels.ID.Mercury,
+      Observer = coreKernels.ID.MercuryBarycenter
     },
     Rotation = {
       Type = "SpiceRotation",
-      SourceFrame = "IAU_MERCURY",
-      DestinationFrame = "GALACTIC"
+      SourceFrame = coreKernels.Frame.Mercury,
+      DestinationFrame = coreKernels.Frame.Galactic
     }
   },
   Renderable = {
diff --git a/data/assets/scene/solarsystem/planets/mercury/trail.asset b/data/assets/scene/solarsystem/planets/mercury/trail.asset
index ecb673e41c..e87c904aba 100644
--- a/data/assets/scene/solarsystem/planets/mercury/trail.asset
+++ b/data/assets/scene/solarsystem/planets/mercury/trail.asset
@@ -1,5 +1,5 @@
-asset.require("spice/base")
 local transforms = asset.require("scene/solarsystem/sun/transforms")
+local coreKernels = asset.require("spice/core")
 
 
 
@@ -10,8 +10,8 @@ local MercuryTrail = {
     Type = "RenderableTrailOrbit",
     Translation = {
       Type = "SpiceTranslation",
-      Target = "MERCURY",
-      Observer = "SSB"
+      Target = coreKernels.ID.Mercury,
+      Observer = coreKernels.ID.SolarSystemBarycenter
     },
     Color = { 0.6, 0.5, 0.5 },
     Period = 87.968,
@@ -41,7 +41,7 @@ asset.export(MercuryTrail)
 asset.meta = {
   Name = "Mercury Trail",
   Version = "1.1",
-  Description = "Main trail for Mercury. Data from NASA Spice (see base spice asset)",
+  Description = "Main trail for Mercury",
   Author = "OpenSpace Team",
   URL = "http://openspaceproject.com",
   License = "MIT license"
diff --git a/data/assets/scene/solarsystem/planets/mercury/trail_barycenter.asset b/data/assets/scene/solarsystem/planets/mercury/trail_barycenter.asset
index a628148e8a..215c9a0611 100644
--- a/data/assets/scene/solarsystem/planets/mercury/trail_barycenter.asset
+++ b/data/assets/scene/solarsystem/planets/mercury/trail_barycenter.asset
@@ -1,5 +1,5 @@
-asset.require("spice/base")
 local transforms = asset.require("scene/solarsystem/sun/transforms")
+local coreKernels = asset.require("spice/core")
 
 
 
@@ -11,8 +11,8 @@ local MercuryBarycenterTrail = {
     Enabled = false,
     Translation = {
       Type = "SpiceTranslation",
-      Target = "MERCURY BARYCENTER",
-      Observer = "SSB"
+      Target = coreKernels.ID.MercuryBarycenter,
+      Observer = coreKernels.ID.SolarSystemBarycenter
     },
     Color = { 0.6, 0.5, 0.5 },
     Period = 87.968,
@@ -42,8 +42,7 @@ asset.export(MercuryBarycenterTrail)
 asset.meta = {
   Name = "Mercury Trail",
   Version = "1.1",
-  Description = [[Trail for Mercury's Barycenter. Data from NASA Spice (see base spice
-    asset)]],
+  Description = "Trail for Mercury's Barycenter",
   Author = "OpenSpace Team",
   URL = "http://openspaceproject.com",
   License = "MIT license"
diff --git a/data/assets/scene/solarsystem/planets/mercury/trail_earth.asset b/data/assets/scene/solarsystem/planets/mercury/trail_earth.asset
index 259460e939..c8d38db592 100644
--- a/data/assets/scene/solarsystem/planets/mercury/trail_earth.asset
+++ b/data/assets/scene/solarsystem/planets/mercury/trail_earth.asset
@@ -1,6 +1,6 @@
-asset.require("spice/base")
 local transforms = asset.require("scene/solarsystem/sun/transforms")
 local earthTransforms = asset.require("scene/solarsystem/planets/earth/transforms")
+local coreKernels = asset.require("spice/core")
 
 
 
@@ -12,8 +12,8 @@ local MercuryTrailEarth = {
     Enabled = false,
     Translation = {
       Type = "SpiceTranslation",
-      Target = "MERCURY",
-      Observer = "EARTH"
+      Target = coreKernels.ID.Mercury,
+      Observer = coreKernels.ID.Earth
     },
     Color = { 1.0, 0.5, 0.2 },
     Period = 224.695,
diff --git a/data/assets/scene/solarsystem/planets/mercury/transforms.asset b/data/assets/scene/solarsystem/planets/mercury/transforms.asset
index 072de7b715..9d34b9c070 100644
--- a/data/assets/scene/solarsystem/planets/mercury/transforms.asset
+++ b/data/assets/scene/solarsystem/planets/mercury/transforms.asset
@@ -1,5 +1,5 @@
-asset.require("spice/base")
 local transforms = asset.require("scene/solarsystem/sun/transforms")
+local coreKernels = asset.require("spice/core")
 
 
 
@@ -9,8 +9,8 @@ local MercuryBarycenter = {
   Transform = {
     Translation = {
       Type = "SpiceTranslation",
-      Target = "MERCURY BARYCENTER",
-      Observer = "SSB"
+      Target = coreKernels.ID.MercuryBarycenter,
+      Observer = coreKernels.ID.SolarSystemBarycenter
     }
   },
   GUI = {
diff --git a/data/assets/scene/solarsystem/planets/neptune/inner_moons.asset b/data/assets/scene/solarsystem/planets/neptune/inner_moons.asset
index 7b74e64e61..10070b7d01 100644
--- a/data/assets/scene/solarsystem/planets/neptune/inner_moons.asset
+++ b/data/assets/scene/solarsystem/planets/neptune/inner_moons.asset
@@ -1,5 +1,6 @@
 local transforms = asset.require("./transforms")
-local kernel = asset.require("./kernels")
+local kernel = asset.require("./kernels095")
+local coreKernels = asset.require("spice/core")
 
 
 
@@ -9,8 +10,8 @@ local Naiad = {
   Transform = {
     Translation = {
       Type = "SpiceTranslation",
-      Target = "NAIAD",
-      Observer = "NEPTUNE BARYCENTER"
+      Target = kernel.ID.Naiad,
+      Observer = coreKernels.ID.NeptuneBarycenter
     }
   },
   Renderable = {
@@ -40,8 +41,8 @@ local NaiadTrail = {
     Type = "RenderableTrailOrbit",
     Translation = {
       Type = "SpiceTranslation",
-      Target = "NAIAD",
-      Observer = "NEPTUNE BARYCENTER"
+      Target = kernel.ID.Naiad,
+      Observer = coreKernels.ID.NeptuneBarycenter
     },
     Color = { 0.2, 0.5, 0.75 },
     Period = 0.294,
@@ -91,8 +92,8 @@ local Thalassa = {
   Transform = {
     Translation = {
       Type = "SpiceTranslation",
-      Target = "THALASSA",
-      Observer = "NEPTUNE BARYCENTER"
+      Target = kernel.ID.Thalassa,
+      Observer = coreKernels.ID.NeptuneBarycenter
     }
   },
   Renderable = {
@@ -122,8 +123,8 @@ local ThalassaTrail = {
     Type = "RenderableTrailOrbit",
     Translation = {
       Type = "SpiceTranslation",
-      Target = "THALASSA",
-      Observer = "NEPTUNE BARYCENTER"
+      Target = kernel.ID.Thalassa,
+      Observer = coreKernels.ID.NeptuneBarycenter
     },
     Color = { 0.2, 0.5, 0.75 },
     Period = 0.311,
@@ -173,8 +174,8 @@ local Despina = {
   Transform = {
     Translation = {
       Type = "SpiceTranslation",
-      Target = "DESPINA",
-      Observer = "NEPTUNE BARYCENTER"
+      Target = kernel.ID.Despina,
+      Observer = coreKernels.ID.NeptuneBarycenter
     }
   },
   Renderable = {
@@ -204,8 +205,8 @@ local DespinaTrail = {
     Type = "RenderableTrailOrbit",
     Translation = {
       Type = "SpiceTranslation",
-      Target = "DESPINA",
-      Observer = "NEPTUNE BARYCENTER"
+      Target = kernel.ID.Despina,
+      Observer = coreKernels.ID.NeptuneBarycenter
     },
     Color = { 0.2, 0.5, 0.75 },
     Period = 0.335,
@@ -255,8 +256,8 @@ local Galatea = {
   Transform = {
     Translation = {
       Type = "SpiceTranslation",
-      Target = "GALATEA",
-      Observer = "NEPTUNE BARYCENTER"
+      Target = kernel.ID.Galatea,
+      Observer = coreKernels.ID.NeptuneBarycenter
     }
   },
   Renderable = {
@@ -286,8 +287,8 @@ local GalateaTrail = {
     Type = "RenderableTrailOrbit",
     Translation = {
       Type = "SpiceTranslation",
-      Target = "GALATEA",
-      Observer = "NEPTUNE BARYCENTER"
+      Target = kernel.ID.Galatea,
+      Observer = coreKernels.ID.NeptuneBarycenter
     },
     Color = { 0.2, 0.5, 0.75 },
     Period = 0.429,
@@ -337,8 +338,8 @@ local Larissa = {
   Transform = {
     Translation = {
       Type = "SpiceTranslation",
-      Target = "LARISSA",
-      Observer = "NEPTUNE BARYCENTER"
+      Target = kernel.ID.Larissa,
+      Observer = coreKernels.ID.NeptuneBarycenter
     }
   },
   Renderable = {
@@ -368,8 +369,8 @@ local LarissaTrail = {
     Type = "RenderableTrailOrbit",
     Translation = {
       Type = "SpiceTranslation",
-      Target = "LARISSA",
-      Observer = "NEPTUNE BARYCENTER"
+      Target = kernel.ID.Larissa,
+      Observer = coreKernels.ID.NeptuneBarycenter
     },
     Color = { 0.2, 0.5, 0.75 },
     Period = 0.555,
@@ -419,8 +420,8 @@ local Hippocamp = {
   Transform = {
     Translation = {
       Type = "SpiceTranslation",
-      Target = "814",
-      Observer = "NEPTUNE BARYCENTER"
+      Target = kernel.ID.Hippocamp,
+      Observer = coreKernels.ID.NeptuneBarycenter
     }
   },
   Renderable = {
@@ -450,8 +451,8 @@ local HippocampTrail = {
     Type = "RenderableTrailOrbit",
     Translation = {
       Type = "SpiceTranslation",
-      Target = "814",
-      Observer = "NEPTUNE BARYCENTER"
+      Target = kernel.ID.Hippocamp,
+      Observer = coreKernels.ID.NeptuneBarycenter
     },
     Color = { 0.2, 0.5, 0.75 },
     Period = 0.936,
@@ -501,8 +502,8 @@ local Proteus = {
   Transform = {
     Translation = {
       Type = "SpiceTranslation",
-      Target = "PROTEUS",
-      Observer = "NEPTUNE BARYCENTER"
+      Target = kernel.ID.Proteus,
+      Observer = coreKernels.ID.NeptuneBarycenter
     }
   },
   Renderable = {
@@ -532,8 +533,8 @@ local ProteusTrail = {
     Type = "RenderableTrailOrbit",
     Translation = {
       Type = "SpiceTranslation",
-      Target = "PROTEUS",
-      Observer = "NEPTUNE BARYCENTER"
+      Target = kernel.ID.Proteus,
+      Observer = coreKernels.ID.NeptuneBarycenter
     },
     Color = { 0.2, 0.5, 0.75 },
     Period = 1.122,
@@ -579,10 +580,6 @@ local ProteusLabel = {
 
 
 asset.onInitialize(function()
-  openspace.spice.loadKernel(kernel.nep095)
-  openspace.spice.loadKernel(kernel.nep097)
-
-
   openspace.addSceneGraphNode(Naiad)
   openspace.addSceneGraphNode(NaiadTrail)
   openspace.addSceneGraphNode(NaiadLabel)
@@ -640,10 +637,6 @@ asset.onDeinitialize(function()
   openspace.removeSceneGraphNode(ProteusLabel)
   openspace.removeSceneGraphNode(ProteusTrail)
   openspace.removeSceneGraphNode(Proteus)
-
-
-  openspace.spice.unloadKernel(kernel.nep097)
-  openspace.spice.unloadKernel(kernel.nep095)
 end)
 
 asset.export(Naiad)
diff --git a/data/assets/scene/solarsystem/planets/neptune/irregular_moons.asset b/data/assets/scene/solarsystem/planets/neptune/irregular_moons.asset
index 6b1f13d4fc..fbd440905a 100644
--- a/data/assets/scene/solarsystem/planets/neptune/irregular_moons.asset
+++ b/data/assets/scene/solarsystem/planets/neptune/irregular_moons.asset
@@ -1,5 +1,6 @@
 local transforms = asset.require("./transforms")
-local kernel = asset.require("./kernels")
+local kernels102 = asset.require("./kernels102")
+local coreKernels = asset.require("spice/core")
 
 
 
@@ -9,8 +10,8 @@ local Halimede = {
   Transform = {
     Translation = {
       Type = "SpiceTranslation",
-      Target = "HALIMEDE",
-      Observer = "NEPTUNE BARYCENTER"
+      Target = kernels102.ID.Halimede,
+      Observer = coreKernels.ID.NeptuneBarycenter
     }
   },
   Renderable = {
@@ -40,8 +41,8 @@ local HalimedeTrail = {
     Type = "RenderableTrailOrbit",
     Translation = {
       Type = "SpiceTranslation",
-      Target = "HALIMEDE",
-      Observer = "NEPTUNE BARYCENTER"
+      Target = kernels102.ID.Halimede,
+      Observer = coreKernels.ID.NeptuneBarycenter
     },
     Color = { 0.2, 0.5, 0.75 },
     Period = 1879.08,
@@ -91,8 +92,8 @@ local Psamathe = {
   Transform = {
     Translation = {
       Type = "SpiceTranslation",
-      Target = "PSAMATHE",
-      Observer = "NEPTUNE BARYCENTER"
+      Target = kernels102.ID.Psamathe,
+      Observer = coreKernels.ID.NeptuneBarycenter
     }
   },
   Renderable = {
@@ -122,8 +123,8 @@ local PsamatheTrail = {
     Type = "RenderableTrailOrbit",
     Translation = {
       Type = "SpiceTranslation",
-      Target = "PSAMATHE",
-      Observer = "NEPTUNE BARYCENTER"
+      Target = kernels102.ID.Psamathe,
+      Observer = coreKernels.ID.NeptuneBarycenter
     },
     Color = { 0.2, 0.5, 0.75 },
     Period = 9074.3,
@@ -173,8 +174,8 @@ local Sao = {
   Transform = {
     Translation = {
       Type = "SpiceTranslation",
-      Target = "SAO",
-      Observer = "NEPTUNE BARYCENTER"
+      Target = kernels102.ID.Sao,
+      Observer = coreKernels.ID.NeptuneBarycenter
     }
   },
   Renderable = {
@@ -204,8 +205,8 @@ local SaoTrail = {
     Type = "RenderableTrailOrbit",
     Translation = {
       Type = "SpiceTranslation",
-      Target = "SAO",
-      Observer = "NEPTUNE BARYCENTER"
+      Target = kernels102.ID.Sao,
+      Observer = coreKernels.ID.NeptuneBarycenter
     },
     Color = { 0.2, 0.5, 0.75 },
     Period = 2912.72,
@@ -255,8 +256,8 @@ local Laomedeia = {
   Transform = {
     Translation = {
       Type = "SpiceTranslation",
-      Target = "LAOMEDEIA",
-      Observer = "NEPTUNE BARYCENTER"
+      Target = kernels102.ID.Laomedeia,
+      Observer = coreKernels.ID.NeptuneBarycenter
     }
   },
   Renderable = {
@@ -286,8 +287,8 @@ local LaomedeiaTrail = {
     Type = "RenderableTrailOrbit",
     Translation = {
       Type = "SpiceTranslation",
-      Target = "LAOMEDEIA",
-      Observer = "NEPTUNE BARYCENTER"
+      Target = kernels102.ID.Laomedeia,
+      Observer = coreKernels.ID.NeptuneBarycenter
     },
     Color = { 0.2, 0.5, 0.75 },
     Period = 3171.33,
@@ -337,8 +338,8 @@ local Neso = {
   Transform = {
     Translation = {
       Type = "SpiceTranslation",
-      Target = "NESO",
-      Observer = "NEPTUNE BARYCENTER"
+      Target = kernels102.ID.Neso,
+      Observer = coreKernels.ID.NeptuneBarycenter
     }
   },
   Renderable = {
@@ -368,8 +369,8 @@ local NesoTrail = {
     Type = "RenderableTrailOrbit",
     Translation = {
       Type = "SpiceTranslation",
-      Target = "NESO",
-      Observer = "NEPTUNE BARYCENTER"
+      Target = kernels102.ID.Neso,
+      Observer = coreKernels.ID.NeptuneBarycenter
     },
     Color = { 0.2, 0.5, 0.75 },
     Period = 9740.73,
@@ -415,9 +416,6 @@ local NesoLabel = {
 
 
 asset.onInitialize(function()
-  openspace.spice.loadKernel(kernel.nep102)
-
-
   openspace.addSceneGraphNode(Halimede)
   openspace.addSceneGraphNode(HalimedeTrail)
   openspace.addSceneGraphNode(HalimedeLabel)
@@ -459,9 +457,6 @@ asset.onDeinitialize(function()
   openspace.removeSceneGraphNode(NesoLabel)
   openspace.removeSceneGraphNode(NesoTrail)
   openspace.removeSceneGraphNode(Neso)
-
-
-  openspace.spice.unloadKernel(kernel.nep102)
 end)
 
 asset.export(Halimede)
diff --git a/data/assets/scene/solarsystem/planets/neptune/kernels095.asset b/data/assets/scene/solarsystem/planets/neptune/kernels095.asset
new file mode 100644
index 0000000000..ebd656215f
--- /dev/null
+++ b/data/assets/scene/solarsystem/planets/neptune/kernels095.asset
@@ -0,0 +1,53 @@
+local coreKernels = asset.require("spice/core")
+
+
+
+local kernels = asset.resource({
+  Name = "Neptune Spice Kernels",
+  Type = "HttpSynchronization",
+  Identifier = "neptune_kernels",
+  Version = 2
+})
+
+
+local ID = {
+  Despina = "DESPINA",
+  Galatea = "GALATEA",
+  Hippocamp = 814,
+  Larissa = "LARISSA",
+  Naiad = "NAIAD",
+  Proteus = "PROTEUS",
+  Thalassa = "THALASSA"
+}
+
+local Frame = {
+  Despina = coreKernels.Frame.Despina,
+  Galatea = coreKernels.Frame.Galatea,
+  Larissa = coreKernels.Frame.Larissa,
+  Naiad = coreKernels.Frame.Naiad,
+  Proteus = coreKernels.Frame.Proteus,
+  Thalassa = coreKernels.Frame.Thalassa
+}
+
+
+asset.onInitialize(function()
+  openspace.spice.loadKernel(kernels .. "nep102.bsp")
+end)
+
+asset.onDeinitialize(function()
+  openspace.spice.unloadKernel(kernels .. "nep102.bsp")
+end)
+
+asset.export("ID", ID)
+asset.export("Frame", Frame)
+
+
+
+asset.meta = {
+  Name = "Neptune Spice Kernels",
+  Version = "1.0",
+  Description = "Generic SPICE kernels for Neptune",
+  Author = "OpenSpace Team",
+  URL = "https://naif.jpl.nasa.gov/pub/naif/pds/wgc/kernels/spk/",
+  License = "NASA"
+}
diff --git a/data/assets/scene/solarsystem/planets/neptune/kernels.asset b/data/assets/scene/solarsystem/planets/neptune/kernels102.asset
similarity index 54%
rename from data/assets/scene/solarsystem/planets/neptune/kernels.asset
rename to data/assets/scene/solarsystem/planets/neptune/kernels102.asset
index e1c2feb317..06ca2973ed 100644
--- a/data/assets/scene/solarsystem/planets/neptune/kernels.asset
+++ b/data/assets/scene/solarsystem/planets/neptune/kernels102.asset
@@ -6,10 +6,24 @@ local kernels = asset.resource({
 })
 
 
-asset.export("nep095", kernels .. "nep095.bsp")
-asset.export("nep097", kernels .. "nep097.bsp")
-asset.export("nep101xl_802", kernels .. "nep101xl-802.bsp")
-asset.export("nep102", kernels .. "nep102.bsp")
+local ID = {
+  Halimede = "HALIMEDE",
+  Laomedeia = "LAOMEDEIA",
+  Psamathe = "PSAMATHE",
+  Sao = "SAO",
+  Neso = "NESO"
+}
+
+
+asset.onInitialize(function()
+  openspace.spice.loadKernel(kernels .. "nep102.bsp")
+end)
+
+asset.onDeinitialize(function()
+  openspace.spice.unloadKernel(kernels .. "nep102.bsp")
+end)
+
+asset.export("ID", ID)
 
 
 
diff --git a/data/assets/scene/solarsystem/planets/neptune/neptune.asset b/data/assets/scene/solarsystem/planets/neptune/neptune.asset
index 08a80ed703..5d2ba64570 100644
--- a/data/assets/scene/solarsystem/planets/neptune/neptune.asset
+++ b/data/assets/scene/solarsystem/planets/neptune/neptune.asset
@@ -1,7 +1,6 @@
-asset.require("spice/base")
 asset.require("./trail")
 local transforms = asset.require("./transforms")
-local kernel = asset.require("./kernels")
+local coreKernels = asset.require("spice/core")
 
 
 
@@ -11,13 +10,13 @@ local Neptune = {
   Transform = {
     Translation = {
       Type = "SpiceTranslation",
-      Target = "NEPTUNE",
-      Observer = "NEPTUNE BARYCENTER"
+      Target = coreKernels.ID.Neptune,
+      Observer = coreKernels.ID.NeptuneBarycenter
     },
     Rotation = {
       Type = "SpiceRotation",
-      SourceFrame = "IAU_NEPTUNE",
-      DestinationFrame = "GALACTIC"
+      SourceFrame = coreKernels.Frame.Neptune,
+      DestinationFrame = coreKernels.Frame.Galactic
     }
   },
   Renderable = {
@@ -61,8 +60,6 @@ local NeptuneLabel = {
 
 
 asset.onInitialize(function()
-  openspace.spice.loadKernel(kernel.nep097)
-
   openspace.addSceneGraphNode(Neptune)
   openspace.addSceneGraphNode(NeptuneLabel)
 end)
@@ -70,8 +67,6 @@ end)
 asset.onDeinitialize(function()
   openspace.removeSceneGraphNode(NeptuneLabel)
   openspace.removeSceneGraphNode(Neptune)
-
-  openspace.spice.unloadKernel(kernel.nep097)
 end)
 
 asset.export(Neptune)
diff --git a/data/assets/scene/solarsystem/planets/neptune/nereid/nereid.asset b/data/assets/scene/solarsystem/planets/neptune/nereid/nereid.asset
index 889f01cc3b..c09dd887c0 100644
--- a/data/assets/scene/solarsystem/planets/neptune/nereid/nereid.asset
+++ b/data/assets/scene/solarsystem/planets/neptune/nereid/nereid.asset
@@ -1,8 +1,16 @@
 local transforms = asset.require("../transforms")
-local kernel = asset.require("../kernels")
+local coreKernels = asset.require("spice/core")
 
 
 
+local kernels = asset.resource({
+  Name = "Neptune Spice Kernels",
+  Type = "HttpSynchronization",
+  Identifier = "neptune_kernels",
+  Version = 2
+})
+
+
 local Nereid = {
   Identifier = "Nereid",
   Parent = transforms.NeptuneBarycenter.Identifier,
@@ -10,7 +18,7 @@ local Nereid = {
     Translation = {
       Type = "SpiceTranslation",
       Target = "NEREID",
-      Observer = "NEPTUNE BARYCENTER"
+      Observer = coreKernels.ID.NeptuneBarycenter
     }
   },
   Renderable = {
@@ -34,7 +42,7 @@ local NereidTrail = {
     Translation = {
       Type = "SpiceTranslation",
       Target = "NEREID",
-      Observer = "NEPTUNE BARYCENTER"
+      Observer = coreKernels.ID.NeptuneBarycenter
     },
     Color = { 0.2, 0.5, 0.75 },
     Period = 360.13,
@@ -74,8 +82,7 @@ local NereidLabel = {
 
 
 asset.onInitialize(function()
-  openspace.spice.loadKernel(kernel.nep101xl_802)
-
+  openspace.spice.loadKernel(kernels .. "nep101xl-802.bsp")
 
   openspace.addSceneGraphNode(Nereid)
   openspace.addSceneGraphNode(NereidTrail)
@@ -87,8 +94,7 @@ asset.onDeinitialize(function()
   openspace.removeSceneGraphNode(NereidTrail)
   openspace.removeSceneGraphNode(Nereid)
 
-
-  openspace.spice.unloadKernel(kernel.nep101xl_802)
+  openspace.spice.unloadKernel(kernels .. "nep101xl-802.bsp")
 end)
 
 asset.export(Nereid)
diff --git a/data/assets/scene/solarsystem/planets/neptune/trail.asset b/data/assets/scene/solarsystem/planets/neptune/trail.asset
index 62268797bf..e8f0ca1647 100644
--- a/data/assets/scene/solarsystem/planets/neptune/trail.asset
+++ b/data/assets/scene/solarsystem/planets/neptune/trail.asset
@@ -1,6 +1,5 @@
-asset.require("spice/base")
 local transforms = asset.require("scene/solarsystem/sun/transforms")
-local kernel = asset.require("./kernels")
+local coreKernels = asset.require("spice/core")
 
 
 
@@ -11,8 +10,8 @@ local NeptuneTrail = {
     Type = "RenderableTrailOrbit",
     Translation = {
       Type = "SpiceTranslation",
-      Target = "NEPTUNE",
-      Observer = "SSB"
+      Target = coreKernels.ID.Neptune,
+      Observer = coreKernels.ID.SolarSystemBarycenter
     },
     Color = { 0.2, 0.5, 1.0 },
     -- Period = 60200,
@@ -39,15 +38,11 @@ local NeptuneTrail = {
 
 
 asset.onInitialize(function()
-  openspace.spice.loadKernel(kernel.nep097)
-
   openspace.addSceneGraphNode(NeptuneTrail)
 end)
 
 asset.onDeinitialize(function()
   openspace.removeSceneGraphNode(NeptuneTrail)
-
-  openspace.spice.unloadKernel(kernel.nep097)
 end)
 
 asset.export(NeptuneTrail)
@@ -57,7 +52,7 @@ asset.export(NeptuneTrail)
 asset.meta = {
   Name = "Neptune Trail",
   Version = "1.1",
-  Description = "Main trail of Neptune. Data from NASA Spice (see base spice asset)",
+  Description = "Main trail of Neptune",
   Author = "OpenSpace Team",
   URL = "http://openspaceproject.com",
   License = "MIT license"
diff --git a/data/assets/scene/solarsystem/planets/neptune/trail_barycenter.asset b/data/assets/scene/solarsystem/planets/neptune/trail_barycenter.asset
index 4a5de693f7..d3ba82200b 100644
--- a/data/assets/scene/solarsystem/planets/neptune/trail_barycenter.asset
+++ b/data/assets/scene/solarsystem/planets/neptune/trail_barycenter.asset
@@ -1,6 +1,5 @@
-asset.require("spice/base")
 local transforms = asset.require("scene/solarsystem/sun/transforms")
-local kernel = asset.require("./kernels")
+local coreKernels = asset.require("spice/core")
 
 
 
@@ -12,8 +11,8 @@ local NeptuneBarycenterTrail = {
     Enabled = false,
     Translation = {
       Type = "SpiceTranslation",
-      Target = "NEPTUNE BARYCENTER",
-      Observer = "SSB"
+      Target = coreKernels.ID.NeptuneBarycenter,
+      Observer = coreKernels.ID.SolarSystemBarycenter
     },
     Color = { 0.2, 0.5, 1.0 },
     Period = 60266,
@@ -29,15 +28,11 @@ local NeptuneBarycenterTrail = {
 
 
 asset.onInitialize(function()
-  openspace.spice.loadKernel(kernel.nep097)
-
   openspace.addSceneGraphNode(NeptuneBarycenterTrail)
 end)
 
 asset.onDeinitialize(function()
   openspace.removeSceneGraphNode(NeptuneBarycenterTrail)
-
-  openspace.spice.unloadKernel(kernel.nep097)
 end)
 
 asset.export(NeptuneBarycenterTrail)
@@ -47,8 +42,7 @@ asset.export(NeptuneBarycenterTrail)
 asset.meta = {
   Name = "Neptune Trail",
   Version = "1.1",
-  Description = [[Trail of Neptune's Barycenter. Data from NASA Spice (see base spice
-    asset)]],
+  Description = "Trail of Neptune's Barycenter",
   Author = "OpenSpace Team",
   URL = "http://openspaceproject.com",
   License = "MIT license"
diff --git a/data/assets/scene/solarsystem/planets/neptune/trail_earth.asset b/data/assets/scene/solarsystem/planets/neptune/trail_earth.asset
index 9becaa7d4a..89a6c1ef73 100644
--- a/data/assets/scene/solarsystem/planets/neptune/trail_earth.asset
+++ b/data/assets/scene/solarsystem/planets/neptune/trail_earth.asset
@@ -1,7 +1,6 @@
-asset.require("spice/base")
 local transforms = asset.require("scene/solarsystem/sun/transforms")
 local earthTransforms = asset.require("scene/solarsystem/planets/earth/transforms")
-local kernel = asset.require("./kernels")
+local coreKernels = asset.require("spice/core")
 
 
 
@@ -13,8 +12,8 @@ local NeptuneTrailEarth = {
     Enabled = false,
     Translation = {
       Type = "SpiceTranslation",
-      Target = "NEPTUNE",
-      Observer = "EARTH"
+      Target = coreKernels.ID.Neptune,
+      Observer = coreKernels.ID.Earth
     },
     Color = { 1.0, 0.5, 0.2 },
     Period = 224.695,
@@ -30,15 +29,11 @@ local NeptuneTrailEarth = {
 
 
 asset.onInitialize(function()
-  openspace.spice.loadKernel(kernel.nep097)
-
   openspace.addSceneGraphNode(NeptuneTrailEarth)
 end)
 
 asset.onDeinitialize(function()
   openspace.removeSceneGraphNode(NeptuneTrailEarth)
-
-  openspace.spice.unloadKernel(kernel.nep097)
 end)
 
 asset.export(NeptuneTrailEarth)
diff --git a/data/assets/scene/solarsystem/planets/neptune/transforms.asset b/data/assets/scene/solarsystem/planets/neptune/transforms.asset
index 93e780ad6d..a2dd5f261b 100644
--- a/data/assets/scene/solarsystem/planets/neptune/transforms.asset
+++ b/data/assets/scene/solarsystem/planets/neptune/transforms.asset
@@ -1,6 +1,5 @@
-asset.require("spice/base")
 local transforms = asset.require("scene/solarsystem/sun/transforms")
-local kernel = asset.require("./kernels")
+local coreKernels = asset.require("spice/core")
 
 
 
@@ -10,8 +9,8 @@ local NeptuneBarycenter = {
   Transform = {
     Translation = {
       Type = "SpiceTranslation",
-      Target = "NEPTUNE BARYCENTER",
-      Observer = "SSB"
+      Target = coreKernels.ID.NeptuneBarycenter,
+      Observer = coreKernels.ID.SolarSystemBarycenter
     }
   },
   GUI = {
@@ -23,15 +22,11 @@ local NeptuneBarycenter = {
 
 
 asset.onInitialize(function()
-  openspace.spice.loadKernel(kernel.nep097)
-
   openspace.addSceneGraphNode(NeptuneBarycenter)
 end)
 
 asset.onDeinitialize(function()
   openspace.removeSceneGraphNode(NeptuneBarycenter)
-
-  openspace.spice.unloadKernel(kernel.nep097)
 end)
 
 asset.export(NeptuneBarycenter)
diff --git a/data/assets/scene/solarsystem/planets/neptune/triton/trail.asset b/data/assets/scene/solarsystem/planets/neptune/triton/trail.asset
deleted file mode 100644
index fc8f537041..0000000000
--- a/data/assets/scene/solarsystem/planets/neptune/triton/trail.asset
+++ /dev/null
@@ -1,53 +0,0 @@
-asset.require("spice/base")
-local transforms = asset.require("../transforms")
-local kernel = asset.require("../kernels")
-
-
-
-local Trail = {
-  Identifier = "TritonTrail",
-  Parent = transforms.NeptuneBarycenter.Identifier,
-  Renderable = {
-    Type = "RenderableTrailOrbit",
-    Translation = {
-      Type = "SpiceTranslation",
-      Target = "TRITON",
-      Observer = "NEPTUNE BARYCENTER"
-    },
-    Color = { 0.2, 0.5, 0.75 },
-    Period = 5.877,
-    Resolution = 1000
-  },
-  Tag = { "moonTrail_solarSystem", "moonTrail_giants", "moonTrail_neptune" },
-  GUI = {
-    Name = "Triton Trail",
-    Path = "/Solar System/Planets/Neptune/Major Moons/Triton"
-  }
-}
-
-asset.onInitialize(function()
-  openspace.spice.loadKernel(kernel.nep097)
-
-
-  openspace.addSceneGraphNode(Trail)
-end)
-
-asset.onDeinitialize(function()
-  openspace.removeSceneGraphNode(Trail)
-
-
-  openspace.spice.unloadKernel(kernel.nep097)
-end)
-
-asset.export(Trail)
-
-
-asset.meta = {
-  Name = "Triton Trail",
-  Version = "1.1",
-  Description = [[Trail of Triton as observed by the Neptune. Data from NASA Spice (see
-    base spice asset)]],
-  Author = "OpenSpace Team",
-  URL = "http://openspaceproject.com",
-  License = "MIT license"
-}
diff --git a/data/assets/scene/solarsystem/planets/neptune/triton/triton.asset b/data/assets/scene/solarsystem/planets/neptune/triton/triton.asset
index df573a0ee9..4cba8e5a83 100644
--- a/data/assets/scene/solarsystem/planets/neptune/triton/triton.asset
+++ b/data/assets/scene/solarsystem/planets/neptune/triton/triton.asset
@@ -1,8 +1,16 @@
 local transforms = asset.require("../transforms")
-local kernel = asset.require("../kernels")
+local coreKernels = asset.require("spice/core")
 
 
 
+local kernels = asset.resource({
+  Name = "Neptune Spice Kernels",
+  Type = "HttpSynchronization",
+  Identifier = "neptune_kernels",
+  Version = 2
+})
+
+
 local Triton = {
   Identifier = "Triton",
   Parent = transforms.NeptuneBarycenter.Identifier,
@@ -10,12 +18,12 @@ local Triton = {
     Translation = {
       Type = "SpiceTranslation",
       Target = "TRITON",
-      Observer = "NEPTUNE BARYCENTER"
+      Observer = coreKernels.ID.NeptuneBarycenter
     },
     Rotation = {
       Type = "SpiceRotation",
       SourceFrame = "IAU_TRITON",
-      DestinationFrame = "GALACTIC"
+      DestinationFrame = coreKernels.Frame.Galactic
     }
   },
   Renderable = {
@@ -39,7 +47,7 @@ local TritonTrail = {
     Translation = {
       Type = "SpiceTranslation",
       Target = "TRITON",
-      Observer = "NEPTUNE BARYCENTER"
+      Observer = coreKernels.ID.NeptuneBarycenter
     },
     Color = { 0.2, 0.5, 0.75 },
     Period = 5.875,
@@ -79,8 +87,7 @@ local TritonLabel = {
 
 
 asset.onInitialize(function()
-  openspace.spice.loadKernel(kernel.nep097)
-
+  openspace.spice.loadKernel(kernels .. "nep097.bsp")
 
   openspace.addSceneGraphNode(Triton)
   openspace.addSceneGraphNode(TritonTrail)
@@ -92,8 +99,7 @@ asset.onDeinitialize(function()
   openspace.removeSceneGraphNode(TritonTrail)
   openspace.removeSceneGraphNode(Triton)
 
-
-  openspace.spice.unloadKernel(kernel.nep097)
+  openspace.spice.unloadKernel(kernels .. "nep097.bsp")
 end)
 
 asset.export(Triton)
diff --git a/data/assets/scene/solarsystem/planets/saturn/dione/dione.asset b/data/assets/scene/solarsystem/planets/saturn/dione/dione.asset
index 059a8978b8..2d198d2bfa 100644
--- a/data/assets/scene/solarsystem/planets/saturn/dione/dione.asset
+++ b/data/assets/scene/solarsystem/planets/saturn/dione/dione.asset
@@ -1,6 +1,7 @@
 asset.require("./trail")
 local transforms = asset.require("../transforms")
-local kernel = asset.require("../kernels")
+local kernels = asset.require("../kernels")
+local coreKernels = asset.require("spice/core")
 
 
 
@@ -18,13 +19,13 @@ local Dione = {
   Transform = {
     Translation = {
       Type = "SpiceTranslation",
-      Target = "DIONE",
-      Observer = "SATURN BARYCENTER"
+      Target = kernels.ID.Dione,
+      Observer = coreKernels.ID.SaturnBarycenter
     },
     Rotation = {
       Type = "SpiceRotation",
-      SourceFrame = "IAU_ENCELADUS",
-      DestinationFrame = "GALACTIC"
+      SourceFrame = coreKernels.Frame.Dione,
+      DestinationFrame = coreKernels.Frame.Galactic
     }
   },
   Renderable = {
@@ -79,8 +80,6 @@ local DioneLabel = {
 
 
 asset.onInitialize(function()
-  openspace.spice.loadKernel(kernel.sat441)
-
   openspace.addSceneGraphNode(Dione)
   openspace.addSceneGraphNode(DioneLabel)
 end)
@@ -88,8 +87,6 @@ end)
 asset.onDeinitialize(function()
   openspace.removeSceneGraphNode(DioneLabel)
   openspace.removeSceneGraphNode(Dione)
-
-  openspace.spice.unloadKernel(kernel.sat441)
 end)
 
 asset.export(Dione)
diff --git a/data/assets/scene/solarsystem/planets/saturn/dione/trail.asset b/data/assets/scene/solarsystem/planets/saturn/dione/trail.asset
index 41cdab9d54..000ef6aaf2 100644
--- a/data/assets/scene/solarsystem/planets/saturn/dione/trail.asset
+++ b/data/assets/scene/solarsystem/planets/saturn/dione/trail.asset
@@ -1,5 +1,6 @@
 local transforms = asset.require("../transforms")
-local kernel = asset.require("../kernels")
+local kernels = asset.require("../kernels")
+local coreKernels = asset.require("spice/core")
 
 
 
@@ -10,8 +11,8 @@ local DioneTrail = {
     Type = "RenderableTrailOrbit",
     Translation = {
       Type = "SpiceTranslation",
-      Target = "DIONE",
-      Observer = "SATURN BARYCENTER"
+      Target = kernels.ID.Dione,
+      Observer = coreKernels.ID.SaturnBarycenter
     },
     Color = { 0.5, 0.3, 0.3 },
     Period = 66.0 / 24.0,
@@ -27,15 +28,11 @@ local DioneTrail = {
 
 
 asset.onInitialize(function()
-  openspace.spice.loadKernel(kernel.sat441)
-
   openspace.addSceneGraphNode(DioneTrail)
 end)
 
 asset.onDeinitialize(function()
   openspace.removeSceneGraphNode(DioneTrail)
-
-  openspace.spice.unloadKernel(kernel.sat441)
 end)
 
 asset.export(DioneTrail)
@@ -45,7 +42,7 @@ asset.export(DioneTrail)
 asset.meta = {
   Name = "Dione Trail",
   Version = "1.0",
-  Description = "Trail for Dione. Data from NASA Spice (see base spice asset)",
+  Description = "Trail for Dione",
   Author = "OpenSpace Team",
   URL = "http://openspaceproject.com",
   License = "MIT license"
diff --git a/data/assets/scene/solarsystem/planets/saturn/enceladus/enceladus.asset b/data/assets/scene/solarsystem/planets/saturn/enceladus/enceladus.asset
index b18131ccef..844c4c80cf 100644
--- a/data/assets/scene/solarsystem/planets/saturn/enceladus/enceladus.asset
+++ b/data/assets/scene/solarsystem/planets/saturn/enceladus/enceladus.asset
@@ -1,6 +1,7 @@
 asset.require("./trail")
 local transforms = asset.require("../transforms")
-local kernel = asset.require("../kernels")
+local kernels = asset.require("../kernels")
+local coreKernels = asset.require("spice/core")
 
 
 
@@ -18,13 +19,13 @@ local Enceladus = {
   Transform = {
     Translation = {
       Type = "SpiceTranslation",
-      Target = "ENCELADUS",
-      Observer = "SATURN BARYCENTER"
+      Target = kernels.ID.Enceladus,
+      Observer = coreKernels.ID.SaturnBarycenter
     },
     Rotation = {
       Type = "SpiceRotation",
-      SourceFrame = "IAU_ENCELADUS",
-      DestinationFrame = "GALACTIC"
+      SourceFrame = kernels.Frame.Enceladus,
+      DestinationFrame = coreKernels.Frame.Galactic
     }
   },
   Renderable = {
@@ -80,8 +81,6 @@ local EnceladusLabel = {
 
 
 asset.onInitialize(function()
-  openspace.spice.loadKernel(kernel.sat441)
-
   openspace.addSceneGraphNode(Enceladus)
   openspace.addSceneGraphNode(EnceladusLabel)
 end)
@@ -89,8 +88,6 @@ end)
 asset.onDeinitialize(function()
   openspace.removeSceneGraphNode(EnceladusLabel)
   openspace.removeSceneGraphNode(Enceladus)
-
-  openspace.spice.unloadKernel(kernel.sat441)
 end)
 
 asset.export(Enceladus)
diff --git a/data/assets/scene/solarsystem/planets/saturn/enceladus/trail.asset b/data/assets/scene/solarsystem/planets/saturn/enceladus/trail.asset
index e518227623..feeeaf909e 100644
--- a/data/assets/scene/solarsystem/planets/saturn/enceladus/trail.asset
+++ b/data/assets/scene/solarsystem/planets/saturn/enceladus/trail.asset
@@ -1,5 +1,6 @@
 local transforms = asset.require("../transforms")
-local kernel = asset.require("../kernels")
+local kernels = asset.require("../kernels")
+local coreKernels = asset.require("spice/core")
 
 
 
@@ -10,8 +11,8 @@ local EnceladusTrail = {
     Type = "RenderableTrailOrbit",
     Translation = {
       Type = "SpiceTranslation",
-      Target = "ENCELADUS",
-      Observer = "SATURN BARYCENTER"
+      Target = kernels.ID.Enceladus,
+      Observer = coreKernels.ID.SaturnBarycenter
     },
     Color = { 0.5, 0.3, 0.3 },
     Period = 33.0 / 24.0,
@@ -27,15 +28,11 @@ local EnceladusTrail = {
 
 
 asset.onInitialize(function()
-  openspace.spice.loadKernel(kernel.sat441)
-
   openspace.addSceneGraphNode(EnceladusTrail)
 end)
 
 asset.onDeinitialize(function()
   openspace.removeSceneGraphNode(EnceladusTrail)
-
-  openspace.spice.unloadKernel(kernel.sat441)
 end)
 
 asset.export(EnceladusTrail)
@@ -45,7 +42,7 @@ asset.export(EnceladusTrail)
 asset.meta = {
   Name = "Enceladus Trail",
   Version = "1.1",
-  Description = "Trail for Enceladus. Data from NASA Spice (see base spice asset)",
+  Description = "Trail for Enceladus",
   Author = "OpenSpace Team",
   URL = "http://openspaceproject.com",
   License = "MIT license"
diff --git a/data/assets/scene/solarsystem/planets/saturn/hyperion/hyperion.asset b/data/assets/scene/solarsystem/planets/saturn/hyperion/hyperion.asset
index 5be4586437..9ea90bfa22 100644
--- a/data/assets/scene/solarsystem/planets/saturn/hyperion/hyperion.asset
+++ b/data/assets/scene/solarsystem/planets/saturn/hyperion/hyperion.asset
@@ -1,6 +1,7 @@
 asset.require("./trail")
 local transforms = asset.require("../transforms")
-local kernel = asset.require("../kernels")
+local kernels = asset.require("../kernels")
+local coreKernels = asset.require("spice/core")
 
 
 
@@ -18,8 +19,8 @@ local Hyperion = {
   Transform = {
     Translation = {
       Type = "SpiceTranslation",
-      Target = "HYPERION",
-      Observer = "SATURN BARYCENTER"
+      Target = kernels.ID.Hyperion,
+      Observer = coreKernels.ID.SaturnBarycenter
     }
     -- The IAU report does not give an orientation model for Hyperion.
     -- Hyperion's rotation is chaotic and not predictable for long periods.
@@ -76,8 +77,6 @@ local HyperionLabel = {
 
 
 asset.onInitialize(function()
-  openspace.spice.loadKernel(kernel.sat441)
-
   openspace.addSceneGraphNode(Hyperion)
   openspace.addSceneGraphNode(HyperionLabel)
 end)
@@ -85,8 +84,6 @@ end)
 asset.onDeinitialize(function()
   openspace.removeSceneGraphNode(HyperionLabel)
   openspace.removeSceneGraphNode(Hyperion)
-
-  openspace.spice.unloadKernel(kernel.sat441)
 end)
 
 asset.export(Hyperion)
diff --git a/data/assets/scene/solarsystem/planets/saturn/hyperion/trail.asset b/data/assets/scene/solarsystem/planets/saturn/hyperion/trail.asset
index 5957e218b1..3b4bbdc3b5 100644
--- a/data/assets/scene/solarsystem/planets/saturn/hyperion/trail.asset
+++ b/data/assets/scene/solarsystem/planets/saturn/hyperion/trail.asset
@@ -1,5 +1,6 @@
 local transforms = asset.require("../transforms")
-local kernel = asset.require("../kernels")
+local kernels = asset.require("../kernels")
+local coreKernels = asset.require("spice/core")
 
 
 
@@ -10,8 +11,8 @@ local HyperionTrail = {
     Type = "RenderableTrailOrbit",
     Translation = {
       Type = "SpiceTranslation",
-      Target = "HYPERION",
-      Observer = "SATURN BARYCENTER"
+      Target = kernels.ID.Hyperion,
+      Observer = coreKernels.ID.SaturnBarycenter
     },
     Color = { 0.5, 0.3, 0.3 },
     Period = 21.276,
@@ -26,15 +27,11 @@ local HyperionTrail = {
 
 
 asset.onInitialize(function()
-  openspace.spice.loadKernel(kernel.sat441)
-
   openspace.addSceneGraphNode(HyperionTrail)
 end)
 
 asset.onDeinitialize(function()
   openspace.removeSceneGraphNode(HyperionTrail)
-
-  openspace.spice.unloadKernel(kernel.sat441)
 end)
 
 asset.export(HyperionTrail)
@@ -44,8 +41,7 @@ asset.export(HyperionTrail)
 asset.meta = {
   Name = "Hyperion Trail",
   Version = "1.1",
-  Description = [[Trail of Saturn's moon Hyperion as observed by Saturn. Data from NASA
-    Spice (see base spice asset)]],
+  Description = "Trail of Saturn's moon Hyperion as observed by Saturn",
   Author = "OpenSpace Team",
   URL = "http://openspaceproject.com",
   License = "MIT license"
diff --git a/data/assets/scene/solarsystem/planets/saturn/iapetus/iapetus.asset b/data/assets/scene/solarsystem/planets/saturn/iapetus/iapetus.asset
index 6ed3d230a8..c7a5c2dcb5 100644
--- a/data/assets/scene/solarsystem/planets/saturn/iapetus/iapetus.asset
+++ b/data/assets/scene/solarsystem/planets/saturn/iapetus/iapetus.asset
@@ -1,6 +1,7 @@
 asset.require("./trail")
 local transforms = asset.require("../transforms")
-local kernel = asset.require("../kernels")
+local kernels = asset.require("../kernels")
+local coreKernels = asset.require("spice/core")
 
 
 
@@ -18,13 +19,13 @@ local Iapetus = {
   Transform = {
     Translation = {
       Type = "SpiceTranslation",
-      Target = "IAPETUS",
-      Observer = "SATURN BARYCENTER"
+      Target = kernels.ID.Iapetus,
+      Observer = coreKernels.ID.SaturnBarycenter
     },
     Rotation = {
       Type = "SpiceRotation",
-      SourceFrame = "IAU_IAPETUS",
-      DestinationFrame = "GALACTIC"
+      SourceFrame = kernels.Frame.Iapetus,
+      DestinationFrame = coreKernels.Frame.Galactic
     }
   },
   Renderable = {
@@ -80,8 +81,6 @@ local IapetusLabel = {
 
 
 asset.onInitialize(function()
-  openspace.spice.loadKernel(kernel.sat441)
-
   openspace.addSceneGraphNode(Iapetus)
   openspace.addSceneGraphNode(IapetusLabel)
 end)
@@ -89,8 +88,6 @@ end)
 asset.onDeinitialize(function()
   openspace.removeSceneGraphNode(IapetusLabel)
   openspace.removeSceneGraphNode(Iapetus)
-
-  openspace.spice.unloadKernel(kernel.sat441)
 end)
 
 asset.export(Iapetus)
diff --git a/data/assets/scene/solarsystem/planets/saturn/iapetus/trail.asset b/data/assets/scene/solarsystem/planets/saturn/iapetus/trail.asset
index 4b67b96bbf..7e8b0dd695 100644
--- a/data/assets/scene/solarsystem/planets/saturn/iapetus/trail.asset
+++ b/data/assets/scene/solarsystem/planets/saturn/iapetus/trail.asset
@@ -1,5 +1,6 @@
 local transforms = asset.require("../transforms")
-local kernel = asset.require("../kernels")
+local kernels = asset.require("../kernels")
+local coreKernels = asset.require("spice/core")
 
 
 
@@ -10,8 +11,8 @@ local IapetusTrail = {
     Type = "RenderableTrailOrbit",
     Translation = {
       Type = "SpiceTranslation",
-      Target = "IAPETUS",
-      Observer = "SATURN BARYCENTER"
+      Target = kernels.ID.Iapetus,
+      Observer = coreKernels.ID.SaturnBarycenter
     },
     Color = { 0.5, 0.3, 0.3 },
     Period = 79.0,
@@ -27,15 +28,11 @@ local IapetusTrail = {
 
 
 asset.onInitialize(function()
-  openspace.spice.loadKernel(kernel.sat441)
-
   openspace.addSceneGraphNode(IapetusTrail)
 end)
 
 asset.onDeinitialize(function()
   openspace.removeSceneGraphNode(IapetusTrail)
-
-  openspace.spice.unloadKernel(kernel.sat441)
 end)
 
 asset.export(IapetusTrail)
@@ -45,7 +42,7 @@ asset.export(IapetusTrail)
 asset.meta = {
   Name = "Iapetus Trail",
   Version = "1.1",
-  Description = "Main trail for Iapetus. Data from NASA Spice (see base spice asset)",
+  Description = "Main trail for Iapetus",
   Author = "OpenSpace Team",
   URL = "http://openspaceproject.com",
   License = "MIT license"
diff --git a/data/assets/scene/solarsystem/planets/saturn/kernels.asset b/data/assets/scene/solarsystem/planets/saturn/kernels.asset
index a1dcf4b882..b2f61017f1 100644
--- a/data/assets/scene/solarsystem/planets/saturn/kernels.asset
+++ b/data/assets/scene/solarsystem/planets/saturn/kernels.asset
@@ -1,3 +1,7 @@
+local coreKernels = asset.require("spice/core")
+
+
+
 local kernels = asset.resource({
   Name = "Saturn Spice Kernels",
   Type = "HttpSynchronization",
@@ -6,10 +10,43 @@ local kernels = asset.resource({
 })
 
 
-asset.export("sat415", kernels .. "sat415.bsp")
-asset.export("sat441", kernels .. "sat441.bsp")
-asset.export("sat452", kernels .. "sat452.bsp")
+local ID = {
+  Calypso = "CALYPSO",
+  Dione = "DIONE",
+  Enceladus = "ENCELADUS",
+  Helene = "HELENE",
+  Hyperion = "HYPERION",
+  Iapetus = "IAPETUS",
+  Mimas = "MIMAS",
+  Phoebe = "PHOEBE",
+  Polydeuces = "POLYDEUCES",
+  Rhea = "RHEA",
+  Tethys = "TETHYS",
+  Titan = "TITAN"
+}
 
+local Frame = {
+  Calypso = coreKernels.Frame.Calypso,
+  Dione = coreKernels.Frame.Dione,
+  Enceladus = coreKernels.Frame.Enceladus,
+  Iapetus = coreKernels.Frame.Iapetus,
+  Mimas = coreKernels.Frame.Mimas,
+  Rhea = coreKernels.Frame.Rhea,
+  Tethys = coreKernels.Frame.Tethys,
+  Titan = coreKernels.Frame.Titan
+}
+
+
+asset.onInitialize(function()
+  openspace.spice.loadKernel(kernels .. "sat441.bsp")
+end)
+
+asset.onDeinitialize(function()
+  openspace.spice.unloadKernel(kernels .. "sat441.bsp")
+end)
+
+asset.export("ID", ID)
+asset.export("Frame", Frame)
 
 
 asset.meta = {
diff --git a/data/assets/scene/solarsystem/planets/saturn/kernels415.asset b/data/assets/scene/solarsystem/planets/saturn/kernels415.asset
new file mode 100644
index 0000000000..dc95ea5834
--- /dev/null
+++ b/data/assets/scene/solarsystem/planets/saturn/kernels415.asset
@@ -0,0 +1,58 @@
+local coreKernels = asset.require("spice/core")
+
+
+
+local kernels = asset.resource({
+  Name = "Saturn Spice Kernels",
+  Type = "HttpSynchronization",
+  Identifier = "saturn_kernels",
+  Version = 2
+})
+
+
+local ID = {
+  Aegaeon = "AEGAEON",
+  Anthe = "ANTHE",
+  Atlas = "ATLAS",
+  Daphnis = "DAPHNIS",
+  Epimetheus = "EPIMETHEUS",
+  Janus = "JANUS",
+  Methone = "METHONE",
+  Pallene = "PALLENE",
+  Pan = "PAN",
+  Pandora = "PANDORA",
+  Prometheus = "PROMETHEUS",
+  Telesto = "TELESTO",
+}
+
+local Frame = {
+  Atlas = coreKernels.Frame.Atlas,
+  Epimetheus = coreKernels.Frame.Epimetheus,
+  Janus = coreKernels.Frame.Janus,
+  Pan = coreKernels.Frame.Pan,
+  Pandora = coreKernels.Frame.Pandora,
+  Prometheus = coreKernels.Frame.Prometheus,
+  Telesto = coreKernels.Frame.Telesto
+}
+
+
+asset.onInitialize(function()
+  openspace.spice.loadKernel(kernels .. "sat415.bsp")
+end)
+
+asset.onDeinitialize(function()
+  openspace.spice.unloadKernel(kernels .. "sat415.bsp")
+end)
+
+asset.export("ID", ID)
+asset.export("Frame", Frame)
+
+
+asset.meta = {
+  Name = "Saturn Spice Kernels",
+  Version = "1.0",
+  Description = "Generic SPICE kernels for Saturn",
+  Author = "OpenSpace Team",
+  URL = "https://naif.jpl.nasa.gov/pub/naif/pds/wgc/kernels/spk/",
+  License = "NASA"
+}
diff --git a/data/assets/scene/solarsystem/planets/saturn/kernels452.asset b/data/assets/scene/solarsystem/planets/saturn/kernels452.asset
new file mode 100644
index 0000000000..769e43e57e
--- /dev/null
+++ b/data/assets/scene/solarsystem/planets/saturn/kernels452.asset
@@ -0,0 +1,91 @@
+local kernels = asset.resource({
+  Name = "Saturn Spice Kernels",
+  Type = "HttpSynchronization",
+  Identifier = "saturn_kernels",
+  Version = 2
+})
+
+
+local ID = {
+  Aegir = "AEGIR",
+  Albiorix = "ALBIORIX",
+  Alvaldi = 665,
+  Angrboda = 655,
+  Bebhionn = "BEBHIONN",
+  Beli = 661,
+  Bergelmir = "BERGELMIR",
+  Bestla = "BESTLA",
+  Eggther = 659,
+  Erriapus = "ERRIAPUS",
+  Farbauti = "FARBAUTI",
+  Fenrir = "FENRIR",
+  Fornjot = "FORNJOT",
+  Geirrod = 666,
+  Gerd = 657,
+  Greip = "GREIP",
+  Gridr = 654,
+  Gunnlod = 662,
+  Hati = "HATI",
+  Hyrrokkin = "HYRROKKIN",
+  Ijiraq = "IJIRAQ",
+  Jarnsaxa = "JARNSAXA",
+  Kari = "KARI",
+  Kiviuq = "KIVIUQ",
+  Loge = "LOGE",
+  Mundilfari = "MUNDILFARI",
+  Narvi = "NARVI",
+  Paaliaq = "PAALIAQ",
+  S2004S7 = 65085,
+  S2004S12 = 65086,
+  S2004S13 = 65087,
+  S2004S17 = 65088,
+  S2004S21 = 65079,
+  S2004S24 = 65070,
+  S2004S26 = 658,
+  S2004S28 = 65077,
+  S2004S29 = 660,
+  S2004S31 = 65067,
+  S2004S34 = 664,
+  S2004S36 = 65081,
+  S2004S37 = 65082,
+  S2004S39 = 65084,
+  S2006S1 = 65089,
+  S2006S3 = 65090,
+  S2007S2 = 65091,
+  S2007S3 = 65092,
+  S2019S01 = 65093,
+  Siarnaq = "SIARNAQ",
+  Skadi = 627,
+  Skathi = "SKATHI",
+  Skoll = "SKOLL",
+  Skrymir = 656,
+  Suttungr = "SUTTUNGR",
+  Surtur = 648,
+  Tarqeq = "TARQEQ",
+  Tarvos = "TARVOS",
+  Thiazzi = 663,
+  Thrymr = "THRYMR",
+  Ymir = "YMIR",
+}
+
+
+asset.onInitialize(function()
+  openspace.spice.loadKernel(kernels .. "sat452.bsp")
+end)
+
+asset.onDeinitialize(function()
+  openspace.spice.unloadKernel(kernels .. "sat452.bsp")
+end)
+
+asset.export("ID", ID)
+
+
+
+asset.meta = {
+  Name = "Saturn Spice Kernels",
+  Version = "1.0",
+  Description = "Generic SPICE kernels for Saturn",
+  Author = "OpenSpace Team",
+  URL = "https://naif.jpl.nasa.gov/pub/naif/pds/wgc/kernels/spk/",
+  License = "NASA"
+}
diff --git a/data/assets/scene/solarsystem/planets/saturn/mimas/mimas.asset b/data/assets/scene/solarsystem/planets/saturn/mimas/mimas.asset
index 09f4794b2f..1acffc38f2 100644
--- a/data/assets/scene/solarsystem/planets/saturn/mimas/mimas.asset
+++ b/data/assets/scene/solarsystem/planets/saturn/mimas/mimas.asset
@@ -1,6 +1,7 @@
 asset.require("./trail")
 local transforms = asset.require("../transforms")
-local kernel = asset.require("../kernels")
+local kernels = asset.require("../kernels")
+local coreKernels = asset.require("spice/core")
 
 
 
@@ -18,13 +19,13 @@ local Mimas = {
   Transform = {
     Translation = {
       Type = "SpiceTranslation",
-      Target = "MIMAS",
-      Observer = "SATURN BARYCENTER"
+      Target = kernels.ID.Mimas,
+      Observer = coreKernels.ID.SaturnBarycenter
     },
     Rotation = {
       Type = "SpiceRotation",
-      SourceFrame = "IAU_MIMAS",
-      DestinationFrame = "GALACTIC"
+      SourceFrame = kernels.Frame.Mimas,
+      DestinationFrame = coreKernels.Frame.Galactic
     }
   },
   Renderable = {
@@ -80,8 +81,6 @@ local MimasLabel = {
 
 
 asset.onInitialize(function()
-  openspace.spice.loadKernel(kernel.sat441)
-
   openspace.addSceneGraphNode(Mimas)
   openspace.addSceneGraphNode(MimasLabel)
 end)
@@ -89,8 +88,6 @@ end)
 asset.onDeinitialize(function()
   openspace.removeSceneGraphNode(MimasLabel)
   openspace.removeSceneGraphNode(Mimas)
-
-  openspace.spice.unloadKernel(kernel.sat441)
 end)
 
 asset.export(Mimas)
diff --git a/data/assets/scene/solarsystem/planets/saturn/mimas/trail.asset b/data/assets/scene/solarsystem/planets/saturn/mimas/trail.asset
index 72c60acddf..077cd6f20a 100644
--- a/data/assets/scene/solarsystem/planets/saturn/mimas/trail.asset
+++ b/data/assets/scene/solarsystem/planets/saturn/mimas/trail.asset
@@ -1,5 +1,6 @@
 local transforms = asset.require("../transforms")
-local kernel = asset.require("../kernels")
+local kernels = asset.require("../kernels")
+local coreKernels = asset.require("spice/core")
 
 
 
@@ -10,8 +11,8 @@ local MimasTrail = {
     Type = "RenderableTrailOrbit",
     Translation = {
       Type = "SpiceTranslation",
-      Target = "MIMAS",
-      Observer = "SATURN BARYCENTER"
+      Target = kernels.ID.Mimas,
+      Observer = coreKernels.ID.SaturnBarycenter
     },
     Color = { 0.5, 0.3, 0.3 },
     Period = 23.0 / 24.0,
@@ -27,15 +28,11 @@ local MimasTrail = {
 
 
 asset.onInitialize(function()
-  openspace.spice.loadKernel(kernel.sat441)
-
   openspace.addSceneGraphNode(MimasTrail)
 end)
 
 asset.onDeinitialize(function()
   openspace.removeSceneGraphNode(MimasTrail)
-
-  openspace.spice.unloadKernel(kernel.sat441)
 end)
 
 asset.export(MimasTrail)
@@ -45,7 +42,7 @@ asset.export(MimasTrail)
 asset.meta = {
   Name = "Mimas Trail",
   Version = "1.1",
-  Description = "Main trail for Mimas. Data from NASA Spice (see base spice asset)",
+  Description = "Main trail for Mimas",
   Author = "OpenSpace Team",
   URL = "http://openspaceproject.com",
   License = "MIT license"
diff --git a/data/assets/scene/solarsystem/planets/saturn/minor/gallic_group.asset b/data/assets/scene/solarsystem/planets/saturn/minor/gallic_group.asset
index a7124b52c9..9e3f76a20f 100644
--- a/data/assets/scene/solarsystem/planets/saturn/minor/gallic_group.asset
+++ b/data/assets/scene/solarsystem/planets/saturn/minor/gallic_group.asset
@@ -1,5 +1,6 @@
 local transforms = asset.require("../transforms")
-local kernel = asset.require("../kernels")
+local kernels452 = asset.require("../kernels452")
+local coreKernels = asset.require("spice/core")
 
 
 
@@ -9,8 +10,8 @@ local Albiorix = {
   Transform = {
     Translation = {
       Type = "SpiceTranslation",
-      Target = "ALBIORIX",
-      Observer = "SATURN BARYCENTER"
+      Target = kernels452.ID.Albiorix,
+      Observer = coreKernels.ID.SaturnBarycenter
     }
   },
   Renderable = {
@@ -40,8 +41,8 @@ local AlbiorixTrail = {
     Type = "RenderableTrailOrbit",
     Translation = {
       Type = "SpiceTranslation",
-      Target = "ALBIORIX",
-      Observer = "SATURN BARYCENTER"
+      Target = kernels452.ID.Albiorix,
+      Observer = coreKernels.ID.SaturnBarycenter
     },
     Color = { 0.5, 0.3, 0.3 },
     Period = 774.58,
@@ -91,8 +92,8 @@ local Bebhionn = {
   Transform = {
     Translation = {
       Type = "SpiceTranslation",
-      Target = "BEBHIONN",
-      Observer = "SATURN BARYCENTER"
+      Target = kernels452.ID.Bebhionn,
+      Observer = coreKernels.ID.SaturnBarycenter
     }
   },
   Renderable = {
@@ -122,8 +123,8 @@ local BebhionnTrail = {
     Type = "RenderableTrailOrbit",
     Translation = {
       Type = "SpiceTranslation",
-      Target = "BEBHIONN",
-      Observer = "SATURN BARYCENTER"
+      Target = kernels452.ID.Bebhionn,
+      Observer = coreKernels.ID.SaturnBarycenter
     },
     Color = { 0.5, 0.3, 0.3 },
     Period = 838.77,
@@ -173,8 +174,8 @@ local Erriapus = {
   Transform = {
     Translation = {
       Type = "SpiceTranslation",
-      Target = "ERRIAPUS",
-      Observer = "SATURN BARYCENTER"
+      Target = kernels452.ID.Erriapus,
+      Observer = coreKernels.ID.SaturnBarycenter
     }
   },
   Renderable = {
@@ -204,8 +205,8 @@ local ErriapusTrail = {
     Type = "RenderableTrailOrbit",
     Translation = {
       Type = "SpiceTranslation",
-      Target = "ERRIAPUS",
-      Observer = "SATURN BARYCENTER"
+      Target = kernels452.ID.Erriapus,
+      Observer = coreKernels.ID.SaturnBarycenter
     },
     Color = { 0.5, 0.3, 0.3 },
     Period = 844.89,
@@ -255,8 +256,8 @@ local Tarvos = {
   Transform = {
     Translation = {
       Type = "SpiceTranslation",
-      Target = "TARVOS",
-      Observer = "SATURN BARYCENTER"
+      Target = kernels452.ID.Tarvos,
+      Observer = coreKernels.ID.SaturnBarycenter
     }
   },
   Renderable = {
@@ -286,8 +287,8 @@ local TarvosTrail = {
     Type = "RenderableTrailOrbit",
     Translation = {
       Type = "SpiceTranslation",
-      Target = "TARVOS",
-      Observer = "SATURN BARYCENTER"
+      Target = kernels452.ID.Tarvos,
+      Observer = coreKernels.ID.SaturnBarycenter
     },
     Color = { 0.5, 0.3, 0.3 },
     Period = 944.23,
@@ -333,9 +334,6 @@ local TarvosLabel = {
 
 
 asset.onInitialize(function()
-  openspace.spice.loadKernel(kernel.sat452)
-
-
   openspace.addSceneGraphNode(Albiorix)
   openspace.addSceneGraphNode(AlbiorixTrail)
   openspace.addSceneGraphNode(AlbiorixLabel)
@@ -369,9 +367,6 @@ asset.onDeinitialize(function()
   openspace.removeSceneGraphNode(AlbiorixLabel)
   openspace.removeSceneGraphNode(AlbiorixTrail)
   openspace.removeSceneGraphNode(Albiorix)
-
-
-  openspace.spice.unloadKernel(kernel.sat452)
 end)
 
 asset.export(Albiorix)
diff --git a/data/assets/scene/solarsystem/planets/saturn/minor/inuit_group.asset b/data/assets/scene/solarsystem/planets/saturn/minor/inuit_group.asset
index b2847dad69..12664f2416 100644
--- a/data/assets/scene/solarsystem/planets/saturn/minor/inuit_group.asset
+++ b/data/assets/scene/solarsystem/planets/saturn/minor/inuit_group.asset
@@ -1,5 +1,6 @@
 local transforms = asset.require("../transforms")
-local kernel = asset.require("../kernels")
+local kernels452 = asset.require("../kernels452")
+local coreKernels = asset.require("spice/core")
 
 
 
@@ -9,8 +10,8 @@ local Kiviuq = {
   Transform = {
     Translation = {
       Type = "SpiceTranslation",
-      Target = "KIVIUQ",
-      Observer = "SATURN BARYCENTER"
+      Target = kernels452.ID.Kiviuq,
+      Observer = coreKernels.ID.SaturnBarycenter
     }
   },
   Renderable = {
@@ -40,8 +41,8 @@ local KiviuqTrail = {
     Type = "RenderableTrailOrbit",
     Translation = {
       Type = "SpiceTranslation",
-      Target = "KIVIUQ",
-      Observer = "SATURN BARYCENTER"
+      Target = kernels452.ID.Kiviuq,
+      Observer = coreKernels.ID.SaturnBarycenter
     },
     Color = { 0.5, 0.3, 0.3 },
     Period = 448.16,
@@ -91,8 +92,8 @@ local Ijiraq = {
   Transform = {
     Translation = {
       Type = "SpiceTranslation",
-      Target = "IJIRAQ",
-      Observer = "SATURN BARYCENTER"
+      Target = kernels452.ID.Ijiraq,
+      Observer = coreKernels.ID.SaturnBarycenter
     }
   },
   Renderable = {
@@ -122,8 +123,8 @@ local IjiraqTrail = {
     Type = "RenderableTrailOrbit",
     Translation = {
       Type = "SpiceTranslation",
-      Target = "IJIRAQ",
-      Observer = "SATURN BARYCENTER"
+      Target = kernels452.ID.Ijiraq,
+      Observer = coreKernels.ID.SaturnBarycenter
     },
     Color = { 0.5, 0.3, 0.3 },
     Period = 451.77,
@@ -173,8 +174,8 @@ local Paaliaq = {
   Transform = {
     Translation = {
       Type = "SpiceTranslation",
-      Target = "PAALIAQ",
-      Observer = "SATURN BARYCENTER"
+      Target = kernels452.ID.Paaliaq,
+      Observer = coreKernels.ID.SaturnBarycenter
     }
   },
   Renderable = {
@@ -204,8 +205,8 @@ local PaaliaqTrail = {
     Type = "RenderableTrailOrbit",
     Translation = {
       Type = "SpiceTranslation",
-      Target = "PAALIAQ",
-      Observer = "SATURN BARYCENTER"
+      Target = kernels452.ID.Paaliaq,
+      Observer = coreKernels.ID.SaturnBarycenter
     },
     Color = { 0.5, 0.3, 0.3 },
     Period = 692.98,
@@ -255,8 +256,8 @@ local Siarnaq = {
   Transform = {
     Translation = {
       Type = "SpiceTranslation",
-      Target = "SIARNAQ",
-      Observer = "SATURN BARYCENTER"
+      Target = kernels452.ID.Siarnaq,
+      Observer = coreKernels.ID.SaturnBarycenter
     }
   },
   Renderable = {
@@ -286,8 +287,8 @@ local SiarnaqTrail = {
     Type = "RenderableTrailOrbit",
     Translation = {
       Type = "SpiceTranslation",
-      Target = "SIARNAQ",
-      Observer = "SATURN BARYCENTER"
+      Target = kernels452.ID.Siarnaq,
+      Observer = coreKernels.ID.SaturnBarycenter
     },
     Color = { 0.5, 0.3, 0.3 },
     Period = 884.88,
@@ -337,8 +338,8 @@ local Tarqeq = {
   Transform = {
     Translation = {
       Type = "SpiceTranslation",
-      Target = "TARQEQ",
-      Observer = "SATURN BARYCENTER"
+      Target = kernels452.ID.Tarqeq,
+      Observer = coreKernels.ID.SaturnBarycenter
     }
   },
   Renderable = {
@@ -368,8 +369,8 @@ local TarqeqTrail = {
     Type = "RenderableTrailOrbit",
     Translation = {
       Type = "SpiceTranslation",
-      Target = "TARQEQ",
-      Observer = "SATURN BARYCENTER"
+      Target = kernels452.ID.Tarqeq,
+      Observer = coreKernels.ID.SaturnBarycenter
     },
     Color = { 0.5, 0.3, 0.3 },
     Period = 894.86,
@@ -419,8 +420,8 @@ local S2004S29 = {
   Transform = {
     Translation = {
       Type = "SpiceTranslation",
-      Target = "660",
-      Observer = "SATURN BARYCENTER"
+      Target = kernels452.ID.S2004S29,
+      Observer = coreKernels.ID.SaturnBarycenter
     }
   },
   Renderable = {
@@ -450,8 +451,8 @@ local S2004S29Trail = {
     Type = "RenderableTrailOrbit",
     Translation = {
       Type = "SpiceTranslation",
-      Target = "660",
-      Observer = "SATURN BARYCENTER"
+      Target = kernels452.ID.S2004S29,
+      Observer = coreKernels.ID.SaturnBarycenter
     },
     Color = { 0.5, 0.3, 0.3 },
     Period = 858.77,
@@ -501,8 +502,8 @@ local S2004S31 = {
   Transform = {
     Translation = {
       Type = "SpiceTranslation",
-      Target = "65067",
-      Observer = "SATURN BARYCENTER"
+      Target = kernels452.ID.S2004S31,
+      Observer = coreKernels.ID.SaturnBarycenter
     }
   },
   Renderable = {
@@ -532,8 +533,8 @@ local S2004S31Trail = {
     Type = "RenderableTrailOrbit",
     Translation = {
       Type = "SpiceTranslation",
-      Target = "65067",
-      Observer = "SATURN BARYCENTER"
+      Target = kernels452.ID.S2004S31,
+      Observer = coreKernels.ID.SaturnBarycenter
     },
     Color = { 0.5, 0.3, 0.3 },
     Period = 853.80,
@@ -583,8 +584,8 @@ local S2019S01 = {
   Transform = {
     Translation = {
       Type = "SpiceTranslation",
-      Target = "65093",
-      Observer = "SATURN BARYCENTER"
+      Target = kernels452.ID.S2019S01,
+      Observer = coreKernels.ID.SaturnBarycenter
     }
   },
   Renderable = {
@@ -614,8 +615,8 @@ local S2019S01Trail = {
     Type = "RenderableTrailOrbit",
     Translation = {
       Type = "SpiceTranslation",
-      Target = "65093",
-      Observer = "SATURN BARYCENTER"
+      Target = kernels452.ID.S2019S01,
+      Observer = coreKernels.ID.SaturnBarycenter
     },
     Color = { 0.5, 0.3, 0.3 },
     Period = 443.78,
@@ -661,9 +662,6 @@ local S2019S01Label = {
 
 
 asset.onInitialize(function()
-  openspace.spice.loadKernel(kernel.sat452)
-
-
   openspace.addSceneGraphNode(Kiviuq)
   openspace.addSceneGraphNode(KiviuqTrail)
   openspace.addSceneGraphNode(KiviuqLabel)
@@ -729,9 +727,6 @@ asset.onDeinitialize(function()
   openspace.removeSceneGraphNode(KiviuqLabel)
   openspace.removeSceneGraphNode(KiviuqTrail)
   openspace.removeSceneGraphNode(Kiviuq)
-
-
-  openspace.spice.unloadKernel(kernel.sat452)
 end)
 
 asset.export(Kiviuq)
diff --git a/data/assets/scene/solarsystem/planets/saturn/minor/norse_group.asset b/data/assets/scene/solarsystem/planets/saturn/minor/norse_group.asset
index d7da7ce2b7..27996bedf8 100644
--- a/data/assets/scene/solarsystem/planets/saturn/minor/norse_group.asset
+++ b/data/assets/scene/solarsystem/planets/saturn/minor/norse_group.asset
@@ -1,5 +1,7 @@
 local transforms = asset.require("../transforms")
 local kernels = asset.require("../kernels")
+local kernels452 = asset.require("../kernels452")
+local coreKernels = asset.require("spice/core")
 
 
 
@@ -9,8 +11,8 @@ local Phoebe = {
   Transform = {
     Translation = {
       Type = "SpiceTranslation",
-      Target = "PHOEBE",
-      Observer = "SATURN BARYCENTER"
+      Target = kernels.ID.Phoebe,
+      Observer = coreKernels.ID.SaturnBarycenter
     }
   },
   Renderable = {
@@ -40,8 +42,8 @@ local PhoebeTrail = {
     Type = "RenderableTrailOrbit",
     Translation = {
       Type = "SpiceTranslation",
-      Target = "PHOEBE",
-      Observer = "SATURN BARYCENTER"
+      Target = kernels.ID.Phoebe,
+      Observer = coreKernels.ID.SaturnBarycenter
     },
     Color = { 0.5, 0.3, 0.3 },
     Period = 545.09,
@@ -91,8 +93,8 @@ local Skathi = {
   Transform = {
     Translation = {
       Type = "SpiceTranslation",
-      Target = "SKATHI",
-      Observer = "SATURN BARYCENTER"
+      Target = kernels452.ID.Skathi,
+      Observer = coreKernels.ID.SaturnBarycenter
     }
   },
   Renderable = {
@@ -122,8 +124,8 @@ local SkathiTrail = {
     Type = "RenderableTrailOrbit",
     Translation = {
       Type = "SpiceTranslation",
-      Target = "SKATHI",
-      Observer = "SATURN BARYCENTER"
+      Target = kernels452.ID.Skathi,
+      Observer = coreKernels.ID.SaturnBarycenter
     },
     Color = { 0.5, 0.3, 0.3 },
     Period = 732.52,
@@ -173,8 +175,8 @@ local S2007S2 = {
   Transform = {
     Translation = {
       Type = "SpiceTranslation",
-      Target = "65091",
-      Observer = "SATURN BARYCENTER"
+      Target = kernels452.ID.S2007S2,
+      Observer = coreKernels.ID.SaturnBarycenter
     }
   },
   Renderable = {
@@ -204,8 +206,8 @@ local S2007S2Trail = {
     Type = "RenderableTrailOrbit",
     Translation = {
       Type = "SpiceTranslation",
-      Target = "65091",
-      Observer = "SATURN BARYCENTER"
+      Target = kernels452.ID.S2007S2,
+      Observer = coreKernels.ID.SaturnBarycenter
     },
     Color = { 0.5, 0.3, 0.3 },
     Period = 792.96,
@@ -255,8 +257,8 @@ local Skoll = {
   Transform = {
     Translation = {
       Type = "SpiceTranslation",
-      Target = "SKOLL",
-      Observer = "SATURN BARYCENTER"
+      Target = kernels452.ID.Skoll,
+      Observer = coreKernels.ID.SaturnBarycenter
     }
   },
   Renderable = {
@@ -286,8 +288,8 @@ local SkollTrail = {
     Type = "RenderableTrailOrbit",
     Translation = {
       Type = "SpiceTranslation",
-      Target = "SKOLL",
-      Observer = "SATURN BARYCENTER"
+      Target = kernels452.ID.Skoll,
+      Observer = coreKernels.ID.SaturnBarycenter
     },
     Color = { 0.5, 0.3, 0.3 },
     Period = 862.37,
@@ -337,8 +339,8 @@ local S2004S13 = {
   Transform = {
     Translation = {
       Type = "SpiceTranslation",
-      Target = "65087",
-      Observer = "SATURN BARYCENTER"
+      Target = kernels452.ID.S2004S13,
+      Observer = coreKernels.ID.SaturnBarycenter
     }
   },
   Renderable = {
@@ -368,8 +370,8 @@ local S2004S13Trail = {
     Type = "RenderableTrailOrbit",
     Translation = {
       Type = "SpiceTranslation",
-      Target = "65087",
-      Observer = "SATURN BARYCENTER"
+      Target = kernels452.ID.S2004S13,
+      Observer = coreKernels.ID.SaturnBarycenter
     },
     Color = { 0.5, 0.3, 0.3 },
     Period = 905.85,
@@ -419,8 +421,8 @@ local Greip = {
   Transform = {
     Translation = {
       Type = "SpiceTranslation",
-      Target = "GREIP",
-      Observer = "SATURN BARYCENTER"
+      Target = kernels452.ID.Greip,
+      Observer = coreKernels.ID.SaturnBarycenter
     }
   },
   Renderable = {
@@ -450,8 +452,8 @@ local GreipTrail = {
     Type = "RenderableTrailOrbit",
     Translation = {
       Type = "SpiceTranslation",
-      Target = "GREIP",
-      Observer = "SATURN BARYCENTER"
+      Target = kernels452.ID.Greip,
+      Observer = coreKernels.ID.SaturnBarycenter
     },
     Color = { 0.5, 0.3, 0.3 },
     Period = 906.56,
@@ -501,8 +503,8 @@ local Hyrrokkin = {
   Transform = {
     Translation = {
       Type = "SpiceTranslation",
-      Target = "HYRROKKIN",
-      Observer = "SATURN BARYCENTER"
+      Target = kernels452.ID.Hyrrokkin,
+      Observer = coreKernels.ID.SaturnBarycenter
     }
   },
   Renderable = {
@@ -532,8 +534,8 @@ local HyrrokkinTrail = {
     Type = "RenderableTrailOrbit",
     Translation = {
       Type = "SpiceTranslation",
-      Target = "HYRROKKIN",
-      Observer = "SATURN BARYCENTER"
+      Target = kernels452.ID.Hyrrokkin,
+      Observer = coreKernels.ID.SaturnBarycenter
     },
     Color = { 0.5, 0.3, 0.3 },
     Period = 914.29,
@@ -583,8 +585,8 @@ local Jarnsaxa = {
   Transform = {
     Translation = {
       Type = "SpiceTranslation",
-      Target = "JARNSAXA",
-      Observer = "SATURN BARYCENTER"
+      Target = kernels452.ID.Jarnsaxa,
+      Observer = coreKernels.ID.SaturnBarycenter
     }
   },
   Renderable = {
@@ -614,8 +616,8 @@ local JarnsaxaTrail = {
     Type = "RenderableTrailOrbit",
     Translation = {
       Type = "SpiceTranslation",
-      Target = "JARNSAXA",
-      Observer = "SATURN BARYCENTER"
+      Target = kernels452.ID.Jarnsaxa,
+      Observer = coreKernels.ID.SaturnBarycenter
     },
     Color = { 0.5, 0.3, 0.3 },
     Period = 943.78,
@@ -665,8 +667,8 @@ local Mundilfari = {
   Transform = {
     Translation = {
       Type = "SpiceTranslation",
-      Target = "MUNDILFARI",
-      Observer = "SATURN BARYCENTER"
+      Target = kernels452.ID.Mundilfari,
+      Observer = coreKernels.ID.SaturnBarycenter
     }
   },
   Renderable = {
@@ -696,8 +698,8 @@ local MundilfariTrail = {
     Type = "RenderableTrailOrbit",
     Translation = {
       Type = "SpiceTranslation",
-      Target = "MUNDILFARI",
-      Observer = "SATURN BARYCENTER"
+      Target = kernels452.ID.Mundilfari,
+      Observer = coreKernels.ID.SaturnBarycenter
     },
     Color = { 0.5, 0.3, 0.3 },
     Period = 956.70,
@@ -747,8 +749,8 @@ local S2006S1 = {
   Transform = {
     Translation = {
       Type = "SpiceTranslation",
-      Target = "65089",
-      Observer = "SATURN BARYCENTER"
+      Target = kernels452.ID.S2006S1,
+      Observer = coreKernels.ID.SaturnBarycenter
     }
   },
   Renderable = {
@@ -778,8 +780,8 @@ local S2006S1Trail = {
     Type = "RenderableTrailOrbit",
     Translation = {
       Type = "SpiceTranslation",
-      Target = "65089",
-      Observer = "SATURN BARYCENTER"
+      Target = kernels452.ID.S2006S1,
+      Observer = coreKernels.ID.SaturnBarycenter
     },
     Color = { 0.5, 0.3, 0.3 },
     Period = 972.41,
@@ -829,8 +831,8 @@ local S2004S17 = {
   Transform = {
     Translation = {
       Type = "SpiceTranslation",
-      Target = "65088",
-      Observer = "SATURN BARYCENTER"
+      Target = kernels452.ID.S2004S17,
+      Observer = coreKernels.ID.SaturnBarycenter
     }
   },
   Renderable = {
@@ -860,8 +862,8 @@ local S2004S17Trail = {
     Type = "RenderableTrailOrbit",
     Translation = {
       Type = "SpiceTranslation",
-      Target = "65088",
-      Observer = "SATURN BARYCENTER"
+      Target = kernels452.ID.S2004S17,
+      Observer = coreKernels.ID.SaturnBarycenter
     },
     Color = { 0.5, 0.3, 0.3 },
     Period = 985.45,
@@ -911,8 +913,8 @@ local Bergelmir = {
   Transform = {
     Translation = {
       Type = "SpiceTranslation",
-      Target = "BERGELMIR",
-      Observer = "SATURN BARYCENTER"
+      Target = kernels452.ID.Bergelmir,
+      Observer = coreKernels.ID.SaturnBarycenter
     }
   },
   Renderable = {
@@ -942,8 +944,8 @@ local BergelmirTrail = {
     Type = "RenderableTrailOrbit",
     Translation = {
       Type = "SpiceTranslation",
-      Target = "BERGELMIR",
-      Observer = "SATURN BARYCENTER"
+      Target = kernels452.ID.Bergelmir,
+      Observer = coreKernels.ID.SaturnBarycenter
     },
     Color = { 0.5, 0.3, 0.3 },
     Period = 985.83,
@@ -993,8 +995,8 @@ local Narvi = {
   Transform = {
     Translation = {
       Type = "SpiceTranslation",
-      Target = "NARVI",
-      Observer = "SATURN BARYCENTER"
+      Target = kernels452.ID.Narvi,
+      Observer = coreKernels.ID.SaturnBarycenter
     }
   },
   Renderable = {
@@ -1024,8 +1026,8 @@ local NarviTrail = {
     Type = "RenderableTrailOrbit",
     Translation = {
       Type = "SpiceTranslation",
-      Target = "NARVI",
-      Observer = "SATURN BARYCENTER"
+      Target = kernels452.ID.Narvi,
+      Observer = coreKernels.ID.SaturnBarycenter
     },
     Color = { 0.5, 0.3, 0.3 },
     Period = 1008.45,
@@ -1075,8 +1077,8 @@ local Suttungr = {
   Transform = {
     Translation = {
       Type = "SpiceTranslation",
-      Target = "SUTTUNGR",
-      Observer = "SATURN BARYCENTER"
+      Target = kernels452.ID.Suttungr,
+      Observer = coreKernels.ID.SaturnBarycenter
     }
   },
   Renderable = {
@@ -1106,8 +1108,8 @@ local SuttungrTrail = {
     Type = "RenderableTrailOrbit",
     Translation = {
       Type = "SpiceTranslation",
-      Target = "SUTTUNGR",
-      Observer = "SATURN BARYCENTER"
+      Target = kernels452.ID.Suttungr,
+      Observer = coreKernels.ID.SaturnBarycenter
     },
     Color = { 0.5, 0.3, 0.3 },
     Period = 1022.82,
@@ -1157,8 +1159,8 @@ local Hati = {
   Transform = {
     Translation = {
       Type = "SpiceTranslation",
-      Target = "HATI",
-      Observer = "SATURN BARYCENTER"
+      Target = kernels452.ID.Hati,
+      Observer = coreKernels.ID.SaturnBarycenter
     }
   },
   Renderable = {
@@ -1188,8 +1190,8 @@ local HatiTrail = {
     Type = "RenderableTrailOrbit",
     Translation = {
       Type = "SpiceTranslation",
-      Target = "HATI",
-      Observer = "SATURN BARYCENTER"
+      Target = kernels452.ID.Hati,
+      Observer = coreKernels.ID.SaturnBarycenter
     },
     Color = { 0.5, 0.3, 0.3 },
     Period = 1033.05,
@@ -1239,8 +1241,8 @@ local S2004S12 = {
   Transform = {
     Translation = {
       Type = "SpiceTranslation",
-      Target = "65086",
-      Observer = "SATURN BARYCENTER"
+      Target = kernels452.ID.S2004S12,
+      Observer = coreKernels.ID.SaturnBarycenter
     }
   },
   Renderable = {
@@ -1270,8 +1272,8 @@ local S2004S12Trail = {
     Type = "RenderableTrailOrbit",
     Translation = {
       Type = "SpiceTranslation",
-      Target = "65086",
-      Observer = "SATURN BARYCENTER"
+      Target = kernels452.ID.S2004S12,
+      Observer = coreKernels.ID.SaturnBarycenter
     },
     Color = { 0.5, 0.3, 0.3 },
     Period = 1048.54,
@@ -1321,8 +1323,8 @@ local Farbauti = {
   Transform = {
     Translation = {
       Type = "SpiceTranslation",
-      Target = "FARBAUTI",
-      Observer = "SATURN BARYCENTER"
+      Target = kernels452.ID.Farbauti,
+      Observer = coreKernels.ID.SaturnBarycenter
     }
   },
   Renderable = {
@@ -1352,8 +1354,8 @@ local FarbautiTrail = {
     Type = "RenderableTrailOrbit",
     Translation = {
       Type = "SpiceTranslation",
-      Target = "FARBAUTI",
-      Observer = "SATURN BARYCENTER"
+      Target = kernels452.ID.Farbauti,
+      Observer = coreKernels.ID.SaturnBarycenter
     },
     Color = { 0.5, 0.3, 0.3 },
     Period = 1054.78,
@@ -1403,8 +1405,8 @@ local Thrymr = {
   Transform = {
     Translation = {
       Type = "SpiceTranslation",
-      Target = "THRYMR",
-      Observer = "SATURN BARYCENTER"
+      Target = kernels452.ID.Thrymr,
+      Observer = coreKernels.ID.SaturnBarycenter
     }
   },
   Renderable = {
@@ -1434,8 +1436,8 @@ local ThrymrTrail = {
     Type = "RenderableTrailOrbit",
     Translation = {
       Type = "SpiceTranslation",
-      Target = "THRYMR",
-      Observer = "SATURN BARYCENTER"
+      Target = kernels452.ID.Thrymr,
+      Observer = coreKernels.ID.SaturnBarycenter
     },
     Color = { 0.5, 0.3, 0.3 },
     Period = 1078.09,
@@ -1485,8 +1487,8 @@ local Aegir = {
   Transform = {
     Translation = {
       Type = "SpiceTranslation",
-      Target = "AEGIR",
-      Observer = "SATURN BARYCENTER"
+      Target = kernels452.ID.Aegir,
+      Observer = coreKernels.ID.SaturnBarycenter
     }
   },
   Renderable = {
@@ -1516,8 +1518,8 @@ local AegirTrail = {
     Type = "RenderableTrailOrbit",
     Translation = {
       Type = "SpiceTranslation",
-      Target = "AEGIR",
-      Observer = "SATURN BARYCENTER"
+      Target = kernels452.ID.Aegir,
+      Observer = coreKernels.ID.SaturnBarycenter
     },
     Color = { 0.5, 0.3, 0.3 },
     Period = 1094.46,
@@ -1567,8 +1569,8 @@ local S2007S3 = {
   Transform = {
     Translation = {
       Type = "SpiceTranslation",
-      Target = "65092",
-      Observer = "SATURN BARYCENTER"
+      Target = kernels452.ID.S2007S3,
+      Observer = coreKernels.ID.SaturnBarycenter
     }
   },
   Renderable = {
@@ -1598,8 +1600,8 @@ local S2007S3Trail = {
     Type = "RenderableTrailOrbit",
     Translation = {
       Type = "SpiceTranslation",
-      Target = "65092",
-      Observer = "SATURN BARYCENTER"
+      Target = kernels452.ID.S2007S3,
+      Observer = coreKernels.ID.SaturnBarycenter
     },
     Color = { 0.5, 0.3, 0.3 },
     Period = 1100.0,
@@ -1649,8 +1651,8 @@ local Bestla = {
   Transform = {
     Translation = {
       Type = "SpiceTranslation",
-      Target = "BESTLA",
-      Observer = "SATURN BARYCENTER"
+      Target = kernels452.ID.Bestla,
+      Observer = coreKernels.ID.SaturnBarycenter
     }
   },
   Renderable = {
@@ -1680,8 +1682,8 @@ local BestlaTrail = {
     Type = "RenderableTrailOrbit",
     Translation = {
       Type = "SpiceTranslation",
-      Target = "BESTLA",
-      Observer = "SATURN BARYCENTER"
+      Target = kernels452.ID.Bestla,
+      Observer = coreKernels.ID.SaturnBarycenter
     },
     Color = { 0.5, 0.3, 0.3 },
     Period = 1101.45,
@@ -1731,8 +1733,8 @@ local S2004S7 = {
   Transform = {
     Translation = {
       Type = "SpiceTranslation",
-      Target = "65085",
-      Observer = "SATURN BARYCENTER"
+      Target = kernels452.ID.S2004S7,
+      Observer = coreKernels.ID.SaturnBarycenter
     }
   },
   Renderable = {
@@ -1762,8 +1764,8 @@ local S2004S7Trail = {
     Type = "RenderableTrailOrbit",
     Translation = {
       Type = "SpiceTranslation",
-      Target = "65085",
-      Observer = "SATURN BARYCENTER"
+      Target = kernels452.ID.S2004S7,
+      Observer = coreKernels.ID.SaturnBarycenter
     },
     Color = { 0.5, 0.3, 0.3 },
     Period = 1101.99,
@@ -1813,8 +1815,8 @@ local S2006S3 = {
   Transform = {
     Translation = {
       Type = "SpiceTranslation",
-      Target = "65090",
-      Observer = "SATURN BARYCENTER"
+      Target = kernels452.ID.S2006S3,
+      Observer = coreKernels.ID.SaturnBarycenter
     }
   },
   Renderable = {
@@ -1844,8 +1846,8 @@ local S2006S3Trail = {
     Type = "RenderableTrailOrbit",
     Translation = {
       Type = "SpiceTranslation",
-      Target = "65090",
-      Observer = "SATURN BARYCENTER"
+      Target = kernels452.ID.S2006S3,
+      Observer = coreKernels.ID.SaturnBarycenter
     },
     Color = { 0.5, 0.3, 0.3 },
     Period = 1142.37,
@@ -1895,8 +1897,8 @@ local Fenrir = {
   Transform = {
     Translation = {
       Type = "SpiceTranslation",
-      Target = "FENRIR",
-      Observer = "SATURN BARYCENTER"
+      Target = kernels452.ID.Fenrir,
+      Observer = coreKernels.ID.SaturnBarycenter
     }
   },
   Renderable = {
@@ -1926,8 +1928,8 @@ local FenrirTrail = {
     Type = "RenderableTrailOrbit",
     Translation = {
       Type = "SpiceTranslation",
-      Target = "FENRIR",
-      Observer = "SATURN BARYCENTER"
+      Target = kernels452.ID.Fenrir,
+      Observer = coreKernels.ID.SaturnBarycenter
     },
     Color = { 0.5, 0.3, 0.3 },
     Period = 1212.53,
@@ -1977,8 +1979,8 @@ local Surtur = {
   Transform = {
     Translation = {
       Type = "SpiceTranslation",
-      Target = "648",
-      Observer = "SATURN BARYCENTER"
+      Target = kernels452.ID.Surtur,
+      Observer = coreKernels.ID.SaturnBarycenter
     }
   },
   Renderable = {
@@ -2008,8 +2010,8 @@ local SurturTrail = {
     Type = "RenderableTrailOrbit",
     Translation = {
       Type = "SpiceTranslation",
-      Target = "648",
-      Observer = "SATURN BARYCENTER"
+      Target = kernels452.ID.Surtur,
+      Observer = coreKernels.ID.SaturnBarycenter
     },
     Color = { 0.5, 0.3, 0.3 },
     Period = 1297.7,
@@ -2059,8 +2061,8 @@ local Kari = {
   Transform = {
     Translation = {
       Type = "SpiceTranslation",
-      Target = "KARI",
-      Observer = "SATURN BARYCENTER"
+      Target = kernels452.ID.Kari,
+      Observer = coreKernels.ID.SaturnBarycenter
     }
   },
   Renderable = {
@@ -2090,8 +2092,8 @@ local KariTrail = {
     Type = "RenderableTrailOrbit",
     Translation = {
       Type = "SpiceTranslation",
-      Target = "KARI",
-      Observer = "SATURN BARYCENTER"
+      Target = kernels452.ID.Kari,
+      Observer = coreKernels.ID.SaturnBarycenter
     },
     Color = { 0.5, 0.3, 0.3 },
     Period = 1245.06,
@@ -2141,8 +2143,8 @@ local Ymir = {
   Transform = {
     Translation = {
       Type = "SpiceTranslation",
-      Target = "YMIR",
-      Observer = "SATURN BARYCENTER"
+      Target = kernels452.ID.Ymir,
+      Observer = coreKernels.ID.SaturnBarycenter
     }
   },
   Renderable = {
@@ -2172,8 +2174,8 @@ local YmirTrail = {
     Type = "RenderableTrailOrbit",
     Translation = {
       Type = "SpiceTranslation",
-      Target = "YMIR",
-      Observer = "SATURN BARYCENTER"
+      Target = kernels452.ID.Ymir,
+      Observer = coreKernels.ID.SaturnBarycenter
     },
     Color = { 0.5, 0.3, 0.3 },
     Period = 1254.15,
@@ -2223,8 +2225,8 @@ local Loge = {
   Transform = {
     Translation = {
       Type = "SpiceTranslation",
-      Target = "LOGE",
-      Observer = "SATURN BARYCENTER"
+      Target = kernels452.ID.Loge,
+      Observer = coreKernels.ID.SaturnBarycenter
     }
   },
   Renderable = {
@@ -2254,8 +2256,8 @@ local LogeTrail = {
     Type = "RenderableTrailOrbit",
     Translation = {
       Type = "SpiceTranslation",
-      Target = "LOGE",
-      Observer = "SATURN BARYCENTER"
+      Target = kernels452.ID.Loge,
+      Observer = coreKernels.ID.SaturnBarycenter
     },
     Color = { 0.5, 0.3, 0.3 },
     Period = 1300.95,
@@ -2305,8 +2307,8 @@ local Fornjot = {
   Transform = {
     Translation = {
       Type = "SpiceTranslation",
-      Target = "FORNJOT",
-      Observer = "SATURN BARYCENTER"
+      Target = kernels452.ID.Fornjot,
+      Observer = coreKernels.ID.SaturnBarycenter
     }
   },
   Renderable = {
@@ -2336,8 +2338,8 @@ local FornjotTrail = {
     Type = "RenderableTrailOrbit",
     Translation = {
       Type = "SpiceTranslation",
-      Target = "FORNJOT",
-      Observer = "SATURN BARYCENTER"
+      Target = kernels452.ID.Fornjot,
+      Observer = coreKernels.ID.SaturnBarycenter
     },
     Color = { 0.5, 0.3, 0.3 },
     Period = 1432.16,
@@ -2387,8 +2389,8 @@ local Skadi = {
   Transform = {
     Translation = {
       Type = "SpiceTranslation",
-      Target = "627",
-      Observer = "SATURN BARYCENTER"
+      Target = kernels452.ID.Skadi,
+      Observer = coreKernels.ID.SaturnBarycenter
     }
   },
   Renderable = {
@@ -2418,8 +2420,8 @@ local SkadiTrail = {
     Type = "RenderableTrailOrbit",
     Translation = {
       Type = "SpiceTranslation",
-      Target = "627",
-      Observer = "SATURN BARYCENTER"
+      Target = kernels452.ID.Skadi,
+      Observer = coreKernels.ID.SaturnBarycenter
     },
     Color = { 0.5, 0.3, 0.3 },
     Period = 728.2,
@@ -2469,8 +2471,8 @@ local Gridr = {
   Transform = {
     Translation = {
       Type = "SpiceTranslation",
-      Target = "654",
-      Observer = "SATURN BARYCENTER"
+      Target = kernels452.ID.Gridr,
+      Observer = coreKernels.ID.SaturnBarycenter
     }
   },
   Renderable = {
@@ -2500,8 +2502,8 @@ local GridrTrail = {
     Type = "RenderableTrailOrbit",
     Translation = {
       Type = "SpiceTranslation",
-      Target = "654",
-      Observer = "SATURN BARYCENTER"
+      Target = kernels452.ID.Gridr,
+      Observer = coreKernels.ID.SaturnBarycenter
     },
     Color = { 0.5, 0.3, 0.3 },
     Period = 990.23,
@@ -2551,8 +2553,8 @@ local Angrboda = {
   Transform = {
     Translation = {
       Type = "SpiceTranslation",
-      Target = "655",
-      Observer = "SATURN BARYCENTER"
+      Target = kernels452.ID.Angrboda,
+      Observer = coreKernels.ID.SaturnBarycenter
     }
   },
   Renderable = {
@@ -2582,8 +2584,8 @@ local AngrbodaTrail = {
     Type = "RenderableTrailOrbit",
     Translation = {
       Type = "SpiceTranslation",
-      Target = "655",
-      Observer = "SATURN BARYCENTER"
+      Target = kernels452.ID.Angrboda,
+      Observer = coreKernels.ID.SaturnBarycenter
     },
     Color = { 0.5, 0.3, 0.3 },
     Period = 1080.4,
@@ -2633,8 +2635,8 @@ local Skrymir = {
   Transform = {
     Translation = {
       Type = "SpiceTranslation",
-      Target = "656",
-      Observer = "SATURN BARYCENTER"
+      Target = kernels452.ID.Skrymir,
+      Observer = coreKernels.ID.SaturnBarycenter
     }
   },
   Renderable = {
@@ -2664,8 +2666,8 @@ local SkrymirTrail = {
     Type = "RenderableTrailOrbit",
     Translation = {
       Type = "SpiceTranslation",
-      Target = "656",
-      Observer = "SATURN BARYCENTER"
+      Target = kernels452.ID.Skrymir,
+      Observer = coreKernels.ID.SaturnBarycenter
     },
     Color = { 0.5, 0.3, 0.3 },
     Period = 1164.3,
@@ -2715,8 +2717,8 @@ local Gerd = {
   Transform = {
     Translation = {
       Type = "SpiceTranslation",
-      Target = "657",
-      Observer = "SATURN BARYCENTER"
+      Target = kernels452.ID.Gerd,
+      Observer = coreKernels.ID.SaturnBarycenter
     }
   },
   Renderable = {
@@ -2746,8 +2748,8 @@ local GerdTrail = {
     Type = "RenderableTrailOrbit",
     Translation = {
       Type = "SpiceTranslation",
-      Target = "657",
-      Observer = "SATURN BARYCENTER"
+      Target = kernels452.ID.Gerd,
+      Observer = coreKernels.ID.SaturnBarycenter
     },
     Color = { 0.5, 0.3, 0.3 },
     Period = 1095.0,
@@ -2797,8 +2799,8 @@ local S2004S26 = {
   Transform = {
     Translation = {
       Type = "SpiceTranslation",
-      Target = "658",
-      Observer = "SATURN BARYCENTER"
+      Target = kernels452.ID.S2004S26,
+      Observer = coreKernels.ID.SaturnBarycenter
     }
   },
   Renderable = {
@@ -2828,8 +2830,8 @@ local S2004S26Trail = {
     Type = "RenderableTrailOrbit",
     Translation = {
       Type = "SpiceTranslation",
-      Target = "658",
-      Observer = "SATURN BARYCENTER"
+      Target = kernels452.ID.S2004S26,
+      Observer = coreKernels.ID.SaturnBarycenter
     },
     Color = { 0.5, 0.3, 0.3 },
     Period = 1624.2,
@@ -2879,8 +2881,8 @@ local Eggther = {
   Transform = {
     Translation = {
       Type = "SpiceTranslation",
-      Target = "659",
-      Observer = "SATURN BARYCENTER"
+      Target = kernels452.ID.Eggther,
+      Observer = coreKernels.ID.SaturnBarycenter
     }
   },
   Renderable = {
@@ -2910,8 +2912,8 @@ local EggtherTrail = {
     Type = "RenderableTrailOrbit",
     Translation = {
       Type = "SpiceTranslation",
-      Target = "659",
-      Observer = "SATURN BARYCENTER"
+      Target = kernels452.ID.Eggther,
+      Observer = coreKernels.ID.SaturnBarycenter
     },
     Color = { 0.5, 0.3, 0.3 },
     Period = 1033.0,
@@ -2961,8 +2963,8 @@ local Beli = {
   Transform = {
     Translation = {
       Type = "SpiceTranslation",
-      Target = "661",
-      Observer = "SATURN BARYCENTER"
+      Target = kernels452.ID.Beli,
+      Observer = coreKernels.ID.SaturnBarycenter
     }
   },
   Renderable = {
@@ -2992,8 +2994,8 @@ local BeliTrail = {
     Type = "RenderableTrailOrbit",
     Translation = {
       Type = "SpiceTranslation",
-      Target = "661",
-      Observer = "SATURN BARYCENTER"
+      Target = kernels452.ID.Beli,
+      Observer = coreKernels.ID.SaturnBarycenter
     },
     Color = { 0.5, 0.3, 0.3 },
     Period = 1084.1,
@@ -3043,8 +3045,8 @@ local Gunnlod = {
   Transform = {
     Translation = {
       Type = "SpiceTranslation",
-      Target = "662",
-      Observer = "SATURN BARYCENTER"
+      Target = kernels452.ID.Gunnlod,
+      Observer = coreKernels.ID.SaturnBarycenter
     }
   },
   Renderable = {
@@ -3074,8 +3076,8 @@ local GunnlodTrail = {
     Type = "RenderableTrailOrbit",
     Translation = {
       Type = "SpiceTranslation",
-      Target = "662",
-      Observer = "SATURN BARYCENTER"
+      Target = kernels452.ID.Gunnlod,
+      Observer = coreKernels.ID.SaturnBarycenter
     },
     Color = { 0.5, 0.3, 0.3 },
     Period = 1175.3,
@@ -3125,8 +3127,8 @@ local Thiazzi = {
   Transform = {
     Translation = {
       Type = "SpiceTranslation",
-      Target = "663",
-      Observer = "SATURN BARYCENTER"
+      Target = kernels452.ID.Thiazzi,
+      Observer = coreKernels.ID.SaturnBarycenter
     }
   },
   Renderable = {
@@ -3156,8 +3158,8 @@ local ThiazziTrail = {
     Type = "RenderableTrailOrbit",
     Translation = {
       Type = "SpiceTranslation",
-      Target = "663",
-      Observer = "SATURN BARYCENTER"
+      Target = kernels452.ID.Thiazzi,
+      Observer = coreKernels.ID.SaturnBarycenter
     },
     Color = { 0.5, 0.3, 0.3 },
     Period = 1361.5,
@@ -3207,8 +3209,8 @@ local S2004S34 = {
   Transform = {
     Translation = {
       Type = "SpiceTranslation",
-      Target = "664",
-      Observer = "SATURN BARYCENTER"
+      Target = kernels452.ID.S2004S34,
+      Observer = coreKernels.ID.SaturnBarycenter
     }
   },
   Renderable = {
@@ -3238,8 +3240,8 @@ local S2004S34Trail = {
     Type = "RenderableTrailOrbit",
     Translation = {
       Type = "SpiceTranslation",
-      Target = "664",
-      Observer = "SATURN BARYCENTER"
+      Target = kernels452.ID.S2004S34,
+      Observer = coreKernels.ID.SaturnBarycenter
     },
     Color = { 0.5, 0.3, 0.3 },
     Period = 1412.5,
@@ -3289,8 +3291,8 @@ local Alvaldi = {
   Transform = {
     Translation = {
       Type = "SpiceTranslation",
-      Target = "665",
-      Observer = "SATURN BARYCENTER"
+      Target = kernels452.ID.Alvaldi,
+      Observer = coreKernels.ID.SaturnBarycenter
     }
   },
   Renderable = {
@@ -3320,8 +3322,8 @@ local AlvaldiTrail = {
     Type = "RenderableTrailOrbit",
     Translation = {
       Type = "SpiceTranslation",
-      Target = "665",
-      Observer = "SATURN BARYCENTER"
+      Target = kernels452.ID.Alvaldi,
+      Observer = coreKernels.ID.SaturnBarycenter
     },
     Color = { 0.5, 0.3, 0.3 },
     Period = 1208.1,
@@ -3371,8 +3373,8 @@ local Geirrod = {
   Transform = {
     Translation = {
       Type = "SpiceTranslation",
-      Target = "666",
-      Observer = "SATURN BARYCENTER"
+      Target = kernels452.ID.Geirrod,
+      Observer = coreKernels.ID.SaturnBarycenter
     }
   },
   Renderable = {
@@ -3402,8 +3404,8 @@ local GeirrodTrail = {
     Type = "RenderableTrailOrbit",
     Translation = {
       Type = "SpiceTranslation",
-      Target = "666",
-      Observer = "SATURN BARYCENTER"
+      Target = kernels452.ID.Geirrod,
+      Observer = coreKernels.ID.SaturnBarycenter
     },
     Color = { 0.5, 0.3, 0.3 },
     Period = 1295.8,
@@ -3453,8 +3455,8 @@ local S2004S28 = {
   Transform = {
     Translation = {
       Type = "SpiceTranslation",
-      Target = "65077",
-      Observer = "SATURN BARYCENTER"
+      Target = kernels452.ID.S2004S28,
+      Observer = coreKernels.ID.SaturnBarycenter
     }
   },
   Renderable = {
@@ -3484,8 +3486,8 @@ local S2004S28Trail = {
     Type = "RenderableTrailOrbit",
     Translation = {
       Type = "SpiceTranslation",
-      Target = "65077",
-      Observer = "SATURN BARYCENTER"
+      Target = kernels452.ID.S2004S28,
+      Observer = coreKernels.ID.SaturnBarycenter
     },
     Color = { 0.5, 0.3, 0.3 },
     Period = 1197.2,
@@ -3535,8 +3537,8 @@ local S2004S21 = {
   Transform = {
     Translation = {
       Type = "SpiceTranslation",
-      Target = "65079",
-      Observer = "SATURN BARYCENTER"
+      Target = kernels452.ID.S2004S21,
+      Observer = coreKernels.ID.SaturnBarycenter
     }
   },
   Renderable = {
@@ -3566,8 +3568,8 @@ local S2004S21Trail = {
     Type = "RenderableTrailOrbit",
     Translation = {
       Type = "SpiceTranslation",
-      Target = "65079",
-      Observer = "SATURN BARYCENTER"
+      Target = kernels452.ID.S2004S21,
+      Observer = coreKernels.ID.SaturnBarycenter
     },
     Color = { 0.5, 0.3, 0.3 },
     Period = 1365.1,
@@ -3617,8 +3619,8 @@ local S2004S36 = {
   Transform = {
     Translation = {
       Type = "SpiceTranslation",
-      Target = "65081",
-      Observer = "SATURN BARYCENTER"
+      Target = kernels452.ID.S2004S36,
+      Observer = coreKernels.ID.SaturnBarycenter
     }
   },
   Renderable = {
@@ -3648,8 +3650,8 @@ local S2004S36Trail = {
     Type = "RenderableTrailOrbit",
     Translation = {
       Type = "SpiceTranslation",
-      Target = "65081",
-      Observer = "SATURN BARYCENTER"
+      Target = kernels452.ID.S2004S36,
+      Observer = coreKernels.ID.SaturnBarycenter
     },
     Color = { 0.5, 0.3, 0.3 },
     Period = 1354.2,
@@ -3699,8 +3701,8 @@ local S2004S37 = {
   Transform = {
     Translation = {
       Type = "SpiceTranslation",
-      Target = "65082",
-      Observer = "SATURN BARYCENTER"
+      Target = kernels452.ID.S2004S37,
+      Observer = coreKernels.ID.SaturnBarycenter
     }
   },
   Renderable = {
@@ -3730,8 +3732,8 @@ local S2004S37Trail = {
     Type = "RenderableTrailOrbit",
     Translation = {
       Type = "SpiceTranslation",
-      Target = "65082",
-      Observer = "SATURN BARYCENTER"
+      Target = kernels452.ID.S2004S37,
+      Observer = coreKernels.ID.SaturnBarycenter
     },
     Color = { 0.5, 0.3, 0.3 },
     Period = 752.88,
@@ -3781,8 +3783,8 @@ local S2004S39 = {
   Transform = {
     Translation = {
       Type = "SpiceTranslation",
-      Target = "65084",
-      Observer = "SATURN BARYCENTER"
+      Target = kernels452.ID.S2004S39,
+      Observer = coreKernels.ID.SaturnBarycenter
     }
   },
   Renderable = {
@@ -3812,8 +3814,8 @@ local S2004S39Trail = {
     Type = "RenderableTrailOrbit",
     Translation = {
       Type = "SpiceTranslation",
-      Target = "65084",
-      Observer = "SATURN BARYCENTER"
+      Target = kernels452.ID.S2004S39,
+      Observer = coreKernels.ID.SaturnBarycenter
     },
     Color = { 0.5, 0.3, 0.3 },
     Period = 1277.5,
@@ -3859,10 +3861,6 @@ local S2004S39Label = {
 
 
 asset.onInitialize(function()
-  openspace.spice.loadKernel(kernels.sat441)
-  openspace.spice.loadKernel(kernels.sat452)
-
-
   openspace.addSceneGraphNode(Phoebe)
   openspace.addSceneGraphNode(PhoebeTrail)
   openspace.addSceneGraphNode(PhoebeLabel)
@@ -4240,9 +4238,6 @@ asset.onDeinitialize(function()
   openspace.removeSceneGraphNode(PhoebeLabel)
   openspace.removeSceneGraphNode(PhoebeTrail)
   openspace.removeSceneGraphNode(Phoebe)
-
-  openspace.spice.unloadKernel(kernels.sat452)
-  openspace.spice.unloadKernel(kernels.sat441)
 end)
 
 asset.export(Phoebe)
diff --git a/data/assets/scene/solarsystem/planets/saturn/minor/other_group.asset b/data/assets/scene/solarsystem/planets/saturn/minor/other_group.asset
index e4119e6abe..623bd34efb 100644
--- a/data/assets/scene/solarsystem/planets/saturn/minor/other_group.asset
+++ b/data/assets/scene/solarsystem/planets/saturn/minor/other_group.asset
@@ -1,5 +1,8 @@
 local transforms = asset.require("../transforms")
 local kernels = asset.require("../kernels")
+local kernels415 = asset.require("../kernels415")
+local kernels452 = asset.require("../kernels452")
+local coreKernels = asset.require("spice/core")
 
 
 
@@ -9,8 +12,8 @@ local Aegaeon = {
   Transform = {
     Translation = {
       Type = "SpiceTranslation",
-      Target = "AEGAEON",
-      Observer = "SATURN BARYCENTER"
+      Target = kernels415.ID.Aegaeon,
+      Observer = coreKernels.ID.SaturnBarycenter
     }
   },
   Renderable = {
@@ -40,8 +43,8 @@ local AegaeonTrail = {
     Type = "RenderableTrailOrbit",
     Translation = {
       Type = "SpiceTranslation",
-      Target = "AEGAEON",
-      Observer = "SATURN BARYCENTER"
+      Target = kernels415.ID.Aegaeon,
+      Observer = coreKernels.ID.SaturnBarycenter
     },
     Color = { 0.5, 0.3, 0.3 },
     Period = 0.80812,
@@ -91,8 +94,8 @@ local Methone = {
   Transform = {
     Translation = {
       Type = "SpiceTranslation",
-      Target = "METHONE",
-      Observer = "SATURN BARYCENTER"
+      Target = kernels415.ID.Methone,
+      Observer = coreKernels.ID.SaturnBarycenter
     }
   },
   Renderable = {
@@ -122,8 +125,8 @@ local MethoneTrail = {
     Type = "RenderableTrailOrbit",
     Translation = {
       Type = "SpiceTranslation",
-      Target = "METHONE",
-      Observer = "SATURN BARYCENTER"
+      Target = kernels415.ID.Methone,
+      Observer = coreKernels.ID.SaturnBarycenter
     },
     Color = { 0.5, 0.3, 0.3 },
     Period = 1.00957,
@@ -173,8 +176,8 @@ local Anthe = {
   Transform = {
     Translation = {
       Type = "SpiceTranslation",
-      Target = "ANTHE",
-      Observer = "SATURN BARYCENTER"
+      Target = kernels415.ID.Anthe,
+      Observer = coreKernels.ID.SaturnBarycenter
     }
   },
   Renderable = {
@@ -204,8 +207,8 @@ local AntheTrail = {
     Type = "RenderableTrailOrbit",
     Translation = {
       Type = "SpiceTranslation",
-      Target = "ANTHE",
-      Observer = "SATURN BARYCENTER"
+      Target = kernels415.ID.Anthe,
+      Observer = coreKernels.ID.SaturnBarycenter
     },
     Color = { 0.5, 0.3, 0.3 },
     Period = 1.05089,
@@ -255,8 +258,8 @@ local Pallene = {
   Transform = {
     Translation = {
       Type = "SpiceTranslation",
-      Target = "PALLENE",
-      Observer = "SATURN BARYCENTER"
+      Target = kernels415.ID.Pallene,
+      Observer = coreKernels.ID.SaturnBarycenter
     }
   },
   Renderable = {
@@ -286,8 +289,8 @@ local PalleneTrail = {
     Type = "RenderableTrailOrbit",
     Translation = {
       Type = "SpiceTranslation",
-      Target = "PALLENE",
-      Observer = "SATURN BARYCENTER"
+      Target = kernels415.ID.Pallene,
+      Observer = coreKernels.ID.SaturnBarycenter
     },
     Color = { 0.5, 0.3, 0.3 },
     Period = 1.370218,
@@ -337,8 +340,8 @@ local Telesto = {
   Transform = {
     Translation = {
       Type = "SpiceTranslation",
-      Target = "TELESTO",
-      Observer = "SATURN BARYCENTER"
+      Target = kernels415.ID.Telesto,
+      Observer = coreKernels.ID.SaturnBarycenter
     }
   },
   Renderable = {
@@ -368,8 +371,8 @@ local TelestoTrail = {
     Type = "RenderableTrailOrbit",
     Translation = {
       Type = "SpiceTranslation",
-      Target = "TELESTO",
-      Observer = "SATURN BARYCENTER"
+      Target = kernels415.ID.Telesto,
+      Observer = coreKernels.ID.SaturnBarycenter
     },
     Color = { 0.5, 0.3, 0.3 },
     Period = 1.887802,
@@ -419,8 +422,8 @@ local Calypso = {
   Transform = {
     Translation = {
       Type = "SpiceTranslation",
-      Target = "CALYPSO",
-      Observer = "SATURN BARYCENTER"
+      Target = kernels.ID.Calypso,
+      Observer = coreKernels.ID.SaturnBarycenter
     }
   },
   Renderable = {
@@ -450,8 +453,8 @@ local CalypsoTrail = {
     Type = "RenderableTrailOrbit",
     Translation = {
       Type = "SpiceTranslation",
-      Target = "CALYPSO",
-      Observer = "SATURN BARYCENTER"
+      Target = kernels.ID.Calypso,
+      Observer = coreKernels.ID.SaturnBarycenter
     },
     Color = { 0.5, 0.3, 0.3 },
     Period = 1.887802,
@@ -501,8 +504,8 @@ local Helene = {
   Transform = {
     Translation = {
       Type = "SpiceTranslation",
-      Target = "HELENE",
-      Observer = "SATURN BARYCENTER"
+      Target = kernels.ID.Helene,
+      Observer = coreKernels.ID.SaturnBarycenter
     }
   },
   Renderable = {
@@ -532,8 +535,8 @@ local HeleneTrail = {
     Type = "RenderableTrailOrbit",
     Translation = {
       Type = "SpiceTranslation",
-      Target = "HELENE",
-      Observer = "SATURN BARYCENTER"
+      Target = kernels.ID.Helene,
+      Observer = coreKernels.ID.SaturnBarycenter
     },
     Color = { 0.5, 0.3, 0.3 },
     Period = 2.736915,
@@ -583,8 +586,8 @@ local Polydeuces = {
   Transform = {
     Translation = {
       Type = "SpiceTranslation",
-      Target = "POLYDEUCES",
-      Observer = "SATURN BARYCENTER"
+      Target = kernels.ID.Polydeuces,
+      Observer = coreKernels.ID.SaturnBarycenter
     }
   },
   Renderable = {
@@ -614,8 +617,8 @@ local PolydeucesTrail = {
     Type = "RenderableTrailOrbit",
     Translation = {
       Type = "SpiceTranslation",
-      Target = "POLYDEUCES",
-      Observer = "SATURN BARYCENTER"
+      Target = kernels.ID.Polydeuces,
+      Observer = coreKernels.ID.SaturnBarycenter
     },
     Color = { 0.5, 0.3, 0.3 },
     Period = 2.736915,
@@ -665,8 +668,8 @@ local S2004S24 = {
   Transform = {
     Translation = {
       Type = "SpiceTranslation",
-      Target = "65070",
-      Observer = "SATURN BARYCENTER"
+      Target = kernels452.ID.S2004S24,
+      Observer = coreKernels.ID.SaturnBarycenter
     }
   },
   Renderable = {
@@ -696,8 +699,8 @@ local S2004S24Trail = {
     Type = "RenderableTrailOrbit",
     Translation = {
       Type = "SpiceTranslation",
-      Target = "65070",
-      Observer = "SATURN BARYCENTER"
+      Target = kernels452.ID.S2004S24,
+      Observer = coreKernels.ID.SaturnBarycenter
     },
     Color = { 0.5, 0.3, 0.3 },
     Period = 1293.85,
@@ -743,11 +746,6 @@ local S2004S24Label = {
 
 
 asset.onInitialize(function()
-  openspace.spice.loadKernel(kernels.sat415)
-  openspace.spice.loadKernel(kernels.sat441)
-  openspace.spice.loadKernel(kernels.sat452)
-
-
   openspace.addSceneGraphNode(Aegaeon)
   openspace.addSceneGraphNode(AegaeonTrail)
   openspace.addSceneGraphNode(AegaeonLabel)
@@ -821,12 +819,6 @@ asset.onDeinitialize(function()
   openspace.removeSceneGraphNode(S2004S24Label)
   openspace.removeSceneGraphNode(S2004S24Trail)
   openspace.removeSceneGraphNode(S2004S24)
-
-
-  openspace.spice.unloadKernel(kernels.sat452)
-  openspace.spice.unloadKernel(kernels.sat441)
-  openspace.spice.unloadKernel(kernels.sat415)
-
 end)
 
 asset.export(Aegaeon)
diff --git a/data/assets/scene/solarsystem/planets/saturn/minor/shepherd_group.asset b/data/assets/scene/solarsystem/planets/saturn/minor/shepherd_group.asset
index cee798aee0..7f689ba830 100644
--- a/data/assets/scene/solarsystem/planets/saturn/minor/shepherd_group.asset
+++ b/data/assets/scene/solarsystem/planets/saturn/minor/shepherd_group.asset
@@ -1,4 +1,6 @@
 local transforms = asset.require("../transforms")
+local kernels415 = asset.require("../kernels415")
+local coreKernels = asset.require("spice/core")
 
 
 
@@ -22,8 +24,8 @@ local Prometheus = {
   Transform = {
     Translation = {
       Type = "SpiceTranslation",
-      Target = "PROMETHEUS",
-      Observer = "SATURN BARYCENTER"
+      Target = kernels415.ID.Prometheus,
+      Observer = coreKernels.ID.SaturnBarycenter
     }
   },
   Renderable = {
@@ -53,8 +55,8 @@ local PrometheusTrail = {
     Type = "RenderableTrailOrbit",
     Translation = {
       Type = "SpiceTranslation",
-      Target = "PROMETHEUS",
-      Observer = "SATURN BARYCENTER"
+      Target = kernels415.ID.Prometheus,
+      Observer = coreKernels.ID.SaturnBarycenter
     },
     Color = { 0.5, 0.3, 0.3 },
     Period = 0.612990038,
@@ -104,8 +106,8 @@ local Pandora = {
   Transform = {
     Translation = {
       Type = "SpiceTranslation",
-      Target = "PANDORA",
-      Observer = "SATURN BARYCENTER"
+      Target = kernels415.ID.Pandora,
+      Observer = coreKernels.ID.SaturnBarycenter
     }
   },
   Renderable = {
@@ -135,8 +137,8 @@ local PandoraTrail = {
     Type = "RenderableTrailOrbit",
     Translation = {
       Type = "SpiceTranslation",
-      Target = "PANDORA",
-      Observer = "SATURN BARYCENTER"
+      Target = kernels415.ID.Pandora,
+      Observer = coreKernels.ID.SaturnBarycenter
     },
     Color = { 0.5, 0.3, 0.3 },
     Period = 0.628504213,
@@ -186,8 +188,8 @@ local Atlas = {
   Transform = {
     Translation = {
       Type = "SpiceTranslation",
-      Target = "ATLAS",
-      Observer = "SATURN BARYCENTER"
+      Target = kernels415.ID.Atlas,
+      Observer = coreKernels.ID.SaturnBarycenter
     }
   },
   Renderable = {
@@ -217,8 +219,8 @@ local AtlasTrail = {
     Type = "RenderableTrailOrbit",
     Translation = {
       Type = "SpiceTranslation",
-      Target = "ATLAS",
-      Observer = "SATURN BARYCENTER"
+      Target = kernels415.ID.Atlas,
+      Observer = coreKernels.ID.SaturnBarycenter
     },
     Color = { 0.5, 0.3, 0.3 },
     Period = 0.6016947883,
@@ -268,8 +270,8 @@ local Janus = {
   Transform = {
     Translation = {
       Type = "SpiceTranslation",
-      Target = "JANUS",
-      Observer = "SATURN BARYCENTER"
+      Target = kernels415.ID.Janus,
+      Observer = coreKernels.ID.SaturnBarycenter
     }
   },
   Renderable = {
@@ -299,8 +301,8 @@ local JanusTrail = {
     Type = "RenderableTrailOrbit",
     Translation = {
       Type = "SpiceTranslation",
-      Target = "JANUS",
-      Observer = "SATURN BARYCENTER"
+      Target = kernels415.ID.Janus,
+      Observer = coreKernels.ID.SaturnBarycenter
     },
     Color = { 0.5, 0.3, 0.3 },
     Period = 0.694660342,
@@ -350,8 +352,8 @@ local Epimetheus = {
   Transform = {
     Translation = {
       Type = "SpiceTranslation",
-      Target = "EPIMETHEUS",
-      Observer = "SATURN BARYCENTER"
+      Target = kernels415.ID.Epimetheus,
+      Observer = coreKernels.ID.SaturnBarycenter
     }
   },
   Renderable = {
@@ -381,8 +383,8 @@ local EpimetheusTrail = {
     Type = "RenderableTrailOrbit",
     Translation = {
       Type = "SpiceTranslation",
-      Target = "EPIMETHEUS",
-      Observer = "SATURN BARYCENTER"
+      Target = kernels415.ID.Epimetheus,
+      Observer = coreKernels.ID.SaturnBarycenter
     },
     Color = { 0.5, 0.3, 0.3 },
     Period = 0.694333517,
@@ -432,8 +434,8 @@ local Daphnis = {
   Transform = {
     Translation = {
       Type = "SpiceTranslation",
-      Target = "DAPHNIS",
-      Observer = "SATURN BARYCENTER"
+      Target = kernels415.ID.Daphnis,
+      Observer = coreKernels.ID.SaturnBarycenter
     }
   },
   Renderable = {
@@ -463,8 +465,8 @@ local DaphnisTrail = {
     Type = "RenderableTrailOrbit",
     Translation = {
       Type = "SpiceTranslation",
-      Target = "DAPHNIS",
-      Observer = "SATURN BARYCENTER"
+      Target = kernels415.ID.Daphnis,
+      Observer = coreKernels.ID.SaturnBarycenter
     },
     Color = { 0.5, 0.3, 0.3 },
     Period = 0.5940798,
@@ -514,8 +516,8 @@ local Pan = {
   Transform = {
     Translation = {
       Type = "SpiceTranslation",
-      Target = "PAN",
-      Observer = "SATURN BARYCENTER"
+      Target = kernels415.ID.Pan,
+      Observer = coreKernels.ID.SaturnBarycenter
     }
   },
   Renderable = {
@@ -545,8 +547,8 @@ local PanTrail = {
     Type = "RenderableTrailOrbit",
     Translation = {
       Type = "SpiceTranslation",
-      Target = "PAN",
-      Observer = "SATURN BARYCENTER"
+      Target = kernels415.ID.Pan,
+      Observer = coreKernels.ID.SaturnBarycenter
     },
     Color = { 0.5, 0.3, 0.3 },
     Period = 0.575050718,
diff --git a/data/assets/scene/solarsystem/planets/saturn/rhea/rhea.asset b/data/assets/scene/solarsystem/planets/saturn/rhea/rhea.asset
index d8f9983b5d..4141b94b55 100644
--- a/data/assets/scene/solarsystem/planets/saturn/rhea/rhea.asset
+++ b/data/assets/scene/solarsystem/planets/saturn/rhea/rhea.asset
@@ -1,6 +1,7 @@
 asset.require("./trail")
 local transforms = asset.require("../transforms")
-local kernel = asset.require("../kernels")
+local kernels = asset.require("../kernels")
+local coreKernels = asset.require("spice/core")
 
 
 
@@ -18,13 +19,13 @@ local Rhea = {
   Transform = {
     Translation = {
       Type = "SpiceTranslation",
-      Target = "RHEA",
-      Observer = "SATURN BARYCENTER"
+      Target = kernels.ID.Rhea,
+      Observer = coreKernels.ID.SaturnBarycenter
     },
     Rotation = {
       Type = "SpiceRotation",
-      SourceFrame = "IAU_RHEA",
-      DestinationFrame = "GALACTIC"
+      SourceFrame = kernels.Frame.Rhea,
+      DestinationFrame = coreKernels.Frame.Galactic
     }
   },
   Renderable = {
@@ -80,8 +81,6 @@ local RheaLabel = {
 
 
 asset.onInitialize(function()
-  openspace.spice.loadKernel(kernel.sat441)
-
   openspace.addSceneGraphNode(Rhea)
   openspace.addSceneGraphNode(RheaLabel)
 end)
@@ -89,8 +88,6 @@ end)
 asset.onDeinitialize(function()
   openspace.removeSceneGraphNode(RheaLabel)
   openspace.removeSceneGraphNode(Rhea)
-
-  openspace.spice.unloadKernel(kernel.sat441)
 end)
 
 asset.export(Rhea)
diff --git a/data/assets/scene/solarsystem/planets/saturn/rhea/trail.asset b/data/assets/scene/solarsystem/planets/saturn/rhea/trail.asset
index 57b15feb7a..1288cb2133 100644
--- a/data/assets/scene/solarsystem/planets/saturn/rhea/trail.asset
+++ b/data/assets/scene/solarsystem/planets/saturn/rhea/trail.asset
@@ -1,5 +1,6 @@
 local transforms = asset.require("../transforms")
-local kernel = asset.require("../kernels")
+local kernels = asset.require("../kernels")
+local coreKernels = asset.require("spice/core")
 
 
 
@@ -10,8 +11,8 @@ local RheaTrail = {
     Type = "RenderableTrailOrbit",
     Translation = {
       Type = "SpiceTranslation",
-      Target = "RHEA",
-      Observer = "SATURN BARYCENTER"
+      Target = kernels.ID.Rhea,
+      Observer = coreKernels.ID.SaturnBarycenter
     },
     Color = { 0.5, 0.3, 0.3 },
     Period = 108.0 / 24.0,
@@ -27,15 +28,11 @@ local RheaTrail = {
 
 
 asset.onInitialize(function()
-  openspace.spice.loadKernel(kernel.sat441)
-
   openspace.addSceneGraphNode(RheaTrail)
 end)
 
 asset.onDeinitialize(function()
   openspace.removeSceneGraphNode(RheaTrail)
-
-  openspace.spice.unloadKernel(kernel.sat441)
 end)
 
 asset.export(RheaTrail)
@@ -45,7 +42,7 @@ asset.export(RheaTrail)
 asset.meta = {
   Name = "Rhea Trail",
   Version = "1.0",
-  Description = "Main trail for Rhea. Data from NASA Spice (see base spice asset)",
+  Description = "Main trail for Rhea",
   Author = "OpenSpace Team",
   URL = "http://openspaceproject.com",
   License = "MIT license"
diff --git a/data/assets/scene/solarsystem/planets/saturn/saturn.asset b/data/assets/scene/solarsystem/planets/saturn/saturn.asset
index 2039e3c9a9..25ab1bcf88 100644
--- a/data/assets/scene/solarsystem/planets/saturn/saturn.asset
+++ b/data/assets/scene/solarsystem/planets/saturn/saturn.asset
@@ -1,6 +1,6 @@
-asset.require("spice/base")
 asset.require("./trail")
 local transforms = asset.require("./transforms")
+local coreKernels = asset.require("spice/core")
 
 
 
@@ -18,13 +18,13 @@ local Saturn = {
   Transform = {
     Translation = {
       Type = "SpiceTranslation",
-      Target = "SATURN",
-      Observer = "SATURN BARYCENTER"
+      Target = coreKernels.ID.Saturn,
+      Observer = coreKernels.ID.SaturnBarycenter
     },
     Rotation = {
       Type = "SpiceRotation",
-      SourceFrame = "IAU_SATURN",
-      DestinationFrame = "GALACTIC"
+      SourceFrame = coreKernels.Frame.Saturn,
+      DestinationFrame = coreKernels.Frame.Galactic
     }
   },
   Renderable = {
diff --git a/data/assets/scene/solarsystem/planets/saturn/tethys/tethys.asset b/data/assets/scene/solarsystem/planets/saturn/tethys/tethys.asset
index 73caeb2422..7212447486 100644
--- a/data/assets/scene/solarsystem/planets/saturn/tethys/tethys.asset
+++ b/data/assets/scene/solarsystem/planets/saturn/tethys/tethys.asset
@@ -1,6 +1,7 @@
 asset.require("./trail")
 local transforms = asset.require("../transforms")
-local kernel = asset.require("../kernels")
+local kernels = asset.require("../kernels")
+local coreKernels = asset.require("spice/core")
 
 
 
@@ -18,13 +19,13 @@ local Tethys = {
   Transform = {
     Translation = {
       Type = "SpiceTranslation",
-      Target = "TETHYS",
-      Observer = "SATURN BARYCENTER"
+      Target = kernels.ID.Tethys,
+      Observer = coreKernels.ID.SaturnBarycenter
     },
     Rotation = {
       Type = "SpiceRotation",
-      SourceFrame = "IAU_TETHYS",
-      DestinationFrame = "GALACTIC"
+      SourceFrame = kernels.Frame.Tethys,
+      DestinationFrame = coreKernels.Frame.Galactic
     }
   },
   Renderable = {
@@ -78,8 +79,6 @@ local TethysLabel = {
 
 
 asset.onInitialize(function()
-  openspace.spice.loadKernel(kernel.sat441)
-
   openspace.addSceneGraphNode(Tethys)
   openspace.addSceneGraphNode(TethysLabel)
 end)
@@ -87,8 +86,6 @@ end)
 asset.onDeinitialize(function()
   openspace.removeSceneGraphNode(TethysLabel)
   openspace.removeSceneGraphNode(Tethys)
-
-  openspace.spice.unloadKernel(kernel.sat441)
 end)
 
 asset.export(Tethys)
diff --git a/data/assets/scene/solarsystem/planets/saturn/tethys/trail.asset b/data/assets/scene/solarsystem/planets/saturn/tethys/trail.asset
index f9253f7bc3..5b8009b6c6 100644
--- a/data/assets/scene/solarsystem/planets/saturn/tethys/trail.asset
+++ b/data/assets/scene/solarsystem/planets/saturn/tethys/trail.asset
@@ -1,5 +1,6 @@
 local transforms = asset.require("../transforms")
-local kernel = asset.require("../kernels")
+local kernels = asset.require("../kernels")
+local coreKernels = asset.require("spice/core")
 
 
 
@@ -10,8 +11,8 @@ local TethysTrail = {
     Type = "RenderableTrailOrbit",
     Translation = {
       Type = "SpiceTranslation",
-      Target = "TETHYS",
-      Observer = "SATURN BARYCENTER"
+      Target = kernels.ID.Tethys,
+      Observer = coreKernels.ID.SaturnBarycenter
     },
     Color = { 0.5, 0.3, 0.3 },
     Period = 45.0 / 24.0,
@@ -27,15 +28,11 @@ local TethysTrail = {
 
 
 asset.onInitialize(function()
-  openspace.spice.loadKernel(kernel.sat441)
-
   openspace.addSceneGraphNode(TethysTrail)
 end)
 
 asset.onDeinitialize(function()
   openspace.removeSceneGraphNode(TethysTrail)
-
-  openspace.spice.unloadKernel(kernel.sat441)
 end)
 
 asset.export(TethysTrail)
@@ -45,7 +42,7 @@ asset.export(TethysTrail)
 asset.meta = {
   Name = "Tethys Trail",
   Version = "1.0",
-  Description = "Main trail for Tethys. Data from NASA Spice (see base spice asset)",
+  Description = "Main trail for Tethys",
   Author = "OpenSpace Team",
   URL = "http://openspaceproject.com",
   License = "MIT license"
diff --git a/data/assets/scene/solarsystem/planets/saturn/titan/titan.asset b/data/assets/scene/solarsystem/planets/saturn/titan/titan.asset
index ae597cbc2a..856893dbbd 100644
--- a/data/assets/scene/solarsystem/planets/saturn/titan/titan.asset
+++ b/data/assets/scene/solarsystem/planets/saturn/titan/titan.asset
@@ -1,6 +1,7 @@
 asset.require("./trail")
 local transforms = asset.require("../transforms")
-local kernel = asset.require("../kernels")
+local kernels = asset.require("../kernels")
+local coreKernels = asset.require("spice/core")
 
 
 
@@ -18,13 +19,13 @@ local Titan = {
   Transform = {
     Translation = {
       Type = "SpiceTranslation",
-      Target = "TITAN",
-      Observer = "SATURN BARYCENTER"
+      Target = kernels.ID.Titan,
+      Observer = coreKernels.ID.SaturnBarycenter
     },
     Rotation = {
       Type = "SpiceRotation",
-      SourceFrame = "IAU_TITAN",
-      DestinationFrame = "GALACTIC"
+      SourceFrame = kernels.Frame.Titan,
+      DestinationFrame = coreKernels.Frame.Galactic
     }
   },
   Renderable = {
@@ -80,8 +81,6 @@ local TitanLabel = {
 
 
 asset.onInitialize(function()
-  openspace.spice.loadKernel(kernel.sat441)
-
   openspace.addSceneGraphNode(Titan)
   openspace.addSceneGraphNode(TitanLabel)
 end)
@@ -89,8 +88,6 @@ end)
 asset.onDeinitialize(function()
   openspace.removeSceneGraphNode(TitanLabel)
   openspace.removeSceneGraphNode(Titan)
-
-  openspace.spice.unloadKernel(kernel.sat441)
 end)
 
 asset.export(Titan)
diff --git a/data/assets/scene/solarsystem/planets/saturn/titan/trail.asset b/data/assets/scene/solarsystem/planets/saturn/titan/trail.asset
index c5568ac4a8..2cf180023f 100644
--- a/data/assets/scene/solarsystem/planets/saturn/titan/trail.asset
+++ b/data/assets/scene/solarsystem/planets/saturn/titan/trail.asset
@@ -1,5 +1,6 @@
 local transforms = asset.require("../transforms")
-local kernel = asset.require("../kernels")
+local kernels = asset.require("../kernels")
+local coreKernels = asset.require("spice/core")
 
 
 
@@ -10,8 +11,8 @@ local TitanTrail = {
     Type = "RenderableTrailOrbit",
     Translation = {
       Type = "SpiceTranslation",
-      Target = "TITAN",
-      Observer = "SATURN BARYCENTER"
+      Target = kernels.ID.Titan,
+      Observer = coreKernels.ID.SaturnBarycenter
     },
     Color = { 0.5, 0.3, 0.3 },
     Period = 16.0,
@@ -27,15 +28,11 @@ local TitanTrail = {
 
 
 asset.onInitialize(function()
-  openspace.spice.loadKernel(kernel.sat441)
-
   openspace.addSceneGraphNode(TitanTrail)
 end)
 
 asset.onDeinitialize(function()
   openspace.removeSceneGraphNode(TitanTrail)
-
-  openspace.spice.unloadKernel(kernel.sat441)
 end)
 
 asset.export(TitanTrail)
@@ -45,7 +42,7 @@ asset.export(TitanTrail)
 asset.meta = {
   Name = "Titan Trail",
   Version = "1.2",
-  Description = "Main trail for Titan. Data from NASA Spice (see base spice asset)",
+  Description = "Main trail for Titan",
   Author = "OpenSpace Team",
   URL = "http://openspaceproject.com",
   License = "MIT license"
diff --git a/data/assets/scene/solarsystem/planets/saturn/trail.asset b/data/assets/scene/solarsystem/planets/saturn/trail.asset
index 5dafbc7db8..a68a4bd96c 100644
--- a/data/assets/scene/solarsystem/planets/saturn/trail.asset
+++ b/data/assets/scene/solarsystem/planets/saturn/trail.asset
@@ -1,4 +1,5 @@
 local transforms = asset.require("scene/solarsystem/sun/transforms")
+local coreKernels = asset.require("spice/core")
 
 
 
@@ -9,8 +10,8 @@ local SaturnTrail = {
     Type = "RenderableTrailOrbit",
     Translation = {
       Type = "SpiceTranslation",
-      Target = "SATURN",
-      Observer = "SSB"
+      Target = coreKernels.ID.Saturn,
+      Observer = coreKernels.ID.SolarSystemBarycenter
     },
     Color = { 0.85, 0.75, 0.51 },
     Period = 10746.94,
@@ -40,7 +41,7 @@ asset.export(SaturnTrail)
 asset.meta = {
   Name = "Saturn Trail",
   Version = "1.1",
-  Description = "Main trail of Saturn. Data from NASA Spice (see base spice asset)",
+  Description = "Main trail of Saturn",
   Author = "OpenSpace Team",
   URL = "http://openspaceproject.com",
   License = "MIT license"
diff --git a/data/assets/scene/solarsystem/planets/saturn/trail_barycenter.asset b/data/assets/scene/solarsystem/planets/saturn/trail_barycenter.asset
index 163618be21..792de0b42b 100644
--- a/data/assets/scene/solarsystem/planets/saturn/trail_barycenter.asset
+++ b/data/assets/scene/solarsystem/planets/saturn/trail_barycenter.asset
@@ -1,4 +1,5 @@
 local transforms = asset.require("scene/solarsystem/sun/transforms")
+local coreKernels = asset.require("spice/core")
 
 
 
@@ -10,8 +11,8 @@ local SaturnBarycenterTrail = {
     Enabled = false,
     Translation = {
       Type = "SpiceTranslation",
-      Target = "SATURN BARYCENTER",
-      Observer = "SSB"
+      Target = coreKernels.ID.SaturnBarycenter,
+      Observer = coreKernels.ID.SolarSystemBarycenter
     },
     Color = { 0.85, 0.75, 0.51 },
     Period = 10746.94,
@@ -41,8 +42,7 @@ asset.export(SaturnBarycenterTrail)
 asset.meta = {
   Name = "Saturn Trail",
   Version = "1.1",
-  Description = [[Trail of Saturn's Barycenter. Data from NASA Spice (see base spice
-    asset)]],
+  Description = "Trail of Saturn's Barycenter",
   Author = "OpenSpace Team",
   URL = "http://openspaceproject.com",
   License = "MIT license"
diff --git a/data/assets/scene/solarsystem/planets/saturn/trail_earth.asset b/data/assets/scene/solarsystem/planets/saturn/trail_earth.asset
index 162419e53d..603c66ca9b 100644
--- a/data/assets/scene/solarsystem/planets/saturn/trail_earth.asset
+++ b/data/assets/scene/solarsystem/planets/saturn/trail_earth.asset
@@ -1,5 +1,5 @@
-asset.require("spice/base")
 local transforms = asset.require("scene/solarsystem/planets/earth/transforms")
+local coreKernels = asset.require("spice/core")
 
 
 
@@ -11,8 +11,8 @@ local SaturnTrailEarth = {
     Enabled = false,
     Translation = {
       Type = "SpiceTranslation",
-      Target = "SATURN",
-      Observer = "EARTH"
+      Target = coreKernels.ID.Saturn,
+      Observer = coreKernels.ID.Earth
     },
     Color = { 1.0, 0.5, 0.2 },
     Period = 224.695,
@@ -42,8 +42,7 @@ asset.export(SaturnTrailEarth)
 asset.meta = {
   Name = "Saturn Trail from Earth",
   Version = "1.1",
-  Description = [[Alternate trail of Saturn, as observed by the Earth rather then the Sun.
-    Data from NASA SPICE (see base spice asset)]],
+  Description = "Alternate trail of Saturn",
   Author = "OpenSpace Team",
   URL = "http://openspaceproject.com",
   License = "MIT license"
diff --git a/data/assets/scene/solarsystem/planets/saturn/transforms.asset b/data/assets/scene/solarsystem/planets/saturn/transforms.asset
index 2543e1eb57..44f74f849c 100644
--- a/data/assets/scene/solarsystem/planets/saturn/transforms.asset
+++ b/data/assets/scene/solarsystem/planets/saturn/transforms.asset
@@ -1,5 +1,5 @@
-asset.require("spice/base")
 local transforms = asset.require("scene/solarsystem/sun/transforms")
+local coreKernels = asset.require("spice/core")
 
 
 
@@ -9,8 +9,8 @@ local SaturnBarycenter = {
   Transform = {
     Translation = {
       Type = "SpiceTranslation",
-      Target = "SATURN BARYCENTER",
-      Observer = "SSB"
+      Target = coreKernels.ID.SaturnBarycenter,
+      Observer = coreKernels.ID.SolarSystemBarycenter
     }
   },
   GUI = {
diff --git a/data/assets/scene/solarsystem/planets/uranus/inner_moons.asset b/data/assets/scene/solarsystem/planets/uranus/inner_moons.asset
index d1cb322f91..ddad1b483a 100644
--- a/data/assets/scene/solarsystem/planets/uranus/inner_moons.asset
+++ b/data/assets/scene/solarsystem/planets/uranus/inner_moons.asset
@@ -1,5 +1,6 @@
 local transforms = asset.require("./transforms")
-local kernel = asset.require("./kernels")
+local kernels115 = asset.require("./kernels115")
+local coreKernels = asset.require("spice/core")
 
 
 
@@ -9,8 +10,8 @@ local Cordelia = {
   Transform = {
     Translation = {
       Type = "SpiceTranslation",
-      Target = "CORDELIA",
-      Observer = "URANUS BARYCENTER"
+      Target = kernels115.ID.Cordelia,
+      Observer = coreKernels.ID.UranusBarycenter
     }
   },
   Renderable = {
@@ -40,8 +41,8 @@ local CordeliaTrail = {
     Type = "RenderableTrailOrbit",
     Translation = {
       Type = "SpiceTranslation",
-      Target = "CORDELIA",
-      Observer = "URANUS BARYCENTER"
+      Target = kernels115.ID.Cordelia,
+      Observer = coreKernels.ID.UranusBarycenter
     },
     Color = { 0.60, 0.65, 0.84 },
     Period = 0.335034,
@@ -91,8 +92,8 @@ local Ophelia = {
   Transform = {
     Translation = {
       Type = "SpiceTranslation",
-      Target = "OPHELIA",
-      Observer = "URANUS BARYCENTER"
+      Target = kernels115.ID.Ophelia,
+      Observer = coreKernels.ID.UranusBarycenter
     }
   },
   Renderable = {
@@ -122,8 +123,8 @@ local OpheliaTrail = {
     Type = "RenderableTrailOrbit",
     Translation = {
       Type = "SpiceTranslation",
-      Target = "OPHELIA",
-      Observer = "URANUS BARYCENTER"
+      Target = kernels115.ID.Ophelia,
+      Observer = coreKernels.ID.UranusBarycenter
     },
     Color = { 0.60, 0.65, 0.84 },
     Period = 0.3764,
@@ -173,8 +174,8 @@ local Bianca = {
   Transform = {
     Translation = {
       Type = "SpiceTranslation",
-      Target = "BIANCA",
-      Observer = "URANUS BARYCENTER"
+      Target = kernels115.ID.Bianca,
+      Observer = coreKernels.ID.UranusBarycenter
     }
   },
   Renderable = {
@@ -204,8 +205,8 @@ local BiancaTrail = {
     Type = "RenderableTrailOrbit",
     Translation = {
       Type = "SpiceTranslation",
-      Target = "BIANCA",
-      Observer = "URANUS BARYCENTER"
+      Target = kernels115.ID.Bianca,
+      Observer = coreKernels.ID.UranusBarycenter
     },
     Color = { 0.60, 0.65, 0.84 },
     Period = 0.434579,
@@ -255,8 +256,8 @@ local Cressida = {
   Transform = {
     Translation = {
       Type = "SpiceTranslation",
-      Target = "CRESSIDA",
-      Observer = "URANUS BARYCENTER"
+      Target = kernels115.ID.Cressida,
+      Observer = coreKernels.ID.UranusBarycenter
     }
   },
   Renderable = {
@@ -286,8 +287,8 @@ local CressidaTrail = {
     Type = "RenderableTrailOrbit",
     Translation = {
       Type = "SpiceTranslation",
-      Target = "CRESSIDA",
-      Observer = "URANUS BARYCENTER"
+      Target = kernels115.ID.Cressida,
+      Observer = coreKernels.ID.UranusBarycenter
     },
     Color = { 0.60, 0.65, 0.84 },
     Period = 0.463570,
@@ -337,8 +338,8 @@ local Desdemona = {
   Transform = {
     Translation = {
       Type = "SpiceTranslation",
-      Target = "DESDEMONA",
-      Observer = "URANUS BARYCENTER"
+      Target = kernels115.ID.Desdemona,
+      Observer = coreKernels.ID.UranusBarycenter
     }
   },
   Renderable = {
@@ -368,8 +369,8 @@ local DesdemonaTrail = {
     Type = "RenderableTrailOrbit",
     Translation = {
       Type = "SpiceTranslation",
-      Target = "DESDEMONA",
-      Observer = "URANUS BARYCENTER"
+      Target = kernels115.ID.Desdemona,
+      Observer = coreKernels.ID.UranusBarycenter
     },
     Color = { 0.60, 0.65, 0.84 },
     Period = 0.473650,
@@ -419,8 +420,8 @@ local Juliet = {
   Transform = {
     Translation = {
       Type = "SpiceTranslation",
-      Target = "JULIET",
-      Observer = "URANUS BARYCENTER"
+      Target = kernels115.ID.Juliet,
+      Observer = coreKernels.ID.UranusBarycenter
     }
   },
   Renderable = {
@@ -450,8 +451,8 @@ local JulietTrail = {
     Type = "RenderableTrailOrbit",
     Translation = {
       Type = "SpiceTranslation",
-      Target = "JULIET",
-      Observer = "URANUS BARYCENTER"
+      Target = kernels115.ID.Juliet,
+      Observer = coreKernels.ID.UranusBarycenter
     },
     Color = { 0.60, 0.65, 0.84 },
     Period = 0.493065,
@@ -501,8 +502,8 @@ local Portia = {
   Transform = {
     Translation = {
       Type = "SpiceTranslation",
-      Target = "PORTIA",
-      Observer = "URANUS BARYCENTER"
+      Target = kernels115.ID.Portia,
+      Observer = coreKernels.ID.UranusBarycenter
     }
   },
   Renderable = {
@@ -532,8 +533,8 @@ local PortiaTrail = {
     Type = "RenderableTrailOrbit",
     Translation = {
       Type = "SpiceTranslation",
-      Target = "PORTIA",
-      Observer = "URANUS BARYCENTER"
+      Target = kernels115.ID.Portia,
+      Observer = coreKernels.ID.UranusBarycenter
     },
     Color = { 0.60, 0.65, 0.84 },
     Period = 0.513196,
@@ -583,8 +584,8 @@ local Rosalind = {
   Transform = {
     Translation = {
       Type = "SpiceTranslation",
-      Target = "ROSALIND",
-      Observer = "URANUS BARYCENTER"
+      Target = kernels115.ID.Rosalind,
+      Observer = coreKernels.ID.UranusBarycenter
     }
   },
   Renderable = {
@@ -614,8 +615,8 @@ local RosalindTrail = {
     Type = "RenderableTrailOrbit",
     Translation = {
       Type = "SpiceTranslation",
-      Target = "ROSALIND",
-      Observer = "URANUS BARYCENTER"
+      Target = kernels115.ID.Rosalind,
+      Observer = coreKernels.ID.UranusBarycenter
     },
     Color = { 0.60, 0.65, 0.84 },
     Period = 0.55846,
@@ -665,8 +666,8 @@ local Cupid = {
   Transform = {
     Translation = {
       Type = "SpiceTranslation",
-      Target = "CUPID",
-      Observer = "URANUS BARYCENTER"
+      Target = kernels115.ID.Cupid,
+      Observer = coreKernels.ID.UranusBarycenter
     }
   },
   Renderable = {
@@ -696,8 +697,8 @@ local CupidTrail = {
     Type = "RenderableTrailOrbit",
     Translation = {
       Type = "SpiceTranslation",
-      Target = "CUPID",
-      Observer = "URANUS BARYCENTER"
+      Target = kernels115.ID.Cupid,
+      Observer = coreKernels.ID.UranusBarycenter
     },
     Color = { 0.60, 0.65, 0.84 },
     Period = 0.618,
@@ -747,8 +748,8 @@ local Belinda = {
   Transform = {
     Translation = {
       Type = "SpiceTranslation",
-      Target = "BELINDA",
-      Observer = "URANUS BARYCENTER"
+      Target = kernels115.ID.Belinda,
+      Observer = coreKernels.ID.UranusBarycenter
     }
   },
   Renderable = {
@@ -778,8 +779,8 @@ local BelindaTrail = {
     Type = "RenderableTrailOrbit",
     Translation = {
       Type = "SpiceTranslation",
-      Target = "BELINDA",
-      Observer = "URANUS BARYCENTER"
+      Target = kernels115.ID.Belinda,
+      Observer = coreKernels.ID.UranusBarycenter
     },
     Color = { 0.60, 0.65, 0.84 },
     Period = 0.623527,
@@ -829,8 +830,8 @@ local Perdita = {
   Transform = {
     Translation = {
       Type = "SpiceTranslation",
-      Target = "PERDITA",
-      Observer = "URANUS BARYCENTER"
+      Target = kernels115.ID.Perdita,
+      Observer = coreKernels.ID.UranusBarycenter
     }
   },
   Renderable = {
@@ -860,8 +861,8 @@ local PerditaTrail = {
     Type = "RenderableTrailOrbit",
     Translation = {
       Type = "SpiceTranslation",
-      Target = "PERDITA",
-      Observer = "URANUS BARYCENTER"
+      Target = kernels115.ID.Perdita,
+      Observer = coreKernels.ID.UranusBarycenter
     },
     Color = { 0.60, 0.65, 0.84 },
     Period = 0.638,
@@ -911,8 +912,8 @@ local Puck = {
   Transform = {
     Translation = {
       Type = "SpiceTranslation",
-      Target = "PUCK",
-      Observer = "URANUS BARYCENTER"
+      Target = kernels115.ID.Puck,
+      Observer = coreKernels.ID.UranusBarycenter
     }
   },
   Renderable = {
@@ -942,8 +943,8 @@ local PuckTrail = {
     Type = "RenderableTrailOrbit",
     Translation = {
       Type = "SpiceTranslation",
-      Target = "PUCK",
-      Observer = "URANUS BARYCENTER"
+      Target = kernels115.ID.Puck,
+      Observer = coreKernels.ID.UranusBarycenter
     },
     Color = { 0.60, 0.65, 0.84 },
     Period = 0.761833,
@@ -993,8 +994,8 @@ local Mab = {
   Transform = {
     Translation = {
       Type = "SpiceTranslation",
-      Target = "MAB",
-      Observer = "URANUS BARYCENTER"
+      Target = kernels115.ID.Mab,
+      Observer = coreKernels.ID.UranusBarycenter
     }
   },
   Renderable = {
@@ -1024,8 +1025,8 @@ local MabTrail = {
     Type = "RenderableTrailOrbit",
     Translation = {
       Type = "SpiceTranslation",
-      Target = "MAB",
-      Observer = "URANUS BARYCENTER"
+      Target = kernels115.ID.Mab,
+      Observer = coreKernels.ID.UranusBarycenter
     },
     Color = { 0.60, 0.65, 0.84 },
     Period = 0.923,
@@ -1070,9 +1071,6 @@ local MabLabel = {
 }
 
 asset.onInitialize(function()
-  openspace.spice.loadKernel(kernel.ura115)
-
-
   openspace.addSceneGraphNode(Cordelia)
   openspace.addSceneGraphNode(CordeliaTrail)
   openspace.addSceneGraphNode(CordeliaLabel)
@@ -1178,9 +1176,6 @@ asset.onDeinitialize(function()
   openspace.removeSceneGraphNode(MabLabel)
   openspace.removeSceneGraphNode(MabTrail)
   openspace.removeSceneGraphNode(Mab)
-
-
-  openspace.spice.unloadKernel(kernel.ura115)
 end)
 
 asset.export(Cordelia)
diff --git a/data/assets/scene/solarsystem/planets/uranus/irregular_prograde_moons.asset b/data/assets/scene/solarsystem/planets/uranus/irregular_prograde_moons.asset
index d48fb2a3d9..3a4ceb9481 100644
--- a/data/assets/scene/solarsystem/planets/uranus/irregular_prograde_moons.asset
+++ b/data/assets/scene/solarsystem/planets/uranus/irregular_prograde_moons.asset
@@ -1,5 +1,6 @@
 local transforms = asset.require("./transforms")
-local kernel = asset.require("./kernels")
+local kernel = asset.require("./kernels116")
+local coreKernels = asset.require("spice/core")
 
 
 
@@ -9,8 +10,8 @@ local Margaret = {
   Transform = {
     Translation = {
       Type = "SpiceTranslation",
-      Target = "MARGARET",
-      Observer = "URANUS BARYCENTER"
+      Target = kernel.ID.Margaret,
+      Observer = coreKernels.ID.UranusBarycenter
     }
   },
   Renderable = {
@@ -40,8 +41,8 @@ local MargaretTrail = {
     Type = "RenderableTrailOrbit",
     Translation = {
       Type = "SpiceTranslation",
-      Target = "MARGARET",
-      Observer = "URANUS BARYCENTER"
+      Target = kernel.ID.Margaret,
+      Observer = coreKernels.ID.UranusBarycenter
     },
     Color = { 0.60, 0.65, 0.84 },
     Period = 1694.8,
@@ -87,9 +88,6 @@ local MargaretLabel = {
 
 
 asset.onInitialize(function()
-  openspace.spice.loadKernel(kernel.ura116)
-
-
   openspace.addSceneGraphNode(Margaret)
   openspace.addSceneGraphNode(MargaretTrail)
   openspace.addSceneGraphNode(MargaretLabel)
@@ -99,9 +97,6 @@ asset.onDeinitialize(function()
   openspace.removeSceneGraphNode(MargaretLabel)
   openspace.removeSceneGraphNode(MargaretTrail)
   openspace.removeSceneGraphNode(Margaret)
-
-
-  openspace.spice.unloadKernel(kernel.ura116)
 end)
 
 asset.export(Margaret)
diff --git a/data/assets/scene/solarsystem/planets/uranus/irregular_retrograde_moons.asset b/data/assets/scene/solarsystem/planets/uranus/irregular_retrograde_moons.asset
index 17a6c962ae..8572b9fec4 100644
--- a/data/assets/scene/solarsystem/planets/uranus/irregular_retrograde_moons.asset
+++ b/data/assets/scene/solarsystem/planets/uranus/irregular_retrograde_moons.asset
@@ -1,5 +1,6 @@
 local transforms = asset.require("./transforms")
-local kernel = asset.require("./kernels")
+local kernel = asset.require("./kernels116")
+local coreKernels = asset.require("spice/core")
 
 
 
@@ -9,8 +10,8 @@ local Francisco = {
   Transform = {
     Translation = {
       Type = "SpiceTranslation",
-      Target = "FRANCISCO",
-      Observer = "URANUS BARYCENTER"
+      Target = kernel.ID.Francisco,
+      Observer = coreKernels.ID.UranusBarycenter
     }
   },
   Renderable = {
@@ -40,8 +41,8 @@ local FranciscoTrail = {
     Type = "RenderableTrailOrbit",
     Translation = {
       Type = "SpiceTranslation",
-      Target = "FRANCISCO",
-      Observer = "URANUS BARYCENTER"
+      Target = kernel.ID.Francisco,
+      Observer = coreKernels.ID.UranusBarycenter
     },
     Color = { 0.60, 0.65, 0.84 },
     Period = 266.56,
@@ -91,8 +92,8 @@ local Caliban = {
   Transform = {
     Translation = {
       Type = "SpiceTranslation",
-      Target = "CALIBAN",
-      Observer = "URANUS BARYCENTER"
+      Target = kernel.ID.Caliban,
+      Observer = coreKernels.ID.UranusBarycenter
     }
   },
   Renderable = {
@@ -122,8 +123,8 @@ local CalibanTrail = {
     Type = "RenderableTrailOrbit",
     Translation = {
       Type = "SpiceTranslation",
-      Target = "CALIBAN",
-      Observer = "URANUS BARYCENTER"
+      Target = kernel.ID.Caliban,
+      Observer = coreKernels.ID.UranusBarycenter
     },
     Color = { 0.60, 0.65, 0.84 },
     Period = 579.50,
@@ -173,8 +174,8 @@ local Stephano = {
   Transform = {
     Translation = {
       Type = "SpiceTranslation",
-      Target = "STEPHANO",
-      Observer = "URANUS BARYCENTER"
+      Target = kernel.ID.Stephano,
+      Observer = coreKernels.ID.UranusBarycenter
     }
   },
   Renderable = {
@@ -204,8 +205,8 @@ local StephanoTrail = {
     Type = "RenderableTrailOrbit",
     Translation = {
       Type = "SpiceTranslation",
-      Target = "STEPHANO",
-      Observer = "URANUS BARYCENTER"
+      Target = kernel.ID.Stephano,
+      Observer = coreKernels.ID.UranusBarycenter
     },
     Color = { 0.60, 0.65, 0.84 },
     Period = 676.50,
@@ -255,8 +256,8 @@ local Trinculo = {
   Transform = {
     Translation = {
       Type = "SpiceTranslation",
-      Target = "TRINCULO",
-      Observer = "URANUS BARYCENTER"
+      Target = kernel.ID.Trinculo,
+      Observer = coreKernels.ID.UranusBarycenter
     }
   },
   Renderable = {
@@ -286,8 +287,8 @@ local TrinculoTrail = {
     Type = "RenderableTrailOrbit",
     Translation = {
       Type = "SpiceTranslation",
-      Target = "TRINCULO",
-      Observer = "URANUS BARYCENTER"
+      Target = kernel.ID.Trinculo,
+      Observer = coreKernels.ID.UranusBarycenter
     },
     Color = { 0.60, 0.65, 0.84 },
     Period = 758.10,
@@ -337,8 +338,8 @@ local Sycorax = {
   Transform = {
     Translation = {
       Type = "SpiceTranslation",
-      Target = "SYCORAX",
-      Observer = "URANUS BARYCENTER"
+      Target = kernel.ID.Sycorax,
+      Observer = coreKernels.ID.UranusBarycenter
     }
   },
   Renderable = {
@@ -368,8 +369,8 @@ local SycoraxTrail = {
     Type = "RenderableTrailOrbit",
     Translation = {
       Type = "SpiceTranslation",
-      Target = "SYCORAX",
-      Observer = "URANUS BARYCENTER"
+      Target = kernel.ID.Sycorax,
+      Observer = coreKernels.ID.UranusBarycenter
     },
     Color = { 0.60, 0.65, 0.84 },
     Period = 1283.4,
@@ -419,8 +420,8 @@ local Prospero = {
   Transform = {
     Translation = {
       Type = "SpiceTranslation",
-      Target = "PROSPERO",
-      Observer = "URANUS BARYCENTER"
+      Target = kernel.ID.Prospero,
+      Observer = coreKernels.ID.UranusBarycenter
     }
   },
   Renderable = {
@@ -450,8 +451,8 @@ local ProsperoTrail = {
     Type = "RenderableTrailOrbit",
     Translation = {
       Type = "SpiceTranslation",
-      Target = "PROSPERO",
-      Observer = "URANUS BARYCENTER"
+      Target = kernel.ID.Prospero,
+      Observer = coreKernels.ID.UranusBarycenter
     },
     Color = { 0.60, 0.65, 0.84 },
     Period = 1992.8,
@@ -501,8 +502,8 @@ local Setebos = {
   Transform = {
     Translation = {
       Type = "SpiceTranslation",
-      Target = "SETEBOS",
-      Observer = "URANUS BARYCENTER"
+      Target = kernel.ID.Setebos,
+      Observer = coreKernels.ID.UranusBarycenter
     }
   },
   Renderable = {
@@ -532,8 +533,8 @@ local SetebosTrail = {
     Type = "RenderableTrailOrbit",
     Translation = {
       Type = "SpiceTranslation",
-      Target = "SETEBOS",
-      Observer = "URANUS BARYCENTER"
+      Target = kernel.ID.Setebos,
+      Observer = coreKernels.ID.UranusBarycenter
     },
     Color = { 0.60, 0.65, 0.84 },
     Period = 2202.3,
@@ -583,8 +584,8 @@ local Ferdinand = {
   Transform = {
     Translation = {
       Type = "SpiceTranslation",
-      Target = "FERDINAND",
-      Observer = "URANUS BARYCENTER"
+      Target = kernel.ID.Ferdinand,
+      Observer = coreKernels.ID.UranusBarycenter
     }
   },
   Renderable = {
@@ -614,8 +615,8 @@ local FerdinandTrail = {
     Type = "RenderableTrailOrbit",
     Translation = {
       Type = "SpiceTranslation",
-      Target = "FERDINAND",
-      Observer = "URANUS BARYCENTER"
+      Target = kernel.ID.Ferdinand,
+      Observer = coreKernels.ID.UranusBarycenter
     },
     Color = { 0.60, 0.65, 0.84 },
     Period = 2823.4,
@@ -661,9 +662,6 @@ local FerdinandLabel = {
 
 
 asset.onInitialize(function()
-  openspace.spice.loadKernel(kernel.ura116)
-
-
   openspace.addSceneGraphNode(Francisco)
   openspace.addSceneGraphNode(FranciscoTrail)
   openspace.addSceneGraphNode(FranciscoLabel)
@@ -729,9 +727,6 @@ asset.onDeinitialize(function()
   openspace.removeSceneGraphNode(FranciscoLabel)
   openspace.removeSceneGraphNode(FranciscoTrail)
   openspace.removeSceneGraphNode(Francisco)
-
-
-  openspace.spice.unloadKernel(kernel.ura116)
 end)
 
 asset.export(Francisco)
diff --git a/data/assets/scene/solarsystem/planets/uranus/kernels.asset b/data/assets/scene/solarsystem/planets/uranus/kernels.asset
index 22ebcd1447..828d2e1a26 100644
--- a/data/assets/scene/solarsystem/planets/uranus/kernels.asset
+++ b/data/assets/scene/solarsystem/planets/uranus/kernels.asset
@@ -1,3 +1,7 @@
+local coreKernels = asset.require("spice/core")
+
+
+
 local kernels = asset.resource({
   Name = "Uranus Spice Kernels",
   Type = "HttpSynchronization",
@@ -6,10 +10,33 @@ local kernels = asset.resource({
 })
 
 
-asset.export("ura111", kernels .. "ura111.bsp")
-asset.export("ura115", kernels .. "ura115.bsp")
-asset.export("ura116", kernels .. "ura116.bsp")
+local ID = {
+  Ariel = "ARIEL",
+  Miranda = "MIRANDA",
+  Oberon = "OBERON",
+  Titania = "TITANIA",
+  Umbriel = "UMBRIEL"
+}
 
+local Frame = {
+  Ariel = coreKernels.Frame.Ariel,
+  Miranda = coreKernels.Frame.Miranda,
+  Oberon = coreKernels.Frame.Oberon,
+  Titania = coreKernels.Frame.Titania,
+  Umbriel = coreKernels.Frame.Umbriel
+}
+
+
+asset.onInitialize(function()
+  openspace.spice.loadKernel(kernels .. "ura111.bsp")
+end)
+
+asset.onDeinitialize(function()
+  openspace.spice.unloadKernel(kernels .. "ura111.bsp")
+end)
+
+asset.export("ID", ID)
+asset.export("Frame", Frame)
 
 
 asset.meta = {
diff --git a/data/assets/scene/solarsystem/planets/uranus/kernels115.asset b/data/assets/scene/solarsystem/planets/uranus/kernels115.asset
new file mode 100644
index 0000000000..813b364797
--- /dev/null
+++ b/data/assets/scene/solarsystem/planets/uranus/kernels115.asset
@@ -0,0 +1,62 @@
+local coreKernels = asset.require("spice/core")
+
+
+
+local kernels = asset.resource({
+  Name = "Uranus Spice Kernels",
+  Type = "HttpSynchronization",
+  Identifier = "uranus_kernels",
+  Version = 2
+})
+
+local ID = {
+  Belinda = "BELINDA",
+  Bianca = "BIANCA",
+  Cordelia = "CORDELIA",
+  Cressida = "CRESSIDA",
+  Cupid = "CUPID",
+  Desdemona = "DESDEMONA",
+  Juliet = "JULIET",
+  Mab = "MAB",
+  Ophelia = "OPHELIA",
+  Perdita = "PERDITA",
+  Portia = "PORTIA",
+  Puck = "PUCK",
+  Rosalind = "ROSALIND",
+}
+
+local Frame = {
+  Belinda = coreKernels.Frame.Belinda,
+  Bianca = coreKernels.Frame.Bianca,
+  Cordelia = coreKernels.Frame.Cordelia,
+  Cressida = coreKernels.Frame.Cressida,
+  Desdemona = coreKernels.Frame.Desdemona,
+  Juliet = coreKernels.Frame.Juliet,
+  Ophelia = coreKernels.Frame.Ophelia,
+  Portia = coreKernels.Frame.Portia,
+  Puck = coreKernels.Frame.Puck,
+  Rosalind = coreKernels.Frame.Rosalind
+}
+
+
+asset.onInitialize(function()
+  openspace.spice.loadKernel(kernels .. "ura115.bsp")
+end)
+
+asset.onDeinitialize(function()
+  openspace.spice.unloadKernel(kernels .. "ura115.bsp")
+end)
+
+asset.export("ID", ID)
+asset.export("Frame", Frame)
+
+
+
+asset.meta = {
+  Name = "Uranus Spice Kernels",
+  Version = "1.0",
+  Description = "Generic SPICE kernels for Uranus",
+  Author = "OpenSpace Team",
+  URL = "https://naif.jpl.nasa.gov/pub/naif/pds/wgc/kernels/spk/",
+  License = "NASA"
+}
diff --git a/data/assets/scene/solarsystem/planets/uranus/kernels116.asset b/data/assets/scene/solarsystem/planets/uranus/kernels116.asset
new file mode 100644
index 0000000000..8ddd406153
--- /dev/null
+++ b/data/assets/scene/solarsystem/planets/uranus/kernels116.asset
@@ -0,0 +1,41 @@
+local kernels = asset.resource({
+  Name = "Uranus Spice Kernels",
+  Type = "HttpSynchronization",
+  Identifier = "uranus_kernels",
+  Version = 2
+})
+
+
+local ID = {
+  Caliban = "CALIBAN",
+  Ferdinand = "FERDINAND",
+  Francisco = "FRANCISCO",
+  Margaret = "MARGARET",
+  Prospero = "PROSPERO",
+  Setebos = "SETEBOS",
+  Stephano = "STEPHANO",
+  Sycorax = "SYCORAX",
+  Trinculo = "TRINCULO",
+}
+
+
+asset.onInitialize(function()
+  openspace.spice.loadKernel(kernels .. "ura116.bsp")
+end)
+
+asset.onDeinitialize(function()
+  openspace.spice.unloadKernel(kernels .. "ura116.bsp")
+end)
+
+asset.export("ID", ID)
+
+
+
+asset.meta = {
+  Name = "Uranus Spice Kernels",
+  Version = "1.0",
+  Description = "Generic SPICE kernels for Uranus",
+  Author = "OpenSpace Team",
+  URL = "https://naif.jpl.nasa.gov/pub/naif/pds/wgc/kernels/spk/",
+  License = "NASA"
+}
diff --git a/data/assets/scene/solarsystem/planets/uranus/major_moons.asset b/data/assets/scene/solarsystem/planets/uranus/major_moons.asset
index 4a4d5f4d46..9243080e63 100644
--- a/data/assets/scene/solarsystem/planets/uranus/major_moons.asset
+++ b/data/assets/scene/solarsystem/planets/uranus/major_moons.asset
@@ -1,5 +1,6 @@
 local transforms = asset.require("./transforms")
-local kernel = asset.require("./kernels")
+local kernels = asset.require("./kernels")
+local coreKernels = asset.require("spice/core")
 
 
 
@@ -9,8 +10,8 @@ local Miranda = {
   Transform = {
     Translation = {
       Type = "SpiceTranslation",
-      Target = "MIRANDA",
-      Observer = "URANUS BARYCENTER"
+      Target = kernels.ID.Miranda,
+      Observer = coreKernels.ID.UranusBarycenter
     }
   },
   Renderable = {
@@ -33,8 +34,8 @@ local MirandaTrail = {
     Type = "RenderableTrailOrbit",
     Translation = {
       Type = "SpiceTranslation",
-      Target = "MIRANDA",
-      Observer = "URANUS BARYCENTER"
+      Target = kernels.ID.Miranda,
+      Observer = coreKernels.ID.UranusBarycenter
     },
     Color = { 0.60, 0.65, 0.84 },
     Period = 1.413479,
@@ -78,8 +79,8 @@ local Ariel = {
   Transform = {
     Translation = {
       Type = "SpiceTranslation",
-      Target = "ARIEL",
-      Observer = "URANUS BARYCENTER"
+      Target = kernels.ID.Ariel,
+      Observer = coreKernels.ID.UranusBarycenter
     }
   },
   Renderable = {
@@ -102,8 +103,8 @@ local ArielTrail = {
     Type = "RenderableTrailOrbit",
     Translation = {
       Type = "SpiceTranslation",
-      Target = "ARIEL",
-      Observer = "URANUS BARYCENTER"
+      Target = kernels.ID.Ariel,
+      Observer = coreKernels.ID.UranusBarycenter
     },
     Color = { 0.60, 0.65, 0.84 },
     Period = 2.520379,
@@ -147,8 +148,8 @@ local Umbriel = {
   Transform = {
     Translation = {
       Type = "SpiceTranslation",
-      Target = "UMBRIEL",
-      Observer = "URANUS BARYCENTER"
+      Target = kernels.ID.Umbriel,
+      Observer = coreKernels.ID.UranusBarycenter
     }
   },
   Renderable = {
@@ -171,8 +172,8 @@ local UmbrielTrail = {
     Type = "RenderableTrailOrbit",
     Translation = {
       Type = "SpiceTranslation",
-      Target = "UMBRIEL",
-      Observer = "URANUS BARYCENTER"
+      Target = kernels.ID.Umbriel,
+      Observer = coreKernels.ID.UranusBarycenter
     },
     Color = { 0.60, 0.65, 0.84 },
     Period = 4.144177,
@@ -216,8 +217,8 @@ local Titania = {
   Transform = {
     Translation = {
       Type = "SpiceTranslation",
-      Target = "TITANIA",
-      Observer = "URANUS BARYCENTER"
+      Target = kernels.ID.Titania,
+      Observer = coreKernels.ID.UranusBarycenter
     }
   },
   Renderable = {
@@ -240,8 +241,8 @@ local TitaniaTrail = {
     Type = "RenderableTrailOrbit",
     Translation = {
       Type = "SpiceTranslation",
-      Target = "TITANIA",
-      Observer = "URANUS BARYCENTER"
+      Target = kernels.ID.Titania,
+      Observer = coreKernels.ID.UranusBarycenter
     },
     Color = { 0.60, 0.65, 0.84 },
     Period = 8.705872,
@@ -285,8 +286,8 @@ local Oberon = {
   Transform = {
     Translation = {
       Type = "SpiceTranslation",
-      Target = "OBERON",
-      Observer = "URANUS BARYCENTER"
+      Target = kernels.ID.Oberon,
+      Observer = coreKernels.ID.UranusBarycenter
     }
   },
   Renderable = {
@@ -309,8 +310,8 @@ local OberonTrail = {
     Type = "RenderableTrailOrbit",
     Translation = {
       Type = "SpiceTranslation",
-      Target = "OBERON",
-      Observer = "URANUS BARYCENTER"
+      Target = kernels.ID.Oberon,
+      Observer = coreKernels.ID.UranusBarycenter
     },
     Color = { 0.60, 0.65, 0.84 },
     Period = 13.463239,
@@ -411,9 +412,6 @@ local UranusMajorMoonsOff = {
 
 
 asset.onInitialize(function()
-  openspace.spice.loadKernel(kernel.ura111)
-
-
   openspace.addSceneGraphNode(Miranda)
   openspace.addSceneGraphNode(MirandaTrail)
   openspace.addSceneGraphNode(MirandaLabel)
@@ -461,9 +459,6 @@ asset.onDeinitialize(function()
   openspace.removeSceneGraphNode(OberonLabel)
   openspace.removeSceneGraphNode(OberonTrail)
   openspace.removeSceneGraphNode(Oberon)
-
-
-  openspace.spice.unloadKernel(kernel.ura111)
 end)
 
 asset.export(Miranda)
diff --git a/data/assets/scene/solarsystem/planets/uranus/trail.asset b/data/assets/scene/solarsystem/planets/uranus/trail.asset
index 218363e6fe..0ab61784b2 100644
--- a/data/assets/scene/solarsystem/planets/uranus/trail.asset
+++ b/data/assets/scene/solarsystem/planets/uranus/trail.asset
@@ -1,4 +1,5 @@
 local transforms = asset.require("scene/solarsystem/sun/transforms")
+local coreKernels = asset.require("spice/core")
 
 
 
@@ -9,8 +10,8 @@ local UranusTrail = {
     Type = "RenderableTrailOrbit",
     Translation = {
       Type = "SpiceTranslation",
-      Target = "URANUS",
-      Observer = "SSB"
+      Target = coreKernels.ID.Uranus,
+      Observer = coreKernels.ID.SolarSystemBarycenter
     },
     Color = { 0.60, 0.95, 1.00 },
     Period = 30588.740,
@@ -40,7 +41,7 @@ asset.export(UranusTrail)
 asset.meta = {
   Name = "Uranus Trail",
   Version = "1.1",
-  Description = "Main trail of Uranus. Data from NASA Spice (see base spice asset)",
+  Description = "Main trail of Uranus",
   Author = "OpenSpace Team",
   URL = "http://openspaceproject.com",
   License = "MIT license"
diff --git a/data/assets/scene/solarsystem/planets/uranus/trail_barycenter.asset b/data/assets/scene/solarsystem/planets/uranus/trail_barycenter.asset
index a636df6a17..0c24192994 100644
--- a/data/assets/scene/solarsystem/planets/uranus/trail_barycenter.asset
+++ b/data/assets/scene/solarsystem/planets/uranus/trail_barycenter.asset
@@ -1,4 +1,5 @@
 local transforms = asset.require("scene/solarsystem/sun/transforms")
+local coreKernels = asset.require("spice/core")
 
 
 
@@ -10,8 +11,8 @@ local UranusBarycenterTrail = {
     Enabled = false,
     Translation = {
       Type = "SpiceTranslation",
-      Target = "URANUS BARYCENTER",
-      Observer = "SSB"
+      Target = coreKernels.ID.UranusBarycenter,
+      Observer = coreKernels.ID.SolarSystemBarycenter
     },
     Color = { 0.60, 0.95, 1.00 },
     Period = 30588.740,
@@ -41,8 +42,7 @@ asset.export(UranusBarycenterTrail)
 asset.meta = {
   Name = "Uranus Trail",
   Version = "1.1",
-  Description = [[Trail of Uranus' Barycenter. Data from NASA Spice (see base spice
-    asset)]],
+  Description = "Trail of Uranus' Barycenter",
   Author = "OpenSpace Team",
   URL = "http://openspaceproject.com",
   License = "MIT license"
diff --git a/data/assets/scene/solarsystem/planets/uranus/trail_earth.asset b/data/assets/scene/solarsystem/planets/uranus/trail_earth.asset
index e18276cff8..a012dc433d 100644
--- a/data/assets/scene/solarsystem/planets/uranus/trail_earth.asset
+++ b/data/assets/scene/solarsystem/planets/uranus/trail_earth.asset
@@ -1,5 +1,5 @@
-asset.require("spice/base")
 local transforms = asset.require("scene/solarsystem/planets/earth/transforms")
+local coreKernels = asset.require("spice/core")
 
 
 
@@ -11,8 +11,8 @@ local UranusTrailEarth = {
     Enabled = false,
     Translation = {
       Type = "SpiceTranslation",
-      Target = "URANUS",
-      Observer = "EARTH"
+      Target = coreKernels.ID.Uranus,
+      Observer = coreKernels.ID.Earth
     },
     Color = { 1.0, 0.5, 0.2 },
     Period = 224.695,
@@ -42,8 +42,7 @@ asset.export(UranusTrailEarth)
 asset.meta = {
   Name = "Uranus Trail from Earth",
   Version = "1.1",
-  Description = [[Alternate trail of Uranus, as observed by the Earth rather then the Sun.
-    Data from NASA SPICE (see base spice asset)]],
+  Description = "Alternate trail of Uranus, as observed by the Earth rather then the Sun",
   Author = "OpenSpace Team",
   URL = "http://openspaceproject.com",
   License = "MIT license"
diff --git a/data/assets/scene/solarsystem/planets/uranus/transforms.asset b/data/assets/scene/solarsystem/planets/uranus/transforms.asset
index 9f9ece5ef3..7973e8edb2 100644
--- a/data/assets/scene/solarsystem/planets/uranus/transforms.asset
+++ b/data/assets/scene/solarsystem/planets/uranus/transforms.asset
@@ -1,5 +1,5 @@
-asset.require("spice/base")
 local transforms = asset.require("scene/solarsystem/sun/transforms")
+local coreKernels = asset.require("spice/core")
 
 
 
@@ -9,8 +9,8 @@ local UranusBarycenter = {
   Transform = {
     Translation = {
       Type = "SpiceTranslation",
-      Target = "URANUS BARYCENTER",
-      Observer = "SSB"
+      Target = coreKernels.ID.UranusBarycenter,
+      Observer = coreKernels.ID.SolarSystemBarycenter
     }
   },
   GUI = {
diff --git a/data/assets/scene/solarsystem/planets/uranus/uranus.asset b/data/assets/scene/solarsystem/planets/uranus/uranus.asset
index e9bc9d07c4..ed3137f11f 100644
--- a/data/assets/scene/solarsystem/planets/uranus/uranus.asset
+++ b/data/assets/scene/solarsystem/planets/uranus/uranus.asset
@@ -1,6 +1,6 @@
-asset.require("spice/base")
 asset.require("./trail")
 local transforms = asset.require("./transforms")
+local coreKernels = asset.require("spice/core")
 
 
 
@@ -10,13 +10,13 @@ local Uranus = {
   Transform = {
     Translation = {
       Type = "SpiceTranslation",
-      Target = "URANUS",
-      Observer = "URANUS BARYCENTER"
+      Target = coreKernels.ID.Uranus,
+      Observer = coreKernels.ID.UranusBarycenter
     },
     Rotation = {
       Type = "SpiceRotation",
-      SourceFrame = "IAU_URANUS",
-      DestinationFrame = "GALACTIC"
+      SourceFrame = coreKernels.Frame.Uranus,
+      DestinationFrame = coreKernels.Frame.Galactic
     }
   },
   Renderable = {
diff --git a/data/assets/scene/solarsystem/planets/venus/trail.asset b/data/assets/scene/solarsystem/planets/venus/trail.asset
index ffd8443417..6f57cec2e6 100644
--- a/data/assets/scene/solarsystem/planets/venus/trail.asset
+++ b/data/assets/scene/solarsystem/planets/venus/trail.asset
@@ -1,5 +1,5 @@
-asset.require("spice/base")
 local transforms = asset.require("scene/solarsystem/sun/transforms")
+local coreKernels = asset.require("spice/core")
 
 
 
@@ -10,8 +10,8 @@ local VenusTrail = {
     Type = "RenderableTrailOrbit",
     Translation = {
       Type = "SpiceTranslation",
-      Target = "VENUS",
-      Observer = "SSB"
+      Target = coreKernels.ID.Venus,
+      Observer = coreKernels.ID.SolarSystemBarycenter
     },
     Color = { 1.0, 0.5, 0.2 },
     Period = 224.695,
@@ -41,8 +41,7 @@ asset.export(VenusTrail)
 asset.meta = {
   Name = "Venus Trail",
   Version = "1.1",
-  Description = [[Trail of Venus as observed by the Sun. Data from NASA Spice (see base
-    spice asset)]],
+  Description = "Trail of Venus as observed by the Sun",
   Author = "OpenSpace Team",
   URL = "http://openspaceproject.com",
   License = "MIT license"
diff --git a/data/assets/scene/solarsystem/planets/venus/trail_barycenter.asset b/data/assets/scene/solarsystem/planets/venus/trail_barycenter.asset
index f777915426..4d681f0ebf 100644
--- a/data/assets/scene/solarsystem/planets/venus/trail_barycenter.asset
+++ b/data/assets/scene/solarsystem/planets/venus/trail_barycenter.asset
@@ -1,5 +1,5 @@
-asset.require("spice/base")
 local transforms = asset.require("scene/solarsystem/sun/transforms")
+local coreKernels = asset.require("spice/core")
 
 
 
@@ -11,8 +11,8 @@ local VenusBarycenterTrail = {
     Enabled = false,
     Translation = {
       Type = "SpiceTranslation",
-      Target = "VENUS BARYCENTER",
-      Observer = "SSB"
+      Target = coreKernels.ID.VenusBarycenter,
+      Observer = coreKernels.ID.SolarSystemBarycenter
     },
     Color = { 1.0, 0.5, 0.2 },
     Period = 224.695,
@@ -42,8 +42,7 @@ asset.export(VenusBarycenterTrail)
 asset.meta = {
   Name = "Venus Trail",
   Version = "1.1",
-  Description = [[Barycenter Trail of Venus as observed by the Sun. Data from NASA Spice
-    (see base spice asset)]],
+  Description = "Barycenter Trail of Venus as observed by the Sun",
   Author = "OpenSpace Team",
   URL = "http://openspaceproject.com",
   License = "MIT license"
diff --git a/data/assets/scene/solarsystem/planets/venus/trail_earth.asset b/data/assets/scene/solarsystem/planets/venus/trail_earth.asset
index 0b305eb592..35fd04ca50 100644
--- a/data/assets/scene/solarsystem/planets/venus/trail_earth.asset
+++ b/data/assets/scene/solarsystem/planets/venus/trail_earth.asset
@@ -1,6 +1,6 @@
-asset.require("spice/base")
 local transforms = asset.require("scene/solarsystem/sun/transforms")
 local earthTransforms = asset.require("scene/solarsystem/planets/earth/transforms")
+local coreKernels = asset.require("spice/core")
 
 
 
@@ -12,8 +12,8 @@ local VenusTrailEarth = {
     Enabled = false,
     Translation = {
       Type = "SpiceTranslation",
-      Target = "VENUS",
-      Observer = "EARTH"
+      Target = coreKernels.ID.Venus,
+      Observer = coreKernels.ID.Earth
     },
     Color = { 1.0, 0.5, 0.2 },
     Period = 224.695,
@@ -43,8 +43,7 @@ asset.export(VenusTrailEarth)
 asset.meta = {
   Name = "Venus Trail from Earth",
   Version = "1.1",
-  Description = [[Trail of Venus as observed by the Earth. Data from NASA SPICE (see base
-    spice asset)]],
+  Description = "Trail of Venus as observed by the Earth",
   Author = "OpenSpace Team",
   URL = "http://openspaceproject.com",
   License = "MIT license"
diff --git a/data/assets/scene/solarsystem/planets/venus/transforms.asset b/data/assets/scene/solarsystem/planets/venus/transforms.asset
index 719509e795..58cf0829d1 100644
--- a/data/assets/scene/solarsystem/planets/venus/transforms.asset
+++ b/data/assets/scene/solarsystem/planets/venus/transforms.asset
@@ -1,5 +1,5 @@
-asset.require("spice/base")
 local transforms = asset.require("scene/solarsystem/sun/transforms")
+local coreKernels = asset.require("spice/core")
 
 
 
@@ -9,8 +9,8 @@ local VenusBarycenter = {
   Transform = {
     Translation = {
       Type = "SpiceTranslation",
-      Target = "VENUS BARYCENTER",
-      Observer = "SSB"
+      Target = coreKernels.ID.VenusBarycenter,
+      Observer = coreKernels.ID.SolarSystemBarycenter
     }
   },
   GUI = {
diff --git a/data/assets/scene/solarsystem/planets/venus/venus.asset b/data/assets/scene/solarsystem/planets/venus/venus.asset
index 43a94091ce..5e517f623e 100644
--- a/data/assets/scene/solarsystem/planets/venus/venus.asset
+++ b/data/assets/scene/solarsystem/planets/venus/venus.asset
@@ -1,6 +1,6 @@
-asset.require("spice/base")
 asset.require("./trail")
 local transforms = asset.require("./transforms")
+local coreKernels = asset.require("spice/core")
 
 
 
@@ -18,13 +18,13 @@ local Venus = {
   Transform = {
     Translation = {
       Type = "SpiceTranslation",
-      Target = "VENUS",
-      Observer = "VENUS BARYCENTER"
+      Target = coreKernels.ID.Venus,
+      Observer = coreKernels.ID.VenusBarycenter
     },
     Rotation = {
       Type = "SpiceRotation",
-      SourceFrame = "IAU_VENUS",
-      DestinationFrame = "GALACTIC"
+      SourceFrame = coreKernels.Frame.Venus,
+      DestinationFrame = coreKernels.Frame.Galactic
     }
   },
   Renderable = {
diff --git a/data/assets/scene/solarsystem/sun/EUV_layer.asset b/data/assets/scene/solarsystem/sun/EUV_layer.asset
index bd42a64afc..768412bd6b 100644
--- a/data/assets/scene/solarsystem/sun/EUV_layer.asset
+++ b/data/assets/scene/solarsystem/sun/EUV_layer.asset
@@ -1,4 +1,3 @@
-asset.require("spice/base")
 local propertyHelper = asset.require("util/property_helper")
 local transforms = asset.require("./transforms")
 
diff --git a/data/assets/scene/solarsystem/sun/glare.asset b/data/assets/scene/solarsystem/sun/glare.asset
index 054f014004..eccb8b60ed 100644
--- a/data/assets/scene/solarsystem/sun/glare.asset
+++ b/data/assets/scene/solarsystem/sun/glare.asset
@@ -1,4 +1,3 @@
-asset.require("spice/base")
 local transforms = asset.require("./transforms")
 
 
diff --git a/data/assets/scene/solarsystem/sun/marker.asset b/data/assets/scene/solarsystem/sun/marker.asset
index 778c3c235c..768ad646a2 100644
--- a/data/assets/scene/solarsystem/sun/marker.asset
+++ b/data/assets/scene/solarsystem/sun/marker.asset
@@ -1,4 +1,3 @@
-asset.require("spice/base")
 local transforms = asset.require("./transforms")
 
 
diff --git a/data/assets/scene/solarsystem/sun/sun.asset b/data/assets/scene/solarsystem/sun/sun.asset
index fb927a495a..e50dc5ace6 100644
--- a/data/assets/scene/solarsystem/sun/sun.asset
+++ b/data/assets/scene/solarsystem/sun/sun.asset
@@ -1,4 +1,3 @@
-asset.require("spice/base")
 local transforms = asset.require("./transforms")
 
 
diff --git a/data/assets/scene/solarsystem/sun/transforms.asset b/data/assets/scene/solarsystem/sun/transforms.asset
index 8c6de68de8..5bd3152753 100644
--- a/data/assets/scene/solarsystem/sun/transforms.asset
+++ b/data/assets/scene/solarsystem/sun/transforms.asset
@@ -1,4 +1,4 @@
-asset.require("spice/base")
+local coreKernels = asset.require("spice/core")
 
 
 
@@ -24,8 +24,8 @@ local SunCenter = {
   Transform = {
     Translation = {
       Type = "SpiceTranslation",
-      Target = "SUN",
-      Observer = "SSB"
+      Target = coreKernels.ID.Sun,
+      Observer = coreKernels.ID.SolarSystemBarycenter
     }
   },
   GUI = {
@@ -43,13 +43,13 @@ local SunIAU = {
   Transform = {
     Translation = {
       Type = "SpiceTranslation",
-      Target = "SUN",
-      Observer = "SSB"
+      Target = coreKernels.ID.Sun,
+      Observer = coreKernels.ID.SolarSystemBarycenter
     },
     Rotation = {
       Type = "SpiceRotation",
-      SourceFrame = "IAU_SUN",
-      DestinationFrame = "GALACTIC"
+      SourceFrame = coreKernels.Frame.Sun,
+      DestinationFrame = coreKernels.Frame.Galactic
     }
   },
   GUI = {
@@ -65,13 +65,13 @@ local SunEclipJ2000 = {
   Transform = {
     Translation = {
       Type = "SpiceTranslation",
-      Target = "SUN",
-      Observer = "SSB"
+      Target = coreKernels.ID.Sun,
+      Observer = coreKernels.ID.SolarSystemBarycenter
     },
     Rotation = {
       Type = "SpiceRotation",
-      SourceFrame = "ECLIPJ2000",
-      DestinationFrame = "GALACTIC"
+      SourceFrame = coreKernels.Frame.EclipJ2000,
+      DestinationFrame = coreKernels.Frame.Galactic
     }
   },
   GUI = {
diff --git a/data/assets/scene/solarsystem/sun/transforms_heliosphere.asset b/data/assets/scene/solarsystem/sun/transforms_heliosphere.asset
index 2ebbf05274..ad293dc48b 100644
--- a/data/assets/scene/solarsystem/sun/transforms_heliosphere.asset
+++ b/data/assets/scene/solarsystem/sun/transforms_heliosphere.asset
@@ -1,8 +1,10 @@
-asset.require("spice/base")
 local sunTransforms = asset.require("scene/solarsystem/sun/transforms")
+local coreKernels = asset.require("spice/core")
 
 
 
+local kernel = asset.resource("kernels/HEEQ180.tf")
+
 local HEEQ180ReferenceFrame = {
   Identifier = "HEEQ180ReferenceFrame",
   -- The HEEQ180 reference frame should have Sun_IAU as parent
@@ -15,8 +17,7 @@ local HEEQ180ReferenceFrame = {
     Rotation = {
       Type = "SpiceRotation",
       SourceFrame = "HEEQ180",
-      DestinationFrame = "GALACTIC",
-      Kernels = asset.resource("kernels/HEEQ180.tf")
+      DestinationFrame = coreKernels.Frame.Galactic
     }
   },
   GUI = {
@@ -28,11 +29,15 @@ local HEEQ180ReferenceFrame = {
 
 
 asset.onInitialize(function()
+  openspace.spice.loadKernel(kernel)
+
   openspace.addSceneGraphNode(HEEQ180ReferenceFrame)
 end)
 
 asset.onDeinitialize(function()
   openspace.removeSceneGraphNode(HEEQ180ReferenceFrame)
+
+  openspace.spice.unloadKernel(kernel)
 end)
 
 asset.export(HEEQ180ReferenceFrame)
diff --git a/data/assets/scene/solarsystem/telescopes/gaia/gaia.asset b/data/assets/scene/solarsystem/telescopes/gaia/gaia.asset
index 2ac0f14efc..de2a916640 100644
--- a/data/assets/scene/solarsystem/telescopes/gaia/gaia.asset
+++ b/data/assets/scene/solarsystem/telescopes/gaia/gaia.asset
@@ -20,7 +20,7 @@ local Gaia = {
       Attached = "Gaia",
       XAxis = { 1.0, 0.0, 0.0 },
       XAxisOrthogonal = true,
-      YAxis = "Sun",
+      YAxis = sun.Sun.Identifier,
       YAxisInvert = true
     },
     Scale = {
diff --git a/data/assets/scene/solarsystem/telescopes/jwst/jwst.asset b/data/assets/scene/solarsystem/telescopes/jwst/jwst.asset
index e0c49a2b6d..c9649f8ed0 100644
--- a/data/assets/scene/solarsystem/telescopes/jwst/jwst.asset
+++ b/data/assets/scene/solarsystem/telescopes/jwst/jwst.asset
@@ -1,4 +1,3 @@
-asset.require("spice/base")
 asset.require("./actions")
 asset.require("./mission")
 local sun = asset.require("scene/solarsystem/sun/sun")
diff --git a/data/assets/scene/solarsystem/telescopes/jwst/kernels.asset b/data/assets/scene/solarsystem/telescopes/jwst/kernels.asset
new file mode 100644
index 0000000000..f9b83d945e
--- /dev/null
+++ b/data/assets/scene/solarsystem/telescopes/jwst/kernels.asset
@@ -0,0 +1,22 @@
+local kernels = asset.resource({
+  Name = "JWST Kernel",
+  Type = "HttpSynchronization",
+  Identifier = "jwst_kernels",
+  Version = 2
+})
+
+
+local ID = {
+  JWST = 170
+}
+
+
+asset.onInitialize(function()
+  openspace.spice.loadKernel(kernels .. "webb.bsp")
+end)
+
+asset.onDeinitialize(function()
+  openspace.spice.unloadKernel(kernels .. "webb.bsp")
+end)
+
+asset.export("ID", ID)
diff --git a/data/assets/scene/solarsystem/telescopes/jwst/targets/hudf.asset b/data/assets/scene/solarsystem/telescopes/jwst/targets/hudf.asset
index 3ff3c7cb1f..3c1a19312f 100644
--- a/data/assets/scene/solarsystem/telescopes/jwst/targets/hudf.asset
+++ b/data/assets/scene/solarsystem/telescopes/jwst/targets/hudf.asset
@@ -26,10 +26,7 @@ local HUDFPosition = {
   GUI = {
     Name = "Hubble Ultra Deep Field Position",
     Path = "/Solar System/Telescopes/JWST/HUDF",
-    Hidden = true,
-    Description = [[
-      Galactic cartesian position for the Hubble Ultra Deep Field
-    ]]
+    Hidden = true
   }
 }
 
diff --git a/data/assets/scene/solarsystem/telescopes/jwst/timelapse.asset b/data/assets/scene/solarsystem/telescopes/jwst/timelapse.asset
index 8ab0ec61c3..9a47d0f50f 100644
--- a/data/assets/scene/solarsystem/telescopes/jwst/timelapse.asset
+++ b/data/assets/scene/solarsystem/telescopes/jwst/timelapse.asset
@@ -1,4 +1,4 @@
-asset.require("spice/base") -- openspace.time.advancedTime depends on SPICE
+asset.require("spice/core") -- openspace.time.advancedTime depends on SPICE
 asset.require("scene/solarsystem/planets/earth/atmosphere")
 
 -- Function to advance a time stamp in the given number of days, hours, minutes and
diff --git a/data/assets/scene/solarsystem/telescopes/jwst/trail.asset b/data/assets/scene/solarsystem/telescopes/jwst/trail.asset
index 070f11312c..83f0d266eb 100644
--- a/data/assets/scene/solarsystem/telescopes/jwst/trail.asset
+++ b/data/assets/scene/solarsystem/telescopes/jwst/trail.asset
@@ -1,16 +1,8 @@
-asset.require("spice/base")
 local transforms = asset.require("scene/solarsystem/planets/earth/lagrange_points/l2")
 local earthTransforms = asset.require("scene/solarsystem/planets/earth/transforms")
 local sunTransforms = asset.require("scene/solarsystem/sun/transforms")
-
-
-
-local kernels = asset.resource({
-  Name = "JWST Kernel",
-  Type = "HttpSynchronization",
-  Identifier = "jwst_kernels",
-  Version = 2
-})
+local kernels = asset.require("./kernels")
+local coreKernels = asset.require("spice/core")
 
 
 local LaunchTime = "2021 DEC 25 12:20:00"
@@ -33,8 +25,8 @@ local JWSTTrailLaunch = {
     Translation = {
       Type = "SpiceTranslation",
       Target = 170, -- JWST
-      Observer = "EARTH",
-      Frame = "IAU_EARTH"
+      Observer = coreKernels.ID.Earth,
+      Frame = coreKernels.Frame.Earth
     },
     Color = { 0.9, 0.9, 0.0 },
     StartTime = LaunchTime,
@@ -64,9 +56,9 @@ local JWSTTrailCruise = {
     Type = "RenderableTrailTrajectory",
     Translation = {
       Type = "SpiceTranslation",
-      Target = 170, -- JWST
-      Observer = "EARTH",
-      Frame = "GALACTIC"
+      Target = kernels.ID.JWST,
+      Observer = coreKernels.ID.Earth,
+      Frame = coreKernels.Frame.Galactic
     },
     Color = { 0.9, 0.9, 0.0 },
     StartTime = DetachTime,
@@ -97,8 +89,8 @@ local JWSTTrailOrbit = {
     Type = "RenderableTrailOrbit",
     Translation = {
       Type = "SpiceTranslation",
-      Target = 170, -- JWST
-      Observer = 392, -- L2
+      Target = kernels.ID.JWST,
+      Observer = transforms.ID.L2,
       Frame = "GALACTIC"
     },
     Color = { 0.863, 0.0, 0.902 },
@@ -128,8 +120,8 @@ local JWSTTrailCoRevOrbit = {
     Type = "RenderableTrailOrbit",
     Translation = {
       Type = "SpiceTranslation",
-      Target = 170, -- JWST
-      Observer = 392, -- L2
+      Target = kernels.ID.JWST,
+      Observer = transforms.ID.L2,
       Frame = "L2_COREV"
     },
     Color = { 1.0, 0.663, 0.157 },
@@ -157,9 +149,9 @@ local JWSTSunTrail = {
     Type = "RenderableTrailOrbit",
     Translation = {
       Type = "SpiceTranslation",
-      Target = 170, -- JWST
-      Observer = "SSB",
-      Frame = "GALACTIC"
+      Target = kernels.ID.JWST,
+      Observer = coreKernels.ID.SolarSystemBarycenter,
+      Frame = coreKernels.Frame.Galactic
     },
     Color = { 0.0, 0.9, 0.9 },
     Period = 365.242,
@@ -176,8 +168,6 @@ local JWSTSunTrail = {
 
 
 asset.onInitialize(function()
-  openspace.spice.loadKernel(kernels .. "webb.bsp")
-
   openspace.addSceneGraphNode(JWSTTrailLaunch)
   openspace.addSceneGraphNode(JWSTTrailCruise)
   openspace.addSceneGraphNode(JWSTTrailOrbit)
@@ -191,8 +181,6 @@ asset.onDeinitialize(function()
   openspace.removeSceneGraphNode(JWSTTrailOrbit)
   openspace.removeSceneGraphNode(JWSTTrailCruise)
   openspace.removeSceneGraphNode(JWSTTrailLaunch)
-
-  openspace.spice.unloadKernel(kernels .. "webb.bsp")
 end)
 
 asset.export(JWSTTrailLaunch)
diff --git a/data/assets/scene/solarsystem/telescopes/jwst/transforms.asset b/data/assets/scene/solarsystem/telescopes/jwst/transforms.asset
index a61ef50bfd..88a48e7a72 100644
--- a/data/assets/scene/solarsystem/telescopes/jwst/transforms.asset
+++ b/data/assets/scene/solarsystem/telescopes/jwst/transforms.asset
@@ -1,18 +1,11 @@
-asset.require("spice/base")
-asset.require("scene/solarsystem/planets/earth/lagrange_points/l2")
 local earthTransforms = asset.require("scene/solarsystem/planets/earth/transforms")
 local sunTransforms = asset.require("scene/solarsystem/sun/transforms")
+local l2 = asset.require("scene/solarsystem/planets/earth/lagrange_points/l2")
+local kernels = asset.require("./kernels")
+local coreKernels = asset.require("spice/core")
 
 
 
-local kernels = asset.resource({
-  Name = "JWST Kernel",
-  Type = "HttpSynchronization",
-  Identifier = "jwst_kernels",
-  Version = 2
-})
-
-
 local LaunchTime = "2021 DEC 25 12:20:00"
 local DetachTime = "2021 DEC 25 12:50:00"
 local L2orbitInsertionTime = "2022 JAN 25 00:00:00"
@@ -27,21 +20,21 @@ local JWSTPosition = {
       Keyframes = {
         [LaunchTime] = {
           Type = "SpiceTranslation",
-          Target = 170, -- JWST
-          Observer = "EARTH",
-          Frame = "IAU_EARTH"
+          Target = kernels.ID.JWST,
+          Observer = coreKernels.ID.Earth,
+          Frame = coreKernels.Frame.Earth
         },
         [DetachTime] = {
           Type = "SpiceTranslation",
-          Target = 170, -- JWST
-          Observer = "EARTH",
-          Frame = "GALACTIC"
+          Target = kernels.ID.JWST,
+          Observer = coreKernels.ID.Earth,
+          Frame = coreKernels.Frame.Galactic
         },
         [L2orbitInsertionTime] = {
           Type = "SpiceTranslation",
-          Target = 170, -- JWST
-          Observer = 392, -- L2
-          Frame = "GALACTIC"
+          Target = kernels.ID.JWST,
+          Observer = l2.ID.L2,
+          Frame = coreKernels.Frame.Galactic
         }
       }
     }
@@ -76,8 +69,6 @@ local JWSTRotation = {
 
 -- Reparent the JWSTPosition node when the data changes
 asset.onInitialize(function()
-  openspace.spice.loadKernel(kernels .. "webb.bsp")
-
   openspace.addSceneGraphNode(JWSTPosition)
   openspace.addSceneGraphNode(JWSTRotation)
 
@@ -112,8 +103,6 @@ asset.onDeinitialize(function()
   openspace.removeSceneGraphNode(JWSTRotation)
   openspace.removeSceneGraphNode(JWSTPosition)
   openspace.scriptScheduler.clear(1)
-
-  openspace.spice.unloadKernel(kernels .. "webb.bsp")
 end)
 
 asset.export(JWSTPosition)
diff --git a/data/assets/spice/base.asset b/data/assets/spice/base.asset
deleted file mode 100644
index 7f651af46f..0000000000
--- a/data/assets/spice/base.asset
+++ /dev/null
@@ -1,42 +0,0 @@
-local pck = asset.resource({
-  Name = "General PCK Kernels",
-  Type = "HttpSynchronization",
-  Identifier = "general_pck",
-  Version = 1
-})
-
-local spk = asset.resource({
-  Name = "General SPK Kernels",
-  Type = "HttpSynchronization",
-  Identifier = "general_spk",
-  Version = 2
-})
-
-
-local kernels = {
-  pck .. "pck00011.tpc",
-  spk .. "de430.bsp"
-}
-
-
-asset.onInitialize(function()
-  openspace.spice.loadKernel(pck .. "pck00011.tpc")
-  openspace.spice.loadKernel(spk .. "de430.bsp")
-end)
-
-asset.onDeinitialize(function()
-  openspace.spice.unloadKernel(spk .. "de430.bsp")
-  openspace.spice.unloadKernel(pck .. "pck00011.tpc")
-end)
-
-
-
-asset.meta = {
-  Name = "SPICE Base",
-  Version = "1.1",
-  Description = [[This asset contains the spice base kernels necessary for any space
-    application. Includes positions for Solar System bodies from 1850 to 2150]],
-  Author = "OpenSpace Team",
-  URL = "https://naif.jpl.nasa.gov/naif/data_generic.html",
-  License = "NASA"
-}
diff --git a/data/assets/spice/core.asset b/data/assets/spice/core.asset
new file mode 100644
index 0000000000..ae6781f675
--- /dev/null
+++ b/data/assets/spice/core.asset
@@ -0,0 +1,191 @@
+local pck = asset.resource({
+  Name = "General PCK Kernels",
+  Type = "HttpSynchronization",
+  Identifier = "general_pck",
+  Version = 1
+})
+
+local spk = asset.resource({
+  Name = "General SPK Kernels",
+  Type = "HttpSynchronization",
+  Identifier = "general_spk",
+  Version = 2
+})
+
+
+-- The following IDs are defined in the de430 kernel provided by the `generic_spk` package
+local ID = {
+  Earth = "EARTH",
+  EarthBarycenter = "EARTH BARYCENTER",
+  Mars = "MARS",
+  MarsBarycenter = "MARS BARYCENTER",
+  Mercury = "MERCURY",
+  MercuryBarycenter = "MERCURY BARYCENTER",
+  Moon = "MOON",
+  Neptune = "NEPTUNE",
+  NeptuneBarycenter = "NEPTUNE BARYCENTER",
+  Jupiter = "JUPITER",
+  JupiterBarycenter = "JUPITER BARYCENTER",
+  Pluto = "PLUTO",
+  PlutoBarycenter = "PLUTO BARYCENTER",
+  Saturn = "SATURN",
+  SaturnBarycenter = "SATURN BARYCENTER",
+  SolarSystemBarycenter = "SOLAR SYSTEM BARYCENTER",
+  Sun = "SUN",
+  Uranus = "URANUS",
+  UranusBarycenter = "URANUS BARYCENTER",
+  Venus = "VENUS",
+  VenusBarycenter = "VENUS BARYCENTER",
+}
+
+-- The following frames are provided as built-in reference frames by SPICE itself. See
+-- https://naif.jpl.nasa.gov/pub/naif/toolkit_docs/C/req/frames.html
+-- Appendix: "Built in" Inertial Reference Frames
+-- Appendix: "Built in" PCK-Based IAU Body-Fixed Reference Frames
+-- Appendix: High Precision Earth Fixed Frames
+-- for more information
+local Frame = {
+  J2000 = "J2000",
+  EclipJ2000 = "ECLIPJ2000",
+  Galactic = "GALACTIC",
+
+  Earth = "IAU_EARTH",
+  ITRF93 = "ITRF93",
+  EarthFixed = "EARTH_FIXED",
+  Mars = "IAU_MARS",
+  Mercury = "IAU_MERCURY",
+  Moon = "IAU_MOON",
+  Neptune = "IAU_NEPTUNE",
+  Jupiter = "IAU_JUPITER",
+  Pluto = "IAU_PLUTO",
+  Saturn = "IAU_SATURN",
+  Sun = "IAU_SUN",
+  Uranus = "IAU_URANUS",
+  Venus = "IAU_VENUS",
+
+  ["52Europa"] = "IAU_52_EUROPA",
+  Adrastea = "IAU_ADRASTEA",
+  Amalthea = "IAU_AMALTHEA",
+  Ananke = "IAU_ANANKE",
+  Ariel = "IAU_ARIEL",
+  Arrokoth = "IAU_ARROKOTH",
+  Atlas = "IAU_ATLAS",
+  Belinda = "IAU_BELINDA",
+  Bennu = "IAU_BENNU",
+  Bianca = "IAU_BIANCA",
+  Borrelly = "IAU_BORRELLY",
+  Callirrhoe = "IAU_CALLIRRHOE",
+  Callisto = "IAU_CALLISTO",
+  Calypso = "IAU_CALYPSO",
+  Carme = "IAU_CARME",
+  Ceres = "IAU_CERES",
+  Chaldene = "IAU_CHALDENE",
+  Charon = "IAU_CHARON",
+  Cordelia = "IAU_CORDELIA",
+  Cressida = "IAU_CRESSIDA",
+  Davida = "IAU_DAVIDA",
+  Deimos = "IAU_DEIMOS",
+  Desdemona = "IAU_DESDEMONA",
+  Despina = "IAU_DESPINA",
+  Didymos = "IAU_DIDYMOS",
+  Dimorphos = "IAU_DIMORPHOS",
+  Dione = "IAU_DIONE",
+  DonaldJohanson = "IAU_DONALDJOHANSON",
+  Elara = "IAU_ELARA",
+  Enceladus = "IAU_ENCELADUS",
+  Epimetheus = "IAU_EPIMETHEUS",
+  Erinome = "IAU_ERINOME",
+  Eros = "IAU_EROS",
+  Europa = "IAU_EUROPA",
+  Eurybates = "IAU_EURYBATES",
+  Galatea = "IAU_GALATEA",
+  Ganymede = "IAU_GANYMEDE",
+  Gaspra = "IAU_GASPRA",
+  Harpalyke = "IAU_HARPALYKE",
+  Helene = "IAU_HELENE",
+  Himalia = "IAU_HIMALIA",
+  Hydra = "IAU_HYDRA",
+  Hyperion = "IAU_HYPERION",
+  Iapetus = "IAU_IAPETUS",
+  Ida = "IAU_IDA",
+  Io = "IAU_IO",
+  Iocaste = "IAU_IOCASTE",
+  Isonoe = "IAU_ISONOE",
+  Itokawa = "IAU_ITOKAWA",
+  Janus = "IAU_JANUS",
+  Juliet = "IAU_JULIET",
+  Kalyke = "IAU_KALYKE",
+  Larissa = "IAU_LARISSA",
+  Leda = "IAU_LEDA",
+  Leucus = "IAU_LEUCUS",
+  Lutetia = "IAU_LUTETIA",
+  Lysithea = "IAU_LYSITHEA",
+  Magaclite = "IAU_MAGACLITE",
+  Menoetius = "IAU_MENOETIUS",
+  Metis = "IAU_METIS",
+  Mimas = "IAU_MIMAS",
+  Miranda = "IAU_MIRANDA",
+  Naiad = "IAU_NAIAD",
+  Nereid = "IAU_NEREID",
+  Nix = "IAU_NIX",
+  Oberon = "IAU_OBERON",
+  Ophelia = "IAU_OPHELIA",
+  Orus = "IAU_ORUS",
+  Pallas = "IAU_PALLAS",
+  Pan = "IAU_PAN",
+  Pandora = "IAU_PANDORA",
+  Pasiphae = "IAU_PASIPHAE",
+  Patroclus = "IAU_PATROCLUS",
+  Phobos = "IAU_PHOBOS",
+  Phoebe = "IAU_PHOEBE",
+  Polymele = "IAU_POLYMELE",
+  Portia = "IAU_PORTIA",
+  Praxidike = "IAU_PRAXIDIKE",
+  Prometheus = "IAU_PROMETHEUS",
+  Proteus = "IAU_PROTEUS",
+  Puck = "IAU_PUCK",
+  Queta = "IAU_QUETA",
+  Rhea = "IAU_RHEA",
+  Rosalind = "IAU_ROSALIND",
+  Ryugu = "IAU_RYUGU",
+  Sinope = "IAU_SINOPE",
+  Steins = "IAU_STEINS",
+  Taygete = "IAU_TAYGETE",
+  Telesto = "IAU_TELESTO",
+  Tempel1 = "IAU_TEMPEL_1",
+  Tethys = "IAU_TETHYS",
+  Thalassa = "IAU_THALASSA",
+  Thebe = "IAU_THEBE",
+  Themisto = "IAU_THEMISTO",
+  Titan = "IAU_TITAN",
+  Titania = "IAU_TITANIA",
+  Triton = "IAU_TRITON",
+  Umbriel = "IAU_UMBRIEL",
+  Vesta = "IAU_VESTA"
+}
+
+
+asset.onInitialize(function()
+  openspace.spice.loadKernel(pck .. "pck00011.tpc")
+  openspace.spice.loadKernel(spk .. "de430.bsp")
+end)
+
+asset.onDeinitialize(function()
+  openspace.spice.unloadKernel(spk .. "de430.bsp")
+  openspace.spice.unloadKernel(pck .. "pck00011.tpc")
+end)
+
+asset.export("ID", ID)
+asset.export("Frame", Frame)
+
+
+
+asset.meta = {
+  Name = "SPICE Base",
+  Version = "1.1",
+  Description = [[This asset contains the spice base kernels necessary for any space
+    application. Includes positions for Solar System bodies from 1850 to 2150]],
+  Author = "OpenSpace Team",
+  URL = "https://naif.jpl.nasa.gov/naif/data_generic.html",
+  License = "NASA"
+}

From c91f7f5a9b35271dfd7dae50fef4103de604c0f4 Mon Sep 17 00:00:00 2001
From: Adam Rohdin <adam.rohdin@liu.se>
Date: Tue, 12 Dec 2023 17:37:13 +0100
Subject: [PATCH 209/701] RenderableOrbitalKepler trail now the whole trail
 properly

---
 modules/space/rendering/renderableorbitalkepler.cpp | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/modules/space/rendering/renderableorbitalkepler.cpp b/modules/space/rendering/renderableorbitalkepler.cpp
index 1baa644886..06510b1379 100644
--- a/modules/space/rendering/renderableorbitalkepler.cpp
+++ b/modules/space/rendering/renderableorbitalkepler.cpp
@@ -360,7 +360,7 @@ void RenderableOrbitalKepler::updateBuffers() {
         _segmentSize.push_back(
             static_cast<size_t>(scale + (scale / pow(1 - p.eccentricity, 1.2)))
         );
-        _startIndex.push_back(_startIndex[i] + static_cast<GLint>(_segmentSize[i]) + 1);
+        _startIndex.push_back(_startIndex[i] + static_cast<GLint>(_segmentSize[i]));
     }
     _startIndex.pop_back();
 
@@ -368,7 +368,7 @@ void RenderableOrbitalKepler::updateBuffers() {
 
     int numOrbits = static_cast<int>(parameters.size());
     for (int i = 0; i < numOrbits; ++i) {
-        nVerticesTotal += _segmentSize[i] + 1;
+        nVerticesTotal += _segmentSize[i];
     }
     _vertexBufferData.resize(nVerticesTotal);
 
@@ -388,9 +388,9 @@ void RenderableOrbitalKepler::updateBuffers() {
             orbit.epoch
         );
 
-        for (size_t j = 0 ; j < (_segmentSize[orbitIdx] + 1); ++j) {
+        for (size_t j = 0 ; j < (_segmentSize[orbitIdx]); ++j) {
             double timeOffset = orbit.period *
-                static_cast<double>(j) / static_cast<double>(_segmentSize[orbitIdx]);
+                static_cast<double>(j) / static_cast<double>(_segmentSize[orbitIdx] - 1);
 
             glm::dvec3 position = keplerTranslator.position({
                 {},

From 9897a9fd5a73ec19cf6431b128222d2342cd7012 Mon Sep 17 00:00:00 2001
From: Emma Broman <emma.broman@liu.se>
Date: Thu, 14 Dec 2023 10:10:40 +0100
Subject: [PATCH 210/701] Update GUI hash (issue #2977)

---
 data/assets/util/webgui.asset | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/data/assets/util/webgui.asset b/data/assets/util/webgui.asset
index c7243a5f5e..19d82a7ee5 100644
--- a/data/assets/util/webgui.asset
+++ b/data/assets/util/webgui.asset
@@ -4,7 +4,7 @@ local guiCustomization = asset.require("customization/gui")
 
 
 -- Select which commit hashes to use for the frontend and backend
-local frontendHash = "17af9032d000a9865a00afe88eff88a822167eea"
+local frontendHash = "a2139b8cf589daf846fb3ef3f4953bc591e66dcb"
 
 local frontend = asset.resource({
   Identifier = "WebGuiFrontend",

From c165098cdcfc6afe97f6c71af76042ebd18c1af7 Mon Sep 17 00:00:00 2001
From: Emma Broman <emma.broman@liu.se>
Date: Tue, 19 Dec 2023 13:20:07 +0100
Subject: [PATCH 211/701] Point cloud rewrite (RIP RenderableBillboardsCloud)
 (#2932)

* Start refactoring billboardscloud renderable

* Remove extra unit computation in geometry shader

* More refactor and fix size parameter not working without colormap (it never did)

* Remove redundant bool in shader

* Divide settings into property owners

* Refactor colormap

* More refactoring (utilize properties for visiblity)

* Remove redundant extra data structures for options

* Move data logic to the colormap settings structure

* Remove confusing correction size properties

* Separate polygon cloud into its own renderable

* Clean up some unused code

* Update some property descriptions

* Split some more code out into functions

* Remove odd and unused "linear filtering"

Should be reimplemented ina better way in a general color map overhaul

* Start refactoring some more properties

* Make color optional and remove redundant color assignments in assets

* Refactor color-parameter input and make range mapping work correctly

* Code cleanup (unused code and fix data types)

* Rename ScaleFactor to ScaleExponent

* Add a scale factor as well, as they're easier to use, and clarify documentation

* Fix faultily renamed scale factors

* Remove confusing multiplication for scale exponent

* Fix problem with points not appearing when _drawElements was set to true

* Move all colormapsettings into its own table in the asset files

* Move scaling/sizing into its own table as well

* Group sizing properties and remove min pixel size limit (was always zero)

* Add some docs and rename a parameter to avoid repetition

* Remove IsExact colormap and add an option to hide outliers

OBS! Still need to update the actual cmap files

* Add property to disable size mapping

* Increase pixel size of polyon texture - reduces jagged edges

* Remove unused points class

* Rename files and billboard class, to make it clearer that it is a point cloud

* Move size mapping into size settings

* Move color map properties out into its own component

* Move color map related computations into the new component

* Add outlier colors, to cover some specific color mapping issues

* Automatically fill parameter options if no colormap parameters were defined

* Move all color-related parameters to under one property owner

* Inlcude changes from matrix maintenance

* Add a checkbox to disable additive blending

* Remove a unused variable in shader

* DO color maping on the graphics card instead of CPU, using a texture

* WIP remove old "Outliers" and start introducing concept of no data colors instead

* Move speck loader to core and divide into a general data loader and a speck specific loader (In preparation for adding CSV support)

* More labelscomponent to core

* Fix a faulty header

* Handle NaN values

* Rename color map component property owner

It's not just the color map, but the settings for the entire mapping

* Hide point with nan value is show missing data is not selected

* Fix labels component documentation after move

* Add option to not provide any texture, and use a sphere generated form the shader

* Don't crash when loading unsupported data formats :)

* Add some TODO comments that should be addressed before merge

* Move renderables from DU module to base, and do some header cleanup

* Move colormapping component to core ad rename it to make it clear that it is not the color map itself

* Add above, below and nan color values to cmap loading

* Remove missing Data value specs in asset (and use belowRange in cmap instead)

* Make warning about wrong color number more verbose

* Add TODO comment about colormap, and actually used color in prev version, to localdwarfs

* WIP: Load CSV files

* Update some property visbility

* Check if chosen parameter options actually exist

* Fix fault column check

* Update example asset to cover more different cases

* Use new asset.resource loading

* Update asset versions (major update)

* Add parent documentation for RenderablePolygonCloud

* Add point cloud example with size scaling and add TODO comment

* Add example with textured points

* Don't blend textured points

* Fix problem with shaders being confused about texture units

* Bring back deepsky points color

* Start implementing more sophisticated datamapping for point data files

* Allow reading datamapping from input dictionary

* Load dataset in constructor instead

Solves problem with color map columns not loading for big datasets when loaded the first time

* Fix crash from reading column value that is interpreted as inf

* Inlcude information about data mapping when caching dataset

Updating the parameters now leads to an updated caching of the data file

* Adapt to tolower update

* Add option to specify columns to exclude in load (for CSV files)

* Start updating some docs

* Add a readonly property that shows the number of data points

* Rename example asset to shorter name

* Add option for not using cache when loading dataset

* Fix some errors in example asset

* Set scaleExponent from max position if not specified

That way the points are always visible, even when no exponent is given

* Restructure and add explanations in example asset

* Add option to not cache labels component data file

* Add example file with labels and units

* Compute fade distances in model coordinates instead of world space (issue #1746)

* Add possiblity to invert fading and add exmaple asset

* Make a separate propertyowner for fading settings

* Update docs

* Add example asset with custom data mapping

* Address some of my own review comments

* Read provided Parameter from asset

* Read ValueRange from asset

* Add example asset for more advanced color mapping settings

* Allow using the same column for two position coordinate axes

* Update src/rendering/colormappingcomponent.cpp

Co-authored-by: Alexander Bock <alexander.bock@liu.se>

* Update src/data/datamapping.cpp

* Use helper function for tolowercase

* Simplify some std::optional handling, and fix broken assignment from code review fix

* Update data file versions to get updated cmap files

* Include a progress bar to show progress of CSV data loading

* Update csv data-to-float parsing for clang

* Add a description about why `openspace.absPath` is used in the file instead of `asset.resource`

* Apply suggestions from code review

* Apply suggestions from code review

* Add some missing info in documentation

* Place size-related property descriptions next to each other

* Remove the explicitly set renderbin

* Fix overly complicated description

* Fix polygon texture not being used

* Add polygon cloud example

* only bind texture and activate texture unit when required

* Rename alpha to opacity in shader

* Fix value range not loading, and make first parameter in list the default

* Rename Pixel Size property

* Use base 10 for scale exponent instead of base e

* Update src/data/datamapping.cpp

* Update modules/base/shaders/billboardpoint_gs.glsl

* Remove some redundant asset settings (Home label)

* Review comments

* Add TODO comment for localdwarfs asset (Speck file reading problems)

* Oops, forgot part of the comment

* Apply suggestions from code review

Co-authored-by: Alexander Bock <alexander.bock@liu.se>

* More code review fixes

* Fix faulty isReady check when labels are included

* Apply suggestions from code review

Co-authored-by: Alexander Bock <alexander.bock@liu.se>

* Apply suggestions from code review

Co-authored-by: Alexander Bock <alexander.bock@liu.se>

* More code review updates

---------

Co-authored-by: Alexander Bock <alexander.bock@liu.se>
---
 .../examples/pointclouds/data/dummydata.csv   |  101 ++
 .../examples/pointclouds/data/dummydata.label |  100 ++
 data/assets/examples/pointclouds/points.asset |  237 ++++
 .../points_colormappingsettings.asset         |   78 ++
 .../pointclouds/points_datamapping.asset      |   68 +
 .../examples/pointclouds/points_fading.asset  |   88 ++
 .../pointclouds/points_units_labels.asset     |   55 +
 .../examples/pointclouds/polygon_cloud.asset  |   45 +
 data/assets/examples/pointclouds/viridis.cmap |  258 ++++
 data/assets/scene/digitaluniverse/2dF.asset   |   27 +-
 data/assets/scene/digitaluniverse/2mass.asset |   30 +-
 data/assets/scene/digitaluniverse/6dF.asset   |   28 +-
 data/assets/scene/digitaluniverse/abell.asset |   20 +-
 .../digitaluniverse/alternatestarlabels.asset |    5 +-
 .../scene/digitaluniverse/clusters.asset      |    5 +-
 .../scene/digitaluniverse/deepsky.asset       |   23 +-
 .../assets/scene/digitaluniverse/dwarfs.asset |   29 +-
 .../scene/digitaluniverse/exoplanets.asset    |   15 +-
 .../exoplanets_candidates.asset               |   18 +-
 .../digitaluniverse/globularclusters.asset    |   17 +-
 data/assets/scene/digitaluniverse/grids.asset |   11 +-
 .../assets/scene/digitaluniverse/groups.asset |    6 +-
 .../scene/digitaluniverse/h2regions.asset     |   17 +-
 data/assets/scene/digitaluniverse/hdf.asset   |   25 +-
 .../scene/digitaluniverse/localdwarfs.asset   |   30 +-
 .../digitaluniverse/milkyway_label.asset      |   14 +-
 .../digitaluniverse/obassociations.asset      |   28 +-
 .../scene/digitaluniverse/openclusters.asset  |   17 +-
 .../digitaluniverse/planetarynebulae.asset    |   17 +-
 .../scene/digitaluniverse/pulsars.asset       |   17 +-
 .../scene/digitaluniverse/quasars.asset       |   33 +-
 data/assets/scene/digitaluniverse/sdss.asset  |   36 +-
 .../scene/digitaluniverse/starlabels.asset    |    5 +-
 .../scene/digitaluniverse/superclusters.asset |   13 +-
 .../digitaluniverse/supernovaremnants.asset   |   19 +-
 data/assets/scene/digitaluniverse/tully.asset |   35 +-
 data/assets/scene/digitaluniverse/voids.asset |    5 +-
 .../openspace/data/csvloader.h                |   28 +-
 .../openspace/data/dataloader.h               |   48 +-
 include/openspace/data/datamapping.h          |   74 ++
 .../openspace/data/speckloader.h              |   31 +-
 .../rendering/colormappingcomponent.h         |  117 ++
 .../openspace/rendering}/labelscomponent.h    |   16 +-
 modules/base/CMakeLists.txt                   |   10 +
 modules/base/basemodule.cpp                   |    6 +
 .../rendering/grids/renderableboxgrid.cpp     |    2 +-
 .../base/rendering/grids/renderableboxgrid.h  |    2 +-
 .../base/rendering/grids/renderablegrid.cpp   |    2 +-
 modules/base/rendering/grids/renderablegrid.h |    2 +-
 .../rendering/grids/renderableradialgrid.cpp  |    2 +-
 .../rendering/grids/renderableradialgrid.h    |    2 +-
 .../grids/renderablesphericalgrid.cpp         |    2 +-
 .../rendering/grids/renderablesphericalgrid.h |    2 +-
 .../pointcloud/renderablepointcloud.cpp       | 1042 +++++++++++++++
 .../pointcloud/renderablepointcloud.h}        |  133 +-
 .../pointcloud/renderablepolygoncloud.cpp     |  193 +++
 .../pointcloud/renderablepolygoncloud.h       |   70 +
 .../shaders/billboardpoint_fs.glsl}           |   71 +-
 .../shaders/billboardpoint_gs.glsl}           |   72 +-
 .../shaders/billboardpoint_vs.glsl}           |   13 +-
 .../shaders/polygon_fs.glsl}                  |    0
 .../shaders/polygon_gs.glsl}                  |    0
 .../shaders/polygon_vs.glsl}                  |    0
 modules/digitaluniverse/CMakeLists.txt        |   12 -
 .../digitaluniverse/digitaluniversemodule.cpp |    6 -
 .../rendering/renderablebillboardscloud.cpp   | 1142 -----------------
 .../rendering/renderabledumeshes.cpp          |    4 +-
 .../rendering/renderabledumeshes.h            |    4 +-
 .../rendering/renderableplanescloud.cpp       |    8 +-
 .../rendering/renderableplanescloud.h         |    5 +-
 .../rendering/renderablepoints.cpp            |  437 -------
 .../rendering/renderablepoints.h              |  106 --
 modules/space/CMakeLists.txt                  |    4 -
 .../renderableconstellationlines.cpp          |    4 +-
 .../renderableconstellationsbase.cpp          |    4 +-
 .../rendering/renderableconstellationsbase.h  |    2 +-
 modules/space/rendering/renderablestars.cpp   |    6 +-
 modules/space/rendering/renderablestars.h     |    4 +-
 modules/space/spacemodule.cpp                 |    2 -
 src/CMakeLists.txt                            |   12 +
 src/data/csvloader.cpp                        |  194 +++
 src/data/dataloader.cpp                       |  687 ++++++++++
 src/data/datamapping.cpp                      |  174 +++
 {modules/space => src/data}/speckloader.cpp   |  523 +-------
 src/documentation/core_registration.cpp       |    7 +
 src/rendering/colormappingcomponent.cpp       |  470 +++++++
 .../rendering}/labelscomponent.cpp            |   24 +-
 87 files changed, 4719 insertions(+), 2637 deletions(-)
 create mode 100644 data/assets/examples/pointclouds/data/dummydata.csv
 create mode 100644 data/assets/examples/pointclouds/data/dummydata.label
 create mode 100644 data/assets/examples/pointclouds/points.asset
 create mode 100644 data/assets/examples/pointclouds/points_colormappingsettings.asset
 create mode 100644 data/assets/examples/pointclouds/points_datamapping.asset
 create mode 100644 data/assets/examples/pointclouds/points_fading.asset
 create mode 100644 data/assets/examples/pointclouds/points_units_labels.asset
 create mode 100644 data/assets/examples/pointclouds/polygon_cloud.asset
 create mode 100644 data/assets/examples/pointclouds/viridis.cmap
 rename modules/digitaluniverse/shaders/points_sprite_fs.glsl => include/openspace/data/csvloader.h (83%)
 rename modules/space/speckloader.h => include/openspace/data/dataloader.h (73%)
 create mode 100644 include/openspace/data/datamapping.h
 rename modules/digitaluniverse/shaders/points_vs.glsl => include/openspace/data/speckloader.h (77%)
 create mode 100644 include/openspace/rendering/colormappingcomponent.h
 rename {modules/space => include/openspace/rendering}/labelscomponent.h (91%)
 create mode 100644 modules/base/rendering/pointcloud/renderablepointcloud.cpp
 rename modules/{digitaluniverse/rendering/renderablebillboardscloud.h => base/rendering/pointcloud/renderablepointcloud.h} (58%)
 create mode 100644 modules/base/rendering/pointcloud/renderablepolygoncloud.cpp
 create mode 100644 modules/base/rendering/pointcloud/renderablepolygoncloud.h
 rename modules/{digitaluniverse/shaders/billboard_fs.glsl => base/shaders/billboardpoint_fs.glsl} (64%)
 rename modules/{digitaluniverse/shaders/billboard_gs.glsl => base/shaders/billboardpoint_gs.glsl} (73%)
 rename modules/{digitaluniverse/shaders/billboard_vs.glsl => base/shaders/billboardpoint_vs.glsl} (91%)
 rename modules/{digitaluniverse/shaders/billboardpolygon_fs.glsl => base/shaders/polygon_fs.glsl} (100%)
 rename modules/{digitaluniverse/shaders/billboardpolygon_gs.glsl => base/shaders/polygon_gs.glsl} (100%)
 rename modules/{digitaluniverse/shaders/billboardpolygon_vs.glsl => base/shaders/polygon_vs.glsl} (100%)
 delete mode 100644 modules/digitaluniverse/rendering/renderablebillboardscloud.cpp
 delete mode 100644 modules/digitaluniverse/rendering/renderablepoints.cpp
 delete mode 100644 modules/digitaluniverse/rendering/renderablepoints.h
 create mode 100644 src/data/csvloader.cpp
 create mode 100644 src/data/dataloader.cpp
 create mode 100644 src/data/datamapping.cpp
 rename {modules/space => src/data}/speckloader.cpp (51%)
 create mode 100644 src/rendering/colormappingcomponent.cpp
 rename {modules/space => src/rendering}/labelscomponent.cpp (92%)

diff --git a/data/assets/examples/pointclouds/data/dummydata.csv b/data/assets/examples/pointclouds/data/dummydata.csv
new file mode 100644
index 0000000000..e8b698833f
--- /dev/null
+++ b/data/assets/examples/pointclouds/data/dummydata.csv
@@ -0,0 +1,101 @@
+x,y,z,a,b,normaldist_withMissing,number_withNan
+13428000,26239000,45870000,-3.226548224,33.95773276,-0.357778948,29
+14727000,45282000,10832000,45.05941924,-106.0395917,,29
+24999000,28370000,19911000,-70.58906931,154.1851656,-0.167961782,Nan
+26539000,36165000,39582000,-13.3663358,71.79484733,0.113536778,9
+49056000,24775000,14626000,21.42870979,-115.6088304,0.125551095,37
+43965000,21472000,18760000,65.07055022,-56.36880466,0.172981386,18
+15661000,28429000,16965000,76.15826514,125.3163407,,40
+25046000,36006000,49453000,-22.31710915,137.4486786,0.447921314,28
+13797000,34811000,18825000,-79.40300933,74.05580595,-0.02379786,12
+13879000,14824000,41472000,-30.93548431,-8.755047834,-0.041777813,50
+11481000,20480000,25925000,75.51244012,178.1377926,-0.044396255,0
+45032000,16606000,23537000,37.38766828,175.5064508,-0.449674816,13
+14395000,34940000,21968000,-31.6863061,-116.6587323,-0.09741961,30
+15945000,21478000,29536000,-53.01226701,59.18196347,0.304142338,30
+13458000,19017000,18542000,8.72692265,80.65872957,,45
+45302000,15732000,34369000,-85.57061714,124.6890481,-0.364449145,20
+15559000,36269000,18160000,-4.975784243,-156.8789425,-0.012893853,22
+16552000,14570000,39763000,-39.2579671,75.22960824,-0.281792015,Nan
+11353000,13410000,38311000,8.610608538,-36.43103437,-0.196021206,9
+12383000,49302000,33539000,69.26506588,-109.0830926,-0.147483079,34
+44302000,21387000,23434000,16.14574541,78.81171702,0.115624185,5
+43107000,14206000,24728000,37.57233254,142.6103028,,Nan
+49320000,43878000,24240000,-39.10527498,149.2751575,-0.086246397,29
+37519000,40514000,16409000,-24.14434437,157.2871976,-0.071946303,12
+37202000,40122000,42551000,-79.88824934,-124.089513,0.375414362,31
+12783000,11757000,25348000,-11.83866388,118.2423568,-0.243289139,Nan
+39621000,30560000,15929000,75.8365484,-95.18288548,-0.399996182,37
+10937000,15183000,21413000,-32.40573,-157.8337361,-0.202310776,39
+39411000,12532000,44006000,34.67409469,-83.29512212,,Nan
+47905000,25552000,28902000,36.19437814,52.25734185,,32
+28426000,45268000,27886000,-70.843469,-63.7321218,0.112287307,45
+15026000,45897000,23911000,-89.01161062,10.16376248,-0.00400866,Nan
+24625000,14844000,12837000,88.91663258,169.8003753,-0.151728888,5
+46304000,21144000,24421000,-41.58069299,59.63971512,-0.371030712,48
+29558000,10724000,27312000,9.663492403,-71.18121738,0.344402457,Nan
+49636000,27202000,24626000,59.46440387,-92.91431055,0.26256468,31
+38603000,23794000,41040000,70.45128929,-67.84861911,-0.184920666,48
+37336000,21742000,40982000,-15.69131418,134.6754731,0.078786176,15
+35128000,38725000,25244000,2.279345664,34.91612867,0.091098807,44
+30419000,33591000,39512000,-56.16030331,133.9105282,-0.590693487,8
+18665000,11189000,45438000,-45.68302316,-85.35524485,0.046936859,26
+15442000,36392000,16074000,81.4389588,-56.70945587,0.038804669,5
+43378000,27900000,38748000,-74.35249265,-133.1884413,0.429053963,17
+44424000,19982000,13528000,-81.19709235,49.49364675,0.115926289,47
+42733000,15383000,28933000,75.17020088,-11.11330632,0.127627239,32
+40144000,46822000,29588000,-81.25577073,-135.8002245,0.346061193,33
+16927000,38232000,43931000,-80.97022269,157.7565432,-0.096039391,39
+38910000,36030000,38003000,-37.79005665,-1.5474944,0.107402594,11
+48340000,38510000,39290000,21.94846638,-112.6129615,0.230803493,3
+17258000,45665000,27152000,80.73726495,-31.33714033,-0.079079307,10
+48363000,39701000,11905000,11.83766221,-69.99777106,-0.002514692,3
+27660000,29370000,26029000,8.179457229,147.7719143,-0.006520509,31
+47106000,30527000,17038000,73.00898959,9.988869939,0.797492967,5
+10471000,37521000,35398000,57.46145065,-29.5045034,-0.261313809,39
+27774000,44082000,40036000,78.47974779,-4.998179635,0.437739286,24
+46887000,20413000,36649000,51.11098102,-136.3276432,0.237434245,41
+10093000,46706000,19187000,-58.41750426,-157.9933447,0.275586609,45
+49093000,36514000,38499000,-55.41355694,150.177605,0.576467955,21
+48945000,49826000,23225000,-63.91174083,-177.7191007,0.475443991,Nan
+26852000,28926000,32243000,-77.854481,116.9006581,,1
+34219000,34787000,30801000,-62.32990484,23.24232366,0.089523916,40
+31075000,30369000,36898000,-77.78314619,38.69526825,-0.046423443,7
+28135000,21412000,25552000,-7.411565773,-88.65122734,0.258690016,Nan
+13347000,15980000,43094000,74.71054756,-37.32614369,,7
+26928000,31159000,16653000,-32.74503199,146.7695347,0.576290488,34
+12364000,14374000,43646000,28.70641859,-92.35199713,-0.059531367,16
+38991000,49388000,48534000,56.70658222,8.014973542,-0.173400177,30
+17180000,14935000,11680000,-45.39957586,102.5726701,0.16285705,1
+27666000,29337000,44778000,89.4063742,-79.68068618,0.044140443,41
+13660000,11108000,37986000,57.03349279,7.98684928,0.066242706,24
+36910000,10252000,41657000,-9.906961203,21.79114496,-0.378241692,6
+21785000,20095000,14903000,77.49612237,-84.68789002,-0.071118836,16
+33363000,42124000,39814000,-64.47776113,-30.79591997,0.371115832,35
+42758000,48892000,44762000,42.39782697,-32.55868099,-0.146011285,1
+16590000,22098000,28515000,-36.90992927,-55.27481385,-0.203981239,27
+26448000,45475000,33361000,64.22197115,146.6687002,-0.026210913,1
+41182000,23927000,25075000,-81.55929754,137.9213773,0.042229126,10
+49801000,15636000,39883000,-89.22857667,159.9681504,0.035529624,15
+32725000,13037000,49874000,-55.17873101,61.01413612,0.519438664,43
+31130000,16471000,41939000,-45.36963748,-156.5100924,0.245045969,22
+19599000,37119000,26468000,-26.58523044,174.7731562,-0.210527713,22
+30024000,23097000,14711000,44.31464407,150.7894846,-0.041347399,45
+39567000,48586000,49391000,1.721781555,156.1687027,,31
+46249000,28249000,32393000,-13.3221674,-176.0644697,-0.108879159,30
+12180000,20488000,46288000,36.02858732,30.43526779,-0.099205446,47
+29659000,40098000,45152000,72.15373455,62.01511311,,46
+41026000,19309000,15845000,-38.63636224,145.9569745,-0.083266866,32
+47146000,39852000,26666000,35.2426196,-33.97130609,-0.650089141,7
+39958000,46945000,11789000,-68.31344333,172.4154216,0.001713968,37
+25921000,13147000,22257000,-15.89505915,-150.39693,0.165178387,37
+28892000,28329000,49094000,-58.72206735,-157.3776844,-0.228068143,48
+29563000,48312000,45703000,86.78718085,179.1386066,-0.146072441,49
+46127000,46582000,13462000,39.98033674,-164.152123,-0.081830298,17
+23268000,24051000,48652000,-43.61767649,83.51428751,-0.106824408,45
+22163000,26901000,28702000,51.04347167,169.7632117,0.052782471,31
+46968000,17027000,25787000,-73.8664022,2.915300454,-0.028069047,22
+24148000,44640000,15422000,8.379412685,101.9542853,-0.049339904,14
+11566000,26486000,11735000,-36.78748293,-129.8960512,,Nan
+11063000,38883000,16772000,-65.43894139,105.6607872,,7
+43081000,16718000,45813000,-2.464830259,87.07999887,-0.24057898,40
diff --git a/data/assets/examples/pointclouds/data/dummydata.label b/data/assets/examples/pointclouds/data/dummydata.label
new file mode 100644
index 0000000000..fb38a1f3e0
--- /dev/null
+++ b/data/assets/examples/pointclouds/data/dummydata.label
@@ -0,0 +1,100 @@
+13428000 26239000 45870000 id P0 text Point 0
+14727000 45282000 10832000 id P1 text Point 1
+24999000 28370000 19911000 id P2 text Point 2
+26539000 36165000 39582000 id P3 text Point 3
+49056000 24775000 14626000 id P4 text Point 4
+43965000 21472000 18760000 id P5 text Point 5
+15661000 28429000 16965000 id P6 text Point 6
+25046000 36006000 49453000 id P7 text Point 7
+13797000 34811000 18825000 id P8 text Point 8
+13879000 14824000 41472000 id P9 text Point 9
+11481000 20480000 25925000 id P10 text Point 10
+45032000 16606000 23537000 id P11 text Point 11
+14395000 34940000 21968000 id P12 text Point 12
+15945000 21478000 29536000 id P13 text Point 13
+13458000 19017000 18542000 id P14 text Point 14
+45302000 15732000 34369000 id P15 text Point 15
+15559000 36269000 18160000 id P16 text Point 16
+16552000 14570000 39763000 id P17 text Point 17
+11353000 13410000 38311000 id P18 text Point 18
+12383000 49302000 33539000 id P19 text Point 19
+44302000 21387000 23434000 id P20 text Point 20
+43107000 14206000 24728000 id P21 text Point 21
+49320000 43878000 24240000 id P22 text Point 22
+37519000 40514000 16409000 id P23 text Point 23
+37202000 40122000 42551000 id P24 text Point 24
+12783000 11757000 25348000 id P25 text Point 25
+39621000 30560000 15929000 id P26 text Point 26
+10937000 15183000 21413000 id P27 text Point 27
+39411000 12532000 44006000 id P28 text Point 28
+47905000 25552000 28902000 id P29 text Point 29
+28426000 45268000 27886000 id P30 text Point 30
+15026000 45897000 23911000 id P31 text Point 31
+24625000 14844000 12837000 id P32 text Point 32
+46304000 21144000 24421000 id P33 text Point 33
+29558000 10724000 27312000 id P34 text Point 34
+49636000 27202000 24626000 id P35 text Point 35
+38603000 23794000 41040000 id P36 text Point 36
+37336000 21742000 40982000 id P37 text Point 37
+35128000 38725000 25244000 id P38 text Point 38
+30419000 33591000 39512000 id P39 text Point 39
+18665000 11189000 45438000 id P40 text Point 40
+15442000 36392000 16074000 id P41 text Point 41
+43378000 27900000 38748000 id P42 text Point 42
+44424000 19982000 13528000 id P43 text Point 43
+42733000 15383000 28933000 id P44 text Point 44
+40144000 46822000 29588000 id P45 text Point 45
+16927000 38232000 43931000 id P46 text Point 46
+38910000 36030000 38003000 id P47 text Point 47
+48340000 38510000 39290000 id P48 text Point 48
+17258000 45665000 27152000 id P49 text Point 49
+48363000 39701000 11905000 id P50 text Point 50
+27660000 29370000 26029000 id P51 text Point 51
+47106000 30527000 17038000 id P52 text Point 52
+10471000 37521000 35398000 id P53 text Point 53
+27774000 44082000 40036000 id P54 text Point 54
+46887000 20413000 36649000 id P55 text Point 55
+10093000 46706000 19187000 id P56 text Point 56
+49093000 36514000 38499000 id P57 text Point 57
+48945000 49826000 23225000 id P58 text Point 58
+26852000 28926000 32243000 id P59 text Point 59
+34219000 34787000 30801000 id P60 text Point 60
+31075000 30369000 36898000 id P61 text Point 61
+28135000 21412000 25552000 id P62 text Point 62
+13347000 15980000 43094000 id P63 text Point 63
+26928000 31159000 16653000 id P64 text Point 64
+12364000 14374000 43646000 id P65 text Point 65
+38991000 49388000 48534000 id P66 text Point 66
+17180000 14935000 11680000 id P67 text Point 67
+27666000 29337000 44778000 id P68 text Point 68
+13660000 11108000 37986000 id P69 text Point 69
+36910000 10252000 41657000 id P70 text Point 70
+21785000 20095000 14903000 id P71 text Point 71
+33363000 42124000 39814000 id P72 text Point 72
+42758000 48892000 44762000 id P73 text Point 73
+16590000 22098000 28515000 id P74 text Point 74
+26448000 45475000 33361000 id P75 text Point 75
+41182000 23927000 25075000 id P76 text Point 76
+49801000 15636000 39883000 id P77 text Point 77
+32725000 13037000 49874000 id P78 text Point 78
+31130000 16471000 41939000 id P79 text Point 79
+19599000 37119000 26468000 id P80 text Point 80
+30024000 23097000 14711000 id P81 text Point 81
+39567000 48586000 49391000 id P82 text Point 82
+46249000 28249000 32393000 id P83 text Point 83
+12180000 20488000 46288000 id P84 text Point 84
+29659000 40098000 45152000 id P85 text Point 85
+41026000 19309000 15845000 id P86 text Point 86
+47146000 39852000 26666000 id P87 text Point 87
+39958000 46945000 11789000 id P88 text Point 88
+25921000 13147000 22257000 id P89 text Point 89
+28892000 28329000 49094000 id P90 text Point 90
+29563000 48312000 45703000 id P91 text Point 91
+46127000 46582000 13462000 id P92 text Point 92
+23268000 24051000 48652000 id P93 text Point 93
+22163000 26901000 28702000 id P94 text Point 94
+46968000 17027000 25787000 id P95 text Point 95
+24148000 44640000 15422000 id P96 text Point 96
+11566000 26486000 11735000 id P97 text Point 97
+11063000 38883000 16772000 id P98 text Point 98
+43081000 16718000 45813000 id P99 text Point 99
diff --git a/data/assets/examples/pointclouds/points.asset b/data/assets/examples/pointclouds/points.asset
new file mode 100644
index 0000000000..e298045d79
--- /dev/null
+++ b/data/assets/examples/pointclouds/points.asset
@@ -0,0 +1,237 @@
+local earthAsset = asset.require("scene/solarsystem/planets/earth/earth")
+
+
+
+-- Color mapped points close to Earth, with some different settings for color and
+-- sizing, and a StaticRotation that makes them not overlap
+
+-- Point cloud with fixed color and default size (fixed)
+local FixedColor_FixedSize = {
+  Identifier = "ExamplePoints_FixedSize",
+  Parent = earthAsset.Earth.Identifier,
+  Renderable = {
+    Type = "RenderablePointCloud",
+    File = asset.resource("data/dummydata.csv"),
+    Coloring = {
+      FixedColor = { 0.0, 0.5, 0.0 }
+    }
+  },
+  GUI = {
+    Name = "Fixed Color / Fixed Size",
+    Path = "/Example/Point Clouds",
+    Description = "Point cloud with a fixed color and fixed sizing"
+  }
+}
+
+-- Point cloud with fixed color and size scaling that is limited by a certain size,
+-- in pixels
+local FixedColor_MaxPixelSize = {
+  Identifier = "ExamplePoints_MaxPixelSize",
+  Parent = earthAsset.Earth.Identifier,
+  Transform = {
+    Rotation = {
+      Type = "StaticRotation",
+      Rotation = { 0, 0, 0.5 * math.pi }
+    }
+  },
+  Renderable = {
+    Type = "RenderablePointCloud",
+    File = asset.resource("data/dummydata.csv"),
+    Coloring = {
+      FixedColor = { 0.0, 1.0, 1.0 }
+    },
+    SizeSettings = {
+      MaxPixelSize = 4.7,
+      EnablePixelSizeControl = true
+    }
+  },
+  GUI = {
+    Name = "Fixed Color / Max Pixel Size",
+    Path = "/Example/Point Clouds",
+    Description = "Point cloud with a fixed color and sizing with a given max pixel size"
+  }
+}
+
+-- Point cloud with color mapping and fixed point sizing
+local ColorMapped_FixedSize = {
+  Identifier = "ExamplePoints_ColorMapped",
+  Parent = earthAsset.Earth.Identifier,
+  Transform = {
+    Rotation = {
+      Type = "StaticRotation",
+      Rotation = { 0, 0, -0.5 * math.pi }
+    }
+  },
+  Renderable = {
+    Type = "RenderablePointCloud",
+    File = asset.resource("data/dummydata.csv"),
+    Coloring = {
+      ColorMapping = {
+        File = asset.resource("viridis.cmap")
+      }
+    },
+    SizeSettings = {
+      -- Here we set the exponent for the scale explicitly, to a value that
+      -- gives the points a suitable size based on their world-space coordinates
+      ScaleExponent = 6.5
+    }
+  },
+  GUI = {
+    Name = "Color Mapped",
+    Path = "/Example/Point Clouds",
+    Description = "Color mapped point cloud with fixed sizing"
+  }
+}
+
+-- Point cloud with fixed color and size scaling from a selected data column
+local FixedColor_ScaleBasedOnData = {
+  Identifier = "ExamplePoints_ScaleFromData",
+  Parent = earthAsset.Earth.Identifier,
+  Transform = {
+    Rotation = {
+      Type = "StaticRotation",
+      Rotation = { 0, 0.5 * math.pi, 0 }
+    }
+  },
+  Renderable = {
+    Type = "RenderablePointCloud",
+    File = asset.resource("data/dummydata.csv"),
+    Coloring = {
+      FixedColor = { 0.5, 0.5, 0.0 }
+    },
+    SizeSettings = {
+      -- The options for the columns that the points can be scaled by. The first
+      -- alternative is chosen per default
+      SizeMapping = { "number_withNan", "a" },
+      -- Use a slightly smaller scale than above for the base size of the points
+      -- (will decide the size of the smallest point). That way, the points don't
+      -- become too big when scaled by the data parameter
+      ScaleExponent = 5
+    }
+  },
+  GUI = {
+    Name = "Fixed Color / Size From Data",
+    Path = "/Example/Point Clouds",
+    Description = [[Point cloud with a fixed color and sizing that can be set based on a
+      column in the dataset]]
+  }
+}
+
+-- Point cloud with textures. Textured points can also be color mapped, but here it
+-- is disabled per default
+local Textured = {
+  Identifier = "ExamplePoints_Textured",
+  Parent = earthAsset.Earth.Identifier,
+  Transform = {
+    Rotation = {
+      Type = "StaticRotation",
+      Rotation = { 0, math.pi, 0 }
+    }
+  },
+  Renderable = {
+    Type = "RenderablePointCloud",
+    File = asset.resource("data/dummydata.csv"),
+    -- The path to the texture file. Here we use openspace.absPath so that we can use
+    -- the ${DATA} token to get the path to a texture in the "OpenSpace/data" folder,
+    -- but for a file at a relative location it would also work to use asset.resource,
+    -- like for the data file above
+    Texture = openspace.absPath("${DATA}/test3.jpg"),
+    -- Disable additive blending, so that points will be rendered with their actual color
+    -- and overlapping points will be sorted by depth. This works best when the points
+    -- have an opacity of 1
+    UseAdditiveBlending = false,
+    Coloring = {
+      ColorMapping = {
+        -- Disable color map per default. When enabled, the texture color will be
+        -- multiplied with the color from the color map
+        Enabled = false,
+        File = asset.resource("viridis.cmap")
+      }
+    }
+  },
+  GUI = {
+    Name = "Textured",
+    Path = "/Example/Point Clouds",
+    Description = "Point cloud with a texture per point"
+  }
+}
+
+-- Point cloud with more advanced color mapping and fixed point sizing.
+-- Here we have predefined a couple of parameters to use for the color mapping.
+-- Also, missing/NaN values are mapped to a specific color.
+-- Finally, no additive blending is used for the color, meaning that the color of
+-- overlapping points will not be mixed/added
+local ColorMappedAdvanced_NoBlend = {
+  Identifier = "ExamplePoints_ColorMappedNoBlend",
+  Parent = earthAsset.Earth.Identifier,
+  Transform = {
+    Rotation = {
+      Type = "StaticRotation",
+      Rotation = { 0, 0, math.pi }
+    }
+  },
+  Renderable = {
+    Type = "RenderablePointCloud",
+    File = asset.resource("data/dummydata.csv"),
+    UseAdditiveBlending = false, -- Disable additive blending
+    Coloring = {
+      ColorMapping = {
+        File = asset.resource("viridis.cmap"),
+        ParameterOptions = {
+          { Key = "number_withNan" }, -- no range => compute min and max
+          { Key = "normaldist_withMissing", Range = { -0.5, 0.5 } }
+        },
+        ShowMissingData = true,
+        NoDataColor = { 0.5, 0.5, 0.5, 1.0 }
+      }
+    },
+    SizeSettings = {
+      ScaleExponent = 6.5
+    }
+  },
+  GUI = {
+    Name = "Color Mapped (Advanced) - No blending",
+    Path = "/Example/Point Clouds",
+    Description = [[Color mapped point cloud without additive blending, with missing
+      values shown in grey, and a limited choice of parameter options to use for
+      the color mapping.]]
+  }
+}
+
+
+asset.onInitialize(function()
+  openspace.addSceneGraphNode(FixedColor_FixedSize)
+  openspace.addSceneGraphNode(FixedColor_MaxPixelSize)
+  openspace.addSceneGraphNode(FixedColor_ScaleBasedOnData)
+  openspace.addSceneGraphNode(Textured)
+  openspace.addSceneGraphNode(ColorMapped_FixedSize)
+  openspace.addSceneGraphNode(ColorMappedAdvanced_NoBlend)
+end)
+
+asset.onDeinitialize(function()
+  openspace.removeSceneGraphNode(ColorMappedAdvanced_NoBlend)
+  openspace.removeSceneGraphNode(ColorMapped_FixedSize)
+  openspace.removeSceneGraphNode(Textured)
+  openspace.removeSceneGraphNode(FixedColor_ScaleBasedOnData)
+  openspace.removeSceneGraphNode(FixedColor_MaxPixelSize)
+  openspace.removeSceneGraphNode(FixedColor_FixedSize)
+end)
+
+asset.export(FixedColor_FixedSize)
+asset.export(FixedColor_MaxPixelSize)
+asset.export(FixedColor_ScaleBasedOnData)
+asset.export(Textured)
+asset.export(ColorMapped_FixedSize)
+asset.export(ColorMappedAdvanced_NoBlend)
+
+
+
+asset.meta = {
+  Name = "Example - Point Clouds",
+  Version = "1.0",
+  Description = [[Examples of point clouds with a few different settings for sizing and
+    coloring]],
+  Author = "OpenSpace Team",
+  URL = "http://openspaceproject.com",
+  License = "MIT license"
+}
diff --git a/data/assets/examples/pointclouds/points_colormappingsettings.asset b/data/assets/examples/pointclouds/points_colormappingsettings.asset
new file mode 100644
index 0000000000..83ca91f125
--- /dev/null
+++ b/data/assets/examples/pointclouds/points_colormappingsettings.asset
@@ -0,0 +1,78 @@
+local earthAsset = asset.require("scene/solarsystem/planets/earth/earth")
+
+
+
+local Example = {
+  Identifier = "ExamplePoints_ColorMapping",
+  Parent = earthAsset.Earth.Identifier,
+  Renderable = {
+    Type = "RenderablePointCloud",
+    File = asset.resource("data/dummydata.csv"),
+    Coloring = {
+      ColorMapping = {
+        File = asset.resource("viridis.cmap"),
+        -- Set the default choice of parameter and value range explicitly. Values
+        -- outside this range will be given special colors
+        Parameter = "normaldist_withMissing",
+        ValueRange = { -0.25, 0.25 },
+        -- Show missing data values, so we can show these in a specific color
+        ShowMissingData = true,
+        -- Color for missing data points
+        NoDataColor = { 1.0, 0.0, 0.0, 1.0 },
+        -- Color for point with values above the given range. If not set, or if
+        -- UseAboveRangeColor is false, the color will be set to the last value
+        -- in the color map (as per default)
+        AboveRangeColor = { 0.0, 1.0, 0.0, 1.0 },
+        -- Color for point with values below the given range. If not set, or if
+        -- UseAboveRangeColor is false, the color will be set to the first value
+        -- in the color map (as per default)
+        BelowRangeColor = { 0.0, 0.0, 1.0, 1.0 },
+
+        -- Some other parameters that can be set are the following (these are all the
+        -- default values):
+
+        -- If true, completely hide all values outside the range
+        HideValuesOutsideRange = false,
+        -- Toggle whether the above range color should be used
+        UseAboveRangeColor = true,
+        -- Toggle whether the below range color should be used
+        UseBelowRangeColor = true
+      }
+    },
+    SizeSettings = {
+      -- Reduce the size of the point a little bit so that they don't overlap so much
+      ScaleFactor = 0.5
+    }
+  },
+  GUI = {
+    Name = "Advanced Color Mapping Settings",
+    Path = "/Example/Point Clouds",
+    Description = [[Example of a point cloud where the range is set explicitly and
+      specific colors are used for values outside the range, as well as for missing
+      data values.]]
+  }
+}
+
+
+asset.onInitialize(function()
+  openspace.addSceneGraphNode(Example)
+end)
+
+asset.onDeinitialize(function()
+  openspace.removeSceneGraphNode(Example)
+end)
+
+asset.export(Example)
+
+
+
+asset.meta = {
+  Name = "Example - Advanced Color Mapping Settings",
+  Version = "1.0",
+  Description = [[Example of a point cloud where the range is set explicitly and
+    specific colors are used for values outside the range, as well as for missing
+    data values]],
+  Author = "OpenSpace Team",
+  URL = "http://openspaceproject.com",
+  License = "MIT license"
+}
diff --git a/data/assets/examples/pointclouds/points_datamapping.asset b/data/assets/examples/pointclouds/points_datamapping.asset
new file mode 100644
index 0000000000..791e945257
--- /dev/null
+++ b/data/assets/examples/pointclouds/points_datamapping.asset
@@ -0,0 +1,68 @@
+local earthAsset = asset.require("scene/solarsystem/planets/earth/earth")
+
+
+
+local Example = {
+  Identifier = "ExamplePoints_DataMapping",
+  Parent = earthAsset.Earth.Identifier,
+  Renderable = {
+    Type = "RenderablePointCloud",
+    File = asset.resource("data/dummydata.csv"),
+    DataMapping = {
+      -- Using the DataMapping, we can specify the X, Y and Z values of the point
+      -- positions to be set by any value in the dataset, without changing the dataset
+      -- used for the rendering
+      X = "a",
+      Y = "b",
+      Z = "a",
+      -- It is also possible to specify a numeric value that corresponds to missing
+      -- values in the dataset. These will be interpreted as NaN values
+      MissingDataValue = 29,
+      -- And some column that we do not want to include in the loading. Here we can for
+      -- example skip the regular position columns
+      ExcludeColumns = { "x", "y", "z" }
+    },
+    -- Interpret values as Parsec rather than meter. The values in the a and b columns
+    -- are much smaller than the x, y and z
+    Unit = "pc",
+    -- To show the values corresponding to missing values, use a color map and show
+    -- missing data values in a specific color
+    Coloring = {
+      ColorMapping = {
+        File = asset.resource("viridis.cmap"),
+        ShowMissingData = true,
+        NoDataColor = { 1.0, 0.0, 0.0, 1.0 }
+      }
+    },
+  },
+  GUI = {
+    Name = "Data Mapping",
+    Path = "/Example/Point Clouds",
+    Description = [[Example of a point cloud where the X, Y and Z position are mapped to
+      other columns in the dataset.]]
+  }
+}
+
+
+asset.onInitialize(function()
+  openspace.addSceneGraphNode(Example)
+end)
+
+asset.onDeinitialize(function()
+  openspace.removeSceneGraphNode(Example)
+end)
+
+asset.export(Example)
+
+
+
+asset.meta = {
+  Name = "Example - Point Cloud with Custom Data Mapping",
+  Version = "1.0",
+  Description = [[Example of a point cloud where the X, Y and Z position are mapped to
+    other columns in the dataset. The data mapping also includes some settings for
+    missing data values and columns to exclude when loading the dataset]],
+  Author = "OpenSpace Team",
+  URL = "http://openspaceproject.com",
+  License = "MIT license"
+}
diff --git a/data/assets/examples/pointclouds/points_fading.asset b/data/assets/examples/pointclouds/points_fading.asset
new file mode 100644
index 0000000000..2b9b5ea604
--- /dev/null
+++ b/data/assets/examples/pointclouds/points_fading.asset
@@ -0,0 +1,88 @@
+local earthAsset = asset.require("scene/solarsystem/planets/earth/earth")
+
+
+
+local EarthRadius = 6371000
+
+local Example = {
+  Identifier = "ExamplePoints_Fading",
+  Parent = earthAsset.Earth.Identifier,
+  Renderable = {
+    Type = "RenderablePointCloud",
+    File = asset.resource("data/dummydata.csv"),
+    Coloring = {
+      FixedColor = { 0.0, 0.3, 1.0 }
+    },
+    Fading = {
+      -- Control at what distance the points fade in. The points will be invisible
+      -- when the camera is closer than the first value, and fully visible when the
+      -- camera is further away then the last value. In-between they will linearly
+      -- fade in or out
+      FadeInDistances = { 15.0 * EarthRadius, 35.0 * EarthRadius }
+    }
+  },
+  GUI = {
+    Name = "PointCloud - Fading",
+    Path = "/Example/Point Clouds",
+    Description = [[Example of a point cloud with distance-based fading (the points
+      are visible when the camera reaches a certain distance away from the origin)]]
+  }
+}
+
+local Example_Invert = {
+  Identifier = "ExamplePoints_FadingInverted",
+  Parent = earthAsset.Earth.Identifier,
+  -- Rotate so that the points don't overlap with the previous ones
+  Transform = {
+    Rotation = {
+      Type = "StaticRotation",
+      Rotation = { 0, math.pi, 0 }
+    }
+  },
+  Renderable = {
+    Type = "RenderablePointCloud",
+    File = asset.resource("data/dummydata.csv"),
+    Coloring = {
+      FixedColor = { 1.0, 0.3, 0.0 }
+    },
+    Fading = {
+      -- Use the same fade distances, but invert the fading so that the points are
+      -- visible when the camera is closer to the origin that the first value, and
+      -- invisible when further away than the last value
+      FadeInDistances = { 15.0 * EarthRadius, 35.0 * EarthRadius },
+      Invert = true
+    }
+  },
+  GUI = {
+    Name = "PointCloud - Fading (Inverted)",
+    Path = "/Example/Point Clouds",
+    Description = [[Example of a point cloud with inverted distance-based fading
+      (the points are visible when the camera is close to the origin, and invisible
+      when further away)]]
+  }
+}
+
+
+asset.onInitialize(function()
+  openspace.addSceneGraphNode(Example)
+  openspace.addSceneGraphNode(Example_Invert)
+end)
+
+asset.onDeinitialize(function()
+  openspace.removeSceneGraphNode(Example_Invert)
+  openspace.removeSceneGraphNode(Example)
+end)
+
+asset.export(Example)
+asset.export(Example_Invert)
+
+
+
+asset.meta = {
+  Name = "Example - Point Cloud with Fading",
+  Version = "1.0",
+  Description = [[Example of a point cloud with distance-based fading]],
+  Author = "OpenSpace Team",
+  URL = "http://openspaceproject.com",
+  License = "MIT license"
+}
diff --git a/data/assets/examples/pointclouds/points_units_labels.asset b/data/assets/examples/pointclouds/points_units_labels.asset
new file mode 100644
index 0000000000..a1d02c3247
--- /dev/null
+++ b/data/assets/examples/pointclouds/points_units_labels.asset
@@ -0,0 +1,55 @@
+local earthAsset = asset.require("scene/solarsystem/planets/earth/earth")
+
+
+
+local Example = {
+  Identifier = "ExamplePoints_UnitsAndLabels",
+  Parent = earthAsset.Earth.Identifier,
+  Renderable = {
+    Type = "RenderablePointCloud",
+    File = asset.resource("data/dummydata.csv"),
+    Coloring = {
+      FixedColor = { 0.0, 0.3, 1.0 }
+    },
+    -- Add a unit to interpret the points to be in kilometers rather than meters
+    Unit = "Km",
+    -- Also load a label file with the same position information as the CSV file.
+    -- The unit should be the same as the renderable
+    Labels = {
+      Enabled = true,
+      File = asset.resource("data/dummydata.label"),
+      Size = 7.5,
+      Unit = "Km"
+    }
+    -- @TODO The labels are not correctly oriented towards the camera!
+  },
+  GUI = {
+    Name = "Units & Labels",
+    Path = "/Example/Point Clouds",
+    Description = [[Example of a point cloud where a spcific unit is used when
+      interpreting the position values, and text labels are placed at the points]]
+  }
+}
+
+
+asset.onInitialize(function()
+  openspace.addSceneGraphNode(Example)
+end)
+
+asset.onDeinitialize(function()
+  openspace.removeSceneGraphNode(Example)
+end)
+
+asset.export(Example)
+
+
+
+asset.meta = {
+  Name = "Example - Point Cloud with Unit and Labels",
+  Version = "1.0",
+  Description = [[Example of a point cloud where a spcific unit is used when
+    interpreting the position values, and text labels are placed at the points]],
+  Author = "OpenSpace Team",
+  URL = "http://openspaceproject.com",
+  License = "MIT license"
+}
diff --git a/data/assets/examples/pointclouds/polygon_cloud.asset b/data/assets/examples/pointclouds/polygon_cloud.asset
new file mode 100644
index 0000000000..6b2ba10677
--- /dev/null
+++ b/data/assets/examples/pointclouds/polygon_cloud.asset
@@ -0,0 +1,45 @@
+local Example = {
+  Identifier = "ExamplePoints_Polygon",
+  Renderable = {
+    Type = "RenderablePolygonCloud",
+    File = asset.resource("data/dummydata.csv"),
+    Coloring = {
+      FixedColor = { 0.8, 0.0, 0.0 }
+    },
+    -- Specify the number of sides for the polygon. 3 = triangle, 4 = square,
+    -- 5 = pentagon, 6 = hexagon, and so on
+    PolygonSides = 6,
+    -- Scale up the dataset, so that it is interpreted in Kilometers instead of meters,
+    -- for increased visiblity
+    Unit = "Km"
+  },
+  GUI = {
+    Name = "Polygon Cloud",
+    Path = "/Example/Point Clouds",
+    Description = [[Example of a polygon cloud, which is a point cloud where a uniform
+      polygon is used for the shape of the points]]
+  }
+}
+
+
+asset.onInitialize(function()
+  openspace.addSceneGraphNode(Example)
+end)
+
+asset.onDeinitialize(function()
+  openspace.removeSceneGraphNode(Example)
+end)
+
+asset.export(Example)
+
+
+
+asset.meta = {
+  Name = "Example - Polygon Cloud",
+  Version = "1.0",
+  Description = [[Example of a polygon cloud, which is a point cloud where a uniform
+  polygon is used for the shape of the points]],
+  Author = "OpenSpace Team",
+  URL = "http://openspaceproject.com",
+  License = "MIT license"
+}
diff --git a/data/assets/examples/pointclouds/viridis.cmap b/data/assets/examples/pointclouds/viridis.cmap
new file mode 100644
index 0000000000..2c00fba35d
--- /dev/null
+++ b/data/assets/examples/pointclouds/viridis.cmap
@@ -0,0 +1,258 @@
+# Viridis Color map
+256
+0.267004 0.004874 0.329415 1.000000
+0.268510 0.009605 0.335427 1.000000
+0.269944 0.014625 0.341379 1.000000
+0.271305 0.019942 0.347269 1.000000
+0.272594 0.025563 0.353093 1.000000
+0.273809 0.031497 0.358853 1.000000
+0.274952 0.037752 0.364543 1.000000
+0.276022 0.044167 0.370164 1.000000
+0.277018 0.050344 0.375715 1.000000
+0.277941 0.056324 0.381191 1.000000
+0.278791 0.062145 0.386592 1.000000
+0.279566 0.067836 0.391917 1.000000
+0.280267 0.073417 0.397163 1.000000
+0.280894 0.078907 0.402329 1.000000
+0.281446 0.084320 0.407414 1.000000
+0.281924 0.089666 0.412415 1.000000
+0.282327 0.094955 0.417331 1.000000
+0.282656 0.100196 0.422160 1.000000
+0.282910 0.105393 0.426902 1.000000
+0.283091 0.110553 0.431554 1.000000
+0.283197 0.115680 0.436115 1.000000
+0.283229 0.120777 0.440584 1.000000
+0.283187 0.125848 0.444960 1.000000
+0.283072 0.130895 0.449241 1.000000
+0.282884 0.135920 0.453427 1.000000
+0.282623 0.140926 0.457517 1.000000
+0.282290 0.145912 0.461510 1.000000
+0.281887 0.150881 0.465405 1.000000
+0.281412 0.155834 0.469201 1.000000
+0.280868 0.160771 0.472899 1.000000
+0.280255 0.165693 0.476498 1.000000
+0.279574 0.170599 0.479997 1.000000
+0.278826 0.175490 0.483397 1.000000
+0.278012 0.180367 0.486697 1.000000
+0.277134 0.185228 0.489898 1.000000
+0.276194 0.190074 0.493001 1.000000
+0.275191 0.194905 0.496005 1.000000
+0.274128 0.199721 0.498911 1.000000
+0.273006 0.204520 0.501721 1.000000
+0.271828 0.209303 0.504434 1.000000
+0.270595 0.214069 0.507052 1.000000
+0.269308 0.218818 0.509577 1.000000
+0.267968 0.223549 0.512008 1.000000
+0.266580 0.228262 0.514349 1.000000
+0.265145 0.232956 0.516599 1.000000
+0.263663 0.237631 0.518762 1.000000
+0.262138 0.242286 0.520837 1.000000
+0.260571 0.246922 0.522828 1.000000
+0.258965 0.251537 0.524736 1.000000
+0.257322 0.256130 0.526563 1.000000
+0.255645 0.260703 0.528312 1.000000
+0.253935 0.265254 0.529983 1.000000
+0.252194 0.269783 0.531579 1.000000
+0.250425 0.274290 0.533103 1.000000
+0.248629 0.278775 0.534556 1.000000
+0.246811 0.283237 0.535941 1.000000
+0.244972 0.287675 0.537260 1.000000
+0.243113 0.292092 0.538516 1.000000
+0.241237 0.296485 0.539709 1.000000
+0.239346 0.300855 0.540844 1.000000
+0.237441 0.305202 0.541921 1.000000
+0.235526 0.309527 0.542944 1.000000
+0.233603 0.313828 0.543914 1.000000
+0.231674 0.318106 0.544834 1.000000
+0.229739 0.322361 0.545706 1.000000
+0.227802 0.326594 0.546532 1.000000
+0.225863 0.330805 0.547314 1.000000
+0.223925 0.334994 0.548053 1.000000
+0.221989 0.339161 0.548752 1.000000
+0.220057 0.343307 0.549413 1.000000
+0.218130 0.347432 0.550038 1.000000
+0.216210 0.351535 0.550627 1.000000
+0.214298 0.355619 0.551184 1.000000
+0.212395 0.359683 0.551710 1.000000
+0.210503 0.363727 0.552206 1.000000
+0.208623 0.367752 0.552675 1.000000
+0.206756 0.371758 0.553117 1.000000
+0.204903 0.375746 0.553533 1.000000
+0.203063 0.379716 0.553925 1.000000
+0.201239 0.383670 0.554294 1.000000
+0.199430 0.387607 0.554642 1.000000
+0.197636 0.391528 0.554969 1.000000
+0.195860 0.395433 0.555276 1.000000
+0.194100 0.399323 0.555565 1.000000
+0.192357 0.403199 0.555836 1.000000
+0.190631 0.407061 0.556089 1.000000
+0.188923 0.410910 0.556326 1.000000
+0.187231 0.414746 0.556547 1.000000
+0.185556 0.418570 0.556753 1.000000
+0.183898 0.422383 0.556944 1.000000
+0.182256 0.426184 0.557120 1.000000
+0.180629 0.429975 0.557282 1.000000
+0.179019 0.433756 0.557430 1.000000
+0.177423 0.437527 0.557565 1.000000
+0.175841 0.441290 0.557685 1.000000
+0.174274 0.445044 0.557792 1.000000
+0.172719 0.448791 0.557885 1.000000
+0.171176 0.452530 0.557965 1.000000
+0.169646 0.456262 0.558030 1.000000
+0.168126 0.459988 0.558082 1.000000
+0.166617 0.463708 0.558119 1.000000
+0.165117 0.467423 0.558141 1.000000
+0.163625 0.471133 0.558148 1.000000
+0.162142 0.474838 0.558140 1.000000
+0.160665 0.478540 0.558115 1.000000
+0.159194 0.482237 0.558073 1.000000
+0.157729 0.485932 0.558013 1.000000
+0.156270 0.489624 0.557936 1.000000
+0.154815 0.493313 0.557840 1.000000
+0.153364 0.497000 0.557724 1.000000
+0.151918 0.500685 0.557587 1.000000
+0.150476 0.504369 0.557430 1.000000
+0.149039 0.508051 0.557250 1.000000
+0.147607 0.511733 0.557049 1.000000
+0.146180 0.515413 0.556823 1.000000
+0.144759 0.519093 0.556572 1.000000
+0.143343 0.522773 0.556295 1.000000
+0.141935 0.526453 0.555991 1.000000
+0.140536 0.530132 0.555659 1.000000
+0.139147 0.533812 0.555298 1.000000
+0.137770 0.537492 0.554906 1.000000
+0.136408 0.541173 0.554483 1.000000
+0.135066 0.544853 0.554029 1.000000
+0.133743 0.548535 0.553541 1.000000
+0.132444 0.552216 0.553018 1.000000
+0.131172 0.555899 0.552459 1.000000
+0.129933 0.559582 0.551864 1.000000
+0.128729 0.563265 0.551229 1.000000
+0.127568 0.566949 0.550556 1.000000
+0.126453 0.570633 0.549841 1.000000
+0.125394 0.574318 0.549086 1.000000
+0.124395 0.578002 0.548287 1.000000
+0.123463 0.581687 0.547445 1.000000
+0.122606 0.585371 0.546557 1.000000
+0.121831 0.589055 0.545623 1.000000
+0.121148 0.592739 0.544641 1.000000
+0.120565 0.596422 0.543611 1.000000
+0.120092 0.600104 0.542530 1.000000
+0.119738 0.603785 0.541400 1.000000
+0.119512 0.607464 0.540218 1.000000
+0.119423 0.611141 0.538982 1.000000
+0.119483 0.614817 0.537692 1.000000
+0.119699 0.618490 0.536347 1.000000
+0.120081 0.622161 0.534946 1.000000
+0.120638 0.625828 0.533488 1.000000
+0.121380 0.629492 0.531973 1.000000
+0.122312 0.633153 0.530398 1.000000
+0.123444 0.636809 0.528763 1.000000
+0.124780 0.640461 0.527068 1.000000
+0.126326 0.644107 0.525311 1.000000
+0.128087 0.647749 0.523491 1.000000
+0.130067 0.651384 0.521608 1.000000
+0.132268 0.655014 0.519661 1.000000
+0.134692 0.658636 0.517649 1.000000
+0.137339 0.662252 0.515571 1.000000
+0.140210 0.665859 0.513427 1.000000
+0.143303 0.669459 0.511215 1.000000
+0.146616 0.673050 0.508936 1.000000
+0.150148 0.676631 0.506589 1.000000
+0.153894 0.680203 0.504172 1.000000
+0.157851 0.683765 0.501686 1.000000
+0.162016 0.687316 0.499129 1.000000
+0.166383 0.690856 0.496502 1.000000
+0.170948 0.694384 0.493803 1.000000
+0.175707 0.697900 0.491033 1.000000
+0.180653 0.701402 0.488189 1.000000
+0.185783 0.704891 0.485273 1.000000
+0.191090 0.708366 0.482284 1.000000
+0.196571 0.711827 0.479221 1.000000
+0.202219 0.715272 0.476084 1.000000
+0.208030 0.718701 0.472873 1.000000
+0.214000 0.722114 0.469588 1.000000
+0.220124 0.725509 0.466226 1.000000
+0.226397 0.728888 0.462789 1.000000
+0.232815 0.732247 0.459277 1.000000
+0.239374 0.735588 0.455688 1.000000
+0.246070 0.738910 0.452024 1.000000
+0.252899 0.742211 0.448284 1.000000
+0.259857 0.745492 0.444467 1.000000
+0.266941 0.748751 0.440573 1.000000
+0.274149 0.751988 0.436601 1.000000
+0.281477 0.755203 0.432552 1.000000
+0.288921 0.758394 0.428426 1.000000
+0.296479 0.761561 0.424223 1.000000
+0.304148 0.764704 0.419943 1.000000
+0.311925 0.767822 0.415586 1.000000
+0.319809 0.770914 0.411152 1.000000
+0.327796 0.773980 0.406640 1.000000
+0.335885 0.777018 0.402049 1.000000
+0.344074 0.780029 0.397381 1.000000
+0.352360 0.783011 0.392636 1.000000
+0.360741 0.785964 0.387814 1.000000
+0.369214 0.788888 0.382914 1.000000
+0.377779 0.791781 0.377939 1.000000
+0.386433 0.794644 0.372886 1.000000
+0.395174 0.797475 0.367757 1.000000
+0.404001 0.800275 0.362552 1.000000
+0.412913 0.803041 0.357269 1.000000
+0.421908 0.805774 0.351910 1.000000
+0.430983 0.808473 0.346476 1.000000
+0.440137 0.811138 0.340967 1.000000
+0.449368 0.813768 0.335384 1.000000
+0.458674 0.816363 0.329727 1.000000
+0.468053 0.818921 0.323998 1.000000
+0.477504 0.821444 0.318195 1.000000
+0.487026 0.823929 0.312321 1.000000
+0.496615 0.826376 0.306377 1.000000
+0.506271 0.828786 0.300362 1.000000
+0.515992 0.831158 0.294279 1.000000
+0.525776 0.833491 0.288127 1.000000
+0.535621 0.835785 0.281908 1.000000
+0.545524 0.838039 0.275626 1.000000
+0.555484 0.840254 0.269281 1.000000
+0.565498 0.842430 0.262877 1.000000
+0.575563 0.844566 0.256415 1.000000
+0.585678 0.846661 0.249897 1.000000
+0.595839 0.848717 0.243329 1.000000
+0.606045 0.850733 0.236712 1.000000
+0.616293 0.852709 0.230052 1.000000
+0.626579 0.854645 0.223353 1.000000
+0.636902 0.856542 0.216620 1.000000
+0.647257 0.858400 0.209861 1.000000
+0.657642 0.860219 0.203082 1.000000
+0.668054 0.861999 0.196293 1.000000
+0.678489 0.863742 0.189503 1.000000
+0.688944 0.865448 0.182725 1.000000
+0.699415 0.867117 0.175971 1.000000
+0.709898 0.868751 0.169257 1.000000
+0.720391 0.870350 0.162603 1.000000
+0.730889 0.871916 0.156029 1.000000
+0.741388 0.873449 0.149561 1.000000
+0.751884 0.874951 0.143228 1.000000
+0.762373 0.876424 0.137064 1.000000
+0.772852 0.877868 0.131109 1.000000
+0.783315 0.879285 0.125405 1.000000
+0.793760 0.880678 0.120005 1.000000
+0.804182 0.882046 0.114965 1.000000
+0.814576 0.883393 0.110347 1.000000
+0.824940 0.884720 0.106217 1.000000
+0.835270 0.886029 0.102646 1.000000
+0.845561 0.887322 0.099702 1.000000
+0.855810 0.888601 0.097452 1.000000
+0.866013 0.889868 0.095953 1.000000
+0.876168 0.891125 0.095250 1.000000
+0.886271 0.892374 0.095374 1.000000
+0.896320 0.893616 0.096335 1.000000
+0.906311 0.894855 0.098125 1.000000
+0.916242 0.896091 0.100717 1.000000
+0.926106 0.897330 0.104071 1.000000
+0.935904 0.898570 0.108131 1.000000
+0.945636 0.899815 0.112838 1.000000
+0.955300 0.901065 0.118128 1.000000
+0.964894 0.902323 0.123941 1.000000
+0.974417 0.903590 0.130215 1.000000
+0.983868 0.904867 0.136897 1.000000
+0.993248 0.906157 0.143936 1.000000
diff --git a/data/assets/scene/digitaluniverse/2dF.asset b/data/assets/scene/digitaluniverse/2dF.asset
index fca4597e97..a86bea1544 100644
--- a/data/assets/scene/digitaluniverse/2dF.asset
+++ b/data/assets/scene/digitaluniverse/2dF.asset
@@ -9,26 +9,33 @@ local speck = asset.resource({
   Name = "2dF Speck Files",
   Type = "HttpSynchronization",
   Identifier = "digitaluniverse_2dF_speck",
-  Version = 2
+  Version = 3
 })
 
 
 local Object = {
   Identifier = "2dF",
   Renderable = {
-    Type = "RenderableBillboardsCloud",
+    Type = "RenderablePointCloud",
     Enabled = false,
-    Color = { 1.0, 1.0, 1.0 },
     Opacity = 1.0,
     File = speck .. "2dF.speck",
     Unit = "Mpc",
     Texture = textures .. "point3A.png",
-    ColorMap = speck .. "2dF.cmap",
-    ColorOption = { "redshift", "proximity" },
-    ColorRange = { { 0.0, 0.075 }, { 1.0, 25.0 } },
-    ScaleFactor = 520.0,
-    BillboardMinMaxSize = { 0.0, 4.7 },
-    EnablePixelSizeControl = true
+    Coloring = {
+      ColorMapping = {
+        File = speck .. "2dF.cmap",
+        ParameterOptions = {
+          { Key = "proximity", Range = { 1.0, 25.0 } },
+          { Key = "redshift", Range = { 0.0, 0.075 } }
+        }
+      }
+    },
+    SizeSettings = {
+      ScaleExponent = 22.6,
+      MaxPixelSize = 4.7,
+      EnablePixelSizeControl = true
+    }
   },
   GUI = {
     Name = "2dF Galaxies",
@@ -64,7 +71,7 @@ asset.export(Object)
 
 asset.meta = {
   Name = "2dF Galaxies",
-  Version = "2.1",
+  Version = "3.0",
   Description = "Digital Universe asset for the The Two-degree Field (2dF) Survey",
   Author = "Brian Abbott (AMNH), Eric Gawiser (Rutgers U)",
   URL = "https://www.amnh.org/research/hayden-planetarium/digital-universe",
diff --git a/data/assets/scene/digitaluniverse/2mass.asset b/data/assets/scene/digitaluniverse/2mass.asset
index da92e173fc..8ed791380b 100644
--- a/data/assets/scene/digitaluniverse/2mass.asset
+++ b/data/assets/scene/digitaluniverse/2mass.asset
@@ -9,28 +9,34 @@ local speck = asset.resource({
   Name = "2MASS Speck Files",
   Type = "HttpSynchronization",
   Identifier = "digitaluniverse_2mass_speck",
-  Version = 1
+  Version = 2
 })
 
 
 local Object = {
   Identifier = "2MASS",
   Renderable = {
-    Type = "RenderableBillboardsCloud",
+    Type = "RenderablePointCloud",
     Enabled = false,
-    Color = { 1.0, 0.4, 0.2 },
     Opacity = 1.0,
     File = speck .. "2MASS.speck",
     Unit = "Mpc",
     Texture = textures .. "point3A.png",
-    ColorMap = speck .. "lss.cmap",
-    ColorOption = { "redshift", "prox5Mpc" },
-    ColorRange = { { 0.0, 0.075 }, { 1.0, 50.0 } },
-    CorrectionSizeEndDistance = 20.6,
-    CorrectionSizeFactor = 15.0,
-    ScaleFactor = 510.78,
-    BillboardMinMaxSize = { 0.0, 11.15 },
-    EnablePixelSizeControl = true
+    Coloring = {
+      FixedColor = { 1.0, 0.4, 0.2 },
+      ColorMapping = {
+        File = speck .. "lss.cmap",
+        ParameterOptions = {
+          { Key = "prox5Mpc", Range = { 1.0, 50.0 } },
+          { Key = "redshift", Range = { 0.0, 0.075 } }
+        }
+      }
+    },
+    SizeSettings = {
+      ScaleExponent = 22.5,
+      MaxPixelSize = 11.15,
+      EnablePixelSizeControl = true
+    }
   },
   GUI = {
     Name = "2MASS Galaxies",
@@ -60,7 +66,7 @@ asset.export(Object)
 
 asset.meta = {
   Name = "2MASS Galaxies",
-  Version = "1.1",
+  Version = "2.0",
   Description = "Digital Universe asset for the Two Micron All-Sky Survey (2MASS) survey",
   Author = "Brian Abbott (AMNH)",
   URL = "https://www.amnh.org/research/hayden-planetarium/digital-universe",
diff --git a/data/assets/scene/digitaluniverse/6dF.asset b/data/assets/scene/digitaluniverse/6dF.asset
index 34bdd92b3b..780aefc678 100644
--- a/data/assets/scene/digitaluniverse/6dF.asset
+++ b/data/assets/scene/digitaluniverse/6dF.asset
@@ -9,26 +9,34 @@ local speck = asset.resource({
   Name = "6dF Speck Files",
   Type = "HttpSynchronization",
   Identifier = "digitaluniverse_6dF_speck",
-  Version = 2
+  Version = 3
 })
 
 
 local Object = {
   Identifier = "6dF",
   Renderable = {
-    Type = "RenderableBillboardsCloud",
+    Type = "RenderablePointCloud",
     Enabled = false,
-    Color = { 1.0, 1.0, 0.0 },
     Opacity = 1.0,
     File = speck .. "6dF.speck",
     Unit = "Mpc",
     Texture = textures .. "point3A.png",
-    ColorMap = speck .. "6dF.cmap",
-    ColorOption = { "redshift", "proximity" },
-    ColorRange = { { 0.0, 0.075 }, { 1.0, 10.0 } },
-    ScaleFactor = 534.0,
-    BillboardMinMaxSize = { 0.0, 9.0 },
-    EnablePixelSizeControl = true
+    Coloring = {
+      FixedColor = { 1.0, 1.0, 0.0 },
+      ColorMapping = {
+        File = speck .. "6dF.cmap",
+        ParameterOptions = {
+          { Key = "proximity", Range = { 1.0, 10.0 } },
+          { Key = "redshift", Range = { 0.0, 0.075 } }
+        }
+      }
+    },
+    SizeSettings = {
+      ScaleExponent = 23.2,
+      MaxPixelSize = 9.0,
+      EnablePixelSizeControl = true
+    }
   },
   GUI = {
     Name = "6dF Galaxies",
@@ -62,7 +70,7 @@ asset.export(Object)
 
 asset.meta = {
   Name = "6dF Galaxies",
-  Version = "2.1",
+  Version = "3.0",
   Description = "Digital Universe asset for The Six-degree Field (6dF) Galaxy Survey",
   Author = "Brian Abbott (AMNH)",
   URL = "https://www.amnh.org/research/hayden-planetarium/digital-universe",
diff --git a/data/assets/scene/digitaluniverse/abell.asset b/data/assets/scene/digitaluniverse/abell.asset
index b7c5de498d..2e3f6f0d02 100644
--- a/data/assets/scene/digitaluniverse/abell.asset
+++ b/data/assets/scene/digitaluniverse/abell.asset
@@ -9,7 +9,7 @@ local speck = asset.resource({
   Name = "Abell Speck Files",
   Type = "HttpSynchronization",
   Identifier = "digitaluniverse_abell_speck",
-  Version = 2
+  Version = 3
 })
 
 
@@ -23,7 +23,7 @@ local TransformMatrix = {
 local Object = {
   Identifier = "Abell",
   Renderable = {
-    Type = "RenderableBillboardsCloud",
+    Type = "RenderablePointCloud",
     Enabled = false,
     Labels = {
       File = speck .. "abell.label",
@@ -34,16 +34,20 @@ local Object = {
       Unit = "Mpc",
       TransformationMatrix = TransformMatrix
     },
-    Color = { 1.0, 0.4, 0.2 },
     Opacity = 1.0,
-    --ColorMap = speck .. "abell.cmap",
+    Coloring = {
+      FixedColor = { 1.0, 0.4, 0.2 },
+      --ColorMap = speck .. "abell.cmap", -- TODO: Decide whether to add
+    },
     File = speck .. "abell.speck",
     Texture = textures .. "point3A.png",
     Unit = "Mpc",
     TransformationMatrix = TransformMatrix,
-    ScaleFactor = 520.0,
-    BillboardMinMaxSize = { 0.0, 7.0 },
-    EnablePixelSizeControl = true
+    SizeSettings = {
+      ScaleExponent = 22.6,
+      MaxPixelSize = 7.0,
+      EnablePixelSizeControl = true
+    }
   },
   GUI = {
     Name = "Abell Galaxy Clusters",
@@ -78,7 +82,7 @@ asset.export(Object)
 
 asset.meta = {
   Name = "Abell Galaxy Clusters",
-  Version = "2.1",
+  Version = "3.0",
   Description = "Digital Universe asset for The Abell catalog",
   Author = "Stuart Levy (NCSA/UIUC), Brian Abbott (AMNH)",
   URL = "https://www.amnh.org/research/hayden-planetarium/digital-universe",
diff --git a/data/assets/scene/digitaluniverse/alternatestarlabels.asset b/data/assets/scene/digitaluniverse/alternatestarlabels.asset
index 070e50eb7d..6ae6004962 100644
--- a/data/assets/scene/digitaluniverse/alternatestarlabels.asset
+++ b/data/assets/scene/digitaluniverse/alternatestarlabels.asset
@@ -9,7 +9,7 @@ local speck = asset.resource({
 local Object = {
   Identifier = "StarLabelsAlternate",
   Renderable = {
-    Type = "RenderableBillboardsCloud",
+    Type = "RenderablePointCloud",
     Enabled = false,
     Labels = {
       Enabled = true,
@@ -19,7 +19,6 @@ local Object = {
       MinMaxSize = { 6, 20 },
       Unit = "pc"
     },
-    Color = { 1.0, 1.0, 1.0 },
     Opacity = 0.65,
     Unit = "pc"
   },
@@ -51,7 +50,7 @@ asset.export(Object)
 
 asset.meta = {
   Name = "Stars Labels - Alternate",
-  Version = "1.1",
+  Version = "2.0",
   Description = "Digital Universe asset for alternate start labels",
   Author = "Brian Abbott (AMNH)",
   URL = "https://www.amnh.org/research/hayden-planetarium/digital-universe",
diff --git a/data/assets/scene/digitaluniverse/clusters.asset b/data/assets/scene/digitaluniverse/clusters.asset
index f266d6afb9..96ff69dad6 100644
--- a/data/assets/scene/digitaluniverse/clusters.asset
+++ b/data/assets/scene/digitaluniverse/clusters.asset
@@ -16,7 +16,7 @@ local TransformMatrix = {
 local Object = {
   Identifier = "GalaxyClusterLabels",
   Renderable = {
-    Type = "RenderableBillboardsCloud",
+    Type = "RenderablePointCloud",
     Enabled = false,
     Labels = {
       Enabled = true,
@@ -27,7 +27,6 @@ local Object = {
       Unit = "Mpc",
       TransformationMatrix = TransformMatrix
     },
-    Color = { 1.0, 1.0, 1.0 },
     Opacity = 0.65,
     Unit = "Mpc",
     TransformationMatrix = TransformMatrix
@@ -58,7 +57,7 @@ asset.export(Object)
 
 asset.meta = {
   Name = "Galaxy Clusters Labels",
-  Version = "1.1",
+  Version = "2.0",
   Description = "Digital Universe asset for Galaxy Clusters",
   Author = "Brian Abbott (AMNH)",
   URL = "https://www.amnh.org/research/hayden-planetarium/digital-universe",
diff --git a/data/assets/scene/digitaluniverse/deepsky.asset b/data/assets/scene/digitaluniverse/deepsky.asset
index 371fd66ea1..6be73ad6e4 100644
--- a/data/assets/scene/digitaluniverse/deepsky.asset
+++ b/data/assets/scene/digitaluniverse/deepsky.asset
@@ -16,7 +16,7 @@ local speck = asset.resource({
 local DeepSkyObjects = {
   Identifier = "DeepSkyObjects",
   Renderable = {
-    Type = "RenderableBillboardsCloud",
+    Type = "RenderablePointCloud",
     Enabled = false,
     Labels = {
       File = speck .. "dso.label",
@@ -25,22 +25,19 @@ local DeepSkyObjects = {
       MinMaxSize = { 16, 20 },
       Unit = "pc"
     },
-    Color = { 1.0, 1.0, 0.0 },
     Opacity = 0.99,
-    ScaleFactor = 500.0,
+    Coloring = {
+      FixedColor = { 1.0, 1.0, 0.0 }
+    },
     File = speck .. "dso.speck",
     Texture = textures .. "point3.png",
-    --ColorMap = speck .. "tully.cmap",
-    --ColorMap = speck .. "lss.cmap",
-    --ColorOption = { "proximity" },
-    --ColorOption = { "prox5Mpc" },
-    --ColorRange = { { 1.0, 30.0 } },
     Unit = "pc",
     --FadeInDistances = { 0.05, 1.0 }, -- Fade in value in the same unit as "Unit"
-    BillboardMinMaxSize = { 0.0, 8.22 }, -- in pixels
-    --CorrectionSizeEndDistance = 22.0,
-    --CorrectionSizeFactor = 10.45
-    EnablePixelSizeControl = true
+    SizeSettings = {
+      ScaleExponent = 21.7,
+      MaxPixelSize = 8.22,
+      EnablePixelSizeControl = true
+    }
   },
   Transform = {
     Rotation = {
@@ -112,7 +109,7 @@ asset.export(DeepSkyObjectsImages)
 
 asset.meta = {
   Name = "Deep Sky Objects Images",
-  Version = "1.1",
+  Version = "2.0",
   Description = "Digital Universe asset for Deep Sky Objects and their Images",
   Author = "Nate Greenstein, Matt Everhart, Brian Abbott (AMNH)",
   URL = "https://www.amnh.org/research/hayden-planetarium/digital-universe",
diff --git a/data/assets/scene/digitaluniverse/dwarfs.asset b/data/assets/scene/digitaluniverse/dwarfs.asset
index fe879a8ec6..312112931d 100644
--- a/data/assets/scene/digitaluniverse/dwarfs.asset
+++ b/data/assets/scene/digitaluniverse/dwarfs.asset
@@ -9,14 +9,14 @@ local speck = asset.resource({
   Name = "Brown Dwarf Speck Files",
   Type = "HttpSynchronization",
   Identifier = "digitaluniverse_dwarfs_speck",
-  Version = 2
+  Version = 3
 })
 
 
 local Object = {
   Identifier = "Dwarfs",
   Renderable = {
-    Type = "RenderableBillboardsCloud",
+    Type = "RenderablePointCloud",
     Enabled = false,
     Labels = {
       File = speck .. "dwarfs.label",
@@ -25,19 +25,24 @@ local Object = {
       MinMaxSize = { 10, 20 },
       Unit = "pc"
     },
-    Color = { 0.4, 0.0, 0.1 },
     Opacity = 1.0,
     File = speck .. "dwarfs.speck",
     Texture = textures .. "point3.png",
     Unit = "pc",
-    ColorMap = speck .. "dwarfs.cmap",
-    ColorOption = { "typeindex" },
-    --ColorRange = { { 1.0, 4.0} },
-    ScaleFactor = 372.1,
-    --CorrectionSizeEndDistance = 16.1,
-    --CorrectionSizeFactor = 7.75,
-    BillboardMinMaxSize = { 0.0, 20.0 },
-    EnablePixelSizeControl = true
+    Coloring = {
+      FixedColor = { 0.4, 0.0, 0.1 },
+      ColorMapping = {
+        File = speck .. "dwarfs.cmap",
+        ParameterOptions = {
+          { Key = "typeindex", Range = { 1.0, 4.0 } }
+        }
+      }
+    },
+    SizeSettings = {
+      ScaleExponent = 16.2,
+      MaxPixelSize = 20.0,
+      EnablePixelSizeControl = true
+    }
   },
   GUI = {
     Name = "Brown Dwarfs",
@@ -77,7 +82,7 @@ asset.export(Object)
 
 asset.meta = {
   Name = "Brown Dwarfs",
-  Version = "2.1",
+  Version = "3.0",
   Description = "Digital Universe asset for Brown Dwarfs",
   Author = "Brian Abbott (AMNH)",
   URL = "https://www.amnh.org/research/hayden-planetarium/digital-universe",
diff --git a/data/assets/scene/digitaluniverse/exoplanets.asset b/data/assets/scene/digitaluniverse/exoplanets.asset
index c20351cb17..f7abff68f8 100644
--- a/data/assets/scene/digitaluniverse/exoplanets.asset
+++ b/data/assets/scene/digitaluniverse/exoplanets.asset
@@ -16,7 +16,7 @@ local speck = asset.resource({
 local Object = {
   Identifier = "Exoplanets",
   Renderable = {
-    Type = "RenderableBillboardsCloud",
+    Type = "RenderablePointCloud",
     Enabled = false,
     Labels = {
       File = speck .. "expl.label",
@@ -25,16 +25,15 @@ local Object = {
       MinMaxSize = { 10, 100 },
       Unit = "pc"
     },
-    Color = { 1.0, 1.0, 1.0 },
     Opacity = 1.0,
     Texture = textures .. "target-blue.png",
     File = speck .. "expl.speck",
     Unit = "pc",
-    ScaleFactor = 388.67923,
-    CorrectionSizeEndDistance = 15.23,
-    CorrectionSizeFactor = 13.3,
-    BillboardMinMaxSize = { 0.0, 75.0 },
-    EnablePixelSizeControl = true
+    SizeSettings = {
+      ScaleExponent = 16.9,
+      MaxPixelSize = 75.0,
+      EnablePixelSizeControl = true
+    }
   },
   GUI = {
     Name = "Exoplanets",
@@ -64,7 +63,7 @@ asset.export(Object)
 
 asset.meta = {
   Name = "Exoplanets",
-  Version = "1.1",
+  Version = "2.0",
   Description = "Digital Universe asset for Exoplanets",
   Author = "Brian Abbott (AMNH)",
   URL = "https://www.amnh.org/research/hayden-planetarium/digital-universe",
diff --git a/data/assets/scene/digitaluniverse/exoplanets_candidates.asset b/data/assets/scene/digitaluniverse/exoplanets_candidates.asset
index 5fa0436b7e..d33e413484 100644
--- a/data/assets/scene/digitaluniverse/exoplanets_candidates.asset
+++ b/data/assets/scene/digitaluniverse/exoplanets_candidates.asset
@@ -16,18 +16,20 @@ local speck = asset.resource({
 local Object = {
   Identifier = "PlanetaryCandidates",
   Renderable = {
-    Type = "RenderableBillboardsCloud",
+    Type = "RenderablePointCloud",
     Enabled = false,
-    Color = { 1.0, 1.0, 0.0 },
     Opacity = 0.99,
-    ScaleFactor = 410.0,
     File = speck .. "exoplanet_candidates.speck",
     Unit = "pc",
     Texture = textures .. "halo.png",
-    CorrectionSizeEndDistance = 15.86,
-    CorrectionSizeFactor = 8.59,
-    BillboardMinMaxSize = { 0.0, 30.0 },
-    EnablePixelSizeControl = true
+    Coloring = {
+      FixedColor = { 1.0, 1.0, 0.0 }
+    },
+    SizeSettings = {
+      ScaleExponent = 17.8,
+      MaxPixelSize = 30.0,
+      EnablePixelSizeControl = true
+    }
   },
   GUI = {
     Name = "Planetary Candidates",
@@ -60,7 +62,7 @@ asset.export(Object)
 
 asset.meta = {
   Name = "Planetary Candidates",
-  Version = "2.1",
+  Version = "3.0",
   Description = "Digital Universe asset for Planetary Candidates",
   Author = "Brian Abbott, Emily Rice, and Jason No (AMNH)",
   URL = "https://www.amnh.org/research/hayden-planetarium/digital-universe",
diff --git a/data/assets/scene/digitaluniverse/globularclusters.asset b/data/assets/scene/digitaluniverse/globularclusters.asset
index 4e7095f8e4..ec6232b7af 100644
--- a/data/assets/scene/digitaluniverse/globularclusters.asset
+++ b/data/assets/scene/digitaluniverse/globularclusters.asset
@@ -16,7 +16,7 @@ local speck = asset.resource({
 local Object = {
   Identifier = "GlobularClusters",
   Renderable = {
-    Type = "RenderableBillboardsCloud",
+    Type = "RenderablePolygonCloud",
     Enabled = false,
     Labels = {
       File = speck .. "gc.label",
@@ -25,15 +25,18 @@ local Object = {
       MinMaxSize = { 4, 20 },
       Unit = "pc"
     },
-    Color = { 0.8, 0.8, 0.0 },
+    Coloring = {
+      FixedColor = { 0.8, 0.8, 0.0 }
+    },
     Opacity = 0.4,
     File = speck .. "gc.speck",
-    Texture = textures .. "point4.png",
     PolygonSides = 5,
     Unit = "pc",
-    ScaleFactor = 431.0,
-    BillboardMinMaxSize = { 0.0, 500.0 },
-    EnablePixelSizeControl = true
+    SizeSettings = {
+      ScaleExponent = 18.7,
+      MaxPixelSize = 500.0,
+      EnablePixelSizeControl = true
+    }
   },
   GUI = {
     Name = "Globular Clusters",
@@ -69,7 +72,7 @@ asset.export(Object)
 
 asset.meta = {
   Name = "Globular Clusters",
-  Version = "2.1",
+  Version = "3.0",
   Description = [[Census: 157 globular clusters. DU Version 2.6. Globular star clusters
     are gravitationally bound groups of 100,000 to 1 million stars. They are compact,
     spherical "balls" of stars with very high stellar densities in their centers (stars
diff --git a/data/assets/scene/digitaluniverse/grids.asset b/data/assets/scene/digitaluniverse/grids.asset
index 65989fab4d..413694058f 100644
--- a/data/assets/scene/digitaluniverse/grids.asset
+++ b/data/assets/scene/digitaluniverse/grids.asset
@@ -126,7 +126,7 @@ local EclipticSphereLabels = {
   Identifier = "EclipticSphereLabels",
   Parent = transforms.SolarSystemBarycenter.Name,
   Renderable = {
-    Type = "RenderableBillboardsCloud",
+    Type = "RenderablePointCloud",
     Enabled = false,
     Labels = {
       Enabled = true,
@@ -137,7 +137,6 @@ local EclipticSphereLabels = {
       Unit = "pc",
       TransformationMatrix = EclipticTransformationMatrix
     },
-    Color = { 1.0, 1.0, 1.0 },
     Opacity = 0.65,
     Unit = "pc",
     TransformationMatrix = EclipticTransformationMatrix
@@ -178,7 +177,7 @@ local EquatorialSphereLabels = {
   Identifier = "EquatorialSphereLabels",
   Parent = transforms.SolarSystemBarycenter.Name,
   Renderable = {
-    Type = "RenderableBillboardsCloud",
+    Type = "RenderablePointCloud",
     Enabled = false,
     Labels = {
       Enabled = true,
@@ -189,7 +188,6 @@ local EquatorialSphereLabels = {
       Unit = "pc",
       TransformationMatrix = EquatorialTransformationMatrix
     },
-    Color = { 1.0, 1.0, 1.0 },
     Opacity = 0.65,
     Unit = "pc",
     TransformationMatrix = EquatorialTransformationMatrix
@@ -226,7 +224,7 @@ local GalacticSphereLabels = {
   Identifier = "GalacticSphereLabels",
   Parent = transforms.SolarSystemBarycenter.Name,
   Renderable = {
-    Type = "RenderableBillboardsCloud",
+    Type = "RenderablePointCloud",
     Enabled = false,
     Labels = {
       Enabled = true,
@@ -236,7 +234,6 @@ local GalacticSphereLabels = {
       MinMaxSize = { 1, 100 },
       Unit = "pc"
     },
-    Color = { 1.0, 1.0, 1.0 },
     Opacity = 0.65,
     Unit = "pc"
   },
@@ -699,7 +696,7 @@ asset.export(Plane20Gly)
 
 asset.meta = {
   Name = "Grids",
-  Version = "2.1",
+  Version = "3.0",
   Description = [[Various grids for showing size reference. Included: 10,000 light year
     grid, 10 light year grid, 20 billion light year grid, 10 million light year grid,
     100 light year grid, 100 million light year grid, Ecliptic Coordinate Sphere
diff --git a/data/assets/scene/digitaluniverse/groups.asset b/data/assets/scene/digitaluniverse/groups.asset
index 03cb117c68..a93d3608f4 100644
--- a/data/assets/scene/digitaluniverse/groups.asset
+++ b/data/assets/scene/digitaluniverse/groups.asset
@@ -16,7 +16,7 @@ local TransformMatrix = {
 local Object = {
   Identifier = "NearbyGalaxyGroups",
   Renderable = {
-    Type = "RenderableBillboardsCloud",
+    Type = "RenderablePointCloud",
     Enabled = false,
     Labels = {
       Enabled = true,
@@ -27,9 +27,7 @@ local Object = {
       Unit = "Mpc",
       TransformationMatrix = TransformMatrix
     },
-    Color = { 1.0, 1.0, 1.0 },
     Opacity = 0.65,
-    --ScaleFactor = 10.0,
     Unit = "Mpc",
     TransformationMatrix = TransformMatrix
   },
@@ -58,7 +56,7 @@ asset.export(Object)
 
 asset.meta = {
   Name = "Galaxy Group Labels",
-  Version = "1.1",
+  Version = "2.0",
   Author = "Brian Abbott (AMNH)",
   Description = "Digital Universe asset for Galaxy Groups",
   URL = "https://www.amnh.org/research/hayden-planetarium/digital-universe",
diff --git a/data/assets/scene/digitaluniverse/h2regions.asset b/data/assets/scene/digitaluniverse/h2regions.asset
index c5fb3baced..3868e22b08 100644
--- a/data/assets/scene/digitaluniverse/h2regions.asset
+++ b/data/assets/scene/digitaluniverse/h2regions.asset
@@ -16,7 +16,7 @@ local speck = asset.resource({
 local Object = {
   Identifier = "HIIRegions",
   Renderable = {
-    Type = "RenderableBillboardsCloud",
+    Type = "RenderablePolygonCloud",
     Enabled = false,
     Labels = {
       File = speck .. "h2.label",
@@ -25,15 +25,18 @@ local Object = {
       MinMaxSize = { 4, 20 },
       Unit = "pc"
     },
-    Color = { 0.0, 0.5, 1.0 },
+    Coloring = {
+      FixedColor = { 0.0, 0.5, 1.0 }
+    },
     Opacity = 0.70,
     File = speck .. "h2.speck",
-    Texture = textures .. "point4.png",
     PolygonSides = 6,
     Unit = "pc",
-    ScaleFactor = 420.0,
-    BillboardMinMaxSize = { 0.0, 300.0 },
-    EnablePixelSizeControl = false
+    SizeSettings = {
+      ScaleExponent = 18.24,
+      MaxPixelSize = 300.0,
+      EnablePixelSizeControl = false
+    }
   },
   GUI = {
     Name = "HII Regions",
@@ -67,7 +70,7 @@ asset.export(Object)
 
 asset.meta = {
   Name = "HII Regions",
-  Version = "1.1",
+  Version = "2.0",
   Description = "Digital Universe asset for HII Regions",
   Author = "Carter Emmart, Brian Abbott (AMNH)",
   URL = "https://www.amnh.org/research/hayden-planetarium/digital-universe",
diff --git a/data/assets/scene/digitaluniverse/hdf.asset b/data/assets/scene/digitaluniverse/hdf.asset
index f34094b0c2..e44aeec0c0 100644
--- a/data/assets/scene/digitaluniverse/hdf.asset
+++ b/data/assets/scene/digitaluniverse/hdf.asset
@@ -23,19 +23,26 @@ local ColorMap = asset.resource({
 local Object = {
   Identifier = "HubbleDeepField",
   Renderable = {
-    Type = "RenderableBillboardsCloud",
+    Type = "RenderablePointCloud",
     Enabled = false,
-    Color = { 1.0, 1.0, 1.0 },
     Opacity = 1.0,
     File = HUDFSpeck .. "hudf.speck",
     Texture = circle .. "circle.png",
-    ColorMap = ColorMap .. "hudf.cmap",
-    ColorOption = { "redshift", "proximity" },
-    ColorRange = { { 0.0, 0.075 }, { 1.0, 25.0 } },
+    Coloring = {
+      ColorMapping = {
+        File = ColorMap .. "hudf.cmap",
+        ParameterOptions = {
+          { Key = "proximity", Range = { 1.0, 25.0 } },
+          { Key = "redshift", Range = { 0.0, 0.075 } }
+        }
+      }
+    },
     Unit = "Mpc",
-    ScaleFactor = 505.0,
-    BillboardMaxSize = 4.7,
-    EnablePixelSizeControl = true
+    SizeSettings = {
+      ScaleExponent = 21.9,
+      MaxPixelSize = 4.7,
+      EnablePixelSizeControl = true
+    }
   },
   GUI = {
     Name = "Hubble Deep Field",
@@ -62,7 +69,7 @@ asset.export(Object)
 
 asset.meta = {
   Name = "Hubble Ultra Deep Field",
-  Version = "1.2",
+  Version = "2.0",
   Description = "Hubble Ultra Deep Field galaxy survey",
   Author = "Frank Summers (STScI), Brian Abbott (AMNH)",
   URL = "http://www.haydenplanetarium.org/universe",
diff --git a/data/assets/scene/digitaluniverse/localdwarfs.asset b/data/assets/scene/digitaluniverse/localdwarfs.asset
index 7426659150..635b6e0edc 100644
--- a/data/assets/scene/digitaluniverse/localdwarfs.asset
+++ b/data/assets/scene/digitaluniverse/localdwarfs.asset
@@ -16,7 +16,7 @@ local speck = asset.resource({
 local Object = {
   Identifier = "LocalDwarfGalaxies",
   Renderable = {
-    Type = "RenderableBillboardsCloud",
+    Type = "RenderablePolygonCloud",
     Enabled = false,
     Labels = {
       File = speck .. "localgroup.label",
@@ -25,17 +25,29 @@ local Object = {
       MinMaxSize = { 7, 20 },
       Unit = "Mpc"
     },
-    Color = { 0.5, 1.0, 0.2 },
-    ColorMap = speck .. "localgroup.cmap",
-    ColorOption = { "association" },
+    Coloring = {
+      FixedColor = { 0.0, 1.0, 0.0 },
+      -- @TODO: This one wasn't actually properly used before the point cloud update.
+      -- All points were mapped to green. Decide if we want it around.
+      -- @TODO: Also, the cmap is currently not applied correctly, due to speck file
+      -- not being read properly (it inlcudes more information than just datavar-s).
+      -- This should be adressed. (2023-12-13, emmbr)
+      ColorMapping = {
+        File = speck .. "localgroup.cmap",
+        ParameterOptions = {
+          { Key = "association" }
+        }
+      }
+    },
     Opacity = 0.3,
     File = speck .. "localgroup.speck",
-    Texture = textures .. "point4.png",
     PolygonSides = 12,
     Unit = "Mpc",
-    ScaleFactor = 465.0,
-    BillboardMinMaxSize = { 0.0, 20.0 },
-    EnablePixelSizeControl = true
+    SizeSettings = {
+      ScaleExponent = 20.2,
+      MaxPixelSize = 20.0,
+      EnablePixelSizeControl = true
+    }
   },
   GUI = {
     Name = "Local Group",
@@ -69,7 +81,7 @@ asset.export(Object)
 
 asset.meta = {
   Name = "Local Group",
-  Version = "2.1",
+  Version = "3.0",
   Description = "Digital Universe asset for the Local Goup",
   Author = "Brian Abbott (AMNH)",
   URL = "https://www.amnh.org/research/hayden-planetarium/digital-universe",
diff --git a/data/assets/scene/digitaluniverse/milkyway_label.asset b/data/assets/scene/digitaluniverse/milkyway_label.asset
index c2098b14ff..19088fdd44 100644
--- a/data/assets/scene/digitaluniverse/milkyway_label.asset
+++ b/data/assets/scene/digitaluniverse/milkyway_label.asset
@@ -16,7 +16,7 @@ local TransformMatrix = {
 local HomeLabel = {
   Identifier = "HomeLabel",
   Renderable = {
-    Type = "RenderableBillboardsCloud",
+    Type = "RenderablePointCloud",
     Enabled = false,
     Labels = {
       Enabled = true,
@@ -26,15 +26,7 @@ local HomeLabel = {
       MinMaxSize = { 16, 20 },
       Unit = "Mpc",
       TransformationMatrix = TransformMatrix
-    },
-    Color = { 1.0, 0.4, 0.2 },
-    Opacity = 0.99,
-    ScaleFactor = 500.0,
-    Unit = "Mpc",
-    TransformationMatrix = TransformMatrix,
-    FadeInDistances = { 0.05, 1.0 },
-    BillboardMinMaxSize = { 0.0, 8.22 },
-    EnablePixelSizeControl = true
+    }
   },
   GUI = {
     Name = "Home Label",
@@ -58,7 +50,7 @@ asset.export(HomeLabel)
 
 asset.meta = {
   Name = "Home Label",
-  Version = "1.1",
+  Version = "2.0",
   Description = "Label for the Milky Way titled 'Home', sided for the galactic level",
   Author = "OpenSpace Team",
   URL = "http://openspaceproject.com",
diff --git a/data/assets/scene/digitaluniverse/obassociations.asset b/data/assets/scene/digitaluniverse/obassociations.asset
index 73644a8c82..c1793d6717 100644
--- a/data/assets/scene/digitaluniverse/obassociations.asset
+++ b/data/assets/scene/digitaluniverse/obassociations.asset
@@ -9,14 +9,14 @@ local speck = asset.resource({
   Name = "OB Associations Speck Files",
   Type = "HttpSynchronization",
   Identifier = "digitaluniverse_obassociations_speck",
-  Version = 3
+  Version = 4
 })
 
 
 local Object = {
   Identifier = "OBAssociations",
   Renderable = {
-    Type = "RenderableBillboardsCloud",
+    Type = "RenderablePolygonCloud",
     Enabled = false,
     Labels = {
       File = speck .. "ob.label",
@@ -25,19 +25,25 @@ local Object = {
       MinMaxSize = { 4, 25 },
       Unit = "pc"
     },
-    Color = { 1.0, 1.0, 1.0 },
-    ColorMap = speck .. "ob.cmap",
-    ColorOption = { "arm" },
-    SizeOption = { "diameter" },
-    ExactColorMap = true,
+    Coloring = {
+      ColorMapping = {
+        File = speck .. "ob.cmap",
+        ParameterOptions = {
+          { Key = "arm" }
+        }
+      }
+    },
     Opacity = 0.7,
     File = speck .. "ob.speck",
     Unit = "pc",
     Texture = textures .. "point4.png",
     PolygonSides = 7,
-    ScaleFactor = 390.0,
-    BillboardMinMaxSize = { 0.0, 450.0 },
-    EnablePixelSizeControl = true
+    SizeSettings = {
+      SizeMapping = { "diameter" },
+      ScaleExponent = 16.9,
+      MaxPixelSize = 450.0,
+      EnablePixelSizeControl = true
+    }
   },
   GUI = {
     Name = "OB Associations",
@@ -71,7 +77,7 @@ asset.export(Object)
 
 asset.meta = {
   Name = "OB Associations",
-  Version = "2.1",
+  Version = "3.0",
   Description = "Digital Universe asset for OB Associations",
   Author = "Brian Abbott (AMNH)",
   URL = "https://www.amnh.org/research/hayden-planetarium/digital-universe",
diff --git a/data/assets/scene/digitaluniverse/openclusters.asset b/data/assets/scene/digitaluniverse/openclusters.asset
index e16a67dcbf..dd35569693 100644
--- a/data/assets/scene/digitaluniverse/openclusters.asset
+++ b/data/assets/scene/digitaluniverse/openclusters.asset
@@ -16,7 +16,7 @@ local speck = asset.resource({
 local Object = {
   Identifier = "OpenStarClusters",
   Renderable = {
-    Type = "RenderableBillboardsCloud",
+    Type = "RenderablePolygonCloud",
     Enabled = false,
     Labels = {
       File = speck .. "oc.label",
@@ -25,15 +25,18 @@ local Object = {
       MinMaxSize = { 4, 30 },
       Unit = "pc"
     },
-    Color = { 0.1, 0.8, 0.4 },
+    Coloring = {
+      FixedColor = { 0.1, 0.8, 0.4 }
+    },
     Opacity = 0.5,
     File = speck .. "oc.speck",
     Unit = "pc",
-    Texture = textures .. "point4.png",
     PolygonSides = 12,
-    ScaleFactor = 405.75,
-    BillboardMinMaxSize = { 0.0, 604.0 },
-    EnablePixelSizeControl = true
+    SizeSettings = {
+      ScaleExponent = 17.6,
+      MaxPixelSize = 604.0,
+      EnablePixelSizeControl = true
+    }
   },
   GUI = {
     Name = "Open Star Clusters",
@@ -68,7 +71,7 @@ asset.export(Object)
 
 asset.meta = {
   Name = "Open Star Clusters",
-  Version = "2.1",
+  Version = "3.0",
   Description = "Digital Universe asset for Open Star Clusters",
   Author = "Brian Abbott (AMNH)",
   URL = "https://www.amnh.org/research/hayden-planetarium/digital-universe",
diff --git a/data/assets/scene/digitaluniverse/planetarynebulae.asset b/data/assets/scene/digitaluniverse/planetarynebulae.asset
index 48837eac3d..303243769a 100644
--- a/data/assets/scene/digitaluniverse/planetarynebulae.asset
+++ b/data/assets/scene/digitaluniverse/planetarynebulae.asset
@@ -16,7 +16,7 @@ local speck = asset.resource({
 local Object = {
   Identifier = "PlanetaryNebulae",
   Renderable = {
-    Type = "RenderableBillboardsCloud",
+    Type = "RenderablePolygonCloud",
     Enabled = false,
     Labels = {
       File = speck .. "pn.label",
@@ -25,15 +25,18 @@ local Object = {
       MinMaxSize = { 4, 25 },
       Unit = "pc"
     },
-    Color = { 0.4, 0.4, 0.9 },
+    Coloring = {
+      FixedColor = { 0.4, 0.4, 0.9 }
+    },
     Opacity = 0.65,
     File = speck .. "pn.speck",
-    Texture = textures .. "point4.png",
     PolygonSides = 3,
     Unit = "pc",
-    ScaleFactor = 425.0,
-    BillboardMinMaxSize = { 0.0, 500.0 },
-    EnablePixelSizeControl = true
+    SizeSettings = {
+      ScaleExponent = 18.46,
+      MaxPixelSize = 500.0,
+      EnablePixelSizeControl = true
+    }
   },
   GUI = {
     Name = "Planetary Nebulae",
@@ -64,7 +67,7 @@ asset.export(Object)
 
 asset.meta = {
   Name = "Planetary Nebulae",
-  Version = "2.1",
+  Version = "3.0",
   Description = "Digital Universe asset for Planetary Nebulae",
   Author = "Brian Abbott (AMNH)",
   URL = "https://www.amnh.org/research/hayden-planetarium/digital-universe",
diff --git a/data/assets/scene/digitaluniverse/pulsars.asset b/data/assets/scene/digitaluniverse/pulsars.asset
index 8118e80fe8..f18b4e3b5a 100644
--- a/data/assets/scene/digitaluniverse/pulsars.asset
+++ b/data/assets/scene/digitaluniverse/pulsars.asset
@@ -16,7 +16,7 @@ local speck = asset.resource({
 local Object = {
   Identifier = "Pulsars",
   Renderable = {
-    Type = "RenderableBillboardsCloud",
+    Type = "RenderablePolygonCloud",
     Enabled = false,
     Labels = {
       File = speck .. "pulsar.label",
@@ -25,15 +25,18 @@ local Object = {
       MinMaxSize = { 4, 20 },
       Unit = "pc"
     },
-    Color = { 0.7, 0.0, 0.0 },
+    Coloring = {
+      FixedColor = { 0.7, 0.0, 0.0 }
+    },
     Opacity = 1.0,
     File = speck .. "pulsar.speck",
-    Texture = textures .. "point4.png",
     PolygonSides = 4,
     Unit = "pc",
-    ScaleFactor = 424.0,
-    BillboardMinMaxSize = { 0.0, 500.0 },
-    EnablePixelSizeControl = false
+    SizeSettings = {
+      ScaleExponent = 18.4,
+      MaxPixelSize = 500.0,
+      EnablePixelSizeControl = false
+    }
   },
   GUI = {
     Name = "Pulsars",
@@ -68,7 +71,7 @@ asset.export(Object)
 
 asset.meta = {
   Name = "Pulsars",
-  Version = "2.1",
+  Version = "3.0",
   Description = "Digital Universe asset for Pulsars",
   Author = "Brian Abbott (AMNH)",
   URL = "https://www.amnh.org/research/hayden-planetarium/digital-universe",
diff --git a/data/assets/scene/digitaluniverse/quasars.asset b/data/assets/scene/digitaluniverse/quasars.asset
index 783b1b9b1b..92c57b19e0 100644
--- a/data/assets/scene/digitaluniverse/quasars.asset
+++ b/data/assets/scene/digitaluniverse/quasars.asset
@@ -23,21 +23,32 @@ local colormaps = asset.resource({
 local Object = {
   Identifier = "Quasars",
   Renderable = {
-    Type = "RenderableBillboardsCloud",
+    Type = "RenderablePointCloud",
     Enabled = true,
-    Color = { 1.0, 0.4, 0.2 },
     Opacity = 0.95,
     File = speck .. "quasars.speck",
     Texture = textures .. "point3A.png",
     Unit = "Mpc",
-    ScaleFactor = 540.9,
-    FadeInDistances = { 1000.0, 10000.0 }, -- Fade in value in the same unit as "Unit"
-    BillboardMinMaxSize = { 0.0, 11.1 },
-    EnablePixelSizeControl = true,
-    ColorMap = colormaps .. "viridis.cmap",
-    ColorOption = { "redshift", "Tlookback", "distMpc" },
-    ColorRange = { { 0.102, 7.085 }, { 1.4, 13.0 }, { 440.5, 8852.099609 } },
-    UseColorMap = false
+    Fading = {
+      FadeInDistances = { 1000.0, 10000.0 } -- Fade in value in the same unit as "Unit"
+    },
+    Coloring = {
+      FixedColor = { 1.0, 0.4, 0.2 },
+      ColorMapping = {
+        Enabled = false,
+        File = colormaps .. "viridis.cmap",
+        ParameterOptions = {
+          { Key = "distMpc", Range = { 440.5, 8852.099609 } },
+          { Key = "redshift", Range = { 0.102, 7.085 } },
+          { Key = "Tlookback", Range = { 1.4, 13.0 } }
+        }
+      }
+    },
+    SizeSettings = {
+      ScaleExponent = 23.5,
+      MaxPixelSize = 11.1,
+      EnablePixelSizeControl = true
+    }
   },
   GUI = {
     Name = "Quasars",
@@ -68,7 +79,7 @@ asset.export(Object)
 
 asset.meta = {
   Name = "Quasars",
-  Version = "2.1",
+  Version = "3.0",
   Description = "Digital Universe asset for Quasars",
   Author = "Brian Abbott (AMNH)",
   URL = "https://www.amnh.org/research/hayden-planetarium/digital-universe",
diff --git a/data/assets/scene/digitaluniverse/sdss.asset b/data/assets/scene/digitaluniverse/sdss.asset
index b1159ddf92..0ed6ee3d8c 100644
--- a/data/assets/scene/digitaluniverse/sdss.asset
+++ b/data/assets/scene/digitaluniverse/sdss.asset
@@ -9,31 +9,37 @@ local speck = asset.resource({
   Name = "Sloan Digital Sky Survey Speck Files",
   Type = "HttpSynchronization",
   Identifier = "digitaluniverse_sloandss_speck",
-  Version = 2
+  Version = 3
 })
 
 
 local Object = {
   Identifier = "SloanDigitalSkySurvey",
   Renderable = {
-    Type = "RenderableBillboardsCloud",
+    Type = "RenderablePointCloud",
     Enabled = true,
-    Color = { 0.8, 0.8, 1.0 },
     Opacity = 0.8,
-    ScaleFactor = 520.0,
     File = speck .. "SDSSgals.speck",
-    ColorMap = speck .. "SDSSgals.cmap",
-    ColorOption = { "redshift", "proximity" },
-    ColorRange = { { 0.0, 0.075 }, { 1.0, 50.0 } },
+    Coloring = {
+      FixedColor = { 0.8, 0.8, 1.0 },
+      ColorMapping = {
+        File = speck .. "SDSSgals.cmap",
+        ParameterOptions = {
+          { Key = "proximity", Range = { 1.0, 50.0 } },
+          { Key = "redshift", Range = { 0.0, 0.075 } }
+        }
+      }
+    },
     Texture = textures .. "point3A.png",
     Unit = "Mpc",
-    FadeInDistances = { 220.0, 650.0 }, -- Fade in value in the same unit as "Unit"
-    BillboardMinMaxSize = { 0.0, 5.5 },
-    CorrectionSizeEndDistance = 20.65,
-    CorrectionSizeFactor = 10.41,
-    TextSize = 14.8,
-    TextMinMaxSize = { 10, 50 },
-    EnablePixelSizeControl = true
+    Fading = {
+      FadeInDistances = { 220.0, 650.0 } -- Fade in value in the same unit as "Unit"
+    },
+    SizeSettings = {
+      ScaleExponent = 22.6,
+      MaxPixelSize = 5.5,
+      EnablePixelSizeControl = true
+    }
   },
   GUI = {
     Name = "Sloan Digital Sky Survey",
@@ -71,7 +77,7 @@ asset.export(Object)
 
 asset.meta = {
   Name = "Sloan Digital Sky Survey",
-  Version = "2.1",
+  Version = "3.0",
   Description = "Digital Universe asset for The Sloan Digital Sky Survey (SDSS)",
   Author = "Brian Abbott (AMNH)",
   URL = "https://www.amnh.org/research/hayden-planetarium/digital-universe",
diff --git a/data/assets/scene/digitaluniverse/starlabels.asset b/data/assets/scene/digitaluniverse/starlabels.asset
index bd33b78b85..1babd0160f 100644
--- a/data/assets/scene/digitaluniverse/starlabels.asset
+++ b/data/assets/scene/digitaluniverse/starlabels.asset
@@ -9,7 +9,7 @@ local speck = asset.resource({
 local Object = {
   Identifier = "StarsLabels",
   Renderable = {
-    Type = "RenderableBillboardsCloud",
+    Type = "RenderablePointCloud",
     Enabled = false,
     Labels = {
       Enabled = true,
@@ -19,7 +19,6 @@ local Object = {
       MinMaxSize = { 6, 50 },
       Unit = "pc"
     },
-    Color = { 1.0, 1.0, 1.0 },
     Opacity = 0.65,
     Unit = "pc"
   },
@@ -45,7 +44,7 @@ asset.export(Object)
 
 asset.meta = {
   Name = "Star Labels",
-  Version = "2.1",
+  Version = "3.0",
   Description = "Digital Universe asset for labels of the stars",
   Author = "Brian Abbott (AMNH)",
   URL = "https://www.amnh.org/research/hayden-planetarium/digital-universe",
diff --git a/data/assets/scene/digitaluniverse/superclusters.asset b/data/assets/scene/digitaluniverse/superclusters.asset
index 4959dc3c47..19d8a55c41 100644
--- a/data/assets/scene/digitaluniverse/superclusters.asset
+++ b/data/assets/scene/digitaluniverse/superclusters.asset
@@ -16,7 +16,7 @@ local speck = asset.resource({
 local Object = {
   Identifier = "GalaxySuperclusters",
   Renderable = {
-    Type = "RenderableBillboardsCloud",
+    Type = "RenderablePointCloud",
     Enabled = false,
     Labels = {
       Enabled = true,
@@ -27,14 +27,15 @@ local Object = {
       Unit = "Mpc"
     },
     DrawElements = false,
-    Color = { 1.0, 1.0, 1.0 },
     Opacity = 0.65,
     File = speck .. "superclust.speck",
     Texture = textures .. "point3A.png",
     Unit = "Mpc",
-    ScaleFactor = 531.0,
-    -- BillboardMinMaxSize = { 0.0, 7.2 },
-    EnablePixelSizeControl = true
+    SizeSettings = {
+      ScaleExponent = 23.1,
+      MaxPixelSize = 7.2,
+      EnablePixelSizeControl = true
+    }
   },
   GUI = {
     Name = "Galaxy Superclusters",
@@ -63,7 +64,7 @@ asset.export(Object)
 
 asset.meta = {
   Name = "Galaxy Superclusters",
-  Version = "2.1",
+  Version = "3.0",
   Description = "Digital Universe asset for Galaxy Superclusters",
   Author = "Brian Abbott (AMNH)",
   URL = "https://www.amnh.org/research/hayden-planetarium/digital-universe",
diff --git a/data/assets/scene/digitaluniverse/supernovaremnants.asset b/data/assets/scene/digitaluniverse/supernovaremnants.asset
index 5332888150..388118796a 100644
--- a/data/assets/scene/digitaluniverse/supernovaremnants.asset
+++ b/data/assets/scene/digitaluniverse/supernovaremnants.asset
@@ -16,7 +16,7 @@ local speck = asset.resource({
 local Object = {
   Identifier = "SupernovaRemnants",
   Renderable = {
-    Type = "RenderableBillboardsCloud",
+    Type = "RenderablePolygonCloud",
     Enabled = false,
     Labels = {
       File = speck .. "snr.label",
@@ -25,17 +25,18 @@ local Object = {
       MinMaxSize = { 4, 100 },
       Unit = "pc"
     },
-    Color = { 1.0, 0.5, 0.0 },
+    Coloring = {
+      FixedColor = { 1.0, 0.5, 0.0 }
+    },
     Opacity = 0.32,
     File = speck .. "snr.speck",
-    Texture = textures .. "point4.png",
     PolygonSides = 7,
     Unit = "pc",
-    ScaleFactor = 424.0,
-    --CorrectionSizeEndDistance = 17.5,
-    --CorrectionSizeFactor = 13.96,
-    BillboardMinMaxSize = { 0.0, 500.0 },
-    EnablePixelSizeControl = true
+    SizeSettings = {
+      ScaleExponent = 18.4,
+      MaxPixelSize = 500.0,
+      EnablePixelSizeControl = true
+    }
   },
   GUI = {
     Name = "Supernova Remnants",
@@ -62,7 +63,7 @@ asset.export(Object)
 
 asset.meta = {
   Name = "Supernova Remnants",
-  Version = "2.1",
+  Version = "3.0",
   Description = "Digital Universe asset for Supernova Remnants",
   Author = "Brian Abbott (AMNH)",
   URL = "https://www.amnh.org/research/hayden-planetarium/digital-universe",
diff --git a/data/assets/scene/digitaluniverse/tully.asset b/data/assets/scene/digitaluniverse/tully.asset
index b4a20b1e4b..f3a329348a 100644
--- a/data/assets/scene/digitaluniverse/tully.asset
+++ b/data/assets/scene/digitaluniverse/tully.asset
@@ -9,7 +9,7 @@ local speck = asset.resource({
   Name = "Tully Speck Files",
   Type = "HttpSynchronization",
   Identifier = "digitaluniverse_tully_speck",
-  Version = 2
+  Version = 3
 })
 
 
@@ -23,7 +23,7 @@ local TransformMatrix = {
 local TullyGalaxies = {
   Identifier = "TullyGalaxies",
   Renderable = {
-    Type = "RenderableBillboardsCloud",
+    Type = "RenderablePointCloud",
     Enabled = true,
     Labels = {
       File = speck .. "tully.label",
@@ -33,23 +33,28 @@ local TullyGalaxies = {
       Unit = "Mpc",
       TransformationMatrix = TransformMatrix
     },
-    Color = { 1.0, 0.4, 0.2 },
     Opacity = 0.99,
-    ScaleFactor = 504.0,
     File = speck .. "tully.speck",
     Texture = textures .. "point3A.png",
-    --ColorMap = speck .. "tully.cmap",
-    ColorMap = speck .. "lss.cmap",
-    --ColorOption = { "proximity" },
-    ColorOption = { "prox5Mpc" },
-    ColorRange = { { 1.0, 30.0 } },
+    Coloring = {
+      FixedColor = { 1.0, 0.4, 0.2 },
+      ColorMapping = {
+        File = speck .. "lss.cmap",
+        ParameterOptions = {
+          { Key = "prox5Mpc", Range = { 1.0, 30.0 } }
+        }
+      }
+    },
     Unit = "Mpc",
     TransformationMatrix = TransformMatrix,
-    FadeInDistances = { 0.001, 1.0 }, -- Fade in value in the same unit as "Unit"
-    BillboardMinMaxSize = { 0.0, 7.0 }, -- in pixels
-    --CorrectionSizeEndDistance = 22.0,
-    --CorrectionSizeFactor = 10.45
-    EnablePixelSizeControl = true
+    Fading = {
+      FadeInDistances = { 0.001, 1.0 } -- Fade in value in the same unit as "Unit"
+    },
+    SizeSettings = {
+      ScaleExponent = 21.9,
+      MaxPixelSize = 7.0,
+      EnablePixelSizeControl = true
+    }
   },
   GUI = {
     Name = "Tully Galaxies",
@@ -125,7 +130,7 @@ asset.export(TullyGalaxiesImages)
 
 asset.meta = {
   Name = "Tully Galaxies",
-  Version = "3.1",
+  Version = "4.0",
   Description = [[Digital Universe asset for Tully Galaxies, including point cloud and
     images]],
   Author = "Stuart Levy (NCSA/UIUC), Brian Abbott (AMNH)",
diff --git a/data/assets/scene/digitaluniverse/voids.asset b/data/assets/scene/digitaluniverse/voids.asset
index 6f38436ee0..40db6e91b0 100644
--- a/data/assets/scene/digitaluniverse/voids.asset
+++ b/data/assets/scene/digitaluniverse/voids.asset
@@ -9,7 +9,7 @@ local speck = asset.resource({
 local Object = {
   Identifier = "Voids",
   Renderable = {
-    Type = "RenderableBillboardsCloud",
+    Type = "RenderablePointCloud",
     Enabled = false,
     Labels = {
       Enabled = true,
@@ -20,7 +20,6 @@ local Object = {
       Unit = "Mpc"
     },
     DrawElements = false,
-    Color = { 1.0, 1.0, 1.0 },
     Opacity = 0.65,
     Unit = "Mpc"
   },
@@ -55,7 +54,7 @@ asset.export(Object)
 
 asset.meta = {
   Name = "Voids",
-  Version = "2.1",
+  Version = "3.0",
   Author = "Brian Abbott (AMNH)",
   Description = "Digital Universe asset for Cosmic voids",
   URL = "https://www.amnh.org/research/hayden-planetarium/digital-universe",
diff --git a/modules/digitaluniverse/shaders/points_sprite_fs.glsl b/include/openspace/data/csvloader.h
similarity index 83%
rename from modules/digitaluniverse/shaders/points_sprite_fs.glsl
rename to include/openspace/data/csvloader.h
index fa56e68087..dcc4163415 100644
--- a/modules/digitaluniverse/shaders/points_sprite_fs.glsl
+++ b/include/openspace/data/csvloader.h
@@ -22,26 +22,18 @@
  * OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                                         *
  ****************************************************************************************/
 
-#include "fragment.glsl"
+#ifndef __OPENSPACE_CORE___CSVLOADER___H__
+#define __OPENSPACE_CORE___CSVLOADER___H__
 
-in float vs_screenSpaceDepth;
+#include <openspace/data/dataloader.h>
+#include <filesystem>
+#include <optional>
 
-uniform vec3 color;
-uniform float alphaValue;
-uniform sampler2D spriteTexture;
+namespace openspace::dataloader::csv {
 
+Dataset loadCsvFile(std::filesystem::path path,
+    std::optional<DataMapping> specs = std::nullopt);
 
-Fragment getFragment() {
-  Fragment frag;
+} // namespace openspace::dataloader
 
-  if (alphaValue == 0.0) {
-    discard;
-  }
-
-  frag.color = texture(spriteTexture, gl_PointCoord) * vec4(color, alphaValue);
-  //frag.depth = gs_screenSpaceDepth;
-  frag.depth = vs_screenSpaceDepth;
-  frag.blend = BLEND_MODE_ADDITIVE;
-
-  return frag;
-}
+#endif // __OPENSPACE_CORE___CSVLOADER___H__
diff --git a/modules/space/speckloader.h b/include/openspace/data/dataloader.h
similarity index 73%
rename from modules/space/speckloader.h
rename to include/openspace/data/dataloader.h
index 74d4150841..8e0e5920ca 100644
--- a/modules/space/speckloader.h
+++ b/include/openspace/data/dataloader.h
@@ -22,20 +22,28 @@
  * OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                                         *
  ****************************************************************************************/
 
-#ifndef __OPENSPACE_MODULE_SPACE___SPECKLOADER___H__
-#define __OPENSPACE_MODULE_SPACE___SPECKLOADER___H__
+#ifndef __OPENSPACE_CORE___DATALOADER___H__
+#define __OPENSPACE_CORE___DATALOADER___H__
 
+#include <openspace/data/datamapping.h>
 #include <ghoul/glm.h>
 #include <ghoul/misc/boolean.h>
+#include <ghoul/misc/csvreader.h>
 #include <filesystem>
 #include <optional>
 #include <string>
 #include <vector>
 
-namespace openspace::speck {
-
-BooleanType(SkipAllZeroLines);
+namespace openspace::dataloader {
 
+/**
+ * A dataset representing objects with positions and various other data columns.
+ * Based on the SPECK format originally used for the digital universe datasets.
+ * Mostly used for point-data.
+ *
+ * The read data files may also have associated texture values to be used for the
+ * points.
+ */
 struct Dataset {
     struct Variable {
         int index = -1;
@@ -59,8 +67,14 @@ struct Dataset {
     };
     std::vector<Entry> entries;
 
+    /// This variable can be used to get an understanding of the world scale size of
+    /// the dataset
+    float maxPositionComponent = 0.f;
+
     int index(std::string_view variableName) const;
     bool normalizeVariable(std::string_view variableName);
+    glm::vec2 findValueRange(int variableIndex) const;
+    glm::vec2 findValueRange(std::string_view variableName) const;
 };
 
 struct Labelset {
@@ -76,49 +90,49 @@ struct Labelset {
 };
 
 struct ColorMap {
+    std::optional<glm::vec4> belowRangeColor;
+    std::optional<glm::vec4> aboveRangeColor;
+    std::optional<glm::vec4> nanColor;
     std::vector<glm::vec4> entries;
 };
 
 namespace data {
 
     Dataset loadFile(std::filesystem::path path,
-        SkipAllZeroLines skipAllZeroLines = SkipAllZeroLines::Yes);
+        std::optional<DataMapping> specs = std::nullopt);
 
     std::optional<Dataset> loadCachedFile(std::filesystem::path path);
     void saveCachedFile(const Dataset& dataset, std::filesystem::path path);
 
-    Dataset loadFileWithCache(std::filesystem::path speckPath,
-        SkipAllZeroLines skipAllZeroLines = SkipAllZeroLines::Yes);
+    Dataset loadFileWithCache(std::filesystem::path path,
+        std::optional<DataMapping> specs = std::nullopt);
 
 } // namespace data
 
 namespace label {
 
     Labelset loadFile(std::filesystem::path path,
-        SkipAllZeroLines skipAllZeroLines = SkipAllZeroLines::Yes);
+        std::optional<DataMapping> specs = std::nullopt);
 
     std::optional<Labelset> loadCachedFile(std::filesystem::path path);
     void saveCachedFile(const Labelset& labelset, std::filesystem::path path);
 
-    Labelset loadFileWithCache(std::filesystem::path speckPath,
-        SkipAllZeroLines skipAllZeroLines = SkipAllZeroLines::Yes);
+    Labelset loadFileWithCache(std::filesystem::path path);
 
 } // namespace label
 
 namespace color {
 
     ColorMap loadFile(std::filesystem::path path,
-        SkipAllZeroLines skipAllZeroLines = SkipAllZeroLines::Yes);
+        std::optional<DataMapping> specs = std::nullopt);
 
     std::optional<ColorMap> loadCachedFile(std::filesystem::path path);
     void saveCachedFile(const ColorMap& colorMap, std::filesystem::path path);
 
-    ColorMap loadFileWithCache(std::filesystem::path path,
-        SkipAllZeroLines skipAllZeroLines = SkipAllZeroLines::Yes);
+    ColorMap loadFileWithCache(std::filesystem::path path);
 
 } // namespace color
 
+} // namespace openspace::dataloader
 
-} // namespace openspace::speck
-
-#endif // __OPENSPACE_MODULE_SPACE___SPECKLOADER___H__
+#endif // __OPENSPACE_CORE___DATALOADER___H__
diff --git a/include/openspace/data/datamapping.h b/include/openspace/data/datamapping.h
new file mode 100644
index 0000000000..bec5890a18
--- /dev/null
+++ b/include/openspace/data/datamapping.h
@@ -0,0 +1,74 @@
+/*****************************************************************************************
+ *                                                                                       *
+ * OpenSpace                                                                             *
+ *                                                                                       *
+ * Copyright (c) 2014-2023                                                               *
+ *                                                                                       *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
+ * software and associated documentation files (the "Software"), to deal in the Software *
+ * without restriction, including without limitation the rights to use, copy, modify,    *
+ * merge, publish, distribute, sublicense, and/or sell copies of the Software, and to    *
+ * permit persons to whom the Software is furnished to do so, subject to the following   *
+ * conditions:                                                                           *
+ *                                                                                       *
+ * The above copyright notice and this permission notice shall be included in all copies *
+ * or substantial portions of the Software.                                              *
+ *                                                                                       *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED,   *
+ * INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A         *
+ * PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT    *
+ * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF  *
+ * CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE  *
+ * OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                                         *
+ ****************************************************************************************/
+
+#ifndef __OPENSPACE_CORE___DATAMAPPING___H__
+#define __OPENSPACE_CORE___DATAMAPPING___H__
+
+#include <optional>
+#include <string>
+#include <vector>
+
+namespace openspace::documentation { struct Documentation; }
+namespace ghoul { class Dictionary; }
+
+namespace openspace::dataloader {
+
+struct DataMapping {
+    static DataMapping createFromDictionary(const ghoul::Dictionary& dictionary);
+    static documentation::Documentation Documentation();
+
+    bool hasExcludeColumns() const;
+    bool isExcludeColumn(std::string_view column) const;
+
+    std::optional<std::string> xColumnName;
+    std::optional<std::string> yColumnName;
+    std::optional<std::string> zColumnName;
+
+    std::optional<float> missingDataValue;
+
+    bool isCaseSensitive = false;
+
+    std::vector<std::string> excludeColumns;
+
+    // OBS! When new parameters are added they should be included in the generateHash
+    // function
+};
+
+/**
+ * Generate a string based on the data mapping, that can be used to uniquely
+ * identify the dataset.
+ */
+std::string generateHashString(const DataMapping& dm);
+
+bool isPositionColumn(const std::string& c, const std::optional<DataMapping>& mapping);
+
+bool isColumnX(const std::string& c, const std::optional<DataMapping>& mapping);
+
+bool isColumnY(const std::string& c, const std::optional<DataMapping>& mapping);
+
+bool isColumnZ(const std::string& c, const std::optional<DataMapping>& mapping);
+
+} // namespace openspace::dataloader
+
+#endif // __OPENSPACE_CORE___DATAMAPPING___H__
diff --git a/modules/digitaluniverse/shaders/points_vs.glsl b/include/openspace/data/speckloader.h
similarity index 77%
rename from modules/digitaluniverse/shaders/points_vs.glsl
rename to include/openspace/data/speckloader.h
index d27c7c35a9..0ff86a8ba7 100644
--- a/modules/digitaluniverse/shaders/points_vs.glsl
+++ b/include/openspace/data/speckloader.h
@@ -22,29 +22,22 @@
  * OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                                         *
  ****************************************************************************************/
 
-#version __CONTEXT__
+#ifndef __OPENSPACE_CORE___SPECKLOADER___H__
+#define __OPENSPACE_CORE___SPECKLOADER___H__
 
-#include "PowerScaling/powerScaling_vs.hglsl"
+#include <openspace/data/dataloader.h>
+#include <filesystem>
+#include <optional>
 
-in dvec4 in_position;
-in dvec4 in_colormap;
+namespace openspace::dataloader::speck {
 
-out float vs_screenSpaceDepth;
-out float vs_scaleFactor;
-out vec4 colorMap;
+Dataset loadSpeckFile(std::filesystem::path path,
+    std::optional<DataMapping> specs = std::nullopt);
 
-uniform dmat4 modelViewProjectionTransform;
-uniform float scaleFactor;
+Labelset loadLabelFile(std::filesystem::path path);
 
+ColorMap loadCmapFile(std::filesystem::path path);
 
-void main() {
-  vec4 positionClipSpace = vec4(modelViewProjectionTransform * in_position);
-  vec4 positionScreenSpace = vec4(z_normalization(positionClipSpace));
+} // namespace openspace::dataloader::speck
 
-  vs_screenSpaceDepth = positionScreenSpace.w;
-  vs_scaleFactor = scaleFactor;
-  colorMap = vec4(in_colormap);
-
-  gl_PointSize = scaleFactor;
-  gl_Position = positionScreenSpace;
-}
+#endif // __OPENSPACE_CORE___SPECKLOADER___H__
diff --git a/include/openspace/rendering/colormappingcomponent.h b/include/openspace/rendering/colormappingcomponent.h
new file mode 100644
index 0000000000..60b9fb7868
--- /dev/null
+++ b/include/openspace/rendering/colormappingcomponent.h
@@ -0,0 +1,117 @@
+/*****************************************************************************************
+ *                                                                                       *
+ * OpenSpace                                                                             *
+ *                                                                                       *
+ * Copyright (c) 2014-2023                                                               *
+ *                                                                                       *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
+ * software and associated documentation files (the "Software"), to deal in the Software *
+ * without restriction, including without limitation the rights to use, copy, modify,    *
+ * merge, publish, distribute, sublicense, and/or sell copies of the Software, and to    *
+ * permit persons to whom the Software is furnished to do so, subject to the following   *
+ * conditions:                                                                           *
+ *                                                                                       *
+ * The above copyright notice and this permission notice shall be included in all copies *
+ * or substantial portions of the Software.                                              *
+ *                                                                                       *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED,   *
+ * INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A         *
+ * PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT    *
+ * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF  *
+ * CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE  *
+ * OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                                         *
+ ****************************************************************************************/
+
+#ifndef __OPENSPACE_MODULE_BASE___COLORMAPCOMPONENT___H__
+#define __OPENSPACE_MODULE_BASE___COLORMAPCOMPONENT___H__
+
+#include <openspace/properties/propertyowner.h>
+
+#include <openspace/data/dataloader.h>
+#include <openspace/properties/optionproperty.h>
+#include <openspace/properties/stringproperty.h>
+#include <openspace/properties/triggerproperty.h>
+#include <openspace/properties/scalar/boolproperty.h>
+#include <openspace/properties/vector/vec2property.h>
+#include <openspace/properties/vector/vec4property.h>
+#include <ghoul/opengl/texture.h>
+
+namespace openspace {
+
+namespace documentation { struct Documentation; }
+
+/**
+ * This is a component that can be used to consistently hold parameters and properties
+ * for controlling color mapping in different types of renderables. This includes things
+ * like the color map file itself (converted to a texture), colors to use for missing
+ * values and the available data columns and value ranges.
+ *
+ * @TODO Also provide a small shader snippet that can be included in fragment shaders
+ * that use this color mapping. As well as a set of uniforms? Now every
+ * renderable needs to handle this separately.  (emmbr, 2023-10-13)
+ */
+class ColorMappingComponent : public properties::PropertyOwner {
+public:
+    ColorMappingComponent();
+    explicit ColorMappingComponent(const ghoul::Dictionary& dictionary);
+    ~ColorMappingComponent() override = default;
+
+    ghoul::opengl::Texture* texture() const;
+
+    /**
+     * Initialize the color map information (ranges, etc.) based on the input dataset.
+     *
+     * \param dataset The *loaded* input dataset
+     */
+    void initialize(const dataloader::Dataset& dataset);
+
+    /**
+     * Initialize a 1D texture based on the entries in the color map file.
+     */
+    void initializeTexture();
+
+    static documentation::Documentation Documentation();
+
+    glm::vec4 colorFromColorMap(float value) const;
+
+    properties::BoolProperty enabled;
+    properties::OptionProperty dataColumn;
+    properties::StringProperty colorMapFile;
+    properties::Vec2Property valueRange;
+    properties::TriggerProperty setRangeFromData;
+
+    properties::BoolProperty hideOutsideRange;
+    properties::BoolProperty useNanColor;
+    properties::Vec4Property nanColor;
+
+    properties::BoolProperty useAboveRangeColor;
+    properties::Vec4Property aboveRangeColor;
+
+    properties::BoolProperty useBelowRangeColor;
+    properties::Vec4Property belowRangeColor;
+
+private:
+    /**
+     * Fill parameter options list and range data based on the dataset and provided
+     * information.
+     */
+    void initializeParameterData(const dataloader::Dataset& dataset);
+
+    // One item per color parameter option
+    std::vector<glm::vec2> _colorRangeData;
+
+    std::unique_ptr<ghoul::opengl::Texture> _texture;
+
+    dataloader::ColorMap _colorMap;
+
+    std::optional<std::string> _providedParameter;
+    std::optional<glm::vec2> _providedRange;
+
+    bool _hasNanColorInAsset = false;
+    bool _hasBelowRangeColorInAsset = false;
+    bool _hasAboveRangeColorInAsset = false;
+};
+
+} // namespace openspace
+
+#endif // __OPENSPACE_MODULE_BASE___COLORMAPCOMPONENT___H__
diff --git a/modules/space/labelscomponent.h b/include/openspace/rendering/labelscomponent.h
similarity index 91%
rename from modules/space/labelscomponent.h
rename to include/openspace/rendering/labelscomponent.h
index 9d8759fa7f..c00fbfc605 100644
--- a/modules/space/labelscomponent.h
+++ b/include/openspace/rendering/labelscomponent.h
@@ -22,13 +22,13 @@
  * OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                                         *
  ****************************************************************************************/
 
-#ifndef __OPENSPACE_MODULE_SPACE___LABELSCOMPONENT___H__
-#define __OPENSPACE_MODULE_SPACE___LABELSCOMPONENT___H__
+#ifndef __OPENSPACE_CORE___LABELSCOMPONENT___H__
+#define __OPENSPACE_CORE___LABELSCOMPONENT___H__
 
 #include <openspace/properties/propertyowner.h>
 #include <openspace/rendering/fadeable.h>
 
-#include <modules/space/speckloader.h>
+#include <openspace/data/dataloader.h>
 #include <openspace/properties/scalar/boolproperty.h>
 #include <openspace/properties/scalar/floatproperty.h>
 #include <openspace/properties/vector/ivec2property.h>
@@ -49,8 +49,8 @@ public:
     explicit LabelsComponent(const ghoul::Dictionary& dictionary);
     ~LabelsComponent() override = default;
 
-    speck::Labelset& labelSet();
-    const speck::Labelset& labelSet() const;
+    dataloader::Labelset& labelSet();
+    const dataloader::Labelset& labelSet() const;
 
     void initialize();
 
@@ -68,7 +68,9 @@ public:
 private:
     std::filesystem::path _labelFile;
     DistanceUnit _unit = DistanceUnit::Parsec;
-    speck::Labelset _labelset;
+    dataloader::Labelset _labelset;
+
+    bool _useCache = true;
 
     std::shared_ptr<ghoul::fontrendering::Font> _font = nullptr;
 
@@ -85,4 +87,4 @@ private:
 
 } // namespace openspace
 
-#endif // __OPENSPACE_MODULE_SPACE___LABELSCOMPONENT___H__
+#endif // __OPENSPACE_CORE___LABELSCOMPONENT___H__
diff --git a/modules/base/CMakeLists.txt b/modules/base/CMakeLists.txt
index 6559ad54b3..7baa93e400 100644
--- a/modules/base/CMakeLists.txt
+++ b/modules/base/CMakeLists.txt
@@ -44,6 +44,8 @@ set(HEADER_FILES
   rendering/grids/renderablegrid.h
   rendering/grids/renderableradialgrid.h
   rendering/grids/renderablesphericalgrid.h
+  rendering/pointcloud/renderablepointcloud.h
+  rendering/pointcloud/renderablepolygoncloud.h
   rendering/renderablecartesianaxes.h
   rendering/renderabledisc.h
   rendering/renderablelabel.h
@@ -103,6 +105,8 @@ set(SOURCE_FILES
   rendering/grids/renderablegrid.cpp
   rendering/grids/renderableradialgrid.cpp
   rendering/grids/renderablesphericalgrid.cpp
+  rendering/pointcloud/renderablepointcloud.cpp
+  rendering/pointcloud/renderablepolygoncloud.cpp
   rendering/renderablecartesianaxes.cpp
   rendering/renderabledisc.cpp
   rendering/renderablelabel.cpp
@@ -148,6 +152,9 @@ set(SHADER_FILES
   shaders/arrow_vs.glsl
   shaders/axes_fs.glsl
   shaders/axes_vs.glsl
+  shaders/billboardpoint_fs.glsl
+  shaders/billboardpoint_gs.glsl
+  shaders/billboardpoint_vs.glsl
   shaders/disc_fs.glsl
   shaders/disc_vs.glsl
   shaders/grid_vs.glsl
@@ -160,6 +167,9 @@ set(SHADER_FILES
   shaders/model_vs.glsl
   shaders/plane_fs.glsl
   shaders/plane_vs.glsl
+  shaders/polygon_fs.glsl
+  shaders/polygon_gs.glsl
+  shaders/polygon_vs.glsl
   shaders/prism_fs.glsl
   shaders/prism_vs.glsl
   shaders/renderabletrail_fs.glsl
diff --git a/modules/base/basemodule.cpp b/modules/base/basemodule.cpp
index 9939cea058..2b46683efb 100644
--- a/modules/base/basemodule.cpp
+++ b/modules/base/basemodule.cpp
@@ -43,6 +43,8 @@
 #include <modules/base/rendering/grids/renderablegrid.h>
 #include <modules/base/rendering/grids/renderableradialgrid.h>
 #include <modules/base/rendering/grids/renderablesphericalgrid.h>
+#include <modules/base/rendering/pointcloud/renderablepointcloud.h>
+#include <modules/base/rendering/pointcloud/renderablepolygoncloud.h>
 #include <modules/base/rendering/renderablecartesianaxes.h>
 #include <modules/base/rendering/renderabledisc.h>
 #include <modules/base/rendering/renderablelabel.h>
@@ -144,6 +146,8 @@ void BaseModule::internalInitialize(const ghoul::Dictionary&) {
     fRenderable->registerClass<RenderablePlaneTimeVaryingImage>(
         "RenderablePlaneTimeVaryingImage"
     );
+    fRenderable->registerClass<RenderablePointCloud>("RenderablePointCloud");
+    fRenderable->registerClass<RenderablePolygonCloud>("RenderablePolygonCloud");
     fRenderable->registerClass<RenderablePrism>("RenderablePrism");
     fRenderable->registerClass<RenderableTimeVaryingSphere>(
         "RenderableTimeVaryingSphere"
@@ -230,6 +234,8 @@ std::vector<documentation::Documentation> BaseModule::documentations() const {
         RenderablePlaneImageLocal::Documentation(),
         RenderablePlaneImageOnline::Documentation(),
         RenderablePlaneTimeVaryingImage::Documentation(),
+        RenderablePointCloud::Documentation(),
+        RenderablePolygonCloud::Documentation(),
         RenderablePrism::Documentation(),
         RenderableRadialGrid::Documentation(),
         RenderableSphere::Documentation(),
diff --git a/modules/base/rendering/grids/renderableboxgrid.cpp b/modules/base/rendering/grids/renderableboxgrid.cpp
index 7af3822024..c3712e9eec 100644
--- a/modules/base/rendering/grids/renderableboxgrid.cpp
+++ b/modules/base/rendering/grids/renderableboxgrid.cpp
@@ -76,7 +76,7 @@ namespace {
 
         // [[codegen::verbatim(LabelsInfo.description)]]
         std::optional<ghoul::Dictionary> labels
-            [[codegen::reference("space_labelscomponent")]];
+            [[codegen::reference("labelscomponent")]];
     };
 #include "renderableboxgrid_codegen.cpp"
 } // namespace
diff --git a/modules/base/rendering/grids/renderableboxgrid.h b/modules/base/rendering/grids/renderableboxgrid.h
index e4a24c7df0..025ec3b36c 100644
--- a/modules/base/rendering/grids/renderableboxgrid.h
+++ b/modules/base/rendering/grids/renderableboxgrid.h
@@ -27,9 +27,9 @@
 
 #include <openspace/rendering/renderable.h>
 
-#include <modules/space/labelscomponent.h>
 #include <openspace/properties/scalar/floatproperty.h>
 #include <openspace/properties/vector/vec3property.h>
+#include <openspace/rendering/labelscomponent.h>
 #include <ghoul/opengl/ghoul_gl.h>
 
 namespace ghoul::opengl {
diff --git a/modules/base/rendering/grids/renderablegrid.cpp b/modules/base/rendering/grids/renderablegrid.cpp
index ceddd1bd0f..c75afc7cdc 100644
--- a/modules/base/rendering/grids/renderablegrid.cpp
+++ b/modules/base/rendering/grids/renderablegrid.cpp
@@ -122,7 +122,7 @@ namespace {
 
         // [[codegen::verbatim(LabelsInfo.description)]]
         std::optional<ghoul::Dictionary> labels
-            [[codegen::reference("space_labelscomponent")]];
+            [[codegen::reference("labelscomponent")]];
     };
 #include "renderablegrid_codegen.cpp"
 } // namespace
diff --git a/modules/base/rendering/grids/renderablegrid.h b/modules/base/rendering/grids/renderablegrid.h
index f9ddc2a1d9..14385f0847 100644
--- a/modules/base/rendering/grids/renderablegrid.h
+++ b/modules/base/rendering/grids/renderablegrid.h
@@ -27,12 +27,12 @@
 
 #include <openspace/rendering/renderable.h>
 
-#include <modules/space/labelscomponent.h>
 #include <openspace/properties/stringproperty.h>
 #include <openspace/properties/vector/ivec2property.h>
 #include <openspace/properties/scalar/floatproperty.h>
 #include <openspace/properties/vector/vec2property.h>
 #include <openspace/properties/vector/vec3property.h>
+#include <openspace/rendering/labelscomponent.h>
 #include <ghoul/opengl/ghoul_gl.h>
 
 namespace ghoul::opengl { class ProgramObject; }
diff --git a/modules/base/rendering/grids/renderableradialgrid.cpp b/modules/base/rendering/grids/renderableradialgrid.cpp
index 4f528fd15b..5c231a3dca 100644
--- a/modules/base/rendering/grids/renderableradialgrid.cpp
+++ b/modules/base/rendering/grids/renderableradialgrid.cpp
@@ -104,7 +104,7 @@ namespace {
 
         // [[codegen::verbatim(LabelsInfo.description)]]
         std::optional<ghoul::Dictionary> labels
-            [[codegen::reference("space_labelscomponent")]];
+            [[codegen::reference("labelscomponent")]];
     };
 #include "renderableradialgrid_codegen.cpp"
 } // namespace
diff --git a/modules/base/rendering/grids/renderableradialgrid.h b/modules/base/rendering/grids/renderableradialgrid.h
index 88689832fd..cf55c07ab0 100644
--- a/modules/base/rendering/grids/renderableradialgrid.h
+++ b/modules/base/rendering/grids/renderableradialgrid.h
@@ -27,13 +27,13 @@
 
 #include <openspace/rendering/renderable.h>
 
-#include <modules/space/labelscomponent.h>
 #include <openspace/properties/scalar/floatproperty.h>
 #include <openspace/properties/scalar/intproperty.h>
 #include <openspace/properties/vector/ivec2property.h>
 #include <openspace/properties/vector/vec2property.h>
 #include <openspace/properties/vector/vec3property.h>
 #include <openspace/rendering/helper.h>
+#include <openspace/rendering/labelscomponent.h>
 #include <ghoul/opengl/ghoul_gl.h>
 
 namespace ghoul::opengl { class ProgramObject; }
diff --git a/modules/base/rendering/grids/renderablesphericalgrid.cpp b/modules/base/rendering/grids/renderablesphericalgrid.cpp
index b196d5d460..a0f2a1fe61 100644
--- a/modules/base/rendering/grids/renderablesphericalgrid.cpp
+++ b/modules/base/rendering/grids/renderablesphericalgrid.cpp
@@ -79,7 +79,7 @@ namespace {
 
         // [[codegen::verbatim(LabelsInfo.description)]]
         std::optional<ghoul::Dictionary> labels
-            [[codegen::reference("space_labelscomponent")]];
+            [[codegen::reference("labelscomponent")]];
     };
 #include "renderablesphericalgrid_codegen.cpp"
 } // namespace
diff --git a/modules/base/rendering/grids/renderablesphericalgrid.h b/modules/base/rendering/grids/renderablesphericalgrid.h
index 992dd7090f..5f6ac23b63 100644
--- a/modules/base/rendering/grids/renderablesphericalgrid.h
+++ b/modules/base/rendering/grids/renderablesphericalgrid.h
@@ -27,10 +27,10 @@
 
 #include <openspace/rendering/renderable.h>
 
-#include <modules/space/labelscomponent.h>
 #include <openspace/properties/scalar/floatproperty.h>
 #include <openspace/properties/scalar/intproperty.h>
 #include <openspace/properties/vector/vec3property.h>
+#include <openspace/rendering/labelscomponent.h>
 #include <ghoul/opengl/ghoul_gl.h>
 
 namespace ghoul::opengl { class ProgramObject; }
diff --git a/modules/base/rendering/pointcloud/renderablepointcloud.cpp b/modules/base/rendering/pointcloud/renderablepointcloud.cpp
new file mode 100644
index 0000000000..f43acf279a
--- /dev/null
+++ b/modules/base/rendering/pointcloud/renderablepointcloud.cpp
@@ -0,0 +1,1042 @@
+/*****************************************************************************************
+ *                                                                                       *
+ * OpenSpace                                                                             *
+ *                                                                                       *
+ * Copyright (c) 2014-2023                                                               *
+ *                                                                                       *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
+ * software and associated documentation files (the "Software"), to deal in the Software *
+ * without restriction, including without limitation the rights to use, copy, modify,    *
+ * merge, publish, distribute, sublicense, and/or sell copies of the Software, and to    *
+ * permit persons to whom the Software is furnished to do so, subject to the following   *
+ * conditions:                                                                           *
+ *                                                                                       *
+ * The above copyright notice and this permission notice shall be included in all copies *
+ * or substantial portions of the Software.                                              *
+ *                                                                                       *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED,   *
+ * INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A         *
+ * PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT    *
+ * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF  *
+ * CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE  *
+ * OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                                         *
+ ****************************************************************************************/
+
+#include <modules/base/rendering/pointcloud/renderablepointcloud.h>
+
+#include <modules/base/basemodule.h>
+#include <openspace/documentation/documentation.h>
+#include <openspace/documentation/verifier.h>
+#include <openspace/engine/globals.h>
+#include <openspace/engine/windowdelegate.h>
+#include <openspace/util/updatestructures.h>
+#include <openspace/rendering/renderengine.h>
+#include <ghoul/filesystem/filesystem.h>
+#include <ghoul/glm.h>
+#include <ghoul/io/texture/texturereader.h>
+#include <ghoul/logging/logmanager.h>
+#include <ghoul/misc/crc32.h>
+#include <ghoul/misc/templatefactory.h>
+#include <ghoul/misc/profiling.h>
+#include <ghoul/opengl/openglstatecache.h>
+#include <ghoul/opengl/programobject.h>
+#include <ghoul/opengl/texture.h>
+#include <ghoul/opengl/textureunit.h>
+#include <glm/gtx/string_cast.hpp>
+#include <array>
+#include <cmath>
+#include <cstdint>
+#include <filesystem>
+#include <fstream>
+#include <locale>
+#include <optional>
+#include <string>
+
+namespace {
+    constexpr std::string_view _loggerCat = "RenderablePointCloud";
+
+    constexpr std::array<const char*, 29> UniformNames = {
+        "cameraViewProjectionMatrix", "modelMatrix", "cameraPosition", "cameraLookUp",
+        "renderOption", "maxBillboardSize", "color", "opacity", "scaleExponent",
+        "scaleFactor", "up", "right", "fadeInValue", "screenSize", "hasSpriteTexture",
+        "spriteTexture", "useColorMap", "colorMapTexture", "cmapRangeMin", "cmapRangeMax",
+        "nanColor", "useNanColor", "hideOutsideRange", "enablePixelSizeControl",
+        "aboveRangeColor", "useAboveRangeColor", "belowRangeColor", "useBelowRangeColor",
+        "hasDvarScaling"
+    };
+
+    enum RenderOption {
+        ViewDirection = 0,
+        PositionNormal
+    };
+
+    constexpr openspace::properties::Property::PropertyInfo SpriteTextureInfo = {
+        "Texture",
+        "Point Sprite Texture",
+        "The path to the texture that should be used as the point sprite",
+        openspace::properties::Property::Visibility::AdvancedUser
+    };
+
+    constexpr openspace::properties::Property::PropertyInfo UseSpriteTextureInfo = {
+        "UseTexture",
+        "Use Texture",
+        "If true, use the provided sprite texture to render the point. If false, draw "
+        "the points using the default point shape",
+        openspace::properties::Property::Visibility::AdvancedUser
+    };
+
+    constexpr openspace::properties::Property::PropertyInfo PointColorInfo = {
+        "FixedColor",
+        "Fixed Color",
+        "This value is used to define the color of the points when no color map is"
+        "used",
+        openspace::properties::Property::Visibility::NoviceUser
+    };
+
+    constexpr openspace::properties::Property::PropertyInfo DrawElementsInfo = {
+        "DrawElements",
+        "Draw Elements",
+        "Enables/Disables the drawing of the points",
+        // @VISIBILITY(1.25)
+        openspace::properties::Property::Visibility::NoviceUser
+    };
+
+    static const openspace::properties::PropertyOwner::PropertyOwnerInfo LabelsInfo = {
+        "Labels",
+        "Labels",
+        "The labels for the points"
+    };
+
+    constexpr openspace::properties::Property::PropertyInfo RenderOptionInfo = {
+        "RenderOption",
+        "Render Option",
+        "Option wether the point billboards should face the camera or not. Used for "
+        "non-linear display environments such as fisheye.",
+        openspace::properties::Property::Visibility::AdvancedUser
+    };
+
+    constexpr openspace::properties::Property::PropertyInfo FadeInDistancesInfo = {
+        "FadeInDistances",
+        "Fade-In Start and End Distances",
+        "These values determine the initial and final distances from the origin of "
+        "the dataset at which the points will start and end fading-in. The distances "
+        "are specified in the same unit as the points, that is, the one provodied as the "
+        "Unit, or meters. With normal fading the points are fully visible once the "
+        "camera is outside this range and fully invisible when inside the range. With "
+        "inverted fading the situation is the opposite: the points are visible inside "
+        "hen closer than the min value of the range and invisible when further away",
+        // @VISIBILITY(3.25)
+        openspace::properties::Property::Visibility::AdvancedUser
+    };
+
+    constexpr openspace::properties::Property::PropertyInfo EnableDistanceFadeInfo = {
+        "Enabled",
+        "Enable Distance-based Fading",
+        "Enables/disables the Fade-in effect based on camera distance. Automatically set "
+        "to true if FadeInDistances are specified in the asset",
+        openspace::properties::Property::Visibility::User
+    };
+
+    constexpr openspace::properties::Property::PropertyInfo InvertFadeInfo = {
+        "Invert",
+        "Invert",
+        "This property can be used the invert the fading so that the points are "
+        "invisible when the camera is further away than the max fade distance "
+        "and fully visible when it is closer than the min distance",
+        openspace::properties::Property::Visibility::AdvancedUser
+    };
+
+    constexpr openspace::properties::Property::PropertyInfo UseAdditiveBlendingInfo = {
+        "UseAdditiveBlending",
+        "Use Additive Blending",
+        "If true (default), the color of points rendered on top of each other is "
+        "blended additively, resulting in a brighter color where points overlap. "
+        "If false, no such blending will take place and the color of the point "
+        "will not be modified by blending. Note that this may lead to weird behaviors "
+        "when the points are rendered with transparency.",
+        openspace::properties::Property::Visibility::AdvancedUser
+    };
+
+    constexpr openspace::properties::Property::PropertyInfo NumShownDataPointsInfo = {
+        "NumberOfDataPoints",
+        "Number of Shown Data Points",
+        "This read only property includes information about how many points are being "
+        "rendered.",
+        openspace::properties::Property::Visibility::User
+    };
+
+    constexpr openspace::properties::Property::PropertyInfo ScaleExponentInfo = {
+        "ScaleExponent",
+        "Scale Exponent",
+        "This value is used as in exponential scaling to set the absolute size of the "
+        "point. In general, the larger distance the dataset covers, the larger this "
+        "value should be. If not included, it is computed based on the maximum "
+        "positional component of the data points. This is useful for showing the "
+        "dataset at all, but you will likely want to change it to something that looks "
+        "good",
+        openspace::properties::Property::Visibility::User
+    };
+
+    constexpr openspace::properties::Property::PropertyInfo ScaleFactorInfo = {
+        "ScaleFactor",
+        "Scale Factor",
+        "This value is used as a multiplicative factor to adjust the size of the points, "
+        "after the exponential scaling and any pixel-size control effects. Simply just "
+        "increases or decreases the visual size of the points",
+        openspace::properties::Property::Visibility::User
+    };
+
+    constexpr openspace::properties::Property::PropertyInfo PixelSizeControlInfo = {
+        "EnablePixelSizeControl",
+        "Enable Pixel Size Control",
+        "If true, the Max Size in Pixels property will be used as an upper limit for the "
+        "size of the point. Reduces the size of the points when approaching them, so that "
+        "they stick to a maximum screen space size. Currently, the scaling is computed "
+        "based on rectangular displays and might look weird in other projections",
+        openspace::properties::Property::Visibility::AdvancedUser
+    };
+
+    constexpr openspace::properties::Property::PropertyInfo MaxPixelSizeInfo = {
+        "MaxPixelSize",
+        "Max Size in Pixels",
+        "The maximum size (in pixels) for the billboard representing the point.",
+        openspace::properties::Property::Visibility::AdvancedUser
+    };
+
+    constexpr openspace::properties::Property::PropertyInfo SizeMappingEnabledInfo = {
+        "Enabled",
+        "Size Mapping Enabled",
+        "If this value is set to 'true' and at least one column was loaded as an option "
+        "for size mapping, the chosen data column will be used to scale the size of the "
+        "points. The first option in the list is selected per default.",
+        openspace::properties::Property::Visibility::NoviceUser
+    };
+
+    constexpr openspace::properties::Property::PropertyInfo SizeMappingOptionInfo = {
+        "Parameter",
+        "Parameter Option",
+        "This value determines which parameter is used for scaling of the point. The "
+        "parameter value will be used as a miltiplicative factor to scale the size of "
+        "the points. Not that they may however still be scaled by pixel size adjustment "
+        "effects.",
+        openspace::properties::Property::Visibility::AdvancedUser
+    };
+
+    // A RenderablePointCloud can be used to render point-based datasets in 3D space,
+    // optionally including color mapping, a sprite texture and labels. There are several
+    // properties that affect the visuals of the points, such as settings for scaling,
+    // fading, sprite texture, color mapping and whether the colors of overlapping points
+    // should be blended additively or not.
+    //
+    // The point size depends on a few different things:
+    //
+    // - At the core, scaling is done based on an exponential value, the 'ScaleExponent'.
+    //   A relatively small change to this value will lead to a large change in size.
+    //   When no exponent is set, one will be created based on the coordinates in the
+    //   dataset. The points will be visible, but may be appeared as too large or small.
+    //   One option is to not specify the exponent when loading the dataset for the the,
+    //   first time, to make sure the points are visual, and then adapt the value
+    //   interactively when OpenSpace is running until you find a value that you find
+    //   suitable.
+    //
+    // - There is also an option to limit the size of the points based on a given pixel
+    //   size. For now, this only works for flat projection displays.
+    //
+    // - To easily change the visual size of the points, the multiplicative 'ScaleFactor'
+    //   may be used. A value of 2 makes the points twice as large, visually, compared
+    //   to 1.
+    //
+    // See example files in data/assets/examples/pointcloud for some concrete examples of
+    // point clouds with different settings.
+    struct [[codegen::Dictionary(RenderablePointCloud)]] Parameters {
+        // The path to the data file that contains information about the point to be
+        // rendered. Can be either a CSV or SPECK file
+        std::optional<std::string> file;
+
+        // If true (default), the loaded dataset will be cached so that it can be loaded
+        // faster at a later time. This does however mean that any updates to the values
+        // in the dataset will not lead to changes in the rendering without first removing
+        // the cached file. Set it to false to disable caching. This can be useful for
+        // example when working on importing a new dataset
+        std::optional<bool> useCaching;
+
+        // A dictionary specifying details on how to load the dataset. Updating the data
+        // mapping will lead to a new cached version of the dataset
+        std::optional<ghoul::Dictionary> dataMapping
+            [[codegen::reference("dataloader_datamapping")]];
+
+        // [[codegen::verbatim(SpriteTextureInfo.description)]]
+        std::optional<std::string> texture;
+
+        // [[codegen::verbatim(UseSpriteTextureInfo.description)]]
+        std::optional<bool> useTexture;
+
+        // [[codegen::verbatim(DrawElementsInfo.description)]]
+        std::optional<bool> drawElements;
+
+        enum class [[codegen::map(RenderOption)]] RenderOption {
+            ViewDirection [[codegen::key("Camera View Direction")]],
+            PositionNormal [[codegen::key("Camera Position Normal")]]
+        };
+        // [[codegen::verbatim(RenderOptionInfo.description)]]
+        std::optional<RenderOption> renderOption;
+
+        // [[codegen::verbatim(UseAdditiveBlendingInfo.description)]]
+        std::optional<bool> useAdditiveBlending;
+
+        enum class [[codegen::map(openspace::DistanceUnit)]] Unit {
+            Meter [[codegen::key("m")]],
+            Kilometer [[codegen::key("Km")]],
+            Parsec [[codegen::key("pc")]],
+            Kiloparsec [[codegen::key("Kpc")]],
+            Megaparsec [[codegen::key("Mpc")]],
+            Gigaparsec [[codegen::key("Gpc")]],
+            Gigalightyear [[codegen::key("Gly")]]
+        };
+        // The unit used for all distances. Should match the unit of any
+        // distances/positions in the data files
+        std::optional<Unit> unit;
+
+        // [[codegen::verbatim(LabelsInfo.description)]]
+        std::optional<ghoul::Dictionary> labels
+            [[codegen::reference("labelscomponent")]];
+
+        struct SizeSettings {
+            // A list specifying all parameters that may be used for size mapping, i.e.
+            // scaling the points based on the provided data columns
+            std::optional<std::vector<std::string>> sizeMapping;
+
+            // [[codegen::verbatim(ScaleExponentInfo.description)]]
+            std::optional<float> scaleExponent;
+
+            // [[codegen::verbatim(ScaleFactorInfo.description)]]
+            std::optional<float> scaleFactor;
+
+            // [[codegen::verbatim(PixelSizeControlInfo.description)]]
+            std::optional<bool> enablePixelSizeControl;
+
+            // [[codegen::verbatim(MaxPixelSizeInfo.description)]]
+            std::optional<float> maxPixelSize;
+        };
+        // Settings related to the scale of the points, whether they should limit to
+        // a certain pixel size, etc.
+        std::optional<SizeSettings> sizeSettings;
+
+        struct ColorSettings {
+            // [[codegen::verbatim(PointColorInfo.description)]]
+            std::optional<glm::vec3> fixedColor [[codegen::color()]];
+
+            // Settings related to the choice of color map, parameters, etc.
+            std::optional<ghoul::Dictionary> colorMapping
+                [[codegen::reference("colormappingcomponent")]];
+        };
+        // Settings related to the coloring of the points, such as a fixed color,
+        // color map, etc.
+        std::optional<ColorSettings> coloring;
+
+        struct Fading {
+            // [[codegen::verbatim(EnableDistanceFadeInfo.description)]]
+            std::optional<bool> enabled;
+
+            // [[codegen::verbatim(FadeInDistancesInfo.description)]]
+            std::optional<glm::dvec2> fadeInDistances;
+
+            // [[codegen::verbatim(InvertFadeInfo.description)]]
+            std::optional<bool> invert;
+        };
+        // Settings related to fading based on camera distance. Can be used to either
+        // fade away or fade in the points when reaching a certain distance from the
+        // origin of the dataset
+        std::optional<Fading> fading;
+
+        // Transformation matrix to be applied to each object
+        std::optional<glm::dmat4x4> transformationMatrix;
+    };
+
+#include "renderablepointcloud_codegen.cpp"
+}  // namespace
+
+namespace openspace {
+
+documentation::Documentation RenderablePointCloud::Documentation() {
+    return codegen::doc<Parameters>("base_renderablepointcloud");
+}
+
+RenderablePointCloud::SizeSettings::SizeSettings(const ghoul::Dictionary& dictionary)
+    : properties::PropertyOwner({ "Sizing", "Sizing", ""})
+    , scaleExponent(ScaleExponentInfo, 1.f, 0.f, 25.f)
+    , scaleFactor(ScaleFactorInfo, 1.f, 0.f, 50.f)
+    , pixelSizeControl(PixelSizeControlInfo, false)
+    , maxPixelSize(MaxPixelSizeInfo, 400.f, 0.f, 1000.f)
+{
+    const Parameters p = codegen::bake<Parameters>(dictionary);
+
+    if (p.sizeSettings.has_value()) {
+        const Parameters::SizeSettings settings = *p.sizeSettings;
+
+        scaleFactor = settings.scaleFactor.value_or(scaleFactor);
+        scaleExponent = settings.scaleExponent.value_or(scaleExponent);
+        pixelSizeControl = settings.enablePixelSizeControl.value_or(pixelSizeControl);
+        maxPixelSize = settings.maxPixelSize.value_or(maxPixelSize);
+
+        if (settings.sizeMapping.has_value()) {
+            std::vector<std::string> opts = *settings.sizeMapping;
+            for (size_t i = 0; i < opts.size(); ++i) {
+                // Note that options are added in order
+                sizeMapping.parameterOption.addOption(static_cast<int>(i), opts[i]);
+            }
+            sizeMapping.enabled = true;
+
+            addPropertySubOwner(sizeMapping);
+        }
+    }
+
+    addProperty(scaleFactor);
+    addProperty(scaleExponent);
+    addProperty(pixelSizeControl);
+    addProperty(maxPixelSize);
+}
+
+RenderablePointCloud::SizeSettings::SizeMapping::SizeMapping()
+    : properties::PropertyOwner({ "SizeMapping", "Size Mapping", "" })
+    , enabled(SizeMappingEnabledInfo, false)
+    , parameterOption(
+        SizeMappingOptionInfo,
+        properties::OptionProperty::DisplayType::Dropdown
+    )
+{
+    addProperty(enabled);
+    addProperty(parameterOption);
+}
+
+RenderablePointCloud::ColorSettings::ColorSettings(const ghoul::Dictionary& dictionary)
+    : properties::PropertyOwner({ "Coloring", "Coloring", "" })
+    , pointColor(PointColorInfo, glm::vec3(1.f), glm::vec3(0.f), glm::vec3(1.f))
+{
+    const Parameters p = codegen::bake<Parameters>(dictionary);
+
+    if (p.coloring.has_value()) {
+        const Parameters::ColorSettings settings = *p.coloring;
+        pointColor = settings.fixedColor.value_or(pointColor);
+
+        if (settings.colorMapping.has_value()) {
+            colorMapping = std::make_unique<ColorMappingComponent>(
+                *settings.colorMapping
+           );
+           addPropertySubOwner(colorMapping.get());
+        }
+    }
+    pointColor.setViewOption(properties::Property::ViewOptions::Color);
+    addProperty(pointColor);
+}
+
+RenderablePointCloud::Fading::Fading(const ghoul::Dictionary& dictionary)
+    : properties::PropertyOwner({ "Fading", "Fading", "" })
+    , enabled(EnableDistanceFadeInfo, false)
+    , fadeInDistances(
+        FadeInDistancesInfo,
+        glm::vec2(0.f),
+        glm::vec2(0.f),
+        glm::vec2(100.f)
+    )
+    , invert(InvertFadeInfo, false)
+{
+    const Parameters p = codegen::bake<Parameters>(dictionary);
+
+    if (p.fading.has_value()) {
+        const Parameters::Fading f = *p.fading;
+
+        if (f.fadeInDistances.has_value()) {
+            fadeInDistances = *f.fadeInDistances;
+            // Set the allowed max value based of that which was entered. Just to give
+            // useful values for the slider
+            fadeInDistances.setMaxValue(10.f * glm::vec2(fadeInDistances.value().y));
+        }
+
+        enabled = f.enabled.value_or(f.fadeInDistances.has_value());
+        invert = f.invert.value_or(invert);
+    }
+
+    addProperty(enabled);
+    fadeInDistances.setViewOption(properties::Property::ViewOptions::MinMaxRange);
+    addProperty(fadeInDistances);
+    addProperty(invert);
+}
+
+RenderablePointCloud::RenderablePointCloud(const ghoul::Dictionary& dictionary)
+    : Renderable(dictionary)
+    , _spriteTexturePath(SpriteTextureInfo)
+    , _useSpriteTexture(UseSpriteTextureInfo, true)
+    , _drawElements(DrawElementsInfo, true)
+    , _useAdditiveBlending(UseAdditiveBlendingInfo, true)
+    , _renderOption(RenderOptionInfo, properties::OptionProperty::DisplayType::Dropdown)
+    , _nDataPoints(NumShownDataPointsInfo, 0)
+    , _fading(dictionary)
+    , _colorSettings(dictionary)
+    , _sizeSettings(dictionary)
+{
+    const Parameters p = codegen::bake<Parameters>(dictionary);
+
+    addProperty(Fadeable::_opacity);
+
+    if (p.file.has_value()) {
+        _hasDataFile = true;
+        _dataFile = absPath(*p.file).string();
+    }
+
+    if (p.dataMapping.has_value()) {
+        _dataMapping = dataloader::DataMapping::createFromDictionary(*p.dataMapping);
+    }
+
+    _drawElements = p.drawElements.value_or(_drawElements);
+    addProperty(_drawElements);
+
+    _renderOption.addOption(RenderOption::ViewDirection, "Camera View Direction");
+    _renderOption.addOption(RenderOption::PositionNormal, "Camera Position Normal");
+
+    if (p.renderOption.has_value()) {
+        _renderOption = codegen::map<RenderOption>(*p.renderOption);
+    }
+    else {
+        _renderOption = RenderOption::ViewDirection;
+    }
+    addProperty(_renderOption);
+
+    _useAdditiveBlending = p.useAdditiveBlending.value_or(_useAdditiveBlending);
+    addProperty(_useAdditiveBlending);
+
+    if (p.unit.has_value()) {
+        _unit = codegen::map<DistanceUnit>(*p.unit);
+    }
+    else {
+        _unit = DistanceUnit::Meter;
+    }
+
+    _spriteTexturePath.onChange([this]() { _spriteTextureIsDirty = true; });
+    addProperty(_spriteTexturePath);
+
+    _useSpriteTexture = p.useTexture.value_or(_useSpriteTexture);
+    addProperty(_useSpriteTexture);
+
+    if (p.texture.has_value()) {
+        _spriteTexturePath = absPath(*p.texture).string();
+    }
+
+    _hasSpriteTexture = p.texture.has_value();
+
+    if (p.labels.has_value()) {
+        _labels = std::make_unique<LabelsComponent>(*p.labels);
+        _hasLabels = true;
+        addPropertySubOwner(_labels.get());
+        // Fading of the labels should also depend on the fading of the renderable
+        _labels->setParentFadeable(this);
+    }
+
+    _transformationMatrix = p.transformationMatrix.value_or(_transformationMatrix);
+
+    if (p.sizeSettings.has_value() && p.sizeSettings->sizeMapping.has_value()) {
+        _sizeSettings.sizeMapping.parameterOption.onChange(
+            [this]() { _dataIsDirty = true; }
+        );
+        _hasDatavarSize = true;
+    }
+
+    addPropertySubOwner(_sizeSettings);
+    addPropertySubOwner(_colorSettings);
+
+    if (p.fading.has_value()) {
+        addPropertySubOwner(_fading);
+    }
+
+    if (p.coloring.has_value() && (*p.coloring).colorMapping.has_value()) {
+        _hasColorMapFile = true;
+
+        _colorSettings.colorMapping->dataColumn.onChange(
+            [this]() { _dataIsDirty = true; }
+        );
+
+        _colorSettings.colorMapping->setRangeFromData.onChange([this]() {
+            int parameterIndex = currentColorParameterIndex();
+            _colorSettings.colorMapping->valueRange = _dataset.findValueRange(
+                parameterIndex
+            );
+        });
+    }
+
+    if (_hasDataFile) {
+        bool useCaching = p.useCaching.value_or(true);
+        if (useCaching) {
+            _dataset = dataloader::data::loadFileWithCache(_dataFile, _dataMapping);
+        }
+        else {
+            _dataset = dataloader::data::loadFile(_dataFile, _dataMapping);
+        }
+        _nDataPoints = static_cast<unsigned int>(_dataset.entries.size());
+    }
+
+    // If no scale exponent was specified, compute one that will at least show the points
+    // based on the scale of the positions in the dataset
+    if (!p.sizeSettings.has_value() || !p.sizeSettings->scaleExponent.has_value()) {
+        double dist = _dataset.maxPositionComponent * toMeter(_unit);
+        float exponent = static_cast<float>(std::log10(dist));
+        // Reduce the actually used exponent a little bit, as just using the logarithm
+        // as is leads to very large points
+        _sizeSettings.scaleExponent = 0.9f * exponent;
+    }
+
+    _nDataPoints.setReadOnly(true);
+    addProperty(_nDataPoints);
+}
+
+bool RenderablePointCloud::isReady() const {
+    bool isReady = _program && !_dataset.entries.empty();
+
+    // If we have labels, they also need to be loaded
+    if (_hasLabels) {
+        isReady = isReady && _labels->isReady();
+    }
+    return isReady;
+}
+
+void RenderablePointCloud::initialize() {
+    ZoneScoped;
+
+    if (_hasDataFile && _hasColorMapFile) {
+        _colorSettings.colorMapping->initialize(_dataset);
+    }
+
+    if (_hasLabels) {
+        _labels->initialize();
+        _labels->loadLabels();
+    }
+}
+
+void RenderablePointCloud::initializeGL() {
+    ZoneScoped;
+
+    _program = BaseModule::ProgramObjectManager.request(
+        "RenderablePointCloud",
+        []() {
+            return global::renderEngine->buildRenderProgram(
+                "RenderablePointCloud",
+                absPath("${MODULE_BASE}/shaders/billboardpoint_vs.glsl"),
+                absPath("${MODULE_BASE}/shaders/billboardpoint_fs.glsl"),
+                absPath("${MODULE_BASE}/shaders/billboardpoint_gs.glsl")
+            );
+        }
+    );
+
+    ghoul::opengl::updateUniformLocations(*_program, _uniformCache, UniformNames);
+
+    if (_hasColorMapFile) {
+        _colorSettings.colorMapping->initializeTexture();
+    }
+}
+
+void RenderablePointCloud::deinitializeGL() {
+    glDeleteBuffers(1, &_vbo);
+    _vbo = 0;
+    glDeleteVertexArrays(1, &_vao);
+    _vao = 0;
+
+    BaseModule::ProgramObjectManager.release(
+        "RenderablePointCloud",
+        [](ghoul::opengl::ProgramObject* p) {
+            global::renderEngine->removeRenderProgram(p);
+        }
+    );
+    _program = nullptr;
+
+    BaseModule::TextureManager.release(_spriteTexture);
+    _spriteTexture = nullptr;
+}
+
+void RenderablePointCloud::bindTextureForRendering() const {
+    if (_spriteTexture) {
+        _spriteTexture->bind();
+    }
+}
+
+float RenderablePointCloud::computeDistanceFadeValue(const RenderData& data) const {
+    if (!_fading.enabled) {
+        return 1.f;
+    }
+
+    float fadeValue = 1.f;
+    glm::dmat4 invModelMatrix = glm::inverse(calcModelTransform(data));
+
+    glm::dvec3 cameraPosModelSpace = glm::dvec3(
+        invModelMatrix * glm::dvec4(data.camera.positionVec3(), 1.0)
+    );
+
+    float distCamera = static_cast<float>(
+        glm::length(cameraPosModelSpace) / toMeter(_unit)
+    );
+
+    const glm::vec2 fadeRange = _fading.fadeInDistances;
+    const float fadeRangeWidth = (fadeRange.y - fadeRange.x);
+    float funcValue = (distCamera - fadeRange.x) / fadeRangeWidth;
+    funcValue = glm::clamp(funcValue, 0.f, 1.f);
+
+    if (_fading.invert) {
+        funcValue = 1.f - funcValue;
+    }
+
+    return fadeValue * funcValue;
+}
+
+void RenderablePointCloud::renderBillboards(const RenderData& data,
+                                            const glm::dmat4& modelMatrix,
+                                            const glm::dvec3& orthoRight,
+                                            const glm::dvec3& orthoUp,
+                                            float fadeInVariable)
+{
+    glEnablei(GL_BLEND, 0);
+
+    if (_useAdditiveBlending) {
+        glDepthMask(false);
+        glBlendFunc(GL_SRC_ALPHA, GL_ONE);
+    }
+    else {
+        // Normal blending, with transparency
+        glDepthMask(true);
+        glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
+    }
+
+    _program->activate();
+
+    _program->setUniform(
+        "screenSize",
+        glm::vec2(global::renderEngine->renderingResolution())
+    );
+
+    _program->setUniform(_uniformCache.cameraPos, data.camera.positionVec3());
+    _program->setUniform(
+        _uniformCache.cameraLookup,
+        glm::vec3(data.camera.lookUpVectorWorldSpace())
+    );
+    _program->setUniform(_uniformCache.renderOption, _renderOption.value());
+    _program->setUniform(_uniformCache.modelMatrix, modelMatrix);
+    _program->setUniform(
+        _uniformCache.cameraViewProjectionMatrix,
+        glm::dmat4(data.camera.projectionMatrix()) * data.camera.combinedViewMatrix()
+    );
+
+    _program->setUniform(_uniformCache.up, glm::vec3(orthoUp));
+    _program->setUniform(_uniformCache.right, glm::vec3(orthoRight));
+    _program->setUniform(_uniformCache.fadeInValue, fadeInVariable);
+    _program->setUniform(_uniformCache.opacity, opacity());
+
+    _program->setUniform(_uniformCache.scaleExponent, _sizeSettings.scaleExponent);
+    _program->setUniform(_uniformCache.scaleFactor, _sizeSettings.scaleFactor);
+    _program->setUniform(_uniformCache.enablePixelSizeControl, _sizeSettings.pixelSizeControl);
+    _program->setUniform(_uniformCache.maxBillboardSize, _sizeSettings.maxPixelSize);
+    _program->setUniform(_uniformCache.hasDvarScaling, _sizeSettings.sizeMapping.enabled);
+
+    GLint viewport[4];
+    glGetIntegerv(GL_VIEWPORT, viewport);
+    _program->setUniform(_uniformCache.screenSize, glm::vec2(viewport[2], viewport[3]));
+
+    bool useTexture = _hasSpriteTexture && _useSpriteTexture;
+    _program->setUniform(_uniformCache.hasSpriteTexture, useTexture);
+
+    ghoul::opengl::TextureUnit spriteTextureUnit;
+    _program->setUniform(_uniformCache.spriteTexture, spriteTextureUnit);
+    if (useTexture) {
+        spriteTextureUnit.activate();
+        bindTextureForRendering();
+    }
+
+    _program->setUniform(_uniformCache.color, _colorSettings.pointColor);
+
+    bool useColorMap = _hasColorMapFile && _colorSettings.colorMapping->enabled &&
+        _colorSettings.colorMapping->texture();
+
+    _program->setUniform(_uniformCache.useColormap, useColorMap);
+
+    ghoul::opengl::TextureUnit colorMapTextureUnit;
+    _program->setUniform(_uniformCache.colorMapTexture, colorMapTextureUnit);
+
+    if (useColorMap) {
+        colorMapTextureUnit.activate();
+        _colorSettings.colorMapping->texture()->bind();
+
+        const glm::vec2 range = _colorSettings.colorMapping->valueRange;
+        _program->setUniform(_uniformCache.cmapRangeMin, range.x);
+        _program->setUniform(_uniformCache.cmapRangeMax, range.y);
+        _program->setUniform(
+            _uniformCache.hideOutsideRange,
+            _colorSettings.colorMapping->hideOutsideRange
+        );
+
+        _program->setUniform(
+            _uniformCache.nanColor,
+            _colorSettings.colorMapping->nanColor
+        );
+        _program->setUniform(
+            _uniformCache.useNanColor,
+            _colorSettings.colorMapping->useNanColor
+        );
+
+        _program->setUniform(
+            _uniformCache.aboveRangeColor,
+            _colorSettings.colorMapping->aboveRangeColor
+        );
+        _program->setUniform(
+            _uniformCache.useAboveRangeColor,
+            _colorSettings.colorMapping->useAboveRangeColor
+        );
+
+        _program->setUniform(
+            _uniformCache.belowRangeColor,
+            _colorSettings.colorMapping->belowRangeColor
+        );
+        _program->setUniform(
+            _uniformCache.useBelowRangeColor,
+            _colorSettings.colorMapping->useBelowRangeColor
+        );
+    }
+
+    glBindVertexArray(_vao);
+    glDrawArrays(GL_POINTS, 0, static_cast<GLsizei>(_dataset.entries.size()));
+    glBindVertexArray(0);
+    _program->deactivate();
+
+    global::renderEngine->openglStateCache().resetBlendState();
+    global::renderEngine->openglStateCache().resetDepthState();
+}
+
+void RenderablePointCloud::render(const RenderData& data, RendererTasks&) {
+    float fadeInVar = computeDistanceFadeValue(data);
+
+    if (fadeInVar < 0.01f) {
+        return;
+    }
+
+    glm::dmat4 modelMatrix = calcModelTransform(data);
+    glm::dmat4 modelViewProjectionMatrix =
+        calcModelViewProjectionTransform(data, modelMatrix);
+
+    glm::dvec3 cameraViewDirectionWorld = -data.camera.viewDirectionWorldSpace();
+    glm::dvec3 cameraUpDirectionWorld = data.camera.lookUpVectorWorldSpace();
+    glm::dvec3 orthoRight = glm::normalize(
+        glm::cross(cameraUpDirectionWorld, cameraViewDirectionWorld)
+    );
+    if (orthoRight == glm::dvec3(0.0)) {
+        glm::dvec3 otherVector = glm::vec3(
+            cameraUpDirectionWorld.y,
+            cameraUpDirectionWorld.x,
+            cameraUpDirectionWorld.z
+        );
+        orthoRight = glm::normalize(glm::cross(otherVector, cameraViewDirectionWorld));
+    }
+    glm::dvec3 orthoUp = glm::normalize(glm::cross(cameraViewDirectionWorld, orthoRight));
+
+    if (_hasDataFile && _drawElements) {
+        renderBillboards(data, modelMatrix, orthoRight, orthoUp, fadeInVar);
+    }
+
+    if (_hasLabels) {
+        _labels->render(data, modelViewProjectionMatrix, orthoRight, orthoUp, fadeInVar);
+    }
+}
+
+void RenderablePointCloud::update(const UpdateData&) {
+    ZoneScoped;
+
+    if (_dataIsDirty) {
+        updateBufferData();
+    }
+
+    if (_spriteTextureIsDirty) {
+        updateSpriteTexture();
+    }
+}
+
+int RenderablePointCloud::nAttributesPerPoint() const {
+    int n = 4; // position
+    n += _hasColorMapFile ? 1 : 0;
+    n += _hasDatavarSize ? 1 : 0;
+    return n;
+}
+
+void RenderablePointCloud::updateBufferData() {
+    if (!_hasDataFile) {
+        return;
+    }
+
+    ZoneScopedN("Data dirty");
+    TracyGpuZone("Data dirty");
+    LDEBUG("Regenerating data");
+
+    std::vector<float> slice = createDataSlice();
+
+    int size = static_cast<int>(slice.size());
+
+    if (_vao == 0) {
+        glGenVertexArrays(1, &_vao);
+        LDEBUG(fmt::format("Generating Vertex Array id '{}'", _vao));
+    }
+    if (_vbo == 0) {
+        glGenBuffers(1, &_vbo);
+        LDEBUG(fmt::format("Generating Vertex Buffer Object id '{}'", _vbo));
+    }
+
+    glBindVertexArray(_vao);
+    glBindBuffer(GL_ARRAY_BUFFER, _vbo);
+    glBufferData(GL_ARRAY_BUFFER, size * sizeof(float), slice.data(), GL_STATIC_DRAW);
+
+    const int attibutesPerPoint = nAttributesPerPoint();
+    int attributeOffset = 0;
+
+    GLint positionAttrib = _program->attributeLocation("in_position");
+    glEnableVertexAttribArray(positionAttrib);
+    glVertexAttribPointer(
+        positionAttrib,
+        4,
+        GL_FLOAT,
+        GL_FALSE,
+        attibutesPerPoint * sizeof(float),
+        nullptr
+    );
+    attributeOffset += 4;
+
+    if (_hasColorMapFile) {
+        GLint colorParamAttrib = _program->attributeLocation("in_colorParameter");
+        glEnableVertexAttribArray(colorParamAttrib);
+        glVertexAttribPointer(
+            colorParamAttrib,
+            1,
+            GL_FLOAT,
+            GL_FALSE,
+            attibutesPerPoint * sizeof(float),
+            reinterpret_cast<void*>(attributeOffset * sizeof(float))
+        );
+        attributeOffset += 1;
+    }
+
+    if (_hasDatavarSize) {
+        GLint scalingAttrib = _program->attributeLocation("in_scalingParameter");
+        glEnableVertexAttribArray(scalingAttrib);
+        glVertexAttribPointer(
+            scalingAttrib,
+            1,
+            GL_FLOAT,
+            GL_FALSE,
+            attibutesPerPoint * sizeof(float),
+            reinterpret_cast<void*>(attributeOffset * sizeof(float))
+        );
+        attributeOffset += 1;
+    }
+
+    glBindVertexArray(0);
+
+    _dataIsDirty = false;
+}
+
+void RenderablePointCloud::updateSpriteTexture() {
+    bool shouldUpdate = _hasSpriteTexture && _spriteTextureIsDirty &&
+        !_spriteTexturePath.value().empty();
+
+    if (!shouldUpdate) {
+        return;
+    }
+
+    ZoneScopedN("Sprite texture");
+    TracyGpuZone("Sprite texture");
+
+    ghoul::opengl::Texture* texture = _spriteTexture;
+
+    unsigned int hash = ghoul::hashCRC32File(_spriteTexturePath);
+
+    _spriteTexture = BaseModule::TextureManager.request(
+        std::to_string(hash),
+        [path = _spriteTexturePath]() -> std::unique_ptr<ghoul::opengl::Texture> {
+            std::filesystem::path p = absPath(path);
+            LINFO(fmt::format("Loaded texture from {}", p));
+            std::unique_ptr<ghoul::opengl::Texture> t =
+                ghoul::io::TextureReader::ref().loadTexture(p.string(), 2);
+            t->uploadTexture();
+            t->setFilter(ghoul::opengl::Texture::FilterMode::AnisotropicMipMap);
+            t->purgeFromRAM();
+            return t;
+        }
+    );
+
+    BaseModule::TextureManager.release(texture);
+    _spriteTextureIsDirty = false;
+}
+
+int RenderablePointCloud::currentColorParameterIndex() const {
+    const properties::OptionProperty& property =
+        _colorSettings.colorMapping->dataColumn;
+
+    if (!_hasColorMapFile || property.options().empty()) {
+        return 0;
+    }
+
+    return _dataset.index(property.option().description);
+}
+
+int RenderablePointCloud::currentSizeParameterIndex() const {
+    const properties::OptionProperty& property =
+        _sizeSettings.sizeMapping.parameterOption;
+
+    if (!_hasDatavarSize || property.options().empty()) {
+        return 0;
+    }
+
+    return _dataset.index(property.option().description);
+}
+
+std::vector<float> RenderablePointCloud::createDataSlice() {
+    ZoneScoped;
+
+    if (_dataset.entries.empty()) {
+        return std::vector<float>();
+    }
+
+    std::vector<float> result;
+    result.reserve(nAttributesPerPoint() * _dataset.entries.size());
+
+    // What datavar is in use for the index color
+    int colorParamIndex = currentColorParameterIndex();
+
+    // What datavar is in use for the size scaling (if present)
+    int sizeParamIndex = currentSizeParameterIndex();
+
+    double maxRadius = 0.0;
+    double biggestCoord = -1.0;
+
+    for (const dataloader::Dataset::Entry& e : _dataset.entries) {
+        const double unitMeter = toMeter(_unit);
+        glm::dvec4 position = glm::dvec4(glm::dvec3(e.position) * unitMeter, 1.0);
+        position = _transformationMatrix * position;
+
+        const double r = glm::length(position);
+        maxRadius = std::max(maxRadius, r);
+
+        // Positions
+        for (int j = 0; j < 4; ++j) {
+            result.push_back(static_cast<float>(position[j]));
+        }
+
+        // Colors
+        if (_hasColorMapFile) {
+            biggestCoord = std::max(biggestCoord, glm::compMax(position));
+            result.push_back(e.data[colorParamIndex]);
+        }
+
+        // Size data
+        if (_hasDatavarSize) {
+            // @TODO: Consider more detailed control over the scaling. Currently the value
+            // is multiplied with the value as is. Should have similar mapping properties
+            // as the color mapping
+            result.push_back(e.data[sizeParamIndex]);
+        }
+    }
+    setBoundingSphere(maxRadius);
+    return result;
+}
+
+} // namespace openspace
diff --git a/modules/digitaluniverse/rendering/renderablebillboardscloud.h b/modules/base/rendering/pointcloud/renderablepointcloud.h
similarity index 58%
rename from modules/digitaluniverse/rendering/renderablebillboardscloud.h
rename to modules/base/rendering/pointcloud/renderablepointcloud.h
index 93701b6aea..0cfcbed715 100644
--- a/modules/digitaluniverse/rendering/renderablebillboardscloud.h
+++ b/modules/base/rendering/pointcloud/renderablepointcloud.h
@@ -22,27 +22,27 @@
  * OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                                         *
  ****************************************************************************************/
 
-#ifndef __OPENSPACE_MODULE_DIGITALUNIVERSE___RENDERABLEBILLBOARDSCLOUD___H__
-#define __OPENSPACE_MODULE_DIGITALUNIVERSE___RENDERABLEBILLBOARDSCLOUD___H__
+#ifndef __OPENSPACE_MODULE_BASE___RENDERABLEPOINTCLOUD___H__
+#define __OPENSPACE_MODULE_BASE___RENDERABLEPOINTCLOUD___H__
 
 #include <openspace/rendering/renderable.h>
 
-#include <modules/space/labelscomponent.h>
 #include <openspace/properties/optionproperty.h>
 #include <openspace/properties/stringproperty.h>
 #include <openspace/properties/triggerproperty.h>
 #include <openspace/properties/scalar/boolproperty.h>
 #include <openspace/properties/scalar/floatproperty.h>
+#include <openspace/properties/scalar/uintproperty.h>
 #include <openspace/properties/vector/ivec2property.h>
 #include <openspace/properties/vector/vec2property.h>
 #include <openspace/properties/vector/vec3property.h>
+#include <openspace/rendering/colormappingcomponent.h>
+#include <openspace/rendering/labelscomponent.h>
 #include <openspace/util/distanceconversion.h>
 #include <ghoul/opengl/ghoul_gl.h>
 #include <ghoul/opengl/uniformcache.h>
 #include <functional>
-#include <unordered_map>
 
-namespace ghoul::filesystem { class File; }
 namespace ghoul::opengl {
     class ProgramObject;
     class Texture;
@@ -52,10 +52,15 @@ namespace openspace {
 
 namespace documentation { struct Documentation; }
 
-class RenderableBillboardsCloud : public Renderable {
+/**
+ * This class describes a point cloud renderable that can be used to draw billboraded
+ * points based on a data file with 3D positions.  Alternatively the points can also
+ * be colored and sized based on a separate column in the data file.
+ */
+class RenderablePointCloud : public Renderable {
 public:
-    explicit RenderableBillboardsCloud(const ghoul::Dictionary& dictionary);
-    ~RenderableBillboardsCloud() override = default;
+    explicit RenderablePointCloud(const ghoul::Dictionary& dictionary);
+    ~RenderablePointCloud() override = default;
 
     void initialize() override;
     void initializeGL() override;
@@ -68,88 +73,104 @@ public:
 
     static documentation::Documentation Documentation();
 
-private:
+protected:
+    int nAttributesPerPoint() const;
+    void updateBufferData();
+    void updateSpriteTexture();
+
+    /// Find the index of the currently chosen color parameter in the dataset
+    int currentColorParameterIndex() const;
+    /// Find the index of the currently chosen size parameter in the dataset
+    int currentSizeParameterIndex() const;
+
     std::vector<float> createDataSlice();
-    void createPolygonTexture();
-    void renderToTexture(GLuint textureToRenderTo, GLuint textureWidth,
-        GLuint textureHeight);
-    void loadPolygonGeometryForRendering();
-    void renderPolygonGeometry(GLuint vao);
+
+    virtual void bindTextureForRendering() const;
+
+    float computeDistanceFadeValue(const RenderData& data) const;
+
     void renderBillboards(const RenderData& data, const glm::dmat4& modelMatrix,
         const glm::dvec3& orthoRight, const glm::dvec3& orthoUp, float fadeInVariable);
 
-    bool _hasSpeckFile = false;
     bool _dataIsDirty = true;
-    bool _hasSpriteTexture = false;
     bool _spriteTextureIsDirty = true;
+
+    bool _hasSpriteTexture = false;
+    bool _hasDataFile = false;
     bool _hasColorMapFile = false;
-    bool _isColorMapExact = false;
     bool _hasDatavarSize = false;
-    bool _hasPolygon = false;
     bool _hasLabels = false;
 
-    int _polygonSides = 0;
+    struct SizeSettings : properties::PropertyOwner {
+        explicit SizeSettings(const ghoul::Dictionary& dictionary);
 
-    GLuint _pTexture = 0;
+        struct SizeMapping : properties::PropertyOwner {
+            SizeMapping();
+            properties::BoolProperty enabled;
+            properties::OptionProperty parameterOption;
+        };
+        SizeMapping sizeMapping;
 
-    properties::FloatProperty _scaleFactor;
-    properties::BoolProperty _useColorMap;
-    properties::Vec3Property _pointColor;
+        properties::FloatProperty scaleExponent;
+        properties::FloatProperty scaleFactor;
+
+        properties::BoolProperty pixelSizeControl;
+        properties::FloatProperty maxPixelSize;
+    };
+    SizeSettings _sizeSettings;
+
+    struct ColorSettings : properties::PropertyOwner {
+        explicit ColorSettings(const ghoul::Dictionary& dictionary);
+        properties::Vec3Property pointColor;
+        std::unique_ptr<ColorMappingComponent> colorMapping;
+    };
+    ColorSettings _colorSettings;
+
+    struct Fading : properties::PropertyOwner {
+        explicit Fading(const ghoul::Dictionary& dictionary);
+        properties::Vec2Property fadeInDistances;
+        properties::BoolProperty enabled;
+        properties::BoolProperty invert;
+    };
+    Fading _fading;
+
+    properties::BoolProperty _useSpriteTexture;
     properties::StringProperty _spriteTexturePath;
+
+    properties::BoolProperty _useAdditiveBlending;
+
     properties::BoolProperty _drawElements;
-    properties::BoolProperty _pixelSizeControl;
-    properties::OptionProperty _colorOption;
-    properties::Vec2Property _optionColorRangeData;
-    properties::OptionProperty _datavarSizeOption;
-    properties::Vec2Property _fadeInDistances;
-    properties::BoolProperty _disableFadeInDistance;
-    properties::Vec2Property _billboardMinMaxSize;
-    properties::FloatProperty _correctionSizeEndDistance;
-    properties::FloatProperty _correctionSizeFactor;
-    properties::BoolProperty _useLinearFiltering;
-    properties::TriggerProperty _setRangeFromData;
     properties::OptionProperty _renderOption;
 
-    ghoul::opengl::Texture* _polygonTexture = nullptr;
+    properties::UIntProperty _nDataPoints;
+
     ghoul::opengl::Texture* _spriteTexture = nullptr;
     ghoul::opengl::ProgramObject* _program = nullptr;
-    ghoul::opengl::ProgramObject* _renderToPolygonProgram = nullptr;
 
     UniformCache(
         cameraViewProjectionMatrix, modelMatrix, cameraPos, cameraLookup, renderOption,
-        minBillboardSize, maxBillboardSize, correctionSizeEndDistance,
-        correctionSizeFactor, color, alphaValue, scaleFactor, up, right, fadeInValue,
-        screenSize, spriteTexture, hasColormap, useColormap, enabledRectSizeControl,
-        hasDvarScaling
+        maxBillboardSize, color, opacity, scaleExponent, scaleFactor, up, right,
+        fadeInValue, screenSize, hasSpriteTexture, spriteTexture, useColormap,
+        colorMapTexture, cmapRangeMin, cmapRangeMax, nanColor, useNanColor,
+        hideOutsideRange, enablePixelSizeControl, aboveRangeColor, useAboveRangeColor,
+        belowRangeColor, useBelowRangeColor, hasDvarScaling
     ) _uniformCache;
 
-    std::string _speckFile;
-    std::string _colorMapFile;
-    std::string _colorOptionString;
-    std::string _datavarSizeOptionString;
+    std::string _dataFile;
 
     DistanceUnit _unit = DistanceUnit::Parsec;
 
-    speck::Dataset _dataset;
-    speck::ColorMap _colorMap;
+    dataloader::Dataset _dataset;
+    dataloader::DataMapping _dataMapping;
 
-    // Everything related to the labels is handled by LabelsComponent
     std::unique_ptr<LabelsComponent> _labels;
 
-    std::vector<glm::vec2> _colorRangeData;
-    std::unordered_map<int, std::string> _optionConversionMap;
-    std::unordered_map<int, std::string> _optionConversionSizeMap;
-
     glm::dmat4 _transformationMatrix = glm::dmat4(1.0);
 
     GLuint _vao = 0;
     GLuint _vbo = 0;
-
-    // For polygons
-    GLuint _polygonVao = 0;
-    GLuint _polygonVbo = 0;
 };
 
 } // namespace openspace
 
-#endif // __OPENSPACE_MODULE_DIGITALUNIVERSE___RENDERABLEBILLBOARDSCLOUD___H__
+#endif // __OPENSPACE_MODULE_BASE___RENDERABLEPOINTCLOUD___H__
diff --git a/modules/base/rendering/pointcloud/renderablepolygoncloud.cpp b/modules/base/rendering/pointcloud/renderablepolygoncloud.cpp
new file mode 100644
index 0000000000..672586f435
--- /dev/null
+++ b/modules/base/rendering/pointcloud/renderablepolygoncloud.cpp
@@ -0,0 +1,193 @@
+/*****************************************************************************************
+ *                                                                                       *
+ * OpenSpace                                                                             *
+ *                                                                                       *
+ * Copyright (c) 2014-2023                                                               *
+ *                                                                                       *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
+ * software and associated documentation files (the "Software"), to deal in the Software *
+ * without restriction, including without limitation the rights to use, copy, modify,    *
+ * merge, publish, distribute, sublicense, and/or sell copies of the Software, and to    *
+ * permit persons to whom the Software is furnished to do so, subject to the following   *
+ * conditions:                                                                           *
+ *                                                                                       *
+ * The above copyright notice and this permission notice shall be included in all copies *
+ * or substantial portions of the Software.                                              *
+ *                                                                                       *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED,   *
+ * INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A         *
+ * PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT    *
+ * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF  *
+ * CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE  *
+ * OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                                         *
+ ****************************************************************************************/
+
+#include <modules/base/rendering/pointcloud/renderablepolygoncloud.h>
+
+#include <openspace/documentation/documentation.h>
+#include <ghoul/filesystem/filesystem.h>
+#include <ghoul/glm.h>
+#include <ghoul/logging/logmanager.h>
+#include <ghoul/opengl/programobject.h>
+#include <ghoul/opengl/texture.h>
+#include <optional>
+
+namespace {
+    constexpr std::string_view _loggerCat = "RenderablePolygonCloud";
+
+    // A RenderablePolygonCloud is a RenderablePointCloud where the shape of the points
+    // is a uniform polygon with a given number of sides instead of a texture. For
+    // instance, PolygonSides = 5 results in the points being rendered as pentagons.
+    // Note that while this renderable inherits the texture property from
+    // RenderablePointCloud, any added texture value will be ignored in favor of the
+    // polygon shape.
+    //
+    // See documentation of RenderablePointCloud for details on the other parts of the
+    // point cloud rendering.
+    struct [[codegen::Dictionary(RenderablePolygonCloud)]] Parameters {
+        // The number of sides for the polygon used to represent each point. Default is
+        // 3, i.e. to use triangles
+        std::optional<int> polygonSides [[codegen::greaterequal(3)]];
+    };
+
+#include "renderablepolygoncloud_codegen.cpp"
+}  // namespace
+
+namespace openspace {
+
+documentation::Documentation RenderablePolygonCloud::Documentation() {
+    return codegen::doc<Parameters>(
+        "base_renderablepolygoncloud",
+        RenderablePointCloud::Documentation()
+    );
+}
+
+RenderablePolygonCloud::RenderablePolygonCloud(const ghoul::Dictionary& dictionary)
+    : RenderablePointCloud(dictionary)
+{
+    const Parameters p = codegen::bake<Parameters>(dictionary);
+
+    _nPolygonSides = p.polygonSides.value_or(_nPolygonSides);
+
+    // The texture to use for the rendering will be generated in initializeGl. Make sure
+    // we use it in the rnedering
+    _hasSpriteTexture = true;
+}
+
+void RenderablePolygonCloud::initializeGL() {
+    ZoneScoped;
+
+    RenderablePointCloud::initializeGL();
+    createPolygonTexture();
+}
+
+void RenderablePolygonCloud::deinitializeGL() {
+    glDeleteBuffers(1, &_polygonVbo);
+    _polygonVbo = 0;
+    glDeleteVertexArrays(1, &_polygonVao);
+    _polygonVao = 0;
+
+    glDeleteTextures(1, &_pTexture);
+
+    RenderablePointCloud::deinitializeGL();
+}
+
+void RenderablePolygonCloud::bindTextureForRendering() const {
+    glBindTexture(GL_TEXTURE_2D, _pTexture);
+}
+
+void RenderablePolygonCloud::createPolygonTexture() {
+    ZoneScoped;
+
+    LDEBUG("Creating Polygon Texture");
+    constexpr gl::GLsizei TexSize = 512;
+
+    glGenTextures(1, &_pTexture);
+    glBindTexture(GL_TEXTURE_2D, _pTexture);
+    glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR);
+    glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR);
+    glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE);
+    glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE);
+    // Stopped using a buffer object for GL_PIXEL_UNPACK_BUFFER
+    glBindBuffer(GL_PIXEL_UNPACK_BUFFER, 0);
+    glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA8, TexSize, TexSize, 0, GL_RGBA, GL_BYTE, nullptr);
+
+    renderToTexture(_pTexture, TexSize, TexSize);
+}
+
+void RenderablePolygonCloud::renderToTexture(GLuint textureToRenderTo,
+                                             GLuint textureWidth, GLuint textureHeight)
+{
+    LDEBUG("Rendering to Texture");
+
+    // Saves initial Application's OpenGL State
+    GLint defaultFBO;
+    GLint viewport[4];
+    glGetIntegerv(GL_FRAMEBUFFER_BINDING, &defaultFBO);
+    glGetIntegerv(GL_VIEWPORT, viewport);
+
+    GLuint textureFBO;
+    glGenFramebuffers(1, &textureFBO);
+    glBindFramebuffer(GL_FRAMEBUFFER, textureFBO);
+    GLenum drawBuffers[1] = { GL_COLOR_ATTACHMENT0 };
+    glDrawBuffers(1, drawBuffers);
+
+    glFramebufferTexture(GL_FRAMEBUFFER, GL_COLOR_ATTACHMENT0, textureToRenderTo, 0);
+
+    glViewport(viewport[0], viewport[1], textureWidth, textureHeight);
+
+    if (_polygonVao == 0) {
+        glGenVertexArrays(1, &_polygonVao);
+    }
+    if (_polygonVbo == 0) {
+        glGenBuffers(1, &_polygonVbo);
+    }
+
+    glBindVertexArray(_polygonVao);
+    glBindBuffer(GL_ARRAY_BUFFER, _polygonVbo);
+
+    constexpr std::array<GLfloat, 4> VertexData = {
+        // x  y  z  w
+        0.f, 0.f, 0.f, 1.f,
+    };
+
+    glBufferData(GL_ARRAY_BUFFER, sizeof(VertexData), VertexData.data(), GL_STATIC_DRAW);
+    glVertexAttribPointer(0, 4, GL_FLOAT, GL_FALSE, 4 * sizeof(GLfloat), nullptr);
+    glEnableVertexAttribArray(0);
+    glBindVertexArray(0);
+
+    renderPolygonGeometry(_polygonVao);
+
+    // Restores Applications' OpenGL State
+    glBindFramebuffer(GL_FRAMEBUFFER, defaultFBO);
+    glViewport(viewport[0], viewport[1], viewport[2], viewport[3]);
+
+    glDeleteBuffers(1, &_polygonVbo);
+    glDeleteVertexArrays(1, &_polygonVao);
+    glDeleteFramebuffers(1, &textureFBO);
+}
+
+void RenderablePolygonCloud::renderPolygonGeometry(GLuint vao) {
+    std::unique_ptr<ghoul::opengl::ProgramObject> program =
+        ghoul::opengl::ProgramObject::Build(
+            "RenderablePointCloud_Polygon",
+            absPath("${MODULE_BASE}/shaders/polygon_vs.glsl"),
+            absPath("${MODULE_BASE}/shaders/polygon_fs.glsl"),
+            absPath("${MODULE_BASE}/shaders/polygon_gs.glsl")
+        );
+
+    program->activate();
+    constexpr glm::vec4 Black = glm::vec4(0.f, 0.f, 0.f, 0.f);
+    glClearBufferfv(GL_COLOR, 0, glm::value_ptr(Black));
+
+    program->setUniform("sides", _nPolygonSides);
+    program->setUniform("polygonColor", _colorSettings.pointColor);
+
+    glBindVertexArray(vao);
+    glDrawArrays(GL_POINTS, 0, 1);
+    glBindVertexArray(0);
+
+    program->deactivate();
+}
+
+} // namespace openspace
diff --git a/modules/base/rendering/pointcloud/renderablepolygoncloud.h b/modules/base/rendering/pointcloud/renderablepolygoncloud.h
new file mode 100644
index 0000000000..f873636779
--- /dev/null
+++ b/modules/base/rendering/pointcloud/renderablepolygoncloud.h
@@ -0,0 +1,70 @@
+/*****************************************************************************************
+ *                                                                                       *
+ * OpenSpace                                                                             *
+ *                                                                                       *
+ * Copyright (c) 2014-2023                                                               *
+ *                                                                                       *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
+ * software and associated documentation files (the "Software"), to deal in the Software *
+ * without restriction, including without limitation the rights to use, copy, modify,    *
+ * merge, publish, distribute, sublicense, and/or sell copies of the Software, and to    *
+ * permit persons to whom the Software is furnished to do so, subject to the following   *
+ * conditions:                                                                           *
+ *                                                                                       *
+ * The above copyright notice and this permission notice shall be included in all copies *
+ * or substantial portions of the Software.                                              *
+ *                                                                                       *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED,   *
+ * INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A         *
+ * PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT    *
+ * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF  *
+ * CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE  *
+ * OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                                         *
+ ****************************************************************************************/
+
+#ifndef __OPENSPACE_MODULE_BASE___RENDERABLEPOLYGONCLOUD___H__
+#define __OPENSPACE_MODULE_BASE___RENDERABLEPOLYGONCLOUD___H__
+
+#include <modules/base/rendering/pointcloud/renderablepointcloud.h>
+
+#include <ghoul/opengl/ghoul_gl.h>
+
+namespace ghoul::opengl { class Texture; }
+
+namespace openspace {
+
+namespace documentation { struct Documentation; }
+
+/**
+ * A billboarded point cloud, but with dynamically created uniform polygon shapes instead
+ * of a custom texture. Overwrites the sprite set in parent class, RenderablePointCloud
+ */
+class RenderablePolygonCloud : public RenderablePointCloud {
+public:
+    explicit RenderablePolygonCloud(const ghoul::Dictionary& dictionary);
+    ~RenderablePolygonCloud() override = default;
+
+    void initializeGL() override;
+    void deinitializeGL() override;
+
+    static documentation::Documentation Documentation();
+
+private:
+    void createPolygonTexture();
+    void renderToTexture(GLuint textureToRenderTo, GLuint textureWidth,
+        GLuint textureHeight);
+    void renderPolygonGeometry(GLuint vao);
+
+    void bindTextureForRendering() const override;
+
+    int _nPolygonSides = 3;
+
+    GLuint _pTexture = 0;
+
+    GLuint _polygonVao = 0;
+    GLuint _polygonVbo = 0;
+};
+
+} // namespace openspace
+
+#endif // __OPENSPACE_MODULE_BASE___RENDERABLEPOLYGONCLOUD___H__
diff --git a/modules/digitaluniverse/shaders/billboard_fs.glsl b/modules/base/shaders/billboardpoint_fs.glsl
similarity index 64%
rename from modules/digitaluniverse/shaders/billboard_fs.glsl
rename to modules/base/shaders/billboardpoint_fs.glsl
index f6ce480f6a..b0dfaaeb6b 100644
--- a/modules/digitaluniverse/shaders/billboard_fs.glsl
+++ b/modules/base/shaders/billboardpoint_fs.glsl
@@ -24,45 +24,86 @@
 
 #include "fragment.glsl"
 
-flat in vec4 gs_colorMap;
+flat in float gs_colorParameter;
 flat in float vs_screenSpaceDepth;
 in vec2 texCoord;
-in float ta;
 
-uniform float alphaValue;
+uniform float opacity;
 uniform vec3 color;
+
+uniform vec4 nanColor = vec4(0.5);
+uniform bool useNanColor = true;
+
+uniform vec4 aboveRangeColor;
+uniform bool useAboveRangeColor;
+
+uniform vec4 belowRangeColor;
+uniform bool useBelowRangeColor;
+
+uniform bool hasSpriteTexture;
 uniform sampler2D spriteTexture;
-uniform bool hasColorMap;
+
 uniform bool useColorMap;
+uniform sampler1D colorMapTexture;
+uniform float cmapRangeMin;
+uniform float cmapRangeMax;
+uniform bool hideOutsideRange;
+
 uniform float fadeInValue;
 
+vec4 sampleColorMap(float dataValue) {
+    if (useNanColor && isnan(dataValue)) {
+        return nanColor;
+    }
+
+    bool isOutside = dataValue < cmapRangeMin || dataValue > cmapRangeMax;
+    if (isnan(dataValue) || (hideOutsideRange && isOutside)) {
+        discard;
+    }
+
+    if (useBelowRangeColor && dataValue < cmapRangeMin) {
+        return belowRangeColor;
+    }
+
+    if (useAboveRangeColor && dataValue > cmapRangeMax) {
+        return aboveRangeColor;
+    }
+
+    float t = (dataValue - cmapRangeMin) / (cmapRangeMax - cmapRangeMin);
+    t = clamp(t, 0.0, 1.0);
+    return texture(colorMapTexture, t);
+}
 
 Fragment getFragment() {
-  if (gs_colorMap.a == 0.0 || ta == 0.0 || fadeInValue == 0.0 || alphaValue == 0.0) {
+  if (fadeInValue == 0.0 || opacity == 0.0) {
     discard;
   }
 
-  vec4 textureColor = texture(spriteTexture, texCoord);
-  if (textureColor.a == 0.0) {
-    discard;
+   if (!hasSpriteTexture) {
+    // Moving the origin to the center
+    vec2 st = (texCoord - vec2(0.5)) * 2.0;
+    if (length(st) > 1.0) {
+      discard;
+    }
   }
 
-  vec4 fullColor = textureColor;
+  vec4 fullColor = vec4(1.0);
+  if (hasSpriteTexture) {
+    fullColor = texture(spriteTexture, texCoord);
+  }
 
-  if (hasColorMap && useColorMap) {
-    fullColor *= gs_colorMap;
+  if (useColorMap) {
+    fullColor *= sampleColorMap(gs_colorParameter);
   }
   else {
     fullColor.rgb *= color;
   }
 
-  float textureOpacity = dot(fullColor.rgb, vec3(1.0));
-  if (textureOpacity == 0.0) {
+  fullColor.a *= opacity * fadeInValue;
+  if (fullColor.a < 0.01) {
     discard;
   }
 
-  fullColor.a *= alphaValue * fadeInValue * ta;
-
   Fragment frag;
   frag.color = fullColor;
   frag.depth = vs_screenSpaceDepth;
diff --git a/modules/digitaluniverse/shaders/billboard_gs.glsl b/modules/base/shaders/billboardpoint_gs.glsl
similarity index 73%
rename from modules/digitaluniverse/shaders/billboard_gs.glsl
rename to modules/base/shaders/billboardpoint_gs.glsl
index 0e5cfc658d..19db521a59 100644
--- a/modules/digitaluniverse/shaders/billboard_gs.glsl
+++ b/modules/base/shaders/billboardpoint_gs.glsl
@@ -27,21 +27,21 @@
 #include "PowerScaling/powerScalingMath.hglsl"
 
 layout(points) in;
-flat in vec4 colorMap[];
-flat in float dvarScaling[];
+flat in float colorParameter[];
+flat in float scalingParameter[];
 
 layout(triangle_strip, max_vertices = 4) out;
-flat out vec4 gs_colorMap;
+flat out float gs_colorParameter;
 out vec2 texCoord;
 flat out float vs_screenSpaceDepth;
-out float ta;
 
 // General settings
+uniform float scaleExponent;
 uniform float scaleFactor;
 uniform int renderOption;
 uniform dmat4 cameraViewProjectionMatrix;
 uniform dmat4 modelMatrix;
-uniform bool enabledRectSizeControl;
+uniform bool enablePixelSizeControl;
 uniform bool hasDvarScaling;
 
 // RenderOption: CameraViewDirection
@@ -51,15 +51,10 @@ uniform vec3 right;
 // RenderOption: CameraPositionNormal
 uniform dvec3 cameraPosition;
 uniform vec3 cameraLookUp;
-uniform float correctionSizeFactor;
-uniform float correctionSizeEndDistance;
 
 // Pixel size control: true
 uniform vec2 screenSize;
 uniform float maxBillboardSize;
-uniform float minBillboardSize;
-
-const double PARSEC = 0.308567756e17LF;
 
 const vec2 corners[4] = vec2[4](
   vec2(0.0, 0.0),
@@ -71,30 +66,15 @@ const vec2 corners[4] = vec2[4](
 const int RenderOptionCameraViewDirection = 0;
 const int RenderOptionCameraPositionNormal = 1;
 
-
 void main() {
-  ta = 1.0;
   vec4 pos = gl_in[0].gl_Position;
-  gs_colorMap = colorMap[0];
+  gs_colorParameter = colorParameter[0];
 
-  double unit = PARSEC;
+  dvec4 dpos = modelMatrix * dvec4(dvec3(pos.xyz), 1.0);
 
-  // Must be the same as the enum in RenderableBillboardsCloud.h
-  if (pos.w == 1.0) { unit = 1E3; }
-  else if (pos.w == 2.0) { unit = PARSEC; }
-  else if (pos.w == 3.0) { unit = 1E3 * PARSEC; }
-  else if (pos.w == 4.0) { unit = 1E6 * PARSEC; }
-  else if (pos.w == 5.0) { unit = 1E9 * PARSEC; }
-  else if (pos.w == 6.0) {
-    // Conversion factor from Parsecs to GigalightYears
-    unit = 306391534.73091 * PARSEC;
-  }
-
-  dvec4 dpos = modelMatrix * dvec4(dvec3(pos.xyz) * unit, 1.0);
-
-  float scaleMultiply = exp(scaleFactor * 0.10);
+  float scaleMultiply = pow(10.0, scaleExponent);
   if (hasDvarScaling) {
-    scaleMultiply *= dvarScaling[0];
+    scaleMultiply *= scalingParameter[0];
   }
 
   vec3 scaledRight = vec3(0.0);
@@ -109,18 +89,13 @@ void main() {
     vec3 newRight = normalize(cross(cameraLookUp, normal));
     vec3 newUp = cross(normal, newRight);
 
-    if (!enabledRectSizeControl) {
-      double distCamera = length(cameraPosition - dpos.xyz);
-      float expVar = float(-distCamera) / pow(10.0, correctionSizeEndDistance);
-      float factorVar = pow(10.0, correctionSizeFactor);
-      scaleMultiply *= 1.0 / (1.0 + factorVar * exp(expVar));
-    }
-
     scaledRight = scaleMultiply * newRight * 0.5;
     scaledUp = scaleMultiply * newUp * 0.5;
   }
 
-  if (enabledRectSizeControl) {
+  // @TODO: Come up with some better solution for this scaling, that
+  // also work with non planar projections and multiple viewport resolutions.
+  if (enablePixelSizeControl) {
     vec4 initialPosition = z_normalization(vec4(cameraViewProjectionMatrix *
       dvec4(dpos.xyz - dvec3(scaledRight - scaledUp), dpos.w)));
 
@@ -137,30 +112,21 @@ void main() {
     // width and height
     vec2 sizes = abs(halfViewSize * (topRight - bottomLeft));
 
-    if (enabledRectSizeControl && (length(sizes) > maxBillboardSize)) {
+    if (length(sizes) > maxBillboardSize) {
       float correctionScale = maxBillboardSize / length(sizes);
-
       scaledRight *= correctionScale;
       scaledUp *= correctionScale;
     }
-    else {
-      // linear alpha decay
-      if (sizes.x < 2.0 * minBillboardSize) {
-        float maxVar = 2.0 * minBillboardSize;
-        float minVar = minBillboardSize;
-        float var = sizes.y + sizes.x;
-        ta = (var - minVar) / (maxVar - minVar);
-        if (ta == 0.0) {
-          return;
-        }
-      }
-    }
+
+    // TODO: add checks for wether the generated plane covers too many or too few pixels
   }
 
   // Saving one matrix multiplication:
   vec4 dposClip = vec4(cameraViewProjectionMatrix * dpos);
-  vec4 scaledRightClip = vec4(cameraViewProjectionMatrix * dvec4(scaledRight, 0.0));
-  vec4 scaledUpClip = vec4(cameraViewProjectionMatrix * dvec4(scaledUp, 0.0));
+  vec4 scaledRightClip = scaleFactor *
+    vec4(cameraViewProjectionMatrix * dvec4(scaledRight, 0.0));
+  vec4 scaledUpClip = scaleFactor *
+    vec4(cameraViewProjectionMatrix * dvec4(scaledUp, 0.0));
 
   vec4 initialPosition = z_normalization(dposClip - scaledRightClip - scaledUpClip);
   vs_screenSpaceDepth = initialPosition.w;
diff --git a/modules/digitaluniverse/shaders/billboard_vs.glsl b/modules/base/shaders/billboardpoint_vs.glsl
similarity index 91%
rename from modules/digitaluniverse/shaders/billboard_vs.glsl
rename to modules/base/shaders/billboardpoint_vs.glsl
index b1f0510a4a..35e8082b41 100644
--- a/modules/digitaluniverse/shaders/billboard_vs.glsl
+++ b/modules/base/shaders/billboardpoint_vs.glsl
@@ -27,15 +27,14 @@
 #include "PowerScaling/powerScaling_vs.hglsl"
 
 in vec4 in_position;
-in vec4 in_colormap;
-in float in_dvarScaling;
-
-flat out vec4 colorMap;
-flat out float dvarScaling;
+in float in_colorParameter;
+in float in_scalingParameter;
 
+flat out float colorParameter;
+flat out float scalingParameter;
 
 void main() {
-  colorMap = in_colormap;
-  dvarScaling = in_dvarScaling;
+  colorParameter = in_colorParameter;
+  scalingParameter = in_scalingParameter;
   gl_Position = in_position;
 }
diff --git a/modules/digitaluniverse/shaders/billboardpolygon_fs.glsl b/modules/base/shaders/polygon_fs.glsl
similarity index 100%
rename from modules/digitaluniverse/shaders/billboardpolygon_fs.glsl
rename to modules/base/shaders/polygon_fs.glsl
diff --git a/modules/digitaluniverse/shaders/billboardpolygon_gs.glsl b/modules/base/shaders/polygon_gs.glsl
similarity index 100%
rename from modules/digitaluniverse/shaders/billboardpolygon_gs.glsl
rename to modules/base/shaders/polygon_gs.glsl
diff --git a/modules/digitaluniverse/shaders/billboardpolygon_vs.glsl b/modules/base/shaders/polygon_vs.glsl
similarity index 100%
rename from modules/digitaluniverse/shaders/billboardpolygon_vs.glsl
rename to modules/base/shaders/polygon_vs.glsl
diff --git a/modules/digitaluniverse/CMakeLists.txt b/modules/digitaluniverse/CMakeLists.txt
index 252b33d460..df3b0b2eeb 100644
--- a/modules/digitaluniverse/CMakeLists.txt
+++ b/modules/digitaluniverse/CMakeLists.txt
@@ -25,34 +25,22 @@
 include(${PROJECT_SOURCE_DIR}/support/cmake/module_definition.cmake)
 
 set(HEADER_FILES
-  rendering/renderablepoints.h
   rendering/renderabledumeshes.h
-  rendering/renderablebillboardscloud.h
   rendering/renderableplanescloud.h
 )
 source_group("Header Files" FILES ${HEADER_FILES})
 
 set(SOURCE_FILES
-  rendering/renderablepoints.cpp
   rendering/renderabledumeshes.cpp
-  rendering/renderablebillboardscloud.cpp
   rendering/renderableplanescloud.cpp
 )
 source_group("Source Files" FILES ${SOURCE_FILES})
 
 set(SHADER_FILES
-  shaders/billboard_fs.glsl
-  shaders/billboard_gs.glsl
-  shaders/billboard_vs.glsl
-  shaders/billboardpolygon_fs.glsl
-  shaders/billboardpolygon_gs.glsl
-  shaders/billboardpolygon_vs.glsl
   shaders/dumesh_vs.glsl
   shaders/dumesh_fs.glsl
   shaders/plane_vs.glsl
   shaders/plane_fs.glsl
-  shaders/points_sprite_fs.glsl
-  shaders/points_vs.glsl
 )
 source_group("Shader Files" FILES ${SHADER_FILES})
 
diff --git a/modules/digitaluniverse/digitaluniversemodule.cpp b/modules/digitaluniverse/digitaluniversemodule.cpp
index b77708080b..92cb71ac1e 100644
--- a/modules/digitaluniverse/digitaluniversemodule.cpp
+++ b/modules/digitaluniverse/digitaluniversemodule.cpp
@@ -24,10 +24,8 @@
 
 #include <modules/digitaluniverse/digitaluniversemodule.h>
 
-#include <modules/digitaluniverse/rendering/renderablebillboardscloud.h>
 #include <modules/digitaluniverse/rendering/renderabledumeshes.h>
 #include <modules/digitaluniverse/rendering/renderableplanescloud.h>
-#include <modules/digitaluniverse/rendering/renderablepoints.h>
 #include <openspace/documentation/documentation.h>
 #include <openspace/rendering/renderable.h>
 #include <openspace/util/factorymanager.h>
@@ -48,8 +46,6 @@ void DigitalUniverseModule::internalInitialize(const ghoul::Dictionary&) {
         FactoryManager::ref().factory<Renderable>();
     ghoul_assert(fRenderable, "Renderable factory was not created");
 
-    fRenderable->registerClass<RenderablePoints>("RenderablePoints");
-    fRenderable->registerClass<RenderableBillboardsCloud>("RenderableBillboardsCloud");
     fRenderable->registerClass<RenderablePlanesCloud>("RenderablePlanesCloud");
     fRenderable->registerClass<RenderableDUMeshes>("RenderableDUMeshes");
 }
@@ -61,8 +57,6 @@ void DigitalUniverseModule::internalDeinitializeGL() {
 
 std::vector<documentation::Documentation> DigitalUniverseModule::documentations() const {
     return {
-        RenderablePoints::Documentation(),
-        RenderableBillboardsCloud::Documentation(),
         RenderablePlanesCloud::Documentation(),
         RenderableDUMeshes::Documentation()
     };
diff --git a/modules/digitaluniverse/rendering/renderablebillboardscloud.cpp b/modules/digitaluniverse/rendering/renderablebillboardscloud.cpp
deleted file mode 100644
index 3f04668c98..0000000000
--- a/modules/digitaluniverse/rendering/renderablebillboardscloud.cpp
+++ /dev/null
@@ -1,1142 +0,0 @@
-/*****************************************************************************************
- *                                                                                       *
- * OpenSpace                                                                             *
- *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
- *                                                                                       *
- * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
- * software and associated documentation files (the "Software"), to deal in the Software *
- * without restriction, including without limitation the rights to use, copy, modify,    *
- * merge, publish, distribute, sublicense, and/or sell copies of the Software, and to    *
- * permit persons to whom the Software is furnished to do so, subject to the following   *
- * conditions:                                                                           *
- *                                                                                       *
- * The above copyright notice and this permission notice shall be included in all copies *
- * or substantial portions of the Software.                                              *
- *                                                                                       *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED,   *
- * INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A         *
- * PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT    *
- * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF  *
- * CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE  *
- * OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                                         *
- ****************************************************************************************/
-
-#include <modules/digitaluniverse/rendering/renderablebillboardscloud.h>
-
-#include <modules/digitaluniverse/digitaluniversemodule.h>
-#include <openspace/documentation/documentation.h>
-#include <openspace/documentation/verifier.h>
-#include <openspace/engine/globals.h>
-#include <openspace/engine/windowdelegate.h>
-#include <openspace/util/updatestructures.h>
-#include <openspace/rendering/renderengine.h>
-#include <ghoul/filesystem/filesystem.h>
-#include <ghoul/glm.h>
-#include <ghoul/io/texture/texturereader.h>
-#include <ghoul/logging/logmanager.h>
-#include <ghoul/misc/crc32.h>
-#include <ghoul/misc/templatefactory.h>
-#include <ghoul/misc/profiling.h>
-#include <ghoul/opengl/openglstatecache.h>
-#include <ghoul/opengl/programobject.h>
-#include <ghoul/opengl/texture.h>
-#include <ghoul/opengl/textureunit.h>
-#include <glm/gtx/string_cast.hpp>
-#include <array>
-#include <cstdint>
-#include <filesystem>
-#include <fstream>
-#include <locale>
-#include <optional>
-#include <string>
-
-namespace {
-    constexpr std::string_view _loggerCat = "RenderableBillboardsCloud";
-
-    constexpr std::array<const char*, 21> UniformNames = {
-        "cameraViewProjectionMatrix", "modelMatrix", "cameraPosition", "cameraLookUp",
-        "renderOption", "minBillboardSize", "maxBillboardSize",
-        "correctionSizeEndDistance", "correctionSizeFactor", "color", "alphaValue",
-        "scaleFactor", "up", "right", "fadeInValue", "screenSize", "spriteTexture",
-        "hasColorMap", "useColorMap", "enabledRectSizeControl", "hasDvarScaling"
-    };
-
-    enum RenderOption {
-        ViewDirection = 0,
-        PositionNormal
-    };
-
-    constexpr openspace::properties::Property::PropertyInfo SpriteTextureInfo = {
-        "Texture",
-        "Point Sprite Texture",
-        "The path to the texture that should be used as the point sprite",
-        openspace::properties::Property::Visibility::AdvancedUser
-    };
-
-    constexpr openspace::properties::Property::PropertyInfo ScaleFactorInfo = {
-        "ScaleFactor",
-        "Scale Factor",
-        "This value is used as a multiplicative factor that is applied to the apparent "
-        "size of each point",
-        // @VISIBILITY(2.5)
-        openspace::properties::Property::Visibility::User
-    };
-
-    constexpr openspace::properties::Property::PropertyInfo UseColorMapInfo = {
-        "UseColorMap",
-        "Use Color Map",
-        "If this value is set to 'true', the provided color map is used (if one was "
-        "provided in the configuration). If no color map was provided, changing this "
-        "setting does not do anything",
-        // @VISIBILITY(2.75)
-        openspace::properties::Property::Visibility::User
-    };
-
-    constexpr openspace::properties::Property::PropertyInfo ColorInfo = {
-        "Color",
-        "Color",
-        "This value is used to define the color of the astronomical object",
-        // @VISIBILITY(1.5)
-        openspace::properties::Property::Visibility::NoviceUser
-    };
-
-    constexpr openspace::properties::Property::PropertyInfo ColorMapInfo = {
-        "ColorMap",
-        "Color Map File",
-        "The path to the color map file of the astronomical object",
-        openspace::properties::Property::Visibility::AdvancedUser
-    };
-
-    constexpr openspace::properties::Property::PropertyInfo DrawElementsInfo = {
-        "DrawElements",
-        "Draw Elements",
-        "Enables/Disables the drawing of the astronomical objects",
-        // @VISIBILITY(1.25)
-        openspace::properties::Property::Visibility::NoviceUser
-    };
-
-    static const openspace::properties::PropertyOwner::PropertyOwnerInfo LabelsInfo = {
-        "Labels",
-        "Labels",
-        "The labels for the astronomical objects"
-    };
-
-    constexpr openspace::properties::Property::PropertyInfo ColorOptionInfo = {
-        "ColorOption",
-        "Color Option",
-        "This value determines which paramenter is used for default color of the "
-        "astronomical objects",
-        openspace::properties::Property::Visibility::AdvancedUser
-    };
-
-    constexpr openspace::properties::Property::PropertyInfo OptionColorRangeInfo = {
-        "OptionColorRange",
-        "Option Color Range",
-        "This value changes the range of values to be mapped with the current color map",
-        openspace::properties::Property::Visibility::AdvancedUser
-    };
-
-    constexpr openspace::properties::Property::PropertyInfo SizeOptionInfo = {
-        "SizeOption",
-        "Size Option Variable",
-        "This value determines which paramenter (datavar) is used for scaling of the "
-        "astronomical objects",
-        openspace::properties::Property::Visibility::AdvancedUser
-    };
-
-    constexpr openspace::properties::Property::PropertyInfo RenderOptionInfo = {
-        "RenderOption",
-        "Render Option",
-        "Option wether the billboards should face the camera or not. Used for non-linear "
-        "display environments such as fisheye.",
-        openspace::properties::Property::Visibility::AdvancedUser
-    };
-
-    constexpr openspace::properties::Property::PropertyInfo FadeInDistancesInfo = {
-        "FadeInDistances",
-        "Fade-In Start and End Distances",
-        "These values determine the initial and final distances from the center of "
-        "our galaxy from which the astronomical object will start and end "
-        "fading-in",
-        // @VISIBILITY(3.25)
-        openspace::properties::Property::Visibility::AdvancedUser
-    };
-
-    constexpr openspace::properties::Property::PropertyInfo DisableFadeInInfo = {
-        "DisableFadeIn",
-        "Disable Fade-in Effect",
-        "Enables/Disables the Fade-in effect",
-        openspace::properties::Property::Visibility::User
-    };
-
-    constexpr openspace::properties::Property::PropertyInfo PixelSizeControlInfo = {
-        "EnablePixelSizeControl",
-        "Enable Pixel Size Control",
-        "Enable pixel size control for rectangular projections. If set to true, the "
-        "billboard size is restricted by the min/max size in pixels property",
-        openspace::properties::Property::Visibility::AdvancedUser
-    };
-
-    constexpr openspace::properties::Property::PropertyInfo BillboardMinMaxSizeInfo = {
-        "BillboardMinMaxSize",
-        "Billboard Min/Max Size in Pixels",
-        "The minimum and maximum size (in pixels) for the billboard representing the "
-        "astronomical object",
-        openspace::properties::Property::Visibility::AdvancedUser
-    };
-
-    constexpr openspace::properties::Property::PropertyInfo
-        CorrectionSizeEndDistanceInfo =
-    {
-        "CorrectionSizeEndDistance",
-        "Distance in 10^X meters where correction size stops acting",
-        "Distance in 10^X meters where correction size stops acting",
-        openspace::properties::Property::Visibility::AdvancedUser
-    };
-
-    constexpr openspace::properties::Property::PropertyInfo CorrectionSizeFactorInfo = {
-        "CorrectionSizeFactor",
-        "Control variable for distance size",
-        "",
-        openspace::properties::Property::Visibility::AdvancedUser
-    };
-
-    constexpr openspace::properties::Property::PropertyInfo UseLinearFiltering = {
-        "UseLinearFiltering",
-        "Use Linear Filtering",
-        "Determines whether the provided color map should be sampled nearest neighbor "
-        "(=off) or linearly (=on)",
-        // @VISIBILITY(3.25)
-        openspace::properties::Property::Visibility::AdvancedUser
-    };
-
-    constexpr openspace::properties::Property::PropertyInfo SetRangeFromData = {
-        "SetRangeFromData",
-        "Set Data Range from Data",
-        "Set the data range based on the available data",
-        openspace::properties::Property::Visibility::AdvancedUser
-    };
-
-    struct [[codegen::Dictionary(RenderableBillboardsCloud)]] Parameters {
-        // The path to the SPECK file that contains information about the astronomical
-        // object being rendered
-        std::optional<std::string> file;
-
-        // [[codegen::verbatim(ColorInfo.description)]]
-        glm::vec3 color [[codegen::color()]];
-
-        // [[codegen::verbatim(SpriteTextureInfo.description)]]
-        std::optional<std::string> texture;
-
-        // [[codegen::verbatim(DrawElementsInfo.description)]]
-        std::optional<bool> drawElements;
-
-        enum class [[codegen::map(RenderOption)]] RenderOption {
-            ViewDirection [[codegen::key("Camera View Direction")]],
-            PositionNormal [[codegen::key("Camera Position Normal")]]
-        };
-        // [[codegen::verbatim(RenderOptionInfo.description)]]
-        std::optional<RenderOption> renderOption;
-
-        enum class [[codegen::map(openspace::DistanceUnit)]] Unit {
-            Meter [[codegen::key("m")]],
-            Kilometer [[codegen::key("Km")]],
-            Parsec [[codegen::key("pc")]],
-            Kiloparsec [[codegen::key("Kpc")]],
-            Megaparsec [[codegen::key("Mpc")]],
-            Gigaparsec [[codegen::key("Gpc")]],
-            Gigalightyear [[codegen::key("Gly")]]
-        };
-        // The unit used for all distances. Must match the unit of any
-        // distances/positions in the data files
-        std::optional<Unit> unit;
-
-        // [[codegen::verbatim(ScaleFactorInfo.description)]]
-        std::optional<float> scaleFactor;
-
-        // [[codegen::verbatim(UseColorMapInfo.description)]]
-        std::optional<bool> useColorMap;
-
-        // [[codegen::verbatim(ColorMapInfo.description)]]
-        std::optional<std::string> colorMap;
-
-        // Set a 1 to 1 relationship between the color index variable and the colormap
-        // entrered value
-        std::optional<bool> exactColorMap;
-
-        // The number of sides for the polygon used to represent the astronomical object
-        std::optional<int> polygonSides;
-
-        // [[codegen::verbatim(LabelsInfo.description)]]
-        std::optional<ghoul::Dictionary> labels
-            [[codegen::reference("space_labelscomponent")]];
-
-        // [[codegen::verbatim(ColorOptionInfo.description)]]
-        std::optional<std::vector<std::string>> colorOption;
-
-        // [[codegen::verbatim(SizeOptionInfo.description)]]
-        std::optional<std::vector<std::string>> sizeOption;
-
-        // This value determines the colormap ranges for the color parameters of the
-        // astronomical objects
-        std::optional<std::vector<glm::vec2>> colorRange;
-
-        // Transformation matrix to be applied to each astronomical object
-        std::optional<glm::dmat4x4> transformationMatrix;
-
-        // [[codegen::verbatim(FadeInDistancesInfo.description)]]
-        std::optional<glm::dvec2> fadeInDistances;
-
-        // [[codegen::verbatim(DisableFadeInInfo.description)]]
-        std::optional<bool> disableFadeIn;
-
-        // [[codegen::verbatim(BillboardMinMaxSizeInfo.description)]]
-        std::optional<glm::vec2> billboardMinMaxSize;
-
-        // [[codegen::verbatim(CorrectionSizeEndDistanceInfo.description)]]
-        std::optional<float> correctionSizeEndDistance;
-
-        // [[codegen::verbatim(CorrectionSizeFactorInfo.description)]]
-        std::optional<float> correctionSizeFactor;
-
-        // [[codegen::verbatim(PixelSizeControlInfo.description)]]
-        std::optional<bool> enablePixelSizeControl;
-
-        // [[codegen::verbatim(UseLinearFiltering.description)]]
-        std::optional<bool> useLinearFiltering;
-    };
-#include "renderablebillboardscloud_codegen.cpp"
-}  // namespace
-
-namespace openspace {
-
-documentation::Documentation RenderableBillboardsCloud::Documentation() {
-    return codegen::doc<Parameters>("digitaluniverse_RenderableBillboardsCloud");
-}
-
-RenderableBillboardsCloud::RenderableBillboardsCloud(const ghoul::Dictionary& dictionary)
-    : Renderable(dictionary)
-    , _scaleFactor(ScaleFactorInfo, 1.f, 0.f, 600.f)
-    , _useColorMap(UseColorMapInfo, true)
-    , _pointColor(ColorInfo, glm::vec3(1.f), glm::vec3(0.f), glm::vec3(1.f))
-    , _spriteTexturePath(SpriteTextureInfo)
-    , _drawElements(DrawElementsInfo, true)
-    , _pixelSizeControl(PixelSizeControlInfo, false)
-    , _colorOption(ColorOptionInfo, properties::OptionProperty::DisplayType::Dropdown)
-    , _optionColorRangeData(OptionColorRangeInfo, glm::vec2(0.f))
-    , _datavarSizeOption(
-        SizeOptionInfo,
-        properties::OptionProperty::DisplayType::Dropdown
-    )
-    , _fadeInDistances(
-        FadeInDistancesInfo,
-        glm::vec2(0.f),
-        glm::vec2(0.f),
-        glm::vec2(100.f)
-    )
-    , _disableFadeInDistance(DisableFadeInInfo, true)
-    , _billboardMinMaxSize(
-        BillboardMinMaxSizeInfo,
-        glm::vec2(0.f, 400.f),
-        glm::vec2(0.f),
-        glm::vec2(1000.f)
-    )
-    , _correctionSizeEndDistance(CorrectionSizeEndDistanceInfo, 17.f, 12.f, 25.f)
-    , _correctionSizeFactor(CorrectionSizeFactorInfo, 8.f, 0.f, 20.f)
-    , _useLinearFiltering(UseLinearFiltering, false)
-    , _setRangeFromData(SetRangeFromData)
-    , _renderOption(RenderOptionInfo, properties::OptionProperty::DisplayType::Dropdown)
-{
-    const Parameters p = codegen::bake<Parameters>(dictionary);
-
-    if (p.file.has_value()) {
-        _speckFile = absPath(*p.file).string();
-    }
-    _hasSpeckFile = p.file.has_value();
-
-    _useColorMap = p.useColorMap.value_or(_useColorMap);
-
-    _drawElements = p.drawElements.value_or(_drawElements);
-    _drawElements.onChange([this]() { _hasSpeckFile = !_hasSpeckFile; });
-    addProperty(_drawElements);
-
-    _renderOption.addOption(RenderOption::ViewDirection, "Camera View Direction");
-    _renderOption.addOption(RenderOption::PositionNormal, "Camera Position Normal");
-
-    if (p.renderOption.has_value()) {
-        _renderOption = codegen::map<RenderOption>(*p.renderOption);
-    }
-    else {
-        _renderOption = RenderOption::ViewDirection;
-    }
-    addProperty(_renderOption);
-
-    if (p.unit.has_value()) {
-        _unit = codegen::map<DistanceUnit>(*p.unit);
-    }
-    else {
-        _unit = DistanceUnit::Meter;
-    }
-
-    if (p.texture.has_value()) {
-        _spriteTexturePath = absPath(*p.texture).string();
-        _spriteTexturePath.onChange([this]() { _spriteTextureIsDirty = true; });
-
-        // @TODO (abock, 2021-01-31) I don't know why we only add this property if the
-        // texture is given, but I think it's a bug
-        // @TODO (emmbr, 2021-05-24) This goes for several properties in this renderable
-        addProperty(_spriteTexturePath);
-    }
-    _hasSpriteTexture = p.texture.has_value();
-
-    if (p.colorMap.has_value()) {
-        _colorMapFile = absPath(*p.colorMap).string();
-        _hasColorMapFile = true;
-
-        if (p.colorOption.has_value()) {
-            std::vector<std::string> opts = *p.colorOption;
-            for (size_t i = 0; i < opts.size(); ++i) {
-                _colorOption.addOption(static_cast<int>(i), opts[i]);
-                _optionConversionMap.insert({ static_cast<int>(i), opts[i] });
-                _colorOptionString = opts[i];
-            }
-        }
-        _colorOption.onChange([this]() {
-            _dataIsDirty = true;
-            const glm::vec2 colorRange = _colorRangeData[_colorOption.value()];
-            _optionColorRangeData = colorRange;
-            _colorOptionString = _optionConversionMap[_colorOption.value()];
-        });
-        addProperty(_colorOption);
-
-        _colorRangeData = p.colorRange.value_or(_colorRangeData);
-        if (!_colorRangeData.empty()) {
-            _optionColorRangeData = _colorRangeData[_colorRangeData.size() - 1];
-        }
-        _optionColorRangeData.onChange([this]() {
-            const glm::vec2 colorRange = _optionColorRangeData;
-            _colorRangeData[_colorOption.value()] = colorRange;
-            _dataIsDirty = true;
-        });
-        addProperty(_optionColorRangeData);
-
-        _isColorMapExact = p.exactColorMap.value_or(_isColorMapExact);
-    }
-
-    _pointColor = p.color;
-    _pointColor.setViewOption(properties::Property::ViewOptions::Color);
-    addProperty(_pointColor);
-
-    addProperty(Fadeable::_opacity);
-
-    _scaleFactor = p.scaleFactor.value_or(_scaleFactor);
-    addProperty(_scaleFactor);
-
-    if (p.sizeOption.has_value()) {
-        std::vector<std::string> opts = *p.sizeOption;
-        for (size_t i = 0; i < opts.size(); ++i) {
-            _datavarSizeOption.addOption(static_cast<int>(i), opts[i]);
-            _optionConversionSizeMap.insert({ static_cast<int>(i), opts[i] });
-            _datavarSizeOptionString = opts[i];
-        }
-
-        _datavarSizeOption.onChange([this]() {
-            _dataIsDirty = true;
-            _datavarSizeOptionString = _optionConversionSizeMap[_datavarSizeOption];
-        });
-        addProperty(_datavarSizeOption);
-
-        _hasDatavarSize = true;
-    }
-
-    _polygonSides = p.polygonSides.value_or(_polygonSides);
-    _hasPolygon = p.polygonSides.has_value();
-
-    if (p.labels.has_value()) {
-        _labels = std::make_unique<LabelsComponent>(*p.labels);
-        _hasLabels = true;
-        addPropertySubOwner(_labels.get());
-        // Fading of the labels should also depend on the fading of the renderable
-        _labels->setParentFadeable(this);
-    }
-
-    _transformationMatrix = p.transformationMatrix.value_or(_transformationMatrix);
-
-    if (p.fadeInDistances.has_value()) {
-        _fadeInDistances = *p.fadeInDistances;
-        _fadeInDistances.setViewOption(properties::Property::ViewOptions::MinMaxRange);
-        addProperty(_fadeInDistances);
-
-        _disableFadeInDistance = false;
-        addProperty(_disableFadeInDistance);
-    }
-
-    _pixelSizeControl = p.enablePixelSizeControl.value_or(_pixelSizeControl);
-    addProperty(_pixelSizeControl);
-
-    _billboardMinMaxSize = p.billboardMinMaxSize.value_or(_billboardMinMaxSize);
-    _billboardMinMaxSize.setViewOption(properties::Property::ViewOptions::MinMaxRange);
-    addProperty(_billboardMinMaxSize);
-
-    _correctionSizeEndDistance =
-        p.correctionSizeEndDistance.value_or(_correctionSizeEndDistance);
-    addProperty(_correctionSizeEndDistance);
-
-    _correctionSizeFactor = p.correctionSizeFactor.value_or(_correctionSizeFactor);
-    if (p.correctionSizeFactor.has_value()) {
-        addProperty(_correctionSizeFactor);
-    }
-
-    _setRangeFromData.onChange([this]() {
-        const int colorMapInUse =
-            _hasColorMapFile ? _dataset.index(_colorOptionString) : 0;
-
-        float minValue = std::numeric_limits<float>::max();
-        float maxValue = -std::numeric_limits<float>::max();
-        for (const speck::Dataset::Entry& e : _dataset.entries) {
-            float color = e.data[colorMapInUse];
-            minValue = std::min(minValue, color);
-            maxValue = std::max(maxValue, color);
-        }
-
-        _optionColorRangeData = glm::vec2(minValue, maxValue);
-    });
-    addProperty(_setRangeFromData);
-
-    _useColorMap.onChange([this]() { _dataIsDirty = true; });
-    addProperty(_useColorMap);
-
-    _useLinearFiltering = p.useLinearFiltering.value_or(_useLinearFiltering);
-    _useLinearFiltering.onChange([this]() { _dataIsDirty = true; });
-    addProperty(_useLinearFiltering);
-}
-
-bool RenderableBillboardsCloud::isReady() const {
-    bool isReady = _program && !_dataset.entries.empty();
-
-    // If we have labels, they also need to be loaded
-    if (_hasLabels) {
-        isReady = isReady || _labels->isReady();
-    }
-    return isReady;
-}
-
-void RenderableBillboardsCloud::initialize() {
-    ZoneScoped;
-
-    if (_hasSpeckFile) {
-        _dataset = speck::data::loadFileWithCache(_speckFile);
-    }
-
-    if (_hasColorMapFile) {
-        _colorMap = speck::color::loadFileWithCache(_colorMapFile);
-    }
-
-    if (_hasLabels) {
-        _labels->initialize();
-        _labels->loadLabels();
-    }
-
-    if (!_colorOptionString.empty() && (_colorRangeData.size() > 1)) {
-        // Following DU behavior here. The last colormap variable
-        // entry is the one selected by default.
-        _colorOption.setValue(static_cast<int>(_colorRangeData.size() - 1));
-    }
-
-    setRenderBin(Renderable::RenderBin::PreDeferredTransparent);
-}
-
-void RenderableBillboardsCloud::initializeGL() {
-    ZoneScoped;
-
-    _program = DigitalUniverseModule::ProgramObjectManager.request(
-        "RenderableBillboardsCloud",
-        []() {
-            return global::renderEngine->buildRenderProgram(
-                "RenderableBillboardsCloud",
-                absPath("${MODULE_DIGITALUNIVERSE}/shaders/billboard_vs.glsl"),
-                absPath("${MODULE_DIGITALUNIVERSE}/shaders/billboard_fs.glsl"),
-                absPath("${MODULE_DIGITALUNIVERSE}/shaders/billboard_gs.glsl")
-            );
-        }
-    );
-
-    _renderToPolygonProgram = DigitalUniverseModule::ProgramObjectManager.request(
-        "RenderableBillboardsCloud_Polygon",
-        []() {
-            return ghoul::opengl::ProgramObject::Build(
-                "RenderableBillboardsCloud_Polygon",
-                absPath("${MODULE_DIGITALUNIVERSE}/shaders/billboardpolygon_vs.glsl"),
-                absPath("${MODULE_DIGITALUNIVERSE}/shaders/billboardpolygon_fs.glsl"),
-                absPath("${MODULE_DIGITALUNIVERSE}/shaders/billboardpolygon_gs.glsl")
-            );
-        }
-    );
-
-    ghoul::opengl::updateUniformLocations(*_program, _uniformCache, UniformNames);
-
-    if (_hasPolygon) {
-        createPolygonTexture();
-    }
-}
-
-void RenderableBillboardsCloud::deinitializeGL() {
-    glDeleteBuffers(1, &_vbo);
-    _vbo = 0;
-    glDeleteVertexArrays(1, &_vao);
-    _vao = 0;
-
-    DigitalUniverseModule::ProgramObjectManager.release(
-        "RenderableBillboardsCloud",
-        [](ghoul::opengl::ProgramObject* p) {
-            global::renderEngine->removeRenderProgram(p);
-        }
-    );
-    _program = nullptr;
-
-    DigitalUniverseModule::ProgramObjectManager.release(
-        "RenderableBillboardsCloud_Polygon"
-    );
-    _renderToPolygonProgram = nullptr;
-
-    DigitalUniverseModule::TextureManager.release(_spriteTexture);
-    _spriteTexture = nullptr;
-
-    if (_hasPolygon) {
-        _polygonTexture = nullptr;
-        glDeleteTextures(1, &_pTexture);
-    }
-}
-
-void RenderableBillboardsCloud::renderBillboards(const RenderData& data,
-                                                 const glm::dmat4& modelMatrix,
-                                                 const glm::dvec3& orthoRight,
-                                                 const glm::dvec3& orthoUp,
-                                                 float fadeInVariable)
-{
-    glDepthMask(false);
-
-    glEnablei(GL_BLEND, 0);
-    glBlendFunc(GL_SRC_ALPHA, GL_ONE);
-
-    _program->activate();
-
-    _program->setUniform(
-        "screenSize",
-        glm::vec2(global::renderEngine->renderingResolution())
-    );
-
-    _program->setUniform(_uniformCache.cameraPos, data.camera.positionVec3());
-    _program->setUniform(
-        _uniformCache.cameraLookup,
-        glm::vec3(data.camera.lookUpVectorWorldSpace())
-    );
-    _program->setUniform(_uniformCache.renderOption, _renderOption.value());
-    _program->setUniform(_uniformCache.modelMatrix, modelMatrix);
-    _program->setUniform(
-        _uniformCache.cameraViewProjectionMatrix,
-        glm::dmat4(data.camera.projectionMatrix()) * data.camera.combinedViewMatrix()
-    );
-
-    const float minBillboardSize = _billboardMinMaxSize.value().x; // in pixels
-    const float maxBillboardSize = _billboardMinMaxSize.value().y; // in pixels
-    _program->setUniform(_uniformCache.minBillboardSize, minBillboardSize);
-    _program->setUniform(_uniformCache.maxBillboardSize, maxBillboardSize);
-    _program->setUniform(_uniformCache.color, _pointColor);
-    _program->setUniform(_uniformCache.alphaValue, opacity());
-    _program->setUniform(_uniformCache.scaleFactor, _scaleFactor);
-    _program->setUniform(_uniformCache.up, glm::vec3(orthoUp));
-    _program->setUniform(_uniformCache.right, glm::vec3(orthoRight));
-    _program->setUniform(_uniformCache.fadeInValue, fadeInVariable);
-
-    _program->setUniform(
-        _uniformCache.correctionSizeEndDistance,
-        _correctionSizeEndDistance
-    );
-    _program->setUniform(_uniformCache.correctionSizeFactor, _correctionSizeFactor);
-
-    _program->setUniform(_uniformCache.enabledRectSizeControl, _pixelSizeControl);
-
-    _program->setUniform(_uniformCache.hasDvarScaling, _hasDatavarSize);
-
-    GLint viewport[4];
-    glGetIntegerv(GL_VIEWPORT, viewport);
-    _program->setUniform(_uniformCache.screenSize, glm::vec2(viewport[2], viewport[3]));
-
-    ghoul::opengl::TextureUnit textureUnit;
-    textureUnit.activate();
-    if (_hasPolygon) {
-        glBindTexture(GL_TEXTURE_2D, _pTexture);
-    }
-    else if (_spriteTexture) {
-        _spriteTexture->bind();
-    }
-    _program->setUniform(_uniformCache.spriteTexture, textureUnit);
-    _program->setUniform(_uniformCache.hasColormap, _hasColorMapFile);
-    _program->setUniform(_uniformCache.useColormap, _useColorMap);
-
-    glBindVertexArray(_vao);
-    glDrawArrays(GL_POINTS, 0, static_cast<GLsizei>(_dataset.entries.size()));
-    glBindVertexArray(0);
-    _program->deactivate();
-
-    global::renderEngine->openglStateCache().resetBlendState();
-    global::renderEngine->openglStateCache().resetDepthState();
-}
-
-void RenderableBillboardsCloud::render(const RenderData& data, RendererTasks&) {
-    float fadeInVar = 1.f;
-    if (!_disableFadeInDistance) {
-        float distCamera = static_cast<float>(glm::length(data.camera.positionVec3()));
-        const glm::vec2 fadeRange = _fadeInDistances;
-        const float a = static_cast<float>(
-            1.f / ((fadeRange.y - fadeRange.x) * toMeter(_unit))
-        );
-        const float b = -(fadeRange.x / (fadeRange.y - fadeRange.x));
-        const float funcValue = a * distCamera + b;
-        fadeInVar *= funcValue > 1.f ? 1.f : funcValue;
-
-        if (funcValue < 0.01f) {
-            return;
-        }
-    }
-
-    glm::dmat4 modelMatrix = calcModelTransform(data);
-    glm::dmat4 modelViewProjectionMatrix =
-        calcModelViewProjectionTransform(data, modelMatrix);
-
-    glm::dvec3 cameraViewDirectionWorld = -data.camera.viewDirectionWorldSpace();
-    glm::dvec3 cameraUpDirectionWorld = data.camera.lookUpVectorWorldSpace();
-    glm::dvec3 orthoRight = glm::normalize(
-        glm::cross(cameraUpDirectionWorld, cameraViewDirectionWorld)
-    );
-    if (orthoRight == glm::dvec3(0.0)) {
-        glm::dvec3 otherVector = glm::vec3(
-            cameraUpDirectionWorld.y,
-            cameraUpDirectionWorld.x,
-            cameraUpDirectionWorld.z
-        );
-        orthoRight = glm::normalize(glm::cross(otherVector, cameraViewDirectionWorld));
-    }
-    glm::dvec3 orthoUp = glm::normalize(glm::cross(cameraViewDirectionWorld, orthoRight));
-
-    if (_hasSpeckFile && _drawElements) {
-        renderBillboards(data, modelMatrix, orthoRight, orthoUp, fadeInVar);
-    }
-
-    if (_hasLabels) {
-        _labels->render(data, modelViewProjectionMatrix, orthoRight, orthoUp, fadeInVar);
-    }
-}
-
-void RenderableBillboardsCloud::update(const UpdateData&) {
-    ZoneScoped;
-
-    if (_dataIsDirty && _hasSpeckFile) {
-        ZoneScopedN("Data dirty");
-        TracyGpuZone("Data dirty");
-        LDEBUG("Regenerating data");
-
-        std::vector<float> slice = createDataSlice();
-
-        int size = static_cast<int>(slice.size());
-
-        if (_vao == 0) {
-            glGenVertexArrays(1, &_vao);
-            LDEBUG(fmt::format("Generating Vertex Array id '{}'", _vao));
-        }
-        if (_vbo == 0) {
-            glGenBuffers(1, &_vbo);
-            LDEBUG(fmt::format("Generating Vertex Buffer Object id '{}'", _vbo));
-        }
-
-        glBindVertexArray(_vao);
-        glBindBuffer(GL_ARRAY_BUFFER, _vbo);
-        glBufferData(GL_ARRAY_BUFFER, size * sizeof(float), slice.data(), GL_STATIC_DRAW);
-        GLint positionAttrib = _program->attributeLocation("in_position");
-
-        if (_hasColorMapFile && _hasDatavarSize) {
-            glEnableVertexAttribArray(positionAttrib);
-            glVertexAttribPointer(
-                positionAttrib,
-                4,
-                GL_FLOAT,
-                GL_FALSE,
-                9 * sizeof(float),
-                nullptr
-            );
-
-            GLint colorMapAttrib = _program->attributeLocation("in_colormap");
-            glEnableVertexAttribArray(colorMapAttrib);
-            glVertexAttribPointer(
-                colorMapAttrib,
-                4,
-                GL_FLOAT,
-                GL_FALSE,
-                9 * sizeof(float),
-                reinterpret_cast<void*>(4 * sizeof(float))
-            );
-
-            GLint dvarScalingAttrib = _program->attributeLocation("in_dvarScaling");
-            glEnableVertexAttribArray(dvarScalingAttrib);
-            glVertexAttribPointer(
-                dvarScalingAttrib,
-                1,
-                GL_FLOAT,
-                GL_FALSE,
-                9 * sizeof(float),
-                reinterpret_cast<void*>(8 * sizeof(float))
-            );
-        }
-        else if (_hasColorMapFile) {
-            glEnableVertexAttribArray(positionAttrib);
-            glVertexAttribPointer(
-                positionAttrib,
-                4,
-                GL_FLOAT,
-                GL_FALSE,
-                8 * sizeof(float),
-                nullptr
-            );
-
-            GLint colorMapAttrib = _program->attributeLocation("in_colormap");
-            glEnableVertexAttribArray(colorMapAttrib);
-            glVertexAttribPointer(
-                colorMapAttrib,
-                4,
-                GL_FLOAT,
-                GL_FALSE,
-                8 * sizeof(float),
-                reinterpret_cast<void*>(4 * sizeof(float))
-            );
-        }
-        else if (_hasDatavarSize) {
-            glEnableVertexAttribArray(positionAttrib);
-            glVertexAttribPointer(
-                positionAttrib,
-                4,
-                GL_FLOAT,
-                GL_FALSE,
-                8 * sizeof(float),
-                nullptr
-            );
-
-            GLint dvarScalingAttrib = _program->attributeLocation("in_dvarScaling");
-            glEnableVertexAttribArray(dvarScalingAttrib);
-            glVertexAttribPointer(
-                dvarScalingAttrib,
-                1,
-                GL_FLOAT,
-                GL_FALSE,
-                5 * sizeof(float),
-                reinterpret_cast<void*>(4 * sizeof(float))
-            );
-        }
-        else {
-            glEnableVertexAttribArray(positionAttrib);
-            glVertexAttribPointer(
-                positionAttrib,
-                4,
-                GL_FLOAT,
-                GL_FALSE,
-                0,
-                nullptr
-            );
-        }
-
-        glBindVertexArray(0);
-
-        _dataIsDirty = false;
-    }
-
-    if (_hasSpriteTexture && _spriteTextureIsDirty && !_spriteTexturePath.value().empty())
-    {
-        ZoneScopedN("Sprite texture");
-        TracyGpuZone("Sprite texture");
-
-        ghoul::opengl::Texture* texture = _spriteTexture;
-
-        unsigned int hash = ghoul::hashCRC32File(_spriteTexturePath);
-
-        _spriteTexture = DigitalUniverseModule::TextureManager.request(
-            std::to_string(hash),
-            [path = _spriteTexturePath]() -> std::unique_ptr<ghoul::opengl::Texture> {
-                std::filesystem::path p = absPath(path);
-                LINFO(fmt::format("Loaded texture from {}", p));
-                std::unique_ptr<ghoul::opengl::Texture> t =
-                    ghoul::io::TextureReader::ref().loadTexture(p.string(), 2);
-                t->uploadTexture();
-                t->setFilter(ghoul::opengl::Texture::FilterMode::AnisotropicMipMap);
-                t->purgeFromRAM();
-                return t;
-            }
-        );
-
-        DigitalUniverseModule::TextureManager.release(texture);
-        _spriteTextureIsDirty = false;
-    }
-}
-
-std::vector<float> RenderableBillboardsCloud::createDataSlice() {
-    ZoneScoped;
-
-    if (_dataset.entries.empty()) {
-        return std::vector<float>();
-    }
-
-    std::vector<float> result;
-    if (_hasColorMapFile) {
-        result.reserve(8 * _dataset.entries.size());
-    }
-    else {
-        result.reserve(4 * _dataset.entries.size());
-    }
-
-    // what datavar in use for the index color
-    int colorMapInUse =
-        _hasColorMapFile ? _dataset.index(_colorOptionString) : 0;
-
-    // what datavar in use for the size scaling (if present)
-    int sizeScalingInUse =
-        _hasDatavarSize ? _dataset.index(_datavarSizeOptionString) : -1;
-
-    float minColorIdx = std::numeric_limits<float>::max();
-    float maxColorIdx = -std::numeric_limits<float>::max();
-    for (const speck::Dataset::Entry& e : _dataset.entries) {
-        if (e.data.size() > 0) {
-            float color = e.data[colorMapInUse];
-            minColorIdx = std::min(color, minColorIdx);
-            maxColorIdx = std::max(color, maxColorIdx);
-        } else {
-            minColorIdx = 0;
-            maxColorIdx = 0;
-        }
-    }
-
-    double maxRadius = 0.0;
-
-    float biggestCoord = -1.f;
-    for (const speck::Dataset::Entry& e : _dataset.entries) {
-        glm::vec3 transformedPos = glm::vec3(_transformationMatrix * glm::vec4(
-            e.position, 1.0
-        ));
-
-        float unitValue = 0.f;
-        // (abock, 2022-01-02)  This is vestigial from a previous rewrite. I just want to
-        // make it work for now and we can rewrite it properly later
-        switch (_unit) {
-            case DistanceUnit::Meter:
-                unitValue = 0.f;
-                break;
-            case DistanceUnit::Kilometer:
-                unitValue = 1.f;
-                break;
-            case DistanceUnit::Parsec:
-                unitValue = 2;
-                break;
-            case DistanceUnit::Kiloparsec:
-                unitValue = 3;
-                break;
-            case DistanceUnit::Megaparsec:
-                unitValue = 4;
-                break;
-            case DistanceUnit::Gigaparsec:
-                unitValue = 5;
-                break;
-            case DistanceUnit::Gigalightyear:
-                unitValue = 6;
-                break;
-            default:
-                throw ghoul::MissingCaseException();
-        }
-
-        glm::vec4 position(transformedPos, unitValue);
-
-        const double unitMeter = toMeter(_unit);
-        glm::dvec3 p = glm::dvec3(position) * unitMeter;
-        const double r = glm::length(p);
-        maxRadius = std::max(maxRadius, r);
-
-        if (_hasColorMapFile && _useColorMap && !_colorMap.entries.empty()) {
-            for (int j = 0; j < 4; ++j) {
-                result.push_back(position[j]);
-            }
-            biggestCoord = std::max(biggestCoord, glm::compMax(position));
-            // Note: if exact colormap option is not selected, the first color and the
-            // last color in the colormap file are the outliers colors.
-            float variableColor = e.data[colorMapInUse];
-
-            float cmax, cmin;
-            if (_colorRangeData.empty()) {
-                cmax = maxColorIdx; // Max value of datavar used for the index color
-                cmin = minColorIdx; // Min value of datavar used for the index color
-            }
-            else {
-                glm::vec2 currentColorRange = _colorRangeData[_colorOption.value()];
-                cmax = currentColorRange.y;
-                cmin = currentColorRange.x;
-            }
-
-            if (_isColorMapExact) {
-                int colorIndex = static_cast<int>(variableColor + cmin);
-                for (int j = 0; j < 4; ++j) {
-                    result.push_back(_colorMap.entries[colorIndex][j]);
-                }
-            }
-            else {
-                if (_useLinearFiltering) {
-                    float valueT = (variableColor - cmin) / (cmax - cmin); // in [0, 1)
-                    valueT = std::clamp(valueT, 0.f, 1.f);
-
-                    const float idx = valueT * (_colorMap.entries.size() - 1);
-                    const int floorIdx = static_cast<int>(std::floor(idx));
-                    const int ceilIdx = static_cast<int>(std::ceil(idx));
-
-                    const glm::vec4 floorColor = _colorMap.entries[floorIdx];
-                    const glm::vec4 ceilColor = _colorMap.entries[ceilIdx];
-
-                    if (floorColor != ceilColor) {
-                        const glm::vec4 c = floorColor + idx * (ceilColor - floorColor);
-                        result.push_back(c.r);
-                        result.push_back(c.g);
-                        result.push_back(c.b);
-                        result.push_back(c.a);
-                    }
-                    else {
-                        result.push_back(floorColor.r);
-                        result.push_back(floorColor.g);
-                        result.push_back(floorColor.b);
-                        result.push_back(floorColor.a);
-                    }
-                }
-                else {
-                    float ncmap = static_cast<float>(_colorMap.entries.size());
-                    float normalization = ((cmax != cmin) && (ncmap > 2.f)) ?
-                        (ncmap - 2.f) / (cmax - cmin) : 0;
-                    int colorIndex = static_cast<int>(
-                        (variableColor - cmin) * normalization + 1.f
-                    );
-                    colorIndex = colorIndex < 0 ? 0 : colorIndex;
-                    colorIndex = colorIndex >= ncmap ?
-                        static_cast<int>(ncmap - 1.f) : colorIndex;
-
-                    for (int j = 0; j < 4; ++j) {
-                        result.push_back(_colorMap.entries[colorIndex][j]);
-                    }
-                }
-            }
-
-            if (_hasDatavarSize) {
-                result.push_back(e.data[sizeScalingInUse]);
-            }
-        }
-        else if (_hasDatavarSize) {
-            result.push_back(e.data[sizeScalingInUse]);
-            for (int j = 0; j < 4; ++j) {
-                result.push_back(position[j]);
-            }
-        }
-        else {
-            for (int j = 0; j < 4; ++j) {
-                result.push_back(position[j]);
-            }
-        }
-    }
-    setBoundingSphere(maxRadius);
-    _fadeInDistances.setMaxValue(glm::vec2(10.f * biggestCoord));
-    return result;
-}
-
-void RenderableBillboardsCloud::createPolygonTexture() {
-    ZoneScoped;
-
-    LDEBUG("Creating Polygon Texture");
-
-    glGenTextures(1, &_pTexture);
-    glBindTexture(GL_TEXTURE_2D, _pTexture);
-    glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR);
-    glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR);
-    glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE);
-    glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE);
-    // Stopped using a buffer object for GL_PIXEL_UNPACK_BUFFER
-    glBindBuffer(GL_PIXEL_UNPACK_BUFFER, 0);
-    glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA8, 256, 256, 0, GL_RGBA, GL_BYTE, nullptr);
-
-    renderToTexture(_pTexture, 256, 256);
-}
-
-void RenderableBillboardsCloud::renderToTexture(GLuint textureToRenderTo,
-                                                GLuint textureWidth, GLuint textureHeight)
-{
-    LDEBUG("Rendering to Texture");
-
-    // Saves initial Application's OpenGL State
-    GLint defaultFBO;
-    GLint viewport[4];
-    glGetIntegerv(GL_FRAMEBUFFER_BINDING, &defaultFBO);
-    glGetIntegerv(GL_VIEWPORT, viewport);
-
-    GLuint textureFBO;
-    glGenFramebuffers(1, &textureFBO);
-    glBindFramebuffer(GL_FRAMEBUFFER, textureFBO);
-    GLenum drawBuffers[1] = { GL_COLOR_ATTACHMENT0 };
-    glDrawBuffers(1, drawBuffers);
-
-    glFramebufferTexture(GL_FRAMEBUFFER, GL_COLOR_ATTACHMENT0, textureToRenderTo, 0);
-
-    glViewport(viewport[0], viewport[1], textureWidth, textureHeight);
-
-    loadPolygonGeometryForRendering();
-    renderPolygonGeometry(_polygonVao);
-
-    // Restores Applications' OpenGL State
-    glBindFramebuffer(GL_FRAMEBUFFER, defaultFBO);
-    glViewport(viewport[0], viewport[1], viewport[2], viewport[3]);
-
-    glDeleteBuffers(1, &_polygonVbo);
-    glDeleteVertexArrays(1, &_polygonVao);
-    glDeleteFramebuffers(1, &textureFBO);
-}
-
-void RenderableBillboardsCloud::loadPolygonGeometryForRendering() {
-    glGenVertexArrays(1, &_polygonVao);
-    glGenBuffers(1, &_polygonVbo);
-    glBindVertexArray(_polygonVao);
-    glBindBuffer(GL_ARRAY_BUFFER, _polygonVbo);
-
-    constexpr std::array<GLfloat, 4> VertexData = {
-        //      x      y     z     w
-        0.f, 0.f, 0.f, 1.f,
-    };
-
-    glBufferData(GL_ARRAY_BUFFER, sizeof(VertexData), VertexData.data(), GL_STATIC_DRAW);
-    glVertexAttribPointer(0, 4, GL_FLOAT, GL_FALSE, 4 * sizeof(GLfloat), nullptr);
-    glEnableVertexAttribArray(0);
-    glBindVertexArray(0);
-}
-
-void RenderableBillboardsCloud::renderPolygonGeometry(GLuint vao) {
-    std::unique_ptr<ghoul::opengl::ProgramObject> program =
-        ghoul::opengl::ProgramObject::Build(
-            "RenderableBillboardsCloud_Polygon",
-            absPath("${MODULE_DIGITALUNIVERSE}/shaders/billboardpolygon_vs.glsl"),
-            absPath("${MODULE_DIGITALUNIVERSE}/shaders/billboardpolygon_fs.glsl"),
-            absPath("${MODULE_DIGITALUNIVERSE}/shaders/billboardpolygon_gs.glsl")
-        );
-
-    program->activate();
-    constexpr glm::vec4 Black = glm::vec4(0.f, 0.f, 0.f, 0.f);
-    glClearBufferfv(GL_COLOR, 0, glm::value_ptr(Black));
-
-    program->setUniform("sides", _polygonSides);
-    program->setUniform("polygonColor", _pointColor);
-
-    glBindVertexArray(vao);
-    glDrawArrays(GL_POINTS, 0, 1);
-    glBindVertexArray(0);
-
-    program->deactivate();
-}
-
-} // namespace openspace
diff --git a/modules/digitaluniverse/rendering/renderabledumeshes.cpp b/modules/digitaluniverse/rendering/renderabledumeshes.cpp
index 96b4f4fd39..02baefd477 100644
--- a/modules/digitaluniverse/rendering/renderabledumeshes.cpp
+++ b/modules/digitaluniverse/rendering/renderabledumeshes.cpp
@@ -385,7 +385,7 @@ void RenderableDUMeshes::renderLabels(const RenderData& data,
 
     glm::vec4 textColor = glm::vec4(glm::vec3(_textColor), _textOpacity);
 
-    for (const speck::Labelset::Entry& e : _labelset.entries) {
+    for (const dataloader::Labelset::Entry& e : _labelset.entries) {
         glm::vec3 scaledPos(e.position);
         scaledPos *= scale;
         ghoul::fontrendering::FontRenderer::defaultProjectionRenderer().render(
@@ -457,7 +457,7 @@ bool RenderableDUMeshes::loadData() {
 
     std::string labelFile = _labelFile;
     if (!labelFile.empty()) {
-        _labelset = speck::label::loadFileWithCache(_labelFile);
+        _labelset = dataloader::label::loadFileWithCache(_labelFile);
     }
 
     return success;
diff --git a/modules/digitaluniverse/rendering/renderabledumeshes.h b/modules/digitaluniverse/rendering/renderabledumeshes.h
index 472a413bd4..c4312fa18a 100644
--- a/modules/digitaluniverse/rendering/renderabledumeshes.h
+++ b/modules/digitaluniverse/rendering/renderabledumeshes.h
@@ -27,7 +27,7 @@
 
 #include <openspace/rendering/renderable.h>
 
-#include <modules/space/speckloader.h>
+#include <openspace/data/dataloader.h>
 #include <openspace/properties/optionproperty.h>
 #include <openspace/properties/stringproperty.h>
 #include <openspace/properties/scalar/boolproperty.h>
@@ -130,7 +130,7 @@ private:
     DistanceUnit _unit = DistanceUnit::Parsec;
 
     std::vector<float> _fullData;
-    speck::Labelset _labelset;
+    dataloader::Labelset _labelset;
 
     std::unordered_map<int, glm::vec3> _meshColorMap;
     std::unordered_map<int, RenderingMesh> _renderingMeshesMap;
diff --git a/modules/digitaluniverse/rendering/renderableplanescloud.cpp b/modules/digitaluniverse/rendering/renderableplanescloud.cpp
index fe16144353..ce8ce811d3 100644
--- a/modules/digitaluniverse/rendering/renderableplanescloud.cpp
+++ b/modules/digitaluniverse/rendering/renderableplanescloud.cpp
@@ -156,7 +156,7 @@ namespace {
 
         // [[codegen::verbatim(LabelsInfo.description)]]
         std::optional<ghoul::Dictionary> labels
-            [[codegen::reference("space_labelscomponent")]];
+            [[codegen::reference("labelscomponent")]];
 
         // [[codegen::verbatim(TransformationMatrixInfo.description)]]
         std::optional<glm::dmat4x4> transformationMatrix;
@@ -322,7 +322,7 @@ void RenderablePlanesCloud::initialize() {
     ZoneScoped;
 
     if (_hasSpeckFile && std::filesystem::is_regular_file(_speckFile)) {
-        _dataset = speck::data::loadFileWithCache(_speckFile);
+        _dataset = dataloader::data::loadFileWithCache(_speckFile);
         if (_dataset.entries.empty()) {
             throw ghoul::RuntimeError("Error loading data");
         }
@@ -488,7 +488,7 @@ void RenderablePlanesCloud::update(const UpdateData&) {
 }
 
 void RenderablePlanesCloud::loadTextures() {
-    for (const speck::Dataset::Texture& tex : _dataset.textures) {
+    for (const dataloader::Dataset::Texture& tex : _dataset.textures) {
         std::filesystem::path fullPath = absPath(_texturesPath.string() + '/' + tex.file);
         std::filesystem::path pngPath = fullPath;
         pngPath.replace_extension(".png");
@@ -535,7 +535,7 @@ void RenderablePlanesCloud::createPlanes() {
         LDEBUG("Creating planes...");
         float maxSize = 0.f;
         double maxRadius = 0.0;
-        for (const speck::Dataset::Entry& e : _dataset.entries) {
+        for (const dataloader::Dataset::Entry& e : _dataset.entries) {
             const glm::vec4 transformedPos = glm::vec4(
                 _transformationMatrix * glm::dvec4(e.position, 1.0)
             );
diff --git a/modules/digitaluniverse/rendering/renderableplanescloud.h b/modules/digitaluniverse/rendering/renderableplanescloud.h
index 8c8773e70d..29edae010b 100644
--- a/modules/digitaluniverse/rendering/renderableplanescloud.h
+++ b/modules/digitaluniverse/rendering/renderableplanescloud.h
@@ -27,13 +27,14 @@
 
 #include <openspace/rendering/renderable.h>
 
-#include <modules/space/labelscomponent.h>
+#include <openspace/data/dataloader.h>
 #include <openspace/properties/optionproperty.h>
 #include <openspace/properties/stringproperty.h>
 #include <openspace/properties/scalar/boolproperty.h>
 #include <openspace/properties/scalar/floatproperty.h>
 #include <openspace/properties/vector/vec2property.h>
 #include <openspace/properties/vector/vec3property.h>
+#include <openspace/rendering/labelscomponent.h>
 #include <openspace/util/distanceconversion.h>
 #include <ghoul/opengl/ghoul_gl.h>
 #include <ghoul/opengl/uniformcache.h>
@@ -111,7 +112,7 @@ private:
 
     DistanceUnit _unit = DistanceUnit::Parsec;
 
-    speck::Dataset _dataset;
+    dataloader::Dataset _dataset;
 
     // Everything related to the labels is handled by LabelsComponent
     std::unique_ptr<LabelsComponent> _labels;
diff --git a/modules/digitaluniverse/rendering/renderablepoints.cpp b/modules/digitaluniverse/rendering/renderablepoints.cpp
deleted file mode 100644
index c104723ffb..0000000000
--- a/modules/digitaluniverse/rendering/renderablepoints.cpp
+++ /dev/null
@@ -1,437 +0,0 @@
-/*****************************************************************************************
- *                                                                                       *
- * OpenSpace                                                                             *
- *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
- *                                                                                       *
- * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
- * software and associated documentation files (the "Software"), to deal in the Software *
- * without restriction, including without limitation the rights to use, copy, modify,    *
- * merge, publish, distribute, sublicense, and/or sell copies of the Software, and to    *
- * permit persons to whom the Software is furnished to do so, subject to the following   *
- * conditions:                                                                           *
- *                                                                                       *
- * The above copyright notice and this permission notice shall be included in all copies *
- * or substantial portions of the Software.                                              *
- *                                                                                       *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED,   *
- * INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A         *
- * PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT    *
- * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF  *
- * CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE  *
- * OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                                         *
- ****************************************************************************************/
-
-#include <modules/digitaluniverse/rendering/renderablepoints.h>
-
-#include <modules/digitaluniverse/digitaluniversemodule.h>
-#include <openspace/documentation/documentation.h>
-#include <openspace/documentation/verifier.h>
-#include <openspace/engine/globals.h>
-#include <openspace/rendering/renderengine.h>
-#include <openspace/util/updatestructures.h>
-#include <ghoul/filesystem/filesystem.h>
-#include <ghoul/io/texture/texturereader.h>
-#include <ghoul/logging/logmanager.h>
-#include <ghoul/misc/profiling.h>
-#include <ghoul/misc/templatefactory.h>
-#include <ghoul/opengl/programobject.h>
-#include <ghoul/opengl/texture.h>
-#include <ghoul/opengl/textureunit.h>
-#include <array>
-#include <filesystem>
-#include <fstream>
-#include <locale>
-#include <cstdint>
-#include <string>
-#include <optional>
-
-namespace {
-    constexpr std::string_view _loggerCat = "RenderablePoints";
-
-    constexpr std::array<const char*, 7> UniformNames = {
-        "modelViewProjectionTransform", "color", "sides", "alphaValue", "scaleFactor",
-        "spriteTexture", "hasColorMap"
-    };
-
-    constexpr openspace::properties::Property::PropertyInfo SpriteTextureInfo = {
-        "Texture",
-        "Point Sprite Texture",
-        "The path to the texture that should be used as the point sprite",
-        openspace::properties::Property::Visibility::AdvancedUser
-    };
-
-    constexpr openspace::properties::Property::PropertyInfo ScaleFactorInfo = {
-        "ScaleFactor",
-        "Scale Factor",
-        "This value is used as a multiplicative factor that is applied to the apparent "
-        "size of each point",
-        openspace::properties::Property::Visibility::AdvancedUser
-    };
-
-    constexpr openspace::properties::Property::PropertyInfo ColorInfo = {
-        "Color",
-        "Color",
-        "This value is used to define the color of the astronomical object",
-        openspace::properties::Property::Visibility::NoviceUser
-    };
-
-    constexpr openspace::properties::Property::PropertyInfo ColorMapInfo = {
-        "ColorMap",
-        "Color Map File",
-        "The path to the color map file of the astronomical object",
-        openspace::properties::Property::Visibility::AdvancedUser
-    };
-
-    struct [[codegen::Dictionary(RenderablePoints)]] Parameters {
-        // The path to the SPECK file that contains information about the astronomical
-        // object being rendered
-        std::string file;
-
-        // Astronomical Object Color (r,g,b)
-        glm::vec3 color [[codegen::color()]];
-
-        enum class [[codegen::map(openspace::DistanceUnit)]] Unit {
-            Meter [[codegen::key("m")]],
-            Kilometer [[codegen::key("Km")]],
-            Parsec [[codegen::key("pc")]],
-            Kiloparsec [[codegen::key("Kpc")]],
-            Megaparsec [[codegen::key("Mpc")]],
-            Gigaparsec [[codegen::key("Gpc")]],
-            Gigalightyear [[codegen::key("Gly")]]
-        };
-        std::optional<Unit> unit;
-
-        // [[codegen::verbatim(SpriteTextureInfo.description)]]
-        std::optional<std::string> texture;
-
-        // [[codegen::verbatim(ScaleFactorInfo.description)]]
-        std::optional<float> scaleFactor;
-
-        // [[codegen::verbatim(ColorMapInfo.description)]]
-        std::optional<std::string> colorMap;
-    };
-#include "renderablepoints_codegen.cpp"
-}  // namespace
-
-namespace openspace {
-
-documentation::Documentation RenderablePoints::Documentation() {
-    return codegen::doc<Parameters>("digitaluniverse_renderablepoints");
-}
-
-RenderablePoints::RenderablePoints(const ghoul::Dictionary& dictionary)
-    : Renderable(dictionary)
-    , _scaleFactor(ScaleFactorInfo, 1.f, 0.f, 64.f)
-    , _pointColor(
-        ColorInfo,
-        glm::vec3(1.f, 0.4f, 0.2f),
-        glm::vec3(0.f, 0.f, 0.f),
-        glm::vec3(1.f, 1.f, 1.f)
-    )
-    , _spriteTexturePath(SpriteTextureInfo)
-{
-    const Parameters p = codegen::bake<Parameters>(dictionary);
-
-    addProperty(Fadeable::_opacity);
-
-    _speckFile = absPath(p.file);
-
-    if (p.unit.has_value()) {
-        _unit = codegen::map<DistanceUnit>(*p.unit);
-    }
-    else {
-        _unit = DistanceUnit::Meter;
-    }
-
-    _pointColor = p.color;
-    _pointColor.setViewOption(properties::Property::ViewOptions::Color);
-    addProperty(_pointColor);
-
-    if (p.texture.has_value()) {
-        _spriteTexturePath = absPath(*p.texture).string();
-        _spriteTextureFile = std::make_unique<ghoul::filesystem::File>(
-            _spriteTexturePath.value()
-        );
-
-        _spriteTexturePath.onChange([this]() { _spriteTextureIsDirty = true; });
-        _spriteTextureFile->setCallback([this]() { _spriteTextureIsDirty = true; });
-        addProperty(_spriteTexturePath);
-
-        _hasSpriteTexture = true;
-    }
-
-    if (p.colorMap.has_value()) {
-        _colorMapFile = absPath(*p.colorMap);
-        _hasColorMapFile = true;
-    }
-
-    _scaleFactor = p.scaleFactor.value_or(_scaleFactor);
-    addProperty(_scaleFactor);
-}
-
-bool RenderablePoints::isReady() const {
-    return _program && (!_dataset.entries.empty());
-}
-
-void RenderablePoints::initialize() {
-    ZoneScoped;
-
-    _dataset = speck::data::loadFileWithCache(_speckFile);
-
-    if (_hasColorMapFile) {
-         readColorMapFile();
-    }
-}
-
-void RenderablePoints::initializeGL() {
-    ZoneScoped;
-
-    if (_hasSpriteTexture) {
-        _program = DigitalUniverseModule::ProgramObjectManager.request(
-            "RenderablePoints Sprite",
-            []() -> std::unique_ptr<ghoul::opengl::ProgramObject> {
-                return global::renderEngine->buildRenderProgram(
-                    "RenderablePoints Sprite",
-                    absPath("${MODULE_DIGITALUNIVERSE}/shaders/points_vs.glsl"),
-                    absPath("${MODULE_DIGITALUNIVERSE}/shaders/points_sprite_fs.glsl")
-                );
-            }
-        );
-    }
-    else {
-        _program = DigitalUniverseModule::ProgramObjectManager.request(
-            "RenderablePoints",
-            []() -> std::unique_ptr<ghoul::opengl::ProgramObject> {
-                return global::renderEngine->buildRenderProgram(
-                    "RenderablePoints",
-                    absPath("${MODULE_DIGITALUNIVERSE}/shaders/points_vs.glsl"),
-                    absPath("${MODULE_DIGITALUNIVERSE}/shaders/points_sprite_fs.glsl")
-                );
-            }
-        );
-    }
-    ghoul::opengl::updateUniformLocations(*_program, _uniformCache, UniformNames);
-}
-
-void RenderablePoints::deinitializeGL() {
-    glDeleteBuffers(1, &_vbo);
-    _vbo = 0;
-    glDeleteVertexArrays(1, &_vao);
-    _vao = 0;
-
-    DigitalUniverseModule::ProgramObjectManager.release(
-        _program->name(),
-        [](ghoul::opengl::ProgramObject* p) {
-            global::renderEngine->removeRenderProgram(p);
-        }
-    );
-
-    if (_hasSpriteTexture) {
-        _spriteTexture = nullptr;
-    }
-}
-
-void RenderablePoints::render(const RenderData& data, RendererTasks&) {
-    glDepthMask(false);
-    _program->activate();
-
-    _program->setUniform(
-        _uniformCache.modelViewProjectionTransform,
-        calcModelViewProjectionTransform(data, glm::dmat4(1.0))
-    );
-
-    _program->setUniform(_uniformCache.color, _pointColor);
-    _program->setUniform(_uniformCache.sides, 4);
-    _program->setUniform(_uniformCache.alphaValue, opacity());
-    _program->setUniform(_uniformCache.scaleFactor, _scaleFactor);
-
-    if (_hasSpriteTexture) {
-        ghoul::opengl::TextureUnit spriteTextureUnit;
-        spriteTextureUnit.activate();
-        _spriteTexture->bind();
-        _program->setUniform(_uniformCache.spriteTexture, spriteTextureUnit);
-    }
-
-    _program->setUniform(_uniformCache.hasColorMap, _hasColorMapFile);
-
-    glEnable(GL_PROGRAM_POINT_SIZE);
-    glBindVertexArray(_vao);
-    glDrawArrays(GL_POINTS, 0, static_cast<GLsizei>(_dataset.entries.size()));
-
-    glDisable(GL_PROGRAM_POINT_SIZE);
-    glBindVertexArray(0);
-    _program->deactivate();
-
-    glDepthMask(true);
-}
-
-void RenderablePoints::update(const UpdateData&) {
-    if (_dataIsDirty) {
-        LDEBUG("Regenerating data");
-
-        std::vector<double> slice = createDataSlice();
-
-        if (_vao == 0) {
-            glGenVertexArrays(1, &_vao);
-        }
-        if (_vbo == 0) {
-            glGenBuffers(1, &_vbo);
-        }
-
-        glBindVertexArray(_vao);
-        glBindBuffer(GL_ARRAY_BUFFER, _vbo);
-        glBufferData(
-            GL_ARRAY_BUFFER,
-            slice.size() * sizeof(double),
-            slice.data(),
-            GL_STATIC_DRAW
-        );
-        GLint positionAttrib = _program->attributeLocation("in_position");
-
-        if (_hasColorMapFile) {
-            glEnableVertexAttribArray(positionAttrib);
-            glVertexAttribLPointer(
-                positionAttrib, 4, GL_DOUBLE, sizeof(double) * 8, nullptr
-            );
-
-            GLint colorMapAttrib = _program->attributeLocation("in_colormap");
-            glEnableVertexAttribArray(colorMapAttrib);
-            glVertexAttribLPointer(
-                colorMapAttrib,
-                4,
-                GL_DOUBLE,
-                8 * sizeof(double),
-                reinterpret_cast<void*>(4 * sizeof(double))
-            );
-        }
-        else {
-            glEnableVertexAttribArray(positionAttrib);
-            glVertexAttribLPointer(positionAttrib, 4, GL_DOUBLE, 0, nullptr);
-        }
-
-        glBindVertexArray(0);
-
-        _dataIsDirty = false;
-    }
-
-    if (_hasSpriteTexture && _spriteTextureIsDirty) {
-        LDEBUG("Reloading Sprite Texture");
-        _spriteTexture = nullptr;
-        if (!_spriteTexturePath.value().empty()) {
-            _spriteTexture = ghoul::io::TextureReader::ref().loadTexture(
-                absPath(_spriteTexturePath).string(),
-                2
-            );
-            if (_spriteTexture) {
-                LDEBUG(
-                    fmt::format("Loaded texture from {}", absPath(_spriteTexturePath))
-                );
-                _spriteTexture->uploadTexture();
-            }
-            _spriteTexture->setFilter(
-                ghoul::opengl::Texture::FilterMode::AnisotropicMipMap
-            );
-
-            _spriteTextureFile = std::make_unique<ghoul::filesystem::File>(
-                _spriteTexturePath.value()
-            );
-            _spriteTextureFile->setCallback([this]() { _spriteTextureIsDirty = true; });
-        }
-        _spriteTextureIsDirty = false;
-    }
-}
-
-void RenderablePoints::readColorMapFile() {
-    std::ifstream file(_colorMapFile);
-    if (!file.good()) {
-        throw ghoul::RuntimeError(fmt::format(
-            "Failed to open Color Map file {}", _colorMapFile
-        ));
-    }
-
-    std::size_t numberOfColors = 0;
-
-    // The beginning of the speck file has a header that either contains comments
-    // (signaled by a preceding '#') or information about the structure of the file
-    // (signaled by the keywords 'datavar', 'texturevar', and 'texture')
-    std::string line;
-    while (true) {
-        // std::streampos position = file.tellg();
-        std::getline(file, line);
-
-        if (line.empty() || line[0] == '#') {
-            continue;
-        }
-
-        // Initial number of colors
-        std::locale loc;
-        if (std::isdigit(line[0], loc)) {
-            std::string::size_type sz;
-            numberOfColors = std::stoi(line, &sz);
-            break;
-        }
-        else if (file.eof()) {
-            throw ghoul::RuntimeError(fmt::format(
-                "Failed to load colors from Color Map file {}", _colorMapFile
-            ));
-        }
-    }
-
-    for (size_t i = 0; i < numberOfColors; ++i) {
-        std::getline(file, line);
-        std::stringstream str(line);
-
-        glm::vec4 color;
-        str >> color.r >> color.g >> color.b >> color.a;
-
-        _colorMapData.push_back(color);
-    }
-}
-
-std::vector<double> RenderablePoints::createDataSlice() {
-    std::vector<double> slice;
-    if (_hasColorMapFile) {
-        slice.reserve(8 * _dataset.entries.size());
-    }
-    else {
-        slice.reserve(4 * _dataset.entries.size());
-    }
-
-    double maxRadius = 0.0;
-
-    int colorIndex = 0;
-    for (const speck::Dataset::Entry& e : _dataset.entries) {
-        glm::dvec3 p = e.position;
-        double scale = toMeter(_unit);
-        p *= scale;
-
-        const double r = glm::length(p);
-        maxRadius = std::max(maxRadius, r);
-
-        glm::dvec4 position(p, 1.0);
-
-        if (_hasColorMapFile) {
-            for (int j = 0; j < 4; ++j) {
-                slice.push_back(position[j]);
-            }
-            for (int j = 0; j < 4; ++j) {
-                slice.push_back(_colorMapData[colorIndex][j]);
-            }
-        }
-        else {
-            for (int j = 0; j < 4; ++j) {
-                slice.push_back(position[j]);
-            }
-        }
-
-        colorIndex = (colorIndex == static_cast<int>(_colorMapData.size() - 1)) ?
-            0 :
-            colorIndex + 1;
-    }
-    setBoundingSphere(maxRadius);
-
-    return slice;
-}
-
-} // namespace openspace
diff --git a/modules/digitaluniverse/rendering/renderablepoints.h b/modules/digitaluniverse/rendering/renderablepoints.h
deleted file mode 100644
index 1fba9ebbff..0000000000
--- a/modules/digitaluniverse/rendering/renderablepoints.h
+++ /dev/null
@@ -1,106 +0,0 @@
-/*****************************************************************************************
- *                                                                                       *
- * OpenSpace                                                                             *
- *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
- *                                                                                       *
- * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
- * software and associated documentation files (the "Software"), to deal in the Software *
- * without restriction, including without limitation the rights to use, copy, modify,    *
- * merge, publish, distribute, sublicense, and/or sell copies of the Software, and to    *
- * permit persons to whom the Software is furnished to do so, subject to the following   *
- * conditions:                                                                           *
- *                                                                                       *
- * The above copyright notice and this permission notice shall be included in all copies *
- * or substantial portions of the Software.                                              *
- *                                                                                       *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED,   *
- * INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A         *
- * PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT    *
- * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF  *
- * CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE  *
- * OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                                         *
- ****************************************************************************************/
-
-#ifndef __OPENSPACE_MODULE_DIGITALUNIVERSE___RENDERABLEPOINTS___H__
-#define __OPENSPACE_MODULE_DIGITALUNIVERSE___RENDERABLEPOINTS___H__
-
-#include <openspace/rendering/renderable.h>
-
-#include <modules/space/speckloader.h>
-#include <openspace/properties/optionproperty.h>
-#include <openspace/properties/stringproperty.h>
-#include <openspace/properties/scalar/boolproperty.h>
-#include <openspace/properties/scalar/floatproperty.h>
-#include <openspace/properties/vector/vec3property.h>
-#include <openspace/util/distanceconversion.h>
-#include <ghoul/opengl/ghoul_gl.h>
-#include <ghoul/opengl/uniformcache.h>
-#include <filesystem>
-
-namespace ghoul::filesystem { class File; }
-
-namespace ghoul::opengl {
-    class ProgramObject;
-    class Texture;
-} // namespace ghoul::opengl
-
-namespace openspace {
-
-namespace documentation { struct Documentation; }
-
-class RenderablePoints : public Renderable {
-public:
-    explicit RenderablePoints(const ghoul::Dictionary& dictionary);
-    ~RenderablePoints() override = default;
-
-    void initialize() override;
-    void initializeGL() override;
-    void deinitializeGL() override;
-
-    bool isReady() const override;
-
-    void render(const RenderData& data, RendererTasks& rendererTask) override;
-    void update(const UpdateData& data) override;
-
-    static documentation::Documentation Documentation();
-
-private:
-    std::vector<double> createDataSlice();
-
-    void readColorMapFile();
-
-    bool _dataIsDirty = true;
-    bool _hasSpriteTexture = false;
-    bool _spriteTextureIsDirty = true;
-    bool _hasColorMapFile = false;
-
-    properties::FloatProperty _scaleFactor;
-    properties::Vec3Property _pointColor;
-    properties::StringProperty _spriteTexturePath;
-
-    std::unique_ptr<ghoul::opengl::Texture> _spriteTexture;
-    std::unique_ptr<ghoul::filesystem::File> _spriteTextureFile;
-    ghoul::opengl::ProgramObject* _program = nullptr;
-    UniformCache(
-        modelViewProjectionTransform, color, sides, alphaValue, scaleFactor,
-        spriteTexture, hasColorMap
-    ) _uniformCache;
-
-    std::filesystem::path _speckFile;
-    std::filesystem::path _colorMapFile;
-
-    DistanceUnit _unit = DistanceUnit::Parsec;
-
-    speck::Dataset _dataset;
-    std::vector<glm::vec4> _colorMapData;
-
-    //int _nValuesPerAstronomicalObject = 0;
-
-    GLuint _vao = 0;
-    GLuint _vbo = 0;
-};
-
-} // namespace openspace
-
-#endif // __OPENSPACE_MODULE_DIGITALUNIVERSE___RENDERABLEPOINTS___H__
diff --git a/modules/space/CMakeLists.txt b/modules/space/CMakeLists.txt
index d4b308bfeb..f191570586 100644
--- a/modules/space/CMakeLists.txt
+++ b/modules/space/CMakeLists.txt
@@ -27,8 +27,6 @@ include(${PROJECT_SOURCE_DIR}/support/cmake/module_definition.cmake)
 set(HEADER_FILES
   horizonsfile.h
   kepler.h
-  labelscomponent.h
-  speckloader.h
   rendering/renderableconstellationsbase.h
   rendering/renderableconstellationbounds.h
   rendering/renderableconstellationlines.h
@@ -51,8 +49,6 @@ set(SOURCE_FILES
   horizonsfile.cpp
   kepler.cpp
   spacemodule_lua.inl
-  labelscomponent.cpp
-  speckloader.cpp
   rendering/renderableconstellationsbase.cpp
   rendering/renderableconstellationbounds.cpp
   rendering/renderableconstellationlines.cpp
diff --git a/modules/space/rendering/renderableconstellationlines.cpp b/modules/space/rendering/renderableconstellationlines.cpp
index de1cc76e19..8bd0f81827 100644
--- a/modules/space/rendering/renderableconstellationlines.cpp
+++ b/modules/space/rendering/renderableconstellationlines.cpp
@@ -144,7 +144,7 @@ void RenderableConstellationLines::selectionPropertyHasChanged() {
         }
 
         if (_hasLabels) {
-            for (speck::Labelset::Entry& e : _labels->labelSet().entries) {
+            for (dataloader::Labelset::Entry& e : _labels->labelSet().entries) {
                 e.isEnabled = true;
             }
         }
@@ -156,7 +156,7 @@ void RenderableConstellationLines::selectionPropertyHasChanged() {
             pair.second.isEnabled = isSelected;
 
             if (_hasLabels) {
-                for (speck::Labelset::Entry& e : _labels->labelSet().entries) {
+                for (dataloader::Labelset::Entry& e : _labels->labelSet().entries) {
                     if (constellationFullName(e.identifier) == pair.second.name) {
                         e.isEnabled = isSelected;
                         break;
diff --git a/modules/space/rendering/renderableconstellationsbase.cpp b/modules/space/rendering/renderableconstellationsbase.cpp
index fb75c8fb5a..ace7b0c53d 100644
--- a/modules/space/rendering/renderableconstellationsbase.cpp
+++ b/modules/space/rendering/renderableconstellationsbase.cpp
@@ -82,7 +82,7 @@ namespace {
 
         // [[codegen::verbatim(LabelsInfo.description)]]
         std::optional<ghoul::Dictionary> labels
-            [[codegen::reference("space_labelscomponent")]];
+            [[codegen::reference("labelscomponent")]];
     };
 #include "renderableconstellationsbase_codegen.cpp"
 } // namespace
@@ -195,7 +195,7 @@ void RenderableConstellationsBase::initialize() {
     _labels->initialize();
     _labels->loadLabels();
 
-    for (speck::Labelset::Entry& entry : _labels->labelSet().entries) {
+    for (dataloader::Labelset::Entry& entry : _labels->labelSet().entries) {
         if (!entry.identifier.empty()) {
             std::string fullName = constellationFullName(entry.identifier);
             if (!fullName.empty()) {
diff --git a/modules/space/rendering/renderableconstellationsbase.h b/modules/space/rendering/renderableconstellationsbase.h
index 7c86c12e4b..288d4cb78f 100644
--- a/modules/space/rendering/renderableconstellationsbase.h
+++ b/modules/space/rendering/renderableconstellationsbase.h
@@ -27,11 +27,11 @@
 
 #include <openspace/rendering/renderable.h>
 
-#include <modules/space/labelscomponent.h>
 #include <openspace/properties/optionproperty.h>
 #include <openspace/properties/selectionproperty.h>
 #include <openspace/properties/vector/vec3property.h>
 #include <openspace/properties/vector/ivec2property.h>
+#include <openspace/rendering/labelscomponent.h>
 #include <openspace/util/distanceconversion.h>
 #include <ghoul/misc/managedmemoryuniqueptr.h>
 #include <ghoul/opengl/ghoul_gl.h>
diff --git a/modules/space/rendering/renderablestars.cpp b/modules/space/rendering/renderablestars.cpp
index 8207385ad8..e696d14e5b 100644
--- a/modules/space/rendering/renderablestars.cpp
+++ b/modules/space/rendering/renderablestars.cpp
@@ -1355,14 +1355,14 @@ void RenderableStars::loadData() {
         return;
     }
 
-    _dataset = speck::data::loadFileWithCache(file);
+    _dataset = dataloader::data::loadFileWithCache(file);
     if (_dataset.entries.empty()) {
         return;
     }
 
     std::vector<std::string> variableNames;
     variableNames.reserve(_dataset.variables.size());
-    for (const speck::Dataset::Variable& v : _dataset.variables) {
+    for (const dataloader::Dataset::Variable& v : _dataset.variables) {
         variableNames.push_back(v.name);
     }
     _otherDataOption.addOptions(variableNames);
@@ -1399,7 +1399,7 @@ std::vector<float> RenderableStars::createDataSlice(ColorOption option) {
     std::vector<float> result;
     // 7 for the default Color option of 3 positions + bv + lum + abs + app magnitude
     result.reserve(_dataset.entries.size() * 7);
-    for (const speck::Dataset::Entry& e : _dataset.entries) {
+    for (const dataloader::Dataset::Entry& e : _dataset.entries) {
         glm::dvec3 position = glm::dvec3(e.position) * distanceconstants::Parsec;
         maxRadius = std::max(maxRadius, glm::length(position));
 
diff --git a/modules/space/rendering/renderablestars.h b/modules/space/rendering/renderablestars.h
index eb7af56799..85ea0c25b4 100644
--- a/modules/space/rendering/renderablestars.h
+++ b/modules/space/rendering/renderablestars.h
@@ -27,7 +27,7 @@
 
 #include <openspace/rendering/renderable.h>
 
-#include <modules/space/speckloader.h>
+#include <openspace/data/dataloader.h>
 #include <openspace/properties/stringproperty.h>
 #include <openspace/properties/optionproperty.h>
 #include <openspace/properties/scalar/floatproperty.h>
@@ -143,7 +143,7 @@ private:
     bool _dataIsDirty = true;
     bool _otherDataColorMapIsDirty = true;
 
-    speck::Dataset _dataset;
+    dataloader::Dataset _dataset;
 
     std::string _queuedOtherData;
 
diff --git a/modules/space/spacemodule.cpp b/modules/space/spacemodule.cpp
index f5f8d792cf..67c29cf461 100644
--- a/modules/space/spacemodule.cpp
+++ b/modules/space/spacemodule.cpp
@@ -24,7 +24,6 @@
 
 #include <modules/space/spacemodule.h>
 
-#include <modules/space/labelscomponent.h>
 #include <modules/space/rendering/renderableconstellationbounds.h>
 #include <modules/space/rendering/renderableconstellationlines.h>
 #include <modules/space/rendering/renderableeclipsecone.h>
@@ -133,7 +132,6 @@ std::vector<documentation::Documentation> SpaceModule::documentations() const {
         RenderableTravelSpeed::Documentation(),
         SpiceRotation::Documentation(),
         SpiceTranslation::Documentation(),
-        LabelsComponent::Documentation(),
         GPTranslation::Documentation()
     };
 }
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index a147c084dc..1d3e45b073 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -27,6 +27,10 @@ include(${PROJECT_SOURCE_DIR}/support/cmake/set_openspace_compile_settings.cmake
 set(OPENSPACE_SOURCE
   openspace.cpp
   camera/camera.cpp
+  data/csvloader.cpp
+  data/dataloader.cpp
+  data/datamapping.cpp
+  data/speckloader.cpp
   documentation/core_registration.cpp
   documentation/documentation.cpp
   documentation/documentationengine.cpp
@@ -120,6 +124,7 @@ set(OPENSPACE_SOURCE
   properties/vector/vec3property.cpp
   properties/vector/vec4property.cpp
   query/query.cpp
+  rendering/colormappingcomponent.cpp
   rendering/dashboard.cpp
   rendering/dashboard_lua.inl
   rendering/dashboarditem.cpp
@@ -128,6 +133,7 @@ set(OPENSPACE_SOURCE
   rendering/deferredcastermanager.cpp
   rendering/fadeable.cpp
   rendering/helper.cpp
+  rendering/labelscomponent.cpp
   rendering/loadingscreen.cpp
   rendering/luaconsole.cpp
   rendering/raycastermanager.cpp
@@ -209,6 +215,10 @@ set(OPENSPACE_HEADER
   ${PROJECT_SOURCE_DIR}/include/openspace/json.h
   ${PROJECT_SOURCE_DIR}/include/openspace/camera/camera.h
   ${PROJECT_SOURCE_DIR}/include/openspace/camera/camerapose.h
+  ${PROJECT_SOURCE_DIR}/include/openspace/data/csvloader.h
+  ${PROJECT_SOURCE_DIR}/include/openspace/data/dataloader.h
+  ${PROJECT_SOURCE_DIR}/include/openspace/data/datamapping.h
+  ${PROJECT_SOURCE_DIR}/include/openspace/data/speckloader.h
   ${PROJECT_SOURCE_DIR}/include/openspace/documentation/core_registration.h
   ${PROJECT_SOURCE_DIR}/include/openspace/documentation/documentation.h
   ${PROJECT_SOURCE_DIR}/include/openspace/documentation/documentationengine.h
@@ -308,6 +318,7 @@ set(OPENSPACE_HEADER
   ${PROJECT_SOURCE_DIR}/include/openspace/properties/vector/vec3property.h
   ${PROJECT_SOURCE_DIR}/include/openspace/properties/vector/vec4property.h
   ${PROJECT_SOURCE_DIR}/include/openspace/query/query.h
+  ${PROJECT_SOURCE_DIR}/include/openspace/rendering/colormappingcomponent.h
   ${PROJECT_SOURCE_DIR}/include/openspace/rendering/dashboard.h
   ${PROJECT_SOURCE_DIR}/include/openspace/rendering/dashboarditem.h
   ${PROJECT_SOURCE_DIR}/include/openspace/rendering/dashboardtextitem.h
@@ -319,6 +330,7 @@ set(OPENSPACE_HEADER
   ${PROJECT_SOURCE_DIR}/include/openspace/rendering/loadingscreen.h
   ${PROJECT_SOURCE_DIR}/include/openspace/rendering/luaconsole.h
   ${PROJECT_SOURCE_DIR}/include/openspace/rendering/helper.h
+  ${PROJECT_SOURCE_DIR}/include/openspace/rendering/labelscomponent.h
   ${PROJECT_SOURCE_DIR}/include/openspace/rendering/raycasterlistener.h
   ${PROJECT_SOURCE_DIR}/include/openspace/rendering/raycastermanager.h
   ${PROJECT_SOURCE_DIR}/include/openspace/rendering/renderable.h
diff --git a/src/data/csvloader.cpp b/src/data/csvloader.cpp
new file mode 100644
index 0000000000..7da87bf571
--- /dev/null
+++ b/src/data/csvloader.cpp
@@ -0,0 +1,194 @@
+/*****************************************************************************************
+ *                                                                                       *
+ * OpenSpace                                                                             *
+ *                                                                                       *
+ * Copyright (c) 2014-2023                                                               *
+ *                                                                                       *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
+ * software and associated documentation files (the "Software"), to deal in the Software *
+ * without restriction, including without limitation the rights to use, copy, modify,    *
+ * merge, publish, distribute, sublicense, and/or sell copies of the Software, and to    *
+ * permit persons to whom the Software is furnished to do so, subject to the following   *
+ * conditions:                                                                           *
+ *                                                                                       *
+ * The above copyright notice and this permission notice shall be included in all copies *
+ * or substantial portions of the Software.                                              *
+ *                                                                                       *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED,   *
+ * INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A         *
+ * PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT    *
+ * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF  *
+ * CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE  *
+ * OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                                         *
+ ****************************************************************************************/
+
+#include <openspace/data/csvloader.h>
+
+#include <openspace/data/datamapping.h>
+#include <openspace/util/progressbar.h>
+#include <ghoul/fmt.h>
+#include <ghoul/filesystem/cachemanager.h>
+#include <ghoul/filesystem/file.h>
+#include <ghoul/filesystem/filesystem.h>
+#include <ghoul/logging/logmanager.h>
+#include <ghoul/misc/assert.h>
+#include <ghoul/misc/exception.h>
+#include <algorithm>
+#include <cmath>
+#include <cctype>
+#include <fstream>
+#include <functional>
+#include <string_view>
+
+namespace {
+    constexpr std::string_view _loggerCat = "DataLoader: CSV";
+} // namespace
+
+namespace openspace::dataloader::csv {
+
+Dataset loadCsvFile(std::filesystem::path filePath, std::optional<DataMapping> specs) {
+    ghoul_assert(std::filesystem::exists(filePath), "File must exist");
+
+    auto readFloatData = [](const std::string& str) -> float {
+        float result;
+#ifdef WIN32
+        auto [p, ec] = std::from_chars(str.data(), str.data() + str.size(), result);
+        if (ec == std::errc() && std::isfinite(result)) {
+            return result;
+        }
+        return std::numeric_limits<float>::quiet_NaN();
+#else
+        // clang is missing float support for std::from_chars
+        try {
+            result = std::stof(str.c_str(), nullptr);
+            if (std::isfinite(result)) {
+                return result;
+            }
+        }
+        catch (std::invalid_argument const& e) {}
+        return NAN;
+#endif
+    };
+
+    LDEBUG("Parsing CSV file");
+
+    std::vector<std::vector<std::string>> rows = ghoul::loadCSVFile(
+        filePath.string(),
+        true
+    );
+
+    if (rows.size() < 2) {
+        LWARNING(fmt::format(
+            "Error loading data file {}. No data items read", filePath
+        ));
+        return Dataset();
+    }
+
+    Dataset res;
+    res.entries.reserve(rows.size() - 1);
+
+    // First row is the column names
+    const std::vector<std::string>& columns = rows.front();
+
+    int xColumn = -1;
+    int yColumn = -1;
+    int zColumn = -1;
+
+    int nDataColumns = 0;
+    bool hasExcludeColumns = specs.has_value() && (*specs).hasExcludeColumns();
+    std::vector<size_t> skipColumns;
+    if (hasExcludeColumns) {
+        skipColumns.reserve((*specs).excludeColumns.size());
+    }
+
+    for (size_t i = 0; i < columns.size(); ++i) {
+        const std::string& col = columns[i];
+
+        if (isPositionColumn(col, specs)) {
+            if (isColumnX(col, specs)) {
+                xColumn = static_cast<int>(i);
+            }
+            if (isColumnY(col, specs)) {
+                yColumn = static_cast<int>(i);
+            }
+            if (isColumnZ(col, specs)) {
+                zColumn = static_cast<int>(i);
+            }
+        }
+        else if (hasExcludeColumns && (*specs).isExcludeColumn(col)) {
+            skipColumns.push_back(i);
+            continue;
+        }
+        else {
+            res.variables.push_back({
+                .index = nDataColumns,
+                .name = col
+            });
+            nDataColumns++;
+        }
+    }
+
+    if (xColumn < 0 || yColumn < 0 || zColumn < 0) {
+        // One or more position columns weren't read
+        LERROR(fmt::format(
+            "Error loading data file {}. Missing X, Y or Z position column", filePath
+        ));
+    }
+
+    LINFO(fmt::format(
+        "Loading {} rows with {} columns", rows.size(), columns.size()
+    ));
+    ProgressBar progress(rows.size());
+
+    // Skip first row (column names)
+    for (size_t rowIdx = 1; rowIdx < rows.size(); ++rowIdx) {
+        const std::vector<std::string>& row = rows[rowIdx];
+
+        Dataset::Entry entry;
+        entry.data.reserve(nDataColumns);
+
+        for (size_t i = 0; i < row.size(); ++i) {
+            // Check if column should be exluded. Note that list of indices is sorted
+            // so we can do a binary search
+            if (hasExcludeColumns &&
+                std::binary_search(skipColumns.begin(), skipColumns.end(), i))
+            {
+                continue;
+            }
+
+            const std::string& strValue = row[i];
+
+            // For now, all values are converted to float
+            float value = readFloatData(strValue);
+
+            if (i == xColumn) {
+                entry.position.x = value;
+            }
+            else if (i == yColumn) {
+                entry.position.y = value;
+            }
+            else if (i == zColumn) {
+                entry.position.z = value;
+            }
+            else {
+                entry.data.push_back(value);
+            }
+
+            // @TODO: comment mapping
+        }
+
+        glm::vec3 positive = glm::abs(entry.position);
+        float max = glm::compMax(positive);
+        if (max > res.maxPositionComponent) {
+            res.maxPositionComponent = max;
+        }
+
+        res.entries.push_back(entry);
+
+        progress.print(rowIdx + 1);
+    }
+
+    return res;
+}
+
+} // namespace openspace::dataloader::csv
diff --git a/src/data/dataloader.cpp b/src/data/dataloader.cpp
new file mode 100644
index 0000000000..e2af74e0b0
--- /dev/null
+++ b/src/data/dataloader.cpp
@@ -0,0 +1,687 @@
+/*****************************************************************************************
+ *                                                                                       *
+ * OpenSpace                                                                             *
+ *                                                                                       *
+ * Copyright (c) 2014-2023                                                               *
+ *                                                                                       *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
+ * software and associated documentation files (the "Software"), to deal in the Software *
+ * without restriction, including without limitation the rights to use, copy, modify,    *
+ * merge, publish, distribute, sublicense, and/or sell copies of the Software, and to    *
+ * permit persons to whom the Software is furnished to do so, subject to the following   *
+ * conditions:                                                                           *
+ *                                                                                       *
+ * The above copyright notice and this permission notice shall be included in all copies *
+ * or substantial portions of the Software.                                              *
+ *                                                                                       *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED,   *
+ * INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A         *
+ * PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT    *
+ * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF  *
+ * CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE  *
+ * OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                                         *
+ ****************************************************************************************/
+
+#include <openspace/data/dataloader.h>
+
+#include <openspace/data/csvloader.h>
+#include <openspace/data/speckloader.h>
+#include <ghoul/fmt.h>
+#include <ghoul/filesystem/cachemanager.h>
+#include <ghoul/filesystem/file.h>
+#include <ghoul/filesystem/filesystem.h>
+#include <ghoul/logging/logmanager.h>
+#include <ghoul/misc/assert.h>
+#include <ghoul/misc/exception.h>
+#include <ghoul/misc/stringhelper.h>
+#include <cctype>
+#include <fstream>
+#include <functional>
+#include <string_view>
+
+namespace {
+    constexpr int8_t DataCacheFileVersion = 11;
+    constexpr int8_t LabelCacheFileVersion = 11;
+    constexpr int8_t ColorCacheFileVersion = 11;
+
+    constexpr std::string_view DefaultXColumn = "x";
+    constexpr std::string_view DefaultYColumn = "y";
+    constexpr std::string_view DefaultZColumn = "z";
+
+    template <typename T, typename U>
+    void checkSize(U value, std::string_view message) {
+        if (value > std::numeric_limits<U>::max()) {
+            throw ghoul::RuntimeError(fmt::format("Error saving file: {}", message));
+        }
+    }
+
+    template <typename T>
+    using LoadCacheFunc = std::function<std::optional<T>(std::filesystem::path)>;
+
+    template <typename T>
+    using SaveCacheFunc = std::function<void(const T&, std::filesystem::path)>;
+
+    template <typename T>
+    using LoadDataFunc = std::function<T(
+        std::filesystem::path, std::optional<openspace::dataloader::DataMapping> specs
+    )>;
+
+    template <typename T>
+    T internalLoadFileWithCache(std::filesystem::path filePath,
+                                std::optional<openspace::dataloader::DataMapping> specs,
+                                LoadDataFunc<T> loadFunction,
+                                LoadCacheFunc<T> loadCacheFunction,
+                                SaveCacheFunc<T> saveCacheFunction)
+    {
+        static_assert(
+            std::is_same_v<T, openspace::dataloader::Dataset> ||
+            std::is_same_v<T, openspace::dataloader::Labelset> ||
+            std::is_same_v<T, openspace::dataloader::ColorMap>
+        );
+
+        std::string info;
+        if (specs.has_value()) {
+            info = openspace::dataloader::generateHashString(*specs);
+        }
+        std::filesystem::path cached = FileSys.cacheManager()->cachedFilename(filePath, info);
+
+        if (std::filesystem::exists(cached)) {
+            LINFOC(
+                "DataLoader",
+                fmt::format("Cached file {} used for file {}", cached, filePath)
+            );
+
+            std::optional<T> dataset = loadCacheFunction(cached);
+            if (dataset.has_value()) {
+                // We could load the cache file and we are now done with this
+                return *dataset;
+            }
+            else {
+                FileSys.cacheManager()->removeCacheFile(cached);
+            }
+        }
+        LINFOC("DataLoader", fmt::format("Loading file {}", filePath));
+        T dataset = loadFunction(filePath, specs);
+
+        if (!dataset.entries.empty()) {
+            LINFOC("DataLoader", "Saving cache");
+            saveCacheFunction(dataset, cached);
+        }
+
+        return dataset;
+    }
+} // namespace
+
+namespace openspace::dataloader {
+
+namespace data {
+
+Dataset loadFile(std::filesystem::path path, std::optional<DataMapping> specs) {
+    ghoul_assert(std::filesystem::exists(path), "File must exist");
+
+    std::ifstream file(path);
+    if (!file.good()) {
+        throw ghoul::RuntimeError(fmt::format("Failed to open data file {}", path));
+    }
+
+    std::string extension = ghoul::toLowerCase(path.extension().string());
+
+    Dataset res;
+    if (extension == ".csv") {
+        res = csv::loadCsvFile(path, specs);
+    }
+    else if (extension == ".speck") {
+        res = speck::loadSpeckFile(path, specs);
+    }
+    else {
+        LERRORC("DataLoader", fmt::format(
+            "Could not read data file {}. File format {} is not supported",
+            path, path.extension()
+        ));
+    }
+
+    return res;
+}
+
+std::optional<Dataset> loadCachedFile(std::filesystem::path path) {
+    std::ifstream file(path, std::ios::binary);
+    if (!file.good()) {
+        return std::nullopt;
+    }
+
+    Dataset result;
+
+    int8_t fileVersion;
+    file.read(reinterpret_cast<char*>(&fileVersion), sizeof(int8_t));
+    if (fileVersion != DataCacheFileVersion) {
+        // Incompatible version and we won't be able to read the file
+        return std::nullopt;
+    }
+
+    //
+    // Read variables
+    uint16_t nVariables;
+    file.read(reinterpret_cast<char*>(&nVariables), sizeof(uint16_t));
+    result.variables.resize(nVariables);
+    for (int i = 0; i < nVariables; i += 1) {
+        Dataset::Variable var;
+
+        int16_t idx;
+        file.read(reinterpret_cast<char*>(&idx), sizeof(int16_t));
+        var.index = idx;
+
+        uint16_t len;
+        file.read(reinterpret_cast<char*>(&len), sizeof(uint16_t));
+        var.name.resize(len);
+        file.read(var.name.data(), len);
+
+        result.variables[i] = std::move(var);
+    }
+
+    //
+    // Read textures
+    uint16_t nTextures;
+    file.read(reinterpret_cast<char*>(&nTextures), sizeof(uint16_t));
+    result.textures.resize(nTextures);
+    for (int i = 0; i < nTextures; i += 1) {
+        Dataset::Texture tex;
+
+        int16_t idx;
+        file.read(reinterpret_cast<char*>(&idx), sizeof(int16_t));
+        tex.index = idx;
+
+        uint16_t len;
+        file.read(reinterpret_cast<char*>(&len), sizeof(uint16_t));
+        tex.file.resize(len);
+        file.read(tex.file.data(), len);
+
+        result.textures[i] = std::move(tex);
+    }
+
+    //
+    // Read indices
+    int16_t texDataIdx;
+    file.read(reinterpret_cast<char*>(&texDataIdx), sizeof(int16_t));
+    result.textureDataIndex = texDataIdx;
+
+    int16_t oriDataIdx;
+    file.read(reinterpret_cast<char*>(&oriDataIdx), sizeof(int16_t));
+    result.orientationDataIndex = oriDataIdx;
+
+    //
+    // Read entries
+    uint64_t nEntries;
+    file.read(reinterpret_cast<char*>(&nEntries), sizeof(uint64_t));
+    result.entries.reserve(nEntries);
+    for (uint64_t i = 0; i < nEntries; i += 1) {
+        Dataset::Entry e;
+        file.read(reinterpret_cast<char*>(&e.position.x), sizeof(float));
+        file.read(reinterpret_cast<char*>(&e.position.y), sizeof(float));
+        file.read(reinterpret_cast<char*>(&e.position.z), sizeof(float));
+
+        uint16_t nValues;
+        file.read(reinterpret_cast<char*>(&nValues), sizeof(uint16_t));
+        e.data.resize(nValues);
+        file.read(reinterpret_cast<char*>(e.data.data()), nValues * sizeof(float));
+
+        uint16_t len;
+        file.read(reinterpret_cast<char*>(&len), sizeof(uint16_t));
+        if (len > 0) {
+            std::string comment;
+            comment.resize(len);
+            file.read(comment.data(), len);
+            e.comment = std::move(comment);
+        }
+
+        result.entries.push_back(std::move(e));
+    }
+
+    //
+    // Read max data point variable
+    float max;
+    file.read(reinterpret_cast<char*>(&max), sizeof(float));
+    result.maxPositionComponent = max;
+
+    return result;
+}
+
+void saveCachedFile(const Dataset& dataset, std::filesystem::path path) {
+    std::ofstream file(path, std::ofstream::binary);
+
+    file.write(reinterpret_cast<const char*>(&DataCacheFileVersion), sizeof(int8_t));
+
+    //
+    // Store variables
+    checkSize<uint16_t>(dataset.variables.size(), "Too many variables");
+    uint16_t nVariables = static_cast<uint16_t>(dataset.variables.size());
+    file.write(reinterpret_cast<const char*>(&nVariables), sizeof(uint16_t));
+    for (const Dataset::Variable& var : dataset.variables) {
+        checkSize<int16_t>(var.index, "Variable index too large");
+        int16_t idx = static_cast<int16_t>(var.index);
+        file.write(reinterpret_cast<const char*>(&idx), sizeof(int16_t));
+
+        checkSize<uint16_t>(var.name.size(), "Variable name too long");
+        uint16_t len = static_cast<uint16_t>(var.name.size());
+        file.write(reinterpret_cast<const char*>(&len), sizeof(uint16_t));
+        file.write(var.name.data(), len);
+    }
+
+    //
+    // Store textures
+    checkSize<uint16_t>(dataset.textures.size(), "Too many textures");
+    uint16_t nTextures = static_cast<uint16_t>(dataset.textures.size());
+    file.write(reinterpret_cast<const char*>(&nTextures), sizeof(uint16_t));
+    for (const Dataset::Texture& tex : dataset.textures) {
+        checkSize<int16_t>(tex.index, "Texture index too large");
+        int16_t idx = static_cast<int16_t>(tex.index);
+        file.write(reinterpret_cast<const char*>(&idx), sizeof(int16_t));
+
+
+        checkSize<uint16_t>(tex.file.size(), "Texture file too long");
+        uint16_t len = static_cast<uint16_t>(tex.file.size());
+        file.write(reinterpret_cast<const char*>(&len), sizeof(uint16_t));
+        file.write(tex.file.data(), len);
+    }
+
+    //
+    // Store indices
+    checkSize<int16_t>(dataset.textureDataIndex, "Texture index too large");
+    int16_t texIdx = static_cast<int16_t>(dataset.textureDataIndex);
+    file.write(reinterpret_cast<const char*>(&texIdx), sizeof(int16_t));
+
+    checkSize<int16_t>(dataset.orientationDataIndex, "Orientation index too large");
+    int16_t orientationIdx = static_cast<int16_t>(dataset.orientationDataIndex);
+    file.write(reinterpret_cast<const char*>(&orientationIdx), sizeof(int16_t));
+
+    //
+    // Store entries
+    checkSize<uint64_t>(dataset.entries.size(), "Too many entries");
+    uint64_t nEntries = static_cast<uint64_t>(dataset.entries.size());
+    file.write(reinterpret_cast<const char*>(&nEntries), sizeof(uint64_t));
+    for (const Dataset::Entry& e : dataset.entries) {
+        file.write(reinterpret_cast<const char*>(&e.position.x), sizeof(float));
+        file.write(reinterpret_cast<const char*>(&e.position.y), sizeof(float));
+        file.write(reinterpret_cast<const char*>(&e.position.z), sizeof(float));
+
+        checkSize<uint16_t>(e.data.size(), "Too many data variables");
+        uint16_t nValues = static_cast<uint16_t>(e.data.size());
+        file.write(reinterpret_cast<const char*>(&nValues), sizeof(uint16_t));
+        file.write(
+            reinterpret_cast<const char*>(e.data.data()),
+            e.data.size() * sizeof(float)
+        );
+
+        if (e.comment.has_value()) {
+            checkSize<uint16_t>(e.comment->size(), "Comment too long");
+        }
+        uint16_t commentLen = e.comment.has_value() ?
+            static_cast<uint16_t>(e.comment->size()) :
+            0;
+        file.write(reinterpret_cast<const char*>(&commentLen), sizeof(uint16_t));
+        if (e.comment.has_value()) {
+            file.write(e.comment->data(), e.comment->size());
+        }
+    }
+
+    //
+    // Store max data point variable
+    file.write(reinterpret_cast<const char*>(&dataset.maxPositionComponent), sizeof(float));
+}
+
+Dataset loadFileWithCache(std::filesystem::path filePath, std::optional<DataMapping> specs)
+{
+    return internalLoadFileWithCache<Dataset>(
+        filePath,
+        specs,
+        &loadFile,
+        &loadCachedFile,
+        &saveCachedFile
+    );
+}
+
+} // namespace data
+
+namespace label {
+
+Labelset loadFile(std::filesystem::path path, std::optional<DataMapping>) {
+    ghoul_assert(std::filesystem::exists(path), "File must exist");
+
+    std::ifstream file(path);
+    if (!file.good()) {
+        throw ghoul::RuntimeError(fmt::format("Failed to open dataset file {}", path));
+    }
+
+    std::string extension = ghoul::toLowerCase(path.extension().string());
+
+    Labelset res;
+    if (extension == ".label") {
+        res = speck::loadLabelFile(path);
+    }
+    else {
+        LERRORC("DataLoader", fmt::format(
+            "Could not read label data file {}. File format {} is not supported",
+            path, path.extension()
+        ));
+    }
+
+    return res;
+}
+
+std::optional<Labelset> loadCachedFile(std::filesystem::path path) {
+    std::ifstream file(path, std::ios::binary);
+    if (!file.good()) {
+        return std::nullopt;
+    }
+
+    int8_t fileVersion;
+    file.read(reinterpret_cast<char*>(&fileVersion), sizeof(int8_t));
+    if (fileVersion != LabelCacheFileVersion) {
+        // Incompatible version and we won't be able to read the file
+        return std::nullopt;
+    }
+
+    Labelset result;
+
+    int16_t textColorIdx;
+    file.read(reinterpret_cast<char*>(&textColorIdx), sizeof(int16_t));
+    result.textColorIndex = textColorIdx;
+
+    uint32_t nEntries;
+    file.read(reinterpret_cast<char*>(&nEntries), sizeof(uint32_t));
+    result.entries.reserve(nEntries);
+    for (unsigned int i = 0; i < nEntries; i += 1) {
+        Labelset::Entry e;
+        file.read(reinterpret_cast<char*>(&e.position.x), sizeof(float));
+        file.read(reinterpret_cast<char*>(&e.position.y), sizeof(float));
+        file.read(reinterpret_cast<char*>(&e.position.z), sizeof(float));
+
+        // Identifier
+        uint8_t idLen;
+        file.read(reinterpret_cast<char*>(&idLen), sizeof(uint8_t));
+        e.identifier.resize(idLen);
+        file.read(e.identifier.data(), idLen);
+
+        // Text
+        uint16_t len;
+        file.read(reinterpret_cast<char*>(&len), sizeof(uint16_t));
+        e.text.resize(len);
+        file.read(e.text.data(), len);
+
+        result.entries.push_back(e);
+    }
+
+    return result;
+}
+
+void saveCachedFile(const Labelset& labelset, std::filesystem::path path) {
+    std::ofstream file(path, std::ofstream::binary);
+
+    file.write(reinterpret_cast<const char*>(&LabelCacheFileVersion), sizeof(int8_t));
+
+    //
+    // Storage text color
+    checkSize<int16_t>(labelset.textColorIndex, "Too high text color");
+    int16_t textColorIdx = static_cast<int16_t>(labelset.textColorIndex);
+    file.write(reinterpret_cast<const char*>(&textColorIdx), sizeof(int16_t));
+
+    //
+    // Storage text lines
+    checkSize<uint32_t>(labelset.entries.size(), "Too many entries");
+    uint32_t nEntries = static_cast<uint32_t>(labelset.entries.size());
+    file.write(reinterpret_cast<const char*>(&nEntries), sizeof(uint32_t));
+    for (const Labelset::Entry& e : labelset.entries) {
+        file.write(reinterpret_cast<const char*>(&e.position.x), sizeof(float));
+        file.write(reinterpret_cast<const char*>(&e.position.y), sizeof(float));
+        file.write(reinterpret_cast<const char*>(&e.position.z), sizeof(float));
+
+        // Identifier
+        checkSize<uint8_t>(e.identifier.size(), "Identifier too long");
+        uint8_t idLen = static_cast<uint8_t>(e.identifier.size());
+        file.write(reinterpret_cast<const char*>(&idLen), sizeof(uint8_t));
+        file.write(e.identifier.data(), idLen);
+
+        // Text
+        checkSize<uint16_t>(e.text.size(), "Text too long");
+        uint16_t len = static_cast<uint16_t>(e.text.size());
+        file.write(reinterpret_cast<const char*>(&len), sizeof(uint16_t));
+        file.write(e.text.data(), len);
+    }
+}
+
+Labelset loadFileWithCache(std::filesystem::path filePath) {
+    return internalLoadFileWithCache<Labelset>(
+        filePath,
+        std::nullopt,
+        &loadFile,
+        &loadCachedFile,
+        &saveCachedFile
+    );
+}
+
+} // namespace label
+
+namespace color {
+
+ColorMap loadFile(std::filesystem::path path, std::optional<DataMapping>) {
+    ghoul_assert(std::filesystem::exists(path), "File must exist");
+
+    std::ifstream file(path);
+    if (!file.good()) {
+        throw ghoul::RuntimeError(fmt::format("Failed to open colormap file {}", path));
+    }
+
+    std::string extension = ghoul::toLowerCase(path.extension().string());
+
+    ColorMap res;
+    if (extension == ".cmap") {
+        res = speck::loadCmapFile(path);
+    }
+    else {
+        LERRORC("DataLoader", fmt::format(
+            "Could not read color map file {}. File format {} is not supported",
+            path, path.extension()
+        ));
+    }
+
+    return res;
+}
+
+std::optional<ColorMap> loadCachedFile(std::filesystem::path path) {
+    std::ifstream file(path, std::ios::binary);
+    if (!file.good()) {
+        return std::nullopt;
+    }
+
+    int8_t fileVersion;
+    file.read(reinterpret_cast<char*>(&fileVersion), sizeof(int8_t));
+    if (fileVersion != ColorCacheFileVersion) {
+        // Incompatible version and we won't be able to read the file
+        return std::nullopt;
+    }
+
+    ColorMap result;
+
+    uint32_t nColors;
+    file.read(reinterpret_cast<char*>(&nColors), sizeof(uint32_t));
+    result.entries.reserve(nColors);
+    for (unsigned int i = 0; i < nColors; i += 1) {
+        glm::vec4 color;
+        file.read(reinterpret_cast<char*>(&color.x), sizeof(float));
+        file.read(reinterpret_cast<char*>(&color.y), sizeof(float));
+        file.read(reinterpret_cast<char*>(&color.z), sizeof(float));
+        file.read(reinterpret_cast<char*>(&color.w), sizeof(float));
+        result.entries.push_back(color);
+    }
+
+    glm::vec4 color;
+
+    bool hasBelowColor = false;
+    file.read(reinterpret_cast<char*>(&hasBelowColor), sizeof(bool));
+    file.read(reinterpret_cast<char*>(&color.x), sizeof(float));
+    file.read(reinterpret_cast<char*>(&color.y), sizeof(float));
+    file.read(reinterpret_cast<char*>(&color.z), sizeof(float));
+    file.read(reinterpret_cast<char*>(&color.w), sizeof(float));
+
+    if (hasBelowColor) {
+        result.belowRangeColor = color;
+    }
+
+    bool hasAboveColor = false;
+    file.read(reinterpret_cast<char*>(&hasAboveColor), sizeof(bool));
+    file.read(reinterpret_cast<char*>(&color.x), sizeof(float));
+    file.read(reinterpret_cast<char*>(&color.y), sizeof(float));
+    file.read(reinterpret_cast<char*>(&color.z), sizeof(float));
+    file.read(reinterpret_cast<char*>(&color.w), sizeof(float));
+
+    if (hasAboveColor) {
+        result.aboveRangeColor = color;
+    }
+
+    bool hasNanColor = false;
+    file.read(reinterpret_cast<char*>(&hasNanColor), sizeof(bool));
+    file.read(reinterpret_cast<char*>(&color.x), sizeof(float));
+    file.read(reinterpret_cast<char*>(&color.y), sizeof(float));
+    file.read(reinterpret_cast<char*>(&color.z), sizeof(float));
+    file.read(reinterpret_cast<char*>(&color.w), sizeof(float));
+
+    if (hasNanColor) {
+        result.nanColor = color;
+    }
+
+    return result;
+}
+
+void saveCachedFile(const ColorMap& colorMap, std::filesystem::path path) {
+    std::ofstream file(path, std::ofstream::binary);
+
+    file.write(reinterpret_cast<const char*>(&ColorCacheFileVersion), sizeof(int8_t));
+
+    uint32_t nColors = static_cast<uint32_t>(colorMap.entries.size());
+    file.write(reinterpret_cast<const char*>(&nColors), sizeof(uint32_t));
+    for (const glm::vec4& color : colorMap.entries) {
+        file.write(reinterpret_cast<const char*>(&color.x), sizeof(float));
+        file.write(reinterpret_cast<const char*>(&color.y), sizeof(float));
+        file.write(reinterpret_cast<const char*>(&color.z), sizeof(float));
+        file.write(reinterpret_cast<const char*>(&color.w), sizeof(float));
+    }
+
+    bool hasBelowColor = colorMap.belowRangeColor.has_value();
+    const glm::vec4 belowColor = colorMap.belowRangeColor.value_or(glm::vec4(0.f));
+    file.write(reinterpret_cast<const char*>(&hasBelowColor), sizeof(bool));
+    file.write(reinterpret_cast<const char*>(&belowColor.x), sizeof(float));
+    file.write(reinterpret_cast<const char*>(&belowColor.y), sizeof(float));
+    file.write(reinterpret_cast<const char*>(&belowColor.z), sizeof(float));
+    file.write(reinterpret_cast<const char*>(&belowColor.w), sizeof(float));
+
+    bool hasAboveColor = colorMap.aboveRangeColor.has_value();
+    const glm::vec4 aboveColor = colorMap.aboveRangeColor.value_or(glm::vec4(0.f));
+    file.write(reinterpret_cast<const char*>(&hasAboveColor), sizeof(bool));
+    file.write(reinterpret_cast<const char*>(&aboveColor.x), sizeof(float));
+    file.write(reinterpret_cast<const char*>(&aboveColor.y), sizeof(float));
+    file.write(reinterpret_cast<const char*>(&aboveColor.z), sizeof(float));
+    file.write(reinterpret_cast<const char*>(&aboveColor.w), sizeof(float));
+
+    bool hasNanColor = colorMap.nanColor.has_value();
+    const glm::vec4 nanColor = colorMap.nanColor.value_or(glm::vec4(0.f));
+    file.write(reinterpret_cast<const char*>(&hasNanColor), sizeof(bool));
+    file.write(reinterpret_cast<const char*>(&nanColor.x), sizeof(float));
+    file.write(reinterpret_cast<const char*>(&nanColor.y), sizeof(float));
+    file.write(reinterpret_cast<const char*>(&nanColor.z), sizeof(float));
+    file.write(reinterpret_cast<const char*>(&nanColor.w), sizeof(float));
+}
+
+ColorMap loadFileWithCache(std::filesystem::path path)
+{
+    return internalLoadFileWithCache<ColorMap>(
+        path,
+        std::nullopt,
+        &loadFile,
+        &loadCachedFile,
+        &saveCachedFile
+    );
+}
+
+} // namespace color
+
+int Dataset::index(std::string_view variableName) const {
+    for (const Dataset::Variable& v : variables) {
+        if (v.name == variableName) {
+            return v.index;
+        }
+    }
+    return -1;
+}
+
+bool Dataset::normalizeVariable(std::string_view variableName) {
+    int idx = index(variableName);
+
+    if (idx == -1) {
+        // We didn't find the variable that was specified
+        return false;
+    }
+
+    float minValue = std::numeric_limits<float>::max();
+    float maxValue = -std::numeric_limits<float>::max();
+    for (Dataset::Entry& e : entries) {
+        float value = e.data[idx];
+        if (std::isnan(value)) {
+            continue;
+        }
+        minValue = std::min(minValue, value);
+        maxValue = std::max(maxValue, value);
+    }
+
+    for (Dataset::Entry& e : entries) {
+        float value = e.data[idx];
+        if (std::isnan(value)) {
+            continue;
+        }
+        e.data[idx] = (value - minValue) / (maxValue - minValue);
+    }
+
+    return true;
+}
+
+glm::vec2 Dataset::findValueRange(int variableIndex) const {
+    if (entries.empty()) {
+        // Can't find range if there are no entries
+        return glm::vec2(0.f);
+    }
+
+    if (variableIndex >= entries[0].data.size()) {
+        // The index is not a valid variable index
+        return glm::vec2(0.f);
+    }
+
+    float minValue = std::numeric_limits<float>::max();
+    float maxValue = -std::numeric_limits<float>::max();
+    for (const Dataset::Entry& e : entries) {
+        if (!e.data.empty()) {
+            float value = e.data[variableIndex];
+            if (std::isnan(value)) {
+                continue;
+            }
+            minValue = std::min(value, minValue);
+            maxValue = std::max(value, maxValue);
+        }
+        else {
+            minValue = 0.f;
+            maxValue = 0.f;
+        }
+    }
+
+    return glm::vec2(minValue, maxValue);
+}
+
+glm::vec2 Dataset::findValueRange(std::string_view variableName) const {
+    int idx = index(variableName);
+
+    if (idx == -1) {
+        // We didn't find the variable that was specified
+        return glm::vec2(0.f);
+    }
+
+    return findValueRange(idx);
+}
+
+} // namespace openspace::dataloader
diff --git a/src/data/datamapping.cpp b/src/data/datamapping.cpp
new file mode 100644
index 0000000000..eba72d6178
--- /dev/null
+++ b/src/data/datamapping.cpp
@@ -0,0 +1,174 @@
+/*****************************************************************************************
+ *                                                                                       *
+ * OpenSpace                                                                             *
+ *                                                                                       *
+ * Copyright (c) 2014-2023                                                               *
+ *                                                                                       *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
+ * software and associated documentation files (the "Software"), to deal in the Software *
+ * without restriction, including without limitation the rights to use, copy, modify,    *
+ * merge, publish, distribute, sublicense, and/or sell copies of the Software, and to    *
+ * permit persons to whom the Software is furnished to do so, subject to the following   *
+ * conditions:                                                                           *
+ *                                                                                       *
+ * The above copyright notice and this permission notice shall be included in all copies *
+ * or substantial portions of the Software.                                              *
+ *                                                                                       *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED,   *
+ * INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A         *
+ * PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT    *
+ * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF  *
+ * CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE  *
+ * OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                                         *
+ ****************************************************************************************/
+
+#include <openspace/data/datamapping.h>
+
+#include <openspace/documentation/documentation.h>
+#include <ghoul/misc/crc32.h>
+#include <ghoul/misc/dictionary.h>
+#include <ghoul/misc/stringhelper.h>
+#include <string_view>
+
+namespace {
+    constexpr std::string_view DefaultX = "x";
+    constexpr std::string_view DefaultY = "y";
+    constexpr std::string_view DefaultZ = "z";
+
+    enum class PositionColumn {
+        X, Y, Z
+    };
+
+    bool checkColumnInternal(PositionColumn columnCase, const std::string& c,
+                         const std::optional<openspace::dataloader::DataMapping>& mapping,
+                             const std::string_view defaultValue)
+    {
+        std::string testColumn = c;
+        std::string column = std::string(defaultValue);
+        if (mapping.has_value()) {
+            switch (columnCase) {
+                case PositionColumn::X:
+                    column = (*mapping).xColumnName.value_or(column);
+                    break;
+                case PositionColumn::Y:
+                    column = (*mapping).yColumnName.value_or(column);
+                    break;
+                case PositionColumn::Z:
+                    column = (*mapping).zColumnName.value_or(column);
+                    break;
+            }
+        }
+
+        // Per default, allow both lower case and upper case versions of column names
+        if (!mapping.has_value() || !(*mapping).isCaseSensitive) {
+            column = ghoul::toLowerCase(column);
+            testColumn = ghoul::toLowerCase(testColumn);
+        }
+
+        return testColumn == column;
+    }
+
+    // This is a data mapping structure that can be used when creating point cloud
+    // datasets, e.g. from a CSV or Speck file.
+    //
+    // It allows specifying things like column names, whether the reading of those
+    // column names should be case sensitive, data value that represents missing
+    // values in the dataset, and more. See details for each field / class member.
+    //
+    // Note that things related to reading the point position will not be handled for
+    // SPECK files, as for those we always expect the first three values per row to
+    // specify the XYZ position
+    struct [[codegen::Dictionary(DataMapping)]] Parameters {
+        // Specifies the column name for the x coordinate
+        std::optional<std::string> x;
+
+        // Specifies the column name for the y coordinate
+        std::optional<std::string> y;
+
+        // Specifies the column name for the z coordinate
+        std::optional<std::string> z;
+
+        // Specifies whether to do case sensitive checks when reading column names.
+        // Default is not to, so that 'X' and 'x' are both valid column names for the
+        // x position column, for example
+        std::optional<bool> caseSensitive;
+
+        // Specifies a value that, when read from the file, should be interpreted as 'no
+        // value', i.e. a missing data value. Note that the same value is used across all
+        // data columns
+        std::optional<float> missingDataValue;
+
+        // A list of column names, of columns that will not be loaded into the dataset.
+        // Note that not all data formats support this. E.g. SPECK files do not
+        std::optional<std::vector<std::string>> excludeColumns;
+    };
+#include "datamapping_codegen.cpp"
+}
+
+namespace openspace::dataloader {
+
+documentation::Documentation DataMapping::Documentation() {
+    return codegen::doc<Parameters>("dataloader_datamapping");
+}
+
+DataMapping DataMapping::createFromDictionary(const ghoul::Dictionary& dictionary) {
+    const Parameters p = codegen::bake<Parameters>(dictionary);
+
+    DataMapping result;
+
+    result.xColumnName = p.x;
+    result.yColumnName = p.y;
+    result.zColumnName = p.z;
+
+    result.missingDataValue = p.missingDataValue;
+
+    result.isCaseSensitive = p.caseSensitive.value_or(result.isCaseSensitive);
+    result.excludeColumns = p.excludeColumns.value_or(result.excludeColumns);
+
+    return result;
+}
+
+bool DataMapping::hasExcludeColumns() const {
+    return !excludeColumns.empty();
+}
+
+bool DataMapping::isExcludeColumn(std::string_view column) const {
+    auto found = std::find(excludeColumns.begin(), excludeColumns.end(), column);
+    return (found != excludeColumns.end());
+}
+
+std::string generateHashString(const DataMapping& dm) {
+    std::string a;
+    for (std::string_view c : dm.excludeColumns) {
+        a += c;
+    }
+    unsigned int excludeColumnsHash = ghoul::hashCRC32(a);
+
+    return fmt::format(
+        "DM|x{}|y{}|z{}|m{}|{}|{}",
+        dm.xColumnName.value_or(""),
+        dm.yColumnName.value_or(""),
+        dm.zColumnName.value_or(""),
+        dm.missingDataValue.has_value() ? ghoul::to_string(*dm.missingDataValue) : "",
+        dm.isCaseSensitive ? "1" : "0",
+        excludeColumnsHash
+    );
+}
+
+bool isPositionColumn(const std::string& c, const std::optional<DataMapping>& mapping) {
+    return isColumnX(c, mapping) || isColumnY(c, mapping) || isColumnZ(c, mapping);
+}
+
+bool isColumnX(const std::string& c, const std::optional<DataMapping>& mapping) {
+    return checkColumnInternal(PositionColumn::X, c, mapping, DefaultX);
+}
+
+bool isColumnY(const std::string& c, const std::optional<DataMapping>& mapping) {
+    return checkColumnInternal(PositionColumn::Y, c, mapping, DefaultY);
+}
+
+bool isColumnZ(const std::string& c, const std::optional<DataMapping>& mapping) {
+    return checkColumnInternal(PositionColumn::Z, c, mapping, DefaultZ);
+}
+
+} // namespace openspace::dataloader
diff --git a/modules/space/speckloader.cpp b/src/data/speckloader.cpp
similarity index 51%
rename from modules/space/speckloader.cpp
rename to src/data/speckloader.cpp
index 72e07d19d4..ee26953f5e 100644
--- a/modules/space/speckloader.cpp
+++ b/src/data/speckloader.cpp
@@ -22,7 +22,7 @@
  * OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                                         *
  ****************************************************************************************/
 
-#include <modules/space/speckloader.h>
+#include <openspace/data/speckloader.h>
 
 #include <ghoul/fmt.h>
 #include <ghoul/filesystem/cachemanager.h>
@@ -30,20 +30,15 @@
 #include <ghoul/filesystem/filesystem.h>
 #include <ghoul/logging/logmanager.h>
 #include <ghoul/misc/assert.h>
+#include <ghoul/misc/stringhelper.h>
 #include <cctype>
 #include <fstream>
 #include <functional>
 #include <string_view>
 
 namespace {
-    constexpr int8_t DataCacheFileVersion = 10;
-    constexpr int8_t LabelCacheFileVersion = 11;
-    constexpr int8_t ColorCacheFileVersion = 10;
-
     bool startsWith(std::string lhs, std::string_view rhs) noexcept {
-        for (size_t i = 0; i < lhs.size(); i++) {
-            lhs[i] = static_cast<char>(tolower(lhs[i]));
-        }
+        lhs = ghoul::toLowerCase(lhs);
         return (rhs.size() <= lhs.size()) && (lhs.substr(0, rhs.size()) == rhs);
     }
 
@@ -70,71 +65,11 @@ namespace {
         }
     }
 
-    template <typename T, typename U>
-    void checkSize(U value, std::string_view message) {
-        if (value > std::numeric_limits<U>::max()) {
-            throw ghoul::RuntimeError(fmt::format("Error saving file: {}", message));
-        }
-    }
-
-    template <typename T>
-    using LoadCacheFunc = std::function<std::optional<T>(std::filesystem::path)>;
-
-    template <typename T>
-    using SaveCacheFunc = std::function<void(const T&, std::filesystem::path)>;
-
-    template <typename T>
-    using LoadSpeckFunc = std::function<T(
-        std::filesystem::path, openspace::speck::SkipAllZeroLines)>;
-
-
-
-    template <typename T>
-    T internalLoadFileWithCache(std::filesystem::path speckPath,
-                                     openspace::speck::SkipAllZeroLines skipAllZeroLines,
-                                     LoadSpeckFunc<T> loadSpeckFunction,
-                                     LoadCacheFunc<T> loadCacheFunction,
-                                     SaveCacheFunc<T> saveCacheFunction)
-    {
-        static_assert(
-            std::is_same_v<T, openspace::speck::Dataset> ||
-            std::is_same_v<T, openspace::speck::Labelset> ||
-            std::is_same_v<T, openspace::speck::ColorMap>
-        );
-
-        std::filesystem::path cached = FileSys.cacheManager()->cachedFilename(speckPath);
-
-        if (std::filesystem::exists(cached)) {
-            LINFOC(
-                "SpeckLoader",
-                fmt::format("Cached file {} used for file {}", cached, speckPath)
-            );
-
-            std::optional<T> dataset = loadCacheFunction(cached);
-            if (dataset.has_value()) {
-                // We could load the cache file and we are now done with this
-                return *dataset;
-            }
-            else {
-                FileSys.cacheManager()->removeCacheFile(cached);
-            }
-        }
-        LINFOC("SpeckLoader", fmt::format("Loading file {}", speckPath));
-        T dataset = loadSpeckFunction(speckPath, skipAllZeroLines);
-
-        if (!dataset.entries.empty()) {
-            LINFOC("SpeckLoader", "Saving cache");
-            saveCacheFunction(dataset, cached);
-        }
-        return dataset;
-    }
 } // namespace
 
-namespace openspace::speck {
+namespace openspace::dataloader::speck {
 
-namespace data {
-
-Dataset loadFile(std::filesystem::path path, SkipAllZeroLines skipAllZeroLines) {
+Dataset loadSpeckFile(std::filesystem::path path, std::optional<DataMapping> specs) {
     ghoul_assert(std::filesystem::exists(path), "File must exist");
 
     std::ifstream file(path);
@@ -329,11 +264,19 @@ Dataset loadFile(std::filesystem::path path, SkipAllZeroLines skipAllZeroLines)
 
         bool allZero = true;
 
+        // For SPECK we know that the first 3 values are the position, so no need to
+        // check agains data mapping
         std::stringstream str(line);
         Dataset::Entry entry;
         str >> entry.position.x >> entry.position.y >> entry.position.z;
         allZero &= (entry.position == glm::vec3(0.0));
 
+        glm::vec3 positive = glm::abs(entry.position);
+        float max = glm::compMax(positive);
+        if (max > res.maxPositionComponent) {
+            res.maxPositionComponent = max;
+        }
+
         if (!str.good()) {
             // Need to subtract one of the line number here as we increase the current
             // line count in the beginning of the while loop we are currently in
@@ -357,6 +300,15 @@ Dataset loadFile(std::filesystem::path path, SkipAllZeroLines skipAllZeroLines)
                 valueStream.str(value);
                 valueStream >> entry.data[i];
 
+                // Check if value corresponds to a missing value
+                if (specs.has_value() && specs->missingDataValue.has_value()) {
+                    float missingDataValue = specs->missingDataValue.value();
+                    float diff = std::abs(entry.data[i] - missingDataValue);
+                    if (diff < std::numeric_limits<float>::epsilon()) {
+                        entry.data[i] = std::numeric_limits<float>::quiet_NaN();
+                    }
+                }
+
                 allZero &= (entry.data[i] == 0.0);
                 if (valueStream.fail()) {
                     // Need to subtract one of the line number here as we increase the
@@ -371,7 +323,7 @@ Dataset loadFile(std::filesystem::path path, SkipAllZeroLines skipAllZeroLines)
             }
         }
 
-        if (skipAllZeroLines && allZero) {
+        if (allZero) {
             continue;
         }
 
@@ -402,203 +354,12 @@ Dataset loadFile(std::filesystem::path path, SkipAllZeroLines skipAllZeroLines)
     return res;
 }
 
-std::optional<Dataset> loadCachedFile(std::filesystem::path path) {
-    std::ifstream file(path, std::ios::binary);
-    if (!file.good()) {
-        return std::nullopt;
-    }
-
-    Dataset result;
-
-    int8_t fileVersion;
-    file.read(reinterpret_cast<char*>(&fileVersion), sizeof(int8_t));
-    if (fileVersion != DataCacheFileVersion) {
-        // Incompatible version and we won't be able to read the file
-        return std::nullopt;
-    }
-
-    //
-    // Read variables
-    uint16_t nVariables;
-    file.read(reinterpret_cast<char*>(&nVariables), sizeof(uint16_t));
-    result.variables.resize(nVariables);
-    for (int i = 0; i < nVariables; i += 1) {
-        Dataset::Variable var;
-
-        int16_t idx;
-        file.read(reinterpret_cast<char*>(&idx), sizeof(int16_t));
-        var.index = idx;
-
-        uint16_t len;
-        file.read(reinterpret_cast<char*>(&len), sizeof(uint16_t));
-        var.name.resize(len);
-        file.read(var.name.data(), len);
-
-        result.variables[i] = std::move(var);
-    }
-
-    //
-    // Read textures
-    uint16_t nTextures;
-    file.read(reinterpret_cast<char*>(&nTextures), sizeof(uint16_t));
-    result.textures.resize(nTextures);
-    for (int i = 0; i < nTextures; i += 1) {
-        Dataset::Texture tex;
-
-        int16_t idx;
-        file.read(reinterpret_cast<char*>(&idx), sizeof(int16_t));
-        tex.index = idx;
-
-        uint16_t len;
-        file.read(reinterpret_cast<char*>(&len), sizeof(uint16_t));
-        tex.file.resize(len);
-        file.read(tex.file.data(), len);
-
-        result.textures[i] = std::move(tex);
-    }
-
-    //
-    // Read indices
-    int16_t texDataIdx;
-    file.read(reinterpret_cast<char*>(&texDataIdx), sizeof(int16_t));
-    result.textureDataIndex = texDataIdx;
-
-    int16_t oriDataIdx;
-    file.read(reinterpret_cast<char*>(&oriDataIdx), sizeof(int16_t));
-    result.orientationDataIndex = oriDataIdx;
-
-    //
-    // Read entries
-    uint64_t nEntries;
-    file.read(reinterpret_cast<char*>(&nEntries), sizeof(uint64_t));
-    result.entries.reserve(nEntries);
-    for (uint64_t i = 0; i < nEntries; i += 1) {
-        Dataset::Entry e;
-        file.read(reinterpret_cast<char*>(&e.position.x), sizeof(float));
-        file.read(reinterpret_cast<char*>(&e.position.y), sizeof(float));
-        file.read(reinterpret_cast<char*>(&e.position.z), sizeof(float));
-
-        uint16_t nValues;
-        file.read(reinterpret_cast<char*>(&nValues), sizeof(uint16_t));
-        e.data.resize(nValues);
-        file.read(reinterpret_cast<char*>(e.data.data()), nValues * sizeof(float));
-
-        uint16_t len;
-        file.read(reinterpret_cast<char*>(&len), sizeof(uint16_t));
-        if (len > 0) {
-            std::string comment;
-            comment.resize(len);
-            file.read(comment.data(), len);
-            e.comment = std::move(comment);
-        }
-
-        result.entries.push_back(std::move(e));
-    }
-
-    return result;
-}
-
-void saveCachedFile(const Dataset& dataset, std::filesystem::path path) {
-    std::ofstream file(path, std::ofstream::binary);
-
-    file.write(reinterpret_cast<const char*>(&DataCacheFileVersion), sizeof(int8_t));
-
-    //
-    // Store variables
-    checkSize<uint16_t>(dataset.variables.size(), "Too many variables");
-    uint16_t nVariables = static_cast<uint16_t>(dataset.variables.size());
-    file.write(reinterpret_cast<const char*>(&nVariables), sizeof(uint16_t));
-    for (const Dataset::Variable& var : dataset.variables) {
-        checkSize<int16_t>(var.index, "Variable index too large");
-        int16_t idx = static_cast<int16_t>(var.index);
-        file.write(reinterpret_cast<const char*>(&idx), sizeof(int16_t));
-
-        checkSize<uint16_t>(var.name.size(), "Variable name too long");
-        uint16_t len = static_cast<uint16_t>(var.name.size());
-        file.write(reinterpret_cast<const char*>(&len), sizeof(uint16_t));
-        file.write(var.name.data(), len);
-    }
-
-    //
-    // Store textures
-    checkSize<uint16_t>(dataset.textures.size(), "Too many textures");
-    uint16_t nTextures = static_cast<uint16_t>(dataset.textures.size());
-    file.write(reinterpret_cast<const char*>(&nTextures), sizeof(uint16_t));
-    for (const Dataset::Texture& tex : dataset.textures) {
-        checkSize<int16_t>(tex.index, "Texture index too large");
-        int16_t idx = static_cast<int16_t>(tex.index);
-        file.write(reinterpret_cast<const char*>(&idx), sizeof(int16_t));
-
-
-        checkSize<uint16_t>(tex.file.size(), "Texture file too long");
-        uint16_t len = static_cast<uint16_t>(tex.file.size());
-        file.write(reinterpret_cast<const char*>(&len), sizeof(uint16_t));
-        file.write(tex.file.data(), len);
-    }
-
-    //
-    // Store indices
-    checkSize<int16_t>(dataset.textureDataIndex, "Texture index too large");
-    int16_t texIdx = static_cast<int16_t>(dataset.textureDataIndex);
-    file.write(reinterpret_cast<const char*>(&texIdx), sizeof(int16_t));
-
-    checkSize<int16_t>(dataset.orientationDataIndex, "Orientation index too large");
-    int16_t orientationIdx = static_cast<int16_t>(dataset.orientationDataIndex);
-    file.write(reinterpret_cast<const char*>(&orientationIdx), sizeof(int16_t));
-
-    //
-    // Store entries
-    checkSize<uint64_t>(dataset.entries.size(), "Too many entries");
-    uint64_t nEntries = static_cast<uint64_t>(dataset.entries.size());
-    file.write(reinterpret_cast<const char*>(&nEntries), sizeof(uint64_t));
-    for (const Dataset::Entry& e : dataset.entries) {
-        file.write(reinterpret_cast<const char*>(&e.position.x), sizeof(float));
-        file.write(reinterpret_cast<const char*>(&e.position.y), sizeof(float));
-        file.write(reinterpret_cast<const char*>(&e.position.z), sizeof(float));
-
-        checkSize<uint16_t>(e.data.size(), "Too many data variables");
-        uint16_t nValues = static_cast<uint16_t>(e.data.size());
-        file.write(reinterpret_cast<const char*>(&nValues), sizeof(uint16_t));
-        file.write(
-            reinterpret_cast<const char*>(e.data.data()),
-            e.data.size() * sizeof(float)
-        );
-
-        if (e.comment.has_value()) {
-            checkSize<uint16_t>(e.comment->size(), "Comment too long");
-        }
-        uint16_t commentLen = e.comment.has_value() ?
-            static_cast<uint16_t>(e.comment->size()) :
-            0;
-        file.write(reinterpret_cast<const char*>(&commentLen), sizeof(uint16_t));
-        if (e.comment.has_value()) {
-            file.write(e.comment->data(), e.comment->size());
-        }
-    }
-}
-
-Dataset loadFileWithCache(std::filesystem::path speckPath,
-                               SkipAllZeroLines skipAllZeroLines)
-{
-    return internalLoadFileWithCache<Dataset>(
-        speckPath,
-        skipAllZeroLines,
-        &loadFile,
-        &loadCachedFile,
-        &saveCachedFile
-    );
-}
-
-} // namespace data
-
-namespace label {
-
-Labelset loadFile(std::filesystem::path path, SkipAllZeroLines) {
+Labelset loadLabelFile(std::filesystem::path path) {
     ghoul_assert(std::filesystem::exists(path), "File must exist");
 
     std::ifstream file(path);
     if (!file.good()) {
-        throw ghoul::RuntimeError(fmt::format("Failed to open speck file {}", path));
+        throw ghoul::RuntimeError(fmt::format("Failed to open dataset file {}", path));
     }
 
     Labelset res;
@@ -637,7 +398,6 @@ Labelset loadFile(std::filesystem::path path, SkipAllZeroLines) {
                 ));
             }
 
-
             std::stringstream str(line);
             std::string dummy;
             str >> dummy >> res.textColorIndex;
@@ -728,117 +488,17 @@ Labelset loadFile(std::filesystem::path path, SkipAllZeroLines) {
     return res;
 }
 
-std::optional<Labelset> loadCachedFile(std::filesystem::path path) {
-    std::ifstream file(path, std::ios::binary);
-    if (!file.good()) {
-        return std::nullopt;
-    }
-
-    int8_t fileVersion;
-    file.read(reinterpret_cast<char*>(&fileVersion), sizeof(int8_t));
-    if (fileVersion != LabelCacheFileVersion) {
-        // Incompatible version and we won't be able to read the file
-        return std::nullopt;
-    }
-
-    Labelset result;
-
-    int16_t textColorIdx;
-    file.read(reinterpret_cast<char*>(&textColorIdx), sizeof(int16_t));
-    result.textColorIndex = textColorIdx;
-
-    uint32_t nEntries;
-    file.read(reinterpret_cast<char*>(&nEntries), sizeof(uint32_t));
-    result.entries.reserve(nEntries);
-    for (unsigned int i = 0; i < nEntries; i += 1) {
-        Labelset::Entry e;
-        file.read(reinterpret_cast<char*>(&e.position.x), sizeof(float));
-        file.read(reinterpret_cast<char*>(&e.position.y), sizeof(float));
-        file.read(reinterpret_cast<char*>(&e.position.z), sizeof(float));
-
-        // Identifier
-        uint8_t idLen;
-        file.read(reinterpret_cast<char*>(&idLen), sizeof(uint8_t));
-        e.identifier.resize(idLen);
-        file.read(e.identifier.data(), idLen);
-
-        // Text
-        uint16_t len;
-        file.read(reinterpret_cast<char*>(&len), sizeof(uint16_t));
-        e.text.resize(len);
-        file.read(e.text.data(), len);
-
-        result.entries.push_back(e);
-    }
-
-    return result;
-}
-
-void saveCachedFile(const Labelset& labelset, std::filesystem::path path) {
-    std::ofstream file(path, std::ofstream::binary);
-
-    file.write(reinterpret_cast<const char*>(&LabelCacheFileVersion), sizeof(int8_t));
-
-    //
-    // Storage text color
-    checkSize<int16_t>(labelset.textColorIndex, "Too high text color");
-    int16_t textColorIdx = static_cast<int16_t>(labelset.textColorIndex);
-    file.write(reinterpret_cast<const char*>(&textColorIdx), sizeof(int16_t));
-
-    //
-    // Storage text lines
-    checkSize<uint32_t>(labelset.entries.size(), "Too many entries");
-    uint32_t nEntries = static_cast<uint32_t>(labelset.entries.size());
-    file.write(reinterpret_cast<const char*>(&nEntries), sizeof(uint32_t));
-    for (const Labelset::Entry& e : labelset.entries) {
-        file.write(reinterpret_cast<const char*>(&e.position.x), sizeof(float));
-        file.write(reinterpret_cast<const char*>(&e.position.y), sizeof(float));
-        file.write(reinterpret_cast<const char*>(&e.position.z), sizeof(float));
-
-        // Identifier
-        checkSize<uint8_t>(e.identifier.size(), "Identifier too long");
-        uint8_t idLen = static_cast<uint8_t>(e.identifier.size());
-        file.write(reinterpret_cast<const char*>(&idLen), sizeof(uint8_t));
-        file.write(e.identifier.data(), idLen);
-
-        // Text
-        checkSize<uint16_t>(e.text.size(), "Text too long");
-        uint16_t len = static_cast<uint16_t>(e.text.size());
-        file.write(reinterpret_cast<const char*>(&len), sizeof(uint16_t));
-        file.write(e.text.data(), len);
-    }
-}
-
-Labelset loadFileWithCache(std::filesystem::path speckPath,
-                                SkipAllZeroLines skipAllZeroLines)
-{
-    return internalLoadFileWithCache<Labelset>(
-        speckPath,
-        skipAllZeroLines,
-        &loadFile,
-        &loadCachedFile,
-        &saveCachedFile
-    );
-}
-
-} // namespace label
-
-namespace color {
-
-ColorMap loadFile(std::filesystem::path path, SkipAllZeroLines) {
+ColorMap loadCmapFile(std::filesystem::path path) {
     ghoul_assert(std::filesystem::exists(path), "File must exist");
 
     std::ifstream file(path);
     if (!file.good()) {
-        throw ghoul::RuntimeError(fmt::format("Failed to open speck file {}", path));
+        throw ghoul::RuntimeError(fmt::format("Failed to open color map file {}", path));
     }
 
     ColorMap res;
     int nColorLines = -1;
 
-    // The beginning of the speck file has a header that either contains comments
-    // (signaled by a preceding '#') or information about the structure of the file
-    // (signaled by the keywords 'datavar', 'texturevar', and 'texture')
     std::string line;
     while (std::getline(file, line)) {
         // Ignore empty line or commented-out lines
@@ -854,11 +514,11 @@ ColorMap loadFile(std::filesystem::path path, SkipAllZeroLines) {
 
         strip(line);
 
-        std::stringstream str(line);
         if (nColorLines == -1) {
             // This is the first time we get this far, it will have to be the first number
             // meaning that it is the number of color values
 
+            std::stringstream str(line);
             str >> nColorLines;
             res.entries.reserve(nColorLines);
         }
@@ -867,114 +527,43 @@ ColorMap loadFile(std::filesystem::path path, SkipAllZeroLines) {
             // reading the individual value lines
 
             glm::vec4 color;
-            str >> color.x >> color.y >> color.z >> color.w;
-            res.entries.push_back(std::move(color));
+            std::string dummy;
+            // Note that startwith converts the input string to all lowercase
+            if (startsWith(line, "belowrange")) {
+                std::stringstream str(line);
+                str >> dummy >> color.x >> color.y >> color.z >> color.w;
+                res.belowRangeColor = color;
+            }
+            else if (startsWith(line, "aboverange")) {
+                std::stringstream str(line);
+                str >> dummy >> color.x >> color.y >> color.z >> color.w;
+                res.aboveRangeColor = color;
+            }
+            else if (startsWith(line, "nan")) {
+                std::stringstream str(line);
+                str >> dummy >> color.x >> color.y >> color.z >> color.w;
+                res.nanColor = color;
+            }
+            else {
+                // TODO: Catch when this is not a color!
+                std::stringstream str(line);
+                str >> color.x >> color.y >> color.z >> color.w;
+                res.entries.push_back(std::move(color));
+            }
         }
     }
 
+    res.entries.shrink_to_fit();
+
     if (nColorLines != static_cast<int>(res.entries.size())) {
         LWARNINGC("SpeckLoader", fmt::format(
-            "While loading color map, the expected number of color values '{}' was "
+            "While loading color map '{}', the expected number of color values '{}' was "
             "different from the actual number of color values '{}'",
-            nColorLines, res.entries.size()
+            path, nColorLines, res.entries.size()
         ));
     }
 
     return res;
 }
 
-std::optional<ColorMap> loadCachedFile(std::filesystem::path path) {
-    std::ifstream file(path, std::ios::binary);
-    if (!file.good()) {
-        return std::nullopt;
-    }
-
-    int8_t fileVersion;
-    file.read(reinterpret_cast<char*>(&fileVersion), sizeof(int8_t));
-    if (fileVersion != ColorCacheFileVersion) {
-        // Incompatible version and we won't be able to read the file
-        return std::nullopt;
-    }
-
-    ColorMap result;
-
-    uint32_t nColors;
-    file.read(reinterpret_cast<char*>(&nColors), sizeof(uint32_t));
-    result.entries.reserve(nColors);
-    for (unsigned int i = 0; i < nColors; i += 1) {
-        glm::vec4 color;
-        file.read(reinterpret_cast<char*>(&color.x), sizeof(float));
-        file.read(reinterpret_cast<char*>(&color.y), sizeof(float));
-        file.read(reinterpret_cast<char*>(&color.z), sizeof(float));
-        file.read(reinterpret_cast<char*>(&color.w), sizeof(float));
-        result.entries.push_back(color);
-    }
-    return result;
-}
-
-void saveCachedFile(const ColorMap& colorMap, std::filesystem::path path) {
-    std::ofstream file(path, std::ofstream::binary);
-
-    file.write(reinterpret_cast<const char*>(&ColorCacheFileVersion), sizeof(int8_t));
-
-    uint32_t nColors = static_cast<uint32_t>(colorMap.entries.size());
-    file.write(reinterpret_cast<const char*>(&nColors), sizeof(uint32_t));
-    for (const glm::vec4& color : colorMap.entries) {
-        file.write(reinterpret_cast<const char*>(&color.x), sizeof(float));
-        file.write(reinterpret_cast<const char*>(&color.y), sizeof(float));
-        file.write(reinterpret_cast<const char*>(&color.z), sizeof(float));
-        file.write(reinterpret_cast<const char*>(&color.w), sizeof(float));
-    }
-}
-
-ColorMap loadFileWithCache(std::filesystem::path path, SkipAllZeroLines skipAllZeroLines)
-{
-    return internalLoadFileWithCache<ColorMap>(
-        path,
-        skipAllZeroLines,
-        &loadFile,
-        &loadCachedFile,
-        &saveCachedFile
-    );
-}
-
-} // namespace color
-
-int Dataset::index(std::string_view variableName) const {
-    for (const Dataset::Variable& v : variables) {
-        if (v.name == variableName) {
-            return v.index;
-        }
-    }
-    return -1;
-}
-
-bool Dataset::normalizeVariable(std::string_view variableName) {
-    std::optional<int> idx;
-    for (const Dataset::Variable& var : variables) {
-        if (var.name == variableName) {
-            idx = var.index;
-            break;
-        }
-    }
-
-    if (!idx.has_value()) {
-        // We didn't find the variable that was specified
-        return false;
-    }
-
-    float minValue = std::numeric_limits<float>::max();
-    float maxValue = -std::numeric_limits<float>::max();
-    for (Dataset::Entry& e : entries) {
-        minValue = std::min(minValue, e.data[*idx]);
-        maxValue = std::max(maxValue, e.data[*idx]);
-    }
-
-    for (Dataset::Entry& e : entries) {
-        e.data[*idx] = (e.data[*idx] - minValue) / (maxValue - minValue);
-    }
-
-    return true;
-}
-
-} // namespace openspace::speck
+} // namespace openspace::dataloader::speck
diff --git a/src/documentation/core_registration.cpp b/src/documentation/core_registration.cpp
index 5e8b02345c..bdec3fa0a9 100644
--- a/src/documentation/core_registration.cpp
+++ b/src/documentation/core_registration.cpp
@@ -24,6 +24,7 @@
 
 #include <openspace/documentation/core_registration.h>
 
+#include <openspace/data/datamapping.h>
 #include <openspace/documentation/documentationengine.h>
 #include <openspace/engine/logfactory.h>
 #include <openspace/engine/moduleengine.h>
@@ -38,7 +39,9 @@
 #include <openspace/navigation/navigationstate.h>
 #include <openspace/navigation/path.h>
 #include <openspace/network/parallelpeer.h>
+#include <openspace/rendering/colormappingcomponent.h>
 #include <openspace/rendering/dashboard.h>
+#include <openspace/rendering/labelscomponent.h>
 #include <openspace/rendering/renderable.h>
 #include <openspace/rendering/renderengine.h>
 #include <openspace/rendering/screenspacerenderable.h>
@@ -62,6 +65,8 @@ namespace openspace {
 void registerCoreClasses(documentation::DocumentationEngine& engine) {
     engine.addDocumentation(LogFactoryDocumentation());
 
+    engine.addDocumentation(ColorMappingComponent::Documentation());
+    engine.addDocumentation(LabelsComponent::Documentation());
     engine.addDocumentation(LightSource::Documentation());
     engine.addDocumentation(Mission::Documentation());
     engine.addDocumentation(Renderable::Documentation());
@@ -73,6 +78,8 @@ void registerCoreClasses(documentation::DocumentationEngine& engine) {
     engine.addDocumentation(Translation::Documentation());
     engine.addDocumentation(TimeFrame::Documentation());
 
+    engine.addDocumentation(dataloader::DataMapping::Documentation());
+
     engine.addDocumentation(interaction::NavigationState::Documentation());
     engine.addDocumentation(interaction::Path::Documentation());
 }
diff --git a/src/rendering/colormappingcomponent.cpp b/src/rendering/colormappingcomponent.cpp
new file mode 100644
index 0000000000..f20038b392
--- /dev/null
+++ b/src/rendering/colormappingcomponent.cpp
@@ -0,0 +1,470 @@
+/*****************************************************************************************
+ *                                                                                       *
+ * OpenSpace                                                                             *
+ *                                                                                       *
+ * Copyright (c) 2014-2023                                                               *
+ *                                                                                       *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
+ * software and associated documentation files (the "Software"), to deal in the Software *
+ * without restriction, including without limitation the rights to use, copy, modify,    *
+ * merge, publish, distribute, sublicense, and/or sell copies of the Software, and to    *
+ * permit persons to whom the Software is furnished to do so, subject to the following   *
+ * conditions:                                                                           *
+ *                                                                                       *
+ * The above copyright notice and this permission notice shall be included in all copies *
+ * or substantial portions of the Software.                                              *
+ *                                                                                       *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED,   *
+ * INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A         *
+ * PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT    *
+ * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF  *
+ * CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE  *
+ * OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                                         *
+ ****************************************************************************************/
+
+#include <openspace/rendering/colormappingcomponent.h>
+
+#include <openspace/documentation/documentation.h>
+#include <openspace/documentation/verifier.h>
+#include <ghoul/filesystem/filesystem.h>
+#include <ghoul/logging/logmanager.h>
+
+namespace {
+    constexpr std::string_view _loggerCat = "ColorMapping";
+
+    constexpr openspace::properties::Property::PropertyInfo EnabledInfo = {
+        "Enabled",
+        "Color Map Enabled",
+        "If this value is set to 'true', the provided color map is used (if one was "
+        "provided in the configuration). If no color map was provided, changing this "
+        "setting does not do anything",
+        openspace::properties::Property::Visibility::NoviceUser
+    };
+
+    constexpr openspace::properties::Property::PropertyInfo FileInfo = {
+        "File",
+        "Color Map File",
+        "The path to the color map file to use for coloring the points",
+        openspace::properties::Property::Visibility::AdvancedUser
+    };
+
+    constexpr openspace::properties::Property::PropertyInfo ParameterInfo = {
+        "Parameter",
+        "Parameter",
+        "This value determines which paramenter is used for coloring the points based "
+        "on the color map. The property is set based on predefined options specified in "
+        "the asset file. When changing the parameter, the value range to used for the"
+        "mapping will also be changed. Per default, it is set to the last parameter in "
+        "the list of options",
+        openspace::properties::Property::Visibility::User
+    };
+
+    constexpr openspace::properties::Property::PropertyInfo RangeInfo = {
+        "ValueRange",
+        "Value Range",
+        "This value changes the range of values to be mapped with the current color map",
+        openspace::properties::Property::Visibility::User
+    };
+
+    constexpr openspace::properties::Property::PropertyInfo SetRangeFromDataInfo = {
+        "SetRangeFromData",
+        "Set Data Range from Data",
+        "Set the data range for the color mapping based on the available data for the "
+        "curently selected data column",
+        openspace::properties::Property::Visibility::User
+    };
+
+    constexpr openspace::properties::Property::PropertyInfo HideOutsideInfo = {
+        "HideValuesOutsideRange",
+        "Hide Values Outside Range",
+        "If true, points with values outside the provided range for the coloring will be "
+        "hidden, i.e. not rendered at all",
+        openspace::properties::Property::Visibility::AdvancedUser
+    };
+
+    constexpr openspace::properties::Property::PropertyInfo UseNoDataColorInfo = {
+        "ShowMissingData",
+        "Show Missing Data",
+        "If true, use a separate color (see NoDataColor) for items with values "
+        "corresponding to missing data values",
+        openspace::properties::Property::Visibility::User
+    };
+
+    constexpr openspace::properties::Property::PropertyInfo NoDataColorInfo = {
+        "NoDataColor",
+        "No Data Color",
+        "The color to use for items with values corresponding to missing data values, "
+        "if enabled. This color can also be read from the color map, but setting this "
+        "value overrides any value in the color map. If a color value for the below "
+        "range values is provided, the ShowMissingData property will automatically be "
+        "set to true",
+        openspace::properties::Property::Visibility::User
+    };
+
+    constexpr openspace::properties::Property::PropertyInfo UseAboveRangeColorInfo = {
+        "UseAboveRangeColor",
+        "Use Above Range Color",
+        "If true, use a separate color (see AboveRangeColor) for items with values "
+        "larger than the one in the provided data range. Otherwise, the values will "
+        "be clamped to use the color at the upper limit of the color map. If a color is "
+        "provided in the color map, this value will automatically be set to true",
+        openspace::properties::Property::Visibility::AdvancedUser
+    };
+
+    constexpr openspace::properties::Property::PropertyInfo AboveRangeColorInfo = {
+        "AboveRangeColor",
+        "Above Range Color",
+        "The color to use for items with values larger than the one in the provided "
+        "data range, if enabled. This color can also be read from the color map, but "
+        "setting this value overrides any value in the color map. If a color value for "
+        "the above range values is provided, the UseAboveRangeColor property will "
+        "automatically be set to true",
+        openspace::properties::Property::Visibility::AdvancedUser
+    };
+
+    constexpr openspace::properties::Property::PropertyInfo UseBelowRangeColorInfo = {
+        "UseBelowRangeColor",
+        "Use Below Range Color",
+        "If true, use a separate color (see BelowRangeColor) for items with values "
+        "smaller than the one in the provided data range. Otherwise, the values will "
+        "be clamped to use the color at the lower limit of the color map. If a color is "
+        "provided in the color map, this value will automatically be set to true",
+        openspace::properties::Property::Visibility::AdvancedUser
+    };
+
+    constexpr openspace::properties::Property::PropertyInfo BelowRangeColorInfo = {
+        "BelowRangeColor",
+        "Below Range Color",
+        "The color to use for items with values smaller than the one in the provided "
+        "data range, if enabled. This color can also be read from the color map, but "
+        "setting this value overrides any value in the color map. If a color value for "
+        "the below range values is provided, the UseBelowRangeColor property will "
+        "automatically be set to true",
+        openspace::properties::Property::Visibility::AdvancedUser
+    };
+
+    struct [[codegen::Dictionary(ColorMappingComponent)]] Parameters {
+        // [[codegen::verbatim(EnabledInfo.description)]]
+        std::optional<bool> enabled;
+
+        // [[codegen::verbatim(FileInfo.description)]]
+        std::optional<std::string> file;
+
+        struct ColorMapParameter {
+            // The key for the data variable to use for color
+            std::string key;
+
+            // An optional value range to use for coloring when this option is selected.
+            // If not included, the range will be set from the min and max value in the
+            // dataset
+            std::optional<glm::vec2> range;
+        };
+        // A list of options for color parameters to use for color mapping, that will
+        // appear as options in the drop-down menu in the user interface. Per default,
+        // the first option in the list is selected. Each option is a table in the form
+        // { Key = \"theKey\", Range = {min, max} }, where the value range is optional.
+        // If added, this range will automatically be set when the option is selected
+        std::optional<std::vector<ColorMapParameter>> parameterOptions;
+
+        // [[codegen::verbatim(ParameterInfo.description)]]
+        std::optional<std::string> parameter;
+
+        // [[codegen::verbatim(RangeInfo.description)]]
+        std::optional<glm::vec2> valueRange;
+
+        // [[codegen::verbatim(HideOutsideInfo.description)]]
+        std::optional<bool> hideValuesOutsideRange;
+
+        // [[codegen::verbatim(UseNoDataColorInfo.description)]]
+        std::optional<bool> showMissingData;
+
+        // [[codegen::verbatim(NoDataColorInfo.description)]]
+        std::optional<glm::vec4> noDataColor [[codegen::color()]];
+
+        // [[codegen::verbatim(UseAboveRangeColorInfo.description)]]
+        std::optional<bool> useAboveRangeColor;
+
+        // [[codegen::verbatim(AboveRangeColorInfo.description)]]
+        std::optional<glm::vec4> aboveRangeColor [[codegen::color()]];
+
+        // [[codegen::verbatim(UseBelowRangeColorInfo.description)]]
+        std::optional<bool> useBelowRangeColor;
+
+        // [[codegen::verbatim(BelowRangeColorInfo.description)]]
+        std::optional<glm::vec4> belowRangeColor [[codegen::color()]];
+    };
+#include "colormappingcomponent_codegen.cpp"
+}  // namespace
+
+namespace openspace {
+
+documentation::Documentation ColorMappingComponent::Documentation() {
+    return codegen::doc<Parameters>("colormappingcomponent");
+}
+
+ColorMappingComponent::ColorMappingComponent()
+    : properties::PropertyOwner({ "ColorMapping", "Color Mapping", "" })
+    , enabled(EnabledInfo, true)
+    , dataColumn(ParameterInfo, properties::OptionProperty::DisplayType::Dropdown)
+    , colorMapFile(FileInfo)
+    , valueRange(RangeInfo, glm::vec2(0.f))
+    , setRangeFromData(SetRangeFromDataInfo)
+    , hideOutsideRange(HideOutsideInfo, false)
+    , useNanColor(UseNoDataColorInfo, false)
+    , nanColor(
+        NoDataColorInfo,
+        glm::vec4(0.5f, 0.5f, 0.5f, 1.f),
+        glm::vec4(0.f),
+        glm::vec4(1.f)
+    )
+    , useAboveRangeColor(UseAboveRangeColorInfo, false)
+    , aboveRangeColor(AboveRangeColorInfo, glm::vec4(1.f), glm::vec4(0.f), glm::vec4(1.f))
+    , useBelowRangeColor(UseBelowRangeColorInfo, false)
+    , belowRangeColor(BelowRangeColorInfo, glm::vec4(1.f), glm::vec4(0.f), glm::vec4(1.f))
+{
+    addProperty(enabled);
+    addProperty(dataColumn);
+
+    addProperty(valueRange);
+    addProperty(setRangeFromData);
+
+    colorMapFile.setReadOnly(true); // Currently this can't be changed
+    addProperty(colorMapFile);
+
+    addProperty(hideOutsideRange);
+    addProperty(useNanColor);
+    nanColor.setViewOption(properties::Property::ViewOptions::Color);
+    addProperty(nanColor);
+
+    addProperty(useAboveRangeColor);
+    aboveRangeColor.setViewOption(properties::Property::ViewOptions::Color);
+    addProperty(aboveRangeColor);
+
+    addProperty(useBelowRangeColor);
+    belowRangeColor.setViewOption(properties::Property::ViewOptions::Color);
+    addProperty(belowRangeColor);
+}
+
+ColorMappingComponent::ColorMappingComponent(const ghoul::Dictionary& dictionary)
+    : ColorMappingComponent()
+{
+    const Parameters p = codegen::bake<Parameters>(dictionary);
+
+    enabled = p.enabled.value_or(enabled);
+
+    if (p.parameterOptions.has_value()) {
+        std::vector<Parameters::ColorMapParameter> opts = *p.parameterOptions;
+
+        _colorRangeData.reserve(opts.size());
+        for (size_t i = 0; i < opts.size(); ++i) {
+            dataColumn.addOption(static_cast<int>(i), opts[i].key);
+            // Add the provided range or an empty range. We will fill it later on,
+            // when the dataset is loaded, if it is empty
+            _colorRangeData.push_back(opts[i].range.value_or(glm::vec2(0.f)));
+        }
+    }
+
+    dataColumn.onChange([this]() {
+        valueRange = _colorRangeData[dataColumn.value()];
+    });
+
+    _providedParameter = p.parameter;
+    _providedRange = p.valueRange;
+
+    hideOutsideRange = p.hideValuesOutsideRange.value_or(hideOutsideRange);
+
+    useNanColor = p.showMissingData.value_or(useNanColor);
+    if (p.noDataColor.has_value()) {
+        useNanColor = p.showMissingData.value_or(true);
+        nanColor = *p.noDataColor;
+        _hasNanColorInAsset = true;
+    }
+
+    useAboveRangeColor = p.useAboveRangeColor.value_or(useAboveRangeColor);
+    if (p.aboveRangeColor.has_value()) {
+        useAboveRangeColor = p.useAboveRangeColor.value_or(true);
+        aboveRangeColor = *p.aboveRangeColor;
+        _hasAboveRangeColorInAsset = true;
+    }
+
+    useBelowRangeColor = p.useBelowRangeColor.value_or(useBelowRangeColor);
+    if (p.belowRangeColor.has_value()) {
+        useBelowRangeColor = p.useBelowRangeColor.value_or(true);
+        belowRangeColor = *p.belowRangeColor;
+        _hasBelowRangeColorInAsset = true;
+    }
+
+    if (p.file.has_value()) {
+        colorMapFile = absPath(*p.file).string();
+    }
+}
+
+ghoul::opengl::Texture* ColorMappingComponent::texture() const {
+    return _texture.get();
+}
+
+void ColorMappingComponent::initialize(const dataloader::Dataset& dataset) {
+    _colorMap = dataloader::color::loadFileWithCache(colorMapFile.value());
+
+    initializeParameterData(dataset);
+
+    if (_colorMap.nanColor.has_value() && !_hasNanColorInAsset) {
+        nanColor = *_colorMap.nanColor;
+        useNanColor = true; // @ TODO: Avoid overriding value set in asset? (also for useBelow and useAbove)
+    }
+
+    if (_colorMap.belowRangeColor.has_value() && !_hasBelowRangeColorInAsset) {
+        belowRangeColor = *_colorMap.belowRangeColor;
+        useBelowRangeColor = true;
+    }
+
+    if (_colorMap.aboveRangeColor.has_value() && !_hasAboveRangeColorInAsset) {
+        aboveRangeColor = *_colorMap.aboveRangeColor;
+        useAboveRangeColor = true;
+    }
+}
+
+void ColorMappingComponent::initializeTexture() {
+    if (_colorMap.entries.empty()) {
+        return;
+    }
+
+    unsigned int width = static_cast<unsigned int>(_colorMap.entries.size());
+    unsigned int height = 1;
+    unsigned int size = width * height;
+    std::vector<GLubyte> img;
+    img.reserve(size * 4);
+
+    for (const glm::vec4& c : _colorMap.entries) {
+        img.push_back(static_cast<GLubyte>(255 * c.r));
+        img.push_back(static_cast<GLubyte>(255 * c.g));
+        img.push_back(static_cast<GLubyte>(255 * c.b));
+        img.push_back(static_cast<GLubyte>(255 * c.a));
+    }
+
+    _texture = std::make_unique<ghoul::opengl::Texture>(
+        glm::uvec3(width, height, 1),
+        GL_TEXTURE_1D,
+        ghoul::opengl::Texture::Format::RGBA
+
+    );
+
+    // TODO: update this for linear mapping?
+    _texture->setFilter(ghoul::opengl::Texture::FilterMode::Nearest);
+    _texture->setWrapping(ghoul::opengl::Texture::WrappingMode::ClampToEdge);
+    _texture->setPixelData(
+        reinterpret_cast<char*>(img.data()),
+        ghoul::opengl::Texture::TakeOwnership::No
+    );
+
+    _texture->uploadTexture();
+}
+
+glm::vec4 ColorMappingComponent::colorFromColorMap(float valueToColorFrom) const {
+    glm::vec2 currentColorRange = valueRange;
+    float cmax = currentColorRange.y;
+    float cmin = currentColorRange.x;
+
+    float nColors = static_cast<float>(_colorMap.entries.size());
+
+    bool isOutsideMin = valueToColorFrom < cmin;
+    bool isOutsideMax = valueToColorFrom > cmax;
+
+    if (hideOutsideRange && (isOutsideMin || isOutsideMax)) {
+        return glm::vec4(0.f);
+    }
+
+    if (useNanColor && std::isnan(valueToColorFrom)) {
+        return nanColor;
+    }
+
+    // Find color value using Nearest neighbor (same as texture)
+    float normalization = (cmax != cmin) ? (nColors) / (cmax - cmin) : 0;
+    int colorIndex = static_cast<int>((valueToColorFrom - cmin) * normalization);
+
+    // Clamp color index to valid range
+    colorIndex = std::max(colorIndex, 0);
+    colorIndex = std::min(colorIndex, static_cast<int>(nColors) - 1);
+
+    return _colorMap.entries[colorIndex];
+}
+
+void ColorMappingComponent::initializeParameterData(const dataloader::Dataset& dataset) {
+    // Initialize empty ranges based on values in the dataset
+    for (const properties::OptionProperty::Option& option : dataColumn.options()) {
+        int optionIndex = option.value;
+        int colorParameterIndex = dataset.index(option.description);
+
+        glm::vec2& range = _colorRangeData[optionIndex];
+        if (glm::length(range) < glm::epsilon<float>()) {
+            range = dataset.findValueRange(colorParameterIndex);
+        }
+    }
+
+    // Index to keep track of the potentially provided default option for the parameter
+    int indexOfProvidedOption = -1;
+
+    // If no options were added, add each dataset parameter and its range as options
+    if (dataColumn.options().empty() && !dataset.entries.empty()) {
+        int i = 0;
+        _colorRangeData.reserve(dataset.variables.size());
+        for (const dataloader::Dataset::Variable& v : dataset.variables) {
+            dataColumn.addOption(i, v.name);
+            _colorRangeData.push_back(dataset.findValueRange(v.index));
+
+            // While iterating over options, try to find the one provided, if any
+            if (_providedParameter.has_value() && *_providedParameter == v.name) {
+                indexOfProvidedOption = i;
+            }
+
+            i++;
+        }
+    }
+    else {
+        // Otherwise, check if the selected columns exist
+        for (size_t i = 0; i < dataColumn.options().size(); ++i) {
+            std::string o = dataColumn.options()[i].description;
+
+            bool found = false;
+            for (const dataloader::Dataset::Variable& v : dataset.variables) {
+                if (v.name == o) {
+                    found = true;
+                    break;
+                }
+            }
+
+            if (!found) {
+                LWARNING(fmt::format(
+                    "Dataset does not contain specified parameter '{}'", o
+                ));
+            }
+            // While iterating over options, try to find the one provided, if any
+            else if (_providedParameter.has_value() && *_providedParameter == o) {
+                indexOfProvidedOption = i;
+            }
+        }
+    }
+
+    if (_providedParameter.has_value()) {
+        if (indexOfProvidedOption == -1) {
+            LERROR(fmt::format(
+                "Error when reading Parameter. Could not find provided parameter '{}' in "
+                "list of parameter options", *_providedParameter
+            ));
+        }
+        else {
+            dataColumn = indexOfProvidedOption;
+        }
+    }
+
+    // Set the value range to correspond to the selected data column, or the one set by
+    // the user
+    if (_providedRange.has_value()) {
+        valueRange = *_providedRange;
+    }
+    else {
+        valueRange = _colorRangeData[dataColumn.value()];
+    }
+}
+
+} // namespace openspace
diff --git a/modules/space/labelscomponent.cpp b/src/rendering/labelscomponent.cpp
similarity index 92%
rename from modules/space/labelscomponent.cpp
rename to src/rendering/labelscomponent.cpp
index 3beb097f64..983d5c8285 100644
--- a/modules/space/labelscomponent.cpp
+++ b/src/rendering/labelscomponent.cpp
@@ -22,7 +22,7 @@
  * OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                                         *
  ****************************************************************************************/
 
-#include <modules/space/labelscomponent.h>
+#include <openspace/rendering/labelscomponent.h>
 
 #include <openspace/engine/globals.h>
 #include <openspace/engine/windowdelegate.h>
@@ -107,6 +107,12 @@ namespace {
         // [[codegen::verbatim(FileInfo.description)]]
         std::filesystem::path file;
 
+        // If true (default), the loaded labels file will be cached so that it can be
+        // loaded faster at a later time. Note that this also means that changes in the
+        // file will not be registered until the cached file is deleted. Set to false
+        // to disable chaching and always do a fresh load of the label file
+        std::optional<bool> useCaching;
+
         // The opacity of the labels
         std::optional<float> opacity [[codegen::inrange(0.0, 1.0)]];
 
@@ -145,7 +151,7 @@ namespace {
 namespace openspace {
 
 documentation::Documentation LabelsComponent::Documentation() {
-    return codegen::doc<Parameters>("space_labelscomponent");
+    return codegen::doc<Parameters>("labelscomponent");
 }
 
 LabelsComponent::LabelsComponent(const ghoul::Dictionary& dictionary)
@@ -165,6 +171,7 @@ LabelsComponent::LabelsComponent(const ghoul::Dictionary& dictionary)
     const Parameters p = codegen::bake<Parameters>(dictionary);
 
     _labelFile = absPath(p.file);
+    _useCache = p.useCaching.value_or(true);
 
     if (p.unit.has_value()) {
         _unit = codegen::map<DistanceUnit>(*p.unit);
@@ -216,11 +223,11 @@ LabelsComponent::LabelsComponent(const ghoul::Dictionary& dictionary)
     _transformationMatrix = p.transformationMatrix.value_or(_transformationMatrix);
 }
 
-speck::Labelset& LabelsComponent::labelSet() {
+dataloader::Labelset& LabelsComponent::labelSet() {
     return _labelset;
 }
 
-const speck::Labelset& LabelsComponent::labelSet() const {
+const dataloader::Labelset& LabelsComponent::labelSet() const {
     return _labelset;
 }
 
@@ -235,7 +242,12 @@ void LabelsComponent::initialize() {
 
 void LabelsComponent::loadLabels() {
     LINFO(fmt::format("Loading label file {}", _labelFile));
-    _labelset = speck::label::loadFileWithCache(_labelFile);
+    if (_useCache) {
+        _labelset = dataloader::label::loadFileWithCache(_labelFile);
+    }
+    else {
+        _labelset = dataloader::label::loadFile(_labelFile);
+    }
 }
 
 bool LabelsComponent::isReady() const {
@@ -273,7 +285,7 @@ void LabelsComponent::render(const RenderData& data,
 
     glm::vec4 textColor = glm::vec4(glm::vec3(_color), opacity() * fadeInVariable);
 
-    for (const speck::Labelset::Entry& e : _labelset.entries) {
+    for (const dataloader::Labelset::Entry& e : _labelset.entries) {
         if (!e.isEnabled) {
             continue;
         }

From 9c77a1226992d22670a49768ae937fd9b11e7369 Mon Sep 17 00:00:00 2001
From: Emma Broman <emma.broman@liu.se>
Date: Wed, 20 Dec 2023 08:28:07 +0100
Subject: [PATCH 212/701] Issue/2665 - Show timer for how long time left in
 camera path (#2980)

* Add a camera path topic and compute remaining time in path

* Remove unused parameter in function

* Include speed scale in estimation of time the path will take

* Includes cleanup and address review comments

* Round instead of ceil, to make countdown reach 0 in most cases

* Update GUI hash
---
 data/assets/util/webgui.asset                 |   2 +-
 include/openspace/navigation/path.h           |  22 +++-
 include/openspace/navigation/pathnavigator.h  |   5 +-
 modules/server/CMakeLists.txt                 |   2 +
 .../server/include/topics/camerapathtopic.h   |  55 +++++++++
 modules/server/include/topics/cameratopic.h   |   2 +-
 .../server/include/topics/skybrowsertopic.h   |   2 +-
 modules/server/include/topics/timetopic.h     |   2 +-
 modules/server/src/connection.cpp             |   2 +
 modules/server/src/topics/camerapathtopic.cpp | 113 ++++++++++++++++++
 modules/server/src/topics/cameratopic.cpp     |   8 +-
 src/navigation/path.cpp                       |  40 ++++---
 src/navigation/pathnavigator.cpp              |  12 +-
 13 files changed, 237 insertions(+), 30 deletions(-)
 create mode 100644 modules/server/include/topics/camerapathtopic.h
 create mode 100644 modules/server/src/topics/camerapathtopic.cpp

diff --git a/data/assets/util/webgui.asset b/data/assets/util/webgui.asset
index 19d82a7ee5..566f87adff 100644
--- a/data/assets/util/webgui.asset
+++ b/data/assets/util/webgui.asset
@@ -4,7 +4,7 @@ local guiCustomization = asset.require("customization/gui")
 
 
 -- Select which commit hashes to use for the frontend and backend
-local frontendHash = "a2139b8cf589daf846fb3ef3f4953bc591e66dcb"
+local frontendHash = "563b65b3043f798c9efe76787454c38ccccd2aaf"
 
 local frontend = asset.resource({
   Identifier = "WebGuiFrontend",
diff --git a/include/openspace/navigation/path.h b/include/openspace/navigation/path.h
index 5be7c88fca..6371cd0633 100644
--- a/include/openspace/navigation/path.h
+++ b/include/openspace/navigation/path.h
@@ -53,7 +53,7 @@ public:
     };
 
     Path(Waypoint start, Waypoint end, Type type,
-        std::optional<double> duration = std::nullopt);
+        std::optional<float> duration = std::nullopt);
 
     Waypoint startPoint() const;
     Waypoint endPoint() const;
@@ -63,6 +63,21 @@ public:
      */
     double pathLength() const;
 
+    /**
+     * Return the remaining distance to traverse, in meters.
+     */
+    double remainingDistance() const;
+
+    /**
+     * Estimate a value for the remaining time to reach the target, based on the
+     * currently progressed time and the estimation for how long the path will
+     * take to traverse. Note that the computation is not exact.
+     *
+     * \param speedScale The speed scale factor that may affect how fast the camera moves
+     * \return The estimated remaining time
+     */
+    float estimatedRemainingTime(float speedScale) const;
+
     /**
      * Return a vector of positions corresponding to the control points of the path's
      * spline curve.
@@ -170,11 +185,12 @@ private:
 
     std::unique_ptr<PathCurve> _curve;
 
-    double _speedFactorFromDuration = 1.0;
+    float _speedFactorFromDuration = 1.f;
+    float _expectedDuration = 0.f;
 
     // Playback variables
     double _traveledDistance = 0.0; // Meters
-    double _progressedTime = 0.0; // Time since playback started (seconds)
+    float _progressedTime = 0.f; // Time since playback started (seconds)
     bool _shouldQuit = false;
     CameraPose _prevPose;
 };
diff --git a/include/openspace/navigation/pathnavigator.h b/include/openspace/navigation/pathnavigator.h
index 1cd6082035..a8d1897cac 100644
--- a/include/openspace/navigation/pathnavigator.h
+++ b/include/openspace/navigation/pathnavigator.h
@@ -64,6 +64,9 @@ public:
     bool hasCurrentPath() const;
     bool hasFinished() const;
     bool isPlayingPath() const;
+    bool isPaused() const;
+
+    float estimatedRemainingTimeInPath() const;
 
     void updateCamera(double deltaTime);
     void createPath(const ghoul::Dictionary& dictionary);
@@ -102,7 +105,7 @@ private:
      */
     void findRelevantNodes();
 
-    void removeRollRotation(CameraPose& pose, double deltaTime);
+    void removeRollRotation(CameraPose& pose);
 
     std::unique_ptr<Path> _currentPath = nullptr;
     bool _isPlaying = false;
diff --git a/modules/server/CMakeLists.txt b/modules/server/CMakeLists.txt
index 2b17c10d38..3ce2d56ff8 100644
--- a/modules/server/CMakeLists.txt
+++ b/modules/server/CMakeLists.txt
@@ -33,6 +33,7 @@ set(HEADER_FILES
   include/serverinterface.h
   include/topics/authorizationtopic.h
   include/topics/bouncetopic.h
+  include/topics/camerapathtopic.h
   include/topics/cameratopic.h
   include/topics/documentationtopic.h
   include/topics/enginemodetopic.h
@@ -60,6 +61,7 @@ set(SOURCE_FILES
   src/serverinterface.cpp
   src/topics/authorizationtopic.cpp
   src/topics/bouncetopic.cpp
+  src/topics/camerapathtopic.cpp
   src/topics/cameratopic.cpp
   src/topics/documentationtopic.cpp
   src/topics/enginemodetopic.cpp
diff --git a/modules/server/include/topics/camerapathtopic.h b/modules/server/include/topics/camerapathtopic.h
new file mode 100644
index 0000000000..58c4d3ba36
--- /dev/null
+++ b/modules/server/include/topics/camerapathtopic.h
@@ -0,0 +1,55 @@
+/*****************************************************************************************
+ *                                                                                       *
+ * OpenSpace                                                                             *
+ *                                                                                       *
+ * Copyright (c) 2014-2023                                                               *
+ *                                                                                       *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
+ * software and associated documentation files (the "Software"), to deal in the Software *
+ * without restriction, including without limitation the rights to use, copy, modify,    *
+ * merge, publish, distribute, sublicense, and/or sell copies of the Software, and to    *
+ * permit persons to whom the Software is furnished to do so, subject to the following   *
+ * conditions:                                                                           *
+ *                                                                                       *
+ * The above copyright notice and this permission notice shall be included in all copies *
+ * or substantial portions of the Software.                                              *
+ *                                                                                       *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED,   *
+ * INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A         *
+ * PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT    *
+ * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF  *
+ * CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE  *
+ * OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                                         *
+ ****************************************************************************************/
+
+#ifndef __OPENSPACE_MODULE_SERVER___CAMERAPATHTOPIC___H__
+#define __OPENSPACE_MODULE_SERVER___CAMERAPATHTOPIC___H__
+
+#include <modules/server/include/topics/topic.h>
+#include <chrono>
+
+namespace openspace {
+
+class CameraPathTopic : public Topic {
+public:
+    CameraPathTopic();
+    ~CameraPathTopic() override;
+
+    void handleJson(const nlohmann::json& json) override;
+    bool isDone() const override;
+
+private:
+    static constexpr int UnsetOnChangeHandle = -1;
+
+    void sendCameraPathData();
+
+    int _dataCallbackHandle = UnsetOnChangeHandle;
+    bool _isDone = false;
+    std::chrono::system_clock::time_point _lastUpdateTime;
+
+    std::chrono::milliseconds _cameraPathUpdateTime = std::chrono::milliseconds(100);
+};
+
+} // namespace openspace
+
+#endif // __OPENSPACE_MODULE_SERVER___CAMERAPATHTOPIC___H__
diff --git a/modules/server/include/topics/cameratopic.h b/modules/server/include/topics/cameratopic.h
index 6aada0f62d..5cc4d60d81 100644
--- a/modules/server/include/topics/cameratopic.h
+++ b/modules/server/include/topics/cameratopic.h
@@ -39,7 +39,7 @@ public:
     bool isDone() const override;
 
 private:
-    const int UnsetOnChangeHandle = -1;
+    static constexpr int UnsetOnChangeHandle = -1;
 
     void sendCameraData();
 
diff --git a/modules/server/include/topics/skybrowsertopic.h b/modules/server/include/topics/skybrowsertopic.h
index 312e68e70e..c9e8165277 100644
--- a/modules/server/include/topics/skybrowsertopic.h
+++ b/modules/server/include/topics/skybrowsertopic.h
@@ -39,7 +39,7 @@ public:
     bool isDone() const override;
 
 private:
-    const int UnsetOnChangeHandle = -1;
+    static constexpr int UnsetOnChangeHandle = -1;
 
     void sendBrowserData();
 
diff --git a/modules/server/include/topics/timetopic.h b/modules/server/include/topics/timetopic.h
index af01e72ed3..d1f4e0be9d 100644
--- a/modules/server/include/topics/timetopic.h
+++ b/modules/server/include/topics/timetopic.h
@@ -39,7 +39,7 @@ public:
     bool isDone() const override;
 
 private:
-    const int UnsetOnChangeHandle = -1;
+    static constexpr int UnsetOnChangeHandle = -1;
 
     const nlohmann::json getNextPrevDeltaTimeStepJson();
 
diff --git a/modules/server/src/connection.cpp b/modules/server/src/connection.cpp
index 5ed46e0eed..8e6dfc1c01 100644
--- a/modules/server/src/connection.cpp
+++ b/modules/server/src/connection.cpp
@@ -26,6 +26,7 @@
 
 #include <modules/server/include/topics/authorizationtopic.h>
 #include <modules/server/include/topics/bouncetopic.h>
+#include <modules/server/include/topics/camerapathtopic.h>
 #include <modules/server/include/topics/cameratopic.h>
 #include <modules/server/include/topics/documentationtopic.h>
 #include <modules/server/include/topics/enginemodetopic.h>
@@ -99,6 +100,7 @@ Connection::Connection(std::unique_ptr<ghoul::io::Socket> s, std::string address
     _topicFactory.registerClass<VersionTopic>("version");
     _topicFactory.registerClass<SkyBrowserTopic>("skybrowser");
     _topicFactory.registerClass<CameraTopic>("camera");
+    _topicFactory.registerClass<CameraPathTopic>("cameraPath");
 }
 
 void Connection::handleMessage(const std::string& message) {
diff --git a/modules/server/src/topics/camerapathtopic.cpp b/modules/server/src/topics/camerapathtopic.cpp
new file mode 100644
index 0000000000..f1b98e4439
--- /dev/null
+++ b/modules/server/src/topics/camerapathtopic.cpp
@@ -0,0 +1,113 @@
+/*****************************************************************************************
+ *                                                                                       *
+ * OpenSpace                                                                             *
+ *                                                                                       *
+ * Copyright (c) 2014-2023                                                               *
+ *                                                                                       *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
+ * software and associated documentation files (the "Software"), to deal in the Software *
+ * without restriction, including without limitation the rights to use, copy, modify,    *
+ * merge, publish, distribute, sublicense, and/or sell copies of the Software, and to    *
+ * permit persons to whom the Software is furnished to do so, subject to the following   *
+ * conditions:                                                                           *
+ *                                                                                       *
+ * The above copyright notice and this permission notice shall be included in all copies *
+ * or substantial portions of the Software.                                              *
+ *                                                                                       *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED,   *
+ * INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A         *
+ * PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT    *
+ * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF  *
+ * CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE  *
+ * OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                                         *
+ ****************************************************************************************/
+
+#include <modules/server/include/topics/camerapathtopic.h>
+
+#include <modules/server/include/connection.h>
+#include <modules/server/servermodule.h>
+#include <openspace/engine/globals.h>
+#include <openspace/engine/moduleengine.h>
+#include <openspace/engine/openspaceengine.h>
+#include <openspace/navigation/navigationhandler.h>
+#include <openspace/navigation/path.h>
+#include <openspace/navigation/pathnavigator.h>
+#include <ghoul/logging/logmanager.h>
+
+namespace {
+    constexpr std::string_view SubscribeEvent = "start_subscription";
+} // namespace
+
+using nlohmann::json;
+
+namespace openspace {
+
+CameraPathTopic::CameraPathTopic()
+    : _lastUpdateTime(std::chrono::system_clock::now())
+{}
+
+CameraPathTopic::~CameraPathTopic() {
+    if (_dataCallbackHandle != UnsetOnChangeHandle) {
+        ServerModule* module = global::moduleEngine->module<ServerModule>();
+        if (module) {
+            module->removePreSyncCallback(_dataCallbackHandle);
+        }
+    }
+}
+
+bool CameraPathTopic::isDone() const {
+    return _isDone;
+}
+
+void CameraPathTopic::handleJson(const nlohmann::json& json) {
+    std::string event = json.at("event").get<std::string>();
+
+    if (event != SubscribeEvent) {
+        _isDone = true;
+        return;
+    }
+
+    ServerModule* module = global::moduleEngine->module<ServerModule>();
+    _dataCallbackHandle = module->addPreSyncCallback(
+        [this]() {
+            bool isInPath = (global::openSpaceEngine->currentMode()
+                == OpenSpaceEngine::Mode::CameraPath);
+
+            std::chrono::system_clock::time_point now = std::chrono::system_clock::now();
+            if (isInPath && (now - _lastUpdateTime) > _cameraPathUpdateTime) {
+                sendCameraPathData();
+                _lastUpdateTime = std::chrono::system_clock::now();
+            }
+        }
+    );
+}
+
+void CameraPathTopic::sendCameraPathData() {
+    const interaction::PathNavigator& pathNavigator =
+        global::navigationHandler->pathNavigator();
+
+    const interaction::Path* path = pathNavigator.currentPath();
+
+    if (!path) {
+        ghoul_assert(path, "Path must exist");
+        return;
+    }
+
+    // The time is not exact, and we only care about the number of seconds. Also,
+    // any negative values should be interpreted as positive
+    int seconds = static_cast<int>(
+        std::round(pathNavigator.estimatedRemainingTimeInPath())
+    );
+    seconds = std::max(seconds, 0);
+
+    nlohmann::json jsonData = {
+        { "target", path->endPoint().nodeIdentifier() },
+        { "remainingTime", seconds },
+        //{ "remainingDistance", path->remainingDistance() },
+        { "isPaused", pathNavigator.isPaused() }
+    };
+
+    _connection->sendJson(wrappedPayload(jsonData));
+}
+
+} // namespace openspace
diff --git a/modules/server/src/topics/cameratopic.cpp b/modules/server/src/topics/cameratopic.cpp
index 2dc5b6a01e..8170ec2b2c 100644
--- a/modules/server/src/topics/cameratopic.cpp
+++ b/modules/server/src/topics/cameratopic.cpp
@@ -22,16 +22,14 @@
  * OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                                         *
  ****************************************************************************************/
 
-#include "modules/server/include/topics/cameratopic.h"
+#include <modules/server/include/topics/cameratopic.h>
 
+#include <modules/globebrowsing/globebrowsingmodule.h>
 #include <modules/server/include/connection.h>
 #include <modules/server/servermodule.h>
-#include <modules/globebrowsing/globebrowsingmodule.h>
-#include <modules/globebrowsing/src/dashboarditemglobelocation.h>
 #include <openspace/engine/moduleengine.h>
 #include <openspace/engine/globals.h>
 #include <openspace/properties/property.h>
-#include <openspace/query/query.h>
 #include <openspace/util/distanceconversion.h>
 #include <ghoul/logging/logmanager.h>
 
@@ -81,8 +79,6 @@ void CameraTopic::handleJson(const nlohmann::json& json) {
 }
 
 void CameraTopic::sendCameraData() {
-    using namespace openspace;
-
     GlobeBrowsingModule* module = global::moduleEngine->module<GlobeBrowsingModule>();
     glm::dvec3 position = module->geoPosition();
     std::pair<double, std::string_view> altSimplified = simplifyDistance(position.z);
diff --git a/src/navigation/path.cpp b/src/navigation/path.cpp
index a796b46595..abeb9ec85c 100644
--- a/src/navigation/path.cpp
+++ b/src/navigation/path.cpp
@@ -102,7 +102,7 @@ documentation::Documentation Path::Documentation() {
     return codegen::doc<Parameters>("core_path_instruction");
 }
 
-Path::Path(Waypoint start, Waypoint end, Type type, std::optional<double> duration)
+Path::Path(Waypoint start, Waypoint end, Type type, std::optional<float> duration)
     : _start(start)
     , _end(end)
     , _type(type)
@@ -122,25 +122,29 @@ Path::Path(Waypoint start, Waypoint end, Type type, std::optional<double> durati
 
     _prevPose = _start.pose();
 
-    // Compute speed factor to match any given duration, by traversing the path and
-    // computing how much faster/slower it should be
+    // Estimate how long time the camera path will take to traverse
+    constexpr double dt = 0.05; // 20 fps
+    while (!hasReachedEnd()) {
+        traversePath(dt);
+    }
+    float estimatedDuration = _progressedTime;
+    resetPlaybackVariables();
+
+    // We now know how long it took to traverse the path. Use that to compute the
+    // speed factor to match any given duration
     _speedFactorFromDuration = 1.0;
     if (duration.has_value()) {
         if (*duration > 0.0) {
-            constexpr double dt = 0.05; // 20 fps
-            while (!hasReachedEnd()) {
-                traversePath(dt);
-            }
-
-            // We now know how long it took to traverse the path. Use that
-            _speedFactorFromDuration = _progressedTime / *duration;
-            resetPlaybackVariables();
+            _speedFactorFromDuration = estimatedDuration / *duration;
+            estimatedDuration = *duration;
         }
         else {
             // A duration of zero means infinite speed. Handle this explicity
-            _speedFactorFromDuration = std::numeric_limits<double>::infinity();
+            _speedFactorFromDuration = std::numeric_limits<float>::infinity();
+            estimatedDuration = 0.f;
         }
     }
+    _expectedDuration = estimatedDuration;
 }
 
 Waypoint Path::startPoint() const {
@@ -155,6 +159,14 @@ double Path::pathLength() const {
     return _curve->length();
 }
 
+double Path::remainingDistance() const {
+    return pathLength() - _traveledDistance;
+}
+
+float Path::estimatedRemainingTime(float speedScale) const {
+    return _expectedDuration / speedScale - _progressedTime;
+}
+
 std::vector<glm::dvec3> Path::controlPoints() const {
     return _curve->points();
 }
@@ -173,7 +185,7 @@ CameraPose Path::traversePath(double dt, float speedScale) {
 
     const double prevDistance = _traveledDistance;
 
-    _progressedTime += dt;
+    _progressedTime += static_cast<float>(dt);
     _traveledDistance += displacement;
 
     CameraPose newPose;
@@ -306,7 +318,7 @@ glm::dquat Path::easedSlerpRotation(double t) const {
     return glm::slerp(_start.rotation(), _end.rotation(), tScaled);
 }
 
-glm::dquat Path::linearPathRotation(double t) const {
+glm::dquat Path::linearPathRotation(double) const {
     const glm::dvec3 a = ghoul::viewDirection(_start.rotation());
     const glm::dvec3 b = ghoul::viewDirection(_end.rotation());
     const double angle = std::acos(glm::dot(a, b)); // assumes length 1.0 for a & b
diff --git a/src/navigation/pathnavigator.cpp b/src/navigation/pathnavigator.cpp
index a937ec4af5..21bed27223 100644
--- a/src/navigation/pathnavigator.cpp
+++ b/src/navigation/pathnavigator.cpp
@@ -208,6 +208,14 @@ bool PathNavigator::isPlayingPath() const {
     return hasCurrentPath() && _isPlaying;
 }
 
+bool PathNavigator::isPaused() const {
+    return hasCurrentPath() && !_isPlaying;
+}
+
+float PathNavigator::estimatedRemainingTimeInPath() const {
+    return hasCurrentPath() ? _currentPath->estimatedRemainingTime(_speedScale) : 0.f;
+}
+
 void PathNavigator::updateCamera(double deltaTime) {
     ghoul_assert(camera() != nullptr, "Camera must not be nullptr");
 
@@ -257,7 +265,7 @@ void PathNavigator::updateCamera(double deltaTime) {
     }
 
     if (!_includeRoll) {
-        removeRollRotation(newPose, deltaTime);
+        removeRollRotation(newPose);
     }
 
     camera()->setPose(newPose);
@@ -537,7 +545,7 @@ SceneGraphNode* PathNavigator::findNodeNearTarget(const SceneGraphNode* node) {
     return nullptr;
 }
 
-void PathNavigator::removeRollRotation(CameraPose& pose, double deltaTime) {
+void PathNavigator::removeRollRotation(CameraPose& pose) {
     // The actual position for the camera does not really matter. Use the origin,
     // to avoid precision problems when we have large values for the position
     const glm::dvec3 cameraPos = glm::dvec3(0.0);

From 8a1b6aceb2182437f2f95af2908a003d1ec95b72 Mon Sep 17 00:00:00 2001
From: Emma Broman <emma.broman@liu.se>
Date: Wed, 20 Dec 2023 08:28:21 +0100
Subject: [PATCH 213/701] Keep track of aim from navigations state when
 creating a camera path (#2981)

---
 include/openspace/navigation/waypoint.h |  6 ++++++
 src/navigation/pathnavigator.cpp        | 20 ++++++++++++++++++--
 src/navigation/waypoint.cpp             | 14 ++++++++++++++
 3 files changed, 38 insertions(+), 2 deletions(-)

diff --git a/include/openspace/navigation/waypoint.h b/include/openspace/navigation/waypoint.h
index 57dca42b10..3a12dd39d2 100644
--- a/include/openspace/navigation/waypoint.h
+++ b/include/openspace/navigation/waypoint.h
@@ -47,6 +47,7 @@ public:
     glm::dquat rotation() const;
     SceneGraphNode* node() const;
     std::string nodeIdentifier() const;
+    std::optional<std::string> aimIdentifier() const;
     double validBoundingSphere() const;
 
 private:
@@ -54,6 +55,11 @@ private:
     std::string _nodeIdentifier;
     // To be able to handle nodes with faulty bounding spheres
     double _validBoundingSphere = 0.0;
+
+    // Keep track of if there was an aim node, specified in for example the
+    // navigation state used to create this waypoint. It may be required in
+    // certain situations
+    std::optional<std::string> _aimNodeIdentifier;
 };
 
 /**
diff --git a/src/navigation/pathnavigator.cpp b/src/navigation/pathnavigator.cpp
index 21bed27223..f7d4eae85f 100644
--- a/src/navigation/pathnavigator.cpp
+++ b/src/navigation/pathnavigator.cpp
@@ -236,11 +236,19 @@ void PathNavigator::updateCamera(double deltaTime) {
     if (_setCameraToEndNextFrame) {
         LDEBUG("Skipped to end of camera path");
         _currentPath->quitPath();
-        camera()->setPose(_currentPath->endPoint().pose());
+
+        const interaction::Waypoint endPoint = _currentPath->endPoint();
+        camera()->setPose(endPoint.pose());
         global::navigationHandler->orbitalNavigator().setFocusNode(
-            _currentPath->endPoint().nodeIdentifier(),
+            endPoint.nodeIdentifier(),
             false
         );
+        if (endPoint.aimIdentifier().has_value()) {
+            global::navigationHandler->orbitalNavigator().setAimNode(
+                *endPoint.aimIdentifier()
+            );
+        }
+
         handlePathEnd();
         _setCameraToEndNextFrame = false;
         return;
@@ -272,6 +280,14 @@ void PathNavigator::updateCamera(double deltaTime) {
 
     if (_currentPath->hasReachedEnd()) {
         LINFO("Reached target");
+
+        // Also set the aim once the path is finished, if one should be set
+        if (_currentPath->endPoint().aimIdentifier().has_value()) {
+            global::navigationHandler->orbitalNavigator().setAimNode(
+                *_currentPath->endPoint().aimIdentifier()
+            );
+        }
+
         handlePathEnd();
         return;
     }
diff --git a/src/navigation/waypoint.cpp b/src/navigation/waypoint.cpp
index c7f1b86286..1b0f929a62 100644
--- a/src/navigation/waypoint.cpp
+++ b/src/navigation/waypoint.cpp
@@ -67,6 +67,16 @@ Waypoint::Waypoint(const NavigationState& ns) {
     }
 
     _nodeIdentifier = ns.anchor;
+
+    if (!ns.aim.empty()) {
+        const SceneGraphNode* aimNode = sceneGraphNode(ns.aim);
+        if (!aimNode) {
+            LERROR(fmt::format("Could not find node '{}' to use as aim", ns.aim));
+            return;
+        }
+        _aimNodeIdentifier = ns.aim;
+    }
+
     const PathNavigator& navigator = global::navigationHandler->pathNavigator();
     _validBoundingSphere = navigator.findValidBoundingSphere(anchorNode);
     _pose = ns.cameraPose();
@@ -92,6 +102,10 @@ std::string Waypoint::nodeIdentifier() const {
     return _nodeIdentifier;
 }
 
+std::optional<std::string> Waypoint::aimIdentifier() const {
+    return _aimNodeIdentifier;
+}
+
 double Waypoint::validBoundingSphere() const {
     return _validBoundingSphere;
 }

From af5ebd77310b110db1fbebff82161229fee98c40 Mon Sep 17 00:00:00 2001
From: Emma Broman <emma.broman@liu.se>
Date: Wed, 20 Dec 2023 08:28:34 +0100
Subject: [PATCH 214/701] Issue/2949 - Fix for camera transition events (#2982)

* Fix variable name typo

* Update transitions to not care about which sphere we were previously in

* Also handle when anchor node changes

* Remove log messages used for testing, and unused variable

* Update src/navigation/navigationhandler.cpp

Co-authored-by: Alexander Bock <alexander.bock@liu.se>

---------

Co-authored-by: Alexander Bock <alexander.bock@liu.se>
---
 .../openspace/navigation/navigationhandler.h  |   2 +-
 src/navigation/navigationhandler.cpp          | 222 +++++++++++-------
 2 files changed, 135 insertions(+), 89 deletions(-)

diff --git a/include/openspace/navigation/navigationhandler.h b/include/openspace/navigation/navigationhandler.h
index ebec211fd3..267d85507d 100644
--- a/include/openspace/navigation/navigationhandler.h
+++ b/include/openspace/navigation/navigationhandler.h
@@ -181,9 +181,9 @@ private:
     Camera* _camera = nullptr;
     std::function<void()> _playbackEndCallback;
 
-    static constexpr double InteractionHystersis = 0.0125;
     bool _inAnchorApproachSphere = false;
     bool _inAnchorReachSphere = false;
+    const SceneGraphNode* _lastAnchor = nullptr;
 
     OrbitalNavigator _orbitalNavigator;
     KeyframeNavigator _keyframeNavigator;
diff --git a/src/navigation/navigationhandler.cpp b/src/navigation/navigationhandler.cpp
index 5c0de14a84..5e53fe519f 100644
--- a/src/navigation/navigationhandler.cpp
+++ b/src/navigation/navigationhandler.cpp
@@ -183,6 +183,7 @@ void NavigationHandler::updateCamera(double deltaTime) {
     // If there is a state to set, do so immediately and then return
     if (_pendingState.has_value()) {
         applyPendingState();
+        updateCameraTransitions();
         return;
     }
 
@@ -268,97 +269,25 @@ void NavigationHandler::updateCameraTransitions() {
     const double af = anchorNode()->approachFactor();
     const double rf = anchorNode()->reachFactor();
 
-    using namespace std::string_literals;
-    if (_inAnchorApproachSphere) {
-        if (currDistance > d * (af + InteractionHystersis)) {
-            // We left the approach sphere outwards
-            _inAnchorApproachSphere = false;
+    // Updated checks compared to last time, so we can check if we are still in the
+    // approach or anchor sphere
+    bool isInApproachSphere = currDistance < d * af;
+    bool isInReachSphere = currDistance < d * rf;
 
-            if (!anchorNode()->onExitAction().empty()) {
-                ghoul::Dictionary dict;
-                dict.setValue("Node", anchorNode()->identifier());
-                dict.setValue("Transition", "Exiting"s);
-                for (const std::string& action : anchorNode()->onExitAction()) {
-                    // No sync because events are always synced and sent to the connected
-                    // nodes and peers
-                    global::actionManager->triggerAction(
-                        action,
-                        dict,
-                        interaction::ActionManager::ShouldBeSynchronized::No
-                    );
-                }
-            }
+    // Compare these to the values from last frame, to trigger the correct transition
+    // events
+    bool wasInApproachSphere = _inAnchorApproachSphere;
+    bool wasInReachSphere = _inAnchorReachSphere;
+    _inAnchorApproachSphere = isInApproachSphere;
+    _inAnchorReachSphere = isInReachSphere;
 
-            global::eventEngine->publishEvent<events::EventCameraFocusTransition>(
-                _camera,
-                anchorNode(),
-                events::EventCameraFocusTransition::Transition::Exiting
-            );
-        }
-        else if (currDistance < d * (rf - InteractionHystersis)) {
-            // We transitioned from the approach sphere into the reach sphere
-            _inAnchorApproachSphere = false;
-            _inAnchorReachSphere = true;
-
-            if (!anchorNode()->onReachAction().empty()) {
-                ghoul::Dictionary dict;
-                dict.setValue("Node", anchorNode()->identifier());
-                dict.setValue("Transition", "Reaching"s);
-                for (const std::string& action : anchorNode()->onReachAction()) {
-                    // No sync because events are always synced and sent to the connected
-                    // nodes and peers
-                    global::actionManager->triggerAction(
-                        action,
-                        dict,
-                        interaction::ActionManager::ShouldBeSynchronized::No
-                    );
-                }
-            }
-
-            global::eventEngine->publishEvent<events::EventCameraFocusTransition>(
-                _camera,
-                anchorNode(),
-                events::EventCameraFocusTransition::Transition::Reaching
-            );
-        }
-    }
-    else if (_inAnchorReachSphere && currDistance > d * (rf + InteractionHystersis)) {
-        // We transitioned from the reach sphere to the approach sphere
-        _inAnchorReachSphere = false;
-        _inAnchorApproachSphere = true;
-
-        if (!anchorNode()->onRecedeAction().empty()) {
+    auto triggerApproachEvent = [this](const SceneGraphNode* node) {
+        using namespace std::string_literals;
+        if (!node->onApproachAction().empty()) {
             ghoul::Dictionary dict;
-            dict.setValue("Node", anchorNode()->identifier());
-            dict.setValue("Transition", "Receding"s);
-            for (const std::string& action : anchorNode()->onRecedeAction()) {
-                // No sync because events are always synced and sent to the connected
-                // nodes and peers
-                global::actionManager->triggerAction(
-                    action,
-                    dict,
-                    interaction::ActionManager::ShouldBeSynchronized::No
-                );
-            }
-        }
-
-        global::eventEngine->publishEvent<events::EventCameraFocusTransition>(
-            _camera,
-            anchorNode(),
-            events::EventCameraFocusTransition::Transition::Receding
-        );
-    }
-    else if (!_inAnchorApproachSphere && !_inAnchorReachSphere &&
-             currDistance < d * (af - InteractionHystersis))
-    {
-        // We moved into the approach sphere
-        _inAnchorApproachSphere = true;
-
-        if (!anchorNode()->onApproachAction().empty()) {
-            ghoul::Dictionary dict;
-            dict.setValue("Node", anchorNode()->identifier());
+            dict.setValue("Node", node->identifier());
             dict.setValue("Transition", "Approaching"s);
-            for (const std::string& action : anchorNode()->onApproachAction()) {
+            for (const std::string& action : node->onApproachAction()) {
                 // No sync because events are always synced and sent to the connected
                 // nodes and peers
                 global::actionManager->triggerAction(
@@ -371,10 +300,127 @@ void NavigationHandler::updateCameraTransitions() {
 
         global::eventEngine->publishEvent<events::EventCameraFocusTransition>(
             _camera,
-            anchorNode(),
+            node,
             events::EventCameraFocusTransition::Transition::Approaching
         );
+    };
+
+    auto triggerReachEvent = [this](const SceneGraphNode* node) {
+        using namespace std::string_literals;
+        if (!node->onReachAction().empty()) {
+            ghoul::Dictionary dict;
+            dict.setValue("Node", node->identifier());
+            dict.setValue("Transition", "Reaching"s);
+            for (const std::string& action : node->onReachAction()) {
+                // No sync because events are always synced and sent to the connected
+                // nodes and peers
+                global::actionManager->triggerAction(
+                    action,
+                    dict,
+                    interaction::ActionManager::ShouldBeSynchronized::No
+                );
+            }
+        }
+
+        global::eventEngine->publishEvent<events::EventCameraFocusTransition>(
+            _camera,
+            node,
+            events::EventCameraFocusTransition::Transition::Reaching
+        );
+     };
+
+    auto triggerRecedeEvent = [this](const SceneGraphNode* node) {
+        using namespace std::string_literals;
+        if (!node->onRecedeAction().empty()) {
+            ghoul::Dictionary dict;
+            dict.setValue("Node", node->identifier());
+            dict.setValue("Transition", "Receding"s);
+            for (const std::string& action : node->onRecedeAction()) {
+                // No sync because events are always synced and sent to the connected
+                // nodes and peers
+                global::actionManager->triggerAction(
+                    action,
+                    dict,
+                    interaction::ActionManager::ShouldBeSynchronized::No
+                );
+            }
+        }
+
+        global::eventEngine->publishEvent<events::EventCameraFocusTransition>(
+            _camera,
+            node,
+            events::EventCameraFocusTransition::Transition::Receding
+        );
+    };
+
+    auto triggerExitEvent = [this](const SceneGraphNode* node) {
+        using namespace std::string_literals;
+        if (!node->onExitAction().empty()) {
+            ghoul::Dictionary dict;
+            dict.setValue("Node", node->identifier());
+            dict.setValue("Transition", "Exiting"s);
+            for (const std::string& action : node->onExitAction()) {
+                // No sync because events are always synced and sent to the connected
+                // nodes and peers
+                global::actionManager->triggerAction(
+                    action,
+                    dict,
+                    interaction::ActionManager::ShouldBeSynchronized::No
+                );
+            }
+        }
+
+        global::eventEngine->publishEvent<events::EventCameraFocusTransition>(
+            _camera,
+            node,
+            events::EventCameraFocusTransition::Transition::Exiting
+        );
+    };
+
+    bool anchorWasChanged = anchorNode() != _lastAnchor;
+    if (anchorWasChanged) {
+        // The anchor was changed between frames, so the transitions we have to check
+        // are a bit different. Just directly trigger the relevant events for the
+        // respective node
+        if (wasInReachSphere) {
+            triggerRecedeEvent(_lastAnchor);
+        }
+
+        if (wasInApproachSphere) {
+            triggerExitEvent(_lastAnchor);
+        }
+
+        if (_inAnchorApproachSphere) {
+            triggerApproachEvent(anchorNode());
+        }
+
+        if (_inAnchorReachSphere) {
+            triggerReachEvent(anchorNode());
+        }
     }
+    else {
+        if (_inAnchorApproachSphere && !wasInApproachSphere) {
+            // Transitioned into the approach sphere from somewhere further away => approach
+            triggerApproachEvent(anchorNode());
+        }
+
+        if (_inAnchorReachSphere && !wasInReachSphere) {
+            // Transitioned into the reach sphere from somewhere further away => reach
+            triggerReachEvent(anchorNode());
+        }
+
+        if (!_inAnchorReachSphere && wasInReachSphere) {
+            // Transitioned out of the reach sphere => recede / move away
+            triggerRecedeEvent(anchorNode());
+        }
+
+        if (!_inAnchorApproachSphere && wasInApproachSphere) {
+            // We transitioned out of the approach sphere => on exit
+            triggerExitEvent(anchorNode());
+        }
+    }
+
+    _lastAnchor = anchorNode();
 }
 
 void NavigationHandler::resetNavigationUpdateVariables() {

From 6281da679881aa3a47eedf2774210cf87e7f8044 Mon Sep 17 00:00:00 2001
From: Andreas Engberg <adde.engberg@gmail.com>
Date: Wed, 20 Dec 2023 10:02:54 +0100
Subject: [PATCH 215/701] Fixed loading screen log messages taking up real
 estate if set to false

---
 openspace.cfg                   | 3 ++-
 src/rendering/loadingscreen.cpp | 7 +++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/openspace.cfg b/openspace.cfg
index 28ef256f33..959a720475 100644
--- a/openspace.cfg
+++ b/openspace.cfg
@@ -217,7 +217,8 @@ VersionCheckUrl = "http://data.openspaceproject.com/latest-version"
 UseMultithreadedInitialization = true
 LoadingScreen = {
     ShowMessage = true,
-    ShowNodeNames = true
+    ShowNodeNames = true,
+    ShowLogMessages = true
 }
 CheckOpenGLState = false
 LogEachOpenGLCall = false
diff --git a/src/rendering/loadingscreen.cpp b/src/rendering/loadingscreen.cpp
index 39cb7b0cec..d256bca6f2 100644
--- a/src/rendering/loadingscreen.cpp
+++ b/src/rendering/loadingscreen.cpp
@@ -317,10 +317,9 @@ void LoadingScreen::render() {
                         rectOverlaps(messageLl, messageUr, ll, ur) :
                         false;
 
-                    const bool logOverlap = rectOverlaps(
-                        logLl, logUr,
-                        ll, ur
-                    );
+                    const bool logOverlap = _showLog ? 
+                        rectOverlaps(logLl, logUr,ll, ur) :
+                        false;
 
                     if (logoOverlap || loadingOverlap || messageOverlap || logOverlap) {
                         // We never want to have an overlap with these, so this try didn't

From 7ad27203b53189371a86a2423b135701e622be25 Mon Sep 17 00:00:00 2001
From: Emma Broman <emma.broman@liu.se>
Date: Thu, 21 Dec 2023 10:01:08 +0100
Subject: [PATCH 216/701] Update GUI hash

buttons hover style is now consistent
---
 data/assets/util/webgui.asset | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/data/assets/util/webgui.asset b/data/assets/util/webgui.asset
index 566f87adff..81bd6111f6 100644
--- a/data/assets/util/webgui.asset
+++ b/data/assets/util/webgui.asset
@@ -4,7 +4,7 @@ local guiCustomization = asset.require("customization/gui")
 
 
 -- Select which commit hashes to use for the frontend and backend
-local frontendHash = "563b65b3043f798c9efe76787454c38ccccd2aaf"
+local frontendHash = "7c89218df5041e51f3b9d8a1ff2325f66a47e8bf"
 
 local frontend = asset.resource({
   Identifier = "WebGuiFrontend",

From 84b9f384cecdf97eae7220c711678f05624a3c05 Mon Sep 17 00:00:00 2001
From: Emma Broman <emma.broman@liu.se>
Date: Thu, 21 Dec 2023 15:28:59 +0100
Subject: [PATCH 217/701] GUI Hash (small style updates)

---
 data/assets/util/webgui.asset | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/data/assets/util/webgui.asset b/data/assets/util/webgui.asset
index 81bd6111f6..eb5ae44c16 100644
--- a/data/assets/util/webgui.asset
+++ b/data/assets/util/webgui.asset
@@ -4,7 +4,7 @@ local guiCustomization = asset.require("customization/gui")
 
 
 -- Select which commit hashes to use for the frontend and backend
-local frontendHash = "7c89218df5041e51f3b9d8a1ff2325f66a47e8bf"
+local frontendHash = "95683e59c7fa1891e7db7b83e4eeea15f9da11f1"
 
 local frontend = asset.resource({
   Identifier = "WebGuiFrontend",

From e64d4d66f4919f18546f939d513bf90c6299e0fc Mon Sep 17 00:00:00 2001
From: Alexander Bock <mail@alexanderbock.eu>
Date: Fri, 22 Dec 2023 14:19:18 +0100
Subject: [PATCH 218/701] Add the optional ability to export the model matrix
 into an ASCII recording

---
 .../openspace/interaction/sessionrecording.h  |  1 +
 src/interaction/sessionrecording.cpp          | 25 ++++++++++++++++---
 2 files changed, 23 insertions(+), 3 deletions(-)

diff --git a/include/openspace/interaction/sessionrecording.h b/include/openspace/interaction/sessionrecording.h
index 7579e9d28e..7e667c0a68 100644
--- a/include/openspace/interaction/sessionrecording.h
+++ b/include/openspace/interaction/sessionrecording.h
@@ -594,6 +594,7 @@ public:
 protected:
     properties::BoolProperty _renderPlaybackInformation;
     properties::BoolProperty _ignoreRecordedScale;
+    properties::BoolProperty _addModelMatrixinAscii;
 
     enum class RecordedType {
         Camera = 0,
diff --git a/src/interaction/sessionrecording.cpp b/src/interaction/sessionrecording.cpp
index f7e6c9f63c..9d27f2f7a2 100644
--- a/src/interaction/sessionrecording.cpp
+++ b/src/interaction/sessionrecording.cpp
@@ -35,6 +35,7 @@
 #include <openspace/navigation/navigationhandler.h>
 #include <openspace/navigation/orbitalnavigator.h>
 #include <openspace/network/messagestructureshelper.h>
+#include <openspace/query/query.h>
 #include <openspace/rendering/luaconsole.h>
 #include <openspace/rendering/renderable.h>
 #include <openspace/rendering/renderengine.h>
@@ -48,6 +49,7 @@
 #include <ghoul/filesystem/filesystem.h>
 #include <ghoul/font/fontmanager.h>
 #include <ghoul/font/fontrenderer.h>
+#include <ghoul/glm.h>
 #include <ghoul/logging/logmanager.h>
 #include <ghoul/misc/profiling.h>
 #include <algorithm>
@@ -80,6 +82,15 @@ namespace {
         "computed values are used instead",
         openspace::properties::Property::Visibility::Hidden
     };
+
+    constexpr openspace::properties::Property::PropertyInfo AddModelMatrixinAsciiInfo = {
+        "AddModelMatrixinAscii",
+        "Add Model Matrix in ASCII recording",
+        "If this is 'true', the model matrix is written into the ASCII recording format "
+        "in the line before each camera keyframe. The model matrix is the full matrix "
+        "that converts the position into a J2000+Galactic reference frame",
+        openspace::properties::Property::Visibility::Developer
+    };
 } // namespace
 
 namespace openspace::interaction {
@@ -92,12 +103,11 @@ SessionRecording::SessionRecording()
     : properties::PropertyOwner({ "SessionRecording", "Session Recording" })
     , _renderPlaybackInformation(RenderPlaybackInfo, false)
     , _ignoreRecordedScale(IgnoreRecordedScaleInfo, false)
+    , _addModelMatrixinAscii(AddModelMatrixinAsciiInfo, false)
 {}
 
 SessionRecording::SessionRecording(bool isGlobal)
-    : properties::PropertyOwner({ "SessionRecording", "Session Recording" })
-    , _renderPlaybackInformation(RenderPlaybackInfo, false)
-    , _ignoreRecordedScale(IgnoreRecordedScaleInfo, false)
+    : SessionRecording()
 {
     if (isGlobal) {
         ghoul::TemplateFactory<Task>* fTask = FactoryManager::ref().factory<Task>();
@@ -106,6 +116,7 @@ SessionRecording::SessionRecording(bool isGlobal)
         fTask->registerClass<ConvertRecFileVersionTask>("ConvertRecFileVersionTask");
         addProperty(_renderPlaybackInformation);
         addProperty(_ignoreRecordedScale);
+        addProperty(_addModelMatrixinAscii);
     }
 }
 
@@ -810,6 +821,14 @@ void SessionRecording::saveCameraKeyframeAscii(Timestamps& times,
                                                datamessagestructures::CameraKeyframe& kf,
                                                std::ofstream& file)
 {
+    if (_addModelMatrixinAscii) {
+        SceneGraphNode* node = sceneGraphNode(kf._focusNode);
+        glm::dmat4 modelTransform = node->modelTransform();
+
+        file << HeaderCommentAscii << ' ' << ghoul::to_string(modelTransform) << '\n';
+    }
+    
+
     std::stringstream keyframeLine = std::stringstream();
     saveHeaderAscii(times, HeaderCameraAscii, keyframeLine);
     kf.write(keyframeLine);

From 952b263a8ece5cca560db1cb805f3797976faf13 Mon Sep 17 00:00:00 2001
From: Alexander Bock <mail@alexanderbock.eu>
Date: Fri, 22 Dec 2023 14:40:58 +0100
Subject: [PATCH 219/701] Add Lua function to return a list of all loaded
 kernels

---
 include/openspace/util/spicemanager.h |  8 ++++++++
 src/util/spicemanager.cpp             | 12 +++++++++++-
 src/util/spicemanager_lua.inl         |  7 +++++++
 3 files changed, 26 insertions(+), 1 deletion(-)

diff --git a/include/openspace/util/spicemanager.h b/include/openspace/util/spicemanager.h
index 9b045426c3..3883050ad9 100644
--- a/include/openspace/util/spicemanager.h
+++ b/include/openspace/util/spicemanager.h
@@ -232,6 +232,14 @@ public:
      */
     void unloadKernel(KernelHandle kernelId);
 
+    /**
+     * Returns a list of all loaded kernels in the kernel pool that have been loaded
+     * through the SpiceManager. The kernels are reported in order of their loading.
+     *
+     * \return The list of all loaded kernels that have been loaded through this manager
+     */
+    std::vector<std::string> loadedKernels() const;
+
     /**
      * Unloads a SPICE kernel identified by the \p filePath which was used in the
      * loading call to #loadKernel. The unloading is done by calling the `unload_c`
diff --git a/src/util/spicemanager.cpp b/src/util/spicemanager.cpp
index 01cd152654..d405ab829e 100644
--- a/src/util/spicemanager.cpp
+++ b/src/util/spicemanager.cpp
@@ -324,6 +324,15 @@ void SpiceManager::unloadKernel(std::string filePath) {
     }
 }
 
+std::vector<std::string> SpiceManager::loadedKernels() const {
+    std::vector<std::string> res;
+    res.reserve(_loadedKernels.size());
+    for (const KernelInformation& info : _loadedKernels) {
+        res.push_back(info.path);
+    }
+    return res;
+}
+
 bool SpiceManager::hasSpkCoverage(const std::string& target, double et) const {
     ghoul_assert(!target.empty(), "Empty target");
 
@@ -1530,9 +1539,10 @@ scripting::LuaLibrary SpiceManager::luaLibrary() {
         {
             codegen::lua::LoadKernel,
             codegen::lua::UnloadKernel,
+            codegen::lua::Kernels,
             codegen::lua::SpiceBodies,
             codegen::lua::RotationMatrix,
-            codegen::lua::Position
+            codegen::lua::Position,
         }
     };
 }
diff --git a/src/util/spicemanager_lua.inl b/src/util/spicemanager_lua.inl
index e7cb1e180e..747c113d5a 100644
--- a/src/util/spicemanager_lua.inl
+++ b/src/util/spicemanager_lua.inl
@@ -68,6 +68,13 @@ namespace {
     }
 }
 
+/**
+ * Returns a list of all loaded kernels 
+ */
+[[codegen::luawrap]] std::vector<std::string> kernels() {
+    return openspace::SpiceManager::ref().loadedKernels();
+}
+
 /**
  * Returns a list of Spice Bodies loaded into the system. Returns SPICE built in frames if
  * builtInFrames. Returns User loaded frames if !builtInFrames.

From cc9f235c9d8217871014c4f4b8de7631857bee45 Mon Sep 17 00:00:00 2001
From: Alexander Bock <mail@alexanderbock.eu>
Date: Fri, 22 Dec 2023 14:41:19 +0100
Subject: [PATCH 220/701] Add more debug outputs to the startup to be able to
 diagnose issues

---
 apps/OpenSpace/main.cpp | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/apps/OpenSpace/main.cpp b/apps/OpenSpace/main.cpp
index 5618fc3522..96ea13d8a2 100644
--- a/apps/OpenSpace/main.cpp
+++ b/apps/OpenSpace/main.cpp
@@ -1415,9 +1415,12 @@ int main(int argc, char* argv[]) {
 
     LDEBUG("Creating SGCT Engine");
     std::vector<std::string> arg(argv + 1, argv + argc);
+    LDEBUG("Parsing commandline arguments");
     sgct::Configuration config = parseArguments(arg);
+    LDEBUG("Loading cluster information");
     config::Cluster cluster = loadCluster(absPath(windowConfiguration).string());
 
+    LDEBUG("Setting callbacks");
     Engine::Callbacks callbacks;
     callbacks.initOpenGL = mainInitFunc;
     callbacks.preSync = mainPreSyncFunc;

From c1ee9079f179f9eab20f486ef9ffc8a28665de97 Mon Sep 17 00:00:00 2001
From: Alexander Bock <mail@alexanderbock.eu>
Date: Sat, 23 Dec 2023 22:33:53 +0100
Subject: [PATCH 221/701] Add the ability to drag-and-drop a video file to add
 it as a screenspacerenderable (closes #2988)

---
 scripts/drag_drop_handler.lua | 33 +++++++++++++++++++++++++++++----
 1 file changed, 29 insertions(+), 4 deletions(-)

diff --git a/scripts/drag_drop_handler.lua b/scripts/drag_drop_handler.lua
index b972971e8e..37937394b5 100644
--- a/scripts/drag_drop_handler.lua
+++ b/scripts/drag_drop_handler.lua
@@ -22,13 +22,31 @@ filename = filename:gsub("\\", "/")
 basename = basename:gsub("\\", "/")
 basename_without_extension = basename:sub(0, #basename - extension:len())
 
-is_image_file = function(extension)
+local is_image_file = function(extension)
   return extension == ".png" or extension == ".jpg" or extension == ".jpeg" or
          extension == ".tif" or extension == ".tga" or extension == ".bmp" or
          extension == ".psd" or extension == ".gif" or extension == ".hdr" or
          extension == ".pic" or extension == ".pnm"
 end
 
+local is_video_file = function(extension)
+  return extension == ".mp4" or extension == ".webm" or extension == ".mkv" or
+         extension == ".avi" or extension == ".mov" or extension == ".wmv" or
+         extension == ".mpg" or extension == ".m4v"
+end
+
+local is_asset_file = function(extension)
+  return extension == ".asset"
+end
+
+local is_recording_file = function(extension)
+  return extension == ".osrec" or extension == ".osrectxt"
+end
+
+local is_geojson_file = function(extension)
+  return extension == ".geojson"
+end
+
 local ReloadUIScript = [[ if openspace.hasProperty('Modules.CefWebGui.Reload') then openspace.setPropertyValue('Modules.CefWebGui.Reload', nil) end ]]
 
 if is_image_file(extension) then
@@ -38,14 +56,21 @@ if is_image_file(extension) then
     Type = "ScreenSpaceImageLocal",
     TexturePath = "]] .. filename .. [["
   });]] .. ReloadUIScript
-elseif extension == ".asset" then
+elseif is_video_file(extension) then
+  return [[
+    openspace.addScreenSpaceRenderable({
+      Identifier = openspace.makeIdentifier("]] .. basename_without_extension .. [["),
+      Type = "ScreenSpaceVideo",
+      Video = "]] .. filename .. [["
+    });]] .. ReloadUIScript
+elseif is_asset_file(extension) then
   return [[
     if openspace.asset.isLoaded("]] .. filename .. [[") ~= true then
       openspace.printInfo("Adding asset: ']] .. filename .. [[' (drag-and-drop)");
     end
     openspace.asset.add("]] .. filename .. '");' .. ReloadUIScript
-elseif extension == ".osrec" or extension == ".osrectxt" then
+elseif is_recording_file(extension) then
   return 'openspace.sessionRecording.startPlayback("' .. filename .. '")'
-elseif extension == ".geojson" then
+elseif is_geojson_file(extension) then
   return 'openspace.globebrowsing.addGeoJsonFromFile("' .. filename .. '")'  .. ReloadUIScript
 end

From 6dd497d38c431e91a004703cbb72a2cd81f68ead Mon Sep 17 00:00:00 2001
From: Emma Broman <emma.broman@liu.se>
Date: Thu, 4 Jan 2024 13:55:21 +0100
Subject: [PATCH 222/701] Feature/add some docs (#2961)

* Add docs for PathInstruction

* Add docs for renderablecartesianaxes and navigationstate

* Write docs for ExoplanetDataPreparationTask

* Add some kind of documentation for the task base class

Was already showing in the list, but the property or decription was not included

* Apply suggestions from code review

* Address review comments

* Clarify confusing sentence

* Slight rephrasing
---
 .../rendering/renderablecartesianaxes.cpp     | 13 +++++++++-
 .../tasks/exoplanetsdatapreparationtask.cpp   | 21 ++++++++++++++++
 src/documentation/core_registration.cpp       |  2 ++
 src/navigation/navigationstate.cpp            | 18 +++++++++++++
 src/navigation/path.cpp                       | 25 +++++++++++++++----
 src/util/task.cpp                             |  9 +++++++
 6 files changed, 82 insertions(+), 6 deletions(-)

diff --git a/modules/base/rendering/renderablecartesianaxes.cpp b/modules/base/rendering/renderablecartesianaxes.cpp
index 841a6b032e..a0f01d6c74 100644
--- a/modules/base/rendering/renderablecartesianaxes.cpp
+++ b/modules/base/rendering/renderablecartesianaxes.cpp
@@ -61,6 +61,18 @@ namespace {
         openspace::properties::Property::Visibility::NoviceUser
     };
 
+    // The RenderableCartesianAxes can be used to render the local Cartesian coordinate
+    // system, or reference frame, of another scene graph node. The colors of the axes
+    // can be customized but are per default set to Red, Green and Blue, for the X-, Y-
+    // and Z-axis, respectively.
+    //
+    // To add the axes, create a scene graph node with the RenderableCartesianAxes
+    // renderable and add it as a child to the other scene graph node, i.e. specify the
+    // other node as the Parent of the node with this renderable. Also, the axes have to
+    // be scaled to match the parent object for the axes to be visible in the scene, for
+    // example using a StaticScale.
+    //
+    // See example asset (@TODO: link to asset file).
     struct [[codegen::Dictionary(RenderableCartesianAxes)]] Parameters {
         // [[codegen::verbatim(XColorInfo.description)]]
         std::optional<glm::vec3> xColor [[codegen::color()]];
@@ -70,7 +82,6 @@ namespace {
 
         // [[codegen::verbatim(ZColorInfo.description)]]
         std::optional<glm::vec3> zColor [[codegen::color()]];
-
     };
 #include "renderablecartesianaxes_codegen.cpp"
 } // namespace
diff --git a/modules/exoplanets/tasks/exoplanetsdatapreparationtask.cpp b/modules/exoplanets/tasks/exoplanetsdatapreparationtask.cpp
index 98fe89286f..c160e8e473 100644
--- a/modules/exoplanets/tasks/exoplanetsdatapreparationtask.cpp
+++ b/modules/exoplanets/tasks/exoplanetsdatapreparationtask.cpp
@@ -40,6 +40,27 @@
 namespace {
     constexpr std::string_view _loggerCat = "ExoplanetsDataPreparationTask";
 
+    // This task is used for generating the binary data files that are used for the
+    // exoplanet system loading in OpenSpace. Using this binary file allows efficient
+    // data loading of an arbitrary exoplanet system during runtime, without keeping all
+    // data in memory.
+    //
+    // Two output files are generated, whose paths have to be specified: One binary with
+    // the data for the exoplanets (OutputBIN) and one look-up table that is used to
+    // find where in the binary file a particular system is located (OutputLUT).
+    //
+    // Additionally, the task uses three different files as input: 1) a CSV file with the
+    // data from the NASA Exoplanet Archive, 2) A SPECK file that contains star positions,
+    // and 3) a TXT file that is used for the conversion from the stars' effective
+    // temperature to a B-V color index. The paths for all these paths have to be
+    // specified. The SPECK file (2) will be used for the positions of the host stars, to
+    // make sure that they line up with the stars in that dataset. The cross-matching is
+    // done by star name, as given by the comment in the SPECK file and the host star
+    // column in the exoplanet dataset.
+    //
+    // Note that the CSV (1) has to include a certain set of columns for the rendering to
+    // be correct. Use the accompanying python script to download the datafile, or make
+    // sure to include all columns in your download.
     struct [[codegen::Dictionary(ExoplanetsDataPreparationTask)]] Parameters {
         // The csv file to extract data from
         std::string inputDataFile;
diff --git a/src/documentation/core_registration.cpp b/src/documentation/core_registration.cpp
index bdec3fa0a9..e1c9f03438 100644
--- a/src/documentation/core_registration.cpp
+++ b/src/documentation/core_registration.cpp
@@ -57,6 +57,7 @@
 #include <openspace/scripting/scriptscheduler.h>
 #include <openspace/scripting/systemcapabilitiesbinding.h>
 #include <openspace/util/spicemanager.h>
+#include <openspace/util/task.h>
 #include <openspace/util/time.h>
 #include <openspace/util/timerange.h>
 
@@ -74,6 +75,7 @@ void registerCoreClasses(documentation::DocumentationEngine& engine) {
     engine.addDocumentation(Scale::Documentation());
     engine.addDocumentation(SceneGraphNode::Documentation());
     engine.addDocumentation(ScreenSpaceRenderable::Documentation());
+    engine.addDocumentation(Task::documentation());
     engine.addDocumentation(TimeRange::Documentation());
     engine.addDocumentation(Translation::Documentation());
     engine.addDocumentation(TimeFrame::Documentation());
diff --git a/src/navigation/navigationstate.cpp b/src/navigation/navigationstate.cpp
index a1f11ba337..b995b9ebf9 100644
--- a/src/navigation/navigationstate.cpp
+++ b/src/navigation/navigationstate.cpp
@@ -33,6 +33,24 @@ namespace {
 
     constexpr double Epsilon = 1E-7;
 
+    // A NavigationState is an object describing an exact camera position and rotation,
+    // in a certain reference frame (per default, the one of the specified Anchor node).
+    // It can be used to set the same camera position at a later point in time, or
+    // navigating to a specific camera position using the pathnavigation system.
+    //
+    // The camera rotation is specified using Euler angles, in radians. It is also
+    // possible to specify a node to be used as Aim, but note that this will not affect
+    // the actual camera position or view direction.
+    //
+    // To get the current navigation state of the camera, use the
+    // `openspace.navigation.getNavigationState()` function in the Scripting API.
+    //
+    // Note that a NavigationState does not include information about what timestamp
+    // within OpenSpace that the NavigationState was generated. When laoding a
+    // NavigationState, the visuals may be different depending on what the simulation
+    // timestamp is, as the relative positions of objects in the scene may have changed.
+    // The get the exact same visuals as when the NavigationState was saved, make sure
+    // to also set the time to be the same as on save.
     struct [[codegen::Dictionary(NavigationState)]] Parameters {
         // The identifier of the anchor node
         std::string anchor;
diff --git a/src/navigation/path.cpp b/src/navigation/path.cpp
index abeb9ec85c..8b827009b6 100644
--- a/src/navigation/path.cpp
+++ b/src/navigation/path.cpp
@@ -45,9 +45,24 @@ namespace {
     constexpr std::string_view _loggerCat = "Path";
     constexpr float LengthEpsilon = 1e-5f;
 
-    // TODO: where should this documentation be?
-    // It's nice to have these to interpret the dictionary when creating the path, but
-    // maybe it's not really necessary
+    // A PathInstruction is a table describing the specification for a camera path.
+    // It is used as an input to the `openspace.pathnavigation.createPath` function.
+    //
+    // There are two types of paths that can be created, as specified by the required
+    // TargetType parameter: 'Node' or 'NavigationState'. The difference is what kind
+    // of target the path is created for, a scene graph node or a specific navigation
+    // state for the camera.
+    //
+    // Depending on the type, the parameters that can be specified are a bit different.
+    // A 'NavigationState' already contains all details for the camera position, so no
+    // other details may be specified. For a 'Node' instruction, only a 'Target' node is
+    // required, but a 'Height' or 'Position' may also be specified. If both a position
+    // and height is specified, the height value will be ignored.
+    //
+    // For 'Node' paths it is also possible to specify whether the target camera state
+    // at the end of the flight should take the up direction of the target node into
+    // account. Note that for this to give an effect on the path, rolling motions have
+    // to be enabled.
     struct [[codegen::Dictionary(PathInstruction)]] Parameters {
         // The type of the instruction. Decides what other parameters are
         // handled/available
@@ -61,7 +76,7 @@ namespace {
         std::optional<float> duration;
 
         // (Node): The target node of the camera path. Not optional for 'Node'
-        // instructions
+        // type instructions
         std::optional<std::string> target;
 
         // (Node): An optional position in relation to the target node, in model
@@ -76,7 +91,7 @@ namespace {
         std::optional<bool> useTargetUpDirection;
 
         // (NavigationState): A navigation state that will be the target
-        // of this path segment
+        // of the resulting path
         std::optional<ghoul::Dictionary> navigationState
             [[codegen::reference("core_navigation_state")]];
 
diff --git a/src/util/task.cpp b/src/util/task.cpp
index 40e1c0fa60..2eb1ce6185 100644
--- a/src/util/task.cpp
+++ b/src/util/task.cpp
@@ -31,6 +31,15 @@
 #include <ghoul/misc/templatefactory.h>
 
 namespace {
+
+    // The base class of all tasks. Specify the Type property to create one of the
+    // available task types. This property should be included in the same table object
+    // as the properties of the specific task.
+    //
+    // Tasks can be executed using the separate TaskRunner application. When starting the
+    // application, just enter the path to the file describing the task you want to run
+    // as input in the command line to initiate the run. All tasks should live in the task
+    // folder in the data folder of the OpenSpace installation.
     struct [[codegen::Dictionary(Task)]] Parameters {
         // This key specifies the type of Task that gets created. It has to be one of the
         // valid Tasks that are available for creation (see the FactoryDocumentation for a

From 97d1dc163b252db714d64140e142dd1b43ad6c79 Mon Sep 17 00:00:00 2001
From: Alexander Bock <alexander.bock@liu.se>
Date: Mon, 8 Jan 2024 11:30:46 +0100
Subject: [PATCH 223/701] Add the ability for the log file to rotate (closes
 #2995)

---
 ext/ghoul                 | 2 +-
 openspace.cfg             | 2 +-
 src/engine/logfactory.cpp | 9 +++++++--
 3 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/ext/ghoul b/ext/ghoul
index 82f83b40fd..274d2beed3 160000
--- a/ext/ghoul
+++ b/ext/ghoul
@@ -1 +1 @@
-Subproject commit 82f83b40fda985e9adc25ab94f253fe127bdeee0
+Subproject commit 274d2beed38bb24ef693b2a8c9c95307bdf5204f
diff --git a/openspace.cfg b/openspace.cfg
index 959a720475..7c5976b387 100644
--- a/openspace.cfg
+++ b/openspace.cfg
@@ -202,7 +202,7 @@ Logging = {
     LogLevel = "Debug",
     ImmediateFlush = true,
     Logs = {
-        { Type = "html", File = "${LOGS}/log.html", Append = false }
+        { Type = "html", File = "${LOGS}/log.html", LogRotation = 3 }
     },
     CapabilitiesVerbosity = "Full"
 }
diff --git a/src/engine/logfactory.cpp b/src/engine/logfactory.cpp
index 529241527f..d4a7332a06 100644
--- a/src/engine/logfactory.cpp
+++ b/src/engine/logfactory.cpp
@@ -54,6 +54,9 @@ namespace {
         // be appended to previous runs
         std::optional<bool> append;
 
+        // The number of files that should be kept around for this Log
+        std::optional<int> logRotation [[codegen::greater(0)]];
+
         // Determines whether the log entires should be stamped with the time at which the
         // message was logged
         std::optional<bool> timeStamping;
@@ -97,6 +100,7 @@ std::unique_ptr<ghoul::logging::Log> createLog(const ghoul::Dictionary& dictiona
 
     std::filesystem::path filename = absPath(p.file);
     bool append = p.append.value_or(true);
+    int nLogRotation = p.logRotation.value_or(0);
     bool timeStamp = p.timeStamping.value_or(true);
     bool dateStamp = p.dateStamping.value_or(true);
     bool categoryStamp = p.categoryStamping.value_or(true);
@@ -116,7 +120,7 @@ std::unique_ptr<ghoul::logging::Log> createLog(const ghoul::Dictionary& dictiona
 
             return std::make_unique<ghoul::logging::HTMLLog>(
                 filename.string(),
-                ghoul::logging::TextLog::Append(append),
+                nLogRotation,
                 ghoul::logging::Log::TimeStamping(timeStamp),
                 ghoul::logging::Log::DateStamping(dateStamp),
                 ghoul::logging::Log::CategoryStamping(categoryStamp),
@@ -124,11 +128,12 @@ std::unique_ptr<ghoul::logging::Log> createLog(const ghoul::Dictionary& dictiona
                 cssFiles,
                 jsFiles,
                 level
-                );
+            );
         }
         case Parameters::Type::Text:
             return std::make_unique<ghoul::logging::TextLog>(
                 filename.string(),
+                nLogRotation,
                 ghoul::logging::TextLog::Append(append),
                 ghoul::logging::Log::TimeStamping(timeStamp),
                 ghoul::logging::Log::DateStamping(dateStamp),

From 4bf111115e6a3c5f9f4669a3069ec23ecafcedb2 Mon Sep 17 00:00:00 2001
From: Alexander Bock <alexander.bock@liu.se>
Date: Mon, 8 Jan 2024 17:09:59 +0100
Subject: [PATCH 224/701] Add precompiled headers to unit tests

---
 ext/ghoul              | 2 +-
 support/coding/codegen | 2 +-
 tests/CMakeLists.txt   | 4 ++++
 3 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/ext/ghoul b/ext/ghoul
index 274d2beed3..d607a6d6b1 160000
--- a/ext/ghoul
+++ b/ext/ghoul
@@ -1 +1 @@
-Subproject commit 274d2beed38bb24ef693b2a8c9c95307bdf5204f
+Subproject commit d607a6d6b11be4ad05ccd555b8b290a782e0e384
diff --git a/support/coding/codegen b/support/coding/codegen
index 60b97c04cc..3bc8dc5546 160000
--- a/support/coding/codegen
+++ b/support/coding/codegen
@@ -1 +1 @@
-Subproject commit 60b97c04cce28a51aedc46dc74db63f7bc1cc930
+Subproject commit 3bc8dc554648d59dc7bec9a5d9c5882415ececcb
diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
index 98bc129461..434608d6e0 100644
--- a/tests/CMakeLists.txt
+++ b/tests/CMakeLists.txt
@@ -63,6 +63,10 @@ target_include_directories(OpenSpaceTest
 target_compile_definitions(OpenSpaceTest PUBLIC "GHL_THROW_ON_ASSERT")
 target_link_libraries(OpenSpaceTest PUBLIC Catch2 openspace-core sgct)
 
+target_precompile_headers(OpenSpaceTest PRIVATE
+  <catch2/catch_test_macros.hpp>
+)
+
 foreach (library_name ${all_enabled_modules})
   get_target_property(library_type ${library_name} TYPE)
   if (NOT ${library_type} STREQUAL "SHARED_LIBRARY")

From 902da116e782869df0262770c03a4a878eef91ba Mon Sep 17 00:00:00 2001
From: Alexander Bock <alexander.bock@liu.se>
Date: Tue, 9 Jan 2024 15:34:54 +0100
Subject: [PATCH 225/701] Remove interesting times (closes #2991)

---
 include/openspace/scene/scene.h               | 19 ---------------
 modules/imgui/src/guispacetimecomponent.cpp   | 24 -------------------
 .../include/topics/flightcontrollertopic.h    |  1 -
 .../src/topics/flightcontrollertopic.cpp      | 19 ---------------
 src/scene/scene.cpp                           |  9 -------
 src/scene/scene_lua.inl                       | 10 --------
 6 files changed, 82 deletions(-)

diff --git a/include/openspace/scene/scene.h b/include/openspace/scene/scene.h
index 7aed9df083..72580a8a9e 100644
--- a/include/openspace/scene/scene.h
+++ b/include/openspace/scene/scene.h
@@ -213,24 +213,6 @@ public:
      */
     void updateInterpolations();
 
-    /**
-     * Adds the provided \p time as an interesting time to this scene. The same time can
-     * be added multiple times.
-     *
-     * \param time The time that should be added
-     *
-     * \pre \p time.time must not be empty
-     * \pre \p time.name must not be empty
-     */
-    void addInterestingTime(InterestingTime time);
-
-    /**
-     * Returns the list of all interesting times that are defined for this scene.
-     *
-     * \return The list of all interesting times that are defined for this scene
-     */
-    const std::vector<InterestingTime>& interestingTimes() const;
-
     /**
      * Returns the Lua library that contains all Lua functions available to change the
      * scene graph.
@@ -334,7 +316,6 @@ private:
     SceneGraphNode _rootDummy;
     std::unique_ptr<SceneInitializer> _initializer;
     std::string _profilePropertyName;
-    std::vector<InterestingTime> _interestingTimes;
     bool _valueIsTable = false;
 
     std::mutex _programUpdateLock;
diff --git a/modules/imgui/src/guispacetimecomponent.cpp b/modules/imgui/src/guispacetimecomponent.cpp
index 0a7bf9dbc7..336000d2f5 100644
--- a/modules/imgui/src/guispacetimecomponent.cpp
+++ b/modules/imgui/src/guispacetimecomponent.cpp
@@ -192,30 +192,6 @@ void GuiSpaceTimeComponent::render() {
     CaptionText("Time Controls");
     ImGui::SetCursorPosY(ImGui::GetCursorPosY() + 10.f);
 
-    const std::vector<Scene::InterestingTime>& interestingTimes =
-        global::renderEngine->scene()->interestingTimes();
-    if (!interestingTimes.empty()) {
-        ImGui::Text("%s", "Interesting Times");
-
-        for (size_t i = 0; i < interestingTimes.size(); ++i) {
-            const Scene::InterestingTime& t = interestingTimes[i];
-            if (ImGui::Button(t.name.c_str())) {
-
-                // No sync or send because time settings are always synced and sent
-                // to the connected nodes and peers
-                global::scriptEngine->queueScript(
-                    "openspace.time.setTime(\"" + t.time + "\")",
-                    scripting::ScriptEngine::ShouldBeSynchronized::No,
-                    scripting::ScriptEngine::ShouldSendToRemote::No
-                );
-            }
-
-            if (i != interestingTimes.size() - 1) {
-                ImGui::SameLine();
-            }
-        }
-    }
-
     ImGui::SetCursorPosY(ImGui::GetCursorPosY() + 10.f);
 
     ImGui::Text(
diff --git a/modules/server/include/topics/flightcontrollertopic.h b/modules/server/include/topics/flightcontrollertopic.h
index 4a58a30696..97afe52a41 100644
--- a/modules/server/include/topics/flightcontrollertopic.h
+++ b/modules/server/include/topics/flightcontrollertopic.h
@@ -63,7 +63,6 @@ private:
     void disconnect();
     void processInputState(const nlohmann::json& json);
     void setFocusNodes();
-    void setInterestingTimes();
     void updateView(const nlohmann::json& json) const;
     void changeFocus(const nlohmann::json& json) const;
     void setRenderableEnabled(const nlohmann::json& json) const;
diff --git a/modules/server/src/topics/flightcontrollertopic.cpp b/modules/server/src/topics/flightcontrollertopic.cpp
index ec1b172e0e..4bba9cfa65 100644
--- a/modules/server/src/topics/flightcontrollertopic.cpp
+++ b/modules/server/src/topics/flightcontrollertopic.cpp
@@ -213,7 +213,6 @@ void FlightControllerTopic::connect() {
     std::fill(_inputState.axes.begin(), _inputState.axes.end(), 0.f);
     _payload[TypeKey] = Connect;
     setFocusNodes();
-    setInterestingTimes();
     _payload[Connect][FocusNodesKey] = _focusNodes;
     _payload[Connect][AllNodesKey] = _allNodes;
     _payload[Connect][InterestingTimesKey] = _interestingTimes;
@@ -258,25 +257,7 @@ void FlightControllerTopic::setFocusNodes() {
     }
 }
 
-void FlightControllerTopic::setInterestingTimes() {
-    std::vector<Scene::InterestingTime> times =
-        global::renderEngine->scene()->interestingTimes();
-
-    std::sort(
-        times.begin(),
-        times.end(),
-        [](Scene::InterestingTime lhs, Scene::InterestingTime rhs) {
-            return lhs.name < rhs.name;
-        }
-    );
-
-    for (const Scene::InterestingTime& t : times) {
-        _interestingTimes[t.name] = t.time;
-    }
-}
-
 void FlightControllerTopic::updateView(const nlohmann::json& json) const {
-
     if (json.find(RenderableKey) != json.end()) {
         setRenderableEnabled(json);
     }
diff --git a/src/scene/scene.cpp b/src/scene/scene.cpp
index 5b020fb8df..1134d008fd 100644
--- a/src/scene/scene.cpp
+++ b/src/scene/scene.cpp
@@ -572,14 +572,6 @@ void Scene::updateInterpolations() {
     );
 }
 
-void Scene::addInterestingTime(InterestingTime time) {
-    _interestingTimes.push_back(std::move(time));
-}
-
-const std::vector<Scene::InterestingTime>& Scene::interestingTimes() const {
-    return _interestingTimes;
-}
-
 void Scene::setPropertiesFromProfile(const Profile& p) {
     ghoul::lua::LuaState L(ghoul::lua::LuaState::IncludeStandardLibrary::Yes);
 
@@ -873,7 +865,6 @@ scripting::LuaLibrary Scene::luaLibrary() {
             codegen::lua::SceneGraphNodes,
             codegen::lua::NodeByRenderableType,
             codegen::lua::ScreenSpaceRenderables,
-            codegen::lua::AddInterestingTime,
             codegen::lua::WorldPosition,
             codegen::lua::WorldRotation,
             codegen::lua::SetParent,
diff --git a/src/scene/scene_lua.inl b/src/scene/scene_lua.inl
index f5728f5ed5..3d7bc74554 100644
--- a/src/scene/scene_lua.inl
+++ b/src/scene/scene_lua.inl
@@ -924,16 +924,6 @@ namespace {
     return res;
 }
 
-/**
- * Adds an interesting time to the current scene. The first argument is the name of the
- * time and the second argument is the time itself in the format YYYY-MM-DDThh:mm:ss.uuu
- */
-[[codegen::luawrap]] void addInterestingTime(std::string name, std::string time) {
-    openspace::global::renderEngine->scene()->addInterestingTime(
-        { std::move(name), std::move(time) }
-    );
-}
-
 /**
  * Returns the world position of the scene graph node with the given string as identifier.
  */

From cae9834ec78c098e745f770e7dd106dabd049596 Mon Sep 17 00:00:00 2001
From: Alexander Bock <alexander.bock@liu.se>
Date: Tue, 9 Jan 2024 15:44:22 +0100
Subject: [PATCH 226/701] Add log rotation function to the Script log as well
 (closes #2995)

---
 include/openspace/engine/configuration.h |  1 +
 src/engine/configuration.cpp             |  6 +++++
 src/engine/openspaceengine.cpp           | 32 ++++++++++++++++++++++++
 3 files changed, 39 insertions(+)

diff --git a/include/openspace/engine/configuration.h b/include/openspace/engine/configuration.h
index b6174030bf..20eb637564 100644
--- a/include/openspace/engine/configuration.h
+++ b/include/openspace/engine/configuration.h
@@ -78,6 +78,7 @@ struct Configuration {
     Logging logging;
 
     std::string scriptLog;
+    int scriptLogRotation = 3;
 
     struct DocumentationInfo {
         std::string path;
diff --git a/src/engine/configuration.cpp b/src/engine/configuration.cpp
index cdec76b78b..56470ef0e9 100644
--- a/src/engine/configuration.cpp
+++ b/src/engine/configuration.cpp
@@ -134,6 +134,10 @@ namespace {
         // from previous runs) will be silently overwritten
         std::optional<std::string> scriptLog;
 
+        // If this value is specified, this many number of script log files are being
+        // retained before overwriting any
+        std::optional<int> scriptLogRotation;
+
         struct Documentation {
             // The path where the documentation files will be stored
             std::optional<std::string> path;
@@ -368,6 +372,7 @@ ghoul::Dictionary Configuration::createDictionary() {
     }
 
     res.setValue("ScriptLog", scriptLog);
+    res.setValue("ScriptLogRotation", scriptLogRotation);
 
     {
         ghoul::Dictionary documentationDict;
@@ -518,6 +523,7 @@ void parseLuaState(Configuration& configuration) {
     c.fontSize.cameraInfo = p.fontSize.cameraInfo;
     c.fontSize.versionInfo = p.fontSize.versionInfo;
     c.scriptLog = p.scriptLog.value_or(c.scriptLog);
+    c.scriptLogRotation = p.scriptLogRotation.value_or(3);
     c.versionCheckUrl = p.versionCheckUrl.value_or(c.versionCheckUrl);
     c.useMultithreadedInitialization =
         p.useMultithreadedInitialization.value_or(c.useMultithreadedInitialization);
diff --git a/src/engine/openspaceengine.cpp b/src/engine/openspaceengine.cpp
index 2637341fef..39885b8bb6 100644
--- a/src/engine/openspaceengine.cpp
+++ b/src/engine/openspaceengine.cpp
@@ -308,6 +308,38 @@ void OpenSpaceEngine::initialize() {
     }
 #endif // GHOUL_LOGGING_ENABLE_TRACE
 
+    if (!global::configuration->scriptLog.empty() &&
+        global::configuration->scriptLogRotation > 0)
+    {
+        int rot = global::configuration->scriptLogRotation;
+        while (rot > 0) {
+            // Move all of the existing logs one position up
+
+            std::filesystem::path file = absPath(global::configuration->scriptLog);
+            std::string fname = file.stem().string();
+            std::string ext = file.extension().string();
+
+            std::filesystem::path newCandidate = file;
+            newCandidate.replace_filename(fmt::format("{}-{}{}", fname, rot, ext));
+
+            std::filesystem::path oldCandidate = file;
+            if (rot > 1) {
+                // We don't actually have a -0 version, it is just the base name
+                oldCandidate.replace_filename(
+                    fmt::format("{}-{}{}", fname, rot - 1, ext)
+                );
+            }
+
+            if (std::filesystem::exists(newCandidate)) {
+                std::filesystem::remove(newCandidate);
+            }
+            if (std::filesystem::exists(oldCandidate)) {
+                std::filesystem::rename(oldCandidate, newCandidate);
+            }
+
+            rot--;
+        }
+    }
 
 
     LINFOC("OpenSpace Version", std::string(OPENSPACE_VERSION_STRING_FULL));

From ab925174b55dfea9432c69a6b25d8b28ab05b457 Mon Sep 17 00:00:00 2001
From: GPayne <payne.gene@gmail.com>
Date: Thu, 11 Jan 2024 14:31:00 -0700
Subject: [PATCH 227/701] Fix for crash when reading meta of corrupt config
 file

---
 apps/OpenSpace/ext/launcher/src/launcherwindow.cpp | 13 ++++++++++---
 apps/OpenSpace/ext/sgct                            |  2 +-
 2 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/apps/OpenSpace/ext/launcher/src/launcherwindow.cpp b/apps/OpenSpace/ext/launcher/src/launcherwindow.cpp
index 75525bdf7f..9c507e4f1d 100644
--- a/apps/OpenSpace/ext/launcher/src/launcherwindow.cpp
+++ b/apps/OpenSpace/ext/launcher/src/launcherwindow.cpp
@@ -588,10 +588,17 @@ bool handleConfigurationFile(QComboBox& box, const std::filesystem::directory_en
 
     // Add tooltip
     if (isJson) {
-        sgct::config::Meta meta = sgct::readMeta(p.path().string(), true);
-        if (!meta.description.empty()) {
+        std::string tooltipDescription;
+        try {
+            sgct::config::Meta meta = sgct::readMeta(p.path().string());
+            tooltipDescription = meta.description;
+        }
+        catch (const sgct::Error&) {
+            tooltipDescription = "(no description available)";
+        }
+        if (!tooltipDescription.empty()) {
             QString toolTip = QString::fromStdString(
-                fmt::format("<p>{}</p>", meta.description)
+                fmt::format("<p>{}</p>", tooltipDescription)
             );
             box.setItemData(box.count() - 1, toolTip, Qt::ToolTipRole);
         }
diff --git a/apps/OpenSpace/ext/sgct b/apps/OpenSpace/ext/sgct
index e2e1b99a2d..9ee34038be 160000
--- a/apps/OpenSpace/ext/sgct
+++ b/apps/OpenSpace/ext/sgct
@@ -1 +1 @@
-Subproject commit e2e1b99a2de784d1774d8b72262fc4def2f0b5ce
+Subproject commit 9ee34038be3a8c0fe2410e5f511688f1ff816392

From 04a06520e59b25339b43c8ca05f92e6073d96ebc Mon Sep 17 00:00:00 2001
From: Alexander Bock <alexander.bock@liu.se>
Date: Fri, 12 Jan 2024 10:10:49 +0100
Subject: [PATCH 228/701] Provide a warning instead of erroring out with the
 localResource/syncedResource -> resource change

---
 src/scene/assetmanager.cpp | 61 ++++++++++++++++++++++++++++++++++----
 1 file changed, 55 insertions(+), 6 deletions(-)

diff --git a/src/scene/assetmanager.cpp b/src/scene/assetmanager.cpp
index 1a9c0ec6a7..755be4a9d9 100644
--- a/src/scene/assetmanager.cpp
+++ b/src/scene/assetmanager.cpp
@@ -555,29 +555,78 @@ void AssetManager::setUpAssetLuaTable(Asset* asset) {
     );
     lua_setfield(*_luaState, assetTableIndex, "resource");
 
+    // @DEPRECATED(abock) This should be removed after 0.20.0
+    ghoul::lua::push(*_luaState, this, asset);
     lua_pushcclosure(
         *_luaState,
         [](lua_State* L) {
-            return ghoul::lua::luaError(
-                L,
+            LWARNING(
                 "'asset.localResource' has been deprecrated and should be replaced with "
                 "'asset.resource' instead. No change to the parameters are needed"
             );
+
+            AssetManager* manager = ghoul::lua::userData<AssetManager>(L, 1);
+            Asset* thisAsset = ghoul::lua::userData<Asset>(L, 2);
+            ghoul::lua::checkArgumentsAndThrow(L, { 0, 1 }, "lua::resource");
+
+            auto [name] = ghoul::lua::values<std::optional<std::string>>(L);
+            std::filesystem::path path =
+                name.has_value() ?
+                thisAsset->path().parent_path() / *name :
+                thisAsset->path().parent_path();
+            ghoul::lua::push(L, path);
+
+            return 1;
         },
-        0
+        2
     );
     lua_setfield(*_luaState, assetTableIndex, "localResource");
 
+    // @DEPRECATED(abock) This should be removed after 0.20.0
+    ghoul::lua::push(*_luaState, this, asset);
     lua_pushcclosure(
         *_luaState,
         [](lua_State* L) {
-            return ghoul::lua::luaError(
-                L,
+            LWARNING(
                 "'asset.syncedResource' has been deprecrated and should be replaced with "
                 "'asset.resource' instead. No change to the parameters are needed"
             );
+
+            AssetManager* manager = ghoul::lua::userData<AssetManager>(L, 1);
+            Asset* thisAsset = ghoul::lua::userData<Asset>(L, 2);
+            ghoul::lua::checkArgumentsAndThrow(L, { 0, 1 }, "lua::resource");
+
+            ghoul::Dictionary d = ghoul::lua::value<ghoul::Dictionary>(L);
+            std::unique_ptr<ResourceSynchronization> s =
+                ResourceSynchronization::createFromDictionary(d);
+
+            std::string uid = d.value<std::string>("Type") + "/" + s->generateUid();
+            SyncItem* syncItem = nullptr;
+            auto it = manager->_synchronizations.find(uid);
+            if (it == manager->_synchronizations.end()) {
+                auto si = std::make_unique<SyncItem>();
+                si->synchronization = std::move(s);
+                si->assets.push_back(thisAsset);
+                syncItem = si.get();
+                manager->_synchronizations[uid] = std::move(si);
+            }
+            else {
+                syncItem = it->second.get();
+                syncItem->assets.push_back(thisAsset);
+            }
+
+            if (!syncItem->synchronization->isResolved()) {
+                manager->_unfinishedSynchronizations.push_back(syncItem);
+            }
+
+            thisAsset->addSynchronization(syncItem->synchronization.get());
+            std::filesystem::path path = syncItem->synchronization->directory();
+            path += std::filesystem::path::preferred_separator;
+            ghoul::lua::push(L, path);
+
+            return 1;
         },
-        0
+        2
     );
     lua_setfield(*_luaState, assetTableIndex, "syncedResource");
 

From 3cf06d26a62480b2ec2fd743d414ed64450cb779 Mon Sep 17 00:00:00 2001
From: Alexander Bock <alexander.bock@liu.se>
Date: Fri, 12 Jan 2024 15:16:40 +0100
Subject: [PATCH 229/701] Make the RenderableFOV and Missions more resilient to
 empty values being passed

---
 .../rendering/renderablefov.cpp               | 36 +++++++++++--------
 src/mission/mission.cpp                       |  2 +-
 2 files changed, 22 insertions(+), 16 deletions(-)

diff --git a/modules/spacecraftinstruments/rendering/renderablefov.cpp b/modules/spacecraftinstruments/rendering/renderablefov.cpp
index e25e156eaf..5c23b7edfd 100644
--- a/modules/spacecraftinstruments/rendering/renderablefov.cpp
+++ b/modules/spacecraftinstruments/rendering/renderablefov.cpp
@@ -447,20 +447,26 @@ bool RenderableFov::isReady() const {
 glm::dvec3 RenderableFov::orthogonalProjection(const glm::dvec3& vecFov, double time,
                                                const std::string& target) const
 {
-    const glm::dvec3 vecToTarget = SpiceManager::ref().targetPosition(
-        target,
-        _instrument.spacecraft,
-        _instrument.referenceFrame,
-        _instrument.aberrationCorrection,
-        time
-    );
-    const glm::dvec3 fov = SpiceManager::ref().frameTransformationMatrix(
-        _instrument.name,
-        _instrument.referenceFrame,
-        time
-    ) * vecFov;
-    const glm::dvec3 p = glm::proj(vecToTarget, fov);
-    return p  * 1000.0; // km -> m
+    if (target.empty()) {
+        glm::dvec3 vec = glm::dvec3(1.0, 0.0, 0.0);
+        return glm::normalize(glm::cross(vec, vecFov));
+    }
+    else {
+        const glm::dvec3 vecToTarget = SpiceManager::ref().targetPosition(
+            target,
+            _instrument.spacecraft,
+            _instrument.referenceFrame,
+            _instrument.aberrationCorrection,
+            time
+        );
+        const glm::dvec3 fov = SpiceManager::ref().frameTransformationMatrix(
+            _instrument.name,
+            _instrument.referenceFrame,
+            time
+        ) * vecFov;
+        const glm::dvec3 p = glm::proj(vecToTarget, fov);
+        return p * 1000.0; // km -> m
+    }
 }
 
 void RenderableFov::computeIntercepts(double time, const std::string& target,
@@ -849,7 +855,7 @@ std::pair<std::string, bool> RenderableFov::determineTarget(double time) {
 
     // If none of the targets is in field of view, either use the last target or if there
     // hasn't been one, find the closest target
-    if (_previousTarget.empty()) {
+    if (_previousTarget.empty() && !_instrument.potentialTargets.empty()) {
         // If we reached this, we haven't found a target in field of view and we don't
         // have a previously selected target, so the next best heuristic for a target is
         // the closest one
diff --git a/src/mission/mission.cpp b/src/mission/mission.cpp
index aace145035..841a4cc667 100644
--- a/src/mission/mission.cpp
+++ b/src/mission/mission.cpp
@@ -92,7 +92,7 @@ MissionPhase::MissionPhase(const ghoul::Dictionary& dictionary) {
     _image = p.image.value_or(_image);
     _link = p.link.value_or(_link);
 
-    if (p.phases.has_value()) {
+    if (p.phases.has_value() && !p.phases->empty()) {
         _subphases.reserve(p.phases->size());
         for (const ghoul::Dictionary& phase : *p.phases) {
             _subphases.emplace_back(phase);

From 15aaae300782554c37191f0cf980e6dc8b476647 Mon Sep 17 00:00:00 2001
From: Alexander Bock <alexander.bock@liu.se>
Date: Fri, 12 Jan 2024 15:20:00 +0100
Subject: [PATCH 230/701] Spice kernel handling cleanup

---
 .../missions/voyager/voyager2.asset           |  3 ++-
 .../euclid/{spice.asset => kernels.asset}     |  0
 .../solarsystem/telescopes/euclid/model.asset |  7 +++---
 .../telescopes/euclid/trails.asset            | 23 ++++++++++---------
 .../solarsystem/telescopes/jwst/trail.asset   |  2 +-
 5 files changed, 19 insertions(+), 16 deletions(-)
 rename data/assets/scene/solarsystem/telescopes/euclid/{spice.asset => kernels.asset} (100%)

diff --git a/data/assets/scene/solarsystem/missions/voyager/voyager2.asset b/data/assets/scene/solarsystem/missions/voyager/voyager2.asset
index b7c8a5b60d..169d7fbe06 100644
--- a/data/assets/scene/solarsystem/missions/voyager/voyager2.asset
+++ b/data/assets/scene/solarsystem/missions/voyager/voyager2.asset
@@ -1,5 +1,6 @@
 local sun = asset.require("scene/solarsystem/sun/sun")
 local sunTransforms = asset.require("scene/solarsystem/sun/transforms")
+local coreKernels = asset.require("spice/core")
 
 
 
@@ -57,7 +58,7 @@ local Voyager2 = {
     Rotation = {
       Type = "SpiceRotation",
       SourceFrame = "VG2_SC_BUS",
-      DestinationFrame = "GALACTIC"
+      DestinationFrame = coreKernels.Frame.Galactic
     }
   },
   GUI = {
diff --git a/data/assets/scene/solarsystem/telescopes/euclid/spice.asset b/data/assets/scene/solarsystem/telescopes/euclid/kernels.asset
similarity index 100%
rename from data/assets/scene/solarsystem/telescopes/euclid/spice.asset
rename to data/assets/scene/solarsystem/telescopes/euclid/kernels.asset
diff --git a/data/assets/scene/solarsystem/telescopes/euclid/model.asset b/data/assets/scene/solarsystem/telescopes/euclid/model.asset
index c837d8a779..a809d2f482 100644
--- a/data/assets/scene/solarsystem/telescopes/euclid/model.asset
+++ b/data/assets/scene/solarsystem/telescopes/euclid/model.asset
@@ -1,6 +1,7 @@
 local transform = asset.require("scene/solarsystem/planets/earth/transforms")
 local sun = asset.require("scene/solarsystem/sun/sun")
-local spice = asset.require("./spice")
+local kernels = asset.require("./kernels")
+local coreKernels = asset.require("spice/core")
 
 
 
@@ -23,8 +24,8 @@ local Euclid = {
   Transform = {
     Translation = {
       Type = "SpiceTranslation",
-      Target = spice.ID.Euclid,
-      Observer = "EARTH BARYCENTER"
+      Target = kernels.ID.Euclid,
+      Observer = coreKernels.ID.EarthBarycenter
     },
     Rotation = {
       Type = "FixedRotation",
diff --git a/data/assets/scene/solarsystem/telescopes/euclid/trails.asset b/data/assets/scene/solarsystem/telescopes/euclid/trails.asset
index b00a11b34e..9f54671974 100644
--- a/data/assets/scene/solarsystem/telescopes/euclid/trails.asset
+++ b/data/assets/scene/solarsystem/telescopes/euclid/trails.asset
@@ -1,7 +1,8 @@
-local spice = asset.require("./spice")
+local kernels = asset.require("./kernels")
 local earth = asset.require("scene/solarsystem/planets/earth/transforms")
 local solarsystem = asset.require("scene/solarsystem/sun/transforms")
 local transforms = asset.require("scene/solarsystem/planets/earth/lagrange_points/l2")
+local coreKernels = asset.require("spice/core")
 
 
 local StartTime = "2023 JUL 01 15:53:08.239"
@@ -14,8 +15,8 @@ local EuclidTrailSun = {
     Type = "RenderableTrailTrajectory",
     Translation = {
       Type = "SpiceTranslation",
-      Target = spice.ID.Euclid,
-      Observer = "SSB"
+      Target = kernels.ID.Euclid,
+      Observer = coreKernels.ID.SolarSystemBarycenter
     },
     Color = { 0.70, 0.50, 0.20 },
     StartTime = StartTime,
@@ -35,8 +36,8 @@ local EuclidTrailEarth = {
     Type = "RenderableTrailTrajectory",
     Translation = {
       Type = "SpiceTranslation",
-      Target = spice.ID.Euclid,
-      Observer = "EARTH BARYCENTER"
+      Target = kernels.ID.Euclid,
+      Observer = coreKernels.ID.EarthBarycenter
     },
     Color = { 0.325, 0.65, 0.55 },
     StartTime = StartTime,
@@ -61,9 +62,9 @@ local EuclidTrailOrbit = {
     Type = "RenderableTrailOrbit",
     Translation = {
       Type = "SpiceTranslation",
-      Target = spice.ID.Euclid,
-      Observer = 392, -- L2
-      Frame = "GALACTIC"
+      Target = kernels.ID.Euclid,
+      Observer = l2.ID.L2,
+      Frame = coreKernels.Frame.Galactic
     },
     Color = { 0.863, 0.0, 0.902 },
     Period = 182.621099, -- About 6 months
@@ -88,9 +89,9 @@ local EuclidTrailCoRevOrbit = {
     Type = "RenderableTrailOrbit",
     Translation = {
       Type = "SpiceTranslation",
-      Target = spice.ID.Euclid,
-      Observer = 392, -- L2
-      Frame = "L2_COREV"
+      Target = kernels.ID.Euclid,
+      Observer = l2.ID.L2,
+      Frame = l2.Frame.L2Corevolving
     },
     Color = { 0.863, 0.0, 0.902 },
     Period = 182.621099, -- About 6 months
diff --git a/data/assets/scene/solarsystem/telescopes/jwst/trail.asset b/data/assets/scene/solarsystem/telescopes/jwst/trail.asset
index 83f0d266eb..823714fe8d 100644
--- a/data/assets/scene/solarsystem/telescopes/jwst/trail.asset
+++ b/data/assets/scene/solarsystem/telescopes/jwst/trail.asset
@@ -91,7 +91,7 @@ local JWSTTrailOrbit = {
       Type = "SpiceTranslation",
       Target = kernels.ID.JWST,
       Observer = transforms.ID.L2,
-      Frame = "GALACTIC"
+      Frame = coreKernels.Frame.Galactic
     },
     Color = { 0.863, 0.0, 0.902 },
     Period = 182.621099, -- About 6 months

From 385d23303d1483745bbe18a12bc118091c359491 Mon Sep 17 00:00:00 2001
From: Emma Broman <emma.broman@liu.se>
Date: Mon, 15 Jan 2024 16:32:19 +0100
Subject: [PATCH 231/701] Prevent point cloud from never getting ready if no
 dataset was added

Fixes issue that Voids were not begin rendered
---
 .../base/rendering/pointcloud/renderablepointcloud.cpp    | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/modules/base/rendering/pointcloud/renderablepointcloud.cpp b/modules/base/rendering/pointcloud/renderablepointcloud.cpp
index f43acf279a..0733849ece 100644
--- a/modules/base/rendering/pointcloud/renderablepointcloud.cpp
+++ b/modules/base/rendering/pointcloud/renderablepointcloud.cpp
@@ -589,7 +589,7 @@ RenderablePointCloud::RenderablePointCloud(const ghoul::Dictionary& dictionary)
 }
 
 bool RenderablePointCloud::isReady() const {
-    bool isReady = _program && !_dataset.entries.empty();
+    bool isReady = _program;
 
     // If we have labels, they also need to be loaded
     if (_hasLabels) {
@@ -691,6 +691,10 @@ void RenderablePointCloud::renderBillboards(const RenderData& data,
                                             const glm::dvec3& orthoUp,
                                             float fadeInVariable)
 {
+    if (!_hasDataFile || _dataset.entries.empty()) {
+        return;
+    }
+
     glEnablei(GL_BLEND, 0);
 
     if (_useAdditiveBlending) {
@@ -861,7 +865,7 @@ int RenderablePointCloud::nAttributesPerPoint() const {
 }
 
 void RenderablePointCloud::updateBufferData() {
-    if (!_hasDataFile) {
+    if (!_hasDataFile || _dataset.entries.empty()) {
         return;
     }
 

From 6fb4b89a121a2d6a7cd61d85bf2639fa10d881f6 Mon Sep 17 00:00:00 2001
From: Emma Broman <emma.broman@liu.se>
Date: Mon, 15 Jan 2024 16:38:56 +0100
Subject: [PATCH 232/701] Prevent setting ScaleExponent to an invalid value

May happen if no dataset was read or if the dataset only incudes (0,0,0)
---
 .../pointcloud/renderablepointcloud.cpp       | 20 ++++++++++---------
 1 file changed, 11 insertions(+), 9 deletions(-)

diff --git a/modules/base/rendering/pointcloud/renderablepointcloud.cpp b/modules/base/rendering/pointcloud/renderablepointcloud.cpp
index 0733849ece..f7319b3bea 100644
--- a/modules/base/rendering/pointcloud/renderablepointcloud.cpp
+++ b/modules/base/rendering/pointcloud/renderablepointcloud.cpp
@@ -572,16 +572,18 @@ RenderablePointCloud::RenderablePointCloud(const ghoul::Dictionary& dictionary)
             _dataset = dataloader::data::loadFile(_dataFile, _dataMapping);
         }
         _nDataPoints = static_cast<unsigned int>(_dataset.entries.size());
-    }
 
-    // If no scale exponent was specified, compute one that will at least show the points
-    // based on the scale of the positions in the dataset
-    if (!p.sizeSettings.has_value() || !p.sizeSettings->scaleExponent.has_value()) {
-        double dist = _dataset.maxPositionComponent * toMeter(_unit);
-        float exponent = static_cast<float>(std::log10(dist));
-        // Reduce the actually used exponent a little bit, as just using the logarithm
-        // as is leads to very large points
-        _sizeSettings.scaleExponent = 0.9f * exponent;
+        // If no scale exponent was specified, compute one that will at least show the
+        // points based on the scale of the positions in the dataset
+        if (!p.sizeSettings.has_value() || !p.sizeSettings->scaleExponent.has_value()) {
+            double dist = _dataset.maxPositionComponent * toMeter(_unit);
+            if (dist > 0.0) {
+                float exponent = static_cast<float>(std::log10(dist));
+                // Reduce the actually used exponent a little bit, as just using the
+                // logarithm as is leads to very large points
+                _sizeSettings.scaleExponent = 0.9f * exponent;
+            }
+        }
     }
 
     _nDataPoints.setReadOnly(true);

From 640ca3ed4912dc289218c3477899f4d1b692a0e7 Mon Sep 17 00:00:00 2001
From: Emma Broman <emma.broman@liu.se>
Date: Wed, 17 Jan 2024 13:46:49 +0100
Subject: [PATCH 233/701] Feature/point cloud labels from csv (#2989)

* Add ability to load labels directly from CSV/SPECK for PointClouds

* Provide some more docs

* Update the example asset for point clouds

* Make both examples visible

* Some cleanup

* Apply suggestions from code review

Co-authored-by: Alexander Bock <alexander.bock@liu.se>

---------

Co-authored-by: Alexander Bock <alexander.bock@liu.se>
---
 .../pointclouds/points_units_labels.asset     | 69 +++++++++++++++----
 include/openspace/data/dataloader.h           |  1 +
 include/openspace/data/datamapping.h          |  3 +
 include/openspace/rendering/labelscomponent.h | 17 ++++-
 .../rendering/grids/renderableboxgrid.cpp     |  1 -
 .../base/rendering/grids/renderablegrid.cpp   |  1 -
 .../rendering/grids/renderableradialgrid.cpp  |  1 -
 .../grids/renderablesphericalgrid.cpp         |  1 -
 .../pointcloud/renderablepointcloud.cpp       | 29 +++++---
 .../rendering/renderableplanescloud.cpp       |  1 -
 .../renderableconstellationsbase.cpp          |  1 -
 src/data/csvloader.cpp                        | 11 ++-
 src/data/dataloader.cpp                       | 17 +++++
 src/data/datamapping.cpp                      | 30 ++++++--
 src/rendering/labelscomponent.cpp             | 27 +++++++-
 15 files changed, 171 insertions(+), 39 deletions(-)

diff --git a/data/assets/examples/pointclouds/points_units_labels.asset b/data/assets/examples/pointclouds/points_units_labels.asset
index a1d02c3247..e124879bcb 100644
--- a/data/assets/examples/pointclouds/points_units_labels.asset
+++ b/data/assets/examples/pointclouds/points_units_labels.asset
@@ -1,6 +1,6 @@
 local earthAsset = asset.require("scene/solarsystem/planets/earth/earth")
 
-
+-- @TODO The labels are not correctly oriented towards the camera!
 
 local Example = {
   Identifier = "ExamplePoints_UnitsAndLabels",
@@ -9,46 +9,89 @@ local Example = {
     Type = "RenderablePointCloud",
     File = asset.resource("data/dummydata.csv"),
     Coloring = {
-      FixedColor = { 0.0, 0.3, 1.0 }
+      FixedColor = { 0.3, 0.8, 0.3 }
+    },
+    DataMapping = {
+      -- When loading labels from a CSV file, we need to provide information about
+      -- which column corresponds to the name to be used for the labels (this is
+      -- not required for SPECK files)
+      Name = "number_withNan"
     },
     -- Add a unit to interpret the points to be in kilometers rather than meters
     Unit = "Km",
-    -- Also load a label file with the same position information as the CSV file.
-    -- The unit should be the same as the renderable
+    -- Add some labels. We also need to enable them for them to be visible.
+    -- Since we do not specify a label file (see below), the positions and text of
+    -- of the labels will be set based on the information in the CSV file
     Labels = {
       Enabled = true,
-      File = asset.resource("data/dummydata.label"),
-      Size = 7.5,
-      Unit = "Km"
+      Size = 7.5
     }
-    -- @TODO The labels are not correctly oriented towards the camera!
   },
   GUI = {
     Name = "Units & Labels",
     Path = "/Example/Point Clouds",
-    Description = [[Example of a point cloud where a spcific unit is used when
-      interpreting the position values, and text labels are placed at the points]]
+    Description = [[Example of a point cloud with labels created by specifying a 'Name'
+      column for the dataset. The positions of the labels will exactly match that of the
+      points]]
+  }
+}
+
+local Example_LabelFromFile = {
+  Identifier = "ExamplePoints_UnitsAndLabels_File",
+  Parent = earthAsset.Earth.Identifier,
+  -- Rotate to not overlap with the other dataset
+  Transform = {
+    Rotation = {
+      Type = "StaticRotation",
+      Rotation = { 0, 0, -0.5 * math.pi }
+    }
+  },
+  Renderable = {
+    Type = "RenderablePointCloud",
+    File = asset.resource("data/dummydata.csv"),
+    Coloring = {
+      FixedColor = { 0.0, 0.3, 1.0 }
+    },
+    -- Add a unit to interpret the points to be in kilometers rather than meters
+    Unit = "Km",
+    -- Also load a label file with the positions of the label (in this case they are the
+    -- same as in the CSV file, but that is not always the case)
+    Labels = {
+      Enabled = true,
+      File = asset.resource("data/dummydata.label"),
+      Size = 7.5,
+      -- When we add an explicit label file we also have to specify the unit, if it is
+      -- different than meters
+      Unit = "Km"
+    }
+  },
+  GUI = {
+    Name = "Units & Labels (Explicit Label file)",
+    Path = "/Example/Point Clouds",
+    Description = [[Example of a point cloud with labels, created from a label file]]
   }
 }
 
 
 asset.onInitialize(function()
   openspace.addSceneGraphNode(Example)
+  openspace.addSceneGraphNode(Example_LabelFromFile)
 end)
 
 asset.onDeinitialize(function()
+  openspace.removeSceneGraphNode(Example_LabelFromFile)
   openspace.removeSceneGraphNode(Example)
 end)
 
 asset.export(Example)
-
+asset.export(Example_LabelFromFile)
 
 
 asset.meta = {
   Name = "Example - Point Cloud with Unit and Labels",
   Version = "1.0",
-  Description = [[Example of a point cloud where a spcific unit is used when
-    interpreting the position values, and text labels are placed at the points]],
+  Description = [[Example of point clouds with labels, either set from the data file
+    itself or from a separate .label file]],
   Author = "OpenSpace Team",
   URL = "http://openspaceproject.com",
   License = "MIT license"
diff --git a/include/openspace/data/dataloader.h b/include/openspace/data/dataloader.h
index 8e0e5920ca..4c8ef8e918 100644
--- a/include/openspace/data/dataloader.h
+++ b/include/openspace/data/dataloader.h
@@ -119,6 +119,7 @@ namespace label {
 
     Labelset loadFileWithCache(std::filesystem::path path);
 
+    Labelset loadFromDataset(const dataloader::Dataset& dataset);
 } // namespace label
 
 namespace color {
diff --git a/include/openspace/data/datamapping.h b/include/openspace/data/datamapping.h
index bec5890a18..791f4d4420 100644
--- a/include/openspace/data/datamapping.h
+++ b/include/openspace/data/datamapping.h
@@ -44,6 +44,7 @@ struct DataMapping {
     std::optional<std::string> xColumnName;
     std::optional<std::string> yColumnName;
     std::optional<std::string> zColumnName;
+    std::optional<std::string> nameColumn;
 
     std::optional<float> missingDataValue;
 
@@ -69,6 +70,8 @@ bool isColumnY(const std::string& c, const std::optional<DataMapping>& mapping);
 
 bool isColumnZ(const std::string& c, const std::optional<DataMapping>& mapping);
 
+bool isNameColumn(const std::string& c, const std::optional<DataMapping>& mapping);
+
 } // namespace openspace::dataloader
 
 #endif // __OPENSPACE_CORE___DATAMAPPING___H__
diff --git a/include/openspace/rendering/labelscomponent.h b/include/openspace/rendering/labelscomponent.h
index c00fbfc605..ee0c9b6bf3 100644
--- a/include/openspace/rendering/labelscomponent.h
+++ b/include/openspace/rendering/labelscomponent.h
@@ -47,6 +47,20 @@ namespace documentation { struct Documentation; }
 class LabelsComponent : public properties::PropertyOwner, public Fadeable {
 public:
     explicit LabelsComponent(const ghoul::Dictionary& dictionary);
+
+    /**
+     * Create a labels component from an already loaded dataset. That dataset should have
+     * a comment per point to be used for the labels.
+     *
+     * \param dictionary A dictionary with the other information used for constructing
+     *        the dataset
+     * \param dataset The dataset to create the labelset from, including xyz position and
+     *        a string to be used for the text.
+     * \param unit The unit to use when interpreting the point information in the dataset
+     */
+    explicit LabelsComponent(const ghoul::Dictionary& dictionary,
+        const dataloader::Dataset& dataset, DistanceUnit unit);
+
     ~LabelsComponent() override = default;
 
     dataloader::Labelset& labelSet();
@@ -76,7 +90,8 @@ private:
 
     glm::dmat4 _transformationMatrix = glm::dmat4(1.0);
 
-    // Properties
+    bool _createdFromDataset = false;
+
     properties::BoolProperty _enabled;
     properties::Vec3Property _color;
     properties::FloatProperty _size;
diff --git a/modules/base/rendering/grids/renderableboxgrid.cpp b/modules/base/rendering/grids/renderableboxgrid.cpp
index c3712e9eec..e0099c512e 100644
--- a/modules/base/rendering/grids/renderableboxgrid.cpp
+++ b/modules/base/rendering/grids/renderableboxgrid.cpp
@@ -124,7 +124,6 @@ bool RenderableBoxGrid::isReady() const {
 void RenderableBoxGrid::initialize() {
     if (_hasLabels) {
         _labels->initialize();
-        _labels->loadLabels();
     }
 }
 
diff --git a/modules/base/rendering/grids/renderablegrid.cpp b/modules/base/rendering/grids/renderablegrid.cpp
index c75afc7cdc..413885e4a4 100644
--- a/modules/base/rendering/grids/renderablegrid.cpp
+++ b/modules/base/rendering/grids/renderablegrid.cpp
@@ -192,7 +192,6 @@ bool RenderableGrid::isReady() const {
 void RenderableGrid::initialize() {
     if (_hasLabels) {
         _labels->initialize();
-        _labels->loadLabels();
     }
 }
 
diff --git a/modules/base/rendering/grids/renderableradialgrid.cpp b/modules/base/rendering/grids/renderableradialgrid.cpp
index 5c231a3dca..48ed3815e3 100644
--- a/modules/base/rendering/grids/renderableradialgrid.cpp
+++ b/modules/base/rendering/grids/renderableradialgrid.cpp
@@ -169,7 +169,6 @@ bool RenderableRadialGrid::isReady() const {
 void RenderableRadialGrid::initialize() {
     if (_hasLabels) {
         _labels->initialize();
-        _labels->loadLabels();
     }
 }
 
diff --git a/modules/base/rendering/grids/renderablesphericalgrid.cpp b/modules/base/rendering/grids/renderablesphericalgrid.cpp
index a0f2a1fe61..5a4007e82d 100644
--- a/modules/base/rendering/grids/renderablesphericalgrid.cpp
+++ b/modules/base/rendering/grids/renderablesphericalgrid.cpp
@@ -136,7 +136,6 @@ bool RenderableSphericalGrid::isReady() const {
 void RenderableSphericalGrid::initialize() {
     if (_hasLabels) {
         _labels->initialize();
-        _labels->loadLabels();
     }
 }
 
diff --git a/modules/base/rendering/pointcloud/renderablepointcloud.cpp b/modules/base/rendering/pointcloud/renderablepointcloud.cpp
index f7319b3bea..be5d3fd6e6 100644
--- a/modules/base/rendering/pointcloud/renderablepointcloud.cpp
+++ b/modules/base/rendering/pointcloud/renderablepointcloud.cpp
@@ -104,7 +104,10 @@ namespace {
     static const openspace::properties::PropertyOwner::PropertyOwnerInfo LabelsInfo = {
         "Labels",
         "Labels",
-        "The labels for the points"
+        "The labels for the points. If no label file is provided, the labels will be "
+        "created to match the points in the data file. For a CSV file, you should then "
+        "specify which column is the 'Name' column in the data mapping. For SPECK files "
+        "the labels are created from the comment at the end of each line"
     };
 
     constexpr openspace::properties::Property::PropertyInfo RenderOptionInfo = {
@@ -524,14 +527,6 @@ RenderablePointCloud::RenderablePointCloud(const ghoul::Dictionary& dictionary)
 
     _hasSpriteTexture = p.texture.has_value();
 
-    if (p.labels.has_value()) {
-        _labels = std::make_unique<LabelsComponent>(*p.labels);
-        _hasLabels = true;
-        addPropertySubOwner(_labels.get());
-        // Fading of the labels should also depend on the fading of the renderable
-        _labels->setParentFadeable(this);
-    }
-
     _transformationMatrix = p.transformationMatrix.value_or(_transformationMatrix);
 
     if (p.sizeSettings.has_value() && p.sizeSettings->sizeMapping.has_value()) {
@@ -586,6 +581,21 @@ RenderablePointCloud::RenderablePointCloud(const ghoul::Dictionary& dictionary)
         }
     }
 
+    if (p.labels.has_value()) {
+        if (!p.labels->hasKey("File") && _hasDataFile) {
+            // Load the labelset from the dataset if no file was included
+            _labels = std::make_unique<LabelsComponent>(*p.labels, _dataset, _unit);
+        }
+        else {
+            _labels = std::make_unique<LabelsComponent>(*p.labels);
+        }
+
+        _hasLabels = true;
+        addPropertySubOwner(_labels.get());
+        // Fading of the labels should also depend on the fading of the renderable
+        _labels->setParentFadeable(this);
+    }
+
     _nDataPoints.setReadOnly(true);
     addProperty(_nDataPoints);
 }
@@ -609,7 +619,6 @@ void RenderablePointCloud::initialize() {
 
     if (_hasLabels) {
         _labels->initialize();
-        _labels->loadLabels();
     }
 }
 
diff --git a/modules/digitaluniverse/rendering/renderableplanescloud.cpp b/modules/digitaluniverse/rendering/renderableplanescloud.cpp
index ce8ce811d3..b0d635a2cb 100644
--- a/modules/digitaluniverse/rendering/renderableplanescloud.cpp
+++ b/modules/digitaluniverse/rendering/renderableplanescloud.cpp
@@ -330,7 +330,6 @@ void RenderablePlanesCloud::initialize() {
 
     if (_hasLabels) {
         _labels->initialize();
-        _labels->loadLabels();
     }
 }
 
diff --git a/modules/space/rendering/renderableconstellationsbase.cpp b/modules/space/rendering/renderableconstellationsbase.cpp
index ace7b0c53d..627ef98d0a 100644
--- a/modules/space/rendering/renderableconstellationsbase.cpp
+++ b/modules/space/rendering/renderableconstellationsbase.cpp
@@ -193,7 +193,6 @@ void RenderableConstellationsBase::initialize() {
     }
 
     _labels->initialize();
-    _labels->loadLabels();
 
     for (dataloader::Labelset::Entry& entry : _labels->labelSet().entries) {
         if (!entry.identifier.empty()) {
diff --git a/src/data/csvloader.cpp b/src/data/csvloader.cpp
index 7da87bf571..5b7febda75 100644
--- a/src/data/csvloader.cpp
+++ b/src/data/csvloader.cpp
@@ -93,6 +93,7 @@ Dataset loadCsvFile(std::filesystem::path filePath, std::optional<DataMapping> s
     int xColumn = -1;
     int yColumn = -1;
     int zColumn = -1;
+    int nameColumn = -1;
 
     int nDataColumns = 0;
     bool hasExcludeColumns = specs.has_value() && (*specs).hasExcludeColumns();
@@ -115,6 +116,9 @@ Dataset loadCsvFile(std::filesystem::path filePath, std::optional<DataMapping> s
                 zColumn = static_cast<int>(i);
             }
         }
+        else if (isNameColumn(col, specs)) {
+            nameColumn = static_cast<int>(i);
+        }
         else if (hasExcludeColumns && (*specs).isExcludeColumn(col)) {
             skipColumns.push_back(i);
             continue;
@@ -170,11 +174,14 @@ Dataset loadCsvFile(std::filesystem::path filePath, std::optional<DataMapping> s
             else if (i == zColumn) {
                 entry.position.z = value;
             }
+            else if (i == nameColumn) {
+                // Note that were we use the original stirng value, rather than the
+                // converted one
+                entry.comment = strValue;
+            }
             else {
                 entry.data.push_back(value);
             }
-
-            // @TODO: comment mapping
         }
 
         glm::vec3 positive = glm::abs(entry.position);
diff --git a/src/data/dataloader.cpp b/src/data/dataloader.cpp
index e2af74e0b0..1035358c8a 100644
--- a/src/data/dataloader.cpp
+++ b/src/data/dataloader.cpp
@@ -458,6 +458,23 @@ Labelset loadFileWithCache(std::filesystem::path filePath) {
     );
 }
 
+Labelset loadFromDataset(const Dataset& dataset) {
+    Labelset res;
+    res.entries.reserve(dataset.entries.size());
+
+    int count = 0;
+    for (const Dataset::Entry& entry : dataset.entries) {
+        Labelset::Entry label;
+        label.position = entry.position;
+        label.text = entry.comment.value_or("MISSING LABEL");
+        // @TODO: make is possible to configure this identifier?
+        label.identifier = fmt::format("Point-{}", count);
+        res.entries.push_back(std::move(label));
+    }
+
+    return res;
+}
+
 } // namespace label
 
 namespace color {
diff --git a/src/data/datamapping.cpp b/src/data/datamapping.cpp
index eba72d6178..463be7d747 100644
--- a/src/data/datamapping.cpp
+++ b/src/data/datamapping.cpp
@@ -39,7 +39,7 @@ namespace {
         X, Y, Z
     };
 
-    bool checkColumnInternal(PositionColumn columnCase, const std::string& c,
+    bool checkPosColumnInternal(PositionColumn columnCase, const std::string& c,
                          const std::optional<openspace::dataloader::DataMapping>& mapping,
                              const std::string_view defaultValue)
     {
@@ -88,6 +88,10 @@ namespace {
         // Specifies the column name for the z coordinate
         std::optional<std::string> z;
 
+        // Specifies the column name for the optional name column. Not valid for SPECK
+        // files, where the name is given by the comment at the end of each line
+        std::optional<std::string> name;
+
         // Specifies whether to do case sensitive checks when reading column names.
         // Default is not to, so that 'X' and 'x' are both valid column names for the
         // x position column, for example
@@ -119,6 +123,7 @@ DataMapping DataMapping::createFromDictionary(const ghoul::Dictionary& dictionar
     result.xColumnName = p.x;
     result.yColumnName = p.y;
     result.zColumnName = p.z;
+    result.nameColumn = p.name;
 
     result.missingDataValue = p.missingDataValue;
 
@@ -145,10 +150,11 @@ std::string generateHashString(const DataMapping& dm) {
     unsigned int excludeColumnsHash = ghoul::hashCRC32(a);
 
     return fmt::format(
-        "DM|x{}|y{}|z{}|m{}|{}|{}",
+        "DM|x{}|y{}|z{}|name{}|m{}|{}|{}",
         dm.xColumnName.value_or(""),
         dm.yColumnName.value_or(""),
         dm.zColumnName.value_or(""),
+        dm.nameColumn.value_or(""),
         dm.missingDataValue.has_value() ? ghoul::to_string(*dm.missingDataValue) : "",
         dm.isCaseSensitive ? "1" : "0",
         excludeColumnsHash
@@ -160,15 +166,29 @@ bool isPositionColumn(const std::string& c, const std::optional<DataMapping>& ma
 }
 
 bool isColumnX(const std::string& c, const std::optional<DataMapping>& mapping) {
-    return checkColumnInternal(PositionColumn::X, c, mapping, DefaultX);
+    return checkPosColumnInternal(PositionColumn::X, c, mapping, DefaultX);
 }
 
 bool isColumnY(const std::string& c, const std::optional<DataMapping>& mapping) {
-    return checkColumnInternal(PositionColumn::Y, c, mapping, DefaultY);
+    return checkPosColumnInternal(PositionColumn::Y, c, mapping, DefaultY);
 }
 
 bool isColumnZ(const std::string& c, const std::optional<DataMapping>& mapping) {
-    return checkColumnInternal(PositionColumn::Z, c, mapping, DefaultZ);
+    return checkPosColumnInternal(PositionColumn::Z, c, mapping, DefaultZ);
+}
+
+bool isNameColumn(const std::string& c, const std::optional<DataMapping>& mapping) {
+    if (!mapping.has_value() || !mapping->nameColumn.has_value()) {
+        return false;
+    }
+
+    std::string testColumn = c;
+    std::string mappedColumn = *mapping->nameColumn;
+    if (!mapping->isCaseSensitive) {
+        testColumn = ghoul::toLowerCase(testColumn);
+        mappedColumn = ghoul::toLowerCase(mappedColumn);
+    }
+    return testColumn == mappedColumn;
 }
 
 } // namespace openspace::dataloader
diff --git a/src/rendering/labelscomponent.cpp b/src/rendering/labelscomponent.cpp
index 983d5c8285..25ad45e7e5 100644
--- a/src/rendering/labelscomponent.cpp
+++ b/src/rendering/labelscomponent.cpp
@@ -105,7 +105,7 @@ namespace {
         std::optional<bool> enabled;
 
         // [[codegen::verbatim(FileInfo.description)]]
-        std::filesystem::path file;
+        std::optional<std::filesystem::path> file;
 
         // If true (default), the loaded labels file will be cached so that it can be
         // loaded faster at a later time. Note that this also means that changes in the
@@ -170,7 +170,7 @@ LabelsComponent::LabelsComponent(const ghoul::Dictionary& dictionary)
 {
     const Parameters p = codegen::bake<Parameters>(dictionary);
 
-    _labelFile = absPath(p.file);
+    _labelFile = absPath(p.file.value_or(""));
     _useCache = p.useCaching.value_or(true);
 
     if (p.unit.has_value()) {
@@ -223,6 +223,21 @@ LabelsComponent::LabelsComponent(const ghoul::Dictionary& dictionary)
     _transformationMatrix = p.transformationMatrix.value_or(_transformationMatrix);
 }
 
+LabelsComponent::LabelsComponent(const ghoul::Dictionary& dictionary,
+                                 const dataloader::Dataset& dataset,
+                                 DistanceUnit unit)
+    : LabelsComponent(dictionary)
+{
+    // The unit should match the one in the dataset, not the one that was included in the
+    // asset (if any)
+    _unit = unit;
+
+    // Load the labelset directly based on the dataset, and keep track of that it has
+    // already been loaded this way
+    _labelset = dataloader::label::loadFromDataset(dataset);
+    _createdFromDataset = true;
+}
+
 dataloader::Labelset& LabelsComponent::labelSet() {
     return _labelset;
 }
@@ -238,10 +253,18 @@ void LabelsComponent::initialize() {
         ghoul::fontrendering::FontManager::Outline::Yes,
         ghoul::fontrendering::FontManager::LoadGlyphs::No
     );
+
+    loadLabels();
 }
 
 void LabelsComponent::loadLabels() {
     LINFO(fmt::format("Loading label file {}", _labelFile));
+
+    if (_createdFromDataset) {
+        // The labelset should already have been loaded
+        return;
+    }
+
     if (_useCache) {
         _labelset = dataloader::label::loadFileWithCache(_labelFile);
     }

From 9959c2b94c216d9631720ca8513eb144d2e62408 Mon Sep 17 00:00:00 2001
From: timol085 <timol085@student.liu.se>
Date: Wed, 17 Jan 2024 16:45:33 +0100
Subject: [PATCH 234/701] Add missing include file <sstream> for mac

---
 src/data/speckloader.cpp        | 2 ++
 src/engine/settings.cpp         | 1 +
 src/rendering/loadingscreen.cpp | 2 ++
 tests/test_sgctedit.cpp         | 1 +
 4 files changed, 6 insertions(+)

diff --git a/src/data/speckloader.cpp b/src/data/speckloader.cpp
index ee26953f5e..d71a349ee1 100644
--- a/src/data/speckloader.cpp
+++ b/src/data/speckloader.cpp
@@ -34,8 +34,10 @@
 #include <cctype>
 #include <fstream>
 #include <functional>
+#include <sstream>
 #include <string_view>
 
+
 namespace {
     bool startsWith(std::string lhs, std::string_view rhs) noexcept {
         lhs = ghoul::toLowerCase(lhs);
diff --git a/src/engine/settings.cpp b/src/engine/settings.cpp
index e1df61f429..3eb054b262 100644
--- a/src/engine/settings.cpp
+++ b/src/engine/settings.cpp
@@ -25,6 +25,7 @@
 #include <openspace/engine/settings.h>
 
 #include <openspace/engine/configuration.h>
+#include <sstream>
 
 namespace openspace {
 
diff --git a/src/rendering/loadingscreen.cpp b/src/rendering/loadingscreen.cpp
index d256bca6f2..9c20088155 100644
--- a/src/rendering/loadingscreen.cpp
+++ b/src/rendering/loadingscreen.cpp
@@ -41,8 +41,10 @@
 #include <ghoul/opengl/texture.h>
 #include <ghoul/opengl/textureunit.h>
 #include <random>
+#include <sstream>
 #include <thread>
 
+
 namespace {
     constexpr float LoadingFontSize = 25.f;
     constexpr float MessageFontSize = 22.f;
diff --git a/tests/test_sgctedit.cpp b/tests/test_sgctedit.cpp
index bca8b65e8d..ed78cbeb75 100644
--- a/tests/test_sgctedit.cpp
+++ b/tests/test_sgctedit.cpp
@@ -33,6 +33,7 @@
 #include <openspace/engine/configuration.h>
 #include <filesystem>
 #include <fstream>
+#include <sstream>
 
 using namespace openspace;
 

From 27608634b2fb169b64a0eeea74f95c84a5253800 Mon Sep 17 00:00:00 2001
From: Alexander Bock <alexander.bock@liu.se>
Date: Thu, 18 Jan 2024 09:58:20 +0100
Subject: [PATCH 235/701] Remove warnings (#2999)

* Remove warnings for MSVC, GCC, and Clang 17
---
 .../ext/launcher/include/settingsdialog.h     |   2 +-
 .../ext/launcher/src/launcherwindow.cpp       |   4 +-
 .../ext/launcher/src/sgctedit/sgctedit.cpp    |   4 +-
 apps/OpenSpace/ext/sgct                       |   2 +-
 ext/ghoul                                     |   2 +-
 include/openspace/util/distanceconversion.h   |   4 -
 include/openspace/util/timeconversion.h       |   4 -
 modules/base/rendering/renderablemodel.cpp    |   2 +-
 modules/gaia/tasks/readfilejob.cpp            |   4 -
 .../src/geojson/geojsoncomponent.cpp          |   2 +-
 .../src/geojson/geojsonproperties.cpp         |   2 +-
 modules/globebrowsing/src/layer.cpp           |   5 +-
 modules/globebrowsing/src/layer.h             |   2 +-
 .../globebrowsing/src/rawtiledatareader.cpp   | 126 ------------------
 modules/globebrowsing/src/renderableglobe.cpp |   3 +-
 modules/skybrowser/src/wwtcommunicator.cpp    |   9 --
 .../rendering/renderableorbitalkepler.cpp     |   6 +-
 modules/sync/syncs/urlsynchronization.cpp     |   2 -
 src/data/csvloader.cpp                        |  10 +-
 src/data/dataloader.cpp                       |   4 -
 src/interaction/actionmanager.cpp             |  20 +--
 src/navigation/orbitalnavigator.cpp           |   5 -
 src/rendering/colormappingcomponent.cpp       |   2 +-
 src/scene/assetmanager.cpp                    |   5 +-
 src/util/resourcesynchronization.cpp          |   2 +-
 .../set_openspace_compile_settings.cmake      |   2 +
 26 files changed, 39 insertions(+), 196 deletions(-)

diff --git a/apps/OpenSpace/ext/launcher/include/settingsdialog.h b/apps/OpenSpace/ext/launcher/include/settingsdialog.h
index 54ba955ec0..dcd2aa89c0 100644
--- a/apps/OpenSpace/ext/launcher/include/settingsdialog.h
+++ b/apps/OpenSpace/ext/launcher/include/settingsdialog.h
@@ -50,7 +50,7 @@ private:
     void updateSaveButton();
 
     void save();
-    void reject();
+    void reject() override;
 
     QLineEdit* _configuration = nullptr;
     QCheckBox* _rememberLastConfiguration = nullptr;
diff --git a/apps/OpenSpace/ext/launcher/src/launcherwindow.cpp b/apps/OpenSpace/ext/launcher/src/launcherwindow.cpp
index 9c507e4f1d..98d222cdaa 100644
--- a/apps/OpenSpace/ext/launcher/src/launcherwindow.cpp
+++ b/apps/OpenSpace/ext/launcher/src/launcherwindow.cpp
@@ -401,8 +401,8 @@ QWidget* LauncherWindow::createCentralWidget() {
             connect(
                 &dialog,
                 &SettingsDialog::saveSettings,
-                [](Settings settings) {
-                    saveSettings(settings, findSettings());
+                [](Settings s) {
+                    saveSettings(s, findSettings());
                 }
             );
 
diff --git a/apps/OpenSpace/ext/launcher/src/sgctedit/sgctedit.cpp b/apps/OpenSpace/ext/launcher/src/sgctedit/sgctedit.cpp
index 2a98f99b78..08d72eaa49 100644
--- a/apps/OpenSpace/ext/launcher/src/sgctedit/sgctedit.cpp
+++ b/apps/OpenSpace/ext/launcher/src/sgctedit/sgctedit.cpp
@@ -142,7 +142,7 @@ void SgctEdit::setupStateOfUiOnFirstWindow(size_t nWindows) {
     bool firstWindowGuiIsEnabled = (nWindows > 1);
     int graphicsSelectionForFirstWindow = 0;
     int nGuiRenderTagsFound = 0;
-    _settingsWidget->nWindowsDisplayedChanged(nWindows);
+    _settingsWidget->nWindowsDisplayedChanged(static_cast<int>(nWindows));
 
     for (size_t i = 0; i < nWindows; ++i) {
         sgct::config::Window& w = _cluster.nodes.front().windows[i];
@@ -185,7 +185,7 @@ void SgctEdit::setupStateOfUiOnFirstWindow(size_t nWindows) {
         // Call these again in order to ensure that GUI is configured correctly based on
         // the values read from the config file
         _settingsWidget->setEnableShowUiOnFirstWindowCheckbox(true);
-        _settingsWidget->nWindowsDisplayedChanged(nWindows);
+        _settingsWidget->nWindowsDisplayedChanged(static_cast<int>(nWindows));
     }
     _settingsWidget->setGraphicsSelectionForShowUiOnFirstWindow(
         graphicsSelectionForFirstWindow
diff --git a/apps/OpenSpace/ext/sgct b/apps/OpenSpace/ext/sgct
index 9ee34038be..cd588a8090 160000
--- a/apps/OpenSpace/ext/sgct
+++ b/apps/OpenSpace/ext/sgct
@@ -1 +1 @@
-Subproject commit 9ee34038be3a8c0fe2410e5f511688f1ff816392
+Subproject commit cd588a809006263554950a51aeb0cb9cf4848417
diff --git a/ext/ghoul b/ext/ghoul
index d607a6d6b1..ba6aece1de 160000
--- a/ext/ghoul
+++ b/ext/ghoul
@@ -1 +1 @@
-Subproject commit d607a6d6b11be4ad05ccd555b8b290a782e0e384
+Subproject commit ba6aece1deb12599fcaa61be133658534ed84425
diff --git a/include/openspace/util/distanceconversion.h b/include/openspace/util/distanceconversion.h
index 989951b229..52e568e63c 100644
--- a/include/openspace/util/distanceconversion.h
+++ b/include/openspace/util/distanceconversion.h
@@ -157,20 +157,16 @@ DistanceUnitNamesPlural = {
 };
 
 constexpr bool isValidDistanceUnitName(std::string_view name) {
-    int i = 0;
     for (std::string_view val : DistanceUnitNamesSingular) {
         if (val == name) {
             return true;
         }
-        ++i;
     }
 
-    i = 0;
     for (std::string_view val : DistanceUnitNamesPlural) {
         if (val == name) {
             return true;
         }
-        ++i;
     }
     return false;
 }
diff --git a/include/openspace/util/timeconversion.h b/include/openspace/util/timeconversion.h
index e4aaa8846e..753d84c7da 100644
--- a/include/openspace/util/timeconversion.h
+++ b/include/openspace/util/timeconversion.h
@@ -100,20 +100,16 @@ TimeUnitNamesPlural = {
 };
 
 constexpr bool isValidTimeUnitName(std::string_view name) {
-    int i = 0;
     for (std::string_view val : TimeUnitNamesSingular) {
         if (val == name) {
             return true;
         }
-        ++i;
     }
 
-    i = 0;
     for (std::string_view val : TimeUnitNamesPlural) {
         if (val == name) {
             return true;
         }
-        ++i;
     }
     return false;
 }
diff --git a/modules/base/rendering/renderablemodel.cpp b/modules/base/rendering/renderablemodel.cpp
index 1264099bd2..d6a9aa5569 100644
--- a/modules/base/rendering/renderablemodel.cpp
+++ b/modules/base/rendering/renderablemodel.cpp
@@ -593,7 +593,7 @@ void RenderableModel::initializeGL() {
         }
 
         // Set animation settings
-        _geometry->setTimeScale(_animationTimeScale);
+        _geometry->setTimeScale(static_cast<float>(_animationTimeScale));
     }
 
     // Initialize shaders
diff --git a/modules/gaia/tasks/readfilejob.cpp b/modules/gaia/tasks/readfilejob.cpp
index 005f94523d..8377062677 100644
--- a/modules/gaia/tasks/readfilejob.cpp
+++ b/modules/gaia/tasks/readfilejob.cpp
@@ -65,7 +65,6 @@ void ReadFileJob::execute() {
 
     int nStars = table->readRows - _firstRow + 1;
 
-    int nNullArr = 0;
     size_t nColumnsRead = _allColumns.size();
     if (nColumnsRead != _nDefaultCols) {
         LINFO(
@@ -117,7 +116,6 @@ void ReadFileJob::execute() {
 
         // Return early if star doesn't have a measured position.
         if (std::isnan(ra[i]) || std::isnan(dec[i])) {
-            nNullArr++;
             continue;
         }
 
@@ -260,8 +258,6 @@ void ReadFileJob::execute() {
 
         _octants[index].insert(_octants[index].end(), values.begin(), values.end());
     }
-
-    // LINFO(fmt::format("{} out of {} read stars were nullArrays", nNullArr, nStars));
 }
 
 std::vector<std::vector<float>> ReadFileJob::product() {
diff --git a/modules/globebrowsing/src/geojson/geojsoncomponent.cpp b/modules/globebrowsing/src/geojson/geojsoncomponent.cpp
index e87bf58e67..287fae4d5c 100644
--- a/modules/globebrowsing/src/geojson/geojsoncomponent.cpp
+++ b/modules/globebrowsing/src/geojson/geojsoncomponent.cpp
@@ -313,8 +313,8 @@ GeoJsonComponent::GeoJsonComponent(const ghoul::Dictionary& dictionary,
         glm::vec2(90.f, 180.f)
     )
     , _flyToFeature(FlyToFeatureInfo)
-    , _deleteThisComponent(DeleteInfo)
     , _deletePropertyOwner({ "Deletion", "Deletion" })
+    , _deleteThisComponent(DeleteInfo)
     , _lightSourcePropertyOwner({ "LightSources", "Light Sources" })
     , _featuresPropertyOwner({ "Features", "Features" })
 {
diff --git a/modules/globebrowsing/src/geojson/geojsonproperties.cpp b/modules/globebrowsing/src/geojson/geojsonproperties.cpp
index 2b96742276..35e0aca85e 100644
--- a/modules/globebrowsing/src/geojson/geojsonproperties.cpp
+++ b/modules/globebrowsing/src/geojson/geojsonproperties.cpp
@@ -151,7 +151,7 @@ namespace {
             }
         }
         return color;
-    };
+    }
 
     constexpr openspace::properties::Property::PropertyInfo OpacityInfo = {
         "Opacity",
diff --git a/modules/globebrowsing/src/layer.cpp b/modules/globebrowsing/src/layer.cpp
index f82930fe5d..9863383105 100644
--- a/modules/globebrowsing/src/layer.cpp
+++ b/modules/globebrowsing/src/layer.cpp
@@ -223,8 +223,6 @@ Layer::Layer(layers::Group::ID id, const ghoul::Dictionary& layerDict, LayerGrou
         addProperty(_guiDescription);
     }
 
-    TileTextureInitData initData = tileTextureInitData(_layerGroupId);
-
     _opacity = p.opacity.value_or(_opacity);
     addProperty(Fadeable::_opacity);
     addProperty(Fadeable::_fade);
@@ -457,8 +455,7 @@ void Layer::update() {
 }
 
 glm::vec2 Layer::tileUvToTextureSamplePosition(const TileUvTransform& uvTransform,
-                                               const glm::vec2& tileUV,
-                                               const glm::uvec2& resolution)
+                                               const glm::vec2& tileUV)
 {
     glm::vec2 uv = uvTransform.uvOffset + uvTransform.uvScale * tileUV;
     return uv;
diff --git a/modules/globebrowsing/src/layer.h b/modules/globebrowsing/src/layer.h
index e0679deda0..e6d272dcd9 100644
--- a/modules/globebrowsing/src/layer.h
+++ b/modules/globebrowsing/src/layer.h
@@ -69,7 +69,7 @@ public:
     void update();
 
     glm::vec2 tileUvToTextureSamplePosition(const TileUvTransform& uvTransform,
-        const glm::vec2& tileUV, const glm::uvec2& resolution);
+        const glm::vec2& tileUV);
 
     static documentation::Documentation Documentation();
 
diff --git a/modules/globebrowsing/src/rawtiledatareader.cpp b/modules/globebrowsing/src/rawtiledatareader.cpp
index 14fe3a01a8..1a7d8dd0cf 100644
--- a/modules/globebrowsing/src/rawtiledatareader.cpp
+++ b/modules/globebrowsing/src/rawtiledatareader.cpp
@@ -140,110 +140,6 @@ int calculateTileLevelDifference(GDALDataset* dataset, int minimumPixelSize) {
     return static_cast<int>(intdiff);
 }
 
-/**
- * Aligns one the sides of the pixel regino to the specified position. This does
- * not change the number of pixels within the region.
- *
- * Example: Side = left and pos = 16:
- *                 start.x = 16 and keep the size the same
- */
-void alignPixelRegion(PixelRegion& pixelRegion, Side side, int pos) {
-    switch (side) {
-        case Side::Left:
-            pixelRegion.start.x = pos;
-            break;
-        case Side::Top:
-            pixelRegion.start.y = pos;
-            break;
-        case Side::Right:
-            pixelRegion.start.x = pos - pixelRegion.numPixels.x;
-            break;
-        case Side::Bottom:
-            pixelRegion.start.y = pos - pixelRegion.numPixels.y;
-            break;
-    }
-}
-
-PixelRegion globalCut(PixelRegion& pixelRegion, Side side, int p) {
-    const bool lineIntersect = [pr = pixelRegion, side, p]() {
-        switch (side) {
-            case Side::Left:
-            case Side::Right:
-                return pr.start.x <= p && p <= (pr.start.x + pr.numPixels.x);
-            case Side::Top:
-            case Side::Bottom:
-                return pr.start.y <= p && p <= (pr.start.y + pr.numPixels.y);
-            default:
-                throw ghoul::MissingCaseException();
-        }
-    }();
-
-    if (!lineIntersect) {
-        return PixelRegion();
-    }
-
-    auto setSide = [](PixelRegion& pr, Side s, int pos) {
-        switch (s) {
-            case Side::Left:
-                pr.numPixels.x += (pr.start.x - pos);
-                pr.start.x = pos;
-                break;
-            case Side::Top:
-                pr.numPixels.y += (pr.start.y - pos);
-                pr.start.y = pos;
-                break;
-            case Side::Right:
-                pr.numPixels.x = pos - pr.start.x;
-                break;
-            case Side::Bottom:
-                pr.numPixels.y = pos - pr.start.y;
-                break;
-        }
-    };
-
-    PixelRegion cutOff(pixelRegion);
-    int cutSize = 0;
-    switch (side) {
-        case Side::Left:
-            setSide(pixelRegion, Side::Left, p);
-            setSide(cutOff, Side::Right, p - cutSize);
-            break;
-        case Side::Top:
-            setSide(pixelRegion, Side::Top, p);
-            setSide(cutOff, Side::Bottom, p - cutSize);
-            break;
-        case Side::Right:
-            setSide(pixelRegion, Side::Right, p);
-            setSide(cutOff, Side::Left, p + cutSize);
-            break;
-        case Side::Bottom:
-            setSide(pixelRegion, Side::Bottom, p);
-            setSide(cutOff, Side::Top, p + cutSize);
-            break;
-    }
-    return cutOff;
-}
-
-int edge(const PixelRegion& pixelRegion, Side side) {
-    switch (side) {
-        case Side::Left:   return pixelRegion.start.x;
-        case Side::Top:    return pixelRegion.start.y;
-        case Side::Right:  return pixelRegion.start.x + pixelRegion.numPixels.x;
-        case Side::Bottom: return pixelRegion.start.y + pixelRegion.numPixels.y;
-        default:           throw ghoul::MissingCaseException();
-    }
-}
-
-PixelRegion localCut(PixelRegion& pr, Side side, int localPos) {
-    if (localPos < 1) {
-        return PixelRegion();
-    }
-    else {
-        const int edgeDirectionSign = (side < Side::Right) ? -1 : 1;
-        return globalCut(pr, side, edge(pr, side) - edgeDirectionSign * localPos);
-    }
-}
-
 bool isInside(const PixelRegion& lhs, const PixelRegion& rhs) {
     glm::ivec2 e = lhs.start + lhs.numPixels;
     glm::ivec2 re = rhs.start + rhs.numPixels;
@@ -251,28 +147,6 @@ bool isInside(const PixelRegion& lhs, const PixelRegion& rhs) {
            rhs.start.y <= lhs.start.y && e.y <= re.y;
 }
 
-IODescription cutIODescription(IODescription& io, Side side, int pos) {
-    glm::dvec2 ratio = glm::dvec2(
-        io.write.region.numPixels.x / static_cast<double>(io.read.region.numPixels.x),
-        io.write.region.numPixels.y / static_cast<double>(io.read.region.numPixels.y)
-    );
-
-    IODescription whatCameOff = io;
-    whatCameOff.read.region = globalCut(io.read.region, side, pos);
-
-    glm::ivec2 cutSize = whatCameOff.read.region.numPixels;
-    glm::ivec2 localWriteCutSize = ratio * glm::dvec2(cutSize);
-
-    int localWriteCutPos =
-        (side == Side::Left || side == Side::Right) ?
-        localWriteCutSize.x :
-        localWriteCutSize.y;
-
-    whatCameOff.write.region = localCut(io.write.region, side, localWriteCutPos);
-
-    return whatCameOff;
-}
-
 /**
  * Returns the geo transform from raster space to projection coordinates as defined
  * by GDAL.
diff --git a/modules/globebrowsing/src/renderableglobe.cpp b/modules/globebrowsing/src/renderableglobe.cpp
index 475679d262..44898268fa 100644
--- a/modules/globebrowsing/src/renderableglobe.cpp
+++ b/modules/globebrowsing/src/renderableglobe.cpp
@@ -1987,8 +1987,7 @@ float RenderableGlobe::getHeight(const glm::dvec3& position) const {
 
         glm::vec2 transformedUv = layer->tileUvToTextureSamplePosition(
             uvTransform,
-            patchUV,
-            glm::uvec2(tileTexture->dimensions())
+            patchUV
         );
 
         // Sample and do linear interpolation
diff --git a/modules/skybrowser/src/wwtcommunicator.cpp b/modules/skybrowser/src/wwtcommunicator.cpp
index 67c7224f98..93b9a27524 100644
--- a/modules/skybrowser/src/wwtcommunicator.cpp
+++ b/modules/skybrowser/src/wwtcommunicator.cpp
@@ -58,15 +58,6 @@ namespace {
         return msg;
     }
 
-    ghoul::Dictionary setForegroundMessage(const std::string& name) {
-        using namespace std::string_literals;
-
-        ghoul::Dictionary msg;
-        msg.setValue("event", "set_foreground_by_name"s);
-        msg.setValue("name", name);
-        return msg;
-    }
-
     ghoul::Dictionary addImageMessage(const std::string& url) {
         using namespace std::string_literals;
 
diff --git a/modules/space/rendering/renderableorbitalkepler.cpp b/modules/space/rendering/renderableorbitalkepler.cpp
index 06510b1379..438c0fbad3 100644
--- a/modules/space/rendering/renderableorbitalkepler.cpp
+++ b/modules/space/rendering/renderableorbitalkepler.cpp
@@ -354,11 +354,11 @@ void RenderableOrbitalKepler::updateBuffers() {
     _segmentSize.clear();
     _startIndex.clear();
     _startIndex.push_back(0);
-    for (int i = 0; i < parameters.size(); ++i) {
+    for (size_t i = 0; i < parameters.size(); ++i) {
         const double scale = static_cast<double>(_segmentQuality) * 10.0;
         const kepler::Parameters& p = parameters[i];
         _segmentSize.push_back(
-            static_cast<size_t>(scale + (scale / pow(1 - p.eccentricity, 1.2)))
+            static_cast<int>(scale + (scale / pow(1.0 - p.eccentricity, 1.2)))
         );
         _startIndex.push_back(_startIndex[i] + static_cast<GLint>(_segmentSize[i]));
     }
@@ -388,7 +388,7 @@ void RenderableOrbitalKepler::updateBuffers() {
             orbit.epoch
         );
 
-        for (size_t j = 0 ; j < (_segmentSize[orbitIdx]); ++j) {
+        for (GLint j = 0 ; j < (_segmentSize[orbitIdx]); ++j) {
             double timeOffset = orbit.period *
                 static_cast<double>(j) / static_cast<double>(_segmentSize[orbitIdx] - 1);
 
diff --git a/modules/sync/syncs/urlsynchronization.cpp b/modules/sync/syncs/urlsynchronization.cpp
index df3b67acd4..8e4ac2cc2a 100644
--- a/modules/sync/syncs/urlsynchronization.cpp
+++ b/modules/sync/syncs/urlsynchronization.cpp
@@ -293,7 +293,6 @@ bool UrlSynchronization::trySyncUrls() {
 
     std::unordered_map<std::string, SizeData> sizeData;
     std::mutex fileSizeMutex;
-    size_t nDownloads = 0;
     std::atomic_bool startedAllDownloads = false;
     std::vector<std::unique_ptr<HttpFileDownload>> downloads;
 
@@ -327,7 +326,6 @@ bool UrlSynchronization::trySyncUrls() {
 
         downloads.push_back(std::move(download));
 
-        ++nDownloads;
         sizeData[url] = SizeData();
 
         dl->onProgress(
diff --git a/src/data/csvloader.cpp b/src/data/csvloader.cpp
index 5b7febda75..e498c5d246 100644
--- a/src/data/csvloader.cpp
+++ b/src/data/csvloader.cpp
@@ -57,7 +57,7 @@ Dataset loadCsvFile(std::filesystem::path filePath, std::optional<DataMapping> s
             return result;
         }
         return std::numeric_limits<float>::quiet_NaN();
-#else
+#else // ^^^^ WIN32 // !WIN32 vvvv
         // clang is missing float support for std::from_chars
         try {
             result = std::stof(str.c_str(), nullptr);
@@ -65,9 +65,9 @@ Dataset loadCsvFile(std::filesystem::path filePath, std::optional<DataMapping> s
                 return result;
             }
         }
-        catch (std::invalid_argument const& e) {}
+        catch (const std::invalid_argument&) {}
         return NAN;
-#endif
+#endif // WIN32
     };
 
     LDEBUG("Parsing CSV file");
@@ -142,7 +142,7 @@ Dataset loadCsvFile(std::filesystem::path filePath, std::optional<DataMapping> s
     LINFO(fmt::format(
         "Loading {} rows with {} columns", rows.size(), columns.size()
     ));
-    ProgressBar progress(rows.size());
+    ProgressBar progress = ProgressBar(static_cast<int>(rows.size()));
 
     // Skip first row (column names)
     for (size_t rowIdx = 1; rowIdx < rows.size(); ++rowIdx) {
@@ -192,7 +192,7 @@ Dataset loadCsvFile(std::filesystem::path filePath, std::optional<DataMapping> s
 
         res.entries.push_back(entry);
 
-        progress.print(rowIdx + 1);
+        progress.print(static_cast<int>(rowIdx + 1));
     }
 
     return res;
diff --git a/src/data/dataloader.cpp b/src/data/dataloader.cpp
index 1035358c8a..7c2aa4a8d6 100644
--- a/src/data/dataloader.cpp
+++ b/src/data/dataloader.cpp
@@ -44,10 +44,6 @@ namespace {
     constexpr int8_t LabelCacheFileVersion = 11;
     constexpr int8_t ColorCacheFileVersion = 11;
 
-    constexpr std::string_view DefaultXColumn = "x";
-    constexpr std::string_view DefaultYColumn = "y";
-    constexpr std::string_view DefaultZColumn = "z";
-
     template <typename T, typename U>
     void checkSize(U value, std::string_view message) {
         if (value > std::numeric_limits<U>::max()) {
diff --git a/src/interaction/actionmanager.cpp b/src/interaction/actionmanager.cpp
index c52f00f42f..3a20f481f9 100644
--- a/src/interaction/actionmanager.cpp
+++ b/src/interaction/actionmanager.cpp
@@ -99,16 +99,20 @@ void ActionManager::triggerAction(const std::string& identifier,
         a.command :
         fmt::format("args = {}\n{}", ghoul::formatLua(arguments), a.command);
 
-    using ShouldBeSynchronized = scripting::ScriptEngine::ShouldBeSynchronized;
-    using ShouldSendToRemote = scripting::ScriptEngine::ShouldSendToRemote;
-    ShouldBeSynchronized sync = ShouldBeSynchronized::Yes;
-    ShouldSendToRemote send = ShouldSendToRemote::Yes;
     if (!shouldBeSynchronized || a.isLocal) {
-        sync = ShouldBeSynchronized::No;
-        send = ShouldSendToRemote::No;
+        global::scriptEngine->queueScript(
+            script,
+            scripting::ScriptEngine::ShouldBeSynchronized::No,
+            scripting::ScriptEngine::ShouldSendToRemote::No
+        );
+    }
+    else {
+        global::scriptEngine->queueScript(
+            script,
+            scripting::ScriptEngine::ShouldBeSynchronized::Yes,
+            scripting::ScriptEngine::ShouldSendToRemote::Yes
+        );
     }
-
-    global::scriptEngine->queueScript(script, sync, send);
 }
 
 scripting::LuaLibrary ActionManager::luaLibrary() {
diff --git a/src/navigation/orbitalnavigator.cpp b/src/navigation/orbitalnavigator.cpp
index dd1659a763..b2f4b72c2a 100644
--- a/src/navigation/orbitalnavigator.cpp
+++ b/src/navigation/orbitalnavigator.cpp
@@ -2060,11 +2060,6 @@ double OrbitalNavigator::rotationSpeedScaleFromCameraHeight(
     const glm::dmat4 modelTransform = _anchorNode->modelTransform();
     const glm::dvec3 anchorPos = _anchorNode->worldPosition();
 
-    const glm::dvec3 outDirection = glm::normalize(
-        glm::dmat3(modelTransform) *
-        positionHandle.referenceSurfaceOutDirection
-    );
-
     const glm::dvec3 posDiff = cameraPosition - anchorPos;
     const glm::dvec3 centerToActualSurfaceModelSpace =
         positionHandle.centerToReferenceSurface +
diff --git a/src/rendering/colormappingcomponent.cpp b/src/rendering/colormappingcomponent.cpp
index f20038b392..e24c491ae4 100644
--- a/src/rendering/colormappingcomponent.cpp
+++ b/src/rendering/colormappingcomponent.cpp
@@ -440,7 +440,7 @@ void ColorMappingComponent::initializeParameterData(const dataloader::Dataset& d
             }
             // While iterating over options, try to find the one provided, if any
             else if (_providedParameter.has_value() && *_providedParameter == o) {
-                indexOfProvidedOption = i;
+                indexOfProvidedOption = static_cast<int>(i);
             }
         }
     }
diff --git a/src/scene/assetmanager.cpp b/src/scene/assetmanager.cpp
index 755be4a9d9..aa0ae9d741 100644
--- a/src/scene/assetmanager.cpp
+++ b/src/scene/assetmanager.cpp
@@ -556,7 +556,7 @@ void AssetManager::setUpAssetLuaTable(Asset* asset) {
     lua_setfield(*_luaState, assetTableIndex, "resource");
 
     // @DEPRECATED(abock) This should be removed after 0.20.0
-    ghoul::lua::push(*_luaState, this, asset);
+    ghoul::lua::push(*_luaState, asset);
     lua_pushcclosure(
         *_luaState,
         [](lua_State* L) {
@@ -565,8 +565,7 @@ void AssetManager::setUpAssetLuaTable(Asset* asset) {
                 "'asset.resource' instead. No change to the parameters are needed"
             );
 
-            AssetManager* manager = ghoul::lua::userData<AssetManager>(L, 1);
-            Asset* thisAsset = ghoul::lua::userData<Asset>(L, 2);
+            Asset* thisAsset = ghoul::lua::userData<Asset>(L, 1);
             ghoul::lua::checkArgumentsAndThrow(L, { 0, 1 }, "lua::resource");
 
             auto [name] = ghoul::lua::values<std::optional<std::string>>(L);
diff --git a/src/util/resourcesynchronization.cpp b/src/util/resourcesynchronization.cpp
index 411719457b..818946aa4f 100644
--- a/src/util/resourcesynchronization.cpp
+++ b/src/util/resourcesynchronization.cpp
@@ -105,7 +105,7 @@ const std::string& ResourceSynchronization::name() const {
     return _name;
 }
 
-void ResourceSynchronization::createSyncFile(bool isFullySynchronized) const {
+void ResourceSynchronization::createSyncFile(bool) const {
     std::filesystem::path dir = directory();
     std::filesystem::create_directories(dir);
 
diff --git a/support/cmake/set_openspace_compile_settings.cmake b/support/cmake/set_openspace_compile_settings.cmake
index ed62bc3fdf..8d44f0b44e 100644
--- a/support/cmake/set_openspace_compile_settings.cmake
+++ b/support/cmake/set_openspace_compile_settings.cmake
@@ -145,6 +145,7 @@ function (set_openspace_compile_settings target)
     "-Wno-attributes"
     "-Wno-deprecated-enum-enum-conversion"
     "-Wno-missing-braces"
+    "-Wno-sign-compare"
     "-Wno-unknown-attributes"
   )
 
@@ -182,6 +183,7 @@ function (set_openspace_compile_settings target)
     "-Wno-float-equal"
     "-Wno-long-long"
     "-Wno-missing-field-initializers"
+    "-Wno-sign-compare"
     "-Wno-unknown-attributes"
     "-Wno-write-strings"
   )

From 54cf26755cfdaad1893c92c726cd36962b10fea4 Mon Sep 17 00:00:00 2001
From: Emma Broman <emma.broman@liu.se>
Date: Thu, 18 Jan 2024 13:23:22 +0100
Subject: [PATCH 236/701] Feature/point cloud scaling (#2994)

* Try using angular max size rather than max pixel size

* Update property name and use for shader

* Add docs and remove mention of angle from user's perspective

* People will wonder, so add some details as to what the value represents

* Fix inconsistent punctuation in property texts with multiple sentences

* Slight clarification of transformation matrix usage

* Add values to asset files

* Increase max size of example points a bit

* Remove/Update comment

* Add TODO comment about potential optimization

* Reduce max size of SDSS and quasars a bit

* Address review comment

* Decrease 6df and increase globular clusters size as per review comment

* Remove any mention of pixel size in the example asset

* Remove some more mentions of pixel size

* Write view space position to G-buffer  to prevent atm. from shining through points
---
 data/assets/examples/pointclouds/points.asset |  21 ++--
 data/assets/scene/digitaluniverse/2dF.asset   |   4 +-
 data/assets/scene/digitaluniverse/2mass.asset |   6 +-
 data/assets/scene/digitaluniverse/6dF.asset   |   6 +-
 data/assets/scene/digitaluniverse/abell.asset |   4 +-
 .../scene/digitaluniverse/deepsky.asset       |   4 +-
 .../assets/scene/digitaluniverse/dwarfs.asset |   4 +-
 .../scene/digitaluniverse/exoplanets.asset    |   4 +-
 .../exoplanets_candidates.asset               |   4 +-
 .../digitaluniverse/globularclusters.asset    |   6 +-
 .../scene/digitaluniverse/h2regions.asset     |   4 +-
 data/assets/scene/digitaluniverse/hdf.asset   |   4 +-
 .../scene/digitaluniverse/localdwarfs.asset   |   4 +-
 .../digitaluniverse/obassociations.asset      |   4 +-
 .../scene/digitaluniverse/openclusters.asset  |   4 +-
 .../digitaluniverse/planetarynebulae.asset    |   4 +-
 .../scene/digitaluniverse/pulsars.asset       |   4 +-
 .../scene/digitaluniverse/quasars.asset       |   4 +-
 data/assets/scene/digitaluniverse/sdss.asset  |   4 +-
 .../scene/digitaluniverse/superclusters.asset |   4 +-
 .../digitaluniverse/supernovaremnants.asset   |   4 +-
 data/assets/scene/digitaluniverse/tully.asset |   4 +-
 .../pointcloud/renderablepointcloud.cpp       | 107 +++++++++---------
 .../pointcloud/renderablepointcloud.h         |  16 +--
 modules/base/shaders/billboardpoint_fs.glsl   |   4 +-
 modules/base/shaders/billboardpoint_gs.glsl   |  54 ++++-----
 26 files changed, 143 insertions(+), 149 deletions(-)

diff --git a/data/assets/examples/pointclouds/points.asset b/data/assets/examples/pointclouds/points.asset
index e298045d79..8007829406 100644
--- a/data/assets/examples/pointclouds/points.asset
+++ b/data/assets/examples/pointclouds/points.asset
@@ -23,10 +23,9 @@ local FixedColor_FixedSize = {
   }
 }
 
--- Point cloud with fixed color and size scaling that is limited by a certain size,
--- in pixels
-local FixedColor_MaxPixelSize = {
-  Identifier = "ExamplePoints_MaxPixelSize",
+-- Point cloud with fixed color and size scaling that is limited by a certain size
+local FixedColor_MaxSize = {
+  Identifier = "ExamplePoints_MaxSize",
   Parent = earthAsset.Earth.Identifier,
   Transform = {
     Rotation = {
@@ -41,14 +40,14 @@ local FixedColor_MaxPixelSize = {
       FixedColor = { 0.0, 1.0, 1.0 }
     },
     SizeSettings = {
-      MaxPixelSize = 4.7,
-      EnablePixelSizeControl = true
+      MaxSize = 0.7,
+      EnableMaxSizeControl = true
     }
   },
   GUI = {
-    Name = "Fixed Color / Max Pixel Size",
+    Name = "Fixed Color / Max Size",
     Path = "/Example/Point Clouds",
-    Description = "Point cloud with a fixed color and sizing with a given max pixel size"
+    Description = "Point cloud with a fixed color and sizing with a given max size"
   }
 }
 
@@ -201,7 +200,7 @@ local ColorMappedAdvanced_NoBlend = {
 
 asset.onInitialize(function()
   openspace.addSceneGraphNode(FixedColor_FixedSize)
-  openspace.addSceneGraphNode(FixedColor_MaxPixelSize)
+  openspace.addSceneGraphNode(FixedColor_MaxSize)
   openspace.addSceneGraphNode(FixedColor_ScaleBasedOnData)
   openspace.addSceneGraphNode(Textured)
   openspace.addSceneGraphNode(ColorMapped_FixedSize)
@@ -213,12 +212,12 @@ asset.onDeinitialize(function()
   openspace.removeSceneGraphNode(ColorMapped_FixedSize)
   openspace.removeSceneGraphNode(Textured)
   openspace.removeSceneGraphNode(FixedColor_ScaleBasedOnData)
-  openspace.removeSceneGraphNode(FixedColor_MaxPixelSize)
+  openspace.removeSceneGraphNode(FixedColor_MaxSize)
   openspace.removeSceneGraphNode(FixedColor_FixedSize)
 end)
 
 asset.export(FixedColor_FixedSize)
-asset.export(FixedColor_MaxPixelSize)
+asset.export(FixedColor_MaxSize)
 asset.export(FixedColor_ScaleBasedOnData)
 asset.export(Textured)
 asset.export(ColorMapped_FixedSize)
diff --git a/data/assets/scene/digitaluniverse/2dF.asset b/data/assets/scene/digitaluniverse/2dF.asset
index a86bea1544..48441443d8 100644
--- a/data/assets/scene/digitaluniverse/2dF.asset
+++ b/data/assets/scene/digitaluniverse/2dF.asset
@@ -33,8 +33,8 @@ local Object = {
     },
     SizeSettings = {
       ScaleExponent = 22.6,
-      MaxPixelSize = 4.7,
-      EnablePixelSizeControl = true
+      MaxSize = 0.2,
+      EnableMaxSizeControl = true
     }
   },
   GUI = {
diff --git a/data/assets/scene/digitaluniverse/2mass.asset b/data/assets/scene/digitaluniverse/2mass.asset
index 8ed791380b..daf8dfe6d9 100644
--- a/data/assets/scene/digitaluniverse/2mass.asset
+++ b/data/assets/scene/digitaluniverse/2mass.asset
@@ -33,9 +33,9 @@ local Object = {
       }
     },
     SizeSettings = {
-      ScaleExponent = 22.5,
-      MaxPixelSize = 11.15,
-      EnablePixelSizeControl = true
+      ScaleExponent = 22.2,
+      MaxSize = 0.44,
+      EnableMaxSizeControl = true
     }
   },
   GUI = {
diff --git a/data/assets/scene/digitaluniverse/6dF.asset b/data/assets/scene/digitaluniverse/6dF.asset
index 780aefc678..f3d5528369 100644
--- a/data/assets/scene/digitaluniverse/6dF.asset
+++ b/data/assets/scene/digitaluniverse/6dF.asset
@@ -33,9 +33,9 @@ local Object = {
       }
     },
     SizeSettings = {
-      ScaleExponent = 23.2,
-      MaxPixelSize = 9.0,
-      EnablePixelSizeControl = true
+      ScaleExponent = 22.5,
+      MaxSize = 0.2,
+      EnableMaxSizeControl = true
     }
   },
   GUI = {
diff --git a/data/assets/scene/digitaluniverse/abell.asset b/data/assets/scene/digitaluniverse/abell.asset
index 2e3f6f0d02..43ef6c6796 100644
--- a/data/assets/scene/digitaluniverse/abell.asset
+++ b/data/assets/scene/digitaluniverse/abell.asset
@@ -45,8 +45,8 @@ local Object = {
     TransformationMatrix = TransformMatrix,
     SizeSettings = {
       ScaleExponent = 22.6,
-      MaxPixelSize = 7.0,
-      EnablePixelSizeControl = true
+      MaxSize = 0.27,
+      EnableMaxSizeControl = true
     }
   },
   GUI = {
diff --git a/data/assets/scene/digitaluniverse/deepsky.asset b/data/assets/scene/digitaluniverse/deepsky.asset
index 6be73ad6e4..5aa89ea88b 100644
--- a/data/assets/scene/digitaluniverse/deepsky.asset
+++ b/data/assets/scene/digitaluniverse/deepsky.asset
@@ -35,8 +35,8 @@ local DeepSkyObjects = {
     --FadeInDistances = { 0.05, 1.0 }, -- Fade in value in the same unit as "Unit"
     SizeSettings = {
       ScaleExponent = 21.7,
-      MaxPixelSize = 8.22,
-      EnablePixelSizeControl = true
+      MaxSize = 0.32,
+      EnableMaxSizeControl = true
     }
   },
   Transform = {
diff --git a/data/assets/scene/digitaluniverse/dwarfs.asset b/data/assets/scene/digitaluniverse/dwarfs.asset
index 312112931d..fd13e0e4ec 100644
--- a/data/assets/scene/digitaluniverse/dwarfs.asset
+++ b/data/assets/scene/digitaluniverse/dwarfs.asset
@@ -40,8 +40,8 @@ local Object = {
     },
     SizeSettings = {
       ScaleExponent = 16.2,
-      MaxPixelSize = 20.0,
-      EnablePixelSizeControl = true
+      MaxSize = 0.7,
+      EnableMaxSizeControl = true
     }
   },
   GUI = {
diff --git a/data/assets/scene/digitaluniverse/exoplanets.asset b/data/assets/scene/digitaluniverse/exoplanets.asset
index f7abff68f8..c53f3ae27d 100644
--- a/data/assets/scene/digitaluniverse/exoplanets.asset
+++ b/data/assets/scene/digitaluniverse/exoplanets.asset
@@ -31,8 +31,8 @@ local Object = {
     Unit = "pc",
     SizeSettings = {
       ScaleExponent = 16.9,
-      MaxPixelSize = 75.0,
-      EnablePixelSizeControl = true
+      MaxSize = 2.8,
+      EnableMaxSizeControl = true
     }
   },
   GUI = {
diff --git a/data/assets/scene/digitaluniverse/exoplanets_candidates.asset b/data/assets/scene/digitaluniverse/exoplanets_candidates.asset
index d33e413484..e0bb934486 100644
--- a/data/assets/scene/digitaluniverse/exoplanets_candidates.asset
+++ b/data/assets/scene/digitaluniverse/exoplanets_candidates.asset
@@ -27,8 +27,8 @@ local Object = {
     },
     SizeSettings = {
       ScaleExponent = 17.8,
-      MaxPixelSize = 30.0,
-      EnablePixelSizeControl = true
+      MaxSize = 1.0,
+      EnableMaxSizeControl = true
     }
   },
   GUI = {
diff --git a/data/assets/scene/digitaluniverse/globularclusters.asset b/data/assets/scene/digitaluniverse/globularclusters.asset
index ec6232b7af..2ce9c05cd5 100644
--- a/data/assets/scene/digitaluniverse/globularclusters.asset
+++ b/data/assets/scene/digitaluniverse/globularclusters.asset
@@ -33,9 +33,9 @@ local Object = {
     PolygonSides = 5,
     Unit = "pc",
     SizeSettings = {
-      ScaleExponent = 18.7,
-      MaxPixelSize = 500.0,
-      EnablePixelSizeControl = true
+      ScaleExponent = 18.9,
+      MaxSize = 13.0,
+      EnableMaxSizeControl = true
     }
   },
   GUI = {
diff --git a/data/assets/scene/digitaluniverse/h2regions.asset b/data/assets/scene/digitaluniverse/h2regions.asset
index 3868e22b08..f704d48757 100644
--- a/data/assets/scene/digitaluniverse/h2regions.asset
+++ b/data/assets/scene/digitaluniverse/h2regions.asset
@@ -34,8 +34,8 @@ local Object = {
     Unit = "pc",
     SizeSettings = {
       ScaleExponent = 18.24,
-      MaxPixelSize = 300.0,
-      EnablePixelSizeControl = false
+      MaxSize = 8.0,
+      EnableMaxSizeControl = true
     }
   },
   GUI = {
diff --git a/data/assets/scene/digitaluniverse/hdf.asset b/data/assets/scene/digitaluniverse/hdf.asset
index e44aeec0c0..964144e69c 100644
--- a/data/assets/scene/digitaluniverse/hdf.asset
+++ b/data/assets/scene/digitaluniverse/hdf.asset
@@ -39,9 +39,7 @@ local Object = {
     },
     Unit = "Mpc",
     SizeSettings = {
-      ScaleExponent = 21.9,
-      MaxPixelSize = 4.7,
-      EnablePixelSizeControl = true
+      ScaleExponent = 21.9
     }
   },
   GUI = {
diff --git a/data/assets/scene/digitaluniverse/localdwarfs.asset b/data/assets/scene/digitaluniverse/localdwarfs.asset
index 635b6e0edc..b09da57150 100644
--- a/data/assets/scene/digitaluniverse/localdwarfs.asset
+++ b/data/assets/scene/digitaluniverse/localdwarfs.asset
@@ -45,8 +45,8 @@ local Object = {
     Unit = "Mpc",
     SizeSettings = {
       ScaleExponent = 20.2,
-      MaxPixelSize = 20.0,
-      EnablePixelSizeControl = true
+      MaxSize = 0.7,
+      EnableMaxSizeControl = true
     }
   },
   GUI = {
diff --git a/data/assets/scene/digitaluniverse/obassociations.asset b/data/assets/scene/digitaluniverse/obassociations.asset
index c1793d6717..fd0610c6f1 100644
--- a/data/assets/scene/digitaluniverse/obassociations.asset
+++ b/data/assets/scene/digitaluniverse/obassociations.asset
@@ -41,8 +41,8 @@ local Object = {
     SizeSettings = {
       SizeMapping = { "diameter" },
       ScaleExponent = 16.9,
-      MaxPixelSize = 450.0,
-      EnablePixelSizeControl = true
+      MaxSize = 17,
+      EnableMaxSizeControl = true
     }
   },
   GUI = {
diff --git a/data/assets/scene/digitaluniverse/openclusters.asset b/data/assets/scene/digitaluniverse/openclusters.asset
index dd35569693..d7a4e2a551 100644
--- a/data/assets/scene/digitaluniverse/openclusters.asset
+++ b/data/assets/scene/digitaluniverse/openclusters.asset
@@ -34,8 +34,8 @@ local Object = {
     PolygonSides = 12,
     SizeSettings = {
       ScaleExponent = 17.6,
-      MaxPixelSize = 604.0,
-      EnablePixelSizeControl = true
+      MaxSize = 23.0,
+      EnableMaxSizeControl = true
     }
   },
   GUI = {
diff --git a/data/assets/scene/digitaluniverse/planetarynebulae.asset b/data/assets/scene/digitaluniverse/planetarynebulae.asset
index 303243769a..f9638d1392 100644
--- a/data/assets/scene/digitaluniverse/planetarynebulae.asset
+++ b/data/assets/scene/digitaluniverse/planetarynebulae.asset
@@ -34,8 +34,8 @@ local Object = {
     Unit = "pc",
     SizeSettings = {
       ScaleExponent = 18.46,
-      MaxPixelSize = 500.0,
-      EnablePixelSizeControl = true
+      MaxSize = 19.0,
+      EnableMaxSizeControl = true
     }
   },
   GUI = {
diff --git a/data/assets/scene/digitaluniverse/pulsars.asset b/data/assets/scene/digitaluniverse/pulsars.asset
index f18b4e3b5a..fd8a4edee1 100644
--- a/data/assets/scene/digitaluniverse/pulsars.asset
+++ b/data/assets/scene/digitaluniverse/pulsars.asset
@@ -34,8 +34,8 @@ local Object = {
     Unit = "pc",
     SizeSettings = {
       ScaleExponent = 18.4,
-      MaxPixelSize = 500.0,
-      EnablePixelSizeControl = false
+      MaxSize = 19.0,
+      EnableMaxSizeControl = true
     }
   },
   GUI = {
diff --git a/data/assets/scene/digitaluniverse/quasars.asset b/data/assets/scene/digitaluniverse/quasars.asset
index 92c57b19e0..93efec3236 100644
--- a/data/assets/scene/digitaluniverse/quasars.asset
+++ b/data/assets/scene/digitaluniverse/quasars.asset
@@ -46,8 +46,8 @@ local Object = {
     },
     SizeSettings = {
       ScaleExponent = 23.5,
-      MaxPixelSize = 11.1,
-      EnablePixelSizeControl = true
+      MaxSize = 0.3,
+      EnableMaxSizeControl = true
     }
   },
   GUI = {
diff --git a/data/assets/scene/digitaluniverse/sdss.asset b/data/assets/scene/digitaluniverse/sdss.asset
index 0ed6ee3d8c..0ffa195d31 100644
--- a/data/assets/scene/digitaluniverse/sdss.asset
+++ b/data/assets/scene/digitaluniverse/sdss.asset
@@ -37,8 +37,8 @@ local Object = {
     },
     SizeSettings = {
       ScaleExponent = 22.6,
-      MaxPixelSize = 5.5,
-      EnablePixelSizeControl = true
+      MaxSize = 0.15,
+      EnableMaxSizeControl = true
     }
   },
   GUI = {
diff --git a/data/assets/scene/digitaluniverse/superclusters.asset b/data/assets/scene/digitaluniverse/superclusters.asset
index 19d8a55c41..77260619f7 100644
--- a/data/assets/scene/digitaluniverse/superclusters.asset
+++ b/data/assets/scene/digitaluniverse/superclusters.asset
@@ -33,8 +33,8 @@ local Object = {
     Unit = "Mpc",
     SizeSettings = {
       ScaleExponent = 23.1,
-      MaxPixelSize = 7.2,
-      EnablePixelSizeControl = true
+      MaxSize = 0.2,
+      EnableMaxSizeControl = true
     }
   },
   GUI = {
diff --git a/data/assets/scene/digitaluniverse/supernovaremnants.asset b/data/assets/scene/digitaluniverse/supernovaremnants.asset
index 388118796a..6a6c8816a8 100644
--- a/data/assets/scene/digitaluniverse/supernovaremnants.asset
+++ b/data/assets/scene/digitaluniverse/supernovaremnants.asset
@@ -34,8 +34,8 @@ local Object = {
     Unit = "pc",
     SizeSettings = {
       ScaleExponent = 18.4,
-      MaxPixelSize = 500.0,
-      EnablePixelSizeControl = true
+      MaxSize = 19.0,
+      EnableMaxSizeControl = true
     }
   },
   GUI = {
diff --git a/data/assets/scene/digitaluniverse/tully.asset b/data/assets/scene/digitaluniverse/tully.asset
index f3a329348a..b7739c503d 100644
--- a/data/assets/scene/digitaluniverse/tully.asset
+++ b/data/assets/scene/digitaluniverse/tully.asset
@@ -52,8 +52,8 @@ local TullyGalaxies = {
     },
     SizeSettings = {
       ScaleExponent = 21.9,
-      MaxPixelSize = 7.0,
-      EnablePixelSizeControl = true
+      MaxSize = 0.3,
+      EnableMaxSizeControl = true
     }
   },
   GUI = {
diff --git a/modules/base/rendering/pointcloud/renderablepointcloud.cpp b/modules/base/rendering/pointcloud/renderablepointcloud.cpp
index be5d3fd6e6..6c8e08031f 100644
--- a/modules/base/rendering/pointcloud/renderablepointcloud.cpp
+++ b/modules/base/rendering/pointcloud/renderablepointcloud.cpp
@@ -28,7 +28,6 @@
 #include <openspace/documentation/documentation.h>
 #include <openspace/documentation/verifier.h>
 #include <openspace/engine/globals.h>
-#include <openspace/engine/windowdelegate.h>
 #include <openspace/util/updatestructures.h>
 #include <openspace/rendering/renderengine.h>
 #include <ghoul/filesystem/filesystem.h>
@@ -56,11 +55,11 @@ namespace {
     constexpr std::string_view _loggerCat = "RenderablePointCloud";
 
     constexpr std::array<const char*, 29> UniformNames = {
-        "cameraViewProjectionMatrix", "modelMatrix", "cameraPosition", "cameraLookUp",
-        "renderOption", "maxBillboardSize", "color", "opacity", "scaleExponent",
-        "scaleFactor", "up", "right", "fadeInValue", "screenSize", "hasSpriteTexture",
+        "cameraViewMatrix", "projectionMatrix", "modelMatrix", "cameraPosition",
+        "cameraLookUp", "renderOption", "maxAngularSize", "color", "opacity",
+        "scaleExponent", "scaleFactor", "up", "right", "fadeInValue", "hasSpriteTexture",
         "spriteTexture", "useColorMap", "colorMapTexture", "cmapRangeMin", "cmapRangeMax",
-        "nanColor", "useNanColor", "hideOutsideRange", "enablePixelSizeControl",
+        "nanColor", "useNanColor", "hideOutsideRange", "enableMaxSizeControl",
         "aboveRangeColor", "useAboveRangeColor", "belowRangeColor", "useBelowRangeColor",
         "hasDvarScaling"
     };
@@ -81,7 +80,7 @@ namespace {
         "UseTexture",
         "Use Texture",
         "If true, use the provided sprite texture to render the point. If false, draw "
-        "the points using the default point shape",
+        "the points using the default point shape.",
         openspace::properties::Property::Visibility::AdvancedUser
     };
 
@@ -127,7 +126,7 @@ namespace {
         "Unit, or meters. With normal fading the points are fully visible once the "
         "camera is outside this range and fully invisible when inside the range. With "
         "inverted fading the situation is the opposite: the points are visible inside "
-        "hen closer than the min value of the range and invisible when further away",
+        "hen closer than the min value of the range and invisible when further away.",
         // @VISIBILITY(3.25)
         openspace::properties::Property::Visibility::AdvancedUser
     };
@@ -136,7 +135,7 @@ namespace {
         "Enabled",
         "Enable Distance-based Fading",
         "Enables/disables the Fade-in effect based on camera distance. Automatically set "
-        "to true if FadeInDistances are specified in the asset",
+        "to true if FadeInDistances are specified in the asset.",
         openspace::properties::Property::Visibility::User
     };
 
@@ -145,7 +144,7 @@ namespace {
         "Invert",
         "This property can be used the invert the fading so that the points are "
         "invisible when the camera is further away than the max fade distance "
-        "and fully visible when it is closer than the min distance",
+        "and fully visible when it is closer than the min distance.",
         openspace::properties::Property::Visibility::AdvancedUser
     };
 
@@ -176,7 +175,7 @@ namespace {
         "value should be. If not included, it is computed based on the maximum "
         "positional component of the data points. This is useful for showing the "
         "dataset at all, but you will likely want to change it to something that looks "
-        "good",
+        "good.",
         openspace::properties::Property::Visibility::User
     };
 
@@ -184,25 +183,29 @@ namespace {
         "ScaleFactor",
         "Scale Factor",
         "This value is used as a multiplicative factor to adjust the size of the points, "
-        "after the exponential scaling and any pixel-size control effects. Simply just "
-        "increases or decreases the visual size of the points",
+        "after the exponential scaling and any max size control effects. Simply just "
+        "increases or decreases the visual size of the points.",
         openspace::properties::Property::Visibility::User
     };
 
-    constexpr openspace::properties::Property::PropertyInfo PixelSizeControlInfo = {
-        "EnablePixelSizeControl",
-        "Enable Pixel Size Control",
-        "If true, the Max Size in Pixels property will be used as an upper limit for the "
-        "size of the point. Reduces the size of the points when approaching them, so that "
-        "they stick to a maximum screen space size. Currently, the scaling is computed "
-        "based on rectangular displays and might look weird in other projections",
+    constexpr openspace::properties::Property::PropertyInfo UseMaxSizeControlInfo = {
+        "EnableMaxSizeControl",
+        "Enable Max Size Control",
+        "If true, the Max Size property will be used as an upper limit for the size of "
+        "the point. This reduces the size of the points when approaching them, so that "
+        "they stick to a maximum visual size depending on the Max Size value.",
         openspace::properties::Property::Visibility::AdvancedUser
     };
 
-    constexpr openspace::properties::Property::PropertyInfo MaxPixelSizeInfo = {
-        "MaxPixelSize",
-        "Max Size in Pixels",
-        "The maximum size (in pixels) for the billboard representing the point.",
+    constexpr openspace::properties::Property::PropertyInfo MaxSizeInfo = {
+        "MaxSize",
+        "Max Size",
+        "This value controls the maximum allowed size for the points, when the max size "
+        "control feature is enabled. This limits the visual size of the points based on "
+        "the distance to the camera. The larger the value, the larger the points are "
+        "allowed to become. In the background, the computations are made by limiting the "
+        "size to a certain angle based on the field of view of the camera. So a value of "
+        "1 limits the point size to take up a maximum of one degree of the view space.",
         openspace::properties::Property::Visibility::AdvancedUser
     };
 
@@ -220,7 +223,7 @@ namespace {
         "Parameter Option",
         "This value determines which parameter is used for scaling of the point. The "
         "parameter value will be used as a miltiplicative factor to scale the size of "
-        "the points. Not that they may however still be scaled by pixel size adjustment "
+        "the points. Note that they may however still be scaled by max size adjustment "
         "effects.",
         openspace::properties::Property::Visibility::AdvancedUser
     };
@@ -242,8 +245,8 @@ namespace {
     //   interactively when OpenSpace is running until you find a value that you find
     //   suitable.
     //
-    // - There is also an option to limit the size of the points based on a given pixel
-    //   size. For now, this only works for flat projection displays.
+    // - There is also an option to limit the size of the points based on a given max
+    //   size value.
     //
     // - To easily change the visual size of the points, the multiplicative 'ScaleFactor'
     //   may be used. A value of 2 makes the points twice as large, visually, compared
@@ -315,14 +318,14 @@ namespace {
             // [[codegen::verbatim(ScaleFactorInfo.description)]]
             std::optional<float> scaleFactor;
 
-            // [[codegen::verbatim(PixelSizeControlInfo.description)]]
-            std::optional<bool> enablePixelSizeControl;
+            // [[codegen::verbatim(UseMaxSizeControlInfo.description)]]
+            std::optional<bool> enableMaxSizeControl;
 
-            // [[codegen::verbatim(MaxPixelSizeInfo.description)]]
-            std::optional<float> maxPixelSize;
+            // [[codegen::verbatim(MaxSizeInfo.description)]]
+            std::optional<float> maxSize;
         };
         // Settings related to the scale of the points, whether they should limit to
-        // a certain pixel size, etc.
+        // a certain max size, etc.
         std::optional<SizeSettings> sizeSettings;
 
         struct ColorSettings {
@@ -352,7 +355,7 @@ namespace {
         // origin of the dataset
         std::optional<Fading> fading;
 
-        // Transformation matrix to be applied to each object
+        // Transformation matrix to be applied to the position of each object
         std::optional<glm::dmat4x4> transformationMatrix;
     };
 
@@ -369,8 +372,8 @@ RenderablePointCloud::SizeSettings::SizeSettings(const ghoul::Dictionary& dictio
     : properties::PropertyOwner({ "Sizing", "Sizing", ""})
     , scaleExponent(ScaleExponentInfo, 1.f, 0.f, 25.f)
     , scaleFactor(ScaleFactorInfo, 1.f, 0.f, 50.f)
-    , pixelSizeControl(PixelSizeControlInfo, false)
-    , maxPixelSize(MaxPixelSizeInfo, 400.f, 0.f, 1000.f)
+    , useMaxSizeControl(UseMaxSizeControlInfo, false)
+    , maxAngularSize(MaxSizeInfo, 1.f, 0.f, 45.f)
 {
     const Parameters p = codegen::bake<Parameters>(dictionary);
 
@@ -379,8 +382,8 @@ RenderablePointCloud::SizeSettings::SizeSettings(const ghoul::Dictionary& dictio
 
         scaleFactor = settings.scaleFactor.value_or(scaleFactor);
         scaleExponent = settings.scaleExponent.value_or(scaleExponent);
-        pixelSizeControl = settings.enablePixelSizeControl.value_or(pixelSizeControl);
-        maxPixelSize = settings.maxPixelSize.value_or(maxPixelSize);
+        useMaxSizeControl = settings.enableMaxSizeControl.value_or(useMaxSizeControl);
+        maxAngularSize = settings.maxSize.value_or(maxAngularSize);
 
         if (settings.sizeMapping.has_value()) {
             std::vector<std::string> opts = *settings.sizeMapping;
@@ -396,8 +399,8 @@ RenderablePointCloud::SizeSettings::SizeSettings(const ghoul::Dictionary& dictio
 
     addProperty(scaleFactor);
     addProperty(scaleExponent);
-    addProperty(pixelSizeControl);
-    addProperty(maxPixelSize);
+    addProperty(useMaxSizeControl);
+    addProperty(maxAngularSize);
 }
 
 RenderablePointCloud::SizeSettings::SizeMapping::SizeMapping()
@@ -720,11 +723,6 @@ void RenderablePointCloud::renderBillboards(const RenderData& data,
 
     _program->activate();
 
-    _program->setUniform(
-        "screenSize",
-        glm::vec2(global::renderEngine->renderingResolution())
-    );
-
     _program->setUniform(_uniformCache.cameraPos, data.camera.positionVec3());
     _program->setUniform(
         _uniformCache.cameraLookup,
@@ -732,9 +730,15 @@ void RenderablePointCloud::renderBillboards(const RenderData& data,
     );
     _program->setUniform(_uniformCache.renderOption, _renderOption.value());
     _program->setUniform(_uniformCache.modelMatrix, modelMatrix);
+
     _program->setUniform(
-        _uniformCache.cameraViewProjectionMatrix,
-        glm::dmat4(data.camera.projectionMatrix()) * data.camera.combinedViewMatrix()
+        _uniformCache.cameraViewMatrix,
+        data.camera.combinedViewMatrix()
+    );
+
+    _program->setUniform(
+        _uniformCache.projectionMatrix,
+        glm::dmat4(data.camera.projectionMatrix())
     );
 
     _program->setUniform(_uniformCache.up, glm::vec3(orthoUp));
@@ -744,14 +748,10 @@ void RenderablePointCloud::renderBillboards(const RenderData& data,
 
     _program->setUniform(_uniformCache.scaleExponent, _sizeSettings.scaleExponent);
     _program->setUniform(_uniformCache.scaleFactor, _sizeSettings.scaleFactor);
-    _program->setUniform(_uniformCache.enablePixelSizeControl, _sizeSettings.pixelSizeControl);
-    _program->setUniform(_uniformCache.maxBillboardSize, _sizeSettings.maxPixelSize);
+    _program->setUniform(_uniformCache.enableMaxSizeControl, _sizeSettings.useMaxSizeControl);
+    _program->setUniform(_uniformCache.maxAngularSize, _sizeSettings.maxAngularSize);
     _program->setUniform(_uniformCache.hasDvarScaling, _sizeSettings.sizeMapping.enabled);
 
-    GLint viewport[4];
-    glGetIntegerv(GL_VIEWPORT, viewport);
-    _program->setUniform(_uniformCache.screenSize, glm::vec2(viewport[2], viewport[3]));
-
     bool useTexture = _hasSpriteTexture && _useSpriteTexture;
     _program->setUniform(_uniformCache.hasSpriteTexture, useTexture);
 
@@ -829,8 +829,6 @@ void RenderablePointCloud::render(const RenderData& data, RendererTasks&) {
     }
 
     glm::dmat4 modelMatrix = calcModelTransform(data);
-    glm::dmat4 modelViewProjectionMatrix =
-        calcModelViewProjectionTransform(data, modelMatrix);
 
     glm::dvec3 cameraViewDirectionWorld = -data.camera.viewDirectionWorldSpace();
     glm::dvec3 cameraUpDirectionWorld = data.camera.lookUpVectorWorldSpace();
@@ -852,6 +850,9 @@ void RenderablePointCloud::render(const RenderData& data, RendererTasks&) {
     }
 
     if (_hasLabels) {
+        glm::dmat4 modelViewProjectionMatrix =
+            calcModelViewProjectionTransform(data, modelMatrix);
+
         _labels->render(data, modelViewProjectionMatrix, orthoRight, orthoUp, fadeInVar);
     }
 }
diff --git a/modules/base/rendering/pointcloud/renderablepointcloud.h b/modules/base/rendering/pointcloud/renderablepointcloud.h
index 0cfcbed715..ab51cfe2d9 100644
--- a/modules/base/rendering/pointcloud/renderablepointcloud.h
+++ b/modules/base/rendering/pointcloud/renderablepointcloud.h
@@ -114,8 +114,8 @@ protected:
         properties::FloatProperty scaleExponent;
         properties::FloatProperty scaleFactor;
 
-        properties::BoolProperty pixelSizeControl;
-        properties::FloatProperty maxPixelSize;
+        properties::BoolProperty useMaxSizeControl;
+        properties::FloatProperty maxAngularSize;
     };
     SizeSettings _sizeSettings;
 
@@ -148,12 +148,12 @@ protected:
     ghoul::opengl::ProgramObject* _program = nullptr;
 
     UniformCache(
-        cameraViewProjectionMatrix, modelMatrix, cameraPos, cameraLookup, renderOption,
-        maxBillboardSize, color, opacity, scaleExponent, scaleFactor, up, right,
-        fadeInValue, screenSize, hasSpriteTexture, spriteTexture, useColormap,
-        colorMapTexture, cmapRangeMin, cmapRangeMax, nanColor, useNanColor,
-        hideOutsideRange, enablePixelSizeControl, aboveRangeColor, useAboveRangeColor,
-        belowRangeColor, useBelowRangeColor, hasDvarScaling
+        cameraViewMatrix, projectionMatrix, modelMatrix, cameraPos, cameraLookup,
+        renderOption, maxAngularSize, color, opacity, scaleExponent, scaleFactor, up,
+        right, fadeInValue, hasSpriteTexture, spriteTexture, useColormap, colorMapTexture,
+        cmapRangeMin, cmapRangeMax, nanColor, useNanColor, hideOutsideRange,
+        enableMaxSizeControl, aboveRangeColor, useAboveRangeColor, belowRangeColor,
+        useBelowRangeColor, hasDvarScaling
     ) _uniformCache;
 
     std::string _dataFile;
diff --git a/modules/base/shaders/billboardpoint_fs.glsl b/modules/base/shaders/billboardpoint_fs.glsl
index b0dfaaeb6b..7b6b51c8e4 100644
--- a/modules/base/shaders/billboardpoint_fs.glsl
+++ b/modules/base/shaders/billboardpoint_fs.glsl
@@ -26,6 +26,7 @@
 
 flat in float gs_colorParameter;
 flat in float vs_screenSpaceDepth;
+flat in vec4 vs_positionViewSpace;
 in vec2 texCoord;
 
 uniform float opacity;
@@ -107,8 +108,7 @@ Fragment getFragment() {
   Fragment frag;
   frag.color = fullColor;
   frag.depth = vs_screenSpaceDepth;
-  // Setting the position of the billboards to not interact with the ATM
-  frag.gPosition = vec4(-1e32, -1e32, -1e32, 1.0);
+  frag.gPosition = vs_positionViewSpace;
   frag.gNormal = vec4(0.0, 0.0, 0.0, 1.0);
 
   return frag;
diff --git a/modules/base/shaders/billboardpoint_gs.glsl b/modules/base/shaders/billboardpoint_gs.glsl
index 19db521a59..51e58c3774 100644
--- a/modules/base/shaders/billboardpoint_gs.glsl
+++ b/modules/base/shaders/billboardpoint_gs.glsl
@@ -34,14 +34,16 @@ layout(triangle_strip, max_vertices = 4) out;
 flat out float gs_colorParameter;
 out vec2 texCoord;
 flat out float vs_screenSpaceDepth;
+flat out vec4 vs_positionViewSpace;
 
 // General settings
 uniform float scaleExponent;
 uniform float scaleFactor;
 uniform int renderOption;
-uniform dmat4 cameraViewProjectionMatrix;
+uniform dmat4 cameraViewMatrix;
+uniform dmat4 projectionMatrix;
 uniform dmat4 modelMatrix;
-uniform bool enablePixelSizeControl;
+uniform bool enableMaxSizeControl;
 uniform bool hasDvarScaling;
 
 // RenderOption: CameraViewDirection
@@ -52,9 +54,9 @@ uniform vec3 right;
 uniform dvec3 cameraPosition;
 uniform vec3 cameraLookUp;
 
-// Pixel size control: true
-uniform vec2 screenSize;
-uniform float maxBillboardSize;
+// Max size control: true
+// The max size is an angle, in degrees, for the diameter
+uniform float maxAngularSize;
 
 const vec2 corners[4] = vec2[4](
   vec2(0.0, 0.0),
@@ -93,41 +95,35 @@ void main() {
     scaledUp = scaleMultiply * newUp * 0.5;
   }
 
-  // @TODO: Come up with some better solution for this scaling, that
-  // also work with non planar projections and multiple viewport resolutions.
-  if (enablePixelSizeControl) {
-    vec4 initialPosition = z_normalization(vec4(cameraViewProjectionMatrix *
-      dvec4(dpos.xyz - dvec3(scaledRight - scaledUp), dpos.w)));
+  if (enableMaxSizeControl) {
+    // Limit the max size of the points, as the angle in "FOV" that the point is allowed
+    // to take up. Note that the max size is for the diameter, and we need the radius
+    float desiredAngleRadians = radians(maxAngularSize * 0.5);
 
-    vs_screenSpaceDepth = initialPosition.w;
+    double distanceToCamera = length(dpos.xyz - cameraPosition);
+    double pointSize = length(dvec3(scaledRight));
+    // @TODO (2023-01-05, emmbr) Consider if this atan computation can be optimized using
+    // approximation
+    float angle = atan(float(pointSize / distanceToCamera));
 
-    vec4 crossCorner = z_normalization(vec4(cameraViewProjectionMatrix *
-      dvec4(dpos.xyz + dvec3(scaledRight + scaledUp), dpos.w)));
-
-    // Testing size for rectangular viewport:
-    vec2 halfViewSize = screenSize * 0.5;
-    vec2 topRight = crossCorner.xy / crossCorner.w;
-    vec2 bottomLeft = initialPosition.xy / initialPosition.w;
-
-    // width and height
-    vec2 sizes = abs(halfViewSize * (topRight - bottomLeft));
-
-    if (length(sizes) > maxBillboardSize) {
-      float correctionScale = maxBillboardSize / length(sizes);
-      scaledRight *= correctionScale;
-      scaledUp *= correctionScale;
+    if ((angle > desiredAngleRadians) && (distanceToCamera > 0.0)) {
+      float correctionScaleFactor = float(distanceToCamera) * tan(desiredAngleRadians) / float(pointSize);
+      scaledRight *= correctionScaleFactor;
+      scaledUp *= correctionScaleFactor;
     }
-
-    // TODO: add checks for wether the generated plane covers too many or too few pixels
   }
 
-  // Saving one matrix multiplication:
+  dmat4 cameraViewProjectionMatrix = projectionMatrix * cameraViewMatrix;
+
   vec4 dposClip = vec4(cameraViewProjectionMatrix * dpos);
   vec4 scaledRightClip = scaleFactor *
     vec4(cameraViewProjectionMatrix * dvec4(scaledRight, 0.0));
   vec4 scaledUpClip = scaleFactor *
     vec4(cameraViewProjectionMatrix * dvec4(scaledUp, 0.0));
 
+  vec4 dposViewSpace= vec4(cameraViewMatrix * dpos);
+  vs_positionViewSpace = dposViewSpace;
+
   vec4 initialPosition = z_normalization(dposClip - scaledRightClip - scaledUpClip);
   vs_screenSpaceDepth = initialPosition.w;
   vec4 secondPosition = z_normalization(dposClip + scaledRightClip - scaledUpClip);

From 232a0e016d50dda18d732ef99369a67469737516 Mon Sep 17 00:00:00 2001
From: Alexander Bock <alexander.bock@liu.se>
Date: Thu, 18 Jan 2024 14:02:55 +0100
Subject: [PATCH 237/701] Add ESA's Bepicolombo mission (#3000)

---
 .../missions/bepicolombo/bepicolombo.asset    |  16 +
 .../missions/bepicolombo/fov.asset            |  10 +
 .../missions/bepicolombo/fov/bela.asset       | 108 +++
 .../missions/bepicolombo/fov/hga.asset        |  48 +
 .../missions/bepicolombo/fov/mertis.asset     | 104 +++
 .../missions/bepicolombo/fov/mgns.asset       |  57 ++
 .../missions/bepicolombo/fov/mixs.asset       |  81 ++
 .../missions/bepicolombo/fov/phebus.asset     | 137 +++
 .../missions/bepicolombo/fov/serena.asset     |  56 ++
 .../bepicolombo/fov/serena_anodes.asset       | 832 ++++++++++++++++++
 .../missions/bepicolombo/fov/sibbiosys.asset  | 378 ++++++++
 .../missions/bepicolombo/fov/sixs.asset       | 104 +++
 .../bepicolombo/fov/startracker.asset         | 107 +++
 .../missions/bepicolombo/kernels.asset        | 303 +++++++
 .../missions/bepicolombo/mission.asset        |  88 ++
 .../missions/bepicolombo/model.asset          |  84 ++
 .../missions/bepicolombo/trails.asset         |  73 ++
 data/profiles/bepicolombo.profile             | 183 ++++
 18 files changed, 2769 insertions(+)
 create mode 100644 data/assets/scene/solarsystem/missions/bepicolombo/bepicolombo.asset
 create mode 100644 data/assets/scene/solarsystem/missions/bepicolombo/fov.asset
 create mode 100644 data/assets/scene/solarsystem/missions/bepicolombo/fov/bela.asset
 create mode 100644 data/assets/scene/solarsystem/missions/bepicolombo/fov/hga.asset
 create mode 100644 data/assets/scene/solarsystem/missions/bepicolombo/fov/mertis.asset
 create mode 100644 data/assets/scene/solarsystem/missions/bepicolombo/fov/mgns.asset
 create mode 100644 data/assets/scene/solarsystem/missions/bepicolombo/fov/mixs.asset
 create mode 100644 data/assets/scene/solarsystem/missions/bepicolombo/fov/phebus.asset
 create mode 100644 data/assets/scene/solarsystem/missions/bepicolombo/fov/serena.asset
 create mode 100644 data/assets/scene/solarsystem/missions/bepicolombo/fov/serena_anodes.asset
 create mode 100644 data/assets/scene/solarsystem/missions/bepicolombo/fov/sibbiosys.asset
 create mode 100644 data/assets/scene/solarsystem/missions/bepicolombo/fov/sixs.asset
 create mode 100644 data/assets/scene/solarsystem/missions/bepicolombo/fov/startracker.asset
 create mode 100644 data/assets/scene/solarsystem/missions/bepicolombo/kernels.asset
 create mode 100644 data/assets/scene/solarsystem/missions/bepicolombo/mission.asset
 create mode 100644 data/assets/scene/solarsystem/missions/bepicolombo/model.asset
 create mode 100644 data/assets/scene/solarsystem/missions/bepicolombo/trails.asset
 create mode 100644 data/profiles/bepicolombo.profile

diff --git a/data/assets/scene/solarsystem/missions/bepicolombo/bepicolombo.asset b/data/assets/scene/solarsystem/missions/bepicolombo/bepicolombo.asset
new file mode 100644
index 0000000000..616728c08b
--- /dev/null
+++ b/data/assets/scene/solarsystem/missions/bepicolombo/bepicolombo.asset
@@ -0,0 +1,16 @@
+asset.require("./model")
+asset.require("./trails")
+asset.require("./mission")
+asset.require("./fov")
+
+
+
+asset.meta = {
+  Name = "BepiColombo",
+  Version = "1.0",
+  Description =
+    "This asset includes all of the other assets for the BepiColombo mission.",
+  Author = "OpenSpace Team",
+  URL = "http://openspaceproject.com",
+  License = "MIT license"
+}
diff --git a/data/assets/scene/solarsystem/missions/bepicolombo/fov.asset b/data/assets/scene/solarsystem/missions/bepicolombo/fov.asset
new file mode 100644
index 0000000000..6dfe003e15
--- /dev/null
+++ b/data/assets/scene/solarsystem/missions/bepicolombo/fov.asset
@@ -0,0 +1,10 @@
+asset.require("./fov/bela")
+asset.require("./fov/hga")
+asset.require("./fov/mertis")
+asset.require("./fov/mgns")
+asset.require("./fov/mixs")
+asset.require("./fov/phebus")
+asset.require("./fov/serena")
+asset.require("./fov/sibbiosys")
+asset.require("./fov/sixs")
+asset.require("./fov/startracker")
diff --git a/data/assets/scene/solarsystem/missions/bepicolombo/fov/bela.asset b/data/assets/scene/solarsystem/missions/bepicolombo/fov/bela.asset
new file mode 100644
index 0000000000..e99a422999
--- /dev/null
+++ b/data/assets/scene/solarsystem/missions/bepicolombo/fov/bela.asset
@@ -0,0 +1,108 @@
+local transforms = asset.require("../model")
+local kernels = asset.require("../kernels")
+
+
+
+local BelaReceiver = {
+  Identifier = "BepiColomboMPO_BelaReceiver",
+  Parent = transforms.BepiColombo.Identifier,
+  Renderable = {
+    Type = "RenderableFov",
+    Body = kernels.ID.MPO,
+    Frame = kernels.Frame.BelaReceiver,
+    RGB = { 0.8, 0.7, 0.7 },
+    Instrument = {
+      Name = "MPO_BELA_RX",
+      Method = "CIRCLE",
+      Aberration = "NONE"
+    },
+    AlwaysDrawFov = true,
+    PotentialTargets = { "MERCURY", "EARTH", "VENUS" },
+    FrameConversions = {}
+  },
+  GUI = {
+    Name = "MPO BELA Receiver",
+    Path = "/Solar System/Missions/BepiColombo/Instruments",
+  }
+}
+
+local BelaTransmitterMain = {
+  Identifier = "BepiColomboMPO_BelaTransmitterMain",
+  Parent = transforms.BepiColombo.Identifier,
+  Renderable = {
+    Type = "RenderableFov",
+    Body = kernels.ID.MPO,
+    Frame = kernels.Frame.BelaTransmitterMain,
+    RGB = { 0.8, 0.7, 0.7 },
+    Instrument = {
+      Name = "MPO_BELA_TX_MAIN",
+      Method = "CIRCLE",
+      Aberration = "NONE"
+    },
+    AlwaysDrawFov = true,
+    PotentialTargets = { "MERCURY", "EARTH", "VENUS" },
+    FrameConversions = {}
+  },
+  GUI = {
+    Name = "MPO BELA Transmitter Main",
+    Path = "/Solar System/Missions/BepiColombo/Instruments",
+  }
+}
+
+local BelaTransmitterRed = {
+  Identifier = "BepiColomboMPO_BelaTransmitterRed",
+  Parent = transforms.BepiColombo.Identifier,
+  Renderable = {
+    Type = "RenderableFov",
+    Body = kernels.ID.MPO,
+    Frame = kernels.Frame.BelaTransmitterRed,
+    RGB = { 0.8, 0.7, 0.7 },
+    Instrument = {
+      Name = "MPO_BELA_TX_RED",
+      Method = "CIRCLE",
+      Aberration = "NONE"
+    },
+    AlwaysDrawFov = true,
+    PotentialTargets = { "MERCURY", "EARTH", "VENUS" },
+    FrameConversions = {}
+  },
+  GUI = {
+    Name = "MPO BELA Transmitter Main",
+    Path = "/Solar System/Missions/BepiColombo/Instruments",
+  }
+}
+
+asset.onInitialize(function()
+  -- Circle shapes are currently not supported
+  -- openspace.addSceneGraphNode(BelaReceiver)
+  -- openspace.addSceneGraphNode(BelaTransmitterMain)
+  -- openspace.addSceneGraphNode(BelaTransmitterRed)
+end)
+
+asset.onDeinitialize(function()
+  -- openspace.removeSceneGraphNode(BelaTransmitterRed)
+  -- openspace.removeSceneGraphNode(BelaTransmitterMain)
+  -- openspace.removeSceneGraphNode(BelaReceiver)
+end)
+
+
+
+asset.meta = {
+  Name = "BELA",
+  Version = "1.0",
+  Description = [[
+    BELA for the first time will return a digitized laser reflection signal (only in a
+    dedicated instrument mode in order to keep the overall data volume moderate). This
+    will allow characterizing the surface roughness with unprecedented detail and
+    accuracy. BELA's albedo measurement capability will be particularly important for
+    permanently shaded craters where ice is suspected to be found. Here, BELA can observe
+    with its laser where most other remote sensing instruments will fail to obtain a
+    signal. In its normal operational mode, BELA employs a modified digital filter
+    matching algorithms for return pulse detection, while other similar instruments
+    (MOLA, MLA) use analog filter matching. The digital filters can be exchanged at any
+    time by telecommand and/or parameter upload.
+  ]],
+  Author = "OpenSpace Team",
+  URL = "http://openspaceproject.com",
+  License = "MIT license"
+}
diff --git a/data/assets/scene/solarsystem/missions/bepicolombo/fov/hga.asset b/data/assets/scene/solarsystem/missions/bepicolombo/fov/hga.asset
new file mode 100644
index 0000000000..e4e5e6c7e6
--- /dev/null
+++ b/data/assets/scene/solarsystem/missions/bepicolombo/fov/hga.asset
@@ -0,0 +1,48 @@
+local transforms = asset.require("../model")
+local kernels = asset.require("../kernels")
+
+
+
+local HGA = {
+  Identifier = "BepiColomboMPO_HGA",
+  Parent = transforms.BepiColombo.Identifier,
+  Renderable = {
+    Type = "RenderableFov",
+    Body = kernels.ID.MPO,
+    Frame = kernels.Frame.HGA,
+    RGB = { 0.8, 0.7, 0.7 },
+    Instrument = {
+      Name = "MPO_HGA",
+      Method = "CIRCLE",
+      Aberration = "NONE"
+    },
+    AlwaysDrawFov = true,
+    PotentialTargets = { "MERCURY", "EARTH", "VENUS" },
+    FrameConversions = {}
+  },
+  GUI = {
+    Name = "MPO HGA",
+    Path = "/Solar System/Missions/BepiColombo/Instruments",
+  }
+}
+
+
+asset.onInitialize(function()
+  -- Circle shapes are currently not supported
+  -- openspace.addSceneGraphNode(HGA)
+end)
+
+asset.onDeinitialize(function()
+  -- openspace.removeSceneGraphNode(HGA)
+end)
+
+
+
+asset.meta = {
+  Name = "HGA",
+  Version = "1.0",
+  Description = "Shows the field-view for the High Gain Antenna of the MPO spacecraft.",
+  Author = "OpenSpace Team",
+  URL = "http://openspaceproject.com",
+  License = "MIT license"
+}
diff --git a/data/assets/scene/solarsystem/missions/bepicolombo/fov/mertis.asset b/data/assets/scene/solarsystem/missions/bepicolombo/fov/mertis.asset
new file mode 100644
index 0000000000..2746bc7a0b
--- /dev/null
+++ b/data/assets/scene/solarsystem/missions/bepicolombo/fov/mertis.asset
@@ -0,0 +1,104 @@
+local transforms = asset.require("../model")
+local kernels = asset.require("../kernels")
+
+
+
+local MertisTis = {
+  Identifier = "BepiColomboMPO_MertisTis",
+  Parent = transforms.BepiColombo.Identifier,
+  Renderable = {
+    Type = "RenderableFov",
+    Body = kernels.ID.MPO,
+    Frame = kernels.Frame.MertisTis,
+    RGB = { 0.8, 0.7, 0.7 },
+    Instrument = {
+      Name = "MPO_MERTIS_TIS",
+      Method = "RECTANGLE",
+      Aberration = "NONE"
+    },
+    AlwaysDrawFov = true,
+    PotentialTargets = { "MERCURY", "EARTH", "VENUS" },
+    FrameConversions = {}
+  },
+  GUI = {
+    Name = "MPO MERTIS TIS",
+    Path = "/Solar System/Missions/BepiColombo/Instruments",
+  }
+}
+
+local MertisTisPlanet = {
+  Identifier = "BepiColomboMPO_MertisTisPlanet",
+  Parent = transforms.BepiColombo.Identifier,
+  Renderable = {
+    Type = "RenderableFov",
+    Body = kernels.ID.MPO,
+    Frame = kernels.Frame.MertisTisPlanet,
+    RGB = { 0.8, 0.7, 0.7 },
+    Instrument = {
+      Name = "MPO_MERTIS_TIS_PLANET",
+      Method = "RECTANGLE",
+      Aberration = "NONE"
+    },
+    AlwaysDrawFov = true,
+    PotentialTargets = { "MERCURY", "EARTH", "VENUS" },
+    FrameConversions = {}
+  },
+  GUI = {
+    Name = "MPO MERTIS TIS Planet",
+    Path = "/Solar System/Missions/BepiColombo/Instruments",
+  }
+}
+
+local MertisTisSpace = {
+  Identifier = "BepiColomboMPO_MertisTisSpace",
+  Parent = transforms.BepiColombo.Identifier,
+  Renderable = {
+    Type = "RenderableFov",
+    Body = kernels.ID.MPO,
+    Frame = kernels.Frame.MertisTisSpace,
+    RGB = { 0.8, 0.7, 0.7 },
+    Instrument = {
+      Name = "MPO_MERTIS_TIS_SPACE",
+      Method = "RECTANGLE",
+      Aberration = "NONE"
+    },
+    AlwaysDrawFov = true,
+    PotentialTargets = { "MERCURY", "EARTH", "VENUS" },
+    FrameConversions = {}
+  },
+  GUI = {
+    Name = "MPO MERTIS TIS Space",
+    Path = "/Solar System/Missions/BepiColombo/Instruments",
+  }
+}
+
+
+asset.onInitialize(function()
+  openspace.addSceneGraphNode(MertisTis)
+  openspace.addSceneGraphNode(MertisTisPlanet)
+  openspace.addSceneGraphNode(MertisTisSpace)
+end)
+
+asset.onDeinitialize(function()
+  openspace.removeSceneGraphNode(MertisTisSpace)
+  openspace.removeSceneGraphNode(MertisTisPlanet)
+  openspace.removeSceneGraphNode(MertisTis)
+end)
+
+
+
+asset.meta = {
+  Name = "MERTIS",
+  Version = "1.0",
+  Description = [[
+    The Mercury Radiometer and Thermal Infrared Spectrometer (MERTIS) is an innovative
+    instrument for studying the surface composition and mineralogy of planet Mercury.
+    MERTIS combines an uncooled grating push broom IR-spectrometer (TIS) with a radiometer
+    (TIR), which will operate in the wavelength region of 7-14 and 7-40 um, respectively.
+    The spatial resolution of the MERTIS observations will be about 500 m globally and
+    better than 500 m for approximately 5-10 percent of the surface.
+  ]],
+  Author = "OpenSpace Team",
+  URL = "http://openspaceproject.com",
+  License = "MIT license"
+}
diff --git a/data/assets/scene/solarsystem/missions/bepicolombo/fov/mgns.asset b/data/assets/scene/solarsystem/missions/bepicolombo/fov/mgns.asset
new file mode 100644
index 0000000000..d54ce926c3
--- /dev/null
+++ b/data/assets/scene/solarsystem/missions/bepicolombo/fov/mgns.asset
@@ -0,0 +1,57 @@
+local transforms = asset.require("../model")
+local kernels = asset.require("../kernels")
+
+
+
+local MGNS = {
+  Identifier = "BepiColomboMPO_MGNS",
+  Parent = transforms.BepiColombo.Identifier,
+  Renderable = {
+    Type = "RenderableFov",
+    Body = kernels.ID.MPO,
+    Frame = kernels.Frame.MGNS,
+    RGB = { 0.8, 0.7, 0.7 },
+    Instrument = {
+      Name = "MPO_MGNS",
+      Method = "CIRCLE",
+      Aberration = "NONE"
+    },
+    AlwaysDrawFov = true,
+    PotentialTargets = { "MERCURY", "EARTH", "VENUS" },
+    FrameConversions = {}
+  },
+  GUI = {
+    Name = "MPO MGNS",
+    Path = "/Solar System/Missions/BepiColombo/Instruments",
+  }
+}
+
+
+asset.onInitialize(function()
+  -- Circle shapes are currently not supported
+  -- openspace.addSceneGraphNode(MGNS)
+end)
+
+asset.onDeinitialize(function()
+  -- openspace.removeSceneGraphNode(MGNS)
+end)
+
+
+
+asset.meta = {
+  Name = "MGNS",
+  Version = "1.0",
+  Description = [[
+    The Mercury Gamma-ray and Neutron Spectrometer (MGNS) on board BepiColombo Mercury
+    Planet Orbiter is designed to observe and study the gamma-ray and neutron emissions of
+    Mercury. The MGNS is a multifunctional scientific instrument, comprising one gamma-ray
+    spectrometer and four neutron detectors. The sensor unit of the gamma-ray spectrometer
+    consists of one 3 by 3 inches high energy resolution inorganic scintillator crystal,
+    i.e. CeBr3, whereas the sensor unit of the neutron detectors consists of three 3He
+    gas-filled tubes and one stilbene organic scintillator crystal with plastic
+    scintillator as its anticoincidence shield.
+  ]],
+  Author = "OpenSpace Team",
+  URL = "http://openspaceproject.com",
+  License = "MIT license"
+}
diff --git a/data/assets/scene/solarsystem/missions/bepicolombo/fov/mixs.asset b/data/assets/scene/solarsystem/missions/bepicolombo/fov/mixs.asset
new file mode 100644
index 0000000000..5696e1fed2
--- /dev/null
+++ b/data/assets/scene/solarsystem/missions/bepicolombo/fov/mixs.asset
@@ -0,0 +1,81 @@
+local transforms = asset.require("../model")
+local kernels = asset.require("../kernels")
+
+
+
+local MIXS_C = {
+  Identifier = "BepiColomboMPO_MIXS-C",
+  Parent = transforms.BepiColombo.Identifier,
+  Renderable = {
+    Type = "RenderableFov",
+    Body = kernels.ID.MPO,
+    Frame = kernels.Frame.MIXS_C,
+    RGB = { 0.8, 0.7, 0.7 },
+    Instrument = {
+      Name = "MPO_MIXS-C",
+      Method = "RECTANGLE",
+      Aberration = "NONE"
+    },
+    AlwaysDrawFov = true,
+    PotentialTargets = { "MERCURY", "EARTH", "VENUS" },
+    FrameConversions = {}
+  },
+  GUI = {
+    Name = "MPO MIXS-C",
+    Path = "/Solar System/Missions/BepiColombo/Instruments",
+  }
+}
+
+local MIXS_T = {
+  Identifier = "BepiColomboMPO_MIXS-T",
+  Parent = transforms.BepiColombo.Identifier,
+  Renderable = {
+    Type = "RenderableFov",
+    Body = kernels.ID.MPO,
+    Frame = kernels.Frame.MIXS_T,
+    RGB = { 0.8, 0.7, 0.7 },
+    Instrument = {
+      Name = "MPO_MIXS-T",
+      Method = "RECTANGLE",
+      Aberration = "NONE"
+    },
+    AlwaysDrawFov = true,
+    PotentialTargets = { "MERCURY", "EARTH", "VENUS" },
+    FrameConversions = {}
+  },
+  GUI = {
+    Name = "MPO MIXS-T",
+    Path = "/Solar System/Missions/BepiColombo/Instruments",
+  }
+}
+
+
+asset.onInitialize(function()
+  openspace.addSceneGraphNode(MIXS_C)
+  openspace.addSceneGraphNode(MIXS_T)
+end)
+
+asset.onDeinitialize(function()
+  openspace.removeSceneGraphNode(MIXS_T)
+  openspace.removeSceneGraphNode(MIXS_C)
+end)
+
+
+
+asset.meta = {
+  Name = "MIXS",
+  Version = "1.0",
+  Description = [[
+    The MIXS instrument contains two parallel telescopes, designed to map the X-ray
+    emission from Mercury at two angular resolutions. The narrow-field telescope (MIXS-T)
+    uses a grazing incidence optic with a 1 degree field-of-view (FOV) and an imaging
+    detector with 64 x 64 pixels. The wide-field telescope (MIXS-C) uses a collimator to
+    define a FOV of ~10 degrees Full Width at Zero Maximum (FWZM). Its detector is
+    identical to MIXS-T, but as the collimator has no imaging capability, the pixels are
+    aggregated into a single output. The optical axes are aligned with the nadir-pointing
+    axis of the spacecraft.
+  ]],
+  Author = "OpenSpace Team",
+  URL = "http://openspaceproject.com",
+  License = "MIT license"
+}
diff --git a/data/assets/scene/solarsystem/missions/bepicolombo/fov/phebus.asset b/data/assets/scene/solarsystem/missions/bepicolombo/fov/phebus.asset
new file mode 100644
index 0000000000..86d52904ec
--- /dev/null
+++ b/data/assets/scene/solarsystem/missions/bepicolombo/fov/phebus.asset
@@ -0,0 +1,137 @@
+local transforms = asset.require("../model")
+local kernels = asset.require("../kernels")
+
+
+
+local PhebusSlit75 = {
+  Identifier = "BepiColomboMPO_PhebusSlit75",
+  Parent = transforms.BepiColombo.Identifier,
+  Renderable = {
+    Type = "RenderableFov",
+    Body = kernels.ID.MPO,
+    Frame = kernels.Frame.PhebusSlit75,
+    RGB = { 0.8, 0.7, 0.7 },
+    Instrument = {
+      Name = "MPO_PHEBUS_SLIT_75",
+      Method = "RECTANGLE",
+      Aberration = "NONE"
+    },
+    AlwaysDrawFov = true,
+    PotentialTargets = { "MERCURY", "EARTH", "VENUS" },
+    FrameConversions = {}
+  },
+  GUI = {
+    Name = "MPO Phebus Slit 75",
+    Path = "/Solar System/Missions/BepiColombo/Instruments",
+  }
+}
+
+local PhebusSlit100 = {
+  Identifier = "BepiColomboMPO_PhebusSlit100",
+  Parent = transforms.BepiColombo.Identifier,
+  Renderable = {
+    Type = "RenderableFov",
+    Body = kernels.ID.MPO,
+    Frame = kernels.Frame.PhebusSlit100,
+    RGB = { 0.8, 0.7, 0.7 },
+    Instrument = {
+      Name = "MPO_PHEBUS_SLIT_100",
+      Method = "RECTANGLE",
+      Aberration = "NONE"
+    },
+    AlwaysDrawFov = true,
+    PotentialTargets = { "MERCURY", "EARTH", "VENUS" },
+    FrameConversions = {}
+  },
+  GUI = {
+    Name = "MPO Phebus Slit 100",
+    Path = "/Solar System/Missions/BepiColombo/Instruments",
+  }
+}
+
+local Phebus75 = {
+  Identifier = "BepiColomboMPO_Phebus75",
+  Parent = transforms.BepiColombo.Identifier,
+  Renderable = {
+    Type = "RenderableFov",
+    Body = kernels.ID.MPO,
+    Frame = kernels.Frame.Phebus75,
+    RGB = { 0.8, 0.7, 0.7 },
+    Instrument = {
+      Name = "MPO_PHEBUS_75",
+      Method = "RECTANGLE",
+      Aberration = "NONE"
+    },
+    AlwaysDrawFov = true,
+    PotentialTargets = { "MERCURY", "EARTH", "VENUS" },
+    FrameConversions = {}
+  },
+  GUI = {
+    Name = "MPO Phebus 75",
+    Path = "/Solar System/Missions/BepiColombo/Instruments",
+  }
+}
+
+local Phebus100 = {
+  Identifier = "BepiColomboMPO_Phebus100",
+  Parent = transforms.BepiColombo.Identifier,
+  Renderable = {
+    Type = "RenderableFov",
+    Body = kernels.ID.MPO,
+    Frame = kernels.Frame.Phebus100,
+    RGB = { 0.8, 0.7, 0.7 },
+    Instrument = {
+      Name = "MPO_PHEBUS_100",
+      Method = "RECTANGLE",
+      Aberration = "NONE"
+    },
+    AlwaysDrawFov = true,
+    PotentialTargets = { "MERCURY", "EARTH", "VENUS" },
+    FrameConversions = {}
+  },
+  GUI = {
+    Name = "MPO Phebus 100",
+    Path = "/Solar System/Missions/BepiColombo/Instruments",
+  }
+}
+
+
+asset.onInitialize(function()
+  openspace.addSceneGraphNode(PhebusSlit75)
+  openspace.addSceneGraphNode(PhebusSlit100)
+  openspace.addSceneGraphNode(Phebus75)
+  openspace.addSceneGraphNode(Phebus100)
+end)
+
+asset.onDeinitialize(function()
+  openspace.removeSceneGraphNode(Phebus100)
+  openspace.removeSceneGraphNode(Phebus75)
+  openspace.removeSceneGraphNode(PhebusSlit100)
+  openspace.removeSceneGraphNode(PhebusSlit75)
+end)
+
+
+
+asset.meta = {
+  Name = "Phebus",
+  Version = "1.0",
+  Description = [[
+    The PHEBUS instrument is a UV spectrometer covering the spectral range going from
+    50 nm to 315 nm with two additional narrow bands in the visible around 404 nm (K line)
+    and 422 nm (Ca line). Photons from the source (exosphere of Mercury) are collected by
+    a SiC primary mirror installed inside a one-degree of freedom rotating mechanism
+    (360 degrees). The primary mirror focuses the photons on a slit. Spectrometric
+    information is obtained by the use of two gratings sharing the same pupil. Photons
+    going through the slit are scattered according to their wavelength onto two separate
+    intensified cross-delay anode detectors. One detector (labelled EUV) covers the
+    55-155 nm wavelength range. The second one (labelled FUV) covers the 145-315nm
+    wavelength range. The two intensifiers based on Micro-Channel Plates use high voltages
+    at values around 3600-5000 V. The two visible narrow spectral bands are obtained by
+    two prisms on the side of the FUV detector that feed two identical Photo-Multiplier
+    Tubes. The high voltage level that is necessary for these PMT is around 1000 V. They
+    are called NUV Ca and NUV K detectors.
+  ]],
+  Author = "OpenSpace Team",
+  URL = "http://openspaceproject.com",
+  License = "MIT license"
+}
diff --git a/data/assets/scene/solarsystem/missions/bepicolombo/fov/serena.asset b/data/assets/scene/solarsystem/missions/bepicolombo/fov/serena.asset
new file mode 100644
index 0000000000..ce050aa3ec
--- /dev/null
+++ b/data/assets/scene/solarsystem/missions/bepicolombo/fov/serena.asset
@@ -0,0 +1,56 @@
+local transforms = asset.require("../model")
+local kernels = asset.require("../kernels")
+
+
+
+local SerenaElena = {
+  Identifier = "BepiColomboMPO_SerenaElena",
+  Parent = transforms.BepiColombo.Identifier,
+  Renderable = {
+    Type = "RenderableFov",
+    Body = kernels.ID.MPO,
+    Frame = kernels.Frame.SerenaElena,
+    RGB = { 0.8, 0.7, 0.7 },
+    Instrument = {
+      Name = "MPO_SERENA_ELENA",
+      Method = "POLYGON",
+      Aberration = "NONE"
+    },
+    AlwaysDrawFov = true,
+    PotentialTargets = { "MERCURY", "EARTH", "VENUS" },
+    FrameConversions = {}
+  },
+  GUI = {
+    Name = "MPO Serena Elena",
+    Path = "/Solar System/Missions/BepiColombo/Instruments",
+  }
+}
+
+
+asset.onInitialize(function()
+  openspace.addSceneGraphNode(SerenaElena)
+end)
+
+asset.onDeinitialize(function()
+  openspace.removeSceneGraphNode(SerenaElena)
+end)
+
+
+
+asset.meta = {
+  Name = "Serena",
+  Version = "1.0",
+  Description = [[
+    The Search for Exospheric Refilling and Emitted Natural Abundances (SERENA) is a
+    single instrument composed by 4 units devoted to the detection of neutral and ionized
+    particles in the Hermean environment. It addresses some of the main scientific
+    objectives of the BepiColombo mission: composition, origin and dynamics of Mercury's
+    exosphere and polar deposits; and structure and dynamics of Mercury's magnetosphere.
+    Each unit is able to operate individually and to achieve its specific scientific
+    objectives. In addition, the opportunity to operate sensors simultaneously greatly
+    improves the success of scientific objectives and allows for additional objectives.
+  ]],
+  Author = "OpenSpace Team",
+  URL = "http://openspaceproject.com",
+  License = "MIT license"
+}
diff --git a/data/assets/scene/solarsystem/missions/bepicolombo/fov/serena_anodes.asset b/data/assets/scene/solarsystem/missions/bepicolombo/fov/serena_anodes.asset
new file mode 100644
index 0000000000..9476efd37f
--- /dev/null
+++ b/data/assets/scene/solarsystem/missions/bepicolombo/fov/serena_anodes.asset
@@ -0,0 +1,832 @@
+local transforms = asset.require("../model")
+local kernels = asset.require("../kernels")
+
+
+
+local SerenaElenaAN01 = {
+  Identifier = "BepiColomboMPO_SerenaElena_AN01",
+  Parent = transforms.BepiColombo.Identifier,
+  Renderable = {
+    Type = "RenderableFov",
+    Body = kernels.ID.MPO,
+    Frame = kernels.Frame.SerenaElenaAN01,
+    RGB = { 0.8, 0.7, 0.7 },
+    Instrument = {
+      Name = "MPO_SERENA_ELENA_AN_01",
+      Method = "RECTANGLE",
+      Aberration = "NONE"
+    },
+    AlwaysDrawFov = true,
+    PotentialTargets = { "MERCURY", "EARTH", "VENUS" },
+    FrameConversions = {}
+  },
+  GUI = {
+    Name = "MPO Serena Elena AN01",
+    Path = "/Solar System/Missions/BepiColombo/Instruments",
+  }
+}
+
+local SerenaElenaAN02 = {
+  Identifier = "BepiColomboMPO_SerenaElena_AN02",
+  Parent = transforms.BepiColombo.Identifier,
+  Renderable = {
+    Type = "RenderableFov",
+    Body = kernels.ID.MPO,
+    Frame = kernels.Frame.SerenaElenaAN02,
+    RGB = { 0.8, 0.7, 0.7 },
+    Instrument = {
+      Name = "MPO_SERENA_ELENA_AN_02",
+      Method = "RECTANGLE",
+      Aberration = "NONE"
+    },
+    AlwaysDrawFov = true,
+    PotentialTargets = { "MERCURY", "EARTH", "VENUS" },
+    FrameConversions = {}
+  },
+  GUI = {
+    Name = "MPO Serena Elena AN02",
+    Path = "/Solar System/Missions/BepiColombo/Instruments",
+  }
+}
+
+local SerenaElenaAN03 = {
+  Identifier = "BepiColomboMPO_SerenaElena_AN03",
+  Parent = transforms.BepiColombo.Identifier,
+  Renderable = {
+    Type = "RenderableFov",
+    Body = kernels.ID.MPO,
+    Frame = kernels.Frame.SerenaElenaAN03,
+    RGB = { 0.8, 0.7, 0.7 },
+    Instrument = {
+      Name = "MPO_SERENA_ELENA_AN_03",
+      Method = "RECTANGLE",
+      Aberration = "NONE"
+    },
+    AlwaysDrawFov = true,
+    PotentialTargets = { "MERCURY", "EARTH", "VENUS" },
+    FrameConversions = {}
+  },
+  GUI = {
+    Name = "MPO Serena Elena AN03",
+    Path = "/Solar System/Missions/BepiColombo/Instruments",
+  }
+}
+
+local SerenaElenaAN04 = {
+  Identifier = "BepiColomboMPO_SerenaElena_AN04",
+  Parent = transforms.BepiColombo.Identifier,
+  Renderable = {
+    Type = "RenderableFov",
+    Body = kernels.ID.MPO,
+    Frame = kernels.Frame.SerenaElenaAN04,
+    RGB = { 0.8, 0.7, 0.7 },
+    Instrument = {
+      Name = "MPO_SERENA_ELENA_AN_04",
+      Method = "RECTANGLE",
+      Aberration = "NONE"
+    },
+    AlwaysDrawFov = true,
+    PotentialTargets = { "MERCURY", "EARTH", "VENUS" },
+    FrameConversions = {}
+  },
+  GUI = {
+    Name = "MPO Serena Elena AN04",
+    Path = "/Solar System/Missions/BepiColombo/Instruments",
+  }
+}
+
+local SerenaElenaAN05 = {
+  Identifier = "BepiColomboMPO_SerenaElena_AN05",
+  Parent = transforms.BepiColombo.Identifier,
+  Renderable = {
+    Type = "RenderableFov",
+    Body = kernels.ID.MPO,
+    Frame = kernels.Frame.SerenaElenaAN05,
+    RGB = { 0.8, 0.7, 0.7 },
+    Instrument = {
+      Name = "MPO_SERENA_ELENA_AN_05",
+      Method = "RECTANGLE",
+      Aberration = "NONE"
+    },
+    AlwaysDrawFov = true,
+    PotentialTargets = { "MERCURY", "EARTH", "VENUS" },
+    FrameConversions = {}
+  },
+  GUI = {
+    Name = "MPO Serena Elena AN05",
+    Path = "/Solar System/Missions/BepiColombo/Instruments",
+  }
+}
+
+local SerenaElenaAN06 = {
+  Identifier = "BepiColomboMPO_SerenaElena_AN06",
+  Parent = transforms.BepiColombo.Identifier,
+  Renderable = {
+    Type = "RenderableFov",
+    Body = kernels.ID.MPO,
+    Frame = kernels.Frame.SerenaElenaAN06,
+    RGB = { 0.8, 0.7, 0.7 },
+    Instrument = {
+      Name = "MPO_SERENA_ELENA_AN_06",
+      Method = "RECTANGLE",
+      Aberration = "NONE"
+    },
+    AlwaysDrawFov = true,
+    PotentialTargets = { "MERCURY", "EARTH", "VENUS" },
+    FrameConversions = {}
+  },
+  GUI = {
+    Name = "MPO Serena Elena AN06",
+    Path = "/Solar System/Missions/BepiColombo/Instruments",
+  }
+}
+
+local SerenaElenaAN07 = {
+  Identifier = "BepiColomboMPO_SerenaElena_AN07",
+  Parent = transforms.BepiColombo.Identifier,
+  Renderable = {
+    Type = "RenderableFov",
+    Body = kernels.ID.MPO,
+    Frame = kernels.Frame.SerenaElenaAN07,
+    RGB = { 0.8, 0.7, 0.7 },
+    Instrument = {
+      Name = "MPO_SERENA_ELENA_AN_07",
+      Method = "RECTANGLE",
+      Aberration = "NONE"
+    },
+    AlwaysDrawFov = true,
+    PotentialTargets = { "MERCURY", "EARTH", "VENUS" },
+    FrameConversions = {}
+  },
+  GUI = {
+    Name = "MPO Serena Elena AN07",
+    Path = "/Solar System/Missions/BepiColombo/Instruments",
+  }
+}
+
+local SerenaElenaAN08 = {
+  Identifier = "BepiColomboMPO_SerenaElena_AN08",
+  Parent = transforms.BepiColombo.Identifier,
+  Renderable = {
+    Type = "RenderableFov",
+    Body = kernels.ID.MPO,
+    Frame = kernels.Frame.SerenaElenaAN08,
+    RGB = { 0.8, 0.7, 0.7 },
+    Instrument = {
+      Name = "MPO_SERENA_ELENA_AN_08",
+      Method = "RECTANGLE",
+      Aberration = "NONE"
+    },
+    AlwaysDrawFov = true,
+    PotentialTargets = { "MERCURY", "EARTH", "VENUS" },
+    FrameConversions = {}
+  },
+  GUI = {
+    Name = "MPO Serena Elena AN08",
+    Path = "/Solar System/Missions/BepiColombo/Instruments",
+  }
+}
+
+local SerenaElenaAN09 = {
+  Identifier = "BepiColomboMPO_SerenaElena_AN09",
+  Parent = transforms.BepiColombo.Identifier,
+  Renderable = {
+    Type = "RenderableFov",
+    Body = kernels.ID.MPO,
+    Frame = kernels.Frame.SerenaElenaAN09,
+    RGB = { 0.8, 0.7, 0.7 },
+    Instrument = {
+      Name = "MPO_SERENA_ELENA_AN_09",
+      Method = "RECTANGLE",
+      Aberration = "NONE"
+    },
+    AlwaysDrawFov = true,
+    PotentialTargets = { "MERCURY", "EARTH", "VENUS" },
+    FrameConversions = {}
+  },
+  GUI = {
+    Name = "MPO Serena Elena AN09",
+    Path = "/Solar System/Missions/BepiColombo/Instruments",
+  }
+}
+
+local SerenaElenaAN10 = {
+  Identifier = "BepiColomboMPO_SerenaElena_AN10",
+  Parent = transforms.BepiColombo.Identifier,
+  Renderable = {
+    Type = "RenderableFov",
+    Body = kernels.ID.MPO,
+    Frame = kernels.Frame.SerenaElenaAN10,
+    RGB = { 0.8, 0.7, 0.7 },
+    Instrument = {
+      Name = "MPO_SERENA_ELENA_AN_10",
+      Method = "RECTANGLE",
+      Aberration = "NONE"
+    },
+    AlwaysDrawFov = true,
+    PotentialTargets = { "MERCURY", "EARTH", "VENUS" },
+    FrameConversions = {}
+  },
+  GUI = {
+    Name = "MPO Serena Elena AN10",
+    Path = "/Solar System/Missions/BepiColombo/Instruments",
+  }
+}
+
+local SerenaElenaAN11 = {
+  Identifier = "BepiColomboMPO_SerenaElena_AN11",
+  Parent = transforms.BepiColombo.Identifier,
+  Renderable = {
+    Type = "RenderableFov",
+    Body = kernels.ID.MPO,
+    Frame = kernels.Frame.SerenaElenaAN11,
+    RGB = { 0.8, 0.7, 0.7 },
+    Instrument = {
+      Name = "MPO_SERENA_ELENA_AN_11",
+      Method = "RECTANGLE",
+      Aberration = "NONE"
+    },
+    AlwaysDrawFov = true,
+    PotentialTargets = { "MERCURY", "EARTH", "VENUS" },
+    FrameConversions = {}
+  },
+  GUI = {
+    Name = "MPO Serena Elena AN11",
+    Path = "/Solar System/Missions/BepiColombo/Instruments",
+  }
+}
+
+local SerenaElenaAN12 = {
+  Identifier = "BepiColomboMPO_SerenaElena_AN12",
+  Parent = transforms.BepiColombo.Identifier,
+  Renderable = {
+    Type = "RenderableFov",
+    Body = kernels.ID.MPO,
+    Frame = kernels.Frame.SerenaElenaAN12,
+    RGB = { 0.8, 0.7, 0.7 },
+    Instrument = {
+      Name = "MPO_SERENA_ELENA_AN_12",
+      Method = "RECTANGLE",
+      Aberration = "NONE"
+    },
+    AlwaysDrawFov = true,
+    PotentialTargets = { "MERCURY", "EARTH", "VENUS" },
+    FrameConversions = {}
+  },
+  GUI = {
+    Name = "MPO Serena Elena AN12",
+    Path = "/Solar System/Missions/BepiColombo/Instruments",
+  }
+}
+
+local SerenaElenaAN13 = {
+  Identifier = "BepiColomboMPO_SerenaElena_AN13",
+  Parent = transforms.BepiColombo.Identifier,
+  Renderable = {
+    Type = "RenderableFov",
+    Body = kernels.ID.MPO,
+    Frame = kernels.Frame.SerenaElenaAN13,
+    RGB = { 0.8, 0.7, 0.7 },
+    Instrument = {
+      Name = "MPO_SERENA_ELENA_AN_13",
+      Method = "RECTANGLE",
+      Aberration = "NONE"
+    },
+    AlwaysDrawFov = true,
+    PotentialTargets = { "MERCURY", "EARTH", "VENUS" },
+    FrameConversions = {}
+  },
+  GUI = {
+    Name = "MPO Serena Elena AN13",
+    Path = "/Solar System/Missions/BepiColombo/Instruments",
+  }
+}
+
+local SerenaElenaAN14 = {
+  Identifier = "BepiColomboMPO_SerenaElena_AN14",
+  Parent = transforms.BepiColombo.Identifier,
+  Renderable = {
+    Type = "RenderableFov",
+    Body = kernels.ID.MPO,
+    Frame = kernels.Frame.SerenaElenaAN14,
+    RGB = { 0.8, 0.7, 0.7 },
+    Instrument = {
+      Name = "MPO_SERENA_ELENA_AN_14",
+      Method = "RECTANGLE",
+      Aberration = "NONE"
+    },
+    AlwaysDrawFov = true,
+    PotentialTargets = { "MERCURY", "EARTH", "VENUS" },
+    FrameConversions = {}
+  },
+  GUI = {
+    Name = "MPO Serena Elena AN14",
+    Path = "/Solar System/Missions/BepiColombo/Instruments",
+  }
+}
+
+local SerenaElenaAN15 = {
+  Identifier = "BepiColomboMPO_SerenaElena_AN15",
+  Parent = transforms.BepiColombo.Identifier,
+  Renderable = {
+    Type = "RenderableFov",
+    Body = kernels.ID.MPO,
+    Frame = kernels.Frame.SerenaElenaAN15,
+    RGB = { 0.8, 0.7, 0.7 },
+    Instrument = {
+      Name = "MPO_SERENA_ELENA_AN_15",
+      Method = "RECTANGLE",
+      Aberration = "NONE"
+    },
+    AlwaysDrawFov = true,
+    PotentialTargets = { "MERCURY", "EARTH", "VENUS" },
+    FrameConversions = {}
+  },
+  GUI = {
+    Name = "MPO Serena Elena AN15",
+    Path = "/Solar System/Missions/BepiColombo/Instruments",
+  }
+}
+
+local SerenaElenaAN16 = {
+  Identifier = "BepiColomboMPO_SerenaElena_AN16",
+  Parent = transforms.BepiColombo.Identifier,
+  Renderable = {
+    Type = "RenderableFov",
+    Body = kernels.ID.MPO,
+    Frame = kernels.Frame.SerenaElenaAN16,
+    RGB = { 0.8, 0.7, 0.7 },
+    Instrument = {
+      Name = "MPO_SERENA_ELENA_AN_16",
+      Method = "RECTANGLE",
+      Aberration = "NONE"
+    },
+    AlwaysDrawFov = true,
+    PotentialTargets = { "MERCURY", "EARTH", "VENUS" },
+    FrameConversions = {}
+  },
+  GUI = {
+    Name = "MPO Serena Elena AN16",
+    Path = "/Solar System/Missions/BepiColombo/Instruments",
+  }
+}
+
+local SerenaElenaAN17 = {
+  Identifier = "BepiColomboMPO_SerenaElena_AN17",
+  Parent = transforms.BepiColombo.Identifier,
+  Renderable = {
+    Type = "RenderableFov",
+    Body = kernels.ID.MPO,
+    Frame = kernels.Frame.SerenaElenaAN17,
+    RGB = { 0.8, 0.7, 0.7 },
+    Instrument = {
+      Name = "MPO_SERENA_ELENA_AN_17",
+      Method = "RECTANGLE",
+      Aberration = "NONE"
+    },
+    AlwaysDrawFov = true,
+    PotentialTargets = { "MERCURY", "EARTH", "VENUS" },
+    FrameConversions = {}
+  },
+  GUI = {
+    Name = "MPO Serena Elena AN17",
+    Path = "/Solar System/Missions/BepiColombo/Instruments",
+  }
+}
+
+local SerenaElenaAN18 = {
+  Identifier = "BepiColomboMPO_SerenaElena_AN18",
+  Parent = transforms.BepiColombo.Identifier,
+  Renderable = {
+    Type = "RenderableFov",
+    Body = kernels.ID.MPO,
+    Frame = kernels.Frame.SerenaElenaAN18,
+    RGB = { 0.8, 0.7, 0.7 },
+    Instrument = {
+      Name = "MPO_SERENA_ELENA_AN_18",
+      Method = "RECTANGLE",
+      Aberration = "NONE"
+    },
+    AlwaysDrawFov = true,
+    PotentialTargets = { "MERCURY", "EARTH", "VENUS" },
+    FrameConversions = {}
+  },
+  GUI = {
+    Name = "MPO Serena Elena AN18",
+    Path = "/Solar System/Missions/BepiColombo/Instruments",
+  }
+}
+
+local SerenaElenaAN19 = {
+  Identifier = "BepiColomboMPO_SerenaElena_AN19",
+  Parent = transforms.BepiColombo.Identifier,
+  Renderable = {
+    Type = "RenderableFov",
+    Body = kernels.ID.MPO,
+    Frame = kernels.Frame.SerenaElenaAN19,
+    RGB = { 0.8, 0.7, 0.7 },
+    Instrument = {
+      Name = "MPO_SERENA_ELENA_AN_19",
+      Method = "RECTANGLE",
+      Aberration = "NONE"
+    },
+    AlwaysDrawFov = true,
+    PotentialTargets = { "MERCURY", "EARTH", "VENUS" },
+    FrameConversions = {}
+  },
+  GUI = {
+    Name = "MPO Serena Elena AN19",
+    Path = "/Solar System/Missions/BepiColombo/Instruments",
+  }
+}
+
+local SerenaElenaAN20 = {
+  Identifier = "BepiColomboMPO_SerenaElena_AN20",
+  Parent = transforms.BepiColombo.Identifier,
+  Renderable = {
+    Type = "RenderableFov",
+    Body = kernels.ID.MPO,
+    Frame = kernels.Frame.SerenaElenaAN20,
+    RGB = { 0.8, 0.7, 0.7 },
+    Instrument = {
+      Name = "MPO_SERENA_ELENA_AN_20",
+      Method = "RECTANGLE",
+      Aberration = "NONE"
+    },
+    AlwaysDrawFov = true,
+    PotentialTargets = { "MERCURY", "EARTH", "VENUS" },
+    FrameConversions = {}
+  },
+  GUI = {
+    Name = "MPO Serena Elena AN20",
+    Path = "/Solar System/Missions/BepiColombo/Instruments",
+  }
+}
+
+local SerenaElenaAN21 = {
+  Identifier = "BepiColomboMPO_SerenaElena_AN21",
+  Parent = transforms.BepiColombo.Identifier,
+  Renderable = {
+    Type = "RenderableFov",
+    Body = kernels.ID.MPO,
+    Frame = kernels.Frame.SerenaElenaAN21,
+    RGB = { 0.8, 0.7, 0.7 },
+    Instrument = {
+      Name = "MPO_SERENA_ELENA_AN_21",
+      Method = "RECTANGLE",
+      Aberration = "NONE"
+    },
+    AlwaysDrawFov = true,
+    PotentialTargets = { "MERCURY", "EARTH", "VENUS" },
+    FrameConversions = {}
+  },
+  GUI = {
+    Name = "MPO Serena Elena AN21",
+    Path = "/Solar System/Missions/BepiColombo/Instruments",
+  }
+}
+
+local SerenaElenaAN22 = {
+  Identifier = "BepiColomboMPO_SerenaElena_AN22",
+  Parent = transforms.BepiColombo.Identifier,
+  Renderable = {
+    Type = "RenderableFov",
+    Body = kernels.ID.MPO,
+    Frame = kernels.Frame.SerenaElenaAN22,
+    RGB = { 0.8, 0.7, 0.7 },
+    Instrument = {
+      Name = "MPO_SERENA_ELENA_AN_22",
+      Method = "RECTANGLE",
+      Aberration = "NONE"
+    },
+    AlwaysDrawFov = true,
+    PotentialTargets = { "MERCURY", "EARTH", "VENUS" },
+    FrameConversions = {}
+  },
+  GUI = {
+    Name = "MPO Serena Elena AN22",
+    Path = "/Solar System/Missions/BepiColombo/Instruments",
+  }
+}
+
+local SerenaElenaAN23 = {
+  Identifier = "BepiColomboMPO_SerenaElena_AN23",
+  Parent = transforms.BepiColombo.Identifier,
+  Renderable = {
+    Type = "RenderableFov",
+    Body = kernels.ID.MPO,
+    Frame = kernels.Frame.SerenaElenaAN23,
+    RGB = { 0.8, 0.7, 0.7 },
+    Instrument = {
+      Name = "MPO_SERENA_ELENA_AN_23",
+      Method = "RECTANGLE",
+      Aberration = "NONE"
+    },
+    AlwaysDrawFov = true,
+    PotentialTargets = { "MERCURY", "EARTH", "VENUS" },
+    FrameConversions = {}
+  },
+  GUI = {
+    Name = "MPO Serena Elena AN23",
+    Path = "/Solar System/Missions/BepiColombo/Instruments",
+  }
+}
+
+local SerenaElenaAN24 = {
+  Identifier = "BepiColomboMPO_SerenaElena_AN24",
+  Parent = transforms.BepiColombo.Identifier,
+  Renderable = {
+    Type = "RenderableFov",
+    Body = kernels.ID.MPO,
+    Frame = kernels.Frame.SerenaElenaAN24,
+    RGB = { 0.8, 0.7, 0.7 },
+    Instrument = {
+      Name = "MPO_SERENA_ELENA_AN_24",
+      Method = "RECTANGLE",
+      Aberration = "NONE"
+    },
+    AlwaysDrawFov = true,
+    PotentialTargets = { "MERCURY", "EARTH", "VENUS" },
+    FrameConversions = {}
+  },
+  GUI = {
+    Name = "MPO Serena Elena AN24",
+    Path = "/Solar System/Missions/BepiColombo/Instruments",
+  }
+}
+
+local SerenaElenaAN25 = {
+  Identifier = "BepiColomboMPO_SerenaElena_AN25",
+  Parent = transforms.BepiColombo.Identifier,
+  Renderable = {
+    Type = "RenderableFov",
+    Body = kernels.ID.MPO,
+    Frame = kernels.Frame.SerenaElenaAN25,
+    RGB = { 0.8, 0.7, 0.7 },
+    Instrument = {
+      Name = "MPO_SERENA_ELENA_AN_25",
+      Method = "RECTANGLE",
+      Aberration = "NONE"
+    },
+    AlwaysDrawFov = true,
+    PotentialTargets = { "MERCURY", "EARTH", "VENUS" },
+    FrameConversions = {}
+  },
+  GUI = {
+    Name = "MPO Serena Elena AN25",
+    Path = "/Solar System/Missions/BepiColombo/Instruments",
+  }
+}
+
+local SerenaElenaAN26 = {
+  Identifier = "BepiColomboMPO_SerenaElena_AN26",
+  Parent = transforms.BepiColombo.Identifier,
+  Renderable = {
+    Type = "RenderableFov",
+    Body = kernels.ID.MPO,
+    Frame = kernels.Frame.SerenaElenaAN26,
+    RGB = { 0.8, 0.7, 0.7 },
+    Instrument = {
+      Name = "MPO_SERENA_ELENA_AN_26",
+      Method = "RECTANGLE",
+      Aberration = "NONE"
+    },
+    AlwaysDrawFov = true,
+    PotentialTargets = { "MERCURY", "EARTH", "VENUS" },
+    FrameConversions = {}
+  },
+  GUI = {
+    Name = "MPO Serena Elena AN26",
+    Path = "/Solar System/Missions/BepiColombo/Instruments",
+  }
+}
+
+local SerenaElenaAN27 = {
+  Identifier = "BepiColomboMPO_SerenaElena_AN27",
+  Parent = transforms.BepiColombo.Identifier,
+  Renderable = {
+    Type = "RenderableFov",
+    Body = kernels.ID.MPO,
+    Frame = kernels.Frame.SerenaElenaAN27,
+    RGB = { 0.8, 0.7, 0.7 },
+    Instrument = {
+      Name = "MPO_SERENA_ELENA_AN_27",
+      Method = "RECTANGLE",
+      Aberration = "NONE"
+    },
+    AlwaysDrawFov = true,
+    PotentialTargets = { "MERCURY", "EARTH", "VENUS" },
+    FrameConversions = {}
+  },
+  GUI = {
+    Name = "MPO Serena Elena AN27",
+    Path = "/Solar System/Missions/BepiColombo/Instruments",
+  }
+}
+
+local SerenaElenaAN28 = {
+  Identifier = "BepiColomboMPO_SerenaElena_AN28",
+  Parent = transforms.BepiColombo.Identifier,
+  Renderable = {
+    Type = "RenderableFov",
+    Body = kernels.ID.MPO,
+    Frame = kernels.Frame.SerenaElenaAN28,
+    RGB = { 0.8, 0.7, 0.7 },
+    Instrument = {
+      Name = "MPO_SERENA_ELENA_AN_28",
+      Method = "RECTANGLE",
+      Aberration = "NONE"
+    },
+    AlwaysDrawFov = true,
+    PotentialTargets = { "MERCURY", "EARTH", "VENUS" },
+    FrameConversions = {}
+  },
+  GUI = {
+    Name = "MPO Serena Elena AN28",
+    Path = "/Solar System/Missions/BepiColombo/Instruments",
+  }
+}
+
+local SerenaElenaAN29 = {
+  Identifier = "BepiColomboMPO_SerenaElena_AN29",
+  Parent = transforms.BepiColombo.Identifier,
+  Renderable = {
+    Type = "RenderableFov",
+    Body = kernels.ID.MPO,
+    Frame = kernels.Frame.SerenaElenaAN29,
+    RGB = { 0.8, 0.7, 0.7 },
+    Instrument = {
+      Name = "MPO_SERENA_ELENA_AN_29",
+      Method = "RECTANGLE",
+      Aberration = "NONE"
+    },
+    AlwaysDrawFov = true,
+    PotentialTargets = { "MERCURY", "EARTH", "VENUS" },
+    FrameConversions = {}
+  },
+  GUI = {
+    Name = "MPO Serena Elena AN29",
+    Path = "/Solar System/Missions/BepiColombo/Instruments",
+  }
+}
+
+local SerenaElenaAN30 = {
+  Identifier = "BepiColomboMPO_SerenaElena_AN30",
+  Parent = transforms.BepiColombo.Identifier,
+  Renderable = {
+    Type = "RenderableFov",
+    Body = kernels.ID.MPO,
+    Frame = kernels.Frame.SerenaElenaAN30,
+    RGB = { 0.8, 0.7, 0.7 },
+    Instrument = {
+      Name = "MPO_SERENA_ELENA_AN_30",
+      Method = "RECTANGLE",
+      Aberration = "NONE"
+    },
+    AlwaysDrawFov = true,
+    PotentialTargets = { "MERCURY", "EARTH", "VENUS" },
+    FrameConversions = {}
+  },
+  GUI = {
+    Name = "MPO Serena Elena AN30",
+    Path = "/Solar System/Missions/BepiColombo/Instruments",
+  }
+}
+
+local SerenaElenaAN31 = {
+  Identifier = "BepiColomboMPO_SerenaElena_AN31",
+  Parent = transforms.BepiColombo.Identifier,
+  Renderable = {
+    Type = "RenderableFov",
+    Body = kernels.ID.MPO,
+    Frame = kernels.Frame.SerenaElenaAN31,
+    RGB = { 0.8, 0.7, 0.7 },
+    Instrument = {
+      Name = "MPO_SERENA_ELENA_AN_31",
+      Method = "RECTANGLE",
+      Aberration = "NONE"
+    },
+    AlwaysDrawFov = true,
+    PotentialTargets = { "MERCURY", "EARTH", "VENUS" },
+    FrameConversions = {}
+  },
+  GUI = {
+    Name = "MPO Serena Elena AN31",
+    Path = "/Solar System/Missions/BepiColombo/Instruments",
+  }
+}
+
+local SerenaElenaAN32 = {
+  Identifier = "BepiColomboMPO_SerenaElena_AN32",
+  Parent = transforms.BepiColombo.Identifier,
+  Renderable = {
+    Type = "RenderableFov",
+    Body = kernels.ID.MPO,
+    Frame = kernels.Frame.SerenaElenaAN32,
+    RGB = { 0.8, 0.7, 0.7 },
+    Instrument = {
+      Name = "MPO_SERENA_ELENA_AN_32",
+      Method = "RECTANGLE",
+      Aberration = "NONE"
+    },
+    AlwaysDrawFov = true,
+    PotentialTargets = { "MERCURY", "EARTH", "VENUS" },
+    FrameConversions = {}
+  },
+  GUI = {
+    Name = "MPO Serena Elena AN32",
+    Path = "/Solar System/Missions/BepiColombo/Instruments",
+  }
+}
+
+
+
+asset.onInitialize(function()
+  openspace.addSceneGraphNode(SerenaElenaAN01)
+  openspace.addSceneGraphNode(SerenaElenaAN02)
+  openspace.addSceneGraphNode(SerenaElenaAN03)
+  openspace.addSceneGraphNode(SerenaElenaAN04)
+  openspace.addSceneGraphNode(SerenaElenaAN05)
+  openspace.addSceneGraphNode(SerenaElenaAN06)
+  openspace.addSceneGraphNode(SerenaElenaAN07)
+  openspace.addSceneGraphNode(SerenaElenaAN08)
+  openspace.addSceneGraphNode(SerenaElenaAN09)
+  openspace.addSceneGraphNode(SerenaElenaAN10)
+  openspace.addSceneGraphNode(SerenaElenaAN11)
+  openspace.addSceneGraphNode(SerenaElenaAN12)
+  openspace.addSceneGraphNode(SerenaElenaAN13)
+  openspace.addSceneGraphNode(SerenaElenaAN14)
+  openspace.addSceneGraphNode(SerenaElenaAN15)
+  openspace.addSceneGraphNode(SerenaElenaAN16)
+  openspace.addSceneGraphNode(SerenaElenaAN17)
+  openspace.addSceneGraphNode(SerenaElenaAN18)
+  openspace.addSceneGraphNode(SerenaElenaAN19)
+  openspace.addSceneGraphNode(SerenaElenaAN20)
+  openspace.addSceneGraphNode(SerenaElenaAN21)
+  openspace.addSceneGraphNode(SerenaElenaAN22)
+  openspace.addSceneGraphNode(SerenaElenaAN23)
+  openspace.addSceneGraphNode(SerenaElenaAN24)
+  openspace.addSceneGraphNode(SerenaElenaAN25)
+  openspace.addSceneGraphNode(SerenaElenaAN26)
+  openspace.addSceneGraphNode(SerenaElenaAN27)
+  openspace.addSceneGraphNode(SerenaElenaAN28)
+  openspace.addSceneGraphNode(SerenaElenaAN29)
+  openspace.addSceneGraphNode(SerenaElenaAN30)
+  openspace.addSceneGraphNode(SerenaElenaAN31)
+  openspace.addSceneGraphNode(SerenaElenaAN32)
+end)
+
+asset.onDeinitialize(function()
+  openspace.removeSceneGraphNode(SerenaElenaAN32)
+  openspace.removeSceneGraphNode(SerenaElenaAN31)
+  openspace.removeSceneGraphNode(SerenaElenaAN30)
+  openspace.removeSceneGraphNode(SerenaElenaAN29)
+  openspace.removeSceneGraphNode(SerenaElenaAN28)
+  openspace.removeSceneGraphNode(SerenaElenaAN27)
+  openspace.removeSceneGraphNode(SerenaElenaAN26)
+  openspace.removeSceneGraphNode(SerenaElenaAN25)
+  openspace.removeSceneGraphNode(SerenaElenaAN24)
+  openspace.removeSceneGraphNode(SerenaElenaAN23)
+  openspace.removeSceneGraphNode(SerenaElenaAN22)
+  openspace.removeSceneGraphNode(SerenaElenaAN21)
+  openspace.removeSceneGraphNode(SerenaElenaAN20)
+  openspace.removeSceneGraphNode(SerenaElenaAN19)
+  openspace.removeSceneGraphNode(SerenaElenaAN18)
+  openspace.removeSceneGraphNode(SerenaElenaAN17)
+  openspace.removeSceneGraphNode(SerenaElenaAN16)
+  openspace.removeSceneGraphNode(SerenaElenaAN15)
+  openspace.removeSceneGraphNode(SerenaElenaAN14)
+  openspace.removeSceneGraphNode(SerenaElenaAN13)
+  openspace.removeSceneGraphNode(SerenaElenaAN12)
+  openspace.removeSceneGraphNode(SerenaElenaAN11)
+  openspace.removeSceneGraphNode(SerenaElenaAN10)
+  openspace.removeSceneGraphNode(SerenaElenaAN09)
+  openspace.removeSceneGraphNode(SerenaElenaAN08)
+  openspace.removeSceneGraphNode(SerenaElenaAN07)
+  openspace.removeSceneGraphNode(SerenaElenaAN06)
+  openspace.removeSceneGraphNode(SerenaElenaAN05)
+  openspace.removeSceneGraphNode(SerenaElenaAN04)
+  openspace.removeSceneGraphNode(SerenaElenaAN03)
+  openspace.removeSceneGraphNode(SerenaElenaAN02)
+  openspace.removeSceneGraphNode(SerenaElenaAN01)
+end)
+
+
+
+asset.meta = {
+  Name = "Serena Anodes",
+  Version = "1.0",
+  Description = [[
+    The Search for Exospheric Refilling and Emitted Natural Abundances (SERENA) is a
+    single instrument composed by 4 units devoted to the detection of neutral and ionized
+    particles in the Hermean environment. It addresses some of the main scientific
+    objectives of the BepiColombo mission: composition, origin and dynamics of Mercury's
+    exosphere and polar deposits; and structure and dynamics of Mercury's magnetosphere.
+    Each unit is able to operate individually and to achieve its specific scientific
+    objectives. In addition, the opportunity to operate sensors simultaneously greatly
+    improves the success of scientific objectives and allows for additional objectives.
+  ]],
+  Author = "OpenSpace Team",
+  URL = "http://openspaceproject.com",
+  License = "MIT license"
+}
diff --git a/data/assets/scene/solarsystem/missions/bepicolombo/fov/sibbiosys.asset b/data/assets/scene/solarsystem/missions/bepicolombo/fov/sibbiosys.asset
new file mode 100644
index 0000000000..b5199d9b94
--- /dev/null
+++ b/data/assets/scene/solarsystem/missions/bepicolombo/fov/sibbiosys.asset
@@ -0,0 +1,378 @@
+local transforms = asset.require("../model")
+local kernels = asset.require("../kernels")
+
+
+
+local SimbioSys_HRIC_FPA = {
+  Identifier = "BepiColomboMPO_SIMBIOSYS_HRIC_FPA",
+  Parent = transforms.BepiColombo.Identifier,
+  Renderable = {
+    Type = "RenderableFov",
+    Body = kernels.ID.MPO,
+    Frame = kernels.Frame.SymbioSysHricFpa,
+    RGB = { 0.8, 0.7, 0.7 },
+    Instrument = {
+      Name = "MPO_SIMBIO-SYS_HRIC_FPA",
+      Method = "RECTANGLE",
+      Aberration = "NONE"
+    },
+    AlwaysDrawFov = true,
+    PotentialTargets = { "MERCURY", "EARTH", "VENUS" },
+    FrameConversions = {}
+  },
+  GUI = {
+    Name = "MPO Simbio-Sys HRIC FPA",
+    Path = "/Solar System/Missions/BepiColombo/Instruments",
+  }
+}
+
+local SimbioSys_HRIC_F550 = {
+  Identifier = "BepiColomboMPO_SIMBIOSYS_HRIC_F550",
+  Parent = transforms.BepiColombo.Identifier,
+  Renderable = {
+    Type = "RenderableFov",
+    Body = kernels.ID.MPO,
+    Frame = kernels.Frame.SymbioSysHricF550,
+    RGB = { 0.8, 0.7, 0.7 },
+    Instrument = {
+      Name = "MPO_SIMBIO-SYS_HRIC_F550",
+      Method = "RECTANGLE",
+      Aberration = "NONE"
+    },
+    AlwaysDrawFov = true,
+    PotentialTargets = { "MERCURY", "EARTH", "VENUS" },
+    FrameConversions = {}
+  },
+  GUI = {
+    Name = "MPO Simbio-Sys HRIC F550",
+    Path = "/Solar System/Missions/BepiColombo/Instruments",
+  }
+}
+
+local SimbioSys_HRIC_FPAN = {
+  Identifier = "BepiColomboMPO_SIMBIOSYS_HRIC_FPAN",
+  Parent = transforms.BepiColombo.Identifier,
+  Renderable = {
+    Type = "RenderableFov",
+    Body = kernels.ID.MPO,
+    Frame = kernels.Frame.SymbioSysHricFpan,
+    RGB = { 0.8, 0.7, 0.7 },
+    Instrument = {
+      Name = "MPO_SIMBIO-SYS_HRIC_FPAN",
+      Method = "RECTANGLE",
+      Aberration = "NONE"
+    },
+    AlwaysDrawFov = true,
+    PotentialTargets = { "MERCURY", "EARTH", "VENUS" },
+    FrameConversions = {}
+  },
+  GUI = {
+    Name = "MPO Simbio-Sys HRIC FPAN",
+    Path = "/Solar System/Missions/BepiColombo/Instruments",
+  }
+}
+
+local SimbioSys_HRIC_F750 = {
+  Identifier = "BepiColomboMPO_SIMBIOSYS_HRIC_F750",
+  Parent = transforms.BepiColombo.Identifier,
+  Renderable = {
+    Type = "RenderableFov",
+    Body = kernels.ID.MPO,
+    Frame = kernels.Frame.SymbioSysHricF750,
+    RGB = { 0.8, 0.7, 0.7 },
+    Instrument = {
+      Name = "MPO_SIMBIO-SYS_HRIC_F750",
+      Method = "RECTANGLE",
+      Aberration = "NONE"
+    },
+    AlwaysDrawFov = true,
+    PotentialTargets = { "MERCURY", "EARTH", "VENUS" },
+    FrameConversions = {}
+  },
+  GUI = {
+    Name = "MPO Simbio-Sys HRIC F750",
+    Path = "/Solar System/Missions/BepiColombo/Instruments",
+  }
+}
+
+local SimbioSys_HRIC_F880 = {
+  Identifier = "BepiColomboMPO_SIMBIOSYS_HRIC_F880",
+  Parent = transforms.BepiColombo.Identifier,
+  Renderable = {
+    Type = "RenderableFov",
+    Body = kernels.ID.MPO,
+    Frame = kernels.Frame.SymbioSysHricF880,
+    RGB = { 0.8, 0.7, 0.7 },
+    Instrument = {
+      Name = "MPO_SIMBIO-SYS_HRIC_F880",
+      Method = "RECTANGLE",
+      Aberration = "NONE"
+    },
+    AlwaysDrawFov = true,
+    PotentialTargets = { "MERCURY", "EARTH", "VENUS" },
+    FrameConversions = {}
+  },
+  GUI = {
+    Name = "MPO Simbio-Sys HRIC F880",
+    Path = "/Solar System/Missions/BepiColombo/Instruments",
+  }
+}
+
+local SimbioSys_STC_L = {
+  Identifier = "BepiColomboMPO_SIMBIOSYS_STC_L",
+  Parent = transforms.BepiColombo.Identifier,
+  Renderable = {
+    Type = "RenderableFov",
+    Body = kernels.ID.MPO,
+    Frame = kernels.Frame.SymbioSysSTCL,
+    RGB = { 0.8, 0.7, 0.7 },
+    Instrument = {
+      Name = "MPO_SIMBIO-SYS_STC-L",
+      Method = "RECTANGLE",
+      Aberration = "NONE"
+    },
+    AlwaysDrawFov = true,
+    PotentialTargets = { "MERCURY", "EARTH", "VENUS" },
+    FrameConversions = {}
+  },
+  GUI = {
+    Name = "MPO Simbio-Sys STC L",
+    Path = "/Solar System/Missions/BepiColombo/Instruments",
+  }
+}
+
+local SimbioSys_STC_H = {
+  Identifier = "BepiColomboMPO_SIMBIOSYS_STC_H",
+  Parent = transforms.BepiColombo.Identifier,
+  Renderable = {
+    Type = "RenderableFov",
+    Body = kernels.ID.MPO,
+    Frame = kernels.Frame.SymbioSysSTCH,
+    RGB = { 0.8, 0.7, 0.7 },
+    Instrument = {
+      Name = "MPO_SIMBIO-SYS_STC-H",
+      Method = "RECTANGLE",
+      Aberration = "NONE"
+    },
+    AlwaysDrawFov = true,
+    PotentialTargets = { "MERCURY", "EARTH", "VENUS" },
+    FrameConversions = {}
+  },
+  GUI = {
+    Name = "MPO Simbio-Sys STC H",
+    Path = "/Solar System/Missions/BepiColombo/Instruments",
+  }
+}
+
+local SimbioSys_STC_L_F920 = {
+  Identifier = "BepiColomboMPO_SIMBIOSYS_STC_L_F920",
+  Parent = transforms.BepiColombo.Identifier,
+  Renderable = {
+    Type = "RenderableFov",
+    Body = kernels.ID.MPO,
+    Frame = kernels.Frame.SymbioSysSTCLF920,
+    RGB = { 0.8, 0.7, 0.7 },
+    Instrument = {
+      Name = "MPO_SIMBIO-SYS_STC-L_F920",
+      Method = "RECTANGLE",
+      Aberration = "NONE"
+    },
+    AlwaysDrawFov = true,
+    PotentialTargets = { "MERCURY", "EARTH", "VENUS" },
+    FrameConversions = {}
+  },
+  GUI = {
+    Name = "MPO Simbio-Sys STC L F920",
+    Path = "/Solar System/Missions/BepiColombo/Instruments",
+  }
+}
+
+local SimbioSys_STC_L_F550 = {
+  Identifier = "BepiColomboMPO_SIMBIOSYS_STC_L_F550",
+  Parent = transforms.BepiColombo.Identifier,
+  Renderable = {
+    Type = "RenderableFov",
+    Body = kernels.ID.MPO,
+    Frame = kernels.Frame.SymbioSysSTCLF550,
+    RGB = { 0.8, 0.7, 0.7 },
+    Instrument = {
+      Name = "MPO_SIMBIO-SYS_STC-L_F550",
+      Method = "RECTANGLE",
+      Aberration = "NONE"
+    },
+    AlwaysDrawFov = true,
+    PotentialTargets = { "MERCURY", "EARTH", "VENUS" },
+    FrameConversions = {}
+  },
+  GUI = {
+    Name = "MPO Simbio-Sys STC L F550",
+    Path = "/Solar System/Missions/BepiColombo/Instruments",
+  }
+}
+
+local SimbioSys_STC_L_P700 = {
+  Identifier = "BepiColomboMPO_SIMBIOSYS_STC_L_P700",
+  Parent = transforms.BepiColombo.Identifier,
+  Renderable = {
+    Type = "RenderableFov",
+    Body = kernels.ID.MPO,
+    Frame = kernels.Frame.SymbioSysSTCLP700,
+    RGB = { 0.8, 0.7, 0.7 },
+    Instrument = {
+      Name = "MPO_SIMBIO-SYS_STC-L_P700",
+      Method = "RECTANGLE",
+      Aberration = "NONE"
+    },
+    AlwaysDrawFov = true,
+    PotentialTargets = { "MERCURY", "EARTH", "VENUS" },
+    FrameConversions = {}
+  },
+  GUI = {
+    Name = "MPO Simbio-Sys STC L P700",
+    Path = "/Solar System/Missions/BepiColombo/Instruments",
+  }
+}
+
+local SimbioSys_STC_H_P700 = {
+  Identifier = "BepiColomboMPO_SIMBIOSYS_STC_H_P700",
+  Parent = transforms.BepiColombo.Identifier,
+  Renderable = {
+    Type = "RenderableFov",
+    Body = kernels.ID.MPO,
+    Frame = kernels.Frame.SymbioSysSTCHP700,
+    RGB = { 0.8, 0.7, 0.7 },
+    Instrument = {
+      Name = "MPO_SIMBIO-SYS_STC-H_P700",
+      Method = "RECTANGLE",
+      Aberration = "NONE"
+    },
+    AlwaysDrawFov = true,
+    PotentialTargets = { "MERCURY", "EARTH", "VENUS" },
+    FrameConversions = {}
+  },
+  GUI = {
+    Name = "MPO Simbio-Sys STC H P700",
+    Path = "/Solar System/Missions/BepiColombo/Instruments",
+  }
+}
+
+local SimbioSys_STC_H_F420 = {
+  Identifier = "BepiColomboMPO_SIMBIOSYS_STC_H_F420",
+  Parent = transforms.BepiColombo.Identifier,
+  Renderable = {
+    Type = "RenderableFov",
+    Body = kernels.ID.MPO,
+    Frame = kernels.Frame.SymbioSysSTCHF420,
+    RGB = { 0.8, 0.7, 0.7 },
+    Instrument = {
+      Name = "MPO_SIMBIO-SYS_STC-H_F420",
+      Method = "RECTANGLE",
+      Aberration = "NONE"
+    },
+    AlwaysDrawFov = true,
+    PotentialTargets = { "MERCURY", "EARTH", "VENUS" },
+    FrameConversions = {}
+  },
+  GUI = {
+    Name = "MPO Simbio-Sys STC H F420",
+    Path = "/Solar System/Missions/BepiColombo/Instruments",
+  }
+}
+
+local SimbioSys_STC_H_F750 = {
+  Identifier = "BepiColomboMPO_SIMBIOSYS_STC_H_F750",
+  Parent = transforms.BepiColombo.Identifier,
+  Renderable = {
+    Type = "RenderableFov",
+    Body = kernels.ID.MPO,
+    Frame = kernels.Frame.SymbioSysSTCHF750,
+    RGB = { 0.8, 0.7, 0.7 },
+    Instrument = {
+      Name = "MPO_SIMBIO-SYS_STC-H_F750",
+      Method = "RECTANGLE",
+      Aberration = "NONE"
+    },
+    AlwaysDrawFov = true,
+    PotentialTargets = { "MERCURY", "EARTH", "VENUS" },
+    FrameConversions = {}
+  },
+  GUI = {
+    Name = "MPO Simbio-Sys STC H F750",
+    Path = "/Solar System/Missions/BepiColombo/Instruments",
+  }
+}
+
+local SimbioSys_VIHI = {
+  Identifier = "BepiColomboMPO_SIMBIOSYS_VIHI",
+  Parent = transforms.BepiColombo.Identifier,
+  Renderable = {
+    Type = "RenderableFov",
+    Body = kernels.ID.MPO,
+    Frame = kernels.Frame.SymbioSysVIHI,
+    RGB = { 0.8, 0.7, 0.7 },
+    Instrument = {
+      Name = "MPO_SIMBIO-SYS_VIHI",
+      Method = "RECTANGLE",
+      Aberration = "NONE"
+    },
+    AlwaysDrawFov = true,
+    PotentialTargets = { "MERCURY", "EARTH", "VENUS" },
+    FrameConversions = {}
+  },
+  GUI = {
+    Name = "MPO Simbio-Sys VIHI",
+    Path = "/Solar System/Missions/BepiColombo/Instruments",
+  }
+}
+
+
+asset.onInitialize(function()
+  openspace.addSceneGraphNode(SimbioSys_HRIC_FPA)
+  openspace.addSceneGraphNode(SimbioSys_HRIC_F550)
+  openspace.addSceneGraphNode(SimbioSys_HRIC_FPAN)
+  openspace.addSceneGraphNode(SimbioSys_HRIC_F750)
+  openspace.addSceneGraphNode(SimbioSys_HRIC_F880)
+  openspace.addSceneGraphNode(SimbioSys_STC_L)
+  openspace.addSceneGraphNode(SimbioSys_STC_H)
+  openspace.addSceneGraphNode(SimbioSys_STC_L_F920)
+  openspace.addSceneGraphNode(SimbioSys_STC_L_F550)
+  openspace.addSceneGraphNode(SimbioSys_STC_L_P700)
+  openspace.addSceneGraphNode(SimbioSys_STC_H_P700)
+  openspace.addSceneGraphNode(SimbioSys_STC_H_F420)
+  openspace.addSceneGraphNode(SimbioSys_STC_H_F750)
+  openspace.addSceneGraphNode(SimbioSys_VIHI)
+end)
+
+asset.onDeinitialize(function()
+  openspace.removeSceneGraphNode(SimbioSys_VIHI)
+  openspace.removeSceneGraphNode(SimbioSys_STC_H_F750)
+  openspace.removeSceneGraphNode(SimbioSys_STC_H_F420)
+  openspace.removeSceneGraphNode(SimbioSys_STC_H_P700)
+  openspace.removeSceneGraphNode(SimbioSys_STC_L_P700)
+  openspace.removeSceneGraphNode(SimbioSys_STC_L_F550)
+  openspace.removeSceneGraphNode(SimbioSys_STC_L_F920)
+  openspace.removeSceneGraphNode(SimbioSys_STC_H)
+  openspace.removeSceneGraphNode(SimbioSys_STC_L)
+  openspace.removeSceneGraphNode(SimbioSys_HRIC_F880)
+  openspace.removeSceneGraphNode(SimbioSys_HRIC_F750)
+  openspace.removeSceneGraphNode(SimbioSys_HRIC_FPAN)
+  openspace.removeSceneGraphNode(SimbioSys_HRIC_F550)
+  openspace.removeSceneGraphNode(SimbioSys_HRIC_FPA)
+end)
+
+
+
+asset.meta = {
+  Name = "SYMBIO-SYS",
+  Version = "1.0",
+  Description = [[
+    SIMBIO-SYS has been conceived to be integrated on the BepiColombo MPO pointing in the
+    nadir direction in order to perform the remote sensing of the Mercury surface during
+    the satellite orbits. The SIMBIO-SYS instrument architecture is based on 3 different
+    channels composing the instrument front-end with a common main electronics and power
+    supply.
+  ]],
+  Author = "OpenSpace Team",
+  URL = "http://openspaceproject.com",
+  License = "MIT license"
+}
diff --git a/data/assets/scene/solarsystem/missions/bepicolombo/fov/sixs.asset b/data/assets/scene/solarsystem/missions/bepicolombo/fov/sixs.asset
new file mode 100644
index 0000000000..a523a5c653
--- /dev/null
+++ b/data/assets/scene/solarsystem/missions/bepicolombo/fov/sixs.asset
@@ -0,0 +1,104 @@
+local transforms = asset.require("../model")
+local kernels = asset.require("../kernels")
+
+
+
+local SixsX1 = {
+  Identifier = "BepiColomboMPO_SixsX1",
+  Parent = transforms.BepiColombo.Identifier,
+  Renderable = {
+    Type = "RenderableFov",
+    Body = kernels.ID.MPO,
+    Frame = kernels.Frame.Sixs_X1,
+    RGB = { 0.8, 0.7, 0.7 },
+    Instrument = {
+      Name = "MPO_SIXS-X-1",
+      Method = "ELLIPSE",
+      Aberration = "NONE"
+    },
+    AlwaysDrawFov = true,
+    PotentialTargets = { "MERCURY", "EARTH", "VENUS" },
+    FrameConversions = {}
+  },
+  GUI = {
+    Name = "MPO Sixs X1",
+    Path = "/Solar System/Missions/BepiColombo/Instruments",
+  }
+}
+
+local SixsX2 = {
+  Identifier = "BepiColomboMPO_SixsX2",
+  Parent = transforms.BepiColombo.Identifier,
+  Renderable = {
+    Type = "RenderableFov",
+    Body = kernels.ID.MPO,
+    Frame = kernels.Frame.Sixs_X2,
+    RGB = { 0.8, 0.7, 0.7 },
+    Instrument = {
+      Name = "MPO_SIXS-X-2",
+      Method = "ELLIPSE",
+      Aberration = "NONE"
+    },
+    AlwaysDrawFov = true,
+    PotentialTargets = { "MERCURY", "EARTH", "VENUS" },
+    FrameConversions = {}
+  },
+  GUI = {
+    Name = "MPO Sixs X2",
+    Path = "/Solar System/Missions/BepiColombo/Instruments",
+  }
+}
+
+local SixsX3 = {
+  Identifier = "BepiColomboMPO_SixsX3",
+  Parent = transforms.BepiColombo.Identifier,
+  Renderable = {
+    Type = "RenderableFov",
+    Body = kernels.ID.MPO,
+    Frame = kernels.Frame.Sixs_X3,
+    RGB = { 0.8, 0.7, 0.7 },
+    Instrument = {
+      Name = "MPO_SIXS-X-3",
+      Method = "ELLIPSE",
+      Aberration = "NONE"
+    },
+    AlwaysDrawFov = true,
+    PotentialTargets = { "MERCURY", "EARTH", "VENUS" },
+    FrameConversions = {}
+  },
+  GUI = {
+    Name = "MPO Sixs X3",
+    Path = "/Solar System/Missions/BepiColombo/Instruments",
+  }
+}
+
+
+asset.onInitialize(function()
+  -- Circle shapes are currently not supported
+  -- openspace.addSceneGraphNode(SixsX1)
+  -- openspace.addSceneGraphNode(SixsX2)
+  -- openspace.addSceneGraphNode(SixsX3)
+end)
+
+asset.onDeinitialize(function()
+  -- openspace.removeSceneGraphNode(SixsX3)
+  -- openspace.removeSceneGraphNode(SixsX2)
+  -- openspace.removeSceneGraphNode(SixsX1)
+end)
+
+
+
+asset.meta = {
+  Name = "Sixs",
+  Version = "1.0",
+  Description = [[
+    The scientific investigation performed by the Solar Intensity X-ray and particle
+    Spectrometer (SIXS) is the determination of solar impact on the Hermean surface in the
+    form of direct X-rays and energetic particles, which induce observable X-ray emission
+    via interaction with the surface of the planet. Particles of concern here are highly
+    energetic solar protons and electrons.
+  ]],
+  Author = "OpenSpace Team",
+  URL = "http://openspaceproject.com",
+  License = "MIT license"
+}
diff --git a/data/assets/scene/solarsystem/missions/bepicolombo/fov/startracker.asset b/data/assets/scene/solarsystem/missions/bepicolombo/fov/startracker.asset
new file mode 100644
index 0000000000..924aa134a2
--- /dev/null
+++ b/data/assets/scene/solarsystem/missions/bepicolombo/fov/startracker.asset
@@ -0,0 +1,107 @@
+local transforms = asset.require("../model")
+local kernels = asset.require("../kernels")
+
+
+
+local StarTracker1 = {
+  Identifier = "BepiColomboMPO_StarTracker1",
+  Parent = transforms.BepiColombo.Identifier,
+  Renderable = {
+    Type = "RenderableFov",
+    Body = kernels.ID.MPO,
+    Frame = kernels.Frame.StarTracker1,
+    RGB = { 0.8, 0.7, 0.7 },
+    Instrument = {
+      Name = "MPO_STR-1",
+      Method = "CIRCLE",
+      Aberration = "NONE"
+    },
+    AlwaysDrawFov = true,
+    PotentialTargets = { "MERCURY", "EARTH", "VENUS" },
+    FrameConversions = {}
+  },
+  GUI = {
+    Name = "MPO Star Tracker 1",
+    Path = "/Solar System/Missions/BepiColombo/Instruments",
+  }
+}
+
+local StarTracker2 = {
+  Identifier = "BepiColomboMPO_StarTracker2",
+  Parent = transforms.BepiColombo.Identifier,
+  Renderable = {
+    Type = "RenderableFov",
+    Body = kernels.ID.MPO,
+    Frame = kernels.Frame.StarTracker2,
+    RGB = { 0.8, 0.7, 0.7 },
+    Instrument = {
+      Name = "MPO_STR-2",
+      Method = "CIRCLE",
+      Aberration = "NONE"
+    },
+    AlwaysDrawFov = true,
+    PotentialTargets = { "MERCURY", "EARTH", "VENUS" },
+    FrameConversions = {}
+  },
+  GUI = {
+    Name = "MPO Star Tracker 2",
+    Path = "/Solar System/Missions/BepiColombo/Instruments",
+  }
+}
+
+local StarTracker3 = {
+  Identifier = "BepiColomboMPO_StarTracker3",
+  Parent = transforms.BepiColombo.Identifier,
+  Renderable = {
+    Type = "RenderableFov",
+    Body = kernels.ID.MPO,
+    Frame = kernels.Frame.StarTracker3,
+    RGB = { 0.8, 0.7, 0.7 },
+    Instrument = {
+      Name = "MPO_STR-3",
+      Method = "CIRCLE",
+      Aberration = "NONE"
+    },
+    AlwaysDrawFov = true,
+    PotentialTargets = { "MERCURY", "EARTH", "VENUS" },
+    FrameConversions = {}
+  },
+  GUI = {
+    Name = "MPO Star Tracker 3",
+    Path = "/Solar System/Missions/BepiColombo/Instruments",
+  }
+}
+
+
+asset.onInitialize(function()
+  -- Circle shapes are currently not supported
+  -- openspace.addSceneGraphNode(StarTracker1)
+  -- openspace.addSceneGraphNode(StarTracker2)
+  -- openspace.addSceneGraphNode(StarTracker3)
+end)
+
+asset.onDeinitialize(function()
+  -- openspace.removeSceneGraphNode(StarTracker1)
+  -- openspace.removeSceneGraphNode(StarTracker2)
+  -- openspace.removeSceneGraphNode(StarTracker3)
+end)
+
+
+
+asset.meta = {
+  Name = "Star Tracker",
+  Version = "1.0",
+  Description = [[
+    From a functional point of view, the Autonomous Star Trackers can be seen as a video
+    camera plus an image processing unit that, starting from an image of the sky, extracts
+    the attitude information for the AOCS, measured with respect to the J2000 inertial
+    reference system.
+
+    The STR can track up to 15 stars simultaneously and consists of a Single box that
+    contains the optical head, the main electronics and a baffle which is thermally
+    decoupled from the box.
+  ]],
+  Author = "OpenSpace Team",
+  URL = "http://openspaceproject.com",
+  License = "MIT license"
+}
diff --git a/data/assets/scene/solarsystem/missions/bepicolombo/kernels.asset b/data/assets/scene/solarsystem/missions/bepicolombo/kernels.asset
new file mode 100644
index 0000000000..7503619b7a
--- /dev/null
+++ b/data/assets/scene/solarsystem/missions/bepicolombo/kernels.asset
@@ -0,0 +1,303 @@
+local kernels = asset.resource({
+  Name = "BepiColombo Kernels",
+  Type = "HttpSynchronization",
+  Identifier = "bepicolombo_kernels",
+  Version = 1
+})
+
+
+local BepiColomboKernels = {
+  -- Kernel list based on bc_ops_v413_20240112_001.tm
+  kernels .. "bc_mpo_magboom_default_s20191107_v01.bc",
+  kernels .. "bc_mpo_hga_scm_20181020_20190101_s20201020_v02.bc",
+  kernels .. "bc_mpo_hga_scm_20190101_20200101_s20230309_v01.bc",
+  kernels .. "bc_mpo_hga_scm_20200101_20210101_s20230309_v01.bc",
+  kernels .. "bc_mpo_hga_scm_20210101_20220101_s20230309_v01.bc",
+  kernels .. "bc_mpo_hga_scm_20220101_20230101_s20221229_v01.bc",
+  kernels .. "bc_mpo_hga_scm_20230101_20240101_s20240104_v01.bc",
+  kernels .. "bc_mpo_hga_scm_20240101_20240111_s20240110_v01.bc",
+  kernels .. "bc_mpo_mga_scm_20181020_20190101_s20200109_v02.bc",
+  kernels .. "bc_mpo_mga_scm_20190101_20200101_s20230309_v01.bc",
+  kernels .. "bc_mpo_mga_scm_20200101_20210101_s20230309_v01.bc",
+  kernels .. "bc_mpo_mga_scm_20210101_20220101_s20230309_v01.bc",
+  kernels .. "bc_mpo_mga_scm_20220101_20230101_s20221229_v01.bc",
+  kernels .. "bc_mpo_mga_scm_20230101_20240101_s20240104_v01.bc",
+  kernels .. "bc_mpo_mga_scm_20240101_20240111_s20240110_v01.bc",
+  kernels .. "bc_mpo_sa_scm_20181020_20190101_s20211202_v01.bc",
+  kernels .. "bc_mpo_sa_scm_20190101_20200101_s20230309_v01.bc",
+  kernels .. "bc_mpo_sa_scm_20200101_20210101_s20230309_v01.bc",
+  kernels .. "bc_mpo_sa_scm_20210101_20220101_s20230309_v01.bc",
+  kernels .. "bc_mpo_sa_scm_20220101_20230101_s20221229_v01.bc",
+  kernels .. "bc_mpo_sa_scm_20230101_20240101_s20240104_v01.bc",
+  kernels .. "bc_mpo_sa_scm_20240101_20240111_s20240110_v01.bc",
+  kernels .. "bc_mtm_sa_scm_20181020_20190101_s20200109_v02.bc",
+  kernels .. "bc_mtm_sa_scm_20190101_20200101_s20230309_v01.bc",
+  kernels .. "bc_mtm_sa_scm_20200101_20210101_s20230309_v01.bc",
+  kernels .. "bc_mtm_sa_scm_20210101_20220101_s20230309_v01.bc",
+  kernels .. "bc_mtm_sa_scm_20220101_20230101_s20221229_v01.bc",
+  kernels .. "bc_mtm_sa_scm_20230101_20240101_s20240104_v01.bc",
+  kernels .. "bc_mtm_sa_scm_20240101_20240111_s20240110_v01.bc",
+  kernels .. "bc_mmo_sc_scp_20180317_20251220_f20170228_v02.bc",
+  kernels .. "bc_mmo_sc_slt_50038_20251220_20280305_f20170228_v02.bc",
+  kernels .. "bc_mtm_sc_scp_20180317_20251219_f20181121_v02.bc",
+  kernels .. "bc_mtm_sep_scp_20181019_20251205_f20181127_v02.bc",
+  kernels .. "bc_mpo_sc_prelaunch_f20181121_v01.bc",
+  kernels .. "bc_mpo_sc_fcp_00160_20181020_20240216_f20181127_v01.bc",
+  kernels .. "bc_mpo_sc_scc_20181019_20190101_s20230309_v01.bc",
+  kernels .. "bc_mpo_sc_scc_20190101_20200101_s20230309_v01.bc",
+  kernels .. "bc_mpo_sc_scc_20200101_20210101_s20230309_v01.bc",
+  kernels .. "bc_mpo_sc_scc_20210101_20220101_s20230309_v01.bc",
+  kernels .. "bc_mpo_sc_scc_20220101_20230101_s20221229_v01.bc",
+  kernels .. "bc_mpo_sc_scc_20230101_20240101_s20240104_v01.bc",
+  kernels .. "bc_mpo_sc_scc_20240101_20240111_s20240110_v01.bc",
+  kernels .. "bc_mpo_sc_scm_20181020_20190101_s20230309_v01.bc",
+  kernels .. "bc_mpo_sc_scm_20190101_20200101_s20230309_v01.bc",
+  kernels .. "bc_mpo_sc_scm_20200101_20210101_s20210618_v01.bc",
+  kernels .. "bc_mpo_sc_scm_20210101_20220101_s20230309_v01.bc",
+  kernels .. "bc_mpo_sc_scm_20220101_20230101_s20230309_v01.bc",
+  kernels .. "bc_mpo_sc_scm_20230101_20240101_s20240104_v01.bc",
+  kernels .. "bc_mpo_sc_scm_20240101_20240111_s20240110_v01.bc",
+  kernels .. "bc_mpo_v34.tf",
+  kernels .. "bc_mtm_v12.tf",
+  kernels .. "bc_mmo_v13.tf",
+  kernels .. "bc_ops_v01.tf",
+  kernels .. "bc_sci_v12.tf",
+  kernels .. "bc_dsk_surfaces_v03.tf",
+  kernels .. "rssd0004.tf",
+  kernels .. "earth_topo_201023.tf",
+  kernels .. "earthstns_jaxa_20230905.tf",
+  kernels .. "earthfixeditrf93.tf",
+  kernels .. "estrack_v04.tf",
+  kernels .. "bc_mmo_sc_bus_v02.bds",
+  kernels .. "bc_mpo_sc_bus_v02.bds",
+  kernels .. "bc_mpo_sc_hga_v02.bds",
+  kernels .. "bc_mpo_sc_mga_v02.bds",
+  kernels .. "bc_mpo_sc_mosif_v02.bds",
+  kernels .. "bc_mpo_sc_sa_v02.bds",
+  kernels .. "bc_mtm_sc_bus_v02.bds",
+  kernels .. "bc_mtm_sc_samx_v02.bds",
+  kernels .. "bc_mtm_sc_sapx_v02.bds",
+  kernels .. "mercury_m002_mes_v02.bds",
+
+  kernels .. "bc_mpo_bela_v09.ti",
+  kernels .. "bc_mpo_mertis_v08.ti",
+  kernels .. "bc_mpo_mgns_v02.ti",
+  kernels .. "bc_mpo_mixs_v06.ti",
+  kernels .. "bc_mpo_phebus_v06.ti",
+  kernels .. "bc_mpo_serena_v08.ti",
+  kernels .. "bc_mpo_simbio-sys_v10.ti",
+  kernels .. "bc_mpo_sixs_v08.ti",
+  kernels .. "bc_mpo_str_v02.ti",
+  kernels .. "bc_mpo_aux_v01.ti",
+  kernels .. "bc_mtm_mcam_v05.ti",
+  kernels .. "bc_mmo_mppe_v04.ti",
+  kernels .. "bc_mmo_msasi_v03.ti",
+  kernels .. "bc_mmo_ssas_v01.ti",
+
+  kernels .. "de403_masses.tpc",
+  kernels .. "gm_de431.tpc",
+  kernels .. "pck00011_bc_v00.tpc",
+
+  kernels .. "earth_070425_370426_predict.bpc",
+  kernels .. "earth_000101_240403_240109.bpc",
+
+  kernels .. "bc_mpo_step_20240110.tsc",
+  kernels .. "bc_mpo_fict_20181127.tsc",
+  kernels .. "bc_mmo_fict_20170228.tsc",
+
+  kernels .. "de432s.bsp",
+  kernels .. "earthstns_itrf93_201023.bsp",
+  kernels .. "earthstns_jaxa_20230905.bsp",
+  kernels .. "estrack_v04.bsp",
+  kernels .. "bc_sci_v02.bsp",
+  kernels .. "bc_mmo_struct_v01.bsp",
+  kernels .. "bc_mmo_scp_20181019_20251220_v02.bsp",
+  kernels .. "bc_mtm_struct_v06.bsp",
+  kernels .. "bc_mtm_scp_20181019_20251219_v03.bsp",
+  kernels .. "bc_mpo_cog_v03.bsp",
+  kernels .. "bc_mpo_cog_00160_20181118_20240201_v01.bsp",
+  kernels .. "bc_mpo_struct_v09.bsp",
+  kernels .. "bc_mpo_schulte_vector_v01.bsp",
+  kernels .. "bc_mpo_prelaunch_v01.bsp",
+  kernels .. "bc_mpo_fcp_00160_20181020_20260328_v01.bsp"
+
+
+--   kernels .. "bc_mpo_step_20240110.tsc",
+-- 
+--   kernels .. "de432s.bsp",
+--   kernels .. "bc_mpo_fcp_00160_20181020_20260328_v01.bsp",
+--   kernels .. "bc_mmo_struct_v01.bsp",
+--   kernels .. "bc_mtm_struct_v06.bsp",
+--   kernels .. "bc_mpo_struct_v09.bsp",
+-- 
+--   kernels .. "bc_mmo_mppe_v04.ti",
+--   kernels .. "bc_mmo_msasi_v03.ti",
+--   kernels .. "bc_mmo_ssas_v01.ti",
+--   kernels .. "bc_mpo_aux_v01.ti",
+--   kernels .. "bc_mpo_bela_v09.ti",
+--   kernels .. "bc_mpo_mertis_v08.ti",
+--   kernels .. "bc_mpo_mgns_v02.ti",
+--   kernels .. "bc_mpo_mixs_v06.ti",
+--   kernels .. "bc_mpo_phebus_v06.ti",
+--   kernels .. "bc_mpo_serena_v08.ti",
+--   kernels .. "bc_mpo_simbio-sys_v10.ti",
+--   kernels .. "bc_mpo_sixs_v08.ti",
+--   kernels .. "bc_mpo_str_v02.ti",
+--   kernels .. "bc_mtm_mcam_v05.ti",
+-- 
+--   kernels .. "bc_sci_v12.tf",
+--   kernels .. "bc_mmo_v13.tf",
+--   kernels .. "bc_mpo_v34.tf",
+--   kernels .. "bc_mtm_v12.tf",
+--   kernels .. "bc_ops_v01.tf",
+-- 
+--   kernels .. "bc_mpo_sc_fcp_00160_20181020_20240216_f20181127_v01.bc",
+--   -- kernels .. "bc_mpo_sc_scm_20240101_20240111_s20240110_v01.bc",
+--   -- kernels .. "bc_mpo_sc_scm_20230101_20240101_s20240104_v01.bc",
+--   -- kernels .. "bc_mpo_sc_scm_20220101_20230101_s20230309_v01.bc",
+--   -- kernels .. "bc_mpo_sc_scm_20210101_20220101_s20230309_v01.bc",
+--   -- kernels .. "bc_mpo_sc_scm_20200101_20210101_s20210618_v01.bc",
+--   -- kernels .. "bc_mpo_sc_scm_20190101_20200101_s20230309_v01.bc",
+--   -- kernels .. "bc_mpo_sc_scm_20181020_20190101_s20230309_v01.bc",
+-- 
+--   kernels .. "bc_mpo_sc_scc_20240101_20240111_s20240110_v01.bc",
+--   kernels .. "bc_mpo_sc_scc_20230101_20240101_s20240104_v01.bc",
+--   kernels .. "bc_mpo_sc_scc_20220101_20230101_s20221229_v01.bc",
+--   kernels .. "bc_mpo_sc_scc_20210101_20220101_s20230309_v01.bc",
+--   kernels .. "bc_mpo_sc_scc_20200101_20210101_s20230309_v01.bc",
+--   kernels .. "bc_mpo_sc_scc_20190101_20200101_s20230309_v01.bc",
+--   kernels .. "bc_mpo_sc_scc_20181019_20190101_s20230309_v01.bc",
+-- 
+--   kernels .. "bc_mpo_hga_scm_20240101_20240111_s20240110_v01.bc",
+--   kernels .. "bc_mpo_hga_scm_20181020_20190101_s20201020_v02.bc",
+--   kernels .. "bc_mpo_hga_scm_20190101_20200101_s20230309_v01.bc",
+--   kernels .. "bc_mpo_hga_scm_20200101_20210101_s20230309_v01.bc",
+--   kernels .. "bc_mpo_hga_scm_20210101_20220101_s20230309_v01.bc",
+--   kernels .. "bc_mpo_hga_scm_20220101_20230101_s20221229_v01.bc",
+--   kernels .. "bc_mpo_hga_scm_20230101_20240101_s20240104_v01.bc",
+--   kernels .. "bc_mpo_magboom_default_s20191107_v01.bc",
+--   kernels .. "bc_mpo_mertis_zero_s20191107_v02.bc",
+--   kernels .. "bc_mpo_mga_scm_20181020_20190101_s20200109_v02.bc",
+--   kernels .. "bc_mpo_mga_scm_20190101_20200101_s20230309_v01.bc",
+--   kernels .. "bc_mpo_mga_scm_20200101_20210101_s20230309_v01.bc",
+--   kernels .. "bc_mpo_mga_scm_20210101_20220101_s20230309_v01.bc",
+--   kernels .. "bc_mpo_mga_scm_20220101_20230101_s20221229_v01.bc",
+--   kernels .. "bc_mpo_mga_scm_20230101_20240101_s20240104_v01.bc",
+--   kernels .. "bc_mpo_mga_scm_20240101_20240111_s20240110_v01.bc",
+--   kernels .. "bc_mpo_mga_zero_s20191107_v02.bc",
+--   kernels .. "bc_mpo_phebus_zero_s20210408_v02.bc",
+--   kernels .. "bc_mpo_sa_scm_20181020_20190101_s20211202_v01.bc",
+--   kernels .. "bc_mpo_sa_scm_20190101_20200101_s20230309_v01.bc",
+--   kernels .. "bc_mpo_sa_scm_20200101_20210101_s20230309_v01.bc",
+--   kernels .. "bc_mpo_sa_scm_20210101_20220101_s20230309_v01.bc",
+--   kernels .. "bc_mpo_sa_scm_20220101_20230101_s20221229_v01.bc",
+--   kernels .. "bc_mpo_sa_scm_20230101_20240101_s20240104_v01.bc",
+--   kernels .. "bc_mpo_sa_scm_20240101_20240111_s20240110_v01.bc",
+--   kernels .. "bc_mpo_sa_zero_s20191107_v02.bc",
+--   kernels .. "bc_mpo_sa_zero_s20191107_v02.bc",
+--   kernels .. "bc_mpo_serena_zero_s20191207_v02.bc"
+}
+
+local ID = {
+  MPO = "-121"
+}
+
+local Frame = {
+  MPO = "MPO_SPACECRAFT",
+
+  HGA = "MPO_HGA",
+  BelaReceiver = "MPO_BELA_RX",
+  BelaTransmitterMain = "MPO_BELA_TX_MAIN",
+  BelaTransmitterRed = "MPO_BELA_TX_RED",
+  MertisTis = "MPO_MERTIS_TIS",
+  MertisTisPlanet = "MPO_MERTIS_TIS_PLANET",
+  MertisTisSpace = "MPO_MERTIS_TIS_SPACE",
+  MGNS = "MPO_MGNS",
+  MIXS_C = "MPO_MIXS-C",
+  MIXS_T = "MPO_MIXS-T",
+  PhebusSlit75 = "MPO_PHEBUS_SLIT_75",
+  PhebusSlit100 = "MPO_PHEBUS_SLIT_100",
+  Phebus75 = "MPO_PHEBUS_75",
+  Phebus100 = "MPO_PHEBUS_100",
+  SerenaElena = "MPO_SERENA_ELENA",
+  SerenaElenaAN01 = "MPO_SERENA_ELENA_AN_01",
+  SerenaElenaAN02 = "MPO_SERENA_ELENA_AN_02",
+  SerenaElenaAN03 = "MPO_SERENA_ELENA_AN_03",
+  SerenaElenaAN04 = "MPO_SERENA_ELENA_AN_04",
+  SerenaElenaAN05 = "MPO_SERENA_ELENA_AN_05",
+  SerenaElenaAN06 = "MPO_SERENA_ELENA_AN_06",
+  SerenaElenaAN07 = "MPO_SERENA_ELENA_AN_07",
+  SerenaElenaAN08 = "MPO_SERENA_ELENA_AN_08",
+  SerenaElenaAN09 = "MPO_SERENA_ELENA_AN_09",
+  SerenaElenaAN10 = "MPO_SERENA_ELENA_AN_10",
+  SerenaElenaAN11 = "MPO_SERENA_ELENA_AN_11",
+  SerenaElenaAN12 = "MPO_SERENA_ELENA_AN_12",
+  SerenaElenaAN13 = "MPO_SERENA_ELENA_AN_13",
+  SerenaElenaAN14 = "MPO_SERENA_ELENA_AN_14",
+  SerenaElenaAN15 = "MPO_SERENA_ELENA_AN_15",
+  SerenaElenaAN16 = "MPO_SERENA_ELENA_AN_16",
+  SerenaElenaAN17 = "MPO_SERENA_ELENA_AN_17",
+  SerenaElenaAN18 = "MPO_SERENA_ELENA_AN_18",
+  SerenaElenaAN19 = "MPO_SERENA_ELENA_AN_19",
+  SerenaElenaAN20 = "MPO_SERENA_ELENA_AN_20",
+  SerenaElenaAN21 = "MPO_SERENA_ELENA_AN_21",
+  SerenaElenaAN22 = "MPO_SERENA_ELENA_AN_22",
+  SerenaElenaAN23 = "MPO_SERENA_ELENA_AN_23",
+  SerenaElenaAN24 = "MPO_SERENA_ELENA_AN_24",
+  SerenaElenaAN25 = "MPO_SERENA_ELENA_AN_25",
+  SerenaElenaAN26 = "MPO_SERENA_ELENA_AN_26",
+  SerenaElenaAN27 = "MPO_SERENA_ELENA_AN_27",
+  SerenaElenaAN28 = "MPO_SERENA_ELENA_AN_28",
+  SerenaElenaAN29 = "MPO_SERENA_ELENA_AN_29",
+  SerenaElenaAN30 = "MPO_SERENA_ELENA_AN_30",
+  SerenaElenaAN31 = "MPO_SERENA_ELENA_AN_31",
+  SerenaElenaAN32 = "MPO_SERENA_ELENA_AN_32",
+  SymbioSysHricFpa = "MPO_SIMBIO-SYS_HRIC_FPA",
+  SymbioSysHricF550 = "MPO_SIMBIO-SYS_HRIC_F550",
+  SymbioSysHricFpan = "MPO_SIMBIO-SYS_HRIC_FPAN",
+  SymbioSysHricF750 = "MPO_SIMBIO-SYS_HRIC_F750",
+  SymbioSysHricF880 = "MPO_SIMBIO-SYS_HRIC_F880",
+  SymbioSysSTCL = "MPO_SIMBIO-SYS_STC-L",
+  SymbioSysSTCH = "MPO_SIMBIO-SYS_STC-H",
+  SymbioSysSTCLF920 = "MPO_SIMBIO-SYS_STC-L_F920",
+  SymbioSysSTCLF550 = "MPO_SIMBIO-SYS_STC-L_F550",
+  SymbioSysSTCLP700 = "MPO_SIMBIO-SYS_STC-L_P700",
+  SymbioSysSTCHP700 = "MPO_SIMBIO-SYS_STC-H_P700",
+  SymbioSysSTCHF420 = "MPO_SIMBIO-SYS_STC-H_F420",
+  SymbioSysSTCHF750 = "MPO_SIMBIO-SYS_STC-H_F750",
+  SymbioSysVIHI = "MPO_SIMBIO-SYS_VIHI",
+  Sixs_X1 = "MPO_SIXS-X-1",
+  Sixs_X2 = "MPO_SIXS-X-2",
+  Sixs_X3 = "MPO_SIXS-X-3",
+  StarTracker1 = "MPO_STR-1",
+  StarTracker2 = "MPO_STR-2",
+  StarTracker3 = "MPO_STR-3",
+
+
+
+
+
+}
+
+
+asset.onInitialize(function()
+  openspace.spice.loadKernel(BepiColomboKernels)
+end)
+
+asset.onDeinitialize(function()
+  openspace.spice.unloadKernel(BepiColomboKernels)
+end)
+
+asset.export("ID", ID)
+asset.export("Frame", Frame)
+
+
+
+asset.meta = {
+  Name = "BepiColombo Kernels",
+  Version = "1.0",
+  Description = "This asset contains the SPICE kernels for the BepiColombo mission.",
+  Author = "OpenSpace Team",
+  URL = "http://openspaceproject.com",
+  License = "MIT license"
+}
diff --git a/data/assets/scene/solarsystem/missions/bepicolombo/mission.asset b/data/assets/scene/solarsystem/missions/bepicolombo/mission.asset
new file mode 100644
index 0000000000..717e23b6c2
--- /dev/null
+++ b/data/assets/scene/solarsystem/missions/bepicolombo/mission.asset
@@ -0,0 +1,88 @@
+local Mission = {
+  Name = "BepiColombo",
+  Image = "https://scifleet.esa.int/downloads/bepi_mcs/bepicolombo.png",
+  Description = [[BepiColombo is Europe's first mission to Mercury. It will launch in October 2018 on a journey to the smallest and least explored terrestrial planet in our Solar System. Arriving at Mercury in December 2025, it will endure temperatures in excess of 350°C and gather data during a 1 year nominal mission. The mission comprises two spacecraft: 1. Mercury Planetary Orbiter (MPO), 2. Mercury Magnetospheric Orbiter (MMO). BepiColombo is a joint mission between ESA and the Japan Aerospace Exploration Agency (JAXA), executed under ESA leadership.]],
+  TimeRange = {
+    Start = "2018 OCT 20 01:45:00",
+    End = "2028 MAY 01 12:00:00" -- Preliminary time
+  },
+  Milestones = {
+    {
+      Name = "Launch",
+      Date = "2018 OCT 20 01:45:00"
+    },
+    {
+      Name = "Earth flyby",
+      Date = "2020 APR 10 04:25"
+    },
+    {
+      Name = "First Venus flyby",
+      Date = "2020 OCT 15 03:58:00"
+    },
+    {
+      Name = "Second Venus flyby",
+      Date = "2021 AUG 10 13:51:00"
+    },
+    {
+      Name = "First Mercury flyby",
+      Date = "2021 OCT 01 23:34:41"
+    },
+    {
+      Name = "Second Mercury flyby",
+      Date = "2022 JUN 23 09:44:00"
+    },
+    {
+      Name = "Third Mercury flyby",
+      Date = "2023 JUN 19 19:34:00"
+    },
+    {
+      Name = "Fourth Mercury flyby",
+      Date = "2024 SEP 05 12:00:00" -- Preliminary time
+    },
+    {
+      Name = "Fifth Mercury flyby",
+      Date = "2024 DEC 02 12:00:00" -- Preliminary time
+    },
+    {
+      Name = "Sixth Mercury flyby",
+      Date = "2025 JAN 09 12:00:00" -- Preliminary time
+    },
+    {
+      Name = "Mercury orbit insertion",
+      Date = "2025 DEC 05 12:00:00" -- Preliminary time
+    },
+    {
+      Name = "MPO in final science orbit",
+      Date = "2026 MAR 14 12:00:00" -- Preliminary time
+    },
+    {
+      Name = "End of nominal mission",
+      Date = "2027 MAY 01 12:00:00" -- Preliminary time
+    },
+    {
+      Name = "End of extended mission",
+      Date = "2028 MAY 01 12:00:00" -- Preliminary time
+    }
+  },
+  Phases = {}
+}
+
+
+asset.onInitialize(function()
+  openspace.loadMission(Mission)
+end)
+
+asset.onDeinitialize(function()
+  openspace.unloadMission(Mission.Name)
+end)
+
+
+
+asset.meta = {
+  Name = "BepiColombo Mission",
+  Version = "1.0",
+  Description = "This asset contains the mission profile information for the BepiColombo mission. The data in this file has been taken from https://www.esa.int/Science_Exploration/Space_Science/BepiColombo/BepiColombo_factsheet",
+  Author = "OpenSpace Team",
+  URL = "http://openspaceproject.com",
+  License = "MIT license"
+}
diff --git a/data/assets/scene/solarsystem/missions/bepicolombo/model.asset b/data/assets/scene/solarsystem/missions/bepicolombo/model.asset
new file mode 100644
index 0000000000..05aec4d10e
--- /dev/null
+++ b/data/assets/scene/solarsystem/missions/bepicolombo/model.asset
@@ -0,0 +1,84 @@
+local transform = asset.require("scene/solarsystem/sun/transforms")
+local sun = asset.require("scene/solarsystem/sun/sun")
+local kernels = asset.require("./kernels")
+local coreKernels = asset.require("spice/core")
+
+
+
+local modelFolder = asset.resource({
+  Name = "BepiColombo Model",
+  Type = "HttpSynchronization",
+  Identifier = "bepicolombo_models",
+  Version = 1
+})
+
+
+local BepiColombo = {
+  Identifier = "BepiColombo",
+  Parent = transform.SolarSystemBarycenter.Identifier,
+  Transform = {
+    Translation = {
+      Type = "SpiceTranslation",
+      Target = kernels.ID.MPO,
+      Observer = coreKernels.ID.SolarSystemBarycenter
+    },
+    Rotation = {
+      Type = "SpiceRotation",
+      SourceFrame = kernels.Frame.MPO,
+      DestinationFrame = coreKernels.Frame.Galactic
+    }
+  },
+  GUI = {
+    Name = "BepiColombo",
+    Path = "/Solar System/Missions/BepiColombo"
+  }
+}
+
+local Model = {
+  Identifier = "BepiColomboModel",
+  Parent = BepiColombo.Identifier,
+  Transform = {
+    Translation = {
+      Type = "StaticTranslation",
+      Position = { 0.0, -0.275, 0.0 }
+    }
+  },
+  Renderable = {
+    Type = "RenderableModel",
+    GeometryFile = modelFolder .. "bepi_mcs.fbx",
+    ModelScale = 0.00075, -- The number has been determined by eyeballing it
+    LightSources = {
+      sun.LightSource
+    },
+    PerformShading = true,
+    AmbientIntensity = 0.075
+  },
+  GUI = {
+    Name = "BepiColombo Model",
+    Path = "/Solar System/Missions/BepiColombo"
+  }
+}
+
+
+asset.onInitialize(function()
+  openspace.addSceneGraphNode(BepiColombo)
+  openspace.addSceneGraphNode(Model)
+end)
+
+asset.onDeinitialize(function()
+  openspace.removeSceneGraphNode(Model)
+  openspace.removeSceneGraphNode(BepiColombo)
+end)
+
+asset.export(BepiColombo)
+
+
+
+asset.meta = {
+  Name = "BepiColombo Model",
+  Version = "1.0",
+  Description = "This asset contains the model of the BepiColombo spacecraft. The model is retrieved from https://s2e2.cosmos.esa.int/bitbucket/projects/SPICE_KERNELS/repos/bepicolombo",
+  Author = "OpenSpace Team",
+  URL = "http://openspaceproject.com",
+  License = "MIT license"
+}
diff --git a/data/assets/scene/solarsystem/missions/bepicolombo/trails.asset b/data/assets/scene/solarsystem/missions/bepicolombo/trails.asset
new file mode 100644
index 0000000000..b2220287c2
--- /dev/null
+++ b/data/assets/scene/solarsystem/missions/bepicolombo/trails.asset
@@ -0,0 +1,73 @@
+local kernels = asset.require("./kernels")
+local mercury = asset.require("scene/solarsystem/planets/mercury/transforms")
+local solarsystem = asset.require("scene/solarsystem/sun/transforms")
+local coreKernels = asset.require("spice/core")
+
+
+
+local BepiColomboTrailSun = {
+  Identifier = "BepiColomboTrailSun",
+  Parent = solarsystem.SolarSystemBarycenter.Identifier,
+  Renderable = {
+    Type = "RenderableTrailTrajectory",
+    Translation = {
+      Type = "SpiceTranslation",
+      Target = kernels.ID.MPO,
+      Observer = coreKernels.ID.SolarSystemBarycenter
+    },
+    Color = { 0.70, 0.50, 0.20 },
+    StartTime = "2018 OCT 20 01:45:00",
+    EndTime = "2028 MAY 01 12:00:00",
+    SampleInterval = 60000
+  },
+  GUI = {
+    Name = "BepiColombo Trail (Sun)",
+    Path = "/Solar System/Missions/BepiColombo"
+  }
+}
+
+local BepiColomboTrailMercury = {
+  Identifier = "BepiColomboTrailMercury",
+  Parent = mercury.MercuryBarycenter.Identifier,
+  Renderable = {
+    Type = "RenderableTrailTrajectory",
+    Translation = {
+      Type = "SpiceTranslation",
+      Target = kernels.ID.MPO,
+      Observer = coreKernels.ID.Mercury
+    },
+    Color = { 0.625, 0.255, 0.45 },
+    StartTime = "2025 DEC 05 12:00:00",
+    EndTime = "2028 MAY 01 12:00:00",
+    SampleInterval = 600
+  },
+  GUI = {
+    Name = "BepiColombo Trail (Mercury)",
+    Path = "/Solar System/Missions/BepiColombo"
+  }
+}
+
+
+asset.onInitialize(function()
+  openspace.addSceneGraphNode(BepiColomboTrailSun)
+  openspace.addSceneGraphNode(BepiColomboTrailMercury)
+end)
+
+asset.onDeinitialize(function()
+  openspace.removeSceneGraphNode(BepiColomboTrailMercury)
+  openspace.removeSceneGraphNode(BepiColomboTrailSun)
+end)
+
+asset.export(BepiColomboTrailSun)
+asset.export(BepiColomboTrailMercury)
+
+
+
+asset.meta = {
+  Name = "BepiColombo Trails",
+  Version = "1.0",
+  Description = "This asset contains the trails for the BepiColombo spacecraft relative to the Sun and Mercury.",
+  Author = "OpenSpace Team",
+  URL = "http://openspaceproject.com",
+  License = "MIT license"
+}
diff --git a/data/profiles/bepicolombo.profile b/data/profiles/bepicolombo.profile
new file mode 100644
index 0000000000..6cef837a3c
--- /dev/null
+++ b/data/profiles/bepicolombo.profile
@@ -0,0 +1,183 @@
+{
+  "assets": [
+    "base",
+    "base_keybindings",
+    "scene/solarsystem/missions/bepicolombo/bepicolombo",
+    "scene/solarsystem/planets/earth/earth"
+  ],
+  "camera": {
+    "altitude": 17000000.0,
+    "anchor": "Earth",
+    "latitude": 58.5877,
+    "longitude": 16.1924,
+    "type": "goToGeo"
+  },
+  "delta_times": [
+    1.0,
+    5.0,
+    30.0,
+    60.0,
+    300.0,
+    1800.0,
+    3600.0,
+    43200.0,
+    86400.0,
+    604800.0,
+    1209600.0,
+    2592000.0,
+    5184000.0,
+    7776000.0,
+    15552000.0,
+    31536000.0,
+    63072000.0,
+    157680000.0,
+    315360000.0,
+    630720000.0
+  ],
+  "mark_nodes": [
+    "BepiColombo",
+    "Mercury",
+    "Earth",
+    "Venus",
+    "Sun"
+  ],
+  "meta": {
+    "author": "OpenSpace Team",
+    "description": "Default OpenSpace Profile. Adds Earth satellites not contained in other profiles",
+    "license": "MIT License",
+    "name": "Default",
+    "url": "https://www.openspaceproject.com",
+    "version": "1.0"
+  },
+  "properties": [
+    {
+      "name": "Scene.BepiColomboMPO_MertisTis.Renderable.Enabled",
+      "type": "setPropertyValueSingle",
+      "value": "false"
+    },
+    {
+      "name": "Scene.BepiColomboMPO_MertisTisPlanet.Renderable.Enabled",
+      "type": "setPropertyValueSingle",
+      "value": "false"
+    },
+    {
+      "name": "Scene.BepiColomboMPO_MertisTisSpace.Renderable.Enabled",
+      "type": "setPropertyValueSingle",
+      "value": "false"
+    },
+    {
+      "name": "Scene.BepiColomboMPO_Phebus100.Renderable.Enabled",
+      "type": "setPropertyValueSingle",
+      "value": "false"
+    },
+    {
+      "name": "Scene.BepiColomboMPO_Phebus75.Renderable.Enabled",
+      "type": "setPropertyValueSingle",
+      "value": "false"
+    },
+    {
+      "name": "Scene.BepiColomboMPO_PhebusSlit100.Renderable.Enabled",
+      "type": "setPropertyValueSingle",
+      "value": "false"
+    },
+    {
+      "name": "Scene.BepiColomboMPO_PhebusSlit75.Renderable.Enabled",
+      "type": "setPropertyValueSingle",
+      "value": "false"
+    },
+    {
+      "name": "Scene.BepiColomboMPO_SerenaElena.Renderable.Enabled",
+      "type": "setPropertyValueSingle",
+      "value": "false"
+    },
+    {
+      "name": "Scene.BepiColomboMPO_SIMBIOSYS_HRIC_F550.Renderable.Enabled",
+      "type": "setPropertyValueSingle",
+      "value": "false"
+    },
+    {
+      "name": "Scene.BepiColomboMPO_SIMBIOSYS_HRIC_F750.Renderable.Enabled",
+      "type": "setPropertyValueSingle",
+      "value": "false"
+    },
+    {
+      "name": "Scene.BepiColomboMPO_SIMBIOSYS_HRIC_F880.Renderable.Enabled",
+      "type": "setPropertyValueSingle",
+      "value": "false"
+    },
+    {
+      "name": "Scene.BepiColomboMPO_SIMBIOSYS_HRIC_FPA.Renderable.Enabled",
+      "type": "setPropertyValueSingle",
+      "value": "false"
+    },
+    {
+      "name": "Scene.BepiColomboMPO_SIMBIOSYS_HRIC_FPAN.Renderable.Enabled",
+      "type": "setPropertyValueSingle",
+      "value": "false"
+    },
+    {
+      "name": "Scene.BepiColomboMPO_SIMBIOSYS_STC_H.Renderable.Enabled",
+      "type": "setPropertyValueSingle",
+      "value": "false"
+    },
+    {
+      "name": "Scene.BepiColomboMPO_SIMBIOSYS_STC_H_F420.Renderable.Enabled",
+      "type": "setPropertyValueSingle",
+      "value": "false"
+    },
+    {
+      "name": "Scene.BepiColomboMPO_SIMBIOSYS_STC_H_F750.Renderable.Enabled",
+      "type": "setPropertyValueSingle",
+      "value": "false"
+    },
+    {
+      "name": "Scene.BepiColomboMPO_SIMBIOSYS_STC_H_P700.Renderable.Enabled",
+      "type": "setPropertyValueSingle",
+      "value": "false"
+    },
+    {
+      "name": "Scene.BepiColomboMPO_SIMBIOSYS_STC_L.Renderable.Enabled",
+      "type": "setPropertyValueSingle",
+      "value": "false"
+    },
+    {
+      "name": "Scene.BepiColomboMPO_SIMBIOSYS_STC_L_F550.Renderable.Enabled",
+      "type": "setPropertyValueSingle",
+      "value": "false"
+    },
+    {
+      "name": "Scene.BepiColomboMPO_SIMBIOSYS_STC_L_F920.Renderable.Enabled",
+      "type": "setPropertyValueSingle",
+      "value": "false"
+    },
+    {
+      "name": "Scene.BepiColomboMPO_SIMBIOSYS_STC_L_P700.Renderable.Enabled",
+      "type": "setPropertyValueSingle",
+      "value": "false"
+    },
+    {
+      "name": "Scene.BepiColomboMPO_SIMBIOSYS_VIHI.Renderable.Enabled",
+      "type": "setPropertyValueSingle",
+      "value": "false"
+    },
+    {
+      "name": "Scene.BepiColomboMPO_MIXS-C.Renderable.Enabled",
+      "type": "setPropertyValueSingle",
+      "value": "false"
+    },
+    {
+      "name": "Scene.BepiColomboMPO_MIXS-T.Renderable.Enabled",
+      "type": "setPropertyValueSingle",
+      "value": "false"
+    }
+  ],
+  "time": {
+    "is_paused": false,
+    "type": "relative",
+    "value": "-1d"
+  },
+  "version": {
+    "major": 1,
+    "minor": 3
+  }
+}

From 0e78e651753233e1d3a1af019ec9ca0a4f21da67 Mon Sep 17 00:00:00 2001
From: Alexander Bock <alexander.bock@liu.se>
Date: Thu, 18 Jan 2024 14:11:04 +0100
Subject: [PATCH 238/701] Fix crash when registering replacement resource
 functions

---
 src/scene/assetmanager.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/scene/assetmanager.cpp b/src/scene/assetmanager.cpp
index aa0ae9d741..ef666ebe85 100644
--- a/src/scene/assetmanager.cpp
+++ b/src/scene/assetmanager.cpp
@@ -577,7 +577,7 @@ void AssetManager::setUpAssetLuaTable(Asset* asset) {
 
             return 1;
         },
-        2
+        1
     );
     lua_setfield(*_luaState, assetTableIndex, "localResource");
 

From ef52155e83e087592f3eb9b23117030bf3b55c97 Mon Sep 17 00:00:00 2001
From: Alexander Bock <alexander.bock@liu.se>
Date: Thu, 18 Jan 2024 16:14:23 +0100
Subject: [PATCH 239/701] Update the VideoPlayer correctly when writing out
 frames in SessionRecording

---
 modules/video/src/videoplayer.cpp | 24 ++++++++++++++++++++++++
 1 file changed, 24 insertions(+)

diff --git a/modules/video/src/videoplayer.cpp b/modules/video/src/videoplayer.cpp
index 32e9a81b06..bb4cded563 100644
--- a/modules/video/src/videoplayer.cpp
+++ b/modules/video/src/videoplayer.cpp
@@ -29,6 +29,7 @@
 #include <openspace/engine/syncengine.h>
 #include <openspace/engine/moduleengine.h>
 #include <openspace/engine/windowdelegate.h>
+#include <openspace/interaction/sessionrecording.h>
 #include <openspace/rendering/renderengine.h>
 #include <openspace/util/time.h>
 #include <openspace/util/timemanager.h>
@@ -36,6 +37,7 @@
 #include <ghoul/opengl/framebufferobject.h>
 #include <ghoul/opengl/openglstatecache.h>
 
+
 namespace {
     constexpr std::string_view _loggerCat = "VideoPlayer";
 
@@ -497,6 +499,28 @@ void VideoPlayer::update() {
     if (_isDestroying) {
         return;
     }
+
+    if (global::sessionRecording->isSavingFramesDuringPlayback()) {
+        double dt = global::sessionRecording->fixedDeltaTimeDuringFrameOutput();
+        if (_playbackMode == PlaybackMode::MapToSimulationTime) {
+            _currentVideoTime = correctVideoPlaybackTime();
+        }
+        else {
+            _currentVideoTime = _currentVideoTime + dt;
+        }
+
+        MpvKey key = MpvKey::Time;
+        mpv_set_property(_mpvHandle, keys[key], formats[key], &_currentVideoTime);
+
+        uint64_t result = mpv_render_context_update(_mpvRenderContext);
+        while ((result & MPV_RENDER_UPDATE_FRAME) == 0) {
+            renderFrame();
+
+            result = mpv_render_context_update(_mpvRenderContext);
+        }
+        return;
+    }
+
     if (_playbackMode == PlaybackMode::MapToSimulationTime) {
         seekToTime(correctVideoPlaybackTime());
     }

From 04ff09814d1dc3b5d55e3006959be0883fe45691 Mon Sep 17 00:00:00 2001
From: Andreas Engberg <48772850+engbergandreas@users.noreply.github.com>
Date: Wed, 24 Jan 2024 13:51:55 +0100
Subject: [PATCH 240/701] Add event topic (#3010)

* Add event topic

Add ability to subscribe to events via js-api

* Apply suggestions from code review

Co-authored-by: Alexander Bock <alexander.bock@liu.se>

* Output an error if no status or event object is passed to payload

* fixed typo

* Report a warning if user tries to unsubscribe to a non registered event/type combination

---------

Co-authored-by: Alexander Bock <alexander.bock@liu.se>
---
 include/openspace/events/event.h           |   3 +-
 include/openspace/events/eventengine.h     |  34 ++++++
 modules/server/CMakeLists.txt              |   2 +
 modules/server/include/topics/eventtopic.h |  53 +++++++++
 modules/server/src/connection.cpp          |   2 +
 modules/server/src/topics/eventtopic.cpp   | 124 +++++++++++++++++++++
 src/engine/openspaceengine.cpp             |   7 +-
 src/events/event.cpp                       |   2 +
 src/events/eventengine.cpp                 |  66 +++++++++++
 9 files changed, 286 insertions(+), 7 deletions(-)
 create mode 100644 modules/server/include/topics/eventtopic.h
 create mode 100644 modules/server/src/topics/eventtopic.cpp

diff --git a/include/openspace/events/event.h b/include/openspace/events/event.h
index 9f2f344bae..5b4c54794e 100644
--- a/include/openspace/events/event.h
+++ b/include/openspace/events/event.h
@@ -80,7 +80,8 @@ struct Event {
         CameraPathStarted,
         CameraPathFinished,
         CameraMovedPosition,
-        Custom
+        Custom,
+        Last // sentinel value
     };
     constexpr explicit Event(Type type_) : type(type_) {}
 
diff --git a/include/openspace/events/eventengine.h b/include/openspace/events/eventengine.h
index b0a84b79c3..72d4a9c7f2 100644
--- a/include/openspace/events/eventengine.h
+++ b/include/openspace/events/eventengine.h
@@ -36,6 +36,8 @@ namespace events { struct Event; }
 
 class EventEngine {
 public:
+    using ScriptCallback = std::function<void(ghoul::Dictionary)>;
+
     struct ActionInfo {
         events::Event::Type type;
         uint32_t id = std::numeric_limits<uint32_t>::max();
@@ -44,6 +46,11 @@ public:
         std::optional<ghoul::Dictionary> filter;
     };
 
+    struct TopicInfo {
+        uint32_t id = std::numeric_limits<uint32_t>::max();
+        ScriptCallback callback;
+    };
+
     /**
      * This function returns the first event stored in the EventEngine, or `nullptr` if
      * no event exists. To navigate the full list of events, you can access the returned
@@ -87,6 +94,16 @@ public:
     void registerEventAction(events::Event::Type type, std::string identifier,
         std::optional<ghoul::Dictionary> filter = std::nullopt);
 
+    /**
+     * Registers a new topic for a specific event type.
+     *
+     * \param topicId The id of the topic that will be triggered
+     * \param type The type for which a new topic is registered
+     * \param callback The callback function that will be called on triggered event
+    */
+    void registerEventTopic(size_t topicId, events::Event::Type type,
+        ScriptCallback callback);
+
     /**
      * Removing registration for a type/action combination.
      *
@@ -105,6 +122,15 @@ public:
      */
     void unregisterEventAction(uint32_t identifier);
 
+    /**
+     * Removing registration for a topic/type combination, does nothing if topicId or type
+     * combination does not exist
+     *
+     * \param topicId The id of the topic that should be unregistered
+     * \param type The type of the topic that should be unregistered
+    */
+    void unregisterEventTopic(size_t topicId, events::Event::Type type);
+
     /**
      * Returns the list of all registered actions, sorted by their identifiers.
      *
@@ -134,6 +160,12 @@ public:
      */
     void triggerActions() const;
 
+    /**
+     * Triggers all topics that are registered for events that are in the current event
+     * queue.
+    */
+    void triggerTopics() const;
+
     static scripting::LuaLibrary luaLibrary();
 
 private:
@@ -149,6 +181,8 @@ private:
     /// the lookup really fast. So having this extra wasted memory is probably worth it
     std::unordered_map<events::Event::Type, std::vector<ActionInfo>> _eventActions;
 
+    std::unordered_map<events::Event::Type, std::vector<TopicInfo>> _eventTopics;
+
     static uint32_t nextRegisteredEventId;
 
 #ifdef _DEBUG
diff --git a/modules/server/CMakeLists.txt b/modules/server/CMakeLists.txt
index 3ce2d56ff8..6b278b6984 100644
--- a/modules/server/CMakeLists.txt
+++ b/modules/server/CMakeLists.txt
@@ -37,6 +37,7 @@ set(HEADER_FILES
   include/topics/cameratopic.h
   include/topics/documentationtopic.h
   include/topics/enginemodetopic.h
+  include/topics/eventtopic.h
   include/topics/flightcontrollertopic.h
   include/topics/getpropertytopic.h
   include/topics/luascripttopic.h
@@ -65,6 +66,7 @@ set(SOURCE_FILES
   src/topics/cameratopic.cpp
   src/topics/documentationtopic.cpp
   src/topics/enginemodetopic.cpp
+  src/topics/eventtopic.cpp
   src/topics/flightcontrollertopic.cpp
   src/topics/getpropertytopic.cpp
   src/topics/luascripttopic.cpp
diff --git a/modules/server/include/topics/eventtopic.h b/modules/server/include/topics/eventtopic.h
new file mode 100644
index 0000000000..fe838cda8f
--- /dev/null
+++ b/modules/server/include/topics/eventtopic.h
@@ -0,0 +1,53 @@
+/*****************************************************************************************
+ *                                                                                       *
+ * OpenSpace                                                                             *
+ *                                                                                       *
+ * Copyright (c) 2014-2023                                                               *
+ *                                                                                       *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
+ * software and associated documentation files (the "Software"), to deal in the Software *
+ * without restriction, including without limitation the rights to use, copy, modify,    *
+ * merge, publish, distribute, sublicense, and/or sell copies of the Software, and to    *
+ * permit persons to whom the Software is furnished to do so, subject to the following   *
+ * conditions:                                                                           *
+ *                                                                                       *
+ * The above copyright notice and this permission notice shall be included in all copies *
+ * or substantial portions of the Software.                                              *
+ *                                                                                       *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED,   *
+ * INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A         *
+ * PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT    *
+ * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF  *
+ * CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE  *
+ * OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                                         *
+ ****************************************************************************************/
+
+#ifndef __OPENSPACE_MODULE_SERVER___EVENT_TOPIC___H__
+#define __OPENSPACE_MODULE_SERVER___EVENT_TOPIC___H__
+
+#include <modules/server/include/topics/topic.h>
+
+#include <openspace/events/event.h>
+
+namespace openspace::properties { class Property; }
+
+namespace openspace {
+
+class EventTopic : public Topic {
+public:
+    EventTopic() = default;
+    ~EventTopic() override = default;
+
+    void handleJson(const nlohmann::json& json) override;
+    bool isDone() const override;
+
+private:
+    // Returns true if there is at least one subscription active, false otherwise
+    bool isSubscribed() const;
+
+    std::unordered_map<events::Event::Type, bool> _subscribedEvents;
+};
+
+} // namespace openspace
+
+#endif // __OPENSPACE_MODULE_SERVER___EVENT_TOPIC___H__
diff --git a/modules/server/src/connection.cpp b/modules/server/src/connection.cpp
index 8e6dfc1c01..2fa1f5738f 100644
--- a/modules/server/src/connection.cpp
+++ b/modules/server/src/connection.cpp
@@ -30,6 +30,7 @@
 #include <modules/server/include/topics/cameratopic.h>
 #include <modules/server/include/topics/documentationtopic.h>
 #include <modules/server/include/topics/enginemodetopic.h>
+#include <modules/server/include/topics/eventtopic.h>
 #include <modules/server/include/topics/flightcontrollertopic.h>
 #include <modules/server/include/topics/getpropertytopic.h>
 #include <modules/server/include/topics/luascripttopic.h>
@@ -101,6 +102,7 @@ Connection::Connection(std::unique_ptr<ghoul::io::Socket> s, std::string address
     _topicFactory.registerClass<SkyBrowserTopic>("skybrowser");
     _topicFactory.registerClass<CameraTopic>("camera");
     _topicFactory.registerClass<CameraPathTopic>("cameraPath");
+    _topicFactory.registerClass<EventTopic>("event");
 }
 
 void Connection::handleMessage(const std::string& message) {
diff --git a/modules/server/src/topics/eventtopic.cpp b/modules/server/src/topics/eventtopic.cpp
new file mode 100644
index 0000000000..4d55f8ad79
--- /dev/null
+++ b/modules/server/src/topics/eventtopic.cpp
@@ -0,0 +1,124 @@
+/*****************************************************************************************
+ *                                                                                       *
+ * OpenSpace                                                                             *
+ *                                                                                       *
+ * Copyright (c) 2014-2023                                                               *
+ *                                                                                       *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
+ * software and associated documentation files (the "Software"), to deal in the Software *
+ * without restriction, including without limitation the rights to use, copy, modify,    *
+ * merge, publish, distribute, sublicense, and/or sell copies of the Software, and to    *
+ * permit persons to whom the Software is furnished to do so, subject to the following   *
+ * conditions:                                                                           *
+ *                                                                                       *
+ * The above copyright notice and this permission notice shall be included in all copies *
+ * or substantial portions of the Software.                                              *
+ *                                                                                       *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED,   *
+ * INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A         *
+ * PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT    *
+ * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF  *
+ * CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE  *
+ * OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                                         *
+ ****************************************************************************************/
+
+#include <modules/server/include/topics/eventtopic.h>
+
+#include <modules/server/include/connection.h>
+#include <modules/server/include/jsonconverters.h>
+#include <openspace/engine/globals.h>
+#include <openspace/events/event.h>
+#include <openspace/events/eventengine.h>
+#include <ghoul/fmt.h>
+#include <ghoul/logging/logmanager.h>
+
+namespace {
+    constexpr std::string_view _loggerCat = "EventTopic";
+
+    constexpr std::string_view StartSubscription = "start_subscription";
+    constexpr std::string_view StopSubscription = "stop_subscription";
+} // namespace
+
+using nlohmann::json;
+
+namespace openspace {
+
+bool EventTopic::isDone() const {
+    return !isSubscribed();
+}
+
+void EventTopic::handleJson(const nlohmann::json& json) {
+    std::vector<std::string> events;
+
+    auto eventJson = json.find("event");
+    auto statusJson = json.find("status");
+
+    if (eventJson == json.end()) {
+        LERROR("Payload does not contain 'event' key");
+        return;
+    }
+
+    if (statusJson == json.end() || !statusJson->is_string()) {
+        LERROR("Status must be a string");
+        return;
+    }
+
+    if (json.at("event").is_array()) {
+        events = json.at("event").get<std::vector<std::string>>();
+    }
+    else {
+        const std::string& event = json.at("event").get<std::string>();
+        if (event == "*" || event == "all") {
+            // Iterate over all event types and add them to list
+            const uint8_t lastEvent = static_cast<uint8_t>(events::Event::Type::Last);
+
+            for (uint8_t i = 0; i < lastEvent; i++) {
+                auto type = static_cast<events::Event::Type>(i);
+                events.push_back(std::string(events::toString(type)));
+            }
+        }
+        else {
+            events.push_back(event);
+        }
+    }
+
+    const std::string& status = json.at("status").get<std::string>();
+
+    for (const std::string& event : events) {
+        if (status == StartSubscription) {
+            const events::Event::Type type = events::fromString(event);
+
+            _subscribedEvents[type] = true;
+
+            auto onCallback = [this, event](ghoul::Dictionary params) {
+                // Include the fired event to the caller
+                params.setValue("Event", event);
+                _connection->sendJson(wrappedPayload(params));
+            };
+
+            global::eventEngine->registerEventTopic(_topicId, type, onCallback);
+        }
+        else if (status == StopSubscription) {
+            events::Event::Type type = events::fromString(event);
+            _subscribedEvents.erase(type);
+            global::eventEngine->unregisterEventTopic(_topicId, type);
+        }
+    }
+}
+
+bool EventTopic::isSubscribed() const {
+    if (_subscribedEvents.empty()) {
+        return false;
+    }
+
+    bool hasActiveSubscription = std::any_of(
+        _subscribedEvents.begin(),
+        _subscribedEvents.end(),
+        [](const std::pair<const events::Event::Type, bool>& subscription) {
+            return subscription.second;
+    });
+
+    return hasActiveSubscription;
+}
+
+} // namespace openspace
diff --git a/src/engine/openspaceengine.cpp b/src/engine/openspaceengine.cpp
index 39885b8bb6..e35182e084 100644
--- a/src/engine/openspaceengine.cpp
+++ b/src/engine/openspaceengine.cpp
@@ -1321,12 +1321,7 @@ void OpenSpaceEngine::postDraw() {
         events::logAllEvents(e);
     }
     global::eventEngine->triggerActions();
-    while (e) {
-        // @TODO (abock, 2021-08-25) Need to send all events to a topic to be sent out to
-        // others
-
-        e = e->next;
-    }
+    global::eventEngine->triggerTopics();
 
 
     global::eventEngine->postFrameCleanup();
diff --git a/src/events/event.cpp b/src/events/event.cpp
index 587e9079cd..87aeaf57d0 100644
--- a/src/events/event.cpp
+++ b/src/events/event.cpp
@@ -595,6 +595,8 @@ void logAllEvents(const Event* e) {
             case Event::Type::Custom:
                 log(i, *static_cast<const CustomEvent*>(e));
                 break;
+            default:
+                break;
         }
 
         i++;
diff --git a/src/events/eventengine.cpp b/src/events/eventengine.cpp
index c777bdfe7a..776d365b09 100644
--- a/src/events/eventengine.cpp
+++ b/src/events/eventengine.cpp
@@ -29,6 +29,10 @@
 
 #include "eventengine_lua.inl"
 
+namespace {
+    constexpr std::string_view _loggerCat = "EventEngine";
+}
+
 namespace openspace {
 
 uint32_t EventEngine::nextRegisteredEventId = 0;
@@ -71,6 +75,16 @@ void EventEngine::registerEventAction(events::Event::Type type,
     nextRegisteredEventId++;
 }
 
+void EventEngine::registerEventTopic(size_t topicId, events::Event::Type type,
+                                     ScriptCallback callback)
+{
+    TopicInfo ti;
+    ti.id = topicId;
+    ti.callback = callback;
+
+    _eventTopics[type].push_back(ti);
+}
+
 void EventEngine::unregisterEventAction(events::Event::Type type,
                                         const std::string& identifier,
                                         std::optional<ghoul::Dictionary> filter)
@@ -115,6 +129,37 @@ void EventEngine::unregisterEventAction(uint32_t identifier) {
     ));
 }
 
+void EventEngine::unregisterEventTopic(size_t topicId, events::Event::Type type) {
+    const auto it = _eventTopics.find(type);
+    if (it != _eventTopics.end()) {
+        const auto jt = std::find_if(
+            it->second.begin(), it->second.end(),
+            [topicId](const TopicInfo& ti) {
+                return ti.id == topicId;
+            }
+        );
+        if (jt != it->second.end()) {
+            it->second.erase(jt);
+
+            // This might have been the last action so we might need to remove the
+            // entry alltogether
+            if (it->second.empty()) {
+                _eventTopics.erase(it);
+            }
+        }
+        else {
+            LWARNING(fmt::format("Could not find registered event '{}' with topicId: {}",
+                events::toString(type), topicId)
+            );
+        }
+    }
+    else {
+        LWARNING(fmt::format("Could not find registered event '{}'",
+            events::toString(type))
+        );
+    }
+}
+
 std::vector<EventEngine::ActionInfo> EventEngine::registeredActions() const {
     std::vector<EventEngine::ActionInfo> result;
     result.reserve(_eventActions.size());
@@ -179,6 +224,27 @@ void EventEngine::triggerActions() const {
     }
 }
 
+void EventEngine::triggerTopics() const {
+    if (_eventTopics.empty()) {
+        // Nothing to do here
+        return;
+    }
+
+    const events::Event* e = _firstEvent;
+    while (e) {
+        const auto it = _eventTopics.find(e->type);
+
+        if (it != _eventTopics.end()) {
+            ghoul::Dictionary params = toParameter(*e);
+            for (const TopicInfo& ti : it->second) {
+                ti.callback(params);
+            }
+        }
+
+        e = e->next;
+    }
+}
+
 scripting::LuaLibrary EventEngine::luaLibrary() {
     return {
         "event",

From 689bae756ab4f7f761a88a61ca203cc89d9568e5 Mon Sep 17 00:00:00 2001
From: Alexander Bock <alexander.bock@liu.se>
Date: Wed, 24 Jan 2024 14:58:54 +0100
Subject: [PATCH 241/701] Add new keybindings Shift+H to toggle all trails
 including the ISS (closes #3005)

---
 data/assets/base_keybindings.asset | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/data/assets/base_keybindings.asset b/data/assets/base_keybindings.asset
index 95d3a1ce23..615c229150 100644
--- a/data/assets/base_keybindings.asset
+++ b/data/assets/base_keybindings.asset
@@ -1,5 +1,6 @@
 asset.require("./base")
 local trailAction = asset.require("actions/trails/toggle_trails_planets_moons").ToggleTrails
+local allTrailsAction = asset.require("actions/trails/toggle_all_trails").ToggleTrails
 
 
 
@@ -14,22 +15,23 @@ local TogglePlanetLabels = {
   ]],
   Documentation = "Turns on visibility for all solar system labels",
   GuiPath = "/Solar System",
-  IsLocal = false,
-  Key = "l"
+  IsLocal = false
 }
 
 asset.onInitialize(function()
   openspace.action.registerAction(TogglePlanetLabels)
-  openspace.bindKey(TogglePlanetLabels.Key, TogglePlanetLabels.Identifier)
+  openspace.bindKey("L", TogglePlanetLabels.Identifier)
 
-  openspace.bindKey("h", trailAction)
+  openspace.bindKey("H", trailAction)
+  openspace.bindKey("SHIFT+H", allTrailsAction)
 end)
 
 asset.onDeinitialize(function()
-  openspace.clearKey("h")
+  openspace.clearKey("SHIFT+H")
+  openspace.clearKey("H")
 
   openspace.action.removeAction(TogglePlanetLabels)
-  openspace.clearKey(TogglePlanetLabels.Key)
+  openspace.clearKey("L")
 end)
 
 asset.export("TogglePlanetLabels", TogglePlanetLabels.Identifier)

From bd7668e8920212f8cdb45a433d02a6c06ed7b39e Mon Sep 17 00:00:00 2001
From: Alexander Bock <alexander.bock@liu.se>
Date: Wed, 24 Jan 2024 16:56:39 +0100
Subject: [PATCH 242/701] Add the ability to arrayify an enum (closes #3003)

---
 support/coding/codegen | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/support/coding/codegen b/support/coding/codegen
index 3bc8dc5546..993147347c 160000
--- a/support/coding/codegen
+++ b/support/coding/codegen
@@ -1 +1 @@
-Subproject commit 3bc8dc554648d59dc7bec9a5d9c5882415ececcb
+Subproject commit 993147347c2ca5b1e6871e4e9a73a4ccfeb4fd72

From 9d97028c3af1cb69ed088b753ce6f1dc929c0113 Mon Sep 17 00:00:00 2001
From: Emma Broman <emma.broman@liu.se>
Date: Thu, 25 Jan 2024 13:50:36 +0100
Subject: [PATCH 243/701] Fix issue with overflowing color values for layers
 (closes #2880)

---
 modules/globebrowsing/shaders/renderer_fs.glsl | 1 +
 1 file changed, 1 insertion(+)

diff --git a/modules/globebrowsing/shaders/renderer_fs.glsl b/modules/globebrowsing/shaders/renderer_fs.glsl
index 6914aa6a57..165424f192 100644
--- a/modules/globebrowsing/shaders/renderer_fs.glsl
+++ b/modules/globebrowsing/shaders/renderer_fs.glsl
@@ -293,5 +293,6 @@ Fragment getFragment() {
 #endif
 
   frag.color.a *= opacity;
+  frag.color = clamp(frag.color, 0.0, 1.0);
   return frag;
 }

From 0925981a8ca337ab86a7ed3f9b86a9d84373e8c5 Mon Sep 17 00:00:00 2001
From: Emma Broman <emma.broman@liu.se>
Date: Thu, 25 Jan 2024 16:15:19 +0100
Subject: [PATCH 244/701] Fix faulty colors when computing HSV from invalid RGB
 values (with values not in [0,1])

Was noticable e.g. when rendering a lotof points that overlap and are belnded additively
---
 shaders/hdr.glsl | 1 +
 1 file changed, 1 insertion(+)

diff --git a/shaders/hdr.glsl b/shaders/hdr.glsl
index 6c158891bc..99d95252ad 100644
--- a/shaders/hdr.glsl
+++ b/shaders/hdr.glsl
@@ -80,6 +80,7 @@ vec3 XYZToSRGB(vec3 XYZ) {
 
 // HSV code taken from http://lolengine.net/blog/2013/07/27/rgb-to-hsv-in-glsl.
 vec3 rgb2hsv(vec3 c) {
+  c = clamp(c, 0.0, 1.0);
   const vec4 K = vec4(0.0, -1.0 / 3.0, 2.0 / 3.0, -1.0);
   vec4 p = mix(vec4(c.bg, K.wz), vec4(c.gb, K.xy), step(c.b, c.g));
   vec4 q = mix(vec4(p.xyw, c.r), vec4(c.r, p.yzx), step(p.x, c.r));

From bcc728cbfd093410a2802bde77804bbc4a4cfabc Mon Sep 17 00:00:00 2001
From: Gene Payne <payne.gene@gmail.com>
Date: Thu, 25 Jan 2024 13:04:21 -0700
Subject: [PATCH 245/701] Disable Mars MOC layers so original test layers show

---
 tests/visual/default/MarsHiRISE.ostest | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/tests/visual/default/MarsHiRISE.ostest b/tests/visual/default/MarsHiRISE.ostest
index 84c03b7386..93c0abcf0a 100644
--- a/tests/visual/default/MarsHiRISE.ostest
+++ b/tests/visual/default/MarsHiRISE.ostest
@@ -7,6 +7,12 @@
       "value": "os.FadeDownTrails"},
     { "type": "navigationstate", 
       "value": "{Anchor='Mars',Pitch=1.327145E0,Position={7.622104E5,-3.288462E6,-3.857782E5},Up={-0.485709E-1,-0.127474E0,0.990652E0},Yaw=0.224817E-1}"},
+    { "type": "script",
+      "value": "openspace.setPropertyValueSingle('Scene.Mars.Renderable.Layers.ColorLayers.MOC_WA_Color_Utah.Enabled', false)"},
+    { "type": "script",
+      "value": "openspace.setPropertyValueSingle('Scene.Mars.Renderable.Layers.ColorLayers.MOC_WA_Color_LiU.Enabled', false)"},
+    { "type": "script",
+      "value": "openspace.setPropertyValueSingle('Scene.Mars.Renderable.Layers.ColorLayers.MOC_WA_Color_NewYork.Enabled', false)"},
     { "type": "script", 
       "value": "openspace.setPropertyValueSingle('Scene.Mars.Renderable.Layers.HeightLayers.HiRISE-LS-DEM.Enabled', true)"},
     { "type": "script", 

From 2406a886ec670f0e98b07cbb2cea4c36553809a7 Mon Sep 17 00:00:00 2001
From: Emma Broman <emma.broman@liu.se>
Date: Tue, 30 Jan 2024 09:43:11 +0100
Subject: [PATCH 246/701] Interpolating points (#3002)

* Add a class for rendering an interpolated point cloud (WIP)

* Make sure that we render the correct number of points

* Group interpolation properties into a property owner

* Update interpolation stuff (which was broken :) )

* Prevent interpolation from breaking with only one step or invalid interpolation values

* Add trigger properties for controlling interpolation

* Allow setting start interpolation value from asset

* Implement spline-based interpolation

* Cleanup, and interpolate to start and end

* And asset type documentation

* Add example asset

* Handle missing data values in interpolation

* Always show values at the knots, if there is one

* Experiment with more dynamic rendering (batching)

* Speed up interpolation by doing it on GPU instead of CPU

* Bring back spline interpolation (this time on GPU)

* Refactor initial data buffering

* Add a helper function to compute transformed positions

* Use vec3 positions instead of vec4 (less data to transfer)

* Update interpolation value documentation

* Apply suggestions from code review

Co-authored-by: Alexander Bock <alexander.bock@liu.se>

* Increase interpolation speed max value

* Fix faulty indentation

* I banish thee, redundant empty line

---------

Co-authored-by: Alexander Bock <alexander.bock@liu.se>
---
 .../pointclouds/data/interpolation_expand.csv |  61 ++
 .../data/interpolation_randomwalk.csv         |  61 ++
 .../pointclouds/interpolated_points.asset     |  92 +++
 modules/base/CMakeLists.txt                   |   9 +-
 modules/base/basemodule.cpp                   |   5 +
 .../renderableinterpolatedpoints.cpp          | 544 ++++++++++++++++++
 .../pointcloud/renderableinterpolatedpoints.h | 100 ++++
 .../pointcloud/renderablepointcloud.cpp       | 158 ++---
 .../pointcloud/renderablepointcloud.h         |  14 +-
 .../{ => pointcloud}/billboardpoint_fs.glsl   |   0
 .../{ => pointcloud}/billboardpoint_gs.glsl   |   0
 .../billboardpoint_interpolated_vs.glsl       |  91 +++
 .../{ => pointcloud}/billboardpoint_vs.glsl   |   4 +-
 13 files changed, 1063 insertions(+), 76 deletions(-)
 create mode 100644 data/assets/examples/pointclouds/data/interpolation_expand.csv
 create mode 100644 data/assets/examples/pointclouds/data/interpolation_randomwalk.csv
 create mode 100644 data/assets/examples/pointclouds/interpolated_points.asset
 create mode 100644 modules/base/rendering/pointcloud/renderableinterpolatedpoints.cpp
 create mode 100644 modules/base/rendering/pointcloud/renderableinterpolatedpoints.h
 rename modules/base/shaders/{ => pointcloud}/billboardpoint_fs.glsl (100%)
 rename modules/base/shaders/{ => pointcloud}/billboardpoint_gs.glsl (100%)
 create mode 100644 modules/base/shaders/pointcloud/billboardpoint_interpolated_vs.glsl
 rename modules/base/shaders/{ => pointcloud}/billboardpoint_vs.glsl (97%)

diff --git a/data/assets/examples/pointclouds/data/interpolation_expand.csv b/data/assets/examples/pointclouds/data/interpolation_expand.csv
new file mode 100644
index 0000000000..3bd9aede78
--- /dev/null
+++ b/data/assets/examples/pointclouds/data/interpolation_expand.csv
@@ -0,0 +1,61 @@
+time,x,y,z,dynamic_value,static_value
+0.0,675.0297905065192,1672.6820684730765,-124.14442820502654,1,1
+0.0,9.0852354697237,1080.363474597831,266.4506394528842,3,3
+0.0,783.6498618493837,-332.90868790089644,166.73196289611994,5,5
+0.0,163.88116606175208,-978.1393719572736,1260.016529398092,10,10
+0.0,-934.1529593143864,-590.4853596059422,-622.5048517597389,11,11
+0.0,77.99426967464474,-184.5196836590583,1835.5681393474856,13,13
+0.0,77.99426967464474,-184.5196836590583,1835.5681393474856,14,14
+0.0,-269.98667369858055,-559.2891044933908,-1487.2591171480176,15,15
+0.0,-710.8143185498654,-627.4209210346181,-1504.56518583112,17,17
+0.0,-710.8143185498654,-627.4209210346181,-1504.56518583112,18,18
+1.0,1350.0595810130385,3345.364136946153,-248.28885641005309,2,1
+1.0,18.1704709394474,2160.726949195662,532.9012789057684,6,3
+1.0,1567.2997236987674,-665.8173758017929,333.4639257922399,10,5
+1.0,327.76233212350417,-1956.2787439145472,2520.033058796184,20,10
+1.0,-1868.3059186287728,-1180.9707192118844,-1245.0097035194779,22,11
+1.0,155.98853934928948,-369.0393673181166,3671.136278694971,26,13
+1.0,155.98853934928948,-369.0393673181166,3671.136278694971,28,14
+1.0,-539.9733473971611,-1118.5782089867816,-2974.518234296035,30,15
+1.0,-1421.628637099731,-1254.8418420692362,-3009.13037166224,34,17
+1.0,-1421.628637099731,-1254.8418420692362,-3009.13037166224,36,18
+2.0,2700.119162026077,6690.728273892306,-496.57771282010617,4,1
+2.0,36.3409418788948,4321.453898391324,1065.8025578115369,12,3
+2.0,3134.5994473975347,-1331.6347516035858,666.9278515844798,20,5
+2.0,655.5246642470083,-3912.5574878290945,5040.066117592368,40,10
+2.0,-3736.6118372575456,-2361.941438423769,-2490.0194070389557,44,11
+2.0,311.97707869857896,-738.0787346362332,7342.272557389942,52,13
+2.0,311.97707869857896,-738.0787346362332,7342.272557389942,56,14
+2.0,-1079.9466947943222,-2237.1564179735633,-5949.03646859207,60,15
+2.0,-2843.257274199462,-2509.6836841384725,-6018.26074332448,68,17
+2.0,-2843.257274199462,-2509.6836841384725,-6018.26074332448,72,18
+3.0,5400.238324052154,13381.456547784612,-993.1554256402123,8,1
+3.0,72.6818837577896,8642.907796782649,2131.6051156230737,24,3
+3.0,6269.1988947950695,-2663.2695032071715,1333.8557031689595,40,5
+3.0,1311.0493284940167,-7825.114975658189,10080.132235184736,80,10
+3.0,-7473.223674515091,-4723.882876847538,-4980.038814077911,88,11
+3.0,623.9541573971579,-1476.1574692724664,14684.545114779885,104,13
+3.0,623.9541573971579,-1476.1574692724664,14684.545114779885,112,14
+3.0,-2159.8933895886444,-4474.312835947127,-11898.07293718414,120,15
+3.0,-5686.514548398924,-5019.367368276945,-12036.52148664896,136,17
+3.0,-5686.514548398924,-5019.367368276945,-12036.52148664896,144,18
+4.0,10800.476648104308,26762.913095569224,-1986.3108512804247,16,1
+4.0,145.3637675155792,17285.815593565298,4263.2102312461475,48,3
+4.0,12538.397789590139,-5326.539006414343,2667.711406337919,80,5
+4.0,2622.0986569880333,-15650.229951316378,20160.26447036947,160,10
+4.0,-14946.447349030183,-9447.765753695076,-9960.077628155823,176,11
+4.0,1247.9083147943159,-2952.314938544933,29369.09022955977,208,13
+4.0,1247.9083147943159,-2952.314938544933,29369.09022955977,224,14
+4.0,-4319.786779177289,-8948.625671894253,-23796.14587436828,240,15
+4.0,-11373.029096797847,-10038.73473655389,-24073.04297329792,272,17
+4.0,-11373.029096797847,-10038.73473655389,-24073.04297329792,288,18
+5.0,21600.953296208616,53525.82619113845,-3972.6217025608494,32,1
+5.0,290.7275350311584,34571.631187130595,8526.420462492295,96,3
+5.0,25076.795579180278,-10653.078012828686,5335.422812675838,160,5
+5.0,5244.197313976067,-31300.459902632756,40320.52894073894,320,10
+5.0,-29892.894698060365,-18895.53150739015,-19920.155256311646,352,11
+5.0,2495.8166295886317,-5904.629877089866,58738.18045911954,416,13
+5.0,2495.8166295886317,-5904.629877089866,58738.18045911954,448,14
+5.0,-8639.573558354577,-17897.251343788506,-47592.29174873656,480,15
+5.0,-22746.058193595694,-20077.46947310778,-48146.08594659584,544,17
+5.0,-22746.058193595694,-20077.46947310778,-48146.08594659584,576,18
diff --git a/data/assets/examples/pointclouds/data/interpolation_randomwalk.csv b/data/assets/examples/pointclouds/data/interpolation_randomwalk.csv
new file mode 100644
index 0000000000..f8681b6d42
--- /dev/null
+++ b/data/assets/examples/pointclouds/data/interpolation_randomwalk.csv
@@ -0,0 +1,61 @@
+time,x,y,z
+0.0,675.0297905065192,1672.6820684730765,-124.14442820502654
+0.0,9.0852354697237,1080.363474597831,266.4506394528842
+0.0,783.6498618493837,-332.90868790089644,166.73196289611994
+0.0,163.88116606175208,-978.1393719572736,1260.016529398092
+0.0,-934.1529593143864,-590.4853596059422,-622.5048517597389
+0.0,77.99426967464474,-184.5196836590583,1835.5681393474856
+0.0,77.99426967464474,-184.5196836590583,1835.5681393474856
+0.0,-269.98667369858055,-559.2891044933908,-1487.2591171480176
+0.0,-710.8143185498654,-627.4209210346181,-1504.56518583112
+0.0,-710.8143185498654,-627.4209210346181,-1504.56518583112
+1.0,1668.4580965289847,745.846682848152,2807.1531096380813
+1.0,-267.4433668726456,148.90396745731732,-185.1019615201871
+1.0,2079.026938050769,151.01585523117177,301.7883722719676
+1.0,3209.940878877803,-4804.699861272869,-1589.4798430288217
+1.0,-1402.4597087610582,-4040.3210246320077,-1711.2703008101043
+1.0,-390.2796442237164,-1309.0947421410037,2057.413318767218
+1.0,3236.419900689428,-2210.181924327906,-466.4190154971202
+1.0,1264.882784607237,69.2055606971569,-735.8630804566736
+1.0,-1649.7630904197697,-2443.46907207704,-2705.84256566873
+1.0,374.30576862206385,-3452.028323705201,-2087.952685417674
+2.0,465.0448720701909,2222.779842838973,3455.3210484276715
+2.0,3437.11300214523,491.6405298372583,-955.2665223528202
+2.0,2052.032488574901,-80.28070954530929,-1052.0556283399499
+2.0,1094.5190209660022,-5406.907252451447,-366.127265347086
+2.0,242.63011544531992,-6997.3650053668625,350.72874418179754
+2.0,-2831.9669441657607,-2748.783158930421,3919.9735569996146
+2.0,3654.1470906989384,-3131.459466247481,-2144.8540619423975
+2.0,-2654.4574631523137,2183.4500131349887,-1354.287832159103
+2.0,-4306.135188216631,-1756.232492940117,-2043.315702861602
+2.0,768.0282403603109,-6978.108634430669,-136.86243117295544
+3.0,-493.303603620389,2945.5710538558005,3015.977272752648
+3.0,3065.7950488175957,3567.7136627691966,-241.04137932932736
+3.0,-160.63745943715548,-151.93278776521237,1903.7324611430824
+3.0,-1297.8942271953392,-2277.6199408234343,-1402.6677018943808
+3.0,1867.681760233716,-12236.85521354635,-1266.2584616045776
+3.0,-119.48688702411482,-1104.9781501799732,2916.459469830542
+3.0,3510.126847538271,-2957.3653297711385,-314.04982653824914
+3.0,-647.3916673682654,1585.4353122032537,-696.785612839734
+3.0,-3582.8631381213627,-1572.7109398691125,-3102.8361103956795
+3.0,-522.2112688499377,-10953.246463632455,889.6724350537568
+4.0,-299.1485049243082,114.829569754972,-821.5651578454349
+4.0,5003.085029883374,2726.4230172384787,-294.0691302277611
+4.0,-1564.7436471918602,-837.3618208187513,2024.1928810251354
+4.0,-1953.2185203908757,-3882.1744792666723,3523.8165230761915
+4.0,1083.4654539694006,-12559.426636878368,-1650.9803911668228
+4.0,-3046.516783288352,-296.8764365508964,3519.554154497767
+4.0,4102.367401667423,815.0064726499218,-383.47336594873576
+4.0,-125.2811230084867,1934.5909378669317,-3034.141688078798
+4.0,-3572.6362248364408,-1057.610158423584,-817.1904813656383
+4.0,-991.3855356002316,-11102.13829516479,2393.538500427305
+5.0,1282.9153891617857,-2986.4972923772934,-366.64528863717607
+5.0,3184.310120293896,2863.5489668505334,2320.216378337095
+5.0,1240.8449746803383,-2961.969248270961,-1190.7735880973198
+5.0,-4756.920645975437,-2934.989617996309,3893.0842401408
+5.0,2257.179641569941,-14398.275105345974,-1131.2148026699756
+5.0,1334.3944683316054,2802.9923734841823,5083.199898052388
+5.0,2121.294751406046,-751.5001120225525,-2857.3747877048995
+5.0,-1257.8765822140306,1290.4679054555804,-5675.05491424735
+5.0,-3373.3334946611585,569.4242763157556,226.69264986815688
+5.0,-1998.3368438326302,-13563.866928032701,2987.507846893677
diff --git a/data/assets/examples/pointclouds/interpolated_points.asset b/data/assets/examples/pointclouds/interpolated_points.asset
new file mode 100644
index 0000000000..ee0110f364
--- /dev/null
+++ b/data/assets/examples/pointclouds/interpolated_points.asset
@@ -0,0 +1,92 @@
+local Points = {
+  Identifier = "Example_InterpolatedPoints_ColorMapped",
+  Renderable = {
+    Type = "RenderableInterpolatedPoints",
+    -- The dataset here is just a linearly expanding dataset, where the points move in
+    -- a straight line
+    File = asset.resource("data/interpolation_expand.csv"),
+    -- Specify how many objects the rows in the dataset represent. Here, the dataset is
+    -- consists of 10 objects with positions at 6 different time steps. This information
+    -- is required
+    NumberOfObjects = 10,
+    -- Both the position and data values will be interpolated, so use a color map
+    Coloring = {
+      ColorMapping = {
+        File = asset.resource("viridis.cmap")
+      }
+    },
+    -- Reduce the scale of the points a bit compared to default, so we see them more clearly
+    SizeSettings = {
+      ScaleExponent = 3.5
+    }
+  },
+  GUI = {
+    Name = "Interpolating Points with Color Map",
+    Path = "/Example/Interpolated Point Clouds",
+    Description = [[Example of interpolating points with a color map. The data value
+      used for the coloring will also be inteprolated, leading to the points changing
+      color throughout the interpolation.]]
+  }
+}
+
+local Points_Smoothed = {
+  Identifier = "Example_InterpolatedPoints_Spline",
+  Renderable = {
+    Type = "RenderableInterpolatedPoints",
+    -- Using a random walk dataset, to get movement in some different directions
+    File = asset.resource("data/interpolation_randomwalk.csv"),
+    -- Same number of objects as above - 10 objects with positions at 6 different
+    -- time steps
+    NumberOfObjects = 10,
+    Interpolation = {
+      -- Smoothen transitions between two different sets of points, by
+      -- using a spline based interpolation of the points
+      UseSplineInterpolation = true
+    },
+    -- Just use a fixed coloring here, no color mapping
+    Coloring = {
+      FixedColor = { 0.0, 0.5, 0.0 }
+    },
+    -- Reduce the scale of the points a bit compared to default, so we see them more clearly
+    SizeSettings = {
+      ScaleExponent = 3.0
+    }
+  },
+  GUI = {
+    Name = "Interpolating Points (Spline)",
+    Path = "/Example/Interpolated Point Clouds",
+    Description = [[Example of interpolating points with spline-based interpolation
+      for the position. This leads to smoother transitions at the nodes of the
+      interpolation. Try disabling the spline interpolation in the GUI (under
+      Renderable->Interpolation) to see the difference.]]
+  }
+}
+
+
+asset.onInitialize(function()
+  openspace.addSceneGraphNode(Points)
+  openspace.addSceneGraphNode(Points_Smoothed)
+end)
+
+asset.onDeinitialize(function()
+  openspace.removeSceneGraphNode(Points_Smoothed)
+  openspace.removeSceneGraphNode(Points)
+end)
+
+asset.export(Points)
+asset.export(Points_Smoothed)
+
+
+
+asset.meta = {
+  Name = "Example - Interpolated Point Clouds",
+  Version = "1.0",
+  Description = [[Example of point clouds that support interpolation. One uses a linear
+    motion and color mapping. The other example uses a spline interpolation for the
+    approximation of the positions, to result in smoother transitions between the sets
+    of positions. The interpolation can be triggered using the properties under
+    Renderable->Interpolation in the Scene menu.]],
+  Author = "OpenSpace Team",
+  URL = "http://openspaceproject.com",
+  License = "MIT license"
+}
diff --git a/modules/base/CMakeLists.txt b/modules/base/CMakeLists.txt
index 7baa93e400..e3168b3272 100644
--- a/modules/base/CMakeLists.txt
+++ b/modules/base/CMakeLists.txt
@@ -44,6 +44,7 @@ set(HEADER_FILES
   rendering/grids/renderablegrid.h
   rendering/grids/renderableradialgrid.h
   rendering/grids/renderablesphericalgrid.h
+  rendering/pointcloud/renderableinterpolatedpoints.h
   rendering/pointcloud/renderablepointcloud.h
   rendering/pointcloud/renderablepolygoncloud.h
   rendering/renderablecartesianaxes.h
@@ -105,6 +106,7 @@ set(SOURCE_FILES
   rendering/grids/renderablegrid.cpp
   rendering/grids/renderableradialgrid.cpp
   rendering/grids/renderablesphericalgrid.cpp
+  rendering/pointcloud/renderableinterpolatedpoints.cpp
   rendering/pointcloud/renderablepointcloud.cpp
   rendering/pointcloud/renderablepolygoncloud.cpp
   rendering/renderablecartesianaxes.cpp
@@ -152,9 +154,6 @@ set(SHADER_FILES
   shaders/arrow_vs.glsl
   shaders/axes_fs.glsl
   shaders/axes_vs.glsl
-  shaders/billboardpoint_fs.glsl
-  shaders/billboardpoint_gs.glsl
-  shaders/billboardpoint_vs.glsl
   shaders/disc_fs.glsl
   shaders/disc_vs.glsl
   shaders/grid_vs.glsl
@@ -167,6 +166,10 @@ set(SHADER_FILES
   shaders/model_vs.glsl
   shaders/plane_fs.glsl
   shaders/plane_vs.glsl
+  shaders/pointcloud/billboardpoint_fs.glsl
+  shaders/pointcloud/billboardpoint_gs.glsl
+  shaders/pointcloud/billboardpoint_vs.glsl
+  shaders/pointcloud/billboardpoint_interpolated_vs.glsl
   shaders/polygon_fs.glsl
   shaders/polygon_gs.glsl
   shaders/polygon_vs.glsl
diff --git a/modules/base/basemodule.cpp b/modules/base/basemodule.cpp
index 2b46683efb..d2619a9dbe 100644
--- a/modules/base/basemodule.cpp
+++ b/modules/base/basemodule.cpp
@@ -43,6 +43,7 @@
 #include <modules/base/rendering/grids/renderablegrid.h>
 #include <modules/base/rendering/grids/renderableradialgrid.h>
 #include <modules/base/rendering/grids/renderablesphericalgrid.h>
+#include <modules/base/rendering/pointcloud/renderableinterpolatedpoints.h>
 #include <modules/base/rendering/pointcloud/renderablepointcloud.h>
 #include <modules/base/rendering/pointcloud/renderablepolygoncloud.h>
 #include <modules/base/rendering/renderablecartesianaxes.h>
@@ -146,6 +147,9 @@ void BaseModule::internalInitialize(const ghoul::Dictionary&) {
     fRenderable->registerClass<RenderablePlaneTimeVaryingImage>(
         "RenderablePlaneTimeVaryingImage"
     );
+    fRenderable->registerClass<RenderableInterpolatedPoints>(
+        "RenderableInterpolatedPoints"
+    );
     fRenderable->registerClass<RenderablePointCloud>("RenderablePointCloud");
     fRenderable->registerClass<RenderablePolygonCloud>("RenderablePolygonCloud");
     fRenderable->registerClass<RenderablePrism>("RenderablePrism");
@@ -226,6 +230,7 @@ std::vector<documentation::Documentation> BaseModule::documentations() const {
         RenderableCartesianAxes::Documentation(),
         RenderableDisc::Documentation(),
         RenderableGrid::Documentation(),
+        RenderableInterpolatedPoints::Documentation(),
         RenderableLabel::Documentation(),
         RenderableModel::Documentation(),
         RenderableNodeArrow::Documentation(),
diff --git a/modules/base/rendering/pointcloud/renderableinterpolatedpoints.cpp b/modules/base/rendering/pointcloud/renderableinterpolatedpoints.cpp
new file mode 100644
index 0000000000..94defce7d0
--- /dev/null
+++ b/modules/base/rendering/pointcloud/renderableinterpolatedpoints.cpp
@@ -0,0 +1,544 @@
+/*****************************************************************************************
+ *                                                                                       *
+ * OpenSpace                                                                             *
+ *                                                                                       *
+ * Copyright (c) 2014-2023                                                               *
+ *                                                                                       *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
+ * software and associated documentation files (the "Software"), to deal in the Software *
+ * without restriction, including without limitation the rights to use, copy, modify,    *
+ * merge, publish, distribute, sublicense, and/or sell copies of the Software, and to    *
+ * permit persons to whom the Software is furnished to do so, subject to the following   *
+ * conditions:                                                                           *
+ *                                                                                       *
+ * The above copyright notice and this permission notice shall be included in all copies *
+ * or substantial portions of the Software.                                              *
+ *                                                                                       *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED,   *
+ * INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A         *
+ * PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT    *
+ * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF  *
+ * CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE  *
+ * OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                                         *
+ ****************************************************************************************/
+
+#include <modules/base/rendering/pointcloud/renderableinterpolatedpoints.h>
+
+#include <modules/base/basemodule.h>
+#include <openspace/documentation/documentation.h>
+#include <openspace/engine/globals.h>
+#include <openspace/rendering/renderengine.h>
+#include <openspace/scripting/scriptengine.h>
+#include <ghoul/filesystem/filesystem.h>
+#include <ghoul/glm.h>
+#include <ghoul/logging/logmanager.h>
+#include <ghoul/misc/interpolator.h>
+#include <ghoul/opengl/programobject.h>
+#include <ghoul/opengl/texture.h>
+#include <optional>
+
+namespace {
+    constexpr std::string_view _loggerCat = "RenderableInterpolatedPoints";
+
+    constexpr openspace::properties::Property::PropertyInfo InterpolationValueInfo = {
+        "Value",
+        "Value",
+        "The value to use for interpolation. The max value is set from the number of "
+        "steps in the dataset, so a step of one corresponds to one step in the dataset "
+        "and values in-between will be determined using interpolation.",
+        openspace::properties::Property::Visibility::NoviceUser
+    };
+
+    constexpr openspace::properties::Property::PropertyInfo StepsInfo = {
+        "NumberOfSteps",
+        "Number of Steps",
+        "The number of steps available in the dataset, including the initial positions.",
+        openspace::properties::Property::Visibility::User
+    };
+
+    constexpr openspace::properties::Property::PropertyInfo JumpToNextInfo = {
+        "JumpToNext",
+        "Jump to Next",
+        "Immediately set the interpolation value to correspond to the next set of point "
+        "positions compared to the current.",
+        openspace::properties::Property::Visibility::User
+    };
+
+    constexpr openspace::properties::Property::PropertyInfo JumpToPrevInfo = {
+        "JumpToPrevious",
+        "Jump to Previous",
+        "Immediately set the interpolation value to correspond to the previous set of "
+        "point positions compared to the current.",
+        openspace::properties::Property::Visibility::User
+    };
+
+    constexpr openspace::properties::Property::PropertyInfo InterpolateToNextInfo = {
+        "InterpolateToNext",
+        "Interpolate to Next",
+        "Trigger an interpolation to the next set of point positions. The duration of "
+        "the interpolation is set based on the Interpolaton Speed property.",
+        openspace::properties::Property::Visibility::User
+    };
+
+    constexpr openspace::properties::Property::PropertyInfo InterpolateToPrevInfo = {
+        "InterpolateToPrevious",
+        "Interpolate to Previous",
+        "Trigger an interpolation to the previous set of point positions. The duration "
+        "of the interpolation is set based on the Interpolaton Speed property.",
+        openspace::properties::Property::Visibility::User
+    };
+
+    constexpr openspace::properties::Property::PropertyInfo InterpolateToEndInfo = {
+        "InterpolateToEnd",
+        "Interpolate to End",
+        "Trigger an interpolation all the way to the final set of positions. The "
+        "duration of the interpolation is set based on the Interpolaton Speed property.",
+        openspace::properties::Property::Visibility::NoviceUser
+    };
+
+    constexpr openspace::properties::Property::PropertyInfo InterpolateToStartInfo = {
+        "InterpolateToStart",
+        "Interpolate to Start",
+        "Trigger an inverted interpolation to the initial set of positions. The duration "
+        "of the interpolation is set based on the Interpolaton Speed property.",
+        openspace::properties::Property::Visibility::NoviceUser
+    };
+
+    constexpr openspace::properties::Property::PropertyInfo InterpolationSpeedInfo = {
+        "Speed",
+        "Interpolation Speed",
+        "Affects how long the interpolation takes when triggered using one of the "
+        "trigger properties. A value of 1 means that a step takes 1 second.",
+        openspace::properties::Property::Visibility::NoviceUser
+    };
+
+    constexpr openspace::properties::Property::PropertyInfo UseSplineInfo = {
+        "UseSplineInterpolation",
+        "Use Spline Interpolation",
+        "If true, the points will be interpolated using a Catmull-Rom spline instead of "
+        "linearly. This leads to a smoother transition at the breakpoints, i.e. between "
+        "each step.",
+        openspace::properties::Property::Visibility::AdvancedUser
+    };
+
+    // RenderableInterpolatedPoints is a version of the RenderablePointCloud class, where
+    // the dataset may contain multiple time steps that can be interpolated between. It
+    // supports interpolation of both of positions and data values used for color mapping
+    // or size.
+    //
+    // The dataset should be structured in a way so that the first N rows correspond to
+    // the first set of positions for the objects, the next N rows to the second set of
+    // positions, and so on. The number of objects in the dataset must be specified in the
+    // asset.
+    struct [[codegen::Dictionary(RenderableInterpolatedPoints)]] Parameters {
+        // The number of objects to read from the dataset. Every N:th datapoint will
+        // be interpreted as the same point, but at a different step in the interpolation
+        int numberOfObjects [[codegen::greaterequal(1)]];
+
+        struct Interpolation {
+            // [[codegen::verbatim(InterpolationValueInfo.description)]]
+            std::optional<double> value;
+
+            // [[codegen::verbatim(InterpolationSpeedInfo.description)]]
+            std::optional<double> speed;
+
+            // [[codegen::verbatim(UseSplineInfo.description)]]
+            std::optional<bool> useSplineInterpolation;
+        };
+        // Initial settings for the interpolation
+        std::optional<Interpolation> interpolation;
+    };
+
+#include "renderableinterpolatedpoints_codegen.cpp"
+}  // namespace
+
+namespace openspace {
+
+documentation::Documentation RenderableInterpolatedPoints::Documentation() {
+    return codegen::doc<Parameters>(
+        "base_renderableinterpolatedpoints",
+        RenderablePointCloud::Documentation()
+    );
+}
+
+RenderableInterpolatedPoints::Interpolation::Interpolation()
+    : properties::PropertyOwner({ "Interpolation", "Interpolation", "" })
+    , value(InterpolationValueInfo, 0.f, 0.f, 1.f)
+    , nSteps(StepsInfo)
+    , goToNextStep(JumpToNextInfo)
+    , goToPrevStep(JumpToPrevInfo)
+    , interpolateToNextStep(InterpolateToNextInfo)
+    , interpolateToPrevStep(InterpolateToPrevInfo)
+    , interpolateToEnd(InterpolateToEndInfo)
+    , interpolateToStart(InterpolateToStartInfo)
+    , speed(InterpolationSpeedInfo, 1.f, 0.01f, 100.f)
+    , useSpline(UseSplineInfo, false)
+{
+    addProperty(value);
+
+    auto triggerInterpolation = [](std::string_view identifier, float v, float d) {
+        std::string script = fmt::format(
+            "openspace.setPropertyValueSingle(\"{}\", {}, {})",
+            identifier, v, d
+        );
+        // No syncing, as this was triggered from a property change (which happened
+        // based on an already synced script)
+        global::scriptEngine->queueScript(
+            script,
+            scripting::ScriptEngine::ShouldBeSynchronized::No,
+            scripting::ScriptEngine::ShouldSendToRemote::No
+        );
+    };
+
+    interpolateToEnd.onChange([triggerInterpolation, this]() {
+        float remaining = value.maxValue() - value;
+        float duration = remaining / speed;
+        triggerInterpolation(
+            value.fullyQualifiedIdentifier(),
+            value.maxValue(),
+            duration
+        );
+    });
+
+    interpolateToStart.onChange([triggerInterpolation, this]() {
+        float duration = value / speed;
+        triggerInterpolation(value.fullyQualifiedIdentifier(), 0.f, duration);
+    });
+
+    interpolateToNextStep.onChange([triggerInterpolation, this]() {
+        float prevValue = glm::floor(value);
+        float newValue = glm::min(prevValue + 1.f, value.maxValue());
+        float duration = 1.f / speed;
+        triggerInterpolation(value.fullyQualifiedIdentifier(), newValue, duration);
+    });
+
+    interpolateToPrevStep.onChange([triggerInterpolation, this]() {
+        float prevValue = glm::ceil(value);
+        float newValue = glm::max(prevValue - 1.f, value.minValue());
+        float duration = 1.f / speed;
+        triggerInterpolation(value.fullyQualifiedIdentifier(), newValue, duration);
+    });
+
+    addProperty(interpolateToEnd);
+    addProperty(interpolateToStart);
+    addProperty(interpolateToNextStep);
+    addProperty(interpolateToPrevStep);
+    addProperty(speed);
+
+    goToNextStep.onChange([this]() {
+        float prevValue = glm::floor(value);
+        value = glm::min(prevValue + 1.f, value.maxValue());
+    });
+
+    goToPrevStep.onChange([this]() {
+        float prevValue = glm::ceil(value);
+        value = glm::max(prevValue - 1.f, value.minValue());
+    });
+
+    addProperty(goToNextStep);
+    addProperty(goToPrevStep);
+
+    nSteps.setReadOnly(true);
+    addProperty(nSteps);
+
+    addProperty(useSpline);
+}
+
+RenderableInterpolatedPoints::RenderableInterpolatedPoints(
+                                                      const ghoul::Dictionary& dictionary)
+    : RenderablePointCloud(dictionary)
+{
+    const Parameters p = codegen::bake<Parameters>(dictionary);
+
+    addPropertySubOwner(_interpolation);
+
+    if (p.interpolation.has_value()) {
+        _interpolation.value = static_cast<float>(
+            p.interpolation->value.value_or(_interpolation.value)
+        );
+        _interpolation.speed = static_cast<float>(
+            p.interpolation->speed.value_or(_interpolation.speed)
+        );
+        _interpolation.useSpline = p.interpolation->useSplineInterpolation.value_or(
+            _interpolation.useSpline
+        );
+    }
+
+    unsigned int nObjects = static_cast<unsigned int>(p.numberOfObjects);
+
+    // At this point, the dataset has been loaded and the number of points computed. We
+    // need to recompute them and compute how many steps the number of points
+    // corresponded to
+
+    if (_nDataPoints % nObjects != 0) {
+        LERROR(fmt::format(
+            "Mismatch between provided number of data entries and the specified number "
+            "of points. Expected the number of entries in the data file {} to be evenly "
+            "divisible by the number of points", _dataFile
+        ));
+    }
+
+    _interpolation.nSteps = _nDataPoints / nObjects;
+    _interpolation.value.setMaxValue(static_cast<float>(_interpolation.nSteps - 1));
+
+    _interpolation.value.onChange([this]() {
+        bool passedAKnot =
+            glm::ceil(_interpolation.value) != glm::ceil(_prevInterpolationValue);
+
+        if (passedAKnot) {
+            _dataIsDirty = true;
+        }
+        _prevInterpolationValue = _interpolation.value;
+    });
+
+    _interpolation.useSpline.onChange([this]() {
+        _dataIsDirty = true;
+        _shouldReinitializeBufferdata = true;
+    });
+
+    // This property is mostly for show in the UI, but also used to tell how many points
+    // should be rendered. So make sure it is updated once we know the number of
+    // interpolation steps
+    _nDataPoints = nObjects;
+}
+
+void RenderableInterpolatedPoints::initializeShadersAndGlExtras() {
+    _program = BaseModule::ProgramObjectManager.request(
+        "RenderablePointCloud_Interpolated",
+        []() {
+            return global::renderEngine->buildRenderProgram(
+                "RenderablePointCloud_Interpolated",
+                absPath("${MODULE_BASE}/shaders/pointcloud/billboardpoint_interpolated_vs.glsl"),
+                absPath("${MODULE_BASE}/shaders/pointcloud/billboardpoint_fs.glsl"),
+                absPath("${MODULE_BASE}/shaders/pointcloud/billboardpoint_gs.glsl")
+            );
+        }
+    );
+
+    initializeBufferData();
+}
+
+void RenderableInterpolatedPoints::deinitializeShaders() {
+    BaseModule::ProgramObjectManager.release(
+        "RenderablePointCloud_Interpolated",
+        [](ghoul::opengl::ProgramObject* p) {
+            global::renderEngine->removeRenderProgram(p);
+        }
+    );
+    _program = nullptr;
+}
+
+void RenderableInterpolatedPoints::bindDataForPointRendering() {
+    RenderablePointCloud::bindDataForPointRendering();
+
+    float t0 = computeCurrentLowerValue();
+    float t = glm::clamp(_interpolation.value - t0, 0.f, 1.f);
+    _program->setUniform("interpolationValue", t);
+    _program->setUniform("useSpline", _interpolation.useSpline);
+}
+
+void RenderableInterpolatedPoints::preUpdate() {
+    if (_shouldReinitializeBufferdata) {
+        initializeBufferData();
+        _shouldReinitializeBufferdata = false;
+    }
+}
+
+int RenderableInterpolatedPoints::nAttributesPerPoint() const {
+    int n = RenderablePointCloud::nAttributesPerPoint();
+    // Need twice as much information as the regular points
+    n *= 2;
+    if (_interpolation.useSpline) {
+        // Use two more positions (xyz)
+        n += 2 * 3;
+    }
+    return n;
+}
+
+std::vector<float> RenderableInterpolatedPoints::createDataSlice() {
+    ZoneScoped;
+
+    if (_dataset.entries.empty()) {
+        return std::vector<float>();
+    }
+
+    std::vector<float> result;
+    result.reserve(nAttributesPerPoint() * _nDataPoints);
+
+    // Find the information we need for the interpolation and to identify the points,
+    // and make sure these result in valid indices in all cases
+    float t0 = computeCurrentLowerValue();
+    float t1 = t0 + 1.f;
+    t1 = glm::clamp(t1, 0.f, _interpolation.value.maxValue());
+    unsigned int t0Index = static_cast<unsigned int>(t0);
+    unsigned int t1Index = static_cast<unsigned int>(t1);
+
+    // What datavar is in use for the index color
+    int colorParamIndex = currentColorParameterIndex();
+
+    // What datavar is in use for the size scaling (if present)
+    int sizeParamIndex = currentSizeParameterIndex();
+
+    double maxRadius = 0.0;
+
+    for (unsigned int i = 0; i < _nDataPoints; i++) {
+        using namespace dataloader;
+        const Dataset::Entry& e0 = _dataset.entries[t0Index * _nDataPoints + i];
+        const Dataset::Entry& e1 = _dataset.entries[t1Index * _nDataPoints + i];
+        glm::dvec3 position0 = transformedPosition(e0);
+        glm::dvec3 position1 = transformedPosition(e1);
+
+        const double r = glm::max(glm::length(position0), glm::length(position1));
+        maxRadius = glm::max(maxRadius, r);
+
+        // Positions
+        for (int j = 0; j < 3; ++j) {
+            result.push_back(static_cast<float>(position0[j]));
+        }
+
+        for (int j = 0; j < 3; ++j) {
+            result.push_back(static_cast<float>(position1[j]));
+        }
+
+        if (_interpolation.useSpline && _interpolation.nSteps > 1) {
+            // Compute the extra positions, before and after the other ones
+            unsigned int beforeIndex = static_cast<unsigned int>(
+                glm::max(t0 - 1.f, 0.f)
+            );
+            unsigned int afterIndex = static_cast<unsigned int>(
+                glm::min(t1 + 1.f, _interpolation.value.maxValue() - 1.f)
+            );
+
+            const Dataset::Entry& e00 = _dataset.entries[beforeIndex * _nDataPoints + i];
+            const Dataset::Entry& e11 = _dataset.entries[afterIndex * _nDataPoints + i];
+            glm::dvec3 positionBefore = transformedPosition(e00);
+            glm::dvec3 positionAfter = transformedPosition(e11);
+
+            for (int j = 0; j < 3; ++j) {
+                result.push_back(static_cast<float>(positionBefore[j]));
+            }
+
+            for (int j = 0; j < 3; ++j) {
+                result.push_back(static_cast<float>(positionAfter[j]));
+            }
+        }
+
+        // Colors
+        if (_hasColorMapFile) {
+            result.push_back(e0.data[colorParamIndex]);
+            result.push_back(e1.data[colorParamIndex]);
+        }
+
+        // Size data
+        if (_hasDatavarSize) {
+            // @TODO: Consider more detailed control over the scaling. Currently the value
+            // is multiplied with the value as is. Should have similar mapping properties
+            // as the color mapping
+            result.push_back(e0.data[sizeParamIndex]);
+            result.push_back(e1.data[sizeParamIndex]);
+        }
+
+        // @TODO: Also need to update label positions, if we have created labels from the dataset
+        // And make sure these are created from only the first set of points..
+    }
+    setBoundingSphere(maxRadius);
+    return result;
+}
+
+void RenderableInterpolatedPoints::initializeBufferData() {
+    if (_vao == 0) {
+        glGenVertexArrays(1, &_vao);
+        LDEBUG(fmt::format("Generating Vertex Array id '{}'", _vao));
+    }
+    if (_vbo == 0) {
+        glGenBuffers(1, &_vbo);
+        LDEBUG(fmt::format("Generating Vertex Buffer Object id '{}'", _vbo));
+    }
+
+    const int attibutesPerPoint = nAttributesPerPoint();
+    const unsigned int bufferSize = attibutesPerPoint * _nDataPoints * sizeof(float);
+
+    // Allocate the memory for the buffer (we will want to upload the data quite often)
+    glBindVertexArray(_vao);
+    glBindBuffer(GL_ARRAY_BUFFER, _vbo);
+    glBufferData(GL_ARRAY_BUFFER, bufferSize, nullptr, GL_DYNAMIC_DRAW);
+
+    int attributeOffset = 0;
+
+    auto addFloatAttribute = [&](const std::string& name, GLint nValues) {
+        GLint attrib = _program->attributeLocation(name);
+        glEnableVertexAttribArray(attrib);
+        glVertexAttribPointer(
+            attrib,
+            nValues,
+            GL_FLOAT,
+            GL_FALSE,
+            attibutesPerPoint * sizeof(float),
+            (attributeOffset > 0) ?
+                reinterpret_cast<void*>(attributeOffset * sizeof(float)) :
+                nullptr
+        );
+        attributeOffset += nValues;
+    };
+
+    addFloatAttribute("in_position0", 3);
+    addFloatAttribute("in_position1", 3);
+
+    if (_interpolation.useSpline) {
+        addFloatAttribute("in_position_before", 3);
+        addFloatAttribute("in_position_after", 3);
+    }
+
+    if (_hasColorMapFile) {
+        addFloatAttribute("in_colorParameter0", 1);
+        addFloatAttribute("in_colorParameter1", 1);
+    }
+
+    if (_hasDatavarSize) {
+        addFloatAttribute("in_scalingParameter0", 1);
+        addFloatAttribute("in_scalingParameter1", 1);
+    }
+
+    glBindVertexArray(0);
+}
+
+void RenderableInterpolatedPoints::updateBufferData() {
+    if (!_hasDataFile || _dataset.entries.empty()) {
+        return;
+    }
+
+    ZoneScopedN("Data dirty");
+    TracyGpuZone("Data dirty");
+    LDEBUG("Regenerating data");
+
+    // Regenerate data and update buffer
+    std::vector<float> slice = createDataSlice();
+
+    glBindVertexArray(_vao);
+    glBindBuffer(GL_ARRAY_BUFFER, _vbo);
+    glBufferSubData(GL_ARRAY_BUFFER, 0, slice.size() * sizeof(float), slice.data());
+
+    glBindVertexArray(0);
+
+    _dataIsDirty = false;
+}
+
+bool RenderableInterpolatedPoints::isAtKnot() const {
+    float v = _interpolation.value;
+    return (v - glm::floor(v)) < std::numeric_limits<float>::epsilon();
+}
+
+float RenderableInterpolatedPoints::computeCurrentLowerValue() const {
+    float t0 = glm::floor(_interpolation.value);
+
+    if (isAtKnot()) {
+        t0 = t0 - 1.f;
+    }
+
+    const float maxTValue = _interpolation.value.maxValue();
+    float maxAllowedT0 = glm::max(maxTValue - 1.f, 0.f);
+    t0 = glm::clamp(t0, 0.f, maxAllowedT0);
+    return t0;
+}
+
+} // namespace openspace
diff --git a/modules/base/rendering/pointcloud/renderableinterpolatedpoints.h b/modules/base/rendering/pointcloud/renderableinterpolatedpoints.h
new file mode 100644
index 0000000000..23d0a479db
--- /dev/null
+++ b/modules/base/rendering/pointcloud/renderableinterpolatedpoints.h
@@ -0,0 +1,100 @@
+/*****************************************************************************************
+ *                                                                                       *
+ * OpenSpace                                                                             *
+ *                                                                                       *
+ * Copyright (c) 2014-2023                                                               *
+ *                                                                                       *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
+ * software and associated documentation files (the "Software"), to deal in the Software *
+ * without restriction, including without limitation the rights to use, copy, modify,    *
+ * merge, publish, distribute, sublicense, and/or sell copies of the Software, and to    *
+ * permit persons to whom the Software is furnished to do so, subject to the following   *
+ * conditions:                                                                           *
+ *                                                                                       *
+ * The above copyright notice and this permission notice shall be included in all copies *
+ * or substantial portions of the Software.                                              *
+ *                                                                                       *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED,   *
+ * INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A         *
+ * PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT    *
+ * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF  *
+ * CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE  *
+ * OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                                         *
+ ****************************************************************************************/
+
+#ifndef __OPENSPACE_MODULE_BASE___RENDERABLEINTERPOLATEDPOINTS___H__
+#define __OPENSPACE_MODULE_BASE___RENDERABLEINTERPOLATEDPOINTS___H__
+
+#include <modules/base/rendering/pointcloud/renderablepointcloud.h>
+
+#include <openspace/properties/scalar/boolproperty.h>
+#include <openspace/properties/scalar/floatproperty.h>
+#include <openspace/properties/scalar/uintproperty.h>
+#include <openspace/properties/triggerproperty.h>
+
+namespace ghoul::opengl { class Texture; }
+
+namespace openspace {
+
+namespace documentation { struct Documentation; }
+
+/**
+ * A specialization of the RenderablePointCloud that supports interpolation beetween
+ * different positions for the points.
+ */
+class RenderableInterpolatedPoints : public RenderablePointCloud {
+public:
+    explicit RenderableInterpolatedPoints(const ghoul::Dictionary& dictionary);
+    ~RenderableInterpolatedPoints() override = default;
+
+    static documentation::Documentation Documentation();
+
+protected:
+    void initializeShadersAndGlExtras() override;
+    void deinitializeShaders() override;
+    void bindDataForPointRendering() override;
+    void preUpdate() override;
+
+    int nAttributesPerPoint() const override;
+
+    /**
+     * Create the data slice to use for rendering the points. Compared to the regular
+     * point cloud, the data slice for an interpolated set of points will have to be
+     * recreated when the interpolation value changes, and will only include a subset of
+     * the points in the entire dataset
+     *
+     * \return The dataslice to use for rendering the points
+     */
+    std::vector<float> createDataSlice() override;
+
+    void initializeBufferData();
+    void updateBufferData() override;
+
+private:
+    bool isAtKnot() const;
+    float computeCurrentLowerValue() const;
+
+    struct Interpolation : public properties::PropertyOwner {
+        Interpolation();
+        properties::FloatProperty value;
+        properties::UIntProperty nSteps;
+
+        properties::TriggerProperty goToNextStep;
+        properties::TriggerProperty goToPrevStep;
+        properties::TriggerProperty interpolateToNextStep;
+        properties::TriggerProperty interpolateToPrevStep;
+        properties::TriggerProperty interpolateToEnd;
+        properties::TriggerProperty interpolateToStart;
+        properties::FloatProperty speed;
+
+        properties::BoolProperty useSpline;
+    };
+    Interpolation _interpolation;
+
+    float _prevInterpolationValue = 0.f;
+    bool _shouldReinitializeBufferdata = false;
+};
+
+} // namespace openspace
+
+#endif // __OPENSPACE_MODULE_BASE___RENDERABLEINTERPOLATEDPOINTS___H__
diff --git a/modules/base/rendering/pointcloud/renderablepointcloud.cpp b/modules/base/rendering/pointcloud/renderablepointcloud.cpp
index 6c8e08031f..f7ededdb66 100644
--- a/modules/base/rendering/pointcloud/renderablepointcloud.cpp
+++ b/modules/base/rendering/pointcloud/renderablepointcloud.cpp
@@ -628,17 +628,7 @@ void RenderablePointCloud::initialize() {
 void RenderablePointCloud::initializeGL() {
     ZoneScoped;
 
-    _program = BaseModule::ProgramObjectManager.request(
-        "RenderablePointCloud",
-        []() {
-            return global::renderEngine->buildRenderProgram(
-                "RenderablePointCloud",
-                absPath("${MODULE_BASE}/shaders/billboardpoint_vs.glsl"),
-                absPath("${MODULE_BASE}/shaders/billboardpoint_fs.glsl"),
-                absPath("${MODULE_BASE}/shaders/billboardpoint_gs.glsl")
-            );
-        }
-    );
+    initializeShadersAndGlExtras();
 
     ghoul::opengl::updateUniformLocations(*_program, _uniformCache, UniformNames);
 
@@ -653,6 +643,27 @@ void RenderablePointCloud::deinitializeGL() {
     glDeleteVertexArrays(1, &_vao);
     _vao = 0;
 
+    deinitializeShaders();
+
+    BaseModule::TextureManager.release(_spriteTexture);
+    _spriteTexture = nullptr;
+}
+
+void RenderablePointCloud::initializeShadersAndGlExtras() {
+    _program = BaseModule::ProgramObjectManager.request(
+        "RenderablePointCloud",
+        []() {
+            return global::renderEngine->buildRenderProgram(
+                "RenderablePointCloud",
+                absPath("${MODULE_BASE}/shaders/pointcloud/billboardpoint_vs.glsl"),
+                absPath("${MODULE_BASE}/shaders/pointcloud/billboardpoint_fs.glsl"),
+                absPath("${MODULE_BASE}/shaders/pointcloud/billboardpoint_gs.glsl")
+            );
+        }
+    );
+}
+
+void RenderablePointCloud::deinitializeShaders() {
     BaseModule::ProgramObjectManager.release(
         "RenderablePointCloud",
         [](ghoul::opengl::ProgramObject* p) {
@@ -660,9 +671,6 @@ void RenderablePointCloud::deinitializeGL() {
         }
     );
     _program = nullptr;
-
-    BaseModule::TextureManager.release(_spriteTexture);
-    _spriteTexture = nullptr;
 }
 
 void RenderablePointCloud::bindTextureForRendering() const {
@@ -699,51 +707,8 @@ float RenderablePointCloud::computeDistanceFadeValue(const RenderData& data) con
     return fadeValue * funcValue;
 }
 
-void RenderablePointCloud::renderBillboards(const RenderData& data,
-                                            const glm::dmat4& modelMatrix,
-                                            const glm::dvec3& orthoRight,
-                                            const glm::dvec3& orthoUp,
-                                            float fadeInVariable)
-{
-    if (!_hasDataFile || _dataset.entries.empty()) {
-        return;
-    }
-
-    glEnablei(GL_BLEND, 0);
-
-    if (_useAdditiveBlending) {
-        glDepthMask(false);
-        glBlendFunc(GL_SRC_ALPHA, GL_ONE);
-    }
-    else {
-        // Normal blending, with transparency
-        glDepthMask(true);
-        glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
-    }
-
-    _program->activate();
-
-    _program->setUniform(_uniformCache.cameraPos, data.camera.positionVec3());
-    _program->setUniform(
-        _uniformCache.cameraLookup,
-        glm::vec3(data.camera.lookUpVectorWorldSpace())
-    );
+void RenderablePointCloud::bindDataForPointRendering() {
     _program->setUniform(_uniformCache.renderOption, _renderOption.value());
-    _program->setUniform(_uniformCache.modelMatrix, modelMatrix);
-
-    _program->setUniform(
-        _uniformCache.cameraViewMatrix,
-        data.camera.combinedViewMatrix()
-    );
-
-    _program->setUniform(
-        _uniformCache.projectionMatrix,
-        glm::dmat4(data.camera.projectionMatrix())
-    );
-
-    _program->setUniform(_uniformCache.up, glm::vec3(orthoUp));
-    _program->setUniform(_uniformCache.right, glm::vec3(orthoRight));
-    _program->setUniform(_uniformCache.fadeInValue, fadeInVariable);
     _program->setUniform(_uniformCache.opacity, opacity());
 
     _program->setUniform(_uniformCache.scaleExponent, _sizeSettings.scaleExponent);
@@ -811,9 +776,58 @@ void RenderablePointCloud::renderBillboards(const RenderData& data,
             _colorSettings.colorMapping->useBelowRangeColor
         );
     }
+}
+
+void RenderablePointCloud::renderBillboards(const RenderData& data,
+                                            const glm::dmat4& modelMatrix,
+                                            const glm::dvec3& orthoRight,
+                                            const glm::dvec3& orthoUp,
+                                            float fadeInVariable)
+{
+    if (!_hasDataFile || _dataset.entries.empty()) {
+        return;
+    }
+
+    glEnablei(GL_BLEND, 0);
+
+    if (_useAdditiveBlending) {
+        glDepthMask(false);
+        glBlendFunc(GL_SRC_ALPHA, GL_ONE);
+    }
+    else {
+        // Normal blending, with transparency
+        glDepthMask(true);
+        glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
+    }
+
+    _program->activate();
+
+    _program->setUniform(_uniformCache.cameraPos, data.camera.positionVec3());
+    _program->setUniform(
+        _uniformCache.cameraLookup,
+        glm::vec3(data.camera.lookUpVectorWorldSpace())
+    );
+    _program->setUniform(_uniformCache.renderOption, _renderOption.value());
+    _program->setUniform(_uniformCache.modelMatrix, modelMatrix);
+
+    _program->setUniform(
+        _uniformCache.cameraViewMatrix,
+        data.camera.combinedViewMatrix()
+    );
+
+    _program->setUniform(
+        _uniformCache.projectionMatrix,
+        glm::dmat4(data.camera.projectionMatrix())
+    );
+
+    _program->setUniform(_uniformCache.up, glm::vec3(orthoUp));
+    _program->setUniform(_uniformCache.right, glm::vec3(orthoRight));
+    _program->setUniform(_uniformCache.fadeInValue, fadeInVariable);
+
+    bindDataForPointRendering();
 
     glBindVertexArray(_vao);
-    glDrawArrays(GL_POINTS, 0, static_cast<GLsizei>(_dataset.entries.size()));
+    glDrawArrays(GL_POINTS, 0, static_cast<GLsizei>(_nDataPoints));
     glBindVertexArray(0);
     _program->deactivate();
 
@@ -857,9 +871,13 @@ void RenderablePointCloud::render(const RenderData& data, RendererTasks&) {
     }
 }
 
+void RenderablePointCloud::preUpdate() {}
+
 void RenderablePointCloud::update(const UpdateData&) {
     ZoneScoped;
 
+    preUpdate();
+
     if (_dataIsDirty) {
         updateBufferData();
     }
@@ -869,8 +887,16 @@ void RenderablePointCloud::update(const UpdateData&) {
     }
 }
 
+glm::dvec3 RenderablePointCloud::transformedPosition(
+                                                const dataloader::Dataset::Entry& e) const
+{
+    const double unitMeter = toMeter(_unit);
+    glm::dvec4 position = glm::dvec4(glm::dvec3(e.position) * unitMeter, 1.0);
+    return glm::dvec3(_transformationMatrix * position);
+}
+
 int RenderablePointCloud::nAttributesPerPoint() const {
-    int n = 4; // position
+    int n = 3; // position
     n += _hasColorMapFile ? 1 : 0;
     n += _hasDatavarSize ? 1 : 0;
     return n;
@@ -909,13 +935,13 @@ void RenderablePointCloud::updateBufferData() {
     glEnableVertexAttribArray(positionAttrib);
     glVertexAttribPointer(
         positionAttrib,
-        4,
+        3,
         GL_FLOAT,
         GL_FALSE,
         attibutesPerPoint * sizeof(float),
         nullptr
     );
-    attributeOffset += 4;
+    attributeOffset += 3;
 
     if (_hasColorMapFile) {
         GLint colorParamAttrib = _program->attributeLocation("in_colorParameter");
@@ -1022,24 +1048,20 @@ std::vector<float> RenderablePointCloud::createDataSlice() {
     int sizeParamIndex = currentSizeParameterIndex();
 
     double maxRadius = 0.0;
-    double biggestCoord = -1.0;
 
     for (const dataloader::Dataset::Entry& e : _dataset.entries) {
-        const double unitMeter = toMeter(_unit);
-        glm::dvec4 position = glm::dvec4(glm::dvec3(e.position) * unitMeter, 1.0);
-        position = _transformationMatrix * position;
+        glm::dvec3 position = transformedPosition(e);
 
         const double r = glm::length(position);
         maxRadius = std::max(maxRadius, r);
 
         // Positions
-        for (int j = 0; j < 4; ++j) {
+        for (int j = 0; j < 3; ++j) {
             result.push_back(static_cast<float>(position[j]));
         }
 
         // Colors
         if (_hasColorMapFile) {
-            biggestCoord = std::max(biggestCoord, glm::compMax(position));
             result.push_back(e.data[colorParamIndex]);
         }
 
diff --git a/modules/base/rendering/pointcloud/renderablepointcloud.h b/modules/base/rendering/pointcloud/renderablepointcloud.h
index ab51cfe2d9..630678b3b8 100644
--- a/modules/base/rendering/pointcloud/renderablepointcloud.h
+++ b/modules/base/rendering/pointcloud/renderablepointcloud.h
@@ -74,8 +74,16 @@ public:
     static documentation::Documentation Documentation();
 
 protected:
-    int nAttributesPerPoint() const;
-    void updateBufferData();
+    virtual void initializeShadersAndGlExtras();
+    virtual void deinitializeShaders();
+    virtual void bindDataForPointRendering();
+    virtual void preUpdate();
+
+    glm::dvec3 transformedPosition(const dataloader::Dataset::Entry& e) const;
+
+    virtual int nAttributesPerPoint() const;
+
+    virtual void updateBufferData();
     void updateSpriteTexture();
 
     /// Find the index of the currently chosen color parameter in the dataset
@@ -83,7 +91,7 @@ protected:
     /// Find the index of the currently chosen size parameter in the dataset
     int currentSizeParameterIndex() const;
 
-    std::vector<float> createDataSlice();
+    virtual std::vector<float> createDataSlice();
 
     virtual void bindTextureForRendering() const;
 
diff --git a/modules/base/shaders/billboardpoint_fs.glsl b/modules/base/shaders/pointcloud/billboardpoint_fs.glsl
similarity index 100%
rename from modules/base/shaders/billboardpoint_fs.glsl
rename to modules/base/shaders/pointcloud/billboardpoint_fs.glsl
diff --git a/modules/base/shaders/billboardpoint_gs.glsl b/modules/base/shaders/pointcloud/billboardpoint_gs.glsl
similarity index 100%
rename from modules/base/shaders/billboardpoint_gs.glsl
rename to modules/base/shaders/pointcloud/billboardpoint_gs.glsl
diff --git a/modules/base/shaders/pointcloud/billboardpoint_interpolated_vs.glsl b/modules/base/shaders/pointcloud/billboardpoint_interpolated_vs.glsl
new file mode 100644
index 0000000000..494b096e2f
--- /dev/null
+++ b/modules/base/shaders/pointcloud/billboardpoint_interpolated_vs.glsl
@@ -0,0 +1,91 @@
+/*****************************************************************************************
+ *                                                                                       *
+ * OpenSpace                                                                             *
+ *                                                                                       *
+ * Copyright (c) 2014-2023                                                               *
+ *                                                                                       *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
+ * software and associated documentation files (the "Software"), to deal in the Software *
+ * without restriction, including without limitation the rights to use, copy, modify,    *
+ * merge, publish, distribute, sublicense, and/or sell copies of the Software, and to    *
+ * permit persons to whom the Software is furnished to do so, subject to the following   *
+ * conditions:                                                                           *
+ *                                                                                       *
+ * The above copyright notice and this permission notice shall be included in all copies *
+ * or substantial portions of the Software.                                              *
+ *                                                                                       *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED,   *
+ * INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A         *
+ * PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT    *
+ * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF  *
+ * CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE  *
+ * OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                                         *
+ ****************************************************************************************/
+
+#version __CONTEXT__
+
+#include "PowerScaling/powerScaling_vs.hglsl"
+
+in vec3 in_position0;
+in vec3 in_position1;
+
+// Only used if spline interpolation is desired
+in vec3 in_position_before;
+in vec3 in_position_after;
+
+in float in_colorParameter0;
+in float in_colorParameter1;
+in float in_scalingParameter0;
+in float in_scalingParameter1;
+
+uniform bool useSpline;
+uniform float interpolationValue;
+
+flat out float colorParameter;
+flat out float scalingParameter;
+
+float interpolateDataValue(float v0, float v1, float t) {
+  const float Epsilon = 1E-7;
+  const float NaN = log(-1.0); // undefined
+  // To make sure we render values at knots with neighboring missing values,
+  // check 0 and 1 expicitly
+  if (abs(t) < Epsilon) {
+      return v0;
+  }
+  if (abs(1.0 - t) < Epsilon) {
+      return v1;
+  }
+  bool isMissing = isnan(v0) || isnan(v1);
+  return isMissing ? NaN : mix(v0, v1, t);
+}
+
+vec3 interpolateCatmullRom(float t, vec3 p0, vec3 p1, vec3 p2, vec3 p3) {
+    float t2 = t * t;
+    float t3 = t2 * t;
+    return 0.5 * (
+        2.0 * p1 +
+        t * (p2 - p0) +
+        t2 * (2.0 * p0 - 5.0 * p1 + 4.0 * p2 - p3) +
+        t3 * (3.0 * p1 - p0  - 3.0 * p2 + p3)
+    );
+}
+
+void main() {
+  float t = interpolationValue;
+
+  colorParameter = interpolateDataValue(in_colorParameter0, in_colorParameter1, t);
+  scalingParameter = interpolateDataValue(in_scalingParameter0, in_scalingParameter1, t);
+
+  vec3 position = mix(in_position0, in_position1, t);
+  if (useSpline) {
+    position = interpolateCatmullRom(
+      t,
+      in_position_before,
+      in_position0,
+      in_position1,
+      in_position_after
+    );
+  }
+
+  gl_Position = vec4(position, 1.0);
+}
diff --git a/modules/base/shaders/billboardpoint_vs.glsl b/modules/base/shaders/pointcloud/billboardpoint_vs.glsl
similarity index 97%
rename from modules/base/shaders/billboardpoint_vs.glsl
rename to modules/base/shaders/pointcloud/billboardpoint_vs.glsl
index 35e8082b41..a92d569161 100644
--- a/modules/base/shaders/billboardpoint_vs.glsl
+++ b/modules/base/shaders/pointcloud/billboardpoint_vs.glsl
@@ -26,7 +26,7 @@
 
 #include "PowerScaling/powerScaling_vs.hglsl"
 
-in vec4 in_position;
+in vec3 in_position;
 in float in_colorParameter;
 in float in_scalingParameter;
 
@@ -36,5 +36,5 @@ flat out float scalingParameter;
 void main() {
   colorParameter = in_colorParameter;
   scalingParameter = in_scalingParameter;
-  gl_Position = in_position;
+  gl_Position = vec4(in_position, 1.0);
 }

From 2323a8ce508a71ae9b467a533b55d265f79b8d7e Mon Sep 17 00:00:00 2001
From: Emma Broman <emma.broman@liu.se>
Date: Mon, 5 Feb 2024 15:47:25 +0100
Subject: [PATCH 247/701] Issue/2985 - Add asset with default cmaps (#3004)

* Allow changing color map during runtime

* Stary building asset with colormaps (currently using local files)

* Add option to invert the color maps

* Remove final use of local viridis file in example and fix broken cmap update

* Use synced resource for colormap files

* Update advanced colormapping example

* Apply suggestions from code review

Co-authored-by: Alexander Bock <alexander.bock@liu.se>

* Update data/assets/util/default_colormaps.asset

* Capitalize first letter of exported keys, to be more consistent with rest of code base

---------

Co-authored-by: Alexander Bock <alexander.bock@liu.se>
---
 data/assets/examples/pointclouds/points.asset |   7 +-
 .../points_colormappingsettings.asset         |   7 +-
 .../pointclouds/points_datamapping.asset      |   3 +-
 data/assets/examples/pointclouds/viridis.cmap | 258 ------------------
 data/assets/util/default_colormaps.asset      | 199 ++++++++++++++
 .../rendering/colormappingcomponent.h         |   6 +
 .../pointcloud/renderablepointcloud.cpp       |  16 +-
 .../pointcloud/renderablepointcloud.h         |   1 +
 src/rendering/colormappingcomponent.cpp       |  39 ++-
 9 files changed, 268 insertions(+), 268 deletions(-)
 delete mode 100644 data/assets/examples/pointclouds/viridis.cmap
 create mode 100644 data/assets/util/default_colormaps.asset

diff --git a/data/assets/examples/pointclouds/points.asset b/data/assets/examples/pointclouds/points.asset
index 8007829406..b14f00906e 100644
--- a/data/assets/examples/pointclouds/points.asset
+++ b/data/assets/examples/pointclouds/points.asset
@@ -1,4 +1,5 @@
 local earthAsset = asset.require("scene/solarsystem/planets/earth/earth")
+local colormaps = asset.require("util/default_colormaps")
 
 
 
@@ -66,7 +67,7 @@ local ColorMapped_FixedSize = {
     File = asset.resource("data/dummydata.csv"),
     Coloring = {
       ColorMapping = {
-        File = asset.resource("viridis.cmap")
+        File = colormaps.Uniform.Viridis
       }
     },
     SizeSettings = {
@@ -144,7 +145,7 @@ local Textured = {
         -- Disable color map per default. When enabled, the texture color will be
         -- multiplied with the color from the color map
         Enabled = false,
-        File = asset.resource("viridis.cmap")
+        File = colormaps.Uniform.Viridis
       }
     }
   },
@@ -175,7 +176,7 @@ local ColorMappedAdvanced_NoBlend = {
     UseAdditiveBlending = false, -- Disable additive blending
     Coloring = {
       ColorMapping = {
-        File = asset.resource("viridis.cmap"),
+        File = colormaps.Uniform.Viridis,
         ParameterOptions = {
           { Key = "number_withNan" }, -- no range => compute min and max
           { Key = "normaldist_withMissing", Range = { -0.5, 0.5 } }
diff --git a/data/assets/examples/pointclouds/points_colormappingsettings.asset b/data/assets/examples/pointclouds/points_colormappingsettings.asset
index 83ca91f125..c8e59ec27b 100644
--- a/data/assets/examples/pointclouds/points_colormappingsettings.asset
+++ b/data/assets/examples/pointclouds/points_colormappingsettings.asset
@@ -1,4 +1,5 @@
 local earthAsset = asset.require("scene/solarsystem/planets/earth/earth")
+local colormaps = asset.require("util/default_colormaps")
 
 
 
@@ -10,7 +11,11 @@ local Example = {
     File = asset.resource("data/dummydata.csv"),
     Coloring = {
       ColorMapping = {
-        File = asset.resource("viridis.cmap"),
+        -- Use white-to-black color map
+        File = colormaps.Sequential.Greys,
+        -- Invert the color map so it goes from dark to bright (black-to-white) instead
+        -- of from bright to dark
+        Invert = true,
         -- Set the default choice of parameter and value range explicitly. Values
         -- outside this range will be given special colors
         Parameter = "normaldist_withMissing",
diff --git a/data/assets/examples/pointclouds/points_datamapping.asset b/data/assets/examples/pointclouds/points_datamapping.asset
index 791e945257..f7b5f3d765 100644
--- a/data/assets/examples/pointclouds/points_datamapping.asset
+++ b/data/assets/examples/pointclouds/points_datamapping.asset
@@ -1,4 +1,5 @@
 local earthAsset = asset.require("scene/solarsystem/planets/earth/earth")
+local colormaps = asset.require("util/default_colormaps")
 
 
 
@@ -29,7 +30,7 @@ local Example = {
     -- missing data values in a specific color
     Coloring = {
       ColorMapping = {
-        File = asset.resource("viridis.cmap"),
+        File = colormaps.Uniform.Magma,
         ShowMissingData = true,
         NoDataColor = { 1.0, 0.0, 0.0, 1.0 }
       }
diff --git a/data/assets/examples/pointclouds/viridis.cmap b/data/assets/examples/pointclouds/viridis.cmap
deleted file mode 100644
index 2c00fba35d..0000000000
--- a/data/assets/examples/pointclouds/viridis.cmap
+++ /dev/null
@@ -1,258 +0,0 @@
-# Viridis Color map
-256
-0.267004 0.004874 0.329415 1.000000
-0.268510 0.009605 0.335427 1.000000
-0.269944 0.014625 0.341379 1.000000
-0.271305 0.019942 0.347269 1.000000
-0.272594 0.025563 0.353093 1.000000
-0.273809 0.031497 0.358853 1.000000
-0.274952 0.037752 0.364543 1.000000
-0.276022 0.044167 0.370164 1.000000
-0.277018 0.050344 0.375715 1.000000
-0.277941 0.056324 0.381191 1.000000
-0.278791 0.062145 0.386592 1.000000
-0.279566 0.067836 0.391917 1.000000
-0.280267 0.073417 0.397163 1.000000
-0.280894 0.078907 0.402329 1.000000
-0.281446 0.084320 0.407414 1.000000
-0.281924 0.089666 0.412415 1.000000
-0.282327 0.094955 0.417331 1.000000
-0.282656 0.100196 0.422160 1.000000
-0.282910 0.105393 0.426902 1.000000
-0.283091 0.110553 0.431554 1.000000
-0.283197 0.115680 0.436115 1.000000
-0.283229 0.120777 0.440584 1.000000
-0.283187 0.125848 0.444960 1.000000
-0.283072 0.130895 0.449241 1.000000
-0.282884 0.135920 0.453427 1.000000
-0.282623 0.140926 0.457517 1.000000
-0.282290 0.145912 0.461510 1.000000
-0.281887 0.150881 0.465405 1.000000
-0.281412 0.155834 0.469201 1.000000
-0.280868 0.160771 0.472899 1.000000
-0.280255 0.165693 0.476498 1.000000
-0.279574 0.170599 0.479997 1.000000
-0.278826 0.175490 0.483397 1.000000
-0.278012 0.180367 0.486697 1.000000
-0.277134 0.185228 0.489898 1.000000
-0.276194 0.190074 0.493001 1.000000
-0.275191 0.194905 0.496005 1.000000
-0.274128 0.199721 0.498911 1.000000
-0.273006 0.204520 0.501721 1.000000
-0.271828 0.209303 0.504434 1.000000
-0.270595 0.214069 0.507052 1.000000
-0.269308 0.218818 0.509577 1.000000
-0.267968 0.223549 0.512008 1.000000
-0.266580 0.228262 0.514349 1.000000
-0.265145 0.232956 0.516599 1.000000
-0.263663 0.237631 0.518762 1.000000
-0.262138 0.242286 0.520837 1.000000
-0.260571 0.246922 0.522828 1.000000
-0.258965 0.251537 0.524736 1.000000
-0.257322 0.256130 0.526563 1.000000
-0.255645 0.260703 0.528312 1.000000
-0.253935 0.265254 0.529983 1.000000
-0.252194 0.269783 0.531579 1.000000
-0.250425 0.274290 0.533103 1.000000
-0.248629 0.278775 0.534556 1.000000
-0.246811 0.283237 0.535941 1.000000
-0.244972 0.287675 0.537260 1.000000
-0.243113 0.292092 0.538516 1.000000
-0.241237 0.296485 0.539709 1.000000
-0.239346 0.300855 0.540844 1.000000
-0.237441 0.305202 0.541921 1.000000
-0.235526 0.309527 0.542944 1.000000
-0.233603 0.313828 0.543914 1.000000
-0.231674 0.318106 0.544834 1.000000
-0.229739 0.322361 0.545706 1.000000
-0.227802 0.326594 0.546532 1.000000
-0.225863 0.330805 0.547314 1.000000
-0.223925 0.334994 0.548053 1.000000
-0.221989 0.339161 0.548752 1.000000
-0.220057 0.343307 0.549413 1.000000
-0.218130 0.347432 0.550038 1.000000
-0.216210 0.351535 0.550627 1.000000
-0.214298 0.355619 0.551184 1.000000
-0.212395 0.359683 0.551710 1.000000
-0.210503 0.363727 0.552206 1.000000
-0.208623 0.367752 0.552675 1.000000
-0.206756 0.371758 0.553117 1.000000
-0.204903 0.375746 0.553533 1.000000
-0.203063 0.379716 0.553925 1.000000
-0.201239 0.383670 0.554294 1.000000
-0.199430 0.387607 0.554642 1.000000
-0.197636 0.391528 0.554969 1.000000
-0.195860 0.395433 0.555276 1.000000
-0.194100 0.399323 0.555565 1.000000
-0.192357 0.403199 0.555836 1.000000
-0.190631 0.407061 0.556089 1.000000
-0.188923 0.410910 0.556326 1.000000
-0.187231 0.414746 0.556547 1.000000
-0.185556 0.418570 0.556753 1.000000
-0.183898 0.422383 0.556944 1.000000
-0.182256 0.426184 0.557120 1.000000
-0.180629 0.429975 0.557282 1.000000
-0.179019 0.433756 0.557430 1.000000
-0.177423 0.437527 0.557565 1.000000
-0.175841 0.441290 0.557685 1.000000
-0.174274 0.445044 0.557792 1.000000
-0.172719 0.448791 0.557885 1.000000
-0.171176 0.452530 0.557965 1.000000
-0.169646 0.456262 0.558030 1.000000
-0.168126 0.459988 0.558082 1.000000
-0.166617 0.463708 0.558119 1.000000
-0.165117 0.467423 0.558141 1.000000
-0.163625 0.471133 0.558148 1.000000
-0.162142 0.474838 0.558140 1.000000
-0.160665 0.478540 0.558115 1.000000
-0.159194 0.482237 0.558073 1.000000
-0.157729 0.485932 0.558013 1.000000
-0.156270 0.489624 0.557936 1.000000
-0.154815 0.493313 0.557840 1.000000
-0.153364 0.497000 0.557724 1.000000
-0.151918 0.500685 0.557587 1.000000
-0.150476 0.504369 0.557430 1.000000
-0.149039 0.508051 0.557250 1.000000
-0.147607 0.511733 0.557049 1.000000
-0.146180 0.515413 0.556823 1.000000
-0.144759 0.519093 0.556572 1.000000
-0.143343 0.522773 0.556295 1.000000
-0.141935 0.526453 0.555991 1.000000
-0.140536 0.530132 0.555659 1.000000
-0.139147 0.533812 0.555298 1.000000
-0.137770 0.537492 0.554906 1.000000
-0.136408 0.541173 0.554483 1.000000
-0.135066 0.544853 0.554029 1.000000
-0.133743 0.548535 0.553541 1.000000
-0.132444 0.552216 0.553018 1.000000
-0.131172 0.555899 0.552459 1.000000
-0.129933 0.559582 0.551864 1.000000
-0.128729 0.563265 0.551229 1.000000
-0.127568 0.566949 0.550556 1.000000
-0.126453 0.570633 0.549841 1.000000
-0.125394 0.574318 0.549086 1.000000
-0.124395 0.578002 0.548287 1.000000
-0.123463 0.581687 0.547445 1.000000
-0.122606 0.585371 0.546557 1.000000
-0.121831 0.589055 0.545623 1.000000
-0.121148 0.592739 0.544641 1.000000
-0.120565 0.596422 0.543611 1.000000
-0.120092 0.600104 0.542530 1.000000
-0.119738 0.603785 0.541400 1.000000
-0.119512 0.607464 0.540218 1.000000
-0.119423 0.611141 0.538982 1.000000
-0.119483 0.614817 0.537692 1.000000
-0.119699 0.618490 0.536347 1.000000
-0.120081 0.622161 0.534946 1.000000
-0.120638 0.625828 0.533488 1.000000
-0.121380 0.629492 0.531973 1.000000
-0.122312 0.633153 0.530398 1.000000
-0.123444 0.636809 0.528763 1.000000
-0.124780 0.640461 0.527068 1.000000
-0.126326 0.644107 0.525311 1.000000
-0.128087 0.647749 0.523491 1.000000
-0.130067 0.651384 0.521608 1.000000
-0.132268 0.655014 0.519661 1.000000
-0.134692 0.658636 0.517649 1.000000
-0.137339 0.662252 0.515571 1.000000
-0.140210 0.665859 0.513427 1.000000
-0.143303 0.669459 0.511215 1.000000
-0.146616 0.673050 0.508936 1.000000
-0.150148 0.676631 0.506589 1.000000
-0.153894 0.680203 0.504172 1.000000
-0.157851 0.683765 0.501686 1.000000
-0.162016 0.687316 0.499129 1.000000
-0.166383 0.690856 0.496502 1.000000
-0.170948 0.694384 0.493803 1.000000
-0.175707 0.697900 0.491033 1.000000
-0.180653 0.701402 0.488189 1.000000
-0.185783 0.704891 0.485273 1.000000
-0.191090 0.708366 0.482284 1.000000
-0.196571 0.711827 0.479221 1.000000
-0.202219 0.715272 0.476084 1.000000
-0.208030 0.718701 0.472873 1.000000
-0.214000 0.722114 0.469588 1.000000
-0.220124 0.725509 0.466226 1.000000
-0.226397 0.728888 0.462789 1.000000
-0.232815 0.732247 0.459277 1.000000
-0.239374 0.735588 0.455688 1.000000
-0.246070 0.738910 0.452024 1.000000
-0.252899 0.742211 0.448284 1.000000
-0.259857 0.745492 0.444467 1.000000
-0.266941 0.748751 0.440573 1.000000
-0.274149 0.751988 0.436601 1.000000
-0.281477 0.755203 0.432552 1.000000
-0.288921 0.758394 0.428426 1.000000
-0.296479 0.761561 0.424223 1.000000
-0.304148 0.764704 0.419943 1.000000
-0.311925 0.767822 0.415586 1.000000
-0.319809 0.770914 0.411152 1.000000
-0.327796 0.773980 0.406640 1.000000
-0.335885 0.777018 0.402049 1.000000
-0.344074 0.780029 0.397381 1.000000
-0.352360 0.783011 0.392636 1.000000
-0.360741 0.785964 0.387814 1.000000
-0.369214 0.788888 0.382914 1.000000
-0.377779 0.791781 0.377939 1.000000
-0.386433 0.794644 0.372886 1.000000
-0.395174 0.797475 0.367757 1.000000
-0.404001 0.800275 0.362552 1.000000
-0.412913 0.803041 0.357269 1.000000
-0.421908 0.805774 0.351910 1.000000
-0.430983 0.808473 0.346476 1.000000
-0.440137 0.811138 0.340967 1.000000
-0.449368 0.813768 0.335384 1.000000
-0.458674 0.816363 0.329727 1.000000
-0.468053 0.818921 0.323998 1.000000
-0.477504 0.821444 0.318195 1.000000
-0.487026 0.823929 0.312321 1.000000
-0.496615 0.826376 0.306377 1.000000
-0.506271 0.828786 0.300362 1.000000
-0.515992 0.831158 0.294279 1.000000
-0.525776 0.833491 0.288127 1.000000
-0.535621 0.835785 0.281908 1.000000
-0.545524 0.838039 0.275626 1.000000
-0.555484 0.840254 0.269281 1.000000
-0.565498 0.842430 0.262877 1.000000
-0.575563 0.844566 0.256415 1.000000
-0.585678 0.846661 0.249897 1.000000
-0.595839 0.848717 0.243329 1.000000
-0.606045 0.850733 0.236712 1.000000
-0.616293 0.852709 0.230052 1.000000
-0.626579 0.854645 0.223353 1.000000
-0.636902 0.856542 0.216620 1.000000
-0.647257 0.858400 0.209861 1.000000
-0.657642 0.860219 0.203082 1.000000
-0.668054 0.861999 0.196293 1.000000
-0.678489 0.863742 0.189503 1.000000
-0.688944 0.865448 0.182725 1.000000
-0.699415 0.867117 0.175971 1.000000
-0.709898 0.868751 0.169257 1.000000
-0.720391 0.870350 0.162603 1.000000
-0.730889 0.871916 0.156029 1.000000
-0.741388 0.873449 0.149561 1.000000
-0.751884 0.874951 0.143228 1.000000
-0.762373 0.876424 0.137064 1.000000
-0.772852 0.877868 0.131109 1.000000
-0.783315 0.879285 0.125405 1.000000
-0.793760 0.880678 0.120005 1.000000
-0.804182 0.882046 0.114965 1.000000
-0.814576 0.883393 0.110347 1.000000
-0.824940 0.884720 0.106217 1.000000
-0.835270 0.886029 0.102646 1.000000
-0.845561 0.887322 0.099702 1.000000
-0.855810 0.888601 0.097452 1.000000
-0.866013 0.889868 0.095953 1.000000
-0.876168 0.891125 0.095250 1.000000
-0.886271 0.892374 0.095374 1.000000
-0.896320 0.893616 0.096335 1.000000
-0.906311 0.894855 0.098125 1.000000
-0.916242 0.896091 0.100717 1.000000
-0.926106 0.897330 0.104071 1.000000
-0.935904 0.898570 0.108131 1.000000
-0.945636 0.899815 0.112838 1.000000
-0.955300 0.901065 0.118128 1.000000
-0.964894 0.902323 0.123941 1.000000
-0.974417 0.903590 0.130215 1.000000
-0.983868 0.904867 0.136897 1.000000
-0.993248 0.906157 0.143936 1.000000
diff --git a/data/assets/util/default_colormaps.asset b/data/assets/util/default_colormaps.asset
new file mode 100644
index 0000000000..175e65846f
--- /dev/null
+++ b/data/assets/util/default_colormaps.asset
@@ -0,0 +1,199 @@
+-- For detailed explanations about the categories and the color maps, please refer to
+-- source page from Matplotlib
+-- https://matplotlib.org/stable/users/explain/colors/colormaps.html
+
+
+-- Perceptually Uniform Sequental colormaps
+
+local uniform = asset.resource({
+  Name = "Perceptually Uniform Color Maps",
+  Type = "HttpSynchronization",
+  Identifier = "default_colormaps_uniform",
+  Version = 1
+})
+
+local Uniform = {
+  Viridis = uniform .. "viridis.cmap",
+  Plasma = uniform .. "plasma.cmap",
+  Inferno = uniform .. "inferno.cmap",
+  Magma = uniform .. "magma.cmap",
+  Cividis = uniform .. "cividis.cmap"
+}
+asset.export("Uniform", Uniform)
+
+
+-- Sequential maps, where the lightness value increases monotonically through the colormaps
+
+local sequential = asset.resource({
+  Name = "Sequential Color Maps",
+  Type = "HttpSynchronization",
+  Identifier = "default_colormaps_sequential",
+  Version = 1
+})
+
+local Sequential = {
+  Greys = sequential .. "Greys.cmap",
+  Purples = sequential .. "Purples.cmap",
+  Blues = sequential .. "Blues.cmap",
+  Greens = sequential .. "Greens.cmap",
+  Oranges = sequential .. "Oranges.cmap",
+  Reds = sequential .. "Reds.cmap",
+  YlOrBr = sequential .. "YlOrBr.cmap",
+  YlOrRd = sequential .. "YlOrRd.cmap",
+  OrRd = sequential .. "OrRd.cmap",
+  PuRd = sequential .. "PuRd.cmap",
+  RdPu = sequential .. "RdPu.cmap",
+  BuPu = sequential .. "BuPu.cmap",
+  GnBu = sequential .. "GnBu.cmap",
+  PuBu = sequential .. "PuBu.cmap",
+  YlGnBu = sequential .. "YlGnBu.cmap",
+  PuBuGn = sequential .. "PuBuGn.cmap",
+  BuGn = sequential .. "BuGn.cmap",
+  YlGn = sequential .. "YlGn.cmap"
+}
+asset.export("Sequential", Sequential)
+
+
+-- Sequential color maps where the lightness might plateu or go both up or down
+
+local sequential2 = asset.resource({
+  Name = "Sequential2 Color Maps",
+  Type = "HttpSynchronization",
+  Identifier = "default_colormaps_sequential2",
+  Version = 1
+})
+
+local Sequential2 = {
+  Binary = sequential2 .. "binary.cmap",
+  Gist_yarg = sequential2 .. "gist_yarg.cmap",
+  Gist_gray = sequential2 .. "gist_gray.cmap",
+  Gray = sequential2 .. "gray.cmap",
+  Bone = sequential2 .. "bone.cmap",
+  Pink = sequential2 .. "pink.cmap",
+  Spring = sequential2 .. "spring.cmap",
+  Summer = sequential2 .. "summer.cmap",
+  Autumn = sequential2 .. "autumn.cmap",
+  Winter = sequential2 .. "winter.cmap",
+  Cool = sequential2 .. "cool.cmap",
+  Wistia = sequential2 .. "Wistia.cmap",
+  Hot = sequential2 .. "hot.cmap",
+  Afmhot = sequential2 .. "afmhot.cmap",
+  Gist_heat = sequential2 .. "gist_heat.cmap",
+  Copper = sequential2 .. "copper.cmap"
+}
+asset.export("Sequential2", Sequential2)
+
+
+-- Diverging maps, with lightness monotonically increasing up to a maximum,
+-- followed by monotonically decreasing
+
+local diverging = asset.resource({
+  Name = "Diverging Color Maps",
+  Type = "HttpSynchronization",
+  Identifier = "default_colormaps_diverging",
+  Version = 1
+})
+
+local Diverging = {
+  PiYG = diverging .. "PiYG.cmap",
+  PRGn = diverging .. "PRGn.cmap",
+  BrBG = diverging .. "BrBG.cmap",
+  PuOr = diverging .. "PuOr.cmap",
+  RdGy = diverging .. "RdGy.cmap",
+  RdBu = diverging .. "RdBu.cmap",
+  RdYlBu = diverging .. "RdYlBu.cmap",
+  RdYlGn = diverging .. "RdYlGn.cmap",
+  Spectral = diverging .. "Spectral.cmap",
+  Coolwarm = diverging .. "coolwarm.cmap",
+  Bwr = diverging .. "bwr.cmap",
+  Seismic = diverging .. "seismic.cmap"
+}
+asset.export("Diverging", Diverging)
+
+
+-- Cyclic colormaps, that start and end on the same color, and meet a symmetric center
+-- point in the middle
+
+local cyclic = asset.resource({
+  Name = "Cyclic Color Maps",
+  Type = "HttpSynchronization",
+  Identifier = "default_colormaps_cyclic",
+  Version = 1
+})
+
+local Cyclic = {
+  Twilight = cyclic .. "twilight.cmap",
+  Twilight_shifted = cyclic .. "twilight_shifted.cmap",
+  Hsv = cyclic .. "hsv.cmap"
+}
+asset.export("Cyclic", Cyclic)
+
+
+-- Qualitative colormaps
+
+local qualitative = asset.resource({
+  Name = "Qualitative Color Maps",
+  Type = "HttpSynchronization",
+  Identifier = "default_colormaps_qualitative",
+  Version = 1
+})
+
+local Qualitative = {
+  Pastel1 = qualitative .. "Pastel1.cmap",
+  Pastel2 = qualitative .. "Pastel2.cmap",
+  Paired = qualitative .. "Paired.cmap",
+  Accent = qualitative .. "Accent.cmap",
+  Dark2 = qualitative .. "Dark2.cmap",
+  Set1 = qualitative .. "Set1.cmap",
+  Set2 = qualitative .. "Set2.cmap",
+  Set3 = qualitative .. "Set3.cmap",
+  Tab10 = qualitative .. "tab10.cmap",
+  Tab20 = qualitative .. "tab20.cmap",
+  Tab20b = qualitative .. "tab20b.cmap",
+  Tab20c = qualitative .. "tab20c.cmap"
+}
+asset.export("Qualitative", Qualitative)
+
+
+-- Miscellaneous colormaps
+
+local misc = asset.resource({
+  Name = "Miscellaneous Color Maps",
+  Type = "HttpSynchronization",
+  Identifier = "default_colormaps_misc",
+  Version = 1
+})
+
+local Misc = {
+  Flag = misc .. "flag.cmap",
+  Prism = misc .. "prism.cmap",
+  Ocean = misc .. "ocean.cmap",
+  Gist_earth = misc .. "gist_earth.cmap",
+  Terrain = misc .. "terrain.cmap",
+  Gist_stern = misc .. "gist_stern.cmap",
+  Gnuplot = misc .. "gnuplot.cmap",
+  Gnuplot2 = misc .. "gnuplot2.cmap",
+  CMRmap = misc .. "CMRmap.cmap",
+  Cubehelix = misc .. "cubehelix.cmap",
+  Brg = misc .. "brg.cmap",
+  Gist_rainbow = misc .. "gist_rainbow.cmap",
+  Rainbow = misc .. "rainbow.cmap",
+  Jet = misc .. "jet.cmap",
+  Turbo = misc .. "turbo.cmap",
+  Nipy_spectral = misc .. "nipy_spectral.cmap",
+  Gist_ncar = misc .. "gist_ncar.cmap"
+}
+asset.export("Misc", Misc)
+
+
+
+asset.meta = {
+  Name = "Default Color Maps",
+  Version = "1.0",
+  Description = [[Load a set of default color maps that can be used in other assets. The
+    color maps are created and categorized based on the ones in Matplotlib.
+    https://matplotlib.org/stable/users/explain/colors/colormaps.html]],
+  Author = "OpenSpace Team",
+  URL = "http://openspaceproject.com",
+  License = "MIT license"
+}
diff --git a/include/openspace/rendering/colormappingcomponent.h b/include/openspace/rendering/colormappingcomponent.h
index 60b9fb7868..fb80b16bbf 100644
--- a/include/openspace/rendering/colormappingcomponent.h
+++ b/include/openspace/rendering/colormappingcomponent.h
@@ -70,11 +70,14 @@ public:
      */
     void initializeTexture();
 
+    void update(const dataloader::Dataset& dataset);
+
     static documentation::Documentation Documentation();
 
     glm::vec4 colorFromColorMap(float value) const;
 
     properties::BoolProperty enabled;
+    properties::BoolProperty invert;
     properties::OptionProperty dataColumn;
     properties::StringProperty colorMapFile;
     properties::Vec2Property valueRange;
@@ -110,6 +113,9 @@ private:
     bool _hasNanColorInAsset = false;
     bool _hasBelowRangeColorInAsset = false;
     bool _hasAboveRangeColorInAsset = false;
+
+    bool _colorMapFileIsDirty = true;
+    bool _colorMapTextureIsDirty = true;
 };
 
 } // namespace openspace
diff --git a/modules/base/rendering/pointcloud/renderablepointcloud.cpp b/modules/base/rendering/pointcloud/renderablepointcloud.cpp
index f7ededdb66..faf19ebf15 100644
--- a/modules/base/rendering/pointcloud/renderablepointcloud.cpp
+++ b/modules/base/rendering/pointcloud/renderablepointcloud.cpp
@@ -30,6 +30,7 @@
 #include <openspace/engine/globals.h>
 #include <openspace/util/updatestructures.h>
 #include <openspace/rendering/renderengine.h>
+#include <ghoul/filesystem/file.h>
 #include <ghoul/filesystem/filesystem.h>
 #include <ghoul/glm.h>
 #include <ghoul/io/texture/texturereader.h>
@@ -559,6 +560,13 @@ RenderablePointCloud::RenderablePointCloud(const ghoul::Dictionary& dictionary)
                 parameterIndex
             );
         });
+
+        _colorSettings.colorMapping->colorMapFile.onChange([this]() {
+            _dataIsDirty = true;
+            _hasColorMapFile = std::filesystem::exists(
+                _colorSettings.colorMapping->colorMapFile.value()
+            );
+        });
     }
 
     if (_hasDataFile) {
@@ -631,10 +639,6 @@ void RenderablePointCloud::initializeGL() {
     initializeShadersAndGlExtras();
 
     ghoul::opengl::updateUniformLocations(*_program, _uniformCache, UniformNames);
-
-    if (_hasColorMapFile) {
-        _colorSettings.colorMapping->initializeTexture();
-    }
 }
 
 void RenderablePointCloud::deinitializeGL() {
@@ -878,6 +882,10 @@ void RenderablePointCloud::update(const UpdateData&) {
 
     preUpdate();
 
+    if (_hasColorMapFile) {
+        _colorSettings.colorMapping->update(_dataset);
+    }
+
     if (_dataIsDirty) {
         updateBufferData();
     }
diff --git a/modules/base/rendering/pointcloud/renderablepointcloud.h b/modules/base/rendering/pointcloud/renderablepointcloud.h
index 630678b3b8..500d1e0f22 100644
--- a/modules/base/rendering/pointcloud/renderablepointcloud.h
+++ b/modules/base/rendering/pointcloud/renderablepointcloud.h
@@ -102,6 +102,7 @@ protected:
 
     bool _dataIsDirty = true;
     bool _spriteTextureIsDirty = true;
+    bool _cmapIsDirty = true;
 
     bool _hasSpriteTexture = false;
     bool _hasDataFile = false;
diff --git a/src/rendering/colormappingcomponent.cpp b/src/rendering/colormappingcomponent.cpp
index e24c491ae4..f6aab11a98 100644
--- a/src/rendering/colormappingcomponent.cpp
+++ b/src/rendering/colormappingcomponent.cpp
@@ -143,6 +143,13 @@ namespace {
         openspace::properties::Property::Visibility::AdvancedUser
     };
 
+    constexpr openspace::properties::Property::PropertyInfo InvertColorMapInfo = {
+        "Invert",
+        "Invert Color Map",
+        "If true, the colors of the color map will be read in the inverse order",
+        openspace::properties::Property::Visibility::AdvancedUser
+    };
+
     struct [[codegen::Dictionary(ColorMappingComponent)]] Parameters {
         // [[codegen::verbatim(EnabledInfo.description)]]
         std::optional<bool> enabled;
@@ -192,6 +199,9 @@ namespace {
 
         // [[codegen::verbatim(BelowRangeColorInfo.description)]]
         std::optional<glm::vec4> belowRangeColor [[codegen::color()]];
+
+        // [[codegen::verbatim(InvertColorMapInfo.description)]]
+        std::optional<bool> invert;
     };
 #include "colormappingcomponent_codegen.cpp"
 }  // namespace
@@ -205,6 +215,7 @@ documentation::Documentation ColorMappingComponent::Documentation() {
 ColorMappingComponent::ColorMappingComponent()
     : properties::PropertyOwner({ "ColorMapping", "Color Mapping", "" })
     , enabled(EnabledInfo, true)
+    , invert(InvertColorMapInfo, false)
     , dataColumn(ParameterInfo, properties::OptionProperty::DisplayType::Dropdown)
     , colorMapFile(FileInfo)
     , valueRange(RangeInfo, glm::vec2(0.f))
@@ -228,9 +239,22 @@ ColorMappingComponent::ColorMappingComponent()
     addProperty(valueRange);
     addProperty(setRangeFromData);
 
-    colorMapFile.setReadOnly(true); // Currently this can't be changed
+    colorMapFile.onChange([this]() {
+        bool fileExists = std::filesystem::exists(colorMapFile.value());
+        if (!fileExists) {
+            LERROR(fmt::format("Could not find cmap file: '{}'", colorMapFile.value()));
+        }
+        _colorMapFileIsDirty = true;
+    });
     addProperty(colorMapFile);
 
+    invert.onChange([this]() {
+        // Invert the entries of the colormap
+        std::reverse(_colorMap.entries.begin(), _colorMap.entries.end());
+        _colorMapTextureIsDirty = true;
+    });
+    addProperty(invert);
+
     addProperty(hideOutsideRange);
     addProperty(useNanColor);
     nanColor.setViewOption(properties::Property::ViewOptions::Color);
@@ -360,6 +384,19 @@ void ColorMappingComponent::initializeTexture() {
     _texture->uploadTexture();
 }
 
+void ColorMappingComponent::update(const dataloader::Dataset& dataset) {
+    if (_colorMapFileIsDirty) {
+        initialize(dataset);
+        _colorMapTextureIsDirty = true;
+        _colorMapFileIsDirty = false;
+    }
+
+    if (_colorMapTextureIsDirty) {
+        initializeTexture();
+        _colorMapTextureIsDirty = false;
+    }
+}
+
 glm::vec4 ColorMappingComponent::colorFromColorMap(float valueToColorFrom) const {
     glm::vec2 currentColorRange = valueRange;
     float cmax = currentColorRange.y;

From 6e29d898cf6696768b40587cf9bff14987ddd569 Mon Sep 17 00:00:00 2001
From: Alexander Bock <alexander.bock@liu.se>
Date: Tue, 6 Feb 2024 15:53:24 +0100
Subject: [PATCH 248/701] Update copyright header

---
 apps/OpenSpace-MinVR/main.cpp                                 | 2 +-
 apps/OpenSpace/ext/launcher/include/filesystemaccess.h        | 2 +-
 apps/OpenSpace/ext/launcher/include/launcherwindow.h          | 2 +-
 apps/OpenSpace/ext/launcher/include/profile/actiondialog.h    | 2 +-
 .../ext/launcher/include/profile/additionalscriptsdialog.h    | 2 +-
 apps/OpenSpace/ext/launcher/include/profile/assetedit.h       | 2 +-
 apps/OpenSpace/ext/launcher/include/profile/assetsdialog.h    | 2 +-
 apps/OpenSpace/ext/launcher/include/profile/assettreeitem.h   | 2 +-
 apps/OpenSpace/ext/launcher/include/profile/assettreemodel.h  | 2 +-
 apps/OpenSpace/ext/launcher/include/profile/cameradialog.h    | 2 +-
 .../OpenSpace/ext/launcher/include/profile/deltatimesdialog.h | 2 +-
 apps/OpenSpace/ext/launcher/include/profile/horizonsdialog.h  | 2 +-
 apps/OpenSpace/ext/launcher/include/profile/line.h            | 2 +-
 apps/OpenSpace/ext/launcher/include/profile/marknodesdialog.h | 2 +-
 apps/OpenSpace/ext/launcher/include/profile/metadialog.h      | 2 +-
 apps/OpenSpace/ext/launcher/include/profile/modulesdialog.h   | 2 +-
 apps/OpenSpace/ext/launcher/include/profile/profileedit.h     | 2 +-
 .../OpenSpace/ext/launcher/include/profile/propertiesdialog.h | 2 +-
 apps/OpenSpace/ext/launcher/include/profile/scriptlogdialog.h | 2 +-
 apps/OpenSpace/ext/launcher/include/profile/timedialog.h      | 2 +-
 apps/OpenSpace/ext/launcher/include/settingsdialog.h          | 2 +-
 .../ext/launcher/include/sgctedit/displaywindowunion.h        | 2 +-
 apps/OpenSpace/ext/launcher/include/sgctedit/monitorbox.h     | 2 +-
 .../ext/launcher/include/sgctedit/orientationdialog.h         | 2 +-
 apps/OpenSpace/ext/launcher/include/sgctedit/settingswidget.h | 2 +-
 apps/OpenSpace/ext/launcher/include/sgctedit/sgctedit.h       | 2 +-
 apps/OpenSpace/ext/launcher/include/sgctedit/windowcontrol.h  | 2 +-
 apps/OpenSpace/ext/launcher/src/filesystemaccess.cpp          | 2 +-
 apps/OpenSpace/ext/launcher/src/launcherwindow.cpp            | 2 +-
 apps/OpenSpace/ext/launcher/src/profile/actiondialog.cpp      | 2 +-
 .../ext/launcher/src/profile/additionalscriptsdialog.cpp      | 2 +-
 apps/OpenSpace/ext/launcher/src/profile/assetedit.cpp         | 2 +-
 apps/OpenSpace/ext/launcher/src/profile/assetsdialog.cpp      | 2 +-
 apps/OpenSpace/ext/launcher/src/profile/assettreeitem.cpp     | 2 +-
 apps/OpenSpace/ext/launcher/src/profile/assettreemodel.cpp    | 2 +-
 apps/OpenSpace/ext/launcher/src/profile/cameradialog.cpp      | 2 +-
 apps/OpenSpace/ext/launcher/src/profile/deltatimesdialog.cpp  | 2 +-
 apps/OpenSpace/ext/launcher/src/profile/horizonsdialog.cpp    | 2 +-
 apps/OpenSpace/ext/launcher/src/profile/line.cpp              | 2 +-
 apps/OpenSpace/ext/launcher/src/profile/marknodesdialog.cpp   | 2 +-
 apps/OpenSpace/ext/launcher/src/profile/metadialog.cpp        | 2 +-
 apps/OpenSpace/ext/launcher/src/profile/modulesdialog.cpp     | 2 +-
 apps/OpenSpace/ext/launcher/src/profile/profileedit.cpp       | 2 +-
 apps/OpenSpace/ext/launcher/src/profile/propertiesdialog.cpp  | 2 +-
 apps/OpenSpace/ext/launcher/src/profile/scriptlogdialog.cpp   | 2 +-
 apps/OpenSpace/ext/launcher/src/profile/timedialog.cpp        | 2 +-
 apps/OpenSpace/ext/launcher/src/settingsdialog.cpp            | 2 +-
 .../ext/launcher/src/sgctedit/displaywindowunion.cpp          | 2 +-
 apps/OpenSpace/ext/launcher/src/sgctedit/monitorbox.cpp       | 2 +-
 .../OpenSpace/ext/launcher/src/sgctedit/orientationdialog.cpp | 2 +-
 apps/OpenSpace/ext/launcher/src/sgctedit/settingswidget.cpp   | 2 +-
 apps/OpenSpace/ext/launcher/src/sgctedit/sgctedit.cpp         | 2 +-
 apps/OpenSpace/ext/launcher/src/sgctedit/windowcontrol.cpp    | 2 +-
 apps/OpenSpace/ext/sgct                                       | 2 +-
 apps/OpenSpace/main.cpp                                       | 2 +-
 apps/Sync/main.cpp                                            | 2 +-
 apps/TaskRunner/main.cpp                                      | 2 +-
 data/assets/examples/modelshader/model_fs.glsl                | 2 +-
 data/assets/examples/modelshader/model_vs.glsl                | 2 +-
 ext/ghoul                                                     | 2 +-
 ext/spice                                                     | 2 +-
 include/openspace/camera/camera.h                             | 2 +-
 include/openspace/camera/camerapose.h                         | 2 +-
 include/openspace/data/csvloader.h                            | 2 +-
 include/openspace/data/dataloader.h                           | 2 +-
 include/openspace/data/datamapping.h                          | 2 +-
 include/openspace/data/speckloader.h                          | 2 +-
 include/openspace/documentation/core_registration.h           | 2 +-
 include/openspace/documentation/documentation.h               | 2 +-
 include/openspace/documentation/documentationengine.h         | 2 +-
 include/openspace/documentation/verifier.h                    | 2 +-
 include/openspace/documentation/verifier.inl                  | 2 +-
 include/openspace/engine/configuration.h                      | 2 +-
 include/openspace/engine/downloadmanager.h                    | 2 +-
 include/openspace/engine/globals.h                            | 2 +-
 include/openspace/engine/globalscallbacks.h                   | 2 +-
 include/openspace/engine/logfactory.h                         | 2 +-
 include/openspace/engine/moduleengine.h                       | 2 +-
 include/openspace/engine/moduleengine.inl                     | 2 +-
 include/openspace/engine/openspaceengine.h                    | 2 +-
 include/openspace/engine/settings.h                           | 2 +-
 include/openspace/engine/syncengine.h                         | 2 +-
 include/openspace/engine/windowdelegate.h                     | 2 +-
 include/openspace/events/event.h                              | 2 +-
 include/openspace/events/eventengine.h                        | 2 +-
 include/openspace/events/eventengine.inl                      | 2 +-
 include/openspace/interaction/action.h                        | 2 +-
 include/openspace/interaction/actionmanager.h                 | 2 +-
 include/openspace/interaction/camerainteractionstates.h       | 2 +-
 include/openspace/interaction/delayedvariable.h               | 2 +-
 include/openspace/interaction/delayedvariable.inl             | 2 +-
 include/openspace/interaction/interactionmonitor.h            | 2 +-
 include/openspace/interaction/interpolator.h                  | 2 +-
 include/openspace/interaction/interpolator.inl                | 2 +-
 include/openspace/interaction/joystickcamerastates.h          | 2 +-
 include/openspace/interaction/joystickinputstate.h            | 2 +-
 include/openspace/interaction/keybindingmanager.h             | 2 +-
 include/openspace/interaction/keyboardinputstate.h            | 2 +-
 include/openspace/interaction/mousecamerastates.h             | 2 +-
 include/openspace/interaction/mouseinputstate.h               | 2 +-
 include/openspace/interaction/scriptcamerastates.h            | 2 +-
 include/openspace/interaction/sessionrecording.h              | 2 +-
 include/openspace/interaction/sessionrecording.inl            | 2 +-
 .../openspace/interaction/tasks/convertrecfileversiontask.h   | 2 +-
 include/openspace/interaction/tasks/convertrecformattask.h    | 2 +-
 include/openspace/interaction/touchbar.h                      | 2 +-
 include/openspace/interaction/websocketcamerastates.h         | 2 +-
 include/openspace/interaction/websocketinputstate.h           | 2 +-
 include/openspace/json.h                                      | 2 +-
 include/openspace/mission/mission.h                           | 2 +-
 include/openspace/mission/missionmanager.h                    | 2 +-
 include/openspace/navigation/keyframenavigator.h              | 2 +-
 include/openspace/navigation/navigationhandler.h              | 2 +-
 include/openspace/navigation/navigationstate.h                | 2 +-
 include/openspace/navigation/orbitalnavigator.h               | 2 +-
 include/openspace/navigation/path.h                           | 2 +-
 include/openspace/navigation/pathcurve.h                      | 2 +-
 include/openspace/navigation/pathcurves/avoidcollisioncurve.h | 2 +-
 .../openspace/navigation/pathcurves/zoomoutoverviewcurve.h    | 2 +-
 include/openspace/navigation/pathnavigator.h                  | 2 +-
 include/openspace/navigation/waypoint.h                       | 2 +-
 include/openspace/network/messagestructures.h                 | 2 +-
 include/openspace/network/messagestructureshelper.h           | 2 +-
 include/openspace/network/parallelconnection.h                | 2 +-
 include/openspace/network/parallelpeer.h                      | 2 +-
 include/openspace/properties/list/doublelistproperty.h        | 2 +-
 include/openspace/properties/list/intlistproperty.h           | 2 +-
 include/openspace/properties/list/stringlistproperty.h        | 2 +-
 include/openspace/properties/listproperty.h                   | 2 +-
 include/openspace/properties/listproperty.inl                 | 2 +-
 include/openspace/properties/matrix/dmat2property.h           | 2 +-
 include/openspace/properties/matrix/dmat3property.h           | 2 +-
 include/openspace/properties/matrix/dmat4property.h           | 2 +-
 include/openspace/properties/matrix/mat2property.h            | 2 +-
 include/openspace/properties/matrix/mat3property.h            | 2 +-
 include/openspace/properties/matrix/mat4property.h            | 2 +-
 include/openspace/properties/numericalproperty.h              | 2 +-
 include/openspace/properties/numericalproperty.inl            | 2 +-
 include/openspace/properties/optionproperty.h                 | 2 +-
 include/openspace/properties/property.h                       | 2 +-
 include/openspace/properties/propertyowner.h                  | 2 +-
 include/openspace/properties/scalar/boolproperty.h            | 2 +-
 include/openspace/properties/scalar/doubleproperty.h          | 2 +-
 include/openspace/properties/scalar/floatproperty.h           | 2 +-
 include/openspace/properties/scalar/intproperty.h             | 2 +-
 include/openspace/properties/scalar/longproperty.h            | 2 +-
 include/openspace/properties/scalar/shortproperty.h           | 2 +-
 include/openspace/properties/scalar/uintproperty.h            | 2 +-
 include/openspace/properties/scalar/ulongproperty.h           | 2 +-
 include/openspace/properties/scalar/ushortproperty.h          | 2 +-
 include/openspace/properties/selectionproperty.h              | 2 +-
 include/openspace/properties/stringproperty.h                 | 2 +-
 include/openspace/properties/templateproperty.h               | 2 +-
 include/openspace/properties/templateproperty.inl             | 2 +-
 include/openspace/properties/triggerproperty.h                | 2 +-
 include/openspace/properties/vector/dvec2property.h           | 2 +-
 include/openspace/properties/vector/dvec3property.h           | 2 +-
 include/openspace/properties/vector/dvec4property.h           | 2 +-
 include/openspace/properties/vector/ivec2property.h           | 2 +-
 include/openspace/properties/vector/ivec3property.h           | 2 +-
 include/openspace/properties/vector/ivec4property.h           | 2 +-
 include/openspace/properties/vector/uvec2property.h           | 2 +-
 include/openspace/properties/vector/uvec3property.h           | 2 +-
 include/openspace/properties/vector/uvec4property.h           | 2 +-
 include/openspace/properties/vector/vec2property.h            | 2 +-
 include/openspace/properties/vector/vec3property.h            | 2 +-
 include/openspace/properties/vector/vec4property.h            | 2 +-
 include/openspace/query/query.h                               | 2 +-
 include/openspace/rendering/colormappingcomponent.h           | 2 +-
 include/openspace/rendering/dashboard.h                       | 2 +-
 include/openspace/rendering/dashboarditem.h                   | 2 +-
 include/openspace/rendering/dashboardtextitem.h               | 2 +-
 include/openspace/rendering/deferredcaster.h                  | 2 +-
 include/openspace/rendering/deferredcasterlistener.h          | 2 +-
 include/openspace/rendering/deferredcastermanager.h           | 2 +-
 include/openspace/rendering/fadeable.h                        | 2 +-
 include/openspace/rendering/framebufferrenderer.h             | 2 +-
 include/openspace/rendering/helper.h                          | 2 +-
 include/openspace/rendering/labelscomponent.h                 | 2 +-
 include/openspace/rendering/loadingscreen.h                   | 2 +-
 include/openspace/rendering/luaconsole.h                      | 2 +-
 include/openspace/rendering/raycasterlistener.h               | 2 +-
 include/openspace/rendering/raycastermanager.h                | 2 +-
 include/openspace/rendering/renderable.h                      | 2 +-
 include/openspace/rendering/renderengine.h                    | 2 +-
 include/openspace/rendering/screenspacerenderable.h           | 2 +-
 include/openspace/rendering/texturecomponent.h                | 2 +-
 include/openspace/rendering/transferfunction.h                | 2 +-
 include/openspace/rendering/volumeraycaster.h                 | 2 +-
 include/openspace/scene/asset.h                               | 2 +-
 include/openspace/scene/assetmanager.h                        | 2 +-
 include/openspace/scene/lightsource.h                         | 2 +-
 include/openspace/scene/profile.h                             | 2 +-
 include/openspace/scene/rotation.h                            | 2 +-
 include/openspace/scene/scale.h                               | 2 +-
 include/openspace/scene/scene.h                               | 2 +-
 include/openspace/scene/scenegraphnode.h                      | 2 +-
 include/openspace/scene/sceneinitializer.h                    | 2 +-
 include/openspace/scene/scenelicensewriter.h                  | 2 +-
 include/openspace/scene/timeframe.h                           | 2 +-
 include/openspace/scene/translation.h                         | 2 +-
 include/openspace/scripting/lualibrary.h                      | 2 +-
 include/openspace/scripting/scriptengine.h                    | 2 +-
 include/openspace/scripting/scriptscheduler.h                 | 2 +-
 include/openspace/scripting/systemcapabilitiesbinding.h       | 2 +-
 include/openspace/util/blockplaneintersectiongeometry.h       | 2 +-
 include/openspace/util/boxgeometry.h                          | 2 +-
 include/openspace/util/collisionhelper.h                      | 2 +-
 include/openspace/util/concurrentjobmanager.h                 | 2 +-
 include/openspace/util/concurrentjobmanager.inl               | 2 +-
 include/openspace/util/concurrentqueue.h                      | 2 +-
 include/openspace/util/concurrentqueue.inl                    | 2 +-
 include/openspace/util/coordinateconversion.h                 | 2 +-
 include/openspace/util/distanceconstants.h                    | 2 +-
 include/openspace/util/distanceconversion.h                   | 2 +-
 include/openspace/util/factorymanager.h                       | 2 +-
 include/openspace/util/factorymanager.inl                     | 2 +-
 include/openspace/util/histogram.h                            | 2 +-
 include/openspace/util/httprequest.h                          | 2 +-
 include/openspace/util/job.h                                  | 2 +-
 include/openspace/util/json_helper.h                          | 2 +-
 include/openspace/util/json_helper.inl                        | 2 +-
 include/openspace/util/keys.h                                 | 2 +-
 include/openspace/util/memorymanager.h                        | 2 +-
 include/openspace/util/mouse.h                                | 2 +-
 include/openspace/util/openspacemodule.h                      | 2 +-
 include/openspace/util/planegeometry.h                        | 2 +-
 include/openspace/util/progressbar.h                          | 2 +-
 include/openspace/util/resourcesynchronization.h              | 2 +-
 include/openspace/util/screenlog.h                            | 2 +-
 include/openspace/util/sphere.h                               | 2 +-
 include/openspace/util/spicemanager.h                         | 2 +-
 include/openspace/util/syncable.h                             | 2 +-
 include/openspace/util/syncbuffer.h                           | 2 +-
 include/openspace/util/syncbuffer.inl                         | 2 +-
 include/openspace/util/syncdata.h                             | 2 +-
 include/openspace/util/syncdata.inl                           | 2 +-
 include/openspace/util/task.h                                 | 2 +-
 include/openspace/util/taskloader.h                           | 2 +-
 include/openspace/util/threadpool.h                           | 2 +-
 include/openspace/util/time.h                                 | 2 +-
 include/openspace/util/timeconversion.h                       | 2 +-
 include/openspace/util/timeline.h                             | 2 +-
 include/openspace/util/timeline.inl                           | 2 +-
 include/openspace/util/timemanager.h                          | 2 +-
 include/openspace/util/timerange.h                            | 2 +-
 include/openspace/util/touch.h                                | 2 +-
 include/openspace/util/transformationmanager.h                | 2 +-
 include/openspace/util/tstring.h                              | 2 +-
 include/openspace/util/universalhelpers.h                     | 2 +-
 include/openspace/util/updatestructures.h                     | 2 +-
 include/openspace/util/versionchecker.h                       | 2 +-
 modules/atmosphere/atmospheremodule.cpp                       | 2 +-
 modules/atmosphere/atmospheremodule.h                         | 2 +-
 modules/atmosphere/rendering/atmospheredeferredcaster.cpp     | 2 +-
 modules/atmosphere/rendering/atmospheredeferredcaster.h       | 2 +-
 modules/atmosphere/rendering/renderableatmosphere.cpp         | 2 +-
 modules/atmosphere/rendering/renderableatmosphere.h           | 2 +-
 modules/atmosphere/shaders/atmosphere_common.glsl             | 2 +-
 modules/atmosphere/shaders/atmosphere_deferred_fs.glsl        | 2 +-
 modules/atmosphere/shaders/atmosphere_deferred_vs.glsl        | 2 +-
 modules/atmosphere/shaders/calculation_gs.glsl                | 2 +-
 modules/atmosphere/shaders/calculation_vs.glsl                | 2 +-
 modules/atmosphere/shaders/deltaE_calc_fs.glsl                | 2 +-
 modules/atmosphere/shaders/deltaJ_calc_fs.glsl                | 2 +-
 modules/atmosphere/shaders/deltaS_calc_fs.glsl                | 2 +-
 modules/atmosphere/shaders/deltaS_sup_calc_fs.glsl            | 2 +-
 modules/atmosphere/shaders/inScattering_calc_fs.glsl          | 2 +-
 modules/atmosphere/shaders/inScattering_sup_calc_fs.glsl      | 2 +-
 modules/atmosphere/shaders/irradiance_calc_fs.glsl            | 2 +-
 modules/atmosphere/shaders/irradiance_final_fs.glsl           | 2 +-
 modules/atmosphere/shaders/irradiance_sup_calc_fs.glsl        | 2 +-
 modules/atmosphere/shaders/transmittance_calc_fs.glsl         | 2 +-
 modules/base/basemodule.cpp                                   | 2 +-
 modules/base/basemodule.h                                     | 2 +-
 modules/base/dashboard/dashboarditemangle.cpp                 | 2 +-
 modules/base/dashboard/dashboarditemangle.h                   | 2 +-
 modules/base/dashboard/dashboarditemdate.cpp                  | 2 +-
 modules/base/dashboard/dashboarditemdate.h                    | 2 +-
 modules/base/dashboard/dashboarditemdistance.cpp              | 2 +-
 modules/base/dashboard/dashboarditemdistance.h                | 2 +-
 modules/base/dashboard/dashboarditemelapsedtime.cpp           | 2 +-
 modules/base/dashboard/dashboarditemelapsedtime.h             | 2 +-
 modules/base/dashboard/dashboarditemframerate.cpp             | 2 +-
 modules/base/dashboard/dashboarditemframerate.h               | 2 +-
 modules/base/dashboard/dashboarditeminputstate.cpp            | 2 +-
 modules/base/dashboard/dashboarditeminputstate.h              | 2 +-
 modules/base/dashboard/dashboarditemmission.cpp               | 2 +-
 modules/base/dashboard/dashboarditemmission.h                 | 2 +-
 modules/base/dashboard/dashboarditemparallelconnection.cpp    | 2 +-
 modules/base/dashboard/dashboarditemparallelconnection.h      | 2 +-
 modules/base/dashboard/dashboarditempropertyvalue.cpp         | 2 +-
 modules/base/dashboard/dashboarditempropertyvalue.h           | 2 +-
 modules/base/dashboard/dashboarditemsimulationincrement.cpp   | 2 +-
 modules/base/dashboard/dashboarditemsimulationincrement.h     | 2 +-
 modules/base/dashboard/dashboarditemspacing.cpp               | 2 +-
 modules/base/dashboard/dashboarditemspacing.h                 | 2 +-
 modules/base/dashboard/dashboarditemtext.cpp                  | 2 +-
 modules/base/dashboard/dashboarditemtext.h                    | 2 +-
 modules/base/dashboard/dashboarditemvelocity.cpp              | 2 +-
 modules/base/dashboard/dashboarditemvelocity.h                | 2 +-
 modules/base/lightsource/cameralightsource.cpp                | 2 +-
 modules/base/lightsource/cameralightsource.h                  | 2 +-
 modules/base/lightsource/scenegraphlightsource.cpp            | 2 +-
 modules/base/lightsource/scenegraphlightsource.h              | 2 +-
 modules/base/rendering/grids/renderableboxgrid.cpp            | 2 +-
 modules/base/rendering/grids/renderableboxgrid.h              | 2 +-
 modules/base/rendering/grids/renderablegrid.cpp               | 2 +-
 modules/base/rendering/grids/renderablegrid.h                 | 2 +-
 modules/base/rendering/grids/renderableradialgrid.cpp         | 2 +-
 modules/base/rendering/grids/renderableradialgrid.h           | 2 +-
 modules/base/rendering/grids/renderablesphericalgrid.cpp      | 2 +-
 modules/base/rendering/grids/renderablesphericalgrid.h        | 2 +-
 .../rendering/pointcloud/renderableinterpolatedpoints.cpp     | 2 +-
 .../base/rendering/pointcloud/renderableinterpolatedpoints.h  | 2 +-
 modules/base/rendering/pointcloud/renderablepointcloud.cpp    | 2 +-
 modules/base/rendering/pointcloud/renderablepointcloud.h      | 2 +-
 modules/base/rendering/pointcloud/renderablepolygoncloud.cpp  | 2 +-
 modules/base/rendering/pointcloud/renderablepolygoncloud.h    | 2 +-
 modules/base/rendering/renderablecartesianaxes.cpp            | 2 +-
 modules/base/rendering/renderablecartesianaxes.h              | 2 +-
 modules/base/rendering/renderabledisc.cpp                     | 2 +-
 modules/base/rendering/renderabledisc.h                       | 2 +-
 modules/base/rendering/renderablelabel.cpp                    | 2 +-
 modules/base/rendering/renderablelabel.h                      | 2 +-
 modules/base/rendering/renderablemodel.cpp                    | 2 +-
 modules/base/rendering/renderablemodel.h                      | 2 +-
 modules/base/rendering/renderablenodearrow.cpp                | 2 +-
 modules/base/rendering/renderablenodearrow.h                  | 2 +-
 modules/base/rendering/renderablenodeline.cpp                 | 2 +-
 modules/base/rendering/renderablenodeline.h                   | 2 +-
 modules/base/rendering/renderableplane.cpp                    | 2 +-
 modules/base/rendering/renderableplane.h                      | 2 +-
 modules/base/rendering/renderableplaneimagelocal.cpp          | 2 +-
 modules/base/rendering/renderableplaneimagelocal.h            | 2 +-
 modules/base/rendering/renderableplaneimageonline.cpp         | 2 +-
 modules/base/rendering/renderableplaneimageonline.h           | 2 +-
 modules/base/rendering/renderableplanetimevaryingimage.cpp    | 2 +-
 modules/base/rendering/renderableplanetimevaryingimage.h      | 2 +-
 modules/base/rendering/renderableprism.cpp                    | 2 +-
 modules/base/rendering/renderableprism.h                      | 2 +-
 modules/base/rendering/renderablesphere.cpp                   | 2 +-
 modules/base/rendering/renderablesphere.h                     | 2 +-
 modules/base/rendering/renderablesphereimagelocal.cpp         | 2 +-
 modules/base/rendering/renderablesphereimagelocal.h           | 2 +-
 modules/base/rendering/renderablesphereimageonline.cpp        | 2 +-
 modules/base/rendering/renderablesphereimageonline.h          | 2 +-
 modules/base/rendering/renderabletimevaryingsphere.cpp        | 2 +-
 modules/base/rendering/renderabletimevaryingsphere.h          | 2 +-
 modules/base/rendering/renderabletrail.cpp                    | 2 +-
 modules/base/rendering/renderabletrail.h                      | 2 +-
 modules/base/rendering/renderabletrailorbit.cpp               | 2 +-
 modules/base/rendering/renderabletrailorbit.h                 | 2 +-
 modules/base/rendering/renderabletrailtrajectory.cpp          | 2 +-
 modules/base/rendering/renderabletrailtrajectory.h            | 2 +-
 modules/base/rendering/screenspacedashboard.cpp               | 2 +-
 modules/base/rendering/screenspacedashboard.h                 | 2 +-
 modules/base/rendering/screenspacedashboard_lua.inl           | 2 +-
 modules/base/rendering/screenspaceframebuffer.cpp             | 2 +-
 modules/base/rendering/screenspaceframebuffer.h               | 2 +-
 modules/base/rendering/screenspaceimagelocal.cpp              | 2 +-
 modules/base/rendering/screenspaceimagelocal.h                | 2 +-
 modules/base/rendering/screenspaceimageonline.cpp             | 2 +-
 modules/base/rendering/screenspaceimageonline.h               | 2 +-
 modules/base/rotation/constantrotation.cpp                    | 2 +-
 modules/base/rotation/constantrotation.h                      | 2 +-
 modules/base/rotation/fixedrotation.cpp                       | 2 +-
 modules/base/rotation/fixedrotation.h                         | 2 +-
 modules/base/rotation/luarotation.cpp                         | 2 +-
 modules/base/rotation/luarotation.h                           | 2 +-
 modules/base/rotation/staticrotation.cpp                      | 2 +-
 modules/base/rotation/staticrotation.h                        | 2 +-
 modules/base/rotation/timelinerotation.cpp                    | 2 +-
 modules/base/rotation/timelinerotation.h                      | 2 +-
 modules/base/scale/luascale.cpp                               | 2 +-
 modules/base/scale/luascale.h                                 | 2 +-
 modules/base/scale/nonuniformstaticscale.cpp                  | 2 +-
 modules/base/scale/nonuniformstaticscale.h                    | 2 +-
 modules/base/scale/staticscale.cpp                            | 2 +-
 modules/base/scale/staticscale.h                              | 2 +-
 modules/base/scale/timedependentscale.cpp                     | 2 +-
 modules/base/scale/timedependentscale.h                       | 2 +-
 modules/base/shaders/arrow_fs.glsl                            | 2 +-
 modules/base/shaders/arrow_vs.glsl                            | 2 +-
 modules/base/shaders/axes_fs.glsl                             | 2 +-
 modules/base/shaders/axes_vs.glsl                             | 2 +-
 modules/base/shaders/disc_fs.glsl                             | 2 +-
 modules/base/shaders/disc_vs.glsl                             | 2 +-
 modules/base/shaders/grid_fs.glsl                             | 2 +-
 modules/base/shaders/grid_vs.glsl                             | 2 +-
 modules/base/shaders/imageplane_fs.glsl                       | 2 +-
 modules/base/shaders/imageplane_vs.glsl                       | 2 +-
 modules/base/shaders/line_fs.glsl                             | 2 +-
 modules/base/shaders/line_vs.glsl                             | 2 +-
 modules/base/shaders/model_fs.glsl                            | 2 +-
 modules/base/shaders/model_vs.glsl                            | 2 +-
 modules/base/shaders/plane_fs.glsl                            | 2 +-
 modules/base/shaders/plane_vs.glsl                            | 2 +-
 modules/base/shaders/pointcloud/billboardpoint_fs.glsl        | 2 +-
 modules/base/shaders/pointcloud/billboardpoint_gs.glsl        | 2 +-
 .../shaders/pointcloud/billboardpoint_interpolated_vs.glsl    | 2 +-
 modules/base/shaders/pointcloud/billboardpoint_vs.glsl        | 2 +-
 modules/base/shaders/polygon_fs.glsl                          | 2 +-
 modules/base/shaders/polygon_gs.glsl                          | 2 +-
 modules/base/shaders/polygon_vs.glsl                          | 2 +-
 modules/base/shaders/prism_fs.glsl                            | 2 +-
 modules/base/shaders/prism_vs.glsl                            | 2 +-
 modules/base/shaders/renderabletrail_apple_fs.glsl            | 2 +-
 modules/base/shaders/renderabletrail_apple_vs.glsl            | 2 +-
 modules/base/shaders/renderabletrail_fs.glsl                  | 2 +-
 modules/base/shaders/renderabletrail_vs.glsl                  | 2 +-
 modules/base/shaders/screenspace_fs.glsl                      | 2 +-
 modules/base/shaders/screenspace_vs.glsl                      | 2 +-
 modules/base/shaders/sphere_fs.glsl                           | 2 +-
 modules/base/shaders/sphere_vs.glsl                           | 2 +-
 modules/base/timeframe/timeframeinterval.cpp                  | 2 +-
 modules/base/timeframe/timeframeinterval.h                    | 2 +-
 modules/base/timeframe/timeframeunion.cpp                     | 2 +-
 modules/base/timeframe/timeframeunion.h                       | 2 +-
 modules/base/translation/luatranslation.cpp                   | 2 +-
 modules/base/translation/luatranslation.h                     | 2 +-
 modules/base/translation/statictranslation.cpp                | 2 +-
 modules/base/translation/statictranslation.h                  | 2 +-
 modules/base/translation/timelinetranslation.cpp              | 2 +-
 modules/base/translation/timelinetranslation.h                | 2 +-
 modules/cefwebgui/cefwebguimodule.cpp                         | 2 +-
 modules/cefwebgui/cefwebguimodule.h                           | 2 +-
 modules/cefwebgui/include/guikeyboardhandler.h                | 2 +-
 modules/cefwebgui/include/guirenderhandler.h                  | 2 +-
 modules/cefwebgui/shaders/gui_fs.glsl                         | 2 +-
 modules/cefwebgui/shaders/gui_vs.glsl                         | 2 +-
 modules/cefwebgui/src/guikeyboardhandler.cpp                  | 2 +-
 modules/cefwebgui/src/guirenderhandler.cpp                    | 2 +-
 modules/debugging/debuggingmodule.cpp                         | 2 +-
 modules/debugging/debuggingmodule.h                           | 2 +-
 modules/debugging/debuggingmodule_lua.inl                     | 2 +-
 modules/debugging/rendering/debugrenderer.cpp                 | 2 +-
 modules/debugging/rendering/debugrenderer.h                   | 2 +-
 modules/debugging/rendering/debugshader_fs.glsl               | 2 +-
 modules/debugging/rendering/debugshader_vs.glsl               | 2 +-
 modules/debugging/rendering/renderabledebugplane.cpp          | 2 +-
 modules/debugging/rendering/renderabledebugplane.h            | 2 +-
 modules/digitaluniverse/digitaluniversemodule.cpp             | 2 +-
 modules/digitaluniverse/digitaluniversemodule.h               | 2 +-
 modules/digitaluniverse/rendering/renderabledumeshes.cpp      | 2 +-
 modules/digitaluniverse/rendering/renderabledumeshes.h        | 2 +-
 modules/digitaluniverse/rendering/renderableplanescloud.cpp   | 2 +-
 modules/digitaluniverse/rendering/renderableplanescloud.h     | 2 +-
 modules/digitaluniverse/shaders/dumesh_fs.glsl                | 2 +-
 modules/digitaluniverse/shaders/dumesh_vs.glsl                | 2 +-
 modules/digitaluniverse/shaders/plane_fs.glsl                 | 2 +-
 modules/digitaluniverse/shaders/plane_vs.glsl                 | 2 +-
 modules/exoplanets/exoplanetshelper.cpp                       | 2 +-
 modules/exoplanets/exoplanetshelper.h                         | 2 +-
 modules/exoplanets/exoplanetsmodule.cpp                       | 2 +-
 modules/exoplanets/exoplanetsmodule.h                         | 2 +-
 modules/exoplanets/exoplanetsmodule_lua.inl                   | 2 +-
 modules/exoplanets/rendering/renderableorbitdisc.cpp          | 2 +-
 modules/exoplanets/rendering/renderableorbitdisc.h            | 2 +-
 modules/exoplanets/shaders/orbitdisc_fs.glsl                  | 2 +-
 modules/exoplanets/shaders/orbitdisc_vs.glsl                  | 2 +-
 modules/exoplanets/tasks/exoplanetsdatapreparationtask.cpp    | 2 +-
 modules/exoplanets/tasks/exoplanetsdatapreparationtask.h      | 2 +-
 modules/fieldlines/fieldlinesmodule.cpp                       | 2 +-
 modules/fieldlines/fieldlinesmodule.h                         | 2 +-
 modules/fieldlines/rendering/renderablefieldlines.cpp         | 2 +-
 modules/fieldlines/rendering/renderablefieldlines.h           | 2 +-
 modules/fieldlines/shaders/fieldline_fs.glsl                  | 2 +-
 modules/fieldlines/shaders/fieldline_gs.glsl                  | 2 +-
 modules/fieldlines/shaders/fieldline_vs.glsl                  | 2 +-
 modules/fieldlinessequence/fieldlinessequencemodule.cpp       | 2 +-
 modules/fieldlinessequence/fieldlinessequencemodule.h         | 2 +-
 .../rendering/renderablefieldlinessequence.cpp                | 2 +-
 .../rendering/renderablefieldlinessequence.h                  | 2 +-
 modules/fieldlinessequence/shaders/fieldlinessequence_fs.glsl | 2 +-
 modules/fieldlinessequence/shaders/fieldlinessequence_vs.glsl | 2 +-
 modules/fieldlinessequence/util/commons.cpp                   | 2 +-
 modules/fieldlinessequence/util/commons.h                     | 2 +-
 modules/fieldlinessequence/util/fieldlinesstate.cpp           | 2 +-
 modules/fieldlinessequence/util/fieldlinesstate.h             | 2 +-
 modules/fieldlinessequence/util/kameleonfieldlinehelper.cpp   | 2 +-
 modules/fieldlinessequence/util/kameleonfieldlinehelper.h     | 2 +-
 modules/fitsfilereader/fitsfilereadermodule.cpp               | 2 +-
 modules/fitsfilereader/fitsfilereadermodule.h                 | 2 +-
 modules/fitsfilereader/include/fitsfilereader.h               | 2 +-
 modules/fitsfilereader/src/fitsfilereader.cpp                 | 2 +-
 modules/gaia/gaiamodule.cpp                                   | 2 +-
 modules/gaia/gaiamodule.h                                     | 2 +-
 modules/gaia/rendering/gaiaoptions.h                          | 2 +-
 modules/gaia/rendering/octreeculler.cpp                       | 2 +-
 modules/gaia/rendering/octreeculler.h                         | 2 +-
 modules/gaia/rendering/octreemanager.cpp                      | 2 +-
 modules/gaia/rendering/octreemanager.h                        | 2 +-
 modules/gaia/rendering/renderablegaiastars.cpp                | 2 +-
 modules/gaia/rendering/renderablegaiastars.h                  | 2 +-
 modules/gaia/shaders/gaia_billboard_fs.glsl                   | 2 +-
 modules/gaia/shaders/gaia_billboard_ge.glsl                   | 2 +-
 modules/gaia/shaders/gaia_billboard_nofbo_fs.glsl             | 2 +-
 modules/gaia/shaders/gaia_point_fs.glsl                       | 2 +-
 modules/gaia/shaders/gaia_point_ge.glsl                       | 2 +-
 modules/gaia/shaders/gaia_ssbo_vs.glsl                        | 2 +-
 modules/gaia/shaders/gaia_tonemapping_billboard_fs.glsl       | 2 +-
 modules/gaia/shaders/gaia_tonemapping_point_fs.glsl           | 2 +-
 modules/gaia/shaders/gaia_tonemapping_vs.glsl                 | 2 +-
 modules/gaia/shaders/gaia_vbo_vs.glsl                         | 2 +-
 modules/gaia/tasks/constructoctreetask.cpp                    | 2 +-
 modules/gaia/tasks/constructoctreetask.h                      | 2 +-
 modules/gaia/tasks/readfilejob.cpp                            | 2 +-
 modules/gaia/tasks/readfilejob.h                              | 2 +-
 modules/gaia/tasks/readfitstask.cpp                           | 2 +-
 modules/gaia/tasks/readfitstask.h                             | 2 +-
 modules/gaia/tasks/readspecktask.cpp                          | 2 +-
 modules/gaia/tasks/readspecktask.h                            | 2 +-
 modules/galaxy/galaxymodule.cpp                               | 2 +-
 modules/galaxy/galaxymodule.h                                 | 2 +-
 modules/galaxy/rendering/galaxyraycaster.cpp                  | 2 +-
 modules/galaxy/rendering/galaxyraycaster.h                    | 2 +-
 modules/galaxy/rendering/renderablegalaxy.cpp                 | 2 +-
 modules/galaxy/rendering/renderablegalaxy.h                   | 2 +-
 modules/galaxy/shaders/billboard_fs.glsl                      | 2 +-
 modules/galaxy/shaders/billboard_ge.glsl                      | 2 +-
 modules/galaxy/shaders/billboard_vs.glsl                      | 2 +-
 modules/galaxy/shaders/points_fs.glsl                         | 2 +-
 modules/galaxy/shaders/points_vs.glsl                         | 2 +-
 modules/galaxy/shaders/raycasterbounds_fs.glsl                | 2 +-
 modules/galaxy/shaders/raycasterbounds_vs.glsl                | 2 +-
 modules/galaxy/tasks/milkywayconversiontask.cpp               | 2 +-
 modules/galaxy/tasks/milkywayconversiontask.h                 | 2 +-
 modules/galaxy/tasks/milkywaypointsconversiontask.cpp         | 2 +-
 modules/galaxy/tasks/milkywaypointsconversiontask.h           | 2 +-
 modules/globebrowsing/globebrowsingmodule.cpp                 | 2 +-
 modules/globebrowsing/globebrowsingmodule.h                   | 2 +-
 modules/globebrowsing/globebrowsingmodule_lua.inl             | 2 +-
 modules/globebrowsing/shaders/advanced_rings_fs.glsl          | 2 +-
 modules/globebrowsing/shaders/advanced_rings_vs.glsl          | 2 +-
 modules/globebrowsing/shaders/blending.glsl                   | 2 +-
 modules/globebrowsing/shaders/geojson_fs.glsl                 | 2 +-
 modules/globebrowsing/shaders/geojson_points_fs.glsl          | 2 +-
 modules/globebrowsing/shaders/geojson_points_gs.glsl          | 2 +-
 modules/globebrowsing/shaders/geojson_points_vs.glsl          | 2 +-
 modules/globebrowsing/shaders/geojson_vs.glsl                 | 2 +-
 modules/globebrowsing/shaders/globalrenderer_vs.glsl          | 2 +-
 modules/globebrowsing/shaders/interpolate_fs.glsl             | 2 +-
 modules/globebrowsing/shaders/interpolate_vs.glsl             | 2 +-
 modules/globebrowsing/shaders/localrenderer_vs.glsl           | 2 +-
 modules/globebrowsing/shaders/renderer_fs.glsl                | 2 +-
 modules/globebrowsing/shaders/rings_fs.glsl                   | 2 +-
 modules/globebrowsing/shaders/rings_geom_fs.glsl              | 2 +-
 modules/globebrowsing/shaders/rings_geom_vs.glsl              | 2 +-
 modules/globebrowsing/shaders/rings_vs.glsl                   | 2 +-
 modules/globebrowsing/shaders/texturetilemapping.glsl         | 2 +-
 modules/globebrowsing/shaders/tile.glsl                       | 2 +-
 modules/globebrowsing/shaders/tileheight.glsl                 | 2 +-
 modules/globebrowsing/shaders/tilevertexskirt.glsl            | 2 +-
 modules/globebrowsing/src/asynctiledataprovider.cpp           | 2 +-
 modules/globebrowsing/src/asynctiledataprovider.h             | 2 +-
 modules/globebrowsing/src/basictypes.h                        | 2 +-
 modules/globebrowsing/src/dashboarditemglobelocation.cpp      | 2 +-
 modules/globebrowsing/src/dashboarditemglobelocation.h        | 2 +-
 modules/globebrowsing/src/ellipsoid.cpp                       | 2 +-
 modules/globebrowsing/src/ellipsoid.h                         | 2 +-
 modules/globebrowsing/src/gdalwrapper.cpp                     | 2 +-
 modules/globebrowsing/src/gdalwrapper.h                       | 2 +-
 modules/globebrowsing/src/geodeticpatch.cpp                   | 2 +-
 modules/globebrowsing/src/geodeticpatch.h                     | 2 +-
 modules/globebrowsing/src/geojson/geojsoncomponent.cpp        | 2 +-
 modules/globebrowsing/src/geojson/geojsoncomponent.h          | 2 +-
 modules/globebrowsing/src/geojson/geojsonmanager.cpp          | 2 +-
 modules/globebrowsing/src/geojson/geojsonmanager.h            | 2 +-
 modules/globebrowsing/src/geojson/geojsonproperties.cpp       | 2 +-
 modules/globebrowsing/src/geojson/geojsonproperties.h         | 2 +-
 modules/globebrowsing/src/geojson/globegeometryfeature.cpp    | 2 +-
 modules/globebrowsing/src/geojson/globegeometryfeature.h      | 2 +-
 modules/globebrowsing/src/geojson/globegeometryhelper.cpp     | 2 +-
 modules/globebrowsing/src/geojson/globegeometryhelper.h       | 2 +-
 modules/globebrowsing/src/globelabelscomponent.cpp            | 2 +-
 modules/globebrowsing/src/globelabelscomponent.h              | 2 +-
 modules/globebrowsing/src/globerotation.cpp                   | 2 +-
 modules/globebrowsing/src/globerotation.h                     | 2 +-
 modules/globebrowsing/src/globetranslation.cpp                | 2 +-
 modules/globebrowsing/src/globetranslation.h                  | 2 +-
 modules/globebrowsing/src/gpulayergroup.cpp                   | 2 +-
 modules/globebrowsing/src/gpulayergroup.h                     | 2 +-
 modules/globebrowsing/src/layer.cpp                           | 2 +-
 modules/globebrowsing/src/layer.h                             | 2 +-
 modules/globebrowsing/src/layeradjustment.cpp                 | 2 +-
 modules/globebrowsing/src/layeradjustment.h                   | 2 +-
 modules/globebrowsing/src/layergroup.cpp                      | 2 +-
 modules/globebrowsing/src/layergroup.h                        | 2 +-
 modules/globebrowsing/src/layergroupid.cpp                    | 2 +-
 modules/globebrowsing/src/layergroupid.h                      | 2 +-
 modules/globebrowsing/src/layermanager.cpp                    | 2 +-
 modules/globebrowsing/src/layermanager.h                      | 2 +-
 modules/globebrowsing/src/layerrendersettings.cpp             | 2 +-
 modules/globebrowsing/src/layerrendersettings.h               | 2 +-
 modules/globebrowsing/src/lrucache.h                          | 2 +-
 modules/globebrowsing/src/lrucache.inl                        | 2 +-
 modules/globebrowsing/src/lruthreadpool.h                     | 2 +-
 modules/globebrowsing/src/lruthreadpool.inl                   | 2 +-
 modules/globebrowsing/src/memoryawaretilecache.cpp            | 2 +-
 modules/globebrowsing/src/memoryawaretilecache.h              | 2 +-
 modules/globebrowsing/src/prioritizingconcurrentjobmanager.h  | 2 +-
 .../globebrowsing/src/prioritizingconcurrentjobmanager.inl    | 2 +-
 modules/globebrowsing/src/rawtile.h                           | 2 +-
 modules/globebrowsing/src/rawtiledatareader.cpp               | 2 +-
 modules/globebrowsing/src/rawtiledatareader.h                 | 2 +-
 modules/globebrowsing/src/renderableglobe.cpp                 | 2 +-
 modules/globebrowsing/src/renderableglobe.h                   | 2 +-
 modules/globebrowsing/src/ringscomponent.cpp                  | 2 +-
 modules/globebrowsing/src/ringscomponent.h                    | 2 +-
 modules/globebrowsing/src/shadowcomponent.cpp                 | 2 +-
 modules/globebrowsing/src/shadowcomponent.h                   | 2 +-
 modules/globebrowsing/src/skirtedgrid.cpp                     | 2 +-
 modules/globebrowsing/src/skirtedgrid.h                       | 2 +-
 modules/globebrowsing/src/tilecacheproperties.h               | 2 +-
 modules/globebrowsing/src/tileindex.cpp                       | 2 +-
 modules/globebrowsing/src/tileindex.h                         | 2 +-
 modules/globebrowsing/src/tileloadjob.cpp                     | 2 +-
 modules/globebrowsing/src/tileloadjob.h                       | 2 +-
 .../globebrowsing/src/tileprovider/defaulttileprovider.cpp    | 2 +-
 modules/globebrowsing/src/tileprovider/defaulttileprovider.h  | 2 +-
 .../src/tileprovider/imagesequencetileprovider.cpp            | 2 +-
 .../src/tileprovider/imagesequencetileprovider.h              | 2 +-
 .../src/tileprovider/singleimagetileprovider.cpp              | 2 +-
 .../globebrowsing/src/tileprovider/singleimagetileprovider.h  | 2 +-
 .../src/tileprovider/sizereferencetileprovider.cpp            | 2 +-
 .../src/tileprovider/sizereferencetileprovider.h              | 2 +-
 modules/globebrowsing/src/tileprovider/spoutimageprovider.cpp | 2 +-
 modules/globebrowsing/src/tileprovider/spoutimageprovider.h   | 2 +-
 .../globebrowsing/src/tileprovider/temporaltileprovider.cpp   | 2 +-
 modules/globebrowsing/src/tileprovider/temporaltileprovider.h | 2 +-
 modules/globebrowsing/src/tileprovider/texttileprovider.cpp   | 2 +-
 modules/globebrowsing/src/tileprovider/texttileprovider.h     | 2 +-
 .../globebrowsing/src/tileprovider/tileindextileprovider.cpp  | 2 +-
 .../globebrowsing/src/tileprovider/tileindextileprovider.h    | 2 +-
 modules/globebrowsing/src/tileprovider/tileprovider.cpp       | 2 +-
 modules/globebrowsing/src/tileprovider/tileprovider.h         | 2 +-
 .../globebrowsing/src/tileprovider/tileproviderbyindex.cpp    | 2 +-
 modules/globebrowsing/src/tileprovider/tileproviderbyindex.h  | 2 +-
 .../globebrowsing/src/tileprovider/tileproviderbylevel.cpp    | 2 +-
 modules/globebrowsing/src/tileprovider/tileproviderbylevel.h  | 2 +-
 modules/globebrowsing/src/tiletextureinitdata.cpp             | 2 +-
 modules/globebrowsing/src/tiletextureinitdata.h               | 2 +-
 modules/globebrowsing/src/timequantizer.cpp                   | 2 +-
 modules/globebrowsing/src/timequantizer.h                     | 2 +-
 modules/imgui/imguimodule.cpp                                 | 2 +-
 modules/imgui/imguimodule.h                                   | 2 +-
 modules/imgui/include/guiactioncomponent.h                    | 2 +-
 modules/imgui/include/guicomponent.h                          | 2 +-
 modules/imgui/include/guifilepathcomponent.h                  | 2 +-
 modules/imgui/include/guigibscomponent.h                      | 2 +-
 modules/imgui/include/guiglobebrowsingcomponent.h             | 2 +-
 modules/imgui/include/guihelpcomponent.h                      | 2 +-
 modules/imgui/include/guijoystickcomponent.h                  | 2 +-
 modules/imgui/include/guimemorycomponent.h                    | 2 +-
 modules/imgui/include/guimissioncomponent.h                   | 2 +-
 modules/imgui/include/guiparallelcomponent.h                  | 2 +-
 modules/imgui/include/guipropertycomponent.h                  | 2 +-
 modules/imgui/include/guiscenecomponent.h                     | 2 +-
 modules/imgui/include/guispacetimecomponent.h                 | 2 +-
 modules/imgui/include/imgui_include.h                         | 2 +-
 modules/imgui/include/renderproperties.h                      | 2 +-
 modules/imgui/shaders/gui_fs.glsl                             | 2 +-
 modules/imgui/shaders/gui_vs.glsl                             | 2 +-
 modules/imgui/src/guiactioncomponent.cpp                      | 2 +-
 modules/imgui/src/guicomponent.cpp                            | 2 +-
 modules/imgui/src/guifilepathcomponent.cpp                    | 2 +-
 modules/imgui/src/guigibscomponent.cpp                        | 2 +-
 modules/imgui/src/guiglobebrowsingcomponent.cpp               | 2 +-
 modules/imgui/src/guihelpcomponent.cpp                        | 2 +-
 modules/imgui/src/guijoystickcomponent.cpp                    | 2 +-
 modules/imgui/src/guimemorycomponent.cpp                      | 2 +-
 modules/imgui/src/guimissioncomponent.cpp                     | 2 +-
 modules/imgui/src/guiparallelcomponent.cpp                    | 2 +-
 modules/imgui/src/guipropertycomponent.cpp                    | 2 +-
 modules/imgui/src/guiscenecomponent.cpp                       | 2 +-
 modules/imgui/src/guispacetimecomponent.cpp                   | 2 +-
 modules/imgui/src/renderproperties.cpp                        | 2 +-
 modules/iswa/iswamodule.cpp                                   | 2 +-
 modules/iswa/iswamodule.h                                     | 2 +-
 modules/iswa/rendering/datacygnet.cpp                         | 2 +-
 modules/iswa/rendering/datacygnet.h                           | 2 +-
 modules/iswa/rendering/dataplane.cpp                          | 2 +-
 modules/iswa/rendering/dataplane.h                            | 2 +-
 modules/iswa/rendering/datasphere.cpp                         | 2 +-
 modules/iswa/rendering/datasphere.h                           | 2 +-
 modules/iswa/rendering/iswabasegroup.cpp                      | 2 +-
 modules/iswa/rendering/iswabasegroup.h                        | 2 +-
 modules/iswa/rendering/iswacygnet.cpp                         | 2 +-
 modules/iswa/rendering/iswacygnet.h                           | 2 +-
 modules/iswa/rendering/iswadatagroup.cpp                      | 2 +-
 modules/iswa/rendering/iswadatagroup.h                        | 2 +-
 modules/iswa/rendering/iswakameleongroup.cpp                  | 2 +-
 modules/iswa/rendering/iswakameleongroup.h                    | 2 +-
 modules/iswa/rendering/kameleonplane.cpp                      | 2 +-
 modules/iswa/rendering/kameleonplane.h                        | 2 +-
 modules/iswa/rendering/screenspacecygnet.cpp                  | 2 +-
 modules/iswa/rendering/screenspacecygnet.h                    | 2 +-
 modules/iswa/rendering/texturecygnet.cpp                      | 2 +-
 modules/iswa/rendering/texturecygnet.h                        | 2 +-
 modules/iswa/rendering/textureplane.cpp                       | 2 +-
 modules/iswa/rendering/textureplane.h                         | 2 +-
 modules/iswa/shaders/dataplane_fs.glsl                        | 2 +-
 modules/iswa/shaders/dataplane_vs.glsl                        | 2 +-
 modules/iswa/shaders/datasphere_fs.glsl                       | 2 +-
 modules/iswa/shaders/datasphere_vs.glsl                       | 2 +-
 modules/iswa/shaders/textureplane_fs.glsl                     | 2 +-
 modules/iswa/shaders/textureplane_vs.glsl                     | 2 +-
 modules/iswa/util/dataprocessor.cpp                           | 2 +-
 modules/iswa/util/dataprocessor.h                             | 2 +-
 modules/iswa/util/dataprocessorjson.cpp                       | 2 +-
 modules/iswa/util/dataprocessorjson.h                         | 2 +-
 modules/iswa/util/dataprocessorkameleon.cpp                   | 2 +-
 modules/iswa/util/dataprocessorkameleon.h                     | 2 +-
 modules/iswa/util/dataprocessortext.cpp                       | 2 +-
 modules/iswa/util/dataprocessortext.h                         | 2 +-
 modules/iswa/util/iswamanager.cpp                             | 2 +-
 modules/iswa/util/iswamanager.h                               | 2 +-
 modules/iswa/util/iswamanager_lua.inl                         | 2 +-
 modules/kameleon/include/kameleonhelper.h                     | 2 +-
 modules/kameleon/include/kameleonwrapper.h                    | 2 +-
 modules/kameleon/kameleonmodule.cpp                           | 2 +-
 modules/kameleon/kameleonmodule.h                             | 2 +-
 modules/kameleon/src/kameleonhelper.cpp                       | 2 +-
 modules/kameleon/src/kameleonwrapper.cpp                      | 2 +-
 modules/kameleonvolume/kameleonvolumemodule.cpp               | 2 +-
 modules/kameleonvolume/kameleonvolumemodule.h                 | 2 +-
 modules/kameleonvolume/kameleonvolumereader.cpp               | 2 +-
 modules/kameleonvolume/kameleonvolumereader.h                 | 2 +-
 modules/kameleonvolume/rendering/renderablekameleonvolume.cpp | 2 +-
 modules/kameleonvolume/rendering/renderablekameleonvolume.h   | 2 +-
 modules/kameleonvolume/tasks/kameleondocumentationtask.cpp    | 2 +-
 modules/kameleonvolume/tasks/kameleondocumentationtask.h      | 2 +-
 modules/kameleonvolume/tasks/kameleonmetadatatojsontask.cpp   | 2 +-
 modules/kameleonvolume/tasks/kameleonmetadatatojsontask.h     | 2 +-
 modules/kameleonvolume/tasks/kameleonvolumetorawtask.cpp      | 2 +-
 modules/kameleonvolume/tasks/kameleonvolumetorawtask.h        | 2 +-
 modules/multiresvolume/multiresvolumemodule.cpp               | 2 +-
 modules/multiresvolume/multiresvolumemodule.h                 | 2 +-
 modules/multiresvolume/rendering/atlasmanager.cpp             | 2 +-
 modules/multiresvolume/rendering/atlasmanager.h               | 2 +-
 modules/multiresvolume/rendering/brickcover.cpp               | 2 +-
 modules/multiresvolume/rendering/brickcover.h                 | 2 +-
 modules/multiresvolume/rendering/brickmanager.cpp             | 2 +-
 modules/multiresvolume/rendering/brickmanager.h               | 2 +-
 modules/multiresvolume/rendering/brickselection.cpp           | 2 +-
 modules/multiresvolume/rendering/brickselection.h             | 2 +-
 modules/multiresvolume/rendering/brickselector.h              | 2 +-
 modules/multiresvolume/rendering/errorhistogrammanager.cpp    | 2 +-
 modules/multiresvolume/rendering/errorhistogrammanager.h      | 2 +-
 modules/multiresvolume/rendering/histogrammanager.cpp         | 2 +-
 modules/multiresvolume/rendering/histogrammanager.h           | 2 +-
 .../multiresvolume/rendering/localerrorhistogrammanager.cpp   | 2 +-
 modules/multiresvolume/rendering/localerrorhistogrammanager.h | 2 +-
 modules/multiresvolume/rendering/localtfbrickselector.cpp     | 2 +-
 modules/multiresvolume/rendering/localtfbrickselector.h       | 2 +-
 modules/multiresvolume/rendering/multiresvolumeraycaster.cpp  | 2 +-
 modules/multiresvolume/rendering/multiresvolumeraycaster.h    | 2 +-
 modules/multiresvolume/rendering/renderablemultiresvolume.cpp | 2 +-
 modules/multiresvolume/rendering/renderablemultiresvolume.h   | 2 +-
 modules/multiresvolume/rendering/shenbrickselector.cpp        | 2 +-
 modules/multiresvolume/rendering/shenbrickselector.h          | 2 +-
 modules/multiresvolume/rendering/simpletfbrickselector.cpp    | 2 +-
 modules/multiresvolume/rendering/simpletfbrickselector.h      | 2 +-
 modules/multiresvolume/rendering/tfbrickselector.cpp          | 2 +-
 modules/multiresvolume/rendering/tfbrickselector.h            | 2 +-
 modules/multiresvolume/rendering/tsp.cpp                      | 2 +-
 modules/multiresvolume/rendering/tsp.h                        | 2 +-
 modules/multiresvolume/shaders/bounds_fs.glsl                 | 2 +-
 modules/multiresvolume/shaders/bounds_vs.glsl                 | 2 +-
 modules/multiresvolume/shaders/helper.glsl                    | 2 +-
 modules/multiresvolume/shaders/raycast.glsl                   | 2 +-
 modules/server/include/connection.h                           | 2 +-
 modules/server/include/connectionpool.h                       | 2 +-
 modules/server/include/jsonconverters.h                       | 2 +-
 modules/server/include/serverinterface.h                      | 2 +-
 modules/server/include/topics/authorizationtopic.h            | 2 +-
 modules/server/include/topics/bouncetopic.h                   | 2 +-
 modules/server/include/topics/camerapathtopic.h               | 2 +-
 modules/server/include/topics/cameratopic.h                   | 2 +-
 modules/server/include/topics/documentationtopic.h            | 2 +-
 modules/server/include/topics/enginemodetopic.h               | 2 +-
 modules/server/include/topics/eventtopic.h                    | 2 +-
 modules/server/include/topics/flightcontrollertopic.h         | 2 +-
 modules/server/include/topics/getpropertytopic.h              | 2 +-
 modules/server/include/topics/luascripttopic.h                | 2 +-
 modules/server/include/topics/missiontopic.h                  | 2 +-
 modules/server/include/topics/sessionrecordingtopic.h         | 2 +-
 modules/server/include/topics/setpropertytopic.h              | 2 +-
 modules/server/include/topics/shortcuttopic.h                 | 2 +-
 modules/server/include/topics/skybrowsertopic.h               | 2 +-
 modules/server/include/topics/subscriptiontopic.h             | 2 +-
 modules/server/include/topics/timetopic.h                     | 2 +-
 modules/server/include/topics/topic.h                         | 2 +-
 modules/server/include/topics/triggerpropertytopic.h          | 2 +-
 modules/server/include/topics/versiontopic.h                  | 2 +-
 modules/server/servermodule.cpp                               | 2 +-
 modules/server/servermodule.h                                 | 2 +-
 modules/server/src/connection.cpp                             | 2 +-
 modules/server/src/connectionpool.cpp                         | 2 +-
 modules/server/src/jsonconverters.cpp                         | 2 +-
 modules/server/src/serverinterface.cpp                        | 2 +-
 modules/server/src/topics/authorizationtopic.cpp              | 2 +-
 modules/server/src/topics/bouncetopic.cpp                     | 2 +-
 modules/server/src/topics/camerapathtopic.cpp                 | 2 +-
 modules/server/src/topics/cameratopic.cpp                     | 2 +-
 modules/server/src/topics/documentationtopic.cpp              | 2 +-
 modules/server/src/topics/enginemodetopic.cpp                 | 2 +-
 modules/server/src/topics/eventtopic.cpp                      | 2 +-
 modules/server/src/topics/flightcontrollertopic.cpp           | 2 +-
 modules/server/src/topics/getpropertytopic.cpp                | 2 +-
 modules/server/src/topics/luascripttopic.cpp                  | 2 +-
 modules/server/src/topics/missiontopic.cpp                    | 2 +-
 modules/server/src/topics/sessionrecordingtopic.cpp           | 2 +-
 modules/server/src/topics/setpropertytopic.cpp                | 2 +-
 modules/server/src/topics/shortcuttopic.cpp                   | 2 +-
 modules/server/src/topics/skybrowsertopic.cpp                 | 2 +-
 modules/server/src/topics/subscriptiontopic.cpp               | 2 +-
 modules/server/src/topics/timetopic.cpp                       | 2 +-
 modules/server/src/topics/topic.cpp                           | 2 +-
 modules/server/src/topics/triggerpropertytopic.cpp            | 2 +-
 modules/server/src/topics/versiontopic.cpp                    | 2 +-
 modules/skybrowser/include/browser.h                          | 2 +-
 modules/skybrowser/include/renderableskytarget.h              | 2 +-
 modules/skybrowser/include/screenspaceskybrowser.h            | 2 +-
 modules/skybrowser/include/targetbrowserpair.h                | 2 +-
 modules/skybrowser/include/utility.h                          | 2 +-
 modules/skybrowser/include/wwtcommunicator.h                  | 2 +-
 modules/skybrowser/include/wwtdatahandler.h                   | 2 +-
 modules/skybrowser/shaders/target_fs.glsl                     | 2 +-
 modules/skybrowser/shaders/target_vs.glsl                     | 2 +-
 modules/skybrowser/skybrowsermodule.cpp                       | 2 +-
 modules/skybrowser/skybrowsermodule.h                         | 2 +-
 modules/skybrowser/skybrowsermodule_lua.inl                   | 2 +-
 modules/skybrowser/src/browser.cpp                            | 2 +-
 modules/skybrowser/src/renderableskytarget.cpp                | 2 +-
 modules/skybrowser/src/screenspaceskybrowser.cpp              | 2 +-
 modules/skybrowser/src/targetbrowserpair.cpp                  | 2 +-
 modules/skybrowser/src/utility.cpp                            | 2 +-
 modules/skybrowser/src/wwtcommunicator.cpp                    | 2 +-
 modules/skybrowser/src/wwtdatahandler.cpp                     | 2 +-
 modules/space/horizonsfile.cpp                                | 2 +-
 modules/space/horizonsfile.h                                  | 2 +-
 modules/space/kepler.cpp                                      | 2 +-
 modules/space/kepler.h                                        | 2 +-
 modules/space/rendering/renderableconstellationbounds.cpp     | 2 +-
 modules/space/rendering/renderableconstellationbounds.h       | 2 +-
 modules/space/rendering/renderableconstellationlines.cpp      | 2 +-
 modules/space/rendering/renderableconstellationlines.h        | 2 +-
 modules/space/rendering/renderableconstellationsbase.cpp      | 2 +-
 modules/space/rendering/renderableconstellationsbase.h        | 2 +-
 modules/space/rendering/renderableeclipsecone.cpp             | 2 +-
 modules/space/rendering/renderableeclipsecone.h               | 2 +-
 modules/space/rendering/renderablefluxnodes.cpp               | 2 +-
 modules/space/rendering/renderablefluxnodes.h                 | 2 +-
 modules/space/rendering/renderablehabitablezone.cpp           | 2 +-
 modules/space/rendering/renderablehabitablezone.h             | 2 +-
 modules/space/rendering/renderableorbitalkepler.cpp           | 2 +-
 modules/space/rendering/renderableorbitalkepler.h             | 2 +-
 modules/space/rendering/renderablerings.cpp                   | 2 +-
 modules/space/rendering/renderablerings.h                     | 2 +-
 modules/space/rendering/renderablestars.cpp                   | 2 +-
 modules/space/rendering/renderablestars.h                     | 2 +-
 modules/space/rendering/renderabletravelspeed.cpp             | 2 +-
 modules/space/rendering/renderabletravelspeed.h               | 2 +-
 modules/space/rotation/spicerotation.cpp                      | 2 +-
 modules/space/rotation/spicerotation.h                        | 2 +-
 modules/space/shaders/constellationbounds_fs.glsl             | 2 +-
 modules/space/shaders/constellationbounds_vs.glsl             | 2 +-
 modules/space/shaders/constellationlines_fs.glsl              | 2 +-
 modules/space/shaders/constellationlines_vs.glsl              | 2 +-
 modules/space/shaders/convolution_fs.glsl                     | 2 +-
 modules/space/shaders/convolution_vs.glsl                     | 2 +-
 modules/space/shaders/debrisViz_fs.glsl                       | 2 +-
 modules/space/shaders/debrisViz_vs.glsl                       | 2 +-
 modules/space/shaders/eclipsecone_fs.glsl                     | 2 +-
 modules/space/shaders/eclipsecone_vs.glsl                     | 2 +-
 modules/space/shaders/fluxnodes_fs.glsl                       | 2 +-
 modules/space/shaders/fluxnodes_vs.glsl                       | 2 +-
 modules/space/shaders/habitablezone_fs.glsl                   | 2 +-
 modules/space/shaders/habitablezone_vs.glsl                   | 2 +-
 modules/space/shaders/psfToTexture_fs.glsl                    | 2 +-
 modules/space/shaders/psfToTexture_vs.glsl                    | 2 +-
 modules/space/shaders/rings_fs.glsl                           | 2 +-
 modules/space/shaders/rings_vs.glsl                           | 2 +-
 modules/space/shaders/star_fs.glsl                            | 2 +-
 modules/space/shaders/star_ge.glsl                            | 2 +-
 modules/space/shaders/star_vs.glsl                            | 2 +-
 modules/space/shaders/travelspeed_fs.glsl                     | 2 +-
 modules/space/shaders/travelspeed_vs.glsl                     | 2 +-
 modules/space/spacemodule.cpp                                 | 2 +-
 modules/space/spacemodule.h                                   | 2 +-
 modules/space/spacemodule_lua.inl                             | 2 +-
 modules/space/tasks/generatedebrisvolumetask.cpp              | 2 +-
 modules/space/tasks/generatedebrisvolumetask.h                | 2 +-
 modules/space/translation/gptranslation.cpp                   | 2 +-
 modules/space/translation/gptranslation.h                     | 2 +-
 modules/space/translation/horizonstranslation.cpp             | 2 +-
 modules/space/translation/horizonstranslation.h               | 2 +-
 modules/space/translation/keplertranslation.cpp               | 2 +-
 modules/space/translation/keplertranslation.h                 | 2 +-
 modules/space/translation/spicetranslation.cpp                | 2 +-
 modules/space/translation/spicetranslation.h                  | 2 +-
 .../dashboard/dashboarditeminstruments.cpp                    | 2 +-
 .../dashboard/dashboarditeminstruments.h                      | 2 +-
 .../rendering/renderablecrawlingline.cpp                      | 2 +-
 .../spacecraftinstruments/rendering/renderablecrawlingline.h  | 2 +-
 modules/spacecraftinstruments/rendering/renderablefov.cpp     | 2 +-
 modules/spacecraftinstruments/rendering/renderablefov.h       | 2 +-
 .../rendering/renderablemodelprojection.cpp                   | 2 +-
 .../rendering/renderablemodelprojection.h                     | 2 +-
 .../rendering/renderableplaneprojection.cpp                   | 2 +-
 .../rendering/renderableplaneprojection.h                     | 2 +-
 .../rendering/renderableplanetprojection.cpp                  | 2 +-
 .../rendering/renderableplanetprojection.h                    | 2 +-
 .../rendering/renderableshadowcylinder.cpp                    | 2 +-
 .../rendering/renderableshadowcylinder.h                      | 2 +-
 modules/spacecraftinstruments/shaders/crawlingline_fs.glsl    | 2 +-
 modules/spacecraftinstruments/shaders/crawlingline_vs.glsl    | 2 +-
 modules/spacecraftinstruments/shaders/dilation_fs.glsl        | 2 +-
 modules/spacecraftinstruments/shaders/dilation_vs.glsl        | 2 +-
 modules/spacecraftinstruments/shaders/fov_fs.glsl             | 2 +-
 modules/spacecraftinstruments/shaders/fov_vs.glsl             | 2 +-
 .../shaders/renderableModelDepth_fs.glsl                      | 2 +-
 .../shaders/renderableModelDepth_vs.glsl                      | 2 +-
 .../shaders/renderableModelProjection_fs.glsl                 | 2 +-
 .../shaders/renderableModelProjection_vs.glsl                 | 2 +-
 modules/spacecraftinstruments/shaders/renderableModel_fs.glsl | 2 +-
 modules/spacecraftinstruments/shaders/renderableModel_vs.glsl | 2 +-
 .../shaders/renderablePlanetProjection_fs.glsl                | 2 +-
 .../shaders/renderablePlanetProjection_vs.glsl                | 2 +-
 .../spacecraftinstruments/shaders/renderablePlanet_fs.glsl    | 2 +-
 .../spacecraftinstruments/shaders/renderablePlanet_vs.glsl    | 2 +-
 .../spacecraftinstruments/shaders/terminatorshadow_fs.glsl    | 2 +-
 .../spacecraftinstruments/shaders/terminatorshadow_vs.glsl    | 2 +-
 modules/spacecraftinstruments/spacecraftinstrumentsmodule.cpp | 2 +-
 modules/spacecraftinstruments/spacecraftinstrumentsmodule.h   | 2 +-
 modules/spacecraftinstruments/util/decoder.cpp                | 2 +-
 modules/spacecraftinstruments/util/decoder.h                  | 2 +-
 modules/spacecraftinstruments/util/hongkangparser.cpp         | 2 +-
 modules/spacecraftinstruments/util/hongkangparser.h           | 2 +-
 modules/spacecraftinstruments/util/image.h                    | 2 +-
 modules/spacecraftinstruments/util/imagesequencer.cpp         | 2 +-
 modules/spacecraftinstruments/util/imagesequencer.h           | 2 +-
 modules/spacecraftinstruments/util/instrumentdecoder.cpp      | 2 +-
 modules/spacecraftinstruments/util/instrumentdecoder.h        | 2 +-
 modules/spacecraftinstruments/util/instrumenttimesparser.cpp  | 2 +-
 modules/spacecraftinstruments/util/instrumenttimesparser.h    | 2 +-
 modules/spacecraftinstruments/util/labelparser.cpp            | 2 +-
 modules/spacecraftinstruments/util/labelparser.h              | 2 +-
 modules/spacecraftinstruments/util/projectioncomponent.cpp    | 2 +-
 modules/spacecraftinstruments/util/projectioncomponent.h      | 2 +-
 modules/spacecraftinstruments/util/scannerdecoder.cpp         | 2 +-
 modules/spacecraftinstruments/util/scannerdecoder.h           | 2 +-
 modules/spacecraftinstruments/util/sequenceparser.cpp         | 2 +-
 modules/spacecraftinstruments/util/sequenceparser.h           | 2 +-
 modules/spacecraftinstruments/util/targetdecoder.cpp          | 2 +-
 modules/spacecraftinstruments/util/targetdecoder.h            | 2 +-
 modules/spout/renderableplanespout.cpp                        | 2 +-
 modules/spout/renderableplanespout.h                          | 2 +-
 modules/spout/renderablespherespout.cpp                       | 2 +-
 modules/spout/renderablespherespout.h                         | 2 +-
 modules/spout/screenspacespout.cpp                            | 2 +-
 modules/spout/screenspacespout.h                              | 2 +-
 modules/spout/spoutlibrary.h                                  | 2 +-
 modules/spout/spoutmodule.cpp                                 | 2 +-
 modules/spout/spoutmodule.h                                   | 2 +-
 modules/spout/spoutwrapper.cpp                                | 2 +-
 modules/spout/spoutwrapper.h                                  | 2 +-
 modules/statemachine/include/state.h                          | 2 +-
 modules/statemachine/include/statemachine.h                   | 2 +-
 modules/statemachine/include/transition.h                     | 2 +-
 modules/statemachine/src/state.cpp                            | 2 +-
 modules/statemachine/src/statemachine.cpp                     | 2 +-
 modules/statemachine/src/transition.cpp                       | 2 +-
 modules/statemachine/statemachinemodule.cpp                   | 2 +-
 modules/statemachine/statemachinemodule.h                     | 2 +-
 modules/statemachine/statemachinemodule_lua.inl               | 2 +-
 modules/sync/syncmodule.cpp                                   | 2 +-
 modules/sync/syncmodule.h                                     | 2 +-
 modules/sync/syncmodule_lua.inl                               | 2 +-
 modules/sync/syncs/httpsynchronization.cpp                    | 2 +-
 modules/sync/syncs/httpsynchronization.h                      | 2 +-
 modules/sync/syncs/urlsynchronization.cpp                     | 2 +-
 modules/sync/syncs/urlsynchronization.h                       | 2 +-
 modules/touch/include/directinputsolver.h                     | 2 +-
 modules/touch/include/touchinteraction.h                      | 2 +-
 modules/touch/include/touchmarker.h                           | 2 +-
 modules/touch/include/tuioear.h                               | 2 +-
 modules/touch/include/win32_touch.h                           | 2 +-
 modules/touch/shaders/marker_fs.glsl                          | 2 +-
 modules/touch/shaders/marker_vs.glsl                          | 2 +-
 modules/touch/src/directinputsolver.cpp                       | 2 +-
 modules/touch/src/touchinteraction.cpp                        | 2 +-
 modules/touch/src/touchmarker.cpp                             | 2 +-
 modules/touch/src/tuioear.cpp                                 | 2 +-
 modules/touch/src/win32_touch.cpp                             | 2 +-
 modules/touch/touchmodule.cpp                                 | 2 +-
 modules/touch/touchmodule.h                                   | 2 +-
 modules/toyvolume/rendering/renderabletoyvolume.cpp           | 2 +-
 modules/toyvolume/rendering/renderabletoyvolume.h             | 2 +-
 modules/toyvolume/rendering/toyvolumeraycaster.cpp            | 2 +-
 modules/toyvolume/rendering/toyvolumeraycaster.h              | 2 +-
 modules/toyvolume/shaders/bounds_fs.glsl                      | 2 +-
 modules/toyvolume/shaders/bounds_vs.glsl                      | 2 +-
 modules/toyvolume/shaders/raycast.glsl                        | 2 +-
 modules/toyvolume/toyvolumemodule.cpp                         | 2 +-
 modules/toyvolume/toyvolumemodule.h                           | 2 +-
 modules/video/include/renderablevideoplane.h                  | 2 +-
 modules/video/include/renderablevideosphere.h                 | 2 +-
 modules/video/include/screenspacevideo.h                      | 2 +-
 modules/video/include/videoplayer.h                           | 2 +-
 modules/video/include/videotileprovider.h                     | 2 +-
 modules/video/src/renderablevideoplane.cpp                    | 2 +-
 modules/video/src/renderablevideosphere.cpp                   | 2 +-
 modules/video/src/screenspacevideo.cpp                        | 2 +-
 modules/video/src/videoplayer.cpp                             | 2 +-
 modules/video/src/videotileprovider.cpp                       | 2 +-
 modules/video/videomodule.cpp                                 | 2 +-
 modules/video/videomodule.h                                   | 2 +-
 modules/vislab/rendering/renderabledistancelabel.cpp          | 2 +-
 modules/vislab/rendering/renderabledistancelabel.h            | 2 +-
 modules/vislab/vislabmodule.cpp                               | 2 +-
 modules/vislab/vislabmodule.h                                 | 2 +-
 modules/volume/envelope.cpp                                   | 2 +-
 modules/volume/envelope.h                                     | 2 +-
 modules/volume/linearlrucache.h                               | 2 +-
 modules/volume/linearlrucache.inl                             | 2 +-
 modules/volume/lrucache.h                                     | 2 +-
 modules/volume/lrucache.inl                                   | 2 +-
 modules/volume/rawvolume.h                                    | 2 +-
 modules/volume/rawvolume.inl                                  | 2 +-
 modules/volume/rawvolumemetadata.cpp                          | 2 +-
 modules/volume/rawvolumemetadata.h                            | 2 +-
 modules/volume/rawvolumereader.h                              | 2 +-
 modules/volume/rawvolumereader.inl                            | 2 +-
 modules/volume/rawvolumewriter.h                              | 2 +-
 modules/volume/rawvolumewriter.inl                            | 2 +-
 modules/volume/rendering/basicvolumeraycaster.cpp             | 2 +-
 modules/volume/rendering/basicvolumeraycaster.h               | 2 +-
 modules/volume/rendering/renderabletimevaryingvolume.cpp      | 2 +-
 modules/volume/rendering/renderabletimevaryingvolume.h        | 2 +-
 modules/volume/rendering/volumeclipplane.cpp                  | 2 +-
 modules/volume/rendering/volumeclipplane.h                    | 2 +-
 modules/volume/rendering/volumeclipplanes.cpp                 | 2 +-
 modules/volume/rendering/volumeclipplanes.h                   | 2 +-
 modules/volume/shaders/bounds_fs.glsl                         | 2 +-
 modules/volume/shaders/bounds_vs.glsl                         | 2 +-
 modules/volume/shaders/helper.glsl                            | 2 +-
 modules/volume/shaders/raycast.glsl                           | 2 +-
 modules/volume/tasks/generaterawvolumetask.cpp                | 2 +-
 modules/volume/tasks/generaterawvolumetask.h                  | 2 +-
 modules/volume/textureslicevolumereader.h                     | 2 +-
 modules/volume/textureslicevolumereader.inl                   | 2 +-
 modules/volume/transferfunction.cpp                           | 2 +-
 modules/volume/transferfunction.h                             | 2 +-
 modules/volume/transferfunctionhandler.cpp                    | 2 +-
 modules/volume/transferfunctionhandler.h                      | 2 +-
 modules/volume/transferfunctionproperty.cpp                   | 2 +-
 modules/volume/transferfunctionproperty.h                     | 2 +-
 modules/volume/volumegridtype.cpp                             | 2 +-
 modules/volume/volumegridtype.h                               | 2 +-
 modules/volume/volumemodule.cpp                               | 2 +-
 modules/volume/volumemodule.h                                 | 2 +-
 modules/volume/volumesampler.h                                | 2 +-
 modules/volume/volumesampler.inl                              | 2 +-
 modules/volume/volumeutils.cpp                                | 2 +-
 modules/volume/volumeutils.h                                  | 2 +-
 modules/webbrowser/include/browserclient.h                    | 2 +-
 modules/webbrowser/include/browserinstance.h                  | 2 +-
 modules/webbrowser/include/cefhost.h                          | 2 +-
 modules/webbrowser/include/defaultbrowserlauncher.h           | 2 +-
 modules/webbrowser/include/eventhandler.h                     | 2 +-
 modules/webbrowser/include/screenspacebrowser.h               | 2 +-
 modules/webbrowser/include/webbrowserapp.h                    | 2 +-
 modules/webbrowser/include/webkeyboardhandler.h               | 2 +-
 modules/webbrowser/include/webrenderhandler.h                 | 2 +-
 modules/webbrowser/shaders/screenspace_fs.glsl                | 2 +-
 modules/webbrowser/shaders/screenspace_vs.glsl                | 2 +-
 modules/webbrowser/src/browserclient.cpp                      | 2 +-
 modules/webbrowser/src/browserinstance.cpp                    | 2 +-
 modules/webbrowser/src/cefhost.cpp                            | 2 +-
 modules/webbrowser/src/defaultbrowserlauncher.cpp             | 2 +-
 modules/webbrowser/src/eventhandler.cpp                       | 2 +-
 modules/webbrowser/src/processhelperlinux.cpp                 | 2 +-
 modules/webbrowser/src/processhelpermac.cpp                   | 2 +-
 modules/webbrowser/src/processhelperwindows.cpp               | 2 +-
 modules/webbrowser/src/screenspacebrowser.cpp                 | 2 +-
 modules/webbrowser/src/webbrowserapp.cpp                      | 2 +-
 modules/webbrowser/src/webkeyboardhandler.cpp                 | 2 +-
 modules/webbrowser/src/webrenderhandler.cpp                   | 2 +-
 modules/webbrowser/webbrowsermodule.cpp                       | 2 +-
 modules/webbrowser/webbrowsermodule.h                         | 2 +-
 modules/webgui/webguimodule.cpp                               | 2 +-
 modules/webgui/webguimodule.h                                 | 2 +-
 shaders/PowerScaling/powerScalingMath.hglsl                   | 2 +-
 shaders/PowerScaling/powerScaling_fs.hglsl                    | 2 +-
 shaders/PowerScaling/powerScaling_vs.hglsl                    | 2 +-
 shaders/blending.glsl                                         | 2 +-
 shaders/core/xyzuvrgba_fs.glsl                                | 2 +-
 shaders/core/xyzuvrgba_vs.glsl                                | 2 +-
 shaders/floatoperations.glsl                                  | 2 +-
 shaders/fragment.glsl                                         | 2 +-
 shaders/framebuffer/exitframebuffer.frag                      | 2 +-
 shaders/framebuffer/fxaa.frag                                 | 2 +-
 shaders/framebuffer/fxaa.vert                                 | 2 +-
 shaders/framebuffer/hdrAndFiltering.frag                      | 2 +-
 shaders/framebuffer/hdrAndFiltering.vert                      | 2 +-
 shaders/framebuffer/inside.glsl                               | 2 +-
 shaders/framebuffer/mergeDownscaledVolume.frag                | 2 +-
 shaders/framebuffer/mergeDownscaledVolume.vert                | 2 +-
 shaders/framebuffer/nOneStripMSAA.frag                        | 2 +-
 shaders/framebuffer/nOneStripMSAA.vert                        | 2 +-
 shaders/framebuffer/outside.glsl                              | 2 +-
 shaders/framebuffer/raycastframebuffer.frag                   | 2 +-
 shaders/framebuffer/renderframebuffer.frag                    | 2 +-
 shaders/framebuffer/resolveframebuffer.vert                   | 2 +-
 shaders/hdr.glsl                                              | 2 +-
 shaders/rand.glsl                                             | 2 +-
 src/camera/camera.cpp                                         | 2 +-
 src/data/csvloader.cpp                                        | 2 +-
 src/data/dataloader.cpp                                       | 2 +-
 src/data/datamapping.cpp                                      | 2 +-
 src/data/speckloader.cpp                                      | 2 +-
 src/documentation/core_registration.cpp                       | 2 +-
 src/documentation/documentation.cpp                           | 2 +-
 src/documentation/documentationengine.cpp                     | 2 +-
 src/documentation/documentationgenerator.cpp                  | 2 +-
 src/documentation/verifier.cpp                                | 2 +-
 src/engine/configuration.cpp                                  | 2 +-
 src/engine/downloadmanager.cpp                                | 2 +-
 src/engine/globals.cpp                                        | 2 +-
 src/engine/globalscallbacks.cpp                               | 2 +-
 src/engine/logfactory.cpp                                     | 2 +-
 src/engine/moduleengine.cpp                                   | 2 +-
 src/engine/moduleengine_lua.inl                               | 2 +-
 src/engine/openspaceengine.cpp                                | 2 +-
 src/engine/openspaceengine_lua.inl                            | 2 +-
 src/engine/settings.cpp                                       | 2 +-
 src/engine/syncengine.cpp                                     | 2 +-
 src/events/event.cpp                                          | 2 +-
 src/events/eventengine.cpp                                    | 2 +-
 src/events/eventengine_lua.inl                                | 2 +-
 src/interaction/actionmanager.cpp                             | 2 +-
 src/interaction/actionmanager_lua.inl                         | 2 +-
 src/interaction/camerainteractionstates.cpp                   | 2 +-
 src/interaction/interactionmonitor.cpp                        | 2 +-
 src/interaction/joystickcamerastates.cpp                      | 2 +-
 src/interaction/joystickinputstate.cpp                        | 2 +-
 src/interaction/keybindingmanager.cpp                         | 2 +-
 src/interaction/keybindingmanager_lua.inl                     | 2 +-
 src/interaction/keyboardinputstate.cpp                        | 2 +-
 src/interaction/mousecamerastates.cpp                         | 2 +-
 src/interaction/mouseinputstate.cpp                           | 2 +-
 src/interaction/scriptcamerastates.cpp                        | 2 +-
 src/interaction/sessionrecording.cpp                          | 2 +-
 src/interaction/sessionrecording_lua.inl                      | 2 +-
 src/interaction/tasks/convertrecfileversiontask.cpp           | 2 +-
 src/interaction/tasks/convertrecformattask.cpp                | 2 +-
 src/interaction/touchbar.mm                                   | 2 +-
 src/interaction/websocketcamerastates.cpp                     | 2 +-
 src/interaction/websocketinputstate.cpp                       | 2 +-
 src/mission/mission.cpp                                       | 2 +-
 src/mission/missionmanager.cpp                                | 2 +-
 src/mission/missionmanager_lua.inl                            | 2 +-
 src/navigation/keyframenavigator.cpp                          | 2 +-
 src/navigation/navigationhandler.cpp                          | 2 +-
 src/navigation/navigationhandler_lua.inl                      | 2 +-
 src/navigation/navigationstate.cpp                            | 2 +-
 src/navigation/orbitalnavigator.cpp                           | 2 +-
 src/navigation/orbitalnavigator_lua.inl                       | 2 +-
 src/navigation/path.cpp                                       | 2 +-
 src/navigation/pathcurve.cpp                                  | 2 +-
 src/navigation/pathcurves/avoidcollisioncurve.cpp             | 2 +-
 src/navigation/pathcurves/zoomoutoverviewcurve.cpp            | 2 +-
 src/navigation/pathnavigator.cpp                              | 2 +-
 src/navigation/pathnavigator_lua.inl                          | 2 +-
 src/navigation/waypoint.cpp                                   | 2 +-
 src/network/messagestructureshelper.cpp                       | 2 +-
 src/network/parallelconnection.cpp                            | 2 +-
 src/network/parallelpeer.cpp                                  | 2 +-
 src/network/parallelpeer_lua.inl                              | 2 +-
 src/openspace.cpp                                             | 4 ++--
 src/properties/list/doublelistproperty.cpp                    | 2 +-
 src/properties/list/intlistproperty.cpp                       | 2 +-
 src/properties/list/stringlistproperty.cpp                    | 2 +-
 src/properties/matrix/dmat2property.cpp                       | 2 +-
 src/properties/matrix/dmat3property.cpp                       | 2 +-
 src/properties/matrix/dmat4property.cpp                       | 2 +-
 src/properties/matrix/mat2property.cpp                        | 2 +-
 src/properties/matrix/mat3property.cpp                        | 2 +-
 src/properties/matrix/mat4property.cpp                        | 2 +-
 src/properties/optionproperty.cpp                             | 2 +-
 src/properties/property.cpp                                   | 2 +-
 src/properties/propertyowner.cpp                              | 2 +-
 src/properties/scalar/boolproperty.cpp                        | 2 +-
 src/properties/scalar/doubleproperty.cpp                      | 2 +-
 src/properties/scalar/floatproperty.cpp                       | 2 +-
 src/properties/scalar/intproperty.cpp                         | 2 +-
 src/properties/scalar/longproperty.cpp                        | 2 +-
 src/properties/scalar/shortproperty.cpp                       | 2 +-
 src/properties/scalar/uintproperty.cpp                        | 2 +-
 src/properties/scalar/ulongproperty.cpp                       | 2 +-
 src/properties/scalar/ushortproperty.cpp                      | 2 +-
 src/properties/selectionproperty.cpp                          | 2 +-
 src/properties/stringproperty.cpp                             | 2 +-
 src/properties/triggerproperty.cpp                            | 2 +-
 src/properties/vector/dvec2property.cpp                       | 2 +-
 src/properties/vector/dvec3property.cpp                       | 2 +-
 src/properties/vector/dvec4property.cpp                       | 2 +-
 src/properties/vector/ivec2property.cpp                       | 2 +-
 src/properties/vector/ivec3property.cpp                       | 2 +-
 src/properties/vector/ivec4property.cpp                       | 2 +-
 src/properties/vector/uvec2property.cpp                       | 2 +-
 src/properties/vector/uvec3property.cpp                       | 2 +-
 src/properties/vector/uvec4property.cpp                       | 2 +-
 src/properties/vector/vec2property.cpp                        | 2 +-
 src/properties/vector/vec3property.cpp                        | 2 +-
 src/properties/vector/vec4property.cpp                        | 2 +-
 src/query/query.cpp                                           | 2 +-
 src/rendering/colormappingcomponent.cpp                       | 2 +-
 src/rendering/dashboard.cpp                                   | 2 +-
 src/rendering/dashboard_lua.inl                               | 2 +-
 src/rendering/dashboarditem.cpp                               | 2 +-
 src/rendering/dashboardtextitem.cpp                           | 2 +-
 src/rendering/deferredcastermanager.cpp                       | 2 +-
 src/rendering/fadeable.cpp                                    | 2 +-
 src/rendering/framebufferrenderer.cpp                         | 2 +-
 src/rendering/helper.cpp                                      | 2 +-
 src/rendering/labelscomponent.cpp                             | 2 +-
 src/rendering/loadingscreen.cpp                               | 2 +-
 src/rendering/luaconsole.cpp                                  | 2 +-
 src/rendering/raycastermanager.cpp                            | 2 +-
 src/rendering/renderable.cpp                                  | 2 +-
 src/rendering/renderengine.cpp                                | 2 +-
 src/rendering/renderengine_lua.inl                            | 2 +-
 src/rendering/screenspacerenderable.cpp                       | 2 +-
 src/rendering/texturecomponent.cpp                            | 2 +-
 src/rendering/transferfunction.cpp                            | 2 +-
 src/rendering/volumeraycaster.cpp                             | 2 +-
 src/scene/asset.cpp                                           | 2 +-
 src/scene/assetmanager.cpp                                    | 2 +-
 src/scene/assetmanager_lua.inl                                | 2 +-
 src/scene/lightsource.cpp                                     | 2 +-
 src/scene/profile.cpp                                         | 2 +-
 src/scene/profile_lua.inl                                     | 2 +-
 src/scene/rotation.cpp                                        | 2 +-
 src/scene/scale.cpp                                           | 2 +-
 src/scene/scene.cpp                                           | 2 +-
 src/scene/scene_lua.inl                                       | 2 +-
 src/scene/scenegraphnode.cpp                                  | 2 +-
 src/scene/sceneinitializer.cpp                                | 2 +-
 src/scene/scenelicensewriter.cpp                              | 2 +-
 src/scene/timeframe.cpp                                       | 2 +-
 src/scene/translation.cpp                                     | 2 +-
 src/scripting/lualibrary.cpp                                  | 2 +-
 src/scripting/scriptengine.cpp                                | 2 +-
 src/scripting/scriptengine_lua.inl                            | 2 +-
 src/scripting/scriptscheduler.cpp                             | 2 +-
 src/scripting/scriptscheduler_lua.inl                         | 2 +-
 src/scripting/systemcapabilitiesbinding.cpp                   | 2 +-
 src/scripting/systemcapabilitiesbinding_lua.inl               | 2 +-
 src/util/blockplaneintersectiongeometry.cpp                   | 2 +-
 src/util/boxgeometry.cpp                                      | 2 +-
 src/util/collisionhelper.cpp                                  | 2 +-
 src/util/coordinateconversion.cpp                             | 2 +-
 src/util/distanceconversion.cpp                               | 2 +-
 src/util/factorymanager.cpp                                   | 2 +-
 src/util/histogram.cpp                                        | 2 +-
 src/util/httprequest.cpp                                      | 2 +-
 src/util/json_helper.cpp                                      | 2 +-
 src/util/keys.cpp                                             | 2 +-
 src/util/openspacemodule.cpp                                  | 2 +-
 src/util/planegeometry.cpp                                    | 2 +-
 src/util/progressbar.cpp                                      | 2 +-
 src/util/resourcesynchronization.cpp                          | 2 +-
 src/util/screenlog.cpp                                        | 2 +-
 src/util/sphere.cpp                                           | 2 +-
 src/util/spicemanager.cpp                                     | 2 +-
 src/util/spicemanager_lua.inl                                 | 2 +-
 src/util/syncbuffer.cpp                                       | 2 +-
 src/util/task.cpp                                             | 2 +-
 src/util/taskloader.cpp                                       | 2 +-
 src/util/threadpool.cpp                                       | 2 +-
 src/util/time.cpp                                             | 2 +-
 src/util/time_lua.inl                                         | 2 +-
 src/util/timeconversion.cpp                                   | 2 +-
 src/util/timeline.cpp                                         | 2 +-
 src/util/timemanager.cpp                                      | 2 +-
 src/util/timerange.cpp                                        | 2 +-
 src/util/touch.cpp                                            | 2 +-
 src/util/transformationmanager.cpp                            | 2 +-
 src/util/tstring.cpp                                          | 2 +-
 src/util/universalhelpers.cpp                                 | 2 +-
 src/util/versionchecker.cpp                                   | 2 +-
 support/cmake/openspace_header.template                       | 2 +-
 support/coding/check_style_guide.py                           | 4 ++--
 support/coding/codegen                                        | 2 +-
 tests/main.cpp                                                | 2 +-
 tests/property/test_property_listproperties.cpp               | 2 +-
 tests/property/test_property_optionproperty.cpp               | 2 +-
 tests/property/test_property_selectionproperty.cpp            | 2 +-
 tests/regression/517.cpp                                      | 2 +-
 tests/test_assetloader.cpp                                    | 2 +-
 tests/test_concurrentqueue.cpp                                | 2 +-
 tests/test_distanceconversion.cpp                             | 2 +-
 tests/test_documentation.cpp                                  | 2 +-
 tests/test_horizons.cpp                                       | 2 +-
 tests/test_iswamanager.cpp                                    | 2 +-
 tests/test_jsonformatting.cpp                                 | 2 +-
 tests/test_latlonpatch.cpp                                    | 2 +-
 tests/test_lrucache.cpp                                       | 2 +-
 tests/test_lua_createsinglecolorimage.cpp                     | 2 +-
 tests/test_profile.cpp                                        | 2 +-
 tests/test_rawvolumeio.cpp                                    | 2 +-
 tests/test_scriptscheduler.cpp                                | 2 +-
 tests/test_settings.cpp                                       | 2 +-
 tests/test_sgctedit.cpp                                       | 2 +-
 tests/test_spicemanager.cpp                                   | 2 +-
 tests/test_timeconversion.cpp                                 | 2 +-
 tests/test_timeline.cpp                                       | 2 +-
 tests/test_timequantizer.cpp                                  | 2 +-
 1322 files changed, 1324 insertions(+), 1324 deletions(-)

diff --git a/apps/OpenSpace-MinVR/main.cpp b/apps/OpenSpace-MinVR/main.cpp
index 8dcabe23c2..382d23499e 100644
--- a/apps/OpenSpace-MinVR/main.cpp
+++ b/apps/OpenSpace-MinVR/main.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/apps/OpenSpace/ext/launcher/include/filesystemaccess.h b/apps/OpenSpace/ext/launcher/include/filesystemaccess.h
index 99c12b6e6a..61ac0471c4 100644
--- a/apps/OpenSpace/ext/launcher/include/filesystemaccess.h
+++ b/apps/OpenSpace/ext/launcher/include/filesystemaccess.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/apps/OpenSpace/ext/launcher/include/launcherwindow.h b/apps/OpenSpace/ext/launcher/include/launcherwindow.h
index 7d4456d12f..6105ce5be1 100644
--- a/apps/OpenSpace/ext/launcher/include/launcherwindow.h
+++ b/apps/OpenSpace/ext/launcher/include/launcherwindow.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/apps/OpenSpace/ext/launcher/include/profile/actiondialog.h b/apps/OpenSpace/ext/launcher/include/profile/actiondialog.h
index 8f7f91fe4e..c81263ad8b 100644
--- a/apps/OpenSpace/ext/launcher/include/profile/actiondialog.h
+++ b/apps/OpenSpace/ext/launcher/include/profile/actiondialog.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/apps/OpenSpace/ext/launcher/include/profile/additionalscriptsdialog.h b/apps/OpenSpace/ext/launcher/include/profile/additionalscriptsdialog.h
index 6d39e86c08..3684ebeb11 100644
--- a/apps/OpenSpace/ext/launcher/include/profile/additionalscriptsdialog.h
+++ b/apps/OpenSpace/ext/launcher/include/profile/additionalscriptsdialog.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/apps/OpenSpace/ext/launcher/include/profile/assetedit.h b/apps/OpenSpace/ext/launcher/include/profile/assetedit.h
index 01d976a3c4..b34db0bbcf 100644
--- a/apps/OpenSpace/ext/launcher/include/profile/assetedit.h
+++ b/apps/OpenSpace/ext/launcher/include/profile/assetedit.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/apps/OpenSpace/ext/launcher/include/profile/assetsdialog.h b/apps/OpenSpace/ext/launcher/include/profile/assetsdialog.h
index f5d89817d0..ba17c32986 100644
--- a/apps/OpenSpace/ext/launcher/include/profile/assetsdialog.h
+++ b/apps/OpenSpace/ext/launcher/include/profile/assetsdialog.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/apps/OpenSpace/ext/launcher/include/profile/assettreeitem.h b/apps/OpenSpace/ext/launcher/include/profile/assettreeitem.h
index 9d8b8169bb..9f9d585ca6 100644
--- a/apps/OpenSpace/ext/launcher/include/profile/assettreeitem.h
+++ b/apps/OpenSpace/ext/launcher/include/profile/assettreeitem.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/apps/OpenSpace/ext/launcher/include/profile/assettreemodel.h b/apps/OpenSpace/ext/launcher/include/profile/assettreemodel.h
index 299d3a0d4c..5294617aa3 100644
--- a/apps/OpenSpace/ext/launcher/include/profile/assettreemodel.h
+++ b/apps/OpenSpace/ext/launcher/include/profile/assettreemodel.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/apps/OpenSpace/ext/launcher/include/profile/cameradialog.h b/apps/OpenSpace/ext/launcher/include/profile/cameradialog.h
index 85eef19954..8e2b0b7761 100644
--- a/apps/OpenSpace/ext/launcher/include/profile/cameradialog.h
+++ b/apps/OpenSpace/ext/launcher/include/profile/cameradialog.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/apps/OpenSpace/ext/launcher/include/profile/deltatimesdialog.h b/apps/OpenSpace/ext/launcher/include/profile/deltatimesdialog.h
index 40fbaf004a..687a44844f 100644
--- a/apps/OpenSpace/ext/launcher/include/profile/deltatimesdialog.h
+++ b/apps/OpenSpace/ext/launcher/include/profile/deltatimesdialog.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/apps/OpenSpace/ext/launcher/include/profile/horizonsdialog.h b/apps/OpenSpace/ext/launcher/include/profile/horizonsdialog.h
index 8f8dec8c60..f08152a286 100644
--- a/apps/OpenSpace/ext/launcher/include/profile/horizonsdialog.h
+++ b/apps/OpenSpace/ext/launcher/include/profile/horizonsdialog.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/apps/OpenSpace/ext/launcher/include/profile/line.h b/apps/OpenSpace/ext/launcher/include/profile/line.h
index 4f51297604..84bcd02a52 100644
--- a/apps/OpenSpace/ext/launcher/include/profile/line.h
+++ b/apps/OpenSpace/ext/launcher/include/profile/line.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/apps/OpenSpace/ext/launcher/include/profile/marknodesdialog.h b/apps/OpenSpace/ext/launcher/include/profile/marknodesdialog.h
index 5a7f29faf9..35e3fff8e0 100644
--- a/apps/OpenSpace/ext/launcher/include/profile/marknodesdialog.h
+++ b/apps/OpenSpace/ext/launcher/include/profile/marknodesdialog.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/apps/OpenSpace/ext/launcher/include/profile/metadialog.h b/apps/OpenSpace/ext/launcher/include/profile/metadialog.h
index 46545b6d08..600d79f399 100644
--- a/apps/OpenSpace/ext/launcher/include/profile/metadialog.h
+++ b/apps/OpenSpace/ext/launcher/include/profile/metadialog.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/apps/OpenSpace/ext/launcher/include/profile/modulesdialog.h b/apps/OpenSpace/ext/launcher/include/profile/modulesdialog.h
index fd1f856336..d1d585fa66 100644
--- a/apps/OpenSpace/ext/launcher/include/profile/modulesdialog.h
+++ b/apps/OpenSpace/ext/launcher/include/profile/modulesdialog.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/apps/OpenSpace/ext/launcher/include/profile/profileedit.h b/apps/OpenSpace/ext/launcher/include/profile/profileedit.h
index d2e1e90925..6a1203b17a 100644
--- a/apps/OpenSpace/ext/launcher/include/profile/profileedit.h
+++ b/apps/OpenSpace/ext/launcher/include/profile/profileedit.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/apps/OpenSpace/ext/launcher/include/profile/propertiesdialog.h b/apps/OpenSpace/ext/launcher/include/profile/propertiesdialog.h
index a8900b0209..819dec642e 100644
--- a/apps/OpenSpace/ext/launcher/include/profile/propertiesdialog.h
+++ b/apps/OpenSpace/ext/launcher/include/profile/propertiesdialog.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/apps/OpenSpace/ext/launcher/include/profile/scriptlogdialog.h b/apps/OpenSpace/ext/launcher/include/profile/scriptlogdialog.h
index b85f4a678e..af982ae116 100644
--- a/apps/OpenSpace/ext/launcher/include/profile/scriptlogdialog.h
+++ b/apps/OpenSpace/ext/launcher/include/profile/scriptlogdialog.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/apps/OpenSpace/ext/launcher/include/profile/timedialog.h b/apps/OpenSpace/ext/launcher/include/profile/timedialog.h
index 0fd18a8aba..9875b5eab2 100644
--- a/apps/OpenSpace/ext/launcher/include/profile/timedialog.h
+++ b/apps/OpenSpace/ext/launcher/include/profile/timedialog.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/apps/OpenSpace/ext/launcher/include/settingsdialog.h b/apps/OpenSpace/ext/launcher/include/settingsdialog.h
index dcd2aa89c0..5ca8b1de01 100644
--- a/apps/OpenSpace/ext/launcher/include/settingsdialog.h
+++ b/apps/OpenSpace/ext/launcher/include/settingsdialog.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/apps/OpenSpace/ext/launcher/include/sgctedit/displaywindowunion.h b/apps/OpenSpace/ext/launcher/include/sgctedit/displaywindowunion.h
index bd3c0f824e..16baee258e 100644
--- a/apps/OpenSpace/ext/launcher/include/sgctedit/displaywindowunion.h
+++ b/apps/OpenSpace/ext/launcher/include/sgctedit/displaywindowunion.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/apps/OpenSpace/ext/launcher/include/sgctedit/monitorbox.h b/apps/OpenSpace/ext/launcher/include/sgctedit/monitorbox.h
index 7819ae58dc..ba4f157285 100644
--- a/apps/OpenSpace/ext/launcher/include/sgctedit/monitorbox.h
+++ b/apps/OpenSpace/ext/launcher/include/sgctedit/monitorbox.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/apps/OpenSpace/ext/launcher/include/sgctedit/orientationdialog.h b/apps/OpenSpace/ext/launcher/include/sgctedit/orientationdialog.h
index 498cf7cb20..5c332589e9 100644
--- a/apps/OpenSpace/ext/launcher/include/sgctedit/orientationdialog.h
+++ b/apps/OpenSpace/ext/launcher/include/sgctedit/orientationdialog.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/apps/OpenSpace/ext/launcher/include/sgctedit/settingswidget.h b/apps/OpenSpace/ext/launcher/include/sgctedit/settingswidget.h
index 6c15ff4094..4b020a302b 100644
--- a/apps/OpenSpace/ext/launcher/include/sgctedit/settingswidget.h
+++ b/apps/OpenSpace/ext/launcher/include/sgctedit/settingswidget.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/apps/OpenSpace/ext/launcher/include/sgctedit/sgctedit.h b/apps/OpenSpace/ext/launcher/include/sgctedit/sgctedit.h
index 96f01ab007..b94a469ddd 100644
--- a/apps/OpenSpace/ext/launcher/include/sgctedit/sgctedit.h
+++ b/apps/OpenSpace/ext/launcher/include/sgctedit/sgctedit.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/apps/OpenSpace/ext/launcher/include/sgctedit/windowcontrol.h b/apps/OpenSpace/ext/launcher/include/sgctedit/windowcontrol.h
index 2433a618d5..e3dd260b51 100644
--- a/apps/OpenSpace/ext/launcher/include/sgctedit/windowcontrol.h
+++ b/apps/OpenSpace/ext/launcher/include/sgctedit/windowcontrol.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/apps/OpenSpace/ext/launcher/src/filesystemaccess.cpp b/apps/OpenSpace/ext/launcher/src/filesystemaccess.cpp
index e48303b9b9..d0a3d6295b 100644
--- a/apps/OpenSpace/ext/launcher/src/filesystemaccess.cpp
+++ b/apps/OpenSpace/ext/launcher/src/filesystemaccess.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/apps/OpenSpace/ext/launcher/src/launcherwindow.cpp b/apps/OpenSpace/ext/launcher/src/launcherwindow.cpp
index 98d222cdaa..416e268c05 100644
--- a/apps/OpenSpace/ext/launcher/src/launcherwindow.cpp
+++ b/apps/OpenSpace/ext/launcher/src/launcherwindow.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/apps/OpenSpace/ext/launcher/src/profile/actiondialog.cpp b/apps/OpenSpace/ext/launcher/src/profile/actiondialog.cpp
index aff8eb342e..81745a45ca 100644
--- a/apps/OpenSpace/ext/launcher/src/profile/actiondialog.cpp
+++ b/apps/OpenSpace/ext/launcher/src/profile/actiondialog.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/apps/OpenSpace/ext/launcher/src/profile/additionalscriptsdialog.cpp b/apps/OpenSpace/ext/launcher/src/profile/additionalscriptsdialog.cpp
index 9dcb181983..32638b74a5 100644
--- a/apps/OpenSpace/ext/launcher/src/profile/additionalscriptsdialog.cpp
+++ b/apps/OpenSpace/ext/launcher/src/profile/additionalscriptsdialog.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/apps/OpenSpace/ext/launcher/src/profile/assetedit.cpp b/apps/OpenSpace/ext/launcher/src/profile/assetedit.cpp
index 0fb0de2345..2d94fd6aa4 100644
--- a/apps/OpenSpace/ext/launcher/src/profile/assetedit.cpp
+++ b/apps/OpenSpace/ext/launcher/src/profile/assetedit.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/apps/OpenSpace/ext/launcher/src/profile/assetsdialog.cpp b/apps/OpenSpace/ext/launcher/src/profile/assetsdialog.cpp
index 00dff88e11..387801653f 100644
--- a/apps/OpenSpace/ext/launcher/src/profile/assetsdialog.cpp
+++ b/apps/OpenSpace/ext/launcher/src/profile/assetsdialog.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/apps/OpenSpace/ext/launcher/src/profile/assettreeitem.cpp b/apps/OpenSpace/ext/launcher/src/profile/assettreeitem.cpp
index d68dc2d249..3d571f55d4 100644
--- a/apps/OpenSpace/ext/launcher/src/profile/assettreeitem.cpp
+++ b/apps/OpenSpace/ext/launcher/src/profile/assettreeitem.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/apps/OpenSpace/ext/launcher/src/profile/assettreemodel.cpp b/apps/OpenSpace/ext/launcher/src/profile/assettreemodel.cpp
index 467a61437c..50b24fd755 100644
--- a/apps/OpenSpace/ext/launcher/src/profile/assettreemodel.cpp
+++ b/apps/OpenSpace/ext/launcher/src/profile/assettreemodel.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/apps/OpenSpace/ext/launcher/src/profile/cameradialog.cpp b/apps/OpenSpace/ext/launcher/src/profile/cameradialog.cpp
index c44a83d063..c238896eaa 100644
--- a/apps/OpenSpace/ext/launcher/src/profile/cameradialog.cpp
+++ b/apps/OpenSpace/ext/launcher/src/profile/cameradialog.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/apps/OpenSpace/ext/launcher/src/profile/deltatimesdialog.cpp b/apps/OpenSpace/ext/launcher/src/profile/deltatimesdialog.cpp
index 8b20e26989..850d849f1c 100644
--- a/apps/OpenSpace/ext/launcher/src/profile/deltatimesdialog.cpp
+++ b/apps/OpenSpace/ext/launcher/src/profile/deltatimesdialog.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/apps/OpenSpace/ext/launcher/src/profile/horizonsdialog.cpp b/apps/OpenSpace/ext/launcher/src/profile/horizonsdialog.cpp
index d9f3f36789..92231cb143 100644
--- a/apps/OpenSpace/ext/launcher/src/profile/horizonsdialog.cpp
+++ b/apps/OpenSpace/ext/launcher/src/profile/horizonsdialog.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/apps/OpenSpace/ext/launcher/src/profile/line.cpp b/apps/OpenSpace/ext/launcher/src/profile/line.cpp
index 1b9bf42e8a..6bbf62cf88 100644
--- a/apps/OpenSpace/ext/launcher/src/profile/line.cpp
+++ b/apps/OpenSpace/ext/launcher/src/profile/line.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/apps/OpenSpace/ext/launcher/src/profile/marknodesdialog.cpp b/apps/OpenSpace/ext/launcher/src/profile/marknodesdialog.cpp
index a42396aee1..0a955cb781 100644
--- a/apps/OpenSpace/ext/launcher/src/profile/marknodesdialog.cpp
+++ b/apps/OpenSpace/ext/launcher/src/profile/marknodesdialog.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/apps/OpenSpace/ext/launcher/src/profile/metadialog.cpp b/apps/OpenSpace/ext/launcher/src/profile/metadialog.cpp
index 5158df2029..90bf7783cc 100644
--- a/apps/OpenSpace/ext/launcher/src/profile/metadialog.cpp
+++ b/apps/OpenSpace/ext/launcher/src/profile/metadialog.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/apps/OpenSpace/ext/launcher/src/profile/modulesdialog.cpp b/apps/OpenSpace/ext/launcher/src/profile/modulesdialog.cpp
index cd345d04f4..fc5df1fa22 100644
--- a/apps/OpenSpace/ext/launcher/src/profile/modulesdialog.cpp
+++ b/apps/OpenSpace/ext/launcher/src/profile/modulesdialog.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/apps/OpenSpace/ext/launcher/src/profile/profileedit.cpp b/apps/OpenSpace/ext/launcher/src/profile/profileedit.cpp
index be170d2eef..6b13a36ef7 100644
--- a/apps/OpenSpace/ext/launcher/src/profile/profileedit.cpp
+++ b/apps/OpenSpace/ext/launcher/src/profile/profileedit.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/apps/OpenSpace/ext/launcher/src/profile/propertiesdialog.cpp b/apps/OpenSpace/ext/launcher/src/profile/propertiesdialog.cpp
index 654f6fb24a..5a92f969b2 100644
--- a/apps/OpenSpace/ext/launcher/src/profile/propertiesdialog.cpp
+++ b/apps/OpenSpace/ext/launcher/src/profile/propertiesdialog.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/apps/OpenSpace/ext/launcher/src/profile/scriptlogdialog.cpp b/apps/OpenSpace/ext/launcher/src/profile/scriptlogdialog.cpp
index d78e105118..ffdefd95d3 100644
--- a/apps/OpenSpace/ext/launcher/src/profile/scriptlogdialog.cpp
+++ b/apps/OpenSpace/ext/launcher/src/profile/scriptlogdialog.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/apps/OpenSpace/ext/launcher/src/profile/timedialog.cpp b/apps/OpenSpace/ext/launcher/src/profile/timedialog.cpp
index 0ab1e9fd9f..d10fd0354b 100644
--- a/apps/OpenSpace/ext/launcher/src/profile/timedialog.cpp
+++ b/apps/OpenSpace/ext/launcher/src/profile/timedialog.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/apps/OpenSpace/ext/launcher/src/settingsdialog.cpp b/apps/OpenSpace/ext/launcher/src/settingsdialog.cpp
index dff09d8fc3..f9c0eac68a 100644
--- a/apps/OpenSpace/ext/launcher/src/settingsdialog.cpp
+++ b/apps/OpenSpace/ext/launcher/src/settingsdialog.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/apps/OpenSpace/ext/launcher/src/sgctedit/displaywindowunion.cpp b/apps/OpenSpace/ext/launcher/src/sgctedit/displaywindowunion.cpp
index 361004653a..f651745b98 100644
--- a/apps/OpenSpace/ext/launcher/src/sgctedit/displaywindowunion.cpp
+++ b/apps/OpenSpace/ext/launcher/src/sgctedit/displaywindowunion.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/apps/OpenSpace/ext/launcher/src/sgctedit/monitorbox.cpp b/apps/OpenSpace/ext/launcher/src/sgctedit/monitorbox.cpp
index ebb1b80c0c..3bde46d3ab 100644
--- a/apps/OpenSpace/ext/launcher/src/sgctedit/monitorbox.cpp
+++ b/apps/OpenSpace/ext/launcher/src/sgctedit/monitorbox.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/apps/OpenSpace/ext/launcher/src/sgctedit/orientationdialog.cpp b/apps/OpenSpace/ext/launcher/src/sgctedit/orientationdialog.cpp
index 008281d863..de2099e26e 100644
--- a/apps/OpenSpace/ext/launcher/src/sgctedit/orientationdialog.cpp
+++ b/apps/OpenSpace/ext/launcher/src/sgctedit/orientationdialog.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/apps/OpenSpace/ext/launcher/src/sgctedit/settingswidget.cpp b/apps/OpenSpace/ext/launcher/src/sgctedit/settingswidget.cpp
index 0130c6a112..dc4df89f46 100644
--- a/apps/OpenSpace/ext/launcher/src/sgctedit/settingswidget.cpp
+++ b/apps/OpenSpace/ext/launcher/src/sgctedit/settingswidget.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/apps/OpenSpace/ext/launcher/src/sgctedit/sgctedit.cpp b/apps/OpenSpace/ext/launcher/src/sgctedit/sgctedit.cpp
index 08d72eaa49..77a5d2db65 100644
--- a/apps/OpenSpace/ext/launcher/src/sgctedit/sgctedit.cpp
+++ b/apps/OpenSpace/ext/launcher/src/sgctedit/sgctedit.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/apps/OpenSpace/ext/launcher/src/sgctedit/windowcontrol.cpp b/apps/OpenSpace/ext/launcher/src/sgctedit/windowcontrol.cpp
index b472dc71b7..431e6ab789 100644
--- a/apps/OpenSpace/ext/launcher/src/sgctedit/windowcontrol.cpp
+++ b/apps/OpenSpace/ext/launcher/src/sgctedit/windowcontrol.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/apps/OpenSpace/ext/sgct b/apps/OpenSpace/ext/sgct
index cd588a8090..377de30963 160000
--- a/apps/OpenSpace/ext/sgct
+++ b/apps/OpenSpace/ext/sgct
@@ -1 +1 @@
-Subproject commit cd588a809006263554950a51aeb0cb9cf4848417
+Subproject commit 377de309631d8a1c9b53becd363db0dc8ee76ae6
diff --git a/apps/OpenSpace/main.cpp b/apps/OpenSpace/main.cpp
index 96ea13d8a2..db2f9400a2 100644
--- a/apps/OpenSpace/main.cpp
+++ b/apps/OpenSpace/main.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/apps/Sync/main.cpp b/apps/Sync/main.cpp
index 2de95d3440..097ba2cdbe 100644
--- a/apps/Sync/main.cpp
+++ b/apps/Sync/main.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/apps/TaskRunner/main.cpp b/apps/TaskRunner/main.cpp
index a4b4ced21f..81316a9d04 100644
--- a/apps/TaskRunner/main.cpp
+++ b/apps/TaskRunner/main.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/data/assets/examples/modelshader/model_fs.glsl b/data/assets/examples/modelshader/model_fs.glsl
index fbf50732bc..106e1603bc 100644
--- a/data/assets/examples/modelshader/model_fs.glsl
+++ b/data/assets/examples/modelshader/model_fs.glsl
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/data/assets/examples/modelshader/model_vs.glsl b/data/assets/examples/modelshader/model_vs.glsl
index 76cead149f..9d12edc407 100644
--- a/data/assets/examples/modelshader/model_vs.glsl
+++ b/data/assets/examples/modelshader/model_vs.glsl
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/ext/ghoul b/ext/ghoul
index ba6aece1de..42fbc6cc49 160000
--- a/ext/ghoul
+++ b/ext/ghoul
@@ -1 +1 @@
-Subproject commit ba6aece1deb12599fcaa61be133658534ed84425
+Subproject commit 42fbc6cc49993893e840f25da1ca505244779005
diff --git a/ext/spice b/ext/spice
index 5dba0f3269..711ffdb918 160000
--- a/ext/spice
+++ b/ext/spice
@@ -1 +1 @@
-Subproject commit 5dba0f32690dd49f29adbbf618a69e5709cdc405
+Subproject commit 711ffdb91865c48018ba2efef963ed645ed2557b
diff --git a/include/openspace/camera/camera.h b/include/openspace/camera/camera.h
index 460b260bbb..f975b70b23 100644
--- a/include/openspace/camera/camera.h
+++ b/include/openspace/camera/camera.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/include/openspace/camera/camerapose.h b/include/openspace/camera/camerapose.h
index d17ae6c054..1eca506326 100644
--- a/include/openspace/camera/camerapose.h
+++ b/include/openspace/camera/camerapose.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/include/openspace/data/csvloader.h b/include/openspace/data/csvloader.h
index dcc4163415..a6f3734e61 100644
--- a/include/openspace/data/csvloader.h
+++ b/include/openspace/data/csvloader.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/include/openspace/data/dataloader.h b/include/openspace/data/dataloader.h
index 4c8ef8e918..73ca6a0e07 100644
--- a/include/openspace/data/dataloader.h
+++ b/include/openspace/data/dataloader.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/include/openspace/data/datamapping.h b/include/openspace/data/datamapping.h
index 791f4d4420..5f2b98beb2 100644
--- a/include/openspace/data/datamapping.h
+++ b/include/openspace/data/datamapping.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/include/openspace/data/speckloader.h b/include/openspace/data/speckloader.h
index 0ff86a8ba7..eb72101e3a 100644
--- a/include/openspace/data/speckloader.h
+++ b/include/openspace/data/speckloader.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/include/openspace/documentation/core_registration.h b/include/openspace/documentation/core_registration.h
index d0ff377dd1..6d876b458f 100644
--- a/include/openspace/documentation/core_registration.h
+++ b/include/openspace/documentation/core_registration.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/include/openspace/documentation/documentation.h b/include/openspace/documentation/documentation.h
index 28d2029922..738a88cb3e 100644
--- a/include/openspace/documentation/documentation.h
+++ b/include/openspace/documentation/documentation.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/include/openspace/documentation/documentationengine.h b/include/openspace/documentation/documentationengine.h
index a21f563b90..004acd1ecd 100644
--- a/include/openspace/documentation/documentationengine.h
+++ b/include/openspace/documentation/documentationengine.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/include/openspace/documentation/verifier.h b/include/openspace/documentation/verifier.h
index fc7cc06b71..20bc2d3a76 100644
--- a/include/openspace/documentation/verifier.h
+++ b/include/openspace/documentation/verifier.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/include/openspace/documentation/verifier.inl b/include/openspace/documentation/verifier.inl
index 298ca7f1fd..2e10417050 100644
--- a/include/openspace/documentation/verifier.inl
+++ b/include/openspace/documentation/verifier.inl
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/include/openspace/engine/configuration.h b/include/openspace/engine/configuration.h
index 20eb637564..a7d2295deb 100644
--- a/include/openspace/engine/configuration.h
+++ b/include/openspace/engine/configuration.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/include/openspace/engine/downloadmanager.h b/include/openspace/engine/downloadmanager.h
index 1eda760dbc..7143b4ee61 100644
--- a/include/openspace/engine/downloadmanager.h
+++ b/include/openspace/engine/downloadmanager.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/include/openspace/engine/globals.h b/include/openspace/engine/globals.h
index 55a1cda83e..add1a4f99c 100644
--- a/include/openspace/engine/globals.h
+++ b/include/openspace/engine/globals.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/include/openspace/engine/globalscallbacks.h b/include/openspace/engine/globalscallbacks.h
index 4dba55e44e..e6b9b505b0 100644
--- a/include/openspace/engine/globalscallbacks.h
+++ b/include/openspace/engine/globalscallbacks.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/include/openspace/engine/logfactory.h b/include/openspace/engine/logfactory.h
index f206ccd738..b60a11987c 100644
--- a/include/openspace/engine/logfactory.h
+++ b/include/openspace/engine/logfactory.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/include/openspace/engine/moduleengine.h b/include/openspace/engine/moduleengine.h
index 4bfe52c166..0a4bee8110 100644
--- a/include/openspace/engine/moduleengine.h
+++ b/include/openspace/engine/moduleengine.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/include/openspace/engine/moduleengine.inl b/include/openspace/engine/moduleengine.inl
index b699db55be..3925728251 100644
--- a/include/openspace/engine/moduleengine.inl
+++ b/include/openspace/engine/moduleengine.inl
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/include/openspace/engine/openspaceengine.h b/include/openspace/engine/openspaceengine.h
index 291a65aefa..892bb072ea 100644
--- a/include/openspace/engine/openspaceengine.h
+++ b/include/openspace/engine/openspaceengine.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/include/openspace/engine/settings.h b/include/openspace/engine/settings.h
index 7ccaee7d11..0095810d5c 100644
--- a/include/openspace/engine/settings.h
+++ b/include/openspace/engine/settings.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/include/openspace/engine/syncengine.h b/include/openspace/engine/syncengine.h
index fb6d9933f2..36abe1d828 100644
--- a/include/openspace/engine/syncengine.h
+++ b/include/openspace/engine/syncengine.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/include/openspace/engine/windowdelegate.h b/include/openspace/engine/windowdelegate.h
index 13458e6e8c..aeb8462bd3 100644
--- a/include/openspace/engine/windowdelegate.h
+++ b/include/openspace/engine/windowdelegate.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/include/openspace/events/event.h b/include/openspace/events/event.h
index 5b4c54794e..a4eb4efe61 100644
--- a/include/openspace/events/event.h
+++ b/include/openspace/events/event.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/include/openspace/events/eventengine.h b/include/openspace/events/eventengine.h
index 72d4a9c7f2..10f4eecca4 100644
--- a/include/openspace/events/eventengine.h
+++ b/include/openspace/events/eventengine.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/include/openspace/events/eventengine.inl b/include/openspace/events/eventengine.inl
index 510bb75db8..7961fa4c7f 100644
--- a/include/openspace/events/eventengine.inl
+++ b/include/openspace/events/eventengine.inl
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/include/openspace/interaction/action.h b/include/openspace/interaction/action.h
index a0f21bd76b..50e34439c3 100644
--- a/include/openspace/interaction/action.h
+++ b/include/openspace/interaction/action.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/include/openspace/interaction/actionmanager.h b/include/openspace/interaction/actionmanager.h
index 610bdbf1e9..b8c37637ad 100644
--- a/include/openspace/interaction/actionmanager.h
+++ b/include/openspace/interaction/actionmanager.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/include/openspace/interaction/camerainteractionstates.h b/include/openspace/interaction/camerainteractionstates.h
index 5e31c37c5f..d2e267d751 100644
--- a/include/openspace/interaction/camerainteractionstates.h
+++ b/include/openspace/interaction/camerainteractionstates.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/include/openspace/interaction/delayedvariable.h b/include/openspace/interaction/delayedvariable.h
index 67046c7bdf..26cd6f059e 100644
--- a/include/openspace/interaction/delayedvariable.h
+++ b/include/openspace/interaction/delayedvariable.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/include/openspace/interaction/delayedvariable.inl b/include/openspace/interaction/delayedvariable.inl
index e626610442..e0e26dbb45 100644
--- a/include/openspace/interaction/delayedvariable.inl
+++ b/include/openspace/interaction/delayedvariable.inl
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/include/openspace/interaction/interactionmonitor.h b/include/openspace/interaction/interactionmonitor.h
index 6cc2907a0e..d668bd4939 100644
--- a/include/openspace/interaction/interactionmonitor.h
+++ b/include/openspace/interaction/interactionmonitor.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/include/openspace/interaction/interpolator.h b/include/openspace/interaction/interpolator.h
index d017bd8618..0167776ded 100644
--- a/include/openspace/interaction/interpolator.h
+++ b/include/openspace/interaction/interpolator.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/include/openspace/interaction/interpolator.inl b/include/openspace/interaction/interpolator.inl
index 5f9d3f45cc..f1c24eb068 100644
--- a/include/openspace/interaction/interpolator.inl
+++ b/include/openspace/interaction/interpolator.inl
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/include/openspace/interaction/joystickcamerastates.h b/include/openspace/interaction/joystickcamerastates.h
index ac418e1ee5..c499cdff89 100644
--- a/include/openspace/interaction/joystickcamerastates.h
+++ b/include/openspace/interaction/joystickcamerastates.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/include/openspace/interaction/joystickinputstate.h b/include/openspace/interaction/joystickinputstate.h
index 6c9cd42fa0..0370470589 100644
--- a/include/openspace/interaction/joystickinputstate.h
+++ b/include/openspace/interaction/joystickinputstate.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/include/openspace/interaction/keybindingmanager.h b/include/openspace/interaction/keybindingmanager.h
index cca79962c6..c638c5015d 100644
--- a/include/openspace/interaction/keybindingmanager.h
+++ b/include/openspace/interaction/keybindingmanager.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/include/openspace/interaction/keyboardinputstate.h b/include/openspace/interaction/keyboardinputstate.h
index 0eb0fdf9ac..fd0ac8beaf 100644
--- a/include/openspace/interaction/keyboardinputstate.h
+++ b/include/openspace/interaction/keyboardinputstate.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/include/openspace/interaction/mousecamerastates.h b/include/openspace/interaction/mousecamerastates.h
index 56f70f2085..252d2ecd7e 100644
--- a/include/openspace/interaction/mousecamerastates.h
+++ b/include/openspace/interaction/mousecamerastates.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/include/openspace/interaction/mouseinputstate.h b/include/openspace/interaction/mouseinputstate.h
index 67809b94b7..bef3482969 100644
--- a/include/openspace/interaction/mouseinputstate.h
+++ b/include/openspace/interaction/mouseinputstate.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/include/openspace/interaction/scriptcamerastates.h b/include/openspace/interaction/scriptcamerastates.h
index 716e145670..3eb5dfd31e 100644
--- a/include/openspace/interaction/scriptcamerastates.h
+++ b/include/openspace/interaction/scriptcamerastates.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/include/openspace/interaction/sessionrecording.h b/include/openspace/interaction/sessionrecording.h
index 7e667c0a68..da587cd4ef 100644
--- a/include/openspace/interaction/sessionrecording.h
+++ b/include/openspace/interaction/sessionrecording.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/include/openspace/interaction/sessionrecording.inl b/include/openspace/interaction/sessionrecording.inl
index 9a1ad5298a..0be76b5709 100644
--- a/include/openspace/interaction/sessionrecording.inl
+++ b/include/openspace/interaction/sessionrecording.inl
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/include/openspace/interaction/tasks/convertrecfileversiontask.h b/include/openspace/interaction/tasks/convertrecfileversiontask.h
index 16ee58d6cb..5ae50c68ca 100644
--- a/include/openspace/interaction/tasks/convertrecfileversiontask.h
+++ b/include/openspace/interaction/tasks/convertrecfileversiontask.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/include/openspace/interaction/tasks/convertrecformattask.h b/include/openspace/interaction/tasks/convertrecformattask.h
index 538f8324a7..ddc1167934 100644
--- a/include/openspace/interaction/tasks/convertrecformattask.h
+++ b/include/openspace/interaction/tasks/convertrecformattask.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/include/openspace/interaction/touchbar.h b/include/openspace/interaction/touchbar.h
index f27b738332..77f405ab70 100644
--- a/include/openspace/interaction/touchbar.h
+++ b/include/openspace/interaction/touchbar.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/include/openspace/interaction/websocketcamerastates.h b/include/openspace/interaction/websocketcamerastates.h
index 1ed1e933a8..dd5a76c992 100644
--- a/include/openspace/interaction/websocketcamerastates.h
+++ b/include/openspace/interaction/websocketcamerastates.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/include/openspace/interaction/websocketinputstate.h b/include/openspace/interaction/websocketinputstate.h
index 0b57864a23..e37f55fbdb 100644
--- a/include/openspace/interaction/websocketinputstate.h
+++ b/include/openspace/interaction/websocketinputstate.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/include/openspace/json.h b/include/openspace/json.h
index ff3a2a6458..26fee89531 100644
--- a/include/openspace/json.h
+++ b/include/openspace/json.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/include/openspace/mission/mission.h b/include/openspace/mission/mission.h
index 731e1951a3..3e0205ac2d 100644
--- a/include/openspace/mission/mission.h
+++ b/include/openspace/mission/mission.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/include/openspace/mission/missionmanager.h b/include/openspace/mission/missionmanager.h
index e7a3f9f1bc..bd0b4cd028 100644
--- a/include/openspace/mission/missionmanager.h
+++ b/include/openspace/mission/missionmanager.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/include/openspace/navigation/keyframenavigator.h b/include/openspace/navigation/keyframenavigator.h
index 9bb1a3ee4f..237a167eac 100644
--- a/include/openspace/navigation/keyframenavigator.h
+++ b/include/openspace/navigation/keyframenavigator.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/include/openspace/navigation/navigationhandler.h b/include/openspace/navigation/navigationhandler.h
index 267d85507d..54f3068d31 100644
--- a/include/openspace/navigation/navigationhandler.h
+++ b/include/openspace/navigation/navigationhandler.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/include/openspace/navigation/navigationstate.h b/include/openspace/navigation/navigationstate.h
index 5418d322a6..bed4f338cd 100644
--- a/include/openspace/navigation/navigationstate.h
+++ b/include/openspace/navigation/navigationstate.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/include/openspace/navigation/orbitalnavigator.h b/include/openspace/navigation/orbitalnavigator.h
index 334c8cb400..4da4639bc7 100644
--- a/include/openspace/navigation/orbitalnavigator.h
+++ b/include/openspace/navigation/orbitalnavigator.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/include/openspace/navigation/path.h b/include/openspace/navigation/path.h
index 6371cd0633..752c1f08d6 100644
--- a/include/openspace/navigation/path.h
+++ b/include/openspace/navigation/path.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/include/openspace/navigation/pathcurve.h b/include/openspace/navigation/pathcurve.h
index 5aa8deed13..4cda795d06 100644
--- a/include/openspace/navigation/pathcurve.h
+++ b/include/openspace/navigation/pathcurve.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/include/openspace/navigation/pathcurves/avoidcollisioncurve.h b/include/openspace/navigation/pathcurves/avoidcollisioncurve.h
index e4af29a49e..77a3344394 100644
--- a/include/openspace/navigation/pathcurves/avoidcollisioncurve.h
+++ b/include/openspace/navigation/pathcurves/avoidcollisioncurve.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/include/openspace/navigation/pathcurves/zoomoutoverviewcurve.h b/include/openspace/navigation/pathcurves/zoomoutoverviewcurve.h
index b040da1d88..e32200e97e 100644
--- a/include/openspace/navigation/pathcurves/zoomoutoverviewcurve.h
+++ b/include/openspace/navigation/pathcurves/zoomoutoverviewcurve.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/include/openspace/navigation/pathnavigator.h b/include/openspace/navigation/pathnavigator.h
index a8d1897cac..83ced28727 100644
--- a/include/openspace/navigation/pathnavigator.h
+++ b/include/openspace/navigation/pathnavigator.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/include/openspace/navigation/waypoint.h b/include/openspace/navigation/waypoint.h
index 3a12dd39d2..373cb07804 100644
--- a/include/openspace/navigation/waypoint.h
+++ b/include/openspace/navigation/waypoint.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/include/openspace/network/messagestructures.h b/include/openspace/network/messagestructures.h
index 2e6999523e..ff20ee9425 100644
--- a/include/openspace/network/messagestructures.h
+++ b/include/openspace/network/messagestructures.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/include/openspace/network/messagestructureshelper.h b/include/openspace/network/messagestructureshelper.h
index 3133c87923..21d2028159 100644
--- a/include/openspace/network/messagestructureshelper.h
+++ b/include/openspace/network/messagestructureshelper.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/include/openspace/network/parallelconnection.h b/include/openspace/network/parallelconnection.h
index d3468f7a4a..a633f3ab89 100644
--- a/include/openspace/network/parallelconnection.h
+++ b/include/openspace/network/parallelconnection.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/include/openspace/network/parallelpeer.h b/include/openspace/network/parallelpeer.h
index 2e852d2808..734ba6e8f2 100644
--- a/include/openspace/network/parallelpeer.h
+++ b/include/openspace/network/parallelpeer.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/include/openspace/properties/list/doublelistproperty.h b/include/openspace/properties/list/doublelistproperty.h
index 03ee240b7b..86831a15dc 100644
--- a/include/openspace/properties/list/doublelistproperty.h
+++ b/include/openspace/properties/list/doublelistproperty.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/include/openspace/properties/list/intlistproperty.h b/include/openspace/properties/list/intlistproperty.h
index c898232d98..f10f638cf3 100644
--- a/include/openspace/properties/list/intlistproperty.h
+++ b/include/openspace/properties/list/intlistproperty.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/include/openspace/properties/list/stringlistproperty.h b/include/openspace/properties/list/stringlistproperty.h
index 4d6c1e2e53..085e42e3da 100644
--- a/include/openspace/properties/list/stringlistproperty.h
+++ b/include/openspace/properties/list/stringlistproperty.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/include/openspace/properties/listproperty.h b/include/openspace/properties/listproperty.h
index 061f5f9014..da39b572a0 100644
--- a/include/openspace/properties/listproperty.h
+++ b/include/openspace/properties/listproperty.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/include/openspace/properties/listproperty.inl b/include/openspace/properties/listproperty.inl
index b2c6fbcf2b..8ac8980a9e 100644
--- a/include/openspace/properties/listproperty.inl
+++ b/include/openspace/properties/listproperty.inl
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/include/openspace/properties/matrix/dmat2property.h b/include/openspace/properties/matrix/dmat2property.h
index 18fbfe7155..aad0b641b5 100644
--- a/include/openspace/properties/matrix/dmat2property.h
+++ b/include/openspace/properties/matrix/dmat2property.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/include/openspace/properties/matrix/dmat3property.h b/include/openspace/properties/matrix/dmat3property.h
index e98ac3a1cf..8487f99b6f 100644
--- a/include/openspace/properties/matrix/dmat3property.h
+++ b/include/openspace/properties/matrix/dmat3property.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/include/openspace/properties/matrix/dmat4property.h b/include/openspace/properties/matrix/dmat4property.h
index 6a1ae2f87e..5c6c199821 100644
--- a/include/openspace/properties/matrix/dmat4property.h
+++ b/include/openspace/properties/matrix/dmat4property.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/include/openspace/properties/matrix/mat2property.h b/include/openspace/properties/matrix/mat2property.h
index 14a7936200..625e6c4fad 100644
--- a/include/openspace/properties/matrix/mat2property.h
+++ b/include/openspace/properties/matrix/mat2property.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/include/openspace/properties/matrix/mat3property.h b/include/openspace/properties/matrix/mat3property.h
index 26319be8ea..ffab98c91d 100644
--- a/include/openspace/properties/matrix/mat3property.h
+++ b/include/openspace/properties/matrix/mat3property.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/include/openspace/properties/matrix/mat4property.h b/include/openspace/properties/matrix/mat4property.h
index ba6a3ecba6..e77aad59e8 100644
--- a/include/openspace/properties/matrix/mat4property.h
+++ b/include/openspace/properties/matrix/mat4property.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/include/openspace/properties/numericalproperty.h b/include/openspace/properties/numericalproperty.h
index dc7cc814c1..5bdd656048 100644
--- a/include/openspace/properties/numericalproperty.h
+++ b/include/openspace/properties/numericalproperty.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/include/openspace/properties/numericalproperty.inl b/include/openspace/properties/numericalproperty.inl
index 29c4a17458..ce87cd47b0 100644
--- a/include/openspace/properties/numericalproperty.inl
+++ b/include/openspace/properties/numericalproperty.inl
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/include/openspace/properties/optionproperty.h b/include/openspace/properties/optionproperty.h
index f115c05608..aaa8b49242 100644
--- a/include/openspace/properties/optionproperty.h
+++ b/include/openspace/properties/optionproperty.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/include/openspace/properties/property.h b/include/openspace/properties/property.h
index 3ec4521a14..e1d71a4b7f 100644
--- a/include/openspace/properties/property.h
+++ b/include/openspace/properties/property.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/include/openspace/properties/propertyowner.h b/include/openspace/properties/propertyowner.h
index 7fc6e03858..1723f6017c 100644
--- a/include/openspace/properties/propertyowner.h
+++ b/include/openspace/properties/propertyowner.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/include/openspace/properties/scalar/boolproperty.h b/include/openspace/properties/scalar/boolproperty.h
index 61ded1814e..4c97effe5a 100644
--- a/include/openspace/properties/scalar/boolproperty.h
+++ b/include/openspace/properties/scalar/boolproperty.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/include/openspace/properties/scalar/doubleproperty.h b/include/openspace/properties/scalar/doubleproperty.h
index fc8820cf4d..64718668c8 100644
--- a/include/openspace/properties/scalar/doubleproperty.h
+++ b/include/openspace/properties/scalar/doubleproperty.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/include/openspace/properties/scalar/floatproperty.h b/include/openspace/properties/scalar/floatproperty.h
index 5cf7c28139..d0e9bd634c 100644
--- a/include/openspace/properties/scalar/floatproperty.h
+++ b/include/openspace/properties/scalar/floatproperty.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/include/openspace/properties/scalar/intproperty.h b/include/openspace/properties/scalar/intproperty.h
index 77d0a1bcbd..293394a06b 100644
--- a/include/openspace/properties/scalar/intproperty.h
+++ b/include/openspace/properties/scalar/intproperty.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/include/openspace/properties/scalar/longproperty.h b/include/openspace/properties/scalar/longproperty.h
index 09c7dbc605..b466314766 100644
--- a/include/openspace/properties/scalar/longproperty.h
+++ b/include/openspace/properties/scalar/longproperty.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/include/openspace/properties/scalar/shortproperty.h b/include/openspace/properties/scalar/shortproperty.h
index be258b07ca..c3ee633957 100644
--- a/include/openspace/properties/scalar/shortproperty.h
+++ b/include/openspace/properties/scalar/shortproperty.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/include/openspace/properties/scalar/uintproperty.h b/include/openspace/properties/scalar/uintproperty.h
index 22b1abfd32..4704ae52ed 100644
--- a/include/openspace/properties/scalar/uintproperty.h
+++ b/include/openspace/properties/scalar/uintproperty.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/include/openspace/properties/scalar/ulongproperty.h b/include/openspace/properties/scalar/ulongproperty.h
index 2dbc36cdad..0a7e74ae9a 100644
--- a/include/openspace/properties/scalar/ulongproperty.h
+++ b/include/openspace/properties/scalar/ulongproperty.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/include/openspace/properties/scalar/ushortproperty.h b/include/openspace/properties/scalar/ushortproperty.h
index a5c2f9c917..e3592ed77e 100644
--- a/include/openspace/properties/scalar/ushortproperty.h
+++ b/include/openspace/properties/scalar/ushortproperty.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/include/openspace/properties/selectionproperty.h b/include/openspace/properties/selectionproperty.h
index 45cca8b4c8..225fb6f69e 100644
--- a/include/openspace/properties/selectionproperty.h
+++ b/include/openspace/properties/selectionproperty.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/include/openspace/properties/stringproperty.h b/include/openspace/properties/stringproperty.h
index cd0a470c8b..bd33a65f34 100644
--- a/include/openspace/properties/stringproperty.h
+++ b/include/openspace/properties/stringproperty.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/include/openspace/properties/templateproperty.h b/include/openspace/properties/templateproperty.h
index b4e7318635..a61716d466 100644
--- a/include/openspace/properties/templateproperty.h
+++ b/include/openspace/properties/templateproperty.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/include/openspace/properties/templateproperty.inl b/include/openspace/properties/templateproperty.inl
index 285ece6273..81d0a422f5 100644
--- a/include/openspace/properties/templateproperty.inl
+++ b/include/openspace/properties/templateproperty.inl
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/include/openspace/properties/triggerproperty.h b/include/openspace/properties/triggerproperty.h
index 225663e965..be71c23053 100644
--- a/include/openspace/properties/triggerproperty.h
+++ b/include/openspace/properties/triggerproperty.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/include/openspace/properties/vector/dvec2property.h b/include/openspace/properties/vector/dvec2property.h
index dcf6d4076f..4ca2d9185b 100644
--- a/include/openspace/properties/vector/dvec2property.h
+++ b/include/openspace/properties/vector/dvec2property.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/include/openspace/properties/vector/dvec3property.h b/include/openspace/properties/vector/dvec3property.h
index f757b781a2..ccd80659e5 100644
--- a/include/openspace/properties/vector/dvec3property.h
+++ b/include/openspace/properties/vector/dvec3property.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/include/openspace/properties/vector/dvec4property.h b/include/openspace/properties/vector/dvec4property.h
index d4e13a4f38..1f6d24ca47 100644
--- a/include/openspace/properties/vector/dvec4property.h
+++ b/include/openspace/properties/vector/dvec4property.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/include/openspace/properties/vector/ivec2property.h b/include/openspace/properties/vector/ivec2property.h
index 394e425c79..d0a0bb55ed 100644
--- a/include/openspace/properties/vector/ivec2property.h
+++ b/include/openspace/properties/vector/ivec2property.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/include/openspace/properties/vector/ivec3property.h b/include/openspace/properties/vector/ivec3property.h
index 39185715ef..e392f9a447 100644
--- a/include/openspace/properties/vector/ivec3property.h
+++ b/include/openspace/properties/vector/ivec3property.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/include/openspace/properties/vector/ivec4property.h b/include/openspace/properties/vector/ivec4property.h
index 73c6c236ad..2df206908d 100644
--- a/include/openspace/properties/vector/ivec4property.h
+++ b/include/openspace/properties/vector/ivec4property.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/include/openspace/properties/vector/uvec2property.h b/include/openspace/properties/vector/uvec2property.h
index 2ffc25bcd6..71b51d8e75 100644
--- a/include/openspace/properties/vector/uvec2property.h
+++ b/include/openspace/properties/vector/uvec2property.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/include/openspace/properties/vector/uvec3property.h b/include/openspace/properties/vector/uvec3property.h
index 95f0342362..b320925f37 100644
--- a/include/openspace/properties/vector/uvec3property.h
+++ b/include/openspace/properties/vector/uvec3property.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/include/openspace/properties/vector/uvec4property.h b/include/openspace/properties/vector/uvec4property.h
index 9bbffcd029..a2a4c7b05e 100644
--- a/include/openspace/properties/vector/uvec4property.h
+++ b/include/openspace/properties/vector/uvec4property.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/include/openspace/properties/vector/vec2property.h b/include/openspace/properties/vector/vec2property.h
index bfbd996e1a..8aae577979 100644
--- a/include/openspace/properties/vector/vec2property.h
+++ b/include/openspace/properties/vector/vec2property.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/include/openspace/properties/vector/vec3property.h b/include/openspace/properties/vector/vec3property.h
index 37f56da6ca..56bb686768 100644
--- a/include/openspace/properties/vector/vec3property.h
+++ b/include/openspace/properties/vector/vec3property.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/include/openspace/properties/vector/vec4property.h b/include/openspace/properties/vector/vec4property.h
index e9e0a20856..ebe2a0c8d3 100644
--- a/include/openspace/properties/vector/vec4property.h
+++ b/include/openspace/properties/vector/vec4property.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/include/openspace/query/query.h b/include/openspace/query/query.h
index 37e31077d5..357ef81eed 100644
--- a/include/openspace/query/query.h
+++ b/include/openspace/query/query.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/include/openspace/rendering/colormappingcomponent.h b/include/openspace/rendering/colormappingcomponent.h
index fb80b16bbf..308d79344e 100644
--- a/include/openspace/rendering/colormappingcomponent.h
+++ b/include/openspace/rendering/colormappingcomponent.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/include/openspace/rendering/dashboard.h b/include/openspace/rendering/dashboard.h
index 2f0fcf1131..1373a378cc 100644
--- a/include/openspace/rendering/dashboard.h
+++ b/include/openspace/rendering/dashboard.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/include/openspace/rendering/dashboarditem.h b/include/openspace/rendering/dashboarditem.h
index c9ec5f0250..6c278ae8a4 100644
--- a/include/openspace/rendering/dashboarditem.h
+++ b/include/openspace/rendering/dashboarditem.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/include/openspace/rendering/dashboardtextitem.h b/include/openspace/rendering/dashboardtextitem.h
index bf5fa72011..4c6a69337e 100644
--- a/include/openspace/rendering/dashboardtextitem.h
+++ b/include/openspace/rendering/dashboardtextitem.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/include/openspace/rendering/deferredcaster.h b/include/openspace/rendering/deferredcaster.h
index 8d0b4f68a1..9a52cd0ccc 100644
--- a/include/openspace/rendering/deferredcaster.h
+++ b/include/openspace/rendering/deferredcaster.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/include/openspace/rendering/deferredcasterlistener.h b/include/openspace/rendering/deferredcasterlistener.h
index 4520801127..bac5e2048a 100644
--- a/include/openspace/rendering/deferredcasterlistener.h
+++ b/include/openspace/rendering/deferredcasterlistener.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/include/openspace/rendering/deferredcastermanager.h b/include/openspace/rendering/deferredcastermanager.h
index 6aeaa4ed37..c5fca87586 100644
--- a/include/openspace/rendering/deferredcastermanager.h
+++ b/include/openspace/rendering/deferredcastermanager.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/include/openspace/rendering/fadeable.h b/include/openspace/rendering/fadeable.h
index d26108c14a..c35df7f438 100644
--- a/include/openspace/rendering/fadeable.h
+++ b/include/openspace/rendering/fadeable.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/include/openspace/rendering/framebufferrenderer.h b/include/openspace/rendering/framebufferrenderer.h
index e89f2ec76d..8e6fbe075e 100644
--- a/include/openspace/rendering/framebufferrenderer.h
+++ b/include/openspace/rendering/framebufferrenderer.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/include/openspace/rendering/helper.h b/include/openspace/rendering/helper.h
index b12b0cd390..c66f132a84 100644
--- a/include/openspace/rendering/helper.h
+++ b/include/openspace/rendering/helper.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/include/openspace/rendering/labelscomponent.h b/include/openspace/rendering/labelscomponent.h
index ee0c9b6bf3..3d4aef8740 100644
--- a/include/openspace/rendering/labelscomponent.h
+++ b/include/openspace/rendering/labelscomponent.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/include/openspace/rendering/loadingscreen.h b/include/openspace/rendering/loadingscreen.h
index dc3049ce8e..2a87879a0a 100644
--- a/include/openspace/rendering/loadingscreen.h
+++ b/include/openspace/rendering/loadingscreen.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/include/openspace/rendering/luaconsole.h b/include/openspace/rendering/luaconsole.h
index cd875a2b4a..e9913bf4dd 100644
--- a/include/openspace/rendering/luaconsole.h
+++ b/include/openspace/rendering/luaconsole.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/include/openspace/rendering/raycasterlistener.h b/include/openspace/rendering/raycasterlistener.h
index 678b9e13a3..1a054679bc 100644
--- a/include/openspace/rendering/raycasterlistener.h
+++ b/include/openspace/rendering/raycasterlistener.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/include/openspace/rendering/raycastermanager.h b/include/openspace/rendering/raycastermanager.h
index 915c7be07f..b7bf82f8e1 100644
--- a/include/openspace/rendering/raycastermanager.h
+++ b/include/openspace/rendering/raycastermanager.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/include/openspace/rendering/renderable.h b/include/openspace/rendering/renderable.h
index c143e15a96..542304e3b1 100644
--- a/include/openspace/rendering/renderable.h
+++ b/include/openspace/rendering/renderable.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/include/openspace/rendering/renderengine.h b/include/openspace/rendering/renderengine.h
index 6905679375..d25ad372c3 100644
--- a/include/openspace/rendering/renderengine.h
+++ b/include/openspace/rendering/renderengine.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/include/openspace/rendering/screenspacerenderable.h b/include/openspace/rendering/screenspacerenderable.h
index e2b1e0f8fd..916c060b60 100644
--- a/include/openspace/rendering/screenspacerenderable.h
+++ b/include/openspace/rendering/screenspacerenderable.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/include/openspace/rendering/texturecomponent.h b/include/openspace/rendering/texturecomponent.h
index f00292705a..bc1cbbb3d2 100644
--- a/include/openspace/rendering/texturecomponent.h
+++ b/include/openspace/rendering/texturecomponent.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/include/openspace/rendering/transferfunction.h b/include/openspace/rendering/transferfunction.h
index c8e34382b8..cf6e923b16 100644
--- a/include/openspace/rendering/transferfunction.h
+++ b/include/openspace/rendering/transferfunction.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/include/openspace/rendering/volumeraycaster.h b/include/openspace/rendering/volumeraycaster.h
index da1e7e2eea..da9575ae51 100644
--- a/include/openspace/rendering/volumeraycaster.h
+++ b/include/openspace/rendering/volumeraycaster.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/include/openspace/scene/asset.h b/include/openspace/scene/asset.h
index 164419746a..e59027b18e 100644
--- a/include/openspace/scene/asset.h
+++ b/include/openspace/scene/asset.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/include/openspace/scene/assetmanager.h b/include/openspace/scene/assetmanager.h
index 2bf660e95c..0410b82382 100644
--- a/include/openspace/scene/assetmanager.h
+++ b/include/openspace/scene/assetmanager.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/include/openspace/scene/lightsource.h b/include/openspace/scene/lightsource.h
index bf9165f390..ed2246bae6 100644
--- a/include/openspace/scene/lightsource.h
+++ b/include/openspace/scene/lightsource.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/include/openspace/scene/profile.h b/include/openspace/scene/profile.h
index 436dafa67b..529bfba332 100644
--- a/include/openspace/scene/profile.h
+++ b/include/openspace/scene/profile.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/include/openspace/scene/rotation.h b/include/openspace/scene/rotation.h
index 6af8c299fc..151c2d4e61 100644
--- a/include/openspace/scene/rotation.h
+++ b/include/openspace/scene/rotation.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/include/openspace/scene/scale.h b/include/openspace/scene/scale.h
index cdfc79308a..375838589b 100644
--- a/include/openspace/scene/scale.h
+++ b/include/openspace/scene/scale.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/include/openspace/scene/scene.h b/include/openspace/scene/scene.h
index 72580a8a9e..7625abdf07 100644
--- a/include/openspace/scene/scene.h
+++ b/include/openspace/scene/scene.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/include/openspace/scene/scenegraphnode.h b/include/openspace/scene/scenegraphnode.h
index e71e4a2a54..390e5455bf 100644
--- a/include/openspace/scene/scenegraphnode.h
+++ b/include/openspace/scene/scenegraphnode.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/include/openspace/scene/sceneinitializer.h b/include/openspace/scene/sceneinitializer.h
index d88965c67c..0da2616cac 100644
--- a/include/openspace/scene/sceneinitializer.h
+++ b/include/openspace/scene/sceneinitializer.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/include/openspace/scene/scenelicensewriter.h b/include/openspace/scene/scenelicensewriter.h
index 4a183e3a1b..69c4eb959a 100644
--- a/include/openspace/scene/scenelicensewriter.h
+++ b/include/openspace/scene/scenelicensewriter.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/include/openspace/scene/timeframe.h b/include/openspace/scene/timeframe.h
index 28328d8977..c6ff91fb98 100644
--- a/include/openspace/scene/timeframe.h
+++ b/include/openspace/scene/timeframe.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/include/openspace/scene/translation.h b/include/openspace/scene/translation.h
index 306b321345..ab01958d46 100644
--- a/include/openspace/scene/translation.h
+++ b/include/openspace/scene/translation.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/include/openspace/scripting/lualibrary.h b/include/openspace/scripting/lualibrary.h
index 7e2fff2241..f86feb2c88 100644
--- a/include/openspace/scripting/lualibrary.h
+++ b/include/openspace/scripting/lualibrary.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/include/openspace/scripting/scriptengine.h b/include/openspace/scripting/scriptengine.h
index d8ebac7f97..85f9224896 100644
--- a/include/openspace/scripting/scriptengine.h
+++ b/include/openspace/scripting/scriptengine.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/include/openspace/scripting/scriptscheduler.h b/include/openspace/scripting/scriptscheduler.h
index 76b26c3710..77f80e4c26 100644
--- a/include/openspace/scripting/scriptscheduler.h
+++ b/include/openspace/scripting/scriptscheduler.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/include/openspace/scripting/systemcapabilitiesbinding.h b/include/openspace/scripting/systemcapabilitiesbinding.h
index 4bcd78a62b..d41a20a067 100644
--- a/include/openspace/scripting/systemcapabilitiesbinding.h
+++ b/include/openspace/scripting/systemcapabilitiesbinding.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/include/openspace/util/blockplaneintersectiongeometry.h b/include/openspace/util/blockplaneintersectiongeometry.h
index 8b5ce7ac2e..d8e5e353d9 100644
--- a/include/openspace/util/blockplaneintersectiongeometry.h
+++ b/include/openspace/util/blockplaneintersectiongeometry.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/include/openspace/util/boxgeometry.h b/include/openspace/util/boxgeometry.h
index caf0003416..7ce4d836d5 100644
--- a/include/openspace/util/boxgeometry.h
+++ b/include/openspace/util/boxgeometry.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/include/openspace/util/collisionhelper.h b/include/openspace/util/collisionhelper.h
index 2cf906211d..55758fbcfc 100644
--- a/include/openspace/util/collisionhelper.h
+++ b/include/openspace/util/collisionhelper.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/include/openspace/util/concurrentjobmanager.h b/include/openspace/util/concurrentjobmanager.h
index ee92a92038..be7b51907d 100644
--- a/include/openspace/util/concurrentjobmanager.h
+++ b/include/openspace/util/concurrentjobmanager.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/include/openspace/util/concurrentjobmanager.inl b/include/openspace/util/concurrentjobmanager.inl
index 73491966c0..f4d0f894fd 100644
--- a/include/openspace/util/concurrentjobmanager.inl
+++ b/include/openspace/util/concurrentjobmanager.inl
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/include/openspace/util/concurrentqueue.h b/include/openspace/util/concurrentqueue.h
index 86f2345169..8afd296f2d 100644
--- a/include/openspace/util/concurrentqueue.h
+++ b/include/openspace/util/concurrentqueue.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/include/openspace/util/concurrentqueue.inl b/include/openspace/util/concurrentqueue.inl
index 2a20e42f24..74929c7617 100644
--- a/include/openspace/util/concurrentqueue.inl
+++ b/include/openspace/util/concurrentqueue.inl
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/include/openspace/util/coordinateconversion.h b/include/openspace/util/coordinateconversion.h
index 66e07a6dbc..f8d6781973 100644
--- a/include/openspace/util/coordinateconversion.h
+++ b/include/openspace/util/coordinateconversion.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/include/openspace/util/distanceconstants.h b/include/openspace/util/distanceconstants.h
index d5ddc506b0..7b950a8198 100644
--- a/include/openspace/util/distanceconstants.h
+++ b/include/openspace/util/distanceconstants.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/include/openspace/util/distanceconversion.h b/include/openspace/util/distanceconversion.h
index 52e568e63c..11a2dd196a 100644
--- a/include/openspace/util/distanceconversion.h
+++ b/include/openspace/util/distanceconversion.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/include/openspace/util/factorymanager.h b/include/openspace/util/factorymanager.h
index d16c4c9e6b..dfb4b11702 100644
--- a/include/openspace/util/factorymanager.h
+++ b/include/openspace/util/factorymanager.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/include/openspace/util/factorymanager.inl b/include/openspace/util/factorymanager.inl
index 6f2765e70b..6af401a2c2 100644
--- a/include/openspace/util/factorymanager.inl
+++ b/include/openspace/util/factorymanager.inl
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/include/openspace/util/histogram.h b/include/openspace/util/histogram.h
index 784f3b553f..67e1f26d7a 100644
--- a/include/openspace/util/histogram.h
+++ b/include/openspace/util/histogram.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/include/openspace/util/httprequest.h b/include/openspace/util/httprequest.h
index 026f544398..428a3ec29c 100644
--- a/include/openspace/util/httprequest.h
+++ b/include/openspace/util/httprequest.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/include/openspace/util/job.h b/include/openspace/util/job.h
index 13dc5fcc06..761c85d48c 100644
--- a/include/openspace/util/job.h
+++ b/include/openspace/util/job.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/include/openspace/util/json_helper.h b/include/openspace/util/json_helper.h
index 4042599c36..ee437bc65d 100644
--- a/include/openspace/util/json_helper.h
+++ b/include/openspace/util/json_helper.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/include/openspace/util/json_helper.inl b/include/openspace/util/json_helper.inl
index e028b0a859..62a2511c1c 100644
--- a/include/openspace/util/json_helper.inl
+++ b/include/openspace/util/json_helper.inl
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/include/openspace/util/keys.h b/include/openspace/util/keys.h
index a3e7dcd4df..fef5f98832 100644
--- a/include/openspace/util/keys.h
+++ b/include/openspace/util/keys.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/include/openspace/util/memorymanager.h b/include/openspace/util/memorymanager.h
index a4cc780cc5..2a22913a0d 100644
--- a/include/openspace/util/memorymanager.h
+++ b/include/openspace/util/memorymanager.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/include/openspace/util/mouse.h b/include/openspace/util/mouse.h
index f20fe5ab1e..b1155bd68d 100644
--- a/include/openspace/util/mouse.h
+++ b/include/openspace/util/mouse.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/include/openspace/util/openspacemodule.h b/include/openspace/util/openspacemodule.h
index 7e626f5f90..c519481073 100644
--- a/include/openspace/util/openspacemodule.h
+++ b/include/openspace/util/openspacemodule.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/include/openspace/util/planegeometry.h b/include/openspace/util/planegeometry.h
index 43af1e0ce1..7f05480ff1 100644
--- a/include/openspace/util/planegeometry.h
+++ b/include/openspace/util/planegeometry.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/include/openspace/util/progressbar.h b/include/openspace/util/progressbar.h
index 61f9bcd08e..50bb5d15ba 100644
--- a/include/openspace/util/progressbar.h
+++ b/include/openspace/util/progressbar.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/include/openspace/util/resourcesynchronization.h b/include/openspace/util/resourcesynchronization.h
index 699940ed93..bc40bc21e7 100644
--- a/include/openspace/util/resourcesynchronization.h
+++ b/include/openspace/util/resourcesynchronization.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/include/openspace/util/screenlog.h b/include/openspace/util/screenlog.h
index e82cc92201..b5e883f295 100644
--- a/include/openspace/util/screenlog.h
+++ b/include/openspace/util/screenlog.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/include/openspace/util/sphere.h b/include/openspace/util/sphere.h
index b7b97b9b24..f8c8529d8f 100644
--- a/include/openspace/util/sphere.h
+++ b/include/openspace/util/sphere.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/include/openspace/util/spicemanager.h b/include/openspace/util/spicemanager.h
index 3883050ad9..c7b05d2c4a 100644
--- a/include/openspace/util/spicemanager.h
+++ b/include/openspace/util/spicemanager.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/include/openspace/util/syncable.h b/include/openspace/util/syncable.h
index 9789a97525..89f863a58d 100644
--- a/include/openspace/util/syncable.h
+++ b/include/openspace/util/syncable.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/include/openspace/util/syncbuffer.h b/include/openspace/util/syncbuffer.h
index 35e63daefc..b0160bbc46 100644
--- a/include/openspace/util/syncbuffer.h
+++ b/include/openspace/util/syncbuffer.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/include/openspace/util/syncbuffer.inl b/include/openspace/util/syncbuffer.inl
index b562be5749..66194089cd 100644
--- a/include/openspace/util/syncbuffer.inl
+++ b/include/openspace/util/syncbuffer.inl
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/include/openspace/util/syncdata.h b/include/openspace/util/syncdata.h
index 6f88f96915..ce99b9366a 100644
--- a/include/openspace/util/syncdata.h
+++ b/include/openspace/util/syncdata.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/include/openspace/util/syncdata.inl b/include/openspace/util/syncdata.inl
index 0f18f30c33..e8fb861cfa 100644
--- a/include/openspace/util/syncdata.inl
+++ b/include/openspace/util/syncdata.inl
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/include/openspace/util/task.h b/include/openspace/util/task.h
index 082d8b1797..48be52d5bd 100644
--- a/include/openspace/util/task.h
+++ b/include/openspace/util/task.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/include/openspace/util/taskloader.h b/include/openspace/util/taskloader.h
index 31b43633bd..6bdee46d17 100644
--- a/include/openspace/util/taskloader.h
+++ b/include/openspace/util/taskloader.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/include/openspace/util/threadpool.h b/include/openspace/util/threadpool.h
index 3a388c7525..8c5581d750 100644
--- a/include/openspace/util/threadpool.h
+++ b/include/openspace/util/threadpool.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/include/openspace/util/time.h b/include/openspace/util/time.h
index 2f8aae1d18..e9a1cbda30 100644
--- a/include/openspace/util/time.h
+++ b/include/openspace/util/time.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/include/openspace/util/timeconversion.h b/include/openspace/util/timeconversion.h
index 753d84c7da..b09dbcb4fd 100644
--- a/include/openspace/util/timeconversion.h
+++ b/include/openspace/util/timeconversion.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/include/openspace/util/timeline.h b/include/openspace/util/timeline.h
index 466caea613..39c9a10c76 100644
--- a/include/openspace/util/timeline.h
+++ b/include/openspace/util/timeline.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/include/openspace/util/timeline.inl b/include/openspace/util/timeline.inl
index 9760c71add..ea047bc48e 100644
--- a/include/openspace/util/timeline.inl
+++ b/include/openspace/util/timeline.inl
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/include/openspace/util/timemanager.h b/include/openspace/util/timemanager.h
index bf8305f619..e0a5265db4 100644
--- a/include/openspace/util/timemanager.h
+++ b/include/openspace/util/timemanager.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/include/openspace/util/timerange.h b/include/openspace/util/timerange.h
index 9c87e8dab3..db2b4aa47e 100644
--- a/include/openspace/util/timerange.h
+++ b/include/openspace/util/timerange.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/include/openspace/util/touch.h b/include/openspace/util/touch.h
index c6e94a0e8f..9b4773810d 100644
--- a/include/openspace/util/touch.h
+++ b/include/openspace/util/touch.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/include/openspace/util/transformationmanager.h b/include/openspace/util/transformationmanager.h
index 702cf3e5a7..148e1c04cf 100644
--- a/include/openspace/util/transformationmanager.h
+++ b/include/openspace/util/transformationmanager.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/include/openspace/util/tstring.h b/include/openspace/util/tstring.h
index c0c9936994..9b8ebe4dbd 100644
--- a/include/openspace/util/tstring.h
+++ b/include/openspace/util/tstring.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/include/openspace/util/universalhelpers.h b/include/openspace/util/universalhelpers.h
index 8b1b23ecc1..e230e7b5e9 100644
--- a/include/openspace/util/universalhelpers.h
+++ b/include/openspace/util/universalhelpers.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/include/openspace/util/updatestructures.h b/include/openspace/util/updatestructures.h
index 0373f263ed..ff819d1071 100644
--- a/include/openspace/util/updatestructures.h
+++ b/include/openspace/util/updatestructures.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/include/openspace/util/versionchecker.h b/include/openspace/util/versionchecker.h
index 5a8b391fb6..024fc45cc8 100644
--- a/include/openspace/util/versionchecker.h
+++ b/include/openspace/util/versionchecker.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/atmosphere/atmospheremodule.cpp b/modules/atmosphere/atmospheremodule.cpp
index 57becfff04..6ab9059d2b 100644
--- a/modules/atmosphere/atmospheremodule.cpp
+++ b/modules/atmosphere/atmospheremodule.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/atmosphere/atmospheremodule.h b/modules/atmosphere/atmospheremodule.h
index f3fdcfeb38..d720f47bad 100644
--- a/modules/atmosphere/atmospheremodule.h
+++ b/modules/atmosphere/atmospheremodule.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/atmosphere/rendering/atmospheredeferredcaster.cpp b/modules/atmosphere/rendering/atmospheredeferredcaster.cpp
index 9724972f3e..319f2b8e59 100644
--- a/modules/atmosphere/rendering/atmospheredeferredcaster.cpp
+++ b/modules/atmosphere/rendering/atmospheredeferredcaster.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/atmosphere/rendering/atmospheredeferredcaster.h b/modules/atmosphere/rendering/atmospheredeferredcaster.h
index d5e5960e2a..bbe7f6b28a 100644
--- a/modules/atmosphere/rendering/atmospheredeferredcaster.h
+++ b/modules/atmosphere/rendering/atmospheredeferredcaster.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/atmosphere/rendering/renderableatmosphere.cpp b/modules/atmosphere/rendering/renderableatmosphere.cpp
index 2cd94dc6fb..f24c758ec6 100644
--- a/modules/atmosphere/rendering/renderableatmosphere.cpp
+++ b/modules/atmosphere/rendering/renderableatmosphere.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/atmosphere/rendering/renderableatmosphere.h b/modules/atmosphere/rendering/renderableatmosphere.h
index a82b33c394..589119da7f 100644
--- a/modules/atmosphere/rendering/renderableatmosphere.h
+++ b/modules/atmosphere/rendering/renderableatmosphere.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/atmosphere/shaders/atmosphere_common.glsl b/modules/atmosphere/shaders/atmosphere_common.glsl
index 6326205d0f..12a6a760b1 100644
--- a/modules/atmosphere/shaders/atmosphere_common.glsl
+++ b/modules/atmosphere/shaders/atmosphere_common.glsl
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/atmosphere/shaders/atmosphere_deferred_fs.glsl b/modules/atmosphere/shaders/atmosphere_deferred_fs.glsl
index 86da689bc5..86aea8f114 100644
--- a/modules/atmosphere/shaders/atmosphere_deferred_fs.glsl
+++ b/modules/atmosphere/shaders/atmosphere_deferred_fs.glsl
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/atmosphere/shaders/atmosphere_deferred_vs.glsl b/modules/atmosphere/shaders/atmosphere_deferred_vs.glsl
index c9e7b04f3f..b18ad2f885 100644
--- a/modules/atmosphere/shaders/atmosphere_deferred_vs.glsl
+++ b/modules/atmosphere/shaders/atmosphere_deferred_vs.glsl
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/atmosphere/shaders/calculation_gs.glsl b/modules/atmosphere/shaders/calculation_gs.glsl
index 0abafa92be..77f7eefbc3 100644
--- a/modules/atmosphere/shaders/calculation_gs.glsl
+++ b/modules/atmosphere/shaders/calculation_gs.glsl
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/atmosphere/shaders/calculation_vs.glsl b/modules/atmosphere/shaders/calculation_vs.glsl
index f8c989d905..d1ac3cf2d5 100644
--- a/modules/atmosphere/shaders/calculation_vs.glsl
+++ b/modules/atmosphere/shaders/calculation_vs.glsl
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/atmosphere/shaders/deltaE_calc_fs.glsl b/modules/atmosphere/shaders/deltaE_calc_fs.glsl
index 6695d32bef..c230776c8e 100644
--- a/modules/atmosphere/shaders/deltaE_calc_fs.glsl
+++ b/modules/atmosphere/shaders/deltaE_calc_fs.glsl
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/atmosphere/shaders/deltaJ_calc_fs.glsl b/modules/atmosphere/shaders/deltaJ_calc_fs.glsl
index a1e3d6c475..6a5d173849 100644
--- a/modules/atmosphere/shaders/deltaJ_calc_fs.glsl
+++ b/modules/atmosphere/shaders/deltaJ_calc_fs.glsl
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/atmosphere/shaders/deltaS_calc_fs.glsl b/modules/atmosphere/shaders/deltaS_calc_fs.glsl
index ee3ebced4c..189c33a0d1 100644
--- a/modules/atmosphere/shaders/deltaS_calc_fs.glsl
+++ b/modules/atmosphere/shaders/deltaS_calc_fs.glsl
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/atmosphere/shaders/deltaS_sup_calc_fs.glsl b/modules/atmosphere/shaders/deltaS_sup_calc_fs.glsl
index 85b7561ee5..4538e3701e 100644
--- a/modules/atmosphere/shaders/deltaS_sup_calc_fs.glsl
+++ b/modules/atmosphere/shaders/deltaS_sup_calc_fs.glsl
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/atmosphere/shaders/inScattering_calc_fs.glsl b/modules/atmosphere/shaders/inScattering_calc_fs.glsl
index d5a94c2d2b..6981419721 100644
--- a/modules/atmosphere/shaders/inScattering_calc_fs.glsl
+++ b/modules/atmosphere/shaders/inScattering_calc_fs.glsl
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/atmosphere/shaders/inScattering_sup_calc_fs.glsl b/modules/atmosphere/shaders/inScattering_sup_calc_fs.glsl
index f5a0b55a79..e0388ebe2d 100644
--- a/modules/atmosphere/shaders/inScattering_sup_calc_fs.glsl
+++ b/modules/atmosphere/shaders/inScattering_sup_calc_fs.glsl
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/atmosphere/shaders/irradiance_calc_fs.glsl b/modules/atmosphere/shaders/irradiance_calc_fs.glsl
index 49a51785b9..5758cf3505 100644
--- a/modules/atmosphere/shaders/irradiance_calc_fs.glsl
+++ b/modules/atmosphere/shaders/irradiance_calc_fs.glsl
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/atmosphere/shaders/irradiance_final_fs.glsl b/modules/atmosphere/shaders/irradiance_final_fs.glsl
index 0c933a45f1..75abff8b05 100644
--- a/modules/atmosphere/shaders/irradiance_final_fs.glsl
+++ b/modules/atmosphere/shaders/irradiance_final_fs.glsl
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/atmosphere/shaders/irradiance_sup_calc_fs.glsl b/modules/atmosphere/shaders/irradiance_sup_calc_fs.glsl
index b8f061b892..6a793c7ed5 100644
--- a/modules/atmosphere/shaders/irradiance_sup_calc_fs.glsl
+++ b/modules/atmosphere/shaders/irradiance_sup_calc_fs.glsl
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/atmosphere/shaders/transmittance_calc_fs.glsl b/modules/atmosphere/shaders/transmittance_calc_fs.glsl
index a81fa6e0a8..23dc23a282 100644
--- a/modules/atmosphere/shaders/transmittance_calc_fs.glsl
+++ b/modules/atmosphere/shaders/transmittance_calc_fs.glsl
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/base/basemodule.cpp b/modules/base/basemodule.cpp
index d2619a9dbe..9dc5c9e9b4 100644
--- a/modules/base/basemodule.cpp
+++ b/modules/base/basemodule.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/base/basemodule.h b/modules/base/basemodule.h
index 669713c2ef..87c9a6d353 100644
--- a/modules/base/basemodule.h
+++ b/modules/base/basemodule.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/base/dashboard/dashboarditemangle.cpp b/modules/base/dashboard/dashboarditemangle.cpp
index 83b1b493c5..eac1046265 100644
--- a/modules/base/dashboard/dashboarditemangle.cpp
+++ b/modules/base/dashboard/dashboarditemangle.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/base/dashboard/dashboarditemangle.h b/modules/base/dashboard/dashboarditemangle.h
index 6635680001..c92b6edd71 100644
--- a/modules/base/dashboard/dashboarditemangle.h
+++ b/modules/base/dashboard/dashboarditemangle.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/base/dashboard/dashboarditemdate.cpp b/modules/base/dashboard/dashboarditemdate.cpp
index cca8844985..2a9d6574b9 100644
--- a/modules/base/dashboard/dashboarditemdate.cpp
+++ b/modules/base/dashboard/dashboarditemdate.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/base/dashboard/dashboarditemdate.h b/modules/base/dashboard/dashboarditemdate.h
index 3a948d17dd..f9ecff3d9c 100644
--- a/modules/base/dashboard/dashboarditemdate.h
+++ b/modules/base/dashboard/dashboarditemdate.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/base/dashboard/dashboarditemdistance.cpp b/modules/base/dashboard/dashboarditemdistance.cpp
index 895c6dbf4a..08d83464bd 100644
--- a/modules/base/dashboard/dashboarditemdistance.cpp
+++ b/modules/base/dashboard/dashboarditemdistance.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/base/dashboard/dashboarditemdistance.h b/modules/base/dashboard/dashboarditemdistance.h
index 86c6b1a58e..80f04ebcb3 100644
--- a/modules/base/dashboard/dashboarditemdistance.h
+++ b/modules/base/dashboard/dashboarditemdistance.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/base/dashboard/dashboarditemelapsedtime.cpp b/modules/base/dashboard/dashboarditemelapsedtime.cpp
index 295ad646f5..adf5ee5216 100644
--- a/modules/base/dashboard/dashboarditemelapsedtime.cpp
+++ b/modules/base/dashboard/dashboarditemelapsedtime.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/base/dashboard/dashboarditemelapsedtime.h b/modules/base/dashboard/dashboarditemelapsedtime.h
index 0ff4ac6646..d2551d9255 100644
--- a/modules/base/dashboard/dashboarditemelapsedtime.h
+++ b/modules/base/dashboard/dashboarditemelapsedtime.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/base/dashboard/dashboarditemframerate.cpp b/modules/base/dashboard/dashboarditemframerate.cpp
index 1ef866c87b..a55c171eb5 100644
--- a/modules/base/dashboard/dashboarditemframerate.cpp
+++ b/modules/base/dashboard/dashboarditemframerate.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/base/dashboard/dashboarditemframerate.h b/modules/base/dashboard/dashboarditemframerate.h
index 69f86171d2..6d704aba47 100644
--- a/modules/base/dashboard/dashboarditemframerate.h
+++ b/modules/base/dashboard/dashboarditemframerate.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/base/dashboard/dashboarditeminputstate.cpp b/modules/base/dashboard/dashboarditeminputstate.cpp
index eecc6e0da4..206fa6865e 100644
--- a/modules/base/dashboard/dashboarditeminputstate.cpp
+++ b/modules/base/dashboard/dashboarditeminputstate.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/base/dashboard/dashboarditeminputstate.h b/modules/base/dashboard/dashboarditeminputstate.h
index b49b21709e..4e3c2acf14 100644
--- a/modules/base/dashboard/dashboarditeminputstate.h
+++ b/modules/base/dashboard/dashboarditeminputstate.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/base/dashboard/dashboarditemmission.cpp b/modules/base/dashboard/dashboarditemmission.cpp
index 8957571a58..41291ea85b 100644
--- a/modules/base/dashboard/dashboarditemmission.cpp
+++ b/modules/base/dashboard/dashboarditemmission.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/base/dashboard/dashboarditemmission.h b/modules/base/dashboard/dashboarditemmission.h
index 17ea778f97..c3d5576a73 100644
--- a/modules/base/dashboard/dashboarditemmission.h
+++ b/modules/base/dashboard/dashboarditemmission.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/base/dashboard/dashboarditemparallelconnection.cpp b/modules/base/dashboard/dashboarditemparallelconnection.cpp
index 720c907110..f021da65ce 100644
--- a/modules/base/dashboard/dashboarditemparallelconnection.cpp
+++ b/modules/base/dashboard/dashboarditemparallelconnection.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/base/dashboard/dashboarditemparallelconnection.h b/modules/base/dashboard/dashboarditemparallelconnection.h
index 06f9ec4c7c..522f40d9c2 100644
--- a/modules/base/dashboard/dashboarditemparallelconnection.h
+++ b/modules/base/dashboard/dashboarditemparallelconnection.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/base/dashboard/dashboarditempropertyvalue.cpp b/modules/base/dashboard/dashboarditempropertyvalue.cpp
index ba0058cfa4..7ffea7cb35 100644
--- a/modules/base/dashboard/dashboarditempropertyvalue.cpp
+++ b/modules/base/dashboard/dashboarditempropertyvalue.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/base/dashboard/dashboarditempropertyvalue.h b/modules/base/dashboard/dashboarditempropertyvalue.h
index 873b2bbf96..3af87f1de0 100644
--- a/modules/base/dashboard/dashboarditempropertyvalue.h
+++ b/modules/base/dashboard/dashboarditempropertyvalue.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/base/dashboard/dashboarditemsimulationincrement.cpp b/modules/base/dashboard/dashboarditemsimulationincrement.cpp
index 6e007cd93d..ae5313ed56 100644
--- a/modules/base/dashboard/dashboarditemsimulationincrement.cpp
+++ b/modules/base/dashboard/dashboarditemsimulationincrement.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/base/dashboard/dashboarditemsimulationincrement.h b/modules/base/dashboard/dashboarditemsimulationincrement.h
index 3af34fda24..84ecca1a86 100644
--- a/modules/base/dashboard/dashboarditemsimulationincrement.h
+++ b/modules/base/dashboard/dashboarditemsimulationincrement.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/base/dashboard/dashboarditemspacing.cpp b/modules/base/dashboard/dashboarditemspacing.cpp
index 806fb95c71..482e849d0a 100644
--- a/modules/base/dashboard/dashboarditemspacing.cpp
+++ b/modules/base/dashboard/dashboarditemspacing.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/base/dashboard/dashboarditemspacing.h b/modules/base/dashboard/dashboarditemspacing.h
index b93398db6a..a78cbd28db 100644
--- a/modules/base/dashboard/dashboarditemspacing.h
+++ b/modules/base/dashboard/dashboarditemspacing.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/base/dashboard/dashboarditemtext.cpp b/modules/base/dashboard/dashboarditemtext.cpp
index 6b7b3cbead..10542723ab 100644
--- a/modules/base/dashboard/dashboarditemtext.cpp
+++ b/modules/base/dashboard/dashboarditemtext.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/base/dashboard/dashboarditemtext.h b/modules/base/dashboard/dashboarditemtext.h
index 4535034aad..ef11a0cca1 100644
--- a/modules/base/dashboard/dashboarditemtext.h
+++ b/modules/base/dashboard/dashboarditemtext.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/base/dashboard/dashboarditemvelocity.cpp b/modules/base/dashboard/dashboarditemvelocity.cpp
index b1911c1e7b..5f975b12e2 100644
--- a/modules/base/dashboard/dashboarditemvelocity.cpp
+++ b/modules/base/dashboard/dashboarditemvelocity.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/base/dashboard/dashboarditemvelocity.h b/modules/base/dashboard/dashboarditemvelocity.h
index 0d2e412172..90c20aa15c 100644
--- a/modules/base/dashboard/dashboarditemvelocity.h
+++ b/modules/base/dashboard/dashboarditemvelocity.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/base/lightsource/cameralightsource.cpp b/modules/base/lightsource/cameralightsource.cpp
index f20751a951..df58467ac0 100644
--- a/modules/base/lightsource/cameralightsource.cpp
+++ b/modules/base/lightsource/cameralightsource.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/base/lightsource/cameralightsource.h b/modules/base/lightsource/cameralightsource.h
index dc9a4f9a99..7a06f5fe6a 100644
--- a/modules/base/lightsource/cameralightsource.h
+++ b/modules/base/lightsource/cameralightsource.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/base/lightsource/scenegraphlightsource.cpp b/modules/base/lightsource/scenegraphlightsource.cpp
index 8e2457a873..bcd035bfbd 100644
--- a/modules/base/lightsource/scenegraphlightsource.cpp
+++ b/modules/base/lightsource/scenegraphlightsource.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/base/lightsource/scenegraphlightsource.h b/modules/base/lightsource/scenegraphlightsource.h
index c362893cb4..1a5177f586 100644
--- a/modules/base/lightsource/scenegraphlightsource.h
+++ b/modules/base/lightsource/scenegraphlightsource.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/base/rendering/grids/renderableboxgrid.cpp b/modules/base/rendering/grids/renderableboxgrid.cpp
index e0099c512e..14056eb28c 100644
--- a/modules/base/rendering/grids/renderableboxgrid.cpp
+++ b/modules/base/rendering/grids/renderableboxgrid.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/base/rendering/grids/renderableboxgrid.h b/modules/base/rendering/grids/renderableboxgrid.h
index 025ec3b36c..64690b2079 100644
--- a/modules/base/rendering/grids/renderableboxgrid.h
+++ b/modules/base/rendering/grids/renderableboxgrid.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/base/rendering/grids/renderablegrid.cpp b/modules/base/rendering/grids/renderablegrid.cpp
index 413885e4a4..4e7586cc7b 100644
--- a/modules/base/rendering/grids/renderablegrid.cpp
+++ b/modules/base/rendering/grids/renderablegrid.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/base/rendering/grids/renderablegrid.h b/modules/base/rendering/grids/renderablegrid.h
index 14385f0847..bee32cd0fe 100644
--- a/modules/base/rendering/grids/renderablegrid.h
+++ b/modules/base/rendering/grids/renderablegrid.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/base/rendering/grids/renderableradialgrid.cpp b/modules/base/rendering/grids/renderableradialgrid.cpp
index 48ed3815e3..1d3b1f408e 100644
--- a/modules/base/rendering/grids/renderableradialgrid.cpp
+++ b/modules/base/rendering/grids/renderableradialgrid.cpp
@@ -3,7 +3,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/base/rendering/grids/renderableradialgrid.h b/modules/base/rendering/grids/renderableradialgrid.h
index cf55c07ab0..fbb0f9140f 100644
--- a/modules/base/rendering/grids/renderableradialgrid.h
+++ b/modules/base/rendering/grids/renderableradialgrid.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/base/rendering/grids/renderablesphericalgrid.cpp b/modules/base/rendering/grids/renderablesphericalgrid.cpp
index 5a4007e82d..7d4d6b3d44 100644
--- a/modules/base/rendering/grids/renderablesphericalgrid.cpp
+++ b/modules/base/rendering/grids/renderablesphericalgrid.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/base/rendering/grids/renderablesphericalgrid.h b/modules/base/rendering/grids/renderablesphericalgrid.h
index 5f6ac23b63..d4278c9b5b 100644
--- a/modules/base/rendering/grids/renderablesphericalgrid.h
+++ b/modules/base/rendering/grids/renderablesphericalgrid.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/base/rendering/pointcloud/renderableinterpolatedpoints.cpp b/modules/base/rendering/pointcloud/renderableinterpolatedpoints.cpp
index 94defce7d0..6b8b5daab9 100644
--- a/modules/base/rendering/pointcloud/renderableinterpolatedpoints.cpp
+++ b/modules/base/rendering/pointcloud/renderableinterpolatedpoints.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/base/rendering/pointcloud/renderableinterpolatedpoints.h b/modules/base/rendering/pointcloud/renderableinterpolatedpoints.h
index 23d0a479db..27b238fa74 100644
--- a/modules/base/rendering/pointcloud/renderableinterpolatedpoints.h
+++ b/modules/base/rendering/pointcloud/renderableinterpolatedpoints.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/base/rendering/pointcloud/renderablepointcloud.cpp b/modules/base/rendering/pointcloud/renderablepointcloud.cpp
index faf19ebf15..0b953186c4 100644
--- a/modules/base/rendering/pointcloud/renderablepointcloud.cpp
+++ b/modules/base/rendering/pointcloud/renderablepointcloud.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/base/rendering/pointcloud/renderablepointcloud.h b/modules/base/rendering/pointcloud/renderablepointcloud.h
index 500d1e0f22..a14062461c 100644
--- a/modules/base/rendering/pointcloud/renderablepointcloud.h
+++ b/modules/base/rendering/pointcloud/renderablepointcloud.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/base/rendering/pointcloud/renderablepolygoncloud.cpp b/modules/base/rendering/pointcloud/renderablepolygoncloud.cpp
index 672586f435..534e28b59f 100644
--- a/modules/base/rendering/pointcloud/renderablepolygoncloud.cpp
+++ b/modules/base/rendering/pointcloud/renderablepolygoncloud.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/base/rendering/pointcloud/renderablepolygoncloud.h b/modules/base/rendering/pointcloud/renderablepolygoncloud.h
index f873636779..745f16b0ac 100644
--- a/modules/base/rendering/pointcloud/renderablepolygoncloud.h
+++ b/modules/base/rendering/pointcloud/renderablepolygoncloud.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/base/rendering/renderablecartesianaxes.cpp b/modules/base/rendering/renderablecartesianaxes.cpp
index a0f01d6c74..da67e3c4ce 100644
--- a/modules/base/rendering/renderablecartesianaxes.cpp
+++ b/modules/base/rendering/renderablecartesianaxes.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/base/rendering/renderablecartesianaxes.h b/modules/base/rendering/renderablecartesianaxes.h
index 15738ebd24..2ef2c180d7 100644
--- a/modules/base/rendering/renderablecartesianaxes.h
+++ b/modules/base/rendering/renderablecartesianaxes.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/base/rendering/renderabledisc.cpp b/modules/base/rendering/renderabledisc.cpp
index 2cb9431ab8..a69435399c 100644
--- a/modules/base/rendering/renderabledisc.cpp
+++ b/modules/base/rendering/renderabledisc.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/base/rendering/renderabledisc.h b/modules/base/rendering/renderabledisc.h
index 14537d6b54..3c0d51b5e1 100644
--- a/modules/base/rendering/renderabledisc.h
+++ b/modules/base/rendering/renderabledisc.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/base/rendering/renderablelabel.cpp b/modules/base/rendering/renderablelabel.cpp
index 06b91995c4..d57d43d25c 100644
--- a/modules/base/rendering/renderablelabel.cpp
+++ b/modules/base/rendering/renderablelabel.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/base/rendering/renderablelabel.h b/modules/base/rendering/renderablelabel.h
index f9b2b57d0c..ab6bca8772 100644
--- a/modules/base/rendering/renderablelabel.h
+++ b/modules/base/rendering/renderablelabel.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/base/rendering/renderablemodel.cpp b/modules/base/rendering/renderablemodel.cpp
index d6a9aa5569..141361da84 100644
--- a/modules/base/rendering/renderablemodel.cpp
+++ b/modules/base/rendering/renderablemodel.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/base/rendering/renderablemodel.h b/modules/base/rendering/renderablemodel.h
index 133f65e9c8..74c1d3ff57 100644
--- a/modules/base/rendering/renderablemodel.h
+++ b/modules/base/rendering/renderablemodel.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/base/rendering/renderablenodearrow.cpp b/modules/base/rendering/renderablenodearrow.cpp
index e44c1cf2ea..3780fe35e3 100644
--- a/modules/base/rendering/renderablenodearrow.cpp
+++ b/modules/base/rendering/renderablenodearrow.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/base/rendering/renderablenodearrow.h b/modules/base/rendering/renderablenodearrow.h
index d020fafd9f..c092e82867 100644
--- a/modules/base/rendering/renderablenodearrow.h
+++ b/modules/base/rendering/renderablenodearrow.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/base/rendering/renderablenodeline.cpp b/modules/base/rendering/renderablenodeline.cpp
index b15644c5fa..68f6ebc97d 100644
--- a/modules/base/rendering/renderablenodeline.cpp
+++ b/modules/base/rendering/renderablenodeline.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/base/rendering/renderablenodeline.h b/modules/base/rendering/renderablenodeline.h
index 7d62d0a534..65a0694692 100644
--- a/modules/base/rendering/renderablenodeline.h
+++ b/modules/base/rendering/renderablenodeline.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/base/rendering/renderableplane.cpp b/modules/base/rendering/renderableplane.cpp
index ae5cb7d3e5..cf5285f1c4 100644
--- a/modules/base/rendering/renderableplane.cpp
+++ b/modules/base/rendering/renderableplane.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/base/rendering/renderableplane.h b/modules/base/rendering/renderableplane.h
index d6bc9f9b53..2144d95a75 100644
--- a/modules/base/rendering/renderableplane.h
+++ b/modules/base/rendering/renderableplane.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/base/rendering/renderableplaneimagelocal.cpp b/modules/base/rendering/renderableplaneimagelocal.cpp
index 8280dfcee0..6114da3d5d 100644
--- a/modules/base/rendering/renderableplaneimagelocal.cpp
+++ b/modules/base/rendering/renderableplaneimagelocal.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/base/rendering/renderableplaneimagelocal.h b/modules/base/rendering/renderableplaneimagelocal.h
index e4d10349fd..1891d0f6d7 100644
--- a/modules/base/rendering/renderableplaneimagelocal.h
+++ b/modules/base/rendering/renderableplaneimagelocal.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/base/rendering/renderableplaneimageonline.cpp b/modules/base/rendering/renderableplaneimageonline.cpp
index a7d876237d..cb662f70a5 100644
--- a/modules/base/rendering/renderableplaneimageonline.cpp
+++ b/modules/base/rendering/renderableplaneimageonline.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/base/rendering/renderableplaneimageonline.h b/modules/base/rendering/renderableplaneimageonline.h
index 66182bb749..3c283f11eb 100644
--- a/modules/base/rendering/renderableplaneimageonline.h
+++ b/modules/base/rendering/renderableplaneimageonline.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/base/rendering/renderableplanetimevaryingimage.cpp b/modules/base/rendering/renderableplanetimevaryingimage.cpp
index b7d498ed47..01059789bf 100644
--- a/modules/base/rendering/renderableplanetimevaryingimage.cpp
+++ b/modules/base/rendering/renderableplanetimevaryingimage.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/base/rendering/renderableplanetimevaryingimage.h b/modules/base/rendering/renderableplanetimevaryingimage.h
index 48defbd122..adb667868b 100644
--- a/modules/base/rendering/renderableplanetimevaryingimage.h
+++ b/modules/base/rendering/renderableplanetimevaryingimage.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/base/rendering/renderableprism.cpp b/modules/base/rendering/renderableprism.cpp
index b7d3936e14..1f1b63b4e4 100644
--- a/modules/base/rendering/renderableprism.cpp
+++ b/modules/base/rendering/renderableprism.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/base/rendering/renderableprism.h b/modules/base/rendering/renderableprism.h
index eb01193fed..79afeb5568 100644
--- a/modules/base/rendering/renderableprism.h
+++ b/modules/base/rendering/renderableprism.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/base/rendering/renderablesphere.cpp b/modules/base/rendering/renderablesphere.cpp
index 2cd9f54ff2..bd73a1141d 100644
--- a/modules/base/rendering/renderablesphere.cpp
+++ b/modules/base/rendering/renderablesphere.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/base/rendering/renderablesphere.h b/modules/base/rendering/renderablesphere.h
index d75dc69369..0dfb3f880e 100644
--- a/modules/base/rendering/renderablesphere.h
+++ b/modules/base/rendering/renderablesphere.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/base/rendering/renderablesphereimagelocal.cpp b/modules/base/rendering/renderablesphereimagelocal.cpp
index 92810ecc80..92b9441935 100644
--- a/modules/base/rendering/renderablesphereimagelocal.cpp
+++ b/modules/base/rendering/renderablesphereimagelocal.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/base/rendering/renderablesphereimagelocal.h b/modules/base/rendering/renderablesphereimagelocal.h
index 2b7fe624c0..84c1286f77 100644
--- a/modules/base/rendering/renderablesphereimagelocal.h
+++ b/modules/base/rendering/renderablesphereimagelocal.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/base/rendering/renderablesphereimageonline.cpp b/modules/base/rendering/renderablesphereimageonline.cpp
index 036fc52bcd..b1d64dc0ec 100644
--- a/modules/base/rendering/renderablesphereimageonline.cpp
+++ b/modules/base/rendering/renderablesphereimageonline.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/base/rendering/renderablesphereimageonline.h b/modules/base/rendering/renderablesphereimageonline.h
index 0aec90ba0c..ed256d0719 100644
--- a/modules/base/rendering/renderablesphereimageonline.h
+++ b/modules/base/rendering/renderablesphereimageonline.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/base/rendering/renderabletimevaryingsphere.cpp b/modules/base/rendering/renderabletimevaryingsphere.cpp
index 8f616136b4..8cde614fad 100644
--- a/modules/base/rendering/renderabletimevaryingsphere.cpp
+++ b/modules/base/rendering/renderabletimevaryingsphere.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/base/rendering/renderabletimevaryingsphere.h b/modules/base/rendering/renderabletimevaryingsphere.h
index d7f9aeeb13..3add139bbe 100644
--- a/modules/base/rendering/renderabletimevaryingsphere.h
+++ b/modules/base/rendering/renderabletimevaryingsphere.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/base/rendering/renderabletrail.cpp b/modules/base/rendering/renderabletrail.cpp
index 1f0d9f26ba..f8a65ad83d 100644
--- a/modules/base/rendering/renderabletrail.cpp
+++ b/modules/base/rendering/renderabletrail.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/base/rendering/renderabletrail.h b/modules/base/rendering/renderabletrail.h
index 032c80a2cd..2840067d58 100644
--- a/modules/base/rendering/renderabletrail.h
+++ b/modules/base/rendering/renderabletrail.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/base/rendering/renderabletrailorbit.cpp b/modules/base/rendering/renderabletrailorbit.cpp
index 0c2b552f79..57c40622b9 100644
--- a/modules/base/rendering/renderabletrailorbit.cpp
+++ b/modules/base/rendering/renderabletrailorbit.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/base/rendering/renderabletrailorbit.h b/modules/base/rendering/renderabletrailorbit.h
index 358af448d4..1f56af9f19 100644
--- a/modules/base/rendering/renderabletrailorbit.h
+++ b/modules/base/rendering/renderabletrailorbit.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/base/rendering/renderabletrailtrajectory.cpp b/modules/base/rendering/renderabletrailtrajectory.cpp
index af7448208e..4021811678 100644
--- a/modules/base/rendering/renderabletrailtrajectory.cpp
+++ b/modules/base/rendering/renderabletrailtrajectory.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/base/rendering/renderabletrailtrajectory.h b/modules/base/rendering/renderabletrailtrajectory.h
index 3484b4afa3..62247da9e4 100644
--- a/modules/base/rendering/renderabletrailtrajectory.h
+++ b/modules/base/rendering/renderabletrailtrajectory.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/base/rendering/screenspacedashboard.cpp b/modules/base/rendering/screenspacedashboard.cpp
index 8bbc2f2f9b..32ee38765b 100644
--- a/modules/base/rendering/screenspacedashboard.cpp
+++ b/modules/base/rendering/screenspacedashboard.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/base/rendering/screenspacedashboard.h b/modules/base/rendering/screenspacedashboard.h
index 86e155947d..18aa3fc743 100644
--- a/modules/base/rendering/screenspacedashboard.h
+++ b/modules/base/rendering/screenspacedashboard.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/base/rendering/screenspacedashboard_lua.inl b/modules/base/rendering/screenspacedashboard_lua.inl
index 34ce71d0e4..0c1e3f87af 100644
--- a/modules/base/rendering/screenspacedashboard_lua.inl
+++ b/modules/base/rendering/screenspacedashboard_lua.inl
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/base/rendering/screenspaceframebuffer.cpp b/modules/base/rendering/screenspaceframebuffer.cpp
index 8628def58c..e34166e976 100644
--- a/modules/base/rendering/screenspaceframebuffer.cpp
+++ b/modules/base/rendering/screenspaceframebuffer.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/base/rendering/screenspaceframebuffer.h b/modules/base/rendering/screenspaceframebuffer.h
index bf190cf4e1..b00300c9dc 100644
--- a/modules/base/rendering/screenspaceframebuffer.h
+++ b/modules/base/rendering/screenspaceframebuffer.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/base/rendering/screenspaceimagelocal.cpp b/modules/base/rendering/screenspaceimagelocal.cpp
index 2115750690..bda85bc416 100644
--- a/modules/base/rendering/screenspaceimagelocal.cpp
+++ b/modules/base/rendering/screenspaceimagelocal.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/base/rendering/screenspaceimagelocal.h b/modules/base/rendering/screenspaceimagelocal.h
index a00288c1d3..d0441945d8 100644
--- a/modules/base/rendering/screenspaceimagelocal.h
+++ b/modules/base/rendering/screenspaceimagelocal.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/base/rendering/screenspaceimageonline.cpp b/modules/base/rendering/screenspaceimageonline.cpp
index e39b422288..a972aca94d 100644
--- a/modules/base/rendering/screenspaceimageonline.cpp
+++ b/modules/base/rendering/screenspaceimageonline.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/base/rendering/screenspaceimageonline.h b/modules/base/rendering/screenspaceimageonline.h
index 9c9ecc2199..412441e62b 100644
--- a/modules/base/rendering/screenspaceimageonline.h
+++ b/modules/base/rendering/screenspaceimageonline.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/base/rotation/constantrotation.cpp b/modules/base/rotation/constantrotation.cpp
index 71949103e2..9a33d17c59 100644
--- a/modules/base/rotation/constantrotation.cpp
+++ b/modules/base/rotation/constantrotation.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/base/rotation/constantrotation.h b/modules/base/rotation/constantrotation.h
index 5cd4ac9b45..3577a7f2f9 100644
--- a/modules/base/rotation/constantrotation.h
+++ b/modules/base/rotation/constantrotation.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/base/rotation/fixedrotation.cpp b/modules/base/rotation/fixedrotation.cpp
index ab69accaf7..fc083d8eca 100644
--- a/modules/base/rotation/fixedrotation.cpp
+++ b/modules/base/rotation/fixedrotation.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/base/rotation/fixedrotation.h b/modules/base/rotation/fixedrotation.h
index b15e9be933..569849256a 100644
--- a/modules/base/rotation/fixedrotation.h
+++ b/modules/base/rotation/fixedrotation.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/base/rotation/luarotation.cpp b/modules/base/rotation/luarotation.cpp
index 83dc48fa7a..648475cb6f 100644
--- a/modules/base/rotation/luarotation.cpp
+++ b/modules/base/rotation/luarotation.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/base/rotation/luarotation.h b/modules/base/rotation/luarotation.h
index be61bdd558..da0e5ab17a 100644
--- a/modules/base/rotation/luarotation.h
+++ b/modules/base/rotation/luarotation.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/base/rotation/staticrotation.cpp b/modules/base/rotation/staticrotation.cpp
index 3b4acc4208..fbe008f3ce 100644
--- a/modules/base/rotation/staticrotation.cpp
+++ b/modules/base/rotation/staticrotation.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/base/rotation/staticrotation.h b/modules/base/rotation/staticrotation.h
index fcd95444ab..e0ba9daebf 100644
--- a/modules/base/rotation/staticrotation.h
+++ b/modules/base/rotation/staticrotation.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/base/rotation/timelinerotation.cpp b/modules/base/rotation/timelinerotation.cpp
index ce881f6a5d..de2709f163 100644
--- a/modules/base/rotation/timelinerotation.cpp
+++ b/modules/base/rotation/timelinerotation.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/base/rotation/timelinerotation.h b/modules/base/rotation/timelinerotation.h
index 9d1cb37337..a755351c44 100644
--- a/modules/base/rotation/timelinerotation.h
+++ b/modules/base/rotation/timelinerotation.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/base/scale/luascale.cpp b/modules/base/scale/luascale.cpp
index 92450a067e..466467db4d 100644
--- a/modules/base/scale/luascale.cpp
+++ b/modules/base/scale/luascale.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/base/scale/luascale.h b/modules/base/scale/luascale.h
index 677f6734be..5538bd73ca 100644
--- a/modules/base/scale/luascale.h
+++ b/modules/base/scale/luascale.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/base/scale/nonuniformstaticscale.cpp b/modules/base/scale/nonuniformstaticscale.cpp
index d6c4148b2d..a10c1e0c55 100644
--- a/modules/base/scale/nonuniformstaticscale.cpp
+++ b/modules/base/scale/nonuniformstaticscale.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/base/scale/nonuniformstaticscale.h b/modules/base/scale/nonuniformstaticscale.h
index 194924887f..59d25457e1 100644
--- a/modules/base/scale/nonuniformstaticscale.h
+++ b/modules/base/scale/nonuniformstaticscale.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/base/scale/staticscale.cpp b/modules/base/scale/staticscale.cpp
index 0317709275..975e7a6b8c 100644
--- a/modules/base/scale/staticscale.cpp
+++ b/modules/base/scale/staticscale.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/base/scale/staticscale.h b/modules/base/scale/staticscale.h
index 5eec024e59..c7f2c84bd2 100644
--- a/modules/base/scale/staticscale.h
+++ b/modules/base/scale/staticscale.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/base/scale/timedependentscale.cpp b/modules/base/scale/timedependentscale.cpp
index 3511658936..a4ecf7da99 100644
--- a/modules/base/scale/timedependentscale.cpp
+++ b/modules/base/scale/timedependentscale.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/base/scale/timedependentscale.h b/modules/base/scale/timedependentscale.h
index a6b499798f..fdfc5a4a86 100644
--- a/modules/base/scale/timedependentscale.h
+++ b/modules/base/scale/timedependentscale.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/base/shaders/arrow_fs.glsl b/modules/base/shaders/arrow_fs.glsl
index 036e67ed18..eec482b47d 100644
--- a/modules/base/shaders/arrow_fs.glsl
+++ b/modules/base/shaders/arrow_fs.glsl
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/base/shaders/arrow_vs.glsl b/modules/base/shaders/arrow_vs.glsl
index 919e838d2d..5b178876b8 100644
--- a/modules/base/shaders/arrow_vs.glsl
+++ b/modules/base/shaders/arrow_vs.glsl
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/base/shaders/axes_fs.glsl b/modules/base/shaders/axes_fs.glsl
index 8ffd2f03e2..3ac974a762 100644
--- a/modules/base/shaders/axes_fs.glsl
+++ b/modules/base/shaders/axes_fs.glsl
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/base/shaders/axes_vs.glsl b/modules/base/shaders/axes_vs.glsl
index c56505f64c..aefbead13c 100644
--- a/modules/base/shaders/axes_vs.glsl
+++ b/modules/base/shaders/axes_vs.glsl
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/base/shaders/disc_fs.glsl b/modules/base/shaders/disc_fs.glsl
index 9ee95a24e2..cdd79ce781 100644
--- a/modules/base/shaders/disc_fs.glsl
+++ b/modules/base/shaders/disc_fs.glsl
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/base/shaders/disc_vs.glsl b/modules/base/shaders/disc_vs.glsl
index c2dbd4674f..8a7bba9efe 100644
--- a/modules/base/shaders/disc_vs.glsl
+++ b/modules/base/shaders/disc_vs.glsl
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/base/shaders/grid_fs.glsl b/modules/base/shaders/grid_fs.glsl
index 51f279ae27..05aee2d993 100644
--- a/modules/base/shaders/grid_fs.glsl
+++ b/modules/base/shaders/grid_fs.glsl
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/base/shaders/grid_vs.glsl b/modules/base/shaders/grid_vs.glsl
index 87dc838550..0c0c99a9c5 100644
--- a/modules/base/shaders/grid_vs.glsl
+++ b/modules/base/shaders/grid_vs.glsl
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/base/shaders/imageplane_fs.glsl b/modules/base/shaders/imageplane_fs.glsl
index 5e970fd883..95fcbb288b 100644
--- a/modules/base/shaders/imageplane_fs.glsl
+++ b/modules/base/shaders/imageplane_fs.glsl
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/base/shaders/imageplane_vs.glsl b/modules/base/shaders/imageplane_vs.glsl
index 4233ebe8c9..5a9e789b47 100644
--- a/modules/base/shaders/imageplane_vs.glsl
+++ b/modules/base/shaders/imageplane_vs.glsl
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/base/shaders/line_fs.glsl b/modules/base/shaders/line_fs.glsl
index 68f69de4b0..22277ee1b4 100644
--- a/modules/base/shaders/line_fs.glsl
+++ b/modules/base/shaders/line_fs.glsl
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/base/shaders/line_vs.glsl b/modules/base/shaders/line_vs.glsl
index 372def6e0c..82d38fc7c3 100644
--- a/modules/base/shaders/line_vs.glsl
+++ b/modules/base/shaders/line_vs.glsl
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/base/shaders/model_fs.glsl b/modules/base/shaders/model_fs.glsl
index 0c3108274a..79f6f9dc69 100644
--- a/modules/base/shaders/model_fs.glsl
+++ b/modules/base/shaders/model_fs.glsl
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/base/shaders/model_vs.glsl b/modules/base/shaders/model_vs.glsl
index 76cead149f..9d12edc407 100644
--- a/modules/base/shaders/model_vs.glsl
+++ b/modules/base/shaders/model_vs.glsl
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/base/shaders/plane_fs.glsl b/modules/base/shaders/plane_fs.glsl
index 11761fdb47..5ba8e9d8c7 100644
--- a/modules/base/shaders/plane_fs.glsl
+++ b/modules/base/shaders/plane_fs.glsl
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/base/shaders/plane_vs.glsl b/modules/base/shaders/plane_vs.glsl
index e1e3bb1f73..05a368b975 100644
--- a/modules/base/shaders/plane_vs.glsl
+++ b/modules/base/shaders/plane_vs.glsl
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/base/shaders/pointcloud/billboardpoint_fs.glsl b/modules/base/shaders/pointcloud/billboardpoint_fs.glsl
index 7b6b51c8e4..a117d53e6b 100644
--- a/modules/base/shaders/pointcloud/billboardpoint_fs.glsl
+++ b/modules/base/shaders/pointcloud/billboardpoint_fs.glsl
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/base/shaders/pointcloud/billboardpoint_gs.glsl b/modules/base/shaders/pointcloud/billboardpoint_gs.glsl
index 51e58c3774..87f9d5eca3 100644
--- a/modules/base/shaders/pointcloud/billboardpoint_gs.glsl
+++ b/modules/base/shaders/pointcloud/billboardpoint_gs.glsl
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/base/shaders/pointcloud/billboardpoint_interpolated_vs.glsl b/modules/base/shaders/pointcloud/billboardpoint_interpolated_vs.glsl
index 494b096e2f..88b558620a 100644
--- a/modules/base/shaders/pointcloud/billboardpoint_interpolated_vs.glsl
+++ b/modules/base/shaders/pointcloud/billboardpoint_interpolated_vs.glsl
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/base/shaders/pointcloud/billboardpoint_vs.glsl b/modules/base/shaders/pointcloud/billboardpoint_vs.glsl
index a92d569161..476a994e11 100644
--- a/modules/base/shaders/pointcloud/billboardpoint_vs.glsl
+++ b/modules/base/shaders/pointcloud/billboardpoint_vs.glsl
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/base/shaders/polygon_fs.glsl b/modules/base/shaders/polygon_fs.glsl
index 5a66e28eb3..495bdc6232 100644
--- a/modules/base/shaders/polygon_fs.glsl
+++ b/modules/base/shaders/polygon_fs.glsl
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/base/shaders/polygon_gs.glsl b/modules/base/shaders/polygon_gs.glsl
index 764fb2fbe6..38a3c8b349 100644
--- a/modules/base/shaders/polygon_gs.glsl
+++ b/modules/base/shaders/polygon_gs.glsl
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/base/shaders/polygon_vs.glsl b/modules/base/shaders/polygon_vs.glsl
index 73f3cba430..e39bc57054 100644
--- a/modules/base/shaders/polygon_vs.glsl
+++ b/modules/base/shaders/polygon_vs.glsl
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/base/shaders/prism_fs.glsl b/modules/base/shaders/prism_fs.glsl
index 7bb84a2032..81445ccb3f 100644
--- a/modules/base/shaders/prism_fs.glsl
+++ b/modules/base/shaders/prism_fs.glsl
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/base/shaders/prism_vs.glsl b/modules/base/shaders/prism_vs.glsl
index aa0db41102..563010854a 100644
--- a/modules/base/shaders/prism_vs.glsl
+++ b/modules/base/shaders/prism_vs.glsl
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/base/shaders/renderabletrail_apple_fs.glsl b/modules/base/shaders/renderabletrail_apple_fs.glsl
index 7d7d61cbb4..16d57b3dd7 100644
--- a/modules/base/shaders/renderabletrail_apple_fs.glsl
+++ b/modules/base/shaders/renderabletrail_apple_fs.glsl
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/base/shaders/renderabletrail_apple_vs.glsl b/modules/base/shaders/renderabletrail_apple_vs.glsl
index 75baaa5449..a7c45a93a9 100644
--- a/modules/base/shaders/renderabletrail_apple_vs.glsl
+++ b/modules/base/shaders/renderabletrail_apple_vs.glsl
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/base/shaders/renderabletrail_fs.glsl b/modules/base/shaders/renderabletrail_fs.glsl
index 7d0ac545ef..668abf9d8c 100644
--- a/modules/base/shaders/renderabletrail_fs.glsl
+++ b/modules/base/shaders/renderabletrail_fs.glsl
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/base/shaders/renderabletrail_vs.glsl b/modules/base/shaders/renderabletrail_vs.glsl
index 1b5f818a53..aa1fffcac7 100644
--- a/modules/base/shaders/renderabletrail_vs.glsl
+++ b/modules/base/shaders/renderabletrail_vs.glsl
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/base/shaders/screenspace_fs.glsl b/modules/base/shaders/screenspace_fs.glsl
index 0124d1c5d0..b39f95c81a 100644
--- a/modules/base/shaders/screenspace_fs.glsl
+++ b/modules/base/shaders/screenspace_fs.glsl
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/base/shaders/screenspace_vs.glsl b/modules/base/shaders/screenspace_vs.glsl
index 4d0a2c820b..bf848f68d1 100644
--- a/modules/base/shaders/screenspace_vs.glsl
+++ b/modules/base/shaders/screenspace_vs.glsl
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/base/shaders/sphere_fs.glsl b/modules/base/shaders/sphere_fs.glsl
index 1a02027ebd..757fac9510 100644
--- a/modules/base/shaders/sphere_fs.glsl
+++ b/modules/base/shaders/sphere_fs.glsl
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/base/shaders/sphere_vs.glsl b/modules/base/shaders/sphere_vs.glsl
index 9180214c74..13aa469132 100644
--- a/modules/base/shaders/sphere_vs.glsl
+++ b/modules/base/shaders/sphere_vs.glsl
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/base/timeframe/timeframeinterval.cpp b/modules/base/timeframe/timeframeinterval.cpp
index 36a16eee2c..7cf33cc43c 100644
--- a/modules/base/timeframe/timeframeinterval.cpp
+++ b/modules/base/timeframe/timeframeinterval.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/base/timeframe/timeframeinterval.h b/modules/base/timeframe/timeframeinterval.h
index b95ae1eac9..7214c6dd48 100644
--- a/modules/base/timeframe/timeframeinterval.h
+++ b/modules/base/timeframe/timeframeinterval.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/base/timeframe/timeframeunion.cpp b/modules/base/timeframe/timeframeunion.cpp
index 656a0d0daf..367155a8e9 100644
--- a/modules/base/timeframe/timeframeunion.cpp
+++ b/modules/base/timeframe/timeframeunion.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/base/timeframe/timeframeunion.h b/modules/base/timeframe/timeframeunion.h
index d3970a653a..e28167b309 100644
--- a/modules/base/timeframe/timeframeunion.h
+++ b/modules/base/timeframe/timeframeunion.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/base/translation/luatranslation.cpp b/modules/base/translation/luatranslation.cpp
index 4bdda55028..c97424af4a 100644
--- a/modules/base/translation/luatranslation.cpp
+++ b/modules/base/translation/luatranslation.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/base/translation/luatranslation.h b/modules/base/translation/luatranslation.h
index 349a31b38d..4a85691866 100644
--- a/modules/base/translation/luatranslation.h
+++ b/modules/base/translation/luatranslation.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/base/translation/statictranslation.cpp b/modules/base/translation/statictranslation.cpp
index 80bad2af5a..079604db64 100644
--- a/modules/base/translation/statictranslation.cpp
+++ b/modules/base/translation/statictranslation.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/base/translation/statictranslation.h b/modules/base/translation/statictranslation.h
index e98af32313..620faca325 100644
--- a/modules/base/translation/statictranslation.h
+++ b/modules/base/translation/statictranslation.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/base/translation/timelinetranslation.cpp b/modules/base/translation/timelinetranslation.cpp
index d64bebe79a..e9a12adc0d 100644
--- a/modules/base/translation/timelinetranslation.cpp
+++ b/modules/base/translation/timelinetranslation.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/base/translation/timelinetranslation.h b/modules/base/translation/timelinetranslation.h
index 482c21bde2..1fae1d4b1d 100644
--- a/modules/base/translation/timelinetranslation.h
+++ b/modules/base/translation/timelinetranslation.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/cefwebgui/cefwebguimodule.cpp b/modules/cefwebgui/cefwebguimodule.cpp
index e9c81bd121..3aab3b311f 100644
--- a/modules/cefwebgui/cefwebguimodule.cpp
+++ b/modules/cefwebgui/cefwebguimodule.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/cefwebgui/cefwebguimodule.h b/modules/cefwebgui/cefwebguimodule.h
index 8dcef3b2e1..f2855ab2b6 100644
--- a/modules/cefwebgui/cefwebguimodule.h
+++ b/modules/cefwebgui/cefwebguimodule.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/cefwebgui/include/guikeyboardhandler.h b/modules/cefwebgui/include/guikeyboardhandler.h
index cdc22f6d46..29eb869a9c 100644
--- a/modules/cefwebgui/include/guikeyboardhandler.h
+++ b/modules/cefwebgui/include/guikeyboardhandler.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/cefwebgui/include/guirenderhandler.h b/modules/cefwebgui/include/guirenderhandler.h
index e2dbab5441..0552f45a3f 100644
--- a/modules/cefwebgui/include/guirenderhandler.h
+++ b/modules/cefwebgui/include/guirenderhandler.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/cefwebgui/shaders/gui_fs.glsl b/modules/cefwebgui/shaders/gui_fs.glsl
index 2d1201113f..288018f598 100644
--- a/modules/cefwebgui/shaders/gui_fs.glsl
+++ b/modules/cefwebgui/shaders/gui_fs.glsl
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/cefwebgui/shaders/gui_vs.glsl b/modules/cefwebgui/shaders/gui_vs.glsl
index dc5cd631ab..ccc480e0b8 100644
--- a/modules/cefwebgui/shaders/gui_vs.glsl
+++ b/modules/cefwebgui/shaders/gui_vs.glsl
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/cefwebgui/src/guikeyboardhandler.cpp b/modules/cefwebgui/src/guikeyboardhandler.cpp
index 3a54161024..5def130e58 100644
--- a/modules/cefwebgui/src/guikeyboardhandler.cpp
+++ b/modules/cefwebgui/src/guikeyboardhandler.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/cefwebgui/src/guirenderhandler.cpp b/modules/cefwebgui/src/guirenderhandler.cpp
index 6fb94f6668..e13f66c8d1 100644
--- a/modules/cefwebgui/src/guirenderhandler.cpp
+++ b/modules/cefwebgui/src/guirenderhandler.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/debugging/debuggingmodule.cpp b/modules/debugging/debuggingmodule.cpp
index 2af7b4fdbb..87d81a8663 100644
--- a/modules/debugging/debuggingmodule.cpp
+++ b/modules/debugging/debuggingmodule.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/debugging/debuggingmodule.h b/modules/debugging/debuggingmodule.h
index bffc843fcb..4dcc34d075 100644
--- a/modules/debugging/debuggingmodule.h
+++ b/modules/debugging/debuggingmodule.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/debugging/debuggingmodule_lua.inl b/modules/debugging/debuggingmodule_lua.inl
index de69a6deb5..ac83715d8a 100644
--- a/modules/debugging/debuggingmodule_lua.inl
+++ b/modules/debugging/debuggingmodule_lua.inl
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/debugging/rendering/debugrenderer.cpp b/modules/debugging/rendering/debugrenderer.cpp
index 62bf000124..366682d8b2 100644
--- a/modules/debugging/rendering/debugrenderer.cpp
+++ b/modules/debugging/rendering/debugrenderer.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/debugging/rendering/debugrenderer.h b/modules/debugging/rendering/debugrenderer.h
index b5c0229358..4198056455 100644
--- a/modules/debugging/rendering/debugrenderer.h
+++ b/modules/debugging/rendering/debugrenderer.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/debugging/rendering/debugshader_fs.glsl b/modules/debugging/rendering/debugshader_fs.glsl
index b18c187ebf..a8c3532d3e 100644
--- a/modules/debugging/rendering/debugshader_fs.glsl
+++ b/modules/debugging/rendering/debugshader_fs.glsl
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/debugging/rendering/debugshader_vs.glsl b/modules/debugging/rendering/debugshader_vs.glsl
index b57738e072..decfa49b9d 100644
--- a/modules/debugging/rendering/debugshader_vs.glsl
+++ b/modules/debugging/rendering/debugshader_vs.glsl
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/debugging/rendering/renderabledebugplane.cpp b/modules/debugging/rendering/renderabledebugplane.cpp
index 97f780de47..541d1e6fff 100644
--- a/modules/debugging/rendering/renderabledebugplane.cpp
+++ b/modules/debugging/rendering/renderabledebugplane.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/debugging/rendering/renderabledebugplane.h b/modules/debugging/rendering/renderabledebugplane.h
index 7830e1ad05..3d71f188b5 100644
--- a/modules/debugging/rendering/renderabledebugplane.h
+++ b/modules/debugging/rendering/renderabledebugplane.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/digitaluniverse/digitaluniversemodule.cpp b/modules/digitaluniverse/digitaluniversemodule.cpp
index 92cb71ac1e..38f510df56 100644
--- a/modules/digitaluniverse/digitaluniversemodule.cpp
+++ b/modules/digitaluniverse/digitaluniversemodule.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/digitaluniverse/digitaluniversemodule.h b/modules/digitaluniverse/digitaluniversemodule.h
index ab8da1415d..51b17d457e 100644
--- a/modules/digitaluniverse/digitaluniversemodule.h
+++ b/modules/digitaluniverse/digitaluniversemodule.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/digitaluniverse/rendering/renderabledumeshes.cpp b/modules/digitaluniverse/rendering/renderabledumeshes.cpp
index 02baefd477..6037e07b95 100644
--- a/modules/digitaluniverse/rendering/renderabledumeshes.cpp
+++ b/modules/digitaluniverse/rendering/renderabledumeshes.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/digitaluniverse/rendering/renderabledumeshes.h b/modules/digitaluniverse/rendering/renderabledumeshes.h
index c4312fa18a..9204a87f51 100644
--- a/modules/digitaluniverse/rendering/renderabledumeshes.h
+++ b/modules/digitaluniverse/rendering/renderabledumeshes.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/digitaluniverse/rendering/renderableplanescloud.cpp b/modules/digitaluniverse/rendering/renderableplanescloud.cpp
index b0d635a2cb..9992b738ea 100644
--- a/modules/digitaluniverse/rendering/renderableplanescloud.cpp
+++ b/modules/digitaluniverse/rendering/renderableplanescloud.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/digitaluniverse/rendering/renderableplanescloud.h b/modules/digitaluniverse/rendering/renderableplanescloud.h
index 29edae010b..ed419bec63 100644
--- a/modules/digitaluniverse/rendering/renderableplanescloud.h
+++ b/modules/digitaluniverse/rendering/renderableplanescloud.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/digitaluniverse/shaders/dumesh_fs.glsl b/modules/digitaluniverse/shaders/dumesh_fs.glsl
index e037698615..32e622f5a9 100644
--- a/modules/digitaluniverse/shaders/dumesh_fs.glsl
+++ b/modules/digitaluniverse/shaders/dumesh_fs.glsl
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/digitaluniverse/shaders/dumesh_vs.glsl b/modules/digitaluniverse/shaders/dumesh_vs.glsl
index 1d092656c8..ceb843f68b 100644
--- a/modules/digitaluniverse/shaders/dumesh_vs.glsl
+++ b/modules/digitaluniverse/shaders/dumesh_vs.glsl
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/digitaluniverse/shaders/plane_fs.glsl b/modules/digitaluniverse/shaders/plane_fs.glsl
index 29857c4613..dadc28be5b 100644
--- a/modules/digitaluniverse/shaders/plane_fs.glsl
+++ b/modules/digitaluniverse/shaders/plane_fs.glsl
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/digitaluniverse/shaders/plane_vs.glsl b/modules/digitaluniverse/shaders/plane_vs.glsl
index e72964b33f..71bd4bd0b9 100644
--- a/modules/digitaluniverse/shaders/plane_vs.glsl
+++ b/modules/digitaluniverse/shaders/plane_vs.glsl
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/exoplanets/exoplanetshelper.cpp b/modules/exoplanets/exoplanetshelper.cpp
index 01c374044f..130e1581e4 100644
--- a/modules/exoplanets/exoplanetshelper.cpp
+++ b/modules/exoplanets/exoplanetshelper.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/exoplanets/exoplanetshelper.h b/modules/exoplanets/exoplanetshelper.h
index 8eda2ad51b..f08f4746b1 100644
--- a/modules/exoplanets/exoplanetshelper.h
+++ b/modules/exoplanets/exoplanetshelper.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/exoplanets/exoplanetsmodule.cpp b/modules/exoplanets/exoplanetsmodule.cpp
index b3923b27b4..1d37af2be1 100644
--- a/modules/exoplanets/exoplanetsmodule.cpp
+++ b/modules/exoplanets/exoplanetsmodule.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/exoplanets/exoplanetsmodule.h b/modules/exoplanets/exoplanetsmodule.h
index 61c748740e..0cba1a263f 100644
--- a/modules/exoplanets/exoplanetsmodule.h
+++ b/modules/exoplanets/exoplanetsmodule.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/exoplanets/exoplanetsmodule_lua.inl b/modules/exoplanets/exoplanetsmodule_lua.inl
index 9b4677e3f6..7d91656439 100644
--- a/modules/exoplanets/exoplanetsmodule_lua.inl
+++ b/modules/exoplanets/exoplanetsmodule_lua.inl
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/exoplanets/rendering/renderableorbitdisc.cpp b/modules/exoplanets/rendering/renderableorbitdisc.cpp
index 9fadb165f1..edd8f9a81f 100644
--- a/modules/exoplanets/rendering/renderableorbitdisc.cpp
+++ b/modules/exoplanets/rendering/renderableorbitdisc.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/exoplanets/rendering/renderableorbitdisc.h b/modules/exoplanets/rendering/renderableorbitdisc.h
index 271b20b724..b615079bfa 100644
--- a/modules/exoplanets/rendering/renderableorbitdisc.h
+++ b/modules/exoplanets/rendering/renderableorbitdisc.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/exoplanets/shaders/orbitdisc_fs.glsl b/modules/exoplanets/shaders/orbitdisc_fs.glsl
index 1253debbde..ff85d89f33 100644
--- a/modules/exoplanets/shaders/orbitdisc_fs.glsl
+++ b/modules/exoplanets/shaders/orbitdisc_fs.glsl
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/exoplanets/shaders/orbitdisc_vs.glsl b/modules/exoplanets/shaders/orbitdisc_vs.glsl
index 8fb4cf3f95..60d80b3abd 100644
--- a/modules/exoplanets/shaders/orbitdisc_vs.glsl
+++ b/modules/exoplanets/shaders/orbitdisc_vs.glsl
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/exoplanets/tasks/exoplanetsdatapreparationtask.cpp b/modules/exoplanets/tasks/exoplanetsdatapreparationtask.cpp
index c160e8e473..78bbe46a5e 100644
--- a/modules/exoplanets/tasks/exoplanetsdatapreparationtask.cpp
+++ b/modules/exoplanets/tasks/exoplanetsdatapreparationtask.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/exoplanets/tasks/exoplanetsdatapreparationtask.h b/modules/exoplanets/tasks/exoplanetsdatapreparationtask.h
index 7de2bb7e6d..d604472fb1 100644
--- a/modules/exoplanets/tasks/exoplanetsdatapreparationtask.h
+++ b/modules/exoplanets/tasks/exoplanetsdatapreparationtask.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/fieldlines/fieldlinesmodule.cpp b/modules/fieldlines/fieldlinesmodule.cpp
index 9c6fe316a4..61f58ce31c 100644
--- a/modules/fieldlines/fieldlinesmodule.cpp
+++ b/modules/fieldlines/fieldlinesmodule.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/fieldlines/fieldlinesmodule.h b/modules/fieldlines/fieldlinesmodule.h
index 022e4ece08..800e45e90d 100644
--- a/modules/fieldlines/fieldlinesmodule.h
+++ b/modules/fieldlines/fieldlinesmodule.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/fieldlines/rendering/renderablefieldlines.cpp b/modules/fieldlines/rendering/renderablefieldlines.cpp
index 6a2c56b0ce..919310d3e6 100644
--- a/modules/fieldlines/rendering/renderablefieldlines.cpp
+++ b/modules/fieldlines/rendering/renderablefieldlines.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/fieldlines/rendering/renderablefieldlines.h b/modules/fieldlines/rendering/renderablefieldlines.h
index c7a715c2ad..d4a25ad78b 100644
--- a/modules/fieldlines/rendering/renderablefieldlines.h
+++ b/modules/fieldlines/rendering/renderablefieldlines.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/fieldlines/shaders/fieldline_fs.glsl b/modules/fieldlines/shaders/fieldline_fs.glsl
index e7c42dd82a..304e2a268a 100644
--- a/modules/fieldlines/shaders/fieldline_fs.glsl
+++ b/modules/fieldlines/shaders/fieldline_fs.glsl
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/fieldlines/shaders/fieldline_gs.glsl b/modules/fieldlines/shaders/fieldline_gs.glsl
index 101cc6aebd..edb2046dec 100644
--- a/modules/fieldlines/shaders/fieldline_gs.glsl
+++ b/modules/fieldlines/shaders/fieldline_gs.glsl
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/fieldlines/shaders/fieldline_vs.glsl b/modules/fieldlines/shaders/fieldline_vs.glsl
index b4afdb78a7..bef66c6232 100644
--- a/modules/fieldlines/shaders/fieldline_vs.glsl
+++ b/modules/fieldlines/shaders/fieldline_vs.glsl
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/fieldlinessequence/fieldlinessequencemodule.cpp b/modules/fieldlinessequence/fieldlinessequencemodule.cpp
index ae809d6cab..9973fd4fa5 100644
--- a/modules/fieldlinessequence/fieldlinessequencemodule.cpp
+++ b/modules/fieldlinessequence/fieldlinessequencemodule.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/fieldlinessequence/fieldlinessequencemodule.h b/modules/fieldlinessequence/fieldlinessequencemodule.h
index 5f31b5f1bd..e9a71fb144 100644
--- a/modules/fieldlinessequence/fieldlinessequencemodule.h
+++ b/modules/fieldlinessequence/fieldlinessequencemodule.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/fieldlinessequence/rendering/renderablefieldlinessequence.cpp b/modules/fieldlinessequence/rendering/renderablefieldlinessequence.cpp
index a660a15456..a40f28615d 100644
--- a/modules/fieldlinessequence/rendering/renderablefieldlinessequence.cpp
+++ b/modules/fieldlinessequence/rendering/renderablefieldlinessequence.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/fieldlinessequence/rendering/renderablefieldlinessequence.h b/modules/fieldlinessequence/rendering/renderablefieldlinessequence.h
index f30c8c75ad..b704a9b8d3 100644
--- a/modules/fieldlinessequence/rendering/renderablefieldlinessequence.h
+++ b/modules/fieldlinessequence/rendering/renderablefieldlinessequence.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/fieldlinessequence/shaders/fieldlinessequence_fs.glsl b/modules/fieldlinessequence/shaders/fieldlinessequence_fs.glsl
index 946397875f..f59a3f2ce6 100644
--- a/modules/fieldlinessequence/shaders/fieldlinessequence_fs.glsl
+++ b/modules/fieldlinessequence/shaders/fieldlinessequence_fs.glsl
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/fieldlinessequence/shaders/fieldlinessequence_vs.glsl b/modules/fieldlinessequence/shaders/fieldlinessequence_vs.glsl
index e98c36c016..b3a5271d05 100644
--- a/modules/fieldlinessequence/shaders/fieldlinessequence_vs.glsl
+++ b/modules/fieldlinessequence/shaders/fieldlinessequence_vs.glsl
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/fieldlinessequence/util/commons.cpp b/modules/fieldlinessequence/util/commons.cpp
index a7706f87a8..59afc8bae2 100644
--- a/modules/fieldlinessequence/util/commons.cpp
+++ b/modules/fieldlinessequence/util/commons.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/fieldlinessequence/util/commons.h b/modules/fieldlinessequence/util/commons.h
index 695743d5a4..e7a50b6b3b 100644
--- a/modules/fieldlinessequence/util/commons.h
+++ b/modules/fieldlinessequence/util/commons.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/fieldlinessequence/util/fieldlinesstate.cpp b/modules/fieldlinessequence/util/fieldlinesstate.cpp
index 39263d007a..6645783fe3 100644
--- a/modules/fieldlinessequence/util/fieldlinesstate.cpp
+++ b/modules/fieldlinessequence/util/fieldlinesstate.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/fieldlinessequence/util/fieldlinesstate.h b/modules/fieldlinessequence/util/fieldlinesstate.h
index 8d80782aab..2d5d44afbd 100644
--- a/modules/fieldlinessequence/util/fieldlinesstate.h
+++ b/modules/fieldlinessequence/util/fieldlinesstate.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/fieldlinessequence/util/kameleonfieldlinehelper.cpp b/modules/fieldlinessequence/util/kameleonfieldlinehelper.cpp
index e17157b7e9..6c73961192 100644
--- a/modules/fieldlinessequence/util/kameleonfieldlinehelper.cpp
+++ b/modules/fieldlinessequence/util/kameleonfieldlinehelper.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/fieldlinessequence/util/kameleonfieldlinehelper.h b/modules/fieldlinessequence/util/kameleonfieldlinehelper.h
index 5599f6914c..76bfb86aeb 100644
--- a/modules/fieldlinessequence/util/kameleonfieldlinehelper.h
+++ b/modules/fieldlinessequence/util/kameleonfieldlinehelper.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/fitsfilereader/fitsfilereadermodule.cpp b/modules/fitsfilereader/fitsfilereadermodule.cpp
index 002c95e858..7a9eadde32 100644
--- a/modules/fitsfilereader/fitsfilereadermodule.cpp
+++ b/modules/fitsfilereader/fitsfilereadermodule.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/fitsfilereader/fitsfilereadermodule.h b/modules/fitsfilereader/fitsfilereadermodule.h
index 8fb66a3410..a25b01bc60 100644
--- a/modules/fitsfilereader/fitsfilereadermodule.h
+++ b/modules/fitsfilereader/fitsfilereadermodule.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/fitsfilereader/include/fitsfilereader.h b/modules/fitsfilereader/include/fitsfilereader.h
index a98a3b970f..3875cf27c6 100644
--- a/modules/fitsfilereader/include/fitsfilereader.h
+++ b/modules/fitsfilereader/include/fitsfilereader.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/fitsfilereader/src/fitsfilereader.cpp b/modules/fitsfilereader/src/fitsfilereader.cpp
index 1ac6ed09a8..fa90651c72 100644
--- a/modules/fitsfilereader/src/fitsfilereader.cpp
+++ b/modules/fitsfilereader/src/fitsfilereader.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/gaia/gaiamodule.cpp b/modules/gaia/gaiamodule.cpp
index 6120886dae..1f8d12e8d1 100644
--- a/modules/gaia/gaiamodule.cpp
+++ b/modules/gaia/gaiamodule.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/gaia/gaiamodule.h b/modules/gaia/gaiamodule.h
index c07a30f470..42bc8693d6 100644
--- a/modules/gaia/gaiamodule.h
+++ b/modules/gaia/gaiamodule.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/gaia/rendering/gaiaoptions.h b/modules/gaia/rendering/gaiaoptions.h
index e4831a82a1..790016ce15 100644
--- a/modules/gaia/rendering/gaiaoptions.h
+++ b/modules/gaia/rendering/gaiaoptions.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/gaia/rendering/octreeculler.cpp b/modules/gaia/rendering/octreeculler.cpp
index e4c341c74c..dff3d8dc70 100644
--- a/modules/gaia/rendering/octreeculler.cpp
+++ b/modules/gaia/rendering/octreeculler.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/gaia/rendering/octreeculler.h b/modules/gaia/rendering/octreeculler.h
index 307385df00..e4f3d76540 100644
--- a/modules/gaia/rendering/octreeculler.h
+++ b/modules/gaia/rendering/octreeculler.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/gaia/rendering/octreemanager.cpp b/modules/gaia/rendering/octreemanager.cpp
index 85441313a9..6a58b3bbf0 100644
--- a/modules/gaia/rendering/octreemanager.cpp
+++ b/modules/gaia/rendering/octreemanager.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/gaia/rendering/octreemanager.h b/modules/gaia/rendering/octreemanager.h
index 89710ced51..23fa61e2a9 100644
--- a/modules/gaia/rendering/octreemanager.h
+++ b/modules/gaia/rendering/octreemanager.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/gaia/rendering/renderablegaiastars.cpp b/modules/gaia/rendering/renderablegaiastars.cpp
index f99b1c75aa..b7175d4b21 100644
--- a/modules/gaia/rendering/renderablegaiastars.cpp
+++ b/modules/gaia/rendering/renderablegaiastars.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/gaia/rendering/renderablegaiastars.h b/modules/gaia/rendering/renderablegaiastars.h
index 8424d84be0..a73fb0e618 100644
--- a/modules/gaia/rendering/renderablegaiastars.h
+++ b/modules/gaia/rendering/renderablegaiastars.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/gaia/shaders/gaia_billboard_fs.glsl b/modules/gaia/shaders/gaia_billboard_fs.glsl
index ffb76f0781..b377e51e0c 100644
--- a/modules/gaia/shaders/gaia_billboard_fs.glsl
+++ b/modules/gaia/shaders/gaia_billboard_fs.glsl
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/gaia/shaders/gaia_billboard_ge.glsl b/modules/gaia/shaders/gaia_billboard_ge.glsl
index 4d3df59446..503b1e8455 100644
--- a/modules/gaia/shaders/gaia_billboard_ge.glsl
+++ b/modules/gaia/shaders/gaia_billboard_ge.glsl
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/gaia/shaders/gaia_billboard_nofbo_fs.glsl b/modules/gaia/shaders/gaia_billboard_nofbo_fs.glsl
index 763b0d5122..e97705f8cf 100644
--- a/modules/gaia/shaders/gaia_billboard_nofbo_fs.glsl
+++ b/modules/gaia/shaders/gaia_billboard_nofbo_fs.glsl
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/gaia/shaders/gaia_point_fs.glsl b/modules/gaia/shaders/gaia_point_fs.glsl
index c7f998c063..1096e6894d 100644
--- a/modules/gaia/shaders/gaia_point_fs.glsl
+++ b/modules/gaia/shaders/gaia_point_fs.glsl
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/gaia/shaders/gaia_point_ge.glsl b/modules/gaia/shaders/gaia_point_ge.glsl
index c7cb52803a..3880490cbd 100644
--- a/modules/gaia/shaders/gaia_point_ge.glsl
+++ b/modules/gaia/shaders/gaia_point_ge.glsl
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/gaia/shaders/gaia_ssbo_vs.glsl b/modules/gaia/shaders/gaia_ssbo_vs.glsl
index b379f956df..c9af489f34 100644
--- a/modules/gaia/shaders/gaia_ssbo_vs.glsl
+++ b/modules/gaia/shaders/gaia_ssbo_vs.glsl
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/gaia/shaders/gaia_tonemapping_billboard_fs.glsl b/modules/gaia/shaders/gaia_tonemapping_billboard_fs.glsl
index 208b247c2b..aeaf100566 100644
--- a/modules/gaia/shaders/gaia_tonemapping_billboard_fs.glsl
+++ b/modules/gaia/shaders/gaia_tonemapping_billboard_fs.glsl
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/gaia/shaders/gaia_tonemapping_point_fs.glsl b/modules/gaia/shaders/gaia_tonemapping_point_fs.glsl
index 09c5548510..63d2a9f0e4 100644
--- a/modules/gaia/shaders/gaia_tonemapping_point_fs.glsl
+++ b/modules/gaia/shaders/gaia_tonemapping_point_fs.glsl
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/gaia/shaders/gaia_tonemapping_vs.glsl b/modules/gaia/shaders/gaia_tonemapping_vs.glsl
index 04befdaa5c..bebaa85c35 100644
--- a/modules/gaia/shaders/gaia_tonemapping_vs.glsl
+++ b/modules/gaia/shaders/gaia_tonemapping_vs.glsl
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/gaia/shaders/gaia_vbo_vs.glsl b/modules/gaia/shaders/gaia_vbo_vs.glsl
index cd1b7b8745..492fd86aee 100644
--- a/modules/gaia/shaders/gaia_vbo_vs.glsl
+++ b/modules/gaia/shaders/gaia_vbo_vs.glsl
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/gaia/tasks/constructoctreetask.cpp b/modules/gaia/tasks/constructoctreetask.cpp
index fde4f13505..52df7a11a6 100644
--- a/modules/gaia/tasks/constructoctreetask.cpp
+++ b/modules/gaia/tasks/constructoctreetask.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/gaia/tasks/constructoctreetask.h b/modules/gaia/tasks/constructoctreetask.h
index 0269569d92..d7635faf26 100644
--- a/modules/gaia/tasks/constructoctreetask.h
+++ b/modules/gaia/tasks/constructoctreetask.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/gaia/tasks/readfilejob.cpp b/modules/gaia/tasks/readfilejob.cpp
index 8377062677..0aeb5d4252 100644
--- a/modules/gaia/tasks/readfilejob.cpp
+++ b/modules/gaia/tasks/readfilejob.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/gaia/tasks/readfilejob.h b/modules/gaia/tasks/readfilejob.h
index 53451b5c1b..9409704084 100644
--- a/modules/gaia/tasks/readfilejob.h
+++ b/modules/gaia/tasks/readfilejob.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/gaia/tasks/readfitstask.cpp b/modules/gaia/tasks/readfitstask.cpp
index 19f855906c..cf978b3b94 100644
--- a/modules/gaia/tasks/readfitstask.cpp
+++ b/modules/gaia/tasks/readfitstask.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/gaia/tasks/readfitstask.h b/modules/gaia/tasks/readfitstask.h
index ad60b60cd6..cf7352e3d6 100644
--- a/modules/gaia/tasks/readfitstask.h
+++ b/modules/gaia/tasks/readfitstask.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/gaia/tasks/readspecktask.cpp b/modules/gaia/tasks/readspecktask.cpp
index a7ded67789..228730e21c 100644
--- a/modules/gaia/tasks/readspecktask.cpp
+++ b/modules/gaia/tasks/readspecktask.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/gaia/tasks/readspecktask.h b/modules/gaia/tasks/readspecktask.h
index 005a73e971..252c2f547f 100644
--- a/modules/gaia/tasks/readspecktask.h
+++ b/modules/gaia/tasks/readspecktask.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/galaxy/galaxymodule.cpp b/modules/galaxy/galaxymodule.cpp
index 1288ee92b3..14b40dd77f 100644
--- a/modules/galaxy/galaxymodule.cpp
+++ b/modules/galaxy/galaxymodule.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/galaxy/galaxymodule.h b/modules/galaxy/galaxymodule.h
index 7749ce30d9..e3a2f33602 100644
--- a/modules/galaxy/galaxymodule.h
+++ b/modules/galaxy/galaxymodule.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/galaxy/rendering/galaxyraycaster.cpp b/modules/galaxy/rendering/galaxyraycaster.cpp
index 623bdb04c1..d57644f180 100644
--- a/modules/galaxy/rendering/galaxyraycaster.cpp
+++ b/modules/galaxy/rendering/galaxyraycaster.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/galaxy/rendering/galaxyraycaster.h b/modules/galaxy/rendering/galaxyraycaster.h
index 5711247f40..559d476208 100644
--- a/modules/galaxy/rendering/galaxyraycaster.h
+++ b/modules/galaxy/rendering/galaxyraycaster.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/galaxy/rendering/renderablegalaxy.cpp b/modules/galaxy/rendering/renderablegalaxy.cpp
index b6ca4bbab3..1e4b162861 100644
--- a/modules/galaxy/rendering/renderablegalaxy.cpp
+++ b/modules/galaxy/rendering/renderablegalaxy.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/galaxy/rendering/renderablegalaxy.h b/modules/galaxy/rendering/renderablegalaxy.h
index 6614529633..4da5da407e 100644
--- a/modules/galaxy/rendering/renderablegalaxy.h
+++ b/modules/galaxy/rendering/renderablegalaxy.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/galaxy/shaders/billboard_fs.glsl b/modules/galaxy/shaders/billboard_fs.glsl
index f9382249b9..1bd3f4630a 100644
--- a/modules/galaxy/shaders/billboard_fs.glsl
+++ b/modules/galaxy/shaders/billboard_fs.glsl
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/galaxy/shaders/billboard_ge.glsl b/modules/galaxy/shaders/billboard_ge.glsl
index 1da0df9b7f..7134b506f9 100644
--- a/modules/galaxy/shaders/billboard_ge.glsl
+++ b/modules/galaxy/shaders/billboard_ge.glsl
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/galaxy/shaders/billboard_vs.glsl b/modules/galaxy/shaders/billboard_vs.glsl
index 1f8d1c3c46..659d760e58 100644
--- a/modules/galaxy/shaders/billboard_vs.glsl
+++ b/modules/galaxy/shaders/billboard_vs.glsl
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/galaxy/shaders/points_fs.glsl b/modules/galaxy/shaders/points_fs.glsl
index 7a02e97691..8c3d9d2aa3 100644
--- a/modules/galaxy/shaders/points_fs.glsl
+++ b/modules/galaxy/shaders/points_fs.glsl
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/galaxy/shaders/points_vs.glsl b/modules/galaxy/shaders/points_vs.glsl
index f9db99919d..86a52394b9 100644
--- a/modules/galaxy/shaders/points_vs.glsl
+++ b/modules/galaxy/shaders/points_vs.glsl
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/galaxy/shaders/raycasterbounds_fs.glsl b/modules/galaxy/shaders/raycasterbounds_fs.glsl
index bee57cf5e7..f8a45ec17c 100644
--- a/modules/galaxy/shaders/raycasterbounds_fs.glsl
+++ b/modules/galaxy/shaders/raycasterbounds_fs.glsl
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/galaxy/shaders/raycasterbounds_vs.glsl b/modules/galaxy/shaders/raycasterbounds_vs.glsl
index b3933e4ae6..f5592f9b53 100644
--- a/modules/galaxy/shaders/raycasterbounds_vs.glsl
+++ b/modules/galaxy/shaders/raycasterbounds_vs.glsl
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/galaxy/tasks/milkywayconversiontask.cpp b/modules/galaxy/tasks/milkywayconversiontask.cpp
index 69883870c0..a03b838d9f 100644
--- a/modules/galaxy/tasks/milkywayconversiontask.cpp
+++ b/modules/galaxy/tasks/milkywayconversiontask.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/galaxy/tasks/milkywayconversiontask.h b/modules/galaxy/tasks/milkywayconversiontask.h
index cce9b9433b..ac214ba39a 100644
--- a/modules/galaxy/tasks/milkywayconversiontask.h
+++ b/modules/galaxy/tasks/milkywayconversiontask.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/galaxy/tasks/milkywaypointsconversiontask.cpp b/modules/galaxy/tasks/milkywaypointsconversiontask.cpp
index e7d34f8ba5..93affdf86e 100644
--- a/modules/galaxy/tasks/milkywaypointsconversiontask.cpp
+++ b/modules/galaxy/tasks/milkywaypointsconversiontask.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/galaxy/tasks/milkywaypointsconversiontask.h b/modules/galaxy/tasks/milkywaypointsconversiontask.h
index 3551443d12..375a1b78af 100644
--- a/modules/galaxy/tasks/milkywaypointsconversiontask.h
+++ b/modules/galaxy/tasks/milkywaypointsconversiontask.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/globebrowsing/globebrowsingmodule.cpp b/modules/globebrowsing/globebrowsingmodule.cpp
index 31fb387ed5..8c4734d395 100644
--- a/modules/globebrowsing/globebrowsingmodule.cpp
+++ b/modules/globebrowsing/globebrowsingmodule.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/globebrowsing/globebrowsingmodule.h b/modules/globebrowsing/globebrowsingmodule.h
index e859e811ee..21da668fb5 100644
--- a/modules/globebrowsing/globebrowsingmodule.h
+++ b/modules/globebrowsing/globebrowsingmodule.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/globebrowsing/globebrowsingmodule_lua.inl b/modules/globebrowsing/globebrowsingmodule_lua.inl
index 3d51d058cd..1a01cd7ff7 100644
--- a/modules/globebrowsing/globebrowsingmodule_lua.inl
+++ b/modules/globebrowsing/globebrowsingmodule_lua.inl
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/globebrowsing/shaders/advanced_rings_fs.glsl b/modules/globebrowsing/shaders/advanced_rings_fs.glsl
index e852929d1e..d85529ad24 100644
--- a/modules/globebrowsing/shaders/advanced_rings_fs.glsl
+++ b/modules/globebrowsing/shaders/advanced_rings_fs.glsl
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/globebrowsing/shaders/advanced_rings_vs.glsl b/modules/globebrowsing/shaders/advanced_rings_vs.glsl
index fbf5ebb754..ef477caeef 100644
--- a/modules/globebrowsing/shaders/advanced_rings_vs.glsl
+++ b/modules/globebrowsing/shaders/advanced_rings_vs.glsl
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/globebrowsing/shaders/blending.glsl b/modules/globebrowsing/shaders/blending.glsl
index ce4f3b60a6..6b9a19570e 100644
--- a/modules/globebrowsing/shaders/blending.glsl
+++ b/modules/globebrowsing/shaders/blending.glsl
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/globebrowsing/shaders/geojson_fs.glsl b/modules/globebrowsing/shaders/geojson_fs.glsl
index 7d3496e9ca..97c8bbc0c8 100644
--- a/modules/globebrowsing/shaders/geojson_fs.glsl
+++ b/modules/globebrowsing/shaders/geojson_fs.glsl
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/globebrowsing/shaders/geojson_points_fs.glsl b/modules/globebrowsing/shaders/geojson_points_fs.glsl
index 8ec728cb34..ea1fe72a76 100644
--- a/modules/globebrowsing/shaders/geojson_points_fs.glsl
+++ b/modules/globebrowsing/shaders/geojson_points_fs.glsl
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/globebrowsing/shaders/geojson_points_gs.glsl b/modules/globebrowsing/shaders/geojson_points_gs.glsl
index 9eda63fa98..46fd996494 100644
--- a/modules/globebrowsing/shaders/geojson_points_gs.glsl
+++ b/modules/globebrowsing/shaders/geojson_points_gs.glsl
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/globebrowsing/shaders/geojson_points_vs.glsl b/modules/globebrowsing/shaders/geojson_points_vs.glsl
index 65f2b13780..d8195796b7 100644
--- a/modules/globebrowsing/shaders/geojson_points_vs.glsl
+++ b/modules/globebrowsing/shaders/geojson_points_vs.glsl
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/globebrowsing/shaders/geojson_vs.glsl b/modules/globebrowsing/shaders/geojson_vs.glsl
index f414fac371..8387cde66b 100644
--- a/modules/globebrowsing/shaders/geojson_vs.glsl
+++ b/modules/globebrowsing/shaders/geojson_vs.glsl
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/globebrowsing/shaders/globalrenderer_vs.glsl b/modules/globebrowsing/shaders/globalrenderer_vs.glsl
index a7489eb96b..c5437a19e6 100644
--- a/modules/globebrowsing/shaders/globalrenderer_vs.glsl
+++ b/modules/globebrowsing/shaders/globalrenderer_vs.glsl
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/globebrowsing/shaders/interpolate_fs.glsl b/modules/globebrowsing/shaders/interpolate_fs.glsl
index e1d1b89f1b..7d3f8c3a3c 100644
--- a/modules/globebrowsing/shaders/interpolate_fs.glsl
+++ b/modules/globebrowsing/shaders/interpolate_fs.glsl
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/globebrowsing/shaders/interpolate_vs.glsl b/modules/globebrowsing/shaders/interpolate_vs.glsl
index 519f245266..238b27367a 100644
--- a/modules/globebrowsing/shaders/interpolate_vs.glsl
+++ b/modules/globebrowsing/shaders/interpolate_vs.glsl
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/globebrowsing/shaders/localrenderer_vs.glsl b/modules/globebrowsing/shaders/localrenderer_vs.glsl
index 6586fc810a..cc7fa0a849 100644
--- a/modules/globebrowsing/shaders/localrenderer_vs.glsl
+++ b/modules/globebrowsing/shaders/localrenderer_vs.glsl
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/globebrowsing/shaders/renderer_fs.glsl b/modules/globebrowsing/shaders/renderer_fs.glsl
index 165424f192..365e178130 100644
--- a/modules/globebrowsing/shaders/renderer_fs.glsl
+++ b/modules/globebrowsing/shaders/renderer_fs.glsl
@@ -2,7 +2,7 @@
     *                                                                                       *
     * OpenSpace                                                                             *
     *                                                                                       *
-    * Copyright (c) 2014-2023                                                               *
+    * Copyright (c) 2014-2024                                                               *
     *                                                                                       *
     * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
     * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/globebrowsing/shaders/rings_fs.glsl b/modules/globebrowsing/shaders/rings_fs.glsl
index 75e0a8361a..e9c6c3a226 100644
--- a/modules/globebrowsing/shaders/rings_fs.glsl
+++ b/modules/globebrowsing/shaders/rings_fs.glsl
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/globebrowsing/shaders/rings_geom_fs.glsl b/modules/globebrowsing/shaders/rings_geom_fs.glsl
index 3b6804204a..dbfd4736b2 100644
--- a/modules/globebrowsing/shaders/rings_geom_fs.glsl
+++ b/modules/globebrowsing/shaders/rings_geom_fs.glsl
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/globebrowsing/shaders/rings_geom_vs.glsl b/modules/globebrowsing/shaders/rings_geom_vs.glsl
index f9c17918e7..247a6b852e 100644
--- a/modules/globebrowsing/shaders/rings_geom_vs.glsl
+++ b/modules/globebrowsing/shaders/rings_geom_vs.glsl
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/globebrowsing/shaders/rings_vs.glsl b/modules/globebrowsing/shaders/rings_vs.glsl
index fbf5ebb754..ef477caeef 100644
--- a/modules/globebrowsing/shaders/rings_vs.glsl
+++ b/modules/globebrowsing/shaders/rings_vs.glsl
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/globebrowsing/shaders/texturetilemapping.glsl b/modules/globebrowsing/shaders/texturetilemapping.glsl
index cb59d52a45..9ede2085c0 100644
--- a/modules/globebrowsing/shaders/texturetilemapping.glsl
+++ b/modules/globebrowsing/shaders/texturetilemapping.glsl
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/globebrowsing/shaders/tile.glsl b/modules/globebrowsing/shaders/tile.glsl
index 37872327bf..1f4f01dfe4 100644
--- a/modules/globebrowsing/shaders/tile.glsl
+++ b/modules/globebrowsing/shaders/tile.glsl
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/globebrowsing/shaders/tileheight.glsl b/modules/globebrowsing/shaders/tileheight.glsl
index b1973172b3..bb5e5206a4 100644
--- a/modules/globebrowsing/shaders/tileheight.glsl
+++ b/modules/globebrowsing/shaders/tileheight.glsl
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/globebrowsing/shaders/tilevertexskirt.glsl b/modules/globebrowsing/shaders/tilevertexskirt.glsl
index a4f81a3156..0ae7cc6f82 100644
--- a/modules/globebrowsing/shaders/tilevertexskirt.glsl
+++ b/modules/globebrowsing/shaders/tilevertexskirt.glsl
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/globebrowsing/src/asynctiledataprovider.cpp b/modules/globebrowsing/src/asynctiledataprovider.cpp
index 8ef3690872..815e2031ed 100644
--- a/modules/globebrowsing/src/asynctiledataprovider.cpp
+++ b/modules/globebrowsing/src/asynctiledataprovider.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/globebrowsing/src/asynctiledataprovider.h b/modules/globebrowsing/src/asynctiledataprovider.h
index 6f971a52c8..4b5b36c06d 100644
--- a/modules/globebrowsing/src/asynctiledataprovider.h
+++ b/modules/globebrowsing/src/asynctiledataprovider.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/globebrowsing/src/basictypes.h b/modules/globebrowsing/src/basictypes.h
index d153c710be..a4dbec0fb5 100644
--- a/modules/globebrowsing/src/basictypes.h
+++ b/modules/globebrowsing/src/basictypes.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/globebrowsing/src/dashboarditemglobelocation.cpp b/modules/globebrowsing/src/dashboarditemglobelocation.cpp
index e6b49d161e..2abbfd5c9b 100644
--- a/modules/globebrowsing/src/dashboarditemglobelocation.cpp
+++ b/modules/globebrowsing/src/dashboarditemglobelocation.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/globebrowsing/src/dashboarditemglobelocation.h b/modules/globebrowsing/src/dashboarditemglobelocation.h
index c73a7efe11..7ba878ed2d 100644
--- a/modules/globebrowsing/src/dashboarditemglobelocation.h
+++ b/modules/globebrowsing/src/dashboarditemglobelocation.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/globebrowsing/src/ellipsoid.cpp b/modules/globebrowsing/src/ellipsoid.cpp
index 76ecc160dd..152ea404bc 100644
--- a/modules/globebrowsing/src/ellipsoid.cpp
+++ b/modules/globebrowsing/src/ellipsoid.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/globebrowsing/src/ellipsoid.h b/modules/globebrowsing/src/ellipsoid.h
index 5eea9b2afc..57d64adbdc 100644
--- a/modules/globebrowsing/src/ellipsoid.h
+++ b/modules/globebrowsing/src/ellipsoid.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/globebrowsing/src/gdalwrapper.cpp b/modules/globebrowsing/src/gdalwrapper.cpp
index fe2787fd48..06d547b825 100644
--- a/modules/globebrowsing/src/gdalwrapper.cpp
+++ b/modules/globebrowsing/src/gdalwrapper.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/globebrowsing/src/gdalwrapper.h b/modules/globebrowsing/src/gdalwrapper.h
index 7db5edad04..1bc8d2505d 100644
--- a/modules/globebrowsing/src/gdalwrapper.h
+++ b/modules/globebrowsing/src/gdalwrapper.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/globebrowsing/src/geodeticpatch.cpp b/modules/globebrowsing/src/geodeticpatch.cpp
index 1dd0102f3d..dec6b77720 100644
--- a/modules/globebrowsing/src/geodeticpatch.cpp
+++ b/modules/globebrowsing/src/geodeticpatch.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/globebrowsing/src/geodeticpatch.h b/modules/globebrowsing/src/geodeticpatch.h
index 3ce392ba82..999109defb 100644
--- a/modules/globebrowsing/src/geodeticpatch.h
+++ b/modules/globebrowsing/src/geodeticpatch.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/globebrowsing/src/geojson/geojsoncomponent.cpp b/modules/globebrowsing/src/geojson/geojsoncomponent.cpp
index 287fae4d5c..c912b640c8 100644
--- a/modules/globebrowsing/src/geojson/geojsoncomponent.cpp
+++ b/modules/globebrowsing/src/geojson/geojsoncomponent.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/globebrowsing/src/geojson/geojsoncomponent.h b/modules/globebrowsing/src/geojson/geojsoncomponent.h
index 74747ddfe1..c33107855c 100644
--- a/modules/globebrowsing/src/geojson/geojsoncomponent.h
+++ b/modules/globebrowsing/src/geojson/geojsoncomponent.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/globebrowsing/src/geojson/geojsonmanager.cpp b/modules/globebrowsing/src/geojson/geojsonmanager.cpp
index 5272c02bcb..a66710a745 100644
--- a/modules/globebrowsing/src/geojson/geojsonmanager.cpp
+++ b/modules/globebrowsing/src/geojson/geojsonmanager.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/globebrowsing/src/geojson/geojsonmanager.h b/modules/globebrowsing/src/geojson/geojsonmanager.h
index 6eade5a73d..84109b4361 100644
--- a/modules/globebrowsing/src/geojson/geojsonmanager.h
+++ b/modules/globebrowsing/src/geojson/geojsonmanager.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/globebrowsing/src/geojson/geojsonproperties.cpp b/modules/globebrowsing/src/geojson/geojsonproperties.cpp
index 35e0aca85e..1effefdcbe 100644
--- a/modules/globebrowsing/src/geojson/geojsonproperties.cpp
+++ b/modules/globebrowsing/src/geojson/geojsonproperties.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/globebrowsing/src/geojson/geojsonproperties.h b/modules/globebrowsing/src/geojson/geojsonproperties.h
index 90ab578079..d841d6304e 100644
--- a/modules/globebrowsing/src/geojson/geojsonproperties.h
+++ b/modules/globebrowsing/src/geojson/geojsonproperties.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/globebrowsing/src/geojson/globegeometryfeature.cpp b/modules/globebrowsing/src/geojson/globegeometryfeature.cpp
index 170928cf2b..eeeb3d9728 100644
--- a/modules/globebrowsing/src/geojson/globegeometryfeature.cpp
+++ b/modules/globebrowsing/src/geojson/globegeometryfeature.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/globebrowsing/src/geojson/globegeometryfeature.h b/modules/globebrowsing/src/geojson/globegeometryfeature.h
index 909abeca76..02e3f63249 100644
--- a/modules/globebrowsing/src/geojson/globegeometryfeature.h
+++ b/modules/globebrowsing/src/geojson/globegeometryfeature.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/globebrowsing/src/geojson/globegeometryhelper.cpp b/modules/globebrowsing/src/geojson/globegeometryhelper.cpp
index 8f77e954b8..9473d3929d 100644
--- a/modules/globebrowsing/src/geojson/globegeometryhelper.cpp
+++ b/modules/globebrowsing/src/geojson/globegeometryhelper.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/globebrowsing/src/geojson/globegeometryhelper.h b/modules/globebrowsing/src/geojson/globegeometryhelper.h
index d2a6281a54..1712430072 100644
--- a/modules/globebrowsing/src/geojson/globegeometryhelper.h
+++ b/modules/globebrowsing/src/geojson/globegeometryhelper.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/globebrowsing/src/globelabelscomponent.cpp b/modules/globebrowsing/src/globelabelscomponent.cpp
index e8bec27250..0755f28901 100644
--- a/modules/globebrowsing/src/globelabelscomponent.cpp
+++ b/modules/globebrowsing/src/globelabelscomponent.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/globebrowsing/src/globelabelscomponent.h b/modules/globebrowsing/src/globelabelscomponent.h
index 9f0c418369..a131e340a8 100644
--- a/modules/globebrowsing/src/globelabelscomponent.h
+++ b/modules/globebrowsing/src/globelabelscomponent.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/globebrowsing/src/globerotation.cpp b/modules/globebrowsing/src/globerotation.cpp
index 9e8d595f47..b1e0fd68ff 100644
--- a/modules/globebrowsing/src/globerotation.cpp
+++ b/modules/globebrowsing/src/globerotation.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/globebrowsing/src/globerotation.h b/modules/globebrowsing/src/globerotation.h
index 912574c73a..e49e547eb5 100644
--- a/modules/globebrowsing/src/globerotation.h
+++ b/modules/globebrowsing/src/globerotation.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/globebrowsing/src/globetranslation.cpp b/modules/globebrowsing/src/globetranslation.cpp
index 7e09b18bed..1d423b0a37 100644
--- a/modules/globebrowsing/src/globetranslation.cpp
+++ b/modules/globebrowsing/src/globetranslation.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/globebrowsing/src/globetranslation.h b/modules/globebrowsing/src/globetranslation.h
index c372ec671c..2c52208f6e 100644
--- a/modules/globebrowsing/src/globetranslation.h
+++ b/modules/globebrowsing/src/globetranslation.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/globebrowsing/src/gpulayergroup.cpp b/modules/globebrowsing/src/gpulayergroup.cpp
index c94916a6e3..c5f6355990 100644
--- a/modules/globebrowsing/src/gpulayergroup.cpp
+++ b/modules/globebrowsing/src/gpulayergroup.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/globebrowsing/src/gpulayergroup.h b/modules/globebrowsing/src/gpulayergroup.h
index b72d4b0a36..e7f1f08dd0 100644
--- a/modules/globebrowsing/src/gpulayergroup.h
+++ b/modules/globebrowsing/src/gpulayergroup.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/globebrowsing/src/layer.cpp b/modules/globebrowsing/src/layer.cpp
index 9863383105..5512da068f 100644
--- a/modules/globebrowsing/src/layer.cpp
+++ b/modules/globebrowsing/src/layer.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/globebrowsing/src/layer.h b/modules/globebrowsing/src/layer.h
index e6d272dcd9..d17a1793e9 100644
--- a/modules/globebrowsing/src/layer.h
+++ b/modules/globebrowsing/src/layer.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/globebrowsing/src/layeradjustment.cpp b/modules/globebrowsing/src/layeradjustment.cpp
index 448acee1ae..f51fba812a 100644
--- a/modules/globebrowsing/src/layeradjustment.cpp
+++ b/modules/globebrowsing/src/layeradjustment.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/globebrowsing/src/layeradjustment.h b/modules/globebrowsing/src/layeradjustment.h
index d19c95ce75..8ecb9a4df7 100644
--- a/modules/globebrowsing/src/layeradjustment.h
+++ b/modules/globebrowsing/src/layeradjustment.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/globebrowsing/src/layergroup.cpp b/modules/globebrowsing/src/layergroup.cpp
index 1c466f26bd..25778db067 100644
--- a/modules/globebrowsing/src/layergroup.cpp
+++ b/modules/globebrowsing/src/layergroup.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/globebrowsing/src/layergroup.h b/modules/globebrowsing/src/layergroup.h
index 8ca76d6c31..91609612b0 100644
--- a/modules/globebrowsing/src/layergroup.h
+++ b/modules/globebrowsing/src/layergroup.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/globebrowsing/src/layergroupid.cpp b/modules/globebrowsing/src/layergroupid.cpp
index 419fae81a2..52ee68e097 100644
--- a/modules/globebrowsing/src/layergroupid.cpp
+++ b/modules/globebrowsing/src/layergroupid.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/globebrowsing/src/layergroupid.h b/modules/globebrowsing/src/layergroupid.h
index 525c859d8f..b8e6d92c11 100644
--- a/modules/globebrowsing/src/layergroupid.h
+++ b/modules/globebrowsing/src/layergroupid.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/globebrowsing/src/layermanager.cpp b/modules/globebrowsing/src/layermanager.cpp
index fd56646c63..7395554c18 100644
--- a/modules/globebrowsing/src/layermanager.cpp
+++ b/modules/globebrowsing/src/layermanager.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/globebrowsing/src/layermanager.h b/modules/globebrowsing/src/layermanager.h
index 626edde330..e8cc3e9722 100644
--- a/modules/globebrowsing/src/layermanager.h
+++ b/modules/globebrowsing/src/layermanager.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/globebrowsing/src/layerrendersettings.cpp b/modules/globebrowsing/src/layerrendersettings.cpp
index bc5f6e4cce..81e71a26ef 100644
--- a/modules/globebrowsing/src/layerrendersettings.cpp
+++ b/modules/globebrowsing/src/layerrendersettings.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/globebrowsing/src/layerrendersettings.h b/modules/globebrowsing/src/layerrendersettings.h
index 493a65170f..b0d36d97f7 100644
--- a/modules/globebrowsing/src/layerrendersettings.h
+++ b/modules/globebrowsing/src/layerrendersettings.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/globebrowsing/src/lrucache.h b/modules/globebrowsing/src/lrucache.h
index 3212cf75bf..cde58eb408 100644
--- a/modules/globebrowsing/src/lrucache.h
+++ b/modules/globebrowsing/src/lrucache.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/globebrowsing/src/lrucache.inl b/modules/globebrowsing/src/lrucache.inl
index 82a78d90c6..505ca084c1 100644
--- a/modules/globebrowsing/src/lrucache.inl
+++ b/modules/globebrowsing/src/lrucache.inl
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/globebrowsing/src/lruthreadpool.h b/modules/globebrowsing/src/lruthreadpool.h
index a86fc02d2e..347de4d523 100644
--- a/modules/globebrowsing/src/lruthreadpool.h
+++ b/modules/globebrowsing/src/lruthreadpool.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/globebrowsing/src/lruthreadpool.inl b/modules/globebrowsing/src/lruthreadpool.inl
index a0362e5723..6e6ed763c3 100644
--- a/modules/globebrowsing/src/lruthreadpool.inl
+++ b/modules/globebrowsing/src/lruthreadpool.inl
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/globebrowsing/src/memoryawaretilecache.cpp b/modules/globebrowsing/src/memoryawaretilecache.cpp
index e6863132fa..e47709663d 100644
--- a/modules/globebrowsing/src/memoryawaretilecache.cpp
+++ b/modules/globebrowsing/src/memoryawaretilecache.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/globebrowsing/src/memoryawaretilecache.h b/modules/globebrowsing/src/memoryawaretilecache.h
index 4bd2810f9e..88a3a303a6 100644
--- a/modules/globebrowsing/src/memoryawaretilecache.h
+++ b/modules/globebrowsing/src/memoryawaretilecache.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/globebrowsing/src/prioritizingconcurrentjobmanager.h b/modules/globebrowsing/src/prioritizingconcurrentjobmanager.h
index 6f452f888d..83e3c6c5c7 100644
--- a/modules/globebrowsing/src/prioritizingconcurrentjobmanager.h
+++ b/modules/globebrowsing/src/prioritizingconcurrentjobmanager.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/globebrowsing/src/prioritizingconcurrentjobmanager.inl b/modules/globebrowsing/src/prioritizingconcurrentjobmanager.inl
index f788d5f070..4d544cb54f 100644
--- a/modules/globebrowsing/src/prioritizingconcurrentjobmanager.inl
+++ b/modules/globebrowsing/src/prioritizingconcurrentjobmanager.inl
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/globebrowsing/src/rawtile.h b/modules/globebrowsing/src/rawtile.h
index 8014ed0ca0..3bb28da410 100644
--- a/modules/globebrowsing/src/rawtile.h
+++ b/modules/globebrowsing/src/rawtile.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/globebrowsing/src/rawtiledatareader.cpp b/modules/globebrowsing/src/rawtiledatareader.cpp
index 1a7d8dd0cf..d6666ede97 100644
--- a/modules/globebrowsing/src/rawtiledatareader.cpp
+++ b/modules/globebrowsing/src/rawtiledatareader.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/globebrowsing/src/rawtiledatareader.h b/modules/globebrowsing/src/rawtiledatareader.h
index 42739cf63c..7daecca1b3 100644
--- a/modules/globebrowsing/src/rawtiledatareader.h
+++ b/modules/globebrowsing/src/rawtiledatareader.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/globebrowsing/src/renderableglobe.cpp b/modules/globebrowsing/src/renderableglobe.cpp
index 44898268fa..05bc83d9ef 100644
--- a/modules/globebrowsing/src/renderableglobe.cpp
+++ b/modules/globebrowsing/src/renderableglobe.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/globebrowsing/src/renderableglobe.h b/modules/globebrowsing/src/renderableglobe.h
index 99851af26c..f4ce5e70e5 100644
--- a/modules/globebrowsing/src/renderableglobe.h
+++ b/modules/globebrowsing/src/renderableglobe.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/globebrowsing/src/ringscomponent.cpp b/modules/globebrowsing/src/ringscomponent.cpp
index 6e8a3af766..74642535db 100644
--- a/modules/globebrowsing/src/ringscomponent.cpp
+++ b/modules/globebrowsing/src/ringscomponent.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/globebrowsing/src/ringscomponent.h b/modules/globebrowsing/src/ringscomponent.h
index 8b13207348..79589aeb82 100644
--- a/modules/globebrowsing/src/ringscomponent.h
+++ b/modules/globebrowsing/src/ringscomponent.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/globebrowsing/src/shadowcomponent.cpp b/modules/globebrowsing/src/shadowcomponent.cpp
index 73707bfce0..0797b817e5 100644
--- a/modules/globebrowsing/src/shadowcomponent.cpp
+++ b/modules/globebrowsing/src/shadowcomponent.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/globebrowsing/src/shadowcomponent.h b/modules/globebrowsing/src/shadowcomponent.h
index 07f50cf116..9791dd1e0d 100644
--- a/modules/globebrowsing/src/shadowcomponent.h
+++ b/modules/globebrowsing/src/shadowcomponent.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/globebrowsing/src/skirtedgrid.cpp b/modules/globebrowsing/src/skirtedgrid.cpp
index 7cdab3e253..4bc5c1ef46 100644
--- a/modules/globebrowsing/src/skirtedgrid.cpp
+++ b/modules/globebrowsing/src/skirtedgrid.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/globebrowsing/src/skirtedgrid.h b/modules/globebrowsing/src/skirtedgrid.h
index 4175f66b8a..85360432ca 100644
--- a/modules/globebrowsing/src/skirtedgrid.h
+++ b/modules/globebrowsing/src/skirtedgrid.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/globebrowsing/src/tilecacheproperties.h b/modules/globebrowsing/src/tilecacheproperties.h
index 360d382946..41a3c1776d 100644
--- a/modules/globebrowsing/src/tilecacheproperties.h
+++ b/modules/globebrowsing/src/tilecacheproperties.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/globebrowsing/src/tileindex.cpp b/modules/globebrowsing/src/tileindex.cpp
index 2faf42f4df..6bf83b9877 100644
--- a/modules/globebrowsing/src/tileindex.cpp
+++ b/modules/globebrowsing/src/tileindex.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/globebrowsing/src/tileindex.h b/modules/globebrowsing/src/tileindex.h
index 47d1b45058..10f89628b7 100644
--- a/modules/globebrowsing/src/tileindex.h
+++ b/modules/globebrowsing/src/tileindex.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/globebrowsing/src/tileloadjob.cpp b/modules/globebrowsing/src/tileloadjob.cpp
index a5bb11669c..4ad9ffed5e 100644
--- a/modules/globebrowsing/src/tileloadjob.cpp
+++ b/modules/globebrowsing/src/tileloadjob.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/globebrowsing/src/tileloadjob.h b/modules/globebrowsing/src/tileloadjob.h
index ab728afd98..9de89411a7 100644
--- a/modules/globebrowsing/src/tileloadjob.h
+++ b/modules/globebrowsing/src/tileloadjob.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/globebrowsing/src/tileprovider/defaulttileprovider.cpp b/modules/globebrowsing/src/tileprovider/defaulttileprovider.cpp
index 616593897d..637c181f9e 100644
--- a/modules/globebrowsing/src/tileprovider/defaulttileprovider.cpp
+++ b/modules/globebrowsing/src/tileprovider/defaulttileprovider.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/globebrowsing/src/tileprovider/defaulttileprovider.h b/modules/globebrowsing/src/tileprovider/defaulttileprovider.h
index 1cb777cb0e..9f095353b2 100644
--- a/modules/globebrowsing/src/tileprovider/defaulttileprovider.h
+++ b/modules/globebrowsing/src/tileprovider/defaulttileprovider.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/globebrowsing/src/tileprovider/imagesequencetileprovider.cpp b/modules/globebrowsing/src/tileprovider/imagesequencetileprovider.cpp
index cfaf762ac2..fade602401 100644
--- a/modules/globebrowsing/src/tileprovider/imagesequencetileprovider.cpp
+++ b/modules/globebrowsing/src/tileprovider/imagesequencetileprovider.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/globebrowsing/src/tileprovider/imagesequencetileprovider.h b/modules/globebrowsing/src/tileprovider/imagesequencetileprovider.h
index 8f4331b314..d6aa907122 100644
--- a/modules/globebrowsing/src/tileprovider/imagesequencetileprovider.h
+++ b/modules/globebrowsing/src/tileprovider/imagesequencetileprovider.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/globebrowsing/src/tileprovider/singleimagetileprovider.cpp b/modules/globebrowsing/src/tileprovider/singleimagetileprovider.cpp
index ec98651a06..38f06a658a 100644
--- a/modules/globebrowsing/src/tileprovider/singleimagetileprovider.cpp
+++ b/modules/globebrowsing/src/tileprovider/singleimagetileprovider.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/globebrowsing/src/tileprovider/singleimagetileprovider.h b/modules/globebrowsing/src/tileprovider/singleimagetileprovider.h
index f58b38824a..a6546040cd 100644
--- a/modules/globebrowsing/src/tileprovider/singleimagetileprovider.h
+++ b/modules/globebrowsing/src/tileprovider/singleimagetileprovider.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/globebrowsing/src/tileprovider/sizereferencetileprovider.cpp b/modules/globebrowsing/src/tileprovider/sizereferencetileprovider.cpp
index 350d73258a..13361a8025 100644
--- a/modules/globebrowsing/src/tileprovider/sizereferencetileprovider.cpp
+++ b/modules/globebrowsing/src/tileprovider/sizereferencetileprovider.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/globebrowsing/src/tileprovider/sizereferencetileprovider.h b/modules/globebrowsing/src/tileprovider/sizereferencetileprovider.h
index 22c8c4abd2..a88c2d40d7 100644
--- a/modules/globebrowsing/src/tileprovider/sizereferencetileprovider.h
+++ b/modules/globebrowsing/src/tileprovider/sizereferencetileprovider.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/globebrowsing/src/tileprovider/spoutimageprovider.cpp b/modules/globebrowsing/src/tileprovider/spoutimageprovider.cpp
index 2e3b44cdad..553f82bb0c 100644
--- a/modules/globebrowsing/src/tileprovider/spoutimageprovider.cpp
+++ b/modules/globebrowsing/src/tileprovider/spoutimageprovider.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/globebrowsing/src/tileprovider/spoutimageprovider.h b/modules/globebrowsing/src/tileprovider/spoutimageprovider.h
index 8f0cadc345..bcbaeb9cdb 100644
--- a/modules/globebrowsing/src/tileprovider/spoutimageprovider.h
+++ b/modules/globebrowsing/src/tileprovider/spoutimageprovider.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/globebrowsing/src/tileprovider/temporaltileprovider.cpp b/modules/globebrowsing/src/tileprovider/temporaltileprovider.cpp
index 8124b89df0..a92c98a846 100644
--- a/modules/globebrowsing/src/tileprovider/temporaltileprovider.cpp
+++ b/modules/globebrowsing/src/tileprovider/temporaltileprovider.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/globebrowsing/src/tileprovider/temporaltileprovider.h b/modules/globebrowsing/src/tileprovider/temporaltileprovider.h
index 7abb920d5d..507c98e2ed 100644
--- a/modules/globebrowsing/src/tileprovider/temporaltileprovider.h
+++ b/modules/globebrowsing/src/tileprovider/temporaltileprovider.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/globebrowsing/src/tileprovider/texttileprovider.cpp b/modules/globebrowsing/src/tileprovider/texttileprovider.cpp
index ad7690faf0..f775ea1c73 100644
--- a/modules/globebrowsing/src/tileprovider/texttileprovider.cpp
+++ b/modules/globebrowsing/src/tileprovider/texttileprovider.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/globebrowsing/src/tileprovider/texttileprovider.h b/modules/globebrowsing/src/tileprovider/texttileprovider.h
index 9f7535c6cb..a9bf92ec43 100644
--- a/modules/globebrowsing/src/tileprovider/texttileprovider.h
+++ b/modules/globebrowsing/src/tileprovider/texttileprovider.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/globebrowsing/src/tileprovider/tileindextileprovider.cpp b/modules/globebrowsing/src/tileprovider/tileindextileprovider.cpp
index ad4de6f268..51028ccdb8 100644
--- a/modules/globebrowsing/src/tileprovider/tileindextileprovider.cpp
+++ b/modules/globebrowsing/src/tileprovider/tileindextileprovider.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/globebrowsing/src/tileprovider/tileindextileprovider.h b/modules/globebrowsing/src/tileprovider/tileindextileprovider.h
index 181a3cbb10..27474648f4 100644
--- a/modules/globebrowsing/src/tileprovider/tileindextileprovider.h
+++ b/modules/globebrowsing/src/tileprovider/tileindextileprovider.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/globebrowsing/src/tileprovider/tileprovider.cpp b/modules/globebrowsing/src/tileprovider/tileprovider.cpp
index f1ea094896..e382233ecc 100644
--- a/modules/globebrowsing/src/tileprovider/tileprovider.cpp
+++ b/modules/globebrowsing/src/tileprovider/tileprovider.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/globebrowsing/src/tileprovider/tileprovider.h b/modules/globebrowsing/src/tileprovider/tileprovider.h
index 33a1c58c42..7ea483a7b1 100644
--- a/modules/globebrowsing/src/tileprovider/tileprovider.h
+++ b/modules/globebrowsing/src/tileprovider/tileprovider.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/globebrowsing/src/tileprovider/tileproviderbyindex.cpp b/modules/globebrowsing/src/tileprovider/tileproviderbyindex.cpp
index 4b603e88df..a3c60c22b6 100644
--- a/modules/globebrowsing/src/tileprovider/tileproviderbyindex.cpp
+++ b/modules/globebrowsing/src/tileprovider/tileproviderbyindex.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/globebrowsing/src/tileprovider/tileproviderbyindex.h b/modules/globebrowsing/src/tileprovider/tileproviderbyindex.h
index bf5f42a380..53a1cb8989 100644
--- a/modules/globebrowsing/src/tileprovider/tileproviderbyindex.h
+++ b/modules/globebrowsing/src/tileprovider/tileproviderbyindex.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/globebrowsing/src/tileprovider/tileproviderbylevel.cpp b/modules/globebrowsing/src/tileprovider/tileproviderbylevel.cpp
index 7683db051d..6e44128fbe 100644
--- a/modules/globebrowsing/src/tileprovider/tileproviderbylevel.cpp
+++ b/modules/globebrowsing/src/tileprovider/tileproviderbylevel.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/globebrowsing/src/tileprovider/tileproviderbylevel.h b/modules/globebrowsing/src/tileprovider/tileproviderbylevel.h
index d0ae495ead..824ab0ce44 100644
--- a/modules/globebrowsing/src/tileprovider/tileproviderbylevel.h
+++ b/modules/globebrowsing/src/tileprovider/tileproviderbylevel.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/globebrowsing/src/tiletextureinitdata.cpp b/modules/globebrowsing/src/tiletextureinitdata.cpp
index 052a0b1168..7f9b918827 100644
--- a/modules/globebrowsing/src/tiletextureinitdata.cpp
+++ b/modules/globebrowsing/src/tiletextureinitdata.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/globebrowsing/src/tiletextureinitdata.h b/modules/globebrowsing/src/tiletextureinitdata.h
index 201a004e82..ffc94a4a35 100644
--- a/modules/globebrowsing/src/tiletextureinitdata.h
+++ b/modules/globebrowsing/src/tiletextureinitdata.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/globebrowsing/src/timequantizer.cpp b/modules/globebrowsing/src/timequantizer.cpp
index b51ddcf2cc..171b36806e 100644
--- a/modules/globebrowsing/src/timequantizer.cpp
+++ b/modules/globebrowsing/src/timequantizer.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/globebrowsing/src/timequantizer.h b/modules/globebrowsing/src/timequantizer.h
index b56e1dfc10..d8d7143b92 100644
--- a/modules/globebrowsing/src/timequantizer.h
+++ b/modules/globebrowsing/src/timequantizer.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/imgui/imguimodule.cpp b/modules/imgui/imguimodule.cpp
index 773cbe2dd7..cfcb97199d 100644
--- a/modules/imgui/imguimodule.cpp
+++ b/modules/imgui/imguimodule.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/imgui/imguimodule.h b/modules/imgui/imguimodule.h
index 4b9047fa6b..1aa1fb4fa4 100644
--- a/modules/imgui/imguimodule.h
+++ b/modules/imgui/imguimodule.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/imgui/include/guiactioncomponent.h b/modules/imgui/include/guiactioncomponent.h
index 4fb747d24f..d1c6f2cc3d 100644
--- a/modules/imgui/include/guiactioncomponent.h
+++ b/modules/imgui/include/guiactioncomponent.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/imgui/include/guicomponent.h b/modules/imgui/include/guicomponent.h
index 75c42f6224..a08537444d 100644
--- a/modules/imgui/include/guicomponent.h
+++ b/modules/imgui/include/guicomponent.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/imgui/include/guifilepathcomponent.h b/modules/imgui/include/guifilepathcomponent.h
index a53d17cc81..cebb524a7a 100644
--- a/modules/imgui/include/guifilepathcomponent.h
+++ b/modules/imgui/include/guifilepathcomponent.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/imgui/include/guigibscomponent.h b/modules/imgui/include/guigibscomponent.h
index af2a161d7b..b294c8e495 100644
--- a/modules/imgui/include/guigibscomponent.h
+++ b/modules/imgui/include/guigibscomponent.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/imgui/include/guiglobebrowsingcomponent.h b/modules/imgui/include/guiglobebrowsingcomponent.h
index 0accd727f1..65ba20bdd2 100644
--- a/modules/imgui/include/guiglobebrowsingcomponent.h
+++ b/modules/imgui/include/guiglobebrowsingcomponent.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/imgui/include/guihelpcomponent.h b/modules/imgui/include/guihelpcomponent.h
index 0e184b8e9e..bdc9449cb2 100644
--- a/modules/imgui/include/guihelpcomponent.h
+++ b/modules/imgui/include/guihelpcomponent.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/imgui/include/guijoystickcomponent.h b/modules/imgui/include/guijoystickcomponent.h
index 764a410d1e..ac95fd013d 100644
--- a/modules/imgui/include/guijoystickcomponent.h
+++ b/modules/imgui/include/guijoystickcomponent.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/imgui/include/guimemorycomponent.h b/modules/imgui/include/guimemorycomponent.h
index 33bb076acd..d55eb20d3c 100644
--- a/modules/imgui/include/guimemorycomponent.h
+++ b/modules/imgui/include/guimemorycomponent.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/imgui/include/guimissioncomponent.h b/modules/imgui/include/guimissioncomponent.h
index 3b2bbb58a7..44c667a890 100644
--- a/modules/imgui/include/guimissioncomponent.h
+++ b/modules/imgui/include/guimissioncomponent.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/imgui/include/guiparallelcomponent.h b/modules/imgui/include/guiparallelcomponent.h
index 6780c6a072..04169c1b8b 100644
--- a/modules/imgui/include/guiparallelcomponent.h
+++ b/modules/imgui/include/guiparallelcomponent.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/imgui/include/guipropertycomponent.h b/modules/imgui/include/guipropertycomponent.h
index fb5a15b219..1b380d3f11 100644
--- a/modules/imgui/include/guipropertycomponent.h
+++ b/modules/imgui/include/guipropertycomponent.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/imgui/include/guiscenecomponent.h b/modules/imgui/include/guiscenecomponent.h
index 706aba14aa..10268a8024 100644
--- a/modules/imgui/include/guiscenecomponent.h
+++ b/modules/imgui/include/guiscenecomponent.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/imgui/include/guispacetimecomponent.h b/modules/imgui/include/guispacetimecomponent.h
index 917c2ed465..af7eb2a278 100644
--- a/modules/imgui/include/guispacetimecomponent.h
+++ b/modules/imgui/include/guispacetimecomponent.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/imgui/include/imgui_include.h b/modules/imgui/include/imgui_include.h
index 5bf7eb6b25..700a5294ff 100644
--- a/modules/imgui/include/imgui_include.h
+++ b/modules/imgui/include/imgui_include.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/imgui/include/renderproperties.h b/modules/imgui/include/renderproperties.h
index 6f2a75736c..082aebe7e0 100644
--- a/modules/imgui/include/renderproperties.h
+++ b/modules/imgui/include/renderproperties.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/imgui/shaders/gui_fs.glsl b/modules/imgui/shaders/gui_fs.glsl
index bb09c30044..72ef4a2c8f 100644
--- a/modules/imgui/shaders/gui_fs.glsl
+++ b/modules/imgui/shaders/gui_fs.glsl
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/imgui/shaders/gui_vs.glsl b/modules/imgui/shaders/gui_vs.glsl
index 462606ef0f..440a7946fa 100644
--- a/modules/imgui/shaders/gui_vs.glsl
+++ b/modules/imgui/shaders/gui_vs.glsl
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/imgui/src/guiactioncomponent.cpp b/modules/imgui/src/guiactioncomponent.cpp
index 1c7ea37b7c..7d66115e65 100644
--- a/modules/imgui/src/guiactioncomponent.cpp
+++ b/modules/imgui/src/guiactioncomponent.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/imgui/src/guicomponent.cpp b/modules/imgui/src/guicomponent.cpp
index e4661c73d0..8f915d23f0 100644
--- a/modules/imgui/src/guicomponent.cpp
+++ b/modules/imgui/src/guicomponent.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/imgui/src/guifilepathcomponent.cpp b/modules/imgui/src/guifilepathcomponent.cpp
index 06fc32aaee..cdf7761afe 100644
--- a/modules/imgui/src/guifilepathcomponent.cpp
+++ b/modules/imgui/src/guifilepathcomponent.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/imgui/src/guigibscomponent.cpp b/modules/imgui/src/guigibscomponent.cpp
index a9c2c71a1c..0ebde94979 100644
--- a/modules/imgui/src/guigibscomponent.cpp
+++ b/modules/imgui/src/guigibscomponent.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/imgui/src/guiglobebrowsingcomponent.cpp b/modules/imgui/src/guiglobebrowsingcomponent.cpp
index af6c52d820..b8e712ef8f 100644
--- a/modules/imgui/src/guiglobebrowsingcomponent.cpp
+++ b/modules/imgui/src/guiglobebrowsingcomponent.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/imgui/src/guihelpcomponent.cpp b/modules/imgui/src/guihelpcomponent.cpp
index 4d330c3515..3d7d380d41 100644
--- a/modules/imgui/src/guihelpcomponent.cpp
+++ b/modules/imgui/src/guihelpcomponent.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/imgui/src/guijoystickcomponent.cpp b/modules/imgui/src/guijoystickcomponent.cpp
index 7cb27ccbe1..8c2583b444 100644
--- a/modules/imgui/src/guijoystickcomponent.cpp
+++ b/modules/imgui/src/guijoystickcomponent.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/imgui/src/guimemorycomponent.cpp b/modules/imgui/src/guimemorycomponent.cpp
index 3e6d71aa0c..4a29eeae78 100644
--- a/modules/imgui/src/guimemorycomponent.cpp
+++ b/modules/imgui/src/guimemorycomponent.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/imgui/src/guimissioncomponent.cpp b/modules/imgui/src/guimissioncomponent.cpp
index 08585392e4..5f82802a42 100644
--- a/modules/imgui/src/guimissioncomponent.cpp
+++ b/modules/imgui/src/guimissioncomponent.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/imgui/src/guiparallelcomponent.cpp b/modules/imgui/src/guiparallelcomponent.cpp
index 9d489a9b85..ce06096833 100644
--- a/modules/imgui/src/guiparallelcomponent.cpp
+++ b/modules/imgui/src/guiparallelcomponent.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/imgui/src/guipropertycomponent.cpp b/modules/imgui/src/guipropertycomponent.cpp
index 834e58aedc..016271781f 100644
--- a/modules/imgui/src/guipropertycomponent.cpp
+++ b/modules/imgui/src/guipropertycomponent.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/imgui/src/guiscenecomponent.cpp b/modules/imgui/src/guiscenecomponent.cpp
index 7cd8ac9dbc..6f5e089d89 100644
--- a/modules/imgui/src/guiscenecomponent.cpp
+++ b/modules/imgui/src/guiscenecomponent.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/imgui/src/guispacetimecomponent.cpp b/modules/imgui/src/guispacetimecomponent.cpp
index 336000d2f5..37fd88a89d 100644
--- a/modules/imgui/src/guispacetimecomponent.cpp
+++ b/modules/imgui/src/guispacetimecomponent.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/imgui/src/renderproperties.cpp b/modules/imgui/src/renderproperties.cpp
index 81b8aa6e8a..6c22585302 100644
--- a/modules/imgui/src/renderproperties.cpp
+++ b/modules/imgui/src/renderproperties.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/iswa/iswamodule.cpp b/modules/iswa/iswamodule.cpp
index 599d396b59..9ec3eb25ae 100644
--- a/modules/iswa/iswamodule.cpp
+++ b/modules/iswa/iswamodule.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/iswa/iswamodule.h b/modules/iswa/iswamodule.h
index e3cc1db507..85991ab146 100644
--- a/modules/iswa/iswamodule.h
+++ b/modules/iswa/iswamodule.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/iswa/rendering/datacygnet.cpp b/modules/iswa/rendering/datacygnet.cpp
index 4c70799064..5a63ce85a2 100644
--- a/modules/iswa/rendering/datacygnet.cpp
+++ b/modules/iswa/rendering/datacygnet.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/iswa/rendering/datacygnet.h b/modules/iswa/rendering/datacygnet.h
index 6398262ccc..361dfa8c0d 100644
--- a/modules/iswa/rendering/datacygnet.h
+++ b/modules/iswa/rendering/datacygnet.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/iswa/rendering/dataplane.cpp b/modules/iswa/rendering/dataplane.cpp
index 08b6e4143f..89ac02d673 100644
--- a/modules/iswa/rendering/dataplane.cpp
+++ b/modules/iswa/rendering/dataplane.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/iswa/rendering/dataplane.h b/modules/iswa/rendering/dataplane.h
index 6d1f8dbf65..ac77221753 100644
--- a/modules/iswa/rendering/dataplane.h
+++ b/modules/iswa/rendering/dataplane.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/iswa/rendering/datasphere.cpp b/modules/iswa/rendering/datasphere.cpp
index ca5b26b02c..28d8f0a43f 100644
--- a/modules/iswa/rendering/datasphere.cpp
+++ b/modules/iswa/rendering/datasphere.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/iswa/rendering/datasphere.h b/modules/iswa/rendering/datasphere.h
index 91244a6120..c6d8e2749a 100644
--- a/modules/iswa/rendering/datasphere.h
+++ b/modules/iswa/rendering/datasphere.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/iswa/rendering/iswabasegroup.cpp b/modules/iswa/rendering/iswabasegroup.cpp
index a498bd7dc8..252ea2d320 100644
--- a/modules/iswa/rendering/iswabasegroup.cpp
+++ b/modules/iswa/rendering/iswabasegroup.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/iswa/rendering/iswabasegroup.h b/modules/iswa/rendering/iswabasegroup.h
index d9ee2136d1..550196d819 100644
--- a/modules/iswa/rendering/iswabasegroup.h
+++ b/modules/iswa/rendering/iswabasegroup.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/iswa/rendering/iswacygnet.cpp b/modules/iswa/rendering/iswacygnet.cpp
index 48b935cf20..80623a50e7 100644
--- a/modules/iswa/rendering/iswacygnet.cpp
+++ b/modules/iswa/rendering/iswacygnet.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/iswa/rendering/iswacygnet.h b/modules/iswa/rendering/iswacygnet.h
index 2a765b9b90..40a7df5762 100644
--- a/modules/iswa/rendering/iswacygnet.h
+++ b/modules/iswa/rendering/iswacygnet.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/iswa/rendering/iswadatagroup.cpp b/modules/iswa/rendering/iswadatagroup.cpp
index 1c44609a11..74965a606e 100644
--- a/modules/iswa/rendering/iswadatagroup.cpp
+++ b/modules/iswa/rendering/iswadatagroup.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/iswa/rendering/iswadatagroup.h b/modules/iswa/rendering/iswadatagroup.h
index 0ffccac096..8d3e3195bc 100644
--- a/modules/iswa/rendering/iswadatagroup.h
+++ b/modules/iswa/rendering/iswadatagroup.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/iswa/rendering/iswakameleongroup.cpp b/modules/iswa/rendering/iswakameleongroup.cpp
index 3840f5f74b..dab593a60d 100644
--- a/modules/iswa/rendering/iswakameleongroup.cpp
+++ b/modules/iswa/rendering/iswakameleongroup.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/iswa/rendering/iswakameleongroup.h b/modules/iswa/rendering/iswakameleongroup.h
index 635e3e8b2e..f0532560cb 100644
--- a/modules/iswa/rendering/iswakameleongroup.h
+++ b/modules/iswa/rendering/iswakameleongroup.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/iswa/rendering/kameleonplane.cpp b/modules/iswa/rendering/kameleonplane.cpp
index 5ca5a57c78..2bdbf6ef6f 100644
--- a/modules/iswa/rendering/kameleonplane.cpp
+++ b/modules/iswa/rendering/kameleonplane.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/iswa/rendering/kameleonplane.h b/modules/iswa/rendering/kameleonplane.h
index 945428b776..52e6041608 100644
--- a/modules/iswa/rendering/kameleonplane.h
+++ b/modules/iswa/rendering/kameleonplane.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/iswa/rendering/screenspacecygnet.cpp b/modules/iswa/rendering/screenspacecygnet.cpp
index ae31fc066e..4b91fd645e 100644
--- a/modules/iswa/rendering/screenspacecygnet.cpp
+++ b/modules/iswa/rendering/screenspacecygnet.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/iswa/rendering/screenspacecygnet.h b/modules/iswa/rendering/screenspacecygnet.h
index faae226c5f..f918115a27 100644
--- a/modules/iswa/rendering/screenspacecygnet.h
+++ b/modules/iswa/rendering/screenspacecygnet.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/iswa/rendering/texturecygnet.cpp b/modules/iswa/rendering/texturecygnet.cpp
index 7262670140..f5a6dc28ec 100644
--- a/modules/iswa/rendering/texturecygnet.cpp
+++ b/modules/iswa/rendering/texturecygnet.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/iswa/rendering/texturecygnet.h b/modules/iswa/rendering/texturecygnet.h
index 95e38d06e6..26505a5a82 100644
--- a/modules/iswa/rendering/texturecygnet.h
+++ b/modules/iswa/rendering/texturecygnet.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/iswa/rendering/textureplane.cpp b/modules/iswa/rendering/textureplane.cpp
index 4b49e7803c..a9110b121c 100644
--- a/modules/iswa/rendering/textureplane.cpp
+++ b/modules/iswa/rendering/textureplane.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/iswa/rendering/textureplane.h b/modules/iswa/rendering/textureplane.h
index 66e5431a4b..2d4c185c61 100644
--- a/modules/iswa/rendering/textureplane.h
+++ b/modules/iswa/rendering/textureplane.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/iswa/shaders/dataplane_fs.glsl b/modules/iswa/shaders/dataplane_fs.glsl
index 8076a78f03..828a299d2a 100644
--- a/modules/iswa/shaders/dataplane_fs.glsl
+++ b/modules/iswa/shaders/dataplane_fs.glsl
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/iswa/shaders/dataplane_vs.glsl b/modules/iswa/shaders/dataplane_vs.glsl
index 09ca68d6b4..8be9f42ff0 100644
--- a/modules/iswa/shaders/dataplane_vs.glsl
+++ b/modules/iswa/shaders/dataplane_vs.glsl
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/iswa/shaders/datasphere_fs.glsl b/modules/iswa/shaders/datasphere_fs.glsl
index 54d336454d..9d8f7ef24d 100644
--- a/modules/iswa/shaders/datasphere_fs.glsl
+++ b/modules/iswa/shaders/datasphere_fs.glsl
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/iswa/shaders/datasphere_vs.glsl b/modules/iswa/shaders/datasphere_vs.glsl
index 2cfbcc93e4..427322e138 100644
--- a/modules/iswa/shaders/datasphere_vs.glsl
+++ b/modules/iswa/shaders/datasphere_vs.glsl
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/iswa/shaders/textureplane_fs.glsl b/modules/iswa/shaders/textureplane_fs.glsl
index 7d2adfef33..64a2bcc32a 100644
--- a/modules/iswa/shaders/textureplane_fs.glsl
+++ b/modules/iswa/shaders/textureplane_fs.glsl
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/iswa/shaders/textureplane_vs.glsl b/modules/iswa/shaders/textureplane_vs.glsl
index e31de12e26..1df1579665 100644
--- a/modules/iswa/shaders/textureplane_vs.glsl
+++ b/modules/iswa/shaders/textureplane_vs.glsl
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/iswa/util/dataprocessor.cpp b/modules/iswa/util/dataprocessor.cpp
index 7e1c755af0..4a6aa92252 100644
--- a/modules/iswa/util/dataprocessor.cpp
+++ b/modules/iswa/util/dataprocessor.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/iswa/util/dataprocessor.h b/modules/iswa/util/dataprocessor.h
index dc27d8697c..8c77d31c8e 100644
--- a/modules/iswa/util/dataprocessor.h
+++ b/modules/iswa/util/dataprocessor.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/iswa/util/dataprocessorjson.cpp b/modules/iswa/util/dataprocessorjson.cpp
index 0b2b170ed3..5ca45fecb3 100644
--- a/modules/iswa/util/dataprocessorjson.cpp
+++ b/modules/iswa/util/dataprocessorjson.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/iswa/util/dataprocessorjson.h b/modules/iswa/util/dataprocessorjson.h
index bbdf1fe199..ffc00c52aa 100644
--- a/modules/iswa/util/dataprocessorjson.h
+++ b/modules/iswa/util/dataprocessorjson.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/iswa/util/dataprocessorkameleon.cpp b/modules/iswa/util/dataprocessorkameleon.cpp
index 758379f4df..1b17d5f354 100644
--- a/modules/iswa/util/dataprocessorkameleon.cpp
+++ b/modules/iswa/util/dataprocessorkameleon.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/iswa/util/dataprocessorkameleon.h b/modules/iswa/util/dataprocessorkameleon.h
index 6b7c524396..69697922ac 100644
--- a/modules/iswa/util/dataprocessorkameleon.h
+++ b/modules/iswa/util/dataprocessorkameleon.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/iswa/util/dataprocessortext.cpp b/modules/iswa/util/dataprocessortext.cpp
index 0d84b5ae3b..99c2ed623c 100644
--- a/modules/iswa/util/dataprocessortext.cpp
+++ b/modules/iswa/util/dataprocessortext.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/iswa/util/dataprocessortext.h b/modules/iswa/util/dataprocessortext.h
index 3e2e3611ae..89186a77fb 100644
--- a/modules/iswa/util/dataprocessortext.h
+++ b/modules/iswa/util/dataprocessortext.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/iswa/util/iswamanager.cpp b/modules/iswa/util/iswamanager.cpp
index 09489ed78d..6b3d86d121 100644
--- a/modules/iswa/util/iswamanager.cpp
+++ b/modules/iswa/util/iswamanager.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/iswa/util/iswamanager.h b/modules/iswa/util/iswamanager.h
index 30367378c4..a2f4b44115 100644
--- a/modules/iswa/util/iswamanager.h
+++ b/modules/iswa/util/iswamanager.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/iswa/util/iswamanager_lua.inl b/modules/iswa/util/iswamanager_lua.inl
index ab7d16a935..ac98898112 100644
--- a/modules/iswa/util/iswamanager_lua.inl
+++ b/modules/iswa/util/iswamanager_lua.inl
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/kameleon/include/kameleonhelper.h b/modules/kameleon/include/kameleonhelper.h
index 8d6839b533..2cf735fb3b 100644
--- a/modules/kameleon/include/kameleonhelper.h
+++ b/modules/kameleon/include/kameleonhelper.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/kameleon/include/kameleonwrapper.h b/modules/kameleon/include/kameleonwrapper.h
index 15bf2a232b..63e583b893 100644
--- a/modules/kameleon/include/kameleonwrapper.h
+++ b/modules/kameleon/include/kameleonwrapper.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/kameleon/kameleonmodule.cpp b/modules/kameleon/kameleonmodule.cpp
index 105554f209..5057a66d5d 100644
--- a/modules/kameleon/kameleonmodule.cpp
+++ b/modules/kameleon/kameleonmodule.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/kameleon/kameleonmodule.h b/modules/kameleon/kameleonmodule.h
index c03091bdb7..4f6593b6ec 100644
--- a/modules/kameleon/kameleonmodule.h
+++ b/modules/kameleon/kameleonmodule.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/kameleon/src/kameleonhelper.cpp b/modules/kameleon/src/kameleonhelper.cpp
index 2975db56a9..c5726aecb4 100644
--- a/modules/kameleon/src/kameleonhelper.cpp
+++ b/modules/kameleon/src/kameleonhelper.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/kameleon/src/kameleonwrapper.cpp b/modules/kameleon/src/kameleonwrapper.cpp
index 555cc17a98..56862bb19c 100644
--- a/modules/kameleon/src/kameleonwrapper.cpp
+++ b/modules/kameleon/src/kameleonwrapper.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/kameleonvolume/kameleonvolumemodule.cpp b/modules/kameleonvolume/kameleonvolumemodule.cpp
index 8ddd686d88..322a892adf 100644
--- a/modules/kameleonvolume/kameleonvolumemodule.cpp
+++ b/modules/kameleonvolume/kameleonvolumemodule.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/kameleonvolume/kameleonvolumemodule.h b/modules/kameleonvolume/kameleonvolumemodule.h
index 686024f859..11a95b4d84 100644
--- a/modules/kameleonvolume/kameleonvolumemodule.h
+++ b/modules/kameleonvolume/kameleonvolumemodule.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/kameleonvolume/kameleonvolumereader.cpp b/modules/kameleonvolume/kameleonvolumereader.cpp
index 5c40d6ea81..4e49fd372a 100644
--- a/modules/kameleonvolume/kameleonvolumereader.cpp
+++ b/modules/kameleonvolume/kameleonvolumereader.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/kameleonvolume/kameleonvolumereader.h b/modules/kameleonvolume/kameleonvolumereader.h
index 7e027cec3f..665224d8c6 100644
--- a/modules/kameleonvolume/kameleonvolumereader.h
+++ b/modules/kameleonvolume/kameleonvolumereader.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/kameleonvolume/rendering/renderablekameleonvolume.cpp b/modules/kameleonvolume/rendering/renderablekameleonvolume.cpp
index 7a77315239..925a88dd74 100644
--- a/modules/kameleonvolume/rendering/renderablekameleonvolume.cpp
+++ b/modules/kameleonvolume/rendering/renderablekameleonvolume.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/kameleonvolume/rendering/renderablekameleonvolume.h b/modules/kameleonvolume/rendering/renderablekameleonvolume.h
index 80e0cce76f..85fe2c2d92 100644
--- a/modules/kameleonvolume/rendering/renderablekameleonvolume.h
+++ b/modules/kameleonvolume/rendering/renderablekameleonvolume.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/kameleonvolume/tasks/kameleondocumentationtask.cpp b/modules/kameleonvolume/tasks/kameleondocumentationtask.cpp
index 9f3a5529fb..4fe1d2f4a0 100644
--- a/modules/kameleonvolume/tasks/kameleondocumentationtask.cpp
+++ b/modules/kameleonvolume/tasks/kameleondocumentationtask.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/kameleonvolume/tasks/kameleondocumentationtask.h b/modules/kameleonvolume/tasks/kameleondocumentationtask.h
index b5012a56a3..59b8a448c4 100644
--- a/modules/kameleonvolume/tasks/kameleondocumentationtask.h
+++ b/modules/kameleonvolume/tasks/kameleondocumentationtask.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/kameleonvolume/tasks/kameleonmetadatatojsontask.cpp b/modules/kameleonvolume/tasks/kameleonmetadatatojsontask.cpp
index 3075b4aea9..38dae18c03 100644
--- a/modules/kameleonvolume/tasks/kameleonmetadatatojsontask.cpp
+++ b/modules/kameleonvolume/tasks/kameleonmetadatatojsontask.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/kameleonvolume/tasks/kameleonmetadatatojsontask.h b/modules/kameleonvolume/tasks/kameleonmetadatatojsontask.h
index 6f9ca0d509..76dfc6c880 100644
--- a/modules/kameleonvolume/tasks/kameleonmetadatatojsontask.h
+++ b/modules/kameleonvolume/tasks/kameleonmetadatatojsontask.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/kameleonvolume/tasks/kameleonvolumetorawtask.cpp b/modules/kameleonvolume/tasks/kameleonvolumetorawtask.cpp
index fda337984b..3ed9c394cc 100644
--- a/modules/kameleonvolume/tasks/kameleonvolumetorawtask.cpp
+++ b/modules/kameleonvolume/tasks/kameleonvolumetorawtask.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/kameleonvolume/tasks/kameleonvolumetorawtask.h b/modules/kameleonvolume/tasks/kameleonvolumetorawtask.h
index 1a3a82dc58..1ce8fa3a74 100644
--- a/modules/kameleonvolume/tasks/kameleonvolumetorawtask.h
+++ b/modules/kameleonvolume/tasks/kameleonvolumetorawtask.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/multiresvolume/multiresvolumemodule.cpp b/modules/multiresvolume/multiresvolumemodule.cpp
index 5f7a33f1f9..15063a9667 100644
--- a/modules/multiresvolume/multiresvolumemodule.cpp
+++ b/modules/multiresvolume/multiresvolumemodule.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/multiresvolume/multiresvolumemodule.h b/modules/multiresvolume/multiresvolumemodule.h
index abfb0a6867..acc6efcd4a 100644
--- a/modules/multiresvolume/multiresvolumemodule.h
+++ b/modules/multiresvolume/multiresvolumemodule.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/multiresvolume/rendering/atlasmanager.cpp b/modules/multiresvolume/rendering/atlasmanager.cpp
index ee3257b5c6..33d1705430 100644
--- a/modules/multiresvolume/rendering/atlasmanager.cpp
+++ b/modules/multiresvolume/rendering/atlasmanager.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/multiresvolume/rendering/atlasmanager.h b/modules/multiresvolume/rendering/atlasmanager.h
index 18ced4894a..e1f953aa26 100644
--- a/modules/multiresvolume/rendering/atlasmanager.h
+++ b/modules/multiresvolume/rendering/atlasmanager.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/multiresvolume/rendering/brickcover.cpp b/modules/multiresvolume/rendering/brickcover.cpp
index 871b93f7cf..4bb2619fc3 100644
--- a/modules/multiresvolume/rendering/brickcover.cpp
+++ b/modules/multiresvolume/rendering/brickcover.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/multiresvolume/rendering/brickcover.h b/modules/multiresvolume/rendering/brickcover.h
index a0b7a3d418..6d09f55a9b 100644
--- a/modules/multiresvolume/rendering/brickcover.h
+++ b/modules/multiresvolume/rendering/brickcover.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/multiresvolume/rendering/brickmanager.cpp b/modules/multiresvolume/rendering/brickmanager.cpp
index 4178fc1a82..ca2d46daaa 100644
--- a/modules/multiresvolume/rendering/brickmanager.cpp
+++ b/modules/multiresvolume/rendering/brickmanager.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/multiresvolume/rendering/brickmanager.h b/modules/multiresvolume/rendering/brickmanager.h
index 044bc0238a..54fd20e2fb 100644
--- a/modules/multiresvolume/rendering/brickmanager.h
+++ b/modules/multiresvolume/rendering/brickmanager.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/multiresvolume/rendering/brickselection.cpp b/modules/multiresvolume/rendering/brickselection.cpp
index ce3c88c1ec..545f9b42d3 100644
--- a/modules/multiresvolume/rendering/brickselection.cpp
+++ b/modules/multiresvolume/rendering/brickselection.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/multiresvolume/rendering/brickselection.h b/modules/multiresvolume/rendering/brickselection.h
index 1eeab40526..49d3a20ed9 100644
--- a/modules/multiresvolume/rendering/brickselection.h
+++ b/modules/multiresvolume/rendering/brickselection.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/multiresvolume/rendering/brickselector.h b/modules/multiresvolume/rendering/brickselector.h
index d13b7f4344..8e78c22bb7 100644
--- a/modules/multiresvolume/rendering/brickselector.h
+++ b/modules/multiresvolume/rendering/brickselector.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/multiresvolume/rendering/errorhistogrammanager.cpp b/modules/multiresvolume/rendering/errorhistogrammanager.cpp
index 804e23f34f..2a83995732 100644
--- a/modules/multiresvolume/rendering/errorhistogrammanager.cpp
+++ b/modules/multiresvolume/rendering/errorhistogrammanager.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/multiresvolume/rendering/errorhistogrammanager.h b/modules/multiresvolume/rendering/errorhistogrammanager.h
index 3f8ad641d1..d819ba7a31 100644
--- a/modules/multiresvolume/rendering/errorhistogrammanager.h
+++ b/modules/multiresvolume/rendering/errorhistogrammanager.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/multiresvolume/rendering/histogrammanager.cpp b/modules/multiresvolume/rendering/histogrammanager.cpp
index 62cdeb997e..91b7f6ab4a 100644
--- a/modules/multiresvolume/rendering/histogrammanager.cpp
+++ b/modules/multiresvolume/rendering/histogrammanager.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/multiresvolume/rendering/histogrammanager.h b/modules/multiresvolume/rendering/histogrammanager.h
index c6dd0b67ce..d9abde4d00 100644
--- a/modules/multiresvolume/rendering/histogrammanager.h
+++ b/modules/multiresvolume/rendering/histogrammanager.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/multiresvolume/rendering/localerrorhistogrammanager.cpp b/modules/multiresvolume/rendering/localerrorhistogrammanager.cpp
index 4b8d5716b6..022aab6335 100644
--- a/modules/multiresvolume/rendering/localerrorhistogrammanager.cpp
+++ b/modules/multiresvolume/rendering/localerrorhistogrammanager.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/multiresvolume/rendering/localerrorhistogrammanager.h b/modules/multiresvolume/rendering/localerrorhistogrammanager.h
index c3a2ee8bd1..8e77e5edd3 100644
--- a/modules/multiresvolume/rendering/localerrorhistogrammanager.h
+++ b/modules/multiresvolume/rendering/localerrorhistogrammanager.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/multiresvolume/rendering/localtfbrickselector.cpp b/modules/multiresvolume/rendering/localtfbrickselector.cpp
index 7189c34b86..6037be50df 100644
--- a/modules/multiresvolume/rendering/localtfbrickselector.cpp
+++ b/modules/multiresvolume/rendering/localtfbrickselector.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/multiresvolume/rendering/localtfbrickselector.h b/modules/multiresvolume/rendering/localtfbrickselector.h
index 5ec49714dc..03ffa1e413 100644
--- a/modules/multiresvolume/rendering/localtfbrickselector.h
+++ b/modules/multiresvolume/rendering/localtfbrickselector.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/multiresvolume/rendering/multiresvolumeraycaster.cpp b/modules/multiresvolume/rendering/multiresvolumeraycaster.cpp
index f6940e105d..b460b59513 100644
--- a/modules/multiresvolume/rendering/multiresvolumeraycaster.cpp
+++ b/modules/multiresvolume/rendering/multiresvolumeraycaster.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/multiresvolume/rendering/multiresvolumeraycaster.h b/modules/multiresvolume/rendering/multiresvolumeraycaster.h
index fc33b386ba..075b71a166 100644
--- a/modules/multiresvolume/rendering/multiresvolumeraycaster.h
+++ b/modules/multiresvolume/rendering/multiresvolumeraycaster.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/multiresvolume/rendering/renderablemultiresvolume.cpp b/modules/multiresvolume/rendering/renderablemultiresvolume.cpp
index 75acfd8237..6189d4d20f 100644
--- a/modules/multiresvolume/rendering/renderablemultiresvolume.cpp
+++ b/modules/multiresvolume/rendering/renderablemultiresvolume.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/multiresvolume/rendering/renderablemultiresvolume.h b/modules/multiresvolume/rendering/renderablemultiresvolume.h
index 42baa927ba..ab906a7b63 100644
--- a/modules/multiresvolume/rendering/renderablemultiresvolume.h
+++ b/modules/multiresvolume/rendering/renderablemultiresvolume.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/multiresvolume/rendering/shenbrickselector.cpp b/modules/multiresvolume/rendering/shenbrickselector.cpp
index 1caffa7863..49278ca833 100644
--- a/modules/multiresvolume/rendering/shenbrickselector.cpp
+++ b/modules/multiresvolume/rendering/shenbrickselector.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/multiresvolume/rendering/shenbrickselector.h b/modules/multiresvolume/rendering/shenbrickselector.h
index 52e379ae99..24de6b0fd8 100644
--- a/modules/multiresvolume/rendering/shenbrickselector.h
+++ b/modules/multiresvolume/rendering/shenbrickselector.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/multiresvolume/rendering/simpletfbrickselector.cpp b/modules/multiresvolume/rendering/simpletfbrickselector.cpp
index d72c91353b..71a04fab99 100644
--- a/modules/multiresvolume/rendering/simpletfbrickselector.cpp
+++ b/modules/multiresvolume/rendering/simpletfbrickselector.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/multiresvolume/rendering/simpletfbrickselector.h b/modules/multiresvolume/rendering/simpletfbrickselector.h
index d831b20585..78f3c8ed66 100644
--- a/modules/multiresvolume/rendering/simpletfbrickselector.h
+++ b/modules/multiresvolume/rendering/simpletfbrickselector.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/multiresvolume/rendering/tfbrickselector.cpp b/modules/multiresvolume/rendering/tfbrickselector.cpp
index fb056a1963..26a964b2bc 100644
--- a/modules/multiresvolume/rendering/tfbrickselector.cpp
+++ b/modules/multiresvolume/rendering/tfbrickselector.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/multiresvolume/rendering/tfbrickselector.h b/modules/multiresvolume/rendering/tfbrickselector.h
index 60cbb7226f..72a6651333 100644
--- a/modules/multiresvolume/rendering/tfbrickselector.h
+++ b/modules/multiresvolume/rendering/tfbrickselector.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/multiresvolume/rendering/tsp.cpp b/modules/multiresvolume/rendering/tsp.cpp
index 8ad3f5f8f5..b12b8ae868 100644
--- a/modules/multiresvolume/rendering/tsp.cpp
+++ b/modules/multiresvolume/rendering/tsp.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/multiresvolume/rendering/tsp.h b/modules/multiresvolume/rendering/tsp.h
index b5b8fff25d..1ef06fd9fd 100644
--- a/modules/multiresvolume/rendering/tsp.h
+++ b/modules/multiresvolume/rendering/tsp.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/multiresvolume/shaders/bounds_fs.glsl b/modules/multiresvolume/shaders/bounds_fs.glsl
index 92a623f4b6..6a8c3cb719 100644
--- a/modules/multiresvolume/shaders/bounds_fs.glsl
+++ b/modules/multiresvolume/shaders/bounds_fs.glsl
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/multiresvolume/shaders/bounds_vs.glsl b/modules/multiresvolume/shaders/bounds_vs.glsl
index 8f5650bc34..a0af27a9ce 100644
--- a/modules/multiresvolume/shaders/bounds_vs.glsl
+++ b/modules/multiresvolume/shaders/bounds_vs.glsl
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/multiresvolume/shaders/helper.glsl b/modules/multiresvolume/shaders/helper.glsl
index bf9a2abb8a..896acc9788 100644
--- a/modules/multiresvolume/shaders/helper.glsl
+++ b/modules/multiresvolume/shaders/helper.glsl
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/multiresvolume/shaders/raycast.glsl b/modules/multiresvolume/shaders/raycast.glsl
index e9bb14c4c1..711cc87671 100644
--- a/modules/multiresvolume/shaders/raycast.glsl
+++ b/modules/multiresvolume/shaders/raycast.glsl
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/server/include/connection.h b/modules/server/include/connection.h
index 6efed2e5a5..1937889008 100644
--- a/modules/server/include/connection.h
+++ b/modules/server/include/connection.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/server/include/connectionpool.h b/modules/server/include/connectionpool.h
index 72baba2262..63c3f3d9e4 100644
--- a/modules/server/include/connectionpool.h
+++ b/modules/server/include/connectionpool.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/server/include/jsonconverters.h b/modules/server/include/jsonconverters.h
index 7dded7f4d4..f4144624c1 100644
--- a/modules/server/include/jsonconverters.h
+++ b/modules/server/include/jsonconverters.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/server/include/serverinterface.h b/modules/server/include/serverinterface.h
index ddce0fdf93..66ffb0d4d9 100644
--- a/modules/server/include/serverinterface.h
+++ b/modules/server/include/serverinterface.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/server/include/topics/authorizationtopic.h b/modules/server/include/topics/authorizationtopic.h
index 7c0303233d..f7db399530 100644
--- a/modules/server/include/topics/authorizationtopic.h
+++ b/modules/server/include/topics/authorizationtopic.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/server/include/topics/bouncetopic.h b/modules/server/include/topics/bouncetopic.h
index 5c7f19189e..b8ceff9dde 100644
--- a/modules/server/include/topics/bouncetopic.h
+++ b/modules/server/include/topics/bouncetopic.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/server/include/topics/camerapathtopic.h b/modules/server/include/topics/camerapathtopic.h
index 58c4d3ba36..73c7ba67ca 100644
--- a/modules/server/include/topics/camerapathtopic.h
+++ b/modules/server/include/topics/camerapathtopic.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/server/include/topics/cameratopic.h b/modules/server/include/topics/cameratopic.h
index 5cc4d60d81..f28c41f65e 100644
--- a/modules/server/include/topics/cameratopic.h
+++ b/modules/server/include/topics/cameratopic.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/server/include/topics/documentationtopic.h b/modules/server/include/topics/documentationtopic.h
index a1f7416d21..fd0d5b38f7 100644
--- a/modules/server/include/topics/documentationtopic.h
+++ b/modules/server/include/topics/documentationtopic.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/server/include/topics/enginemodetopic.h b/modules/server/include/topics/enginemodetopic.h
index 7beb7bd1cf..40d3beb678 100644
--- a/modules/server/include/topics/enginemodetopic.h
+++ b/modules/server/include/topics/enginemodetopic.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/server/include/topics/eventtopic.h b/modules/server/include/topics/eventtopic.h
index fe838cda8f..0dc863ad74 100644
--- a/modules/server/include/topics/eventtopic.h
+++ b/modules/server/include/topics/eventtopic.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/server/include/topics/flightcontrollertopic.h b/modules/server/include/topics/flightcontrollertopic.h
index 97afe52a41..36be8ed760 100644
--- a/modules/server/include/topics/flightcontrollertopic.h
+++ b/modules/server/include/topics/flightcontrollertopic.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/server/include/topics/getpropertytopic.h b/modules/server/include/topics/getpropertytopic.h
index 95d3fc976e..d1fbce4267 100644
--- a/modules/server/include/topics/getpropertytopic.h
+++ b/modules/server/include/topics/getpropertytopic.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/server/include/topics/luascripttopic.h b/modules/server/include/topics/luascripttopic.h
index b0ed050eeb..c26814e584 100644
--- a/modules/server/include/topics/luascripttopic.h
+++ b/modules/server/include/topics/luascripttopic.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/server/include/topics/missiontopic.h b/modules/server/include/topics/missiontopic.h
index 30f34632fb..59890efabe 100644
--- a/modules/server/include/topics/missiontopic.h
+++ b/modules/server/include/topics/missiontopic.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/server/include/topics/sessionrecordingtopic.h b/modules/server/include/topics/sessionrecordingtopic.h
index 449071d2a3..7e7d7ce41c 100644
--- a/modules/server/include/topics/sessionrecordingtopic.h
+++ b/modules/server/include/topics/sessionrecordingtopic.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/server/include/topics/setpropertytopic.h b/modules/server/include/topics/setpropertytopic.h
index 45ad797f68..a42addcfb4 100644
--- a/modules/server/include/topics/setpropertytopic.h
+++ b/modules/server/include/topics/setpropertytopic.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/server/include/topics/shortcuttopic.h b/modules/server/include/topics/shortcuttopic.h
index bfcc9c1478..e2c36ef115 100644
--- a/modules/server/include/topics/shortcuttopic.h
+++ b/modules/server/include/topics/shortcuttopic.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/server/include/topics/skybrowsertopic.h b/modules/server/include/topics/skybrowsertopic.h
index c9e8165277..4c93b5c249 100644
--- a/modules/server/include/topics/skybrowsertopic.h
+++ b/modules/server/include/topics/skybrowsertopic.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/server/include/topics/subscriptiontopic.h b/modules/server/include/topics/subscriptiontopic.h
index 2e958a1dc7..fe08afdf5a 100644
--- a/modules/server/include/topics/subscriptiontopic.h
+++ b/modules/server/include/topics/subscriptiontopic.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/server/include/topics/timetopic.h b/modules/server/include/topics/timetopic.h
index d1f4e0be9d..16f8a6c34e 100644
--- a/modules/server/include/topics/timetopic.h
+++ b/modules/server/include/topics/timetopic.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/server/include/topics/topic.h b/modules/server/include/topics/topic.h
index c9a4656318..fb27ff3cbb 100644
--- a/modules/server/include/topics/topic.h
+++ b/modules/server/include/topics/topic.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/server/include/topics/triggerpropertytopic.h b/modules/server/include/topics/triggerpropertytopic.h
index c7cffc770e..bf54bdac19 100644
--- a/modules/server/include/topics/triggerpropertytopic.h
+++ b/modules/server/include/topics/triggerpropertytopic.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/server/include/topics/versiontopic.h b/modules/server/include/topics/versiontopic.h
index b79bf5dcb0..6a38b79118 100644
--- a/modules/server/include/topics/versiontopic.h
+++ b/modules/server/include/topics/versiontopic.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/server/servermodule.cpp b/modules/server/servermodule.cpp
index 424ad59747..dec3c0042c 100644
--- a/modules/server/servermodule.cpp
+++ b/modules/server/servermodule.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/server/servermodule.h b/modules/server/servermodule.h
index af742f120f..aa59142948 100644
--- a/modules/server/servermodule.h
+++ b/modules/server/servermodule.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/server/src/connection.cpp b/modules/server/src/connection.cpp
index 2fa1f5738f..53026656fe 100644
--- a/modules/server/src/connection.cpp
+++ b/modules/server/src/connection.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/server/src/connectionpool.cpp b/modules/server/src/connectionpool.cpp
index e6fe55b18b..ae4078ea3f 100644
--- a/modules/server/src/connectionpool.cpp
+++ b/modules/server/src/connectionpool.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/server/src/jsonconverters.cpp b/modules/server/src/jsonconverters.cpp
index 0d6cab960c..ae62f728e8 100644
--- a/modules/server/src/jsonconverters.cpp
+++ b/modules/server/src/jsonconverters.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/server/src/serverinterface.cpp b/modules/server/src/serverinterface.cpp
index ce666a402f..4c080721f2 100644
--- a/modules/server/src/serverinterface.cpp
+++ b/modules/server/src/serverinterface.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/server/src/topics/authorizationtopic.cpp b/modules/server/src/topics/authorizationtopic.cpp
index faf63719bb..3684412af3 100644
--- a/modules/server/src/topics/authorizationtopic.cpp
+++ b/modules/server/src/topics/authorizationtopic.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/server/src/topics/bouncetopic.cpp b/modules/server/src/topics/bouncetopic.cpp
index d57207ce10..52a54b8888 100644
--- a/modules/server/src/topics/bouncetopic.cpp
+++ b/modules/server/src/topics/bouncetopic.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/server/src/topics/camerapathtopic.cpp b/modules/server/src/topics/camerapathtopic.cpp
index f1b98e4439..54c6c579dd 100644
--- a/modules/server/src/topics/camerapathtopic.cpp
+++ b/modules/server/src/topics/camerapathtopic.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/server/src/topics/cameratopic.cpp b/modules/server/src/topics/cameratopic.cpp
index 8170ec2b2c..c6690eb077 100644
--- a/modules/server/src/topics/cameratopic.cpp
+++ b/modules/server/src/topics/cameratopic.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/server/src/topics/documentationtopic.cpp b/modules/server/src/topics/documentationtopic.cpp
index 3c2e0c16f0..247736e67c 100644
--- a/modules/server/src/topics/documentationtopic.cpp
+++ b/modules/server/src/topics/documentationtopic.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/server/src/topics/enginemodetopic.cpp b/modules/server/src/topics/enginemodetopic.cpp
index 843ba71dce..8f4cfdb2d2 100644
--- a/modules/server/src/topics/enginemodetopic.cpp
+++ b/modules/server/src/topics/enginemodetopic.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/server/src/topics/eventtopic.cpp b/modules/server/src/topics/eventtopic.cpp
index 4d55f8ad79..cc46202166 100644
--- a/modules/server/src/topics/eventtopic.cpp
+++ b/modules/server/src/topics/eventtopic.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/server/src/topics/flightcontrollertopic.cpp b/modules/server/src/topics/flightcontrollertopic.cpp
index 4bba9cfa65..1ac4fd202f 100644
--- a/modules/server/src/topics/flightcontrollertopic.cpp
+++ b/modules/server/src/topics/flightcontrollertopic.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/server/src/topics/getpropertytopic.cpp b/modules/server/src/topics/getpropertytopic.cpp
index 4d475fcdb8..be96c0d54f 100644
--- a/modules/server/src/topics/getpropertytopic.cpp
+++ b/modules/server/src/topics/getpropertytopic.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/server/src/topics/luascripttopic.cpp b/modules/server/src/topics/luascripttopic.cpp
index b75d863681..b7d492279b 100644
--- a/modules/server/src/topics/luascripttopic.cpp
+++ b/modules/server/src/topics/luascripttopic.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/server/src/topics/missiontopic.cpp b/modules/server/src/topics/missiontopic.cpp
index b8bbaeee03..09a9a82a53 100644
--- a/modules/server/src/topics/missiontopic.cpp
+++ b/modules/server/src/topics/missiontopic.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/server/src/topics/sessionrecordingtopic.cpp b/modules/server/src/topics/sessionrecordingtopic.cpp
index 3a84458eb5..cd9d660edb 100644
--- a/modules/server/src/topics/sessionrecordingtopic.cpp
+++ b/modules/server/src/topics/sessionrecordingtopic.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/server/src/topics/setpropertytopic.cpp b/modules/server/src/topics/setpropertytopic.cpp
index 3a6ca50f67..182b6817c8 100644
--- a/modules/server/src/topics/setpropertytopic.cpp
+++ b/modules/server/src/topics/setpropertytopic.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/server/src/topics/shortcuttopic.cpp b/modules/server/src/topics/shortcuttopic.cpp
index 4125257635..a3ef7e12a2 100644
--- a/modules/server/src/topics/shortcuttopic.cpp
+++ b/modules/server/src/topics/shortcuttopic.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/server/src/topics/skybrowsertopic.cpp b/modules/server/src/topics/skybrowsertopic.cpp
index 6fcbaff99c..28d04402c1 100644
--- a/modules/server/src/topics/skybrowsertopic.cpp
+++ b/modules/server/src/topics/skybrowsertopic.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/server/src/topics/subscriptiontopic.cpp b/modules/server/src/topics/subscriptiontopic.cpp
index a28fdecfff..0eba60161c 100644
--- a/modules/server/src/topics/subscriptiontopic.cpp
+++ b/modules/server/src/topics/subscriptiontopic.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/server/src/topics/timetopic.cpp b/modules/server/src/topics/timetopic.cpp
index 1ed325c15d..5496a0d29c 100644
--- a/modules/server/src/topics/timetopic.cpp
+++ b/modules/server/src/topics/timetopic.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/server/src/topics/topic.cpp b/modules/server/src/topics/topic.cpp
index bce34c07e4..2ae23d5757 100644
--- a/modules/server/src/topics/topic.cpp
+++ b/modules/server/src/topics/topic.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/server/src/topics/triggerpropertytopic.cpp b/modules/server/src/topics/triggerpropertytopic.cpp
index 6ba2e78d05..a7d4e00445 100644
--- a/modules/server/src/topics/triggerpropertytopic.cpp
+++ b/modules/server/src/topics/triggerpropertytopic.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/server/src/topics/versiontopic.cpp b/modules/server/src/topics/versiontopic.cpp
index d900db3004..e8bd0af0c0 100644
--- a/modules/server/src/topics/versiontopic.cpp
+++ b/modules/server/src/topics/versiontopic.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/skybrowser/include/browser.h b/modules/skybrowser/include/browser.h
index 297b71414b..32348a24ac 100644
--- a/modules/skybrowser/include/browser.h
+++ b/modules/skybrowser/include/browser.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/skybrowser/include/renderableskytarget.h b/modules/skybrowser/include/renderableskytarget.h
index 76c0620567..367705805d 100644
--- a/modules/skybrowser/include/renderableskytarget.h
+++ b/modules/skybrowser/include/renderableskytarget.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/skybrowser/include/screenspaceskybrowser.h b/modules/skybrowser/include/screenspaceskybrowser.h
index de47a0355a..67ff217873 100644
--- a/modules/skybrowser/include/screenspaceskybrowser.h
+++ b/modules/skybrowser/include/screenspaceskybrowser.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/skybrowser/include/targetbrowserpair.h b/modules/skybrowser/include/targetbrowserpair.h
index aa1d5c0ddd..48b265eedb 100644
--- a/modules/skybrowser/include/targetbrowserpair.h
+++ b/modules/skybrowser/include/targetbrowserpair.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/skybrowser/include/utility.h b/modules/skybrowser/include/utility.h
index 1e574bc42f..170cefc93f 100644
--- a/modules/skybrowser/include/utility.h
+++ b/modules/skybrowser/include/utility.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/skybrowser/include/wwtcommunicator.h b/modules/skybrowser/include/wwtcommunicator.h
index bc2235dc92..d62bb26c70 100644
--- a/modules/skybrowser/include/wwtcommunicator.h
+++ b/modules/skybrowser/include/wwtcommunicator.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/skybrowser/include/wwtdatahandler.h b/modules/skybrowser/include/wwtdatahandler.h
index c6b1df682d..ac2767b5f2 100644
--- a/modules/skybrowser/include/wwtdatahandler.h
+++ b/modules/skybrowser/include/wwtdatahandler.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/skybrowser/shaders/target_fs.glsl b/modules/skybrowser/shaders/target_fs.glsl
index 60c7d8e26a..f7516f5831 100644
--- a/modules/skybrowser/shaders/target_fs.glsl
+++ b/modules/skybrowser/shaders/target_fs.glsl
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/skybrowser/shaders/target_vs.glsl b/modules/skybrowser/shaders/target_vs.glsl
index a395ea0e5b..d601f353bb 100644
--- a/modules/skybrowser/shaders/target_vs.glsl
+++ b/modules/skybrowser/shaders/target_vs.glsl
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/skybrowser/skybrowsermodule.cpp b/modules/skybrowser/skybrowsermodule.cpp
index 188fec73db..3b3f852a53 100644
--- a/modules/skybrowser/skybrowsermodule.cpp
+++ b/modules/skybrowser/skybrowsermodule.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/skybrowser/skybrowsermodule.h b/modules/skybrowser/skybrowsermodule.h
index 822b613b9c..97b44fa65f 100644
--- a/modules/skybrowser/skybrowsermodule.h
+++ b/modules/skybrowser/skybrowsermodule.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/skybrowser/skybrowsermodule_lua.inl b/modules/skybrowser/skybrowsermodule_lua.inl
index 66b1a628e2..b085b52df0 100644
--- a/modules/skybrowser/skybrowsermodule_lua.inl
+++ b/modules/skybrowser/skybrowsermodule_lua.inl
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/skybrowser/src/browser.cpp b/modules/skybrowser/src/browser.cpp
index 3dd9ae04a0..7cf5b127c6 100644
--- a/modules/skybrowser/src/browser.cpp
+++ b/modules/skybrowser/src/browser.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/skybrowser/src/renderableskytarget.cpp b/modules/skybrowser/src/renderableskytarget.cpp
index 429b660d15..c28f1b1cc9 100644
--- a/modules/skybrowser/src/renderableskytarget.cpp
+++ b/modules/skybrowser/src/renderableskytarget.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/skybrowser/src/screenspaceskybrowser.cpp b/modules/skybrowser/src/screenspaceskybrowser.cpp
index 29566eff1b..30125c257f 100644
--- a/modules/skybrowser/src/screenspaceskybrowser.cpp
+++ b/modules/skybrowser/src/screenspaceskybrowser.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/skybrowser/src/targetbrowserpair.cpp b/modules/skybrowser/src/targetbrowserpair.cpp
index 8683264840..d375948d91 100644
--- a/modules/skybrowser/src/targetbrowserpair.cpp
+++ b/modules/skybrowser/src/targetbrowserpair.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/skybrowser/src/utility.cpp b/modules/skybrowser/src/utility.cpp
index e6c276a48a..51812de1fe 100644
--- a/modules/skybrowser/src/utility.cpp
+++ b/modules/skybrowser/src/utility.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/skybrowser/src/wwtcommunicator.cpp b/modules/skybrowser/src/wwtcommunicator.cpp
index 93b9a27524..c32efd492b 100644
--- a/modules/skybrowser/src/wwtcommunicator.cpp
+++ b/modules/skybrowser/src/wwtcommunicator.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/skybrowser/src/wwtdatahandler.cpp b/modules/skybrowser/src/wwtdatahandler.cpp
index a000d3e17c..f2e714641a 100644
--- a/modules/skybrowser/src/wwtdatahandler.cpp
+++ b/modules/skybrowser/src/wwtdatahandler.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/space/horizonsfile.cpp b/modules/space/horizonsfile.cpp
index f2635c70a8..efb5036811 100644
--- a/modules/space/horizonsfile.cpp
+++ b/modules/space/horizonsfile.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/space/horizonsfile.h b/modules/space/horizonsfile.h
index c492e7486a..f23f86fb00 100644
--- a/modules/space/horizonsfile.h
+++ b/modules/space/horizonsfile.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/space/kepler.cpp b/modules/space/kepler.cpp
index 45d5ba5b1f..0e6ca11493 100644
--- a/modules/space/kepler.cpp
+++ b/modules/space/kepler.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/space/kepler.h b/modules/space/kepler.h
index 7786e0c48c..a86aa7e227 100644
--- a/modules/space/kepler.h
+++ b/modules/space/kepler.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/space/rendering/renderableconstellationbounds.cpp b/modules/space/rendering/renderableconstellationbounds.cpp
index 8e3cb017fa..a495d303e1 100644
--- a/modules/space/rendering/renderableconstellationbounds.cpp
+++ b/modules/space/rendering/renderableconstellationbounds.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/space/rendering/renderableconstellationbounds.h b/modules/space/rendering/renderableconstellationbounds.h
index bfccd0cca9..11e2bc0f08 100644
--- a/modules/space/rendering/renderableconstellationbounds.h
+++ b/modules/space/rendering/renderableconstellationbounds.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/space/rendering/renderableconstellationlines.cpp b/modules/space/rendering/renderableconstellationlines.cpp
index 8bd0f81827..f8b2b5f013 100644
--- a/modules/space/rendering/renderableconstellationlines.cpp
+++ b/modules/space/rendering/renderableconstellationlines.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/space/rendering/renderableconstellationlines.h b/modules/space/rendering/renderableconstellationlines.h
index 74a2795ebb..3c3dd430e9 100644
--- a/modules/space/rendering/renderableconstellationlines.h
+++ b/modules/space/rendering/renderableconstellationlines.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/space/rendering/renderableconstellationsbase.cpp b/modules/space/rendering/renderableconstellationsbase.cpp
index 627ef98d0a..747db8bcd4 100644
--- a/modules/space/rendering/renderableconstellationsbase.cpp
+++ b/modules/space/rendering/renderableconstellationsbase.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/space/rendering/renderableconstellationsbase.h b/modules/space/rendering/renderableconstellationsbase.h
index 288d4cb78f..0d02039914 100644
--- a/modules/space/rendering/renderableconstellationsbase.h
+++ b/modules/space/rendering/renderableconstellationsbase.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/space/rendering/renderableeclipsecone.cpp b/modules/space/rendering/renderableeclipsecone.cpp
index b782045340..928a1e9cbe 100644
--- a/modules/space/rendering/renderableeclipsecone.cpp
+++ b/modules/space/rendering/renderableeclipsecone.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/space/rendering/renderableeclipsecone.h b/modules/space/rendering/renderableeclipsecone.h
index bee608a571..f154c45211 100644
--- a/modules/space/rendering/renderableeclipsecone.h
+++ b/modules/space/rendering/renderableeclipsecone.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/space/rendering/renderablefluxnodes.cpp b/modules/space/rendering/renderablefluxnodes.cpp
index cd0ed7b9a5..5b18355ae1 100644
--- a/modules/space/rendering/renderablefluxnodes.cpp
+++ b/modules/space/rendering/renderablefluxnodes.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/space/rendering/renderablefluxnodes.h b/modules/space/rendering/renderablefluxnodes.h
index 922d3fe6a8..917a16748c 100644
--- a/modules/space/rendering/renderablefluxnodes.h
+++ b/modules/space/rendering/renderablefluxnodes.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/space/rendering/renderablehabitablezone.cpp b/modules/space/rendering/renderablehabitablezone.cpp
index 67caa87580..622d69d777 100644
--- a/modules/space/rendering/renderablehabitablezone.cpp
+++ b/modules/space/rendering/renderablehabitablezone.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/space/rendering/renderablehabitablezone.h b/modules/space/rendering/renderablehabitablezone.h
index fc24ab26f9..4194a0a59c 100644
--- a/modules/space/rendering/renderablehabitablezone.h
+++ b/modules/space/rendering/renderablehabitablezone.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/space/rendering/renderableorbitalkepler.cpp b/modules/space/rendering/renderableorbitalkepler.cpp
index 438c0fbad3..5acaf7e019 100644
--- a/modules/space/rendering/renderableorbitalkepler.cpp
+++ b/modules/space/rendering/renderableorbitalkepler.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/space/rendering/renderableorbitalkepler.h b/modules/space/rendering/renderableorbitalkepler.h
index 6352435f4e..c3aef4d813 100644
--- a/modules/space/rendering/renderableorbitalkepler.h
+++ b/modules/space/rendering/renderableorbitalkepler.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/space/rendering/renderablerings.cpp b/modules/space/rendering/renderablerings.cpp
index 41fe330e8b..3d62abbf7e 100644
--- a/modules/space/rendering/renderablerings.cpp
+++ b/modules/space/rendering/renderablerings.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/space/rendering/renderablerings.h b/modules/space/rendering/renderablerings.h
index d9dec3154b..8fe741281c 100644
--- a/modules/space/rendering/renderablerings.h
+++ b/modules/space/rendering/renderablerings.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/space/rendering/renderablestars.cpp b/modules/space/rendering/renderablestars.cpp
index e696d14e5b..d0b5aa88c0 100644
--- a/modules/space/rendering/renderablestars.cpp
+++ b/modules/space/rendering/renderablestars.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/space/rendering/renderablestars.h b/modules/space/rendering/renderablestars.h
index 85ea0c25b4..3119e48614 100644
--- a/modules/space/rendering/renderablestars.h
+++ b/modules/space/rendering/renderablestars.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/space/rendering/renderabletravelspeed.cpp b/modules/space/rendering/renderabletravelspeed.cpp
index 7b8b354370..b2bb48429e 100644
--- a/modules/space/rendering/renderabletravelspeed.cpp
+++ b/modules/space/rendering/renderabletravelspeed.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/space/rendering/renderabletravelspeed.h b/modules/space/rendering/renderabletravelspeed.h
index d379ef064a..d1d9f2bf7f 100644
--- a/modules/space/rendering/renderabletravelspeed.h
+++ b/modules/space/rendering/renderabletravelspeed.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/space/rotation/spicerotation.cpp b/modules/space/rotation/spicerotation.cpp
index ae9958bddf..3dfa015bfa 100644
--- a/modules/space/rotation/spicerotation.cpp
+++ b/modules/space/rotation/spicerotation.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/space/rotation/spicerotation.h b/modules/space/rotation/spicerotation.h
index 4a706bd135..b45c143fe6 100644
--- a/modules/space/rotation/spicerotation.h
+++ b/modules/space/rotation/spicerotation.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/space/shaders/constellationbounds_fs.glsl b/modules/space/shaders/constellationbounds_fs.glsl
index d037eae5f0..1340445fd5 100644
--- a/modules/space/shaders/constellationbounds_fs.glsl
+++ b/modules/space/shaders/constellationbounds_fs.glsl
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/space/shaders/constellationbounds_vs.glsl b/modules/space/shaders/constellationbounds_vs.glsl
index 58b9cb02f1..e0563e98ff 100644
--- a/modules/space/shaders/constellationbounds_vs.glsl
+++ b/modules/space/shaders/constellationbounds_vs.glsl
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/space/shaders/constellationlines_fs.glsl b/modules/space/shaders/constellationlines_fs.glsl
index badb2842ca..d650b3084f 100644
--- a/modules/space/shaders/constellationlines_fs.glsl
+++ b/modules/space/shaders/constellationlines_fs.glsl
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/space/shaders/constellationlines_vs.glsl b/modules/space/shaders/constellationlines_vs.glsl
index 62770659c2..1c240ddf4a 100644
--- a/modules/space/shaders/constellationlines_vs.glsl
+++ b/modules/space/shaders/constellationlines_vs.glsl
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/space/shaders/convolution_fs.glsl b/modules/space/shaders/convolution_fs.glsl
index ca1ff4f734..e0dadb1907 100644
--- a/modules/space/shaders/convolution_fs.glsl
+++ b/modules/space/shaders/convolution_fs.glsl
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/space/shaders/convolution_vs.glsl b/modules/space/shaders/convolution_vs.glsl
index 0ba4e8ee85..b13785d2bc 100644
--- a/modules/space/shaders/convolution_vs.glsl
+++ b/modules/space/shaders/convolution_vs.glsl
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/space/shaders/debrisViz_fs.glsl b/modules/space/shaders/debrisViz_fs.glsl
index 31c0db4235..590794c5a6 100644
--- a/modules/space/shaders/debrisViz_fs.glsl
+++ b/modules/space/shaders/debrisViz_fs.glsl
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/space/shaders/debrisViz_vs.glsl b/modules/space/shaders/debrisViz_vs.glsl
index 601a33316a..b66d821850 100644
--- a/modules/space/shaders/debrisViz_vs.glsl
+++ b/modules/space/shaders/debrisViz_vs.glsl
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/space/shaders/eclipsecone_fs.glsl b/modules/space/shaders/eclipsecone_fs.glsl
index a14344c0e6..561aed356a 100644
--- a/modules/space/shaders/eclipsecone_fs.glsl
+++ b/modules/space/shaders/eclipsecone_fs.glsl
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/space/shaders/eclipsecone_vs.glsl b/modules/space/shaders/eclipsecone_vs.glsl
index 177f3e04c7..e86446e418 100644
--- a/modules/space/shaders/eclipsecone_vs.glsl
+++ b/modules/space/shaders/eclipsecone_vs.glsl
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/space/shaders/fluxnodes_fs.glsl b/modules/space/shaders/fluxnodes_fs.glsl
index e439b428c9..4503d84e53 100644
--- a/modules/space/shaders/fluxnodes_fs.glsl
+++ b/modules/space/shaders/fluxnodes_fs.glsl
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/space/shaders/fluxnodes_vs.glsl b/modules/space/shaders/fluxnodes_vs.glsl
index 60db0de0a3..c8da051462 100644
--- a/modules/space/shaders/fluxnodes_vs.glsl
+++ b/modules/space/shaders/fluxnodes_vs.glsl
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/space/shaders/habitablezone_fs.glsl b/modules/space/shaders/habitablezone_fs.glsl
index 3636ecbfd0..f80f8519fb 100644
--- a/modules/space/shaders/habitablezone_fs.glsl
+++ b/modules/space/shaders/habitablezone_fs.glsl
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/space/shaders/habitablezone_vs.glsl b/modules/space/shaders/habitablezone_vs.glsl
index c2dbd4674f..8a7bba9efe 100644
--- a/modules/space/shaders/habitablezone_vs.glsl
+++ b/modules/space/shaders/habitablezone_vs.glsl
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/space/shaders/psfToTexture_fs.glsl b/modules/space/shaders/psfToTexture_fs.glsl
index 8d914d9dd0..188afd2973 100644
--- a/modules/space/shaders/psfToTexture_fs.glsl
+++ b/modules/space/shaders/psfToTexture_fs.glsl
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/space/shaders/psfToTexture_vs.glsl b/modules/space/shaders/psfToTexture_vs.glsl
index 5e6e7c0a8c..b2a75fd410 100644
--- a/modules/space/shaders/psfToTexture_vs.glsl
+++ b/modules/space/shaders/psfToTexture_vs.glsl
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/space/shaders/rings_fs.glsl b/modules/space/shaders/rings_fs.glsl
index eaf78692bf..ae6d288922 100644
--- a/modules/space/shaders/rings_fs.glsl
+++ b/modules/space/shaders/rings_fs.glsl
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/space/shaders/rings_vs.glsl b/modules/space/shaders/rings_vs.glsl
index 264573395b..d90f41316e 100644
--- a/modules/space/shaders/rings_vs.glsl
+++ b/modules/space/shaders/rings_vs.glsl
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/space/shaders/star_fs.glsl b/modules/space/shaders/star_fs.glsl
index 45360a1434..10917c260d 100644
--- a/modules/space/shaders/star_fs.glsl
+++ b/modules/space/shaders/star_fs.glsl
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/space/shaders/star_ge.glsl b/modules/space/shaders/star_ge.glsl
index 4e3cba08fa..b033fd0099 100644
--- a/modules/space/shaders/star_ge.glsl
+++ b/modules/space/shaders/star_ge.glsl
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/space/shaders/star_vs.glsl b/modules/space/shaders/star_vs.glsl
index 1f61fe2e5f..40d65c8b63 100644
--- a/modules/space/shaders/star_vs.glsl
+++ b/modules/space/shaders/star_vs.glsl
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/space/shaders/travelspeed_fs.glsl b/modules/space/shaders/travelspeed_fs.glsl
index e74e11a9ba..e46d644bb9 100644
--- a/modules/space/shaders/travelspeed_fs.glsl
+++ b/modules/space/shaders/travelspeed_fs.glsl
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/space/shaders/travelspeed_vs.glsl b/modules/space/shaders/travelspeed_vs.glsl
index 3b881f76c8..e5a3e163b6 100644
--- a/modules/space/shaders/travelspeed_vs.glsl
+++ b/modules/space/shaders/travelspeed_vs.glsl
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/space/spacemodule.cpp b/modules/space/spacemodule.cpp
index 67c29cf461..2b025106c1 100644
--- a/modules/space/spacemodule.cpp
+++ b/modules/space/spacemodule.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/space/spacemodule.h b/modules/space/spacemodule.h
index f5ca941780..d53f42d0ff 100644
--- a/modules/space/spacemodule.h
+++ b/modules/space/spacemodule.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/space/spacemodule_lua.inl b/modules/space/spacemodule_lua.inl
index 952640fb42..0b63785b0f 100644
--- a/modules/space/spacemodule_lua.inl
+++ b/modules/space/spacemodule_lua.inl
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/space/tasks/generatedebrisvolumetask.cpp b/modules/space/tasks/generatedebrisvolumetask.cpp
index 1034274197..5c535ce4fc 100644
--- a/modules/space/tasks/generatedebrisvolumetask.cpp
+++ b/modules/space/tasks/generatedebrisvolumetask.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/space/tasks/generatedebrisvolumetask.h b/modules/space/tasks/generatedebrisvolumetask.h
index adcca2e02a..7a382f828e 100644
--- a/modules/space/tasks/generatedebrisvolumetask.h
+++ b/modules/space/tasks/generatedebrisvolumetask.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/space/translation/gptranslation.cpp b/modules/space/translation/gptranslation.cpp
index 5fcaf5911e..0def33012c 100644
--- a/modules/space/translation/gptranslation.cpp
+++ b/modules/space/translation/gptranslation.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/space/translation/gptranslation.h b/modules/space/translation/gptranslation.h
index 7aa68679f6..aa6d04a0e4 100644
--- a/modules/space/translation/gptranslation.h
+++ b/modules/space/translation/gptranslation.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/space/translation/horizonstranslation.cpp b/modules/space/translation/horizonstranslation.cpp
index f65ecfe5fd..7709f8fbd6 100644
--- a/modules/space/translation/horizonstranslation.cpp
+++ b/modules/space/translation/horizonstranslation.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/space/translation/horizonstranslation.h b/modules/space/translation/horizonstranslation.h
index 5542b286fa..60cead9707 100644
--- a/modules/space/translation/horizonstranslation.h
+++ b/modules/space/translation/horizonstranslation.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/space/translation/keplertranslation.cpp b/modules/space/translation/keplertranslation.cpp
index 2cf331f892..3f13ceff46 100644
--- a/modules/space/translation/keplertranslation.cpp
+++ b/modules/space/translation/keplertranslation.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/space/translation/keplertranslation.h b/modules/space/translation/keplertranslation.h
index 79cf251142..5657172f0a 100644
--- a/modules/space/translation/keplertranslation.h
+++ b/modules/space/translation/keplertranslation.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/space/translation/spicetranslation.cpp b/modules/space/translation/spicetranslation.cpp
index fb08e91c76..9291c594ec 100644
--- a/modules/space/translation/spicetranslation.cpp
+++ b/modules/space/translation/spicetranslation.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/space/translation/spicetranslation.h b/modules/space/translation/spicetranslation.h
index a599b49066..5e3811f255 100644
--- a/modules/space/translation/spicetranslation.h
+++ b/modules/space/translation/spicetranslation.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/spacecraftinstruments/dashboard/dashboarditeminstruments.cpp b/modules/spacecraftinstruments/dashboard/dashboarditeminstruments.cpp
index 9db867a435..25ffc06545 100644
--- a/modules/spacecraftinstruments/dashboard/dashboarditeminstruments.cpp
+++ b/modules/spacecraftinstruments/dashboard/dashboarditeminstruments.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/spacecraftinstruments/dashboard/dashboarditeminstruments.h b/modules/spacecraftinstruments/dashboard/dashboarditeminstruments.h
index 0193d8d7ec..a44dca9089 100644
--- a/modules/spacecraftinstruments/dashboard/dashboarditeminstruments.h
+++ b/modules/spacecraftinstruments/dashboard/dashboarditeminstruments.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/spacecraftinstruments/rendering/renderablecrawlingline.cpp b/modules/spacecraftinstruments/rendering/renderablecrawlingline.cpp
index 31688c56c6..ab89151dbc 100644
--- a/modules/spacecraftinstruments/rendering/renderablecrawlingline.cpp
+++ b/modules/spacecraftinstruments/rendering/renderablecrawlingline.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/spacecraftinstruments/rendering/renderablecrawlingline.h b/modules/spacecraftinstruments/rendering/renderablecrawlingline.h
index c2a4457a84..671b430e38 100644
--- a/modules/spacecraftinstruments/rendering/renderablecrawlingline.h
+++ b/modules/spacecraftinstruments/rendering/renderablecrawlingline.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/spacecraftinstruments/rendering/renderablefov.cpp b/modules/spacecraftinstruments/rendering/renderablefov.cpp
index 5c23b7edfd..6e9a1b402b 100644
--- a/modules/spacecraftinstruments/rendering/renderablefov.cpp
+++ b/modules/spacecraftinstruments/rendering/renderablefov.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/spacecraftinstruments/rendering/renderablefov.h b/modules/spacecraftinstruments/rendering/renderablefov.h
index 42f539c5b1..c085bc9cc1 100644
--- a/modules/spacecraftinstruments/rendering/renderablefov.h
+++ b/modules/spacecraftinstruments/rendering/renderablefov.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/spacecraftinstruments/rendering/renderablemodelprojection.cpp b/modules/spacecraftinstruments/rendering/renderablemodelprojection.cpp
index bd88be6f96..98884e3c70 100644
--- a/modules/spacecraftinstruments/rendering/renderablemodelprojection.cpp
+++ b/modules/spacecraftinstruments/rendering/renderablemodelprojection.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/spacecraftinstruments/rendering/renderablemodelprojection.h b/modules/spacecraftinstruments/rendering/renderablemodelprojection.h
index c2b70bbc86..05cfb5a8db 100644
--- a/modules/spacecraftinstruments/rendering/renderablemodelprojection.h
+++ b/modules/spacecraftinstruments/rendering/renderablemodelprojection.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/spacecraftinstruments/rendering/renderableplaneprojection.cpp b/modules/spacecraftinstruments/rendering/renderableplaneprojection.cpp
index 9a9ea32360..19f653a933 100644
--- a/modules/spacecraftinstruments/rendering/renderableplaneprojection.cpp
+++ b/modules/spacecraftinstruments/rendering/renderableplaneprojection.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/spacecraftinstruments/rendering/renderableplaneprojection.h b/modules/spacecraftinstruments/rendering/renderableplaneprojection.h
index 29151709e0..3a7acfb139 100644
--- a/modules/spacecraftinstruments/rendering/renderableplaneprojection.h
+++ b/modules/spacecraftinstruments/rendering/renderableplaneprojection.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/spacecraftinstruments/rendering/renderableplanetprojection.cpp b/modules/spacecraftinstruments/rendering/renderableplanetprojection.cpp
index dd395868f8..14eed03d9a 100644
--- a/modules/spacecraftinstruments/rendering/renderableplanetprojection.cpp
+++ b/modules/spacecraftinstruments/rendering/renderableplanetprojection.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/spacecraftinstruments/rendering/renderableplanetprojection.h b/modules/spacecraftinstruments/rendering/renderableplanetprojection.h
index 2bddb411f7..2fe44e2ac4 100644
--- a/modules/spacecraftinstruments/rendering/renderableplanetprojection.h
+++ b/modules/spacecraftinstruments/rendering/renderableplanetprojection.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/spacecraftinstruments/rendering/renderableshadowcylinder.cpp b/modules/spacecraftinstruments/rendering/renderableshadowcylinder.cpp
index f721ea17c7..e2ae7aa2e8 100644
--- a/modules/spacecraftinstruments/rendering/renderableshadowcylinder.cpp
+++ b/modules/spacecraftinstruments/rendering/renderableshadowcylinder.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/spacecraftinstruments/rendering/renderableshadowcylinder.h b/modules/spacecraftinstruments/rendering/renderableshadowcylinder.h
index cbf213459c..bc6d641d1d 100644
--- a/modules/spacecraftinstruments/rendering/renderableshadowcylinder.h
+++ b/modules/spacecraftinstruments/rendering/renderableshadowcylinder.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/spacecraftinstruments/shaders/crawlingline_fs.glsl b/modules/spacecraftinstruments/shaders/crawlingline_fs.glsl
index 817d704ff1..4ad4f35dda 100644
--- a/modules/spacecraftinstruments/shaders/crawlingline_fs.glsl
+++ b/modules/spacecraftinstruments/shaders/crawlingline_fs.glsl
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/spacecraftinstruments/shaders/crawlingline_vs.glsl b/modules/spacecraftinstruments/shaders/crawlingline_vs.glsl
index eec19f6a6e..1f5d8e42f2 100644
--- a/modules/spacecraftinstruments/shaders/crawlingline_vs.glsl
+++ b/modules/spacecraftinstruments/shaders/crawlingline_vs.glsl
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/spacecraftinstruments/shaders/dilation_fs.glsl b/modules/spacecraftinstruments/shaders/dilation_fs.glsl
index 14fcf82072..50f25efbe2 100644
--- a/modules/spacecraftinstruments/shaders/dilation_fs.glsl
+++ b/modules/spacecraftinstruments/shaders/dilation_fs.glsl
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/spacecraftinstruments/shaders/dilation_vs.glsl b/modules/spacecraftinstruments/shaders/dilation_vs.glsl
index c4e6dd6d3e..6595d2ff81 100644
--- a/modules/spacecraftinstruments/shaders/dilation_vs.glsl
+++ b/modules/spacecraftinstruments/shaders/dilation_vs.glsl
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/spacecraftinstruments/shaders/fov_fs.glsl b/modules/spacecraftinstruments/shaders/fov_fs.glsl
index b3c76b86e2..80ac3e203d 100644
--- a/modules/spacecraftinstruments/shaders/fov_fs.glsl
+++ b/modules/spacecraftinstruments/shaders/fov_fs.glsl
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/spacecraftinstruments/shaders/fov_vs.glsl b/modules/spacecraftinstruments/shaders/fov_vs.glsl
index 9d62bf358e..2788f07adc 100644
--- a/modules/spacecraftinstruments/shaders/fov_vs.glsl
+++ b/modules/spacecraftinstruments/shaders/fov_vs.glsl
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/spacecraftinstruments/shaders/renderableModelDepth_fs.glsl b/modules/spacecraftinstruments/shaders/renderableModelDepth_fs.glsl
index a38705de61..4441ed531e 100644
--- a/modules/spacecraftinstruments/shaders/renderableModelDepth_fs.glsl
+++ b/modules/spacecraftinstruments/shaders/renderableModelDepth_fs.glsl
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/spacecraftinstruments/shaders/renderableModelDepth_vs.glsl b/modules/spacecraftinstruments/shaders/renderableModelDepth_vs.glsl
index 9855e78f59..5d6f8635e6 100644
--- a/modules/spacecraftinstruments/shaders/renderableModelDepth_vs.glsl
+++ b/modules/spacecraftinstruments/shaders/renderableModelDepth_vs.glsl
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/spacecraftinstruments/shaders/renderableModelProjection_fs.glsl b/modules/spacecraftinstruments/shaders/renderableModelProjection_fs.glsl
index 1bb8255e1e..885549b432 100644
--- a/modules/spacecraftinstruments/shaders/renderableModelProjection_fs.glsl
+++ b/modules/spacecraftinstruments/shaders/renderableModelProjection_fs.glsl
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/spacecraftinstruments/shaders/renderableModelProjection_vs.glsl b/modules/spacecraftinstruments/shaders/renderableModelProjection_vs.glsl
index e3732da719..fb112e8a4a 100644
--- a/modules/spacecraftinstruments/shaders/renderableModelProjection_vs.glsl
+++ b/modules/spacecraftinstruments/shaders/renderableModelProjection_vs.glsl
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/spacecraftinstruments/shaders/renderableModel_fs.glsl b/modules/spacecraftinstruments/shaders/renderableModel_fs.glsl
index cf155e390d..42b4991828 100644
--- a/modules/spacecraftinstruments/shaders/renderableModel_fs.glsl
+++ b/modules/spacecraftinstruments/shaders/renderableModel_fs.glsl
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/spacecraftinstruments/shaders/renderableModel_vs.glsl b/modules/spacecraftinstruments/shaders/renderableModel_vs.glsl
index c77edb6d6d..85db434343 100644
--- a/modules/spacecraftinstruments/shaders/renderableModel_vs.glsl
+++ b/modules/spacecraftinstruments/shaders/renderableModel_vs.glsl
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/spacecraftinstruments/shaders/renderablePlanetProjection_fs.glsl b/modules/spacecraftinstruments/shaders/renderablePlanetProjection_fs.glsl
index 5eb98ea72a..ddc9d9e728 100644
--- a/modules/spacecraftinstruments/shaders/renderablePlanetProjection_fs.glsl
+++ b/modules/spacecraftinstruments/shaders/renderablePlanetProjection_fs.glsl
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/spacecraftinstruments/shaders/renderablePlanetProjection_vs.glsl b/modules/spacecraftinstruments/shaders/renderablePlanetProjection_vs.glsl
index 58094ded29..ef472190af 100644
--- a/modules/spacecraftinstruments/shaders/renderablePlanetProjection_vs.glsl
+++ b/modules/spacecraftinstruments/shaders/renderablePlanetProjection_vs.glsl
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/spacecraftinstruments/shaders/renderablePlanet_fs.glsl b/modules/spacecraftinstruments/shaders/renderablePlanet_fs.glsl
index 427fc76688..20bd0c7e26 100644
--- a/modules/spacecraftinstruments/shaders/renderablePlanet_fs.glsl
+++ b/modules/spacecraftinstruments/shaders/renderablePlanet_fs.glsl
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/spacecraftinstruments/shaders/renderablePlanet_vs.glsl b/modules/spacecraftinstruments/shaders/renderablePlanet_vs.glsl
index 8925ff01ae..2d21045b25 100644
--- a/modules/spacecraftinstruments/shaders/renderablePlanet_vs.glsl
+++ b/modules/spacecraftinstruments/shaders/renderablePlanet_vs.glsl
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/spacecraftinstruments/shaders/terminatorshadow_fs.glsl b/modules/spacecraftinstruments/shaders/terminatorshadow_fs.glsl
index 1d8c0cc01d..de2b879095 100644
--- a/modules/spacecraftinstruments/shaders/terminatorshadow_fs.glsl
+++ b/modules/spacecraftinstruments/shaders/terminatorshadow_fs.glsl
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/spacecraftinstruments/shaders/terminatorshadow_vs.glsl b/modules/spacecraftinstruments/shaders/terminatorshadow_vs.glsl
index 0b9c43a496..c082ccde83 100644
--- a/modules/spacecraftinstruments/shaders/terminatorshadow_vs.glsl
+++ b/modules/spacecraftinstruments/shaders/terminatorshadow_vs.glsl
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/spacecraftinstruments/spacecraftinstrumentsmodule.cpp b/modules/spacecraftinstruments/spacecraftinstrumentsmodule.cpp
index 2ce8cfd89c..9efca1a851 100644
--- a/modules/spacecraftinstruments/spacecraftinstrumentsmodule.cpp
+++ b/modules/spacecraftinstruments/spacecraftinstrumentsmodule.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/spacecraftinstruments/spacecraftinstrumentsmodule.h b/modules/spacecraftinstruments/spacecraftinstrumentsmodule.h
index ee6ec081b5..fd252080ba 100644
--- a/modules/spacecraftinstruments/spacecraftinstrumentsmodule.h
+++ b/modules/spacecraftinstruments/spacecraftinstrumentsmodule.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/spacecraftinstruments/util/decoder.cpp b/modules/spacecraftinstruments/util/decoder.cpp
index ffb1e5c502..432a11149b 100644
--- a/modules/spacecraftinstruments/util/decoder.cpp
+++ b/modules/spacecraftinstruments/util/decoder.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/spacecraftinstruments/util/decoder.h b/modules/spacecraftinstruments/util/decoder.h
index 025e2767b1..d5228bfa1e 100644
--- a/modules/spacecraftinstruments/util/decoder.h
+++ b/modules/spacecraftinstruments/util/decoder.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/spacecraftinstruments/util/hongkangparser.cpp b/modules/spacecraftinstruments/util/hongkangparser.cpp
index a96f4ac582..9024f434cc 100644
--- a/modules/spacecraftinstruments/util/hongkangparser.cpp
+++ b/modules/spacecraftinstruments/util/hongkangparser.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/spacecraftinstruments/util/hongkangparser.h b/modules/spacecraftinstruments/util/hongkangparser.h
index b56819edb6..16acd7920b 100644
--- a/modules/spacecraftinstruments/util/hongkangparser.h
+++ b/modules/spacecraftinstruments/util/hongkangparser.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/spacecraftinstruments/util/image.h b/modules/spacecraftinstruments/util/image.h
index d672fc6909..98433ea121 100644
--- a/modules/spacecraftinstruments/util/image.h
+++ b/modules/spacecraftinstruments/util/image.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/spacecraftinstruments/util/imagesequencer.cpp b/modules/spacecraftinstruments/util/imagesequencer.cpp
index 0dc7204a33..ab77378408 100644
--- a/modules/spacecraftinstruments/util/imagesequencer.cpp
+++ b/modules/spacecraftinstruments/util/imagesequencer.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/spacecraftinstruments/util/imagesequencer.h b/modules/spacecraftinstruments/util/imagesequencer.h
index fd79fa3f71..ea7dbb8ee5 100644
--- a/modules/spacecraftinstruments/util/imagesequencer.h
+++ b/modules/spacecraftinstruments/util/imagesequencer.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/spacecraftinstruments/util/instrumentdecoder.cpp b/modules/spacecraftinstruments/util/instrumentdecoder.cpp
index 30ab3af502..494d38a714 100644
--- a/modules/spacecraftinstruments/util/instrumentdecoder.cpp
+++ b/modules/spacecraftinstruments/util/instrumentdecoder.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/spacecraftinstruments/util/instrumentdecoder.h b/modules/spacecraftinstruments/util/instrumentdecoder.h
index b35037b857..2dbcb5c905 100644
--- a/modules/spacecraftinstruments/util/instrumentdecoder.h
+++ b/modules/spacecraftinstruments/util/instrumentdecoder.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/spacecraftinstruments/util/instrumenttimesparser.cpp b/modules/spacecraftinstruments/util/instrumenttimesparser.cpp
index eb3395aaa7..326f45a92d 100644
--- a/modules/spacecraftinstruments/util/instrumenttimesparser.cpp
+++ b/modules/spacecraftinstruments/util/instrumenttimesparser.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/spacecraftinstruments/util/instrumenttimesparser.h b/modules/spacecraftinstruments/util/instrumenttimesparser.h
index 91ba06bb75..31af6937f1 100644
--- a/modules/spacecraftinstruments/util/instrumenttimesparser.h
+++ b/modules/spacecraftinstruments/util/instrumenttimesparser.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/spacecraftinstruments/util/labelparser.cpp b/modules/spacecraftinstruments/util/labelparser.cpp
index 68a0cbc75f..b374ecbee5 100644
--- a/modules/spacecraftinstruments/util/labelparser.cpp
+++ b/modules/spacecraftinstruments/util/labelparser.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/spacecraftinstruments/util/labelparser.h b/modules/spacecraftinstruments/util/labelparser.h
index 11cdd89bbc..50982b602f 100644
--- a/modules/spacecraftinstruments/util/labelparser.h
+++ b/modules/spacecraftinstruments/util/labelparser.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/spacecraftinstruments/util/projectioncomponent.cpp b/modules/spacecraftinstruments/util/projectioncomponent.cpp
index aa03fa8db9..4945a52a48 100644
--- a/modules/spacecraftinstruments/util/projectioncomponent.cpp
+++ b/modules/spacecraftinstruments/util/projectioncomponent.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/spacecraftinstruments/util/projectioncomponent.h b/modules/spacecraftinstruments/util/projectioncomponent.h
index 84f49170f7..bde82ba1e4 100644
--- a/modules/spacecraftinstruments/util/projectioncomponent.h
+++ b/modules/spacecraftinstruments/util/projectioncomponent.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/spacecraftinstruments/util/scannerdecoder.cpp b/modules/spacecraftinstruments/util/scannerdecoder.cpp
index 16dc0e8b6a..138867afea 100644
--- a/modules/spacecraftinstruments/util/scannerdecoder.cpp
+++ b/modules/spacecraftinstruments/util/scannerdecoder.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/spacecraftinstruments/util/scannerdecoder.h b/modules/spacecraftinstruments/util/scannerdecoder.h
index ec646005ab..adeb000c69 100644
--- a/modules/spacecraftinstruments/util/scannerdecoder.h
+++ b/modules/spacecraftinstruments/util/scannerdecoder.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/spacecraftinstruments/util/sequenceparser.cpp b/modules/spacecraftinstruments/util/sequenceparser.cpp
index 42a3055b5d..1683396e88 100644
--- a/modules/spacecraftinstruments/util/sequenceparser.cpp
+++ b/modules/spacecraftinstruments/util/sequenceparser.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/spacecraftinstruments/util/sequenceparser.h b/modules/spacecraftinstruments/util/sequenceparser.h
index 4a33dda71a..8cbd5fa917 100644
--- a/modules/spacecraftinstruments/util/sequenceparser.h
+++ b/modules/spacecraftinstruments/util/sequenceparser.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/spacecraftinstruments/util/targetdecoder.cpp b/modules/spacecraftinstruments/util/targetdecoder.cpp
index cd45b2d64b..4db4f343fa 100644
--- a/modules/spacecraftinstruments/util/targetdecoder.cpp
+++ b/modules/spacecraftinstruments/util/targetdecoder.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/spacecraftinstruments/util/targetdecoder.h b/modules/spacecraftinstruments/util/targetdecoder.h
index 73d87f117b..bc84a5c135 100644
--- a/modules/spacecraftinstruments/util/targetdecoder.h
+++ b/modules/spacecraftinstruments/util/targetdecoder.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/spout/renderableplanespout.cpp b/modules/spout/renderableplanespout.cpp
index 2e3bea2bc9..d43845af4c 100644
--- a/modules/spout/renderableplanespout.cpp
+++ b/modules/spout/renderableplanespout.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/spout/renderableplanespout.h b/modules/spout/renderableplanespout.h
index aae38380d9..7f6ab5c95f 100644
--- a/modules/spout/renderableplanespout.h
+++ b/modules/spout/renderableplanespout.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/spout/renderablespherespout.cpp b/modules/spout/renderablespherespout.cpp
index d68cf9b2ab..a45a0c8b64 100644
--- a/modules/spout/renderablespherespout.cpp
+++ b/modules/spout/renderablespherespout.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/spout/renderablespherespout.h b/modules/spout/renderablespherespout.h
index 0b7f837172..a871f6127a 100644
--- a/modules/spout/renderablespherespout.h
+++ b/modules/spout/renderablespherespout.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/spout/screenspacespout.cpp b/modules/spout/screenspacespout.cpp
index 7ba25f1ede..e72df828da 100644
--- a/modules/spout/screenspacespout.cpp
+++ b/modules/spout/screenspacespout.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/spout/screenspacespout.h b/modules/spout/screenspacespout.h
index 0c4fcd9c7a..1ec5c5427e 100644
--- a/modules/spout/screenspacespout.h
+++ b/modules/spout/screenspacespout.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/spout/spoutlibrary.h b/modules/spout/spoutlibrary.h
index a676969823..b8937cef3f 100644
--- a/modules/spout/spoutlibrary.h
+++ b/modules/spout/spoutlibrary.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/spout/spoutmodule.cpp b/modules/spout/spoutmodule.cpp
index 2334b95412..972de87bd1 100644
--- a/modules/spout/spoutmodule.cpp
+++ b/modules/spout/spoutmodule.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/spout/spoutmodule.h b/modules/spout/spoutmodule.h
index 38212ba270..c89d48df26 100644
--- a/modules/spout/spoutmodule.h
+++ b/modules/spout/spoutmodule.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/spout/spoutwrapper.cpp b/modules/spout/spoutwrapper.cpp
index ff51447a49..7e50f31359 100644
--- a/modules/spout/spoutwrapper.cpp
+++ b/modules/spout/spoutwrapper.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/spout/spoutwrapper.h b/modules/spout/spoutwrapper.h
index d2e3611430..8753a60ed4 100644
--- a/modules/spout/spoutwrapper.h
+++ b/modules/spout/spoutwrapper.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/statemachine/include/state.h b/modules/statemachine/include/state.h
index 1d1e57501c..abf4fd7e8e 100644
--- a/modules/statemachine/include/state.h
+++ b/modules/statemachine/include/state.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/statemachine/include/statemachine.h b/modules/statemachine/include/statemachine.h
index 346290607b..520e526147 100644
--- a/modules/statemachine/include/statemachine.h
+++ b/modules/statemachine/include/statemachine.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/statemachine/include/transition.h b/modules/statemachine/include/transition.h
index 36c77e324e..812bede803 100644
--- a/modules/statemachine/include/transition.h
+++ b/modules/statemachine/include/transition.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/statemachine/src/state.cpp b/modules/statemachine/src/state.cpp
index 6a09ee24e7..cb611e6f05 100644
--- a/modules/statemachine/src/state.cpp
+++ b/modules/statemachine/src/state.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/statemachine/src/statemachine.cpp b/modules/statemachine/src/statemachine.cpp
index ce2f361d80..4d472f943a 100644
--- a/modules/statemachine/src/statemachine.cpp
+++ b/modules/statemachine/src/statemachine.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/statemachine/src/transition.cpp b/modules/statemachine/src/transition.cpp
index 55873a398b..554722e707 100644
--- a/modules/statemachine/src/transition.cpp
+++ b/modules/statemachine/src/transition.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/statemachine/statemachinemodule.cpp b/modules/statemachine/statemachinemodule.cpp
index 69aa15f995..9c3d90dd09 100644
--- a/modules/statemachine/statemachinemodule.cpp
+++ b/modules/statemachine/statemachinemodule.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/statemachine/statemachinemodule.h b/modules/statemachine/statemachinemodule.h
index 1521dc1f92..11fd4b2df2 100644
--- a/modules/statemachine/statemachinemodule.h
+++ b/modules/statemachine/statemachinemodule.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/statemachine/statemachinemodule_lua.inl b/modules/statemachine/statemachinemodule_lua.inl
index a55d7e83bc..bbe0778d0c 100644
--- a/modules/statemachine/statemachinemodule_lua.inl
+++ b/modules/statemachine/statemachinemodule_lua.inl
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/sync/syncmodule.cpp b/modules/sync/syncmodule.cpp
index a787e7006c..90ebdbad30 100644
--- a/modules/sync/syncmodule.cpp
+++ b/modules/sync/syncmodule.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/sync/syncmodule.h b/modules/sync/syncmodule.h
index 202a716276..aeb8899372 100644
--- a/modules/sync/syncmodule.h
+++ b/modules/sync/syncmodule.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/sync/syncmodule_lua.inl b/modules/sync/syncmodule_lua.inl
index 16eb23605e..3bf3421faa 100644
--- a/modules/sync/syncmodule_lua.inl
+++ b/modules/sync/syncmodule_lua.inl
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/sync/syncs/httpsynchronization.cpp b/modules/sync/syncs/httpsynchronization.cpp
index 7b71f7dea3..0525bfdc41 100644
--- a/modules/sync/syncs/httpsynchronization.cpp
+++ b/modules/sync/syncs/httpsynchronization.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/sync/syncs/httpsynchronization.h b/modules/sync/syncs/httpsynchronization.h
index d1d1744f98..9f626fe31b 100644
--- a/modules/sync/syncs/httpsynchronization.h
+++ b/modules/sync/syncs/httpsynchronization.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/sync/syncs/urlsynchronization.cpp b/modules/sync/syncs/urlsynchronization.cpp
index 8e4ac2cc2a..631d8711b9 100644
--- a/modules/sync/syncs/urlsynchronization.cpp
+++ b/modules/sync/syncs/urlsynchronization.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/sync/syncs/urlsynchronization.h b/modules/sync/syncs/urlsynchronization.h
index 3691150f00..6707f7e3bc 100644
--- a/modules/sync/syncs/urlsynchronization.h
+++ b/modules/sync/syncs/urlsynchronization.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/touch/include/directinputsolver.h b/modules/touch/include/directinputsolver.h
index b142c8ea9a..d736253f27 100644
--- a/modules/touch/include/directinputsolver.h
+++ b/modules/touch/include/directinputsolver.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/touch/include/touchinteraction.h b/modules/touch/include/touchinteraction.h
index 8278e600d4..a782850b42 100644
--- a/modules/touch/include/touchinteraction.h
+++ b/modules/touch/include/touchinteraction.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/touch/include/touchmarker.h b/modules/touch/include/touchmarker.h
index 3880e1300a..1b2f85fd75 100644
--- a/modules/touch/include/touchmarker.h
+++ b/modules/touch/include/touchmarker.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/touch/include/tuioear.h b/modules/touch/include/tuioear.h
index 3ec380cc83..677a945704 100644
--- a/modules/touch/include/tuioear.h
+++ b/modules/touch/include/tuioear.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/touch/include/win32_touch.h b/modules/touch/include/win32_touch.h
index 1e85f2067b..986c8d7af4 100644
--- a/modules/touch/include/win32_touch.h
+++ b/modules/touch/include/win32_touch.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/touch/shaders/marker_fs.glsl b/modules/touch/shaders/marker_fs.glsl
index 9d9018a9b9..50f5cd32a3 100644
--- a/modules/touch/shaders/marker_fs.glsl
+++ b/modules/touch/shaders/marker_fs.glsl
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/touch/shaders/marker_vs.glsl b/modules/touch/shaders/marker_vs.glsl
index 61af79aa0c..dfe9ec457b 100644
--- a/modules/touch/shaders/marker_vs.glsl
+++ b/modules/touch/shaders/marker_vs.glsl
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/touch/src/directinputsolver.cpp b/modules/touch/src/directinputsolver.cpp
index e6b0515e37..6f3a0dd6b2 100644
--- a/modules/touch/src/directinputsolver.cpp
+++ b/modules/touch/src/directinputsolver.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/touch/src/touchinteraction.cpp b/modules/touch/src/touchinteraction.cpp
index 4c6c7f1725..59c788e193 100644
--- a/modules/touch/src/touchinteraction.cpp
+++ b/modules/touch/src/touchinteraction.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/touch/src/touchmarker.cpp b/modules/touch/src/touchmarker.cpp
index b746ca2547..7d7e2d7912 100644
--- a/modules/touch/src/touchmarker.cpp
+++ b/modules/touch/src/touchmarker.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/touch/src/tuioear.cpp b/modules/touch/src/tuioear.cpp
index ca36440c1a..f5f715d118 100644
--- a/modules/touch/src/tuioear.cpp
+++ b/modules/touch/src/tuioear.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/touch/src/win32_touch.cpp b/modules/touch/src/win32_touch.cpp
index fc476265a2..ce08d85ff1 100644
--- a/modules/touch/src/win32_touch.cpp
+++ b/modules/touch/src/win32_touch.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/touch/touchmodule.cpp b/modules/touch/touchmodule.cpp
index 98e61911c0..91976bd1bb 100644
--- a/modules/touch/touchmodule.cpp
+++ b/modules/touch/touchmodule.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/touch/touchmodule.h b/modules/touch/touchmodule.h
index eb263060f7..cb39dbc460 100644
--- a/modules/touch/touchmodule.h
+++ b/modules/touch/touchmodule.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/toyvolume/rendering/renderabletoyvolume.cpp b/modules/toyvolume/rendering/renderabletoyvolume.cpp
index 8dadf4203b..6fa4d3485c 100644
--- a/modules/toyvolume/rendering/renderabletoyvolume.cpp
+++ b/modules/toyvolume/rendering/renderabletoyvolume.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/toyvolume/rendering/renderabletoyvolume.h b/modules/toyvolume/rendering/renderabletoyvolume.h
index 5fc66e9da9..38c659528a 100644
--- a/modules/toyvolume/rendering/renderabletoyvolume.h
+++ b/modules/toyvolume/rendering/renderabletoyvolume.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/toyvolume/rendering/toyvolumeraycaster.cpp b/modules/toyvolume/rendering/toyvolumeraycaster.cpp
index edcf9a858c..d1caf09116 100644
--- a/modules/toyvolume/rendering/toyvolumeraycaster.cpp
+++ b/modules/toyvolume/rendering/toyvolumeraycaster.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/toyvolume/rendering/toyvolumeraycaster.h b/modules/toyvolume/rendering/toyvolumeraycaster.h
index 303e759cbe..7f7744b802 100644
--- a/modules/toyvolume/rendering/toyvolumeraycaster.h
+++ b/modules/toyvolume/rendering/toyvolumeraycaster.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/toyvolume/shaders/bounds_fs.glsl b/modules/toyvolume/shaders/bounds_fs.glsl
index 6bc1b8f58c..4e7ba29ec7 100644
--- a/modules/toyvolume/shaders/bounds_fs.glsl
+++ b/modules/toyvolume/shaders/bounds_fs.glsl
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/toyvolume/shaders/bounds_vs.glsl b/modules/toyvolume/shaders/bounds_vs.glsl
index bd61697e12..d71f5ae081 100644
--- a/modules/toyvolume/shaders/bounds_vs.glsl
+++ b/modules/toyvolume/shaders/bounds_vs.glsl
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/toyvolume/shaders/raycast.glsl b/modules/toyvolume/shaders/raycast.glsl
index 66faa16211..c7ac37c3d9 100644
--- a/modules/toyvolume/shaders/raycast.glsl
+++ b/modules/toyvolume/shaders/raycast.glsl
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/toyvolume/toyvolumemodule.cpp b/modules/toyvolume/toyvolumemodule.cpp
index b77142eebe..6a4b0720a4 100644
--- a/modules/toyvolume/toyvolumemodule.cpp
+++ b/modules/toyvolume/toyvolumemodule.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/toyvolume/toyvolumemodule.h b/modules/toyvolume/toyvolumemodule.h
index 1e614a24be..335ec803b7 100644
--- a/modules/toyvolume/toyvolumemodule.h
+++ b/modules/toyvolume/toyvolumemodule.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/video/include/renderablevideoplane.h b/modules/video/include/renderablevideoplane.h
index c9b145f1ad..442bafd7cd 100644
--- a/modules/video/include/renderablevideoplane.h
+++ b/modules/video/include/renderablevideoplane.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/video/include/renderablevideosphere.h b/modules/video/include/renderablevideosphere.h
index c7db3a3fa5..c25531f446 100644
--- a/modules/video/include/renderablevideosphere.h
+++ b/modules/video/include/renderablevideosphere.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/video/include/screenspacevideo.h b/modules/video/include/screenspacevideo.h
index 723a572093..b373576e4a 100644
--- a/modules/video/include/screenspacevideo.h
+++ b/modules/video/include/screenspacevideo.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/video/include/videoplayer.h b/modules/video/include/videoplayer.h
index 7a10a667ad..cb9cf128d5 100644
--- a/modules/video/include/videoplayer.h
+++ b/modules/video/include/videoplayer.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/video/include/videotileprovider.h b/modules/video/include/videotileprovider.h
index 23efca20a4..c36fb3f406 100644
--- a/modules/video/include/videotileprovider.h
+++ b/modules/video/include/videotileprovider.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/video/src/renderablevideoplane.cpp b/modules/video/src/renderablevideoplane.cpp
index 6c694c32e8..4d0ed18dab 100644
--- a/modules/video/src/renderablevideoplane.cpp
+++ b/modules/video/src/renderablevideoplane.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/video/src/renderablevideosphere.cpp b/modules/video/src/renderablevideosphere.cpp
index f0ab52f706..a5659d0e48 100644
--- a/modules/video/src/renderablevideosphere.cpp
+++ b/modules/video/src/renderablevideosphere.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/video/src/screenspacevideo.cpp b/modules/video/src/screenspacevideo.cpp
index 01a71b406d..0f24c0563e 100644
--- a/modules/video/src/screenspacevideo.cpp
+++ b/modules/video/src/screenspacevideo.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/video/src/videoplayer.cpp b/modules/video/src/videoplayer.cpp
index bb4cded563..199864d63c 100644
--- a/modules/video/src/videoplayer.cpp
+++ b/modules/video/src/videoplayer.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/video/src/videotileprovider.cpp b/modules/video/src/videotileprovider.cpp
index 8446be051a..8a53522c1a 100644
--- a/modules/video/src/videotileprovider.cpp
+++ b/modules/video/src/videotileprovider.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/video/videomodule.cpp b/modules/video/videomodule.cpp
index 9c67becbb1..cb914478c2 100644
--- a/modules/video/videomodule.cpp
+++ b/modules/video/videomodule.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/video/videomodule.h b/modules/video/videomodule.h
index 20d89290db..ec425df31f 100644
--- a/modules/video/videomodule.h
+++ b/modules/video/videomodule.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/vislab/rendering/renderabledistancelabel.cpp b/modules/vislab/rendering/renderabledistancelabel.cpp
index 76a04775b4..bb056ed192 100644
--- a/modules/vislab/rendering/renderabledistancelabel.cpp
+++ b/modules/vislab/rendering/renderabledistancelabel.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/vislab/rendering/renderabledistancelabel.h b/modules/vislab/rendering/renderabledistancelabel.h
index 1617960a14..14d611fbbf 100644
--- a/modules/vislab/rendering/renderabledistancelabel.h
+++ b/modules/vislab/rendering/renderabledistancelabel.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/vislab/vislabmodule.cpp b/modules/vislab/vislabmodule.cpp
index 4d3bd66b82..8be4a0716d 100644
--- a/modules/vislab/vislabmodule.cpp
+++ b/modules/vislab/vislabmodule.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/vislab/vislabmodule.h b/modules/vislab/vislabmodule.h
index 05fbdbdba0..0ece19b840 100644
--- a/modules/vislab/vislabmodule.h
+++ b/modules/vislab/vislabmodule.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/volume/envelope.cpp b/modules/volume/envelope.cpp
index 63f8b8aaf0..9b900c0bc1 100644
--- a/modules/volume/envelope.cpp
+++ b/modules/volume/envelope.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/volume/envelope.h b/modules/volume/envelope.h
index 72d134b1c8..ee31491667 100644
--- a/modules/volume/envelope.h
+++ b/modules/volume/envelope.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/volume/linearlrucache.h b/modules/volume/linearlrucache.h
index 099ed99227..42cae88998 100644
--- a/modules/volume/linearlrucache.h
+++ b/modules/volume/linearlrucache.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/volume/linearlrucache.inl b/modules/volume/linearlrucache.inl
index 130675eecf..39fac068af 100644
--- a/modules/volume/linearlrucache.inl
+++ b/modules/volume/linearlrucache.inl
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/volume/lrucache.h b/modules/volume/lrucache.h
index 6114e10c03..363d593b3b 100644
--- a/modules/volume/lrucache.h
+++ b/modules/volume/lrucache.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/volume/lrucache.inl b/modules/volume/lrucache.inl
index eea5cc0ec1..81d1d69798 100644
--- a/modules/volume/lrucache.inl
+++ b/modules/volume/lrucache.inl
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/volume/rawvolume.h b/modules/volume/rawvolume.h
index f8ed2ea521..b159a61cee 100644
--- a/modules/volume/rawvolume.h
+++ b/modules/volume/rawvolume.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/volume/rawvolume.inl b/modules/volume/rawvolume.inl
index 8c65d3eca1..8dca905d95 100644
--- a/modules/volume/rawvolume.inl
+++ b/modules/volume/rawvolume.inl
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/volume/rawvolumemetadata.cpp b/modules/volume/rawvolumemetadata.cpp
index ef396be506..e639b15f88 100644
--- a/modules/volume/rawvolumemetadata.cpp
+++ b/modules/volume/rawvolumemetadata.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/volume/rawvolumemetadata.h b/modules/volume/rawvolumemetadata.h
index 995f2705de..9d6218bfbe 100644
--- a/modules/volume/rawvolumemetadata.h
+++ b/modules/volume/rawvolumemetadata.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/volume/rawvolumereader.h b/modules/volume/rawvolumereader.h
index 3e5c899814..02911944bf 100644
--- a/modules/volume/rawvolumereader.h
+++ b/modules/volume/rawvolumereader.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/volume/rawvolumereader.inl b/modules/volume/rawvolumereader.inl
index ea534b112f..a392e43f80 100644
--- a/modules/volume/rawvolumereader.inl
+++ b/modules/volume/rawvolumereader.inl
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/volume/rawvolumewriter.h b/modules/volume/rawvolumewriter.h
index ddbf57a9b1..9d66a6c7c0 100644
--- a/modules/volume/rawvolumewriter.h
+++ b/modules/volume/rawvolumewriter.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/volume/rawvolumewriter.inl b/modules/volume/rawvolumewriter.inl
index 59320f6922..bb13a83897 100644
--- a/modules/volume/rawvolumewriter.inl
+++ b/modules/volume/rawvolumewriter.inl
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/volume/rendering/basicvolumeraycaster.cpp b/modules/volume/rendering/basicvolumeraycaster.cpp
index 90c2ec5260..9458b1c03d 100644
--- a/modules/volume/rendering/basicvolumeraycaster.cpp
+++ b/modules/volume/rendering/basicvolumeraycaster.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/volume/rendering/basicvolumeraycaster.h b/modules/volume/rendering/basicvolumeraycaster.h
index ddea4ae227..599e6757f7 100644
--- a/modules/volume/rendering/basicvolumeraycaster.h
+++ b/modules/volume/rendering/basicvolumeraycaster.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/volume/rendering/renderabletimevaryingvolume.cpp b/modules/volume/rendering/renderabletimevaryingvolume.cpp
index 21f04ae866..968677ac30 100644
--- a/modules/volume/rendering/renderabletimevaryingvolume.cpp
+++ b/modules/volume/rendering/renderabletimevaryingvolume.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/volume/rendering/renderabletimevaryingvolume.h b/modules/volume/rendering/renderabletimevaryingvolume.h
index 66e3cfaf99..1bb1567821 100644
--- a/modules/volume/rendering/renderabletimevaryingvolume.h
+++ b/modules/volume/rendering/renderabletimevaryingvolume.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/volume/rendering/volumeclipplane.cpp b/modules/volume/rendering/volumeclipplane.cpp
index 06f8938433..3f84fd7d3d 100644
--- a/modules/volume/rendering/volumeclipplane.cpp
+++ b/modules/volume/rendering/volumeclipplane.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/volume/rendering/volumeclipplane.h b/modules/volume/rendering/volumeclipplane.h
index 43213d7f57..da4c964c5f 100644
--- a/modules/volume/rendering/volumeclipplane.h
+++ b/modules/volume/rendering/volumeclipplane.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/volume/rendering/volumeclipplanes.cpp b/modules/volume/rendering/volumeclipplanes.cpp
index 94347e0706..201a638ed8 100644
--- a/modules/volume/rendering/volumeclipplanes.cpp
+++ b/modules/volume/rendering/volumeclipplanes.cpp
@@ -3,7 +3,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/volume/rendering/volumeclipplanes.h b/modules/volume/rendering/volumeclipplanes.h
index 8add71a805..bd7a3a12b0 100644
--- a/modules/volume/rendering/volumeclipplanes.h
+++ b/modules/volume/rendering/volumeclipplanes.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/volume/shaders/bounds_fs.glsl b/modules/volume/shaders/bounds_fs.glsl
index 4617578763..a762d77fa3 100644
--- a/modules/volume/shaders/bounds_fs.glsl
+++ b/modules/volume/shaders/bounds_fs.glsl
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/volume/shaders/bounds_vs.glsl b/modules/volume/shaders/bounds_vs.glsl
index cf93a6b7bb..c101c3b173 100644
--- a/modules/volume/shaders/bounds_vs.glsl
+++ b/modules/volume/shaders/bounds_vs.glsl
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/volume/shaders/helper.glsl b/modules/volume/shaders/helper.glsl
index 66801a2dae..6f06befed3 100644
--- a/modules/volume/shaders/helper.glsl
+++ b/modules/volume/shaders/helper.glsl
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/volume/shaders/raycast.glsl b/modules/volume/shaders/raycast.glsl
index c96252294f..4a1e046cf1 100644
--- a/modules/volume/shaders/raycast.glsl
+++ b/modules/volume/shaders/raycast.glsl
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/volume/tasks/generaterawvolumetask.cpp b/modules/volume/tasks/generaterawvolumetask.cpp
index f64032acdd..5978b7de58 100644
--- a/modules/volume/tasks/generaterawvolumetask.cpp
+++ b/modules/volume/tasks/generaterawvolumetask.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/volume/tasks/generaterawvolumetask.h b/modules/volume/tasks/generaterawvolumetask.h
index d99f2f2731..76337067e5 100644
--- a/modules/volume/tasks/generaterawvolumetask.h
+++ b/modules/volume/tasks/generaterawvolumetask.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/volume/textureslicevolumereader.h b/modules/volume/textureslicevolumereader.h
index 51a15c904f..bb0cbf4fd0 100644
--- a/modules/volume/textureslicevolumereader.h
+++ b/modules/volume/textureslicevolumereader.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/volume/textureslicevolumereader.inl b/modules/volume/textureslicevolumereader.inl
index bb2452be49..a82bcbca69 100644
--- a/modules/volume/textureslicevolumereader.inl
+++ b/modules/volume/textureslicevolumereader.inl
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/volume/transferfunction.cpp b/modules/volume/transferfunction.cpp
index e18973917d..8f5f0d9a5e 100644
--- a/modules/volume/transferfunction.cpp
+++ b/modules/volume/transferfunction.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/volume/transferfunction.h b/modules/volume/transferfunction.h
index 37000c25c1..396cab17f2 100644
--- a/modules/volume/transferfunction.h
+++ b/modules/volume/transferfunction.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/volume/transferfunctionhandler.cpp b/modules/volume/transferfunctionhandler.cpp
index 405a670c77..251211dc03 100644
--- a/modules/volume/transferfunctionhandler.cpp
+++ b/modules/volume/transferfunctionhandler.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/volume/transferfunctionhandler.h b/modules/volume/transferfunctionhandler.h
index 946c2b1905..cc6fa9341a 100644
--- a/modules/volume/transferfunctionhandler.h
+++ b/modules/volume/transferfunctionhandler.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/volume/transferfunctionproperty.cpp b/modules/volume/transferfunctionproperty.cpp
index fab076f252..af280c22da 100644
--- a/modules/volume/transferfunctionproperty.cpp
+++ b/modules/volume/transferfunctionproperty.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/volume/transferfunctionproperty.h b/modules/volume/transferfunctionproperty.h
index 5d01977219..6f44855544 100644
--- a/modules/volume/transferfunctionproperty.h
+++ b/modules/volume/transferfunctionproperty.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/volume/volumegridtype.cpp b/modules/volume/volumegridtype.cpp
index 3bfcf0cb2d..917ae65a39 100644
--- a/modules/volume/volumegridtype.cpp
+++ b/modules/volume/volumegridtype.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/volume/volumegridtype.h b/modules/volume/volumegridtype.h
index cdf5059196..f652bd92da 100644
--- a/modules/volume/volumegridtype.h
+++ b/modules/volume/volumegridtype.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/volume/volumemodule.cpp b/modules/volume/volumemodule.cpp
index 6b18b8e681..0e70a298c0 100644
--- a/modules/volume/volumemodule.cpp
+++ b/modules/volume/volumemodule.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/volume/volumemodule.h b/modules/volume/volumemodule.h
index 070c6d171e..6d6b188c95 100644
--- a/modules/volume/volumemodule.h
+++ b/modules/volume/volumemodule.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/volume/volumesampler.h b/modules/volume/volumesampler.h
index 789b044167..12f16437af 100644
--- a/modules/volume/volumesampler.h
+++ b/modules/volume/volumesampler.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/volume/volumesampler.inl b/modules/volume/volumesampler.inl
index c02bbd57a9..8d526e3f4d 100644
--- a/modules/volume/volumesampler.inl
+++ b/modules/volume/volumesampler.inl
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/volume/volumeutils.cpp b/modules/volume/volumeutils.cpp
index a98b898a01..143397a700 100644
--- a/modules/volume/volumeutils.cpp
+++ b/modules/volume/volumeutils.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/volume/volumeutils.h b/modules/volume/volumeutils.h
index 7aa8095631..85c44e2f01 100644
--- a/modules/volume/volumeutils.h
+++ b/modules/volume/volumeutils.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/webbrowser/include/browserclient.h b/modules/webbrowser/include/browserclient.h
index d8ac4862f4..07d1ba459b 100644
--- a/modules/webbrowser/include/browserclient.h
+++ b/modules/webbrowser/include/browserclient.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/webbrowser/include/browserinstance.h b/modules/webbrowser/include/browserinstance.h
index 9c15eaf6fe..0cb61eab11 100644
--- a/modules/webbrowser/include/browserinstance.h
+++ b/modules/webbrowser/include/browserinstance.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/webbrowser/include/cefhost.h b/modules/webbrowser/include/cefhost.h
index 01927abd4a..e42a0fee04 100644
--- a/modules/webbrowser/include/cefhost.h
+++ b/modules/webbrowser/include/cefhost.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/webbrowser/include/defaultbrowserlauncher.h b/modules/webbrowser/include/defaultbrowserlauncher.h
index af67ce27b2..86946a3f3f 100644
--- a/modules/webbrowser/include/defaultbrowserlauncher.h
+++ b/modules/webbrowser/include/defaultbrowserlauncher.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/webbrowser/include/eventhandler.h b/modules/webbrowser/include/eventhandler.h
index fdc904c038..959041dccf 100644
--- a/modules/webbrowser/include/eventhandler.h
+++ b/modules/webbrowser/include/eventhandler.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/webbrowser/include/screenspacebrowser.h b/modules/webbrowser/include/screenspacebrowser.h
index cafb114dc4..f78b5fbc93 100644
--- a/modules/webbrowser/include/screenspacebrowser.h
+++ b/modules/webbrowser/include/screenspacebrowser.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/webbrowser/include/webbrowserapp.h b/modules/webbrowser/include/webbrowserapp.h
index fca008cb68..e3c0ccd865 100644
--- a/modules/webbrowser/include/webbrowserapp.h
+++ b/modules/webbrowser/include/webbrowserapp.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/webbrowser/include/webkeyboardhandler.h b/modules/webbrowser/include/webkeyboardhandler.h
index c72a5f408b..a94aca00c5 100644
--- a/modules/webbrowser/include/webkeyboardhandler.h
+++ b/modules/webbrowser/include/webkeyboardhandler.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/webbrowser/include/webrenderhandler.h b/modules/webbrowser/include/webrenderhandler.h
index a53ace70ab..10e374e43d 100644
--- a/modules/webbrowser/include/webrenderhandler.h
+++ b/modules/webbrowser/include/webrenderhandler.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/webbrowser/shaders/screenspace_fs.glsl b/modules/webbrowser/shaders/screenspace_fs.glsl
index 6f6f0686cf..2ebc7c611c 100644
--- a/modules/webbrowser/shaders/screenspace_fs.glsl
+++ b/modules/webbrowser/shaders/screenspace_fs.glsl
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/webbrowser/shaders/screenspace_vs.glsl b/modules/webbrowser/shaders/screenspace_vs.glsl
index c39e263268..cc503adde3 100644
--- a/modules/webbrowser/shaders/screenspace_vs.glsl
+++ b/modules/webbrowser/shaders/screenspace_vs.glsl
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/webbrowser/src/browserclient.cpp b/modules/webbrowser/src/browserclient.cpp
index ffec9624b7..688a71a449 100644
--- a/modules/webbrowser/src/browserclient.cpp
+++ b/modules/webbrowser/src/browserclient.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/webbrowser/src/browserinstance.cpp b/modules/webbrowser/src/browserinstance.cpp
index 45e2d4575e..22e85fbb74 100644
--- a/modules/webbrowser/src/browserinstance.cpp
+++ b/modules/webbrowser/src/browserinstance.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/webbrowser/src/cefhost.cpp b/modules/webbrowser/src/cefhost.cpp
index 1d76f6b86e..94388eb388 100644
--- a/modules/webbrowser/src/cefhost.cpp
+++ b/modules/webbrowser/src/cefhost.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/webbrowser/src/defaultbrowserlauncher.cpp b/modules/webbrowser/src/defaultbrowserlauncher.cpp
index 5761a85b5c..c05f398b2d 100644
--- a/modules/webbrowser/src/defaultbrowserlauncher.cpp
+++ b/modules/webbrowser/src/defaultbrowserlauncher.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/webbrowser/src/eventhandler.cpp b/modules/webbrowser/src/eventhandler.cpp
index e6ca44a97e..c4bf4b4e88 100644
--- a/modules/webbrowser/src/eventhandler.cpp
+++ b/modules/webbrowser/src/eventhandler.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/webbrowser/src/processhelperlinux.cpp b/modules/webbrowser/src/processhelperlinux.cpp
index 69c5502dcd..fddd8356b6 100644
--- a/modules/webbrowser/src/processhelperlinux.cpp
+++ b/modules/webbrowser/src/processhelperlinux.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/webbrowser/src/processhelpermac.cpp b/modules/webbrowser/src/processhelpermac.cpp
index 405606549d..eecebe255e 100644
--- a/modules/webbrowser/src/processhelpermac.cpp
+++ b/modules/webbrowser/src/processhelpermac.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/webbrowser/src/processhelperwindows.cpp b/modules/webbrowser/src/processhelperwindows.cpp
index 1f9870487c..e5440661a5 100644
--- a/modules/webbrowser/src/processhelperwindows.cpp
+++ b/modules/webbrowser/src/processhelperwindows.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/webbrowser/src/screenspacebrowser.cpp b/modules/webbrowser/src/screenspacebrowser.cpp
index cf7d45fc78..a7aea56939 100644
--- a/modules/webbrowser/src/screenspacebrowser.cpp
+++ b/modules/webbrowser/src/screenspacebrowser.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/webbrowser/src/webbrowserapp.cpp b/modules/webbrowser/src/webbrowserapp.cpp
index 4d7f26298b..c4b09f8ed6 100644
--- a/modules/webbrowser/src/webbrowserapp.cpp
+++ b/modules/webbrowser/src/webbrowserapp.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/webbrowser/src/webkeyboardhandler.cpp b/modules/webbrowser/src/webkeyboardhandler.cpp
index fb290c451c..33e16fc0cf 100644
--- a/modules/webbrowser/src/webkeyboardhandler.cpp
+++ b/modules/webbrowser/src/webkeyboardhandler.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/webbrowser/src/webrenderhandler.cpp b/modules/webbrowser/src/webrenderhandler.cpp
index aec3354436..3780722976 100644
--- a/modules/webbrowser/src/webrenderhandler.cpp
+++ b/modules/webbrowser/src/webrenderhandler.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/webbrowser/webbrowsermodule.cpp b/modules/webbrowser/webbrowsermodule.cpp
index 2aeda1bd10..3a4675cbd3 100644
--- a/modules/webbrowser/webbrowsermodule.cpp
+++ b/modules/webbrowser/webbrowsermodule.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/webbrowser/webbrowsermodule.h b/modules/webbrowser/webbrowsermodule.h
index 2287f52a1a..d345ef74b5 100644
--- a/modules/webbrowser/webbrowsermodule.h
+++ b/modules/webbrowser/webbrowsermodule.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/webgui/webguimodule.cpp b/modules/webgui/webguimodule.cpp
index 26b9ab478e..26dc12233e 100644
--- a/modules/webgui/webguimodule.cpp
+++ b/modules/webgui/webguimodule.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/webgui/webguimodule.h b/modules/webgui/webguimodule.h
index 41c89f3ef8..c7972b8144 100644
--- a/modules/webgui/webguimodule.h
+++ b/modules/webgui/webguimodule.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/shaders/PowerScaling/powerScalingMath.hglsl b/shaders/PowerScaling/powerScalingMath.hglsl
index 24dde9f6d3..6e0cb05102 100644
--- a/shaders/PowerScaling/powerScalingMath.hglsl
+++ b/shaders/PowerScaling/powerScalingMath.hglsl
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/shaders/PowerScaling/powerScaling_fs.hglsl b/shaders/PowerScaling/powerScaling_fs.hglsl
index 5579299b4d..5ccb3b00a2 100644
--- a/shaders/PowerScaling/powerScaling_fs.hglsl
+++ b/shaders/PowerScaling/powerScaling_fs.hglsl
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/shaders/PowerScaling/powerScaling_vs.hglsl b/shaders/PowerScaling/powerScaling_vs.hglsl
index 45b0aacb43..588f1d731c 100644
--- a/shaders/PowerScaling/powerScaling_vs.hglsl
+++ b/shaders/PowerScaling/powerScaling_vs.hglsl
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/shaders/blending.glsl b/shaders/blending.glsl
index d658c1dd6c..c0c125ff20 100644
--- a/shaders/blending.glsl
+++ b/shaders/blending.glsl
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/shaders/core/xyzuvrgba_fs.glsl b/shaders/core/xyzuvrgba_fs.glsl
index 4347c6a354..ef21de0710 100644
--- a/shaders/core/xyzuvrgba_fs.glsl
+++ b/shaders/core/xyzuvrgba_fs.glsl
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/shaders/core/xyzuvrgba_vs.glsl b/shaders/core/xyzuvrgba_vs.glsl
index d28938f9ab..88ebf1b190 100644
--- a/shaders/core/xyzuvrgba_vs.glsl
+++ b/shaders/core/xyzuvrgba_vs.glsl
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/shaders/floatoperations.glsl b/shaders/floatoperations.glsl
index 722dd135a7..94ccb7eebb 100644
--- a/shaders/floatoperations.glsl
+++ b/shaders/floatoperations.glsl
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/shaders/fragment.glsl b/shaders/fragment.glsl
index 5a645658f6..896a63f71e 100644
--- a/shaders/fragment.glsl
+++ b/shaders/fragment.glsl
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/shaders/framebuffer/exitframebuffer.frag b/shaders/framebuffer/exitframebuffer.frag
index 5d9189c5ab..b17c921aa9 100644
--- a/shaders/framebuffer/exitframebuffer.frag
+++ b/shaders/framebuffer/exitframebuffer.frag
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/shaders/framebuffer/fxaa.frag b/shaders/framebuffer/fxaa.frag
index 06f85a6d84..563ada1a87 100644
--- a/shaders/framebuffer/fxaa.frag
+++ b/shaders/framebuffer/fxaa.frag
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/shaders/framebuffer/fxaa.vert b/shaders/framebuffer/fxaa.vert
index 07d09a5c7c..bd6e872fe8 100644
--- a/shaders/framebuffer/fxaa.vert
+++ b/shaders/framebuffer/fxaa.vert
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/shaders/framebuffer/hdrAndFiltering.frag b/shaders/framebuffer/hdrAndFiltering.frag
index b25214c26d..5d57ecb20e 100644
--- a/shaders/framebuffer/hdrAndFiltering.frag
+++ b/shaders/framebuffer/hdrAndFiltering.frag
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/shaders/framebuffer/hdrAndFiltering.vert b/shaders/framebuffer/hdrAndFiltering.vert
index 07d09a5c7c..bd6e872fe8 100644
--- a/shaders/framebuffer/hdrAndFiltering.vert
+++ b/shaders/framebuffer/hdrAndFiltering.vert
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/shaders/framebuffer/inside.glsl b/shaders/framebuffer/inside.glsl
index 4737ad6e0c..2bf6b16f2f 100644
--- a/shaders/framebuffer/inside.glsl
+++ b/shaders/framebuffer/inside.glsl
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/shaders/framebuffer/mergeDownscaledVolume.frag b/shaders/framebuffer/mergeDownscaledVolume.frag
index 6ae80a3910..3ec1485b0b 100644
--- a/shaders/framebuffer/mergeDownscaledVolume.frag
+++ b/shaders/framebuffer/mergeDownscaledVolume.frag
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/shaders/framebuffer/mergeDownscaledVolume.vert b/shaders/framebuffer/mergeDownscaledVolume.vert
index 07d09a5c7c..bd6e872fe8 100644
--- a/shaders/framebuffer/mergeDownscaledVolume.vert
+++ b/shaders/framebuffer/mergeDownscaledVolume.vert
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/shaders/framebuffer/nOneStripMSAA.frag b/shaders/framebuffer/nOneStripMSAA.frag
index a71de476f0..c550d8665e 100644
--- a/shaders/framebuffer/nOneStripMSAA.frag
+++ b/shaders/framebuffer/nOneStripMSAA.frag
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/shaders/framebuffer/nOneStripMSAA.vert b/shaders/framebuffer/nOneStripMSAA.vert
index 4eceddb098..2c8b434092 100644
--- a/shaders/framebuffer/nOneStripMSAA.vert
+++ b/shaders/framebuffer/nOneStripMSAA.vert
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/shaders/framebuffer/outside.glsl b/shaders/framebuffer/outside.glsl
index ba6a73916e..aa66ae5878 100644
--- a/shaders/framebuffer/outside.glsl
+++ b/shaders/framebuffer/outside.glsl
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/shaders/framebuffer/raycastframebuffer.frag b/shaders/framebuffer/raycastframebuffer.frag
index da1f4c00db..36f2263439 100644
--- a/shaders/framebuffer/raycastframebuffer.frag
+++ b/shaders/framebuffer/raycastframebuffer.frag
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/shaders/framebuffer/renderframebuffer.frag b/shaders/framebuffer/renderframebuffer.frag
index bf7f209a82..4cecf335d4 100644
--- a/shaders/framebuffer/renderframebuffer.frag
+++ b/shaders/framebuffer/renderframebuffer.frag
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/shaders/framebuffer/resolveframebuffer.vert b/shaders/framebuffer/resolveframebuffer.vert
index e886074f95..c7e5f3fc1a 100644
--- a/shaders/framebuffer/resolveframebuffer.vert
+++ b/shaders/framebuffer/resolveframebuffer.vert
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/shaders/hdr.glsl b/shaders/hdr.glsl
index 99d95252ad..57eab0180e 100644
--- a/shaders/hdr.glsl
+++ b/shaders/hdr.glsl
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/shaders/rand.glsl b/shaders/rand.glsl
index bdf2980e74..549ed8fb18 100644
--- a/shaders/rand.glsl
+++ b/shaders/rand.glsl
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/src/camera/camera.cpp b/src/camera/camera.cpp
index 4303b83e77..95a3b46744 100644
--- a/src/camera/camera.cpp
+++ b/src/camera/camera.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/src/data/csvloader.cpp b/src/data/csvloader.cpp
index e498c5d246..9bf8f3cfbc 100644
--- a/src/data/csvloader.cpp
+++ b/src/data/csvloader.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/src/data/dataloader.cpp b/src/data/dataloader.cpp
index 7c2aa4a8d6..6926df0853 100644
--- a/src/data/dataloader.cpp
+++ b/src/data/dataloader.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/src/data/datamapping.cpp b/src/data/datamapping.cpp
index 463be7d747..24c60a1877 100644
--- a/src/data/datamapping.cpp
+++ b/src/data/datamapping.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/src/data/speckloader.cpp b/src/data/speckloader.cpp
index d71a349ee1..dbe254135c 100644
--- a/src/data/speckloader.cpp
+++ b/src/data/speckloader.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/src/documentation/core_registration.cpp b/src/documentation/core_registration.cpp
index e1c9f03438..c06b267191 100644
--- a/src/documentation/core_registration.cpp
+++ b/src/documentation/core_registration.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/src/documentation/documentation.cpp b/src/documentation/documentation.cpp
index 9918bb4044..0c43cc0128 100644
--- a/src/documentation/documentation.cpp
+++ b/src/documentation/documentation.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/src/documentation/documentationengine.cpp b/src/documentation/documentationengine.cpp
index 1a0f2f0c8d..73e3df7788 100644
--- a/src/documentation/documentationengine.cpp
+++ b/src/documentation/documentationengine.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/src/documentation/documentationgenerator.cpp b/src/documentation/documentationgenerator.cpp
index 9b2bca2af2..ea186f1ee2 100644
--- a/src/documentation/documentationgenerator.cpp
+++ b/src/documentation/documentationgenerator.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/src/documentation/verifier.cpp b/src/documentation/verifier.cpp
index 1bb3580355..671628954b 100644
--- a/src/documentation/verifier.cpp
+++ b/src/documentation/verifier.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/src/engine/configuration.cpp b/src/engine/configuration.cpp
index 56470ef0e9..b18fe245dd 100644
--- a/src/engine/configuration.cpp
+++ b/src/engine/configuration.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/src/engine/downloadmanager.cpp b/src/engine/downloadmanager.cpp
index 7c05e3cb07..199688c40f 100644
--- a/src/engine/downloadmanager.cpp
+++ b/src/engine/downloadmanager.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/src/engine/globals.cpp b/src/engine/globals.cpp
index 047fd8a6a5..70874bec4d 100644
--- a/src/engine/globals.cpp
+++ b/src/engine/globals.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/src/engine/globalscallbacks.cpp b/src/engine/globalscallbacks.cpp
index 076dfef258..594efb1235 100644
--- a/src/engine/globalscallbacks.cpp
+++ b/src/engine/globalscallbacks.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/src/engine/logfactory.cpp b/src/engine/logfactory.cpp
index d4a7332a06..cb163c1456 100644
--- a/src/engine/logfactory.cpp
+++ b/src/engine/logfactory.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/src/engine/moduleengine.cpp b/src/engine/moduleengine.cpp
index f3190a224a..4cf8da503c 100644
--- a/src/engine/moduleengine.cpp
+++ b/src/engine/moduleengine.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/src/engine/moduleengine_lua.inl b/src/engine/moduleengine_lua.inl
index 196c8116b3..bd2ceee872 100644
--- a/src/engine/moduleengine_lua.inl
+++ b/src/engine/moduleengine_lua.inl
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/src/engine/openspaceengine.cpp b/src/engine/openspaceengine.cpp
index e35182e084..e343909766 100644
--- a/src/engine/openspaceengine.cpp
+++ b/src/engine/openspaceengine.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/src/engine/openspaceengine_lua.inl b/src/engine/openspaceengine_lua.inl
index 8bf6c7be75..3e310294b4 100644
--- a/src/engine/openspaceengine_lua.inl
+++ b/src/engine/openspaceengine_lua.inl
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/src/engine/settings.cpp b/src/engine/settings.cpp
index 3eb054b262..90feb2bf1f 100644
--- a/src/engine/settings.cpp
+++ b/src/engine/settings.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/src/engine/syncengine.cpp b/src/engine/syncengine.cpp
index 5815645218..dce531c641 100644
--- a/src/engine/syncengine.cpp
+++ b/src/engine/syncengine.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/src/events/event.cpp b/src/events/event.cpp
index 87aeaf57d0..b6cdf174b6 100644
--- a/src/events/event.cpp
+++ b/src/events/event.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/src/events/eventengine.cpp b/src/events/eventengine.cpp
index 776d365b09..4a5ea3589f 100644
--- a/src/events/eventengine.cpp
+++ b/src/events/eventengine.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/src/events/eventengine_lua.inl b/src/events/eventengine_lua.inl
index 9dfd2f68e9..7aef222b9b 100644
--- a/src/events/eventengine_lua.inl
+++ b/src/events/eventengine_lua.inl
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/src/interaction/actionmanager.cpp b/src/interaction/actionmanager.cpp
index 3a20f481f9..608ce69005 100644
--- a/src/interaction/actionmanager.cpp
+++ b/src/interaction/actionmanager.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/src/interaction/actionmanager_lua.inl b/src/interaction/actionmanager_lua.inl
index 1c7bede99e..f07d82b63a 100644
--- a/src/interaction/actionmanager_lua.inl
+++ b/src/interaction/actionmanager_lua.inl
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/src/interaction/camerainteractionstates.cpp b/src/interaction/camerainteractionstates.cpp
index e55a2b45e6..428d07a6d8 100644
--- a/src/interaction/camerainteractionstates.cpp
+++ b/src/interaction/camerainteractionstates.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/src/interaction/interactionmonitor.cpp b/src/interaction/interactionmonitor.cpp
index 5410714cfb..fe83a4a684 100644
--- a/src/interaction/interactionmonitor.cpp
+++ b/src/interaction/interactionmonitor.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/src/interaction/joystickcamerastates.cpp b/src/interaction/joystickcamerastates.cpp
index e5bb3c1be3..002e8f45ad 100644
--- a/src/interaction/joystickcamerastates.cpp
+++ b/src/interaction/joystickcamerastates.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/src/interaction/joystickinputstate.cpp b/src/interaction/joystickinputstate.cpp
index 2aa1c44f33..d904f0201d 100644
--- a/src/interaction/joystickinputstate.cpp
+++ b/src/interaction/joystickinputstate.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/src/interaction/keybindingmanager.cpp b/src/interaction/keybindingmanager.cpp
index 46d3663a76..bc438be44b 100644
--- a/src/interaction/keybindingmanager.cpp
+++ b/src/interaction/keybindingmanager.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/src/interaction/keybindingmanager_lua.inl b/src/interaction/keybindingmanager_lua.inl
index 054482e090..6343059530 100644
--- a/src/interaction/keybindingmanager_lua.inl
+++ b/src/interaction/keybindingmanager_lua.inl
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/src/interaction/keyboardinputstate.cpp b/src/interaction/keyboardinputstate.cpp
index b9fdb7b11e..48fb647e36 100644
--- a/src/interaction/keyboardinputstate.cpp
+++ b/src/interaction/keyboardinputstate.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/src/interaction/mousecamerastates.cpp b/src/interaction/mousecamerastates.cpp
index 3d8be3a6cb..8b2121efcc 100644
--- a/src/interaction/mousecamerastates.cpp
+++ b/src/interaction/mousecamerastates.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/src/interaction/mouseinputstate.cpp b/src/interaction/mouseinputstate.cpp
index 9f4c25d07d..0ae6b78911 100644
--- a/src/interaction/mouseinputstate.cpp
+++ b/src/interaction/mouseinputstate.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/src/interaction/scriptcamerastates.cpp b/src/interaction/scriptcamerastates.cpp
index e27a18b9f9..b6b8e7ec81 100644
--- a/src/interaction/scriptcamerastates.cpp
+++ b/src/interaction/scriptcamerastates.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/src/interaction/sessionrecording.cpp b/src/interaction/sessionrecording.cpp
index 9d27f2f7a2..cce0561c76 100644
--- a/src/interaction/sessionrecording.cpp
+++ b/src/interaction/sessionrecording.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/src/interaction/sessionrecording_lua.inl b/src/interaction/sessionrecording_lua.inl
index d82d6e24e4..6b76b6cf49 100644
--- a/src/interaction/sessionrecording_lua.inl
+++ b/src/interaction/sessionrecording_lua.inl
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/src/interaction/tasks/convertrecfileversiontask.cpp b/src/interaction/tasks/convertrecfileversiontask.cpp
index 717f4d8053..0ecf27d203 100644
--- a/src/interaction/tasks/convertrecfileversiontask.cpp
+++ b/src/interaction/tasks/convertrecfileversiontask.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/src/interaction/tasks/convertrecformattask.cpp b/src/interaction/tasks/convertrecformattask.cpp
index 3e4f998483..b5a95c70a9 100644
--- a/src/interaction/tasks/convertrecformattask.cpp
+++ b/src/interaction/tasks/convertrecformattask.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/src/interaction/touchbar.mm b/src/interaction/touchbar.mm
index fe59e2ed5d..d96f89837f 100644
--- a/src/interaction/touchbar.mm
+++ b/src/interaction/touchbar.mm
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/src/interaction/websocketcamerastates.cpp b/src/interaction/websocketcamerastates.cpp
index 5315b104da..bfa13e316d 100644
--- a/src/interaction/websocketcamerastates.cpp
+++ b/src/interaction/websocketcamerastates.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/src/interaction/websocketinputstate.cpp b/src/interaction/websocketinputstate.cpp
index 58e1670457..ea07a518ee 100644
--- a/src/interaction/websocketinputstate.cpp
+++ b/src/interaction/websocketinputstate.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/src/mission/mission.cpp b/src/mission/mission.cpp
index 841a4cc667..ab98243f04 100644
--- a/src/mission/mission.cpp
+++ b/src/mission/mission.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/src/mission/missionmanager.cpp b/src/mission/missionmanager.cpp
index 95c86e0db9..7ff5e0d3e7 100644
--- a/src/mission/missionmanager.cpp
+++ b/src/mission/missionmanager.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/src/mission/missionmanager_lua.inl b/src/mission/missionmanager_lua.inl
index 2572d62715..3f31ff869f 100644
--- a/src/mission/missionmanager_lua.inl
+++ b/src/mission/missionmanager_lua.inl
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/src/navigation/keyframenavigator.cpp b/src/navigation/keyframenavigator.cpp
index d6234a2708..5f71578f6b 100644
--- a/src/navigation/keyframenavigator.cpp
+++ b/src/navigation/keyframenavigator.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/src/navigation/navigationhandler.cpp b/src/navigation/navigationhandler.cpp
index 5e53fe519f..192c76ce87 100644
--- a/src/navigation/navigationhandler.cpp
+++ b/src/navigation/navigationhandler.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/src/navigation/navigationhandler_lua.inl b/src/navigation/navigationhandler_lua.inl
index 983c51c089..52b5276d3c 100644
--- a/src/navigation/navigationhandler_lua.inl
+++ b/src/navigation/navigationhandler_lua.inl
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/src/navigation/navigationstate.cpp b/src/navigation/navigationstate.cpp
index b995b9ebf9..68f956d2de 100644
--- a/src/navigation/navigationstate.cpp
+++ b/src/navigation/navigationstate.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/src/navigation/orbitalnavigator.cpp b/src/navigation/orbitalnavigator.cpp
index b2f4b72c2a..ca5bfd8a21 100644
--- a/src/navigation/orbitalnavigator.cpp
+++ b/src/navigation/orbitalnavigator.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/src/navigation/orbitalnavigator_lua.inl b/src/navigation/orbitalnavigator_lua.inl
index 3dc95a7146..363b3c091e 100644
--- a/src/navigation/orbitalnavigator_lua.inl
+++ b/src/navigation/orbitalnavigator_lua.inl
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/src/navigation/path.cpp b/src/navigation/path.cpp
index 8b827009b6..a2bb04cce1 100644
--- a/src/navigation/path.cpp
+++ b/src/navigation/path.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/src/navigation/pathcurve.cpp b/src/navigation/pathcurve.cpp
index de03d8e27b..de9af43d31 100644
--- a/src/navigation/pathcurve.cpp
+++ b/src/navigation/pathcurve.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/src/navigation/pathcurves/avoidcollisioncurve.cpp b/src/navigation/pathcurves/avoidcollisioncurve.cpp
index 60b240259b..9070cc94e5 100644
--- a/src/navigation/pathcurves/avoidcollisioncurve.cpp
+++ b/src/navigation/pathcurves/avoidcollisioncurve.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/src/navigation/pathcurves/zoomoutoverviewcurve.cpp b/src/navigation/pathcurves/zoomoutoverviewcurve.cpp
index 11905b990e..36367c7224 100644
--- a/src/navigation/pathcurves/zoomoutoverviewcurve.cpp
+++ b/src/navigation/pathcurves/zoomoutoverviewcurve.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/src/navigation/pathnavigator.cpp b/src/navigation/pathnavigator.cpp
index f7d4eae85f..3b1daed7ce 100644
--- a/src/navigation/pathnavigator.cpp
+++ b/src/navigation/pathnavigator.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/src/navigation/pathnavigator_lua.inl b/src/navigation/pathnavigator_lua.inl
index 989d07fbb1..97d8999681 100644
--- a/src/navigation/pathnavigator_lua.inl
+++ b/src/navigation/pathnavigator_lua.inl
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/src/navigation/waypoint.cpp b/src/navigation/waypoint.cpp
index 1b0f929a62..c4722c44ad 100644
--- a/src/navigation/waypoint.cpp
+++ b/src/navigation/waypoint.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/src/network/messagestructureshelper.cpp b/src/network/messagestructureshelper.cpp
index 42666b2f13..28367240cd 100644
--- a/src/network/messagestructureshelper.cpp
+++ b/src/network/messagestructureshelper.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/src/network/parallelconnection.cpp b/src/network/parallelconnection.cpp
index 731bdf34cc..a2729d1f08 100644
--- a/src/network/parallelconnection.cpp
+++ b/src/network/parallelconnection.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/src/network/parallelpeer.cpp b/src/network/parallelpeer.cpp
index 5f5e5727ba..d0c4bafa63 100644
--- a/src/network/parallelpeer.cpp
+++ b/src/network/parallelpeer.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/src/network/parallelpeer_lua.inl b/src/network/parallelpeer_lua.inl
index a081507b40..103758ecd7 100644
--- a/src/network/parallelpeer_lua.inl
+++ b/src/network/parallelpeer_lua.inl
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/src/openspace.cpp b/src/openspace.cpp
index 3340b0c90c..e419372c6c 100644
--- a/src/openspace.cpp
+++ b/src/openspace.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
@@ -29,7 +29,7 @@ namespace openspace {
 std::string licenseText() {
     return "OpenSpace\n\
 \n\
-Copyright (c) 2014-2023\n\
+Copyright (c) 2014-2024\n\
 \n\
 Permission is hereby granted, free of charge, to any person obtaining a copy of this\n\
 software and associated documentation files (the \"Software\"), to deal in the Software\n\
diff --git a/src/properties/list/doublelistproperty.cpp b/src/properties/list/doublelistproperty.cpp
index f0e74faca6..f7918f0afc 100644
--- a/src/properties/list/doublelistproperty.cpp
+++ b/src/properties/list/doublelistproperty.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/src/properties/list/intlistproperty.cpp b/src/properties/list/intlistproperty.cpp
index 57a85ab51b..04b30da344 100644
--- a/src/properties/list/intlistproperty.cpp
+++ b/src/properties/list/intlistproperty.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/src/properties/list/stringlistproperty.cpp b/src/properties/list/stringlistproperty.cpp
index 99192273a4..8f1458f063 100644
--- a/src/properties/list/stringlistproperty.cpp
+++ b/src/properties/list/stringlistproperty.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/src/properties/matrix/dmat2property.cpp b/src/properties/matrix/dmat2property.cpp
index fc9425516b..de9dd9cc90 100644
--- a/src/properties/matrix/dmat2property.cpp
+++ b/src/properties/matrix/dmat2property.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/src/properties/matrix/dmat3property.cpp b/src/properties/matrix/dmat3property.cpp
index 74de77b43e..51c6f1b2e5 100644
--- a/src/properties/matrix/dmat3property.cpp
+++ b/src/properties/matrix/dmat3property.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/src/properties/matrix/dmat4property.cpp b/src/properties/matrix/dmat4property.cpp
index 1c645f70bf..c4ec3b2761 100644
--- a/src/properties/matrix/dmat4property.cpp
+++ b/src/properties/matrix/dmat4property.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/src/properties/matrix/mat2property.cpp b/src/properties/matrix/mat2property.cpp
index ad27ed35a9..a345b46f71 100644
--- a/src/properties/matrix/mat2property.cpp
+++ b/src/properties/matrix/mat2property.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/src/properties/matrix/mat3property.cpp b/src/properties/matrix/mat3property.cpp
index a352aeaa99..c7559d94fa 100644
--- a/src/properties/matrix/mat3property.cpp
+++ b/src/properties/matrix/mat3property.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/src/properties/matrix/mat4property.cpp b/src/properties/matrix/mat4property.cpp
index 57250251ef..816d0e098a 100644
--- a/src/properties/matrix/mat4property.cpp
+++ b/src/properties/matrix/mat4property.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/src/properties/optionproperty.cpp b/src/properties/optionproperty.cpp
index ba0a38e95b..66c771a8c3 100644
--- a/src/properties/optionproperty.cpp
+++ b/src/properties/optionproperty.cpp
@@ -3,7 +3,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/src/properties/property.cpp b/src/properties/property.cpp
index b60276e0d9..5acbb31a70 100644
--- a/src/properties/property.cpp
+++ b/src/properties/property.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/src/properties/propertyowner.cpp b/src/properties/propertyowner.cpp
index 43ee2da0ad..6478b7ec11 100644
--- a/src/properties/propertyowner.cpp
+++ b/src/properties/propertyowner.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/src/properties/scalar/boolproperty.cpp b/src/properties/scalar/boolproperty.cpp
index 60b79ce133..067afddb9d 100644
--- a/src/properties/scalar/boolproperty.cpp
+++ b/src/properties/scalar/boolproperty.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/src/properties/scalar/doubleproperty.cpp b/src/properties/scalar/doubleproperty.cpp
index 1ce8615e34..8d6f27ed4a 100644
--- a/src/properties/scalar/doubleproperty.cpp
+++ b/src/properties/scalar/doubleproperty.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/src/properties/scalar/floatproperty.cpp b/src/properties/scalar/floatproperty.cpp
index 46a64c2324..3f30b13252 100644
--- a/src/properties/scalar/floatproperty.cpp
+++ b/src/properties/scalar/floatproperty.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/src/properties/scalar/intproperty.cpp b/src/properties/scalar/intproperty.cpp
index ca6729ecad..9f40b17364 100644
--- a/src/properties/scalar/intproperty.cpp
+++ b/src/properties/scalar/intproperty.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/src/properties/scalar/longproperty.cpp b/src/properties/scalar/longproperty.cpp
index a9ede12fa8..4b108b6c51 100644
--- a/src/properties/scalar/longproperty.cpp
+++ b/src/properties/scalar/longproperty.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/src/properties/scalar/shortproperty.cpp b/src/properties/scalar/shortproperty.cpp
index 5eacfe2f88..644b3821fd 100644
--- a/src/properties/scalar/shortproperty.cpp
+++ b/src/properties/scalar/shortproperty.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/src/properties/scalar/uintproperty.cpp b/src/properties/scalar/uintproperty.cpp
index dbcb5b7403..e46c829520 100644
--- a/src/properties/scalar/uintproperty.cpp
+++ b/src/properties/scalar/uintproperty.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/src/properties/scalar/ulongproperty.cpp b/src/properties/scalar/ulongproperty.cpp
index 2db4c589ee..70ecbf8004 100644
--- a/src/properties/scalar/ulongproperty.cpp
+++ b/src/properties/scalar/ulongproperty.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/src/properties/scalar/ushortproperty.cpp b/src/properties/scalar/ushortproperty.cpp
index a61e3dba20..a66e2c249f 100644
--- a/src/properties/scalar/ushortproperty.cpp
+++ b/src/properties/scalar/ushortproperty.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/src/properties/selectionproperty.cpp b/src/properties/selectionproperty.cpp
index be82af68b5..982d8b107f 100644
--- a/src/properties/selectionproperty.cpp
+++ b/src/properties/selectionproperty.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/src/properties/stringproperty.cpp b/src/properties/stringproperty.cpp
index 73699280d2..5f114bbce7 100644
--- a/src/properties/stringproperty.cpp
+++ b/src/properties/stringproperty.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/src/properties/triggerproperty.cpp b/src/properties/triggerproperty.cpp
index f2c738b352..53898659e2 100644
--- a/src/properties/triggerproperty.cpp
+++ b/src/properties/triggerproperty.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/src/properties/vector/dvec2property.cpp b/src/properties/vector/dvec2property.cpp
index 5b894193b2..1de60dbae6 100644
--- a/src/properties/vector/dvec2property.cpp
+++ b/src/properties/vector/dvec2property.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/src/properties/vector/dvec3property.cpp b/src/properties/vector/dvec3property.cpp
index 3565090d5d..5136a7fd75 100644
--- a/src/properties/vector/dvec3property.cpp
+++ b/src/properties/vector/dvec3property.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/src/properties/vector/dvec4property.cpp b/src/properties/vector/dvec4property.cpp
index 206cdcdf37..c6982348ed 100644
--- a/src/properties/vector/dvec4property.cpp
+++ b/src/properties/vector/dvec4property.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/src/properties/vector/ivec2property.cpp b/src/properties/vector/ivec2property.cpp
index 831f47bd8b..c669ba2001 100644
--- a/src/properties/vector/ivec2property.cpp
+++ b/src/properties/vector/ivec2property.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/src/properties/vector/ivec3property.cpp b/src/properties/vector/ivec3property.cpp
index 1693ab1bb2..b970a8dd66 100644
--- a/src/properties/vector/ivec3property.cpp
+++ b/src/properties/vector/ivec3property.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/src/properties/vector/ivec4property.cpp b/src/properties/vector/ivec4property.cpp
index 66ff4fb49f..5d4d4a7bed 100644
--- a/src/properties/vector/ivec4property.cpp
+++ b/src/properties/vector/ivec4property.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/src/properties/vector/uvec2property.cpp b/src/properties/vector/uvec2property.cpp
index 99d99c36ba..c52b706f4b 100644
--- a/src/properties/vector/uvec2property.cpp
+++ b/src/properties/vector/uvec2property.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/src/properties/vector/uvec3property.cpp b/src/properties/vector/uvec3property.cpp
index 9bf2f2b7a7..c38da33649 100644
--- a/src/properties/vector/uvec3property.cpp
+++ b/src/properties/vector/uvec3property.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/src/properties/vector/uvec4property.cpp b/src/properties/vector/uvec4property.cpp
index ab770ede00..7e49b3ce37 100644
--- a/src/properties/vector/uvec4property.cpp
+++ b/src/properties/vector/uvec4property.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/src/properties/vector/vec2property.cpp b/src/properties/vector/vec2property.cpp
index f13a4a8fa9..1a3aecb2c0 100644
--- a/src/properties/vector/vec2property.cpp
+++ b/src/properties/vector/vec2property.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/src/properties/vector/vec3property.cpp b/src/properties/vector/vec3property.cpp
index 7da51eaef7..9b8af65205 100644
--- a/src/properties/vector/vec3property.cpp
+++ b/src/properties/vector/vec3property.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/src/properties/vector/vec4property.cpp b/src/properties/vector/vec4property.cpp
index a6f5c0a8b7..de149aa6bf 100644
--- a/src/properties/vector/vec4property.cpp
+++ b/src/properties/vector/vec4property.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/src/query/query.cpp b/src/query/query.cpp
index 4b9cdafb1d..c932accdb5 100644
--- a/src/query/query.cpp
+++ b/src/query/query.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/src/rendering/colormappingcomponent.cpp b/src/rendering/colormappingcomponent.cpp
index f6aab11a98..f82d732da4 100644
--- a/src/rendering/colormappingcomponent.cpp
+++ b/src/rendering/colormappingcomponent.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/src/rendering/dashboard.cpp b/src/rendering/dashboard.cpp
index d3ad44420c..9e27eef04f 100644
--- a/src/rendering/dashboard.cpp
+++ b/src/rendering/dashboard.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/src/rendering/dashboard_lua.inl b/src/rendering/dashboard_lua.inl
index ef148fbb58..0cc98277cb 100644
--- a/src/rendering/dashboard_lua.inl
+++ b/src/rendering/dashboard_lua.inl
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/src/rendering/dashboarditem.cpp b/src/rendering/dashboarditem.cpp
index a187389be7..2fce1a640f 100644
--- a/src/rendering/dashboarditem.cpp
+++ b/src/rendering/dashboarditem.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/src/rendering/dashboardtextitem.cpp b/src/rendering/dashboardtextitem.cpp
index a423e841c5..b9b0c12acb 100644
--- a/src/rendering/dashboardtextitem.cpp
+++ b/src/rendering/dashboardtextitem.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/src/rendering/deferredcastermanager.cpp b/src/rendering/deferredcastermanager.cpp
index 70d57f7d36..d50b5b79f9 100644
--- a/src/rendering/deferredcastermanager.cpp
+++ b/src/rendering/deferredcastermanager.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/src/rendering/fadeable.cpp b/src/rendering/fadeable.cpp
index 5b4280344b..9dd00f3242 100644
--- a/src/rendering/fadeable.cpp
+++ b/src/rendering/fadeable.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/src/rendering/framebufferrenderer.cpp b/src/rendering/framebufferrenderer.cpp
index d2fbfd3ffa..45e5e9d12c 100644
--- a/src/rendering/framebufferrenderer.cpp
+++ b/src/rendering/framebufferrenderer.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/src/rendering/helper.cpp b/src/rendering/helper.cpp
index 28d9080b50..3409c9ffb2 100644
--- a/src/rendering/helper.cpp
+++ b/src/rendering/helper.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/src/rendering/labelscomponent.cpp b/src/rendering/labelscomponent.cpp
index 25ad45e7e5..8e6fe2b92c 100644
--- a/src/rendering/labelscomponent.cpp
+++ b/src/rendering/labelscomponent.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/src/rendering/loadingscreen.cpp b/src/rendering/loadingscreen.cpp
index 9c20088155..09c66e63f6 100644
--- a/src/rendering/loadingscreen.cpp
+++ b/src/rendering/loadingscreen.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/src/rendering/luaconsole.cpp b/src/rendering/luaconsole.cpp
index 5bc9ecbb66..3f3dd2e469 100644
--- a/src/rendering/luaconsole.cpp
+++ b/src/rendering/luaconsole.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/src/rendering/raycastermanager.cpp b/src/rendering/raycastermanager.cpp
index 738679b951..e178eaa2db 100644
--- a/src/rendering/raycastermanager.cpp
+++ b/src/rendering/raycastermanager.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/src/rendering/renderable.cpp b/src/rendering/renderable.cpp
index ec30219e37..d40ffeb414 100644
--- a/src/rendering/renderable.cpp
+++ b/src/rendering/renderable.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/src/rendering/renderengine.cpp b/src/rendering/renderengine.cpp
index a7d50bb032..644292f962 100644
--- a/src/rendering/renderengine.cpp
+++ b/src/rendering/renderengine.cpp
@@ -3,7 +3,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/src/rendering/renderengine_lua.inl b/src/rendering/renderengine_lua.inl
index f7b474aea3..2e9b8e4a98 100644
--- a/src/rendering/renderengine_lua.inl
+++ b/src/rendering/renderengine_lua.inl
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/src/rendering/screenspacerenderable.cpp b/src/rendering/screenspacerenderable.cpp
index e228ad989a..11c55fb8d1 100644
--- a/src/rendering/screenspacerenderable.cpp
+++ b/src/rendering/screenspacerenderable.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/src/rendering/texturecomponent.cpp b/src/rendering/texturecomponent.cpp
index 61432631b3..f66337a530 100644
--- a/src/rendering/texturecomponent.cpp
+++ b/src/rendering/texturecomponent.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/src/rendering/transferfunction.cpp b/src/rendering/transferfunction.cpp
index 47ce67062f..5d663e9c80 100644
--- a/src/rendering/transferfunction.cpp
+++ b/src/rendering/transferfunction.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/src/rendering/volumeraycaster.cpp b/src/rendering/volumeraycaster.cpp
index b84695586e..eaba0dcc91 100644
--- a/src/rendering/volumeraycaster.cpp
+++ b/src/rendering/volumeraycaster.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/src/scene/asset.cpp b/src/scene/asset.cpp
index 77a455f474..15c34bdfff 100644
--- a/src/scene/asset.cpp
+++ b/src/scene/asset.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/src/scene/assetmanager.cpp b/src/scene/assetmanager.cpp
index ef666ebe85..a3b5086956 100644
--- a/src/scene/assetmanager.cpp
+++ b/src/scene/assetmanager.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/src/scene/assetmanager_lua.inl b/src/scene/assetmanager_lua.inl
index d3a7e181ca..5c3a7f0a84 100644
--- a/src/scene/assetmanager_lua.inl
+++ b/src/scene/assetmanager_lua.inl
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/src/scene/lightsource.cpp b/src/scene/lightsource.cpp
index 78e909c3a1..eb6648a337 100644
--- a/src/scene/lightsource.cpp
+++ b/src/scene/lightsource.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/src/scene/profile.cpp b/src/scene/profile.cpp
index 647c8de15e..fef3492ae0 100644
--- a/src/scene/profile.cpp
+++ b/src/scene/profile.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/src/scene/profile_lua.inl b/src/scene/profile_lua.inl
index 44880efc03..f006c6de3c 100644
--- a/src/scene/profile_lua.inl
+++ b/src/scene/profile_lua.inl
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/src/scene/rotation.cpp b/src/scene/rotation.cpp
index b34e8e929b..1ac84efc36 100644
--- a/src/scene/rotation.cpp
+++ b/src/scene/rotation.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/src/scene/scale.cpp b/src/scene/scale.cpp
index 1677635ecc..0a75b5af80 100644
--- a/src/scene/scale.cpp
+++ b/src/scene/scale.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/src/scene/scene.cpp b/src/scene/scene.cpp
index 1134d008fd..fa07e6e520 100644
--- a/src/scene/scene.cpp
+++ b/src/scene/scene.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/src/scene/scene_lua.inl b/src/scene/scene_lua.inl
index 3d7bc74554..5241f7b2f1 100644
--- a/src/scene/scene_lua.inl
+++ b/src/scene/scene_lua.inl
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/src/scene/scenegraphnode.cpp b/src/scene/scenegraphnode.cpp
index 1939463388..c2fa3fa44b 100644
--- a/src/scene/scenegraphnode.cpp
+++ b/src/scene/scenegraphnode.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/src/scene/sceneinitializer.cpp b/src/scene/sceneinitializer.cpp
index 7353a020fb..387b61618f 100644
--- a/src/scene/sceneinitializer.cpp
+++ b/src/scene/sceneinitializer.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/src/scene/scenelicensewriter.cpp b/src/scene/scenelicensewriter.cpp
index df3cba898c..56d074455b 100644
--- a/src/scene/scenelicensewriter.cpp
+++ b/src/scene/scenelicensewriter.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/src/scene/timeframe.cpp b/src/scene/timeframe.cpp
index da58c24618..7af39c2632 100644
--- a/src/scene/timeframe.cpp
+++ b/src/scene/timeframe.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/src/scene/translation.cpp b/src/scene/translation.cpp
index a131e72774..f2e70b6a83 100644
--- a/src/scene/translation.cpp
+++ b/src/scene/translation.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/src/scripting/lualibrary.cpp b/src/scripting/lualibrary.cpp
index d22c25b0ea..c3c77999ca 100644
--- a/src/scripting/lualibrary.cpp
+++ b/src/scripting/lualibrary.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/src/scripting/scriptengine.cpp b/src/scripting/scriptengine.cpp
index 1663b3b133..42345a9afa 100644
--- a/src/scripting/scriptengine.cpp
+++ b/src/scripting/scriptengine.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/src/scripting/scriptengine_lua.inl b/src/scripting/scriptengine_lua.inl
index dbe600ac8c..ef8da626e9 100644
--- a/src/scripting/scriptengine_lua.inl
+++ b/src/scripting/scriptengine_lua.inl
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/src/scripting/scriptscheduler.cpp b/src/scripting/scriptscheduler.cpp
index c34784df24..daba62dc55 100644
--- a/src/scripting/scriptscheduler.cpp
+++ b/src/scripting/scriptscheduler.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/src/scripting/scriptscheduler_lua.inl b/src/scripting/scriptscheduler_lua.inl
index ccc05c774d..64d45eba2d 100644
--- a/src/scripting/scriptscheduler_lua.inl
+++ b/src/scripting/scriptscheduler_lua.inl
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/src/scripting/systemcapabilitiesbinding.cpp b/src/scripting/systemcapabilitiesbinding.cpp
index 86e3424bff..5923e78d7c 100644
--- a/src/scripting/systemcapabilitiesbinding.cpp
+++ b/src/scripting/systemcapabilitiesbinding.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/src/scripting/systemcapabilitiesbinding_lua.inl b/src/scripting/systemcapabilitiesbinding_lua.inl
index 6573d5098a..e2ef00afb5 100644
--- a/src/scripting/systemcapabilitiesbinding_lua.inl
+++ b/src/scripting/systemcapabilitiesbinding_lua.inl
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/src/util/blockplaneintersectiongeometry.cpp b/src/util/blockplaneintersectiongeometry.cpp
index ea08f71eea..5b73618863 100644
--- a/src/util/blockplaneintersectiongeometry.cpp
+++ b/src/util/blockplaneintersectiongeometry.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/src/util/boxgeometry.cpp b/src/util/boxgeometry.cpp
index 45f393d57c..6c06e54b89 100644
--- a/src/util/boxgeometry.cpp
+++ b/src/util/boxgeometry.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/src/util/collisionhelper.cpp b/src/util/collisionhelper.cpp
index 873b8bcc37..af74c2df77 100644
--- a/src/util/collisionhelper.cpp
+++ b/src/util/collisionhelper.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/src/util/coordinateconversion.cpp b/src/util/coordinateconversion.cpp
index 31526a63f5..0f700060b3 100644
--- a/src/util/coordinateconversion.cpp
+++ b/src/util/coordinateconversion.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/src/util/distanceconversion.cpp b/src/util/distanceconversion.cpp
index a56ac03e39..31eb085530 100644
--- a/src/util/distanceconversion.cpp
+++ b/src/util/distanceconversion.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/src/util/factorymanager.cpp b/src/util/factorymanager.cpp
index 755b1e3efa..48665796a0 100644
--- a/src/util/factorymanager.cpp
+++ b/src/util/factorymanager.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/src/util/histogram.cpp b/src/util/histogram.cpp
index 480799d7ac..762c944be8 100644
--- a/src/util/histogram.cpp
+++ b/src/util/histogram.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/src/util/httprequest.cpp b/src/util/httprequest.cpp
index e5552bdfea..263120b8ff 100644
--- a/src/util/httprequest.cpp
+++ b/src/util/httprequest.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/src/util/json_helper.cpp b/src/util/json_helper.cpp
index 8f4e6475fd..cafd1c4c90 100644
--- a/src/util/json_helper.cpp
+++ b/src/util/json_helper.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/src/util/keys.cpp b/src/util/keys.cpp
index b6e647d2ad..1e97dcce4a 100644
--- a/src/util/keys.cpp
+++ b/src/util/keys.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/src/util/openspacemodule.cpp b/src/util/openspacemodule.cpp
index 3189634580..771a9b82bb 100644
--- a/src/util/openspacemodule.cpp
+++ b/src/util/openspacemodule.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/src/util/planegeometry.cpp b/src/util/planegeometry.cpp
index cec681b5c7..fa139d54be 100644
--- a/src/util/planegeometry.cpp
+++ b/src/util/planegeometry.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/src/util/progressbar.cpp b/src/util/progressbar.cpp
index 62d9a9dff1..eb8c84f639 100644
--- a/src/util/progressbar.cpp
+++ b/src/util/progressbar.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/src/util/resourcesynchronization.cpp b/src/util/resourcesynchronization.cpp
index 818946aa4f..adbe6fbb28 100644
--- a/src/util/resourcesynchronization.cpp
+++ b/src/util/resourcesynchronization.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/src/util/screenlog.cpp b/src/util/screenlog.cpp
index b9d8881959..a5a24aff49 100644
--- a/src/util/screenlog.cpp
+++ b/src/util/screenlog.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/src/util/sphere.cpp b/src/util/sphere.cpp
index bd76c78cef..882c734615 100644
--- a/src/util/sphere.cpp
+++ b/src/util/sphere.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/src/util/spicemanager.cpp b/src/util/spicemanager.cpp
index d405ab829e..e8a0630c33 100644
--- a/src/util/spicemanager.cpp
+++ b/src/util/spicemanager.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/src/util/spicemanager_lua.inl b/src/util/spicemanager_lua.inl
index 747c113d5a..f19d9a14ef 100644
--- a/src/util/spicemanager_lua.inl
+++ b/src/util/spicemanager_lua.inl
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/src/util/syncbuffer.cpp b/src/util/syncbuffer.cpp
index 02ebfdba0b..bef545df42 100644
--- a/src/util/syncbuffer.cpp
+++ b/src/util/syncbuffer.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/src/util/task.cpp b/src/util/task.cpp
index 2eb1ce6185..0239ca9850 100644
--- a/src/util/task.cpp
+++ b/src/util/task.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/src/util/taskloader.cpp b/src/util/taskloader.cpp
index 39d38e51e6..5d633915bf 100644
--- a/src/util/taskloader.cpp
+++ b/src/util/taskloader.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/src/util/threadpool.cpp b/src/util/threadpool.cpp
index 0ea8527f0a..7606ae7d92 100644
--- a/src/util/threadpool.cpp
+++ b/src/util/threadpool.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/src/util/time.cpp b/src/util/time.cpp
index 87810e03ba..d5b682939f 100644
--- a/src/util/time.cpp
+++ b/src/util/time.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/src/util/time_lua.inl b/src/util/time_lua.inl
index ceaaaab423..5cbd3c942d 100644
--- a/src/util/time_lua.inl
+++ b/src/util/time_lua.inl
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/src/util/timeconversion.cpp b/src/util/timeconversion.cpp
index 18fdcf03df..cea0ebc87d 100644
--- a/src/util/timeconversion.cpp
+++ b/src/util/timeconversion.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/src/util/timeline.cpp b/src/util/timeline.cpp
index da698d3323..8d9e3e2a49 100644
--- a/src/util/timeline.cpp
+++ b/src/util/timeline.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/src/util/timemanager.cpp b/src/util/timemanager.cpp
index c25030813a..7140359766 100644
--- a/src/util/timemanager.cpp
+++ b/src/util/timemanager.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/src/util/timerange.cpp b/src/util/timerange.cpp
index db25034be8..59f255c6b4 100644
--- a/src/util/timerange.cpp
+++ b/src/util/timerange.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/src/util/touch.cpp b/src/util/touch.cpp
index 6b95bc5a2c..f4297bbe3e 100644
--- a/src/util/touch.cpp
+++ b/src/util/touch.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/src/util/transformationmanager.cpp b/src/util/transformationmanager.cpp
index 549c51262d..02e4a6d4a0 100644
--- a/src/util/transformationmanager.cpp
+++ b/src/util/transformationmanager.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/src/util/tstring.cpp b/src/util/tstring.cpp
index e56479f6a0..6551a33e6e 100644
--- a/src/util/tstring.cpp
+++ b/src/util/tstring.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/src/util/universalhelpers.cpp b/src/util/universalhelpers.cpp
index fe3530c936..10ff42980d 100644
--- a/src/util/universalhelpers.cpp
+++ b/src/util/universalhelpers.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/src/util/versionchecker.cpp b/src/util/versionchecker.cpp
index 70ad442d80..df9a8d853c 100644
--- a/src/util/versionchecker.cpp
+++ b/src/util/versionchecker.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/support/cmake/openspace_header.template b/support/cmake/openspace_header.template
index 3ec58e41ef..bae418ab74 100644
--- a/support/cmake/openspace_header.template
+++ b/support/cmake/openspace_header.template
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/support/coding/check_style_guide.py b/support/coding/check_style_guide.py
index ca3c3266bf..a9ee0de76d 100644
--- a/support/coding/check_style_guide.py
+++ b/support/coding/check_style_guide.py
@@ -3,7 +3,7 @@
 """
 OpenSpace
 
-Copyright (c) 2014-2023
+Copyright (c) 2014-2024
 
 Permission is hereby granted, free of charge, to any person obtaining a copy of this
 software and associated documentation files (the "Software"), to deal in the Software
@@ -59,7 +59,7 @@ import os
 import re
 import sys
 
-current_year = '2023'
+current_year = '2024'
 is_strict_mode = False
 is_silent_mode = False
 
diff --git a/support/coding/codegen b/support/coding/codegen
index 993147347c..0a75d05d83 160000
--- a/support/coding/codegen
+++ b/support/coding/codegen
@@ -1 +1 @@
-Subproject commit 993147347c2ca5b1e6871e4e9a73a4ccfeb4fd72
+Subproject commit 0a75d05d833e019bd4f143d932857493b2569681
diff --git a/tests/main.cpp b/tests/main.cpp
index 0aa736f681..64eece4647 100644
--- a/tests/main.cpp
+++ b/tests/main.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/tests/property/test_property_listproperties.cpp b/tests/property/test_property_listproperties.cpp
index 60a3a5c953..1939ebf17c 100644
--- a/tests/property/test_property_listproperties.cpp
+++ b/tests/property/test_property_listproperties.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/tests/property/test_property_optionproperty.cpp b/tests/property/test_property_optionproperty.cpp
index bf4dfb8245..1d52f2644e 100644
--- a/tests/property/test_property_optionproperty.cpp
+++ b/tests/property/test_property_optionproperty.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/tests/property/test_property_selectionproperty.cpp b/tests/property/test_property_selectionproperty.cpp
index 4e0e22a35d..1f4b41654d 100644
--- a/tests/property/test_property_selectionproperty.cpp
+++ b/tests/property/test_property_selectionproperty.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/tests/regression/517.cpp b/tests/regression/517.cpp
index 7cb2cd189b..7449450d8a 100644
--- a/tests/regression/517.cpp
+++ b/tests/regression/517.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/tests/test_assetloader.cpp b/tests/test_assetloader.cpp
index a3a783418d..4856be28c1 100644
--- a/tests/test_assetloader.cpp
+++ b/tests/test_assetloader.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/tests/test_concurrentqueue.cpp b/tests/test_concurrentqueue.cpp
index a8cbd1fcf0..64f97e2d7a 100644
--- a/tests/test_concurrentqueue.cpp
+++ b/tests/test_concurrentqueue.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/tests/test_distanceconversion.cpp b/tests/test_distanceconversion.cpp
index 98fe07da54..7c9408d75b 100644
--- a/tests/test_distanceconversion.cpp
+++ b/tests/test_distanceconversion.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/tests/test_documentation.cpp b/tests/test_documentation.cpp
index debd5ed418..f7bb1983be 100644
--- a/tests/test_documentation.cpp
+++ b/tests/test_documentation.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/tests/test_horizons.cpp b/tests/test_horizons.cpp
index 2d97b5ed3b..d9e37b206a 100644
--- a/tests/test_horizons.cpp
+++ b/tests/test_horizons.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/tests/test_iswamanager.cpp b/tests/test_iswamanager.cpp
index f6a5dbb97a..f2464194d1 100644
--- a/tests/test_iswamanager.cpp
+++ b/tests/test_iswamanager.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/tests/test_jsonformatting.cpp b/tests/test_jsonformatting.cpp
index cd3d97b28d..b65f7bbe48 100644
--- a/tests/test_jsonformatting.cpp
+++ b/tests/test_jsonformatting.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/tests/test_latlonpatch.cpp b/tests/test_latlonpatch.cpp
index 6b95778f35..dc585e7187 100644
--- a/tests/test_latlonpatch.cpp
+++ b/tests/test_latlonpatch.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/tests/test_lrucache.cpp b/tests/test_lrucache.cpp
index 5603d0c276..b594386d18 100644
--- a/tests/test_lrucache.cpp
+++ b/tests/test_lrucache.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/tests/test_lua_createsinglecolorimage.cpp b/tests/test_lua_createsinglecolorimage.cpp
index 1f65021d13..64696d47d5 100644
--- a/tests/test_lua_createsinglecolorimage.cpp
+++ b/tests/test_lua_createsinglecolorimage.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/tests/test_profile.cpp b/tests/test_profile.cpp
index d5bc06bb5b..dddd520da9 100644
--- a/tests/test_profile.cpp
+++ b/tests/test_profile.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/tests/test_rawvolumeio.cpp b/tests/test_rawvolumeio.cpp
index 7f390c52a2..4370ce1554 100644
--- a/tests/test_rawvolumeio.cpp
+++ b/tests/test_rawvolumeio.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/tests/test_scriptscheduler.cpp b/tests/test_scriptscheduler.cpp
index a9652c4572..2a7cc2ee9c 100644
--- a/tests/test_scriptscheduler.cpp
+++ b/tests/test_scriptscheduler.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/tests/test_settings.cpp b/tests/test_settings.cpp
index 1a7ab36608..ade6863421 100644
--- a/tests/test_settings.cpp
+++ b/tests/test_settings.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/tests/test_sgctedit.cpp b/tests/test_sgctedit.cpp
index ed78cbeb75..3e56f0da30 100644
--- a/tests/test_sgctedit.cpp
+++ b/tests/test_sgctedit.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/tests/test_spicemanager.cpp b/tests/test_spicemanager.cpp
index 44065b8a71..2312a1ead5 100644
--- a/tests/test_spicemanager.cpp
+++ b/tests/test_spicemanager.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/tests/test_timeconversion.cpp b/tests/test_timeconversion.cpp
index 9931326327..e9718a3cf1 100644
--- a/tests/test_timeconversion.cpp
+++ b/tests/test_timeconversion.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/tests/test_timeline.cpp b/tests/test_timeline.cpp
index 5e770cae5d..51884024fa 100644
--- a/tests/test_timeline.cpp
+++ b/tests/test_timeline.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/tests/test_timequantizer.cpp b/tests/test_timequantizer.cpp
index fb96eb018e..594bfcada6 100644
--- a/tests/test_timequantizer.cpp
+++ b/tests/test_timequantizer.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2024                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *

From d67cabf578cce093ca4952f9de5c5b857d592a63 Mon Sep 17 00:00:00 2001
From: Alexander Bock <alexander.bock@liu.se>
Date: Tue, 6 Feb 2024 16:34:12 +0100
Subject: [PATCH 249/701] Coding style update

---
 ext/ghoul                                     |  2 +-
 .../rendering/colormappingcomponent.h         |  6 +-
 include/openspace/util/spicemanager.h         |  4 +-
 .../pointcloud/renderablepointcloud.cpp       |  5 +-
 .../pointcloud/renderablepolygoncloud.cpp     | 12 +++-
 .../base/rendering/renderablenodearrow.cpp    |  4 +-
 modules/base/rendering/renderablesphere.cpp   |  5 +-
 .../rendering/renderableplanescloud.cpp       |  8 ++-
 modules/exoplanets/exoplanetsmodule.cpp       |  6 +-
 modules/exoplanets/exoplanetsmodule_lua.inl   |  8 ++-
 .../tasks/exoplanetsdatapreparationtask.cpp   |  2 +-
 .../src/geojson/geojsoncomponent.cpp          |  5 +-
 .../src/geojson/geojsonproperties.cpp         |  7 +-
 modules/globebrowsing/src/renderableglobe.cpp | 11 +--
 .../rendering/renderableplanetprojection.cpp  |  5 +-
 modules/sync/syncs/httpsynchronization.cpp    |  8 +--
 modules/sync/syncs/urlsynchronization.cpp     |  4 +-
 src/data/dataloader.cpp                       | 13 +++-
 src/engine/configuration.cpp                  | 20 ++++--
 src/interaction/sessionrecording.cpp          |  1 -
 src/navigation/navigationhandler.cpp          |  4 +-
 src/navigation/waypoint.cpp                   |  3 +-
 src/rendering/colormappingcomponent.cpp       |  3 +-
 src/rendering/framebufferrenderer.cpp         | 36 ++++------
 src/rendering/loadingscreen.cpp               |  2 +-
 src/rendering/luaconsole.cpp                  |  4 +-
 src/scene/scene.cpp                           |  7 +-
 src/scene/scenegraphnode.cpp                  |  8 +--
 src/util/spicemanager.cpp                     | 70 +++++++++----------
 src/util/spicemanager_lua.inl                 |  2 +-
 30 files changed, 162 insertions(+), 113 deletions(-)

diff --git a/ext/ghoul b/ext/ghoul
index 42fbc6cc49..06d72a031c 160000
--- a/ext/ghoul
+++ b/ext/ghoul
@@ -1 +1 @@
-Subproject commit 42fbc6cc49993893e840f25da1ca505244779005
+Subproject commit 06d72a031c1b56769ab8eb06ea25231471b3ee9c
diff --git a/include/openspace/rendering/colormappingcomponent.h b/include/openspace/rendering/colormappingcomponent.h
index 308d79344e..6443a46975 100644
--- a/include/openspace/rendering/colormappingcomponent.h
+++ b/include/openspace/rendering/colormappingcomponent.h
@@ -22,8 +22,8 @@
  * OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                                         *
  ****************************************************************************************/
 
-#ifndef __OPENSPACE_MODULE_BASE___COLORMAPCOMPONENT___H__
-#define __OPENSPACE_MODULE_BASE___COLORMAPCOMPONENT___H__
+#ifndef __OPENSPACE_CORE___COLORMAPCOMPONENT___H__
+#define __OPENSPACE_CORE___COLORMAPCOMPONENT___H__
 
 #include <openspace/properties/propertyowner.h>
 
@@ -120,4 +120,4 @@ private:
 
 } // namespace openspace
 
-#endif // __OPENSPACE_MODULE_BASE___COLORMAPCOMPONENT___H__
+#endif // __OPENSPACE_CORE___COLORMAPCOMPONENT___H__
diff --git a/include/openspace/util/spicemanager.h b/include/openspace/util/spicemanager.h
index c7b05d2c4a..5c2a362275 100644
--- a/include/openspace/util/spicemanager.h
+++ b/include/openspace/util/spicemanager.h
@@ -678,8 +678,8 @@ public:
      * Struct that is used as the return value from the #surfaceIntercept method.
      */
     struct SurfaceInterceptResult {
-        /// The closest surface intercept point on the target body in Cartesian Coordinates
-        /// relative to the reference frame
+        /// The closest surface intercept point on the target body in Cartesian
+        /// Coordinates relative to the reference frame
         glm::dvec3 surfaceIntercept = glm::dvec3(0.0);
 
         /// If the aberration correction is not AberrationCorrection::Type::None, this
diff --git a/modules/base/rendering/pointcloud/renderablepointcloud.cpp b/modules/base/rendering/pointcloud/renderablepointcloud.cpp
index 0b953186c4..a360b3f91b 100644
--- a/modules/base/rendering/pointcloud/renderablepointcloud.cpp
+++ b/modules/base/rendering/pointcloud/renderablepointcloud.cpp
@@ -717,7 +717,10 @@ void RenderablePointCloud::bindDataForPointRendering() {
 
     _program->setUniform(_uniformCache.scaleExponent, _sizeSettings.scaleExponent);
     _program->setUniform(_uniformCache.scaleFactor, _sizeSettings.scaleFactor);
-    _program->setUniform(_uniformCache.enableMaxSizeControl, _sizeSettings.useMaxSizeControl);
+    _program->setUniform(
+        _uniformCache.enableMaxSizeControl,
+        _sizeSettings.useMaxSizeControl
+    );
     _program->setUniform(_uniformCache.maxAngularSize, _sizeSettings.maxAngularSize);
     _program->setUniform(_uniformCache.hasDvarScaling, _sizeSettings.sizeMapping.enabled);
 
diff --git a/modules/base/rendering/pointcloud/renderablepolygoncloud.cpp b/modules/base/rendering/pointcloud/renderablepolygoncloud.cpp
index 534e28b59f..9797bce49c 100644
--- a/modules/base/rendering/pointcloud/renderablepolygoncloud.cpp
+++ b/modules/base/rendering/pointcloud/renderablepolygoncloud.cpp
@@ -110,7 +110,17 @@ void RenderablePolygonCloud::createPolygonTexture() {
     glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE);
     // Stopped using a buffer object for GL_PIXEL_UNPACK_BUFFER
     glBindBuffer(GL_PIXEL_UNPACK_BUFFER, 0);
-    glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA8, TexSize, TexSize, 0, GL_RGBA, GL_BYTE, nullptr);
+    glTexImage2D(
+        GL_TEXTURE_2D,
+        0,
+        GL_RGBA8,
+        TexSize,
+        TexSize,
+        0,
+        GL_RGBA,
+        GL_BYTE,
+        nullptr
+    );
 
     renderToTexture(_pTexture, TexSize, TexSize);
 }
diff --git a/modules/base/rendering/renderablenodearrow.cpp b/modules/base/rendering/renderablenodearrow.cpp
index 3780fe35e3..77103a9955 100644
--- a/modules/base/rendering/renderablenodearrow.cpp
+++ b/modules/base/rendering/renderablenodearrow.cpp
@@ -438,7 +438,9 @@ void RenderableNodeArrow::updateShapeTransforms(const RenderData& data) {
 
     // Create transformation matrices to reshape to size and position
     _cylinderTranslation = glm::translate(glm::dmat4(1.0), startPos);
-    glm::dvec3 cylinderScale = glm::dvec3(s * glm::dvec4(_width, _width, cylinderLength, 0.0));
+    glm::dvec3 cylinderScale = glm::dvec3(
+        s * glm::dvec4(_width, _width, cylinderLength, 0.0)
+    );
     _cylinderScale = glm::scale(glm::dmat4(1.0), cylinderScale);
 
     // Adapt arrow head start to scaled size
diff --git a/modules/base/rendering/renderablesphere.cpp b/modules/base/rendering/renderablesphere.cpp
index bd73a1141d..fba2b8627f 100644
--- a/modules/base/rendering/renderablesphere.cpp
+++ b/modules/base/rendering/renderablesphere.cpp
@@ -245,7 +245,10 @@ void RenderableSphere::render(const RenderData& data, RendererTasks&) {
     glm::dmat3 modelRotation = glm::dmat3(data.modelTransform.rotation);
 
     _shader->setUniform(_uniformCache.modelViewTransform, glm::mat4(modelViewTransform));
-    _shader->setUniform(_uniformCache.modelViewProjection, glm::mat4(modelViewProjectionTransform));
+    _shader->setUniform(
+        _uniformCache.modelViewProjection,
+        glm::mat4(modelViewProjectionTransform)
+    );
 
     glm::mat3 modelViewRotation = glm::mat3(
         glm::dmat3(data.camera.viewRotationMatrix()) * modelRotation
diff --git a/modules/digitaluniverse/rendering/renderableplanescloud.cpp b/modules/digitaluniverse/rendering/renderableplanescloud.cpp
index 9992b738ea..7c4a801dc0 100644
--- a/modules/digitaluniverse/rendering/renderableplanescloud.cpp
+++ b/modules/digitaluniverse/rendering/renderableplanescloud.cpp
@@ -469,7 +469,13 @@ void RenderablePlanesCloud::render(const RenderData& data, RendererTasks&) {
             glm::dvec3(invMVPParts * glm::dvec4(0.0, 1.0, 0.0, 0.0))
         );
 
-        _labels->render(data, modelViewProjectionTransform, orthoRight, orthoUp, fadeInVariable);
+        _labels->render(
+            data,
+            modelViewProjectionTransform,
+            orthoRight,
+            orthoUp,
+            fadeInVariable
+        );
     }
 }
 
diff --git a/modules/exoplanets/exoplanetsmodule.cpp b/modules/exoplanets/exoplanetsmodule.cpp
index 1d37af2be1..e713c95154 100644
--- a/modules/exoplanets/exoplanetsmodule.cpp
+++ b/modules/exoplanets/exoplanetsmodule.cpp
@@ -113,9 +113,9 @@ namespace {
     constexpr openspace::properties::Property::PropertyInfo ComparisonCircleColorInfo = {
         "ComparisonCircleColor",
         "Comparison Circle Color",
-        "Decides the color of the 1 AU size comparison circles that are generated as part "
-        "of an exoplanet system. Changing the color will not modify already existing "
-        "circles",
+        "Decides the color of the 1 AU size comparison circles that are generated as "
+        "part of an exoplanet system. Changing the color will not modify already "
+        "existing circles",
         openspace::properties::Property::Visibility::NoviceUser
     };
 
diff --git a/modules/exoplanets/exoplanetsmodule_lua.inl b/modules/exoplanets/exoplanetsmodule_lua.inl
index 7d91656439..4d78edbf45 100644
--- a/modules/exoplanets/exoplanetsmodule_lua.inl
+++ b/modules/exoplanets/exoplanetsmodule_lua.inl
@@ -748,7 +748,9 @@ listOfExoplanetsDeprecated()
         LINFO(fmt::format("Reading data for planet: '{}' ", planetData.name));
 
         if (!hasSufficientData(planetData.dataEntry)) {
-            LWARNING(fmt::format("Insufficient data for exoplanet: '{}'", planetData.name));
+            LWARNING(fmt::format(
+                "Insufficient data for exoplanet: '{}'", planetData.name
+            ));
             continue;
         }
 
@@ -774,7 +776,9 @@ listOfExoplanetsDeprecated()
     }
 
     // Add all the added exoplanet systems
-    for (const std::pair<const std::string, ExoplanetSystem>& entry : hostNameToSystemDataMap) {
+    using K = const std::string;
+    using V = ExoplanetSystem;
+    for (const std::pair<K, V>& entry : hostNameToSystemDataMap) {
         const std::string& hostName = entry.first;
         const ExoplanetSystem& data = entry.second;
         createExoplanetSystem(hostName, data);
diff --git a/modules/exoplanets/tasks/exoplanetsdatapreparationtask.cpp b/modules/exoplanets/tasks/exoplanetsdatapreparationtask.cpp
index 78bbe46a5e..746b422d91 100644
--- a/modules/exoplanets/tasks/exoplanetsdatapreparationtask.cpp
+++ b/modules/exoplanets/tasks/exoplanetsdatapreparationtask.cpp
@@ -442,7 +442,7 @@ ExoplanetsDataPreparationTask::parseDataRow(std::string row,
 }
 
 glm::vec3 ExoplanetsDataPreparationTask::starPosition(const std::string& starName,
-                                                      const std::filesystem::path& sourceFile)
+                                                  const std::filesystem::path& sourceFile)
 {
     glm::vec3 position = glm::vec3(std::numeric_limits<float>::quiet_NaN());
 
diff --git a/modules/globebrowsing/src/geojson/geojsoncomponent.cpp b/modules/globebrowsing/src/geojson/geojsoncomponent.cpp
index c912b640c8..7abd7f820f 100644
--- a/modules/globebrowsing/src/geojson/geojsoncomponent.cpp
+++ b/modules/globebrowsing/src/geojson/geojsoncomponent.cpp
@@ -168,8 +168,9 @@ namespace {
     constexpr openspace::properties::Property::PropertyInfo DeleteInfo = {
         "Delete",
         "Delete",
-        "Triggering this will remove this GeoJson component from its globe. Note that the "
-        "GUI may have to be reloaded for the change to be reflect in the user interface.",
+        "Triggering this will remove this GeoJson component from its globe. Note that "
+        "the GUI may have to be reloaded for the change to be reflect in the user "
+        "interface.",
         openspace::properties::Property::Visibility::User
     };
 
diff --git a/modules/globebrowsing/src/geojson/geojsonproperties.cpp b/modules/globebrowsing/src/geojson/geojsonproperties.cpp
index 1effefdcbe..50aa4c9f8c 100644
--- a/modules/globebrowsing/src/geojson/geojsonproperties.cpp
+++ b/modules/globebrowsing/src/geojson/geojsonproperties.cpp
@@ -409,7 +409,8 @@ GeoJsonProperties::GeoJsonProperties()
     altitudeModeOption.addOptions({
         { static_cast<int>(AltitudeMode::Absolute), "Absolute" },
         { static_cast<int>(AltitudeMode::RelativeToGround), "Relative to Ground" }
-        //{ static_cast<int>(AltitudeMode::ClampToGround), "Clamp to Ground" } / TODO: add ClampToGround
+        // TODO: add ClampToGround
+        //{ static_cast<int>(AltitudeMode::ClampToGround), "Clamp to Ground" }
     });
     addProperty(altitudeModeOption);
 
@@ -642,7 +643,9 @@ GeoJsonProperties::AltitudeMode PropertySet::altitudeMode() const {
 }
 
 bool PropertySet::tessellationEnabled() const {
-    return overrideValues.tessellationEnabled.value_or(defaultValues.tessellation.enabled);
+    return overrideValues.tessellationEnabled.value_or(
+        defaultValues.tessellation.enabled
+    );
 }
 
 bool PropertySet::useTessellationLevel() const {
diff --git a/modules/globebrowsing/src/renderableglobe.cpp b/modules/globebrowsing/src/renderableglobe.cpp
index 05bc83d9ef..165a901d37 100644
--- a/modules/globebrowsing/src/renderableglobe.cpp
+++ b/modules/globebrowsing/src/renderableglobe.cpp
@@ -1897,7 +1897,8 @@ bool RenderableGlobe::testIfCullable(const Chunk& chunk,
     ZoneScoped;
 
     return (PreformHorizonCulling && isCullableByHorizon(chunk, renderData, heights)) ||
-           (_debugProperties.performFrustumCulling && isCullableByFrustum(chunk, renderData, mvp));
+           (_debugProperties.performFrustumCulling &&
+               isCullableByFrustum(chunk, renderData, mvp));
 }
 
 int RenderableGlobe::desiredLevel(const Chunk& chunk, const RenderData& renderData,
@@ -2363,9 +2364,11 @@ int RenderableGlobe::desiredLevelByAvailableTileData(const Chunk& chunk) const {
         const std::vector<Layer*>& lyrs = _layerManager.layerGroup(gi.id).activeLayers();
         for (Layer* layer : lyrs) {
             Tile::Status status = layer->tileStatus(chunk.tileIndex);
-            // Ensure that the current tile is OK and that the tileprovider for the current
-            // layer has enough data to support an additional level.
-            if (status == Tile::Status::OK && layer->tileProvider()->maxLevel() > currLevel + 1) {
+            // Ensure that the current tile is OK and that the tileprovider for the
+            // current layer has enough data to support an additional level.
+            if (status == Tile::Status::OK &&
+                layer->tileProvider()->maxLevel() > currLevel + 1)
+            {
                 return UnknownDesiredLevel;
             }
         }
diff --git a/modules/spacecraftinstruments/rendering/renderableplanetprojection.cpp b/modules/spacecraftinstruments/rendering/renderableplanetprojection.cpp
index 14eed03d9a..4ec427d2f9 100644
--- a/modules/spacecraftinstruments/rendering/renderableplanetprojection.cpp
+++ b/modules/spacecraftinstruments/rendering/renderableplanetprojection.cpp
@@ -524,7 +524,10 @@ void RenderablePlanetProjection::render(const RenderData& data, RendererTasks&)
     // Model transform and view transform needs to be in double precision
     const glm::dmat4 modelTransform = calcModelTransform(data);
 
-    _programObject->setUniform(_mainUniformCache.modelTransform, glm::mat4(modelTransform));
+    _programObject->setUniform(
+        _mainUniformCache.modelTransform,
+        glm::mat4(modelTransform)
+    );
     _programObject->setUniform(
         _mainUniformCache.modelViewProjectionTransform,
         glm::mat4(calcModelViewProjectionTransform(data, modelTransform))
diff --git a/modules/sync/syncs/httpsynchronization.cpp b/modules/sync/syncs/httpsynchronization.cpp
index 0525bfdc41..6c4c493d91 100644
--- a/modules/sync/syncs/httpsynchronization.cpp
+++ b/modules/sync/syncs/httpsynchronization.cpp
@@ -121,7 +121,7 @@ void HttpSynchronization::start() {
             for (const std::string& url : _syncRepositories) {
                 const SynchronizationState syncState = trySyncFromUrl(url + q);
 
-                // Could not get this sync repository list of files. 
+                // Could not get this sync repository list of files.
                 if (syncState == SynchronizationState::ListDownloadFail) {
                     continue;
                 }
@@ -131,7 +131,7 @@ void HttpSynchronization::start() {
                     createSyncFile(true);
                 }
                 else if (syncState == SynchronizationState::FileDownloadFail) {
-                    // If it was not successful we should add any files that were 
+                    // If it was not successful we should add any files that were
                     // potentially downloaded to avoid downloading from other repositories
                     _existingSyncedFiles.insert(
                         _existingSyncedFiles.end(),
@@ -143,7 +143,7 @@ void HttpSynchronization::start() {
                 }
                 break;
             }
-            
+
             if (!isResolved() && !_shouldCancel) {
                 _state = State::Rejected;
             }
@@ -424,7 +424,7 @@ HttpSynchronization::trySyncFromUrl(std::string listUrl) {
     }
     if (failed) {
         for (const std::unique_ptr<HttpFileDownload>& d : downloads) {
-            // Store all files that were synced to the ossync 
+            // Store all files that were synced to the ossync
             if (d->hasSucceeded()) {
                 _newSyncedFiles.push_back(d->url());
             }
diff --git a/modules/sync/syncs/urlsynchronization.cpp b/modules/sync/syncs/urlsynchronization.cpp
index 631d8711b9..b4fe997eb8 100644
--- a/modules/sync/syncs/urlsynchronization.cpp
+++ b/modules/sync/syncs/urlsynchronization.cpp
@@ -67,8 +67,8 @@ namespace {
         // parameter only only contain exactly one URL
         std::optional<std::string> filename;
 
-        // This variable determines the validity period of a file(s) in seconds before it 
-        // needs to be re-downloaded. The default value keeps the file permanently cached, 
+        // This variable determines the validity period of a file(s) in seconds before it
+        // needs to be re-downloaded. The default value keeps the file permanently cached,
         // while a value of 0 forces the file to be downloaded on every startup.
         std::optional<double> secondsUntilResync [[codegen::greaterequal(0.0)]];
     };
diff --git a/src/data/dataloader.cpp b/src/data/dataloader.cpp
index 6926df0853..bc7fb74543 100644
--- a/src/data/dataloader.cpp
+++ b/src/data/dataloader.cpp
@@ -79,7 +79,10 @@ namespace {
         if (specs.has_value()) {
             info = openspace::dataloader::generateHashString(*specs);
         }
-        std::filesystem::path cached = FileSys.cacheManager()->cachedFilename(filePath, info);
+        std::filesystem::path cached = FileSys.cacheManager()->cachedFilename(
+            filePath,
+            info
+        );
 
         if (std::filesystem::exists(cached)) {
             LINFOC(
@@ -321,10 +324,14 @@ void saveCachedFile(const Dataset& dataset, std::filesystem::path path) {
 
     //
     // Store max data point variable
-    file.write(reinterpret_cast<const char*>(&dataset.maxPositionComponent), sizeof(float));
+    file.write(
+        reinterpret_cast<const char*>(&dataset.maxPositionComponent),
+        sizeof(float)
+    );
 }
 
-Dataset loadFileWithCache(std::filesystem::path filePath, std::optional<DataMapping> specs)
+Dataset loadFileWithCache(std::filesystem::path filePath,
+                          std::optional<DataMapping> specs)
 {
     return internalLoadFileWithCache<Dataset>(
         filePath,
diff --git a/src/engine/configuration.cpp b/src/engine/configuration.cpp
index b18fe245dd..b646709333 100644
--- a/src/engine/configuration.cpp
+++ b/src/engine/configuration.cpp
@@ -421,15 +421,27 @@ ghoul::Dictionary Configuration::createDictionary() {
     {
         ghoul::Dictionary openGLDebugContextDict;
         openGLDebugContextDict.setValue("IsActive", openGLDebugContext.isActive);
-        openGLDebugContextDict.setValue("PrintStacktrace", openGLDebugContext.printStacktrace);
-        openGLDebugContextDict.setValue("IsSynchronous", openGLDebugContext.isSynchronous);
+        openGLDebugContextDict.setValue(
+            "PrintStacktrace",
+            openGLDebugContext.printStacktrace
+        );
+        openGLDebugContextDict.setValue(
+            "IsSynchronous",
+            openGLDebugContext.isSynchronous
+        );
 
         ghoul::Dictionary identifierFiltersDict;
         for (size_t i = 0; i < openGLDebugContext.severityFilters.size(); ++i) {
             {
                 ghoul::Dictionary identifierFilterDict;
-                identifierFilterDict.setValue("Type", openGLDebugContext.identifierFilters[i].type);
-                identifierFilterDict.setValue("Source", openGLDebugContext.identifierFilters[i].source);
+                identifierFilterDict.setValue(
+                    "Type",
+                    openGLDebugContext.identifierFilters[i].type
+                );
+                identifierFilterDict.setValue(
+                    "Source",
+                    openGLDebugContext.identifierFilters[i].source
+                );
                 identifierFilterDict.setValue(
                     "Identifier",
                     static_cast<int>(openGLDebugContext.identifierFilters[i].identifier)
diff --git a/src/interaction/sessionrecording.cpp b/src/interaction/sessionrecording.cpp
index cce0561c76..9cb631505c 100644
--- a/src/interaction/sessionrecording.cpp
+++ b/src/interaction/sessionrecording.cpp
@@ -827,7 +827,6 @@ void SessionRecording::saveCameraKeyframeAscii(Timestamps& times,
 
         file << HeaderCommentAscii << ' ' << ghoul::to_string(modelTransform) << '\n';
     }
-    
 
     std::stringstream keyframeLine = std::stringstream();
     saveHeaderAscii(times, HeaderCameraAscii, keyframeLine);
diff --git a/src/navigation/navigationhandler.cpp b/src/navigation/navigationhandler.cpp
index 192c76ce87..429c315351 100644
--- a/src/navigation/navigationhandler.cpp
+++ b/src/navigation/navigationhandler.cpp
@@ -400,12 +400,12 @@ void NavigationHandler::updateCameraTransitions() {
     }
     else {
         if (_inAnchorApproachSphere && !wasInApproachSphere) {
-            // Transitioned into the approach sphere from somewhere further away => approach
+            // Transitioned to the approach sphere from somewhere further away => approach
             triggerApproachEvent(anchorNode());
         }
 
         if (_inAnchorReachSphere && !wasInReachSphere) {
-            // Transitioned into the reach sphere from somewhere further away => reach
+            // Transitioned to the reach sphere from somewhere further away => reach
             triggerReachEvent(anchorNode());
         }
 
diff --git a/src/navigation/waypoint.cpp b/src/navigation/waypoint.cpp
index c4722c44ad..155a0852f8 100644
--- a/src/navigation/waypoint.cpp
+++ b/src/navigation/waypoint.cpp
@@ -224,7 +224,8 @@ Waypoint computeWaypointFromNodeInfo(const NodeCameraStateSpec& spec,
     // Compute rotation so the camera is looking at the targetted node
     glm::dvec3 lookAtPos = targetNode->worldPosition();
 
-    // Check if we can distinguish between targetpos and lookAt pos. Otherwise, move it further away
+    // Check if we can distinguish between targetpos and lookAt pos. Otherwise, move it
+    // further away
     const glm::dvec3 diff = targetPos - lookAtPos;
     double distSquared = glm::dot(diff, diff);
     if (std::isnan(distSquared) || distSquared < LengthEpsilon) {
diff --git a/src/rendering/colormappingcomponent.cpp b/src/rendering/colormappingcomponent.cpp
index f82d732da4..c2ce901d4a 100644
--- a/src/rendering/colormappingcomponent.cpp
+++ b/src/rendering/colormappingcomponent.cpp
@@ -334,7 +334,8 @@ void ColorMappingComponent::initialize(const dataloader::Dataset& dataset) {
 
     if (_colorMap.nanColor.has_value() && !_hasNanColorInAsset) {
         nanColor = *_colorMap.nanColor;
-        useNanColor = true; // @ TODO: Avoid overriding value set in asset? (also for useBelow and useAbove)
+        // @ TODO: Avoid overriding value set in asset? (also for useBelow and useAbove)
+        useNanColor = true;
     }
 
     if (_colorMap.belowRangeColor.has_value() && !_hasBelowRangeColorInAsset) {
diff --git a/src/rendering/framebufferrenderer.cpp b/src/rendering/framebufferrenderer.cpp
index 45e5e9d12c..0d650e91f4 100644
--- a/src/rendering/framebufferrenderer.cpp
+++ b/src/rendering/framebufferrenderer.cpp
@@ -511,17 +511,15 @@ void FramebufferRenderer::applyFXAA(const glm::ivec4& viewport) {
 }
 
 void FramebufferRenderer::updateDownscaleTextures() {
+    float cdf = _downscaleVolumeRendering.currentDownscaleFactor;
+
     glBindTexture(GL_TEXTURE_2D, _downscaleVolumeRendering.colorTexture);
     glTexImage2D(
         GL_TEXTURE_2D,
         0,
         GL_RGBA32F,
-        static_cast<GLsizei>(
-            glm::max(_resolution.x * _downscaleVolumeRendering.currentDownscaleFactor, 1.f)
-        ),
-        static_cast<GLsizei>(
-            glm::max(_resolution.y * _downscaleVolumeRendering.currentDownscaleFactor, 1.f)
-        ),
+        static_cast<GLsizei>(glm::max(_resolution.x * cdf, 1.f)),
+        static_cast<GLsizei>(glm::max(_resolution.y * cdf, 1.f)),
         0,
         GL_RGBA,
         GL_FLOAT,
@@ -537,12 +535,8 @@ void FramebufferRenderer::updateDownscaleTextures() {
         GL_TEXTURE_2D,
         0,
         GL_DEPTH_COMPONENT32F,
-        static_cast<GLsizei>(
-            glm::max(_resolution.x * _downscaleVolumeRendering.currentDownscaleFactor, 1.f)
-        ),
-        static_cast<GLsizei>(
-            glm::max(_resolution.y * _downscaleVolumeRendering.currentDownscaleFactor, 1.f)
-        ),
+        static_cast<GLsizei>(glm::max(_resolution.x * cdf, 1.f)),
+        static_cast<GLsizei>(glm::max(_resolution.y * cdf, 1.f)),
         0,
         GL_DEPTH_COMPONENT,
         GL_FLOAT,
@@ -839,18 +833,16 @@ void FramebufferRenderer::updateResolution() {
         glObjectLabel(GL_TEXTURE, _fxaaBuffers.fxaaTexture, -1, "FXAA");
     }
 
+    float cdf = _downscaleVolumeRendering.currentDownscaleFactor;
+
     // Downscale Volume Rendering
     glBindTexture(GL_TEXTURE_2D, _downscaleVolumeRendering.colorTexture);
     glTexImage2D(
         GL_TEXTURE_2D,
         0,
         GL_RGBA32F,
-        static_cast<GLsizei>(
-            glm::max(_resolution.x * _downscaleVolumeRendering.currentDownscaleFactor, 1.f)
-        ),
-        static_cast<GLsizei>(
-            glm::max(_resolution.y * _downscaleVolumeRendering.currentDownscaleFactor, 1.f)
-        ),
+        static_cast<GLsizei>(glm::max(_resolution.x * cdf, 1.f)),
+        static_cast<GLsizei>(glm::max(_resolution.y * cdf, 1.f)),
         0,
         GL_RGBA,
         GL_FLOAT,
@@ -877,12 +869,8 @@ void FramebufferRenderer::updateResolution() {
         GL_TEXTURE_2D,
         0,
         GL_DEPTH_COMPONENT32F,
-        static_cast<GLsizei>(
-            glm::max(_resolution.x * _downscaleVolumeRendering.currentDownscaleFactor, 1.f)
-        ),
-        static_cast<GLsizei>(
-            glm::max(_resolution.y * _downscaleVolumeRendering.currentDownscaleFactor, 1.f)
-        ),
+        static_cast<GLsizei>(glm::max(_resolution.x * cdf, 1.f)),
+        static_cast<GLsizei>(glm::max(_resolution.y * cdf, 1.f)),
         0,
         GL_DEPTH_COMPONENT,
         GL_FLOAT,
diff --git a/src/rendering/loadingscreen.cpp b/src/rendering/loadingscreen.cpp
index 09c66e63f6..24c918ba88 100644
--- a/src/rendering/loadingscreen.cpp
+++ b/src/rendering/loadingscreen.cpp
@@ -319,7 +319,7 @@ void LoadingScreen::render() {
                         rectOverlaps(messageLl, messageUr, ll, ur) :
                         false;
 
-                    const bool logOverlap = _showLog ? 
+                    const bool logOverlap = _showLog ?
                         rectOverlaps(logLl, logUr,ll, ur) :
                         false;
 
diff --git a/src/rendering/luaconsole.cpp b/src/rendering/luaconsole.cpp
index 3f3dd2e469..cb7e8624e2 100644
--- a/src/rendering/luaconsole.cpp
+++ b/src/rendering/luaconsole.cpp
@@ -307,7 +307,9 @@ bool LuaConsole::keyboardCallback(Key key, KeyModifier modifier, KeyAction actio
                 if (_shouldSendToRemote) {
                     _shouldSendToRemote = false;
                 }
-                else if (global::parallelPeer->status() == ParallelConnection::Status::Host) {
+                else if (global::parallelPeer->status() ==
+                         ParallelConnection::Status::Host)
+                {
                     _shouldSendToRemote = true;
                 }
             }
diff --git a/src/scene/scene.cpp b/src/scene/scene.cpp
index fa07e6e520..1b26510b9a 100644
--- a/src/scene/scene.cpp
+++ b/src/scene/scene.cpp
@@ -548,9 +548,10 @@ void Scene::updateInterpolations() {
 
         if (i.isExpired) {
             if (!i.postScript.empty()) {
-                // No sync or send because this is already inside a Lua script that was triggered
-                // when the interpolation of the property was triggered, therefor it has already been
-                // synced and sent to the connected nodes and peers
+                // No sync or send because this is already inside a Lua script that was
+                // triggered when the interpolation of the property was triggered,
+                // therefore it has already been synced and sent to the connected nodes
+                // and peers
                 global::scriptEngine->queueScript(
                     std::move(i.postScript),
                     scripting::ScriptEngine::ShouldBeSynchronized::No,
diff --git a/src/scene/scenegraphnode.cpp b/src/scene/scenegraphnode.cpp
index c2fa3fa44b..c67685baab 100644
--- a/src/scene/scenegraphnode.cpp
+++ b/src/scene/scenegraphnode.cpp
@@ -122,10 +122,10 @@ namespace {
     constexpr openspace::properties::Property::PropertyInfo EvalInteractionSphereInfo = {
         "EvaluatedInteractionSphere",
         "Evaluated Interaction Sphere",
-        "This read-only property contains the evaluated value for the interaction sphere. "
-        "This is the actual value that is used internally within the software. If the "
-        "InteractionSphere property is set to -1, it is the computed value, otherwise it "
-        "matches the one set in the property",
+        "This read-only property contains the evaluated value for the interaction "
+        "sphere. This is the actual value that is used internally within the software. "
+        "If the InteractionSphere property is set to -1, it is the computed value, "
+        "otherwise it matches the one set in the property",
         openspace::properties::Property::Visibility::AdvancedUser
     };
 
diff --git a/src/util/spicemanager.cpp b/src/util/spicemanager.cpp
index e8a0630c33..454b263ffe 100644
--- a/src/util/spicemanager.cpp
+++ b/src/util/spicemanager.cpp
@@ -1379,19 +1379,19 @@ Modifications:
 
 2012, Jan. 5    NJB  Modified file to account for the leapsecond that
                      will occur on June 30, 2012.
-                     
+
 2008, Jul. 7    NJB  Modified file to account for the leapsecond that
                      will occur on December 31, 2008.
-                     
+
 2005, Aug. 3    NJB  Modified file to account for the leapsecond that
                      will occur on December 31, 2005.
-                     
+
 1998, Jul  17   WLT  Modified file to account for the leapsecond that
                      will occur on December 31, 1998.
-                     
+
 1997, Feb  22   WLT  Modified file to account for the leapsecond that
                      will occur on June 30, 1997.
-                     
+
 1995, Dec  14   KSZ  Corrected date of last leapsecond from 1-1-95
                      to 1-1-96.
 
@@ -1407,19 +1407,19 @@ Modifications:
 1992, Mar. 6   HAN   Modified file to account for the leapsecond on
                      June 30, 1992.
 
-1990, Oct. 8   HAN   Modified file to account for the leapsecond on 
-                     Dec. 31, 1990.  
+1990, Oct. 8   HAN   Modified file to account for the leapsecond on
+                     Dec. 31, 1990.
 
 
 Explanation:
 ------------
 
-The contents of this file are used by the routine DELTET to compute the 
+The contents of this file are used by the routine DELTET to compute the
 time difference
 
-[1]       DELTA_ET  =  ET - UTC                                         
-          
-the increment to be applied to UTC to give ET. 
+[1]       DELTA_ET  =  ET - UTC
+
+the increment to be applied to UTC to give ET.
 
 The difference between UTC and TAI,
 
@@ -1435,17 +1435,17 @@ is declared. Combining [1] and [2] gives
 
 The difference (ET - TAI) is periodic, and is given by
 
-[4]       ET - TAI  =  DELTA_T_A  + K sin E 
+[4]       ET - TAI  =  DELTA_T_A  + K sin E
 
-where DELTA_T_A and K are constant, and E is the eccentric anomaly of the 
-heliocentric orbit of the Earth-Moon barycenter. Equation [4], which ignores 
+where DELTA_T_A and K are constant, and E is the eccentric anomaly of the
+heliocentric orbit of the Earth-Moon barycenter. Equation [4], which ignores
 small-period fluctuations, is accurate to about 0.000030 seconds.
 
-The eccentric anomaly E is given by 
+The eccentric anomaly E is given by
 
 [5]       E = M + EB sin M
 
-where M is the mean anomaly, which in turn is given by 
+where M is the mean anomaly, which in turn is given by
 
 [6]       M = M  +  M t
                0     1
@@ -1463,7 +1463,7 @@ Thus, in order to compute DELTA_ET, the following items are necessary.
 
 The numbers, and the formulation, are taken from the following sources.
 
-     1) Moyer, T.D., Transformation from Proper Time on Earth to 
+     1) Moyer, T.D., Transformation from Proper Time on Earth to
         Coordinate Time in Solar System Barycentric Space-Time Frame
         of Reference, Parts 1 and 2, Celestial Mechanics 23 (1981),
         33-56 and 57-68.
@@ -1472,7 +1472,7 @@ The numbers, and the formulation, are taken from the following sources.
         Reference System on Algorithms for Computing Time Differences
         and Clock Rates, JPL IOM 314.5--942, 1 October 1985.
 
-The variable names used above are consistent with those used in the 
+The variable names used above are consistent with those used in the
 Astronomical Almanac.
 
 \begindata
@@ -1483,32 +1483,32 @@ DELTET/EB              =    1.671D-2
 DELTET/M               = (  6.239996D0   1.99096871D-7 )
 
 DELTET/DELTA_AT        = ( 10,   @1972-JAN-1
-                           11,   @1972-JUL-1     
-                           12,   @1973-JAN-1     
-                           13,   @1974-JAN-1     
-                           14,   @1975-JAN-1          
-                           15,   @1976-JAN-1          
-                           16,   @1977-JAN-1          
-                           17,   @1978-JAN-1          
-                           18,   @1979-JAN-1          
-                           19,   @1980-JAN-1          
-                           20,   @1981-JUL-1          
-                           21,   @1982-JUL-1          
-                           22,   @1983-JUL-1          
-                           23,   @1985-JUL-1          
-                           24,   @1988-JAN-1 
+                           11,   @1972-JUL-1
+                           12,   @1973-JAN-1
+                           13,   @1974-JAN-1
+                           14,   @1975-JAN-1
+                           15,   @1976-JAN-1
+                           16,   @1977-JAN-1
+                           17,   @1978-JAN-1
+                           18,   @1979-JAN-1
+                           19,   @1980-JAN-1
+                           20,   @1981-JUL-1
+                           21,   @1982-JUL-1
+                           22,   @1983-JUL-1
+                           23,   @1985-JUL-1
+                           24,   @1988-JAN-1
                            25,   @1990-JAN-1
-                           26,   @1991-JAN-1 
+                           26,   @1991-JAN-1
                            27,   @1992-JUL-1
                            28,   @1993-JUL-1
                            29,   @1994-JUL-1
-                           30,   @1996-JAN-1 
+                           30,   @1996-JAN-1
                            31,   @1997-JUL-1
                            32,   @1999-JAN-1
                            33,   @2006-JAN-1
                            34,   @2009-JAN-1
                            35,   @2012-JUL-1
-                           36,   @2015-JUL-1 
+                           36,   @2015-JUL-1
                            37,   @2017-JAN-1 )
 
 \begintext
diff --git a/src/util/spicemanager_lua.inl b/src/util/spicemanager_lua.inl
index f19d9a14ef..b08c9af17e 100644
--- a/src/util/spicemanager_lua.inl
+++ b/src/util/spicemanager_lua.inl
@@ -69,7 +69,7 @@ namespace {
 }
 
 /**
- * Returns a list of all loaded kernels 
+ * Returns a list of all loaded kernels
  */
 [[codegen::luawrap]] std::vector<std::string> kernels() {
     return openspace::SpiceManager::ref().loadedKernels();

From 5e9af1bc135ea1a3d7e8cca6c3bd094c7697fdaf Mon Sep 17 00:00:00 2001
From: Alexander Bock <mail@alexanderbock.eu>
Date: Sat, 10 Feb 2024 09:05:28 +0100
Subject: [PATCH 250/701] Revent point overflow when viewing the solar system
 position far in the future (closes #3021)

---
 modules/base/rendering/renderabletrailorbit.cpp | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/modules/base/rendering/renderabletrailorbit.cpp b/modules/base/rendering/renderabletrailorbit.cpp
index 57c40622b9..81db88850c 100644
--- a/modules/base/rendering/renderabletrailorbit.cpp
+++ b/modules/base/rendering/renderabletrailorbit.cpp
@@ -378,7 +378,7 @@ RenderableTrailOrbit::UpdateReport RenderableTrailOrbit::updateTrails(
         }
 
         // See how many points we need to drop
-        const int nNewPoints = static_cast<int>(floor(delta / secondsPerPoint));
+        const uint64_t nNewPoints = static_cast<uint64_t>(floor(delta / secondsPerPoint));
 
         // If we would need to generate more new points than there are total points in the
         // array, it is faster to regenerate the entire array
@@ -412,12 +412,13 @@ RenderableTrailOrbit::UpdateReport RenderableTrailOrbit::updateTrails(
         // future
         _firstPointTime += nNewPoints * secondsPerPoint;
 
-        return { false, true, nNewPoints };
+        return { false, true, static_cast<int>(nNewPoints) };
     }
     else {
         // See how many new points needs to be generated. Delta is negative, so we need
         // to invert the ratio
-        const int nNewPoints = -(static_cast<int>(floor(delta / secondsPerPoint)));
+        const uint64_t nNewPoints =
+            -(static_cast<uint64_t>(floor(delta / secondsPerPoint)));
 
         // If we would need to generate more new points than there are total points in the
         // array, it is faster to regenerate the entire array
@@ -453,7 +454,7 @@ RenderableTrailOrbit::UpdateReport RenderableTrailOrbit::updateTrails(
         // The previously youngest point has become nNewPoints steps older
         _lastPointTime -= nNewPoints * secondsPerPoint;
 
-        return { false, true, -nNewPoints };
+        return { false, true, static_cast<int>(-nNewPoints) };
     }
 }
 

From fa1847d235ee740063eed3ef789d6c7e5526d3e2 Mon Sep 17 00:00:00 2001
From: Alexander Bock <mail@alexanderbock.eu>
Date: Sat, 10 Feb 2024 10:18:57 +0100
Subject: [PATCH 251/701] Add Lua function to load a JSON file

---
 include/openspace/util/json_helper.h      |  5 ++
 modules/sync/syncs/urlsynchronization.cpp |  2 +-
 src/engine/openspaceengine.cpp            |  3 +-
 src/engine/openspaceengine_lua.inl        | 17 +++++++
 src/util/json_helper.cpp                  | 59 +++++++++++++++++++++++
 5 files changed, 84 insertions(+), 2 deletions(-)

diff --git a/include/openspace/util/json_helper.h b/include/openspace/util/json_helper.h
index ee437bc65d..8d089cdee2 100644
--- a/include/openspace/util/json_helper.h
+++ b/include/openspace/util/json_helper.h
@@ -75,6 +75,11 @@ std::string formatJson(T value);
  */
 void sortJson(nlohmann::json& json, const std::string& key);
 
+/**
+ * Converts the provided JSON object into its corresponding Dictionary format. 
+ */
+ghoul::Dictionary jsonToDictionary(const nlohmann::json& json);
+
 } // namespace openspace
 
 #include "json_helper.inl"
diff --git a/modules/sync/syncs/urlsynchronization.cpp b/modules/sync/syncs/urlsynchronization.cpp
index b4fe997eb8..c919736fa2 100644
--- a/modules/sync/syncs/urlsynchronization.cpp
+++ b/modules/sync/syncs/urlsynchronization.cpp
@@ -133,7 +133,7 @@ UrlSynchronization::UrlSynchronization(const ghoul::Dictionary& dictionary,
 
     if (p.forceOverride.has_value()) {
         LWARNING(fmt::format(
-            "{}: The variable ForceOverride has been deprecated."
+            "{}: The variable ForceOverride has been deprecated. "
             "Optionally, use SecondsUntilResync instead to specify file validity date.",
             p.identifier
         ));
diff --git a/src/engine/openspaceengine.cpp b/src/engine/openspaceengine.cpp
index e343909766..45bbafdd72 100644
--- a/src/engine/openspaceengine.cpp
+++ b/src/engine/openspaceengine.cpp
@@ -1698,7 +1698,8 @@ scripting::LuaLibrary OpenSpaceEngine::luaLibrary() {
             codegen::lua::ReadCSVFile,
             codegen::lua::ResetCamera,
             codegen::lua::Configuration,
-            codegen::lua::LayerServer
+            codegen::lua::LayerServer,
+            codegen::lua::LoadJson
         },
         {
             absPath("${SCRIPTS}/core_scripts.lua")
diff --git a/src/engine/openspaceengine_lua.inl b/src/engine/openspaceengine_lua.inl
index 3e310294b4..43a85dabc7 100644
--- a/src/engine/openspaceengine_lua.inl
+++ b/src/engine/openspaceengine_lua.inl
@@ -251,4 +251,21 @@ namespace {
     return layerServerToString(config.layerServer);
 }
 
+/**
+ * Loads the provided JSON file and returns it back to the caller.
+ */
+[[codegen::luawrap]] ghoul::Dictionary loadJson(std::filesystem::path path) {
+    if (!std::filesystem::exists(path)) {
+        throw ghoul::RuntimeError(fmt::format("File {} did not exist", path));
+    }
+
+    std::ifstream f(path);
+    std::string contents = std::string(
+        (std::istreambuf_iterator<char>(f)),
+        std::istreambuf_iterator<char>()
+    );
+    nlohmann::json json = nlohmann::json::parse(contents);
+    return openspace::jsonToDictionary(json);
+}
+
 #include "openspaceengine_lua_codegen.cpp"
diff --git a/src/util/json_helper.cpp b/src/util/json_helper.cpp
index cafd1c4c90..8515ab0a04 100644
--- a/src/util/json_helper.cpp
+++ b/src/util/json_helper.cpp
@@ -99,4 +99,63 @@ void sortJson(nlohmann::json& json, const std::string& key) {
     );
 }
 
+ghoul::Dictionary jsonToDictionary(const nlohmann::json& json) {
+    if (!json.is_object()) {
+        throw ghoul::RuntimeError("Provided JSON is not an object type");
+    }
+
+    using Func = std::function<
+        void(ghoul::Dictionary& dict, std::string key, const nlohmann::json& j)
+    >;
+    Func addToDict = [&addToDict](ghoul::Dictionary& dict, std::string key,
+                                  const nlohmann::json& j)
+    {
+        switch (j.type()) {
+        case nlohmann::json::value_t::null:
+        case nlohmann::json::value_t::discarded:
+                break;
+            case nlohmann::json::value_t::object: {
+                ghoul::Dictionary subDict = jsonToDictionary(j);
+                dict.setValue(key, std::move(subDict));
+                break;
+            }
+            case nlohmann::json::value_t::array: {
+                // We can't represent arrays with different types, so we have to use a
+                // Dictionary for that instead
+                ghoul::Dictionary subDict;
+                for (int i = 0; i < j.size(); i++) {
+                    const nlohmann::json& value = j[i];
+                    // We add 1 to the key to make Lua happy :-/
+                    addToDict(subDict, fmt::format("{}", i + 1), value);
+                }
+                dict.setValue(key, std::move(subDict));
+                break;
+            }
+            case nlohmann::json::value_t::string:
+                dict.setValue(key, j.get<std::string>());
+                break;
+            case nlohmann::json::value_t::boolean:
+                dict.setValue(key, j.get<bool>());
+                break;
+            case nlohmann::json::value_t::number_integer:
+            case nlohmann::json::value_t::number_unsigned:
+            case nlohmann::json::value_t::number_float:
+                dict.setValue(key, j.get<double>());
+                break;
+            case nlohmann::json::value_t::binary:
+                throw ghoul::RuntimeError(
+                    "Binary format conversion to Dictionary is unsupported. Please "
+                    "create an issue with an example of the file that lead to this error"
+                );
+        }
+    };
+
+
+    ghoul::Dictionary result;
+    for (auto& [key, value] : json.get<nlohmann::json::object_t>()) {
+        addToDict(result, key, value);
+    }
+    return result;
+}
+
 }  // namespace openspace

From 15e3cbbb68e9ba25774bcf1f4bb33151d0021f08 Mon Sep 17 00:00:00 2001
From: Alexander Bock <mail@alexanderbock.eu>
Date: Sat, 10 Feb 2024 10:23:20 +0100
Subject: [PATCH 252/701] Add documentation to JSON loading functions

---
 include/openspace/util/json_helper.h | 4 +++-
 src/engine/openspaceengine_lua.inl   | 4 +++-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/include/openspace/util/json_helper.h b/include/openspace/util/json_helper.h
index 8d089cdee2..00e5f62b6c 100644
--- a/include/openspace/util/json_helper.h
+++ b/include/openspace/util/json_helper.h
@@ -76,7 +76,9 @@ std::string formatJson(T value);
 void sortJson(nlohmann::json& json, const std::string& key);
 
 /**
- * Converts the provided JSON object into its corresponding Dictionary format. 
+ * Converts the provided JSON object into its corresponding Dictionary format. Please note
+ * that if the JSON contains keys that array of an array type, they are converted into a
+ * Dictionary with numerical keys and the numerical keys start with 1.
  */
 ghoul::Dictionary jsonToDictionary(const nlohmann::json& json);
 
diff --git a/src/engine/openspaceengine_lua.inl b/src/engine/openspaceengine_lua.inl
index 43a85dabc7..128133a9f0 100644
--- a/src/engine/openspaceengine_lua.inl
+++ b/src/engine/openspaceengine_lua.inl
@@ -252,7 +252,9 @@ namespace {
 }
 
 /**
- * Loads the provided JSON file and returns it back to the caller.
+ * Loads the provided JSON file and returns it back to the caller. Please note that if the
+ * JSON contains keys that array of an array type, they are converted into a Dictionary
+ * with numerical keys and the numerical keys start with 1.
  */
 [[codegen::luawrap]] ghoul::Dictionary loadJson(std::filesystem::path path) {
     if (!std::filesystem::exists(path)) {

From 1691b92575b8d4aa4dee8595cd25da94950a2b27 Mon Sep 17 00:00:00 2001
From: Alexander Bock <mail@alexanderbock.eu>
Date: Mon, 12 Feb 2024 09:11:03 +0900
Subject: [PATCH 253/701] Fix compile issue with the previous commit

---
 include/openspace/util/json_helper.h | 1 +
 1 file changed, 1 insertion(+)

diff --git a/include/openspace/util/json_helper.h b/include/openspace/util/json_helper.h
index 00e5f62b6c..af656d89ee 100644
--- a/include/openspace/util/json_helper.h
+++ b/include/openspace/util/json_helper.h
@@ -27,6 +27,7 @@
 
 #include <string>
 #include <openspace/json.h>
+#include <ghoul/misc/dictionary.h>
 
 namespace openspace {
 

From adad4ab0ff6648ece697a346234da84ba41a543e Mon Sep 17 00:00:00 2001
From: Alexander Bock <mail@alexanderbock.eu>
Date: Mon, 12 Feb 2024 11:39:08 +0900
Subject: [PATCH 254/701] Make the DestinationFrame in the SpiceRotation option
 and use GALACTIC if it is not specified

---
 include/openspace/util/json_helper.h     | 2 +-
 modules/space/rotation/spicerotation.cpp | 8 +++++---
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/include/openspace/util/json_helper.h b/include/openspace/util/json_helper.h
index af656d89ee..b98e67f645 100644
--- a/include/openspace/util/json_helper.h
+++ b/include/openspace/util/json_helper.h
@@ -25,9 +25,9 @@
 #ifndef __OPENSPACE_CORE___JSON_HELPER___H__
 #define __OPENSPACE_CORE___JSON_HELPER___H__
 
-#include <string>
 #include <openspace/json.h>
 #include <ghoul/misc/dictionary.h>
+#include <string>
 
 namespace openspace {
 
diff --git a/modules/space/rotation/spicerotation.cpp b/modules/space/rotation/spicerotation.cpp
index 3dfa015bfa..79d3744c67 100644
--- a/modules/space/rotation/spicerotation.cpp
+++ b/modules/space/rotation/spicerotation.cpp
@@ -68,8 +68,10 @@ namespace {
         std::string sourceFrame
             [[codegen::annotation("A valid SPICE NAIF name or integer")]];
 
-        // [[codegen::verbatim(DestinationInfo.description)]]
-        std::string destinationFrame;
+        // This value specifies the destination frame that is used for the coordinate
+        // transformation. This has to be a valid SPICE name. If this value is not
+        // specified, a reference frame of 'GALACTIC' is used instead
+        std::optional<std::string> destinationFrame;
 
         // [[codegen::verbatim(DestinationInfo.description)]]
         std::optional<std::variant<std::vector<std::string>, std::string>> kernels;
@@ -99,7 +101,7 @@ SpiceRotation::SpiceRotation(const ghoul::Dictionary& dictionary)
     const Parameters p = codegen::bake<Parameters>(dictionary);
 
     _sourceFrame = p.sourceFrame;
-    _destinationFrame = p.destinationFrame;
+    _destinationFrame = p.destinationFrame.value_or("GALACTIC");
 
     if (p.kernels.has_value()) {
         if (std::holds_alternative<std::string>(*p.kernels)) {

From de5a4352ec005480f7f5fe98d4def94abefdd49b Mon Sep 17 00:00:00 2001
From: Arohdin <adam.rohdin@liu.se>
Date: Tue, 13 Feb 2024 14:49:46 +0100
Subject: [PATCH 255/701] Solves issue for incorrect FOV (Planar Projection)

---
 apps/OpenSpace/ext/launcher/src/sgctedit/windowcontrol.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/apps/OpenSpace/ext/launcher/src/sgctedit/windowcontrol.cpp b/apps/OpenSpace/ext/launcher/src/sgctedit/windowcontrol.cpp
index 431e6ab789..1bf757a41c 100644
--- a/apps/OpenSpace/ext/launcher/src/sgctedit/windowcontrol.cpp
+++ b/apps/OpenSpace/ext/launcher/src/sgctedit/windowcontrol.cpp
@@ -723,10 +723,10 @@ sgct::config::Projections WindowControl::generateProjectionInformation() const {
             }
         case ProjectionIndices::Planar:
             {
-                double fovH = _planar.fovH->text().toFloat();
+                double fovH = _planar.fovH->value();
                 fovH = std::clamp(fovH, FovEpsilon, 180.0 - FovEpsilon);
                 
-                double fovV = _planar.fovV->text().toFloat();
+                double fovV = _planar.fovV->value();
                 fovV = std::clamp(fovV, FovEpsilon, 180.0 - FovEpsilon);
 
                 // The negative values for left & down are due to SGCT's convention

From f9a01d507ecf7db611049184287c2451dec800f1 Mon Sep 17 00:00:00 2001
From: Alexander Bock <mail@alexanderbock.eu>
Date: Thu, 15 Feb 2024 11:19:41 +0900
Subject: [PATCH 256/701] Make the co-rotation dependent on the bounding sphere
 rather than interaction sphere (closes #3017)

---
 src/navigation/orbitalnavigator.cpp | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/navigation/orbitalnavigator.cpp b/src/navigation/orbitalnavigator.cpp
index ca5bfd8a21..268acbebd2 100644
--- a/src/navigation/orbitalnavigator.cpp
+++ b/src/navigation/orbitalnavigator.cpp
@@ -1247,11 +1247,11 @@ bool OrbitalNavigator::shouldFollowAnchorRotation(const glm::dvec3& cameraPositi
     const glm::dvec3 cameraPositionModelSpace = glm::dvec3(inverseModelTransform *
         glm::dvec4(cameraPosition, 1.0));
 
-    const SurfacePositionHandle positionHandle =
-        _anchorNode->calculateSurfacePositionHandle(cameraPositionModelSpace);
+    const glm::dvec3 centerToReference =
+        glm::normalize(cameraPositionModelSpace) * _anchorNode->boundingSphere();
 
     const double maximumDistanceForRotation = glm::length(
-        glm::dmat3(modelTransform) * positionHandle.centerToReferenceSurface
+        glm::dmat3(modelTransform) * centerToReference
     ) * _followAnchorNodeRotationDistance;
 
     const double distanceToCamera =

From 815dfe11f141ffced47d429f428ac06f844b340f Mon Sep 17 00:00:00 2001
From: Alexander Bock <mail@alexanderbock.eu>
Date: Thu, 15 Feb 2024 15:56:19 +0900
Subject: [PATCH 257/701] Add the ability to specify properties and requiring
 confirmation (#3006)

---
 include/openspace/properties/property.h            | 11 +++++++++++
 .../rendering/atmospheredeferredcaster.cpp         |  4 ++++
 modules/webbrowser/src/browserinstance.cpp         |  2 ++
 src/properties/property.cpp                        | 14 +++++++++++++-
 src/scene/assetmanager.cpp                         |  5 ++++-
 5 files changed, 34 insertions(+), 2 deletions(-)

diff --git a/include/openspace/properties/property.h b/include/openspace/properties/property.h
index e1d71a4b7f..2d1e6721e1 100644
--- a/include/openspace/properties/property.h
+++ b/include/openspace/properties/property.h
@@ -381,6 +381,17 @@ public:
      */
     void setReadOnly(bool state);
 
+    /**
+     * This method determines if this Property requires confirmation upon every change of
+     * the value. This setting is only a hint and does not need to be followed by GUI
+     * applications and does not have any effect on the Property::set or
+     * Property::setLuaValue methods. The value is stored in the metaData Dictionary with
+     * the key: `needsConfirmation`. The default value is `false`.
+     *
+     * \param state `true` if the Property needs confirmation, `false` otherwise
+     */
+    void setNeedsConfirmation(bool state);
+
     /**
      * Default view options that can be used in the Property::setViewOption method. The
      * values are:
diff --git a/modules/atmosphere/rendering/atmospheredeferredcaster.cpp b/modules/atmosphere/rendering/atmospheredeferredcaster.cpp
index 319f2b8e59..9f5ee33b0d 100644
--- a/modules/atmosphere/rendering/atmospheredeferredcaster.cpp
+++ b/modules/atmosphere/rendering/atmospheredeferredcaster.cpp
@@ -316,6 +316,8 @@ void AtmosphereDeferredcaster::preRaycast(const RenderData& data, const Deferred
                                           ghoul::opengl::ProgramObject& prg)
 {
     ZoneScoped;
+    TracyGpuZone("Atmosphere preRaycast");
+
 
     // Atmosphere Frustum Culling
     glm::dvec3 tPlanetPos = glm::dvec3(_modelTransform * glm::dvec4(0.0, 0.0, 0.0, 1.0));
@@ -521,6 +523,8 @@ void AtmosphereDeferredcaster::postRaycast(const RenderData&, const Deferredcast
 {
     ZoneScoped;
 
+    TracyGpuZone("Atmosphere postRaycast");
+
     // Deactivate the texture units
     _transmittanceTableTextureUnit.deactivate();
     _irradianceTableTextureUnit.deactivate();
diff --git a/modules/webbrowser/src/browserinstance.cpp b/modules/webbrowser/src/browserinstance.cpp
index 22e85fbb74..33da63a9da 100644
--- a/modules/webbrowser/src/browserinstance.cpp
+++ b/modules/webbrowser/src/browserinstance.cpp
@@ -118,6 +118,8 @@ void BrowserInstance::reshape(const glm::ivec2& windowSize) {
 
 void BrowserInstance::draw() {
     ZoneScoped;
+    TracyGpuZone("CEF Draw");
+
 
     if (_zoomLevel != _browser->GetHost()->GetZoomLevel()) {
         _browser->GetHost()->SetZoomLevel(_zoomLevel);
diff --git a/src/properties/property.cpp b/src/properties/property.cpp
index 5acbb31a70..344f7721dd 100644
--- a/src/properties/property.cpp
+++ b/src/properties/property.cpp
@@ -34,6 +34,7 @@
 namespace {
     constexpr std::string_view MetaDataKeyGroup = "Group";
     constexpr std::string_view MetaDataKeyReadOnly = "isReadOnly";
+    constexpr std::string_view MetaDataKeyNeedsConfirmation = "needsConfirmation";
     constexpr std::string_view MetaDataKeyViewOptions = "ViewOptions";
     constexpr std::string_view MetaDataKeyVisibility = "Visibility";
 
@@ -150,6 +151,10 @@ void Property::setReadOnly(bool state) {
     _metaData.setValue(std::string(MetaDataKeyReadOnly), state);
 }
 
+void Property::setNeedsConfirmation(bool state) {
+    _metaData.setValue(std::string(MetaDataKeyNeedsConfirmation), state);
+}
+
 void Property::setViewOption(std::string option, bool value) {
     ghoul::Dictionary d;
     d.setValue(option, value);
@@ -295,6 +300,12 @@ std::string Property::generateMetaDataJsonDescription() const {
     }
     std::string isReadOnlyString = (isReadOnly ? "true" : "false");
 
+    bool needsConfirmation = false;
+    if (_metaData.hasValue<bool>(MetaDataKeyNeedsConfirmation)) {
+        needsConfirmation = _metaData.value<bool>(MetaDataKeyNeedsConfirmation);
+    }
+    std::string needsConfirmationString = (needsConfirmation ? "true" : "false");
+
     std::string groupId = groupIdentifier();
     std::string sanitizedGroupId = escapedJson(groupId);
 
@@ -306,10 +317,11 @@ std::string Property::generateMetaDataJsonDescription() const {
     }
 
     std::string result = fmt::format(
-        R"({{"{}":"{}","{}":"{}","{}":{},"{}":{}}})",
+        R"({{"{}":"{}","{}":"{}","{}":{},"{}":{},"{}":{}}})",
         MetaDataKeyGroup, sanitizedGroupId,
         MetaDataKeyVisibility, vis,
         MetaDataKeyReadOnly, isReadOnlyString,
+        MetaDataKeyNeedsConfirmation, needsConfirmationString,
         MetaDataKeyViewOptions, viewOptions
     );
     return result;
diff --git a/src/scene/assetmanager.cpp b/src/scene/assetmanager.cpp
index a3b5086956..a085346bd8 100644
--- a/src/scene/assetmanager.cpp
+++ b/src/scene/assetmanager.cpp
@@ -914,7 +914,10 @@ Asset* AssetManager::retrieveAsset(const std::filesystem::path& path,
     }
 
     if (!std::filesystem::is_regular_file(path)) {
-        throw ghoul::RuntimeError(fmt::format("Could not find asset file {}", path));
+        throw ghoul::RuntimeError(fmt::format(
+            "Could not find asset file {} requested by {}",
+            path, retriever
+        ));
     }
     auto asset = std::make_unique<Asset>(*this, path, explicitEnable);
     Asset* res = asset.get();

From be95530ce337c84584b3295491417587a93dc00a Mon Sep 17 00:00:00 2001
From: Joakim Kilby <jockekilby@gmail.com>
Date: Mon, 19 Feb 2024 10:10:35 +0100
Subject: [PATCH 258/701] Update rotation source frame specification in
 apollo15.asset

---
 data/assets/scene/solarsystem/missions/apollo/15/apollo15.asset | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/data/assets/scene/solarsystem/missions/apollo/15/apollo15.asset b/data/assets/scene/solarsystem/missions/apollo/15/apollo15.asset
index cf6ee7602f..73aeabc4f4 100644
--- a/data/assets/scene/solarsystem/missions/apollo/15/apollo15.asset
+++ b/data/assets/scene/solarsystem/missions/apollo/15/apollo15.asset
@@ -26,7 +26,7 @@ local Apollo15 = {
     },
     Rotation = {
       Type = "SpiceRotation",
-      SourceFrame = kernels.ID.Apollo15Metric,
+      SourceFrame = kernels.Frame.Apollo15Metric,
       DestinationFrame = coreKernels.Frame.Galactic
     }
   },

From da2c2df3a63cf04a051c3edb5119849262d8609a Mon Sep 17 00:00:00 2001
From: Emma Broman <emma.broman@liu.se>
Date: Mon, 19 Feb 2024 10:52:03 +0100
Subject: [PATCH 259/701] Fix interpolated points example

Did not have the updates for the color map helper asset
---
 data/assets/examples/pointclouds/interpolated_points.asset | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/data/assets/examples/pointclouds/interpolated_points.asset b/data/assets/examples/pointclouds/interpolated_points.asset
index ee0110f364..b938060750 100644
--- a/data/assets/examples/pointclouds/interpolated_points.asset
+++ b/data/assets/examples/pointclouds/interpolated_points.asset
@@ -1,3 +1,7 @@
+local colormaps = asset.require("util/default_colormaps")
+
+
+
 local Points = {
   Identifier = "Example_InterpolatedPoints_ColorMapped",
   Renderable = {
@@ -12,7 +16,7 @@ local Points = {
     -- Both the position and data values will be interpolated, so use a color map
     Coloring = {
       ColorMapping = {
-        File = asset.resource("viridis.cmap")
+        File = colormaps.Uniform.Viridis
       }
     },
     -- Reduce the scale of the points a bit compared to default, so we see them more clearly

From 1b5335fa895614cc4ed6624aac63330cec474158 Mon Sep 17 00:00:00 2001
From: Alexander Bock <alexander.bock@liu.se>
Date: Mon, 19 Feb 2024 11:42:50 +0100
Subject: [PATCH 260/701] Update Slack invite link

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 22f0d4d176..4362c8c955 100644
--- a/README.md
+++ b/README.md
@@ -42,7 +42,7 @@ Requirements for compiling are:
  - [Boost](http://www.boost.org/)
  - [Qt](http://www.qt.io/download)
 
-Feel free to create issues for missing features, bug reports, or compile problems or contact us via [email](mailto:openspace@amnh.org?subject=OpenSpace:).  Regarding any issues, you are very welcome on our [Slack support channel](https://openspacesupport.slack.com) to which you can freely [sign-up](https://join.slack.com/t/openspacesupport/shared_invite/zt-37niq6y9-T0JaCIk4UoFLI4VF5U9Vsw).
+Feel free to create issues for missing features, bug reports, or compile problems or contact us via [email](mailto:openspace@amnh.org?subject=OpenSpace:).  Regarding any issues, you are very welcome on our [Slack support channel](https://openspacesupport.slack.com) to which you can freely [sign-up](https://join.slack.com/t/openspacesupport/shared_invite/zt-24uhn3wvo-gCGHgjg2m9tHzKUEb_FyMQ).
 
 ![Image](https://docs.openspaceproject.com/en/latest/_static/images/himalaya-nkpg-dome.jpg)
 

From 8fddd5585186801a23be6d11fb0bbcc60bb9cdab Mon Sep 17 00:00:00 2001
From: Emma Broman <emma.broman@liu.se>
Date: Tue, 20 Feb 2024 08:39:54 +0100
Subject: [PATCH 261/701] Fix a couple of point cloud related problems

* crash that occurs when loading an empty dataset
* trying to access outside of range when sampling color or size values
---
 include/openspace/data/dataloader.h                        | 2 ++
 modules/base/rendering/pointcloud/renderablepointcloud.cpp | 4 ++--
 src/data/dataloader.cpp                                    | 4 ++++
 src/rendering/colormappingcomponent.cpp                    | 4 ++++
 4 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/include/openspace/data/dataloader.h b/include/openspace/data/dataloader.h
index 73ca6a0e07..22101bb691 100644
--- a/include/openspace/data/dataloader.h
+++ b/include/openspace/data/dataloader.h
@@ -71,6 +71,8 @@ struct Dataset {
     /// the dataset
     float maxPositionComponent = 0.f;
 
+    bool isEmpty() const;
+
     int index(std::string_view variableName) const;
     bool normalizeVariable(std::string_view variableName);
     glm::vec2 findValueRange(int variableIndex) const;
diff --git a/modules/base/rendering/pointcloud/renderablepointcloud.cpp b/modules/base/rendering/pointcloud/renderablepointcloud.cpp
index a360b3f91b..bd83bc3044 100644
--- a/modules/base/rendering/pointcloud/renderablepointcloud.cpp
+++ b/modules/base/rendering/pointcloud/renderablepointcloud.cpp
@@ -1072,12 +1072,12 @@ std::vector<float> RenderablePointCloud::createDataSlice() {
         }
 
         // Colors
-        if (_hasColorMapFile) {
+        if (_hasColorMapFile && colorParamIndex > -1) {
             result.push_back(e.data[colorParamIndex]);
         }
 
         // Size data
-        if (_hasDatavarSize) {
+        if (_hasDatavarSize && sizeParamIndex > -1) {
             // @TODO: Consider more detailed control over the scaling. Currently the value
             // is multiplied with the value as is. Should have similar mapping properties
             // as the color mapping
diff --git a/src/data/dataloader.cpp b/src/data/dataloader.cpp
index bc7fb74543..7234aaa613 100644
--- a/src/data/dataloader.cpp
+++ b/src/data/dataloader.cpp
@@ -623,6 +623,10 @@ ColorMap loadFileWithCache(std::filesystem::path path)
 
 } // namespace color
 
+bool Dataset::isEmpty() const {
+    return variables.empty() || entries.empty();
+}
+
 int Dataset::index(std::string_view variableName) const {
     for (const Dataset::Variable& v : variables) {
         if (v.name == variableName) {
diff --git a/src/rendering/colormappingcomponent.cpp b/src/rendering/colormappingcomponent.cpp
index c2ce901d4a..ddac7f80dd 100644
--- a/src/rendering/colormappingcomponent.cpp
+++ b/src/rendering/colormappingcomponent.cpp
@@ -428,6 +428,10 @@ glm::vec4 ColorMappingComponent::colorFromColorMap(float valueToColorFrom) const
 }
 
 void ColorMappingComponent::initializeParameterData(const dataloader::Dataset& dataset) {
+    if (dataset.isEmpty()) {
+        return;
+    }
+
     // Initialize empty ranges based on values in the dataset
     for (const properties::OptionProperty::Option& option : dataColumn.options()) {
         int optionIndex = option.value;

From 15429ddbc614c5db497ba1e75c00b0c5df41a82c Mon Sep 17 00:00:00 2001
From: Emma Broman <emma.broman@liu.se>
Date: Tue, 20 Feb 2024 15:47:35 +0100
Subject: [PATCH 262/701] Fix wrong kernels being used for Neptune's inner
 moons

Copy paste error in kernel handling update
---
 .../assets/scene/solarsystem/planets/neptune/kernels095.asset | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/data/assets/scene/solarsystem/planets/neptune/kernels095.asset b/data/assets/scene/solarsystem/planets/neptune/kernels095.asset
index ebd656215f..f216a1f0a6 100644
--- a/data/assets/scene/solarsystem/planets/neptune/kernels095.asset
+++ b/data/assets/scene/solarsystem/planets/neptune/kernels095.asset
@@ -31,11 +31,11 @@ local Frame = {
 
 
 asset.onInitialize(function()
-  openspace.spice.loadKernel(kernels .. "nep102.bsp")
+  openspace.spice.loadKernel(kernels .. "nep095.bsp")
 end)
 
 asset.onDeinitialize(function()
-  openspace.spice.unloadKernel(kernels .. "nep102.bsp")
+  openspace.spice.unloadKernel(kernels .. "nep095.bsp")
 end)
 
 asset.export("ID", ID)

From c763c7d036c2cd8a398a1e00a51ff3b8cbca4d0d Mon Sep 17 00:00:00 2001
From: Emma Broman <emma.broman@liu.se>
Date: Wed, 21 Feb 2024 08:54:11 +0100
Subject: [PATCH 263/701] Fix typo in Tessellation parameter struct ("ebabled")

---
 modules/globebrowsing/src/geojson/geojsonproperties.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/globebrowsing/src/geojson/geojsonproperties.cpp b/modules/globebrowsing/src/geojson/geojsonproperties.cpp
index 50aa4c9f8c..7c828f7a3c 100644
--- a/modules/globebrowsing/src/geojson/geojsonproperties.cpp
+++ b/modules/globebrowsing/src/geojson/geojsonproperties.cpp
@@ -336,7 +336,7 @@ namespace {
 
         struct Tessellation {
             // [[codegen::verbatim(TessellationEnabledInfo.description)]]
-            std::optional<bool> ebabled;
+            std::optional<bool> enabled;
 
             // [[codegen::verbatim(UseTessellationLevelInfo.description)]]
             std::optional<bool> useTessellationLevel;

From 50b169128102ba0e5b95a9952651e40a63260b21 Mon Sep 17 00:00:00 2001
From: Ylva Selling <ylva.selling@liu.se>
Date: Wed, 21 Feb 2024 10:49:48 +0100
Subject: [PATCH 264/701] Remove nestling and make members of table more
 accessible

---
 src/util/factorymanager.cpp | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/util/factorymanager.cpp b/src/util/factorymanager.cpp
index 48665796a0..567b11b4f6 100644
--- a/src/util/factorymanager.cpp
+++ b/src/util/factorymanager.cpp
@@ -82,9 +82,11 @@ nlohmann::json generateJsonDocumentation(const Documentation& d) {
         }
         else if (tv) {
             Documentation doc = { .entries = tv->documentations };
-            nlohmann::json restrictions = generateJsonDocumentation(doc);
             // We have a TableVerifier, so we need to recurse
-            entry["restrictions"] = restrictions;
+            nlohmann::json tableDocs = generateJsonDocumentation(doc);
+            // Set the members entry to the members of the table
+            // to not have unnecessary nestling
+            entry["members"] = tableDocs["members"];
         }
         else {
             entry["description"] = p.verifier->documentation();

From c613ddc41227416006830e372ac57c286fd0a99e Mon Sep 17 00:00:00 2001
From: Ylva Selling <ylva.selling@liu.se>
Date: Wed, 21 Feb 2024 13:39:22 +0100
Subject: [PATCH 265/701] Update comment

---
 src/util/factorymanager.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/util/factorymanager.cpp b/src/util/factorymanager.cpp
index 567b11b4f6..283e2f8061 100644
--- a/src/util/factorymanager.cpp
+++ b/src/util/factorymanager.cpp
@@ -82,7 +82,7 @@ nlohmann::json generateJsonDocumentation(const Documentation& d) {
         }
         else if (tv) {
             Documentation doc = { .entries = tv->documentations };
-            // We have a TableVerifier, so we need to recurse
+            // Recurse to find the members of the table
             nlohmann::json tableDocs = generateJsonDocumentation(doc);
             // Set the members entry to the members of the table
             // to not have unnecessary nestling

From 217a7b6c7054fbdcb248adfd3548cac4e3e4196d Mon Sep 17 00:00:00 2001
From: Gene Payne <payne.gene@gmail.com>
Date: Wed, 21 Feb 2024 15:32:03 -0700
Subject: [PATCH 266/701] Add new eclipse test

---
 tests/visual/eclipse/earth1966.ostest | 12 ++++++++++++
 1 file changed, 12 insertions(+)
 create mode 100644 tests/visual/eclipse/earth1966.ostest

diff --git a/tests/visual/eclipse/earth1966.ostest b/tests/visual/eclipse/earth1966.ostest
new file mode 100644
index 0000000000..deea44d657
--- /dev/null
+++ b/tests/visual/eclipse/earth1966.ostest
@@ -0,0 +1,12 @@
+[ 
+    { "type": "pause", 
+      "value": "true"},
+    { "type": "time", 
+      "value": "1966-11-12T14:28:39.00"}, 
+    { "type": "navigationstate", 
+      "value": "{Anchor='Earth',Position={8117064.770626424,-15651002.199110571,-9165703.435119975},Up={-0.39241745239503034,-0.6078072727788707,0.6903469143937023}"},
+    { "type": "wait", 
+      "value": "30"}, 
+    { "type": "screenshot", 
+      "value": ""}
+] 

From 6751b30c03c8096ddae6740bcdb701f48a39bd8d Mon Sep 17 00:00:00 2001
From: Ylva Selling <ylva.selling@liu.se>
Date: Thu, 22 Feb 2024 09:10:51 +0100
Subject: [PATCH 267/701] Add actions to documentation file

---
 include/openspace/interaction/actionmanager.h |  1 +
 src/engine/openspaceengine.cpp                |  3 ++-
 src/interaction/actionmanager.cpp             | 20 +++++++++++++++++++
 3 files changed, 23 insertions(+), 1 deletion(-)

diff --git a/include/openspace/interaction/actionmanager.h b/include/openspace/interaction/actionmanager.h
index b8c37637ad..c965a108fc 100644
--- a/include/openspace/interaction/actionmanager.h
+++ b/include/openspace/interaction/actionmanager.h
@@ -46,6 +46,7 @@ public:
     void triggerAction(const std::string& identifier, const ghoul::Dictionary& arguments,
         ShouldBeSynchronized shouldBeSynchronized) const;
     static scripting::LuaLibrary luaLibrary();
+    nlohmann::json generateJson() const;
 
 private:
     std::unordered_map<unsigned int, Action> _actions;
diff --git a/src/engine/openspaceengine.cpp b/src/engine/openspaceengine.cpp
index 45bbafdd72..a0dca5e879 100644
--- a/src/engine/openspaceengine.cpp
+++ b/src/engine/openspaceengine.cpp
@@ -1069,6 +1069,7 @@ void OpenSpaceEngine::writeDocumentation() {
     nlohmann::json license = writer.generateJsonGroupedByLicense();
     nlohmann::json sceneProperties = settings.get();
     nlohmann::json sceneGraph = scene.get();
+    nlohmann::json actions = global::actionManager->generateJson();
 
     sceneProperties["name"] = "Settings";
     sceneGraph["name"] = "Scene";
@@ -1080,7 +1081,7 @@ void OpenSpaceEngine::writeDocumentation() {
     scriptingResult["data"] = scripting;
 
     nlohmann::json documentation = {
-        sceneGraph, sceneProperties, keybindings, license, scriptingResult, factory
+        sceneGraph, sceneProperties, actions, keybindings, license, scriptingResult, factory
     };
 
     nlohmann::json result;
diff --git a/src/interaction/actionmanager.cpp b/src/interaction/actionmanager.cpp
index 608ce69005..454e292aa2 100644
--- a/src/interaction/actionmanager.cpp
+++ b/src/interaction/actionmanager.cpp
@@ -25,6 +25,7 @@
 #include <openspace/interaction/actionmanager.h>
 
 #include <openspace/engine/globals.h>
+#include <openspace/json.h>
 #include <openspace/scripting/lualibrary.h>
 #include <openspace/scripting/scriptengine.h>
 #include <ghoul/logging/logmanager.h>
@@ -129,4 +130,23 @@ scripting::LuaLibrary ActionManager::luaLibrary() {
     };
 }
 
+nlohmann::json ActionManager::generateJson() const {
+    nlohmann::json res; 
+    res["name"] = "Actions";
+    res["data"] = nlohmann::json::array();
+
+    for (const std::pair<const unsigned int, Action>& a : _actions) {
+        const Action& action = a.second;
+        nlohmann::json d;
+        // Use identifier as name to make it more similar to scripting api
+        d["name"] = action.identifier;
+        d["guiName"] = action.name;
+        d["documentation"] = action.documentation;
+        d["command"] = action.command;
+        res["data"].push_back(d);
+    }
+    sortJson(res["data"], "name");
+    return res;
+}
+
 } // namespace openspace::interaction

From e77443b825ceb9c369bc10350a5849e8aafe52d5 Mon Sep 17 00:00:00 2001
From: Ylva Selling <ylva.selling@liu.se>
Date: Thu, 22 Feb 2024 10:41:03 +0100
Subject: [PATCH 268/701] Add events to documentation

---
 include/openspace/events/eventengine.h |  2 ++
 src/engine/openspaceengine.cpp         |  3 ++-
 src/events/eventengine.cpp             | 22 ++++++++++++++++++++++
 3 files changed, 26 insertions(+), 1 deletion(-)

diff --git a/include/openspace/events/eventengine.h b/include/openspace/events/eventengine.h
index 10f4eecca4..e1c28289d0 100644
--- a/include/openspace/events/eventengine.h
+++ b/include/openspace/events/eventengine.h
@@ -168,6 +168,8 @@ public:
 
     static scripting::LuaLibrary luaLibrary();
 
+    nlohmann::json generateJson() const;
+
 private:
     /// The storage space in which Events are stored
     ghoul::MemoryPool<4096> _memory;
diff --git a/src/engine/openspaceengine.cpp b/src/engine/openspaceengine.cpp
index a0dca5e879..731f3babe8 100644
--- a/src/engine/openspaceengine.cpp
+++ b/src/engine/openspaceengine.cpp
@@ -1070,6 +1070,7 @@ void OpenSpaceEngine::writeDocumentation() {
     nlohmann::json sceneProperties = settings.get();
     nlohmann::json sceneGraph = scene.get();
     nlohmann::json actions = global::actionManager->generateJson();
+    nlohmann::json events = global::eventEngine->generateJson();
 
     sceneProperties["name"] = "Settings";
     sceneGraph["name"] = "Scene";
@@ -1081,7 +1082,7 @@ void OpenSpaceEngine::writeDocumentation() {
     scriptingResult["data"] = scripting;
 
     nlohmann::json documentation = {
-        sceneGraph, sceneProperties, actions, keybindings, license, scriptingResult, factory
+        sceneGraph, sceneProperties, actions, events, keybindings, license, scriptingResult, factory
     };
 
     nlohmann::json result;
diff --git a/src/events/eventengine.cpp b/src/events/eventengine.cpp
index 4a5ea3589f..afce7e1e52 100644
--- a/src/events/eventengine.cpp
+++ b/src/events/eventengine.cpp
@@ -258,4 +258,26 @@ scripting::LuaLibrary EventEngine::luaLibrary() {
     };
 }
 
+nlohmann::json EventEngine::generateJson() const {
+    nlohmann::json result;
+    result["name"] = "Events";
+    nlohmann::json data = nlohmann::json::array();
+
+    for (auto& [key, value] : _eventActions) {
+        nlohmann::json eventJson;
+        std::string eventName = std::string(events::toString(key));
+        eventJson["name"] = eventName;
+        data.push_back(eventJson);
+    }
+    for (auto& [key, value] : _eventTopics) {
+        nlohmann::json eventJson;
+        std::string eventName = std::string(events::toString(key));
+        eventJson["name"] = eventName;
+        data.push_back(eventJson);
+    }
+
+    result["data"] = data;
+    return result;
+}
+
 } // namespace openspace

From 7a551774bcb4878ba8fec0fa50ed250a0d9331dd Mon Sep 17 00:00:00 2001
From: Arohdin <adam.rohdin@outlook.com>
Date: Fri, 23 Feb 2024 11:32:21 +0100
Subject: [PATCH 269/701] Updated ghoul submodule

---
 ext/ghoul | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ext/ghoul b/ext/ghoul
index 06d72a031c..2905908df8 160000
--- a/ext/ghoul
+++ b/ext/ghoul
@@ -1 +1 @@
-Subproject commit 06d72a031c1b56769ab8eb06ea25231471b3ee9c
+Subproject commit 2905908df8dc4f6fc025f4f73834819706b3afe0

From 373f4ca924f2b0db52b20ce1f6b239c0e31a1ca0 Mon Sep 17 00:00:00 2001
From: Ylva Selling <ylva.selling@liu.se>
Date: Fri, 23 Feb 2024 13:56:38 +0100
Subject: [PATCH 270/701] Move documentation function from openspace engine to
 the documentation engine

---
 .../documentation/documentationengine.h       |  2 +-
 include/openspace/engine/openspaceengine.h    |  1 -
 src/documentation/documentationengine.cpp     | 66 +++++++++++++++++--
 src/engine/openspaceengine.cpp                | 59 ++---------------
 src/engine/openspaceengine_lua.inl            |  2 +-
 5 files changed, 67 insertions(+), 63 deletions(-)

diff --git a/include/openspace/documentation/documentationengine.h b/include/openspace/documentation/documentationengine.h
index 004acd1ecd..2e7ffc1e7d 100644
--- a/include/openspace/documentation/documentationengine.h
+++ b/include/openspace/documentation/documentationengine.h
@@ -88,7 +88,7 @@ public:
 
     std::string generateJson() const;
 
-    nlohmann::json generateJsonJson() const;
+    void writeDocumentation() const;
 
 private:
     /// The list of all Documentation%s that are stored by the DocumentationEngine
diff --git a/include/openspace/engine/openspaceengine.h b/include/openspace/engine/openspaceengine.h
index 892bb072ea..f7bd9e185a 100644
--- a/include/openspace/engine/openspaceengine.h
+++ b/include/openspace/engine/openspaceengine.h
@@ -135,7 +135,6 @@ public:
     AssetManager& assetManager();
     LoadingScreen* loadingScreen();
 
-    void writeDocumentation();
     void createUserDirectoriesIfNecessary();
 
     /**
diff --git a/src/documentation/documentationengine.cpp b/src/documentation/documentationengine.cpp
index 73e3df7788..9bcd02f767 100644
--- a/src/documentation/documentationengine.cpp
+++ b/src/documentation/documentationengine.cpp
@@ -27,13 +27,25 @@
 #include <openspace/openspace.h>
 #include <openspace/documentation/core_registration.h>
 #include <openspace/documentation/verifier.h>
+#include <openspace/engine/globals.h>
+#include <openspace/engine/configuration.h>
+#include <openspace/events/eventengine.h>
+#include <openspace/interaction/actionmanager.h>
+#include <openspace/interaction/keybindingmanager.h>
+#include <openspace/rendering/renderengine.h>
 #include <openspace/json.h>
+#include <openspace/scene/scene.h>
+#include <openspace/scene/scenelicensewriter.h>
+#include <openspace/scripting/scriptscheduler.h>
+#include <openspace/scripting/scriptengine.h>
+#include <openspace/util/factorymanager.h>
 #include <openspace/util/json_helper.h>
 #include <ghoul/fmt.h>
 #include <ghoul/filesystem/filesystem.h>
 #include <ghoul/misc/profiling.h>
 
 #include <fstream>
+#include <future>
 
 namespace openspace::documentation {
 
@@ -135,14 +147,58 @@ std::string DocumentationEngine::generateJson() const {
     return json.dump();
 }
 
-nlohmann::json DocumentationEngine::generateJsonJson() const {
-    nlohmann::json json;
+void DocumentationEngine::writeDocumentation() const {
+    ZoneScoped;
 
-    for (const Documentation& d : _documentations) {
-        json.push_back(generateJsonDocumentation(d));
+    // Write documentation to json files if config file supplies path for doc files
+    std::string path = global::configuration->documentation.path;
+    if (path.empty()) {
+        // if path was empty, that means that no documentation is requested
+        return;
     }
+    path = absPath(path).string() + '/';
 
-    return json;
+    // Start the async requests as soon as possible so they are finished when we need them
+    std::future<nlohmann::json> settings = std::async(
+        &properties::PropertyOwner::generateJson,
+        global::rootPropertyOwner
+    );
+
+    std::future<nlohmann::json> sceneJson = std::async(
+        &properties::PropertyOwner::generateJson,
+        global::renderEngine->scene()
+    );
+
+    SceneLicenseWriter writer;
+
+    nlohmann::json scripting = global::scriptEngine->generateJson();
+    nlohmann::json factory = FactoryManager::ref().generateJson();
+    nlohmann::json keybindings = global::keybindingManager->generateJson();
+    nlohmann::json license = writer.generateJsonGroupedByLicense();
+    nlohmann::json sceneProperties = settings.get();
+    nlohmann::json sceneGraph = sceneJson.get();
+    nlohmann::json actions = global::actionManager->generateJson();
+    nlohmann::json events = global::eventEngine->generateJson();
+
+    sceneProperties["name"] = "Settings";
+    sceneGraph["name"] = "Scene";
+
+    // Add this here so that the generateJson function is the same as before to ensure
+    // backwards compatibility
+    nlohmann::json scriptingResult;
+    scriptingResult["name"] = "Scripting API";
+    scriptingResult["data"] = scripting;
+
+    nlohmann::json documentation = {
+        sceneGraph, sceneProperties, actions, events, keybindings, license, scriptingResult, factory
+    };
+
+    nlohmann::json result;
+    result["documentation"] = documentation;
+
+    std::ofstream out(absPath("${DOCUMENTATION}/documentationData.js"));
+    out << "var data = " << result.dump();
+    out.close();
 }
 
 
diff --git a/src/engine/openspaceengine.cpp b/src/engine/openspaceengine.cpp
index 731f3babe8..2d6c3236a0 100644
--- a/src/engine/openspaceengine.cpp
+++ b/src/engine/openspaceengine.cpp
@@ -41,7 +41,6 @@
 #include <openspace/interaction/interactionmonitor.h>
 #include <openspace/interaction/keybindingmanager.h>
 #include <openspace/interaction/sessionrecording.h>
-#include <openspace/json.h>
 #include <openspace/navigation/navigationhandler.h>
 #include <openspace/navigation/orbitalnavigator.h>
 #include <openspace/navigation/waypoint.h>
@@ -896,7 +895,10 @@ void OpenSpaceEngine::loadAssets() {
 
     runGlobalCustomizationScripts();
 
-    _writeDocumentationTask = std::async(&OpenSpaceEngine::writeDocumentation, this);
+    
+    _writeDocumentationTask = std::async(
+        &documentation::DocumentationEngine::writeDocumentation, DocEng
+    );
 
     LTRACE("OpenSpaceEngine::loadAsset(end)");
 }
@@ -1040,59 +1042,6 @@ void OpenSpaceEngine::loadFonts() {
     }
 }
 
-void OpenSpaceEngine::writeDocumentation() {
-    ZoneScoped;
-
-    // Write documentation to json files if config file supplies path for doc files
-    std::string path = global::configuration->documentation.path;
-    if (path.empty()) {
-        // if path was empty, that means that no documentation is requested
-        return;
-    }
-    path = absPath(path).string() + '/';
-
-    // Start the async requests as soon as possible so they are finished when we need them
-    std::future<nlohmann::json> settings = std::async(
-        &properties::PropertyOwner::generateJson,
-        global::rootPropertyOwner
-    );
-
-    std::future<nlohmann::json> scene = std::async(
-        &properties::PropertyOwner::generateJson,
-        _scene.get()
-    );
-    SceneLicenseWriter writer;
-
-    nlohmann::json scripting = global::scriptEngine->generateJson();
-    nlohmann::json factory = FactoryManager::ref().generateJson();
-    nlohmann::json keybindings = global::keybindingManager->generateJson();
-    nlohmann::json license = writer.generateJsonGroupedByLicense();
-    nlohmann::json sceneProperties = settings.get();
-    nlohmann::json sceneGraph = scene.get();
-    nlohmann::json actions = global::actionManager->generateJson();
-    nlohmann::json events = global::eventEngine->generateJson();
-
-    sceneProperties["name"] = "Settings";
-    sceneGraph["name"] = "Scene";
-
-    // Add this here so that the generateJson function is the same as before to ensure
-    // backwards compatibility
-    nlohmann::json scriptingResult;
-    scriptingResult["name"] = "Scripting API";
-    scriptingResult["data"] = scripting;
-
-    nlohmann::json documentation = {
-        sceneGraph, sceneProperties, actions, events, keybindings, license, scriptingResult, factory
-    };
-
-    nlohmann::json result;
-    result["documentation"] = documentation;
-
-    std::ofstream out(absPath("${DOCUMENTATION}/documentationData.js"));
-    out << "var data = " << result.dump();
-    out.close();
-}
-
 void OpenSpaceEngine::preSynchronization() {
     ZoneScoped;
     TracyGpuZone("preSynchronization");
diff --git a/src/engine/openspaceengine_lua.inl b/src/engine/openspaceengine_lua.inl
index 128133a9f0..b8c4b8af9c 100644
--- a/src/engine/openspaceengine_lua.inl
+++ b/src/engine/openspaceengine_lua.inl
@@ -39,7 +39,7 @@ namespace {
  * Writes out documentation files
  */
 [[codegen::luawrap]] void writeDocumentation() {
-    openspace::global::openSpaceEngine->writeDocumentation();
+    DocEng.writeDocumentation();
 }
 
 // Sets the folder used for storing screenshots or session recording frames

From 5fdd2e9938acbae0fa6cce84c1995aab7d3c3c52 Mon Sep 17 00:00:00 2001
From: Ylva Selling <ylva.selling@liu.se>
Date: Fri, 23 Feb 2024 15:53:28 +0100
Subject: [PATCH 271/701] Move documentation generation for script engine from
 script engine into documentation engine

---
 .../documentation/documentationengine.h       |  1 +
 include/openspace/scripting/scriptengine.h    |  3 +-
 .../server/src/topics/documentationtopic.cpp  |  4 +-
 src/documentation/documentationengine.cpp     | 69 ++++++++++++++++++-
 src/scripting/scriptengine.cpp                | 63 +----------------
 5 files changed, 74 insertions(+), 66 deletions(-)

diff --git a/include/openspace/documentation/documentationengine.h b/include/openspace/documentation/documentationengine.h
index 2e7ffc1e7d..980af4ee3c 100644
--- a/include/openspace/documentation/documentationengine.h
+++ b/include/openspace/documentation/documentationengine.h
@@ -90,6 +90,7 @@ public:
 
     void writeDocumentation() const;
 
+    nlohmann::json generateScriptEngineJson() const;
 private:
     /// The list of all Documentation%s that are stored by the DocumentationEngine
     std::vector<Documentation> _documentations;
diff --git a/include/openspace/scripting/scriptengine.h b/include/openspace/scripting/scriptengine.h
index 85f9224896..559db5a5b1 100644
--- a/include/openspace/scripting/scriptengine.h
+++ b/include/openspace/scripting/scriptengine.h
@@ -96,8 +96,7 @@ public:
         ShouldSendToRemote shouldSendToRemote, ScriptCallback cb = ScriptCallback());
 
     std::vector<std::string> allLuaFunctions() const;
-
-    nlohmann::json generateJson() const;
+    const std::vector<LuaLibrary>& allLuaLibraries() const;
 
 private:
     BooleanType(Replace);
diff --git a/modules/server/src/topics/documentationtopic.cpp b/modules/server/src/topics/documentationtopic.cpp
index 247736e67c..17632d2338 100644
--- a/modules/server/src/topics/documentationtopic.cpp
+++ b/modules/server/src/topics/documentationtopic.cpp
@@ -28,7 +28,7 @@
 #include <modules/server/include/jsonconverters.h>
 #include <openspace/engine/globals.h>
 
-#include <openspace/scripting/scriptengine.h>
+#include <openspace/documentation/documentationengine.h>
 #include <openspace/util/factorymanager.h>
 #include <openspace/interaction/keybindingmanager.h>
 #include <openspace/scene/scenelicensewriter.h>
@@ -47,7 +47,7 @@ void DocumentationTopic::handleJson(const nlohmann::json& json) {
     // Do not parse generated json. Instead implement ability to get
     // ghoul::Dictionary objects from ScriptEngine, FactoryManager, and KeybindingManager.
     if (requestedType == "lua") {
-        response = global::scriptEngine->generateJson();
+        response = DocEng.generateScriptEngineJson();
     }
     else if (requestedType == "factories") {
         response = FactoryManager::ref().generateJson();
diff --git a/src/documentation/documentationengine.cpp b/src/documentation/documentationengine.cpp
index 9bcd02f767..e76b021d24 100644
--- a/src/documentation/documentationengine.cpp
+++ b/src/documentation/documentationengine.cpp
@@ -49,6 +49,37 @@
 
 namespace openspace::documentation {
 
+nlohmann::json LuaFunctionToJson(const openspace::scripting::LuaLibrary::Function& f,
+    bool includeSourceLocation)
+{
+    using namespace openspace;
+    using namespace openspace::scripting;
+    nlohmann::json function;
+    function["name"] = f.name;
+    nlohmann::json arguments = nlohmann::json::array();
+
+    for (const LuaLibrary::Function::Argument& arg : f.arguments) {
+        nlohmann::json argument;
+        argument["name"] = arg.name;
+        argument["type"] = arg.type;
+        argument["defaultValue"] = arg.defaultValue.value_or("");
+        arguments.push_back(argument);
+    }
+
+    function["arguments"] = arguments;
+    function["returnType"] = f.returnType;
+    function["help"] = f.helpText;
+
+    if (includeSourceLocation) {
+        nlohmann::json sourceLocation;
+        sourceLocation["file"] = f.sourceLocation.file;
+        sourceLocation["line"] = f.sourceLocation.line;
+        function["sourceLocation"] = sourceLocation;
+    }
+
+    return function;
+}
+
 DocumentationEngine* DocumentationEngine::_instance = nullptr;
 
 DocumentationEngine::DuplicateDocumentationException::DuplicateDocumentationException(
@@ -147,6 +178,42 @@ std::string DocumentationEngine::generateJson() const {
     return json.dump();
 }
 
+nlohmann::json DocumentationEngine::generateScriptEngineJson() const {
+    ZoneScoped;
+
+    using namespace openspace;
+    using namespace scripting;
+    const std::vector<LuaLibrary> libraries = global::scriptEngine->allLuaLibraries();
+    nlohmann::json json;
+
+    for (const LuaLibrary& l : libraries) {
+
+        nlohmann::json library;
+        std::string libraryName = l.name;
+        // Keep the library key for backwards compatability
+        library["library"] = libraryName;
+        library["name"] = libraryName;
+        std::string os = "openspace";
+        library["fullName"] = libraryName.empty() ? os : os + "." + libraryName;
+
+        for (const LuaLibrary::Function& f : l.functions) {
+            bool hasSourceLocation = true;
+            library["functions"].push_back(LuaFunctionToJson(f, hasSourceLocation));
+        }
+
+        for (const LuaLibrary::Function& f : l.documentations) {
+            bool hasSourceLocation = false;
+            library["functions"].push_back(LuaFunctionToJson(f, hasSourceLocation));
+        }
+        sortJson(library["functions"], "name");
+        json.push_back(library);
+
+        sortJson(json, "library");
+    }
+    return json;
+}
+
+
 void DocumentationEngine::writeDocumentation() const {
     ZoneScoped;
 
@@ -171,7 +238,7 @@ void DocumentationEngine::writeDocumentation() const {
 
     SceneLicenseWriter writer;
 
-    nlohmann::json scripting = global::scriptEngine->generateJson();
+    nlohmann::json scripting = generateScriptEngineJson();
     nlohmann::json factory = FactoryManager::ref().generateJson();
     nlohmann::json keybindings = global::keybindingManager->generateJson();
     nlohmann::json license = writer.generateJsonGroupedByLicense();
diff --git a/src/scripting/scriptengine.cpp b/src/scripting/scriptengine.cpp
index 42345a9afa..cd4ec3154c 100644
--- a/src/scripting/scriptengine.cpp
+++ b/src/scripting/scriptengine.cpp
@@ -81,36 +81,7 @@ namespace {
         return result;
     }
 
-    nlohmann::json toJson(const openspace::scripting::LuaLibrary::Function& f,
-                          bool includeSourceLocation)
-    {
-        using namespace openspace;
-        using namespace openspace::scripting;
-        nlohmann::json function;
-        function["name"] = f.name;
-        nlohmann::json arguments = nlohmann::json::array();
 
-        for (const LuaLibrary::Function::Argument& arg : f.arguments) {
-            nlohmann::json argument;
-            argument["name"] = arg.name;
-            argument["type"] = arg.type;
-            argument["defaultValue"] = arg.defaultValue.value_or("");
-            arguments.push_back(argument);
-        }
-
-        function["arguments"] = arguments;
-        function["returnType"] = f.returnType;
-        function["help"] = f.helpText;
-
-        if (includeSourceLocation) {
-            nlohmann::json sourceLocation;
-            sourceLocation["file"] = f.sourceLocation.file;
-            sourceLocation["line"] = f.sourceLocation.line;
-            function["sourceLocation"] = sourceLocation;
-        }
-
-        return function;
-    }
 
 #include "scriptengine_codegen.cpp"
 } // namespace
@@ -448,38 +419,8 @@ std::vector<std::string> ScriptEngine::allLuaFunctions() const {
     return result;
 }
 
-nlohmann::json ScriptEngine::generateJson() const {
-    ZoneScoped;
-
-    nlohmann::json json;
-
-    for (const LuaLibrary& l : _registeredLibraries) {
-        using namespace openspace;
-        using namespace openspace::scripting;
-
-        nlohmann::json library;
-        std::string libraryName = l.name;
-        // Keep the library key for backwards compatability
-        library["library"] = libraryName;
-        library["name"] = libraryName;
-        std::string os = "openspace";
-        library["fullName"] = libraryName.empty() ? os : os  + "." + libraryName;
-
-        for (const LuaLibrary::Function& f : l.functions) {
-            bool hasSourceLocation = true;
-            library["functions"].push_back(toJson(f, hasSourceLocation));
-        }
-
-        for (const LuaLibrary::Function& f : l.documentations) {
-            bool hasSourceLocation = false;
-            library["functions"].push_back(toJson(f, hasSourceLocation));
-        }
-        sortJson(library["functions"], "name");
-        json.push_back(library);
-
-        sortJson(json, "library");
-    }
-    return json;
+const std::vector<LuaLibrary>& ScriptEngine::allLuaLibraries() const {
+    return _registeredLibraries;
 }
 
 void ScriptEngine::writeLog(const std::string& script) {

From 8bea02585ca79dcfbc26f8924eebdf09a77e1868 Mon Sep 17 00:00:00 2001
From: Ylva Selling <ylva.selling@liu.se>
Date: Fri, 23 Feb 2024 16:03:27 +0100
Subject: [PATCH 272/701] Remove unused function from DocumentationEngine that
 creates a string

---
 .../documentation/documentationengine.h       |  2 -
 src/documentation/documentationengine.cpp     | 63 -------------------
 2 files changed, 65 deletions(-)

diff --git a/include/openspace/documentation/documentationengine.h b/include/openspace/documentation/documentationengine.h
index 980af4ee3c..71554ac004 100644
--- a/include/openspace/documentation/documentationengine.h
+++ b/include/openspace/documentation/documentationengine.h
@@ -86,8 +86,6 @@ public:
      */
     static DocumentationEngine& ref();
 
-    std::string generateJson() const;
-
     void writeDocumentation() const;
 
     nlohmann::json generateScriptEngineJson() const;
diff --git a/src/documentation/documentationengine.cpp b/src/documentation/documentationengine.cpp
index e76b021d24..a93aecf0ab 100644
--- a/src/documentation/documentationengine.cpp
+++ b/src/documentation/documentationengine.cpp
@@ -115,69 +115,6 @@ DocumentationEngine& DocumentationEngine::ref() {
     return *_instance;
 }
 
-nlohmann::json generateJsonDocumentation(const Documentation& d) {
-    nlohmann::json json;
-
-    json["name"] = d.name;
-    json["id"] = d.id;
-    json["description"] = d.description;
-    json["properties"] = nlohmann::json::array();
-
-    for (const DocumentationEntry& p : d.entries) {
-        nlohmann::json entry;
-        entry["key"] = p.key;
-        entry["optional"] = p.optional ? true : false;
-        entry["type"] = p.verifier->type();
-        entry["documentation"] = p.documentation;
-
-        TableVerifier* tv = dynamic_cast<TableVerifier*>(p.verifier.get());
-        ReferencingVerifier* rv = dynamic_cast<ReferencingVerifier*>(p.verifier.get());
-
-        if (rv) {
-            const std::vector<Documentation>& documentations = DocEng.documentations();
-            auto it = std::find_if(
-                documentations.begin(),
-                documentations.end(),
-                [rv](const Documentation& doc) { return doc.id == rv->identifier; }
-            );
-
-            if (it == documentations.end()) {
-                entry["reference"]["found"] = false;
-            }
-            else {
-                nlohmann::json reference;
-                reference["found"] = true;
-                reference["name"] = it->name;
-                reference["identifier"] = rv->identifier;
-
-                entry["reference"] = reference;
-            }
-        }
-        else if (tv) {
-            Documentation doc = { .entries = tv->documentations };
-            nlohmann::json restrictions = generateJsonDocumentation(doc);
-            // We have a TableVerifier, so we need to recurse
-            entry["restrictions"] = restrictions;
-        }
-        else {
-            entry["description"] = p.verifier->documentation();
-        }
-        json["properties"].push_back(entry);
-    }
-
-    return json;
-}
-
-std::string DocumentationEngine::generateJson() const {
-    nlohmann::json json;
-
-    for (const Documentation& d : _documentations) {
-        json["data"].push_back(generateJsonDocumentation(d));
-    }
-
-    return json.dump();
-}
-
 nlohmann::json DocumentationEngine::generateScriptEngineJson() const {
     ZoneScoped;
 

From 94aa098457050647d0dea12a112973fcd949d484 Mon Sep 17 00:00:00 2001
From: Ylva Selling <ylva.selling@liu.se>
Date: Fri, 23 Feb 2024 16:17:02 +0100
Subject: [PATCH 273/701] Move generated json documentation from factory
 manager to documentation engine

---
 .../documentation/documentationengine.h       |   1 +
 include/openspace/util/factorymanager.h       |  10 +-
 .../server/src/topics/documentationtopic.cpp  |   2 +-
 src/documentation/documentationengine.cpp     | 132 ++++++++++++++++-
 src/util/factorymanager.cpp                   | 133 +-----------------
 5 files changed, 140 insertions(+), 138 deletions(-)

diff --git a/include/openspace/documentation/documentationengine.h b/include/openspace/documentation/documentationengine.h
index 71554ac004..4e3be2269f 100644
--- a/include/openspace/documentation/documentationengine.h
+++ b/include/openspace/documentation/documentationengine.h
@@ -89,6 +89,7 @@ public:
     void writeDocumentation() const;
 
     nlohmann::json generateScriptEngineJson() const;
+    nlohmann::json generateFactoryManagerJson() const;
 private:
     /// The list of all Documentation%s that are stored by the DocumentationEngine
     std::vector<Documentation> _documentations;
diff --git a/include/openspace/util/factorymanager.h b/include/openspace/util/factorymanager.h
index dfb4b11702..453cd2bd4a 100644
--- a/include/openspace/util/factorymanager.h
+++ b/include/openspace/util/factorymanager.h
@@ -39,6 +39,10 @@ namespace openspace {
  */
 class FactoryManager {
 public:
+    struct FactoryInfo {
+        std::unique_ptr<ghoul::TemplateFactoryBase> factory;
+        std::string name;
+    };
     /**
      * This exception is thrown if the ghoul::TemplateFactory could not be found in the
      * #factory method.
@@ -117,16 +121,12 @@ public:
     template <class T>
     ghoul::TemplateFactory<T>* factory() const;
 
-    nlohmann::json generateJson() const;
+    const std::vector<FactoryInfo>& factories() const;
 
 private:
     /// Singleton member for the Factory Manager
     static FactoryManager* _manager;
 
-    struct FactoryInfo {
-        std::unique_ptr<ghoul::TemplateFactoryBase> factory;
-        std::string name;
-    };
     std::vector<FactoryInfo> _factories;
 };
 
diff --git a/modules/server/src/topics/documentationtopic.cpp b/modules/server/src/topics/documentationtopic.cpp
index 17632d2338..ebfaad75ef 100644
--- a/modules/server/src/topics/documentationtopic.cpp
+++ b/modules/server/src/topics/documentationtopic.cpp
@@ -50,7 +50,7 @@ void DocumentationTopic::handleJson(const nlohmann::json& json) {
         response = DocEng.generateScriptEngineJson();
     }
     else if (requestedType == "factories") {
-        response = FactoryManager::ref().generateJson();
+        response = DocEng.generateFactoryManagerJson();
     }
     else if (requestedType == "keyboard") {
         response = global::keybindingManager->generateJson();
diff --git a/src/documentation/documentationengine.cpp b/src/documentation/documentationengine.cpp
index a93aecf0ab..97a0067d40 100644
--- a/src/documentation/documentationengine.cpp
+++ b/src/documentation/documentationengine.cpp
@@ -49,6 +49,60 @@
 
 namespace openspace::documentation {
 
+nlohmann::json generateJsonDocumentation(const Documentation& d) {
+    nlohmann::json json;
+
+    json["name"] = d.name;
+    json["identifier"] = d.id;
+    json["description"] = d.description;
+    json["members"] = nlohmann::json::array();
+
+    for (const DocumentationEntry& p : d.entries) {
+        nlohmann::json entry;
+        entry["name"] = p.key;
+        entry["optional"] = p.optional.value;
+        entry["type"] = p.verifier->type();
+        entry["documentation"] = p.documentation;
+
+        TableVerifier* tv = dynamic_cast<TableVerifier*>(p.verifier.get());
+        ReferencingVerifier* rv = dynamic_cast<ReferencingVerifier*>(p.verifier.get());
+
+        if (rv) {
+            const std::vector<Documentation>& documentations = DocEng.documentations();
+            auto it = std::find_if(
+                documentations.begin(),
+                documentations.end(),
+                [rv](const Documentation& doc) { return doc.id == rv->identifier; }
+            );
+
+            if (it == documentations.end()) {
+                entry["reference"]["found"] = false;
+            }
+            else {
+                nlohmann::json reference;
+                reference["found"] = true;
+                reference["name"] = it->name;
+                reference["identifier"] = rv->identifier;
+
+                entry["reference"] = reference;
+            }
+        }
+        else if (tv) {
+            Documentation doc = { .entries = tv->documentations };
+            nlohmann::json restrictions = generateJsonDocumentation(doc);
+            // We have a TableVerifier, so we need to recurse
+            entry["restrictions"] = restrictions;
+        }
+        else {
+            entry["description"] = p.verifier->documentation();
+        }
+        json["members"].push_back(entry);
+    }
+    sortJson(json["members"], "name");
+
+    return json;
+}
+
 nlohmann::json LuaFunctionToJson(const openspace::scripting::LuaLibrary::Function& f,
     bool includeSourceLocation)
 {
@@ -150,6 +204,82 @@ nlohmann::json DocumentationEngine::generateScriptEngineJson() const {
     return json;
 }
 
+nlohmann::json DocumentationEngine::generateFactoryManagerJson() const {                 
+    nlohmann::json json;
+
+    std::vector<Documentation> docs = _documentations; // Copy the documentations
+    const std::vector<FactoryManager::FactoryInfo>& factories =
+        FactoryManager::ref().factories();
+
+    for (const FactoryManager::FactoryInfo& factoryInfo : factories) {
+        nlohmann::json factory;
+        factory["name"] = factoryInfo.name;
+        factory["identifier"] = "category" + factoryInfo.name;
+
+        ghoul::TemplateFactoryBase* f = factoryInfo.factory.get();
+        // Add documentation about base class
+        auto factoryDoc = std::find_if(
+            docs.begin(),
+            docs.end(),
+            [&factoryInfo](const Documentation& d) {
+                return d.name == factoryInfo.name;
+            });
+        if (factoryDoc != docs.end()) {
+            nlohmann::json documentation = generateJsonDocumentation(*factoryDoc);
+            factory["classes"].push_back(documentation);
+            // Remove documentation from list check at the end if all docs got put in
+            docs.erase(factoryDoc);
+        }
+        else {
+            nlohmann::json documentation;
+            documentation["name"] = factoryInfo.name;
+            documentation["identifier"] = factoryInfo.name;
+            factory["classes"].push_back(documentation);
+        }
+
+        // Add documentation about derived classes
+        const std::vector<std::string>& registeredClasses = f->registeredClasses();
+        for (const std::string& c : registeredClasses) {
+            auto found = std::find_if(
+                docs.begin(),
+                docs.end(),
+                [&c](const Documentation& d) {
+                    return d.name == c;
+                });
+            if (found != docs.end()) {
+                nlohmann::json documentation = generateJsonDocumentation(*found);
+                factory["classes"].push_back(documentation);
+                docs.erase(found);
+            }
+            else {
+                nlohmann::json documentation;
+                documentation["name"] = c;
+                documentation["identifier"] = c;
+                factory["classes"].push_back(documentation);
+            }
+        }
+        sortJson(factory["classes"], "name");
+        json.push_back(factory);
+    }
+    // Add all leftover docs
+    nlohmann::json leftovers;
+    leftovers["name"] = "Other";
+    leftovers["identifier"] = "other";
+
+    for (const Documentation& doc : docs) {
+        leftovers["classes"].push_back(generateJsonDocumentation(doc));
+    }
+    sortJson(leftovers["classes"], "name");
+    json.push_back(leftovers);
+    sortJson(json, "name");
+
+    // I did not check the output of this for correctness ---abock
+    nlohmann::json result;
+    result["name"] = "Asset Types";
+    result["data"] = json;
+
+    return result;
+}
 
 void DocumentationEngine::writeDocumentation() const {
     ZoneScoped;
@@ -176,7 +306,7 @@ void DocumentationEngine::writeDocumentation() const {
     SceneLicenseWriter writer;
 
     nlohmann::json scripting = generateScriptEngineJson();
-    nlohmann::json factory = FactoryManager::ref().generateJson();
+    nlohmann::json factory = generateFactoryManagerJson();
     nlohmann::json keybindings = global::keybindingManager->generateJson();
     nlohmann::json license = writer.generateJsonGroupedByLicense();
     nlohmann::json sceneProperties = settings.get();
diff --git a/src/util/factorymanager.cpp b/src/util/factorymanager.cpp
index 48665796a0..f6fa93cef4 100644
--- a/src/util/factorymanager.cpp
+++ b/src/util/factorymanager.cpp
@@ -38,65 +38,6 @@
 #include <openspace/util/task.h>
 #include <sstream>
 
-namespace {
-using namespace openspace;
-using namespace openspace::documentation;
-
-nlohmann::json generateJsonDocumentation(const Documentation& d) {
-    nlohmann::json json;
-
-    json["name"] = d.name;
-    json["identifier"] = d.id;
-    json["description"] = d.description;
-    json["members"] = nlohmann::json::array();
-
-    for (const DocumentationEntry& p : d.entries) {
-        nlohmann::json entry;
-        entry["name"] = p.key;
-        entry["optional"] = p.optional.value;
-        entry["type"] = p.verifier->type();
-        entry["documentation"] = p.documentation;
-
-        TableVerifier* tv = dynamic_cast<TableVerifier*>(p.verifier.get());
-        ReferencingVerifier* rv = dynamic_cast<ReferencingVerifier*>(p.verifier.get());
-
-        if (rv) {
-            const std::vector<Documentation>& documentations = DocEng.documentations();
-            auto it = std::find_if(
-                documentations.begin(),
-                documentations.end(),
-                [rv](const Documentation& doc) { return doc.id == rv->identifier; }
-            );
-
-            if (it == documentations.end()) {
-                entry["reference"]["found"] = false;
-            }
-            else {
-                nlohmann::json reference;
-                reference["found"] = true;
-                reference["name"] = it->name;
-                reference["identifier"] = rv->identifier;
-
-                entry["reference"] = reference;
-            }
-        }
-        else if (tv) {
-            Documentation doc = { .entries = tv->documentations };
-            nlohmann::json restrictions = generateJsonDocumentation(doc);
-            // We have a TableVerifier, so we need to recurse
-            entry["restrictions"] = restrictions;
-        }
-        else {
-            entry["description"] = p.verifier->documentation();
-        }
-        json["members"].push_back(entry);
-    }
-    sortJson(json["members"], "name");
-
-    return json;
-}
-}
-
 namespace openspace {
 
 FactoryManager* FactoryManager::_manager = nullptr;
@@ -142,78 +83,8 @@ FactoryManager& FactoryManager::ref() {
     return *_manager;
 }
 
-nlohmann::json FactoryManager::generateJson() const {
-    nlohmann::json json;
-    std::vector<Documentation> docs = DocEng.documentations();
-
-    for (const FactoryInfo& factoryInfo : _factories) {
-        nlohmann::json factory;
-        factory["name"] = factoryInfo.name;
-        factory["identifier"] = "category" + factoryInfo.name;
-
-        ghoul::TemplateFactoryBase* f = factoryInfo.factory.get();
-        // Add documentation about base class
-        auto factoryDoc = std::find_if(
-            docs.begin(),
-            docs.end(),
-            [&factoryInfo](const Documentation& d) {
-                return d.name == factoryInfo.name;
-            });
-        if (factoryDoc != docs.end()) {
-            nlohmann::json documentation = generateJsonDocumentation(*factoryDoc);
-            factory["classes"].push_back(documentation);
-            // Remove documentation from list check at the end if all docs got put in
-            docs.erase(factoryDoc);
-        }
-        else {
-            nlohmann::json documentation;
-            documentation["name"] = factoryInfo.name;
-            documentation["identifier"] = factoryInfo.name;
-            factory["classes"].push_back(documentation);
-        }
-
-        // Add documentation about derived classes
-        const std::vector<std::string>& registeredClasses = f->registeredClasses();
-        for (const std::string& c : registeredClasses) {
-            auto found = std::find_if(
-                docs.begin(),
-                docs.end(),
-                [&c](const Documentation& d) {
-                    return d.name == c;
-                });
-            if (found != docs.end()) {
-                nlohmann::json documentation = generateJsonDocumentation(*found);
-                factory["classes"].push_back(documentation);
-                docs.erase(found);
-            }
-            else {
-                nlohmann::json documentation;
-                documentation["name"] = c;
-                documentation["identifier"] = c;
-                factory["classes"].push_back(documentation);
-            }
-        }
-        sortJson(factory["classes"], "name");
-        json.push_back(factory);
-    }
-    // Add all leftover docs
-    nlohmann::json leftovers;
-    leftovers["name"] = "Other";
-    leftovers["identifier"] = "other";
-
-    for (const Documentation& doc : docs) {
-        leftovers["classes"].push_back(generateJsonDocumentation(doc));
-    }
-    sortJson(leftovers["classes"], "name");
-    json.push_back(leftovers);
-    sortJson(json, "name");
-
-    // I did not check the output of this for correctness ---abock
-    nlohmann::json result;
-    result["name"] = "Asset Types";
-    result["data"] = json;
-
-    return result;
+const std::vector<FactoryManager::FactoryInfo>& FactoryManager::factories() const {
+    return _factories;
 }
 
 }  // namespace openspace

From 126c62dc3a362a8287a9beac311956485b84dd24 Mon Sep 17 00:00:00 2001
From: Ylva Selling <ylva.selling@liu.se>
Date: Fri, 23 Feb 2024 16:44:22 +0100
Subject: [PATCH 274/701] Move json documentation generation from keybindings
 to documentation engine

---
 .../documentation/documentationengine.h       |  1 +
 .../openspace/interaction/keybindingmanager.h |  2 --
 .../server/src/topics/documentationtopic.cpp  |  4 ++--
 src/documentation/documentationengine.cpp     | 21 +++++++++++++++++++
 src/interaction/keybindingmanager.cpp         | 19 -----------------
 5 files changed, 24 insertions(+), 23 deletions(-)

diff --git a/include/openspace/documentation/documentationengine.h b/include/openspace/documentation/documentationengine.h
index 4e3be2269f..37af2cfa39 100644
--- a/include/openspace/documentation/documentationengine.h
+++ b/include/openspace/documentation/documentationengine.h
@@ -90,6 +90,7 @@ public:
 
     nlohmann::json generateScriptEngineJson() const;
     nlohmann::json generateFactoryManagerJson() const;
+    nlohmann::json generateKeybindingsJson() const;
 private:
     /// The list of all Documentation%s that are stored by the DocumentationEngine
     std::vector<Documentation> _documentations;
diff --git a/include/openspace/interaction/keybindingmanager.h b/include/openspace/interaction/keybindingmanager.h
index c638c5015d..9e1865b769 100644
--- a/include/openspace/interaction/keybindingmanager.h
+++ b/include/openspace/interaction/keybindingmanager.h
@@ -53,8 +53,6 @@ public:
 
     void keyboardCallback(Key key, KeyModifier modifier, KeyAction action);
 
-    nlohmann::json generateJson() const;
-
     const std::multimap<KeyWithModifier, std::string>& keyBindings() const;
 
 private:
diff --git a/modules/server/src/topics/documentationtopic.cpp b/modules/server/src/topics/documentationtopic.cpp
index ebfaad75ef..0890319f50 100644
--- a/modules/server/src/topics/documentationtopic.cpp
+++ b/modules/server/src/topics/documentationtopic.cpp
@@ -53,10 +53,10 @@ void DocumentationTopic::handleJson(const nlohmann::json& json) {
         response = DocEng.generateFactoryManagerJson();
     }
     else if (requestedType == "keyboard") {
-        response = global::keybindingManager->generateJson();
+        response = DocEng.generateKeybindingsJson();
     }
     else if (requestedType == "asset") {
-        response = global::keybindingManager->generateJson();
+        // TODO: Add asset documentation here
     }
     else if (requestedType == "meta") {
         response = SceneLicenseWriter().generateJsonList();
diff --git a/src/documentation/documentationengine.cpp b/src/documentation/documentationengine.cpp
index 97a0067d40..43cedcdcb0 100644
--- a/src/documentation/documentationengine.cpp
+++ b/src/documentation/documentationengine.cpp
@@ -281,6 +281,27 @@ nlohmann::json DocumentationEngine::generateFactoryManagerJson() const {
     return result;
 }
 
+nlohmann::json DocumentationEngine::generateKeybindingsJson() const {
+    ZoneScoped;
+
+    nlohmann::json json;
+    const std::multimap<KeyWithModifier, std::string>& luaKeys =
+        global::keybindingManager->keyBindings();
+
+    for (const std::pair<const KeyWithModifier, std::string>& p : luaKeys) {
+        nlohmann::json keybind;
+        keybind["name"] = ghoul::to_string(p.first);
+        keybind["action"] = p.second;
+        json.push_back(std::move(keybind));
+    }
+    sortJson(json, "name");
+
+    nlohmann::json result;
+    result["name"] = "Keybindings";
+    result["keybindings"] = json;
+    return result;
+}
+
 void DocumentationEngine::writeDocumentation() const {
     ZoneScoped;
 
diff --git a/src/interaction/keybindingmanager.cpp b/src/interaction/keybindingmanager.cpp
index bc438be44b..b13301898d 100644
--- a/src/interaction/keybindingmanager.cpp
+++ b/src/interaction/keybindingmanager.cpp
@@ -115,25 +115,6 @@ const std::multimap<KeyWithModifier, std::string>& KeybindingManager::keyBinding
     return _keyLua;
 }
 
-nlohmann::json KeybindingManager::generateJson() const {
-    ZoneScoped;
-
-    nlohmann::json json;
-
-    for (const std::pair<const KeyWithModifier, std::string>& p : _keyLua) {
-        nlohmann::json keybind;
-        keybind["name"] = ghoul::to_string(p.first);
-        keybind["action"] = p.second;
-        json.push_back(std::move(keybind));
-    }
-    sortJson(json, "name");
-
-    nlohmann::json result;
-    result["name"] = "Keybindings";
-    result["keybindings"] = json;
-    return result;
-}
-
 scripting::LuaLibrary KeybindingManager::luaLibrary() {
     return {
         "",

From 74f4e27f43339ba7fafff42aba1a964814b354f3 Mon Sep 17 00:00:00 2001
From: Ylva Selling <ylva.selling@liu.se>
Date: Fri, 23 Feb 2024 16:44:49 +0100
Subject: [PATCH 275/701] Move property owner json documentation to
 documentation engine

---
 .../documentation/documentationengine.h       |  2 +
 src/documentation/documentationengine.cpp     | 71 +++++++++++++++++--
 src/properties/propertyowner.cpp              | 58 ---------------
 3 files changed, 68 insertions(+), 63 deletions(-)

diff --git a/include/openspace/documentation/documentationengine.h b/include/openspace/documentation/documentationengine.h
index 37af2cfa39..055836ed1d 100644
--- a/include/openspace/documentation/documentationengine.h
+++ b/include/openspace/documentation/documentationengine.h
@@ -91,6 +91,8 @@ public:
     nlohmann::json generateScriptEngineJson() const;
     nlohmann::json generateFactoryManagerJson() const;
     nlohmann::json generateKeybindingsJson() const;
+    nlohmann::json generatePropertyOwnerJson(properties::PropertyOwner* owner) const;
+
 private:
     /// The list of all Documentation%s that are stored by the DocumentationEngine
     std::vector<Documentation> _documentations;
diff --git a/src/documentation/documentationengine.cpp b/src/documentation/documentationengine.cpp
index 43cedcdcb0..4272e9921e 100644
--- a/src/documentation/documentationengine.cpp
+++ b/src/documentation/documentationengine.cpp
@@ -103,6 +103,43 @@ nlohmann::json generateJsonDocumentation(const Documentation& d) {
     return json;
 }
 
+nlohmann::json createPropertyJson(openspace::properties::PropertyOwner* owner) {
+    ZoneScoped;
+
+    using namespace openspace;
+    nlohmann::json json;
+    json["name"] = !owner->guiName().empty() ? owner->guiName() : owner->identifier();
+
+    json["description"] = owner->description();
+    json["properties"] = nlohmann::json::array();
+    json["propertyOwners"] = nlohmann::json::array();
+    json["type"] = owner->type();
+    json["tags"] = owner->tags();
+
+    const std::vector<properties::Property*>& properties = owner->properties();
+    for (properties::Property* p : properties) {
+        nlohmann::json propertyJson;
+        std::string name = !p->guiName().empty() ? p->guiName() : p->identifier();
+        propertyJson["name"] = name;
+        propertyJson["type"] = p->className();
+        propertyJson["uri"] = p->fullyQualifiedIdentifier();
+        propertyJson["identifier"] = p->identifier();
+        propertyJson["description"] = p->description();
+
+        json["properties"].push_back(propertyJson);
+    }
+    sortJson(json["properties"], "name");
+
+    auto propertyOwners = owner->propertySubOwners();
+    for (properties::PropertyOwner* o : propertyOwners) {
+        nlohmann::json propertyOwner;
+        json["propertyOwners"].push_back(createPropertyJson(o));
+    }
+    sortJson(json["propertyOwners"], "name");
+
+    return json;
+}
+
 nlohmann::json LuaFunctionToJson(const openspace::scripting::LuaLibrary::Function& f,
     bool includeSourceLocation)
 {
@@ -302,6 +339,28 @@ nlohmann::json DocumentationEngine::generateKeybindingsJson() const {
     return result;
 }
 
+nlohmann::json DocumentationEngine::generatePropertyOwnerJson(
+    properties::PropertyOwner* owner) const {
+    ZoneScoped;
+
+    nlohmann::json json;
+    std::vector<properties::PropertyOwner*> subOwners = owner->propertySubOwners();
+    for (properties::PropertyOwner* owner : subOwners) {
+        if (owner->identifier() != "Scene") {
+            nlohmann::json jsonOwner = createPropertyJson(owner);
+
+            json.push_back(jsonOwner);
+        }
+    }
+    sortJson(json, "name");
+
+    nlohmann::json result;
+    result["name"] = "propertyOwner";
+    result["data"] = json;
+
+    return result;
+}
+
 void DocumentationEngine::writeDocumentation() const {
     ZoneScoped;
 
@@ -315,12 +374,14 @@ void DocumentationEngine::writeDocumentation() const {
 
     // Start the async requests as soon as possible so they are finished when we need them
     std::future<nlohmann::json> settings = std::async(
-        &properties::PropertyOwner::generateJson,
+        &DocumentationEngine::generatePropertyOwnerJson,
+        this,
         global::rootPropertyOwner
     );
 
     std::future<nlohmann::json> sceneJson = std::async(
-        &properties::PropertyOwner::generateJson,
+        &DocumentationEngine::generatePropertyOwnerJson,
+        this,
         global::renderEngine->scene()
     );
 
@@ -328,7 +389,7 @@ void DocumentationEngine::writeDocumentation() const {
 
     nlohmann::json scripting = generateScriptEngineJson();
     nlohmann::json factory = generateFactoryManagerJson();
-    nlohmann::json keybindings = global::keybindingManager->generateJson();
+    nlohmann::json keybindings = generateKeybindingsJson();
     nlohmann::json license = writer.generateJsonGroupedByLicense();
     nlohmann::json sceneProperties = settings.get();
     nlohmann::json sceneGraph = sceneJson.get();
@@ -345,7 +406,8 @@ void DocumentationEngine::writeDocumentation() const {
     scriptingResult["data"] = scripting;
 
     nlohmann::json documentation = {
-        sceneGraph, sceneProperties, actions, events, keybindings, license, scriptingResult, factory
+        sceneGraph, sceneProperties, actions, events, keybindings, license,
+        scriptingResult, factory
     };
 
     nlohmann::json result;
@@ -356,7 +418,6 @@ void DocumentationEngine::writeDocumentation() const {
     out.close();
 }
 
-
 void DocumentationEngine::addDocumentation(Documentation documentation) {
     if (documentation.id.empty()) {
         _documentations.push_back(std::move(documentation));
diff --git a/src/properties/propertyowner.cpp b/src/properties/propertyowner.cpp
index 6478b7ec11..3ace8786c2 100644
--- a/src/properties/propertyowner.cpp
+++ b/src/properties/propertyowner.cpp
@@ -40,43 +40,6 @@
 
 namespace {
     constexpr std::string_view _loggerCat = "PropertyOwner";
-
-    nlohmann::json createJson(openspace::properties::PropertyOwner* owner) {
-        ZoneScoped;
-
-        using namespace openspace;
-        nlohmann::json json;
-        json["name"] = !owner->guiName().empty() ? owner->guiName() : owner->identifier();
-
-        json["description"] = owner->description();
-        json["properties"] = nlohmann::json::array();
-        json["propertyOwners"] = nlohmann::json::array();
-        json["type"] = owner->type();
-        json["tags"] = owner->tags();
-
-        const std::vector<properties::Property*>& properties = owner->properties();
-        for (properties::Property* p : properties) {
-            nlohmann::json propertyJson;
-            std::string name = !p->guiName().empty() ? p->guiName() : p->identifier();
-            propertyJson["name"] = name;
-            propertyJson["type"] = p->className();
-            propertyJson["uri"] = p->fullyQualifiedIdentifier();
-            propertyJson["identifier"] = p->identifier();
-            propertyJson["description"] = p->description();
-
-            json["properties"].push_back(propertyJson);
-        }
-        sortJson(json["properties"], "name");
-
-        auto propertyOwners = owner->propertySubOwners();
-        for (properties::PropertyOwner* o : propertyOwners) {
-            nlohmann::json propertyOwner;
-            json["propertyOwners"].push_back(createJson(o));
-        }
-        sortJson(json["propertyOwners"], "name");
-
-        return json;
-    }
 } // namespace
 
 namespace openspace::properties {
@@ -386,25 +349,4 @@ void PropertyOwner::removeTag(const std::string& tag) {
     _tags.erase(std::remove(_tags.begin(), _tags.end(), tag), _tags.end());
 }
 
-nlohmann::json PropertyOwner::generateJson() const {
-    ZoneScoped;
-
-    nlohmann::json json;
-    std::vector<PropertyOwner*> subOwners = propertySubOwners();
-    for (PropertyOwner* owner : subOwners) {
-        if (owner->identifier() != "Scene") {
-            nlohmann::json jsonOwner = createJson(owner);
-
-            json.push_back(jsonOwner);
-        }
-    }
-    sortJson(json, "name");
-
-    nlohmann::json result;
-    result["name"] = "propertyOwner";
-    result["data"] = json;
-
-    return result;
-}
-
 } // namespace openspace::properties

From 2fbcb0544ef2823dbd13aeadd35d0a466788fff0 Mon Sep 17 00:00:00 2001
From: Alexander Bock <alexander.bock@liu.se>
Date: Sun, 25 Feb 2024 01:09:32 +0100
Subject: [PATCH 276/701] NavigationState handling (#3023)

* Change the navigation state format from Lua to JSON.  Add the ability to set the navigation state in the profile editor based on a file
---
 .../ext/launcher/src/profile/cameradialog.cpp | 44 ++++++++-
 .../openspace/navigation/navigationstate.h    |  3 +
 src/navigation/navigationhandler.cpp          | 31 +++----
 src/navigation/navigationhandler_lua.inl      |  2 +-
 src/navigation/navigationstate.cpp            | 93 ++++++++++++++++---
 5 files changed, 143 insertions(+), 30 deletions(-)

diff --git a/apps/OpenSpace/ext/launcher/src/profile/cameradialog.cpp b/apps/OpenSpace/ext/launcher/src/profile/cameradialog.cpp
index c238896eaa..5966da0fcc 100644
--- a/apps/OpenSpace/ext/launcher/src/profile/cameradialog.cpp
+++ b/apps/OpenSpace/ext/launcher/src/profile/cameradialog.cpp
@@ -25,15 +25,18 @@
 #include "profile/cameradialog.h"
 
 #include "profile/line.h"
+#include <openspace/navigation/navigationstate.h>
 #include <QDialogButtonBox>
 #include <QDoubleValidator>
+#include <QFileDialog>
 #include <QFrame>
 #include <QGridLayout>
 #include <QKeyEvent>
 #include <QLabel>
 #include <QLineEdit>
-#include <QTabWidget>
 #include <QPlainTextEdit>
+#include <QPushButton>
+#include <QTabWidget>
 
 namespace {
     constexpr int CameraTypeNode = 0;
@@ -345,6 +348,45 @@ QWidget* CameraDialog::createNavStateWidget() {
         mainLayout->addWidget(box);
     }
 
+    QPushButton* loadFile = new QPushButton("Load state from file");
+    loadFile->setIcon(loadFile->style()->standardIcon(QStyle::SP_FileIcon));
+    connect(
+        loadFile, &QPushButton::clicked,
+        [this]() {
+            QString file = QFileDialog::getOpenFileName(
+                this,
+                "Select navigate state file"
+            );
+
+            std::ifstream f(file.toStdString());
+            std::string contents = std::string(
+                (std::istreambuf_iterator<char>(f)),
+                std::istreambuf_iterator<char>()
+            );
+            nlohmann::json json = nlohmann::json::parse(contents);
+
+            using namespace openspace::interaction;
+            NavigationState state = NavigationState(json);
+
+            _navState.anchor->setText(QString::fromStdString(state.anchor));
+            _navState.aim->setText(QString::fromStdString(state.aim));
+            _navState.refFrame->setText(QString::fromStdString(state.referenceFrame));
+            _navState.positionX->setText(QString::number(state.position.x));
+            _navState.positionY->setText(QString::number(state.position.y));
+            _navState.positionZ->setText(QString::number(state.position.z));
+
+            if (state.up.has_value()) {
+                _navState.upX->setText(QString::number(state.up->x));
+                _navState.upY->setText(QString::number(state.up->y));
+                _navState.upZ->setText(QString::number(state.up->z));
+            }
+
+            _navState.yaw->setText(QString::number(state.yaw));
+            _navState.pitch->setText(QString::number(state.pitch));
+        }
+    );
+    mainLayout->addWidget(loadFile);
+
     return tab;
 }
 
diff --git a/include/openspace/navigation/navigationstate.h b/include/openspace/navigation/navigationstate.h
index bed4f338cd..864e014d0a 100644
--- a/include/openspace/navigation/navigationstate.h
+++ b/include/openspace/navigation/navigationstate.h
@@ -26,6 +26,7 @@
 #define __OPENSPACE_CORE___NAVIGATIONSTATE___H__
 
 #include <openspace/documentation/documentation.h>
+#include <openspace/json.h>
 #include <optional>
 
 namespace openspace {
@@ -37,12 +38,14 @@ namespace openspace::interaction {
 struct NavigationState {
     NavigationState() = default;
     explicit NavigationState(const ghoul::Dictionary& dictionary);
+    explicit NavigationState(const nlohmann::json& json);
     NavigationState(std::string anchor, std::string aim, std::string referenceFrame,
         glm::dvec3 position, std::optional<glm::dvec3> up = std::nullopt,
         double yaw = 0.0, double pitch = 0.0);
 
     CameraPose cameraPose() const;
     ghoul::Dictionary dictionary() const;
+    nlohmann::json toJson() const;
     static documentation::Documentation Documentation();
 
     std::string anchor;
diff --git a/src/navigation/navigationhandler.cpp b/src/navigation/navigationhandler.cpp
index 429c315351..de63360dfb 100644
--- a/src/navigation/navigationhandler.cpp
+++ b/src/navigation/navigationhandler.cpp
@@ -557,6 +557,10 @@ void NavigationHandler::saveNavigationState(const std::filesystem::path& filepat
     }
 
     std::filesystem::path absolutePath = absPath(filepath);
+    if (!absolutePath.has_extension()) {
+        // Adding the .navstate extension to the filepath if it came without one
+        absolutePath.replace_extension(".navstate");
+    }
     LINFO(fmt::format("Saving camera position: {}", absolutePath));
 
     std::ofstream ofs(absolutePath);
@@ -567,7 +571,7 @@ void NavigationHandler::saveNavigationState(const std::filesystem::path& filepat
         ));
     }
 
-    ofs << "return " << ghoul::formatLua(state.dictionary());
+    ofs << state.toJson().dump(2);
 }
 
 void NavigationHandler::loadNavigationState(const std::string& filepath) {
@@ -578,22 +582,15 @@ void NavigationHandler::loadNavigationState(const std::string& filepath) {
         throw ghoul::FileNotFoundError(absolutePath.string(), "NavigationState");
     }
 
-    ghoul::Dictionary navigationStateDictionary;
-    try {
-        ghoul::lua::loadDictionaryFromFile(
-            absolutePath.string(),
-            navigationStateDictionary
-        );
-        openspace::documentation::testSpecificationAndThrow(
-            NavigationState::Documentation(),
-            navigationStateDictionary,
-            "NavigationState"
-        );
-        setNavigationStateNextFrame(NavigationState(navigationStateDictionary));
-    }
-    catch (ghoul::RuntimeError& e) {
-        LERROR(fmt::format("Unable to set camera position: {}", e.message));
-    }
+    std::ifstream f(filepath);
+    std::string contents = std::string(
+        std::istreambuf_iterator<char>(f),
+        std::istreambuf_iterator<char>()
+    );
+    nlohmann::json json = nlohmann::json::parse(contents);
+
+    NavigationState state = NavigationState(json);
+    setNavigationStateNextFrame(state);
 }
 
 std::vector<std::string> NavigationHandler::listAllJoysticks() const {
diff --git a/src/navigation/navigationhandler_lua.inl b/src/navigation/navigationhandler_lua.inl
index 52b5276d3c..7045a1dc81 100644
--- a/src/navigation/navigationhandler_lua.inl
+++ b/src/navigation/navigationhandler_lua.inl
@@ -38,7 +38,7 @@ namespace {
 }
 
 /**
- * Return the current navigation state as a lua table. The optional argument is the scene
+ * Return the current navigation state as a Lua table. The optional argument is the scene
  * graph node to use as reference frame. By default, the reference frame will picked based
  * on whether the orbital navigator is currently following the anchor node rotation. If it
  * is, the anchor will be chosen as reference frame. If not, the reference frame will be
diff --git a/src/navigation/navigationstate.cpp b/src/navigation/navigationstate.cpp
index 68f956d2de..03f8460a4e 100644
--- a/src/navigation/navigationstate.cpp
+++ b/src/navigation/navigationstate.cpp
@@ -89,11 +89,42 @@ NavigationState::NavigationState(const ghoul::Dictionary& dictionary) {
     referenceFrame = p.referenceFrame.value_or(anchor);
     aim = p.aim.value_or(aim);
 
-    if (p.up.has_value()) {
-        up = *p.up;
+    up = p.up;
+    yaw = p.yaw.value_or(yaw);
+    pitch = p.pitch.value_or(pitch);
+}
 
-        yaw = p.yaw.value_or(yaw);
-        pitch = p.pitch.value_or(pitch);
+NavigationState::NavigationState(const nlohmann::json& json) {
+    position.x = json["position"]["x"].get<double>();
+    position.y = json["position"]["y"].get<double>();
+    position.z = json["position"]["z"].get<double>();
+
+    anchor = json["anchor"];
+
+    if (auto it = json.find("referenceframe");  it != json.end()) {
+        referenceFrame = it->get<std::string>();
+    }
+    else {
+        referenceFrame = anchor;
+    }
+
+    if (auto it = json.find("aim");  it != json.end()) {
+        aim = it->get<std::string>();
+    }
+
+    if (auto it = json.find("up");  it != json.end()) {
+        up = glm::dvec3();
+        up->x = it->at("x").get<double>();
+        up->y = it->at("y").get<double>();
+        up->z = it->at("z").get<double>();
+    }
+
+    if (auto it = json.find("yaw");  it != json.end()) {
+        yaw = it->get<double>();
+    }
+
+    if (auto it = json.find("pitch");  it != json.end()) {
+        pitch = it->get<double>();
     }
 }
 
@@ -174,16 +205,56 @@ ghoul::Dictionary NavigationState::dictionary() const {
     }
     if (up.has_value()) {
         cameraDict.setValue("Up", *up);
+    }
+    if (std::abs(yaw) > Epsilon) {
+        cameraDict.setValue("Yaw", yaw);
+    }
+    if (std::abs(pitch) > Epsilon) {
+        cameraDict.setValue("Pitch", pitch);
+    }
+    return cameraDict;
+}
 
-        if (std::abs(yaw) > Epsilon) {
-            cameraDict.setValue("Yaw", yaw);
-        }
-        if (std::abs(pitch) > Epsilon) {
-            cameraDict.setValue("Pitch", pitch);
-        }
+nlohmann::json NavigationState::toJson() const {
+    nlohmann::json result = nlohmann::json::object();
+
+    // Obligatory version number
+    result["version"] = 1;
+
+    {
+        nlohmann::json posObj = nlohmann::json::object();
+        posObj["x"] = position.x;
+        posObj["y"] = position.y;
+        posObj["z"] = position.z;
+        result["position"] = posObj;
     }
 
-    return cameraDict;
+    result["anchor"] = anchor;
+
+    if (anchor != referenceFrame) {
+        result["referenceframe"] = referenceFrame;
+    }
+
+    if (!aim.empty()) {
+        result["aim"] = aim;
+    }
+
+    if (up.has_value()) {
+        nlohmann::json upObj = nlohmann::json::object();
+        upObj["x"] = up->x;
+        upObj["y"] = up->y;
+        upObj["z"] = up->z;
+        result["up"] = upObj;
+    }
+
+    if (std::abs(yaw) > Epsilon) {
+        result["yaw"] = yaw;
+    }
+    if (std::abs(pitch) > Epsilon) {
+        result["pitch"] = pitch;
+    }
+
+    return result;
 }
 
 documentation::Documentation NavigationState::Documentation() {

From 9c16bd689fb95020528a1fc532c6f9ea5ed5094a Mon Sep 17 00:00:00 2001
From: Ylva Selling <ylva.selling@liu.se>
Date: Mon, 26 Feb 2024 09:06:19 +0100
Subject: [PATCH 277/701] Rename variable to remove shadowing

---
 src/documentation/documentationengine.cpp | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/documentation/documentationengine.cpp b/src/documentation/documentationengine.cpp
index 4272e9921e..1fa651efe9 100644
--- a/src/documentation/documentationengine.cpp
+++ b/src/documentation/documentationengine.cpp
@@ -345,9 +345,9 @@ nlohmann::json DocumentationEngine::generatePropertyOwnerJson(
 
     nlohmann::json json;
     std::vector<properties::PropertyOwner*> subOwners = owner->propertySubOwners();
-    for (properties::PropertyOwner* owner : subOwners) {
-        if (owner->identifier() != "Scene") {
-            nlohmann::json jsonOwner = createPropertyJson(owner);
+    for (properties::PropertyOwner* o : subOwners) {
+        if (o->identifier() != "Scene") {
+            nlohmann::json jsonOwner = createPropertyJson(o);
 
             json.push_back(jsonOwner);
         }

From 3fdac4a6d0619f505eb71c9885f138c42e66927c Mon Sep 17 00:00:00 2001
From: Ylva Selling <ylva.selling@liu.se>
Date: Mon, 26 Feb 2024 09:10:52 +0100
Subject: [PATCH 278/701] Move function from SceneLicenseWriter to
 DocumentationEngine and remove SceneLicenseWriter files

---
 .../documentation/documentationengine.h       |   2 +
 include/openspace/scene/scenelicensewriter.h  |  42 -----
 .../server/src/topics/documentationtopic.cpp  |   3 +-
 src/CMakeLists.txt                            |   2 -
 src/documentation/documentationengine.cpp     | 130 +++++++++++++-
 src/engine/openspaceengine.cpp                |   1 -
 src/scene/scene.cpp                           |   1 -
 src/scene/scenelicensewriter.cpp              | 162 ------------------
 8 files changed, 129 insertions(+), 214 deletions(-)
 delete mode 100644 include/openspace/scene/scenelicensewriter.h
 delete mode 100644 src/scene/scenelicensewriter.cpp

diff --git a/include/openspace/documentation/documentationengine.h b/include/openspace/documentation/documentationengine.h
index 055836ed1d..dd8786e5fc 100644
--- a/include/openspace/documentation/documentationengine.h
+++ b/include/openspace/documentation/documentationengine.h
@@ -92,6 +92,8 @@ public:
     nlohmann::json generateFactoryManagerJson() const;
     nlohmann::json generateKeybindingsJson() const;
     nlohmann::json generatePropertyOwnerJson(properties::PropertyOwner* owner) const;
+    nlohmann::json generateLicensesGroupedByLicense() const;
+    nlohmann::json generateLicenseList() const;
 
 private:
     /// The list of all Documentation%s that are stored by the DocumentationEngine
diff --git a/include/openspace/scene/scenelicensewriter.h b/include/openspace/scene/scenelicensewriter.h
deleted file mode 100644
index 69c4eb959a..0000000000
--- a/include/openspace/scene/scenelicensewriter.h
+++ /dev/null
@@ -1,42 +0,0 @@
-/*****************************************************************************************
- *                                                                                       *
- * OpenSpace                                                                             *
- *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
- *                                                                                       *
- * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
- * software and associated documentation files (the "Software"), to deal in the Software *
- * without restriction, including without limitation the rights to use, copy, modify,    *
- * merge, publish, distribute, sublicense, and/or sell copies of the Software, and to    *
- * permit persons to whom the Software is furnished to do so, subject to the following   *
- * conditions:                                                                           *
- *                                                                                       *
- * The above copyright notice and this permission notice shall be included in all copies *
- * or substantial portions of the Software.                                              *
- *                                                                                       *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED,   *
- * INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A         *
- * PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT    *
- * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF  *
- * CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE  *
- * OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                                         *
- ****************************************************************************************/
-
-#ifndef __OPENSPACE_CORE___SCENELICENSEWRITER___H__
-#define __OPENSPACE_CORE___SCENELICENSEWRITER___H__
-
-#include <openspace/json.h>
-#include <vector>
-
-namespace openspace {
-
-class SceneLicenseWriter {
-public:
-    SceneLicenseWriter();
-    nlohmann::json generateJsonList() const;
-    nlohmann::json generateJsonGroupedByLicense() const;
-};
-
-} // namespace openspace
-
-#endif // __OPENSPACE_CORE___SCENELICENSEWRITER___H__
diff --git a/modules/server/src/topics/documentationtopic.cpp b/modules/server/src/topics/documentationtopic.cpp
index 0890319f50..344a35cce2 100644
--- a/modules/server/src/topics/documentationtopic.cpp
+++ b/modules/server/src/topics/documentationtopic.cpp
@@ -31,7 +31,6 @@
 #include <openspace/documentation/documentationengine.h>
 #include <openspace/util/factorymanager.h>
 #include <openspace/interaction/keybindingmanager.h>
-#include <openspace/scene/scenelicensewriter.h>
 #include <ghoul/logging/logmanager.h>
 
 using nlohmann::json;
@@ -59,7 +58,7 @@ void DocumentationTopic::handleJson(const nlohmann::json& json) {
         // TODO: Add asset documentation here
     }
     else if (requestedType == "meta") {
-        response = SceneLicenseWriter().generateJsonList();
+        response = DocEng.generateLicenseList();
     }
 
     _connection->sendJson(wrappedPayload(response));
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 1d3e45b073..b92e05ea8a 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -155,7 +155,6 @@ set(OPENSPACE_SOURCE
   scene/scene.cpp
   scene/scene_lua.inl
   scene/sceneinitializer.cpp
-  scene/scenelicensewriter.cpp
   scene/scenegraphnode.cpp
   scene/timeframe.cpp
   scene/translation.cpp
@@ -347,7 +346,6 @@ set(OPENSPACE_HEADER
   ${PROJECT_SOURCE_DIR}/include/openspace/scene/scale.h
   ${PROJECT_SOURCE_DIR}/include/openspace/scene/scene.h
   ${PROJECT_SOURCE_DIR}/include/openspace/scene/sceneinitializer.h
-  ${PROJECT_SOURCE_DIR}/include/openspace/scene/scenelicensewriter.h
   ${PROJECT_SOURCE_DIR}/include/openspace/scene/scenegraphnode.h
   ${PROJECT_SOURCE_DIR}/include/openspace/scene/timeframe.h
   ${PROJECT_SOURCE_DIR}/include/openspace/scene/translation.h
diff --git a/src/documentation/documentationengine.cpp b/src/documentation/documentationengine.cpp
index 1fa651efe9..bf2f838874 100644
--- a/src/documentation/documentationengine.cpp
+++ b/src/documentation/documentationengine.cpp
@@ -27,6 +27,7 @@
 #include <openspace/openspace.h>
 #include <openspace/documentation/core_registration.h>
 #include <openspace/documentation/verifier.h>
+#include <openspace/engine/openspaceengine.h>
 #include <openspace/engine/globals.h>
 #include <openspace/engine/configuration.h>
 #include <openspace/events/eventengine.h>
@@ -34,8 +35,9 @@
 #include <openspace/interaction/keybindingmanager.h>
 #include <openspace/rendering/renderengine.h>
 #include <openspace/json.h>
+#include <openspace/scene/asset.h>
+#include <openspace/scene/assetmanager.h>
 #include <openspace/scene/scene.h>
-#include <openspace/scene/scenelicensewriter.h>
 #include <openspace/scripting/scriptscheduler.h>
 #include <openspace/scripting/scriptengine.h>
 #include <openspace/util/factorymanager.h>
@@ -241,6 +243,128 @@ nlohmann::json DocumentationEngine::generateScriptEngineJson() const {
     return json;
 }
 
+nlohmann::json DocumentationEngine::generateLicensesGroupedByLicense() const {
+    nlohmann::json json;
+
+    std::vector<const Asset*> assets =
+        global::openSpaceEngine->assetManager().allAssets();
+
+    int metaTotal = 0;
+    for (const Asset* asset : assets) {
+        std::optional<Asset::MetaInformation> meta = asset->metaInformation();
+        if (!meta.has_value()) {
+            continue;
+        }
+        metaTotal++;
+    }
+
+    if (global::profile->meta.has_value()) {
+        metaTotal++;
+        nlohmann::json metaJson;
+        metaJson["name"] = "Profile";
+        metaJson["profileName"] = global::profile->meta->name.value_or("");
+        metaJson["version"] = global::profile->meta->version.value_or("");
+        metaJson["description"] = global::profile->meta->description.value_or("");
+        metaJson["author"] = global::profile->meta->author.value_or("");
+        metaJson["url"] = global::profile->meta->url.value_or("");
+        metaJson["license"] = global::profile->meta->license.value_or("");
+        metaJson["type"] = "license";
+        json.push_back(std::move(metaJson));
+    }
+
+    std::map<std::string, nlohmann::json> assetLicenses;
+    for (const Asset* asset : assets) {
+        std::optional<Asset::MetaInformation> meta = asset->metaInformation();
+
+        nlohmann::json assetJson;
+        if (!meta.has_value()) {
+            assetJson["name"] = "";
+            assetJson["version"] = "";
+            assetJson["description"] = "";
+            assetJson["author"] = "";
+            assetJson["url"] = "";
+            assetJson["license"] = "No license";
+            assetJson["identifiers"] = "";
+            assetJson["path"] = asset->path().string();
+
+            assetLicenses["noLicense"].push_back(assetJson);
+        }
+        else {
+            std::string license = meta->license == "" ? "No License" : meta->license;
+            assetJson["name"] = meta->name;
+            assetJson["version"] = meta->version;
+            assetJson["description"] = meta->description;
+            assetJson["author"] = meta->author;
+            assetJson["url"] = meta->url;
+            assetJson["license"] = license;
+            assetJson["identifiers"] = meta->identifiers;
+            assetJson["path"] = asset->path().string();
+
+            assetLicenses[license].push_back(assetJson);
+        }
+    }
+
+    nlohmann::json assetsJson;
+    assetsJson["name"] = "Assets";
+    assetsJson["type"] = "Licenses";
+
+    using K = const std::string;
+    using V = nlohmann::json;
+    for (const std::pair<K, V>& assetLicense : assetLicenses) {
+        nlohmann::json entry;
+        entry["name"] = assetLicense.first;
+        entry["assets"] = assetLicense.second;
+        sortJson(entry["assets"], "name");
+        assetsJson["licenses"].push_back(entry);
+    }
+    json.push_back(assetsJson);
+
+    nlohmann::json result;
+    result["name"] = "Licenses";
+    result["data"] = json;
+
+    return result;
+}
+
+nlohmann::json DocumentationEngine::generateLicenseList() const {
+    nlohmann::json json;
+
+    if (global::profile->meta.has_value()) {
+        nlohmann::json profile;
+        profile["name"] = global::profile->meta->name.value_or("");
+        profile["version"] = global::profile->meta->version.value_or("");
+        profile["description"] = global::profile->meta->description.value_or("");
+        profile["author"] = global::profile->meta->author.value_or("");
+        profile["url"] = global::profile->meta->url.value_or("");
+        profile["license"] = global::profile->meta->license.value_or("");
+        json.push_back(profile);
+    }
+
+    std::vector<const Asset*> assets =
+        global::openSpaceEngine->assetManager().allAssets();
+
+    for (const Asset* asset : assets) {
+        std::optional<Asset::MetaInformation> meta = asset->metaInformation();
+
+        if (!meta.has_value()) {
+            continue;
+        }
+
+        nlohmann::json assetJson;
+        assetJson["name"] = meta->name;
+        assetJson["version"] = meta->version;
+        assetJson["description"] = meta->description;
+        assetJson["author"] = meta->author;
+        assetJson["url"] = meta->url;
+        assetJson["license"] = meta->license;
+        assetJson["identifiers"] = meta->identifiers;
+        assetJson["path"] = asset->path().string();
+
+        json.push_back(assetJson);
+    }
+    return json;
+}
+
 nlohmann::json DocumentationEngine::generateFactoryManagerJson() const {                 
     nlohmann::json json;
 
@@ -385,12 +509,10 @@ void DocumentationEngine::writeDocumentation() const {
         global::renderEngine->scene()
     );
 
-    SceneLicenseWriter writer;
-
     nlohmann::json scripting = generateScriptEngineJson();
     nlohmann::json factory = generateFactoryManagerJson();
     nlohmann::json keybindings = generateKeybindingsJson();
-    nlohmann::json license = writer.generateJsonGroupedByLicense();
+    nlohmann::json license = generateLicensesGroupedByLicense();
     nlohmann::json sceneProperties = settings.get();
     nlohmann::json sceneGraph = sceneJson.get();
     nlohmann::json actions = global::actionManager->generateJson();
diff --git a/src/engine/openspaceengine.cpp b/src/engine/openspaceengine.cpp
index 2d6c3236a0..c99df5f884 100644
--- a/src/engine/openspaceengine.cpp
+++ b/src/engine/openspaceengine.cpp
@@ -56,7 +56,6 @@
 #include <openspace/scene/scene.h>
 #include <openspace/scene/scenegraphnode.h>
 #include <openspace/scene/sceneinitializer.h>
-#include <openspace/scene/scenelicensewriter.h>
 #include <openspace/scripting/scriptscheduler.h>
 #include <openspace/scripting/scriptengine.h>
 #include <openspace/util/factorymanager.h>
diff --git a/src/scene/scene.cpp b/src/scene/scene.cpp
index 1b26510b9a..12953dd95d 100644
--- a/src/scene/scene.cpp
+++ b/src/scene/scene.cpp
@@ -38,7 +38,6 @@
 #include <openspace/rendering/renderengine.h>
 #include <openspace/scene/profile.h>
 #include <openspace/scene/scenegraphnode.h>
-#include <openspace/scene/scenelicensewriter.h>
 #include <openspace/scene/sceneinitializer.h>
 #include <openspace/scripting/lualibrary.h>
 #include <openspace/scripting/scriptengine.h>
diff --git a/src/scene/scenelicensewriter.cpp b/src/scene/scenelicensewriter.cpp
deleted file mode 100644
index 56d074455b..0000000000
--- a/src/scene/scenelicensewriter.cpp
+++ /dev/null
@@ -1,162 +0,0 @@
-/*****************************************************************************************
- *                                                                                       *
- * OpenSpace                                                                             *
- *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
- *                                                                                       *
- * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
- * software and associated documentation files (the "Software"), to deal in the Software *
- * without restriction, including without limitation the rights to use, copy, modify,    *
- * merge, publish, distribute, sublicense, and/or sell copies of the Software, and to    *
- * permit persons to whom the Software is furnished to do so, subject to the following   *
- * conditions:                                                                           *
- *                                                                                       *
- * The above copyright notice and this permission notice shall be included in all copies *
- * or substantial portions of the Software.                                              *
- *                                                                                       *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED,   *
- * INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A         *
- * PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT    *
- * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF  *
- * CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE  *
- * OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                                         *
- ****************************************************************************************/
-
-#include <openspace/scene/scenelicensewriter.h>
-
-#include <openspace/engine/globals.h>
-#include <openspace/engine/openspaceengine.h>
-#include <openspace/scene/asset.h>
-#include <openspace/scene/assetmanager.h>
-#include <openspace/scene/profile.h>
-#include <openspace/util/json_helper.h>
-#include <ghoul/fmt.h>
-#include <ghoul/misc/profiling.h>
-#include <sstream>
-
-namespace openspace {
-
-SceneLicenseWriter::SceneLicenseWriter() {}
-
-nlohmann::json SceneLicenseWriter::generateJsonGroupedByLicense() const {
-    nlohmann::json json;
-
-    std::vector<const Asset*> assets =
-        global::openSpaceEngine->assetManager().allAssets();
-
-    int metaTotal = 0;
-    for (const Asset* asset : assets) {
-        std::optional<Asset::MetaInformation> meta = asset->metaInformation();
-        if (!meta.has_value()) {
-            continue;
-        }
-        metaTotal++;
-    }
-
-    if (global::profile->meta.has_value()) {
-        metaTotal++;
-        nlohmann::json metaJson;
-        metaJson["name"] = "Profile";
-        metaJson["profileName"] = global::profile->meta->name.value_or("");
-        metaJson["version"] = global::profile->meta->version.value_or("");
-        metaJson["description"] = global::profile->meta->description.value_or("");
-        metaJson["author"] = global::profile->meta->author.value_or("");
-        metaJson["url"] = global::profile->meta->url.value_or("");
-        metaJson["license"] = global::profile->meta->license.value_or("");
-        metaJson["type"] = "license";
-        json.push_back(std::move(metaJson));
-    }
-
-    std::map<std::string, nlohmann::json> assetLicenses;
-    for (const Asset* asset : assets) {
-        std::optional<Asset::MetaInformation> meta = asset->metaInformation();
-
-        nlohmann::json assetJson;
-        if (!meta.has_value()) {
-            assetJson["name"] = "";
-            assetJson["version"] = "";
-            assetJson["description"] = "";
-            assetJson["author"] = "";
-            assetJson["url"] = "";
-            assetJson["license"] = "No license";
-            assetJson["identifiers"] = "";
-            assetJson["path"] = asset->path().string();
-
-            assetLicenses["noLicense"].push_back(assetJson);
-        }
-        else {
-            std::string license = meta->license == "" ? "No License" : meta->license;
-            assetJson["name"] = meta->name;
-            assetJson["version"] = meta->version;
-            assetJson["description"] = meta->description;
-            assetJson["author"] = meta->author;
-            assetJson["url"] = meta->url;
-            assetJson["license"] = license;
-            assetJson["identifiers"] = meta->identifiers;
-            assetJson["path"] = asset->path().string();
-
-            assetLicenses[license].push_back(assetJson);
-        }
-    }
-
-    nlohmann::json assetsJson;
-    assetsJson["name"] = "Assets";
-    assetsJson["type"] = "Licenses";
-
-    using K = const std::string;
-    using V = nlohmann::json;
-    for (const std::pair<K, V>& assetLicense : assetLicenses) {
-        nlohmann::json entry;
-        entry["name"] = assetLicense.first;
-        entry["assets"] = assetLicense.second;
-        sortJson(entry["assets"], "name");
-        assetsJson["licenses"].push_back(entry);
-    }
-    json.push_back(assetsJson);
-
-    nlohmann::json result;
-    result["name"] = "Licenses";
-    result["data"] = json;
-
-    return result;
-}
-
-nlohmann::json SceneLicenseWriter::generateJsonList() const {
-    nlohmann::json json;
-
-    if (global::profile->meta.has_value()) {
-        nlohmann::json profile;
-        profile["name"] = global::profile->meta->name.value_or("");
-        profile["version"] = global::profile->meta->version.value_or("");
-        profile["description"] = global::profile->meta->description.value_or("");
-        profile["author"] = global::profile->meta->author.value_or("");
-        profile["url"] = global::profile->meta->url.value_or("");
-        profile["license"] = global::profile->meta->license.value_or("");
-        json.push_back(profile);
-    }
-
-    std::vector<const Asset*> assets =
-        global::openSpaceEngine->assetManager().allAssets();
-
-    for (const Asset* asset : assets) {
-        std::optional<Asset::MetaInformation> meta = asset->metaInformation();
-
-        if (!meta.has_value()) {
-            continue;
-        }
-
-        nlohmann::json assetJson;
-        assetJson["name"] = meta->name;
-        assetJson["version"] = meta->version;
-        assetJson["description"] = meta->description;
-        assetJson["author"] = meta->author;
-        assetJson["url"] = meta->url;
-        assetJson["license"] = meta->license;
-        assetJson["identifiers"] = meta->identifiers;
-        assetJson["path"] = asset->path().string();
-
-        json.push_back(assetJson);
-    }
-    return json;
-}
-} // namespace openspace

From a911f340ce2edf1517c1e2ee46b41c2e0d654683 Mon Sep 17 00:00:00 2001
From: Ylva Selling <ylva.selling@liu.se>
Date: Mon, 26 Feb 2024 09:19:45 +0100
Subject: [PATCH 279/701] Move action json generation from actionManager to
 DocumentationEngine

---
 .../documentation/documentationengine.h       |  1 +
 include/openspace/interaction/actionmanager.h |  1 -
 src/documentation/documentationengine.cpp     | 25 ++++++++++++++++++-
 src/interaction/actionmanager.cpp             | 21 ----------------
 4 files changed, 25 insertions(+), 23 deletions(-)

diff --git a/include/openspace/documentation/documentationengine.h b/include/openspace/documentation/documentationengine.h
index dd8786e5fc..2a7fd7a47c 100644
--- a/include/openspace/documentation/documentationengine.h
+++ b/include/openspace/documentation/documentationengine.h
@@ -94,6 +94,7 @@ public:
     nlohmann::json generatePropertyOwnerJson(properties::PropertyOwner* owner) const;
     nlohmann::json generateLicensesGroupedByLicense() const;
     nlohmann::json generateLicenseList() const;
+    nlohmann::json generateActionJson() const;
 
 private:
     /// The list of all Documentation%s that are stored by the DocumentationEngine
diff --git a/include/openspace/interaction/actionmanager.h b/include/openspace/interaction/actionmanager.h
index c965a108fc..b8c37637ad 100644
--- a/include/openspace/interaction/actionmanager.h
+++ b/include/openspace/interaction/actionmanager.h
@@ -46,7 +46,6 @@ public:
     void triggerAction(const std::string& identifier, const ghoul::Dictionary& arguments,
         ShouldBeSynchronized shouldBeSynchronized) const;
     static scripting::LuaLibrary luaLibrary();
-    nlohmann::json generateJson() const;
 
 private:
     std::unordered_map<unsigned int, Action> _actions;
diff --git a/src/documentation/documentationengine.cpp b/src/documentation/documentationengine.cpp
index bf2f838874..f7a2e0c870 100644
--- a/src/documentation/documentationengine.cpp
+++ b/src/documentation/documentationengine.cpp
@@ -31,6 +31,7 @@
 #include <openspace/engine/globals.h>
 #include <openspace/engine/configuration.h>
 #include <openspace/events/eventengine.h>
+#include <openspace/interaction/action.h>
 #include <openspace/interaction/actionmanager.h>
 #include <openspace/interaction/keybindingmanager.h>
 #include <openspace/rendering/renderengine.h>
@@ -515,7 +516,7 @@ void DocumentationEngine::writeDocumentation() const {
     nlohmann::json license = generateLicensesGroupedByLicense();
     nlohmann::json sceneProperties = settings.get();
     nlohmann::json sceneGraph = sceneJson.get();
-    nlohmann::json actions = global::actionManager->generateJson();
+    nlohmann::json actions = generateActionJson();
     nlohmann::json events = global::eventEngine->generateJson();
 
     sceneProperties["name"] = "Settings";
@@ -540,6 +541,28 @@ void DocumentationEngine::writeDocumentation() const {
     out.close();
 }
 
+nlohmann::json DocumentationEngine::generateActionJson() const {
+    using namespace interaction;
+
+    nlohmann::json res;
+    res["name"] = "Actions";
+    res["data"] = nlohmann::json::array();
+    std::vector<Action> actions = global::actionManager->actions();
+
+    for (const Action& action : actions) {
+        nlohmann::json d;
+        // Use identifier as name to make it more similar to scripting api
+        d["name"] = action.identifier;
+        d["guiName"] = action.name;
+        d["documentation"] = action.documentation;
+        d["command"] = action.command;
+        res["data"].push_back(d);
+    }
+    sortJson(res["data"], "name");
+    return res;
+}
+
+
 void DocumentationEngine::addDocumentation(Documentation documentation) {
     if (documentation.id.empty()) {
         _documentations.push_back(std::move(documentation));
diff --git a/src/interaction/actionmanager.cpp b/src/interaction/actionmanager.cpp
index 454e292aa2..a3900159ae 100644
--- a/src/interaction/actionmanager.cpp
+++ b/src/interaction/actionmanager.cpp
@@ -25,7 +25,6 @@
 #include <openspace/interaction/actionmanager.h>
 
 #include <openspace/engine/globals.h>
-#include <openspace/json.h>
 #include <openspace/scripting/lualibrary.h>
 #include <openspace/scripting/scriptengine.h>
 #include <ghoul/logging/logmanager.h>
@@ -129,24 +128,4 @@ scripting::LuaLibrary ActionManager::luaLibrary() {
         }
     };
 }
-
-nlohmann::json ActionManager::generateJson() const {
-    nlohmann::json res; 
-    res["name"] = "Actions";
-    res["data"] = nlohmann::json::array();
-
-    for (const std::pair<const unsigned int, Action>& a : _actions) {
-        const Action& action = a.second;
-        nlohmann::json d;
-        // Use identifier as name to make it more similar to scripting api
-        d["name"] = action.identifier;
-        d["guiName"] = action.name;
-        d["documentation"] = action.documentation;
-        d["command"] = action.command;
-        res["data"].push_back(d);
-    }
-    sortJson(res["data"], "name");
-    return res;
-}
-
 } // namespace openspace::interaction

From 4a8e964f8943c96b8cadf55782a1696ca8f731f2 Mon Sep 17 00:00:00 2001
From: Ylva Selling <ylva.selling@liu.se>
Date: Mon, 26 Feb 2024 09:45:56 +0100
Subject: [PATCH 280/701] Move generate json function from EventEngine to
 DocumentationEngine

---
 .../documentation/documentationengine.h       |  1 +
 include/openspace/events/eventengine.h        |  2 --
 src/documentation/documentationengine.cpp     | 21 ++++++++++++++++-
 src/events/eventengine.cpp                    | 23 -------------------
 4 files changed, 21 insertions(+), 26 deletions(-)

diff --git a/include/openspace/documentation/documentationengine.h b/include/openspace/documentation/documentationengine.h
index 2a7fd7a47c..e690a4413a 100644
--- a/include/openspace/documentation/documentationengine.h
+++ b/include/openspace/documentation/documentationengine.h
@@ -95,6 +95,7 @@ public:
     nlohmann::json generateLicensesGroupedByLicense() const;
     nlohmann::json generateLicenseList() const;
     nlohmann::json generateActionJson() const;
+    nlohmann::json generateEventJson() const;
 
 private:
     /// The list of all Documentation%s that are stored by the DocumentationEngine
diff --git a/include/openspace/events/eventengine.h b/include/openspace/events/eventengine.h
index e1c28289d0..10f4eecca4 100644
--- a/include/openspace/events/eventengine.h
+++ b/include/openspace/events/eventengine.h
@@ -168,8 +168,6 @@ public:
 
     static scripting::LuaLibrary luaLibrary();
 
-    nlohmann::json generateJson() const;
-
 private:
     /// The storage space in which Events are stored
     ghoul::MemoryPool<4096> _memory;
diff --git a/src/documentation/documentationengine.cpp b/src/documentation/documentationengine.cpp
index f7a2e0c870..7fc5a614d9 100644
--- a/src/documentation/documentationengine.cpp
+++ b/src/documentation/documentationengine.cpp
@@ -366,6 +366,25 @@ nlohmann::json DocumentationEngine::generateLicenseList() const {
     return json;
 }
 
+nlohmann::json DocumentationEngine::generateEventJson() const {
+    nlohmann::json result;
+    result["name"] = "Events";
+    nlohmann::json data = nlohmann::json::array();
+
+    std::vector<EventEngine::ActionInfo> eventActions =
+        global::eventEngine->registeredActions();
+
+    for (const EventEngine::ActionInfo& eventAction : eventActions) {
+        nlohmann::json eventJson;
+        std::string eventName = std::string(events::toString(eventAction.type));
+        eventJson["name"] = eventName;
+        data.push_back(eventJson);
+    }
+
+    result["data"] = data;
+    return result;
+}
+
 nlohmann::json DocumentationEngine::generateFactoryManagerJson() const {                 
     nlohmann::json json;
 
@@ -517,7 +536,7 @@ void DocumentationEngine::writeDocumentation() const {
     nlohmann::json sceneProperties = settings.get();
     nlohmann::json sceneGraph = sceneJson.get();
     nlohmann::json actions = generateActionJson();
-    nlohmann::json events = global::eventEngine->generateJson();
+    nlohmann::json events = generateEventJson();
 
     sceneProperties["name"] = "Settings";
     sceneGraph["name"] = "Scene";
diff --git a/src/events/eventengine.cpp b/src/events/eventengine.cpp
index afce7e1e52..d5dc46ea39 100644
--- a/src/events/eventengine.cpp
+++ b/src/events/eventengine.cpp
@@ -257,27 +257,4 @@ scripting::LuaLibrary EventEngine::luaLibrary() {
         }
     };
 }
-
-nlohmann::json EventEngine::generateJson() const {
-    nlohmann::json result;
-    result["name"] = "Events";
-    nlohmann::json data = nlohmann::json::array();
-
-    for (auto& [key, value] : _eventActions) {
-        nlohmann::json eventJson;
-        std::string eventName = std::string(events::toString(key));
-        eventJson["name"] = eventName;
-        data.push_back(eventJson);
-    }
-    for (auto& [key, value] : _eventTopics) {
-        nlohmann::json eventJson;
-        std::string eventName = std::string(events::toString(key));
-        eventJson["name"] = eventName;
-        data.push_back(eventJson);
-    }
-
-    result["data"] = data;
-    return result;
-}
-
 } // namespace openspace

From 2e078e4e323c774dd7171bfc4c84c3feb4a189fd Mon Sep 17 00:00:00 2001
From: Ylva Selling <ylva.selling@liu.se>
Date: Mon, 26 Feb 2024 09:58:35 +0100
Subject: [PATCH 281/701] Remove includes for json where they are no longer
 needed

---
 include/openspace/properties/propertyowner.h | 6 ------
 include/openspace/scripting/scriptengine.h   | 1 -
 include/openspace/util/factorymanager.h      | 1 -
 src/interaction/keybindingmanager.cpp        | 1 -
 src/properties/propertyowner.cpp             | 2 --
 src/scripting/scriptengine.cpp               | 1 -
 src/util/factorymanager.cpp                  | 1 -
 7 files changed, 13 deletions(-)

diff --git a/include/openspace/properties/propertyowner.h b/include/openspace/properties/propertyowner.h
index 1723f6017c..a9d8c089d7 100644
--- a/include/openspace/properties/propertyowner.h
+++ b/include/openspace/properties/propertyowner.h
@@ -25,7 +25,6 @@
 #ifndef __OPENSPACE_CORE___PROPERTYOWNER___H__
 #define __OPENSPACE_CORE___PROPERTYOWNER___H__
 
-#include <openspace/json.h>
 #include <map>
 #include <string>
 #include <vector>
@@ -295,11 +294,6 @@ public:
      */
     void removeTag(const std::string& tag);
 
-    /**
-     * Generate JSON for documentation.
-     */
-    nlohmann::json generateJson() const;
-
 protected:
     /// The unique identifier of this PropertyOwner
     std::string _identifier;
diff --git a/include/openspace/scripting/scriptengine.h b/include/openspace/scripting/scriptengine.h
index 559db5a5b1..ba9140186e 100644
--- a/include/openspace/scripting/scriptengine.h
+++ b/include/openspace/scripting/scriptengine.h
@@ -27,7 +27,6 @@
 
 #include <openspace/util/syncable.h>
 #include <openspace/scripting/lualibrary.h>
-#include <openspace/json.h>
 #include <ghoul/lua/luastate.h>
 #include <ghoul/misc/boolean.h>
 #include <filesystem>
diff --git a/include/openspace/util/factorymanager.h b/include/openspace/util/factorymanager.h
index 453cd2bd4a..ca9184833f 100644
--- a/include/openspace/util/factorymanager.h
+++ b/include/openspace/util/factorymanager.h
@@ -25,7 +25,6 @@
 #ifndef __OPENSPACE_CORE___FACTORYMANAGER___H__
 #define __OPENSPACE_CORE___FACTORYMANAGER___H__
 
-#include <openspace/json.h>
 #include <ghoul/misc/exception.h>
 #include <ghoul/misc/templatefactory.h>
 #include <memory>
diff --git a/src/interaction/keybindingmanager.cpp b/src/interaction/keybindingmanager.cpp
index b13301898d..61c3e5ddfb 100644
--- a/src/interaction/keybindingmanager.cpp
+++ b/src/interaction/keybindingmanager.cpp
@@ -28,7 +28,6 @@
 #include <openspace/interaction/actionmanager.h>
 #include <openspace/scripting/lualibrary.h>
 #include <openspace/scripting/scriptengine.h>
-#include <openspace/util/json_helper.h>
 #include <ghoul/logging/logmanager.h>
 #include <ghoul/misc/profiling.h>
 #include <ghoul/glm.h>
diff --git a/src/properties/propertyowner.cpp b/src/properties/propertyowner.cpp
index 3ace8786c2..0f4ddc8eb0 100644
--- a/src/properties/propertyowner.cpp
+++ b/src/properties/propertyowner.cpp
@@ -27,10 +27,8 @@
 #include <openspace/engine/globals.h>
 #include <openspace/events/event.h>
 #include <openspace/events/eventengine.h>
-#include <openspace/json.h>
 #include <openspace/properties/property.h>
 #include <openspace/scene/scene.h>
-#include <openspace/util/json_helper.h>
 #include <ghoul/fmt.h>
 #include <ghoul/logging/logmanager.h>
 #include <ghoul/misc/assert.h>
diff --git a/src/scripting/scriptengine.cpp b/src/scripting/scriptengine.cpp
index cd4ec3154c..f29b555162 100644
--- a/src/scripting/scriptengine.cpp
+++ b/src/scripting/scriptengine.cpp
@@ -29,7 +29,6 @@
 #include <openspace/engine/globals.h>
 #include <openspace/interaction/sessionrecording.h>
 #include <openspace/network/parallelpeer.h>
-#include <openspace/util/json_helper.h>
 #include <openspace/util/syncbuffer.h>
 #include <ghoul/filesystem/file.h>
 #include <ghoul/filesystem/filesystem.h>
diff --git a/src/util/factorymanager.cpp b/src/util/factorymanager.cpp
index f6fa93cef4..5c2fd2227e 100644
--- a/src/util/factorymanager.cpp
+++ b/src/util/factorymanager.cpp
@@ -26,7 +26,6 @@
 
 #include <openspace/documentation/documentationengine.h>
 #include <openspace/documentation/documentation.h>
-#include <openspace/json.h>
 #include <openspace/rendering/dashboarditem.h>
 #include <openspace/rendering/renderable.h>
 #include <openspace/scene/lightsource.h>

From d13974f2897b6e0d89e3424c01f329c50faeb613 Mon Sep 17 00:00:00 2001
From: Micah Acinapura <micahnyc@gmail.com>
Date: Tue, 27 Feb 2024 10:31:10 -0500
Subject: [PATCH 282/701] Issue/1250 Increase timeout for gdal http and updated
 url for loading gibs (#3015)

* increase timeout for gdal http requests and updated url for loading gibs data

* revertingurl change as its no longer redirecting for me

* fixed includes, moved setting long time out to only when we load capabilities

* removed comment

* refix include

closes #1250
---
 data/globebrowsing_servers.lua                | 2 --
 modules/globebrowsing/globebrowsingmodule.cpp | 3 +++
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/data/globebrowsing_servers.lua b/data/globebrowsing_servers.lua
index 1c2de7dc53..c3defef508 100644
--- a/data/globebrowsing_servers.lua
+++ b/data/globebrowsing_servers.lua
@@ -46,5 +46,3 @@ return {
   }
 }
 
-
--- https://astrowebmaps.wr.usgs.gov/webmapatlas/Layers/maps.html
\ No newline at end of file
diff --git a/modules/globebrowsing/globebrowsingmodule.cpp b/modules/globebrowsing/globebrowsingmodule.cpp
index 8c4734d395..c1aeefcced 100644
--- a/modules/globebrowsing/globebrowsingmodule.cpp
+++ b/modules/globebrowsing/globebrowsingmodule.cpp
@@ -83,6 +83,7 @@
 #pragma warning (disable : 4251)
 #endif // _MSC_VER
 
+#include <cpl_conv.h>
 #include <cpl_string.h>
 
 #ifdef _MSC_VER
@@ -550,10 +551,12 @@ void GlobeBrowsingModule::loadWMSCapabilities(std::string name, std::string glob
 {
     auto downloadFunction = [](const std::string& downloadUrl) {
         LDEBUG("Opening WMS capabilities: " + downloadUrl);
+        CPLSetConfigOption("GDAL_HTTP_TIMEOUT", "15"); // 3 seconds
         GDALDatasetH dataset = GDALOpen(
             downloadUrl.c_str(),
             GA_ReadOnly
         );
+        CPLSetConfigOption("GDAL_HTTP_TIMEOUT", "3"); // 3 seconds
 
         if (!dataset) {
             LWARNING("Could not open dataset: " + downloadUrl);

From af6e46f78bb865b9bd4d80b8769731e83e272a4d Mon Sep 17 00:00:00 2001
From: Alexander Bock <mail@alexanderbock.eu>
Date: Tue, 27 Feb 2024 20:47:43 +0100
Subject: [PATCH 283/701] Fix compilation for Sync application (closes #3027)

---
 apps/Sync/main.cpp | 20 +++++++++++++-------
 1 file changed, 13 insertions(+), 7 deletions(-)

diff --git a/apps/Sync/main.cpp b/apps/Sync/main.cpp
index 097ba2cdbe..3a4255997e 100644
--- a/apps/Sync/main.cpp
+++ b/apps/Sync/main.cpp
@@ -22,8 +22,10 @@
  * OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                                         *
  ****************************************************************************************/
 
-#include <openspace/engine/openspaceengine.h>
+#include <openspace/engine/configuration.h>
 #include <openspace/engine/moduleengine.h>
+#include <openspace/engine/openspaceengine.h>
+#include <openspace/engine/settings.h>
 #include <openspace/engine/windowdelegate.h>
 #include <openspace/engine/configuration.h>
 #include <openspace/util/factorymanager.h>
@@ -44,15 +46,19 @@ int main(int, char**) {
 
     ghoul::initialize();
 
-    std::string configFile = configuration::findConfiguration();
-    global::configuration = configuration::loadConfigurationFromFile(configFile);
-    global::openSpaceEngine.initialize();
+    std::filesystem::path configFile = findConfiguration();
+    std::filesystem::path settings = findSettings();
+    *global::configuration = loadConfigurationFromFile(
+        configFile,
+        settings,
+        glm::ivec2(0, 0)
+    );
+    global::openSpaceEngine->initialize();
 
 
     TaskLoader taskLoader;
-    std::vector<std::unique_ptr<Task>> tasks = taskLoader.tasksFromFile(
-        absPath("${TASKS}/full_sync.task")
-    );
+    std::filesystem::path t = absPath("${TASKS}/full_sync.task");
+    std::vector<std::unique_ptr<Task>> tasks = taskLoader.tasksFromFile(t.string());
 
     for (size_t i = 0; i < tasks.size(); i++) {
         Task& task = *tasks[i].get();

From 67d114755ca114947b3ae7aa397e20b267af1819 Mon Sep 17 00:00:00 2001
From: Alexander Bock <mail@alexanderbock.eu>
Date: Tue, 27 Feb 2024 20:56:50 +0100
Subject: [PATCH 284/701] Shifting the keybindings (closes #1055)

 - Add new action to instantly toggle all trails
 - Instead of 'H', the 'T' keybind now toggles all trails
 - Shift+T instantly toggles trails
 - Instead of 'W', the 'B' toggles the blackout of the rendering
---
 .../actions/trails/toggle_all_trails.asset    | 32 +++++++++++++++++++
 data/assets/base_keybindings.asset            | 10 +++---
 data/assets/default_keybindings.asset         |  4 +--
 3 files changed, 39 insertions(+), 7 deletions(-)

diff --git a/data/assets/actions/trails/toggle_all_trails.asset b/data/assets/actions/trails/toggle_all_trails.asset
index 9e129e055a..ff5aff14fe 100644
--- a/data/assets/actions/trails/toggle_all_trails.asset
+++ b/data/assets/actions/trails/toggle_all_trails.asset
@@ -63,14 +63,45 @@ local ToggleTrails = {
   IsLocal = false
 }
 
+local ToggleTrailsInstant = {
+  Identifier = "os.ToggleTrailsInstant",
+  Name = "Toggle all trails instantly",
+  Command = [[
+    local capList = openspace.property("*Trail.Renderable.Fade")
+    local list = openspace.property("*trail.Renderable.Fade")
+    if (#capList == 0) and (#list == 0) then
+      openspace.printWarning("No trails to toggle")
+    else
+      local prop
+      if #capList > 0 then
+        prop = capList[1]
+      else
+        prop = list[1]
+      end
+      local currentFade = openspace.propertyValue(prop)
+      local newFade = 0
+      if currentFade < 1 then
+        newFade = 1
+      end
+      openspace.setPropertyValue("Scene.*Trail.Renderable.Fade", newFade)
+      openspace.setPropertyValue("Scene.*trail.Renderable.Fade", newFade)
+    end
+  ]],
+  Documentation = "Toggle fade instantly for all trails in the Scene",
+  GuiPath = "/Trails",
+  IsLocal = false
+}
+
 
 asset.onInitialize(function()
   openspace.action.registerAction(FadeUpTrails)
   openspace.action.registerAction(FadeDownTrails)
   openspace.action.registerAction(ToggleTrails)
+  openspace.action.registerAction(ToggleTrailsInstant)
 end)
 
 asset.onDeinitialize(function()
+  openspace.action.removeAction(ToggleTrailsInstant)
   openspace.action.removeAction(ToggleTrails)
   openspace.action.removeAction(FadeDownTrails)
   openspace.action.removeAction(FadeUpTrails)
@@ -79,3 +110,4 @@ end)
 asset.export("FadeUpTrails", FadeUpTrails.Identifier)
 asset.export("FadeDownTrails", FadeDownTrails.Identifier)
 asset.export("ToggleTrails", ToggleTrails.Identifier)
+asset.export("ToggleTrailsInstant", ToggleTrailsInstant.Identifier)
diff --git a/data/assets/base_keybindings.asset b/data/assets/base_keybindings.asset
index 615c229150..2339db9862 100644
--- a/data/assets/base_keybindings.asset
+++ b/data/assets/base_keybindings.asset
@@ -1,6 +1,6 @@
 asset.require("./base")
-local trailAction = asset.require("actions/trails/toggle_trails_planets_moons").ToggleTrails
 local allTrailsAction = asset.require("actions/trails/toggle_all_trails").ToggleTrails
+local allTrailsInstantAction = asset.require("actions/trails/toggle_all_trails").ToggleTrailsInstant
 
 
 
@@ -22,13 +22,13 @@ asset.onInitialize(function()
   openspace.action.registerAction(TogglePlanetLabels)
   openspace.bindKey("L", TogglePlanetLabels.Identifier)
 
-  openspace.bindKey("H", trailAction)
-  openspace.bindKey("SHIFT+H", allTrailsAction)
+  openspace.bindKey("T", allTrailsAction)
+  openspace.bindKey("SHIFT+T", allTrailsInstantAction)
 end)
 
 asset.onDeinitialize(function()
-  openspace.clearKey("SHIFT+H")
-  openspace.clearKey("H")
+  openspace.clearKey("SHIFT+T")
+  openspace.clearKey("T")
 
   openspace.action.removeAction(TogglePlanetLabels)
   openspace.clearKey("L")
diff --git a/data/assets/default_keybindings.asset b/data/assets/default_keybindings.asset
index 2b207fa0c1..66446dfd25 100644
--- a/data/assets/default_keybindings.asset
+++ b/data/assets/default_keybindings.asset
@@ -194,7 +194,7 @@ asset.onInitialize(function()
   openspace.bindKey("Ctrl+F", ToggleRollFriction.Identifier)
 
   openspace.action.registerAction(FadeToBlack)
-  openspace.bindKey("W", FadeToBlack.Identifier)
+  openspace.bindKey("B", FadeToBlack.Identifier)
 
   openspace.action.registerAction(ToggleMainGui)
   openspace.bindKey("TAB", ToggleMainGui.Identifier)
@@ -246,7 +246,7 @@ asset.onDeinitialize(function()
   openspace.clearKey("TAB")
   openspace.action.removeAction(ToggleMainGui)
 
-  openspace.clearKey("W")
+  openspace.clearKey("B")
   openspace.action.removeAction(FadeToBlack)
 
   openspace.clearKey("Ctrl+F")

From fba81ea2a96234d39651ae64509e31a3c0752b15 Mon Sep 17 00:00:00 2001
From: Alexander Bock <mail@alexanderbock.eu>
Date: Tue, 27 Feb 2024 21:15:25 +0100
Subject: [PATCH 285/701] Immediately apply the settings provided in the
 launcher window (closes #2969)

---
 .../ext/launcher/src/launcherwindow.cpp       | 10 ++++-
 apps/OpenSpace/main.cpp                       | 38 +++++++++++++++++++
 2 files changed, 47 insertions(+), 1 deletion(-)

diff --git a/apps/OpenSpace/ext/launcher/src/launcherwindow.cpp b/apps/OpenSpace/ext/launcher/src/launcherwindow.cpp
index 416e268c05..f27284c0b7 100644
--- a/apps/OpenSpace/ext/launcher/src/launcherwindow.cpp
+++ b/apps/OpenSpace/ext/launcher/src/launcherwindow.cpp
@@ -401,8 +401,16 @@ QWidget* LauncherWindow::createCentralWidget() {
             connect(
                 &dialog,
                 &SettingsDialog::saveSettings,
-                [](Settings s) {
+                [this](Settings s) {
                     saveSettings(s, findSettings());
+
+                    if (s.profile.has_value()) {
+                        populateProfilesList(*s.profile);
+                    }
+
+                    if (s.configuration.has_value()) {
+                        populateWindowConfigsList(*s.configuration);
+                    }
                 }
             );
 
diff --git a/apps/OpenSpace/main.cpp b/apps/OpenSpace/main.cpp
index db2f9400a2..01663ead0a 100644
--- a/apps/OpenSpace/main.cpp
+++ b/apps/OpenSpace/main.cpp
@@ -1379,6 +1379,44 @@ int main(int argc, char* argv[]) {
         }
         glfwInit();
 
+        // We are just reloading the configuration file here in case the user has changed
+        // anything in the settings panel. In that case want to apply these settings
+        // immediately rather than waiting for the next startup.
+        // What follows is some copy-paste code that should be cleaned up at some point
+
+        LDEBUG("Reloading configuration from disk");
+        // Find configuration
+        std::filesystem::path configurationFilePath;
+        if (commandlineArguments.configuration.has_value()) {
+            configurationFilePath = absPath(*commandlineArguments.configuration);
+        }
+        else {
+            LDEBUG("Finding configuration");
+            configurationFilePath = findConfiguration();
+        }
+
+        // The previous incarnation of this was initializing GLFW to get the primary
+        // monitor's resolution, but that had some massive performance implications as
+        // there was some issue with the swap buffer handling inside of GLFW. My
+        // assumption is that GLFW doesn't like being initialized, destroyed, and then
+        // initialized again. Therefore we are using the platform specific functions now
+        glm::ivec2 size = glm::ivec2(1920, 1080);
+#ifdef WIN32
+        DEVMODEW dm = { 0 };
+        dm.dmSize = sizeof(DEVMODEW);
+        BOOL success = EnumDisplaySettingsW(nullptr, ENUM_CURRENT_SETTINGS, &dm);
+        if (success) {
+            size.x = dm.dmPelsWidth;
+            size.y = dm.dmPelsHeight;
+        }
+#endif // WIN32
+
+        *global::configuration = loadConfigurationFromFile(
+            configurationFilePath.string(),
+            findSettings(),
+            size
+        );
+
         global::configuration->profile = win.selectedProfile();
         windowConfiguration = selectedSgctProfileFromLauncher(
             win,

From 0203d723e89ccfc39c97e1e95e23181325ca6b75 Mon Sep 17 00:00:00 2001
From: Alexander Bock <mail@alexanderbock.eu>
Date: Tue, 27 Feb 2024 22:49:21 +0100
Subject: [PATCH 286/701] Remove support for built-in NvTools in favor of Tracy

---
 CMakeLists.txt          | 11 -----------
 apps/OpenSpace/main.cpp | 11 -----------
 2 files changed, 22 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 2d26714a60..ca6c1ccb60 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -189,17 +189,6 @@ if (APPLE)
   )
 endif ()
 
-if (MSVC)
-  option(OPENSPACE_NVTOOLS_ENABLED "Include support for Nvidia Tools Extensions" OFF)
-  set(OPENSPACE_NVTOOLS_PATH "C:/Program Files/NVIDIA Corporation/NvToolsExt")
-  if (OPENSPACE_NVTOOLS_ENABLED)
-    begin_dependency("Nvidia Tools Extension")
-    target_compile_definitions(openspace-core PUBLIC "OPENSPACE_HAS_NVTOOLS")
-    target_include_directories(openspace-core PUBLIC "${OPENSPACE_NVTOOLS_PATH}/include")
-    end_dependency()
-  endif ()
-endif ()
-
 begin_header("Configuring Modules")
 add_subdirectory("${CMAKE_CURRENT_SOURCE_DIR}/modules")
 end_header("End: Configuring Modules")
diff --git a/apps/OpenSpace/main.cpp b/apps/OpenSpace/main.cpp
index 01663ead0a..adbc555f08 100644
--- a/apps/OpenSpace/main.cpp
+++ b/apps/OpenSpace/main.cpp
@@ -71,10 +71,6 @@
 #include <modules/spout/spoutwrapper.h>
 #endif // OPENSPACE_HAS_SPOUT
 
-#ifdef OPENSPACE_HAS_NVTOOLS
-#include "nvToolsExt.h"
-#endif // OPENSPACE_HAS_NVTOOLS
-
 #ifdef OPENSPACE_BREAK_ON_FLOATING_POINT_EXCEPTION
 #include <float.h>
 #endif // OPENSPACE_BREAK_ON_FLOATING_POINT_EXCEPTION
@@ -417,9 +413,6 @@ void mainPreSyncFunc() {
 void mainPostSyncPreDrawFunc() {
     ZoneScoped;
 
-#ifdef OPENSPACE_HAS_NVTOOLS
-    nvtxRangePush("postSyncPreDraw");
-#endif // OPENSPACE_HAS_NVTOOLS
     LTRACE("main::postSynchronizationPreDraw(begin)");
 
     global::openSpaceEngine->postSynchronizationPreDraw();
@@ -432,10 +425,6 @@ void mainPostSyncPreDrawFunc() {
 #endif // OPENVR_SUPPORT
 
     LTRACE("main::postSynchronizationPreDraw(end)");
-
-#ifdef OPENSPACE_HAS_NVTOOLS
-    nvtxRangePop();
-#endif // OPENSPACE_HAS_NVTOOLS
 }
 
 

From 7a2efc66d6aae7e3a65eedba4b2dc58ee03b2d85 Mon Sep 17 00:00:00 2001
From: Alexander Bock <mail@alexanderbock.eu>
Date: Wed, 28 Feb 2024 00:19:06 +0100
Subject: [PATCH 287/701] Simplify profile loading and handling of the loading
 screen

---
 .../ext/launcher/src/launcherwindow.cpp       |  16 +-
 apps/OpenSpace/main.cpp                       |  60 +++--
 include/openspace/engine/openspaceengine.h    |   1 -
 include/openspace/rendering/loadingscreen.h   |  48 ++--
 include/openspace/scene/profile.h             |   2 +-
 src/engine/openspaceengine.cpp                | 133 +-----------
 src/rendering/loadingscreen.cpp               | 116 ++++++++++
 src/scene/profile.cpp                         |  19 +-
 tests/test_profile.cpp                        | 205 ++++++++----------
 9 files changed, 290 insertions(+), 310 deletions(-)

diff --git a/apps/OpenSpace/ext/launcher/src/launcherwindow.cpp b/apps/OpenSpace/ext/launcher/src/launcherwindow.cpp
index f27284c0b7..00a34e554f 100644
--- a/apps/OpenSpace/ext/launcher/src/launcherwindow.cpp
+++ b/apps/OpenSpace/ext/launcher/src/launcherwindow.cpp
@@ -110,22 +110,8 @@ namespace {
             return std::nullopt;
         }
 
-        std::ifstream inFile;
         try {
-            inFile.open(filename, std::ifstream::in);
-        }
-        catch (const std::ifstream::failure& e) {
-            throw ghoul::RuntimeError(fmt::format(
-                "Exception opening {} profile for read: {}", filename, e.what()
-            ));
-        }
-        std::string content;
-        std::string line;
-        while (std::getline(inFile, line)) {
-            content += line;
-        }
-        try {
-            return Profile(content);
+            return Profile(filename);
         }
         catch (const Profile::ParsingError& e) {
             QMessageBox::critical(
diff --git a/apps/OpenSpace/main.cpp b/apps/OpenSpace/main.cpp
index adbc555f08..6c5d6a5cf3 100644
--- a/apps/OpenSpace/main.cpp
+++ b/apps/OpenSpace/main.cpp
@@ -92,7 +92,6 @@ constexpr std::string_view OpenVRTag = "OpenVR";
 const Window* currentWindow = nullptr;
 const BaseViewport* currentViewport = nullptr;
 Frustum::Mode currentFrustumMode;
-glm::mat4 currentModelViewProjectionMatrix;
 glm::mat4 currentModelMatrix;
 glm::ivec2 currentDrawResolution;
 
@@ -126,7 +125,6 @@ std::vector<SpoutWindow> SpoutWindows;
 
 #endif // OPENSPACE_HAS_SPOUT
 
-}
 
 //
 //  MiniDump generation
@@ -432,9 +430,6 @@ void mainPostSyncPreDrawFunc() {
 void mainRenderFunc(const sgct::RenderData& data) {
     ZoneScoped;
 
-#ifdef OPENSPACE_HAS_NVTOOLS
-    nvtxRangePush("render");
-#endif // OPENSPACE_HAS_NVTOOLS
     LTRACE("main::mainRenderFunc(begin)");
 
     currentWindow = &data.window;
@@ -480,7 +475,6 @@ void mainRenderFunc(const sgct::RenderData& data) {
             sizeof(mat4)
         );
         currentModelMatrix = modelMatrix;
-        currentModelViewProjectionMatrix = modelMatrix * viewMatrix * projectionMatrix;
         global::openSpaceEngine->render(modelMatrix, viewMatrix, projectionMatrix);
 
 #ifdef OPENSPACE_HAS_SPOUT
@@ -511,9 +505,6 @@ void mainRenderFunc(const sgct::RenderData& data) {
     }
 
     LTRACE("main::mainRenderFunc(end)");
-#ifdef OPENSPACE_HAS_NVTOOLS
-    nvtxRangePop();
-#endif // OPENSPACE_HAS_NVTOOLS
 }
 
 
@@ -630,6 +621,8 @@ void mainCharCallback(unsigned int codepoint, int modifiers, sgct::Window* windo
 
 
 void mainDropCallback(int amount, const char** paths) {
+    ZoneScoped;
+
     ghoul_assert(amount > 0, "Expected at least one file path");
     ghoul_assert(paths, "expected non-nullptr");
 
@@ -640,25 +633,25 @@ void mainDropCallback(int amount, const char** paths) {
 
 
 
-std::vector<std::byte> mainEncodeFun() {
+std::vector<std::byte> mainEncode() {
     ZoneScoped;
-    LTRACE("main::mainEncodeFun(begin)");
+    LTRACE("main::mainEncode(begin)");
 
     std::vector<std::byte> data = global::openSpaceEngine->encode();
 
-    LTRACE("main::mainEncodeFun(end)");
+    LTRACE("main::mainEncode(end)");
     return data;
 }
 
 
 
-void mainDecodeFun(const std::vector<std::byte>& data) {
+void mainDecode(const std::vector<std::byte>& data) {
     ZoneScoped;
-    LTRACE("main::mainDecodeFun(begin)");
+    LTRACE("main::mainDecode(begin)");
 
     global::openSpaceEngine->decode(data);
 
-    LTRACE("main::mainDecodeFun(end)");
+    LTRACE("main::mainDecode(end)");
 }
 
 
@@ -679,10 +672,9 @@ void mainLogCallback(Log::Level level, std::string_view message) {
         case Log::Level::Error:
             LERRORC("SGCT", message);
             break;
+    }
 }
 
-} // namespace
-
 
 void setSgctDelegateFunctions() {
     WindowDelegate& sgctDelegate = *global::windowDelegate;
@@ -1102,6 +1094,9 @@ std::string selectedSgctProfileFromLauncher(LauncherWindow& lw, bool hasCliSGCTC
     return config;
 }
 
+} // namespace
+
+
 int main(int argc, char* argv[]) {
 #ifdef OPENSPACE_BREAK_ON_FLOATING_POINT_EXCEPTION
     _clearfp();
@@ -1448,21 +1443,22 @@ int main(int argc, char* argv[]) {
     config::Cluster cluster = loadCluster(absPath(windowConfiguration).string());
 
     LDEBUG("Setting callbacks");
-    Engine::Callbacks callbacks;
-    callbacks.initOpenGL = mainInitFunc;
-    callbacks.preSync = mainPreSyncFunc;
-    callbacks.postSyncPreDraw = mainPostSyncPreDrawFunc;
-    callbacks.draw = mainRenderFunc;
-    callbacks.draw2D = mainDraw2DFunc;
-    callbacks.postDraw = mainPostDrawFunc;
-    callbacks.keyboard = mainKeyboardCallback;
-    callbacks.mouseButton = mainMouseButtonCallback;
-    callbacks.mousePos = mainMousePosCallback;
-    callbacks.mouseScroll = mainMouseScrollCallback;
-    callbacks.character = mainCharCallback;
-    callbacks.drop = mainDropCallback;
-    callbacks.encode = mainEncodeFun;
-    callbacks.decode = mainDecodeFun;
+    Engine::Callbacks callbacks = {
+        .initOpenGL = mainInitFunc,
+        .preSync = mainPreSyncFunc,
+        .postSyncPreDraw = mainPostSyncPreDrawFunc,
+        .draw = mainRenderFunc,
+        .draw2D = mainDraw2DFunc,
+        .postDraw = mainPostDrawFunc,
+        .encode = mainEncode,
+        .decode = mainDecode,
+        .keyboard = mainKeyboardCallback,
+        .character = mainCharCallback,
+        .mouseButton = mainMouseButtonCallback,
+        .mousePos = mainMousePosCallback,
+        .mouseScroll = mainMouseScrollCallback,
+        .drop = mainDropCallback
+    };
     Log::instance().setNotifyLevel(Log::Level::Debug);
 
     try {
diff --git a/include/openspace/engine/openspaceengine.h b/include/openspace/engine/openspaceengine.h
index 892bb072ea..49b15390bb 100644
--- a/include/openspace/engine/openspaceengine.h
+++ b/include/openspace/engine/openspaceengine.h
@@ -159,7 +159,6 @@ private:
 
     std::unique_ptr<Scene> _scene;
     std::unique_ptr<AssetManager> _assetManager;
-    bool _shouldAbortLoading = false;
     std::unique_ptr<LoadingScreen> _loadingScreen;
     std::unique_ptr<VersionChecker> _versionChecker;
 
diff --git a/include/openspace/rendering/loadingscreen.h b/include/openspace/rendering/loadingscreen.h
index 2a87879a0a..9d1a9c330a 100644
--- a/include/openspace/rendering/loadingscreen.h
+++ b/include/openspace/rendering/loadingscreen.h
@@ -46,6 +46,9 @@ namespace ghoul::opengl {
 
 namespace openspace {
 
+class AssetManager;
+class Scene;
+
 class LoadingScreen {
 public:
     BooleanType(ShowMessage);
@@ -57,29 +60,11 @@ public:
         ShowLogMessages showLogMessages);
     ~LoadingScreen();
 
+    void abort();
+    void exec(AssetManager& manager, Scene& scene);
+
     void render();
 
-    void postMessage(std::string message);
-    void setCatastrophicError(CatastrophicError catastrophicError);
-
-    void finalize();
-
-    enum class Phase {
-        PreStart,
-        Construction,
-        Synchronization,
-        Initialization
-    };
-    void setPhase(Phase phase);
-
-
-    enum class ItemStatus {
-        Started,
-        Initializing,
-        Finished,
-        Failed
-    };
-
     struct ProgressInfo {
         float progress = 0.f;
 
@@ -87,10 +72,29 @@ public:
         int64_t totalSize = -1;
     };
 
+    enum class ItemStatus {
+        Started,
+        Initializing,
+        Finished,
+        Failed
+    };
+
     void updateItem(const std::string& itemIdentifier, const std::string& itemName,
         ItemStatus newStatus, ProgressInfo progressInfo);
 
 private:
+    enum class Phase {
+        PreStart,
+        Construction,
+        Synchronization,
+        Initialization
+    };
+
+    void postMessage(std::string message);
+    void setCatastrophicError(CatastrophicError catastrophicError);
+
+    void finalize();
+    void setPhase(Phase phase);
 
     void renderLogMessages() const;
 
@@ -127,6 +131,8 @@ private:
     std::vector<Item> _items;
     std::mutex _itemsMutex;
 
+    bool _shouldAbortLoading = false;
+
     std::random_device _randomDevice;
     std::default_random_engine _randomEngine;
 
diff --git a/include/openspace/scene/profile.h b/include/openspace/scene/profile.h
index 529bfba332..13ca783062 100644
--- a/include/openspace/scene/profile.h
+++ b/include/openspace/scene/profile.h
@@ -137,7 +137,7 @@ public:
     using CameraType = std::variant<CameraGoToNode, CameraNavState, CameraGoToGeo>;
 
     Profile() = default;
-    explicit Profile(const std::string& content);
+    explicit Profile(const std::filesystem::path& path);
     std::string serialize() const;
 
     /**
diff --git a/src/engine/openspaceengine.cpp b/src/engine/openspaceengine.cpp
index 45bbafdd72..84874a2678 100644
--- a/src/engine/openspaceengine.cpp
+++ b/src/engine/openspaceengine.cpp
@@ -114,8 +114,8 @@ namespace {
             case Mode::UserControl: return "UserControl";
             case Mode::CameraPath: return "CameraPath";
             case Mode::SessionRecordingPlayback: return "SessionRecording";
-            default: throw ghoul::MissingCaseException();
         }
+        throw ghoul::MissingCaseException();
     }
 
     constexpr openspace::properties::Property::PropertyInfo PrintEventsInfo = {
@@ -393,21 +393,7 @@ void OpenSpaceEngine::initialize() {
     }
 
     // Load the profile
-    std::ifstream inFile;
-    try {
-        inFile.open(profile, std::ifstream::in);
-    }
-    catch (const std::ifstream::failure& e) {
-        throw ghoul::RuntimeError(fmt::format(
-            "Exception opening profile file for read: {} ({})", profile, e.what()
-        ));
-    }
-
-    std::string content(
-        (std::istreambuf_iterator<char>(inFile)),
-        std::istreambuf_iterator<char>()
-    );
-    *global::profile = Profile(content);
+    *global::profile = Profile(profile);
 
     // Set up asset loader
     _assetManager = std::make_unique<AssetManager>(
@@ -770,119 +756,10 @@ void OpenSpaceEngine::loadAssets() {
         _assetManager->add(a);
     }
 
-    _loadingScreen->setPhase(LoadingScreen::Phase::Construction);
-    _loadingScreen->postMessage("Loading assets");
-
-    std::unordered_set<const ResourceSynchronization*> finishedSynchronizations;
-
-    while (true) {
-        _loadingScreen->render();
-        _assetManager->update();
-
-        std::vector<const Asset*> allAssets = _assetManager->allAssets();
-
-        std::vector<const ResourceSynchronization*> allSyncs =
-            _assetManager->allSynchronizations();
-
-        // Filter already synchronized assets so we don't check them anymore
-        auto syncIt = std::remove_if(
-            allSyncs.begin(),
-            allSyncs.end(),
-            [&finishedSynchronizations](const ResourceSynchronization* sync) {
-                return finishedSynchronizations.contains(sync);
-            }
-        );
-        allSyncs.erase(syncIt, allSyncs.end());
-
-        auto it = allSyncs.begin();
-        while (it != allSyncs.end()) {
-            ZoneScopedN("Update resource synchronization");
-
-            if ((*it)->isSyncing()) {
-                LoadingScreen::ProgressInfo progressInfo;
-
-                progressInfo.progress = [](const ResourceSynchronization* sync) {
-                    if (!sync->nTotalBytesIsKnown()) {
-                        return 0.f;
-                    }
-                    if (sync->nTotalBytes() == 0) {
-                        return 1.f;
-                    }
-                    return
-                        static_cast<float>(sync->nSynchronizedBytes()) /
-                        static_cast<float>(sync->nTotalBytes());
-                }(*it);
-
-                progressInfo.currentSize = (*it)->nSynchronizedBytes();
-                if ((*it)->nTotalBytesIsKnown()) {
-                    progressInfo.totalSize = (*it)->nTotalBytes();
-                }
-
-                _loadingScreen->updateItem(
-                    (*it)->identifier(),
-                    (*it)->name(),
-                    LoadingScreen::ItemStatus::Started,
-                    progressInfo
-                );
-                ++it;
-            }
-            else if ((*it)->isRejected()) {
-                _loadingScreen->updateItem(
-                    (*it)->identifier(),
-                    (*it)->name(),
-                    LoadingScreen::ItemStatus::Failed,
-                    LoadingScreen::ProgressInfo()
-                );
-                ++it;
-            }
-            else {
-                LoadingScreen::ProgressInfo progressInfo;
-                progressInfo.progress = 1.f;
-
-                _loadingScreen->updateItem(
-                    (*it)->identifier(),
-                    (*it)->name(),
-                    LoadingScreen::ItemStatus::Finished,
-                    progressInfo
-                );
-                finishedSynchronizations.insert(*it);
-                it = allSyncs.erase(it);
-            }
-        }
-
-        if (_shouldAbortLoading) {
-            global::windowDelegate->terminate();
-            break;
-        }
-
-        bool finishedLoading = std::all_of(
-            allAssets.begin(),
-            allAssets.end(),
-            [](const Asset* asset) { return asset->isInitialized() || asset->isFailed(); }
-        );
-
-        if (finishedLoading) {
-            break;
-        }
-    } // while(true)
-
-    if (_shouldAbortLoading) {
-        _loadingScreen = nullptr;
-        return;
-    }
-
-    _loadingScreen->setPhase(LoadingScreen::Phase::Initialization);
-
-    _loadingScreen->postMessage("Initializing scene");
-    while (_scene->isInitializing()) {
-        _loadingScreen->render();
-    }
-
-    _loadingScreen->postMessage("Initializing OpenGL");
-    _loadingScreen->finalize();
-
+    _loadingScreen->exec(*_assetManager, *_scene);
     _loadingScreen = nullptr;
 
+
     global::renderEngine->updateScene();
 
     global::syncEngine->addSyncables(global::timeManager->syncables());
@@ -1358,7 +1235,7 @@ void OpenSpaceEngine::keyboardCallback(Key key, KeyModifier mod, KeyAction actio
         // If the loading screen object exists, we are currently loading and want key
         // presses to behave differently
         if (key == Key::Escape) {
-            _shouldAbortLoading = true;
+            _loadingScreen->abort();
         }
 
         return;
diff --git a/src/rendering/loadingscreen.cpp b/src/rendering/loadingscreen.cpp
index 24c918ba88..739e106e92 100644
--- a/src/rendering/loadingscreen.cpp
+++ b/src/rendering/loadingscreen.cpp
@@ -27,6 +27,10 @@
 #include <openspace/engine/globals.h>
 #include <openspace/engine/windowdelegate.h>
 #include <openspace/rendering/helper.h>
+#include <openspace/scene/asset.h>
+#include <openspace/scene/assetmanager.h>
+#include <openspace/scene/scene.h>
+#include <openspace/util/resourcesynchronization.h>
 #include <ghoul/fmt.h>
 #include <ghoul/filesystem/filesystem.h>
 #include <ghoul/font/font.h>
@@ -43,6 +47,7 @@
 #include <random>
 #include <sstream>
 #include <thread>
+#include <unordered_set>
 
 
 namespace {
@@ -167,6 +172,117 @@ LoadingScreen::~LoadingScreen() {
     _log = nullptr;
 }
 
+void LoadingScreen::abort() {
+    _shouldAbortLoading = true;
+}
+
+void LoadingScreen::exec(AssetManager& manager, Scene& scene) {
+    setPhase(LoadingScreen::Phase::Construction);
+    postMessage("Loading assets");
+
+    std::unordered_set<const ResourceSynchronization*> finishedSynchronizations;
+    while (true) {
+        render();
+        manager.update();
+
+        std::vector<const Asset*> allAssets = manager.allAssets();
+
+        std::vector<const ResourceSynchronization*> allSyncs =
+            manager.allSynchronizations();
+
+        // Filter already synchronized assets so we don't check them anymore
+        auto syncIt = std::remove_if(
+            allSyncs.begin(),
+            allSyncs.end(),
+            [&finishedSynchronizations](const ResourceSynchronization* sync) {
+                return finishedSynchronizations.contains(sync);
+            }
+        );
+        allSyncs.erase(syncIt, allSyncs.end());
+
+        auto it = allSyncs.begin();
+        while (it != allSyncs.end()) {
+            ZoneScopedN("Update resource synchronization");
+
+            if ((*it)->isSyncing()) {
+                LoadingScreen::ProgressInfo progressInfo;
+
+                progressInfo.progress = [](const ResourceSynchronization* sync) {
+                    if (!sync->nTotalBytesIsKnown()) {
+                        return 0.f;
+                    }
+                    if (sync->nTotalBytes() == 0) {
+                        return 1.f;
+                    }
+                    return
+                        static_cast<float>(sync->nSynchronizedBytes()) /
+                        static_cast<float>(sync->nTotalBytes());
+                    }(*it);
+
+                    progressInfo.currentSize = (*it)->nSynchronizedBytes();
+                    if ((*it)->nTotalBytesIsKnown()) {
+                        progressInfo.totalSize = (*it)->nTotalBytes();
+                    }
+
+                    updateItem(
+                        (*it)->identifier(),
+                        (*it)->name(),
+                        LoadingScreen::ItemStatus::Started,
+                        progressInfo
+                    );
+                    ++it;
+            }
+            else if ((*it)->isRejected()) {
+                updateItem(
+                    (*it)->identifier(),
+                    (*it)->name(),
+                    LoadingScreen::ItemStatus::Failed,
+                    LoadingScreen::ProgressInfo()
+                );
+                ++it;
+            }
+            else {
+                LoadingScreen::ProgressInfo progressInfo;
+                progressInfo.progress = 1.f;
+
+                updateItem(
+                    (*it)->identifier(),
+                    (*it)->name(),
+                    LoadingScreen::ItemStatus::Finished,
+                    progressInfo
+                );
+                finishedSynchronizations.insert(*it);
+                it = allSyncs.erase(it);
+            }
+        }
+
+        if (_shouldAbortLoading) {
+            global::windowDelegate->terminate();
+            return;
+        }
+
+        bool finishedLoading = std::all_of(
+            allAssets.begin(),
+            allAssets.end(),
+            [](const Asset* asset) { return asset->isInitialized() || asset->isFailed(); }
+        );
+
+        if (finishedLoading) {
+            break;
+        }
+    } // while(true)
+
+    setPhase(LoadingScreen::Phase::Initialization);
+
+    postMessage("Initializing scene");
+    while (scene.isInitializing()) {
+        render();
+    }
+
+    postMessage("Initializing OpenGL");
+    finalize();
+}
+
 void LoadingScreen::render() {
     ZoneScoped;
     FrameMarkStart("Loading");
diff --git a/src/scene/profile.cpp b/src/scene/profile.cpp
index fef3492ae0..7b80defb18 100644
--- a/src/scene/profile.cpp
+++ b/src/scene/profile.cpp
@@ -741,7 +741,24 @@ std::string Profile::serialize() const {
     return r.dump(2);
 }
 
-Profile::Profile(const std::string& content) {
+Profile::Profile(const std::filesystem::path& path) {
+    ghoul_assert(std::filesystem::is_regular_file(path), "Path must exist");
+
+    std::ifstream inFile;
+    try {
+        inFile.open(path, std::ifstream::in);
+    }
+    catch (const std::ifstream::failure& e) {
+        throw ghoul::RuntimeError(fmt::format(
+            "Exception opening profile file for read: {} ({})", path, e.what()
+        ));
+    }
+
+    std::string content(
+        (std::istreambuf_iterator<char>(inFile)),
+        std::istreambuf_iterator<char>()
+    );
+
     try {
         nlohmann::json profile = nlohmann::json::parse(content);
         profile.at("version").get_to(version);
diff --git a/tests/test_profile.cpp b/tests/test_profile.cpp
index dddd520da9..7f28f11e43 100644
--- a/tests/test_profile.cpp
+++ b/tests/test_profile.cpp
@@ -146,30 +146,13 @@ namespace openspace {
 
 using namespace openspace;
 
-namespace {
-    /// Loads the contents of the file and creates a profile from it
-    Profile loadProfile(const std::filesystem::path& filename) {
-        if (!std::filesystem::exists(filename)) {
-            throw std::runtime_error("Could not find file)");
-        }
-
-        std::ifstream f(filename);
-        std::string content(
-            (std::istreambuf_iterator<char>(f)),
-            std::istreambuf_iterator<char>()
-        );
-
-        return Profile(content);
-    }
-} // namespace
-
 //
 // Minimal
 // The absolute minimal profile that can be loaded
 //
 TEST_CASE("Minimal", "[profile]") {
     constexpr std::string_view File = "${TESTDIR}/profile/minimal.profile";
-    Profile profile = loadProfile(absPath(File));
+    Profile profile = Profile(absPath(File));
 
     Profile ref;
     ref.version = Profile::CurrentVersion;
@@ -182,7 +165,7 @@ TEST_CASE("Minimal", "[profile]") {
 //
 TEST_CASE("Basic Meta (full)", "[profile]") {
     constexpr std::string_view File = "${TESTDIR}/profile/basic/meta_full.profile";
-    Profile profile = loadProfile(absPath(File));
+    Profile profile = Profile(absPath(File));
 
     Profile ref;
     ref.version = Profile::CurrentVersion;
@@ -201,7 +184,7 @@ TEST_CASE("Basic Meta (full)", "[profile]") {
 
 TEST_CASE("Basic Meta (empty)", "[profile]") {
     constexpr std::string_view File = "${TESTDIR}/profile/basic/meta_empty.profile";
-    Profile profile = loadProfile(absPath(File));
+    Profile profile = Profile(absPath(File));
 
     Profile ref;
     ref.version = Profile::CurrentVersion;
@@ -214,7 +197,7 @@ TEST_CASE("Basic Meta (empty)", "[profile]") {
 
 TEST_CASE("Basic Meta (no name)", "[profile]") {
     constexpr std::string_view File = "${TESTDIR}/profile/basic/meta_no_name.profile";
-    Profile profile = loadProfile(absPath(File));
+    Profile profile = Profile(absPath(File));
 
     Profile ref;
     ref.version = Profile::CurrentVersion;
@@ -232,7 +215,7 @@ TEST_CASE("Basic Meta (no name)", "[profile]") {
 
 TEST_CASE("Basic Meta (no version)", "[profile]") {
     constexpr std::string_view File = "${TESTDIR}/profile/basic/meta_no_version.profile";
-    Profile profile = loadProfile(absPath(File));
+    Profile profile = Profile(absPath(File));
 
     Profile ref;
     ref.version = Profile::CurrentVersion;
@@ -250,7 +233,7 @@ TEST_CASE("Basic Meta (no version)", "[profile]") {
 
 TEST_CASE("Basic Meta (no description)", "[profile]") {
     constexpr std::string_view File = "${TESTDIR}/profile/basic/meta_no_description.profile";
-    Profile profile = loadProfile(absPath(File));
+    Profile profile = Profile(absPath(File));
 
     Profile ref;
     ref.version = Profile::CurrentVersion;
@@ -268,7 +251,7 @@ TEST_CASE("Basic Meta (no description)", "[profile]") {
 
 TEST_CASE("Basic Meta (no author)", "[profile]") {
     constexpr std::string_view File = "${TESTDIR}/profile/basic/meta_no_author.profile";
-    Profile profile = loadProfile(absPath(File));
+    Profile profile = Profile(absPath(File));
 
     Profile ref;
     ref.version = Profile::CurrentVersion;
@@ -286,7 +269,7 @@ TEST_CASE("Basic Meta (no author)", "[profile]") {
 
 TEST_CASE("Basic Meta (no url)", "[profile]") {
     constexpr std::string_view File = "${TESTDIR}/profile/basic/meta_no_url.profile";
-    Profile profile = loadProfile(absPath(File));
+    Profile profile = Profile(absPath(File));
 
     Profile ref;
     ref.version = Profile::CurrentVersion;
@@ -304,7 +287,7 @@ TEST_CASE("Basic Meta (no url)", "[profile]") {
 
 TEST_CASE("Basic Meta (no license)", "[profile]") {
     constexpr std::string_view File = "${TESTDIR}/profile/basic/meta_no_license.profile";
-    Profile profile = loadProfile(absPath(File));
+    Profile profile = Profile(absPath(File));
 
     Profile ref;
     ref.version = Profile::CurrentVersion;
@@ -322,7 +305,7 @@ TEST_CASE("Basic Meta (no license)", "[profile]") {
 
 TEST_CASE("Basic Module", "[profile]") {
     constexpr std::string_view File = "${TESTDIR}/profile/basic/modules.profile";
-    Profile profile = loadProfile(absPath(File));
+    Profile profile = Profile(absPath(File));
 
     Profile ref;
     ref.version = Profile::CurrentVersion;
@@ -357,7 +340,7 @@ TEST_CASE("Basic Module", "[profile]") {
 
 TEST_CASE("Basic Assets", "[profile]") {
     constexpr std::string_view File = "${TESTDIR}/profile/basic/assets.profile";
-    Profile profile = loadProfile(absPath(File));
+    Profile profile = Profile(absPath(File));
 
     Profile ref;
     ref.version = Profile::CurrentVersion;
@@ -371,7 +354,7 @@ TEST_CASE("Basic Assets", "[profile]") {
 
 TEST_CASE("Basic Properties", "[profile]") {
     constexpr std::string_view File = "${TESTDIR}/profile/basic/properties.profile";
-    Profile profile = loadProfile(absPath(File));
+    Profile profile = Profile(absPath(File));
 
     Profile ref;
     ref.version = Profile::CurrentVersion;
@@ -424,7 +407,7 @@ TEST_CASE("Basic Properties", "[profile]") {
 
 TEST_CASE("Basic Keybindings", "[profile]") {
     constexpr std::string_view File = "${TESTDIR}/profile/basic/keybindings.profile";
-    Profile profile = loadProfile(absPath(File));
+    Profile profile = Profile(absPath(File));
 
     Profile ref;
     ref.version = Profile::CurrentVersion;
@@ -480,7 +463,7 @@ TEST_CASE("Basic Keybindings", "[profile]") {
 
 TEST_CASE("Basic Time Relative", "[profile]") {
     constexpr std::string_view File = "${TESTDIR}/profile/basic/time_relative.profile";
-    Profile profile = loadProfile(absPath(File));
+    Profile profile = Profile(absPath(File));
 
     Profile ref;
     ref.version = Profile::CurrentVersion;
@@ -495,7 +478,7 @@ TEST_CASE("Basic Time Relative", "[profile]") {
 
 TEST_CASE("Basic Time Absolute", "[profile]") {
     constexpr std::string_view File = "${TESTDIR}/profile/basic/time_absolute.profile";
-    Profile profile = loadProfile(absPath(File));
+    Profile profile = Profile(absPath(File));
 
     Profile ref;
     ref.version = Profile::CurrentVersion;
@@ -510,7 +493,7 @@ TEST_CASE("Basic Time Absolute", "[profile]") {
 
 TEST_CASE("Basic Delta Times", "[profile]") {
     constexpr std::string_view File = "${TESTDIR}/profile/basic/deltatimes.profile";
-    Profile profile = loadProfile(absPath(File));
+    Profile profile = Profile(absPath(File));
 
     Profile ref;
     ref.version = Profile::CurrentVersion;
@@ -526,7 +509,7 @@ TEST_CASE("Basic Delta Times", "[profile]") {
 
 TEST_CASE("Basic Camera NavState (full)", "[profile]") {
     constexpr std::string_view File = "${TESTDIR}/profile/basic/camera_navstate_full.profile";
-    Profile profile = loadProfile(absPath(File));
+    Profile profile = Profile(absPath(File));
 
     Profile ref;
     ref.version = Profile::CurrentVersion;
@@ -547,7 +530,7 @@ TEST_CASE("Basic Camera NavState (full)", "[profile]") {
 TEST_CASE("Basic Camera NavState (no aim)", "[profile]") {
     constexpr std::string_view File =
         "${TESTDIR}/profile/basic/camera_navstate_no_aim.profile";
-    Profile profile = loadProfile(absPath(File));
+    Profile profile = Profile(absPath(File));
 
     Profile ref;
     ref.version = Profile::CurrentVersion;
@@ -567,7 +550,7 @@ TEST_CASE("Basic Camera NavState (no aim)", "[profile]") {
 TEST_CASE("Basic Camera NavState (no pitch)", "[profile]") {
     constexpr std::string_view File =
         "${TESTDIR}/profile/basic/camera_navstate_no_pitch.profile";
-    Profile profile = loadProfile(absPath(File));
+    Profile profile = Profile(absPath(File));
 
     Profile ref;
     ref.version = Profile::CurrentVersion;
@@ -587,7 +570,7 @@ TEST_CASE("Basic Camera NavState (no pitch)", "[profile]") {
 TEST_CASE("Basic Camera NavState (no up)", "[profile]") {
     constexpr std::string_view File =
         "${TESTDIR}/profile/basic/camera_navstate_no_up.profile";
-    Profile profile = loadProfile(absPath(File));
+    Profile profile = Profile(absPath(File));
 
     Profile ref;
     ref.version = Profile::CurrentVersion;
@@ -607,7 +590,7 @@ TEST_CASE("Basic Camera NavState (no up)", "[profile]") {
 TEST_CASE("Basic Camera NavState (no yaw)", "[profile]") {
     constexpr std::string_view File =
         "${TESTDIR}/profile/basic/camera_navstate_no_yaw.profile";
-    Profile profile = loadProfile(absPath(File));
+    Profile profile = Profile(absPath(File));
 
     Profile ref;
     ref.version = Profile::CurrentVersion;
@@ -626,7 +609,7 @@ TEST_CASE("Basic Camera NavState (no yaw)", "[profile]") {
 
 TEST_CASE("Basic Camera GoToGeo (full)", "[profile]") {
     constexpr std::string_view File = "${TESTDIR}/profile/basic/camera_gotogeo.profile";
-    Profile profile = loadProfile(absPath(File));
+    Profile profile = Profile(absPath(File));
 
     Profile ref;
     ref.version = Profile::CurrentVersion;
@@ -643,7 +626,7 @@ TEST_CASE("Basic Camera GoToGeo (full)", "[profile]") {
 TEST_CASE("Basic Camera GoToGeo (with altitude)", "[profile]") {
     constexpr std::string_view File =
         "${TESTDIR}/profile/basic/camera_gotogeo_altitude.profile";
-    Profile profile = loadProfile(absPath(File));
+    Profile profile = Profile(absPath(File));
 
     Profile ref;
     ref.version = Profile::CurrentVersion;
@@ -661,7 +644,7 @@ TEST_CASE("Basic Camera GoToGeo (with altitude)", "[profile]") {
 TEST_CASE("Basic Camera GoToNode", "[profile]") {
     constexpr std::string_view File =
         "${TESTDIR}/profile/basic/camera_gotonode.profile";
-    Profile profile = loadProfile(absPath(File));
+    Profile profile = Profile(absPath(File));
 
     Profile ref;
     ref.version = Profile::CurrentVersion;
@@ -676,7 +659,7 @@ TEST_CASE("Basic Camera GoToNode", "[profile]") {
 TEST_CASE("Basic Camera GoToNode (with height)", "[profile]") {
     constexpr std::string_view File =
         "${TESTDIR}/profile/basic/camera_gotonode_height.profile";
-    Profile profile = loadProfile(absPath(File));
+    Profile profile = Profile(absPath(File));
 
     Profile ref;
     ref.version = Profile::CurrentVersion;
@@ -691,7 +674,7 @@ TEST_CASE("Basic Camera GoToNode (with height)", "[profile]") {
 
 TEST_CASE("Basic Mark Nodes", "[profile]") {
     constexpr std::string_view File = "${TESTDIR}/profile/basic/mark_nodes.profile";
-    Profile profile = loadProfile(absPath(File));
+    Profile profile = Profile(absPath(File));
 
     Profile ref;
     ref.version = Profile::CurrentVersion;
@@ -706,7 +689,7 @@ TEST_CASE("Basic Mark Nodes", "[profile]") {
 TEST_CASE("Basic Additional Scripts", "[profile]") {
     constexpr std::string_view File =
         "${TESTDIR}/profile/basic/additional_scripts.profile";
-    Profile profile = loadProfile(absPath(File));
+    Profile profile = Profile(absPath(File));
 
     Profile ref;
     ref.version = Profile::CurrentVersion;
@@ -723,7 +706,7 @@ TEST_CASE("Basic Additional Scripts", "[profile]") {
 //
 TEST_CASE("Integration Full Test", "[profile]") {
     constexpr std::string_view File = "${TESTDIR}/profile/integration/full_test.profile";
-    Profile profile = loadProfile(absPath(File));
+    Profile profile = Profile(absPath(File));
 
     Profile ref;
     ref.version = Profile::CurrentVersion;
@@ -1074,7 +1057,7 @@ TEST_CASE("(Error) Version: Missing value 'major'", "[profile]") {
     constexpr std::string_view TestFile =
         "${TESTDIR}/profile/error/version/missing_major.profile";
     CHECK_THROWS_WITH(
-        loadProfile(absPath(TestFile)),
+        Profile(absPath(TestFile)),
         Catch::Matchers::Equals("(profile) 'version.major' field is missing")
     );
 }
@@ -1083,7 +1066,7 @@ TEST_CASE("(Error) Version: Missing value 'minor'", "[profile]") {
     constexpr std::string_view TestFile =
         "${TESTDIR}/profile/error/version/missing_minor.profile";
     CHECK_THROWS_WITH(
-        loadProfile(absPath(TestFile)),
+        Profile(absPath(TestFile)),
         Catch::Matchers::Equals("(profile) 'version.minor' field is missing")
     );
 }
@@ -1092,7 +1075,7 @@ TEST_CASE("(Error) Version: Wrong type 'major'", "[profile]") {
     constexpr std::string_view TestFile =
         "${TESTDIR}/profile/error/version/wrongtype_major.profile";
     CHECK_THROWS_WITH(
-        loadProfile(absPath(TestFile)),
+        Profile(absPath(TestFile)),
         Catch::Matchers::Equals("(profile) 'version.major' must be a number")
     );
 }
@@ -1101,7 +1084,7 @@ TEST_CASE("(Error) Version: Wrong type 'minor'", "[profile]") {
     constexpr std::string_view TestFile =
         "${TESTDIR}/profile/error/version/wrongtype_minor.profile";
     CHECK_THROWS_WITH(
-        loadProfile(absPath(TestFile)),
+        Profile(absPath(TestFile)),
         Catch::Matchers::Equals("(profile) 'version.minor' must be a number")
     );
 }
@@ -1110,7 +1093,7 @@ TEST_CASE("(Error) Version: Wrong type 'major' and 'minor'", "[profile]") {
     constexpr std::string_view TestFile =
         "${TESTDIR}/profile/error/version/wrongtype_major_minor.profile";
     CHECK_THROWS_WITH(
-        loadProfile(absPath(TestFile)),
+        Profile(absPath(TestFile)),
         Catch::Matchers::Equals("(profile) 'version.major' must be a number")
     );
 }
@@ -1124,7 +1107,7 @@ TEST_CASE("(Error) Module: Missing value 'name'", "[profile]") {
     constexpr std::string_view TestFile =
         "${TESTDIR}/profile/error/module/missing_name.profile";
     CHECK_THROWS_WITH(
-        loadProfile(absPath(TestFile)),
+        Profile(absPath(TestFile)),
         Catch::Matchers::Equals("(profile) 'module.name' field is missing")
     );
 }
@@ -1133,7 +1116,7 @@ TEST_CASE("(Error) Module: Wrong type 'name'", "[profile]") {
     constexpr std::string_view TestFile =
         "${TESTDIR}/profile/error/module/wrongtype_name.profile";
     CHECK_THROWS_WITH(
-        loadProfile(absPath(TestFile)),
+        Profile(absPath(TestFile)),
         Catch::Matchers::Equals("(profile) 'module.name' must be a string")
     );
 }
@@ -1142,7 +1125,7 @@ TEST_CASE("(Error) Module: Wrong type 'loadedInstruction'", "[profile]") {
     constexpr std::string_view TestFile =
         "${TESTDIR}/profile/error/module/wrongtype_loadedInstruction.profile";
     CHECK_THROWS_WITH(
-        loadProfile(absPath(TestFile)),
+        Profile(absPath(TestFile)),
         Catch::Matchers::Equals("(profile) 'module.loadedInstruction' must be a string")
     );
 }
@@ -1151,7 +1134,7 @@ TEST_CASE("(Error) Module: Wrong type 'notLoadedInstruction'", "[profile]") {
     constexpr std::string_view TestFile =
         "${TESTDIR}/profile/error/module/wrongtype_notLoadedInstruction.profile";
     CHECK_THROWS_WITH(
-        loadProfile(absPath(TestFile)),
+        Profile(absPath(TestFile)),
         Catch::Matchers::Equals("(profile) 'module.notLoadedInstruction' must be a string")
     );
 }
@@ -1164,7 +1147,7 @@ TEST_CASE("(Error) Property: Missing value 'name'", "[profile]") {
     constexpr std::string_view TestFile =
         "${TESTDIR}/profile/error/property/missing_name.profile";
     CHECK_THROWS_WITH(
-        loadProfile(absPath(TestFile)),
+        Profile(absPath(TestFile)),
         Catch::Matchers::Equals("(profile) 'property.name' field is missing")
     );
 }
@@ -1173,7 +1156,7 @@ TEST_CASE("(Error) Property: Missing value 'value'", "[profile]") {
     constexpr std::string_view TestFile =
         "${TESTDIR}/profile/error/property/missing_value.profile";
     CHECK_THROWS_WITH(
-        loadProfile(absPath(TestFile)),
+        Profile(absPath(TestFile)),
         Catch::Matchers::Equals("(profile) 'property.value' field is missing")
     );
 }
@@ -1182,7 +1165,7 @@ TEST_CASE("(Error) Property: Missing value 'name' and 'value'", "[profile]") {
     constexpr std::string_view TestFile =
         "${TESTDIR}/profile/error/property/missing_name_value.profile";
     CHECK_THROWS_WITH(
-        loadProfile(absPath(TestFile)),
+        Profile(absPath(TestFile)),
         Catch::Matchers::Equals("(profile) 'property.name' field is missing")
     );
 }
@@ -1191,7 +1174,7 @@ TEST_CASE("(Error) Property: Wrong value 'type'", "[profile]") {
     constexpr std::string_view TestFile =
         "${TESTDIR}/profile/error/property/wrongvalue_type.profile";
     CHECK_THROWS_WITH(
-        loadProfile(absPath(TestFile)),
+        Profile(absPath(TestFile)),
         Catch::Matchers::Equals("(profile) Unknown property set type")
     );
 }
@@ -1200,7 +1183,7 @@ TEST_CASE("(Error) Property: Wrong type 'name'", "[profile]") {
     constexpr std::string_view TestFile =
         "${TESTDIR}/profile/error/property/wrongtype_name.profile";
     CHECK_THROWS_WITH(
-        loadProfile(absPath(TestFile)),
+        Profile(absPath(TestFile)),
         Catch::Matchers::Equals("(profile) 'property.name' must be a string")
     );
 }
@@ -1209,7 +1192,7 @@ TEST_CASE("(Error) Property: Wrong type 'value'", "[profile]") {
     constexpr std::string_view TestFile =
         "${TESTDIR}/profile/error/property/wrongtype_value.profile";
     CHECK_THROWS_WITH(
-        loadProfile(absPath(TestFile)),
+        Profile(absPath(TestFile)),
         Catch::Matchers::Equals("(profile) 'property.value' must be a string")
     );
 }
@@ -1222,7 +1205,7 @@ TEST_CASE("(Error) Keybinding: Missing value 'key'", "[profile]") {
     constexpr std::string_view TestFile =
         "${TESTDIR}/profile/error/keybinding/missing_key.profile";
     CHECK_THROWS_WITH(
-        loadProfile(absPath(TestFile)),
+        Profile(absPath(TestFile)),
         Catch::Matchers::Equals("(profile) 'keybinding.key' field is missing")
     );
 }
@@ -1231,7 +1214,7 @@ TEST_CASE("(Error) Keybinding: Missing value 'documentation'", "[profile]") {
     constexpr std::string_view TestFile =
         "${TESTDIR}/profile/error/keybinding/missing_documentation.profile";
     CHECK_THROWS_WITH(
-        loadProfile(absPath(TestFile)),
+        Profile(absPath(TestFile)),
         Catch::Matchers::Equals("(profile) 'keybinding.documentation' field is missing")
     );
 }
@@ -1240,7 +1223,7 @@ TEST_CASE("(Error) Keybinding: Missing value 'name'", "[profile]") {
     constexpr std::string_view TestFile =
         "${TESTDIR}/profile/error/keybinding/missing_name.profile";
     CHECK_THROWS_WITH(
-        loadProfile(absPath(TestFile)),
+        Profile(absPath(TestFile)),
         Catch::Matchers::Equals("(profile) 'keybinding.name' field is missing")
     );
 }
@@ -1249,7 +1232,7 @@ TEST_CASE("(Error) Keybinding: Missing value 'gui_path'", "[profile]") {
     constexpr std::string_view TestFile =
         "${TESTDIR}/profile/error/keybinding/missing_guipath.profile";
     CHECK_THROWS_WITH(
-        loadProfile(absPath(TestFile)),
+        Profile(absPath(TestFile)),
         Catch::Matchers::Equals("(profile) 'keybinding.gui_path' field is missing")
     );
 }
@@ -1258,7 +1241,7 @@ TEST_CASE("(Error) Keybinding: Missing value 'is_local'", "[profile]") {
     constexpr std::string_view TestFile =
         "${TESTDIR}/profile/error/keybinding/missing_islocal.profile";
     CHECK_THROWS_WITH(
-        loadProfile(absPath(TestFile)),
+        Profile(absPath(TestFile)),
         Catch::Matchers::Equals("(profile) 'keybinding.is_local' field is missing")
     );
 }
@@ -1267,7 +1250,7 @@ TEST_CASE("(Error) Keybinding: Wrong value 'key'", "[profile]") {
     constexpr std::string_view TestFile =
         "${TESTDIR}/profile/error/keybinding/wrongvalue_key.profile";
     CHECK_THROWS_WITH(
-        loadProfile(absPath(TestFile)),
+        Profile(absPath(TestFile)),
         Catch::Matchers::Equals("Could not find key for 'F50'")
     );
 }
@@ -1276,7 +1259,7 @@ TEST_CASE("(Error) Keybinding: Wrong value 'key, modifier'", "[profile]") {
     constexpr std::string_view TestFile =
         "${TESTDIR}/profile/error/keybinding/wrongvalue_modifier.profile";
     CHECK_THROWS_WITH(
-        loadProfile(absPath(TestFile)),
+        Profile(absPath(TestFile)),
         Catch::Matchers::Equals("Unknown modifier key 'KEYKEY'")
     );
 }
@@ -1285,7 +1268,7 @@ TEST_CASE("(Error) Keybinding: Wrong type 'documentation'", "[profile]") {
     constexpr std::string_view TestFile =
         "${TESTDIR}/profile/error/keybinding/wrongtype_documentation.profile";
     CHECK_THROWS_WITH(
-        loadProfile(absPath(TestFile)),
+        Profile(absPath(TestFile)),
         Catch::Matchers::Equals("(profile) 'keybinding.documentation' must be a string")
     );
 }
@@ -1294,7 +1277,7 @@ TEST_CASE("(Error) Keybinding: Wrong type 'gui_path'", "[profile]") {
     constexpr std::string_view TestFile =
         "${TESTDIR}/profile/error/keybinding/wrongtype_guipath.profile";
     CHECK_THROWS_WITH(
-        loadProfile(absPath(TestFile)),
+        Profile(absPath(TestFile)),
         Catch::Matchers::Equals("(profile) 'keybinding.gui_path' must be a string")
     );
 }
@@ -1303,7 +1286,7 @@ TEST_CASE("(Error) Keybinding: Wrong type 'is_local'", "[profile]") {
     constexpr std::string_view TestFile =
         "${TESTDIR}/profile/error/keybinding/wrongtype_islocal.profile";
     CHECK_THROWS_WITH(
-        loadProfile(absPath(TestFile)),
+        Profile(absPath(TestFile)),
         Catch::Matchers::Equals("(profile) 'keybinding.is_local' must be a boolean")
     );
 }
@@ -1312,7 +1295,7 @@ TEST_CASE("(Error) Keybinding: Wrong type 'name'", "[profile]") {
     constexpr std::string_view TestFile =
         "${TESTDIR}/profile/error/keybinding/wrongtype_name.profile";
     CHECK_THROWS_WITH(
-        loadProfile(absPath(TestFile)),
+        Profile(absPath(TestFile)),
         Catch::Matchers::Equals("(profile) 'keybinding.name' must be a string")
     );
 }
@@ -1321,7 +1304,7 @@ TEST_CASE("(Error) Keybinding: Wrong type 'script'", "[profile]") {
     constexpr std::string_view TestFile =
         "${TESTDIR}/profile/error/keybinding/wrongtype_script.profile";
     CHECK_THROWS_WITH(
-        loadProfile(absPath(TestFile)),
+        Profile(absPath(TestFile)),
         Catch::Matchers::Equals("(profile) 'keybinding.script' must be a string")
     );
 }
@@ -1334,7 +1317,7 @@ TEST_CASE("(Error) Time: Wrong value 'type'", "[profile]") {
     constexpr std::string_view TestFile =
         "${TESTDIR}/profile/error/time/wrongvalue_type.profile";
     CHECK_THROWS_WITH(
-        loadProfile(absPath(TestFile)),
+        Profile(absPath(TestFile)),
         Catch::Matchers::Equals("(profile) Unknown time type")
     );
 }
@@ -1343,7 +1326,7 @@ TEST_CASE("(Error) Time (absolute): Missing value 'type'", "[profile]") {
     constexpr std::string_view TestFile =
         "${TESTDIR}/profile/error/time/missing_type.profile";
     CHECK_THROWS_WITH(
-        loadProfile(absPath(TestFile)),
+        Profile(absPath(TestFile)),
         Catch::Matchers::Equals("(profile) 'time.type' field is missing")
     );
 }
@@ -1352,7 +1335,7 @@ TEST_CASE("(Error) Time (relative): Missing value 'value'", "[profile]") {
     constexpr std::string_view TestFile =
         "${TESTDIR}/profile/error/time/relative_missing_value.profile";
     CHECK_THROWS_WITH(
-        loadProfile(absPath(TestFile)),
+        Profile(absPath(TestFile)),
         Catch::Matchers::Equals("(profile) 'time.value' field is missing")
     );
 }
@@ -1364,7 +1347,7 @@ TEST_CASE("(Error) Deltatimes: Wrong type", "[profile]") {
     constexpr std::string_view TestFile =
         "${TESTDIR}/profile/error/deltatimes/wrongtype_value.profile";
     CHECK_THROWS_WITH(
-        loadProfile(absPath(TestFile)),
+        Profile(absPath(TestFile)),
         Catch::Matchers::ContainsSubstring("type must be number, but is string")
     );
 }
@@ -1376,7 +1359,7 @@ TEST_CASE("(Error) Camera: Wrong value 'type'", "[profile]") {
     constexpr std::string_view TestFile =
         "${TESTDIR}/profile/error/camera/wrongvalue_type.profile";
     CHECK_THROWS_WITH(
-        loadProfile(absPath(TestFile)),
+        Profile(absPath(TestFile)),
         Catch::Matchers::Equals("(profile) Unknown camera type")
     );
 }
@@ -1385,7 +1368,7 @@ TEST_CASE("(Error) Camera (NavState): Missing value 'anchor'", "[profile]") {
     constexpr std::string_view TestFile =
         "${TESTDIR}/profile/error/camera/navstate_missing_anchor.profile";
     CHECK_THROWS_WITH(
-        loadProfile(absPath(TestFile)),
+        Profile(absPath(TestFile)),
         Catch::Matchers::Equals("(profile) 'camera.anchor' field is missing")
     );
 }
@@ -1394,7 +1377,7 @@ TEST_CASE("(Error) Camera (NavState): Missing value 'frame'", "[profile]") {
     constexpr std::string_view TestFile =
         "${TESTDIR}/profile/error/camera/navstate_missing_frame.profile";
     CHECK_THROWS_WITH(
-        loadProfile(absPath(TestFile)),
+        Profile(absPath(TestFile)),
         Catch::Matchers::Equals("(profile) 'camera.frame' field is missing")
     );
 }
@@ -1403,7 +1386,7 @@ TEST_CASE("(Error) Camera (NavState): Missing value 'position'", "[profile]") {
     constexpr std::string_view TestFile =
         "${TESTDIR}/profile/error/camera/navstate_missing_position.profile";
     CHECK_THROWS_WITH(
-        loadProfile(absPath(TestFile)),
+        Profile(absPath(TestFile)),
         Catch::Matchers::Equals("(profile) 'camera.position' field is missing")
     );
 }
@@ -1412,7 +1395,7 @@ TEST_CASE("(Error) Camera (NavState): Wrong type 'anchor'", "[profile]") {
     constexpr std::string_view TestFile =
         "${TESTDIR}/profile/error/camera/navstate_wrongtype_anchor.profile";
     CHECK_THROWS_WITH(
-        loadProfile(absPath(TestFile)),
+        Profile(absPath(TestFile)),
         Catch::Matchers::Equals("(profile) 'camera.anchor' must be a string")
     );
 }
@@ -1421,7 +1404,7 @@ TEST_CASE("(Error) Camera (NavState): Wrong type 'aim'", "[profile]") {
     constexpr std::string_view TestFile =
         "${TESTDIR}/profile/error/camera/navstate_wrongtype_aim.profile";
     CHECK_THROWS_WITH(
-        loadProfile(absPath(TestFile)),
+        Profile(absPath(TestFile)),
         Catch::Matchers::Equals("(profile) 'camera.aim' must be a string")
     );
 }
@@ -1430,7 +1413,7 @@ TEST_CASE("(Error) Camera (NavState): Wrong type 'frame'", "[profile]") {
     constexpr std::string_view TestFile =
         "${TESTDIR}/profile/error/camera/navstate_wrongtype_frame.profile";
     CHECK_THROWS_WITH(
-        loadProfile(absPath(TestFile)),
+        Profile(absPath(TestFile)),
         Catch::Matchers::Equals("(profile) 'camera.frame' must be a string")
     );
 }
@@ -1439,7 +1422,7 @@ TEST_CASE("(Error) Camera (NavState): Wrong type 'position'", "[profile]") {
     constexpr std::string_view TestFile =
         "${TESTDIR}/profile/error/camera/navstate_wrongtype_position.profile";
     CHECK_THROWS_WITH(
-        loadProfile(absPath(TestFile)),
+        Profile(absPath(TestFile)),
         Catch::Matchers::Equals("(profile) 'camera.position' must be an object")
     );
 }
@@ -1448,7 +1431,7 @@ TEST_CASE("(Error) Camera (NavState): Missing value 'position.x'", "[profile]")
     constexpr std::string_view TestFile =
         "${TESTDIR}/profile/error/camera/navstate_missing_position_x.profile";
     CHECK_THROWS_WITH(
-        loadProfile(absPath(TestFile)),
+        Profile(absPath(TestFile)),
         Catch::Matchers::Equals("(profile) 'camera.position.x' field is missing")
     );
 }
@@ -1457,7 +1440,7 @@ TEST_CASE("(Error) Camera (NavState): Wrong type 'position.x'", "[profile]") {
     constexpr std::string_view TestFile =
         "${TESTDIR}/profile/error/camera/navstate_wrongtype_position_x.profile";
     CHECK_THROWS_WITH(
-        loadProfile(absPath(TestFile)),
+        Profile(absPath(TestFile)),
         Catch::Matchers::Equals("(profile) 'camera.position.x' must be a number")
     );
 }
@@ -1466,7 +1449,7 @@ TEST_CASE("(Error) Camera (NavState): Missing value 'position.y'", "[profile]")
     constexpr std::string_view TestFile =
         "${TESTDIR}/profile/error/camera/navstate_missing_position_y.profile";
     CHECK_THROWS_WITH(
-        loadProfile(absPath(TestFile)),
+        Profile(absPath(TestFile)),
         Catch::Matchers::Equals("(profile) 'camera.position.y' field is missing")
     );
 }
@@ -1475,7 +1458,7 @@ TEST_CASE("(Error) Camera (NavState): Wrong type 'position.y'", "[profile]") {
     constexpr std::string_view TestFile =
         "${TESTDIR}/profile/error/camera/navstate_wrongtype_position_y.profile";
     CHECK_THROWS_WITH(
-        loadProfile(absPath(TestFile)),
+        Profile(absPath(TestFile)),
         Catch::Matchers::Equals("(profile) 'camera.position.y' must be a number")
     );
 }
@@ -1484,7 +1467,7 @@ TEST_CASE("(Error) Camera (NavState): Missing value 'position.z'", "[profile]")
     constexpr std::string_view TestFile =
         "${TESTDIR}/profile/error/camera/navstate_missing_position_z.profile";
     CHECK_THROWS_WITH(
-        loadProfile(absPath(TestFile)),
+        Profile(absPath(TestFile)),
         Catch::Matchers::Equals("(profile) 'camera.position.z' field is missing")
     );
 }
@@ -1493,7 +1476,7 @@ TEST_CASE("(Error) Camera (NavState): Wrong type 'position.z'", "[profile]") {
     constexpr std::string_view TestFile =
         "${TESTDIR}/profile/error/camera/navstate_wrongtype_position_z.profile";
     CHECK_THROWS_WITH(
-        loadProfile(absPath(TestFile)),
+        Profile(absPath(TestFile)),
         Catch::Matchers::Equals("(profile) 'camera.position.z' must be a number")
     );
 }
@@ -1502,7 +1485,7 @@ TEST_CASE("(Error) Camera (NavState): Wrong type 'up'", "[profile]") {
     constexpr std::string_view TestFile =
         "${TESTDIR}/profile/error/camera/navstate_wrongtype_up.profile";
     CHECK_THROWS_WITH(
-        loadProfile(absPath(TestFile)),
+        Profile(absPath(TestFile)),
         Catch::Matchers::Equals("(profile) 'camera.up' must be an object")
     );
 }
@@ -1511,7 +1494,7 @@ TEST_CASE("(Error) Camera (NavState): Missing value 'up.x'", "[profile]") {
     constexpr std::string_view TestFile =
         "${TESTDIR}/profile/error/camera/navstate_missing_up_x.profile";
     CHECK_THROWS_WITH(
-        loadProfile(absPath(TestFile)),
+        Profile(absPath(TestFile)),
         Catch::Matchers::Equals("(profile) 'camera.up.x' field is missing")
     );
 }
@@ -1520,7 +1503,7 @@ TEST_CASE("(Error) Camera (NavState): Wrong type 'up.x'", "[profile]") {
     constexpr std::string_view TestFile =
         "${TESTDIR}/profile/error/camera/navstate_wrongtype_up_x.profile";
     CHECK_THROWS_WITH(
-        loadProfile(absPath(TestFile)),
+        Profile(absPath(TestFile)),
         Catch::Matchers::Equals("(profile) 'camera.up.x' must be a number")
     );
 }
@@ -1529,7 +1512,7 @@ TEST_CASE("(Error) Camera (NavState): Missing value 'up.y'", "[profile]") {
     constexpr std::string_view TestFile =
         "${TESTDIR}/profile/error/camera/navstate_missing_up_y.profile";
     CHECK_THROWS_WITH(
-        loadProfile(absPath(TestFile)),
+        Profile(absPath(TestFile)),
         Catch::Matchers::Equals("(profile) 'camera.up.y' field is missing")
     );
 }
@@ -1538,7 +1521,7 @@ TEST_CASE("(Error) Camera (NavState): Wrong type 'up.y'", "[profile]") {
     constexpr std::string_view TestFile =
         "${TESTDIR}/profile/error/camera/navstate_wrongtype_up_y.profile";
     CHECK_THROWS_WITH(
-        loadProfile(absPath(TestFile)),
+        Profile(absPath(TestFile)),
         Catch::Matchers::Equals("(profile) 'camera.up.y' must be a number")
     );
 }
@@ -1547,7 +1530,7 @@ TEST_CASE("(Error) Camera (NavState): Missing value 'up.z'", "[profile]") {
     constexpr std::string_view TestFile =
         "${TESTDIR}/profile/error/camera/navstate_missing_up_z.profile";
     CHECK_THROWS_WITH(
-        loadProfile(absPath(TestFile)),
+        Profile(absPath(TestFile)),
         Catch::Matchers::Equals("(profile) 'camera.up.z' field is missing")
     );
 }
@@ -1556,7 +1539,7 @@ TEST_CASE("(Error) Camera (NavState): Wrong type 'up.z'", "[profile]") {
     constexpr std::string_view TestFile =
         "${TESTDIR}/profile/error/camera/navstate_wrongtype_up_z.profile";
     CHECK_THROWS_WITH(
-        loadProfile(absPath(TestFile)),
+        Profile(absPath(TestFile)),
         Catch::Matchers::Equals("(profile) 'camera.up.z' must be a number")
     );
 }
@@ -1565,7 +1548,7 @@ TEST_CASE("(Error) Camera (NavState): Wrong type 'yaw'", "[profile]") {
     constexpr std::string_view TestFile =
         "${TESTDIR}/profile/error/camera/navstate_wrongtype_yaw.profile";
     CHECK_THROWS_WITH(
-        loadProfile(absPath(TestFile)),
+        Profile(absPath(TestFile)),
         Catch::Matchers::Equals("(profile) 'camera.yaw' must be a number")
     );
 }
@@ -1574,7 +1557,7 @@ TEST_CASE("(Error) Camera (NavState): Wrong type 'pitch'", "[profile]") {
     constexpr std::string_view TestFile =
         "${TESTDIR}/profile/error/camera/navstate_wrongtype_pitch.profile";
     CHECK_THROWS_WITH(
-        loadProfile(absPath(TestFile)),
+        Profile(absPath(TestFile)),
         Catch::Matchers::Equals("(profile) 'camera.pitch' must be a number")
     );
 }
@@ -1583,7 +1566,7 @@ TEST_CASE("(Error) Camera (GoToGeo): Missing value 'anchor'", "[profile]") {
     constexpr std::string_view TestFile =
         "${TESTDIR}/profile/error/camera/gotogeo_missing_anchor.profile";
     CHECK_THROWS_WITH(
-        loadProfile(absPath(TestFile)),
+        Profile(absPath(TestFile)),
         Catch::Matchers::Equals("(profile) 'camera.anchor' field is missing")
     );
 }
@@ -1592,7 +1575,7 @@ TEST_CASE("(Error) Camera (GoToGeo): Missing value 'latitude'", "[profile]") {
     constexpr std::string_view TestFile =
         "${TESTDIR}/profile/error/camera/gotogeo_missing_latitude.profile";
     CHECK_THROWS_WITH(
-        loadProfile(absPath(TestFile)),
+        Profile(absPath(TestFile)),
         Catch::Matchers::Equals("(profile) 'camera.latitude' field is missing")
     );
 }
@@ -1601,7 +1584,7 @@ TEST_CASE("(Error) Camera (GoToGeo): Missing value 'longitude'", "[profile]") {
     constexpr std::string_view TestFile =
         "${TESTDIR}/profile/error/camera/gotogeo_missing_longitude.profile";
     CHECK_THROWS_WITH(
-        loadProfile(absPath(TestFile)),
+        Profile(absPath(TestFile)),
         Catch::Matchers::Equals("(profile) 'camera.longitude' field is missing")
     );
 }
@@ -1610,7 +1593,7 @@ TEST_CASE("(Error) Camera (GoToGeo): Wrong type 'anchor'", "[profile]") {
     constexpr std::string_view TestFile =
         "${TESTDIR}/profile/error/camera/gotogeo_wrongtype_anchor.profile";
     CHECK_THROWS_WITH(
-        loadProfile(absPath(TestFile)),
+        Profile(absPath(TestFile)),
         Catch::Matchers::Equals("(profile) 'camera.anchor' must be a string")
     );
 }
@@ -1619,7 +1602,7 @@ TEST_CASE("(Error) Camera (GoToGeo): Wrong type 'latitude'", "[profile]") {
     constexpr std::string_view TestFile =
         "${TESTDIR}/profile/error/camera/gotogeo_wrongtype_latitude.profile";
     CHECK_THROWS_WITH(
-        loadProfile(absPath(TestFile)),
+        Profile(absPath(TestFile)),
         Catch::Matchers::Equals("(profile) 'camera.latitude' must be a number")
     );
 }
@@ -1628,7 +1611,7 @@ TEST_CASE("(Error) Camera (GoToGeo): Wrong type 'longitude'", "[profile]") {
     constexpr std::string_view TestFile =
         "${TESTDIR}/profile/error/camera/gotogeo_wrongtype_longitude.profile";
     CHECK_THROWS_WITH(
-        loadProfile(absPath(TestFile)),
+        Profile(absPath(TestFile)),
         Catch::Matchers::Equals("(profile) 'camera.longitude' must be a number")
     );
 }
@@ -1637,7 +1620,7 @@ TEST_CASE("(Error) Camera (GoToGeo): Wrong type 'altitude'", "[profile]") {
     constexpr std::string_view TestFile =
         "${TESTDIR}/profile/error/camera/gotogeo_wrongtype_altitude.profile";
     CHECK_THROWS_WITH(
-        loadProfile(absPath(TestFile)),
+        Profile(absPath(TestFile)),
         Catch::Matchers::Equals("(profile) 'camera.altitude' must be a number")
     );
 }
@@ -1646,7 +1629,7 @@ TEST_CASE("(Error) Camera (GoToNode): Wrong type 'anchor'", "[profile]") {
     constexpr std::string_view TestFile =
         "${TESTDIR}/profile/error/camera/gotonode_wrongtype_anchor.profile";
     CHECK_THROWS_WITH(
-        loadProfile(absPath(TestFile)),
+        Profile(absPath(TestFile)),
         Catch::Matchers::Equals("(profile) 'camera.anchor' must be a string")
     );
 }
@@ -1655,7 +1638,7 @@ TEST_CASE("(Error) Camera (GoToNode): Wrong type 'height'", "[profile]") {
     constexpr std::string_view TestFile =
         "${TESTDIR}/profile/error/camera/gotonode_wrongtype_height.profile";
     CHECK_THROWS_WITH(
-        loadProfile(absPath(TestFile)),
+        Profile(absPath(TestFile)),
         Catch::Matchers::Equals("(profile) 'camera.height' must be a number")
     );
 }
@@ -1664,7 +1647,7 @@ TEST_CASE("(Error) Camera (GoToNode): Missing value 'anchor'", "[profile]") {
     constexpr std::string_view TestFile =
         "${TESTDIR}/profile/error/camera/gotonode_missing_anchor.profile";
     CHECK_THROWS_WITH(
-        loadProfile(absPath(TestFile)),
+        Profile(absPath(TestFile)),
         Catch::Matchers::Equals("(profile) 'camera.anchor' field is missing")
     );
 }
@@ -1677,7 +1660,7 @@ TEST_CASE("(Error) Camera (GoToNode): Missing value 'anchor'", "[profile]") {
 //    constexpr std::string_view TestFile =
 //        "${TESTDIR}/profile/error/camera/gotonode_invalidvalue_negative_height.profile";
 //    CHECK_THROWS_WITH(
-//        loadProfile(absPath(TestFile)),
+//        Profile(absPath(TestFile)),
 //        Catch::Matchers::Equals("(profile) 'camera.height' must be a larger than zero")
 //    );
 //}
@@ -1686,7 +1669,7 @@ TEST_CASE("(Error) Camera (GoToNode): Missing value 'anchor'", "[profile]") {
 //    constexpr std::string_view TestFile =
 //        "${TESTDIR}/profile/error/camera/gotonode_invalidvalue_zero_height.profile";
 //    CHECK_THROWS_WITH(
-//        loadProfile(absPath(TestFile)),
+//        Profile(absPath(TestFile)),
 //        Catch::Matchers::Equals("(profile) 'camera.height' must be a larger than zero")
 //    );
 //}

From 187808f84e27fcacefe3ebdefdebf6ffb4e7c5e2 Mon Sep 17 00:00:00 2001
From: Alexander Bock <alexander.bock@liu.se>
Date: Wed, 28 Feb 2024 11:56:26 +0100
Subject: [PATCH 288/701] Add the Tiangong space station

---
 .../earth/satellites/misc/tiangong.asset      | 153 ++++++++++++++++++
 .../satellites/satellites_interesting.asset   |   1 +
 2 files changed, 154 insertions(+)
 create mode 100644 data/assets/scene/solarsystem/planets/earth/satellites/misc/tiangong.asset

diff --git a/data/assets/scene/solarsystem/planets/earth/satellites/misc/tiangong.asset b/data/assets/scene/solarsystem/planets/earth/satellites/misc/tiangong.asset
new file mode 100644
index 0000000000..7e38ed719e
--- /dev/null
+++ b/data/assets/scene/solarsystem/planets/earth/satellites/misc/tiangong.asset
@@ -0,0 +1,153 @@
+local transforms = asset.require("scene/solarsystem/planets/earth/transforms")
+local sun = asset.require("scene/solarsystem/sun/sun")
+local coreKernels = asset.require("spice/core")
+
+
+local models = asset.resource({
+  Name = "Tiangong Models",
+  Type = "HttpSynchronization",
+  Identifier = "tiangong_model",
+  Version = 1
+})
+
+local omm = asset.resource({
+  Name = "Satellite OMM Data (Tiangong)",
+  Type = "UrlSynchronization",
+  Identifier = "satellite_omm_data_tiangong",
+  Url = "https://www.celestrak.com/NORAD/elements/gp.php?CATNR=48274&FORMAT=kvn",
+  Filename = "Tiangong.txt",
+  SecondsUntilResync = 24 * 60 * 60
+})
+
+
+local TiangongPosition = {
+  Identifier = "TiangongPosition",
+  Parent = transforms.EarthInertial.Identifier,
+  BoundingSphere = 54.5, -- half the width
+  Transform = {
+    Translation = {
+      Type = "GPTranslation",
+      Observer = transforms.EarthInertial.Identifier,
+      File = omm .. "Tiangong.txt",
+      Format = "OMM"
+    },
+    Rotation = {
+      Type = "SpiceRotation",
+      SourceFrame = coreKernels.Frame.Galactic,
+      DestinationFrame = coreKernels.Frame.J2000
+    }
+  },
+  Tag = { "earth_satellite" },
+  GUI = {
+    Name = "Tiangong Position",
+    Path = "/Solar System/Planets/Earth/Satellites/Tiangong",
+    Hidden = true
+  }
+}
+
+local TiangongModel = {
+  Identifier = "Tiangong",
+  Parent = TiangongPosition.Identifier,
+  Transform = {
+    Rotation = {
+      Type = "FixedRotation",
+      Attached = "Tiangong",
+      XAxis = { 0.01, -0.09, 1.0 },
+      XAxisOrthogonal = true,
+      YAxis = transforms.EarthInertial.Identifier
+    }
+  },
+  Renderable = {
+    Type = "RenderableModel",
+    GeometryFile = asset.resource(models .. "tiangong.glb"),
+    LightSources = {
+      sun.LightSource
+    },
+    PerformShading = true
+  },
+  Tag = { "earth_satellite" },
+  GUI = {
+    Name = "Tiangong",
+    Path = "/Solar System/Planets/Earth/Satellites/Tiangong"
+  }
+}
+
+local TiangongTrail = {
+  Identifier = "Tiangong_trail",
+  Parent = transforms.EarthInertial.Identifier,
+  Renderable = {
+    Type = "RenderableTrailOrbit",
+    Translation = {
+      Type = "GPTranslation",
+      Observer = transforms.EarthInertial.Identifier,
+      File = omm .. "Tiangong.txt",
+      Format = "OMM"
+    },
+    RenderBinMode = "PostDeferredTransparent",
+    Color = { 0.9, 0.28, 0.33 },
+    Fade = 1.5,
+    Resolution = 320
+  },
+  Tag = { "earth_satellite" },
+  GUI = {
+    Name = "Tiangong Trail",
+    Path = "/Solar System/Planets/Earth/Satellites/Tiangong"
+  }
+}
+
+-- @TODO (emmbr, 2021-05-27) add to scene when label rendering issues have been fixed
+local TiangongLabel = {
+  Identifier = "TiangongLabel",
+  Parent = TiangongPosition.Identifier,
+  Renderable = {
+    Type = "RenderableLabel",
+    Enabled = false,
+    Text = "Tiangong",
+    FontSize = 70.0,
+    Size = 3.4,
+    MinMaxSize = { 1, 100 },
+    OrientationOption = "Camera View Direction",
+    BlendMode = "Additive",
+    EnableFading = true,
+    FadeDistances = { 0.15, 15.0 },
+    FadeWidths = { 1.0, 25.0 }
+  },
+  Tag = { "solarsystem_labels" },
+  GUI = {
+    Name = "Tiangong Label",
+    Path = "/Solar System/Planets/Earth/Satellites"
+  }
+}
+
+
+asset.onInitialize(function()
+  local i = openspace.space.readKeplerFile(omm .. "Tiangong.txt", "OMM")
+  TiangongTrail.Renderable.Period = i[1].Period / (60 * 60 * 24)
+
+  openspace.addSceneGraphNode(TiangongPosition)
+  openspace.addSceneGraphNode(TiangongModel)
+  openspace.addSceneGraphNode(TiangongTrail)
+
+  openspace.setPropertyValueSingle("Scene.Tiangong.Rotation.yAxisInvertObject", true)
+end)
+
+asset.onDeinitialize(function()
+  openspace.removeSceneGraphNode(TiangongTrail)
+  openspace.removeSceneGraphNode(TiangongModel)
+  openspace.removeSceneGraphNode(TiangongPosition)
+end)
+
+asset.export(TiangongTrail)
+asset.export(TiangongModel)
+asset.export(TiangongPosition)
+
+
+
+asset.meta = {
+  Name = "Tiangong",
+  Version = "2.0",
+  Description = [[Model and Trail for Tiangong. Model from Turbosquid, trail from
+    Celestrak.]],
+  Author = "OpenSpace Team",
+  URL = "https://celestrak.com/"
+}
diff --git a/data/assets/scene/solarsystem/planets/earth/satellites/satellites_interesting.asset b/data/assets/scene/solarsystem/planets/earth/satellites/satellites_interesting.asset
index 2659720bba..8bef2d22ef 100644
--- a/data/assets/scene/solarsystem/planets/earth/satellites/satellites_interesting.asset
+++ b/data/assets/scene/solarsystem/planets/earth/satellites/satellites_interesting.asset
@@ -3,6 +3,7 @@ asset.require("./communications/geostationary")
 asset.require("./navigation/gps")
 asset.require("./misc/spacestations")
 asset.require("./misc/iss")
+asset.require("./misc/tiangong")
 asset.require("./misc/tle-new")
 
 

From 5c932a1a13f7d77032955e58a2fefaf768224a17 Mon Sep 17 00:00:00 2001
From: Ylva Selling <ylva.selling@liu.se>
Date: Thu, 29 Feb 2024 16:51:16 +0100
Subject: [PATCH 289/701] Make hard coded names for keys constants

---
 src/documentation/documentationengine.cpp | 368 +++++++++++++---------
 1 file changed, 225 insertions(+), 143 deletions(-)

diff --git a/src/documentation/documentationengine.cpp b/src/documentation/documentationengine.cpp
index 7fc5a614d9..f7625863b2 100644
--- a/src/documentation/documentationengine.cpp
+++ b/src/documentation/documentationengine.cpp
@@ -52,20 +52,101 @@
 
 namespace openspace::documentation {
 
-nlohmann::json generateJsonDocumentation(const Documentation& d) {
+// Titles shown in the documentation sidebar 
+constexpr const char* ScriptingName = "Scripting API";
+constexpr const char* ActionName = "Actions";
+constexpr const char* SceneName = "Scene";
+constexpr const char* SettingsName = "Settings";
+constexpr const char* EventsName = "Events";
+constexpr const char* FactoryName = "Asset Types";
+constexpr const char* KeybindingsName = "Keybindings";
+
+// General keys
+constexpr const char* NameKey = "name";
+constexpr const char* IdentifierKey = "identifier";
+constexpr const char* DescriptionKey = "description";
+constexpr const char* DataKey = "data";
+constexpr const char* TypeKey = "type";
+constexpr const char* DocumentationKey = "documentation";
+
+// Actions keys
+constexpr const char* GuiNameKey = "guiName";
+
+// Factory keys
+constexpr const char* MembersKey = "members";
+constexpr const char* OptionalKey = "optional";
+constexpr const char* ReferenceKey = "reference";
+constexpr const char* FoundKey = "found";
+constexpr const char* RestrictionsKey = "restrictions";
+
+// Properties keys
+constexpr const char* PropertiesKeys = "properties";
+constexpr const char* PropertyOwnersKey = "propertyOwners";
+constexpr const char* TagsKey = "tags";
+constexpr const char* UriKey = "uri";
+
+// Scripting
+constexpr const char* DefaultValueKey = "defaultValue";
+constexpr const char* ArgumentsKey = "arguments";
+constexpr const char* ReturnTypeKey = "returnType";
+constexpr const char* HelpKey = "help";
+constexpr const char* FileKey = "file";
+constexpr const char* LineKey = "line";
+constexpr const char* LibraryKey = "library";
+constexpr const char* FullNameKey = "fullName";
+constexpr const char* FunctionsKey = "functions";
+constexpr const char* SourceLocationKey = "sourceLocation";
+constexpr const char* OpenSpaceScriptingKey = "openspace";
+
+// Licenses
+constexpr const char* ProfileName = "Profile";
+constexpr const char* AssetsName = "Assets";
+constexpr const char* LicensesName = "Licenses";
+constexpr const char* LicenseTypeName = "license";
+constexpr const char* NoLicenseName = "No License";
+constexpr const char* NoData = "";
+
+constexpr const char* ProfileNameKey = "profileName";
+constexpr const char* VersionKey = "version";
+constexpr const char* AuthorKey = "author";
+constexpr const char* UrlKey = "url";
+constexpr const char* LicenseKey = "license";
+constexpr const char* NoLicenseKey = "noLicense";
+constexpr const char* IdentifiersKey = "identifiers";
+constexpr const char* PathKey = "path";
+constexpr const char* AssetKey = "assets";
+constexpr const char* LicensesKey = "licenses";
+
+// Factory
+constexpr const char* OtherName = "Other";
+
+constexpr const char* OtherIdentifierName = "other";
+constexpr const char* propertyOwnerName = "propertyOwner";
+constexpr const char* categoryName = "category";
+
+constexpr const char* ClassesKey = "classes";
+
+// Actions
+constexpr const char* CommandKey = "command";
+
+// Keybindings
+constexpr const char* KeybindingsKey = "keybindings";
+constexpr const char* ActionKey = "action";
+
+nlohmann::json generateJsonDocumentation(const Documentation & d) {
     nlohmann::json json;
 
-    json["name"] = d.name;
-    json["identifier"] = d.id;
-    json["description"] = d.description;
-    json["members"] = nlohmann::json::array();
+    json[NameKey] = d.name;
+    json[IdentifierKey] = d.id;
+    json[DescriptionKey] = d.description;
+    json[MembersKey] = nlohmann::json::array();
 
     for (const DocumentationEntry& p : d.entries) {
         nlohmann::json entry;
-        entry["name"] = p.key;
-        entry["optional"] = p.optional.value;
-        entry["type"] = p.verifier->type();
-        entry["documentation"] = p.documentation;
+        entry[NameKey] = p.key;
+        entry[OptionalKey] = p.optional.value;
+        entry[TypeKey] = p.verifier->type();
+        entry[DocumentationKey] = p.documentation;
 
         TableVerifier* tv = dynamic_cast<TableVerifier*>(p.verifier.get());
         ReferencingVerifier* rv = dynamic_cast<ReferencingVerifier*>(p.verifier.get());
@@ -79,29 +160,29 @@ nlohmann::json generateJsonDocumentation(const Documentation& d) {
             );
 
             if (it == documentations.end()) {
-                entry["reference"]["found"] = false;
+                entry[ReferenceKey][FoundKey] = false;
             }
             else {
                 nlohmann::json reference;
-                reference["found"] = true;
-                reference["name"] = it->name;
-                reference["identifier"] = rv->identifier;
+                reference[FoundKey] = true;
+                reference[NameKey] = it->name;
+                reference[IdentifierKey] = rv->identifier;
 
-                entry["reference"] = reference;
+                entry[ReferenceKey] = reference;
             }
         }
         else if (tv) {
             Documentation doc = { .entries = tv->documentations };
             nlohmann::json restrictions = generateJsonDocumentation(doc);
             // We have a TableVerifier, so we need to recurse
-            entry["restrictions"] = restrictions;
+            entry[RestrictionsKey] = restrictions;
         }
         else {
-            entry["description"] = p.verifier->documentation();
+            entry[DescriptionKey] = p.verifier->documentation();
         }
-        json["members"].push_back(entry);
+        json[MembersKey].push_back(entry);
     }
-    sortJson(json["members"], "name");
+    sortJson(json[MembersKey], NameKey);
 
     return json;
 }
@@ -111,34 +192,34 @@ nlohmann::json createPropertyJson(openspace::properties::PropertyOwner* owner) {
 
     using namespace openspace;
     nlohmann::json json;
-    json["name"] = !owner->guiName().empty() ? owner->guiName() : owner->identifier();
+    json[NameKey] = !owner->guiName().empty() ? owner->guiName() : owner->identifier();
 
-    json["description"] = owner->description();
-    json["properties"] = nlohmann::json::array();
-    json["propertyOwners"] = nlohmann::json::array();
-    json["type"] = owner->type();
-    json["tags"] = owner->tags();
+    json[DescriptionKey] = owner->description();
+    json[PropertiesKeys] = nlohmann::json::array();
+    json[PropertyOwnersKey] = nlohmann::json::array();
+    json[TypeKey] = owner->type();
+    json[TagsKey] = owner->tags();
 
     const std::vector<properties::Property*>& properties = owner->properties();
     for (properties::Property* p : properties) {
         nlohmann::json propertyJson;
         std::string name = !p->guiName().empty() ? p->guiName() : p->identifier();
-        propertyJson["name"] = name;
-        propertyJson["type"] = p->className();
-        propertyJson["uri"] = p->fullyQualifiedIdentifier();
-        propertyJson["identifier"] = p->identifier();
-        propertyJson["description"] = p->description();
+        propertyJson[NameKey] = name;
+        propertyJson[TypeKey] = p->className();
+        propertyJson[UriKey] = p->fullyQualifiedIdentifier();
+        propertyJson[IdentifierKey] = p->identifier();
+        propertyJson[DescriptionKey] = p->description();
 
-        json["properties"].push_back(propertyJson);
+        json[PropertiesKeys].push_back(propertyJson);
     }
-    sortJson(json["properties"], "name");
+    sortJson(json[PropertiesKeys], NameKey);
 
     auto propertyOwners = owner->propertySubOwners();
     for (properties::PropertyOwner* o : propertyOwners) {
         nlohmann::json propertyOwner;
-        json["propertyOwners"].push_back(createPropertyJson(o));
+        json[PropertyOwnersKey].push_back(createPropertyJson(o));
     }
-    sortJson(json["propertyOwners"], "name");
+    sortJson(json[PropertyOwnersKey], NameKey);
 
     return json;
 }
@@ -149,26 +230,26 @@ nlohmann::json LuaFunctionToJson(const openspace::scripting::LuaLibrary::Functio
     using namespace openspace;
     using namespace openspace::scripting;
     nlohmann::json function;
-    function["name"] = f.name;
+    function[NameKey] = f.name;
     nlohmann::json arguments = nlohmann::json::array();
 
     for (const LuaLibrary::Function::Argument& arg : f.arguments) {
         nlohmann::json argument;
-        argument["name"] = arg.name;
-        argument["type"] = arg.type;
-        argument["defaultValue"] = arg.defaultValue.value_or("");
+        argument[NameKey] = arg.name;
+        argument[TypeKey] = arg.type;
+        argument[DefaultValueKey] = arg.defaultValue.value_or(NoData);
         arguments.push_back(argument);
     }
 
-    function["arguments"] = arguments;
-    function["returnType"] = f.returnType;
-    function["help"] = f.helpText;
+    function[ArgumentsKey] = arguments;
+    function[ReturnTypeKey] = f.returnType;
+    function[HelpKey ] = f.helpText;
 
     if (includeSourceLocation) {
         nlohmann::json sourceLocation;
-        sourceLocation["file"] = f.sourceLocation.file;
-        sourceLocation["line"] = f.sourceLocation.line;
-        function["sourceLocation"] = sourceLocation;
+        sourceLocation[FileKey] = f.sourceLocation.file;
+        sourceLocation[LineKey] = f.sourceLocation.line;
+        function[SourceLocationKey] = sourceLocation;
     }
 
     return function;
@@ -222,24 +303,24 @@ nlohmann::json DocumentationEngine::generateScriptEngineJson() const {
         nlohmann::json library;
         std::string libraryName = l.name;
         // Keep the library key for backwards compatability
-        library["library"] = libraryName;
-        library["name"] = libraryName;
-        std::string os = "openspace";
-        library["fullName"] = libraryName.empty() ? os : os + "." + libraryName;
+        library[LibraryKey] = libraryName;
+        library[NameKey] = libraryName;
+        std::string os = OpenSpaceScriptingKey;
+        library[FullNameKey] = libraryName.empty() ? os : os + "." + libraryName;
 
         for (const LuaLibrary::Function& f : l.functions) {
             bool hasSourceLocation = true;
-            library["functions"].push_back(LuaFunctionToJson(f, hasSourceLocation));
+            library[FunctionsKey].push_back(LuaFunctionToJson(f, hasSourceLocation));
         }
 
         for (const LuaLibrary::Function& f : l.documentations) {
             bool hasSourceLocation = false;
-            library["functions"].push_back(LuaFunctionToJson(f, hasSourceLocation));
+            library[FunctionsKey].push_back(LuaFunctionToJson(f, hasSourceLocation));
         }
-        sortJson(library["functions"], "name");
+        sortJson(library[FunctionsKey], NameKey);
         json.push_back(library);
 
-        sortJson(json, "library");
+        sortJson(json, LibraryKey);
     }
     return json;
 }
@@ -262,14 +343,14 @@ nlohmann::json DocumentationEngine::generateLicensesGroupedByLicense() const {
     if (global::profile->meta.has_value()) {
         metaTotal++;
         nlohmann::json metaJson;
-        metaJson["name"] = "Profile";
-        metaJson["profileName"] = global::profile->meta->name.value_or("");
-        metaJson["version"] = global::profile->meta->version.value_or("");
-        metaJson["description"] = global::profile->meta->description.value_or("");
-        metaJson["author"] = global::profile->meta->author.value_or("");
-        metaJson["url"] = global::profile->meta->url.value_or("");
-        metaJson["license"] = global::profile->meta->license.value_or("");
-        metaJson["type"] = "license";
+        metaJson[NameKey] = ProfileName;
+        metaJson[ProfileNameKey] = global::profile->meta->name.value_or(NoData);
+        metaJson[VersionKey] = global::profile->meta->version.value_or(NoData);
+        metaJson[DescriptionKey] = global::profile->meta->description.value_or(NoData);
+        metaJson[AuthorKey] = global::profile->meta->author.value_or(NoData);
+        metaJson[UrlKey] = global::profile->meta->url.value_or(NoData);
+        metaJson[LicenseKey] = global::profile->meta->license.value_or(NoData);
+        metaJson[TypeKey] = LicenseTypeName;
         json.push_back(std::move(metaJson));
     }
 
@@ -279,50 +360,51 @@ nlohmann::json DocumentationEngine::generateLicensesGroupedByLicense() const {
 
         nlohmann::json assetJson;
         if (!meta.has_value()) {
-            assetJson["name"] = "";
-            assetJson["version"] = "";
-            assetJson["description"] = "";
-            assetJson["author"] = "";
-            assetJson["url"] = "";
-            assetJson["license"] = "No license";
-            assetJson["identifiers"] = "";
-            assetJson["path"] = asset->path().string();
+            assetJson[NameKey] = NoData;
+            assetJson[VersionKey] = NoData;
+            assetJson[DescriptionKey] = NoData;
+            assetJson[AuthorKey] = NoData;
+            assetJson[UrlKey] = NoData;
+            assetJson[LicenseKey] = NoLicenseName;
+            assetJson[IdentifiersKey] = NoData;
+            assetJson[PathKey] = asset->path().string();
 
-            assetLicenses["noLicense"].push_back(assetJson);
+            assetLicenses[NoLicenseKey].push_back(assetJson);
         }
         else {
-            std::string license = meta->license == "" ? "No License" : meta->license;
-            assetJson["name"] = meta->name;
-            assetJson["version"] = meta->version;
-            assetJson["description"] = meta->description;
-            assetJson["author"] = meta->author;
-            assetJson["url"] = meta->url;
-            assetJson["license"] = license;
-            assetJson["identifiers"] = meta->identifiers;
-            assetJson["path"] = asset->path().string();
+            std::string licenseName = meta->license == NoData ? NoLicenseName :
+                meta->license;
+            assetJson[NameKey] = meta->name;
+            assetJson[VersionKey] = meta->version;
+            assetJson[DescriptionKey] = meta->description;
+            assetJson[AuthorKey] = meta->author;
+            assetJson[UrlKey] = meta->url;
+            assetJson[LicenseKey] = licenseName;
+            assetJson[IdentifiersKey] = meta->identifiers;
+            assetJson[PathKey] = asset->path().string();
 
-            assetLicenses[license].push_back(assetJson);
+            assetLicenses[licenseName].push_back(assetJson);
         }
     }
 
     nlohmann::json assetsJson;
-    assetsJson["name"] = "Assets";
-    assetsJson["type"] = "Licenses";
+    assetsJson[NameKey] = AssetsName;
+    assetsJson[TypeKey] = LicensesName;
 
     using K = const std::string;
     using V = nlohmann::json;
     for (const std::pair<K, V>& assetLicense : assetLicenses) {
         nlohmann::json entry;
-        entry["name"] = assetLicense.first;
-        entry["assets"] = assetLicense.second;
-        sortJson(entry["assets"], "name");
-        assetsJson["licenses"].push_back(entry);
+        entry[NameKey] = assetLicense.first;
+        entry[AssetKey] = assetLicense.second;
+        sortJson(entry[AssetKey], NameKey);
+        assetsJson[LicensesKey].push_back(entry);
     }
     json.push_back(assetsJson);
 
     nlohmann::json result;
-    result["name"] = "Licenses";
-    result["data"] = json;
+    result[NameKey] = LicensesName;
+    result[DataKey] = json;
 
     return result;
 }
@@ -332,12 +414,12 @@ nlohmann::json DocumentationEngine::generateLicenseList() const {
 
     if (global::profile->meta.has_value()) {
         nlohmann::json profile;
-        profile["name"] = global::profile->meta->name.value_or("");
-        profile["version"] = global::profile->meta->version.value_or("");
-        profile["description"] = global::profile->meta->description.value_or("");
-        profile["author"] = global::profile->meta->author.value_or("");
-        profile["url"] = global::profile->meta->url.value_or("");
-        profile["license"] = global::profile->meta->license.value_or("");
+        profile[NameKey] = global::profile->meta->name.value_or(NoData);
+        profile[VersionKey] = global::profile->meta->version.value_or(NoData);
+        profile[DescriptionKey] = global::profile->meta->description.value_or(NoData);
+        profile[AuthorKey] = global::profile->meta->author.value_or(NoData);
+        profile[UrlKey] = global::profile->meta->url.value_or(NoData);
+        profile[LicenseKey] = global::profile->meta->license.value_or(NoData);
         json.push_back(profile);
     }
 
@@ -352,14 +434,14 @@ nlohmann::json DocumentationEngine::generateLicenseList() const {
         }
 
         nlohmann::json assetJson;
-        assetJson["name"] = meta->name;
-        assetJson["version"] = meta->version;
-        assetJson["description"] = meta->description;
-        assetJson["author"] = meta->author;
-        assetJson["url"] = meta->url;
-        assetJson["license"] = meta->license;
-        assetJson["identifiers"] = meta->identifiers;
-        assetJson["path"] = asset->path().string();
+        assetJson[NameKey] = meta->name;
+        assetJson[VersionKey] = meta->version;
+        assetJson[DescriptionKey] = meta->description;
+        assetJson[AuthorKey] = meta->author;
+        assetJson[UrlKey] = meta->url;
+        assetJson[LicenseKey] = meta->license;
+        assetJson[IdentifiersKey] = meta->identifiers;
+        assetJson[PathKey] = asset->path().string();
 
         json.push_back(assetJson);
     }
@@ -368,7 +450,7 @@ nlohmann::json DocumentationEngine::generateLicenseList() const {
 
 nlohmann::json DocumentationEngine::generateEventJson() const {
     nlohmann::json result;
-    result["name"] = "Events";
+    result[NameKey] = EventsName;
     nlohmann::json data = nlohmann::json::array();
 
     std::vector<EventEngine::ActionInfo> eventActions =
@@ -377,11 +459,11 @@ nlohmann::json DocumentationEngine::generateEventJson() const {
     for (const EventEngine::ActionInfo& eventAction : eventActions) {
         nlohmann::json eventJson;
         std::string eventName = std::string(events::toString(eventAction.type));
-        eventJson["name"] = eventName;
+        eventJson[NameKey] = eventName;
         data.push_back(eventJson);
     }
 
-    result["data"] = data;
+    result[DataKey] = data;
     return result;
 }
 
@@ -394,8 +476,8 @@ nlohmann::json DocumentationEngine::generateFactoryManagerJson() const {
 
     for (const FactoryManager::FactoryInfo& factoryInfo : factories) {
         nlohmann::json factory;
-        factory["name"] = factoryInfo.name;
-        factory["identifier"] = "category" + factoryInfo.name;
+        factory[NameKey] = factoryInfo.name;
+        factory[IdentifierKey] = categoryName + factoryInfo.name;
 
         ghoul::TemplateFactoryBase* f = factoryInfo.factory.get();
         // Add documentation about base class
@@ -407,15 +489,15 @@ nlohmann::json DocumentationEngine::generateFactoryManagerJson() const {
             });
         if (factoryDoc != docs.end()) {
             nlohmann::json documentation = generateJsonDocumentation(*factoryDoc);
-            factory["classes"].push_back(documentation);
+            factory[ClassesKey].push_back(documentation);
             // Remove documentation from list check at the end if all docs got put in
             docs.erase(factoryDoc);
         }
         else {
             nlohmann::json documentation;
-            documentation["name"] = factoryInfo.name;
-            documentation["identifier"] = factoryInfo.name;
-            factory["classes"].push_back(documentation);
+            documentation[NameKey] = factoryInfo.name;
+            documentation[IdentifierKey] = factoryInfo.name;
+            factory[ClassesKey].push_back(documentation);
         }
 
         // Add documentation about derived classes
@@ -429,35 +511,35 @@ nlohmann::json DocumentationEngine::generateFactoryManagerJson() const {
                 });
             if (found != docs.end()) {
                 nlohmann::json documentation = generateJsonDocumentation(*found);
-                factory["classes"].push_back(documentation);
+                factory[ClassesKey].push_back(documentation);
                 docs.erase(found);
             }
             else {
                 nlohmann::json documentation;
-                documentation["name"] = c;
-                documentation["identifier"] = c;
-                factory["classes"].push_back(documentation);
+                documentation[NameKey] = c;
+                documentation[IdentifierKey] = c;
+                factory[ClassesKey].push_back(documentation);
             }
         }
-        sortJson(factory["classes"], "name");
+        sortJson(factory[ClassesKey], NameKey);
         json.push_back(factory);
     }
     // Add all leftover docs
     nlohmann::json leftovers;
-    leftovers["name"] = "Other";
-    leftovers["identifier"] = "other";
+    leftovers[NameKey] = OtherName;
+    leftovers[IdentifierKey] = OtherIdentifierName;
 
     for (const Documentation& doc : docs) {
-        leftovers["classes"].push_back(generateJsonDocumentation(doc));
+        leftovers[ClassesKey].push_back(generateJsonDocumentation(doc));
     }
-    sortJson(leftovers["classes"], "name");
+    sortJson(leftovers[ClassesKey], NameKey);
     json.push_back(leftovers);
-    sortJson(json, "name");
+    sortJson(json, NameKey);
 
     // I did not check the output of this for correctness ---abock
     nlohmann::json result;
-    result["name"] = "Asset Types";
-    result["data"] = json;
+    result[NameKey] = FactoryName;
+    result[DataKey] = json;
 
     return result;
 }
@@ -471,15 +553,15 @@ nlohmann::json DocumentationEngine::generateKeybindingsJson() const {
 
     for (const std::pair<const KeyWithModifier, std::string>& p : luaKeys) {
         nlohmann::json keybind;
-        keybind["name"] = ghoul::to_string(p.first);
-        keybind["action"] = p.second;
+        keybind[NameKey] = ghoul::to_string(p.first);
+        keybind[ActionKey] = p.second;
         json.push_back(std::move(keybind));
     }
-    sortJson(json, "name");
+    sortJson(json, NameKey);
 
     nlohmann::json result;
-    result["name"] = "Keybindings";
-    result["keybindings"] = json;
+    result[NameKey] = KeybindingsName;
+    result[KeybindingsKey] = json;
     return result;
 }
 
@@ -490,17 +572,17 @@ nlohmann::json DocumentationEngine::generatePropertyOwnerJson(
     nlohmann::json json;
     std::vector<properties::PropertyOwner*> subOwners = owner->propertySubOwners();
     for (properties::PropertyOwner* o : subOwners) {
-        if (o->identifier() != "Scene") {
+        if (o->identifier() != SceneName) {
             nlohmann::json jsonOwner = createPropertyJson(o);
 
             json.push_back(jsonOwner);
         }
     }
-    sortJson(json, "name");
+    sortJson(json, NameKey);
 
     nlohmann::json result;
-    result["name"] = "propertyOwner";
-    result["data"] = json;
+    result[NameKey] = propertyOwnerName;
+    result[DataKey] = json;
 
     return result;
 }
@@ -538,14 +620,14 @@ void DocumentationEngine::writeDocumentation() const {
     nlohmann::json actions = generateActionJson();
     nlohmann::json events = generateEventJson();
 
-    sceneProperties["name"] = "Settings";
-    sceneGraph["name"] = "Scene";
+    sceneProperties[NameKey] = SettingsName;
+    sceneGraph[NameKey] = SceneName;
 
     // Add this here so that the generateJson function is the same as before to ensure
     // backwards compatibility
     nlohmann::json scriptingResult;
-    scriptingResult["name"] = "Scripting API";
-    scriptingResult["data"] = scripting;
+    scriptingResult[NameKey] = ScriptingName;
+    scriptingResult[DataKey] = scripting;
 
     nlohmann::json documentation = {
         sceneGraph, sceneProperties, actions, events, keybindings, license,
@@ -553,7 +635,7 @@ void DocumentationEngine::writeDocumentation() const {
     };
 
     nlohmann::json result;
-    result["documentation"] = documentation;
+    result[DocumentationKey] = documentation;
 
     std::ofstream out(absPath("${DOCUMENTATION}/documentationData.js"));
     out << "var data = " << result.dump();
@@ -564,20 +646,20 @@ nlohmann::json DocumentationEngine::generateActionJson() const {
     using namespace interaction;
 
     nlohmann::json res;
-    res["name"] = "Actions";
-    res["data"] = nlohmann::json::array();
+    res[NameKey] = ActionName;
+    res[DataKey] = nlohmann::json::array();
     std::vector<Action> actions = global::actionManager->actions();
 
     for (const Action& action : actions) {
         nlohmann::json d;
         // Use identifier as name to make it more similar to scripting api
-        d["name"] = action.identifier;
-        d["guiName"] = action.name;
-        d["documentation"] = action.documentation;
-        d["command"] = action.command;
-        res["data"].push_back(d);
+        d[NameKey] = action.identifier;
+        d[GuiNameKey] = action.name;
+        d[DocumentationKey] = action.documentation;
+        d[CommandKey] = action.command;
+        res[DataKey].push_back(d);
     }
-    sortJson(res["data"], "name");
+    sortJson(res[DataKey], NameKey);
     return res;
 }
 

From 5cb93f9afd4d1e266c22a382a997e91306456b8f Mon Sep 17 00:00:00 2001
From: Adam Rohdin <adam.rohdin@liu.se>
Date: Fri, 1 Mar 2024 10:16:02 +0100
Subject: [PATCH 290/701] Added point outlines for RenderablePointCloud (PR
 #3044)

Added point outlines for RenderablePointCloud
---
 .../pointcloud/renderablepointcloud.cpp       | 57 ++++++++++++++++++-
 .../pointcloud/renderablepointcloud.h         |  5 +-
 .../shaders/pointcloud/billboardpoint_fs.glsl | 25 ++++----
 3 files changed, 73 insertions(+), 14 deletions(-)

diff --git a/modules/base/rendering/pointcloud/renderablepointcloud.cpp b/modules/base/rendering/pointcloud/renderablepointcloud.cpp
index bd83bc3044..a83f9fd6fd 100644
--- a/modules/base/rendering/pointcloud/renderablepointcloud.cpp
+++ b/modules/base/rendering/pointcloud/renderablepointcloud.cpp
@@ -55,14 +55,14 @@
 namespace {
     constexpr std::string_view _loggerCat = "RenderablePointCloud";
 
-    constexpr std::array<const char*, 29> UniformNames = {
+    constexpr std::array<const char*, 32> UniformNames = {
         "cameraViewMatrix", "projectionMatrix", "modelMatrix", "cameraPosition",
         "cameraLookUp", "renderOption", "maxAngularSize", "color", "opacity",
         "scaleExponent", "scaleFactor", "up", "right", "fadeInValue", "hasSpriteTexture",
         "spriteTexture", "useColorMap", "colorMapTexture", "cmapRangeMin", "cmapRangeMax",
         "nanColor", "useNanColor", "hideOutsideRange", "enableMaxSizeControl",
         "aboveRangeColor", "useAboveRangeColor", "belowRangeColor", "useBelowRangeColor",
-        "hasDvarScaling"
+        "hasDvarScaling", "enableOutline", "outlineColor", "outlineWeight"
     };
 
     enum RenderOption {
@@ -229,6 +229,30 @@ namespace {
         openspace::properties::Property::Visibility::AdvancedUser
     };
 
+    constexpr openspace::properties::Property::PropertyInfo EnableOutlineInfo = {
+        "EnableOutline",
+        "Enable Point Outline",
+        "This setting determines if each point should have an outline or not. An outline "
+        "is only applied when rendering as colored points (not when using textures).",
+        openspace::properties::Property::Visibility::User
+    };
+
+    constexpr openspace::properties::Property::PropertyInfo OutlineColorInfo = {
+        "OutlineColor",
+        "Outline Color",
+        "This value defines the color of the outline. Darker colors will be "
+        "less visible if Additive Blending is enabled.",
+        openspace::properties::Property::Visibility::User
+    };
+
+    constexpr openspace::properties::Property::PropertyInfo OutlineWeightInfo = {
+        "OutlineWeight",
+        "Outline Weight",
+        "This setting determines the thickness of the outline. A value of 0 will "
+        "not show any outline, while a value of 1 will cover the whole point.",
+        openspace::properties::Property::Visibility::AdvancedUser
+    };
+
     // A RenderablePointCloud can be used to render point-based datasets in 3D space,
     // optionally including color mapping, a sprite texture and labels. There are several
     // properties that affect the visuals of the points, such as settings for scaling,
@@ -336,6 +360,15 @@ namespace {
             // Settings related to the choice of color map, parameters, etc.
             std::optional<ghoul::Dictionary> colorMapping
                 [[codegen::reference("colormappingcomponent")]];
+
+            // [[codegen::verbatim(EnableOutlineInfo.description)]]
+            std::optional<bool> enableOutline;
+
+            // [[codegen::verbatim(OutlineColorInfo.description)]]
+            std::optional<glm::vec3> outlineColor;
+
+            // [[codegen::verbatim(OutlineColorInfo.description)]]
+            std::optional<float> outlineWeight;
         };
         // Settings related to the coloring of the points, such as a fixed color,
         // color map, etc.
@@ -419,10 +452,14 @@ RenderablePointCloud::SizeSettings::SizeMapping::SizeMapping()
 RenderablePointCloud::ColorSettings::ColorSettings(const ghoul::Dictionary& dictionary)
     : properties::PropertyOwner({ "Coloring", "Coloring", "" })
     , pointColor(PointColorInfo, glm::vec3(1.f), glm::vec3(0.f), glm::vec3(1.f))
+    , enableOutline(EnableOutlineInfo, false)
+    , outlineColor(OutlineColorInfo, glm::vec3(0.23f), glm::vec3(0.f), glm::vec3(1.f))
+    , outlineWeight(OutlineWeightInfo, 0.2f, 0.f, 1.f)
 {
     const Parameters p = codegen::bake<Parameters>(dictionary);
 
-    if (p.coloring.has_value()) {
+    const bool hasColoring = p.coloring.has_value();
+    if (hasColoring) {
         const Parameters::ColorSettings settings = *p.coloring;
         pointColor = settings.fixedColor.value_or(pointColor);
 
@@ -435,6 +472,17 @@ RenderablePointCloud::ColorSettings::ColorSettings(const ghoul::Dictionary& dict
     }
     pointColor.setViewOption(properties::Property::ViewOptions::Color);
     addProperty(pointColor);
+
+    enableOutline = p.coloring->enableOutline.value_or(enableOutline);
+    addProperty(enableOutline);
+
+    outlineColor.setViewOption(properties::Property::ViewOptions::Color);
+    outlineColor = p.coloring->outlineColor.value_or(outlineColor);
+    addProperty(outlineColor);
+
+    outlineWeight = p.coloring->outlineWeight.value_or(outlineWeight);
+    addProperty(outlineWeight);
+
 }
 
 RenderablePointCloud::Fading::Fading(const ghoul::Dictionary& dictionary)
@@ -735,6 +783,9 @@ void RenderablePointCloud::bindDataForPointRendering() {
     }
 
     _program->setUniform(_uniformCache.color, _colorSettings.pointColor);
+    _program->setUniform(_uniformCache.enableOutline, _colorSettings.enableOutline);
+    _program->setUniform(_uniformCache.outlineColor, _colorSettings.outlineColor);
+    _program->setUniform(_uniformCache.outlineWeight, _colorSettings.outlineWeight);
 
     bool useColorMap = _hasColorMapFile && _colorSettings.colorMapping->enabled &&
         _colorSettings.colorMapping->texture();
diff --git a/modules/base/rendering/pointcloud/renderablepointcloud.h b/modules/base/rendering/pointcloud/renderablepointcloud.h
index a14062461c..c1ec0b0be5 100644
--- a/modules/base/rendering/pointcloud/renderablepointcloud.h
+++ b/modules/base/rendering/pointcloud/renderablepointcloud.h
@@ -132,6 +132,9 @@ protected:
         explicit ColorSettings(const ghoul::Dictionary& dictionary);
         properties::Vec3Property pointColor;
         std::unique_ptr<ColorMappingComponent> colorMapping;
+        properties::BoolProperty enableOutline;
+        properties::Vec3Property outlineColor;
+        properties::FloatProperty outlineWeight;
     };
     ColorSettings _colorSettings;
 
@@ -162,7 +165,7 @@ protected:
         right, fadeInValue, hasSpriteTexture, spriteTexture, useColormap, colorMapTexture,
         cmapRangeMin, cmapRangeMax, nanColor, useNanColor, hideOutsideRange,
         enableMaxSizeControl, aboveRangeColor, useAboveRangeColor, belowRangeColor,
-        useBelowRangeColor, hasDvarScaling
+        useBelowRangeColor, hasDvarScaling, enableOutline, outlineColor, outlineWeight
     ) _uniformCache;
 
     std::string _dataFile;
diff --git a/modules/base/shaders/pointcloud/billboardpoint_fs.glsl b/modules/base/shaders/pointcloud/billboardpoint_fs.glsl
index a117d53e6b..629d1ff7a3 100644
--- a/modules/base/shaders/pointcloud/billboardpoint_fs.glsl
+++ b/modules/base/shaders/pointcloud/billboardpoint_fs.glsl
@@ -49,6 +49,9 @@ uniform sampler1D colorMapTexture;
 uniform float cmapRangeMin;
 uniform float cmapRangeMax;
 uniform bool hideOutsideRange;
+uniform bool enableOutline;
+uniform vec3 outlineColor;
+uniform float outlineWeight;
 
 uniform float fadeInValue;
 
@@ -80,24 +83,26 @@ Fragment getFragment() {
     discard;
   }
 
-   if (!hasSpriteTexture) {
-    // Moving the origin to the center
-    vec2 st = (texCoord - vec2(0.5)) * 2.0;
-    if (length(st) > 1.0) {
+  // Moving the origin to the center and calculating the length
+  float lengthFromCenter = length((texCoord - vec2(0.5)) * 2.0);
+  if (!hasSpriteTexture) {
+    if (lengthFromCenter > 1.0) {
       discard;
     }
   }
 
   vec4 fullColor = vec4(1.0);
-  if (hasSpriteTexture) {
-    fullColor = texture(spriteTexture, texCoord);
-  }
-
   if (useColorMap) {
-    fullColor *= sampleColorMap(gs_colorParameter);
+    fullColor = sampleColorMap(gs_colorParameter);
   }
   else {
-    fullColor.rgb *= color;
+    fullColor.rgb = color;
+  }
+
+  if (hasSpriteTexture) {
+    fullColor *= texture(spriteTexture, texCoord);
+  } else if (enableOutline && (lengthFromCenter > (1.0 - outlineWeight))) {
+    fullColor.rgb = outlineColor;
   }
 
   fullColor.a *= opacity * fadeInValue;

From ecc930c24b9803e1b9935c50071da9d37aea94c2 Mon Sep 17 00:00:00 2001
From: Ylva Selling <ylva.selling@liu.se>
Date: Fri, 1 Mar 2024 16:14:46 +0100
Subject: [PATCH 291/701] Add event documentation

---
 include/openspace/events/eventengine.h    |  7 ++
 src/documentation/documentationengine.cpp | 81 ++++++++++++++++-------
 src/events/eventengine.cpp                |  5 ++
 3 files changed, 69 insertions(+), 24 deletions(-)

diff --git a/include/openspace/events/eventengine.h b/include/openspace/events/eventengine.h
index 10f4eecca4..aee899f575 100644
--- a/include/openspace/events/eventengine.h
+++ b/include/openspace/events/eventengine.h
@@ -138,6 +138,13 @@ public:
      */
     std::vector<ActionInfo> registeredActions() const;
 
+    /**
+     * Returns the list of all registered actions, grouped by their event type.
+     *
+     * \return The unordered map of all registered actions
+     */
+    const std::unordered_map<events::Event::Type, std::vector<ActionInfo>>& eventActions() const;
+
     /**
      * Enables the event identified by the \p identifier. If the event is already enabled,
      * this function does nothing.
diff --git a/src/documentation/documentationengine.cpp b/src/documentation/documentationengine.cpp
index f7625863b2..77c5c04e46 100644
--- a/src/documentation/documentationengine.cpp
+++ b/src/documentation/documentationengine.cpp
@@ -51,6 +51,7 @@
 #include <future>
 
 namespace openspace::documentation {
+constexpr std::string_view _loggerCat = "DocumentationEngine";
 
 // Titles shown in the documentation sidebar 
 constexpr const char* ScriptingName = "Scripting API";
@@ -68,18 +69,26 @@ constexpr const char* DescriptionKey = "description";
 constexpr const char* DataKey = "data";
 constexpr const char* TypeKey = "type";
 constexpr const char* DocumentationKey = "documentation";
+constexpr const char* ActionKey = "action";
 
-// Actions keys
+// Actions
 constexpr const char* GuiNameKey = "guiName";
+constexpr const char* CommandKey = "command";
 
-// Factory keys
+// Factory
 constexpr const char* MembersKey = "members";
 constexpr const char* OptionalKey = "optional";
 constexpr const char* ReferenceKey = "reference";
 constexpr const char* FoundKey = "found";
 constexpr const char* RestrictionsKey = "restrictions";
+constexpr const char* ClassesKey = "classes";
 
-// Properties keys
+constexpr const char* OtherName = "Other";
+constexpr const char* OtherIdentifierName = "other";
+constexpr const char* propertyOwnerName = "propertyOwner";
+constexpr const char* categoryName = "category";
+
+// Properties
 constexpr const char* PropertiesKeys = "properties";
 constexpr const char* PropertyOwnersKey = "propertyOwners";
 constexpr const char* TagsKey = "tags";
@@ -117,21 +126,14 @@ constexpr const char* PathKey = "path";
 constexpr const char* AssetKey = "assets";
 constexpr const char* LicensesKey = "licenses";
 
-// Factory
-constexpr const char* OtherName = "Other";
-
-constexpr const char* OtherIdentifierName = "other";
-constexpr const char* propertyOwnerName = "propertyOwner";
-constexpr const char* categoryName = "category";
-
-constexpr const char* ClassesKey = "classes";
-
-// Actions
-constexpr const char* CommandKey = "command";
-
 // Keybindings
 constexpr const char* KeybindingsKey = "keybindings";
-constexpr const char* ActionKey = "action";
+
+// Event
+constexpr const char* FiltersKey = "filters";
+constexpr const char* ActionsKey = "actions";
+constexpr const char* IdKey = "id";
+
 
 nlohmann::json generateJsonDocumentation(const Documentation & d) {
     nlohmann::json json;
@@ -449,20 +451,51 @@ nlohmann::json DocumentationEngine::generateLicenseList() const {
 }
 
 nlohmann::json DocumentationEngine::generateEventJson() const {
-    nlohmann::json result;
-    result[NameKey] = EventsName;
+    const std::unordered_map<events::Event::Type, std::vector<EventEngine::ActionInfo>>& eventActions =
+        global::eventEngine->eventActions();
+    nlohmann::json events;
+
     nlohmann::json data = nlohmann::json::array();
 
-    std::vector<EventEngine::ActionInfo> eventActions =
-        global::eventEngine->registeredActions();
-
-    for (const EventEngine::ActionInfo& eventAction : eventActions) {
+    // Group actions by events
+    for (const auto& [eventType, actions] : eventActions) {
         nlohmann::json eventJson;
-        std::string eventName = std::string(events::toString(eventAction.type));
-        eventJson[NameKey] = eventName;
+
+        eventJson[NameKey] = std::string(events::toString(eventType));
+        nlohmann::json actionsJson = nlohmann::json::array();
+
+        for (const EventEngine::ActionInfo& action : actions) {
+            nlohmann::json actionJson;
+            actionJson[NameKey] = eventJson[NameKey];
+            actionJson[ActionKey] = action.action;
+            // Create a unique ID
+            actionJson[IdKey] = fmt::format("{}{}", action.action, action.id);
+
+            if (action.filter.has_value()) {
+                ghoul::Dictionary filters = action.filter.value();
+                std::vector<std::string_view> keys = filters.keys();
+                nlohmann::json filtersJson = nlohmann::json::array();
+
+                std::string filtersString = "";
+                for (std::string_view key : keys) {
+                    std::string value = filters.value<std::string>(key);
+                    filtersString += fmt::format("{} = {}, ", std::string(key), value);
+                }
+                filtersString.pop_back(); // Remove last space from last entry
+                filtersString.pop_back(); // Remove last comma from last entry
+
+                actionJson[FiltersKey] = filtersString;
+
+            }
+            actionsJson.push_back(actionJson);
+        }
+        eventJson[ActionsKey] = actionsJson;
         data.push_back(eventJson);
     }
 
+    // Format resulting json
+    nlohmann::json result;
+    result[NameKey] = EventsName;
     result[DataKey] = data;
     return result;
 }
diff --git a/src/events/eventengine.cpp b/src/events/eventengine.cpp
index d5dc46ea39..1e6e303b93 100644
--- a/src/events/eventengine.cpp
+++ b/src/events/eventengine.cpp
@@ -170,6 +170,11 @@ std::vector<EventEngine::ActionInfo> EventEngine::registeredActions() const {
     return result;
 }
 
+const std::unordered_map<events::Event::Type, std::vector<EventEngine::ActionInfo>>& const
+EventEngine::eventActions() const {
+    return _eventActions;
+}
+
 void EventEngine::enableEvent(uint32_t identifier) {
     using Type = events::Event::Type;
     for (std::pair<const Type, std::vector<ActionInfo>>& p : _eventActions) {

From 041cb5c68b8729f2a38075efeb431b57329bd760 Mon Sep 17 00:00:00 2001
From: Alexander Bock <alexander.bock@liu.se>
Date: Fri, 1 Mar 2024 16:40:20 +0100
Subject: [PATCH 292/701] Prevent accessing the coloring parameters for the
 outline if none are specified

---
 .../base/rendering/pointcloud/renderablepointcloud.cpp    | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/modules/base/rendering/pointcloud/renderablepointcloud.cpp b/modules/base/rendering/pointcloud/renderablepointcloud.cpp
index a83f9fd6fd..03376aaf8e 100644
--- a/modules/base/rendering/pointcloud/renderablepointcloud.cpp
+++ b/modules/base/rendering/pointcloud/renderablepointcloud.cpp
@@ -469,20 +469,20 @@ RenderablePointCloud::ColorSettings::ColorSettings(const ghoul::Dictionary& dict
            );
            addPropertySubOwner(colorMapping.get());
         }
+
+        enableOutline = p.coloring->enableOutline.value_or(enableOutline);
+        outlineColor = p.coloring->outlineColor.value_or(outlineColor);
+        outlineWeight = p.coloring->outlineWeight.value_or(outlineWeight);
     }
     pointColor.setViewOption(properties::Property::ViewOptions::Color);
     addProperty(pointColor);
 
-    enableOutline = p.coloring->enableOutline.value_or(enableOutline);
     addProperty(enableOutline);
 
     outlineColor.setViewOption(properties::Property::ViewOptions::Color);
-    outlineColor = p.coloring->outlineColor.value_or(outlineColor);
     addProperty(outlineColor);
 
-    outlineWeight = p.coloring->outlineWeight.value_or(outlineWeight);
     addProperty(outlineWeight);
-
 }
 
 RenderablePointCloud::Fading::Fading(const ghoul::Dictionary& dictionary)

From bf0486927ca766911705c4b408482e7626411565 Mon Sep 17 00:00:00 2001
From: Ylva Selling <ylva.selling@liu.se>
Date: Mon, 4 Mar 2024 09:30:34 +0100
Subject: [PATCH 293/701] Rename keys more consistently and add comments

---
 src/documentation/documentationengine.cpp | 82 +++++++++++------------
 1 file changed, 40 insertions(+), 42 deletions(-)

diff --git a/src/documentation/documentationengine.cpp b/src/documentation/documentationengine.cpp
index 77c5c04e46..df0cefd6d9 100644
--- a/src/documentation/documentationengine.cpp
+++ b/src/documentation/documentationengine.cpp
@@ -53,15 +53,6 @@
 namespace openspace::documentation {
 constexpr std::string_view _loggerCat = "DocumentationEngine";
 
-// Titles shown in the documentation sidebar 
-constexpr const char* ScriptingName = "Scripting API";
-constexpr const char* ActionName = "Actions";
-constexpr const char* SceneName = "Scene";
-constexpr const char* SettingsName = "Settings";
-constexpr const char* EventsName = "Events";
-constexpr const char* FactoryName = "Asset Types";
-constexpr const char* KeybindingsName = "Keybindings";
-
 // General keys
 constexpr const char* NameKey = "name";
 constexpr const char* IdentifierKey = "identifier";
@@ -72,10 +63,12 @@ constexpr const char* DocumentationKey = "documentation";
 constexpr const char* ActionKey = "action";
 
 // Actions
+constexpr const char* ActionTitle = "Actions"; // Title in documentation sidebar
 constexpr const char* GuiNameKey = "guiName";
 constexpr const char* CommandKey = "command";
 
 // Factory
+constexpr const char* FactoryTitle = "Asset Types"; // Title in documentation sidebar
 constexpr const char* MembersKey = "members";
 constexpr const char* OptionalKey = "optional";
 constexpr const char* ReferenceKey = "reference";
@@ -89,12 +82,15 @@ constexpr const char* propertyOwnerName = "propertyOwner";
 constexpr const char* categoryName = "category";
 
 // Properties
+constexpr const char* SettingsTitle = "Settings"; // Title in documentation sidebar
+constexpr const char* SceneTitle = "Scene"; // Title in documentation sidebar
 constexpr const char* PropertiesKeys = "properties";
 constexpr const char* PropertyOwnersKey = "propertyOwners";
 constexpr const char* TagsKey = "tags";
 constexpr const char* UriKey = "uri";
 
 // Scripting
+constexpr const char* ScriptingTitle = "Scripting API"; // Title in documentation sidebar
 constexpr const char* DefaultValueKey = "defaultValue";
 constexpr const char* ArgumentsKey = "arguments";
 constexpr const char* ReturnTypeKey = "returnType";
@@ -108,12 +104,12 @@ constexpr const char* SourceLocationKey = "sourceLocation";
 constexpr const char* OpenSpaceScriptingKey = "openspace";
 
 // Licenses
+constexpr const char* LicensesTitle = "Licenses"; // Title in documentation sidebar
 constexpr const char* ProfileName = "Profile";
 constexpr const char* AssetsName = "Assets";
 constexpr const char* LicensesName = "Licenses";
-constexpr const char* LicenseTypeName = "license";
 constexpr const char* NoLicenseName = "No License";
-constexpr const char* NoData = "";
+constexpr const char* NoDataName = "";
 
 constexpr const char* ProfileNameKey = "profileName";
 constexpr const char* VersionKey = "version";
@@ -127,9 +123,11 @@ constexpr const char* AssetKey = "assets";
 constexpr const char* LicensesKey = "licenses";
 
 // Keybindings
+constexpr const char* KeybindingsTitle = "Keybindings"; // Title in documentation sidebar
 constexpr const char* KeybindingsKey = "keybindings";
 
-// Event
+// Events
+constexpr const char* EventsTitle = "Events"; // Title in documentation sidebar
 constexpr const char* FiltersKey = "filters";
 constexpr const char* ActionsKey = "actions";
 constexpr const char* IdKey = "id";
@@ -239,7 +237,7 @@ nlohmann::json LuaFunctionToJson(const openspace::scripting::LuaLibrary::Functio
         nlohmann::json argument;
         argument[NameKey] = arg.name;
         argument[TypeKey] = arg.type;
-        argument[DefaultValueKey] = arg.defaultValue.value_or(NoData);
+        argument[DefaultValueKey] = arg.defaultValue.value_or(NoDataName);
         arguments.push_back(argument);
     }
 
@@ -346,13 +344,12 @@ nlohmann::json DocumentationEngine::generateLicensesGroupedByLicense() const {
         metaTotal++;
         nlohmann::json metaJson;
         metaJson[NameKey] = ProfileName;
-        metaJson[ProfileNameKey] = global::profile->meta->name.value_or(NoData);
-        metaJson[VersionKey] = global::profile->meta->version.value_or(NoData);
-        metaJson[DescriptionKey] = global::profile->meta->description.value_or(NoData);
-        metaJson[AuthorKey] = global::profile->meta->author.value_or(NoData);
-        metaJson[UrlKey] = global::profile->meta->url.value_or(NoData);
-        metaJson[LicenseKey] = global::profile->meta->license.value_or(NoData);
-        metaJson[TypeKey] = LicenseTypeName;
+        metaJson[ProfileNameKey] = global::profile->meta->name.value_or(NoDataName);
+        metaJson[VersionKey] = global::profile->meta->version.value_or(NoDataName);
+        metaJson[DescriptionKey] = global::profile->meta->description.value_or(NoDataName);
+        metaJson[AuthorKey] = global::profile->meta->author.value_or(NoDataName);
+        metaJson[UrlKey] = global::profile->meta->url.value_or(NoDataName);
+        metaJson[LicenseKey] = global::profile->meta->license.value_or(NoDataName);
         json.push_back(std::move(metaJson));
     }
 
@@ -362,19 +359,19 @@ nlohmann::json DocumentationEngine::generateLicensesGroupedByLicense() const {
 
         nlohmann::json assetJson;
         if (!meta.has_value()) {
-            assetJson[NameKey] = NoData;
-            assetJson[VersionKey] = NoData;
-            assetJson[DescriptionKey] = NoData;
-            assetJson[AuthorKey] = NoData;
-            assetJson[UrlKey] = NoData;
+            assetJson[NameKey] = NoDataName;
+            assetJson[VersionKey] = NoDataName;
+            assetJson[DescriptionKey] = NoDataName;
+            assetJson[AuthorKey] = NoDataName;
+            assetJson[UrlKey] = NoDataName;
             assetJson[LicenseKey] = NoLicenseName;
-            assetJson[IdentifiersKey] = NoData;
+            assetJson[IdentifiersKey] = NoDataName;
             assetJson[PathKey] = asset->path().string();
 
             assetLicenses[NoLicenseKey].push_back(assetJson);
         }
         else {
-            std::string licenseName = meta->license == NoData ? NoLicenseName :
+            std::string licenseName = meta->license == NoDataName ? NoLicenseName :
                 meta->license;
             assetJson[NameKey] = meta->name;
             assetJson[VersionKey] = meta->version;
@@ -405,7 +402,7 @@ nlohmann::json DocumentationEngine::generateLicensesGroupedByLicense() const {
     json.push_back(assetsJson);
 
     nlohmann::json result;
-    result[NameKey] = LicensesName;
+    result[NameKey] = LicensesTitle;
     result[DataKey] = json;
 
     return result;
@@ -416,12 +413,12 @@ nlohmann::json DocumentationEngine::generateLicenseList() const {
 
     if (global::profile->meta.has_value()) {
         nlohmann::json profile;
-        profile[NameKey] = global::profile->meta->name.value_or(NoData);
-        profile[VersionKey] = global::profile->meta->version.value_or(NoData);
-        profile[DescriptionKey] = global::profile->meta->description.value_or(NoData);
-        profile[AuthorKey] = global::profile->meta->author.value_or(NoData);
-        profile[UrlKey] = global::profile->meta->url.value_or(NoData);
-        profile[LicenseKey] = global::profile->meta->license.value_or(NoData);
+        profile[NameKey] = global::profile->meta->name.value_or(NoDataName);
+        profile[VersionKey] = global::profile->meta->version.value_or(NoDataName);
+        profile[DescriptionKey] = global::profile->meta->description.value_or(NoDataName);
+        profile[AuthorKey] = global::profile->meta->author.value_or(NoDataName);
+        profile[UrlKey] = global::profile->meta->url.value_or(NoDataName);
+        profile[LicenseKey] = global::profile->meta->license.value_or(NoDataName);
         json.push_back(profile);
     }
 
@@ -471,6 +468,7 @@ nlohmann::json DocumentationEngine::generateEventJson() const {
             // Create a unique ID
             actionJson[IdKey] = fmt::format("{}{}", action.action, action.id);
 
+            // Output filters as a string
             if (action.filter.has_value()) {
                 ghoul::Dictionary filters = action.filter.value();
                 std::vector<std::string_view> keys = filters.keys();
@@ -495,7 +493,7 @@ nlohmann::json DocumentationEngine::generateEventJson() const {
 
     // Format resulting json
     nlohmann::json result;
-    result[NameKey] = EventsName;
+    result[NameKey] = EventsTitle;
     result[DataKey] = data;
     return result;
 }
@@ -571,7 +569,7 @@ nlohmann::json DocumentationEngine::generateFactoryManagerJson() const {
 
     // I did not check the output of this for correctness ---abock
     nlohmann::json result;
-    result[NameKey] = FactoryName;
+    result[NameKey] = FactoryTitle;
     result[DataKey] = json;
 
     return result;
@@ -593,7 +591,7 @@ nlohmann::json DocumentationEngine::generateKeybindingsJson() const {
     sortJson(json, NameKey);
 
     nlohmann::json result;
-    result[NameKey] = KeybindingsName;
+    result[NameKey] = KeybindingsTitle;
     result[KeybindingsKey] = json;
     return result;
 }
@@ -605,7 +603,7 @@ nlohmann::json DocumentationEngine::generatePropertyOwnerJson(
     nlohmann::json json;
     std::vector<properties::PropertyOwner*> subOwners = owner->propertySubOwners();
     for (properties::PropertyOwner* o : subOwners) {
-        if (o->identifier() != SceneName) {
+        if (o->identifier() != SceneTitle) {
             nlohmann::json jsonOwner = createPropertyJson(o);
 
             json.push_back(jsonOwner);
@@ -653,13 +651,13 @@ void DocumentationEngine::writeDocumentation() const {
     nlohmann::json actions = generateActionJson();
     nlohmann::json events = generateEventJson();
 
-    sceneProperties[NameKey] = SettingsName;
-    sceneGraph[NameKey] = SceneName;
+    sceneProperties[NameKey] = SettingsTitle;
+    sceneGraph[NameKey] = SceneTitle;
 
     // Add this here so that the generateJson function is the same as before to ensure
     // backwards compatibility
     nlohmann::json scriptingResult;
-    scriptingResult[NameKey] = ScriptingName;
+    scriptingResult[NameKey] = ScriptingTitle;
     scriptingResult[DataKey] = scripting;
 
     nlohmann::json documentation = {
@@ -679,7 +677,7 @@ nlohmann::json DocumentationEngine::generateActionJson() const {
     using namespace interaction;
 
     nlohmann::json res;
-    res[NameKey] = ActionName;
+    res[NameKey] = ActionTitle;
     res[DataKey] = nlohmann::json::array();
     std::vector<Action> actions = global::actionManager->actions();
 

From dd31e7ff2543e828ec80d16d81fe6bb1275db8b5 Mon Sep 17 00:00:00 2001
From: Ylva Selling <ylva.selling@liu.se>
Date: Mon, 4 Mar 2024 10:50:40 +0100
Subject: [PATCH 294/701] Refactor generateLicensesGroupedByLicense function

---
 src/documentation/documentationengine.cpp | 66 +++++++++--------------
 1 file changed, 25 insertions(+), 41 deletions(-)

diff --git a/src/documentation/documentationengine.cpp b/src/documentation/documentationengine.cpp
index df0cefd6d9..ce5592f5f5 100644
--- a/src/documentation/documentationengine.cpp
+++ b/src/documentation/documentationengine.cpp
@@ -61,6 +61,7 @@ constexpr const char* DataKey = "data";
 constexpr const char* TypeKey = "type";
 constexpr const char* DocumentationKey = "documentation";
 constexpr const char* ActionKey = "action";
+constexpr const char* IdKey = "id";
 
 // Actions
 constexpr const char* ActionTitle = "Actions"; // Title in documentation sidebar
@@ -130,7 +131,6 @@ constexpr const char* KeybindingsKey = "keybindings";
 constexpr const char* EventsTitle = "Events"; // Title in documentation sidebar
 constexpr const char* FiltersKey = "filters";
 constexpr const char* ActionsKey = "actions";
-constexpr const char* IdKey = "id";
 
 
 nlohmann::json generateJsonDocumentation(const Documentation & d) {
@@ -328,20 +328,7 @@ nlohmann::json DocumentationEngine::generateScriptEngineJson() const {
 nlohmann::json DocumentationEngine::generateLicensesGroupedByLicense() const {
     nlohmann::json json;
 
-    std::vector<const Asset*> assets =
-        global::openSpaceEngine->assetManager().allAssets();
-
-    int metaTotal = 0;
-    for (const Asset* asset : assets) {
-        std::optional<Asset::MetaInformation> meta = asset->metaInformation();
-        if (!meta.has_value()) {
-            continue;
-        }
-        metaTotal++;
-    }
-
     if (global::profile->meta.has_value()) {
-        metaTotal++;
         nlohmann::json metaJson;
         metaJson[NameKey] = ProfileName;
         metaJson[ProfileNameKey] = global::profile->meta->name.value_or(NoDataName);
@@ -353,37 +340,34 @@ nlohmann::json DocumentationEngine::generateLicensesGroupedByLicense() const {
         json.push_back(std::move(metaJson));
     }
 
+    // Go through all assets and group them in a map with the key as the license name
+    std::vector<const Asset*> assets =
+        global::openSpaceEngine->assetManager().allAssets();
+
     std::map<std::string, nlohmann::json> assetLicenses;
     for (const Asset* asset : assets) {
         std::optional<Asset::MetaInformation> meta = asset->metaInformation();
 
+        // Ensure the license is not going to be an empty string
+        std::string licenseName = NoLicenseName;
+        if (meta.has_value() && meta->license != NoDataName) {
+            licenseName = meta->license;
+        }
+
         nlohmann::json assetJson;
-        if (!meta.has_value()) {
-            assetJson[NameKey] = NoDataName;
-            assetJson[VersionKey] = NoDataName;
-            assetJson[DescriptionKey] = NoDataName;
-            assetJson[AuthorKey] = NoDataName;
-            assetJson[UrlKey] = NoDataName;
-            assetJson[LicenseKey] = NoLicenseName;
-            assetJson[IdentifiersKey] = NoDataName;
-            assetJson[PathKey] = asset->path().string();
 
-            assetLicenses[NoLicenseKey].push_back(assetJson);
-        }
-        else {
-            std::string licenseName = meta->license == NoDataName ? NoLicenseName :
-                meta->license;
-            assetJson[NameKey] = meta->name;
-            assetJson[VersionKey] = meta->version;
-            assetJson[DescriptionKey] = meta->description;
-            assetJson[AuthorKey] = meta->author;
-            assetJson[UrlKey] = meta->url;
-            assetJson[LicenseKey] = licenseName;
-            assetJson[IdentifiersKey] = meta->identifiers;
-            assetJson[PathKey] = asset->path().string();
+        assetJson[NameKey] = meta.has_value() ? meta->name : NoDataName;
+        assetJson[VersionKey] = meta.has_value() ? meta->version : NoDataName;
+        assetJson[DescriptionKey] = meta.has_value() ? meta->description : NoDataName;
+        assetJson[AuthorKey] = meta.has_value() ? meta->author : NoDataName; 
+        assetJson[UrlKey] = meta.has_value() ? meta->url : NoDataName; 
+        assetJson[LicenseKey] = licenseName;
+        assetJson[PathKey] = asset->path().string();
+        assetJson[IdKey] = asset->path().string();
+        assetJson[IdentifiersKey] = meta.has_value() ? meta->identifiers :
+            std::vector<std::string>();
 
-            assetLicenses[licenseName].push_back(assetJson);
-        }
+        assetLicenses[licenseName].push_back(assetJson);
     }
 
     nlohmann::json assetsJson;
@@ -392,10 +376,10 @@ nlohmann::json DocumentationEngine::generateLicensesGroupedByLicense() const {
 
     using K = const std::string;
     using V = nlohmann::json;
-    for (const std::pair<K, V>& assetLicense : assetLicenses) {
+    for (std::pair<K, V>& assetLicense : assetLicenses) {
         nlohmann::json entry;
-        entry[NameKey] = assetLicense.first;
-        entry[AssetKey] = assetLicense.second;
+        entry[NameKey] = std::move(assetLicense.first);
+        entry[AssetKey] = std::move(assetLicense.second);
         sortJson(entry[AssetKey], NameKey);
         assetsJson[LicensesKey].push_back(entry);
     }

From bdec2da599a63012e93e7f27b51ddf5d00da5321 Mon Sep 17 00:00:00 2001
From: Ylva Selling <ylva.selling@liu.se>
Date: Mon, 4 Mar 2024 10:55:13 +0100
Subject: [PATCH 295/701] Update comment due to PR comments

---
 src/documentation/documentationengine.cpp | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/documentation/documentationengine.cpp b/src/documentation/documentationengine.cpp
index ce5592f5f5..8ae1d37560 100644
--- a/src/documentation/documentationengine.cpp
+++ b/src/documentation/documentationengine.cpp
@@ -173,8 +173,9 @@ nlohmann::json generateJsonDocumentation(const Documentation & d) {
         }
         else if (tv) {
             Documentation doc = { .entries = tv->documentations };
+
+            // Since this is a table we need to recurse this function to extract all data
             nlohmann::json restrictions = generateJsonDocumentation(doc);
-            // We have a TableVerifier, so we need to recurse
             entry[RestrictionsKey] = restrictions;
         }
         else {

From b77e03dce24e4360276ced3a4b793046230c5802 Mon Sep 17 00:00:00 2001
From: Alexander Bock <alexander.bock@liu.se>
Date: Mon, 4 Mar 2024 13:03:40 +0100
Subject: [PATCH 296/701] Some general cleanup

---
 include/openspace/engine/openspaceengine.h |  1 -
 include/openspace/scene/scene.h            |  2 +-
 include/openspace/scene/scenegraphnode.h   |  1 -
 src/engine/openspaceengine.cpp             | 98 +++++++++++-----------
 src/rendering/renderengine.cpp             | 17 +---
 src/scene/scene.cpp                        | 53 ++++++------
 src/scene/scenegraphnode.cpp               | 36 --------
 7 files changed, 78 insertions(+), 130 deletions(-)

diff --git a/include/openspace/engine/openspaceengine.h b/include/openspace/engine/openspaceengine.h
index 49b15390bb..4d4f20abc6 100644
--- a/include/openspace/engine/openspaceengine.h
+++ b/include/openspace/engine/openspaceengine.h
@@ -96,7 +96,6 @@ public:
     void deinitializeGL();
     void preSynchronization();
     void postSynchronizationPreDraw();
-    void viewportChanged();
     void render(const glm::mat4& sceneMatrix, const glm::mat4& viewMatrix,
         const glm::mat4& projectionMatrix);
     void drawOverlays();
diff --git a/include/openspace/scene/scene.h b/include/openspace/scene/scene.h
index 7625abdf07..5a3d6e60cc 100644
--- a/include/openspace/scene/scene.h
+++ b/include/openspace/scene/scene.h
@@ -313,7 +313,7 @@ private:
     std::vector<SceneGraphNode*> _circularNodes;
     std::unordered_map<std::string, SceneGraphNode*> _nodesByIdentifier;
     bool _dirtyNodeRegistry = false;
-    SceneGraphNode _rootDummy;
+    SceneGraphNode _rootNode;
     std::unique_ptr<SceneInitializer> _initializer;
     std::string _profilePropertyName;
     bool _valueIsTable = false;
diff --git a/include/openspace/scene/scenegraphnode.h b/include/openspace/scene/scenegraphnode.h
index 390e5455bf..4dbf96f757 100644
--- a/include/openspace/scene/scenegraphnode.h
+++ b/include/openspace/scene/scenegraphnode.h
@@ -74,7 +74,6 @@ public:
 
     BooleanType(UpdateScene);
 
-    static constexpr const char* RootNodeIdentifier = "Root";
     static constexpr std::string_view KeyIdentifier = "Identifier";
     static constexpr std::string_view KeyParentName = "Parent";
     static constexpr std::string_view KeyDependencies = "Dependencies";
diff --git a/src/engine/openspaceengine.cpp b/src/engine/openspaceengine.cpp
index 84874a2678..92512a941a 100644
--- a/src/engine/openspaceengine.cpp
+++ b/src/engine/openspaceengine.cpp
@@ -159,6 +159,19 @@ namespace {
         // @VISIBILITY(2.67)
         openspace::properties::Property::Visibility::User
     };
+
+    void viewportChanged() {
+        using namespace openspace;
+
+        // Needs to be updated since each render call potentially targets a different
+        // window and/or viewport
+        using FR = ghoul::fontrendering::FontRenderer;
+        FR::defaultRenderer().setFramebufferSize(global::renderEngine->fontResolution());
+
+        FR::defaultProjectionRenderer().setFramebufferSize(
+            global::renderEngine->renderingResolution()
+        );
+    }
 } // namespace
 
 namespace openspace {
@@ -509,7 +522,7 @@ void OpenSpaceEngine::initializeGL() {
         global::luaConsole->initialize();
         global::luaConsole->setCommandInputButton(global::configuration->consoleKey);
     }
-    catch (ghoul::RuntimeError& e) {
+    catch (const ghoul::RuntimeError& e) {
         LERROR("Error initializing Console with error:");
         LERRORC(e.component, e.message);
     }
@@ -558,40 +571,41 @@ void OpenSpaceEngine::initializeGL() {
             );
         }
 
-        auto callback = [](Source source, Type type, Severity severity,
-                           unsigned int id, std::string message) -> void
-        {
-            const std::string s = ghoul::to_string(source);
-            const std::string t = ghoul::to_string(type);
+        ghoul::opengl::debug::setDebugCallback(
+            [](Source source, Type type, Severity severity, unsigned int id,
+               std::string message)
+            {
+                const std::string s = ghoul::to_string(source);
+                const std::string t = ghoul::to_string(type);
 
-            const std::string category = fmt::format("OpenGL ({}) [{}] {{{}}}", s, t, id);
-            switch (severity) {
-                case Severity::High:
-                    LERRORC(category, message);
-                    break;
-                case Severity::Medium:
-                    LWARNINGC(category, message);
-                    break;
-                case Severity::Low:
-                    LINFOC(category, message);
-                    break;
-                case Severity::Notification:
-                    LDEBUGC(category, message);
-                    break;
-                default:
-                    throw ghoul::MissingCaseException();
-            }
-
-            if (global::configuration->openGLDebugContext.printStacktrace) {
-                std::string stackString = "Stacktrace\n";
-                std::vector<std::string> stack = ghoul::stackTrace();
-                for (size_t i = 0; i < stack.size(); i++) {
-                    stackString += fmt::format("{}: {}\n", i, stack[i]);
+                const std::string cat = fmt::format("OpenGL ({}) [{}] {{{}}}", s, t, id);
+                switch (severity) {
+                    case Severity::High:
+                        LERRORC(cat, message);
+                        break;
+                    case Severity::Medium:
+                        LWARNINGC(cat, message);
+                        break;
+                    case Severity::Low:
+                        LINFOC(cat, message);
+                        break;
+                    case Severity::Notification:
+                        LDEBUGC(cat, message);
+                        break;
+                    default:
+                        throw ghoul::MissingCaseException();
+                }
+
+                if (global::configuration->openGLDebugContext.printStacktrace) {
+                    std::string stackString = "Stacktrace\n";
+                    std::vector<std::string> stack = ghoul::stackTrace();
+                    for (size_t i = 0; i < stack.size(); i++) {
+                        stackString += fmt::format("{}: {}\n", i, stack[i]);
+                    }
+                    LDEBUGC(cat, stackString);
                 }
-                LDEBUGC(category, stackString);
             }
-        };
-        ghoul::opengl::debug::setDebugCallback(callback);
+        );
     }
     LTRACE("OpenSpaceEngine::initializeGL::DebugContext(end)");
 
@@ -1114,17 +1128,6 @@ void OpenSpaceEngine::postSynchronizationPreDraw() {
     LTRACE("OpenSpaceEngine::postSynchronizationPreDraw(end)");
 }
 
-void OpenSpaceEngine::viewportChanged() {
-    // Needs to be updated since each render call potentially targets a different
-    // window and/or viewport
-    using FR = ghoul::fontrendering::FontRenderer;
-    FR::defaultRenderer().setFramebufferSize(global::renderEngine->fontResolution());
-
-    FR::defaultProjectionRenderer().setFramebufferSize(
-        global::renderEngine->renderingResolution()
-    );
-}
-
 void OpenSpaceEngine::render(const glm::mat4& sceneMatrix, const glm::mat4& viewMatrix,
                              const glm::mat4& projectionMatrix)
 {
@@ -1390,8 +1393,7 @@ void OpenSpaceEngine::mouseScrollWheelCallback(double posX, double posY,
 void OpenSpaceEngine::touchDetectionCallback(TouchInput input) {
     ZoneScoped;
 
-    using F = std::function<bool (TouchInput)>;
-    for (const F& func : *global::callback::touchDetected) {
+    for (const std::function<bool(TouchInput)>& func : *global::callback::touchDetected) {
         bool isConsumed = func(input);
         if (isConsumed) {
             return;
@@ -1402,8 +1404,7 @@ void OpenSpaceEngine::touchDetectionCallback(TouchInput input) {
 void OpenSpaceEngine::touchUpdateCallback(TouchInput input) {
     ZoneScoped;
 
-    using F = std::function<bool(TouchInput)>;
-    for (const F& func : *global::callback::touchUpdated) {
+    for (const std::function<bool(TouchInput)>& func : *global::callback::touchUpdated) {
         bool isConsumed = func(input);
         if (isConsumed) {
             return;
@@ -1414,8 +1415,7 @@ void OpenSpaceEngine::touchUpdateCallback(TouchInput input) {
 void OpenSpaceEngine::touchExitCallback(TouchInput input) {
     ZoneScoped;
 
-    using F = std::function<void(TouchInput)>;
-    for (const F& func : *global::callback::touchExit) {
+    for (const std::function<void(TouchInput)>& func : *global::callback::touchExit) {
         func(input);
     }
 }
diff --git a/src/rendering/renderengine.cpp b/src/rendering/renderengine.cpp
index 644292f962..4d1242e0bc 100644
--- a/src/rendering/renderengine.cpp
+++ b/src/rendering/renderengine.cpp
@@ -599,7 +599,7 @@ void RenderEngine::updateRenderer() {
         using FR = ghoul::fontrendering::FontRenderer;
         FR::defaultRenderer().setFramebufferSize(fontResolution());
         FR::defaultProjectionRenderer().setFramebufferSize(renderingResolution());
-        //Override the aspect ratio property value to match that of resized window
+        // Override the aspect ratio property value to match that of resized window
         _horizFieldOfView =
             static_cast<float>(global::windowDelegate->getHorizFieldOfView());
     }
@@ -1033,11 +1033,6 @@ void RenderEngine::removeRenderProgram(ghoul::opengl::ProgramObject* program) {
     }
 }
 
-/**
-* Set renderer data
-* Called from the renderer, whenever it needs to update
-* the dictionary of all rendering programs.
-*/
 void RenderEngine::setRendererData(ghoul::Dictionary rendererData) {
     _rendererData = std::move(rendererData);
     for (ghoul::opengl::ProgramObject* program : _programs) {
@@ -1047,11 +1042,6 @@ void RenderEngine::setRendererData(ghoul::Dictionary rendererData) {
     }
 }
 
-/**
-* Set resolve data
-* Called from the renderer, whenever it needs to update
-* the dictionary of all post rendering programs.
-*/
 void RenderEngine::setResolveData(ghoul::Dictionary resolveData) {
     _resolveData = std::move(resolveData);
     for (ghoul::opengl::ProgramObject* program : _programs) {
@@ -1061,9 +1051,6 @@ void RenderEngine::setResolveData(ghoul::Dictionary resolveData) {
     }
 }
 
-/**
- * Take a screenshot and store it in the ${SCREENSHOTS} directory
- */
 void RenderEngine::takeScreenshot() {
     // We only create the directory here, as we don't want to spam the users
     // screenshot folder everytime we start OpenSpace even when we are not taking any
@@ -1274,7 +1261,7 @@ void RenderEngine::renderVersionInformation() {
 
     // If a developer hasn't placed the Git command in the path, this variable will be
     // empty
-    if (!std::string_view(OPENSPACE_GIT_COMMIT).empty()) {
+    if (!OPENSPACE_GIT_COMMIT.empty()) {
         // We check OPENSPACE_GIT_COMMIT but use OPENSPACE_GIT_FULL on purpose since
         // OPENSPACE_GIT_FULL will never be empty (always will contain at least @, but
         // checking for that is a bit brittle)
diff --git a/src/scene/scene.cpp b/src/scene/scene.cpp
index 1b26510b9a..81e5fe275c 100644
--- a/src/scene/scene.cpp
+++ b/src/scene/scene.cpp
@@ -61,6 +61,7 @@ namespace {
     constexpr std::string_view _loggerCat = "Scene";
     constexpr std::string_view KeyIdentifier = "Identifier";
     constexpr std::string_view KeyParent = "Parent";
+    constexpr const char* RootNodeIdentifier = "Root";
 
 #ifdef TRACY_ENABLE
     constexpr const char* renderBinToString(int renderBin) {
@@ -104,10 +105,10 @@ Scene::Scene(std::unique_ptr<SceneInitializer> initializer)
     , _camera(std::make_unique<Camera>())
     , _initializer(std::move(initializer))
 {
-    _rootDummy.setIdentifier(SceneGraphNode::RootNodeIdentifier);
-    _rootDummy.setScene(this);
+    _rootNode.setIdentifier(RootNodeIdentifier);
+    _rootNode.setScene(this);
 
-    _camera->setParent(&_rootDummy);
+    _camera->setParent(&_rootNode);
 }
 
 Scene::~Scene() {
@@ -128,16 +129,16 @@ Scene::~Scene() {
         node->deinitializeGL();
         node->deinitialize();
     }
-    _rootDummy.clearChildren();
-    _rootDummy.setScene(nullptr);
+    _rootNode.clearChildren();
+    _rootNode.setScene(nullptr);
 }
 
 void Scene::attachNode(ghoul::mm_unique_ptr<SceneGraphNode> node) {
-    _rootDummy.attachChild(std::move(node));
+    _rootNode.attachChild(std::move(node));
 }
 
 ghoul::mm_unique_ptr<SceneGraphNode> Scene::detachNode(SceneGraphNode& node) {
-    return _rootDummy.detachChild(node);
+    return _rootNode.detachChild(node);
 }
 
 Camera* Scene::camera() const {
@@ -146,9 +147,9 @@ Camera* Scene::camera() const {
 
 void Scene::registerNode(SceneGraphNode* node) {
     if (_nodesByIdentifier.count(node->identifier())) {
-        throw Scene::InvalidSceneError(
-            "Node with identifier " + node->identifier() + " already exists"
-        );
+        throw Scene::InvalidSceneError(fmt::format(
+            "Node with identifier '{}' already exists", node->identifier()
+        ));
     }
 
     _topologicallySortedNodes.push_back(node);
@@ -207,7 +208,7 @@ void Scene::sortTopologically() {
     }
 
     // Only the Root node can have an in-degree of 0
-    SceneGraphNode* root = _nodesByIdentifier[SceneGraphNode::RootNodeIdentifier];
+    SceneGraphNode* root = _nodesByIdentifier[RootNodeIdentifier];
     if (!root) {
         throw Scene::InvalidSceneError("No root node found");
     }
@@ -263,6 +264,8 @@ void Scene::sortTopologically() {
 }
 
 void Scene::initializeNode(SceneGraphNode* node) {
+    ghoul_assert(node, "Node must not be nullptr");
+
     _initializer->initializeNode(node);
 }
 
@@ -334,11 +337,11 @@ const std::unordered_map<std::string, SceneGraphNode*>& Scene::nodesByIdentifier
 }
 
 SceneGraphNode* Scene::root() {
-    return &_rootDummy;
+    return &_rootNode;
 }
 
 const SceneGraphNode* Scene::root() const {
-    return &_rootDummy;
+    return &_rootNode;
 }
 
 SceneGraphNode* Scene::sceneGraphNode(const std::string& name) const {
@@ -384,10 +387,6 @@ SceneGraphNode* Scene::loadNode(const ghoul::Dictionary& nodeDictionary) {
     ghoul::mm_unique_ptr<SceneGraphNode> node = SceneGraphNode::createFromDictionary(
         nodeDictionary
     );
-    if (!node) {
-        // TODO: Throw exception
-        LERROR("Could not create node from dictionary: " + nodeIdentifier);
-    }
 
     if (nodeDictionary.hasKey(SceneGraphNode::KeyDependencies)) {
         if (!nodeDictionary.hasValue<ghoul::Dictionary>(SceneGraphNode::KeyDependencies))
@@ -616,7 +615,7 @@ void Scene::propertyPushProfileValueToLua(ghoul::lua::LuaState& L,
     _valueIsTable = false;
     ProfilePropertyLua elem = propertyProcessValue(L, value);
     if (!_valueIsTable) {
-        std::visit(overloaded{
+        std::visit(overloaded {
             [&L](bool v) {
                 ghoul::lua::push(L, v);
             },
@@ -681,21 +680,21 @@ void Scene::handlePropertyLuaTableEntry(ghoul::lua::LuaState& L, const std::stri
         case PropertyValueType::Boolean:
             LERROR(fmt::format(
                 "A lua table of bool values is not supported. (processing property {})",
-                _profilePropertyName)
-            );
+                _profilePropertyName
+            ));
             break;
         case PropertyValueType::Float:
             {
-                std::vector<float> valsF;
-                processPropertyValueTableEntries(L, value, valsF);
-                ghoul::lua::push(L, valsF);
+                std::vector<float> vals;
+                processPropertyValueTableEntries(L, value, vals);
+                ghoul::lua::push(L, vals);
             }
             break;
         case PropertyValueType::String:
             {
-                std::vector<std::string> valsS;
-                processPropertyValueTableEntries(L, value, valsS);
-                ghoul::lua::push(L, valsS);
+                std::vector<std::string> vals;
+                processPropertyValueTableEntries(L, value, vals);
+                ghoul::lua::push(L, vals);
             }
             break;
         case PropertyValueType::Table:
@@ -768,7 +767,7 @@ PropertyValueType Scene::propertyValueType(const std::string& value) {
 }
 
 std::vector<properties::Property*> Scene::propertiesMatchingRegex(
-                                                              std::string propertyString)
+                                                               std::string propertyString)
 {
     return findMatchesInAllProperties(propertyString, allProperties(), "");
 }
diff --git a/src/scene/scenegraphnode.cpp b/src/scene/scenegraphnode.cpp
index c67685baab..32fcb655d1 100644
--- a/src/scene/scenegraphnode.cpp
+++ b/src/scene/scenegraphnode.cpp
@@ -380,15 +380,6 @@ ghoul::mm_unique_ptr<SceneGraphNode> SceneGraphNode::createFromDictionary(
                 *p.transform->translation
             );
 
-            // @TODO(abock, 2021-03-05)  I don't think this is necessary anymore as we
-            // transitioned to throwing exceptions when the construction fails
-            if (result->_transform.translation == nullptr) {
-                LERROR(fmt::format(
-                    "Failed to create ephemeris for SceneGraphNode '{}'",
-                    result->identifier()
-                ));
-                return nullptr;
-            }
             LDEBUG(fmt::format(
                 "Successfully created ephemeris for '{}'", result->identifier()
             ));
@@ -399,15 +390,6 @@ ghoul::mm_unique_ptr<SceneGraphNode> SceneGraphNode::createFromDictionary(
                 *p.transform->rotation
             );
 
-            // @TODO(abock, 2021-03-05)  I don't think this is necessary anymore as we
-            // transitioned to throwing exceptions when the construction fails
-            if (result->_transform.rotation == nullptr) {
-                LERROR(fmt::format(
-                    "Failed to create rotation for SceneGraphNode '{}'",
-                    result->identifier()
-                ));
-                return nullptr;
-            }
             LDEBUG(fmt::format(
                 "Successfully created rotation for '{}'", result->identifier()
             ));
@@ -416,15 +398,6 @@ ghoul::mm_unique_ptr<SceneGraphNode> SceneGraphNode::createFromDictionary(
         if (p.transform->scale.has_value()) {
             result->_transform.scale = Scale::createFromDictionary(*p.transform->scale);
 
-            // @TODO(abock, 2021-03-05)  I don't think this is necessary anymore as we
-            // transitioned to throwing exceptions when the construction fails
-            if (result->_transform.scale == nullptr) {
-                LERROR(fmt::format(
-                    "Failed to create scale for SceneGraphNode '{}'",
-                    result->identifier()
-                ));
-                return nullptr;
-            }
             LDEBUG(fmt::format(
                 "Successfully created scale for '{}'", result->identifier()
             ));
@@ -438,15 +411,6 @@ ghoul::mm_unique_ptr<SceneGraphNode> SceneGraphNode::createFromDictionary(
     if (p.timeFrame.has_value()) {
         result->_timeFrame = TimeFrame::createFromDictionary(*p.timeFrame);
 
-        // @TODO(abock, 2021-03-05)  I don't think this is necessary anymore as we
-        // transitioned to throwing exceptions when the construction fails
-        if (result->_timeFrame == nullptr) {
-            LERROR(fmt::format(
-                "Failed to create time frame for SceneGraphNode '{}'",
-                result->identifier()
-            ));
-            return nullptr;
-        }
         LDEBUG(fmt::format(
             "Successfully created time frame for '{}'", result->identifier()
         ));

From 86c2c75b01f6c2619562a823c59497c201dba4e9 Mon Sep 17 00:00:00 2001
From: Alexander Bock <alexander.bock@liu.se>
Date: Mon, 4 Mar 2024 13:32:56 +0100
Subject: [PATCH 297/701] Coding style

---
 include/openspace/events/eventengine.h    |   3 +-
 src/documentation/documentationengine.cpp | 402 +++++++++++-----------
 src/engine/openspaceengine.cpp            |   3 +-
 src/events/eventengine.cpp                |   8 +-
 src/interaction/actionmanager.cpp         |   1 +
 5 files changed, 210 insertions(+), 207 deletions(-)

diff --git a/include/openspace/events/eventengine.h b/include/openspace/events/eventengine.h
index aee899f575..a94a87e680 100644
--- a/include/openspace/events/eventengine.h
+++ b/include/openspace/events/eventengine.h
@@ -143,7 +143,8 @@ public:
      *
      * \return The unordered map of all registered actions
      */
-    const std::unordered_map<events::Event::Type, std::vector<ActionInfo>>& eventActions() const;
+    const std::unordered_map<events::Event::Type, std::vector<ActionInfo>>&
+        eventActions() const;
 
     /**
      * Enables the event identified by the \p identifier. If the event is already enabled,
diff --git a/src/documentation/documentationengine.cpp b/src/documentation/documentationengine.cpp
index 8ae1d37560..b4d8f9e8d3 100644
--- a/src/documentation/documentationengine.cpp
+++ b/src/documentation/documentationengine.cpp
@@ -34,8 +34,8 @@
 #include <openspace/interaction/action.h>
 #include <openspace/interaction/actionmanager.h>
 #include <openspace/interaction/keybindingmanager.h>
-#include <openspace/rendering/renderengine.h>
 #include <openspace/json.h>
+#include <openspace/rendering/renderengine.h>
 #include <openspace/scene/asset.h>
 #include <openspace/scene/assetmanager.h>
 #include <openspace/scene/scene.h>
@@ -46,215 +46,218 @@
 #include <ghoul/fmt.h>
 #include <ghoul/filesystem/filesystem.h>
 #include <ghoul/misc/profiling.h>
-
 #include <fstream>
 #include <future>
 
-namespace openspace::documentation {
-constexpr std::string_view _loggerCat = "DocumentationEngine";
+namespace {
+    constexpr std::string_view _loggerCat = "DocumentationEngine";
 
-// General keys
-constexpr const char* NameKey = "name";
-constexpr const char* IdentifierKey = "identifier";
-constexpr const char* DescriptionKey = "description";
-constexpr const char* DataKey = "data";
-constexpr const char* TypeKey = "type";
-constexpr const char* DocumentationKey = "documentation";
-constexpr const char* ActionKey = "action";
-constexpr const char* IdKey = "id";
+    // General keys
+    constexpr const char* NameKey = "name";
+    constexpr const char* IdentifierKey = "identifier";
+    constexpr const char* DescriptionKey = "description";
+    constexpr const char* DataKey = "data";
+    constexpr const char* TypeKey = "type";
+    constexpr const char* DocumentationKey = "documentation";
+    constexpr const char* ActionKey = "action";
+    constexpr const char* IdKey = "id";
 
-// Actions
-constexpr const char* ActionTitle = "Actions"; // Title in documentation sidebar
-constexpr const char* GuiNameKey = "guiName";
-constexpr const char* CommandKey = "command";
+    // Actions
+    constexpr const char* ActionTitle = "Actions";
+    constexpr const char* GuiNameKey = "guiName";
+    constexpr const char* CommandKey = "command";
 
-// Factory
-constexpr const char* FactoryTitle = "Asset Types"; // Title in documentation sidebar
-constexpr const char* MembersKey = "members";
-constexpr const char* OptionalKey = "optional";
-constexpr const char* ReferenceKey = "reference";
-constexpr const char* FoundKey = "found";
-constexpr const char* RestrictionsKey = "restrictions";
-constexpr const char* ClassesKey = "classes";
+    // Factory
+    constexpr const char* FactoryTitle = "Asset Types";
+    constexpr const char* MembersKey = "members";
+    constexpr const char* OptionalKey = "optional";
+    constexpr const char* ReferenceKey = "reference";
+    constexpr const char* FoundKey = "found";
+    constexpr const char* RestrictionsKey = "restrictions";
+    constexpr const char* ClassesKey = "classes";
 
-constexpr const char* OtherName = "Other";
-constexpr const char* OtherIdentifierName = "other";
-constexpr const char* propertyOwnerName = "propertyOwner";
-constexpr const char* categoryName = "category";
+    constexpr const char* OtherName = "Other";
+    constexpr const char* OtherIdentifierName = "other";
+    constexpr const char* propertyOwnerName = "propertyOwner";
+    constexpr const char* categoryName = "category";
 
-// Properties
-constexpr const char* SettingsTitle = "Settings"; // Title in documentation sidebar
-constexpr const char* SceneTitle = "Scene"; // Title in documentation sidebar
-constexpr const char* PropertiesKeys = "properties";
-constexpr const char* PropertyOwnersKey = "propertyOwners";
-constexpr const char* TagsKey = "tags";
-constexpr const char* UriKey = "uri";
+    // Properties
+    constexpr const char* SettingsTitle = "Settings";
+    constexpr const char* SceneTitle = "Scene";
+    constexpr const char* PropertiesKeys = "properties";
+    constexpr const char* PropertyOwnersKey = "propertyOwners";
+    constexpr const char* TagsKey = "tags";
+    constexpr const char* UriKey = "uri";
 
-// Scripting
-constexpr const char* ScriptingTitle = "Scripting API"; // Title in documentation sidebar
-constexpr const char* DefaultValueKey = "defaultValue";
-constexpr const char* ArgumentsKey = "arguments";
-constexpr const char* ReturnTypeKey = "returnType";
-constexpr const char* HelpKey = "help";
-constexpr const char* FileKey = "file";
-constexpr const char* LineKey = "line";
-constexpr const char* LibraryKey = "library";
-constexpr const char* FullNameKey = "fullName";
-constexpr const char* FunctionsKey = "functions";
-constexpr const char* SourceLocationKey = "sourceLocation";
-constexpr const char* OpenSpaceScriptingKey = "openspace";
+    // Scripting
+    constexpr const char* ScriptingTitle = "Scripting API";
+    constexpr const char* DefaultValueKey = "defaultValue";
+    constexpr const char* ArgumentsKey = "arguments";
+    constexpr const char* ReturnTypeKey = "returnType";
+    constexpr const char* HelpKey = "help";
+    constexpr const char* FileKey = "file";
+    constexpr const char* LineKey = "line";
+    constexpr const char* LibraryKey = "library";
+    constexpr const char* FullNameKey = "fullName";
+    constexpr const char* FunctionsKey = "functions";
+    constexpr const char* SourceLocationKey = "sourceLocation";
+    constexpr const char* OpenSpaceScriptingKey = "openspace";
 
-// Licenses
-constexpr const char* LicensesTitle = "Licenses"; // Title in documentation sidebar
-constexpr const char* ProfileName = "Profile";
-constexpr const char* AssetsName = "Assets";
-constexpr const char* LicensesName = "Licenses";
-constexpr const char* NoLicenseName = "No License";
-constexpr const char* NoDataName = "";
+    // Licenses
+    constexpr const char* LicensesTitle = "Licenses";
+    constexpr const char* ProfileName = "Profile";
+    constexpr const char* AssetsName = "Assets";
+    constexpr const char* LicensesName = "Licenses";
+    constexpr const char* NoLicenseName = "No License";
+    constexpr const char* NoDataName = "";
 
-constexpr const char* ProfileNameKey = "profileName";
-constexpr const char* VersionKey = "version";
-constexpr const char* AuthorKey = "author";
-constexpr const char* UrlKey = "url";
-constexpr const char* LicenseKey = "license";
-constexpr const char* NoLicenseKey = "noLicense";
-constexpr const char* IdentifiersKey = "identifiers";
-constexpr const char* PathKey = "path";
-constexpr const char* AssetKey = "assets";
-constexpr const char* LicensesKey = "licenses";
+    constexpr const char* ProfileNameKey = "profileName";
+    constexpr const char* VersionKey = "version";
+    constexpr const char* AuthorKey = "author";
+    constexpr const char* UrlKey = "url";
+    constexpr const char* LicenseKey = "license";
+    constexpr const char* NoLicenseKey = "noLicense";
+    constexpr const char* IdentifiersKey = "identifiers";
+    constexpr const char* PathKey = "path";
+    constexpr const char* AssetKey = "assets";
+    constexpr const char* LicensesKey = "licenses";
 
-// Keybindings
-constexpr const char* KeybindingsTitle = "Keybindings"; // Title in documentation sidebar
-constexpr const char* KeybindingsKey = "keybindings";
+    // Keybindings
+    constexpr const char* KeybindingsTitle = "Keybindings";
+    constexpr const char* KeybindingsKey = "keybindings";
 
-// Events
-constexpr const char* EventsTitle = "Events"; // Title in documentation sidebar
-constexpr const char* FiltersKey = "filters";
-constexpr const char* ActionsKey = "actions";
+    // Events
+    constexpr const char* EventsTitle = "Events";
+    constexpr const char* FiltersKey = "filters";
+    constexpr const char* ActionsKey = "actions";
 
+    nlohmann::json generateJsonDocumentation(
+                                         const openspace::documentation::Documentation& d)
+    {
+        using namespace openspace::documentation;
 
-nlohmann::json generateJsonDocumentation(const Documentation & d) {
-    nlohmann::json json;
+        nlohmann::json json;
 
-    json[NameKey] = d.name;
-    json[IdentifierKey] = d.id;
-    json[DescriptionKey] = d.description;
-    json[MembersKey] = nlohmann::json::array();
+        json[NameKey] = d.name;
+        json[IdentifierKey] = d.id;
+        json[DescriptionKey] = d.description;
+        json[MembersKey] = nlohmann::json::array();
 
-    for (const DocumentationEntry& p : d.entries) {
-        nlohmann::json entry;
-        entry[NameKey] = p.key;
-        entry[OptionalKey] = p.optional.value;
-        entry[TypeKey] = p.verifier->type();
-        entry[DocumentationKey] = p.documentation;
+        for (const DocumentationEntry& p : d.entries) {
+            nlohmann::json entry;
+            entry[NameKey] = p.key;
+            entry[OptionalKey] = p.optional.value;
+            entry[TypeKey] = p.verifier->type();
+            entry[DocumentationKey] = p.documentation;
 
-        TableVerifier* tv = dynamic_cast<TableVerifier*>(p.verifier.get());
-        ReferencingVerifier* rv = dynamic_cast<ReferencingVerifier*>(p.verifier.get());
+            auto* tv = dynamic_cast<TableVerifier*>(p.verifier.get());
+            auto* rv = dynamic_cast<ReferencingVerifier*>(p.verifier.get());
 
-        if (rv) {
-            const std::vector<Documentation>& documentations = DocEng.documentations();
-            auto it = std::find_if(
-                documentations.begin(),
-                documentations.end(),
-                [rv](const Documentation& doc) { return doc.id == rv->identifier; }
-            );
+            if (rv) {
+                const std::vector<Documentation>& doc = DocEng.documentations();
+                auto it = std::find_if(
+                    doc.begin(),
+                    doc.end(),
+                    [rv](const Documentation& doc) { return doc.id == rv->identifier; }
+                );
 
-            if (it == documentations.end()) {
-                entry[ReferenceKey][FoundKey] = false;
+                if (it == doc.end()) {
+                    entry[ReferenceKey][FoundKey] = false;
+                }
+                else {
+                    nlohmann::json reference;
+                    reference[FoundKey] = true;
+                    reference[NameKey] = it->name;
+                    reference[IdentifierKey] = rv->identifier;
+
+                    entry[ReferenceKey] = reference;
+                }
+            }
+            else if (tv) {
+                Documentation doc = { .entries = tv->documentations };
+
+                // Since this is a table we need to recurse this function to extract data
+                nlohmann::json restrictions = generateJsonDocumentation(doc);
+                entry[RestrictionsKey] = restrictions;
             }
             else {
-                nlohmann::json reference;
-                reference[FoundKey] = true;
-                reference[NameKey] = it->name;
-                reference[IdentifierKey] = rv->identifier;
-
-                entry[ReferenceKey] = reference;
+                entry[DescriptionKey] = p.verifier->documentation();
             }
+            json[MembersKey].push_back(entry);
         }
-        else if (tv) {
-            Documentation doc = { .entries = tv->documentations };
+        openspace::sortJson(json[MembersKey], NameKey);
 
-            // Since this is a table we need to recurse this function to extract all data
-            nlohmann::json restrictions = generateJsonDocumentation(doc);
-            entry[RestrictionsKey] = restrictions;
+        return json;
+    }
+
+    nlohmann::json createPropertyJson(openspace::properties::PropertyOwner* owner) {
+        ZoneScoped;
+
+        using namespace openspace;
+        nlohmann::json json;
+        json[NameKey] = !owner->guiName().empty() ? owner->guiName() : owner->identifier();
+
+        json[DescriptionKey] = owner->description();
+        json[PropertiesKeys] = nlohmann::json::array();
+        json[PropertyOwnersKey] = nlohmann::json::array();
+        json[TypeKey] = owner->type();
+        json[TagsKey] = owner->tags();
+
+        for (properties::Property* p : owner->properties()) {
+            nlohmann::json propertyJson;
+            std::string name = !p->guiName().empty() ? p->guiName() : p->identifier();
+            propertyJson[NameKey] = name;
+            propertyJson[TypeKey] = p->className();
+            propertyJson[UriKey] = p->fullyQualifiedIdentifier();
+            propertyJson[IdentifierKey] = p->identifier();
+            propertyJson[DescriptionKey] = p->description();
+
+            json[PropertiesKeys].push_back(propertyJson);
         }
-        else {
-            entry[DescriptionKey] = p.verifier->documentation();
+        sortJson(json[PropertiesKeys], NameKey);
+
+        for (properties::PropertyOwner* o : owner->propertySubOwners()) {
+            nlohmann::json propertyOwner;
+            json[PropertyOwnersKey].push_back(createPropertyJson(o));
         }
-        json[MembersKey].push_back(entry);
-    }
-    sortJson(json[MembersKey], NameKey);
+        sortJson(json[PropertyOwnersKey], NameKey);
 
-    return json;
-}
-
-nlohmann::json createPropertyJson(openspace::properties::PropertyOwner* owner) {
-    ZoneScoped;
-
-    using namespace openspace;
-    nlohmann::json json;
-    json[NameKey] = !owner->guiName().empty() ? owner->guiName() : owner->identifier();
-
-    json[DescriptionKey] = owner->description();
-    json[PropertiesKeys] = nlohmann::json::array();
-    json[PropertyOwnersKey] = nlohmann::json::array();
-    json[TypeKey] = owner->type();
-    json[TagsKey] = owner->tags();
-
-    const std::vector<properties::Property*>& properties = owner->properties();
-    for (properties::Property* p : properties) {
-        nlohmann::json propertyJson;
-        std::string name = !p->guiName().empty() ? p->guiName() : p->identifier();
-        propertyJson[NameKey] = name;
-        propertyJson[TypeKey] = p->className();
-        propertyJson[UriKey] = p->fullyQualifiedIdentifier();
-        propertyJson[IdentifierKey] = p->identifier();
-        propertyJson[DescriptionKey] = p->description();
-
-        json[PropertiesKeys].push_back(propertyJson);
-    }
-    sortJson(json[PropertiesKeys], NameKey);
-
-    auto propertyOwners = owner->propertySubOwners();
-    for (properties::PropertyOwner* o : propertyOwners) {
-        nlohmann::json propertyOwner;
-        json[PropertyOwnersKey].push_back(createPropertyJson(o));
-    }
-    sortJson(json[PropertyOwnersKey], NameKey);
-
-    return json;
-}
-
-nlohmann::json LuaFunctionToJson(const openspace::scripting::LuaLibrary::Function& f,
-    bool includeSourceLocation)
-{
-    using namespace openspace;
-    using namespace openspace::scripting;
-    nlohmann::json function;
-    function[NameKey] = f.name;
-    nlohmann::json arguments = nlohmann::json::array();
-
-    for (const LuaLibrary::Function::Argument& arg : f.arguments) {
-        nlohmann::json argument;
-        argument[NameKey] = arg.name;
-        argument[TypeKey] = arg.type;
-        argument[DefaultValueKey] = arg.defaultValue.value_or(NoDataName);
-        arguments.push_back(argument);
+        return json;
     }
 
-    function[ArgumentsKey] = arguments;
-    function[ReturnTypeKey] = f.returnType;
-    function[HelpKey ] = f.helpText;
+    nlohmann::json luaFunctionToJson(const openspace::scripting::LuaLibrary::Function& f,
+                                     bool includeSourceLocation)
+    {
+        using namespace openspace::scripting;
 
-    if (includeSourceLocation) {
-        nlohmann::json sourceLocation;
-        sourceLocation[FileKey] = f.sourceLocation.file;
-        sourceLocation[LineKey] = f.sourceLocation.line;
-        function[SourceLocationKey] = sourceLocation;
+        nlohmann::json function;
+        function[NameKey] = f.name;
+        nlohmann::json arguments = nlohmann::json::array();
+
+        for (const LuaLibrary::Function::Argument& arg : f.arguments) {
+            nlohmann::json argument;
+            argument[NameKey] = arg.name;
+            argument[TypeKey] = arg.type;
+            argument[DefaultValueKey] = arg.defaultValue.value_or(NoDataName);
+            arguments.push_back(argument);
+        }
+
+        function[ArgumentsKey] = arguments;
+        function[ReturnTypeKey] = f.returnType;
+        function[HelpKey] = f.helpText;
+
+        if (includeSourceLocation) {
+            nlohmann::json sourceLocation;
+            sourceLocation[FileKey] = f.sourceLocation.file;
+            sourceLocation[LineKey] = f.sourceLocation.line;
+            function[SourceLocationKey] = sourceLocation;
+        }
+
+        return function;
     }
+} // namespace
 
-    return function;
-}
+namespace openspace::documentation {
 
 DocumentationEngine* DocumentationEngine::_instance = nullptr;
 
@@ -294,13 +297,11 @@ DocumentationEngine& DocumentationEngine::ref() {
 nlohmann::json DocumentationEngine::generateScriptEngineJson() const {
     ZoneScoped;
 
-    using namespace openspace;
-    using namespace scripting;
+    using namespace openspace::scripting;
     const std::vector<LuaLibrary> libraries = global::scriptEngine->allLuaLibraries();
     nlohmann::json json;
 
     for (const LuaLibrary& l : libraries) {
-
         nlohmann::json library;
         std::string libraryName = l.name;
         // Keep the library key for backwards compatability
@@ -310,13 +311,13 @@ nlohmann::json DocumentationEngine::generateScriptEngineJson() const {
         library[FullNameKey] = libraryName.empty() ? os : os + "." + libraryName;
 
         for (const LuaLibrary::Function& f : l.functions) {
-            bool hasSourceLocation = true;
-            library[FunctionsKey].push_back(LuaFunctionToJson(f, hasSourceLocation));
+            constexpr bool HasSourceLocation = true;
+            library[FunctionsKey].push_back(luaFunctionToJson(f, HasSourceLocation));
         }
 
         for (const LuaLibrary::Function& f : l.documentations) {
-            bool hasSourceLocation = false;
-            library[FunctionsKey].push_back(LuaFunctionToJson(f, hasSourceLocation));
+            constexpr bool HasSourceLocation = false;
+            library[FunctionsKey].push_back(luaFunctionToJson(f, HasSourceLocation));
         }
         sortJson(library[FunctionsKey], NameKey);
         json.push_back(library);
@@ -375,12 +376,12 @@ nlohmann::json DocumentationEngine::generateLicensesGroupedByLicense() const {
     assetsJson[NameKey] = AssetsName;
     assetsJson[TypeKey] = LicensesName;
 
-    using K = const std::string;
+    using K = std::string;
     using V = nlohmann::json;
-    for (std::pair<K, V>& assetLicense : assetLicenses) {
+    for (const std::pair<const K, V>& assetLicense : assetLicenses) {
         nlohmann::json entry;
-        entry[NameKey] = std::move(assetLicense.first);
-        entry[AssetKey] = std::move(assetLicense.second);
+        entry[NameKey] = assetLicense.first;
+        entry[AssetKey] = assetLicense.second;
         sortJson(entry[AssetKey], NameKey);
         assetsJson[LicensesKey].push_back(entry);
     }
@@ -389,7 +390,6 @@ nlohmann::json DocumentationEngine::generateLicensesGroupedByLicense() const {
     nlohmann::json result;
     result[NameKey] = LicensesTitle;
     result[DataKey] = json;
-
     return result;
 }
 
@@ -426,14 +426,14 @@ nlohmann::json DocumentationEngine::generateLicenseList() const {
         assetJson[LicenseKey] = meta->license;
         assetJson[IdentifiersKey] = meta->identifiers;
         assetJson[PathKey] = asset->path().string();
-
         json.push_back(assetJson);
     }
     return json;
 }
 
 nlohmann::json DocumentationEngine::generateEventJson() const {
-    const std::unordered_map<events::Event::Type, std::vector<EventEngine::ActionInfo>>& eventActions =
+    using Type = events::Event::Type;
+    const std::unordered_map<Type, std::vector<EventEngine::ActionInfo>>& eventActions =
         global::eventEngine->eventActions();
     nlohmann::json events;
 
@@ -462,7 +462,7 @@ nlohmann::json DocumentationEngine::generateEventJson() const {
                 std::string filtersString = "";
                 for (std::string_view key : keys) {
                     std::string value = filters.value<std::string>(key);
-                    filtersString += fmt::format("{} = {}, ", std::string(key), value);
+                    filtersString += fmt::format("{} = {}, ", key, value);
                 }
                 filtersString.pop_back(); // Remove last space from last entry
                 filtersString.pop_back(); // Remove last comma from last entry
@@ -500,9 +500,8 @@ nlohmann::json DocumentationEngine::generateFactoryManagerJson() const {
         auto factoryDoc = std::find_if(
             docs.begin(),
             docs.end(),
-            [&factoryInfo](const Documentation& d) {
-                return d.name == factoryInfo.name;
-            });
+            [&factoryInfo](const Documentation& d) { return d.name == factoryInfo.name; }
+        );
         if (factoryDoc != docs.end()) {
             nlohmann::json documentation = generateJsonDocumentation(*factoryDoc);
             factory[ClassesKey].push_back(documentation);
@@ -522,9 +521,8 @@ nlohmann::json DocumentationEngine::generateFactoryManagerJson() const {
             auto found = std::find_if(
                 docs.begin(),
                 docs.end(),
-                [&c](const Documentation& d) {
-                    return d.name == c;
-                });
+                [&c](const Documentation& d) { return d.name == c; }
+            );
             if (found != docs.end()) {
                 nlohmann::json documentation = generateJsonDocumentation(*found);
                 factory[ClassesKey].push_back(documentation);
@@ -582,9 +580,12 @@ nlohmann::json DocumentationEngine::generateKeybindingsJson() const {
 }
 
 nlohmann::json DocumentationEngine::generatePropertyOwnerJson(
-    properties::PropertyOwner* owner) const {
+                                                   properties::PropertyOwner* owner) const
+{
     ZoneScoped;
 
+    ghoul_assert(owner, "Owner must not be nullptr");
+
     nlohmann::json json;
     std::vector<properties::PropertyOwner*> subOwners = owner->propertySubOwners();
     for (properties::PropertyOwner* o : subOwners) {
@@ -653,9 +654,8 @@ void DocumentationEngine::writeDocumentation() const {
     nlohmann::json result;
     result[DocumentationKey] = documentation;
 
-    std::ofstream out(absPath("${DOCUMENTATION}/documentationData.js"));
+    std::ofstream out = std::ofstream(absPath("${DOCUMENTATION}/documentationData.js"));
     out << "var data = " << result.dump();
-    out.close();
 }
 
 nlohmann::json DocumentationEngine::generateActionJson() const {
diff --git a/src/engine/openspaceengine.cpp b/src/engine/openspaceengine.cpp
index 7b62746d0b..cd568f2e9f 100644
--- a/src/engine/openspaceengine.cpp
+++ b/src/engine/openspaceengine.cpp
@@ -773,7 +773,8 @@ void OpenSpaceEngine::loadAssets() {
 
     
     _writeDocumentationTask = std::async(
-        &documentation::DocumentationEngine::writeDocumentation, DocEng
+        &documentation::DocumentationEngine::writeDocumentation,
+        DocEng
     );
 
     LTRACE("OpenSpaceEngine::loadAsset(end)");
diff --git a/src/events/eventengine.cpp b/src/events/eventengine.cpp
index 1e6e303b93..087b55ff89 100644
--- a/src/events/eventengine.cpp
+++ b/src/events/eventengine.cpp
@@ -31,7 +31,7 @@
 
 namespace {
     constexpr std::string_view _loggerCat = "EventEngine";
-}
+} // namespace
 
 namespace openspace {
 
@@ -54,8 +54,7 @@ void EventEngine::postFrameCleanup() {
 #endif // _DEBUG
 }
 
-void EventEngine::registerEventAction(events::Event::Type type,
-                                      std::string identifier,
+void EventEngine::registerEventAction(events::Event::Type type, std::string identifier,
                                       std::optional<ghoul::Dictionary> filter)
 {
     ActionInfo ai;
@@ -171,7 +170,8 @@ std::vector<EventEngine::ActionInfo> EventEngine::registeredActions() const {
 }
 
 const std::unordered_map<events::Event::Type, std::vector<EventEngine::ActionInfo>>& const
-EventEngine::eventActions() const {
+EventEngine::eventActions() const
+{
     return _eventActions;
 }
 
diff --git a/src/interaction/actionmanager.cpp b/src/interaction/actionmanager.cpp
index a3900159ae..608ce69005 100644
--- a/src/interaction/actionmanager.cpp
+++ b/src/interaction/actionmanager.cpp
@@ -128,4 +128,5 @@ scripting::LuaLibrary ActionManager::luaLibrary() {
         }
     };
 }
+
 } // namespace openspace::interaction

From fc2d48fa06bc017f85f59ec007a13777391e3e79 Mon Sep 17 00:00:00 2001
From: Ylva Selling <ylva.selling@liu.se>
Date: Mon, 4 Mar 2024 14:14:23 +0100
Subject: [PATCH 298/701] Rename functions for consistency

---
 .../documentation/documentationengine.h       |  4 ++--
 .../server/src/topics/documentationtopic.cpp  |  2 +-
 src/documentation/documentationengine.cpp     | 22 +++++++++----------
 3 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/include/openspace/documentation/documentationengine.h b/include/openspace/documentation/documentationengine.h
index e690a4413a..392d36cf10 100644
--- a/include/openspace/documentation/documentationengine.h
+++ b/include/openspace/documentation/documentationengine.h
@@ -92,8 +92,8 @@ public:
     nlohmann::json generateFactoryManagerJson() const;
     nlohmann::json generateKeybindingsJson() const;
     nlohmann::json generatePropertyOwnerJson(properties::PropertyOwner* owner) const;
-    nlohmann::json generateLicensesGroupedByLicense() const;
-    nlohmann::json generateLicenseList() const;
+    nlohmann::json generateLicenseGroupsJson() const;
+    nlohmann::json generateLicenseListJson() const;
     nlohmann::json generateActionJson() const;
     nlohmann::json generateEventJson() const;
 
diff --git a/modules/server/src/topics/documentationtopic.cpp b/modules/server/src/topics/documentationtopic.cpp
index 344a35cce2..eb2467902e 100644
--- a/modules/server/src/topics/documentationtopic.cpp
+++ b/modules/server/src/topics/documentationtopic.cpp
@@ -58,7 +58,7 @@ void DocumentationTopic::handleJson(const nlohmann::json& json) {
         // TODO: Add asset documentation here
     }
     else if (requestedType == "meta") {
-        response = DocEng.generateLicenseList();
+        response = DocEng.generateLicenseListJson();
     }
 
     _connection->sendJson(wrappedPayload(response));
diff --git a/src/documentation/documentationengine.cpp b/src/documentation/documentationengine.cpp
index b4d8f9e8d3..f65fb810ad 100644
--- a/src/documentation/documentationengine.cpp
+++ b/src/documentation/documentationengine.cpp
@@ -131,7 +131,7 @@ namespace {
     constexpr const char* FiltersKey = "filters";
     constexpr const char* ActionsKey = "actions";
 
-    nlohmann::json generateJsonDocumentation(
+    nlohmann::json documentationToJson(
                                          const openspace::documentation::Documentation& d)
     {
         using namespace openspace::documentation;
@@ -177,7 +177,7 @@ namespace {
                 Documentation doc = { .entries = tv->documentations };
 
                 // Since this is a table we need to recurse this function to extract data
-                nlohmann::json restrictions = generateJsonDocumentation(doc);
+                nlohmann::json restrictions = documentationToJson(doc);
                 entry[RestrictionsKey] = restrictions;
             }
             else {
@@ -190,7 +190,7 @@ namespace {
         return json;
     }
 
-    nlohmann::json createPropertyJson(openspace::properties::PropertyOwner* owner) {
+    nlohmann::json propertyOwnerToJson(openspace::properties::PropertyOwner* owner) {
         ZoneScoped;
 
         using namespace openspace;
@@ -218,7 +218,7 @@ namespace {
 
         for (properties::PropertyOwner* o : owner->propertySubOwners()) {
             nlohmann::json propertyOwner;
-            json[PropertyOwnersKey].push_back(createPropertyJson(o));
+            json[PropertyOwnersKey].push_back(propertyOwnerToJson(o));
         }
         sortJson(json[PropertyOwnersKey], NameKey);
 
@@ -327,7 +327,7 @@ nlohmann::json DocumentationEngine::generateScriptEngineJson() const {
     return json;
 }
 
-nlohmann::json DocumentationEngine::generateLicensesGroupedByLicense() const {
+nlohmann::json DocumentationEngine::generateLicenseGroupsJson() const {
     nlohmann::json json;
 
     if (global::profile->meta.has_value()) {
@@ -393,7 +393,7 @@ nlohmann::json DocumentationEngine::generateLicensesGroupedByLicense() const {
     return result;
 }
 
-nlohmann::json DocumentationEngine::generateLicenseList() const {
+nlohmann::json DocumentationEngine::generateLicenseListJson() const {
     nlohmann::json json;
 
     if (global::profile->meta.has_value()) {
@@ -503,7 +503,7 @@ nlohmann::json DocumentationEngine::generateFactoryManagerJson() const {
             [&factoryInfo](const Documentation& d) { return d.name == factoryInfo.name; }
         );
         if (factoryDoc != docs.end()) {
-            nlohmann::json documentation = generateJsonDocumentation(*factoryDoc);
+            nlohmann::json documentation = documentationToJson(*factoryDoc);
             factory[ClassesKey].push_back(documentation);
             // Remove documentation from list check at the end if all docs got put in
             docs.erase(factoryDoc);
@@ -524,7 +524,7 @@ nlohmann::json DocumentationEngine::generateFactoryManagerJson() const {
                 [&c](const Documentation& d) { return d.name == c; }
             );
             if (found != docs.end()) {
-                nlohmann::json documentation = generateJsonDocumentation(*found);
+                nlohmann::json documentation = documentationToJson(*found);
                 factory[ClassesKey].push_back(documentation);
                 docs.erase(found);
             }
@@ -544,7 +544,7 @@ nlohmann::json DocumentationEngine::generateFactoryManagerJson() const {
     leftovers[IdentifierKey] = OtherIdentifierName;
 
     for (const Documentation& doc : docs) {
-        leftovers[ClassesKey].push_back(generateJsonDocumentation(doc));
+        leftovers[ClassesKey].push_back(documentationToJson(doc));
     }
     sortJson(leftovers[ClassesKey], NameKey);
     json.push_back(leftovers);
@@ -590,7 +590,7 @@ nlohmann::json DocumentationEngine::generatePropertyOwnerJson(
     std::vector<properties::PropertyOwner*> subOwners = owner->propertySubOwners();
     for (properties::PropertyOwner* o : subOwners) {
         if (o->identifier() != SceneTitle) {
-            nlohmann::json jsonOwner = createPropertyJson(o);
+            nlohmann::json jsonOwner = propertyOwnerToJson(o);
 
             json.push_back(jsonOwner);
         }
@@ -631,7 +631,7 @@ void DocumentationEngine::writeDocumentation() const {
     nlohmann::json scripting = generateScriptEngineJson();
     nlohmann::json factory = generateFactoryManagerJson();
     nlohmann::json keybindings = generateKeybindingsJson();
-    nlohmann::json license = generateLicensesGroupedByLicense();
+    nlohmann::json license = generateLicenseGroupsJson();
     nlohmann::json sceneProperties = settings.get();
     nlohmann::json sceneGraph = sceneJson.get();
     nlohmann::json actions = generateActionJson();

From 0454754762d9389709a5c17a2183b884b38e70df Mon Sep 17 00:00:00 2001
From: Ylva Selling <ylva.selling@liu.se>
Date: Mon, 4 Mar 2024 14:27:28 +0100
Subject: [PATCH 299/701] Move documentation json as it is more efficient

Discussed with @alexanderbock
---
 src/documentation/documentationengine.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/documentation/documentationengine.cpp b/src/documentation/documentationengine.cpp
index f65fb810ad..8cb394bf83 100644
--- a/src/documentation/documentationengine.cpp
+++ b/src/documentation/documentationengine.cpp
@@ -378,10 +378,10 @@ nlohmann::json DocumentationEngine::generateLicenseGroupsJson() const {
 
     using K = std::string;
     using V = nlohmann::json;
-    for (const std::pair<const K, V>& assetLicense : assetLicenses) {
+    for (std::pair<const K, V>& assetLicense : assetLicenses) {
         nlohmann::json entry;
         entry[NameKey] = assetLicense.first;
-        entry[AssetKey] = assetLicense.second;
+        entry[AssetKey] = std::move(assetLicense.second);
         sortJson(entry[AssetKey], NameKey);
         assetsJson[LicensesKey].push_back(entry);
     }

From e25f3d34f781a09c81537cf80cdf366b8e0952b7 Mon Sep 17 00:00:00 2001
From: Ylva Selling <ylva.selling@liu.se>
Date: Mon, 4 Mar 2024 14:28:59 +0100
Subject: [PATCH 300/701] Rename "Asset Types" to "Asset Components"

---
 src/documentation/documentationengine.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/documentation/documentationengine.cpp b/src/documentation/documentationengine.cpp
index 8cb394bf83..d3d769daa9 100644
--- a/src/documentation/documentationengine.cpp
+++ b/src/documentation/documentationengine.cpp
@@ -68,7 +68,7 @@ namespace {
     constexpr const char* CommandKey = "command";
 
     // Factory
-    constexpr const char* FactoryTitle = "Asset Types";
+    constexpr const char* FactoryTitle = "Asset Components";
     constexpr const char* MembersKey = "members";
     constexpr const char* OptionalKey = "optional";
     constexpr const char* ReferenceKey = "reference";

From 210e17b0bb607af7887b606e6d92ed8a33e025f8 Mon Sep 17 00:00:00 2001
From: GPayne <payne.gene@gmail.com>
Date: Mon, 4 Mar 2024 15:37:21 -0700
Subject: [PATCH 301/701] Replaced std::getline usages with new ghoul::getline

---
 .../src/profile/additionalscriptsdialog.cpp   |  3 +-
 .../launcher/src/profile/assettreemodel.cpp   |  3 +-
 apps/OpenSpace/ext/sgct                       |  2 +-
 ext/ghoul                                     |  2 +-
 include/openspace/network/messagestructures.h |  3 +-
 .../rendering/renderabledumeshes.cpp          |  9 ++--
 modules/exoplanets/exoplanetshelper.cpp       |  5 ++-
 modules/exoplanets/exoplanetsmodule_lua.inl   | 17 ++++----
 .../tasks/exoplanetsdatapreparationtask.cpp   | 29 ++++++-------
 .../rendering/renderablefieldlines.cpp        |  3 +-
 .../renderablefieldlinessequence.cpp          |  4 +-
 modules/fitsfilereader/src/fitsfilereader.cpp |  5 ++-
 modules/galaxy/rendering/renderablegalaxy.cpp |  7 ++--
 .../src/globelabelscomponent.cpp              | 19 +++++----
 modules/iswa/rendering/datacygnet.cpp         |  3 +-
 modules/iswa/rendering/iswakameleongroup.cpp  |  3 +-
 modules/iswa/util/dataprocessortext.cpp       | 13 +++---
 modules/iswa/util/iswamanager.cpp             |  9 ++--
 modules/space/horizonsfile.cpp                | 42 +++++++++----------
 modules/space/kepler.cpp                      | 12 +++---
 .../renderableconstellationbounds.cpp         |  3 +-
 .../renderableconstellationlines.cpp          | 12 +++---
 .../renderableconstellationsbase.cpp          |  4 +-
 .../space/rendering/renderablefluxnodes.cpp   |  5 ++-
 .../space/tasks/generatedebrisvolumetask.cpp  |  7 ++--
 .../util/hongkangparser.cpp                   |  2 +-
 .../util/instrumenttimesparser.cpp            |  3 +-
 .../util/labelparser.cpp                      |  5 ++-
 modules/sync/syncs/httpsynchronization.cpp    |  3 +-
 modules/sync/syncs/urlsynchronization.cpp     |  3 +-
 src/data/speckloader.cpp                      | 18 ++++----
 src/engine/downloadmanager.cpp                |  5 ++-
 src/interaction/sessionrecording.cpp          |  5 ++-
 .../tasks/convertrecformattask.cpp            |  5 ++-
 src/rendering/transferfunction.cpp            |  3 +-
 src/util/versionchecker.cpp                   |  6 +--
 36 files changed, 154 insertions(+), 128 deletions(-)

diff --git a/apps/OpenSpace/ext/launcher/src/profile/additionalscriptsdialog.cpp b/apps/OpenSpace/ext/launcher/src/profile/additionalscriptsdialog.cpp
index 32638b74a5..6686846304 100644
--- a/apps/OpenSpace/ext/launcher/src/profile/additionalscriptsdialog.cpp
+++ b/apps/OpenSpace/ext/launcher/src/profile/additionalscriptsdialog.cpp
@@ -26,6 +26,7 @@
 
 #include "profile/line.h"
 #include "profile/scriptlogdialog.h"
+#include <ghoul/misc/stringhelper.h>
 #include <openspace/scene/profile.h>
 #include <QDialogButtonBox>
 #include <QHBoxLayout>
@@ -93,7 +94,7 @@ void AdditionalScriptsDialog::parseScript() {
     std::istringstream iss(_textScripts->toPlainText().toStdString());
     while (!iss.eof()) {
         std::string s;
-        std::getline(iss, s);
+        ghoul::getline(iss, s);
         additionalScripts.push_back(std::move(s));
     }
     *_scripts = std::move(additionalScripts);
diff --git a/apps/OpenSpace/ext/launcher/src/profile/assettreemodel.cpp b/apps/OpenSpace/ext/launcher/src/profile/assettreemodel.cpp
index 50b24fd755..44bb986ef1 100644
--- a/apps/OpenSpace/ext/launcher/src/profile/assettreemodel.cpp
+++ b/apps/OpenSpace/ext/launcher/src/profile/assettreemodel.cpp
@@ -25,6 +25,7 @@
 #include "profile/assettreeitem.h"
 #include "profile/assettreemodel.h"
 #include "filesystemaccess.h"
+#include <ghoul/misc/stringhelper.h>
 #include <sstream>
 #include <QColor>
 
@@ -58,7 +59,7 @@ namespace {
     }
 
     bool importGetNextLine(ImportElement& elem, std::istringstream& iss) {
-        std::getline(iss, elem.line);
+        ghoul::getline(iss, elem.line);
         const bool ok = iss.good();
         if (!ok) {
             elem.line = "";
diff --git a/apps/OpenSpace/ext/sgct b/apps/OpenSpace/ext/sgct
index 377de30963..3ace983eea 160000
--- a/apps/OpenSpace/ext/sgct
+++ b/apps/OpenSpace/ext/sgct
@@ -1 +1 @@
-Subproject commit 377de309631d8a1c9b53becd363db0dc8ee76ae6
+Subproject commit 3ace983eeaa235b3a105abb238b4d844244a427b
diff --git a/ext/ghoul b/ext/ghoul
index 2905908df8..f830834a74 160000
--- a/ext/ghoul
+++ b/ext/ghoul
@@ -1 +1 @@
-Subproject commit 2905908df8dc4f6fc025f4f73834819706b3afe0
+Subproject commit f830834a74e174f034a40778428eab1bfb04c85a
diff --git a/include/openspace/network/messagestructures.h b/include/openspace/network/messagestructures.h
index ff20ee9425..e13a3d7d9c 100644
--- a/include/openspace/network/messagestructures.h
+++ b/include/openspace/network/messagestructures.h
@@ -28,6 +28,7 @@
 #include <ghoul/fmt.h>
 #include <ghoul/glm.h>
 #include <ghoul/logging/logmanager.h>
+#include <ghoul/misc/stringhelper.h>
 #include <algorithm>
 #include <cstring>
 #include <fstream>
@@ -468,7 +469,7 @@ struct ScriptMessage {
         std::string tmpReadbackScript;
         _script.erase();
         for (int i = 0; i < numScriptLines; ++i) {
-            std::getline(iss, tmpReadbackScript);
+            ghoul::getline(iss, tmpReadbackScript);
             size_t start = tmpReadbackScript.find_first_not_of(" ");
             tmpReadbackScript = tmpReadbackScript.substr(start);
             _script.append(tmpReadbackScript);
diff --git a/modules/digitaluniverse/rendering/renderabledumeshes.cpp b/modules/digitaluniverse/rendering/renderabledumeshes.cpp
index 6037e07b95..784db02c3a 100644
--- a/modules/digitaluniverse/rendering/renderabledumeshes.cpp
+++ b/modules/digitaluniverse/rendering/renderabledumeshes.cpp
@@ -35,6 +35,7 @@
 #include <ghoul/filesystem/filesystem.h>
 #include <ghoul/font/fontmanager.h>
 #include <ghoul/font/fontrenderer.h>
+#include <ghoul/misc/stringhelper.h>
 #include <ghoul/misc/templatefactory.h>
 #include <ghoul/io/texture/texturereader.h>
 #include <ghoul/logging/logmanager.h>
@@ -482,7 +483,7 @@ bool RenderableDUMeshes::readSpeckFile() {
     // (signaled by the keywords 'datavar', 'texturevar', and 'texture')
     std::string line;
     while (true) {
-        std::getline(file, line);
+        ghoul::getline(file, line);
 
         if (file.eof()) {
             break;
@@ -547,13 +548,13 @@ bool RenderableDUMeshes::readSpeckFile() {
                 str >> dummy;
             } while (dummy != "{");
 
-            std::getline(file, line);
+            ghoul::getline(file, line);
             std::stringstream dim(line);
             dim >> mesh.numU >> mesh.numV;
 
             // We can now read the vertices data:
             for (int l = 0; l < mesh.numU * mesh.numV; ++l) {
-                std::getline(file, line);
+                ghoul::getline(file, line);
                 if (line.substr(0, 1) == "}") {
                     break;
                 }
@@ -605,7 +606,7 @@ bool RenderableDUMeshes::readSpeckFile() {
                 //}
             }
 
-            std::getline(file, line);
+            ghoul::getline(file, line);
             if (line.substr(0, 1) == "}") {
                 _renderingMeshesMap.insert({ meshIndex++, mesh });
             }
diff --git a/modules/exoplanets/exoplanetshelper.cpp b/modules/exoplanets/exoplanetshelper.cpp
index 130e1581e4..5176f23828 100644
--- a/modules/exoplanets/exoplanetshelper.cpp
+++ b/modules/exoplanets/exoplanetshelper.cpp
@@ -31,6 +31,7 @@
 #include <ghoul/filesystem/filesystem.h>
 #include <ghoul/fmt.h>
 #include <ghoul/logging/logmanager.h>
+#include <ghoul/misc/stringhelper.h>
 #include <glm/gtx/quaternion.hpp>
 #include <glm/gtx/transform.hpp>
 #include <string_view>
@@ -72,7 +73,7 @@ glm::vec3 computeStarColor(float bv) {
 
     // Interpret the colormap cmap file
     std::string line;
-    while (std::getline(colorMap, line)) {
+    while (ghoul::getline(colorMap, line)) {
         if (line.empty() || (line[0] == '#')) {
             continue;
         }
@@ -88,7 +89,7 @@ glm::vec3 computeStarColor(float bv) {
     const int t = static_cast<int>(round(((bv + 0.4) / (2.0 + 0.4)) * (nValues - 1)));
     std::string color;
     for (int i = 0; i < t + 1; i++) {
-        std::getline(colorMap, color);
+        ghoul::getline(colorMap, color);
     }
     colorMap.close();
 
diff --git a/modules/exoplanets/exoplanetsmodule_lua.inl b/modules/exoplanets/exoplanetsmodule_lua.inl
index 4d78edbf45..cb6acf6cca 100644
--- a/modules/exoplanets/exoplanetsmodule_lua.inl
+++ b/modules/exoplanets/exoplanetsmodule_lua.inl
@@ -24,6 +24,7 @@
 
 #include <openspace/scene/scene.h>
 #include <ghoul/misc/csvreader.h>
+#include <ghoul/misc/stringhelper.h>
 #include <algorithm>
 #include <map>
 #include <string>
@@ -71,17 +72,17 @@ openspace::exoplanets::ExoplanetSystem findExoplanetSystemInData(
     // 3. read sizeof(exoplanet) bytes into an exoplanet object.
     ExoplanetDataEntry p;
     std::string line;
-    while (std::getline(lut, line)) {
+    while (ghoul::getline(lut, line)) {
         std::istringstream ss(line);
         std::string name;
-        std::getline(ss, name, ',');
+        ghoul::getline(ss, name, ',');
 
         if (name.substr(0, name.length() - 2) != starName) {
             continue;
         }
 
         std::string location_s;
-        std::getline(ss, location_s);
+        ghoul::getline(ss, location_s);
         long location = std::stol(location_s.c_str());
 
         data.seekg(location);
@@ -576,7 +577,7 @@ std::vector<std::string> hostStarsWithSufficientData() {
 
     // Read number of lines
     int nExoplanets = 0;
-    while (std::getline(lookupTableFile, line)) {
+    while (ghoul::getline(lookupTableFile, line)) {
         ++nExoplanets;
     }
     lookupTableFile.clear();
@@ -584,17 +585,17 @@ std::vector<std::string> hostStarsWithSufficientData() {
     names.reserve(nExoplanets);
 
     ExoplanetDataEntry p;
-    while (std::getline(lookupTableFile, line)) {
+    while (ghoul::getline(lookupTableFile, line)) {
         std::stringstream ss(line);
         std::string name;
-        std::getline(ss, name, ',');
+        ghoul::getline(ss, name, ',');
         // Remove the last two characters, that specify the planet
         name = name.substr(0, name.size() - 2);
 
         // Don't want to list systems where there is not enough data to visualize.
         // So, test if there is before adding the name to the list.
         std::string location_s;
-        std::getline(ss, location_s);
+        ghoul::getline(ss, location_s);
         long location = std::stol(location_s.c_str());
 
         data.seekg(location);
@@ -737,7 +738,7 @@ listOfExoplanetsDeprecated()
 
     // Parse the file line by line to compose system information
     std::string row;
-    while (std::getline(inputDataFile, row)) {
+    while (ghoul::getline(inputDataFile, row)) {
         PlanetData planetData = ExoplanetsDataPreparationTask::parseDataRow(
             row,
             columnNames,
diff --git a/modules/exoplanets/tasks/exoplanetsdatapreparationtask.cpp b/modules/exoplanets/tasks/exoplanetsdatapreparationtask.cpp
index 746b422d91..45e66d07fa 100644
--- a/modules/exoplanets/tasks/exoplanetsdatapreparationtask.cpp
+++ b/modules/exoplanets/tasks/exoplanetsdatapreparationtask.cpp
@@ -33,6 +33,7 @@
 #include <ghoul/glm.h>
 #include <ghoul/logging/logmanager.h>
 #include <ghoul/misc/dictionary.h>
+#include <ghoul/misc/stringhelper.h>
 #include <charconv>
 #include <filesystem>
 #include <fstream>
@@ -146,7 +147,7 @@ void ExoplanetsDataPreparationTask::perform(
     // Read total number of items
     int total = 0;
     std::string row;
-    while (std::getline(inputDataFile, row)) {
+    while (ghoul::getline(inputDataFile, row)) {
         ++total;
     }
     inputDataFile.clear();
@@ -159,7 +160,7 @@ void ExoplanetsDataPreparationTask::perform(
     LINFO(fmt::format("Loading {} exoplanets", total));
 
     int exoplanetCount = 0;
-    while (std::getline(inputDataFile, row)) {
+    while (ghoul::getline(inputDataFile, row)) {
         ++exoplanetCount;
         progressCallback(static_cast<float>(exoplanetCount) / static_cast<float>(total));
 
@@ -190,7 +191,7 @@ ExoplanetsDataPreparationTask::readFirstDataRow(std::ifstream& file)
     std::string line;
 
     // Read past any comments and empty lines
-    while (std::getline(file, line)) {
+    while (ghoul::getline(file, line)) {
         bool shouldSkip = line.empty() || line[0] == '#';
         if (!shouldSkip) {
             break;
@@ -201,7 +202,7 @@ ExoplanetsDataPreparationTask::readFirstDataRow(std::ifstream& file)
     std::vector<std::string> columnNames;
     std::stringstream sStream(line);
     std::string colName;
-    while (std::getline(sStream, colName, ',')) {
+    while (ghoul::getline(sStream, colName, ',')) {
         columnNames.push_back(colName);
     }
 
@@ -270,7 +271,7 @@ ExoplanetsDataPreparationTask::parseDataRow(std::string row,
     std::string name;
 
     std::string data;
-    while (std::getline(lineStream, data, ',')) {
+    while (ghoul::getline(lineStream, data, ',')) {
         const std::string& column = columnNames[columnIndex];
         columnIndex++;
 
@@ -457,7 +458,7 @@ glm::vec3 ExoplanetsDataPreparationTask::starPosition(const std::string& starNam
     }
 
     std::string line;
-    while (std::getline(exoplanetsFile, line)) {
+    while (ghoul::getline(exoplanetsFile, line)) {
         bool shouldSkipLine = (
             line.empty() || line[0] == '#' || line.substr(0, 7) == "datavar" ||
             line.substr(0, 10) == "texturevar" || line.substr(0, 7) == "texture"
@@ -470,18 +471,18 @@ glm::vec3 ExoplanetsDataPreparationTask::starPosition(const std::string& starNam
         std::string data;
         std::string name;
         std::istringstream linestream(line);
-        std::getline(linestream, data, '#');
-        std::getline(linestream, name);
+        ghoul::getline(linestream, data, '#');
+        ghoul::getline(linestream, name);
         name.erase(0, 1);
 
         std::string coord;
         if (name == starName) {
             std::stringstream dataStream(data);
-            std::getline(dataStream, coord, ' ');
+            ghoul::getline(dataStream, coord, ' ');
             position[0] = std::stof(coord.c_str(), nullptr);
-            std::getline(dataStream, coord, ' ');
+            ghoul::getline(dataStream, coord, ' ');
             position[1] = std::stof(coord.c_str(), nullptr);
-            std::getline(dataStream, coord, ' ');
+            ghoul::getline(dataStream, coord, ' ');
             position[2] = std::stof(coord.c_str(), nullptr);
             break;
         }
@@ -511,12 +512,12 @@ float ExoplanetsDataPreparationTask::bvFromTeff(float teff,
     float teffLower = 0.f;
     float teffUpper;
     std::string row;
-    while (std::getline(teffToBvFile, row)) {
+    while (ghoul::getline(teffToBvFile, row)) {
         std::istringstream lineStream(row);
         std::string teffString;
-        std::getline(lineStream, teffString, ',');
+        ghoul::getline(lineStream, teffString, ',');
         std::string bvString;
-        std::getline(lineStream, bvString);
+        ghoul::getline(lineStream, bvString);
 
         float teffCurrent = std::stof(teffString.c_str(), nullptr);
         float bvCurrent = std::stof(bvString.c_str(), nullptr);
diff --git a/modules/fieldlines/rendering/renderablefieldlines.cpp b/modules/fieldlines/rendering/renderablefieldlines.cpp
index 919310d3e6..914cf89a18 100644
--- a/modules/fieldlines/rendering/renderablefieldlines.cpp
+++ b/modules/fieldlines/rendering/renderablefieldlines.cpp
@@ -33,6 +33,7 @@
 #include <ghoul/filesystem/filesystem.h>
 #include <ghoul/logging/logmanager.h>
 #include <ghoul/misc/assert.h>
+#include <ghoul/misc/stringhelper.h>
 #include <ghoul/opengl/programobject.h>
 #include <fstream>
 
@@ -372,7 +373,7 @@ void RenderableFieldlines::loadSeedPointsFromFile() {
         ));
     else {
         std::string line;
-        while (std::getline(seedFile, line)) {
+        while (ghoul::getline(seedFile, line)) {
             std::stringstream s(line);
 
             glm::vec3 point;
diff --git a/modules/fieldlinessequence/rendering/renderablefieldlinessequence.cpp b/modules/fieldlinessequence/rendering/renderablefieldlinessequence.cpp
index a40f28615d..428e2917bd 100644
--- a/modules/fieldlinessequence/rendering/renderablefieldlinessequence.cpp
+++ b/modules/fieldlinessequence/rendering/renderablefieldlinessequence.cpp
@@ -877,7 +877,7 @@ std::unordered_map<std::string, std::vector<glm::vec3>>
         LDEBUG(fmt::format("Reading seed points from file '{}'", seedFilePath));
         std::string line;
         std::vector<glm::vec3> outVec;
-        while (std::getline(seedFile, line)) {
+        while (ghoul::getline(seedFile, line)) {
             std::stringstream ss(line);
             glm::vec3 point;
             ss >> point.x;
@@ -916,7 +916,7 @@ std::vector<std::string>
             std::istringstream ss(str.substr(2, str.size() - 4));
             std::string magVar;
             size_t counter = 0;
-            while (std::getline(ss, magVar, ',')) {
+            while (ghoul::getline(ss, magVar, ',')) {
                 magVar.erase(
                     std::remove_if(
                         magVar.begin(),
diff --git a/modules/fitsfilereader/src/fitsfilereader.cpp b/modules/fitsfilereader/src/fitsfilereader.cpp
index fa90651c72..c424ffb3bc 100644
--- a/modules/fitsfilereader/src/fitsfilereader.cpp
+++ b/modules/fitsfilereader/src/fitsfilereader.cpp
@@ -28,6 +28,7 @@
 #include <ghoul/fmt.h>
 #include <ghoul/logging/logmanager.h>
 #include <ghoul/misc/dictionary.h>
+#include <ghoul/misc/stringhelper.h>
 #include <fstream>
 
 #ifdef WIN32
@@ -544,7 +545,7 @@ std::vector<float> FitsFileReader::readSpeckFile(const std::filesystem::path& fi
     std::string line;
     while (true) {
         std::streampos position = fileStream.tellg();
-        std::getline(fileStream, line);
+        ghoul::getline(fileStream, line);
 
         if (line.empty() || line[0] == '#') {
             continue;
@@ -597,7 +598,7 @@ std::vector<float> FitsFileReader::readSpeckFile(const std::filesystem::path& fi
         std::vector<float> readValues(nValuesPerStar);
         nStars++;
 
-        std::getline(fileStream, line);
+        ghoul::getline(fileStream, line);
         std::stringstream str(line);
 
         // Read values.
diff --git a/modules/galaxy/rendering/renderablegalaxy.cpp b/modules/galaxy/rendering/renderablegalaxy.cpp
index 1e4b162861..b68fb72ece 100644
--- a/modules/galaxy/rendering/renderablegalaxy.cpp
+++ b/modules/galaxy/rendering/renderablegalaxy.cpp
@@ -42,6 +42,7 @@
 #include <ghoul/io/texture/texturereader.h>
 #include <ghoul/logging/logmanager.h>
 #include <ghoul/misc/profiling.h>
+#include <ghoul/misc/stringhelper.h>
 #include <ghoul/opengl/ghoul_gl.h>
 #include <ghoul/opengl/openglstatecache.h>
 #include <ghoul/opengl/programobject.h>
@@ -736,10 +737,10 @@ RenderableGalaxy::Result RenderableGalaxy::loadPointFile() {
 
     // Read header for OFF (Object File Format)
     std::string line;
-    std::getline(pointFile, line);
+    ghoul::getline(pointFile, line);
 
     // Read point count
-    std::getline(pointFile, line);
+    ghoul::getline(pointFile, line);
     std::istringstream iss(line);
     iss >> nPoints;
 
@@ -752,7 +753,7 @@ RenderableGalaxy::Result RenderableGalaxy::loadPointFile() {
         ++i)
     {
         float x, y, z, r, g, b, a;
-        std::getline(pointFile, line);
+        ghoul::getline(pointFile, line);
         std::istringstream issp(line);
         issp >> x >> y >> z >> r >> g >> b >> a;
 
diff --git a/modules/globebrowsing/src/globelabelscomponent.cpp b/modules/globebrowsing/src/globelabelscomponent.cpp
index 0755f28901..d546937bfc 100644
--- a/modules/globebrowsing/src/globelabelscomponent.cpp
+++ b/modules/globebrowsing/src/globelabelscomponent.cpp
@@ -40,6 +40,7 @@
 #include <ghoul/logging/logmanager.h>
 #include <ghoul/misc/dictionary.h>
 #include <ghoul/misc/profiling.h>
+#include <ghoul/misc/stringhelper.h>
 #include <ghoul/opengl/programobject.h>
 #include <cstdlib>
 #include <filesystem>
@@ -359,14 +360,14 @@ bool GlobeLabelsComponent::readLabelsFile(const std::filesystem::path& file) {
 
         std::string sline;
         while (!csvLabelFile.eof()) {
-            std::getline(csvLabelFile, sline);
+            ghoul::getline(csvLabelFile, sline);
             if (sline.size() <= 10) {
                 continue;
             }
 
             std::istringstream iss(sline);
             std::string token;
-            std::getline(iss, token, ',');
+            ghoul::getline(iss, token, ',');
 
             // First line is just the Header
             if (token == "Feature_Name") {
@@ -392,18 +393,18 @@ bool GlobeLabelsComponent::readLabelsFile(const std::filesystem::path& file) {
                 tokenChar++;
             }
 
-            std::getline(iss, token, ','); // Target is not used
+            ghoul::getline(iss, token, ','); // Target is not used
 
-            std::getline(iss, token, ','); // Diameter
+            ghoul::getline(iss, token, ','); // Diameter
             lEntry.diameter = std::stof(token);
 
-            std::getline(iss, token, ','); // Latitude
+            ghoul::getline(iss, token, ','); // Latitude
             lEntry.latitude = std::stof(token);
 
-            std::getline(iss, token, ','); // Longitude
+            ghoul::getline(iss, token, ','); // Longitude
             lEntry.longitude = std::stof(token);
 
-            std::getline(iss, token, ','); // Coord System
+            ghoul::getline(iss, token, ','); // Coord System
             std::string coordinateSystem(token);
             std::size_t found = coordinateSystem.find("West");
             if (found != std::string::npos) {
@@ -412,9 +413,9 @@ bool GlobeLabelsComponent::readLabelsFile(const std::filesystem::path& file) {
 
             // Clean white spaces
             std::istringstream issFeature(lEntry.feature);
-            std::getline(issFeature, token, '=');
+            ghoul::getline(issFeature, token, '=');
             if (token.empty()) {
-                std::getline(issFeature, token, '=');
+                ghoul::getline(issFeature, token, '=');
             }
             strncpy(lEntry.feature, token.c_str(), 255);
 
diff --git a/modules/iswa/rendering/datacygnet.cpp b/modules/iswa/rendering/datacygnet.cpp
index 5a63ce85a2..fcf4b46001 100644
--- a/modules/iswa/rendering/datacygnet.cpp
+++ b/modules/iswa/rendering/datacygnet.cpp
@@ -30,6 +30,7 @@
 #include <openspace/rendering/transferfunction.h>
 #include <ghoul/filesystem/filesystem.h>
 #include <ghoul/logging/logmanager.h>
+#include <ghoul/misc/stringhelper.h>
 #include <ghoul/opengl/programobject.h>
 #include <ghoul/opengl/texture.h>
 #include <ghoul/opengl/textureunit.h>
@@ -279,7 +280,7 @@ void DataCygnet::readTransferFunctions(std::string tfPath) {
 
     if (tfFile.is_open()) {
         std::string line;
-        while (getline(tfFile, line)) {
+        while (ghoul::getline(tfFile, line)) {
             tfs.emplace_back(absPath(line).string());
         }
 
diff --git a/modules/iswa/rendering/iswakameleongroup.cpp b/modules/iswa/rendering/iswakameleongroup.cpp
index dab593a60d..9da5ae9038 100644
--- a/modules/iswa/rendering/iswakameleongroup.cpp
+++ b/modules/iswa/rendering/iswakameleongroup.cpp
@@ -29,6 +29,7 @@
 #include <openspace/engine/globals.h>
 #include <openspace/scripting/scriptengine.h>
 #include <ghoul/logging/logmanager.h>
+#include <ghoul/misc/stringhelper.h>
 #include <fstream>
 
 namespace {
@@ -109,7 +110,7 @@ void IswaKameleonGroup::readFieldlinePaths(const std::string& indexFile) {
     else {
         std::string line;
         std::string fileContent;
-        while (std::getline(seedFile, line)) {
+        while (ghoul::getline(seedFile, line)) {
             fileContent += line;
         }
 
diff --git a/modules/iswa/util/dataprocessortext.cpp b/modules/iswa/util/dataprocessortext.cpp
index 99c2ed623c..38330482b1 100644
--- a/modules/iswa/util/dataprocessortext.cpp
+++ b/modules/iswa/util/dataprocessortext.cpp
@@ -26,6 +26,7 @@
 
 #include <openspace/properties/selectionproperty.h>
 #include <openspace/util/histogram.h>
+#include <ghoul/misc/stringhelper.h>
 #include <algorithm>
 #include <sstream>
 
@@ -51,21 +52,21 @@ std::vector<std::string> DataProcessorText::readMetadata(const std::string& data
     std::vector<std::string> options;
     std::string line;
     std::stringstream memorystream(data);
-    while (getline(memorystream, line)) {
+    while (ghoul::getline(memorystream, line)) {
         if (line.find(info) == 0) {
             line = line.substr(info.size());
             std::stringstream ss(line);
 
             std::string token;
-            getline(ss, token, 'x');
+            ghoul::getline(ss, token, 'x');
             const int x = std::stoi(token);
 
-            getline(ss, token, '=');
+            ghoul::getline(ss, token, '=');
             const int y = std::stoi(token);
 
             dimensions = glm::size3_t(x, y, 1);
 
-            getline(memorystream, line);
+            ghoul::getline(memorystream, line);
             line = line.substr(1); //because of the # char
 
             ss = std::stringstream(line);
@@ -98,7 +99,7 @@ void DataProcessorText::addDataValues(const std::string& data,
     std::vector<std::vector<float>> optionValues(numOptions);
 
     // for each data point
-    while (getline(memorystream, line)) {
+    while (ghoul::getline(memorystream, line)) {
         if (!line.empty() && line[0] == '#') {
             continue;
         }
@@ -170,7 +171,7 @@ std::vector<float*> DataProcessorText::processData(const std::string& data,
     }
 
     int numValues = 0;
-    while (getline(memorystream, line)) {
+    while (ghoul::getline(memorystream, line)) {
         if (!line.empty() && line[0] == '#') {
             continue;
         }
diff --git a/modules/iswa/util/iswamanager.cpp b/modules/iswa/util/iswamanager.cpp
index 6b3d86d121..75dd5d3c46 100644
--- a/modules/iswa/util/iswamanager.cpp
+++ b/modules/iswa/util/iswamanager.cpp
@@ -44,6 +44,7 @@
 #include <ghoul/filesystem/filesystem.h>
 #include <ghoul/logging/logmanager.h>
 #include <ghoul/misc/constexpr.h>
+#include <ghoul/misc/stringhelper.h>
 #include <filesystem>
 #include <fstream>
 
@@ -273,13 +274,13 @@ std::string IswaManager::iswaUrl(int id, double timestamp, const std::string& ty
     ss << SpiceManager::ref().dateFromEphemerisTime(timestamp);;
     std::string token;
 
-    std::getline(ss, token, ' ');
+    ghoul::getline(ss, token, ' ');
     url += token + "-";
-    std::getline(ss, token, ' ');
+    ghoul::getline(ss, token, ' ');
     url = fmt::format("{}{}-", url, monthNumber(token));
-    std::getline(ss, token, 'T');
+    ghoul::getline(ss, token, 'T');
     url += token + "%20";
-    std::getline(ss, token, '.');
+    ghoul::getline(ss, token, '.');
     url += token;
 
     return url;
diff --git a/modules/space/horizonsfile.cpp b/modules/space/horizonsfile.cpp
index efb5036811..8e88399b8b 100644
--- a/modules/space/horizonsfile.cpp
+++ b/modules/space/horizonsfile.cpp
@@ -258,8 +258,8 @@ HorizonsResultCode isValidHorizonsFile(std::filesystem::path file) {
     // The line $$SOE indicates start of data.
     std::string line;
     bool foundTarget = false;
-    std::getline(fileStream, line);
-    std::getline(fileStream, line); // First line is just stars (*) no information, skip
+    ghoul::getline(fileStream, line);
+    ghoul::getline(fileStream, line); // First line is just stars (*) no information, skip
 
     // @CPP23 (malej, 2022-04-08) In all cases below, the string function contains
     // should be used instead of find
@@ -338,7 +338,7 @@ HorizonsResultCode isValidHorizonsFile(std::filesystem::path file) {
             return HorizonsResultCode::ErrorNoTarget;
         }
 
-        std::getline(fileStream, line);
+        ghoul::getline(fileStream, line);
     }
 
     if (result != HorizonsResultCode::UnknownError) {
@@ -505,14 +505,14 @@ HorizonsResult readHorizonsFile(std::filesystem::path file) {
     //   X     Y     Z
     // " Before data starts, Observer table doesn't
     std::string line;
-    std::getline(fileStream, line);
+    ghoul::getline(fileStream, line);
     while (line[0] != '$') {
         if (line.starts_with("JDTDB")) {
             fileStream.close();
             return readHorizonsVectorFile(file);
         }
 
-        std::getline(fileStream, line);
+        ghoul::getline(fileStream, line);
     }
 
     fileStream.close();
@@ -536,12 +536,12 @@ HorizonsResult readHorizonsVectorFile(std::filesystem::path file) {
     // the row marked by $$SOE (i.e. Start Of Ephemerides).
     std::string line;
     do {
-        std::getline(fileStream, line);
+        ghoul::getline(fileStream, line);
     } while (line[0] != '$');
 
     // Read data line by line until $$EOE (i.e. End Of Ephemerides).
     // Skip the rest of the file.
-    std::getline(fileStream, line); // Skip the line with the $$EOE
+    ghoul::getline(fileStream, line); // Skip the line with the $$EOE
     while (line[0] != '$') {
         HorizonsKeyframe dataPoint;
         std::stringstream str1(line);
@@ -555,7 +555,7 @@ HorizonsResult readHorizonsVectorFile(std::filesystem::path file) {
         str1 >> temp >> temp >> temp >> date >> time >> temp;
 
         // Get next line of same data point
-        std::getline(fileStream, line);
+        ghoul::getline(fileStream, line);
         if (!fileStream.good()) {
             LERROR(fmt::format("Malformed Horizons file '{}'", file));
             return HorizonsResult();
@@ -581,7 +581,7 @@ HorizonsResult readHorizonsVectorFile(std::filesystem::path file) {
         dataPoint.position = pos;
         data.push_back(dataPoint);
 
-        std::getline(fileStream, line);
+        ghoul::getline(fileStream, line);
     }
 
     result.data = data;
@@ -605,12 +605,12 @@ HorizonsResult readHorizonsObserverFile(std::filesystem::path file) {
     // the row marked by $$SOE (i.e. Start Of Ephemerides).
     std::string line;
     do {
-        std::getline(fileStream, line);
+        ghoul::getline(fileStream, line);
     } while (line[0] != '$');
 
     // Read data line by line until $$EOE (i.e. End Of Ephemerides).
     // Skip the rest of the file.
-    std::getline(fileStream, line); // Skip the line with the $$EOE
+    ghoul::getline(fileStream, line); // Skip the line with the $$EOE
     while (line[0] != '$') {
         HorizonsKeyframe dataPoint;
         std::stringstream str(line);
@@ -644,7 +644,7 @@ HorizonsResult readHorizonsObserverFile(std::filesystem::path file) {
         dataPoint.position = gPos;
         data.push_back(dataPoint);
 
-        std::getline(fileStream, line);
+        ghoul::getline(fileStream, line);
     }
 
     LWARNING(
@@ -686,7 +686,7 @@ std::vector<std::string> HorizonsFile::parseMatches(const std::string& startPhra
             break;
         }
 
-        std::getline(fileStream, line);
+        ghoul::getline(fileStream, line);
     }
 
     if (!fileStream.good()) {
@@ -695,8 +695,8 @@ std::vector<std::string> HorizonsFile::parseMatches(const std::string& startPhra
     }
 
     // There will be one empty line before the list of matches, skip
-    std::getline(fileStream, line);
-    std::getline(fileStream, line);
+    ghoul::getline(fileStream, line);
+    ghoul::getline(fileStream, line);
     while (fileStream.good()) {
         // End of matches or file
         if (line == " " || line.empty() || line.find(endPhrase) != std::string::npos) {
@@ -705,7 +705,7 @@ std::vector<std::string> HorizonsFile::parseMatches(const std::string& startPhra
         }
 
         matches.push_back(line);
-        std::getline(fileStream, line);
+        ghoul::getline(fileStream, line);
     }
 
     fileStream.close();
@@ -756,7 +756,7 @@ std::pair<std::string, std::string> HorizonsFile::parseValidTimeRange(
 
     // Ignore everything until head of time range list
     std::string line;
-    std::getline(fileStream, line);
+    ghoul::getline(fileStream, line);
     while (fileStream.good()) {
         // Add the line with the start phrase first, to give context
         if (line.find(startPhrase) != std::string::npos) {
@@ -768,7 +768,7 @@ std::pair<std::string, std::string> HorizonsFile::parseValidTimeRange(
             break;
         }
 
-        std::getline(fileStream, line);
+        ghoul::getline(fileStream, line);
     }
 
     if (!fileStream.good()) {
@@ -776,12 +776,12 @@ std::pair<std::string, std::string> HorizonsFile::parseValidTimeRange(
     }
 
     // There will be one empty line before the list of time ranges, skip
-    std::getline(fileStream, line);
+    ghoul::getline(fileStream, line);
 
     // In the first file parse both start and end time
     // From the first line get the start time
     std::string startTime, endTime;
-    std::getline(fileStream, line);
+    ghoul::getline(fileStream, line);
     if (fileStream.good()) {
         std::stringstream str(line);
 
@@ -845,7 +845,7 @@ std::pair<std::string, std::string> HorizonsFile::parseValidTimeRange(
             return { "", "" };
         }
 
-        std::getline(fileStream, line);
+        ghoul::getline(fileStream, line);
     }
 
     return { "", "" };
diff --git a/modules/space/kepler.cpp b/modules/space/kepler.cpp
index 0e6ca11493..07c677134f 100644
--- a/modules/space/kepler.cpp
+++ b/modules/space/kepler.cpp
@@ -396,7 +396,7 @@ std::vector<Parameters> readTleFile(std::filesystem::path file) {
     int lineNum = 1;
 
     std::string header;
-    while (std::getline(f, header)) {
+    while (ghoul::getline(f, header)) {
         Parameters p;
 
         // Header
@@ -419,7 +419,7 @@ std::vector<Parameters> readTleFile(std::filesystem::path file) {
         //    13   65-68   Element set  number.Incremented when a new TLE is generated
         //    14   69-69   Checksum (modulo 10)
         std::string firstLine;
-        std::getline(f, firstLine);
+        ghoul::getline(f, firstLine);
         if (f.bad() || firstLine[0] != '1') {
             throw ghoul::RuntimeError(fmt::format(
                 "Malformed TLE file '{}' at line {}", file, lineNum + 1
@@ -451,7 +451,7 @@ std::vector<Parameters> readTleFile(std::filesystem::path file) {
         //     9      64-68   Revolution number at epoch (revolutions)
         //    10      69-69   Checksum (modulo 10)
         std::string secondLine;
-        std::getline(f, secondLine);
+        ghoul::getline(f, secondLine);
         if (f.bad() || secondLine[0] != '2') {
             throw ghoul::RuntimeError(fmt::format(
                 "Malformed TLE file '{}' at line {}", file, lineNum + 1
@@ -513,7 +513,7 @@ std::vector<Parameters> readOmmFile(std::filesystem::path file) {
     int lineNum = 1;
     std::optional<Parameters> current = std::nullopt;
     std::string line;
-    while (std::getline(f, line)) {
+    while (ghoul::getline(f, line)) {
         if (line.empty() || line == "\r") {
             continue;
         }
@@ -604,7 +604,7 @@ std::vector<Parameters> readSbdbFile(std::filesystem::path file) {
     f.open(file);
 
     std::string line;
-    std::getline(f, line);
+    ghoul::getline(f, line);
     // Newer versions downloaded from the JPL SBDB website have " around variables
     line.erase(remove(line.begin(), line.end(), '\"'), line.end());
     if (line != ExpectedHeader) {
@@ -615,7 +615,7 @@ std::vector<Parameters> readSbdbFile(std::filesystem::path file) {
     }
 
     std::vector<Parameters> result;
-    while (std::getline(f, line)) {
+    while (ghoul::getline(f, line)) {
         constexpr double AuToKm = 1.496e8;
 
         std::vector<std::string> parts = ghoul::tokenizeString(line, ',');
diff --git a/modules/space/rendering/renderableconstellationbounds.cpp b/modules/space/rendering/renderableconstellationbounds.cpp
index a495d303e1..2d873521f2 100644
--- a/modules/space/rendering/renderableconstellationbounds.cpp
+++ b/modules/space/rendering/renderableconstellationbounds.cpp
@@ -30,6 +30,7 @@
 #include <openspace/util/updatestructures.h>
 #include <ghoul/filesystem/filesystem.h>
 #include <ghoul/logging/logmanager.h>
+#include <ghoul/misc/stringhelper.h>
 #include <ghoul/opengl/programobject.h>
 #include <fstream>
 #include <optional>
@@ -238,7 +239,7 @@ bool RenderableConstellationBounds::loadVertexFile() {
     // a new constellation name, at which point the currentBound is stored away, a new,
     // empty ConstellationBound is created and set at the currentBound
     while (file.good()) {
-        std::getline(file, currentLine);
+        ghoul::getline(file, currentLine);
         if (currentLine.empty()) {
             continue;
         }
diff --git a/modules/space/rendering/renderableconstellationlines.cpp b/modules/space/rendering/renderableconstellationlines.cpp
index f8b2b5f013..3873ff0d0f 100644
--- a/modules/space/rendering/renderableconstellationlines.cpp
+++ b/modules/space/rendering/renderableconstellationlines.cpp
@@ -331,7 +331,7 @@ bool RenderableConstellationLines::readSpeckFile() {
     // (signaled by the keywords 'datavar', 'texturevar', and 'texture')
     std::string line;
     while (true) {
-        std::getline(file, line);
+        ghoul::getline(file, line);
 
         if (file.eof()) {
             break;
@@ -377,7 +377,7 @@ bool RenderableConstellationLines::readSpeckFile() {
                 str >> dummy;
             } while (dummy != "{");
 
-            std::getline(file, line);
+            ghoul::getline(file, line);
 
             // Read the identifier
             std::stringstream id(line);
@@ -385,7 +385,7 @@ bool RenderableConstellationLines::readSpeckFile() {
 
             id >> dummy; // id command
             dummy.clear();
-            std::getline(id, identifier); // identifier
+            ghoul::getline(id, identifier); // identifier
             ghoul::trimWhitespace(identifier);
             std::string name = constellationFullName(identifier);
             if (!name.empty()) {
@@ -393,13 +393,13 @@ bool RenderableConstellationLines::readSpeckFile() {
             }
 
             // Read the number of vertices
-            std::getline(file, line);
+            ghoul::getline(file, line);
             std::stringstream dim(line);
             dim >> constellationLine.numV;
 
             // We can now read the vertices data:
             for (int l = 0; l < constellationLine.numV; ++l) {
-                std::getline(file, line);
+                ghoul::getline(file, line);
                 if (line.substr(0, 1) == "}") {
                     break;
                 }
@@ -425,7 +425,7 @@ bool RenderableConstellationLines::readSpeckFile() {
                 maxRadius = std::max(maxRadius, r);
             }
 
-            std::getline(file, line);
+            ghoul::getline(file, line);
             if (line.substr(0, 1) == "}") {
                 _renderingConstellationsMap.insert({ lineIndex++, constellationLine });
             }
diff --git a/modules/space/rendering/renderableconstellationsbase.cpp b/modules/space/rendering/renderableconstellationsbase.cpp
index 747db8bcd4..36c3914be5 100644
--- a/modules/space/rendering/renderableconstellationsbase.cpp
+++ b/modules/space/rendering/renderableconstellationsbase.cpp
@@ -161,7 +161,7 @@ void RenderableConstellationsBase::loadConstellationFile() {
 
     std::string line;
     while (file.good()) {
-        std::getline(file, line);
+        ghoul::getline(file, line);
         if (line.empty()) {
             continue;
         }
@@ -171,7 +171,7 @@ void RenderableConstellationsBase::loadConstellationFile() {
         s >> abbreviation;
 
         std::string fullName;
-        std::getline(s, fullName);
+        ghoul::getline(s, fullName);
         ghoul::trimWhitespace(fullName);
         _namesTranslation[abbreviation] = fullName;
     }
diff --git a/modules/space/rendering/renderablefluxnodes.cpp b/modules/space/rendering/renderablefluxnodes.cpp
index 5b18355ae1..dbb7352711 100644
--- a/modules/space/rendering/renderablefluxnodes.cpp
+++ b/modules/space/rendering/renderablefluxnodes.cpp
@@ -37,6 +37,7 @@
 #include <ghoul/logging/logmanager.h>
 #include <ghoul/logging/consolelog.h>
 #include <ghoul/logging/visualstudiooutputlog.h>
+#include <ghoul/misc/stringhelper.h>
 #include <ghoul/opengl/programobject.h>
 #include <ghoul/opengl/textureunit.h>
 #include <fstream>
@@ -617,7 +618,7 @@ void RenderableFluxNodes::populateStartTimes() {
 
     std::string line;
     // gets only first line to "remove" header
-    std::getline(tfs, line);
+    ghoul::getline(tfs, line);
     std::stringstream s;
     s << line;
 
@@ -627,7 +628,7 @@ void RenderableFluxNodes::populateStartTimes() {
     while (s >> columnName) {
         ++nColumns;
     }
-    while (std::getline(tfs, line)) {   // for each line of data
+    while (ghoul::getline(tfs, line)) {   // for each line of data
         std::istringstream iss(line);
         for (int i = 0; i < nColumns; ++i) {    // for each column in line
             std::string columnValue;
diff --git a/modules/space/tasks/generatedebrisvolumetask.cpp b/modules/space/tasks/generatedebrisvolumetask.cpp
index 5c535ce4fc..bd7505702e 100644
--- a/modules/space/tasks/generatedebrisvolumetask.cpp
+++ b/modules/space/tasks/generatedebrisvolumetask.cpp
@@ -34,6 +34,7 @@
 #include <ghoul/logging/logmanager.h>
 #include <ghoul/misc/defer.h>
 #include <ghoul/misc/dictionaryluaformatter.h>
+#include <ghoul/misc/stringhelper.h>
 #include <fstream>
 #include <queue>
 
@@ -266,11 +267,11 @@ std::vector<KeplerParameters> readTLEFile(const std::string& filename){
     std::string line = "-";
     for (int i = 0; i < numberOfObjects; i++) {
 
-        std::getline(file, line); // get rid of title
+        ghoul::getline(file, line); // get rid of title
 
         KeplerParameters keplerElements;
 
-        std::getline(file, line);
+        ghoul::getline(file, line);
         if (line[0] == '1') {
             // First line
             // Field Columns   Content
@@ -296,7 +297,7 @@ std::vector<KeplerParameters> readTLEFile(const std::string& filename){
             ));
         }
 
-        std::getline(file, line);
+        ghoul::getline(file, line);
         if (line[0] == '2') {
             // Second line
             // Field    Columns   Content
diff --git a/modules/spacecraftinstruments/util/hongkangparser.cpp b/modules/spacecraftinstruments/util/hongkangparser.cpp
index 9024f434cc..ce9ffc4911 100644
--- a/modules/spacecraftinstruments/util/hongkangparser.cpp
+++ b/modules/spacecraftinstruments/util/hongkangparser.cpp
@@ -166,7 +166,7 @@ bool HongKangParser::create() {
 
     std::string line;
     while (!file.eof()) {
-        std::getline(file, line);
+        ghoul::getline(file, line);
 
         std::string event = line.substr(0, line.find_first_of(' '));
 
diff --git a/modules/spacecraftinstruments/util/instrumenttimesparser.cpp b/modules/spacecraftinstruments/util/instrumenttimesparser.cpp
index 326f45a92d..0fbb09e41c 100644
--- a/modules/spacecraftinstruments/util/instrumenttimesparser.cpp
+++ b/modules/spacecraftinstruments/util/instrumenttimesparser.cpp
@@ -31,6 +31,7 @@
 #include <ghoul/filesystem/file.h>
 #include <ghoul/filesystem/filesystem.h>
 #include <ghoul/misc/dictionary.h>
+#include <ghoul/misc/stringhelper.h>
 #include <filesystem>
 #include <fstream>
 
@@ -94,7 +95,7 @@ bool InstrumentTimesParser::create() {
             std::smatch matches;
             TimeRange instrumentActiveTimeRange;
             bool successfulRead = true;
-            while (std::getline(inFile, line)) {
+            while (ghoul::getline(inFile, line)) {
                 if (!std::regex_match(line, matches, _pattern)) {
                     continue;
                 }
diff --git a/modules/spacecraftinstruments/util/labelparser.cpp b/modules/spacecraftinstruments/util/labelparser.cpp
index b374ecbee5..c35957d68e 100644
--- a/modules/spacecraftinstruments/util/labelparser.cpp
+++ b/modules/spacecraftinstruments/util/labelparser.cpp
@@ -31,6 +31,7 @@
 #include <ghoul/io/texture/texturereader.h>
 #include <ghoul/logging/logmanager.h>
 #include <ghoul/misc/dictionary.h>
+#include <ghoul/misc/stringhelper.h>
 #include <filesystem>
 #include <fstream>
 
@@ -175,7 +176,7 @@ bool LabelParser::create() {
         double stopTime = 0.0;
         std::string line;
         do {
-            std::getline(file, line);
+            ghoul::getline(file, line);
 
             line.erase(std::remove(line.begin(), line.end(), '"'), line.end());
             line.erase(std::remove(line.begin(), line.end(), ' '), line.end());
@@ -227,7 +228,7 @@ bool LabelParser::create() {
                 startTime = SpiceManager::ref().ephemerisTimeFromDate(start);
                 count++;
 
-                std::getline(file, line);
+                ghoul::getline(file, line);
                 line.erase(std::remove(line.begin(), line.end(), '"'), line.end());
                 line.erase(std::remove(line.begin(), line.end(), ' '), line.end());
                 line.erase(std::remove(line.begin(), line.end(), '\r'), line.end());
diff --git a/modules/sync/syncs/httpsynchronization.cpp b/modules/sync/syncs/httpsynchronization.cpp
index 6c4c493d91..b05f26e327 100644
--- a/modules/sync/syncs/httpsynchronization.cpp
+++ b/modules/sync/syncs/httpsynchronization.cpp
@@ -29,6 +29,7 @@
 #include <openspace/util/httprequest.h>
 #include <ghoul/ext/assimp/contrib/zip/src/zip.h>
 #include <ghoul/logging/logmanager.h>
+#include <ghoul/misc/stringhelper.h>
 #include <fstream>
 #include <unordered_map>
 
@@ -212,7 +213,7 @@ bool HttpSynchronization::isEachFileDownloaded() {
     //Optionally list of already synched files
 
     if (ossyncVersion == OssyncVersionNumber) {
-        std::getline(file >> std::ws, line); // Read synchronization status
+        ghoul::getline(file >> std::ws, line); // Read synchronization status
         if (line == SynchronizationToken) {
             return true;
         }
diff --git a/modules/sync/syncs/urlsynchronization.cpp b/modules/sync/syncs/urlsynchronization.cpp
index c919736fa2..db7387897f 100644
--- a/modules/sync/syncs/urlsynchronization.cpp
+++ b/modules/sync/syncs/urlsynchronization.cpp
@@ -31,6 +31,7 @@
 #include <openspace/util/time.h>
 #include <ghoul/filesystem/filesystem.h>
 #include <ghoul/logging/logmanager.h>
+#include <ghoul/misc/stringhelper.h>
 #include <numeric>
 #include <mutex>
 #include <optional>
@@ -221,7 +222,7 @@ bool UrlSynchronization::isEachFileValid() {
     // Valid to: yyyy-mm-ddThr:mn:sc.xxx
 
     if (ossyncVersion == "1.0") {
-        std::getline(file >> std::ws, line);
+        ghoul::getline(file >> std::ws, line);
         std::string& fileIsValidToDate = line;
         double fileValidAsJ2000 = Time::convertTime(fileIsValidToDate);
 
diff --git a/src/data/speckloader.cpp b/src/data/speckloader.cpp
index dbe254135c..710c8873a3 100644
--- a/src/data/speckloader.cpp
+++ b/src/data/speckloader.cpp
@@ -86,7 +86,7 @@ Dataset loadSpeckFile(std::filesystem::path path, std::optional<DataMapping> spe
 
     std::string line;
     // First phase: Loading the header information
-    while (std::getline(file, line)) {
+    while (ghoul::getline(file, line)) {
         currentLineNumber++;
 
         // Guard against wrong line endings (copying files from Windows to Mac) causes
@@ -232,9 +232,9 @@ Dataset loadSpeckFile(std::filesystem::path path, std::optional<DataMapping> spe
     );
 
     // For the first line, we already loaded it and rejected it above, so if we do another
-    // std::getline, we'd miss the first data value line
+    // ghoul::getline, we'd miss the first data value line
     bool isFirst = true;
-    while (isFirst || std::getline(file, line)) {
+    while (isFirst || ghoul::getline(file, line)) {
         currentLineNumber++;
         isFirst = false;
 
@@ -330,7 +330,7 @@ Dataset loadSpeckFile(std::filesystem::path path, std::optional<DataMapping> spe
         }
 
         std::string rest;
-        std::getline(str, rest);
+        ghoul::getline(str, rest);
         if (!rest.empty()) {
 
             strip(rest);
@@ -368,7 +368,7 @@ Labelset loadLabelFile(std::filesystem::path path) {
 
     std::string line;
     // First phase: Loading the header information
-    while (std::getline(file, line)) {
+    while (ghoul::getline(file, line)) {
         // Ignore empty line or commented-out lines
         if (line.empty() || line[0] == '#') {
             continue;
@@ -408,9 +408,9 @@ Labelset loadLabelFile(std::filesystem::path path) {
     }
 
     // For the first line, we already loaded it and rejected it above, so if we do another
-    // std::getline, we'd miss the first data value line
+    // ghoul::getline, we'd miss the first data value line
     bool isFirst = true;
-    while (isFirst || std::getline(file, line)) {
+    while (isFirst || ghoul::getline(file, line)) {
         isFirst = false;
 
         // Ignore empty line or commented-out lines
@@ -448,7 +448,7 @@ Labelset loadLabelFile(std::filesystem::path path) {
         str >> entry.position.x >> entry.position.y >> entry.position.z;
 
         std::string rest;
-        std::getline(str, rest);
+        ghoul::getline(str, rest);
         strip(rest);
 
         if (startsWith(rest, "id")) {
@@ -502,7 +502,7 @@ ColorMap loadCmapFile(std::filesystem::path path) {
     int nColorLines = -1;
 
     std::string line;
-    while (std::getline(file, line)) {
+    while (ghoul::getline(file, line)) {
         // Ignore empty line or commented-out lines
         if (line.empty() || line[0] == '#') {
             continue;
diff --git a/src/engine/downloadmanager.cpp b/src/engine/downloadmanager.cpp
index 199688c40f..36f12f37ee 100644
--- a/src/engine/downloadmanager.cpp
+++ b/src/engine/downloadmanager.cpp
@@ -29,6 +29,7 @@
 #include <ghoul/filesystem/filesystem.h>
 #include <ghoul/logging/logmanager.h>
 #include <ghoul/misc/assert.h>
+#include <ghoul/misc/stringhelper.h>
 #include <ghoul/misc/thread.h>
 #include <curl/curl.h>
 #include <chrono>
@@ -261,8 +262,8 @@ std::future<DownloadManager::MemoryFile> DownloadManager::fetchFile(
             if (res == CURLE_OK) {
                 std::string extension = std::string(ct);
                 std::stringstream ss(extension);
-                getline(ss, extension ,'/');
-                getline(ss, extension);
+                ghoul::getline(ss, extension ,'/');
+                ghoul::getline(ss, extension);
                 file.format = extension;
             }
             else {
diff --git a/src/interaction/sessionrecording.cpp b/src/interaction/sessionrecording.cpp
index 9cb631505c..c9b295b497 100644
--- a/src/interaction/sessionrecording.cpp
+++ b/src/interaction/sessionrecording.cpp
@@ -52,6 +52,7 @@
 #include <ghoul/glm.h>
 #include <ghoul/logging/logmanager.h>
 #include <ghoul/misc/profiling.h>
+#include <ghoul/misc/stringhelper.h>
 #include <algorithm>
 #include <filesystem>
 #include <iomanip>
@@ -1111,7 +1112,7 @@ bool SessionRecording::playbackAddEntriesToTimeline() {
         }
     }
     else {
-        while (parsingStatusOk && std::getline(_playbackFile, _playbackLineParsing)) {
+        while (parsingStatusOk && ghoul::getline(_playbackFile, _playbackLineParsing)) {
             _playbackLineNum++;
 
             std::istringstream iss(_playbackLineParsing);
@@ -2484,7 +2485,7 @@ bool SessionRecording::convertEntries(std::string& inFilename,
         }
     }
     else {
-        while (conversionStatusOk && std::getline(inStream, lineParsing)) {
+        while (conversionStatusOk && ghoul::getline(inStream, lineParsing)) {
             lineNum++;
 
             std::istringstream iss(lineParsing);
diff --git a/src/interaction/tasks/convertrecformattask.cpp b/src/interaction/tasks/convertrecformattask.cpp
index b5a95c70a9..86a05d5ea7 100644
--- a/src/interaction/tasks/convertrecformattask.cpp
+++ b/src/interaction/tasks/convertrecformattask.cpp
@@ -29,6 +29,7 @@
 #include <openspace/engine/globals.h>
 #include <ghoul/filesystem/file.h>
 #include <ghoul/filesystem/filesystem.h>
+#include <ghoul/misc/stringhelper.h>
 #include <filesystem>
 #include <iomanip>
 #include <ghoul/logging/logmanager.h>
@@ -126,7 +127,7 @@ void ConvertRecFormatTask::convert() {
         _iFile.open(_inFilePath, std::ifstream::in);
         //Throw out first line
         std::string throw_out;
-        std::getline(_iFile, throw_out);
+        ghoul::getline(_iFile, throw_out);
         _oFile.open(_outFilePath);
     }
     else if (_fileFormatType == SessionRecording::DataMode::Binary) {
@@ -252,7 +253,7 @@ void ConvertRecFormatTask::convertToBinary() {
     _oFile.write(&tmpType, 1);
     _oFile.write("\n", 1);
 
-    while (std::getline(_iFile, lineContents)) {
+    while (ghoul::getline(_iFile, lineContents)) {
         lineNum++;
 
         std::istringstream iss(lineContents);
diff --git a/src/rendering/transferfunction.cpp b/src/rendering/transferfunction.cpp
index 5d663e9c80..ef6b657b2e 100644
--- a/src/rendering/transferfunction.cpp
+++ b/src/rendering/transferfunction.cpp
@@ -29,6 +29,7 @@
 #include <ghoul/filesystem/file.h>
 #include <ghoul/io/texture/texturereader.h>
 #include <ghoul/logging/logmanager.h>
+#include <ghoul/misc/stringhelper.h>
 #include <ghoul/opengl/texture.h>
 #include <iterator>
 #include <filesystem>
@@ -110,7 +111,7 @@ void TransferFunction::setTextureFromTxt() {
 
     std::string line;
 
-    while (std::getline(in, line)) {
+    while (ghoul::getline(in, line)) {
         std::istringstream iss(line);
         std::string key;
         iss >> key;
diff --git a/src/util/versionchecker.cpp b/src/util/versionchecker.cpp
index df9a8d853c..dfd64f835a 100644
--- a/src/util/versionchecker.cpp
+++ b/src/util/versionchecker.cpp
@@ -83,11 +83,11 @@ void VersionChecker::cancel() {
             std::istringstream versionData(versionString);
 
             std::string token;
-            std::getline(versionData, token, '.');
+            ghoul::getline(versionData, token, '.');
             int major = std::atoi(token.c_str());
-            std::getline(versionData, token, '.');
+            ghoul::getline(versionData, token, '.');
             int minor = std::atoi(token.c_str());
-            std::getline(versionData, token, '.');
+            ghoul::getline(versionData, token, '.');
             int patch = std::atoi(token.c_str());
 
             _latestVersion = { major, minor, patch };

From e8b67c3ce3f9d93fa46048151aca42100d646646 Mon Sep 17 00:00:00 2001
From: Emma Broman <emma.broman@liu.se>
Date: Tue, 5 Mar 2024 11:23:07 +0100
Subject: [PATCH 302/701] Update ghoul (comments in CSV)

---
 ext/ghoul | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ext/ghoul b/ext/ghoul
index 2905908df8..fd7743f680 160000
--- a/ext/ghoul
+++ b/ext/ghoul
@@ -1 +1 @@
-Subproject commit 2905908df8dc4f6fc025f4f73834819706b3afe0
+Subproject commit fd7743f680b6ea1d5d1ec1b7199d6c54d9318c7e

From 93535e36e85d4615858bb841318dfc187a8aad28 Mon Sep 17 00:00:00 2001
From: GPayne <payne.gene@gmail.com>
Date: Tue, 5 Mar 2024 22:24:01 -0700
Subject: [PATCH 303/701] Bump sgct submodule that uses carriage return getline
 string checks

---
 apps/OpenSpace/ext/sgct | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/apps/OpenSpace/ext/sgct b/apps/OpenSpace/ext/sgct
index 3ace983eea..c020f067f9 160000
--- a/apps/OpenSpace/ext/sgct
+++ b/apps/OpenSpace/ext/sgct
@@ -1 +1 @@
-Subproject commit 3ace983eeaa235b3a105abb238b4d844244a427b
+Subproject commit c020f067f96099ae4491edcdabaf65ef7808b595

From 52ecabe6d3062472bdc7b335f9e0278355210f17 Mon Sep 17 00:00:00 2001
From: Andreas Engberg <adde.engberg@gmail.com>
Date: Wed, 6 Mar 2024 09:24:55 +0100
Subject: [PATCH 304/701] Report details of asset specification error

---
 src/documentation/documentation.cpp | 15 ++++++++++-----
 src/scene/asset.cpp                 |  7 +++++++
 2 files changed, 17 insertions(+), 5 deletions(-)

diff --git a/src/documentation/documentation.cpp b/src/documentation/documentation.cpp
index 0c43cc0128..9f0c0d1d4a 100644
--- a/src/documentation/documentation.cpp
+++ b/src/documentation/documentation.cpp
@@ -162,13 +162,18 @@ void logError(const SpecificationError& error, std::string component) {
         LERRORC(fmt::format("{}: {}", component, error.component), error.message);
     }
     for (const documentation::TestResult::Offense& o : error.result.offenses) {
-        LERRORC(
-            o.offender,
-            fmt::format("{}: {}", ghoul::to_string(o.reason), o.explanation)
-        );
+        if (o.explanation.empty()) {
+            LERRORC(ghoul::to_string(o.reason), o.offender);
+        }
+        else {
+            LERRORC(
+                ghoul::to_string(o.reason),
+                fmt::format("{}: {}", o.offender, o.explanation)
+            );
+        }
     }
     for (const documentation::TestResult::Warning& w : error.result.warnings) {
-        LWARNINGC(w.offender, ghoul::to_string(w.reason));
+        LWARNINGC(ghoul::to_string(w.reason), w.offender);
     }
 }
 
diff --git a/src/scene/asset.cpp b/src/scene/asset.cpp
index 15c34bdfff..42095a7e1d 100644
--- a/src/scene/asset.cpp
+++ b/src/scene/asset.cpp
@@ -24,6 +24,7 @@
 
 #include <openspace/scene/asset.h>
 
+#include <openspace/documentation/documentation.h>
 #include <openspace/scene/assetmanager.h>
 #include <ghoul/fmt.h>
 #include <ghoul/filesystem/filesystem.h>
@@ -292,6 +293,12 @@ void Asset::initialize() {
     try {
         _manager.callOnInitialize(this);
     }
+    catch (const documentation::SpecificationError& e) {
+        LERROR(fmt::format("Failed to initialize asset {}", path()));
+        documentation::logError(e);
+        setState(State::InitializationFailed);
+        return;
+    }
     catch (const ghoul::RuntimeError& e) {
         LERROR(fmt::format("Failed to initialize asset {}", path()));
         LERROR(fmt::format("{}: {}", e.component, e.message));

From 0d96df01b0e7d4f9fae8bc1b3fce6d3f6a3da467 Mon Sep 17 00:00:00 2001
From: Alexander Bock <alexander.bock@liu.se>
Date: Wed, 6 Mar 2024 10:07:50 +0100
Subject: [PATCH 305/701] Add map layer to show the last 5000 years of eclipses
 (#3069)

Add new asset showing 5000 years of eclipses from the Scientific Visualization Studio
---
 .../planets/earth/eclipses/5000_years.asset   | 49 +++++++++++++++++++
 1 file changed, 49 insertions(+)
 create mode 100644 data/assets/scene/solarsystem/planets/earth/eclipses/5000_years.asset

diff --git a/data/assets/scene/solarsystem/planets/earth/eclipses/5000_years.asset b/data/assets/scene/solarsystem/planets/earth/eclipses/5000_years.asset
new file mode 100644
index 0000000000..ee82c5a4c8
--- /dev/null
+++ b/data/assets/scene/solarsystem/planets/earth/eclipses/5000_years.asset
@@ -0,0 +1,49 @@
+local globe = asset.require("../earth")
+
+
+
+local texturesPath = asset.resource({
+  Name = "5000 Years of Total Solar Eclipses",
+  Type = "HttpSynchronization",
+  Identifier = "earth_eclipse_5000_years",
+  Version = 1
+})
+
+
+local Layer = {
+  Identifier = "5000_Years_Eclipses",
+  Name = "5000 Years of Total Solar Eclipses",
+  Enabled = asset.enabled,
+  FilePath = texturesPath .. "eclipse_freq_heatmap.tif",
+  Description = [[
+    This is a heatmap showing the density of solar eclipse paths over the Earth during the 5000-year period between 2000 BCE and 3000 CE. It uses the list of eclipses calculated by Fred Espenak and Jean Meeus and published in 2006 as the Five Millennium Canon of Solar Eclipses. The paths of the 3742 eclipses classified in the Canon as either "T" (total) or "H" (hybrid or total-annular) were drawn into a global map with a pixel resolution of 4 minutes (1/15 of a degree) of latitude and longitude. The pixels counted the eclipse paths as they were drawn, and each pixel location ended up experiencing anywhere from one to 35 eclipses.
+
+    For more information visit the NASA's Scientific Visualization Studio that generated this image: https://svs.gsfc.nasa.gov/5222
+
+    Thanks to Visualizer Ernie Wright and Technical support Ian Jones and Laurence Schuler for this.
+
+    See also the paper by Jean Meeus, The Frequency of Total and Annular Solar Eclipses for a Given Place, JBAA 92, 3 (April 1982), pp 124-126.
+  ]],
+  CacheSettings = { Enabled = false }
+}
+
+
+asset.onInitialize(function()
+  openspace.globebrowsing.addLayer(globe.Earth.Identifier, "ColorLayers", Layer)
+end)
+
+asset.onDeinitialize(function()
+  openspace.globebrowsing.deleteLayer(globe.Earth.Identifier, "ColorLayers", Layer)
+end)
+
+asset.export("layer", Layer)
+
+
+asset.meta = {
+  Name = "5000 Years of Total Solar Eclipses",
+  Version = "1.0",
+  Description = Layer.Description,
+  Author = "OpenSpace Team",
+  URL = "https://svs.gsfc.nasa.gov/5222",
+  License = "NASA"
+}

From 2ed6907cf1b2524e4bfc62e6201d5a2b97c5dfdf Mon Sep 17 00:00:00 2001
From: Alexander Bock <alexander.bock@liu.se>
Date: Thu, 7 Mar 2024 14:58:12 +0100
Subject: [PATCH 306/701] Remove the ability to implicitly load kernels from
 SpiceTranslation and SpiceRotations

---
 modules/space/rotation/spicerotation.cpp       | 14 --------------
 modules/space/translation/spicetranslation.cpp | 15 ---------------
 2 files changed, 29 deletions(-)

diff --git a/modules/space/rotation/spicerotation.cpp b/modules/space/rotation/spicerotation.cpp
index 79d3744c67..2d79142d54 100644
--- a/modules/space/rotation/spicerotation.cpp
+++ b/modules/space/rotation/spicerotation.cpp
@@ -73,9 +73,6 @@ namespace {
         // specified, a reference frame of 'GALACTIC' is used instead
         std::optional<std::string> destinationFrame;
 
-        // [[codegen::verbatim(DestinationInfo.description)]]
-        std::optional<std::variant<std::vector<std::string>, std::string>> kernels;
-
         // [[codegen::verbatim(TimeFrameInfo.description)]]
         std::optional<ghoul::Dictionary> timeFrame
             [[codegen::reference("core_time_frame")]];
@@ -103,17 +100,6 @@ SpiceRotation::SpiceRotation(const ghoul::Dictionary& dictionary)
     _sourceFrame = p.sourceFrame;
     _destinationFrame = p.destinationFrame.value_or("GALACTIC");
 
-    if (p.kernels.has_value()) {
-        if (std::holds_alternative<std::string>(*p.kernels)) {
-            SpiceManager::ref().loadKernel(std::get<std::string>(*p.kernels));
-        }
-        else {
-            for (const std::string& s : std::get<std::vector<std::string>>(*p.kernels)) {
-                SpiceManager::ref().loadKernel(s);
-            }
-        }
-    }
-
     _fixedDate.onChange([this]() {
         if (_fixedDate.value().empty()) {
             _fixedEphemerisTime = std::nullopt;
diff --git a/modules/space/translation/spicetranslation.cpp b/modules/space/translation/spicetranslation.cpp
index 9291c594ec..3fb249e786 100644
--- a/modules/space/translation/spicetranslation.cpp
+++ b/modules/space/translation/spicetranslation.cpp
@@ -88,10 +88,6 @@ namespace {
 
         std::optional<std::string> fixedDate
             [[codegen::annotation("A date to lock the position to")]];
-
-        // A single kernel or list of kernels that this SpiceTranslation depends on. All
-        // provided kernels will be loaded before any other operation is performed
-        std::optional<std::variant<std::vector<std::string>, std::string>> kernels;
     };
 #include "spicetranslation_codegen.cpp"
 } // namespace
@@ -126,17 +122,6 @@ SpiceTranslation::SpiceTranslation(const ghoul::Dictionary& dictionary)
         }
     };
 
-    if (p.kernels.has_value()) {
-        if (std::holds_alternative<std::string>(*p.kernels)) {
-            loadKernel(absPath(std::get<std::string>(*p.kernels)).string());
-        }
-        else {
-            for (const std::string& k : std::get<std::vector<std::string>>(*p.kernels)) {
-                loadKernel(absPath(k).string());
-            }
-        }
-    }
-
     _target.onChange([this]() {
         _cachedTarget = _target;
         requireUpdate();

From fff6f8a6278cfd663936cebaf82c10e64ef56b82 Mon Sep 17 00:00:00 2001
From: Alexander Bock <mail@alexanderbock.eu>
Date: Fri, 8 Mar 2024 00:36:54 +0100
Subject: [PATCH 307/701] General pass for code cleanup

---
 .../ext/launcher/src/profile/actiondialog.cpp | 18 ++---
 .../ext/launcher/src/profile/assetsdialog.cpp |  2 +-
 .../launcher/src/profile/assettreemodel.cpp   |  4 +-
 .../launcher/src/profile/deltatimesdialog.cpp |  4 +-
 .../launcher/src/profile/marknodesdialog.cpp  |  5 +-
 .../launcher/src/profile/propertiesdialog.cpp |  4 +-
 .../src/sgctedit/displaywindowunion.cpp       | 10 +--
 .../ext/launcher/src/sgctedit/monitorbox.cpp  | 10 +--
 .../launcher/src/sgctedit/settingswidget.cpp  |  2 +-
 .../ext/launcher/src/sgctedit/sgctedit.cpp    |  8 +-
 apps/OpenSpace/ext/sgct                       |  2 +-
 apps/OpenSpace/main.cpp                       | 19 ++---
 ext/ghoul                                     |  2 +-
 include/openspace/engine/openspaceengine.h    |  4 -
 include/openspace/engine/windowdelegate.h     |  2 +-
 include/openspace/network/messagestructures.h |  2 +-
 .../openspace/rendering/framebufferrenderer.h |  4 +-
 include/openspace/util/distanceconversion.h   |  4 +-
 include/openspace/util/factorymanager.h       |  2 +-
 include/openspace/util/json_helper.inl        |  6 +-
 include/openspace/util/timeconversion.h       |  4 +-
 .../shaders/inScattering_calc_fs.glsl         |  2 +-
 .../shaders/inScattering_sup_calc_fs.glsl     |  2 +-
 .../shaders/irradiance_sup_calc_fs.glsl       |  4 +-
 .../shaders/transmittance_calc_fs.glsl        |  2 +-
 .../base/rendering/grids/renderablegrid.cpp   |  8 +-
 .../rendering/grids/renderableradialgrid.cpp  |  4 +-
 .../grids/renderablesphericalgrid.cpp         |  4 +-
 .../renderableinterpolatedpoints.cpp          |  8 +-
 .../pointcloud/renderablepointcloud.cpp       |  4 +-
 .../renderableplanetimevaryingimage.cpp       |  2 +-
 modules/base/rendering/renderableprism.cpp    | 12 +--
 .../base/rendering/renderabletrailorbit.cpp   |  6 +-
 .../rendering/renderabletrailtrajectory.cpp   |  2 +-
 modules/base/rotation/luarotation.cpp         |  2 +-
 modules/base/shaders/model_fs.glsl            |  2 +-
 modules/base/translation/luatranslation.cpp   |  2 +-
 .../rendering/renderabledumeshes.cpp          | 14 ++--
 .../rendering/renderableplanescloud.cpp       |  6 +-
 modules/exoplanets/exoplanetsmodule_lua.inl   |  4 +-
 .../rendering/renderablefieldlines.cpp        |  2 +-
 .../renderablefieldlinessequence.cpp          |  2 +-
 .../util/fieldlinesstate.cpp                  |  8 +-
 .../util/kameleonfieldlinehelper.cpp          |  4 +-
 modules/fitsfilereader/src/fitsfilereader.cpp | 10 +--
 modules/gaia/rendering/octreeculler.cpp       |  2 +-
 modules/gaia/rendering/octreemanager.cpp      | 50 ++++++-------
 .../gaia/rendering/renderablegaiastars.cpp    |  2 +-
 modules/gaia/tasks/constructoctreetask.cpp    |  4 +-
 modules/gaia/tasks/readfilejob.cpp            |  2 +-
 modules/gaia/tasks/readfitstask.cpp           |  2 +-
 modules/galaxy/rendering/renderablegalaxy.cpp |  2 +-
 .../tasks/milkywaypointsconversiontask.cpp    |  2 +-
 modules/globebrowsing/globebrowsingmodule.cpp |  4 +-
 .../globebrowsing/globebrowsingmodule_lua.inl |  2 +-
 modules/globebrowsing/shaders/geojson_fs.glsl |  2 +-
 .../src/geojson/geojsoncomponent.cpp          |  6 +-
 .../src/geojson/geojsonmanager.cpp            |  2 +-
 .../src/geojson/globegeometryfeature.cpp      |  6 +-
 .../src/geojson/globegeometryhelper.cpp       |  8 +-
 modules/globebrowsing/src/gpulayergroup.cpp   |  8 +-
 modules/globebrowsing/src/layer.cpp           |  2 +-
 modules/globebrowsing/src/layergroup.cpp      |  2 +-
 modules/globebrowsing/src/layermanager.cpp    |  4 +-
 modules/globebrowsing/src/lruthreadpool.inl   |  4 +-
 .../src/memoryawaretilecache.cpp              |  2 +-
 modules/globebrowsing/src/renderableglobe.cpp | 46 ++++++------
 modules/globebrowsing/src/skirtedgrid.cpp     |  2 +-
 .../src/tileprovider/tileprovider.cpp         |  2 +-
 modules/globebrowsing/src/timequantizer.cpp   |  4 +-
 modules/imgui/imguimodule.cpp                 |  8 +-
 modules/imgui/src/guijoystickcomponent.cpp    | 10 +--
 modules/imgui/src/guimemorycomponent.cpp      |  2 +-
 modules/imgui/src/guipropertycomponent.cpp    | 29 ++++---
 modules/imgui/src/renderproperties.cpp        |  2 +-
 modules/iswa/rendering/iswakameleongroup.cpp  |  2 +-
 modules/iswa/rendering/kameleonplane.cpp      |  2 +-
 modules/iswa/util/dataprocessor.cpp           |  6 +-
 modules/iswa/util/dataprocessorjson.cpp       |  4 +-
 modules/iswa/util/dataprocessorkameleon.cpp   |  2 +-
 modules/iswa/util/dataprocessortext.cpp       |  2 +-
 modules/iswa/util/iswamanager.cpp             |  4 +-
 modules/kameleon/src/kameleonwrapper.cpp      |  6 +-
 .../kameleonvolume/kameleonvolumereader.cpp   |  6 +-
 .../rendering/renderablekameleonvolume.cpp    |  2 +-
 .../multiresvolume/rendering/brickmanager.cpp |  4 +-
 .../rendering/errorhistogrammanager.cpp       |  4 +-
 .../rendering/histogrammanager.cpp            |  4 +-
 .../rendering/localerrorhistogrammanager.cpp  |  8 +-
 modules/multiresvolume/rendering/tsp.cpp      |  8 +-
 .../src/topics/flightcontrollertopic.cpp      |  6 +-
 modules/server/src/topics/luascripttopic.cpp  |  8 +-
 .../server/src/topics/setpropertytopic.cpp    |  4 +-
 .../renderableconstellationlines.cpp          |  2 +-
 .../space/rendering/renderablefluxnodes.cpp   |  8 +-
 .../rendering/renderablehabitablezone.cpp     |  2 +-
 .../rendering/renderableorbitalkepler.cpp     |  6 +-
 .../space/translation/horizonstranslation.cpp |  2 +-
 .../space/translation/keplertranslation.cpp   |  2 +-
 .../rendering/renderablefov.cpp               | 12 +--
 .../rendering/renderableplaneprojection.cpp   |  2 +-
 .../util/imagesequencer.cpp                   |  6 +-
 .../util/targetdecoder.cpp                    |  2 +-
 modules/spout/renderableplanespout.cpp        |  2 +-
 modules/spout/renderablespherespout.cpp       |  2 +-
 modules/spout/spoutwrapper.cpp                |  4 +-
 modules/statemachine/src/statemachine.cpp     |  6 +-
 modules/touch/src/directinputsolver.cpp       | 12 +--
 modules/volume/envelope.cpp                   |  6 +-
 modules/volume/rawvolumereader.inl            |  2 +-
 .../rendering/renderabletimevaryingvolume.cpp |  8 +-
 modules/volume/transferfunction.cpp           |  8 +-
 modules/webgui/webguimodule.cpp               |  2 +-
 src/data/csvloader.cpp                        |  4 +-
 src/engine/configuration.cpp                  | 12 +--
 src/engine/openspaceengine.cpp                | 75 ++++++++-----------
 src/engine/openspaceengine_lua.inl            |  2 +-
 src/interaction/joystickcamerastates.cpp      | 10 +--
 src/interaction/joystickinputstate.cpp        | 12 +--
 src/interaction/keybindingmanager.cpp         |  6 +-
 src/interaction/websocketcamerastates.cpp     |  6 +-
 src/navigation/pathcurve.cpp                  |  4 +-
 .../pathcurves/avoidcollisioncurve.cpp        |  2 +-
 src/network/parallelpeer.cpp                  |  2 +-
 src/properties/optionproperty.cpp             |  6 +-
 src/properties/selectionproperty.cpp          |  2 +-
 src/rendering/colormappingcomponent.cpp       |  4 +-
 src/rendering/framebufferrenderer.cpp         | 25 +++----
 src/rendering/helper.cpp                      |  6 +-
 src/rendering/loadingscreen.cpp               |  6 +-
 src/rendering/luaconsole.cpp                  |  4 +-
 src/rendering/renderengine.cpp                | 26 ++++---
 src/rendering/transferfunction.cpp            |  6 +-
 src/scene/assetmanager.cpp                    |  4 +-
 src/scene/profile.cpp                         |  2 +-
 src/scripting/scriptengine.cpp                |  2 +-
 src/scripting/scriptscheduler.cpp             |  4 +-
 src/scripting/scriptscheduler_lua.inl         |  2 +-
 src/util/histogram.cpp                        |  4 +-
 src/util/sphere.cpp                           |  4 +-
 src/util/spicemanager.cpp                     | 10 +--
 src/util/threadpool.cpp                       |  2 +-
 src/util/timemanager.cpp                      |  2 +-
 support/coding/codegen                        |  2 +-
 tests/test_spicemanager.cpp                   |  2 +-
 145 files changed, 432 insertions(+), 463 deletions(-)

diff --git a/apps/OpenSpace/ext/launcher/src/profile/actiondialog.cpp b/apps/OpenSpace/ext/launcher/src/profile/actiondialog.cpp
index 81745a45ca..7e23515146 100644
--- a/apps/OpenSpace/ext/launcher/src/profile/actiondialog.cpp
+++ b/apps/OpenSpace/ext/launcher/src/profile/actiondialog.cpp
@@ -140,8 +140,7 @@ void ActionDialog::createActionWidgets(QGridLayout* layout) {
         this, &ActionDialog::actionSelected
     );
 
-    for (size_t i = 0; i < _actionData.size(); ++i) {
-        const Profile::Action& action = _actionData[i];
+    for (const Profile::Action& action : _actionData) {
         std::string name = action.name.empty() ? action.identifier : action.name;
         _actionWidgets.list->addItem(new QListWidgetItem(QString::fromStdString(name)));
     }
@@ -308,10 +307,9 @@ void ActionDialog::createKeyboardWidgets(QGridLayout* layout) {
         this, &ActionDialog::keybindingSelected
     );
 
-    for (size_t i = 0; i < _keybindingsData.size(); ++i) {
-        const Profile::Keybinding& kv = _keybindingsData[i];
+    for (const Profile::Keybinding& keybinding : _keybindingsData) {
         QListWidgetItem* item = new QListWidgetItem;
-        updateListItem(item, kv);
+        updateListItem(item, keybinding);
         _keybindingWidgets.list->addItem(item);
     }
 
@@ -468,7 +466,7 @@ void ActionDialog::actionRemove() {
     );
 
     // We can't remove an action if it has a keyboard shortcut attached to it
-    for (size_t i = 0; i < _keybindingsData.size(); ++i) {
+    for (size_t i = 0; i < _keybindingsData.size(); i++) {
         const Profile::Keybinding& kb = _keybindingsData[i];
         if (kb.action != action->identifier) {
             continue;
@@ -500,7 +498,7 @@ void ActionDialog::actionRemove() {
         }
     }
 
-    for (size_t i = 0; i < _actionData.size(); ++i) {
+    for (size_t i = 0; i < _actionData.size(); i++) {
         if (_actionData[i].identifier == action->identifier) {
             clearActionFields();
             _actionData.erase(_actionData.begin() + i);
@@ -598,13 +596,13 @@ void ActionDialog::actionSaved() {
             _keybindingWidgets.list->count() == static_cast<int>(_keybindingsData.size()),
             "The list and data got out of sync"
         );
-        for (int i = 0; i < _keybindingWidgets.list->count(); ++i) {
+        for (int i = 0; i < _keybindingWidgets.list->count(); i++) {
             if (_keybindingsData[i].action == oldIdentifier) {
                 _keybindingsData[i].action = newIdentifier;
                 updateListItem(_keybindingWidgets.list->item(i), _keybindingsData[i]);
             }
         }
-        for (int i = 0; i < _keybindingWidgets.action->count(); ++i) {
+        for (int i = 0; i < _keybindingWidgets.action->count(); i++) {
             if (_keybindingWidgets.action->itemText(i).toStdString() == oldIdentifier) {
                 _keybindingWidgets.action->setItemText(
                     i,
@@ -703,7 +701,7 @@ void ActionDialog::keybindingRemove() {
     const Profile::Keybinding* keybinding = selectedKeybinding();
     ghoul_assert(keybinding, "A keybinding must be selected at this point");
     
-    for (size_t i = 0; i < _keybindingsData.size(); ++i) {
+    for (size_t i = 0; i < _keybindingsData.size(); i++) {
         if (_keybindingsData[i].key == keybinding->key &&
             _keybindingsData[i].action == keybinding->action)
         {
diff --git a/apps/OpenSpace/ext/launcher/src/profile/assetsdialog.cpp b/apps/OpenSpace/ext/launcher/src/profile/assetsdialog.cpp
index 387801653f..1186a649db 100644
--- a/apps/OpenSpace/ext/launcher/src/profile/assetsdialog.cpp
+++ b/apps/OpenSpace/ext/launcher/src/profile/assetsdialog.cpp
@@ -249,7 +249,7 @@ QString AssetsDialog::createTextSummary() {
         return "";
     }
     QString summary;
-    for (size_t i = 0; i < summaryItems.size(); ++i) {
+    for (size_t i = 0; i < summaryItems.size(); i++) {
         bool existsInFilesystem = summaryItems.at(i)->doesExistInFilesystem();
 
         std::string s = existsInFilesystem ?
diff --git a/apps/OpenSpace/ext/launcher/src/profile/assettreemodel.cpp b/apps/OpenSpace/ext/launcher/src/profile/assettreemodel.cpp
index 50b24fd755..71b414c399 100644
--- a/apps/OpenSpace/ext/launcher/src/profile/assettreemodel.cpp
+++ b/apps/OpenSpace/ext/launcher/src/profile/assettreemodel.cpp
@@ -41,7 +41,7 @@ namespace {
 
     int getLevelFromLine(std::string line) {
         int level = 0;
-        for (unsigned int i = 0; i < line.length(); ++i) {
+        for (unsigned int i = 0; i < line.length(); i++) {
             if (line.substr(i, 1) == " ") {
                 level++;
             }
@@ -123,7 +123,7 @@ namespace {
                 pathPrefix += itemName;
                 pathPrefix += "/";
             }
-            for (int i = 0; i < item->childCount(); ++i) {
+            for (int i = 0; i < item->childCount(); i++) {
                 parseChildrenForSelected(
                     item->child(i),
                     outputPaths,
diff --git a/apps/OpenSpace/ext/launcher/src/profile/deltatimesdialog.cpp b/apps/OpenSpace/ext/launcher/src/profile/deltatimesdialog.cpp
index 850d849f1c..cbaf315149 100644
--- a/apps/OpenSpace/ext/launcher/src/profile/deltatimesdialog.cpp
+++ b/apps/OpenSpace/ext/launcher/src/profile/deltatimesdialog.cpp
@@ -71,7 +71,7 @@ namespace {
         }
 
         size_t i;
-        for (i = 0; i < (TimeIntervals.size() - 1); ++i) {
+        for (i = 0; i < (TimeIntervals.size() - 1); i++) {
             if (abs(value) >= TimeIntervals[i].secondsPerInterval) {
                 break;
             }
@@ -362,7 +362,7 @@ void DeltaTimesDialog::parseSelections() {
         }
     }
     std::vector<double> tempDt;
-    for (int i = 0; i < (finalNonzeroIndex + 1); ++i) {
+    for (int i = 0; i < (finalNonzeroIndex + 1); i++) {
         tempDt.push_back(_deltaTimesData[i]);
     }
     *_deltaTimes = std::move(_deltaTimesData);
diff --git a/apps/OpenSpace/ext/launcher/src/profile/marknodesdialog.cpp b/apps/OpenSpace/ext/launcher/src/profile/marknodesdialog.cpp
index 0a955cb781..30103a1a92 100644
--- a/apps/OpenSpace/ext/launcher/src/profile/marknodesdialog.cpp
+++ b/apps/OpenSpace/ext/launcher/src/profile/marknodesdialog.cpp
@@ -57,9 +57,8 @@ void MarkNodesDialog::createWidgets() {
     _list->setDragDropMode(QListView::InternalMove);
     _list->setResizeMode(QListView::Adjust);
 
-    for (size_t i = 0; i < _markedNodes->size(); ++i) {
-        QListWidgetItem* item =
-            new QListWidgetItem(QString::fromStdString(_markedNodes->at(i)));
+    for (const std::string& nodes : *_markedNodes) {
+        QListWidgetItem* item = new QListWidgetItem(QString::fromStdString(nodes));
         _list->addItem(item);
     }
     layout->addWidget(_list);
diff --git a/apps/OpenSpace/ext/launcher/src/profile/propertiesdialog.cpp b/apps/OpenSpace/ext/launcher/src/profile/propertiesdialog.cpp
index 5a92f969b2..6d8809a483 100644
--- a/apps/OpenSpace/ext/launcher/src/profile/propertiesdialog.cpp
+++ b/apps/OpenSpace/ext/launcher/src/profile/propertiesdialog.cpp
@@ -70,8 +70,8 @@ void PropertiesDialog::createWidgets() {
             _list, &QListWidget::itemSelectionChanged,
             this, &PropertiesDialog::listItemSelected
         );
-        for (size_t i = 0; i < _propertyData.size(); ++i) {
-            _list->addItem(new QListWidgetItem(createOneLineSummary(_propertyData[i])));
+        for (const Profile::Property& property : _propertyData) {
+            _list->addItem(new QListWidgetItem(createOneLineSummary(property)));
         }
         layout->addWidget(_list);
     }
diff --git a/apps/OpenSpace/ext/launcher/src/sgctedit/displaywindowunion.cpp b/apps/OpenSpace/ext/launcher/src/sgctedit/displaywindowunion.cpp
index f651745b98..7b32b750d9 100644
--- a/apps/OpenSpace/ext/launcher/src/sgctedit/displaywindowunion.cpp
+++ b/apps/OpenSpace/ext/launcher/src/sgctedit/displaywindowunion.cpp
@@ -54,7 +54,7 @@ void DisplayWindowUnion::createWidgets(int nMaxWindows,
                                        bool resetToDefault)
 {
     // Add all window controls (some will be hidden from GUI initially)
-    for (int i = 0; i < nMaxWindows; ++i) {
+    for (int i = 0; i < nMaxWindows; i++) {
         const int monitorNumForThisWindow =
             (monitorResolutions.size() > 1 && i >= 2) ? 1 : 0;
 
@@ -114,7 +114,7 @@ void DisplayWindowUnion::createWidgets(int nMaxWindows,
     QBoxLayout* layoutWindows = new QHBoxLayout;
     layoutWindows->setContentsMargins(0, 0, 0, 0);
     layoutWindows->setSpacing(0);
-    for (int i = 0; i < nMaxWindows; ++i) {
+    for (int i = 0; i < nMaxWindows; i++) {
         layoutWindows->addWidget(_windowControl[i]);
         if (i < (nMaxWindows - 1)) {
             QFrame* frameForNextWindow = new QFrame;
@@ -130,7 +130,7 @@ void DisplayWindowUnion::createWidgets(int nMaxWindows,
 std::vector<WindowControl*> DisplayWindowUnion::activeWindowControls() const {
     std::vector<WindowControl*> res;
     res.reserve(_nWindowsDisplayed);
-    for (unsigned int i = 0; i < _nWindowsDisplayed; ++i) {
+    for (unsigned int i = 0; i < _nWindowsDisplayed; i++) {
         res.push_back(_windowControl[i]);
     }
     return res;
@@ -160,10 +160,10 @@ unsigned int DisplayWindowUnion::numWindowsDisplayed() const {
 }
 
 void DisplayWindowUnion::showWindows() {
-    for (size_t i = 0; i < _windowControl.size(); ++i) {
+    for (size_t i = 0; i < _windowControl.size(); i++) {
         _windowControl[i]->setVisible(i < _nWindowsDisplayed);
     }
-    for (size_t i = 0; i < _frameBorderLines.size(); ++i) {
+    for (size_t i = 0; i < _frameBorderLines.size(); i++) {
         _frameBorderLines[i]->setVisible(i < (_nWindowsDisplayed - 1));
     }
     _removeWindowButton->setEnabled(_nWindowsDisplayed > 1);
diff --git a/apps/OpenSpace/ext/launcher/src/sgctedit/monitorbox.cpp b/apps/OpenSpace/ext/launcher/src/sgctedit/monitorbox.cpp
index 3bde46d3ab..3f4909ca57 100644
--- a/apps/OpenSpace/ext/launcher/src/sgctedit/monitorbox.cpp
+++ b/apps/OpenSpace/ext/launcher/src/sgctedit/monitorbox.cpp
@@ -68,7 +68,7 @@ MonitorBox::MonitorBox(QRect widgetDims, const std::vector<QRect>& monitorResolu
         computeScaledResolutionLandscape(monitorArrangement, monitorResolutions) :
         computeScaledResolutionPortrait(monitorArrangement, monitorResolutions);
 
-    for (size_t i = 0; i < monitorResolutions.size(); ++i) {
+    for (size_t i = 0; i < monitorResolutions.size(); i++) {
         _monitorDimensionsScaled.emplace_back(
             offsets[i].width(),
             offsets[i].height(),
@@ -89,7 +89,7 @@ void MonitorBox::paintEvent(QPaintEvent*) {
 
     //
     // Draw window out-of-bounds region(s) first
-    for (int i = 0; i < _nWindows; ++i) {
+    for (int i = 0; i < _nWindows; i++) {
         painter.setBrush(Qt::BDiagPattern);
         painter.setPen(QPen(_colorsForWindows[i], 0));
         painter.drawRect(_windowRendering[i]);
@@ -99,7 +99,7 @@ void MonitorBox::paintEvent(QPaintEvent*) {
     painter.setPen(QPen(Qt::black, 2));
     painter.setBrush(Qt::NoBrush);
 
-    for (size_t i = 0; i < _monitorDimensionsScaled.size(); ++i) {
+    for (size_t i = 0; i < _monitorDimensionsScaled.size(); i++) {
         const QColor Grey = QColor(0xDD, 0xDD, 0xDD);
 
         painter.drawRect(_monitorDimensionsScaled[i]);
@@ -120,7 +120,7 @@ void MonitorBox::paintEvent(QPaintEvent*) {
 
     // Draw window number(s) first for darker contrast, then window(s) over both
     // out-of-bounds and monitors
-    for (int i = 0; i < _nWindows; ++i) {
+    for (int i = 0; i < _nWindows; i++) {
         QPointF p = QPointF(
             _windowRendering[i].left() + 5.0,
             _windowRendering[i].bottom() - 5.0
@@ -132,7 +132,7 @@ void MonitorBox::paintEvent(QPaintEvent*) {
 
     //
     // Paint window
-    for (int i = 0; i < _nWindows; ++i) {
+    for (int i = 0; i < _nWindows; i++) {
         painter.setPen(QPen(_colorsForWindows[i], 1));
         painter.drawRect(_windowRendering[i]);
         
diff --git a/apps/OpenSpace/ext/launcher/src/sgctedit/settingswidget.cpp b/apps/OpenSpace/ext/launcher/src/sgctedit/settingswidget.cpp
index dc4df89f46..402dde3dc1 100644
--- a/apps/OpenSpace/ext/launcher/src/sgctedit/settingswidget.cpp
+++ b/apps/OpenSpace/ext/launcher/src/sgctedit/settingswidget.cpp
@@ -127,7 +127,7 @@ void SettingsWidget::nWindowsDisplayedChanged(int newCount) {
     graphicsSelect = std::max(0, graphicsSelect);
 
     QList<QString> graphicsOptions = {"None (GUI only)"};
-    for (int i = CountOneWindow; i <= newCount; ++i) {
+    for (int i = CountOneWindow; i <= newCount; i++) {
         graphicsOptions.append("Window " + QString::number(i));
     }
     _firstWindowGraphicsSelection->clear();
diff --git a/apps/OpenSpace/ext/launcher/src/sgctedit/sgctedit.cpp b/apps/OpenSpace/ext/launcher/src/sgctedit/sgctedit.cpp
index 77a5d2db65..482d97d635 100644
--- a/apps/OpenSpace/ext/launcher/src/sgctedit/sgctedit.cpp
+++ b/apps/OpenSpace/ext/launcher/src/sgctedit/sgctedit.cpp
@@ -91,7 +91,7 @@ SgctEdit::SgctEdit(sgct::config::Cluster& cluster, const std::string& configName
     std::vector<QRect> monitorSizes = createMonitorInfoSet();
     createWidgets(monitorSizes, static_cast<unsigned int>(nWindows), false);
     size_t existingWindowsControlSize = _displayWidget->windowControls().size();
-    for (size_t i = 0; i < nWindows; ++i) {
+    for (size_t i = 0; i < nWindows; i++) {
         sgct::config::Window& w = _cluster.nodes.front().windows[i];
         WindowControl* wCtrl = _displayWidget->windowControls()[i];
         if (i < existingWindowsControlSize && wCtrl) {
@@ -144,7 +144,7 @@ void SgctEdit::setupStateOfUiOnFirstWindow(size_t nWindows) {
     int nGuiRenderTagsFound = 0;
     _settingsWidget->nWindowsDisplayedChanged(static_cast<int>(nWindows));
 
-    for (size_t i = 0; i < nWindows; ++i) {
+    for (size_t i = 0; i < nWindows; i++) {
         sgct::config::Window& w = _cluster.nodes.front().windows[i];
         //First window needs to have "GUI" tag if this mode is set
         if (i == 0) {
@@ -318,7 +318,7 @@ void SgctEdit::createWidgets(const std::vector<QRect>& monitorSizes,
             monitorBox, &MonitorBox::nWindowsDisplayedChanged
         );
 
-        for (unsigned int i = 0; i < nWindows; ++i) {
+        for (unsigned int i = 0; i < nWindows; i++) {
             _displayWidget->addWindow();
         }
         
@@ -529,7 +529,7 @@ void SgctEdit::generateConfigResizeWindowsAccordingToSelected(sgct::config::Node
 }
 
 void SgctEdit::generateConfigIndividualWindowSettings(sgct::config::Node& node) {
-    for (size_t i = 0; i < node.windows.size(); ++i) {
+    for (size_t i = 0; i < node.windows.size(); i++) {
         // First apply default settings to each window...
         node.windows[i].id = static_cast<int>(i);
         node.windows[i].draw2D = true;
diff --git a/apps/OpenSpace/ext/sgct b/apps/OpenSpace/ext/sgct
index 377de30963..62333a4bc2 160000
--- a/apps/OpenSpace/ext/sgct
+++ b/apps/OpenSpace/ext/sgct
@@ -1 +1 @@
-Subproject commit 377de309631d8a1c9b53becd363db0dc8ee76ae6
+Subproject commit 62333a4bc252e6192f062e6aa80e50a3db2e744e
diff --git a/apps/OpenSpace/main.cpp b/apps/OpenSpace/main.cpp
index 6c5d6a5cf3..146ca7f30f 100644
--- a/apps/OpenSpace/main.cpp
+++ b/apps/OpenSpace/main.cpp
@@ -198,7 +198,7 @@ LONG WINAPI generateMiniDump(EXCEPTION_POINTERS* exceptionPointers) {
 void checkJoystickStatus() {
     using namespace interaction;
 
-    for (int i = GLFW_JOYSTICK_1; i <= GLFW_JOYSTICK_LAST; ++i) {
+    for (int i = GLFW_JOYSTICK_1; i <= GLFW_JOYSTICK_LAST; i++) {
         ZoneScopedN("Joystick state");
 
         JoystickInputState& state = global::joystickInputStates->at(i);
@@ -228,7 +228,7 @@ void checkJoystickStatus() {
         std::memcpy(state.axes.data(), axes, state.nAxes * sizeof(float));
 
         const unsigned char* buttons = glfwGetJoystickButtons(i, &state.nButtons);
-        for (int j = 0; j < state.nButtons; ++j) {
+        for (int j = 0; j < state.nButtons; j++) {
             const bool currentlyPressed = buttons[j] == GLFW_PRESS;
 
             if (currentlyPressed) {
@@ -340,7 +340,7 @@ void mainInitFunc(GLFWwindow*) {
         }
     }
 
-    for (size_t i = 0; i < Engine::instance().windows().size(); ++i) {
+    for (size_t i = 0; i < Engine::instance().windows().size(); i++) {
         Window& window = *Engine::instance().windows()[i];
         if (!window.hasTag(SpoutTag)) {
             continue;
@@ -620,14 +620,11 @@ void mainCharCallback(unsigned int codepoint, int modifiers, sgct::Window* windo
 
 
 
-void mainDropCallback(int amount, const char** paths) {
+void mainDropCallback(std::vector<std::string_view> paths) {
     ZoneScoped;
 
-    ghoul_assert(amount > 0, "Expected at least one file path");
-    ghoul_assert(paths, "expected non-nullptr");
-
-    for (int i = 0; i < amount; ++i) {
-        global::openSpaceEngine->handleDragDrop(paths[i]);
+    for (std::string_view path : paths) {
+        global::openSpaceEngine->handleDragDrop(path);
     }
 }
 
@@ -957,7 +954,7 @@ void setSgctDelegateFunctions() {
 
         return currentWindow->swapGroupFrameNumber();
     };
-    sgctDelegate.setScreenshotFolder = [](std::string path) {
+    sgctDelegate.setScreenshotFolder = [](std::filesystem::path path) {
         sgct::Settings::instance().setCapturePath(std::move(path));
     };
     sgctDelegate.showStatistics = [](bool enabled) {
@@ -1003,7 +1000,7 @@ void setSgctDelegateFunctions() {
 void checkCommandLineForSettings(int& argc, char** argv, bool& hasSGCT, bool& hasProfile,
                                  std::string& sgctFunctionName)
 {
-    for (int i = 1; i < argc; ++i) {
+    for (int i = 1; i < argc; i++) {
         const std::string arg = argv[i];
         if (arg == "-c" || arg == "--config") {
             std::string p = ((i + 1) < argc) ? argv[i + 1] : "";
diff --git a/ext/ghoul b/ext/ghoul
index fd7743f680..8a502be36b 160000
--- a/ext/ghoul
+++ b/ext/ghoul
@@ -1 +1 @@
-Subproject commit fd7743f680b6ea1d5d1ec1b7199d6c54d9318c7e
+Subproject commit 8a502be36b93385ab902e27f4d50d1fb5e90b5a0
diff --git a/include/openspace/engine/openspaceengine.h b/include/openspace/engine/openspaceengine.h
index 4d4f20abc6..7b763b844f 100644
--- a/include/openspace/engine/openspaceengine.h
+++ b/include/openspace/engine/openspaceengine.h
@@ -100,7 +100,6 @@ public:
         const glm::mat4& projectionMatrix);
     void drawOverlays();
     void postDraw();
-    void resetPropertyChangeFlags();
     void keyboardCallback(Key key, KeyModifier mod, KeyAction action,
         IsGuiWindow isGuiWindow);
     void charCallback(unsigned int codepoint, KeyModifier modifier,
@@ -117,7 +116,6 @@ public:
     void decode(std::vector<std::byte> data);
 
     properties::Property::Visibility visibility() const;
-    bool showHiddenSceneGraphNodes() const;
     void toggleShutdownMode();
 
     Mode currentMode() const;
@@ -148,11 +146,9 @@ private:
     void loadFonts();
 
     void runGlobalCustomizationScripts();
-    void resetPropertyChangeFlagsOfSubowners(openspace::properties::PropertyOwner* po);
 
     properties::BoolProperty _printEvents;
     properties::OptionProperty _visibility;
-    properties::BoolProperty _showHiddenSceneGraphNodes;
     properties::FloatProperty _fadeOnEnableDuration;
     properties::BoolProperty _disableAllMouseInputs;
 
diff --git a/include/openspace/engine/windowdelegate.h b/include/openspace/engine/windowdelegate.h
index aeb8462bd3..f6cde89d09 100644
--- a/include/openspace/engine/windowdelegate.h
+++ b/include/openspace/engine/windowdelegate.h
@@ -114,7 +114,7 @@ struct WindowDelegate {
 
     uint64_t (*swapGroupFrameNumber)() = []() { return uint64_t(0); };
 
-    void (*setScreenshotFolder)(std::string) = [](std::string) {};
+    void (*setScreenshotFolder)(std::filesystem::path) = [](std::filesystem::path) {};
 
     void (*showStatistics)(bool) = [](bool) {};
 
diff --git a/include/openspace/network/messagestructures.h b/include/openspace/network/messagestructures.h
index ff20ee9425..a11fe62eb8 100644
--- a/include/openspace/network/messagestructures.h
+++ b/include/openspace/network/messagestructures.h
@@ -467,7 +467,7 @@ struct ScriptMessage {
         }
         std::string tmpReadbackScript;
         _script.erase();
-        for (int i = 0; i < numScriptLines; ++i) {
+        for (int i = 0; i < numScriptLines; i++) {
             std::getline(iss, tmpReadbackScript);
             size_t start = tmpReadbackScript.find_first_not_of(" ");
             tmpReadbackScript = tmpReadbackScript.substr(start);
diff --git a/include/openspace/rendering/framebufferrenderer.h b/include/openspace/rendering/framebufferrenderer.h
index 8e6fbe075e..55d046c097 100644
--- a/include/openspace/rendering/framebufferrenderer.h
+++ b/include/openspace/rendering/framebufferrenderer.h
@@ -156,9 +156,7 @@ public:
     void setResolution(glm::ivec2 res);
     void setHDRExposure(float hdrExposure);
     void setGamma(float gamma);
-    void setHue(float hue);
-    void setValue(float value);
-    void setSaturation(float sat);
+    void setHueValueSaturation(float hue, float value, float saturation);
 
     void enableFXAA(bool enable);
     void setDisableHDR(bool disable);
diff --git a/include/openspace/util/distanceconversion.h b/include/openspace/util/distanceconversion.h
index 11a2dd196a..d968f94845 100644
--- a/include/openspace/util/distanceconversion.h
+++ b/include/openspace/util/distanceconversion.h
@@ -218,7 +218,7 @@ constexpr DistanceUnit distanceUnitFromString(std::string_view unitName) {
             found = i;
             break;
         }
-        ++i;
+        i++;
     }
 
     i = 0;
@@ -227,7 +227,7 @@ constexpr DistanceUnit distanceUnitFromString(std::string_view unitName) {
             found = i;
             break;
         }
-        ++i;
+        i++;
     }
 
 
diff --git a/include/openspace/util/factorymanager.h b/include/openspace/util/factorymanager.h
index dfb4b11702..14dbffb723 100644
--- a/include/openspace/util/factorymanager.h
+++ b/include/openspace/util/factorymanager.h
@@ -97,7 +97,7 @@ public:
      *
      * \tparam Factory The type for which a factory should be created and added
      * \param name A user-readable name for the registered factory
-     *     *
+     *
      * \pre \p name must not be empty
      */
     template <typename T>
diff --git a/include/openspace/util/json_helper.inl b/include/openspace/util/json_helper.inl
index 62a2511c1c..33e8e827c9 100644
--- a/include/openspace/util/json_helper.inl
+++ b/include/openspace/util/json_helper.inl
@@ -72,7 +72,7 @@ std::string formatJson(T value) {
     }
     else if constexpr (internal::isGlmVector<T>()) {
         std::string values;
-        for (glm::length_t i = 0; i < ghoul::glm_components<T>::value; ++i) {
+        for (glm::length_t i = 0; i < ghoul::glm_components<T>::value; i++) {
             values += std::to_string(value[i]) + ',';
         }
         values.pop_back();
@@ -80,8 +80,8 @@ std::string formatJson(T value) {
     }
     else if constexpr (internal::isGlmMatrix<T>()) {
         std::string values;
-        for (glm::length_t i = 0; i < T::type::row_type::length(); ++i) {
-            for (glm::length_t j = 0; j < T::type::col_type::length(); ++j) {
+        for (glm::length_t i = 0; i < T::type::row_type::length(); i++) {
+            for (glm::length_t j = 0; j < T::type::col_type::length(); j++) {
                 values += std::to_string(value[i][j]) + ',';
             }
         }
diff --git a/include/openspace/util/timeconversion.h b/include/openspace/util/timeconversion.h
index b09dbcb4fd..2fa2bbdb63 100644
--- a/include/openspace/util/timeconversion.h
+++ b/include/openspace/util/timeconversion.h
@@ -144,7 +144,7 @@ constexpr TimeUnit timeUnitFromString(std::string_view unitName) {
             found = i;
             break;
         }
-        ++i;
+        i++;
     }
 
     i = 0;
@@ -153,7 +153,7 @@ constexpr TimeUnit timeUnitFromString(std::string_view unitName) {
             found = i;
             break;
         }
-        ++i;
+        i++;
     }
 
     if (found != -1) {
diff --git a/modules/atmosphere/shaders/inScattering_calc_fs.glsl b/modules/atmosphere/shaders/inScattering_calc_fs.glsl
index 6981419721..3280280d2e 100644
--- a/modules/atmosphere/shaders/inScattering_calc_fs.glsl
+++ b/modules/atmosphere/shaders/inScattering_calc_fs.glsl
@@ -103,7 +103,7 @@ void inscatter(float r, float mu, float muSun, float nu, out vec3 S_R, out vec3
   vec3 S_Ri;
   vec3 S_Mi;
   integrand(r, mu, muSun, nu, 0.0, S_Ri, S_Mi);
-  for (int i = 1; i <= INSCATTER_INTEGRAL_SAMPLES; ++i) {
+  for (int i = 1; i <= INSCATTER_INTEGRAL_SAMPLES; i++) {
     float yj = float(i) * dy;
     vec3 S_Rj;
     vec3 S_Mj;
diff --git a/modules/atmosphere/shaders/inScattering_sup_calc_fs.glsl b/modules/atmosphere/shaders/inScattering_sup_calc_fs.glsl
index e0388ebe2d..753df9fa4d 100644
--- a/modules/atmosphere/shaders/inScattering_sup_calc_fs.glsl
+++ b/modules/atmosphere/shaders/inScattering_sup_calc_fs.glsl
@@ -68,7 +68,7 @@ vec3 inscatter(float r, float mu, float muSun, float nu) {
   // In order to solve the integral from equation (11) we use the trapezoidal rule:
   // Integral(f(y)dy)(from a to b) = ((b-a)/2n_steps)*(Sum(f(y_i+1)+f(y_i)))
   // where y_i+1 = y_j
-  for (int i = 1; i <= INSCATTER_INTEGRAL_SAMPLES; ++i) {
+  for (int i = 1; i <= INSCATTER_INTEGRAL_SAMPLES; i++) {
     float y_j = float(i) * dy;
     vec3 inScatteringRadiance_j = integrand(r, mu, muSun, nu, y_j);
     inScatteringRadiance += (inScatteringRadiance_i + inScatteringRadiance_j) / 2.0 * dy;
diff --git a/modules/atmosphere/shaders/irradiance_sup_calc_fs.glsl b/modules/atmosphere/shaders/irradiance_sup_calc_fs.glsl
index 6a793c7ed5..3fe343ba7c 100644
--- a/modules/atmosphere/shaders/irradiance_sup_calc_fs.glsl
+++ b/modules/atmosphere/shaders/irradiance_sup_calc_fs.glsl
@@ -60,9 +60,9 @@ void main() {
   // In order to solve the integral from equation (15) we use the trapezoidal rule:
   // Integral(f(y)dy)(from a to b) = ((b-a)/2n_steps)*(Sum(f(y_i+1)+f(y_i)))
   vec3 irradianceE = vec3(0.0);
-  for (int iphi = 0; iphi < IRRADIANCE_INTEGRAL_SAMPLES; ++iphi) {
+  for (int iphi = 0; iphi < IRRADIANCE_INTEGRAL_SAMPLES; iphi++) {
     float phi = (float(iphi) + 0.5) * stepPhi;
-    for (int itheta = 0; itheta < IRRADIANCE_INTEGRAL_SAMPLES; ++itheta) {
+    for (int itheta = 0; itheta < IRRADIANCE_INTEGRAL_SAMPLES; itheta++) {
       float theta = (float(itheta) + 0.5) * stepTheta;
       // spherical coordinates: dw = dtheta*dphi*sin(theta)*rho^2
       // rho = 1, we are integrating over a unit sphere
diff --git a/modules/atmosphere/shaders/transmittance_calc_fs.glsl b/modules/atmosphere/shaders/transmittance_calc_fs.glsl
index 23dc23a282..76f3599956 100644
--- a/modules/atmosphere/shaders/transmittance_calc_fs.glsl
+++ b/modules/atmosphere/shaders/transmittance_calc_fs.glsl
@@ -69,7 +69,7 @@ float opticalDepth(float r, float mu, float H) {
   float y_i = exp(-(r - Rg) / H);
 
   float accumulation = 0.0;
-  for (int i = 1; i <= TRANSMITTANCE_STEPS; ++i) {
+  for (int i = 1; i <= TRANSMITTANCE_STEPS; i++) {
     float x_i = float(i) * deltaStep;
     // cosine law for triangles: y_i^2 = a^2 + b^2 - 2abcos(alpha)
     // In this case, a = r, b = x_i and cos(alpha) = cos(PI-zenithView) = mu
diff --git a/modules/base/rendering/grids/renderablegrid.cpp b/modules/base/rendering/grids/renderablegrid.cpp
index 4e7586cc7b..426535503e 100644
--- a/modules/base/rendering/grids/renderablegrid.cpp
+++ b/modules/base/rendering/grids/renderablegrid.cpp
@@ -336,8 +336,8 @@ void RenderableGrid::update(const UpdateData&) {
 
     // If the number of segments are uneven the center won't be completly centered
     const glm::uvec2 center = glm::uvec2(nSegments.x / 2.f, nSegments.y / 2.f);
-    for (unsigned int i = 0; i < nSegments.x; ++i) {
-        for (unsigned int j = 0; j < nSegments.y; ++j) {
+    for (unsigned int i = 0; i < nSegments.x; i++) {
+        for (unsigned int j = 0; j < nSegments.y; j++) {
             const double y0 = -halfSize.y + j * step.y;
             const double y1 = y0 + step.y;
 
@@ -381,7 +381,7 @@ void RenderableGrid::update(const UpdateData&) {
     }
 
     // last x row
-    for (unsigned int i = 0; i < nSegments.x; ++i) {
+    for (unsigned int i = 0; i < nSegments.x; i++) {
         const double x0 = -halfSize.x + i * step.x;
         const double x1 = x0 + step.x;
 
@@ -403,7 +403,7 @@ void RenderableGrid::update(const UpdateData&) {
     }
 
     // last y col
-    for (unsigned int j = 0; j < nSegments.y; ++j) {
+    for (unsigned int j = 0; j < nSegments.y; j++) {
         const double y0 = -halfSize.y + j * step.y;
         const double y1 = y0 + step.y;
 
diff --git a/modules/base/rendering/grids/renderableradialgrid.cpp b/modules/base/rendering/grids/renderableradialgrid.cpp
index 1d3b1f408e..9402602a13 100644
--- a/modules/base/rendering/grids/renderableradialgrid.cpp
+++ b/modules/base/rendering/grids/renderableradialgrid.cpp
@@ -289,7 +289,7 @@ void RenderableRadialGrid::update(const UpdateData&) {
         addRing(_circleSegments, innerRadius);
     }
 
-    for (int i = 0; i < nRadialSegments; ++i) {
+    for (int i = 0; i < nRadialSegments; i++) {
         const float ri = static_cast<float>(i + 1) * deltaRadius + innerRadius;
         addRing(_circleSegments, ri);
     }
@@ -308,7 +308,7 @@ void RenderableRadialGrid::update(const UpdateData&) {
         std::vector<rendering::helper::Vertex> innerVertices =
             rendering::helper::createRing(nLines, innerRadius);
 
-        for (int i = 0; i < nLines; ++i) {
+        for (int i = 0; i < nLines; i++) {
             const rendering::helper::VertexXYZ vOut =
                 rendering::helper::convertToXYZ(outerVertices[i]);
 
diff --git a/modules/base/rendering/grids/renderablesphericalgrid.cpp b/modules/base/rendering/grids/renderablesphericalgrid.cpp
index 7d4d6b3d44..a8e0a44a98 100644
--- a/modules/base/rendering/grids/renderablesphericalgrid.cpp
+++ b/modules/base/rendering/grids/renderablesphericalgrid.cpp
@@ -291,8 +291,8 @@ void RenderableSphericalGrid::update(const UpdateData&) {
         }
         nr = 0;
         // define indices for all triangles
-        for (int i = 1; i <= _segments; ++i) {
-            for (int j = 0; j < _segments; ++j) {
+        for (int i = 1; i <= _segments; i++) {
+            for (int j = 0; j < _segments; j++) {
                 const int t = _segments + 1;
                 _iarray[nr] = t * (i - 1) + j + 0; ++nr;
                 _iarray[nr] = t * (i + 0) + j + 0; ++nr;
diff --git a/modules/base/rendering/pointcloud/renderableinterpolatedpoints.cpp b/modules/base/rendering/pointcloud/renderableinterpolatedpoints.cpp
index 6b8b5daab9..66ed112948 100644
--- a/modules/base/rendering/pointcloud/renderableinterpolatedpoints.cpp
+++ b/modules/base/rendering/pointcloud/renderableinterpolatedpoints.cpp
@@ -392,11 +392,11 @@ std::vector<float> RenderableInterpolatedPoints::createDataSlice() {
         maxRadius = glm::max(maxRadius, r);
 
         // Positions
-        for (int j = 0; j < 3; ++j) {
+        for (int j = 0; j < 3; j++) {
             result.push_back(static_cast<float>(position0[j]));
         }
 
-        for (int j = 0; j < 3; ++j) {
+        for (int j = 0; j < 3; j++) {
             result.push_back(static_cast<float>(position1[j]));
         }
 
@@ -414,11 +414,11 @@ std::vector<float> RenderableInterpolatedPoints::createDataSlice() {
             glm::dvec3 positionBefore = transformedPosition(e00);
             glm::dvec3 positionAfter = transformedPosition(e11);
 
-            for (int j = 0; j < 3; ++j) {
+            for (int j = 0; j < 3; j++) {
                 result.push_back(static_cast<float>(positionBefore[j]));
             }
 
-            for (int j = 0; j < 3; ++j) {
+            for (int j = 0; j < 3; j++) {
                 result.push_back(static_cast<float>(positionAfter[j]));
             }
         }
diff --git a/modules/base/rendering/pointcloud/renderablepointcloud.cpp b/modules/base/rendering/pointcloud/renderablepointcloud.cpp
index 03376aaf8e..df47f5ade4 100644
--- a/modules/base/rendering/pointcloud/renderablepointcloud.cpp
+++ b/modules/base/rendering/pointcloud/renderablepointcloud.cpp
@@ -421,7 +421,7 @@ RenderablePointCloud::SizeSettings::SizeSettings(const ghoul::Dictionary& dictio
 
         if (settings.sizeMapping.has_value()) {
             std::vector<std::string> opts = *settings.sizeMapping;
-            for (size_t i = 0; i < opts.size(); ++i) {
+            for (size_t i = 0; i < opts.size(); i++) {
                 // Note that options are added in order
                 sizeMapping.parameterOption.addOption(static_cast<int>(i), opts[i]);
             }
@@ -1118,7 +1118,7 @@ std::vector<float> RenderablePointCloud::createDataSlice() {
         maxRadius = std::max(maxRadius, r);
 
         // Positions
-        for (int j = 0; j < 3; ++j) {
+        for (int j = 0; j < 3; j++) {
             result.push_back(static_cast<float>(position[j]));
         }
 
diff --git a/modules/base/rendering/renderableplanetimevaryingimage.cpp b/modules/base/rendering/renderableplanetimevaryingimage.cpp
index 01059789bf..156ab6aae5 100644
--- a/modules/base/rendering/renderableplanetimevaryingimage.cpp
+++ b/modules/base/rendering/renderableplanetimevaryingimage.cpp
@@ -143,7 +143,7 @@ void RenderablePlaneTimeVaryingImage::initializeGL() {
     RenderablePlane::initializeGL();
 
     _textureFiles.resize(_sourceFiles.size());
-    for (size_t i = 0; i < _sourceFiles.size(); ++i) {
+    for (size_t i = 0; i < _sourceFiles.size(); i++) {
         _textureFiles[i] = ghoul::io::TextureReader::ref().loadTexture(
             absPath(_sourceFiles[i]).string(),
             2
diff --git a/modules/base/rendering/renderableprism.cpp b/modules/base/rendering/renderableprism.cpp
index 1f1b63b4e4..f9540e469e 100644
--- a/modules/base/rendering/renderableprism.cpp
+++ b/modules/base/rendering/renderableprism.cpp
@@ -230,7 +230,7 @@ void RenderablePrism::updateVertexData() {
     std::vector<VertexXYZ> unitVerticesLines = createRingXYZ(_nLines.value(), 1.f);
 
     // Put base vertices into array
-    for (int j = 0; j < _nShapeSegments; ++j) {
+    for (int j = 0; j < _nShapeSegments; j++) {
         float ux = unitVertices[j].xyz[0];
         float uy = unitVertices[j].xyz[1];
 
@@ -240,7 +240,7 @@ void RenderablePrism::updateVertexData() {
     }
 
     // Put top shape vertices into array
-    for (int j = 0; j < _nShapeSegments; ++j) {
+    for (int j = 0; j < _nShapeSegments; j++) {
         float ux = unitVertices[j].xyz[0];
         float uy = unitVertices[j].xyz[1];
 
@@ -263,7 +263,7 @@ void RenderablePrism::updateVertexData() {
         _vertexArray.push_back(_length);
     }
     else {
-        for (int j = 0; j < _nLines; ++j) {
+        for (int j = 0; j < _nLines; j++) {
             float ux = unitVerticesLines[j].xyz[0];
             float uy = unitVerticesLines[j].xyz[1];
 
@@ -284,7 +284,7 @@ void RenderablePrism::updateVertexData() {
         _nShapeSegments.value() <= std::numeric_limits<uint8_t>::max(),
         "Too many shape segments"
     );
-    for (uint8_t i = 0; i < _nShapeSegments; ++i) {
+    for (uint8_t i = 0; i < _nShapeSegments; i++) {
         _indexArray.push_back(i);
     }
 
@@ -292,12 +292,12 @@ void RenderablePrism::updateVertexData() {
     _indexArray.push_back(255);
 
     // Indices for Top shape
-    for (int i = _nShapeSegments; i < 2 * _nShapeSegments; ++i) {
+    for (int i = _nShapeSegments; i < 2 * _nShapeSegments; i++) {
         _indexArray.push_back(static_cast<uint8_t>(i));
     }
 
     // Indices for connecting lines
-    for (int i = 0, k = 0; i < _nLines; ++i, k += 2) {
+    for (int i = 0, k = 0; i < _nLines; i++, k += 2) {
         // Reset
         _indexArray.push_back(255);
 
diff --git a/modules/base/rendering/renderabletrailorbit.cpp b/modules/base/rendering/renderabletrailorbit.cpp
index 81db88850c..8fd3bd1993 100644
--- a/modules/base/rendering/renderabletrailorbit.cpp
+++ b/modules/base/rendering/renderabletrailorbit.cpp
@@ -387,7 +387,7 @@ RenderableTrailOrbit::UpdateReport RenderableTrailOrbit::updateTrails(
             return { false, true, UpdateReport::All };
         }
 
-        for (int i = 0; i < nNewPoints; ++i) {
+        for (int i = 0; i < nNewPoints; i++) {
             _lastPointTime += secondsPerPoint;
 
             // Get the new permanent point and write it into the (previously) floating
@@ -427,7 +427,7 @@ RenderableTrailOrbit::UpdateReport RenderableTrailOrbit::updateTrails(
             return { false, true, UpdateReport::All };
         }
 
-        for (int i = 0; i < nNewPoints; ++i) {
+        for (int i = 0; i < nNewPoints; i++) {
             _firstPointTime -= secondsPerPoint;
 
             // Get the new permanent point and write it into the (previously) floating
@@ -478,7 +478,7 @@ void RenderableTrailOrbit::fullSweep(double time) {
     const double periodSeconds = _period * duration_cast<seconds>(hours(24)).count();
     const double secondsPerPoint = periodSeconds / (_resolution - 1);
     // starting at 1 because the first position is a floating current one
-    for (int i = 1; i < _resolution; ++i) {
+    for (int i = 1; i < _resolution; i++) {
         const glm::vec3 p = _translation->position({ {}, Time(time), Time(0.0) });
         _vertexArray[i] = { p.x, p.y, p.z };
 
diff --git a/modules/base/rendering/renderabletrailtrajectory.cpp b/modules/base/rendering/renderabletrailtrajectory.cpp
index 4021811678..33e2a2159c 100644
--- a/modules/base/rendering/renderabletrailtrajectory.cpp
+++ b/modules/base/rendering/renderabletrailtrajectory.cpp
@@ -239,7 +239,7 @@ void RenderableTrailTrajectory::update(const UpdateData& data) {
         unsigned int stopIndex = std::min(nextIndex, _numberOfVertices);
 
         // Calculate all vertex positions
-        for (unsigned int i = startIndex; i < stopIndex; ++i) {
+        for (unsigned int i = startIndex; i < stopIndex; i++) {
             const glm::vec3 p = _translation->position({
                 {},
                 Time(_start + i * _totalSampleInterval),
diff --git a/modules/base/rotation/luarotation.cpp b/modules/base/rotation/luarotation.cpp
index 648475cb6f..7815131c9a 100644
--- a/modules/base/rotation/luarotation.cpp
+++ b/modules/base/rotation/luarotation.cpp
@@ -117,7 +117,7 @@ glm::dmat3 LuaRotation::matrix(const UpdateData& data) const {
     }
 
     double values[9];
-    for (int i = 0; i < 9; ++i) {
+    for (int i = 0; i < 9; i++) {
         values[i] = luaL_checknumber(_state, -1 - i);
     }
 
diff --git a/modules/base/shaders/model_fs.glsl b/modules/base/shaders/model_fs.glsl
index 79f6f9dc69..c15de3dc49 100644
--- a/modules/base/shaders/model_fs.glsl
+++ b/modules/base/shaders/model_fs.glsl
@@ -139,7 +139,7 @@ Fragment getFragment() {
 
     vec3 viewDirection = normalize(vs_positionCameraSpace.xyz);
 
-    for (int i = 0; i < nLightSources; ++i) {
+    for (int i = 0; i < nLightSources; i++) {
       // Diffuse light
       vec3 lightDirection = lightDirectionsViewSpace[i];
       float diffuseFactor =  max(dot(normal, lightDirection), 0.0);
diff --git a/modules/base/translation/luatranslation.cpp b/modules/base/translation/luatranslation.cpp
index c97424af4a..bdafa4b592 100644
--- a/modules/base/translation/luatranslation.cpp
+++ b/modules/base/translation/luatranslation.cpp
@@ -120,7 +120,7 @@ glm::dvec3 LuaTranslation::position(const UpdateData& data) const {
     }
 
     double values[3];
-    for (int i = 1; i <= 3; ++i) {
+    for (int i = 1; i <= 3; i++) {
         values[i - 1] = ghoul::lua::value<double>(_state, i);
     }
 
diff --git a/modules/digitaluniverse/rendering/renderabledumeshes.cpp b/modules/digitaluniverse/rendering/renderabledumeshes.cpp
index 6037e07b95..dd4bd817aa 100644
--- a/modules/digitaluniverse/rendering/renderabledumeshes.cpp
+++ b/modules/digitaluniverse/rendering/renderabledumeshes.cpp
@@ -255,7 +255,7 @@ RenderableDUMeshes::RenderableDUMeshes(const ghoul::Dictionary& dictionary)
 
     if (p.meshColor.has_value()) {
         std::vector<glm::vec3> ops = *p.meshColor;
-        for (size_t i = 0; i < ops.size(); ++i) {
+        for (size_t i = 0; i < ops.size(); i++) {
             _meshColorMap.insert({ static_cast<int>(i) + 1, ops[i] });
         }
     }
@@ -304,7 +304,7 @@ void RenderableDUMeshes::initializeGL() {
 
 void RenderableDUMeshes::deinitializeGL() {
     for (const std::pair<const int, RenderingMesh>& pair : _renderingMeshesMap) {
-        for (int i = 0; i < pair.second.numU; ++i) {
+        for (int i = 0; i < pair.second.numU; i++) {
             glDeleteVertexArrays(1, &pair.second.vaoArray[i]);
             glDeleteBuffers(1, &pair.second.vboArray[i]);
         }
@@ -336,7 +336,7 @@ void RenderableDUMeshes::renderMeshes(const RenderData&,
 
     for (const std::pair<const int, RenderingMesh>& pair : _renderingMeshesMap) {
         _program->setUniform(_uniformCache.color, _meshColorMap[pair.second.colorIndex]);
-        for (size_t i = 0; i < pair.second.vaoArray.size(); ++i) {
+        for (size_t i = 0; i < pair.second.vaoArray.size(); i++) {
             glBindVertexArray(pair.second.vaoArray[i]);
             switch (pair.second.style) {
                 case Solid:
@@ -563,7 +563,7 @@ bool RenderableDUMeshes::readSpeckFile() {
                 // Try to read three values for the position
                 glm::vec3 pos;
                 bool success = true;
-                for (int i = 0; i < 3; ++i) {
+                for (int i = 0; i < 3; i++) {
                     GLfloat value;
                     lineData >> value;
                     bool errorReading = lineData.rdstate() & std::ifstream::failbit;
@@ -592,7 +592,7 @@ bool RenderableDUMeshes::readSpeckFile() {
                 // OLD CODE:
                 // (2022-03-23, emmbr)  None of our files included texture coordinates,
                 // and if they would they would still not be used by the shader
-                //for (int i = 0; i < 7; ++i) {
+                //for (int i = 0; i < 7; i++) {
                 //    GLfloat value;
                 //    lineData >> value;
                 //    bool errorReading = lineData.rdstate() & std::ifstream::failbit;
@@ -626,7 +626,7 @@ void RenderableDUMeshes::createMeshes() {
     LDEBUG("Creating planes");
 
     for (std::pair<const int, RenderingMesh>& p : _renderingMeshesMap) {
-        for (int i = 0; i < p.second.numU; ++i) {
+        for (int i = 0; i < p.second.numU; i++) {
             GLuint vao;
             glGenVertexArrays(1, &vao);
             p.second.vaoArray.push_back(vao);
@@ -685,7 +685,7 @@ void RenderableDUMeshes::createMeshes() {
 
         // Grid: we need columns
         if (p.second.numU > 1) {
-            for (int i = 0; i < p.second.numV; ++i) {
+            for (int i = 0; i < p.second.numV; i++) {
                 GLuint cvao;
                 glGenVertexArrays(1, &cvao);
                 p.second.vaoArray.push_back(cvao);
diff --git a/modules/digitaluniverse/rendering/renderableplanescloud.cpp b/modules/digitaluniverse/rendering/renderableplanescloud.cpp
index 7c4a801dc0..4ab564e3ea 100644
--- a/modules/digitaluniverse/rendering/renderableplanescloud.cpp
+++ b/modules/digitaluniverse/rendering/renderableplanescloud.cpp
@@ -587,7 +587,7 @@ void RenderablePlanesCloud::createPlanes() {
             glm::vec4 vertex2 = transformedPos - u + v;
             glm::vec4 vertex4 = transformedPos + u - v;
 
-            for (int i = 0; i < 3; ++i) {
+            for (int i = 0; i < 3; i++) {
                 maxSize = std::max(maxSize, vertex0[i]);
                 maxSize = std::max(maxSize, vertex1[i]);
                 maxSize = std::max(maxSize, vertex2[i]);
@@ -613,7 +613,7 @@ void RenderablePlanesCloud::createPlanes() {
             std::unordered_map<int, PlaneAggregate>::iterator found =
                 _planesMap.find(textureIndex);
             if (found != _planesMap.end()) {
-                for (int i = 0; i < PlanesVertexDataSize; ++i) {
+                for (int i = 0; i < PlanesVertexDataSize; i++) {
                     found->second.planesCoordinates.push_back(VertexData[i]);
                 }
                 found->second.numberOfPlanes++;
@@ -624,7 +624,7 @@ void RenderablePlanesCloud::createPlanes() {
                 glGenVertexArrays(1, &pA.vao);
                 glGenBuffers(1, &pA.vbo);
                 pA.numberOfPlanes = 1;
-                for (int i = 0; i < PlanesVertexDataSize; ++i) {
+                for (int i = 0; i < PlanesVertexDataSize; i++) {
                     pA.planesCoordinates.push_back(VertexData[i]);
                 }
                 _planesMap.insert(std::pair(textureIndex, pA));
diff --git a/modules/exoplanets/exoplanetsmodule_lua.inl b/modules/exoplanets/exoplanetsmodule_lua.inl
index 4d78edbf45..4adc13639d 100644
--- a/modules/exoplanets/exoplanetsmodule_lua.inl
+++ b/modules/exoplanets/exoplanetsmodule_lua.inl
@@ -685,8 +685,8 @@ listOfExoplanetsDeprecated()
     std::vector<std::string> names = hostStarsWithSufficientData();
 
     std::string output;
-    for (auto it = names.begin(); it != names.end(); ++it) {
-        output += *it + ", ";
+    for (const std::string& name : names) {
+        output += name + ", ";
     }
     output.pop_back();
     output.pop_back();
diff --git a/modules/fieldlines/rendering/renderablefieldlines.cpp b/modules/fieldlines/rendering/renderablefieldlines.cpp
index 919310d3e6..295121b017 100644
--- a/modules/fieldlines/rendering/renderablefieldlines.cpp
+++ b/modules/fieldlines/rendering/renderablefieldlines.cpp
@@ -292,7 +292,7 @@ void RenderableFieldlines::update(const UpdateData&) {
         int prevEnd = 0;
         std::vector<LinePoint> vertexData;
         // Arrange data for glMultiDrawArrays
-        for (size_t j = 0; j < fieldlines.size(); ++j) {
+        for (size_t j = 0; j < fieldlines.size(); j++) {
             _lineStart.push_back(prevEnd);
             _lineCount.push_back(static_cast<int>(fieldlines[j].size()));
             prevEnd = prevEnd + static_cast<int>(fieldlines[j].size());
diff --git a/modules/fieldlinessequence/rendering/renderablefieldlinessequence.cpp b/modules/fieldlinessequence/rendering/renderablefieldlinessequence.cpp
index a40f28615d..7a7b2ba9ac 100644
--- a/modules/fieldlinessequence/rendering/renderablefieldlinessequence.cpp
+++ b/modules/fieldlinessequence/rendering/renderablefieldlinessequence.cpp
@@ -674,7 +674,7 @@ void RenderableFieldlinesSequence::setupProperties() {
         // the given sequence have the same extra quantities
         const size_t nExtraQuantities = _states[0].nExtraQuantities();
         const std::vector<std::string>& extraNamesVec = _states[0].extraQuantityNames();
-        for (int i = 0; i < static_cast<int>(nExtraQuantities); ++i) {
+        for (int i = 0; i < static_cast<int>(nExtraQuantities); i++) {
             _colorQuantity.addOption(i, extraNamesVec[i]);
             _maskingQuantity.addOption(i, extraNamesVec[i]);
         }
diff --git a/modules/fieldlinessequence/util/fieldlinesstate.cpp b/modules/fieldlinessequence/util/fieldlinesstate.cpp
index 6645783fe3..3f07ccbd05 100644
--- a/modules/fieldlinessequence/util/fieldlinesstate.cpp
+++ b/modules/fieldlinessequence/util/fieldlinesstate.cpp
@@ -122,7 +122,7 @@ bool FieldlinesState::loadStateFromOsfls(const std::string& pathToOsflsFile) {
     allNamesInOne.assign(buffer.data(), byteSizeAllNames);
 
     size_t offset = 0;
-    for (size_t i = 0; i < nExtras; ++i) {
+    for (size_t i = 0; i < nExtras; i++) {
         auto endOfVarName = allNamesInOne.find('\0', offset);
         endOfVarName -= offset;
         const std::string varName = allNamesInOne.substr(offset, endOfVarName);
@@ -172,7 +172,7 @@ bool FieldlinesState::loadStateFromJson(const std::string& pathToJsonFile,
             return false;
         }
 
-        for (size_t i = nPosComponents ; i < nVariables ; ++i) {
+        for (size_t i = nPosComponents; i < nVariables; i++) {
             _extraQuantityNames.push_back(variableNameVec[i]);
         }
     }
@@ -188,7 +188,7 @@ bool FieldlinesState::loadStateFromJson(const std::string& pathToJsonFile,
         const std::vector<std::vector<float>>& jData = (*lineIter)[sTrace][sData];
         const size_t nPoints = jData.size();
 
-        for (size_t j = 0; j < nPoints; ++j) {
+        for (size_t j = 0; j < nPoints; j++) {
             const std::vector<float>& variables = jData[j];
 
             // Expects the x, y and z variables to be stored first!
@@ -205,7 +205,7 @@ bool FieldlinesState::loadStateFromJson(const std::string& pathToJsonFile,
 
             // Add the extra quantites. Stored in the same array as the x,y,z variables.
             // Hence index of the first extra quantity = 3
-            for (size_t xtraIdx = 3, k = 0 ; k < nExtras; ++k, ++xtraIdx) {
+            for (size_t xtraIdx = 3, k = 0; k < nExtras; k++, xtraIdx++) {
                 _extraQuantities[k].push_back(variables[xtraIdx]);
             }
         }
diff --git a/modules/fieldlinessequence/util/kameleonfieldlinehelper.cpp b/modules/fieldlinessequence/util/kameleonfieldlinehelper.cpp
index 6c73961192..abaf4a3431 100644
--- a/modules/fieldlinessequence/util/kameleonfieldlinehelper.cpp
+++ b/modules/fieldlinessequence/util/kameleonfieldlinehelper.cpp
@@ -243,7 +243,7 @@ void addExtraQuantities(ccmc::Kameleon* kameleon,
             state.appendToExtra(i, val);
         }
         // Calculate and store the magnitudes!
-        for (size_t i = 0; i < nXtraMagnitudes; ++i) {
+        for (size_t i = 0; i < nXtraMagnitudes; i++) {
             const size_t idx = i*3;
 
             const float x = interpolator->interpolate(extraMagVars[idx]  , p.x, p.y, p.z);
@@ -292,7 +292,7 @@ void prepareStateAndKameleonForExtras(ccmc::Kameleon* kameleon,
 
     // Load the existing SCALAR variables into kameleon.
     // Remove non-existing variables from vector
-    for (int i = 0; i < static_cast<int>(extraScalarVars.size()); ++i) {
+    for (int i = 0; i < static_cast<int>(extraScalarVars.size()); i++) {
         std::string& str = extraScalarVars[i];
         bool success = kameleon->doesVariableExist(str) && kameleon->loadVariable(str);
         if (!success &&
diff --git a/modules/fitsfilereader/src/fitsfilereader.cpp b/modules/fitsfilereader/src/fitsfilereader.cpp
index fa90651c72..0b74ec0497 100644
--- a/modules/fitsfilereader/src/fitsfilereader.cpp
+++ b/modules/fitsfilereader/src/fitsfilereader.cpp
@@ -165,7 +165,7 @@ std::shared_ptr<TableData<T>> FitsFileReader::readTable(const std::filesystem::p
                 endRow = numRowsInTable;
             }
 
-            for (int i = 0; i < numCols; ++i) {
+            for (int i = 0; i < numCols; i++) {
                 std::vector<T> columnData;
                 //LINFO("Read column: " + columnNames[i]);
                 table.column(columnNames[i]).read(columnData, firstRow, endRow);
@@ -288,7 +288,7 @@ std::vector<float> FitsFileReader::readFitsFile(std::filesystem::path filePath,
     std::vector<float> tycho_v_err = std::move(tableContent[allColumnNames[16]]);
 
     // Construct data array. OBS: ORDERING IS IMPORTANT! This is where slicing happens.
-    for (int i = 0; i < nStars * multiplier; ++i) {
+    for (int i = 0; i < nStars * multiplier; i++) {
         std::vector<float> values(nValuesPerStar);
         size_t idx = 0;
 
@@ -345,7 +345,7 @@ std::vector<float> FitsFileReader::readFitsFile(std::filesystem::path filePath,
             values[idx++] = vecData[i];
         }
 
-        for (int j = 0; j < nValuesPerStar; ++j) {
+        for (int j = 0; j < nValuesPerStar; j++) {
             // The astronomers in Vienna use -999 as default value. Change it to 0.
             if (values[j] == -999) {
                 values[j] = 0.f;
@@ -413,7 +413,7 @@ std::vector<float> FitsFileReader::readFitsFile(std::filesystem::path filePath,
     std::vector<float> radial_vel = std::move(tableContent[allColumnNames[8]]);
 
     // Construct data array. OBS: ORDERING IS IMPORTANT! This is where slicing happens.
-    for (int i = 0; i < nStars; ++i) {
+    for (int i = 0; i < nStars; i++) {
         std::vector<float> values(nValuesPerStar);
         size_t idx = 0;
 
@@ -601,7 +601,7 @@ std::vector<float> FitsFileReader::readSpeckFile(const std::filesystem::path& fi
         std::stringstream str(line);
 
         // Read values.
-        for (int i = 0; i < nValuesPerStar; ++i) {
+        for (int i = 0; i < nValuesPerStar; i++) {
             str >> readValues[i];
         }
 
diff --git a/modules/gaia/rendering/octreeculler.cpp b/modules/gaia/rendering/octreeculler.cpp
index dff3d8dc70..74f5641703 100644
--- a/modules/gaia/rendering/octreeculler.cpp
+++ b/modules/gaia/rendering/octreeculler.cpp
@@ -72,7 +72,7 @@ void OctreeCuller::createNodeBounds(const std::vector<glm::dvec4>& corners,
     // Create a bounding box in clipping space from node boundaries.
     _nodeBounds = globebrowsing::AABB3();
 
-    for (size_t i = 0; i < 8; ++i) {
+    for (size_t i = 0; i < 8; i++) {
         glm::dvec4 cornerClippingSpace = mvp * corners[i];
         glm::dvec4 ndc = (1.f / glm::abs(cornerClippingSpace.w)) * cornerClippingSpace;
         expand(_nodeBounds, glm::dvec3(ndc));
diff --git a/modules/gaia/rendering/octreemanager.cpp b/modules/gaia/rendering/octreemanager.cpp
index 6a58b3bbf0..48e15fbba0 100644
--- a/modules/gaia/rendering/octreemanager.cpp
+++ b/modules/gaia/rendering/octreemanager.cpp
@@ -72,7 +72,7 @@ void OctreeManager::initOctree(long long cpuRamBudget, int maxDist, int maxStars
         MAX_STARS_PER_NODE = static_cast<size_t>(maxStarsPerNode);
     }
 
-    for (size_t i = 0; i < 8; ++i) {
+    for (size_t i = 0; i < 8; i++) {
         _numLeafNodes++;
         _root->Children[i] = std::make_shared<OctreeNode>();
         _root->Children[i]->posData = std::vector<float>();
@@ -127,7 +127,7 @@ void OctreeManager::sliceLodData(size_t branchIndex) {
         sliceNodeLodCache(*_root->Children[branchIndex]);
     }
     else {
-        for (int i = 0; i < 7; ++i) {
+        for (int i = 0; i < 7; i++) {
             sliceNodeLodCache(*_root->Children[i]);
         }
     }
@@ -136,7 +136,7 @@ void OctreeManager::sliceLodData(size_t branchIndex) {
 void OctreeManager::printStarsPerNode() const {
     std::string accumulatedString;
 
-    for (int i = 0; i < 8; ++i) {
+    for (int i = 0; i < 8; i++) {
         std::string prefix = "{" + std::to_string(i);
         accumulatedString += printStarsPerNode(*_root->Children[i], prefix);
     }
@@ -159,7 +159,7 @@ void OctreeManager::fetchSurroundingNodes(const glm::dvec3& cameraPos,
             // Fetch first layer of children
             fetchChildrenNodes(*_root, 0);
 
-            for (int i = 0; i < 8; ++i) {
+            for (int i = 0; i < 8; i++) {
                 // Check so branch doesn't have a single layer.
                 if (_root->Children[i]->isLeaf) {
                     continue;
@@ -437,7 +437,7 @@ std::map<int, std::vector<float>> OctreeManager::traverseData(const glm::dmat4&
     // Check if entire tree is too small to see, and if so remove it.
     std::vector<glm::dvec4> corners(8);
     float fMaxDist = static_cast<float>(MAX_DIST);
-    for (int i = 0; i < 8; ++i) {
+    for (int i = 0; i < 8; i++) {
         float x = (i % 2 == 0) ? fMaxDist : -fMaxDist;
         float y = (i % 4 < 2) ? fMaxDist : -fMaxDist;
         float z = (i < 4) ? fMaxDist : -fMaxDist;
@@ -451,7 +451,7 @@ std::map<int, std::vector<float>> OctreeManager::traverseData(const glm::dmat4&
     float totalPixels = nodeSize.x * nodeSize.y;
     if (totalPixels < _minTotalPixelsLod * 2) {
         // Remove LOD from first layer of children.
-        for (int i = 0; i < 8; ++i) {
+        for (int i = 0; i < 8; i++) {
             std::map<int, std::vector<float>> tmpData = removeNodeFromCache(
                 *_root->Children[i],
                 deltaStars
@@ -461,7 +461,7 @@ std::map<int, std::vector<float>> OctreeManager::traverseData(const glm::dmat4&
         return renderData;
     }
 
-    for (size_t i = 0; i < 8; ++i) {
+    for (size_t i = 0; i < 8; i++) {
         if (i < _traversedBranchesInRenderCall) {
             continue;
         }
@@ -524,7 +524,7 @@ std::map<int, std::vector<float>> OctreeManager::traverseData(const glm::dmat4&
 std::vector<float> OctreeManager::getAllData(gaia::RenderMode mode) {
     std::vector<float> fullData;
 
-    for (size_t i = 0; i < 8; ++i) {
+    for (size_t i = 0; i < 8; i++) {
         std::vector<float> tmpData = getNodeData(*_root->Children[i], mode);
         fullData.insert(fullData.end(), tmpData.begin(), tmpData.end());
     }
@@ -537,7 +537,7 @@ void OctreeManager::clearAllData(int branchIndex) {
         clearNodeData(*_root->Children[branchIndex]);
     }
     else {
-        for (size_t i = 0; i < 8; ++i) {
+        for (size_t i = 0; i < 8; i++) {
             clearNodeData(*_root->Children[i]);
         }
     }
@@ -552,7 +552,7 @@ void OctreeManager::writeToFile(std::ofstream& outFileStream, bool writeData) {
     outFileStream.write(reinterpret_cast<const char*>(&MAX_DIST), sizeof(int32_t));
 
     // Use pre-traversal (Morton code / Z-order).
-    for (size_t i = 0; i < 8; ++i) {
+    for (size_t i = 0; i < 8; i++) {
         writeNodeToFile(outFileStream, *_root->Children[i], writeData);
     }
 }
@@ -582,7 +582,7 @@ void OctreeManager::writeNodeToFile(std::ofstream& outFileStream, const OctreeNo
 
     // Write children to file (in Morton order) if we're in an inner node.
     if (!node.isLeaf) {
-        for (size_t i = 0; i < 8; ++i) {
+        for (size_t i = 0; i < 8; i++) {
             writeNodeToFile(outFileStream, *node.Children[i], writeData);
         }
     }
@@ -612,7 +612,7 @@ int OctreeManager::readFromFile(std::ifstream& inFileStream, bool readData,
 
     // Octree Manager root halfDistance must be updated before any nodes are created!
     if (static_cast<int>(MAX_DIST) != oldMaxdist) {
-        for (size_t i = 0; i < 8; ++i) {
+        for (size_t i = 0; i < 8; i++) {
             _root->Children[i]->halfDimension = MAX_DIST / 2.f;
             _root->Children[i]->originX = (i % 2 == 0) ?
                 _root->Children[i]->halfDimension :
@@ -631,7 +631,7 @@ int OctreeManager::readFromFile(std::ifstream& inFileStream, bool readData,
     }
 
     // Use the same technique to construct octree from file.
-    for (size_t i = 0; i < 8; ++i) {
+    for (size_t i = 0; i < 8; i++) {
         nStarsRead += readNodeFromFile(inFileStream, *_root->Children[i], readData);
     }
     return nStarsRead;
@@ -675,7 +675,7 @@ int OctreeManager::readNodeFromFile(std::ifstream& inFileStream, OctreeNode& nod
     if (!node.isLeaf) {
         numStars = 0;
         createNodeChildren(node);
-        for (size_t i = 0; i < 8; ++i) {
+        for (size_t i = 0; i < 8; i++) {
             numStars += readNodeFromFile(inFileStream, *node.Children[i], readData);
         }
     }
@@ -730,7 +730,7 @@ void OctreeManager::writeNodeToMultipleFiles(const std::string& outFilePrefix,
     // Recursively write children to file (in Morton order) if we're in an inner node.
     if (!node.isLeaf) {
         std::vector<std::thread> writeThreads(8);
-        for (size_t i = 0; i < 8; ++i) {
+        for (size_t i = 0; i < 8; i++) {
             std::string newOutFilePrefix = outFilePrefix + std::to_string(i);
             if (threadWrites) {
                 // Divide writing to new threads to speed up the process.
@@ -760,7 +760,7 @@ void OctreeManager::fetchChildrenNodes(OctreeNode& parentNode,
     // Lock node to make sure nobody else are trying to load the same children.
     std::lock_guard lock(parentNode.loadingLock);
 
-    for (int i = 0; i < 8; ++i) {
+    for (int i = 0; i < 8; i++) {
         // Fetch node data if we're streaming and it doesn't exist in RAM yet.
         // (As long as there is any RAM budget left and node actually has any data!)
         if (!parentNode.Children[i]->isLoaded &&
@@ -1050,7 +1050,7 @@ void OctreeManager::sliceNodeLodCache(OctreeNode& node) {
         node.velData = std::move(tmpVel);
         node.numStars = node.magOrder.size(); // = MAX_STARS_PER_NODE
 
-        for (int i = 0; i < 8; ++i) {
+        for (int i = 0; i < 8; i++) {
             sliceNodeLodCache(*node.Children[i]);
         }
     }
@@ -1090,7 +1090,7 @@ std::string OctreeManager::printStarsPerNode(const OctreeNode& node,
     }
     else {
         str += fmt::format("LOD: {} - [Parent]\n", node.posData.size() / POS_SIZE);
-        for (int i = 0; i < 8; ++i) {
+        for (int i = 0; i < 8; i++) {
             auto pref = prefix + "->" + std::to_string(i);
             str += printStarsPerNode(*node.Children[i], pref);
         }
@@ -1108,7 +1108,7 @@ std::map<int, std::vector<float>> OctreeManager::checkNodeIntersection(OctreeNod
 
     // Calculate the corners of the node.
     std::vector<glm::dvec4> corners(8);
-    for (int i = 0; i < 8; ++i) {
+    for (int i = 0; i < 8; i++) {
         const float x = (i % 2 == 0) ?
             node.originX + node.halfDimension :
             node.originX - node.halfDimension;
@@ -1160,7 +1160,7 @@ std::map<int, std::vector<float>> OctreeManager::checkNodeIntersection(OctreeNod
                 }
 
                 // We're in an inner node, remove indices from potential children in cache
-                for (int i = 0; i < 8; ++i) {
+                for (int i = 0; i < 8; i++) {
                     std::map<int, std::vector<float>> tmpData = removeNodeFromCache(
                         *node.Children[i],
                         deltaStars
@@ -1202,7 +1202,7 @@ std::map<int, std::vector<float>> OctreeManager::checkNodeIntersection(OctreeNod
     fetchedData = removeNodeFromCache(node, deltaStars, false);
 
     // Recursively check if children should be rendered.
-    for (size_t i = 0; i < 8; ++i) {
+    for (size_t i = 0; i < 8; i++) {
         // Observe that if there exists identical keys in fetchedData then those values in
         // tmpData will be ignored! Thus we store the removed keys until next render call!
         std::map<int, std::vector<float>> tmpData = checkNodeIntersection(
@@ -1242,7 +1242,7 @@ std::map<int, std::vector<float>> OctreeManager::removeNodeFromCache(OctreeNode&
 
     // Check children recursively if we're in an inner node.
     if (!(node.isLeaf) && recursive) {
-        for (int i = 0; i < 8; ++i) {
+        for (int i = 0; i < 8; i++) {
             std::map<int, std::vector<float>> tmpData = removeNodeFromCache(
                 *node.Children[i],
                 deltaStars
@@ -1264,7 +1264,7 @@ std::vector<float> OctreeManager::getNodeData(const OctreeNode& node,
 
     // If we're not in a leaf, get data from all children recursively.
     std::vector<float> nodeData;
-    for (size_t i = 0; i < 8; ++i) {
+    for (size_t i = 0; i < 8; i++) {
         std::vector<float> tmpData = getNodeData(*node.Children[i], mode);
         nodeData.insert(nodeData.end(), tmpData.begin(), tmpData.end());
     }
@@ -1286,14 +1286,14 @@ void OctreeManager::clearNodeData(OctreeNode& node) {
 
     if (!node.isLeaf) {
         // Remove data from all children recursively.
-        for (size_t i = 0; i < 8; ++i) {
+        for (size_t i = 0; i < 8; i++) {
             clearNodeData(*node.Children[i]);
         }
     }
 }
 
 void OctreeManager::createNodeChildren(OctreeNode& node) {
-    for (size_t i = 0; i < 8; ++i) {
+    for (size_t i = 0; i < 8; i++) {
         _numLeafNodes++;
         node.Children[i] = std::make_shared<OctreeNode>();
         node.Children[i]->isLeaf = true;
diff --git a/modules/gaia/rendering/renderablegaiastars.cpp b/modules/gaia/rendering/renderablegaiastars.cpp
index b7175d4b21..c32593c0bd 100644
--- a/modules/gaia/rendering/renderablegaiastars.cpp
+++ b/modules/gaia/rendering/renderablegaiastars.cpp
@@ -1042,7 +1042,7 @@ void RenderableGaiaStars::render(const RenderData& data, RendererTasks&) {
             int changeInValue = newValue - _accumulatedIndices[offset + 1];
             _accumulatedIndices[offset + 1] = newValue;
             // Propagate change.
-            for (int i = offset + 1; i < nChunksToRender; ++i) {
+            for (int i = offset + 1; i < nChunksToRender; i++) {
                 _accumulatedIndices[i + 1] += changeInValue;
             }
         }
diff --git a/modules/gaia/tasks/constructoctreetask.cpp b/modules/gaia/tasks/constructoctreetask.cpp
index 52df7a11a6..ea459006d2 100644
--- a/modules/gaia/tasks/constructoctreetask.cpp
+++ b/modules/gaia/tasks/constructoctreetask.cpp
@@ -475,7 +475,7 @@ void ConstructOctreeTask::constructOctreeFromFolder(
         _indexOctreeManager->maxDist(), _indexOctreeManager->maxStarsPerNode()
     ));
 
-    for (size_t idx = 0; idx < allInputFiles.size(); ++idx) {
+    for (size_t idx = 0; idx < allInputFiles.size(); idx++) {
         std::filesystem::path inFilePath = allInputFiles[idx];
         int nStarsInfile = 0;
 
@@ -608,7 +608,7 @@ void ConstructOctreeTask::constructOctreeFromFolder(
     }
 
     // Make sure all threads are done.
-    for (int i = 0; i < 8; ++i) {
+    for (int i = 0; i < 8; i++) {
         writeThreads[i].join();
     }
 }
diff --git a/modules/gaia/tasks/readfilejob.cpp b/modules/gaia/tasks/readfilejob.cpp
index 0aeb5d4252..fb7e5a287b 100644
--- a/modules/gaia/tasks/readfilejob.cpp
+++ b/modules/gaia/tasks/readfilejob.cpp
@@ -100,7 +100,7 @@ void ReadFileJob::execute() {
 
 
     // Construct data array. OBS: ORDERING IS IMPORTANT! This is where slicing happens.
-    for (int i = 0; i < nStars; ++i) {
+    for (int i = 0; i < nStars; i++) {
         std::vector<float> values(_nValuesPerStar);
         size_t idx = 0;
 
diff --git a/modules/gaia/tasks/readfitstask.cpp b/modules/gaia/tasks/readfitstask.cpp
index cf978b3b94..d7d9d05adf 100644
--- a/modules/gaia/tasks/readfitstask.cpp
+++ b/modules/gaia/tasks/readfitstask.cpp
@@ -271,7 +271,7 @@ void ReadFitsTask::readAllFitsFilesFromFolder(const Task::ProgressCallback&) {
 
             finishedJobs++;
 
-            for (int i = 0; i < 8; ++i) {
+            for (int i = 0; i < 8; i++) {
                 // Add read values to global octant and check if it's time to write!
                 octants[i].insert(
                     octants[i].end(),
diff --git a/modules/galaxy/rendering/renderablegalaxy.cpp b/modules/galaxy/rendering/renderablegalaxy.cpp
index 1e4b162861..d9d6293338 100644
--- a/modules/galaxy/rendering/renderablegalaxy.cpp
+++ b/modules/galaxy/rendering/renderablegalaxy.cpp
@@ -749,7 +749,7 @@ RenderableGalaxy::Result RenderableGalaxy::loadPointFile() {
     // Read points
     for (size_t i = 0;
         i < static_cast<size_t>(_nPoints * _enabledPointsRatio.maxValue()) + 1;
-        ++i)
+        i++)
     {
         float x, y, z, r, g, b, a;
         std::getline(pointFile, line);
diff --git a/modules/galaxy/tasks/milkywaypointsconversiontask.cpp b/modules/galaxy/tasks/milkywaypointsconversiontask.cpp
index 93affdf86e..dd4cca68b3 100644
--- a/modules/galaxy/tasks/milkywaypointsconversiontask.cpp
+++ b/modules/galaxy/tasks/milkywaypointsconversiontask.cpp
@@ -65,7 +65,7 @@ void MilkywayPointsConversionTask::perform(const Task::ProgressCallback& progres
     float b;
     float a;
 
-    for (int64_t i = 0; i < nPoints; ++i) {
+    for (int64_t i = 0; i < nPoints; i++) {
         in >> x >> y >> z >> r >> g >> b >> a;
         if (in.good()) {
             pointData[i * 7 + 0] = x;
diff --git a/modules/globebrowsing/globebrowsingmodule.cpp b/modules/globebrowsing/globebrowsingmodule.cpp
index c1aeefcced..d88976dcfd 100644
--- a/modules/globebrowsing/globebrowsingmodule.cpp
+++ b/modules/globebrowsing/globebrowsingmodule.cpp
@@ -136,7 +136,7 @@ namespace {
 
         int currentLayerNumber = -1;
         Layer currentLayer;
-        for (int i = 0; i < nSubdatasets; ++i) {
+        for (int i = 0; i < nSubdatasets; i++) {
             int iDataset = -1;
             std::array<char, 256> IdentifierBuffer;
             std::fill(IdentifierBuffer.begin(), IdentifierBuffer.end(), '\0');
@@ -634,7 +634,7 @@ GlobeBrowsingModule::urlInfo(const std::string& globe) const
 {
     const auto range = _urlList.equal_range(globe);
     std::vector<UrlInfo> res;
-    for (auto i = range.first; i != range.second; ++i) {
+    for (auto i = range.first; i != range.second; i++) {
         res.emplace_back(i->second);
     }
     return res;
diff --git a/modules/globebrowsing/globebrowsingmodule_lua.inl b/modules/globebrowsing/globebrowsingmodule_lua.inl
index 1a01cd7ff7..848b1726dc 100644
--- a/modules/globebrowsing/globebrowsingmodule_lua.inl
+++ b/modules/globebrowsing/globebrowsingmodule_lua.inl
@@ -582,7 +582,7 @@ geoPositionForCameraDeprecated(bool useEyePosition = false)
 
     std::vector<ghoul::Dictionary> res;
     res.reserve(cap.size());
-    for (size_t i = 0; i < cap.size(); ++i) {
+    for (size_t i = 0; i < cap.size(); i++) {
         ghoul::Dictionary c;
         c.setValue("Name", cap[i].name);
         c.setValue("URL", cap[i].url);
diff --git a/modules/globebrowsing/shaders/geojson_fs.glsl b/modules/globebrowsing/shaders/geojson_fs.glsl
index 97c8bbc0c8..00461563a0 100644
--- a/modules/globebrowsing/shaders/geojson_fs.glsl
+++ b/modules/globebrowsing/shaders/geojson_fs.glsl
@@ -57,7 +57,7 @@ Fragment getFragment() {
     // Ambient color
     vec3 shadedColor = ambientIntensity  * color;
 
-    for (int i = 0; i < nLightSources; ++i) {
+    for (int i = 0; i < nLightSources; i++) {
       vec3 l = lightDirectionsViewSpace[i];
 
       // Diffuse
diff --git a/modules/globebrowsing/src/geojson/geojsoncomponent.cpp b/modules/globebrowsing/src/geojson/geojsoncomponent.cpp
index 7abd7f820f..7127c5b3d9 100644
--- a/modules/globebrowsing/src/geojson/geojsoncomponent.cpp
+++ b/modules/globebrowsing/src/geojson/geojsoncomponent.cpp
@@ -537,7 +537,7 @@ void GeoJsonComponent::render(const RenderData& data) {
 
     // Do two render passes, to properly render opacity of overlaying objects
     for (int renderPass = 0; renderPass < 2; ++renderPass) {
-        for (size_t i = 0; i < _geometryFeatures.size(); ++i) {
+        for (size_t i = 0; i < _geometryFeatures.size(); i++) {
             if (_features[i]->enabled && _features[i]->isVisible()) {
                 _geometryFeatures[i].render(
                     data,
@@ -569,7 +569,7 @@ void GeoJsonComponent::update() {
 
     glm::vec3 offsets = glm::vec3(_latLongOffset.value(), _heightOffset);
 
-    for (size_t i = 0; i < _geometryFeatures.size(); ++i) {
+    for (size_t i = 0; i < _geometryFeatures.size(); i++) {
         if (!_features[i]->enabled) {
             continue;
         }
@@ -661,7 +661,7 @@ void GeoJsonComponent::parseSingleFeature(const geos::io::GeoJSONFeature& featur
     else {
         size_t nGeom = geom->getNumGeometries();
         geomsToAdd.reserve(nGeom);
-        for (size_t i = 0; i < nGeom; ++i) {
+        for (size_t i = 0; i < nGeom; i++) {
             const geos::geom::Geometry* subGeometry = geom->getGeometryN(i);
             if (subGeometry) {
                 geomsToAdd.push_back(subGeometry);
diff --git a/modules/globebrowsing/src/geojson/geojsonmanager.cpp b/modules/globebrowsing/src/geojson/geojsonmanager.cpp
index a66710a745..cd907324c8 100644
--- a/modules/globebrowsing/src/geojson/geojsonmanager.cpp
+++ b/modules/globebrowsing/src/geojson/geojsonmanager.cpp
@@ -108,7 +108,7 @@ void GeoJsonManager::addGeoJsonLayer(const ghoul::Dictionary& layerDict) {
 void GeoJsonManager::deleteLayer(const std::string& layerIdentifier) {
     ZoneScoped;
 
-    for (auto it = _geoJsonObjects.begin(); it != _geoJsonObjects.end(); ++it) {
+    for (auto it = _geoJsonObjects.begin(); it != _geoJsonObjects.end(); it++) {
         if (it->get()->identifier() == layerIdentifier) {
             // we need to make a copy as the layerIdentifier is only a reference
             // which will no longer be valid once it is deleted
diff --git a/modules/globebrowsing/src/geojson/globegeometryfeature.cpp b/modules/globebrowsing/src/geojson/globegeometryfeature.cpp
index eeeb3d9728..3ca1b9c6c7 100644
--- a/modules/globebrowsing/src/geojson/globegeometryfeature.cpp
+++ b/modules/globebrowsing/src/geojson/globegeometryfeature.cpp
@@ -219,7 +219,7 @@ void GlobeGeometryFeature::createFromSingleGeosGeometry(const geos::geom::Geomet
                     _geoCoordinates.push_back(outerBoundsGeoCoords);
 
                     // Inner bounds (holes)
-                    for (int i = 0; i < nHoles; ++i) {
+                    for (int i = 0; i < nHoles; i++) {
                         const geos::geom::LinearRing* hole =
                             pNormalized->getInteriorRingN(i);
                         std::vector<Geodetic3> ringGeoCoords =
@@ -555,7 +555,7 @@ std::vector<std::vector<glm::vec3>> GlobeGeometryFeature::createLineGeometry() {
     std::vector<std::vector<glm::vec3>> resultPositions;
     resultPositions.reserve(_geoCoordinates.size());
 
-    for (size_t i = 0; i < _geoCoordinates.size(); ++i) {
+    for (size_t i = 0; i < _geoCoordinates.size(); i++) {
         std::vector<Vertex> vertices;
         std::vector<glm::vec3> positions;
         // TODO: this is not correct anymore
@@ -639,7 +639,7 @@ void GlobeGeometryFeature::createPointGeometry() {
         return;
     }
 
-    for (size_t i = 0; i < _geoCoordinates.size(); ++i) {
+    for (size_t i = 0; i < _geoCoordinates.size(); i++) {
         std::vector<Vertex> vertices;
         vertices.reserve(_geoCoordinates[i].size());
 
diff --git a/modules/globebrowsing/src/geojson/globegeometryhelper.cpp b/modules/globebrowsing/src/geojson/globegeometryhelper.cpp
index 9473d3929d..d1838f90d0 100644
--- a/modules/globebrowsing/src/geojson/globegeometryhelper.cpp
+++ b/modules/globebrowsing/src/geojson/globegeometryhelper.cpp
@@ -105,7 +105,7 @@ createExtrudedGeometryVertices(const std::vector<std::vector<glm::vec3>>& edgeVe
     // Extrude polygon
     for (size_t nBound = 0; nBound < edgeVertices.size(); ++nBound) {
         const std::vector<glm::vec3>& boundary = edgeVertices[nBound];
-        for (size_t i = 1; i < boundary.size(); ++i) {
+        for (size_t i = 1; i < boundary.size(); i++) {
             glm::vec3 v0 = boundary[i - 1];
             glm::vec3 v1 = boundary[i ];
 
@@ -242,8 +242,8 @@ subdivideTriangle(const glm::vec3& v0, const glm::vec3& v1, const glm::vec3& v2,
 
     const float lengthEdge01 = glm::length(v1 - v0);
     const float lengthEdge02 = glm::length(v2 - v0);
-    for (size_t i = 1; i < nSteps01; ++i) {
-        for (size_t j = 1; j < nSteps02; ++j) {
+    for (size_t i = 1; i < nSteps01; i++) {
+        for (size_t j = 1; j < nSteps02; j++) {
             glm::vec3 comp01 = edge01[i].position - v0;
             glm::vec3 comp02 = edge02[j].position - v0;
 
@@ -267,7 +267,7 @@ subdivideTriangle(const glm::vec3& v0, const glm::vec3& v1, const glm::vec3& v2,
     }
 
     // Add egde positions
-    for (size_t i = 0; i < maxSteps; ++i) {
+    for (size_t i = 0; i < maxSteps; i++) {
         if (i < edge01.size() - 1) {
             Geodetic2 geo2 = globe.ellipsoid().cartesianToGeodetic2(edge01[i].position);
             Geodetic3 geo3 = { geo2, edge01[i].height };
diff --git a/modules/globebrowsing/src/gpulayergroup.cpp b/modules/globebrowsing/src/gpulayergroup.cpp
index c5f6355990..1f8618e0df 100644
--- a/modules/globebrowsing/src/gpulayergroup.cpp
+++ b/modules/globebrowsing/src/gpulayergroup.cpp
@@ -43,7 +43,7 @@ void GPULayerGroup::setValue(ghoul::opengl::ProgramObject& program,
     );
 
     const std::vector<Layer*>& activeLayers = layerGroup.activeLayers();
-    for (unsigned int i = 0; i < activeLayers.size(); ++i) {
+    for (unsigned int i = 0; i < activeLayers.size(); i++) {
         const GPULayer& gal = _gpuActiveLayers[i];
         auto& galuc = gal.uniformCache;
         const Layer& al = *activeLayers[i];
@@ -80,7 +80,7 @@ void GPULayerGroup::setValue(ghoul::opengl::ProgramObject& program,
                     tileIndex,
                     layerGroup.pileSize()
                 );
-                for (size_t j = 0; j < _gpuActiveLayers[i].gpuChunkTiles.size(); ++j) {
+                for (size_t j = 0; j < _gpuActiveLayers[i].gpuChunkTiles.size(); j++) {
                     GPULayer::GPUChunkTile& t = _gpuActiveLayers[i].gpuChunkTiles[j];
                     ghoul_assert(ctp[j].has_value(), "Wrong ChunkTiles number in pile");
                     const ChunkTile& ct = *ctp[j];
@@ -112,7 +112,7 @@ void GPULayerGroup::bind(ghoul::opengl::ProgramObject& p, const LayerGroup& laye
     const std::vector<Layer*>& activeLayers = layerGroup.activeLayers();
     _gpuActiveLayers.resize(activeLayers.size());
     const int pileSize = layerGroup.pileSize();
-    for (size_t i = 0; i < _gpuActiveLayers.size(); ++i) {
+    for (size_t i = 0; i < _gpuActiveLayers.size(); i++) {
         GPULayer& gal = _gpuActiveLayers[i];
         auto& galuc = gal.uniformCache;
         const Layer& al = *activeLayers[i];
@@ -149,7 +149,7 @@ void GPULayerGroup::bind(ghoul::opengl::ProgramObject& p, const LayerGroup& laye
             case layers::Layer::ID::TileProviderByIndex:
             case layers::Layer::ID::TileProviderByLevel: {
                 gal.gpuChunkTiles.resize(pileSize);
-                for (size_t j = 0; j < gal.gpuChunkTiles.size(); ++j) {
+                for (size_t j = 0; j < gal.gpuChunkTiles.size(); j++) {
                     GPULayer::GPUChunkTile& t = gal.gpuChunkTiles[j];
                     auto& tuc = t.uniformCache;
                     std::string n = name + "pile.chunkTile" + std::to_string(j) + ".";
diff --git a/modules/globebrowsing/src/layer.cpp b/modules/globebrowsing/src/layer.cpp
index 5512da068f..41ee4ee91d 100644
--- a/modules/globebrowsing/src/layer.cpp
+++ b/modules/globebrowsing/src/layer.cpp
@@ -385,7 +385,7 @@ ChunkTilePile Layer::chunkTilePile(const TileIndex& tileIndex, int pileSize) con
     else {
         ChunkTilePile chunkTilePile;
         std::fill(chunkTilePile.begin(), chunkTilePile.end(), std::nullopt);
-        for (int i = 0; i < pileSize; ++i) {
+        for (int i = 0; i < pileSize; i++) {
             ChunkTile tile;
             tile.uvTransform = TileUvTransform{ { 0, 0 }, { 1, 1 } };
             chunkTilePile[i] = tile;
diff --git a/modules/globebrowsing/src/layergroup.cpp b/modules/globebrowsing/src/layergroup.cpp
index 25778db067..eef2aaf4f4 100644
--- a/modules/globebrowsing/src/layergroup.cpp
+++ b/modules/globebrowsing/src/layergroup.cpp
@@ -162,7 +162,7 @@ Layer* LayerGroup::addLayer(const ghoul::Dictionary& layerDict) {
 void LayerGroup::deleteLayer(const std::string& layerName) {
     for (std::vector<std::unique_ptr<Layer>>::iterator it = _layers.begin();
          it != _layers.end();
-         ++it)
+         it++)
     {
         if (it->get()->identifier() == layerName) {
             // we need to make a copy as the layername is only a reference
diff --git a/modules/globebrowsing/src/layermanager.cpp b/modules/globebrowsing/src/layermanager.cpp
index 7395554c18..f013505b00 100644
--- a/modules/globebrowsing/src/layermanager.cpp
+++ b/modules/globebrowsing/src/layermanager.cpp
@@ -58,7 +58,7 @@ void LayerManager::initialize(const ghoul::Dictionary& layerGroupsDict) {
     ZoneScoped;
 
     // First create empty layer groups in case not all are specified
-    for (size_t i = 0; i < _layerGroups.size(); ++i) {
+    for (size_t i = 0; i < _layerGroups.size(); i++) {
         _layerGroups[i] = std::make_unique<LayerGroup>(layers::Groups[i]);
     }
 
@@ -140,7 +140,7 @@ std::array<LayerGroup*, LayerManager::NumLayerGroups> LayerManager::layerGroups(
     ZoneScoped;
 
     std::array<LayerGroup*, NumLayerGroups> res = {};
-    for (size_t i = 0; i < NumLayerGroups; ++i) {
+    for (size_t i = 0; i < NumLayerGroups; i++) {
         res[i] = _layerGroups[i].get();
     }
     return res;
diff --git a/modules/globebrowsing/src/lruthreadpool.inl b/modules/globebrowsing/src/lruthreadpool.inl
index 6e6ed763c3..cfa17c6170 100644
--- a/modules/globebrowsing/src/lruthreadpool.inl
+++ b/modules/globebrowsing/src/lruthreadpool.inl
@@ -61,7 +61,7 @@ template<typename KeyType>
 LRUThreadPool<KeyType>::LRUThreadPool(size_t numThreads, size_t queueSize)
     : _queuedTasks(queueSize)
 {
-    for (size_t i = 0; i < numThreads; ++i) {
+    for (size_t i = 0; i < numThreads; i++) {
         _workers.push_back(std::thread(LRUThreadPoolWorker<KeyType>(*this)));
     }
 }
@@ -81,7 +81,7 @@ LRUThreadPool<KeyType>::~LRUThreadPool() {
     _condition.notify_all();
 
     // join them
-    for (size_t i = 0; i < _workers.size(); ++i) {
+    for (size_t i = 0; i < _workers.size(); i++) {
         _workers[i].join();
     }
 }
diff --git a/modules/globebrowsing/src/memoryawaretilecache.cpp b/modules/globebrowsing/src/memoryawaretilecache.cpp
index e47709663d..b1ca191ebe 100644
--- a/modules/globebrowsing/src/memoryawaretilecache.cpp
+++ b/modules/globebrowsing/src/memoryawaretilecache.cpp
@@ -220,7 +220,7 @@ void MemoryAwareTileCache::TextureContainer::reset() {
         ghoul::opengl::Texture::FilterMode::Linear :
         ghoul::opengl::Texture::FilterMode::AnisotropicMipMap;
 
-    for (size_t i = 0; i < _numTextures; ++i) {
+    for (size_t i = 0; i < _numTextures; i++) {
         using namespace ghoul::opengl;
 
         std::unique_ptr<Texture> tex = std::make_unique<Texture>(
diff --git a/modules/globebrowsing/src/renderableglobe.cpp b/modules/globebrowsing/src/renderableglobe.cpp
index 165a901d37..476442c978 100644
--- a/modules/globebrowsing/src/renderableglobe.cpp
+++ b/modules/globebrowsing/src/renderableglobe.cpp
@@ -332,11 +332,11 @@ const Chunk& findChunkNode(const Chunk& node, const Geodetic2& location) {
         const Geodetic2 center = n->surfacePatch.center();
         int index = 0;
         if (center.lon < location.lon) {
-            ++index;
+            index++;
         }
         if (location.lat < center.lat) {
-            ++index;
-            ++index;
+            index++;
+            index++;
         }
         n = n->children[static_cast<Quad>(index)];
     }
@@ -504,7 +504,7 @@ std::array<glm::dvec4, 8> boundingCornersForChunk(const Chunk& chunk,
     const Geodetic2 pGeodetic = ellipsoid.cartesianToGeodetic2(p);
     const double latDiff = latCloseToEquator - pGeodetic.lat;
 
-    for (size_t i = 0; i < 8; ++i) {
+    for (size_t i = 0; i < 8; i++) {
         const Quad q = static_cast<Quad>(i % 4);
         const double cornerHeight = i < 4 ? minCornerHeight : maxCornerHeight;
         Geodetic3 cornerGeodetic = { chunk.surfacePatch.corner(q), cornerHeight };
@@ -1063,7 +1063,7 @@ void RenderableGlobe::renderChunks(const RenderData& data, RendererTasks&,
         const std::array<LayerGroup*, LayerManager::NumLayerGroups>& layerGroups =
             _layerManager.layerGroups();
 
-        for (size_t i = 0; i < layerGroups.size(); ++i) {
+        for (size_t i = 0; i < layerGroups.size(); i++) {
             _globalRenderer.gpuLayerGroups[i].bind(
                 *_globalRenderer.program,
                 *layerGroups[i]
@@ -1085,7 +1085,7 @@ void RenderableGlobe::renderChunks(const RenderData& data, RendererTasks&,
         const std::array<LayerGroup*, LayerManager::NumLayerGroups>& layerGroups =
             _layerManager.layerGroups();
 
-        for (size_t i = 0; i < layerGroups.size(); ++i) {
+        for (size_t i = 0; i < layerGroups.size(); i++) {
             _localRenderer.gpuLayerGroups[i].bind(
                 *_localRenderer.program,
                 *layerGroups[i]
@@ -1233,17 +1233,17 @@ void RenderableGlobe::renderChunks(const RenderData& data, RendererTasks&,
             if (isLeaf(*n) && n->isVisible) {
                 if (n->tileIndex.level < cutoff) {
                     global[iGlobal] = n;
-                    ++iGlobal;
+                    iGlobal++;
                 }
                 else {
                     local[iLocal] = n;
-                    ++iLocal;
+                    iLocal++;
                 }
             }
 
             // Add children to queue, if any
             if (!isLeaf(*n)) {
-                for (int i = 0; i < 4; ++i) {
+                for (int i = 0; i < 4; i++) {
                     traversalMemory.push_back(n->children[i]);
                 }
             }
@@ -1271,7 +1271,7 @@ void RenderableGlobe::renderChunks(const RenderData& data, RendererTasks&,
 
     // Render all chunks that want to be rendered globally
     _globalRenderer.program->activate();
-    for (int i = 0; i < globalCount; ++i) {
+    for (int i = 0; i < globalCount; i++) {
         renderChunkGlobally(*_globalChunkBuffer[i], data, shadowData, renderGeomOnly);
     }
     _globalRenderer.program->deactivate();
@@ -1279,7 +1279,7 @@ void RenderableGlobe::renderChunks(const RenderData& data, RendererTasks&,
 
     // Render all chunks that need to be rendered locally
     _localRenderer.program->activate();
-    for (int i = 0; i < localCount; ++i) {
+    for (int i = 0; i < localCount; i++) {
         renderChunkLocally(*_localChunkBuffer[i], data, shadowData, renderGeomOnly);
     }
     _localRenderer.program->deactivate();
@@ -1327,7 +1327,7 @@ void RenderableGlobe::renderChunkGlobally(const Chunk& chunk, const RenderData&
 
     std::array<LayerGroup*, LayerManager::NumLayerGroups> layerGroups =
         _layerManager.layerGroups();
-    for (size_t i = 0; i < layerGroups.size(); ++i) {
+    for (size_t i = 0; i < layerGroups.size(); i++) {
         _globalRenderer.gpuLayerGroups[i].setValue(program, *layerGroups[i], tileIndex);
     }
 
@@ -1419,7 +1419,7 @@ void RenderableGlobe::renderChunkLocally(const Chunk& chunk, const RenderData& d
 
     const std::array<LayerGroup*, LayerManager::NumLayerGroups>& layerGroups =
         _layerManager.layerGroups();
-    for (size_t i = 0; i < layerGroups.size(); ++i) {
+    for (size_t i = 0; i < layerGroups.size(); i++) {
         _localRenderer.gpuLayerGroups[i].setValue(program, *layerGroups[i], tileIndex);
     }
 
@@ -1445,7 +1445,7 @@ void RenderableGlobe::renderChunkLocally(const Chunk& chunk, const RenderData& d
 
     std::array<glm::dvec3, 4> cornersCameraSpace;
     std::array<glm::dvec3, 4> cornersModelSpace;
-    for (int i = 0; i < 4; ++i) {
+    for (int i = 0; i < 4; i++) {
         const Quad q = static_cast<Quad>(i);
         const Geodetic2 corner = chunk.surfacePatch.corner(q);
         const glm::dvec3 cornerModelSpace = _ellipsoid.cartesianSurfacePosition(corner);
@@ -1554,7 +1554,7 @@ void RenderableGlobe::debugRenderChunk(const Chunk& chunk, const glm::dmat4& mvp
     std::vector<glm::vec4> clippingSpaceCorners(8);
     AABB3 screenSpaceBounds;
 
-    for (size_t i = 0; i < 8; ++i) {
+    for (size_t i = 0; i < 8; i++) {
         const glm::vec4& clippingSpaceCorner = mvp * modelSpaceCorners[i];
         clippingSpaceCorners[i] = clippingSpaceCorner;
 
@@ -1748,7 +1748,7 @@ void RenderableGlobe::recompileShaders() {
 
         for (int j = 0;
              j < preprocessingData.layeredTextureInfo[i].lastLayerIdx + 1;
-             ++j)
+             j++)
         {
             shaderDictionary.setValue(
                 groupName + std::to_string(j) + "LayerType",
@@ -1761,7 +1761,7 @@ void RenderableGlobe::recompileShaders() {
 
         for (int j = 0;
              j < preprocessingData.layeredTextureInfo[i].lastLayerIdx + 1;
-             ++j)
+             j++)
         {
             shaderDictionary.setValue(
                 groupName + std::to_string(j) + "BlendMode",
@@ -1775,7 +1775,7 @@ void RenderableGlobe::recompileShaders() {
 
         for (int j = 0;
              j < preprocessingData.layeredTextureInfo[i].lastLayerIdx + 1;
-             ++j)
+             j++)
         {
             shaderDictionary.setValue(
                 groupName + std::to_string(j) + "LayerAdjustmentType",
@@ -1787,7 +1787,7 @@ void RenderableGlobe::recompileShaders() {
     }
 
     ghoul::Dictionary layerGroupNames;
-    for (size_t i = 0; i < layers::Groups.size(); ++i) {
+    for (size_t i = 0; i < layers::Groups.size(); i++) {
         layerGroupNames.setValue(
             std::to_string(i),
             std::string(layers::Groups[i].identifier)
@@ -2391,7 +2391,7 @@ bool RenderableGlobe::isCullableByFrustum(const Chunk& chunk,
 
     // Create a bounding box that fits the patch corners
     AABB3 bounds; // in screen space
-    for (size_t i = 0; i < 8; ++i) {
+    for (size_t i = 0; i < 8; i++) {
         const glm::dvec4 cornerClippingSpace = mvp * corners[i];
         const glm::dvec3 ndc = glm::dvec3(
             (1.f / glm::abs(cornerClippingSpace.w)) * cornerClippingSpace
@@ -2435,7 +2435,7 @@ bool RenderableGlobe::isCullableByHorizon(const Chunk& chunk,
         _ellipsoid.cartesianSurfacePosition(chunk.surfacePatch.corner(SOUTH_EAST))
     };
 
-    for (int i = 0; i < 4; ++i) {
+    for (int i = 0; i < 4; i++) {
         const double distance = glm::length(cameraPos - corners[i]);
         if (distance < glm::length(cameraPos - objectPos)) {
             objectPos = corners[i];
@@ -2483,7 +2483,7 @@ void RenderableGlobe::splitChunkNode(Chunk& cn, int depth) {
         std::vector<void*> memory = _chunkPool.allocate(
             static_cast<int>(cn.children.size())
         );
-        for (size_t i = 0; i < cn.children.size(); ++i) {
+        for (size_t i = 0; i < cn.children.size(); i++) {
             cn.children[i] = new (memory[i]) Chunk(
                 cn.tileIndex.child(static_cast<Quad>(i))
             );
@@ -2557,7 +2557,7 @@ bool RenderableGlobe::updateChunkTree(Chunk& cn, const RenderData& data,
     else {
         ZoneScopedN("!leaf");
         char requestedMergeMask = 0;
-        for (int i = 0; i < 4; ++i) {
+        for (int i = 0; i < 4; i++) {
             if (updateChunkTree(*cn.children[i], data, mvp)) {
                 requestedMergeMask |= (1 << i);
             }
diff --git a/modules/globebrowsing/src/skirtedgrid.cpp b/modules/globebrowsing/src/skirtedgrid.cpp
index 4bc5c1ef46..fc5fd9f224 100644
--- a/modules/globebrowsing/src/skirtedgrid.cpp
+++ b/modules/globebrowsing/src/skirtedgrid.cpp
@@ -123,7 +123,7 @@ void SkirtedGrid::initializeGL() {
 
     std::vector<glm::vec2> textures = createTextureCoordinates(xSegments, ySegments);
     std::vector<Vertex> vertexData(textures.size());
-    for (size_t i = 0; i < textures.size(); ++i) {
+    for (size_t i = 0; i < textures.size(); i++) {
         vertexData[i].texture[0] = textures[i][0];
         vertexData[i].texture[1] = textures[i][1];
     }
diff --git a/modules/globebrowsing/src/tileprovider/tileprovider.cpp b/modules/globebrowsing/src/tileprovider/tileprovider.cpp
index e382233ecc..3eff7b845c 100644
--- a/modules/globebrowsing/src/tileprovider/tileprovider.cpp
+++ b/modules/globebrowsing/src/tileprovider/tileprovider.cpp
@@ -227,7 +227,7 @@ ChunkTilePile TileProvider::chunkTilePile(TileIndex tileIndex, int pileSize) {
 
     ChunkTilePile chunkTilePile;
     std::fill(chunkTilePile.begin(), chunkTilePile.end(), std::nullopt);
-    for (int i = 0; i < pileSize; ++i) {
+    for (int i = 0; i < pileSize; i++) {
         chunkTilePile[i] = chunkTile(tileIndex, i);
         if (chunkTilePile[i]->tile.status == Tile::Status::Unavailable) {
             if (i == 0) {
diff --git a/modules/globebrowsing/src/timequantizer.cpp b/modules/globebrowsing/src/timequantizer.cpp
index 171b36806e..b7c43d86e6 100644
--- a/modules/globebrowsing/src/timequantizer.cpp
+++ b/modules/globebrowsing/src/timequantizer.cpp
@@ -190,7 +190,7 @@ int DateTime::increment(int value, char unit, double error, double resolution) {
     if (nIncrements == 0) {
         nIncrements = 1;
     }
-    for (unsigned int i = 0; i < nIncrements; ++i) {
+    for (unsigned int i = 0; i < nIncrements; i++) {
         incrementOnce(value, unit);
     }
     return nIncrements;
@@ -237,7 +237,7 @@ int DateTime::decrement(int value, char unit, double error, double resolution) {
     if (nDecrements == 0) {
         nDecrements = 1;
     }
-    for (unsigned int i = 0; i < nDecrements; ++i) {
+    for (unsigned int i = 0; i < nDecrements; i++) {
         decrementOnce(value, unit);
     }
     return nDecrements;
diff --git a/modules/imgui/imguimodule.cpp b/modules/imgui/imguimodule.cpp
index cfcb97199d..e75a2f2499 100644
--- a/modules/imgui/imguimodule.cpp
+++ b/modules/imgui/imguimodule.cpp
@@ -294,7 +294,7 @@ void ImGUIModule::internalInitializeGL() {
     int nWindows = global::windowDelegate->nWindows();
     _contexts.resize(nWindows);
 
-    for (int i = 0; i < nWindows; ++i) {
+    for (int i = 0; i < nWindows; i++) {
         _contexts[i] = ImGui::CreateContext();
         ImGui::SetCurrentContext(_contexts[i]);
 
@@ -395,7 +395,7 @@ void ImGUIModule::internalInitializeGL() {
     {
         unsigned char* texData;
         glm::ivec2 texSize = glm::ivec2(0, 0);
-        for (int i = 0; i < nWindows; ++i) {
+        for (int i = 0; i < nWindows; i++) {
             ImGui::SetCurrentContext(_contexts[i]);
 
             ImGui::GetIO().Fonts->GetTexDataAsRGBA32(&texData, &texSize.x, &texSize.y);
@@ -409,7 +409,7 @@ void ImGUIModule::internalInitializeGL() {
         _fontTexture->setDataOwnership(ghoul::opengl::Texture::TakeOwnership::No);
         _fontTexture->uploadTexture();
     }
-    for (int i = 0; i < nWindows; ++i) {
+    for (int i = 0; i < nWindows; i++) {
         uintptr_t texture = static_cast<GLuint>(*_fontTexture);
         ImGui::SetCurrentContext(_contexts[i]);
         ImGui::GetIO().Fonts->TexID = reinterpret_cast<void*>(texture);
@@ -590,7 +590,7 @@ void ImGUIModule::renderFrame(float deltaTime, const glm::vec2& windowSize,
 
     glBindVertexArray(vao);
 
-    for (int i = 0; i < drawData->CmdListsCount; ++i) {
+    for (int i = 0; i < drawData->CmdListsCount; i++) {
         const ImDrawList* cmdList = drawData->CmdLists[i];
         const ImDrawIdx* indexBufferOffset = nullptr;
 
diff --git a/modules/imgui/src/guijoystickcomponent.cpp b/modules/imgui/src/guijoystickcomponent.cpp
index 8c2583b444..96f674005c 100644
--- a/modules/imgui/src/guijoystickcomponent.cpp
+++ b/modules/imgui/src/guijoystickcomponent.cpp
@@ -50,7 +50,7 @@ void GuiJoystickComponent::render() {
     _isEnabled = v;
     _isCollapsed = ImGui::IsWindowCollapsed();
 
-    for (size_t i = 0; i < global::joystickInputStates->size(); ++i) {
+    for (size_t i = 0; i < global::joystickInputStates->size(); i++) {
         const JoystickInputState& state = global::joystickInputStates->at(i);
         if (!state.isConnected) {
             continue;
@@ -58,7 +58,7 @@ void GuiJoystickComponent::render() {
 
         ImGui::Text("%s [%i]", state.name.c_str(), static_cast<int>(i));
         ImGui::Text("%s", "Axes");
-        for (int j = 0; j < state.nAxes; ++j) {
+        for (int j = 0; j < state.nAxes; j++) {
             float f = state.axes[j];
             std::string id = std::to_string(j) + "##" + state.name + "Axis";
             ImGui::SliderFloat(
@@ -69,7 +69,7 @@ void GuiJoystickComponent::render() {
             );
         }
         ImGui::Text("%s", "Buttons");
-        for (int j = 0; j < state.nButtons; ++j) {
+        for (int j = 0; j < state.nButtons; j++) {
             std::string id = std::to_string(j) + "##" + state.name + "Button";
             ImGui::RadioButton(
                 id.c_str(),
@@ -86,7 +86,7 @@ void GuiJoystickComponent::render() {
 
     ImGui::Text("%s", "Summed contributions");
     ImGui::Text("%s", "Axes");
-    for (int i = 0; i < global::joystickInputStates->numAxes(); ++i) {
+    for (int i = 0; i < global::joystickInputStates->numAxes(); i++) {
         float f = global::joystickInputStates->axis("", i);
         std::string id = std::to_string(i) + "##" + "TotalAxis";
         ImGui::SliderFloat(
@@ -97,7 +97,7 @@ void GuiJoystickComponent::render() {
         );
     }
     ImGui::Text("%s", "Buttons");
-    for (int i = 0; i < global::joystickInputStates->numButtons(); ++i) {
+    for (int i = 0; i < global::joystickInputStates->numButtons(); i++) {
         std::string id = std::to_string(i) + "##" + "TotalButton";
         ImGui::RadioButton(
             id.c_str(),
diff --git a/modules/imgui/src/guimemorycomponent.cpp b/modules/imgui/src/guimemorycomponent.cpp
index 4a29eeae78..c1ca19ccfb 100644
--- a/modules/imgui/src/guimemorycomponent.cpp
+++ b/modules/imgui/src/guimemorycomponent.cpp
@@ -36,7 +36,7 @@ namespace {
         //ImGui::Text("Bucket Size: %i", p.BucketSize);
         ImGui::Text("Number of Buckets: %i", p.nBuckets());
         const std::vector<int>& occupancies = p.occupancies();
-        for (size_t i = 0; i < occupancies.size(); ++i) {
+        for (size_t i = 0; i < occupancies.size(); i++) {
             ImGui::Text(
                 "  %i: %i/%i (%.2f/%.2f kiB)",
                 static_cast<int>(i),
diff --git a/modules/imgui/src/guipropertycomponent.cpp b/modules/imgui/src/guipropertycomponent.cpp
index 016271781f..f0942a27ab 100644
--- a/modules/imgui/src/guipropertycomponent.cpp
+++ b/modules/imgui/src/guipropertycomponent.cpp
@@ -280,7 +280,6 @@ void GuiPropertyComponent::render() {
     ImGui::SetNextWindowBgAlpha(0.75f);
     ImGui::Begin(guiName().c_str(), &v);
     _isEnabled = v;
-    bool showHiddenNode = openspace::global::openSpaceEngine->showHiddenSceneGraphNodes();
 
     _isCollapsed = ImGui::IsWindowCollapsed();
     using namespace properties;
@@ -397,20 +396,18 @@ void GuiPropertyComponent::render() {
     };
 
     if (!_useTreeLayout || noGuiGroups) {
-        if (!showHiddenNode) {
-            // Remove all of the nodes that we want hidden first
-            owners.erase(
-                std::remove_if(
-                    owners.begin(),
-                    owners.end(),
-                    [](properties::PropertyOwner* p) {
-                        SceneGraphNode* s = dynamic_cast<SceneGraphNode*>(p);
-                        return s && s->hasGuiHintHidden();
-                    }
-                ),
-                owners.end()
-            );
-        }
+        // Remove all of the nodes that we want hidden first
+        owners.erase(
+            std::remove_if(
+                owners.begin(),
+                owners.end(),
+                [](properties::PropertyOwner* p) {
+                    SceneGraphNode* s = dynamic_cast<SceneGraphNode*>(p);
+                    return s && s->hasGuiHintHidden();
+                }
+            ),
+            owners.end()
+        );
         std::for_each(owners.begin(), owners.end(), renderProp);
     }
     else { // _useTreeLayout && gui groups exist
@@ -419,7 +416,7 @@ void GuiPropertyComponent::render() {
         for (properties::PropertyOwner* pOwner : owners) {
             // We checked above that pOwner is a SceneGraphNode
             SceneGraphNode* nOwner = static_cast<SceneGraphNode*>(pOwner);
-            if (!showHiddenNode && nOwner->hasGuiHintHidden()) {
+            if (nOwner->hasGuiHintHidden()) {
                 continue;
             }
             const std::string gui = nOwner->guiPath();
diff --git a/modules/imgui/src/renderproperties.cpp b/modules/imgui/src/renderproperties.cpp
index 6c22585302..5bd850bc21 100644
--- a/modules/imgui/src/renderproperties.cpp
+++ b/modules/imgui/src/renderproperties.cpp
@@ -178,7 +178,7 @@ void renderSelectionProperty(Property* prop, const std::string& ownerName,
         std::set<std::string> selected = p->value();
         const std::vector<std::string>& options = p->options();
 
-        for (int i = 0; i < static_cast<int>(options.size()); ++i) {
+        for (int i = 0; i < static_cast<int>(options.size()); i++) {
             const std::string key = options[i];
             bool isSelected = p->isSelected(key);
 
diff --git a/modules/iswa/rendering/iswakameleongroup.cpp b/modules/iswa/rendering/iswakameleongroup.cpp
index dab593a60d..3f2482731a 100644
--- a/modules/iswa/rendering/iswakameleongroup.cpp
+++ b/modules/iswa/rendering/iswakameleongroup.cpp
@@ -118,7 +118,7 @@ void IswaKameleonGroup::readFieldlinePaths(const std::string& indexFile) {
             json fieldlines = json::parse(fileContent);
             int i = 0;
 
-            for (json::iterator it = fieldlines.begin(); it != fieldlines.end(); ++it) {
+            for (json::iterator it = fieldlines.begin(); it != fieldlines.end(); it++) {
                 _fieldlines.addOption(it.key());
                 _fieldlineState[i] = std::make_tuple<std::string, std::string, bool>(
                     identifier() + "/" + it.key(),
diff --git a/modules/iswa/rendering/kameleonplane.cpp b/modules/iswa/rendering/kameleonplane.cpp
index 2bdbf6ef6f..b9ab4e93dc 100644
--- a/modules/iswa/rendering/kameleonplane.cpp
+++ b/modules/iswa/rendering/kameleonplane.cpp
@@ -339,7 +339,7 @@ void KameleonPlane::readFieldlinePaths(const std::string& indexFile) {
             int i = 0;
             const std::string& fullName = identifier();
             std::string partName = fullName.substr(0,fullName.find_last_of("-"));
-            for (json::iterator it = fieldlines.begin(); it != fieldlines.end(); ++it) {
+            for (json::iterator it = fieldlines.begin(); it != fieldlines.end(); it++) {
                 _fieldlines.addOption(it.key());
                 _fieldlineState[i] = std::make_tuple<std::string, std::string, bool>(
                     partName + "/" + it.key(),
diff --git a/modules/iswa/util/dataprocessor.cpp b/modules/iswa/util/dataprocessor.cpp
index 4a6aa92252..1384afc98e 100644
--- a/modules/iswa/util/dataprocessor.cpp
+++ b/modules/iswa/util/dataprocessor.cpp
@@ -173,7 +173,7 @@ void DataProcessor::add(const std::vector<std::vector<float>>& optionValues,
 {
     const int numOptions = static_cast<int>(optionValues.size());
 
-    for (int i = 0; i < numOptions; ++i) {
+    for (int i = 0; i < numOptions; i++) {
         const std::vector<float>& values = optionValues[i];
         const int numValues = static_cast<int>(values.size());
 
@@ -248,7 +248,7 @@ void DataProcessor::add(const std::vector<std::vector<float>>& optionValues,
                 numBins
             );
 
-            for (int j = 0; j < numBins; ++j) {
+            for (int j = 0; j < numBins; j++) {
                 float value = unnormalizeWithStandardScore(
                     j * (histMax - histMin) + histMin,
                     oldMean,
@@ -269,7 +269,7 @@ void DataProcessor::add(const std::vector<std::vector<float>>& optionValues,
             _histograms[i] = std::move(newHist);
         }
 
-        for (int j = 0; j < numValues; ++j) {
+        for (int j = 0; j < numValues; j++) {
             _histograms[i]->add(
                 normalizeWithStandardScore(
                     values[j],
diff --git a/modules/iswa/util/dataprocessorjson.cpp b/modules/iswa/util/dataprocessorjson.cpp
index 5ca45fecb3..5e5c054c3b 100644
--- a/modules/iswa/util/dataprocessorjson.cpp
+++ b/modules/iswa/util/dataprocessorjson.cpp
@@ -44,7 +44,7 @@ std::vector<std::string> DataProcessorJson::readMetadata(const std::string& data
         const json& j = json::parse(data);
         json variables = j["variables"];
 
-        for (json::iterator it = variables.begin(); it != variables.end(); ++it) {
+        for (json::iterator it = variables.begin(); it != variables.end(); it++) {
             std::string option = it.key();
             if (option == "ep") {
                 const json& row = it.value();
@@ -75,7 +75,7 @@ void DataProcessorJson::addDataValues(const std::string& data,
         std::vector<std::vector<float>> optionValues(numOptions, std::vector<float>());
         const std::vector<std::string>& options = dataOptions.options();
 
-        for (int i = 0; i < numOptions; ++i) {
+        for (int i = 0; i < numOptions; i++) {
             const json& row = variables[options[i]];
 //            int rowsize = row.size();
 
diff --git a/modules/iswa/util/dataprocessorkameleon.cpp b/modules/iswa/util/dataprocessorkameleon.cpp
index 1b17d5f354..56cab6a360 100644
--- a/modules/iswa/util/dataprocessorkameleon.cpp
+++ b/modules/iswa/util/dataprocessorkameleon.cpp
@@ -85,7 +85,7 @@ void DataProcessorKameleon::addDataValues(const std::string& path,
 
     const int numValues = static_cast<int>(_dimensions.x * _dimensions.y * _dimensions.z);
 
-    for (int i = 0; i < numOptions; ++i) {
+    for (int i = 0; i < numOptions; i++) {
         //0.5 to gather interesting values for the normalization/histograms.
         float* values = _kw->uniformSliceValues(
             options[i],
diff --git a/modules/iswa/util/dataprocessortext.cpp b/modules/iswa/util/dataprocessortext.cpp
index 99c2ed623c..2eab2bbaa2 100644
--- a/modules/iswa/util/dataprocessortext.cpp
+++ b/modules/iswa/util/dataprocessortext.cpp
@@ -125,7 +125,7 @@ void DataProcessorText::addDataValues(const std::string& data,
             continue;
         }
 
-        for (int i = 0; i < numOptions; ++i) {
+        for (int i = 0; i < numOptions; i++) {
             const float value = values[i];
 
             optionValues[i].push_back(value);
diff --git a/modules/iswa/util/iswamanager.cpp b/modules/iswa/util/iswamanager.cpp
index 6b3d86d121..86fe3e3ff1 100644
--- a/modules/iswa/util/iswamanager.cpp
+++ b/modules/iswa/util/iswamanager.cpp
@@ -677,7 +677,7 @@ void IswaManager::fillCygnetInfo(std::string jsonString) {
 
         for (const std::string& list : lists) {
             nlohmann::json jsonList = j[list];
-            for (size_t i = 0; i < jsonList.size(); ++i) {
+            for (size_t i = 0; i < jsonList.size(); i++) {
                 nlohmann::json jCygnet = jsonList.at(i);
 
                 std::string name = jCygnet["cygnetDisplayTitle"];
@@ -709,7 +709,7 @@ void IswaManager::addCdfFiles(std::string cdfpath) {
 
         if (jsonFile.is_open()) {
             nlohmann::json cdfGroups = nlohmann::json::parse(jsonFile);
-            for(size_t i = 0; i < cdfGroups.size(); ++i) {
+            for(size_t i = 0; i < cdfGroups.size(); i++) {
                 nlohmann::json cdfGroup = cdfGroups.at(i);
 
                 std::string groupName = cdfGroup["group"];
diff --git a/modules/kameleon/src/kameleonwrapper.cpp b/modules/kameleon/src/kameleonwrapper.cpp
index 56862bb19c..291718baa4 100644
--- a/modules/kameleon/src/kameleonwrapper.cpp
+++ b/modules/kameleon/src/kameleonwrapper.cpp
@@ -290,7 +290,7 @@ float* KameleonWrapper::uniformSampledValues(const std::string& var,
     int stop = 0;
     constexpr float TruncationLimit = 0.9f;
     const int upperLimit = static_cast<int>(size * TruncationLimit);
-    for (int i = 0; i < NBins; ++i) {
+    for (int i = 0; i < NBins; i++) {
         sum += histogram[i];
         if (sum > upperLimit) {
             stop = i;
@@ -301,7 +301,7 @@ float* KameleonWrapper::uniformSampledValues(const std::string& var,
     const double dist = ((varMax - varMin) / NBins) * stop;
 
     const double varMaxNew = varMin + dist;
-    for(size_t i = 0; i < size; ++i) {
+    for(size_t i = 0; i < size; i++) {
         const double normalizedVal = (doubleData[i] - varMin) / (varMaxNew - varMin);
 
         data[i] = static_cast<float>(glm::clamp(normalizedVal, 0.0, 1.0));
@@ -1072,7 +1072,7 @@ std::vector<std::string> KameleonWrapper::variables() const {
 
     int numVariables = _model->getNumberOfVariables();
 
-    for (int i = 0; i < numVariables; ++i) {
+    for (int i = 0; i < numVariables; i++) {
         variableNames.push_back(_model->getVariableName(i));;
     }
     return variableNames;
diff --git a/modules/kameleonvolume/kameleonvolumereader.cpp b/modules/kameleonvolume/kameleonvolumereader.cpp
index 4e49fd372a..76d51ac77f 100644
--- a/modules/kameleonvolume/kameleonvolumereader.cpp
+++ b/modules/kameleonvolume/kameleonvolumereader.cpp
@@ -133,7 +133,7 @@ std::unique_ptr<volume::RawVolume<float>> KameleonVolumeReader::readFloatVolume(
     };
 
     float* data = volume->data();
-    for (size_t index = 0; index < volume->nCells(); ++index) {
+    for (size_t index = 0; index < volume->nCells(); index++) {
         const glm::vec3 coords = volume->indexToCoords(index);
         const glm::vec3 coordsZeroToOne = coords / dims;
         const glm::vec3 volumeCoords = lowerBound + diff * coordsZeroToOne;
@@ -150,7 +150,7 @@ std::unique_ptr<volume::RawVolume<float>> KameleonVolumeReader::readFloatVolume(
 std::vector<std::string> KameleonVolumeReader::variableNames() const {
     std::vector<std::string> variableNames;
     const int nVariables = _kameleon->model->getNumberOfVariables();
-    for (int i = 0; i < nVariables; ++i) {
+    for (int i = 0; i < nVariables; i++) {
         variableNames.push_back(_kameleon->model->getVariableName(i));
     }
     return variableNames;
@@ -163,7 +163,7 @@ std::vector<std::string> KameleonVolumeReader::variableAttributeNames() const {
 std::vector<std::string> KameleonVolumeReader::globalAttributeNames() const {
     std::vector<std::string> attributeNames;
     const int nAttributes = _kameleon->model->getNumberOfGlobalAttributes();
-    for (int i = 0; i < nAttributes; ++i) {
+    for (int i = 0; i < nAttributes; i++) {
         attributeNames.push_back(_kameleon->model->getGlobalAttributeName(i));
     }
     return attributeNames;
diff --git a/modules/kameleonvolume/rendering/renderablekameleonvolume.cpp b/modules/kameleonvolume/rendering/renderablekameleonvolume.cpp
index 925a88dd74..9de9405784 100644
--- a/modules/kameleonvolume/rendering/renderablekameleonvolume.cpp
+++ b/modules/kameleonvolume/rendering/renderablekameleonvolume.cpp
@@ -430,7 +430,7 @@ void RenderableKameleonVolume::updateTextureFromVolume() {
     float min = _lowerValueBound;
     float diff = _upperValueBound - _lowerValueBound;
 
-    for (size_t i = 0; i < _normalizedVolume->nCells(); ++i) {
+    for (size_t i = 0; i < _normalizedVolume->nCells(); i++) {
         out[i] = glm::clamp((in[i] - min) / diff, 0.f, 1.f);
     }
 
diff --git a/modules/multiresvolume/rendering/brickmanager.cpp b/modules/multiresvolume/rendering/brickmanager.cpp
index ca2d46daaa..7039745a64 100644
--- a/modules/multiresvolume/rendering/brickmanager.cpp
+++ b/modules/multiresvolume/rendering/brickmanager.cpp
@@ -168,7 +168,7 @@ bool BrickManager::buildBrickList(BUFFER_INDEX bufferIndex,
     // For every non-zero entry in the request list, assign a texture atlas
     // coordinate. For zero entries, signal "no brick" using -1.
 
-    for (unsigned int i = 0; i < brickRequest.size(); ++i) {
+    for (unsigned int i = 0; i < brickRequest.size(); i++) {
         if (brickRequest[i] > 0) {
             numBricks++;
 
@@ -367,7 +367,7 @@ bool BrickManager::diskToPBO(BUFFER_INDEX pboIndex) {
             //INFO("Disk read "<<mb<<" MB in "<<time<<" s, "<< mb/time<<" MB/s");
 
             // For each brick in the buffer, put it the correct buffer spot
-            for (unsigned int i = 0; i < sequence; ++i) {
+            for (unsigned int i = 0; i < sequence; i++) {
                 // Only upload if needed
                 // Pointless if implementation only skips reading when ALL bricks in
                 // sequence are in PBO, but could be useful if other solutions that
diff --git a/modules/multiresvolume/rendering/errorhistogrammanager.cpp b/modules/multiresvolume/rendering/errorhistogrammanager.cpp
index 2a83995732..bfe0f41156 100644
--- a/modules/multiresvolume/rendering/errorhistogrammanager.cpp
+++ b/modules/multiresvolume/rendering/errorhistogrammanager.cpp
@@ -196,7 +196,7 @@ bool ErrorHistogramManager::loadFromFile(const std::filesystem::path& filename)
 
     _histograms = std::vector<Histogram>(_numInnerNodes);
 
-    for (int i = 0; i < static_cast<int>(_numInnerNodes); ++i) {
+    for (int i = 0; i < static_cast<int>(_numInnerNodes); i++) {
         int offset = i * _numBins;
         float* data = new float[_numBins];
         memcpy(data, &histogramData[offset], sizeof(float) * _numBins);
@@ -224,7 +224,7 @@ bool ErrorHistogramManager::saveToFile(const std::filesystem::path& filename) {
     int nFloats = _numInnerNodes * _numBins;
     float* histogramData = new float[nFloats];
 
-    for (unsigned int i = 0; i < _numInnerNodes; ++i) {
+    for (unsigned int i = 0; i < _numInnerNodes; i++) {
         int offset = i * _numBins;
         memcpy(&histogramData[offset], _histograms[i].data(), sizeof(float) * _numBins);
     }
diff --git a/modules/multiresvolume/rendering/histogrammanager.cpp b/modules/multiresvolume/rendering/histogrammanager.cpp
index 91b7f6ab4a..a7929f18b5 100644
--- a/modules/multiresvolume/rendering/histogrammanager.cpp
+++ b/modules/multiresvolume/rendering/histogrammanager.cpp
@@ -139,7 +139,7 @@ bool HistogramManager::loadFromFile(const std::filesystem::path& filename) {
 
     _histograms = std::vector<Histogram>(numHistograms);
 
-    for (int i = 0; i < numHistograms; ++i) {
+    for (int i = 0; i < numHistograms; i++) {
         int offset = i * _numBins;
         // No need to deallocate histogram data, since histograms take ownership.
         float* data = new float[_numBins];
@@ -166,7 +166,7 @@ bool HistogramManager::saveToFile(const std::filesystem::path& filename) {
     size_t nFloats = numHistograms * _numBins;
     std::vector<float> histogramData(nFloats);
 
-    for (size_t i = 0; i < numHistograms; ++i) {
+    for (size_t i = 0; i < numHistograms; i++) {
         size_t offset = i*_numBins;
         memcpy(&histogramData[offset], _histograms[i].data(), sizeof(float) * _numBins);
     }
diff --git a/modules/multiresvolume/rendering/localerrorhistogrammanager.cpp b/modules/multiresvolume/rendering/localerrorhistogrammanager.cpp
index 022aab6335..14bdf6a753 100644
--- a/modules/multiresvolume/rendering/localerrorhistogrammanager.cpp
+++ b/modules/multiresvolume/rendering/localerrorhistogrammanager.cpp
@@ -321,7 +321,7 @@ bool LocalErrorHistogramManager::loadFromFile(const std::filesystem::path& filen
 
     file.read(reinterpret_cast<char*>(histogramData.data()), sizeof(float) * nFloats);
     _spatialHistograms = std::vector<Histogram>(_numInnerNodes);
-    for (unsigned int i = 0; i < _numInnerNodes; ++i) {
+    for (unsigned int i = 0; i < _numInnerNodes; i++) {
         const int offset = i * _numBins;
         // No need to deallocate histogram data, since histograms take ownership.
         float* data = new float[_numBins];
@@ -331,7 +331,7 @@ bool LocalErrorHistogramManager::loadFromFile(const std::filesystem::path& filen
 
     file.read(reinterpret_cast<char*>(histogramData.data()), sizeof(float) * nFloats);
     _temporalHistograms = std::vector<Histogram>(_numInnerNodes);
-    for (unsigned int i = 0; i < _numInnerNodes; ++i) {
+    for (unsigned int i = 0; i < _numInnerNodes; i++) {
         const int offset = i * _numBins;
         // No need to deallocate histogram data, since histograms take ownership.
         float* data = new float[_numBins];
@@ -358,7 +358,7 @@ bool LocalErrorHistogramManager::saveToFile(const std::filesystem::path& filenam
     const int nFloats = _numInnerNodes * _numBins;
     std::vector<float> histogramData(nFloats);
 
-    for (unsigned int i = 0; i < _numInnerNodes; ++i) {
+    for (unsigned int i = 0; i < _numInnerNodes; i++) {
         int offset = i * _numBins;
         memcpy(
             &histogramData[offset],
@@ -368,7 +368,7 @@ bool LocalErrorHistogramManager::saveToFile(const std::filesystem::path& filenam
     }
     file.write(reinterpret_cast<char*>(histogramData.data()), sizeof(float) * nFloats);
 
-    for (unsigned int i = 0; i < _numInnerNodes; ++i) {
+    for (unsigned int i = 0; i < _numInnerNodes; i++) {
         int offset = i * _numBins;
         memcpy(
             &histogramData[offset],
diff --git a/modules/multiresvolume/rendering/tsp.cpp b/modules/multiresvolume/rendering/tsp.cpp
index b12b8ae868..37f1ad074e 100644
--- a/modules/multiresvolume/rendering/tsp.cpp
+++ b/modules/multiresvolume/rendering/tsp.cpp
@@ -147,7 +147,7 @@ bool TSP::construct() {
         unsigned int OTLevel = 0;
         while (OTLevel < _numOTLevels) {
             unsigned int OTNodesInLevel = static_cast<unsigned int>(pow(8, OTLevel));
-            for (unsigned int i = 0; i<OTNodesInLevel; ++i) {
+            for (unsigned int i = 0; i<OTNodesInLevel; i++) {
                 // Brick index
                 _data[OTNode*NUM_DATA + BRICK_INDEX] = static_cast<int>(OTNode);
 
@@ -363,7 +363,7 @@ bool TSP::calculateSpatialError() {
     // "Normalize" errors
     float minNorm = 1e20f;
     float maxNorm = 0.f;
-    for (unsigned int i = 0; i<_numTotalNodes; ++i) {
+    for (unsigned int i = 0; i<_numTotalNodes; i++) {
         //float normalized = (stdDevs[i]-minError)/(maxError-minError);
         if (stdDevs[i] > 0.f) {
             stdDevs[i] = pow(stdDevs[i], 0.5f);
@@ -476,7 +476,7 @@ bool TSP::calculateTemporalError() {
     // Adjust errors using user-provided exponents
     float minNorm = 1e20f;
     float maxNorm = 0.f;
-    for (unsigned int i = 0; i < _numTotalNodes; ++i) {
+    for (unsigned int i = 0; i < _numTotalNodes; i++) {
         if (errors[i] > 0.f) {
             errors[i] = pow(errors[i], 0.25f);
         }
@@ -649,7 +649,7 @@ std::list<unsigned int> TSP::coveredLeafBricks(unsigned int brickIndex) const {
         }
         else {
             // Queue the eight children
-            for (int i = 0; i<8; ++i) {
+            for (int i = 0; i<8; i++) {
                 queue.push(child + i);
             }
         }
diff --git a/modules/server/src/topics/flightcontrollertopic.cpp b/modules/server/src/topics/flightcontrollertopic.cpp
index 1ac4fd202f..fe29905348 100644
--- a/modules/server/src/topics/flightcontrollertopic.cpp
+++ b/modules/server/src/topics/flightcontrollertopic.cpp
@@ -147,7 +147,7 @@ using nlohmann::json;
 namespace openspace {
 
 FlightControllerTopic::FlightControllerTopic() {
-    for (auto it = AxisIndexMap.begin(); it != AxisIndexMap.end(); ++it) {
+    for (auto it = AxisIndexMap.begin(); it != AxisIndexMap.end(); it++) {
         global::navigationHandler->setWebsocketAxisMapping(
             int(std::distance(AxisIndexMap.begin(), it)),
             it->second
@@ -389,7 +389,7 @@ void FlightControllerTopic::engageAutopilot(const nlohmann::json &json) {
     std::fill(_inputState.axes.begin(), _inputState.axes.end(), 0.f);
     _inputState.isConnected = true;
 
-    for (auto it = input.begin(); it != input.end(); ++it) {
+    for (auto it = input.begin(); it != input.end(); it++) {
         const auto mapIt = AxisIndexMap.find(it.key());
         if (mapIt == AxisIndexMap.end()) {
             if (it.key() != TypeKey || CommandMap.find(it.value()) == CommandMap.end()) {
@@ -429,7 +429,7 @@ void FlightControllerTopic::processInputState(const nlohmann::json& json) {
     // Get "inputState" object from "payload"
     auto input = json[InputState][ValuesKey];
 
-    for (auto it = input.begin(); it != input.end(); ++it) {
+    for (auto it = input.begin(); it != input.end(); it++) {
         const auto mapIt = AxisIndexMap.find(it.key());
         if (mapIt == AxisIndexMap.end()) {
             if (it.key() != TypeKey || CommandMap.find(it.value()) == CommandMap.end()) {
diff --git a/modules/server/src/topics/luascripttopic.cpp b/modules/server/src/topics/luascripttopic.cpp
index b7d492279b..1cdbbf38c4 100644
--- a/modules/server/src/topics/luascripttopic.cpp
+++ b/modules/server/src/topics/luascripttopic.cpp
@@ -73,7 +73,7 @@ namespace {
     std::string formatObjectAsLuaTable(const nlohmann::json& json) {
         std::string output = "{";
         auto it = json.begin();
-        for (size_t i = 0; i < json.size(); ++i, ++it) {
+        for (size_t i = 0; i < json.size(); i++, it++) {
             output += formatKeyValuePair(it);
             if (i < json.size() - 1) {
                 output += ",";
@@ -85,7 +85,7 @@ namespace {
     std::string formatArrayAsLuaTable(const nlohmann::json& json) {
         std::string output = "{";
         auto it = json.begin();
-        for (size_t i = 0; i < json.size(); ++i, ++it) {
+        for (size_t i = 0; i < json.size(); i++, it++) {
             output += formatLua(it);
             if (i < json.size() - 1) {
                 output += ",";
@@ -121,7 +121,7 @@ namespace {
     {
         std::string script = "return " + function + "(";
         auto it = args.begin();
-        for (size_t i = 0; i < args.size(); ++i, ++it) {
+        for (size_t i = 0; i < args.size(); i++, it++) {
             script += *it;
             if (i < args.size() - 1) {
                 script += ",";
@@ -175,7 +175,7 @@ void LuaScriptTopic::handleJson(const nlohmann::json& json) {
 
             std::vector<std::string> formattedArgs;
             formattedArgs.reserve(args->size());
-            for (auto it = args->begin(); it != args->end(); ++it) {
+            for (auto it = args->begin(); it != args->end(); it++) {
                 formattedArgs.push_back(formatLua(it));
             }
 
diff --git a/modules/server/src/topics/setpropertytopic.cpp b/modules/server/src/topics/setpropertytopic.cpp
index 182b6817c8..67c0dc7869 100644
--- a/modules/server/src/topics/setpropertytopic.cpp
+++ b/modules/server/src/topics/setpropertytopic.cpp
@@ -81,7 +81,7 @@ namespace {
             }
 
             std::string literal = "{";
-            for (nlohmann::json::iterator it = value.begin(); it != value.end(); ++it) {
+            for (nlohmann::json::iterator it = value.begin(); it != value.end(); it++) {
                 literal += luaLiteralFromJson(it.value()) += ",";
             }
             literal.pop_back(); // remove last comma
@@ -94,7 +94,7 @@ namespace {
             }
 
             std::string literal = "{";
-            for (nlohmann::json::iterator it = value.begin(); it != value.end(); ++it) {
+            for (nlohmann::json::iterator it = value.begin(); it != value.end(); it++) {
                 literal += it.key() + "=" + luaLiteralFromJson(it.value()) += ",";
             }
             literal.pop_back(); // remove last comma
diff --git a/modules/space/rendering/renderableconstellationlines.cpp b/modules/space/rendering/renderableconstellationlines.cpp
index f8b2b5f013..8958b85b7d 100644
--- a/modules/space/rendering/renderableconstellationlines.cpp
+++ b/modules/space/rendering/renderableconstellationlines.cpp
@@ -128,7 +128,7 @@ RenderableConstellationLines::RenderableConstellationLines(
 
     if (p.colors.has_value()) {
         std::vector<glm::vec3> ops = *p.colors;
-        for (size_t i = 0; i < ops.size(); ++i) {
+        for (size_t i = 0; i < ops.size(); i++) {
             _constellationColorMap.insert({ static_cast<int>(i) + 1, ops[i] });
         }
     }
diff --git a/modules/space/rendering/renderablefluxnodes.cpp b/modules/space/rendering/renderablefluxnodes.cpp
index 5b18355ae1..66bb4bc2ad 100644
--- a/modules/space/rendering/renderablefluxnodes.cpp
+++ b/modules/space/rendering/renderablefluxnodes.cpp
@@ -479,7 +479,7 @@ void RenderableFluxNodes::loadNodeData(int energybinOption) {
     _statesPos.clear();
     _statesRadius.clear();
 
-    for (unsigned int i = 0; i < _nStates; ++i) {
+    for (unsigned int i = 0; i < _nStates; i++) {
         _vertexPositions.resize(nNodesPerTimestep);
         fileStream.read(reinterpret_cast<char*>(
             _vertexPositions.data()), nNodesPerTimestep * sizeof(glm::vec3)
@@ -488,7 +488,7 @@ void RenderableFluxNodes::loadNodeData(int energybinOption) {
         _statesPos.push_back(_vertexPositions);
         _vertexPositions.clear();
     }
-    for (unsigned int i = 0; i < _nStates; ++i) {
+    for (unsigned int i = 0; i < _nStates; i++) {
         _vertexColor.resize(nNodesPerTimestep);
         fileStream2.read(reinterpret_cast<char*>(
             _vertexColor.data()), nNodesPerTimestep * sizeof(float)
@@ -497,7 +497,7 @@ void RenderableFluxNodes::loadNodeData(int energybinOption) {
         _statesColor.push_back(_vertexColor);
         _vertexColor.clear();
     }
-    for (unsigned int i = 0; i < _nStates; ++i) {
+    for (unsigned int i = 0; i < _nStates; i++) {
         _vertexRadius.resize(nNodesPerTimestep);
         fileStream3.read(reinterpret_cast<char*>(
             _vertexRadius.data()), nNodesPerTimestep * sizeof(float)
@@ -629,7 +629,7 @@ void RenderableFluxNodes::populateStartTimes() {
     }
     while (std::getline(tfs, line)) {   // for each line of data
         std::istringstream iss(line);
-        for (int i = 0; i < nColumns; ++i) {    // for each column in line
+        for (int i = 0; i < nColumns; i++) {    // for each column in line
             std::string columnValue;
             iss >> columnValue;
             if (i != nColumns - 1) {    // last column
diff --git a/modules/space/rendering/renderablehabitablezone.cpp b/modules/space/rendering/renderablehabitablezone.cpp
index 622d69d777..afdafa46fa 100644
--- a/modules/space/rendering/renderablehabitablezone.cpp
+++ b/modules/space/rendering/renderablehabitablezone.cpp
@@ -252,7 +252,7 @@ glm::dvec4 RenderableHabitableZone::computeKopparapuZoneBoundaries(float teff,
     const double L = static_cast<double>(luminosity);
 
     glm::dvec4 distances;
-    for (int i = 0; i < 4; ++i) {
+    for (int i = 0; i < 4; i++) {
         const Coefficients& coeffs = coefficients[i];
         double seff = coeffs.seffSun + (coeffs.a * tstar) + (coeffs.b * tstar2) +
             (coeffs.c * tstar * tstar2) + (coeffs.d * tstar2 * tstar2);
diff --git a/modules/space/rendering/renderableorbitalkepler.cpp b/modules/space/rendering/renderableorbitalkepler.cpp
index 5acaf7e019..d5ea2d4de2 100644
--- a/modules/space/rendering/renderableorbitalkepler.cpp
+++ b/modules/space/rendering/renderableorbitalkepler.cpp
@@ -354,7 +354,7 @@ void RenderableOrbitalKepler::updateBuffers() {
     _segmentSize.clear();
     _startIndex.clear();
     _startIndex.push_back(0);
-    for (size_t i = 0; i < parameters.size(); ++i) {
+    for (size_t i = 0; i < parameters.size(); i++) {
         const double scale = static_cast<double>(_segmentQuality) * 10.0;
         const kepler::Parameters& p = parameters[i];
         _segmentSize.push_back(
@@ -367,7 +367,7 @@ void RenderableOrbitalKepler::updateBuffers() {
     size_t nVerticesTotal = 0;
 
     int numOrbits = static_cast<int>(parameters.size());
-    for (int i = 0; i < numOrbits; ++i) {
+    for (int i = 0; i < numOrbits; i++) {
         nVerticesTotal += _segmentSize[i];
     }
     _vertexBufferData.resize(nVerticesTotal);
@@ -388,7 +388,7 @@ void RenderableOrbitalKepler::updateBuffers() {
             orbit.epoch
         );
 
-        for (GLint j = 0 ; j < (_segmentSize[orbitIdx]); ++j) {
+        for (GLint j = 0 ; j < (_segmentSize[orbitIdx]); j++) {
             double timeOffset = orbit.period *
                 static_cast<double>(j) / static_cast<double>(_segmentSize[orbitIdx] - 1);
 
diff --git a/modules/space/translation/horizonstranslation.cpp b/modules/space/translation/horizonstranslation.cpp
index 7709f8fbd6..3fb5c22624 100644
--- a/modules/space/translation/horizonstranslation.cpp
+++ b/modules/space/translation/horizonstranslation.cpp
@@ -241,7 +241,7 @@ bool HorizonsTranslation::loadCachedFile(const std::filesystem::path& file) {
     );
 
     // Extract the data from the cache Keyframe vector
-    for (int i = 0; i < nKeyframes; ++i) {
+    for (int i = 0; i < nKeyframes; i++) {
         // Add keyframe in timeline
         _timeline.addKeyframe(
             std::move(cacheKeyframes[i].timestamp),
diff --git a/modules/space/translation/keplertranslation.cpp b/modules/space/translation/keplertranslation.cpp
index 3f13ceff46..1bd8571bec 100644
--- a/modules/space/translation/keplertranslation.cpp
+++ b/modules/space/translation/keplertranslation.cpp
@@ -35,7 +35,7 @@ namespace {
     T solveIteration(const Func& function, T x0, const T& err = 0.0, int maxIter = 100) {
         T x2 = x0;
 
-        for (int i = 0; i < maxIter; ++i) {
+        for (int i = 0; i < maxIter; i++) {
             T x = x2;
             x2 = function(x);
             if (std::abs(x2 - x) < err) {
diff --git a/modules/spacecraftinstruments/rendering/renderablefov.cpp b/modules/spacecraftinstruments/rendering/renderablefov.cpp
index 6e9a1b402b..24098e844d 100644
--- a/modules/spacecraftinstruments/rendering/renderablefov.cpp
+++ b/modules/spacecraftinstruments/rendering/renderablefov.cpp
@@ -308,7 +308,7 @@ void RenderableFov::initializeGL() {
 
     if (_simplifyBounds) {
         const size_t sizeBefore = res.bounds.size();
-        for (size_t i = 1; i < res.bounds.size() - 1; ++i) {
+        for (size_t i = 1; i < res.bounds.size() - 1; i++) {
             const glm::dvec3& prev = res.bounds[i - 1];
             const glm::dvec3& curr = res.bounds[i];
             const glm::dvec3& next = res.bounds[i + 1];
@@ -489,7 +489,7 @@ void RenderableFov::computeIntercepts(double time, const std::string& target,
     // First we fill the field-of-view bounds array by testing each bounds vector against
     // the object. We need to test it against the object (rather than using a fixed
     // distance) as the field of view rendering should stop at the surface
-    for (size_t i = 0; i < _instrument.bounds.size(); ++i) {
+    for (size_t i = 0; i < _instrument.bounds.size(); i++) {
         const glm::dvec3& bound = _instrument.bounds[i];
 
         RenderInformation::VBOData& first = _fieldOfViewBounds.data[2 * i];
@@ -582,7 +582,7 @@ void RenderableFov::computeIntercepts(double time, const std::string& target,
 
     // An early out for when the target is not in field of view
     if (!isInFov) {
-        for (size_t i = 0; i < _instrument.bounds.size(); ++i) {
+        for (size_t i = 0; i < _instrument.bounds.size(); i++) {
             // If none of the points are able to intersect with the target, we can just
             // copy the values from the field-of-view boundary. So we take each second
             // item (the first one is (0,0,0)) and replicate it 'InterpolationSteps' times
@@ -591,7 +591,7 @@ void RenderableFov::computeIntercepts(double time, const std::string& target,
     }
     else {
         // At least one point will intersect
-        for (size_t i = 0; i < _instrument.bounds.size(); ++i) {
+        for (size_t i = 0; i < _instrument.bounds.size(); i++) {
             // Wrap around the array index to 0
             const size_t j = (i == _instrument.bounds.size() - 1) ? 0 : i + 1;
 
@@ -663,7 +663,7 @@ void RenderableFov::computeIntercepts(double time, const std::string& target,
 
 #if 0 // DEBUG_THIS
     // At least one point will intersect
-    for (size_t i = 0; i < _instrument.bounds.size(); ++i) {
+    for (size_t i = 0; i < _instrument.bounds.size(); i++) {
         // Wrap around the array index to 0
         const size_t j = (i == _instrument.bounds.size() - 1) ? 0 : i + 1;
 
@@ -726,7 +726,7 @@ void RenderableFov::computeIntercepts(double time, const std::string& target,
                     copyFieldOfViewValues(i, p2, indexForBounds(j));
 
                     // Are recompute the intersecting ones
-                    for (size_t k = 0; k <= (p2 - p1); ++k) {
+                    for (size_t k = 0; k <= (p2 - p1); k++) {
                         const double t = t1 + k * (t2 - t1);
                         const glm::dvec3 interpolated = glm::mix(iBound, jBound, t);
                         const glm::vec3 icpt = interceptVector(interpolated);
diff --git a/modules/spacecraftinstruments/rendering/renderableplaneprojection.cpp b/modules/spacecraftinstruments/rendering/renderableplaneprojection.cpp
index 19f653a933..a6361a6cfe 100644
--- a/modules/spacecraftinstruments/rendering/renderableplaneprojection.cpp
+++ b/modules/spacecraftinstruments/rendering/renderableplaneprojection.cpp
@@ -239,7 +239,7 @@ void RenderablePlaneProjection::updatePlane(const Image& img, double currentTime
 
     std::array<glm::vec3, 4> projection;
     std::fill(projection.begin(), projection.end(), glm::vec3(0.f));
-    for (size_t j = 0; j < bounds.size(); ++j) {
+    for (size_t j = 0; j < bounds.size(); j++) {
         bounds[j] = SpiceManager::ref().frameTransformationMatrix(
             frame,
             "GALACTIC",
diff --git a/modules/spacecraftinstruments/util/imagesequencer.cpp b/modules/spacecraftinstruments/util/imagesequencer.cpp
index ab77378408..010d13ff45 100644
--- a/modules/spacecraftinstruments/util/imagesequencer.cpp
+++ b/modules/spacecraftinstruments/util/imagesequencer.cpp
@@ -254,7 +254,7 @@ std::vector<Image> ImageSequencer::imagePaths(const std::string& projectee,
     }
 
     std::vector<int> toDelete;
-    for (std::vector<Image>::iterator it = captures.begin(); it != captures.end(); ++it) {
+    for (std::vector<Image>::iterator it = captures.begin(); it != captures.end(); it++) {
         if (!it->isPlaceholder) {
             continue;
         }
@@ -274,7 +274,7 @@ std::vector<Image> ImageSequencer::imagePaths(const std::string& projectee,
         }
     }
 
-    for (size_t i = 0; i < toDelete.size(); ++i) {
+    for (size_t i = 0; i < toDelete.size(); i++) {
         // We have to subtract i here as we already have deleted i value before this and
         // we need to adjust the location
         int v = toDelete[i] - static_cast<int>(i);
@@ -350,7 +350,7 @@ void ImageSequencer::runSequenceParser(SequenceParser& parser) {
         // simple search function
         double min = 10;
         auto findMin = [&min](const std::vector<Image>& vec) -> double {
-            for (size_t i = 1; i < vec.size(); ++i) {
+            for (size_t i = 1; i < vec.size(); i++) {
                 double e = std::abs(vec[i].timeRange.start - vec[i - 1].timeRange.start);
                 min = std::min(e, min);
             }
diff --git a/modules/spacecraftinstruments/util/targetdecoder.cpp b/modules/spacecraftinstruments/util/targetdecoder.cpp
index 4db4f343fa..09bdc2569b 100644
--- a/modules/spacecraftinstruments/util/targetdecoder.cpp
+++ b/modules/spacecraftinstruments/util/targetdecoder.cpp
@@ -34,7 +34,7 @@ namespace openspace {
 
 TargetDecoder::TargetDecoder(const ghoul::Dictionary& dictionary) {
     _names.resize(dictionary.size());
-    for (size_t i = 0; i < _names.size(); ++i) {
+    for (size_t i = 0; i < _names.size(); i++) {
         std::string key = std::to_string(i + 1);
         if (dictionary.hasKey(key) && dictionary.hasValue<std::string>(key)) {
             _names[i] = dictionary.value<std::string>(key);;
diff --git a/modules/spout/renderableplanespout.cpp b/modules/spout/renderableplanespout.cpp
index d43845af4c..4a71596eb2 100644
--- a/modules/spout/renderableplanespout.cpp
+++ b/modules/spout/renderableplanespout.cpp
@@ -89,7 +89,7 @@ RenderablePlaneSpout::RenderablePlaneSpout(const ghoul::Dictionary& dictionary)
         else {
             setIdentifier("RenderablePlaneSpout" + std::to_string(iIdentifier));
         }
-        ++id;
+        id++;
     }
 
     if (_guiName.empty()) {
diff --git a/modules/spout/renderablespherespout.cpp b/modules/spout/renderablespherespout.cpp
index a45a0c8b64..384bacd254 100644
--- a/modules/spout/renderablespherespout.cpp
+++ b/modules/spout/renderablespherespout.cpp
@@ -77,7 +77,7 @@ RenderableSphereSpout::RenderableSphereSpout(const ghoul::Dictionary& dictionary
         else {
             setIdentifier("RenderableSphereSpout" + std::to_string(iIdentifier));
         }
-        ++id;
+        id++;
     }
 
     if (_guiName.empty()) {
diff --git a/modules/spout/spoutwrapper.cpp b/modules/spout/spoutwrapper.cpp
index 7e50f31359..739a3170bb 100644
--- a/modules/spout/spoutwrapper.cpp
+++ b/modules/spout/spoutwrapper.cpp
@@ -135,7 +135,7 @@ const std::vector<std::string> &SpoutReceiver::spoutReceiverList() {
     const int nSenders = _spoutHandle->GetSenderCount();
     _receiverList.clear();
 
-    for (int i = 0; i < nSenders; ++i) {
+    for (int i = 0; i < nSenders; i++) {
         char Name[256];
         _spoutHandle->GetSenderName(i, Name, 256);
         _receiverList.push_back(Name);
@@ -373,7 +373,7 @@ SpoutReceiverPropertyProxy::SpoutReceiverPropertyProxy(properties::PropertyOwner
         _spoutSelection.addOption(0, "");
 
         int idx = 0;
-        for (int i = 0; i < static_cast<int>(receiverList.size()); ++i) {
+        for (int i = 0; i < static_cast<int>(receiverList.size()); i++) {
             _spoutSelection.addOption(i + 1, receiverList[i]);
 
             LWARNING(fmt::format("List {}", receiverList[i]));
diff --git a/modules/statemachine/src/statemachine.cpp b/modules/statemachine/src/statemachine.cpp
index 4d472f943a..48046a7884 100644
--- a/modules/statemachine/src/statemachine.cpp
+++ b/modules/statemachine/src/statemachine.cpp
@@ -160,7 +160,7 @@ int StateMachine::findTransitionTo(const std::string& state) const {
         return -1;
     }
 
-    for (size_t i = 0; i < _transitions.size(); ++i) {
+    for (size_t i = 0; i < _transitions.size(); i++) {
         if (_transitions[i].from() == currentState()->name() &&
             _transitions[i].to() == state)
         {
@@ -173,7 +173,7 @@ int StateMachine::findTransitionTo(const std::string& state) const {
 // Search if the state exist.
 // If yes then return the index to the state, otherwise return -1
 int StateMachine::findState(const std::string& state) const {
-    for (size_t i = 0; i < _states.size(); ++i) {
+    for (size_t i = 0; i < _states.size(); i++) {
         if (_states[i].name() == state) {
             return static_cast<int>(i);
         }
@@ -189,7 +189,7 @@ std::vector<std::string> StateMachine::possibleTransitions() const {
     }
 
     res.reserve(_transitions.size());
-    for (size_t i = 0; i < _transitions.size(); ++i) {
+    for (size_t i = 0; i < _transitions.size(); i++) {
         if (_transitions[i].from() == currentState()->name()) {
             res.push_back(_transitions[i].to());
         }
diff --git a/modules/touch/src/directinputsolver.cpp b/modules/touch/src/directinputsolver.cpp
index 6f3a0dd6b2..0352438163 100644
--- a/modules/touch/src/directinputsolver.cpp
+++ b/modules/touch/src/directinputsolver.cpp
@@ -64,7 +64,7 @@ double distToMinimize(double* par, int x, void* fdata, LMstat* lmstat) {
 
     // { vec2 globalRot, zoom, roll, vec2 localRot }
     double q[6] = { 0.0, 0.0, 0.0, 0.0, 0.0, 0.0 };
-    for (int i = 0; i < ptr->nDOF; ++i) {
+    for (int i = 0; i < ptr->nDOF; i++) {
         q[i] = par[i];
     }
 
@@ -150,7 +150,7 @@ void gradient(double* g, double* par, int x, void* fdata, LMstat* lmstat) {
     std::vector<double> dPar(ptr->nDOF, 0.0);
     dPar.assign(par, par + ptr->nDOF);
 
-    for (int i = 0; i < ptr->nDOF; ++i) {
+    for (int i = 0; i < ptr->nDOF; i++) {
         // Initial values
         double h = 1e-8;
         double lastG = 1;
@@ -158,7 +158,7 @@ void gradient(double* g, double* par, int x, void* fdata, LMstat* lmstat) {
         double f1 = distToMinimize(dPar.data(), x, fdata, lmstat);
         dPar.at(i) = par[i];
         // Iterative process to find the minimum step h that gives a good gradient
-        for (int j = 0; j < 100; ++j) {
+        for (int j = 0; j < 100; j++) {
             if ((f1 - f0) != 0 && lastG == 0) { // found minimum step size h
                 // scale up to get a good initial guess value
                 h *= scale * scale * scale;
@@ -196,12 +196,12 @@ void gradient(double* g, double* par, int x, void* fdata, LMstat* lmstat) {
     }
     if (ptr->nDOF == 2) {
         // normalize on 1 finger case to allow for horizontal/vertical movement
-        for (int i = 0; i < 2; ++i) {
+        for (int i = 0; i < 2; i++) {
             g[i] = g[i] / std::abs(g[i]);
         }
     }
     else if (ptr->nDOF == 6) {
-        for (int i = 0; i < ptr->nDOF; ++i) {
+        for (int i = 0; i < ptr->nDOF; i++) {
             // lock to only pan and zoom on 3 finger case, no roll/orbit
             g[i] = (i == 2) ? g[i] : g[i] / std::abs(g[i]);
         }
@@ -226,7 +226,7 @@ bool DirectInputSolver::solve(const std::vector<TouchInputHolder>& list,
     std::vector<glm::dvec3> selectedPoints;
     std::vector<glm::dvec2> screenPoints;
 
-    for (int i = 0; i < nFingers; ++i) {
+    for (int i = 0; i < nFingers; i++) {
         const SelectedBody& sb = selectedBodies.at(i);
         selectedPoints.push_back(sb.coordinates);
         screenPoints.emplace_back(
diff --git a/modules/volume/envelope.cpp b/modules/volume/envelope.cpp
index 9b900c0bc1..061e310bd9 100644
--- a/modules/volume/envelope.cpp
+++ b/modules/volume/envelope.cpp
@@ -57,7 +57,7 @@ bool Envelope::operator!=(const Envelope& env) const {
 
     for (auto iter = _points.begin(), envIter = env._points.begin();
          iter != _points.end();
-         ++iter, ++envIter)
+         iter++, envIter++)
     {
       if (std::fabs(iter->position.first - envIter->position.first) > MinDist ||
           std::fabs(iter->position.second - envIter->position.second) > MinDist ||
@@ -134,7 +134,7 @@ glm::vec4 Envelope::valueAtPosition(float pos) const {
 int EnvelopePoint::hexadecimalToDecimal(const std::string& hex) const {
     const size_t hexLength = hex.length();
     double dec = 0;
-    for (size_t i = 0; i < hexLength; ++i) {
+    for (size_t i = 0; i < hexLength; i++) {
         char b = hex[i];
 
         if (b >= 48 && b <= 57) {
@@ -214,7 +214,7 @@ json Envelope::jsonEnvelope() const {
 }
 
 void Envelope::setEnvelopeLuaTable(lua_State* state) const {
-    for (auto iter = _points.begin(); iter != _points.end(); ++iter) {
+    for (auto iter = _points.begin(); iter != _points.end(); iter++) {
         lua_newtable(state);
         ghoul::lua::push(state, iter->colorHex);
         lua_setfield(state, -2, "color");
diff --git a/modules/volume/rawvolumereader.inl b/modules/volume/rawvolumereader.inl
index a392e43f80..f17fcc1215 100644
--- a/modules/volume/rawvolumereader.inl
+++ b/modules/volume/rawvolumereader.inl
@@ -104,7 +104,7 @@ std::unique_ptr<RawVolume<VoxelType>> RawVolumeReader<VoxelType>::read(bool inve
         std::unique_ptr<RawVolume<VoxelType>> newVolume =
             std::make_unique<RawVolume<VoxelType>>(dims);
 
-        for (size_t i = 0; i < volume->nCells(); ++i) {
+        for (size_t i = 0; i < volume->nCells(); i++) {
             const glm::uvec3& coords = volume->indexToCoords(i);
             glm::uvec3 newcoords = glm::uvec3(coords.x, coords.y, dims.z - coords.z - 1);
 
diff --git a/modules/volume/rendering/renderabletimevaryingvolume.cpp b/modules/volume/rendering/renderabletimevaryingvolume.cpp
index 968677ac30..d0265032d1 100644
--- a/modules/volume/rendering/renderabletimevaryingvolume.cpp
+++ b/modules/volume/rendering/renderabletimevaryingvolume.cpp
@@ -255,12 +255,12 @@ void RenderableTimeVaryingVolume::initializeGL() {
         float min = t.metadata.minValue;
         float diff = t.metadata.maxValue - t.metadata.minValue;
         float* data = t.rawVolume->data();
-        for (size_t i = 0; i < t.rawVolume->nCells(); ++i) {
+        for (size_t i = 0; i < t.rawVolume->nCells(); i++) {
             data[i] = glm::clamp((data[i] - min) / diff, 0.f, 1.f);
         }
 
         t.histogram = std::make_shared<Histogram>(0.f, 1.f, 100);
-        for (size_t i = 0; i < t.rawVolume->nCells(); ++i) {
+        for (size_t i = 0; i < t.rawVolume->nCells(); i++) {
             t.histogram->add(data[i]);
         }
         // TODO: handle normalization properly for different timesteps + transfer function
@@ -398,7 +398,7 @@ int RenderableTimeVaryingVolume::timestepIndex(
         if (&(it.second) == t) {
             return index;
         }
-        ++index;
+        index++;
     }
     return -1;
 }
@@ -415,7 +415,7 @@ RenderableTimeVaryingVolume::Timestep* RenderableTimeVaryingVolume::timestepFrom
         if (index == target) {
             return &(it.second);
         }
-        ++index;
+        index++;
     }
     return nullptr;
 }
diff --git a/modules/volume/transferfunction.cpp b/modules/volume/transferfunction.cpp
index 8f5f0d9a5e..125428df04 100644
--- a/modules/volume/transferfunction.cpp
+++ b/modules/volume/transferfunction.cpp
@@ -39,7 +39,7 @@ TransferFunction::TransferFunction(const std::string& s) {
 
 bool TransferFunction::setEnvelopesFromString(const std::string& s) {
     json j = json::parse(s);
-    for (json::iterator it = j.begin(); it != j.end(); ++it) {
+    for (json::iterator it = j.begin(); it != j.end(); it++) {
         Envelope env;
         std::vector<EnvelopePoint> tmpVec;
         for (size_t i = 0; i < 4; i++) {
@@ -92,7 +92,7 @@ bool TransferFunction::setEnvelopesFromLua(lua_State* state) {
 
 void TransferFunction::envelopesToLua(lua_State* state) const {
     lua_newtable(state);
-    for (auto iter = _envelopes.begin(); iter != _envelopes.end(); ++iter) {
+    for (auto iter = _envelopes.begin(); iter != _envelopes.end(); iter++) {
         lua_newtable(state);
         iter->setEnvelopeLuaTable(state);
         lua_setfield(
@@ -163,7 +163,7 @@ bool TransferFunction::operator!=(const TransferFunction& tf) {
 
     auto iter = _envelopes.begin();
     auto tfIter = tf._envelopes.begin();
-    for (; iter != _envelopes.end(); ++iter, ++tfIter) {
+    for (; iter != _envelopes.end(); iter++, tfIter++) {
         if (*iter != *tfIter)
             return true;
     }
@@ -193,7 +193,7 @@ bool TransferFunction::createTexture(ghoul::opengl::Texture& ptr) {
         float* transferFunction = new float[_width * 4];
         std::memset(transferFunction, 0, _width * 4 * sizeof(float));
 
-        for (int i = 0; i < _width ; ++i) {
+        for (int i = 0; i < _width ; i++) {
             const float position = static_cast<float>(i) / static_cast<float>(_width);
             int count = 0;
             glm::vec4 rgbFromEnvelopes(0.f);
diff --git a/modules/webgui/webguimodule.cpp b/modules/webgui/webguimodule.cpp
index 26dc12233e..0910fa2e88 100644
--- a/modules/webgui/webguimodule.cpp
+++ b/modules/webgui/webguimodule.cpp
@@ -259,7 +259,7 @@ void WebGuiModule::startProcess() {
     std::string formattedDirectories = "[";
 
     std::vector<std::string> directories = _directories;
-    for (size_t i = 0; i < directories.size(); ++i) {
+    for (size_t i = 0; i < directories.size(); i++) {
         std::string arg = directories[i];
         if (i % 2 == 1) {
             arg = absPath(arg).string();
diff --git a/src/data/csvloader.cpp b/src/data/csvloader.cpp
index 9bf8f3cfbc..19e8600d40 100644
--- a/src/data/csvloader.cpp
+++ b/src/data/csvloader.cpp
@@ -102,7 +102,7 @@ Dataset loadCsvFile(std::filesystem::path filePath, std::optional<DataMapping> s
         skipColumns.reserve((*specs).excludeColumns.size());
     }
 
-    for (size_t i = 0; i < columns.size(); ++i) {
+    for (size_t i = 0; i < columns.size(); i++) {
         const std::string& col = columns[i];
 
         if (isPositionColumn(col, specs)) {
@@ -151,7 +151,7 @@ Dataset loadCsvFile(std::filesystem::path filePath, std::optional<DataMapping> s
         Dataset::Entry entry;
         entry.data.reserve(nDataColumns);
 
-        for (size_t i = 0; i < row.size(); ++i) {
+        for (size_t i = 0; i < row.size(); i++) {
             // Check if column should be exluded. Note that list of indices is sorted
             // so we can do a binary search
             if (hasExcludeColumns &&
diff --git a/src/engine/configuration.cpp b/src/engine/configuration.cpp
index b646709333..60b3aed5e1 100644
--- a/src/engine/configuration.cpp
+++ b/src/engine/configuration.cpp
@@ -331,7 +331,7 @@ ghoul::Dictionary Configuration::createDictionary() {
     res.setValue("PropertyVisibility", static_cast<int>(propertyVisibility));
 
     ghoul::Dictionary globalCustomizationScriptsDict;
-    for (size_t i = 0; i < globalCustomizationScripts.size(); ++i) {
+    for (size_t i = 0; i < globalCustomizationScripts.size(); i++) {
         globalCustomizationScriptsDict.setValue(
             std::to_string(i),
             globalCustomizationScripts[i]
@@ -340,7 +340,7 @@ ghoul::Dictionary Configuration::createDictionary() {
     res.setValue("GlobalCustomizationScripts", globalCustomizationScriptsDict);
 
     ghoul::Dictionary fontsDict;
-    for (auto it = fonts.begin(); it != fonts.end(); ++it) {
+    for (auto it = fonts.begin(); it != fonts.end(); it++) {
         fontsDict.setValue(it->first, it->second);
     }
     res.setValue("Fonts", fontsDict);
@@ -363,7 +363,7 @@ ghoul::Dictionary Configuration::createDictionary() {
         loggingDict.setValue("CapabilitiesVerbosity", logging.capabilitiesVerbosity);
 
         ghoul::Dictionary logsDict;
-        for (size_t i = 0; i < logging.logs.size(); ++i) {
+        for (size_t i = 0; i < logging.logs.size(); i++) {
             logsDict.setValue(std::to_string(i), logging.logs[i]);
         }
         loggingDict.setValue("Logs", logsDict);
@@ -413,7 +413,7 @@ ghoul::Dictionary Configuration::createDictionary() {
     res.setValue("LayerServer", layerServerToString(layerServer));
 
     ghoul::Dictionary moduleConfigurationsDict;
-    for (auto it = moduleConfigurations.begin(); it != moduleConfigurations.end(); ++it) {
+    for (auto it = moduleConfigurations.begin(); it != moduleConfigurations.end(); it++) {
         moduleConfigurationsDict.setValue(it->first, it->second);
     }
     res.setValue("ModuleConfigurations", moduleConfigurationsDict);
@@ -431,7 +431,7 @@ ghoul::Dictionary Configuration::createDictionary() {
         );
 
         ghoul::Dictionary identifierFiltersDict;
-        for (size_t i = 0; i < openGLDebugContext.severityFilters.size(); ++i) {
+        for (size_t i = 0; i < openGLDebugContext.severityFilters.size(); i++) {
             {
                 ghoul::Dictionary identifierFilterDict;
                 identifierFilterDict.setValue(
@@ -453,7 +453,7 @@ ghoul::Dictionary Configuration::createDictionary() {
         openGLDebugContextDict.setValue("IdentifierFilters", identifierFiltersDict);
 
         ghoul::Dictionary severityFiltersDict;
-        for (size_t i = 0; i < openGLDebugContext.severityFilters.size(); ++i) {
+        for (size_t i = 0; i < openGLDebugContext.severityFilters.size(); i++) {
             severityFiltersDict.setValue(
                 std::to_string(i),
                 openGLDebugContext.severityFilters[i]
diff --git a/src/engine/openspaceengine.cpp b/src/engine/openspaceengine.cpp
index 92512a941a..39954093d1 100644
--- a/src/engine/openspaceengine.cpp
+++ b/src/engine/openspaceengine.cpp
@@ -134,13 +134,6 @@ namespace {
         openspace::properties::Property::Visibility::Always
     };
 
-    constexpr openspace::properties::Property::PropertyInfo ShowHiddenSceneInfo = {
-        "ShowHiddenSceneGraphNodes",
-        "Show Hidden Scene Graph Nodes",
-        "If checked, hidden scene graph nodes are visible in the UI",
-        openspace::properties::Property::Visibility::AdvancedUser
-    };
-
     constexpr openspace::properties::Property::PropertyInfo FadeDurationInfo = {
         "FadeDuration",
         "Fade Duration (seconds)",
@@ -172,6 +165,28 @@ namespace {
             global::renderEngine->renderingResolution()
         );
     }
+
+    void resetPropertyChangeFlagsOfSubowners(openspace::properties::PropertyOwner* po) {
+        using namespace openspace;
+
+        for (properties::PropertyOwner* subOwner : po->propertySubOwners()) {
+            resetPropertyChangeFlagsOfSubowners(subOwner);
+        }
+        for (properties::Property* p : po->properties()) {
+            p->resetToUnchanged();
+        }
+    }
+
+    void resetPropertyChangeFlags() {
+        ZoneScoped;
+
+        std::vector<openspace::SceneGraphNode*> nodes =
+            openspace::global::renderEngine->scene()->allSceneGraphNodes();
+        for (openspace::SceneGraphNode* n : nodes) {
+            resetPropertyChangeFlagsOfSubowners(n);
+        }
+    }
+
 } // namespace
 
 namespace openspace {
@@ -182,7 +197,6 @@ OpenSpaceEngine::OpenSpaceEngine()
     : properties::PropertyOwner({ "OpenSpaceEngine", "OpenSpace Engine" })
     , _printEvents(PrintEventsInfo, false)
     , _visibility(VisibilityInfo)
-    , _showHiddenSceneGraphNodes(ShowHiddenSceneInfo, false)
     , _fadeOnEnableDuration(FadeDurationInfo, 1.f, 0.f, 5.f)
     , _disableAllMouseInputs(DisableMouseInputInfo, false)
 {
@@ -202,7 +216,6 @@ OpenSpaceEngine::OpenSpaceEngine()
     });
     addProperty(_visibility);
 
-    addProperty(_showHiddenSceneGraphNodes);
     addProperty(_fadeOnEnableDuration);
     addProperty(_disableAllMouseInputs);
 }
@@ -1012,11 +1025,10 @@ void OpenSpaceEngine::preSynchronization() {
 
     global::syncEngine->preSynchronization(SyncEngine::IsMaster(master));
     if (master) {
-        double dt = global::windowDelegate->deltaTime();
-
-        if (global::sessionRecording->isSavingFramesDuringPlayback()) {
-            dt = global::sessionRecording->fixedDeltaTimeDuringFrameOutput();
-        }
+        const double dt =
+            global::sessionRecording->isSavingFramesDuringPlayback() ?
+            global::sessionRecording->fixedDeltaTimeDuringFrameOutput() :
+            global::windowDelegate->deltaTime();
 
         global::timeManager->preSynchronization(dt);
 
@@ -1210,25 +1222,6 @@ void OpenSpaceEngine::postDraw() {
     LTRACE("OpenSpaceEngine::postDraw(end)");
 }
 
-void OpenSpaceEngine::resetPropertyChangeFlags() {
-    ZoneScoped;
-
-    std::vector<SceneGraphNode*> nodes =
-        global::renderEngine->scene()->allSceneGraphNodes();
-    for (SceneGraphNode* n : nodes) {
-        resetPropertyChangeFlagsOfSubowners(n);
-    }
-}
-
-void OpenSpaceEngine::resetPropertyChangeFlagsOfSubowners(properties::PropertyOwner* po) {
-    for (properties::PropertyOwner* subOwner : po->propertySubOwners()) {
-        resetPropertyChangeFlagsOfSubowners(subOwner);
-    }
-    for (properties::Property* p : po->properties()) {
-        p->resetToUnchanged();
-    }
-}
-
 void OpenSpaceEngine::keyboardCallback(Key key, KeyModifier mod, KeyAction action,
                                        IsGuiWindow isGuiWindow)
 {
@@ -1256,8 +1249,7 @@ void OpenSpaceEngine::keyboardCallback(Key key, KeyModifier mod, KeyAction actio
         return;
     }
 
-    using F = global::callback::KeyboardCallback;
-    for (const F& func : *global::callback::keyboard) {
+    for (const global::callback::KeyboardCallback& func : *global::callback::keyboard) {
         const bool isConsumed = func(key, mod, action, isGuiWindow);
         if (isConsumed) {
             return;
@@ -1285,8 +1277,7 @@ void OpenSpaceEngine::charCallback(unsigned int codepoint, KeyModifier modifier,
 {
     ZoneScoped;
 
-    using F = global::callback::CharacterCallback;
-    for (const F& func : *global::callback::character) {
+    for (const global::callback::CharacterCallback& func : *global::callback::character) {
         bool isConsumed = func(codepoint, modifier, isGuiWindow);
         if (isConsumed) {
             return;
@@ -1315,7 +1306,7 @@ void OpenSpaceEngine::mouseButtonCallback(MouseButton button, MouseAction action
 
     using F = global::callback::MouseButtonCallback;
     for (const F& func : *global::callback::mouseButton) {
-        bool isConsumed = func(button, action, mods, isGuiWindow);
+        const bool isConsumed = func(button, action, mods, isGuiWindow);
         if (isConsumed) {
             // If the mouse was released, we still want to forward it to the navigation
             // handler in order to reliably terminate a rotation or zoom, or to the other
@@ -1475,14 +1466,10 @@ void OpenSpaceEngine::decode(std::vector<std::byte> data) {
     global::syncEngine->decodeSyncables(std::move(data));
 }
 
-properties::Property::Visibility openspace::OpenSpaceEngine::visibility() const {
+properties::Property::Visibility OpenSpaceEngine::visibility() const {
     return static_cast<properties::Property::Visibility>(_visibility.value());
 }
 
-bool openspace::OpenSpaceEngine::showHiddenSceneGraphNodes() const {
-    return _showHiddenSceneGraphNodes;
-}
-
 void OpenSpaceEngine::toggleShutdownMode() {
     if (_shutdown.inShutdown) {
         // If we are already in shutdown mode, we want to disable it
@@ -1535,7 +1522,7 @@ void OpenSpaceEngine::resetMode() {
 }
 
 OpenSpaceEngine::CallbackHandle OpenSpaceEngine::addModeChangeCallback(
-                                                                   ModeChangeCallback cb)
+                                                                    ModeChangeCallback cb)
 {
     CallbackHandle handle = _nextCallbackHandle++;
     _modeChangeCallbacks.emplace_back(handle, std::move(cb));
diff --git a/src/engine/openspaceengine_lua.inl b/src/engine/openspaceengine_lua.inl
index 128133a9f0..4cb9164e0d 100644
--- a/src/engine/openspaceengine_lua.inl
+++ b/src/engine/openspaceengine_lua.inl
@@ -57,7 +57,7 @@ namespace {
         ghoul::filesystem::FileSystem::Override::Yes
     );
 
-    global::windowDelegate->setScreenshotFolder(folder.string());
+    global::windowDelegate->setScreenshotFolder(std::move(folder));
 }
 
 // Adds a Tag to a SceneGraphNode identified by the provided uri
diff --git a/src/interaction/joystickcamerastates.cpp b/src/interaction/joystickcamerastates.cpp
index 002e8f45ad..2f4694d35c 100644
--- a/src/interaction/joystickcamerastates.cpp
+++ b/src/interaction/joystickcamerastates.cpp
@@ -74,7 +74,7 @@ void JoystickCameraStates::updateStateFromInput(
         int nAxes = joystickInputStates.numAxes(joystickInputState.name);
         for (int i = 0;
              i < std::min(nAxes, static_cast<int>(joystick->axisMapping.size()));
-             ++i)
+             i++)
         {
             AxisInformation t = joystick->axisMapping[i];
             if (t.type == AxisType::None) {
@@ -177,9 +177,9 @@ void JoystickCameraStates::updateStateFromInput(
         }
 
         int nButtons = joystickInputStates.numButtons(joystickInputState.name);
-        for (int i = 0; i < nButtons; ++i) {
+        for (int i = 0; i < nButtons; i++) {
             auto itRange = joystick->buttonMapping.equal_range(i);
-            for (auto it = itRange.first; it != itRange.second; ++it) {
+            for (auto it = itRange.first; it != itRange.second; it++) {
                 bool active = global::joystickInputStates->button(
                     joystickInputState.name,
                     i,
@@ -378,7 +378,7 @@ void JoystickCameraStates::clearButtonCommand(const std::string& joystickName,
             it = joystick->buttonMapping.erase(it);
         }
         else {
-            ++it;
+            it++;
         }
     }
 }
@@ -394,7 +394,7 @@ std::vector<std::string> JoystickCameraStates::buttonCommand(
     }
 
     auto itRange = joystick->buttonMapping.equal_range(button);
-    for (auto it = itRange.first; it != itRange.second; ++it) {
+    for (auto it = itRange.first; it != itRange.second; it++) {
         result.push_back(it->second.command);
     }
     return result;
diff --git a/src/interaction/joystickinputstate.cpp b/src/interaction/joystickinputstate.cpp
index d904f0201d..b79a444ec9 100644
--- a/src/interaction/joystickinputstate.cpp
+++ b/src/interaction/joystickinputstate.cpp
@@ -36,7 +36,7 @@ namespace openspace::interaction {
 int JoystickInputStates::numAxes(const std::string& joystickName) const {
     if (joystickName.empty()) {
         int maxNumAxes = -1;
-        for (auto it = begin(); it < end(); ++it) {
+        for (auto it = begin(); it < end(); it++) {
             if (it->nAxes > maxNumAxes) {
                 maxNumAxes = it->nAxes;
             }
@@ -44,7 +44,7 @@ int JoystickInputStates::numAxes(const std::string& joystickName) const {
         return maxNumAxes;
     }
 
-    for (auto it = begin(); it < end(); ++it) {
+    for (auto it = begin(); it < end(); it++) {
         if (it->name == joystickName) {
             return it->nAxes;
         }
@@ -55,7 +55,7 @@ int JoystickInputStates::numAxes(const std::string& joystickName) const {
 int JoystickInputStates::numButtons(const std::string& joystickName) const {
     if (joystickName.empty()) {
         int maxNumButtons = -1;
-        for (auto it = begin(); it < end(); ++it) {
+        for (auto it = begin(); it < end(); it++) {
             if (it->nButtons > maxNumButtons) {
                 maxNumButtons = it->nButtons;
             }
@@ -63,7 +63,7 @@ int JoystickInputStates::numButtons(const std::string& joystickName) const {
         return maxNumButtons;
     }
 
-    for (auto it = begin(); it < end(); ++it) {
+    for (auto it = begin(); it < end(); it++) {
         if (it->name == joystickName) {
             return it->nButtons;
         }
@@ -94,7 +94,7 @@ float JoystickInputStates::axis(const std::string& joystickName, int axis) const
     }
 
     const JoystickInputState* state = nullptr;
-    for (auto it = begin(); it < end(); ++it) {
+    for (auto it = begin(); it < end(); it++) {
         if (it->name == joystickName) {
             state = &(*it);
         }
@@ -124,7 +124,7 @@ bool JoystickInputStates::button(const std::string& joystickName, int button,
     }
 
     const JoystickInputState* state = nullptr;
-    for (auto it = begin(); it < end(); ++it) {
+    for (auto it = begin(); it < end(); it++) {
         if (it->name == joystickName) {
             state = &(*it);
         }
diff --git a/src/interaction/keybindingmanager.cpp b/src/interaction/keybindingmanager.cpp
index bc438be44b..76f8d97b1a 100644
--- a/src/interaction/keybindingmanager.cpp
+++ b/src/interaction/keybindingmanager.cpp
@@ -45,7 +45,7 @@ void KeybindingManager::keyboardCallback(Key key, KeyModifier modifier, KeyActio
     if (action == KeyAction::Press || action == KeyAction::Repeat) {
         // iterate over key bindings
         auto ret = _keyLua.equal_range({ key, modifier });
-        for (auto it = ret.first; it != ret.second; ++it) {
+        for (auto it = ret.first; it != ret.second; it++) {
             ghoul_assert(!it->second.empty(), "Action must not be empty");
             if (!global::actionManager->hasAction(it->second)) {
                 // Silently ignoring the unknown action as the user might have intended to
@@ -93,7 +93,7 @@ void KeybindingManager::removeKeyBinding(const KeyWithModifier& key) {
         }
         else {
             // If it is not, we continue iteration
-            ++it;
+            it++;
         }
     }
 }
@@ -104,7 +104,7 @@ std::vector<std::pair<KeyWithModifier, std::string>> KeybindingManager::keyBindi
     std::vector<std::pair<KeyWithModifier, std::string>> result;
 
     auto itRange = _keyLua.equal_range(key);
-    for (auto it = itRange.first; it != itRange.second; ++it) {
+    for (auto it = itRange.first; it != itRange.second; it++) {
         result.emplace_back(it->first, it->second);
     }
     return result;
diff --git a/src/interaction/websocketcamerastates.cpp b/src/interaction/websocketcamerastates.cpp
index bfa13e316d..2a4ab47f6e 100644
--- a/src/interaction/websocketcamerastates.cpp
+++ b/src/interaction/websocketcamerastates.cpp
@@ -49,7 +49,7 @@ void WebsocketCameraStates::updateStateFromInput(
     std::pair<bool, glm::dvec2> localRotation = std::pair(false, glm::dvec2(0.0));
 
     if (!websocketInputStates.empty()) {
-        for (int i = 0; i < WebsocketInputState::MaxAxes; ++i) {
+        for (int i = 0; i < WebsocketInputState::MaxAxes; i++) {
             AxisInformation t = _axisMapping[i];
             if (t.type == AxisType::None) {
                 continue;
@@ -198,7 +198,7 @@ void WebsocketCameraStates::clearButtonCommand(int button) {
             it = _buttonMapping.erase(it);
         }
         else {
-            ++it;
+            it++;
         }
     }
 }
@@ -206,7 +206,7 @@ void WebsocketCameraStates::clearButtonCommand(int button) {
 std::vector<std::string> WebsocketCameraStates::buttonCommand(int button) const {
     std::vector<std::string> result;
     auto itRange = _buttonMapping.equal_range(button);
-    for (auto it = itRange.first; it != itRange.second; ++it) {
+    for (auto it = itRange.first; it != itRange.second; it++) {
         result.push_back(it->second.command);
     }
     return result;
diff --git a/src/navigation/pathcurve.cpp b/src/navigation/pathcurve.cpp
index de9af43d31..edd4152f47 100644
--- a/src/navigation/pathcurve.cpp
+++ b/src/navigation/pathcurve.cpp
@@ -104,7 +104,7 @@ void PathCurve::initializeParameterData() {
         double sStart = _lengthSums[i];
         _parameterSamples.push_back({ uStart, sStart });
         // Intermediate sampels
-        for (int j = 1; j < Steps; ++j) {
+        for (int j = 1; j < Steps; j++) {
             double u = uStart + j * uStep;
             double s = sStart + arcLength(uStart, u);
             // Identify samples that are indistinguishable due to precision limitations
@@ -185,7 +185,7 @@ double PathCurve::curveParameter(double s) const {
     double lower = uMin;
     double upper = uMax;
 
-    for (int i = 0; i < maxIterations; ++i) {
+    for (int i = 0; i < maxIterations; i++) {
         double F = arcLength(uMin, u) - segmentS;
 
         // The error we tolerate, in meters. Note that distances are very large
diff --git a/src/navigation/pathcurves/avoidcollisioncurve.cpp b/src/navigation/pathcurves/avoidcollisioncurve.cpp
index 9070cc94e5..2c0eac480a 100644
--- a/src/navigation/pathcurves/avoidcollisioncurve.cpp
+++ b/src/navigation/pathcurves/avoidcollisioncurve.cpp
@@ -139,7 +139,7 @@ void AvoidCollisionCurve::removeCollisions(int step) {
     }
 
     const int nSegments = static_cast<int>(_points.size() - 3);
-    for (int i = 0; i < nSegments; ++i) {
+    for (int i = 0; i < nSegments; i++) {
         const glm::dvec3 lineStart = _points[i + 1];
         const glm::dvec3 lineEnd = _points[i + 2];
 
diff --git a/src/network/parallelpeer.cpp b/src/network/parallelpeer.cpp
index d0c4bafa63..a4c156eeaf 100644
--- a/src/network/parallelpeer.cpp
+++ b/src/network/parallelpeer.cpp
@@ -737,7 +737,7 @@ void ParallelPeer::sendTimeTimeline() {
     timelineMessage._keyframes.reserve(timeline.nKeyframes());
 
     // Case 1: Copy all keyframes from the native timeline
-    for (size_t i = 0; i < timeline.nKeyframes(); ++i) {
+    for (size_t i = 0; i < timeline.nKeyframes(); i++) {
         const Keyframe<TimeKeyframeData>& kf = keyframes.at(i);
 
         datamessagestructures::TimeKeyframe kfMessage;
diff --git a/src/properties/optionproperty.cpp b/src/properties/optionproperty.cpp
index 66c771a8c3..65f754373e 100644
--- a/src/properties/optionproperty.cpp
+++ b/src/properties/optionproperty.cpp
@@ -84,7 +84,7 @@ void OptionProperty::addOptions(std::vector<std::pair<int, std::string>> options
 }
 
 void OptionProperty::addOptions(std::vector<std::string> options) {
-    for (int i = 0; i < static_cast<int>(options.size()); ++i) {
+    for (int i = 0; i < static_cast<int>(options.size()); i++) {
         addOption(i, std::move(options[i]));
     }
 }
@@ -96,7 +96,7 @@ void OptionProperty::clearOptions() {
 
 void OptionProperty::setValue(int value) {
     // Check if the passed value belongs to any option
-    for (size_t i = 0; i < _options.size(); ++i) {
+    for (size_t i = 0; i < _options.size(); i++) {
         const Option& o = _options[i];
         if (o.value == value) {
             // If it does, set it by calling the superclasses setValue method
@@ -156,7 +156,7 @@ std::string OptionProperty::generateAdditionalJsonDescription() const {
     // @REFACTOR from selectionproperty.cpp, possible refactoring? ---abock
     std::string result =
         "{ \"" + OptionsKey + "\": [";
-    for (size_t i = 0; i < _options.size(); ++i) {
+    for (size_t i = 0; i < _options.size(); i++) {
         const Option& o = _options[i];
         std::string v = std::to_string(o.value);
         std::string vSan = escapedJson(v);
diff --git a/src/properties/selectionproperty.cpp b/src/properties/selectionproperty.cpp
index 982d8b107f..00dd9390fe 100644
--- a/src/properties/selectionproperty.cpp
+++ b/src/properties/selectionproperty.cpp
@@ -160,7 +160,7 @@ bool SelectionProperty::removeInvalidKeys(std::set<std::string>& keys) {
             changed = true;
         }
         else {
-            ++it;
+            it++;
         }
     }
     return changed;
diff --git a/src/rendering/colormappingcomponent.cpp b/src/rendering/colormappingcomponent.cpp
index ddac7f80dd..5e2be4f0d6 100644
--- a/src/rendering/colormappingcomponent.cpp
+++ b/src/rendering/colormappingcomponent.cpp
@@ -280,7 +280,7 @@ ColorMappingComponent::ColorMappingComponent(const ghoul::Dictionary& dictionary
         std::vector<Parameters::ColorMapParameter> opts = *p.parameterOptions;
 
         _colorRangeData.reserve(opts.size());
-        for (size_t i = 0; i < opts.size(); ++i) {
+        for (size_t i = 0; i < opts.size(); i++) {
             dataColumn.addOption(static_cast<int>(i), opts[i].key);
             // Add the provided range or an empty range. We will fill it later on,
             // when the dataset is loaded, if it is empty
@@ -464,7 +464,7 @@ void ColorMappingComponent::initializeParameterData(const dataloader::Dataset& d
     }
     else {
         // Otherwise, check if the selected columns exist
-        for (size_t i = 0; i < dataColumn.options().size(); ++i) {
+        for (size_t i = 0; i < dataColumn.options().size(); i++) {
             std::string o = dataColumn.options()[i].description;
 
             bool found = false;
diff --git a/src/rendering/framebufferrenderer.cpp b/src/rendering/framebufferrenderer.cpp
index 0d650e91f4..7aa3fa0e8d 100644
--- a/src/rendering/framebufferrenderer.cpp
+++ b/src/rendering/framebufferrenderer.cpp
@@ -157,7 +157,7 @@ void FramebufferRenderer::initialize() {
     glBindBuffer(GL_ARRAY_BUFFER, _vertexPositionBuffer);
 
     glBufferData(GL_ARRAY_BUFFER, sizeof(vertexData), vertexData, GL_STATIC_DRAW);
-    glVertexAttribPointer(0, 2, GL_FLOAT, GL_FALSE, sizeof(GLfloat) * 2, nullptr);
+    glVertexAttribPointer(0, 2, GL_FLOAT, GL_FALSE, 2 * sizeof(GLfloat), nullptr);
     glEnableVertexAttribArray(0);
 
     glGetIntegerv(GL_FRAMEBUFFER_BINDING, &_defaultFBO);
@@ -970,7 +970,7 @@ void FramebufferRenderer::updateRaycastData() {
 
         try {
             _exitPrograms[raycaster] = ghoul::opengl::ProgramObject::Build(
-                "Volume " + std::to_string(data.id) + " exit",
+                fmt::format("Volume {} exit", data.id),
                 absPath(vsPath),
                 absPath(ExitFragmentShaderPath),
                 dict
@@ -983,7 +983,7 @@ void FramebufferRenderer::updateRaycastData() {
             ghoul::Dictionary outsideDict = dict;
             outsideDict.setValue("getEntryPath", std::string(GetEntryOutsidePath));
             _raycastPrograms[raycaster] = ghoul::opengl::ProgramObject::Build(
-                "Volume " + std::to_string(data.id) + " raycast",
+                fmt::format("Volume {} raycast", data.id),
                 absPath(vsPath),
                 absPath(RaycastFragmentShaderPath),
                 outsideDict
@@ -996,7 +996,7 @@ void FramebufferRenderer::updateRaycastData() {
             ghoul::Dictionary insideDict = dict;
             insideDict.setValue("getEntryPath", std::string(GetEntryInsidePath));
             _insideRaycastPrograms[raycaster] = ghoul::opengl::ProgramObject::Build(
-                "Volume " + std::to_string(data.id) + " inside raycast",
+                fmt::format("Volume {} inside raycast", data.id),
                 absPath("${SHADERS}/framebuffer/resolveframebuffer.vert"),
                 absPath(RaycastFragmentShaderPath),
                 insideDict
@@ -1037,7 +1037,7 @@ void FramebufferRenderer::updateDeferredcastData() {
 
         try {
             _deferredcastPrograms[caster] = ghoul::opengl::ProgramObject::Build(
-                "Deferred " + std::to_string(data.id) + " raycast",
+                fmt::format("Deferred {} raycast", data.id),
                 vsPath,
                 fsPath,
                 dict
@@ -1045,7 +1045,7 @@ void FramebufferRenderer::updateDeferredcastData() {
 
             caster->initializeCachedVariables(*_deferredcastPrograms[caster]);
         }
-        catch (ghoul::RuntimeError& e) {
+        catch (const ghoul::RuntimeError& e) {
             LERRORC(e.component, e.message);
         }
     }
@@ -1476,20 +1476,15 @@ void FramebufferRenderer::setGamma(float gamma) {
     _gamma = std::move(gamma);
 }
 
-void FramebufferRenderer::setHue(float hue) {
+void FramebufferRenderer::setHueValueSaturation(float hue, float value, float saturation)
+{
     _hue = std::move(hue);
-}
-
-void FramebufferRenderer::setValue(float value) {
     _value = std::move(value);
-}
-
-void FramebufferRenderer::setSaturation(float sat) {
-    _saturation = std::move(sat);
+    _saturation = std::move(saturation);
 }
 
 void FramebufferRenderer::enableFXAA(bool enable) {
-    _enableFXAA = std::move(enable);
+    _enableFXAA = enable;
 }
 
 void FramebufferRenderer::updateRendererData() {
diff --git a/src/rendering/helper.cpp b/src/rendering/helper.cpp
index 3409c9ffb2..3c45e65b0d 100644
--- a/src/rendering/helper.cpp
+++ b/src/rendering/helper.cpp
@@ -524,7 +524,7 @@ std::vector<Vertex> createRing(int nSegments, float radius, glm::vec4 colors) {
     const int nVertices = nSegments + 1;
     std::vector<Vertex> vertices(nVertices);
 
-    for (int i = 0; i <= nSegments; ++i) {
+    for (int i = 0; i <= nSegments; i++) {
         vertices[i] = computeCircleVertex(i, nSegments, radius, colors);
     }
     return vertices;
@@ -534,7 +534,7 @@ std::vector<VertexXYZ> createRingXYZ(int nSegments, float radius) {
     const int nVertices = nSegments + 1;
     std::vector<VertexXYZ> vertices(nVertices);
 
-    for (int i = 0; i <= nSegments; ++i) {
+    for (int i = 0; i <= nSegments; i++) {
         Vertex fullVertex = computeCircleVertex(i, nSegments, radius);
         vertices[i] = { fullVertex.xyz[0], fullVertex.xyz[1], fullVertex.xyz[2] };
     }
@@ -696,7 +696,7 @@ VertexIndexListCombo<VertexXYZNormal> createConicalCylinder(unsigned int nSegmen
     GLushort botCenterIndex = 0;
     GLushort topCenterIndex = static_cast<GLushort>(vertices.size()) - 1;
 
-    for (unsigned int i = 0; i < nSegments; ++i) {
+    for (unsigned int i = 0; i < nSegments; i++) {
         bool isLast = (i == nSegments - 1);
         GLushort v0, v1, v2, v3;
 
diff --git a/src/rendering/loadingscreen.cpp b/src/rendering/loadingscreen.cpp
index 739e106e92..aa017b195e 100644
--- a/src/rendering/loadingscreen.cpp
+++ b/src/rendering/loadingscreen.cpp
@@ -230,7 +230,7 @@ void LoadingScreen::exec(AssetManager& manager, Scene& scene) {
                         LoadingScreen::ItemStatus::Started,
                         progressInfo
                     );
-                    ++it;
+                    it++;
             }
             else if ((*it)->isRejected()) {
                 updateItem(
@@ -239,7 +239,7 @@ void LoadingScreen::exec(AssetManager& manager, Scene& scene) {
                     LoadingScreen::ItemStatus::Failed,
                     LoadingScreen::ProgressInfo()
                 );
-                ++it;
+                it++;
             }
             else {
                 LoadingScreen::ProgressInfo progressInfo;
@@ -407,7 +407,7 @@ void LoadingScreen::render() {
                 glm::vec2 ll = glm::vec2(0.f);
                 glm::vec2 ur = glm::vec2(0.f);
                 int i = 0;
-                for (; i < MaxNumberLocationSamples; ++i) {
+                for (; i < MaxNumberLocationSamples; i++) {
                     std::uniform_int_distribution<int> distX(
                         15,
                         static_cast<int>(res.x - b.x - 15)
diff --git a/src/rendering/luaconsole.cpp b/src/rendering/luaconsole.cpp
index cb7e8624e2..23bfa33d81 100644
--- a/src/rendering/luaconsole.cpp
+++ b/src/rendering/luaconsole.cpp
@@ -210,7 +210,7 @@ void LuaConsole::initialize() {
                 int64_t nCommands;
                 file.read(reinterpret_cast<char*>(&nCommands), sizeof(int64_t));
 
-                for (int64_t i = 0; i < nCommands; ++i) {
+                for (int64_t i = 0; i < nCommands; i++) {
                     int64_t length;
                     file.read(reinterpret_cast<char*>(&length), sizeof(int64_t));
 
@@ -500,7 +500,7 @@ bool LuaConsole::keyboardCallback(Key key, KeyModifier modifier, KeyAction actio
             _autoCompleteInfo.hasInitialValue = true;
         }
 
-        for (int i = 0; i < static_cast<int>(allCommands.size()); ++i) {
+        for (int i = 0; i < static_cast<int>(allCommands.size()); i++) {
             const std::string& command = allCommands[i];
 
             // Check if the command has enough length (we don't want crashes here)
diff --git a/src/rendering/renderengine.cpp b/src/rendering/renderengine.cpp
index 4d1242e0bc..b1440caeaa 100644
--- a/src/rendering/renderengine.cpp
+++ b/src/rendering/renderengine.cpp
@@ -1,4 +1,3 @@
-
 /*****************************************************************************************
  *                                                                                       *
  * OpenSpace                                                                             *
@@ -376,13 +375,16 @@ RenderEngine::RenderEngine()
     _gamma.onChange([this]() { _renderer.setGamma(_gamma); });
     addProperty(_gamma);
 
-    _hue.onChange([this]() { _renderer.setHue(_hue / 360.f); });
+    auto setHueValueSaturation = [this]() {
+        _renderer.setHueValueSaturation(_hue / 360.f, _value, _saturation);
+    };
+    _hue.onChange(setHueValueSaturation);
     addProperty(_hue);
 
-    _saturation.onChange([this]() { _renderer.setSaturation(_saturation); });
+    _saturation.onChange(setHueValueSaturation);
     addProperty(_saturation);
 
-    _value.onChange([this]() { _renderer.setValue(_value); });
+    _value.onChange(setHueValueSaturation);
     addProperty(_value);
 
     addProperty(_globalBlackOutFactor);
@@ -429,7 +431,7 @@ RenderEngine::RenderEngine()
                 ghoul::filesystem::FileSystem::Override::Yes
             );
         }
-        global::windowDelegate->setScreenshotFolder(absPath("${SCREENSHOTS}").string());
+        global::windowDelegate->setScreenshotFolder(absPath("${SCREENSHOTS}"));
     });
     addProperty(_screenshotUseDate);
 
@@ -448,10 +450,10 @@ RenderEngine::RenderEngine()
     addProperty(_masterRotation);
     addProperty(_disableMasterRendering);
 
-    _enabledFontColor.setViewOption(openspace::properties::Property::ViewOptions::Color);
+    _enabledFontColor.setViewOption(properties::Property::ViewOptions::Color);
     addProperty(_enabledFontColor);
 
-    _disabledFontColor.setViewOption(openspace::properties::Property::ViewOptions::Color);
+    _disabledFontColor.setViewOption(properties::Property::ViewOptions::Color);
     addProperty(_disabledFontColor);
 }
 
@@ -492,7 +494,7 @@ void RenderEngine::initialize() {
     if (global::versionChecker->hasLatestVersionInfo()) {
         VersionChecker::SemanticVersion latest = global::versionChecker->latestVersion();
 
-        VersionChecker::SemanticVersion current{
+        VersionChecker::SemanticVersion current {
             OPENSPACE_VERSION_MAJOR,
             OPENSPACE_VERSION_MINOR,
             OPENSPACE_VERSION_PATCH
@@ -755,7 +757,7 @@ void RenderEngine::render(const glm::mat4& sceneMatrix, const glm::mat4& viewMat
             ssrs.begin(),
             ssrs.end(),
             [](ScreenSpaceRenderable* lhs, ScreenSpaceRenderable* rhs) {
-                // Render back to front.
+                // Render back to front
                 return lhs->depth() > rhs->depth();
             }
         );
@@ -1180,8 +1182,8 @@ void RenderEngine::renderCameraInformation() {
         return;
     }
 
-    const glm::vec4 EnabledColor = _enabledFontColor.value();
-    const glm::vec4 DisabledColor = _disabledFontColor.value();
+    const glm::vec4 EnabledColor = _enabledFontColor;
+    const glm::vec4 DisabledColor = _disabledFontColor;
 
     const glm::vec2 rotationBox = _fontCameraInfo->boundingBox("Rotation");
 
@@ -1356,7 +1358,7 @@ void RenderEngine::renderScreenLog() {
         std::string_view message = std::string_view(it.message).substr(0, MessageLength);
         nRows += std::count(message.begin(), message.end(), '\n');
 
-        const glm::vec4 white(0.9f, 0.9f, 0.9f, alpha);
+        const glm::vec4 white = glm::vec4(0.9f, 0.9f, 0.9f, alpha);
 
         std::array<char, 15 + 1 + CategoryLength + 3> buf;
         {
diff --git a/src/rendering/transferfunction.cpp b/src/rendering/transferfunction.cpp
index 5d663e9c80..ebf0755960 100644
--- a/src/rendering/transferfunction.cpp
+++ b/src/rendering/transferfunction.cpp
@@ -130,7 +130,7 @@ void TransferFunction::setTextureFromTxt() {
             float intensity;
             glm::vec4 rgba = glm::vec4(0.f);
             iss >> intensity;
-            for(int i = 0; i < 4; ++i) {
+            for(int i = 0; i < 4; i++) {
                 iss >> rgba[i];
             }
             mappingKeys.emplace_back(intensity, rgba);
@@ -152,7 +152,7 @@ void TransferFunction::setTextureFromTxt() {
 
     // allocate new float array with zeros
     float* transferFunction = new float[width * 4];
-    for (int i = 0; i < 4 * width; ++i) {
+    for (int i = 0; i < 4 * width; i++) {
         transferFunction[i] = 0.f;
     }
 
@@ -163,7 +163,7 @@ void TransferFunction::setTextureFromTxt() {
     auto currentKey = prevKey + 1;
     auto lastKey = mappingKeys.end() -1;
 
-    for (size_t i = lowerIndex; i <= upperIndex; ++i) {
+    for (size_t i = lowerIndex; i <= upperIndex; i++) {
         const float fpos = static_cast<float>(i) / static_cast<float>(width-1);
         if (fpos > currentKey->position) {
             prevKey = currentKey;
diff --git a/src/scene/assetmanager.cpp b/src/scene/assetmanager.cpp
index a085346bd8..31d63e755b 100644
--- a/src/scene/assetmanager.cpp
+++ b/src/scene/assetmanager.cpp
@@ -169,7 +169,7 @@ void AssetManager::update() {
 
     // Initialize all assets that have been loaded and synchronized but that not yet
     // initialized
-    for (auto it = _toBeInitialized.cbegin(); it != _toBeInitialized.cend(); ++it) {
+    for (auto it = _toBeInitialized.cbegin(); it != _toBeInitialized.cend(); it++) {
         ZoneScopedN("Initializing queued assets");
         Asset* a = *it;
 
@@ -297,7 +297,7 @@ void AssetManager::update() {
             it = _unfinishedSynchronizations.erase(it);
         }
         else {
-            ++it;
+            it++;
         }
     }
 }
diff --git a/src/scene/profile.cpp b/src/scene/profile.cpp
index 7b80defb18..02f6216b59 100644
--- a/src/scene/profile.cpp
+++ b/src/scene/profile.cpp
@@ -575,7 +575,7 @@ void convertVersion10to11(nlohmann::json& profile) {
 
     std::vector<version10::Keybinding> kbs =
         profile.at("keybindings").get<std::vector<version10::Keybinding>>();
-    for (size_t i = 0; i < kbs.size(); ++i) {
+    for (size_t i = 0; i < kbs.size(); i++) {
         version10::Keybinding& kb = kbs[i];
         std::string identifier = fmt::format("profile.keybind.{}", i);
 
diff --git a/src/scripting/scriptengine.cpp b/src/scripting/scriptengine.cpp
index 42345a9afa..6fadc2a135 100644
--- a/src/scripting/scriptengine.cpp
+++ b/src/scripting/scriptengine.cpp
@@ -580,7 +580,7 @@ void ScriptEngine::decode(SyncBuffer* syncBuffer) {
     size_t nScripts;
     syncBuffer->decode(nScripts);
 
-    for (size_t i = 0; i < nScripts; ++i) {
+    for (size_t i = 0; i < nScripts; i++) {
         std::string script;
         syncBuffer->decode(script);
         _clientScriptQueue.push(std::move(script));
diff --git a/src/scripting/scriptscheduler.cpp b/src/scripting/scriptscheduler.cpp
index daba62dc55..4c41bc0c65 100644
--- a/src/scripting/scriptscheduler.cpp
+++ b/src/scripting/scriptscheduler.cpp
@@ -150,7 +150,7 @@ void ScriptScheduler::clearSchedule(std::optional<int> group) {
                 it = _scripts.erase(it);
             }
             else {
-                ++it;
+                it++;
             }
         }
 
@@ -196,7 +196,7 @@ std::vector<std::string> ScriptScheduler::progressTo(double newTime) {
         // Construct result
         for (auto iter = _scripts.begin() + prevIndex;
             iter < (_scripts.begin() + _currentIndex);
-            ++iter)
+            iter++)
         {
             std::string script = iter->universalScript.empty() ?
                 iter->forwardScript :
diff --git a/src/scripting/scriptscheduler_lua.inl b/src/scripting/scriptscheduler_lua.inl
index 64d45eba2d..66d7598b0a 100644
--- a/src/scripting/scriptscheduler_lua.inl
+++ b/src/scripting/scriptscheduler_lua.inl
@@ -41,7 +41,7 @@ namespace {
     );
 
     std::vector<scripting::ScriptScheduler::ScheduledScript> scripts;
-    for (size_t i = 1; i <= scriptsDict.size(); ++i) {
+    for (size_t i = 1; i <= scriptsDict.size(); i++) {
         ghoul::Dictionary d = scriptsDict.value<ghoul::Dictionary>(std::to_string(i));
 
         scripting::ScriptScheduler::ScheduledScript script =
diff --git a/src/util/histogram.cpp b/src/util/histogram.cpp
index 762c944be8..db8432bc33 100644
--- a/src/util/histogram.cpp
+++ b/src/util/histogram.cpp
@@ -42,7 +42,7 @@ Histogram::Histogram(float minValue, float maxValue, int numBins, float* data)
 {
     if (!data) {
         _data = new float[numBins];
-        for (int i = 0; i < numBins; ++i) {
+        for (int i = 0; i < numBins; i++) {
             _data[i] = 0.0;
         }
     }
@@ -268,7 +268,7 @@ float Histogram::equalize(float value) const {
 
 float Histogram::entropy() {
     float entropy = 0.f;
-    for (int i = 0; i < _numBins; ++i) {
+    for (int i = 0; i < _numBins; i++) {
         if (_data[i] != 0) {
             entropy -= (_data[i] / static_cast<float>(_numValues)) *
                         (log2(_data[i]) / static_cast<float>(_numValues));
diff --git a/src/util/sphere.cpp b/src/util/sphere.cpp
index 882c734615..8e717ed325 100644
--- a/src/util/sphere.cpp
+++ b/src/util/sphere.cpp
@@ -90,8 +90,8 @@ Sphere::Sphere(glm::vec3 radius, int segments)
 
     nr = 0;
     // define indices for all triangles
-    for (int i = 1; i <= segments; ++i) {
-        for (int j = 0; j < segments; ++j) {
+    for (int i = 1; i <= segments; i++) {
+        for (int j = 0; j < segments; j++) {
             const int t = segments + 1;
             _iarray[nr] = t * (i - 1) + j + 0; //1
             ++nr;
diff --git a/src/util/spicemanager.cpp b/src/util/spicemanager.cpp
index 454b263ffe..5fb7cb2363 100644
--- a/src/util/spicemanager.cpp
+++ b/src/util/spicemanager.cpp
@@ -973,7 +973,7 @@ SpiceManager::FieldOfViewResult SpiceManager::fieldOfView(int instrument) const
     }
 
     res.bounds.reserve(nrReturned);
-    for (int i = 0; i < nrReturned; ++i) {
+    for (int i = 0; i < nrReturned; i++) {
         res.bounds.emplace_back(boundsArr[i][0], boundsArr[i][1], boundsArr[i][2]);
     }
 
@@ -1060,7 +1060,7 @@ void SpiceManager::findCkCoverage(const std::string& path) {
         throwSpiceError("Error finding Ck Coverage");
     }
 
-    for (SpiceInt i = 0; i < card_c(&ids); ++i) {
+    for (SpiceInt i = 0; i < card_c(&ids); i++) {
         const SpiceInt frame = SPICE_CELL_ELEM_I(&ids, i);
 
 #if defined __clang__
@@ -1078,7 +1078,7 @@ void SpiceManager::findCkCoverage(const std::string& path) {
         // Get the number of intervals in the coverage window.
         const SpiceInt numberOfIntervals = wncard_c(&cover);
 
-        for (SpiceInt j = 0; j < numberOfIntervals; ++j) {
+        for (SpiceInt j = 0; j < numberOfIntervals; j++) {
             // Get the endpoints of the jth interval.
             SpiceDouble b, e;
             wnfetd_c(&cover, j, &b, &e);
@@ -1119,7 +1119,7 @@ void SpiceManager::findSpkCoverage(const std::string& path) {
         throwSpiceError("Error finding Spk ID for coverage");
     }
 
-    for (SpiceInt i = 0; i < card_c(&ids); ++i) {
+    for (SpiceInt i = 0; i < card_c(&ids); i++) {
         const SpiceInt obj = SPICE_CELL_ELEM_I(&ids, i);
 
 #if defined __clang__
@@ -1137,7 +1137,7 @@ void SpiceManager::findSpkCoverage(const std::string& path) {
         // Get the number of intervals in the coverage window.
         const SpiceInt numberOfIntervals = wncard_c(&cover);
 
-        for (SpiceInt j = 0; j < numberOfIntervals; ++j) {
+        for (SpiceInt j = 0; j < numberOfIntervals; j++) {
             //Get the endpoints of the jth interval.
             SpiceDouble b, e;
             wnfetd_c(&cover, j, &b, &e);
diff --git a/src/util/threadpool.cpp b/src/util/threadpool.cpp
index 7606ae7d92..dbcee5d3e2 100644
--- a/src/util/threadpool.cpp
+++ b/src/util/threadpool.cpp
@@ -57,7 +57,7 @@ void Worker::operator()() {
 }
 
 ThreadPool::ThreadPool(size_t numThreads) : stop(false) {
-    for (size_t i = 0; i < numThreads; ++i) {
+    for (size_t i = 0; i < numThreads; i++) {
         workers.emplace_back(std::thread(Worker(*this)));
     }
 }
diff --git a/src/util/timemanager.cpp b/src/util/timemanager.cpp
index 7140359766..a562264289 100644
--- a/src/util/timemanager.cpp
+++ b/src/util/timemanager.cpp
@@ -523,7 +523,7 @@ void TimeManager::addDeltaTimesKeybindings() {
 
     // For each key, add upp to three keybinds (no modifier, then SHIFT and then CTRL),
     // plus inverted version of each time step one using the ALT modifier
-    for (int i = 0; i < nSteps; ++i) {
+    for (int i = 0; i < nSteps; i++) {
         const Key key = Keys[i % nKeys];
         const double deltaTimeStep = steps[i];
 
diff --git a/support/coding/codegen b/support/coding/codegen
index 0a75d05d83..3f6582f3ba 160000
--- a/support/coding/codegen
+++ b/support/coding/codegen
@@ -1 +1 @@
-Subproject commit 0a75d05d833e019bd4f143d932857493b2569681
+Subproject commit 3f6582f3ba889e20dc4ca42b27f7f8e761877278
diff --git a/tests/test_spicemanager.cpp b/tests/test_spicemanager.cpp
index 2312a1ead5..2a7001e416 100644
--- a/tests/test_spicemanager.cpp
+++ b/tests/test_spicemanager.cpp
@@ -279,7 +279,7 @@ TEST_CASE("SpiceManager: Get Value From ID ND", "[spicemanager]") {
 
     CHECK(controlVec.size() == returnND.size());
 
-    for (unsigned int i = 0; i < returnND.size(); ++i){
+    for (unsigned int i = 0; i < returnND.size(); i++) {
         CHECK(controlVec[i] == returnND[i]);
     }
 

From 9a6fe47d17e671161999108a4e9c73b9594ebbc7 Mon Sep 17 00:00:00 2001
From: Alexander Bock <alexander.bock@liu.se>
Date: Fri, 8 Mar 2024 20:19:06 +0100
Subject: [PATCH 308/701] Fix up text formatting as path's no longer get quoted

---
 .../ext/launcher/src/launcherwindow.cpp       | 32 +++++-----
 .../launcher/src/profile/horizonsdialog.cpp   | 20 +++---
 apps/OpenSpace/ext/sgct                       |  2 +-
 apps/OpenSpace/main.cpp                       | 10 +--
 ext/ghoul                                     |  2 +-
 include/openspace/documentation/verifier.inl  |  2 +-
 .../renderableinterpolatedpoints.cpp          |  4 +-
 modules/base/rendering/renderablemodel.cpp    | 20 +++---
 modules/base/rendering/renderablenodeline.cpp | 14 ++---
 .../rendering/renderableplaneimagelocal.cpp   |  2 +-
 .../renderableplanetimevaryingimage.cpp       |  4 +-
 .../rendering/renderablesphereimagelocal.cpp  |  4 +-
 .../base/rendering/screenspaceimagelocal.cpp  |  6 +-
 modules/cefwebgui/cefwebguimodule.cpp         |  2 +-
 .../rendering/renderabledumeshes.cpp          |  8 +--
 .../rendering/renderableplanescloud.cpp       |  2 +-
 modules/exoplanets/exoplanetshelper.cpp       |  2 +-
 modules/exoplanets/exoplanetsmodule_lua.inl   | 16 ++---
 .../tasks/exoplanetsdatapreparationtask.cpp   | 12 ++--
 .../rendering/renderablefieldlines.cpp        |  6 +-
 .../renderablefieldlinessequence.cpp          | 13 ++--
 .../util/fieldlinesstate.cpp                  |  2 +-
 .../util/kameleonfieldlinehelper.cpp          |  6 +-
 modules/fitsfilereader/src/fitsfilereader.cpp |  4 +-
 modules/gaia/rendering/octreemanager.cpp      |  2 +-
 .../gaia/rendering/renderablegaiastars.cpp    |  8 ++-
 modules/gaia/tasks/constructoctreetask.cpp    | 18 +++---
 modules/gaia/tasks/readfitstask.cpp           | 24 +++----
 modules/gaia/tasks/readspecktask.cpp          |  7 ++-
 modules/galaxy/rendering/renderablegalaxy.cpp | 12 ++--
 modules/globebrowsing/globebrowsingmodule.cpp | 11 ++--
 .../globebrowsing/globebrowsingmodule_lua.inl |  8 +--
 modules/globebrowsing/src/gdalwrapper.cpp     |  2 +-
 .../src/geojson/geojsoncomponent.cpp          |  4 +-
 .../src/geojson/globegeometryfeature.cpp      |  4 +-
 .../src/globelabelscomponent.cpp              | 16 ++---
 modules/globebrowsing/src/layermanager.cpp    |  2 +-
 .../globebrowsing/src/rawtiledatareader.cpp   | 12 ++--
 modules/globebrowsing/src/renderableglobe.cpp |  2 +-
 modules/globebrowsing/src/ringscomponent.cpp  | 12 ++--
 .../sizereferencetileprovider.cpp             |  2 +-
 .../src/tileprovider/temporaltileprovider.cpp |  4 +-
 modules/globebrowsing/src/timequantizer.cpp   |  4 +-
 modules/imgui/imguimodule.cpp                 |  2 +-
 .../imgui/src/guiglobebrowsingcomponent.cpp   |  2 +-
 modules/iswa/rendering/texturecygnet.cpp      |  2 +-
 modules/iswa/util/iswamanager.cpp             |  6 +-
 modules/iswa/util/iswamanager_lua.inl         |  2 +-
 modules/kameleon/src/kameleonhelper.cpp       |  6 +-
 modules/kameleon/src/kameleonwrapper.cpp      |  8 ++-
 .../kameleonvolume/kameleonvolumereader.cpp   |  5 +-
 .../tasks/kameleondocumentationtask.cpp       |  2 +-
 .../tasks/kameleonmetadatatojsontask.cpp      |  2 +-
 .../tasks/kameleonvolumetorawtask.cpp         |  4 +-
 .../rendering/localerrorhistogrammanager.cpp  |  4 +-
 .../rendering/renderablemultiresvolume.cpp    | 26 ++++----
 modules/server/src/connection.cpp             |  4 +-
 .../src/topics/flightcontrollertopic.cpp      | 14 ++---
 modules/skybrowser/skybrowsermodule_lua.inl   |  4 +-
 modules/skybrowser/src/browser.cpp            |  2 +-
 modules/skybrowser/src/wwtdatahandler.cpp     |  6 +-
 modules/space/horizonsfile.cpp                |  2 +-
 modules/space/kepler.cpp                      |  4 +-
 .../renderableconstellationbounds.cpp         |  2 +-
 .../renderableconstellationlines.cpp          | 12 ++--
 .../space/rendering/renderablefluxnodes.cpp   |  9 +--
 modules/space/rendering/renderablerings.cpp   |  2 +-
 modules/space/rendering/renderablestars.cpp   |  9 +--
 modules/space/rotation/spicerotation.cpp      |  1 -
 .../space/translation/horizonstranslation.cpp |  4 +-
 .../space/translation/spicetranslation.cpp    | 15 -----
 .../util/hongkangparser.cpp                   |  2 +-
 .../util/instrumenttimesparser.cpp            |  4 +-
 .../util/labelparser.cpp                      |  8 +--
 .../util/projectioncomponent.cpp              |  6 +-
 modules/statemachine/src/statemachine.cpp     |  2 +-
 .../statemachine/statemachinemodule_lua.inl   | 13 ++--
 modules/sync/syncs/httpsynchronization.cpp    |  8 +--
 modules/sync/syncs/urlsynchronization.cpp     | 10 ++-
 modules/video/src/videoplayer.cpp             | 10 +--
 .../rendering/renderabledistancelabel.cpp     |  2 +-
 modules/volume/rawvolumewriter.inl            |  2 +-
 .../rendering/renderabletimevaryingvolume.cpp |  2 +-
 .../volume/tasks/generaterawvolumetask.cpp    |  4 +-
 modules/webbrowser/src/browserinstance.cpp    |  2 +-
 modules/webbrowser/webbrowsermodule.cpp       |  2 +-
 src/data/csvloader.cpp                        |  8 +--
 src/data/dataloader.cpp                       | 16 ++---
 src/data/speckloader.cpp                      | 28 +++++----
 src/engine/downloadmanager.cpp                |  2 +-
 src/engine/openspaceengine.cpp                | 30 ++++-----
 src/engine/openspaceengine_lua.inl            |  8 +--
 src/engine/settings.cpp                       |  2 +-
 src/events/eventengine.cpp                    |  2 +-
 src/interaction/joystickcamerastates.cpp      |  6 +-
 src/interaction/sessionrecording.cpp          | 62 +++++++++----------
 .../tasks/convertrecfileversiontask.cpp       |  4 +-
 .../tasks/convertrecformattask.cpp            | 21 ++++---
 src/navigation/navigationhandler.cpp          |  2 +-
 src/navigation/orbitalnavigator.cpp           |  4 +-
 src/network/parallelpeer.cpp                  |  3 +-
 src/properties/scalar/intproperty.cpp         |  2 +-
 src/properties/scalar/uintproperty.cpp        |  2 +-
 src/rendering/colormappingcomponent.cpp       |  2 +-
 src/rendering/labelscomponent.cpp             |  2 +-
 src/rendering/texturecomponent.cpp            |  2 +-
 src/scene/asset.cpp                           | 12 ++--
 src/scene/assetmanager.cpp                    | 12 ++--
 src/scene/profile.cpp                         |  2 +-
 src/scene/profile_lua.inl                     |  9 ++-
 src/scene/scene.cpp                           |  8 +--
 src/scene/scene_lua.inl                       | 22 +++----
 src/scripting/scriptengine.cpp                | 11 ++--
 src/scripting/scriptengine_lua.inl            |  4 +-
 src/util/httprequest.cpp                      | 12 ++--
 src/util/openspacemodule.cpp                  |  2 +-
 src/util/spicemanager.cpp                     | 16 ++---
 src/util/taskloader.cpp                       |  8 ++-
 support/coding/codegen                        |  2 +-
 119 files changed, 457 insertions(+), 458 deletions(-)

diff --git a/apps/OpenSpace/ext/launcher/src/launcherwindow.cpp b/apps/OpenSpace/ext/launcher/src/launcherwindow.cpp
index 00a34e554f..65eb3b411c 100644
--- a/apps/OpenSpace/ext/launcher/src/launcherwindow.cpp
+++ b/apps/OpenSpace/ext/launcher/src/launcherwindow.cpp
@@ -118,7 +118,7 @@ namespace {
                 parent,
                 "Exception",
                 QString::fromStdString(fmt::format(
-                    "ParsingError exception in {}: {}, {}",
+                    "ParsingError exception in '{}': {}, {}",
                     filename, e.component, e.message
                 ))
             );
@@ -129,7 +129,7 @@ namespace {
                 parent,
                 "Exception",
                 QString::fromStdString(fmt::format(
-                    "RuntimeError exception in {}, component {}: {}",
+                    "RuntimeError exception in '{}', component {}: {}",
                     filename, e.component, e.message
                 ))
             );
@@ -154,7 +154,7 @@ namespace {
                         parent,
                         "Exception",
                         QString::fromStdString(fmt::format(
-                            "Error writing data to file: '{}' as file is marked hidden",
+                            "Error writing data to file '{}' as file is marked hidden",
                             path
                         ))
                     );
@@ -166,7 +166,7 @@ namespace {
                 parent,
                 "Exception",
                 QString::fromStdString(fmt::format(
-                    "Error writing data to file: {} ({})", path, e.what()
+                    "Error writing data to file '{}': {}", path, e.what()
                 ))
             );
         }
@@ -189,7 +189,7 @@ namespace {
                 parent,
                 "Exception",
                 QString::fromStdString(fmt::format(
-                    "Error writing data to file: {} ({})", path, e.what()
+                    "Error writing data to file '{}': {}", path, e.what()
                 ))
             );
         }
@@ -507,7 +507,7 @@ void LauncherWindow::populateProfilesList(std::string preset) {
         std::optional<Profile> p = loadProfileFromFile(this, path.string());
         int idx = _profileBox->count() - 1;
         if (p.has_value() && (*p).meta.has_value()) {
-            const std::optional<std::string>& d = (*p).meta.value().description;
+            const std::optional<std::string>& d = p->meta.value().description;
             if (d.has_value()) {
                 // Tooltip has to be 'rich text' to linebreak properly
                 QString tooltip = QString::fromStdString(fmt::format("<p>{}</p>", *d));
@@ -543,7 +543,7 @@ void LauncherWindow::populateProfilesList(std::string preset) {
         std::optional<Profile> p = loadProfileFromFile(this, path.string());
         int idx = _profileBox->count() - 1;
         if (p.has_value() && (*p).meta.has_value()) {
-            const std::optional<std::string>& d = (*p).meta.value().description;
+            const std::optional<std::string>& d = p->meta.value().description;
             if (d.has_value()) {
                 // Tooltip has to be 'rich text' to linebreak properly
                 QString tooltip = QString::fromStdString(fmt::format("<p>{}</p>", *d));
@@ -741,7 +741,8 @@ void LauncherWindow::onNewWindowConfigSelection(int newIndex) {
         _editWindowButton->setToolTip(
             QString::fromStdString(fmt::format(
                 "Cannot edit '{}'\nsince it is one of the configuration "
-                "files provided in the OpenSpace installation", fileSelected))
+                "files provided in the OpenSpace installation", fileSelected
+            ))
         );
     }
     else {
@@ -752,7 +753,8 @@ void LauncherWindow::onNewWindowConfigSelection(int newIndex) {
                 _editWindowButton->setEnabled(false);
                 _editWindowButton->setToolTip(QString::fromStdString(fmt::format(
                     "This file does not meet the minimum required version of {}.",
-                    versionMin.versionString())));
+                    versionMin.versionString()
+                )));
                 return;
             } 
         }
@@ -862,12 +864,10 @@ void LauncherWindow::openWindowEditor(const std::string& winCfg, bool isUserWinC
                 }
                 catch (const std::runtime_error& e) {
                     //Re-throw an SGCT error exception with the runtime exception message
-                    throw std::runtime_error(
-                        fmt::format(
-                            "Importing of this configuration file failed because of a "
-                            "problem detected in the readConfig function:\n\n{}", e.what()
-                        )
-                    );
+                    throw std::runtime_error(fmt::format(
+                        "Importing of this configuration file failed because of a "
+                        "problem detected in the readConfig function:\n\n{}", e.what()
+                    ));
                 }
                 SgctEdit editor(
                     preview,
@@ -888,7 +888,7 @@ void LauncherWindow::openWindowEditor(const std::string& winCfg, bool isUserWinC
                 editRefusalDialog(
                     "File Format Version Error",
                     fmt::format(
-                        "File '{}' does not meet the minimum required version of {}.",
+                        "File '{}' does not meet the minimum required version of {}",
                         winCfg, versionMin.versionString()
                     ),
                     ""
diff --git a/apps/OpenSpace/ext/launcher/src/profile/horizonsdialog.cpp b/apps/OpenSpace/ext/launcher/src/profile/horizonsdialog.cpp
index 92231cb143..9e5185bb89 100644
--- a/apps/OpenSpace/ext/launcher/src/profile/horizonsdialog.cpp
+++ b/apps/OpenSpace/ext/launcher/src/profile/horizonsdialog.cpp
@@ -504,7 +504,7 @@ json HorizonsDialog::handleReply(QNetworkReply* reply) {
         QVariant statusCode = reply->attribute(QNetworkRequest::HttpStatusCodeAttribute);
         if (!checkHttpStatus(statusCode)) {
             std::string msg = fmt::format(
-                "Connection Error '{}' ", reply->errorString().toStdString()
+                "Connection Error '{}'", reply->errorString().toStdString()
             );
             appendLog(msg, HorizonsDialog::LogLevel::Error);
         }
@@ -666,8 +666,8 @@ std::pair<std::string, std::string> HorizonsDialog::readTimeRange() {
                 else {
                     _errorMsg->setText("Could not parse time range");
                     std::string msg = fmt::format(
-                        "Could not read time range '{}' to '{}'", timeRange.first,
-                        timeRange.second
+                        "Could not read time range '{}' to '{}'",
+                        timeRange.first, timeRange.second
                     );
                     appendLog(msg, LogLevel::Error);
                 }
@@ -740,7 +740,7 @@ bool HorizonsDialog::handleRequest() {
         std::filesystem::rename(oldFile, newFile);
 
         std::string msg = fmt::format(
-            "For more information, see the saved error file {}", newFile
+            "For more information, see the saved error file '{}'", newFile
         );
         appendLog(msg, LogLevel::Info);
     }
@@ -865,7 +865,7 @@ openspace::HorizonsFile HorizonsDialog::handleAnswer(json& answer) {
 
     auto result = answer.find("result");
     if (result == answer.end()) {
-        std::string msg = fmt::format("Malformed answer recieved '{}'", answer.dump());
+        std::string msg = fmt::format("Malformed answer received '{}'", answer.dump());
         appendLog(msg, HorizonsDialog::LogLevel::Error);
         return openspace::HorizonsFile();
     }
@@ -969,8 +969,8 @@ bool HorizonsDialog::handleResult(openspace::HorizonsResultCode& result) {
             }
 
             msg = fmt::format(
-                "Valid time range is '{}' to '{}'", _validTimeRange.first,
-                _validTimeRange.second
+                "Valid time range is '{}' to '{}'",
+                _validTimeRange.first, _validTimeRange.second
             );
             appendLog(msg, HorizonsDialog::LogLevel::Info);
             _importTimeButton->show();
@@ -1020,7 +1020,7 @@ bool HorizonsDialog::handleResult(openspace::HorizonsResultCode& result) {
         }
         case HorizonsResultCode::MultipleObserverStations: {
             std::string msg = fmt::format(
-                "Multiple matching observer stations were found for observer '{}'. ",
+                "Multiple matching observer stations were found for observer '{}'",
                 _observerName
             );
             appendLog(msg, HorizonsDialog::LogLevel::Warning);
@@ -1076,9 +1076,7 @@ bool HorizonsDialog::handleResult(openspace::HorizonsResultCode& result) {
                     HorizonsDialog::LogLevel::Error
                 );
                 if (!_latestHorizonsError.empty()) {
-                    msg = fmt::format(
-                        "Latest Horizons error: {}", _latestHorizonsError
-                    );
+                    msg = fmt::format("Latest Horizons error: {}", _latestHorizonsError);
                     appendLog(msg, LogLevel::Error);
                 }
                 break;
diff --git a/apps/OpenSpace/ext/sgct b/apps/OpenSpace/ext/sgct
index 62333a4bc2..4bf071f548 160000
--- a/apps/OpenSpace/ext/sgct
+++ b/apps/OpenSpace/ext/sgct
@@ -1 +1 @@
-Subproject commit 62333a4bc252e6192f062e6aa80e50a3db2e744e
+Subproject commit 4bf071f5486dee3bb6ae95d8a90e9ee6f8ef2a18
diff --git a/apps/OpenSpace/main.cpp b/apps/OpenSpace/main.cpp
index 146ca7f30f..f6f47ac0b3 100644
--- a/apps/OpenSpace/main.cpp
+++ b/apps/OpenSpace/main.cpp
@@ -1077,7 +1077,7 @@ std::string selectedSgctProfileFromLauncher(LauncherWindow& lw, bool hasCliSGCTC
                 }
                 else {
                     throw ghoul::RuntimeError(fmt::format(
-                        "Error loading configuration file {}. File could not be found",
+                        "Error loading configuration file '{}'. File could not be found",
                         config
                     ));
                 }
@@ -1129,7 +1129,7 @@ int main(int argc, char* argv[]) {
         std::filesystem::current_path() / std::filesystem::path(argv[0]).parent_path(),
         ghoul::filesystem::FileSystem::Override::Yes
     );
-    LDEBUG(fmt::format("Registering ${{BIN}} to {}", absPath("${BIN}")));
+    LDEBUG(fmt::format("Registering ${{BIN}} to '{}'", absPath("${BIN}")));
 
     //
     // Parse commandline arguments
@@ -1213,11 +1213,11 @@ int main(int argc, char* argv[]) {
         if (!std::filesystem::is_regular_file(configurationFilePath)) {
             LFATALC(
                 "main",
-                fmt::format("Could not find configuration {}", configurationFilePath)
+                fmt::format("Could not find configuration '{}'", configurationFilePath)
             );
             exit(EXIT_FAILURE);
         }
-        LINFO(fmt::format("Configuration Path: {}", configurationFilePath));
+        LINFO(fmt::format("Configuration Path '{}'", configurationFilePath));
 
         // Register the base path as the directory where the configuration file lives
         std::filesystem::path base = configurationFilePath.parent_path();
@@ -1339,7 +1339,7 @@ int main(int argc, char* argv[]) {
                 "OpenSpace",
                 QString::fromStdString(fmt::format(
                     "The OpenSpace folder is started must not contain any of \"'\", "
-                    "\"\"\", [, or ]. Path is: '{}'. Unexpected errors will occur when "
+                    "\"\"\", [, or ]. Path is: {}. Unexpected errors will occur when "
                     "proceeding to run the software", pwd
                 ))
             );
diff --git a/ext/ghoul b/ext/ghoul
index 8a502be36b..2c78aec544 160000
--- a/ext/ghoul
+++ b/ext/ghoul
@@ -1 +1 @@
-Subproject commit 8a502be36b93385ab902e27f4d50d1fb5e90b5a0
+Subproject commit 2c78aec544b741a3de420ee6f99b72b04e7f9061
diff --git a/include/openspace/documentation/verifier.inl b/include/openspace/documentation/verifier.inl
index 2e10417050..8ed86be2b3 100644
--- a/include/openspace/documentation/verifier.inl
+++ b/include/openspace/documentation/verifier.inl
@@ -384,7 +384,7 @@ TestResult InListVerifier<T>::operator()(const ghoul::Dictionary& dict,
                 }
             );
             o.explanation = fmt::format(
-                "{} not in list of accepted values '{}'",
+                "'{}' not in list of accepted values '{}'",
                 key, list
             );
             r.offenses.push_back(o);
diff --git a/modules/base/rendering/pointcloud/renderableinterpolatedpoints.cpp b/modules/base/rendering/pointcloud/renderableinterpolatedpoints.cpp
index 66ed112948..81faf785fe 100644
--- a/modules/base/rendering/pointcloud/renderableinterpolatedpoints.cpp
+++ b/modules/base/rendering/pointcloud/renderableinterpolatedpoints.cpp
@@ -273,8 +273,8 @@ RenderableInterpolatedPoints::RenderableInterpolatedPoints(
     if (_nDataPoints % nObjects != 0) {
         LERROR(fmt::format(
             "Mismatch between provided number of data entries and the specified number "
-            "of points. Expected the number of entries in the data file {} to be evenly "
-            "divisible by the number of points", _dataFile
+            "of points. Expected the number of entries in the data file '{}' to be "
+            "evenly divisible by the number of points", _dataFile
         ));
     }
 
diff --git a/modules/base/rendering/renderablemodel.cpp b/modules/base/rendering/renderablemodel.cpp
index 141361da84..36c7f57550 100644
--- a/modules/base/rendering/renderablemodel.cpp
+++ b/modules/base/rendering/renderablemodel.cpp
@@ -363,7 +363,7 @@ RenderableModel::RenderableModel(const ghoul::Dictionary& dictionary)
 
     _file = absPath(p.geometryFile.string());
     if (!std::filesystem::exists(_file)) {
-        throw ghoul::RuntimeError(fmt::format("Cannot find model file {}", _file));
+        throw ghoul::RuntimeError(fmt::format("Cannot find model file '{}'", _file));
     }
 
     _invertModelScale = p.invertModelScale.value_or(_invertModelScale);
@@ -475,7 +475,9 @@ RenderableModel::RenderableModel(const ghoul::Dictionary& dictionary)
 
     _modelScale.onChange([this]() {
         if (!_geometry) {
-            LWARNING(fmt::format("Cannot set scale for model {}; not loaded yet", _file));
+            LWARNING(fmt::format(
+                "Cannot set scale for model '{}': not loaded yet", _file
+            ));
             return;
         }
 
@@ -492,12 +494,12 @@ RenderableModel::RenderableModel(const ghoul::Dictionary& dictionary)
     _enableAnimation.onChange([this]() {
         if (!_modelHasAnimation) {
             LWARNING(fmt::format(
-                "Cannot enable animation for model {}; it does not have any", _file
+                "Cannot enable animation for model '{}': it does not have any", _file
             ));
         }
         else if (_enableAnimation && _animationStart.empty()) {
             LWARNING(fmt::format(
-                "Cannot enable animation for model {}; it does not have a start time",
+                "Cannot enable animation for model '{}': it does not have a start time",
                 _file
             ));
             _enableAnimation = false;
@@ -505,7 +507,7 @@ RenderableModel::RenderableModel(const ghoul::Dictionary& dictionary)
         else {
             if (!_geometry) {
                 LWARNING(fmt::format(
-                    "Cannot enable animation for model {}; not loaded yet", _file
+                    "Cannot enable animation for model '{}': not loaded yet", _file
                 ));
                 return;
             }
@@ -565,13 +567,13 @@ void RenderableModel::initializeGL() {
     if (!_modelHasAnimation) {
         if (!_animationStart.empty()) {
             LWARNING(fmt::format(
-                "Animation start time given to model {} without animation", _file
+                "Animation start time given to model '{}' without animation", _file
             ));
         }
 
         if (_enableAnimation) {
             LWARNING(fmt::format(
-                "Cannot enable animation for model {}; it does not have any", _file
+                "Cannot enable animation for model '{}': it does not have any", _file
             ));
             _enableAnimation = false;
         }
@@ -581,13 +583,13 @@ void RenderableModel::initializeGL() {
     else {
         if (_enableAnimation && _animationStart.empty()) {
             LWARNING(fmt::format(
-                "Cannot enable animation for model {}; it does not have a start time",
+                "Cannot enable animation for model '{}': it does not have a start time",
                 _file
             ));
         }
         else if (!_enableAnimation) {
             LINFO(fmt::format(
-                "Model {} with deactivated animation was found. The animation can be "
+                "Model '{}' with deactivated animation was found. The animation can be "
                 "activated by entering a start time in the asset file", _file
             ));
         }
diff --git a/modules/base/rendering/renderablenodeline.cpp b/modules/base/rendering/renderablenodeline.cpp
index 68f6ebc97d..d1a60cb457 100644
--- a/modules/base/rendering/renderablenodeline.cpp
+++ b/modules/base/rendering/renderablenodeline.cpp
@@ -182,10 +182,9 @@ RenderableNodeLine::RenderableNodeLine(const ghoul::Dictionary& dictionary)
                 return;
             }
             LWARNING(fmt::format(
-                "Setting StartOffset for node line '{}': "
-                "Trying to use relative offsets for start node '{}' that has no "
-                "bounding sphere. This will result in no offset. Use direct "
-                "values by setting UseRelativeOffsets to false",
+                "Setting StartOffset for node line '{}': Trying to use relative offsets "
+                "for start node '{}' that has no bounding sphere. This will result in no "
+                "offset. Use direct values by setting UseRelativeOffsets to false",
                 parent()->identifier(), _start.value()
             ));
         }
@@ -200,10 +199,9 @@ RenderableNodeLine::RenderableNodeLine(const ghoul::Dictionary& dictionary)
                 return;
             }
             LWARNING(fmt::format(
-                "Setting EndOffset for node line '{}': "
-                "Trying to use relative offsets for end node '{}' that has no "
-                "bounding sphere. This will result in no offset. Use direct "
-                "values by setting UseRelativeOffsets to false",
+                "Setting EndOffset for node line '{}': Trying to use relative offsets "
+                "for end node '{}' that has no bounding sphere. This will result in no "
+                "offset. Use direct values by setting UseRelativeOffsets to false",
                 parent()->identifier(), _end.value()
             ));
         }
diff --git a/modules/base/rendering/renderableplaneimagelocal.cpp b/modules/base/rendering/renderableplaneimagelocal.cpp
index 6114da3d5d..0d0aea11f6 100644
--- a/modules/base/rendering/renderableplaneimagelocal.cpp
+++ b/modules/base/rendering/renderableplaneimagelocal.cpp
@@ -175,7 +175,7 @@ void RenderablePlaneImageLocal::loadTexture() {
 
                 LDEBUGC(
                     "RenderablePlaneImageLocal",
-                    fmt::format("Loaded texture from {}", absPath(path))
+                    fmt::format("Loaded texture from '{}'", absPath(path))
                 );
                 texture->uploadTexture();
                 texture->setFilter(ghoul::opengl::Texture::FilterMode::LinearMipMap);
diff --git a/modules/base/rendering/renderableplanetimevaryingimage.cpp b/modules/base/rendering/renderableplanetimevaryingimage.cpp
index 156ab6aae5..c33071fce0 100644
--- a/modules/base/rendering/renderableplanetimevaryingimage.cpp
+++ b/modules/base/rendering/renderableplanetimevaryingimage.cpp
@@ -97,7 +97,7 @@ RenderablePlaneTimeVaryingImage::RenderablePlaneTimeVaryingImage(
     _sourceFolder = p.sourceFolder;
     if (!std::filesystem::is_directory(absPath(_sourceFolder))) {
         LERROR(fmt::format(
-            "Time varying image, {} is not a valid directory",
+            "Time varying image, '{}' is not a valid directory",
             _sourceFolder.value()
         ));
     }
@@ -175,7 +175,7 @@ bool RenderablePlaneTimeVaryingImage::extractMandatoryInfoFromDictionary() {
     // Ensure that there are available and valid source files left
     if (_sourceFiles.empty()) {
         LERROR(fmt::format(
-            "{}: Plane sequence filepath {} was empty",
+            "{}: Plane sequence filepath '{}' was empty",
             _identifier, _sourceFolder.value()
         ));
         return false;
diff --git a/modules/base/rendering/renderablesphereimagelocal.cpp b/modules/base/rendering/renderablesphereimagelocal.cpp
index 92b9441935..e68de2767a 100644
--- a/modules/base/rendering/renderablesphereimagelocal.cpp
+++ b/modules/base/rendering/renderablesphereimagelocal.cpp
@@ -117,14 +117,14 @@ void RenderableSphereImageLocal::loadTexture() {
     if (!texture) {
         LWARNINGC(
             "RenderableSphereImageLocal",
-            fmt::format("Could not load texture from {}", absPath(_texturePath))
+            fmt::format("Could not load texture from '{}'", absPath(_texturePath))
         );
         return;
     }
 
     LDEBUGC(
         "RenderableSphereImageLocal",
-        fmt::format("Loaded texture from {}", absPath(_texturePath))
+        fmt::format("Loaded texture from '{}'", absPath(_texturePath))
     );
     texture->uploadTexture();
     texture->setFilter(ghoul::opengl::Texture::FilterMode::LinearMipMap);
diff --git a/modules/base/rendering/screenspaceimagelocal.cpp b/modules/base/rendering/screenspaceimagelocal.cpp
index bda85bc416..e9e361ece7 100644
--- a/modules/base/rendering/screenspaceimagelocal.cpp
+++ b/modules/base/rendering/screenspaceimagelocal.cpp
@@ -86,7 +86,7 @@ ScreenSpaceImageLocal::ScreenSpaceImageLocal(const ghoul::Dictionary& dictionary
             LWARNINGC(
                 "ScreenSpaceImageLocal",
                 fmt::format(
-                    "Image {} did not exist for {}", _texturePath.value(), _identifier
+                    "Image '{}' did not exist for '{}'", _texturePath.value(), _identifier
                 )
             );
         }
@@ -103,7 +103,9 @@ ScreenSpaceImageLocal::ScreenSpaceImageLocal(const ghoul::Dictionary& dictionary
         else {
             LWARNINGC(
                 "ScreenSpaceImageLocal",
-                fmt::format("Image {} did not exist for {}", *p.texturePath, _identifier)
+                fmt::format(
+                    "Image '{}' did not exist for '{}'", *p.texturePath, _identifier
+                )
             );
         }
     }
diff --git a/modules/cefwebgui/cefwebguimodule.cpp b/modules/cefwebgui/cefwebguimodule.cpp
index 3aab3b311f..c40b798489 100644
--- a/modules/cefwebgui/cefwebguimodule.cpp
+++ b/modules/cefwebgui/cefwebguimodule.cpp
@@ -102,7 +102,7 @@ void CefWebGuiModule::startOrStopGui() {
     const bool isMaster = global::windowDelegate->isMaster();
 
     if (_enabled && isMaster) {
-        LDEBUGC("WebBrowser", fmt::format("Loading GUI from {}", _url.value()));
+        LDEBUGC("WebBrowser", fmt::format("Loading GUI from '{}'", _url.value()));
 
         if (!_instance) {
             _instance = std::make_unique<BrowserInstance>(
diff --git a/modules/digitaluniverse/rendering/renderabledumeshes.cpp b/modules/digitaluniverse/rendering/renderabledumeshes.cpp
index dd4bd817aa..94ac450298 100644
--- a/modules/digitaluniverse/rendering/renderabledumeshes.cpp
+++ b/modules/digitaluniverse/rendering/renderabledumeshes.cpp
@@ -448,7 +448,7 @@ void RenderableDUMeshes::update(const UpdateData&) {
 bool RenderableDUMeshes::loadData() {
     bool success = false;
     if (_hasSpeckFile) {
-        LINFO(fmt::format("Loading Speck file {}", std::filesystem::path(_speckFile)));
+        LINFO(fmt::format("Loading Speck file '{}'", _speckFile));
         success = readSpeckFile();
         if (!success) {
             return false;
@@ -466,9 +466,7 @@ bool RenderableDUMeshes::loadData() {
 bool RenderableDUMeshes::readSpeckFile() {
     std::ifstream file(_speckFile);
     if (!file.good()) {
-        LERROR(fmt::format(
-            "Failed to open Speck file {}", std::filesystem::path(_speckFile)
-        ));
+        LERROR(fmt::format("Failed to open Speck file '{}'", _speckFile));
         return false;
     }
 
@@ -579,7 +577,7 @@ bool RenderableDUMeshes::readSpeckFile() {
 
                 if (!success) {
                     LERROR(fmt::format(
-                        "Failed reading position on line {} of mesh {} in file: '{}'. "
+                        "Failed reading position on line {} of mesh {} in file '{}'. "
                         "Stopped reading mesh data", l, meshIndex, _speckFile
                     ));
                     break;
diff --git a/modules/digitaluniverse/rendering/renderableplanescloud.cpp b/modules/digitaluniverse/rendering/renderableplanescloud.cpp
index 4ab564e3ea..fb5006e7fa 100644
--- a/modules/digitaluniverse/rendering/renderableplanescloud.cpp
+++ b/modules/digitaluniverse/rendering/renderableplanescloud.cpp
@@ -516,7 +516,7 @@ void RenderablePlanesCloud::loadTextures() {
             ghoul::io::TextureReader::ref().loadTexture(path.string(), 2);
 
         if (t) {
-            LINFOC("RenderablePlanesCloud", fmt::format("Loaded texture {}", path));
+            LINFOC("RenderablePlanesCloud", fmt::format("Loaded texture '{}'", path));
             t->uploadTexture();
             t->setFilter(ghoul::opengl::Texture::FilterMode::LinearMipMap);
             t->purgeFromRAM();
diff --git a/modules/exoplanets/exoplanetshelper.cpp b/modules/exoplanets/exoplanetshelper.cpp
index 130e1581e4..75b9ad87b1 100644
--- a/modules/exoplanets/exoplanetshelper.cpp
+++ b/modules/exoplanets/exoplanetshelper.cpp
@@ -65,7 +65,7 @@ glm::vec3 computeStarColor(float bv) {
 
     if (!colorMap.good()) {
         LERROR(fmt::format(
-            "Failed to open colormap data file: {}", absPath(bvColormapPath)
+            "Failed to open colormap data file '{}'", absPath(bvColormapPath)
         ));
         return glm::vec3(0.f);
     }
diff --git a/modules/exoplanets/exoplanetsmodule_lua.inl b/modules/exoplanets/exoplanetsmodule_lua.inl
index 4adc13639d..5ea8a5874e 100644
--- a/modules/exoplanets/exoplanetsmodule_lua.inl
+++ b/modules/exoplanets/exoplanetsmodule_lua.inl
@@ -53,14 +53,14 @@ openspace::exoplanets::ExoplanetSystem findExoplanetSystemInData(
     const std::string binPath = module->exoplanetsDataPath();
     std::ifstream data(absPath(binPath), std::ios::in | std::ios::binary);
     if (!data.good()) {
-        LERROR(fmt::format("Failed to open exoplanets data file: '{}'", binPath));
+        LERROR(fmt::format("Failed to open exoplanets data file '{}'", binPath));
         return ExoplanetSystem();
     }
 
     const std::string lutPath = module->lookUpTablePath();
     std::ifstream lut(absPath(lutPath));
     if (!lut.good()) {
-        LERROR(fmt::format("Failed to open exoplanets look-up table: '{}'", lutPath));
+        LERROR(fmt::format("Failed to open exoplanets look-up table '{}'", lutPath));
         return ExoplanetSystem();
     }
 
@@ -90,7 +90,7 @@ openspace::exoplanets::ExoplanetSystem findExoplanetSystemInData(
         sanitizeNameString(name);
 
         if (!hasSufficientData(p)) {
-            LWARNING(fmt::format("Insufficient data for exoplanet: '{}'", name));
+            LWARNING(fmt::format("Insufficient data for exoplanet '{}'", name));
             continue;
         }
 
@@ -129,7 +129,7 @@ void createExoplanetSystem(const std::string& starName,
     const glm::vec3 starPosInParsec = system.starData.position;
     if (!isValidPosition(starPosInParsec)) {
         LERROR(fmt::format(
-            "Insufficient data available for exoplanet system: '{}'. Could not determine "
+            "Insufficient data available for exoplanet system '{}'. Could not determine "
             "star position", starName
         ));
         return;
@@ -723,7 +723,7 @@ listOfExoplanetsDeprecated()
 
     std::ifstream inputDataFile(csvFile);
     if (!inputDataFile.good()) {
-        LERROR(fmt::format("Failed to open input file {}", csvFile));
+        LERROR(fmt::format("Failed to open input file '{}'", csvFile));
         return;
     }
 
@@ -745,11 +745,11 @@ listOfExoplanetsDeprecated()
             module->teffToBvConversionFilePath()
         );
 
-        LINFO(fmt::format("Reading data for planet: '{}' ", planetData.name));
+        LINFO(fmt::format("Reading data for planet '{}'", planetData.name));
 
         if (!hasSufficientData(planetData.dataEntry)) {
             LWARNING(fmt::format(
-                "Insufficient data for exoplanet: '{}'", planetData.name
+                "Insufficient data for exoplanet '{}'", planetData.name
             ));
             continue;
         }
@@ -785,7 +785,7 @@ listOfExoplanetsDeprecated()
     }
 
     LINFO(fmt::format(
-        "Read data for {} exoplanet systems from CSV file: '{}'. Please wait until "
+        "Read data for {} exoplanet systems from CSV file: {}. Please wait until "
         "they are all finished initializing. You may have to reload the user interface.",
         hostNameToSystemDataMap.size(), csvFile
     ));
diff --git a/modules/exoplanets/tasks/exoplanetsdatapreparationtask.cpp b/modules/exoplanets/tasks/exoplanetsdatapreparationtask.cpp
index 746b422d91..9508df954d 100644
--- a/modules/exoplanets/tasks/exoplanetsdatapreparationtask.cpp
+++ b/modules/exoplanets/tasks/exoplanetsdatapreparationtask.cpp
@@ -101,7 +101,7 @@ ExoplanetsDataPreparationTask::ExoplanetsDataPreparationTask(
 
 std::string ExoplanetsDataPreparationTask::description() {
     return fmt::format(
-        "Extract data about exoplanets from file {} and write as bin to {}. The data "
+        "Extract data about exoplanets from file '{}' and write as bin to '{}'. The data "
         "file should be a csv version of the Planetary Systems Composite Data from the "
         "NASA exoplanets archive (https://exoplanetarchive.ipac.caltech.edu/)",
         _inputDataPath, _outputBinPath
@@ -113,7 +113,7 @@ void ExoplanetsDataPreparationTask::perform(
 {
     std::ifstream inputDataFile(_inputDataPath);
     if (!inputDataFile.good()) {
-        LERROR(fmt::format("Failed to open input file {}", _inputDataPath));
+        LERROR(fmt::format("Failed to open input file '{}'", _inputDataPath));
         return;
     }
 
@@ -121,7 +121,7 @@ void ExoplanetsDataPreparationTask::perform(
     std::ofstream lutFile(_outputLutPath);
 
     if (!binFile.good()) {
-        LERROR(fmt::format("Error when writing to {}",_outputBinPath));
+        LERROR(fmt::format("Error when writing to '{}'",_outputBinPath));
         if (!std::filesystem::is_directory(_outputBinPath.parent_path())) {
             LERROR("Output directory does not exist");
         }
@@ -129,7 +129,7 @@ void ExoplanetsDataPreparationTask::perform(
     }
 
     if (!lutFile.good()) {
-        LERROR(fmt::format("Error when writing to {}", _outputLutPath));
+        LERROR(fmt::format("Error when writing to '{}'", _outputLutPath));
         if (!std::filesystem::is_directory(_outputLutPath.parent_path())) {
             LERROR("Output directory does not exist");
         }
@@ -453,7 +453,7 @@ glm::vec3 ExoplanetsDataPreparationTask::starPosition(const std::string& starNam
 
     std::ifstream exoplanetsFile(sourceFile);
     if (!exoplanetsFile) {
-        LERROR(fmt::format("Error opening file {}", sourceFile));
+        LERROR(fmt::format("Error opening file '{}'", sourceFile));
     }
 
     std::string line;
@@ -499,7 +499,7 @@ float ExoplanetsDataPreparationTask::bvFromTeff(float teff,
 
     std::ifstream teffToBvFile(conversionFile);
     if (!teffToBvFile.good()) {
-        LERROR(fmt::format("Failed to open file {}", conversionFile));
+        LERROR(fmt::format("Failed to open file '{}'", conversionFile));
         return std::numeric_limits<float>::quiet_NaN();
     }
 
diff --git a/modules/fieldlines/rendering/renderablefieldlines.cpp b/modules/fieldlines/rendering/renderablefieldlines.cpp
index 295121b017..7f616485b4 100644
--- a/modules/fieldlines/rendering/renderablefieldlines.cpp
+++ b/modules/fieldlines/rendering/renderablefieldlines.cpp
@@ -405,7 +405,7 @@ void RenderableFieldlines::loadSeedPointsFromTable() {
 std::vector<RenderableFieldlines::Line> RenderableFieldlines::generateFieldlines() {
     if (!_vectorFieldInfo.hasValue<std::string>(KeyVectorFieldType)) {
         LERROR(fmt::format(
-            "{} does not contain a '{}' key", KeyVectorField, KeyVectorFieldType
+            "'{}' does not contain a '{}' key", KeyVectorField, KeyVectorFieldType
         ));
         return {};
     }
@@ -426,14 +426,14 @@ std::vector<RenderableFieldlines::Line>
 RenderableFieldlines::generateFieldlinesVolumeKameleon()
 {
     if (!_vectorFieldInfo.hasValue<std::string>(KeyVectorFieldVolumeModel)) {
-        LERROR(fmt::format("{} does not name a model", KeyVectorField));
+        LERROR(fmt::format("'{}' does not name a model", KeyVectorField));
         return {};
     }
 
     std::string model = _vectorFieldInfo.value<std::string>(KeyVectorFieldVolumeModel);
 
     if (!_vectorFieldInfo.hasValue<std::string>(KeyVectorFieldFile)) {
-        LERROR(fmt::format("{} does not name a file", KeyVectorField));
+        LERROR(fmt::format("'{}' does not name a file", KeyVectorField));
         return {};
     }
     std::string fileName = _vectorFieldInfo.value<std::string>(KeyVectorFieldFile);
diff --git a/modules/fieldlinessequence/rendering/renderablefieldlinessequence.cpp b/modules/fieldlinessequence/rendering/renderablefieldlinessequence.cpp
index 7a7b2ba9ac..69d5652e8b 100644
--- a/modules/fieldlinessequence/rendering/renderablefieldlinessequence.cpp
+++ b/modules/fieldlinessequence/rendering/renderablefieldlinessequence.cpp
@@ -389,8 +389,7 @@ RenderableFieldlinesSequence::RenderableFieldlinesSequence(
     std::filesystem::path sourcePath = p.sourceFolder;
     if (!std::filesystem::is_directory(sourcePath)) {
         LERROR(fmt::format(
-            "FieldlinesSequence {} is not a valid directory",
-            sourcePath.string()
+            "FieldlinesSequence '{}' is not a valid directory", sourcePath
         ));
     }
 
@@ -422,7 +421,7 @@ RenderableFieldlinesSequence::RenderableFieldlinesSequence(
     // Ensure that there are available and valid source files left
     if (_sourceFiles.empty()) {
         LERROR(fmt::format(
-            "{} contains no {} files", sourcePath.string(), fileTypeString
+            "'{}' contains no {} files", sourcePath.string(), fileTypeString
         ));
     }
     _extraVars = p.extraVariables.value_or(_extraVars);
@@ -492,7 +491,7 @@ RenderableFieldlinesSequence::RenderableFieldlinesSequence(
     if (!_outputFolderPath.empty() && !std::filesystem::is_directory(_outputFolderPath)) {
         _outputFolderPath.clear();
         LERROR(fmt::format(
-            "The specified output path: '{}', does not exist", _outputFolderPath
+            "The specified output path '{}' does not exist", _outputFolderPath
         ));
     }
 
@@ -618,7 +617,7 @@ void RenderableFieldlinesSequence::loadOsflsStatesIntoRAM() {
             }
         }
         else {
-            LWARNING(fmt::format("Failed to load state from: {}", filePath));
+            LWARNING(fmt::format("Failed to load state from '{}'", filePath));
         }
     }
 }
@@ -853,7 +852,7 @@ std::unordered_map<std::string, std::vector<glm::vec3>>
 
     if (!std::filesystem::is_directory(filePath)) {
         LERROR(fmt::format(
-            "The specified seed point directory: '{}' does not exist", filePath
+            "The specified seed point directory '{}' does not exist", filePath
         ));
         return outMap;
     }
@@ -887,7 +886,7 @@ std::unordered_map<std::string, std::vector<glm::vec3>>
         }
 
         if (outVec.empty()) {
-            LERROR(fmt::format("Found no seed points in: {}", seedFilePath));
+            LERROR(fmt::format("Found no seed points in '{}'", seedFilePath));
             outMap.clear();
             return {};
         }
diff --git a/modules/fieldlinessequence/util/fieldlinesstate.cpp b/modules/fieldlinessequence/util/fieldlinesstate.cpp
index 3f07ccbd05..571088c3c7 100644
--- a/modules/fieldlinessequence/util/fieldlinesstate.cpp
+++ b/modules/fieldlinessequence/util/fieldlinesstate.cpp
@@ -140,7 +140,7 @@ bool FieldlinesState::loadStateFromJson(const std::string& pathToJsonFile,
     std::ifstream ifs(pathToJsonFile);
 
     if (!ifs.is_open()) {
-        LERROR(fmt::format("FAILED TO OPEN FILE: {}", pathToJsonFile));
+        LERROR(fmt::format("Failed to open file '{}'", pathToJsonFile));
         return false;
     }
 
diff --git a/modules/fieldlinessequence/util/kameleonfieldlinehelper.cpp b/modules/fieldlinessequence/util/kameleonfieldlinehelper.cpp
index abaf4a3431..266fa2a554 100644
--- a/modules/fieldlinessequence/util/kameleonfieldlinehelper.cpp
+++ b/modules/fieldlinessequence/util/kameleonfieldlinehelper.cpp
@@ -311,7 +311,7 @@ void prepareStateAndKameleonForExtras(ccmc::Kameleon* kameleon,
             str = TAsPOverRho;
         }
         if (!success) {
-            LWARNING(fmt::format("Failed to load extra variable: '{}'. Ignoring", str));
+            LWARNING(fmt::format("Failed to load extra variable '{}'. Ignoring", str));
             extraScalarVars.erase(extraScalarVars.begin() + i);
             --i;
         }
@@ -350,8 +350,8 @@ void prepareStateAndKameleonForExtras(ccmc::Kameleon* kameleon,
             }
             if (!success) {
                 LWARNING(fmt::format(
-                    "Failed to load at least one of the magnitude variables: {}, {}, {}. "
-                    "Removing ability to store corresponding magnitude",
+                    "Failed to load at least one of the magnitude variables: '{}', '{}', "
+                    "'{}'. Removing ability to store corresponding magnitude",
                     s1, s2, s3
                 ));
                 extraMagVars.erase(
diff --git a/modules/fitsfilereader/src/fitsfilereader.cpp b/modules/fitsfilereader/src/fitsfilereader.cpp
index 0b74ec0497..e11aecfb65 100644
--- a/modules/fitsfilereader/src/fitsfilereader.cpp
+++ b/modules/fitsfilereader/src/fitsfilereader.cpp
@@ -247,7 +247,7 @@ std::vector<float> FitsFileReader::readFitsFile(std::filesystem::path filePath,
     );
 
     if (!table) {
-        throw ghoul::RuntimeError(fmt::format("Failed to open Fits file {}", filePath));
+        throw ghoul::RuntimeError(fmt::format("Failed to open Fits file '{}'", filePath));
     }
 
     int nStars = table->readRows - firstRow + 1;
@@ -530,7 +530,7 @@ std::vector<float> FitsFileReader::readSpeckFile(const std::filesystem::path& fi
     std::ifstream fileStream(filePath);
 
     if (!fileStream.good()) {
-        LERROR(fmt::format("Failed to open Speck file {}", filePath));
+        LERROR(fmt::format("Failed to open Speck file '{}'", filePath));
         return fullData;
     }
 
diff --git a/modules/gaia/rendering/octreemanager.cpp b/modules/gaia/rendering/octreemanager.cpp
index 48e15fbba0..0599a724a2 100644
--- a/modules/gaia/rendering/octreemanager.cpp
+++ b/modules/gaia/rendering/octreemanager.cpp
@@ -723,7 +723,7 @@ void OctreeManager::writeNodeToMultipleFiles(const std::string& outFilePrefix,
             outFileStream.close();
         }
         else {
-            LERROR(fmt::format("Error opening file: {} as output data file", outPath));
+            LERROR(fmt::format("Error opening file '{}' as output data file", outPath));
         }
     }
 
diff --git a/modules/gaia/rendering/renderablegaiastars.cpp b/modules/gaia/rendering/renderablegaiastars.cpp
index c32593c0bd..632f4a5eaa 100644
--- a/modules/gaia/rendering/renderablegaiastars.cpp
+++ b/modules/gaia/rendering/renderablegaiastars.cpp
@@ -2102,7 +2102,7 @@ void RenderableGaiaStars::update(const UpdateData&) {
 
             if (_pointSpreadFunctionTexture) {
                 LDEBUG(fmt::format(
-                    "Loaded texture from {}", absPath(_pointSpreadFunctionTexturePath)
+                    "Loaded texture from '{}'", absPath(_pointSpreadFunctionTexturePath)
                ));
                 _pointSpreadFunctionTexture->uploadTexture();
             }
@@ -2129,7 +2129,9 @@ void RenderableGaiaStars::update(const UpdateData&) {
                 1
             );
             if (_colorTexture) {
-                LDEBUG(fmt::format("Loaded texture from {}", absPath(_colorTexturePath)));
+                LDEBUG(fmt::format(
+                    "Loaded texture from '{}'", absPath(_colorTexturePath)
+                ));
                 _colorTexture->uploadTexture();
             }
 
@@ -2186,7 +2188,7 @@ bool RenderableGaiaStars::readDataFile() {
     _octreeManager.initOctree(_cpuRamBudgetInBytes);
 
     std::filesystem::path file = absPath(_filePath.value());
-    LINFO(fmt::format("Loading data file: {}", file));
+    LINFO(fmt::format("Loading data file '{}'", file));
 
     switch (fileReaderOption) {
         case gaia::FileReaderOption::Fits:
diff --git a/modules/gaia/tasks/constructoctreetask.cpp b/modules/gaia/tasks/constructoctreetask.cpp
index ea459006d2..9681bf6fcf 100644
--- a/modules/gaia/tasks/constructoctreetask.cpp
+++ b/modules/gaia/tasks/constructoctreetask.cpp
@@ -296,8 +296,8 @@ ConstructOctreeTask::ConstructOctreeTask(const ghoul::Dictionary& dictionary) {
 
 std::string ConstructOctreeTask::description() {
     return fmt::format(
-        "Read bin file (or files in folder): {} and write octree data file (or files) "
-        "into: {}", _inFileOrFolderPath, _outFileOrFolderPath
+        "Read bin file (or files in folder) '{}' and write octree data file (or files) "
+        "into '{}'", _inFileOrFolderPath, _outFileOrFolderPath
     );
 }
 
@@ -325,7 +325,7 @@ void ConstructOctreeTask::constructOctreeFromSingleFile(
 
     _octreeManager->initOctree(0, _maxDist, _maxStarsPerNode);
 
-    LINFO(fmt::format("Reading data file: {}", _inFileOrFolderPath));
+    LINFO(fmt::format("Reading data file '{}'", _inFileOrFolderPath));
 
     LINFO(fmt::format(
         "MAX DIST: {} - MAX STARS PER NODE: {}",
@@ -406,7 +406,7 @@ void ConstructOctreeTask::constructOctreeFromSingleFile(
     }
     else {
         LERROR(fmt::format(
-            "Error opening file {} for loading preprocessed file", _inFileOrFolderPath
+            "Error opening file '{}' for loading preprocessed file", _inFileOrFolderPath
         ));
     }
     LINFO(fmt::format("{} of {} read stars were filtered", nFilteredStars, nTotalStars));
@@ -414,7 +414,7 @@ void ConstructOctreeTask::constructOctreeFromSingleFile(
     // Slice LOD data before writing to files.
     _octreeManager->sliceLodData();
 
-    LINFO(fmt::format("Writing octree to: {}", _outFileOrFolderPath));
+    LINFO(fmt::format("Writing octree to '{}'", _outFileOrFolderPath));
     std::ofstream outFileStream(_outFileOrFolderPath, std::ofstream::binary);
     if (outFileStream.good()) {
         if (nValues == 0) {
@@ -426,7 +426,7 @@ void ConstructOctreeTask::constructOctreeFromSingleFile(
     }
     else {
         LERROR(fmt::format(
-            "Error opening file: {} as output data file", _outFileOrFolderPath
+            "Error opening file '{}' as output data file", _outFileOrFolderPath
         ));
     }
 }
@@ -479,7 +479,7 @@ void ConstructOctreeTask::constructOctreeFromFolder(
         std::filesystem::path inFilePath = allInputFiles[idx];
         int nStarsInfile = 0;
 
-        LINFO(fmt::format("Reading data file: {}", inFilePath));
+        LINFO(fmt::format("Reading data file '{}'", inFilePath));
 
         std::ifstream inFileStream(inFilePath, std::ifstream::binary);
         if (inFileStream.good()) {
@@ -537,7 +537,7 @@ void ConstructOctreeTask::constructOctreeFromFolder(
         }
         else {
             LERROR(fmt::format(
-                "Error opening file {} for loading preprocessed file", inFilePath
+                "Error opening file '{}' for loading preprocessed file", inFilePath
             ));
         }
 
@@ -603,7 +603,7 @@ void ConstructOctreeTask::constructOctreeFromFolder(
     }
     else {
         LERROR(fmt::format(
-            "Error opening file: {} as index output file", indexFileOutPath
+            "Error opening file '{}' as index output file", indexFileOutPath
         ));
     }
 
diff --git a/modules/gaia/tasks/readfitstask.cpp b/modules/gaia/tasks/readfitstask.cpp
index d7d9d05adf..5d67fd2dfc 100644
--- a/modules/gaia/tasks/readfitstask.cpp
+++ b/modules/gaia/tasks/readfitstask.cpp
@@ -106,10 +106,10 @@ ReadFitsTask::ReadFitsTask(const ghoul::Dictionary& dictionary) {
 
 std::string ReadFitsTask::description() {
     return fmt::format(
-        "Read the specified fits file (or all fits files in specified folder): {}\n and "
-        "write raw star data into: {}\nAll columns required for default rendering and "
-        "filtering parameters will always be read but user can define additional filter "
-        "columns to read", _inFileOrFolderPath, _outFileOrFolderPath
+        "Read the specified fits file (or all fits files in specified folder): '{}'\n "
+        "and write raw star data into: '{}'\nAll columns required for default rendering "
+        "and filtering parameters will always be read but user can define additional "
+        "filter columns to read", _inFileOrFolderPath, _outFileOrFolderPath
     );
 }
 
@@ -143,7 +143,9 @@ void ReadFitsTask::readSingleFitsFile(const Task::ProgressCallback& progressCall
     std::ofstream outFileStream(_outFileOrFolderPath, std::ofstream::binary);
     if (outFileStream.good()) {
         int32_t nValues = static_cast<int32_t>(fullData.size());
-        LINFO(fmt::format("Writing {} values to file {}", nValues, _outFileOrFolderPath));
+        LINFO(fmt::format(
+            "Writing {} values to file '{}'", nValues, _outFileOrFolderPath
+        ));
         LINFO("Number of values per star: " + std::to_string(nValuesPerStar));
 
         if (nValues == 0) {
@@ -165,7 +167,7 @@ void ReadFitsTask::readSingleFitsFile(const Task::ProgressCallback& progressCall
     }
     else {
         LERROR(fmt::format(
-            "Error opening file: {} as output data file", _outFileOrFolderPath
+            "Error opening file '{}' as output data file", _outFileOrFolderPath
         ));
     }
 }
@@ -301,20 +303,18 @@ void ReadFitsTask::readAllFitsFilesFromFolder(const Task::ProgressCallback&) {
 int ReadFitsTask::writeOctantToFile(const std::vector<float>& octantData, int index,
                                     std::vector<bool>& isFirstWrite, int nValuesPerStar)
 {
-    std::string outPath = fmt::format(
-        "{}octant_{}.bin", _outFileOrFolderPath.string(), index
-    );
+    std::string outPath = fmt::format("{}octant_{}.bin", _outFileOrFolderPath, index);
     std::ofstream fileStream(outPath, std::ofstream::binary | std::ofstream::app);
     if (fileStream.good()) {
         int32_t nValues = static_cast<int32_t>(octantData.size());
-        LINFO("Write " + std::to_string(nValues) + " values to " + outPath);
+        LINFO(fmt::format("Write {} values to {}", nValues, outPath));
 
         if (nValues == 0) {
             LERROR("Error writing file - No values were read from file");
         }
         // If this is the first write then write number of values per star!
         if (isFirstWrite[index]) {
-            LINFO("First write for Octant_" + std::to_string(index));
+            LINFO(fmt::format("First write for Octant_{}", index));
             fileStream.write(
                 reinterpret_cast<const char*>(&nValuesPerStar),
                 sizeof(int32_t)
@@ -331,7 +331,7 @@ int ReadFitsTask::writeOctantToFile(const std::vector<float>& octantData, int in
         return nValues / nValuesPerStar;
     }
     else {
-        LERROR(fmt::format("Error opening file: {} as output data file", outPath));
+        LERROR(fmt::format("Error opening file '{}' as output data file", outPath));
         return 0;
     }
 }
diff --git a/modules/gaia/tasks/readspecktask.cpp b/modules/gaia/tasks/readspecktask.cpp
index 228730e21c..811614905a 100644
--- a/modules/gaia/tasks/readspecktask.cpp
+++ b/modules/gaia/tasks/readspecktask.cpp
@@ -60,7 +60,8 @@ ReadSpeckTask::ReadSpeckTask(const ghoul::Dictionary& dictionary) {
 
 std::string ReadSpeckTask::description() {
     return fmt::format(
-        "Read speck file {} and write raw star data into {}", _inFilePath, _outFilePath
+        "Read speck file '{}' and write raw star data into '{}'",
+        _inFilePath, _outFilePath
     );
 }
 
@@ -71,7 +72,7 @@ void ReadSpeckTask::perform(const Task::ProgressCallback& onProgress) {
 
     FitsFileReader fileReader(false);
     std::vector<float> fullData = fileReader.readSpeckFile(
-        _inFilePath.string(),
+        _inFilePath,
         nRenderValues
     );
 
@@ -94,7 +95,7 @@ void ReadSpeckTask::perform(const Task::ProgressCallback& onProgress) {
         fileStream.close();
     }
     else {
-        LERROR(fmt::format("Error opening file: {} as output data file", _outFilePath));
+        LERROR(fmt::format("Error opening file '{}' as output data file", _outFilePath));
     }
 
     onProgress(1.f);
diff --git a/modules/galaxy/rendering/renderablegalaxy.cpp b/modules/galaxy/rendering/renderablegalaxy.cpp
index d9d6293338..4b3873f16b 100644
--- a/modules/galaxy/rendering/renderablegalaxy.cpp
+++ b/modules/galaxy/rendering/renderablegalaxy.cpp
@@ -222,7 +222,7 @@ namespace {
         std::ofstream fileStream(file, std::ofstream::binary);
 
         if (!fileStream.good()) {
-            LERROR(fmt::format("Error opening file {} for save cache file", file));
+            LERROR(fmt::format("Error opening file '{}' for save cache file", file));
             return;
         }
 
@@ -361,8 +361,8 @@ void RenderableGalaxy::initialize() {
     );
     const bool hasCachedFile = std::filesystem::is_regular_file(cachedPointsFile);
     if (hasCachedFile) {
-        LINFO(fmt::format("Cached file {} used for galaxy point file {}",
-            cachedPointsFile, std::filesystem::path(_pointsFilename)
+        LINFO(fmt::format("Cached file '{}' used for galaxy point file '{}'",
+            cachedPointsFile, _pointsFilename
         ));
 
         Result res = loadCachedFile(cachedPointsFile);
@@ -460,7 +460,7 @@ void RenderableGalaxy::initializeGL() {
 
         if (_pointSpreadFunctionTexture) {
             LDEBUG(fmt::format(
-                "Loaded texture from {}", absPath(_pointSpreadFunctionTexturePath)
+                "Loaded texture from '{}'", absPath(_pointSpreadFunctionTexturePath)
             ));
             _pointSpreadFunctionTexture->uploadTexture();
         }
@@ -776,14 +776,14 @@ RenderableGalaxy::Result RenderableGalaxy::loadCachedFile(
 {
     std::ifstream fileStream(file, std::ifstream::binary);
     if (!fileStream.good()) {
-        LERROR(fmt::format("Error opening file {} for loading cache file", file));
+        LERROR(fmt::format("Error opening file '{}' for loading cache file", file));
         return { false, {}, {} };
     }
 
     int8_t cacheVersion;
     fileStream.read(reinterpret_cast<char*>(&cacheVersion), sizeof(int8_t));
     if (cacheVersion != CurrentCacheVersion) {
-        LINFO(fmt::format("Removing cache file {} as the version changed", file));
+        LINFO(fmt::format("Removing cache file '{}' as the version changed", file));
         return { false, {}, {} };
     }
 
diff --git a/modules/globebrowsing/globebrowsingmodule.cpp b/modules/globebrowsing/globebrowsingmodule.cpp
index d88976dcfd..42010a2fff 100644
--- a/modules/globebrowsing/globebrowsingmodule.cpp
+++ b/modules/globebrowsing/globebrowsingmodule.cpp
@@ -230,10 +230,13 @@ void GlobeBrowsingModule::internalInitialize(const ghoul::Dictionary& dict) {
             _hasDefaultGeoPointTexture = true;
         }
         else {
-            LWARNINGC("GlobeBrowsingModule", fmt::format(
-                "The provided texture file {} for the default geo point texture "
-                "does not exist", path
-            ));
+            LWARNINGC(
+                "GlobeBrowsingModule",
+                fmt::format(
+                    "The provided texture file '{}' for the default geo point texture "
+                    "does not exist", path
+                )
+            );
         }
     });
 
diff --git a/modules/globebrowsing/globebrowsingmodule_lua.inl b/modules/globebrowsing/globebrowsingmodule_lua.inl
index 848b1726dc..2efab28eb2 100644
--- a/modules/globebrowsing/globebrowsingmodule_lua.inl
+++ b/modules/globebrowsing/globebrowsingmodule_lua.inl
@@ -191,7 +191,7 @@ namespace {
 
     SceneGraphNode* n = sceneGraphNode(globeIdentifier);
     if (!n) {
-        throw ghoul::lua::LuaError(fmt::format("Unknown globe: {}", globeIdentifier));
+        throw ghoul::lua::LuaError(fmt::format("Unknown globe '{}'", globeIdentifier));
     }
 
     RenderableGlobe* globe = dynamic_cast<RenderableGlobe*>(n->renderable());
@@ -201,7 +201,7 @@ namespace {
 
     layers::Group::ID group = ghoul::from_string<layers::Group::ID>(layerGroup);
     if (group == layers::Group::ID::Unknown) {
-        throw ghoul::lua::LuaError(fmt::format("Unknown layer group: {}", layerGroup));
+        throw ghoul::lua::LuaError(fmt::format("Unknown layer group '{}'", layerGroup));
     }
 
     LayerGroup& lg = globe->layerManager().layerGroup(group);
@@ -669,7 +669,7 @@ geoPositionForCameraDeprecated(bool useEyePosition = false)
     std::filesystem::path path = absPath(filename);
     if (!std::filesystem::is_regular_file(path)) {
         throw ghoul::lua::LuaError(fmt::format(
-            "Could not find the provided file: '{}'", filename
+            "Could not find the provided file '{}'", filename
         ));
     }
 
@@ -678,7 +678,7 @@ geoPositionForCameraDeprecated(bool useEyePosition = false)
 
     if (extension != ".geojson" && extension != ".json") {
         throw ghoul::lua::LuaError(fmt::format(
-            "Unexpected file type: '{}'. Expected '.geojson' or '.json' file", filename
+            "Unexpected file type '{}'. Expected '.geojson' or '.json' file", filename
         ));
     }
 
diff --git a/modules/globebrowsing/src/gdalwrapper.cpp b/modules/globebrowsing/src/gdalwrapper.cpp
index 06d547b825..48fba4af15 100644
--- a/modules/globebrowsing/src/gdalwrapper.cpp
+++ b/modules/globebrowsing/src/gdalwrapper.cpp
@@ -140,7 +140,7 @@ void GdalWrapper::setGdalProxyConfiguration() {
 
         const std::string proxy = address + ":" + std::to_string(port);
         CPLSetConfigOption("GDAL_HTTP_PROXY", proxy.c_str());
-        LDEBUG(fmt::format("Using proxy server {}", proxy));
+        LDEBUG(fmt::format("Using proxy server '{}'", proxy));
 
         if (!user.empty() && !password.empty()) {
             std::string userPwd = user + ":" + password;
diff --git a/modules/globebrowsing/src/geojson/geojsoncomponent.cpp b/modules/globebrowsing/src/geojson/geojsoncomponent.cpp
index 7127c5b3d9..0f28a8fe61 100644
--- a/modules/globebrowsing/src/geojson/geojsoncomponent.cpp
+++ b/modules/globebrowsing/src/geojson/geojsoncomponent.cpp
@@ -369,7 +369,7 @@ GeoJsonComponent::GeoJsonComponent(const ghoul::Dictionary& dictionary,
         }
         else {
             LERROR(fmt::format(
-                "Provided texture file does not exist: '{}'",
+                "Provided texture file does not exist: {}",
                 _defaultProperties.pointTexture.value()
             ));
         }
@@ -629,7 +629,7 @@ void GeoJsonComponent::readFile() {
     catch (const geos::util::GEOSException& e) {
         LERROR(fmt::format(
             "Error creating GeoJson layer with identifier '{}'. Problem reading "
-            "GeoJson file '{}'. Error: '{}'", identifier(), _geoJsonFile.value(), e.what()
+            "GeoJson file '{}'. Error: {}", identifier(), _geoJsonFile.value(), e.what()
         ));
     }
 
diff --git a/modules/globebrowsing/src/geojson/globegeometryfeature.cpp b/modules/globebrowsing/src/geojson/globegeometryfeature.cpp
index 3ca1b9c6c7..381f8c2b3a 100644
--- a/modules/globebrowsing/src/geojson/globegeometryfeature.cpp
+++ b/modules/globebrowsing/src/geojson/globegeometryfeature.cpp
@@ -152,7 +152,7 @@ void GlobeGeometryFeature::updateTexture(bool isInitializeStep) {
     }
     else {
         LERROR(fmt::format(
-            "Trying to use texture file that does not exist: {} ", texturePath
+            "Trying to use texture file that does not exist: {}", texturePath
         ));
     }
 }
@@ -234,7 +234,7 @@ void GlobeGeometryFeature::createFromSingleGeosGeometry(const geos::geom::Geomet
             catch (geos::util::IllegalStateException& e) {
                 throw ghoul::RuntimeError(fmt::format(
                     "Non-simple (e.g. self-intersecting) polygons not supported yet. "
-                    "GEOS error: '{}'", e.what()
+                    "GEOS error: {}", e.what()
                 ));
 
                 // TODO: handle self-intersections points
diff --git a/modules/globebrowsing/src/globelabelscomponent.cpp b/modules/globebrowsing/src/globelabelscomponent.cpp
index 0755f28901..233dfe5a69 100644
--- a/modules/globebrowsing/src/globelabelscomponent.cpp
+++ b/modules/globebrowsing/src/globelabelscomponent.cpp
@@ -320,7 +320,9 @@ bool GlobeLabelsComponent::loadLabelsData(const std::filesystem::path& file) {
 
     bool hasCachedFile = std::filesystem::is_regular_file(cachedFile);
     if (hasCachedFile) {
-        LINFO(fmt::format("Cached file {} used for labels file {}", cachedFile, file));
+        LINFO(fmt::format(
+            "Cached file '{}' used for labels file '{}'", cachedFile, file
+        ));
 
         const bool hasCache = loadCachedFile(cachedFile);
         if (hasCache) {
@@ -333,9 +335,9 @@ bool GlobeLabelsComponent::loadLabelsData(const std::filesystem::path& file) {
         }
     }
     else {
-        LINFO(fmt::format("Cache for labels file {} not found", file));
+        LINFO(fmt::format("Cache for labels file '{}' not found", file));
     }
-    LINFO(fmt::format("Loading labels file {}", file));
+    LINFO(fmt::format("Loading labels file '{}'", file));
 
     bool success = readLabelsFile(file);
     if (success) {
@@ -348,7 +350,7 @@ bool GlobeLabelsComponent::readLabelsFile(const std::filesystem::path& file) {
     try {
         std::fstream csvLabelFile(file);
         if (!csvLabelFile.good()) {
-            LERROR(fmt::format("Failed to open labels file {}", file));
+            LERROR(fmt::format("Failed to open labels file '{}'", file));
             return false;
         }
         if (!csvLabelFile.is_open()) {
@@ -433,7 +435,7 @@ bool GlobeLabelsComponent::readLabelsFile(const std::filesystem::path& file) {
         return true;
     }
     catch (const std::fstream::failure& e) {
-        LERROR(fmt::format("Failed reading labels file {}", file));
+        LERROR(fmt::format("Failed reading labels file '{}'", file));
         LERROR(e.what());
         return false;
     }
@@ -442,7 +444,7 @@ bool GlobeLabelsComponent::readLabelsFile(const std::filesystem::path& file) {
 bool GlobeLabelsComponent::loadCachedFile(const std::filesystem::path& file) {
     std::ifstream fileStream(file, std::ifstream::binary);
     if (!fileStream.good()) {
-        LERROR(fmt::format("Error opening file {} for loading cache file", file));
+        LERROR(fmt::format("Error opening file '{}' for loading cache file", file));
         return false;
     }
 
@@ -472,7 +474,7 @@ bool GlobeLabelsComponent::loadCachedFile(const std::filesystem::path& file) {
 bool GlobeLabelsComponent::saveCachedFile(const std::filesystem::path& file) const {
     std::ofstream fileStream(file, std::ofstream::binary);
     if (!fileStream.good()) {
-        LERROR(fmt::format("Error opening file {} for save cache file", file));
+        LERROR(fmt::format("Error opening file '{}' for save cache file", file));
         return false;
     }
     fileStream.write(reinterpret_cast<const char*>(&CurrentCacheVersion), sizeof(int8_t));
diff --git a/modules/globebrowsing/src/layermanager.cpp b/modules/globebrowsing/src/layermanager.cpp
index f013505b00..31302cda24 100644
--- a/modules/globebrowsing/src/layermanager.cpp
+++ b/modules/globebrowsing/src/layermanager.cpp
@@ -72,7 +72,7 @@ void LayerManager::initialize(const ghoul::Dictionary& layerGroupsDict) {
             _layerGroups[static_cast<int>(id)]->setLayersFromDict(d);
         }
         else {
-            LWARNINGC("LayerManager", fmt::format("Unknown layer group: {}", groupName));
+            LWARNINGC("LayerManager", fmt::format("Unknown layer group '{}'", groupName));
         }
     }
 
diff --git a/modules/globebrowsing/src/rawtiledatareader.cpp b/modules/globebrowsing/src/rawtiledatareader.cpp
index d6666ede97..42ce6dfdb7 100644
--- a/modules/globebrowsing/src/rawtiledatareader.cpp
+++ b/modules/globebrowsing/src/rawtiledatareader.cpp
@@ -283,7 +283,7 @@ std::optional<std::string> RawTileDataReader::mrfCache() {
     for (std::string_view fmt : Unsupported) {
         if (_datasetFilePath.ends_with(fmt)) {
             LWARNING(fmt::format(
-                "Unsupported file format for MRF caching: {}, Dataset: {}",
+                "Unsupported file format for MRF caching: '{}', Dataset: '{}'",
                 fmt, _datasetFilePath
             ));
             return std::nullopt;
@@ -305,8 +305,8 @@ std::optional<std::string> RawTileDataReader::mrfCache() {
             // Already existing directories causes a 'failure' but no error
             if (ec) {
                 LWARNING(fmt::format(
-                    "Failed to create directories for cache at: {}. "
-                    "Error Code: {}, message: {}",
+                    "Failed to create directories for cache at: '{}'. "
+                    "Error Code: '{}', message: {}",
                     root, std::to_string(ec.value()), ec.message()
                 ));
                 return std::nullopt;
@@ -320,7 +320,7 @@ std::optional<std::string> RawTileDataReader::mrfCache() {
             );
             if (!src) {
                 LWARNING(fmt::format(
-                    "Failed to load dataset: {}. GDAL Error: {}",
+                    "Failed to load dataset '{}'. GDAL error: {}",
                     _datasetFilePath, CPLGetLastErrorMsg()
                 ));
                 return std::nullopt;
@@ -357,7 +357,7 @@ std::optional<std::string> RawTileDataReader::mrfCache() {
             );
             if (!dst) {
                 LWARNING(fmt::format(
-                    "Failed to create MRF Caching dataset dataset: {}. GDAL Error: {}",
+                    "Failed to create MRF Caching dataset dataset '{}'. GDAL error: {}",
                     mrf, CPLGetLastErrorMsg()
                 ));
                 return std::nullopt;
@@ -398,7 +398,7 @@ void RawTileDataReader::initialize() {
         _dataset = static_cast<GDALDataset*>(GDALOpen(content.c_str(), GA_ReadOnly));
         if (!_dataset) {
             throw ghoul::RuntimeError(fmt::format(
-                "Failed to load dataset: {}. GDAL Error: {}",
+                "Failed to load dataset '{}'. GDAL error: {}",
                 _datasetFilePath, CPLGetLastErrorMsg()
             ));
         }
diff --git a/modules/globebrowsing/src/renderableglobe.cpp b/modules/globebrowsing/src/renderableglobe.cpp
index 476442c978..783373fe2b 100644
--- a/modules/globebrowsing/src/renderableglobe.cpp
+++ b/modules/globebrowsing/src/renderableglobe.cpp
@@ -866,7 +866,7 @@ void RenderableGlobe::renderSecondary(const RenderData& data, RendererTasks&) {
         _globeLabelsComponent.draw(data);
     }
     catch (const ghoul::opengl::TextureUnit::TextureUnitError& e) {
-        LERROR(fmt::format("Error on drawing globe labels: '{}'", e.message));
+        LERROR(fmt::format("Error on drawing globe labels '{}'", e.message));
     }
 
     if (_geoJsonManager.isReady()) {
diff --git a/modules/globebrowsing/src/ringscomponent.cpp b/modules/globebrowsing/src/ringscomponent.cpp
index 74642535db..10543c1c82 100644
--- a/modules/globebrowsing/src/ringscomponent.cpp
+++ b/modules/globebrowsing/src/ringscomponent.cpp
@@ -665,7 +665,7 @@ void RingsComponent::loadTexture() {
         if (texture) {
             LDEBUGC(
                 "RingsComponent",
-                fmt::format("Loaded texture from {}", absPath(_texturePath))
+                fmt::format("Loaded texture from '{}'", absPath(_texturePath))
             );
             _texture = std::move(texture);
 
@@ -689,7 +689,7 @@ void RingsComponent::loadTexture() {
             LDEBUGC(
                 "RingsComponent",
                 fmt::format(
-                    "Loaded forwards scattering texture from {}",
+                    "Loaded forwards scattering texture from '{}'",
                     absPath(_textureFwrdPath)
                 )
             );
@@ -716,7 +716,7 @@ void RingsComponent::loadTexture() {
             LDEBUGC(
                 "RingsComponent",
                 fmt::format(
-                    "Loaded backwards scattering texture from {}",
+                    "Loaded backwards scattering texture from '{}'",
                     absPath(_textureBckwrdPath)
                 )
             );
@@ -742,7 +742,7 @@ void RingsComponent::loadTexture() {
         if (textureUnlit) {
             LDEBUGC(
                 "RingsComponent",
-                fmt::format("Loaded unlit texture from {}", absPath(_textureUnlitPath))
+                fmt::format("Loaded unlit texture from '{}'", absPath(_textureUnlitPath))
             );
             _textureUnlit = std::move(textureUnlit);
 
@@ -765,7 +765,7 @@ void RingsComponent::loadTexture() {
         if (textureColor) {
             LDEBUGC(
                 "RingsComponent",
-                fmt::format("Loaded color texture from {}", absPath(_textureColorPath))
+                fmt::format("Loaded color texture from '{}'", absPath(_textureColorPath))
             );
             _textureColor = std::move(textureColor);
 
@@ -788,7 +788,7 @@ void RingsComponent::loadTexture() {
         if (textureTransparency) {
             LDEBUGC(
                 "RingsComponent",
-                fmt::format("Loaded unlit texture from {}", absPath(_textureUnlitPath))
+                fmt::format("Loaded unlit texture from '{}'", absPath(_textureUnlitPath))
             );
             _textureTransparency = std::move(textureTransparency);
 
diff --git a/modules/globebrowsing/src/tileprovider/sizereferencetileprovider.cpp b/modules/globebrowsing/src/tileprovider/sizereferencetileprovider.cpp
index 13361a8025..d8b01d71ef 100644
--- a/modules/globebrowsing/src/tileprovider/sizereferencetileprovider.cpp
+++ b/modules/globebrowsing/src/tileprovider/sizereferencetileprovider.cpp
@@ -93,7 +93,7 @@ Tile SizeReferenceTileProvider::tile(const TileIndex& tileIndex) {
         unit = "m";
     }
 
-    std::string text = fmt::format(" {:.0f} {:s}", tileLongitudalLength, unit);
+    std::string text = fmt::format("{:.0f} {:s}", tileLongitudalLength, unit);
     glm::vec2 textPosition = glm::vec2(
         0.f,
         aboveEquator ?
diff --git a/modules/globebrowsing/src/tileprovider/temporaltileprovider.cpp b/modules/globebrowsing/src/tileprovider/temporaltileprovider.cpp
index a92c98a846..4107e89dbe 100644
--- a/modules/globebrowsing/src/tileprovider/temporaltileprovider.cpp
+++ b/modules/globebrowsing/src/tileprovider/temporaltileprovider.cpp
@@ -218,7 +218,7 @@ TemporalTileProvider::TemporalTileProvider(const ghoul::Dictionary& dictionary)
         }
         catch (const ghoul::RuntimeError& e) {
             throw ghoul::RuntimeError(fmt::format(
-                "Could not create time quantizer for Temporal GDAL dataset. {}", e.message
+                "Could not create time quantizer for Temporal GDAL dataset: {}", e.message
             ));
         }
 
@@ -295,7 +295,7 @@ TemporalTileProvider::TemporalTileProvider(const ghoul::Dictionary& dictionary)
 
         if (_folder.files.empty()) {
             throw ghoul::RuntimeError(fmt::format(
-                "Error loading layer '{}'. Folder {} does not contain any files that "
+                "Error loading layer '{}'. Folder '{}' does not contain any files that "
                 "matched the time format",
                 _identifier, _folder.folder
             ));
diff --git a/modules/globebrowsing/src/timequantizer.cpp b/modules/globebrowsing/src/timequantizer.cpp
index b7c43d86e6..cd67b732cd 100644
--- a/modules/globebrowsing/src/timequantizer.cpp
+++ b/modules/globebrowsing/src/timequantizer.cpp
@@ -388,9 +388,7 @@ void TimeQuantizer::verifyStartTimeRestrictions() {
     if (_start.day() < 1 || _start.day() > dayUpperLimit) {
         throw ghoul::RuntimeError(fmt::format(
             "Invalid start day value of {} for {}, valid days are 1 - {}",
-            _start.day(),
-            helpfulDescription,
-            dayUpperLimit
+            _start.day(), helpfulDescription, dayUpperLimit
         ));
     }
     if (_start.hour() != 0 || _start.minute() != 0 || _start.second() != 0) {
diff --git a/modules/imgui/imguimodule.cpp b/modules/imgui/imguimodule.cpp
index e75a2f2499..451fa63d79 100644
--- a/modules/imgui/imguimodule.cpp
+++ b/modules/imgui/imguimodule.cpp
@@ -281,7 +281,7 @@ void ImGUIModule::internalDeinitialize() {
 
 void ImGUIModule::internalInitializeGL() {
     std::filesystem::path file = FileSys.cacheManager()->cachedFilename("imgui.ini", "");
-    LDEBUG(fmt::format("Using {} as ImGUI cache location", file));
+    LDEBUG(fmt::format("Using '{}' as ImGUI cache location", file));
 
     _iniFileBuffer.resize(file.string().size() + 1);
 
diff --git a/modules/imgui/src/guiglobebrowsingcomponent.cpp b/modules/imgui/src/guiglobebrowsingcomponent.cpp
index b8e712ef8f..9f7d4d4032 100644
--- a/modules/imgui/src/guiglobebrowsingcomponent.cpp
+++ b/modules/imgui/src/guiglobebrowsingcomponent.cpp
@@ -270,7 +270,7 @@ void GuiGlobeBrowsingComponent::render() {
     Capabilities cap = module->capabilities(_currentServer);
 
     if (cap.empty()) {
-        LWARNINGC("GlobeBrowsing", fmt::format("Unknown server: '{}'", _currentServer));
+        LWARNINGC("GlobeBrowsing", fmt::format("Unknown server '{}'", _currentServer));
     }
 
     ImGui::Columns(6, nullptr, false);
diff --git a/modules/iswa/rendering/texturecygnet.cpp b/modules/iswa/rendering/texturecygnet.cpp
index f5a6dc28ec..81bc8666cd 100644
--- a/modules/iswa/rendering/texturecygnet.cpp
+++ b/modules/iswa/rendering/texturecygnet.cpp
@@ -53,7 +53,7 @@ bool TextureCygnet::updateTexture() {
 
     if (texture) {
         LDEBUG(fmt::format(
-            "Loaded texture from image iswa cygnet with id: '{}'", _data.id
+            "Loaded texture from image iswa cygnet with id '{}'", _data.id
         ));
         texture->uploadTexture();
         // Textures of planets looks much smoother with AnisotropicMipMap
diff --git a/modules/iswa/util/iswamanager.cpp b/modules/iswa/util/iswamanager.cpp
index 86fe3e3ff1..7a2197ff1a 100644
--- a/modules/iswa/util/iswamanager.cpp
+++ b/modules/iswa/util/iswamanager.cpp
@@ -622,7 +622,7 @@ void IswaManager::createKameleonPlane(CdfInfo info, std::string cut) {
     }
     else {
         LWARNING(
-            fmt::format("{} is not a cdf file or can't be found", absPath(info.path))
+            fmt::format("'{}' is not a CDF file or cannot be found", absPath(info.path))
         );
     }
 }
@@ -630,7 +630,7 @@ void IswaManager::createKameleonPlane(CdfInfo info, std::string cut) {
 void IswaManager::createFieldline(std::string name, std::string cdfPath,
                                   std::string seedPath)
 {
-    std::filesystem::path ext = std::filesystem::path(absPath(cdfPath)).extension();
+    std::filesystem::path ext = absPath(cdfPath).extension();
     if (std::filesystem::is_regular_file(absPath(cdfPath)) && ext == ".cdf") {
         std::string luaTable = "{"
             "Name = '" + name + "',"
@@ -744,7 +744,7 @@ void IswaManager::addCdfFiles(std::string cdfpath) {
         }
     }
     else {
-        LWARNING(fmt::format("{} is not a cdf file or can't be found", cdfFile));
+        LWARNING(fmt::format("'{}' is not a CDF file or cannot be found", cdfFile));
     }
 }
 
diff --git a/modules/iswa/util/iswamanager_lua.inl b/modules/iswa/util/iswamanager_lua.inl
index ac98898112..b65d16a411 100644
--- a/modules/iswa/util/iswamanager_lua.inl
+++ b/modules/iswa/util/iswamanager_lua.inl
@@ -51,7 +51,7 @@ namespace {
 
     if (global::renderEngine->screenSpaceRenderable(name)) {
         throw ghoul::lua::LuaError(fmt::format(
-            "A cygnet with the name \"{}\" already exist", name
+            "A cygnet with the name '{}' already exist", name
         ));
     }
     else {
diff --git a/modules/kameleon/src/kameleonhelper.cpp b/modules/kameleon/src/kameleonhelper.cpp
index c5726aecb4..460cfddff8 100644
--- a/modules/kameleon/src/kameleonhelper.cpp
+++ b/modules/kameleon/src/kameleonhelper.cpp
@@ -50,17 +50,17 @@ namespace openspace::kameleonHelper {
 
 std::unique_ptr<ccmc::Kameleon> createKameleonObject(const std::string& cdfFilePath) {
     auto kameleon = std::make_unique<ccmc::Kameleon>();
-    LDEBUG(fmt::format("\tOpening the cdf file: {}", cdfFilePath));
+    LDEBUG(fmt::format("Opening the CDF file '{}'", cdfFilePath));
     long kamStatus = kameleon->open(cdfFilePath);
 
     if (kamStatus != ccmc::FileReader::OK) {
         LERROR(fmt::format(
-            "Failed to create a Kameleon Object from file: {}",
+            "Failed to create a Kameleon Object from file '{}'",
             cdfFilePath
         ));
        return nullptr;
     }
-    LDEBUG(fmt::format("\tSuccessfully opened: {}", cdfFilePath));
+    LDEBUG(fmt::format("Successfully opened '{}'", cdfFilePath));
     return kameleon;
 }
 
diff --git a/modules/kameleon/src/kameleonwrapper.cpp b/modules/kameleon/src/kameleonwrapper.cpp
index 291718baa4..94c3982a76 100644
--- a/modules/kameleon/src/kameleonwrapper.cpp
+++ b/modules/kameleon/src/kameleonwrapper.cpp
@@ -172,7 +172,9 @@ float* KameleonWrapper::uniformSampledValues(const std::string& var,
 {
     ghoul_assert(_model && _interpolator, "Model and interpolator must exist");
 
-    LINFO(fmt::format("Loading variable {} from CDF data with a uniform sampling", var));
+    LINFO(fmt::format(
+        "Loading variable '{}' from CDF data with a uniform sampling", var
+    ));
 
     const size_t size = outDimensions.x * outDimensions.y * outDimensions.z;
     float* data = new float[size];
@@ -323,7 +325,7 @@ float* KameleonWrapper::uniformSliceValues(const std::string& var,
 {
     ghoul_assert(_model && _interpolator, "Model and interpolator must exist");
     LINFO(fmt::format(
-        "Loading variable {} from CDF data with a uniform sampling",
+        "Loading variable '{}' from CDF data with a uniform sampling",
         var
     ));
 
@@ -454,7 +456,7 @@ float* KameleonWrapper::uniformSampledVectorValues(const std::string& xVar,
     ghoul_assert(_model && _interpolator, "Model and interpolator must exist");
 
     LINFO(fmt::format(
-        "loading variables {} {} {} from CDF data with a uniform sampling",
+        "Loading variables {} {} {} from CDF data with a uniform sampling",
         xVar,
         yVar,
         zVar
diff --git a/modules/kameleonvolume/kameleonvolumereader.cpp b/modules/kameleonvolume/kameleonvolumereader.cpp
index 76d51ac77f..577611b777 100644
--- a/modules/kameleonvolume/kameleonvolumereader.cpp
+++ b/modules/kameleonvolume/kameleonvolumereader.cpp
@@ -83,8 +83,9 @@ KameleonVolumeReader::KameleonVolumeReader(std::string path) : _path(std::move(p
 
     const long status = _kameleon->open(_path);
     if (status != ccmc::FileReader::OK) {
-        LERROR(fmt::format("Failed to open file '{}' with Kameleon", _path));
-        throw ghoul::RuntimeError("Failed to open file: " + _path + " with Kameleon");
+        throw ghoul::RuntimeError(fmt::format(
+            "Failed to open file '{}' with Kameleon", _path
+        ));
     }
 
     // Possibly use a kameleon interpolator instead of a model interpolator?
diff --git a/modules/kameleonvolume/tasks/kameleondocumentationtask.cpp b/modules/kameleonvolume/tasks/kameleondocumentationtask.cpp
index 4fe1d2f4a0..136d4ea0c4 100644
--- a/modules/kameleonvolume/tasks/kameleondocumentationtask.cpp
+++ b/modules/kameleonvolume/tasks/kameleondocumentationtask.cpp
@@ -65,7 +65,7 @@ KameleonDocumentationTask::KameleonDocumentationTask(const ghoul::Dictionary& di
 
 std::string KameleonDocumentationTask::description() {
     return fmt::format(
-        "Extract metadata from cdf file {} and output html documentation to {}",
+        "Extract metadata from CDF file '{}' and output HTML documentation to '{}'",
         _inputPath, _outputPath
     );
 }
diff --git a/modules/kameleonvolume/tasks/kameleonmetadatatojsontask.cpp b/modules/kameleonvolume/tasks/kameleonmetadatatojsontask.cpp
index 38dae18c03..00069bae93 100644
--- a/modules/kameleonvolume/tasks/kameleonmetadatatojsontask.cpp
+++ b/modules/kameleonvolume/tasks/kameleonmetadatatojsontask.cpp
@@ -59,7 +59,7 @@ KameleonMetadataToJsonTask::KameleonMetadataToJsonTask(
 
 std::string KameleonMetadataToJsonTask::description() {
     return fmt::format(
-        "Extract metadata from cdf file {} and write as json to {}",
+        "Extract metadata from CDF file '{}' and write as JSON to '{}'",
         _inputPath, _outputPath
     );
 }
diff --git a/modules/kameleonvolume/tasks/kameleonvolumetorawtask.cpp b/modules/kameleonvolume/tasks/kameleonvolumetorawtask.cpp
index 3ed9c394cc..09c5658d9a 100644
--- a/modules/kameleonvolume/tasks/kameleonvolumetorawtask.cpp
+++ b/modules/kameleonvolume/tasks/kameleonvolumetorawtask.cpp
@@ -98,8 +98,8 @@ KameleonVolumeToRawTask::KameleonVolumeToRawTask(const ghoul::Dictionary& dictio
 
 std::string KameleonVolumeToRawTask::description() {
     return fmt::format(
-        "Extract volumetric data from cdf file {}. Write raw volume data into {} "
-        "and dictionary with metadata to {}",
+        "Extract volumetric data from CDF file '{}'. Write raw volume data into '{}' "
+        "and dictionary with metadata to '{}'",
         _inputPath, _rawVolumeOutputPath, _dictionaryOutputPath
     );
 }
diff --git a/modules/multiresvolume/rendering/localerrorhistogrammanager.cpp b/modules/multiresvolume/rendering/localerrorhistogrammanager.cpp
index 14bdf6a753..e750f653aa 100644
--- a/modules/multiresvolume/rendering/localerrorhistogrammanager.cpp
+++ b/modules/multiresvolume/rendering/localerrorhistogrammanager.cpp
@@ -135,9 +135,7 @@ bool LocalErrorHistogramManager::buildFromOctreeChild(unsigned int bstOffset,
             else {
                 LERROR(fmt::format(
                     "Child {} visited without cache, {}, {}",
-                    childIndex,
-                    bstOffset,
-                    octreeOffset
+                    childIndex, bstOffset, octreeOffset
                 ));
                 return false;
             }
diff --git a/modules/multiresvolume/rendering/renderablemultiresvolume.cpp b/modules/multiresvolume/rendering/renderablemultiresvolume.cpp
index 6189d4d20f..cf3ec17421 100644
--- a/modules/multiresvolume/rendering/renderablemultiresvolume.cpp
+++ b/modules/multiresvolume/rendering/renderablemultiresvolume.cpp
@@ -482,28 +482,28 @@ bool RenderableMultiresVolume::initializeSelector() {
                 );
                 std::ifstream cacheFile(cached, std::ios::in | std::ios::binary);
                 if (cacheFile.is_open()) {
-                    // Read histograms from cache.
+                    // Read histograms from cache
                     cacheFile.close();
                     LINFO(
-                        fmt::format("Loading histograms from cache: {}", cached)
+                        fmt::format("Loading histograms from cache '{}'", cached)
                     );
                     success &= _errorHistogramManager->loadFromFile(cached);
                 }
                 else if (!_errorHistogramsPath.empty()) {
-                    // Read histograms from scene data.
+                    // Read histograms from scene data
                     LINFO(fmt::format(
-                        "Loading histograms from scene data: {}", _errorHistogramsPath
+                        "Loading histograms from scene data '{}'", _errorHistogramsPath
                     ));
                     success &= _errorHistogramManager->loadFromFile(
                         _errorHistogramsPath.string()
                     );
                 }
                 else {
-                    // Build histograms from tsp file.
-                    LWARNING(fmt::format("Failed to open {}", cached));
+                    // Build histograms from tsp file
+                    LWARNING(fmt::format("Failed to open '{}'", cached));
                     success &= _errorHistogramManager->buildHistograms(nHistograms);
                     if (success) {
-                        LINFO(fmt::format("Writing cache to {}", cached));
+                        LINFO(fmt::format("Writing cache to '{}'", cached));
                         _errorHistogramManager->saveToFile(cached);
                     }
                 }
@@ -523,18 +523,18 @@ bool RenderableMultiresVolume::initializeSelector() {
                 if (cacheFile.is_open()) {
                     // Read histograms from cache.
                     cacheFile.close();
-                    LINFO(fmt::format("Loading histograms from {}", cached));
+                    LINFO(fmt::format("Loading histograms from '{}'", cached));
                     success &= _histogramManager->loadFromFile(cached);
                 }
                 else {
                     // Build histograms from tsp file.
-                    LWARNING(fmt::format("Failed to open {}", cached));
+                    LWARNING(fmt::format("Failed to open '{}'", cached));
                     success &= _histogramManager->buildHistograms(
                         _tsp.get(),
                         nHistograms
                     );
                     if (success) {
-                        LINFO(fmt::format("Writing cache to {}", cached));
+                        LINFO(fmt::format("Writing cache to '{}'", cached));
                         _histogramManager->saveToFile(cached);
                     }
                 }
@@ -555,15 +555,15 @@ bool RenderableMultiresVolume::initializeSelector() {
                 if (cacheFile.is_open()) {
                     // Read histograms from cache.
                     cacheFile.close();
-                    LINFO(fmt::format("Loading histograms from {}", cached));
+                    LINFO(fmt::format("Loading histograms from '{}'", cached));
                     success &= _localErrorHistogramManager->loadFromFile(cached);
                 }
                 else {
                     // Build histograms from tsp file.
-                    LWARNING(fmt::format("Failed to open {}", cached));
+                    LWARNING(fmt::format("Failed to open '{}'", cached));
                     success &= _localErrorHistogramManager->buildHistograms(nHistograms);
                     if (success) {
-                        LINFO(fmt::format("Writing cache to {}", cached));
+                        LINFO(fmt::format("Writing cache to '{}'", cached));
                         _localErrorHistogramManager->saveToFile(cached);
                     }
                 }
diff --git a/modules/server/src/connection.cpp b/modules/server/src/connection.cpp
index 53026656fe..3465a58ec7 100644
--- a/modules/server/src/connection.cpp
+++ b/modules/server/src/connection.cpp
@@ -126,7 +126,7 @@ void Connection::handleMessage(const std::string& message) {
         if (!isAuthorized()) {
             _socket->disconnect();
             LERROR(fmt::format(
-                "Could not parse JSON: '{}'. Connection is unauthorized. Disconnecting",
+                "Could not parse JSON '{}'. Connection is unauthorized. Disconnecting",
                 message
             ));
             return;
@@ -141,7 +141,7 @@ void Connection::handleMessage(const std::string& message) {
                     return std::isprint(c, std::locale("")) ? char(c) : ' ';
                 }
             );
-            LERROR(fmt::format("Could not parse JSON: '{}'", sanitizedString));
+            LERROR(fmt::format("Could not parse JSON '{}'", sanitizedString));
         }
     }
 }
diff --git a/modules/server/src/topics/flightcontrollertopic.cpp b/modules/server/src/topics/flightcontrollertopic.cpp
index fe29905348..a646af53b0 100644
--- a/modules/server/src/topics/flightcontrollertopic.cpp
+++ b/modules/server/src/topics/flightcontrollertopic.cpp
@@ -175,7 +175,7 @@ void FlightControllerTopic::handleJson(const nlohmann::json& json) {
     auto it = CommandMap.find(json[TypeKey]);
     if (it == CommandMap.end()) {
         LWARNING(
-            fmt::format("Poorly formatted JSON command: no '{}' in payload", TypeKey)
+            fmt::format("Malformed JSON command: no '{}' in payload", TypeKey)
         );
         return;
     }
@@ -270,15 +270,15 @@ void FlightControllerTopic::changeFocus(const nlohmann::json& json) const {
     if (json.find(FocusKey) == json.end()) {
         const std::string j = json;
         LWARNING(
-            fmt::format("Could not find {} key in JSON. JSON was:\n{}", FocusKey, j)
+            fmt::format("Could not find '{}' key in JSON. JSON was:\n{}", FocusKey, j)
         );
         if (json.find(AimKey) == json.end()) {
             LWARNING(
-                fmt::format("Could not find {} key in JSON. JSON was:\n{}", AimKey, j)
+                fmt::format("Could not find '{}' key in JSON. JSON was:\n{}", AimKey, j)
             );
             if (json.find(AnchorKey) == json.end()) {
                 LWARNING(fmt::format(
-                    "Could not find {} key in JSON. JSON was:\n{}", AnchorKey, j
+                    "Could not find '{}' key in JSON. JSON was:\n{}", AnchorKey, j
                 ));
                 return;
             }
@@ -324,7 +324,7 @@ void FlightControllerTopic::setRenderableEnabled(const nlohmann::json& json) con
     if (json[RenderableKey].find(SceneNodeName) == json[RenderableKey].end()) {
         const std::string j = json;
         LWARNING(
-            fmt::format("Could not find {} key in JSON. JSON was:\n{}", FocusKey, j)
+            fmt::format("Could not find '{}' key in JSON. JSON was:\n{}", FocusKey, j)
         );
         return;
     }
@@ -394,7 +394,7 @@ void FlightControllerTopic::engageAutopilot(const nlohmann::json &json) {
         if (mapIt == AxisIndexMap.end()) {
             if (it.key() != TypeKey || CommandMap.find(it.value()) == CommandMap.end()) {
                 LWARNING(fmt::format(
-                    "No axis, button, or command named {} (value: {})",
+                    "No axis, button, or command named '{}' (value: {})",
                     it.key(), static_cast<int>(it.value())
                 ));
             }
@@ -434,7 +434,7 @@ void FlightControllerTopic::processInputState(const nlohmann::json& json) {
         if (mapIt == AxisIndexMap.end()) {
             if (it.key() != TypeKey || CommandMap.find(it.value()) == CommandMap.end()) {
                 LWARNING(fmt::format(
-                    "No axis, button, or command named {} (value: {})",
+                    "No axis, button, or command named '{}' (value: {})",
                     it.key() , static_cast<int>(it.value())
                 ));
             }
diff --git a/modules/skybrowser/skybrowsermodule_lua.inl b/modules/skybrowser/skybrowsermodule_lua.inl
index b085b52df0..131fe47d3a 100644
--- a/modules/skybrowser/skybrowsermodule_lua.inl
+++ b/modules/skybrowser/skybrowsermodule_lua.inl
@@ -112,7 +112,7 @@ std::string prunedIdentifier(std::string identifier) {
             );
             if (!found.has_value()) {
                 LINFO(fmt::format(
-                    "No image with identifier {} was found in the collection.", imageUrl
+                    "No image with identifier '{}' was found in the collection.", imageUrl
                 ));
                 return;
             }
@@ -161,7 +161,7 @@ std::string prunedIdentifier(std::string identifier) {
     SceneGraphNode* circle = global::renderEngine->scene()->sceneGraphNode(identifier);
     if (!circle) {
         throw ghoul::lua::LuaError(fmt::format(
-            "Could not find node to set as hover circle: '{}'", identifier
+            "Could not find node to set as hover circle: {}", identifier
         ));
     }
 
diff --git a/modules/skybrowser/src/browser.cpp b/modules/skybrowser/src/browser.cpp
index 7cf5b127c6..bf9918ffc2 100644
--- a/modules/skybrowser/src/browser.cpp
+++ b/modules/skybrowser/src/browser.cpp
@@ -139,7 +139,7 @@ void Browser::deinitializeGL() {
 
     _texture = nullptr;
 
-    LDEBUG(fmt::format("Deinitializing browser: {}", _url.value()));
+    LDEBUG(fmt::format("Deinitializing browser '{}'", _url.value()));
 
     _browserInstance->close(true);
 
diff --git a/modules/skybrowser/src/wwtdatahandler.cpp b/modules/skybrowser/src/wwtdatahandler.cpp
index f2e714641a..808c3a2af1 100644
--- a/modules/skybrowser/src/wwtdatahandler.cpp
+++ b/modules/skybrowser/src/wwtdatahandler.cpp
@@ -136,7 +136,7 @@ namespace {
         const bool success = downloadFile(url, file);
         if (!success) {
             LINFO(fmt::format(
-                "Could not download file '{}' to directory {}", url, directory
+                "Could not download file '{}' to directory '{}'", url, directory
             ));
             return false;
         }
@@ -154,7 +154,7 @@ namespace {
         // If the file contains no folders, or there are folders but without urls,
         // stop recursion
         if (!folderExists || folderContainNoUrls) {
-            LINFO(fmt::format("Saving {}", url));
+            LINFO(fmt::format("Saving '{}'", url));
             return true;
         }
 
@@ -261,7 +261,7 @@ void WwtDataHandler::loadImages(const std::string& root,
 
     // 1.
     if (!directoryExists(directory)) {
-        LINFO(fmt::format("Creating directory {}", directory));
+        LINFO(fmt::format("Creating directory '{}'", directory));
         std::filesystem::create_directory(directory);
     }
 
diff --git a/modules/space/horizonsfile.cpp b/modules/space/horizonsfile.cpp
index efb5036811..fabd20b143 100644
--- a/modules/space/horizonsfile.cpp
+++ b/modules/space/horizonsfile.cpp
@@ -130,7 +130,7 @@ json sendHorizonsRequest(const std::string& url, std::filesystem::path filePath)
     bool failed = false;
     dl->wait();
     if (!dl->hasSucceeded()) {
-        LERROR(fmt::format("Error downloading horizons file with URL {}", dl->url()));
+        LERROR(fmt::format("Error downloading horizons file with URL '{}'", dl->url()));
         failed = true;
     }
 
diff --git a/modules/space/kepler.cpp b/modules/space/kepler.cpp
index 0e6ca11493..55d9978c3e 100644
--- a/modules/space/kepler.cpp
+++ b/modules/space/kepler.cpp
@@ -734,7 +734,7 @@ std::vector<Parameters> readFile(std::filesystem::path file, Format format) {
     std::filesystem::path cachedFile = FileSys.cacheManager()->cachedFilename(file);
     if (std::filesystem::is_regular_file(cachedFile)) {
         LINFO(fmt::format(
-            "Cached file {} used for Kepler file {}", cachedFile, file
+            "Cached file '{}' used for Kepler file '{}'", cachedFile, file
         ));
 
         std::optional<std::vector<Parameters>> res = loadCache(cachedFile);
@@ -758,7 +758,7 @@ std::vector<Parameters> readFile(std::filesystem::path file, Format format) {
             break;
     }
 
-    LINFO(fmt::format("Saving cache {} for Kepler file {}", cachedFile, file));
+    LINFO(fmt::format("Saving cache '{}' for Kepler file '{}'", cachedFile, file));
     saveCache(res, cachedFile);
     return res;
 }
diff --git a/modules/space/rendering/renderableconstellationbounds.cpp b/modules/space/rendering/renderableconstellationbounds.cpp
index a495d303e1..abc67aeaf3 100644
--- a/modules/space/rendering/renderableconstellationbounds.cpp
+++ b/modules/space/rendering/renderableconstellationbounds.cpp
@@ -258,7 +258,7 @@ bool RenderableConstellationBounds::loadVertexFile() {
             // If this evaluates to true, the stream was not completely filled, which
             // means that the line was incomplete, so there was an error
             LERROR(fmt::format(
-                "Error reading file {} at line #{}", fileName, currentLineNumber
+                "Error reading file '{}' at line #{}", fileName, currentLineNumber
             ));
             break;
         }
diff --git a/modules/space/rendering/renderableconstellationlines.cpp b/modules/space/rendering/renderableconstellationlines.cpp
index 8958b85b7d..a4182b6734 100644
--- a/modules/space/rendering/renderableconstellationlines.cpp
+++ b/modules/space/rendering/renderableconstellationlines.cpp
@@ -314,10 +314,10 @@ bool RenderableConstellationLines::readSpeckFile() {
     }
     std::filesystem::path fileName = absPath(_speckFile);
 
-    LINFO(fmt::format("Loading Speck file {}", fileName));
+    LINFO(fmt::format("Loading Speck file '{}'", fileName));
     std::ifstream file(fileName);
     if (!file.good()) {
-        LERROR(fmt::format("Failed to open Speck file {}", fileName));
+        LERROR(fmt::format("Failed to open Speck file '{}'", fileName));
         return false;
     }
 
@@ -369,8 +369,10 @@ bool RenderableConstellationLines::readSpeckFile() {
                     str >> constellationLine.colorIndex; // color index
                 }
                 else {
-                    std::string message = fmt::format("Unknown command '{}' found in "
-                        "constellation file '{}'", dummy, fileName);
+                    std::string message = fmt::format(
+                        "Unknown command '{}' found in constellation file '{}'",
+                        dummy, fileName
+                    );
                     LWARNING(message);
                 }
                 dummy.clear();
@@ -415,7 +417,7 @@ bool RenderableConstellationLines::readSpeckFile() {
                 }
                 else {
                     LERROR(fmt::format(
-                        "Failed reading position on line {} of mesh {} in file: '{}'. "
+                        "Failed reading position on line {} of mesh {} in file '{}'. "
                         "Stopped reading constellation data", l, lineIndex, fileName
                     ));
                 }
diff --git a/modules/space/rendering/renderablefluxnodes.cpp b/modules/space/rendering/renderablefluxnodes.cpp
index 66bb4bc2ad..4070b993c4 100644
--- a/modules/space/rendering/renderablefluxnodes.cpp
+++ b/modules/space/rendering/renderablefluxnodes.cpp
@@ -359,12 +359,12 @@ RenderableFluxNodes::RenderableFluxNodes(const ghoul::Dictionary& dictionary)
 
         // Ensure that there are available and valid source files left
         if (_binarySourceFiles.empty()) {
-            LERROR(fmt::format("{} contains no files", _binarySourceFolderPath));
+            LERROR(fmt::format("'{}' contains no files", _binarySourceFolderPath));
         }
     }
     else {
         LERROR(fmt::format(
-            "Source folder {} is not a valid directory", _binarySourceFolderPath
+            "Source folder '{}' is not a valid directory", _binarySourceFolderPath
         ));
     }
 
@@ -646,8 +646,9 @@ void RenderableFluxNodes::populateStartTimes() {
                 _startTimes.push_back(triggerTime);
             }
             else {
-                LERROR(fmt::format("Error in file formating. Last column in ",
-                    "file '{}' is not on UTC ISO8601 format", timeFile
+                LERROR(fmt::format(
+                    "Error in file formating. Last column in file '{}' is not on UTC "
+                    "ISO8601 format", timeFile
                 ));
             }
         }
diff --git a/modules/space/rendering/renderablerings.cpp b/modules/space/rendering/renderablerings.cpp
index 3d62abbf7e..54ff607863 100644
--- a/modules/space/rendering/renderablerings.cpp
+++ b/modules/space/rendering/renderablerings.cpp
@@ -246,7 +246,7 @@ void RenderableRings::loadTexture() {
         if (texture) {
             LDEBUGC(
                 "RenderableRings",
-                fmt::format("Loaded texture from {}", absPath(_texturePath))
+                fmt::format("Loaded texture from '{}'", absPath(_texturePath))
             );
             _texture = std::move(texture);
 
diff --git a/modules/space/rendering/renderablestars.cpp b/modules/space/rendering/renderablestars.cpp
index d0b5aa88c0..51297fa304 100644
--- a/modules/space/rendering/renderablestars.cpp
+++ b/modules/space/rendering/renderablestars.cpp
@@ -909,7 +909,7 @@ void RenderableStars::loadPSFTexture() {
 
         if (_pointSpreadFunctionTexture) {
             LDEBUG(fmt::format(
-                "Loaded texture from {}", absPath(_pointSpreadFunctionTexturePath)
+                "Loaded texture from '{}'", absPath(_pointSpreadFunctionTexturePath)
             ));
             _pointSpreadFunctionTexture->uploadTexture();
         }
@@ -1309,7 +1309,9 @@ void RenderableStars::update(const UpdateData&) {
                 1
             );
             if (_colorTexture) {
-                LDEBUG(fmt::format("Loaded texture from {}", absPath(_colorTexturePath)));
+                LDEBUG(fmt::format(
+                    "Loaded texture from '{}'", absPath(_colorTexturePath)
+                ));
                 _colorTexture->uploadTexture();
             }
 
@@ -1333,8 +1335,7 @@ void RenderableStars::update(const UpdateData&) {
             );
             if (_otherDataColorMapTexture) {
                 LDEBUG(fmt::format(
-                    "Loaded texture from {}",
-                    absPath(_otherDataColorMapPath)
+                    "Loaded texture from '{}'", absPath(_otherDataColorMapPath)
                 ));
                 _otherDataColorMapTexture->uploadTexture();
             }
diff --git a/modules/space/rotation/spicerotation.cpp b/modules/space/rotation/spicerotation.cpp
index 2d79142d54..308954107f 100644
--- a/modules/space/rotation/spicerotation.cpp
+++ b/modules/space/rotation/spicerotation.cpp
@@ -126,7 +126,6 @@ SpiceRotation::SpiceRotation(const ghoul::Dictionary& dictionary)
 
     _sourceFrame.onChange([this]() { requireUpdate(); });
     _destinationFrame.onChange([this]() { requireUpdate(); });
-
 }
 
 glm::dmat3 SpiceRotation::matrix(const UpdateData& data) const {
diff --git a/modules/space/translation/horizonstranslation.cpp b/modules/space/translation/horizonstranslation.cpp
index 3fb5c22624..bec5c261f3 100644
--- a/modules/space/translation/horizonstranslation.cpp
+++ b/modules/space/translation/horizonstranslation.cpp
@@ -210,7 +210,7 @@ bool HorizonsTranslation::loadCachedFile(const std::filesystem::path& file) {
     std::ifstream fileStream(file, std::ifstream::binary);
 
     if (!fileStream.good()) {
-        LERROR(fmt::format("Error opening file {} for loading cache file", file));
+        LERROR(fmt::format("Error opening file '{}' for loading cache file", file));
         return false;
     }
 
@@ -259,7 +259,7 @@ bool HorizonsTranslation::loadCachedFile(const std::filesystem::path& file) {
 void HorizonsTranslation::saveCachedFile(const std::filesystem::path& file) const {
     std::ofstream fileStream(file, std::ofstream::binary);
     if (!fileStream.good()) {
-        LERROR(fmt::format("Error opening file {} for save cache file", file));
+        LERROR(fmt::format("Error opening file '{}' for save cache file", file));
         return;
     }
 
diff --git a/modules/space/translation/spicetranslation.cpp b/modules/space/translation/spicetranslation.cpp
index 3fb249e786..5d1b7a4a84 100644
--- a/modules/space/translation/spicetranslation.cpp
+++ b/modules/space/translation/spicetranslation.cpp
@@ -107,21 +107,6 @@ SpiceTranslation::SpiceTranslation(const ghoul::Dictionary& dictionary)
 {
     const Parameters p = codegen::bake<Parameters>(dictionary);
 
-    auto loadKernel = [](const std::string& kernel) {
-        if (!std::filesystem::is_regular_file(kernel)) {
-            throw SpiceManager::SpiceException(fmt::format(
-                "Kernel '{}' does not exist", kernel
-            ));
-        }
-
-        try {
-            SpiceManager::ref().loadKernel(kernel);
-        }
-        catch (const SpiceManager::SpiceException& exception) {
-            LERRORC("SpiceEphemeris", exception.message);
-        }
-    };
-
     _target.onChange([this]() {
         _cachedTarget = _target;
         requireUpdate();
diff --git a/modules/spacecraftinstruments/util/hongkangparser.cpp b/modules/spacecraftinstruments/util/hongkangparser.cpp
index 9024f434cc..ff51404e1b 100644
--- a/modules/spacecraftinstruments/util/hongkangparser.cpp
+++ b/modules/spacecraftinstruments/util/hongkangparser.cpp
@@ -132,7 +132,7 @@ bool HongKangParser::create() {
     const bool hasObserver = SpiceManager::ref().hasNaifId(_spacecraft);
     if (!hasObserver) {
         throw ghoul::RuntimeError(
-            fmt::format("SPICE has no observer: '{}' in kernel pool", _spacecraft),
+            fmt::format("SPICE has no observer '{}' in kernel pool", _spacecraft),
             "HongKangParser"
         );
     }
diff --git a/modules/spacecraftinstruments/util/instrumenttimesparser.cpp b/modules/spacecraftinstruments/util/instrumenttimesparser.cpp
index 326f45a92d..6d9cd3e3a5 100644
--- a/modules/spacecraftinstruments/util/instrumenttimesparser.cpp
+++ b/modules/spacecraftinstruments/util/instrumenttimesparser.cpp
@@ -72,7 +72,7 @@ InstrumentTimesParser::InstrumentTimesParser(std::string name, std::string seque
 bool InstrumentTimesParser::create() {
     std::filesystem::path sequenceDir = absPath(_fileName);
     if (!std::filesystem::is_directory(sequenceDir)) {
-        LERROR(fmt::format("Could not load Label Directory {}", sequenceDir));
+        LERROR(fmt::format("Could not load label directory '{}'", sequenceDir));
         return false;
     }
 
@@ -84,7 +84,7 @@ bool InstrumentTimesParser::create() {
             std::filesystem::path filepath = sequenceDir / filename;
 
             if (!std::filesystem::is_regular_file(filepath)) {
-                LERROR(fmt::format("Unable to read file {}. Skipping file", filepath));
+                LERROR(fmt::format("Unable to read file '{}'. Skipping file", filepath));
                 continue;
             }
 
diff --git a/modules/spacecraftinstruments/util/labelparser.cpp b/modules/spacecraftinstruments/util/labelparser.cpp
index b374ecbee5..e3a8b853d9 100644
--- a/modules/spacecraftinstruments/util/labelparser.cpp
+++ b/modules/spacecraftinstruments/util/labelparser.cpp
@@ -136,7 +136,7 @@ std::string LabelParser::encode(const std::string& line) const {
 bool LabelParser::create() {
     std::filesystem::path sequenceDir = absPath(_fileName);
     if (!std::filesystem::is_directory(sequenceDir)) {
-        LERROR(fmt::format("Could not load Label Directory {}", sequenceDir));
+        LERROR(fmt::format("Could not load label directory '{}'", sequenceDir));
         return false;
     }
 
@@ -162,9 +162,7 @@ bool LabelParser::create() {
         std::ifstream file(path);
 
         if (!file.good()) {
-            LERROR(fmt::format(
-                "Failed to open label file {}", std::filesystem::path(path)
-            ));
+            LERROR(fmt::format("Failed to open label file '{}'", path));
             return false;
         }
 
@@ -248,7 +246,7 @@ bool LabelParser::create() {
                 }
                 else{
                     LERROR(fmt::format(
-                        "Label file {} deviates from generic standard", path
+                        "Label file '{}' deviates from generic standard", path
                     ));
                     LINFO(
                         "Please make sure input data adheres to format from \
diff --git a/modules/spacecraftinstruments/util/projectioncomponent.cpp b/modules/spacecraftinstruments/util/projectioncomponent.cpp
index 4945a52a48..4f9cf9e848 100644
--- a/modules/spacecraftinstruments/util/projectioncomponent.cpp
+++ b/modules/spacecraftinstruments/util/projectioncomponent.cpp
@@ -425,7 +425,7 @@ void ProjectionComponent::imageProjectBegin() {
 
     if (_textureSizeDirty) {
         glm::ivec2 size = _textureSize;
-        LDEBUG(fmt::format("Changing texture size to {}, {}", size.x, size.y));
+        LDEBUG(fmt::format("Changing texture size to ({}, {})", size.x, size.y));
 
         // If the texture size has changed, we have to allocate new memory and copy
         // the image texture to the new target
@@ -900,7 +900,7 @@ std::shared_ptr<ghoul::opengl::Texture> ProjectionComponent::loadProjectionTextu
 }
 
 bool ProjectionComponent::generateProjectionLayerTexture(const glm::ivec2& size) {
-    LINFO(fmt::format("Creating projection texture of size '{}, {}'", size.x, size.y));
+    LINFO(fmt::format("Creating projection texture of size ({}, {})", size.x, size.y));
 
     using namespace ghoul::opengl;
     _projectionTexture = std::make_unique<Texture>(
@@ -939,7 +939,7 @@ bool ProjectionComponent::generateProjectionLayerTexture(const glm::ivec2& size)
 }
 
 bool ProjectionComponent::generateDepthTexture(const glm::ivec2& size) {
-    LINFO(fmt::format("Creating depth texture of size '{}, {}'", size.x, size.y));
+    LINFO(fmt::format("Creating depth texture of size ({}, {})", size.x, size.y));
 
     _shadowing.texture = std::make_unique<ghoul::opengl::Texture>(
         glm::uvec3(size, 1),
diff --git a/modules/statemachine/src/statemachine.cpp b/modules/statemachine/src/statemachine.cpp
index 48046a7884..033d63c5d1 100644
--- a/modules/statemachine/src/statemachine.cpp
+++ b/modules/statemachine/src/statemachine.cpp
@@ -203,7 +203,7 @@ void StateMachine::saveToDotFile(const std::string& filename) const {
     std::ofstream file(outputFile);
     if (!file.good()) {
         LERROR(fmt::format(
-            "Error opening file {} for saving state machine dot file", outputFile
+            "Error opening file '{}' for saving state machine dot file", outputFile
         ));
         return;
     }
diff --git a/modules/statemachine/statemachinemodule_lua.inl b/modules/statemachine/statemachinemodule_lua.inl
index bbe0778d0c..0a583bad8e 100644
--- a/modules/statemachine/statemachinemodule_lua.inl
+++ b/modules/statemachine/statemachinemodule_lua.inl
@@ -111,11 +111,14 @@ namespace {
     if (module->hasStateMachine()) {
         std::string currentState = module->currentState();
         std::vector<std::string> transitions = module->possibleTransitions();
-        LINFOC("StateMachine", fmt::format(
-            "Currently in state: '{}'. Can transition to states: [ {} ]",
-            currentState,
-            ghoul::join(transitions, ",")
-        ));
+        LINFOC(
+            "StateMachine",
+            fmt::format(
+                "Currently in state: '{}'. Can transition to states: [ {} ]",
+                currentState,
+                ghoul::join(transitions, ",")
+            )
+        );
     }
     else {
         LINFOC("StateMachine", "No state machine has been created");
diff --git a/modules/sync/syncs/httpsynchronization.cpp b/modules/sync/syncs/httpsynchronization.cpp
index 6c4c493d91..6153bc7f04 100644
--- a/modules/sync/syncs/httpsynchronization.cpp
+++ b/modules/sync/syncs/httpsynchronization.cpp
@@ -372,7 +372,7 @@ HttpSynchronization::trySyncFromUrl(std::string listUrl) {
     for (const std::unique_ptr<HttpFileDownload>& d : downloads) {
         d->wait();
         if (!d->hasSucceeded()) {
-            LERROR(fmt::format("Error downloading file from URL {}", d->url()));
+            LERROR(fmt::format("Error downloading file from URL '{}'", d->url()));
             failed = true;
             continue;
         }
@@ -391,7 +391,7 @@ HttpSynchronization::trySyncFromUrl(std::string listUrl) {
         std::error_code ec;
         std::filesystem::rename(tempName, originalName, ec);
         if (ec) {
-            LERROR(fmt::format("Error renaming {} to {}", tempName, originalName));
+            LERROR(fmt::format("Error renaming '{}' to '{}'", tempName, originalName));
             failed = true;
         }
 
@@ -408,14 +408,14 @@ HttpSynchronization::trySyncFromUrl(std::string listUrl) {
 
             if (is64) {
                 LERROR(fmt::format(
-                    "Error while unzipping {}: Zip64 archives are not supported", source
+                    "Error while unzipping '{}': Zip64 archives are not supported", source
                 ));
                 continue;
             }
 
             int ret = zip_extract(source.c_str(), dest.c_str(), nullptr, nullptr);
             if (ret != 0) {
-                LERROR(fmt::format("Error {} while unzipping {}", ret, source));
+                LERROR(fmt::format("Error '{}' while unzipping '{}'", ret, source));
                 continue;
             }
 
diff --git a/modules/sync/syncs/urlsynchronization.cpp b/modules/sync/syncs/urlsynchronization.cpp
index c919736fa2..8c38ade41d 100644
--- a/modules/sync/syncs/urlsynchronization.cpp
+++ b/modules/sync/syncs/urlsynchronization.cpp
@@ -234,9 +234,7 @@ bool UrlSynchronization::isEachFileValid() {
                 "{}: File is valid to {} but asset specifies SecondsUntilResync = {} "
                 "Did you mean to re-download the file? If so, remove file from sync "
                 "folder to resync",
-                _identifier,
-                fileIsValidToDate,
-                _secondsUntilResync
+                _identifier, fileIsValidToDate, _secondsUntilResync
             ));
         }
 
@@ -313,7 +311,7 @@ bool UrlSynchronization::trySyncUrls() {
         std::filesystem::path destination = directory() / (_filename + ".tmp");
 
         if (sizeData.find(url) != sizeData.end()) {
-            LWARNING(fmt::format("{}: Duplicate entry for {}", _identifier, url));
+            LWARNING(fmt::format("{}: Duplicate entry for '{}'", _identifier, url));
             continue;
         }
 
@@ -362,7 +360,7 @@ bool UrlSynchronization::trySyncUrls() {
         d->wait();
         if (!d->hasSucceeded()) {
             failed = true;
-            LERROR(fmt::format("Error downloading file from URL {}", d->url()));
+            LERROR(fmt::format("Error downloading file from URL: {}", d->url()));
             continue;
         }
 
@@ -383,7 +381,7 @@ bool UrlSynchronization::trySyncUrls() {
         if (ec) {
             LERRORC(
                 "URLSynchronization",
-                fmt::format("Error renaming file {} to {}", tempName, originalName)
+                fmt::format("Error renaming file '{}' to '{}'", tempName, originalName)
             );
 
             failed = true;
diff --git a/modules/video/src/videoplayer.cpp b/modules/video/src/videoplayer.cpp
index 199864d63c..00715d24d2 100644
--- a/modules/video/src/videoplayer.cpp
+++ b/modules/video/src/videoplayer.cpp
@@ -166,7 +166,7 @@ void VideoPlayer::observePropertyMpv(MpvKey key) {
 void VideoPlayer::setPropertyStringMpv(const char* name, const char* value) {
     int result = mpv_set_property_string(_mpvHandle, name, value);
     if (!checkMpvError(result)) {
-        LWARNING(fmt::format("Error setting property {}", name));
+        LWARNING(fmt::format("Error setting property '{}'", name));
     }
 }
 
@@ -226,7 +226,7 @@ void VideoPlayer::getPropertyAsyncMpv(MpvKey key) {
         formats[key]
     );
     if (!checkMpvError(result)) {
-        LWARNING(fmt::format("Could not find property {}", keys[key]));
+        LWARNING(fmt::format("Could not find property '{}'", keys[key]));
         return;
     }
 }
@@ -238,7 +238,7 @@ void VideoPlayer::commandAsyncMpv(const char* cmd[], MpvKey key) {
         cmd
     );
     if (!checkMpvError(result)) {
-        LERROR(fmt::format("Could not execute command {}", keys[key]));
+        LERROR(fmt::format("Could not execute command '{}'", keys[key]));
         return;
     }
 }
@@ -608,7 +608,7 @@ void VideoPlayer::handleMpvEvents() {
                 // Validate reply with what we have stored
                 MpvKey key = static_cast<MpvKey>(event->reply_userdata);
                 if (formats[key] != prop->format) {
-                    LINFO(fmt::format("Wrong format for property {}", keys[key]));
+                    LINFO(fmt::format("Wrong format for property '{}'", keys[key]));
                     break;
                 }
                 getPropertyAsyncMpv(key);
@@ -647,7 +647,7 @@ void VideoPlayer::handleMpvProperties(mpv_event* event) {
         int result = mpv_event_to_node(&node, event);
         if (!checkMpvError(result)) {
             LWARNING(
-                fmt::format("Error getting data from libmpv property {}", keys[key])
+                fmt::format("Error getting data from libmpv property: {}", keys[key])
             );
         }
     }
diff --git a/modules/vislab/rendering/renderabledistancelabel.cpp b/modules/vislab/rendering/renderabledistancelabel.cpp
index bb056ed192..7ac3e98bc9 100644
--- a/modules/vislab/rendering/renderabledistancelabel.cpp
+++ b/modules/vislab/rendering/renderabledistancelabel.cpp
@@ -149,7 +149,7 @@ void RenderableDistanceLabel::update(const UpdateData&) {
         }
         else {
             LERROR(fmt::format(
-                "Could not find scene graph node {} or {}",
+                "Could not find scene graph node '{}' or '{}'",
                 nodeline->start(), nodeline->end()
             ));
         }
diff --git a/modules/volume/rawvolumewriter.inl b/modules/volume/rawvolumewriter.inl
index bb13a83897..7b8c5091da 100644
--- a/modules/volume/rawvolumewriter.inl
+++ b/modules/volume/rawvolumewriter.inl
@@ -100,7 +100,7 @@ void RawVolumeWriter<VoxelType>::write(const RawVolume<VoxelType>& volume) {
     std::ofstream file(_path, std::ios::binary);
 
     if (!file.good()) {
-        throw ghoul::RuntimeError(fmt::format("Could not create file {}", _path));
+        throw ghoul::RuntimeError(fmt::format("Could not create file '{}'", _path));
     }
 
     file.write(buffer, length);
diff --git a/modules/volume/rendering/renderabletimevaryingvolume.cpp b/modules/volume/rendering/renderabletimevaryingvolume.cpp
index d0265032d1..e16b7badda 100644
--- a/modules/volume/rendering/renderabletimevaryingvolume.cpp
+++ b/modules/volume/rendering/renderabletimevaryingvolume.cpp
@@ -232,7 +232,7 @@ void RenderableTimeVaryingVolume::initializeGL() {
     std::filesystem::path sequenceDir = absPath(_sourceDirectory);
 
     if (!std::filesystem::is_directory(sequenceDir)) {
-        LERROR(fmt::format("Could not load sequence directory {}", sequenceDir));
+        LERROR(fmt::format("Could not load sequence directory '{}'", sequenceDir));
         return;
     }
 
diff --git a/modules/volume/tasks/generaterawvolumetask.cpp b/modules/volume/tasks/generaterawvolumetask.cpp
index 5978b7de58..ee6078e4f3 100644
--- a/modules/volume/tasks/generaterawvolumetask.cpp
+++ b/modules/volume/tasks/generaterawvolumetask.cpp
@@ -91,8 +91,8 @@ std::string GenerateRawVolumeTask::description() {
     return fmt::format(
         "Generate a raw volume with dimenstions: ({}, {}, {}). For each cell, set the "
         "value by evaluating the lua function: `{}`, with three arguments (x, y, z) "
-        "ranging from ({}, {}, {}) to ({}, {}, {}). Write raw volume data into {} and "
-        "dictionary with metadata to {}",
+        "ranging from ({}, {}, {}) to ({}, {}, {}). Write raw volume data into '{}' and "
+        "dictionary with metadata to '{}'",
         _dimensions.x, _dimensions.y, _dimensions.z, _valueFunctionLua,
         _lowerDomainBound.x, _lowerDomainBound.y, _lowerDomainBound.z,
         _upperDomainBound.x, _upperDomainBound.y, _upperDomainBound.z,
diff --git a/modules/webbrowser/src/browserinstance.cpp b/modules/webbrowser/src/browserinstance.cpp
index 33da63a9da..30a4ca2925 100644
--- a/modules/webbrowser/src/browserinstance.cpp
+++ b/modules/webbrowser/src/browserinstance.cpp
@@ -90,7 +90,7 @@ void BrowserInstance::loadUrl(std::string url) {
     ghoul_assert(_isInitialized, "BrowserInstance should be initialized");
 
     if (!url.empty()) {
-        LDEBUG(fmt::format("Loading URL: {}", url));
+        LDEBUG(fmt::format("Loading URL '{}'", url));
         CefString cefUrl = std::move(url);
         _browser->GetMainFrame()->LoadURL(cefUrl);
     }
diff --git a/modules/webbrowser/webbrowsermodule.cpp b/modules/webbrowser/webbrowsermodule.cpp
index 3a4675cbd3..bbbbf89f34 100644
--- a/modules/webbrowser/webbrowsermodule.cpp
+++ b/modules/webbrowser/webbrowsermodule.cpp
@@ -123,7 +123,7 @@ std::filesystem::path WebBrowserModule::findHelperExecutable() {
     std::filesystem::path execLocation = absPath("${BIN}/" + std::string(SubprocessPath));
     if (!std::filesystem::is_regular_file(execLocation)) {
         LERROR(fmt::format(
-            "Could not find web helper executable at location: {}" , execLocation
+            "Could not find web helper executable at location: {}", execLocation
         ));
     }
     return execLocation;
diff --git a/src/data/csvloader.cpp b/src/data/csvloader.cpp
index 19e8600d40..538a71e419 100644
--- a/src/data/csvloader.cpp
+++ b/src/data/csvloader.cpp
@@ -79,7 +79,7 @@ Dataset loadCsvFile(std::filesystem::path filePath, std::optional<DataMapping> s
 
     if (rows.size() < 2) {
         LWARNING(fmt::format(
-            "Error loading data file {}. No data items read", filePath
+            "Error loading data file '{}'. No data items read", filePath
         ));
         return Dataset();
     }
@@ -135,13 +135,11 @@ Dataset loadCsvFile(std::filesystem::path filePath, std::optional<DataMapping> s
     if (xColumn < 0 || yColumn < 0 || zColumn < 0) {
         // One or more position columns weren't read
         LERROR(fmt::format(
-            "Error loading data file {}. Missing X, Y or Z position column", filePath
+            "Error loading data file '{}'. Missing X, Y or Z position column", filePath
         ));
     }
 
-    LINFO(fmt::format(
-        "Loading {} rows with {} columns", rows.size(), columns.size()
-    ));
+    LINFO(fmt::format("Loading {} rows with {} columns", rows.size(), columns.size()));
     ProgressBar progress = ProgressBar(static_cast<int>(rows.size()));
 
     // Skip first row (column names)
diff --git a/src/data/dataloader.cpp b/src/data/dataloader.cpp
index 7234aaa613..8c55bc97c0 100644
--- a/src/data/dataloader.cpp
+++ b/src/data/dataloader.cpp
@@ -47,7 +47,7 @@ namespace {
     template <typename T, typename U>
     void checkSize(U value, std::string_view message) {
         if (value > std::numeric_limits<U>::max()) {
-            throw ghoul::RuntimeError(fmt::format("Error saving file: {}", message));
+            throw ghoul::RuntimeError(fmt::format("Error saving file '{}'", message));
         }
     }
 
@@ -99,7 +99,7 @@ namespace {
                 FileSys.cacheManager()->removeCacheFile(cached);
             }
         }
-        LINFOC("DataLoader", fmt::format("Loading file {}", filePath));
+        LINFOC("DataLoader", fmt::format("Loading file '{}'", filePath));
         T dataset = loadFunction(filePath, specs);
 
         if (!dataset.entries.empty()) {
@@ -120,7 +120,7 @@ Dataset loadFile(std::filesystem::path path, std::optional<DataMapping> specs) {
 
     std::ifstream file(path);
     if (!file.good()) {
-        throw ghoul::RuntimeError(fmt::format("Failed to open data file {}", path));
+        throw ghoul::RuntimeError(fmt::format("Failed to open data file '{}'", path));
     }
 
     std::string extension = ghoul::toLowerCase(path.extension().string());
@@ -134,7 +134,7 @@ Dataset loadFile(std::filesystem::path path, std::optional<DataMapping> specs) {
     }
     else {
         LERRORC("DataLoader", fmt::format(
-            "Could not read data file {}. File format {} is not supported",
+            "Could not read data file '{}'. File format '{}' is not supported",
             path, path.extension()
         ));
     }
@@ -351,7 +351,7 @@ Labelset loadFile(std::filesystem::path path, std::optional<DataMapping>) {
 
     std::ifstream file(path);
     if (!file.good()) {
-        throw ghoul::RuntimeError(fmt::format("Failed to open dataset file {}", path));
+        throw ghoul::RuntimeError(fmt::format("Failed to open dataset file '{}'", path));
     }
 
     std::string extension = ghoul::toLowerCase(path.extension().string());
@@ -362,7 +362,7 @@ Labelset loadFile(std::filesystem::path path, std::optional<DataMapping>) {
     }
     else {
         LERRORC("DataLoader", fmt::format(
-            "Could not read label data file {}. File format {} is not supported",
+            "Could not read label data file '{}'. File format '{}' is not supported",
             path, path.extension()
         ));
     }
@@ -487,7 +487,7 @@ ColorMap loadFile(std::filesystem::path path, std::optional<DataMapping>) {
 
     std::ifstream file(path);
     if (!file.good()) {
-        throw ghoul::RuntimeError(fmt::format("Failed to open colormap file {}", path));
+        throw ghoul::RuntimeError(fmt::format("Failed to open colormap file '{}'", path));
     }
 
     std::string extension = ghoul::toLowerCase(path.extension().string());
@@ -498,7 +498,7 @@ ColorMap loadFile(std::filesystem::path path, std::optional<DataMapping>) {
     }
     else {
         LERRORC("DataLoader", fmt::format(
-            "Could not read color map file {}. File format {} is not supported",
+            "Could not read color map file '{}'. File format '{}' is not supported",
             path, path.extension()
         ));
     }
diff --git a/src/data/speckloader.cpp b/src/data/speckloader.cpp
index dbe254135c..cf5180aa34 100644
--- a/src/data/speckloader.cpp
+++ b/src/data/speckloader.cpp
@@ -76,7 +76,7 @@ Dataset loadSpeckFile(std::filesystem::path path, std::optional<DataMapping> spe
 
     std::ifstream file(path);
     if (!file.good()) {
-        throw ghoul::RuntimeError(fmt::format("Failed to open speck file {}", path));
+        throw ghoul::RuntimeError(fmt::format("Failed to open speck file '{}'", path));
     }
 
     Dataset res;
@@ -130,7 +130,7 @@ Dataset loadSpeckFile(std::filesystem::path path, std::optional<DataMapping> spe
             // where <idx> is the data value index where the texture index is stored
             if (res.textureDataIndex != -1) {
                 throw ghoul::RuntimeError(fmt::format(
-                    "Error loading speck file {}: Texturevar defined twice", path
+                    "Error loading speck file '{}': Texturevar defined twice", path
                 ));
             }
 
@@ -149,7 +149,7 @@ Dataset loadSpeckFile(std::filesystem::path path, std::optional<DataMapping> spe
 
             if (res.orientationDataIndex != -1) {
                 throw ghoul::RuntimeError(fmt::format(
-                    "Error loading speck file {}: Orientation index defined twice", path
+                    "Error loading speck file '{}': Orientation index defined twice", path
                 ));
             }
 
@@ -191,7 +191,7 @@ Dataset loadSpeckFile(std::filesystem::path path, std::optional<DataMapping> spe
             for (const Dataset::Texture& t : res.textures) {
                 if (t.index == texture.index) {
                     throw ghoul::RuntimeError(fmt::format(
-                        "Error loading speck file {}: Texture index '{}' defined twice",
+                        "Error loading speck file '{}': Texture index '{}' defined twice",
                         path, texture.index
                     ));
                 }
@@ -210,7 +210,7 @@ Dataset loadSpeckFile(std::filesystem::path path, std::optional<DataMapping> spe
         // didn't start with either '#' denoting a comment line, and didn't start with
         // either the 'datavar', 'texturevar', 'polyorivar', or 'texture' keywords
         throw ghoul::RuntimeError(fmt::format(
-            "Error in line {} while reading the header information of file {}. Line is "
+            "Error in line {} while reading the header information of file '{}'. Line is "
             "neither a comment line, nor starts with one of the supported keywords for "
             "SPECK files",
             currentLineNumber, path
@@ -259,7 +259,7 @@ Dataset loadSpeckFile(std::filesystem::path path, std::optional<DataMapping> spe
         // data section of the file
         if (!std::isdigit(line[0]) && line[0] != '-') {
             throw ghoul::RuntimeError(fmt::format(
-                "Error loading speck file {}: Header information and datasegment "
+                "Error loading speck file '{}': Header information and datasegment "
                 "intermixed", path
             ));
         }
@@ -283,7 +283,7 @@ Dataset loadSpeckFile(std::filesystem::path path, std::optional<DataMapping> spe
             // Need to subtract one of the line number here as we increase the current
             // line count in the beginning of the while loop we are currently in
             throw ghoul::RuntimeError(fmt::format(
-                "Error loading position information out of data line {} in file {}. "
+                "Error loading position information out of data line {} in file '{}'. "
                 "Value was not a number",
                 currentLineNumber - 1, path
             ));
@@ -317,7 +317,7 @@ Dataset loadSpeckFile(std::filesystem::path path, std::optional<DataMapping> spe
                     // current line count in the beginning of the while loop we are
                     // currently in
                     throw ghoul::RuntimeError(fmt::format(
-                        "Error loading data value {} out of data line {} in file {}. "
+                        "Error loading data value {} out of data line {} in file '{}'. "
                         "Value was not a number",
                         i, currentLineNumber - 1, path
                     ));
@@ -361,7 +361,7 @@ Labelset loadLabelFile(std::filesystem::path path) {
 
     std::ifstream file(path);
     if (!file.good()) {
-        throw ghoul::RuntimeError(fmt::format("Failed to open dataset file {}", path));
+        throw ghoul::RuntimeError(fmt::format("Failed to open dataset file '{}'", path));
     }
 
     Labelset res;
@@ -396,7 +396,7 @@ Labelset loadLabelFile(std::filesystem::path path) {
             // included in the speck file)
             if (res.textColorIndex != -1) {
                 throw ghoul::RuntimeError(fmt::format(
-                    "Error loading label file {}: Textcolor defined twice", path
+                    "Error loading label file '{}': Textcolor defined twice", path
                 ));
             }
 
@@ -434,7 +434,7 @@ Labelset loadLabelFile(std::filesystem::path path) {
         // data section of the file
         if (!std::isdigit(line[0]) && line[0] != '-') {
             throw ghoul::RuntimeError(fmt::format(
-                "Error loading label file {}: Header information and datasegment "
+                "Error loading label file '{}': Header information and datasegment "
                 "intermixed", path
             ));
         }
@@ -463,7 +463,7 @@ Labelset loadLabelFile(std::filesystem::path path) {
         }
         if (!startsWith(rest, "text")) {
             throw ghoul::RuntimeError(fmt::format(
-                "Error loading label file {}: File contains an unsupported value "
+                "Error loading label file '{}': File contains an unsupported value "
                 "between positions and text label", path
             ));
         }
@@ -495,7 +495,9 @@ ColorMap loadCmapFile(std::filesystem::path path) {
 
     std::ifstream file(path);
     if (!file.good()) {
-        throw ghoul::RuntimeError(fmt::format("Failed to open color map file {}", path));
+        throw ghoul::RuntimeError(fmt::format(
+            "Failed to open color map file '{}'", path
+        ));
     }
 
     ColorMap res;
diff --git a/src/engine/downloadmanager.cpp b/src/engine/downloadmanager.cpp
index 199688c40f..db3b36867f 100644
--- a/src/engine/downloadmanager.cpp
+++ b/src/engine/downloadmanager.cpp
@@ -227,7 +227,7 @@ std::future<DownloadManager::MemoryFile> DownloadManager::fetchFile(
                                                           SuccessCallback successCallback,
                                                               ErrorCallback errorCallback)
 {
-    LDEBUG(fmt::format("Start downloading file: '{}' into memory", url));
+    LDEBUG(fmt::format("Start downloading file '{}' into memory", url));
 
     auto downloadFunction = [url, successCb = std::move(successCallback),
                              errorCb = std::move(errorCallback)]()
diff --git a/src/engine/openspaceengine.cpp b/src/engine/openspaceengine.cpp
index 39954093d1..f0d44b83be 100644
--- a/src/engine/openspaceengine.cpp
+++ b/src/engine/openspaceengine.cpp
@@ -230,7 +230,7 @@ void OpenSpaceEngine::registerPathTokens() {
     using T = std::string;
     for (const std::pair<const T, T>& path : global::configuration->pathTokens) {
         std::string fullKey = "${" + path.first + "}";
-        LDEBUG(fmt::format("Registering path '{}': '{}'", fullKey, path.second));
+        LDEBUG(fmt::format("Registering path '{}': {}", fullKey, path.second));
 
         const bool overrideBase = (fullKey == "${BASE}");
         if (overrideBase) {
@@ -502,9 +502,9 @@ void OpenSpaceEngine::initializeGL() {
             for (const std::string& ext : m->requiredOpenGLExtensions()) {
                 if (!SysCap.component<OCC>().isExtensionSupported(ext)) {
                     LFATAL(fmt::format(
-                        "Module {} required OpenGL extension {} which is not available "
-                        "on this system. Some functionality related to this module will "
-                        "probably not work",
+                        "Module '{}' required OpenGL extension '{}' which is not "
+                        "available on this system. Some functionality related to this "
+                        "module will probably not work",
                         m->guiName(), ext
                     ));
                 }
@@ -639,27 +639,27 @@ void OpenSpaceEngine::initializeGL() {
                 case GL_INVALID_ENUM:
                     LERRORC(
                         "OpenGL Invalid State",
-                        fmt::format("Function {}: GL_INVALID_ENUM", f.function->name())
+                        fmt::format("Function '{}': GL_INVALID_ENUM", f.function->name())
                     );
                     break;
                 case GL_INVALID_VALUE:
                     LERRORC(
                         "OpenGL Invalid State",
-                        fmt::format("Function {}: GL_INVALID_VALUE", f.function->name())
+                        fmt::format("Function '{}': GL_INVALID_VALUE", f.function->name())
                     );
                     break;
                 case GL_INVALID_OPERATION:
                     LERRORC(
                         "OpenGL Invalid State",
                         fmt::format(
-                            "Function {}: GL_INVALID_OPERATION", f.function->name()
+                            "Function '{}': GL_INVALID_OPERATION", f.function->name()
                         ));
                     break;
                 case GL_INVALID_FRAMEBUFFER_OPERATION:
                     LERRORC(
                         "OpenGL Invalid State",
                         fmt::format(
-                            "Function {}: GL_INVALID_FRAMEBUFFER_OPERATION",
+                            "Function '{}': GL_INVALID_FRAMEBUFFER_OPERATION",
                             f.function->name()
                         )
                     );
@@ -667,7 +667,7 @@ void OpenSpaceEngine::initializeGL() {
                 case GL_OUT_OF_MEMORY:
                     LERRORC(
                         "OpenGL Invalid State",
-                        fmt::format("Function {}: GL_OUT_OF_MEMORY", f.function->name())
+                        fmt::format("Function '{}': GL_OUT_OF_MEMORY", f.function->name())
                     );
                     break;
                 default:
@@ -924,15 +924,17 @@ void OpenSpaceEngine::loadFonts() {
         std::filesystem::path fontName = absPath(font.second);
 
         if (!std::filesystem::is_regular_file(fontName)) {
-            LERROR(fmt::format("Could not find font {} for key '{}'", fontName, key));
+            LERROR(fmt::format("Could not find font '{}' for key '{}'", fontName, key));
             continue;
         }
 
-        LDEBUG(fmt::format("Registering font {} with key '{}'", fontName, key));
+        LDEBUG(fmt::format("Registering font '{}' with key '{}'", fontName, key));
         bool success = global::fontManager->registerFontPath(key, fontName);
 
         if (!success) {
-            LERROR(fmt::format("Error registering font {} with key '{}'", fontName, key));
+            LERROR(fmt::format(
+                "Error registering font '{}' with key '{}'", fontName, key
+            ));
         }
     }
 
@@ -1518,7 +1520,7 @@ bool OpenSpaceEngine::setMode(Mode newMode) {
 
 void OpenSpaceEngine::resetMode() {
     _currentMode = Mode::UserControl;
-    LDEBUG(fmt::format("Reset engine mode to {}", stringify(_currentMode)));
+    LDEBUG(fmt::format("Reset engine mode to '{}'", stringify(_currentMode)));
 }
 
 OpenSpaceEngine::CallbackHandle OpenSpaceEngine::addModeChangeCallback(
@@ -1702,7 +1704,7 @@ void setActionsFromProfile(const Profile& p) {
         }
         if (a.script.empty()) {
             LERROR(fmt::format(
-                "Identifier '{}' doesn't provide a Lua command to execute", a.identifier
+                "Identifier '{}' does not provide a Lua command to execute", a.identifier
             ));
         }
         interaction::Action action;
diff --git a/src/engine/openspaceengine_lua.inl b/src/engine/openspaceengine_lua.inl
index 4cb9164e0d..d1aafdb5a6 100644
--- a/src/engine/openspaceengine_lua.inl
+++ b/src/engine/openspaceengine_lua.inl
@@ -90,7 +90,7 @@ namespace {
 {
     using namespace openspace;
 
-    LINFOC("OpenSpaceEngine", fmt::format("Downloading file from {}", url));
+    LINFOC("OpenSpaceEngine", fmt::format("Downloading file from '{}'", url));
     std::shared_ptr<DownloadManager::FileFuture> future =
         global::downloadManager->downloadFile(
             url,
@@ -103,7 +103,7 @@ namespace {
     if (waitForCompletion) {
         while (!future->isFinished && future->errorMessage.empty()) {
             // just wait
-            LTRACEC("OpenSpaceEngine", fmt::format("waiting {}", future->errorMessage));
+            LTRACEC("OpenSpaceEngine", fmt::format("waiting '{}'", future->errorMessage));
         }
     }
 }
@@ -220,7 +220,7 @@ namespace {
                                                             bool includeFirstLine = false)
 {
     if (!std::filesystem::exists(file) || !std::filesystem::is_regular_file(file)) {
-        throw ghoul::lua::LuaError(fmt::format("Could not find file {}", file));
+        throw ghoul::lua::LuaError(fmt::format("Could not find file '{}'", file));
     }
 
     std::vector<std::vector<std::string>> res =
@@ -258,7 +258,7 @@ namespace {
  */
 [[codegen::luawrap]] ghoul::Dictionary loadJson(std::filesystem::path path) {
     if (!std::filesystem::exists(path)) {
-        throw ghoul::RuntimeError(fmt::format("File {} did not exist", path));
+        throw ghoul::RuntimeError(fmt::format("File '{}' did not exist", path));
     }
 
     std::ifstream f(path);
diff --git a/src/engine/settings.cpp b/src/engine/settings.cpp
index 90feb2bf1f..111c54a8a1 100644
--- a/src/engine/settings.cpp
+++ b/src/engine/settings.cpp
@@ -69,7 +69,7 @@ namespace version1 {
             }
             else {
                 throw ghoul::RuntimeError(fmt::format(
-                    "Unknown visibility value {}", *visibility
+                    "Unknown visibility value '{}'", *visibility
                 ));
             }
         }
diff --git a/src/events/eventengine.cpp b/src/events/eventengine.cpp
index 4a5ea3589f..d52842b6ed 100644
--- a/src/events/eventengine.cpp
+++ b/src/events/eventengine.cpp
@@ -125,7 +125,7 @@ void EventEngine::unregisterEventAction(uint32_t identifier) {
 
     // If we get this far, we haven't found the identifier
     throw ghoul::RuntimeError(fmt::format(
-        "Could not find event with identifier {}", identifier
+        "Could not find event with identifier '{}'", identifier
     ));
 }
 
diff --git a/src/interaction/joystickcamerastates.cpp b/src/interaction/joystickcamerastates.cpp
index 2f4694d35c..b8d34f2278 100644
--- a/src/interaction/joystickcamerastates.cpp
+++ b/src/interaction/joystickcamerastates.cpp
@@ -436,8 +436,10 @@ JoystickCameraStates::findOrAddJoystickCameraState(const std::string& joystickNa
             joystick->joystickName = joystickName;
         }
         else {
-            LWARNING(fmt::format("Cannot add more joysticks, only {} joysticks are "
-                "supported", JoystickInputStates::MaxNumJoysticks));
+            LWARNING(fmt::format(
+                "Cannot add more joysticks, only {} joysticks are supported",
+                JoystickInputStates::MaxNumJoysticks
+            ));
             return nullptr;
         }
     }
diff --git a/src/interaction/sessionrecording.cpp b/src/interaction/sessionrecording.cpp
index 9cb631505c..057eae02c7 100644
--- a/src/interaction/sessionrecording.cpp
+++ b/src/interaction/sessionrecording.cpp
@@ -185,7 +185,7 @@ bool SessionRecording::handleRecordingFile(std::string filenameIn) {
 
     if (std::filesystem::is_regular_file(absFilename)) {
         LERROR(fmt::format(
-            "Unable to start recording; file {} already exists", absFilename
+            "Unable to start recording; file '{}' already exists", absFilename
         ));
         return false;
     }
@@ -197,7 +197,9 @@ bool SessionRecording::handleRecordingFile(std::string filenameIn) {
     }
 
     if (!_recordFile.is_open() || !_recordFile.good()) {
-        LERROR(fmt::format("Unable to open file {} for keyframe recording", absFilename));
+        LERROR(fmt::format(
+            "Unable to open file '{}' for keyframe recording", absFilename
+        ));
         return false;
     }
     return true;
@@ -426,7 +428,7 @@ bool SessionRecording::startPlayback(std::string& filename,
 
     if (!_playbackFile.is_open() || !_playbackFile.good()) {
         LERROR(fmt::format(
-            "Unable to open file {} for keyframe playback", absFilename.c_str()
+            "Unable to open file '{}' for keyframe playback", absFilename.c_str()
         ));
         stopPlayback();
         cleanUpPlayback();
@@ -1084,7 +1086,7 @@ bool SessionRecording::playbackAddEntriesToTimeline() {
             // Check if have reached EOF
             if (!_playbackFile) {
                 LINFO(fmt::format(
-                    "Finished parsing {} entries from playback file {}",
+                    "Finished parsing {} entries from playback file '{}'",
                     _playbackLineNum - 1, _playbackFilename
                 ));
                 break;
@@ -1100,7 +1102,7 @@ bool SessionRecording::playbackAddEntriesToTimeline() {
             }
             else {
                 LERROR(fmt::format(
-                    "Unknown frame type {} @ index {} of playback file {}",
+                    "Unknown frame type {} @ index {} of playback file '{}'",
                     frameType, _playbackLineNum - 1, _playbackFilename
                 ));
                 parsingStatusOk = false;
@@ -1118,7 +1120,7 @@ bool SessionRecording::playbackAddEntriesToTimeline() {
             std::string entryType;
             if (!(iss >> entryType)) {
                 LERROR(fmt::format(
-                    "Error reading entry type @ line {} of playback file {}",
+                    "Error reading entry type @ line {} of playback file '{}'",
                     _playbackLineNum, _playbackFilename
                 ));
                 break;
@@ -1138,7 +1140,7 @@ bool SessionRecording::playbackAddEntriesToTimeline() {
             }
             else {
                 LERROR(fmt::format(
-                    "Unknown frame type {} @ line {} of playback file {}",
+                    "Unknown frame type {} @ line {} of playback file '{}'",
                     entryType, _playbackLineNum, _playbackFilename
                 ));
                 parsingStatusOk = false;
@@ -1146,7 +1148,7 @@ bool SessionRecording::playbackAddEntriesToTimeline() {
             }
         }
         LINFO(fmt::format(
-            "Finished parsing {} entries from playback file {}",
+            "Finished parsing {} entries from playback file '{}'",
             _playbackLineNum, _playbackFilename
         ));
     }
@@ -1567,8 +1569,8 @@ void SessionRecording::checkIfScriptUsesScenegraphNode(std::string s) {
                     std::find(_loadedNodes.begin(), _loadedNodes.end(), navNode);
                 if (it == _loadedNodes.end()) {
                     LWARNING(fmt::format(
-                        "Playback file contains a property setting of navigation using"
-                        " scenegraph node '{}', which is not currently loaded", navNode
+                        "Playback file contains a property setting of navigation using "
+                        "scenegraph node '{}', which is not currently loaded", navNode
                     ));
                 }
             }
@@ -1582,8 +1584,8 @@ void SessionRecording::checkIfScriptUsesScenegraphNode(std::string s) {
                     );
                 if (matchHits.empty()) {
                     LWARNING(fmt::format(
-                        "Playback file contains a property setting of scenegraph"
-                        " node '{}', which is not currently loaded", found
+                        "Playback file contains a property setting of scenegraph "
+                        "node '{}', which is not currently loaded", found
                     ));
                 }
             }
@@ -1780,14 +1782,11 @@ bool SessionRecording::readScriptKeyframeAscii(Timestamps& times,
     iss >> times.timeOs >> times.timeRec >> times.timeSim;
     kf.read(iss);
     if (iss.fail()) {
-        LERROR(fmt::format(
-            "Error parsing script line {} of playback file", lineN
-        ));
+        LERROR(fmt::format("Error parsing script line {} of playback file", lineN));
         return false;
-    } else if (!iss.eof()) {
-        LERROR(fmt::format(
-            "Did not find an EOL at line {} of playback file", lineN
-        ));
+    }
+    else if (!iss.eof()) {
+        LERROR(fmt::format("Did not find an EOL at line {} of playback file", lineN));
         return false;
     }
     return true;
@@ -2296,7 +2295,8 @@ void SessionRecording::readFileIntoStringStream(std::string filename,
     std::filesystem::path conversionInFilename = absPath(filename);
     if (!std::filesystem::is_regular_file(conversionInFilename)) {
         throw ConversionError(fmt::format(
-            "Cannot find the specified playback file {} to convert", conversionInFilename
+            "Cannot find the specified playback file '{}' to convert",
+            conversionInFilename
         ));
     }
 
@@ -2314,7 +2314,7 @@ void SessionRecording::readFileIntoStringStream(std::string filename,
     stream << inputFstream.rdbuf();
     if (!inputFstream.is_open() || !inputFstream.good()) {
         throw ConversionError(fmt::format(
-            "Unable to open file {} for conversion", filename.c_str()
+            "Unable to open file '{}' for conversion", filename
         ));
     }
     inputFstream.close();
@@ -2365,8 +2365,8 @@ std::string SessionRecording::convertFile(std::string filename, int depth) {
         if (depth != 0) {
             conversionOutFilename = determineConversionOutFilename(filename, mode);
             LINFO(fmt::format(
-                "Starting conversion on rec file {}, version {} in {} mode. "
-                "Writing result to {}",
+                "Starting conversion on rec file '{}', version {} in {} mode. "
+                "Writing result to '{}'",
                 newFilename, fileVersion, (mode == DataMode::Ascii) ? "ascii" : "binary",
                 conversionOutFilename
             ));
@@ -2379,8 +2379,8 @@ std::string SessionRecording::convertFile(std::string filename, int depth) {
             }
             if (!conversionOutFile.is_open() || !conversionOutFile.good()) {
                 LERROR(fmt::format(
-                    "Unable to open file {} for conversion result",
-                    conversionOutFilename.c_str()
+                    "Unable to open file '{}' for conversion result",
+                    conversionOutFilename
                 ));
                 return "";
             }
@@ -2432,7 +2432,7 @@ bool SessionRecording::convertEntries(std::string& inFilename,
             // Check if have reached EOF
             if (!inStream) {
                 LINFO(fmt::format(
-                    "Finished converting {} entries from playback file {}",
+                    "Finished converting {} entries from playback file '{}'",
                     lineNum - 1, inFilename
                 ));
                 break;
@@ -2475,7 +2475,7 @@ bool SessionRecording::convertEntries(std::string& inFilename,
             }
             else {
                 LERROR(fmt::format(
-                    "Unknown frame type {} @ index {} of conversion file {}",
+                    "Unknown frame type {} @ index {} of conversion file '{}'",
                     frameType, lineNum - 1, inFilename
                 ));
                 conversionStatusOk = false;
@@ -2491,7 +2491,7 @@ bool SessionRecording::convertEntries(std::string& inFilename,
             std::string entryType;
             if (!(iss >> entryType)) {
                 LERROR(fmt::format(
-                    "Error reading entry type @ line {} of conversion file {}",
+                    "Error reading entry type @ line {} of conversion file '{}'",
                     lineNum, inFilename
                 ));
                 break;
@@ -2538,14 +2538,14 @@ bool SessionRecording::convertEntries(std::string& inFilename,
             }
             else {
                 LERROR(fmt::format(
-                    "Unknown frame type {} @ line {} of conversion file {}",
+                    "Unknown frame type {} @ line {} of conversion file '{}'",
                     entryType, lineNum, inFilename
                 ));
                 conversionStatusOk = false;
             }
         }
         LINFO(fmt::format(
-            "Finished parsing {} entries from conversion file {}",
+            "Finished parsing {} entries from conversion file '{}'",
             lineNum, inFilename
         ));
     }
@@ -2564,7 +2564,7 @@ std::string SessionRecording_legacy_0085::getLegacyConversionResult(std::string
     // as the oldest supported legacy version.
     LERROR(fmt::format(
         "Version 00.85 is the oldest supported legacy file format; no conversion "
-        "can be made. It is possible that file {} has a corrupted header or an invalid "
+        "can be made. It is possible that file '{}' has a corrupted header or an invalid "
         "file format version number",
         filename
     ));
diff --git a/src/interaction/tasks/convertrecfileversiontask.cpp b/src/interaction/tasks/convertrecfileversiontask.cpp
index 0ecf27d203..d17a229217 100644
--- a/src/interaction/tasks/convertrecfileversiontask.cpp
+++ b/src/interaction/tasks/convertrecfileversiontask.cpp
@@ -69,7 +69,7 @@ ConvertRecFileVersionTask::~ConvertRecFileVersionTask() {
 
 std::string ConvertRecFileVersionTask::description() {
     std::string description = fmt::format(
-        "Convert file format of session recording file {} to current version",
+        "Convert file format of session recording file '{}' to current version",
         _inFilePath
     );
     return description;
@@ -90,7 +90,7 @@ void ConvertRecFileVersionTask::convert() {
     );
     if (!hasBinaryFileExtension && !hasAsciiFileExtension) {
         LERROR(fmt::format(
-            "Input filename does not have expected {} or {} extension",
+            "Input filename does not have expected '{}' or '{}' extension",
             SessionRecording::FileExtensionBinary, SessionRecording::FileExtensionAscii
         ));
         return;
diff --git a/src/interaction/tasks/convertrecformattask.cpp b/src/interaction/tasks/convertrecformattask.cpp
index b5a95c70a9..09323a4515 100644
--- a/src/interaction/tasks/convertrecformattask.cpp
+++ b/src/interaction/tasks/convertrecformattask.cpp
@@ -73,7 +73,7 @@ ConvertRecFormatTask::~ConvertRecFormatTask() {
 
 std::string ConvertRecFormatTask::description() {
     std::string description =
-        fmt::format("Convert session recording file {}", _inFilePath);
+        fmt::format("Convert session recording file '{}'", _inFilePath);
     if (_fileFormatType == SessionRecording::DataMode::Ascii) {
         description += "(ascii format) ";
     }
@@ -83,7 +83,7 @@ std::string ConvertRecFormatTask::description() {
     else {
         description += "(UNKNOWN format) ";
     }
-    description += fmt::format("conversion to file {}", _outFilePath);
+    description += fmt::format("conversion to file '{}'", _outFilePath);
     return description;
 }
 
@@ -107,12 +107,13 @@ void ConvertRecFormatTask::convert() {
 
     if (_inFilePath.extension() != expectedFileExtension_in) {
         LWARNING(fmt::format(
-            "Input filename doesn't have expected {} format file extension", currentFormat
+            "Input filename doesn't have expected '{}' format file extension",
+            currentFormat
         ));
     }
     if (_outFilePath.extension() == expectedFileExtension_in) {
         LERROR(fmt::format(
-            "Output filename has {} file extension, but is conversion from {}",
+            "Output filename has '{}' file extension, but is conversion from '{}'",
             currentFormat, currentFormat
         ));
         return;
@@ -162,7 +163,7 @@ void ConvertRecFormatTask::determineFormatType() {
         != SessionRecording::FileHeaderTitle)
     {
         LERROR(fmt::format(
-            "Session recording file {} does not have expected header", _inFilePath
+            "Session recording file '{}' does not have expected header", _inFilePath
         ));
     }
     else {
@@ -198,7 +199,7 @@ void ConvertRecFormatTask::convertToAscii() {
         // Check if have reached EOF
         if (!_iFile) {
             LINFO(fmt::format(
-                "Finished converting {} entries from file {}", lineNum - 1, _inFilePath
+                "Finished converting {} entries from file '{}'", lineNum - 1, _inFilePath
             ));
             fileReadOk = false;
             break;
@@ -227,7 +228,7 @@ void ConvertRecFormatTask::convertToAscii() {
         }
         else {
             LERROR(fmt::format(
-                "Unknown frame type @ index {} of playback file {}",
+                "Unknown frame type @ index {} of playback file '{}'",
                 lineNum - 1, _inFilePath
             ));
             break;
@@ -259,7 +260,7 @@ void ConvertRecFormatTask::convertToBinary() {
         std::string entryType;
         if (!(iss >> entryType)) {
             LERROR(fmt::format(
-                "Error reading entry type @ line {} of file {}", lineNum, _inFilePath
+                "Error reading entry type @ line {} of file '{}'", lineNum, _inFilePath
             ));
             break;
         }
@@ -284,7 +285,7 @@ void ConvertRecFormatTask::convertToBinary() {
         }
         else {
             LERROR(fmt::format(
-                "Unknown frame type {} @ line {} of file {}",
+                "Unknown frame type {} @ line {} of file '{}'",
                 entryType, lineContents, _inFilePath
             ));
             break;
@@ -292,7 +293,7 @@ void ConvertRecFormatTask::convertToBinary() {
     }
     _oFile.close();
     LINFO(fmt::format(
-        "Finished converting {} entries from file {}", lineNum, _inFilePath
+        "Finished converting {} entries from file '{}'", lineNum, _inFilePath
     ));
 }
 
diff --git a/src/navigation/navigationhandler.cpp b/src/navigation/navigationhandler.cpp
index de63360dfb..a45ceb3b27 100644
--- a/src/navigation/navigationhandler.cpp
+++ b/src/navigation/navigationhandler.cpp
@@ -567,7 +567,7 @@ void NavigationHandler::saveNavigationState(const std::filesystem::path& filepat
 
     if (!ofs.good()) {
         throw ghoul::RuntimeError(fmt::format(
-            "Error saving navigation state to {}", filepath
+            "Error saving navigation state to '{}'", filepath
         ));
     }
 
diff --git a/src/navigation/orbitalnavigator.cpp b/src/navigation/orbitalnavigator.cpp
index 268acbebd2..f8b75006de 100644
--- a/src/navigation/orbitalnavigator.cpp
+++ b/src/navigation/orbitalnavigator.cpp
@@ -534,7 +534,7 @@ OrbitalNavigator::OrbitalNavigator()
         }
         else {
             LERROR(fmt::format(
-                "No scenegraph node with identifier {} exists", _anchor.value()
+                "No scenegraph node with identifier '{}' exists", _anchor.value()
             ));
         }
     });
@@ -550,7 +550,7 @@ OrbitalNavigator::OrbitalNavigator()
         }
         else {
             LERROR(fmt::format(
-                "No scenegraph node with identifier {} exists", _aim.value()
+                "No scenegraph node with identifier '{}' exists", _aim.value()
             ));
         }
     });
diff --git a/src/network/parallelpeer.cpp b/src/network/parallelpeer.cpp
index a4c156eeaf..988ec47d1d 100644
--- a/src/network/parallelpeer.cpp
+++ b/src/network/parallelpeer.cpp
@@ -403,7 +403,8 @@ void ParallelPeer::dataMessageReceived(const std::vector<char>& message) {
         }
         default:
             LERROR(fmt::format(
-                "Unidentified message with identifier {} received in parallel connection",
+                "Unidentified message with identifier '{}' received in parallel "
+                "connection",
                 type
             ));
             break;
diff --git a/src/properties/scalar/intproperty.cpp b/src/properties/scalar/intproperty.cpp
index 9f40b17364..af10f72e5d 100644
--- a/src/properties/scalar/intproperty.cpp
+++ b/src/properties/scalar/intproperty.cpp
@@ -49,7 +49,7 @@ int IntProperty::fromLuaConversion(lua_State* state) const {
         return ghoul::lua::value<int>(state);
     }
     else {
-        throw ghoul::RuntimeError(fmt::format("Error extracting value in IntProperty"));
+        throw ghoul::RuntimeError("Error extracting value in IntProperty");
     }
 }
 
diff --git a/src/properties/scalar/uintproperty.cpp b/src/properties/scalar/uintproperty.cpp
index e46c829520..03b454604c 100644
--- a/src/properties/scalar/uintproperty.cpp
+++ b/src/properties/scalar/uintproperty.cpp
@@ -56,7 +56,7 @@ unsigned int UIntProperty::fromLuaConversion(lua_State* state) const {
         return ghoul::lua::value<unsigned int>(state);
     }
     else {
-        throw ghoul::RuntimeError(fmt::format("Error extracting value in UIntProperty"));
+        throw ghoul::RuntimeError("Error extracting value in UIntProperty");
     }
 }
 
diff --git a/src/rendering/colormappingcomponent.cpp b/src/rendering/colormappingcomponent.cpp
index 5e2be4f0d6..0300b296a8 100644
--- a/src/rendering/colormappingcomponent.cpp
+++ b/src/rendering/colormappingcomponent.cpp
@@ -242,7 +242,7 @@ ColorMappingComponent::ColorMappingComponent()
     colorMapFile.onChange([this]() {
         bool fileExists = std::filesystem::exists(colorMapFile.value());
         if (!fileExists) {
-            LERROR(fmt::format("Could not find cmap file: '{}'", colorMapFile.value()));
+            LERROR(fmt::format("Could not find cmap file: {}", colorMapFile.value()));
         }
         _colorMapFileIsDirty = true;
     });
diff --git a/src/rendering/labelscomponent.cpp b/src/rendering/labelscomponent.cpp
index 8e6fe2b92c..e8320cffe7 100644
--- a/src/rendering/labelscomponent.cpp
+++ b/src/rendering/labelscomponent.cpp
@@ -258,7 +258,7 @@ void LabelsComponent::initialize() {
 }
 
 void LabelsComponent::loadLabels() {
-    LINFO(fmt::format("Loading label file {}", _labelFile));
+    LINFO(fmt::format("Loading label file '{}'", _labelFile));
 
     if (_createdFromDataset) {
         // The labelset should already have been loaded
diff --git a/src/rendering/texturecomponent.cpp b/src/rendering/texturecomponent.cpp
index f66337a530..4a7ed293ab 100644
--- a/src/rendering/texturecomponent.cpp
+++ b/src/rendering/texturecomponent.cpp
@@ -99,7 +99,7 @@ void TextureComponent::loadFromFile(const std::filesystem::path& path) {
         );
 
         if (texture) {
-            LDEBUG(fmt::format("Loaded texture from {}", absolutePath));
+            LDEBUG(fmt::format("Loaded texture from '{}'", absolutePath));
             _texture = std::move(texture);
 
             _textureFile = std::make_unique<ghoul::filesystem::File>(absolutePath);
diff --git a/src/scene/asset.cpp b/src/scene/asset.cpp
index 42095a7e1d..08fe0884ec 100644
--- a/src/scene/asset.cpp
+++ b/src/scene/asset.cpp
@@ -279,10 +279,10 @@ void Asset::initialize() {
         return;
     }
     if (!isSynchronized()) {
-        LERROR(fmt::format("Cannot initialize unsynchronized asset {}", _assetPath));
+        LERROR(fmt::format("Cannot initialize unsynchronized asset '{}'", _assetPath));
         return;
     }
-    LDEBUG(fmt::format("Initializing asset {}", _assetPath));
+    LDEBUG(fmt::format("Initializing asset '{}'", _assetPath));
 
     // 1. Initialize requirements
     for (Asset* child : _requiredAssets) {
@@ -294,13 +294,13 @@ void Asset::initialize() {
         _manager.callOnInitialize(this);
     }
     catch (const documentation::SpecificationError& e) {
-        LERROR(fmt::format("Failed to initialize asset {}", path()));
+        LERROR(fmt::format("Failed to initialize asset '{}'", path()));
         documentation::logError(e);
         setState(State::InitializationFailed);
         return;
     }
     catch (const ghoul::RuntimeError& e) {
-        LERROR(fmt::format("Failed to initialize asset {}", path()));
+        LERROR(fmt::format("Failed to initialize asset '{}'", path()));
         LERROR(fmt::format("{}: {}", e.component, e.message));
         setState(State::InitializationFailed);
         return;
@@ -314,7 +314,7 @@ void Asset::deinitialize() {
     if (!isInitialized()) {
         return;
     }
-    LDEBUG(fmt::format("Deinitializing asset {}", _assetPath));
+    LDEBUG(fmt::format("Deinitializing asset '{}'", _assetPath));
 
     // Perform inverse actions as in initialize, in reverse order (3 - 1)
 
@@ -326,7 +326,7 @@ void Asset::deinitialize() {
         _manager.callOnDeinitialize(this);
     }
     catch (const ghoul::lua::LuaRuntimeException& e) {
-        LERROR(fmt::format("Failed to deinitialize asset {}", _assetPath));
+        LERROR(fmt::format("Failed to deinitialize asset '{}'", _assetPath));
         LERROR(fmt::format("{}: {}", e.component, e.message));
         return;
     }
diff --git a/src/scene/assetmanager.cpp b/src/scene/assetmanager.cpp
index 31d63e755b..02776a1a4b 100644
--- a/src/scene/assetmanager.cpp
+++ b/src/scene/assetmanager.cpp
@@ -238,7 +238,7 @@ void AssetManager::update() {
             [&path](const std::unique_ptr<Asset>& a) { return a->path() == path; }
         );
         if (it == _assets.cend()) {
-            LWARNING(fmt::format("Tried to remove unknown asset {}. Skipping", asset));
+            LWARNING(fmt::format("Tried to remove unknown asset '{}'. Skipping", asset));
             continue;
         }
 
@@ -363,7 +363,7 @@ bool AssetManager::loadAsset(Asset* asset, Asset* parent) {
 
     if (!std::filesystem::is_regular_file(asset->path())) {
         LERROR(fmt::format(
-            "Could not load asset {}: File does not exist", asset->path())
+            "Could not load asset '{}': File does not exist", asset->path())
         );
         return false;
     }
@@ -372,7 +372,7 @@ bool AssetManager::loadAsset(Asset* asset, Asset* parent) {
         ghoul::lua::runScriptFile(*_luaState, asset->path());
     }
     catch (const ghoul::lua::LuaRuntimeException& e) {
-        LERROR(fmt::format("Could not load asset {}: {}", asset->path(), e.message));
+        LERROR(fmt::format("Could not load asset '{}': {}", asset->path(), e.message));
         return false;
     }
     catch (const ghoul::RuntimeError& e) {
@@ -915,7 +915,7 @@ Asset* AssetManager::retrieveAsset(const std::filesystem::path& path,
 
     if (!std::filesystem::is_regular_file(path)) {
         throw ghoul::RuntimeError(fmt::format(
-            "Could not find asset file {} requested by {}",
+            "Could not find asset file '{}' requested by '{}'",
             path, retriever
         ));
     }
@@ -939,7 +939,7 @@ void AssetManager::callOnInitialize(Asset* asset) const {
         lua_rawgeti(*_luaState, LUA_REGISTRYINDEX, init);
         if (lua_pcall(*_luaState, 0, 0, 0) != LUA_OK) {
             throw ghoul::lua::LuaRuntimeException(fmt::format(
-                "When initializing {}: {}",
+                "When initializing '{}': {}",
                 asset->path(),
                 ghoul::lua::value<std::string>(*_luaState, -1)
             ));
@@ -962,7 +962,7 @@ void AssetManager::callOnDeinitialize(Asset* asset) const {
         lua_rawgeti(*_luaState, LUA_REGISTRYINDEX, deinit);
         if (lua_pcall(*_luaState, 0, 0, 0) != LUA_OK) {
             throw ghoul::lua::LuaRuntimeException(fmt::format(
-                "When deinitializing {}: {}",
+                "When deinitializing '{}': {}",
                 asset->path(),
                 ghoul::lua::value<std::string>(*_luaState, -1)
             ));
diff --git a/src/scene/profile.cpp b/src/scene/profile.cpp
index 02f6216b59..cc7b42e131 100644
--- a/src/scene/profile.cpp
+++ b/src/scene/profile.cpp
@@ -750,7 +750,7 @@ Profile::Profile(const std::filesystem::path& path) {
     }
     catch (const std::ifstream::failure& e) {
         throw ghoul::RuntimeError(fmt::format(
-            "Exception opening profile file for read: {} ({})", path, e.what()
+            "Exception opening profile file for read '{}': {}", path, e.what()
         ));
     }
 
diff --git a/src/scene/profile_lua.inl b/src/scene/profile_lua.inl
index f006c6de3c..358fa66750 100644
--- a/src/scene/profile_lua.inl
+++ b/src/scene/profile_lua.inl
@@ -69,7 +69,10 @@ namespace {
                 absPath("${USER_PROFILES}").string(), global::configuration->profile
             );
         }
-        LINFOC("Profile", fmt::format("Saving a copy of the old profile as {}", newFile));
+        LINFOC(
+            "Profile",
+            fmt::format("Saving a copy of the old profile as '{}'", newFile)
+        );
         std::filesystem::copy(sourcePath, destPath);
         saveFilePath = global::configuration->profile;
     }
@@ -119,7 +122,7 @@ namespace {
     catch (const std::ofstream::failure& e) {
         throw ghoul::lua::LuaError(
             fmt::format(
-                "Exception opening profile file for write: {} ({})", absFilename, e.what()
+                "Exception opening profile file for write '{}': {}", absFilename, e.what()
             )
         );
     }
@@ -129,7 +132,7 @@ namespace {
     }
     catch (const std::ofstream::failure& e) {
         throw ghoul::lua::LuaError(
-            fmt::format("Data write error to file: {} ({})", absFilename, e.what())
+            fmt::format("Data write error to file '{}': {}", absFilename, e.what())
         );
     }
 }
diff --git a/src/scene/scene.cpp b/src/scene/scene.cpp
index 81e5fe275c..4b281d174f 100644
--- a/src/scene/scene.cpp
+++ b/src/scene/scene.cpp
@@ -679,7 +679,7 @@ void Scene::handlePropertyLuaTableEntry(ghoul::lua::LuaState& L, const std::stri
     switch (enclosedType) {
         case PropertyValueType::Boolean:
             LERROR(fmt::format(
-                "A lua table of bool values is not supported. (processing property {})",
+                "A Lua table of bool values is not supported. (processing property '{}')",
                 _profilePropertyName
             ));
             break;
@@ -701,7 +701,7 @@ void Scene::handlePropertyLuaTableEntry(ghoul::lua::LuaState& L, const std::stri
         default:
             LERROR(fmt::format(
                 "Table-within-a-table values are not supported for profile a "
-                "property (processing property {})", _profilePropertyName
+                "property (processing property '{}')", _profilePropertyName
             ));
             break;
     }
@@ -730,8 +730,8 @@ void Scene::processPropertyValueTableEntries(ghoul::lua::LuaState& L,
         }
         catch (std::bad_variant_access&) {
             LERROR(fmt::format(
-                "Error attempting to parse profile property setting for "
-                "{} using value = {}", _profilePropertyName, value
+                "Error attempting to parse profile property setting for '{}' using "
+                "value = {}", _profilePropertyName, value
             ));
         }
     }
diff --git a/src/scene/scene_lua.inl b/src/scene/scene_lua.inl
index 5241f7b2f1..41a22f49fe 100644
--- a/src/scene/scene_lua.inl
+++ b/src/scene/scene_lua.inl
@@ -226,7 +226,7 @@ void applyRegularExpression(lua_State* L, const std::string& regex,
                 "property_setValue",
                 fmt::format(
                     "{}: Property '{}' does not accept input of type '{}'. Requested "
-                    "type: '{}'",
+                    "type: {}",
                     errorLocation(L), prop->fullyQualifiedIdentifier(),
                     luaTypeToString(type), luaTypeToString(prop->typeLua())
                 )
@@ -305,7 +305,7 @@ int setPropertyCallSingle(properties::Property& prop, const std::string& uri,
             "property_setValue",
             fmt::format(
                 "{}: Property '{}' does not accept input of type '{}'. "
-                "Requested type: '{}'",
+                "Requested type: {}",
                 errorLocation(L), uri, luaTypeToString(type),
                 luaTypeToString(prop.typeLua())
             )
@@ -364,7 +364,7 @@ int propertySetValue(lua_State* L) {
         }
         else {
             std::string msg = fmt::format(
-                "Unexpected type {} in argument 3",
+                "Unexpected type '{}' in argument 3",
                 ghoul::lua::luaTypeToString(lua_type(L, 3))
             );
             return ghoul::lua::luaError(L, msg);
@@ -377,7 +377,7 @@ int propertySetValue(lua_State* L) {
         }
         else {
             std::string msg = fmt::format(
-                "Unexpected type {} in argument 4",
+                "Unexpected type '{}' in argument 4",
                 ghoul::lua::luaTypeToString(lua_type(L, 4))
             );
             return ghoul::lua::luaError(L, msg);
@@ -390,7 +390,7 @@ int propertySetValue(lua_State* L) {
         }
         else {
             std::string msg = fmt::format(
-                "Unexpected type {} in argument 5",
+                "Unexpected type '{}' in argument 5",
                 ghoul::lua::luaTypeToString(lua_type(L, 5))
             );
             return ghoul::lua::luaError(L, msg);
@@ -402,7 +402,7 @@ int propertySetValue(lua_State* L) {
         if (!correctName) {
             LWARNINGC(
                 "propertySetValue",
-                fmt::format("{} is not a valid easing method", easingMethodName)
+                fmt::format("'{}' is not a valid easing method", easingMethodName)
             );
         }
         else {
@@ -677,7 +677,7 @@ namespace {
     SceneGraphNode* foundNode = sceneGraphNode(identifier);
     if (!foundNode) {
         throw ghoul::lua::LuaError(
-            fmt::format("Did not find a match for identifier: {} ", identifier)
+            fmt::format("Did not find a match for identifier: {}", identifier)
         );
     }
 
@@ -966,13 +966,13 @@ namespace {
     SceneGraphNode* node = sceneGraphNode(identifier);
     if (!node) {
         throw ghoul::lua::LuaError(fmt::format(
-            "Did not find a match for identifier: {} ", identifier
+            "Did not find a match for identifier: {}", identifier
         ));
     }
     SceneGraphNode* newParentNode = sceneGraphNode(newParent);
     if (!newParentNode) {
         throw ghoul::lua::LuaError(fmt::format(
-            "Did not find a match for new parent identifier: {} ", newParent
+            "Did not find a match for new parent identifier: {}", newParent
         ));
     }
 
@@ -989,7 +989,7 @@ namespace {
     SceneGraphNode* node = sceneGraphNode(identifier);
     if (!node) {
         throw ghoul::lua::LuaError(fmt::format(
-            "Did not find a match for identifier: {} ", identifier
+            "Did not find a match for identifier: {}", identifier
         ));
     }
 
@@ -1006,7 +1006,7 @@ namespace {
     SceneGraphNode* node = sceneGraphNode(identifier);
     if (!node) {
         throw ghoul::lua::LuaError(fmt::format(
-            "Did not find a match for identifier: {} ", identifier
+            "Did not find a match for identifier: {}", identifier
         ));
     }
 
diff --git a/src/scripting/scriptengine.cpp b/src/scripting/scriptengine.cpp
index 6fadc2a135..9c11565c9a 100644
--- a/src/scripting/scriptengine.cpp
+++ b/src/scripting/scriptengine.cpp
@@ -242,7 +242,7 @@ bool ScriptEngine::runScriptFile(const std::filesystem::path& filename) {
     ZoneScoped;
 
     if (!std::filesystem::is_regular_file(filename)) {
-        LERROR(fmt::format("Script with name {} did not exist", filename));
+        LERROR(fmt::format("Script with name '{}' did not exist", filename));
         return false;
     }
 
@@ -361,7 +361,7 @@ void ScriptEngine::addLibraryFunctions(lua_State* state, LuaLibrary& library,
         lua_gettable(state, -2);
         if (lua_isnil(state, -1)) {
             LERROR(fmt::format(
-                "Module '{}' did not provide a documentation in script file {}",
+                "Module '{}' did not provide a documentation in script file '{}'",
                 library.name, script
             ));
             lua_pop(state, 1);
@@ -492,17 +492,14 @@ void ScriptEngine::writeLog(const std::string& script) {
             _logFilename = absPath(global::configuration->scriptLog).string();
             _logFileExists = true;
 
-            LDEBUG(fmt::format(
-                "Using script log file {}", std::filesystem::path(_logFilename)
-            ));
+            LDEBUG(fmt::format("Using script log file '{}'", _logFilename));
 
             // Test file and clear previous input
             std::ofstream file(_logFilename, std::ofstream::out | std::ofstream::trunc);
 
             if (!file.good()) {
                 LERROR(fmt::format(
-                    "Could not open file {} for logging scripts",
-                    std::filesystem::path(_logFilename)
+                    "Could not open file '{}' for logging scripts", _logFilename
                 ));
 
                 return;
diff --git a/src/scripting/scriptengine_lua.inl b/src/scripting/scriptengine_lua.inl
index ef8da626e9..a9b55d46ed 100644
--- a/src/scripting/scriptengine_lua.inl
+++ b/src/scripting/scriptengine_lua.inl
@@ -225,14 +225,14 @@ std::vector<std::string> walkCommon(std::string path, bool recursive, bool sorte
 
     if (is64) {
         throw ghoul::lua::LuaError(fmt::format(
-            "Error while unzipping {}: Zip64 archives are not supported", source
+            "Error while unzipping '{}': Zip64 archives are not supported", source
         ));
     }
 
     int ret = zip_extract(source.c_str(), destination.c_str(), nullptr, nullptr);
     if (ret != 0) {
         throw ghoul::lua::LuaError(fmt::format(
-            "Error {} while unzipping {}", ret, source
+            "Error while unzipping '{}': {}", source, ret
         ));
     }
 
diff --git a/src/util/httprequest.cpp b/src/util/httprequest.cpp
index 263120b8ff..22e1e42d82 100644
--- a/src/util/httprequest.cpp
+++ b/src/util/httprequest.cpp
@@ -121,7 +121,7 @@ bool HttpRequest::perform(std::chrono::milliseconds timeout) {
         if (responseCode >= 400) {
             LERRORC(
                 "HttpRequest",
-                fmt::format("Failed download {} with code {}", _url, responseCode)
+                fmt::format("Failed download '{}' with code {}", _url, responseCode)
             );
             success = false;
         }
@@ -133,7 +133,7 @@ bool HttpRequest::perform(std::chrono::milliseconds timeout) {
         LERRORC(
             "HttpRequest",
             fmt::format(
-                "Failed download {} with error {}", _url, curl_easy_strerror(res)
+                "Failed download '{}' with error {}", _url, curl_easy_strerror(res)
             )
         );
     }
@@ -256,7 +256,7 @@ HttpFileDownload::HttpFileDownload(std::string url, std::filesystem::path destin
     , _destination(std::move(destination))
 {
     if (!overwrite && std::filesystem::is_regular_file(_destination)) {
-        throw ghoul::RuntimeError(fmt::format("File {} already exists", _destination));
+        throw ghoul::RuntimeError(fmt::format("File '{}' already exists", _destination));
     }
 }
 
@@ -286,7 +286,7 @@ bool HttpFileDownload::setup() {
     // GetLastError() gives more details than errno.
     DWORD errorId = GetLastError();
     if (errorId == 0) {
-        LERRORC("HttpFileDownload", fmt::format("Cannot open file {}", _destination));
+        LERRORC("HttpFileDownload", fmt::format("Cannot open file '{}'", _destination));
         return false;
     }
     std::array<char, 256> Buffer;
@@ -304,7 +304,7 @@ bool HttpFileDownload::setup() {
     std::string message(Buffer.data(), size);
     LERRORC(
         "HttpFileDownload",
-        fmt::format("Cannot open file {}: {}", _destination, message)
+        fmt::format("Cannot open file '{}': {}", _destination, message)
     );
     return false;
 #else // ^^^ WIN32 / !WIN32 vvv
@@ -330,7 +330,7 @@ bool HttpFileDownload::setup() {
 #endif // __unix__
     }
 
-    LERRORC("HttpFileDownload", fmt::format("Cannot open file {}", _destination));
+    LERRORC("HttpFileDownload", fmt::format("Cannot open file '{}'", _destination));
     return false;
 #endif // WIN32
 }
diff --git a/src/util/openspacemodule.cpp b/src/util/openspacemodule.cpp
index 771a9b82bb..abb03cec72 100644
--- a/src/util/openspacemodule.cpp
+++ b/src/util/openspacemodule.cpp
@@ -56,7 +56,7 @@ void OpenSpaceModule::initialize(const ghoul::Dictionary& configuration) {
 
     std::filesystem::path path = modulePath();
     if (!path.empty()) {
-        LDEBUG(fmt::format("Registering module path {}: {}", moduleToken, path));
+        LDEBUG(fmt::format("Registering module path '{}' -> {}", moduleToken, path));
         FileSys.registerPathToken(moduleToken, std::move(path));
     }
 
diff --git a/src/util/spicemanager.cpp b/src/util/spicemanager.cpp
index 5fb7cb2363..2d5b4de9d1 100644
--- a/src/util/spicemanager.cpp
+++ b/src/util/spicemanager.cpp
@@ -212,7 +212,7 @@ SpiceManager::KernelHandle SpiceManager::loadKernel(std::string filePath) {
     ghoul_assert(
         std::filesystem::is_directory(std::filesystem::path(filePath).parent_path()),
         fmt::format(
-            "File {} exists, but directory {} does not",
+            "File '{}' exists, but directory '{}' does not",
             absPath(filePath), std::filesystem::path(filePath).parent_path()
         )
     );
@@ -237,7 +237,7 @@ SpiceManager::KernelHandle SpiceManager::loadKernel(std::string filePath) {
     std::filesystem::path p = path.parent_path();
     std::filesystem::current_path(p);
 
-    LINFO(fmt::format("Loading SPICE kernel {}", path));
+    LINFO(fmt::format("Loading SPICE kernel '{}'", path));
     // Load the kernel
     furnsh_c(path.string().c_str());
 
@@ -257,7 +257,7 @@ SpiceManager::KernelHandle SpiceManager::loadKernel(std::string filePath) {
     }
 
     KernelHandle kernelId = ++_lastAssignedKernel;
-    ghoul_assert(kernelId != 0, fmt::format("Kernel Handle wrapped around to 0"));
+    ghoul_assert(kernelId != 0, "Kernel Handle wrapped around to 0");
     _loadedKernels.push_back({ path.string(), kernelId, 1 });
     return kernelId;
 }
@@ -276,7 +276,7 @@ void SpiceManager::unloadKernel(KernelHandle kernelId) {
         // If there was only one part interested in the kernel, we can unload it
         if (it->refCount == 1) {
             // No need to check for errors as we do not allow empty path names
-            LINFO(fmt::format("Unloading SPICE kernel {}", it->path));
+            LINFO(fmt::format("Unloading SPICE kernel '{}'", it->path));
             unload_c(it->path.c_str());
             _loadedKernels.erase(it);
         }
@@ -302,7 +302,7 @@ void SpiceManager::unloadKernel(std::string filePath) {
     if (it == _loadedKernels.end()) {
         if (_useExceptions) {
             throw SpiceException(
-                fmt::format("{} did not correspond to a loaded kernel", path)
+                fmt::format("'{}' did not correspond to a loaded kernel", path)
             );
         }
         else {
@@ -312,7 +312,7 @@ void SpiceManager::unloadKernel(std::string filePath) {
     else {
         // If there was only one part interested in the kernel, we can unload it
         if (it->refCount == 1) {
-            LINFO(fmt::format("Unloading SPICE kernel {}", path));
+            LINFO(fmt::format("Unloading SPICE kernel '{}'", path));
             unload_c(path.string().c_str());
             _loadedKernels.erase(it);
         }
@@ -636,7 +636,7 @@ glm::dvec3 SpiceManager::targetPosition(const std::string& target,
         if (_useExceptions) {
             throw SpiceException(
                 fmt::format(
-                    "Neither target '{}' nor observer '{}' has SPK coverage at time {}",
+                    "Neither target '{}' nor observer '{}' has SPK coverage at time '{}'",
                     target, observer, ephemerisTime
                 )
             );
@@ -658,7 +658,7 @@ glm::dvec3 SpiceManager::targetPosition(const std::string& target,
         );
         if (failed_c()) {
             throwSpiceError(fmt::format(
-                "Error getting position from '{}' to '{}' in frame '{}' at time {}",
+                "Error getting position from '{}' to '{}' in frame '{}' at time '{}'",
                 target, observer, referenceFrame, ephemerisTime
             ));
         }
diff --git a/src/util/taskloader.cpp b/src/util/taskloader.cpp
index 5d633915bf..050f5b498e 100644
--- a/src/util/taskloader.cpp
+++ b/src/util/taskloader.cpp
@@ -71,7 +71,9 @@ std::vector<std::unique_ptr<Task>> TaskLoader::tasksFromDictionary(
 std::vector<std::unique_ptr<Task>> TaskLoader::tasksFromFile(const std::string& path) {
     std::filesystem::path absTasksFile = absPath(path);
     if (!std::filesystem::is_regular_file(absTasksFile)) {
-        LERROR(fmt::format("Could not load tasks file {}. File not found", absTasksFile));
+        LERROR(fmt::format(
+            "Could not load tasks file '{}'. File not found", absTasksFile
+        ));
         return std::vector<std::unique_ptr<Task>>();
     }
 
@@ -81,7 +83,7 @@ std::vector<std::unique_ptr<Task>> TaskLoader::tasksFromFile(const std::string&
     }
     catch (const ghoul::RuntimeError& e) {
         LERROR(fmt::format(
-            "Could not load tasks file {}. Lua error: {}: {}",
+            "Could not load tasks file '{}'. Lua error: ({}) {}",
             absTasksFile, e.message, e.component
         ));
         return std::vector<std::unique_ptr<Task>>();
@@ -91,7 +93,7 @@ std::vector<std::unique_ptr<Task>> TaskLoader::tasksFromFile(const std::string&
         return tasksFromDictionary(tasksDictionary);
     }
     catch (const documentation::SpecificationError& e) {
-        LERROR(fmt::format("Could not load tasks file {}. {}", absTasksFile, e.what()));
+        LERROR(fmt::format("Could not load tasks file '{}': {}", absTasksFile, e.what()));
         logError(e);
 
         return std::vector<std::unique_ptr<Task>>();
diff --git a/support/coding/codegen b/support/coding/codegen
index 3f6582f3ba..3cae27731c 160000
--- a/support/coding/codegen
+++ b/support/coding/codegen
@@ -1 +1 @@
-Subproject commit 3f6582f3ba889e20dc4ca42b27f7f8e761877278
+Subproject commit 3cae27731c6a0b8a7a0e81c916d4298a860f4e1b

From 8cdea01b225f82edd89e5b3287980d5780a201eb Mon Sep 17 00:00:00 2001
From: Alexander Bock <alexander.bock@liu.se>
Date: Mon, 11 Mar 2024 15:16:42 +0100
Subject: [PATCH 309/701] Remove support for XML configuration files in SGCT

---
 .../ext/launcher/include/filesystemaccess.h   |  2 +-
 .../ext/launcher/src/launcherwindow.cpp       | 29 +++----------------
 apps/OpenSpace/ext/sgct                       |  2 +-
 apps/OpenSpace/main.cpp                       |  8 +----
 include/openspace/engine/configuration.h      |  2 +-
 5 files changed, 8 insertions(+), 35 deletions(-)

diff --git a/apps/OpenSpace/ext/launcher/include/filesystemaccess.h b/apps/OpenSpace/ext/launcher/include/filesystemaccess.h
index 61ac0471c4..900d300e32 100644
--- a/apps/OpenSpace/ext/launcher/include/filesystemaccess.h
+++ b/apps/OpenSpace/ext/launcher/include/filesystemaccess.h
@@ -33,7 +33,7 @@ public:
      * Constructor for filesystemAccess class.
      *
      * \param fileExtension The file extensiopn filter used to find files. Only files with
-     *        this extension will be recognized (e.g. '.xml')
+     *        this extension will be recognized (e.g. '.json')
      * \param hideFileExtensions If `true` then file extensions will be removed from the
      *        listed files in the output
      * \param useCheckboxes If `true` then the text output format will contain a '0' as
diff --git a/apps/OpenSpace/ext/launcher/src/launcherwindow.cpp b/apps/OpenSpace/ext/launcher/src/launcherwindow.cpp
index 65eb3b411c..8a2657fcfa 100644
--- a/apps/OpenSpace/ext/launcher/src/launcherwindow.cpp
+++ b/apps/OpenSpace/ext/launcher/src/launcherwindow.cpp
@@ -573,9 +573,8 @@ void LauncherWindow::populateProfilesList(std::string preset) {
 
 // Returns 'true' if the file was a configuration file, 'false' otherwise
 bool handleConfigurationFile(QComboBox& box, const std::filesystem::directory_entry& p) {
-    const bool isXml = p.path().extension() == ".xml";
     const bool isJson = p.path().extension() == ".json";
-    if (!isXml && !isJson) {
+    if (!isJson) {
         return false;
     }
     box.addItem(QString::fromStdString(p.path().filename().string()));
@@ -598,11 +597,6 @@ bool handleConfigurationFile(QComboBox& box, const std::filesystem::directory_en
         }
     }
 
-    // For now, mark the XML configuration files to show that they are deprecated
-    if (isXml) {
-        box.setItemData(box.count() - 1, QBrush(Qt::darkYellow), Qt::ForegroundRole);
-    }
-
     return true;
 }
 
@@ -630,8 +624,6 @@ void LauncherWindow::populateWindowConfigsList(std::string preset) {
     _userConfigStartingIdx++;
     _preDefinedConfigStartingIdx++;
 
-    bool hasXmlConfig = false;
-
     // Sort files
     std::vector<fs::directory_entry> files;
     for (const fs::directory_entry& p : fs::directory_iterator(_userConfigPath)) {
@@ -639,7 +631,7 @@ void LauncherWindow::populateWindowConfigsList(std::string preset) {
     }
     std::sort(files.begin(), files.end());
 
-    // Add all the files with the .xml or .json extension to the dropdown
+    // Add all the files with the .json extension to the dropdown
     for (const fs::directory_entry& p : files) {
         bool isConfigFile = handleConfigurationFile(*_windowConfigBox, p);
         if (isConfigFile) {
@@ -647,7 +639,6 @@ void LauncherWindow::populateWindowConfigsList(std::string preset) {
             _userConfigStartingIdx++;
             _preDefinedConfigStartingIdx++;
         }
-        hasXmlConfig |= p.path().extension() == ".xml";
     }
     _windowConfigBox->addItem(QString::fromStdString("--- OpenSpace Configurations ---"));
     model = qobject_cast<const QStandardItemModel*>(_windowConfigBox->model());
@@ -661,10 +652,9 @@ void LauncherWindow::populateWindowConfigsList(std::string preset) {
             files.push_back(p);
         }
         std::sort(files.begin(), files.end());
-        // Add all the files with the .xml or .json extension to the dropdown
+        // Add all the files with the .json extension to the dropdown
         for (const fs::directory_entry& p : files) {
             handleConfigurationFile(*_windowConfigBox, p);
-            hasXmlConfig |= p.path().extension() == ".xml";
         }
     }
     else {
@@ -674,18 +664,7 @@ void LauncherWindow::populateWindowConfigsList(std::string preset) {
         );
     }
 
-    if (hasXmlConfig) {
-        // At least one XML configuration file is present, so we should show the tooltip
-        // informing the user that files will be deprecated
-        _windowConfigBox->setToolTip(
-            "Support for XML-based configuration files will be removed in the next "
-            "version of OpenSpace. Please convert the files to the new JSON format or "
-            "run the Node tool at "
-            "https://github.com/sgct/sgct/tree/master/support/config-converter"
-        );
-    }
-
-    // Always add the .cfg sgct default as first item
+    // Always add the .cfg SGCT default as first item
     _windowConfigBox->insertItem(
         _windowConfigBoxIndexSgctCfgDefault,
         QString::fromStdString(_sgctConfigName)
diff --git a/apps/OpenSpace/ext/sgct b/apps/OpenSpace/ext/sgct
index 4bf071f548..be88262a5f 160000
--- a/apps/OpenSpace/ext/sgct
+++ b/apps/OpenSpace/ext/sgct
@@ -1 +1 @@
-Subproject commit 4bf071f5486dee3bb6ae95d8a90e9ee6f8ef2a18
+Subproject commit be88262a5fe36715043433654490afa0c750a6a4
diff --git a/apps/OpenSpace/main.cpp b/apps/OpenSpace/main.cpp
index f6f47ac0b3..18df1b87a8 100644
--- a/apps/OpenSpace/main.cpp
+++ b/apps/OpenSpace/main.cpp
@@ -1065,16 +1065,10 @@ std::string selectedSgctProfileFromLauncher(LauncherWindow& lw, bool hasCliSGCTC
             std::filesystem::path cj = c;
             cj.replace_extension(".json");
 
-            std::filesystem::path cx = c;
-            cx.replace_extension(".xml");
-
             if (c.extension().empty()) {
                 if (std::filesystem::exists(cj)) {
                     config += ".json";
                 }
-                else if (std::filesystem::exists(cx)) {
-                    config += ".xml";
-                }
                 else {
                     throw ghoul::RuntimeError(fmt::format(
                         "Error loading configuration file '{}'. File could not be found",
@@ -1083,7 +1077,7 @@ std::string selectedSgctProfileFromLauncher(LauncherWindow& lw, bool hasCliSGCTC
                 }
             }
             else {
-                // user customzied sgct config
+                // user customized SGCT config
             }
         }
         global::configuration->windowConfiguration = config;
diff --git a/include/openspace/engine/configuration.h b/include/openspace/engine/configuration.h
index a7d2295deb..7bb5abeacc 100644
--- a/include/openspace/engine/configuration.h
+++ b/include/openspace/engine/configuration.h
@@ -47,7 +47,7 @@ struct Configuration {
 
     ghoul::Dictionary createDictionary();
 
-    std::string windowConfiguration = "${CONFIG}/single.xml";
+    std::string windowConfiguration = "${CONFIG}/single.json";
     std::string asset;
     std::string profile;
 

From 75681d1d4ce49852cf54ba3a873cac04beb3a3e9 Mon Sep 17 00:00:00 2001
From: Emma Broman <emma.broman@liu.se>
Date: Wed, 13 Mar 2024 15:11:28 +0100
Subject: [PATCH 310/701] Always show all nodes in ImGui, even if SGN has
 guiHidden property true

---
 modules/imgui/src/guipropertycomponent.cpp | 15 ---------------
 1 file changed, 15 deletions(-)

diff --git a/modules/imgui/src/guipropertycomponent.cpp b/modules/imgui/src/guipropertycomponent.cpp
index f0942a27ab..a497c2280a 100644
--- a/modules/imgui/src/guipropertycomponent.cpp
+++ b/modules/imgui/src/guipropertycomponent.cpp
@@ -396,18 +396,6 @@ void GuiPropertyComponent::render() {
     };
 
     if (!_useTreeLayout || noGuiGroups) {
-        // Remove all of the nodes that we want hidden first
-        owners.erase(
-            std::remove_if(
-                owners.begin(),
-                owners.end(),
-                [](properties::PropertyOwner* p) {
-                    SceneGraphNode* s = dynamic_cast<SceneGraphNode*>(p);
-                    return s && s->hasGuiHintHidden();
-                }
-            ),
-            owners.end()
-        );
         std::for_each(owners.begin(), owners.end(), renderProp);
     }
     else { // _useTreeLayout && gui groups exist
@@ -416,9 +404,6 @@ void GuiPropertyComponent::render() {
         for (properties::PropertyOwner* pOwner : owners) {
             // We checked above that pOwner is a SceneGraphNode
             SceneGraphNode* nOwner = static_cast<SceneGraphNode*>(pOwner);
-            if (nOwner->hasGuiHintHidden()) {
-                continue;
-            }
             const std::string gui = nOwner->guiPath();
             if (gui.empty()) {
                 // We know that we are done now since we stable_sort:ed them above

From 2759c00e4be3289346dd838365a814c764db3161 Mon Sep 17 00:00:00 2001
From: Alexander Bock <alexander.bock@liu.se>
Date: Sun, 17 Mar 2024 00:58:50 +0100
Subject: [PATCH 311/701] Pass through the code to address clang-tidy linting
 (#3083)

---
 .../ext/launcher/include/filesystemaccess.h   |  10 +-
 .../ext/launcher/include/launcherwindow.h     |   5 +-
 .../include/profile/additionalscriptsdialog.h |   2 +-
 .../launcher/include/profile/assettreemodel.h |   2 +-
 .../launcher/include/profile/cameradialog.h   |   2 +-
 .../include/profile/deltatimesdialog.h        |   2 +-
 .../launcher/include/profile/horizonsdialog.h |   2 +-
 .../launcher/include/profile/modulesdialog.h  |   1 -
 .../include/profile/propertiesdialog.h        |   1 -
 .../include/sgctedit/displaywindowunion.h     |   2 +-
 .../launcher/include/sgctedit/monitorbox.h    |   4 +-
 .../ext/launcher/include/sgctedit/sgctedit.h  |   2 +-
 .../launcher/include/sgctedit/windowcontrol.h |   2 +-
 .../ext/launcher/src/filesystemaccess.cpp     |  39 +-
 .../ext/launcher/src/launcherwindow.cpp       |  77 +-
 .../ext/launcher/src/profile/actiondialog.cpp |  26 +-
 .../src/profile/additionalscriptsdialog.cpp   |  15 +-
 .../ext/launcher/src/profile/assetsdialog.cpp |  35 +-
 .../launcher/src/profile/assettreeitem.cpp    |   4 +-
 .../launcher/src/profile/assettreemodel.cpp   |  28 +-
 .../ext/launcher/src/profile/cameradialog.cpp |  22 +-
 .../launcher/src/profile/deltatimesdialog.cpp |  35 +-
 .../launcher/src/profile/horizonsdialog.cpp   | 149 ++--
 .../launcher/src/profile/marknodesdialog.cpp  |   5 +-
 .../launcher/src/profile/modulesdialog.cpp    |  48 +-
 .../ext/launcher/src/profile/profileedit.cpp  |  16 +-
 .../launcher/src/profile/propertiesdialog.cpp |  47 +-
 .../launcher/src/profile/scriptlogdialog.cpp  |  10 +-
 .../ext/launcher/src/profile/timedialog.cpp   |  18 +-
 .../ext/launcher/src/settingsdialog.cpp       |  17 +-
 .../src/sgctedit/displaywindowunion.cpp       |   2 +-
 .../ext/launcher/src/sgctedit/monitorbox.cpp  |  26 +-
 .../src/sgctedit/orientationdialog.cpp        |  15 +-
 .../launcher/src/sgctedit/settingswidget.cpp  |  11 +-
 .../ext/launcher/src/sgctedit/sgctedit.cpp    |  87 +-
 .../launcher/src/sgctedit/windowcontrol.cpp   |  76 +-
 apps/OpenSpace/ext/sgct                       |   2 +-
 apps/OpenSpace/main.cpp                       | 138 ++--
 ext/ghoul                                     |   2 +-
 include/openspace/camera/camera.h             |   2 +-
 include/openspace/data/dataloader.h           |  12 +-
 include/openspace/documentation/verifier.h    |   2 +-
 include/openspace/engine/downloadmanager.h    |   7 +-
 include/openspace/engine/windowdelegate.h     |   4 +-
 include/openspace/events/eventengine.h        |   2 +-
 .../interaction/camerainteractionstates.h     |   2 +-
 .../openspace/interaction/interpolator.inl    |   2 +-
 .../interaction/joystickcamerastates.h        |   4 +-
 .../openspace/interaction/keybindingmanager.h |   2 -
 .../openspace/interaction/mousecamerastates.h |   4 +-
 .../openspace/interaction/sessionrecording.h  |  34 +-
 .../interaction/tasks/convertrecformattask.h  |   1 -
 .../openspace/navigation/keyframenavigator.h  |   4 +-
 .../openspace/navigation/navigationhandler.h  |   2 +-
 .../openspace/navigation/orbitalnavigator.h   |  29 +-
 include/openspace/navigation/pathcurve.h      |   4 +-
 include/openspace/navigation/pathnavigator.h  |   2 +-
 include/openspace/navigation/waypoint.h       |   4 +-
 include/openspace/network/messagestructures.h |   4 +-
 .../openspace/properties/selectionproperty.h  |   2 +-
 include/openspace/rendering/dashboarditem.h   |   2 +-
 .../openspace/rendering/framebufferrenderer.h |   2 +-
 include/openspace/rendering/helper.h          |   4 +-
 include/openspace/rendering/luaconsole.h      |   5 +-
 include/openspace/rendering/renderable.h      |   6 +-
 include/openspace/rendering/renderengine.h    |   7 +-
 .../rendering/screenspacerenderable.h         |   8 +-
 include/openspace/rendering/volumeraycaster.h |  10 +-
 include/openspace/scene/asset.h               |  10 +-
 include/openspace/scene/assetmanager.h        |   2 +-
 include/openspace/scene/scene.h               |   3 +-
 include/openspace/scene/scenegraphnode.h      |   2 +-
 include/openspace/scripting/scriptengine.h    |   6 +-
 .../util/blockplaneintersectiongeometry.h     |   2 +-
 include/openspace/util/boxgeometry.h          |   2 +-
 include/openspace/util/collisionhelper.h      |   4 +-
 include/openspace/util/histogram.h            |   4 +-
 include/openspace/util/keys.h                 |   4 +-
 include/openspace/util/planegeometry.h        |   2 +-
 include/openspace/util/sphere.h               |   2 +-
 include/openspace/util/spicemanager.h         |   2 +-
 include/openspace/util/syncbuffer.h           |   2 +-
 include/openspace/util/taskloader.h           |   2 +-
 include/openspace/util/time.h                 |   2 +-
 include/openspace/util/timeline.h             |   2 +
 include/openspace/util/timeline.inl           |   2 +-
 include/openspace/util/timemanager.h          |   6 +-
 include/openspace/util/touch.h                |   2 +-
 .../rendering/atmospheredeferredcaster.cpp    | 250 +++---
 .../rendering/atmospheredeferredcaster.h      |   4 +-
 .../rendering/renderableatmosphere.cpp        |  39 +-
 modules/base/dashboard/dashboarditemangle.cpp |  97 +--
 modules/base/dashboard/dashboarditemangle.h   |   2 +-
 .../base/dashboard/dashboarditemdistance.cpp  |  16 +-
 .../dashboard/dashboarditemelapsedtime.cpp    |  14 +-
 .../base/dashboard/dashboarditemframerate.cpp |  15 +-
 .../dashboard/dashboarditeminputstate.cpp     |  28 +-
 .../base/dashboard/dashboarditemmission.cpp   |  16 +-
 .../dashboarditemparallelconnection.cpp       |   4 +-
 .../dashboard/dashboarditempropertyvalue.cpp  |   2 +-
 .../dashboarditemsimulationincrement.cpp      |  10 +-
 .../base/dashboard/dashboarditemvelocity.cpp  |   8 +-
 .../rendering/grids/renderableboxgrid.cpp     |   4 +-
 .../base/rendering/grids/renderablegrid.cpp   |  28 +-
 .../rendering/grids/renderableradialgrid.cpp  |  19 +-
 .../rendering/grids/renderableradialgrid.h    |   4 +-
 .../grids/renderablesphericalgrid.cpp         | 166 ++--
 .../pointcloud/renderablepointcloud.cpp       |   1 -
 modules/base/rendering/renderablelabel.cpp    |  32 +-
 modules/base/rendering/renderablemodel.cpp    |  53 +-
 .../base/rendering/renderablenodearrow.cpp    |  21 +-
 modules/base/rendering/renderablenodeline.cpp |  40 +-
 modules/base/rendering/renderablenodeline.h   |   3 -
 modules/base/rendering/renderableplane.cpp    |  12 +-
 .../rendering/renderableplaneimagelocal.cpp   |  18 +-
 .../rendering/renderableplaneimageonline.cpp  |  20 +-
 .../renderableplanetimevaryingimage.cpp       |  10 +-
 modules/base/rendering/renderableprism.cpp    |  12 +-
 modules/base/rendering/renderablesphere.cpp   |   6 +-
 .../rendering/renderablesphereimageonline.cpp |  44 +-
 .../rendering/renderablesphereimageonline.h   |   3 -
 .../rendering/renderabletimevaryingsphere.cpp |   8 +-
 modules/base/rendering/renderabletrail.cpp    |  10 +-
 .../base/rendering/renderabletrailorbit.cpp   |   2 +-
 .../rendering/renderabletrailtrajectory.cpp   |  12 +-
 .../base/rendering/screenspaceframebuffer.cpp |  12 +-
 .../base/rendering/screenspaceimageonline.cpp |   2 +-
 modules/base/rotation/constantrotation.cpp    |   2 +-
 modules/base/rotation/fixedrotation.cpp       |  11 +-
 modules/base/rotation/luarotation.cpp         |   6 +-
 modules/base/rotation/staticrotation.cpp      |   4 +-
 modules/base/timeframe/timeframeunion.cpp     |   8 +-
 modules/base/translation/luatranslation.cpp   |   5 +-
 modules/cefwebgui/cefwebguimodule.cpp         |   5 +-
 modules/cefwebgui/src/guirenderhandler.cpp    |  12 +-
 modules/debugging/rendering/debugrenderer.cpp |   6 +-
 .../rendering/renderabledumeshes.cpp          |  60 +-
 .../rendering/renderabledumeshes.h            |   2 +-
 modules/exoplanets/exoplanetshelper.cpp       |  22 +-
 modules/exoplanets/exoplanetshelper.h         |   2 +-
 .../tasks/exoplanetsdatapreparationtask.cpp   |  54 +-
 .../tasks/exoplanetsdatapreparationtask.h     |   6 +-
 .../fitsfilereader/include/fitsfilereader.h   |   5 +-
 modules/fitsfilereader/src/fitsfilereader.cpp |  47 +-
 modules/gaia/rendering/octreeculler.cpp       |   5 +-
 modules/gaia/rendering/octreemanager.cpp      | 605 +++++++-------
 modules/gaia/rendering/octreemanager.h        |  13 +-
 .../gaia/rendering/renderablegaiastars.cpp    | 175 ++--
 modules/gaia/shaders/gaia_point_fs.glsl       |   2 +-
 modules/gaia/shaders/gaia_ssbo_vs.glsl        |   6 +-
 .../shaders/gaia_tonemapping_point_fs.glsl    |   2 +-
 modules/gaia/shaders/gaia_vbo_vs.glsl         |   6 +-
 modules/gaia/tasks/constructoctreetask.cpp    |  17 +-
 modules/gaia/tasks/readfilejob.cpp            |  44 +-
 modules/gaia/tasks/readfitstask.cpp           |  35 +-
 modules/gaia/tasks/readspecktask.cpp          |   2 +-
 modules/galaxy/rendering/galaxyraycaster.cpp  |   8 +-
 modules/galaxy/rendering/galaxyraycaster.h    |   2 +-
 modules/galaxy/rendering/renderablegalaxy.cpp |  73 +-
 .../galaxy/tasks/milkywayconversiontask.cpp   |  24 +-
 .../tasks/milkywaypointsconversiontask.cpp    |  18 +-
 modules/globebrowsing/globebrowsingmodule.cpp |  11 +-
 modules/globebrowsing/globebrowsingmodule.h   |   5 +-
 .../src/asynctiledataprovider.cpp             |   6 +-
 .../globebrowsing/src/asynctiledataprovider.h |   2 +-
 .../src/dashboarditemglobelocation.cpp        |   7 +-
 modules/globebrowsing/src/ellipsoid.cpp       |   6 +-
 modules/globebrowsing/src/gdalwrapper.cpp     |   2 +-
 modules/globebrowsing/src/geodeticpatch.cpp   |   8 +-
 .../src/geojson/geojsoncomponent.cpp          |  44 +-
 .../src/geojson/geojsonmanager.cpp            |   9 +-
 .../src/geojson/geojsonproperties.cpp         |   8 +-
 .../src/geojson/globegeometryfeature.cpp      | 124 +--
 .../src/geojson/globegeometryfeature.h        |   2 +-
 .../src/geojson/globegeometryhelper.cpp       |  92 ++-
 .../src/globelabelscomponent.cpp              | 211 +++--
 .../globebrowsing/src/globelabelscomponent.h  |   1 -
 modules/globebrowsing/src/globerotation.cpp   |  19 +-
 .../globebrowsing/src/globetranslation.cpp    |  18 +-
 modules/globebrowsing/src/gpulayergroup.cpp   |   6 +-
 modules/globebrowsing/src/layer.cpp           |   8 +-
 modules/globebrowsing/src/layeradjustment.cpp |   2 +-
 modules/globebrowsing/src/layergroup.cpp      |  15 +-
 modules/globebrowsing/src/layergroupid.cpp    |  18 +-
 modules/globebrowsing/src/layermanager.cpp    |  10 +-
 modules/globebrowsing/src/layermanager.h      |   2 +-
 .../globebrowsing/src/layerrendersettings.cpp |   6 +-
 .../globebrowsing/src/layerrendersettings.h   |   2 +-
 .../src/memoryawaretilecache.cpp              |  24 +-
 .../globebrowsing/src/rawtiledatareader.cpp   |  48 +-
 modules/globebrowsing/src/renderableglobe.cpp |  48 +-
 modules/globebrowsing/src/ringscomponent.cpp  |  18 +-
 modules/globebrowsing/src/shadowcomponent.cpp | 225 +++---
 modules/globebrowsing/src/shadowcomponent.h   |   6 +-
 modules/globebrowsing/src/skirtedgrid.cpp     |   2 +-
 .../src/tileprovider/defaulttileprovider.cpp  |  18 +-
 .../imagesequencetileprovider.cpp             |   4 +-
 .../sizereferencetileprovider.cpp             |   7 +-
 .../src/tileprovider/temporaltileprovider.cpp |  58 +-
 .../src/tileprovider/texttileprovider.cpp     |  16 +-
 .../tileprovider/tileindextileprovider.cpp    |  14 +-
 .../src/tileprovider/tileprovider.cpp         |  28 +-
 .../src/tileprovider/tileprovider.h           |   3 +-
 .../src/tileprovider/tileproviderbyindex.cpp  |  10 +-
 .../src/tileprovider/tileproviderbylevel.cpp  |  12 +-
 .../globebrowsing/src/tiletextureinitdata.cpp |  10 +-
 .../globebrowsing/src/tiletextureinitdata.h   |   4 +-
 modules/globebrowsing/src/timequantizer.cpp   |  47 +-
 modules/globebrowsing/src/timequantizer.h     |   6 +-
 modules/imgui/imguimodule.cpp                 |  30 +-
 modules/imgui/include/guiparallelcomponent.h  |   1 -
 modules/imgui/src/guigibscomponent.cpp        |   2 +-
 .../imgui/src/guiglobebrowsingcomponent.cpp   |  22 +-
 modules/imgui/src/guijoystickcomponent.cpp    |   8 +-
 modules/imgui/src/guimissioncomponent.cpp     |  12 +-
 modules/imgui/src/guiparallelcomponent.cpp    |  80 +-
 modules/imgui/src/guipropertycomponent.cpp    |  36 +-
 modules/imgui/src/guiscenecomponent.cpp       |   6 +-
 modules/imgui/src/guispacetimecomponent.cpp   |  17 +-
 modules/imgui/src/renderproperties.cpp        | 168 ++--
 modules/iswa/util/dataprocessor.cpp           |   6 +-
 modules/iswa/util/iswamanager.cpp             |   2 +-
 .../tasks/kameleondocumentationtask.cpp       |   2 +-
 .../tasks/kameleonmetadatatojsontask.cpp      |   2 +-
 .../tasks/kameleonvolumetorawtask.cpp         |   5 +-
 .../rendering/multiresvolumeraycaster.cpp     |   2 +-
 .../rendering/renderablemultiresvolume.cpp    |   2 +-
 modules/server/include/serverinterface.h      |   2 +-
 .../server/include/topics/luascripttopic.h    |   2 +-
 modules/server/include/topics/timetopic.h     |   2 +-
 modules/server/servermodule.cpp               |  22 +-
 modules/server/servermodule.h                 |   2 +-
 modules/server/src/connection.cpp             |  34 +-
 modules/server/src/connectionpool.cpp         |   2 +-
 modules/server/src/jsonconverters.cpp         |   8 +-
 modules/server/src/serverinterface.cpp        |  38 +-
 .../server/src/topics/authorizationtopic.cpp  |   2 +-
 modules/server/src/topics/camerapathtopic.cpp |   8 +-
 modules/server/src/topics/cameratopic.cpp     |   6 +-
 .../server/src/topics/documentationtopic.cpp  |   2 +-
 modules/server/src/topics/enginemodetopic.cpp |  13 +-
 modules/server/src/topics/eventtopic.cpp      |   6 +-
 .../src/topics/flightcontrollertopic.cpp      |   4 +-
 .../server/src/topics/getpropertytopic.cpp    |   4 +-
 modules/server/src/topics/luascripttopic.cpp  |  35 +-
 modules/server/src/topics/missiontopic.cpp    |   6 +-
 .../src/topics/sessionrecordingtopic.cpp      |   9 +-
 .../server/src/topics/setpropertytopic.cpp    |   2 +-
 modules/server/src/topics/shortcuttopic.cpp   |   6 +-
 modules/server/src/topics/skybrowsertopic.cpp |  10 +-
 modules/server/src/topics/timetopic.cpp       |   8 +-
 modules/skybrowser/include/browser.h          |   2 +-
 .../skybrowser/include/targetbrowserpair.h    |   2 +-
 modules/skybrowser/include/utility.h          |   2 +-
 modules/skybrowser/include/wwtcommunicator.h  |   2 +-
 modules/skybrowser/skybrowsermodule.cpp       |  16 +-
 modules/skybrowser/skybrowsermodule.h         |   4 +-
 modules/skybrowser/src/browser.cpp            |  26 +-
 .../skybrowser/src/renderableskytarget.cpp    |  16 +-
 .../skybrowser/src/screenspaceskybrowser.cpp  |  75 +-
 modules/skybrowser/src/targetbrowserpair.cpp  |  56 +-
 modules/skybrowser/src/utility.cpp            | 109 +--
 modules/skybrowser/src/wwtcommunicator.cpp    |  28 +-
 modules/skybrowser/src/wwtdatahandler.cpp     |  60 +-
 modules/space/horizonsfile.cpp                |  62 +-
 modules/space/horizonsfile.h                  |   4 +-
 modules/space/kepler.cpp                      |  36 +-
 modules/space/kepler.h                        |   6 +-
 .../renderableconstellationbounds.cpp         |  17 +-
 .../rendering/renderableconstellationbounds.h |   2 +-
 .../renderableconstellationlines.cpp          | 163 ++--
 .../rendering/renderableconstellationlines.h  |   2 +-
 .../renderableconstellationsbase.cpp          |   6 +-
 .../space/rendering/renderableeclipsecone.cpp |  14 +-
 .../space/rendering/renderablefluxnodes.cpp   |  21 +-
 .../rendering/renderablehabitablezone.cpp     |  16 +-
 .../rendering/renderableorbitalkepler.cpp     |  13 +-
 modules/space/rendering/renderablerings.cpp   |  16 +-
 modules/space/rendering/renderablestars.cpp   |  41 +-
 modules/space/rendering/renderablestars.h     |   2 +-
 .../space/rendering/renderabletravelspeed.cpp |  20 +-
 .../space/rendering/renderabletravelspeed.h   |   1 -
 modules/space/rotation/spicerotation.cpp      |   2 +-
 modules/space/translation/gptranslation.cpp   |   2 +-
 .../space/translation/horizonstranslation.cpp |  14 +-
 .../space/translation/keplertranslation.cpp   |   2 +-
 .../dashboard/dashboarditeminstruments.cpp    |  36 +-
 .../rendering/renderablecrawlingline.cpp      |  25 +-
 .../rendering/renderablefov.cpp               |  14 +-
 .../rendering/renderablemodelprojection.cpp   |  18 +-
 .../rendering/renderableplaneprojection.cpp   |   8 +-
 .../rendering/renderableplaneprojection.h     |   2 +-
 .../rendering/renderableplanetprojection.cpp  |  46 +-
 .../rendering/renderableshadowcylinder.cpp    |   6 +-
 .../util/hongkangparser.cpp                   |  24 +-
 .../util/imagesequencer.cpp                   |  16 +-
 .../util/instrumenttimesparser.cpp            |  16 +-
 .../util/labelparser.cpp                      |  55 +-
 .../util/projectioncomponent.cpp              |  74 +-
 .../util/projectioncomponent.h                |   8 +-
 .../util/targetdecoder.cpp                    |   2 +-
 modules/statemachine/include/statemachine.h   |   2 +-
 modules/statemachine/src/statemachine.cpp     |  28 +-
 modules/statemachine/statemachinemodule.cpp   |   6 +-
 modules/statemachine/statemachinemodule.h     |   4 +-
 modules/sync/syncs/httpsynchronization.cpp    |  12 +-
 modules/sync/syncs/urlsynchronization.cpp     |  16 +-
 .../rendering/renderabletoyvolume.cpp         |  20 +-
 .../rendering/toyvolumeraycaster.cpp          |  12 +-
 .../toyvolume/rendering/toyvolumeraycaster.h  |   2 +-
 modules/video/src/renderablevideoplane.cpp    |  12 +-
 modules/video/src/renderablevideosphere.cpp   |   2 +-
 modules/video/src/screenspacevideo.cpp        |   2 +-
 modules/video/src/videoplayer.cpp             |  75 +-
 modules/video/src/videotileprovider.cpp       |  19 +-
 .../rendering/renderabledistancelabel.cpp     |  10 +-
 modules/volume/rawvolumemetadata.cpp          |   2 +-
 modules/volume/rawvolumemetadata.h            |   2 +-
 .../volume/rendering/basicvolumeraycaster.cpp |  24 +-
 .../volume/rendering/basicvolumeraycaster.h   |   2 +-
 .../rendering/renderabletimevaryingvolume.cpp |  40 +-
 .../rendering/renderabletimevaryingvolume.h   |   4 +-
 modules/volume/rendering/volumeclipplanes.cpp |   8 +-
 .../volume/tasks/generaterawvolumetask.cpp    |  15 +-
 modules/volume/transferfunction.cpp           |  81 +-
 modules/volume/transferfunction.h             |   4 +-
 modules/volume/transferfunctionhandler.cpp    |   6 +-
 modules/volume/transferfunctionhandler.h      |   2 +-
 modules/volume/transferfunctionproperty.cpp   |   2 +-
 modules/volume/volumegridtype.cpp             |   6 +-
 modules/volume/volumeutils.cpp                |  12 +-
 modules/webbrowser/include/browserinstance.h  |   2 +-
 modules/webbrowser/include/eventhandler.h     |   2 +-
 modules/webbrowser/include/webbrowserapp.h    |   2 +-
 modules/webbrowser/src/browserinstance.cpp    |  11 +-
 modules/webbrowser/src/cefhost.cpp            |   4 +-
 modules/webbrowser/src/eventhandler.cpp       |  12 +-
 modules/webbrowser/src/processhelperlinux.cpp |   6 +-
 modules/webbrowser/src/screenspacebrowser.cpp |   8 +-
 modules/webbrowser/src/webbrowserapp.cpp      |  20 +-
 modules/webbrowser/src/webrenderhandler.cpp   |   6 +-
 modules/webbrowser/webbrowsermodule.cpp       |  35 +-
 modules/webbrowser/webbrowsermodule.h         |   8 -
 modules/webgui/webguimodule.cpp               |   4 +-
 src/camera/camera.cpp                         |  48 +-
 src/data/csvloader.cpp                        |  12 +-
 src/data/dataloader.cpp                       | 101 ++-
 src/data/datamapping.cpp                      |   2 +-
 src/data/speckloader.cpp                      |  12 +-
 src/documentation/documentation.cpp           |  10 +-
 src/documentation/verifier.cpp                | 318 ++++----
 src/engine/configuration.cpp                  |  24 +-
 src/engine/downloadmanager.cpp                |  20 +-
 src/engine/logfactory.cpp                     |  22 +-
 src/engine/moduleengine.cpp                   |   2 +-
 src/engine/openspaceengine.cpp                |  91 ++-
 src/engine/settings.cpp                       |  16 +-
 src/events/event.cpp                          |   2 +-
 src/events/eventengine.cpp                    |   8 +-
 src/interaction/actionmanager.cpp             |   4 +-
 src/interaction/camerainteractionstates.cpp   |   2 +-
 src/interaction/joystickcamerastates.cpp      |  20 +-
 src/interaction/joystickinputstate.cpp        |  49 +-
 src/interaction/keybindingmanager.cpp         |   4 +-
 src/interaction/mousecamerastates.cpp         |  51 +-
 src/interaction/sessionrecording.cpp          | 297 ++++---
 .../tasks/convertrecfileversiontask.cpp       |   8 +-
 .../tasks/convertrecformattask.cpp            |  79 +-
 src/interaction/websocketcamerastates.cpp     |   4 +-
 src/interaction/websocketinputstate.cpp       |   4 +-
 src/mission/mission.cpp                       |  16 +-
 src/mission/missionmanager.cpp                |   4 +-
 src/navigation/keyframenavigator.cpp          |  37 +-
 src/navigation/navigationhandler.cpp          |  32 +-
 src/navigation/navigationstate.cpp            |  16 +-
 src/navigation/orbitalnavigator.cpp           | 227 +++---
 src/navigation/path.cpp                       |  40 +-
 src/navigation/pathcurve.cpp                  |  40 +-
 .../pathcurves/avoidcollisioncurve.cpp        |  51 +-
 .../pathcurves/zoomoutoverviewcurve.cpp       |   4 +-
 src/navigation/pathnavigator.cpp              |  23 +-
 src/navigation/waypoint.cpp                   |  30 +-
 src/network/parallelconnection.cpp            |   2 +-
 src/network/parallelpeer.cpp                  |  60 +-
 src/properties/list/doublelistproperty.cpp    |   2 +-
 src/properties/list/intlistproperty.cpp       |   2 +-
 src/properties/list/stringlistproperty.cpp    |   2 +-
 src/properties/optionproperty.cpp             |  20 +-
 src/properties/property.cpp                   |  36 +-
 src/properties/propertyowner.cpp              |  23 +-
 src/properties/selectionproperty.cpp          |  18 +-
 src/rendering/colormappingcomponent.cpp       |  26 +-
 src/rendering/dashboarditem.cpp               |   4 +-
 src/rendering/framebufferrenderer.cpp         |  85 +-
 src/rendering/helper.cpp                      |  58 +-
 src/rendering/labelscomponent.cpp             |  14 +-
 src/rendering/loadingscreen.cpp               |  36 +-
 src/rendering/luaconsole.cpp                  |  35 +-
 src/rendering/renderable.cpp                  |  31 +-
 src/rendering/renderengine.cpp                |  83 +-
 src/rendering/screenspacerenderable.cpp       |  61 +-
 src/rendering/transferfunction.cpp            |  17 +-
 src/scene/assetmanager.cpp                    |  69 +-
 src/scene/profile.cpp                         |  22 +-
 src/scene/scene.cpp                           |  67 +-
 src/scene/scene_lua.inl                       |   1 -
 src/scene/scenegraphnode.cpp                  |  30 +-
 src/scene/sceneinitializer.cpp                |   8 +-
 src/scripting/scriptengine.cpp                |  61 +-
 src/scripting/scriptscheduler.cpp             |  10 +-
 src/util/blockplaneintersectiongeometry.cpp   |  33 +-
 src/util/boxgeometry.cpp                      |  48 +-
 src/util/collisionhelper.cpp                  |  14 +-
 src/util/coordinateconversion.cpp             |  94 +--
 src/util/distanceconversion.cpp               |  10 +-
 src/util/factorymanager.cpp                   |   8 +-
 src/util/histogram.cpp                        |  46 +-
 src/util/httprequest.cpp                      |  25 +-
 src/util/json_helper.cpp                      |  14 +-
 src/util/keys.cpp                             |  24 +-
 src/util/openspacemodule.cpp                  |   8 +-
 src/util/planegeometry.cpp                    |  18 +-
 src/util/progressbar.cpp                      |   2 +-
 src/util/screenlog.cpp                        |   6 +-
 src/util/sphere.cpp                           |  13 +-
 src/util/spicemanager.cpp                     | 135 ++--
 src/util/syncbuffer.cpp                       |   8 +-
 src/util/taskloader.cpp                       |  12 +-
 src/util/threadpool.cpp                       |  22 +-
 src/util/time.cpp                             |  24 +-
 src/util/timeconversion.cpp                   |  17 +-
 src/util/timeline.cpp                         |   5 +
 src/util/timemanager.cpp                      |  83 +-
 src/util/touch.cpp                            |   4 +-
 src/util/tstring.cpp                          |   2 +-
 src/util/universalhelpers.cpp                 |   2 +-
 src/util/versionchecker.cpp                   |  15 +-
 support/coding/codegen                        |   2 +-
 tests/main.cpp                                |   7 +-
 .../property/test_property_listproperties.cpp |  68 +-
 .../property/test_property_optionproperty.cpp |   2 +-
 .../test_property_selectionproperty.cpp       |  16 +-
 tests/test_assetloader.cpp                    |  33 +-
 tests/test_concurrentqueue.cpp                |   2 +-
 tests/test_distanceconversion.cpp             | 200 ++---
 tests/test_documentation.cpp                  | 600 +++++++-------
 tests/test_horizons.cpp                       | 168 ++--
 tests/test_jsonformatting.cpp                 |   8 +-
 tests/test_latlonpatch.cpp                    |  26 +-
 tests/test_lua_createsinglecolorimage.cpp     |  12 +-
 tests/test_profile.cpp                        | 752 ++++++++----------
 tests/test_rawvolumeio.cpp                    |  11 +-
 tests/test_scriptscheduler.cpp                |  10 +-
 tests/test_settings.cpp                       | 322 ++++----
 tests/test_sgctedit.cpp                       |  15 +-
 tests/test_spicemanager.cpp                   | 367 +++++----
 tests/test_timequantizer.cpp                  |  18 +-
 457 files changed, 6639 insertions(+), 6519 deletions(-)

diff --git a/apps/OpenSpace/ext/launcher/include/filesystemaccess.h b/apps/OpenSpace/ext/launcher/include/filesystemaccess.h
index 900d300e32..3113335234 100644
--- a/apps/OpenSpace/ext/launcher/include/filesystemaccess.h
+++ b/apps/OpenSpace/ext/launcher/include/filesystemaccess.h
@@ -48,14 +48,14 @@ public:
      *
      * \param dir The directory from which to start the search from
      */
-    std::string useQtFileSystemModelToTraverseDir(std::string dir,
-        bool usersAssets = false);
+    std::string useQtFileSystemModelToTraverseDir(const std::string& dir,
+        bool userAssets = false);
 
 private:
-    void parseChildDirElements(QFileInfo item, std::string space, int level,
-        std::vector<std::string>& dirNames, std::vector<std::string>& output,
+    void parseChildDirElements(const QFileInfo& fileInfo, const std::string& space,
+        int level, std::vector<std::string>& dirNames, std::vector<std::string>& output,
         bool userAssets);
-    void parseChildFile(std::string res, bool& hasDirHeaderBeenAdded,
+    void parseChildFile(std::string filename, bool& hasDirHeaderBeenAdded,
         std::vector<std::string>& dirNames, std::vector<std::string>& output);
 
     QFileSystemModel _filesystemModel;
diff --git a/apps/OpenSpace/ext/launcher/include/launcherwindow.h b/apps/OpenSpace/ext/launcher/include/launcherwindow.h
index 6105ce5be1..6a67b1eaff 100644
--- a/apps/OpenSpace/ext/launcher/include/launcherwindow.h
+++ b/apps/OpenSpace/ext/launcher/include/launcherwindow.h
@@ -96,12 +96,11 @@ private:
     void editRefusalDialog(const std::string& title, const std::string& msg,
         const std::string& detailedText);
 
-    void populateProfilesList(std::string preset);
-    void populateWindowConfigsList(std::string preset);
+    void populateProfilesList(const std::string& preset);
+    void populateWindowConfigsList(const std::string& preset);
     void handleReturnFromWindowEditor(const sgct::config::Cluster& cluster,
         std::filesystem::path savePath, const std::string& saveWindowCfgPath);
     void onNewWindowConfigSelection(int newIndex);
-    bool versionCheck(sgct::config::GeneratorVersion& v) const;
 
     const std::string _assetPath;
     const std::string _userAssetPath;
diff --git a/apps/OpenSpace/ext/launcher/include/profile/additionalscriptsdialog.h b/apps/OpenSpace/ext/launcher/include/profile/additionalscriptsdialog.h
index 3684ebeb11..3bdfdfd039 100644
--- a/apps/OpenSpace/ext/launcher/include/profile/additionalscriptsdialog.h
+++ b/apps/OpenSpace/ext/launcher/include/profile/additionalscriptsdialog.h
@@ -52,7 +52,7 @@ private:
      *
      * \param scripts The scripts to be appended
      */
-    void appendScriptsToTextfield(std::vector<std::string> scripts);
+    void appendScriptsToTextfield(const std::vector<std::string>& scripts);
 
     std::vector<std::string>* _scripts = nullptr;
     std::vector<std::string> _scriptsData;
diff --git a/apps/OpenSpace/ext/launcher/include/profile/assettreemodel.h b/apps/OpenSpace/ext/launcher/include/profile/assettreemodel.h
index 5294617aa3..f3317192e5 100644
--- a/apps/OpenSpace/ext/launcher/include/profile/assettreemodel.h
+++ b/apps/OpenSpace/ext/launcher/include/profile/assettreemodel.h
@@ -205,7 +205,7 @@ public:
       * \param index Location of the item to set
       * \param name The asset name to set
       */
-    void setName(QModelIndex& index, QString name);
+    void setName(QModelIndex& index, const QString& name);
 
     /**
       * Set state of checked/selected of an item.
diff --git a/apps/OpenSpace/ext/launcher/include/profile/cameradialog.h b/apps/OpenSpace/ext/launcher/include/profile/cameradialog.h
index 8e2b0b7761..79e20b661e 100644
--- a/apps/OpenSpace/ext/launcher/include/profile/cameradialog.h
+++ b/apps/OpenSpace/ext/launcher/include/profile/cameradialog.h
@@ -56,7 +56,7 @@ private:
     QWidget* createNavStateWidget();
     QWidget* createGeoWidget();
 
-    void addErrorMsg(QString errorDescription);
+    void addErrorMsg(const QString& errorDescription);
     bool areRequiredFormsFilledAndValid();
 
     std::optional<openspace::Profile::CameraType>* _camera = nullptr;
diff --git a/apps/OpenSpace/ext/launcher/include/profile/deltatimesdialog.h b/apps/OpenSpace/ext/launcher/include/profile/deltatimesdialog.h
index 687a44844f..d6fd44fa1f 100644
--- a/apps/OpenSpace/ext/launcher/include/profile/deltatimesdialog.h
+++ b/apps/OpenSpace/ext/launcher/include/profile/deltatimesdialog.h
@@ -80,7 +80,7 @@ private:
      */
     void transitionEditMode(int index, bool state);
 
-    void setLabelForKey(int index, bool editMode, std::string color);
+    void setLabelForKey(int index, bool editMode, std::string_view color);
     bool isLineEmpty(int index);
 
     std::vector<double>* _deltaTimes = nullptr;
diff --git a/apps/OpenSpace/ext/launcher/include/profile/horizonsdialog.h b/apps/OpenSpace/ext/launcher/include/profile/horizonsdialog.h
index f08152a286..da4cb49118 100644
--- a/apps/OpenSpace/ext/launcher/include/profile/horizonsdialog.h
+++ b/apps/OpenSpace/ext/launcher/include/profile/horizonsdialog.h
@@ -71,7 +71,7 @@ private:
 
     void openSaveAs();
     void typeOnChange(int index);
-    void downloadProgress(int value, int max);
+    void downloadProgress(int value, int total);
     void importTimeRange();
 
     void approved();
diff --git a/apps/OpenSpace/ext/launcher/include/profile/modulesdialog.h b/apps/OpenSpace/ext/launcher/include/profile/modulesdialog.h
index d1d585fa66..45b232e97b 100644
--- a/apps/OpenSpace/ext/launcher/include/profile/modulesdialog.h
+++ b/apps/OpenSpace/ext/launcher/include/profile/modulesdialog.h
@@ -65,7 +65,6 @@ private:
     void transitionToEditMode();
     void parseSelections();
 
-    QString createOneLineSummary(openspace::Profile::Module m);
     void transitionFromEditMode();
     void editBoxDisabled(bool disabled);
     bool isLineEmpty(int index) const;
diff --git a/apps/OpenSpace/ext/launcher/include/profile/propertiesdialog.h b/apps/OpenSpace/ext/launcher/include/profile/propertiesdialog.h
index 819dec642e..a1ae8fc28d 100644
--- a/apps/OpenSpace/ext/launcher/include/profile/propertiesdialog.h
+++ b/apps/OpenSpace/ext/launcher/include/profile/propertiesdialog.h
@@ -69,7 +69,6 @@ private:
 
     void selectLineFromScriptLog();
 
-    QString createOneLineSummary(openspace::Profile::Property p);
     void transitionFromEditMode();
     void editBoxDisabled(bool disabled);
     bool areRequiredFormsFilled();
diff --git a/apps/OpenSpace/ext/launcher/include/sgctedit/displaywindowunion.h b/apps/OpenSpace/ext/launcher/include/sgctedit/displaywindowunion.h
index 16baee258e..2d41e61039 100644
--- a/apps/OpenSpace/ext/launcher/include/sgctedit/displaywindowunion.h
+++ b/apps/OpenSpace/ext/launcher/include/sgctedit/displaywindowunion.h
@@ -109,7 +109,7 @@ signals:
     void nWindowsChanged(int newCount);
 
 private:
-    void createWidgets(int nMaxWindows, std::vector<QRect> monitorResolutions,
+    void createWidgets(int nMaxWindows, const std::vector<QRect>& monitorResolutions,
         std::array<QColor, 4> windowColors, bool resetToDefault);
     void showWindows();
 
diff --git a/apps/OpenSpace/ext/launcher/include/sgctedit/monitorbox.h b/apps/OpenSpace/ext/launcher/include/sgctedit/monitorbox.h
index ba4f157285..99e0003fc8 100644
--- a/apps/OpenSpace/ext/launcher/include/sgctedit/monitorbox.h
+++ b/apps/OpenSpace/ext/launcher/include/sgctedit/monitorbox.h
@@ -66,9 +66,9 @@ public:
     /**
      * Called when the number of windows that should be displayed changes.
      *
-     * \param newCount The new number of windows included
+     * \param nWindows The new number of windows included
      */
-    void nWindowsDisplayedChanged(int newCount);
+    void nWindowsDisplayedChanged(int nWindows);
 
 protected:
     void paintEvent(QPaintEvent* event) override;
diff --git a/apps/OpenSpace/ext/launcher/include/sgctedit/sgctedit.h b/apps/OpenSpace/ext/launcher/include/sgctedit/sgctedit.h
index b94a469ddd..4db02f5a9b 100644
--- a/apps/OpenSpace/ext/launcher/include/sgctedit/sgctedit.h
+++ b/apps/OpenSpace/ext/launcher/include/sgctedit/sgctedit.h
@@ -66,7 +66,7 @@ public:
      * \param configBasePath The path to the folder where default config files reside
      * \param parent Pointer to parent Qt widget
      */
-    SgctEdit(sgct::config::Cluster& cluster, const std::string& configName,
+    SgctEdit(sgct::config::Cluster& cluster, std::string configName,
         std::string& configBasePath, QWidget* parent);
 
     /**
diff --git a/apps/OpenSpace/ext/launcher/include/sgctedit/windowcontrol.h b/apps/OpenSpace/ext/launcher/include/sgctedit/windowcontrol.h
index e3dd260b51..1116a2d7f7 100644
--- a/apps/OpenSpace/ext/launcher/include/sgctedit/windowcontrol.h
+++ b/apps/OpenSpace/ext/launcher/include/sgctedit/windowcontrol.h
@@ -199,7 +199,7 @@ private:
     void onSizeYChanged(int newValue);
     void onOffsetXChanged(int newValue);
     void onOffsetYChanged(int newValue);
-    void onProjectionChanged(int newSelection);
+    void onProjectionChanged(int newSelection) const;
     void onFullscreenClicked();
     void onAspectRatioLockClicked();
     void onFovLockClicked();
diff --git a/apps/OpenSpace/ext/launcher/src/filesystemaccess.cpp b/apps/OpenSpace/ext/launcher/src/filesystemaccess.cpp
index d0a3d6295b..208b04a30c 100644
--- a/apps/OpenSpace/ext/launcher/src/filesystemaccess.cpp
+++ b/apps/OpenSpace/ext/launcher/src/filesystemaccess.cpp
@@ -31,11 +31,12 @@ FileSystemAccess::FileSystemAccess(std::string fileExtension,
     , _useCheckboxes(useCheckboxes)
 {}
 
-std::string FileSystemAccess::useQtFileSystemModelToTraverseDir(std::string dir,
-                                                                bool userAssets) {
+std::string FileSystemAccess::useQtFileSystemModelToTraverseDir(const std::string& dir,
+                                                                bool userAssets)
+{
     _filesystemModel.setRootPath(QString::fromStdString(dir));
-    QModelIndex index = _filesystemModel.index(_filesystemModel.rootPath());
-    QFileInfo fileInfo = _filesystemModel.fileInfo(index);
+    const QModelIndex index = _filesystemModel.index(_filesystemModel.rootPath());
+    const QFileInfo fileInfo = _filesystemModel.fileInfo(index);
     std::vector<std::string> dirsNested;
     std::vector<std::string> out;
     parseChildDirElements(fileInfo, "", 0, dirsNested, out, userAssets);
@@ -46,32 +47,38 @@ std::string FileSystemAccess::useQtFileSystemModelToTraverseDir(std::string dir,
     return combined;
 }
 
-void FileSystemAccess::parseChildDirElements(QFileInfo fileInfo, std::string space,
-                                             int level,
+void FileSystemAccess::parseChildDirElements(const QFileInfo& fileInfo,
+                                             const std::string& space, int level,
                                              std::vector<std::string>& dirNames,
                                              std::vector<std::string>& output,
                                              bool userAssets)
 {
-    QDir dir(fileInfo.filePath());
+    const QDir dir = QDir(fileInfo.filePath());
     bool hasDirHeaderBeenAdded = false;
 
-    QFileInfoList fileList = dir.entryInfoList(_fileFilterOptions);
-    for (int i = 0; i < fileList.size(); i++) {
-        QFileInfo fi = fileList[i];
+    const QFileInfoList fileList = dir.entryInfoList(_fileFilterOptions);
+    for (const QFileInfo& fi : fileList) {
         std::string res = space + fi.fileName().toStdString();
         if (level == 0 && userAssets) {
-            res = "${USER_ASSETS}/" + res;
+            res = fmt::format("${{USER_ASSETS}}/{}", res);
         }
         if (fi.isDir()) {
             dirNames.push_back(res);
-            parseChildDirElements(fi, (space + " "), level + 1, dirNames, output, userAssets);
+            parseChildDirElements(
+                fi,
+                (space + " "),
+                level + 1,
+                dirNames,
+                output,
+                userAssets
+            );
         }
         else {
             parseChildFile(res, hasDirHeaderBeenAdded, dirNames, output);
         }
     }
-    bool isThisDirAnEmptyDeadEnd = !hasDirHeaderBeenAdded;
-    if (isThisDirAnEmptyDeadEnd && (dirNames.size() != 0)) {
+    const bool isThisDirAnEmptyDeadEnd = !hasDirHeaderBeenAdded;
+    if (isThisDirAnEmptyDeadEnd && !dirNames.empty()) {
         dirNames.pop_back();
     }
 }
@@ -80,12 +87,12 @@ void FileSystemAccess::parseChildFile(std::string filename, bool& hasDirHeaderBe
                                       std::vector<std::string>& dirNames,
                                       std::vector<std::string>& output)
 {
-    std::string cbox = (_useCheckboxes) ? "0" : "";
+    const std::string cbox = _useCheckboxes ? "0" : "";
     if (filename.length() <= _fileExtension.length()) {
         return;
     }
     else {
-        std::string extension = filename.substr(filename.length()
+        const std::string extension = filename.substr(filename.length()
             - _fileExtension.length());
         if (extension != _fileExtension) {
             return;
diff --git a/apps/OpenSpace/ext/launcher/src/launcherwindow.cpp b/apps/OpenSpace/ext/launcher/src/launcherwindow.cpp
index 8a2657fcfa..5c8766efc9 100644
--- a/apps/OpenSpace/ext/launcher/src/launcherwindow.cpp
+++ b/apps/OpenSpace/ext/launcher/src/launcherwindow.cpp
@@ -194,6 +194,13 @@ namespace {
             );
         }
     }
+
+    bool versionCheck(sgct::config::GeneratorVersion& v) {
+        return
+            v.versionCheck(versionMin) ||
+            v == versionLegacy18 ||
+            v == versionLegacy19;
+    }
 } // namespace
 
 using namespace openspace;
@@ -211,14 +218,14 @@ LauncherWindow::LauncherWindow(bool profileEnabled,
     , _userProfilePath(
         absPath(globalConfig.pathTokens.at("USER_PROFILES")).string() + '/'
     )
-    , _sgctConfigName(sgctConfigName)
+    , _sgctConfigName(std::move(sgctConfigName))
 {
     Q_INIT_RESOURCE(resources);
 
     qInstallMessageHandler(
         [](QtMsgType type, const QMessageLogContext&, const QString& msg) {
             if (type == QtCriticalMsg || type == QtFatalMsg || type == QtSystemMsg) {
-                std::cerr << msg.toStdString() << std::endl;
+                std::cerr << msg.toStdString() << '\n';
             }
         }
     );
@@ -230,7 +237,7 @@ LauncherWindow::LauncherWindow(bool profileEnabled,
     {
         QFile file(":/qss/launcher.qss");
         file.open(QFile::ReadOnly);
-        QString styleSheet = QLatin1String(file.readAll());
+        const QString styleSheet = QLatin1String(file.readAll());
         setStyleSheet(styleSheet);
     }
 
@@ -244,7 +251,7 @@ LauncherWindow::LauncherWindow(bool profileEnabled,
     // Trigger currentIndexChanged so the preview file read is performed
     _windowConfigBox->currentIndexChanged(_windowConfigBox->currentIndex());
 
-    std::filesystem::path p = absPath(
+    const std::filesystem::path p = absPath(
         globalConfig.pathTokens.at("SYNC") + "/http/launcher_images"
     );
     if (std::filesystem::exists(p)) {
@@ -324,8 +331,8 @@ QWidget* LauncherWindow::createCentralWidget() {
         editProfileButton, &QPushButton::released,
         [this]() {
             const std::string selection = _profileBox->currentText().toStdString();
-            int selectedIndex = _profileBox->currentIndex();
-            bool isUserProfile = selectedIndex < _userAssetCount;
+            const int selectedIndex = _profileBox->currentIndex();
+            const bool isUserProfile = selectedIndex < _userAssetCount;
             openProfileEditor(selection, isUserProfile);
         }
     );
@@ -349,9 +356,9 @@ QWidget* LauncherWindow::createCentralWidget() {
         _editWindowButton,
         &QPushButton::released,
         [this]() {
-            std::filesystem::path pathSelected = absPath(selectedWindowConfig());
-            bool isUserConfig = isUserConfigSelected();
-            std::string fileSelected = pathSelected.generic_string();
+            const std::filesystem::path pathSelected = absPath(selectedWindowConfig());
+            const bool isUserConfig = isUserConfigSelected();
+            const std::string fileSelected = pathSelected.generic_string();
             if (std::filesystem::is_regular_file(pathSelected)) {
                 openWindowEditor(fileSelected, isUserConfig);
             }
@@ -446,7 +453,7 @@ void LauncherWindow::setBackgroundImage(const std::string& syncPath) {
     std::shuffle(files.begin(), files.end(), g);
     // We know there has to be at least one folder, so it's fine to just pick the first
     while (!files.empty()) {
-        std::string p = files.front();
+        const std::string& p = files.front();
         if (std::filesystem::path(p).extension() == ".png") {
             // If the top path starts with the png extension, we have found our candidate
             break;
@@ -460,12 +467,12 @@ void LauncherWindow::setBackgroundImage(const std::string& syncPath) {
 
     // There better be at least one file left, but just in in case
     if (!files.empty()) {
-        std::string image = files.front();
+        const std::string& image = files.front();
         _backgroundImage->setPixmap(QPixmap(QString::fromStdString(image)));
     }
 }
 
-void LauncherWindow::populateProfilesList(std::string preset) {
+void LauncherWindow::populateProfilesList(const std::string& preset) {
     namespace fs = std::filesystem;
     
     _profileBox->clear();
@@ -497,7 +504,7 @@ void LauncherWindow::populateProfilesList(std::string preset) {
     }
     std::sort(profiles.begin(), profiles.end());
     for (const fs::directory_entry& profile : profiles) {
-        std::filesystem::path path = profile.path();
+        const std::filesystem::path& path = profile.path();
         _profileBox->addItem(
             QString::fromStdString(path.stem().string()),
             QString::fromStdString(path.string())
@@ -505,12 +512,14 @@ void LauncherWindow::populateProfilesList(std::string preset) {
 
         // Add toooltip
         std::optional<Profile> p = loadProfileFromFile(this, path.string());
-        int idx = _profileBox->count() - 1;
+        const int idx = _profileBox->count() - 1;
         if (p.has_value() && (*p).meta.has_value()) {
             const std::optional<std::string>& d = p->meta.value().description;
             if (d.has_value()) {
                 // Tooltip has to be 'rich text' to linebreak properly
-                QString tooltip = QString::fromStdString(fmt::format("<p>{}</p>", *d));
+                const QString tooltip = QString::fromStdString(fmt::format(
+                    "<p>{}</p>", *d
+                ));
                 _profileBox->setItemData(idx, tooltip, Qt::ToolTipRole);
             }
         }
@@ -533,7 +542,7 @@ void LauncherWindow::populateProfilesList(std::string preset) {
 
     // Add sorted items to list
     for (const fs::directory_entry& profile : profiles) {
-        std::filesystem::path path = profile.path();
+        const std::filesystem::path& path = profile.path();
         _profileBox->addItem(
             QString::fromStdString(path.stem().string()),
             QString::fromStdString(path.string())
@@ -541,12 +550,14 @@ void LauncherWindow::populateProfilesList(std::string preset) {
 
         // Add toooltip
         std::optional<Profile> p = loadProfileFromFile(this, path.string());
-        int idx = _profileBox->count() - 1;
+        const int idx = _profileBox->count() - 1;
         if (p.has_value() && (*p).meta.has_value()) {
             const std::optional<std::string>& d = p->meta.value().description;
             if (d.has_value()) {
                 // Tooltip has to be 'rich text' to linebreak properly
-                QString tooltip = QString::fromStdString(fmt::format("<p>{}</p>", *d));
+                const QString tooltip = QString::fromStdString(fmt::format(
+                    "<p>{}</p>", *d
+                ));
                 _profileBox->setItemData(idx, tooltip, Qt::ToolTipRole);
             }
         }
@@ -583,14 +594,14 @@ bool handleConfigurationFile(QComboBox& box, const std::filesystem::directory_en
     if (isJson) {
         std::string tooltipDescription;
         try {
-            sgct::config::Meta meta = sgct::readMeta(p.path().string());
+            const sgct::config::Meta meta = sgct::readMeta(p.path().string());
             tooltipDescription = meta.description;
         }
         catch (const sgct::Error&) {
             tooltipDescription = "(no description available)";
         }
         if (!tooltipDescription.empty()) {
-            QString toolTip = QString::fromStdString(
+            const QString toolTip = QString::fromStdString(
                 fmt::format("<p>{}</p>", tooltipDescription)
             );
             box.setItemData(box.count() - 1, toolTip, Qt::ToolTipRole);
@@ -600,7 +611,7 @@ bool handleConfigurationFile(QComboBox& box, const std::filesystem::directory_en
     return true;
 }
 
-void LauncherWindow::populateWindowConfigsList(std::string preset) {
+void LauncherWindow::populateWindowConfigsList(const std::string& preset) {
     namespace fs = std::filesystem;
 
     // Disconnect the signal for new window config selection during population process
@@ -633,7 +644,7 @@ void LauncherWindow::populateWindowConfigsList(std::string preset) {
 
     // Add all the files with the .json extension to the dropdown
     for (const fs::directory_entry& p : files) {
-        bool isConfigFile = handleConfigurationFile(*_windowConfigBox, p);
+        const bool isConfigFile = handleConfigurationFile(*_windowConfigBox, p);
         if (isConfigFile) {
             _userConfigCount++;
             _userConfigStartingIdx++;
@@ -669,7 +680,7 @@ void LauncherWindow::populateWindowConfigsList(std::string preset) {
         _windowConfigBoxIndexSgctCfgDefault,
         QString::fromStdString(_sgctConfigName)
     );
-    QString defaultTip = 
+    const QString defaultTip =
         "<p>The basic default configuration specified in the .cfg file</p>";
     _windowConfigBox->setItemData(
         _windowConfigBoxIndexSgctCfgDefault,
@@ -679,7 +690,7 @@ void LauncherWindow::populateWindowConfigsList(std::string preset) {
     // Try to find the requested configuration file and set it as the current one. As we
     // have support for function-generated configuration files that will not be in the
     // list we need to add a preset that doesn't exist a file for
-    const int idx = _windowConfigBox->findText(QString::fromStdString(std::move(preset)));
+    const int idx = _windowConfigBox->findText(QString::fromStdString(preset));
     if (idx != -1) {
         _windowConfigBox->setCurrentIndex(idx);
     }
@@ -707,8 +718,8 @@ void LauncherWindow::populateWindowConfigsList(std::string preset) {
 }
 
 void LauncherWindow::onNewWindowConfigSelection(int newIndex) {
-    std::filesystem::path pathSelected = absPath(selectedWindowConfig());
-    std::string fileSelected = pathSelected.string();
+    const std::filesystem::path pathSelected = absPath(selectedWindowConfig());
+    const std::string fileSelected = pathSelected.string();
     if (newIndex == _windowConfigBoxIndexSgctCfgDefault) {
         _editWindowButton->setEnabled(false);
         _editWindowButton->setToolTip(
@@ -746,10 +757,6 @@ void LauncherWindow::onNewWindowConfigSelection(int newIndex) {
     }
 }
 
-bool LauncherWindow::versionCheck(sgct::config::GeneratorVersion& v) const {
-    return (v.versionCheck(versionMin) || v == versionLegacy18 || v == versionLegacy19);
-}
-
 void LauncherWindow::openProfileEditor(const std::string& profile, bool isUserProfile) {
     std::optional<Profile> p;
     std::string saveProfilePath = isUserProfile ? _userProfilePath : _profilePath;
@@ -760,13 +767,13 @@ void LauncherWindow::openProfileEditor(const std::string& profile, bool isUserPr
     else {
         // Otherwise, we want to load that profile
         std::string fullProfilePath = saveProfilePath + profile + ".profile";
-        p = loadProfileFromFile(this, fullProfilePath);
+        p = loadProfileFromFile(this, std::move(fullProfilePath));
         if (!p.has_value()) {
             return;
         }
     }
 
-    ProfileEdit editor(
+    ProfileEdit editor = ProfileEdit(
         *p,
         profile,
         _assetPath,
@@ -891,8 +898,8 @@ void LauncherWindow::handleReturnFromWindowEditor(const sgct::config::Cluster& c
     savePath.replace_extension(".json");
     saveWindowConfig(this, savePath, cluster);
     // Truncate path to convert this back to path relative to _userConfigPath
-    std::string p = std::filesystem::proximate(savePath, saveWindowCfgPath).string();
-    populateWindowConfigsList(p);
+    std::filesystem::path p = std::filesystem::proximate(savePath, saveWindowCfgPath);
+    populateWindowConfigsList(p.string());
 }
 
 bool LauncherWindow::wasLaunchSelected() const {
@@ -918,6 +925,6 @@ std::string LauncherWindow::selectedWindowConfig() const {
 }
 
 bool LauncherWindow::isUserConfigSelected() const {
-    int selectedIndex = _windowConfigBox->currentIndex();
+    const int selectedIndex = _windowConfigBox->currentIndex();
     return (selectedIndex <= _userConfigCount);
 }
diff --git a/apps/OpenSpace/ext/launcher/src/profile/actiondialog.cpp b/apps/OpenSpace/ext/launcher/src/profile/actiondialog.cpp
index 7e23515146..5e311b1219 100644
--- a/apps/OpenSpace/ext/launcher/src/profile/actiondialog.cpp
+++ b/apps/OpenSpace/ext/launcher/src/profile/actiondialog.cpp
@@ -56,8 +56,8 @@ namespace {
 
     void updateListItem(QListWidgetItem* item, const Profile::Keybinding& kb) {
         ghoul_assert(item, "Item must exist at this point");
-        std::string name = fmt::format("{}\t{}", ghoul::to_string(kb.key), kb.action);
-        item->setText(QString::fromStdString(name));
+        const std::string n = fmt::format("{}\t{}", ghoul::to_string(kb.key), kb.action);
+        item->setText(QString::fromStdString(n));
     }
 } // namespace
 
@@ -141,7 +141,7 @@ void ActionDialog::createActionWidgets(QGridLayout* layout) {
     );
 
     for (const Profile::Action& action : _actionData) {
-        std::string name = action.name.empty() ? action.identifier : action.name;
+        const std::string name = action.name.empty() ? action.identifier : action.name;
         _actionWidgets.list->addItem(new QListWidgetItem(QString::fromStdString(name)));
     }
 
@@ -160,8 +160,8 @@ void ActionDialog::createActionWidgets(QGridLayout* layout) {
         _actionWidgets.identifier, &QLineEdit::textEdited,
         [this]() {
             // Check if the identifier is legal
-            std::string identifier = _actionWidgets.identifier->text().toStdString();
-            bool isLegal = identifier.find_first_of("\t\n. ") == std::string::npos;
+            const std::string id = _actionWidgets.identifier->text().toStdString();
+            const bool isLegal = id.find_first_of("\t\n. ") == std::string::npos;
             if (isLegal) {
                 _actionWidgets.infoText->clear();
                 _actionWidgets.infoText->setHidden(true);
@@ -452,7 +452,7 @@ Profile::Action* ActionDialog::selectedAction() {
 
 void ActionDialog::actionAdd() {
     _actionWidgets.list->addItem("");
-    _actionData.push_back(Profile::Action());
+    _actionData.emplace_back();
     _actionWidgets.list->setCurrentRow(_actionWidgets.list->count() - 1);
 }
 
@@ -471,7 +471,7 @@ void ActionDialog::actionRemove() {
         if (kb.action != action->identifier) {
             continue;
         }
-        QMessageBox::StandardButton button = QMessageBox::information(
+        const QMessageBox::StandardButton button = QMessageBox::information(
             this,
             "Remove action",
             QString::fromStdString(fmt::format(
@@ -561,14 +561,14 @@ void ActionDialog::actionSelected() {
 }
 
 void ActionDialog::actionSaved() {
-    std::string newIdentifier = _actionWidgets.identifier->text().toStdString();
+    const std::string newIdentifier = _actionWidgets.identifier->text().toStdString();
     if (newIdentifier.empty()) {
         QMessageBox::critical(this, "Empty identifier", "Identifier must not be empty");
         return;
     }
 
     Profile::Action* action = selectedAction();
-    std::string oldIdentifier = action->identifier;
+    const std::string oldIdentifier = action->identifier;
     if (oldIdentifier != newIdentifier) {
         // The identifier is a bit special as we need to make sure that we didn't
         // accidentally create a duplicate while renaming the currently selected action.
@@ -680,8 +680,8 @@ void ActionDialog::chooseScripts() {
 }
 
 void ActionDialog::appendScriptsToTextfield(std::vector<std::string> scripts) {
-    for (std::string script : scripts) {
-        _actionWidgets.script->append(QString::fromStdString(std::move(script)));
+    for (const std::string script : scripts) {
+        _actionWidgets.script->append(QString::fromStdString(script));
     }
 }
 
@@ -830,8 +830,8 @@ void ActionDialog::clearKeybindingFields() {
 }
 
 void ActionDialog::keybindingRejected() {
-    bool isKeyEmpty = (_keybindingsData.back().key.key == Key::Unknown);
-    bool isActionEmpty = _keybindingsData.back().action.empty();
+    const bool isKeyEmpty = (_keybindingsData.back().key.key == Key::Unknown);
+    const bool isActionEmpty = _keybindingsData.back().action.empty();
     if (isKeyEmpty || isActionEmpty) {
         delete _keybindingWidgets.list->takeItem(_keybindingWidgets.list->count() - 1);
         _keybindingsData.erase(_keybindingsData.begin() + _keybindingsData.size() - 1);
diff --git a/apps/OpenSpace/ext/launcher/src/profile/additionalscriptsdialog.cpp b/apps/OpenSpace/ext/launcher/src/profile/additionalscriptsdialog.cpp
index 32638b74a5..e3d8108f58 100644
--- a/apps/OpenSpace/ext/launcher/src/profile/additionalscriptsdialog.cpp
+++ b/apps/OpenSpace/ext/launcher/src/profile/additionalscriptsdialog.cpp
@@ -44,11 +44,12 @@ AdditionalScriptsDialog::AdditionalScriptsDialog(QWidget* parent,
     setWindowTitle("Additional Scripts");
     createWidgets();
 
-    std::string scriptText = std::accumulate(
+    const std::string scriptText = std::accumulate(
         _scriptsData.begin(), _scriptsData.end(),
-        std::string(), [](std::string lhs, std::string rhs) { return lhs + rhs + '\n'; }
+        std::string(),
+        [](std::string lhs, const std::string& rhs) { return lhs + rhs + '\n'; }
     );
-    _textScripts->setText(QString::fromStdString(std::move(scriptText)));
+    _textScripts->setText(QString::fromStdString(scriptText));
     _textScripts->moveCursor(QTextCursor::MoveOperation::End);
 }
 
@@ -109,8 +110,10 @@ void AdditionalScriptsDialog::chooseScripts() {
     d.exec();
 }
 
-void AdditionalScriptsDialog::appendScriptsToTextfield(std::vector<std::string> scripts) {
-    for (std::string script : scripts) {
-        _textScripts->append(QString::fromStdString(std::move(script)));
+void AdditionalScriptsDialog::appendScriptsToTextfield(
+                                                  const std::vector<std::string>& scripts)
+{
+    for (const std::string& script : scripts) {
+        _textScripts->append(QString::fromStdString(script));
     }
 }
diff --git a/apps/OpenSpace/ext/launcher/src/profile/assetsdialog.cpp b/apps/OpenSpace/ext/launcher/src/profile/assetsdialog.cpp
index 1186a649db..cb7800ddb7 100644
--- a/apps/OpenSpace/ext/launcher/src/profile/assetsdialog.cpp
+++ b/apps/OpenSpace/ext/launcher/src/profile/assetsdialog.cpp
@@ -46,7 +46,7 @@ namespace {
             QModelIndex idx = model.index(r, 0, parent);
 
             if (!model.isAsset(idx)) {
-                int nChildRows = model.childCount(idx);
+                const int nChildRows = model.childCount(idx);
                 if (traverseToExpandSelectedItems(tree, model, nChildRows, idx)) {
                     tree.setExpanded(idx, true);
                     isExpanded = true;
@@ -63,25 +63,25 @@ namespace {
                                        int nRows, const std::string& path)
     {
         int startIndex = 0;
-        std::string token = "${USER_ASSETS}/";
+        const std::string token = "${USER_ASSETS}/";
         if (path.starts_with(token)) {
             startIndex = static_cast<int>(token.length());
         }
         const size_t slash = path.find_first_of('/', startIndex);
         const bool endOfPath = (slash == std::string::npos);
-        std::string firstDir = endOfPath ? "" : path.substr(0, slash);
+        const std::string firstDir = endOfPath ? "" : path.substr(0, slash);
 
         if (!endOfPath) {
-            std::string nextPath = (slash == std::string::npos) ?
+            const std::string nextPath = (slash == std::string::npos) ?
                 path :
                 path.substr(slash + 1);
             bool foundDirMatch = false;
             for (int r = 0; r < nRows; r++) {
                 QModelIndex idx = model.index(r, 0, parent);
-                std::string assetName = model.name(idx).toStdString();
+                const std::string assetName = model.name(idx).toStdString();
                 if (!model.isAsset(idx)) {
                     if (firstDir == assetName) {
-                        int nChildRows = model.childCount(idx);
+                        const int nChildRows = model.childCount(idx);
                         foundDirMatch = true;
                         traverseToFindFilesystemMatch(model, idx, nChildRows, nextPath);
                         break;
@@ -104,7 +104,7 @@ namespace {
             bool foundFileMatch = false;
             for (int r = 0; r < nRows; r++) {
                 QModelIndex idx = model.index(r, 0, parent);
-                std::string assetName = model.name(idx).toStdString();
+                const std::string assetName = model.name(idx).toStdString();
                 // Need to check if it actually is an asset to prevent issue #2154
                 if (model.isAsset(idx) && path == assetName) {
                     foundFileMatch = true;
@@ -173,12 +173,12 @@ AssetsDialog::AssetsDialog(QWidget* parent, openspace::Profile* profile,
 
 
         for (const std::string& a : _profile->assets) {
-            QModelIndex p = _assetTreeModel.index(-1, 0);
-            int nRows = _assetTreeModel.rowCount(p);
+            const QModelIndex p = _assetTreeModel.index(-1, 0);
+            const int nRows = _assetTreeModel.rowCount(p);
             traverseToFindFilesystemMatch(_assetTreeModel, p, nRows, a);
         }
 
-        int nRows = _assetTreeModel.rowCount(_assetTreeModel.index(-1, 0));
+        const int nRows = _assetTreeModel.rowCount(_assetTreeModel.index(-1, 0));
         traverseToExpandSelectedItems(
             *_assetTree,
             _assetTreeModel,
@@ -250,9 +250,9 @@ QString AssetsDialog::createTextSummary() {
     }
     QString summary;
     for (size_t i = 0; i < summaryItems.size(); i++) {
-        bool existsInFilesystem = summaryItems.at(i)->doesExistInFilesystem();
+        const bool existsInFilesystem = summaryItems.at(i)->doesExistInFilesystem();
 
-        std::string s = existsInFilesystem ?
+        const std::string s = existsInFilesystem ?
             fmt::format("{}<br>", summaryPaths.at(i)) :
             fmt::format("<font color='red'>{}</font><br>", summaryPaths.at(i));
         summary += QString::fromStdString(s);
@@ -316,7 +316,7 @@ void SearchProxyModel::setFilterRegularExpression(const QString& pattern) {
 bool SearchProxyModel::filterAcceptsRow(int sourceRow,
                                         const QModelIndex& sourceParent) const
 {
-    QModelIndex idx = sourceModel()->index(sourceRow, 0, sourceParent);
+    const QModelIndex idx = sourceModel()->index(sourceRow, 0, sourceParent);
     return acceptIndex(idx);
 }
 
@@ -324,13 +324,14 @@ bool SearchProxyModel::acceptIndex(const QModelIndex& idx) const {
     if (!idx.isValid() || !_regExPattern) {
         return false;
     }
-    QString text = idx.data(Qt::DisplayRole).toString();
-    QRegularExpressionMatchIterator matchIterator = _regExPattern->globalMatch(text);
-    if (matchIterator.hasNext()) {
+    const QString text = idx.data(Qt::DisplayRole).toString();
+    const QRegularExpressionMatchIterator matchIt = _regExPattern->globalMatch(text);
+    if (matchIt.hasNext()) {
         return true;
     }
     for (int row = 0; row < idx.model()->rowCount(idx); ++row) {
-        if (acceptIndex(idx.model()->index(row, 0, idx))) {
+        const bool accept = acceptIndex(idx.model()->index(row, 0, idx));
+        if (accept) {
             return true;
         }
     }
diff --git a/apps/OpenSpace/ext/launcher/src/profile/assettreeitem.cpp b/apps/OpenSpace/ext/launcher/src/profile/assettreeitem.cpp
index 3d571f55d4..15a9b69e08 100644
--- a/apps/OpenSpace/ext/launcher/src/profile/assettreeitem.cpp
+++ b/apps/OpenSpace/ext/launcher/src/profile/assettreeitem.cpp
@@ -121,8 +121,8 @@ bool AssetTreeItem::insertChildren(int position, int count, int columns) {
     }
 
     for (int row = 0; row < count; ++row) {
-        std::vector<QVariant> data(columns);
-        AssetTreeItem*item = new AssetTreeItem(data, this);
+        std::vector<QVariant> data = std::vector<QVariant>(columns);
+        AssetTreeItem* item = new AssetTreeItem(std::move(data), this);
         _childItems.insert(_childItems.begin() + position, item);
     }
 
diff --git a/apps/OpenSpace/ext/launcher/src/profile/assettreemodel.cpp b/apps/OpenSpace/ext/launcher/src/profile/assettreemodel.cpp
index 71b414c399..43aef3688c 100644
--- a/apps/OpenSpace/ext/launcher/src/profile/assettreemodel.cpp
+++ b/apps/OpenSpace/ext/launcher/src/profile/assettreemodel.cpp
@@ -39,7 +39,7 @@ namespace {
         bool existsInFilesystem = true;
     };
 
-    int getLevelFromLine(std::string line) {
+    int getLevelFromLine(const std::string& line) {
         int level = 0;
         for (unsigned int i = 0; i < line.length(); i++) {
             if (line.substr(i, 1) == " ") {
@@ -80,14 +80,19 @@ namespace {
         int nChildInsert = -1;
         bool continueToNextLine = true;
 
-        while (continueToNextLine && elem.line.length() != 0) {
-            int levelChange = elem.level - level;
+        while (continueToNextLine && !elem.line.empty()) {
+            const int levelChange = elem.level - level;
 
             if (levelChange == 0) {
                 parent->insertChildren(++nChildInsert, 1, 3);
-                parent->child(nChildInsert)->setData(0, QString::fromStdString(elem.line));
-                bool shouldMakeElemChecked = (elem.checked || !elem.existsInFilesystem);
-                Qt::CheckState check = (shouldMakeElemChecked) ? Qt::Checked : Qt::Unchecked;
+                parent->child(nChildInsert)->setData(
+                    0,
+                    QString::fromStdString(elem.line)
+                );
+                const bool shouldMakeElemChecked =
+                    (elem.checked || !elem.existsInFilesystem);
+                const Qt::CheckState check =
+                    shouldMakeElemChecked ? Qt::Checked : Qt::Unchecked;
                 parent->child(nChildInsert)->setData(1, check);
                 parent->child(nChildInsert)->setExistsInFilesystem(elem.existsInFilesystem);
                 continueToNextLine = importGetNextLine(elem, iss);
@@ -96,7 +101,6 @@ namespace {
                 importInsertItem(iss, parent->child(nChildInsert), elem, level + 1);
             }
             else if (levelChange < 0) {
-                continueToNextLine = false;
                 break;
             }
         }
@@ -108,14 +112,14 @@ namespace {
                                   std::vector<AssetTreeItem*>& outputItems,
                                   std::string pathPrefix)
     {
-        std::string itemName = item->data(0).toString().toStdString();
-        bool isPathPrefix = ((pathPrefix.length()) == 0 && (itemName == Header1));
+        const std::string itemName = item->data(0).toString().toStdString();
+        const bool isPathPrefix = ((pathPrefix.length()) == 0 && (itemName == Header1));
 
         if (item->isAsset()) {
             if (item->isChecked()) {
                 std::string path = pathPrefix + itemName;
                 outputItems.push_back(item);
-                outputPaths.push_back(path);
+                outputPaths.push_back(std::move(path));
             }
         }
         else {
@@ -200,7 +204,7 @@ QString AssetTreeModel::name(QModelIndex& index) const {
     return item(index)->name();
 }
 
-void AssetTreeModel::setName(QModelIndex& index, QString name) {
+void AssetTreeModel::setName(QModelIndex& index, const QString& name) {
     item(index)->setData(0, name);
 }
 
@@ -245,7 +249,7 @@ QModelIndex AssetTreeModel::index(int row, int column, const QModelIndex& parent
 }
 
 QModelIndex AssetTreeModel::parent(int row, int column, const QModelIndex& parent) const {
-    QModelIndex idx = index(row, column, parent);
+    const QModelIndex idx = index(row, column, parent);
     return AssetTreeModel::parent(idx);
 }
 
diff --git a/apps/OpenSpace/ext/launcher/src/profile/cameradialog.cpp b/apps/OpenSpace/ext/launcher/src/profile/cameradialog.cpp
index 5966da0fcc..1f1e0d8f07 100644
--- a/apps/OpenSpace/ext/launcher/src/profile/cameradialog.cpp
+++ b/apps/OpenSpace/ext/launcher/src/profile/cameradialog.cpp
@@ -47,9 +47,9 @@ namespace {
     template <class... Ts> overloaded(Ts...) -> overloaded<Ts...>;
 
     bool inNumericalRange(QLineEdit* le, float min, float max) {
-        QString s = le->text();
+        const QString s = le->text();
         bool validConversion = false;
-        float value = s.toFloat(&validConversion);
+        const float value = s.toFloat(&validConversion);
         if (!validConversion) {
             return false;
         }
@@ -60,9 +60,9 @@ namespace {
     }
 
     bool isNumericalLargerThan(QLineEdit* le, float limit) {
-        QString s = le->text();
+        const QString s = le->text();
         bool validConversion = false;
-        float value = s.toFloat(&validConversion);
+        const float value = s.toFloat(&validConversion);
         if (!validConversion) {
             return false;
         }
@@ -353,17 +353,17 @@ QWidget* CameraDialog::createNavStateWidget() {
     connect(
         loadFile, &QPushButton::clicked,
         [this]() {
-            QString file = QFileDialog::getOpenFileName(
+            const QString file = QFileDialog::getOpenFileName(
                 this,
                 "Select navigate state file"
             );
 
-            std::ifstream f(file.toStdString());
-            std::string contents = std::string(
-                (std::istreambuf_iterator<char>(f)),
+            std::ifstream f = std::ifstream(file.toStdString());
+            const std::string contents = std::string(
+                std::istreambuf_iterator<char>(f),
                 std::istreambuf_iterator<char>()
             );
-            nlohmann::json json = nlohmann::json::parse(contents);
+            const nlohmann::json json = nlohmann::json::parse(contents);
 
             using namespace openspace::interaction;
             NavigationState state = NavigationState(json);
@@ -529,7 +529,7 @@ bool CameraDialog::areRequiredFormsFilledAndValid() {
     return allFormsOk;
 }
 
-void CameraDialog::addErrorMsg(QString errorDescription) {
+void CameraDialog::addErrorMsg(const QString& errorDescription) {
     QString contents = _errorMsg->text();
     if (!contents.isEmpty()) {
         contents += ", ";
@@ -563,7 +563,7 @@ void CameraDialog::approved() {
             !_navState.upY->text().isEmpty() &&
             !_navState.upZ->text().isEmpty())
         {
-            glm::dvec3 u = glm::dvec3(
+            const glm::dvec3 u = glm::dvec3(
                 _navState.upX->text().toDouble(),
                 _navState.upY->text().toDouble(),
                 _navState.upZ->text().toDouble()
diff --git a/apps/OpenSpace/ext/launcher/src/profile/deltatimesdialog.cpp b/apps/OpenSpace/ext/launcher/src/profile/deltatimesdialog.cpp
index cbaf315149..5c208e9e0e 100644
--- a/apps/OpenSpace/ext/launcher/src/profile/deltatimesdialog.cpp
+++ b/apps/OpenSpace/ext/launcher/src/profile/deltatimesdialog.cpp
@@ -70,9 +70,9 @@ namespace {
             return "";
         }
 
-        size_t i;
+        size_t i = 0;
         for (i = 0; i < (TimeIntervals.size() - 1); i++) {
-            if (abs(value) >= TimeIntervals[i].secondsPerInterval) {
+            if (std::abs(value) >= TimeIntervals[i].secondsPerInterval) {
                 break;
             }
         }
@@ -89,7 +89,7 @@ DeltaTimesDialog::DeltaTimesDialog(QWidget* parent, std::vector<double>* deltaTi
     createWidgets();
 
     for (size_t d = 0; d < _deltaTimesData.size(); ++d) {
-        std::string summary = createSummaryForDeltaTime(d, true);
+        const std::string summary = createSummaryForDeltaTime(d, true);
         _listWidget->addItem(new QListWidgetItem(QString::fromStdString(summary)));
     }
 
@@ -185,7 +185,7 @@ void DeltaTimesDialog::createWidgets() {
 std::string DeltaTimesDialog::createSummaryForDeltaTime(size_t idx, bool forListView) {
     int k = (idx % 10 == 9) ? 0 : idx % 10 + 1;
     k = (idx == 0) ? 1 : k;
-    std::string key = std::to_string(k);
+    const std::string key = std::to_string(k);
 
     std::string s;
     if (idx >= 20) {
@@ -211,7 +211,7 @@ std::string DeltaTimesDialog::createSummaryForDeltaTime(size_t idx, bool forList
 
 void DeltaTimesDialog::listItemSelected() {
     QListWidgetItem *item = _listWidget->currentItem();
-    int index = _listWidget->row(item);
+    const int index = _listWidget->row(item);
 
     if (index < (static_cast<int>(_deltaTimesData.size()) - 1)) {
         _listWidget->setCurrentRow(index);
@@ -229,7 +229,7 @@ void DeltaTimesDialog::listItemSelected() {
     transitionEditMode(index, true);
 }
 
-void DeltaTimesDialog::setLabelForKey(int index, bool editMode, std::string color) {
+void DeltaTimesDialog::setLabelForKey(int index, bool editMode, std::string_view color) {
     std::string labelS = "Set Simulation Time Increment for key";
     if (index >= static_cast<int>(_deltaTimesData.size())) {
         index = static_cast<int>(_deltaTimesData.size()) - 1;
@@ -237,9 +237,9 @@ void DeltaTimesDialog::setLabelForKey(int index, bool editMode, std::string colo
     if (editMode) {
         labelS += " '" + createSummaryForDeltaTime(index, false) + "':";
     }
-    _adjustLabel->setText(QString::fromStdString(
-        "<font color='" + color + "'>" + labelS + "</font>"
-    ));
+    _adjustLabel->setText(QString::fromStdString(fmt::format(
+        "<font color='{}'>{}</font>", color, labelS
+    )));
 }
 
 void DeltaTimesDialog::valueChanged(const QString& text) {
@@ -247,9 +247,9 @@ void DeltaTimesDialog::valueChanged(const QString& text) {
         _errorMsg->setText("");
     }
     else {
-        int value = text.toDouble();
-        if (value != 0) {
-            _value->setText(QString::fromStdString(timeDescription(text.toDouble())));
+        const double value = text.toDouble();
+        if (value != 0.0) {
+            _value->setText(QString::fromStdString(timeDescription(value)));
             _errorMsg->setText("");
         }
     }
@@ -267,7 +267,7 @@ bool DeltaTimesDialog::isLineEmpty(int index) {
 }
 
 void DeltaTimesDialog::addDeltaTimeValue() {
-    int currentListSize = _listWidget->count();
+    const int currentListSize = _listWidget->count();
     const QString messageAddValue = "  (Enter integer value below & click 'Save')";
 
     if ((currentListSize == 1) && (isLineEmpty(0))) {
@@ -292,9 +292,9 @@ void DeltaTimesDialog::addDeltaTimeValue() {
 void DeltaTimesDialog::saveDeltaTimeValue() {
     QListWidgetItem* item = _listWidget->currentItem();
     if (item && !_deltaTimesData.empty()) {
-        int index = _listWidget->row(item);
+        const int index = _listWidget->row(item);
         _deltaTimesData.at(index) = _seconds->text().toDouble();
-        std::string summary = createSummaryForDeltaTime(index, true);
+        const std::string summary = createSummaryForDeltaTime(index, true);
         _listWidget->item(index)->setText(QString::fromStdString(summary));
         transitionEditMode(index, false);
         _editModeNewItem = false;
@@ -362,6 +362,7 @@ void DeltaTimesDialog::parseSelections() {
         }
     }
     std::vector<double> tempDt;
+    tempDt.reserve(finalNonzeroIndex);
     for (int i = 0; i < (finalNonzeroIndex + 1); i++) {
         tempDt.push_back(_deltaTimesData[i]);
     }
@@ -379,11 +380,13 @@ void DeltaTimesDialog::keyPressEvent(QKeyEvent* evt) {
         }
         return;
     }
-    else if (evt->key() == Qt::Key_Escape) {
+
+    if (evt->key() == Qt::Key_Escape) {
         if (_editModeNewItem) {
             discardDeltaTimeValue();
             return;
         }
     }
+
     QDialog::keyPressEvent(evt);
 }
diff --git a/apps/OpenSpace/ext/launcher/src/profile/horizonsdialog.cpp b/apps/OpenSpace/ext/launcher/src/profile/horizonsdialog.cpp
index 9e5185bb89..1ed5f5d636 100644
--- a/apps/OpenSpace/ext/launcher/src/profile/horizonsdialog.cpp
+++ b/apps/OpenSpace/ext/launcher/src/profile/horizonsdialog.cpp
@@ -47,18 +47,8 @@
 #include <QStyle>
 #include <sstream>
 
-using json = nlohmann::json;
-using namespace openspace;
-
-namespace {
-    BooleanType(IsDirty);
-    void styleLabel(QLabel* label, IsDirty isDirty) {
-        std::string newStyle = isDirty ? "error" : "normal";
-        label->setObjectName(QString::fromStdString(newStyle));
-        label->style()->unpolish(label);
-        label->style()->polish(label);
-    }
-} // namespace
+//using json = nlohmann::json;
+//using namespace openspace;
 
 namespace {
     constexpr std::string_view _loggerCat = "HorizonsDialog";
@@ -72,11 +62,18 @@ namespace {
     constexpr std::string_view Years = "calendar years";
     constexpr std::string_view Unitless = "equal intervals (unitless)";
 
+    BooleanType(IsDirty);
+    void styleLabel(QLabel* label, IsDirty isDirty) {
+        const std::string newStyle = isDirty ? "error" : "normal";
+        label->setObjectName(QString::fromStdString(newStyle));
+        label->style()->unpolish(label);
+        label->style()->polish(label);
+    }
+
     int findId(const std::string& match) {
         // Format: id, other information...
         std::stringstream str(match);
-        int id;
-
+        int id = 0;
         str >> id;
         return id;
     }
@@ -84,10 +81,12 @@ namespace {
 
 HorizonsDialog::HorizonsDialog(QWidget* parent)
     : QDialog(parent)
-{
 #ifdef OPENSPACE_MODULE_SPACE_ENABLED
-    _manager = new QNetworkAccessManager(this);
+    , _manager(new QNetworkAccessManager(this))
+#endif // OPENSPACE_MODULE_SPACE_ENABLED
+{
 
+#ifdef OPENSPACE_MODULE_SPACE_ENABLED
     setWindowTitle("Horizons");
     createWidgets();
 #endif // OPENSPACE_MODULE_SPACE_ENABLED
@@ -102,7 +101,7 @@ std::filesystem::path HorizonsDialog::file() const {
 }
 
 void HorizonsDialog::openSaveAs() {
-    QString filename = QFileDialog::getSaveFileName(
+    const QString filename = QFileDialog::getSaveFileName(
         this,
         "Choose a file path where the generated Horizons file will be saved",
         QString::fromStdString(absPath("${USER}").string()),
@@ -142,8 +141,8 @@ void HorizonsDialog::downloadProgress(int value, int total) {
 }
 
 void HorizonsDialog::importTimeRange() {
-    QString startStr = QString::fromStdString(_validTimeRange.first);
-    QString endStr = QString::fromStdString(_validTimeRange.second);
+    const QString startStr = QString::fromStdString(_validTimeRange.first);
+    const QString endStr = QString::fromStdString(_validTimeRange.second);
 
     QDateTime start = QDateTime::fromString(startStr, "yyyy-MMM-dd T hh:mm");
     QDateTime end = QDateTime::fromString(endStr, "yyyy-MMM-dd T hh:mm");
@@ -153,8 +152,8 @@ void HorizonsDialog::importTimeRange() {
         end = QDateTime::fromString(endStr, "yyyy-MMM-dd T hh:mm:ss");
 
         if (!start.isValid() || !end.isValid()) {
-            QDate startDate = QDate::fromString(startStr, "yyyy-MMM-dd");
-            QDate endDate = QDate::fromString(endStr, "yyyy-MMM-dd");
+            const QDate startDate = QDate::fromString(startStr, "yyyy-MMM-dd");
+            const QDate endDate = QDate::fromString(endStr, "yyyy-MMM-dd");
 
             if (startDate.isValid() && endDate.isValid()) {
                 _startEdit->setDate(startDate);
@@ -165,7 +164,7 @@ void HorizonsDialog::importTimeRange() {
             }
 
             _errorMsg->setText("Could not import time range");
-            std::string msg = fmt::format(
+            const std::string msg = fmt::format(
                 "Could not import time range '{}' to '{}'",
                 _validTimeRange.first, _validTimeRange.second
             );
@@ -183,7 +182,7 @@ void HorizonsDialog::importTimeRange() {
 void HorizonsDialog::approved() {
 #ifdef OPENSPACE_MODULE_SPACE_ENABLED
     _downloadLabel->show();
-    bool result = handleRequest();
+    const bool result = handleRequest();
     _downloadLabel->hide();
     if (result && std::filesystem::is_regular_file(_horizonsFile.file())) {
         accept();
@@ -216,7 +215,7 @@ void HorizonsDialog::createWidgets() {
 
         _typeCombo = new QComboBox;
         _typeCombo->setToolTip("Choose Horizons data type");
-        QStringList types = {
+        const QStringList types = {
            "Vector table",
            "Observer table"
         };
@@ -335,7 +334,7 @@ void HorizonsDialog::createWidgets() {
 
         _timeTypeCombo = new QComboBox;
         _timeTypeCombo->setToolTip("Choose unit of the step size");
-        QStringList timeTypes = {
+        const QStringList timeTypes = {
             Minutes.data(),
             Hours.data(),
             Days.data(),
@@ -437,7 +436,7 @@ bool HorizonsDialog::isValidInput() {
     }
     // Numerical
     bool couldConvert = false;
-    int32_t step = _stepEdit->text().toInt(&couldConvert);
+    const int32_t step = _stepEdit->text().toInt(&couldConvert);
     if (!couldConvert) {
         _errorMsg->setText(QString::fromStdString(fmt::format(
             "Step size needs to be a number in range 1 to {}",
@@ -470,7 +469,7 @@ bool HorizonsDialog::isValidInput() {
 }
 
 // Send request synchronously, EventLoop waits until request has finished
-json HorizonsDialog::sendRequest(const std::string& url) {
+nlohmann::json HorizonsDialog::sendRequest(const std::string& url) {
     QNetworkRequest request;
     request.setHeader(QNetworkRequest::UserAgentHeader, "OpenSpace");
     request.setUrl(QUrl(QString::fromStdString(url)));
@@ -484,13 +483,13 @@ json HorizonsDialog::sendRequest(const std::string& url) {
     _downloadProgress->show();
 
     QEventLoop loop;
-    QMetaObject::Connection status = connect(
+    const QMetaObject::Connection status = connect(
         reply, &QNetworkReply::finished,
         &loop, &QEventLoop::quit
     );
     if (!status) {
         appendLog("Could not connect to Horizons API", HorizonsDialog::LogLevel::Error);
-        return json();
+        return nlohmann::json();
     }
 
     loop.exec(QEventLoop::ExcludeUserInputEvents);
@@ -498,19 +497,20 @@ json HorizonsDialog::sendRequest(const std::string& url) {
     return handleReply(reply);
 }
 
-json HorizonsDialog::handleReply(QNetworkReply* reply) {
+nlohmann::json HorizonsDialog::handleReply(QNetworkReply* reply) {
     _downloadProgress->hide();
     if (reply->error() != QNetworkReply::NoError) {
-        QVariant statusCode = reply->attribute(QNetworkRequest::HttpStatusCodeAttribute);
+        const QVariant statusCode =
+            reply->attribute(QNetworkRequest::HttpStatusCodeAttribute);
         if (!checkHttpStatus(statusCode)) {
-            std::string msg = fmt::format(
+            const std::string msg = fmt::format(
                 "Connection Error '{}'", reply->errorString().toStdString()
             );
             appendLog(msg, HorizonsDialog::LogLevel::Error);
         }
 
         reply->deleteLater();
-        return json();
+        return nlohmann::json();
     }
 
     QUrl redirect = reply->attribute(QNetworkRequest::RedirectionTargetAttribute).toUrl();
@@ -519,26 +519,26 @@ json HorizonsDialog::handleReply(QNetworkReply* reply) {
             redirect = reply->url().resolved(redirect);
         }
 
-        std::string msg = fmt::format(
+        const std::string msg = fmt::format(
             "Redirecting request to '{}'", redirect.toString().toStdString()
         );
         appendLog(msg, HorizonsDialog::LogLevel::Info);
         return sendRequest(redirect.toString().toStdString());
     }
 
-    QString answer = reply->readAll();
+    const QString answer = reply->readAll();
     reply->deleteLater();
 
     if (answer.isEmpty()) {
-        std::string msg = fmt::format(
+        const std::string msg = fmt::format(
             "Connection Error '{}'", reply->errorString().toStdString()
         );
         appendLog(msg, HorizonsDialog::LogLevel::Error);
-        return json();
+        return nlohmann::json();
     }
 
     // Convert the answer to a json object and return it
-    return json::parse(answer.toStdString());
+    return nlohmann::json::parse(answer.toStdString());
 }
 
 bool HorizonsDialog::checkHttpStatus(const QVariant& statusCode) {
@@ -547,7 +547,7 @@ bool HorizonsDialog::checkHttpStatus(const QVariant& statusCode) {
         statusCode.toInt() != static_cast<int>(HorizonsDialog::HTTPCodes::Ok))
     {
         std::string message;
-        HorizonsDialog::HTTPCodes code =
+        const HorizonsDialog::HTTPCodes code =
             static_cast<HorizonsDialog::HTTPCodes>(statusCode.toInt());
 
         switch (code) {
@@ -618,7 +618,8 @@ std::pair<std::string, std::string> HorizonsDialog::readTimeRange() {
         "Trajectory name"
     );
 
-    QDateTime start, end;
+    QDateTime start;
+    QDateTime end;
     start = QDateTime::fromString(
         QString::fromStdString(timeRange.first),
         "yyyy-MMM-dd T hh:mm"
@@ -665,7 +666,7 @@ std::pair<std::string, std::string> HorizonsDialog::readTimeRange() {
                 }
                 else {
                     _errorMsg->setText("Could not parse time range");
-                    std::string msg = fmt::format(
+                    const std::string msg = fmt::format(
                         "Could not read time range '{}' to '{}'",
                         timeRange.first, timeRange.second
                     );
@@ -674,7 +675,7 @@ std::pair<std::string, std::string> HorizonsDialog::readTimeRange() {
                 return std::pair<std::string, std::string>();
             }
             else {
-                std::string msg = fmt::format(
+                const std::string msg = fmt::format(
                     "Could not find all time range information. Latest Horizons "
                     "mesage: {}", _latestHorizonsError
                 );
@@ -686,6 +687,8 @@ std::pair<std::string, std::string> HorizonsDialog::readTimeRange() {
 }
 
 bool HorizonsDialog::handleRequest() {
+    using namespace openspace;
+
     if (!isValidInput()) {
         return false;
     }
@@ -707,14 +710,14 @@ bool HorizonsDialog::handleRequest() {
     _validTimeRange = std::pair<std::string, std::string>();
     _latestHorizonsError.clear();
 
-    std::string url = constructUrl();
+    const std::string url = constructUrl();
 
     _chooseObserverCombo->clear();
     _chooseObserverCombo->hide();
     _chooseTargetCombo->clear();
     _chooseTargetCombo->hide();
 
-    json answer = sendRequest(url);
+    nlohmann::json answer = sendRequest(url);
     if (answer.empty()) {
         _errorMsg->setText("Connection error");
         return false;
@@ -728,18 +731,17 @@ bool HorizonsDialog::handleRequest() {
     _horizonsFile = std::move(file);
     HorizonsResultCode result = isValidHorizonsFile(_horizonsFile.file());
 
-    bool isValid = handleResult(result);
-
+    const bool isValid = handleResult(result);
     if (!isValid && std::filesystem::is_regular_file(_horizonsFile.file())) {
-        std::string newName = _horizonsFile.file().filename().stem().string();
+        const std::string newName = _horizonsFile.file().filename().stem().string();
 
-        std::filesystem::path oldFile = _horizonsFile.file();
+        const std::filesystem::path& oldFile = _horizonsFile.file();
         std::filesystem::path newFile = oldFile;
         newFile.replace_filename(newName + "_error.txt");
 
         std::filesystem::rename(oldFile, newFile);
 
-        std::string msg = fmt::format(
+        const std::string msg = fmt::format(
             "For more information, see the saved error file '{}'", newFile
         );
         appendLog(msg, LogLevel::Info);
@@ -749,8 +751,10 @@ bool HorizonsDialog::handleRequest() {
 }
 
 std::string HorizonsDialog::constructUrl() {
+    using namespace openspace;
+
     // Construct url for request
-    HorizonsType type;
+    HorizonsType type = HorizonsType::Invalid;
     if (_typeCombo->currentIndex() == 0) {
         type = HorizonsType::Vector;
     }
@@ -765,7 +769,8 @@ std::string HorizonsDialog::constructUrl() {
 
     std::string command;
     if (_chooseTargetCombo->count() > 0 && _chooseTargetCombo->currentIndex() != 0) {
-        QVariant t = _chooseTargetCombo->itemData(_chooseTargetCombo->currentIndex());
+        const QVariant t =
+            _chooseTargetCombo->itemData(_chooseTargetCombo->currentIndex());
         command = t.toString().toStdString();
         _targetName = _chooseTargetCombo->currentText().toStdString();
         _targetEdit->setText(QString::fromStdString(command));
@@ -777,9 +782,9 @@ std::string HorizonsDialog::constructUrl() {
 
     std::string center;
     if (_chooseObserverCombo->count() > 0 && _chooseObserverCombo->currentIndex() != 0) {
-        QVariant observer =
+        const QVariant observer =
             _chooseObserverCombo->itemData(_chooseObserverCombo->currentIndex());
-        std::string id = observer.toString().toStdString();
+        const std::string id = observer.toString().toStdString();
         center = "@" + id;
         _observerName = _chooseObserverCombo->currentText().toStdString();
         _centerEdit->setText(QString::fromStdString(id));
@@ -840,7 +845,9 @@ std::string HorizonsDialog::constructUrl() {
     );
 }
 
-openspace::HorizonsFile HorizonsDialog::handleAnswer(json& answer) {
+openspace::HorizonsFile HorizonsDialog::handleAnswer(nlohmann::json& answer) {
+    using namespace openspace;
+
     auto it = answer.find("error");
     if (it != answer.end()) {
         _latestHorizonsError = *it;
@@ -860,12 +867,14 @@ openspace::HorizonsFile HorizonsDialog::handleAnswer(json& answer) {
     }
 
     // Create a text file and write reply to it
-    std::filesystem::path filePath =
+    const std::filesystem::path filePath =
         std::filesystem::absolute(_fileEdit->text().toStdString());
 
     auto result = answer.find("result");
     if (result == answer.end()) {
-        std::string msg = fmt::format("Malformed answer received '{}'", answer.dump());
+        const std::string msg = fmt::format(
+            "Malformed answer received '{}'", answer.dump()
+        );
         appendLog(msg, HorizonsDialog::LogLevel::Error);
         return openspace::HorizonsFile();
     }
@@ -878,7 +887,7 @@ openspace::HorizonsFile HorizonsDialog::handleAnswer(json& answer) {
             QMessageBox::Yes | QMessageBox::No | QMessageBox::Cancel
         );
         msgBox.setDefaultButton(QMessageBox::Yes);
-        int ret = msgBox.exec();
+        const int ret = msgBox.exec();
         switch (ret) {
             case QMessageBox::Yes:
                 // If yes then continue as normal
@@ -900,13 +909,15 @@ openspace::HorizonsFile HorizonsDialog::handleAnswer(json& answer) {
 }
 
 bool HorizonsDialog::handleResult(openspace::HorizonsResultCode& result) {
+    using namespace openspace;
+
     switch (result) {
         case HorizonsResultCode::Valid: {
             // If the request worked then delete the corresponding error file if it exist
-            std::filesystem::path validFile(_horizonsFile.file());
+            std::filesystem::path validFile =_horizonsFile.file();
 
-            std::string errorName = validFile.filename().stem().string();
-            std::filesystem::path errorFile = validFile.replace_filename(
+            const std::string errorName = validFile.filename().stem().string();
+            const std::filesystem::path errorFile = validFile.replace_filename(
                 errorName + "_error.txt"
             );
 
@@ -918,7 +929,7 @@ bool HorizonsDialog::handleResult(openspace::HorizonsResultCode& result) {
         case HorizonsResultCode::Empty: {
             _errorMsg->setText("The horizons file is empty");
             if (!_latestHorizonsError.empty()) {
-                std::string msg = fmt::format(
+                const std::string msg = fmt::format(
                     "Latest Horizons error: {}", _latestHorizonsError
                 );
                 appendLog(msg, LogLevel::Error);
@@ -928,7 +939,7 @@ bool HorizonsDialog::handleResult(openspace::HorizonsResultCode& result) {
             break;
         }
         case HorizonsResultCode::ErrorSize: {
-            std::string msg = fmt::format(
+            const std::string msg = fmt::format(
                 "Time range '{}' to '{}' with step size '{} {}' is too big, try to "
                 "increase the step size and/or decrease the time range",
                 _startTime, _endTime, _stepEdit->text().toStdString(),
@@ -995,7 +1006,7 @@ bool HorizonsDialog::handleResult(openspace::HorizonsResultCode& result) {
             break;
         }
         case HorizonsResultCode::ErrorObserverTargetSame: {
-            std::string msg = fmt::format(
+            const std::string msg = fmt::format(
                 "The observer '{}' and target '{}' are the same. Please use another "
                 "observer for the current target", _observerName, _targetName
             );
@@ -1007,7 +1018,7 @@ bool HorizonsDialog::handleResult(openspace::HorizonsResultCode& result) {
             break;
         }
         case HorizonsResultCode::ErrorNoData: {
-            std::string msg = fmt::format(
+            const std::string msg = fmt::format(
                 "There is not enough data to compute the state of target '{}' in "
                 "relation to the observer '{}' for the time range '{}' to '{}'. Try to "
                 "use another observer for the current target or another time range",
@@ -1032,7 +1043,7 @@ bool HorizonsDialog::handleResult(openspace::HorizonsResultCode& result) {
             appendLog(msg, HorizonsDialog::LogLevel::Info);
             styleLabel(_centerLabel, IsDirty::Yes);
 
-            std::vector<std::string> matchingstations =
+            const std::vector<std::string> matchingstations =
                 _horizonsFile.parseMatches(
                     "Observatory Name",
                     "Multiple matching stations found"
@@ -1068,7 +1079,7 @@ bool HorizonsDialog::handleResult(openspace::HorizonsResultCode& result) {
             appendLog(msg, HorizonsDialog::LogLevel::Warning);
             styleLabel(_centerLabel, IsDirty::Yes);
 
-            std::vector<std::string> matchingObservers =
+            const std::vector<std::string> matchingObservers =
                 _horizonsFile.parseMatches("Name", "matches", ">MATCH NAME<");
             if (matchingObservers.empty()) {
                 appendLog(
@@ -1127,7 +1138,7 @@ bool HorizonsDialog::handleResult(openspace::HorizonsResultCode& result) {
             appendLog(msg, HorizonsDialog::LogLevel::Warning);
             styleLabel(_targetLabel, IsDirty::Yes);
 
-            std::vector<std::string> matchingTargets =
+            const std::vector<std::string> matchingTargets =
                 _horizonsFile.parseMatches("Name", "matches", ">MATCH NAME<");
             if (matchingTargets.empty()) {
                 appendLog(
@@ -1156,7 +1167,7 @@ bool HorizonsDialog::handleResult(openspace::HorizonsResultCode& result) {
         case HorizonsResultCode::UnknownError: {
             appendLog("Unknown error", LogLevel::Error);
             if (!_latestHorizonsError.empty()) {
-                std::string msg = fmt::format(
+                const std::string msg = fmt::format(
                     "Latest Horizons error: {}", _latestHorizonsError
                 );
                 appendLog(msg, LogLevel::Error);
@@ -1166,7 +1177,7 @@ bool HorizonsDialog::handleResult(openspace::HorizonsResultCode& result) {
         }
         default: {
             if (!_latestHorizonsError.empty()) {
-                std::string msg = fmt::format(
+                const std::string msg = fmt::format(
                     "Latest Horizons error: {}", _latestHorizonsError
                 );
                 appendLog(msg, LogLevel::Error);
diff --git a/apps/OpenSpace/ext/launcher/src/profile/marknodesdialog.cpp b/apps/OpenSpace/ext/launcher/src/profile/marknodesdialog.cpp
index 30103a1a92..3c2af72a44 100644
--- a/apps/OpenSpace/ext/launcher/src/profile/marknodesdialog.cpp
+++ b/apps/OpenSpace/ext/launcher/src/profile/marknodesdialog.cpp
@@ -99,7 +99,6 @@ void MarkNodesDialog::listItemAdded() {
         return;
     }
 
-    std::string itemToAdd = _newNode->text().toStdString();
     QListWidgetItem* item = new QListWidgetItem(_newNode->text());
     _list->addItem(item);
 
@@ -112,14 +111,14 @@ void MarkNodesDialog::listItemAdded() {
 
 void MarkNodesDialog::listItemRemove() {
     QListWidgetItem* item = _list->currentItem();
-    int index = _list->row(item);
+    const int index = _list->row(item);
     _list->takeItem(index);
 }
 
 void MarkNodesDialog::parseSelections() {
     std::vector<std::string> nodes;
     for (int i = 0; i < _list->count(); i++) {
-        QString node = _list->item(i)->text();
+        const QString node = _list->item(i)->text();
         nodes.push_back(node.toStdString());
     }
     *_markedNodes = std::move(nodes);
diff --git a/apps/OpenSpace/ext/launcher/src/profile/modulesdialog.cpp b/apps/OpenSpace/ext/launcher/src/profile/modulesdialog.cpp
index fc5df1fa22..7ccd0487ac 100644
--- a/apps/OpenSpace/ext/launcher/src/profile/modulesdialog.cpp
+++ b/apps/OpenSpace/ext/launcher/src/profile/modulesdialog.cpp
@@ -42,6 +42,26 @@ namespace {
         .loadedInstruction = std::nullopt,
         .notLoadedInstruction = std::nullopt
     };
+
+    QString createOneLineSummary(Profile::Module m) {
+        QString summary = QString::fromStdString(m.name);
+        const bool hasCommandForLoaded = !m.loadedInstruction->empty();
+        const bool hasCommandForNotLoaded = !m.notLoadedInstruction->empty();
+
+        if (hasCommandForLoaded && hasCommandForNotLoaded) {
+            summary += " (commands set for both loaded & not-loaded conditions)";
+        }
+        else if (hasCommandForLoaded) {
+            summary += " (command set only for loaded condition)";
+        }
+        else if (hasCommandForNotLoaded) {
+            summary += " (command set only for NOT loaded condition)";
+        }
+        else {
+            summary += " (no commands set)";
+        }
+        return summary;
+    }
 } // namespace
 
 ModulesDialog::ModulesDialog(QWidget* parent,
@@ -160,29 +180,9 @@ void ModulesDialog::createWidgets() {
     }
 }
 
-QString ModulesDialog::createOneLineSummary(Profile::Module m) {
-    QString summary = QString::fromStdString(m.name);
-    bool hasCommandForLoaded = !m.loadedInstruction->empty();
-    bool hasCommandForNotLoaded = !m.notLoadedInstruction->empty();
-
-    if (hasCommandForLoaded && hasCommandForNotLoaded) {
-        summary += " (commands set for both loaded & not-loaded conditions)";
-    }
-    else if (hasCommandForLoaded) {
-        summary += " (command set only for loaded condition)";
-    }
-    else if (hasCommandForNotLoaded) {
-        summary += " (command set only for NOT loaded condition)";
-    }
-    else {
-        summary += " (no commands set)";
-    }
-    return summary;
-}
-
 void ModulesDialog::listItemSelected() {
     QListWidgetItem* item = _list->currentItem();
-    int index = _list->row(item);
+    const int index = _list->row(item);
 
     if (!_moduleData.empty()) {
         const Profile::Module& m = _moduleData[index];
@@ -211,7 +211,7 @@ bool ModulesDialog::isLineEmpty(int index) const {
 }
 
 void ModulesDialog::listItemAdded() {
-    int currentListSize = _list->count();
+    const int currentListSize = _list->count();
 
     if ((currentListSize == 1) && (isLineEmpty(0))) {
         // Special case where list is "empty" but really has one line that is blank.
@@ -259,7 +259,7 @@ void ModulesDialog::listItemSave() {
     }
 
     QListWidgetItem* item = _list->currentItem();
-    int index = _list->row(item);
+    const int index = _list->row(item);
 
     if (!_moduleData.empty()) {
         _moduleData[index].name = _moduleEdit->text().toStdString();
@@ -290,7 +290,7 @@ void ModulesDialog::listItemRemove() {
             _list->item(0)->setText("");
         }
         else {
-            int index = _list->currentRow();
+            const int index = _list->currentRow();
             if (index >= 0 && index < _list->count()) {
                 delete _list->takeItem(index);
                 if (!_moduleData.empty()) {
diff --git a/apps/OpenSpace/ext/launcher/src/profile/profileedit.cpp b/apps/OpenSpace/ext/launcher/src/profile/profileedit.cpp
index 6b13a36ef7..233de812ff 100644
--- a/apps/OpenSpace/ext/launcher/src/profile/profileedit.cpp
+++ b/apps/OpenSpace/ext/launcher/src/profile/profileedit.cpp
@@ -51,7 +51,7 @@
 using namespace openspace;
 
 namespace {
-    QString labelText(size_t size, QString title) {
+    QString labelText(size_t size, const QString& title) {
         QString label;
         if (size > 0) {
             label = title + " (" + QString::number(size) + ")";
@@ -74,7 +74,7 @@ namespace {
                                      const std::vector<Profile::Action>& actions)
     {
         std::string results;
-        for (Profile::Keybinding k : keybindings) {
+        for (const Profile::Keybinding& k : keybindings) {
             const auto it = std::find_if(
                 actions.cbegin(), actions.cend(),
                 [id = k.action](const Profile::Action& a) { return a.identifier == id; }
@@ -368,10 +368,10 @@ void ProfileEdit::duplicateProfile() {
 
     constexpr char Separator = '_';
     int version = 0;
-    if (size_t it = profile.rfind(Separator); it != std::string::npos) {
+    if (const size_t it = profile.rfind(Separator);  it != std::string::npos) {
         // If the value exists, we have a profile that potentially already has a version
         // number attached to it
-        std::string versionStr = profile.substr(it + 1);
+        const std::string versionStr = profile.substr(it + 1);
         try {
             version = std::stoi(versionStr);
 
@@ -392,11 +392,11 @@ void ProfileEdit::duplicateProfile() {
     while (true) {
         version++;
 
-        std::string candidate = profile + Separator + std::to_string(version);
-        std::string candidatePath = _profileBasePath + candidate + ".profile";
+        const std::string candidate = profile + Separator + std::to_string(version);
+        const std::string candidatePath = _profileBasePath + candidate + ".profile";
 
         if (!std::filesystem::exists(candidatePath)) {
-            _profileEdit->setText(QString::fromStdString(std::move(candidate)));
+            _profileEdit->setText(QString::fromStdString(candidate));
             return;
         }
     }
@@ -489,7 +489,7 @@ void ProfileEdit::approved() {
         return;
     }
 
-    std::filesystem::path p = fmt::format(
+    const std::filesystem::path p = fmt::format(
         "{}/{}.profile", _builtInProfilesPath, profileName
     );
     if (std::filesystem::exists(p)) {
diff --git a/apps/OpenSpace/ext/launcher/src/profile/propertiesdialog.cpp b/apps/OpenSpace/ext/launcher/src/profile/propertiesdialog.cpp
index 6d8809a483..3df3f61585 100644
--- a/apps/OpenSpace/ext/launcher/src/profile/propertiesdialog.cpp
+++ b/apps/OpenSpace/ext/launcher/src/profile/propertiesdialog.cpp
@@ -48,6 +48,18 @@ namespace {
         "",
         ""
     };
+
+    QString createOneLineSummary(const Profile::Property& p) {
+        QString summary = QString::fromStdString(p.name);
+        summary += " = ";
+        summary += QString::fromStdString(p.value);
+        summary += " (SetPropertyValue";
+        if (p.setType == Profile::Property::SetType::SetPropertyValueSingle) {
+            summary += "Single";
+        }
+        summary += ")";
+        return summary;
+    }
 } // namespace
 
 PropertiesDialog::PropertiesDialog(QWidget* parent,
@@ -168,24 +180,12 @@ void PropertiesDialog::createWidgets() {
     }
 }
 
-QString PropertiesDialog::createOneLineSummary(Profile::Property p) {
-    QString summary = QString::fromStdString(p.name);
-    summary += " = ";
-    summary += QString::fromStdString(p.value);
-    summary += " (SetPropertyValue";
-    if (p.setType == Profile::Property::SetType::SetPropertyValueSingle) {
-        summary += "Single";
-    }
-    summary += ")";
-    return summary;
-}
-
 void PropertiesDialog::listItemSelected() {
     QListWidgetItem* item = _list->currentItem();
-    int index = _list->row(item);
+    const int index = _list->row(item);
 
     if (!_propertyData.empty()) {
-        Profile::Property& p = _propertyData[index];
+        const Profile::Property& p = _propertyData[index];
         if (p.setType == Profile::Property::SetType::SetPropertyValueSingle) {
             _commandCombo->setCurrentIndex(0);
         }
@@ -210,7 +210,7 @@ bool PropertiesDialog::isLineEmpty(int index) {
 }
 
 void PropertiesDialog::listItemAdded() {
-    int currentListSize = _list->count();
+    const int currentListSize = _list->count();
 
     if ((currentListSize == 1) && (isLineEmpty(0))) {
         // Special case where list is "empty" but really has one line that is blank.
@@ -242,7 +242,7 @@ void PropertiesDialog::listItemSave() {
     }
 
     QListWidgetItem* item = _list->currentItem();
-    int index = _list->row(item);
+    const int index = _list->row(item);
 
     if (!_propertyData.empty()) {
         if (_commandCombo->currentIndex() == 0) {
@@ -300,10 +300,10 @@ void PropertiesDialog::listItemRemove() {
             _list->item(0)->setText("");
         }
         else {
-            int index = _list->currentRow();
+            const int index = _list->currentRow();
             if (index >= 0 && index < _list->count()) {
                 delete _list->takeItem(index);
-                if (_propertyData.size() > 0) {
+                if (!_propertyData.empty()) {
                     _propertyData.erase(_propertyData.begin() + index);
                 }
             }
@@ -379,7 +379,7 @@ void PropertiesDialog::selectLineFromScriptLog() {
     ScriptlogDialog d(this, "openspace.setPropertyValue");
     connect(
         &d, &ScriptlogDialog::scriptsSelected,
-        [this](std::vector<std::string> scripts) {
+        [this](const std::vector<std::string>& scripts) {
             for (const std::string& script : scripts) {
                 listItemAdded();
 
@@ -392,13 +392,13 @@ void PropertiesDialog::selectLineFromScriptLog() {
                 // openspace.setPropertyValue('prop', value);
                 if (text.startsWith("openspace.setPropertyValueSingle")) {
                     _commandCombo->setCurrentIndex(0);
-                    std::string_view prefix = "openspace.setPropertyValueSingle";
+                    const std::string_view prefix = "openspace.setPropertyValueSingle";
                     text = text.mid(static_cast<int>(prefix.size()) + 1); // +1 for (
                 }
                 else {
                     // command == "openspace.setPropertyValue"
                     _commandCombo->setCurrentIndex(1);
-                    std::string_view prefix = "openspace.setPropertyValue";
+                    const std::string_view prefix = "openspace.setPropertyValue";
                     text = text.mid(static_cast<int>(prefix.size()) + 1); // +1 for (
                 }
 
@@ -411,11 +411,10 @@ void PropertiesDialog::selectLineFromScriptLog() {
                 }
 
                 // Remove the string markers around the property
-                QString property = textList[0].mid(1, textList[0].size() - 2);
+                const QString property = textList[0].mid(1, textList[0].size() - 2);
 
                 textList.removeFirst();
-                QString value = textList.join(",");
-
+                const QString value = textList.join(",");
 
                 _propertyEdit->setText(property.trimmed());
                 _valueEdit->setText(value.trimmed());
diff --git a/apps/OpenSpace/ext/launcher/src/profile/scriptlogdialog.cpp b/apps/OpenSpace/ext/launcher/src/profile/scriptlogdialog.cpp
index ffdefd95d3..191c2006b7 100644
--- a/apps/OpenSpace/ext/launcher/src/profile/scriptlogdialog.cpp
+++ b/apps/OpenSpace/ext/launcher/src/profile/scriptlogdialog.cpp
@@ -76,7 +76,7 @@ void ScriptlogDialog::createWidgets() {
         connect(
             open, &QPushButton::clicked,
             [this, heading]() {
-                QString file = QFileDialog::getOpenFileName(
+                const QString file = QFileDialog::getOpenFileName(
                     this,
                     "Select log file",
                     "",
@@ -126,7 +126,7 @@ void ScriptlogDialog::createWidgets() {
 void ScriptlogDialog::loadScriptFile() {
     _scripts.clear();
 
-    std::string log = absPath(_scriptLogFile).string();
+    const std::string log = absPath(_scriptLogFile).string();
     QFile file(QString::fromStdString(log));
     if (file.open(QIODevice::ReadOnly | QIODevice::Text)) {
         QTextStream in(&file);
@@ -143,7 +143,7 @@ void ScriptlogDialog::loadScriptFile() {
 }
 
 void ScriptlogDialog::updateScriptList() {
-    std::string filter = _filter->text().toStdString();
+    const std::string filter = _filter->text().toStdString();
     QListWidgetItem* curr = _scriptlogList->currentItem();
     std::string selection;
     if (curr) {
@@ -152,8 +152,8 @@ void ScriptlogDialog::updateScriptList() {
     int index = -1;
     _scriptlogList->clear();
     for (const std::string& script : _scripts) {
-        bool foundDynamic = script.find(filter) != std::string::npos;
-        bool foundStatic =
+        const bool foundDynamic = script.find(filter) != std::string::npos;
+        const bool foundStatic =
             _fixedFilter.empty() ? true : script.find(_fixedFilter) != std::string::npos;
         if (foundDynamic && foundStatic) {
             if (script == selection && index == -1) {
diff --git a/apps/OpenSpace/ext/launcher/src/profile/timedialog.cpp b/apps/OpenSpace/ext/launcher/src/profile/timedialog.cpp
index d10fd0354b..ca81de16e2 100644
--- a/apps/OpenSpace/ext/launcher/src/profile/timedialog.cpp
+++ b/apps/OpenSpace/ext/launcher/src/profile/timedialog.cpp
@@ -45,7 +45,7 @@ TimeDialog::TimeDialog(QWidget* parent, std::optional<openspace::Profile::Time>*
     setWindowTitle("Time");
     createWidgets();
 
-    QStringList types = { "Absolute", "Relative" };
+    const QStringList types = { "Absolute", "Relative" };
     _typeCombo->addItems(types);
     if (_time->has_value()) {
         _timeData = **_time;
@@ -53,7 +53,7 @@ TimeDialog::TimeDialog(QWidget* parent, std::optional<openspace::Profile::Time>*
             if (_timeData.value.empty()) {
                 _timeData.value = "0d";
             }
-            int len = static_cast<int>(_relativeEdit->text().length());
+            const int len = static_cast<int>(_relativeEdit->text().length());
             _relativeEdit->setSelection(0, len);
         }
         else {
@@ -121,8 +121,8 @@ void TimeDialog::createWidgets() {
 }
 
 void TimeDialog::enableAccordingToType(int idx) {
-    Profile::Time::Type comboIdx = static_cast<Profile::Time::Type>(idx);
-    bool setFormatForAbsolute = (comboIdx == Profile::Time::Type::Absolute);
+    const Profile::Time::Type comboIdx = static_cast<Profile::Time::Type>(idx);
+    const bool setFormatForAbsolute = (comboIdx == Profile::Time::Type::Absolute);
     enableFormatForAbsolute(setFormatForAbsolute);
     _typeCombo->setCurrentIndex(idx);
     if (comboIdx == Profile::Time::Type::Relative) {
@@ -137,9 +137,13 @@ void TimeDialog::enableAccordingToType(int idx) {
     }
     else {
         _relativeEdit->setText("<font color='gray'>Relative Time:</font>");
-        size_t tIdx = _timeData.value.find_first_of('T', 0);
-        QString importDate = QString::fromStdString(_timeData.value.substr(0, tIdx));
-        QString importTime = QString::fromStdString(_timeData.value.substr(tIdx + 1));
+        const size_t tIdx = _timeData.value.find_first_of('T', 0);
+        const QString importDate = QString::fromStdString(
+            _timeData.value.substr(0, tIdx)
+        );
+        const QString importTime = QString::fromStdString(
+            _timeData.value.substr(tIdx + 1)
+        );
         _absoluteEdit->setDate(QDate::fromString(importDate, Qt::DateFormat::ISODate));
         _absoluteEdit->setTime(QTime::fromString(importTime));
         _relativeEdit->clear();
diff --git a/apps/OpenSpace/ext/launcher/src/settingsdialog.cpp b/apps/OpenSpace/ext/launcher/src/settingsdialog.cpp
index f9c0eac68a..b82c13c4fd 100644
--- a/apps/OpenSpace/ext/launcher/src/settingsdialog.cpp
+++ b/apps/OpenSpace/ext/launcher/src/settingsdialog.cpp
@@ -35,14 +35,13 @@
 #include <QMessageBox>
 #include <QPushButton>
 
-SettingsDialog::SettingsDialog(openspace::Settings settings,
-                               QWidget* parent)
+SettingsDialog::SettingsDialog(openspace::Settings settings, QWidget* parent)
     : QDialog(parent)
-    , _currentEdit(settings)
+    , _currentEdit(std::move(settings))
 {
     setWindowTitle("Settings");
     createWidgets();
-    loadFromSettings(settings);
+    loadFromSettings(_currentEdit);
 
     // Setting the startup values for the control will have caused the Save button to be
     // enabled, so we need to manually disable it again here
@@ -91,7 +90,7 @@ void SettingsDialog::createWidgets() {
             _profile,
             &QLineEdit::textChanged,
             [this]() {
-                std::string v = _profile->text().toStdString();
+                const std::string v = _profile->text().toStdString();
                 if (v.empty()) {
                     _currentEdit.profile = std::nullopt;
                 }
@@ -147,7 +146,7 @@ void SettingsDialog::createWidgets() {
             _configuration,
             &QLineEdit::textChanged,
             [this]() {
-                std::string v = _configuration->text().toStdString();
+                const std::string v = _configuration->text().toStdString();
                 if (v.empty()) {
                     _currentEdit.configuration = std::nullopt;
                 }
@@ -392,7 +391,7 @@ void SettingsDialog::loadFromSettings(const openspace::Settings& settings) {
 
     if (settings.visibility.has_value()) {
         using Visibility = openspace::properties::Property::Visibility;
-        Visibility vis = *settings.visibility;
+        const Visibility vis = *settings.visibility;
         switch (vis) {
             case Visibility::NoviceUser:
                 _propertyVisibility->setCurrentText("Novice User");
@@ -417,9 +416,9 @@ void SettingsDialog::loadFromSettings(const openspace::Settings& settings) {
     }
 
     if (settings.layerServer.has_value()) {
-        openspace::Configuration::LayerServer server = *settings.layerServer;
+        Configuration::LayerServer server = *settings.layerServer;
         _layerServer->setCurrentText(
-            QString::fromStdString(openspace::layerServerToString(server))
+            QString::fromStdString(openspace::layerServerToString(std::move(server)))
         );
     }
 
diff --git a/apps/OpenSpace/ext/launcher/src/sgctedit/displaywindowunion.cpp b/apps/OpenSpace/ext/launcher/src/sgctedit/displaywindowunion.cpp
index 7b32b750d9..b411b8979d 100644
--- a/apps/OpenSpace/ext/launcher/src/sgctedit/displaywindowunion.cpp
+++ b/apps/OpenSpace/ext/launcher/src/sgctedit/displaywindowunion.cpp
@@ -49,7 +49,7 @@ DisplayWindowUnion::DisplayWindowUnion(const std::vector<QRect>& monitorSizeList
 }
 
 void DisplayWindowUnion::createWidgets(int nMaxWindows,
-                                       std::vector<QRect> monitorResolutions,
+                                       const std::vector<QRect>& monitorResolutions,
                                        std::array<QColor, 4> windowColors,
                                        bool resetToDefault)
 {
diff --git a/apps/OpenSpace/ext/launcher/src/sgctedit/monitorbox.cpp b/apps/OpenSpace/ext/launcher/src/sgctedit/monitorbox.cpp
index 3f4909ca57..57b1eb7809 100644
--- a/apps/OpenSpace/ext/launcher/src/sgctedit/monitorbox.cpp
+++ b/apps/OpenSpace/ext/launcher/src/sgctedit/monitorbox.cpp
@@ -27,7 +27,7 @@
 #include <QPainter>
 
 namespace {
-    constexpr float MarginFractionOfWidgetSize = 0.05f;
+    constexpr float MarginFractionWidgetSize = 0.05f;
     constexpr int WindowOpacity = 170;
 
     QRectF computeUnion(const std::vector<QRect>& monitorResolutions) {
@@ -48,15 +48,15 @@ MonitorBox::MonitorBox(QRect widgetDims, const std::vector<QRect>& monitorResolu
 {
     setSizePolicy(QSizePolicy::Fixed, QSizePolicy::Fixed);
     
-    QRectF monitorArrangement = computeUnion(monitorResolutions);
+    const QRectF monitorArrangement = computeUnion(monitorResolutions);
     
     const float aspectRatio = monitorArrangement.width() / monitorArrangement.height();
     if (aspectRatio > 1.0) {
-        float borderMargin = 2.f * MarginFractionOfWidgetSize * widgetDims.width();
+        const float borderMargin = 2.f * MarginFractionWidgetSize * widgetDims.width();
         widgetDims.setHeight(widgetDims.width() / aspectRatio + borderMargin);
     }
     else {
-        float borderMargin = 2.f * MarginFractionOfWidgetSize * widgetDims.height();
+        const float borderMargin = 2.f * MarginFractionWidgetSize * widgetDims.height();
         widgetDims.setWidth(widgetDims.height() * aspectRatio + borderMargin);
     }
     setFixedSize(widgetDims.width(), widgetDims.height());
@@ -107,7 +107,7 @@ void MonitorBox::paintEvent(QPaintEvent*) {
 
         if (_monitorDimensionsScaled.size() > 1 && i == 0) {
             // We only want to render the "Primary" if there are multiple windows
-            QPointF textPos = QPointF(
+            const QPointF textPos = QPointF(
                 _monitorDimensionsScaled[i].left() + 4.0,
                 _monitorDimensionsScaled[i].top() + 24.0
             );
@@ -159,16 +159,16 @@ std::vector<QSizeF> MonitorBox::computeScaledResolutionLandscape(QRectF arrangem
 {
     std::vector<QSizeF> offsets;
 
-    float marginWidget = size().width() * MarginFractionOfWidgetSize;
-    float virtualWidth = size().width() * (1.f - MarginFractionOfWidgetSize * 2.f);
+    const float margin = size().width() * MarginFractionWidgetSize;
+    const float virtualWidth = size().width() * (1.f - MarginFractionWidgetSize * 2.f);
     _monitorScaleFactor = virtualWidth / arrangement.width();
 
     const float aspectRatio = arrangement.width() / arrangement.height();
     const float newHeight = virtualWidth / aspectRatio;
 
     for (const QRect& res : resolutions) {
-        float x = marginWidget + (res.x() - arrangement.x()) * _monitorScaleFactor;
-        float y = marginWidget + (size().height() - newHeight - marginWidget) / 4.f +
+        const float x = margin + (res.x() - arrangement.x()) * _monitorScaleFactor;
+        const float y = margin + (size().height() - newHeight - margin) / 4.f +
             (res.y() - arrangement.y()) * _monitorScaleFactor;
         offsets.emplace_back(x, y);
     }
@@ -181,17 +181,17 @@ std::vector<QSizeF> MonitorBox::computeScaledResolutionPortrait(QRectF arrangeme
 {
     std::vector<QSizeF> offsets;
     
-    float marginWidget = size().height() * MarginFractionOfWidgetSize;
-    float virtualHeight = size().height() * (1.f - MarginFractionOfWidgetSize * 2.f);
+    const float marginWidget = size().height() * MarginFractionWidgetSize;
+    const float virtualHeight = size().height() * (1.f - MarginFractionWidgetSize * 2.f);
     _monitorScaleFactor = virtualHeight / arrangement.height();
     
     const float aspectRatio = arrangement.width() / arrangement.height();
     const float newWidth = virtualHeight * aspectRatio;
 
     for (const QRect& res : resolutions) {
-        float x = marginWidget + (size().width() - newWidth - marginWidget) / 4.f +
+        const float x = marginWidget + (size().width() - newWidth - marginWidget) / 4.f +
             (res.x() - arrangement.x()) * _monitorScaleFactor;
-        float y = marginWidget + (res.y() - arrangement.y()) * _monitorScaleFactor;
+        const float y = marginWidget + (res.y() - arrangement.y()) * _monitorScaleFactor;
         offsets.emplace_back(x, y);
     }
     
diff --git a/apps/OpenSpace/ext/launcher/src/sgctedit/orientationdialog.cpp b/apps/OpenSpace/ext/launcher/src/sgctedit/orientationdialog.cpp
index de2099e26e..d310b51431 100644
--- a/apps/OpenSpace/ext/launcher/src/sgctedit/orientationdialog.cpp
+++ b/apps/OpenSpace/ext/launcher/src/sgctedit/orientationdialog.cpp
@@ -39,7 +39,7 @@ OrientationDialog::OrientationDialog(sgct::quat& orientation, QWidget* parent)
     QGridLayout* layoutWindow = new QGridLayout(this);
 
     {
-        QString pitchTip = "Pitch or elevation: negative numbers tilt the camera "
+        const QString pitchTip = "Pitch or elevation: negative numbers tilt the camera "
             "downwards; positive numbers tilt upwards.\nThe allowed range is [-90, 90]. "
             "Internally, this corresponds to the x value in the quaternion";
 
@@ -56,9 +56,9 @@ OrientationDialog::OrientationDialog(sgct::quat& orientation, QWidget* parent)
         layoutWindow->addWidget(_linePitch, 0, 1);
     }
     {
-        QString rollTip = "Roll or bank: negative numbers rotate the camera counter-"
-            "clockwise; positive numbers clockwise.\nThe allowed range is [-180, 180]. "
-            "Internally, this corresponds to the z value in the quaternion";
+        const QString rollTip = "Roll or bank: negative numbers rotate the camera "
+            "counter-clockwise; positive numbers clockwise.\nThe allowed range is "
+            "[-180, 180]. Internally, this corresponds to the z value in the quaternion";
 
         QLabel* labelRoll = new QLabel("Roll");
         labelRoll->setToolTip(rollTip);
@@ -73,9 +73,10 @@ OrientationDialog::OrientationDialog(sgct::quat& orientation, QWidget* parent)
         layoutWindow->addWidget(_lineRoll, 1, 1);
     }
     {
-        QString yawTip = "Yaw, heading, or azimuth: negative numbers pan the camera "
-            "to the left; positive numbers pan to the\nright. The allowed range is "
-            "[-360, 360]. Internally, this corresponds to the y value in the quaternion";
+        const QString yawTip = "Yaw, heading, or azimuth: negative numbers pan the "
+            "camera to the left; positive numbers pan to the\nright. The allowed range "
+            "is [-360, 360]. Internally, this corresponds to the y value in the "
+            "quaternion";
 
         QLabel* labelYaw = new QLabel;
         labelYaw ->setText("Yaw");
diff --git a/apps/OpenSpace/ext/launcher/src/sgctedit/settingswidget.cpp b/apps/OpenSpace/ext/launcher/src/sgctedit/settingswidget.cpp
index 402dde3dc1..7244a7d961 100644
--- a/apps/OpenSpace/ext/launcher/src/sgctedit/settingswidget.cpp
+++ b/apps/OpenSpace/ext/launcher/src/sgctedit/settingswidget.cpp
@@ -32,13 +32,15 @@
 SettingsWidget::SettingsWidget(sgct::quat orientation, QWidget* parent)
     : QWidget(parent)
     , _orientationValue(std::move(orientation))
+    , _firstWindowGraphicsSelection(new QComboBox)
+    , _firstWindowSelectionLayout(new QHBoxLayout)
+    ,_showUiOnFirstWindow(new QCheckBox(
+        "Show user interface only on first window using graphics:"
+    ))
 {
     QBoxLayout* layout = new QVBoxLayout(this);
     layout->setContentsMargins(0, 0, 0, 0);
     
-    _showUiOnFirstWindow = new QCheckBox(
-        "Show user interface only on first window using graphics:"
-    );
     _showUiOnFirstWindow->setChecked(false);
     _showUiOnFirstWindow->setEnabled(false);
     _showUiOnFirstWindow->setToolTip(
@@ -48,9 +50,6 @@ SettingsWidget::SettingsWidget(sgct::quat orientation, QWidget* parent)
         "not show the user interface"
     );
 
-    _firstWindowSelectionLayout = new QHBoxLayout;
-
-    _firstWindowGraphicsSelection = new QComboBox();
     _firstWindowGraphicsSelection->setToolTip(
         "Select the contents of the first window to match one of the other windows"
     );
diff --git a/apps/OpenSpace/ext/launcher/src/sgctedit/sgctedit.cpp b/apps/OpenSpace/ext/launcher/src/sgctedit/sgctedit.cpp
index 482d97d635..0adde4e76c 100644
--- a/apps/OpenSpace/ext/launcher/src/sgctedit/sgctedit.cpp
+++ b/apps/OpenSpace/ext/launcher/src/sgctedit/sgctedit.cpp
@@ -78,19 +78,19 @@ SgctEdit::SgctEdit(QWidget* parent, std::string userConfigPath)
     createWidgets(createMonitorInfoSet(), 1, true);
 }
 
-SgctEdit::SgctEdit(sgct::config::Cluster& cluster, const std::string& configName,
+SgctEdit::SgctEdit(sgct::config::Cluster& cluster, std::string configName,
                    std::string& configBasePath, QWidget* parent)
     : QDialog(parent)
     , _cluster(cluster)
     , _userConfigPath(configBasePath)
-    , _configurationFilename(configName)
+    , _configurationFilename(std::move(configName))
     , _didImportValues(true)
 {
     setWindowTitle("Window Configuration Editor");
-    size_t nWindows = _cluster.nodes.front().windows.size();
+    const size_t nWindows = _cluster.nodes.front().windows.size();
     std::vector<QRect> monitorSizes = createMonitorInfoSet();
     createWidgets(monitorSizes, static_cast<unsigned int>(nWindows), false);
-    size_t existingWindowsControlSize = _displayWidget->windowControls().size();
+    const size_t existingWindowsControlSize = _displayWidget->windowControls().size();
     for (size_t i = 0; i < nWindows; i++) {
         sgct::config::Window& w = _cluster.nodes.front().windows[i];
         WindowControl* wCtrl = _displayWidget->windowControls()[i];
@@ -116,12 +116,7 @@ SgctEdit::SgctEdit(sgct::config::Cluster& cluster, const std::string& configName
                     posY -= monitorSizes[monitorNum].y();
                 }
             }
-            QRectF newDims(
-                posX,
-                posY,
-                w.size.x,
-                w.size.y
-            );
+            const QRectF newDims = QRectF(posX, posY, w.size.x, w.size.y);
             wCtrl->setDimensions(newDims);
             if (w.name.has_value()) {
                 wCtrl->setWindowName(w.name.value());
@@ -156,9 +151,8 @@ void SgctEdit::setupStateOfUiOnFirstWindow(size_t nWindows) {
                 nGuiRenderTagsFound++;
             }
             for (int winNum = 0; winNum <= 4; ++winNum) {
-                std::string tagToLookFor = "GUI_Render_Win" + std::to_string(winNum);
-                if (std::find(w.tags.begin(), w.tags.end(), tagToLookFor) != w.tags.end())
-                {
+                const std::string searchTag = "GUI_Render_Win" + std::to_string(winNum);
+                if (std::find(w.tags.begin(), w.tags.end(), searchTag) != w.tags.end()) {
                     graphicsSelectionForFirstWindow = winNum;
                     nGuiRenderTagsFound++;
                 }
@@ -195,8 +189,8 @@ void SgctEdit::setupStateOfUiOnFirstWindow(size_t nWindows) {
 void SgctEdit::setupProjectionTypeInGui(sgct::config::Viewport& vPort,
                                         WindowControl* wCtrl)
 {
-    std::visit(overloaded{
-        [&](sgct::config::CylindricalProjection p) {
+    std::visit(overloaded {
+        [&](const sgct::config::CylindricalProjection& p) {
             if (p.quality && p.heightOffset) {
                 wCtrl->setProjectionCylindrical(
                     *p.quality,
@@ -204,7 +198,7 @@ void SgctEdit::setupProjectionTypeInGui(sgct::config::Viewport& vPort,
                 );
             }
         },
-        [&](sgct::config::EquirectangularProjection p) {
+        [&](const sgct::config::EquirectangularProjection& p) {
             if (p.quality) {
                 wCtrl->setProjectionEquirectangular(
                     *p.quality,
@@ -212,7 +206,7 @@ void SgctEdit::setupProjectionTypeInGui(sgct::config::Viewport& vPort,
                 );
             }
         },
-        [&](sgct::config::FisheyeProjection p) {
+        [&](const sgct::config::FisheyeProjection& p) {
             if (p.quality) {
                 wCtrl->setProjectionFisheye(
                     *p.quality,
@@ -220,20 +214,20 @@ void SgctEdit::setupProjectionTypeInGui(sgct::config::Viewport& vPort,
                 );
             }
         },
-        [&](sgct::config::PlanarProjection p) {
+        [&](const sgct::config::PlanarProjection& p) {
             wCtrl->setProjectionPlanar(
                 (std::abs(p.fov.left) + std::abs(p.fov.right)),
                 (std::abs(p.fov.up) + std::abs(p.fov.down))
             );
         },
-        [&](sgct::config::SphericalMirrorProjection p) {
+        [&](const sgct::config::SphericalMirrorProjection& p) {
             if (p.quality) {
                 wCtrl->setProjectionSphericalMirror(
                     *p.quality
                 );
             }
         },
-        [&](sgct::config::SpoutOutputProjection p) {
+        [&](const sgct::config::SpoutOutputProjection& p) {
             if (p.quality) {
                 if (p.mapping ==
                     sgct::config::SpoutOutputProjection::Mapping::Equirectangular)
@@ -253,21 +247,21 @@ void SgctEdit::setupProjectionTypeInGui(sgct::config::Viewport& vPort,
                 }
             }
         },
-        [&](sgct::config::NoProjection) {},
-        [&](sgct::config::ProjectionPlane) {},
-        [&](sgct::config::SpoutFlatProjection) {}
+        [&](const sgct::config::NoProjection&) {},
+        [&](const sgct::config::ProjectionPlane&) {},
+        [&](const sgct::config::SpoutFlatProjection&) {}
     }, vPort.projection);
 }
 
 std::vector<QRect> SgctEdit::createMonitorInfoSet() {
-    QList<QScreen*> screens = qApp->screens();
-    int nScreensManaged = std::min(static_cast<int>(screens.length()), 4);
+    const QList<QScreen*> screens = qApp->screens();
+    const int nScreensManaged = std::min(static_cast<int>(screens.length()), 4);
     std::vector<QRect> monitorSizes;
     for (int s = 0; s < nScreensManaged; ++s) {
-        QSize size = screens[s]->size();
-        QRect geometry = screens[s]->availableGeometry();
-        int actualWidth = std::max(size.width(), geometry.width());
-        int actualHeight = std::max(size.height(), geometry.height());
+        const QSize size = screens[s]->size();
+        const QRect geometry = screens[s]->availableGeometry();
+        const int actualWidth = std::max(size.width(), geometry.width());
+        const int actualHeight = std::max(size.height(), geometry.height());
         monitorSizes.emplace_back(
             geometry.x(),
             geometry.y(),
@@ -394,7 +388,7 @@ std::filesystem::path SgctEdit::saveFilename() const {
 void SgctEdit::save() {
     generateConfiguration();
     if (hasWindowIssues(_cluster)) {
-        int ret = QMessageBox::warning(
+        const int ret = QMessageBox::warning(
             this,
             "Window Sizes Incompatible",
             "Window sizes for multiple windows have to be strictly ordered, meaning that "
@@ -414,7 +408,7 @@ void SgctEdit::save() {
         accept();
     }
     else {
-        QString fileName = QFileDialog::getSaveFileName(
+        const QString fileName = QFileDialog::getSaveFileName(
             this,
             "Save Window Configuration File",
             QString::fromStdString(_userConfigPath),
@@ -435,7 +429,7 @@ void SgctEdit::save() {
 void SgctEdit::apply() {
     generateConfiguration();
     if (hasWindowIssues(_cluster)) {
-        int ret = QMessageBox::warning(
+        const int ret = QMessageBox::warning(
             this,
             "Window Sizes Incompatible",
             "Window sizes for multiple windows have to be strictly ordered, meaning that "
@@ -466,7 +460,7 @@ void SgctEdit::generateConfiguration() {
     _cluster.scene = sgct::config::Scene();
     _cluster.scene->orientation = _settingsWidget->orientation();
     if (_cluster.nodes.empty()) {
-        _cluster.nodes.push_back(sgct::config::Node());
+        _cluster.nodes.emplace_back();
     }
     sgct::config::Node& node = _cluster.nodes.back();
 
@@ -515,12 +509,10 @@ void SgctEdit::generateConfigResizeWindowsAccordingToSelected(sgct::config::Node
     std::vector<WindowControl*> windowControls = _displayWidget->activeWindowControls();
     for (size_t wIdx = 0; wIdx < windowControls.size(); ++wIdx) {
         if (node.windows.size() <= wIdx) {
-            node.windows.push_back(sgct::config::Window());
+            node.windows.emplace_back();
         }
         if (windowControls[wIdx]) {
-            windowControls[wIdx]->generateWindowInformation(
-                node.windows[wIdx]
-            );
+            windowControls[wIdx]->generateWindowInformation(node.windows[wIdx]);
         }
     }
     while (node.windows.size() > windowControls.size()) {
@@ -540,20 +532,21 @@ void SgctEdit::generateConfigIndividualWindowSettings(sgct::config::Node& node)
         // depending on if this is the first window or not
         if (_settingsWidget->showUiOnFirstWindow()) {
             if (i == 0) {
-                node.windows[i].tags.push_back("GUI");
-                int selectedGraphics =
+                node.windows[i].tags.emplace_back("GUI");
+                const int selectedGraphics =
                     _settingsWidget->graphicsSelectionForShowUiOnFirstWindow();
 
                 if (selectedGraphics == 0) {
                     node.windows[i].viewports.back().isTracked = false;
-                    node.windows[i].tags.push_back("GUI_No_Render");
+                    node.windows[i].tags.emplace_back("GUI_No_Render");
                 }
                 else if (selectedGraphics > 0 &&
                          selectedGraphics <= static_cast<int>(node.windows.size()))
                 {
-                    node.windows[i].tags.push_back("GUI_Render_Win" +
-                        std::to_string(selectedGraphics));
-                    //Set first window viewport to mirror the selected window's viewport
+                    node.windows[i].tags.emplace_back(
+                        "GUI_Render_Win" + std::to_string(selectedGraphics)
+                    );
+                    // Set first window viewport to mirror the selected window's viewport
                     node.windows[i].viewports =
                         node.windows[(selectedGraphics - 1)].viewports;
                 }
@@ -577,7 +570,7 @@ void SgctEdit::deleteFromTags(sgct::config::Window& window) {
         "GUI_Render_Win3",
         "GUI_Render_Win4"
     };
-    for (std::string_view tag : Tags) {
+    for (const std::string_view tag : Tags) {
         window.tags.erase(
             std::remove(window.tags.begin(), window.tags.end(), tag),
             window.tags.end()
@@ -590,12 +583,12 @@ sgct::config::Cluster SgctEdit::cluster() const {
 }
 
 void SgctEdit::firstWindowGraphicsSelectionChanged(const QString&) {
-    if (!_settingsWidget)
+    if (!_settingsWidget) {
         return;
-
-    int newSetting = _settingsWidget->graphicsSelectionForShowUiOnFirstWindow();
+    }
 
     if (_settingsWidget->showUiOnFirstWindow()) {
+        const int newSetting = _settingsWidget->graphicsSelectionForShowUiOnFirstWindow();
         _displayWidget->activeWindowControls()[0]->setVisibilityOfProjectionGui(
             newSetting == 1
         );
diff --git a/apps/OpenSpace/ext/launcher/src/sgctedit/windowcontrol.cpp b/apps/OpenSpace/ext/launcher/src/sgctedit/windowcontrol.cpp
index 1bf757a41c..ba7a7358cd 100644
--- a/apps/OpenSpace/ext/launcher/src/sgctedit/windowcontrol.cpp
+++ b/apps/OpenSpace/ext/launcher/src/sgctedit/windowcontrol.cpp
@@ -50,7 +50,7 @@ namespace {
         "8K (8192)", "16K (16384)", "32K (32768)", "64K (65536)"
     };
 
-    constexpr int QualityValues[nQualityTypes] = {
+    constexpr std::array<int, nQualityTypes> QualityValues = {
         256, 512, 1024, 1536, 2048, 4096, 8192, 16384, 32768, 65536
     };
 
@@ -76,7 +76,7 @@ namespace {
     QList<QString> monitorNames(const std::vector<QRect>& resolutions) {
         QList<QString> monitorNames;
         for (size_t i = 0; i < resolutions.size(); i++) {
-            std::string fullName = fmt::format(
+            const std::string fullName = fmt::format(
                 "{} ({}x{})",
                 MonitorNames[i], resolutions[i].width(), resolutions[i].height()
             );
@@ -116,7 +116,7 @@ void WindowControl::createWidgets(const QColor& windowColor) {
     //  *----------*----------*-------*----------*-------*--------*-------*-------*
 
     QGridLayout* layout = new QGridLayout(this);
-    QMargins margins = layout->contentsMargins();
+    const QMargins margins = layout->contentsMargins();
     layout->setContentsMargins(margins.left(), 0, margins.right(), 0);
     layout->setColumnStretch(6, 1);
     layout->setRowStretch(8, 1);
@@ -128,7 +128,7 @@ void WindowControl::createWidgets(const QColor& windowColor) {
     )));
     layout->addWidget(_windowNumber, 0, 0, 1, 8, Qt::AlignCenter);
     {
-        QString tip = "The name for the window (displayed in title bar)";
+        const QString tip = "The name for the window (displayed in title bar)";
 
         QLabel* labelName = new QLabel("Name");
         labelName->setToolTip(tip);
@@ -138,7 +138,7 @@ void WindowControl::createWidgets(const QColor& windowColor) {
         _windowName->setToolTip(tip);
         layout->addWidget(_windowName, 1, 1, 1, 7);
     }
-    QString tip = "The monitor where this window is located";
+    const QString tip = "The monitor where this window is located";
 
     _monitor = new QComboBox;
     _monitor->addItems(monitorNames(_monitorResolutions));
@@ -370,7 +370,8 @@ QWidget* WindowControl::createPlanarWidget() {
     layout->addWidget(_planar.labelInfo, 0, 0, 1, 3);
 
     _planar.labelFovH = new QLabel("Horizontal FOV");
-    QString hfovTip = "The total horizontal field of view of the viewport (degrees)";
+    const QString hfovTip =
+        "The total horizontal field of view of the viewport (degrees)";
     _planar.labelFovH->setToolTip(hfovTip);
     layout->addWidget(_planar.labelFovH, 1, 0);
 
@@ -387,7 +388,7 @@ QWidget* WindowControl::createPlanarWidget() {
     layout->addWidget(_planar.fovH, 1, 1);
 
     _planar.labelFovV = new QLabel("Vertical FOV");
-    QString vfovTip = "The total vertical field of view of the viewport (degrees). "
+    const QString vfovTip = "The total vertical field of view of the viewport (degrees). "
         "Internally,\nthe values for 'up' & 'down' will each be half this value";
     _planar.labelFovV->setToolTip(vfovTip);
     layout->addWidget(_planar.labelFovV, 2, 0);
@@ -445,9 +446,9 @@ QWidget* WindowControl::createFisheyeWidget() {
     layout->addWidget(_fisheye.labelInfo, 0, 0, 1, 2);
 
     _fisheye.labelQuality = new QLabel("Quality");
-    QString qualityTip = "Determines the pixel resolution of the projection rendering. "
-        "The higher resolution,\nthe better the rendering quality, but at the expense of "
-        "increased rendering times";
+    const QString qualityTip = "Determines the pixel resolution of the projection "
+        "rendering. The higher resolution,\nthe better the rendering quality, but at the "
+        "expense of increased rendering times";
     _fisheye.labelQuality->setToolTip(qualityTip);
     layout->addWidget(_fisheye.labelQuality, 1, 0);
 
@@ -490,9 +491,9 @@ QWidget* WindowControl::createSphericalMirrorWidget() {
     layout->addWidget(_sphericalMirror.labelInfo, 0, 0, 1, 2);
 
     _sphericalMirror.labelQuality = new QLabel("Quality");
-    QString qualityTip = "Determines the pixel resolution of the projection rendering. "
-        "The higher resolution,\nthe better the rendering quality, but at the expense of "
-        "increased rendering times";
+    const QString qualityTip = "Determines the pixel resolution of the projection "
+        "rendering. The higher resolution,\nthe better the rendering quality, but at the "
+        "expense of increased rendering times";
     _sphericalMirror.labelQuality->setToolTip(qualityTip);
     layout->addWidget(_sphericalMirror.labelQuality, 1, 0);
 
@@ -527,9 +528,9 @@ QWidget* WindowControl::createCylindricalWidget() {
     layout->addWidget(_cylindrical.labelInfo, 0, 0, 1, 2);
 
     _cylindrical.labelQuality = new QLabel("Quality");
-    QString qualityTip = "Determines the pixel resolution of the projection rendering. "
-        "The higher resolution,\nthe better the rendering quality, but at the expense of "
-        "increased rendering times";
+    const QString qualityTip = "Determines the pixel resolution of the projection "
+        "rendering. The higher resolution,\nthe better the rendering quality, but at the "
+        "expense of increased rendering times";
     _cylindrical.labelQuality->setToolTip(qualityTip);
     layout->addWidget(_cylindrical.labelQuality, 1, 0);
 
@@ -540,10 +541,10 @@ QWidget* WindowControl::createCylindricalWidget() {
     layout->addWidget(_cylindrical.quality, 1, 1);
 
     _cylindrical.labelHeightOffset = new QLabel("Height Offset");
-    QString heightTip = "Offsets the height from which the cylindrical projection is "
-        "generated.\nThis is, in general, only necessary if the user position is offset "
-        "and\ncountering that offset is desired in order to continue producing\na "
-        "'standard' cylindrical projection";
+    const QString heightTip = "Offsets the height from which the cylindrical projection "
+        "is generated.\nThis is, in general, only necessary if the user position is "
+        "offset and\ncountering that offset is desired in order to continue producing\n"
+        "a 'standard' cylindrical projection";
     _cylindrical.labelHeightOffset->setToolTip(heightTip);
     layout->addWidget(_cylindrical.labelHeightOffset, 2, 0);
 
@@ -580,9 +581,9 @@ QWidget* WindowControl::createEquirectangularWidget() {
     layout->addWidget(_equirectangular.labelInfo, 0, 0, 1, 2);
 
     _equirectangular.labelQuality = new QLabel("Quality");
-    QString qualityTip = "Determines the pixel resolution of the projection rendering. "
-        "The higher resolution,\nthe better the rendering quality, but at the expense of "
-        "increased rendering times";
+    const QString qualityTip = "Determines the pixel resolution of the projection "
+        "rendering. The higher resolution,\nthe better the rendering quality, but at the "
+        "expense of increased rendering times";
     _equirectangular.labelQuality->setToolTip(qualityTip);
     layout->addWidget(_equirectangular.labelQuality, 1, 0);
 
@@ -613,9 +614,9 @@ void WindowControl::resetToDefaults() {
     _windowDimensions = DefaultWindowSizes[_windowIndex];
     _offsetX->setValue(_windowDimensions.x());
     _offsetY->setValue(_windowDimensions.y());
-    float newHeight =
+    const float newHeight =
         _monitorResolutions[PrimaryMonitorIdx].height() * IdealScaleVerticalLines;
-    float newWidth = newHeight * IdealAspectRatio;
+    const float newWidth = newHeight * IdealAspectRatio;
     _windowDimensions.setHeight(newHeight);
     _windowDimensions.setWidth(newWidth);
     _sizeX->setValue(static_cast<int>(newWidth));
@@ -666,7 +667,7 @@ void WindowControl::setDecorationState(bool hasWindowDecoration) {
 }
 
 sgct::config::Projections WindowControl::generateProjectionInformation() const {
-    ProjectionIndices type =
+    const ProjectionIndices type =
         static_cast<WindowControl::ProjectionIndices>(_projectionType->currentIndex());
 
     const bool isSpoutFisheye =
@@ -745,7 +746,7 @@ sgct::config::Projections WindowControl::generateProjectionInformation() const {
 void WindowControl::generateWindowInformation(sgct::config::Window& window) const {
     window.size = { _sizeX->text().toInt(), _sizeY->text().toInt() };
     window.monitor = _monitor->currentIndex();
-    QRect resolution = _monitorResolutions[_monitor->currentIndex()];
+    const QRect resolution = _monitorResolutions[_monitor->currentIndex()];
     window.pos = sgct::ivec2(
         resolution.x() + _offsetX->text().toInt(),
         resolution.y() + _offsetY->text().toInt()
@@ -839,7 +840,7 @@ void WindowControl::setQualityComboBoxFromLinesResolution(int lines, QComboBox*
 void WindowControl::onSizeXChanged(int newValue) {
     _windowDimensions.setWidth(newValue);
     if (_aspectRatioLocked) {
-        int updatedHeight = _windowDimensions.width() / _aspectRatioSize;
+        const int updatedHeight = _windowDimensions.width() / _aspectRatioSize;
         _sizeY->blockSignals(true);
         _sizeY->setValue(updatedHeight);
         _sizeY->blockSignals(false);
@@ -854,7 +855,7 @@ void WindowControl::onSizeXChanged(int newValue) {
 void WindowControl::onSizeYChanged(int newValue) {
     _windowDimensions.setHeight(newValue);
     if (_aspectRatioLocked) {
-        int updatedWidth = _windowDimensions.height() * _aspectRatioSize;
+        const int updatedWidth = _windowDimensions.height() * _aspectRatioSize;
         _sizeX->blockSignals(true);
         _sizeX->setValue(updatedWidth);
         _sizeX->blockSignals(false);
@@ -867,21 +868,21 @@ void WindowControl::onSizeYChanged(int newValue) {
 }
 
 void WindowControl::onOffsetXChanged(int newValue) {
-    float prevWidth = _windowDimensions.width();
+    const float prevWidth = _windowDimensions.width();
     _windowDimensions.setX(newValue);
     _windowDimensions.setWidth(prevWidth);
     emit windowChanged(_monitor->currentIndex(), _windowIndex, _windowDimensions);
 }
 
 void WindowControl::onOffsetYChanged(int newValue) {
-    float prevHeight = _windowDimensions.height();
+    const float prevHeight = _windowDimensions.height();
     _windowDimensions.setY(newValue);
     _windowDimensions.setHeight(prevHeight);
     emit windowChanged(_monitor->currentIndex(), _windowIndex, _windowDimensions);
 }
 
 void WindowControl::onFullscreenClicked() {
-    QRect resolution = _monitorResolutions[_monitor->currentIndex()];
+    const QRect resolution = _monitorResolutions[_monitor->currentIndex()];
 
     _offsetX->setValue(0);
     _offsetY->setValue(0);
@@ -890,8 +891,8 @@ void WindowControl::onFullscreenClicked() {
     _windowDecoration->setChecked(false);
 }
 
-void WindowControl::onProjectionChanged(int newSelection) {
-    ProjectionIndices selected = static_cast<ProjectionIndices>(newSelection);
+void WindowControl::onProjectionChanged(int newSelection) const {
+    const ProjectionIndices selected = static_cast<ProjectionIndices>(newSelection);
     _planar.widget->setVisible(selected == ProjectionIndices::Planar);
     _fisheye.widget->setVisible(selected == ProjectionIndices::Fisheye);
     _sphericalMirror.widget->setVisible(selected == ProjectionIndices::SphericalMirror);
@@ -921,8 +922,9 @@ void WindowControl::onFovLockClicked() {
 }
 
 void WindowControl::updatePlanarLockedFov() {
-    bool landscapeOrientation = (_windowDimensions.width() >= _windowDimensions.height());
-    float aspectRatio;
+    const bool landscapeOrientation =
+        (_windowDimensions.width() >= _windowDimensions.height());
+    float aspectRatio = 0.f;
     if (landscapeOrientation) {
         aspectRatio = _windowDimensions.width() / _windowDimensions.height();
     }
@@ -930,7 +932,7 @@ void WindowControl::updatePlanarLockedFov() {
         aspectRatio = _windowDimensions.height() / _windowDimensions.width();
     }
 
-    float adjustedFov = 2.f * atan(aspectRatio * tan(DefaultFovShortEdge
+    float adjustedFov = 2.f * std::atan(aspectRatio * std::tan(DefaultFovShortEdge
         * std::numbers::pi_v<float> / 180.f / 2.f));
     // Convert to degrees and limit to 180°
     adjustedFov *= 180.f / std::numbers::pi_v<float>;
diff --git a/apps/OpenSpace/ext/sgct b/apps/OpenSpace/ext/sgct
index be88262a5f..19603f0bbd 160000
--- a/apps/OpenSpace/ext/sgct
+++ b/apps/OpenSpace/ext/sgct
@@ -1 +1 @@
-Subproject commit be88262a5fe36715043433654490afa0c750a6a4
+Subproject commit 19603f0bbd18073d0c7d68bfd5c94315572193d1
diff --git a/apps/OpenSpace/main.cpp b/apps/OpenSpace/main.cpp
index 18df1b87a8..bd7199198e 100644
--- a/apps/OpenSpace/main.cpp
+++ b/apps/OpenSpace/main.cpp
@@ -203,7 +203,7 @@ void checkJoystickStatus() {
 
         JoystickInputState& state = global::joystickInputStates->at(i);
 
-        int present = glfwJoystickPresent(i);
+        const int present = glfwJoystickPresent(i);
         if (present == GLFW_FALSE) {
             state.isConnected = false;
             continue;
@@ -282,8 +282,8 @@ void mainInitFunc(GLFWwindow*) {
     // We save the startup value of the screenshots just in case we want to add a date
     // to them later in the RenderEngine
     std::filesystem::path screenshotPath = absPath("${SCREENSHOTS}");
-    FileSys.registerPathToken("${STARTUP_SCREENSHOT}", screenshotPath);
     sgct::Settings::instance().setCapturePath(screenshotPath.string());
+    FileSys.registerPathToken("${STARTUP_SCREENSHOT}", std::move(screenshotPath));
 
     LDEBUG("Initializing OpenSpace Engine started");
     global::openSpaceEngine->initialize();
@@ -292,22 +292,22 @@ void mainInitFunc(GLFWwindow*) {
 #ifndef __APPLE__
     // Apparently: "Cocoa: Regular windows do not have icons on macOS"
     {
-        std::filesystem::path path = absPath("${DATA}/openspace-icon.png");
-        int x;
-        int y;
-        int n;
+        const std::filesystem::path path = absPath("${DATA}/openspace-icon.png");
+        int x = 0;
+        int y = 0;
+        int n = 0;
         unsigned char* data = stbi_load(path.string().c_str(), &x, &y, &n, 0);
 
-        GLFWimage icons[1];
-        icons[0].pixels = data;
-        icons[0].width = x;
-        icons[0].height = y;
+        GLFWimage icon;
+        icon.pixels = data;
+        icon.width = x;
+        icon.height = y;
 
         for (const std::unique_ptr<Window>& window : Engine::instance().windows()) {
-            glfwSetWindowIcon(window->windowHandle(), 1, icons);
+            glfwSetWindowIcon(window->windowHandle(), 1, &icon);
         }
 
-        stbi_image_free(icons[0].pixels);
+        stbi_image_free(icon.pixels);
     }
 #endif // __APPLE__
 
@@ -341,7 +341,7 @@ void mainInitFunc(GLFWwindow*) {
     }
 
     for (size_t i = 0; i < Engine::instance().windows().size(); i++) {
-        Window& window = *Engine::instance().windows()[i];
+        const Window& window = *Engine::instance().windows()[i];
         if (!window.hasTag(SpoutTag)) {
             continue;
         }
@@ -438,11 +438,7 @@ void mainRenderFunc(const sgct::RenderData& data) {
     currentDrawResolution = glm::ivec2(data.bufferSize.x, data.bufferSize.y);
 
     glm::vec3 pos;
-    std::memcpy(
-        glm::value_ptr(pos),
-        &Engine::instance().defaultUser().posMono().x,
-        sizeof(vec3)
-    );
+    std::memcpy(glm::value_ptr(pos), &Engine::defaultUser().posMono().x, sizeof(vec3));
 
     glm::mat4 viewMatrix;
     std::memcpy(
@@ -620,10 +616,10 @@ void mainCharCallback(unsigned int codepoint, int modifiers, sgct::Window* windo
 
 
 
-void mainDropCallback(std::vector<std::string_view> paths) {
+void mainDropCallback(const std::vector<std::string_view>& paths) {
     ZoneScoped;
 
-    for (std::string_view path : paths) {
+    for (const std::string_view path : paths) {
         global::openSpaceEngine->handleDragDrop(path);
     }
 }
@@ -750,11 +746,11 @@ void setSgctDelegateFunctions() {
         const Viewport* viewport = dynamic_cast<const Viewport*>(currentViewport);
         if (viewport) {
             if (viewport->hasSubViewports() && viewport->nonLinearProjection()) {
-                ivec2 dim = viewport->nonLinearProjection()->cubemapResolution();
+                const ivec2 dim = viewport->nonLinearProjection()->cubemapResolution();
                 return glm::ivec2(dim.x, dim.y);
             }
             else {
-                ivec2 dim = currentWindow->finalFBODimensions();
+                const ivec2 dim = currentWindow->finalFBODimensions();
                 return glm::ivec2(dim.x, dim.y);
             }
         }
@@ -765,8 +761,8 @@ void setSgctDelegateFunctions() {
     sgctDelegate.currentViewportSize = []() {
         ZoneScoped;
 
-        if (currentViewport != nullptr) {
-            vec2 size = currentViewport->size();
+        if (currentViewport) {
+            const vec2 size = currentViewport->size();
             return glm::ivec2(size.x, size.y);
         }
         return glm::ivec2(-1, -1);
@@ -774,9 +770,9 @@ void setSgctDelegateFunctions() {
     sgctDelegate.currentViewportResolution = []() {
         ZoneScoped;
 
-        if (currentViewport != nullptr) {
-            ivec2 res = currentWindow->resolution();
-            vec2 size = currentViewport->size();
+        if (currentViewport) {
+            const ivec2 res = currentWindow->resolution();
+            const vec2 size = currentViewport->size();
             return glm::ivec2(size.x * res.x, size.y * res.y);
         }
         return glm::ivec2(-1, -1);
@@ -784,7 +780,7 @@ void setSgctDelegateFunctions() {
     sgctDelegate.dpiScaling = []() {
         ZoneScoped;
 
-        vec2 scale = currentWindow->scale();
+        const vec2 scale = currentWindow->scale();
         return glm::vec2(scale.x, scale.y);
     };
     sgctDelegate.firstWindowResolution = []() {
@@ -951,8 +947,7 @@ void setSgctDelegateFunctions() {
     };
     sgctDelegate.swapGroupFrameNumber = []() -> uint64_t {
         ZoneScoped;
-
-        return currentWindow->swapGroupFrameNumber();
+        return sgct::Window::swapGroupFrameNumber();
     };
     sgctDelegate.setScreenshotFolder = [](std::filesystem::path path) {
         sgct::Settings::instance().setCapturePath(std::move(path));
@@ -966,29 +961,30 @@ void setSgctDelegateFunctions() {
     sgctDelegate.currentNode = []() {
         return ClusterManager::instance().thisNodeId();
     };
-    sgctDelegate.mousePositionViewportRelative = [](glm::vec2 mousePosition) {
+    sgctDelegate.mousePositionViewportRelative = [](const glm::vec2& mousePosition) {
         for (const std::unique_ptr<Window>& window : Engine::instance().windows()) {
-            if (isGuiWindow(window.get())) {
-                sgct::ivec2 res = window->resolution();
-                for (const std::unique_ptr<Viewport>& viewport : window->viewports()) {
-                    sgct::vec2 pos = viewport->position();
-                    sgct::vec2 size = viewport->size();
-                    glm::vec4 bounds = glm::vec4(
-                        pos.x * res.x,
-                        (1.0 - pos.y - size.y) * res.y,
-                        (pos.x + size.x) * res.x,
-                        (1.0 - pos.y) * res.y
-                    );
+            if (!isGuiWindow(window.get())) {
+                continue;
+            }
 
-                    if (
-                        (mousePosition.x >= bounds.x && mousePosition.x <= bounds.z) &&
-                        (mousePosition.y >= bounds.y && mousePosition.y <= bounds.w)
-                        ) {
-                        return glm::vec2(
-                            res.x * (mousePosition.x - bounds.x) / (bounds.z - bounds.x),
-                            res.y * (mousePosition.y - bounds.y) / (bounds.w - bounds.y)
-                        );
-                    }
+            const sgct::ivec2 res = window->resolution();
+            for (const std::unique_ptr<Viewport>& viewport : window->viewports()) {
+                const sgct::vec2 pos = viewport->position();
+                const sgct::vec2 size = viewport->size();
+                const glm::vec4 bounds = glm::vec4(
+                    pos.x * res.x,
+                    (1.0 - pos.y - size.y) * res.y,
+                    (pos.x + size.x) * res.x,
+                    (1.0 - pos.y) * res.y
+                );
+
+                if ((mousePosition.x >= bounds.x && mousePosition.x <= bounds.z) &&
+                    (mousePosition.y >= bounds.y && mousePosition.y <= bounds.w))
+                {
+                    return glm::vec2(
+                        res.x * (mousePosition.x - bounds.x) / (bounds.z - bounds.x),
+                        res.y * (mousePosition.y - bounds.y) / (bounds.w - bounds.y)
+                    );
                 }
             }
         }
@@ -1008,7 +1004,7 @@ void checkCommandLineForSettings(int& argc, char** argv, bool& hasSGCT, bool& ha
 
             const std::string sgctAssignment = "SGCTConfig=";
             const size_t findSgct = p.find(sgctAssignment);
-            const size_t findBracket = p.find("}");
+            const size_t findBracket = p.find('}');
             if (findSgct != std::string::npos) {
                 if (findBracket != std::string::npos) {
                     sgctFunctionName = arg.substr(
@@ -1025,17 +1021,17 @@ void checkCommandLineForSettings(int& argc, char** argv, bool& hasSGCT, bool& ha
     }
 }
 
-std::string setWindowConfigPresetForGui(const std::string labelFromCfgFile,
+std::string setWindowConfigPresetForGui(const std::string& labelFromCfgFile,
                                         bool haveCliSGCTConfig)
 {
     openspace::Configuration& config = *global::configuration;
 
     std::string preset;
-    bool sgctConfigFileSpecifiedByLuaFunction = !config.sgctConfigNameInitialized.empty();
+    const bool sgctCfgFileSpecifiedByLua = !config.sgctConfigNameInitialized.empty();
     if (haveCliSGCTConfig) {
         preset = fmt::format("{} (from CLI)", config.windowConfiguration);
     }
-    else if (sgctConfigFileSpecifiedByLuaFunction) {
+    else if (sgctCfgFileSpecifiedByLua) {
         preset = config.sgctConfigNameInitialized + labelFromCfgFile;
     }
     else {
@@ -1045,7 +1041,7 @@ std::string setWindowConfigPresetForGui(const std::string labelFromCfgFile,
 }
 
 std::string selectedSgctProfileFromLauncher(LauncherWindow& lw, bool hasCliSGCTConfig,
-                                            std::string windowConfiguration,
+                                            const std::string& windowConfiguration,
                                             const std::string& labelFromCfgFile)
 {
     std::string config = windowConfiguration;
@@ -1060,7 +1056,7 @@ std::string selectedSgctProfileFromLauncher(LauncherWindow& lw, bool hasCliSGCTC
             }
         }
         else {
-            std::filesystem::path c = absPath(config);
+            const std::filesystem::path c = absPath(config);
 
             std::filesystem::path cj = c;
             cj.replace_extension(".json");
@@ -1173,7 +1169,7 @@ int main(int argc, char* argv[]) {
     );
 
     try {
-        bool showHelp = parser.execute();
+        const bool showHelp = parser.execute();
         if (showHelp) {
             std::cout << parser.helpText();
             exit(EXIT_SUCCESS);
@@ -1215,15 +1211,15 @@ int main(int argc, char* argv[]) {
 
         // Register the base path as the directory where the configuration file lives
         std::filesystem::path base = configurationFilePath.parent_path();
-        FileSys.registerPathToken("${BASE}", base);
+        FileSys.registerPathToken("${BASE}", std::move(base));
 
         // The previous incarnation of this was initializing GLFW to get the primary
         // monitor's resolution, but that had some massive performance implications as
         // there was some issue with the swap buffer handling inside of GLFW. My
         // assumption is that GLFW doesn't like being initialized, destroyed, and then
         // initialized again. Therefore we are using the platform specific functions now
-        glm::ivec2 size = glm::ivec2(1920, 1080);
 #ifdef WIN32
+        glm::ivec2 size = glm::ivec2(1920, 1080);
         DEVMODEW dm = { 0 };
         dm.dmSize = sizeof(DEVMODEW);
         BOOL success = EnumDisplaySettingsW(nullptr, ENUM_CURRENT_SETTINGS, &dm);
@@ -1231,6 +1227,8 @@ int main(int argc, char* argv[]) {
             size.x = dm.dmPelsWidth;
             size.y = dm.dmPelsHeight;
         }
+#else // ^^^^ WIN32 // !WIN32 vvvv
+        const glm::ivec2 size = glm::ivec2(1920, 1080);
 #endif // WIN32
 
         // Loading configuration from disk
@@ -1327,7 +1325,7 @@ int main(int argc, char* argv[]) {
 #endif // __APPLE__
 
         std::string pwd = std::filesystem::current_path().string();
-        if (size_t it = pwd.find_first_of("'\"[]");  it != std::string::npos) {
+        if (const size_t it = pwd.find_first_of("'\"[]");  it != std::string::npos) {
             QMessageBox::warning(
                 nullptr,
                 "OpenSpace",
@@ -1339,15 +1337,15 @@ int main(int argc, char* argv[]) {
             );
         }
 
-        LauncherWindow win(
+        LauncherWindow win = LauncherWindow(
             !commandlineArguments.profile.has_value(),
             *global::configuration,
             !commandlineArguments.windowConfig.has_value(),
-            windowCfgPreset,
+            std::move(windowCfgPreset),
             nullptr
         );
         win.show();
-        app.exec();
+        QApplication::exec();
 
         if (!win.wasLaunchSelected()) {
             exit(EXIT_SUCCESS);
@@ -1375,8 +1373,8 @@ int main(int argc, char* argv[]) {
         // there was some issue with the swap buffer handling inside of GLFW. My
         // assumption is that GLFW doesn't like being initialized, destroyed, and then
         // initialized again. Therefore we are using the platform specific functions now
-        glm::ivec2 size = glm::ivec2(1920, 1080);
 #ifdef WIN32
+        glm::ivec2 size = glm::ivec2(1920, 1080);
         DEVMODEW dm = { 0 };
         dm.dmSize = sizeof(DEVMODEW);
         BOOL success = EnumDisplaySettingsW(nullptr, ENUM_CURRENT_SETTINGS, &dm);
@@ -1384,6 +1382,8 @@ int main(int argc, char* argv[]) {
             size.x = dm.dmPelsWidth;
             size.y = dm.dmPelsHeight;
         }
+#else // ^^^^ WIN32 // !WIN32 vvvv
+        const glm::ivec2 size = glm::ivec2(1920, 1080);
 #endif // WIN32
 
         *global::configuration = loadConfigurationFromFile(
@@ -1429,7 +1429,7 @@ int main(int argc, char* argv[]) {
     LDEBUG("Creating SGCT Engine");
     std::vector<std::string> arg(argv + 1, argv + argc);
     LDEBUG("Parsing commandline arguments");
-    sgct::Configuration config = parseArguments(arg);
+    const sgct::Configuration config = parseArguments(arg);
     LDEBUG("Loading cluster information");
     config::Cluster cluster = loadCluster(absPath(windowConfiguration).string());
 
@@ -1453,7 +1453,7 @@ int main(int argc, char* argv[]) {
     Log::instance().setNotifyLevel(Log::Level::Debug);
 
     try {
-        Engine::create(cluster, callbacks, config);
+        Engine::create(std::move(cluster), std::move(callbacks), config);
     }
     catch (const std::runtime_error& e) {
         LFATALC("main", e.what());
@@ -1503,8 +1503,8 @@ int main(int argc, char* argv[]) {
         settings.hasStartedBefore = true;
 
         if (settings.rememberLastProfile) {
-            std::filesystem::path p = global::configuration->profile;
-            std::filesystem::path reducedName = p.filename().replace_extension();
+            const std::filesystem::path p = global::configuration->profile;
+            const std::filesystem::path reducedName = p.filename().replace_extension();
             settings.profile = reducedName.string();
         }
 
diff --git a/ext/ghoul b/ext/ghoul
index 2c78aec544..43c025377f 160000
--- a/ext/ghoul
+++ b/ext/ghoul
@@ -1 +1 @@
-Subproject commit 2c78aec544b741a3de420ee6f99b72b04e7f9061
+Subproject commit 43c025377fe5077c90e37f1a1a408e1865de6b14
diff --git a/include/openspace/camera/camera.h b/include/openspace/camera/camera.h
index f975b70b23..9fa3bd8ea8 100644
--- a/include/openspace/camera/camera.h
+++ b/include/openspace/camera/camera.h
@@ -78,7 +78,7 @@ public:
     void setAtmosphereDimmingFactor(float atmosphereDimmingFactor);
 
     // Relative mutators
-    void rotate(glm::dquat rotation);
+    void rotate(const glm::dquat& rotation);
 
     // Accessors
     // Remove Vec3 from the name when psc is gone
diff --git a/include/openspace/data/dataloader.h b/include/openspace/data/dataloader.h
index 22101bb691..2296885f25 100644
--- a/include/openspace/data/dataloader.h
+++ b/include/openspace/data/dataloader.h
@@ -103,8 +103,8 @@ namespace data {
     Dataset loadFile(std::filesystem::path path,
         std::optional<DataMapping> specs = std::nullopt);
 
-    std::optional<Dataset> loadCachedFile(std::filesystem::path path);
-    void saveCachedFile(const Dataset& dataset, std::filesystem::path path);
+    std::optional<Dataset> loadCachedFile(const std::filesystem::path& path);
+    void saveCachedFile(const Dataset& dataset, const std::filesystem::path& path);
 
     Dataset loadFileWithCache(std::filesystem::path path,
         std::optional<DataMapping> specs = std::nullopt);
@@ -116,8 +116,8 @@ namespace label {
     Labelset loadFile(std::filesystem::path path,
         std::optional<DataMapping> specs = std::nullopt);
 
-    std::optional<Labelset> loadCachedFile(std::filesystem::path path);
-    void saveCachedFile(const Labelset& labelset, std::filesystem::path path);
+    std::optional<Labelset> loadCachedFile(const std::filesystem::path& path);
+    void saveCachedFile(const Labelset& labelset, const std::filesystem::path& path);
 
     Labelset loadFileWithCache(std::filesystem::path path);
 
@@ -129,8 +129,8 @@ namespace color {
     ColorMap loadFile(std::filesystem::path path,
         std::optional<DataMapping> specs = std::nullopt);
 
-    std::optional<ColorMap> loadCachedFile(std::filesystem::path path);
-    void saveCachedFile(const ColorMap& colorMap, std::filesystem::path path);
+    std::optional<ColorMap> loadCachedFile(const std::filesystem::path& path);
+    void saveCachedFile(const ColorMap& colorMap, const std::filesystem::path& path);
 
     ColorMap loadFileWithCache(std::filesystem::path path);
 
diff --git a/include/openspace/documentation/verifier.h b/include/openspace/documentation/verifier.h
index 20bc2d3a76..8b9d10ee90 100644
--- a/include/openspace/documentation/verifier.h
+++ b/include/openspace/documentation/verifier.h
@@ -954,7 +954,7 @@ public:
      *       necessary to make the codegen work in all cases without complications there
      */
     OrVerifier(const std::vector<std::variant<Verifier*,
-        std::shared_ptr<Verifier>>> values);
+        std::shared_ptr<Verifier>>>& values);
 
     /**
      * Checks whether the \p dictionary contains the \p key and whether this key passes
diff --git a/include/openspace/engine/downloadmanager.h b/include/openspace/engine/downloadmanager.h
index 7143b4ee61..8549415175 100644
--- a/include/openspace/engine/downloadmanager.h
+++ b/include/openspace/engine/downloadmanager.h
@@ -104,15 +104,14 @@ public:
         OverrideFile overrideFile = OverrideFile::Yes,
         FailOnError failOnError = FailOnError::No, unsigned int timeout_secs = 0,
         DownloadFinishedCallback finishedCallback = DownloadFinishedCallback(),
-        DownloadProgressCallback progressCallback = DownloadProgressCallback()
-    );
+        DownloadProgressCallback progressCallback = DownloadProgressCallback()) const;
 
     std::future<MemoryFile> fetchFile(const std::string& url,
         SuccessCallback successCallback = SuccessCallback(),
         ErrorCallback errorCallback = ErrorCallback());
 
-    void getFileExtension(const std::string& url,
-        RequestFinishedCallback finishedCallback = RequestFinishedCallback());
+    void fileExtension(const std::string& url,
+        RequestFinishedCallback finishedCallback = RequestFinishedCallback()) const;
 
 private:
     bool _useMultithreadedDownload;
diff --git a/include/openspace/engine/windowdelegate.h b/include/openspace/engine/windowdelegate.h
index f6cde89d09..7bfda13217 100644
--- a/include/openspace/engine/windowdelegate.h
+++ b/include/openspace/engine/windowdelegate.h
@@ -122,8 +122,8 @@ struct WindowDelegate {
 
     int (*currentNode)() = []() { return 0; };
 
-    glm::vec2 (*mousePositionViewportRelative)(glm::vec2 mousePosition) =
-        [](glm::vec2) { return glm::vec2(0); };
+    glm::vec2 (*mousePositionViewportRelative)(const glm::vec2& mousePosition) =
+        [](const glm::vec2&) { return glm::vec2(0); };
 };
 
 } // namespace openspace
diff --git a/include/openspace/events/eventengine.h b/include/openspace/events/eventengine.h
index 10f4eecca4..ebfd241bcf 100644
--- a/include/openspace/events/eventengine.h
+++ b/include/openspace/events/eventengine.h
@@ -113,7 +113,7 @@ public:
      */
     void unregisterEventAction(events::Event::Type type,
         const std::string& identifier,
-        std::optional<ghoul::Dictionary> filter = std::nullopt);
+        const std::optional<ghoul::Dictionary>& filter = std::nullopt);
 
     /**
      * Removing registration for a specific event identified by the \p identifier.
diff --git a/include/openspace/interaction/camerainteractionstates.h b/include/openspace/interaction/camerainteractionstates.h
index d2e267d751..efdceb476a 100644
--- a/include/openspace/interaction/camerainteractionstates.h
+++ b/include/openspace/interaction/camerainteractionstates.h
@@ -58,7 +58,7 @@ public:
      * Returns true if any of the velocities are larger than zero, i.e. wether an
      * interaction happened.
      */
-    bool hasNonZeroVelocities(bool checkOnlyMovement = false);
+    bool hasNonZeroVelocities(bool checkOnlyMovement = false) const;
 
 protected:
     struct InteractionState {
diff --git a/include/openspace/interaction/interpolator.inl b/include/openspace/interaction/interpolator.inl
index f1c24eb068..d02bc0ec74 100644
--- a/include/openspace/interaction/interpolator.inl
+++ b/include/openspace/interaction/interpolator.inl
@@ -59,7 +59,7 @@ void Interpolator<T>::setInterpolationTime(float interpolationTime) {
 template <typename T>
 void Interpolator<T>::step() {
     _t += _scaledDeltaTime;
-    _t = glm::clamp(_t, 0.0f, 1.0f);
+    _t = glm::clamp(_t, 0.f, 1.f);
 }
 
 template <typename T>
diff --git a/include/openspace/interaction/joystickcamerastates.h b/include/openspace/interaction/joystickcamerastates.h
index c499cdff89..5b2a993d04 100644
--- a/include/openspace/interaction/joystickcamerastates.h
+++ b/include/openspace/interaction/joystickcamerastates.h
@@ -88,14 +88,14 @@ public:
     void updateStateFromInput(
         const JoystickInputStates& joystickInputStates, double deltaTime);
 
-    void setAxisMapping(std::string joystickName, int axis, AxisType mapping,
+    void setAxisMapping(const std::string& joystickName, int axis, AxisType mapping,
         AxisInvert shouldInvert = AxisInvert::No,
         JoystickType joystickType = JoystickType::JoystickLike,
         bool isSticky = false, AxisFlip shouldFlip = AxisFlip::No,
         double sensitivity = 0.0
     );
 
-    void setAxisMappingProperty(std::string joystickName, int axis,
+    void setAxisMappingProperty(const std::string& joystickName, int axis,
         std::string propertyUri, float min = 0.f, float max = 1.f,
         AxisInvert shouldInvert = AxisInvert::No, bool isRemote = true
     );
diff --git a/include/openspace/interaction/keybindingmanager.h b/include/openspace/interaction/keybindingmanager.h
index c638c5015d..655f0b4057 100644
--- a/include/openspace/interaction/keybindingmanager.h
+++ b/include/openspace/interaction/keybindingmanager.h
@@ -38,8 +38,6 @@ namespace openspace::interaction {
 
 class KeybindingManager {
 public:
-    KeybindingManager();
-
     void resetKeyBindings();
 
     void bindKey(Key key, KeyModifier modifier, std::string action);
diff --git a/include/openspace/interaction/mousecamerastates.h b/include/openspace/interaction/mousecamerastates.h
index 252d2ecd7e..6015a2e495 100644
--- a/include/openspace/interaction/mousecamerastates.h
+++ b/include/openspace/interaction/mousecamerastates.h
@@ -36,8 +36,8 @@ class MouseCameraStates : public CameraInteractionStates {
 public:
     MouseCameraStates(double sensitivity, double velocityScaleFactor);
 
-    void updateStateFromInput(const MouseInputState& mouseinputState,
-        const KeyboardInputState& keyboardinputState, double deltaTime);
+    void updateStateFromInput(const MouseInputState& mouseState,
+        const KeyboardInputState& keyboardState, double deltaTime);
 
     void setInvertMouseButton(bool value);
 
diff --git a/include/openspace/interaction/sessionrecording.h b/include/openspace/interaction/sessionrecording.h
index da587cd4ef..27dc7d615d 100644
--- a/include/openspace/interaction/sessionrecording.h
+++ b/include/openspace/interaction/sessionrecording.h
@@ -101,7 +101,7 @@ public:
     SessionRecording();
     SessionRecording(bool isGlobal);
 
-    ~SessionRecording() override;
+    ~SessionRecording() override = default;
 
     /**
      * Used to de-initialize the session recording feature. Any recording or playback
@@ -305,7 +305,7 @@ public:
      *
      * \param callback Function handle for the callback
      */
-    void removeStateChangeCallback(CallbackHandle callback);
+    void removeStateChangeCallback(CallbackHandle handle);
 
     /**
      * Provides list of available playback files.
@@ -338,7 +338,7 @@ public:
      * \return `true` if data read has no errors
      */
     bool readCameraKeyframeAscii(Timestamps& times,
-        datamessagestructures::CameraKeyframe& kf, std::string currentParsingLine,
+        datamessagestructures::CameraKeyframe& kf, const std::string& currentParsingLine,
         int lineN);
 
     /**
@@ -365,7 +365,7 @@ public:
      * \return `true` if data read has no errors
      */
     bool readTimeKeyframeAscii(Timestamps& times,
-        datamessagestructures::TimeKeyframe& kf, std::string currentParsingLine,
+        datamessagestructures::TimeKeyframe& kf, const std::string& currentParsingLine,
         int lineN);
 
     /**
@@ -394,7 +394,7 @@ public:
      * \return `true` if data read has no errors
      */
     bool readScriptKeyframeAscii(Timestamps& times,
-        datamessagestructures::ScriptMessage& kf, std::string currentParsingLine,
+        datamessagestructures::ScriptMessage& kf, const std::string& currentParsingLine,
         int lineN);
 
     /**
@@ -482,7 +482,7 @@ public:
      * \param readLen_chars Number of characters to be read, which may be the expected
      *        length of the header line, or an arbitrary number of characters within it
      */
-    static std::string readHeaderElement(std::ifstream& stream, size_t readLen_chars);
+    static std::string readHeaderElement(std::ifstream& stream, size_t readLenChars);
 
     /**
      * Reads header information from a session recording file.
@@ -491,7 +491,7 @@ public:
      * \param readLen_chars Number of characters to be read, which may be the expected
      *        length of the header line, or an arbitrary number of characters within it
      */
-    static std::string readHeaderElement(std::stringstream& stream, size_t readLen_chars);
+    static std::string readHeaderElement(std::stringstream& stream, size_t readLenChars);
 
     /**
      * Writes a header to a binary recording file buffer.
@@ -520,7 +520,7 @@ public:
      * \param entry The ASCII string version of the keyframe (any type)
      * \param file `std::ofstream` object to write to
      */
-    static void saveKeyframeToFile(std::string entry, std::ofstream& file);
+    static void saveKeyframeToFile(const std::string& entry, std::ofstream& file);
 
     /**
      * Checks if a specified recording file ends with a particular file extension.
@@ -528,7 +528,8 @@ public:
      * \param filename The name of the file to record to
      * \param extension The file extension to check for
      */
-    static bool hasFileExtension(std::string filename, std::string extension);
+    static bool hasFileExtension(const std::string& filename,
+        const std::string& extension);
 
     /**
      * Converts file format of a session recording file to the current format version
@@ -589,7 +590,7 @@ public:
      *
      * \return pathname of the converted version of the file
      */
-    std::string determineConversionOutFilename(const std::string filename, DataMode mode);
+    std::string determineConversionOutFilename(const std::string& filename, DataMode mode);
 
 protected:
     properties::BoolProperty _renderPlaybackInformation;
@@ -612,7 +613,7 @@ protected:
     double _timestampPlaybackStarted_application = 0.0;
     double _timestampPlaybackStarted_simulation = 0.0;
     double _timestampApplicationStarted_simulation = 0.0;
-    bool hasCameraChangedFromPrev(datamessagestructures::CameraKeyframe kfNew);
+    bool hasCameraChangedFromPrev(const datamessagestructures::CameraKeyframe& kfNew);
     double appropriateTimestamp(Timestamps t3stamps);
     double equivalentSimulationTime(double timeOs, double timeRec, double timeSim);
     double equivalentApplicationTime(double timeOs, double timeRec, double timeSim);
@@ -620,7 +621,7 @@ protected:
     void recordCurrentTimeRate();
     bool handleRecordingFile(std::string filenameIn);
     static bool isPath(std::string& filename);
-    void removeTrailingPathSlashes(std::string& filename);
+    void removeTrailingPathSlashes(std::string& filename) const;
     bool playbackCamera();
     bool playbackTimeChange();
     bool playbackScript();
@@ -629,7 +630,7 @@ protected:
     void handlePlaybackEnd();
 
     bool findFirstCameraKeyframeInTimeline();
-    Timestamps generateCurrentTimestamp3(double keyframeTime);
+    Timestamps generateCurrentTimestamp3(double keyframeTime) const;
     static void saveStringToFile(const std::string& s, unsigned char* kfBuffer,
         size_t& idx, std::ofstream& file);
     static void saveKeyframeToFileBinary(unsigned char* bufferSource, size_t size,
@@ -675,7 +676,6 @@ protected:
     bool isPropertyAllowedForBaseline(const std::string& propString);
     unsigned int findIndexOfLastCameraKeyframeInTimeline();
     bool doesTimelineEntryContainCamera(unsigned int index) const;
-    bool doesStartWithSubstring(const std::string& s, const std::string& matchSubstr);
     void trimCommandsFromScriptIfFound(std::string& script);
     void replaceCommandsFromScriptIfFound(std::string& script);
 
@@ -694,15 +694,15 @@ protected:
         int lineNum, std::string& inputLine, std::ofstream& outFile, unsigned char* buff);
     virtual bool convertScript(std::stringstream& inStream, DataMode mode, int lineNum,
         std::string& inputLine, std::ofstream& outFile, unsigned char* buff);
-    DataMode readModeFromHeader(std::string filename);
+    DataMode readModeFromHeader(const std::string& filename);
     void readPlaybackHeader_stream(std::stringstream& conversionInStream,
         std::string& version, DataMode& mode);
     void populateListofLoadedSceneGraphNodes();
 
     void checkIfScriptUsesScenegraphNode(std::string s);
-    bool checkForScenegraphNodeAccessScene(std::string& s);
+    bool checkForScenegraphNodeAccessScene(const std::string& s);
     bool checkForScenegraphNodeAccessNav(std::string& navTerm);
-    std::string extractScenegraphNodeFromScene(std::string& s);
+    std::string extractScenegraphNodeFromScene(const std::string& s);
     bool checkIfInitialFocusNodeIsLoaded(unsigned int firstCamIndex);
     std::string isolateTermFromQuotes(std::string s);
     void eraseSpacesFromString(std::string& s);
diff --git a/include/openspace/interaction/tasks/convertrecformattask.h b/include/openspace/interaction/tasks/convertrecformattask.h
index ddc1167934..be519c99f2 100644
--- a/include/openspace/interaction/tasks/convertrecformattask.h
+++ b/include/openspace/interaction/tasks/convertrecformattask.h
@@ -51,7 +51,6 @@ private:
     void convertToAscii();
     void convertToBinary();
     void determineFormatType();
-    std::string addFileSuffix(const std::string& filePath, const std::string& suffix);
     std::filesystem::path _inFilePath;
     std::filesystem::path _outFilePath;
     std::ifstream _iFile;
diff --git a/include/openspace/navigation/keyframenavigator.h b/include/openspace/navigation/keyframenavigator.h
index 237a167eac..c9e2b8153d 100644
--- a/include/openspace/navigation/keyframenavigator.h
+++ b/include/openspace/navigation/keyframenavigator.h
@@ -69,8 +69,8 @@ public:
      * \return true only if a new future keyframe is available to set camera pose
      */
     bool updateCamera(Camera& camera, bool ignoreFutureKeyframes);
-    static bool updateCamera(Camera* camera, const CameraPose prevPose,
-        const CameraPose nextPose, double t, bool ignoreFutureKeyframes);
+    static bool updateCamera(Camera* camera, const CameraPose& prevPose,
+        const CameraPose& nextPose, double t, bool ignoreFutureKeyframes);
 
     Timeline<CameraPose>& timeline();
     void addKeyframe(double timestamp, KeyframeNavigator::CameraPose pose);
diff --git a/include/openspace/navigation/navigationhandler.h b/include/openspace/navigation/navigationhandler.h
index 54f3068d31..f0818d268e 100644
--- a/include/openspace/navigation/navigationhandler.h
+++ b/include/openspace/navigation/navigationhandler.h
@@ -143,7 +143,7 @@ public:
     NavigationState navigationState(const SceneGraphNode& referenceFrame) const;
 
     void saveNavigationState(const std::filesystem::path& filepath,
-        const std::string& referenceFrameIdentifier);
+        const std::string& referenceFrameIdentifier) const;
 
     void loadNavigationState(const std::string& filepath);
 
diff --git a/include/openspace/navigation/orbitalnavigator.h b/include/openspace/navigation/orbitalnavigator.h
index 4da4639bc7..cde98848f3 100644
--- a/include/openspace/navigation/orbitalnavigator.h
+++ b/include/openspace/navigation/orbitalnavigator.h
@@ -274,7 +274,7 @@ private:
      * from the global to the current total rotation so that
      * `cameraRotation = globalRotation * localRotation`.
      */
-    CameraRotationDecomposition decomposeCameraRotationSurface(const CameraPose pose,
+    CameraRotationDecomposition decomposeCameraRotationSurface(const CameraPose& pose,
         const SceneGraphNode& reference);
 
     /**
@@ -285,22 +285,23 @@ private:
      * The local rotation defines the differential from the global to the current total
      * rotation so that `cameraRotation = globalRotation * localRotation`.
      */
-    CameraRotationDecomposition decomposeCameraRotation(const CameraPose pose,
-        glm::dvec3 reference);
+    CameraRotationDecomposition decomposeCameraRotation(const CameraPose& pose,
+        const glm::dvec3& reference);
 
     /**
      * Composes a pair of global and local rotations into a quaternion that can be used as
      * the world rotation for a camera.
      */
-    glm::dquat composeCameraRotation(const CameraRotationDecomposition& composition);
+    glm::dquat composeCameraRotation(
+        const CameraRotationDecomposition& composition) const;
 
     /**
      * Moves and rotates the camera around the anchor node in order to maintain the screen
      * space position of the aim node. Also interpolates to the aim node, when retargeting
      * the aim.
      */
-    CameraPose followAim(CameraPose pose, glm::dvec3 cameraToAnchor,
-        Displacement anchorToAim);
+    CameraPose followAim(CameraPose pose, const glm::dvec3& cameraToAnchor,
+        const Displacement& anchorToAim);
 
     /**
      * Perform a camera roll on the local camera rotation.
@@ -326,7 +327,7 @@ private:
         const glm::dquat& localCameraRotation);
 
     Displacement interpolateRetargetAim(double deltaTime, CameraPose pose,
-        glm::dvec3 cameraToAnchor, Displacement anchorToAim);
+        const glm::dvec3& cameraToAnchor, Displacement anchorToAim);
 
     double interpolateCameraToSurfaceDistance(double deltaTime, double currentDistance,
         double targetDistance);
@@ -354,12 +355,12 @@ private:
 
     /**
      * Adds rotation to the camera position so that it follows the rotation of the anchor
-     * node defined by the differential \p anchorNodeRotationDiff.
+     * node defined by the differential \p focusNodeRotationDiff.
      *
      * \return A position updated with the rotation defined by \p anchorNodeRotationDiff
      */
     glm::dvec3 followAnchorNodeRotation(const glm::dvec3& cameraPosition,
-        const glm::dvec3& objectPosition, const glm::dquat& anchorNodeRotationDiff) const;
+        const glm::dvec3& objectPosition, const glm::dquat& focusNodeRotationDiff) const;
 
     /**
      * Updates the global rotation so that it points towards the anchor node.
@@ -367,7 +368,7 @@ private:
      * \return A global rotation quaternion defining a rotation towards the anchor node
      */
     glm::dquat rotateGlobally(const glm::dquat& globalCameraRotation,
-        const glm::dquat& aimNodeRotationDiff,
+        const glm::dquat& focusNodeRotationDiff,
         const SurfacePositionHandle& positionHandle) const;
 
     /**
@@ -410,12 +411,6 @@ private:
     glm::dvec3 cameraToSurfaceVector(const glm::dvec3& cameraPos,
         const glm::dvec3& centerPos, const SurfacePositionHandle& posHandle);
 
-    /**
-     * Calculates a SurfacePositionHandle given a camera position in world space.
-     */
-    SurfacePositionHandle calculateSurfacePositionHandle(const SceneGraphNode& node,
-        const glm::dvec3& cameraPositionWorldSpace) const;
-
     void resetIdleBehavior();
 
     /**
@@ -451,7 +446,7 @@ private:
      * \param position The position of the camera. Will be changed by the function
      * \param globalRotation The camera's global rotation. Will be changed by the function
      */
-    void orbitAroundAxis(const glm::dvec3 axis, double angle, glm::dvec3& position,
+    void orbitAroundAxis(const glm::dvec3& axis, double angle, glm::dvec3& position,
         glm::dquat& globalRotation);
 
     double rotationSpeedScaleFromCameraHeight(const glm::dvec3& cameraPosition,
diff --git a/include/openspace/navigation/pathcurve.h b/include/openspace/navigation/pathcurve.h
index 4cda795d06..c5aea40b02 100644
--- a/include/openspace/navigation/pathcurve.h
+++ b/include/openspace/navigation/pathcurve.h
@@ -36,11 +36,11 @@ class Waypoint;
 class PathCurve {
 public:
     struct InsufficientPrecisionError : public ghoul::RuntimeError {
-        explicit InsufficientPrecisionError(std::string msg);
+        explicit InsufficientPrecisionError(std::string error);
     };
 
     struct TooShortPathError : public ghoul::RuntimeError {
-        explicit TooShortPathError(std::string msg);
+        explicit TooShortPathError(std::string error);
     };
 
     virtual ~PathCurve() = 0;
diff --git a/include/openspace/navigation/pathnavigator.h b/include/openspace/navigation/pathnavigator.h
index 83ced28727..c2db18ff0e 100644
--- a/include/openspace/navigation/pathnavigator.h
+++ b/include/openspace/navigation/pathnavigator.h
@@ -105,7 +105,7 @@ private:
      */
     void findRelevantNodes();
 
-    void removeRollRotation(CameraPose& pose);
+    void removeRollRotation(CameraPose& pose) const;
 
     std::unique_ptr<Path> _currentPath = nullptr;
     bool _isPlaying = false;
diff --git a/include/openspace/navigation/waypoint.h b/include/openspace/navigation/waypoint.h
index 373cb07804..a6cdb9d30e 100644
--- a/include/openspace/navigation/waypoint.h
+++ b/include/openspace/navigation/waypoint.h
@@ -39,7 +39,7 @@ struct NavigationState;
 class Waypoint {
 public:
     Waypoint() = default;
-    Waypoint(const glm::dvec3& pos, const glm::dquat& rot, const std::string& ref);
+    Waypoint(const glm::dvec3& pos, const glm::dquat& rot, std::string ref);
     explicit Waypoint(const NavigationState& ns);
 
     CameraPose pose() const;
@@ -92,7 +92,7 @@ struct NodeCameraStateSpec {
  * \return The computed WayPoint
  */
 Waypoint computeWaypointFromNodeInfo(const NodeCameraStateSpec& spec,
-    std::optional<Waypoint> startPoint = std::nullopt, bool useLinear = false);
+    const std::optional<Waypoint>& startPoint = std::nullopt, bool useLinear = false);
 
 } // namespace openspace::interaction
 
diff --git a/include/openspace/network/messagestructures.h b/include/openspace/network/messagestructures.h
index a11fe62eb8..f959ddc9b1 100644
--- a/include/openspace/network/messagestructures.h
+++ b/include/openspace/network/messagestructures.h
@@ -49,8 +49,8 @@ struct CameraKeyframe {
     CameraKeyframe(const std::vector<char>& buffer) {
         deserialize(buffer);
     }
-    CameraKeyframe(glm::dvec3&& pos, glm::dquat&& rot, std::string&& focusNode,
-        bool&& followNodeRot, float&& scale)
+    CameraKeyframe(glm::dvec3 pos, glm::dquat rot, std::string focusNode,
+                   bool followNodeRot, float scale)
         : _position(pos)
         , _rotation(rot)
         , _followNodeRotation(followNodeRot)
diff --git a/include/openspace/properties/selectionproperty.h b/include/openspace/properties/selectionproperty.h
index 225fb6f69e..99363069dc 100644
--- a/include/openspace/properties/selectionproperty.h
+++ b/include/openspace/properties/selectionproperty.h
@@ -122,7 +122,7 @@ protected:
 
 private:
     void sortOptions();
-    bool removeInvalidKeys(std::set<std::string>& keys);
+    bool removeInvalidKeys(std::set<std::string>& keys) const;
 
     std::string generateAdditionalJsonDescription() const override;
 
diff --git a/include/openspace/rendering/dashboarditem.h b/include/openspace/rendering/dashboarditem.h
index 6c278ae8a4..1f8c4ef72c 100644
--- a/include/openspace/rendering/dashboarditem.h
+++ b/include/openspace/rendering/dashboarditem.h
@@ -41,7 +41,7 @@ public:
     static documentation::Documentation Documentation();
 
     static std::unique_ptr<DashboardItem> createFromDictionary(
-        ghoul::Dictionary dictionary
+        const ghoul::Dictionary& dictionary
     );
 
     DashboardItem(const ghoul::Dictionary& dictionary);
diff --git a/include/openspace/rendering/framebufferrenderer.h b/include/openspace/rendering/framebufferrenderer.h
index 55d046c097..1fae1d86ef 100644
--- a/include/openspace/rendering/framebufferrenderer.h
+++ b/include/openspace/rendering/framebufferrenderer.h
@@ -191,7 +191,7 @@ private:
     void resolveMSAA(float blackoutFactor);
     void applyTMO(float blackoutFactor, const glm::ivec4& viewport);
     void applyFXAA(const glm::ivec4& viewport);
-    void updateDownscaleTextures();
+    void updateDownscaleTextures() const;
     void updateExitVolumeTextures();
     void writeDownscaledVolume(const glm::ivec4& viewport);
 
diff --git a/include/openspace/rendering/helper.h b/include/openspace/rendering/helper.h
index c66f132a84..29146c70fb 100644
--- a/include/openspace/rendering/helper.h
+++ b/include/openspace/rendering/helper.h
@@ -146,12 +146,12 @@ VertexXYZ convertToXYZ(const Vertex& v);
 std::vector<VertexXYZ> convert(std::vector<Vertex> v);
 
 std::vector<Vertex> createRing(int nSegments, float radius,
-    glm::vec4 colors = glm::vec4(1.f));
+    const glm::vec4& colors = glm::vec4(1.f));
 
 std::vector<VertexXYZ> createRingXYZ(int nSegments, float radius);
 
 VertexIndexListCombo<Vertex>
-createSphere(int nSegments, glm::vec3 radii, glm::vec4 colors = glm::vec4(1.f));
+createSphere(int nSegments, glm::vec3 radii, const glm::vec4& colors = glm::vec4(1.f));
 
 VertexIndexListCombo<VertexXYZNormal> createCylinder(unsigned int nSegments,
     float radius, float height);
diff --git a/include/openspace/rendering/luaconsole.h b/include/openspace/rendering/luaconsole.h
index e9913bf4dd..efce7f5a9b 100644
--- a/include/openspace/rendering/luaconsole.h
+++ b/include/openspace/rendering/luaconsole.h
@@ -46,7 +46,7 @@ namespace openspace {
 class LuaConsole : public properties::PropertyOwner {
 public:
     LuaConsole();
-    ~LuaConsole() override;
+    ~LuaConsole() override = default;
 
     void initialize();
     void deinitialize();
@@ -62,8 +62,7 @@ public:
 
 private:
     void parallelConnectionChanged(const ParallelConnection::Status& status);
-
-    void addToCommand(std::string c);
+    void addToCommand(const std::string& c);
 
     properties::BoolProperty _isVisible;
     properties::BoolProperty _shouldBeSynchronized;
diff --git a/include/openspace/rendering/renderable.h b/include/openspace/rendering/renderable.h
index 542304e3b1..747c58852e 100644
--- a/include/openspace/rendering/renderable.h
+++ b/include/openspace/rendering/renderable.h
@@ -71,7 +71,7 @@ public:
     };
 
     static ghoul::mm_unique_ptr<Renderable> createFromDictionary(
-        ghoul::Dictionary dictionary);
+        const ghoul::Dictionary& dictionary);
 
     Renderable(const ghoul::Dictionary& dictionary,
         RenderableSettings settings = RenderableSettings());
@@ -175,7 +175,7 @@ protected:
      * \return The resulting model view transformation matrix in double precision
      */
     glm::dmat4 calcModelViewTransform(const RenderData& data,
-        std::optional<glm::dmat4> modelTransform = std::nullopt) const;
+        const std::optional<glm::dmat4>& modelTransform = std::nullopt) const;
 
     /**
      * Calculates the model view projection transformation matrix with the given data and
@@ -189,7 +189,7 @@ protected:
      *         precision
      */
     glm::dmat4 calcModelViewProjectionTransform(const RenderData& data,
-        std::optional<glm::dmat4> modelTransform = std::nullopt) const;
+        const std::optional<glm::dmat4>& modelTransform = std::nullopt) const;
 
     /**
      * Calculates the model, model view, and the model view projection transformation
diff --git a/include/openspace/rendering/renderengine.h b/include/openspace/rendering/renderengine.h
index d25ad372c3..f4806efd97 100644
--- a/include/openspace/rendering/renderengine.h
+++ b/include/openspace/rendering/renderengine.h
@@ -103,11 +103,12 @@ public:
 
     std::unique_ptr<ghoul::opengl::ProgramObject> buildRenderProgram(
         const std::string& name, const std::filesystem::path& vsPath,
-        std::filesystem::path fsPath, ghoul::Dictionary data = ghoul::Dictionary());
+        const std::filesystem::path& fsPath,
+        ghoul::Dictionary data = ghoul::Dictionary());
 
     std::unique_ptr<ghoul::opengl::ProgramObject> buildRenderProgram(
         const std::string& name, const std::filesystem::path& vsPath,
-        std::filesystem::path fsPath, const std::filesystem::path& csPath,
+        const std::filesystem::path& fsPath, const std::filesystem::path& csPath,
         ghoul::Dictionary data = ghoul::Dictionary());
 
     void removeRenderProgram(ghoul::opengl::ProgramObject* program);
@@ -164,7 +165,7 @@ private:
     void renderVersionInformation();
     void renderCameraInformation();
     void renderShutdownInformation(float timer, float fullTime);
-    void renderDashboard();
+    void renderDashboard() const;
     float combinedBlackoutFactor() const;
 
     Camera* _camera = nullptr;
diff --git a/include/openspace/rendering/screenspacerenderable.h b/include/openspace/rendering/screenspacerenderable.h
index 916c060b60..bdba579e20 100644
--- a/include/openspace/rendering/screenspacerenderable.h
+++ b/include/openspace/rendering/screenspacerenderable.h
@@ -82,7 +82,7 @@ public:
     glm::vec2 screenSpaceDimensions();
     glm::vec2 upperRightCornerScreenSpace();
     glm::vec2 lowerLeftCornerScreenSpace();
-    bool isIntersecting(glm::vec2 coord);
+    bool isIntersecting(const glm::vec2& coord);
     void translate(glm::vec2 translation, glm::vec2 position);
     void setCartesianPosition(const glm::vec3& position);
     void setRaeFromCartesianPosition(const glm::vec3& position);
@@ -102,13 +102,13 @@ protected:
     glm::vec3 raeToCartesian(const glm::vec3& rae) const;
     glm::vec3 cartesianToRae(const glm::vec3& cartesian) const;
 
-    void draw(glm::mat4 modelTransform, float blackoutFactor);
+    void draw(const glm::mat4& modelTransform, float blackoutFactor);
 
     virtual void bindTexture() = 0;
     virtual void unbindTexture();
 
-    glm::vec3 sphericalToRae(glm::vec3 spherical) const;
-    glm::vec3 raeToSpherical(glm::vec3 rae) const;
+    glm::vec3 sphericalToRae(const glm::vec3& spherical) const;
+    glm::vec3 raeToSpherical(const glm::vec3& rae) const;
     glm::vec3 cartesianToSpherical(const glm::vec3& cartesian) const;
     glm::vec3 sphericalToCartesian(glm::vec3 spherical) const;
     glm::vec3 sanitizeSphericalCoordinates(glm::vec3 spherical) const;
diff --git a/include/openspace/rendering/volumeraycaster.h b/include/openspace/rendering/volumeraycaster.h
index da9575ae51..25949e67d9 100644
--- a/include/openspace/rendering/volumeraycaster.h
+++ b/include/openspace/rendering/volumeraycaster.h
@@ -136,15 +136,11 @@ public:
     float downscaleRender() const;
 
 private:
-    /**
-     * Maximum number of integration steps to be executed by the volume integrator.
-     */
+    /// Maximum number of integration steps to be executed by the volume integrator
     int _rayCastMaxSteps = 1000;
 
-    /**
-     * Enable and set the downscale rendering of the volume. Used to improve performance.
-     */
-    float _downscaleRenderConst = 1.0f;
+    /// Enable and set the downscale rendering of the volume. Used to improve performance
+    float _downscaleRenderConst = 1.f;
 };
 
 } // namespace openspace
diff --git a/include/openspace/scene/asset.h b/include/openspace/scene/asset.h
index e59027b18e..5e35c9e148 100644
--- a/include/openspace/scene/asset.h
+++ b/include/openspace/scene/asset.h
@@ -215,14 +215,14 @@ public:
     void deinitialize();
 
     /**
-     * Marks the passed \p child as being required by this Asset. If the \p child is
-     * already required by this asset, this function does nothing.
+     * Marks the passed \p dependency as being required by this Asset. If the
+     * \p dependency is already required by this asset, this function does nothing.
      *
-     * \param child The asset that is required by this asset
+     * \param dependency The asset that is required by this asset
      *
-     * \pre \p child must not be nullptr
+     * \pre \p dependency must not be nullptr
      */
-    void require(Asset* child);
+    void require(Asset* dependency);
 
     /**
      * Returns `true` if the loading of the Asset has failed in any way so that
diff --git a/include/openspace/scene/assetmanager.h b/include/openspace/scene/assetmanager.h
index 0410b82382..88ee16636d 100644
--- a/include/openspace/scene/assetmanager.h
+++ b/include/openspace/scene/assetmanager.h
@@ -83,7 +83,7 @@ public:
      */
     void update();
 
-    scripting::LuaLibrary luaLibrary();
+    static scripting::LuaLibrary luaLibrary();
 
     /**
      * Returns all assets that have been loaded by the AssetManager. The order of the
diff --git a/include/openspace/scene/scene.h b/include/openspace/scene/scene.h
index 5a3d6e60cc..e7c10db589 100644
--- a/include/openspace/scene/scene.h
+++ b/include/openspace/scene/scene.h
@@ -241,7 +241,7 @@ public:
      * \return Vector of Property objs containing property names that matched the regex
      */
     std::vector<properties::Property*> propertiesMatchingRegex(
-        std::string propertyString);
+        const std::string& propertyString);
 
     /**
      * Returns a list of all unique tags that are used in the currently loaded scene.
@@ -305,7 +305,6 @@ private:
      * Update dependencies.
      */
     void updateNodeRegistry();
-    std::chrono::steady_clock::time_point currentTimeForInterpolation();
     void sortTopologically();
 
     std::unique_ptr<Camera> _camera;
diff --git a/include/openspace/scene/scenegraphnode.h b/include/openspace/scene/scenegraphnode.h
index 4dbf96f757..224ed69a52 100644
--- a/include/openspace/scene/scenegraphnode.h
+++ b/include/openspace/scene/scenegraphnode.h
@@ -155,7 +155,7 @@ private:
     glm::dmat3 calculateWorldRotation() const;
     glm::dvec3 calculateWorldScale() const;
     void computeScreenSpaceData(RenderData& newData);
-    void renderDebugSphere(const Camera& camera, double size, glm::vec4 color);
+    void renderDebugSphere(const Camera& camera, double size, const glm::vec4& color);
 
     std::atomic<State> _state = State::Loaded;
     std::vector<ghoul::mm_unique_ptr<SceneGraphNode>> _children;
diff --git a/include/openspace/scripting/scriptengine.h b/include/openspace/scripting/scriptengine.h
index 85f9224896..60f59d92e6 100644
--- a/include/openspace/scripting/scriptengine.h
+++ b/include/openspace/scripting/scriptengine.h
@@ -84,7 +84,8 @@ public:
     void addLibrary(LuaLibrary library);
     bool hasLibrary(const std::string& name);
 
-    bool runScript(const std::string& script, ScriptCallback callback = ScriptCallback());
+    bool runScript(const std::string& script,
+        const ScriptCallback& callback = ScriptCallback());
     bool runScriptFile(const std::filesystem::path& filename);
 
     virtual void preSync(bool isMaster) override;
@@ -93,7 +94,8 @@ public:
     virtual void postSync(bool isMaster) override;
 
     void queueScript(std::string script, ShouldBeSynchronized shouldBeSynchronized,
-        ShouldSendToRemote shouldSendToRemote, ScriptCallback cb = ScriptCallback());
+        ShouldSendToRemote shouldSendToRemote,
+        ScriptCallback callback = ScriptCallback());
 
     std::vector<std::string> allLuaFunctions() const;
 
diff --git a/include/openspace/util/blockplaneintersectiongeometry.h b/include/openspace/util/blockplaneintersectiongeometry.h
index d8e5e353d9..f2f7706e17 100644
--- a/include/openspace/util/blockplaneintersectiongeometry.h
+++ b/include/openspace/util/blockplaneintersectiongeometry.h
@@ -42,7 +42,7 @@ public:
     void render();
 
     void setBlockSize(glm::vec3 size);
-    void setPlane(glm::vec3 normal, float distance);
+    void setPlane(const glm::vec3& normal, float distance);
 
 private:
     void updateVertices();
diff --git a/include/openspace/util/boxgeometry.h b/include/openspace/util/boxgeometry.h
index 7ce4d836d5..75139b2ea0 100644
--- a/include/openspace/util/boxgeometry.h
+++ b/include/openspace/util/boxgeometry.h
@@ -37,7 +37,7 @@ public:
     ~BoxGeometry();
 
     bool initialize();
-    void render();
+    void render() const;
 
     GLuint _vaoId = 0;
     GLuint _vBufferId = 0;
diff --git a/include/openspace/util/collisionhelper.h b/include/openspace/util/collisionhelper.h
index 55758fbcfc..edcf09a47f 100644
--- a/include/openspace/util/collisionhelper.h
+++ b/include/openspace/util/collisionhelper.h
@@ -45,8 +45,8 @@ namespace openspace::collision {
  * \return True if the line between \p p1 and \p p2 intersects the sphere given by
  *         \p r and \p center, and false otherwise
  */
-bool lineSphereIntersection(glm::dvec3 p1, glm::dvec3 p2, glm::dvec3 center,
-    double r, glm::dvec3& intersectionPoint);
+bool lineSphereIntersection(const glm::dvec3& p1, const glm::dvec3& p2,
+    const glm::dvec3& center, double r, glm::dvec3& intersectionPoint);
 
 /**
  * Check if the point \p p is inside of the sphere defined by radius \p r and center
diff --git a/include/openspace/util/histogram.h b/include/openspace/util/histogram.h
index 67e1f26d7a..63e2cdbf62 100644
--- a/include/openspace/util/histogram.h
+++ b/include/openspace/util/histogram.h
@@ -51,7 +51,7 @@ public:
      * \param repeat How many times you want to insert it
      * \return Returns `true` if succesful insertion, otherwise return `false`
      */
-    bool add(float value, float repeat = 1.0f);
+    bool add(float value, float repeat = 1.f);
     bool add(const Histogram& histogram);
     bool addRectangle(float lowBin, float highBin, float value);
 
@@ -69,7 +69,7 @@ public:
     std::vector<char> getBinaryData() const;
 
     float highestBinValue(bool equalized, int overBins=0);
-    float binWidth();
+    float binWidth() const;
 
     void changeRange(float minValue, float maxValue);
 
diff --git a/include/openspace/util/keys.h b/include/openspace/util/keys.h
index fef5f98832..3c03b701cf 100644
--- a/include/openspace/util/keys.h
+++ b/include/openspace/util/keys.h
@@ -400,7 +400,7 @@ constexpr inline bool isKeypadKey(Key key) noexcept {
         key == Key::KeypadDivide;
 }
 
-KeyWithModifier stringToKey(std::string str);
+KeyWithModifier stringToKey(const std::string& str);
 std::string keyToString(KeyWithModifier keyWithModifier);
 
 // @TODO (abock, 2021-08-12) This function should die
@@ -430,7 +430,7 @@ template <>
 std::string to_string(const openspace::KeyModifier& mod);
 
 template <>
-std::string to_string(const openspace::KeyWithModifier& key);
+std::string to_string(const openspace::KeyWithModifier& keyMod);
 
 } // namespace ghoul
 
diff --git a/include/openspace/util/planegeometry.h b/include/openspace/util/planegeometry.h
index 7f05480ff1..398214ee4d 100644
--- a/include/openspace/util/planegeometry.h
+++ b/include/openspace/util/planegeometry.h
@@ -39,7 +39,7 @@ public:
 
     void initialize();
     void deinitialize();
-    void render();
+    void render() const;
 
     void updateSize(const glm::vec2& size);
     void updateSize(const float size);
diff --git a/include/openspace/util/sphere.h b/include/openspace/util/sphere.h
index f8c8529d8f..cf23199e82 100644
--- a/include/openspace/util/sphere.h
+++ b/include/openspace/util/sphere.h
@@ -39,7 +39,7 @@ public:
 
     bool initialize();
 
-    void render();
+    void render() const;
 
 //private:
     struct Vertex {
diff --git a/include/openspace/util/spicemanager.h b/include/openspace/util/spicemanager.h
index 5c2a362275..9255b1dea5 100644
--- a/include/openspace/util/spicemanager.h
+++ b/include/openspace/util/spicemanager.h
@@ -524,7 +524,7 @@ public:
      *        specific spacecraft
      * \pre \p craft must not be empty
      */
-    double spacecraftClockToET(const std::string& craft, double craftTicks);
+    double spacecraftClockToET(const std::string& craft, double craftTicks) const;
 
     /**
      * Converts the \p timeString representing a date to a double precision value
diff --git a/include/openspace/util/syncbuffer.h b/include/openspace/util/syncbuffer.h
index b0160bbc46..16fe46215a 100644
--- a/include/openspace/util/syncbuffer.h
+++ b/include/openspace/util/syncbuffer.h
@@ -36,7 +36,7 @@ class SyncBuffer {
 public:
     SyncBuffer(size_t n);
 
-    ~SyncBuffer();
+    ~SyncBuffer() = default;
 
     void encode(const std::string& s);
 
diff --git a/include/openspace/util/taskloader.h b/include/openspace/util/taskloader.h
index 6bdee46d17..752fee1329 100644
--- a/include/openspace/util/taskloader.h
+++ b/include/openspace/util/taskloader.h
@@ -38,7 +38,7 @@ class Task;
 class TaskLoader {
 public:
     std::vector<std::unique_ptr<Task>> tasksFromDictionary(
-        const ghoul::Dictionary& tasksDictionary);
+        const ghoul::Dictionary& dictionary);
 
     std::vector<std::unique_ptr<Task>> tasksFromFile(const std::string& path);
 };
diff --git a/include/openspace/util/time.h b/include/openspace/util/time.h
index e9a1cbda30..5af42816b7 100644
--- a/include/openspace/util/time.h
+++ b/include/openspace/util/time.h
@@ -166,7 +166,7 @@ public:
      * (M)onths, and (y)ears as units and an optional - sign to move backwards in time.
      * The return value is in the form of an ISO 8601 date string.
      */
-    static std::string advancedTime(std::string base, std::string change);
+    static std::string advancedTime(const std::string& base, std::string change);
 
     /**
      * Returns the Lua library that contains all Lua functions available to change the
diff --git a/include/openspace/util/timeline.h b/include/openspace/util/timeline.h
index 39c9a10c76..fb6c29aba5 100644
--- a/include/openspace/util/timeline.h
+++ b/include/openspace/util/timeline.h
@@ -35,6 +35,8 @@ namespace openspace {
  * Base class for keyframes.
  */
 struct KeyframeBase {
+    KeyframeBase(size_t id_, double timestamp_);
+
     size_t id;
     double timestamp;
 };
diff --git a/include/openspace/util/timeline.inl b/include/openspace/util/timeline.inl
index ea047bc48e..df9f1fe4a9 100644
--- a/include/openspace/util/timeline.inl
+++ b/include/openspace/util/timeline.inl
@@ -26,7 +26,7 @@ namespace openspace {
 
 template <typename T>
 Keyframe<T>::Keyframe(size_t i, double t, T d)
-    : KeyframeBase{ i, t }
+    : KeyframeBase(i, t)
     , data(std::move(d))
 {}
 
diff --git a/include/openspace/util/timemanager.h b/include/openspace/util/timemanager.h
index e0a5265db4..da1775b6a7 100644
--- a/include/openspace/util/timemanager.h
+++ b/include/openspace/util/timemanager.h
@@ -98,8 +98,8 @@ public:
 
     void interpolateTime(double targetTime, double durationSeconds);
     void interpolateTimeRelative(double delta, double durationSeconds);
-    void interpolateDeltaTime(double targetDeltaTime, double durationSeconds);
-    void interpolatePause(bool pause, double durationSeconds);
+    void interpolateDeltaTime(double newDeltaTime, double interpolationDuration);
+    void interpolatePause(bool pause, double interpolationDuration);
 
     std::optional<double> nextDeltaTimeStep();
     std::optional<double> previousDeltaTimeStep();
@@ -110,7 +110,7 @@ public:
     void interpolateNextDeltaTimeStep(double durationSeconds);
     void interpolatePreviousDeltaTimeStep(double durationSeconds);
 
-    void addKeyframe(double timestamp, TimeKeyframeData kf);
+    void addKeyframe(double timestamp, TimeKeyframeData time);
     void removeKeyframesBefore(double timestamp, bool inclusive = false);
     void removeKeyframesAfter(double timestamp, bool inclusive = false);
 
diff --git a/include/openspace/util/touch.h b/include/openspace/util/touch.h
index 9b4773810d..7697a6077b 100644
--- a/include/openspace/util/touch.h
+++ b/include/openspace/util/touch.h
@@ -39,7 +39,7 @@ namespace openspace {
  */
 struct TouchInput {
     TouchInput(size_t touchDeviceId, size_t fingerId, float x, float y, double timestamp);
-    glm::vec2 screenCoordinates(glm::vec2 resolution) const;
+    glm::vec2 screenCoordinates(const glm::vec2& resolution) const;
     glm::vec2 currentWindowCoordinates() const;
     bool isMoving() const;
     float distanceToPos(float otherX, float otherY) const;
diff --git a/modules/atmosphere/rendering/atmospheredeferredcaster.cpp b/modules/atmosphere/rendering/atmospheredeferredcaster.cpp
index 9f5ee33b0d..5bdee24199 100644
--- a/modules/atmosphere/rendering/atmospheredeferredcaster.cpp
+++ b/modules/atmosphere/rendering/atmospheredeferredcaster.cpp
@@ -112,14 +112,14 @@ namespace {
         }
     }
 
-    bool isAtmosphereInFrustum(const glm::dmat4& MVMatrix, const glm::dvec3& position,
+    bool isAtmosphereInFrustum(const glm::dmat4& mv, const glm::dvec3& position,
                                double radius)
     {
         // Frustum Planes
-        glm::dvec3 col1 = glm::dvec3(MVMatrix[0][0], MVMatrix[1][0], MVMatrix[2][0]);
-        glm::dvec3 col2 = glm::dvec3(MVMatrix[0][1], MVMatrix[1][1], MVMatrix[2][1]);
-        glm::dvec3 col3 = glm::dvec3(MVMatrix[0][2], MVMatrix[1][2], MVMatrix[2][2]);
-        glm::dvec3 col4 = glm::dvec3(MVMatrix[0][3], MVMatrix[1][3], MVMatrix[2][3]);
+        const glm::dvec3 col1 = glm::dvec3(mv[0][0], mv[1][0], mv[2][0]);
+        const glm::dvec3 col2 = glm::dvec3(mv[0][1], mv[1][1], mv[2][1]);
+        const glm::dvec3 col3 = glm::dvec3(mv[0][2], mv[1][2], mv[2][2]);
+        const glm::dvec3 col4 = glm::dvec3(mv[0][3], mv[1][3], mv[2][3]);
 
         glm::dvec3 leftNormal = col4 + col1;
         glm::dvec3 rightNormal = col4 - col1;
@@ -129,11 +129,11 @@ namespace {
         glm::dvec3 farNormal = col4 - col3;
 
         // Plane Distances
-        double leftDistance = MVMatrix[3][3] + MVMatrix[3][0];
-        double rightDistance = MVMatrix[3][3] - MVMatrix[3][0];
-        double bottomDistance = MVMatrix[3][3] + MVMatrix[3][1];
-        double topDistance = MVMatrix[3][3] - MVMatrix[3][1];
-        double nearDistance = MVMatrix[3][3] + MVMatrix[3][2];
+        double leftDistance = mv[3][3] + mv[3][0];
+        double rightDistance = mv[3][3] - mv[3][0];
+        double bottomDistance = mv[3][3] + mv[3][1];
+        double topDistance = mv[3][3] - mv[3][1];
+        double nearDistance = mv[3][3] + mv[3][2];
 
         // Normalize Planes
         const double invLeftMag = 1.0 / glm::length(leftNormal);
@@ -159,20 +159,18 @@ namespace {
         const double invFarMag = 1.0 / glm::length(farNormal);
         farNormal *= invFarMag;
 
-        if (((glm::dot(leftNormal, position) + leftDistance) < -radius) ||
+        const bool outsideFrustum =
+            (((glm::dot(leftNormal, position) + leftDistance) < -radius) ||
             ((glm::dot(rightNormal, position) + rightDistance) < -radius) ||
             ((glm::dot(bottomNormal, position) + bottomDistance) < -radius) ||
             ((glm::dot(topNormal, position) + topDistance) < -radius) ||
-            ((glm::dot(nearNormal, position) + nearDistance) < -radius))
-            // The far plane testing is disabled because the atm has no depth.
-        {
-            return false;
-        }
-        return true;
+            ((glm::dot(nearNormal, position) + nearDistance) < -radius));
+
+        return !outsideFrustum;
     }
 
     GLuint createTexture(const glm::ivec2& size, std::string_view name) {
-        GLuint t;
+        GLuint t = 0;
         glGenTextures(1, &t);
         glBindTexture(GL_TEXTURE_2D, t);
         glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR);
@@ -201,7 +199,7 @@ namespace {
     GLuint createTexture(const glm::ivec3& size, std::string_view name, int components) {
         ghoul_assert(components == 3 || components == 4, "Only 3-4 components supported");
 
-        GLuint t;
+        GLuint t = 0;
         glGenTextures(1, &t);
         glBindTexture(GL_TEXTURE_3D, t);
         glTexParameteri(GL_TEXTURE_3D, GL_TEXTURE_MIN_FILTER, GL_LINEAR);
@@ -270,7 +268,7 @@ void AtmosphereDeferredcaster::deinitialize() {
 
 void AtmosphereDeferredcaster::update(const UpdateData&) {}
 
-float AtmosphereDeferredcaster::eclipseShadow(glm::dvec3 position) {
+float AtmosphereDeferredcaster::eclipseShadow(const glm::dvec3& position) {
     // This code is copied from the atmosphere deferred fragment shader
     // It is used to calculate the eclipse shadow
     if (_shadowDataArrayCache.empty() || !_shadowDataArrayCache.front().isShadowing) {
@@ -284,13 +282,13 @@ float AtmosphereDeferredcaster::eclipseShadow(glm::dvec3 position) {
         dot(positionToCaster, sourceToCaster) * sourceToCaster;
     const glm::dvec3 positionToShadow = positionToCaster - casterShadow;
 
-    float distanceToShadow = static_cast<float>(length(positionToShadow));
-    double shadowLength = length(casterShadow);
+    const float distanceToShadow = static_cast<float>(length(positionToShadow));
+    const double shadowLength = length(casterShadow);
 
-    float radiusPenumbra = static_cast<float>(
+    const float radiusPenumbra = static_cast<float>(
         shadow.radiusCaster * (shadowLength + shadow.penumbra) / shadow.penumbra
     );
-    float radiusUmbra = static_cast<float>(
+    const float radiusUmbra = static_cast<float>(
         shadow.radiusCaster * (shadow.umbra - shadowLength) / shadow.umbra
     );
 
@@ -301,7 +299,8 @@ float AtmosphereDeferredcaster::eclipseShadow(glm::dvec3 position) {
         }
         else {
             // Smooth the shadow with the butterworth function
-            return sqrt(radiusUmbra / (radiusUmbra + pow(distanceToShadow, 4.f)));
+            const float s = radiusUmbra / (radiusUmbra + std::pow(distanceToShadow, 4.f));
+            return std::sqrt(s);
         }
     }
     else if (distanceToShadow < radiusPenumbra) { // In penumbra - partially shaded part
@@ -313,14 +312,16 @@ float AtmosphereDeferredcaster::eclipseShadow(glm::dvec3 position) {
 }
 
 void AtmosphereDeferredcaster::preRaycast(const RenderData& data, const DeferredcastData&,
-                                          ghoul::opengl::ProgramObject& prg)
+                                          ghoul::opengl::ProgramObject& program)
 {
     ZoneScoped;
     TracyGpuZone("Atmosphere preRaycast");
 
 
     // Atmosphere Frustum Culling
-    glm::dvec3 tPlanetPos = glm::dvec3(_modelTransform * glm::dvec4(0.0, 0.0, 0.0, 1.0));
+    const glm::dvec3 tPlanetPos = glm::dvec3(
+        _modelTransform * glm::dvec4(0.0, 0.0, 0.0, 1.0)
+    );
     const double distance = glm::distance(tPlanetPos, data.camera.eyePositionVec3());
 
     // Radius is in KM
@@ -329,58 +330,60 @@ void AtmosphereDeferredcaster::preRaycast(const RenderData& data, const Deferred
     );
 
     // Number of planet radii to use as distance threshold for culling
-    prg.setUniform(_uniformCache.cullAtmosphere, 1);
+    program.setUniform(_uniformCache.cullAtmosphere, 1);
 
     constexpr double DistanceCullingRadii = 5000;
-    glm::dmat4 MV = glm::dmat4(data.camera.sgctInternal.projectionMatrix()) *
+    const glm::dmat4 MV = glm::dmat4(data.camera.sgctInternal.projectionMatrix()) *
         data.camera.combinedViewMatrix();
     if (distance <= scaledRadius * DistanceCullingRadii &&
         isAtmosphereInFrustum(MV, tPlanetPos, scaledRadius + ATM_EPS))
     {
-        prg.setUniform(_uniformCache.cullAtmosphere, 0);
-        prg.setUniform(_uniformCache.opacity, _opacity);
-        prg.setUniform(_uniformCache.Rg, _atmospherePlanetRadius);
-        prg.setUniform(_uniformCache.Rt, _atmosphereRadius);
-        prg.setUniform(_uniformCache.groundRadianceEmission, _groundRadianceEmission);
-        prg.setUniform(_uniformCache.HR, _rayleighHeightScale);
-        prg.setUniform(_uniformCache.betaRayleigh, _rayleighScatteringCoeff);
-        prg.setUniform(_uniformCache.HM, _mieHeightScale);
-        prg.setUniform(_uniformCache.betaMieExtinction, _mieExtinctionCoeff);
-        prg.setUniform(_uniformCache.mieG, _miePhaseConstant);
-        prg.setUniform(_uniformCache.sunRadiance, _sunRadianceIntensity);
-        prg.setUniform(_uniformCache.ozoneLayerEnabled, _ozoneEnabled);
-        prg.setUniform(_uniformCache.HO, _ozoneHeightScale);
-        prg.setUniform(_uniformCache.betaOzoneExtinction, _ozoneExtinctionCoeff);
-        prg.setUniform(_uniformCache.SAMPLES_R, _rSamples);
-        prg.setUniform(_uniformCache.SAMPLES_MU, _muSamples);
-        prg.setUniform(_uniformCache.SAMPLES_MU_S, _muSSamples);
-        prg.setUniform(_uniformCache.SAMPLES_NU, _nuSamples);
+        program.setUniform(_uniformCache.cullAtmosphere, 0);
+        program.setUniform(_uniformCache.opacity, _opacity);
+        program.setUniform(_uniformCache.Rg, _atmospherePlanetRadius);
+        program.setUniform(_uniformCache.Rt, _atmosphereRadius);
+        program.setUniform(_uniformCache.groundRadianceEmission, _groundRadianceEmission);
+        program.setUniform(_uniformCache.HR, _rayleighHeightScale);
+        program.setUniform(_uniformCache.betaRayleigh, _rayleighScatteringCoeff);
+        program.setUniform(_uniformCache.HM, _mieHeightScale);
+        program.setUniform(_uniformCache.betaMieExtinction, _mieExtinctionCoeff);
+        program.setUniform(_uniformCache.mieG, _miePhaseConstant);
+        program.setUniform(_uniformCache.sunRadiance, _sunRadianceIntensity);
+        program.setUniform(_uniformCache.ozoneLayerEnabled, _ozoneEnabled);
+        program.setUniform(_uniformCache.HO, _ozoneHeightScale);
+        program.setUniform(_uniformCache.betaOzoneExtinction, _ozoneExtinctionCoeff);
+        program.setUniform(_uniformCache.SAMPLES_R, _rSamples);
+        program.setUniform(_uniformCache.SAMPLES_MU, _muSamples);
+        program.setUniform(_uniformCache.SAMPLES_MU_S, _muSSamples);
+        program.setUniform(_uniformCache.SAMPLES_NU, _nuSamples);
         // We expose the value as degrees, but the shader wants radians
-        prg.setUniform(_uniformCache.sunAngularSize, glm::radians(_sunAngularSize));
+        program.setUniform(_uniformCache.sunAngularSize, glm::radians(_sunAngularSize));
 
         // Object Space
-        glm::dmat4 invModelMatrix = glm::inverse(_modelTransform);
-        prg.setUniform(_uniformCache.inverseModelTransformMatrix, invModelMatrix);
-        prg.setUniform(_uniformCache.modelTransformMatrix, _modelTransform);
+        const glm::dmat4 invModelMatrix = glm::inverse(_modelTransform);
+        program.setUniform(_uniformCache.inverseModelTransformMatrix, invModelMatrix);
+        program.setUniform(_uniformCache.modelTransformMatrix, _modelTransform);
 
-        glm::dmat4 viewToWorldMatrix = glm::inverse(data.camera.combinedViewMatrix());
+        const glm::dmat4 viewToWorld = glm::inverse(data.camera.combinedViewMatrix());
 
         // Eye Space to World Space
-        prg.setUniform(_uniformCache.viewToWorldMatrix, viewToWorldMatrix);
+        program.setUniform(_uniformCache.viewToWorldMatrix, viewToWorld);
 
         // Projection to Eye Space
-        glm::dmat4 dInvProj = glm::inverse(glm::dmat4(data.camera.projectionMatrix()));
+        const glm::dmat4 dInvProj = glm::inverse(
+            glm::dmat4(data.camera.projectionMatrix())
+        );
 
-        glm::dmat4 invWholePipeline = invModelMatrix * viewToWorldMatrix * dInvProj;
+        const glm::dmat4 invWholePipeline = invModelMatrix * viewToWorld * dInvProj;
 
-        prg.setUniform(_uniformCache.projectionToModelTransform, invWholePipeline);
+        program.setUniform(_uniformCache.projectionToModelTransform, invWholePipeline);
 
-        glm::dvec4 camPosObjCoords =
+        const glm::dvec4 camPosObjCoords =
             invModelMatrix * glm::dvec4(data.camera.eyePositionVec3(), 1.0);
-        prg.setUniform(_uniformCache.camPosObj, glm::dvec3(camPosObjCoords));
+        program.setUniform(_uniformCache.camPosObj, glm::dvec3(camPosObjCoords));
 
         SceneGraphNode* node = sceneGraph()->sceneGraphNode("Sun");
-        glm::dvec3 sunPosWorld = node ? node->worldPosition() : glm::dvec3(0.0);
+        const glm::dvec3 sunPosWorld = node ? node->worldPosition() : glm::dvec3(0.0);
 
         glm::dvec3 sunPosObj;
         // Sun following camera position
@@ -393,14 +396,14 @@ void AtmosphereDeferredcaster::preRaycast(const RenderData& data, const Deferred
         }
 
         // Sun Position in Object Space
-        prg.setUniform(_uniformCache.sunDirectionObj, glm::normalize(sunPosObj));
+        program.setUniform(_uniformCache.sunDirectionObj, glm::normalize(sunPosObj));
 
         // Shadow calculations..
         _shadowDataArrayCache.clear();
         for (ShadowConfiguration& shadowConf : _shadowConfArray) {
             // TO REMEMBER: all distances and lengths in world coordinates are in
             // meters!!! We need to move this to view space...
-            double lt;
+            double lt = 0.0;
             glm::dvec3 sourcePos = SpiceManager::ref().targetPosition(
                 shadowConf.source.first,
                 "SSB",
@@ -437,26 +440,27 @@ void AtmosphereDeferredcaster::preRaycast(const RenderData& data, const Deferred
                 return;
             }
 
-            double sourceScale = std::max(glm::compMax(sourceNode->scale()), 1.0);
-            double casterScale = std::max(glm::compMax(casterNode->scale()), 1.0);
-            double actualSourceRadius = shadowConf.source.second * sourceScale;
-            double actualCasterRadius = shadowConf.caster.second * casterScale;
+            const double sourceScale = std::max(glm::compMax(sourceNode->scale()), 1.0);
+            const double casterScale = std::max(glm::compMax(casterNode->scale()), 1.0);
+            const double actualSourceRadius = shadowConf.source.second * sourceScale;
+            const double actualCasterRadius = shadowConf.caster.second * casterScale;
             // First we determine if the caster is shadowing the current planet
             // (all calculations in World Coordinates):
-            glm::dvec3 planetCasterVec = casterPos - data.modelTransform.translation;
-            glm::dvec3 sourceCasterVec = casterPos - sourcePos;
-            double scLength = glm::length(sourceCasterVec);
-            glm::dvec3 planetCasterProj =
+            const glm::dvec3 planetCasterVec =
+                casterPos - data.modelTransform.translation;
+            const glm::dvec3 sourceCasterVec = casterPos - sourcePos;
+            const double scLength = glm::length(sourceCasterVec);
+            const glm::dvec3 planetCasterProj =
                 (glm::dot(planetCasterVec, sourceCasterVec) / (scLength * scLength)) *
                 sourceCasterVec;
-            double dTest = glm::length(planetCasterVec - planetCasterProj);
-            double xpTest = actualCasterRadius * scLength /
+            const double dTest = glm::length(planetCasterVec - planetCasterProj);
+            const double xpTest = actualCasterRadius * scLength /
                 (actualSourceRadius + actualCasterRadius);
-            double rpTest = actualCasterRadius *
+            const double rpTest = actualCasterRadius *
                 (glm::length(planetCasterProj) + xpTest) / xpTest;
 
-            double casterDistSun = glm::length(casterPos - sunPosWorld);
-            double planetDistSun = glm::length(
+            const double casterDistSun = glm::length(casterPos - sunPosWorld);
+            const double planetDistSun = glm::length(
                 data.modelTransform.translation - sunPosWorld
             );
 
@@ -487,35 +491,38 @@ void AtmosphereDeferredcaster::preRaycast(const RenderData& data, const Deferred
             char* bf = fmt::format_to(_uniformNameBuffer + 16, "{}", counter);
 
             std::strcpy(bf, "].isShadowing\0");
-            prg.setUniform(_uniformNameBuffer, sd.isShadowing);
+            program.setUniform(_uniformNameBuffer, sd.isShadowing);
 
             if (sd.isShadowing) {
                 std::strcpy(bf, "].xp\0");
-                prg.setUniform(_uniformNameBuffer, sd.penumbra);
+                program.setUniform(_uniformNameBuffer, sd.penumbra);
                 std::strcpy(bf, "].xu\0");
-                prg.setUniform(_uniformNameBuffer, sd.umbra);
+                program.setUniform(_uniformNameBuffer, sd.umbra);
                 std::strcpy(bf, "].rc\0");
-                prg.setUniform(_uniformNameBuffer, sd.radiusCaster);
+                program.setUniform(_uniformNameBuffer, sd.radiusCaster);
                 std::strcpy(bf, "].sourceCasterVec\0");
-                prg.setUniform(_uniformNameBuffer, sd.sourceCasterVec);
+                program.setUniform(_uniformNameBuffer, sd.sourceCasterVec);
                 std::strcpy(bf, "].casterPositionVec\0");
-                prg.setUniform(_uniformNameBuffer, sd.casterPositionVec);
+                program.setUniform(_uniformNameBuffer, sd.casterPositionVec);
             }
             counter++;
         }
-        prg.setUniform(_uniformCache.hardShadows, _hardShadowsEnabled);
+        program.setUniform(_uniformCache.hardShadows, _hardShadowsEnabled);
     }
     _transmittanceTableTextureUnit.activate();
     glBindTexture(GL_TEXTURE_2D, _transmittanceTableTexture);
-    prg.setUniform(_uniformCache.transmittanceTexture, _transmittanceTableTextureUnit);
+    program.setUniform(
+        _uniformCache.transmittanceTexture,
+        _transmittanceTableTextureUnit
+    );
 
     _irradianceTableTextureUnit.activate();
     glBindTexture(GL_TEXTURE_2D, _irradianceTableTexture);
-    prg.setUniform(_uniformCache.irradianceTexture, _irradianceTableTextureUnit);
+    program.setUniform(_uniformCache.irradianceTexture, _irradianceTableTextureUnit);
 
     _inScatteringTableTextureUnit.activate();
     glBindTexture(GL_TEXTURE_3D, _inScatteringTableTexture);
-    prg.setUniform(_uniformCache.inscatterTexture, _inScatteringTableTextureUnit);
+    program.setUniform(_uniformCache.inscatterTexture, _inScatteringTableTextureUnit);
 }
 
 void AtmosphereDeferredcaster::postRaycast(const RenderData&, const DeferredcastData&,
@@ -619,8 +626,8 @@ void AtmosphereDeferredcaster::calculateTransmittance() {
     program->setUniform("HO", _ozoneHeightScale);
     program->setUniform("betaOzoneExtinction", _ozoneExtinctionCoeff);
 
-    constexpr float Black[] = { 0.f, 0.f, 0.f, 0.f };
-    glClearBufferfv(GL_COLOR, 0, Black);
+    constexpr glm::vec4 Black = glm::vec4(0.f, 0.f, 0.f, 0.f);
+    glClearBufferfv(GL_COLOR, 0, glm::value_ptr(Black));
     glDrawArrays(GL_TRIANGLES, 0, 6);
     if (_saveCalculationTextures) {
         saveTextureFile("transmittance_texture.ppm", _transmittanceTableSize);
@@ -631,7 +638,7 @@ void AtmosphereDeferredcaster::calculateTransmittance() {
 GLuint AtmosphereDeferredcaster::calculateDeltaE() {
     ZoneScoped;
 
-    GLuint deltaE = createTexture(_deltaETableSize, "DeltaE");
+    const GLuint deltaE = createTexture(_deltaETableSize, "DeltaE");
     glFramebufferTexture(GL_FRAMEBUFFER, GL_COLOR_ATTACHMENT0, deltaE, 0);
     glViewport(0, 0, _deltaETableSize.x, _deltaETableSize.y);
     using ProgramObject = ghoul::opengl::ProgramObject;
@@ -660,12 +667,12 @@ GLuint AtmosphereDeferredcaster::calculateDeltaE() {
 std::pair<GLuint, GLuint> AtmosphereDeferredcaster::calculateDeltaS() {
     ZoneScoped;
 
-    GLuint deltaSRayleigh = createTexture(_textureSize, "DeltaS Rayleigh", 3);
+    const GLuint deltaSRayleigh = createTexture(_textureSize, "DeltaS Rayleigh", 3);
     glFramebufferTexture(GL_FRAMEBUFFER, GL_COLOR_ATTACHMENT0, deltaSRayleigh, 0);
-    GLuint deltaSMie = createTexture(_textureSize, "DeltaS Mie", 3);
+    const GLuint deltaSMie = createTexture(_textureSize, "DeltaS Mie", 3);
     glFramebufferTexture(GL_FRAMEBUFFER, GL_COLOR_ATTACHMENT1, deltaSMie, 0);
-    GLenum colorBuffers[2] = { GL_COLOR_ATTACHMENT0, GL_COLOR_ATTACHMENT1 };
-    glDrawBuffers(2, colorBuffers);
+    std::array<GLenum, 2> colorBuffers = { GL_COLOR_ATTACHMENT0, GL_COLOR_ATTACHMENT1 };
+    glDrawBuffers(2, colorBuffers.data());
     glViewport(0, 0, _textureSize.x, _textureSize.y);
     using ProgramObject = ghoul::opengl::ProgramObject;
     std::unique_ptr<ProgramObject> program = ProgramObject::Build(
@@ -704,8 +711,8 @@ std::pair<GLuint, GLuint> AtmosphereDeferredcaster::calculateDeltaS() {
         );
     }
     glFramebufferTexture2D(GL_FRAMEBUFFER, GL_COLOR_ATTACHMENT1, GL_TEXTURE_2D, 0, 0);
-    GLenum drawBuffers[1] = { GL_COLOR_ATTACHMENT0 };
-    glDrawBuffers(1, drawBuffers);
+    const std::array<GLenum, 1> drawBuffers = { GL_COLOR_ATTACHMENT0 };
+    glDrawBuffers(1, drawBuffers.data());
 
     program->deactivate();
     return { deltaSRayleigh, deltaSMie };
@@ -954,8 +961,8 @@ void AtmosphereDeferredcaster::calculateIrradiance(int scatteringOrder,
 }
 
 void AtmosphereDeferredcaster::calculateInscattering(int scatteringOrder,
-                                                     ghoul::opengl::ProgramObject& prg,
-                                                     GLuint deltaSRayleigh)
+                                                    ghoul::opengl::ProgramObject& program,
+                                                                    GLuint deltaSRayleigh)
 
 {
     ZoneScoped;
@@ -967,18 +974,18 @@ void AtmosphereDeferredcaster::calculateInscattering(int scatteringOrder,
         0
     );
     glViewport(0, 0, _textureSize.x, _textureSize.y);
-    prg.activate();
+    program.activate();
 
     ghoul::opengl::TextureUnit unit;
     unit.activate();
     glBindTexture(GL_TEXTURE_3D, deltaSRayleigh);
-    prg.setUniform("deltaSTexture", unit);
-    prg.setUniform("SAMPLES_MU_S", _muSSamples);
-    prg.setUniform("SAMPLES_NU", _nuSamples);
-    prg.setUniform("SAMPLES_MU", _muSamples);
-    prg.setUniform("SAMPLES_R", _rSamples);
+    program.setUniform("deltaSTexture", unit);
+    program.setUniform("SAMPLES_MU_S", _muSSamples);
+    program.setUniform("SAMPLES_NU", _nuSamples);
+    program.setUniform("SAMPLES_MU", _muSamples);
+    program.setUniform("SAMPLES_R", _rSamples);
     for (int layer = 0; layer < _rSamples; ++layer) {
-        prg.setUniform("layer", layer);
+        program.setUniform("layer", layer);
         glDrawArrays(GL_TRIANGLES, 0, 6);
     }
     if (_saveCalculationTextures) {
@@ -987,7 +994,7 @@ void AtmosphereDeferredcaster::calculateInscattering(int scatteringOrder,
             glm::ivec2(_textureSize)
         );
     }
-    prg.deactivate();
+    program.deactivate();
 }
 
 void AtmosphereDeferredcaster::calculateAtmosphereParameters() {
@@ -1025,38 +1032,38 @@ void AtmosphereDeferredcaster::calculateAtmosphereParameters() {
 
 
     // Saves current FBO first
-    GLint defaultFBO;
+    GLint defaultFBO = 0;
     glGetIntegerv(GL_FRAMEBUFFER_BINDING, &defaultFBO);
 
-    GLint viewport[4];
-    global::renderEngine->openglStateCache().viewport(viewport);
+    std::array<GLint, 4> viewport;
+    global::renderEngine->openglStateCache().viewport(viewport.data());
 
     // Creates the FBO for the calculations
-    GLuint calcFBO;
+    GLuint calcFBO = 0;
     glGenFramebuffers(1, &calcFBO);
     glBindFramebuffer(GL_FRAMEBUFFER, calcFBO);
-    GLenum drawBuffers[1] = { GL_COLOR_ATTACHMENT0 };
-    glDrawBuffers(1, drawBuffers);
+    std::array<GLenum, 1> drawBuffers = { GL_COLOR_ATTACHMENT0 };
+    glDrawBuffers(1, drawBuffers.data());
 
     // Prepare for rendering/calculations
-    GLuint quadVao;
+    GLuint quadVao = 0;
     glGenVertexArrays(1, &quadVao);
     glBindVertexArray(quadVao);
-    GLuint quadVbo;
+    GLuint quadVbo = 0;
     glGenBuffers(1, &quadVbo);
     glBindBuffer(GL_ARRAY_BUFFER, quadVbo);
 
-    const GLfloat VertexData[] = {
-        //  x      y    z
+    constexpr std::array<GLfloat, 12> VertexData = {
+        // x     y
         -1.f, -1.f,
-        1.f,  1.f,
+         1.f,  1.f,
         -1.f,  1.f,
         -1.f, -1.f,
-        1.f, -1.f,
-        1.f,  1.f,
+         1.f, -1.f,
+         1.f,  1.f,
     };
 
-    glBufferData(GL_ARRAY_BUFFER, sizeof(VertexData), VertexData, GL_STATIC_DRAW);
+    glBufferData(GL_ARRAY_BUFFER, sizeof(VertexData), VertexData.data(), GL_STATIC_DRAW);
     glEnableVertexAttribArray(0);
     glVertexAttribPointer(0, 2, GL_FLOAT, GL_FALSE, 2 * sizeof(GLfloat), nullptr);
 
@@ -1068,7 +1075,7 @@ void AtmosphereDeferredcaster::calculateAtmosphereParameters() {
     calculateTransmittance();
 
     // line 2 in algorithm 4.1
-    GLuint deltaETable = calculateDeltaE();
+    const GLuint deltaETable = calculateDeltaE();
 
     // line 3 in algorithm 4.1
     auto [deltaSRayleighTable, deltaSMieTable] = calculateDeltaS();
@@ -1079,7 +1086,7 @@ void AtmosphereDeferredcaster::calculateAtmosphereParameters() {
     // line 5 in algorithm 4.1
     calculateInscattering(deltaSRayleighTable, deltaSMieTable);
 
-    GLuint deltaJTable = createTexture(_textureSize, "DeltaJ", 3);
+    const GLuint deltaJTable = createTexture(_textureSize, "DeltaJ", 3);
 
     // loop in line 6 in algorithm 4.1
     for (int scatteringOrder = 2; scatteringOrder <= 4; ++scatteringOrder) {
@@ -1141,7 +1148,7 @@ void AtmosphereDeferredcaster::calculateAtmosphereParameters() {
 
     // Restores system state
     glBindFramebuffer(GL_FRAMEBUFFER, defaultFBO);
-    global::renderEngine->openglStateCache().setViewportState(viewport);
+    global::renderEngine->openglStateCache().setViewportState(viewport.data());
     glDeleteBuffers(1, &quadVbo);
     glDeleteVertexArrays(1, &quadVao);
     glDeleteFramebuffers(1, &calcFBO);
@@ -1150,7 +1157,8 @@ void AtmosphereDeferredcaster::calculateAtmosphereParameters() {
     LDEBUG("Ended precalculations for Atmosphere effects");
 }
 
-void AtmosphereDeferredcaster::step3DTexture(ghoul::opengl::ProgramObject& prg, int layer)
+void AtmosphereDeferredcaster::step3DTexture(ghoul::opengl::ProgramObject& prg,
+                                             int layer) const
 {
     // See OpenGL redbook 8th Edition page 556 for Layered Rendering
     const float planet2 = _atmospherePlanetRadius * _atmospherePlanetRadius;
diff --git a/modules/atmosphere/rendering/atmospheredeferredcaster.h b/modules/atmosphere/rendering/atmospheredeferredcaster.h
index bbe7f6b28a..89e80d075f 100644
--- a/modules/atmosphere/rendering/atmospheredeferredcaster.h
+++ b/modules/atmosphere/rendering/atmospheredeferredcaster.h
@@ -75,7 +75,7 @@ public:
     void initializeCachedVariables(ghoul::opengl::ProgramObject& program) override;
 
     void update(const UpdateData&) override;
-    float eclipseShadow(glm::dvec3 position);
+    float eclipseShadow(const glm::dvec3& position);
 
     void calculateAtmosphereParameters();
 
@@ -93,7 +93,7 @@ public:
     void setHardShadows(bool enabled);
 
 private:
-    void step3DTexture(ghoul::opengl::ProgramObject& prg, int layer);
+    void step3DTexture(ghoul::opengl::ProgramObject& prg, int layer) const;
 
     void calculateTransmittance();
     GLuint calculateDeltaE();
diff --git a/modules/atmosphere/rendering/renderableatmosphere.cpp b/modules/atmosphere/rendering/renderableatmosphere.cpp
index f24c758ec6..fa189f8542 100644
--- a/modules/atmosphere/rendering/renderableatmosphere.cpp
+++ b/modules/atmosphere/rendering/renderableatmosphere.cpp
@@ -34,7 +34,7 @@
 #include <openspace/properties/property.h>
 #include <openspace/rendering/deferredcastermanager.h>
 #include <algorithm>
-#include <math.h>
+#include <cmath>
 
 namespace {
     constexpr float KM_TO_M = 1000.f;
@@ -466,11 +466,11 @@ glm::dmat4 RenderableAtmosphere::computeModelTransformMatrix(const TransformData
         glm::scale(glm::dmat4(1.0), glm::dvec3(data.scale));
 }
 
-void RenderableAtmosphere::render(const RenderData& data, RendererTasks& renderTask) {
+void RenderableAtmosphere::render(const RenderData& data, RendererTasks& rendererTask) {
     ZoneScoped;
 
-    DeferredcasterTask task{ _deferredcaster.get(), data };
-    renderTask.deferredcasterTasks.push_back(task);
+    DeferredcasterTask task = { _deferredcaster.get(), data };
+    rendererTask.deferredcasterTasks.push_back(std::move(task));
 }
 
 void RenderableAtmosphere::update(const UpdateData& data) {
@@ -484,7 +484,7 @@ void RenderableAtmosphere::update(const UpdateData& data) {
     }
 
     glm::dmat4 modelTransform = computeModelTransformMatrix(data.modelTransform);
-    _deferredcaster->setModelTransform(modelTransform);
+    _deferredcaster->setModelTransform(std::move(modelTransform));
     _deferredcaster->setOpacity(opacity());
     _deferredcaster->update(data);
     setDimmingCoefficient(computeModelTransformMatrix(data.modelTransform));
@@ -525,17 +525,17 @@ void RenderableAtmosphere::setDimmingCoefficient(const glm::dmat4& modelTransfor
     const glm::dvec3 normalUnderCamera = glm::normalize(cameraPos - planetPos);
     const glm::dvec3 vecToSun = glm::normalize(-planetPos);
 
-    float cameraDistance = static_cast<float>(glm::distance(planetPos, cameraPos));
-    float cameraSunAngle = static_cast<float>(
+    const float cameraDistance = static_cast<float>(glm::distance(planetPos, cameraPos));
+    const float cameraSunAngle = static_cast<float>(
         glm::degrees(glm::acos(glm::dot(vecToSun, normalUnderCamera))
     ));
-    float sunsetEnd = _atmosphereDimmingSunsetAngle.value().y;
+    const float sunsetEnd = _atmosphereDimmingSunsetAngle.value().y;
 
     // If cameraSunAngle is more than 90 degrees, we are in shaded part of globe
-    bool cameraIsInSun = cameraSunAngle <= sunsetEnd;
+    const bool cameraIsInSun = cameraSunAngle <= sunsetEnd;
     // Atmosphere height is in KM
-    float atmosphereEdge = KM_TO_M * (_planetRadius + _atmosphereHeight);
-    bool cameraIsInAtmosphere = cameraDistance < atmosphereEdge;
+    const float atmosphereEdge = KM_TO_M * (_planetRadius + _atmosphereHeight);
+    const bool cameraIsInAtmosphere = cameraDistance < atmosphereEdge;
 
     // Don't fade if camera is not in the sunny part of an atmosphere
     if (!cameraIsInAtmosphere || !cameraIsInSun) {
@@ -543,17 +543,18 @@ void RenderableAtmosphere::setDimmingCoefficient(const glm::dmat4& modelTransfor
     }
     // Else we need to fade the objects
     // Height of the atmosphere where the objects will be faded
-    float atmosphereFadingHeight = KM_TO_M * _atmosphereDimmingHeight * _atmosphereHeight;
-    float atmosphereInnerEdge = atmosphereEdge - atmosphereFadingHeight;
-    bool cameraIsInFadingRegion = cameraDistance > atmosphereInnerEdge;
+    const float atmosphereFadingHeight =
+        KM_TO_M * _atmosphereDimmingHeight * _atmosphereHeight;
+    const float atmosphereInnerEdge = atmosphereEdge - atmosphereFadingHeight;
+    const bool cameraIsInFadingRegion = cameraDistance > atmosphereInnerEdge;
 
     // Check if camera is in sunset
-    float sunsetStart = _atmosphereDimmingSunsetAngle.value().x;
-    bool cameraIsInSunset = cameraSunAngle > sunsetStart && cameraIsInSun;
+    const float sunsetStart = _atmosphereDimmingSunsetAngle.value().x;
+    const bool cameraIsInSunset = cameraSunAngle > sunsetStart && cameraIsInSun;
 
     // See if we are inside of an eclipse shadow
     float eclipseShadow = _deferredcaster->eclipseShadow(cameraPos);
-    bool cameraIsInEclipse = std::abs(eclipseShadow - 1.f) > glm::epsilon<float>();
+    const bool cameraIsInEclipse = std::abs(eclipseShadow - 1.f) > glm::epsilon<float>();
     // Invert shadow and multiply with itself to make it more narrow
     eclipseShadow = std::pow(1.f - eclipseShadow, 2.f);
     float atmosphereDimming = 0.f;
@@ -566,8 +567,8 @@ void RenderableAtmosphere::setDimmingCoefficient(const glm::dmat4& modelTransfor
     else if (cameraIsInFadingRegion && cameraIsInEclipse) {
         // Fade with regards to altitude & eclipse shadow
         // Fading - linear interpolation
-        float fading = (cameraDistance - atmosphereInnerEdge) /
-            atmosphereFadingHeight;
+        const float fading =
+            (cameraDistance - atmosphereInnerEdge) / atmosphereFadingHeight;
         atmosphereDimming = std::clamp(eclipseShadow + fading, 0.f, 1.f);
     }
     else if (cameraIsInFadingRegion) {
diff --git a/modules/base/dashboard/dashboarditemangle.cpp b/modules/base/dashboard/dashboarditemangle.cpp
index eac1046265..7a8857d8e0 100644
--- a/modules/base/dashboard/dashboarditemangle.cpp
+++ b/modules/base/dashboard/dashboarditemangle.cpp
@@ -257,9 +257,56 @@ DashboardItemAngle::DashboardItemAngle(const ghoul::Dictionary& dictionary)
     _buffer.resize(128);
 }
 
-std::pair<glm::dvec3, std::string> DashboardItemAngle::positionAndLabel(
-                                                                    Component& comp) const
-{
+void DashboardItemAngle::render(glm::vec2& penPosition) {
+    ZoneScoped;
+
+    std::pair<glm::dvec3, std::string> sourceInfo = positionAndLabel(_source);
+    std::pair<glm::dvec3, std::string> referenceInfo = positionAndLabel(_reference);
+    std::pair<glm::dvec3, std::string> destinationInfo = positionAndLabel(_destination);
+
+    const glm::dvec3 a = referenceInfo.first - sourceInfo.first;
+    const glm::dvec3 b = destinationInfo.first - sourceInfo.first;
+
+    std::fill(_buffer.begin(), _buffer.end(), char(0));
+    if (glm::length(a) == 0.0 || glm::length(b) == 0) {
+        char* end = fmt::format_to(
+            _buffer.data(),
+            "Could not compute angle at {} between {} and {}",
+            sourceInfo.second, destinationInfo.second, referenceInfo.second
+        );
+        const std::string_view text = std::string_view(
+            _buffer.data(),
+            end - _buffer.data()
+        );
+        RenderFont(*_font, penPosition, text);
+        penPosition.y -= _font->height();
+    }
+    else {
+        const double angle = glm::degrees(
+            glm::acos(glm::dot(a, b) / (glm::length(a) * glm::length(b)))
+        );
+
+        char* end = fmt::format_to(
+            _buffer.data(),
+            "Angle at {} between {} and {}: {} degrees",
+            sourceInfo.second, destinationInfo.second, referenceInfo.second, angle
+        );
+        const std::string_view text = std::string_view(
+            _buffer.data(), end - _buffer.data()
+        );
+        RenderFont(*_font, penPosition, text);
+        penPosition.y -= _font->height();
+    }
+}
+
+glm::vec2 DashboardItemAngle::size() const {
+    ZoneScoped;
+
+    constexpr double Angle = 120;
+    return _font->boundingBox("Angle: " + std::to_string(Angle));
+}
+
+std::pair<glm::dvec3, std::string> DashboardItemAngle::positionAndLabel(Component& comp) {
     if (comp.type == Type::Node) {
         if (!comp.node) {
             comp.node = global::renderEngine->scene()->sceneGraphNode(comp.nodeName);
@@ -293,48 +340,4 @@ std::pair<glm::dvec3, std::string> DashboardItemAngle::positionAndLabel(
     }
 }
 
-void DashboardItemAngle::render(glm::vec2& penPosition) {
-    ZoneScoped;
-
-    std::pair<glm::dvec3, std::string> sourceInfo = positionAndLabel(_source);
-    std::pair<glm::dvec3, std::string> referenceInfo = positionAndLabel(_reference);
-    std::pair<glm::dvec3, std::string> destinationInfo = positionAndLabel(_destination);
-
-    const glm::dvec3 a = referenceInfo.first - sourceInfo.first;
-    const glm::dvec3 b = destinationInfo.first - sourceInfo.first;
-
-    std::fill(_buffer.begin(), _buffer.end(), char(0));
-    if (glm::length(a) == 0.0 || glm::length(b) == 0) {
-        char* end = fmt::format_to(
-            _buffer.data(),
-            "Could not compute angle at {} between {} and {}",
-            sourceInfo.second, destinationInfo.second, referenceInfo.second
-        );
-        std::string_view text = std::string_view(_buffer.data(), end - _buffer.data());
-        RenderFont(*_font, penPosition, text);
-        penPosition.y -= _font->height();
-    }
-    else {
-        const double angle = glm::degrees(
-            glm::acos(glm::dot(a, b) / (glm::length(a) * glm::length(b)))
-        );
-
-        char* end = fmt::format_to(
-            _buffer.data(),
-            "Angle at {} between {} and {}: {} degrees",
-            sourceInfo.second, destinationInfo.second, referenceInfo.second, angle
-        );
-        std::string_view text = std::string_view(_buffer.data(), end - _buffer.data());
-        RenderFont(*_font, penPosition, text);
-        penPosition.y -= _font->height();
-    }
-}
-
-glm::vec2 DashboardItemAngle::size() const {
-    ZoneScoped;
-
-    constexpr double Angle = 120;
-    return _font->boundingBox("Angle: " + std::to_string(Angle));
-}
-
 } // namespace openspace
diff --git a/modules/base/dashboard/dashboarditemangle.h b/modules/base/dashboard/dashboarditemangle.h
index c92b6edd71..1e44bbdf55 100644
--- a/modules/base/dashboard/dashboarditemangle.h
+++ b/modules/base/dashboard/dashboarditemangle.h
@@ -55,7 +55,7 @@ private:
         SceneGraphNode* node;
     };
 
-    std::pair<glm::dvec3, std::string> positionAndLabel(Component& comp) const;
+    static std::pair<glm::dvec3, std::string> positionAndLabel(Component& comp);
 
     Component _source;
     Component _reference;
diff --git a/modules/base/dashboard/dashboarditemdistance.cpp b/modules/base/dashboard/dashboarditemdistance.cpp
index 08d83464bd..241024118f 100644
--- a/modules/base/dashboard/dashboarditemdistance.cpp
+++ b/modules/base/dashboard/dashboarditemdistance.cpp
@@ -266,7 +266,7 @@ DashboardItemDistance::DashboardItemDistance(const ghoul::Dictionary& dictionary
     });
     addProperty(_doSimplification);
 
-    for (DistanceUnit u : DistanceUnits) {
+    for (const DistanceUnit u : DistanceUnits) {
         _requestedUnit.addOption(
             static_cast<int>(u),
             std::string(nameForDistanceUnit(u))
@@ -274,7 +274,7 @@ DashboardItemDistance::DashboardItemDistance(const ghoul::Dictionary& dictionary
     }
     _requestedUnit = static_cast<int>(DistanceUnit::Meter);
     if (p.requestedUnit.has_value()) {
-        DistanceUnit unit = distanceUnitFromString(p.requestedUnit->c_str());
+        const DistanceUnit unit = distanceUnitFromString(*p.requestedUnit);
         _requestedUnit = static_cast<int>(unit);
     }
     _requestedUnit.setVisibility(properties::Property::Visibility::Hidden);
@@ -323,9 +323,9 @@ std::pair<glm::dvec3, std::string> DashboardItemDistance::positionAndLabel(
             const glm::dvec3 thisPos = mainComp.node->worldPosition();
 
             const glm::dvec3 dir = glm::normalize(otherPos - thisPos);
-            glm::dvec3 dirLength = dir * glm::dvec3(mainComp.node->boundingSphere());
+            const glm::dvec3 dirLen = dir * glm::dvec3(mainComp.node->boundingSphere());
 
-            return { thisPos + dirLength, "surface of " + mainComp.node->guiName() };
+            return { thisPos + dirLen, "surface of " + mainComp.node->guiName() };
         }
         case Type::Focus: {
             const SceneGraphNode* anchor =
@@ -375,8 +375,8 @@ void DashboardItemDistance::render(glm::vec2& penPosition) {
             sourceInfo.second, destinationInfo.second, dist.first, dist.second
         );
 
-        std::string_view text = std::string_view(_buffer.data(), end - _buffer.data());
-        RenderFont(*_font, penPosition, text);
+        const std::string_view t = std::string_view(_buffer.data(), end - _buffer.data());
+        RenderFont(*_font, penPosition, t);
     }
     catch (const fmt::format_error&) {
         LERRORC("DashboardItemDate", "Illegal format string");
@@ -393,8 +393,8 @@ glm::vec2 DashboardItemDistance::size() const {
         dist = simplifyDistance(d);
     }
     else {
-        DistanceUnit unit = static_cast<DistanceUnit>(_requestedUnit.value());
-        double convertedD = convertMeters(d, unit);
+        const DistanceUnit unit = static_cast<DistanceUnit>(_requestedUnit.value());
+        const double convertedD = convertMeters(d, unit);
         dist = std::pair(convertedD, nameForDistanceUnit(unit, convertedD != 1.0));
     }
 
diff --git a/modules/base/dashboard/dashboarditemelapsedtime.cpp b/modules/base/dashboard/dashboarditemelapsedtime.cpp
index adf5ee5216..b1b623bd8c 100644
--- a/modules/base/dashboard/dashboarditemelapsedtime.cpp
+++ b/modules/base/dashboard/dashboarditemelapsedtime.cpp
@@ -127,11 +127,11 @@ DashboardItemElapsedTime::DashboardItemElapsedTime(const ghoul::Dictionary& dict
     _simplifyTime = p.simplifyTime.value_or(_simplifyTime);
     addProperty(_simplifyTime);
 
-    for (TimeUnit u : TimeUnits) {
+    for (const TimeUnit u : TimeUnits) {
         _lowestTimeUnit.addOption(static_cast<int>(u), std::string(nameForTimeUnit(u)));
     }
     _lowestTimeUnit = static_cast<int>(TimeUnit::Second);
-    TimeUnit u = codegen::map<TimeUnit>(
+    const TimeUnit u = codegen::map<TimeUnit>(
         p.lowestTimeUnit.value_or(Parameters::TimeUnit::Second)
     );
     _lowestTimeUnit = static_cast<int>(u);
@@ -141,16 +141,16 @@ DashboardItemElapsedTime::DashboardItemElapsedTime(const ghoul::Dictionary& dict
 void DashboardItemElapsedTime::render(glm::vec2& penPosition) {
     ZoneScoped;
 
-    double delta = global::timeManager->time().j2000Seconds() - _referenceJ2000;
+    const double delta = global::timeManager->time().j2000Seconds() - _referenceJ2000;
 
     if (_simplifyTime) {
         using namespace std::chrono;
 
-        TimeUnit lowestTime = TimeUnit(_lowestTimeUnit.value());
-        std::string_view lowestUnitS = nameForTimeUnit(lowestTime, false);
-        std::string_view lowestUnitP = nameForTimeUnit(lowestTime, true);
+        const TimeUnit lowestTime = TimeUnit(_lowestTimeUnit.value());
+        const std::string_view lowestUnitS = nameForTimeUnit(lowestTime, false);
+        const std::string_view lowestUnitP = nameForTimeUnit(lowestTime, true);
 
-        std::vector<std::pair<double, std::string_view>> ts = splitTime(delta);
+        const std::vector<std::pair<double, std::string_view>> ts = splitTime(delta);
         std::string time;
         for (const std::pair<double, std::string_view>& t : ts) {
             time += fmt::format("{} {} ", t.first, t.second);
diff --git a/modules/base/dashboard/dashboarditemframerate.cpp b/modules/base/dashboard/dashboarditemframerate.cpp
index a55c171eb5..6712ae7192 100644
--- a/modules/base/dashboard/dashboarditemframerate.cpp
+++ b/modules/base/dashboard/dashboarditemframerate.cpp
@@ -232,15 +232,16 @@ void DashboardItemFramerate::render(glm::vec2& penPosition) {
         _minDeltaTimeCache,
         _maxDeltaTimeCache
     );
-    std::string_view output = std::string_view(_buffer.data(), end - _buffer.data());
+    const std::string_view text = std::string_view(_buffer.data(), end - _buffer.data());
 
-    int nLines = output.empty() ? 0 :
-        static_cast<int>((std::count(output.begin(), output.end(), '\n') + 1));
+    const int nLines = text.empty() ?
+        0 :
+        static_cast<int>((std::count(text.begin(), text.end(), '\n') + 1));
 
     ghoul::fontrendering::FontRenderer::defaultRenderer().render(
         *_font,
         penPosition,
-        output
+        text
     );
     penPosition.y -= _font->height() * static_cast<float>(nLines);
 }
@@ -250,13 +251,13 @@ glm::vec2 DashboardItemFramerate::size() const {
 
     const FrametimeType t = FrametimeType(_frametimeType.value());
     char* end = format(_buffer, t, _minDeltaTimeCache, _maxDeltaTimeCache);
-    std::string_view output = std::string_view(_buffer.data(), end - _buffer.data());
+    const std::string_view res = std::string_view(_buffer.data(), end - _buffer.data());
 
-    if (output.empty()) {
+    if (res.empty()) {
         return { 0.f, 0.f };
     }
 
-    return _font->boundingBox(output);
+    return _font->boundingBox(res);
 }
 
 } // namespace openspace
diff --git a/modules/base/dashboard/dashboarditeminputstate.cpp b/modules/base/dashboard/dashboarditeminputstate.cpp
index 206fa6865e..ed28511707 100644
--- a/modules/base/dashboard/dashboarditeminputstate.cpp
+++ b/modules/base/dashboard/dashboarditeminputstate.cpp
@@ -135,12 +135,12 @@ void DashboardItemInputState::render(glm::vec2& penPosition) {
     if (_showKeyboard) {
         if (global::navigationHandler->disabledKeybindings()) {
             if (_showWhenDisabled) {
-                text.push_back("Keyboard shortcuts disabled");
+                text.emplace_back("Keyboard shortcuts disabled");
             }
         }
         else {
             if (_showWhenEnabled) {
-                text.push_back("Keyboard shortcuts enabled");
+                text.emplace_back("Keyboard shortcuts enabled");
             }
         }
     }
@@ -148,12 +148,12 @@ void DashboardItemInputState::render(glm::vec2& penPosition) {
     if (_showMouse) {
         if (global::navigationHandler->disabledMouse()) {
             if (_showWhenDisabled) {
-                text.push_back("Mouse input disabled");
+                text.emplace_back("Mouse input disabled");
             }
         }
         else {
             if (_showWhenEnabled) {
-                text.push_back("Mouse input enabled");
+                text.emplace_back("Mouse input enabled");
             }
         }
     }
@@ -161,18 +161,18 @@ void DashboardItemInputState::render(glm::vec2& penPosition) {
     if (_showJoystick) {
         if (global::navigationHandler->disabledJoystick()) {
             if (_showWhenDisabled) {
-                text.push_back("Joystick input disabled");
+                text.emplace_back("Joystick input disabled");
             }
         }
         else {
             if (_showWhenEnabled) {
-                text.push_back("Joystick input enabled");
+                text.emplace_back("Joystick input enabled");
             }
         }
     }
 
     if (!text.empty()) {
-        std::string t = ghoul::join(std::move(text), "\n");
+        const std::string t = ghoul::join(std::move(text), "\n");
         RenderFont(*_font, penPosition, t);
         penPosition.y -= _font->height();
     }
@@ -185,12 +185,12 @@ glm::vec2 DashboardItemInputState::size() const {
     if (_showKeyboard) {
         if (global::navigationHandler->disabledKeybindings()) {
             if (_showWhenDisabled) {
-                text.push_back("Keyboard shortcuts disabled");
+                text.emplace_back("Keyboard shortcuts disabled");
             }
         }
         else {
             if (_showWhenEnabled) {
-                text.push_back("Keyboard shortcuts enabled");
+                text.emplace_back("Keyboard shortcuts enabled");
             }
         }
     }
@@ -198,12 +198,12 @@ glm::vec2 DashboardItemInputState::size() const {
     if (_showMouse) {
         if (global::navigationHandler->disabledMouse()) {
             if (_showWhenDisabled) {
-                text.push_back("Mouse input disabled");
+                text.emplace_back("Mouse input disabled");
             }
         }
         else {
             if (_showWhenEnabled) {
-                text.push_back("Mouse input disabled");
+                text.emplace_back("Mouse input disabled");
             }
         }
     }
@@ -211,18 +211,18 @@ glm::vec2 DashboardItemInputState::size() const {
     if (_showJoystick) {
         if (global::navigationHandler->disabledJoystick()) {
             if (_showWhenDisabled) {
-                text.push_back("Joystick input disabled");
+                text.emplace_back("Joystick input disabled");
             }
         }
         else {
             if (_showWhenEnabled) {
-                text.push_back("Joystick input disabled");
+                text.emplace_back("Joystick input disabled");
             }
         }
     }
 
     if (!text.empty()) {
-        std::string t = ghoul::join(std::move(text), "\n");
+        const std::string t = ghoul::join(std::move(text), "\n");
         return _font->boundingBox(t);
     }
     else {
diff --git a/modules/base/dashboard/dashboarditemmission.cpp b/modules/base/dashboard/dashboarditemmission.cpp
index 41291ea85b..8fb771448c 100644
--- a/modules/base/dashboard/dashboarditemmission.cpp
+++ b/modules/base/dashboard/dashboarditemmission.cpp
@@ -72,7 +72,7 @@ void DashboardItemMission::render(glm::vec2& penPosition) {
     if (!global::missionManager->hasCurrentMission()) {
         return;
     }
-    double currentTime = global::timeManager->time().j2000Seconds();
+    const double currentTime = global::timeManager->time().j2000Seconds();
     const Mission& mission = global::missionManager->currentMission();
 
     if (mission.phases().empty()) {
@@ -99,7 +99,7 @@ void DashboardItemMission::render(glm::vec2& penPosition) {
         penPosition.y -= _font->height();
         RenderFont(*_font, penPosition, title, missionProgressColor);
         double remaining = phase.timeRange().end - currentTime;
-        float t = static_cast<float>(
+        const float t = static_cast<float>(
             1.0 - remaining / phase.timeRange().duration()
         );
         std::string progress = progressToStr(25, t);
@@ -124,13 +124,13 @@ void DashboardItemMission::render(glm::vec2& penPosition) {
         );
     }
 
-    bool showAllPhases = false;
+    constexpr bool ShowAllPhases = false;
 
     using PhaseWithDepth = std::pair<const MissionPhase*, int>;
     std::stack<PhaseWithDepth> S;
 
     constexpr int PixelIndentation = 20;
-    S.push({ &mission, 0 });
+    S.emplace(&mission, 0);
     while (!S.empty()) {
         const MissionPhase* phase = S.top().first;
         const int depth = S.top().second;
@@ -169,15 +169,13 @@ void DashboardItemMission::render(glm::vec2& penPosition) {
         }
         penPosition.x -= depth * PixelIndentation;
 
-        if (isCurrentPhase || showAllPhases) {
+        if (isCurrentPhase || ShowAllPhases) {
             // phases are sorted increasingly by start time, and will be
             // popped last-in-first-out from the stack, so add them in
             // reversed order.
-            int indexLastPhase = static_cast<int>(
-                phase->phases().size()
-            ) - 1;
+            const int indexLastPhase = static_cast<int>(phase->phases().size()) - 1;
             for (int i = indexLastPhase; 0 <= i; --i) {
-                S.push({ &phase->phases()[i], depth + 1 });
+                S.emplace(&phase->phases()[i], depth + 1);
             }
         }
     }
diff --git a/modules/base/dashboard/dashboarditemparallelconnection.cpp b/modules/base/dashboard/dashboarditemparallelconnection.cpp
index f021da65ce..22d3b6f4ce 100644
--- a/modules/base/dashboard/dashboarditemparallelconnection.cpp
+++ b/modules/base/dashboard/dashboarditemparallelconnection.cpp
@@ -108,8 +108,8 @@ void DashboardItemParallelConnection::render(glm::vec2& penPosition) {
 glm::vec2 DashboardItemParallelConnection::size() const {
     ZoneScoped;
 
-    ParallelConnection::Status status = global::parallelPeer->status();
-    size_t nConnections = global::parallelPeer->nConnections();
+    const ParallelConnection::Status status = global::parallelPeer->status();
+    const size_t nConnections = global::parallelPeer->nConnections();
     const std::string& hostName = global::parallelPeer->hostName();
 
     std::string connectionInfo;
diff --git a/modules/base/dashboard/dashboarditempropertyvalue.cpp b/modules/base/dashboard/dashboarditempropertyvalue.cpp
index 7ffea7cb35..0846e8c680 100644
--- a/modules/base/dashboard/dashboarditempropertyvalue.cpp
+++ b/modules/base/dashboard/dashboarditempropertyvalue.cpp
@@ -118,7 +118,7 @@ void DashboardItemPropertyValue::render(glm::vec2& penPosition) {
     }
 
     if (_property) {
-        std::string_view type = _property->className();
+        const std::string_view type = _property->className();
         if (type == "DoubleProperty") {
             double value = static_cast<properties::DoubleProperty*>(_property)->value();
             RenderFont(
diff --git a/modules/base/dashboard/dashboarditemsimulationincrement.cpp b/modules/base/dashboard/dashboarditemsimulationincrement.cpp
index ae5313ed56..c8193215ab 100644
--- a/modules/base/dashboard/dashboarditemsimulationincrement.cpp
+++ b/modules/base/dashboard/dashboarditemsimulationincrement.cpp
@@ -138,12 +138,12 @@ DashboardItemSimulationIncrement::DashboardItemSimulationIncrement(
     });
     addProperty(_doSimplification);
 
-    for (TimeUnit u : TimeUnits) {
+    for (const TimeUnit u : TimeUnits) {
         _requestedUnit.addOption(static_cast<int>(u), std::string(nameForTimeUnit(u)));
     }
     _requestedUnit = static_cast<int>(TimeUnit::Second);
     if (p.requestedUnit.has_value()) {
-        TimeUnit unit = timeUnitFromString(p.requestedUnit->c_str());
+        const TimeUnit unit = timeUnitFromString(*p.requestedUnit);
         _requestedUnit = static_cast<int>(unit);
     }
     _requestedUnit.setVisibility(properties::Property::Visibility::Hidden);
@@ -223,14 +223,14 @@ void DashboardItemSimulationIncrement::render(glm::vec2& penPosition) {
 glm::vec2 DashboardItemSimulationIncrement::size() const {
     ZoneScoped;
 
-    double t = global::timeManager->targetDeltaTime();
+    const double t = global::timeManager->targetDeltaTime();
     std::pair<double, std::string> deltaTime;
     if (_doSimplification) {
         deltaTime = simplifyTime(t);
     }
     else {
-        TimeUnit unit = static_cast<TimeUnit>(_requestedUnit.value());
-        double convertedT = convertTime(t, TimeUnit::Second, unit);
+        const TimeUnit unit = static_cast<TimeUnit>(_requestedUnit.value());
+        const double convertedT = convertTime(t, TimeUnit::Second, unit);
         deltaTime = std::pair(
             convertedT,
             std::string(nameForTimeUnit(unit, convertedT != 1.0))
diff --git a/modules/base/dashboard/dashboarditemvelocity.cpp b/modules/base/dashboard/dashboarditemvelocity.cpp
index 5f975b12e2..fdf99a67c5 100644
--- a/modules/base/dashboard/dashboarditemvelocity.cpp
+++ b/modules/base/dashboard/dashboarditemvelocity.cpp
@@ -106,7 +106,7 @@ DashboardItemVelocity::DashboardItemVelocity(const ghoul::Dictionary& dictionary
     });
     addProperty(_doSimplification);
 
-    for (DistanceUnit u : DistanceUnits) {
+    for (const DistanceUnit u : DistanceUnits) {
         _requestedUnit.addOption(
             static_cast<int>(u),
             std::string(nameForDistanceUnit(u))
@@ -114,7 +114,7 @@ DashboardItemVelocity::DashboardItemVelocity(const ghoul::Dictionary& dictionary
     }
     _requestedUnit = static_cast<int>(DistanceUnit::Meter);
     if (p.requestedUnit.has_value()) {
-        DistanceUnit unit = distanceUnitFromString(p.requestedUnit->c_str());
+        const DistanceUnit unit = distanceUnitFromString(*p.requestedUnit);
         _requestedUnit = static_cast<int>(unit);
     }
     _requestedUnit.setVisibility(properties::Property::Visibility::Hidden);
@@ -163,8 +163,8 @@ glm::vec2 DashboardItemVelocity::size() const {
         dist = simplifyDistance(d);
     }
     else {
-        DistanceUnit unit = static_cast<DistanceUnit>(_requestedUnit.value());
-        double convertedD = convertMeters(d, unit);
+        const DistanceUnit unit = static_cast<DistanceUnit>(_requestedUnit.value());
+        const double convertedD = convertMeters(d, unit);
         dist = std::pair(convertedD, nameForDistanceUnit(unit, convertedD != 1.0));
     }
 
diff --git a/modules/base/rendering/grids/renderableboxgrid.cpp b/modules/base/rendering/grids/renderableboxgrid.cpp
index 14056eb28c..d53632c94f 100644
--- a/modules/base/rendering/grids/renderableboxgrid.cpp
+++ b/modules/base/rendering/grids/renderableboxgrid.cpp
@@ -58,7 +58,7 @@ namespace {
         openspace::properties::Property::Visibility::AdvancedUser
     };
 
-    static const openspace::properties::PropertyOwner::PropertyOwnerInfo LabelsInfo = {
+    const openspace::properties::PropertyOwner::PropertyOwnerInfo LabelsInfo = {
         "Labels",
         "Labels",
         "The labels for the grid"
@@ -210,7 +210,7 @@ void RenderableBoxGrid::render(const RenderData& data, RendererTasks&){
         );
 
         if (orthoRight == glm::vec3(0.0)) {
-            glm::vec3 otherVector = glm::vec3(lookup.y, lookup.x, lookup.z);
+            const glm::vec3 otherVector = glm::vec3(lookup.y, lookup.x, lookup.z);
             right = glm::cross(viewDirection, otherVector);
             orthoRight = glm::normalize(
                 glm::vec3(worldToModelTransform * glm::vec4(right, 0.0))
diff --git a/modules/base/rendering/grids/renderablegrid.cpp b/modules/base/rendering/grids/renderablegrid.cpp
index 426535503e..ba03ab9f00 100644
--- a/modules/base/rendering/grids/renderablegrid.cpp
+++ b/modules/base/rendering/grids/renderablegrid.cpp
@@ -92,7 +92,7 @@ namespace {
         openspace::properties::Property::Visibility::User
     };
 
-    static const openspace::properties::PropertyOwner::PropertyOwnerInfo LabelsInfo = {
+    const openspace::properties::PropertyOwner::PropertyOwnerInfo LabelsInfo = {
         "Labels",
         "Labels",
         "The labels for the grid"
@@ -262,7 +262,7 @@ void RenderableGrid::render(const RenderData& data, RendererTasks&){
     );
 
     if (orthoRight == glm::vec3(0.0)) {
-        glm::vec3 otherVector = glm::vec3(lookup.y, lookup.x, lookup.z);
+        const glm::vec3 otherVector = glm::vec3(lookup.y, lookup.x, lookup.z);
         right = glm::cross(viewDirection, otherVector);
         orthoRight = glm::normalize(
             glm::vec3(worldToModelTransform * glm::vec4(right, 0.0))
@@ -347,8 +347,8 @@ void RenderableGrid::update(const UpdateData&) {
             // Line in y direction
             bool shouldHighlight = false;
             if (_highlightRate.value().x != 0) {
-                int dist = abs(static_cast<int>(i) - static_cast<int>(center.x));
-                int rest = dist % _highlightRate.value().x;
+                const int dist = abs(static_cast<int>(i) - static_cast<int>(center.x));
+                const int rest = dist % _highlightRate.value().x;
                 shouldHighlight = rest == 0;
             }
 
@@ -364,8 +364,8 @@ void RenderableGrid::update(const UpdateData&) {
             // Line in x direction
             shouldHighlight = false;
             if (_highlightRate.value().y != 0) {
-                int dist = abs(static_cast<int>(j) - static_cast<int>(center.y));
-                int rest = dist % _highlightRate.value().y;
+                const int dist = abs(static_cast<int>(j) - static_cast<int>(center.y));
+                const int rest = dist % _highlightRate.value().y;
                 shouldHighlight = abs(rest) == 0;
             }
 
@@ -387,9 +387,11 @@ void RenderableGrid::update(const UpdateData&) {
 
         bool shouldHighlight = false;
         if (_highlightRate.value().y != 0) {
-            int dist = abs(static_cast<int>(nSegments.y) - static_cast<int>(center.y));
-            int rest = dist % _highlightRate.value().y;
-            shouldHighlight = abs(rest) == 0;
+            const int dist = std::abs(
+                static_cast<int>(nSegments.y) - static_cast<int>(center.y)
+            );
+            const int rest = dist % _highlightRate.value().y;
+            shouldHighlight = std::abs(rest) == 0;
         }
 
         if (shouldHighlight) {
@@ -409,9 +411,11 @@ void RenderableGrid::update(const UpdateData&) {
 
         bool shouldHighlight = false;
         if (_highlightRate.value().x != 0) {
-            int dist = abs(static_cast<int>(nSegments.x) - static_cast<int>(center.x));
-            int rest = dist % _highlightRate.value().x;
-            shouldHighlight = abs(rest) == 0;
+            const int dist = std::abs(
+                static_cast<int>(nSegments.x) - static_cast<int>(center.x)
+            );
+            const int rest = dist % _highlightRate.value().x;
+            shouldHighlight = std::abs(rest) == 0;
         }
         if (shouldHighlight) {
             _highlightArray.push_back({ halfSize.x, y0, 0.0 });
diff --git a/modules/base/rendering/grids/renderableradialgrid.cpp b/modules/base/rendering/grids/renderableradialgrid.cpp
index 9402602a13..1449533ff7 100644
--- a/modules/base/rendering/grids/renderableradialgrid.cpp
+++ b/modules/base/rendering/grids/renderableradialgrid.cpp
@@ -80,7 +80,7 @@ namespace {
         openspace::properties::Property::Visibility::User
     };
 
-    static const openspace::properties::PropertyOwner::PropertyOwnerInfo LabelsInfo = {
+    const openspace::properties::PropertyOwner::PropertyOwnerInfo LabelsInfo = {
         "Labels",
         "Labels",
         "The labels for the grid"
@@ -217,7 +217,7 @@ void RenderableRadialGrid::render(const RenderData& data, RendererTasks&) {
     glEnable(GL_LINE_SMOOTH);
     glDepthMask(false);
 
-    for (GeometryData& c : _circles) {
+    for (const GeometryData& c : _circles) {
         c.render();
     }
 
@@ -243,7 +243,7 @@ void RenderableRadialGrid::render(const RenderData& data, RendererTasks&) {
         );
 
         if (orthoRight == glm::vec3(0.0)) {
-            glm::vec3 otherVector = glm::vec3(lookup.y, lookup.x, lookup.z);
+            const glm::vec3 otherVector = glm::vec3(lookup.y, lookup.x, lookup.z);
             right = glm::cross(viewDirection, otherVector);
             orthoRight = glm::normalize(
                 glm::vec3(worldToModelTransform * glm::vec4(right, 0.0))
@@ -279,8 +279,8 @@ void RenderableRadialGrid::update(const UpdateData&) {
         std::vector<rendering::helper::Vertex> vertices =
             rendering::helper::createRing(nSegments, radius);
 
-        _circles.push_back(GeometryData(GL_LINE_STRIP));
-        _circles.back().varray = rendering::helper::convert(vertices);
+        _circles.emplace_back(GL_LINE_STRIP);
+        _circles.back().varray = rendering::helper::convert(std::move(vertices));
         _circles.back().update();
     };
 
@@ -339,7 +339,10 @@ RenderableRadialGrid::GeometryData::GeometryData(GLenum renderMode)
 }
 
 RenderableRadialGrid::GeometryData::GeometryData(GeometryData&& other) noexcept {
-    if (this == &other) return;
+    if (this == &other) {
+        return;
+    }
+
     vao = other.vao;
     vbo = other.vbo;
     varray = std::move(other.varray);
@@ -372,7 +375,7 @@ RenderableRadialGrid::GeometryData::~GeometryData() {
     vbo = 0;
 }
 
-void RenderableRadialGrid::GeometryData::update() {
+void RenderableRadialGrid::GeometryData::update() const {
     glBindVertexArray(vao);
     glBindBuffer(GL_ARRAY_BUFFER, vbo);
     glBufferData(
@@ -392,7 +395,7 @@ void RenderableRadialGrid::GeometryData::update() {
     );
 }
 
-void RenderableRadialGrid::GeometryData::render() {
+void RenderableRadialGrid::GeometryData::render() const {
     glBindVertexArray(vao);
     glDrawArrays(mode, 0, static_cast<GLsizei>(varray.size()));
     glBindVertexArray(0);
diff --git a/modules/base/rendering/grids/renderableradialgrid.h b/modules/base/rendering/grids/renderableradialgrid.h
index fbb0f9140f..0abc486631 100644
--- a/modules/base/rendering/grids/renderableradialgrid.h
+++ b/modules/base/rendering/grids/renderableradialgrid.h
@@ -66,8 +66,8 @@ protected:
         GeometryData& operator=(GeometryData&& other) noexcept;
         ~GeometryData();
 
-        void update();
-        void render();
+        void update() const;
+        void render() const;
 
         std::vector<rendering::helper::VertexXYZ> varray;
         GLuint vao = 0;
diff --git a/modules/base/rendering/grids/renderablesphericalgrid.cpp b/modules/base/rendering/grids/renderablesphericalgrid.cpp
index a8e0a44a98..809bf737f9 100644
--- a/modules/base/rendering/grids/renderablesphericalgrid.cpp
+++ b/modules/base/rendering/grids/renderablesphericalgrid.cpp
@@ -61,7 +61,7 @@ namespace {
         openspace::properties::Property::Visibility::NoviceUser
     };
 
-    static const openspace::properties::PropertyOwner::PropertyOwnerInfo LabelsInfo = {
+    const openspace::properties::PropertyOwner::PropertyOwnerInfo LabelsInfo = {
         "Labels",
         "Labels",
         "The labels for the grid"
@@ -228,7 +228,7 @@ void RenderableSphericalGrid::render(const RenderData& data, RendererTasks&){
         );
 
         if (orthoRight == glm::vec3(0.0)) {
-            glm::vec3 otherVector = glm::vec3(lookup.y, lookup.x, lookup.z);
+            const glm::vec3 otherVector = glm::vec3(lookup.y, lookup.x, lookup.z);
             right = glm::cross(viewDirection, otherVector);
             orthoRight = glm::normalize(
                 glm::vec3(worldToModelTransform * glm::vec4(right, 0.0))
@@ -242,87 +242,89 @@ void RenderableSphericalGrid::render(const RenderData& data, RendererTasks&){
 }
 
 void RenderableSphericalGrid::update(const UpdateData&) {
-    if (_gridIsDirty) {
-        _isize = 6 * _segments * _segments;
-        _vsize = (_segments + 1) * (_segments + 1);
-        _varray.resize(_vsize);
-        Vertex v = { 0.f, 0.f, 0.f };
-        std::fill(_varray.begin(), _varray.end(), v);
-        _iarray.resize(_isize);
-        std::fill(_iarray.begin(), _iarray.end(), 0);
-
-        int nr = 0;
-        const float fsegments = static_cast<float>(_segments);
-
-        for (int nSegment = 0; nSegment <= _segments; ++nSegment) {
-            // define an extra vertex around the y-axis due to texture mapping
-            for (int j = 0; j <= _segments; j++) {
-                const float fi = static_cast<float>(nSegment);
-                const float fj = static_cast<float>(j);
-
-                // inclination angle (north to south)
-                const float theta = fi * glm::pi<float>() / fsegments * 2.f;  // 0 -> PI
-
-                // azimuth angle (east to west)
-                const float phi = fj * glm::pi<float>() * 2.0f / fsegments;  // 0 -> 2*PI
-
-                const float x = sin(phi) * sin(theta);  //
-                const float y = cos(theta);             // up
-                const float z = cos(phi) * sin(theta);  //
-
-                glm::vec3 normal = glm::vec3(x, y, z);
-                if (!(x == 0.f && y == 0.f && z == 0.f)) {
-                    normal = glm::normalize(normal);
-                }
-
-                glm::vec4 tmp(x, y, z, 1.f);
-                glm::mat4 rot = glm::rotate(
-                    glm::mat4(1.f),
-                    glm::half_pi<float>(),
-                    glm::vec3(1.f, 0.f, 0.f)
-                );
-                tmp = glm::vec4(glm::dmat4(rot) * glm::dvec4(tmp));
-
-                for (int i = 0; i < 3; i++) {
-                    _varray[nr].location[i] = tmp[i];
-                }
-                ++nr;
-            }
-        }
-        nr = 0;
-        // define indices for all triangles
-        for (int i = 1; i <= _segments; i++) {
-            for (int j = 0; j < _segments; j++) {
-                const int t = _segments + 1;
-                _iarray[nr] = t * (i - 1) + j + 0; ++nr;
-                _iarray[nr] = t * (i + 0) + j + 0; ++nr;
-                _iarray[nr] = t * (i + 0) + j + 1; ++nr;
-                _iarray[nr] = t * (i - 1) + j + 1; ++nr;
-                _iarray[nr] = t * (i - 1) + j + 0; ++nr;
-            }
-        }
-
-        glBindVertexArray(_vaoID);
-        glBindBuffer(GL_ARRAY_BUFFER, _vBufferID);
-        glBufferData(
-            GL_ARRAY_BUFFER,
-            _vsize * sizeof(Vertex),
-            _varray.data(),
-            GL_STATIC_DRAW
-        );
-
-        glVertexAttribPointer(0, 3, GL_FLOAT, GL_FALSE, sizeof(Vertex), nullptr);
-
-        glBindBuffer(GL_ELEMENT_ARRAY_BUFFER, _iBufferID);
-        glBufferData(
-            GL_ELEMENT_ARRAY_BUFFER,
-            _isize * sizeof(int),
-            _iarray.data(),
-            GL_STATIC_DRAW
-        );
-
-        _gridIsDirty = false;
+    if (!_gridIsDirty) {
+        return;
     }
+
+    _isize = 6 * _segments * _segments;
+    _vsize = (_segments + 1) * (_segments + 1);
+    _varray.resize(_vsize);
+    constexpr Vertex v = { 0.f, 0.f, 0.f };
+    std::fill(_varray.begin(), _varray.end(), v);
+    _iarray.resize(_isize);
+    std::fill(_iarray.begin(), _iarray.end(), 0);
+
+    int nr = 0;
+    const float fsegments = static_cast<float>(_segments);
+
+    for (int nSegment = 0; nSegment <= _segments; ++nSegment) {
+        // define an extra vertex around the y-axis due to texture mapping
+        for (int j = 0; j <= _segments; j++) {
+            const float fi = static_cast<float>(nSegment);
+            const float fj = static_cast<float>(j);
+
+            // inclination angle (north to south)
+            const float theta = fi * glm::pi<float>() / fsegments * 2.f;  // 0 -> PI
+
+            // azimuth angle (east to west)
+            const float phi = fj * glm::pi<float>() * 2.0f / fsegments;  // 0 -> 2*PI
+
+            const float x = std::sin(phi) * std::sin(theta);  //
+            const float y = std::cos(theta);                  // up
+            const float z = std::cos(phi) * std::sin(theta);  //
+
+            glm::vec3 normal = glm::vec3(x, y, z);
+            if (x != 0.f || y != 0.f || z != 0.f) {
+                normal = glm::normalize(normal);
+            }
+
+            glm::vec4 tmp(x, y, z, 1.f);
+            const glm::mat4 rot = glm::rotate(
+                glm::mat4(1.f),
+                glm::half_pi<float>(),
+                glm::vec3(1.f, 0.f, 0.f)
+            );
+            tmp = glm::vec4(glm::dmat4(rot) * glm::dvec4(tmp));
+
+            for (int i = 0; i < 3; i++) {
+                _varray[nr].location[i] = tmp[i];
+            }
+            ++nr;
+        }
+    }
+    nr = 0;
+    // define indices for all triangles
+    for (int i = 1; i <= _segments; i++) {
+        for (int j = 0; j < _segments; j++) {
+            const int t = _segments + 1;
+            _iarray[nr] = t * (i - 1) + j + 0; ++nr;
+            _iarray[nr] = t * (i + 0) + j + 0; ++nr;
+            _iarray[nr] = t * (i + 0) + j + 1; ++nr;
+            _iarray[nr] = t * (i - 1) + j + 1; ++nr;
+            _iarray[nr] = t * (i - 1) + j + 0; ++nr;
+        }
+    }
+
+    glBindVertexArray(_vaoID);
+    glBindBuffer(GL_ARRAY_BUFFER, _vBufferID);
+    glBufferData(
+        GL_ARRAY_BUFFER,
+        _vsize * sizeof(Vertex),
+        _varray.data(),
+        GL_STATIC_DRAW
+    );
+
+    glVertexAttribPointer(0, 3, GL_FLOAT, GL_FALSE, sizeof(Vertex), nullptr);
+
+    glBindBuffer(GL_ELEMENT_ARRAY_BUFFER, _iBufferID);
+    glBufferData(
+        GL_ELEMENT_ARRAY_BUFFER,
+        _isize * sizeof(int),
+        _iarray.data(),
+        GL_STATIC_DRAW
+    );
+
+    _gridIsDirty = false;
 }
 
 } // namespace openspace
diff --git a/modules/base/rendering/pointcloud/renderablepointcloud.cpp b/modules/base/rendering/pointcloud/renderablepointcloud.cpp
index df47f5ade4..85d05f1e45 100644
--- a/modules/base/rendering/pointcloud/renderablepointcloud.cpp
+++ b/modules/base/rendering/pointcloud/renderablepointcloud.cpp
@@ -1030,7 +1030,6 @@ void RenderablePointCloud::updateBufferData() {
             attibutesPerPoint * sizeof(float),
             reinterpret_cast<void*>(attributeOffset * sizeof(float))
         );
-        attributeOffset += 1;
     }
 
     glBindVertexArray(0);
diff --git a/modules/base/rendering/renderablelabel.cpp b/modules/base/rendering/renderablelabel.cpp
index d57d43d25c..a73fdf0611 100644
--- a/modules/base/rendering/renderablelabel.cpp
+++ b/modules/base/rendering/renderablelabel.cpp
@@ -403,30 +403,32 @@ void RenderableLabel::render(const RenderData& data, RendererTasks&) {
     float fadeInVariable = 1.f;
 
     if (_enableFadingEffect) {
-        float distanceNodeToCamera = static_cast<float>(
+        const float distanceNodeToCamera = static_cast<float>(
             glm::distance(data.camera.positionVec3(), data.modelTransform.translation)
         );
         fadeInVariable = computeFadeFactor(distanceNodeToCamera);
     }
 
-    glm::dmat4 modelMatrix(1.0);
+    const glm::dmat4 modelMatrix = glm::dmat4(1.0);
     const glm::dmat4 modelViewProjectionTransform =
         calcModelViewProjectionTransform(data, modelMatrix);
 
-    glm::dvec3 cameraViewDirectionWorld = -data.camera.viewDirectionWorldSpace();
-    glm::dvec3 cameraUpDirectionWorld = data.camera.lookUpVectorWorldSpace();
+    const glm::dvec3 cameraViewDirectionWorld = -data.camera.viewDirectionWorldSpace();
+    const glm::dvec3 cameraUpDirectionWorld = data.camera.lookUpVectorWorldSpace();
     glm::dvec3 orthoRight = glm::normalize(
         glm::cross(cameraUpDirectionWorld, cameraViewDirectionWorld)
     );
     if (orthoRight == glm::dvec3(0.0)) {
-        glm::dvec3 otherVector(
+        const glm::dvec3 otherVector = glm::dvec3(
             cameraUpDirectionWorld.y,
             cameraUpDirectionWorld.x,
             cameraUpDirectionWorld.z
         );
         orthoRight = glm::normalize(glm::cross(otherVector, cameraViewDirectionWorld));
     }
-    glm::dvec3 orthoUp = glm::normalize(glm::cross(cameraViewDirectionWorld, orthoRight));
+    const glm::dvec3 orthoUp = glm::normalize(
+        glm::cross(cameraViewDirectionWorld, orthoRight)
+    );
 
     renderLabels(data, modelViewProjectionTransform, orthoRight, orthoUp, fadeInVariable);
 
@@ -464,7 +466,7 @@ void RenderableLabel::renderLabels(const RenderData& data,
     labelInfo.enableFalseDepth = false;
 
     // We don't use spice rotation and scale
-    glm::vec3 transformedPos(
+    const glm::vec3 transformedPos = glm::vec3(
         _transformationMatrix * glm::dvec4(data.modelTransform.translation, 1.0)
     );
 
@@ -478,25 +480,25 @@ void RenderableLabel::renderLabels(const RenderData& data,
 }
 
 float RenderableLabel::computeFadeFactor(float distanceNodeToCamera) const {
-    float distanceUnit = unit(_fadeUnitOption);
+    const float distanceUnit = unit(_fadeUnitOption);
 
-    float x = distanceNodeToCamera;
-    float startX = _fadeDistances.value().x * distanceUnit;
-    float endX = _fadeDistances.value().y * distanceUnit;
+    const float x = distanceNodeToCamera;
+    const float startX = _fadeDistances.value().x * distanceUnit;
+    const float endX = _fadeDistances.value().y * distanceUnit;
 
     // The distances over which the fading should happen
-    float fadingStartDistance = _fadeWidths.value().x * distanceUnit;
-    float fadingEndDistance = _fadeWidths.value().y * distanceUnit;
+    const float fadingStartDistance = _fadeWidths.value().x * distanceUnit;
+    const float fadingEndDistance = _fadeWidths.value().y * distanceUnit;
 
     if (x <= startX) {
-        float f1 = 1.f - (startX - x) / fadingStartDistance;
+        const float f1 = 1.f - (startX - x) / fadingStartDistance;
         return std::clamp(f1, 0.f, 1.f);
     }
     else if (x > startX && x < endX) {
         return 1.f; // not faded
     }
     else { // x >= endX
-        float f2 = 1.f - (x - endX) / fadingEndDistance;
+        const float f2 = 1.f - (x - endX) / fadingEndDistance;
         return std::clamp(f2, 0.f, 1.f);
     }
 }
diff --git a/modules/base/rendering/renderablemodel.cpp b/modules/base/rendering/renderablemodel.cpp
index 36c7f57550..6f7a1fa0f7 100644
--- a/modules/base/rendering/renderablemodel.cpp
+++ b/modules/base/rendering/renderablemodel.cpp
@@ -69,12 +69,6 @@ namespace {
 
     constexpr glm::vec4 PosBufferClearVal = glm::vec4(1e32, 1e32, 1e32, 1.f);
 
-    const GLenum ColorAttachmentArray[3] = {
-       GL_COLOR_ATTACHMENT0,
-       GL_COLOR_ATTACHMENT1,
-       GL_COLOR_ATTACHMENT2,
-    };
-
     constexpr std::array<const char*, 26> UniformNames = {
         "modelViewTransform", "projectionTransform", "normalTransform", "meshTransform",
         "meshNormalTransform", "ambientIntensity", "diffuseIntensity",
@@ -370,9 +364,9 @@ RenderableModel::RenderableModel(const ghoul::Dictionary& dictionary)
 
     if (p.modelScale.has_value()) {
         if (std::holds_alternative<Parameters::ScaleUnit>(*p.modelScale)) {
-            Parameters::ScaleUnit scaleUnit =
+            const Parameters::ScaleUnit scaleUnit =
                 std::get<Parameters::ScaleUnit>(*p.modelScale);
-            DistanceUnit distanceUnit = codegen::map<DistanceUnit>(scaleUnit);
+            const DistanceUnit distanceUnit = codegen::map<DistanceUnit>(scaleUnit);
             _modelScale = toMeter(distanceUnit);
         }
         else if (std::holds_alternative<double>(*p.modelScale)) {
@@ -400,9 +394,9 @@ RenderableModel::RenderableModel(const ghoul::Dictionary& dictionary)
                 *p.animationTimeScale
             ))
         {
-            Parameters::AnimationTimeUnit animationTimeUnit =
+            const Parameters::AnimationTimeUnit animationTimeUnit =
                 std::get<Parameters::AnimationTimeUnit>(*p.animationTimeScale);
-            TimeUnit timeUnit = codegen::map<TimeUnit>(animationTimeUnit);
+            const TimeUnit timeUnit = codegen::map<TimeUnit>(animationTimeUnit);
 
             _animationTimeScale = static_cast<double>(
                 convertTime(1.0, timeUnit, TimeUnit::Second)
@@ -448,7 +442,7 @@ RenderableModel::RenderableModel(const ghoul::Dictionary& dictionary)
     }
 
     if (p.lightSources.has_value()) {
-        std::vector<ghoul::Dictionary> lightsources = *p.lightSources;
+        const std::vector<ghoul::Dictionary> lightsources = *p.lightSources;
 
         for (const ghoul::Dictionary& lsDictionary : lightsources) {
             std::unique_ptr<LightSource> lightSource =
@@ -609,11 +603,11 @@ void RenderableModel::initializeGL() {
     _program = BaseModule::ProgramObjectManager.request(
         program,
         [this, program]() -> std::unique_ptr<ghoul::opengl::ProgramObject> {
-            std::filesystem::path vs =
+            const std::filesystem::path vs =
                 _vertexShaderPath.empty() ?
                 absPath("${MODULE_BASE}/shaders/model_vs.glsl") :
                 std::filesystem::path(_vertexShaderPath);
-            std::filesystem::path fs =
+            const std::filesystem::path fs =
                 _fragmentShaderPath.empty() ?
                 absPath("${MODULE_BASE}/shaders/model_fs.glsl") :
                 std::filesystem::path(_fragmentShaderPath);
@@ -632,9 +626,9 @@ void RenderableModel::initializeGL() {
     _quadProgram = BaseModule::ProgramObjectManager.request(
         "ModelOpacityProgram",
         [&]() -> std::unique_ptr<ghoul::opengl::ProgramObject> {
-            std::filesystem::path vs =
+            const std::filesystem::path vs =
                 absPath("${MODULE_BASE}/shaders/modelOpacity_vs.glsl");
-            std::filesystem::path fs =
+            const std::filesystem::path fs =
                 absPath("${MODULE_BASE}/shaders/modelOpacity_fs.glsl");
 
             return global::renderEngine->buildRenderProgram(
@@ -651,7 +645,7 @@ void RenderableModel::initializeGL() {
     );
 
     // Screen quad VAO
-    const GLfloat quadVertices[] = {
+    constexpr std::array<GLfloat, 24> QuadVtx = {
         // x     y     s     t
         -1.f, -1.f,  0.f,  0.f,
          1.f,  1.f,  1.f,  1.f,
@@ -667,7 +661,7 @@ void RenderableModel::initializeGL() {
     glGenBuffers(1, &_quadVbo);
     glBindBuffer(GL_ARRAY_BUFFER, _quadVbo);
 
-    glBufferData(GL_ARRAY_BUFFER, sizeof(quadVertices), &quadVertices, GL_STATIC_DRAW);
+    glBufferData(GL_ARRAY_BUFFER, sizeof(QuadVtx), QuadVtx.data(), GL_STATIC_DRAW);
     glEnableVertexAttribArray(0);
     glVertexAttribPointer(0, 2, GL_FLOAT, GL_FALSE, 4 * sizeof(GLfloat), nullptr);
     glEnableVertexAttribArray(1);
@@ -715,7 +709,7 @@ void RenderableModel::initializeGL() {
     }
 
     // Check status
-    GLenum status = glCheckFramebufferStatus(GL_FRAMEBUFFER);
+    const GLenum status = glCheckFramebufferStatus(GL_FRAMEBUFFER);
     if (status != GL_FRAMEBUFFER_COMPLETE) {
         LERROR("Framebuffer is not complete");
     }
@@ -837,7 +831,7 @@ void RenderableModel::render(const RenderData& data, RendererTasks&) {
         glm::mat4(modelViewTransform)
     );
 
-    glm::dmat4 normalTransform = glm::transpose(glm::inverse(modelViewTransform));
+    const glm::dmat4 normalTransform = glm::transpose(glm::inverse(modelViewTransform));
 
     _program->setUniform(
         _uniformCache.normalTransform,
@@ -895,7 +889,7 @@ void RenderableModel::render(const RenderData& data, RendererTasks&) {
     }
     else {
         // Prepare framebuffer
-        GLint defaultFBO = ghoul::opengl::FramebufferObject::getActiveObject();
+        const GLint defaultFBO = ghoul::opengl::FramebufferObject::getActiveObject();
         glBindFramebuffer(GL_FRAMEBUFFER, _framebuffer);
 
         // Re-bind first texture to use the currently not used Ping-Pong texture in the
@@ -907,12 +901,17 @@ void RenderableModel::render(const RenderData& data, RendererTasks&) {
             0
         );
         // Check status
-        GLenum status = glCheckFramebufferStatus(GL_FRAMEBUFFER);
+        const GLenum status = glCheckFramebufferStatus(GL_FRAMEBUFFER);
         if (status != GL_FRAMEBUFFER_COMPLETE) {
             LERROR("Framebuffer is not complete");
         }
 
-        glDrawBuffers(3, ColorAttachmentArray);
+        constexpr std::array<GLenum, 3> ColorAttachmentArray = {
+           GL_COLOR_ATTACHMENT0,
+           GL_COLOR_ATTACHMENT1,
+           GL_COLOR_ATTACHMENT2,
+        };
+        glDrawBuffers(3, ColorAttachmentArray.data());
         glClearColor(0.f, 0.f, 0.f, 0.f);
         glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);
         glClearBufferfv(GL_COLOR, 1, glm::value_ptr(PosBufferClearVal));
@@ -987,8 +986,8 @@ void RenderableModel::render(const RenderData& data, RendererTasks&) {
             glm::vec2(global::windowDelegate->currentDrawBufferResolution())
         );
 
-        GLint vp[4] = { 0 };
-        global::renderEngine->openglStateCache().viewport(vp);
+        std::array<GLint, 4> vp = {};
+        global::renderEngine->openglStateCache().viewport(vp.data());
         glm::ivec4 viewport = glm::ivec4(vp[0], vp[1], vp[2], vp[3]);
         _quadProgram->setUniform(
             _uniformOpacityCache.viewport,
@@ -1049,9 +1048,9 @@ void RenderableModel::update(const UpdateData& data) {
 
     if (_geometry->hasAnimation() && !_animationStart.empty()) {
         double relativeTime = 0.0;
-        double now = data.time.j2000Seconds();
-        double startTime = data.time.convertTime(_animationStart);
-        double duration = _geometry->animationDuration();
+        const double now = data.time.j2000Seconds();
+        const double startTime = Time::convertTime(_animationStart);
+        const double duration = _geometry->animationDuration();
 
         // The animation works in a time range 0 to duration where 0 in the animation is
         // the given _animationStart time in OpenSpace. The time in OpenSpace then has to
diff --git a/modules/base/rendering/renderablenodearrow.cpp b/modules/base/rendering/renderablenodearrow.cpp
index 77103a9955..6b4ff18b9e 100644
--- a/modules/base/rendering/renderablenodearrow.cpp
+++ b/modules/base/rendering/renderablenodearrow.cpp
@@ -393,7 +393,8 @@ void RenderableNodeArrow::updateShapeTransforms(const RenderData& data) {
     }
 
     const double boundingSphere = startNode->boundingSphere();
-    bool hasNoBoundingSphere = boundingSphere < std::numeric_limits<double>::epsilon();
+    const bool hasNoBoundingSphere =
+        boundingSphere < std::numeric_limits<double>::epsilon();
 
     if (hasNoBoundingSphere && (_useRelativeLength || _useRelativeOffset)) {
         LERROR(fmt::format(
@@ -420,8 +421,8 @@ void RenderableNodeArrow::updateShapeTransforms(const RenderData& data) {
     );
 
     // Update the position based on the arrowDirection of the nodes
-    glm::dvec3 startNodePos = startNode->worldPosition();
-    glm::dvec3 endNodePos = endNode->worldPosition();
+    const glm::dvec3 startNodePos = startNode->worldPosition();
+    const glm::dvec3 endNodePos = endNode->worldPosition();
 
     glm::dvec3 arrowDirection = glm::normalize(endNodePos - startNodePos);
     glm::dvec3 startPos = glm::dvec3(startNodePos + offset * arrowDirection);
@@ -432,26 +433,26 @@ void RenderableNodeArrow::updateShapeTransforms(const RenderData& data) {
         arrowDirection *= -1.0;
     }
 
-    double coneLength = _arrowHeadSize * length;
-    double cylinderLength = length - coneLength;
-    double arrowHeadWidth = _width * _arrowHeadWidthFactor;
+    const double coneLength = _arrowHeadSize * length;
+    const double cylinderLength = length - coneLength;
+    const double arrowHeadWidth = _width * _arrowHeadWidthFactor;
 
     // Create transformation matrices to reshape to size and position
     _cylinderTranslation = glm::translate(glm::dmat4(1.0), startPos);
-    glm::dvec3 cylinderScale = glm::dvec3(
+    const glm::dvec3 cylinderScale = glm::dvec3(
         s * glm::dvec4(_width, _width, cylinderLength, 0.0)
     );
     _cylinderScale = glm::scale(glm::dmat4(1.0), cylinderScale);
 
     // Adapt arrow head start to scaled size
-    glm::dvec3 arrowHeadStartPos = startPos + cylinderScale.z * arrowDirection;
+    const glm::dvec3 arrowHeadStartPos = startPos + cylinderScale.z * arrowDirection;
 
     _coneTranslation = glm::translate(glm::dmat4(1.0), arrowHeadStartPos);
-    glm::dvec3 coneScale = glm::dvec3(arrowHeadWidth, arrowHeadWidth, coneLength);
+    const glm::dvec3 coneScale = glm::dvec3(arrowHeadWidth, arrowHeadWidth, coneLength);
     _coneScale = s * glm::scale(glm::dmat4(1.0), coneScale);
 
     // Rotation to point at the end node
-    glm::quat rotQuat = glm::rotation(glm::dvec3(0.0, 0.0, 1.0), arrowDirection);
+    const glm::quat rotQuat = glm::rotation(glm::dvec3(0.0, 0.0, 1.0), arrowDirection);
     _pointDirectionRotation = glm::dmat4(glm::toMat4(rotQuat));
 }
 
diff --git a/modules/base/rendering/renderablenodeline.cpp b/modules/base/rendering/renderablenodeline.cpp
index d1a60cb457..68a39ed79e 100644
--- a/modules/base/rendering/renderablenodeline.cpp
+++ b/modules/base/rendering/renderablenodeline.cpp
@@ -111,7 +111,7 @@ namespace {
         if (nav.anchorNode()) {
             anchorNodePos = nav.anchorNode()->worldPosition();
         }
-        glm::dvec3 diffPos = worldPos - anchorNodePos;
+        const glm::dvec3 diffPos = worldPos - anchorNodePos;
         return diffPos;
     }
 
@@ -230,8 +230,8 @@ RenderableNodeLine::RenderableNodeLine(const ghoul::Dictionary& dictionary)
 
         if (_useRelativeOffsets) {
             // Recompute previous offsets to relative values
-            double startBs = startNode->boundingSphere();
-            double endBs = endNode->boundingSphere();
+            const double startBs = startNode->boundingSphere();
+            const double endBs = endNode->boundingSphere();
             _startOffset =
                 static_cast<float>(startBs > 0.0 ? _startOffset / startBs : 0.0);
             _endOffset =
@@ -273,12 +273,14 @@ void RenderableNodeLine::initializeGL() {
     glGenVertexArrays(1, &_vaoId);
     glGenBuffers(1, &_vBufferId);
 
-    bindGL();
+    glBindVertexArray(_vaoId);
+    glBindBuffer(GL_ARRAY_BUFFER, _vBufferId);
 
     glVertexAttribPointer(_locVertex, 3, GL_FLOAT, GL_FALSE, 3 * sizeof(float), nullptr);
     glEnableVertexAttribArray(_locVertex);
 
-    unbindGL();
+    glBindBuffer(GL_ARRAY_BUFFER, 0);
+    glBindVertexArray(0);
 }
 
 void RenderableNodeLine::deinitializeGL() {
@@ -303,16 +305,6 @@ bool RenderableNodeLine::isReady() const {
     return ready;
 }
 
-void RenderableNodeLine::unbindGL() {
-    glBindBuffer(GL_ARRAY_BUFFER, 0);
-    glBindVertexArray(0);
-}
-
-void RenderableNodeLine::bindGL() {
-    glBindVertexArray(_vaoId);
-    glBindBuffer(GL_ARRAY_BUFFER, _vBufferId);
-}
-
 void RenderableNodeLine::updateVertexData() {
     SceneGraphNode* startNode = global::renderEngine->scene()->sceneGraphNode(_start);
     SceneGraphNode* endNode = global::renderEngine->scene()->sceneGraphNode(_end);
@@ -342,9 +334,9 @@ void RenderableNodeLine::updateVertexData() {
     }
 
     // Compute line positions
-    glm::dvec3 dir = glm::normalize(_endPos - _startPos);
-    glm::dvec3 startPos = _startPos + startOffset * dir;
-    glm::dvec3 endPos = _endPos - endOffset * dir;
+    const glm::dvec3 dir = glm::normalize(_endPos - _startPos);
+    const glm::dvec3 startPos = _startPos + startOffset * dir;
+    const glm::dvec3 endPos = _endPos - endOffset * dir;
 
     _vertexArray.push_back(static_cast<float>(startPos.x));
     _vertexArray.push_back(static_cast<float>(startPos.y));
@@ -354,7 +346,8 @@ void RenderableNodeLine::updateVertexData() {
     _vertexArray.push_back(static_cast<float>(endPos.y));
     _vertexArray.push_back(static_cast<float>(endPos.z));
 
-    bindGL();
+    glBindVertexArray(_vaoId);
+    glBindBuffer(GL_ARRAY_BUFFER, _vBufferId);
     glBufferData(
         GL_ARRAY_BUFFER,
         _vertexArray.size() * sizeof(float),
@@ -365,7 +358,8 @@ void RenderableNodeLine::updateVertexData() {
     // update vertex attributes
     glVertexAttribPointer(_locVertex, 3, GL_FLOAT, GL_FALSE, 3 * sizeof(float), nullptr);
 
-    unbindGL();
+    glBindBuffer(GL_ARRAY_BUFFER, 0);
+    glBindVertexArray(0);
 }
 
 void RenderableNodeLine::update(const UpdateData&) {
@@ -399,11 +393,13 @@ void RenderableNodeLine::render(const RenderData& data, RendererTasks&) {
     glLineWidth(_lineWidth);
 
     // Bind and draw
-    bindGL();
+    glBindVertexArray(_vaoId);
+    glBindBuffer(GL_ARRAY_BUFFER, _vBufferId);
     glDrawArrays(GL_LINES, 0, 2);
 
     // Restore GL State
-    unbindGL();
+    glBindBuffer(GL_ARRAY_BUFFER, 0);
+    glBindVertexArray(0);
     _program->deactivate();
     global::renderEngine->openglStateCache().resetBlendState();
     global::renderEngine->openglStateCache().resetLineState();
diff --git a/modules/base/rendering/renderablenodeline.h b/modules/base/rendering/renderablenodeline.h
index 65a0694692..7160dd96bb 100644
--- a/modules/base/rendering/renderablenodeline.h
+++ b/modules/base/rendering/renderablenodeline.h
@@ -65,9 +65,6 @@ private:
     void update(const UpdateData& data) override;
     void render(const RenderData& data, RendererTasks& rendererTask) override;
 
-    void unbindGL();
-    void bindGL();
-
     ghoul::opengl::ProgramObject* _program;
     /// The vertex attribute location for position
     /// must correlate to layout location in vertex shader
diff --git a/modules/base/rendering/renderableplane.cpp b/modules/base/rendering/renderableplane.cpp
index cf5285f1c4..4224b57c9d 100644
--- a/modules/base/rendering/renderableplane.cpp
+++ b/modules/base/rendering/renderableplane.cpp
@@ -156,7 +156,7 @@ RenderablePlane::RenderablePlane(const ghoul::Dictionary& dictionary)
         { static_cast<int>(BlendMode::Additive), "Additive"}
     });
     _blendMode.onChange([this]() {
-        BlendMode m = static_cast<BlendMode>(_blendMode.value());
+        const BlendMode m = static_cast<BlendMode>(_blendMode.value());
         switch (m) {
             case BlendMode::Normal:
                 setRenderBinFromOpacity();
@@ -244,17 +244,17 @@ void RenderablePlane::render(const RenderData& data, RendererTasks&) {
 
     _shader->setUniform(_uniformCache.mirrorBackside, _mirrorBackside);
 
-    glm::dvec3 objectPositionWorld = glm::dvec3(
+    const glm::dvec3 objPosWorld = glm::dvec3(
         glm::translate(
             glm::dmat4(1.0),
             data.modelTransform.translation) * glm::dvec4(0.0, 0.0, 0.0, 1.0)
     );
 
-    glm::dvec3 normal = glm::normalize(data.camera.positionVec3() - objectPositionWorld);
-    glm::dvec3 newRight = glm::normalize(
+    const glm::dvec3 normal = glm::normalize(data.camera.positionVec3() - objPosWorld);
+    const glm::dvec3 newRight = glm::normalize(
         glm::cross(data.camera.lookUpVectorWorldSpace(), normal)
     );
-    glm::dvec3 newUp = glm::cross(normal, newRight);
+    const glm::dvec3 newUp = glm::cross(normal, newRight);
 
     glm::dmat4 cameraOrientedRotation = glm::dmat4(1.0);
     cameraOrientedRotation[0] = glm::dvec4(newRight, 0.0);
@@ -283,7 +283,7 @@ void RenderablePlane::render(const RenderData& data, RendererTasks&) {
 
     _shader->setUniform(_uniformCache.multiplyColor, _multiplyColor);
 
-    bool additiveBlending = (_blendMode == static_cast<int>(BlendMode::Additive));
+    const bool additiveBlending = (_blendMode == static_cast<int>(BlendMode::Additive));
     if (additiveBlending) {
         glDepthMask(false);
         glBlendFunc(GL_SRC_ALPHA, GL_ONE);
diff --git a/modules/base/rendering/renderableplaneimagelocal.cpp b/modules/base/rendering/renderableplaneimagelocal.cpp
index 0d0aea11f6..122c232e7d 100644
--- a/modules/base/rendering/renderableplaneimagelocal.cpp
+++ b/modules/base/rendering/renderableplaneimagelocal.cpp
@@ -102,15 +102,15 @@ RenderablePlaneImageLocal::RenderablePlaneImageLocal(const ghoul::Dictionary& di
         }
 
         // Shape the plane based on the aspect ration of the image
-        glm::vec2 textureDim = glm::vec2(_texture->dimensions());
+        const glm::vec2 textureDim = glm::vec2(_texture->dimensions());
         if (_textureDimensions != textureDim) {
-            float aspectRatio = textureDim.x / textureDim.y;
-            float planeAspectRatio = _size.value().x / _size.value().y;
+            const float aspectRatio = textureDim.x / textureDim.y;
+            const float planeAspectRatio = _size.value().x / _size.value().y;
 
             if (std::abs(planeAspectRatio - aspectRatio) >
                 std::numeric_limits<float>::epsilon())
             {
-                glm::vec2 newSize =
+                const glm::vec2 newSize =
                     aspectRatio > 0.f ?
                     glm::vec2(_size.value().x * aspectRatio, _size.value().y) :
                     glm::vec2(_size.value().x, _size.value().y * aspectRatio);
@@ -162,7 +162,7 @@ void RenderablePlaneImageLocal::loadTexture() {
     if (!_texturePath.value().empty()) {
         ghoul::opengl::Texture* t = _texture;
 
-        unsigned int hash = ghoul::hashCRC32File(_texturePath);
+        const unsigned int hash = ghoul::hashCRC32File(_texturePath);
 
         _texture = BaseModule::TextureManager.request(
             std::to_string(hash),
@@ -195,15 +195,15 @@ void RenderablePlaneImageLocal::loadTexture() {
         }
 
         // Shape the plane based on the aspect ration of the image
-        glm::vec2 textureDim = glm::vec2(_texture->dimensions());
+        const glm::vec2 textureDim = glm::vec2(_texture->dimensions());
         if (_textureDimensions != textureDim) {
-            float aspectRatio = textureDim.x / textureDim.y;
-            float planeAspectRatio = _size.value().x / _size.value().y;
+            const float aspectRatio = textureDim.x / textureDim.y;
+            const float planeAspectRatio = _size.value().x / _size.value().y;
 
             if (std::abs(planeAspectRatio - aspectRatio) >
                 std::numeric_limits<float>::epsilon())
             {
-                glm::vec2 newSize =
+                const glm::vec2 newSize =
                     aspectRatio > 0.f ?
                     glm::vec2(_size.value().x * aspectRatio, _size.value().y) :
                     glm::vec2(_size.value().x, _size.value().y * aspectRatio);
diff --git a/modules/base/rendering/renderableplaneimageonline.cpp b/modules/base/rendering/renderableplaneimageonline.cpp
index cb662f70a5..88d2d89db3 100644
--- a/modules/base/rendering/renderableplaneimageonline.cpp
+++ b/modules/base/rendering/renderableplaneimageonline.cpp
@@ -77,19 +77,18 @@ RenderablePlaneImageOnline::RenderablePlaneImageOnline(
         }
 
         // Shape the plane based on the aspect ration of the image
-        glm::vec2 textureDim = glm::vec2(_texture->dimensions());
+        const glm::vec2 textureDim = glm::vec2(_texture->dimensions());
         if (_textureDimensions != textureDim) {
-            float aspectRatio = textureDim.x / textureDim.y;
-            float planeAspectRatio = _size.value().x / _size.value().y;
+            const float aspectRatio = textureDim.x / textureDim.y;
+            const float planeAspectRatio = _size.value().x / _size.value().y;
 
             if (std::abs(planeAspectRatio - aspectRatio) >
                 std::numeric_limits<float>::epsilon())
             {
-                glm::vec2 newSize =
+                _size =
                     aspectRatio > 0.f ?
                     glm::vec2(_size.value().x * aspectRatio, _size.value().y) :
                     glm::vec2(_size.value().x, _size.value().y * aspectRatio);
-                _size = newSize;
             }
 
             _textureDimensions = textureDim;
@@ -129,7 +128,7 @@ void RenderablePlaneImageOnline::update(const UpdateData& data) {
     }
 
     if (_imageFuture.valid() && DownloadManager::futureReady(_imageFuture)) {
-        DownloadManager::MemoryFile imageFile = _imageFuture.get();
+        const DownloadManager::MemoryFile imageFile = _imageFuture.get();
 
         if (imageFile.corrupted) {
             LERRORC(
@@ -165,19 +164,18 @@ void RenderablePlaneImageOnline::update(const UpdateData& data) {
                 }
 
                 // Shape the plane based on the aspect ration of the image
-                glm::vec2 textureDim = glm::vec2(_texture->dimensions());
+                const glm::vec2 textureDim = glm::vec2(_texture->dimensions());
                 if (_textureDimensions != textureDim) {
-                    float aspectRatio = textureDim.x / textureDim.y;
-                    float planeAspectRatio = _size.value().x / _size.value().y;
+                    const float aspectRatio = textureDim.x / textureDim.y;
+                    const float planeAspectRatio = _size.value().x / _size.value().y;
 
                     if (std::abs(planeAspectRatio - aspectRatio) >
                         std::numeric_limits<float>::epsilon())
                     {
-                        glm::vec2 newSize =
+                        _size =
                             aspectRatio > 0.f ?
                             glm::vec2(_size.value().x * aspectRatio, _size.value().y) :
                             glm::vec2(_size.value().x, _size.value().y * aspectRatio);
-                        _size = newSize;
                     }
 
                     _textureDimensions = textureDim;
diff --git a/modules/base/rendering/renderableplanetimevaryingimage.cpp b/modules/base/rendering/renderableplanetimevaryingimage.cpp
index c33071fce0..c41ebb4b7a 100644
--- a/modules/base/rendering/renderableplanetimevaryingimage.cpp
+++ b/modules/base/rendering/renderableplanetimevaryingimage.cpp
@@ -131,7 +131,7 @@ RenderablePlaneTimeVaryingImage::RenderablePlaneTimeVaryingImage(
 
 void RenderablePlaneTimeVaryingImage::initialize() {
     RenderablePlane::initialize();
-    bool success = extractMandatoryInfoFromDictionary();
+    const bool success = extractMandatoryInfoFromDictionary();
     if (!success) {
         return;
     }
@@ -162,7 +162,7 @@ bool RenderablePlaneTimeVaryingImage::extractMandatoryInfoFromDictionary() {
     // Ensure that the source folder exists and then extract
     // the files with the same extension as <inputFileTypeString>
     namespace fs = std::filesystem;
-    fs::path sourceFolder = absPath(_sourceFolder);
+    const fs::path sourceFolder = absPath(_sourceFolder);
     // Extract all file paths from the provided folder
     _sourceFiles.clear();
     namespace fs = std::filesystem;
@@ -206,8 +206,8 @@ void RenderablePlaneTimeVaryingImage::update(const UpdateData& data) {
     }
     bool needsUpdate = false;
     const double currentTime = data.time.j2000Seconds();
-    bool isInInterval = (currentTime >= _startTimes[0]) &&
-        (currentTime < _sequenceEndTime);
+    const bool isInInterval = (currentTime >= _startTimes[0]) &&
+                              (currentTime < _sequenceEndTime);
     if (isInInterval) {
         const size_t nextIdx = _activeTriggerTimeIndex + 1;
         if (
@@ -268,7 +268,7 @@ int RenderablePlaneTimeVaryingImage::updateActiveTriggerTimeIndex(
     auto iter = std::upper_bound(_startTimes.begin(), _startTimes.end(), currentTime);
     if (iter != _startTimes.end()) {
         if (iter != _startTimes.begin()) {
-            std::ptrdiff_t idx = std::distance(_startTimes.begin(), iter);
+            const std::ptrdiff_t idx = std::distance(_startTimes.begin(), iter);
             activeIndex = static_cast<int>(idx) - 1;
         }
         else {
diff --git a/modules/base/rendering/renderableprism.cpp b/modules/base/rendering/renderableprism.cpp
index f9540e469e..9bac9b2a3d 100644
--- a/modules/base/rendering/renderableprism.cpp
+++ b/modules/base/rendering/renderableprism.cpp
@@ -231,8 +231,8 @@ void RenderablePrism::updateVertexData() {
 
     // Put base vertices into array
     for (int j = 0; j < _nShapeSegments; j++) {
-        float ux = unitVertices[j].xyz[0];
-        float uy = unitVertices[j].xyz[1];
+        const float ux = unitVertices[j].xyz[0];
+        const float uy = unitVertices[j].xyz[1];
 
         _vertexArray.push_back(ux * _baseRadius); // x
         _vertexArray.push_back(uy * _baseRadius); // y
@@ -241,8 +241,8 @@ void RenderablePrism::updateVertexData() {
 
     // Put top shape vertices into array
     for (int j = 0; j < _nShapeSegments; j++) {
-        float ux = unitVertices[j].xyz[0];
-        float uy = unitVertices[j].xyz[1];
+        const float ux = unitVertices[j].xyz[0];
+        const float uy = unitVertices[j].xyz[1];
 
         _vertexArray.push_back(ux * _radius); // x
         _vertexArray.push_back(uy * _radius); // y
@@ -264,8 +264,8 @@ void RenderablePrism::updateVertexData() {
     }
     else {
         for (int j = 0; j < _nLines; j++) {
-            float ux = unitVerticesLines[j].xyz[0];
-            float uy = unitVerticesLines[j].xyz[1];
+            const float ux = unitVerticesLines[j].xyz[0];
+            const float uy = unitVerticesLines[j].xyz[1];
 
             // Base
             _vertexArray.push_back(ux * _baseRadius); // x
diff --git a/modules/base/rendering/renderablesphere.cpp b/modules/base/rendering/renderablesphere.cpp
index fba2b8627f..ac8b2db74b 100644
--- a/modules/base/rendering/renderablesphere.cpp
+++ b/modules/base/rendering/renderablesphere.cpp
@@ -233,7 +233,7 @@ void RenderableSphere::deinitializeGL() {
 }
 
 void RenderableSphere::render(const RenderData& data, RendererTasks&) {
-    Orientation orientation = static_cast<Orientation>(_orientation.value());
+    const Orientation orientation = static_cast<Orientation>(_orientation.value());
 
     // Activate shader
     using IgnoreError = ghoul::opengl::ProgramObject::IgnoreError;
@@ -242,7 +242,7 @@ void RenderableSphere::render(const RenderData& data, RendererTasks&) {
 
     auto [modelTransform, modelViewTransform, modelViewProjectionTransform] =
         calcAllTransforms(data);
-    glm::dmat3 modelRotation = glm::dmat3(data.modelTransform.rotation);
+    const glm::dmat3 modelRotation = glm::dmat3(data.modelTransform.rotation);
 
     _shader->setUniform(_uniformCache.modelViewTransform, glm::mat4(modelViewTransform));
     _shader->setUniform(
@@ -250,7 +250,7 @@ void RenderableSphere::render(const RenderData& data, RendererTasks&) {
         glm::mat4(modelViewProjectionTransform)
     );
 
-    glm::mat3 modelViewRotation = glm::mat3(
+    const glm::mat3 modelViewRotation = glm::mat3(
         glm::dmat3(data.camera.viewRotationMatrix()) * modelRotation
     );
     _shader->setUniform(_uniformCache.modelViewRotation, modelViewRotation);
diff --git a/modules/base/rendering/renderablesphereimageonline.cpp b/modules/base/rendering/renderablesphereimageonline.cpp
index b1d64dc0ec..a4b5c64397 100644
--- a/modules/base/rendering/renderablesphereimageonline.cpp
+++ b/modules/base/rendering/renderablesphereimageonline.cpp
@@ -43,6 +43,28 @@ namespace {
         openspace::properties::Property::Visibility::User
     };
 
+    std::future<openspace::DownloadManager::MemoryFile> downloadImageToMemory(
+                                                                   const std::string& url)
+    {
+        using namespace openspace;
+
+        return global::downloadManager->fetchFile(
+            url,
+            [url](const DownloadManager::MemoryFile&) {
+                LDEBUGC(
+                    "RenderableSphereImageOnline",
+                    fmt::format("Download to memory finished for image '{}'", url)
+                );
+            },
+            [url](const std::string& err) {
+                LDEBUGC(
+                    "RenderableSphereImageOnline",
+                    fmt::format("Download to memory failed for image '{}': {}", url, err)
+                );
+            }
+        );
+    }
+
     struct [[codegen::Dictionary(RenderableSphere)]] Parameters {
         // [[codegen::verbatim(TextureInfo.description)]]
         std::string url [[codegen::key("URL")]];
@@ -93,7 +115,7 @@ void RenderableSphereImageOnline::update(const UpdateData& data) {
     }
 
     if (_imageFuture.valid() && DownloadManager::futureReady(_imageFuture)) {
-        DownloadManager::MemoryFile imageFile = _imageFuture.get();
+        const DownloadManager::MemoryFile imageFile = _imageFuture.get();
 
         if (imageFile.corrupted) {
             LERRORC(
@@ -141,24 +163,4 @@ void RenderableSphereImageOnline::bindTexture() {
     }
 }
 
-std::future<DownloadManager::MemoryFile>
-RenderableSphereImageOnline::downloadImageToMemory(const std::string& url)
-{
-    return global::downloadManager->fetchFile(
-        url,
-        [url](const DownloadManager::MemoryFile&) {
-            LDEBUGC(
-                "RenderableSphereImageOnline",
-                fmt::format("Download to memory finished for image '{}'", url)
-            );
-        },
-        [url](const std::string& err) {
-            LDEBUGC(
-                "RenderableSphereImageOnline",
-                fmt::format("Download to memory failed for image '{}': {}", url, err)
-            );
-        }
-    );
-}
-
 } // namespace openspace
diff --git a/modules/base/rendering/renderablesphereimageonline.h b/modules/base/rendering/renderablesphereimageonline.h
index ed256d0719..c98102e39b 100644
--- a/modules/base/rendering/renderablesphereimageonline.h
+++ b/modules/base/rendering/renderablesphereimageonline.h
@@ -52,9 +52,6 @@ protected:
     void bindTexture() override;
 
 private:
-    std::future<DownloadManager::MemoryFile> downloadImageToMemory(
-        const std::string& url);
-
     properties::StringProperty _textureUrl;
 
     std::future<DownloadManager::MemoryFile> _imageFuture;
diff --git a/modules/base/rendering/renderabletimevaryingsphere.cpp b/modules/base/rendering/renderabletimevaryingsphere.cpp
index 8cde614fad..affa8e718d 100644
--- a/modules/base/rendering/renderabletimevaryingsphere.cpp
+++ b/modules/base/rendering/renderabletimevaryingsphere.cpp
@@ -105,7 +105,7 @@ void RenderableTimeVaryingSphere::extractMandatoryInfoFromSourceFolder() {
     // Ensure that the source folder exists and then extract
     // the files with the same extension as <inputFileTypeString>
     namespace fs = std::filesystem;
-    fs::path sourceFolder = absPath(_textureSourcePath);
+    const fs::path sourceFolder = absPath(_textureSourcePath);
     if (!std::filesystem::is_directory(sourceFolder)) {
         throw ghoul::RuntimeError(
             "Source folder for RenderableTimeVaryingSphere is not a valid directory"
@@ -118,8 +118,8 @@ void RenderableTimeVaryingSphere::extractMandatoryInfoFromSourceFolder() {
         if (!e.is_regular_file()) {
             continue;
         }
-        std::string filePath = e.path().string();
-        double time = extractTriggerTimeFromFileName(filePath);
+        const std::string filePath = e.path().string();
+        const double time = extractTriggerTimeFromFileName(filePath);
         std::unique_ptr<ghoul::opengl::Texture> t =
             ghoul::io::TextureReader::ref().loadTexture(filePath, 2);
 
@@ -194,7 +194,7 @@ void RenderableTimeVaryingSphere::updateActiveTriggerTimeIndex(double currentTim
     );
     if (iter != _files.end()) {
         if (iter != _files.begin()) {
-            ptrdiff_t idx = std::distance(_files.begin(), iter);
+            const ptrdiff_t idx = std::distance(_files.begin(), iter);
             _activeTriggerTimeIndex = static_cast<int>(idx - 1);
         }
         else {
diff --git a/modules/base/rendering/renderabletrail.cpp b/modules/base/rendering/renderabletrail.cpp
index f8a65ad83d..bc4c69ac27 100644
--- a/modules/base/rendering/renderabletrail.cpp
+++ b/modules/base/rendering/renderabletrail.cpp
@@ -291,7 +291,7 @@ void RenderableTrail::internalRender(bool renderLines, bool renderPoints,
     // We pass in the model view transformation matrix as double in order to maintain
     // high precision for vertices; especially for the trails, a high vertex precision
     // is necessary as they are usually far away from their reference
-    glm::dmat4 modelViewTransform = calcModelViewTransform(data, modelTransform);
+    const glm::dmat4 modelViewTransform = calcModelViewTransform(data, modelTransform);
     _programObject->setUniform(
         _uniformCache.modelView,
         modelViewTransform * info._localTransform
@@ -317,8 +317,8 @@ void RenderableTrail::internalRender(bool renderLines, bool renderPoints,
     _programObject->setUniform(_uniformCache.nVertices, nVertices);
 
 #if !defined(__APPLE__)
-    GLint viewport[4];
-    global::renderEngine->openglStateCache().viewport(viewport);
+    std::array<GLint, 4> viewport;
+    global::renderEngine->openglStateCache().viewport(viewport.data());
     _programObject->setUniform(
         _uniformCache.viewport,
         static_cast<float>(viewport[0]),
@@ -392,7 +392,7 @@ void RenderableTrail::render(const RenderData& data, RendererTasks&) {
     _programObject->activate();
     _programObject->setUniform(_uniformCache.opacity, opacity());
 
-    glm::dmat4 modelTransform = calcModelTransform(data);
+    const glm::dmat4 modelTransform = calcModelTransform(data);
 
     _programObject->setUniform(_uniformCache.projection, data.camera.projectionMatrix());
 
@@ -418,7 +418,7 @@ void RenderableTrail::render(const RenderData& data, RendererTasks&) {
 #ifdef __APPLE__
         glLineWidth(1);
 #else
-        glLineWidth(ceil((2.f * 1.f + _appearance.lineWidth) * std::sqrt(2.f)));
+        glLineWidth(std::ceil((2.f * 1.f + _appearance.lineWidth) * std::sqrt(2.f)));
 #endif
     }
     if (renderPoints) {
diff --git a/modules/base/rendering/renderabletrailorbit.cpp b/modules/base/rendering/renderabletrailorbit.cpp
index 8fd3bd1993..58b8dd168a 100644
--- a/modules/base/rendering/renderabletrailorbit.cpp
+++ b/modules/base/rendering/renderabletrailorbit.cpp
@@ -354,7 +354,7 @@ RenderableTrailOrbit::UpdateReport RenderableTrailOrbit::updateTrails(
     }
 
     using namespace std::chrono;
-    double periodSeconds = _period * duration_cast<seconds>(hours(24)).count();
+    const double periodSeconds = _period * duration_cast<seconds>(hours(24)).count();
     const double secondsPerPoint = periodSeconds / (_resolution - 1);
     // How much time has passed since the last permanent point
     const double delta = data.time.j2000Seconds() - _lastPointTime;
diff --git a/modules/base/rendering/renderabletrailtrajectory.cpp b/modules/base/rendering/renderabletrailtrajectory.cpp
index 33e2a2159c..fe694d2fac 100644
--- a/modules/base/rendering/renderabletrailtrajectory.cpp
+++ b/modules/base/rendering/renderabletrailtrajectory.cpp
@@ -211,7 +211,7 @@ void RenderableTrailTrajectory::update(const UpdateData& data) {
             // Convert the start and end time from string representations to J2000 seconds
             _start = SpiceManager::ref().ephemerisTimeFromDate(_startTime);
             _end = SpiceManager::ref().ephemerisTimeFromDate(_endTime);
-            double timespan = _end - _start;
+            const double timespan = _end - _start;
 
             _totalSampleInterval = _sampleInterval / _timeStampSubsamplingFactor;
 
@@ -234,9 +234,9 @@ void RenderableTrailTrajectory::update(const UpdateData& data) {
         }
 
         // Calculate sweeping range for this iteration
-        unsigned int startIndex = _sweepIteration * _sweepChunkSize;
-        unsigned int nextIndex = (_sweepIteration + 1) * _sweepChunkSize;
-        unsigned int stopIndex = std::min(nextIndex, _numberOfVertices);
+        const unsigned int startIndex = _sweepIteration * _sweepChunkSize;
+        const unsigned int nextIndex = (_sweepIteration + 1) * _sweepChunkSize;
+        const unsigned int stopIndex = std::min(nextIndex, _numberOfVertices);
 
         // Calculate all vertex positions
         for (unsigned int i = startIndex; i < stopIndex; i++) {
@@ -331,7 +331,7 @@ void RenderableTrailTrajectory::update(const UpdateData& data) {
         ghoul_assert(_primaryRenderInformation.count > 0, "No vertices available");
 
         // Copy the last valid location
-        glm::dvec3 v0(
+        const glm::dvec3 v0 = glm::dvec3(
             _vertexArray[_primaryRenderInformation.count - 1].x,
             _vertexArray[_primaryRenderInformation.count - 1].y,
             _vertexArray[_primaryRenderInformation.count - 1].z
@@ -339,7 +339,7 @@ void RenderableTrailTrajectory::update(const UpdateData& data) {
 
         // And get the current location of the object
         const glm::dvec3 p = _translation->position(data);
-        const glm::dvec3 v1 = { p.x, p.y, p.z };
+        const glm::dvec3 v1 = glm::dvec3(p.x, p.y, p.z);
 
         // Comptue the difference between the points in double precision
         const glm::dvec3 p0 = v0 - v1;
diff --git a/modules/base/rendering/screenspaceframebuffer.cpp b/modules/base/rendering/screenspaceframebuffer.cpp
index e34166e976..81380c5ede 100644
--- a/modules/base/rendering/screenspaceframebuffer.cpp
+++ b/modules/base/rendering/screenspaceframebuffer.cpp
@@ -80,7 +80,7 @@ ScreenSpaceFramebuffer::ScreenSpaceFramebuffer(const ghoul::Dictionary& dictiona
         setGuiName("ScreenSpaceFramebuffer " + std::to_string(iIdentifier));
     }
 
-    glm::vec2 resolution = global::windowDelegate->currentDrawBufferResolution();
+    const glm::vec2 resolution = global::windowDelegate->currentDrawBufferResolution();
     addProperty(_size);
     _size = glm::vec4(0.f, 0.f, resolution.x, resolution.y);
 }
@@ -113,18 +113,18 @@ void ScreenSpaceFramebuffer::render(float blackoutFactor) {
     const float yratio = resolution.y / (size.w - size.y);
 
     if (!_renderFunctions.empty()) {
-        GLint viewport[4];
+        std::array<GLint, 4> viewport;
         //glGetIntegerv(GL_VIEWPORT, viewport);
-        global::renderEngine->openglStateCache().viewport(viewport);
+        global::renderEngine->openglStateCache().viewport(viewport.data());
         glViewport(
             static_cast<GLint>(-size.x * xratio),
             static_cast<GLint>(-size.y * yratio),
             static_cast<GLsizei>(resolution.x * xratio),
             static_cast<GLsizei>(resolution.y * yratio)
         );
-        global::renderEngine->openglStateCache().setViewportState(viewport);
+        global::renderEngine->openglStateCache().setViewportState(viewport.data());
 
-        GLint defaultFBO = ghoul::opengl::FramebufferObject::getActiveObject();
+        const GLint defaultFBO = ghoul::opengl::FramebufferObject::getActiveObject();
         _framebuffer->activate();
 
         glClearColor(0.f, 0.f, 0.f, 0.f);
@@ -173,7 +173,7 @@ void ScreenSpaceFramebuffer::removeAllRenderFunctions() {
 }
 
 void ScreenSpaceFramebuffer::createFramebuffer() {
-    glm::vec2 resolution = global::windowDelegate->currentDrawBufferResolution();
+    const glm::vec2 resolution = global::windowDelegate->currentDrawBufferResolution();
 
     _framebuffer = std::make_unique<ghoul::opengl::FramebufferObject>();
     _framebuffer->activate();
diff --git a/modules/base/rendering/screenspaceimageonline.cpp b/modules/base/rendering/screenspaceimageonline.cpp
index a972aca94d..c804a8fed0 100644
--- a/modules/base/rendering/screenspaceimageonline.cpp
+++ b/modules/base/rendering/screenspaceimageonline.cpp
@@ -105,7 +105,7 @@ void ScreenSpaceImageOnline::update() {
         }
 
         if (_imageFuture.valid() && DownloadManager::futureReady(_imageFuture)) {
-            DownloadManager::MemoryFile imageFile = _imageFuture.get();
+            const DownloadManager::MemoryFile imageFile = _imageFuture.get();
 
             if (imageFile.corrupted) {
                 LERRORC(
diff --git a/modules/base/rotation/constantrotation.cpp b/modules/base/rotation/constantrotation.cpp
index 9a33d17c59..fb965c088c 100644
--- a/modules/base/rotation/constantrotation.cpp
+++ b/modules/base/rotation/constantrotation.cpp
@@ -102,7 +102,7 @@ glm::dmat3 ConstantRotation::matrix(const UpdateData& data) const {
         _accumulatedRotation += glm::tau<double>();
     }
 
-    glm::dquat q = glm::angleAxis(_accumulatedRotation, _rotationAxis.value());
+    const glm::dquat q = glm::angleAxis(_accumulatedRotation, _rotationAxis.value());
     return glm::toMat3(q);
 }
 
diff --git a/modules/base/rotation/fixedrotation.cpp b/modules/base/rotation/fixedrotation.cpp
index fc083d8eca..d546486fa2 100644
--- a/modules/base/rotation/fixedrotation.cpp
+++ b/modules/base/rotation/fixedrotation.cpp
@@ -294,6 +294,7 @@ FixedRotation::FixedRotation(const ghoul::Dictionary& dictionary)
         nullptr
     }
     , _attachedObject(AttachedInfo, "")
+    , _constructorDictionary(dictionary)
 {
     // We check the Dictionary here in order to detect the errors early
     codegen::bake<Parameters>(dictionary);
@@ -304,8 +305,6 @@ FixedRotation::FixedRotation(const ghoul::Dictionary& dictionary)
         "FixedRotation"
     );
 
-    _constructorDictionary = dictionary;
-
     setPropertyGroupName("global", "Global");
     setPropertyGroupName("xAxis", "X Axis");
     setPropertyGroupName("yAxis", "Y Axis");
@@ -501,7 +500,7 @@ bool FixedRotation::initialize() {
 }
 
 void FixedRotation::update(const UpdateData& data) {
-    bool anyAxisIsObjectType = (
+    const bool anyAxisIsObjectType = (
         _xAxis.type == Axis::Type::Object ||
         _yAxis.type == Axis::Type::Object ||
         _zAxis.type == Axis::Type::Object
@@ -561,7 +560,7 @@ glm::vec3 FixedRotation::xAxis() const {
                 if (dir == glm::dvec3(0.0)) {
                     dir = glm::dvec3(1.0, 0.0, 0.0);
                 }
-                glm::vec3 dirNorm = glm::vec3(glm::normalize(dir));
+                const glm::vec3 dirNorm = glm::vec3(glm::normalize(dir));
                 return _xAxis.invertObject ? -dirNorm : dirNorm;
             }
             else {
@@ -613,7 +612,7 @@ glm::vec3 FixedRotation::yAxis() const {
             return glm::vec3(0.f, 1.f, 0.f);
         case Axis::Type::Object:
             if (_yAxis.node && _attachedNode) {
-                glm::vec3 dir = glm::vec3(glm::normalize(
+                const glm::vec3 dir = glm::vec3(glm::normalize(
                     // @TODO(abock): This should be changed to be in the coordinate system
                     // of the attached node // same with xAxis and zAxis ofc
                     _yAxis.node->worldPosition() - _attachedNode->worldPosition()
@@ -669,7 +668,7 @@ glm::vec3 FixedRotation::zAxis() const {
             return glm::vec3(0.f, 0.f, 1.f);
         case Axis::Type::Object:
             if (_zAxis.node && _attachedNode) {
-                glm::vec3 dir = glm::vec3(glm::normalize(
+                const glm::vec3 dir = glm::vec3(glm::normalize(
                     _zAxis.node->worldPosition() - _attachedNode->worldPosition()
                 ));
                 return _zAxis.invertObject ? -dir : dir;
diff --git a/modules/base/rotation/luarotation.cpp b/modules/base/rotation/luarotation.cpp
index 7815131c9a..cfcad65f20 100644
--- a/modules/base/rotation/luarotation.cpp
+++ b/modules/base/rotation/luarotation.cpp
@@ -108,7 +108,7 @@ glm::dmat3 LuaRotation::matrix(const UpdateData& data) const {
     ghoul::lua::push(_state, duration_cast<milliseconds>(now.time_since_epoch()).count());
 
     // Execute the scaling function
-    int success = lua_pcall(_state, 2, 9, 0);
+    const int success = lua_pcall(_state, 2, 9, 0);
     if (success != 0) {
         LERRORC(
             "LuaScale",
@@ -116,12 +116,12 @@ glm::dmat3 LuaRotation::matrix(const UpdateData& data) const {
         );
     }
 
-    double values[9];
+    std::array<double, 9> values;
     for (int i = 0; i < 9; i++) {
         values[i] = luaL_checknumber(_state, -1 - i);
     }
 
-    return glm::make_mat3(values);
+    return glm::make_mat3(values.data());
 }
 
 } // namespace openspace
diff --git a/modules/base/rotation/staticrotation.cpp b/modules/base/rotation/staticrotation.cpp
index fbe008f3ce..bf4ed3a55d 100644
--- a/modules/base/rotation/staticrotation.cpp
+++ b/modules/base/rotation/staticrotation.cpp
@@ -42,7 +42,7 @@ namespace {
     // Inspired by: https://www.learnopencv.com/rotation-matrix-to-euler-angles/
     glm::dvec3 rotationMatrixToEulerAngles(glm::dmat4 mat) {
         const double sy = glm::sqrt(mat[0][0] * mat[0][0] + mat[0][1] * mat[0][1]);
-        bool singular = sy < 1e-6;
+        const bool singular = (sy < 1e-6);
 
         glm::dvec3 res;
         if (singular) {
@@ -95,7 +95,7 @@ StaticRotation::StaticRotation(const ghoul::Dictionary& dictionary) : StaticRota
         _eulerRotation = std::get<glm::dvec3>(p.rotation);
     }
     else if (std::holds_alternative<glm::dvec4>(p.rotation)) {
-        glm::dvec4 data = std::get<glm::dvec4>(p.rotation);
+        const glm::dvec4 data = std::get<glm::dvec4>(p.rotation);
         _eulerRotation = rotationMatrixToEulerAngles(
             glm::mat3_cast(glm::dquat(data.w, data.x, data.y, data.z))
         );
diff --git a/modules/base/timeframe/timeframeunion.cpp b/modules/base/timeframe/timeframeunion.cpp
index 367155a8e9..de9335ab76 100644
--- a/modules/base/timeframe/timeframeunion.cpp
+++ b/modules/base/timeframe/timeframeunion.cpp
@@ -63,18 +63,16 @@ bool TimeFrameUnion::isActive(const Time& time) const {
     return false;
 }
 
-TimeFrameUnion::TimeFrameUnion(const ghoul::Dictionary& dictionary)
-    : TimeFrame()
-{
+TimeFrameUnion::TimeFrameUnion(const ghoul::Dictionary& dictionary) {
     // I don't know how we can actually help the reference attribute properly. Since the
     // Parameter list only contains the monostate, there is no need to actually create
     // the object here
     codegen::bake<Parameters>(dictionary);
 
-    ghoul::Dictionary frames =
+    const ghoul::Dictionary frames =
         dictionary.value<ghoul::Dictionary>(TimeFramesInfo.identifier);
 
-    for (std::string_view k : frames.keys()) {
+    for (const std::string_view k : frames.keys()) {
         const ghoul::Dictionary& subDictionary = frames.value<ghoul::Dictionary>(k);
         _timeFrames.push_back(TimeFrame::createFromDictionary(subDictionary));
         TimeFrame& subFrame = *_timeFrames.back();
diff --git a/modules/base/translation/luatranslation.cpp b/modules/base/translation/luatranslation.cpp
index bdafa4b592..7a790c4a03 100644
--- a/modules/base/translation/luatranslation.cpp
+++ b/modules/base/translation/luatranslation.cpp
@@ -119,12 +119,11 @@ glm::dvec3 LuaTranslation::position(const UpdateData& data) const {
         );
     }
 
-    double values[3];
+    glm::vec3 values;
     for (int i = 1; i <= 3; i++) {
         values[i - 1] = ghoul::lua::value<double>(_state, i);
     }
-
-    return glm::make_vec3(values);
+    return values;
 }
 
 } // namespace openspace
diff --git a/modules/cefwebgui/cefwebguimodule.cpp b/modules/cefwebgui/cefwebguimodule.cpp
index c40b798489..30c9023f79 100644
--- a/modules/cefwebgui/cefwebguimodule.cpp
+++ b/modules/cefwebgui/cefwebguimodule.cpp
@@ -140,8 +140,7 @@ void CefWebGuiModule::internalInitialize(const ghoul::Dictionary& configuration)
     WebBrowserModule* webBrowserModule =
         global::moduleEngine->module<WebBrowserModule>();
 
-    bool available = webBrowserModule && webBrowserModule->isEnabled();
-
+    const bool available = webBrowserModule && webBrowserModule->isEnabled();
     if (!available) {
         return;
     }
@@ -232,7 +231,7 @@ void CefWebGuiModule::internalInitialize(const ghoul::Dictionary& configuration)
 
         if (isGuiWindow && isMaster && _instance) {
             if (global::windowDelegate->windowHasResized() || _instance->_shouldReshape) {
-                glm::ivec2 csws = global::windowDelegate->guiWindowResolution();
+                const glm::ivec2 csws = global::windowDelegate->guiWindowResolution();
                 _instance->reshape(static_cast<glm::ivec2>(
                     static_cast<glm::vec2>(csws) * global::windowDelegate->dpiScaling()
                 ));
diff --git a/modules/cefwebgui/src/guirenderhandler.cpp b/modules/cefwebgui/src/guirenderhandler.cpp
index e13f66c8d1..4853fcc30a 100644
--- a/modules/cefwebgui/src/guirenderhandler.cpp
+++ b/modules/cefwebgui/src/guirenderhandler.cpp
@@ -43,11 +43,11 @@ GUIRenderHandler::GUIRenderHandler() {
         absPath("${MODULE_CEFWEBGUI}/shaders/gui_vs.glsl"),
         absPath("${MODULE_CEFWEBGUI}/shaders/gui_fs.glsl")
     );
-    float data[] = {
-        -1.0f, -1.0f, -1.0f,
-         1.0f,  1.0f, -1.0f,
-         1.0f, -1.0f, -1.0f,
-         1.0f,  1.0f,  1.0f
+    constexpr std::array<float, 12> Vtx = {
+        -1.f, -1.f, -1.f,
+         1.f,  1.f, -1.f,
+         1.f, -1.f, -1.f,
+         1.f,  1.f,  1.f
     };
 
     glGenVertexArrays(1, &_vao);
@@ -55,7 +55,7 @@ GUIRenderHandler::GUIRenderHandler() {
     glGenBuffers(1, &_vbo);
     glGenTextures(1, &_texture);
     glBindBuffer(GL_ARRAY_BUFFER, _vbo);
-    glBufferData(GL_ARRAY_BUFFER, sizeof(data), data, GL_STATIC_DRAW);
+    glBufferData(GL_ARRAY_BUFFER, Vtx.size() * sizeof(float), Vtx.data(), GL_STATIC_DRAW);
     glEnableVertexAttribArray(0);
     glVertexAttribPointer(0, 2, GL_FLOAT, GL_FALSE, 2 * sizeof(GLfloat), nullptr);
     glBindVertexArray(0);
diff --git a/modules/debugging/rendering/debugrenderer.cpp b/modules/debugging/rendering/debugrenderer.cpp
index 366682d8b2..6b48b6b2f3 100644
--- a/modules/debugging/rendering/debugrenderer.cpp
+++ b/modules/debugging/rendering/debugrenderer.cpp
@@ -73,12 +73,12 @@ void DebugRenderer::renderVertices(const Vertices& clippingSpacePoints, GLenum m
     }
 
     // Generate a vao, vertex array object (keeping track of pointers to vbo)
-    GLuint _vaoID;
+    GLuint _vaoID = 0;
     glGenVertexArrays(1, &_vaoID);
     ghoul_assert(_vaoID != 0, "Could not generate vertex arrays");
 
     // Generate a vbo, vertex buffer object (storeing actual data)
-    GLuint _vertexBufferID;
+    GLuint _vertexBufferID = 0;
     glGenBuffers(1, &_vertexBufferID);
     ghoul_assert(_vertexBufferID != 0, "Could not create vertex buffer");
 
@@ -91,7 +91,7 @@ void DebugRenderer::renderVertices(const Vertices& clippingSpacePoints, GLenum m
     glBufferData(
         GL_ARRAY_BUFFER,
         clippingSpacePoints.size() * sizeof(clippingSpacePoints[0]),
-        &clippingSpacePoints[0],
+        clippingSpacePoints.data(),
         GL_STATIC_DRAW);
 
 
diff --git a/modules/digitaluniverse/rendering/renderabledumeshes.cpp b/modules/digitaluniverse/rendering/renderabledumeshes.cpp
index 94ac450298..13e99aa896 100644
--- a/modules/digitaluniverse/rendering/renderabledumeshes.cpp
+++ b/modules/digitaluniverse/rendering/renderabledumeshes.cpp
@@ -203,7 +203,6 @@ RenderableDUMeshes::RenderableDUMeshes(const ghoul::Dictionary& dictionary)
     addProperty(Fadeable::_opacity);
 
     _speckFile = absPath(p.file).string();
-    _hasSpeckFile = true;
     _drawElements.onChange([this]() { _hasSpeckFile = !_hasSpeckFile; });
     addProperty(_drawElements);
 
@@ -267,7 +266,7 @@ bool RenderableDUMeshes::isReady() const {
 }
 
 void RenderableDUMeshes::initialize() {
-    bool success = loadData();
+    const bool success = loadData();
     if (!success) {
         throw ghoul::RuntimeError("Error loading data");
     }
@@ -368,22 +367,23 @@ void RenderableDUMeshes::renderLabels(const RenderData& data,
                                       const glm::vec3& orthoRight,
                                       const glm::vec3& orthoUp)
 {
-    float scale = static_cast<float>(toMeter(_unit));
+    const float scale = static_cast<float>(toMeter(_unit));
 
-    ghoul::fontrendering::FontRenderer::ProjectedLabelsInformation labelInfo;
-    labelInfo.orthoRight = orthoRight;
-    labelInfo.orthoUp = orthoUp;
-    labelInfo.minSize = _textMinMaxSize.value().x;
-    labelInfo.maxSize = _textMinMaxSize.value().y;
-    labelInfo.cameraPos = data.camera.positionVec3();
-    labelInfo.cameraLookUp = data.camera.lookUpVectorWorldSpace();
-    labelInfo.renderType = _renderOption;
-    labelInfo.mvpMatrix = modelViewProjectionMatrix;
-    labelInfo.scale = pow(10.f, _textSize);
-    labelInfo.enableDepth = true;
-    labelInfo.enableFalseDepth = false;
+    const ghoul::fontrendering::FontRenderer::ProjectedLabelsInformation labelInfo = {
+        .enableDepth = true,
+        .enableFalseDepth = false,
+        .scale = std::pow(10.f, _textSize),
+        .renderType = _renderOption,
+        .minSize = _textMinMaxSize.value().x,
+        .maxSize = _textMinMaxSize.value().y,
+        .mvpMatrix = modelViewProjectionMatrix,
+        .orthoRight = orthoRight,
+        .orthoUp = orthoUp,
+        .cameraPos = data.camera.positionVec3(),
+        .cameraLookUp = data.camera.lookUpVectorWorldSpace()
+    };
 
-    glm::vec4 textColor = glm::vec4(glm::vec3(_textColor), _textOpacity);
+    const glm::vec4 textColor = glm::vec4(glm::vec3(_textColor), _textOpacity);
 
     for (const dataloader::Labelset::Entry& e : _labelset.entries) {
         glm::vec3 scaledPos(e.position);
@@ -415,14 +415,14 @@ void RenderableDUMeshes::render(const RenderData& data, RendererTasks&) {
 
     const glm::dmat4 worldToModelTransform = glm::inverse(modelMatrix);
     glm::vec3 orthoRight = glm::normalize(
-        glm::vec3(worldToModelTransform * glm::vec4(right, 0.0))
+        glm::vec3(worldToModelTransform * glm::vec4(right, 0.f))
     );
 
     if (orthoRight == glm::vec3(0.0)) {
-        glm::vec3 otherVector(lookup.y, lookup.x, lookup.z);
+        const glm::vec3 otherVector = glm::vec3(lookup.y, lookup.x, lookup.z);
         right = glm::cross(viewDirection, otherVector);
         orthoRight = glm::normalize(
-            glm::vec3(worldToModelTransform * glm::vec4(right, 0.0))
+            glm::vec3(worldToModelTransform * glm::vec4(right, 0.f))
         );
     }
 
@@ -455,7 +455,7 @@ bool RenderableDUMeshes::loadData() {
         }
     }
 
-    std::string labelFile = _labelFile;
+    const std::string labelFile = _labelFile;
     if (!labelFile.empty()) {
         _labelset = dataloader::label::loadFileWithCache(_labelFile);
     }
@@ -496,7 +496,7 @@ bool RenderableDUMeshes::readSpeckFile() {
             continue;
         }
 
-        std::size_t found = line.find("mesh");
+        const size_t found = line.find("mesh");
         if (found == std::string::npos) {
             continue;
         }
@@ -562,15 +562,15 @@ bool RenderableDUMeshes::readSpeckFile() {
                 glm::vec3 pos;
                 bool success = true;
                 for (int i = 0; i < 3; i++) {
-                    GLfloat value;
+                    GLfloat value = 0.f;
                     lineData >> value;
-                    bool errorReading = lineData.rdstate() & std::ifstream::failbit;
+                    const bool errorReading = lineData.rdstate() & std::ifstream::failbit;
                     if (errorReading) {
                         success = false;
                         break;
                     }
 
-                    GLfloat scaledValue = value * scale;
+                    const GLfloat scaledValue = value * scale;
                     pos[i] = scaledValue;
                     mesh.vertices.push_back(scaledValue);
                 }
@@ -625,11 +625,11 @@ void RenderableDUMeshes::createMeshes() {
 
     for (std::pair<const int, RenderingMesh>& p : _renderingMeshesMap) {
         for (int i = 0; i < p.second.numU; i++) {
-            GLuint vao;
+            GLuint vao = 0;
             glGenVertexArrays(1, &vao);
             p.second.vaoArray.push_back(vao);
 
-            GLuint vbo;
+            GLuint vbo = 0;
             glGenBuffers(1, &vbo);
             p.second.vboArray.push_back(vbo);
 
@@ -639,7 +639,7 @@ void RenderableDUMeshes::createMeshes() {
             glBufferData(
                 GL_ARRAY_BUFFER,
                 p.second.vertices.size() * sizeof(GLfloat),
-                &p.second.vertices[0],
+                p.second.vertices.data(),
                 GL_STATIC_DRAW
             );
             // in_position
@@ -684,11 +684,11 @@ void RenderableDUMeshes::createMeshes() {
         // Grid: we need columns
         if (p.second.numU > 1) {
             for (int i = 0; i < p.second.numV; i++) {
-                GLuint cvao;
+                GLuint cvao = 0;
                 glGenVertexArrays(1, &cvao);
                 p.second.vaoArray.push_back(cvao);
 
-                GLuint cvbo;
+                GLuint cvbo = 0;
                 glGenBuffers(1, &cvbo);
                 p.second.vboArray.push_back(cvbo);
 
@@ -697,7 +697,7 @@ void RenderableDUMeshes::createMeshes() {
                 glBufferData(
                     GL_ARRAY_BUFFER,
                     p.second.vertices.size() * sizeof(GLfloat),
-                    &p.second.vertices[0],
+                    p.second.vertices.data(),
                     GL_STATIC_DRAW
                 );
                 // in_position
diff --git a/modules/digitaluniverse/rendering/renderabledumeshes.h b/modules/digitaluniverse/rendering/renderabledumeshes.h
index 9204a87f51..d24962ffa9 100644
--- a/modules/digitaluniverse/rendering/renderabledumeshes.h
+++ b/modules/digitaluniverse/rendering/renderabledumeshes.h
@@ -103,7 +103,7 @@ private:
     bool loadData();
     bool readSpeckFile();
 
-    bool _hasSpeckFile = false;
+    bool _hasSpeckFile = true;
     bool _dataIsDirty = true;
     bool _textColorIsDirty = true;
     bool _hasLabel = false;
diff --git a/modules/exoplanets/exoplanetshelper.cpp b/modules/exoplanets/exoplanetshelper.cpp
index 75b9ad87b1..120c9571b4 100644
--- a/modules/exoplanets/exoplanetshelper.cpp
+++ b/modules/exoplanets/exoplanetshelper.cpp
@@ -48,11 +48,11 @@ bool isValidPosition(const glm::vec3& pos) {
 }
 
 bool hasSufficientData(const ExoplanetDataEntry& p) {
-    const glm::vec3 starPosition{ p.positionX , p.positionY, p.positionZ };
+    const glm::vec3 starPosition = glm::vec3(p.positionX, p.positionY, p.positionZ);
 
-    bool validStarPosition = isValidPosition(starPosition);
-    bool hasSemiMajorAxis = !std::isnan(p.a);
-    bool hasOrbitalPeriod = !std::isnan(p.per);
+    const bool validStarPosition = isValidPosition(starPosition);
+    const bool hasSemiMajorAxis = !std::isnan(p.a);
+    const bool hasOrbitalPeriod = !std::isnan(p.per);
 
     return validStarPosition && hasSemiMajorAxis && hasOrbitalPeriod;
 }
@@ -81,7 +81,7 @@ glm::vec3 computeStarColor(float bv) {
 
     // The first line is the width of the image, i.e number of values
     std::istringstream ss(line);
-    int nValues;
+    int nValues = 0;
     ss >> nValues;
 
     // Find the line matching the input B-V value (B-V is in [-0.4,2.0])
@@ -90,13 +90,11 @@ glm::vec3 computeStarColor(float bv) {
     for (int i = 0; i < t + 1; i++) {
         std::getline(colorMap, color);
     }
-    colorMap.close();
 
     std::istringstream colorStream(color);
-    float r, g, b;
-    colorStream >> r >> g >> b;
-
-    return glm::vec3(r, g, b);
+    glm::vec3 rgb;
+    colorStream >> rgb.r >> rgb.g >> rgb.b;
+    return rgb;
 }
 
 glm::dmat4 computeOrbitPlaneRotationMatrix(float i, float bigom, float omega) {
@@ -117,7 +115,7 @@ glm::dmat4 computeOrbitPlaneRotationMatrix(float i, float bigom, float omega) {
     return orbitPlaneRotation;
 }
 
-glm::dmat3 computeSystemRotation(glm::dvec3 starPosition) {
+glm::dmat3 computeSystemRotation(const glm::dvec3& starPosition) {
     const glm::dvec3 sunPosition = glm::dvec3(0.0, 0.0, 0.0);
     const glm::dvec3 starToSunVec = glm::normalize(sunPosition - starPosition);
     const glm::dvec3 galacticNorth = glm::dvec3(0.0, 0.0, 1.0);
@@ -135,7 +133,7 @@ glm::dmat3 computeSystemRotation(glm::dvec3 starPosition) {
         celestialNorth,
         starToSunVec
     ));
-    glm::dvec3 northProjected = glm::normalize(
+    const glm::dvec3 northProjected = glm::normalize(
         celestialNorth - (celestialAngle / glm::length(starToSunVec)) * starToSunVec
     );
 
diff --git a/modules/exoplanets/exoplanetshelper.h b/modules/exoplanets/exoplanetshelper.h
index f08f4746b1..9af3a0c0d4 100644
--- a/modules/exoplanets/exoplanetshelper.h
+++ b/modules/exoplanets/exoplanetshelper.h
@@ -164,7 +164,7 @@ glm::dmat4 computeOrbitPlaneRotationMatrix(float i, float bigom = 180.f,
  * Rotate the original coordinate system (where x is pointing to First Point of Aries) so
  * that x is pointing from star to the Sun.
  */
-glm::dmat3 computeSystemRotation(glm::dvec3 starPosition);
+glm::dmat3 computeSystemRotation(const glm::dvec3& starPosition);
 
 void sanitizeNameString(std::string& s);
 
diff --git a/modules/exoplanets/tasks/exoplanetsdatapreparationtask.cpp b/modules/exoplanets/tasks/exoplanetsdatapreparationtask.cpp
index 9508df954d..d43faba2da 100644
--- a/modules/exoplanets/tasks/exoplanetsdatapreparationtask.cpp
+++ b/modules/exoplanets/tasks/exoplanetsdatapreparationtask.cpp
@@ -141,7 +141,7 @@ void ExoplanetsDataPreparationTask::perform(
 
     // Read until the first line contaning the column names, and save them for
     // later access
-    std::vector<std::string> columnNames = readFirstDataRow(inputDataFile);
+    const std::vector<std::string> columnNames = readFirstDataRow(inputDataFile);
 
     // Read total number of items
     int total = 0;
@@ -171,9 +171,9 @@ void ExoplanetsDataPreparationTask::perform(
         );
 
         // Create look-up table
-        long pos = static_cast<long>(binFile.tellp());
-        std::string planetName = planetData.host + " " + planetData.component;
-        lutFile << planetName << "," << pos << std::endl;
+        const long pos = static_cast<long>(binFile.tellp());
+        const std::string planetName = planetData.host + " " + planetData.component;
+        lutFile << planetName << "," << pos << '\n';
 
         binFile.write(
             reinterpret_cast<char*>(&planetData.dataEntry),
@@ -191,7 +191,7 @@ ExoplanetsDataPreparationTask::readFirstDataRow(std::ifstream& file)
 
     // Read past any comments and empty lines
     while (std::getline(file, line)) {
-        bool shouldSkip = line.empty() || line[0] == '#';
+        const bool shouldSkip = line.empty() || line[0] == '#';
         if (!shouldSkip) {
             break;
         }
@@ -209,10 +209,10 @@ ExoplanetsDataPreparationTask::readFirstDataRow(std::ifstream& file)
 }
 
 ExoplanetsDataPreparationTask::PlanetData
-ExoplanetsDataPreparationTask::parseDataRow(std::string row,
+ExoplanetsDataPreparationTask::parseDataRow(const std::string& row,
                                             const std::vector<std::string>& columnNames,
-                                            std::filesystem::path positionSourceFile,
-                                          std::filesystem::path bvFromTeffConversionFile)
+                                          const std::filesystem::path& positionSourceFile,
+                                    const std::filesystem::path& bvFromTeffConversionFile)
 {
     auto readFloatData = [](const std::string& str) -> float {
 #ifdef WIN32
@@ -224,7 +224,7 @@ ExoplanetsDataPreparationTask::parseDataRow(std::string row,
         return std::numeric_limits<float>::quiet_NaN();
 #else
         // clang is missing float support for std::from_chars
-        return !str.empty() ? std::stof(str.c_str(), nullptr) : NAN;
+        return !str.empty() ? std::stof(str, nullptr) : NAN;
 #endif
 };
 
@@ -238,12 +238,12 @@ ExoplanetsDataPreparationTask::parseDataRow(std::string row,
         return std::numeric_limits<double>::quiet_NaN();
 #else
         // clang is missing double support for std::from_chars
-        return !str.empty() ? std::stod(str.c_str(), nullptr) : NAN;
+        return !str.empty() ? std::stod(str, nullptr) : NAN;
 #endif
     };
 
     auto readIntegerData = [](const std::string& str) -> int {
-        int result;
+        int result = 0;
         auto [p, ec] = std::from_chars(str.data(), str.data() + str.size(), result);
         if (ec == std::errc()) {
             return result;
@@ -391,15 +391,15 @@ ExoplanetsDataPreparationTask::parseDataRow(std::string row,
         }
         // Star luminosity
         else if (column == "st_lum") {
-            float dataInLogSolar = readFloatData(data);
+            const float dataInLogSolar = readFloatData(data);
             p.luminosity = static_cast<float>(std::pow(10, dataInLogSolar));
         }
         else if (column == "st_lumerr1") {
-            float dataInLogSolar = readFloatData(data);
+            const float dataInLogSolar = readFloatData(data);
             p.luminosityUpper = static_cast<float>(std::pow(10, dataInLogSolar));
         }
         else if (column == "st_lumerr2") {
-            float dataInLogSolar = readFloatData(data);
+            const float dataInLogSolar = readFloatData(data);
             p.luminosityLower = static_cast<float>(-std::pow(10, dataInLogSolar));
         }
         // Is the planet orbiting a binary system?
@@ -422,12 +422,12 @@ ExoplanetsDataPreparationTask::parseDataRow(std::string row,
     p.bigOmegaUpper = std::numeric_limits<float>::quiet_NaN();
     p.bigOmegaLower = std::numeric_limits<float>::quiet_NaN();
 
-    bool foundPositionFromSpeck = !std::isnan(p.positionX);
-    bool hasDistance = !std::isnan(distanceInParsec);
-    bool hasIcrsCoords = !std::isnan(ra) && !std::isnan(dec) && hasDistance;
+    const bool foundPositionFromSpeck = !std::isnan(p.positionX);
+    const bool hasDistance = !std::isnan(distanceInParsec);
+    const bool hasIcrsCoords = !std::isnan(ra) && !std::isnan(dec) && hasDistance;
 
     if (!foundPositionFromSpeck && hasIcrsCoords) {
-        glm::dvec3 pos = icrsToGalacticCartesian(ra, dec, distanceInParsec);
+        const glm::dvec3 pos = icrsToGalacticCartesian(ra, dec, distanceInParsec);
         p.positionX = static_cast<float>(pos.x);
         p.positionY = static_cast<float>(pos.y);
         p.positionZ = static_cast<float>(pos.z);
@@ -458,7 +458,7 @@ glm::vec3 ExoplanetsDataPreparationTask::starPosition(const std::string& starNam
 
     std::string line;
     while (std::getline(exoplanetsFile, line)) {
-        bool shouldSkipLine = (
+        const bool shouldSkipLine = (
             line.empty() || line[0] == '#' || line.substr(0, 7) == "datavar" ||
             line.substr(0, 10) == "texturevar" || line.substr(0, 7) == "texture"
         );
@@ -478,11 +478,11 @@ glm::vec3 ExoplanetsDataPreparationTask::starPosition(const std::string& starNam
         if (name == starName) {
             std::stringstream dataStream(data);
             std::getline(dataStream, coord, ' ');
-            position[0] = std::stof(coord.c_str(), nullptr);
+            position[0] = std::stof(coord, nullptr);
             std::getline(dataStream, coord, ' ');
-            position[1] = std::stof(coord.c_str(), nullptr);
+            position[1] = std::stof(coord, nullptr);
             std::getline(dataStream, coord, ' ');
-            position[2] = std::stof(coord.c_str(), nullptr);
+            position[2] = std::stof(coord, nullptr);
             break;
         }
     }
@@ -509,7 +509,7 @@ float ExoplanetsDataPreparationTask::bvFromTeff(float teff,
     float bvUpper = 0.f;
     float bvLower = 0.f;
     float teffLower = 0.f;
-    float teffUpper;
+    float teffUpper = 0.f;
     std::string row;
     while (std::getline(teffToBvFile, row)) {
         std::istringstream lineStream(row);
@@ -518,8 +518,8 @@ float ExoplanetsDataPreparationTask::bvFromTeff(float teff,
         std::string bvString;
         std::getline(lineStream, bvString);
 
-        float teffCurrent = std::stof(teffString.c_str(), nullptr);
-        float bvCurrent = std::stof(bvString.c_str(), nullptr);
+        const float teffCurrent = std::stof(teffString, nullptr);
+        const float bvCurrent = std::stof(bvString, nullptr);
 
         if (teff > teffCurrent) {
             teffLower = teffCurrent;
@@ -532,8 +532,8 @@ float ExoplanetsDataPreparationTask::bvFromTeff(float teff,
                 bv = 2.f;
             }
             else {
-                float bvDiff = (bvUpper - bvLower);
-                float teffDiff = (teffUpper - teffLower);
+                const float bvDiff = (bvUpper - bvLower);
+                const float teffDiff = (teffUpper - teffLower);
                 bv = ((bvDiff * (teff - teffLower)) / teffDiff) + bvLower;
             }
             break;
diff --git a/modules/exoplanets/tasks/exoplanetsdatapreparationtask.h b/modules/exoplanets/tasks/exoplanetsdatapreparationtask.h
index d604472fb1..2a0fc765e6 100644
--- a/modules/exoplanets/tasks/exoplanetsdatapreparationtask.h
+++ b/modules/exoplanets/tasks/exoplanetsdatapreparationtask.h
@@ -77,10 +77,10 @@ public:
      *
      * /sa https://exoplanetarchive.ipac.caltech.edu/
      */
-    static PlanetData parseDataRow(std::string row,
+    static PlanetData parseDataRow(const std::string& row,
         const std::vector<std::string>& columnNames,
-        std::filesystem::path positionSourceFile,
-        std::filesystem::path bvFromTeffConversionFile);
+        const std::filesystem::path& positionSourceFile,
+        const std::filesystem::path& bvFromTeffConversionFile);
 
 private:
     std::filesystem::path _inputDataPath;
diff --git a/modules/fitsfilereader/include/fitsfilereader.h b/modules/fitsfilereader/include/fitsfilereader.h
index 3875cf27c6..0b2e2ae086 100644
--- a/modules/fitsfilereader/include/fitsfilereader.h
+++ b/modules/fitsfilereader/include/fitsfilereader.h
@@ -106,9 +106,10 @@ private:
 
     bool isPrimaryHDU();
     template<typename T>
-    const std::shared_ptr<ImageData<T>> readImageInternal(CCfits::PHDU& image);
+    std::shared_ptr<ImageData<T>> readImageInternal(CCfits::PHDU& image);
+
     template<typename T>
-    const std::shared_ptr<ImageData<T>> readImageInternal(CCfits::ExtHDU& image);
+    std::shared_ptr<ImageData<T>> readImageInternal(CCfits::ExtHDU& image);
 
     mutable std::mutex _mutex;
 };
diff --git a/modules/fitsfilereader/src/fitsfilereader.cpp b/modules/fitsfilereader/src/fitsfilereader.cpp
index e11aecfb65..ec5260afd3 100644
--- a/modules/fitsfilereader/src/fitsfilereader.cpp
+++ b/modules/fitsfilereader/src/fitsfilereader.cpp
@@ -52,8 +52,9 @@ namespace {
 
 namespace openspace {
 
-FitsFileReader::FitsFileReader(bool verboseMode) {
-    _verboseMode = verboseMode;
+FitsFileReader::FitsFileReader(bool verboseMode)
+    : _verboseMode(verboseMode)
+{
     FITS::setVerboseMode(_verboseMode);
 }
 
@@ -146,20 +147,20 @@ std::shared_ptr<TableData<T>> FitsFileReader::readTable(const std::filesystem::p
 {
     // We need to lock reading when using multithreads because CCfits can't handle
     // multiple I/O drivers.
-    std::lock_guard g(_mutex);
+    const std::lock_guard g(_mutex);
 
     try {
         _infile = std::make_unique<FITS>(path.string(), Read, readAll);
 
         // Make sure FITS file is not a Primary HDU Object (aka an image).
         if (!isPrimaryHDU()) {
-            ExtHDU& table = _infile->extension(hduIdx);
-            int numCols = static_cast<int>(columnNames.size());
-            int numRowsInTable = static_cast<int>(table.rows());
+            const ExtHDU& table = _infile->extension(hduIdx);
+            const int numCols = static_cast<int>(columnNames.size());
+            const int numRowsInTable = static_cast<int>(table.rows());
             std::unordered_map<string, std::vector<T>> contents;
             //LINFO("Read file: " + _infile->name());
 
-            int firstRow = std::max(startRow, 1);
+            const int firstRow = std::max(startRow, 1);
 
             if (endRow < firstRow) {
                 endRow = numRowsInTable;
@@ -180,7 +181,7 @@ std::shared_ptr<TableData<T>> FitsFileReader::readTable(const std::filesystem::p
                 .name = table.name()
             };
 
-            return std::make_shared<TableData<T>>(loadedTable);
+            return std::make_shared<TableData<T>>(std::move(loadedTable));
         }
     }
     catch (FitsException& e) {
@@ -238,8 +239,8 @@ std::vector<float> FitsFileReader::readFitsFile(std::filesystem::path filePath,
     }
     LINFO(allNames);
 
-    // Read columns from FITS file. If rows aren't specified then full table will be read.
-    std::shared_ptr<TableData<float>> table = readTable<float>(
+    // Read columns from FITS file. If rows aren't specified then full table will be read
+    const std::shared_ptr<TableData<float>> table = readTable<float>(
         filePath,
         allColumnNames,
         firstRow,
@@ -253,19 +254,19 @@ std::vector<float> FitsFileReader::readFitsFile(std::filesystem::path filePath,
     int nStars = table->readRows - firstRow + 1;
 
     int nNullArr = 0;
-    int nColumnsRead = static_cast<int>(allColumnNames.size());
-    int defaultCols = 17; // Number of columns that are copied by predefined code.
+    const int nColumnsRead = static_cast<int>(allColumnNames.size());
+    const int defaultCols = 17; // Number of columns that are copied by predefined code
     if (nColumnsRead != defaultCols) {
         LINFO("Additional columns will be read! Consider add column in code for "
             "significant speedup");
     }
     // Declare how many values to save per star
-    nValuesPerStar = nColumnsRead + 1; // +1 for B-V color value.
+    nValuesPerStar = nColumnsRead + 1; // +1 for B-V color value
 
-    // Copy columns to local variables.
+    // Copy columns to local variables
     std::unordered_map<std::string, std::vector<float>>& tableContent = table->contents;
 
-    // Default render parameters!
+    // Default render parameters
     std::vector<float> posXcol = std::move(tableContent[allColumnNames[0]]);
     std::vector<float> posYcol = std::move(tableContent[allColumnNames[1]]);
     std::vector<float> posZcol = std::move(tableContent[allColumnNames[2]]);
@@ -543,7 +544,7 @@ std::vector<float> FitsFileReader::readSpeckFile(const std::filesystem::path& fi
     // (signaled by the keywords 'datavar', 'texturevar', 'texture' and 'maxcomment')
     std::string line;
     while (true) {
-        std::streampos position = fileStream.tellg();
+        const std::streampos position = fileStream.tellg();
         std::getline(fileStream, line);
 
         if (line.empty() || line[0] == '#') {
@@ -607,8 +608,8 @@ std::vector<float> FitsFileReader::readSpeckFile(const std::filesystem::path& fi
 
         // Check if star is a nullArray.
         bool nullArray = true;
-        for (float f : readValues) {
-            if (f != 0.0) {
+        for (const float f : readValues) {
+            if (f != 0.f) {
                 nullArray = false;
                 break;
             }
@@ -656,7 +657,7 @@ std::vector<float> FitsFileReader::readSpeckFile(const std::filesystem::path& fi
 // This is pretty annoying, the read method is not derived from the HDU class
 // in CCfits - need to explicitly cast to the sub classes to access read
 template<typename T>
-const std::shared_ptr<ImageData<T>> FitsFileReader::readImageInternal(ExtHDU& image) {
+std::shared_ptr<ImageData<T>> FitsFileReader::readImageInternal(ExtHDU& image) {
    try {
         std::valarray<T> contents;
         image.read(contents);
@@ -666,14 +667,15 @@ const std::shared_ptr<ImageData<T>> FitsFileReader::readImageInternal(ExtHDU& im
             .height = image.axis(1)
         };
         return std::make_shared<ImageData<T>>(im);
-    } catch (const FitsException& e){
+    }
+   catch (const FitsException& e) {
         LERROR("Could not read FITS image EXTHDU. " + e.message());
     }
     return nullptr;
 }
 
 template<typename T>
-const std::shared_ptr<ImageData<T>> FitsFileReader::readImageInternal(PHDU& image) {
+std::shared_ptr<ImageData<T>> FitsFileReader::readImageInternal(PHDU& image) {
     try {
         std::valarray<T> contents;
         image.read(contents);
@@ -683,7 +685,8 @@ const std::shared_ptr<ImageData<T>> FitsFileReader::readImageInternal(PHDU& imag
             .height = image.axis(1)
         };
         return std::make_shared<ImageData<T>>(im);
-    } catch (const FitsException& e){
+    }
+    catch (const FitsException& e) {
         LERROR("Could not read FITS image PHDU. " + e.message());
     }
     return nullptr;
diff --git a/modules/gaia/rendering/octreeculler.cpp b/modules/gaia/rendering/octreeculler.cpp
index 74f5641703..e417b13366 100644
--- a/modules/gaia/rendering/octreeculler.cpp
+++ b/modules/gaia/rendering/octreeculler.cpp
@@ -73,8 +73,9 @@ void OctreeCuller::createNodeBounds(const std::vector<glm::dvec4>& corners,
     _nodeBounds = globebrowsing::AABB3();
 
     for (size_t i = 0; i < 8; i++) {
-        glm::dvec4 cornerClippingSpace = mvp * corners[i];
-        glm::dvec4 ndc = (1.f / glm::abs(cornerClippingSpace.w)) * cornerClippingSpace;
+        const glm::dvec4 cornerClippingSpace = mvp * corners[i];
+        const glm::dvec4 ndc =
+            (1.f / glm::abs(cornerClippingSpace.w)) * cornerClippingSpace;
         expand(_nodeBounds, glm::dvec3(ndc));
     }
 }
diff --git a/modules/gaia/rendering/octreemanager.cpp b/modules/gaia/rendering/octreemanager.cpp
index 0599a724a2..aeca54ea8e 100644
--- a/modules/gaia/rendering/octreemanager.cpp
+++ b/modules/gaia/rendering/octreemanager.cpp
@@ -34,6 +34,25 @@
 
 namespace {
     constexpr std::string_view _loggerCat = "OctreeManager";
+
+    /**
+     * \return the correct index of child node. Maps [1,1,1] to 0 and [-1,-1,-1] to 7
+     */
+    size_t childIndex(float posX, float posY, float posZ, float origX = 0.f,
+                      float origY = 0.f, float origZ = 0.f)
+    {
+        size_t index = 0;
+        if (posX < origX) {
+            index += 1;
+        }
+        if (posY < origY) {
+            index += 2;
+        }
+        if (posZ < origZ) {
+            index += 4;
+        }
+        return index;
+    }
 } // namespace
 
 namespace openspace {
@@ -48,7 +67,7 @@ void OctreeManager::initOctree(long long cpuRamBudget, int maxDist, int maxStars
     _root = std::make_shared<OctreeNode>();
     _root->octreePositionIndex = 8;
 
-    // Initialize the culler. The NDC.z of the comparing corners are always -1 or 1.
+    // Initialize the culler. The NDC.z of the comparing corners are always -1 or 1
     globebrowsing::AABB3 box;
     box.min = glm::vec3(-1.f, -1.f, 0.f);
     box.max = glm::vec3(1.f, 1.f, 100.f);
@@ -56,7 +75,7 @@ void OctreeManager::initOctree(long long cpuRamBudget, int maxDist, int maxStars
     _removedKeysInPrevCall = std::set<int>();
     _leastRecentlyFetchedNodes = std::queue<unsigned long long>();
 
-    // Reset default values when rebuilding the Octree during runtime.
+    // Reset default values when rebuilding the Octree during runtime
     _numInnerNodes = 0;
     _numLeafNodes = 0;
     _totalDepth = 0;
@@ -74,34 +93,34 @@ void OctreeManager::initOctree(long long cpuRamBudget, int maxDist, int maxStars
 
     for (size_t i = 0; i < 8; i++) {
         _numLeafNodes++;
-        _root->Children[i] = std::make_shared<OctreeNode>();
-        _root->Children[i]->posData = std::vector<float>();
-        _root->Children[i]->colData = std::vector<float>();
-        _root->Children[i]->velData = std::vector<float>();
-        _root->Children[i]->magOrder = std::vector<std::pair<float, size_t>>();
-        _root->Children[i]->isLeaf = true;
-        _root->Children[i]->isLoaded = false;
-        _root->Children[i]->hasLoadedDescendant = false;
-        _root->Children[i]->bufferIndex = DEFAULT_INDEX;
-        _root->Children[i]->octreePositionIndex = 80 + i;
-        _root->Children[i]->numStars = 0;
-        _root->Children[i]->halfDimension = MAX_DIST / 2.f;
-        _root->Children[i]->originX = (i % 2 == 0) ?
-            _root->Children[i]->halfDimension :
-            -_root->Children[i]->halfDimension;
-        _root->Children[i]->originY = (i % 4 < 2) ?
-            _root->Children[i]->halfDimension :
-            -_root->Children[i]->halfDimension;
-        _root->Children[i]->originZ = (i < 4) ?
-            _root->Children[i]->halfDimension :
-            -_root->Children[i]->halfDimension;
+        _root->children[i] = std::make_shared<OctreeNode>();
+        _root->children[i]->posData = std::vector<float>();
+        _root->children[i]->colData = std::vector<float>();
+        _root->children[i]->velData = std::vector<float>();
+        _root->children[i]->magOrder = std::vector<std::pair<float, size_t>>();
+        _root->children[i]->isLeaf = true;
+        _root->children[i]->isLoaded = false;
+        _root->children[i]->hasLoadedDescendant = false;
+        _root->children[i]->bufferIndex = DEFAULT_INDEX;
+        _root->children[i]->octreePositionIndex = 80 + i;
+        _root->children[i]->numStars = 0;
+        _root->children[i]->halfDimension = MAX_DIST / 2.f;
+        _root->children[i]->originX = (i % 2 == 0) ?
+            _root->children[i]->halfDimension :
+            -_root->children[i]->halfDimension;
+        _root->children[i]->originY = (i % 4 < 2) ?
+            _root->children[i]->halfDimension :
+            -_root->children[i]->halfDimension;
+        _root->children[i]->originZ = (i < 4) ?
+            _root->children[i]->halfDimension :
+            -_root->children[i]->halfDimension;
     }
 }
 
 void OctreeManager::initBufferIndexStack(long long maxNodes, bool useVBO,
                                          bool datasetFitInMemory)
 {
-    // Clear stack if we've used it before.
+    // Clear stack if we've used it before
     _biggestChunkIndexInUse = 0;
     _freeSpotsInBuffer = std::stack<int>();
     _rebuildBuffer = true;
@@ -117,18 +136,18 @@ void OctreeManager::initBufferIndexStack(long long maxNodes, bool useVBO,
 }
 
 void OctreeManager::insert(const std::vector<float>& starValues) {
-    size_t index = getChildIndex(starValues[0], starValues[1], starValues[2]);
+    const size_t index = childIndex(starValues[0], starValues[1], starValues[2]);
 
-    insertInNode(*_root->Children[index], starValues);
+    insertInNode(*_root->children[index], starValues);
 }
 
 void OctreeManager::sliceLodData(size_t branchIndex) {
     if (branchIndex != 8) {
-        sliceNodeLodCache(*_root->Children[branchIndex]);
+        sliceNodeLodCache(*_root->children[branchIndex]);
     }
     else {
         for (int i = 0; i < 7; i++) {
-            sliceNodeLodCache(*_root->Children[i]);
+            sliceNodeLodCache(*_root->children[i]);
         }
     }
 }
@@ -137,8 +156,8 @@ void OctreeManager::printStarsPerNode() const {
     std::string accumulatedString;
 
     for (int i = 0; i < 8; i++) {
-        std::string prefix = "{" + std::to_string(i);
-        accumulatedString += printStarsPerNode(*_root->Children[i], prefix);
+        const std::string prefix = "{" + std::to_string(i);
+        accumulatedString += printStarsPerNode(*_root->children[i], prefix);
     }
     LINFO(fmt::format("Number of stars per node: \n{}", accumulatedString));
     LINFO(fmt::format("Number of leaf nodes: {}", std::to_string(_numLeafNodes)));
@@ -152,23 +171,23 @@ void OctreeManager::fetchSurroundingNodes(const glm::dvec3& cameraPos,
 {
 
     // If entire dataset fits in RAM then load the entire dataset asynchronously now.
-    // Nodes will be rendered when they've been made available.
+    // Nodes will be rendered when they've been made available
     if (_datasetFitInMemory) {
-        // Only traverse Octree once!
+        // Only traverse Octree once
         if (_parentNodeOfCamera == 8) {
             // Fetch first layer of children
             fetchChildrenNodes(*_root, 0);
 
-            for (int i = 0; i < 8; i++) {
-                // Check so branch doesn't have a single layer.
-                if (_root->Children[i]->isLeaf) {
+            for (const std::shared_ptr<OctreeNode>& child : _root->children) {
+                // Check so branch doesn't have a single layer
+                if (child->isLeaf) {
                     continue;
                 }
 
                 // Use multithreading to load files and detach thread from main execution
                 // so it can execute independently. Thread will be destroyed when
-                // finished!
-                std::thread([this, n = _root->Children[i]]() {
+                // finished
+                std::thread([this, n = child]() {
                     fetchChildrenNodes(*n, -1);
                 }).detach();
             }
@@ -177,15 +196,13 @@ void OctreeManager::fetchSurroundingNodes(const glm::dvec3& cameraPos,
         return;
     }
 
-    // Get leaf node in which the camera resides.
-    glm::vec3 fCameraPos = static_cast<glm::vec3>(
-        cameraPos / (1000.0 * distanceconstants::Parsec)
-    );
-    size_t idx = getChildIndex(fCameraPos.x, fCameraPos.y, fCameraPos.z);
-    std::shared_ptr<OctreeNode> node = _root->Children[idx];
+    // Get leaf node in which the camera resides
+    const glm::vec3 fCameraPos = cameraPos / (1000.0 * distanceconstants::Parsec);
+    size_t idx = childIndex(fCameraPos.x, fCameraPos.y, fCameraPos.z);
+    std::shared_ptr<OctreeNode> node = _root->children[idx];
 
     while (!node->isLeaf) {
-        idx = getChildIndex(
+        idx = childIndex(
             fCameraPos.x,
             fCameraPos.y,
             fCameraPos.z,
@@ -193,25 +210,25 @@ void OctreeManager::fetchSurroundingNodes(const glm::dvec3& cameraPos,
             node->originY,
             node->originZ
         );
-        node = node->Children[idx];
+        node = node->children[idx];
     }
-    unsigned long long leafId = node->octreePositionIndex;
-    unsigned long long firstParentId = leafId / 10;
+    const unsigned long long leafId = node->octreePositionIndex;
+    const unsigned long long firstParentId = leafId / 10;
 
-    // Return early if camera resides in the same first parent as before!
-    // Otherwise camera has moved and may need to load more nodes!
+    // Return early if camera resides in the same first parent as before.
+    // Otherwise camera has moved and may need to load more nodes
     if (_parentNodeOfCamera == firstParentId) {
         return;
     }
     _parentNodeOfCamera = firstParentId;
 
     // Each parent level may be root, make sure to propagate it in that case!
-    unsigned long long secondParentId = (firstParentId == 8) ? 8 : leafId / 100;
-    unsigned long long thirdParentId = (secondParentId == 8) ? 8 : leafId / 1000;
-    unsigned long long fourthParentId = (thirdParentId == 8) ? 8 : leafId / 10000;
-    unsigned long long fifthParentId = (fourthParentId == 8) ? 8 : leafId / 100000;
+    const unsigned long long secondParentId = (firstParentId == 8) ? 8 : leafId / 100;
+    const unsigned long long thirdParentId = (secondParentId == 8) ? 8 : leafId / 1000;
+    const unsigned long long fourthParentId = (thirdParentId == 8) ? 8 : leafId / 10000;
+    const unsigned long long fifthParentId = (fourthParentId == 8) ? 8 : leafId / 100000;
 
-    // Get the number of levels to fetch from user input.
+    // Get the number of levels to fetch from user input
     int additionalLevelsToFetch = additionalNodes.y;
 
     // Get more descendants when closer to root.
@@ -219,11 +236,11 @@ void OctreeManager::fetchSurroundingNodes(const glm::dvec3& cameraPos,
         additionalLevelsToFetch++;
     }
 
-    // Get the 3^3 closest parents and load all their (eventual) children.
+    // Get the 3^3 closest parents and load all their (eventual) children
     for (int x = -1; x <= 1; x += 1) {
         for (int y = -2; y <= 2; y += 2) {
             for (int z = -4; z <= 4; z += 4) {
-                // Fetch all stars the 216 closest leaf nodes.
+                // Fetch all stars the 216 closest leaf nodes
                 findAndFetchNeighborNode(
                     firstParentId,
                     x,
@@ -231,7 +248,7 @@ void OctreeManager::fetchSurroundingNodes(const glm::dvec3& cameraPos,
                     z,
                     additionalLevelsToFetch
                 );
-                // Fetch LOD stars from 208 parents one and two layer(s) up.
+                // Fetch LOD stars from 208 parents one and two layer(s) up
                 if (x != 0 || y != 0 || z != 0) {
                     if (additionalNodes.x > 0) {
                         findAndFetchNeighborNode(
@@ -274,14 +291,14 @@ void OctreeManager::fetchSurroundingNodes(const glm::dvec3& cameraPos,
         }
     }
 
-    // Check if we should remove any nodes from RAM.
-    long long tenthOfRamBudget = _maxCpuRamBudget / 10;
+    // Check if we should remove any nodes from RAM
+    const long long tenthOfRamBudget = _maxCpuRamBudget / 10;
     if (_cpuRamBudget < tenthOfRamBudget) {
-        long long bytesToTenthOfRam = tenthOfRamBudget - _cpuRamBudget;
+        const long long bytesToTenthOfRam = tenthOfRamBudget - _cpuRamBudget;
         size_t nNodesToRemove = static_cast<size_t>(bytesToTenthOfRam / chunkSizeInBytes);
         std::vector<unsigned long long> nodesToRemove;
         while (nNodesToRemove > 0) {
-            // Dequeue nodes that were least recently fetched by findAndFetchNeighborNode.
+            // Dequeue nodes that were least recently fetched by findAndFetchNeighborNode
             nodesToRemove.push_back(_leastRecentlyFetchedNodes.front());
             _leastRecentlyFetchedNodes.pop();
             nNodesToRemove--;
@@ -299,7 +316,7 @@ void OctreeManager::findAndFetchNeighborNode(unsigned long long firstParentId, i
     unsigned long long parentId = firstParentId;
     std::stack<int> indexStack;
 
-    // Fetch first layer children if we're already at root.
+    // Fetch first layer children if we're already at root
     if (parentId == 8) {
         fetchChildrenNodes(*_root, 0);
         return;
@@ -312,7 +329,7 @@ void OctreeManager::findAndFetchNeighborNode(unsigned long long firstParentId, i
     int dy = (nodeIndex % 4 < 2) ? 2 : -2;
     int dz = (nodeIndex < 4) ? 4 : -4;
 
-    // Determine if we need to switch any side (find a higher common parent).
+    // Determine if we need to switch any side (find a higher common parent)
     bool needToSwitchX = (x == dx);
     bool needToSwitchY = (y == dy);
     bool needToSwitchZ = (z == dz);
@@ -327,7 +344,7 @@ void OctreeManager::findAndFetchNeighborNode(unsigned long long firstParentId, i
         z = -z;
     }
 
-    // Update node index and store it at the back of our stack.
+    // Update node index and store it at the back of our stack
     nodeIndex += x + y + z;
     indexStack.push(nodeIndex);
     parentId /= 10;
@@ -364,29 +381,29 @@ void OctreeManager::findAndFetchNeighborNode(unsigned long long firstParentId, i
     }
 
     // Take care of edge cases. If we got to the root but still need to switch to a
-    // common parent then no neighbor exists in that direction.
+    // common parent then no neighbor exists in that direction
     if (needToSwitchX || needToSwitchY || needToSwitchZ) {
         return;
     }
 
-    // Continue to root if we didn't reach it.
+    // Continue to root if we didn't reach it
     while (parentId != 8) {
         nodeIndex = parentId % 10;
         indexStack.push(nodeIndex);
         parentId /= 10;
     }
 
-    // Traverse to that parent node (as long as such a child exists!).
+    // Traverse to that parent node (as long as such a child exists!)
     std::shared_ptr<OctreeNode> node = _root;
-    while (!indexStack.empty() && !node->Children[indexStack.top()]->isLeaf) {
-        node = node->Children[indexStack.top()];
+    while (!indexStack.empty() && !node->children[indexStack.top()]->isLeaf) {
+        node = node->children[indexStack.top()];
         node->hasLoadedDescendant = true;
         indexStack.pop();
     }
 
     // Fetch all children nodes from found parent. Use multithreading to load files
     // asynchronously! Detach thread from main execution so it can execute independently.
-    // Thread will then be destroyed when it has finished!
+    // Thread will then be destroyed when it has finished
     std::thread([this, node, additionalLevelsToFetch]() {
         fetchChildrenNodes(*node, additionalLevelsToFetch);
     }).detach();
@@ -402,11 +419,11 @@ std::map<int, std::vector<float>> OctreeManager::traverseData(const glm::dmat4&
     bool innerRebuild = false;
     _minTotalPixelsLod = lodPixelThreshold;
 
-    // Reclaim indices from previous render call.
+    // Reclaim indices from previous render call
     for (auto removedKey = _removedKeysInPrevCall.rbegin();
          removedKey != _removedKeysInPrevCall.rend(); ++removedKey) {
 
-        // Uses a reverse loop to try to decrease the biggest chunk.
+        // Uses a reverse loop to try to decrease the biggest chunk
         if (*removedKey == static_cast<int>(_biggestChunkIndexInUse) - 1) {
             _biggestChunkIndexInUse = *removedKey;
             LDEBUG(fmt::format(
@@ -416,12 +433,12 @@ std::map<int, std::vector<float>> OctreeManager::traverseData(const glm::dmat4&
         }
         _freeSpotsInBuffer.push(*removedKey);
     }
-    // Clear cache of removed keys before next render call.
+    // Clear cache of removed keys before next render call
     if (!_removedKeysInPrevCall.empty()) {
         _removedKeysInPrevCall.clear();
     }
 
-    // Rebuild VBO from scratch if we're not using most of it but have a high max index.
+    // Rebuild VBO from scratch if we're not using most of it but have a high max index
     if ((_biggestChunkIndexInUse > _maxStackSize * 4 / 5) &&
         (_freeSpotsInBuffer.size() > _maxStackSize * 5 / 6))
     {
@@ -434,26 +451,26 @@ std::map<int, std::vector<float>> OctreeManager::traverseData(const glm::dmat4&
         innerRebuild = true;
     }
 
-    // Check if entire tree is too small to see, and if so remove it.
+    // Check if entire tree is too small to see, and if so remove it
     std::vector<glm::dvec4> corners(8);
-    float fMaxDist = static_cast<float>(MAX_DIST);
+    const float fMaxDist = static_cast<float>(MAX_DIST);
     for (int i = 0; i < 8; i++) {
-        float x = (i % 2 == 0) ? fMaxDist : -fMaxDist;
-        float y = (i % 4 < 2) ? fMaxDist : -fMaxDist;
-        float z = (i < 4) ? fMaxDist : -fMaxDist;
-        glm::dvec3 pos = glm::dvec3(x, y, z) * 1000.0 * distanceconstants::Parsec;
+        const float x = (i % 2 == 0) ? fMaxDist : -fMaxDist;
+        const float y = (i % 4 < 2) ? fMaxDist : -fMaxDist;
+        const float z = (i < 4) ? fMaxDist : -fMaxDist;
+        const glm::dvec3 pos = glm::dvec3(x, y, z) * 1000.0 * distanceconstants::Parsec;
         corners[i] = glm::dvec4(pos, 1.0);
     }
     if (!_culler->isVisible(corners, mvp)) {
         return renderData;
     }
-    glm::vec2 nodeSize = _culler->getNodeSizeInPixels(corners, mvp, screenSize);
-    float totalPixels = nodeSize.x * nodeSize.y;
+    const glm::vec2 nodeSize = _culler->getNodeSizeInPixels(corners, mvp, screenSize);
+    const float totalPixels = nodeSize.x * nodeSize.y;
     if (totalPixels < _minTotalPixelsLod * 2) {
-        // Remove LOD from first layer of children.
-        for (int i = 0; i < 8; i++) {
+        // Remove LOD from first layer of children
+        for (const std::shared_ptr<OctreeNode>& child : _root->children) {
             std::map<int, std::vector<float>> tmpData = removeNodeFromCache(
-                *_root->Children[i],
+                *child,
                 deltaStars
             );
             renderData.insert(tmpData.begin(), tmpData.end());
@@ -467,7 +484,7 @@ std::map<int, std::vector<float>> OctreeManager::traverseData(const glm::dmat4&
         }
 
         std::map<int, std::vector<float>> tmpData = checkNodeIntersection(
-            *_root->Children[i],
+            *_root->children[i],
             mvp,
             screenSize,
             deltaStars,
@@ -475,35 +492,33 @@ std::map<int, std::vector<float>> OctreeManager::traverseData(const glm::dmat4&
         );
 
         // Avoid freezing when switching render mode for large datasets by only fetching
-        // one branch at a time when rebuilding buffer.
+        // one branch at a time when rebuilding buffer
         if (_rebuildBuffer) {
-            //renderData = std::move(tmpData);
             _traversedBranchesInRenderCall++;
-            //break;
         }
 
         // Observe that if there exists identical keys in renderData then those values in
-        // tmpData will be ignored! Thus we store the removed keys until next render call!
+        // tmpData will be ignored! Thus we store the removed keys until next render call
         renderData.insert(tmpData.begin(), tmpData.end());
     }
 
     if (_rebuildBuffer) {
         if (_useVBO) {
-            // We need to overwrite bigger indices that had data before! No need for SSBO.
+            // We need to overwrite bigger indices that had data before! No need for SSBO
             std::map<int, std::vector<float>> idxToRemove;
-            for (int idx : _removedKeysInPrevCall) {
+            for (const int idx : _removedKeysInPrevCall) {
                 idxToRemove[idx] = std::vector<float>();
             }
 
             // This will only insert indices that doesn't already exist in map
-            // (i.e. > biggestIdx).
+            // (i.e. > biggestIdx)
             renderData.insert(idxToRemove.begin(), idxToRemove.end());
         }
         if (innerRebuild) {
             deltaStars = 0;
         }
 
-        // Clear potential removed keys for both VBO and SSBO!
+        // Clear potential removed keys for both VBO and SSBO
         _removedKeysInPrevCall.clear();
 
         LDEBUG(fmt::format(
@@ -512,7 +527,7 @@ std::map<int, std::vector<float>> OctreeManager::traverseData(const glm::dmat4&
             _freeSpotsInBuffer.size()
         ));
 
-        // End rebuild when all branches has been fetched.
+        // End rebuild when all branches has been fetched
         if (_traversedBranchesInRenderCall == 8) {
             _rebuildBuffer = false;
             _traversedBranchesInRenderCall = 0;
@@ -524,21 +539,21 @@ std::map<int, std::vector<float>> OctreeManager::traverseData(const glm::dmat4&
 std::vector<float> OctreeManager::getAllData(gaia::RenderMode mode) {
     std::vector<float> fullData;
 
-    for (size_t i = 0; i < 8; i++) {
-        std::vector<float> tmpData = getNodeData(*_root->Children[i], mode);
+    for (const std::shared_ptr<OctreeNode>& child : _root->children) {
+        std::vector<float> tmpData = getNodeData(*child, mode);
         fullData.insert(fullData.end(), tmpData.begin(), tmpData.end());
     }
     return fullData;
 }
 
 void OctreeManager::clearAllData(int branchIndex) {
-    // Don't clear everything if not needed.
+    // Don't clear everything if not needed
     if (branchIndex != -1) {
-        clearNodeData(*_root->Children[branchIndex]);
+        clearNodeData(*_root->children[branchIndex]);
     }
     else {
-        for (size_t i = 0; i < 8; i++) {
-            clearNodeData(*_root->Children[i]);
+        for (const std::shared_ptr<OctreeNode>& child : _root->children) {
+            clearNodeData(*child);
         }
     }
 }
@@ -551,16 +566,16 @@ void OctreeManager::writeToFile(std::ofstream& outFileStream, bool writeData) {
     );
     outFileStream.write(reinterpret_cast<const char*>(&MAX_DIST), sizeof(int32_t));
 
-    // Use pre-traversal (Morton code / Z-order).
-    for (size_t i = 0; i < 8; i++) {
-        writeNodeToFile(outFileStream, *_root->Children[i], writeData);
+    // Use pre-traversal (Morton code / Z-order)
+    for (const std::shared_ptr<OctreeNode>& child : _root->children) {
+        writeNodeToFile(outFileStream, *child, writeData);
     }
 }
 
 void OctreeManager::writeNodeToFile(std::ofstream& outFileStream, const OctreeNode& node,
                                     bool writeData)
 {
-    // Write node structure.
+    // Write node structure
     bool isLeaf = node.isLeaf;
     int32_t numStars = static_cast<int32_t>(node.numStars);
     outFileStream.write(reinterpret_cast<const char*>(&isLeaf), sizeof(bool));
@@ -572,7 +587,7 @@ void OctreeManager::writeNodeToFile(std::ofstream& outFileStream, const OctreeNo
         nodeData.insert(nodeData.end(), node.colData.begin(), node.colData.end());
         nodeData.insert(nodeData.end(), node.velData.begin(), node.velData.end());
         int32_t nDataSize = static_cast<int32_t>(nodeData.size());
-        size_t nBytes = nDataSize * sizeof(nodeData[0]);
+        const size_t nBytes = nDataSize * sizeof(float);
 
         outFileStream.write(reinterpret_cast<const char*>(&nDataSize), sizeof(int32_t));
         if (nDataSize > 0) {
@@ -580,10 +595,10 @@ void OctreeManager::writeNodeToFile(std::ofstream& outFileStream, const OctreeNo
         }
     }
 
-    // Write children to file (in Morton order) if we're in an inner node.
+    // Write children to file (in Morton order) if we're in an inner node
     if (!node.isLeaf) {
-        for (size_t i = 0; i < 8; i++) {
-            writeNodeToFile(outFileStream, *node.Children[i], writeData);
+        for (const std::shared_ptr<OctreeNode>& child : node.children) {
+            writeNodeToFile(outFileStream, *child, writeData);
         }
     }
 }
@@ -592,9 +607,9 @@ int OctreeManager::readFromFile(std::ifstream& inFileStream, bool readData,
                                 const std::string& folderPath)
 {
     int nStarsRead = 0;
-    int oldMaxdist = static_cast<int>(MAX_DIST);
+    const int oldMaxdist = static_cast<int>(MAX_DIST);
 
-    // If we're not reading data then we need to stream from files later on.
+    // If we're not reading data then we need to stream from files later on
     _streamOctree = !readData;
     if (_streamOctree) {
         _streamFolderPath = folderPath;
@@ -610,19 +625,19 @@ int OctreeManager::readFromFile(std::ifstream& inFileStream, bool readData,
         MAX_STARS_PER_NODE, MAX_DIST
     ));
 
-    // Octree Manager root halfDistance must be updated before any nodes are created!
+    // Octree Manager root halfDistance must be updated before any nodes are created
     if (static_cast<int>(MAX_DIST) != oldMaxdist) {
         for (size_t i = 0; i < 8; i++) {
-            _root->Children[i]->halfDimension = MAX_DIST / 2.f;
-            _root->Children[i]->originX = (i % 2 == 0) ?
-                _root->Children[i]->halfDimension :
-                -_root->Children[i]->halfDimension;
-            _root->Children[i]->originY = (i % 4 < 2) ?
-                _root->Children[i]->halfDimension :
-                -_root->Children[i]->halfDimension;
-            _root->Children[i]->originZ = (i < 4) ?
-                _root->Children[i]->halfDimension :
-                -_root->Children[i]->halfDimension;
+            _root->children[i]->halfDimension = MAX_DIST / 2.f;
+            _root->children[i]->originX = (i % 2 == 0) ?
+                _root->children[i]->halfDimension :
+                -_root->children[i]->halfDimension;
+            _root->children[i]->originY = (i % 4 < 2) ?
+                _root->children[i]->halfDimension :
+                -_root->children[i]->halfDimension;
+            _root->children[i]->originZ = (i < 4) ?
+                _root->children[i]->halfDimension :
+                -_root->children[i]->halfDimension;
         }
     }
 
@@ -630,9 +645,9 @@ int OctreeManager::readFromFile(std::ifstream& inFileStream, bool readData,
         LERROR("Read file doesn't have the same structure of render parameters");
     }
 
-    // Use the same technique to construct octree from file.
-    for (size_t i = 0; i < 8; i++) {
-        nStarsRead += readNodeFromFile(inFileStream, *_root->Children[i], readData);
+    // Use the same technique to construct octree from file
+    for (const std::shared_ptr<OctreeNode>& child : _root->children) {
+        nStarsRead += readNodeFromFile(inFileStream, *child, readData);
     }
     return nStarsRead;
 }
@@ -641,7 +656,7 @@ int OctreeManager::readNodeFromFile(std::ifstream& inFileStream, OctreeNode& nod
                                     bool readData)
 {
     // Read node structure.
-    bool isLeaf;
+    bool isLeaf = false;
     int32_t numStars = 0;
 
     inFileStream.read(reinterpret_cast<char*>(&isLeaf), sizeof(bool));
@@ -656,45 +671,45 @@ int OctreeManager::readNodeFromFile(std::ifstream& inFileStream, OctreeNode& nod
         inFileStream.read(reinterpret_cast<char*>(&nDataSize), sizeof(int32_t));
 
         if (nDataSize > 0) {
-            std::vector<float> fetchedData(nDataSize, 0.0f);
-            size_t nBytes = nDataSize * sizeof(fetchedData[0]);
+            std::vector<float> fetchedData(nDataSize, 0.f);
+            const size_t nBytes = nDataSize * sizeof(float);
 
-            inFileStream.read(reinterpret_cast<char*>(&fetchedData[0]), nBytes);
+            inFileStream.read(reinterpret_cast<char*>(fetchedData.data()), nBytes);
 
-            int starsInNode = static_cast<int>(nDataSize / _valuesPerStar);
-            auto posEnd = fetchedData.begin() + (starsInNode * POS_SIZE);
-            auto colEnd = posEnd + (starsInNode * COL_SIZE);
-            auto velEnd = colEnd + (starsInNode * VEL_SIZE);
+            const int starsInNode = static_cast<int>(nDataSize / _valuesPerStar);
+            const auto posEnd = fetchedData.begin() + (starsInNode * POS_SIZE);
+            const auto colEnd = posEnd + (starsInNode * COL_SIZE);
+            const auto velEnd = colEnd + (starsInNode * VEL_SIZE);
             node.posData = std::vector<float>(fetchedData.begin(), posEnd);
             node.colData = std::vector<float>(posEnd, colEnd);
             node.velData = std::vector<float>(colEnd, velEnd);
         }
     }
 
-    // Create children if we're in an inner node and read from the corresponding nodes.
+    // Create children if we're in an inner node and read from the corresponding nodes
     if (!node.isLeaf) {
         numStars = 0;
         createNodeChildren(node);
-        for (size_t i = 0; i < 8; i++) {
-            numStars += readNodeFromFile(inFileStream, *node.Children[i], readData);
+        for (const std::shared_ptr<OctreeNode>& child : node.children) {
+            numStars += readNodeFromFile(inFileStream, *child, readData);
         }
     }
 
-    // Return the number of stars in the entire branch, no need to check children.
+    // Return the number of stars in the entire branch, no need to check children
     return numStars;
 }
 
 void OctreeManager::writeToMultipleFiles(const std::string& outFolderPath,
                                          size_t branchIndex)
 {
-    // Write entire branch to disc, with one file per node.
-    std::string outFilePrefix = outFolderPath + std::to_string(branchIndex);
-    // More threads doesn't make it much faster, disk speed still the limiter.
-    writeNodeToMultipleFiles(outFilePrefix, *_root->Children[branchIndex], false);
+    // Write entire branch to disc, with one file per node
+    const std::string outFilePrefix = outFolderPath + std::to_string(branchIndex);
+    // More threads doesn't make it much faster, disk speed still the limiter
+    writeNodeToMultipleFiles(outFilePrefix, *_root->children[branchIndex], false);
 
     // Clear all data in branch.
     LINFO(fmt::format("Clear all data from branch {} in octree", branchIndex));
-    clearNodeData(*_root->Children[branchIndex]);
+    clearNodeData(*_root->children[branchIndex]);
 }
 
 void OctreeManager::writeNodeToMultipleFiles(const std::string& outFilePrefix,
@@ -704,8 +719,8 @@ void OctreeManager::writeNodeToMultipleFiles(const std::string& outFilePrefix,
     std::vector<float> nodeData = node.posData;
     nodeData.insert(nodeData.end(), node.colData.begin(), node.colData.end());
     nodeData.insert(nodeData.end(), node.velData.begin(), node.velData.end());
-    int32_t nDataSize = static_cast<int32_t>(nodeData.size());
-    size_t nBytes = nDataSize * sizeof(nodeData[0]);
+    const int32_t nDataSize = static_cast<int32_t>(nodeData.size());
+    const size_t nBytes = nDataSize * sizeof(nodeData[0]);
 
     // Only open output stream if we have any values to write.
     if (nDataSize > 0) {
@@ -727,22 +742,22 @@ void OctreeManager::writeNodeToMultipleFiles(const std::string& outFilePrefix,
         }
     }
 
-    // Recursively write children to file (in Morton order) if we're in an inner node.
+    // Recursively write children to file (in Morton order) if we're in an inner node
     if (!node.isLeaf) {
         std::vector<std::thread> writeThreads(8);
         for (size_t i = 0; i < 8; i++) {
-            std::string newOutFilePrefix = outFilePrefix + std::to_string(i);
+            const std::string newOutFilePrefix = outFilePrefix + std::to_string(i);
             if (threadWrites) {
-                // Divide writing to new threads to speed up the process.
+                // Divide writing to new threads to speed up the process
                 std::thread t(
-                    [this, newOutFilePrefix, n = node.Children[i]]() {
+                    [this, newOutFilePrefix, n = node.children[i]]() {
                         writeNodeToMultipleFiles(newOutFilePrefix, *n, false);
                     }
                 );
                 writeThreads[i] = std::move(t);
             }
             else {
-                writeNodeToMultipleFiles(newOutFilePrefix, *node.Children[i], false);
+                writeNodeToMultipleFiles(newOutFilePrefix, *node.children[i], false);
             }
         }
         if (threadWrites) {
@@ -757,62 +772,61 @@ void OctreeManager::writeNodeToMultipleFiles(const std::string& outFilePrefix,
 void OctreeManager::fetchChildrenNodes(OctreeNode& parentNode,
                                        int additionalLevelsToFetch)
 {
-    // Lock node to make sure nobody else are trying to load the same children.
-    std::lock_guard lock(parentNode.loadingLock);
+    // Lock node to make sure nobody else are trying to load the same children
+    const std::lock_guard lock(parentNode.loadingLock);
 
-    for (int i = 0; i < 8; i++) {
+    for (const std::shared_ptr<OctreeNode>& child : parentNode.children) {
         // Fetch node data if we're streaming and it doesn't exist in RAM yet.
         // (As long as there is any RAM budget left and node actually has any data!)
-        if (!parentNode.Children[i]->isLoaded &&
-            (parentNode.Children[i]->numStars > 0) &&
-            _cpuRamBudget > static_cast<long long>(parentNode.Children[i]->numStars
-            * (POS_SIZE + COL_SIZE + VEL_SIZE) * 4))
+        if (!child->isLoaded && (child->numStars > 0) &&
+            _cpuRamBudget > static_cast<long long>(child->numStars
+                                                  * (POS_SIZE + COL_SIZE + VEL_SIZE) * 4))
         {
-            fetchNodeDataFromFile(*parentNode.Children[i]);
+            fetchNodeDataFromFile(*child);
         }
 
-        // Fetch all Children's Children if recursive is set to true!
-        if (additionalLevelsToFetch != 0 && !parentNode.Children[i]->isLeaf) {
-            fetchChildrenNodes(*parentNode.Children[i], --additionalLevelsToFetch);
+        // Fetch all Children's Children if recursive is set to true
+        if (additionalLevelsToFetch != 0 && !child->isLeaf) {
+            fetchChildrenNodes(*child, --additionalLevelsToFetch);
         }
     }
 }
 
 void OctreeManager::fetchNodeDataFromFile(OctreeNode& node) {
-    // Remove root ID ("8") from index before loading file.
+    // Remove root ID ("8") from index before loading file
     std::string posId = std::to_string(node.octreePositionIndex);
     posId.erase(posId.begin());
 
-    std::string inFilePath = _streamFolderPath + posId + BINARY_SUFFIX;
+    const std::string inFilePath = _streamFolderPath + posId + BINARY_SUFFIX;
     std::ifstream inFileStream(inFilePath, std::ifstream::binary);
     // LINFO("Fetch node data file: " + inFilePath);
 
     if (inFileStream.good()) {
-        // Read node data.
+        // Read node data
         int32_t nDataSize = 0;
 
-        // Octree knows if we have any data in this node = it exists.
+        // Octree knows if we have any data in this node = it exists
         // Otherwise don't call this function!
         inFileStream.read(reinterpret_cast<char*>(&nDataSize), sizeof(int32_t));
 
         std::vector<float> readData(nDataSize, 0.f);
-        int nBytes = nDataSize * sizeof(readData[0]);
+        const int nBytes = nDataSize * sizeof(float);
         if (nDataSize > 0) {
-            inFileStream.read(reinterpret_cast<char*>(&readData[0]), nBytes);
+            inFileStream.read(reinterpret_cast<char*>(readData.data()), nBytes);
         }
 
-        int starsInNode = static_cast<int>(nDataSize / _valuesPerStar);
-        auto posEnd = readData.begin() + (starsInNode * POS_SIZE);
-        auto colEnd = posEnd + (starsInNode * COL_SIZE);
-        auto velEnd = colEnd + (starsInNode * VEL_SIZE);
+        const int starsInNode = static_cast<int>(nDataSize / _valuesPerStar);
+        const auto posEnd = readData.begin() + (starsInNode * POS_SIZE);
+        const auto colEnd = posEnd + (starsInNode * COL_SIZE);
+        const auto velEnd = colEnd + (starsInNode * VEL_SIZE);
         node.posData = std::vector<float>(readData.begin(), posEnd);
         node.colData = std::vector<float>(posEnd, colEnd);
         node.velData = std::vector<float>(colEnd, velEnd);
 
-        // Keep track of nodes that are loaded and update CPU RAM budget.
+        // Keep track of nodes that are loaded and update CPU RAM budget
         node.isLoaded = true;
         if (!_datasetFitInMemory) {
-            std::lock_guard g(_leastRecentlyFetchedNodesMutex);
+            const std::lock_guard g(_leastRecentlyFetchedNodesMutex);
             _leastRecentlyFetchedNodes.push(node.octreePositionIndex);
         }
         _cpuRamBudget -= nBytes;
@@ -830,7 +844,7 @@ void OctreeManager::removeNodesFromRam(
     for (unsigned long long nodePosIndex : nodesToRemove) {
         std::stack<int> indexStack;
         while (nodePosIndex != 8) {
-            int nodeIndex = nodePosIndex % 10;
+            const int nodeIndex = nodePosIndex % 10;
             indexStack.push(nodeIndex);
             nodePosIndex /= 10;
         }
@@ -840,7 +854,7 @@ void OctreeManager::removeNodesFromRam(
         std::vector<std::shared_ptr<OctreeNode>> ancestors;
         while (!indexStack.empty()) {
             ancestors.push_back(node);
-            node = node->Children[indexStack.top()];
+            node = node->children[indexStack.top()];
             indexStack.pop();
         }
         removeNode(*node);
@@ -850,13 +864,13 @@ void OctreeManager::removeNodesFromRam(
 }
 
 void OctreeManager::removeNode(OctreeNode& node) {
-    // Lock node to make sure nobody else is trying to access it while removing.
-    std::lock_guard lock(node.loadingLock);
+    // Lock node to make sure nobody else is trying to access it while removing
+    const std::lock_guard lock(node.loadingLock);
 
-    int nBytes = static_cast<int>(
+    const int nBytes = static_cast<int>(
         node.numStars * _valuesPerStar * sizeof(node.posData[0])
     );
-    // Keep track of which nodes that are loaded and update CPU RAM budget.
+    // Keep track of which nodes that are loaded and update CPU RAM budget
     node.isLoaded = false;
     _cpuRamBudget += nBytes;
 
@@ -874,27 +888,27 @@ void OctreeManager::propagateUnloadedNodes(
 {
     std::shared_ptr<OctreeNode> parentNode = ancestorNodes.back();
     while (parentNode->octreePositionIndex != 8) {
-        // Check if any children of inner node is still loaded, or has loaded descendants.
-        if (parentNode->Children[0]->isLoaded || parentNode->Children[1]->isLoaded ||
-            parentNode->Children[2]->isLoaded || parentNode->Children[3]->isLoaded ||
-            parentNode->Children[4]->isLoaded || parentNode->Children[5]->isLoaded ||
-            parentNode->Children[6]->isLoaded || parentNode->Children[7]->isLoaded ||
-            parentNode->Children[0]->hasLoadedDescendant ||
-            parentNode->Children[1]->hasLoadedDescendant ||
-            parentNode->Children[2]->hasLoadedDescendant ||
-            parentNode->Children[3]->hasLoadedDescendant ||
-            parentNode->Children[4]->hasLoadedDescendant ||
-            parentNode->Children[5]->hasLoadedDescendant ||
-            parentNode->Children[6]->hasLoadedDescendant ||
-            parentNode->Children[7]->hasLoadedDescendant)
+        // Check if any children of inner node is still loaded, or has loaded descendants
+        if (parentNode->children[0]->isLoaded || parentNode->children[1]->isLoaded ||
+            parentNode->children[2]->isLoaded || parentNode->children[3]->isLoaded ||
+            parentNode->children[4]->isLoaded || parentNode->children[5]->isLoaded ||
+            parentNode->children[6]->isLoaded || parentNode->children[7]->isLoaded ||
+            parentNode->children[0]->hasLoadedDescendant ||
+            parentNode->children[1]->hasLoadedDescendant ||
+            parentNode->children[2]->hasLoadedDescendant ||
+            parentNode->children[3]->hasLoadedDescendant ||
+            parentNode->children[4]->hasLoadedDescendant ||
+            parentNode->children[5]->hasLoadedDescendant ||
+            parentNode->children[6]->hasLoadedDescendant ||
+            parentNode->children[7]->hasLoadedDescendant)
         {
             return;
         }
-        // Else all children has been unloaded and we can update parent flag.
+        // Else all children has been unloaded and we can update parent flag
         parentNode->hasLoadedDescendant = false;
         // LINFO("Removed ancestor: " + std::to_string(parentNode->octreePositionIndex));
 
-        // Propagate change upwards.
+        // Propagate change upwards
         ancestorNodes.pop_back();
         parentNode = ancestorNodes.back();
     }
@@ -940,27 +954,11 @@ bool OctreeManager::isRebuildOngoing() const {
     return _rebuildBuffer;
 }
 
-size_t OctreeManager::getChildIndex(float posX, float posY, float posZ, float origX,
-                                    float origY, float origZ)
-{
-    size_t index = 0;
-    if (posX < origX) {
-        index += 1;
-    }
-    if (posY < origY) {
-        index += 2;
-    }
-    if (posZ < origZ) {
-        index += 4;
-    }
-    return index;
-}
-
 bool OctreeManager::insertInNode(OctreeNode& node, const std::vector<float>& starValues,
                                  int depth)
 {
     if (node.isLeaf && node.numStars < MAX_STARS_PER_NODE) {
-        // Node is a leaf and it's not yet full -> insert star.
+        // Node is a leaf and it's not yet full -> insert star
         storeStarData(node, starValues);
 
         if (depth > static_cast<int>(_totalDepth)) {
@@ -970,10 +968,10 @@ bool OctreeManager::insertInNode(OctreeNode& node, const std::vector<float>& sta
     }
     else if (node.isLeaf) {
         // Too many stars in leaf node, subdivide into 8 new nodes.
-        // Create children and clean up parent.
+        // Create children and clean up parent
         createNodeChildren(node);
 
-        // Distribute stars from parent node into children.
+        // Distribute stars from parent node into children
         for (size_t n = 0; n < MAX_STARS_PER_NODE; ++n) {
             // Position data.
             auto posBegin = node.posData.begin() + n * POS_SIZE;
@@ -988,8 +986,8 @@ bool OctreeManager::insertInNode(OctreeNode& node, const std::vector<float>& sta
             auto velEnd = velBegin + VEL_SIZE;
             tmpValues.insert(tmpValues.end(), velBegin, velEnd);
 
-            // Find out which child that will inherit the data and store it.
-            size_t index = getChildIndex(
+            // Find out which child that will inherit the data and store it
+            const size_t index = childIndex(
                 tmpValues[0],
                 tmpValues[1],
                 tmpValues[2],
@@ -997,17 +995,17 @@ bool OctreeManager::insertInNode(OctreeNode& node, const std::vector<float>& sta
                 node.originY,
                 node.originZ
             );
-            insertInNode(*node.Children[index], tmpValues, depth);
+            insertInNode(*node.children[index], tmpValues, depth);
         }
 
         // Sort magnitudes in inner node.
-        // (The last value will be used as comparison for what to store in LOD cache.)
+        // (The last value will be used as comparison for what to store in LOD cache)
         std::sort(node.magOrder.begin(), node.magOrder.end());
     }
 
     // Node is an inner node, keep recursion going.
-    // This will also take care of the new star when a subdivision has taken place.
-    size_t index = getChildIndex(
+    // This will also take care of the new star when a subdivision has taken place
+    const size_t index = childIndex(
         starValues[0],
         starValues[1],
         starValues[2],
@@ -1022,11 +1020,11 @@ bool OctreeManager::insertInNode(OctreeNode& node, const std::vector<float>& sta
         storeStarData(node, starValues);
     }
 
-    return insertInNode(*node.Children[index], starValues, ++depth);
+    return insertInNode(*node.children[index], starValues, ++depth);
 }
 
 void OctreeManager::sliceNodeLodCache(OctreeNode& node) {
-    // Slice stored LOD data in inner nodes.
+    // Slice stored LOD data in inner nodes
     if (!node.isLeaf) {
         // Sort by magnitude. Inverse relation (i.e. a lower magnitude means a brighter
         // star!)
@@ -1036,7 +1034,7 @@ void OctreeManager::sliceNodeLodCache(OctreeNode& node) {
         std::vector<float> tmpPos;
         std::vector<float> tmpCol;
         std::vector<float> tmpVel;
-        // Ordered map contain the MAX_STARS_PER_NODE brightest stars in all children!
+        // Ordered map contain the MAX_STARS_PER_NODE brightest stars in all children
         for (auto const& [absMag, placement] : node.magOrder) {
             auto posBegin = node.posData.begin() + placement * POS_SIZE;
             auto colBegin = node.colData.begin() + placement * COL_SIZE;
@@ -1050,22 +1048,23 @@ void OctreeManager::sliceNodeLodCache(OctreeNode& node) {
         node.velData = std::move(tmpVel);
         node.numStars = node.magOrder.size(); // = MAX_STARS_PER_NODE
 
-        for (int i = 0; i < 8; i++) {
-            sliceNodeLodCache(*node.Children[i]);
+        for (const std::shared_ptr<OctreeNode>& child : node.children) {
+            sliceNodeLodCache(*child);
         }
     }
 }
 
-void OctreeManager::storeStarData(OctreeNode& node, const std::vector<float>& starValues)
+void OctreeManager::storeStarData(OctreeNode& node,
+                                  const std::vector<float>& starValues) const
 {
     // Insert star data at the back of vectors and store a vector with pairs consisting of
-    // star magnitude and insert index for later sorting and slicing of LOD cache.
-    float mag = starValues[POS_SIZE];
+    // star magnitude and insert index for later sorting and slicing of LOD cache
+    const float mag = starValues[POS_SIZE];
     node.magOrder.insert(node.magOrder.end(), std::make_pair(mag, node.numStars));
     node.numStars++;
 
     // If LOD is growing too large then sort it and resize to [chunk size] to avoid too
-    // much RAM usage and increase threshold for adding new stars.
+    // much RAM usage and increase threshold for adding new stars
     if (node.magOrder.size() > MAX_STARS_PER_NODE * 2) {
         std::sort(node.magOrder.begin(), node.magOrder.end());
         node.magOrder.resize(MAX_STARS_PER_NODE);
@@ -1082,7 +1081,7 @@ std::string OctreeManager::printStarsPerNode(const OctreeNode& node,
                                              const std::string& prefix) const
 {
 
-    // Print both inner and leaf nodes.
+    // Print both inner and leaf nodes
     auto str = prefix + "} : " + std::to_string(node.numStars);
 
     if (node.isLeaf) {
@@ -1092,7 +1091,7 @@ std::string OctreeManager::printStarsPerNode(const OctreeNode& node,
         str += fmt::format("LOD: {} - [Parent]\n", node.posData.size() / POS_SIZE);
         for (int i = 0; i < 8; i++) {
             auto pref = prefix + "->" + std::to_string(i);
-            str += printStarsPerNode(*node.Children[i], pref);
+            str += printStarsPerNode(*node.children[i], pref);
         }
         return str;
     }
@@ -1106,7 +1105,7 @@ std::map<int, std::vector<float>> OctreeManager::checkNodeIntersection(OctreeNod
 {
     std::map<int, std::vector<float>> fetchedData;
 
-    // Calculate the corners of the node.
+    // Calculate the corners of the node
     std::vector<glm::dvec4> corners(8);
     for (int i = 0; i < 8; i++) {
         const float x = (i % 2 == 0) ?
@@ -1118,14 +1117,14 @@ std::map<int, std::vector<float>> OctreeManager::checkNodeIntersection(OctreeNod
         const float z = (i < 4) ?
             node.originZ + node.halfDimension :
             node.originZ - node.halfDimension;
-        glm::dvec3 pos = glm::dvec3(x, y, z) * 1000.0 * distanceconstants::Parsec;
+        const glm::dvec3 pos = glm::dvec3(x, y, z) * 1000.0 * distanceconstants::Parsec;
         corners[i] = glm::dvec4(pos, 1.0);
     }
 
-    // Check if node is visible from camera. If not then return early.
+    // Check if node is visible from camera. If not then return early
     if (!(_culler->isVisible(corners, mvp))) {
         // Check if this node or any of its children existed in cache previously.
-        // If so, then remove them from cache and add those indices to stack.
+        // If so, then remove them from cache and add those indices to stack
         fetchedData = removeNodeFromCache(node, deltaStars);
         return fetchedData;
     }
@@ -1141,28 +1140,28 @@ std::map<int, std::vector<float>> OctreeManager::checkNodeIntersection(OctreeNod
 
     // Take care of inner nodes.
     if (!(node.isLeaf)) {
-        glm::vec2 nodeSize = _culler->getNodeSizeInPixels(corners, mvp, screenSize);
-        float totalPixels = nodeSize.x * nodeSize.y;
+        const glm::vec2 nodeSize = _culler->getNodeSizeInPixels(corners, mvp, screenSize);
+        const float totalPixels = nodeSize.x * nodeSize.y;
 
         // Check if we should return any LOD cache data. If we're streaming a big dataset
         // from files and inner node is visible and loaded, then it should be rendered
         // (as long as it doesn't have loaded children because then we should traverse to
-        // lowest loaded level and render it instead)!
+        // lowest loaded level and render it instead)
         if ((totalPixels < _minTotalPixelsLod) || (_streamOctree &&
             !_datasetFitInMemory && node.isLoaded && !node.hasLoadedDescendant))
         {
             // Get correct insert index from stack if node didn't exist already. Otherwise
-            // we will overwrite the old data. Key merging is not a problem here.
+            // we will overwrite the old data. Key merging is not a problem here
             if ((node.bufferIndex == DEFAULT_INDEX) || _rebuildBuffer) {
-                // Return empty if we couldn't claim a buffer stream index.
+                // Return empty if we couldn't claim a buffer stream index
                 if (!updateBufferIndex(node)) {
                     return fetchedData;
                 }
 
                 // We're in an inner node, remove indices from potential children in cache
-                for (int i = 0; i < 8; i++) {
+                for (const std::shared_ptr<OctreeNode>& child : node.children) {
                     std::map<int, std::vector<float>> tmpData = removeNodeFromCache(
-                        *node.Children[i],
+                        *child,
                         deltaStars
                     );
                     fetchedData.insert(tmpData.begin(), tmpData.end());
@@ -1178,11 +1177,11 @@ std::map<int, std::vector<float>> OctreeManager::checkNodeIntersection(OctreeNod
             return fetchedData;
         }
     }
-    // Return node data if node is a leaf.
+    // Return node data if node is a leaf
     else {
-        // If node already is in cache then skip it, otherwise store it.
+        // If node already is in cache then skip it, otherwise store it
         if ((node.bufferIndex == DEFAULT_INDEX) || _rebuildBuffer) {
-            // Return empty if we couldn't claim a buffer stream index.
+            // Return empty if we couldn't claim a buffer stream index
             if (!updateBufferIndex(node)) {
                 return fetchedData;
             }
@@ -1198,15 +1197,15 @@ std::map<int, std::vector<float>> OctreeManager::checkNodeIntersection(OctreeNod
     }
 
     // We're in a big, visible inner node -> remove it from cache if it existed.
-    // But not its children -> set recursive check to false.
+    // But not its children -> set recursive check to false
     fetchedData = removeNodeFromCache(node, deltaStars, false);
 
     // Recursively check if children should be rendered.
-    for (size_t i = 0; i < 8; i++) {
+    for (const std::shared_ptr<OctreeNode>& child : node.children) {
         // Observe that if there exists identical keys in fetchedData then those values in
-        // tmpData will be ignored! Thus we store the removed keys until next render call!
+        // tmpData will be ignored! Thus we store the removed keys until next render call
         std::map<int, std::vector<float>> tmpData = checkNodeIntersection(
-            *node.Children[i],
+            *child,
             mvp,
             screenSize,
             deltaStars,
@@ -1223,28 +1222,27 @@ std::map<int, std::vector<float>> OctreeManager::removeNodeFromCache(OctreeNode&
 {
     std::map<int, std::vector<float>> keysToRemove;
 
-    // If we're in rebuilding mode then there is no need to remove any nodes.
-    //if (_rebuildBuffer) return keysToRemove;
+    // If we're in rebuilding mode then there is no need to remove any nodes
 
-    // Check if this node was rendered == had a specified index.
+    // Check if this node was rendered == had a specified index
     if (node.bufferIndex != DEFAULT_INDEX) {
 
-        // Reclaim that index. We need to wait until next render call to use it again!
+        // Reclaim that index. We need to wait until next render call to use it again
         _removedKeysInPrevCall.insert(node.bufferIndex);
 
-        // Insert dummy node at offset index that should be removed from render.
+        // Insert dummy node at offset index that should be removed from render
         keysToRemove[node.bufferIndex] = std::vector<float>();
 
-        // Reset index and adjust stars removed this frame.
+        // Reset index and adjust stars removed this frame
         node.bufferIndex = DEFAULT_INDEX;
         deltaStars -= static_cast<int>(node.numStars);
     }
 
-    // Check children recursively if we're in an inner node.
+    // Check children recursively if we're in an inner node
     if (!(node.isLeaf) && recursive) {
-        for (int i = 0; i < 8; i++) {
+        for (const std::shared_ptr<OctreeNode>& child : node.children) {
             std::map<int, std::vector<float>> tmpData = removeNodeFromCache(
-                *node.Children[i],
+                *child,
                 deltaStars
             );
             keysToRemove.insert(tmpData.begin(), tmpData.end());
@@ -1256,38 +1254,35 @@ std::map<int, std::vector<float>> OctreeManager::removeNodeFromCache(OctreeNode&
 std::vector<float> OctreeManager::getNodeData(const OctreeNode& node,
                                               gaia::RenderMode mode)
 {
-    // Return node data if node is a leaf.
+    // Return node data if node is a leaf
     if (node.isLeaf) {
         int dStars = 0;
         return constructInsertData(node, mode, dStars);
     }
 
-    // If we're not in a leaf, get data from all children recursively.
+    // If we're not in a leaf, get data from all children recursively
     std::vector<float> nodeData;
-    for (size_t i = 0; i < 8; i++) {
-        std::vector<float> tmpData = getNodeData(*node.Children[i], mode);
+    for (const std::shared_ptr<OctreeNode>& child : node.children) {
+        std::vector<float> tmpData = getNodeData(*child, mode);
         nodeData.insert(nodeData.end(), tmpData.begin(), tmpData.end());
     }
     return nodeData;
 }
 
 void OctreeManager::clearNodeData(OctreeNode& node) {
-    // Clear data and its allocated memory.
+    // Clear data and its allocated memory
     node.posData.clear();
-    node.posData.shrink_to_fit();
     node.colData.clear();
-    node.colData.shrink_to_fit();
     node.velData.clear();
-    node.velData.shrink_to_fit();
 
-    // Clear magnitudes as well!
+    // Clear magnitudes as well
     //std::vector<std::pair<float, size_t>>().swap(node->magOrder);
     node.magOrder.clear();
 
     if (!node.isLeaf) {
-        // Remove data from all children recursively.
-        for (size_t i = 0; i < 8; i++) {
-            clearNodeData(*node.Children[i]);
+        // Remove data from all children recursively
+        for (const std::shared_ptr<OctreeNode>& child : node.children) {
+            clearNodeData(*child);
         }
     }
 }
@@ -1295,35 +1290,35 @@ void OctreeManager::clearNodeData(OctreeNode& node) {
 void OctreeManager::createNodeChildren(OctreeNode& node) {
     for (size_t i = 0; i < 8; i++) {
         _numLeafNodes++;
-        node.Children[i] = std::make_shared<OctreeNode>();
-        node.Children[i]->isLeaf = true;
-        node.Children[i]->isLoaded = false;
-        node.Children[i]->hasLoadedDescendant = false;
-        node.Children[i]->bufferIndex = DEFAULT_INDEX;
-        node.Children[i]->octreePositionIndex = (node.octreePositionIndex * 10) + i;
-        node.Children[i]->numStars = 0;
-        node.Children[i]->posData = std::vector<float>();
-        node.Children[i]->colData = std::vector<float>();
-        node.Children[i]->velData = std::vector<float>();
-        node.Children[i]->magOrder = std::vector<std::pair<float, size_t>>();
-        node.Children[i]->halfDimension = node.halfDimension / 2.f;
+        node.children[i] = std::make_shared<OctreeNode>();
+        node.children[i]->isLeaf = true;
+        node.children[i]->isLoaded = false;
+        node.children[i]->hasLoadedDescendant = false;
+        node.children[i]->bufferIndex = DEFAULT_INDEX;
+        node.children[i]->octreePositionIndex = (node.octreePositionIndex * 10) + i;
+        node.children[i]->numStars = 0;
+        node.children[i]->posData = std::vector<float>();
+        node.children[i]->colData = std::vector<float>();
+        node.children[i]->velData = std::vector<float>();
+        node.children[i]->magOrder = std::vector<std::pair<float, size_t>>();
+        node.children[i]->halfDimension = node.halfDimension / 2.f;
 
-        // Calculate new origin.
-        node.Children[i]->originX = node.originX;
-        node.Children[i]->originX += (i % 2 == 0) ?
-            node.Children[i]->halfDimension :
-            -node.Children[i]->halfDimension;
-        node.Children[i]->originY = node.originY;
-        node.Children[i]->originY += (i % 4 < 2) ?
-            node.Children[i]->halfDimension :
-            -node.Children[i]->halfDimension;
-        node.Children[i]->originZ = node.originZ;
-        node.Children[i]->originZ += (i < 4) ?
-            node.Children[i]->halfDimension :
-            -node.Children[i]->halfDimension;
+        // Calculate new origin
+        node.children[i]->originX = node.originX;
+        node.children[i]->originX += (i % 2 == 0) ?
+            node.children[i]->halfDimension :
+            -node.children[i]->halfDimension;
+        node.children[i]->originY = node.originY;
+        node.children[i]->originY += (i % 4 < 2) ?
+            node.children[i]->halfDimension :
+            -node.children[i]->halfDimension;
+        node.children[i]->originZ = node.originZ;
+        node.children[i]->originZ += (i < 4) ?
+            node.children[i]->halfDimension :
+            -node.children[i]->halfDimension;
     }
 
-    // Clean up parent.
+    // Clean up parent
     node.isLeaf = false;
     _numLeafNodes--;
     _numInnerNodes++;
@@ -1331,26 +1326,26 @@ void OctreeManager::createNodeChildren(OctreeNode& node) {
 
 bool OctreeManager::updateBufferIndex(OctreeNode& node) {
     if (node.bufferIndex != DEFAULT_INDEX) {
-        // If we're rebuilding Buffer Index Cache then store indices to overwrite later.
+        // If we're rebuilding Buffer Index Cache then store indices to overwrite later
         _removedKeysInPrevCall.insert(node.bufferIndex);
     }
 
-    // Make sure node isn't loading/unloading as we're checking isLoaded flag.
-    std::lock_guard lock(node.loadingLock);
+    // Make sure node isn't loading/unloading as we're checking isLoaded flag
+    const std::lock_guard lock(node.loadingLock);
 
     // Return false if there are no more spots in our buffer, or if we're streaming and
-    // node isn't loaded yet, or if node doesn't have any stars.
+    // node isn't loaded yet, or if node doesn't have any stars
     if (_freeSpotsInBuffer.empty() || (_streamOctree && !node.isLoaded) ||
         node.numStars == 0)
     {
         return false;
     }
 
-    // Get correct insert index from stack.
+    // Get correct insert index from stack
     node.bufferIndex = _freeSpotsInBuffer.top();
     _freeSpotsInBuffer.pop();
 
-    // Keep track of how many chunks are in use (ceiling).
+    // Keep track of how many chunks are in use (ceiling)
     if (_freeSpotsInBuffer.empty()) {
         _biggestChunkIndexInUse++;
     }
@@ -1362,15 +1357,15 @@ bool OctreeManager::updateBufferIndex(OctreeNode& node) {
 
 std::vector<float> OctreeManager::constructInsertData(const OctreeNode& node,
                                                       gaia::RenderMode mode,
-                                                      int& deltaStars)
+                                                      int& deltaStars) const
 {
-    // Return early if node doesn't contain any stars!
+    // Return early if node doesn't contain any stars
     if (node.numStars == 0) {
         return std::vector<float>();
     }
 
-    // Fill chunk by appending zeroes to data so we overwrite possible earlier values.
-    // And more importantly so our attribute pointers knows where to read!
+    // Fill chunk by appending zeroes to data so we overwrite possible earlier values
+    // And more importantly so our attribute pointers knows where to read
     auto insertData = std::vector<float>(node.posData.begin(), node.posData.end());
     if (_useVBO) {
         insertData.resize(POS_SIZE * MAX_STARS_PER_NODE, 0.f);
@@ -1390,7 +1385,7 @@ std::vector<float> OctreeManager::constructInsertData(const OctreeNode& node,
         }
     }
 
-    // Update deltaStars.
+    // Update deltaStars
     deltaStars += static_cast<int>(node.numStars);
     return insertData;
 }
diff --git a/modules/gaia/rendering/octreemanager.h b/modules/gaia/rendering/octreemanager.h
index 23fa61e2a9..05a56a5908 100644
--- a/modules/gaia/rendering/octreemanager.h
+++ b/modules/gaia/rendering/octreemanager.h
@@ -28,6 +28,7 @@
 #include <modules/gaia/rendering/gaiaoptions.h>
 #include <ghoul/glm.h>
 #include <ghoul/opengl/ghoul_gl.h>
+#include <array>
 #include <map>
 #include <mutex>
 #include <queue>
@@ -41,7 +42,7 @@ class OctreeCuller;
 class OctreeManager {
 public:
     struct OctreeNode {
-        std::shared_ptr<OctreeNode> Children[8];
+        std::array<std::shared_ptr<OctreeNode>, 8> children;
         std::vector<float> posData;
         std::vector<float> colData;
         std::vector<float> velData;
@@ -201,12 +202,6 @@ private:
     const int DEFAULT_INDEX = -1;
     const std::string BINARY_SUFFIX = ".bin";
 
-    /**
-     * \return the correct index of child node. Maps [1,1,1] to 0 and [-1,-1,-1] to 7.
-     */
-    size_t getChildIndex(float posX, float posY, float posZ, float origX = 0.f,
-        float origY = 0.f, float origZ = 0.f);
-
     /**
      * Private help function for `insert()`. Inserts star into node if leaf and
      * numStars < MAX_STARS_PER_NODE. If a leaf goes above the threshold it is subdivided
@@ -228,7 +223,7 @@ private:
      * Private help function for `insertInNode()`. Stores star data in node and
      * keeps track of the brightest stars all children.
      */
-    void storeStarData(OctreeNode& node, const std::vector<float>& starValues);
+    void storeStarData(OctreeNode& node, const std::vector<float>& starValues) const;
 
     /**
      * Private help function for `printStarsPerNode()`.
@@ -301,7 +296,7 @@ private:
      * \return the data to be inserted
      */
     std::vector<float> constructInsertData(const OctreeNode& node,
-        gaia::RenderMode mode, int& deltaStars);
+        gaia::RenderMode mode, int& deltaStars) const;
 
     /**
      * Write a node to outFileStream.
diff --git a/modules/gaia/rendering/renderablegaiastars.cpp b/modules/gaia/rendering/renderablegaiastars.cpp
index 632f4a5eaa..a6d943d28f 100644
--- a/modules/gaia/rendering/renderablegaiastars.cpp
+++ b/modules/gaia/rendering/renderablegaiastars.cpp
@@ -606,7 +606,7 @@ RenderableGaiaStars::RenderableGaiaStars(const ghoul::Dictionary& dictionary)
         // available to always be consistant with previous call(s).
         GLint nDedicatedVidMemoryInKB = 0;
         glGetIntegerv(GL_GPU_MEMORY_INFO_DEDICATED_VIDMEM_NVX, &nDedicatedVidMemoryInKB);
-        float dedicatedVidMem = static_cast<float>(
+        const float dedicatedVidMem = static_cast<float>(
             static_cast<long long>(nDedicatedVidMemoryInKB) * 1024
         );
 
@@ -648,17 +648,17 @@ RenderableGaiaStars::RenderableGaiaStars(const ghoul::Dictionary& dictionary)
         addProperty(_lastRow);
 
         if (p.columnNames.has_value()) {
-            ghoul::Dictionary tmpDict = dictionary.value<ghoul::Dictionary>(
+            const ghoul::Dictionary tmpDict = dictionary.value<ghoul::Dictionary>(
                 ColumnNamesInfo.identifier
             );
 
             // Ugly fix for ASCII sorting when there are more columns read than 10.
             std::set<int> intKeys;
-            for (std::string_view key : tmpDict.keys()) {
+            for (const std::string_view key : tmpDict.keys()) {
                 intKeys.insert(std::stoi(std::string(key)));
             }
 
-            for (int key : intKeys) {
+            for (const int key : intKeys) {
                 _columnNames.push_back(tmpDict.value<std::string>(std::to_string(key)));
             }
 
@@ -882,7 +882,7 @@ void RenderableGaiaStars::initializeGL() {
     ));
 
     // Set ceiling for video memory to use in streaming.
-    float dedicatedVidMem = static_cast<float>(
+    const float dedicatedVidMem = static_cast<float>(
         static_cast<long long>(nDedicatedVidMemoryInKB) * 1024
     );
     // TODO: Need to fix what happens if we can't query! For now use 2 GB by default.
@@ -891,8 +891,8 @@ void RenderableGaiaStars::initializeGL() {
         2147483648;
 
     // Set ceiling for how much of the installed CPU RAM to use for streaming
-    long long installedRam = static_cast<long long>(CpuCap.installedMainMemory()) *
-                             1024 * 1024;
+    const long long installedRam =
+        static_cast<long long>(CpuCap.installedMainMemory()) * 1024 * 1024;
     // TODO: What to do if we can't query? As for now we use 4 GB by default.
     _cpuRamBudgetInBytes = installedRam > 0 ?
         static_cast<long long>(static_cast<float>(installedRam) * _maxCpuMemoryPercent) :
@@ -958,18 +958,18 @@ void RenderableGaiaStars::deinitializeGL() {
 void RenderableGaiaStars::render(const RenderData& data, RendererTasks&) {
     checkGlErrors("Before render");
 
-    // Save current FBO.
-    GLint defaultFbo;
+    // Save current FBO
+    GLint defaultFbo = 0;
     glGetIntegerv(GL_FRAMEBUFFER_BINDING, &defaultFbo);
 
-    glm::dmat4 model = calcModelTransform(data);
+    const glm::dmat4 model = calcModelTransform(data);
 
-    float viewScaling = data.camera.scaling();
-    glm::dmat4 view = data.camera.combinedViewMatrix();
-    glm::dmat4 projection = data.camera.projectionMatrix();
+    const float viewScaling = data.camera.scaling();
+    const glm::dmat4 view = data.camera.combinedViewMatrix();
+    const glm::dmat4 projection = data.camera.projectionMatrix();
 
-    glm::dmat4 modelViewProjMat = calcModelViewProjectionTransform(data, model);
-    glm::vec2 screenSize = glm::vec2(global::renderEngine->renderingResolution());
+    const glm::dmat4 modelViewProjMat = calcModelViewProjectionTransform(data, model);
+    const glm::vec2 screenSize = glm::vec2(global::renderEngine->renderingResolution());
 
     // Wait until camera has stabilized before we traverse the Octree/stream from files.
     const double rotationDiff = std::abs(length(_previousCameraRotation) -
@@ -985,8 +985,8 @@ void RenderableGaiaStars::render(const RenderData& data, RendererTasks&) {
     // Update which nodes that are stored in memory as the camera moves around
     // (if streaming)
     if (_fileReaderOption == gaia::FileReaderOption::StreamOctree) {
-        glm::dvec3 cameraPos = data.camera.positionVec3();
-        size_t chunkSizeBytes = _chunkSize * sizeof(GLfloat);
+        const glm::dvec3 cameraPos = data.camera.positionVec3();
+        const size_t chunkSizeBytes = _chunkSize * sizeof(GLfloat);
         _octreeManager.fetchSurroundingNodes(cameraPos, chunkSizeBytes, _additionalNodes);
 
         // Update CPU Budget property.
@@ -996,7 +996,7 @@ void RenderableGaiaStars::render(const RenderData& data, RendererTasks&) {
     // Traverse Octree and build a map with new nodes to render, uses mvp matrix to decide
     const int renderOption = _renderMode;
     int deltaStars = 0;
-    std::map<int, std::vector<float>> updateData = _octreeManager.traverseData(
+    const std::map<int, std::vector<float>> updateData = _octreeManager.traverseData(
         modelViewProjMat,
         screenSize,
         deltaStars,
@@ -1011,9 +1011,9 @@ void RenderableGaiaStars::render(const RenderData& data, RendererTasks&) {
     // Update GPU Stream Budget property.
     _gpuStreamBudgetProperty = static_cast<float>(_octreeManager.numFreeSpotsInBuffer());
 
-    int nChunksToRender = static_cast<int>(_octreeManager.biggestChunkIndexInUse());
-    int maxStarsPerNode = static_cast<int>(_octreeManager.maxStarsPerNode());
-    int valuesPerStar = static_cast<int>(_nRenderValuesPerStar);
+    const int nChunksToRender = static_cast<int>(_octreeManager.biggestChunkIndexInUse());
+    const int maxStarsPerNode = static_cast<int>(_octreeManager.maxStarsPerNode());
+    const int valuesPerStar = static_cast<int>(_nRenderValuesPerStar);
 
     // Switch rendering technique depending on user-defined shader option.
     const int shaderOption = _shaderOption;
@@ -1025,7 +1025,7 @@ void RenderableGaiaStars::render(const RenderData& data, RendererTasks&) {
         //------------------------ RENDER WITH SSBO ---------------------------
         // Update SSBO Index array with accumulated stars in all chunks.
         glBindBuffer(GL_SHADER_STORAGE_BUFFER, _ssboIdx);
-        int lastValue = _accumulatedIndices.back();
+        const int lastValue = _accumulatedIndices.back();
         _accumulatedIndices.resize(nChunksToRender + 1, lastValue);
 
         // Update vector with accumulated indices.
@@ -1037,9 +1037,10 @@ void RenderableGaiaStars::render(const RenderData& data, RendererTasks&) {
                 continue;
             }
 
-            int newValue = static_cast<int>(subData.size() / _nRenderValuesPerStar) +
-                           _accumulatedIndices[offset];
-            int changeInValue = newValue - _accumulatedIndices[offset + 1];
+            const int newValue =
+                static_cast<int>(subData.size() / _nRenderValuesPerStar) +
+                    _accumulatedIndices[offset];
+            const int changeInValue = newValue - _accumulatedIndices[offset + 1];
             _accumulatedIndices[offset + 1] = newValue;
             // Propagate change.
             for (int i = offset + 1; i < nChunksToRender; i++) {
@@ -1053,7 +1054,7 @@ void RenderableGaiaStars::render(const RenderData& data, RendererTasks&) {
             _nRenderedStars = _nStarsToRender;
         }
 
-        size_t indexBufferSize = _accumulatedIndices.size() * sizeof(GLint);
+        const size_t indexBufferSize = _accumulatedIndices.size() * sizeof(GLint);
 
         // Update SSBO Index (stars per chunk).
         glBufferData(
@@ -1099,9 +1100,10 @@ void RenderableGaiaStars::render(const RenderData& data, RendererTasks&) {
 
         // Always update Position VBO.
         glBindBuffer(GL_ARRAY_BUFFER, _vboPos);
-        float posMemoryShare = static_cast<float>(PositionSize) / _nRenderValuesPerStar;
-        size_t posChunkSize = maxStarsPerNode * PositionSize;
-        long long posStreamingBudget = static_cast<long long>(
+        const float posMemoryShare =
+            static_cast<float>(PositionSize) / _nRenderValuesPerStar;
+        const size_t posChunkSize = maxStarsPerNode * PositionSize;
+        const long long posStreamingBudget = static_cast<long long>(
             _maxStreamingBudgetInBytes * posMemoryShare
         );
 
@@ -1132,9 +1134,10 @@ void RenderableGaiaStars::render(const RenderData& data, RendererTasks&) {
         // Update Color VBO if render option is 'Color' or 'Motion'.
         if (renderOption != gaia::RenderMode::Static) {
             glBindBuffer(GL_ARRAY_BUFFER, _vboCol);
-            float colMemoryShare = static_cast<float>(ColorSize) / _nRenderValuesPerStar;
-            size_t colChunkSize = maxStarsPerNode * ColorSize;
-            long long colStreamingBudget = static_cast<long long>(
+            const float colMemoryShare =
+                static_cast<float>(ColorSize) / _nRenderValuesPerStar;
+            const size_t colChunkSize = maxStarsPerNode * ColorSize;
+            const long long colStreamingBudget = static_cast<long long>(
                 _maxStreamingBudgetInBytes * colMemoryShare
             );
 
@@ -1163,10 +1166,10 @@ void RenderableGaiaStars::render(const RenderData& data, RendererTasks&) {
             // Update Velocity VBO if specified.
             if (renderOption == gaia::RenderMode::Motion) {
                 glBindBuffer(GL_ARRAY_BUFFER, _vboVel);
-                float velMemoryShare = static_cast<float>(VelocitySize) /
+                const float velMemoryShare = static_cast<float>(VelocitySize) /
                                        _nRenderValuesPerStar;
-                size_t velChunkSize = maxStarsPerNode * VelocitySize;
-                long long velStreamingBudget = static_cast<long long>(
+                const size_t velChunkSize = maxStarsPerNode * VelocitySize;
+                const long long velStreamingBudget = static_cast<long long>(
                     _maxStreamingBudgetInBytes * velMemoryShare
                 );
 
@@ -1357,7 +1360,7 @@ void RenderableGaiaStars::render(const RenderData& data, RendererTasks&) {
 
 void RenderableGaiaStars::checkGlErrors(const std::string& identifier) const {
     if (_reportGlErrors) {
-        GLenum error = glGetError();
+        const GLenum error = glGetError();
         if (error != GL_NO_ERROR) {
             switch (error) {
             case GL_INVALID_ENUM:
@@ -1395,7 +1398,7 @@ void RenderableGaiaStars::update(const UpdateData&) {
     if (_dataIsDirty) {
         LDEBUG("Regenerating data");
         // Reload data file. This may reconstruct the Octree as well.
-        bool success = readDataFile();
+        const bool success = readDataFile();
         if (!success) {
             throw ghoul::RuntimeError("Error loading Gaia Star data");
         }
@@ -1695,10 +1698,10 @@ void RenderableGaiaStars::update(const UpdateData&) {
             }
             case gaia::ShaderOption::BillboardSSBO:
             case gaia::ShaderOption::BillboardVBO: {
-                std::filesystem::path vs = absPath(
+                const std::filesystem::path vs = absPath(
                     "${MODULE_GAIA}/shaders/gaia_tonemapping_vs.glsl"
                 );
-                std::filesystem::path fs = absPath(
+                const std::filesystem::path fs = absPath(
                     "${MODULE_GAIA}/shaders/gaia_tonemapping_billboard_fs.glsl"
                 );
                 std::unique_ptr<ghoul::opengl::ProgramObject> programTM =
@@ -1732,8 +1735,8 @@ void RenderableGaiaStars::update(const UpdateData&) {
 
         // Calculate memory budgets.
         _chunkSize = _octreeManager.maxStarsPerNode() * _nRenderValuesPerStar;
-        long long totalChunkSizeInBytes = _octreeManager.totalNodes() *
-                                          _chunkSize * sizeof(GLfloat);
+        const long long totalChunkSizeInBytes =
+            _octreeManager.totalNodes() * _chunkSize * sizeof(GLfloat);
         _maxStreamingBudgetInBytes = std::min(
             totalChunkSizeInBytes,
             _gpuMemoryBudgetInBytes
@@ -1742,7 +1745,7 @@ void RenderableGaiaStars::update(const UpdateData&) {
                                      (_chunkSize * sizeof(GLfloat));
 
         _gpuStreamBudgetProperty.setMaxValue(static_cast<float>(maxNodesInStream));
-        bool datasetFitInMemory =
+        const bool datasetFitInMemory =
             static_cast<float>(_totalDatasetSizeInBytes) < (_cpuRamBudgetInBytes * 0.9f);
 
         if (!datasetFitInMemory && !hasProperty(&_additionalNodes)) {
@@ -1894,11 +1897,11 @@ void RenderableGaiaStars::update(const UpdateData&) {
             switch (renderOption) {
                 case gaia::RenderMode::Static: {
                     glBindBuffer(GL_ARRAY_BUFFER, _vboPos);
-                    GLint positionAttrib = _program->attributeLocation("in_position");
-                    glEnableVertexAttribArray(positionAttrib);
+                    const GLint position = _program->attributeLocation("in_position");
+                    glEnableVertexAttribArray(position);
 
                     glVertexAttribPointer(
-                        positionAttrib,
+                        position,
                         PositionSize,
                         GL_FLOAT,
                         GL_FALSE,
@@ -1910,11 +1913,11 @@ void RenderableGaiaStars::update(const UpdateData&) {
                 }
                 case gaia::RenderMode::Color: {
                     glBindBuffer(GL_ARRAY_BUFFER, _vboPos);
-                    GLint positionAttrib = _program->attributeLocation("in_position");
-                    glEnableVertexAttribArray(positionAttrib);
+                    const GLint position = _program->attributeLocation("in_position");
+                    glEnableVertexAttribArray(position);
 
                     glVertexAttribPointer(
-                        positionAttrib,
+                        position,
                         PositionSize,
                         GL_FLOAT,
                         GL_FALSE,
@@ -1923,11 +1926,11 @@ void RenderableGaiaStars::update(const UpdateData&) {
                     );
 
                     glBindBuffer(GL_ARRAY_BUFFER, _vboCol);
-                    GLint brightnessAttrib = _program->attributeLocation("in_brightness");
-                    glEnableVertexAttribArray(brightnessAttrib);
+                    const GLint brightness = _program->attributeLocation("in_brightness");
+                    glEnableVertexAttribArray(brightness);
 
                     glVertexAttribPointer(
-                        brightnessAttrib,
+                        brightness,
                         ColorSize,
                         GL_FLOAT,
                         GL_FALSE,
@@ -1938,11 +1941,11 @@ void RenderableGaiaStars::update(const UpdateData&) {
                 }
                 case gaia::RenderMode::Motion: {
                     glBindBuffer(GL_ARRAY_BUFFER, _vboPos);
-                    GLint positionAttrib = _program->attributeLocation("in_position");
-                    glEnableVertexAttribArray(positionAttrib);
+                    const GLint position = _program->attributeLocation("in_position");
+                    glEnableVertexAttribArray(position);
 
                     glVertexAttribPointer(
-                        positionAttrib,
+                        position,
                         PositionSize,
                         GL_FLOAT,
                         GL_FALSE,
@@ -1951,11 +1954,11 @@ void RenderableGaiaStars::update(const UpdateData&) {
                     );
 
                     glBindBuffer(GL_ARRAY_BUFFER, _vboCol);
-                    GLint brightnessAttrib = _program->attributeLocation("in_brightness");
-                    glEnableVertexAttribArray(brightnessAttrib);
+                    const GLint brightness = _program->attributeLocation("in_brightness");
+                    glEnableVertexAttribArray(brightness);
 
                     glVertexAttribPointer(
-                        brightnessAttrib,
+                        brightness,
                         ColorSize,
                         GL_FLOAT,
                         GL_FALSE,
@@ -1964,11 +1967,11 @@ void RenderableGaiaStars::update(const UpdateData&) {
                     );
 
                     glBindBuffer(GL_ARRAY_BUFFER, _vboVel);
-                    GLint velocityAttrib = _program->attributeLocation("in_velocity");
-                    glEnableVertexAttribArray(velocityAttrib);
+                    const GLint velocity = _program->attributeLocation("in_velocity");
+                    glEnableVertexAttribArray(velocity);
 
                     glVertexAttribPointer(
-                        velocityAttrib,
+                        velocity,
                         VelocitySize,
                         GL_FLOAT,
                         GL_FALSE,
@@ -2021,23 +2024,23 @@ void RenderableGaiaStars::update(const UpdateData&) {
         glBindBuffer(GL_ARRAY_BUFFER, _vboQuad);
 
         // Quad for fullscreen.
-        static constexpr GLfloat vbo_quad_data[] = {
-            -1.0f, -1.0f, 0.0f,
-            1.0f, -1.0f, 0.0f,
-            -1.0f,  1.0f, 0.0f,
-            -1.0f,  1.0f, 0.0f,
-            1.0f, -1.0f, 0.0f,
-            1.0f,  1.0f, 0.0f,
+        constexpr std::array<GLfloat, 24> VboQuadData = {
+            -1.f, -1.f, 0.f,
+             1.f, -1.f, 0.f,
+            -1.f,  1.f, 0.f,
+            -1.f,  1.f, 0.f,
+             1.f, -1.f, 0.f,
+             1.f,  1.f, 0.f,
         };
 
         glBufferData(
             GL_ARRAY_BUFFER,
-            sizeof(vbo_quad_data),
-            vbo_quad_data,
+            sizeof(VboQuadData),
+            VboQuadData.data(),
             GL_STATIC_DRAW
         );
 
-        GLint tmPositionAttrib = _programTM->attributeLocation("in_position");
+        const GLint tmPositionAttrib = _programTM->attributeLocation("in_position");
         glEnableVertexAttribArray(tmPositionAttrib);
         glVertexAttribPointer(
             tmPositionAttrib,
@@ -2059,7 +2062,9 @@ void RenderableGaiaStars::update(const UpdateData&) {
         }
         if (!_fboTexture) {
             // Generate a new texture and attach it to our FBO.
-            glm::vec2 screenSize = glm::vec2(global::renderEngine->renderingResolution());
+            const glm::vec2 screenSize = glm::vec2(
+                global::renderEngine->renderingResolution()
+            );
             _fboTexture = std::make_unique<ghoul::opengl::Texture>(
                 glm::uvec3(screenSize, 1),
                 GL_TEXTURE_2D,
@@ -2079,8 +2084,8 @@ void RenderableGaiaStars::update(const UpdateData&) {
             *_fboTexture,
             0
         );
-        GLenum textureBuffers[1] = { GL_COLOR_ATTACHMENT0 };
-        glDrawBuffers(1, textureBuffers);
+        const GLenum textureBuffer = GL_COLOR_ATTACHMENT0;
+        glDrawBuffers(1, &textureBuffer);
 
         // Check that our framebuffer is ok.
         if (glCheckFramebufferStatus(GL_FRAMEBUFFER) != GL_FRAMEBUFFER_COMPLETE) {
@@ -2144,8 +2149,10 @@ void RenderableGaiaStars::update(const UpdateData&) {
     }
 
     if (global::windowDelegate->windowHasResized()) {
-        // Update FBO texture resolution if we haven't already.
-        glm::vec2 screenSize = glm::vec2(global::renderEngine->renderingResolution());
+        // Update FBO texture resolution if we haven't already
+        const glm::vec2 screenSize = glm::vec2(
+            global::renderEngine->renderingResolution()
+        );
         const bool hasChanged = glm::any(
             glm::notEqual(_fboTexture->dimensions(), glm::uvec3(screenSize, 1))
         );
@@ -2169,8 +2176,8 @@ void RenderableGaiaStars::update(const UpdateData&) {
                 *_fboTexture,
                 0
             );
-            GLenum textureBuffers[1] = { GL_COLOR_ATTACHMENT0 };
-            glDrawBuffers(1, textureBuffers);
+            const GLenum textureBuffer = GL_COLOR_ATTACHMENT0;
+            glDrawBuffers(1, &textureBuffer);
 
             // Check that our framebuffer is ok.
             if (glCheckFramebufferStatus(GL_FRAMEBUFFER) != GL_FRAMEBUFFER_COMPLETE) {
@@ -2238,10 +2245,9 @@ int RenderableGaiaStars::readFitsFile(const std::filesystem::path& filePath) {
 
     // Insert stars into octree.
     for (size_t i = 0; i < fullData.size(); i += nReadValuesPerStar) {
-        auto first = fullData.begin() + i;
-        auto last = fullData.begin() + i + nReadValuesPerStar;
-        std::vector<float> starValues(first, last);
-
+        const auto first = fullData.begin() + i;
+        const auto last = fullData.begin() + i + nReadValuesPerStar;
+        const std::vector<float> starValues(first, last);
         _octreeManager.insert(starValues);
     }
     _octreeManager.sliceLodData();
@@ -2258,8 +2264,7 @@ int RenderableGaiaStars::readSpeckFile(const std::filesystem::path& filePath) {
     for (size_t i = 0; i < fullData.size(); i += nReadValuesPerStar) {
         auto first = fullData.begin() + i;
         auto last = fullData.begin() + i + nReadValuesPerStar;
-        std::vector<float> starValues(first, last);
-
+        const std::vector<float> starValues = std::vector<float>(first, last);
         _octreeManager.insert(starValues);
     }
     _octreeManager.sliceLodData();
@@ -2274,7 +2279,7 @@ int RenderableGaiaStars::readBinaryRawFile(const std::filesystem::path& filePath
     if (fileStream.good()) {
         int32_t nValues = 0;
         int32_t nReadValuesPerStar = 0;
-        int renderValues = 8;
+        const int renderValues = 8;
         fileStream.read(reinterpret_cast<char*>(&nValues), sizeof(int32_t));
         fileStream.read(reinterpret_cast<char*>(&nReadValuesPerStar), sizeof(int32_t));
 
@@ -2288,7 +2293,7 @@ int RenderableGaiaStars::readBinaryRawFile(const std::filesystem::path& filePath
         for (size_t i = 0; i < fullData.size(); i += nReadValuesPerStar) {
             auto first = fullData.begin() + i;
             auto last = fullData.begin() + i + renderValues;
-            std::vector<float> starValues(first, last);
+            const std::vector<float> starValues(first, last);
 
             _octreeManager.insert(starValues);
         }
diff --git a/modules/gaia/shaders/gaia_point_fs.glsl b/modules/gaia/shaders/gaia_point_fs.glsl
index 1096e6894d..0dc7b66d58 100644
--- a/modules/gaia/shaders/gaia_point_fs.glsl
+++ b/modules/gaia/shaders/gaia_point_fs.glsl
@@ -95,5 +95,5 @@ void main() {
     //color *= ratio * ratioMultiplier;
   }
 
-  outColor = vec4(color, 1.0f);
+  outColor = vec4(color, 1.0);
 }
diff --git a/modules/gaia/shaders/gaia_ssbo_vs.glsl b/modules/gaia/shaders/gaia_ssbo_vs.glsl
index c9af489f34..faa139202d 100644
--- a/modules/gaia/shaders/gaia_ssbo_vs.glsl
+++ b/modules/gaia/shaders/gaia_ssbo_vs.glsl
@@ -130,8 +130,8 @@ void main() {
 
     // Check if we should filter this star by magnitude or color
     if ((abs(gMagThreshold.x - gMagThreshold.y) < EPS && abs(gMagThreshold.x - in_brightness.x) < EPS) ||
-        (abs(gMagThreshold.x - 20.0f) > EPS && in_brightness.x < gMagThreshold.x) ||
-        (abs(gMagThreshold.y - 20.0f) > EPS && in_brightness.x > gMagThreshold.y) ||
+        (abs(gMagThreshold.x - 20.0) > EPS && in_brightness.x < gMagThreshold.x) ||
+        (abs(gMagThreshold.y - 20.0) > EPS && in_brightness.x > gMagThreshold.y) ||
         (abs(bpRpThreshold.x - bpRpThreshold.y) < EPS && abs(bpRpThreshold.x - in_brightness.y) < EPS) ||
         (abs(bpRpThreshold.x) > EPS && in_brightness.y < bpRpThreshold.x) ||
         (abs(bpRpThreshold.y) > EPS && in_brightness.y > bpRpThreshold.y))
@@ -169,7 +169,7 @@ void main() {
 
   // Apply camera transforms
   dvec4 viewPosition = view * model * objectPosition;
-  vec4 sunPosition = vec4(view * model * dvec4(0.0f, 0.0f, 0.0f, 1.0f));
+  vec4 sunPosition = vec4(view * model * dvec4(0.0, 0.0, 0.0, 1.0));
 
   vs_starDistFromSun = safeLength(objectPosition);
   vs_cameraDistFromSun = safeLength(sunPosition);
diff --git a/modules/gaia/shaders/gaia_tonemapping_point_fs.glsl b/modules/gaia/shaders/gaia_tonemapping_point_fs.glsl
index 63d2a9f0e4..37c7c907a8 100644
--- a/modules/gaia/shaders/gaia_tonemapping_point_fs.glsl
+++ b/modules/gaia/shaders/gaia_tonemapping_point_fs.glsl
@@ -162,7 +162,7 @@ Fragment getFragment() {
     discard;
   }
 
-  color = vec4(intensity, 1.0f);
+  color = vec4(intensity, 1.0);
 
   // Use the following to check for any intensity at all.
   //color = (length(intensity.rgb) > 0.001) ? vec4(1.0) : vec4(0.0);
diff --git a/modules/gaia/shaders/gaia_vbo_vs.glsl b/modules/gaia/shaders/gaia_vbo_vs.glsl
index 492fd86aee..19ccf6e1d5 100644
--- a/modules/gaia/shaders/gaia_vbo_vs.glsl
+++ b/modules/gaia/shaders/gaia_vbo_vs.glsl
@@ -69,8 +69,8 @@ void main() {
       && abs(length(in_position) - distThreshold.y) < EPS) ||
       (renderOption != RENDEROPTION_STATIC && (
       (abs(gMagThreshold.x - gMagThreshold.y) < EPS && abs(gMagThreshold.x - in_brightness.x) < EPS) ||
-      (abs(gMagThreshold.x - 20.0f) > EPS && in_brightness.x < gMagThreshold.x) ||
-      (abs(gMagThreshold.y - 20.0f) > EPS && in_brightness.x > gMagThreshold.y) ||
+      (abs(gMagThreshold.x - 20.0) > EPS && in_brightness.x < gMagThreshold.x) ||
+      (abs(gMagThreshold.y - 20.0) > EPS && in_brightness.x > gMagThreshold.y) ||
       (abs(bpRpThreshold.x - bpRpThreshold.y) < EPS && abs(bpRpThreshold.x - in_brightness.y) < EPS) ||
       (abs(bpRpThreshold.x) > EPS && in_brightness.y < bpRpThreshold.x) ||
       (abs(bpRpThreshold.y) > EPS && in_brightness.y > bpRpThreshold.y))))
@@ -104,7 +104,7 @@ void main() {
 
   // Apply camera transforms.
   dvec4 viewPosition = view * model * objectPosition;
-  vec4 sunPosition = vec4(view * model * vec4(0.0f, 0.0f, 0.0f, 1.0f));
+  vec4 sunPosition = vec4(view * model * vec4(0.0, 0.0, 0.0, 1.0));
 
   vs_starDistFromSun = safeLength(objectPosition);
   vs_cameraDistFromSun = safeLength(sunPosition);
diff --git a/modules/gaia/tasks/constructoctreetask.cpp b/modules/gaia/tasks/constructoctreetask.cpp
index 9681bf6fcf..7b5de63695 100644
--- a/modules/gaia/tasks/constructoctreetask.cpp
+++ b/modules/gaia/tasks/constructoctreetask.cpp
@@ -390,8 +390,8 @@ void ConstructOctreeTask::constructOctreeFromSingleFile(
         for (size_t i = 0; i < fullData.size(); i += nValuesPerStar) {
             auto first = fullData.begin() + i;
             auto last = fullData.begin() + i + nValuesPerStar;
-            std::vector<float> filterValues(first, last);
-            std::vector<float> renderValues(first, first + RENDER_VALUES);
+            const std::vector<float> filterValues(first, last);
+            const std::vector<float> renderValues(first, first + RENDER_VALUES);
 
             // Filter data by parameters.
             if (checkAllFilters(filterValues)) {
@@ -468,7 +468,7 @@ void ConstructOctreeTask::constructOctreeFromFolder(
 
     _indexOctreeManager->initOctree(0, _maxDist, _maxStarsPerNode);
 
-    float processOneFile = 1.f / allInputFiles.size();
+    const float processOneFile = 1.f / allInputFiles.size();
 
     LINFO(fmt::format(
         "MAX DIST: {} - MAX STARS PER NODE: {}",
@@ -506,7 +506,7 @@ void ConstructOctreeTask::constructOctreeFromFolder(
                 //}
 
                 // If all filters passed then insert render values into Octree.
-                std::vector<float> renderValues(
+                const std::vector<float> renderValues(
                     filterValues.begin(),
                     filterValues.begin() + RENDER_VALUES
                 );
@@ -646,10 +646,11 @@ bool ConstructOctreeTask::filterStar(const glm::vec2& range, float filterValue,
 {
     // Return true if star should be filtered away, i.e. if min = max = filterValue or
     // if filterValue < min (when min != 0.0) or filterValue > max (when max != 0.0).
-    return (fabs(range.x - range.y) < FLT_EPSILON &&
-        fabs(range.x - filterValue) < FLT_EPSILON) ||
-        (fabs(range.x - normValue) > FLT_EPSILON && filterValue < range.x) ||
-        (fabs(range.y - normValue) > FLT_EPSILON && filterValue > range.y);
+    constexpr float eps = std::numeric_limits<float>::epsilon();
+    return (std::abs(range.x - range.y) < eps &&
+        std::abs(range.x - filterValue) < eps) ||
+        (std::abs(range.x - normValue) > eps && filterValue < range.x) ||
+        (std::abs(range.y - normValue) > eps && filterValue > range.y);
 }
 
 documentation::Documentation ConstructOctreeTask::Documentation() {
diff --git a/modules/gaia/tasks/readfilejob.cpp b/modules/gaia/tasks/readfilejob.cpp
index fb7e5a287b..716471a252 100644
--- a/modules/gaia/tasks/readfilejob.cpp
+++ b/modules/gaia/tasks/readfilejob.cpp
@@ -50,7 +50,7 @@ ReadFileJob::ReadFileJob(std::string filePath, std::vector<std::string> allColum
 
 void ReadFileJob::execute() {
     // Read columns from FITS file. If rows aren't specified then full table will be read.
-    std::shared_ptr<TableData<float>> table = _fitsFileReader->readTable<float>(
+    const std::shared_ptr<TableData<float>> table = _fitsFileReader->readTable<float>(
         _inFilePath,
         _allColumns,
         _firstRow,
@@ -63,9 +63,9 @@ void ReadFileJob::execute() {
         ));
     }
 
-    int nStars = table->readRows - _firstRow + 1;
+    const int nStars = table->readRows - _firstRow + 1;
 
-    size_t nColumnsRead = _allColumns.size();
+    const size_t nColumnsRead = _allColumns.size();
     if (nColumnsRead != _nDefaultCols) {
         LINFO(
             "Additional columns will be read! Consider add column in code for "
@@ -139,7 +139,7 @@ void ReadFileJob::execute() {
         */
 
         // Convert ICRS Equatorial Ra and Dec to Galactic latitude and longitude.
-        glm::mat3 aPrimG = glm::mat3(
+        const glm::mat3 aPrimG = glm::mat3(
             // Col 0
             glm::vec3(-0.0548755604162154, 0.4941094278755837, -0.8676661490190047),
             // Col 1
@@ -147,12 +147,12 @@ void ReadFileJob::execute() {
             // Col 2
             glm::vec3(-0.4838350155487132, 0.7469822444972189, 0.4559837761750669)
         );
-        glm::vec3 rICRS = glm::vec3(
-            cos(glm::radians(ra[i])) * cos(glm::radians(dec[i])),
-            sin(glm::radians(ra[i])) * cos(glm::radians(dec[i])),
-            sin(glm::radians(dec[i]))
+        const glm::vec3 rICRS = glm::vec3(
+            std::cos(glm::radians(ra[i])) * std::cos(glm::radians(dec[i])),
+            std::sin(glm::radians(ra[i])) * std::cos(glm::radians(dec[i])),
+            std::sin(glm::radians(dec[i]))
         );
-        glm::vec3 rGal = aPrimG * rICRS;
+        const glm::vec3 rGal = aPrimG * rICRS;
         values[idx++] = radiusInKiloParsec * rGal.x; // Pos X
         values[idx++] = radiusInKiloParsec * rGal.y; // Pos Y
         values[idx++] = radiusInKiloParsec * rGal.z; // Pos Z
@@ -180,27 +180,27 @@ void ReadFileJob::execute() {
         }
 
         // Convert Proper Motion from ICRS [Ra,Dec] to Galactic Tanget Vector [l,b].
-        glm::vec3 uICRS = glm::vec3(
-            -sin(glm::radians(ra[i])) * pmra[i] -
-                cos(glm::radians(ra[i])) * sin(glm::radians(dec[i])) * pmdec[i],
-            cos(glm::radians(ra[i])) * pmra[i] -
-                sin(glm::radians(ra[i])) * sin(glm::radians(dec[i])) * pmdec[i],
-            cos(glm::radians(dec[i]))  * pmdec[i]
+        const glm::vec3 uICRS = glm::vec3(
+            -std::sin(glm::radians(ra[i])) * pmra[i] -
+                std::cos(glm::radians(ra[i])) * std::sin(glm::radians(dec[i])) * pmdec[i],
+            std::cos(glm::radians(ra[i])) * pmra[i] -
+                std::sin(glm::radians(ra[i])) * std::sin(glm::radians(dec[i])) * pmdec[i],
+            std::cos(glm::radians(dec[i]))  * pmdec[i]
         );
-        glm::vec3 pmVecGal = aPrimG * uICRS;
+        const glm::vec3 pmVecGal = aPrimG * uICRS;
 
         // Convert to Tangential vector [m/s] from Proper Motion vector [mas/yr]
-        float tanVelX = 1000.f * 4.74f * radiusInKiloParsec * pmVecGal.x;
-        float tanVelY = 1000.f * 4.74f * radiusInKiloParsec * pmVecGal.y;
-        float tanVelZ = 1000.f * 4.74f * radiusInKiloParsec * pmVecGal.z;
+        const float tanVelX = 1000.f * 4.74f * radiusInKiloParsec * pmVecGal.x;
+        const float tanVelY = 1000.f * 4.74f * radiusInKiloParsec * pmVecGal.y;
+        const float tanVelZ = 1000.f * 4.74f * radiusInKiloParsec * pmVecGal.z;
 
         // Calculate True Space Velocity [m/s] if we have the radial velocity
         if (!std::isnan(radial_vel[i])) {
             // Calculate Radial Velocity in the direction of the star.
             // radial_vel is given in [km/s] -> convert to [m/s].
-            float radVelX = 1000.f * radial_vel[i] * rGal.x;
-            float radVelY = 1000.f * radial_vel[i] * rGal.y;
-            float radVelZ = 1000.f * radial_vel[i] * rGal.z;
+            const float radVelX = 1000.f * radial_vel[i] * rGal.x;
+            const float radVelY = 1000.f * radial_vel[i] * rGal.y;
+            const float radVelZ = 1000.f * radial_vel[i] * rGal.z;
 
             // Use Pythagoras theorem for the final Space Velocity [m/s].
             values[idx++] = static_cast<float>(
diff --git a/modules/gaia/tasks/readfitstask.cpp b/modules/gaia/tasks/readfitstask.cpp
index 5d67fd2dfc..c13e64014b 100644
--- a/modules/gaia/tasks/readfitstask.cpp
+++ b/modules/gaia/tasks/readfitstask.cpp
@@ -90,15 +90,16 @@ ReadFitsTask::ReadFitsTask(const ghoul::Dictionary& dictionary) {
     _lastRow = p.lastRow.value_or(_lastRow);
 
     if (p.filterColumnNames.has_value()) {
-        ghoul::Dictionary d = dictionary.value<ghoul::Dictionary>(KeyFilterColumnNames);
+        const ghoul::Dictionary d =
+            dictionary.value<ghoul::Dictionary>(KeyFilterColumnNames);
 
         // Ugly fix for ASCII sorting when there are more columns read than 10.
         std::set<int> intKeys;
-        for (std::string_view key : d.keys()) {
+        for (const std::string_view key : d.keys()) {
             intKeys.insert(std::stoi(std::string(key)));
         }
 
-        for (int key : intKeys) {
+        for (const int key : intKeys) {
             _filterColumnNames.push_back(d.value<std::string>(std::to_string(key)));
         }
     }
@@ -160,7 +161,7 @@ void ReadFitsTask::readSingleFitsFile(const Task::ProgressCallback& progressCall
             sizeof(int32_t)
         );
 
-        size_t nBytes = nValues * sizeof(fullData[0]);
+        const size_t nBytes = nValues * sizeof(fullData[0]);
         outFileStream.write(reinterpret_cast<const char*>(fullData.data()), nBytes);
 
         outFileStream.close();
@@ -180,12 +181,14 @@ void ReadFitsTask::readAllFitsFilesFromFolder(const Task::ProgressCallback&) {
 
     _firstRow = std::max(_firstRow, 1);
 
-    // Create Threadpool and JobManager.
+    // Create Threadpool and JobManager
     LINFO("Threads in pool: " + std::to_string(_threadsToUse));
     ThreadPool threadPool(_threadsToUse);
-    ConcurrentJobManager<std::vector<std::vector<float>>> jobManager(threadPool);
+    ConcurrentJobManager<std::vector<std::vector<float>>> jobManager(
+        std::move(threadPool)
+    );
 
-    // Get all files in specified folder.
+    // Get all files in specified folder
     std::vector<std::filesystem::path> allInputFiles;
     if (std::filesystem::is_directory(_inFileOrFolderPath)) {
         namespace fs = std::filesystem;
@@ -196,12 +199,12 @@ void ReadFitsTask::readAllFitsFilesFromFolder(const Task::ProgressCallback&) {
         }
     }
 
-    size_t nInputFiles = allInputFiles.size();
+    const size_t nInputFiles = allInputFiles.size();
     LINFO("Files to read: " + std::to_string(nInputFiles));
 
-    // Define what columns to read.
+    // Define what columns to read
     _allColumnNames.clear();
-    // Read in the order of table in file.
+    // Read in the order of table in file
     std::vector<std::string> defaultColumnNames = {
         "ra",
         "ra_error",
@@ -241,13 +244,13 @@ void ReadFitsTask::readAllFitsFilesFromFolder(const Task::ProgressCallback&) {
     LINFO(allNames);
 
     // Declare how many values to save for each star.
-    int32_t nValuesPerStar = 24;
-    size_t nDefaultColumns = defaultColumnNames.size();
+    constexpr int32_t NValuesPerStar = 24;
+    const size_t nDefaultColumns = defaultColumnNames.size();
     auto fitsFileReader = std::make_shared<FitsFileReader>(false);
 
     // Divide all files into ReadFilejobs and then delegate them onto several threads!
     while (!allInputFiles.empty()) {
-        std::filesystem::path fileToRead = allInputFiles.back();
+        const std::filesystem::path fileToRead = allInputFiles.back();
         allInputFiles.erase(allInputFiles.end() - 1);
 
         // Add reading of file to jobmanager, which will distribute it to our threadpool.
@@ -257,7 +260,7 @@ void ReadFitsTask::readAllFitsFilesFromFolder(const Task::ProgressCallback&) {
             _firstRow,
             _lastRow,
             nDefaultColumns,
-            nValuesPerStar,
+            NValuesPerStar,
             fitsFileReader
         );
         jobManager.enqueueJob(readFileJob);
@@ -288,7 +291,7 @@ void ReadFitsTask::readAllFitsFilesFromFolder(const Task::ProgressCallback&) {
                         octants[i],
                         i,
                         isFirstWrite,
-                        nValuesPerStar
+                        NValuesPerStar
                     );
 
                     octants[i].clear();
@@ -322,7 +325,7 @@ int ReadFitsTask::writeOctantToFile(const std::vector<float>& octantData, int in
             isFirstWrite[index] = false;
         }
 
-        size_t nBytes = nValues * sizeof(octantData[0]);
+        const size_t nBytes = nValues * sizeof(octantData[0]);
         fileStream.write(reinterpret_cast<const char*>(octantData.data()), nBytes);
 
         fileStream.close();
diff --git a/modules/gaia/tasks/readspecktask.cpp b/modules/gaia/tasks/readspecktask.cpp
index 811614905a..f20ecab5b6 100644
--- a/modules/gaia/tasks/readspecktask.cpp
+++ b/modules/gaia/tasks/readspecktask.cpp
@@ -89,7 +89,7 @@ void ReadSpeckTask::perform(const Task::ProgressCallback& onProgress) {
         fileStream.write(reinterpret_cast<const char*>(&nValues), sizeof(int32_t));
         fileStream.write(reinterpret_cast<const char*>(&nRenderValues), sizeof(int32_t));
 
-        size_t nBytes = nValues * sizeof(fullData[0]);
+        const size_t nBytes = nValues * sizeof(fullData[0]);
         fileStream.write(reinterpret_cast<const char*>(fullData.data()), nBytes);
 
         fileStream.close();
diff --git a/modules/galaxy/rendering/galaxyraycaster.cpp b/modules/galaxy/rendering/galaxyraycaster.cpp
index d57644f180..a550a98eef 100644
--- a/modules/galaxy/rendering/galaxyraycaster.cpp
+++ b/modules/galaxy/rendering/galaxyraycaster.cpp
@@ -44,7 +44,7 @@ namespace {
 namespace openspace {
 
 GalaxyRaycaster::GalaxyRaycaster(ghoul::opengl::Texture& texture,
-                                 std::optional<std::filesystem::path> raycastingShader)
+                             const std::optional<std::filesystem::path>& raycastingShader)
     : _boundingBox(glm::vec3(1.f))
     , _texture(texture)
     , _textureUnit(nullptr)
@@ -90,7 +90,7 @@ void GalaxyRaycaster::renderExitPoints(const RenderData& data,
 }
 
 glm::dmat4 GalaxyRaycaster::modelViewTransform(const RenderData& data) {
-    glm::dmat4 modelTransform =
+    const glm::dmat4 modelTransform =
         glm::translate(glm::dmat4(1.0), data.modelTransform.translation) *
         glm::dmat4(data.modelTransform.rotation) *
         glm::scale(glm::dmat4(1.0), glm::dvec3(data.modelTransform.scale)) *
@@ -132,7 +132,7 @@ void GalaxyRaycaster::postRaycast(const RaycastData&, ghoul::opengl::ProgramObje
 }
 
 bool GalaxyRaycaster::isCameraInside(const RenderData& data, glm::vec3& localPosition) {
-    glm::vec4 modelPos = glm::inverse(modelViewTransform(data)) *
+    const glm::vec4 modelPos = glm::inverse(modelViewTransform(data)) *
         glm::vec4(0.f, 0.f, 0.f, 1.f);
 
     localPosition = (glm::vec3(modelPos) + glm::vec3(0.5f));
@@ -163,7 +163,7 @@ void GalaxyRaycaster::setAspect(const glm::vec3& aspect) {
 }
 
 void GalaxyRaycaster::setModelTransform(glm::mat4 transform) {
-    _modelTransform = transform;
+    _modelTransform = std::move(transform);
 }
 
 void GalaxyRaycaster::setOpacityCoefficient(float opacityCoefficient) {
diff --git a/modules/galaxy/rendering/galaxyraycaster.h b/modules/galaxy/rendering/galaxyraycaster.h
index 559d476208..25da69373b 100644
--- a/modules/galaxy/rendering/galaxyraycaster.h
+++ b/modules/galaxy/rendering/galaxyraycaster.h
@@ -46,7 +46,7 @@ struct RaycastData;
 class GalaxyRaycaster : public VolumeRaycaster {
 public:
     GalaxyRaycaster(ghoul::opengl::Texture& texture,
-        std::optional<std::filesystem::path> raycastingShader = std::nullopt);
+        const std::optional<std::filesystem::path>& raycastingShader = std::nullopt);
     ~GalaxyRaycaster() override = default;
 
     void initialize();
diff --git a/modules/galaxy/rendering/renderablegalaxy.cpp b/modules/galaxy/rendering/renderablegalaxy.cpp
index 4b3873f16b..ddbd8eb497 100644
--- a/modules/galaxy/rendering/renderablegalaxy.cpp
+++ b/modules/galaxy/rendering/renderablegalaxy.cpp
@@ -265,13 +265,13 @@ RenderableGalaxy::RenderableGalaxy(const ghoul::Dictionary& dictionary)
     , _volumeRenderingEnabled(VolumeRenderingEnabledInfo, true)
     , _starRenderingEnabled(StarRenderingEnabledInfo, true)
     , _stepSize(StepSizeInfo, 0.01f, 0.001f, 0.05f, 0.001f)
-    , _absorptionMultiply(AbsorptionMultiplyInfo, 40.f, 0.f, 200.0f)
-    , _emissionMultiply(EmissionMultiplyInfo, 200.f, 0.f, 1000.0f)
+    , _absorptionMultiply(AbsorptionMultiplyInfo, 40.f, 0.f, 200.f)
+    , _emissionMultiply(EmissionMultiplyInfo, 200.f, 0.f, 1000.f)
     , _starRenderingMethod(
         StarRenderingMethodInfo,
         properties::OptionProperty::DisplayType::Dropdown
     )
-    , _enabledPointsRatio(EnabledPointsRatioInfo, 0.5f, 0.01f, 1.0f)
+    , _enabledPointsRatio(EnabledPointsRatioInfo, 0.5f, 0.01f, 1.f)
     , _rotation(
         RotationInfo,
         glm::vec3(0.f),
@@ -345,8 +345,8 @@ RenderableGalaxy::RenderableGalaxy(const ghoul::Dictionary& dictionary)
 void RenderableGalaxy::initialize() {
     ZoneScoped;
 
-    // Aspect is currently hardcoded to cubic voxels.
-    glm::vec3 d = _volumeDimensions;
+    // Aspect is currently hardcoded to cubic voxels
+    const glm::vec3 d = _volumeDimensions;
     _aspect = d / glm::compMax(d);
 
     // The volume
@@ -548,7 +548,7 @@ void RenderableGalaxy::update(const UpdateData& data) {
     transform = glm::rotate(transform, eulerRotation.y, glm::vec3(0.f, 1.f, 0.f));
     transform = glm::rotate(transform, eulerRotation.z,  glm::vec3(0.f, 0.f, 1.f));
 
-    glm::mat4 volumeTransform = glm::scale(transform, _volumeSize);
+    const glm::mat4 volumeTransform = glm::scale(transform, _volumeSize);
     _pointTransform = transform;
 
     _raycaster->setDownscaleRender(_downScaleVolumeRendering);
@@ -564,7 +564,7 @@ void RenderableGalaxy::update(const UpdateData& data) {
 void RenderableGalaxy::render(const RenderData& data, RendererTasks& tasks) {
     // Render the volume
     if (_raycaster && _volumeRenderingEnabled) {
-        RaycasterTask task { _raycaster.get(), data };
+        const RaycasterTask task { _raycaster.get(), data };
 
         const glm::vec3 position = data.camera.positionVec3();
         const float length = safeLength(position);
@@ -608,7 +608,7 @@ void RenderableGalaxy::render(const RenderData& data, RendererTasks& tasks) {
         }
     }
 
-    if (!(_starRenderingEnabled && _opacityCoefficient > 0.f)) {
+    if (!_starRenderingEnabled || _opacityCoefficient <= 0.f) {
         return;
     }
 
@@ -631,7 +631,7 @@ void RenderableGalaxy::renderPoints(const RenderData& data) {
 
     _pointsProgram->activate();
 
-    glm::dmat4 rotMatrix = glm::rotate(
+    const glm::dmat4 rotMatrix = glm::rotate(
         glm::dmat4(1.0),
         glm::pi<double>(),
         glm::dvec3(1.0, 0.0, 0.0)) *
@@ -639,11 +639,12 @@ void RenderableGalaxy::renderPoints(const RenderData& data) {
             glm::rotate(glm::dmat4(1.0), 4.45741, glm::dvec3(0.0, 0.0, 1.0)
     );
 
-    AlternativeTransform altTransform;
-    altTransform.rotation = glm::dmat4(data.modelTransform.rotation) * rotMatrix;
-    glm::dmat4 modelTransform = calcModelTransform(data, altTransform);
+    const AlternativeTransform altTransform = {
+        .rotation = glm::dmat4(data.modelTransform.rotation) * rotMatrix
+    };
+    const glm::dmat4 modelTransform = calcModelTransform(data, altTransform);
 
-    glm::dmat4 cameraViewProjectionMatrix =
+    const glm::dmat4 cameraViewProjectionMatrix =
         glm::dmat4(data.camera.projectionMatrix()) * data.camera.combinedViewMatrix();
 
     _pointsProgram->setUniform(_uniformCachePoints.modelMatrix, modelTransform);
@@ -652,7 +653,7 @@ void RenderableGalaxy::renderPoints(const RenderData& data) {
         cameraViewProjectionMatrix
     );
 
-    glm::dvec3 eyePosition = glm::dvec3(
+    const glm::dvec3 eyePosition = glm::dvec3(
         glm::inverse(data.camera.combinedViewMatrix()) *
         glm::dvec4(0.0, 0.0, 0.0, 1.0)
     );
@@ -681,7 +682,7 @@ void RenderableGalaxy::renderBillboards(const RenderData& data) {
 
     _billboardsProgram->activate();
 
-    glm::dmat4 rotMatrix = glm::rotate(
+    const glm::dmat4 rotMatrix = glm::rotate(
         glm::dmat4(1.0),
         glm::pi<double>(),
         glm::dvec3(1.0, 0.0, 0.0)) *
@@ -689,11 +690,12 @@ void RenderableGalaxy::renderBillboards(const RenderData& data) {
             glm::rotate(glm::dmat4(1.0), 4.45741, glm::dvec3(0.0, 0.0, 1.0)
     );
 
-    AlternativeTransform altTransform;
-    altTransform.rotation = glm::dmat4(data.modelTransform.rotation) * rotMatrix;
-    glm::dmat4 modelTransform = calcModelTransform(data, altTransform);
+    const AlternativeTransform altTransform = {
+        .rotation = glm::dmat4(data.modelTransform.rotation) * rotMatrix
+    };
+    const glm::dmat4 modelTransform = calcModelTransform(data, altTransform);
 
-    glm::dmat4 cameraViewProjectionMatrix =
+    const glm::dmat4 cameraViewProjectionMatrix =
         glm::dmat4(data.camera.projectionMatrix()) * data.camera.combinedViewMatrix();
 
     _billboardsProgram->setUniform(_uniformCacheBillboards.modelMatrix, modelTransform);
@@ -702,13 +704,13 @@ void RenderableGalaxy::renderBillboards(const RenderData& data) {
         cameraViewProjectionMatrix
     );
 
-    glm::dvec3 eyePosition = glm::dvec3(
+    const glm::dvec3 eyePosition = glm::dvec3(
         glm::inverse(data.camera.combinedViewMatrix()) *
         glm::dvec4(0.0, 0.0, 0.0, 1.0)
     );
     _billboardsProgram->setUniform(_uniformCacheBillboards.eyePosition, eyePosition);
 
-    glm::dvec3 cameraUp = data.camera.lookUpVectorWorldSpace();
+    const glm::dvec3 cameraUp = data.camera.lookUpVectorWorldSpace();
     _billboardsProgram->setUniform(_uniformCacheBillboards.cameraUp, cameraUp);
 
     ghoul::opengl::TextureUnit psfUnit;
@@ -728,11 +730,7 @@ void RenderableGalaxy::renderBillboards(const RenderData& data) {
 }
 
 RenderableGalaxy::Result RenderableGalaxy::loadPointFile() {
-    std::vector<glm::vec3> pointPositions;
-    std::vector<glm::vec3> pointColors;
-    int64_t nPoints;
-
-    std::ifstream pointFile(_pointsFilename, std::ios::in);
+    std::ifstream pointFile = std::ifstream(_pointsFilename, std::ios::in);
 
     // Read header for OFF (Object File Format)
     std::string line;
@@ -741,17 +739,26 @@ RenderableGalaxy::Result RenderableGalaxy::loadPointFile() {
     // Read point count
     std::getline(pointFile, line);
     std::istringstream iss(line);
+    int64_t nPoints = 0;
     iss >> nPoints;
 
     // Prepare point reading
     _nPoints = static_cast<size_t>(nPoints);
 
+    std::vector<glm::vec3> pointPositions;
+    std::vector<glm::vec3> pointColors;
     // Read points
     for (size_t i = 0;
         i < static_cast<size_t>(_nPoints * _enabledPointsRatio.maxValue()) + 1;
         i++)
     {
-        float x, y, z, r, g, b, a;
+        float x = 0.f;
+        float y = 0.f;
+        float z = 0.f;
+        float r = 0.f;
+        float g = 0.f;
+        float b = 0.f;
+        float a = 0.f;
         std::getline(pointFile, line);
         std::istringstream issp(line);
         issp >> x >> y >> z >> r >> g >> b >> a;
@@ -774,28 +781,28 @@ RenderableGalaxy::Result RenderableGalaxy::loadPointFile() {
 RenderableGalaxy::Result RenderableGalaxy::loadCachedFile(
                                                         const std::filesystem::path& file)
 {
-    std::ifstream fileStream(file, std::ifstream::binary);
+    std::ifstream fileStream = std::ifstream(file, std::ifstream::binary);
     if (!fileStream.good()) {
         LERROR(fmt::format("Error opening file '{}' for loading cache file", file));
         return { false, {}, {} };
     }
 
-    int8_t cacheVersion;
+    int8_t cacheVersion = 0;
     fileStream.read(reinterpret_cast<char*>(&cacheVersion), sizeof(int8_t));
     if (cacheVersion != CurrentCacheVersion) {
         LINFO(fmt::format("Removing cache file '{}' as the version changed", file));
         return { false, {}, {} };
     }
 
-    int64_t nPoints;
+    int64_t nPoints = 0;
     fileStream.read(reinterpret_cast<char*>(&nPoints), sizeof(int64_t));
     _nPoints = static_cast<size_t>(nPoints);
 
-    float enabledPointsRatio;
+    float enabledPointsRatio = false;
     fileStream.read(reinterpret_cast<char*>(&enabledPointsRatio), sizeof(float));
     _enabledPointsRatio = enabledPointsRatio;
 
-    uint64_t nPositions;
+    uint64_t nPositions = 0;
     fileStream.read(reinterpret_cast<char*>(&nPositions), sizeof(uint64_t));
     std::vector<glm::vec3> positions;
     positions.resize(nPositions);
@@ -804,7 +811,7 @@ RenderableGalaxy::Result RenderableGalaxy::loadCachedFile(
         nPositions * sizeof(glm::vec3)
     );
 
-    uint64_t nColors;
+    uint64_t nColors = 0;
     fileStream.read(reinterpret_cast<char*>(&nColors), sizeof(uint64_t));
     std::vector<glm::vec3> colors;
     colors.resize(nColors);
diff --git a/modules/galaxy/tasks/milkywayconversiontask.cpp b/modules/galaxy/tasks/milkywayconversiontask.cpp
index a03b838d9f..b199db45be 100644
--- a/modules/galaxy/tasks/milkywayconversiontask.cpp
+++ b/modules/galaxy/tasks/milkywayconversiontask.cpp
@@ -27,11 +27,7 @@
 #include <modules/volume/textureslicevolumereader.h>
 #include <modules/volume/rawvolumewriter.h>
 #include <modules/volume/volumesampler.h>
-#include <modules/volume/textureslicevolumereader.h>
-
-#include <modules/volume/rawvolumewriter.h>
 #include <openspace/documentation/documentation.h>
-
 #include <ghoul/misc/dictionary.h>
 
 namespace {
@@ -45,10 +41,7 @@ namespace {
 
 namespace openspace {
 
-MilkywayConversionTask::MilkywayConversionTask(const ghoul::Dictionary& dictionary)
-    : _inFirstIndex(0)
-    , _inNSlices(0)
-{
+MilkywayConversionTask::MilkywayConversionTask(const ghoul::Dictionary& dictionary) {
     if (dictionary.hasKey(KeyInFilenamePrefix)) {
         _inFilenamePrefix = dictionary.value<std::string>(KeyInFilenamePrefix);
     }
@@ -92,17 +85,16 @@ void MilkywayConversionTask::perform(const Task::ProgressCallback& onProgress) {
     const glm::vec3 resolutionRatio = static_cast<glm::vec3>(sliceReader.dimensions()) /
                                       static_cast<glm::vec3>(rawWriter.dimensions());
 
-    VolumeSampler<TextureSliceVolumeReader<glm::tvec4<GLfloat>>> sampler(
+    const VolumeSampler<TextureSliceVolumeReader<glm::tvec4<GLfloat>>> sampler(
         &sliceReader,
         resolutionRatio
     );
-    std::function<glm::tvec4<GLfloat>(glm::ivec3)> sampleFunction =
-        [resolutionRatio, sampler](glm::ivec3 outCoord) {
-            const glm::vec3 inCoord = ((glm::vec3(outCoord) + glm::vec3(0.5f)) *
-                                      resolutionRatio) - glm::vec3(0.5f);
-            const glm::tvec4<GLfloat> value = sampler.sample(inCoord);
-            return value;
-        };
+    auto sampleFunction = [resolutionRatio, sampler](const glm::ivec3& outCoord) {
+        const glm::vec3 inCoord =
+            ((glm::vec3(outCoord) + glm::vec3(0.5f)) * resolutionRatio) - glm::vec3(0.5f);
+        const glm::tvec4<GLfloat> value = sampler.sample(inCoord);
+        return value;
+    };
 
     rawWriter.write(sampleFunction, onProgress);
 }
diff --git a/modules/galaxy/tasks/milkywaypointsconversiontask.cpp b/modules/galaxy/tasks/milkywaypointsconversiontask.cpp
index dd4cca68b3..62dd447acc 100644
--- a/modules/galaxy/tasks/milkywaypointsconversiontask.cpp
+++ b/modules/galaxy/tasks/milkywaypointsconversiontask.cpp
@@ -50,20 +50,20 @@ void MilkywayPointsConversionTask::perform(const Task::ProgressCallback& progres
     std::ofstream out(_outFilename, std::ios::out | std::ios::binary);
 
     std::string format;
-    int64_t nPoints;
+    int64_t nPoints = 0;
     in >> format >> nPoints;
 
-    size_t nFloats = nPoints * 7;
+    const size_t nFloats = nPoints * 7;
 
     std::vector<float> pointData(nFloats);
 
-    float x;
-    float y;
-    float z;
-    float r;
-    float g;
-    float b;
-    float a;
+    float x = 0.f;
+    float y = 0.f;
+    float z = 0.f;
+    float r = 0.f;
+    float g = 0.f;
+    float b = 0.f;
+    float a = 0.f;
 
     for (int64_t i = 0; i < nPoints; i++) {
         in >> x >> y >> z >> r >> g >> b >> a;
diff --git a/modules/globebrowsing/globebrowsingmodule.cpp b/modules/globebrowsing/globebrowsingmodule.cpp
index 42010a2fff..bdf082d5c5 100644
--- a/modules/globebrowsing/globebrowsingmodule.cpp
+++ b/modules/globebrowsing/globebrowsingmodule.cpp
@@ -140,7 +140,7 @@ namespace {
             int iDataset = -1;
             std::array<char, 256> IdentifierBuffer;
             std::fill(IdentifierBuffer.begin(), IdentifierBuffer.end(), '\0');
-            int ret = sscanf(
+            const int ret = sscanf(
                 subDatasets[i],
                 "SUBDATASET_%i_%255[^=]",
                 &iDataset,
@@ -427,8 +427,8 @@ glm::dvec3 GlobeBrowsingModule::geoPosition() const {
         posHandle.centerToReferenceSurface
     );
 
-    double lat = glm::degrees(geo2.lat);
-    double lon = glm::degrees(geo2.lon);
+    const double lat = glm::degrees(geo2.lat);
+    const double lon = glm::degrees(geo2.lon);
 
     double altitude = glm::length(
         cameraPositionModelSpace - posHandle.centerToReferenceSurface
@@ -445,7 +445,7 @@ glm::dvec3 GlobeBrowsingModule::geoPosition() const {
 
 void GlobeBrowsingModule::goToChunk(const globebrowsing::RenderableGlobe& globe,
                                     const globebrowsing::TileIndex& ti,
-                                    glm::vec2 uv, bool doResetCameraDirection)
+                                    const glm::vec2& uv, bool doResetCameraDirection)
 {
     using namespace globebrowsing;
 
@@ -492,6 +492,7 @@ void GlobeBrowsingModule::goToGeodetic2(const globebrowsing::RenderableGlobe& gl
     SceneGraphNode* globeSceneGraphNode = dynamic_cast<SceneGraphNode*>(globe.owner());
     if (!globeSceneGraphNode) {
         LERROR("Error when going to Geodetic2");
+        return;
     }
 
     const glm::dmat4 inverseModelTransform = glm::inverse(
@@ -651,7 +652,7 @@ bool GlobeBrowsingModule::isMRFCachingEnabled() const {
     return _mrfCacheEnabled;
 }
 
-const std::string GlobeBrowsingModule::mrfCacheLocation() const {
+std::string GlobeBrowsingModule::mrfCacheLocation() const {
     return _mrfCacheLocation;
 }
 
diff --git a/modules/globebrowsing/globebrowsingmodule.h b/modules/globebrowsing/globebrowsingmodule.h
index 21da668fb5..429c09741f 100644
--- a/modules/globebrowsing/globebrowsingmodule.h
+++ b/modules/globebrowsing/globebrowsingmodule.h
@@ -93,7 +93,7 @@ public:
     void removeWMSServer(const std::string& name);
 
     bool isMRFCachingEnabled() const;
-    const std::string mrfCacheLocation() const;
+    std::string mrfCacheLocation() const;
 
     bool hasDefaultGeoPointTexture() const;
     std::string_view defaultGeoPointTexture() const;
@@ -103,7 +103,8 @@ protected:
 
 private:
     void goToChunk(const globebrowsing::RenderableGlobe& globe,
-        const globebrowsing::TileIndex& ti, glm::vec2 uv, bool doResetCameraDirection);
+        const globebrowsing::TileIndex& ti, const glm::vec2& uv,
+        bool doResetCameraDirection);
 
     void goToGeodetic2(const globebrowsing::RenderableGlobe& globe,
         globebrowsing::Geodetic2 geo2, bool doResetCameraDirection);
diff --git a/modules/globebrowsing/src/asynctiledataprovider.cpp b/modules/globebrowsing/src/asynctiledataprovider.cpp
index 815e2031ed..15b58653ce 100644
--- a/modules/globebrowsing/src/asynctiledataprovider.cpp
+++ b/modules/globebrowsing/src/asynctiledataprovider.cpp
@@ -113,7 +113,7 @@ bool AsyncTileDataProvider::satisfiesEnqueueCriteria(const TileIndex& tileIndex)
 }
 
 void AsyncTileDataProvider::endUnfinishedJobs() {
-    std::vector<TileIndex::TileHashKey> unfinishedJobs =
+    const std::vector<TileIndex::TileHashKey> unfinishedJobs =
         _concurrentJobManager.keysToUnfinishedJobs();
     for (const TileIndex::TileHashKey& unfinishedJob : unfinishedJobs) {
         // When erasing the job before
@@ -122,7 +122,7 @@ void AsyncTileDataProvider::endUnfinishedJobs() {
 }
 
 void AsyncTileDataProvider::endEnqueuedJobs() {
-    std::vector<TileIndex::TileHashKey> enqueuedJobs =
+    const std::vector<TileIndex::TileHashKey> enqueuedJobs =
         _concurrentJobManager.keysToEnqueuedJobs();
     for (const TileIndex::TileHashKey& enqueuedJob : enqueuedJobs) {
         // When erasing the job before
@@ -180,7 +180,7 @@ void AsyncTileDataProvider::prepareToBeDeleted() {
     endEnqueuedJobs();
 }
 
-bool AsyncTileDataProvider::shouldBeDeleted() {
+bool AsyncTileDataProvider::shouldBeDeleted() const {
     return _shouldBeDeleted;
 }
 
diff --git a/modules/globebrowsing/src/asynctiledataprovider.h b/modules/globebrowsing/src/asynctiledataprovider.h
index 4b5b36c06d..f9de5e2fe0 100644
--- a/modules/globebrowsing/src/asynctiledataprovider.h
+++ b/modules/globebrowsing/src/asynctiledataprovider.h
@@ -65,7 +65,7 @@ public:
     void reset();
     void prepareToBeDeleted();
 
-    bool shouldBeDeleted();
+    bool shouldBeDeleted() const;
 
     const RawTileDataReader& rawTileDataReader() const;
     float noDataValueAsFloat() const;
diff --git a/modules/globebrowsing/src/dashboarditemglobelocation.cpp b/modules/globebrowsing/src/dashboarditemglobelocation.cpp
index 2abbfd5c9b..1fc998c0b8 100644
--- a/modules/globebrowsing/src/dashboarditemglobelocation.cpp
+++ b/modules/globebrowsing/src/dashboarditemglobelocation.cpp
@@ -145,10 +145,10 @@ void DashboardItemGlobeLocation::render(glm::vec2& penPosition) {
 
     GlobeBrowsingModule* module = global::moduleEngine->module<GlobeBrowsingModule>();
 
-    glm::dvec3 position = module->geoPosition();
+    const glm::dvec3 position = module->geoPosition();
     double lat = position.x;
     double lon = position.y;
-    double altitude = position.z;
+    const double altitude = position.z;
 
     std::pair<double, std::string_view> dist = simplifyDistance(altitude);
 
@@ -196,8 +196,7 @@ void DashboardItemGlobeLocation::render(glm::vec2& penPosition) {
         }
     }
 
-    std::string_view text = std::string_view(_buffer.data(), end - _buffer.data());
-
+    const std::string_view text = std::string_view(_buffer.data(), end - _buffer.data());
     RenderFont(*_font, penPosition, text);
     penPosition.y -= _font->height();
 }
diff --git a/modules/globebrowsing/src/ellipsoid.cpp b/modules/globebrowsing/src/ellipsoid.cpp
index 152ea404bc..49bd8537bf 100644
--- a/modules/globebrowsing/src/ellipsoid.cpp
+++ b/modules/globebrowsing/src/ellipsoid.cpp
@@ -35,7 +35,7 @@ namespace {
 
 namespace openspace::globebrowsing {
 
-Ellipsoid::Ellipsoid(glm::dvec3 radii) : _radii(radii) {
+Ellipsoid::Ellipsoid(glm::dvec3 radii) : _radii(std::move(radii)) {
     updateInternalCache();
 }
 
@@ -66,7 +66,7 @@ glm::dvec3 Ellipsoid::geodeticSurfaceProjection(const glm::dvec3& p) const {
     double s = 0.0;
     double dSdA = 1.0;
 
-    double epsilon = 1e-10;
+    constexpr double Epsilon = 1e-10;
 
     size_t nIterations = 0;
     do {
@@ -81,7 +81,7 @@ glm::dvec3 Ellipsoid::geodeticSurfaceProjection(const glm::dvec3& p) const {
         dSdA = -2.0 * glm::dot(p2 / (_cached.radiiToTheFourth * d3), glm::dvec3(1.0));
         ++nIterations;
     }
-    while (std::abs(s) > epsilon && nIterations < MaxIterations);
+    while (std::abs(s) > Epsilon && nIterations < MaxIterations);
 
     return p / d;
 }
diff --git a/modules/globebrowsing/src/gdalwrapper.cpp b/modules/globebrowsing/src/gdalwrapper.cpp
index 48fba4af15..b8797751cc 100644
--- a/modules/globebrowsing/src/gdalwrapper.cpp
+++ b/modules/globebrowsing/src/gdalwrapper.cpp
@@ -143,7 +143,7 @@ void GdalWrapper::setGdalProxyConfiguration() {
         LDEBUG(fmt::format("Using proxy server '{}'", proxy));
 
         if (!user.empty() && !password.empty()) {
-            std::string userPwd = user + ":" + password;
+            const std::string userPwd = user + ":" + password;
             CPLSetConfigOption("GDAL_HTTP_PROXYUSERPWD", userPwd.c_str());
             CPLSetConfigOption("GDAL_HTTP_PROXYAUTH", auth.c_str());
             LDEBUG(fmt::format("Using authentication method: {}", auth));
diff --git a/modules/globebrowsing/src/geodeticpatch.cpp b/modules/globebrowsing/src/geodeticpatch.cpp
index dec6b77720..86f3d4c3bf 100644
--- a/modules/globebrowsing/src/geodeticpatch.cpp
+++ b/modules/globebrowsing/src/geodeticpatch.cpp
@@ -154,8 +154,8 @@ Geodetic2 GeodeticPatch::clamp(const Geodetic2& p) const {
     //        --> Just clamping pointLat would be clamp(330, -10, 10) = 10 // WRONG!
     //    Instead, if we first normalize 330 deg around 0, we get -30 deg
     //        --> clamp(-30, -10, 10) = -10 // CORRECT!
-    double pointLat = normalizedAngleAround(p.lat, _center.lat);
-    double pointLon = normalizedAngleAround(p.lon, _center.lon);
+    const double pointLat = normalizedAngleAround(p.lat, _center.lat);
+    const double pointLon = normalizedAngleAround(p.lon, _center.lon);
 
     return {
         glm::clamp(pointLat, minLat(), maxLat()),
@@ -219,8 +219,8 @@ Geodetic2 GeodeticPatch::closestPoint(const Geodetic2& p) const {
 
     // Normalize point with respect to center. This is done because the point
     // will later be clamped. See LatLonPatch::clamp(const LatLon&) for explanation
-    double pointLat = normalizedAngleAround(p.lat, _center.lat);
-    double pointLon = normalizedAngleAround(p.lon, _center.lon);
+    const double pointLat = normalizedAngleAround(p.lat, _center.lat);
+    const double pointLon = normalizedAngleAround(p.lon, _center.lon);
 
     // Calculate the longitud difference between center and point. We normalize around
     // zero because we want the "shortest distance" difference, i.e the difference
diff --git a/modules/globebrowsing/src/geojson/geojsoncomponent.cpp b/modules/globebrowsing/src/geojson/geojsoncomponent.cpp
index 0f28a8fe61..b943747989 100644
--- a/modules/globebrowsing/src/geojson/geojsoncomponent.cpp
+++ b/modules/globebrowsing/src/geojson/geojsoncomponent.cpp
@@ -362,7 +362,7 @@ GeoJsonComponent::GeoJsonComponent(const ghoul::Dictionary& dictionary,
     addPropertySubOwner(_defaultProperties);
 
     _defaultProperties.pointTexture.onChange([this]() {
-        std::filesystem::path texturePath = _defaultProperties.pointTexture.value();
+        const std::filesystem::path texturePath = _defaultProperties.pointTexture.value();
         // Not ethat an empty texture is also valid => use default texture from module
         if (std::filesystem::is_regular_file(texturePath) || texturePath.empty()) {
             _textureIsDirty = true;
@@ -424,7 +424,7 @@ GeoJsonComponent::GeoJsonComponent(const ghoul::Dictionary& dictionary,
     readFile();
 
     if (p.lightSources.has_value()) {
-        std::vector<ghoul::Dictionary> lightsources = *p.lightSources;
+        const std::vector<ghoul::Dictionary> lightsources = *p.lightSources;
 
         for (const ghoul::Dictionary& lsDictionary : lightsources) {
             std::unique_ptr<LightSource> lightSource =
@@ -497,7 +497,7 @@ void GeoJsonComponent::deinitializeGL() {
 }
 
 bool GeoJsonComponent::isReady() const {
-    bool isReady = std::all_of(
+    const bool isReady = std::all_of(
         std::begin(_geometryFeatures),
         std::end(_geometryFeatures),
         std::mem_fn(&GlobeGeometryFeature::isReady)
@@ -567,7 +567,7 @@ void GeoJsonComponent::update() {
         return;
     }
 
-    glm::vec3 offsets = glm::vec3(_latLongOffset.value(), _heightOffset);
+    const glm::vec3 offsets = glm::vec3(_latLongOffset.value(), _heightOffset);
 
     for (size_t i = 0; i < _geometryFeatures.size(); i++) {
         if (!_features[i]->enabled) {
@@ -600,20 +600,18 @@ void GeoJsonComponent::readFile() {
 
     _geometryFeatures.clear();
 
-    std::string content(
-        (std::istreambuf_iterator<char>(file)),
-        (std::istreambuf_iterator<char>())
+    const std::string content = std::string(
+        std::istreambuf_iterator<char>(file),
+        std::istreambuf_iterator<char>()
     );
 
     // Parse GeoJSON string into GeoJSON objects
-    using namespace geos::io;
-    GeoJSONReader reader;
-
     try {
-        GeoJSONFeatureCollection fc = reader.readFeatures(content);
+        const geos::io::GeoJSONReader reader;
+        const geos::io::GeoJSONFeatureCollection fc = reader.readFeatures(content);
 
         int count = 1;
-        for (const GeoJSONFeature& feature : fc.getFeatures()) {
+        for (const geos::io::GeoJSONFeature& feature : fc.getFeatures()) {
             parseSingleFeature(feature, count);
             count++;
         }
@@ -659,7 +657,7 @@ void GeoJsonComponent::parseSingleFeature(const geos::io::GeoJSONFeature& featur
         geomsToAdd = { geom };
     }
     else {
-        size_t nGeom = geom->getNumGeometries();
+        const size_t nGeom = geom->getNumGeometries();
         geomsToAdd.reserve(nGeom);
         for (size_t i = 0; i < nGeom; i++) {
             const geos::geom::Geometry* subGeometry = geom->getGeometryN(i);
@@ -688,9 +686,9 @@ void GeoJsonComponent::parseSingleFeature(const geos::io::GeoJSONFeature& featur
                 identifier = fmt::format("Feature{}-", index, identifier);
             }
 
-            properties::PropertyOwner::PropertyOwnerInfo info = {
-                identifier,
-                name
+            const properties::PropertyOwner::PropertyOwnerInfo info = {
+                std::move(identifier),
+                std::move(name)
                 // @TODO: Use description from file, if any
             };
             _features.push_back(std::make_unique<SubFeatureProps>(info));
@@ -720,7 +718,7 @@ void GeoJsonComponent::addMetaPropertiesToFeature(SubFeatureProps& feature, int
     // but on Windows it returns
     // geos::geom::CoordinateXY
     auto centroidCoord = *centroid->getCoordinate();
-    glm::vec2 centroidLatLong = glm::vec2(centroidCoord.y, centroidCoord.x);
+    const glm::vec2 centroidLatLong = glm::vec2(centroidCoord.y, centroidCoord.x);
     feature.centroidLatLong = centroidLatLong;
 
     std::unique_ptr<geos::geom::Geometry> boundingbox = geometry->getEnvelope();
@@ -750,12 +748,12 @@ void GeoJsonComponent::addMetaPropertiesToFeature(SubFeatureProps& feature, int
     feature.boundingboxLatLong = boundingboxLatLong;
 
     // Compute the diagonal distance of the bounding box
-    Geodetic2 pos0 = {
+    const Geodetic2 pos0 = {
         glm::radians(boundingboxLatLong.x),
         glm::radians(boundingboxLatLong.y)
     };
 
-    Geodetic2 pos1 = {
+    const Geodetic2 pos1 = {
         glm::radians(boundingboxLatLong.z),
         glm::radians(boundingboxLatLong.w)
     };
@@ -800,12 +798,12 @@ void GeoJsonComponent::computeMainFeatureMetaPropeties() {
     _centerLatLong = 0.5f * (bboxLowerCorner + bboxUpperCorner);
 
     // Compute the diagonal distance (size) of the bounding box
-    Geodetic2 pos0 = {
+    const Geodetic2 pos0 = {
         glm::radians(bboxLowerCorner.x),
         glm::radians(bboxLowerCorner.y)
     };
 
-    Geodetic2 pos1 = {
+    const Geodetic2 pos1 = {
         glm::radians(bboxUpperCorner.x),
         glm::radians(bboxUpperCorner.y)
     };
@@ -838,7 +836,7 @@ void GeoJsonComponent::flyToFeature(std::optional<int> index) const {
 
     global::scriptEngine->queueScript(
         fmt::format(
-            "openspace.globebrowsing.flyToGeo(\"{}\", {}, {}, {})",
+            "openspace.globebrowsing.flyToGeo([[{}]], {}, {}, {})",
             _globeNode.owner()->identifier(), lat, lon, d
         ),
         scripting::ScriptEngine::ShouldBeSynchronized::Yes,
@@ -849,7 +847,7 @@ void GeoJsonComponent::flyToFeature(std::optional<int> index) const {
 void GeoJsonComponent::triggerDeletion() const {
     global::scriptEngine->queueScript(
         fmt::format(
-            "openspace.globebrowsing.deleteGeoJson(\"{}\", \"{}\")",
+            "openspace.globebrowsing.deleteGeoJson([[{}]], [[{}]])",
             _globeNode.owner()->identifier(), _identifier
         ),
         scripting::ScriptEngine::ShouldBeSynchronized::Yes,
diff --git a/modules/globebrowsing/src/geojson/geojsonmanager.cpp b/modules/globebrowsing/src/geojson/geojsonmanager.cpp
index cd907324c8..3a6dc63545 100644
--- a/modules/globebrowsing/src/geojson/geojsonmanager.cpp
+++ b/modules/globebrowsing/src/geojson/geojsonmanager.cpp
@@ -60,7 +60,7 @@ void GeoJsonManager::deinitializeGL() {
 }
 
 bool GeoJsonManager::isReady() const {
-    bool isReady = std::all_of(
+    const bool isReady = std::all_of(
         std::begin(_geoJsonObjects),
         std::end(_geoJsonObjects),
         [](const std::unique_ptr<GeoJsonComponent>& g) {
@@ -81,7 +81,7 @@ void GeoJsonManager::addGeoJsonLayer(const ghoul::Dictionary& layerDict) {
             "GeoJsonComponent"
         );
 
-        std::string identifier = layerDict.value<std::string>("Identifier");
+        const std::string identifier = layerDict.value<std::string>("Identifier");
         if (hasPropertySubOwner(identifier)) {
             LERROR("GeoJson layer with identifier '" + identifier + "' already exists");
             return;
@@ -110,13 +110,10 @@ void GeoJsonManager::deleteLayer(const std::string& layerIdentifier) {
 
     for (auto it = _geoJsonObjects.begin(); it != _geoJsonObjects.end(); it++) {
         if (it->get()->identifier() == layerIdentifier) {
-            // we need to make a copy as the layerIdentifier is only a reference
-            // which will no longer be valid once it is deleted
-            std::string id = layerIdentifier;
+            LINFO("Deleting GeoJson layer: " + layerIdentifier);
             removePropertySubOwner(it->get());
             (*it)->deinitializeGL();
             _geoJsonObjects.erase(it);
-            LINFO("Deleted GeoJson layer " + id);
             return;
         }
     }
diff --git a/modules/globebrowsing/src/geojson/geojsonproperties.cpp b/modules/globebrowsing/src/geojson/geojsonproperties.cpp
index 7c828f7a3c..de214a93d7 100644
--- a/modules/globebrowsing/src/geojson/geojsonproperties.cpp
+++ b/modules/globebrowsing/src/geojson/geojsonproperties.cpp
@@ -71,7 +71,7 @@ namespace geojson::propertykeys {
 namespace {
     using PropertyInfo = openspace::properties::Property::PropertyInfo;
 
-    template <std::size_t SIZE>
+    template <size_t SIZE>
     bool keyMatches(const std::string_view key,
                     const std::array<std::string_view, SIZE>& keyAlternativesArray,
                     std::optional<const PropertyInfo> propInfo = std::nullopt)
@@ -135,7 +135,7 @@ namespace {
             );
         }
         else if (value.isString()) {
-            const std::string hex = value.getString();
+            const std::string& hex = value.getString();
             std::optional<glm::vec3> c = hexToRgb(hex);
             if (!c) {
                 LERRORC(
@@ -460,10 +460,10 @@ void GeoJsonProperties::createFromDictionary(const ghoul::Dictionary& dictionary
     // Distances are computed based on a certain lat/long angle size
     constexpr float DefaultAngle = glm::radians(1.f);
     constexpr float MaxAngle = glm::radians(45.f);
-    float defaultDistance = static_cast<float>(
+    const float defaultDistance = static_cast<float>(
         globe.ellipsoid().longitudalDistance(0.f, 0.f, DefaultAngle)
     );
-    float maxDistance = static_cast<float>(
+    const float maxDistance = static_cast<float>(
         globe.ellipsoid().longitudalDistance(0.f, 0.f, MaxAngle)
     );
     tessellation.distance = defaultDistance;
diff --git a/modules/globebrowsing/src/geojson/globegeometryfeature.cpp b/modules/globebrowsing/src/geojson/globegeometryfeature.cpp
index 381f8c2b3a..ebfcb7ab5e 100644
--- a/modules/globebrowsing/src/geojson/globegeometryfeature.cpp
+++ b/modules/globebrowsing/src/geojson/globegeometryfeature.cpp
@@ -75,8 +75,8 @@ std::string GlobeGeometryFeature::key() const {
     return _key;
 }
 
-void GlobeGeometryFeature::setOffsets(const glm::vec3& value) {
-    _offsets = value;
+void GlobeGeometryFeature::setOffsets(glm::vec3 offsets) {
+    _offsets = std::move(offsets);
 }
 
 void GlobeGeometryFeature::initializeGL(ghoul::opengl::ProgramObject* pointsProgram,
@@ -100,8 +100,8 @@ void GlobeGeometryFeature::deinitializeGL() {
 }
 
 bool GlobeGeometryFeature::isReady() const {
-    bool shadersAreReady = _linesAndPolygonsProgram && _pointsProgram;
-    bool textureIsReady = (!_hasTexture) || _pointTexture;
+    const bool shadersAreReady = _linesAndPolygonsProgram && _pointsProgram;
+    const bool textureIsReady = (!_hasTexture) || _pointTexture;
     return shadersAreReady && textureIsReady;
 }
 
@@ -160,9 +160,11 @@ void GlobeGeometryFeature::updateTexture(bool isInitializeStep) {
 void GlobeGeometryFeature::createFromSingleGeosGeometry(const geos::geom::Geometry* geo,
                                                         int index, bool ignoreHeights)
 {
-    ghoul_assert(geo, "No geometry provided");
+    if (!geo) {
+        throw std::logic_error("No geometry provided");
+    }
     ghoul_assert(
-        geo->isPuntal() || !geo->isCollection(),
+        (geo && geo->isPuntal()) || (geo && !geo->isCollection()),
         "Non-point geometry can not be a collection"
     );
 
@@ -180,7 +182,7 @@ void GlobeGeometryFeature::createFromSingleGeosGeometry(const geos::geom::Geomet
         }
         case geos::geom::GEOS_POLYGON: {
             try {
-                auto p = dynamic_cast<const geos::geom::Polygon*>(geo);
+                const auto p = dynamic_cast<const geos::geom::Polygon*>(geo);
 
                 // Triangles
                 // Note that Constrained Delaunay triangulation supports polygons with
@@ -208,11 +210,13 @@ void GlobeGeometryFeature::createFromSingleGeosGeometry(const geos::geom::Geomet
                 pNormalized->normalize();
 
                 const geos::geom::LinearRing* outerRing = pNormalized->getExteriorRing();
-                std::vector<Geodetic3> outerBoundsGeoCoords =
+                const std::vector<Geodetic3> outerBoundsGeoCoords =
                     geometryhelper::geometryCoordsAsGeoVector(outerRing);
 
                 if (!outerBoundsGeoCoords.empty()) {
-                    int nHoles = static_cast<int>(pNormalized->getNumInteriorRing());
+                    const int nHoles = static_cast<int>(
+                        pNormalized->getNumInteriorRing()
+                    );
                     _geoCoordinates.reserve(nHoles + 1);
 
                     // Outer bounds
@@ -224,8 +228,7 @@ void GlobeGeometryFeature::createFromSingleGeosGeometry(const geos::geom::Geomet
                             pNormalized->getInteriorRingN(i);
                         std::vector<Geodetic3> ringGeoCoords =
                             geometryhelper::geometryCoordsAsGeoVector(hole);
-
-                        _geoCoordinates.push_back(ringGeoCoords);
+                        _geoCoordinates.push_back(std::move(ringGeoCoords));
                     }
                 }
 
@@ -289,8 +292,8 @@ void GlobeGeometryFeature::render(const RenderData& renderData, int pass,
 {
     ghoul_assert(pass >= 0 && pass < 2, "Render pass variable out of accepted range");
 
-    float opacity = mainOpacity * _properties.opacity();
-    float fillOpacity = mainOpacity * _properties.fillOpacity();
+    const float opacity = mainOpacity * _properties.opacity();
+    const float fillOpacity = mainOpacity * _properties.fillOpacity();
 
     const glm::dmat4 globeModelTransform = _globe.modelTransform();
     const glm::dmat4 modelViewTransform =
@@ -313,7 +316,7 @@ void GlobeGeometryFeature::render(const RenderData& renderData, int pass,
             continue;
         }
 
-        bool shouldRenderTwice = r.type == RenderType::Polygon &&
+        const bool shouldRenderTwice = r.type == RenderType::Polygon &&
             fillOpacity < 1.f && _properties.extrude();
 
         if (pass > 0 && !shouldRenderTwice) {
@@ -352,7 +355,7 @@ void GlobeGeometryFeature::render(const RenderData& renderData, int pass,
                 break;
             case RenderType::Points: {
                 shader->setUniform("opacity", opacity);
-                float scale = extraRenderData.pointSizeScale;
+                const float scale = extraRenderData.pointSizeScale;
                 renderPoints(r, renderData, extraRenderData.pointRenderMode, scale);
                 break;
             }
@@ -382,8 +385,8 @@ void GlobeGeometryFeature::renderPoints(const RenderFeature& feature,
     ghoul_assert(feature.type == RenderType::Points, "Trying to render faulty geometry");
     _pointsProgram->setUniform("color", _properties.color());
 
-    float bs = static_cast<float>(_globe.boundingSphere());
-    float size = 0.001f * sizeScale * _properties.pointSize() * bs;
+    const float bs = static_cast<float>(_globe.boundingSphere());
+    const float size = 0.001f * sizeScale * _properties.pointSize() * bs;
     _pointsProgram->setUniform("pointSize", size);
 
     _pointsProgram->setUniform("renderMode", static_cast<int>(renderMode));
@@ -395,29 +398,29 @@ void GlobeGeometryFeature::renderPoints(const RenderFeature& feature,
     );
 
     // Points are rendered as billboards
-    glm::dvec3 cameraViewDirectionWorld = -renderData.camera.viewDirectionWorldSpace();
-    glm::dvec3 cameraUpDirectionWorld = renderData.camera.lookUpVectorWorldSpace();
+    const glm::dvec3 cameraViewDirWorld = -renderData.camera.viewDirectionWorldSpace();
+    const glm::dvec3 cameraUpDirWorld = renderData.camera.lookUpVectorWorldSpace();
     glm::dvec3 orthoRight = glm::normalize(
-        glm::cross(cameraUpDirectionWorld, cameraViewDirectionWorld)
+        glm::cross(cameraUpDirWorld, cameraViewDirWorld)
     );
     if (orthoRight == glm::dvec3(0.0)) {
-        // For some reason, the up vector and camera view vecter were the same. Use a
+        // For some reason, the up vector and camera view vector were the same. Use a
         // slightly different vector
-        glm::dvec3 otherVector = glm::vec3(
-            cameraUpDirectionWorld.y,
-            cameraUpDirectionWorld.x,
-            cameraUpDirectionWorld.z
+        const glm::dvec3 otherVector = glm::vec3(
+            cameraUpDirWorld.y,
+            cameraUpDirWorld.x,
+            cameraUpDirWorld.z
         );
-        orthoRight = glm::normalize(glm::cross(otherVector, cameraViewDirectionWorld));
+        orthoRight = glm::normalize(glm::cross(otherVector, cameraViewDirWorld));
     }
-    glm::dvec3 orthoUp = glm::normalize(glm::cross(cameraViewDirectionWorld, orthoRight));
+    const glm::dvec3 orthoUp = glm::normalize(glm::cross(cameraViewDirWorld, orthoRight));
 
     _pointsProgram->setUniform("cameraUp", glm::vec3(orthoUp));
     _pointsProgram->setUniform("cameraRight", glm::vec3(orthoRight));
 
-    glm::dvec3 cameraPositionWorld = renderData.camera.positionVec3();
+    const glm::dvec3 cameraPositionWorld = renderData.camera.positionVec3();
     _pointsProgram->setUniform("cameraPosition", cameraPositionWorld);
-    _pointsProgram->setUniform("cameraLookUp", glm::vec3(cameraUpDirectionWorld));
+    _pointsProgram->setUniform("cameraLookUp", glm::vec3(cameraUpDirWorld));
 
     if (_pointTexture && _hasTexture) {
         ghoul::opengl::TextureUnit unit;
@@ -426,7 +429,8 @@ void GlobeGeometryFeature::renderPoints(const RenderFeature& feature,
         _pointsProgram->setUniform("pointTexture", unit);
         _pointsProgram->setUniform("hasTexture", true);
 
-        float widthHeightRatio = static_cast<float>(_pointTexture->texture()->width()) /
+        const float widthHeightRatio =
+            static_cast<float>(_pointTexture->texture()->width()) /
             static_cast<float>(_pointTexture->texture()->height());
         _pointsProgram->setUniform("textureWidthFactor", widthHeightRatio);
     }
@@ -480,7 +484,7 @@ void GlobeGeometryFeature::renderPolygons(const RenderFeature& feature,
 bool GlobeGeometryFeature::shouldUpdateDueToHeightMapChange() const {
     if (_properties.altitudeMode() == GeoJsonProperties::AltitudeMode::RelativeToGround) {
         // Cap the update to a given time interval
-        std::chrono::system_clock::time_point now = std::chrono::system_clock::now();
+        const auto now = std::chrono::system_clock::now();
         if (now - _lastHeightUpdateTime < HeightUpdateInterval) {
             return false;
         }
@@ -491,7 +495,7 @@ bool GlobeGeometryFeature::shouldUpdateDueToHeightMapChange() const {
         // Check if last height values for the control positions have changed
         std::vector<double> newHeights = getCurrentReferencePointsHeights();
 
-        bool isSame = std::equal(
+        const bool isSame = std::equal(
             _lastControlHeights.begin(),
             _lastControlHeights.end(),
             newHeights.begin(),
@@ -529,7 +533,7 @@ void GlobeGeometryFeature::updateGeometry() {
         createPointGeometry();
     }
     else {
-        std::vector<std::vector<glm::vec3>> edgeVertices = createLineGeometry();
+        const std::vector<std::vector<glm::vec3>> edgeVertices = createLineGeometry();
         createExtrudedGeometry(edgeVertices);
         createPolygonGeometry();
     }
@@ -554,28 +558,27 @@ void GlobeGeometryFeature::updateHeightsFromHeightMap() {
 std::vector<std::vector<glm::vec3>> GlobeGeometryFeature::createLineGeometry() {
     std::vector<std::vector<glm::vec3>> resultPositions;
     resultPositions.reserve(_geoCoordinates.size());
-
-    for (size_t i = 0; i < _geoCoordinates.size(); i++) {
+    for (const std::vector<Geodetic3>& coordinates : _geoCoordinates) {
         std::vector<Vertex> vertices;
         std::vector<glm::vec3> positions;
         // TODO: this is not correct anymore
-        vertices.reserve(_geoCoordinates[i].size() * 3);
+        vertices.reserve(coordinates.size() * 3);
         // TODO: this is not correct anymore
-        positions.reserve(_geoCoordinates[i].size() * 3);
+        positions.reserve(coordinates.size() * 3);
 
         glm::dvec3 lastPos = glm::dvec3(0.0);
         double lastHeightValue = 0.0;
 
         bool isFirst = true;
-        for (const Geodetic3& geodetic : _geoCoordinates[i]) {
-            glm::dvec3 v = geometryhelper::computeOffsetedModelCoordinate(
+        for (const Geodetic3& geodetic : coordinates) {
+            const glm::dvec3 v = geometryhelper::computeOffsetedModelCoordinate(
                 geodetic,
                 _globe,
                 _offsets.x,
                 _offsets.y
             );
 
-            auto addLinePos = [&vertices, &positions](glm::vec3 pos) {
+            const auto addLinePos = [&vertices, &positions](const glm::vec3& pos) {
                 vertices.push_back({ pos.x, pos.y, pos.z, 0.f, 0.f, 0.f });
                 positions.push_back(pos);
             };
@@ -592,7 +595,7 @@ std::vector<std::vector<glm::vec3>> GlobeGeometryFeature::createLineGeometry() {
                 // Tessellate.
                 // But first, determine the step size for the tessellation (larger
                 // features will not be tesselated)
-                float stepSize = tessellationStepSize();
+                const float stepSize = tessellationStepSize();
 
                 std::vector<geometryhelper::PosHeightPair> subdividedPositions =
                     geometryhelper::subdivideLine(
@@ -639,24 +642,24 @@ void GlobeGeometryFeature::createPointGeometry() {
         return;
     }
 
-    for (size_t i = 0; i < _geoCoordinates.size(); i++) {
+    for (const std::vector<Geodetic3>& coordinates : _geoCoordinates) {
         std::vector<Vertex> vertices;
-        vertices.reserve(_geoCoordinates[i].size());
+        vertices.reserve(coordinates.size());
 
         std::vector<Vertex> extrudedLineVertices;
-        extrudedLineVertices.reserve(2 * _geoCoordinates[i].size());
+        extrudedLineVertices.reserve(2 * coordinates.size());
 
-        for (const Geodetic3& geodetic : _geoCoordinates[i]) {
-            glm::dvec3 v = geometryhelper::computeOffsetedModelCoordinate(
+        for (const Geodetic3& geodetic : coordinates) {
+            const glm::dvec3 v = geometryhelper::computeOffsetedModelCoordinate(
                 geodetic,
                 _globe,
                 _offsets.x,
                 _offsets.y
             );
 
-            glm::vec3 vf = static_cast<glm::vec3>(v);
+            const glm::vec3 vf = static_cast<glm::vec3>(v);
             // Normal is the out direction
-            glm::vec3 normal = glm::normalize(vf);
+            const glm::vec3 normal = glm::normalize(vf);
 
             vertices.push_back({ vf.x, vf.y, vf.z, normal.x, normal.y, normal.z });
 
@@ -691,8 +694,9 @@ void GlobeGeometryFeature::createExtrudedGeometry(
         return;
     }
 
-    std::vector<Vertex> vertices =
-        geometryhelper::createExtrudedGeometryVertices(edgeVertices);
+    const std::vector<Vertex> vertices = geometryhelper::createExtrudedGeometryVertices(
+        edgeVertices
+    );
 
     RenderFeature feature;
     feature.type = RenderType::Polygon;
@@ -732,14 +736,14 @@ void GlobeGeometryFeature::createPolygonGeometry() {
             const glm::vec3 v1 = triPositions[1];
             const glm::vec3 v2 = triPositions[2];
 
-            double h0 = triHeights[0];
-            double h1 = triHeights[1];
-            double h2 = triHeights[2];
+            const double h0 = triHeights[0];
+            const double h1 = triHeights[1];
+            const double h2 = triHeights[2];
 
             if (_properties.tessellationEnabled()) {
                 // First determine the step size for the tessellation (larger features
                 // will not be tesselated)
-                float stepSize = tessellationStepSize();
+                const float stepSize = tessellationStepSize();
 
                 std::vector<Vertex> verts = geometryhelper::subdivideTriangle(
                     v0, v1, v2,
@@ -783,7 +787,7 @@ void GlobeGeometryFeature::initializeRenderFeature(RenderFeature& feature,
 
 float GlobeGeometryFeature::tessellationStepSize() const {
     float distance = _properties.tessellationDistance();
-    bool shouldDivideDistance = _properties.useTessellationLevel() &&
+    const bool shouldDivideDistance = _properties.useTessellationLevel() &&
         _properties.tessellationLevel() > 0;
 
     if (shouldDivideDistance) {
@@ -839,7 +843,7 @@ void GlobeGeometryFeature::bufferVertexData(const RenderFeature& feature,
         vertexData.data()
     );
 
-    GLint positionAttrib = program->attributeLocation("in_position");
+    const GLint positionAttrib = program->attributeLocation("in_position");
     glEnableVertexAttribArray(positionAttrib);
     glVertexAttribPointer(
         positionAttrib,
@@ -850,7 +854,7 @@ void GlobeGeometryFeature::bufferVertexData(const RenderFeature& feature,
         nullptr
     );
 
-    GLint normalAttrib = program->attributeLocation("in_normal");
+    const GLint normalAttrib = program->attributeLocation("in_normal");
     glEnableVertexAttribArray(normalAttrib);
     glVertexAttribPointer(
         normalAttrib,
@@ -862,7 +866,7 @@ void GlobeGeometryFeature::bufferVertexData(const RenderFeature& feature,
     );
 
     // Put height data after all vertex data in buffer
-    unsigned long long endOfVertexData = vertexData.size() * sizeof(Vertex);
+    const unsigned long long endOfVertexData = vertexData.size() * sizeof(Vertex);
     glBindVertexArray(feature.vaoId);
     glBindBuffer(GL_ARRAY_BUFFER, feature.vboId);
     glBufferSubData(
@@ -872,7 +876,7 @@ void GlobeGeometryFeature::bufferVertexData(const RenderFeature& feature,
         feature.heights.data()
     );
 
-    GLint heightAttrib = program->attributeLocation("in_height");
+    const GLint heightAttrib = program->attributeLocation("in_height");
     glEnableVertexAttribArray(heightAttrib);
     glVertexAttribPointer(
         heightAttrib,
@@ -907,7 +911,7 @@ void GlobeGeometryFeature::bufferDynamicHeightData(const RenderFeature& feature)
         feature.heights.data()
     );
 
-    GLint heightAttrib = program->attributeLocation("in_height");
+    const GLint heightAttrib = program->attributeLocation("in_height");
     glEnableVertexAttribArray(heightAttrib);
     glVertexAttribPointer(
         heightAttrib,
diff --git a/modules/globebrowsing/src/geojson/globegeometryfeature.h b/modules/globebrowsing/src/geojson/globegeometryfeature.h
index 02e3f63249..1f899e8004 100644
--- a/modules/globebrowsing/src/geojson/globegeometryfeature.h
+++ b/modules/globebrowsing/src/geojson/globegeometryfeature.h
@@ -119,7 +119,7 @@ public:
 
     std::string key() const;
 
-    void setOffsets(const glm::vec3& offsets);
+    void setOffsets(glm::vec3 offsets);
 
     void initializeGL(ghoul::opengl::ProgramObject* pointsProgram,
         ghoul::opengl::ProgramObject* linesAndPolygonsProgram);
diff --git a/modules/globebrowsing/src/geojson/globegeometryhelper.cpp b/modules/globebrowsing/src/geojson/globegeometryhelper.cpp
index d1838f90d0..bdaa473685 100644
--- a/modules/globebrowsing/src/geojson/globegeometryhelper.cpp
+++ b/modules/globebrowsing/src/geojson/globegeometryhelper.cpp
@@ -73,7 +73,7 @@ std::vector<Geodetic2> geodetic2FromVertexList(const RenderableGlobe& globe,
     std::vector<Geodetic2> res;
     res.reserve(verts.size());
     for (const rendering::helper::VertexXYZNormal& v : verts) {
-        glm::dvec3 cartesian = glm::dvec3(v.xyz[0], v.xyz[1], v.xyz[2]);
+        const glm::dvec3 cartesian = glm::dvec3(v.xyz[0], v.xyz[1], v.xyz[2]);
         res.push_back(globe.ellipsoid().cartesianToGeodetic2(cartesian));
     }
     return res;
@@ -85,7 +85,7 @@ std::vector<float> heightMapHeightsFromGeodetic2List(const RenderableGlobe& glob
     std::vector<float> res;
     res.reserve(list.size());
     for (const Geodetic2& geo : list) {
-        float h = static_cast<float>(getHeightToReferenceSurface(geo, globe));
+        const float h = static_cast<float>(getHeightToReferenceSurface(geo, globe));
         res.push_back(h);
     }
     return res;
@@ -106,16 +106,16 @@ createExtrudedGeometryVertices(const std::vector<std::vector<glm::vec3>>& edgeVe
     for (size_t nBound = 0; nBound < edgeVertices.size(); ++nBound) {
         const std::vector<glm::vec3>& boundary = edgeVertices[nBound];
         for (size_t i = 1; i < boundary.size(); i++) {
-            glm::vec3 v0 = boundary[i - 1];
-            glm::vec3 v1 = boundary[i ];
+            const glm::vec3& v0 = boundary[i - 1];
+            const glm::vec3& v1 = boundary[i];
 
             // Vertices close to globe (Based on origin which is the zero point here)
             // For now, use center of globe (TODO: allow setting the height)
-            glm::vec3 vOrigin = glm::vec3(0.f);
+            const glm::vec3 vOrigin = glm::vec3(0.f);
 
             // Outer boundary is the first one
             if (nBound == 0) {
-                glm::vec3 n = glm::vec3(
+                const glm::vec3 n = glm::vec3(
                     glm::normalize(glm::cross(v1 - vOrigin, v0 - vOrigin))
                 );
                 vertices.push_back({ vOrigin.x, vOrigin.y, vOrigin.z, n.x, n.y, n.z });
@@ -125,7 +125,9 @@ createExtrudedGeometryVertices(const std::vector<std::vector<glm::vec3>>& edgeVe
             // Inner boundary
             else {
                 // Flipped winding order and normal for inner rings
-                glm::vec3 n = glm::normalize(glm::cross(v0 - vOrigin, v1 - vOrigin));
+                const glm::vec3 n = glm::normalize(
+                    glm::cross(v0 - vOrigin, v1 - vOrigin)
+                );
                 vertices.push_back({ vOrigin.x, vOrigin.y, vOrigin.z, n.x, n.y, n.z });
                 vertices.push_back({ v0.x, v0.y, v0.z, n.x, n.y, n.z });
                 vertices.push_back({ v1.x, v1.y, v1.z, n.x, n.y, n.z });
@@ -144,7 +146,7 @@ createExtrudedGeometryVertices(const std::vector<std::vector<glm::vec3>>& edgeVe
 
 double getHeightToReferenceSurface(const Geodetic2& geo, const RenderableGlobe& globe) {
     // Compute model space coordinate, and potentially account for height map
-    glm::dvec3 posModelSpaceZeroHeight =
+    const glm::dvec3 posModelSpaceZeroHeight =
         globe.ellipsoid().cartesianSurfacePosition(geo);
 
     const SurfacePositionHandle posHandle =
@@ -158,8 +160,8 @@ glm::dvec3 computeOffsetedModelCoordinate(const Geodetic3& geo,
                                           float latOffset, float lonOffset)
 {
     // Account for lat long offset
-    double offsetLatRadians = glm::radians(latOffset);
-    double offsetLonRadians = glm::radians(lonOffset);
+    const double offsetLatRadians = glm::radians(latOffset);
+    const double offsetLonRadians = glm::radians(lonOffset);
 
     Geodetic3 adjusted = geo;
     adjusted.geodetic2.lat += offsetLatRadians;
@@ -171,8 +173,8 @@ glm::dvec3 computeOffsetedModelCoordinate(const Geodetic3& geo,
 std::vector<PosHeightPair> subdivideLine(const glm::dvec3& v0, const glm::dvec3& v1,
                                          double h0, double h1, double maxDistance)
 {
-    double edgeLength = glm::distance(v1, v0);
-    int nSegments = static_cast<int>(std::ceil(edgeLength / maxDistance));
+    const double edgeLength = glm::distance(v1, v0);
+    const int nSegments = static_cast<int>(std::ceil(edgeLength / maxDistance));
 
     std::vector<PosHeightPair> positions;
     positions.reserve(nSegments + 1);
@@ -183,15 +185,15 @@ std::vector<PosHeightPair> subdivideLine(const glm::dvec3& v0, const glm::dvec3&
     }
 
     for (int seg = 0; seg < nSegments; ++seg) {
-        double t = static_cast<double>(seg) / static_cast<double>(nSegments);
+        const double t = static_cast<double>(seg) / static_cast<double>(nSegments);
 
         // Interpolate both position and height value
-        glm::dvec3 newV = glm::mix(v0, v1, t);
-        double newHeight = glm::mix(h0, h1, t);
-        double heightDiff = newHeight - h0;
+        const glm::dvec3 newV = glm::mix(v0, v1, t);
+        const double newHeight = glm::mix(h0, h1, t);
+        const double heightDiff = newHeight - h0;
 
         // Compute position along arc between v0 and v1, with adjusted height value
-        glm::vec3 newVf = static_cast<glm::vec3>(
+        const glm::vec3 newVf = static_cast<glm::vec3>(
             (glm::length(v0) + heightDiff) * glm::normalize(newV)
         );
         positions.push_back({ newVf, newHeight });
@@ -230,38 +232,40 @@ subdivideTriangle(const glm::vec3& v0, const glm::vec3& v1, const glm::vec3& v2,
         maxDistance
     );
 
-    size_t nSteps01 = edge01.size();
-    size_t nSteps02 = edge02.size();
-    size_t nSteps12 = edge12.size();
-    size_t maxSteps = std::max(std::max(nSteps01, nSteps02), nSteps12);
+    const size_t nSteps01 = edge01.size();
+    const size_t nSteps02 = edge02.size();
+    const size_t nSteps12 = edge12.size();
+    const size_t maxSteps = std::max(std::max(nSteps01, nSteps02), nSteps12);
     vertices.reserve(maxSteps * maxSteps);
 
     // Add points inside the triangle
     std::vector<Coordinate> pointCoords;
     pointCoords.reserve(3 * maxSteps + 1);
 
+    const globebrowsing::Ellipsoid& ellipsoid = globe.ellipsoid();
+
     const float lengthEdge01 = glm::length(v1 - v0);
     const float lengthEdge02 = glm::length(v2 - v0);
     for (size_t i = 1; i < nSteps01; i++) {
         for (size_t j = 1; j < nSteps02; j++) {
-            glm::vec3 comp01 = edge01[i].position - v0;
-            glm::vec3 comp02 = edge02[j].position - v0;
+            const glm::vec3 comp01 = edge01[i].position - v0;
+            const glm::vec3 comp02 = edge02[j].position - v0;
 
-            double hComp01 = edge01[i].height - h0;
-            double hComp02 = edge02[j].height - h0;
+            const double hComp01 = edge01[i].height - h0;
+            const double hComp02 = edge02[j].height - h0;
 
-            float w1 = glm::length(comp01) / lengthEdge01;
-            float w2 = glm::length(comp02) / lengthEdge02;
+            const float w1 = glm::length(comp01) / lengthEdge01;
+            const float w2 = glm::length(comp02) / lengthEdge02;
 
             if (w1 + w2 > 1.f - std::numeric_limits<float>::epsilon()) {
                 continue; // Sum larger than 1.0 => Outside of triangle
             }
 
-            glm::vec3 pos = v0 + comp01 + comp02;
-            double height = h0 + hComp01 + hComp02;
+            const glm::vec3 pos = v0 + comp01 + comp02;
+            const double height = h0 + hComp01 + hComp02;
 
-            Geodetic2 geo2 = globe.ellipsoid().cartesianToGeodetic2(pos);
-            Geodetic3 geo3 = { geo2, height };
+            const Geodetic2 geo2 = ellipsoid.cartesianToGeodetic2(pos);
+            const Geodetic3 geo3 = { geo2, height };
             pointCoords.push_back(geometryhelper::toGeosCoord(geo3));
         }
     }
@@ -269,27 +273,27 @@ subdivideTriangle(const glm::vec3& v0, const glm::vec3& v1, const glm::vec3& v2,
     // Add egde positions
     for (size_t i = 0; i < maxSteps; i++) {
         if (i < edge01.size() - 1) {
-            Geodetic2 geo2 = globe.ellipsoid().cartesianToGeodetic2(edge01[i].position);
-            Geodetic3 geo3 = { geo2, edge01[i].height };
+            const Geodetic2 geo2 = ellipsoid.cartesianToGeodetic2(edge01[i].position);
+            const Geodetic3 geo3 = { geo2, edge01[i].height };
             pointCoords.push_back(geometryhelper::toGeosCoord(geo3));
         }
         if (i < edge02.size() - 1) {
-            Geodetic2 geo2 = globe.ellipsoid().cartesianToGeodetic2(edge02[i].position);
-            Geodetic3 geo3 = { geo2, edge02[i].height };
+            const Geodetic2 geo2 = ellipsoid.cartesianToGeodetic2(edge02[i].position);
+            const Geodetic3 geo3 = { geo2, edge02[i].height };
             pointCoords.push_back(geometryhelper::toGeosCoord(geo3));
         }
         if (i < edge12.size() - 1) {
-            Geodetic2 geo2 = globe.ellipsoid().cartesianToGeodetic2(edge12[i].position);
-            Geodetic3 geo3 = { geo2, edge12[i].height };
+            const Geodetic2 geo2 = ellipsoid.cartesianToGeodetic2(edge12[i].position);
+            const Geodetic3 geo3 = { geo2, edge12[i].height };
             pointCoords.push_back(geometryhelper::toGeosCoord(geo3));
         }
     }
 
     // Also add the final position (not part of the subdivide step above)
-    Geodetic2 geo2 = globe.ellipsoid().cartesianToGeodetic2(v2);
-    glm::dvec3 centerToEllipsoidSurface = globe.ellipsoid().geodeticSurfaceProjection(v2);
-    double height = glm::length(glm::dvec3(v2) - centerToEllipsoidSurface);
-    Geodetic3 geo3 = { geo2, height };
+    const Geodetic2 geo2 = ellipsoid.cartesianToGeodetic2(v2);
+    const glm::dvec3 centerToEllipsoidSurface = ellipsoid.geodeticSurfaceProjection(v2);
+    const double height = glm::length(glm::dvec3(v2) - centerToEllipsoidSurface);
+    const Geodetic3 geo3 = { geo2, height };
     pointCoords.push_back(geometryhelper::toGeosCoord(geo3));
 
     pointCoords.shrink_to_fit();
@@ -330,11 +334,11 @@ subdivideTriangle(const glm::vec3& v0, const glm::vec3& v1, const glm::vec3& v2,
             count = 0;
             continue;
         }
-        Geodetic3 geodetic = geometryhelper::toGeodetic(coord);
+        const Geodetic3 geodetic = geometryhelper::toGeodetic(coord);
 
         // Note that offset should already have been applied to the coordinates. Use
         // zero offset => just get model coordinate
-        glm::vec3 v =
+        const glm::vec3 v =
             geometryhelper::computeOffsetedModelCoordinate(geodetic, globe, 0.f, 0.f);
 
         vertices.push_back({ v.x, v.y, v.z, 0.f, 0.f, 0.f });
@@ -343,7 +347,7 @@ subdivideTriangle(const glm::vec3& v0, const glm::vec3& v1, const glm::vec3& v2,
         // triangle vertices
         if (count == 3) {
             // Find previous vertices
-            size_t lastIndex = vertices.size() - 1;
+            const size_t lastIndex = vertices.size() - 1;
             rendering::helper::VertexXYZNormal& vert0 = vertices[lastIndex - 2];
             rendering::helper::VertexXYZNormal& vert1 = vertices[lastIndex - 1];
             rendering::helper::VertexXYZNormal& vert2 = vertices[lastIndex];
diff --git a/modules/globebrowsing/src/globelabelscomponent.cpp b/modules/globebrowsing/src/globelabelscomponent.cpp
index 233dfe5a69..2993a744c2 100644
--- a/modules/globebrowsing/src/globelabelscomponent.cpp
+++ b/modules/globebrowsing/src/globelabelscomponent.cpp
@@ -154,6 +154,73 @@ namespace {
         openspace::properties::Property::Visibility::User
     };
 
+    bool isLabelInFrustum(const glm::dmat4& MVMatrix, const glm::dvec3& position) {
+        // Frustum Planes
+        const glm::dvec3 col1(MVMatrix[0][0], MVMatrix[1][0], MVMatrix[2][0]);
+        const glm::dvec3 col2(MVMatrix[0][1], MVMatrix[1][1], MVMatrix[2][1]);
+        const glm::dvec3 col3(MVMatrix[0][2], MVMatrix[1][2], MVMatrix[2][2]);
+        const glm::dvec3 col4(MVMatrix[0][3], MVMatrix[1][3], MVMatrix[2][3]);
+
+        glm::dvec3 leftNormal = col4 + col1;
+        glm::dvec3 rightNormal = col4 - col1;
+        glm::dvec3 bottomNormal = col4 + col2;
+        glm::dvec3 topNormal = col4 - col2;
+        glm::dvec3 nearNormal = col3 + col4;
+        glm::dvec3 farNormal = col4 - col3;
+
+        // Plane Distances
+        double leftDistance = MVMatrix[3][3] + MVMatrix[3][0];
+        double rightDistance = MVMatrix[3][3] - MVMatrix[3][0];
+        double bottomDistance = MVMatrix[3][3] + MVMatrix[3][1];
+        double topDistance = MVMatrix[3][3] - MVMatrix[3][1];
+        double nearDistance = MVMatrix[3][3] + MVMatrix[3][2];
+        // double farDistance = MVMatrix[3][3] - MVMatrix[3][2];
+
+        // Normalize Planes
+        const double invMagLeft = 1.0 / glm::length(leftNormal);
+        leftNormal *= invMagLeft;
+        leftDistance *= invMagLeft;
+
+        const double invMagRight = 1.0 / glm::length(rightNormal);
+        rightNormal *= invMagRight;
+        rightDistance *= invMagRight;
+
+        const double invMagBottom = 1.0 / glm::length(bottomNormal);
+        bottomNormal *= invMagBottom;
+        bottomDistance *= invMagBottom;
+
+        const double invMagTop = 1.0 / glm::length(topNormal);
+        topNormal *= invMagTop;
+        topDistance *= invMagTop;
+
+        const double invMagNear = 1.0 / glm::length(nearNormal);
+        nearNormal *= invMagNear;
+        nearDistance *= invMagNear;
+
+        const double invMagFar = 1.0 / glm::length(farNormal);
+        farNormal *= invMagFar;
+        // farDistance *= invMagFar;
+
+        constexpr float Radius = 1.0;
+        if ((glm::dot(leftNormal, position) + leftDistance) < -Radius) {
+            return false;
+        }
+        else if ((glm::dot(rightNormal, position) + rightDistance) < -Radius) {
+            return false;
+        }
+        else if ((glm::dot(bottomNormal, position) + bottomDistance) < -Radius) {
+            return false;
+        }
+        else if ((glm::dot(topNormal, position) + topDistance) < -Radius) {
+            return false;
+        }
+        else if ((glm::dot(nearNormal, position) + nearDistance) < -Radius) {
+            return false;
+        }
+
+        return true;
+    }
+
     struct [[codegen::Dictionary(GlobeLabelsComponent)]] Parameters {
         // The path to the labels file
         std::optional<std::filesystem::path> fileName;
@@ -318,7 +385,7 @@ bool GlobeLabelsComponent::loadLabelsData(const std::filesystem::path& file) {
         "GlobeLabelsComponent|" + identifier()
     );
 
-    bool hasCachedFile = std::filesystem::is_regular_file(cachedFile);
+    const bool hasCachedFile = std::filesystem::is_regular_file(cachedFile);
     if (hasCachedFile) {
         LINFO(fmt::format(
             "Cached file '{}' used for labels file '{}'", cachedFile, file
@@ -339,7 +406,7 @@ bool GlobeLabelsComponent::loadLabelsData(const std::filesystem::path& file) {
     }
     LINFO(fmt::format("Loading labels file '{}'", file));
 
-    bool success = readLabelsFile(file);
+    const bool success = readLabelsFile(file);
     if (success) {
         saveCachedFile(cachedFile);
     }
@@ -385,7 +452,7 @@ bool GlobeLabelsComponent::readLabelsFile(const std::filesystem::path& file) {
             strncpy(lEntry.feature, token.c_str(), 255);
             int tokenChar = 0;
             while (tokenChar < 256) {
-                if (lEntry.feature[tokenChar] < 0 && lEntry.feature[tokenChar] != '\0') {
+                if (lEntry.feature[tokenChar] < 0 && lEntry.feature[tokenChar]) {
                     lEntry.feature[tokenChar] = '*';
                 }
                 else if (lEntry.feature[tokenChar] == '\"') {
@@ -406,10 +473,10 @@ bool GlobeLabelsComponent::readLabelsFile(const std::filesystem::path& file) {
             lEntry.longitude = std::stof(token);
 
             std::getline(iss, token, ','); // Coord System
-            std::string coordinateSystem(token);
-            std::size_t found = coordinateSystem.find("West");
+            const std::string_view coordinateSystem = token;
+            const size_t found = coordinateSystem.find("West");
             if (found != std::string::npos) {
-                lEntry.longitude = 360.0f - lEntry.longitude;
+                lEntry.longitude = 360.f - lEntry.longitude;
             }
 
             // Clean white spaces
@@ -418,7 +485,7 @@ bool GlobeLabelsComponent::readLabelsFile(const std::filesystem::path& file) {
             if (token.empty()) {
                 std::getline(issFeature, token, '=');
             }
-            strncpy(lEntry.feature, token.c_str(), 255);
+            std::strncpy(lEntry.feature, token.c_str(), 255);
 
             GlobeBrowsingModule* _globeBrowsingModule =
                 global::moduleEngine->module<openspace::GlobeBrowsingModule>();
@@ -472,21 +539,21 @@ bool GlobeLabelsComponent::loadCachedFile(const std::filesystem::path& file) {
 }
 
 bool GlobeLabelsComponent::saveCachedFile(const std::filesystem::path& file) const {
-    std::ofstream fileStream(file, std::ofstream::binary);
+    std::ofstream fileStream = std::ofstream(file, std::ofstream::binary);
     if (!fileStream.good()) {
         LERROR(fmt::format("Error opening file '{}' for save cache file", file));
         return false;
     }
     fileStream.write(reinterpret_cast<const char*>(&CurrentCacheVersion), sizeof(int8_t));
 
-    int32_t nValues = static_cast<int32_t>(_labels.labelsArray.size());
+    const int32_t nValues = static_cast<int32_t>(_labels.labelsArray.size());
     if (nValues == 0) {
         LERROR("Error writing cache: No values were loaded");
         return false;
     }
     fileStream.write(reinterpret_cast<const char*>(&nValues), sizeof(int32_t));
 
-    size_t nBytes = nValues * sizeof(LabelEntry);
+    const size_t nBytes = nValues * sizeof(LabelEntry);
     fileStream.write(reinterpret_cast<const char*>(_labels.labelsArray.data()), nBytes);
 
     return fileStream.good();
@@ -498,27 +565,27 @@ void GlobeLabelsComponent::draw(const RenderData& data) {
     }
 
     // Calculate the MVP matrix
-    glm::dmat4 viewTransform = glm::dmat4(data.camera.combinedViewMatrix());
-    glm::dmat4 vp = glm::dmat4(data.camera.sgctInternal.projectionMatrix()) *
+    const glm::dmat4 viewTransform = glm::dmat4(data.camera.combinedViewMatrix());
+    const glm::dmat4 vp = glm::dmat4(data.camera.sgctInternal.projectionMatrix()) *
                     viewTransform;
-    glm::dmat4 mvp = vp * _globe->modelTransform();
+    const glm::dmat4 mvp = vp * _globe->modelTransform();
 
-    glm::dvec3 globePosWorld =
+    const glm::dvec3 globePosWorld =
         glm::dvec3(_globe->modelTransform() * glm::vec4(0.f, 0.f, 0.f, 1.f));
-    glm::dvec3 cameraToGlobeWorld = globePosWorld - data.camera.positionVec3();
-    double distanceCameraGlobeWorld = glm::length(cameraToGlobeWorld);
+    const glm::dvec3 cameraToGlobeWorld = globePosWorld - data.camera.positionVec3();
+    const double distanceCameraGlobeWorld = glm::length(cameraToGlobeWorld);
 
     float varyingOpacity = 1.f;
 
     const glm::dvec3 globeRadii = _globe->ellipsoid().radii();
-    double averageRadius = (globeRadii.x + globeRadii.y + globeRadii.z) / 3.0;
+    const double averageRadius = (globeRadii.x + globeRadii.y + globeRadii.z) / 3.0;
 
     if (_fadeInEnabled) {
         glm::dvec2 fadeRange = glm::dvec2(averageRadius + _heightOffset);
         fadeRange.x += _fadeDistances.value().y;
-        double a = 1.0 / (fadeRange.y - fadeRange.x);
-        double b = -(fadeRange.x / (fadeRange.y - fadeRange.x));
-        double funcValue = a * distanceCameraGlobeWorld + b;
+        const double a = 1.0 / (fadeRange.y - fadeRange.x);
+        const double b = -(fadeRange.x / (fadeRange.y - fadeRange.x));
+        const double funcValue = a * distanceCameraGlobeWorld + b;
         varyingOpacity *= static_cast<float>(std::min(funcValue, 1.0));
 
         if (varyingOpacity < MinOpacityValueConst) {
@@ -531,9 +598,9 @@ void GlobeLabelsComponent::draw(const RenderData& data) {
             averageRadius + _heightOffset + LabelFadeOutLimitAltitudeMeters
         );
         fadeRange.x += _fadeDistances.value().x;
-        double a = 1.0 / (fadeRange.x - fadeRange.y);
-        double b = -(fadeRange.y / (fadeRange.x - fadeRange.y));
-        double funcValue = a * distanceCameraGlobeWorld + b;
+        const double a = 1.0 / (fadeRange.x - fadeRange.y);
+        const double b = -(fadeRange.y / (fadeRange.x - fadeRange.y));
+        const double funcValue = a * distanceCameraGlobeWorld + b;
         varyingOpacity *= static_cast<float>(std::min(funcValue, 1.0));
 
         if (varyingOpacity < MinOpacityValueConst) {
@@ -548,27 +615,24 @@ void GlobeLabelsComponent::renderLabels(const RenderData& data,
                                         const glm::dmat4& modelViewProjectionMatrix,
                                         float distToCamera, float fadeInVariable
 ) {
-    glm::vec4 textColor = glm::vec4(
-        glm::vec3(_color),
-        opacity() * fadeInVariable
-    );
+    const glm::vec4 textColor = glm::vec4(glm::vec3(_color), opacity() * fadeInVariable);
 
-    glm::dmat4 VP = glm::dmat4(data.camera.sgctInternal.projectionMatrix()) *
+    const glm::dmat4 VP = glm::dmat4(data.camera.sgctInternal.projectionMatrix()) *
                     data.camera.combinedViewMatrix();
 
-    glm::dmat4 invModelMatrix = glm::inverse(_globe->modelTransform());
+    const glm::dmat4 invModelMatrix = glm::inverse(_globe->modelTransform());
 
-    glm::dvec3 cameraViewDirectionObj = glm::dvec3(
+    const glm::dvec3 cameraViewDirectionObj = glm::dvec3(
         invModelMatrix * glm::dvec4(data.camera.viewDirectionWorldSpace(), 0.0)
     );
-    glm::dvec3 cameraUpDirectionObj = glm::dvec3(
+    const glm::dvec3 cameraUpDirectionObj = glm::dvec3(
         invModelMatrix * glm::dvec4(data.camera.lookUpVectorWorldSpace(), 0.0)
     );
     glm::dvec3 orthoRight = glm::normalize(
         glm::cross(cameraViewDirectionObj, cameraUpDirectionObj)
     );
     if (orthoRight == glm::dvec3(0.0)) {
-        glm::dvec3 otherVector(
+        const glm::dvec3 otherVector = glm::dvec3(
             cameraUpDirectionObj.y,
             cameraUpDirectionObj.x,
             cameraUpDirectionObj.z
@@ -579,9 +643,9 @@ void GlobeLabelsComponent::renderLabels(const RenderData& data,
 
     for (const LabelEntry& lEntry : _labels.labelsArray) {
         glm::vec3 position = lEntry.geoPosition;
-        glm::dvec3 locationPositionWorld =
+        const glm::dvec3 locationPositionWorld =
             glm::dvec3(_globe->modelTransform() * glm::dvec4(position, 1.0));
-        double distanceCameraToLabelWorld =
+        const double distanceCameraToLabelWorld =
             glm::length(locationPositionWorld - data.camera.positionVec3());
 
         if (_disableCulling ||
@@ -589,17 +653,17 @@ void GlobeLabelsComponent::renderLabels(const RenderData& data,
             isLabelInFrustum(VP, locationPositionWorld)))
         {
             if (_alignmentOption == Circularly) {
-                glm::dvec3 labelNormalObj = glm::dvec3(
+                const glm::dvec3 labelNormalObj = glm::dvec3(
                     invModelMatrix * glm::dvec4(data.camera.positionVec3(), 1.0)
                 ) - glm::dvec3(position);
 
-                glm::dvec3 labelUpDirectionObj = glm::dvec3(position);
+                const glm::dvec3 labelUpDirectionObj = glm::dvec3(position);
 
                 orthoRight = glm::normalize(
                     glm::cross(labelUpDirectionObj, labelNormalObj)
                 );
                 if (orthoRight == glm::dvec3(0.0)) {
-                    glm::dvec3 otherVector(
+                    const glm::dvec3 otherVector = glm::dvec3(
                         labelUpDirectionObj.y,
                         labelUpDirectionObj.x,
                         labelUpDirectionObj.z
@@ -627,8 +691,8 @@ void GlobeLabelsComponent::renderLabels(const RenderData& data,
             labelInfo.disableTransmittance = true;
 
             // Testing
-            glm::dmat4 modelviewTransform = glm::dmat4(data.camera.combinedViewMatrix()) *
-                                            _globe->modelTransform();
+            const glm::dmat4 modelviewTransform = glm::dmat4(
+                data.camera.combinedViewMatrix()) * _globe->modelTransform();
             labelInfo.modelViewMatrix = modelviewTransform;
             labelInfo.projectionMatrix = glm::dmat4(
                 data.camera.sgctInternal.projectionMatrix()
@@ -645,73 +709,4 @@ void GlobeLabelsComponent::renderLabels(const RenderData& data,
     }
 }
 
-bool GlobeLabelsComponent::isLabelInFrustum(const glm::dmat4& MVMatrix,
-                                            const glm::dvec3& position) const
-{
-    // Frustum Planes
-    glm::dvec3 col1(MVMatrix[0][0], MVMatrix[1][0], MVMatrix[2][0]);
-    glm::dvec3 col2(MVMatrix[0][1], MVMatrix[1][1], MVMatrix[2][1]);
-    glm::dvec3 col3(MVMatrix[0][2], MVMatrix[1][2], MVMatrix[2][2]);
-    glm::dvec3 col4(MVMatrix[0][3], MVMatrix[1][3], MVMatrix[2][3]);
-
-    glm::dvec3 leftNormal = col4 + col1;
-    glm::dvec3 rightNormal = col4 - col1;
-    glm::dvec3 bottomNormal = col4 + col2;
-    glm::dvec3 topNormal = col4 - col2;
-    glm::dvec3 nearNormal = col3 + col4;
-    glm::dvec3 farNormal = col4 - col3;
-
-    // Plane Distances
-    double leftDistance = MVMatrix[3][3] + MVMatrix[3][0];
-    double rightDistance = MVMatrix[3][3] - MVMatrix[3][0];
-    double bottomDistance = MVMatrix[3][3] + MVMatrix[3][1];
-    double topDistance = MVMatrix[3][3] - MVMatrix[3][1];
-    double nearDistance = MVMatrix[3][3] + MVMatrix[3][2];
-    // double farDistance = MVMatrix[3][3] - MVMatrix[3][2];
-
-    // Normalize Planes
-    const double invMagLeft = 1.0 / glm::length(leftNormal);
-    leftNormal *= invMagLeft;
-    leftDistance *= invMagLeft;
-
-    const double invMagRight = 1.0 / glm::length(rightNormal);
-    rightNormal *= invMagRight;
-    rightDistance *= invMagRight;
-
-    const double invMagBottom = 1.0 / glm::length(bottomNormal);
-    bottomNormal *= invMagBottom;
-    bottomDistance *= invMagBottom;
-
-    const double invMagTop = 1.0 / glm::length(topNormal);
-    topNormal *= invMagTop;
-    topDistance *= invMagTop;
-
-    const double invMagNear = 1.0 / glm::length(nearNormal);
-    nearNormal *= invMagNear;
-    nearDistance *= invMagNear;
-
-    const double invMagFar = 1.0 / glm::length(farNormal);
-    farNormal *= invMagFar;
-    // farDistance *= invMagFar;
-
-    constexpr float Radius = 1.0;
-    if ((glm::dot(leftNormal, position) + leftDistance) < -Radius) {
-        return false;
-    }
-    else if ((glm::dot(rightNormal, position) + rightDistance) < -Radius) {
-        return false;
-    }
-    else if ((glm::dot(bottomNormal, position) + bottomDistance) < -Radius) {
-        return false;
-    }
-    else if ((glm::dot(topNormal, position) + topDistance) < -Radius) {
-        return false;
-    }
-    else if ((glm::dot(nearNormal, position) + nearDistance) < -Radius) {
-        return false;
-    }
-
-    return true;
-}
-
 } // namespace openspace
diff --git a/modules/globebrowsing/src/globelabelscomponent.h b/modules/globebrowsing/src/globelabelscomponent.h
index a131e340a8..6c63a7bad8 100644
--- a/modules/globebrowsing/src/globelabelscomponent.h
+++ b/modules/globebrowsing/src/globelabelscomponent.h
@@ -69,7 +69,6 @@ private:
     bool saveCachedFile(const std::filesystem::path& file) const;
     void renderLabels(const RenderData& data, const glm::dmat4& modelViewProjectionMatrix,
         float distToCamera, float fadeInVariable);
-    bool isLabelInFrustum(const glm::dmat4& MVMatrix, const glm::dvec3& position) const;
 
     // Labels Structures
     struct LabelEntry {
diff --git a/modules/globebrowsing/src/globerotation.cpp b/modules/globebrowsing/src/globerotation.cpp
index b1e0fd68ff..5d9f6471ff 100644
--- a/modules/globebrowsing/src/globerotation.cpp
+++ b/modules/globebrowsing/src/globerotation.cpp
@@ -186,15 +186,14 @@ glm::vec3 GlobeRotation::computeSurfacePosition(double latitude, double longitud
     ghoul_assert(_globeNode, "Globe cannot be nullptr");
 
     GlobeBrowsingModule* mod = global::moduleEngine->module<GlobeBrowsingModule>();
-    glm::vec3 groundPos = mod->cartesianCoordinatesFromGeo(
+    const glm::vec3 groundPos = mod->cartesianCoordinatesFromGeo(
         *_globeNode,
         latitude,
         longitude,
         0.0
     );
 
-    SurfacePositionHandle h =
-        _globeNode->calculateSurfacePositionHandle(groundPos);
+    const SurfacePositionHandle h = _globeNode->calculateSurfacePositionHandle(groundPos);
 
     // Compute position including heightmap
     return mod->cartesianCoordinatesFromGeo(
@@ -228,12 +227,20 @@ glm::dmat3 GlobeRotation::matrix(const UpdateData&) const {
         return _matrix;
     }
 
+    if (!_globeNode) {
+        LERRORC(
+            "GlobeRotation",
+            fmt::format("Could not find globe '{}'", _globe.value())
+        );
+        return _matrix;
+    }
+
     double lat = _latitude;
     double lon = _longitude;
 
     if (_useCamera) {
         GlobeBrowsingModule* mod = global::moduleEngine->module<GlobeBrowsingModule>();
-        glm::dvec3 position = mod->geoPosition();
+        const glm::dvec3 position = mod->geoPosition();
         lat = position.x;
         lon = position.y;
     }
@@ -251,8 +258,8 @@ glm::dmat3 GlobeRotation::matrix(const UpdateData&) const {
         yAxis = glm::dvec3(glm::cross(v1, v2));
     }
     else {
-        float latitudeRad = glm::radians(static_cast<float>(lat));
-        float longitudeRad = glm::radians(static_cast<float>(lon));
+        const float latitudeRad = glm::radians(static_cast<float>(lat));
+        const float longitudeRad = glm::radians(static_cast<float>(lon));
         yAxis = _globeNode->ellipsoid().geodeticSurfaceNormal(
             { latitudeRad, longitudeRad }
         );
diff --git a/modules/globebrowsing/src/globetranslation.cpp b/modules/globebrowsing/src/globetranslation.cpp
index 1d423b0a37..68cc127e8e 100644
--- a/modules/globebrowsing/src/globetranslation.cpp
+++ b/modules/globebrowsing/src/globetranslation.cpp
@@ -222,6 +222,14 @@ glm::dvec3 GlobeTranslation::position(const UpdateData&) const {
         return _position;
     }
 
+    if (!_attachedNode) {
+        LERRORC(
+            "GlobeRotation",
+            fmt::format("Could not find attached node '{}'", _globe.value())
+        );
+        return _position;
+    }
+
     GlobeBrowsingModule* mod = global::moduleEngine->module<GlobeBrowsingModule>();
 
     double lat = _latitude;
@@ -229,7 +237,7 @@ glm::dvec3 GlobeTranslation::position(const UpdateData&) const {
     double alt = _altitude;
 
     if (_useCamera) {
-        glm::dvec3 position = mod->geoPosition();
+        const glm::dvec3 position = mod->geoPosition();
         lat = position.x;
         lon = position.y;
         if (_useCameraAltitude) {
@@ -238,16 +246,16 @@ glm::dvec3 GlobeTranslation::position(const UpdateData&) const {
     }
 
     if (_useHeightmap) {
-
-        glm::vec3 groundPos = mod->cartesianCoordinatesFromGeo(
+        const glm::vec3 groundPos = mod->cartesianCoordinatesFromGeo(
             *_attachedNode,
             lat,
             lon,
             0.0
         );
 
-        SurfacePositionHandle h =
-            _attachedNode->calculateSurfacePositionHandle(groundPos);
+        const SurfacePositionHandle h = _attachedNode->calculateSurfacePositionHandle(
+            groundPos
+        );
 
         _position = mod->cartesianCoordinatesFromGeo(
             *_attachedNode,
diff --git a/modules/globebrowsing/src/gpulayergroup.cpp b/modules/globebrowsing/src/gpulayergroup.cpp
index 1f8618e0df..be7096f18f 100644
--- a/modules/globebrowsing/src/gpulayergroup.cpp
+++ b/modules/globebrowsing/src/gpulayergroup.cpp
@@ -45,7 +45,7 @@ void GPULayerGroup::setValue(ghoul::opengl::ProgramObject& program,
     const std::vector<Layer*>& activeLayers = layerGroup.activeLayers();
     for (unsigned int i = 0; i < activeLayers.size(); i++) {
         const GPULayer& gal = _gpuActiveLayers[i];
-        auto& galuc = gal.uniformCache;
+        const auto& galuc = gal.uniformCache;
         const Layer& al = *activeLayers[i];
 
         program.setUniform(galuc.opacity, al.opacity());
@@ -116,7 +116,7 @@ void GPULayerGroup::bind(ghoul::opengl::ProgramObject& p, const LayerGroup& laye
         GPULayer& gal = _gpuActiveLayers[i];
         auto& galuc = gal.uniformCache;
         const Layer& al = *activeLayers[i];
-        std::string name = fmt::format("{}[{}].", layerGroup.identifier(), i);
+        const std::string name = fmt::format("{}[{}].", layerGroup.identifier(), i);
 
         if (layerGroup.isHeightLayer()) {
             gal.isHeightLayer = true;
@@ -152,7 +152,7 @@ void GPULayerGroup::bind(ghoul::opengl::ProgramObject& p, const LayerGroup& laye
                 for (size_t j = 0; j < gal.gpuChunkTiles.size(); j++) {
                     GPULayer::GPUChunkTile& t = gal.gpuChunkTiles[j];
                     auto& tuc = t.uniformCache;
-                    std::string n = name + "pile.chunkTile" + std::to_string(j) + ".";
+                    const std::string n = fmt::format("{}pile.chunkTile{}.", name, j);
 
                     tuc.texture = p.uniformLocation(n + "textureSampler");
                     tuc.uvOffset = p.uniformLocation(n + "uvTransform.uvOffset");
diff --git a/modules/globebrowsing/src/layer.cpp b/modules/globebrowsing/src/layer.cpp
index 41ee4ee91d..b1ef0eb2a7 100644
--- a/modules/globebrowsing/src/layer.cpp
+++ b/modules/globebrowsing/src/layer.cpp
@@ -209,7 +209,7 @@ Layer::Layer(layers::Group::ID id, const ghoul::Dictionary& layerDict, LayerGrou
 {
     const Parameters p = codegen::bake<Parameters>(layerDict);
 
-    layers::Layer::ID typeID =
+    const layers::Layer::ID typeID =
         p.type.has_value() ?
         ghoul::from_string<layers::Layer::ID>(*p.type) :
         layers::Layer::ID::DefaultTileProvider;
@@ -457,7 +457,7 @@ void Layer::update() {
 glm::vec2 Layer::tileUvToTextureSamplePosition(const TileUvTransform& uvTransform,
                                                const glm::vec2& tileUV)
 {
-    glm::vec2 uv = uvTransform.uvOffset + uvTransform.uvScale * tileUV;
+    const glm::vec2 uv = uvTransform.uvOffset + uvTransform.uvScale * tileUV;
     return uv;
 }
 
@@ -481,10 +481,10 @@ void Layer::initializeBasedOnType(layers::Layer::ID id, ghoul::Dictionary initDi
                 static_cast<int>(_layerGroupId)
             );
             if (initDict.hasKey(KeyName) && initDict.hasValue<std::string>(KeyName)) {
-                std::string name = initDict.value<std::string>(KeyName);
+                const std::string name = initDict.value<std::string>(KeyName);
                 LDEBUG("Initializing tile provider for layer: '" + name + "'");
             }
-            _tileProvider = TileProvider::createFromDictionary(id, std::move(initDict));
+            _tileProvider = TileProvider::createFromDictionary(id, initDict);
             break;
         case layers::Layer::ID::SolidColor:
             if (initDict.hasValue<glm::dvec3>(ColorInfo.identifier)) {
diff --git a/modules/globebrowsing/src/layeradjustment.cpp b/modules/globebrowsing/src/layeradjustment.cpp
index f51fba812a..8ddf55e323 100644
--- a/modules/globebrowsing/src/layeradjustment.cpp
+++ b/modules/globebrowsing/src/layeradjustment.cpp
@@ -81,13 +81,13 @@ LayerAdjustment::LayerAdjustment()
     , _chromaKeyColor(ChromaKeyColorInfo, glm::vec3(0.f), glm::vec3(0.f), glm::vec3(1.f))
     , _chromaKeyTolerance(ChromaKeyToleranceInfo, 0.f, 0.f, 1.f)
     , _typeOption(TypeInfo, properties::OptionProperty::DisplayType::Dropdown)
+    , _typeId(static_cast<layers::Adjustment::ID>(_typeOption.value()))
 {
     // Add options to option properties
     for (const layers::Adjustment& ai : layers::Adjustments) {
         _typeOption.addOption(static_cast<int>(ai.id), std::string(ai.identifier));
     }
     _typeOption.setValue(static_cast<int>(layers::Adjustment::ID::None));
-    _typeId = static_cast<layers::Adjustment::ID>(_typeOption.value());
 
     _typeOption.onChange([this]() {
         switch (type()) {
diff --git a/modules/globebrowsing/src/layergroup.cpp b/modules/globebrowsing/src/layergroup.cpp
index eef2aaf4f4..c18b78bad2 100644
--- a/modules/globebrowsing/src/layergroup.cpp
+++ b/modules/globebrowsing/src/layergroup.cpp
@@ -58,10 +58,10 @@ LayerGroup::LayerGroup(layers::Group group)
 
 void LayerGroup::setLayersFromDict(const ghoul::Dictionary& dict) {
     for (size_t i = 1; i <= dict.size(); i++) {
-        ghoul::Dictionary layerDict = dict.value<ghoul::Dictionary>(std::to_string(i));
+        const ghoul::Dictionary layer = dict.value<ghoul::Dictionary>(std::to_string(i));
 
         try {
-            addLayer(layerDict);
+            addLayer(layer);
         }
         catch (const ghoul::RuntimeError& e) {
             LERRORC(e.component, e.message);
@@ -101,7 +101,7 @@ void LayerGroup::update() {
 Layer* LayerGroup::addLayer(const ghoul::Dictionary& layerDict) {
     ZoneScoped;
 
-    documentation::TestResult res = documentation::testSpecification(
+    const documentation::TestResult res = documentation::testSpecification(
         Layer::Documentation(),
         layerDict
     );
@@ -113,7 +113,7 @@ Layer* LayerGroup::addLayer(const ghoul::Dictionary& layerDict) {
         LERROR("'Identifier' must be specified for layer");
         return nullptr;
     }
-    std::string identifier = layerDict.value<std::string>("Identifier");
+    const std::string identifier = layerDict.value<std::string>("Identifier");
     if (hasPropertySubOwner(identifier)) {
         LINFO("Layer with identifier '" + identifier + "' already exists");
         _levelBlendingEnabled.setVisibility(properties::Property::Visibility::User);
@@ -167,7 +167,6 @@ void LayerGroup::deleteLayer(const std::string& layerName) {
         if (it->get()->identifier() == layerName) {
             // we need to make a copy as the layername is only a reference
             // which will no longer be valid once it is deleted
-            std::string name = layerName;
             removePropertySubOwner(it->get());
             (*it)->deinitialize();
             properties::PropertyOwner* layerGroup = it->get()->owner();
@@ -184,7 +183,7 @@ void LayerGroup::deleteLayer(const std::string& layerName) {
             if (_onChangeCallback) {
                 _onChangeCallback(nullptr);
             }
-            LINFO("Deleted layer " + name);
+            LINFO("Deleted layer " + layerName);
 
             if (_layers.empty()) {
                 _levelBlendingEnabled.setVisibility(
@@ -211,10 +210,10 @@ void LayerGroup::moveLayer(int oldPosition, int newPosition) {
     _layers.insert(newPosLayers, std::move(v));
 
     auto oldPosOwner = _subOwners.begin() + oldPosition;
-    PropertyOwner* owner = std::move(*oldPosOwner);
+    PropertyOwner* owner = *oldPosOwner;
     _subOwners.erase(oldPosOwner);
     auto newPosOwner = _subOwners.begin() + newPosition;
-    _subOwners.insert(newPosOwner, std::move(owner));
+    _subOwners.insert(newPosOwner, owner);
 }
 
 std::vector<Layer*> LayerGroup::layers() const {
diff --git a/modules/globebrowsing/src/layergroupid.cpp b/modules/globebrowsing/src/layergroupid.cpp
index 52ee68e097..4db0c8237b 100644
--- a/modules/globebrowsing/src/layergroupid.cpp
+++ b/modules/globebrowsing/src/layergroupid.cpp
@@ -55,19 +55,17 @@ static_assert(
         Groups.begin(),
         Groups.end(),
         [](const Group& gi) {
-            auto it = std::find_if(
+            const auto it = std::find_if(
                 Groups.begin(),
                 Groups.end(),
                 [gi](const Group& g) { return g.id == gi.id; }
             );
-            std::ptrdiff_t pos = std::distance(Groups.begin(), it);
+            const std::ptrdiff_t pos = std::distance(Groups.begin(), it);
             return static_cast<int>(pos) == static_cast<int>(gi.id);
         }
     )
 );
 
-
-
 static_assert(
     std::is_sorted(
         Layers.begin(),
@@ -87,12 +85,12 @@ static_assert(
         Layers.begin(),
         Layers.end(),
         [](const Layer& li) {
-            auto it = std::find_if(
+            const auto it = std::find_if(
                 Layers.begin(),
                 Layers.end(),
                 [li](const Layer& l) { return l.id == li.id; }
             );
-            std::ptrdiff_t pos = std::distance(Layers.begin(), it);
+            const std::ptrdiff_t pos = std::distance(Layers.begin(), it);
             return static_cast<int>(pos) == static_cast<int>(li.id);
         }
     )
@@ -121,12 +119,12 @@ static_assert(
         Adjustments.begin(),
         Adjustments.end(),
         [](const Adjustment& ai) {
-            auto it = std::find_if(
+            const auto it = std::find_if(
                 Adjustments.begin(),
                 Adjustments.end(),
                 [ai](const Adjustment& a) { return a.id == ai.id; }
             );
-            std::ptrdiff_t pos = std::distance(Adjustments.begin(), it);
+            const std::ptrdiff_t pos = std::distance(Adjustments.begin(), it);
             return static_cast<int>(pos) == static_cast<int>(ai.id);
         }
     )
@@ -155,12 +153,12 @@ static_assert(
         Blends.begin(),
         Blends.end(),
         [](const Blend& bi) {
-            auto it = std::find_if(
+            const auto it = std::find_if(
                 Blends.begin(),
                 Blends.end(),
                 [bi](const Blend& b) { return b.id == bi.id; }
             );
-            std::ptrdiff_t pos = std::distance(Blends.begin(), it);
+            const std::ptrdiff_t pos = std::distance(Blends.begin(), it);
             return static_cast<int>(pos) == static_cast<int>(bi.id);
         }
     )
diff --git a/modules/globebrowsing/src/layermanager.cpp b/modules/globebrowsing/src/layermanager.cpp
index 31302cda24..2387fa5bc8 100644
--- a/modules/globebrowsing/src/layermanager.cpp
+++ b/modules/globebrowsing/src/layermanager.cpp
@@ -63,16 +63,16 @@ void LayerManager::initialize(const ghoul::Dictionary& layerGroupsDict) {
     }
 
     // Create all the layer groups
-    for (std::string_view groupName : layerGroupsDict.keys()) {
+    for (std::string_view group : layerGroupsDict.keys()) {
         using namespace layers;
-        Group::ID id = ghoul::from_string<Group::ID>(groupName);
+        const Group::ID id = ghoul::from_string<Group::ID>(group);
 
         if (id != Group::ID::Unknown) {
-            ghoul::Dictionary d = layerGroupsDict.value<ghoul::Dictionary>(groupName);
+            const ghoul::Dictionary d = layerGroupsDict.value<ghoul::Dictionary>(group);
             _layerGroups[static_cast<int>(id)]->setLayersFromDict(d);
         }
         else {
-            LWARNINGC("LayerManager", fmt::format("Unknown layer group '{}'", groupName));
+            LWARNINGC("LayerManager", fmt::format("Unknown layer group '{}'", group));
         }
     }
 
@@ -166,7 +166,7 @@ void LayerManager::reset(bool includeDisabled) {
     }
 }
 
-void LayerManager::onChange(std::function<void(Layer*)> callback) {
+void LayerManager::onChange(const std::function<void(Layer*)>& callback) {
     ZoneScoped;
 
     for (std::unique_ptr<LayerGroup>& layerGroup : _layerGroups) {
diff --git a/modules/globebrowsing/src/layermanager.h b/modules/globebrowsing/src/layermanager.h
index e8cc3e9722..024734af6a 100644
--- a/modules/globebrowsing/src/layermanager.h
+++ b/modules/globebrowsing/src/layermanager.h
@@ -68,7 +68,7 @@ public:
     void update();
     void reset(bool includeDisabled = false);
 
-    void onChange(std::function<void(Layer* l)> callback);
+    void onChange(const std::function<void(Layer* l)>& callback);
 
     static documentation::Documentation Documentation();
 
diff --git a/modules/globebrowsing/src/layerrendersettings.cpp b/modules/globebrowsing/src/layerrendersettings.cpp
index 81e71a26ef..e50a39d070 100644
--- a/modules/globebrowsing/src/layerrendersettings.cpp
+++ b/modules/globebrowsing/src/layerrendersettings.cpp
@@ -81,7 +81,7 @@ LayerRenderSettings::LayerRenderSettings()
     });
 }
 
-void LayerRenderSettings::onChange(std::function<void()> callback) {
+void LayerRenderSettings::onChange(const std::function<void()>& callback) {
     gamma.onChange(callback);
     multiplier.onChange(callback);
     multiplier.onChange(callback);
@@ -94,14 +94,12 @@ float LayerRenderSettings::performLayerSettings(float v) const {
 }
 
 glm::vec4 LayerRenderSettings::performLayerSettings(const glm::vec4& currentValue) const {
-    glm::vec4 newValue = glm::vec4(
+    return glm::vec4(
         performLayerSettings(currentValue.r),
         performLayerSettings(currentValue.g),
         performLayerSettings(currentValue.b),
         performLayerSettings(currentValue.a)
     );
-
-    return newValue;
 }
 
 } // namespace openspace::globebrowsing
diff --git a/modules/globebrowsing/src/layerrendersettings.h b/modules/globebrowsing/src/layerrendersettings.h
index b0d36d97f7..58974cb143 100644
--- a/modules/globebrowsing/src/layerrendersettings.h
+++ b/modules/globebrowsing/src/layerrendersettings.h
@@ -40,7 +40,7 @@ struct LayerRenderSettings : public properties::PropertyOwner {
     properties::FloatProperty offset;
     properties::TriggerProperty setDefault;
 
-    void onChange(std::function<void()> callback);
+    void onChange(const std::function<void()>& callback);
 
     /**
      * This function matches the function with the same name in the shader code.
diff --git a/modules/globebrowsing/src/memoryawaretilecache.cpp b/modules/globebrowsing/src/memoryawaretilecache.cpp
index b1ca191ebe..ac35f07a88 100644
--- a/modules/globebrowsing/src/memoryawaretilecache.cpp
+++ b/modules/globebrowsing/src/memoryawaretilecache.cpp
@@ -215,7 +215,7 @@ void MemoryAwareTileCache::TextureContainer::reset() {
 
     using namespace ghoul::systemcapabilities;
 
-    ghoul::opengl::Texture::FilterMode mode =
+    const ghoul::opengl::Texture::FilterMode mode =
         OpenGLCap.gpuVendor() == OpenGLCapabilitiesComponent::Vendor::AmdATI ?
         ghoul::opengl::Texture::FilterMode::Linear :
         ghoul::opengl::Texture::FilterMode::AnisotropicMipMap;
@@ -331,7 +331,7 @@ void MemoryAwareTileCache::createDefaultTextureContainers() {
     ZoneScoped;
 
     for (const layers::Group& gi : layers::Groups) {
-        TileTextureInitData initData = tileTextureInitData(gi.id);
+        const TileTextureInitData initData = tileTextureInitData(gi.id);
         assureTextureContainerExists(initData);
     }
 }
@@ -341,13 +341,13 @@ void MemoryAwareTileCache::assureTextureContainerExists(
 {
     ZoneScoped;
 
-    TileTextureInitData::HashKey initDataKey = initData.hashKey;
+    const TileTextureInitData::HashKey initDataKey = initData.hashKey;
     if (_textureContainerMap.find(initDataKey) == _textureContainerMap.end()) {
         // For now create 500 textures of this type
         _textureContainerMap.emplace(initDataKey,
             TextureContainerTileCache(
                 std::make_unique<TextureContainer>(initData, 500),
-                std::make_unique<TileCache>(std::numeric_limits<std::size_t>::max())
+                std::make_unique<TileCache>(std::numeric_limits<size_t>::max())
             )
         );
     }
@@ -429,7 +429,7 @@ ghoul::opengl::Texture* MemoryAwareTileCache::texture(const TileTextureInitData&
 {
     // if this texture type does not exist among the texture containers
     // it needs to be created
-    TileTextureInitData::HashKey initDataKey = initData.hashKey;
+    const TileTextureInitData::HashKey initDataKey = initData.hashKey;
     assureTextureContainerExists(initData);
     // Now we know that the texture container exists,
     // check if there are any unused textures
@@ -437,7 +437,7 @@ ghoul::opengl::Texture* MemoryAwareTileCache::texture(const TileTextureInitData&
         _textureContainerMap[initDataKey].first->getTextureIfFree();
     // Second option. No more textures available. Pop from the LRU cache
     if (!texture) {
-        Tile oldTile = _textureContainerMap[initDataKey].second->popLRU().second;
+        const Tile oldTile = _textureContainerMap[initDataKey].second->popLRU().second;
         // Use the old tile's texture
         texture = oldTile.texture;
     }
@@ -469,16 +469,16 @@ void MemoryAwareTileCache::createTileAndPut(ProviderTileKey key, RawTile rawTile
             }
         }
         else {
-            size_t previousExpectedDataSize = tex->expectedPixelDataSize();
+            const size_t previousExpectedDataSize = tex->expectedPixelDataSize();
             ghoul_assert(
                 tex->dataOwnership(),
                 "Texture must have ownership of old data to avoid leaks"
             );
             tex->setPixelData(rawTile.imageData.release(), Texture::TakeOwnership::Yes);
             rawTile.imageData = nullptr;
-            [[ maybe_unused ]] size_t expectedDataSize = tex->expectedPixelDataSize();
+            [[ maybe_unused ]] const size_t expectedSize = tex->expectedPixelDataSize();
             const size_t numBytes = rawTile.textureInitData->totalNumBytes;
-            ghoul_assert(expectedDataSize == numBytes, "Pixel data size is incorrect");
+            ghoul_assert(expectedSize == numBytes, "Pixel data size is incorrect");
             _numTextureBytesAllocatedOnCPU += numBytes - previousExpectedDataSize;
             tex->reUploadTexture();
         }
@@ -486,14 +486,14 @@ void MemoryAwareTileCache::createTileAndPut(ProviderTileKey key, RawTile rawTile
         // mode at some point. This will introduce rendering artifacts when looking at the
         // globe at oblique angles (see #2752)
         using namespace ghoul::systemcapabilities;
-        ghoul::opengl::Texture::FilterMode mode =
+        const ghoul::opengl::Texture::FilterMode mode =
             OpenGLCap.gpuVendor() == OpenGLCapabilitiesComponent::Vendor::AmdATI ?
             ghoul::opengl::Texture::FilterMode::Linear :
             ghoul::opengl::Texture::FilterMode::AnisotropicMipMap;
 
         tex->setFilter(mode);
         Tile tile{ tex, std::move(rawTile.tileMetaData), Tile::Status::OK };
-        TileTextureInitData::HashKey initDataKey = initData.hashKey;
+        const TileTextureInitData::HashKey initDataKey = initData.hashKey;
         _textureContainerMap[initDataKey].second->put(std::move(key), std::move(tile));
     }
 }
@@ -541,7 +541,7 @@ size_t MemoryAwareTileCache::cpuAllocatedDataSize() const {
             const TextureContainer& textureContainer = *p.second.first;
             const TileTextureInitData& initData = textureContainer.tileTextureInitData();
             if (initData.shouldAllocateDataOnCPU) {
-                size_t bytesPerTexture = initData.totalNumBytes;
+                const size_t bytesPerTexture = initData.totalNumBytes;
                 return s + bytesPerTexture * textureContainer.size();
             }
             return s;
diff --git a/modules/globebrowsing/src/rawtiledatareader.cpp b/modules/globebrowsing/src/rawtiledatareader.cpp
index 42ce6dfdb7..f456046efb 100644
--- a/modules/globebrowsing/src/rawtiledatareader.cpp
+++ b/modules/globebrowsing/src/rawtiledatareader.cpp
@@ -126,8 +126,8 @@ GDALDataType toGDALDataType(GLenum glType) {
  */
 int calculateTileLevelDifference(GDALDataset* dataset, int minimumPixelSize) {
     GDALRasterBand* firstBand = dataset->GetRasterBand(1);
-    GDALRasterBand* maxOverview;
-    int numOverviews = firstBand->GetOverviewCount();
+    GDALRasterBand* maxOverview = nullptr;
+    const int numOverviews = firstBand->GetOverviewCount();
     if (numOverviews <= 0) { // No overviews. Use first band.
         maxOverview = firstBand;
     }
@@ -141,8 +141,8 @@ int calculateTileLevelDifference(GDALDataset* dataset, int minimumPixelSize) {
 }
 
 bool isInside(const PixelRegion& lhs, const PixelRegion& rhs) {
-    glm::ivec2 e = lhs.start + lhs.numPixels;
-    glm::ivec2 re = rhs.start + rhs.numPixels;
+    const glm::ivec2 e = lhs.start + lhs.numPixels;
+    const glm::ivec2 re = rhs.start + rhs.numPixels;
     return rhs.start.x <= lhs.start.x && e.x <= re.x &&
            rhs.start.y <= lhs.start.y && e.y <= re.y;
 }
@@ -152,7 +152,7 @@ bool isInside(const PixelRegion& lhs, const PixelRegion& rhs) {
  * by GDAL.
  */
 std::array<double, 6> geoTransform(int rasterX, int rasterY) {
-    GeodeticPatch cov(
+    const GeodeticPatch cov(
         Geodetic2{ 0.0, 0.0 },
         Geodetic2{ glm::half_pi<double>(), glm::pi<double>() }
     );
@@ -256,7 +256,7 @@ RawTileDataReader::RawTileDataReader(std::string filePath,
 }
 
 RawTileDataReader::~RawTileDataReader() {
-    std::lock_guard lockGuard(_datasetLock);
+    const std::lock_guard lockGuard(_datasetLock);
     if (_dataset) {
         GDALClose(_dataset);
         _dataset = nullptr;
@@ -290,13 +290,13 @@ std::optional<std::string> RawTileDataReader::mrfCache() {
         }
     }
 
-    GlobeBrowsingModule& module = *global::moduleEngine->module<GlobeBrowsingModule>();
+    const GlobeBrowsingModule& mod = *global::moduleEngine->module<GlobeBrowsingModule>();
 
-    std::string datasetIdentifier =
+    const std::string datasetIdentifier =
         std::to_string(std::hash<std::string>{}(_datasetFilePath));
-    std::string path = fmt::format("{}/{}/{}/",
-        module.mrfCacheLocation(), _cacheProperties.path, datasetIdentifier);
-    std::string root = absPath(path).string();
+    const std::string path = fmt::format("{}/{}/{}/",
+        mod.mrfCacheLocation(), _cacheProperties.path, datasetIdentifier);
+    const std::string root = absPath(path).string();
     std::string mrf = root + datasetIdentifier + ".mrf";
 
     if (!std::filesystem::exists(mrf)) {
@@ -408,7 +408,7 @@ void RawTileDataReader::initialize() {
     _rasterCount = _dataset->GetRasterCount();
 
     // calculateTileDepthTransform
-    unsigned long long maximumValue = [](GLenum t) {
+    const unsigned long long maximumValue = [](GLenum t) {
         switch (t) {
             case GL_UNSIGNED_BYTE:  return 1ULL << 8ULL;
             case GL_UNSIGNED_SHORT: return 1ULL << 16ULL;
@@ -434,12 +434,12 @@ void RawTileDataReader::initialize() {
     _noDataValue = static_cast<float>(_dataset->GetRasterBand(1)->GetNoDataValue());
     _dataType = toGDALDataType(_initData.glType);
 
-    CPLErr error = _dataset->GetGeoTransform(_padfTransform.data());
+    const CPLErr error = _dataset->GetGeoTransform(_padfTransform.data());
     if (error == CE_Failure) {
         _padfTransform = geoTransform(_rasterXSize, _rasterYSize);
     }
 
-    double tileLevelDifference = calculateTileLevelDifference(
+    const double tileLevelDifference = calculateTileLevelDifference(
         _dataset,
         _initData.dimensions.x
     );
@@ -453,7 +453,7 @@ void RawTileDataReader::initialize() {
 }
 
 void RawTileDataReader::reset() {
-    std::lock_guard lockGuard(_datasetLock);
+    const std::lock_guard lockGuard(_datasetLock);
     _maxChunkLevel = -1;
     if (_dataset) {
         GDALClose(_dataset);
@@ -517,7 +517,7 @@ RawTile::ReadError RawTileDataReader::rasterRead(int rasterBand,
 }
 
 RawTile RawTileDataReader::readTileData(TileIndex tileIndex) const {
-    size_t numBytes = _initData.totalNumBytes;
+    const size_t numBytes = _initData.totalNumBytes;
 
     RawTile rawTile;
     rawTile.imageData = std::unique_ptr<std::byte[]>(new std::byte[numBytes]);
@@ -546,7 +546,7 @@ void RawTileDataReader::readImageData(IODescription& io, RawTile::ReadError& wor
                                       char* imageDataDest) const
 {
     // Only read the minimum number of rasters
-    int nRastersToRead = std::min(_rasterCount, static_cast<int>(_initData.nRasters));
+    const int nReadRasters = std::min(_rasterCount, static_cast<int>(_initData.nRasters));
 
     switch (_initData.ghoulTextureFormat) {
         case ghoul::opengl::Texture::Format::Red: {
@@ -558,7 +558,7 @@ void RawTileDataReader::readImageData(IODescription& io, RawTile::ReadError& wor
         case ghoul::opengl::Texture::Format::RG:
         case ghoul::opengl::Texture::Format::RGB:
         case ghoul::opengl::Texture::Format::RGBA: {
-            if (nRastersToRead == 1) { // Grayscale
+            if (nReadRasters == 1) { // Grayscale
                 for (int i = 0; i < 3; i++) {
                     // The final destination pointer is offsetted by one datum byte size
                     // for every raster (or data channel, i.e. R in RGB)
@@ -567,7 +567,7 @@ void RawTileDataReader::readImageData(IODescription& io, RawTile::ReadError& wor
                     worstError = std::max(worstError, err);
                 }
             }
-            else if (nRastersToRead == 2) { // Grayscale + alpha
+            else if (nReadRasters == 2) { // Grayscale + alpha
                 for (int i = 0; i < 3; i++) {
                     // The final destination pointer is offsetted by one datum byte size
                     // for every raster (or data channel, i.e. R in RGB)
@@ -581,7 +581,7 @@ void RawTileDataReader::readImageData(IODescription& io, RawTile::ReadError& wor
                 worstError = std::max(worstError, err);
             }
             else { // Three or more rasters
-                for (int i = 0; i < nRastersToRead; i++) {
+                for (int i = 0; i < nReadRasters; i++) {
                     // The final destination pointer is offsetted by one datum byte size
                     // for every raster (or data channel, i.e. R in RGB)
                     char* dest = imageDataDest + (i * _initData.bytesPerDatum);
@@ -593,7 +593,7 @@ void RawTileDataReader::readImageData(IODescription& io, RawTile::ReadError& wor
         }
         case ghoul::opengl::Texture::Format::BGR:
         case ghoul::opengl::Texture::Format::BGRA: {
-            if (nRastersToRead == 1) { // Grayscale
+            if (nReadRasters == 1) { // Grayscale
                 for (int i = 0; i < 3; i++) {
                     // The final destination pointer is offsetted by one datum byte size
                     // for every raster (or data channel, i.e. R in RGB)
@@ -602,7 +602,7 @@ void RawTileDataReader::readImageData(IODescription& io, RawTile::ReadError& wor
                     worstError = std::max(worstError, err);
                 }
             }
-            else if (nRastersToRead == 2) { // Grayscale + alpha
+            else if (nReadRasters == 2) { // Grayscale + alpha
                 for (int i = 0; i < 3; i++) {
                     // The final destination pointer is offsetted by one datum byte size
                     // for every raster (or data channel, i.e. R in RGB)
@@ -616,7 +616,7 @@ void RawTileDataReader::readImageData(IODescription& io, RawTile::ReadError& wor
                 worstError = std::max(worstError, err);
             }
             else { // Three or more rasters
-                for (int i = 0; i < 3 && i < nRastersToRead; i++) {
+                for (int i = 0; i < 3 && i < nReadRasters; i++) {
                     // The final destination pointer is offsetted by one datum byte size
                     // for every raster (or data channel, i.e. R in RGB)
                     char* dest = imageDataDest + (i * _initData.bytesPerDatum);
@@ -624,7 +624,7 @@ void RawTileDataReader::readImageData(IODescription& io, RawTile::ReadError& wor
                     worstError = std::max(worstError, err);
                 }
             }
-            if (nRastersToRead > 3) { // Alpha channel exists
+            if (nReadRasters > 3) { // Alpha channel exists
                 // Last read is the alpha channel
                 char* dest = imageDataDest + (3 * _initData.bytesPerDatum);
                 const RawTile::ReadError err = rasterRead(4, io, dest);
diff --git a/modules/globebrowsing/src/renderableglobe.cpp b/modules/globebrowsing/src/renderableglobe.cpp
index 783373fe2b..2ecd96ec4a 100644
--- a/modules/globebrowsing/src/renderableglobe.cpp
+++ b/modules/globebrowsing/src/renderableglobe.cpp
@@ -29,7 +29,6 @@
 #include <modules/globebrowsing/src/gpulayergroup.h>
 #include <modules/globebrowsing/src/layer.h>
 #include <modules/globebrowsing/src/layergroup.h>
-#include <modules/globebrowsing/src/renderableglobe.h>
 #include <modules/globebrowsing/src/tileprovider/tileprovider.h>
 #include <openspace/documentation/documentation.h>
 #include <openspace/documentation/verifier.h>
@@ -385,7 +384,7 @@ BoundingHeights boundingHeightsForChunk(const Chunk& chunk, const LayerManager&
     const size_t HeightChannel = 0;
     const LayerGroup& heightmaps = lm.layerGroup(layers::Group::ID::HeightLayers);
 
-    ChunkTileVector chunkTileSettingPairs = tilesAndSettingsUnsorted(
+    const ChunkTileVector chunkTileSettingPairs = tilesAndSettingsUnsorted(
         heightmaps,
         chunk.tileIndex
     );
@@ -443,7 +442,7 @@ bool colorAvailableForChunk(const Chunk& chunk, const LayerManager& lm) {
     const LayerGroup& colorLayers = lm.layerGroup(layers::Group::ID::ColorLayers);
     for (Layer* lyr : colorLayers.activeLayers()) {
         if (lyr->tileProvider()) {
-            ChunkTile t = lyr->tileProvider()->chunkTile(chunk.tileIndex);
+            const ChunkTile t = lyr->tileProvider()->chunkTile(chunk.tileIndex);
             if (t.tile.status == Tile::Status::Unavailable) {
                 return false;
             }
@@ -463,7 +462,7 @@ std::array<glm::dvec4, 8> boundingCornersForChunk(const Chunk& chunk,
     const double patchCenterRadius = ellipsoid.maximumRadius();
 
     const double maxCenterRadius = patchCenterRadius + heights.max;
-    Geodetic2 halfSize = chunk.surfacePatch.halfSize();
+    const Geodetic2 halfSize = chunk.surfacePatch.halfSize();
 
     // As the patch is curved, the maximum height offsets at the corners must be long
     // enough to cover large enough to cover a heights.max at the center of the
@@ -608,8 +607,8 @@ RenderableGlobe::RenderableGlobe(const ghoul::Dictionary& dictionary)
     // @TODO (abock, 2021-03-25) The layermanager should be changed to take a
     // std::map<std::string, ghoul::Dictionary> instead and then we don't need to get it
     // as a bare dictionary anymore and can use the value from the struct directly
-    ghoul::Dictionary layersDictionary = dictionary.value<ghoul::Dictionary>("Layers");
-    _layerManager.initialize(layersDictionary);
+    const ghoul::Dictionary layersDict = dictionary.value<ghoul::Dictionary>("Layers");
+    _layerManager.initialize(layersDict);
 
     addProperty(Fadeable::_opacity);
     addProperty(_generalProperties.performShading);
@@ -641,7 +640,7 @@ RenderableGlobe::RenderableGlobe(const ghoul::Dictionary& dictionary)
     addPropertySubOwner(_shadowMappingPropertyOwner);
 
     _generalProperties.targetLodScaleFactor.onChange([this]() {
-        float sf = _generalProperties.targetLodScaleFactor;
+        const float sf = _generalProperties.targetLodScaleFactor;
         _generalProperties.currentLodScaleFactor = sf;
         _lodScaleFactorDirty = true;
     });
@@ -785,7 +784,7 @@ void RenderableGlobe::render(const RenderData& data, RendererTasks& rendererTask
         try {
             if (_shadowComponent && _shadowComponent->isEnabled()) {
                 // Set matrices and other GL states
-                RenderData lightRenderData(_shadowComponent->begin(data));
+                const RenderData lightRenderData(_shadowComponent->begin(data));
 
                 glDisable(GL_BLEND);
 
@@ -829,7 +828,8 @@ void RenderableGlobe::render(const RenderData& data, RendererTasks& rendererTask
             }
         }
         catch (const ghoul::opengl::TextureUnit::TextureUnitError&) {
-            std::string layer = _lastChangedLayer ? _lastChangedLayer->guiName() : "";
+            const std::string& layer =
+                _lastChangedLayer ? _lastChangedLayer->guiName() : "";
 
             LWARNINGC(
                 guiName(),
@@ -917,10 +917,10 @@ void RenderableGlobe::update(const UpdateData& data) {
     setBoundingSphere(bs);
     setInteractionSphere(bs);
 
-    glm::dmat4 translation =
+    const glm::dmat4 translation =
         glm::translate(glm::dmat4(1.0), data.modelTransform.translation);
-    glm::dmat4 rotation = glm::dmat4(data.modelTransform.rotation);
-    glm::dmat4 scaling = glm::scale(glm::dmat4(1.0), data.modelTransform.scale);
+    const glm::dmat4 rotation = glm::dmat4(data.modelTransform.rotation);
+    const glm::dmat4 scaling = glm::scale(glm::dmat4(1.0), data.modelTransform.scale);
 
     _cachedModelTransform = translation * rotation * scaling;
     _cachedInverseModelTransform = glm::inverse(_cachedModelTransform);
@@ -1744,7 +1744,7 @@ void RenderableGlobe::recompileShaders() {
             0
         );
 
-        std::string groupName = std::string(layers::Groups[i].identifier);
+        const std::string groupName = std::string(layers::Groups[i].identifier);
 
         for (int j = 0;
              j < preprocessingData.layeredTextureInfo[i].lastLayerIdx + 1;
@@ -1770,8 +1770,8 @@ void RenderableGlobe::recompileShaders() {
         }
 
         // This is to avoid errors from shader preprocessor
-        std::string keyLayerAdjustmentType = groupName + "0" + "LayerAdjustmentType";
-        shaderDictionary.setValue(keyLayerAdjustmentType, 0);
+        std::string layerAdjustmentType = groupName + "0" + "LayerAdjustmentType";
+        shaderDictionary.setValue(std::move(layerAdjustmentType), 0);
 
         for (int j = 0;
              j < preprocessingData.layeredTextureInfo[i].lastLayerIdx + 1;
@@ -1804,7 +1804,9 @@ void RenderableGlobe::recompileShaders() {
     shaderDictionary.setValue("nShadowSamples", _generalProperties.nShadowSamples - 1);
 
     // Exclise Shadow Samples
-    int nEclipseShadows = static_cast<int>(_ellipsoid.shadowConfigurationArray().size());
+    const int nEclipseShadows = static_cast<int>(
+        _ellipsoid.shadowConfigurationArray().size()
+    );
     shaderDictionary.setValue("nEclipseShadows", nEclipseShadows - 1);
     //
     // Create local shader
@@ -1865,11 +1867,11 @@ SurfacePositionHandle RenderableGlobe::calculateSurfacePositionHandle(
 
     glm::dvec3 centerToEllipsoidSurface =
         _ellipsoid.geodeticSurfaceProjection(targetModelSpace);
-    glm::dvec3 ellipsoidSurfaceToTarget = targetModelSpace - centerToEllipsoidSurface;
+    const glm::dvec3 ellipsoidSrfToTarget = targetModelSpace - centerToEllipsoidSurface;
     // ellipsoidSurfaceOutDirection will point towards the target, we want the outward
     // direction. Therefore it must be flipped in case the target is under the reference
     // ellipsoid so that it always points outwards
-    glm::dvec3 ellipsoidSurfaceOutDirection = glm::normalize(ellipsoidSurfaceToTarget);
+    glm::dvec3 ellipsoidSurfaceOutDirection = glm::normalize(ellipsoidSrfToTarget);
     if (glm::dot(ellipsoidSurfaceOutDirection, centerToEllipsoidSurface) < 0) {
         ellipsoidSurfaceOutDirection *= -1.0;
     }
@@ -1986,7 +1988,7 @@ float RenderableGlobe::getHeight(const glm::dvec3& position) const {
             return 0;
         }
 
-        glm::vec2 transformedUv = layer->tileUvToTextureSamplePosition(
+        const glm::vec2& transformedUv = layer->tileUvToTextureSamplePosition(
             uvTransform,
             patchUV
         );
@@ -2085,10 +2087,10 @@ void RenderableGlobe::calculateEclipseShadows(ghoul::opengl::ProgramObject& prog
     );
     // Shadow calculations..
     std::vector<ShadowRenderingStruct> shadowDataArray;
-    std::vector<Ellipsoid::ShadowConfiguration> shadowConfArray =
+    const std::vector<Ellipsoid::ShadowConfiguration>& shadowConfArray =
         _ellipsoid.shadowConfigurationArray();
     shadowDataArray.reserve(shadowConfArray.size());
-    double lt;
+    double lt = 0.0;
     for (const auto& shadowConf : shadowConfArray) {
         // TO REMEMBER: all distances and lengths in world coordinates are in
         // meters!!! We need to move this to view space...
@@ -2363,7 +2365,7 @@ int RenderableGlobe::desiredLevelByAvailableTileData(const Chunk& chunk) const {
     for (const layers::Group& gi : layers::Groups) {
         const std::vector<Layer*>& lyrs = _layerManager.layerGroup(gi.id).activeLayers();
         for (Layer* layer : lyrs) {
-            Tile::Status status = layer->tileStatus(chunk.tileIndex);
+            const Tile::Status status = layer->tileStatus(chunk.tileIndex);
             // Ensure that the current tile is OK and that the tileprovider for the
             // current layer has enough data to support an additional level.
             if (status == Tile::Status::OK &&
@@ -2419,7 +2421,7 @@ bool RenderableGlobe::isCullableByHorizon(const Chunk& chunk,
         _cachedInverseModelTransform * glm::dvec4(renderData.camera.positionVec3(), 1.0)
     );
 
-    const glm::dvec3 globeToCamera = cameraPos;
+    const glm::dvec3& globeToCamera = cameraPos;
 
     const Geodetic2 camPosOnGlobe = _ellipsoid.cartesianToGeodetic2(globeToCamera);
     const Geodetic2 closestPatchPoint = patch.closestPoint(camPosOnGlobe);
diff --git a/modules/globebrowsing/src/ringscomponent.cpp b/modules/globebrowsing/src/ringscomponent.cpp
index 10543c1c82..195a2afe2c 100644
--- a/modules/globebrowsing/src/ringscomponent.cpp
+++ b/modules/globebrowsing/src/ringscomponent.cpp
@@ -452,7 +452,7 @@ void RingsComponent::draw(const RenderData& data, RenderPass renderPass,
 
             const glm::dmat4 inverseModelTransform = glm::inverse(modelTransform);
 
-            glm::vec3 sunPositionObjectSpace = glm::normalize(
+            const glm::vec3 sunPositionObjectSpace = glm::normalize(
                 glm::vec3(inverseModelTransform * glm::vec4(_sunPosition, 0.f))
             );
 
@@ -817,18 +817,18 @@ void RingsComponent::createPlane() {
         GLfloat t;
     };
 
-    VertexData data[] = {
-        { -size, -size, 0.f, 0.f },
-        {  size,  size, 1.f, 1.f },
-        { -size,  size, 0.f, 1.f },
-        { -size, -size, 0.f, 0.f },
-        {  size, -size, 1.f, 0.f },
-        {  size,  size, 1.f, 1.f },
+    const std::array<VertexData, 6> vertices = {
+        VertexData{ -size, -size, 0.f, 0.f },
+        VertexData{  size,  size, 1.f, 1.f },
+        VertexData{ -size,  size, 0.f, 1.f },
+        VertexData{ -size, -size, 0.f, 0.f },
+        VertexData{  size, -size, 1.f, 0.f },
+        VertexData{  size,  size, 1.f, 1.f },
     };
 
     glBindVertexArray(_quad);
     glBindBuffer(GL_ARRAY_BUFFER, _vertexPositionBuffer);
-    glBufferData(GL_ARRAY_BUFFER, sizeof(data), data, GL_STATIC_DRAW);
+    glBufferData(GL_ARRAY_BUFFER, sizeof(vertices), vertices.data(), GL_STATIC_DRAW);
     glEnableVertexAttribArray(0);
     glVertexAttribPointer(
         0,
diff --git a/modules/globebrowsing/src/shadowcomponent.cpp b/modules/globebrowsing/src/shadowcomponent.cpp
index 0797b817e5..82b8d3ba50 100644
--- a/modules/globebrowsing/src/shadowcomponent.cpp
+++ b/modules/globebrowsing/src/shadowcomponent.cpp
@@ -94,67 +94,69 @@ namespace {
         openspace::properties::Property::Visibility::AdvancedUser
     };
 
-    constexpr GLfloat ShadowBorder[] = { 1.f, 1.f, 1.f, 1.f };
+    constexpr std::array<GLfloat, 4> ShadowBorder = { 1.f, 1.f, 1.f, 1.f };
 
     void checkFrameBufferState(const std::string& codePosition) {
         if (glCheckFramebufferStatus(GL_DRAW_FRAMEBUFFER) != GL_FRAMEBUFFER_COMPLETE) {
             LERROR("Framework not built. " + codePosition);
-            GLenum fbErr = glCheckFramebufferStatus(GL_FRAMEBUFFER);
+            const GLenum fbErr = glCheckFramebufferStatus(GL_FRAMEBUFFER);
             switch (fbErr) {
-            case GL_FRAMEBUFFER_UNDEFINED:
-                LERROR("Indefined framebuffer");
-                break;
-            case GL_FRAMEBUFFER_INCOMPLETE_ATTACHMENT:
-                LERROR("Incomplete, missing attachement");
-                break;
-            case GL_FRAMEBUFFER_INCOMPLETE_MISSING_ATTACHMENT:
-                LERROR("Framebuffer doesn't have at least one image attached to it");
-                break;
-            case GL_FRAMEBUFFER_INCOMPLETE_DRAW_BUFFER:
-                LERROR(
-                    "Returned if the value of GL_FRAMEBUFFER_ATTACHMENT_OBJECT_TYPE is "
-                    "GL_NONE for any color attachment point(s) named by GL_DRAW_BUFFERi"
-                );
-                break;
-            case GL_FRAMEBUFFER_INCOMPLETE_READ_BUFFER:
-                LERROR(
-                    "Returned if GL_READ_BUFFER is not GL_NONE and the value of "
-                    "GL_FRAMEBUFFER_ATTACHMENT_OBJECT_TYPE is GL_NONE for the color "
-                    "attachment point named by GL_READ_BUFFER");
-                break;
-            case GL_FRAMEBUFFER_UNSUPPORTED:
-                LERROR(
-                    "Returned if the combination of internal formats of the attached "
-                    "images violates an implementation - dependent set of restrictions"
-                );
-                break;
-            case GL_FRAMEBUFFER_INCOMPLETE_MULTISAMPLE:
-                LERROR(
-                    "Returned if the value of GL_RENDERBUFFE_r_samples is not the same "
-                    "for all attached renderbuffers; if the value of GL_TEXTURE_SAMPLES "
-                    "is the not same for all attached textures; or , if the attached "
-                    "images are a mix of renderbuffers and textures, the value of "
-                    "GL_RENDERBUFFE_r_samples does not match the value of "
-                    "GL_TEXTURE_SAMPLES"
-                );
-                LERROR(
-                    "Returned if the value of GL_TEXTURE_FIXED_SAMPLE_LOCATIONS is not "
-                    "the same for all attached textures; or , if the attached images are "
-                    "a mix of renderbuffers and textures, the value of "
-                    "GL_TEXTURE_FIXED_SAMPLE_LOCATIONS is not GL_TRUE for all attached "
-                    "textures"
-                );
-                break;
-            case GL_FRAMEBUFFER_INCOMPLETE_LAYER_TARGETS:
-                LERROR(
-                    "Returned if any framebuffer attachment is layered, and any "
-                    "populated attachment is not layered, or if all populated color "
-                    "attachments are not from textures of the same target"
-                );
-                break;
-            default:
-                LDEBUG("No error found checking framebuffer: " + codePosition);
-                break;
+                case GL_FRAMEBUFFER_UNDEFINED:
+                    LERROR("Indefined framebuffer");
+                    break;
+                case GL_FRAMEBUFFER_INCOMPLETE_ATTACHMENT:
+                    LERROR("Incomplete, missing attachement");
+                    break;
+                case GL_FRAMEBUFFER_INCOMPLETE_MISSING_ATTACHMENT:
+                    LERROR("Framebuffer doesn't have at least one image attached to it");
+                    break;
+                case GL_FRAMEBUFFER_INCOMPLETE_DRAW_BUFFER:
+                    LERROR(
+                        "Returned if the value of GL_FRAMEBUFFER_ATTACHMENT_OBJECT_TYPE "
+                        "is GL_NONE for any color attachment point(s) named by "
+                        "GL_DRAW_BUFFERi"
+                    );
+                    break;
+                case GL_FRAMEBUFFER_INCOMPLETE_READ_BUFFER:
+                    LERROR(
+                        "Returned if GL_READ_BUFFER is not GL_NONE and the value of "
+                        "GL_FRAMEBUFFER_ATTACHMENT_OBJECT_TYPE is GL_NONE for the color "
+                        "attachment point named by GL_READ_BUFFER");
+                    break;
+                case GL_FRAMEBUFFER_UNSUPPORTED:
+                    LERROR(
+                        "Returned if the combination of internal formats of the attached "
+                        "images violates an implementation - dependent set of "
+                        "restrictions"
+                    );
+                    break;
+                case GL_FRAMEBUFFER_INCOMPLETE_MULTISAMPLE:
+                    LERROR(
+                        "Returned if the value of GL_RENDERBUFFE_r_samples is not the "
+                        "same for all attached renderbuffers; if the value of "
+                        "GL_TEXTURE_SAMPLES is the not same for all attached textures; "
+                        "or , if the attached images are a mix of renderbuffers and "
+                        "textures, the value of GL_RENDERBUFFE_r_samples does not match "
+                        "the value of GL_TEXTURE_SAMPLES"
+                    );
+                    LERROR(
+                        "Returned if the value of GL_TEXTURE_FIXED_SAMPLE_LOCATIONS is "
+                        "not the same for all attached textures; or , if the attached "
+                        "images are a mix of renderbuffers and textures, the value of "
+                        "GL_TEXTURE_FIXED_SAMPLE_LOCATIONS is not GL_TRUE for all "
+                        "attached textures"
+                    );
+                    break;
+                case GL_FRAMEBUFFER_INCOMPLETE_LAYER_TARGETS:
+                    LERROR(
+                        "Returned if any framebuffer attachment is layered, and any "
+                        "populated attachment is not layered, or if all populated color "
+                        "attachments are not from textures of the same target"
+                    );
+                    break;
+                default:
+                    LDEBUG("No error found checking framebuffer: " + codePosition);
+                    break;
             }
         }
     }
@@ -190,7 +192,7 @@ ShadowComponent::ShadowComponent(const ghoul::Dictionary& dictionary)
     if (!dictionary.hasValue<ghoul::Dictionary>("Shadows")) {
         return;
     }
-    ghoul::Dictionary d = dictionary.value<ghoul::Dictionary>("Shadows");
+    const ghoul::Dictionary d = dictionary.value<ghoul::Dictionary>("Shadows");
 
     const Parameters p = codegen::bake<Parameters>(d);
 
@@ -207,9 +209,9 @@ ShadowComponent::ShadowComponent(const ghoul::Dictionary& dictionary)
         _dynamicDepthTextureRes = false;
     }
     else {
-        glm::ivec2 renderingResolution = global::renderEngine->renderingResolution();
-        _shadowDepthTextureWidth = renderingResolution.x * 2;
-        _shadowDepthTextureHeight = renderingResolution.y * 2;
+        const glm::ivec2 renderingRes= global::renderEngine->renderingResolution();
+        _shadowDepthTextureWidth = renderingRes.x * 2;
+        _shadowDepthTextureHeight = renderingRes.y * 2;
         _dynamicDepthTextureRes = true;
     }
 
@@ -239,7 +241,7 @@ void ShadowComponent::deinitializeGL() {
 }
 
 RenderData ShadowComponent::begin(const RenderData& data) {
-    glm::ivec2 renderingResolution = global::renderEngine->renderingResolution();
+    const glm::ivec2 renderingResolution = global::renderEngine->renderingResolution();
     if (_dynamicDepthTextureRes && ((_shadowDepthTextureWidth != renderingResolution.x) ||
         (_shadowDepthTextureHeight != renderingResolution.y)))
     {
@@ -252,21 +254,22 @@ RenderData ShadowComponent::begin(const RenderData& data) {
     // Builds light's ModelViewProjectionMatrix:
     // ===========================================
 
-    glm::dvec3 diffVector = glm::dvec3(_sunPosition) - data.modelTransform.translation;
-    double originalLightDistance = glm::length(diffVector);
-    glm::dvec3 lightDirection = glm::normalize(diffVector);
+    const glm::dvec3 diffVector =
+        glm::dvec3(_sunPosition) - data.modelTransform.translation;
+    const double originalLightDistance = glm::length(diffVector);
+    const glm::dvec3 lightDirection = glm::normalize(diffVector);
 
     // Percentage of the original light source distance (to avoid artifacts)
     //double multiplier = originalLightDistance *
     //    (static_cast<double>(_distanceFraction)/1.0E5);
 
-    double multiplier = originalLightDistance *
+    const double multiplier = originalLightDistance *
         (static_cast<double>(_distanceFraction) / 1E17);
 
     // New light source position
     //glm::dvec3 lightPosition = data.modelTransform.translation +
     //    (lightDirection * multiplier);
-    glm::dvec3 lightPosition = data.modelTransform.translation +
+    const glm::dvec3 lightPosition = data.modelTransform.translation +
         (diffVector * multiplier);
 
     //// Light Position
@@ -275,27 +278,27 @@ RenderData ShadowComponent::begin(const RenderData& data) {
     //=============== Manually Created Camera Matrix ===================
     //==================================================================
     // camera Z
-    glm::dvec3 cameraZ = lightDirection;
+    const glm::dvec3 cameraZ = lightDirection;
 
     // camera X
-    glm::dvec3 upVector = glm::dvec3(0.0, 1.0, 0.0);
-    glm::dvec3 cameraX = glm::normalize(glm::cross(upVector, cameraZ));
+    const glm::dvec3 upVector = glm::dvec3(0.0, 1.0, 0.0);
+    const glm::dvec3 cameraX = glm::normalize(glm::cross(upVector, cameraZ));
 
     // camera Y
-    glm::dvec3 cameraY = glm::cross(cameraZ, cameraX);
+    const glm::dvec3 cameraY = glm::cross(cameraZ, cameraX);
 
     // init 4x4 matrix
     glm::dmat4 cameraRotationMatrix(1.0);
 
     double* matrix = glm::value_ptr(cameraRotationMatrix);
-    matrix[0]  = cameraX.x;
-    matrix[4]  = cameraX.y;
-    matrix[8]  = cameraX.z;
-    matrix[1]  = cameraY.x;
-    matrix[5]  = cameraY.y;
-    matrix[9]  = cameraY.z;
-    matrix[2]  = cameraZ.x;
-    matrix[6]  = cameraZ.y;
+    matrix[0] = cameraX.x;
+    matrix[4] = cameraX.y;
+    matrix[8] = cameraX.z;
+    matrix[1] = cameraY.x;
+    matrix[5] = cameraY.y;
+    matrix[9] = cameraY.z;
+    matrix[2] = cameraZ.x;
+    matrix[6] = cameraZ.y;
     matrix[10] = cameraZ.z;
 
     // set translation part
@@ -315,7 +318,7 @@ RenderData ShadowComponent::begin(const RenderData& data) {
 
     //============= Light Matrix by Camera Matrices Composition =============
     //=======================================================================
-    glm::dmat4 lightProjectionMatrix = glm::dmat4(_lightCamera->projectionMatrix());
+    const glm::dmat4 lightProjectionMatrix = glm::dmat4(_lightCamera->projectionMatrix());
 
     // The model transformation missing in the final shadow matrix is add when rendering
     // each object (using its transformations provided by the RenderData structure)
@@ -326,16 +329,16 @@ RenderData ShadowComponent::begin(const RenderData& data) {
 
     // Saves current state
     glGetIntegerv(GL_FRAMEBUFFER_BINDING, &_currentFBO);
-    global::renderEngine->openglStateCache().viewport(_mViewport);
+    global::renderEngine->openglStateCache().viewport(_viewport.data());
 
     glBindFramebuffer(GL_FRAMEBUFFER, _shadowFBO);
-    GLenum drawBuffers[] = { GL_COLOR_ATTACHMENT0, GL_NONE, GL_NONE };
-    glDrawBuffers(3, drawBuffers);
+    std::array<GLenum, 3> drawBuffers = { GL_COLOR_ATTACHMENT0, GL_NONE, GL_NONE };
+    glDrawBuffers(3, drawBuffers.data());
     glViewport(0, 0, _shadowDepthTextureWidth, _shadowDepthTextureHeight);
-    glClearDepth(1.0f);
+    glClearDepth(1.f);
     glDepthFunc(GL_LEQUAL);
     glEnable(GL_DEPTH_TEST);
-    glClearColor(0.0, 0.0, 0.0, 0.0);
+    glClearColor(0.f, 0.f, 0.f, 0.f);
     glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);
 
     //glEnable(GL_CULL_FACE);
@@ -344,7 +347,7 @@ RenderData ShadowComponent::begin(const RenderData& data) {
     //checkGLError("begin() -- set cullface to front");
     //glEnable(GL_POLYGON_OFFSET_FILL);
     //checkGLError("begin() -- enabled polygon offset fill");
-    //glPolygonOffset(2.5f, 10.0f);
+    //glPolygonOffset(2.5f, 10.f);
     //checkGLError("begin() -- set values for polygon offset");
 
     RenderData lightRenderData{
@@ -365,11 +368,13 @@ void ShadowComponent::end() {
 
     // Restores system state
     glBindFramebuffer(GL_FRAMEBUFFER, _currentFBO);
-    GLenum drawBuffers[] = {
-        GL_COLOR_ATTACHMENT0, GL_COLOR_ATTACHMENT1, GL_COLOR_ATTACHMENT2
+    std::array<GLenum, 3> drawBuffers = {
+        GL_COLOR_ATTACHMENT0,
+        GL_COLOR_ATTACHMENT1,
+        GL_COLOR_ATTACHMENT2
     };
-    glDrawBuffers(3, drawBuffers);
-    glViewport(_mViewport[0], _mViewport[1], _mViewport[2], _mViewport[3]);
+    glDrawBuffers(3, drawBuffers.data());
+    glViewport(_viewport[0], _viewport[1], _viewport[2], _viewport[3]);
 
     // Restores OpenGL Rendering State
     global::renderEngine->openglStateCache().resetColorState();
@@ -415,16 +420,8 @@ void ShadowComponent::createShadowFBO() {
         0
     );
 
-    //glFramebufferTexture(
-    //    GL_FRAMEBUFFER,
-    //    GL_COLOR_ATTACHMENT0,
-    //    _positionInLightSpaceTexture,
-    //    0
-    //);
-
-    //GLenum drawBuffers[] = { GL_COLOR_ATTACHMENT0, GL_NONE, GL_NONE };
-    GLenum drawBuffers[] = { GL_NONE, GL_NONE, GL_NONE };
-    glDrawBuffers(3, drawBuffers);
+    std::array<GLenum, 3> drawBuffers = { GL_NONE, GL_NONE, GL_NONE };
+    glDrawBuffers(3, drawBuffers.data());
 
     checkFrameBufferState("createShadowFBO()");
 
@@ -432,7 +429,7 @@ void ShadowComponent::createShadowFBO() {
     glBindFramebuffer(GL_FRAMEBUFFER, _currentFBO);
 }
 
-void ShadowComponent::updateDepthTexture() {
+void ShadowComponent::updateDepthTexture() const {
     glBindTexture(GL_TEXTURE_2D, _shadowDepthTexture);
 
     //glTexStorage2D(
@@ -459,7 +456,7 @@ void ShadowComponent::updateDepthTexture() {
     glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR);
     glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_BORDER);
     glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_BORDER);
-    glTexParameterfv(GL_TEXTURE_2D, GL_TEXTURE_BORDER_COLOR, ShadowBorder);
+    glTexParameterfv(GL_TEXTURE_2D, GL_TEXTURE_BORDER_COLOR, ShadowBorder.data());
     glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_COMPARE_MODE, GL_COMPARE_REF_TO_TEXTURE);
     glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_COMPARE_FUNC, GL_LEQUAL);
 
@@ -509,8 +506,8 @@ void ShadowComponent::buildDDepthTexture() {
     glBindTexture(GL_TEXTURE_2D, 0);
 }
 
-void ShadowComponent::saveDepthBuffer() {
-    int size = _shadowDepthTextureWidth * _shadowDepthTextureHeight;
+void ShadowComponent::saveDepthBuffer() const {
+    const int size = _shadowDepthTextureWidth * _shadowDepthTextureHeight;
     std::vector<GLubyte> buffer(size);
 
     glReadPixels(
@@ -528,19 +525,18 @@ void ShadowComponent::saveDepthBuffer() {
     ppmFile.open("depthBufferShadowMapping.ppm", std::fstream::out);
     if (ppmFile.is_open()) {
 
-        ppmFile << "P3" << std::endl;
-        ppmFile << _shadowDepthTextureWidth << " " << _shadowDepthTextureHeight
-                << std::endl;
-        ppmFile << "255" << std::endl;
+        ppmFile << "P3\n";
+        ppmFile << _shadowDepthTextureWidth << " " << _shadowDepthTextureHeight << '\n';
+        ppmFile << "255\n";
 
         LDEBUG("Saving depth texture to file depthBufferShadowMapping.ppm");
         int k = 0;
         for (int i = 0; i < _shadowDepthTextureWidth; i++) {
             for (int j = 0; j < _shadowDepthTextureHeight; j++, k++) {
-                unsigned int val = static_cast<unsigned int>(buffer[k]);
-                ppmFile << val << " " << val << " " << val << " ";
+                const unsigned int val = static_cast<unsigned int>(buffer[k]);
+                ppmFile << fmt::format("{0} {0} {0} ", val);
             }
-            ppmFile << std::endl;
+            ppmFile << '\n';
         }
 
         ppmFile.close();
@@ -567,10 +563,9 @@ void ShadowComponent::saveDepthBuffer() {
     ppmFile.open("positionBufferShadowMapping.ppm", std::fstream::out);
     if (ppmFile.is_open()) {
 
-        ppmFile << "P3" << std::endl;
-        ppmFile << _shadowDepthTextureWidth << " " << _shadowDepthTextureHeight
-                << std::endl;
-        ppmFile << "255" << std::endl;
+        ppmFile << "P3\n";
+        ppmFile << _shadowDepthTextureWidth << " " << _shadowDepthTextureHeight << '\n';
+        ppmFile << "255\n";
 
         LDEBUG("Saving texture position to positionBufferShadowMapping.ppm");
 
@@ -595,7 +590,7 @@ void ShadowComponent::saveDepthBuffer() {
                     << static_cast<unsigned int>(bBuffer[k + 2] / biggestValue) << " ";
                 k += 4;
             }
-            ppmFile << std::endl;
+            ppmFile << '\n';
         }
 
         ppmFile.close();
diff --git a/modules/globebrowsing/src/shadowcomponent.h b/modules/globebrowsing/src/shadowcomponent.h
index 9791dd1e0d..561e961502 100644
--- a/modules/globebrowsing/src/shadowcomponent.h
+++ b/modules/globebrowsing/src/shadowcomponent.h
@@ -81,11 +81,11 @@ public:
 private:
     void createDepthTexture();
     void createShadowFBO();
-    void updateDepthTexture();
+    void updateDepthTexture() const;
     void buildDDepthTexture();
 
     // Debug
-    void saveDepthBuffer();
+    void saveDepthBuffer() const;
 
     ShadowMapData _shadowData;
 
@@ -105,7 +105,7 @@ private:
     GLuint _positionInLightSpaceTexture = 0;
     GLuint _shadowFBO = 0;
     GLint _currentFBO = 0;
-    GLint _mViewport[4];
+    std::array<GLint, 4> _viewport;
 
     GLboolean _faceCulling;
     GLboolean _polygonOffSet;
diff --git a/modules/globebrowsing/src/skirtedgrid.cpp b/modules/globebrowsing/src/skirtedgrid.cpp
index fc5fd9f224..7437821cc5 100644
--- a/modules/globebrowsing/src/skirtedgrid.cpp
+++ b/modules/globebrowsing/src/skirtedgrid.cpp
@@ -117,7 +117,7 @@ void SkirtedGrid::initializeGL() {
     std::vector<GLushort> elementData = createElements(xSegments, ySegments);
 
     struct Vertex {
-        GLfloat texture[2];
+        std::array<GLfloat, 2> texture;
     };
 
 
diff --git a/modules/globebrowsing/src/tileprovider/defaulttileprovider.cpp b/modules/globebrowsing/src/tileprovider/defaulttileprovider.cpp
index 637c181f9e..5450f4681c 100644
--- a/modules/globebrowsing/src/tileprovider/defaulttileprovider.cpp
+++ b/modules/globebrowsing/src/tileprovider/defaulttileprovider.cpp
@@ -130,7 +130,7 @@ DefaultTileProvider::DefaultTileProvider(const ghoul::Dictionary& dictionary)
     const Parameters p = codegen::bake<Parameters>(dictionary);
 
     name = p.name.value_or("Name unspecified");
-    std::string _loggerCat = "DefaultTileProvider (" + name + ")";
+    const std::string _loggerCat = fmt::format("DefaultTileProvider ({})", name);
 
     // 1. Get required Keys
     _filePath = p.filePath;
@@ -139,7 +139,7 @@ DefaultTileProvider::DefaultTileProvider(const ghoul::Dictionary& dictionary)
 
     // 2. Initialize default values for any optional Keys
     // getValue does not work for integers
-    int pixelSize = p.tilePixelSize.value_or(0);
+    const int pixelSize = p.tilePixelSize.value_or(0);
 
     // Only preprocess height layers by default
     _performPreProcessing = _layerGroupID == layers::Group::ID::HeightLayers;
@@ -164,8 +164,8 @@ DefaultTileProvider::DefaultTileProvider(const ghoul::Dictionary& dictionary)
 
     std::string path = fmt::format("{}/{}/{}/", enclosing, layerGroup, identifier);
 
-    GlobeBrowsingModule& module = *global::moduleEngine->module<GlobeBrowsingModule>();
-    bool enabled = module.isMRFCachingEnabled();
+    const GlobeBrowsingModule& mod = *global::moduleEngine->module<GlobeBrowsingModule>();
+    bool enabled = mod.isMRFCachingEnabled();
     Compression compression =
         _layerGroupID == layers::Group::ID::HeightLayers ?
         Compression::LERC :
@@ -182,16 +182,16 @@ DefaultTileProvider::DefaultTileProvider(const ghoul::Dictionary& dictionary)
     }
 
     _cacheProperties.enabled = enabled;
-    _cacheProperties.path = path;
+    _cacheProperties.path = std::move(path);
     _cacheProperties.quality = quality;
     _cacheProperties.blockSize = blockSize;
     _cacheProperties.compression = codegen::toString(compression);
 
-    TileTextureInitData initData(
+    TileTextureInitData initData = TileTextureInitData(
         tileTextureInitData(_layerGroupID, pixelSize)
     );
     _tilePixelSize = initData.dimensions.x;
-    initAsyncTileDataReader(initData, _cacheProperties);
+    initAsyncTileDataReader(std::move(initData), _cacheProperties);
 
     addProperty(_filePath);
     addProperty(_tilePixelSize);
@@ -206,8 +206,8 @@ void DefaultTileProvider::initAsyncTileDataReader(TileTextureInitData initData,
         name,
         std::make_unique<RawTileDataReader>(
             _filePath,
-            initData,
-            cacheProperties,
+            std::move(initData),
+            std::move(cacheProperties),
             RawTileDataReader::PerformPreprocessing(_performPreProcessing)
         )
     );
diff --git a/modules/globebrowsing/src/tileprovider/imagesequencetileprovider.cpp b/modules/globebrowsing/src/tileprovider/imagesequencetileprovider.cpp
index fade602401..fd2bbc2574 100644
--- a/modules/globebrowsing/src/tileprovider/imagesequencetileprovider.cpp
+++ b/modules/globebrowsing/src/tileprovider/imagesequencetileprovider.cpp
@@ -135,7 +135,7 @@ void ImageSequenceTileProvider::update() {
             _currentTileProvider->deinitialize();
         }
 
-        std::string p = _imagePaths[_index].string();
+        const std::string p = _imagePaths[_index].string();
         _currentImage = p;
         _initDict.setValue("FilePath", p);
         _currentTileProvider = std::make_unique<DefaultTileProvider>(_initDict);
@@ -150,7 +150,7 @@ void ImageSequenceTileProvider::update() {
 
 void ImageSequenceTileProvider::reset() {
     namespace fs = std::filesystem;
-    std::string path = _folderPath;
+    const std::string path = _folderPath;
     _imagePaths.clear();
     for (const fs::directory_entry& p : fs::directory_iterator(path)) {
         if (p.is_regular_file()) {
diff --git a/modules/globebrowsing/src/tileprovider/sizereferencetileprovider.cpp b/modules/globebrowsing/src/tileprovider/sizereferencetileprovider.cpp
index d8b01d71ef..95d5051464 100644
--- a/modules/globebrowsing/src/tileprovider/sizereferencetileprovider.cpp
+++ b/modules/globebrowsing/src/tileprovider/sizereferencetileprovider.cpp
@@ -28,6 +28,7 @@
 #include <openspace/documentation/documentation.h>
 #include <openspace/engine/globals.h>
 #include <ghoul/font/fontmanager.h>
+#include <ghoul/font/fontrenderer.h>
 #include <optional>
 #include <variant>
 
@@ -84,7 +85,7 @@ Tile SizeReferenceTileProvider::tile(const TileIndex& tileIndex) {
     }
     double tileLongitudalLength = l;
 
-    const char* unit;
+    const char* unit = nullptr;
     if (tileLongitudalLength > 9999) {
         tileLongitudalLength *= 0.001;
         unit = "km";
@@ -93,8 +94,8 @@ Tile SizeReferenceTileProvider::tile(const TileIndex& tileIndex) {
         unit = "m";
     }
 
-    std::string text = fmt::format("{:.0f} {:s}", tileLongitudalLength, unit);
-    glm::vec2 textPosition = glm::vec2(
+    const std::string text = fmt::format("{:.0f} {:s}", tileLongitudalLength, unit);
+    const glm::vec2 textPosition = glm::vec2(
         0.f,
         aboveEquator ?
             fontSize / 2.f :
diff --git a/modules/globebrowsing/src/tileprovider/temporaltileprovider.cpp b/modules/globebrowsing/src/tileprovider/temporaltileprovider.cpp
index 4107e89dbe..1792b6f056 100644
--- a/modules/globebrowsing/src/tileprovider/temporaltileprovider.cpp
+++ b/modules/globebrowsing/src/tileprovider/temporaltileprovider.cpp
@@ -197,7 +197,7 @@ TemporalTileProvider::TemporalTileProvider(const ghoul::Dictionary& dictionary)
     if (p.prototyped.has_value()) {
         _mode = Mode::Prototype;
 
-        Time start = Time(p.prototyped->time.start);
+        const Time start = Time(p.prototyped->time.start);
         Time end = Time::now();
         _prototyped.startTimeJ2000 = start.j2000Seconds();
         _prototyped.endTimeJ2000 = Time(p.prototyped->time.end).j2000Seconds();
@@ -244,8 +244,8 @@ TemporalTileProvider::TemporalTileProvider(const ghoul::Dictionary& dictionary)
                 continue;
             }
 
-            std::string file = path.path().filename().string();
-            std::istringstream ss(file);
+            const std::string file = path.path().filename().string();
+            std::istringstream ss = std::istringstream(file);
 
             std::tm tm = {};
             ss >> std::get_time(&tm, p.folder->format.c_str());
@@ -278,8 +278,8 @@ TemporalTileProvider::TemporalTileProvider(const ghoul::Dictionary& dictionary)
                     );
                 }
 
-                double et = SpiceManager::ref().ephemerisTimeFromDate(date);
-                _folder.files.push_back({ et, path.path().string() });
+                const double et = SpiceManager::ref().ephemerisTimeFromDate(date);
+                _folder.files.emplace_back(et, path.path().string());
             }
         }
 
@@ -345,8 +345,8 @@ void TemporalTileProvider::update() {
     try {
         if (_useFixedTime && !_fixedTime.value().empty()) {
             if (_fixedTimeDirty) {
-                std::string fixedTime = _fixedTime.value();
-                double et = SpiceManager::ref().ephemerisTimeFromDate(fixedTime);
+                const std::string fixedTime = _fixedTime.value();
+                const double et = SpiceManager::ref().ephemerisTimeFromDate(fixedTime);
                 newCurr = retrieveTileProvider(Time(et));
                 _fixedTimeDirty = false;
             }
@@ -434,7 +434,7 @@ DefaultTileProvider* TemporalTileProvider::retrieveTileProvider(const Time& t) {
         return &it->second;
     }
 
-    std::string_view timeStr = [this, time]() {
+    const std::string_view timeStr = [this, time]() {
         switch (_mode) {
             case Mode::Prototype:
                 return timeStringify(_prototyped.timeFormat, Time(time));
@@ -472,8 +472,7 @@ TemporalTileProvider::tileProvider<TemporalTileProvider::Mode::Folder, false>(
     // Find the most current image that matches the current time. We can't pass the `time`
     // variable into the retrieveTileProvider function as it would generate a new
     // non-existing TileProvider for every new frame
-    using It = std::vector<std::pair<double, std::string>>::const_iterator;
-    It it = std::lower_bound(
+    auto it = std::lower_bound(
         _folder.files.begin(),
         _folder.files.end(),
         time.j2000Seconds(),
@@ -486,7 +485,7 @@ TemporalTileProvider::tileProvider<TemporalTileProvider::Mode::Folder, false>(
         it -= 1;
     }
 
-    double t = it->first;
+    const double t = it->first;
     return retrieveTileProvider(Time(t));
 }
 
@@ -495,8 +494,7 @@ TileProvider*
 TemporalTileProvider::tileProvider<TemporalTileProvider::Mode::Folder, true>(
                                                                          const Time& time)
 {
-    using It = std::vector<std::pair<double, std::string>>::const_iterator;
-    It next = std::lower_bound(
+    auto next = std::lower_bound(
         _folder.files.begin(),
         _folder.files.end(),
         time.j2000Seconds(),
@@ -505,8 +503,8 @@ TemporalTileProvider::tileProvider<TemporalTileProvider::Mode::Folder, true>(
         }
     );
 
-    It curr = next != _folder.files.begin() ? next - 1 : next;
-    It nextNext = next != _folder.files.end() ? next + 1 : curr;
+    auto curr = next != _folder.files.begin() ? next - 1 : next;
+    auto nextNext = next != _folder.files.end() ? next + 1 : curr;
 
     if (next == _folder.files.end()) {
         curr = _folder.files.end() - 1;
@@ -514,14 +512,14 @@ TemporalTileProvider::tileProvider<TemporalTileProvider::Mode::Folder, true>(
         nextNext = curr;
     }
 
-    It prev = curr != _folder.files.begin() ? curr - 1 : curr;
+    auto prev = curr != _folder.files.begin() ? curr - 1 : curr;
 
     _interpolateTileProvider->t1 = retrieveTileProvider(Time(curr->first));
     _interpolateTileProvider->t2 = retrieveTileProvider(Time(next->first));
     _interpolateTileProvider->future = retrieveTileProvider(Time(nextNext->first));
     _interpolateTileProvider->before = retrieveTileProvider(Time(prev->first));
 
-    float factor = static_cast<float>(
+    const float factor = static_cast<float>(
         (time.j2000Seconds() - curr->first) / (next->first - curr->first)
     );
 
@@ -678,7 +676,7 @@ TemporalTileProvider::InterpolateTileProvider::InterpolateTileProvider(
     glBindVertexArray(vaoQuad);
     glBindBuffer(GL_ARRAY_BUFFER, vboQuad);
     // Quad for fullscreen with vertex (xy) and texture coordinates (uv)
-    const GLfloat vertexData[] = {
+    constexpr std::array<GLfloat, 24> VertexData = {
         // x    y    u    v
         -1.f, -1.f, 0.f, 0.f,
          1.f,  1.f, 1.f, 1.f,
@@ -687,7 +685,7 @@ TemporalTileProvider::InterpolateTileProvider::InterpolateTileProvider(
          1.f, -1.f, 1.f, 0.f,
          1.f,  1.f, 1.f, 1.f
     };
-    glBufferData(GL_ARRAY_BUFFER, sizeof(vertexData), vertexData, GL_STATIC_DRAW);
+    glBufferData(GL_ARRAY_BUFFER, sizeof(VertexData), VertexData.data(), GL_STATIC_DRAW);
     // vertex coordinates at location 0
     glVertexAttribPointer(0, 2, GL_FLOAT, GL_FALSE, 4 * sizeof(GLfloat), nullptr);
     glEnableVertexAttribArray(0);
@@ -721,21 +719,21 @@ Tile TemporalTileProvider::InterpolateTileProvider::tile(const TileIndex& tileIn
     TracyGpuZone("tile");
 
     // prev and next are the two tiles to interpolate between
-    Tile prev = t1->tile(tileIndex);
-    Tile next = t2->tile(tileIndex);
+    const Tile prev = t1->tile(tileIndex);
+    const Tile next = t2->tile(tileIndex);
     // the tile before and the tile after the interpolation interval are loaded so the
     // interpolation goes smoother. It is on purpose that we are not actually storing the
     // return tile here, we just want to trigger the load already
     before->tile(tileIndex);
     future->tile(tileIndex);
-    cache::ProviderTileKey key = { tileIndex, uniqueIdentifier };
+    const cache::ProviderTileKey key = { tileIndex, uniqueIdentifier };
 
     if (!prev.texture || !next.texture) {
         return Tile{ nullptr, std::nullopt, Tile::Status::Unavailable };
     }
 
     // The data for initializing the texture
-    TileTextureInitData initData(
+    const TileTextureInitData initData(
         prev.texture->dimensions().x,
         prev.texture->dimensions().y,
         prev.texture->dataType(),
@@ -747,7 +745,7 @@ Tile TemporalTileProvider::InterpolateTileProvider::tile(const TileIndex& tileIn
     // Initializing the tile that will contian the interpolated texture
     Tile ourTile;
     // The texture that will contain the interpolated image
-    ghoul::opengl::Texture* writeTexture;
+    ghoul::opengl::Texture* writeTexture = nullptr;
     cache::MemoryAwareTileCache* tileCache =
         global::moduleEngine->module<GlobeBrowsingModule>()->tileCache();
     if (tileCache->exist(key)) {
@@ -762,10 +760,10 @@ Tile TemporalTileProvider::InterpolateTileProvider::tile(const TileIndex& tileIn
     }
 
     // Saves current state
-    GLint currentFBO;
-    GLint viewport[4];
+    GLint currentFBO = 0;
+    std::array<GLint, 4> viewport;
     glGetIntegerv(GL_FRAMEBUFFER_BINDING, &currentFBO);
-    global::renderEngine->openglStateCache().viewport(viewport);
+    global::renderEngine->openglStateCache().viewport(viewport.data());
     // Bind render texture to FBO
     glBindFramebuffer(GL_FRAMEBUFFER, fbo);
     glFramebufferTexture(GL_FRAMEBUFFER, GL_COLOR_ATTACHMENT0, *writeTexture, 0);
@@ -774,12 +772,12 @@ Tile TemporalTileProvider::InterpolateTileProvider::tile(const TileIndex& tileIn
     glDrawBuffers(1, textureBuffers);
 
     // Setup our own viewport settings
-    GLsizei w = static_cast<GLsizei>(writeTexture->width());
-    GLsizei h = static_cast<GLsizei>(writeTexture->height());
+    const GLsizei w = static_cast<GLsizei>(writeTexture->width());
+    const GLsizei h = static_cast<GLsizei>(writeTexture->height());
     glViewport(0, 0, w, h);
     glClearColor(0.f, 0.f, 0.f, 0.f);
     glClear(GL_COLOR_BUFFER_BIT);
-    GLint id;
+    GLint id = 0;
     glGetIntegerv(GL_CURRENT_PROGRAM, &id);
     // Activate shader and bind uniforms
     shaderProgram->activate();
diff --git a/modules/globebrowsing/src/tileprovider/texttileprovider.cpp b/modules/globebrowsing/src/tileprovider/texttileprovider.cpp
index f775ea1c73..bef9727ad1 100644
--- a/modules/globebrowsing/src/tileprovider/texttileprovider.cpp
+++ b/modules/globebrowsing/src/tileprovider/texttileprovider.cpp
@@ -38,11 +38,8 @@ namespace openspace::globebrowsing {
 TextTileProvider::TextTileProvider(TileTextureInitData initData_, size_t fontSize_)
     : initData(std::move(initData_))
     , fontSize(fontSize_)
-{
-    ZoneScoped;
-
-    tileCache = global::moduleEngine->module<GlobeBrowsingModule>()->tileCache();
-}
+    , tileCache(global::moduleEngine->module<GlobeBrowsingModule>()->tileCache())
+{}
 
 TextTileProvider::~TextTileProvider() {}
 
@@ -66,12 +63,13 @@ Tile TextTileProvider::renderTile(const TileIndex& tileIndex, const std::string&
     ZoneScoped;
     TracyGpuZone("tile");
 
-    cache::ProviderTileKey key = { tileIndex, uniqueIdentifier };
+    const cache::ProviderTileKey key = { tileIndex, uniqueIdentifier };
     Tile tile = tileCache->get(key);
     if (!tile.texture) {
         ghoul::opengl::Texture* texture = tileCache->texture(initData);
 
-        GLint prevProgram, prevFBO;
+        GLint prevProgram = 0;
+        GLint prevFBO = 0;
         glGetIntegerv(GL_CURRENT_PROGRAM, &prevProgram);
         glGetIntegerv(GL_FRAMEBUFFER_BINDING, &prevFBO);
 
@@ -85,8 +83,8 @@ Tile TextTileProvider::renderTile(const TileIndex& tileIndex, const std::string&
             0
         );
 
-        GLsizei w = static_cast<GLsizei>(texture->width());
-        GLsizei h = static_cast<GLsizei>(texture->height());
+        const GLsizei w = static_cast<GLsizei>(texture->width());
+        const GLsizei h = static_cast<GLsizei>(texture->height());
         global::renderEngine->openglStateCache().loadCurrentGLState();
         glViewport(0, 0, w, h);
         glClearColor(
diff --git a/modules/globebrowsing/src/tileprovider/tileindextileprovider.cpp b/modules/globebrowsing/src/tileprovider/tileindextileprovider.cpp
index 51028ccdb8..fb6fe49bea 100644
--- a/modules/globebrowsing/src/tileprovider/tileindextileprovider.cpp
+++ b/modules/globebrowsing/src/tileprovider/tileindextileprovider.cpp
@@ -59,17 +59,17 @@ TileIndexTileProvider::TileIndexTileProvider(const ghoul::Dictionary& dictionary
 
 Tile TileIndexTileProvider::tile(const TileIndex& tileIndex) {
     ZoneScoped;
-    std::string text = fmt::format(
+    const std::string text = fmt::format(
         "level: {}\nx: {}\ny: {}", tileIndex.level, tileIndex.x, tileIndex.y
     );
-    glm::vec2 position = glm::vec2(
+    const glm::vec2 position = glm::vec2(
         initData.dimensions.x / 4 -
         (initData.dimensions.x / 32) * log10(1 << tileIndex.level),
         initData.dimensions.y / 2 + fontSize
     );
 
     if (_uniqueBackgroundColors) {
-        TileIndex::TileHashKey key = tileIndex.hashKey();
+        const TileIndex::TileHashKey key = tileIndex.hashKey();
         size_t hash = std::hash<TileIndex::TileHashKey>{}(key);
 
         // This is pretty ugly, but it's just for debugging and it is reproducable... We
@@ -78,11 +78,11 @@ Tile TileIndexTileProvider::tile(const TileIndex& tileIndex) {
         // each tile. If we divide the resulting number by 255 we get a value [0, 1] that
         // we can use for the color channel
 
-        uint8_t red = reinterpret_cast<uint8_t*>(&hash)[0];
-        uint8_t green = reinterpret_cast<uint8_t*>(&hash)[1];
-        uint8_t blue = reinterpret_cast<uint8_t*>(&hash)[2];
+        const uint8_t red = reinterpret_cast<uint8_t*>(&hash)[0];
+        const uint8_t green = reinterpret_cast<uint8_t*>(&hash)[1];
+        const uint8_t blue = reinterpret_cast<uint8_t*>(&hash)[2];
 
-        glm::vec4 backgroundColor = glm::vec4(
+        const glm::vec4 backgroundColor = glm::vec4(
             static_cast<float>(red) / 255.f,
             static_cast<float>(green) / 255.f,
             static_cast<float>(blue) / 255.f,
diff --git a/modules/globebrowsing/src/tileprovider/tileprovider.cpp b/modules/globebrowsing/src/tileprovider/tileprovider.cpp
index 3eff7b845c..d6af722e30 100644
--- a/modules/globebrowsing/src/tileprovider/tileprovider.cpp
+++ b/modules/globebrowsing/src/tileprovider/tileprovider.cpp
@@ -75,7 +75,8 @@ std::unique_ptr<TileProvider> TileProvider::createFromDictionary(
 {
     ZoneScoped;
 
-    std::string_view type = layers::Layers[static_cast<int>(layerTypeID)].identifier;
+    const std::string_view type =
+        layers::Layers[static_cast<int>(layerTypeID)].identifier;
 
     ghoul::TemplateFactory<TileProvider>* factory =
         FactoryManager::ref().factory<TileProvider>();
@@ -92,7 +93,7 @@ void TileProvider::initializeDefaultTile() {
     using namespace ghoul::opengl;
 
     // Create pixel data
-    TileTextureInitData initData(
+    const TileTextureInitData initData(
         8,
         8,
         GL_UNSIGNED_BYTE,
@@ -152,7 +153,7 @@ void TileProvider::deinitialize() {
 }
 
 ChunkTile TileProvider::traverseTree(TileIndex tileIndex, int parents, int maxParents,
-                        std::function<void(TileIndex&, TileUvTransform&)>& ascendToParent,
+                  const std::function<void(TileIndex&, TileUvTransform&)>& ascendToParent,
                                                              TileUvTransform& uvTransform)
 {
     // Step 1. Traverse 0 or more parents up the chunkTree as requested by the caller
@@ -163,7 +164,7 @@ ChunkTile TileProvider::traverseTree(TileIndex tileIndex, int parents, int maxPa
 
     // Step 2. Traverse 0 or more parents up the chunkTree to make sure we're inside
     //         the range of defined data.
-    int maximumLevel = maxLevel();
+    const int maximumLevel = maxLevel();
     while (tileIndex.level > maximumLevel) {
         ascendToParent(tileIndex, uvTransform);
         maxParents--;
@@ -174,7 +175,7 @@ ChunkTile TileProvider::traverseTree(TileIndex tileIndex, int parents, int maxPa
 
     // Step 3. Traverse 0 or more parents up the chunkTree until we find a chunk that
     //         has a loaded tile ready to use.
-    int minimumLevel = minLevel();
+    const int minimumLevel = minLevel();
     while (tileIndex.level > minimumLevel) {
         Tile t = tile(tileIndex);
         if (t.status != Tile::Status::OK) {
@@ -199,17 +200,16 @@ ChunkTile TileProvider::chunkTile(TileIndex tileIndex, int parents, int maxParen
 
     ghoul_assert(isInitialized, "TileProvider was not initialized");
 
-    std::function<void(TileIndex&, TileUvTransform&)> ascendToParent = []
-        (TileIndex& ti, TileUvTransform& uv) {
-            uv.uvOffset *= 0.5;
-            uv.uvScale *= 0.5;
+    constexpr auto ascendToParent = [](TileIndex& ti, TileUvTransform& uv) {
+        uv.uvOffset *= 0.5;
+        uv.uvScale *= 0.5;
 
-            uv.uvOffset += ti.positionRelativeParent();
+        uv.uvOffset += ti.positionRelativeParent();
 
-            ti.x /= 2;
-            ti.y /= 2;
-            ti.level--;
-        };
+        ti.x /= 2;
+        ti.y /= 2;
+        ti.level--;
+    };
 
     TileUvTransform uvTransform = {
        .uvOffset = glm::vec2(0.f, 0.f),
diff --git a/modules/globebrowsing/src/tileprovider/tileprovider.h b/modules/globebrowsing/src/tileprovider/tileprovider.h
index 7ea483a7b1..5712353df5 100644
--- a/modules/globebrowsing/src/tileprovider/tileprovider.h
+++ b/modules/globebrowsing/src/tileprovider/tileprovider.h
@@ -141,9 +141,10 @@ struct TileProvider : public properties::PropertyOwner {
 
     uint16_t uniqueIdentifier = 0;
     bool isInitialized = false;
+
 protected:
     ChunkTile traverseTree(TileIndex tileIndex, int parents, int maxParents,
-        std::function<void(TileIndex&, TileUvTransform&)>& ascendToParent,
+        const std::function<void(TileIndex&, TileUvTransform&)>& ascendToParent,
         TileUvTransform& uvTransform);
 
 private:
diff --git a/modules/globebrowsing/src/tileprovider/tileproviderbyindex.cpp b/modules/globebrowsing/src/tileprovider/tileproviderbyindex.cpp
index a3c60c22b6..a64fb1f2e1 100644
--- a/modules/globebrowsing/src/tileprovider/tileproviderbyindex.cpp
+++ b/modules/globebrowsing/src/tileprovider/tileproviderbyindex.cpp
@@ -71,14 +71,14 @@ TileProviderByIndex::TileProviderByIndex(const ghoul::Dictionary& dictionary) {
 
     layers::Layer::ID typeID = layers::Layer::ID::DefaultTileProvider;
     if (p.defaultProvider.hasValue<std::string>("Type")) {
-        std::string type = p.defaultProvider.value<std::string>("Type");
+        const std::string type = p.defaultProvider.value<std::string>("Type");
         typeID = ghoul::from_string<layers::Layer::ID>(type);
     }
 
     _defaultTileProvider = createFromDictionary(typeID, p.defaultProvider);
 
     for (const Parameters::IndexProvider& ip : p.indexTileProviders) {
-        const TileIndex tileIndex(
+        const TileIndex tileIndex = TileIndex(
             ip.tileIndex.x,
             ip.tileIndex.y,
             static_cast<uint8_t>(ip.tileIndex.level)
@@ -86,7 +86,7 @@ TileProviderByIndex::TileProviderByIndex(const ghoul::Dictionary& dictionary) {
 
         layers::Layer::ID providerID = layers::Layer::ID::DefaultTileProvider;
         if (ip.tileProvider.hasValue<std::string>("Type")) {
-            std::string type = ip.tileProvider.value<std::string>("Type");
+            const std::string type = ip.tileProvider.value<std::string>("Type");
             providerID = ghoul::from_string<layers::Layer::ID>(type);
         }
 
@@ -94,8 +94,8 @@ TileProviderByIndex::TileProviderByIndex(const ghoul::Dictionary& dictionary) {
             providerID,
             ip.tileProvider
         );
-        TileIndex::TileHashKey key = tileIndex.hashKey();
-        _providers.insert(std::make_pair(key, std::move(stp)));
+        const TileIndex::TileHashKey key = tileIndex.hashKey();
+        _providers.emplace(key, std::move(stp));
     }
 }
 
diff --git a/modules/globebrowsing/src/tileprovider/tileproviderbylevel.cpp b/modules/globebrowsing/src/tileprovider/tileproviderbylevel.cpp
index 6e44128fbe..3413212e2d 100644
--- a/modules/globebrowsing/src/tileprovider/tileproviderbylevel.cpp
+++ b/modules/globebrowsing/src/tileprovider/tileproviderbylevel.cpp
@@ -50,7 +50,7 @@ TileProviderByLevel::TileProviderByLevel(const ghoul::Dictionary& dictionary) {
 
     const Parameters p = codegen::bake<Parameters>(dictionary);
 
-    layers::Group::ID group = static_cast<layers::Group::ID>(p.layerGroupID);
+    const layers::Group::ID group = static_cast<layers::Group::ID>(p.layerGroupID);
 
     for (Parameters::Provider provider : p.levelTileProviders) {
         ghoul::Dictionary& tileProviderDict = provider.tileProvider;
@@ -65,15 +65,15 @@ TileProviderByLevel::TileProviderByLevel(const ghoul::Dictionary& dictionary) {
         }
         layers::Layer::ID typeID = layers::Layer::ID::DefaultTileProvider;
         if (tileProviderDict.hasValue<std::string>("Type")) {
-            std::string type = tileProviderDict.value<std::string>("Type");
+            const std::string type = tileProviderDict.value<std::string>("Type");
             typeID = ghoul::from_string<layers::Layer::ID>(type);
         }
 
         std::unique_ptr<TileProvider> tp = createFromDictionary(typeID, tileProviderDict);
 
-        std::string provId = tileProviderDict.value<std::string>("Identifier");
+        const std::string provId = tileProviderDict.value<std::string>("Identifier");
         tp->setIdentifier(provId);
-        std::string providerName = tileProviderDict.value<std::string>("Name");
+        const std::string providerName = tileProviderDict.value<std::string>("Name");
         tp->setGuiName(providerName);
         addPropertySubOwner(tp.get());
 
@@ -130,12 +130,12 @@ TileProvider* TileProviderByLevel::levelProvider(int level) const {
     ZoneScoped;
 
     if (!_levelTileProviders.empty()) {
-        int clampedLevel = glm::clamp(
+        const int clampedLevel = glm::clamp(
             level,
             0,
             static_cast<int>(_providerIndices.size() - 1)
         );
-        int idx = _providerIndices[clampedLevel];
+        const int idx = _providerIndices[clampedLevel];
         return _levelTileProviders[idx].get();
     }
     else {
diff --git a/modules/globebrowsing/src/tiletextureinitdata.cpp b/modules/globebrowsing/src/tiletextureinitdata.cpp
index 7f9b918827..91687c9b79 100644
--- a/modules/globebrowsing/src/tiletextureinitdata.cpp
+++ b/modules/globebrowsing/src/tiletextureinitdata.cpp
@@ -82,7 +82,7 @@ openspace::globebrowsing::TileTextureInitData::HashKey calculateHashKey(
     ghoul_assert(dimensions.x <= 1024, "Incorrect dimension");
     ghoul_assert(dimensions.y <= 1024, "Incorrect dimension");
     ghoul_assert(dimensions.z == 1, "Incorrect dimension");
-    unsigned int formatId = uniqueIdForTextureFormat(format);
+    const unsigned int formatId = uniqueIdForTextureFormat(format);
     ghoul_assert(formatId < 256, "Incorrect format");
 
     openspace::globebrowsing::TileTextureInitData::HashKey res = 0ULL;
@@ -169,20 +169,20 @@ TileTextureInitData::TileTextureInitData(size_t width, size_t height, GLenum typ
     , hashKey(calculateHashKey(dimensions, ghoulTextureFormat, glType))
 {}
 
-TileTextureInitData TileTextureInitData::operator=(const TileTextureInitData& rhs) {
+TileTextureInitData& TileTextureInitData::operator=(const TileTextureInitData& rhs) {
     if (this == &rhs) {
         return *this;
     }
 
-    return rhs;
+    return *this;
 }
 
-TileTextureInitData TileTextureInitData::operator=(TileTextureInitData&& rhs) noexcept {
+TileTextureInitData& TileTextureInitData::operator=(TileTextureInitData&& rhs) noexcept {
     if (this == &rhs) {
         return *this;
     }
 
-    return std::move(rhs);
+    return *this;
 }
 
 } // namespace openspace::globebrowsing
diff --git a/modules/globebrowsing/src/tiletextureinitdata.h b/modules/globebrowsing/src/tiletextureinitdata.h
index ffc94a4a35..b1fcf0d80c 100644
--- a/modules/globebrowsing/src/tiletextureinitdata.h
+++ b/modules/globebrowsing/src/tiletextureinitdata.h
@@ -48,8 +48,8 @@ public:
     TileTextureInitData(const TileTextureInitData& original) = default;
     TileTextureInitData(TileTextureInitData&& original) = default;
 
-    TileTextureInitData operator=(const TileTextureInitData& rhs);
-    TileTextureInitData operator=(TileTextureInitData&& rhs) noexcept;
+    TileTextureInitData& operator=(const TileTextureInitData& rhs);
+    TileTextureInitData& operator=(TileTextureInitData&& rhs) noexcept;
 
     ~TileTextureInitData() = default;
 
diff --git a/modules/globebrowsing/src/timequantizer.cpp b/modules/globebrowsing/src/timequantizer.cpp
index cd67b732cd..61daaa95f0 100644
--- a/modules/globebrowsing/src/timequantizer.cpp
+++ b/modules/globebrowsing/src/timequantizer.cpp
@@ -47,8 +47,9 @@ namespace openspace::globebrowsing {
 
 namespace {
     // returns the number of days in a given month and year (takes leap year into account)
-    constexpr int monthSize(int month, int year) {
-        date::year_month_day_last d = date::year(year) / date::month(month) / date::last;
+    constexpr int monthSize(int month_, int year_) {
+        using namespace date;
+        const year_month_day_last d = year(year_) / month(month_) / last;
         return static_cast<int>(static_cast<unsigned>(d.day()));
     }
 
@@ -334,17 +335,17 @@ TimeQuantizer::TimeQuantizer(std::string start, std::string end,
                              const std::string& resolution)
     : _start(start)
     , _timerange(std::move(start), std::move(end))
+    , _resolution(parseTimeResolutionStr(resolution))
 {
-    _resolution = parseTimeResolutionStr(resolution);
     verifyStartTimeRestrictions();
 }
 
 double TimeQuantizer::parseTimeResolutionStr(const std::string& resolutionStr) {
     const char unit = resolutionStr.back();
-    std::string numberString = resolutionStr.substr(0, resolutionStr.length() - 1);
+    const std::string numberString = resolutionStr.substr(0, resolutionStr.length() - 1);
 
-    char* p;
-    double value = strtol(numberString.c_str(), &p, 10);
+    char* p = nullptr;
+    const double value = strtol(numberString.c_str(), &p, 10);
     _resolutionValue = value;
     _resolutionUnit = unit;
     if (*p) { // not a number
@@ -371,7 +372,7 @@ void TimeQuantizer::setResolution(const std::string& resolutionString) {
 
 void TimeQuantizer::verifyStartTimeRestrictions() {
     // If monthly time resolution then restrict to 28 days so every month is consistent
-    int dayUpperLimit;
+    int dayUpperLimit = 0;
     std::string helpfulDescription = "the selected month";
     if (_resolutionUnit == 'M') {
         dayUpperLimit = 28;
@@ -420,7 +421,7 @@ void TimeQuantizer::verifyResolutionRestrictions(const int value, const char uni
             }
             break;
         case 'h':
-            if (!((value >= 1 && value <= 4) || value == 6 || value == 12)) {
+            if ((value < 1 || value > 4) && value != 6 && value != 12) {
                 throw ghoul::RuntimeError(fmt::format(
                     "Invalid resolution count of {} for (h)our option. Valid counts are "
                     "1, 2, 3, 4, 6, or 12", value
@@ -485,11 +486,14 @@ bool TimeQuantizer::quantize(Time& t, bool clamp) {
     std::memset(unquantizedString, 0, BufferSize);
     SpiceManager::ref().dateFromEphemerisTime(
         t.j2000Seconds(),
-        unquantizedString, BufferSize,
+        unquantizedString,
+        BufferSize,
         Format
     );
 
-    DateTime unquantized(std::string_view(unquantizedString, BufferSize));
+    const DateTime unquantized = DateTime(
+        std::string_view(unquantizedString, BufferSize)
+    );
     // resolutionFraction helps to improve iteration performance
     constexpr double ResolutionFraction = 0.7;
     constexpr int IterationLimit = 50;
@@ -519,7 +523,7 @@ bool TimeQuantizer::quantize(Time& t, bool clamp) {
                 );
             }
             error = unquantized.J2000() - quantized.J2000();
-            bool hasSettled = (lastIncr == 1 && lastDecr == 1 && error >= 0.0);
+            const bool hasSettled = (lastIncr == 1 && lastDecr == 1 && error >= 0.0);
             iterations++;
             if (hasSettled || iterations > IterationLimit) {
                 break;
@@ -546,8 +550,8 @@ bool TimeQuantizer::quantize(Time& t, bool clamp) {
     }
 }
 
-void TimeQuantizer::doFirstApproximation(DateTime& quantized, DateTime& unQ, double value,
-                                         char unit)
+void TimeQuantizer::doFirstApproximation(DateTime& quantized, const DateTime& unQ,
+                                         double value, char unit)
 {
     ZoneScoped;
 
@@ -565,10 +569,8 @@ void TimeQuantizer::doFirstApproximation(DateTime& quantized, DateTime& unQ, dou
         }
         case 'M':
         {
-            bool isSimMonthPastQuantizedMonth = unQ.month() > static_cast<int>(value);
-            quantized.setYear(
-                (isSimMonthPastQuantizedMonth) ? unQ.year() : unQ.year() - 1
-            );
+            const bool isMonthPastQuantizedMonth = unQ.month() > static_cast<int>(value);
+            quantized.setYear(isMonthPastQuantizedMonth ? unQ.year() : unQ.year() - 1);
             break;
         }
         case 'd':
@@ -578,7 +580,7 @@ void TimeQuantizer::doFirstApproximation(DateTime& quantized, DateTime& unQ, dou
             const int originalMinute = quantized.minute();
             const int originalSecond = quantized.second();
             const double addToTime = std::round(error) * 86400;
-            Time testDay(quantized.J2000() + addToTime);
+            const Time testDay = Time(quantized.J2000() + addToTime);
 
             char Buffer[25];
             testDay.ISO8601(Buffer);
@@ -620,10 +622,10 @@ void TimeQuantizer::doFirstApproximation(DateTime& quantized, DateTime& unQ, dou
 }
 
 std::vector<std::string> TimeQuantizer::quantized(Time& start, Time& end) {
-    DateTime s(start.ISO8601());
+    const DateTime s = DateTime(start.ISO8601());
     quantize(start, true);
 
-    DateTime e(end.ISO8601());
+    const DateTime e = DateTime(end.ISO8601());
     quantize(end, true);
 
     const double startSeconds = s.J2000();
@@ -635,7 +637,10 @@ std::vector<std::string> TimeQuantizer::quantized(Time& start, Time& end) {
 
     std::vector<std::string> result;
     DateTime itr = s;
-    RangedTime range(std::string(start.ISO8601()), std::string(end.ISO8601()));
+    const RangedTime range = RangedTime(
+        std::string(start.ISO8601()),
+        std::string(end.ISO8601())
+    );
     while (range.includes(Time(itr.ISO8601()))) {
         itr.incrementOnce(static_cast<int>(_resolutionValue), _resolutionUnit);
         result.push_back(itr.ISO8601());
diff --git a/modules/globebrowsing/src/timequantizer.h b/modules/globebrowsing/src/timequantizer.h
index d8d7143b92..df12aaa01b 100644
--- a/modules/globebrowsing/src/timequantizer.h
+++ b/modules/globebrowsing/src/timequantizer.h
@@ -94,9 +94,9 @@ public:
     /**
      * Set the end date/time of the time range.
      *
-     * \param start The ISO8601 date/time string that defines the end of the range
+     * \param end The ISO8601 date/time string that defines the end of the range
      */
-    void setEnd(const std::string start);
+    void setEnd(const std::string end);
 
 private:
     std::string _start;
@@ -362,7 +362,7 @@ public:
 private:
     void verifyStartTimeRestrictions();
     void verifyResolutionRestrictions(const int value, const char unit);
-    void doFirstApproximation(DateTime& q, DateTime& unQ, double value, char unit);
+    void doFirstApproximation(DateTime& q, const DateTime& unQ, double value, char unit);
     double computeSecondsFromResolution(const int valueIn, const char unit);
     double _resolution = 0.0;
     double _resolutionValue = 0.0;
diff --git a/modules/imgui/imguimodule.cpp b/modules/imgui/imguimodule.cpp
index 451fa63d79..6f98369a6f 100644
--- a/modules/imgui/imguimodule.cpp
+++ b/modules/imgui/imguimodule.cpp
@@ -136,7 +136,7 @@ ImGUIModule::ImGUIModule()
             return;
         }
 
-        WindowDelegate& delegate = *global::windowDelegate;
+        const WindowDelegate& delegate = *global::windowDelegate;
         const bool showGui = delegate.hasGuiWindow() ? delegate.isGuiWindow() : true;
         if (delegate.isMaster() && showGui) {
             const glm::ivec2 windowSize = delegate.currentSubwindowSize();
@@ -291,7 +291,7 @@ void ImGUIModule::internalInitializeGL() {
     strcpy(_iniFileBuffer.data(), file.c_str());
 #endif
 
-    int nWindows = global::windowDelegate->nWindows();
+    const int nWindows = global::windowDelegate->nWindows();
     _contexts.resize(nWindows);
 
     for (int i = 0; i < nWindows; i++) {
@@ -393,7 +393,7 @@ void ImGUIModule::internalInitializeGL() {
     ghoul::opengl::updateUniformLocations(*_program, _uniformCache, UniformNames);
 
     {
-        unsigned char* texData;
+        unsigned char* texData = nullptr;
         glm::ivec2 texSize = glm::ivec2(0, 0);
         for (int i = 0; i < nWindows; i++) {
             ImGui::SetCurrentContext(_contexts[i]);
@@ -410,7 +410,7 @@ void ImGUIModule::internalInitializeGL() {
         _fontTexture->uploadTexture();
     }
     for (int i = 0; i < nWindows; i++) {
-        uintptr_t texture = static_cast<GLuint>(*_fontTexture);
+        const uintptr_t texture = static_cast<GLuint>(*_fontTexture);
         ImGui::SetCurrentContext(_contexts[i]);
         ImGui::GetIO().Fonts->TexID = reinterpret_cast<void*>(texture);
     }
@@ -425,9 +425,9 @@ void ImGUIModule::internalInitializeGL() {
     glBindVertexArray(vao);
     glBindBuffer(GL_ARRAY_BUFFER, vbo);
 
-    GLuint positionAttrib = _program->attributeLocation("in_position");
-    GLuint uvAttrib = _program->attributeLocation("in_uv");
-    GLuint colorAttrib = _program->attributeLocation("in_color");
+    const GLuint positionAttrib = _program->attributeLocation("in_position");
+    const GLuint uvAttrib = _program->attributeLocation("in_uv");
+    const GLuint colorAttrib = _program->attributeLocation("in_color");
 
     glEnableVertexAttribArray(positionAttrib);
     glVertexAttribPointer(
@@ -549,10 +549,10 @@ void ImGUIModule::renderFrame(float deltaTime, const glm::vec2& windowSize,
 
     // Avoid rendering when minimized, scale coordinates for retina displays
     // (screen coordinates != framebuffer coordinates)
-    GLsizei fbWidth = static_cast<GLsizei>(
+    const GLsizei fbWidth = static_cast<GLsizei>(
         io.DisplaySize.x * io.DisplayFramebufferScale.x
     );
-    GLsizei fbHeight = static_cast<GLsizei>(
+    const GLsizei fbHeight = static_cast<GLsizei>(
         io.DisplaySize.y * io.DisplayFramebufferScale.y
     );
     if (fbWidth == 0 || fbHeight == 0) {
@@ -645,14 +645,14 @@ void ImGUIModule::renderFrame(float deltaTime, const glm::vec2& windowSize,
 }
 
 bool ImGUIModule::mouseButtonCallback(MouseButton, MouseAction) {
-    ImGuiIO& io = ImGui::GetIO();
-    bool consumeEvent = io.WantCaptureMouse;
+    const ImGuiIO& io = ImGui::GetIO();
+    const bool consumeEvent = io.WantCaptureMouse;
     return consumeEvent;
 }
 
 bool ImGUIModule::mouseWheelCallback(double position) {
     ImGuiIO& io = ImGui::GetIO();
-    bool consumeEvent = io.WantCaptureMouse;
+    const bool consumeEvent = io.WantCaptureMouse;
     if (consumeEvent) {
         io.MouseWheel = static_cast<float>(position);
     }
@@ -701,7 +701,7 @@ bool ImGUIModule::keyCallback(Key key, KeyModifier modifier, KeyAction action) {
 
 bool ImGUIModule::charCallback(unsigned int character, KeyModifier) {
     ImGuiIO& io = ImGui::GetIO();
-    bool consumeEvent = io.WantCaptureKeyboard;
+    const bool consumeEvent = io.WantCaptureKeyboard;
     if (consumeEvent) {
         io.AddInputCharacter(static_cast<unsigned short>(character));
     }
@@ -740,7 +740,7 @@ bool ImGUIModule::touchUpdatedCallback(TouchInput input) {
     );
 
     if (it == _validTouchStates.cbegin()) {
-        glm::vec2 windowPos = input.currentWindowCoordinates();
+        const glm::vec2 windowPos = input.currentWindowCoordinates();
         io.MousePos = ImVec2(windowPos.x, windowPos.y);
         io.MouseClicked[0] = true;
         return true;
@@ -772,7 +772,7 @@ void ImGUIModule::touchExitCallback(TouchInput input) {
     ImGuiIO& io = ImGui::GetIO();
     _validTouchStates.erase(found);
     if (_validTouchStates.empty()) {
-        glm::vec2 windowPos = input.currentWindowCoordinates();
+        const glm::vec2 windowPos = input.currentWindowCoordinates();
         io.MousePos = ImVec2(windowPos.x, windowPos.y);
         io.MouseClicked[0] = false;
     }
diff --git a/modules/imgui/include/guiparallelcomponent.h b/modules/imgui/include/guiparallelcomponent.h
index 04169c1b8b..46669f0ff2 100644
--- a/modules/imgui/include/guiparallelcomponent.h
+++ b/modules/imgui/include/guiparallelcomponent.h
@@ -40,7 +40,6 @@ private:
     void renderClientWithHost();
     void renderClientWithoutHost();
     void renderClientCommon();
-    void renderHost();
 };
 
 } // namespace openspace::gui
diff --git a/modules/imgui/src/guigibscomponent.cpp b/modules/imgui/src/guigibscomponent.cpp
index 0ebde94979..857e1485f2 100644
--- a/modules/imgui/src/guigibscomponent.cpp
+++ b/modules/imgui/src/guigibscomponent.cpp
@@ -146,7 +146,7 @@ void GuiGIBSComponent::render() {
             layerScript
         );
         global::scriptEngine->queueScript(
-            script,
+            std::move(script),
             scripting::ScriptEngine::ShouldBeSynchronized::Yes,
             scripting::ScriptEngine::ShouldSendToRemote::Yes
         );
diff --git a/modules/imgui/src/guiglobebrowsingcomponent.cpp b/modules/imgui/src/guiglobebrowsingcomponent.cpp
index 9f7d4d4032..a97bf190dc 100644
--- a/modules/imgui/src/guiglobebrowsingcomponent.cpp
+++ b/modules/imgui/src/guiglobebrowsingcomponent.cpp
@@ -151,7 +151,7 @@ void GuiGlobeBrowsingComponent::render() {
     bool isNodeChanged = ImGui::Combo("Globe", &iNode, nodeNames.c_str());
 
     ImGui::SameLine();
-    bool selectFocusNode = ImGui::Button("From Focus");
+    const bool selectFocusNode = ImGui::Button("From Focus");
     if (selectFocusNode) {
         const SceneGraphNode* const focus =
             global::navigationHandler->orbitalNavigator().anchorNode();
@@ -186,7 +186,7 @@ void GuiGlobeBrowsingComponent::render() {
     // Render the list of servers for the planet
     std::vector<UrlInfo> urlInfo = module->urlInfo(_currentNode);
 
-    std::string serverList = std::accumulate(
+    const std::string serverList = std::accumulate(
         urlInfo.cbegin(),
         urlInfo.cend(),
         std::string(),
@@ -226,21 +226,21 @@ void GuiGlobeBrowsingComponent::render() {
 
     if (ImGui::BeginPopup("globebrowsing_add_server")) {
         constexpr int InputBufferSize = 512;
-        static char NameInputBuffer[InputBufferSize];
-        ImGui::InputText("Server Name", NameInputBuffer, InputBufferSize);
+        static std::array<char, InputBufferSize> NameInputBuffer;
+        ImGui::InputText("Server Name", NameInputBuffer.data(), InputBufferSize);
 
-        static char UrlInputBuffer[InputBufferSize];
-        ImGui::InputText("Server URL", UrlInputBuffer, InputBufferSize);
+        static std::array<char, InputBufferSize> UrlInputBuffer;
+        ImGui::InputText("Server URL", UrlInputBuffer.data(), InputBufferSize);
 
         const bool addServer = ImGui::Button("Add Server");
         if (addServer && (!_currentNode.empty())) {
             module->loadWMSCapabilities(
-                std::string(NameInputBuffer),
+                std::string(NameInputBuffer.data()),
                 _currentNode,
-                std::string(UrlInputBuffer)
+                std::string(UrlInputBuffer.data())
             );
-            std::memset(NameInputBuffer, 0, InputBufferSize * sizeof(char));
-            std::memset(UrlInputBuffer, 0, InputBufferSize * sizeof(char));
+            std::memset(NameInputBuffer.data(), 0, InputBufferSize * sizeof(char));
+            std::memset(UrlInputBuffer.data(), 0, InputBufferSize * sizeof(char));
 
             urlInfo = module->urlInfo(_currentNode);
             _currentServer = urlInfo.back().name;
@@ -267,7 +267,7 @@ void GuiGlobeBrowsingComponent::render() {
 
     ImGui::Separator();
 
-    Capabilities cap = module->capabilities(_currentServer);
+    const Capabilities cap = module->capabilities(_currentServer);
 
     if (cap.empty()) {
         LWARNINGC("GlobeBrowsing", fmt::format("Unknown server '{}'", _currentServer));
diff --git a/modules/imgui/src/guijoystickcomponent.cpp b/modules/imgui/src/guijoystickcomponent.cpp
index 96f674005c..362e6b5fdc 100644
--- a/modules/imgui/src/guijoystickcomponent.cpp
+++ b/modules/imgui/src/guijoystickcomponent.cpp
@@ -60,7 +60,7 @@ void GuiJoystickComponent::render() {
         ImGui::Text("%s", "Axes");
         for (int j = 0; j < state.nAxes; j++) {
             float f = state.axes[j];
-            std::string id = std::to_string(j) + "##" + state.name + "Axis";
+            const std::string id = std::to_string(j) + "##" + state.name + "Axis";
             ImGui::SliderFloat(
                 id.c_str(),
                 &f,
@@ -70,7 +70,7 @@ void GuiJoystickComponent::render() {
         }
         ImGui::Text("%s", "Buttons");
         for (int j = 0; j < state.nButtons; j++) {
-            std::string id = std::to_string(j) + "##" + state.name + "Button";
+            const std::string id = std::to_string(j) + "##" + state.name + "Button";
             ImGui::RadioButton(
                 id.c_str(),
                 state.buttons[j] == JoystickAction::Press ||
@@ -88,7 +88,7 @@ void GuiJoystickComponent::render() {
     ImGui::Text("%s", "Axes");
     for (int i = 0; i < global::joystickInputStates->numAxes(); i++) {
         float f = global::joystickInputStates->axis("", i);
-        std::string id = std::to_string(i) + "##" + "TotalAxis";
+        const std::string id = std::to_string(i) + "##" + "TotalAxis";
         ImGui::SliderFloat(
             id.c_str(),
             &f,
@@ -98,7 +98,7 @@ void GuiJoystickComponent::render() {
     }
     ImGui::Text("%s", "Buttons");
     for (int i = 0; i < global::joystickInputStates->numButtons(); i++) {
-        std::string id = std::to_string(i) + "##" + "TotalButton";
+        const std::string id = std::to_string(i) + "##" + "TotalButton";
         ImGui::RadioButton(
             id.c_str(),
             global::joystickInputStates->button("", i, JoystickAction::Press) ||
diff --git a/modules/imgui/src/guimissioncomponent.cpp b/modules/imgui/src/guimissioncomponent.cpp
index 5f82802a42..7fd9022d08 100644
--- a/modules/imgui/src/guimissioncomponent.cpp
+++ b/modules/imgui/src/guimissioncomponent.cpp
@@ -37,13 +37,13 @@ namespace {
     void renderMission(const openspace::Mission& mission) {
         // The hashname is necessary since ImGui computes a hash based off the name of the
         // elements.  This does not play well with using %s as the name
-        std::string missionHashname = "##" + mission.name();
+        const std::string missionHashname = "##" + mission.name();
 
 
         const double currentTime = openspace::global::timeManager->time().j2000Seconds();
-        openspace::MissionPhase::Trace t = mission.phaseTrace(currentTime, 0);
+        const openspace::MissionPhase::Trace t = mission.phaseTrace(currentTime, 0);
 
-        int treeOption = t.empty() ? 0 : ImGuiTreeNodeFlags_DefaultOpen;
+        const int treeOption = t.empty() ? 0 : ImGuiTreeNodeFlags_DefaultOpen;
         if (ImGui::TreeNodeEx(
                 ("%s" + missionHashname).c_str(),
                 treeOption,
@@ -55,9 +55,9 @@ namespace {
                 ImGui::Text("%s", mission.description().c_str());
             }
 
-            openspace::TimeRange range = mission.timeRange();
-            openspace::Time startTime = openspace::Time(range.start);
-            openspace::Time endTime  = openspace::Time(range.end);
+            const openspace::TimeRange range = mission.timeRange();
+            const openspace::Time startTime = openspace::Time(range.start);
+            const openspace::Time endTime  = openspace::Time(range.end);
 
             openspace::CaptionText("Mission Progress");
 
diff --git a/modules/imgui/src/guiparallelcomponent.cpp b/modules/imgui/src/guiparallelcomponent.cpp
index ce06096833..f54147ae89 100644
--- a/modules/imgui/src/guiparallelcomponent.cpp
+++ b/modules/imgui/src/guiparallelcomponent.cpp
@@ -31,12 +31,32 @@
 #include <openspace/network/parallelpeer.h>
 #include <openspace/network/messagestructures.h>
 #include <openspace/util/timemanager.h>
-
 #include <ghoul/fmt.h>
-
 #include <algorithm>
 #include <numeric>
 
+namespace {
+    void renderHost() {
+        const size_t nConnections = openspace::global::parallelPeer->nConnections();
+
+        std::string connectionInfo;
+        const size_t nClients = nConnections - 1;
+        if (nClients == 1) {
+            connectionInfo = "Hosting session with 1 client";
+        }
+        else {
+            connectionInfo = fmt::format("Hosting session with {} clients", nClients);
+        }
+
+        ImGui::Text("%s", connectionInfo.c_str());
+
+        const bool resignHostship = ImGui::Button("Resign hostship");
+        if (resignHostship) {
+            openspace::global::parallelPeer->resignHostship();
+        }
+    }
+} // namespace
+
 namespace openspace::gui {
 
 GuiParallelComponent::GuiParallelComponent()
@@ -70,12 +90,14 @@ void GuiParallelComponent::renderClientWithHost() {
     const size_t nClients = nConnections - 1;
 
     if (nClients > 2) {
-        std::string c = std::to_string(nClients - 1);
-        connectionInfo += "You and " + c + " more clients are connected";
+        connectionInfo += fmt::format(
+            "You and {} more clients are connected", nClients - 1
+        );
     }
     else if (nClients == 2) {
-        std::string c = std::to_string(nClients - 1);
-        connectionInfo += "You and " + c + " more client are connected";
+        connectionInfo += fmt::format(
+            "You and {} more client are connected", nClients - 1
+        );
     }
     else if (nClients == 1) {
         connectionInfo += "You are the only client";
@@ -88,11 +110,15 @@ void GuiParallelComponent::renderClientWithHost() {
     const size_t nCameraKeyframes =
         global::navigationHandler->keyframeNavigator().nKeyframes();
 
-    std::string timeKeyframeInfo = "TimeKeyframes : " + std::to_string(nTimeKeyframes);
-    std::string cameraKeyframeInfo = "CameraKeyframes : " +
-                                     std::to_string(nCameraKeyframes);
-    std::string latencyStandardDeviation = "Latency standard deviation: " +
-                               std::to_string(parallel.latencyStandardDeviation()) + " s";
+    const std::string timeKeyframeInfo = fmt::format(
+        "TimeKeyframes: {}", nTimeKeyframes
+    );
+    const std::string cameraKeyframeInfo = fmt::format(
+        "CameraKeyframes: {}", nCameraKeyframes
+    );
+    const std::string latencyStandardDeviation = fmt::format(
+        "Latency standard deviation: {} s", parallel.latencyStandardDeviation()
+    );
 
     const bool resetTimeOffset = ImGui::Button("Reset time offset");
 
@@ -110,12 +136,14 @@ void GuiParallelComponent::renderClientWithoutHost() {
     const size_t nConnections = global::parallelPeer->nConnections();
 
     if (nConnections > 2) {
-        std::string c = std::to_string(nConnections - 1);
-        connectionInfo += "You and " + c + " more users are connected";
+        connectionInfo += fmt::format(
+            "You and {} more users are connected", nConnections - 1
+        );
     }
     else if (nConnections == 2) {
-        std::string c = std::to_string(nConnections - 1);
-        connectionInfo += "You and " + c + " more users are connected";
+        connectionInfo += fmt::format(
+            "You and {} more users are connected", nConnections - 1
+        );
     }
     else if (nConnections == 1) {
         connectionInfo += "You are the only one here";
@@ -138,26 +166,6 @@ void GuiParallelComponent::renderClientCommon() {
     }
 }
 
-void GuiParallelComponent::renderHost() {
-    const size_t nConnections = global::parallelPeer->nConnections();
-
-    std::string connectionInfo;
-    const size_t nClients = nConnections - 1;
-    if (nClients == 1) {
-        connectionInfo = "Hosting session with 1 client";
-    }
-    else {
-        connectionInfo = "Hosting session with " + std::to_string(nClients) + " clients";
-    }
-
-    ImGui::Text("%s", connectionInfo.c_str());
-
-    const bool resignHostship = ImGui::Button("Resign hostship");
-    if (resignHostship) {
-        global::parallelPeer->resignHostship();
-    }
-}
-
 void GuiParallelComponent::render() {
     ImGui::SetNextWindowCollapsed(_isCollapsed);
     bool v = _isEnabled;
@@ -165,7 +173,7 @@ void GuiParallelComponent::render() {
     _isEnabled = v;
     _isCollapsed = ImGui::IsWindowCollapsed();
 
-    ParallelConnection::Status status = global::parallelPeer->status();
+    const ParallelConnection::Status status = global::parallelPeer->status();
 
     switch (status) {
         case ParallelConnection::Status::Disconnected:
diff --git a/modules/imgui/src/guipropertycomponent.cpp b/modules/imgui/src/guipropertycomponent.cpp
index a497c2280a..6725f15668 100644
--- a/modules/imgui/src/guipropertycomponent.cpp
+++ b/modules/imgui/src/guipropertycomponent.cpp
@@ -59,14 +59,15 @@ namespace {
 
     int nVisibleProperties(const std::vector<openspace::properties::Property*>& props)
     {
-        using Visibility = openspace::properties::Property::Visibility;
-        Visibility visibilityFilter = openspace::global::openSpaceEngine->visibility();
+        using namespace openspace;
+        using Visibility = properties::Property::Visibility;
+        const Visibility visibilityFilter = global::openSpaceEngine->visibility();
 
         return static_cast<int>(std::count_if(
             props.begin(),
             props.end(),
-            [visibilityFilter](openspace::properties::Property* p) {
-                using V = openspace::properties::Property::Visibility;
+            [visibilityFilter](properties::Property* p) {
+                using V = properties::Property::Visibility;
                 return static_cast<std::underlying_type_t<V>>(visibilityFilter) >=
                        static_cast<std::underlying_type_t<V>>(p->visibility());
             }
@@ -124,7 +125,7 @@ namespace {
             }
         );
 
-        TreeNode* n;
+        TreeNode* n = nullptr;
         if (it != node.children.end()) {
             // We have a child, so we use it
             n = it->get();
@@ -216,7 +217,7 @@ void GuiPropertyComponent::renderPropertyOwner(properties::PropertyOwner* owner)
     const std::vector<PropertyOwner*>& subOwners = owner->propertySubOwners();
     for (PropertyOwner* subOwner : subOwners) {
         const std::vector<Property*>& properties = subOwner->propertiesRecursive();
-        int count = nVisibleProperties(properties);
+        const int count = nVisibleProperties(properties);
         if (count == 0) {
             continue;
         }
@@ -312,25 +313,25 @@ void GuiPropertyComponent::render() {
             owners.begin(),
             owners.end(),
             [&ordering](PropertyOwner* lhs, PropertyOwner* rhs) {
-                std::string lhsGroup = dynamic_cast<SceneGraphNode*>(lhs)->guiPath();
-                std::string rhsGroup = dynamic_cast<SceneGraphNode*>(rhs)->guiPath();
+                const std::string lhsGrp = dynamic_cast<SceneGraphNode*>(lhs)->guiPath();
+                const std::string rhsGrp = dynamic_cast<SceneGraphNode*>(rhs)->guiPath();
 
-                if (lhsGroup.empty()) {
+                if (lhsGrp.empty()) {
                     return false;
                 }
-                if (rhsGroup.empty()) {
+                if (rhsGrp.empty()) {
                     return true;
                 }
 
                 if (ordering.empty()) {
-                    return lhsGroup < rhsGroup;
+                    return lhsGrp < rhsGrp;
                 }
 
-                std::vector<std::string> lhsToken = ghoul::tokenizeString(lhsGroup, '/');
+                std::vector<std::string> lhsToken = ghoul::tokenizeString(lhsGrp, '/');
                 // The first token is always empty
                 auto lhsIt = std::find(ordering.begin(), ordering.end(), lhsToken[1]);
 
-                std::vector<std::string> rhsToken = ghoul::tokenizeString(rhsGroup, '/');
+                std::vector<std::string> rhsToken = ghoul::tokenizeString(rhsGrp, '/');
                 // The first token is always empty
                 auto rhsIt = std::find(ordering.begin(), ordering.end(), rhsToken[1]);
 
@@ -341,7 +342,7 @@ void GuiPropertyComponent::render() {
                         return lhsIt < rhsIt;
                     }
                     else {
-                        return lhsGroup < rhsGroup;
+                        return lhsGrp < rhsGrp;
                     }
                 }
                 else if (lhsIt != ordering.end() && rhsIt == ordering.end()) {
@@ -352,7 +353,7 @@ void GuiPropertyComponent::render() {
                     return false;
                 }
                 else {
-                    return lhsGroup < rhsGroup;
+                    return lhsGrp < rhsGrp;
                 }
             }
         );
@@ -409,7 +410,8 @@ void GuiPropertyComponent::render() {
                 // We know that we are done now since we stable_sort:ed them above
                 break;
             }
-            std::vector<std::string> paths = ghoul::tokenizeString(gui.substr(1), '/');
+            const std::vector<std::string> paths =
+                ghoul::tokenizeString(gui.substr(1), '/');
             addPathToTree(root, paths, nOwner);
         }
 
@@ -469,7 +471,7 @@ void GuiPropertyComponent::renderProperty(properties::Property* prop,
     // Check if the visibility of the property is high enough to be displayed
     using V = properties::Property::Visibility;
     using Visibility = openspace::properties::Property::Visibility;
-    Visibility visibilityFilter = openspace::global::openSpaceEngine->visibility();
+    const Visibility visibilityFilter = openspace::global::openSpaceEngine->visibility();
     const auto v = static_cast<std::underlying_type_t<V>>(visibilityFilter);
     const auto propV = static_cast<std::underlying_type_t<V>>(prop->visibility());
     if (v >= propV) {
diff --git a/modules/imgui/src/guiscenecomponent.cpp b/modules/imgui/src/guiscenecomponent.cpp
index 6f5e089d89..57817bb47b 100644
--- a/modules/imgui/src/guiscenecomponent.cpp
+++ b/modules/imgui/src/guiscenecomponent.cpp
@@ -44,7 +44,7 @@ namespace {
         using namespace openspace;
 
         if (ImGui::TreeNode(node.identifier().c_str())) {
-            std::vector<SceneGraphNode*> children = node.children();
+            const std::vector<SceneGraphNode*> children = node.children();
             for (SceneGraphNode* c : children) {
                 renderSceneGraphNode(*c, time);
             }
@@ -67,8 +67,8 @@ namespace {
                 bool isReady = renderable->isReady();
                 ImGui::Checkbox("Is Ready", &isReady);
 
-                Renderable::RenderBin bin = renderable->renderBin();
-                std::string binStr = [](Renderable::RenderBin b) {
+                const Renderable::RenderBin bin = renderable->renderBin();
+                const std::string binStr = [](Renderable::RenderBin b) {
                     switch (b) {
                         case Renderable::RenderBin::Background:
                             return "Background";
diff --git a/modules/imgui/src/guispacetimecomponent.cpp b/modules/imgui/src/guispacetimecomponent.cpp
index 37fd88a89d..15844b7985 100644
--- a/modules/imgui/src/guispacetimecomponent.cpp
+++ b/modules/imgui/src/guispacetimecomponent.cpp
@@ -201,7 +201,7 @@ void GuiSpaceTimeComponent::render() {
 
     constexpr int BufferSize = 256;
     static char Buffer[BufferSize];
-    bool dateChanged = ImGui::InputText(
+    const bool dateChanged = ImGui::InputText(
         "Change Date",
         Buffer,
         BufferSize,
@@ -211,7 +211,7 @@ void GuiSpaceTimeComponent::render() {
         // No sync or send because time settings are always synced and sent to the
         // connected nodes and peers
         global::scriptEngine->queueScript(
-            "openspace.time.setTime(\"" + std::string(Buffer) + "\")",
+            fmt::format("openspace.time.setTime([[{}]])", std::string_view(Buffer)),
             scripting::ScriptEngine::ShouldBeSynchronized::No,
             scripting::ScriptEngine::ShouldSendToRemote::No
         );
@@ -357,7 +357,7 @@ void GuiSpaceTimeComponent::render() {
             convertTime(dt, TimeUnit::Second, _deltaTimeUnit)
         );
 
-        bool valueChanged = ImGui::InputFloat(
+        const bool valueChanged = ImGui::InputFloat(
             "##inputValueDeltaTime",
             &_deltaTime,
             1.f,
@@ -368,7 +368,7 @@ void GuiSpaceTimeComponent::render() {
         ImGui::SameLine();
 
         int deltaTimeUnit = static_cast<int>(_deltaTimeUnit);
-        bool unitChanged = ImGui::Combo(
+        const bool unitChanged = ImGui::Combo(
             "##inputUnit",
             &deltaTimeUnit,
             _timeUnits.c_str()
@@ -377,8 +377,11 @@ void GuiSpaceTimeComponent::render() {
 
         if (valueChanged) {
             // If the value changed, we want to change the delta time to the new value
-
-            double newDt = convertTime(_deltaTime, _deltaTimeUnit, TimeUnit::Second);
+            const double newDt = convertTime(
+                _deltaTime,
+                _deltaTimeUnit,
+                TimeUnit::Second
+            );
 
             // No sync or send because time settings are always synced and sent
             // to the connected nodes and peers
@@ -454,7 +457,7 @@ void GuiSpaceTimeComponent::render() {
         }
     }
     else {
-        bool accelerationDeltaChanged = ImGui::SliderFloat(
+        const bool accelerationDeltaChanged = ImGui::SliderFloat(
             "Delta Time Slider",
             &_accelerationDelta,
             -100.f,
diff --git a/modules/imgui/src/renderproperties.cpp b/modules/imgui/src/renderproperties.cpp
index 5bd850bc21..bb90409c85 100644
--- a/modules/imgui/src/renderproperties.cpp
+++ b/modules/imgui/src/renderproperties.cpp
@@ -175,11 +175,10 @@ void renderSelectionProperty(Property* prop, const std::string& ownerName,
         bool selectionChanged = false;
         std::set<std::string> newSelected;
 
-        std::set<std::string> selected = p->value();
+        const std::set<std::string> selected = p->value();
         const std::vector<std::string>& options = p->options();
 
-        for (int i = 0; i < static_cast<int>(options.size()); i++) {
-            const std::string key = options[i];
+        for (const std::string& key : options) {
             bool isSelected = p->isSelected(key);
 
             selectionChanged |= ImGui::Checkbox(key.c_str(), &isSelected);
@@ -218,14 +217,14 @@ void renderStringProperty(Property* prop, const std::string& ownerName,
 
     const std::string value = p->value();
 
-    static constexpr int bufferSize = 256;
-    static char buffer[bufferSize];
+    static constexpr int BufferSize = 256;
+    static std::array<char, BufferSize> buffer;
 #ifdef _MSC_VER
-    strcpy_s(buffer, value.length() + 1, value.c_str());
+    strcpy_s(buffer.data(), value.length() + 1, value.c_str());
 #else
-    strcpy(buffer, value.c_str());
+    strcpy(buffer.data(), value.c_str());
 #endif
-    bool hasNewValue = ImGui::InputText(name.c_str(), buffer, bufferSize);
+    const bool hasNewValue = ImGui::InputText(name.c_str(), buffer.data(), BufferSize);
     if (showTooltip) {
         renderTooltip(prop, tooltipDelay);
     }
@@ -233,7 +232,7 @@ void renderStringProperty(Property* prop, const std::string& ownerName,
     if (hasNewValue) {
         executeSetPropertyScript(
             p->fullyQualifiedIdentifier(),
-            "[[" + std::string(buffer) + "]]"
+            "[[" + std::string(buffer.data()) + "]]"
         );
     }
 
@@ -249,19 +248,19 @@ void renderListProperty(const std::string& name, const std::string& fullIdentifi
     );
 
     // Remove brackets from the string value
-    std::string value = stringValue.substr(1, stringValue.size() - 2);
+    const std::string value = stringValue.substr(1, stringValue.size() - 2);
 
-    static const int bufferSize = 512;
-    static char buffer[bufferSize];
+    static constexpr int BufferSize = 512;
+    static std::array<char, BufferSize> buffer;
 #ifdef _MSC_VER
-    strcpy_s(buffer, value.length() + 1, value.c_str());
+    strcpy_s(buffer.data(), value.length() + 1, value.c_str());
 #else
-    strcpy(buffer, value.c_str());
+    strcpy(buffer.data(), value.c_str());
 #endif
 
-    bool hasNewValue = ImGui::InputText(name.c_str(), buffer, bufferSize);
+    const bool hasNewValue = ImGui::InputText(name.c_str(), buffer.data(), BufferSize);
     if (hasNewValue) {
-        std::vector<std::string> tokens = ghoul::tokenizeString(std::string(buffer), ',');
+        std::vector<std::string> tokens = ghoul::tokenizeString(buffer.data(), ',');
         std::string script = "{";
         for (std::string& token : tokens) {
             if (!token.empty()) {
@@ -271,7 +270,7 @@ void renderListProperty(const std::string& name, const std::string& fullIdentifi
         }
         script += '}';
 
-        executeSetPropertyScript(fullIdentifier, std::move(script));
+        executeSetPropertyScript(fullIdentifier, script);
     }
 }
 
@@ -283,7 +282,7 @@ void renderDoubleListProperty(Property* prop, const std::string& ownerName,
     const std::string& name = p->guiName();
     ImGui::PushID((ownerName + '.' + name).c_str());
 
-    std::string value = p->stringValue();
+    const std::string value = p->stringValue();
     renderListProperty(name, p->fullyQualifiedIdentifier(), value);
 
     if (showTooltip) {
@@ -301,7 +300,7 @@ void renderIntListProperty(Property* prop, const std::string& ownerName,
     const std::string& name = p->guiName();
     ImGui::PushID((ownerName + '.' + name).c_str());
 
-    std::string value = p->stringValue();
+    const std::string value = p->stringValue();
     renderListProperty(name, p->fullyQualifiedIdentifier(), value);
 
     if (showTooltip) {
@@ -319,7 +318,7 @@ void renderStringListProperty(Property* prop, const std::string& ownerName,
     const std::string& name = p->guiName();
     ImGui::PushID((ownerName + '.' + name).c_str());
 
-    std::string value = p->stringValue();
+    const std::string value = p->stringValue();
     renderListProperty(name, p->fullyQualifiedIdentifier(), value);
 
     if (showTooltip) {
@@ -334,7 +333,7 @@ void renderDoubleProperty(properties::Property* prop, const std::string& ownerNa
 {
     ghoul_assert(prop, "prop must not be nullptr");
     DoubleProperty* p = static_cast<DoubleProperty*>(prop);
-    std::string name = p->guiName();
+    const std::string& name = p->guiName();
     ImGui::PushID((ownerName + '.' + name).c_str());
 
     float value = static_cast<float>(*p);
@@ -346,7 +345,7 @@ void renderDoubleProperty(properties::Property* prop, const std::string& ownerNa
     min = std::max(min, std::numeric_limits<float>::min() / 2.f);
     max = std::min(max, std::numeric_limits<float>::max() / 2.f);
 
-    bool changed = ImGui::SliderFloat(
+    const bool changed = ImGui::SliderFloat(
         name.c_str(),
         &value,
         min,
@@ -370,14 +369,14 @@ void renderIntProperty(Property* prop, const std::string& ownerName,
 {
     ghoul_assert(prop, "prop must not be nullptr");
     IntProperty* p = static_cast<IntProperty*>(prop);
-    std::string name = p->guiName();
+    const std::string& name = p->guiName();
     ImGui::PushID((ownerName + '.' + name).c_str());
 
     IntProperty::ValueType value = *p;
-    int min = p->minValue();
-    int max = p->maxValue();
+    const int min = p->minValue();
+    const int max = p->maxValue();
 
-    bool changed = ImGui::SliderInt(name.c_str(), &value, min, max);
+    const bool changed = ImGui::SliderInt(name.c_str(), &value, min, max);
     if (showTooltip) {
         renderTooltip(prop, tooltipDelay);
     }
@@ -394,13 +393,13 @@ void renderIVec2Property(Property* prop, const std::string& ownerName,
 {
     ghoul_assert(prop, "prop must not be nullptr");
     IVec2Property* p = static_cast<IVec2Property*>(prop);
-    std::string name = p->guiName();
+    const std::string& name = p->guiName();
     ImGui::PushID((ownerName + '.' + name).c_str());
 
     IVec2Property::ValueType value = *p;
-    int min = glm::compMin(p->minValue());
-    int max = glm::compMax(p->maxValue());
-    bool changed = ImGui::SliderInt2(name.c_str(), &value.x, min, max);
+    const int min = glm::compMin(p->minValue());
+    const int max = glm::compMax(p->maxValue());
+    const bool changed = ImGui::SliderInt2(name.c_str(), &value.x, min, max);
     if (showTooltip) {
         renderTooltip(prop, tooltipDelay);
     }
@@ -417,14 +416,13 @@ void renderIVec3Property(Property* prop, const std::string& ownerName,
 {
     ghoul_assert(prop, "prop must not be nullptr");
     IVec3Property* p = static_cast<IVec3Property*>(prop);
-    std::string name = p->guiName();
+    const std::string& name = p->guiName();
     ImGui::PushID((ownerName + '.' + name).c_str());
 
     IVec3Property::ValueType value = *p;
-    int min = glm::compMin(p->minValue());
-    int max = glm::compMax(p->maxValue());
-
-    bool changed = ImGui::SliderInt3(name.c_str(), &value.x, min, max);
+    const int min = glm::compMin(p->minValue());
+    const int max = glm::compMax(p->maxValue());
+    const bool changed = ImGui::SliderInt3(name.c_str(), &value.x, min, max);
     if (showTooltip) {
         renderTooltip(prop, tooltipDelay);
     }
@@ -440,14 +438,13 @@ void renderIVec4Property(Property* prop, const std::string& ownerName,
 {
     ghoul_assert(prop, "prop must not be nullptr");
     IVec4Property* p = static_cast<IVec4Property*>(prop);
-    std::string name = p->guiName();
+    const std::string& name = p->guiName();
     ImGui::PushID((ownerName + '.' + name).c_str());
 
     IVec4Property::ValueType value = *p;
-    int min = glm::compMin(p->minValue());
-    int max = glm::compMax(p->maxValue());
-
-    bool changed = ImGui::SliderInt4(name.c_str(), &value.x, min, max);
+    const int min = glm::compMin(p->minValue());
+    const int max = glm::compMax(p->maxValue());
+    const bool changed = ImGui::SliderInt4(name.c_str(), &value.x, min, max);
     if (showTooltip) {
         renderTooltip(prop, tooltipDelay);
     }
@@ -463,13 +460,13 @@ void renderFloatProperty(Property* prop, const std::string& ownerName,
 {
     ghoul_assert(prop, "prop must not be nullptr");
     FloatProperty* p = static_cast<FloatProperty*>(prop);
-    std::string name = p->guiName();
+    const std::string& name = p->guiName();
     ImGui::PushID((ownerName + '.' + name).c_str());
 
     FloatProperty::ValueType value = *p;
-    float min = p->minValue();
-    float max = p->maxValue();
-    bool changed = ImGui::SliderFloat(
+    const float min = p->minValue();
+    const float max = p->maxValue();
+    const bool changed = ImGui::SliderFloat(
         name.c_str(),
         &value,
         min,
@@ -493,14 +490,13 @@ void renderVec2Property(Property* prop, const std::string& ownerName,
 {
     ghoul_assert(prop, "prop must not be nullptr");
     Vec2Property* p = static_cast<Vec2Property*>(prop);
-    std::string name = p->guiName();
+    const std::string& name = p->guiName();
     ImGui::PushID((ownerName + '.' + name).c_str());
 
     Vec2Property::ValueType value = *p;
-    float min = glm::compMin(p->minValue());
-    float max = glm::compMax(p->maxValue());
-
-    bool changed = ImGui::SliderFloat2(
+    const float min = glm::compMin(p->minValue());
+    const float max = glm::compMax(p->maxValue());
+    const bool changed = ImGui::SliderFloat2(
         name.c_str(),
         &value.x,
         min,
@@ -524,13 +520,12 @@ void renderVec3Property(Property* prop, const std::string& ownerName,
 {
     ghoul_assert(prop, "prop must not be nullptr");
     Vec3Property* p = static_cast<Vec3Property*>(prop);
-    std::string name = p->guiName();
+    const std::string& name = p->guiName();
     ImGui::PushID((ownerName + '.' + name).c_str());
 
     Vec3Property::ValueType value = *p;
-    float min = glm::compMin(p->minValue());
-    float max = glm::compMax(p->maxValue());
-
+    const float min = glm::compMin(p->minValue());
+    const float max = glm::compMax(p->maxValue());
     bool changed = false;
     if (prop->viewOption(Property::ViewOptions::Color)) {
         changed = ImGui::ColorEdit3(name.c_str(), glm::value_ptr(value));
@@ -561,13 +556,12 @@ void renderVec4Property(Property* prop, const std::string& ownerName,
 {
     ghoul_assert(prop, "prop must not be nullptr");
     Vec4Property* p = static_cast<Vec4Property*>(prop);
-    std::string name = p->guiName();
+    const std::string& name = p->guiName();
     ImGui::PushID((ownerName + '.' + name).c_str());
 
     Vec4Property::ValueType value = *p;
-    float min = glm::compMin(p->minValue());
-    float max = glm::compMax(p->maxValue());
-
+    const float min = glm::compMin(p->minValue());
+    const float max = glm::compMax(p->maxValue());
     bool changed = false;
     if (prop->viewOption(Property::ViewOptions::Color)) {
         changed = ImGui::ColorEdit4(name.c_str(), glm::value_ptr(value));
@@ -598,13 +592,13 @@ void renderDVec2Property(Property* prop, const std::string& ownerName,
 {
     ghoul_assert(prop, "prop must not be nullptr");
     DVec2Property* p = static_cast<DVec2Property*>(prop);
-    std::string name = p->guiName();
+    const std::string& name = p->guiName();
     ImGui::PushID((ownerName + '.' + name).c_str());
 
     glm::vec2 value = glm::dvec2(*p);
-    float min = static_cast<float>(glm::compMin(p->minValue()));
-    float max = static_cast<float>(glm::compMax(p->maxValue()));
-    bool changed = ImGui::SliderFloat2(
+    const float min = static_cast<float>(glm::compMin(p->minValue()));
+    const float max = static_cast<float>(glm::compMax(p->maxValue()));
+    const bool changed = ImGui::SliderFloat2(
         name.c_str(),
         &value.x,
         min,
@@ -628,14 +622,13 @@ void renderDVec3Property(Property* prop, const std::string& ownerName,
 {
     ghoul_assert(prop, "prop must not be nullptr");
     DVec3Property* p = static_cast<DVec3Property*>(prop);
-    std::string name = p->guiName();
+    const std::string& name = p->guiName();
     ImGui::PushID((ownerName + '.' + name).c_str());
 
     glm::vec3 value = glm::dvec3(*p);
-    float min = static_cast<float>(glm::compMin(p->minValue()));
-    float max = static_cast<float>(glm::compMax(p->maxValue()));
-
-    bool changed = ImGui::SliderFloat3(
+    const float min = static_cast<float>(glm::compMin(p->minValue()));
+    const float max = static_cast<float>(glm::compMax(p->maxValue()));
+    const bool changed = ImGui::SliderFloat3(
         name.c_str(),
         glm::value_ptr(value),
         min,
@@ -659,14 +652,13 @@ void renderDVec4Property(Property* prop, const std::string& ownerName,
 {
     ghoul_assert(prop, "prop must not be nullptr");
     DVec4Property* p = static_cast<DVec4Property*>(prop);
-    std::string name = p->guiName();
+    const std::string& name = p->guiName();
     ImGui::PushID((ownerName + '.' + name).c_str());
 
     glm::vec4 value = glm::dvec4(*p);
-    float min = static_cast<float>(glm::compMin(p->minValue()));
-    float max = static_cast<float>(glm::compMax(p->maxValue()));
-
-    bool changed = ImGui::SliderFloat4(
+    const float min = static_cast<float>(glm::compMin(p->minValue()));
+    const float max = static_cast<float>(glm::compMax(p->maxValue()));
+    const bool changed = ImGui::SliderFloat4(
         name.c_str(),
         &value.x,
         min,
@@ -691,22 +683,22 @@ void renderDMat2Property(Property* prop, const std::string& ownerName,
     ghoul_assert(prop, "prop must not be nullptr");
     DMat2Property* p = static_cast<DMat2Property*>(prop);
 
-    std::string name = p->guiName();
+    const std::string& name = p->guiName();
     ImGui::PushID((ownerName + '.' + name).c_str());
     ImGui::Text("%s", name.c_str());
 
     glm::mat2 value = glm::dmat2(*p);
-    glm::dvec2 minValues = glm::dvec2(
+    const glm::dvec2 minValues = glm::dvec2(
         glm::compMin(p->minValue()[0]),
         glm::compMin(p->minValue()[1])
     );
-    float min = static_cast<float>(glm::compMin(minValues));
+    const float min = static_cast<float>(glm::compMin(minValues));
 
-    glm::dvec2 maxValues = glm::dvec2(
+    const glm::dvec2 maxValues = glm::dvec2(
         glm::compMax(p->maxValue()[0]),
         glm::compMax(p->maxValue()[1])
     );
-    float max = static_cast<float>(glm::compMax(maxValues));
+    const float max = static_cast<float>(glm::compMax(maxValues));
 
     bool changed = false;
     changed |= ImGui::SliderFloat2(
@@ -743,24 +735,24 @@ void renderDMat3Property(Property* prop, const std::string& ownerName,
     ghoul_assert(prop, "prop must not be nullptr");
     DMat3Property* p = static_cast<DMat3Property*>(prop);
 
-    std::string name = p->guiName();
+    const std::string& name = p->guiName();
     ImGui::PushID((ownerName + '.' + name).c_str());
     ImGui::Text("%s", name.c_str());
 
     glm::mat3 value = glm::dmat3(*p);
-    glm::dvec3 minValues = glm::dvec3(
+    const glm::dvec3 minValues = glm::dvec3(
         glm::compMin(p->minValue()[0]),
         glm::compMin(p->minValue()[1]),
         glm::compMin(p->minValue()[2])
     );
-    float min = static_cast<float>(glm::compMin(minValues));
+    const float min = static_cast<float>(glm::compMin(minValues));
 
-    glm::dvec3 maxValues = glm::dvec3(
+    const glm::dvec3 maxValues = glm::dvec3(
         glm::compMax(p->maxValue()[0]),
         glm::compMax(p->maxValue()[1]),
         glm::compMax(p->maxValue()[2])
     );
-    float max = static_cast<float>(glm::compMax(maxValues));
+    const float max = static_cast<float>(glm::compMax(maxValues));
 
     bool changed = false;
     changed |= ImGui::SliderFloat3(
@@ -805,26 +797,26 @@ void renderDMat4Property(Property* prop, const std::string& ownerName,
     ghoul_assert(prop, "prop must not be nullptr");
     DMat4Property* p = static_cast<DMat4Property*>(prop);
 
-    std::string name = p->guiName();
+    const std::string& name = p->guiName();
     ImGui::PushID((ownerName + '.' + name).c_str());
     ImGui::Text("%s", name.c_str());
 
     glm::mat4 value = glm::dmat4(*p);
-    glm::dvec4 minValues = glm::dvec4(
+    const glm::dvec4 minValues = glm::dvec4(
         glm::compMin(p->minValue()[0]),
         glm::compMin(p->minValue()[1]),
         glm::compMin(p->minValue()[2]),
         glm::compMin(p->minValue()[3])
     );
-    float min = static_cast<float>(glm::compMin(minValues));
+    const float min = static_cast<float>(glm::compMin(minValues));
 
-    glm::dvec4 maxValues = glm::dvec4(
+    const glm::dvec4 maxValues = glm::dvec4(
         glm::compMax(p->maxValue()[0]),
         glm::compMax(p->maxValue()[1]),
         glm::compMax(p->maxValue()[2]),
         glm::compMax(p->maxValue()[3])
     );
-    float max = static_cast<float>(glm::compMax(maxValues));
+    const float max = static_cast<float>(glm::compMax(maxValues));
 
     bool changed = false;
     changed |= ImGui::SliderFloat4(
@@ -875,10 +867,10 @@ void renderTriggerProperty(Property* prop, const std::string& ownerName,
                            ShowToolTip showTooltip, double tooltipDelay)
 {
     ghoul_assert(prop, "prop must not be nullptr");
-    std::string name = prop->guiName();
+    const std::string& name = prop->guiName();
     ImGui::PushID((ownerName + '.' + name).c_str());
 
-    bool pressed = ImGui::Button(name.c_str());
+    const bool pressed = ImGui::Button(name.c_str());
     if (pressed) {
         executeSetPropertyScript(prop->fullyQualifiedIdentifier(), "nil");
     }
diff --git a/modules/iswa/util/dataprocessor.cpp b/modules/iswa/util/dataprocessor.cpp
index 1384afc98e..edda318d45 100644
--- a/modules/iswa/util/dataprocessor.cpp
+++ b/modules/iswa/util/dataprocessor.cpp
@@ -110,13 +110,13 @@ void DataProcessor::initializeVectors(int numOptions) {
         _max = std::vector<float>(numOptions, std::numeric_limits<float>::min());
     }
     if (_sum.empty()) {
-        _sum = std::vector<float>(numOptions, 0.0f);
+        _sum = std::vector<float>(numOptions, 0.f);
     }
     if (_standardDeviation.empty()) {
-        _standardDeviation = std::vector<float>(numOptions, 0.0f);
+        _standardDeviation = std::vector<float>(numOptions, 0.f);
     }
     if (_numValues.empty()) {
-        _numValues = std::vector<float>(numOptions, 0.0f);
+        _numValues = std::vector<float>(numOptions, 0.f);
     }
     if (_histograms.empty()) {
         _histograms.clear();
diff --git a/modules/iswa/util/iswamanager.cpp b/modules/iswa/util/iswamanager.cpp
index 7a2197ff1a..7dd7108247 100644
--- a/modules/iswa/util/iswamanager.cpp
+++ b/modules/iswa/util/iswamanager.cpp
@@ -434,7 +434,7 @@ std::string IswaManager::parseKWToLuaTable(const CdfInfo& info, const std::strin
         }
         else {
             spatialScale = glm::vec4(1.f);
-            spatialScale.w = 1; //-log10(1.0f/max.x);
+            spatialScale.w = 1; //-log10(1.f/max.x);
             coordinateType = "Polar";
         }
 
diff --git a/modules/kameleonvolume/tasks/kameleondocumentationtask.cpp b/modules/kameleonvolume/tasks/kameleondocumentationtask.cpp
index 136d4ea0c4..9993c8db9d 100644
--- a/modules/kameleonvolume/tasks/kameleondocumentationtask.cpp
+++ b/modules/kameleonvolume/tasks/kameleondocumentationtask.cpp
@@ -151,7 +151,7 @@ void KameleonDocumentationTask::perform(const Task::ProgressCallback & progressC
 
     file << html.str();
 
-    progressCallback(1.0f);
+    progressCallback(1.f);
 }
 
 } // namespace openspace::kameleonvolume
diff --git a/modules/kameleonvolume/tasks/kameleonmetadatatojsontask.cpp b/modules/kameleonvolume/tasks/kameleonmetadatatojsontask.cpp
index 00069bae93..833a046885 100644
--- a/modules/kameleonvolume/tasks/kameleonmetadatatojsontask.cpp
+++ b/modules/kameleonvolume/tasks/kameleonmetadatatojsontask.cpp
@@ -72,7 +72,7 @@ void KameleonMetadataToJsonTask::perform(const Task::ProgressCallback& progressC
     std::string json = ghoul::formatJson(dictionary);
     std::ofstream output(_outputPath);
     output << std::move(json);
-    progressCallback(1.0f);
+    progressCallback(1.f);
 }
 
 } // namespace openspace::kameleonvolume
diff --git a/modules/kameleonvolume/tasks/kameleonvolumetorawtask.cpp b/modules/kameleonvolume/tasks/kameleonvolumetorawtask.cpp
index 09c5658d9a..f6ca029cbc 100644
--- a/modules/kameleonvolume/tasks/kameleonvolumetorawtask.cpp
+++ b/modules/kameleonvolume/tasks/kameleonvolumetorawtask.cpp
@@ -158,11 +158,10 @@ void KameleonVolumeToRawTask::perform(const Task::ProgressCallback& progressCall
 
     std::string metadataString = ghoul::formatLua(outputMetadata);
 
-    std::fstream f(_dictionaryOutputPath, std::ios::out);
+    std::fstream f = std::fstream(_dictionaryOutputPath, std::ios::out);
     f << "return " << metadataString;
-    f.close();
 
-    progressCallback(1.0f);
+    progressCallback(1.f);
 }
 
 } // namespace openspace::kameleonvolume
diff --git a/modules/multiresvolume/rendering/multiresvolumeraycaster.cpp b/modules/multiresvolume/rendering/multiresvolumeraycaster.cpp
index b460b59513..64ad947e1c 100644
--- a/modules/multiresvolume/rendering/multiresvolumeraycaster.cpp
+++ b/modules/multiresvolume/rendering/multiresvolumeraycaster.cpp
@@ -100,7 +100,7 @@ void MultiresVolumeRaycaster::preRaycast(const RaycastData& data,
                                          ghoul::opengl::ProgramObject& program)
 {
     std::string id = std::to_string(data.id);
-    //program.setUniform("opacity_" + std::to_string(id), visible ? 1.0f : 0.0f);
+    //program.setUniform("opacity_" + std::to_string(id), visible ? 1.f : 0.f);
     program.setUniform("stepSizeCoefficient_" + id, _stepSizeCoefficient);
 
     _tfUnit = std::make_unique<ghoul::opengl::TextureUnit>();
diff --git a/modules/multiresvolume/rendering/renderablemultiresvolume.cpp b/modules/multiresvolume/rendering/renderablemultiresvolume.cpp
index cf3ec17421..614757096e 100644
--- a/modules/multiresvolume/rendering/renderablemultiresvolume.cpp
+++ b/modules/multiresvolume/rendering/renderablemultiresvolume.cpp
@@ -581,7 +581,7 @@ void RenderableMultiresVolume::preResolve(ghoul::opengl::ProgramObject* program)
 
     std::stringstream ss;
     ss << "opacity_" << getId();
-    program->setUniform(ss.str(), visible ? 1.0f : 0.0f);
+    program->setUniform(ss.str(), visible ? 1.f : 0.f);
 
     ss.str(std::string());
     ss << "stepSizeCoefficient_" << getId();
diff --git a/modules/server/include/serverinterface.h b/modules/server/include/serverinterface.h
index 66ffb0d4d9..090d18514b 100644
--- a/modules/server/include/serverinterface.h
+++ b/modules/server/include/serverinterface.h
@@ -42,7 +42,7 @@ public:
         const ghoul::Dictionary& dictionary);
 
     ServerInterface(const ghoul::Dictionary& dictionary);
-    virtual ~ServerInterface() override;
+    virtual ~ServerInterface() override = default;
 
     void initialize();
     void deinitialize();
diff --git a/modules/server/include/topics/luascripttopic.h b/modules/server/include/topics/luascripttopic.h
index c26814e584..d12f729687 100644
--- a/modules/server/include/topics/luascripttopic.h
+++ b/modules/server/include/topics/luascripttopic.h
@@ -35,7 +35,7 @@ public:
     bool isDone() const override;
 
 private:
-    void runScript(std::string script, bool returnValue, bool shouldBeSynchronized);
+    void runScript(std::string script, bool shouldReturn, bool shouldBeSynchronized);
 
     bool _waitingForReturnValue = true;
 };
diff --git a/modules/server/include/topics/timetopic.h b/modules/server/include/topics/timetopic.h
index 16f8a6c34e..9c5534ccb3 100644
--- a/modules/server/include/topics/timetopic.h
+++ b/modules/server/include/topics/timetopic.h
@@ -41,7 +41,7 @@ public:
 private:
     static constexpr int UnsetOnChangeHandle = -1;
 
-    const nlohmann::json getNextPrevDeltaTimeStepJson();
+    nlohmann::json getNextPrevDeltaTimeStepJson();
 
     void sendCurrentTime();
     void sendFullTimeData();
diff --git a/modules/server/servermodule.cpp b/modules/server/servermodule.cpp
index dec3c0042c..aebcaf068f 100644
--- a/modules/server/servermodule.cpp
+++ b/modules/server/servermodule.cpp
@@ -96,9 +96,10 @@ void ServerModule::internalInitialize(const ghoul::Dictionary& configuration) {
     if (!configuration.hasValue<ghoul::Dictionary>(KeyInterfaces)) {
         return;
     }
-    ghoul::Dictionary interfaces = configuration.value<ghoul::Dictionary>(KeyInterfaces);
+    const ghoul::Dictionary interfaces =
+        configuration.value<ghoul::Dictionary>(KeyInterfaces);
 
-    for (std::string_view key : interfaces.keys()) {
+    for (const std::string_view key : interfaces.keys()) {
         ghoul::Dictionary interfaceDictionary = interfaces.value<ghoul::Dictionary>(key);
 
         // @TODO (abock, 2019-09-17);  This is a hack to make the parsing of the
@@ -143,7 +144,7 @@ void ServerModule::preSync() {
 
         std::unique_ptr<ghoul::io::Socket> socket;
         while ((socket = socketServer->nextPendingSocket())) {
-            std::string address = socket->address();
+            const std::string address = socket->address();
             if (serverInterface->clientIsBlocked(address)) {
                 // Drop connection if the address is blocked.
                 continue;
@@ -200,7 +201,7 @@ void ServerModule::disconnectAll() {
         serverInterface->deinitialize();
     }
 
-    for (ConnectionData& connectionData : _connections) {
+    for (const ConnectionData& connectionData : _connections) {
         Connection& connection = *connectionData.connection;
         if (connection.socket() && connection.socket()->isConnected()) {
             connection.socket()->disconnect(
@@ -210,13 +211,13 @@ void ServerModule::disconnectAll() {
     }
 }
 
-void ServerModule::handleConnection(std::shared_ptr<Connection> connection) {
+void ServerModule::handleConnection(const std::shared_ptr<Connection>& connection) {
     ZoneScoped;
 
     std::string messageString;
     messageString.reserve(256);
     while (connection->socket()->getMessage(messageString)) {
-        std::lock_guard lock(_messageQueueMutex);
+        const std::lock_guard lock(_messageQueueMutex);
         _messageQueue.push_back({ connection, messageString });
     }
 }
@@ -224,19 +225,18 @@ void ServerModule::handleConnection(std::shared_ptr<Connection> connection) {
 void ServerModule::consumeMessages() {
     ZoneScoped;
 
-    std::lock_guard lock(_messageQueueMutex);
+    const std::lock_guard lock(_messageQueueMutex);
     while (!_messageQueue.empty()) {
         const Message& m = _messageQueue.front();
-        if (std::shared_ptr<Connection> c = m.connection.lock()) {
+        if (const std::shared_ptr<Connection>& c = m.connection.lock()) {
             c->handleMessage(m.messageString);
         }
         _messageQueue.pop_front();
     }
 }
 
-ServerModule::CallbackHandle ServerModule::addPreSyncCallback(CallbackFunction cb)
-{
-    CallbackHandle handle = _nextCallbackHandle++;
+ServerModule::CallbackHandle ServerModule::addPreSyncCallback(CallbackFunction cb) {
+    const CallbackHandle handle = _nextCallbackHandle++;
     _preSyncCallbacks.emplace_back(handle, std::move(cb));
     return handle;
 }
diff --git a/modules/server/servermodule.h b/modules/server/servermodule.h
index aa59142948..3bf7823a11 100644
--- a/modules/server/servermodule.h
+++ b/modules/server/servermodule.h
@@ -71,7 +71,7 @@ private:
         bool isMarkedForRemoval = false;
     };
 
-    void handleConnection(std::shared_ptr<Connection> connection);
+    void handleConnection(const std::shared_ptr<Connection>& connection);
     void cleanUpFinishedThreads();
     void consumeMessages();
     void disconnectAll();
diff --git a/modules/server/src/connection.cpp b/modules/server/src/connection.cpp
index 3465a58ec7..41526cfb34 100644
--- a/modules/server/src/connection.cpp
+++ b/modules/server/src/connection.cpp
@@ -109,7 +109,7 @@ void Connection::handleMessage(const std::string& message) {
     ZoneScoped;
 
     try {
-        nlohmann::json j = nlohmann::json::parse(message.c_str());
+        const nlohmann::json j = nlohmann::json::parse(message.c_str());
         try {
             handleJson(j);
         }
@@ -122,7 +122,8 @@ void Connection::handleMessage(const std::string& message) {
     }
     catch (const std::exception& e) {
         LERROR(e.what());
-    } catch (...) {
+    }
+    catch (...) {
         if (!isAuthorized()) {
             _socket->disconnect();
             LERROR(fmt::format(
@@ -131,18 +132,17 @@ void Connection::handleMessage(const std::string& message) {
             ));
             return;
         }
-        else {
-            std::string sanitizedString = message;
-            std::transform(
-                message.begin(),
-                message.end(),
-                sanitizedString.begin(),
-                [](wchar_t c) {
-                    return std::isprint(c, std::locale("")) ? char(c) : ' ';
-                }
-            );
-            LERROR(fmt::format("Could not parse JSON '{}'", sanitizedString));
-        }
+
+        std::string sanitizedString = message;
+        std::transform(
+            message.begin(),
+            message.end(),
+            sanitizedString.begin(),
+            [](wchar_t c) {
+                return std::isprint(c, std::locale("")) ? char(c) : ' ';
+            }
+        );
+        LERROR(fmt::format("Could not parse JSON '{}'", sanitizedString));
     }
 }
 
@@ -163,7 +163,7 @@ void Connection::handleJson(const nlohmann::json& json) {
     }
 
     // The topic id may be an already discussed topic, or a new one.
-    TopicId topicId = *topicJson;
+    const TopicId topicId = *topicJson;
     auto topicIt = _topics.find(topicId);
 
     if (topicIt == _topics.end()) {
@@ -173,9 +173,9 @@ void Connection::handleJson(const nlohmann::json& json) {
             LERROR("Type must be specified as a string when a new topic is initialized");
             return;
         }
-        std::string type = *typeJson;
+        const std::string type = *typeJson;
 
-        if (!isAuthorized() && type != "authorize") {
+        if (!isAuthorized() && (type != "authorize")) {
             LERROR("Connection is not authorized");
             return;
         }
diff --git a/modules/server/src/connectionpool.cpp b/modules/server/src/connectionpool.cpp
index ae4078ea3f..69136581d7 100644
--- a/modules/server/src/connectionpool.cpp
+++ b/modules/server/src/connectionpool.cpp
@@ -65,7 +65,7 @@ void ConnectionPool::updateConnections() {
 }
 
 void ConnectionPool::acceptNewSockets() {
-    for (std::shared_ptr<ghoul::io::SocketServer>& server : _socketServers) {
+    for (const std::shared_ptr<ghoul::io::SocketServer>& server : _socketServers) {
         std::unique_ptr<ghoul::io::Socket> socket;
         while ((socket = server->nextPendingSocket())) {
             _handleSocket(*socket);
diff --git a/modules/server/src/jsonconverters.cpp b/modules/server/src/jsonconverters.cpp
index ae62f728e8..3481455972 100644
--- a/modules/server/src/jsonconverters.cpp
+++ b/modules/server/src/jsonconverters.cpp
@@ -34,10 +34,10 @@ using json = nlohmann::json;
 namespace openspace::properties {
 
 void to_json(json& j, const Property& p) {
-    std::string description = p.generateJsonDescription();
+    const std::string description = p.generateJsonDescription();
     json desc = json::parse(description);
 
-    std::string value = p.jsonValue();
+    const std::string value = p.jsonValue();
     json val = json::parse(value);
 
     j = {
@@ -72,8 +72,8 @@ namespace ghoul {
 
 void to_json(json& j, const Dictionary& dictionary) {
     json object;
-    for (std::string_view k : dictionary.keys()) {
-        std::string key = std::string(k);
+    for (const std::string_view k : dictionary.keys()) {
+        const std::string key = std::string(k);
         if (dictionary.hasValue<glm::dvec4>(key)) {
             const glm::dvec4 v = dictionary.value<glm::dvec4>(key);
             object[key] = json::array({ v[0], v[1], v[2], v[3] });
diff --git a/modules/server/src/serverinterface.cpp b/modules/server/src/serverinterface.cpp
index 4c080721f2..4679ed9414 100644
--- a/modules/server/src/serverinterface.cpp
+++ b/modules/server/src/serverinterface.cpp
@@ -99,14 +99,14 @@ namespace {
 namespace openspace {
 
 std::unique_ptr<ServerInterface> ServerInterface::createFromDictionary(
-                                                          const ghoul::Dictionary& config)
+                                                      const ghoul::Dictionary& dictionary)
 {
     // TODO: Use documentation to verify dictionary
-    auto si = std::make_unique<ServerInterface>(config);
+    auto si = std::make_unique<ServerInterface>(dictionary);
     return si;
 }
 
-ServerInterface::ServerInterface(const ghoul::Dictionary& config)
+ServerInterface::ServerInterface(const ghoul::Dictionary& dictionary)
     : properties::PropertyOwner({ "", "", "" })
     , _socketType(TypeInfo)
     , _port(PortInfo, 0)
@@ -140,8 +140,10 @@ ServerInterface::ServerInterface(const ghoul::Dictionary& config)
         std::string(AllowAccess)
     );
 
-    if (config.hasKey(DefaultAccessInfo.identifier)) {
-        std::string access = config.value<std::string>(DefaultAccessInfo.identifier);
+    if (dictionary.hasKey(DefaultAccessInfo.identifier)) {
+        const std::string access = dictionary.value<std::string>(
+            DefaultAccessInfo.identifier
+        );
         if (access == DenyAccess) {
             _defaultAccess.setValue(static_cast<int>(Access::Deny));
         }
@@ -153,14 +155,14 @@ ServerInterface::ServerInterface(const ghoul::Dictionary& config)
         }
     }
 
-    const std::string identifier = config.value<std::string>(KeyIdentifier);
+    const std::string identifier = dictionary.value<std::string>(KeyIdentifier);
 
     auto readList =
-        [config](const std::string& key, properties::StringListProperty& list) {
-            if (config.hasValue<ghoul::Dictionary>(key)) {
-                const ghoul::Dictionary& dict = config.value<ghoul::Dictionary>(key);
+        [dictionary](const std::string& key, properties::StringListProperty& list) {
+            if (dictionary.hasValue<ghoul::Dictionary>(key)) {
+                const ghoul::Dictionary& dict = dictionary.value<ghoul::Dictionary>(key);
                 std::vector<std::string> v;
-                for (std::string_view k : dict.keys()) {
+                for (const std::string_view k : dict.keys()) {
                     v.push_back(dict.value<std::string>(k));
                 }
                 list = v;
@@ -175,7 +177,7 @@ ServerInterface::ServerInterface(const ghoul::Dictionary& config)
     setGuiName(identifier);
     setDescription("Settings for server interface " + identifier);
 
-    const std::string type = config.value<std::string>(TypeInfo.identifier);
+    const std::string type = dictionary.value<std::string>(TypeInfo.identifier);
     if (type == TcpSocketType) {
         _socketType = static_cast<int>(InterfaceType::TcpSocket);
     }
@@ -183,12 +185,12 @@ ServerInterface::ServerInterface(const ghoul::Dictionary& config)
         _socketType = static_cast<int>(InterfaceType::WebSocket);
     }
 
-    if (config.hasValue<std::string>(PasswordInfo.identifier)) {
-        _password = config.value<std::string>(PasswordInfo.identifier);
+    if (dictionary.hasValue<std::string>(PasswordInfo.identifier)) {
+        _password = dictionary.value<std::string>(PasswordInfo.identifier);
     }
 
-    _port = static_cast<int>(config.value<double>(PortInfo.identifier));
-    _enabled = config.value<bool>(EnabledInfo.identifier);
+    _port = static_cast<int>(dictionary.value<double>(PortInfo.identifier));
+    _enabled = dictionary.value<bool>(EnabledInfo.identifier);
 
     auto reinitialize = [this]() {
         deinitialize();
@@ -213,8 +215,6 @@ ServerInterface::ServerInterface(const ghoul::Dictionary& config)
     addProperty(_password);
 }
 
-ServerInterface::~ServerInterface() {}
-
 void ServerInterface::initialize() {
     if (!_enabled) {
         return;
@@ -258,7 +258,7 @@ bool ServerInterface::clientHasAccessWithoutPassword(
             return true;
         }
     }
-    Access access = static_cast<Access>(_defaultAccess.value());
+    const Access access = static_cast<Access>(_defaultAccess.value());
     if (access == Access::Allow) {
         for (const std::string& address : _denyAddresses.value()) {
             if (clientAddress == address) {
@@ -276,7 +276,7 @@ bool ServerInterface::clientIsBlocked(const std::string& clientAddress) const {
             return true;
         }
     }
-    Access access = static_cast<Access>(_defaultAccess.value());
+    const Access access = static_cast<Access>(_defaultAccess.value());
     if (access == Access::Deny) {
         for (const std::string& address : _allowAddresses.value()) {
             if (clientAddress == address) {
diff --git a/modules/server/src/topics/authorizationtopic.cpp b/modules/server/src/topics/authorizationtopic.cpp
index 3684412af3..946fc6c3ab 100644
--- a/modules/server/src/topics/authorizationtopic.cpp
+++ b/modules/server/src/topics/authorizationtopic.cpp
@@ -54,7 +54,7 @@ void AuthorizationTopic::handleJson(const nlohmann::json& json) {
     }
     else {
         try {
-            std::string providedKey = json.at("key").get<std::string>();
+            const std::string providedKey = json.at("key").get<std::string>();
             if (authorize(providedKey)) {
                 _connection->setAuthorized(true);
                 _connection->sendJson(wrappedPayload({ KeyStatus, Authorized }));
diff --git a/modules/server/src/topics/camerapathtopic.cpp b/modules/server/src/topics/camerapathtopic.cpp
index 54c6c579dd..7662530fc4 100644
--- a/modules/server/src/topics/camerapathtopic.cpp
+++ b/modules/server/src/topics/camerapathtopic.cpp
@@ -60,7 +60,7 @@ bool CameraPathTopic::isDone() const {
 }
 
 void CameraPathTopic::handleJson(const nlohmann::json& json) {
-    std::string event = json.at("event").get<std::string>();
+    const std::string event = json.at("event").get<std::string>();
 
     if (event != SubscribeEvent) {
         _isDone = true;
@@ -70,10 +70,10 @@ void CameraPathTopic::handleJson(const nlohmann::json& json) {
     ServerModule* module = global::moduleEngine->module<ServerModule>();
     _dataCallbackHandle = module->addPreSyncCallback(
         [this]() {
-            bool isInPath = (global::openSpaceEngine->currentMode()
+            const bool isInPath =(global::openSpaceEngine->currentMode()
                 == OpenSpaceEngine::Mode::CameraPath);
 
-            std::chrono::system_clock::time_point now = std::chrono::system_clock::now();
+            const auto now = std::chrono::system_clock::now();
             if (isInPath && (now - _lastUpdateTime) > _cameraPathUpdateTime) {
                 sendCameraPathData();
                 _lastUpdateTime = std::chrono::system_clock::now();
@@ -100,7 +100,7 @@ void CameraPathTopic::sendCameraPathData() {
     );
     seconds = std::max(seconds, 0);
 
-    nlohmann::json jsonData = {
+    const nlohmann::json jsonData = {
         { "target", path->endPoint().nodeIdentifier() },
         { "remainingTime", seconds },
         //{ "remainingDistance", path->remainingDistance() },
diff --git a/modules/server/src/topics/cameratopic.cpp b/modules/server/src/topics/cameratopic.cpp
index c6690eb077..9e10c80518 100644
--- a/modules/server/src/topics/cameratopic.cpp
+++ b/modules/server/src/topics/cameratopic.cpp
@@ -59,7 +59,7 @@ bool CameraTopic::isDone() const {
 }
 
 void CameraTopic::handleJson(const nlohmann::json& json) {
-    std::string event = json.at("event").get<std::string>();
+    const std::string event = json.at("event").get<std::string>();
 
     if (event != SubscribeEvent) {
         _isDone = true;
@@ -69,7 +69,7 @@ void CameraTopic::handleJson(const nlohmann::json& json) {
     ServerModule* module = global::moduleEngine->module<ServerModule>();
     _dataCallbackHandle = module->addPreSyncCallback(
         [this]() {
-            std::chrono::system_clock::time_point now = std::chrono::system_clock::now();
+            const auto now = std::chrono::system_clock::now();
             if (now - _lastUpdateTime > _cameraPositionUpdateTime) {
                 sendCameraData();
                 _lastUpdateTime = std::chrono::system_clock::now();
@@ -83,7 +83,7 @@ void CameraTopic::sendCameraData() {
     glm::dvec3 position = module->geoPosition();
     std::pair<double, std::string_view> altSimplified = simplifyDistance(position.z);
 
-    nlohmann::json jsonData = {
+    const nlohmann::json jsonData = {
         { "latitude", position.x },
         { "longitude", position.y },
         { "altitude", altSimplified.first },
diff --git a/modules/server/src/topics/documentationtopic.cpp b/modules/server/src/topics/documentationtopic.cpp
index 247736e67c..61161528f2 100644
--- a/modules/server/src/topics/documentationtopic.cpp
+++ b/modules/server/src/topics/documentationtopic.cpp
@@ -39,7 +39,7 @@ using nlohmann::json;
 namespace openspace {
 
 void DocumentationTopic::handleJson(const nlohmann::json& json) {
-    std::string requestedType = json.at("type").get<std::string>();
+    const std::string requestedType = json.at("type").get<std::string>();
 
     nlohmann::json response;
 
diff --git a/modules/server/src/topics/enginemodetopic.cpp b/modules/server/src/topics/enginemodetopic.cpp
index 8f4cfdb2d2..ce4450b5a1 100644
--- a/modules/server/src/topics/enginemodetopic.cpp
+++ b/modules/server/src/topics/enginemodetopic.cpp
@@ -75,11 +75,10 @@ void EngineModeTopic::handleJson(const nlohmann::json& json) {
     if (event == SubscribeEvent) {
         _modeCallbackHandle = global::openSpaceEngine->addModeChangeCallback(
             [this]() {
-                OpenSpaceEngine::Mode currentMode =
-                    global::openSpaceEngine->currentMode();
-                if (currentMode != _lastMode) {
+                const OpenSpaceEngine::Mode mode = global::openSpaceEngine->currentMode();
+                if (mode != _lastMode) {
                     sendJsonData();
-                    _lastMode = currentMode;
+                    _lastMode = mode;
                 }
             }
         );
@@ -87,9 +86,7 @@ void EngineModeTopic::handleJson(const nlohmann::json& json) {
 }
 
 void EngineModeTopic::sendJsonData() {
-    json stateJson;
-
-    OpenSpaceEngine::Mode mode = global::openSpaceEngine->currentMode();
+    const OpenSpaceEngine::Mode mode = global::openSpaceEngine->currentMode();
     std::string modeString;
     switch (mode) {
         case OpenSpaceEngine::Mode::UserControl:
@@ -102,6 +99,8 @@ void EngineModeTopic::sendJsonData() {
             modeString = "camera_path";
             break;
     }
+
+    json stateJson;
     stateJson["mode"] = modeString;
 
     if (!stateJson.empty()) {
diff --git a/modules/server/src/topics/eventtopic.cpp b/modules/server/src/topics/eventtopic.cpp
index cc46202166..bb04159b15 100644
--- a/modules/server/src/topics/eventtopic.cpp
+++ b/modules/server/src/topics/eventtopic.cpp
@@ -74,7 +74,7 @@ void EventTopic::handleJson(const nlohmann::json& json) {
 
             for (uint8_t i = 0; i < lastEvent; i++) {
                 auto type = static_cast<events::Event::Type>(i);
-                events.push_back(std::string(events::toString(type)));
+                events.emplace_back(events::toString(type));
             }
         }
         else {
@@ -99,7 +99,7 @@ void EventTopic::handleJson(const nlohmann::json& json) {
             global::eventEngine->registerEventTopic(_topicId, type, onCallback);
         }
         else if (status == StopSubscription) {
-            events::Event::Type type = events::fromString(event);
+            const events::Event::Type type = events::fromString(event);
             _subscribedEvents.erase(type);
             global::eventEngine->unregisterEventTopic(_topicId, type);
         }
@@ -111,7 +111,7 @@ bool EventTopic::isSubscribed() const {
         return false;
     }
 
-    bool hasActiveSubscription = std::any_of(
+    const bool hasActiveSubscription = std::any_of(
         _subscribedEvents.begin(),
         _subscribedEvents.end(),
         [](const std::pair<const events::Event::Type, bool>& subscription) {
diff --git a/modules/server/src/topics/flightcontrollertopic.cpp b/modules/server/src/topics/flightcontrollertopic.cpp
index a646af53b0..f1b1e75fa7 100644
--- a/modules/server/src/topics/flightcontrollertopic.cpp
+++ b/modules/server/src/topics/flightcontrollertopic.cpp
@@ -118,7 +118,7 @@ namespace {
     constexpr const char* Friction = "friction";
     constexpr const char* Lua = "lua";
 
-    const static std::unordered_map<std::string, AxisType> AxisIndexMap ({
+    const std::unordered_map<std::string, AxisType> AxisIndexMap ({
         { OrbitX, AxisType::OrbitX },
         { OrbitY, AxisType::OrbitY },
         { ZoomIn, AxisType::ZoomIn },
@@ -131,7 +131,7 @@ namespace {
         { PanY, AxisType::PanY }
     });
 
-    const static std::unordered_map<std::string, Command> CommandMap ({
+    const std::unordered_map<std::string, Command> CommandMap ({
         { Connect, Command::Connect },
         { Disconnect, Command::Disconnect },
         { InputState, Command::InputState },
diff --git a/modules/server/src/topics/getpropertytopic.cpp b/modules/server/src/topics/getpropertytopic.cpp
index be96c0d54f..2bf2866c0c 100644
--- a/modules/server/src/topics/getpropertytopic.cpp
+++ b/modules/server/src/topics/getpropertytopic.cpp
@@ -52,7 +52,7 @@ namespace {
 namespace openspace {
 
 void GetPropertyTopic::handleJson(const nlohmann::json& json) {
-    std::string requestedKey = json.at("property").get<std::string>();
+    const std::string requestedKey = json.at("property").get<std::string>();
     LDEBUG("Getting property '" + requestedKey + "'...");
     nlohmann::json response;
     if (requestedKey == AllPropertiesValue) {
@@ -80,7 +80,7 @@ bool GetPropertyTopic::isDone() const {
 }
 
 json GetPropertyTopic::allProperties() {
-    json payload {
+    const json payload {
         {
             "value",
             {
diff --git a/modules/server/src/topics/luascripttopic.cpp b/modules/server/src/topics/luascripttopic.cpp
index 1cdbbf38c4..d4ab44aec3 100644
--- a/modules/server/src/topics/luascripttopic.cpp
+++ b/modules/server/src/topics/luascripttopic.cpp
@@ -137,38 +137,36 @@ namespace openspace {
 
 void LuaScriptTopic::handleJson(const nlohmann::json& json) {
     try {
-        nlohmann::json::const_iterator script = json.find(KeyScript);
-        nlohmann::json::const_iterator function = json.find(KeyFunction);
+        const auto script = json.find(KeyScript);
+        const auto function = json.find(KeyFunction);
 
         if (script != json.end() && script->is_string()) {
             std::string luaScript = script->get<std::string>();
-            nlohmann::json::const_iterator ret = json.find(KeyReturn);
-            bool shouldReturn = (ret != json.end()) &&
-                                 ret->is_boolean() &&
-                                 ret->get<bool>();
+            const auto ret = json.find(KeyReturn);
+            const bool shouldReturn =
+                (ret != json.end()) && ret->is_boolean() && ret->get<bool>();
 
-            nlohmann::json::const_iterator sync = json.find(KeyShouldBeSynchronized);
+            const auto sync = json.find(KeyShouldBeSynchronized);
             bool shouldBeSynchronized = true;
             if (sync != json.end() && sync->is_boolean()) {
                 shouldBeSynchronized = sync->get<bool>();
             }
 
-            runScript(luaScript, shouldReturn, shouldBeSynchronized);
+            runScript(std::move(luaScript), shouldReturn, shouldBeSynchronized);
         }
         else if (function != json.end() && function->is_string()) {
-            std::string luaFunction = function->get<std::string>();
-            nlohmann::json::const_iterator ret = json.find(KeyReturn);
-            bool shouldReturn = (ret != json.end()) &&
-                                 ret->is_boolean() &&
-                                 ret->get<bool>();
+            const std::string luaFunction = function->get<std::string>();
+            const auto ret = json.find(KeyReturn);
+            const bool shouldReturn =
+                (ret != json.end()) && ret->is_boolean() && ret->get<bool>();
 
-            nlohmann::json::const_iterator sync = json.find(KeyShouldBeSynchronized);
+            const auto sync = json.find(KeyShouldBeSynchronized);
             bool shouldBeSynchronized = true;
             if (sync != json.end() && sync->is_boolean()) {
                 shouldBeSynchronized = sync->get<bool>();
             }
 
-            nlohmann::json::const_iterator args = json.find(KeyArguments);
+            const nlohmann::json::const_iterator args = json.find(KeyArguments);
             if (!args->is_array()) {
                 return;
             }
@@ -180,7 +178,7 @@ void LuaScriptTopic::handleJson(const nlohmann::json& json) {
             }
 
             std::string luaScript = generateScript(luaFunction, formattedArgs);
-            runScript(luaScript, shouldReturn, shouldBeSynchronized);
+            runScript(std::move(luaScript), shouldReturn, shouldBeSynchronized);
         }
     }
     catch (const std::out_of_range& e) {
@@ -194,10 +192,9 @@ void LuaScriptTopic::runScript(std::string script, bool shouldReturn,
 {
     scripting::ScriptEngine::ScriptCallback callback;
     if (shouldReturn) {
-        callback = [this](ghoul::Dictionary data) {
+        callback = [this](const ghoul::Dictionary& data) {
             if (_connection) {
-                nlohmann::json j = data;
-                nlohmann::json payload = wrappedPayload(j);
+                const nlohmann::json payload = wrappedPayload(data);
                 _connection->sendJson(payload);
                 _waitingForReturnValue = false;
             }
diff --git a/modules/server/src/topics/missiontopic.cpp b/modules/server/src/topics/missiontopic.cpp
index 09a9a82a53..51489775d3 100644
--- a/modules/server/src/topics/missiontopic.cpp
+++ b/modules/server/src/topics/missiontopic.cpp
@@ -45,7 +45,7 @@ nlohmann::json MissionTopic::missionJson() const {
     const std::map<std::string, Mission>& missions =
         global::missionManager->missionMap();
 
-    ImageSequencer& sequencer = ImageSequencer::ref();
+    const ImageSequencer& sequencer = ImageSequencer::ref();
     const std::vector<double>& captureTimes = sequencer.captureProgression();
     std::vector<std::string> captureTimesString(captureTimes.size());
 
@@ -69,7 +69,7 @@ nlohmann::json MissionTopic::createPhaseJson(const MissionPhase& phase) const {
     json phases = json::array();
     for (const MissionPhase& missionPhase : phase.phases()) {
         json subphaseJson = createPhaseJson(missionPhase);
-        phases.push_back(subphaseJson);
+        phases.push_back(std::move(subphaseJson));
     }
 
     json milestones = json::array();
@@ -116,7 +116,7 @@ nlohmann::json MissionTopic::createPhaseJson(const MissionPhase& phase) const {
 }
 
 void MissionTopic::handleJson(const nlohmann::json&) {
-    nlohmann::json data = { {"missions", missionJson()} };
+    const nlohmann::json data = { {"missions", missionJson()} };
     _connection->sendJson(wrappedPayload(data));
 }
 
diff --git a/modules/server/src/topics/sessionrecordingtopic.cpp b/modules/server/src/topics/sessionrecordingtopic.cpp
index cd9d660edb..5b785a3e48 100644
--- a/modules/server/src/topics/sessionrecordingtopic.cpp
+++ b/modules/server/src/topics/sessionrecordingtopic.cpp
@@ -78,7 +78,8 @@ void SessionRecordingTopic::handleJson(const nlohmann::json& json) {
         if (!json.at(PropertiesKey).is_array()) {
             LERROR("Properties must be an array of strings");
         }
-        nlohmann::json requestedProperties = json.at(PropertiesKey).get<nlohmann::json>();
+        const nlohmann::json requestedProperties =
+            json.at(PropertiesKey).get<nlohmann::json>();
         for (const auto& p : requestedProperties) {
             if (!p.is_string()) {
                 _isDone = true;
@@ -100,7 +101,7 @@ void SessionRecordingTopic::handleJson(const nlohmann::json& json) {
     if (event == SubscribeEvent && _sendState) {
         _stateCallbackHandle = global::sessionRecording->addStateChangeCallback(
             [this]() {
-                interaction::SessionRecording::SessionState currentState =
+                const interaction::SessionRecording::SessionState currentState =
                     global::sessionRecording->state();
                 if (currentState != _lastState) {
                     sendJsonData();
@@ -113,9 +114,9 @@ void SessionRecordingTopic::handleJson(const nlohmann::json& json) {
 
 void SessionRecordingTopic::sendJsonData() {
     json stateJson;
-    using SessionRecording = openspace::interaction::SessionRecording;
+    using SessionRecording = interaction::SessionRecording;
     if (_sendState) {
-        SessionRecording::SessionState state = global::sessionRecording->state();
+        const SessionRecording::SessionState state = global::sessionRecording->state();
         std::string stateString;
         switch (state) {
             case SessionRecording::SessionState::Recording:
diff --git a/modules/server/src/topics/setpropertytopic.cpp b/modules/server/src/topics/setpropertytopic.cpp
index 67c0dc7869..12a34b3b4d 100644
--- a/modules/server/src/topics/setpropertytopic.cpp
+++ b/modules/server/src/topics/setpropertytopic.cpp
@@ -119,7 +119,7 @@ void SetPropertyTopic::handleJson(const nlohmann::json& json) {
             global::timeManager->setTimeNextFrame(newTime);
         }
         else {
-            nlohmann::json value = json.at("value");
+            const nlohmann::json value = json.at("value");
             std::string literal = luaLiteralFromJson(value);
 
             global::scriptEngine->queueScript(
diff --git a/modules/server/src/topics/shortcuttopic.cpp b/modules/server/src/topics/shortcuttopic.cpp
index a3ef7e12a2..7f99ec4d3f 100644
--- a/modules/server/src/topics/shortcuttopic.cpp
+++ b/modules/server/src/topics/shortcuttopic.cpp
@@ -55,7 +55,7 @@ std::vector<nlohmann::json> ShortcutTopic::shortcutsJson() const {
     );
 
     for (const interaction::Action& action : actions) {
-        nlohmann::json shortcutJson = {
+        const nlohmann::json shortcutJson = {
             { "identifier", action.identifier },
             { "name", action.name },
             { "script", action.command },
@@ -84,7 +84,7 @@ std::vector<nlohmann::json> ShortcutTopic::shortcutsJson() const {
             keyBinding.second
         );
 
-        nlohmann::json shortcutJson = {
+        const nlohmann::json shortcutJson = {
             { "key", ghoul::to_string(k.key) },
             { "modifiers",
                 {
@@ -102,7 +102,7 @@ std::vector<nlohmann::json> ShortcutTopic::shortcutsJson() const {
 }
 
 void ShortcutTopic::sendData() const {
-    nlohmann::json data = { {"shortcuts", shortcutsJson()} };
+    const nlohmann::json data = { {"shortcuts", shortcutsJson()} };
     _connection->sendJson(wrappedPayload(data));
 }
 
diff --git a/modules/server/src/topics/skybrowsertopic.cpp b/modules/server/src/topics/skybrowsertopic.cpp
index 28d04402c1..b4432b7bb7 100644
--- a/modules/server/src/topics/skybrowsertopic.cpp
+++ b/modules/server/src/topics/skybrowsertopic.cpp
@@ -66,7 +66,7 @@ bool SkyBrowserTopic::isDone() const {
 }
 
 void SkyBrowserTopic::handleJson(const nlohmann::json& json) {
-    std::string event = json.at("event").get<std::string>();
+    const std::string event = json.at("event").get<std::string>();
     if (event == UnsubscribeEvent) {
         _isDone = true;
         return;
@@ -80,7 +80,7 @@ void SkyBrowserTopic::handleJson(const nlohmann::json& json) {
     ServerModule* module = global::moduleEngine->module<ServerModule>();
     _targetDataCallbackHandle = module->addPreSyncCallback(
         [this]() {
-            std::chrono::system_clock::time_point now = std::chrono::system_clock::now();
+            const auto now = std::chrono::system_clock::now();
             if (now - _lastUpdateTime > _skyBrowserUpdateTime) {
                 sendBrowserData();
                 _lastUpdateTime = std::chrono::system_clock::now();
@@ -104,8 +104,8 @@ void SkyBrowserTopic::sendBrowserData() {
         const std::vector<std::unique_ptr<TargetBrowserPair>>& pairs = module->pairs();
         ghoul::Dictionary targets;
         for (const std::unique_ptr<TargetBrowserPair>& pair : pairs) {
-            std::string id = pair->browserId();
-            ghoul::Dictionary target = pair->dataAsDictionary();
+            const std::string id = pair->browserId();
+            const ghoul::Dictionary target = pair->dataAsDictionary();
             targets.setValue(id, target);
         }
         data.setValue("browsers", targets);
@@ -115,7 +115,7 @@ void SkyBrowserTopic::sendBrowserData() {
 
     // Only send message if data actually changed
     if (jsonString != _lastUpdateJsonString) {
-        json jsonData = json::parse(jsonString.begin(), jsonString.end());
+        const json jsonData = json::parse(jsonString.begin(), jsonString.end());
         _connection->sendJson(wrappedPayload(jsonData));
     }
 
diff --git a/modules/server/src/topics/timetopic.cpp b/modules/server/src/topics/timetopic.cpp
index 5496a0d29c..f34caff483 100644
--- a/modules/server/src/topics/timetopic.cpp
+++ b/modules/server/src/topics/timetopic.cpp
@@ -64,7 +64,7 @@ bool TimeTopic::isDone() const {
 }
 
 void TimeTopic::handleJson(const nlohmann::json& json) {
-    std::string event = json.at("event").get<std::string>();
+    const std::string event = json.at("event").get<std::string>();
     if (event == UnsubscribeEvent) {
         _isDone = true;
         return;
@@ -79,7 +79,7 @@ void TimeTopic::handleJson(const nlohmann::json& json) {
     }
 
     _timeCallbackHandle = global::timeManager->addTimeChangeCallback([this]() {
-        std::chrono::system_clock::time_point now = std::chrono::system_clock::now();
+        const auto now = std::chrono::system_clock::now();
         if (now - _lastUpdateTime > TimeUpdateInterval) {
             sendCurrentTime();
         }
@@ -89,7 +89,7 @@ void TimeTopic::handleJson(const nlohmann::json& json) {
         // Throttle by last update,
         // but force update if pause state or target delta changes.
 
-        std::chrono::system_clock::time_point now = std::chrono::system_clock::now();
+        const auto now = std::chrono::system_clock::now();
         const double targetDeltaTime = global::timeManager->targetDeltaTime();
         const bool isPaused = global::timeManager->isPaused();
         const bool forceUpdate =
@@ -110,7 +110,7 @@ void TimeTopic::handleJson(const nlohmann::json& json) {
     );
 }
 
-const json TimeTopic::getNextPrevDeltaTimeStepJson() {
+json TimeTopic::getNextPrevDeltaTimeStepJson() {
     const std::optional<double> nextStep = global::timeManager->nextDeltaTimeStep();
     const std::optional<double> prevStep = global::timeManager->previousDeltaTimeStep();
     const bool hasNext = nextStep.has_value();
diff --git a/modules/skybrowser/include/browser.h b/modules/skybrowser/include/browser.h
index 32348a24ac..900afc2ae9 100644
--- a/modules/skybrowser/include/browser.h
+++ b/modules/skybrowser/include/browser.h
@@ -100,9 +100,9 @@ private:
         void setTexture(GLuint t);
     };
 
-    std::unique_ptr<BrowserInstance> _browserInstance;
     CefRefPtr<RenderHandler> _renderHandler;
     CefRefPtr<WebKeyboardHandler> _keyboardHandler;
+    std::unique_ptr<BrowserInstance> _browserInstance;
 };
 
 } // namespace openspace
diff --git a/modules/skybrowser/include/targetbrowserpair.h b/modules/skybrowser/include/targetbrowserpair.h
index 48b265eedb..04366b6d12 100644
--- a/modules/skybrowser/include/targetbrowserpair.h
+++ b/modules/skybrowser/include/targetbrowserpair.h
@@ -45,7 +45,7 @@ public:
     void initialize();
 
     // Animation
-    void startAnimation(glm::dvec3 coordsEnd, double fovEnd);
+    void startAnimation(glm::dvec3 galacticCoords, double fovEnd);
     void incrementallyAnimateToCoordinate();
     void startFading(float goal, float fadeTime);
     void stopAnimations();
diff --git a/modules/skybrowser/include/utility.h b/modules/skybrowser/include/utility.h
index 170cefc93f..bb4ddbc3a2 100644
--- a/modules/skybrowser/include/utility.h
+++ b/modules/skybrowser/include/utility.h
@@ -200,7 +200,7 @@ glm::dmat4 incrementalAnimationMatrix(const glm::dvec3& start, const glm::dvec3&
  * \param worldPosition The galactic position of the plane
  * \return Field of view
  */
-double sizeFromFov(double fov, glm::dvec3 worldPosition);
+double sizeFromFov(double fov, const glm::dvec3& worldPosition);
 
 template <typename T>
 class Animation {
diff --git a/modules/skybrowser/include/wwtcommunicator.h b/modules/skybrowser/include/wwtcommunicator.h
index d62bb26c70..082486bf09 100644
--- a/modules/skybrowser/include/wwtcommunicator.h
+++ b/modules/skybrowser/include/wwtcommunicator.h
@@ -71,7 +71,7 @@ public:
 
 protected:
     void setIdInBrowser(const std::string& id) const;
-    SelectedImageDeque::iterator findSelectedImage(const std::string& id);
+    SelectedImageDeque::iterator findSelectedImage(const std::string& imageUrl);
 
     properties::DoubleProperty _verticalFov;
 
diff --git a/modules/skybrowser/skybrowsermodule.cpp b/modules/skybrowser/skybrowsermodule.cpp
index 3b3f852a53..27983cfe07 100644
--- a/modules/skybrowser/skybrowsermodule.cpp
+++ b/modules/skybrowser/skybrowsermodule.cpp
@@ -211,10 +211,10 @@ SkyBrowserModule::SkyBrowserModule()
         constexpr double SolarSystemRadius = 30.0 * distanceconstants::AstronomicalUnit;
 
         // Disable browser and targets when camera is outside of solar system
-        bool camWasInSolarSystem = _isCameraInSolarSystem;
-        glm::dvec3 cameraPos = global::navigationHandler->camera()->positionVec3();
+        const bool camWasInSolarSystem = _isCameraInSolarSystem;
+        const glm::dvec3 cameraPos = global::navigationHandler->camera()->positionVec3();
         _isCameraInSolarSystem = glm::length(cameraPos) < SolarSystemRadius;
-        bool vizModeChanged = _isCameraInSolarSystem != camWasInSolarSystem;
+        const bool vizModeChanged = _isCameraInSolarSystem != camWasInSolarSystem;
 
         // Visualization mode changed. Start fading in/out
         if (vizModeChanged) {
@@ -444,18 +444,18 @@ TargetBrowserPair* SkyBrowserModule::pair(std::string_view id) const {
     return found;
 }
 
-void SkyBrowserModule::startRotatingCamera(glm::dvec3 endAnimation) {
+void SkyBrowserModule::startRotatingCamera(const glm::dvec3& endAnimation) {
     // Save coordinates to rotate to in galactic world coordinates
-    glm::dvec3 start = skybrowser::cameraDirectionGalactic();
-    double angle = skybrowser::angleBetweenVectors(start, endAnimation);
-    double time = angle / _cameraRotationSpeed;
+    const glm::dvec3 start = skybrowser::cameraDirectionGalactic();
+    const double angle = skybrowser::angleBetweenVectors(start, endAnimation);
+    const double time = angle / _cameraRotationSpeed;
     _cameraRotation = skybrowser::Animation(start, endAnimation, time);
     _cameraRotation.start();
 }
 
 void SkyBrowserModule::incrementallyRotateCamera() {
     if (_cameraRotation.isAnimating()) {
-        glm::dmat4 rotMat = _cameraRotation.rotationMatrix();
+        const glm::dmat4 rotMat = _cameraRotation.rotationMatrix();
         global::navigationHandler->camera()->rotate(glm::quat_cast(rotMat));
     }
 }
diff --git a/modules/skybrowser/skybrowsermodule.h b/modules/skybrowser/skybrowsermodule.h
index 97b44fa65f..40006f2084 100644
--- a/modules/skybrowser/skybrowsermodule.h
+++ b/modules/skybrowser/skybrowsermodule.h
@@ -60,7 +60,9 @@ public:
 
     // Rotation, animation, placement
     void lookAtTarget(const std::string& id);
-    void startRotatingCamera(glm::dvec3 endAnimation); // Pass in galactic coordinate
+
+    // Pass in galactic coordinate
+    void startRotatingCamera(const glm::dvec3& endAnimation);
     double targetAnimationSpeed() const;
     double browserAnimationSpeed() const;
     double spaceCraftAnimationTime() const;
diff --git a/modules/skybrowser/src/browser.cpp b/modules/skybrowser/src/browser.cpp
index bf9918ffc2..a9db81735b 100644
--- a/modules/skybrowser/src/browser.cpp
+++ b/modules/skybrowser/src/browser.cpp
@@ -92,6 +92,11 @@ Browser::Browser(const ghoul::Dictionary& dictionary)
     )
     , _url(UrlInfo)
     , _reload(ReloadInfo)
+    , _renderHandler(new RenderHandler)
+    , _keyboardHandler(new WebKeyboardHandler)
+    , _browserInstance(
+        std::make_unique<BrowserInstance>(_renderHandler.get(), _keyboardHandler.get())
+    )
 {
     const Parameters p = codegen::bake<Parameters>(dictionary);
 
@@ -104,8 +109,6 @@ Browser::Browser(const ghoul::Dictionary& dictionary)
     _reload.onChange([this]() { _shouldReload = true; });
 
     // Create browser and render handler
-    _renderHandler = new RenderHandler();
-    _keyboardHandler = new WebKeyboardHandler();
     _browserInstance = std::make_unique<BrowserInstance>(
         _renderHandler.get(),
         _keyboardHandler.get()
@@ -189,10 +192,12 @@ void Browser::reload() {
 }
 
 void Browser::setRatio(float ratio) {
-    float relativeRatio = ratio / browserRatio();
-    float newX = static_cast<float>(_browserDimensions.value().x) * relativeRatio;
-    glm::ivec2 newDims = { static_cast<int>(floor(newX)), _browserDimensions.value().y };
-    _browserDimensions = newDims;
+    const float relativeRatio = ratio / browserRatio();
+    const float newX = static_cast<float>(_browserDimensions.value().x) * relativeRatio;
+    _browserDimensions = {
+        static_cast<int>(std::floor(newX)),
+        _browserDimensions.value().y
+    };
     _isDimensionsDirty = true;
 }
 
@@ -202,7 +207,7 @@ float Browser::browserRatio() const {
 }
 
 void Browser::updateBrowserDimensions() {
-    glm::ivec2 dim = _browserDimensions;
+    const glm::ivec2 dim = _browserDimensions;
     if (dim.x > 0 && dim.y > 0) {
         _texture->setDimensions(glm::uvec3(_browserDimensions.value(), 1));
         _browserInstance->reshape(dim);
@@ -212,11 +217,12 @@ void Browser::updateBrowserDimensions() {
 
 void Browser::executeJavascript(const std::string& script) const {
     // Make sure that the browser has a main frame
-    bool browserExists = _browserInstance && _browserInstance->getBrowser();
-    bool frameIsLoaded = browserExists && _browserInstance->getBrowser()->GetMainFrame();
+    const bool browserExists = _browserInstance && _browserInstance->getBrowser();
+    const bool frameIsLoaded =
+        browserExists && _browserInstance->getBrowser()->GetMainFrame();
 
     if (frameIsLoaded) {
-        CefRefPtr<CefFrame> frame = _browserInstance->getBrowser()->GetMainFrame();
+        const CefRefPtr<CefFrame> frame = _browserInstance->getBrowser()->GetMainFrame();
         frame->ExecuteJavaScript(script, frame->GetURL(), 0);
     }
 }
diff --git a/modules/skybrowser/src/renderableskytarget.cpp b/modules/skybrowser/src/renderableskytarget.cpp
index c28f1b1cc9..48d39e287e 100644
--- a/modules/skybrowser/src/renderableskytarget.cpp
+++ b/modules/skybrowser/src/renderableskytarget.cpp
@@ -173,20 +173,20 @@ glm::ivec3 RenderableSkyTarget::borderColor() const {
 }
 
 glm::dvec3 RenderableSkyTarget::rightVector() const {
-    double scaling =
-        (_verticalFov / 70) * static_cast<double>(glm::compMax(_size.value()));
+    const double scaling =
+        (_verticalFov / 70.0) * static_cast<double>(glm::compMax(_size.value()));
     return scaling * _rightVector;
 }
 
 glm::dvec3 RenderableSkyTarget::upVector() const {
-    double scaling =
-        (_verticalFov / 70) * static_cast<double>(glm::compMax(_size.value()));
+    const double scaling =
+        (_verticalFov / 70.0) * static_cast<double>(glm::compMax(_size.value()));
     return scaling * _upVector;
 }
 
 void RenderableSkyTarget::applyRoll() {
     Camera* camera = global::navigationHandler->camera();
-    glm::dvec3 normal = glm::normalize(camera->positionVec3() - _worldPosition);
+    const glm::dvec3 normal = glm::normalize(camera->positionVec3() - _worldPosition);
 
     _rightVector = glm::normalize(
         glm::cross(camera->lookUpVectorWorldSpace(), normal)
@@ -198,7 +198,7 @@ void RenderableSkyTarget::render(const RenderData& data, RendererTasks&) {
     ZoneScoped;
     const bool showRectangle = _verticalFov > _showRectangleThreshold;
 
-    glm::vec4 color = glm::vec4(glm::vec3(_borderColor) / 255.f, 1.0);
+    const glm::vec4 color = glm::vec4(glm::vec3(_borderColor) / 255.f, 1.0);
 
     _shader->activate();
     _shader->setUniform("opacity", opacity());
@@ -216,7 +216,7 @@ void RenderableSkyTarget::render(const RenderData& data, RendererTasks&) {
             data.modelTransform.translation) * glm::dvec4(0.0, 0.0, 0.0, 1.0)
     );
 
-    glm::dvec3 normal = glm::normalize(data.camera.positionVec3() - _worldPosition);
+    const glm::dvec3 normal = glm::normalize(data.camera.positionVec3() - _worldPosition);
     // There are two modes - 1) target rolls to have its up vector parallel to the
     // cameras up vector or 2) it is decoupled from the camera, in which case it needs to
     // be initialized once
@@ -253,7 +253,7 @@ void RenderableSkyTarget::render(const RenderData& data, RendererTasks&) {
 
     _shader->setUniform("multiplyColor", _multiplyColor);
 
-    bool additiveBlending = (_blendMode == static_cast<int>(BlendMode::Additive));
+    const bool additiveBlending = _blendMode == static_cast<int>(BlendMode::Additive);
     if (additiveBlending) {
         glDepthMask(false);
         glBlendFunc(GL_SRC_ALPHA, GL_ONE);
diff --git a/modules/skybrowser/src/screenspaceskybrowser.cpp b/modules/skybrowser/src/screenspaceskybrowser.cpp
index 30125c257f..1e03e88ebb 100644
--- a/modules/skybrowser/src/screenspaceskybrowser.cpp
+++ b/modules/skybrowser/src/screenspaceskybrowser.cpp
@@ -113,11 +113,10 @@ namespace {
         std::uniform_real_distribution<float> hue(0.f, 360.f);
 
         // Value in saturation are in the unit percent [0,1]
-        float value = 0.9f; // Brightness
-        float saturation = 0.5f;
-        glm::vec3 hsvColor = glm::vec3(hue(rd), saturation, value);
-        glm::ivec3 rgbColor = glm::ivec3(glm::rgbColor(hsvColor) * 255.f);
-
+        constexpr float Value = 0.9f; // Brightness
+        constexpr float Saturation = 0.5f;
+        const glm::vec3 hsvColor = glm::vec3(hue(rd), Saturation, Value);
+        const glm::ivec3 rgbColor = glm::ivec3(glm::rgbColor(hsvColor) * 255.f);
         return rgbColor;
     }
 } // namespace
@@ -140,6 +139,7 @@ ScreenSpaceSkyBrowser::ScreenSpaceSkyBrowser(const ghoul::Dictionary& dictionary
 
     // Handle target dimension property
     const Parameters p = codegen::bake<Parameters>(dictionary);
+
     _textureQuality = p.textureQuality.value_or(_textureQuality);
     _isHidden = p.isHidden.value_or(_isHidden);
     _isPointingSpacecraft = p.pointSpacecraft.value_or(_isPointingSpacecraft);
@@ -194,16 +194,16 @@ bool ScreenSpaceSkyBrowser::initializeGL() {
 
 glm::dvec2 ScreenSpaceSkyBrowser::fineTuneVector(const glm::dvec2& drag) {
     // Fine tuning of target
-    glm::dvec2 wwtFov = fieldsOfView();
-    glm::dvec2 openSpaceFOV = skybrowser::fovWindow();
+    const glm::dvec2 wwtFov = fieldsOfView();
+    const glm::dvec2 openSpaceFOV = skybrowser::fovWindow();
 
-    glm::dvec2 browserDim = screenSpaceDimensions();
-    glm::dvec2 angleResult = wwtFov * (drag / browserDim);
-    glm::dvec2 resultRelativeOs = angleResult / openSpaceFOV;
+    const glm::dvec2 browserDim = screenSpaceDimensions();
+    const glm::dvec2 angleResult = wwtFov * (drag / browserDim);
+    const glm::dvec2 resultRelativeOs = angleResult / openSpaceFOV;
 
     // Convert to screen space coordinate system
-    glm::dvec2 convertToScreenSpace = glm::dvec2((2.f * skybrowser::windowRatio()), 2.f);
-    glm::dvec2 result = -convertToScreenSpace * resultRelativeOs;
+    const glm::dvec2 screenSpace = glm::dvec2((2.f * skybrowser::windowRatio()), 2.f);
+    const glm::dvec2 result = -screenSpace * resultRelativeOs;
     return result;
 }
 
@@ -235,9 +235,9 @@ void ScreenSpaceSkyBrowser::setPointSpaceCraft(bool shouldPoint) {
 void ScreenSpaceSkyBrowser::updateTextureResolution() {
     // Check if texture quality has changed. If it has, adjust accordingly
     if (std::abs(_textureQuality.value() - _lastTextureQuality) > glm::epsilon<float>()) {
-        float diffTextureQuality = _textureQuality / _lastTextureQuality;
-        glm::vec2 newRes = glm::vec2(_browserDimensions.value()) * diffTextureQuality;
-        _browserDimensions = glm::ivec2(newRes);
+        const float diffTextureQuality = _textureQuality / _lastTextureQuality;
+        const glm::vec2 res = glm::vec2(_browserDimensions.value()) * diffTextureQuality;
+        _browserDimensions = glm::ivec2(res);
         _lastTextureQuality = _textureQuality.value();
     }
     _objectSize = glm::ivec3(_browserDimensions.value(), 1);
@@ -248,12 +248,14 @@ void ScreenSpaceSkyBrowser::updateTextureResolution() {
 }
 
 void ScreenSpaceSkyBrowser::addDisplayCopy(const glm::vec3& raePosition, int nCopies) {
-    size_t start = _displayCopies.size();
+    const size_t start = _displayCopies.size();
     for (int i = 0; i < nCopies; i++) {
         openspace::properties::Property::PropertyInfo info = DisplayCopyInfo;
-        float azimuth = i * glm::two_pi<float>() / nCopies;
-        glm::vec3 position = raePosition + glm::vec3(0.f, azimuth, 0.f);
-        std::string idDisplayCopy = "DisplayCopy" + std::to_string(start + i);
+        const float azimuth = i * glm::two_pi<float>() / nCopies;
+        const glm::vec3 position = raePosition + glm::vec3(0.f, azimuth, 0.f);
+        // @TODO(abock) I think the lifetime for this string is a bit tricky. I don't
+        // think it will live long enough to be actually usable
+        const std::string idDisplayCopy = "DisplayCopy" + std::to_string(start + i);
         info.identifier = idDisplayCopy.c_str();
         _displayCopies.push_back(
             std::make_unique<properties::Vec3Property>(
@@ -264,13 +266,12 @@ void ScreenSpaceSkyBrowser::addDisplayCopy(const glm::vec3& raePosition, int nCo
             )
         );
         openspace::properties::Property::PropertyInfo showInfo = DisplayCopyShowInfo;
-        std::string idDisplayCopyVisible = "ShowDisplayCopy" + std::to_string(start + i);
-        showInfo.identifier = idDisplayCopyVisible.c_str();
+        // @TODO(abock) I think the lifetime for this string is a bit tricky. I don't
+        // think it will live long enough to be actually usable
+        const std::string idDispCpyVis = "ShowDisplayCopy" + std::to_string(start + i);
+        showInfo.identifier = idDispCpyVis.c_str();
         _showDisplayCopies.push_back(
-            std::make_unique<properties::BoolProperty>(
-                showInfo,
-                true
-                )
+            std::make_unique<properties::BoolProperty>(showInfo, true)
         );
         addProperty(_displayCopies.back().get());
         addProperty(_showDisplayCopies.back().get());
@@ -290,9 +291,9 @@ std::vector<std::pair<std::string, glm::dvec3>>
 ScreenSpaceSkyBrowser::displayCopies() const
 {
     std::vector<std::pair<std::string, glm::dvec3>> vec;
-    using vec3Property = std::unique_ptr<properties::Vec3Property>;
-    for (const vec3Property& copy : _displayCopies) {
-        vec.push_back({ copy->identifier(), copy->value() });
+    vec.reserve(_displayCopies.size());
+    for (const std::unique_ptr<properties::Vec3Property>& copy : _displayCopies) {
+        vec.emplace_back(copy->identifier(), copy->value());
     }
     return vec;
 }
@@ -301,9 +302,9 @@ std::vector<std::pair<std::string, bool>>
 ScreenSpaceSkyBrowser::showDisplayCopies() const
 {
     std::vector<std::pair<std::string, bool>> vec;
-    using boolProperty = std::unique_ptr<properties::BoolProperty>;
-    for (const boolProperty& copy : _showDisplayCopies) {
-        vec.push_back({copy->identifier(), copy->value()});
+    vec.reserve(_showDisplayCopies.size());
+    for (const std::unique_ptr<properties::BoolProperty>& copy : _showDisplayCopies) {
+        vec.emplace_back(copy->identifier(), copy->value());
     }
     return vec;
 }
@@ -318,7 +319,7 @@ void ScreenSpaceSkyBrowser::render(float blackoutFactor) {
     WwtCommunicator::render();
 
     if (!_isHidden) {
-        glm::mat4 mat =
+        const glm::mat4 mat =
             globalRotationMatrix() *
             translationMatrix() *
             localRotationMatrix() *
@@ -342,7 +343,7 @@ void ScreenSpaceSkyBrowser::render(float blackoutFactor) {
                 ));
             }
 
-            glm::mat4 mat =
+            const glm::mat4 mat =
                 globalRotationMatrix() *
                 glm::translate(glm::mat4(1.f), coordinates) *
                 localRotation *
@@ -375,10 +376,12 @@ void ScreenSpaceSkyBrowser::update() {
 
 double ScreenSpaceSkyBrowser::setVerticalFovWithScroll(float scroll) {
     // Make scroll more sensitive the smaller the FOV
-    double x = _verticalFov;
-    double zoomFactor = atan(x / 50.0) + exp(x / 40.0) - 0.99999999999999999999999999999;
-    double zoom = scroll > 0.0 ? zoomFactor : -zoomFactor;
+    const double x = _verticalFov;
+    const double zoomFactor =
+        atan(x / 50.0) + exp(x / 40.0) - 0.99999999999999999999999999999;
+    const double zoom = scroll > 0.0 ? zoomFactor : -zoomFactor;
     _verticalFov = std::clamp(_verticalFov + zoom, 0.0, 70.0);
+
     return _verticalFov;
 }
 
diff --git a/modules/skybrowser/src/targetbrowserpair.cpp b/modules/skybrowser/src/targetbrowserpair.cpp
index d375948d91..e2a4ac1e70 100644
--- a/modules/skybrowser/src/targetbrowserpair.cpp
+++ b/modules/skybrowser/src/targetbrowserpair.cpp
@@ -41,11 +41,11 @@
 #include <chrono>
 
 namespace {
-    void aimTargetGalactic(std::string id, glm::dvec3 direction) {
-        glm::dvec3 positionCelestial = glm::normalize(direction) *
+    void aimTargetGalactic(std::string_view id, const glm::dvec3& direction) {
+        const glm::dvec3 positionCelestial = glm::normalize(direction) *
             openspace::skybrowser::CelestialSphereRadius;
 
-        std::string script = fmt::format(
+        const std::string script = fmt::format(
             "openspace.setPropertyValueSingle('Scene.{}.Translation.Position', {});",
             id, ghoul::to_string(positionCelestial)
         );
@@ -83,16 +83,16 @@ void TargetBrowserPair::startFinetuningTarget() {
 // drag on the sky browser window. This is to be able to drag the target around when it
 // has a very small field of view
 void TargetBrowserPair::fineTuneTarget(const glm::vec2& translation) {
-    glm::dvec2 percentage = glm::dvec2(translation);
-    glm::dvec3 right = _targetRenderable->rightVector() * percentage.x;
-    glm::dvec3 up = _targetRenderable->upVector() * percentage.y;
+    const glm::dvec2 percentage = glm::dvec2(translation);
+    const glm::dvec3 right = _targetRenderable->rightVector() * percentage.x;
+    const glm::dvec3 up = _targetRenderable->upVector() * percentage.y;
 
-    glm::dvec3 newPosition = _startTargetPosition - (right - up);
+    const glm::dvec3 newPosition = _startTargetPosition - (right - up);
     aimTargetGalactic(_targetNode->identifier(), newPosition);
 }
 
 void TargetBrowserPair::synchronizeAim() {
-    bool shouldUpdate =
+    const bool shouldUpdate =
         _browser->shouldUpdateWhileTargetAnimates() ||
         !_targetAnimation.isAnimating();
     if (shouldUpdate && _browser->isInitialized()) {
@@ -113,7 +113,7 @@ bool TargetBrowserPair::isEnabled() const {
 
 void TargetBrowserPair::initialize() {
     _targetRenderable->setColor(_browser->borderColor());
-    glm::vec2 dim = _browser->screenSpaceDimensions();
+    const glm::vec2 dim = _browser->screenSpaceDimensions();
     _targetRenderable->setRatio(dim.x / dim.y);
     _browser->updateBorderColor();
     _browser->hideChromeInterface();
@@ -125,7 +125,7 @@ glm::ivec3 TargetBrowserPair::borderColor() const {
 }
 
 glm::dvec2 TargetBrowserPair::targetDirectionEquatorial() const {
-    glm::dvec3 cartesian = skybrowser::galacticToEquatorial(
+    const glm::dvec3 cartesian = skybrowser::galacticToEquatorial(
         glm::normalize(_targetNode->worldPosition())
     );
     return skybrowser::cartesianToSpherical(cartesian);
@@ -164,13 +164,13 @@ std::vector<std::string> TargetBrowserPair::selectedImages() const {
 }
 
 ghoul::Dictionary TargetBrowserPair::dataAsDictionary() const {
-    glm::dvec2 spherical = targetDirectionEquatorial();
-    glm::dvec3 cartesian = skybrowser::sphericalToCartesian(spherical);
+    const glm::dvec2 spherical = targetDirectionEquatorial();
+    const glm::dvec3 cartesian = skybrowser::sphericalToCartesian(spherical);
     SkyBrowserModule* module = global::moduleEngine->module<SkyBrowserModule>();
     std::vector<std::string> selectedImagesIndices;
 
     for (const std::string& imageUrl : selectedImages()) {
-        bool imageExists = module->wwtDataHandler().image(imageUrl).has_value();
+        const bool imageExists = module->wwtDataHandler().image(imageUrl).has_value();
         ghoul_assert(imageExists, "Image doesn't exist in the wwt catalog!");
         selectedImagesIndices.push_back(
             module->wwtDataHandler().image(imageUrl)->identifier
@@ -218,7 +218,9 @@ void TargetBrowserPair::selectImage(const ImageData& image) {
     // If the image has coordinates, move the target
     if (image.hasCelestialCoords) {
         // Animate the target to the image coordinate position
-        glm::dvec3 galactic = skybrowser::equatorialToGalactic(image.equatorialCartesian);
+        const glm::dvec3 galactic = skybrowser::equatorialToGalactic(
+            image.equatorialCartesian
+        );
         startAnimation(galactic * skybrowser::CelestialSphereRadius, image.fov);
     }
 }
@@ -279,7 +281,7 @@ void TargetBrowserPair::setBrowserRatio(float ratio) {
 }
 
 void TargetBrowserPair::setVerticalFovWithScroll(float scroll) {
-    double fov = _browser->setVerticalFovWithScroll(scroll);
+    const double fov = _browser->setVerticalFovWithScroll(scroll);
     _targetRenderable->setVerticalFov(fov);
 }
 
@@ -339,40 +341,42 @@ void TargetBrowserPair::stopAnimations() {
 }
 
 void TargetBrowserPair::startAnimation(glm::dvec3 galacticCoords, double fovEnd) {
+    using namespace skybrowser;
+
     SkyBrowserModule* module = global::moduleEngine->module<SkyBrowserModule>();
-    double fovSpeed = module->browserAnimationSpeed();
+    const double fovSpeed = module->browserAnimationSpeed();
     // The speed is given degrees /sec
-    double fovTime = std::abs(_browser->verticalFov() - fovEnd) / fovSpeed;
+    const double fovTime = std::abs(_browser->verticalFov() - fovEnd) / fovSpeed;
     // Fov animation
     _fovAnimation = skybrowser::Animation(_browser->verticalFov(), fovEnd, fovTime);
 
     // Target animation
-    glm::dvec3 start = glm::normalize(_targetNode->worldPosition()) *
+    const glm::dvec3 start = glm::normalize(_targetNode->worldPosition()) *
         skybrowser::CelestialSphereRadius;
-    double targetSpeed = module->targetAnimationSpeed();
-    double angle = skybrowser::angleBetweenVectors(start, galacticCoords);
-    _targetAnimation = skybrowser::Animation(start, galacticCoords, angle / targetSpeed);
+    const double targetSpeed = module->targetAnimationSpeed();
+    const double angle = angleBetweenVectors(start, galacticCoords);
+    _targetAnimation = Animation(start, std::move(galacticCoords), angle / targetSpeed);
     _targetAnimation.start();
     _targetIsAnimating = true;
 }
 
 void TargetBrowserPair::centerTargetOnScreen() {
     // Get camera direction in celestial spherical coordinates
-    glm::dvec3 viewDirection = skybrowser::cameraDirectionGalactic();
+    const glm::dvec3 viewDirection = skybrowser::cameraDirectionGalactic();
     // Keep the current fov
-    double currentFov = verticalFov();
+    const double currentFov = verticalFov();
     startAnimation(viewDirection, currentFov);
 }
 
 double TargetBrowserPair::targetRoll() const {
     // To remove the lag effect when moving the camera while having a locked
     // target, send the locked coordinates to wwt
-    glm::dvec3 normal = glm::normalize(
+    const glm::dvec3 normal = glm::normalize(
         _targetNode->worldPosition() -
         global::navigationHandler->camera()->positionVec3()
     );
-    glm::dvec3 right = _targetRenderable->rightVector();
-    glm::dvec3 up = glm::normalize(glm::cross(right, normal));
+    const glm::dvec3 right = _targetRenderable->rightVector();
+    const glm::dvec3 up = glm::normalize(glm::cross(right, normal));
     return skybrowser::targetRoll(up, normal);
 }
 
diff --git a/modules/skybrowser/src/utility.cpp b/modules/skybrowser/src/utility.cpp
index 51812de1fe..f7f1a0cef8 100644
--- a/modules/skybrowser/src/utility.cpp
+++ b/modules/skybrowser/src/utility.cpp
@@ -40,9 +40,9 @@ namespace {
     // Conversion matrix - J2000 equatorial <-> galactic
     // https://arxiv.org/abs/1010.3773v1
     constexpr glm::dmat3 ConversionMatrix = glm::dmat3(
-        -0.054875539390, 0.494109453633, -0.867666135681, // col 0
+        -0.054875539390,  0.494109453633, -0.867666135681, // col 0
         -0.873437104725, -0.444829594298, -0.198076389622, // col 1
-        -0.483834991775, 0.746982248696, 0.455983794523 // col 2
+        -0.483834991775,  0.746982248696,  0.455983794523  // col 2
     );
 } // namespace
 
@@ -50,9 +50,8 @@ namespace openspace::skybrowser {
 
 // Converts from spherical coordinates in the unit of degrees to cartesian coordianates
 glm::dvec3 sphericalToCartesian(const glm::dvec2& coords) {
-    glm::dvec2 coordsRadians = glm::radians(coords);
-
-    glm::dvec3 cartesian = glm::dvec3(
+    const glm::dvec2 coordsRadians = glm::radians(coords);
+    const glm::dvec3 cartesian = glm::dvec3(
         cos(coordsRadians.x) * cos(coordsRadians.y),
         sin(coordsRadians.x) * cos(coordsRadians.y),
         sin(coordsRadians.y)
@@ -65,11 +64,14 @@ glm::dvec3 sphericalToCartesian(const glm::dvec2& coords) {
 glm::dvec2 cartesianToSpherical(const glm::dvec3& coord) {
     // Equatorial coordinates RA = right ascension, Dec = declination
     double ra = atan2(coord.y, coord.x);
-    double dec = atan2(coord.z, glm::sqrt((coord.x * coord.x) + (coord.y * coord.y)));
+    const double dec = atan2(
+        coord.z,
+        glm::sqrt((coord.x * coord.x) + (coord.y * coord.y))
+    );
 
     ra = ra > 0.0 ? ra : ra + glm::two_pi<double>();
 
-    glm::dvec2 celestialCoords = glm::dvec2(ra, dec);
+    const glm::dvec2 celestialCoords = glm::dvec2(ra, dec);
     return glm::degrees(celestialCoords);
 }
 
@@ -79,31 +81,31 @@ glm::dvec3 galacticToEquatorial(const glm::dvec3& coords) {
 
 glm::dvec3 equatorialToGalactic(const glm::dvec3& coords) {
     // On the unit sphere
-    glm::dvec3 rGalactic = ConversionMatrix * glm::normalize(coords);
+    const glm::dvec3 rGalactic = ConversionMatrix * glm::normalize(coords);
     return rGalactic;
 }
 
 glm::dvec3 localCameraToScreenSpace3d(const glm::dvec3& coords) {
     // Ensure that if the coord is behind the camera,
     // the converted coordinate will be there too
-    double zCoord = coords.z > 0.0 ? -ScreenSpaceZ : ScreenSpaceZ;
+    const double zCoord = coords.z > 0.0 ? -ScreenSpaceZ : ScreenSpaceZ;
 
     // Calculate screen space coords x and y
-    double tanX = coords.x / coords.z;
-    double tanY = coords.y / coords.z;
+    const double tanX = coords.x / coords.z;
+    const double tanY = coords.y / coords.z;
 
-    glm::dvec3 screenSpace = glm::dvec3(zCoord * tanX, zCoord * tanY, zCoord);
+    const glm::dvec3 screenSpace = glm::dvec3(zCoord * tanX, zCoord * tanY, zCoord);
     return screenSpace;
 }
 
 glm::dvec3 localCameraToGalactic(const glm::dvec3& coords) {
-    glm::dvec3 camPos = global::navigationHandler->camera()->positionVec3();
-    glm::dvec4 coordsVec4 = glm::dvec4(coords, 1.0) ;
-    glm::dmat4 camMat = glm::inverse(
+    const glm::dvec3 camPos = global::navigationHandler->camera()->positionVec3();
+    const glm::dvec4 coordsVec4 = glm::dvec4(coords, 1.0) ;
+    const glm::dmat4 camMat = glm::inverse(
         global::navigationHandler->camera()->combinedViewMatrix()
     );
     // Subtract camera position to get the view direction
-    glm::dvec3 galactic = glm::dvec3(camMat * coordsVec4) - camPos;
+    const glm::dvec3 galactic = glm::dvec3(camMat * coordsVec4) - camPos;
 
     return glm::normalize(galactic) * CelestialSphereRadius;
 }
@@ -111,65 +113,66 @@ glm::dvec3 localCameraToGalactic(const glm::dvec3& coords) {
 glm::dvec3 localCameraToEquatorial(const glm::dvec3& coords) {
     // Calculate the galactic coordinate of the target direction
     // projected onto the celestial sphere
-    glm::dvec3 camPos = global::navigationHandler->camera()->positionVec3();
-    glm::dvec3 galactic = camPos + localCameraToGalactic(coords);
+    const glm::dvec3 camPos = global::navigationHandler->camera()->positionVec3();
+    const glm::dvec3 galactic = camPos + localCameraToGalactic(coords);
     return galacticToEquatorial(galactic);
 }
 
 glm::dvec3 equatorialToLocalCamera(const glm::dvec3& coords) {
     // Transform equatorial J2000 to galactic coord with infinite radius
-    glm::dvec3 galactic = equatorialToGalactic(coords) * CelestialSphereRadius;
-    glm::dvec3 localCamera = galacticToLocalCamera(galactic);
+    const glm::dvec3 galactic = equatorialToGalactic(coords) * CelestialSphereRadius;
+    const glm::dvec3 localCamera = galacticToLocalCamera(galactic);
     return localCamera;
 }
 
 glm::dvec3 galacticToLocalCamera(const glm::dvec3& coords) {
     // Transform vector to camera's local coordinate system
-    glm::dmat4 camMat = global::navigationHandler->camera()->combinedViewMatrix();
-    glm::dvec3 viewDirectionLocal = camMat * glm::dvec4(coords, 1.0);
+    const glm::dmat4 camMat = global::navigationHandler->camera()->combinedViewMatrix();
+    const glm::dvec3 viewDirectionLocal = camMat * glm::dvec4(coords, 1.0);
     return glm::normalize(viewDirectionLocal);
 }
 
 double targetRoll(const glm::dvec3& up, const glm::dvec3& forward) {
     constexpr glm::dvec3 NorthPole = glm::dvec3(0.0, 0.0, 1.0);
 
-    glm::dvec3 upJ2000 = galacticToEquatorial(up);
-    glm::dvec3 forwardJ2000 = galacticToEquatorial(forward);
+    const glm::dvec3 upJ2000 = galacticToEquatorial(up);
+    const glm::dvec3 forwardJ2000 = galacticToEquatorial(forward);
 
-    glm::dvec3 crossUpNorth = glm::cross(upJ2000, NorthPole);
-    double dotNorthUp = glm::dot(NorthPole, upJ2000);
-    double dotCrossUpNorthForward = glm::dot(crossUpNorth, forwardJ2000);
+    const glm::dvec3 crossUpNorth = glm::cross(upJ2000, NorthPole);
+    const double dotNorthUp = glm::dot(NorthPole, upJ2000);
+    const double dotCrossUpNorthForward = glm::dot(crossUpNorth, forwardJ2000);
 
     return glm::degrees(atan2(dotCrossUpNorthForward, dotNorthUp));
 }
 
 glm::dvec3 cameraDirectionEquatorial() {
     // Get the view direction of the screen in cartesian J2000 coordinates
-    glm::dvec3 camDirGalactic = cameraDirectionGalactic();
+    const glm::dvec3 camDirGalactic = cameraDirectionGalactic();
     return galacticToEquatorial(camDirGalactic);
 }
 
 glm::dvec3 cameraDirectionGalactic() {
     // Get the view direction of the screen in galactic coordinates
-    glm::dvec3 camPos = global::navigationHandler->camera()->positionVec3();
-    glm::dvec3 view = global::navigationHandler->camera()->viewDirectionWorldSpace();
-    glm::dvec3 galCoord = camPos + CelestialSphereRadius * view;
+    Camera* camera = global::navigationHandler->camera();
+    const glm::dvec3 camPos = camera->positionVec3();
+    const glm::dvec3 view = camera->viewDirectionWorldSpace();
+    const glm::dvec3 galCoord = camPos + CelestialSphereRadius * view;
 
     return galCoord;
 }
 
 float windowRatio() {
-    glm::vec2 windowRatio = global::windowDelegate->currentWindowSize();
+    const glm::vec2 windowRatio = global::windowDelegate->currentWindowSize();
     return windowRatio.x / windowRatio.y;
 }
 
 bool isCoordinateInView(const glm::dvec3& equatorial) {
     // Check if image coordinate is within current FOV
-    glm::dvec3 localCamera = equatorialToLocalCamera(equatorial);
-    glm::dvec3 coordsScreen = localCameraToScreenSpace3d(localCamera);
-    double r = windowRatio();
+    const glm::dvec3 localCamera = equatorialToLocalCamera(equatorial);
+    const glm::dvec3 coordsScreen = localCameraToScreenSpace3d(localCamera);
+    const double r = windowRatio();
 
-    bool isCoordInView =
+    const bool isCoordInView =
         std::abs(coordsScreen.x) < r &&
         std::abs(coordsScreen.y) < 1.f &&
         coordsScreen.z < 0.f;
@@ -178,7 +181,7 @@ bool isCoordinateInView(const glm::dvec3& equatorial) {
 
 // Transforms a pixel coordinate to a screen space coordinate
 glm::vec2 pixelToScreenSpace2d(const glm::vec2& mouseCoordinate) {
-    glm::vec2 size = glm::vec2(global::windowDelegate->currentWindowSize());
+    const glm::vec2 size = glm::vec2(global::windowDelegate->currentWindowSize());
     // Change origin to middle of the window
     glm::vec2 screenSpacePos = mouseCoordinate - (size / 2.f);
     // Ensure the upper right corner is positive on the y axis
@@ -191,16 +194,16 @@ glm::vec2 pixelToScreenSpace2d(const glm::vec2& mouseCoordinate) {
 // The horizontal and vertical fov of the OpenSpace window
 glm::dvec2 fovWindow() {
     // OpenSpace FOV
-    glm::dvec2 windowDim = glm::dvec2(global::windowDelegate->currentWindowSize());
-    double ratio = windowDim.y / windowDim.x;
-    double hFov = global::windowDelegate->getHorizFieldOfView();
-    glm::dvec2 OpenSpaceFOV = glm::dvec2(hFov, hFov * ratio);
+    const glm::dvec2 windowDim = glm::dvec2(global::windowDelegate->currentWindowSize());
+    const double ratio = windowDim.y / windowDim.x;
+    const double hFov = global::windowDelegate->getHorizFieldOfView();
+    const glm::dvec2 OpenSpaceFOV = glm::dvec2(hFov, hFov * ratio);
     return OpenSpaceFOV;
 }
 
 double angleBetweenVectors(const glm::dvec3& start, const glm::dvec3& end) {
     // Find smallest angle between the two vectors
-    double cos = glm::dot(glm::normalize(start), glm::normalize(end));
+    const double cos = glm::dot(glm::normalize(start), glm::normalize(end));
     // Ensure cos is within defined interval [-1,1]
     return std::acos(std::clamp(cos, -1.0, 1.0));
 }
@@ -208,23 +211,23 @@ double angleBetweenVectors(const glm::dvec3& start, const glm::dvec3& end) {
 glm::dmat4 incrementalAnimationMatrix(const glm::dvec3& start, const glm::dvec3& end,
                                       double percentage)
 {
-    double smallestAngle = angleBetweenVectors(start, end);
+    const double smallestAngle = angleBetweenVectors(start, end);
     // Calculate rotation this frame
-    double rotationAngle = smallestAngle * percentage;
+    const double rotationAngle = smallestAngle * percentage;
 
     // Create the rotation matrix
-    glm::dvec3 rotationAxis = glm::normalize(glm::cross(start, end));
+    const glm::dvec3 rotationAxis = glm::normalize(glm::cross(start, end));
     return glm::rotate(rotationAngle, rotationAxis);
 }
 
-double sizeFromFov(double fov, glm::dvec3 worldPosition) {
+double sizeFromFov(double fov, const glm::dvec3& worldPosition) {
     // Calculate the size with trigonometry
     //  /|
     // /_|    Adjacent is the horizontal line, opposite the vertical
     // \ |    Calculate for half the triangle first, then multiply with 2
     //  \|
-    double adjacent = glm::length(worldPosition);
-    double opposite = 2.0 * adjacent * glm::tan(glm::radians(fov * 0.5));
+    const double adjacent = glm::length(worldPosition);
+    const double opposite = 2.0 * adjacent * glm::tan(glm::radians(fov * 0.5));
     return opposite;
 }
 
@@ -234,8 +237,8 @@ double Animation<double>::newValue() const {
         return _goal;
     }
     else {
-        double percentage = percentageSpent();
-        double diff = (_goal - _start) * ghoul::exponentialEaseOut(percentage);
+        const double percentage = percentageSpent();
+        const double diff = (_goal - _start) * ghoul::exponentialEaseOut(percentage);
         return _start + diff;
     }
 }
@@ -246,8 +249,8 @@ glm::dmat4 Animation<glm::dvec3>::rotationMatrix() {
         return glm::dmat4(1.0);
     }
 
-    double percentage = ghoul::sineEaseInOut(percentageSpent());
-    double increment = percentage - _lastPercentage;
+    const double percentage = ghoul::sineEaseInOut(percentageSpent());
+    const double increment = percentage - _lastPercentage;
     _lastPercentage = percentage;
 
     glm::dmat4 rotMat = skybrowser::incrementalAnimationMatrix(
@@ -263,7 +266,7 @@ glm::dvec3 Animation<glm::dvec3>::newValue() const {
     if (!isAnimating()) {
         return _goal;
     }
-    glm::dmat4 rotMat = skybrowser::incrementalAnimationMatrix(
+    const glm::dmat4 rotMat = skybrowser::incrementalAnimationMatrix(
         glm::normalize(_start),
         glm::normalize(_goal),
         ghoul::exponentialEaseOut(percentageSpent())
diff --git a/modules/skybrowser/src/wwtcommunicator.cpp b/modules/skybrowser/src/wwtcommunicator.cpp
index c32efd492b..aee43cce12 100644
--- a/modules/skybrowser/src/wwtcommunicator.cpp
+++ b/modules/skybrowser/src/wwtcommunicator.cpp
@@ -135,8 +135,8 @@ WwtCommunicator::WwtCommunicator(const ghoul::Dictionary& dictionary)
 
 void WwtCommunicator::update() {
     // Cap how messages are passed
-    std::chrono::system_clock::time_point now = std::chrono::system_clock::now();
-    std::chrono::system_clock::duration timeSinceLastUpdate = now - _lastUpdateTime;
+    const std::chrono::system_clock::time_point now = std::chrono::system_clock::now();
+    const std::chrono::system_clock::duration timeSinceLastUpdate = now - _lastUpdateTime;
 
     if (timeSinceLastUpdate > TimeUpdateInterval) {
         if (_equatorialAimIsDirty) {
@@ -161,7 +161,7 @@ void WwtCommunicator::selectImage(const std::string& url) {
 
     if (it == _selectedImages.end()) {
         // Push newly selected image to front
-        _selectedImages.push_front(std::pair<std::string, double>(url, 1.0));
+        _selectedImages.emplace_front(url, 1.0);
 
         // If wwt has not loaded the collection yet, wait with passing the message
         if (_isImageCollectionLoaded) {
@@ -239,12 +239,12 @@ void WwtCommunicator::setBorderColor(glm::ivec3 color) {
 
 void WwtCommunicator::setBorderRadius(double radius) {
     _borderRadius = radius;
-    std::string scr = fmt::format("setBorderRadius({});", radius);
+    const std::string scr = fmt::format("setBorderRadius({});", radius);
     executeJavascript(scr);
 }
 
 void WwtCommunicator::updateBorderColor() const {
-    std::string script = fmt::format(
+    const std::string script = fmt::format(
         "setBackgroundColor('rgb({},{},{})');",
         _wwtBorderColor.x, _wwtBorderColor.y, _wwtBorderColor.z
     );
@@ -253,7 +253,11 @@ void WwtCommunicator::updateBorderColor() const {
 
 void WwtCommunicator::updateAim() const {
     // Message WorldWide Telescope current view
-    ghoul::Dictionary msg = moveCameraMessage(_equatorialAim, _verticalFov, _targetRoll);
+    const ghoul::Dictionary msg = moveCameraMessage(
+        _equatorialAim,
+        _verticalFov,
+        _targetRoll
+    );
     sendMessageToWwt(msg);
 }
 
@@ -287,7 +291,9 @@ glm::dvec2 WwtCommunicator::equatorialAim() const {
 void WwtCommunicator::setImageOrder(const std::string& imageUrl, int order) {
     // Find in selected images list
     auto current = findSelectedImage(imageUrl);
-    int currentIndex = static_cast<int>(std::distance(_selectedImages.begin(), current));
+    const int currentIndex = static_cast<int>(
+        std::distance(_selectedImages.begin(), current)
+    );
 
     std::deque<std::pair<std::string, double>> newDeque;
 
@@ -311,8 +317,8 @@ void WwtCommunicator::setImageOrder(const std::string& imageUrl, int order) {
     }
 
     _selectedImages = newDeque;
-    int reverseOrder = static_cast<int>(_selectedImages.size()) - order - 1;
-    ghoul::Dictionary message = setLayerOrderMessage(imageUrl, reverseOrder);
+    const int reverseOrder = static_cast<int>(_selectedImages.size()) - order - 1;
+    const ghoul::Dictionary message = setLayerOrderMessage(imageUrl, reverseOrder);
     sendMessageToWwt(message);
 }
 
@@ -326,12 +332,12 @@ void WwtCommunicator::setImageOpacity(const std::string& imageUrl, float opacity
     auto it = findSelectedImage(imageUrl);
     it->second = opacity;
 
-    ghoul::Dictionary msg = setImageOpacityMessage(imageUrl, opacity);
+    const ghoul::Dictionary msg = setImageOpacityMessage(imageUrl, opacity);
     sendMessageToWwt(msg);
 }
 
 void WwtCommunicator::hideChromeInterface() const {
-    std::string script = "sendMessageToWWT({event : \"modify_settings\", "
+    const std::string script = "sendMessageToWWT({event : \"modify_settings\", "
         "settings : [[\"hideAllChrome\", true]], target: \"app\"});";
     executeJavascript(script);
 }
diff --git a/modules/skybrowser/src/wwtdatahandler.cpp b/modules/skybrowser/src/wwtdatahandler.cpp
index 808c3a2af1..0390b3fcbf 100644
--- a/modules/skybrowser/src/wwtdatahandler.cpp
+++ b/modules/skybrowser/src/wwtdatahandler.cpp
@@ -38,7 +38,7 @@ namespace {
     constexpr std::string_view ImageSet = "ImageSet";
     constexpr std::string_view Dec = "Dec";
     constexpr std::string_view RA = "RA";
-    constexpr std::string_view Undefined = "";
+    constexpr std::string_view Undefined;
     constexpr std::string_view Folder = "Folder";
     constexpr std::string_view Place = "Place";
     constexpr std::string_view ThumbnailUrl = "ThumbnailUrl";
@@ -50,13 +50,13 @@ namespace {
     constexpr std::string_view Sky = "Sky";
 
     bool hasAttribute(const tinyxml2::XMLElement* element, std::string_view name) {
-        std::string n = std::string(name);
+        const std::string n = std::string(name);
         return element->FindAttribute(n.c_str());
     }
 
     std::string attribute(const tinyxml2::XMLElement* element, std::string_view name) {
         if (hasAttribute(element, name)) {
-            std::string n = std::string(name);
+            const std::string n = std::string(name);
             return element->FindAttribute(n.c_str())->Value();
         }
         return std::string(Undefined);
@@ -105,7 +105,7 @@ namespace {
     {
         // Find the thumbnail image url
         // The thumbnail is the last node so traverse backwards for speed
-        std::string n = std::string(elementName);
+        const std::string n = std::string(elementName);
         const tinyxml2::XMLElement* child = imageSet->FirstChildElement(n.c_str());
         return child && child->GetText() ? child->GetText() : std::string(Undefined);
     }
@@ -132,7 +132,7 @@ namespace {
     {
         using namespace openspace;
         // Download file from url
-        std::filesystem::path file = directory.string() + fileName + ".aspx";
+        const std::filesystem::path file = directory.string() + fileName + ".aspx";
         const bool success = downloadFile(url, file);
         if (!success) {
             LINFO(fmt::format(
@@ -162,8 +162,8 @@ namespace {
         while (element && std::string(element->Value()) == Folder) {
             // If folder contains urls, download and parse those urls
             if (hasAttribute(element, Url) && hasAttribute(element, Name)) {
-                std::string urlAttr = attribute(element, Url);
-                std::string fileNameAttr = attribute(element, Name);
+                const std::string urlAttr = attribute(element, Url);
+                const std::string fileNameAttr = attribute(element, Name);
                 downloadWtmlFiles(directory, urlAttr, fileNameAttr);
             }
             element = element->NextSiblingElement();
@@ -180,7 +180,7 @@ namespace {
         // it is a Place or an ImageSet
         std::string thumbnailUrl = std::string(Undefined);
         const tinyxml2::XMLElement* imageSet = nullptr;
-        std::string type = node->Name();
+        const std::string type = node->Name();
 
         if (type == ImageSet) {
             thumbnailUrl = childNodeContentFromImageSet(node, ThumbnailUrl);
@@ -208,20 +208,20 @@ namespace {
             name[0] = static_cast<char>(std::toupper(name[0]));
         }
 
-        std::string imageUrl = attribute(imageSet, Url);
-        std::string credits = childNodeContentFromImageSet(imageSet, Credits);
-        std::string creditsUrl = childNodeContentFromImageSet(imageSet, CreditsUrl);
+        const std::string imageUrl = attribute(imageSet, Url);
+        const std::string credits = childNodeContentFromImageSet(imageSet, Credits);
+        const std::string creditsUrl = childNodeContentFromImageSet(imageSet, CreditsUrl);
 
         // Collect equatorial coordinates. All-sky surveys do not have these coordinates
-        bool hasCelestialCoords = hasAttribute(node, RA) && hasAttribute(node, Dec);
+        const bool hasCelestialCoords = hasAttribute(node, RA) && hasAttribute(node, Dec);
         glm::dvec2 equatorialSpherical = glm::dvec2(0.0);
         glm::dvec3 equatorialCartesian = glm::dvec3(0.0);
 
         if (hasCelestialCoords) {
             // The RA from WWT is in the unit hours:
             // to convert to degrees, multiply with 360 (deg) /24 (h) = 15
-            double ra = 15.0 * std::stod(attribute(node, RA));
-            double dec = std::stod(attribute(node, Dec));
+            const double ra = 15.0 * std::stod(attribute(node, RA));
+            const double dec = std::stod(attribute(node, Dec));
             equatorialSpherical = glm::dvec2(ra, dec);
             equatorialCartesian = skybrowser::sphericalToCartesian(equatorialSpherical);
         }
@@ -268,8 +268,11 @@ void WwtDataHandler::loadImages(const std::string& root,
     // Get the hash from the remote. If no such hash exists, the remoteHash will be empty
     std::string remoteHash;
     {
-        std::string remoteHashFile = root.substr(0, root.find_last_of('/')) + "/hash.md5";
-        bool success = downloadFile(remoteHashFile, directory / "hash.tmp");
+        const std::string remoteHashFile = root.substr(
+            0,
+            root.find_last_of('/')
+        ) + "/hash.md5";
+        const bool success = downloadFile(remoteHashFile, directory / "hash.tmp");
         // The hash download might fail if the provided 'root' does not have a hash
         // in which case we assume that the underlying data has not changed
         if (success) {
@@ -280,7 +283,7 @@ void WwtDataHandler::loadImages(const std::string& root,
 
     // Load the local hash. If no such hash exists, the localHash will be empty
     std::string localHash;
-    std::filesystem::path localHashFile = directory / "hash.md5";
+    const std::filesystem::path localHashFile = directory / "hash.md5";
     if (std::filesystem::exists(localHashFile)) {
         std::ifstream(localHashFile) >> localHash;
     }
@@ -309,29 +312,30 @@ void WwtDataHandler::loadImages(const std::string& root,
     LINFO("Loading images from directory");
     for (const auto& entry : std::filesystem::directory_iterator(directory)) {
         tinyxml2::XMLDocument document;
-        std::string path = entry.path().string();
-        tinyxml2::XMLError successCode = document.LoadFile(path.c_str());
+        const std::string path = entry.path().string();
+        const tinyxml2::XMLError successCode = document.LoadFile(path.c_str());
 
         if (successCode == tinyxml2::XMLError::XML_SUCCESS) {
             tinyxml2::XMLElement* rootNode = document.FirstChildElement();
-            std::string collectionName = attribute(rootNode, Name);
+            const std::string collectionName = attribute(rootNode, Name);
             saveImagesFromXml(rootNode, collectionName);
         }
     }
     // Sort images. Copy images to vector
-    std::vector<ImageData> _imageVector;
+    std::vector<ImageData> imageVector;
+    imageVector.reserve(_images.size());
     for (const auto& [id, img] : _images) {
-        _imageVector.push_back(img);
+        imageVector.push_back(img);
     }
     // Sort
-    std::sort(_imageVector.begin(), _imageVector.end(),
+    std::sort(imageVector.begin(), imageVector.end(),
         [](const ImageData& lhs, const ImageData& rhs) {
             return lhs.name < rhs.name;
         }
     );
     // Set the identifiers to the correct order
-    for (size_t i = 0; i < _imageVector.size(); i++) {
-        _images[_imageVector[i].imageUrl].identifier = std::to_string(i);
+    for (size_t i = 0; i < imageVector.size(); i++) {
+        _images[imageVector[i].imageUrl].identifier = std::to_string(i);
     }
 
     LINFO(fmt::format("Loaded {} WorldWide Telescope images", _images.size()));
@@ -375,8 +379,10 @@ void WwtDataHandler::saveImagesFromXml(const tinyxml2::XMLElement* root,
         }
         // If node is another folder, open recursively
         else if (name == Folder) {
-            std::string nodeName = attribute(node, Name);
-            std::string newCollectionName = fmt::format("{}/{}", collection, nodeName);
+            const std::string nodeName = attribute(node, Name);
+            const std::string newCollectionName = fmt::format(
+                "{}/{}", collection, nodeName
+            );
             saveImagesFromXml(node, newCollectionName);
         }
         node = node->NextSiblingElement();
diff --git a/modules/space/horizonsfile.cpp b/modules/space/horizonsfile.cpp
index fabd20b143..6dedaf89b6 100644
--- a/modules/space/horizonsfile.cpp
+++ b/modules/space/horizonsfile.cpp
@@ -66,7 +66,7 @@ HorizonsFile::HorizonsFile(std::filesystem::path filePath, std::string result)
 {
     // Write the response into a new file and save it
     std::ofstream file(_file);
-    file << ghoul::replaceAll(std::move(result), "\\n", "\n") << std::endl;
+    file << ghoul::replaceAll(std::move(result), "\\n", "\n") << '\n';
 }
 
 void HorizonsFile::setFile(std::filesystem::path file) {
@@ -118,7 +118,7 @@ std::string constructHorizonsUrl(HorizonsType type, const std::string& target,
 
 json sendHorizonsRequest(const std::string& url, std::filesystem::path filePath) {
     // Set up HTTP request and download result
-    std::unique_ptr<HttpFileDownload> download = std::make_unique<HttpFileDownload>(
+    const auto download = std::make_unique<HttpFileDownload>(
         url,
         filePath,
         HttpFileDownload::Overwrite::Yes
@@ -141,15 +141,15 @@ json sendHorizonsRequest(const std::string& url, std::filesystem::path filePath)
     return convertHorizonsDownloadToJson(filePath);
 }
 
-nlohmann::json convertHorizonsDownloadToJson(std::filesystem::path filePath) {
+nlohmann::json convertHorizonsDownloadToJson(const std::filesystem::path& filePath) {
     // Read the entire file into a string
-    constexpr size_t readSize = std::size_t(4096);
+    constexpr size_t ReadSize = 4096;
     std::ifstream stream = std::ifstream(filePath);
     stream.exceptions(std::ios_base::badbit);
 
     std::string answer;
-    std::string buf = std::string(readSize, '\0');
-    while (stream.read(buf.data(), readSize)) {
+    std::string buf = std::string(ReadSize, '\0');
+    while (stream.read(buf.data(), ReadSize)) {
         answer.append(buf, 0, stream.gcount());
     }
     answer.append(buf, 0, stream.gcount());
@@ -197,7 +197,7 @@ HorizonsResultCode isValidHorizonsAnswer(const json& answer) {
     // Errors
     if (auto it = answer.find("error");  it != answer.end()) {
         // There was an error
-        std::string errorMsg = *it;
+        const std::string errorMsg = *it;
 
         // @CPP23 (malej, 2022-04-08) In all cases below, the string function contains
         // should be used instead of find
@@ -247,7 +247,7 @@ HorizonsResultCode isValidHorizonsAnswer(const json& answer) {
 
 // Check whether the given Horizons file is valid or not
 // Return an error code with what is the problem if there was one
-HorizonsResultCode isValidHorizonsFile(std::filesystem::path file) {
+HorizonsResultCode isValidHorizonsFile(const std::filesystem::path& file) {
     std::ifstream fileStream(file);
     if (!fileStream.good()) {
         return HorizonsResultCode::Empty;
@@ -412,7 +412,7 @@ void HorizonsFile::displayErrorMessage(HorizonsResultCode code) const {
                 "selected observer"
             );
 
-            std::vector<std::string> matchingstations =
+            const std::vector<std::string> matchingstations =
                 parseMatches("Observatory Name", "Multiple matching stations found");
             if (matchingstations.empty()) {
                 LERROR("Could not parse the matching stations");
@@ -420,7 +420,7 @@ void HorizonsFile::displayErrorMessage(HorizonsResultCode code) const {
             }
 
             std::string matches;
-            for (std::string station : matchingstations) {
+            for (const std::string& station : matchingstations) {
                 matches += '\n' + station;
             }
             LINFO(fmt::format("Matching Observer Stations: {}", matches));
@@ -429,7 +429,7 @@ void HorizonsFile::displayErrorMessage(HorizonsResultCode code) const {
         case HorizonsResultCode::MultipleObserver: {
             LWARNING("Multiple matches were found for the selected observer");
 
-            std::vector<std::string> matchingObservers =
+            const std::vector<std::string> matchingObservers =
                 parseMatches("Name", "matches", ">MATCH NAME<");
             if (matchingObservers.empty()) {
                 LERROR("Could not parse the matching observers");
@@ -437,7 +437,7 @@ void HorizonsFile::displayErrorMessage(HorizonsResultCode code) const {
             }
 
             std::string matches;
-            for (std::string observer : matchingObservers) {
+            for (const std::string& observer : matchingObservers) {
                 matches += '\n' + observer;
             }
             LINFO(fmt::format("Matching Observers: {}", matches));
@@ -460,7 +460,7 @@ void HorizonsFile::displayErrorMessage(HorizonsResultCode code) const {
 
             LWARNING("Multiple matches were found for the target");
 
-            std::vector<std::string> matchingTargets =
+            const std::vector<std::string> matchingTargets =
                 parseMatches("Name", "matches", ">MATCH NAME<");
             if (matchingTargets.empty()) {
                 LERROR("Could not parse the matching targets");
@@ -468,7 +468,7 @@ void HorizonsFile::displayErrorMessage(HorizonsResultCode code) const {
             }
 
             std::string matches;
-            for (std::string target : matchingTargets) {
+            for (const std::string& target : matchingTargets) {
                 matches += '\n' + target;
             }
             LINFO(fmt::format("Matching targets: {}", matches));
@@ -485,7 +485,7 @@ void HorizonsFile::displayErrorMessage(HorizonsResultCode code) const {
 
 HorizonsResult readHorizonsFile(std::filesystem::path file) {
     // Check if valid
-    HorizonsResultCode code = isValidHorizonsFile(file);
+    const HorizonsResultCode code = isValidHorizonsFile(file);
     if (code != HorizonsResultCode::Valid) {
         HorizonsResult result;
         result.errorCode = code;
@@ -563,16 +563,16 @@ HorizonsResult readHorizonsVectorFile(std::filesystem::path file) {
         std::stringstream str2(line);
 
         //   X Y Z
-        double xPos;
-        double yPos;
-        double zPos;
+        double xPos = 0.0;
+        double yPos = 0.0;
+        double zPos = 0.0;
         str2 >> xPos >> yPos >> zPos;
 
         // Convert date and time to seconds after 2000
-        std::string timeString = fmt::format("{} {}", date, time);
-        double timeInJ2000 = Time::convertTime(timeString);
+        const std::string timeString = fmt::format("{} {}", date, time);
+        const double timeInJ2000 = Time::convertTime(timeString);
         glm::dvec3 pos = glm::dvec3(1000 * xPos, 1000 * yPos, 1000 * zPos);
-        glm::dmat3 transform =
+        const glm::dmat3 transform =
             SpiceManager::ref().positionTransformMatrix("ECLIPJ2000", "GALACTIC", 0.0);
         pos = transform * pos;
 
@@ -631,17 +631,15 @@ HorizonsResult readHorizonsObserverFile(std::filesystem::path file) {
 
         // Convert date and time to seconds after 2000
         // and pos to Galactic positions in meter from Observer.
-        std::string timeString = fmt::format("{} {}", date, time);
-        double timeInJ2000 = Time::convertTime(timeString);
-        glm::dvec3 gPos = glm::dvec3(
+        const std::string timeString = fmt::format("{} {}", date, time);
+
+        // Add position to stored data
+        dataPoint.time = Time::convertTime(timeString);
+        dataPoint.position = glm::dvec3(
             1000 * range * cos(glm::radians(gLat)) * cos(glm::radians(gLon)),
             1000 * range * cos(glm::radians(gLat)) * sin(glm::radians(gLon)),
             1000 * range * sin(glm::radians(gLat))
         );
-
-        // Add position to stored data
-        dataPoint.time = timeInJ2000;
-        dataPoint.position = gPos;
         data.push_back(dataPoint);
 
         std::getline(fileStream, line);
@@ -762,9 +760,8 @@ std::pair<std::string, std::string> HorizonsFile::parseValidTimeRange(
         if (line.find(startPhrase) != std::string::npos) {
             break;
         }
-        else if (!altStartPhrase.empty() &&
-                 line.find(altStartPhrase) != std::string::npos)
-        {
+
+        if (!altStartPhrase.empty() && line.find(altStartPhrase) != std::string::npos) {
             break;
         }
 
@@ -780,7 +777,8 @@ std::pair<std::string, std::string> HorizonsFile::parseValidTimeRange(
 
     // In the first file parse both start and end time
     // From the first line get the start time
-    std::string startTime, endTime;
+    std::string startTime;
+    std::string endTime;
     std::getline(fileStream, line);
     if (fileStream.good()) {
         std::stringstream str(line);
diff --git a/modules/space/horizonsfile.h b/modules/space/horizonsfile.h
index f23f86fb00..25b0cf6aae 100644
--- a/modules/space/horizonsfile.h
+++ b/modules/space/horizonsfile.h
@@ -129,9 +129,9 @@ std::string constructHorizonsUrl(HorizonsType type, const std::string& target,
     const std::string& unit);
 nlohmann::json sendHorizonsRequest(const std::string& url,
     std::filesystem::path filePath);
-nlohmann::json convertHorizonsDownloadToJson(std::filesystem::path filePath);
+nlohmann::json convertHorizonsDownloadToJson(const std::filesystem::path& filePath);
 HorizonsResultCode isValidHorizonsAnswer(const nlohmann::json& answer);
-HorizonsResultCode isValidHorizonsFile(std::filesystem::path file);
+HorizonsResultCode isValidHorizonsFile(const std::filesystem::path& file);
 HorizonsResult readHorizonsFile(std::filesystem::path file);
 
 HorizonsResult readHorizonsVectorFile(std::filesystem::path file);
diff --git a/modules/space/kepler.cpp b/modules/space/kepler.cpp
index 55d9978c3e..3da2484d7a 100644
--- a/modules/space/kepler.cpp
+++ b/modules/space/kepler.cpp
@@ -127,7 +127,7 @@ namespace {
             LeapSecond { .year = 2017, .dayOfYear =   1 }
         };
         // Get the position of the last leap second before the desired date
-        LeapSecond date{ year, dayOfYear };
+        const LeapSecond date = { year, dayOfYear };
         const auto it = std::lower_bound(LeapSeconds.begin(), LeapSeconds.end(), date);
 
         // Get the position of the Epoch
@@ -259,20 +259,20 @@ namespace {
             e += ".0";
         }
         // 1, 2
-        size_t nDashes = std::count_if(
+        const size_t nDashes = std::count_if(
             epoch.begin(),
             epoch.end(),
             [](char c) { return c == '-'; }
         );
-        std::string formatString = (nDashes == 2) ? "{:4}-{:2}-{:2}{}" : "{:4}{:2}{:2}{}";
+        const std::string format = (nDashes == 2) ? "{:4}-{:2}-{:2}{}" : "{:4}{:2}{:2}{}";
         auto [res, year, monthNum, dayOfMonthNum, fractionOfDay] =
-            scn::scan_tuple<int, int, int, double>(e, formatString);
+            scn::scan_tuple<int, int, int, double>(e, format);
         if (!res) {
             throw ghoul::RuntimeError(fmt::format("Error parsing epoch '{}'", epoch));
         }
         const int daysSince2000 = countDays(year);
-        int wholeDaysInto = daysIntoGivenYear(year, monthNum, dayOfMonthNum);
-        double daysInYear = static_cast<double>(wholeDaysInto) + fractionOfDay;
+        const int wholeDaysInto = daysIntoGivenYear(year, monthNum, dayOfMonthNum);
+        const double daysInYear = static_cast<double>(wholeDaysInto) + fractionOfDay;
 
         // 3
         using namespace std::chrono;
@@ -328,8 +328,8 @@ namespace {
         const size_t pos = epoch.find('T');
         if (pos == 10) {
             // We have the first form
-            int month;
-            int days;
+            int month = 0;
+            int days = 0;
             auto res = scn::scan(
                 epoch, "{:4}-{:2}-{:2}T{:2}:{:2}:{}",
                 date.year, month, days, date.hours, date.minutes, date.seconds
@@ -385,7 +385,7 @@ namespace {
 
 namespace openspace::kepler {
 
-std::vector<Parameters> readTleFile(std::filesystem::path file) {
+std::vector<Parameters> readTleFile(const std::filesystem::path& file) {
     ghoul_assert(std::filesystem::is_regular_file(file), "File must exist");
 
     std::vector<Parameters> result;
@@ -428,9 +428,9 @@ std::vector<Parameters> readTleFile(std::filesystem::path file) {
         // The id only contains the last two digits of the launch year, so we have to
         // patch it to the full year
         {
-            std::string id = firstLine.substr(9, 6);
-            std::string prefix = [y = id.substr(0, 2)](){
-                int year = std::atoi(y.c_str());
+            const std::string id = firstLine.substr(9, 6);
+            const std::string prefix = [y = id.substr(0, 2)](){
+                const int year = std::atoi(y.c_str());
                 return year >= 57 ? "19" : "20";
             }();
             p.id = fmt::format("{}{}-{}", prefix, id.substr(0, 2), id.substr(3));
@@ -488,7 +488,7 @@ std::vector<Parameters> readTleFile(std::filesystem::path file) {
 
         // Get mean motion
         stream.str(secondLine.substr(52, 11));
-        float meanMotion;
+        float meanMotion = 0.f;
         stream >> meanMotion;
 
         p.semiMajorAxis = calculateSemiMajorAxis(meanMotion);
@@ -502,7 +502,7 @@ std::vector<Parameters> readTleFile(std::filesystem::path file) {
     return result;
 }
 
-std::vector<Parameters> readOmmFile(std::filesystem::path file) {
+std::vector<Parameters> readOmmFile(const std::filesystem::path& file) {
     ghoul_assert(std::filesystem::is_regular_file(file), "File must exist");
 
     std::vector<Parameters> result;
@@ -563,7 +563,7 @@ std::vector<Parameters> readOmmFile(std::filesystem::path file) {
             current->epoch = epochFromOmmString(parts[1]);
         }
         else if (parts[0] == "MEAN_MOTION") {
-            float mm = std::stof(parts[1]);
+            const float mm = std::stof(parts[1]);
             current->semiMajorAxis = calculateSemiMajorAxis(mm);
             current->period = std::chrono::seconds(std::chrono::hours(24)).count() / mm;
         }
@@ -594,7 +594,7 @@ std::vector<Parameters> readOmmFile(std::filesystem::path file) {
     return result;
 }
 
-std::vector<Parameters> readSbdbFile(std::filesystem::path file) {
+std::vector<Parameters> readSbdbFile(const std::filesystem::path& file) {
     constexpr int NDataFields = 9;
     constexpr std::string_view ExpectedHeader = "full_name,epoch_cal,e,a,i,om,w,ma,per";
 
@@ -658,7 +658,7 @@ std::vector<Parameters> readSbdbFile(std::filesystem::path file) {
     return result;
 }
 
-void saveCache(const std::vector<Parameters>& params, std::filesystem::path file) {
+void saveCache(const std::vector<Parameters>& params, const std::filesystem::path& file) {
     std::ofstream stream(file, std::ofstream::binary);
 
     stream.write(reinterpret_cast<const char*>(&CurrentCacheVersion), sizeof(int8_t));
@@ -688,7 +688,7 @@ void saveCache(const std::vector<Parameters>& params, std::filesystem::path file
     }
 }
 
-std::optional<std::vector<Parameters>> loadCache(std::filesystem::path file) {
+std::optional<std::vector<Parameters>> loadCache(const std::filesystem::path& file) {
     std::ifstream stream(file, std::ifstream::binary);
 
     int8_t version = 0;
diff --git a/modules/space/kepler.h b/modules/space/kepler.h
index a86aa7e227..c17e487f69 100644
--- a/modules/space/kepler.h
+++ b/modules/space/kepler.h
@@ -58,7 +58,7 @@ struct Parameters {
  * \pre \p file must be a file and must exist
  * \throw ghoul::RuntimeError If the provided \p file is not a valid TLE file
  */
-std::vector<Parameters> readTleFile(std::filesystem::path file);
+std::vector<Parameters> readTleFile(const std::filesystem::path& file);
 
 /**
  * Reads the object information from the provided \p file and returns them as individual
@@ -70,7 +70,7 @@ std::vector<Parameters> readTleFile(std::filesystem::path file);
  * \pre \p file must be a file and must exist
  * \throw ghoul::RuntimeError If the provided \p file is not a valid OMM file
  */
-std::vector<Parameters> readOmmFile(std::filesystem::path file);
+std::vector<Parameters> readOmmFile(const std::filesystem::path& file);
 
 /**
  * Reads the object information from a CSV file following JPL's Small Body Database
@@ -83,7 +83,7 @@ std::vector<Parameters> readOmmFile(std::filesystem::path file);
  * \pre \p file must be a file and must exist
  * \throw ghoul::RuntimeError If the provided \p is not a valid JPL SBDB CSV format
  */
-std::vector<Parameters> readSbdbFile(std::filesystem::path file);
+std::vector<Parameters> readSbdbFile(const std::filesystem::path& file);
 
 /**
  * The different formats that the readFile function is capable of loading.
diff --git a/modules/space/rendering/renderableconstellationbounds.cpp b/modules/space/rendering/renderableconstellationbounds.cpp
index abc67aeaf3..a822d4801c 100644
--- a/modules/space/rendering/renderableconstellationbounds.cpp
+++ b/modules/space/rendering/renderableconstellationbounds.cpp
@@ -145,11 +145,11 @@ void RenderableConstellationBounds::initializeGL() {
     glBufferData(
         GL_ARRAY_BUFFER,
         _vertexValues.size() * 3 * sizeof(float),
-        &_vertexValues[0],
+        _vertexValues.data(),
         GL_STATIC_DRAW
     );
 
-    GLint positionAttrib = _program->attributeLocation("in_position");
+    const GLint positionAttrib = _program->attributeLocation("in_position");
     glEnableVertexAttribArray(positionAttrib);
     glVertexAttribPointer(positionAttrib, 3, GL_FLOAT, GL_FALSE, 0, nullptr);
 
@@ -208,7 +208,7 @@ void RenderableConstellationBounds::render(const RenderData& data, RendererTasks
 }
 
 bool RenderableConstellationBounds::loadData() {
-    bool success = loadVertexFile();
+    const bool success = loadVertexFile();
     if (!success) {
         throw ghoul::RuntimeError("Error loading data");
     }
@@ -245,10 +245,10 @@ bool RenderableConstellationBounds::loadVertexFile() {
 
         // @CHECK: Is this the best way of doing this? ---abock
         std::stringstream s(currentLine);
-        float ra;
+        float ra = 0.f;
         s >> ra;
 
-        float dec;
+        float dec = 0.f;
         s >> dec;
 
         std::string abbreviation;
@@ -275,7 +275,8 @@ bool RenderableConstellationBounds::loadVertexFile() {
             currentBound.isEnabled = true;
             currentBound.constellationAbbreviation = abbreviation;
             std::string name = constellationFullName(abbreviation);
-            currentBound.constellationFullName = name.empty() ? abbreviation : name;
+            currentBound.constellationFullName =
+                name.empty() ? abbreviation : std::move(name);
             currentBound.startIndex = static_cast<GLsizei>(_vertexValues.size());
         }
 
@@ -289,8 +290,8 @@ bool RenderableConstellationBounds::loadVertexFile() {
         // Convert the (right ascension, declination) to rectangular coordinates)
         // The 1.0 is the distance of the celestial sphere, we will scale that in the
         // render function
-        double rectangularValues[3];
-        radrec_c(1.0, ra, dec, rectangularValues);
+        std::array<double, 3> rectangularValues;
+        radrec_c(1.0, ra, dec, rectangularValues.data());
 
         // Add the new vertex to our list of vertices
         _vertexValues.push_back({
diff --git a/modules/space/rendering/renderableconstellationbounds.h b/modules/space/rendering/renderableconstellationbounds.h
index 11e2bc0f08..cc1f354ad9 100644
--- a/modules/space/rendering/renderableconstellationbounds.h
+++ b/modules/space/rendering/renderableconstellationbounds.h
@@ -53,7 +53,7 @@ public:
 
     bool isReady() const override;
 
-    void render(const RenderData& data, RendererTasks& rendererTask) override;
+    void render(const RenderData& data, RendererTasks& tasks) override;
 
     static documentation::Documentation Documentation();
 
diff --git a/modules/space/rendering/renderableconstellationlines.cpp b/modules/space/rendering/renderableconstellationlines.cpp
index a4182b6734..22c6ffe78f 100644
--- a/modules/space/rendering/renderableconstellationlines.cpp
+++ b/modules/space/rendering/renderableconstellationlines.cpp
@@ -152,7 +152,7 @@ void RenderableConstellationLines::selectionPropertyHasChanged() {
     else {
         // Enable all constellations that are selected
         for (ConstellationKeyValuePair& pair : _renderingConstellationsMap) {
-            bool isSelected = _selection.isSelected(pair.second.name);
+            const bool isSelected = _selection.isSelected(pair.second.name);
             pair.second.isEnabled = isSelected;
 
             if (_hasLabels) {
@@ -168,7 +168,7 @@ void RenderableConstellationLines::selectionPropertyHasChanged() {
 }
 
 bool RenderableConstellationLines::isReady() const {
-    bool isReady = _program && !_renderingConstellationsMap.empty();
+    const bool isReady = _program && !_renderingConstellationsMap.empty();
 
     // If we have labels, they also need to be loaded
     if (_hasLabels) {
@@ -301,7 +301,7 @@ void RenderableConstellationLines::update(const UpdateData&) {
 }
 
 bool RenderableConstellationLines::loadData() {
-    bool success = readSpeckFile();
+    const bool success = readSpeckFile();
     if (!success) {
         throw ghoul::RuntimeError("Error loading data");
     }
@@ -347,93 +347,88 @@ bool RenderableConstellationLines::readSpeckFile() {
             continue;
         }
 
-        std::size_t found = line.find("mesh");
-        if (found == std::string::npos) {
+        if (const size_t found = line.find("mesh");  found == std::string::npos) {
             continue;
         }
-        else {
-            // mesh lines are structured as follows:
-            // mesh -c colorindex {
-            // colorindex is the index of the color for the mesh
-            std::stringstream str(line);
 
-            ConstellationLine constellationLine;
-            constellationLine.lineIndex = lineIndex;
+        // mesh lines are structured as follows:
+        // mesh -c colorindex {
+        // colorindex is the index of the color for the mesh
+        std::stringstream str(line);
 
-            std::string dummy;
-            str >> dummy; // mesh command
-            dummy.clear();
-            str >> dummy; // color index command
-            do {
-                if (dummy == "-c") {
-                    str >> constellationLine.colorIndex; // color index
-                }
-                else {
-                    std::string message = fmt::format(
-                        "Unknown command '{}' found in constellation file '{}'",
-                        dummy, fileName
-                    );
-                    LWARNING(message);
-                }
-                dummy.clear();
-                str >> dummy;
-            } while (dummy != "{");
+        ConstellationLine constellationLine;
+        constellationLine.lineIndex = lineIndex;
 
-            std::getline(file, line);
-
-            // Read the identifier
-            std::stringstream id(line);
-            std::string identifier;
-
-            id >> dummy; // id command
-            dummy.clear();
-            std::getline(id, identifier); // identifier
-            ghoul::trimWhitespace(identifier);
-            std::string name = constellationFullName(identifier);
-            if (!name.empty()) {
-                constellationLine.name = name;
-            }
-
-            // Read the number of vertices
-            std::getline(file, line);
-            std::stringstream dim(line);
-            dim >> constellationLine.numV;
-
-            // We can now read the vertices data:
-            for (int l = 0; l < constellationLine.numV; ++l) {
-                std::getline(file, line);
-                if (line.substr(0, 1) == "}") {
-                    break;
-                }
-
-                // Try to read three values for the position
-                glm::vec3 pos;
-                auto reading = scn::scan(line, "{} {} {}", pos.x, pos.y, pos.z);
-                if (reading) {
-                    pos *= scale;
-                    constellationLine.vertices.push_back(pos.x);
-                    constellationLine.vertices.push_back(pos.y);
-                    constellationLine.vertices.push_back(pos.z);
-                }
-                else {
-                    LERROR(fmt::format(
-                        "Failed reading position on line {} of mesh {} in file '{}'. "
-                        "Stopped reading constellation data", l, lineIndex, fileName
-                    ));
-                }
-
-                // Check if new max radius
-                const double r = glm::length(glm::dvec3(pos));
-                maxRadius = std::max(maxRadius, r);
-            }
-
-            std::getline(file, line);
-            if (line.substr(0, 1) == "}") {
-                _renderingConstellationsMap.insert({ lineIndex++, constellationLine });
+        std::string dummy;
+        str >> dummy; // mesh command
+        dummy.clear();
+        str >> dummy; // color index command
+        do {
+            if (dummy == "-c") {
+                str >> constellationLine.colorIndex; // color index
             }
             else {
-                return false;
+                LWARNING(fmt::format(
+                    "Unknown command '{}' found in constellation file '{}'",
+                    dummy, fileName
+                ));
             }
+            dummy.clear();
+            str >> dummy;
+        }
+        while (dummy != "{");
+
+        std::getline(file, line);
+
+        // Read the identifier
+        std::stringstream id(line);
+        std::string identifier;
+
+        id >> dummy; // id command
+        dummy.clear();
+        std::getline(id, identifier); // identifier
+        ghoul::trimWhitespace(identifier);
+        constellationLine.name = constellationFullName(identifier);
+
+        // Read the number of vertices
+        std::getline(file, line);
+        std::stringstream dim(line);
+        dim >> constellationLine.numV;
+
+        // We can now read the vertices data:
+        for (int l = 0; l < constellationLine.numV; ++l) {
+            std::getline(file, line);
+            if (line.substr(0, 1) == "}") {
+                break;
+            }
+
+            // Try to read three values for the position
+            glm::vec3 pos;
+            auto reading = scn::scan(line, "{} {} {}", pos.x, pos.y, pos.z);
+            if (reading) {
+                pos *= scale;
+                constellationLine.vertices.push_back(pos.x);
+                constellationLine.vertices.push_back(pos.y);
+                constellationLine.vertices.push_back(pos.z);
+            }
+            else {
+                LERROR(fmt::format(
+                    "Failed reading position on line {} of mesh {} in file '{}'. "
+                    "Stopped reading constellation data", l, lineIndex, fileName
+                ));
+            }
+
+            // Check if new max radius
+            const double r = glm::length(glm::dvec3(pos));
+            maxRadius = std::max(maxRadius, r);
+        }
+
+        std::getline(file, line);
+        if (line.substr(0, 1) == "}") {
+            _renderingConstellationsMap.insert({ lineIndex++, constellationLine });
+        }
+        else {
+            return false;
         }
     }
     setBoundingSphere(maxRadius);
@@ -445,11 +440,11 @@ void RenderableConstellationLines::createConstellations() {
     LDEBUG("Creating constellations");
 
     for (std::pair<const int, ConstellationLine>& p : _renderingConstellationsMap) {
-        GLuint vao;
+        GLuint vao = 0;
         glGenVertexArrays(1, &vao);
         p.second.vaoArray = vao;
 
-        GLuint vbo;
+        GLuint vbo = 0;
         glGenBuffers(1, &vbo);
         p.second.vboArray = vbo;
 
diff --git a/modules/space/rendering/renderableconstellationlines.h b/modules/space/rendering/renderableconstellationlines.h
index 3c3dd430e9..8d316c7721 100644
--- a/modules/space/rendering/renderableconstellationlines.h
+++ b/modules/space/rendering/renderableconstellationlines.h
@@ -52,7 +52,7 @@ public:
 
     bool isReady() const override;
 
-    void render(const RenderData& data, RendererTasks& rendererTask) override;
+    void render(const RenderData& data, RendererTasks& tasks) override;
     void update(const UpdateData& data) override;
 
     static documentation::Documentation Documentation();
diff --git a/modules/space/rendering/renderableconstellationsbase.cpp b/modules/space/rendering/renderableconstellationsbase.cpp
index 747db8bcd4..7e63dd3df6 100644
--- a/modules/space/rendering/renderableconstellationsbase.cpp
+++ b/modules/space/rendering/renderableconstellationsbase.cpp
@@ -64,7 +64,7 @@ namespace {
         openspace::properties::Property::Visibility::NoviceUser
     };
 
-    const static openspace::properties::PropertyOwner::PropertyOwnerInfo LabelsInfo = {
+    const openspace::properties::PropertyOwner::PropertyOwnerInfo LabelsInfo = {
         "Labels",
         "Labels",
         "The labels for the constellations"
@@ -198,7 +198,7 @@ void RenderableConstellationsBase::initialize() {
         if (!entry.identifier.empty()) {
             std::string fullName = constellationFullName(entry.identifier);
             if (!fullName.empty()) {
-                entry.text = fullName;
+                entry.text = std::move(fullName);
             }
         }
     }
@@ -228,7 +228,7 @@ void RenderableConstellationsBase::render(const RenderData& data, RendererTasks&
     );
 
     if (orthoRight == glm::vec3(0.f)) {
-        glm::vec3 otherVector(lookup.y, lookup.x, lookup.z);
+        const glm::vec3 otherVector = glm::vec3(lookup.y, lookup.x, lookup.z);
         right = glm::cross(viewDirection, otherVector);
         orthoRight = glm::normalize(
             glm::vec3(worldToModelTransform * glm::vec4(right, 0.f))
diff --git a/modules/space/rendering/renderableeclipsecone.cpp b/modules/space/rendering/renderableeclipsecone.cpp
index 928a1e9cbe..e32464c884 100644
--- a/modules/space/rendering/renderableeclipsecone.cpp
+++ b/modules/space/rendering/renderableeclipsecone.cpp
@@ -329,15 +329,15 @@ std::vector<VBOLayout> calculateShadowPoints(const std::vector<glm::dvec3>& srcT
         // reference frame of the Moon
         const glm::dvec3 src =
             lightSourceToShadower * srcTerminator[i] + shadowerToLightSource;
-        const glm::dvec3 dst = dstTerminator[i];
+        const glm::dvec3& dst = dstTerminator[i];
         const glm::dvec3 dir = glm::normalize(dst - src);
 
         // The start point is the terminator point on the Moon
-        glm::vec3 p1 = dst;
+        const glm::vec3 p1 = dst;
         vertices.push_back({ p1.x, p1.y, p1.z });
 
         // The end point is calculated by forward propagating the incoming direction
-        glm::vec3 p2 = dst + dir * lengthScale;
+        const glm::vec3 p2 = dst + dir * lengthScale;
         vertices.push_back({ p2.x, p2.y, p2.z });
     }
     return vertices;
@@ -428,7 +428,7 @@ void RenderableEclipseCone::createCone(double et) {
 
 
     // 3. Get the necessary conversion distances and matrices
-    glm::dvec3 diff = SpiceManager::ref().targetPosition(
+    const glm::dvec3 diff = SpiceManager::ref().targetPosition(
         _shadowee,
         _shadower,
         "GALACTIC",
@@ -451,7 +451,7 @@ void RenderableEclipseCone::createCone(double et) {
         },
         et
     ) * 1000.0; // to meter
-    glm::dmat3 lightSourceToShadower = SpiceManager::ref().frameTransformationMatrix(
+    const glm::dmat3 lightToShadower = SpiceManager::ref().frameTransformationMatrix(
         _lightSourceFrame, _shadowerFrame, et
     );
 
@@ -463,7 +463,7 @@ void RenderableEclipseCone::createCone(double et) {
             resSrc.terminatorPoints,
             resDst.terminatorPoints,
             shadowerToLightSource,
-            lightSourceToShadower,
+            lightToShadower,
             distance * static_cast<double>(_shadowLength)
         );
 
@@ -488,7 +488,7 @@ void RenderableEclipseCone::createCone(double et) {
             resSrc.terminatorPoints,
             resDst.terminatorPoints,
             shadowerToLightSource,
-            lightSourceToShadower,
+            lightToShadower,
             distance * static_cast<double>(_shadowLength)
         );
 
diff --git a/modules/space/rendering/renderablefluxnodes.cpp b/modules/space/rendering/renderablefluxnodes.cpp
index 4070b993c4..c1679c2057 100644
--- a/modules/space/rendering/renderablefluxnodes.cpp
+++ b/modules/space/rendering/renderablefluxnodes.cpp
@@ -447,9 +447,9 @@ void RenderableFluxNodes::loadNodeData(int energybinOption) {
             break;
     }
 
-    std::string file = _binarySourceFolderPath.string() + "\\positions" + energybin;
-    std::string file2 = _binarySourceFolderPath.string() + "\\fluxes" + energybin;
-    std::string file3 = _binarySourceFolderPath.string() + "\\radiuses" + energybin;
+    const std::string file = _binarySourceFolderPath.string() + "\\positions" + energybin;
+    const std::string file2 = _binarySourceFolderPath.string() + "\\fluxes" + energybin;
+    const std::string file3 = _binarySourceFolderPath.string() + "\\radiuses" + energybin;
 
     std::ifstream fileStream(file, std::ifstream::binary);
     std::ifstream fileStream2(file2, std::ifstream::binary);
@@ -581,21 +581,21 @@ bool RenderableFluxNodes::isReady() const {
 void RenderableFluxNodes::populateStartTimes() {
     std::string timeFile;
     for (const std::string& filePath : _binarySourceFiles) {
-        if (filePath.substr(filePath.find_last_of(".") + 1) == "csv") {
+        if (filePath.substr(filePath.find_last_of('.') + 1) == "csv") {
             timeFile = filePath;
             break;
         }
-        else if (filePath.substr(filePath.find_last_of(".") + 1) == "dat") {
+        else if (filePath.substr(filePath.find_last_of('.') + 1) == "dat") {
             timeFile = filePath;
             break;
         }
-        else if (filePath.substr(filePath.find_last_of(".") + 1) == "txt") {
+        else if (filePath.substr(filePath.find_last_of('.') + 1) == "txt") {
             timeFile = filePath;
             break;
         }
         //if no file extention but word "time" in file name
         else if (filePath.find("time") != std::string::npos &&
-                    filePath.find(".") == std::string::npos)
+                 filePath.find('.') == std::string::npos)
         {
             timeFile = filePath;
             break;
@@ -659,7 +659,7 @@ void RenderableFluxNodes::updateActiveTriggerTimeIndex(double currentTime) {
     auto iter = std::upper_bound(_startTimes.begin(), _startTimes.end(), currentTime);
     if (iter != _startTimes.end()) {
         if (iter != _startTimes.begin()) {
-            std::ptrdiff_t idx = std::distance(_startTimes.begin(), iter);
+            const std::ptrdiff_t idx = std::distance(_startTimes.begin(), iter);
             _activeTriggerTimeIndex = static_cast<int>(idx) - 1;
         }
         else {
@@ -692,7 +692,7 @@ void RenderableFluxNodes::render(const RenderData& data, RendererTasks&) {
     if (!earthNode) {
         LWARNING("Could not find scene graph node 'Earth'");
     }
-    glm::vec3 earthPos = glm::vec3(
+    const glm::vec3 earthPos = glm::vec3(
         earthNode->worldPosition() * data.modelTransform.rotation
     );
 
@@ -749,7 +749,7 @@ void RenderableFluxNodes::render(const RenderData& data, RendererTasks&) {
         _gaussianPulseEnabled
     );
 
-    glm::vec3 cameraPos = data.camera.positionVec3() * data.modelTransform.rotation;
+    const glm::vec3 cameraPos = data.camera.positionVec3() * data.modelTransform.rotation;
 
     _shaderProgram->setUniform("cameraPos", cameraPos);
 
@@ -824,7 +824,6 @@ void RenderableFluxNodes::update(const UpdateData& data) {
         _vertexPositions = _statesPos[_activeTriggerTimeIndex];
         _vertexColor = _statesColor[_activeTriggerTimeIndex];
         _vertexRadius = _statesRadius[_activeTriggerTimeIndex];
-        needsUpdate = false;
         updatePositionBuffer();
         updateVertexColorBuffer();
         updateVertexFilteringBuffer();
diff --git a/modules/space/rendering/renderablehabitablezone.cpp b/modules/space/rendering/renderablehabitablezone.cpp
index afdafa46fa..276d8ea5a5 100644
--- a/modules/space/rendering/renderablehabitablezone.cpp
+++ b/modules/space/rendering/renderablehabitablezone.cpp
@@ -221,8 +221,8 @@ glm::dvec4 RenderableHabitableZone::computeKopparapuZoneBoundaries(float teff,
         // For the other stars, use a method by Tom E. Morris:
         // https://www.planetarybiology.com/calculating_habitable_zone.html
         const double L = static_cast<double>(luminosity);
-        double inner = std::sqrt(L / 1.1);
-        double outer = std::sqrt(L / 0.53);
+        const double inner = std::sqrt(L / 1.1);
+        const double outer = std::sqrt(L / 0.53);
         return glm::dvec4(inner, inner, outer, outer);
     }
 
@@ -236,15 +236,15 @@ glm::dvec4 RenderableHabitableZone::computeKopparapuZoneBoundaries(float teff,
 
     // Coefficients for planets of 1 Earth mass. Received from:
     // https://depts.washington.edu/naivpl/sites/default/files/HZ_coefficients.dat
-    constexpr Coefficients coefficients[] = {
+    constexpr std::array<Coefficients, 4> coefficients = {
         // Optimistic Inner boundary - Recent Venus
-        { 1.77600E+00, 2.13600E-04, 2.53300E-08, -1.33200E-11, -3.09700E-15 },
+        Coefficients{ 1.77600E+00, 2.13600E-04, 2.53300E-08, -1.33200E-11, -3.09700E-15 },
         // Conservative Inner boundary - Runaway greenhouse
-        { 1.10700E+00, 1.33200E-04, 1.58000E-08, -8.30800E-12, -1.93100E-15 },
+        Coefficients{ 1.10700E+00, 1.33200E-04, 1.58000E-08, -8.30800E-12, -1.93100E-15 },
         // Conservative Outer boundary - Maximum greenhouse
-        { 3.56000E-01, 6.17100E-05, 1.69800E-09, -3.19800E-12, -5.57500E-16 },
+        Coefficients{ 3.56000E-01, 6.17100E-05, 1.69800E-09, -3.19800E-12, -5.57500E-16 },
         // Optimistic Outer boundary - Early Mars
-        { 3.20000E-01, 5.54700E-05, 1.52600E-09, -2.87400E-12, -5.01100E-16 }
+        Coefficients{ 3.20000E-01, 5.54700E-05, 1.52600E-09, -2.87400E-12, -5.01100E-16 }
     };
 
     const double tstar = static_cast<double>(teff - 5780.f);
@@ -254,7 +254,7 @@ glm::dvec4 RenderableHabitableZone::computeKopparapuZoneBoundaries(float teff,
     glm::dvec4 distances;
     for (int i = 0; i < 4; i++) {
         const Coefficients& coeffs = coefficients[i];
-        double seff = coeffs.seffSun + (coeffs.a * tstar) + (coeffs.b * tstar2) +
+        const double seff = coeffs.seffSun + (coeffs.a * tstar) + (coeffs.b * tstar2) +
             (coeffs.c * tstar * tstar2) + (coeffs.d * tstar2 * tstar2);
 
         distances[i] = std::pow(L / seff, 0.5);
diff --git a/modules/space/rendering/renderableorbitalkepler.cpp b/modules/space/rendering/renderableorbitalkepler.cpp
index d5ea2d4de2..217efc3f89 100644
--- a/modules/space/rendering/renderableorbitalkepler.cpp
+++ b/modules/space/rendering/renderableorbitalkepler.cpp
@@ -39,8 +39,8 @@
 #include <ghoul/opengl/programobject.h>
 #include <ghoul/logging/logmanager.h>
 #include <chrono>
+#include <cmath>
 #include <fstream>
-#include <math.h>
 #include <random>
 #include <vector>
 
@@ -274,7 +274,10 @@ void RenderableOrbitalKepler::render(const RenderData& data, RendererTasks&) {
     _programObject->setUniform(_uniformCache.modelView, calcModelViewTransform(data));
 
     // Because we want the property to work similar to the planet trails
-    const float fade = pow(_appearance.lineFade.maxValue() - _appearance.lineFade, 2.f);
+    const float fade = std::pow(
+        _appearance.lineFade.maxValue() - _appearance.lineFade,
+        2.f
+    );
 
     _programObject->setUniform(_uniformCache.projection, data.camera.projectionMatrix());
     _programObject->setUniform(_uniformCache.color, _appearance.lineColor);
@@ -366,7 +369,7 @@ void RenderableOrbitalKepler::updateBuffers() {
 
     size_t nVerticesTotal = 0;
 
-    int numOrbits = static_cast<int>(parameters.size());
+    const int numOrbits = static_cast<int>(parameters.size());
     for (int i = 0; i < numOrbits; i++) {
         nVerticesTotal += _segmentSize[i];
     }
@@ -389,10 +392,10 @@ void RenderableOrbitalKepler::updateBuffers() {
         );
 
         for (GLint j = 0 ; j < (_segmentSize[orbitIdx]); j++) {
-            double timeOffset = orbit.period *
+            const double timeOffset = orbit.period *
                 static_cast<double>(j) / static_cast<double>(_segmentSize[orbitIdx] - 1);
 
-            glm::dvec3 position = keplerTranslator.position({
+            const glm::dvec3 position = keplerTranslator.position({
                 {},
                 Time(timeOffset + orbit.epoch),
                 Time(0.0)
diff --git a/modules/space/rendering/renderablerings.cpp b/modules/space/rendering/renderablerings.cpp
index 54ff607863..574a29fa2a 100644
--- a/modules/space/rendering/renderablerings.cpp
+++ b/modules/space/rendering/renderablerings.cpp
@@ -271,18 +271,18 @@ void RenderableRings::createPlane() {
         GLfloat t;
     };
 
-    VertexData data[] = {
-        { -size, -size, 0.f, 0.f },
-        {  size,  size, 1.f, 1.f },
-        { -size,  size, 0.f, 1.f },
-        { -size, -size, 0.f, 0.f },
-        {  size, -size, 1.f, 0.f },
-        {  size,  size, 1.f, 1.f },
+    const std::array<VertexData, 6> Data = {
+        VertexData{ -size, -size, 0.f, 0.f },
+        VertexData{  size,  size, 1.f, 1.f },
+        VertexData{ -size,  size, 0.f, 1.f },
+        VertexData{ -size, -size, 0.f, 0.f },
+        VertexData{  size, -size, 1.f, 0.f },
+        VertexData{  size,  size, 1.f, 1.f },
     };
 
     glBindVertexArray(_quad);
     glBindBuffer(GL_ARRAY_BUFFER, _vertexPositionBuffer);
-    glBufferData(GL_ARRAY_BUFFER, sizeof(data), data, GL_STATIC_DRAW);
+    glBufferData(GL_ARRAY_BUFFER, Data.size(), Data.data(), GL_STATIC_DRAW);
     glEnableVertexAttribArray(0);
     glVertexAttribPointer(
         0,
diff --git a/modules/space/rendering/renderablestars.cpp b/modules/space/rendering/renderablestars.cpp
index 51297fa304..444f7e63bc 100644
--- a/modules/space/rendering/renderablestars.cpp
+++ b/modules/space/rendering/renderablestars.cpp
@@ -770,8 +770,7 @@ RenderableStars::RenderableStars(const ghoul::Dictionary& dictionary)
     addPropertySubOwner(_moffatMethodOwner);
 
     if (p.fadeInDistances.has_value()) {
-        glm::vec2 v = *p.fadeInDistances;
-        _fadeInDistances = v;
+        _fadeInDistances = *p.fadeInDistances;
         _disableFadeInDistance = false;
         _fadeInDistances.setViewOption(properties::Property::ViewOptions::MinMaxRange);
         addProperty(_fadeInDistances);
@@ -779,8 +778,6 @@ RenderableStars::RenderableStars(const ghoul::Dictionary& dictionary)
     }
 }
 
-RenderableStars::~RenderableStars() {}
-
 bool RenderableStars::isReady() const {
     return _program && _pointSpreadFunctionTexture;
 }
@@ -801,7 +798,7 @@ void RenderableStars::initializeGL() {
     // data value actually exists or not.  Once we determine the index, we no longer
     // need the value and can clear it
     if (!_queuedOtherData.empty()) {
-        int idx = _dataset.index(_queuedOtherData);
+        const int idx = _dataset.index(_queuedOtherData);
         if (idx == -1) {
             LERROR(fmt::format("Could not find other data column {}", _queuedOtherData));
         }
@@ -929,7 +926,7 @@ void RenderableStars::loadPSFTexture() {
 
 void RenderableStars::renderPSFToTexture() {
     // Creates the FBO for the calculations
-    GLuint psfFBO;
+    GLuint psfFBO = 0;
     glGenFramebuffers(1, &psfFBO);
     glBindFramebuffer(GL_FRAMEBUFFER, psfFBO);
     GLenum drawBuffers[1] = { GL_COLOR_ATTACHMENT0 };
@@ -1039,20 +1036,20 @@ void RenderableStars::render(const RenderData& data, RendererTasks&) {
 
     _program->activate();
 
-    glm::dvec3 eyePosition = glm::dvec3(
+    const glm::dvec3 eyePosition = glm::dvec3(
         glm::inverse(data.camera.combinedViewMatrix()) * glm::dvec4(0.0, 0.0, 0.0, 1.0)
     );
     _program->setUniform(_uniformCache.eyePosition, eyePosition);
 
-    glm::dvec3 cameraUp = data.camera.lookUpVectorWorldSpace();
+    const glm::dvec3 cameraUp = data.camera.lookUpVectorWorldSpace();
     _program->setUniform(_uniformCache.cameraUp, cameraUp);
 
-    glm::dmat4 modelMatrix = calcModelTransform(data);
+    const glm::dmat4 modelMatrix = calcModelTransform(data);
 
-    glm::dmat4 projectionMatrix = glm::dmat4(data.camera.projectionMatrix());
+    const glm::dmat4 projectionMatrix = glm::dmat4(data.camera.projectionMatrix());
 
-    glm::dmat4 cameraViewProjectionMatrix = projectionMatrix *
-                                            data.camera.combinedViewMatrix();
+    const glm::dmat4 cameraViewProjectionMatrix =
+        projectionMatrix * data.camera.combinedViewMatrix();
 
     _program->setUniform(_uniformCache.modelMatrix, modelMatrix);
     _program->setUniform(
@@ -1076,7 +1073,7 @@ void RenderableStars::render(const RenderData& data, RendererTasks&) {
 
     float fadeInVariable = 1.f;
     if (!_disableFadeInDistance) {
-        float distCamera = static_cast<float>(glm::length(data.camera.positionVec3()));
+        const float distCamera = static_cast<float>(glm::length(data.camera.positionVec3()));
         const glm::vec2 fadeRange = _fadeInDistances;
         const double a = 1.f / ((fadeRange.y - fadeRange.x) * PARSEC);
         const double b = -(fadeRange.x / (fadeRange.y - fadeRange.x));
@@ -1170,16 +1167,16 @@ void RenderableStars::update(const UpdateData&) {
             GL_STATIC_DRAW
         );
 
-        GLint positionAttrib = _program->attributeLocation("in_position");
+        const GLint positionAttrib = _program->attributeLocation("in_position");
         // bvLumAbsMagAppMag = bv color, luminosity, abs magnitude and app magnitude
-        GLint bvLumAbsMagAppMagAttrib = _program->attributeLocation(
+        const GLint bvLumAbsMagAppMagAttrib = _program->attributeLocation(
             "in_bvLumAbsMagAppMag"
         );
 
         const size_t nStars = _dataset.entries.size();
         const size_t nValues = slice.size() / nStars;
 
-        GLsizei stride = static_cast<GLsizei>(sizeof(GLfloat) * nValues);
+        const GLsizei stride = static_cast<GLsizei>(sizeof(GLfloat) * nValues);
 
         glEnableVertexAttribArray(positionAttrib);
         glEnableVertexAttribArray(bvLumAbsMagAppMagAttrib);
@@ -1224,7 +1221,7 @@ void RenderableStars::update(const UpdateData&) {
                     reinterpret_cast<void*>(offsetof(VelocityVBOLayout, value))
                 );
 
-                GLint velocityAttrib = _program->attributeLocation("in_velocity");
+                const GLint velocityAttrib = _program->attributeLocation("in_velocity");
                 glEnableVertexAttribArray(velocityAttrib);
                 glVertexAttribPointer(
                     velocityAttrib,
@@ -1256,7 +1253,7 @@ void RenderableStars::update(const UpdateData&) {
                     reinterpret_cast<void*>(offsetof(SpeedVBOLayout, value))
                 );
 
-                GLint speedAttrib = _program->attributeLocation("in_speed");
+                const GLint speedAttrib = _program->attributeLocation("in_speed");
                 glEnableVertexAttribArray(speedAttrib);
                 glVertexAttribPointer(
                     speedAttrib,
@@ -1303,7 +1300,7 @@ void RenderableStars::update(const UpdateData&) {
     if (_colorTextureIsDirty) {
         LDEBUG("Reloading Color Texture");
         _colorTexture = nullptr;
-        if (_colorTexturePath.value() != "") {
+        if (!_colorTexturePath.value().empty()) {
             _colorTexture = ghoul::io::TextureReader::ref().loadTexture(
                 absPath(_colorTexturePath).string(),
                 1
@@ -1351,7 +1348,7 @@ void RenderableStars::update(const UpdateData&) {
 }
 
 void RenderableStars::loadData() {
-    std::filesystem::path file = absPath(_speckFile);
+    const std::filesystem::path file = absPath(_speckFile);
     if (!std::filesystem::is_regular_file(file)) {
         return;
     }
@@ -1368,7 +1365,7 @@ void RenderableStars::loadData() {
     }
     _otherDataOption.addOptions(variableNames);
 
-    bool success = _dataset.normalizeVariable("lum");
+    const bool success = _dataset.normalizeVariable("lum");
     if (!success) {
         throw ghoul::RuntimeError("Could not find required variable 'luminosity'");
     }
@@ -1487,7 +1484,7 @@ std::vector<float> RenderableStars::createDataSlice(ColorOption option) {
                     static_cast<float>(position[2])
                 }};
 
-                int index = _otherDataOption.value();
+                const int index = _otherDataOption.value();
                 // plus 3 because of the position
                 layout.value.value = e.data[index];
 
diff --git a/modules/space/rendering/renderablestars.h b/modules/space/rendering/renderablestars.h
index 3119e48614..cc42931b15 100644
--- a/modules/space/rendering/renderablestars.h
+++ b/modules/space/rendering/renderablestars.h
@@ -52,7 +52,7 @@ namespace documentation { struct Documentation; }
 class RenderableStars : public Renderable {
 public:
     explicit RenderableStars(const ghoul::Dictionary& dictionary);
-    ~RenderableStars() override;
+    ~RenderableStars() override = default;
 
     void initializeGL() override;
     void deinitializeGL() override;
diff --git a/modules/space/rendering/renderabletravelspeed.cpp b/modules/space/rendering/renderabletravelspeed.cpp
index b2bb48429e..5b3ab4d252 100644
--- a/modules/space/rendering/renderabletravelspeed.cpp
+++ b/modules/space/rendering/renderabletravelspeed.cpp
@@ -153,10 +153,8 @@ RenderableTravelSpeed::RenderableTravelSpeed(const ghoul::Dictionary& dictionary
         if (SceneGraphNode* n = sceneGraphNode(_targetName);  n) {
             _targetNode = n;
             _targetPosition = _targetNode->worldPosition();
-            _lightTravelTime = calculateLightTravelTime(
-                _sourcePosition,
-                _targetPosition
-            );
+            _lightTravelTime =
+                glm::distance(_targetPosition, _sourcePosition) / _travelSpeed;
             calculateDirectionVector();
             reinitiateTravel();
         }
@@ -164,9 +162,7 @@ RenderableTravelSpeed::RenderableTravelSpeed(const ghoul::Dictionary& dictionary
 
     _travelSpeed = p.travelSpeed.value_or(_travelSpeed);
     addProperty(_travelSpeed);
-    _travelSpeed.onChange([this]() {
-        reinitiateTravel();
-    });
+    _travelSpeed.onChange([this]() { reinitiateTravel(); });
 }
 
 void RenderableTravelSpeed::initialize() {
@@ -205,11 +201,6 @@ void RenderableTravelSpeed::deinitializeGL() {
     glDeleteBuffers(1, &_vBufferId);
 }
 
-double RenderableTravelSpeed::calculateLightTravelTime(glm::dvec3 startPosition,
-    glm::dvec3 targetPosition) {
-    return glm::distance(targetPosition, startPosition) / _travelSpeed;
-}
-
 void RenderableTravelSpeed::calculateDirectionVector() {
     _directionVector = glm::normalize(_targetPosition - _sourcePosition);
 }
@@ -273,10 +264,7 @@ void RenderableTravelSpeed::update(const UpdateData& data) {
     ghoul_assert(mySGNPointer, "Renderable have to be owned by scene graph node");
     _sourcePosition = mySGNPointer->worldPosition();
 
-    _lightTravelTime = calculateLightTravelTime(
-        _sourcePosition,
-        _targetPosition
-    );
+    _lightTravelTime = glm::distance(_targetPosition, _sourcePosition) / _travelSpeed;
 
     const double currentTime = data.time.j2000Seconds();
     // Unless we've reached the target
diff --git a/modules/space/rendering/renderabletravelspeed.h b/modules/space/rendering/renderabletravelspeed.h
index d1d9f2bf7f..d6bc9148a2 100644
--- a/modules/space/rendering/renderabletravelspeed.h
+++ b/modules/space/rendering/renderabletravelspeed.h
@@ -53,7 +53,6 @@ public:
     void update(const UpdateData& data) override;
 
 private:
-    double calculateLightTravelTime(glm::dvec3 startPosition, glm::dvec3 targetPosition);
     void calculateVerticesPositions();
     void calculateDirectionVector();
     void updateVertexData();
diff --git a/modules/space/rotation/spicerotation.cpp b/modules/space/rotation/spicerotation.cpp
index 308954107f..53d4d42cde 100644
--- a/modules/space/rotation/spicerotation.cpp
+++ b/modules/space/rotation/spicerotation.cpp
@@ -112,7 +112,7 @@ SpiceRotation::SpiceRotation(const ghoul::Dictionary& dictionary)
     addProperty(_fixedDate);
 
     if (dictionary.hasKey(TimeFrameInfo.identifier)) {
-        ghoul::Dictionary timeFrameDictionary =
+        const ghoul::Dictionary timeFrameDictionary =
             dictionary.value<ghoul::Dictionary>(TimeFrameInfo.identifier);
         _timeFrame = TimeFrame::createFromDictionary(timeFrameDictionary);
         if (_timeFrame == nullptr) {
diff --git a/modules/space/translation/gptranslation.cpp b/modules/space/translation/gptranslation.cpp
index 0def33012c..145acd8772 100644
--- a/modules/space/translation/gptranslation.cpp
+++ b/modules/space/translation/gptranslation.cpp
@@ -77,7 +77,7 @@ GPTranslation::GPTranslation(const ghoul::Dictionary& dictionary) {
         ));
     }
 
-    kepler::Parameters param = parameters[element - 1];
+    const kepler::Parameters& param = parameters[element - 1];
     setKeplerElements(
         param.eccentricity,
         param.semiMajorAxis,
diff --git a/modules/space/translation/horizonstranslation.cpp b/modules/space/translation/horizonstranslation.cpp
index bec5c261f3..ced6f1ec14 100644
--- a/modules/space/translation/horizonstranslation.cpp
+++ b/modules/space/translation/horizonstranslation.cpp
@@ -94,7 +94,7 @@ HorizonsTranslation::HorizonsTranslation(const ghoul::Dictionary& dictionary)
         _horizonsTextFiles = files;
     }
     else if (std::holds_alternative<std::vector<std::string>>(p.horizonsTextFile)) {
-        std::vector<std::string> files =
+        const std::vector<std::string> files =
             std::get<std::vector<std::string>>(p.horizonsTextFile);
 
         for (const std::string& file : files) {
@@ -122,11 +122,11 @@ glm::dvec3 HorizonsTranslation::position(const UpdateData& data) const {
 
     if (lastBefore && firstAfter) {
         // We're inbetween first and last value.
-        double timelineDiff = firstAfter->timestamp - lastBefore->timestamp;
-        double timeDiff = data.time.j2000Seconds() - lastBefore->timestamp;
-        double diff = (timelineDiff > DBL_EPSILON) ? timeDiff / timelineDiff : 0.0;
+        const double timelineDiff = firstAfter->timestamp - lastBefore->timestamp;
+        const double timeDiff = data.time.j2000Seconds() - lastBefore->timestamp;
+        const double diff = (timelineDiff > DBL_EPSILON) ? timeDiff / timelineDiff : 0.0;
 
-        glm::dvec3 dir = firstAfter->data - lastBefore->data;
+        const glm::dvec3 dir = firstAfter->data - lastBefore->data;
         interpolatedPos = lastBefore->data + dir * diff;
     }
     else if (lastBefore) {
@@ -150,7 +150,7 @@ void HorizonsTranslation::loadData() {
         }
 
         std::filesystem::path cachedFile = FileSys.cacheManager()->cachedFilename(file);
-        bool hasCachedFile = std::filesystem::is_regular_file(cachedFile);
+        const bool hasCachedFile = std::filesystem::is_regular_file(cachedFile);
         if (hasCachedFile) {
             LINFO(fmt::format(
                 "Cached file '{}' used for Horizon file '{}'", cachedFile, file
@@ -244,7 +244,7 @@ bool HorizonsTranslation::loadCachedFile(const std::filesystem::path& file) {
     for (int i = 0; i < nKeyframes; i++) {
         // Add keyframe in timeline
         _timeline.addKeyframe(
-            std::move(cacheKeyframes[i].timestamp),
+            cacheKeyframes[i].timestamp,
             {
                 cacheKeyframes[i].position[0],
                 cacheKeyframes[i].position[1],
diff --git a/modules/space/translation/keplertranslation.cpp b/modules/space/translation/keplertranslation.cpp
index 1bd8571bec..547a5b1efa 100644
--- a/modules/space/translation/keplertranslation.cpp
+++ b/modules/space/translation/keplertranslation.cpp
@@ -236,7 +236,7 @@ double KeplerTranslation::eccentricAnomaly(double meanAnomaly) const {
         auto sign = [](double val) -> double {
             return val > 0.0 ? 1.0 : ((val < 0.0) ? -1.0 : 0.0);
         };
-        double e = meanAnomaly + 0.85 * _eccentricity * sign(sin(meanAnomaly));
+        const double e = meanAnomaly + 0.85 * _eccentricity * sign(sin(meanAnomaly));
 
         auto solver = [this, &meanAnomaly, &sign](double x) -> double {
             const double s = _eccentricity * sin(x);
diff --git a/modules/spacecraftinstruments/dashboard/dashboarditeminstruments.cpp b/modules/spacecraftinstruments/dashboard/dashboarditeminstruments.cpp
index 25ffc06545..c4f38f3e46 100644
--- a/modules/spacecraftinstruments/dashboard/dashboarditeminstruments.cpp
+++ b/modules/spacecraftinstruments/dashboard/dashboarditeminstruments.cpp
@@ -72,8 +72,8 @@ namespace {
         return progress;
     }
 
-    glm::vec2 addToBoundingbox(glm::vec2 lhs, glm::vec2 rhs) {
-        return { std::max(lhs.x, rhs.x), lhs.y + rhs.y };
+    glm::vec2 addToBoundingbox(const glm::vec2& lhs, const glm::vec2& rhs) {
+        return glm::vec2(std::max(lhs.x, rhs.x), lhs.y + rhs.y);
     }
 
     struct [[codegen::Dictionary(DashboardItemInstruments)]] Parameters {
@@ -122,7 +122,7 @@ DashboardItemInstruments::DashboardItemInstruments(const ghoul::Dictionary& dict
 void DashboardItemInstruments::render(glm::vec2& penPosition) {
     ZoneScoped;
 
-    double currentTime = global::timeManager->time().j2000Seconds();
+    const double currentTime = global::timeManager->time().j2000Seconds();
 
     if (!ImageSequencer::ref().isReady()) {
         return;
@@ -133,9 +133,9 @@ void DashboardItemInstruments::render(glm::vec2& penPosition) {
 
     constexpr glm::vec4 targetColor(0.f, 0.75f, 1.f, 1.f);
 
-    double previous = sequencer.prevCaptureTime(currentTime);
-    double next = sequencer.nextCaptureTime(currentTime);
-    double remaining = next - currentTime;
+    const double previous = sequencer.prevCaptureTime(currentTime);
+    const double next = sequencer.nextCaptureTime(currentTime);
+    const double remaining = next - currentTime;
     float t = static_cast<float>(1.0 - remaining / (next - previous));
     t = std::clamp(t, 0.f, 1.f);
 
@@ -156,7 +156,7 @@ void DashboardItemInstruments::render(glm::vec2& penPosition) {
         }
 
         const int Size = 25;
-        int p = std::max(static_cast<int>((t * (Size - 1)) + 1), 0);
+        const int p = std::max(static_cast<int>((t * (Size - 1)) + 1), 0);
         RenderFont(
             *_font,
             penPosition,
@@ -215,7 +215,7 @@ void DashboardItemInstruments::render(glm::vec2& penPosition) {
     const std::vector<std::pair<std::string, bool>>& activeMap =
         sequencer.activeInstruments(currentTime);
 
-    glm::vec4 firing = glm::vec4(0.58f - t, 1.f - t, 1.f - t, 1.f);
+    const glm::vec4 firing = glm::vec4(0.58f - t, 1.f - t, 1.f - t, 1.f);
 
     RenderFont(
         *_font,
@@ -253,24 +253,24 @@ void DashboardItemInstruments::render(glm::vec2& penPosition) {
 }
 
 glm::vec2 DashboardItemInstruments::size() const {
-    glm::vec2 size = glm::vec2(0.f);
-    double currentTime = global::timeManager->time().j2000Seconds();
+    const double time = global::timeManager->time().j2000Seconds();
 
     if (!ImageSequencer::ref().isReady()) {
         return glm::vec2(0.f);
     }
-    ImageSequencer& sequencer = ImageSequencer::ref();
+    const ImageSequencer& sequencer = ImageSequencer::ref();
 
-    double previous = sequencer.prevCaptureTime(currentTime);
-    double next = sequencer.nextCaptureTime(currentTime);
-    double remaining = sequencer.nextCaptureTime(currentTime) - currentTime;
+    const double previous = sequencer.prevCaptureTime(time);
+    const double next = sequencer.nextCaptureTime(time);
+    const double remaining = sequencer.nextCaptureTime(time) - time;
     const float t = static_cast<float>(1.0 - remaining / (next - previous));
 
     const std::string& str = SpiceManager::ref().dateFromEphemerisTime(
-        sequencer.nextCaptureTime(currentTime),
+        sequencer.nextCaptureTime(time),
         "YYYY MON DD HR:MN:SC"
     );
 
+    glm::vec2 size = glm::vec2(0.f);
     if (remaining > 0.0) {
         std::string progress = progressToStr(25, t);
 
@@ -288,14 +288,14 @@ glm::vec2 DashboardItemInstruments::size() const {
             _font->boundingBox(fmt::format("Data acquisition time: {}", str))
         );
     }
-    std::pair<double, std::string> nextTarget = sequencer.nextTarget(currentTime);
-    std::pair<double, std::string> currentTarget = sequencer.currentTarget(currentTime);
+    const std::pair<double, std::string> nextTarget = sequencer.nextTarget(time);
+    const std::pair<double, std::string> currentTarget = sequencer.currentTarget(time);
 
     if (currentTarget.first <= 0.0) {
         return size;
     }
 
-    const int timeleft = static_cast<int>(nextTarget.first - currentTime);
+    const int timeleft = static_cast<int>(nextTarget.first - time);
 
     const int hour = timeleft / 3600;
     int second = timeleft % 3600;
diff --git a/modules/spacecraftinstruments/rendering/renderablecrawlingline.cpp b/modules/spacecraftinstruments/rendering/renderablecrawlingline.cpp
index ab89151dbc..5654208eac 100644
--- a/modules/spacecraftinstruments/rendering/renderablecrawlingline.cpp
+++ b/modules/spacecraftinstruments/rendering/renderablecrawlingline.cpp
@@ -36,8 +36,8 @@
 
 namespace {
     struct VBOData {
-        float position[3];
-        float color[4];
+        std::array<float, 3> position;
+        std::array<float, 4> color;
     };
 
     struct [[codegen::Dictionary(RenderableCrawlingLine)]] Parameters {
@@ -142,13 +142,12 @@ void RenderableCrawlingLine::render(const RenderData& data, RendererTasks&) {
     _program->activate();
     _frameCounter++;
 
-    glm::dmat4 modelViewProjectionTransform = calcModelViewProjectionTransform(data);
+    const glm::dmat4 modelViewProjection = calcModelViewProjectionTransform(data);
+    _program->setUniform("modelViewProjection", modelViewProjection);
 
-    _program->setUniform("modelViewProjection", modelViewProjectionTransform);
-
-    int frame = _frameCounter % 60;
-    float fadingFactor = static_cast<float>(sin((frame * glm::pi<float>()) / 60));
-    float alpha = 0.6f + fadingFactor*0.4f;
+    const int frame = _frameCounter % 60;
+    const float fadingFactor = std::sin(frame * glm::pi<float>() / 60.f);
+    const float alpha = 0.6f + fadingFactor * 0.4f;
 
     glLineWidth(2.f);
 
@@ -176,12 +175,12 @@ void RenderableCrawlingLine::update(const UpdateData& data) {
     const glm::dvec3 boresight = res.boresightVector;
     const glm::vec4 target = glm::dmat4(tm) * glm::vec4(boresight, 12);
 
-    VBOData vboData[2] = {
-        {
+    std::array<VBOData, 2> vboData = {
+        VBOData {
             { 0.f, 0.f, 0.f },
             { _lineColorBegin.r, _lineColorBegin.g, _lineColorBegin.b, _lineColorBegin.a }
         },
-        {
+        VBOData {
             {
                 target.x * powf(10, target.w),
                 target.y * powf(10, target.w),
@@ -193,10 +192,10 @@ void RenderableCrawlingLine::update(const UpdateData& data) {
 
 
     glBindBuffer(GL_ARRAY_BUFFER, _vbo);
-    glBufferSubData(GL_ARRAY_BUFFER, 0, 2 * sizeof(VBOData), vboData);
+    glBufferSubData(GL_ARRAY_BUFFER, 0, 2 * sizeof(VBOData), vboData.data());
 
     if (ImageSequencer::ref().isReady()) {
-        float imageSequenceTime = ImageSequencer::ref().instrumentActiveTime(
+        const float imageSequenceTime = ImageSequencer::ref().instrumentActiveTime(
             data.time.j2000Seconds(),
             _instrumentName
         );
diff --git a/modules/spacecraftinstruments/rendering/renderablefov.cpp b/modules/spacecraftinstruments/rendering/renderablefov.cpp
index 24098e844d..de5bc927f5 100644
--- a/modules/spacecraftinstruments/rendering/renderablefov.cpp
+++ b/modules/spacecraftinstruments/rendering/renderablefov.cpp
@@ -448,8 +448,8 @@ glm::dvec3 RenderableFov::orthogonalProjection(const glm::dvec3& vecFov, double
                                                const std::string& target) const
 {
     if (target.empty()) {
-        glm::dvec3 vec = glm::dvec3(1.0, 0.0, 0.0);
-        return glm::normalize(glm::cross(vec, vecFov));
+        constexpr glm::dvec3 Up = glm::dvec3(1.0, 0.0, 0.0);
+        return glm::normalize(glm::cross(Up, vecFov));
     }
     else {
         const glm::dvec3 vecToTarget = SpiceManager::ref().targetPosition(
@@ -473,7 +473,7 @@ void RenderableFov::computeIntercepts(double time, const std::string& target,
                                       bool isInFov)
 {
     auto makeBodyFixedReferenceFrame =
-        [&target](std::string ref) -> std::pair<std::string, bool>
+        [&target](const std::string& ref) -> std::pair<std::string, bool>
     {
         const bool convert = (ref.find("IAU_") == std::string::npos);
         if (convert) {
@@ -515,7 +515,7 @@ void RenderableFov::computeIntercepts(double time, const std::string& target,
         else {
             // The target is in the field of view, but not the entire field of view has to
             // be filled by the target
-            std::pair<std::string, bool> ref = makeBodyFixedReferenceFrame(
+            const std::pair<std::string, bool> ref = makeBodyFixedReferenceFrame(
                 _instrument.referenceFrame
             );
 
@@ -764,7 +764,7 @@ void RenderableFov::render(const RenderData& data, RendererTasks&) {
     _program->activate();
 
     // Model transform and view transform needs to be in double precision
-    glm::mat4 modelViewProjectionTransform =
+    const glm::mat4 modelViewProjectionTransform =
         calcModelViewProjectionTransform(data);
 
     _program->setUniform(_uniformCache.modelViewProjection, modelViewProjectionTransform);
@@ -835,7 +835,7 @@ std::pair<std::string, bool> RenderableFov::determineTarget(double time) {
 
     // First, for all potential targets, check whether they are in the field of view
     for (const std::string& pt : _instrument.potentialTargets) {
-        bool inFOV = SpiceManager::ref().isTargetInFieldOfView(
+        const bool inFOV = SpiceManager::ref().isTargetInFieldOfView(
             pt,
             _instrument.spacecraft,
             global::moduleEngine->module<SpacecraftInstrumentsModule>()->frameFromBody(
@@ -865,7 +865,7 @@ std::pair<std::string, bool> RenderableFov::determineTarget(double time) {
             _instrument.potentialTargets.end(),
             distances.begin(),
             [&i = _instrument, &t = time] (const std::string& pt) {
-                double lt;
+                double lt = 0.0;
                 const glm::dvec3 p = SpiceManager::ref().targetPosition(
                     pt,
                     i.spacecraft,
diff --git a/modules/spacecraftinstruments/rendering/renderablemodelprojection.cpp b/modules/spacecraftinstruments/rendering/renderablemodelprojection.cpp
index 98884e3c70..9278edbf31 100644
--- a/modules/spacecraftinstruments/rendering/renderablemodelprojection.cpp
+++ b/modules/spacecraftinstruments/rendering/renderablemodelprojection.cpp
@@ -118,7 +118,7 @@ RenderableModelProjection::RenderableModelProjection(const ghoul::Dictionary& di
 {
     const Parameters p = codegen::bake<Parameters>(dictionary);
 
-    std::filesystem::path file = absPath(p.geometryFile.string());
+    const std::filesystem::path file = absPath(p.geometryFile.string());
     _geometry = ghoul::io::ModelReader::ref().loadModel(
         file.string(),
         ghoul::io::ModelReader::ForceRenderInvisible::No,
@@ -129,9 +129,9 @@ RenderableModelProjection::RenderableModelProjection(const ghoul::Dictionary& di
 
     if (p.modelScale.has_value()) {
         if (std::holds_alternative<Parameters::ScaleUnit>(*p.modelScale)) {
-            Parameters::ScaleUnit scaleUnit =
+            const Parameters::ScaleUnit scaleUnit =
                 std::get<Parameters::ScaleUnit>(*p.modelScale);
-            DistanceUnit distanceUnit = codegen::map<DistanceUnit>(scaleUnit);
+            const DistanceUnit distanceUnit = codegen::map<DistanceUnit>(scaleUnit);
             _modelScale = toMeter(distanceUnit);
         }
         else if (std::holds_alternative<double>(*p.modelScale)) {
@@ -231,15 +231,15 @@ void RenderableModelProjection::render(const RenderData& data, RendererTasks&) {
         _projectionComponent.clearAllProjections();
     }
 
-    glm::vec3 up = data.camera.lookUpVectorCameraSpace();
+    const glm::vec3 up = data.camera.lookUpVectorCameraSpace();
 
     if (_shouldCapture && _projectionComponent.doesPerformProjection()) {
         for (const Image& i : _imageTimes) {
             try {
-                glm::mat4 projectorMatrix = attitudeParameters(i.timeRange.start, up);
-                std::shared_ptr<ghoul::opengl::Texture> t =
+                const glm::mat4 projectorMat = attitudeParameters(i.timeRange.start, up);
+                const std::shared_ptr<ghoul::opengl::Texture> t =
                     _projectionComponent.loadProjectionTexture(i.path, i.isPlaceholder);
-                imageProjectGPU(*t, projectorMatrix);
+                imageProjectGPU(*t, projectorMat);
             }
             catch (const SpiceManager::SpiceException& e) {
                 LERRORC(e.component, e.what());
@@ -431,12 +431,12 @@ glm::mat4 RenderableModelProjection::attitudeParameters(double time, const glm::
         time
     );
 
-    SpiceManager::FieldOfViewResult res = SpiceManager::ref().fieldOfView(
+    const SpiceManager::FieldOfViewResult res = SpiceManager::ref().fieldOfView(
         _projectionComponent.instrumentId()
     );
     _boresight = std::move(res.boresightVector);
 
-    double lightTime;
+    double lightTime = 0.0;
     const glm::dvec3 p = SpiceManager::ref().targetPosition(
         _projectionComponent.projectorId(),
         _projectionComponent.projecteeId(),
diff --git a/modules/spacecraftinstruments/rendering/renderableplaneprojection.cpp b/modules/spacecraftinstruments/rendering/renderableplaneprojection.cpp
index a6361a6cfe..53534ce988 100644
--- a/modules/spacecraftinstruments/rendering/renderableplaneprojection.cpp
+++ b/modules/spacecraftinstruments/rendering/renderableplaneprojection.cpp
@@ -82,8 +82,6 @@ RenderablePlaneProjection::RenderablePlaneProjection(const ghoul::Dictionary& di
     }
 }
 
-RenderablePlaneProjection::~RenderablePlaneProjection() {}
-
 bool RenderablePlaneProjection::isReady() const {
     return _shader && _texture;
 }
@@ -223,7 +221,7 @@ void RenderablePlaneProjection::updatePlane(const Image& img, double currentTime
         LERROR(e.what());
     }
 
-    double lt;
+    double lt = 0.0;
     const glm::dvec3 vecToTarget = SpiceManager::ref().targetPosition(
         _target.body,
         _spacecraft,
@@ -258,7 +256,7 @@ void RenderablePlaneProjection::updatePlane(const Image& img, double currentTime
         projection[j] = glm::vec3(cornerPosition * 1000.0);
     }
 
-    const GLfloat vertex_data[] = {
+    const std::array<GLfloat, 36> VertexData = {
         // square of two triangles drawn within fov in target coordinates
         //      x      y     z     w     s     t
         // Lower left 1
@@ -277,7 +275,7 @@ void RenderablePlaneProjection::updatePlane(const Image& img, double currentTime
 
     glBindVertexArray(_quad);
     glBindBuffer(GL_ARRAY_BUFFER, _vertexPositionBuffer);
-    glBufferData(GL_ARRAY_BUFFER, sizeof(vertex_data), vertex_data, GL_STATIC_DRAW);
+    glBufferData(GL_ARRAY_BUFFER, sizeof(VertexData), VertexData.data(), GL_STATIC_DRAW);
     glEnableVertexAttribArray(0);
     glVertexAttribPointer(0, 4, GL_FLOAT, GL_FALSE, sizeof(GLfloat) * 6, nullptr);
     glEnableVertexAttribArray(1);
diff --git a/modules/spacecraftinstruments/rendering/renderableplaneprojection.h b/modules/spacecraftinstruments/rendering/renderableplaneprojection.h
index 3a7acfb139..fcb974c765 100644
--- a/modules/spacecraftinstruments/rendering/renderableplaneprojection.h
+++ b/modules/spacecraftinstruments/rendering/renderableplaneprojection.h
@@ -46,7 +46,7 @@ struct UpdateData;
 class RenderablePlaneProjection : public Renderable {
 public:
     RenderablePlaneProjection(const ghoul::Dictionary& dictionary);
-    ~RenderablePlaneProjection() override;
+    ~RenderablePlaneProjection() override = default;
 
     void initializeGL() override;
     void deinitializeGL() override;
diff --git a/modules/spacecraftinstruments/rendering/renderableplanetprojection.cpp b/modules/spacecraftinstruments/rendering/renderableplanetprojection.cpp
index 4ec427d2f9..4668b24a38 100644
--- a/modules/spacecraftinstruments/rendering/renderableplanetprojection.cpp
+++ b/modules/spacecraftinstruments/rendering/renderableplanetprojection.cpp
@@ -355,7 +355,7 @@ void RenderablePlanetProjection::initializeGL() {
     setBoundingSphere(std::max(std::max(radius[0], radius[1]), radius[2]));
 
     // SCREEN-QUAD
-    const GLfloat vertexData[] = {
+    constexpr std::array<GLfloat, 12> VertexData = {
         -1.f, -1.f,
          1.f,  1.f,
         -1.f,  1.f,
@@ -368,7 +368,7 @@ void RenderablePlanetProjection::initializeGL() {
     glBindVertexArray(_quad);
     glGenBuffers(1, &_vertexPositionBuffer);
     glBindBuffer(GL_ARRAY_BUFFER, _vertexPositionBuffer);
-    glBufferData(GL_ARRAY_BUFFER, sizeof(vertexData), vertexData, GL_STATIC_DRAW);
+    glBufferData(GL_ARRAY_BUFFER, sizeof(VertexData), VertexData.data(), GL_STATIC_DRAW);
     glEnableVertexAttribArray(0);
     glVertexAttribPointer(0, 2, GL_FLOAT, GL_FALSE, 2 * sizeof(GLfloat), nullptr);
     glBindVertexArray(0);
@@ -429,18 +429,18 @@ void RenderablePlanetProjection::imageProjectGPU(
 glm::mat4 RenderablePlanetProjection::attitudeParameters(double time, const glm::vec3& up)
 {
     // precomputations for shader
-    glm::dmat3 instrumentMatrix = SpiceManager::ref().positionTransformMatrix(
+    const glm::dmat3 instrumentMatrix = SpiceManager::ref().positionTransformMatrix(
         _projectionComponent.instrumentId(),
         "GALACTIC",
         time
     );
 
-    SpiceManager::FieldOfViewResult res = SpiceManager::ref().fieldOfView(
+    const SpiceManager::FieldOfViewResult res = SpiceManager::ref().fieldOfView(
         _projectionComponent.instrumentId()
     );
 
-    double lightTime;
-    glm::dvec3 p = SpiceManager::ref().targetPosition(
+    double lightTime = 0.0;
+    const glm::dvec3 p = SpiceManager::ref().targetPosition(
         _projectionComponent.projectorId(),
         _projectionComponent.projecteeId(),
         "GALACTIC",
@@ -479,7 +479,7 @@ void RenderablePlanetProjection::render(const RenderData& data, RendererTasks&)
         _projectionComponent.generateMipMap();
     }
 
-    glm::vec3 up = data.camera.lookUpVectorCameraSpace();
+    const glm::vec3 up = data.camera.lookUpVectorCameraSpace();
     if (_projectionComponent.doesPerformProjection()) {
         int nProjections = 0;
         for (const Image& img : _imageTimes) {
@@ -487,10 +487,10 @@ void RenderablePlanetProjection::render(const RenderData& data, RendererTasks&)
                 break;
             }
             try {
-                glm::mat4 projectorMatrix = attitudeParameters(img.timeRange.start, up);
-                std::shared_ptr<ghoul::opengl::Texture> t =
+                const glm::mat4 projMatrix = attitudeParameters(img.timeRange.start, up);
+                const std::shared_ptr<ghoul::opengl::Texture> t =
                     _projectionComponent.loadProjectionTexture(img.path);
-                imageProjectGPU(*t, projectorMatrix);
+                imageProjectGPU(*t, projMatrix);
                 ++nProjections;
             }
             catch (const SpiceManager::SpiceException& e) {
@@ -507,8 +507,8 @@ void RenderablePlanetProjection::render(const RenderData& data, RendererTasks&)
         LERRORC(e.component, e.what());
     }
 
-    double lt;
-    glm::dvec3 sunPos = SpiceManager::ref().targetPosition(
+    double lt = 0.0;
+    const glm::dvec3 sunPos = SpiceManager::ref().targetPosition(
         "SUN",
         _projectionComponent.projecteeId(),
         "GALACTIC",
@@ -546,21 +546,23 @@ void RenderablePlanetProjection::render(const RenderData& data, RendererTasks&)
         _projectionComponent.projectionFading()
     );
 
-    ghoul::opengl::TextureUnit unit[3];
+    ghoul::opengl::TextureUnit baseUnit;
     if (_baseTexture) {
-        unit[0].activate();
+        baseUnit.activate();
         _baseTexture->bind();
-        _programObject->setUniform(_mainUniformCache.baseTexture, unit[0]);
+        _programObject->setUniform(_mainUniformCache.baseTexture, baseUnit);
     }
 
-    unit[1].activate();
+    ghoul::opengl::TextureUnit projectionUnit;
+    projectionUnit.activate();
     _projectionComponent.projectionTexture().bind();
-    _programObject->setUniform(_mainUniformCache.projectionTexture, unit[1]);
+    _programObject->setUniform(_mainUniformCache.projectionTexture, projectionUnit);
 
+    ghoul::opengl::TextureUnit heightUnit;
     if (_heightMapTexture) {
-        unit[2].activate();
+        heightUnit.activate();
         _heightMapTexture->bind();
-        _programObject->setUniform(_mainUniformCache.heightTexture, unit[2]);
+        _programObject->setUniform(_mainUniformCache.heightTexture, heightUnit);
     }
 
     _sphere->render();
@@ -615,7 +617,7 @@ void RenderablePlanetProjection::update(const UpdateData& data) {
         );
 
         if (!newImageTimes.empty()) {
-            double firstNewImage = newImageTimes[0].timeRange.end;
+            const double firstNewImage = newImageTimes[0].timeRange.end;
             // Make sure images are always projected in the correct order
             // (Remove buffered images with a later timestamp)
             const auto& it = std::find_if(
@@ -644,7 +646,7 @@ void RenderablePlanetProjection::update(const UpdateData& data) {
 
 void RenderablePlanetProjection::loadColorTexture() {
     using ghoul::opengl::Texture;
-    std::string selectedPath = _colorTexturePaths.option().description;
+    const std::string selectedPath = _colorTexturePaths.option().description;
 
     // We delete the texture first in order to free up the memory, which could otherwise
     // run out in the case of two large textures
@@ -667,7 +669,7 @@ void RenderablePlanetProjection::loadColorTexture() {
 
 void RenderablePlanetProjection::loadHeightTexture() {
     using ghoul::opengl::Texture;
-    std::string selectedPath = _heightMapTexturePaths.option().description;
+    const std::string selectedPath = _heightMapTexturePaths.option().description;
 
     // We delete the texture first in order to free up the memory, which could otherwise
     // run out in the case of two large textures
diff --git a/modules/spacecraftinstruments/rendering/renderableshadowcylinder.cpp b/modules/spacecraftinstruments/rendering/renderableshadowcylinder.cpp
index e2ae7aa2e8..f2d9bda2d8 100644
--- a/modules/spacecraftinstruments/rendering/renderableshadowcylinder.cpp
+++ b/modules/spacecraftinstruments/rendering/renderableshadowcylinder.cpp
@@ -206,10 +206,10 @@ RenderableShadowCylinder::RenderableShadowCylinder(const ghoul::Dictionary& dict
         { static_cast<int>(T::LightTimeStellar), "Light Time Stellar" },
 
     });
-    SpiceManager::AberrationCorrection aberration = SpiceManager::AberrationCorrection(
+    const SpiceManager::AberrationCorrection abbcorr = SpiceManager::AberrationCorrection(
         p.aberration
     );
-    _aberration = static_cast<int>(aberration.type);
+    _aberration = static_cast<int>(abbcorr.type);
 }
 
 void RenderableShadowCylinder::initializeGL() {
@@ -315,7 +315,7 @@ void RenderableShadowCylinder::createCylinder(double time) {
         [](const glm::dvec3& p) { return p * 1000.0; }
     );
 
-    double lt;
+    double lt = 0.0;
     glm::dvec3 vecLightSource = SpiceManager::ref().targetPosition(
         _body,
         _lightSource,
diff --git a/modules/spacecraftinstruments/util/hongkangparser.cpp b/modules/spacecraftinstruments/util/hongkangparser.cpp
index ff51404e1b..0a1acaba44 100644
--- a/modules/spacecraftinstruments/util/hongkangparser.cpp
+++ b/modules/spacecraftinstruments/util/hongkangparser.cpp
@@ -82,7 +82,7 @@ HongKangParser::HongKangParser(std::string name, std::string fileName,
                 continue;
             }
 
-            ghoul::Dictionary typeDictionary =
+            const ghoul::Dictionary typeDictionary =
                 translationDictionary.value<ghoul::Dictionary>(decoderType);
             // for each playbook call -> create a Decoder object
             for (std::string_view key : typeDictionary.keys()) {
@@ -142,7 +142,7 @@ bool HongKangParser::create() {
             "HongKangParser"
         );
     }
-    size_t position = _fileName.find_last_of('.') + 1;
+    const size_t position = _fileName.find_last_of('.') + 1;
     if (position == 0 || position == std::string::npos) {
         return true;
     }
@@ -168,7 +168,7 @@ bool HongKangParser::create() {
     while (!file.eof()) {
         std::getline(file, line);
 
-        std::string event = line.substr(0, line.find_first_of(' '));
+        const std::string event = line.substr(0, line.find_first_of(' '));
 
         const auto it = _fileTranslation.find(event);
         const bool foundEvent = (it != _fileTranslation.end());
@@ -208,13 +208,13 @@ bool HongKangParser::create() {
                     _targetTimes.emplace_back(time, image.target);
                 }
 
-                // store actual image in map. All targets get _only_ their corresp. subset
-                _subsetMap[image.target]._subset.push_back(image);
                 // compute and store the range for each subset
                 _subsetMap[image.target]._range.include(time);
+                // store actual image in map. All targets get _only_ their corresp. subset
+                _subsetMap[image.target]._subset.push_back(std::move(image));
             }
             if (it->second->decoderType() == "SCANNER") { // SCANNER START
-                double scanStart = time;
+                const double scanStart = time;
 
                 InstrumentDecoder* scanner = static_cast<InstrumentDecoder*>(
                     it->second.get()
@@ -222,18 +222,20 @@ bool HongKangParser::create() {
                 const std::string& endNominal = scanner->stopCommand();
 
                 // store current position in file
-                std::streampos len = file.tellg();
+                const std::streampos len = file.tellg();
                 std::string linePeek;
                 while (!file.eof()) {
                     // continue grabbing next line until we find what we need
                     getline(file, linePeek);
                     if (linePeek.find(endNominal) != std::string::npos) {
                         met = linePeek.substr(25, 9);
-                        double scanStop = ephemerisTimeFromMissionElapsedTime(
+                        const double scanStop = ephemerisTimeFromMissionElapsedTime(
                             met,
                             _metRef
                         );
-                        std::string scannerTarget = findPlaybookSpecifiedTarget(line);
+                        const std::string scannerTarget = findPlaybookSpecifiedTarget(
+                            line
+                        );
 
                         TimeRange scanRange = TimeRange(scanStart, scanStop);
                         ghoul_assert(scanRange.isDefined(), "Invalid time range");
@@ -241,7 +243,7 @@ bool HongKangParser::create() {
 
                         // store individual image
                         Image image = {
-                            .timeRange = scanRange,
+                            .timeRange = std::move(scanRange),
                             .path = _defaultCaptureImage.string(),
                             .activeInstruments = it->second->translations(),
                             .target = cameraTarget,
@@ -263,7 +265,7 @@ bool HongKangParser::create() {
                 // end of capture sequence for camera, store end time of this sequence
                 TimeRange cameraRange = TimeRange(captureStart, time);
                 ghoul_assert(cameraRange.isDefined(), "Invalid time range");
-                _instrumentTimes.emplace_back(previousCamera, cameraRange);
+                _instrumentTimes.emplace_back(previousCamera, std::move(cameraRange));
                 captureStart = -1;
             }
         }
diff --git a/modules/spacecraftinstruments/util/imagesequencer.cpp b/modules/spacecraftinstruments/util/imagesequencer.cpp
index 010d13ff45..0d50e38327 100644
--- a/modules/spacecraftinstruments/util/imagesequencer.cpp
+++ b/modules/spacecraftinstruments/util/imagesequencer.cpp
@@ -225,7 +225,8 @@ std::vector<Image> ImageSequencer::imagePaths(const std::string& projectee,
     // create temporary storage
     std::vector<Image> captures;
     // what to look for
-    Image findPrevious, findCurrent;
+    Image findPrevious;
+    Image findCurrent;
     findPrevious.timeRange.start = sinceTime;
     findCurrent.timeRange.start = time;
 
@@ -254,7 +255,7 @@ std::vector<Image> ImageSequencer::imagePaths(const std::string& projectee,
     }
 
     std::vector<int> toDelete;
-    for (std::vector<Image>::iterator it = captures.begin(); it != captures.end(); it++) {
+    for (auto it = captures.begin(); it != captures.end(); it++) {
         if (!it->isPlaceholder) {
             continue;
         }
@@ -277,7 +278,7 @@ std::vector<Image> ImageSequencer::imagePaths(const std::string& projectee,
     for (size_t i = 0; i < toDelete.size(); i++) {
         // We have to subtract i here as we already have deleted i value before this and
         // we need to adjust the location
-        int v = toDelete[i] - static_cast<int>(i);
+        const int v = toDelete[i] - static_cast<int>(i);
         captures.erase(captures.begin() + v);
     }
 
@@ -351,21 +352,22 @@ void ImageSequencer::runSequenceParser(SequenceParser& parser) {
         double min = 10;
         auto findMin = [&min](const std::vector<Image>& vec) -> double {
             for (size_t i = 1; i < vec.size(); i++) {
-                double e = std::abs(vec[i].timeRange.start - vec[i - 1].timeRange.start);
+                const double e = std::abs(
+                    vec[i].timeRange.start - vec[i - 1].timeRange.start
+                );
                 min = std::min(e, min);
             }
             return min;
         };
 
         // find the smallest separation of images in time
-        double epsilon;
-        epsilon = findMin(destination);
+        double epsilon = findMin(destination);
         // set epsilon as 1% smaller than min
         epsilon -= min * 0.01;
 
         // IFF images have same time as mission planned capture, erase that event
         // from 'predicted event file' (mission-playbook)
-        for (Image& i : source) {
+        for (const Image& i : source) {
             for (const Image& j : destination) {
                 const double diff = std::abs(i.timeRange.start - j.timeRange.start);
                 if (diff < epsilon) {
diff --git a/modules/spacecraftinstruments/util/instrumenttimesparser.cpp b/modules/spacecraftinstruments/util/instrumenttimesparser.cpp
index 6d9cd3e3a5..8f19337625 100644
--- a/modules/spacecraftinstruments/util/instrumenttimesparser.cpp
+++ b/modules/spacecraftinstruments/util/instrumenttimesparser.cpp
@@ -59,9 +59,13 @@ InstrumentTimesParser::InstrumentTimesParser(std::string name, std::string seque
 
     _target = p.target;
     for (const std::pair<const std::string, ghoul::Dictionary>& ps : p.instruments) {
-        ghoul::Dictionary files = ps.second.value<ghoul::Dictionary>(KeyInstrumentFiles);
-        _fileTranslation[ps.first] =
-            Decoder::createFromDictionary(ps.second, KeyInstrument);
+        const ghoul::Dictionary files = ps.second.value<ghoul::Dictionary>(
+            KeyInstrumentFiles
+        );
+        _fileTranslation[ps.first] = Decoder::createFromDictionary(
+            ps.second,
+            KeyInstrument
+        );
         for (size_t i = 0; i < files.size(); i++) {
             std::string filename = files.value<std::string>(std::to_string(i + 1));
             _instrumentFiles[ps.first].push_back(std::move(filename));
@@ -80,7 +84,7 @@ bool InstrumentTimesParser::create() {
     using V = std::vector<std::string>;
     for (const std::pair<const K, V>& p : _instrumentFiles) {
         const std::string& instrumentID = p.first;
-        for (std::string filename : p.second) {
+        for (const std::string& filename : p.second) {
             std::filesystem::path filepath = sequenceDir / filename;
 
             if (!std::filesystem::is_regular_file(filepath)) {
@@ -110,8 +114,8 @@ bool InstrumentTimesParser::create() {
 
                 TimeRange tr;
                 try { // parse date strings
-                    std::string start = matches[1].str();
-                    std::string stop = matches[2].str();
+                    const std::string start = matches[1].str();
+                    const std::string stop = matches[2].str();
                     tr.start = SpiceManager::ref().ephemerisTimeFromDate(start);
                     tr.end = SpiceManager::ref().ephemerisTimeFromDate(stop);
                 }
diff --git a/modules/spacecraftinstruments/util/labelparser.cpp b/modules/spacecraftinstruments/util/labelparser.cpp
index e3a8b853d9..d73a738765 100644
--- a/modules/spacecraftinstruments/util/labelparser.cpp
+++ b/modules/spacecraftinstruments/util/labelparser.cpp
@@ -45,23 +45,25 @@ namespace openspace {
 LabelParser::LabelParser(std::string fileName, const ghoul::Dictionary& dictionary)
     : _fileName(std::move(fileName))
 {
+    using ghoul::Dictionary;
+
     // get the different instrument types
     // for each decoder (assuming might have more if hong makes changes)
-    for (std::string_view decoderStr : dictionary.keys()) {
-        if (!dictionary.hasValue<ghoul::Dictionary>(decoderStr)) {
+    for (const std::string_view decoderStr : dictionary.keys()) {
+        if (!dictionary.hasValue<Dictionary>(decoderStr)) {
             continue;
         }
 
-        ghoul::Dictionary typeDict = dictionary.value<ghoul::Dictionary>(decoderStr);
+        const Dictionary typeDict = dictionary.value<Dictionary>(decoderStr);
 
         // create dictionary containing all {playbookKeys , spice IDs}
         if (decoderStr == "Instrument") {
             // for each playbook call -> create a Decoder object
-            for (std::string_view key : typeDict.keys()) {
-                if (!typeDict.hasValue<ghoul::Dictionary>(key)) {
+            for (const std::string_view key : typeDict.keys()) {
+                if (!typeDict.hasValue<Dictionary>(key)) {
                     continue;
                 }
-                ghoul::Dictionary decoderDict = typeDict.value<ghoul::Dictionary>(key);
+                const Dictionary decoderDict = typeDict.value<Dictionary>(key);
 
                 std::unique_ptr<Decoder> decoder = Decoder::createFromDictionary(
                     decoderDict,
@@ -73,33 +75,32 @@ LabelParser::LabelParser(std::string fileName, const ghoul::Dictionary& dictiona
             }
         }
         if (decoderStr == "Target") {
-            if (!typeDict.hasValue<ghoul::Dictionary>(keySpecs) ||
-                !typeDict.hasValue<ghoul::Dictionary>(keySpecs))
+            if (!typeDict.hasValue<Dictionary>(keySpecs) ||
+                !typeDict.hasValue<Dictionary>(keySpecs))
             {
                 continue;
             }
 
-            ghoul::Dictionary specsOfInterestDict =
-                typeDict.value<ghoul::Dictionary>(keySpecs);
+            const Dictionary specsOfInterestDict = typeDict.value<Dictionary>(keySpecs);
 
             _specsOfInterest.resize(specsOfInterestDict.size());
             for (size_t n = 0; n < _specsOfInterest.size(); ++n) {
-                std::string key = std::to_string(n + 1);
+                const std::string key = std::to_string(n + 1);
                 if (specsOfInterestDict.hasValue<std::string>(key)) {
                     std::string readMe = specsOfInterestDict.value<std::string>(key);
-                    _specsOfInterest[n] = readMe;
+                    _specsOfInterest[n] = std::move(readMe);
                 }
             }
-            ghoul::Dictionary convertDict = typeDict.value<ghoul::Dictionary>(keyConvert);
+            const Dictionary convertDict = typeDict.value<Dictionary>(keyConvert);
 
-            for (std::string_view key : convertDict.keys()) {
-                if (!convertDict.hasValue<ghoul::Dictionary>(key)) {
+            for (const std::string_view key : convertDict.keys()) {
+                if (!convertDict.hasValue<Dictionary>(key)) {
                     continue;
                 }
 
-                ghoul::Dictionary itemDict = convertDict.value<ghoul::Dictionary>(key);
+                const Dictionary item = convertDict.value<Dictionary>(key);
                 std::unique_ptr<Decoder> decoder = Decoder::createFromDictionary(
-                    itemDict,
+                    item,
                     std::string(decoderStr)
                 );
                 // insert decoder to map - this will be used in the parser to determine
@@ -111,10 +112,12 @@ LabelParser::LabelParser(std::string fileName, const ghoul::Dictionary& dictiona
 }
 
 std::string LabelParser::decode(const std::string& line) {
-    for (std::pair<const std::string, std::unique_ptr<Decoder>>& key : _fileTranslation) {
-        std::size_t value = line.find(key.first);
+    using K = std::string;
+    using V = std::unique_ptr<Decoder>;
+    for (const std::pair<const K, V>& key : _fileTranslation) {
+        const size_t value = line.find(key.first);
         if (value != std::string::npos) {
-            std::string toTranslate = line.substr(value);
+            const std::string toTranslate = line.substr(value);
             return _fileTranslation[toTranslate]->translations()[0];
         }
     }
@@ -125,7 +128,7 @@ std::string LabelParser::encode(const std::string& line) const {
     using K = std::string;
     using V = std::unique_ptr<Decoder>;
     for (const std::pair<const K, V>& key : _fileTranslation) {
-        std::size_t value = line.find(key.first);
+        const size_t value = line.find(key.first);
         if (value != std::string::npos) {
             return line.substr(value);
         }
@@ -149,12 +152,12 @@ bool LabelParser::create() {
 
         std::string path = e.path().string();
 
-        size_t position = path.find_last_of('.') + 1;
+        const size_t position = path.find_last_of('.') + 1;
         if (position == 0 || position == std::string::npos) {
             continue;
         }
 
-        std::filesystem::path extension = std::filesystem::path(path).extension();
+        const std::filesystem::path extension = std::filesystem::path(path).extension();
         if (extension != ".lbl" && extension != ".LBL") {
             continue;
         }
@@ -261,14 +264,14 @@ bool LabelParser::create() {
                 count = 0;
 
                 using namespace std::literals;
-                std::string p = path.substr(0, path.size() - ("lbl"s).size());
+                const std::string p = path.substr(0, path.size() - ("lbl"s).size());
                 for (const std::string& ext : extensions) {
-                    std::string imagePath = p + ext;
+                    const std::string imagePath = p + ext;
                     if (std::filesystem::is_regular_file(imagePath)) {
                         std::vector<std::string> spiceInstrument;
                         spiceInstrument.push_back(_instrumentID);
 
-                        Image image = {
+                        const Image image = {
                             .timeRange = TimeRange(startTime, stopTime),
                             .path = imagePath,
                             .activeInstruments = spiceInstrument,
diff --git a/modules/spacecraftinstruments/util/projectioncomponent.cpp b/modules/spacecraftinstruments/util/projectioncomponent.cpp
index 4f9cf9e848..e9b0b6ce4c 100644
--- a/modules/spacecraftinstruments/util/projectioncomponent.cpp
+++ b/modules/spacecraftinstruments/util/projectioncomponent.cpp
@@ -322,7 +322,7 @@ void ProjectionComponent::initialize(const std::string& identifier,
     }
 
     for (std::unique_ptr<SequenceParser>& parser : parsers) {
-        bool success = parser->create();
+        const bool success = parser->create();
         if (success) {
             ImageSequencer::ref().runSequenceParser(*parser);
         }
@@ -334,7 +334,7 @@ void ProjectionComponent::initialize(const std::string& identifier,
 }
 
 bool ProjectionComponent::initializeGL() {
-    int maxSize = OpenGLCap.max2DTextureSize();
+    const int maxSize = OpenGLCap.max2DTextureSize();
 
     glm::ivec2 size;
     if (_projectionTextureAspectRatio > 1.f) {
@@ -377,7 +377,7 @@ bool ProjectionComponent::initializeGL() {
             absPath("${MODULE_SPACECRAFTINSTRUMENTS}/shaders/dilation_fs.glsl")
         );
 
-        const GLfloat plane[] = {
+        constexpr std::array<GLfloat, 12> Plane = {
             -1.0, -1.0,
              1.0,  1.0,
             -1.0,  1.0,
@@ -391,7 +391,7 @@ bool ProjectionComponent::initializeGL() {
 
         glBindVertexArray(_dilation.vao);
         glBindBuffer(GL_ARRAY_BUFFER, _dilation.vbo);
-        glBufferData(GL_ARRAY_BUFFER, sizeof(plane), plane, GL_STATIC_DRAW);
+        glBufferData(GL_ARRAY_BUFFER, sizeof(Plane), Plane.data(), GL_STATIC_DRAW);
         glEnableVertexAttribArray(0);
         glVertexAttribPointer(0, 2, GL_FLOAT, GL_FALSE, 2 * sizeof(GLfloat), nullptr);
         glBindVertexArray(0);
@@ -434,10 +434,12 @@ void ProjectionComponent::imageProjectBegin() {
         using ghoul::opengl::FramebufferObject;
 
         // Make a copy of the old textures
-        std::unique_ptr<Texture> oldProjectionTexture = std::move(_projectionTexture);
-        std::unique_ptr<Texture> oldDilationStencil = std::move(_dilation.stencilTexture);
-        std::unique_ptr<Texture> oldDilationTexture = std::move(_dilation.texture);
-        std::unique_ptr<Texture> oldDepthTexture = std::move(_shadowing.texture);
+        const std::unique_ptr<Texture> oldProjectionTexture =
+            std::move(_projectionTexture);
+        const std::unique_ptr<Texture> oldDilationStencil =
+            std::move(_dilation.stencilTexture);
+        const std::unique_ptr<Texture> oldDilationTexture = std::move(_dilation.texture);
+        const std::unique_ptr<Texture> oldDepthTexture = std::move(_shadowing.texture);
 
         // Generate the new textures
         generateProjectionLayerTexture(_textureSize);
@@ -504,8 +506,8 @@ void ProjectionComponent::imageProjectBegin() {
             );
         };
 
-        GLuint fbos[2];
-        glGenFramebuffers(2, fbos);
+        std::array<GLuint, 3> fbos;
+        glGenFramebuffers(2, fbos.data());
         glBindFramebuffer(GL_READ_FRAMEBUFFER, fbos[0]);
         glBindFramebuffer(GL_DRAW_FRAMEBUFFER, fbos[1]);
 
@@ -535,7 +537,7 @@ void ProjectionComponent::imageProjectBegin() {
 
         glBindFramebuffer(GL_READ_FRAMEBUFFER, 0);
         glBindFramebuffer(GL_DRAW_FRAMEBUFFER, 0);
-        glDeleteFramebuffers(2, fbos);
+        glDeleteFramebuffers(2, fbos.data());
 
         glBindFramebuffer(GL_FRAMEBUFFER, _fboID);
         glFramebufferTexture2D(
@@ -590,8 +592,8 @@ void ProjectionComponent::imageProjectBegin() {
     );
 
     if (_dilation.isEnabled) {
-        GLenum buffers[] = { GL_COLOR_ATTACHMENT0, GL_COLOR_ATTACHMENT1 };
-        glDrawBuffers(2, buffers);
+        std::array<GLenum, 2> buffers = { GL_COLOR_ATTACHMENT0, GL_COLOR_ATTACHMENT1 };
+        glDrawBuffers(2, buffers.data());
     }
 }
 
@@ -599,7 +601,7 @@ bool ProjectionComponent::needsShadowMap() const {
     return _shadowing.isEnabled;
 }
 
-ghoul::opengl::Texture& ProjectionComponent::depthTexture() {
+ghoul::opengl::Texture& ProjectionComponent::depthTexture() const {
     return *_shadowing.texture;
 }
 
@@ -633,16 +635,17 @@ void ProjectionComponent::imageProjectEnd() {
 
         glDisable(GL_BLEND);
 
-        ghoul::opengl::TextureUnit unit[2];
-        unit[0].activate();
+        ghoul::opengl::TextureUnit projUnit;
+        projUnit.activate();
         _projectionTexture->bind();
 
-        unit[1].activate();
+        ghoul::opengl::TextureUnit stencilUnit;
+        stencilUnit.activate();
         _dilation.stencilTexture->bind();
 
         _dilation.program->activate();
-        _dilation.program->setUniform("tex", unit[0]);
-        _dilation.program->setUniform("stencil", unit[1]);
+        _dilation.program->setUniform("tex", projUnit);
+        _dilation.program->setUniform("stencil", stencilUnit);
 
         glBindVertexArray(_dilation.vao);
         glDrawArrays(GL_TRIANGLES, 0, 6);
@@ -658,14 +661,14 @@ void ProjectionComponent::imageProjectEnd() {
     _mipMapDirty = true;
 }
 
-void ProjectionComponent::update() {
+void ProjectionComponent::update() const {
     if (_dilation.isEnabled && _dilation.program->isDirty()) {
         _dilation.program->rebuildFromFile();
     }
 }
 
 bool ProjectionComponent::depthRendertarget() {
-    GLint defaultFBO;
+    GLint defaultFBO = 0;
     glGetIntegerv(GL_FRAMEBUFFER_BINDING, &defaultFBO);
     // setup FBO
     glGenFramebuffers(1, &_depthFboID);
@@ -680,7 +683,7 @@ bool ProjectionComponent::depthRendertarget() {
 
     glDrawBuffer(GL_NONE);
 
-    GLenum status = glCheckFramebufferStatus(GL_FRAMEBUFFER);
+    const GLenum status = glCheckFramebufferStatus(GL_FRAMEBUFFER);
     if (status != GL_FRAMEBUFFER_COMPLETE) {
         return false;
     }
@@ -692,7 +695,7 @@ bool ProjectionComponent::depthRendertarget() {
 bool ProjectionComponent::auxiliaryRendertarget() {
     bool completeSuccess = true;
 
-    GLint defaultFBO;
+    GLint defaultFBO = 0;
     glGetIntegerv(GL_FRAMEBUFFER_BINDING, &defaultFBO);
 
     // setup FBO
@@ -754,8 +757,9 @@ bool ProjectionComponent::auxiliaryRendertarget() {
     return completeSuccess;
 }
 
-glm::mat4 ProjectionComponent::computeProjectorMatrix(const glm::vec3 loc, glm::dvec3 aim,
-                                                      const glm::vec3 up,
+glm::mat4 ProjectionComponent::computeProjectorMatrix(const glm::vec3& loc,
+                                                      const glm::dvec3& aim,
+                                                      const glm::vec3& up,
                                                       const glm::dmat3& instrumentMatrix,
                                                       float fieldOfViewY,
                                                       float aspectRatio,
@@ -765,21 +769,21 @@ glm::mat4 ProjectionComponent::computeProjectorMatrix(const glm::vec3 loc, glm::
 
     // rotate boresight into correct alignment
     boreSight = instrumentMatrix * aim;
-    glm::vec3 uptmp = instrumentMatrix * glm::dvec3(up);
+    const glm::vec3 uptmp = instrumentMatrix * glm::dvec3(up);
 
     // create view matrix
-    glm::vec3 e3 = glm::normalize(-boreSight);
-    glm::vec3 e1 = glm::normalize(glm::cross(uptmp, e3));
-    glm::vec3 e2 = glm::normalize(glm::cross(e3, e1));
+    const glm::vec3 e3 = glm::normalize(-boreSight);
+    const glm::vec3 e1 = glm::normalize(glm::cross(uptmp, e3));
+    const glm::vec3 e2 = glm::normalize(glm::cross(e3, e1));
 
-    glm::mat4 projViewMatrix = glm::mat4(
+    const glm::mat4 projViewMatrix = glm::mat4(
         e1.x, e2.x, e3.x, 0.f,
         e1.y, e2.y, e3.y, 0.f,
         e1.z, e2.z, e3.z, 0.f,
         glm::dot(e1, -loc), glm::dot(e2, -loc), glm::dot(e3, -loc), 1.f
     );
     // create perspective projection matrix
-    glm::mat4 projProjectionMatrix = glm::perspective(
+    const glm::mat4 projProjectionMatrix = glm::perspective(
         glm::radians(fieldOfViewY), aspectRatio, nearPlane, farPlane
     );
 
@@ -837,11 +841,11 @@ float ProjectionComponent::aspectRatio() const {
 
 void ProjectionComponent::clearAllProjections() {
     // keep handle to the current bound FBO
-    GLint defaultFBO;
+    GLint defaultFBO = 0;
     glGetIntegerv(GL_FRAMEBUFFER_BINDING, &defaultFBO);
 
-    GLint m_viewport[4];
-    glGetIntegerv(GL_VIEWPORT, m_viewport);
+    std::array<GLint, 4> viewport;
+    glGetIntegerv(GL_VIEWPORT, viewport.data());
     //counter = 0;
     glViewport(
         0,
@@ -861,7 +865,7 @@ void ProjectionComponent::clearAllProjections() {
     }
 
     glBindFramebuffer(GL_FRAMEBUFFER, defaultFBO);
-    glViewport(m_viewport[0], m_viewport[1], m_viewport[2], m_viewport[3]);
+    glViewport(viewport[0], viewport[1], viewport[2], viewport[3]);
 
     _clearAllProjections = false;
     _mipMapDirty = true;
diff --git a/modules/spacecraftinstruments/util/projectioncomponent.h b/modules/spacecraftinstruments/util/projectioncomponent.h
index bde82ba1e4..c8ca7855ff 100644
--- a/modules/spacecraftinstruments/util/projectioncomponent.h
+++ b/modules/spacecraftinstruments/util/projectioncomponent.h
@@ -54,13 +54,13 @@ public:
 
     bool isReady() const;
 
-    ghoul::opengl::Texture& depthTexture();
+    ghoul::opengl::Texture& depthTexture() const;
     void imageProjectBegin();
     void imageProjectEnd();
     void depthMapRenderBegin();
     void depthMapRenderEnd();
 
-    void update();
+    void update() const;
 
     bool auxiliaryRendertarget();
     bool depthRendertarget();
@@ -68,8 +68,8 @@ public:
     std::shared_ptr<ghoul::opengl::Texture> loadProjectionTexture(
         const std::string& texturePath, bool isPlaceholder = false);
 
-    glm::mat4 computeProjectorMatrix(const glm::vec3 loc, glm::dvec3 aim,
-        const glm::vec3 up, const glm::dmat3& instrumentMatrix, float fieldOfViewY,
+    glm::mat4 computeProjectorMatrix(const glm::vec3& loc, const glm::dvec3& aim,
+        const glm::vec3& up, const glm::dmat3& instrumentMatrix, float fieldOfViewY,
         float aspectRatio, float nearPlane, float farPlane, glm::vec3& boreSight);
 
     bool doesPerformProjection() const;
diff --git a/modules/spacecraftinstruments/util/targetdecoder.cpp b/modules/spacecraftinstruments/util/targetdecoder.cpp
index 09bdc2569b..8f2747bdd8 100644
--- a/modules/spacecraftinstruments/util/targetdecoder.cpp
+++ b/modules/spacecraftinstruments/util/targetdecoder.cpp
@@ -35,7 +35,7 @@ namespace openspace {
 TargetDecoder::TargetDecoder(const ghoul::Dictionary& dictionary) {
     _names.resize(dictionary.size());
     for (size_t i = 0; i < _names.size(); i++) {
-        std::string key = std::to_string(i + 1);
+        const std::string key = std::to_string(i + 1);
         if (dictionary.hasKey(key) && dictionary.hasValue<std::string>(key)) {
             _names[i] = dictionary.value<std::string>(key);;
         }
diff --git a/modules/statemachine/include/statemachine.h b/modules/statemachine/include/statemachine.h
index 520e526147..62761dbe7b 100644
--- a/modules/statemachine/include/statemachine.h
+++ b/modules/statemachine/include/statemachine.h
@@ -38,7 +38,7 @@ public:
     explicit StateMachine(const ghoul::Dictionary& dictionary);
     ~StateMachine() = default;
 
-    void setInitialState(const std::string initialState);
+    void setInitialState(const std::string& initialState);
     const State* currentState() const;
     void transitionTo(const std::string& newState);
     bool canTransitionTo(const std::string& state) const;
diff --git a/modules/statemachine/src/statemachine.cpp b/modules/statemachine/src/statemachine.cpp
index 033d63c5d1..3311f9b968 100644
--- a/modules/statemachine/src/statemachine.cpp
+++ b/modules/statemachine/src/statemachine.cpp
@@ -59,7 +59,7 @@ StateMachine::StateMachine(const ghoul::Dictionary& dictionary) {
 
     _states.reserve(p.states.size());
     for (const ghoul::Dictionary& s : p.states) {
-        _states.push_back(State(s));
+        _states.emplace_back(s);
     }
 
     _transitions.reserve(p.transitions.size());
@@ -67,8 +67,8 @@ StateMachine::StateMachine(const ghoul::Dictionary& dictionary) {
         const Transition trans = Transition(t);
 
         // Check so transition has valid identifiers
-        bool foundFrom = findState(trans.from()) != -1;
-        bool foundTo = findState(trans.to()) != -1;
+        const bool foundFrom = findState(trans.from()) != -1;
+        const bool foundTo = findState(trans.to()) != -1;
 
         if (foundFrom && foundTo) {
             _transitions.push_back(trans);
@@ -95,8 +95,8 @@ StateMachine::StateMachine(const ghoul::Dictionary& dictionary) {
     setInitialState(startState);
 }
 
-void StateMachine::setInitialState(const std::string initialState) {
-    int stateIndex = findState(initialState);
+void StateMachine::setInitialState(const std::string& initialState) {
+    const int stateIndex = findState(initialState);
 
     if (stateIndex == -1) {
         LWARNING(fmt::format(
@@ -125,7 +125,7 @@ void StateMachine::transitionTo(const std::string& newState) {
         return;
     }
 
-    int stateIndex = findState(newState);
+    const int stateIndex = findState(newState);
     if (stateIndex == -1) {
         LWARNING(fmt::format(
             "Attempting to transition to undefined state '{}'", newState
@@ -133,7 +133,7 @@ void StateMachine::transitionTo(const std::string& newState) {
         return;
     }
 
-    int transitionIndex = findTransitionTo(newState);
+    const int transitionIndex = findTransitionTo(newState);
     if (transitionIndex == -1) {
         LWARNING(fmt::format(
             "Transition from '{}' to '{}' is undefined",
@@ -189,9 +189,9 @@ std::vector<std::string> StateMachine::possibleTransitions() const {
     }
 
     res.reserve(_transitions.size());
-    for (size_t i = 0; i < _transitions.size(); i++) {
-        if (_transitions[i].from() == currentState()->name()) {
-            res.push_back(_transitions[i].to());
+    for (const Transition& transition : _transitions) {
+        if (transition.from() == currentState()->name()) {
+            res.push_back(transition.to());
         }
     }
     return res;
@@ -208,14 +208,14 @@ void StateMachine::saveToDotFile(const std::string& filename) const {
         return;
     }
 
-    file << "digraph statemachine {" << std::endl;
+    file << "digraph statemachine {\n";
     for (const State& s : _states) {
-        file << "\t" << s.name() << ";" << std::endl;
+        file << fmt::format("\t{};\n", s.name());
     }
     for (const Transition& t : _transitions) {
-        file << "\t" << t.from() << " -> " << t.to() << ";" << std::endl;
+        file << fmt::format("\t{} -> {};\n", t.from(), t.to());
     }
-    file << "}" << std::endl;
+    file << "}\n";
 
     LINFO(fmt::format("Saved state machine to file: {}", outputFile));
 }
diff --git a/modules/statemachine/statemachinemodule.cpp b/modules/statemachine/statemachinemodule.cpp
index 9c3d90dd09..43e2edac28 100644
--- a/modules/statemachine/statemachinemodule.cpp
+++ b/modules/statemachine/statemachinemodule.cpp
@@ -52,14 +52,14 @@ StateMachineModule::StateMachineModule()
 
 void StateMachineModule::initializeStateMachine(const ghoul::Dictionary& states,
                                                 const ghoul::Dictionary& transitions,
-                                             const std::optional<std::string> startState)
+                                                std::optional<std::string> startState)
 {
     ghoul::Dictionary dictionary;
     dictionary.setValue("States", states);
     dictionary.setValue("Transitions", transitions);
 
     if (startState.has_value()) {
-        dictionary.setValue("StartState", *startState);
+        dictionary.setValue("StartState", std::move(*startState));
     }
 
     try {
@@ -83,7 +83,7 @@ bool StateMachineModule::hasStateMachine() const {
     return _machine != nullptr;
 }
 
-void StateMachineModule::setInitialState(const std::string initialState) {
+void StateMachineModule::setInitialState(const std::string& initialState) {
     if (!_machine) {
         LERROR("Attempting to use uninitialized state machine");
         return;
diff --git a/modules/statemachine/statemachinemodule.h b/modules/statemachine/statemachinemodule.h
index 11fd4b2df2..9f6708bc25 100644
--- a/modules/statemachine/statemachinemodule.h
+++ b/modules/statemachine/statemachinemodule.h
@@ -42,13 +42,13 @@ public:
 
     void initializeStateMachine(const ghoul::Dictionary& states,
         const ghoul::Dictionary& transitions,
-        const std::optional<std::string> startState = std::nullopt);
+        std::optional<std::string> startState = std::nullopt);
     void deinitializeStateMachine();
 
     bool hasStateMachine() const;
 
     // initializeStateMachine must have been called before
-    void setInitialState(const std::string initialState);
+    void setInitialState(const std::string& initialState);
     std::string currentState() const;
     std::vector<std::string> possibleTransitions() const;
     void transitionTo(const std::string& newState);
diff --git a/modules/sync/syncs/httpsynchronization.cpp b/modules/sync/syncs/httpsynchronization.cpp
index 6153bc7f04..7b5dd027cb 100644
--- a/modules/sync/syncs/httpsynchronization.cpp
+++ b/modules/sync/syncs/httpsynchronization.cpp
@@ -101,7 +101,7 @@ void HttpSynchronization::start() {
     }
     _state = State::Syncing;
 
-    bool isSynced = isEachFileDownloaded();
+    const bool isSynced = isEachFileDownloaded();
     if (isSynced) {
         _state = State::Resolved;
         return;
@@ -111,7 +111,7 @@ void HttpSynchronization::start() {
         return;
     }
 
-    std::string query = fmt::format(
+    const std::string query = fmt::format(
         "?identifier={}&file_version={}&application_version={}",
         _identifier, _version, ApplicationVersion
     );
@@ -282,8 +282,8 @@ HttpSynchronization::trySyncFromUrl(std::string listUrl) {
             continue;
         }
 
-        std::string filename = std::filesystem::path(line).filename().string();
-        std::filesystem::path destination = directory() / (filename + ".tmp");
+        const std::string filename = std::filesystem::path(line).filename().string();
+        const std::filesystem::path destination = directory() / (filename + ".tmp");
 
         if (sizeData.find(line) != sizeData.end()) {
             LWARNING(fmt::format("{}: Duplicate entry for {}", _identifier, line));
@@ -320,7 +320,7 @@ HttpSynchronization::trySyncFromUrl(std::string listUrl) {
                 return !_shouldCancel;
             }
 
-            std::lock_guard guard(mutex);
+            const std::lock_guard guard(mutex);
 
             sizeData[line] = { downloadedBytes, totalBytes };
 
@@ -397,7 +397,7 @@ HttpSynchronization::trySyncFromUrl(std::string listUrl) {
 
         if (_unzipFiles && originalName.extension() == ".zip") {
             std::string source = originalName.string();
-            std::string dest =
+            const std::string dest =
                 _unzipFilesDestination.has_value() ?
                 (originalName.parent_path() / *_unzipFilesDestination).string() :
                 originalName.replace_extension().string();;
diff --git a/modules/sync/syncs/urlsynchronization.cpp b/modules/sync/syncs/urlsynchronization.cpp
index 8c38ade41d..f58b1434f8 100644
--- a/modules/sync/syncs/urlsynchronization.cpp
+++ b/modules/sync/syncs/urlsynchronization.cpp
@@ -223,10 +223,10 @@ bool UrlSynchronization::isEachFileValid() {
     if (ossyncVersion == "1.0") {
         std::getline(file >> std::ws, line);
         std::string& fileIsValidToDate = line;
-        double fileValidAsJ2000 = Time::convertTime(fileIsValidToDate);
+        const double fileValidAsJ2000 = Time::convertTime(fileIsValidToDate);
 
-        std::string todaysDate = Time::currentWallTime();
-        double todaysDateAsJ2000 = Time::convertTime(todaysDate);
+        const std::string todaysDate = Time::currentWallTime();
+        const double todaysDateAsJ2000 = Time::convertTime(todaysDate);
 
         // Issue warning if file is kept but user changed setting to download on startup.
         if ((fileValidAsJ2000 > todaysDateAsJ2000) && _secondsUntilResync == 0) {
@@ -264,12 +264,12 @@ void UrlSynchronization::createSyncFile(bool) const {
     dir.replace_extension("ossync");
     std::ofstream syncFile(dir, std::ofstream::out);
 
-    std::string currentTimeAsISO8601 = Time::currentWallTime();
-    double currentTimeAsJ2000 = Time::convertTime(currentTimeAsISO8601);
+    const std::string currentTimeAsISO8601 = Time::currentWallTime();
+    const double currentTimeAsJ2000 = Time::convertTime(currentTimeAsISO8601);
 
     // With the format YYYY-MM... any year thats larger than 4 digits throws an error
     // Limit the future date to year 9999
-    double futureTimeAsJ2000 = std::min(
+    const double futureTimeAsJ2000 = std::min(
         currentTimeAsJ2000 + _secondsUntilResync,
         MaxDateAsJ2000
     );
@@ -317,7 +317,7 @@ bool UrlSynchronization::trySyncUrls() {
 
         auto download = std::make_unique<HttpFileDownload>(
             url,
-            destination,
+            std::move(destination),
             HttpFileDownload::Overwrite::Yes
         );
         HttpFileDownload* dl = download.get();
@@ -334,7 +334,7 @@ bool UrlSynchronization::trySyncUrls() {
                     return !_shouldCancel;
                 }
 
-                std::lock_guard guard(fileSizeMutex);
+                const std::lock_guard guard(fileSizeMutex);
                 sizeData[url] = { downloadedBytes, totalBytes };
 
                 _nTotalBytesKnown = true;
diff --git a/modules/toyvolume/rendering/renderabletoyvolume.cpp b/modules/toyvolume/rendering/renderabletoyvolume.cpp
index 6fa4d3485c..f809341a63 100644
--- a/modules/toyvolume/rendering/renderabletoyvolume.cpp
+++ b/modules/toyvolume/rendering/renderabletoyvolume.cpp
@@ -150,18 +150,18 @@ RenderableToyVolume::RenderableToyVolume(const ghoul::Dictionary& dictionary)
 RenderableToyVolume::~RenderableToyVolume() {}
 
 void RenderableToyVolume::initializeGL() {
-    glm::vec4 color(glm::vec3(_color), opacity());
-    _raycaster = std::make_unique<ToyVolumeRaycaster>(color);
+    glm::vec4 color = glm::vec4(glm::vec3(_color), opacity());
+    _raycaster = std::make_unique<ToyVolumeRaycaster>(std::move(color));
     _raycaster->initialize();
 
-    global::raycasterManager->attachRaycaster(*_raycaster.get());
+    global::raycasterManager->attachRaycaster(*_raycaster);
 
-    std::function<void(bool)> onChange = [this](bool enabled) {
+    auto onChange = [this](bool enabled) {
         if (enabled) {
-            global::raycasterManager->attachRaycaster(*_raycaster.get());
+            global::raycasterManager->attachRaycaster(*_raycaster);
         }
         else {
-            global::raycasterManager->detachRaycaster(*_raycaster.get());
+            global::raycasterManager->detachRaycaster(*_raycaster);
         }
     };
 
@@ -179,7 +179,7 @@ void RenderableToyVolume::initializeGL() {
 
 void RenderableToyVolume::deinitializeGL() {
     if (_raycaster) {
-        global::raycasterManager->detachRaycaster(*_raycaster.get());
+        global::raycasterManager->detachRaycaster(*_raycaster);
         _raycaster = nullptr;
     }
 }
@@ -196,7 +196,7 @@ void RenderableToyVolume::update(const UpdateData& data) {
             static_cast<glm::vec3>(_translation) *
                 std::pow(10.f, static_cast<float>(_scalingExponent))
         );
-        glm::vec3 eulerRotation = static_cast<glm::vec3>(_rotation);
+        const glm::vec3 eulerRotation = _rotation;
         transform = glm::rotate(transform, eulerRotation.x, glm::vec3(1.f, 0.f, 0.f));
         transform = glm::rotate(transform, eulerRotation.y, glm::vec3(0.f, 1.f, 0.f));
         transform = glm::rotate(transform, eulerRotation.z,  glm::vec3(0.f, 0.f, 1.f));
@@ -207,7 +207,7 @@ void RenderableToyVolume::update(const UpdateData& data) {
                 std::pow(10.f, static_cast<float>(_scalingExponent))
         );
 
-        glm::vec4 color(glm::vec3(_color), opacity());
+        const glm::vec4 color = glm::vec4(glm::vec3(_color), opacity());
 
         _raycaster->setColor(color);
         _raycaster->setStepSize(_stepSize);
@@ -220,7 +220,7 @@ void RenderableToyVolume::update(const UpdateData& data) {
 
 void RenderableToyVolume::render(const RenderData& data, RendererTasks& tasks) {
     RaycasterTask task { _raycaster.get(), data };
-    tasks.raycasterTasks.push_back(task);
+    tasks.raycasterTasks.push_back(std::move(task));
 }
 
 } // namespace openspace
diff --git a/modules/toyvolume/rendering/toyvolumeraycaster.cpp b/modules/toyvolume/rendering/toyvolumeraycaster.cpp
index d1caf09116..be3acef255 100644
--- a/modules/toyvolume/rendering/toyvolumeraycaster.cpp
+++ b/modules/toyvolume/rendering/toyvolumeraycaster.cpp
@@ -91,7 +91,7 @@ void ToyVolumeRaycaster::renderExitPoints(const RenderData& data,
 }
 
 glm::dmat4 ToyVolumeRaycaster::modelViewTransform(const RenderData& data) {
-    glm::dmat4 modelTransform =
+    const glm::dmat4 modelTransform =
         glm::translate(glm::dmat4(1.0), data.modelTransform.translation) *
         glm::dmat4(data.modelTransform.rotation) *
         glm::scale(glm::dmat4(1.0), glm::dvec3(data.modelTransform.scale)) *
@@ -115,14 +115,14 @@ void ToyVolumeRaycaster::postRaycast(const RaycastData&, ghoul::opengl::ProgramO
 
 bool ToyVolumeRaycaster::isCameraInside(const RenderData& data, glm::vec3& localPosition)
 {
-    glm::vec4 modelPos = glm::inverse(modelViewTransform(data)) *
-                         glm::vec4(0.f, 0.f, 0.f, 1.f);
+    const glm::vec4 modelPos =
+        glm::inverse(modelViewTransform(data)) * glm::vec4(0.f, 0.f, 0.f, 1.f);
 
     localPosition = (glm::vec3(modelPos) + glm::vec3(0.5f));
 
-    return (localPosition.x > 0 && localPosition.x < 1 &&
-            localPosition.y > 0 && localPosition.y < 1 &&
-            localPosition.z > 0 && localPosition.z < 1);
+    return (localPosition.x > 0.f && localPosition.x < 1.f &&
+            localPosition.y > 0.f && localPosition.y < 1.f &&
+            localPosition.z > 0.f && localPosition.z < 1.f);
 }
 
 std::string ToyVolumeRaycaster::boundsVertexShaderPath() const {
diff --git a/modules/toyvolume/rendering/toyvolumeraycaster.h b/modules/toyvolume/rendering/toyvolumeraycaster.h
index 7f7744b802..25e371707f 100644
--- a/modules/toyvolume/rendering/toyvolumeraycaster.h
+++ b/modules/toyvolume/rendering/toyvolumeraycaster.h
@@ -66,7 +66,7 @@ public:
     void setColor(glm::vec4 color);
     void setModelTransform(glm::mat4 transform);
     void setTime(double time);
-    void setStepSize(float time);
+    void setStepSize(float stepSize);
 
 private:
     glm::dmat4 modelViewTransform(const RenderData& data);
diff --git a/modules/video/src/renderablevideoplane.cpp b/modules/video/src/renderablevideoplane.cpp
index 4d0ed18dab..fd399eacb3 100644
--- a/modules/video/src/renderablevideoplane.cpp
+++ b/modules/video/src/renderablevideoplane.cpp
@@ -75,20 +75,18 @@ void RenderableVideoPlane::update(const UpdateData& data) {
     }
 
     // Shape the plane based on the aspect ratio of the video
-    glm::vec2 textureDim = glm::vec2(_videoPlayer.frameTexture()->dimensions());
+    const glm::vec2 textureDim = glm::vec2(_videoPlayer.frameTexture()->dimensions());
     if (_textureDimensions != textureDim) {
-        float aspectRatio = textureDim.x / textureDim.y;
-        float planeAspectRatio = _size.value().x / _size.value().y;
+        const float aspectRatio = textureDim.x / textureDim.y;
+        const float planeAspectRatio = _size.value().x / _size.value().y;
 
         if (std::abs(planeAspectRatio - aspectRatio) >
             std::numeric_limits<float>::epsilon())
         {
-            double scale = _size.value().y;
-            glm::vec2 newSize =
-                aspectRatio > 0.f ?
+            const double scale = _size.value().y;
+            _size = aspectRatio > 0.f ?
                 glm::vec2(scale * aspectRatio, scale) :
                 glm::vec2(scale, scale * aspectRatio);
-            _size = newSize;
         }
 
         _textureDimensions = textureDim;
diff --git a/modules/video/src/renderablevideosphere.cpp b/modules/video/src/renderablevideosphere.cpp
index a5659d0e48..4aa9244af2 100644
--- a/modules/video/src/renderablevideosphere.cpp
+++ b/modules/video/src/renderablevideosphere.cpp
@@ -77,7 +77,7 @@ void RenderableVideoSphere::update(const UpdateData&) {
 }
 
 void RenderableVideoSphere::bindTexture() {
-    _videoPlayer.frameTexture().get()->bind();
+    _videoPlayer.frameTexture()->bind();
 }
 
 } // namespace openspace
diff --git a/modules/video/src/screenspacevideo.cpp b/modules/video/src/screenspacevideo.cpp
index 0f24c0563e..9d5f62964c 100644
--- a/modules/video/src/screenspacevideo.cpp
+++ b/modules/video/src/screenspacevideo.cpp
@@ -73,7 +73,7 @@ void ScreenSpaceVideo::update() {
     if (!_videoPlayer.isInitialized()) {
         return;
     }
-    glm::uvec3 texDimensions = _videoPlayer.frameTexture()->dimensions();
+    const glm::uvec3& texDimensions = _videoPlayer.frameTexture()->dimensions();
     if (_objectSize != glm::ivec2(texDimensions.x, texDimensions.y)) {
         _objectSize = texDimensions;
     }
diff --git a/modules/video/src/videoplayer.cpp b/modules/video/src/videoplayer.cpp
index 00715d24d2..b6a8225dd0 100644
--- a/modules/video/src/videoplayer.cpp
+++ b/modules/video/src/videoplayer.cpp
@@ -164,7 +164,7 @@ void VideoPlayer::observePropertyMpv(MpvKey key) {
 }
 
 void VideoPlayer::setPropertyStringMpv(const char* name, const char* value) {
-    int result = mpv_set_property_string(_mpvHandle, name, value);
+    const int result = mpv_set_property_string(_mpvHandle, name, value);
     if (!checkMpvError(result)) {
         LWARNING(fmt::format("Error setting property '{}'", name));
     }
@@ -174,7 +174,7 @@ void VideoPlayer::setPropertyAsyncMpv(int value, MpvKey key) {
     if (!_isInitialized) {
         return;
     }
-    int result = mpv_set_property_async(
+    const int result = mpv_set_property_async(
         _mpvHandle,
         static_cast<uint64_t>(key),
         keys[key],
@@ -190,7 +190,7 @@ void VideoPlayer::setPropertyAsyncMpv(const char* value, MpvKey key) {
     if (!_isInitialized) {
         return;
     }
-    int result = mpv_set_property_async(
+    const int result = mpv_set_property_async(
         _mpvHandle,
         static_cast<uint64_t>(key),
         keys[key],
@@ -206,7 +206,7 @@ void VideoPlayer::setPropertyAsyncMpv(double value, MpvKey key) {
     if (!_isInitialized) {
         return;
     }
-    int result = mpv_set_property_async(
+    const int result = mpv_set_property_async(
         _mpvHandle,
         static_cast<uint64_t>(key),
         keys[key],
@@ -219,7 +219,7 @@ void VideoPlayer::setPropertyAsyncMpv(double value, MpvKey key) {
 }
 
 void VideoPlayer::getPropertyAsyncMpv(MpvKey key) {
-    int result = mpv_get_property_async(
+    const int result = mpv_get_property_async(
         _mpvHandle,
         static_cast<uint64_t>(key),
         keys[key],
@@ -232,11 +232,7 @@ void VideoPlayer::getPropertyAsyncMpv(MpvKey key) {
 }
 
 void VideoPlayer::commandAsyncMpv(const char* cmd[], MpvKey key) {
-    int result = mpv_command_async(
-        _mpvHandle,
-        static_cast<uint64_t>(key),
-        cmd
-    );
+    const int result = mpv_command_async(_mpvHandle, static_cast<uint64_t>(key), cmd);
     if (!checkMpvError(result)) {
         LERROR(fmt::format("Could not execute command '{}'", keys[key]));
         return;
@@ -286,8 +282,7 @@ VideoPlayer::VideoPlayer(const ghoul::Dictionary& dictionary)
         _goToStart.onChange([this]() { goToStart(); });
         addProperty(_goToStart);
         _loopVideo.onChange([this]() {
-            std::string newValue = _loopVideo ? "inf" : "no";
-            setPropertyAsyncMpv(newValue.c_str(), MpvKey::Loop);
+            setPropertyAsyncMpv(_loopVideo ? "inf" : "no", MpvKey::Loop);
         });
         addProperty(_loopVideo);
         // Audio only makes sense when the video is playing in real time
@@ -343,13 +338,13 @@ VideoPlayer::~VideoPlayer() {
 }
 
 void VideoPlayer::pause() {
-    int isPaused = 1;
-    setPropertyAsyncMpv(isPaused, MpvKey::Pause);
+    constexpr int IsPaused = 1;
+    setPropertyAsyncMpv(IsPaused, MpvKey::Pause);
 }
 
 void VideoPlayer::play() {
-    int isPaused = 0;
-    setPropertyAsyncMpv(isPaused, MpvKey::Pause);
+    constexpr int IsPaused = 0;
+    setPropertyAsyncMpv(IsPaused, MpvKey::Pause);
 }
 
 void VideoPlayer::goToStart() {
@@ -451,7 +446,7 @@ void VideoPlayer::initializeMpv() {
     );
 
     // Load file
-    std::string file = _videoFile;
+    const std::string file = _videoFile;
     const char* cmd[] = { "loadfile", file.c_str(), nullptr };
     result = mpv_command(_mpvHandle, cmd);
     if (!checkMpvError(result)) {
@@ -501,7 +496,7 @@ void VideoPlayer::update() {
     }
 
     if (global::sessionRecording->isSavingFramesDuringPlayback()) {
-        double dt = global::sessionRecording->fixedDeltaTimeDuringFrameOutput();
+        const double dt = global::sessionRecording->fixedDeltaTimeDuringFrameOutput();
         if (_playbackMode == PlaybackMode::MapToSimulationTime) {
             _currentVideoTime = correctVideoPlaybackTime();
         }
@@ -509,7 +504,7 @@ void VideoPlayer::update() {
             _currentVideoTime = _currentVideoTime + dt;
         }
 
-        MpvKey key = MpvKey::Time;
+        const MpvKey key = MpvKey::Time;
         mpv_set_property(_mpvHandle, keys[key], formats[key], &_currentVideoTime);
 
         uint64_t result = mpv_render_context_update(_mpvRenderContext);
@@ -534,7 +529,7 @@ void VideoPlayer::renderMpv() {
 
     // Renders a frame libmpv has been updated
     if (_wakeup) {
-        uint64_t result = mpv_render_context_update(_mpvRenderContext);
+        const uint64_t result = mpv_render_context_update(_mpvRenderContext);
         if ((result & MPV_RENDER_UPDATE_FRAME)) {
             renderFrame();
             _wakeup = 0;
@@ -544,12 +539,12 @@ void VideoPlayer::renderMpv() {
 
 void VideoPlayer::renderFrame() {
     // Save the currently bound fbo
-    GLint defaultFBO = ghoul::opengl::FramebufferObject::getActiveObject();
+    const GLint defaultFBO = ghoul::opengl::FramebufferObject::getActiveObject();
 
     // See render_gl.h on what OpenGL environment mpv expects, and other API
     // details. This function fills the fbo and texture with data, after it
     // we can get the data on the GPU, not the CPU
-    int fboInt = static_cast<int>(_fbo);
+    const int fboInt = static_cast<int>(_fbo);
     mpv_opengl_fbo mpfbo{
         fboInt,
         _videoResolution.x,
@@ -606,7 +601,7 @@ void VideoPlayer::handleMpvEvents() {
                     break;
                 }
                 // Validate reply with what we have stored
-                MpvKey key = static_cast<MpvKey>(event->reply_userdata);
+                const MpvKey key = static_cast<MpvKey>(event->reply_userdata);
                 if (formats[key] != prop->format) {
                     LINFO(fmt::format("Wrong format for property '{}'", keys[key]));
                     break;
@@ -621,7 +616,6 @@ void VideoPlayer::handleMpvEvents() {
             case MPV_EVENT_LOG_MESSAGE: {
                 mpv_event_log_message* msg =
                     reinterpret_cast<mpv_event_log_message*>(event->data);
-                std::stringstream ss;
                 LINFO(fmt::format("[{}] {}: {}", msg->prefix, msg->level, msg->text));
                 break;
             }
@@ -634,7 +628,7 @@ void VideoPlayer::handleMpvEvents() {
 }
 
 void VideoPlayer::handleMpvProperties(mpv_event* event) {
-    MpvKey key = static_cast<MpvKey>(event->reply_userdata);
+    const MpvKey key = static_cast<MpvKey>(event->reply_userdata);
 
     if (!event->data) {
         LERROR(fmt::format("Could not find data for property: {}", keys[key]));
@@ -644,7 +638,7 @@ void VideoPlayer::handleMpvProperties(mpv_event* event) {
     mpv_event_property* prop = nullptr;
     mpv_node node = {};
     if (formats[key] == MPV_FORMAT_NODE) {
-        int result = mpv_event_to_node(&node, event);
+        const int result = mpv_event_to_node(&node, event);
         if (!checkMpvError(result)) {
             LWARNING(
                 fmt::format("Error getting data from libmpv property: {}", keys[key])
@@ -658,6 +652,9 @@ void VideoPlayer::handleMpvProperties(mpv_event* event) {
     // Handle new values
     switch (key) {
         case MpvKey::Duration: {
+            if (!prop) {
+                break;
+            }
             double* duration = reinterpret_cast<double*>(prop->data);
 
             if (!duration) {
@@ -674,6 +671,9 @@ void VideoPlayer::handleMpvProperties(mpv_event* event) {
             break;
         }
         case MpvKey::Height: {
+            if (!prop) {
+                break;
+            }
             int* height = reinterpret_cast<int*>(prop->data);
 
             if (!height) {
@@ -691,6 +691,9 @@ void VideoPlayer::handleMpvProperties(mpv_event* event) {
             break;
         }
         case MpvKey::Width: {
+            if (!prop) {
+                break;
+            }
             int* width = reinterpret_cast<int*>(prop->data);
 
             if (!width) {
@@ -708,6 +711,9 @@ void VideoPlayer::handleMpvProperties(mpv_event* event) {
             break;
         }
         case MpvKey::Time: {
+            if (!prop) {
+                break;
+            }
             double* time = reinterpret_cast<double*>(prop->data);
 
             if (!time) {
@@ -718,11 +724,17 @@ void VideoPlayer::handleMpvProperties(mpv_event* event) {
             break;
         }
         case MpvKey::IsSeeking: {
+            if (!prop) {
+                break;
+            }
             bool* isSeekingBool = reinterpret_cast<bool*>(prop->data);
             _isSeeking = *isSeekingBool;
             break;
         }
         case MpvKey::Fps: {
+            if (!prop) {
+                break;
+            }
             double* fps = reinterpret_cast<double*>(prop->data);
             if (*fps < glm::epsilon<double>()) {
                 _fps = 24.0;
@@ -743,6 +755,9 @@ void VideoPlayer::handleMpvProperties(mpv_event* event) {
             break;
         }
         case MpvKey::Pause: {
+            if (!prop) {
+                break;
+            }
             int* videoIsPaused = reinterpret_cast<int*>(prop->data);
             _isPaused = (* videoIsPaused == 1);
             break;
@@ -794,7 +809,7 @@ void VideoPlayer::postSync(bool isMaster) {
         return;
     }
     // Ensure the nodes have the same time as the master node
-    bool isMappingTime = _playbackMode == PlaybackMode::MapToSimulationTime;
+    const bool isMappingTime = _playbackMode == PlaybackMode::MapToSimulationTime;
     if (!isMaster) {
         if ((_correctPlaybackTime - _currentVideoTime) > glm::epsilon<double>()) {
             seekToTime(_correctPlaybackTime, PauseAfterSeek(isMappingTime));
@@ -825,7 +840,7 @@ bool VideoPlayer::isWithingStartEndTime() const {
 }
 
 void VideoPlayer::updateFrameDuration() {
-    double openspaceVideoLength = (_endJ200Time - _startJ200Time) / _videoDuration;
+    const double openspaceVideoLength = (_endJ200Time - _startJ200Time) / _videoDuration;
     _frameDuration = (1.0 / _fps) * openspaceVideoLength;
 }
 
@@ -881,8 +896,8 @@ void VideoPlayer::createTexture(glm::ivec2 size) {
 }
 
 void VideoPlayer::resizeTexture(glm::ivec2 size) {
-    bool isValid = size.x > 0 && size.y > 0 && _fbo > 0;
-    bool isNew = size != _videoResolution;
+    const bool isValid = size.x > 0 && size.y > 0 && _fbo > 0;
+    const bool isNew = size != _videoResolution;
     if (isValid && isNew) {
         _videoResolution = size;
         LINFO(fmt::format("Resizing texture: width: {} height: {}", size.x, size.y));
diff --git a/modules/video/src/videotileprovider.cpp b/modules/video/src/videotileprovider.cpp
index 8a53522c1a..6c290f9456 100644
--- a/modules/video/src/videotileprovider.cpp
+++ b/modules/video/src/videotileprovider.cpp
@@ -70,9 +70,9 @@ globebrowsing::Tile VideoTileProvider::tile(const globebrowsing::TileIndex& tile
     }
 
     // For now, don't use the cache as we're trying to debug the problem w playback
-    uint64_t hash = tileIndex.hashKey();
+    const uint64_t hash = tileIndex.hashKey();
     auto foundTile = _tileCache.find(hash);
-    bool textureChanged = foundTile != _tileCache.end() &&
+    const bool textureChanged = foundTile != _tileCache.end() &&
         foundTile->second.texture != _videoPlayer.frameTexture().get();
 
     if (foundTile == _tileCache.end() || textureChanged) {
@@ -110,19 +110,18 @@ void VideoTileProvider::reset() {
 }
 
 ChunkTile VideoTileProvider::chunkTile(TileIndex tileIndex, int parents, int maxParents) {
-    std::function<void(TileIndex&, TileUvTransform&)> ascendToParent =
-        [](TileIndex& ti, TileUvTransform&) {
-            ti.level--;
-        };
+    constexpr auto ascendToParent = [](TileIndex& ti, TileUvTransform&) {
+        ti.level--;
+    };
 
-    glm::vec2 noOfTiles = {
+    const glm::vec2 nTiles = {
         std::pow(2, tileIndex.level),
         std::pow(2, tileIndex.level - 1)
     };
-    glm::vec2 ratios = { 1.f / noOfTiles.x, 1.f / noOfTiles.y };
-    float offsetX = ratios.x * static_cast<float>(tileIndex.x);
+    const glm::vec2 ratios = { 1.f / nTiles.x, 1.f / nTiles.y };
+    const float offsetX = ratios.x * static_cast<float>(tileIndex.x);
     // The tiles on the y-axis should be traversed backwards
-    float offsetY = ratios.y * (noOfTiles.y - static_cast<float>(tileIndex.y) - 1.f);
+    const float offsetY = ratios.y * (nTiles.y - static_cast<float>(tileIndex.y) - 1.f);
 
     TileUvTransform uvTransform = { glm::vec2(offsetX, offsetY), ratios };
 
diff --git a/modules/vislab/rendering/renderabledistancelabel.cpp b/modules/vislab/rendering/renderabledistancelabel.cpp
index 7ac3e98bc9..05726662c5 100644
--- a/modules/vislab/rendering/renderabledistancelabel.cpp
+++ b/modules/vislab/rendering/renderabledistancelabel.cpp
@@ -130,8 +130,8 @@ void RenderableDistanceLabel::update(const UpdateData&) {
         std::string distanceText = std::to_string(
             std::round(nodeline->distance() / scale)
         );
-        int pos = static_cast<int>(distanceText.find("."));
-        std::string subStr = distanceText.substr(pos);
+        const int pos = static_cast<int>(distanceText.find('.'));
+        const std::string subStr = distanceText.substr(pos);
         distanceText.erase(pos, subStr.size());
 
         // Create final label text and set it
@@ -142,9 +142,9 @@ void RenderableDistanceLabel::update(const UpdateData&) {
         SceneGraphNode* startNode = RE.scene()->sceneGraphNode(nodeline->start());
         SceneGraphNode* endNode = RE.scene()->sceneGraphNode(nodeline->end());
         if (startNode && endNode) {
-            glm::dvec3 start = startNode->worldPosition();
-            glm::dvec3 end = endNode->worldPosition();
-            glm::dvec3 goalPos = start + (end - start) / 2.0;
+            const glm::dvec3 start = startNode->worldPosition();
+            const glm::dvec3 end = endNode->worldPosition();
+            const glm::dvec3 goalPos = start + (end - start) / 2.0;
             _transformationMatrix = glm::translate(glm::dmat4(1.0), goalPos);
         }
         else {
diff --git a/modules/volume/rawvolumemetadata.cpp b/modules/volume/rawvolumemetadata.cpp
index e639b15f88..27e93726c0 100644
--- a/modules/volume/rawvolumemetadata.cpp
+++ b/modules/volume/rawvolumemetadata.cpp
@@ -100,7 +100,7 @@ RawVolumeMetadata RawVolumeMetadata::createFromDictionary(
     return metadata;
 }
 
-ghoul::Dictionary RawVolumeMetadata::dictionary() {
+ghoul::Dictionary RawVolumeMetadata::dictionary() const {
     ghoul::Dictionary dict;
     dict.setValue("Dimensions", glm::dvec3(dimensions));
     dict.setValue("GridType", gridTypeToString(gridType));
diff --git a/modules/volume/rawvolumemetadata.h b/modules/volume/rawvolumemetadata.h
index 9d6218bfbe..77edffd1e8 100644
--- a/modules/volume/rawvolumemetadata.h
+++ b/modules/volume/rawvolumemetadata.h
@@ -37,7 +37,7 @@ struct RawVolumeMetadata {
     static RawVolumeMetadata createFromDictionary(const ghoul::Dictionary& dictionary);
     static documentation::Documentation Documentation();
 
-    ghoul::Dictionary dictionary();
+    ghoul::Dictionary dictionary() const;
 
     glm::uvec3 dimensions = glm::uvec3(0);
     VolumeGridType gridType;
diff --git a/modules/volume/rendering/basicvolumeraycaster.cpp b/modules/volume/rendering/basicvolumeraycaster.cpp
index 9458b1c03d..75f350b7c8 100644
--- a/modules/volume/rendering/basicvolumeraycaster.cpp
+++ b/modules/volume/rendering/basicvolumeraycaster.cpp
@@ -50,10 +50,10 @@ BasicVolumeRaycaster::BasicVolumeRaycaster(
                                     std::shared_ptr<ghoul::opengl::Texture> volumeTexture,
                             std::shared_ptr<openspace::TransferFunction> transferFunction,
                                              std::shared_ptr<VolumeClipPlanes> clipPlanes)
-    : _clipPlanes(clipPlanes)
-    , _volumeTexture(volumeTexture)
-    , _transferFunction(transferFunction)
-    , _boundingBox(glm::vec3(1.0))
+    : _clipPlanes(std::move(clipPlanes))
+    , _volumeTexture(std::move(volumeTexture))
+    , _transferFunction(std::move(transferFunction))
+    , _boundingBox(glm::vec3(1.f))
 {}
 
 BasicVolumeRaycaster::~BasicVolumeRaycaster() {}
@@ -79,7 +79,7 @@ void BasicVolumeRaycaster::renderEntryPoints(const RenderData& data,
 }
 
 glm::dmat4 BasicVolumeRaycaster::modelViewTransform(const RenderData& data) {
-    glm::dmat4 modelTransform =
+    const glm::dmat4 modelTransform =
         glm::translate(glm::dmat4(1.0), data.modelTransform.translation) *
         glm::dmat4(data.modelTransform.rotation) *
         glm::scale(glm::dmat4(1.0), glm::dvec3(data.modelTransform.scale)) *
@@ -112,10 +112,10 @@ void BasicVolumeRaycaster::preRaycast(const RaycastData& data,
         return;
     }
 
-    std::string stepSizeUniformName = "maxStepSize" + std::to_string(data.id);
+    const std::string stepSizeUniformName = "maxStepSize" + std::to_string(data.id);
     program.setUniform(stepSizeUniformName, _stepSize);
 
-    std::string id = std::to_string(data.id);
+    const std::string id = std::to_string(data.id);
 
     _transferFunction->update();
     _tfUnit = std::make_unique<ghoul::opengl::TextureUnit>();
@@ -130,9 +130,9 @@ void BasicVolumeRaycaster::preRaycast(const RaycastData& data,
 
     program.setUniform("gridType_" + id, static_cast<int>(_gridType));
 
-    std::vector<glm::vec3> clipNormals = _clipPlanes->normals();
-    std::vector<glm::vec2> clipOffsets = _clipPlanes->offsets();
-    int nClips = static_cast<int>(clipNormals.size());
+    const std::vector<glm::vec3> clipNormals = _clipPlanes->normals();
+    const std::vector<glm::vec2> clipOffsets = _clipPlanes->offsets();
+    const int nClips = static_cast<int>(clipNormals.size());
 
     program.setUniform("nClips_" + id, nClips);
     program.setUniform("clipNormals_" + id, clipNormals);
@@ -151,8 +151,8 @@ void BasicVolumeRaycaster::postRaycast(const RaycastData&, ghoul::opengl::Progra
 bool BasicVolumeRaycaster::isCameraInside(const RenderData& data,
                                           glm::vec3& localPosition)
 {
-    glm::vec4 modelPos = glm::inverse(modelViewTransform(data)) *
-                         glm::vec4(0.f, 0.f, 0.f, 1.f);
+    const glm::vec4 modelPos = glm::inverse(modelViewTransform(data)) *
+                               glm::vec4(0.f, 0.f, 0.f, 1.f);
 
     localPosition = (glm::vec3(modelPos) + glm::vec3(0.5f));
 
diff --git a/modules/volume/rendering/basicvolumeraycaster.h b/modules/volume/rendering/basicvolumeraycaster.h
index 599e6757f7..43c3d24208 100644
--- a/modules/volume/rendering/basicvolumeraycaster.h
+++ b/modules/volume/rendering/basicvolumeraycaster.h
@@ -85,7 +85,7 @@ public:
     float rNormalization() const;
     void setRNormalization(float rNormalization);
     float rUpperBound() const;
-    void setRUpperBound(float rNormalization);
+    void setRUpperBound(float rUpperBound);
     VolumeGridType gridType() const;
     void setGridType(VolumeGridType gridType);
     void setModelTransform(glm::mat4 transform);
diff --git a/modules/volume/rendering/renderabletimevaryingvolume.cpp b/modules/volume/rendering/renderabletimevaryingvolume.cpp
index e16b7badda..464c140a5e 100644
--- a/modules/volume/rendering/renderabletimevaryingvolume.cpp
+++ b/modules/volume/rendering/renderabletimevaryingvolume.cpp
@@ -212,13 +212,13 @@ RenderableTimeVaryingVolume::RenderableTimeVaryingVolume(
     _secondsBefore = p.secondsBefore.value_or(_secondsBefore);
     _secondsAfter = p.secondsAfter;
 
-    ghoul::Dictionary clipPlanesDictionary = p.clipPlanes.value_or(ghoul::Dictionary());
-    _clipPlanes = std::make_shared<volume::VolumeClipPlanes>(clipPlanesDictionary);
+    const ghoul::Dictionary clipPlanesDict = p.clipPlanes.value_or(ghoul::Dictionary());
+    _clipPlanes = std::make_shared<volume::VolumeClipPlanes>(clipPlanesDict);
     _clipPlanes->setIdentifier("clipPlanes");
     _clipPlanes->setGuiName("Clip Planes");
 
     if (p.gridType.has_value()) {
-        VolumeGridType gridType = volume::parseGridType(*p.gridType);
+        const VolumeGridType gridType = volume::parseGridType(*p.gridType);
         _gridType = static_cast<std::underlying_type_t<VolumeGridType>>(gridType);
     }
 
@@ -246,14 +246,14 @@ void RenderableTimeVaryingVolume::initializeGL() {
     // TODO: defer loading of data to later (separate thread or at least not when loading)
     for (std::pair<const double, Timestep>& p : _volumeTimesteps) {
         Timestep& t = p.second;
-        std::string path = fmt::format(
+        const std::string path = fmt::format(
             "{}/{}.rawvolume", _sourceDirectory.value(), t.baseName
         );
         RawVolumeReader<float> reader(path, t.metadata.dimensions);
         t.rawVolume = reader.read(_invertDataAtZ);
 
-        float min = t.metadata.minValue;
-        float diff = t.metadata.maxValue - t.metadata.minValue;
+        const float min = t.metadata.minValue;
+        const float diff = t.metadata.maxValue - t.metadata.minValue;
         float* data = t.rawVolume->data();
         for (size_t i = 0; i < t.rawVolume->nCells(); i++) {
             data[i] = glm::clamp((data[i] - min) / diff, 0.f, 1.f);
@@ -291,13 +291,13 @@ void RenderableTimeVaryingVolume::initializeGL() {
     );
 
     _raycaster->initialize();
-    global::raycasterManager->attachRaycaster(*_raycaster.get());
+    global::raycasterManager->attachRaycaster(*_raycaster);
     onEnabledChange([this](bool enabled) {
         if (enabled) {
-            global::raycasterManager->attachRaycaster(*_raycaster.get());
+            global::raycasterManager->attachRaycaster(*_raycaster);
         }
         else {
-            global::raycasterManager->detachRaycaster(*_raycaster.get());
+            global::raycasterManager->detachRaycaster(*_raycaster);
         }
     });
 
@@ -338,7 +338,7 @@ void RenderableTimeVaryingVolume::loadTimestepMetadata(const std::string& path)
     RawVolumeMetadata metadata;
 
     try {
-        ghoul::Dictionary dictionary = ghoul::lua::loadDictionaryFromFile(path);
+        const ghoul::Dictionary dictionary = ghoul::lua::loadDictionaryFromFile(path);
         metadata = RawVolumeMetadata::createFromDictionary(dictionary);
     }
     catch (const ghoul::RuntimeError& e) {
@@ -362,23 +362,23 @@ RenderableTimeVaryingVolume::Timestep* RenderableTimeVaryingVolume::currentTimes
     if (_volumeTimesteps.empty()) {
         return nullptr;
     }
-    double currentTime = global::timeManager->time().j2000Seconds();
+    const double currentTime = global::timeManager->time().j2000Seconds();
 
     // Get the first item with time > currentTime
     auto currentTimestepIt = _volumeTimesteps.upper_bound(currentTime);
     if (currentTimestepIt == _volumeTimesteps.end()) {
         // No such timestep was found: show last timestep if it is within the time margin.
         Timestep* lastTimestep = &(_volumeTimesteps.rbegin()->second);
-        double threshold = lastTimestep->metadata.time +
-            static_cast<double>(_secondsAfter);
+        const double threshold =
+            lastTimestep->metadata.time + static_cast<double>(_secondsAfter);
         return currentTime < threshold ? lastTimestep : nullptr;
     }
 
     if (currentTimestepIt == _volumeTimesteps.begin()) {
         // No such timestep was found: show first timestep if it is within the time margin
         Timestep* firstTimestep = &(_volumeTimesteps.begin()->second);
-        double threshold = firstTimestep->metadata.time -
-            static_cast<double>(_secondsBefore);
+        const double threshold =
+            firstTimestep->metadata.time - static_cast<double>(_secondsBefore);
         return currentTime >= threshold ? firstTimestep : nullptr;
     }
 
@@ -438,13 +438,13 @@ void RenderableTimeVaryingVolume::update(const UpdateData&) {
         // ie with lower bound from (-0.5, -0.5, -0.5) and upper bound (0.5, 0.5, 0.5)
         if (t && t->texture) {
             if (_raycaster->gridType() == volume::VolumeGridType::Cartesian) {
-                glm::dvec3 scale = t->metadata.upperDomainBound -
-                    t->metadata.lowerDomainBound;
-                glm::dvec3 translation =
+                const glm::dvec3 scale =
+                    t->metadata.upperDomainBound - t->metadata.lowerDomainBound;
+                const glm::dvec3 translation =
                     (t->metadata.lowerDomainBound + t->metadata.upperDomainBound) * 0.5f;
 
                 glm::dmat4 modelTransform = glm::translate(glm::dmat4(1.0), translation);
-                glm::dmat4 scaleMatrix = glm::scale(glm::dmat4(1.0), scale);
+                const glm::dmat4 scaleMatrix = glm::scale(glm::dmat4(1.0), scale);
                 modelTransform = modelTransform * scaleMatrix;
                 _raycaster->setModelTransform(glm::mat4(modelTransform));
             }
@@ -482,7 +482,7 @@ bool RenderableTimeVaryingVolume::isReady() const {
 
 void RenderableTimeVaryingVolume::deinitializeGL() {
     if (_raycaster) {
-        global::raycasterManager->detachRaycaster(*_raycaster.get());
+        global::raycasterManager->detachRaycaster(*_raycaster);
         _raycaster = nullptr;
     }
 }
diff --git a/modules/volume/rendering/renderabletimevaryingvolume.h b/modules/volume/rendering/renderabletimevaryingvolume.h
index 1bb1567821..a5d1f1a9cd 100644
--- a/modules/volume/rendering/renderabletimevaryingvolume.h
+++ b/modules/volume/rendering/renderabletimevaryingvolume.h
@@ -72,8 +72,8 @@ private:
 
     Timestep* currentTimestep();
     int timestepIndex(const Timestep* t) const;
-    Timestep* timestepFromIndex(int index);
-    void jumpToTimestep(int i);
+    Timestep* timestepFromIndex(int target);
+    void jumpToTimestep(int target);
 
     void loadTimestepMetadata(const std::string& path);
 
diff --git a/modules/volume/rendering/volumeclipplanes.cpp b/modules/volume/rendering/volumeclipplanes.cpp
index 201a638ed8..689df97c6e 100644
--- a/modules/volume/rendering/volumeclipplanes.cpp
+++ b/modules/volume/rendering/volumeclipplanes.cpp
@@ -34,9 +34,9 @@ VolumeClipPlanes::VolumeClipPlanes(const ghoul::Dictionary& dictionary)
     // @TODO Missing documentation
     , _nClipPlanes({ "nClipPlanes", "Number of clip planes", "" }, 0, 0, 10)
 {
-    for (std::string_view key : dictionary.keys()) {
-        ghoul::Dictionary cutPlaneDictionary = dictionary.value<ghoul::Dictionary>(key);
-        VolumeClipPlane clipPlane = VolumeClipPlane(cutPlaneDictionary);
+    for (const std::string_view key : dictionary.keys()) {
+        const ghoul::Dictionary cutplane = dictionary.value<ghoul::Dictionary>(key);
+        VolumeClipPlane clipPlane = VolumeClipPlane(cutplane);
         clipPlane.setIdentifier(std::string(key));
         _clipPlanes.push_back(std::move(clipPlane));
     }
@@ -54,6 +54,7 @@ void VolumeClipPlanes::deinitialize() {}
 
 std::vector<glm::vec3> VolumeClipPlanes::normals() {
     std::vector<glm::vec3> normals;
+    normals.reserve(_clipPlanes.size());
     for (const VolumeClipPlane& clipPlane : _clipPlanes) {
         normals.push_back(clipPlane.normal());
     }
@@ -62,6 +63,7 @@ std::vector<glm::vec3> VolumeClipPlanes::normals() {
 
 std::vector<glm::vec2> VolumeClipPlanes::offsets() {
     std::vector<glm::vec2> offsets;
+    offsets.reserve(_clipPlanes.size());
     for (const VolumeClipPlane& clipPlane : _clipPlanes) {
         offsets.push_back(clipPlane.offsets());
     }
diff --git a/modules/volume/tasks/generaterawvolumetask.cpp b/modules/volume/tasks/generaterawvolumetask.cpp
index ee6078e4f3..880857d079 100644
--- a/modules/volume/tasks/generaterawvolumetask.cpp
+++ b/modules/volume/tasks/generaterawvolumetask.cpp
@@ -133,8 +133,8 @@ void GenerateRawVolumeTask::perform(const Task::ProgressCallback& progressCallba
     float minVal = std::numeric_limits<float>::max();
     float maxVal = std::numeric_limits<float>::min();
 
-    rawVolume.forEachVoxel([&](glm::uvec3 cell, float) {
-        glm::vec3 coord = _lowerDomainBound +
+    rawVolume.forEachVoxel([&](const glm::uvec3& cell, float) {
+        const glm::vec3 coord = _lowerDomainBound +
             glm::vec3(cell) / glm::vec3(_dimensions) * domainSize;
 
 #if (defined(NDEBUG) || defined(DEBUG))
@@ -154,7 +154,7 @@ void GenerateRawVolumeTask::perform(const Task::ProgressCallback& progressCallba
             return;
         }
 
-        float value = static_cast<float>(luaL_checknumber(state, 1));
+        const float value = static_cast<float>(luaL_checknumber(state, 1));
         lua_pop(state, 1);
         rawVolume.set(cell, value);
 
@@ -189,14 +189,13 @@ void GenerateRawVolumeTask::perform(const Task::ProgressCallback& progressCallba
     metadata.minValue = minVal;
     metadata.maxValue = maxVal;
 
-    ghoul::Dictionary outputDictionary = metadata.dictionary();
-    std::string metadataString = ghoul::formatLua(outputDictionary);
+    const ghoul::Dictionary outputDictionary = metadata.dictionary();
+    const std::string metadataString = ghoul::formatLua(outputDictionary);
 
-    std::fstream f(_dictionaryOutputPath, std::ios::out);
+    std::fstream f = std::fstream(_dictionaryOutputPath, std::ios::out);
     f << "return " << metadataString;
-    f.close();
 
-    progressCallback(1.0f);
+    progressCallback(1.f);
 }
 
 } // namespace openspace::volume
diff --git a/modules/volume/transferfunction.cpp b/modules/volume/transferfunction.cpp
index 125428df04..b62082565c 100644
--- a/modules/volume/transferfunction.cpp
+++ b/modules/volume/transferfunction.cpp
@@ -38,15 +38,17 @@ TransferFunction::TransferFunction(const std::string& s) {
 }
 
 bool TransferFunction::setEnvelopesFromString(const std::string& s) {
-    json j = json::parse(s);
-    for (json::iterator it = j.begin(); it != j.end(); it++) {
+    const json j = json::parse(s);
+    for (const nlohmann::json& it : j) {
         Envelope env;
         std::vector<EnvelopePoint> tmpVec;
+        const nlohmann::json& points = it["points"];
         for (size_t i = 0; i < 4; i++) {
-            std::string color = (*it)["points"][i]["color"].get<std::string>();
-            float x_value = (*it)["points"][i]["position"]["x"].get<float>();
-            float y_value = (*it)["points"][i]["position"]["y"].get<float>();
-            tmpVec.emplace_back(color, x_value, y_value);
+            const nlohmann::json& jt = points[i];
+            const std::string color = jt["color"].get<std::string>();
+            const float xValue = jt["position"]["x"].get<float>();
+            const float yValue = jt["position"]["y"].get<float>();
+            tmpVec.emplace_back(color, xValue, yValue);
         }
         env.setPoints(tmpVec);
         _envelopes.emplace_back(env);
@@ -57,32 +59,32 @@ bool TransferFunction::setEnvelopesFromString(const std::string& s) {
 bool TransferFunction::setEnvelopesFromLua(lua_State* state) {
     ghoul_assert(false, "Implement this");
 
-    bool success = (lua_istable(state, -1) == 1);
+    const bool success = (lua_istable(state, -1) == 1);
     if (success) {
         lua_pushnil(state);
         while (lua_next(state, -2)) {
-            Envelope env;
-            std::vector<EnvelopePoint> tmpVec;
+            //Envelope env;
+            //std::vector<EnvelopePoint> tmpVec;
 
-            /*lua_pushnil(state);
-            while (lua_next(state, -2)) {
-                lua_pushnil(state);
-                while (lua_next(state, -2)) {
-                    PrintTable(state);
-                    std::string color = static_cast<std::string>(lua_tostring(state, -1));
-                    lua_pop(state, 1);
-                    lua_pushnil(state);
-                    lua_next(state, -2);
-                    float x_value = static_cast<float>(lua_tonumber(state, -1));
+            //lua_pushnil(state);
+            //while (lua_next(state, -2)) {
+            //    lua_pushnil(state);
+            //    while (lua_next(state, -2)) {
+            //        PrintTable(state);
+            //        std::string color = static_cast<std::string>(lua_tostring(state, -1));
+            //        lua_pop(state, 1);
+            //        lua_pushnil(state);
+            //        lua_next(state, -2);
+            //        float x_value = static_cast<float>(lua_tonumber(state, -1));
 
-                    lua_pop(state, 1);
-                    lua_next(state, -2);
-                    float y_value = static_cast<float>(lua_tonumber(state, -1));
-                    lua_pop(state, 1);
-                    tmpVec.emplace_back(color, x_value, y_value);
-                    lua_pop(state, 1);
-                }
-            }*/
+            //        lua_pop(state, 1);
+            //        lua_next(state, -2);
+            //        float y_value = static_cast<float>(lua_tonumber(state, -1));
+            //        lua_pop(state, 1);
+            //        tmpVec.emplace_back(color, x_value, y_value);
+            //        lua_pop(state, 1);
+            //    }
+            //}
             lua_pop(state, 2);
         }
         lua_pop(state, 1);
@@ -108,24 +110,24 @@ void TransferFunction::loadEnvelopesFromFile(const std::string& path) {
     ghoul::Dictionary dictionary;
     ghoul::lua::loadDictionaryFromFile(path, dictionary, L);
 
-    for (std::string_view key : dictionary.keys()) {
-        ghoul::Dictionary tfDictionary = dictionary.value<ghoul::Dictionary>(key);
+    for (const std::string_view key : dictionary.keys()) {
+        const ghoul::Dictionary tfDictionary = dictionary.value<ghoul::Dictionary>(key);
 
-        for (std::string_view envelopeKey : tfDictionary.keys()) {
-            ghoul::Dictionary envelopeDictionary =
+        for (const std::string_view envelopeKey : tfDictionary.keys()) {
+            const ghoul::Dictionary envelopeDictionary =
                 tfDictionary.value<ghoul::Dictionary>(envelopeKey);
             Envelope env;
             std::vector<EnvelopePoint> tmpVec;
-            for (std::string_view pointKey : envelopeDictionary.keys()) {
-                ghoul::Dictionary pointDictionary =
+            for (const std::string_view pointKey : envelopeDictionary.keys()) {
+                const ghoul::Dictionary pointDictionary =
                     envelopeDictionary.value<ghoul::Dictionary>(pointKey);
 
-                ghoul::Dictionary positionDictionary =
+                const ghoul::Dictionary positionDictionary =
                     pointDictionary.value<ghoul::Dictionary>("position");
 
-                std::string color = pointDictionary.value<std::string>("color");
-                double posX = positionDictionary.value<double>("x");
-                double posY = positionDictionary.value<double>("y");
+                const std::string color = pointDictionary.value<std::string>("color");
+                const double posX = positionDictionary.value<double>("x");
+                const double posY = positionDictionary.value<double>("y");
                 tmpVec.emplace_back(
                     color,
                     static_cast<float>(posX),
@@ -138,7 +140,7 @@ void TransferFunction::loadEnvelopesFromFile(const std::string& path) {
     }
 }
 
-void TransferFunction::saveEnvelopesToFile(const std::string& path) {
+void TransferFunction::saveEnvelopesToFile(const std::string& path) const {
     ghoul::Dictionary dictionary;
     lua_State* state = luaL_newstate();
     envelopesToLua(state);
@@ -164,8 +166,9 @@ bool TransferFunction::operator!=(const TransferFunction& tf) {
     auto iter = _envelopes.begin();
     auto tfIter = tf._envelopes.begin();
     for (; iter != _envelopes.end(); iter++, tfIter++) {
-        if (*iter != *tfIter)
+        if (*iter != *tfIter) {
             return true;
+        }
     }
     return false;
 }
diff --git a/modules/volume/transferfunction.h b/modules/volume/transferfunction.h
index 396cab17f2..58a164e71d 100644
--- a/modules/volume/transferfunction.h
+++ b/modules/volume/transferfunction.h
@@ -41,10 +41,10 @@ public:
     void envelopesToLua(lua_State* state) const;
 
     bool setEnvelopesFromString(const std::string& s);
-    bool setEnvelopesFromLua(lua_State* lua);
+    bool setEnvelopesFromLua(lua_State* state);
 
     void loadEnvelopesFromFile(const std::string& path);
-    void saveEnvelopesToFile(const std::string& path);
+    void saveEnvelopesToFile(const std::string& path) const;
 
     bool operator!=(const TransferFunction& tf);
     bool hasEnvelopes() const;
diff --git a/modules/volume/transferfunctionhandler.cpp b/modules/volume/transferfunctionhandler.cpp
index 251211dc03..b840c5516d 100644
--- a/modules/volume/transferfunctionhandler.cpp
+++ b/modules/volume/transferfunctionhandler.cpp
@@ -68,9 +68,9 @@ namespace {
 
 namespace openspace::volume {
 
-TransferFunctionHandler::TransferFunctionHandler(const properties::StringProperty& prop)
+TransferFunctionHandler::TransferFunctionHandler(properties::StringProperty prop)
     : properties::PropertyOwner({ "TransferFunctionHandler", "Tranfer Function Handler" })
-    , _transferFunctionPath(prop)
+    , _transferFunctionPath(std::move(prop))
     , _dataUnit(DataUnitInfo)
     , _minValue(MinValueInfo)
     , _maxValue(MaxValueInfo)
@@ -143,7 +143,7 @@ void TransferFunctionHandler::setFilepath(std::string path) {
 }
 
 ghoul::opengl::Texture& TransferFunctionHandler::texture() {
-    return *_texture.get();
+    return *_texture;
 }
 
 void TransferFunctionHandler::uploadTexture() {
diff --git a/modules/volume/transferfunctionhandler.h b/modules/volume/transferfunctionhandler.h
index cc6fa9341a..2259f30cc1 100644
--- a/modules/volume/transferfunctionhandler.h
+++ b/modules/volume/transferfunctionhandler.h
@@ -44,7 +44,7 @@ class Envelope;
 
 class TransferFunctionHandler : public properties::PropertyOwner {
 public:
-    TransferFunctionHandler(const properties::StringProperty& prop);
+    TransferFunctionHandler(properties::StringProperty prop);
 
     void initialize();
 
diff --git a/modules/volume/transferfunctionproperty.cpp b/modules/volume/transferfunctionproperty.cpp
index af280c22da..feb288b63b 100644
--- a/modules/volume/transferfunctionproperty.cpp
+++ b/modules/volume/transferfunctionproperty.cpp
@@ -29,7 +29,7 @@ namespace openspace::properties {
 
 TransferFunctionProperty::TransferFunctionProperty(Property::PropertyInfo info,
                                                    volume::TransferFunction value)
-    : TemplateProperty<volume::TransferFunction>(std::move(info), value)
+    : TemplateProperty<volume::TransferFunction>(std::move(info), std::move(value))
 {}
 
 std::string_view TransferFunctionProperty::className() const {
diff --git a/modules/volume/volumegridtype.cpp b/modules/volume/volumegridtype.cpp
index 917ae65a39..57ced6d10f 100644
--- a/modules/volume/volumegridtype.cpp
+++ b/modules/volume/volumegridtype.cpp
@@ -26,9 +26,9 @@
 
 namespace openspace::volume {
 
-InvalidGridTypeError::InvalidGridTypeError(std::string gt)
-    : RuntimeError("Invalid grid type: '" + gt + "'")
-    , gridType(std::move(gt))
+InvalidGridTypeError::InvalidGridTypeError(std::string gridType)
+    : RuntimeError("Invalid grid type: '" + gridType + "'")
+    , gridType(std::move(gridType))
 {}
 
 VolumeGridType parseGridType(const std::string& gridType) {
diff --git a/modules/volume/volumeutils.cpp b/modules/volume/volumeutils.cpp
index 143397a700..624cd3f003 100644
--- a/modules/volume/volumeutils.cpp
+++ b/modules/volume/volumeutils.cpp
@@ -26,15 +26,15 @@
 
 namespace openspace::volume {
 
-size_t coordsToIndex(const glm::uvec3& coords, const glm::uvec3& dims) {
-    const size_t w = dims.x;
-    const size_t h = dims.y;
+size_t coordsToIndex(const glm::uvec3& coords, const glm::uvec3& dimensions) {
+    const size_t w = dimensions.x;
+    const size_t h = dimensions.y;
     return coords.z * (h * w) + coords.y * w + coords.x;
 }
 
-glm::uvec3 indexToCoords(size_t index, const glm::uvec3& dims) {
-    const size_t w = dims.x;
-    const size_t h = dims.y;
+glm::uvec3 indexToCoords(size_t index, const glm::uvec3& dimensions) {
+    const size_t w = dimensions.x;
+    const size_t h = dimensions.y;
 
     const size_t x = index % w;
     const size_t y = (index / w) % h;
diff --git a/modules/webbrowser/include/browserinstance.h b/modules/webbrowser/include/browserinstance.h
index 0cb61eab11..0e29b93c49 100644
--- a/modules/webbrowser/include/browserinstance.h
+++ b/modules/webbrowser/include/browserinstance.h
@@ -61,7 +61,7 @@ public:
     BrowserInstance(WebRenderHandler* renderer, WebKeyboardHandler* keyboardHandler);
     ~BrowserInstance();
 
-    void loadUrl(std::string url);
+    void loadUrl(const std::string& url);
 
     /**
      * Load a local file.
diff --git a/modules/webbrowser/include/eventhandler.h b/modules/webbrowser/include/eventhandler.h
index 959041dccf..7897e72492 100644
--- a/modules/webbrowser/include/eventhandler.h
+++ b/modules/webbrowser/include/eventhandler.h
@@ -82,7 +82,7 @@ private:
     /**
      * Create a mouse event on the current cursor position.
      */
-    CefMouseEvent mouseEvent(KeyModifier mods = KeyModifier::None);
+    CefMouseEvent mouseEvent(KeyModifier mods = KeyModifier::None) const;
 
 #ifdef WIN32
     /**
diff --git a/modules/webbrowser/include/webbrowserapp.h b/modules/webbrowser/include/webbrowserapp.h
index e3c0ccd865..32c3d2d3a6 100644
--- a/modules/webbrowser/include/webbrowserapp.h
+++ b/modules/webbrowser/include/webbrowserapp.h
@@ -51,7 +51,7 @@ public:
     void OnContextCreated(CefRefPtr<CefBrowser> browser, CefRefPtr<CefFrame> frame,
         CefRefPtr<CefV8Context> context) override;
     void OnBeforeCommandLineProcessing(const CefString &process_type,
-        CefRefPtr<CefCommandLine> command_line) override;
+        CefRefPtr<CefCommandLine> commandline) override;
 
 private:
     IMPLEMENT_REFCOUNTING(WebBrowserApp);
diff --git a/modules/webbrowser/src/browserinstance.cpp b/modules/webbrowser/src/browserinstance.cpp
index 30a4ca2925..81bbcfa7bc 100644
--- a/modules/webbrowser/src/browserinstance.cpp
+++ b/modules/webbrowser/src/browserinstance.cpp
@@ -47,9 +47,8 @@ BrowserInstance::BrowserInstance(WebRenderHandler* renderer,
                                  WebKeyboardHandler* keyboardHandler)
     : _renderHandler(renderer)
     , _keyboardHandler(keyboardHandler)
+    , _client(new BrowserClient(_renderHandler.get(), _keyboardHandler.get()))
 {
-    _client = new BrowserClient(_renderHandler.get(), _keyboardHandler.get());
-
     CefWindowInfo windowInfo;
     // On Windows and MacOS this function takes a pointer as a parameter, but Linux
     // requires this to be a long unsigned int, so we can't use nullptr here
@@ -58,11 +57,10 @@ BrowserInstance::BrowserInstance(WebRenderHandler* renderer,
     CefBrowserSettings browserSettings;
     browserSettings.windowless_frame_rate = 60;
 
-    std::string url;
     _browser = CefBrowserHost::CreateBrowserSync(
         windowInfo,
         _client.get(),
-        url,
+        "",
         browserSettings,
         nullptr,
         nullptr
@@ -86,13 +84,12 @@ void BrowserInstance::initialize() {
     _shouldReshape = true;
 }
 
-void BrowserInstance::loadUrl(std::string url) {
+void BrowserInstance::loadUrl(const std::string& url) {
     ghoul_assert(_isInitialized, "BrowserInstance should be initialized");
 
     if (!url.empty()) {
         LDEBUG(fmt::format("Loading URL '{}'", url));
-        CefString cefUrl = std::move(url);
-        _browser->GetMainFrame()->LoadURL(cefUrl);
+        _browser->GetMainFrame()->LoadURL(url);
     }
     else {
         LWARNING("Provided browser URL is empty");
diff --git a/modules/webbrowser/src/cefhost.cpp b/modules/webbrowser/src/cefhost.cpp
index 94388eb388..1ee11dc811 100644
--- a/modules/webbrowser/src/cefhost.cpp
+++ b/modules/webbrowser/src/cefhost.cpp
@@ -67,9 +67,9 @@ CefHost::CefHost([[maybe_unused]] const std::string& helperLocation) {
     }
 #endif // __APPLE__
 
-    CefRefPtr<WebBrowserApp> app(new WebBrowserApp);
+    const CefRefPtr<WebBrowserApp> app = CefRefPtr<WebBrowserApp>(new WebBrowserApp);
 
-    CefMainArgs args;
+    const CefMainArgs args;
     CefInitialize(args, settings, app.get(), nullptr);
     LDEBUG("Initializing CEF... done");
 }
diff --git a/modules/webbrowser/src/eventhandler.cpp b/modules/webbrowser/src/eventhandler.cpp
index c4bf4b4e88..174fc00930 100644
--- a/modules/webbrowser/src/eventhandler.cpp
+++ b/modules/webbrowser/src/eventhandler.cpp
@@ -263,7 +263,7 @@ void EventHandler::initialize() {
                 );
                 _browserInstance->sendTouchEvent(event);
 #else // ^^^^ WIN32 // !WIN32 vvvv
-                glm::vec2 windowPos = input.currentWindowCoordinates();
+                const glm::vec2 windowPos = input.currentWindowCoordinates();
                 _mousePosition.x = windowPos.x;
                 _mousePosition.y = windowPos.y;
                 _leftButton.down = true;
@@ -311,7 +311,7 @@ void EventHandler::initialize() {
             _validTouchStates.erase(found);
 #ifndef WIN32
             if (_validTouchStates.empty()) {
-                glm::vec2 windowPos = input.currentWindowCoordinates();
+                const glm::vec2 windowPos = input.currentWindowCoordinates();
                 _mousePosition.x = windowPos.x;
                 _mousePosition.y = windowPos.y;
                 _leftButton.down = false;
@@ -365,7 +365,7 @@ bool EventHandler::mouseButtonCallback(MouseButton button, MouseAction action,
 
 bool EventHandler::isDoubleClick(const MouseButtonState& button) const {
     auto now = std::chrono::high_resolution_clock::now();
-    std::chrono::milliseconds maxTimeDifference(doubleClickTime());
+    const std::chrono::milliseconds maxTimeDifference(doubleClickTime());
     auto requiredTime = button.lastClickTime + maxTimeDifference;
     if (requiredTime < now) {
         return false;
@@ -381,8 +381,8 @@ bool EventHandler::isDoubleClick(const MouseButtonState& button) const {
 
 bool EventHandler::mousePositionCallback(double x, double y) {
     const glm::vec2 dpiScaling = global::windowDelegate->dpiScaling();
-    _mousePosition.x = floor(static_cast<float>(x) * dpiScaling.x);
-    _mousePosition.y = floor(static_cast<float>(y) * dpiScaling.y);
+    _mousePosition.x = std::floor(static_cast<float>(x) * dpiScaling.x);
+    _mousePosition.y = std::floor(static_cast<float>(y) * dpiScaling.y);
     _mousePosition =
         global::windowDelegate->mousePositionViewportRelative(_mousePosition);
     _browserInstance->sendMouseMoveEvent(mouseEvent());
@@ -468,7 +468,7 @@ cef_key_event_type_t EventHandler::keyEventType(KeyAction action) {
     return action == KeyAction::Release ? KEYEVENT_KEYUP : KEYEVENT_KEYDOWN;
 }
 
-CefMouseEvent EventHandler::mouseEvent(KeyModifier mods) {
+CefMouseEvent EventHandler::mouseEvent(KeyModifier mods) const {
     CefMouseEvent event;
     event.x = static_cast<int>(_mousePosition.x);
     event.y = static_cast<int>(_mousePosition.y);
diff --git a/modules/webbrowser/src/processhelperlinux.cpp b/modules/webbrowser/src/processhelperlinux.cpp
index fddd8356b6..16ac417937 100644
--- a/modules/webbrowser/src/processhelperlinux.cpp
+++ b/modules/webbrowser/src/processhelperlinux.cpp
@@ -32,12 +32,12 @@
 // Entry point function for all processes.
 int main(int argc, char* argv[]) {
   // Provide CEF with command-line arguments.
-  CefMainArgs main_args(argc, argv);
+  const CefMainArgs mainArgs(argc, argv);
 
-  CefRefPtr<openspace::WebBrowserApp> app(new openspace::WebBrowserApp);
+  const CefRefPtr<openspace::WebBrowserApp> app(new openspace::WebBrowserApp);
 
   // CEF applications have multiple sub-processes (render, GPU, etc) that share
   // the same executable. This function checks the command-line and, if this is
   // a sub-process, executes the appropriate logic.
-  return CefExecuteProcess(main_args, app.get(), nullptr);
+  return CefExecuteProcess(mainArgs, app.get(), nullptr);
 }
diff --git a/modules/webbrowser/src/screenspacebrowser.cpp b/modules/webbrowser/src/screenspacebrowser.cpp
index a7aea56939..c9c6a7d3c2 100644
--- a/modules/webbrowser/src/screenspacebrowser.cpp
+++ b/modules/webbrowser/src/screenspacebrowser.cpp
@@ -82,6 +82,8 @@ void ScreenSpaceBrowser::ScreenSpaceRenderHandler::setTexture(GLuint t) {
 ScreenSpaceBrowser::ScreenSpaceBrowser(const ghoul::Dictionary& dictionary)
     : ScreenSpaceRenderable(dictionary)
     , _dimensions(DimensionsInfo, glm::vec2(0.f), glm::vec2(0.f), glm::vec2(3000.f))
+    , _renderHandler(new ScreenSpaceRenderHandler)
+    , _keyboardHandler(new WebKeyboardHandler)
     , _url(UrlInfo)
     , _reload(ReloadInfo)
 {
@@ -93,11 +95,9 @@ ScreenSpaceBrowser::ScreenSpaceBrowser(const ghoul::Dictionary& dictionary)
 
     _url = p.url.value_or(_url);
 
-    glm::vec2 windowDimensions = global::windowDelegate->currentSubwindowSize();
+    const glm::vec2 windowDimensions = global::windowDelegate->currentSubwindowSize();
     _dimensions = p.dimensions.value_or(windowDimensions);
 
-    _renderHandler = new ScreenSpaceRenderHandler;
-    _keyboardHandler = new WebKeyboardHandler();
     _browserInstance = std::make_unique<BrowserInstance>(
         _renderHandler.get(),
         _keyboardHandler.get()
@@ -158,7 +158,7 @@ void ScreenSpaceBrowser::render(float blackoutFactor) {
     }
 
     _renderHandler->updateTexture();
-    glm::mat4 mat =
+    const glm::mat4 mat =
         globalRotationMatrix() *
         translationMatrix() *
         localRotationMatrix() *
diff --git a/modules/webbrowser/src/webbrowserapp.cpp b/modules/webbrowser/src/webbrowserapp.cpp
index c4b09f8ed6..8867954074 100644
--- a/modules/webbrowser/src/webbrowserapp.cpp
+++ b/modules/webbrowser/src/webbrowserapp.cpp
@@ -40,18 +40,18 @@ void WebBrowserApp::OnContextCreated(CefRefPtr<CefBrowser>, CefRefPtr<CefFrame>,
 }
 
 void WebBrowserApp::OnBeforeCommandLineProcessing(const CefString&,
-                                                  CefRefPtr<CefCommandLine> commandLine)
+                                                  CefRefPtr<CefCommandLine> commandline)
 {
-    commandLine->AppendSwitch("--enable-gpu-rasterization");
-    commandLine->AppendSwitch("--use-gl=desktop");
-    commandLine->AppendSwitch("--enable-webgl2-compute-context");
-    commandLine->AppendSwitch("log-gpu-control-list-decisions");
-    commandLine->AppendSwitch("use-mock-keychain");
-    commandLine->AppendSwitch("enable-begin-frame-scheduling");
-    commandLine->AppendSwitchWithValue("autoplay-policy", "no-user-gesture-required");
+    commandline->AppendSwitch("--enable-gpu-rasterization");
+    commandline->AppendSwitch("--use-gl=desktop");
+    commandline->AppendSwitch("--enable-webgl2-compute-context");
+    commandline->AppendSwitch("log-gpu-control-list-decisions");
+    commandline->AppendSwitch("use-mock-keychain");
+    commandline->AppendSwitch("enable-begin-frame-scheduling");
+    commandline->AppendSwitchWithValue("autoplay-policy", "no-user-gesture-required");
 #ifdef __APPLE__
-    commandLine->AppendSwitch("--disable-gpu-sandbox");
-    commandLine->AppendSwitch("--no-sandbox");
+    commandline->AppendSwitch("--disable-gpu-sandbox");
+    commandline->AppendSwitch("--no-sandbox");
 #endif
 }
 
diff --git a/modules/webbrowser/src/webrenderhandler.cpp b/modules/webbrowser/src/webrenderhandler.cpp
index 3780722976..81c7f75cc8 100644
--- a/modules/webbrowser/src/webrenderhandler.cpp
+++ b/modules/webbrowser/src/webrenderhandler.cpp
@@ -78,10 +78,10 @@ void WebRenderHandler::OnPaint(CefRefPtr<CefBrowser>, CefRenderHandler::PaintEle
 
     // Copy the updated rectangle line by line.
     for (int y = lowerUpdatingRectBound.y; y < upperUpdatingRectBound.y; ++y) {
-        int lineOffset = y * w + lowerUpdatingRectBound.x;
+        const int lineOffset = y * w + lowerUpdatingRectBound.x;
         // Chromium stores image upside down compared to OpenGL, so we flip it:
-        int invLineOffset = (h - y - 1) * w + lowerUpdatingRectBound.x;
-        int rectWidth = upperUpdatingRectBound.x - lowerUpdatingRectBound.x;
+        const int invLineOffset = (h - y - 1) * w + lowerUpdatingRectBound.x;
+        const int rectWidth = upperUpdatingRectBound.x - lowerUpdatingRectBound.x;
         std::copy(
             reinterpret_cast<const Pixel*>(buffer) + lineOffset,
             reinterpret_cast<const Pixel*>(buffer) + lineOffset + rectWidth,
diff --git a/modules/webbrowser/webbrowsermodule.cpp b/modules/webbrowser/webbrowsermodule.cpp
index bbbbf89f34..35788be99d 100644
--- a/modules/webbrowser/webbrowsermodule.cpp
+++ b/modules/webbrowser/webbrowsermodule.cpp
@@ -69,6 +69,25 @@ namespace {
         "Only used if UpdateBrowserBetweenRenderables is true",
         openspace::properties::Property::Visibility::Developer
     };
+
+    /**
+     * Try to find the CEF Helper executable. It looks in the bin/openspace folder.
+     * Therefore, if you change that this might cause a crash here.
+     *
+     * \return the absolute path to the file
+     */
+    std::filesystem::path findHelperExecutable() {
+        const std::filesystem::path execLocation = absPath(fmt::format(
+            "${{BIN}}/{}", SubprocessPath
+        ));
+        if (!std::filesystem::is_regular_file(execLocation)) {
+            LERROR(fmt::format(
+                "Could not find web helper executable at location: {}", execLocation
+            ));
+        }
+        return execLocation;
+    }
+
 } // namespace
 
 namespace openspace {
@@ -76,7 +95,7 @@ namespace openspace {
 WebBrowserModule::WebBrowserModule()
     : OpenSpaceModule(WebBrowserModule::Name)
     , _updateBrowserBetweenRenderables(UpdateBrowserBetweenRenderablesInfo, true)
-    , _browserUpdateInterval(BrowserUpdateIntervalInfo, 1.f, 1.0f, 1000.f)
+    , _browserUpdateInterval(BrowserUpdateIntervalInfo, 1.f, 1.f, 1000.f)
     , _eventHandler(new EventHandler)
 {
     global::callback::deinitialize->emplace_back([this]() {
@@ -113,22 +132,12 @@ void WebBrowserModule::internalDeinitialize() {
 
     _eventHandler->resetBrowserInstance();
 
-    bool forceBrowserShutdown = true;
+    const bool forceBrowserShutdown = true;
     for (BrowserInstance* browser : _browsers) {
         browser->close(forceBrowserShutdown);
     }
 }
 
-std::filesystem::path WebBrowserModule::findHelperExecutable() {
-    std::filesystem::path execLocation = absPath("${BIN}/" + std::string(SubprocessPath));
-    if (!std::filesystem::is_regular_file(execLocation)) {
-        LERROR(fmt::format(
-            "Could not find web helper executable at location: {}", execLocation
-        ));
-    }
-    return execLocation;
-}
-
 void WebBrowserModule::internalInitialize(const ghoul::Dictionary& dictionary) {
     ZoneScoped;
 
@@ -229,7 +238,7 @@ void update() {
     const std::chrono::time_point<std::chrono::high_resolution_clock> timeBefore =
         std::chrono::high_resolution_clock::now();
 
-    std::chrono::microseconds duration =
+    const std::chrono::microseconds duration =
         std::chrono::duration_cast<std::chrono::microseconds>(timeBefore - latestCall);
 
     if (duration > interval) {
diff --git a/modules/webbrowser/webbrowsermodule.h b/modules/webbrowser/webbrowsermodule.h
index d345ef74b5..b6215a8acc 100644
--- a/modules/webbrowser/webbrowsermodule.h
+++ b/modules/webbrowser/webbrowsermodule.h
@@ -63,14 +63,6 @@ protected:
     void internalDeinitialize() override;
 
 private:
-    /**
-     * Try to find the CEF Helper executable. It looks in the bin/openspace folder.
-     * Therefore, if you change that this might cause a crash here.
-     *
-     * \return the absolute path to the file
-     */
-    std::filesystem::path findHelperExecutable();
-
     properties::BoolProperty _updateBrowserBetweenRenderables;
     properties::FloatProperty _browserUpdateInterval;
 
diff --git a/modules/webgui/webguimodule.cpp b/modules/webgui/webguimodule.cpp
index 0910fa2e88..d9c8fe4f51 100644
--- a/modules/webgui/webguimodule.cpp
+++ b/modules/webgui/webguimodule.cpp
@@ -153,8 +153,8 @@ std::string  WebGuiModule::address() const {
 
 WebGuiModule::CallbackHandle WebGuiModule::addEndpointChangeCallback(EndpointCallback cb)
 {
-    CallbackHandle handle = _nextCallbackHandle++;
-    _endpointChangeCallbacks.push_back({ handle, std::move(cb) });
+    const CallbackHandle handle = _nextCallbackHandle++;
+    _endpointChangeCallbacks.emplace_back(handle, std::move(cb));
     return handle;
 }
 
diff --git a/src/camera/camera.cpp b/src/camera/camera.cpp
index 95a3b46744..075a851c59 100644
--- a/src/camera/camera.cpp
+++ b/src/camera/camera.cpp
@@ -46,14 +46,14 @@ void Camera::setPose(CameraPose pose) {
 
 void Camera::setPositionVec3(glm::dvec3 pos) {
     if (!glm::any(glm::isnan(pos))) {
-        std::lock_guard _lock(_mutex);
+        const std::lock_guard _lock(_mutex);
         _position = std::move(pos);
         _cachedCombinedViewMatrix.isDirty = true;
     }
 }
 
 void Camera::setRotation(glm::dquat rotation) {
-    std::lock_guard _lock(_mutex);
+    const std::lock_guard _lock(_mutex);
     _rotation = std::move(rotation);
     _cachedViewDirection.isDirty = true;
     _cachedLookupVector.isDirty = true;
@@ -62,14 +62,14 @@ void Camera::setRotation(glm::dquat rotation) {
 }
 
 void Camera::setScaling(float scaling) {
-    std::lock_guard _lock(_mutex);
+    const std::lock_guard _lock(_mutex);
     _scaling = scaling;
     _cachedViewScaleMatrix.isDirty = true;
     _cachedCombinedViewMatrix.isDirty = true;
 }
 
 void Camera::setMaxFov(float fov) {
-    std::lock_guard _lock(_mutex);
+    const std::lock_guard _lock(_mutex);
     _maxFov = fov;
     _cachedSinMaxFov.isDirty = true;
 }
@@ -78,9 +78,9 @@ void Camera::setParent(SceneGraphNode* parent) {
     _parent = parent;
 }
 
-void Camera::rotate(glm::dquat rotation) {
-    std::lock_guard _lock(_mutex);
-    _rotation = std::move(rotation) * static_cast<glm::dquat>(_rotation);
+void Camera::rotate(const glm::dquat& rotation) {
+    const std::lock_guard _lock(_mutex);
+    _rotation = rotation * static_cast<glm::dquat>(_rotation);
 
     _cachedViewDirection.isDirty = true;
     _cachedLookupVector.isDirty = true;
@@ -93,19 +93,19 @@ const glm::dvec3& Camera::positionVec3() const {
 }
 
 glm::dvec3 Camera::eyePositionVec3() const {
-    glm::dvec4 eyeInEyeSpace(0.0, 0.0, 0.0, 1.0);
+    constexpr glm::dvec4 EyeInEyeSpace = glm::dvec4(0.0, 0.0, 0.0, 1.0);
 
-    glm::dmat4 invViewMatrix = glm::inverse(sgctInternal.viewMatrix());
-    glm::dmat4 invRotationMatrix = glm::mat4_cast(static_cast<glm::dquat>(_rotation));
-    glm::dmat4 invTranslationMatrix = glm::translate(
+    const glm::dmat4 invViewMat = glm::inverse(sgctInternal.viewMatrix());
+    const glm::dmat4 invRotationMat = glm::mat4_cast(static_cast<glm::dquat>(_rotation));
+    const glm::dmat4 invTranslationMat = glm::translate(
         glm::dmat4(1.0),
         static_cast<glm::dvec3>(_position)
     );
 
-    glm::dmat4 invViewScale = glm::inverse(viewScaleMatrix());
+    const glm::dmat4 invViewScale = glm::inverse(viewScaleMatrix());
 
-    glm::dvec4 eyeInWorldSpace = invTranslationMatrix * invRotationMatrix *
-        invViewScale * invViewMatrix * eyeInEyeSpace;
+    const glm::dvec4 eyeInWorldSpace = invTranslationMat * invRotationMat *
+        invViewScale * invViewMat * EyeInEyeSpace;
 
     return glm::dvec3(eyeInWorldSpace.x, eyeInWorldSpace.y, eyeInWorldSpace.z);
 }
@@ -145,7 +145,7 @@ float Camera::maxFov() const {
 
 float Camera::sinMaxFov() const {
     if (_cachedSinMaxFov.isDirty) {
-        _cachedSinMaxFov.datum = sin(_maxFov);
+        _cachedSinMaxFov.datum = std::sin(_maxFov);
         _cachedSinMaxFov.isDirty = true;
     }
     return _cachedSinMaxFov.datum;
@@ -216,8 +216,8 @@ void Camera::invalidateCache() {
 void Camera::serialize(std::ostream& os) const {
     const glm::dvec3 p = positionVec3();
     const glm::dquat q = rotationQuaternion();
-    os << p.x << " " << p.y << " " << p.z << std::endl;
-    os << q.x << " " << q.y << " " << q.z << " " << q.w << std::endl;
+    os << p.x << " " << p.y << " " << p.z << '\n';
+    os << q.x << " " << q.y << " " << q.z << " " << q.w << '\n';
 }
 
 void Camera::deserialize(std::istream& is) {
@@ -236,20 +236,20 @@ Camera::SgctInternal::SgctInternal(const SgctInternal& o)
 {}
 
 void Camera::SgctInternal::setSceneMatrix(glm::mat4 sceneMatrix) {
-    std::lock_guard _lock(_mutex);
+    const std::lock_guard _lock(_mutex);
 
     _sceneMatrix = std::move(sceneMatrix);
 }
 
 void Camera::SgctInternal::setViewMatrix(glm::mat4 viewMatrix) {
-    std::lock_guard _lock(_mutex);
+    const std::lock_guard _lock(_mutex);
 
     _viewMatrix = std::move(viewMatrix);
     _cachedViewProjectionMatrix.isDirty = true;
 }
 
 void Camera::SgctInternal::setProjectionMatrix(glm::mat4 projectionMatrix) {
-    std::lock_guard _lock(_mutex);
+    const std::lock_guard _lock(_mutex);
 
     _projectionMatrix = std::move(projectionMatrix);
     _cachedViewProjectionMatrix.isDirty = true;
@@ -268,11 +268,9 @@ const glm::mat4& Camera::SgctInternal::projectionMatrix() const {
 }
 
 const glm::mat4& Camera::SgctInternal::viewProjectionMatrix() const {
-    //if (_cachedViewProjectionMatrix.isDirty) {
-        std::lock_guard _lock(_mutex);
-        _cachedViewProjectionMatrix.datum = _projectionMatrix * _viewMatrix;
-        _cachedViewProjectionMatrix.isDirty = false;
-    //}
+    const std::lock_guard _lock(_mutex);
+    _cachedViewProjectionMatrix.datum = _projectionMatrix * _viewMatrix;
+    _cachedViewProjectionMatrix.isDirty = false;
     return _cachedViewProjectionMatrix.datum;
 }
 
diff --git a/src/data/csvloader.cpp b/src/data/csvloader.cpp
index 538a71e419..b9ad97c06e 100644
--- a/src/data/csvloader.cpp
+++ b/src/data/csvloader.cpp
@@ -50,7 +50,7 @@ Dataset loadCsvFile(std::filesystem::path filePath, std::optional<DataMapping> s
     ghoul_assert(std::filesystem::exists(filePath), "File must exist");
 
     auto readFloatData = [](const std::string& str) -> float {
-        float result;
+        float result = 0.f;
 #ifdef WIN32
         auto [p, ec] = std::from_chars(str.data(), str.data() + str.size(), result);
         if (ec == std::errc() && std::isfinite(result)) {
@@ -60,7 +60,7 @@ Dataset loadCsvFile(std::filesystem::path filePath, std::optional<DataMapping> s
 #else // ^^^^ WIN32 // !WIN32 vvvv
         // clang is missing float support for std::from_chars
         try {
-            result = std::stof(str.c_str(), nullptr);
+            result = std::stof(str, nullptr);
             if (std::isfinite(result)) {
                 return result;
             }
@@ -96,7 +96,7 @@ Dataset loadCsvFile(std::filesystem::path filePath, std::optional<DataMapping> s
     int nameColumn = -1;
 
     int nDataColumns = 0;
-    bool hasExcludeColumns = specs.has_value() && (*specs).hasExcludeColumns();
+    const bool hasExcludeColumns = specs.has_value() && specs->hasExcludeColumns();
     std::vector<size_t> skipColumns;
     if (hasExcludeColumns) {
         skipColumns.reserve((*specs).excludeColumns.size());
@@ -161,7 +161,7 @@ Dataset loadCsvFile(std::filesystem::path filePath, std::optional<DataMapping> s
             const std::string& strValue = row[i];
 
             // For now, all values are converted to float
-            float value = readFloatData(strValue);
+            const float value = readFloatData(strValue);
 
             if (i == xColumn) {
                 entry.position.x = value;
@@ -182,8 +182,8 @@ Dataset loadCsvFile(std::filesystem::path filePath, std::optional<DataMapping> s
             }
         }
 
-        glm::vec3 positive = glm::abs(entry.position);
-        float max = glm::compMax(positive);
+        const glm::vec3 positive = glm::abs(entry.position);
+        const float max = glm::compMax(positive);
         if (max > res.maxPositionComponent) {
             res.maxPositionComponent = max;
         }
diff --git a/src/data/dataloader.cpp b/src/data/dataloader.cpp
index 8c55bc97c0..b2b10bb94c 100644
--- a/src/data/dataloader.cpp
+++ b/src/data/dataloader.cpp
@@ -118,19 +118,19 @@ namespace data {
 Dataset loadFile(std::filesystem::path path, std::optional<DataMapping> specs) {
     ghoul_assert(std::filesystem::exists(path), "File must exist");
 
-    std::ifstream file(path);
+    const std::ifstream file = std::ifstream(path);
     if (!file.good()) {
         throw ghoul::RuntimeError(fmt::format("Failed to open data file '{}'", path));
     }
 
-    std::string extension = ghoul::toLowerCase(path.extension().string());
+    const std::string extension = ghoul::toLowerCase(path.extension().string());
 
     Dataset res;
     if (extension == ".csv") {
-        res = csv::loadCsvFile(path, specs);
+        res = csv::loadCsvFile(path, std::move(specs));
     }
     else if (extension == ".speck") {
-        res = speck::loadSpeckFile(path, specs);
+        res = speck::loadSpeckFile(path, std::move(specs));
     }
     else {
         LERRORC("DataLoader", fmt::format(
@@ -142,15 +142,15 @@ Dataset loadFile(std::filesystem::path path, std::optional<DataMapping> specs) {
     return res;
 }
 
-std::optional<Dataset> loadCachedFile(std::filesystem::path path) {
-    std::ifstream file(path, std::ios::binary);
+std::optional<Dataset> loadCachedFile(const std::filesystem::path& path) {
+    std::ifstream file = std::ifstream(path, std::ios::binary);
     if (!file.good()) {
         return std::nullopt;
     }
 
     Dataset result;
 
-    int8_t fileVersion;
+    int8_t fileVersion = 0;
     file.read(reinterpret_cast<char*>(&fileVersion), sizeof(int8_t));
     if (fileVersion != DataCacheFileVersion) {
         // Incompatible version and we won't be able to read the file
@@ -159,17 +159,17 @@ std::optional<Dataset> loadCachedFile(std::filesystem::path path) {
 
     //
     // Read variables
-    uint16_t nVariables;
+    uint16_t nVariables = 0;
     file.read(reinterpret_cast<char*>(&nVariables), sizeof(uint16_t));
     result.variables.resize(nVariables);
     for (int i = 0; i < nVariables; i += 1) {
         Dataset::Variable var;
 
-        int16_t idx;
+        int16_t idx = 0;
         file.read(reinterpret_cast<char*>(&idx), sizeof(int16_t));
         var.index = idx;
 
-        uint16_t len;
+        uint16_t len = 0;
         file.read(reinterpret_cast<char*>(&len), sizeof(uint16_t));
         var.name.resize(len);
         file.read(var.name.data(), len);
@@ -179,17 +179,17 @@ std::optional<Dataset> loadCachedFile(std::filesystem::path path) {
 
     //
     // Read textures
-    uint16_t nTextures;
+    uint16_t nTextures = 0;
     file.read(reinterpret_cast<char*>(&nTextures), sizeof(uint16_t));
     result.textures.resize(nTextures);
     for (int i = 0; i < nTextures; i += 1) {
         Dataset::Texture tex;
 
-        int16_t idx;
+        int16_t idx = 0;
         file.read(reinterpret_cast<char*>(&idx), sizeof(int16_t));
         tex.index = idx;
 
-        uint16_t len;
+        uint16_t len = 0;
         file.read(reinterpret_cast<char*>(&len), sizeof(uint16_t));
         tex.file.resize(len);
         file.read(tex.file.data(), len);
@@ -199,17 +199,17 @@ std::optional<Dataset> loadCachedFile(std::filesystem::path path) {
 
     //
     // Read indices
-    int16_t texDataIdx;
+    int16_t texDataIdx = 0;
     file.read(reinterpret_cast<char*>(&texDataIdx), sizeof(int16_t));
     result.textureDataIndex = texDataIdx;
 
-    int16_t oriDataIdx;
+    int16_t oriDataIdx = 0;
     file.read(reinterpret_cast<char*>(&oriDataIdx), sizeof(int16_t));
     result.orientationDataIndex = oriDataIdx;
 
     //
     // Read entries
-    uint64_t nEntries;
+    uint64_t nEntries = 0;
     file.read(reinterpret_cast<char*>(&nEntries), sizeof(uint64_t));
     result.entries.reserve(nEntries);
     for (uint64_t i = 0; i < nEntries; i += 1) {
@@ -218,12 +218,12 @@ std::optional<Dataset> loadCachedFile(std::filesystem::path path) {
         file.read(reinterpret_cast<char*>(&e.position.y), sizeof(float));
         file.read(reinterpret_cast<char*>(&e.position.z), sizeof(float));
 
-        uint16_t nValues;
+        uint16_t nValues = 0;
         file.read(reinterpret_cast<char*>(&nValues), sizeof(uint16_t));
         e.data.resize(nValues);
         file.read(reinterpret_cast<char*>(e.data.data()), nValues * sizeof(float));
 
-        uint16_t len;
+        uint16_t len = 0;
         file.read(reinterpret_cast<char*>(&len), sizeof(uint16_t));
         if (len > 0) {
             std::string comment;
@@ -237,15 +237,15 @@ std::optional<Dataset> loadCachedFile(std::filesystem::path path) {
 
     //
     // Read max data point variable
-    float max;
+    float max = 0.f;
     file.read(reinterpret_cast<char*>(&max), sizeof(float));
     result.maxPositionComponent = max;
 
     return result;
 }
 
-void saveCachedFile(const Dataset& dataset, std::filesystem::path path) {
-    std::ofstream file(path, std::ofstream::binary);
+void saveCachedFile(const Dataset& dataset, const std::filesystem::path& path) {
+    std::ofstream file = std::ofstream(path, std::ofstream::binary);
 
     file.write(reinterpret_cast<const char*>(&DataCacheFileVersion), sizeof(int8_t));
 
@@ -330,12 +330,10 @@ void saveCachedFile(const Dataset& dataset, std::filesystem::path path) {
     );
 }
 
-Dataset loadFileWithCache(std::filesystem::path filePath,
-                          std::optional<DataMapping> specs)
-{
+Dataset loadFileWithCache(std::filesystem::path path, std::optional<DataMapping> specs) {
     return internalLoadFileWithCache<Dataset>(
-        filePath,
-        specs,
+        std::move(path),
+        std::move(specs),
         &loadFile,
         &loadCachedFile,
         &saveCachedFile
@@ -349,12 +347,12 @@ namespace label {
 Labelset loadFile(std::filesystem::path path, std::optional<DataMapping>) {
     ghoul_assert(std::filesystem::exists(path), "File must exist");
 
-    std::ifstream file(path);
+    const std::ifstream file = std::ifstream(path);
     if (!file.good()) {
         throw ghoul::RuntimeError(fmt::format("Failed to open dataset file '{}'", path));
     }
 
-    std::string extension = ghoul::toLowerCase(path.extension().string());
+    const std::string extension = ghoul::toLowerCase(path.extension().string());
 
     Labelset res;
     if (extension == ".label") {
@@ -370,13 +368,13 @@ Labelset loadFile(std::filesystem::path path, std::optional<DataMapping>) {
     return res;
 }
 
-std::optional<Labelset> loadCachedFile(std::filesystem::path path) {
+std::optional<Labelset> loadCachedFile(const std::filesystem::path& path) {
     std::ifstream file(path, std::ios::binary);
     if (!file.good()) {
         return std::nullopt;
     }
 
-    int8_t fileVersion;
+    int8_t fileVersion = 0;
     file.read(reinterpret_cast<char*>(&fileVersion), sizeof(int8_t));
     if (fileVersion != LabelCacheFileVersion) {
         // Incompatible version and we won't be able to read the file
@@ -385,11 +383,11 @@ std::optional<Labelset> loadCachedFile(std::filesystem::path path) {
 
     Labelset result;
 
-    int16_t textColorIdx;
+    int16_t textColorIdx = 0;
     file.read(reinterpret_cast<char*>(&textColorIdx), sizeof(int16_t));
     result.textColorIndex = textColorIdx;
 
-    uint32_t nEntries;
+    uint32_t nEntries = 0;
     file.read(reinterpret_cast<char*>(&nEntries), sizeof(uint32_t));
     result.entries.reserve(nEntries);
     for (unsigned int i = 0; i < nEntries; i += 1) {
@@ -399,13 +397,13 @@ std::optional<Labelset> loadCachedFile(std::filesystem::path path) {
         file.read(reinterpret_cast<char*>(&e.position.z), sizeof(float));
 
         // Identifier
-        uint8_t idLen;
+        uint8_t idLen = 0;
         file.read(reinterpret_cast<char*>(&idLen), sizeof(uint8_t));
         e.identifier.resize(idLen);
         file.read(e.identifier.data(), idLen);
 
         // Text
-        uint16_t len;
+        uint16_t len = 0;
         file.read(reinterpret_cast<char*>(&len), sizeof(uint16_t));
         e.text.resize(len);
         file.read(e.text.data(), len);
@@ -416,8 +414,8 @@ std::optional<Labelset> loadCachedFile(std::filesystem::path path) {
     return result;
 }
 
-void saveCachedFile(const Labelset& labelset, std::filesystem::path path) {
-    std::ofstream file(path, std::ofstream::binary);
+void saveCachedFile(const Labelset& labelset, const std::filesystem::path& path) {
+    std::ofstream file = std::ofstream(path, std::ofstream::binary);
 
     file.write(reinterpret_cast<const char*>(&LabelCacheFileVersion), sizeof(int8_t));
 
@@ -453,7 +451,7 @@ void saveCachedFile(const Labelset& labelset, std::filesystem::path path) {
 
 Labelset loadFileWithCache(std::filesystem::path filePath) {
     return internalLoadFileWithCache<Labelset>(
-        filePath,
+        std::move(filePath),
         std::nullopt,
         &loadFile,
         &loadCachedFile,
@@ -485,12 +483,12 @@ namespace color {
 ColorMap loadFile(std::filesystem::path path, std::optional<DataMapping>) {
     ghoul_assert(std::filesystem::exists(path), "File must exist");
 
-    std::ifstream file(path);
+    const std::ifstream file = std::ifstream(path);
     if (!file.good()) {
         throw ghoul::RuntimeError(fmt::format("Failed to open colormap file '{}'", path));
     }
 
-    std::string extension = ghoul::toLowerCase(path.extension().string());
+    const std::string extension = ghoul::toLowerCase(path.extension().string());
 
     ColorMap res;
     if (extension == ".cmap") {
@@ -506,13 +504,13 @@ ColorMap loadFile(std::filesystem::path path, std::optional<DataMapping>) {
     return res;
 }
 
-std::optional<ColorMap> loadCachedFile(std::filesystem::path path) {
+std::optional<ColorMap> loadCachedFile(const std::filesystem::path& path) {
     std::ifstream file(path, std::ios::binary);
     if (!file.good()) {
         return std::nullopt;
     }
 
-    int8_t fileVersion;
+    int8_t fileVersion = 0;
     file.read(reinterpret_cast<char*>(&fileVersion), sizeof(int8_t));
     if (fileVersion != ColorCacheFileVersion) {
         // Incompatible version and we won't be able to read the file
@@ -521,7 +519,7 @@ std::optional<ColorMap> loadCachedFile(std::filesystem::path path) {
 
     ColorMap result;
 
-    uint32_t nColors;
+    uint32_t nColors = 0;
     file.read(reinterpret_cast<char*>(&nColors), sizeof(uint32_t));
     result.entries.reserve(nColors);
     for (unsigned int i = 0; i < nColors; i += 1) {
@@ -571,8 +569,8 @@ std::optional<ColorMap> loadCachedFile(std::filesystem::path path) {
     return result;
 }
 
-void saveCachedFile(const ColorMap& colorMap, std::filesystem::path path) {
-    std::ofstream file(path, std::ofstream::binary);
+void saveCachedFile(const ColorMap& colorMap, const std::filesystem::path& path) {
+    std::ofstream file = std::ofstream(path, std::ofstream::binary);
 
     file.write(reinterpret_cast<const char*>(&ColorCacheFileVersion), sizeof(int8_t));
 
@@ -610,10 +608,9 @@ void saveCachedFile(const ColorMap& colorMap, std::filesystem::path path) {
     file.write(reinterpret_cast<const char*>(&nanColor.w), sizeof(float));
 }
 
-ColorMap loadFileWithCache(std::filesystem::path path)
-{
+ColorMap loadFileWithCache(std::filesystem::path path) {
     return internalLoadFileWithCache<ColorMap>(
-        path,
+        std::move(path),
         std::nullopt,
         &loadFile,
         &loadCachedFile,
@@ -637,7 +634,7 @@ int Dataset::index(std::string_view variableName) const {
 }
 
 bool Dataset::normalizeVariable(std::string_view variableName) {
-    int idx = index(variableName);
+    const int idx = index(variableName);
 
     if (idx == -1) {
         // We didn't find the variable that was specified
@@ -647,7 +644,7 @@ bool Dataset::normalizeVariable(std::string_view variableName) {
     float minValue = std::numeric_limits<float>::max();
     float maxValue = -std::numeric_limits<float>::max();
     for (Dataset::Entry& e : entries) {
-        float value = e.data[idx];
+        const float value = e.data[idx];
         if (std::isnan(value)) {
             continue;
         }
@@ -656,7 +653,7 @@ bool Dataset::normalizeVariable(std::string_view variableName) {
     }
 
     for (Dataset::Entry& e : entries) {
-        float value = e.data[idx];
+        const float value = e.data[idx];
         if (std::isnan(value)) {
             continue;
         }
@@ -681,7 +678,7 @@ glm::vec2 Dataset::findValueRange(int variableIndex) const {
     float maxValue = -std::numeric_limits<float>::max();
     for (const Dataset::Entry& e : entries) {
         if (!e.data.empty()) {
-            float value = e.data[variableIndex];
+            const float value = e.data[variableIndex];
             if (std::isnan(value)) {
                 continue;
             }
@@ -698,7 +695,7 @@ glm::vec2 Dataset::findValueRange(int variableIndex) const {
 }
 
 glm::vec2 Dataset::findValueRange(std::string_view variableName) const {
-    int idx = index(variableName);
+    const int idx = index(variableName);
 
     if (idx == -1) {
         // We didn't find the variable that was specified
diff --git a/src/data/datamapping.cpp b/src/data/datamapping.cpp
index 24c60a1877..172e3753d9 100644
--- a/src/data/datamapping.cpp
+++ b/src/data/datamapping.cpp
@@ -144,7 +144,7 @@ bool DataMapping::isExcludeColumn(std::string_view column) const {
 
 std::string generateHashString(const DataMapping& dm) {
     std::string a;
-    for (std::string_view c : dm.excludeColumns) {
+    for (const std::string_view c : dm.excludeColumns) {
         a += c;
     }
     unsigned int excludeColumnsHash = ghoul::hashCRC32(a);
diff --git a/src/data/speckloader.cpp b/src/data/speckloader.cpp
index cf5180aa34..3b192c0973 100644
--- a/src/data/speckloader.cpp
+++ b/src/data/speckloader.cpp
@@ -273,8 +273,8 @@ Dataset loadSpeckFile(std::filesystem::path path, std::optional<DataMapping> spe
         str >> entry.position.x >> entry.position.y >> entry.position.z;
         allZero &= (entry.position == glm::vec3(0.0));
 
-        glm::vec3 positive = glm::abs(entry.position);
-        float max = glm::compMax(positive);
+        const glm::vec3 positive = glm::abs(entry.position);
+        const float max = glm::compMax(positive);
         if (max > res.maxPositionComponent) {
             res.maxPositionComponent = max;
         }
@@ -304,8 +304,8 @@ Dataset loadSpeckFile(std::filesystem::path path, std::optional<DataMapping> spe
 
                 // Check if value corresponds to a missing value
                 if (specs.has_value() && specs->missingDataValue.has_value()) {
-                    float missingDataValue = specs->missingDataValue.value();
-                    float diff = std::abs(entry.data[i] - missingDataValue);
+                    const float missingDataValue = specs->missingDataValue.value();
+                    const float diff = std::abs(entry.data[i] - missingDataValue);
                     if (diff < std::numeric_limits<float>::epsilon()) {
                         entry.data[i] = std::numeric_limits<float>::quiet_NaN();
                     }
@@ -455,7 +455,7 @@ Labelset loadLabelFile(std::filesystem::path path) {
             // optional arument with identifier
             // Remove the 'id' text
             rest = rest.substr(std::string_view("id ").size());
-            size_t index = rest.find("text");
+            const size_t index = rest.find("text");
             entry.identifier = rest.substr(0, index - 1);
 
             // update the rest, remove the identifier
@@ -493,7 +493,7 @@ Labelset loadLabelFile(std::filesystem::path path) {
 ColorMap loadCmapFile(std::filesystem::path path) {
     ghoul_assert(std::filesystem::exists(path), "File must exist");
 
-    std::ifstream file(path);
+    std::ifstream file = std::ifstream(path);
     if (!file.good()) {
         throw ghoul::RuntimeError(fmt::format(
             "Failed to open color map file '{}'", path
diff --git a/src/documentation/documentation.cpp b/src/documentation/documentation.cpp
index 9f0c0d1d4a..9c74ff5fc2 100644
--- a/src/documentation/documentation.cpp
+++ b/src/documentation/documentation.cpp
@@ -221,7 +221,7 @@ TestResult testSpecification(const Documentation& documentation,
 
     for (const auto& p : documentation.entries) {
         if (p.key == DocumentationEntry::Wildcard) {
-            for (std::string_view key : dictionary.keys()) {
+            for (const std::string_view key : dictionary.keys()) {
                 applyVerifier(*(p.verifier), std::string(key));
             }
         }
@@ -237,14 +237,14 @@ TestResult testSpecification(const Documentation& documentation,
 
     // Remove duplicate offenders that might occur if multiple rules apply to a single
     // key and more than one of these rules are broken
-    std::set<TestResult::Offense, OffenseCompare> uniqueOffenders(
+    const std::set<TestResult::Offense, OffenseCompare> uniqueOffenders(
         result.offenses.begin(), result.offenses.end()
     );
     result.offenses = std::vector<TestResult::Offense>(
         uniqueOffenders.begin(), uniqueOffenders.end()
     );
     // Remove duplicate warnings. This should normally not happen, but we want to be sure
-    std::set<TestResult::Warning, WarningCompare> uniqueWarnings(
+    const std::set<TestResult::Warning, WarningCompare> uniqueWarnings(
         result.warnings.begin(), result.warnings.end()
     );
     result.warnings = std::vector<TestResult::Warning>(
@@ -258,9 +258,9 @@ void testSpecificationAndThrow(const Documentation& documentation,
                                const ghoul::Dictionary& dictionary, std::string component)
 {
     // Perform testing against the documentation/specification
-    TestResult testResult = testSpecification(documentation, dictionary);
+    const TestResult testResult = testSpecification(documentation, dictionary);
     if (!testResult.success) {
-        throw SpecificationError(testResult, component);
+        throw SpecificationError(testResult, std::move(component));
     }
 }
 
diff --git a/src/documentation/verifier.cpp b/src/documentation/verifier.cpp
index 671628954b..81a7f36a11 100644
--- a/src/documentation/verifier.cpp
+++ b/src/documentation/verifier.cpp
@@ -138,9 +138,9 @@ TestResult IntVerifier::operator()(const ghoul::Dictionary& dict,
         if (dict.hasKey(key)) {
             if (dict.hasValue<double>(key)) {
                 // If we have a double value, we need to check if it is integer
-                double value = dict.value<double>(key);
-                double intPart;
-                bool isInt = modf(value, &intPart) == 0.0;
+                const double value = dict.value<double>(key);
+                double intPart = 0.0;
+                const bool isInt = modf(value, &intPart) == 0.0;
                 if (isInt) {
                     TestResult res;
                     res.success = true;
@@ -149,10 +149,11 @@ TestResult IntVerifier::operator()(const ghoul::Dictionary& dict,
                 else {
                     TestResult res;
                     res.success = false;
-                    TestResult::Offense o;
-                    o.offender = key;
-                    o.reason = TestResult::Offense::Reason::WrongType;
-                    res.offenses.push_back(o);
+                    TestResult::Offense o = {
+                        .offender = key,
+                        .reason = TestResult::Offense::Reason::WrongType
+                    };
+                    res.offenses.push_back(std::move(o));
                     return res;
                 }
             }
@@ -160,20 +161,22 @@ TestResult IntVerifier::operator()(const ghoul::Dictionary& dict,
                 // If we don't have a double value, we cannot have an int value
                 TestResult res;
                 res.success = false;
-                TestResult::Offense o;
-                o.offender = key;
-                o.reason = TestResult::Offense::Reason::WrongType;
-                res.offenses.push_back(o);
+                TestResult::Offense o = {
+                    .offender = key,
+                    .reason = TestResult::Offense::Reason::WrongType
+                };
+                res.offenses.push_back(std::move(o));
                 return res;
             }
         }
         else {
             TestResult res;
             res.success = false;
-            TestResult::Offense o;
-            o.offender = key;
-            o.reason = TestResult::Offense::Reason::MissingKey;
-            res.offenses.push_back(o);
+            TestResult::Offense o = {
+                .offender = key,
+                .reason = TestResult::Offense::Reason::MissingKey
+            };
+            res.offenses.push_back(std::move(o));
             return res;
         }
     }
@@ -195,12 +198,15 @@ TestResult StringVerifier::operator()(const ghoul::Dictionary& dictionary,
         return res;
     }
 
-    std::string value = dictionary.value<std::string>(key);
+    const std::string value = dictionary.value<std::string>(key);
     if (value.empty() && _mustBeNotEmpty) {
         res.success = false;
-        res.offenses.push_back({
-            key, TestResult::Offense::Reason::Verification, "value must not be empty"
-        });
+        TestResult::Offense o = {
+            .offender = key,
+            .reason = TestResult::Offense::Reason::Verification,
+            .explanation = "value must not be empty"
+        };
+        res.offenses.push_back(std::move(o));
     }
     return res;
 }
@@ -223,15 +229,16 @@ TestResult IdentifierVerifier::operator()(const ghoul::Dictionary& dict,
         return res;
     }
 
-    std::string identifier = dict.value<std::string>(key);
-    size_t pos = identifier.find_first_of(" \t\n\r.");
+    const std::string identifier = dict.value<std::string>(key);
+    const size_t pos = identifier.find_first_of(" \t\n\r.");
     if (pos != std::string::npos) {
         res.success = false;
-        TestResult::Offense off;
-        off.offender = key;
-        off.reason = TestResult::Offense::Reason::Verification;
-        off.explanation = "Identifier contained illegal character";
-        res.offenses.push_back(off);
+        TestResult::Offense o = {
+            .offender = key,
+            .reason = TestResult::Offense::Reason::Verification,
+            .explanation = "Identifier contained illegal character"
+        };
+        res.offenses.push_back(std::move(o));
     }
     return res;
 }
@@ -254,14 +261,15 @@ TestResult FileVerifier::operator()(const ghoul::Dictionary& dict,
         return res;
     }
 
-    std::string file = dict.value<std::string>(key);
+    const std::string file = dict.value<std::string>(key);
     if (!std::filesystem::exists(file) || !std::filesystem::is_regular_file(file)) {
         res.success = false;
-        TestResult::Offense off;
-        off.offender = key;
-        off.reason = TestResult::Offense::Reason::Verification;
-        off.explanation = "File did not exist";
-        res.offenses.push_back(off);
+        TestResult::Offense o = {
+            .offender = key,
+            .reason = TestResult::Offense::Reason::Verification,
+            .explanation = "File did not exist"
+        };
+        res.offenses.push_back(std::move(o));
     }
     return res;
 }
@@ -280,14 +288,15 @@ TestResult DirectoryVerifier::operator()(const ghoul::Dictionary& dict,
         return res;
     }
 
-    std::string dir = dict.value<std::string>(key);
+    const std::string dir = dict.value<std::string>(key);
     if (!std::filesystem::exists(dir) || !std::filesystem::is_directory(dir)) {
         res.success = false;
-        TestResult::Offense off;
-        off.offender = key;
-        off.reason = TestResult::Offense::Reason::Verification;
-        off.explanation = "Directory did not exist";
-        res.offenses.push_back(off);
+        TestResult::Offense o = {
+            .offender = key,
+            .reason = TestResult::Offense::Reason::Verification,
+            .explanation = "Directory did not exist"
+        };
+        res.offenses.push_back(std::move(o));
     }
     return res;
 }
@@ -306,8 +315,8 @@ TestResult DateTimeVerifier::operator()(const ghoul::Dictionary& dict,
         return res;
     }
 
-    std::string dateTime = dict.value<std::string>(key);
-    std::string format = "%Y %m %d %H:%M:%S"; // YYYY MM DD hh:mm:ss
+    const std::string dateTime = dict.value<std::string>(key);
+    const std::string format = "%Y %m %d %H:%M:%S"; // YYYY MM DD hh:mm:ss
 
     std::tm t = {};
     std::istringstream ss(dateTime);
@@ -316,11 +325,12 @@ TestResult DateTimeVerifier::operator()(const ghoul::Dictionary& dict,
     // first check format (automatically checks if valid time)
     if (ss.fail()) {
         res.success = false;
-        TestResult::Offense off;
-        off.offender = key;
-        off.reason = TestResult::Offense::Reason::Verification;
-        off.explanation = "Not a valid format, should be: YYYY MM DD hh:mm:ss";
-        res.offenses.push_back(off);
+        TestResult::Offense o = {
+            .offender = key,
+            .reason = TestResult::Offense::Reason::Verification,
+            .explanation = "Not a valid format, should be: YYYY MM DD hh:mm:ss"
+        };
+        res.offenses.push_back(std::move(o));
     }
     return res;
 }
@@ -337,36 +347,39 @@ TestResult Color3Verifier::operator()(const ghoul::Dictionary& dictionary,
         return res;
     }
 
-    glm::dvec3 values = dictionary.value<glm::dvec3>(key);
+    const glm::dvec3 values = dictionary.value<glm::dvec3>(key);
     if (values.x < 0.0 || values.x > 1.0) {
         res.success = false;
-        TestResult::Offense o;
-        o.offender = key + ".x";
-        o.reason = TestResult::Offense::Reason::Verification;
-        res.offenses.push_back(o);
+        TestResult::Offense o = {
+            .offender = key + ".x",
+            .reason = TestResult::Offense::Reason::Verification
+        };
+        res.offenses.push_back(std::move(o));
     }
 
     if (values.y < 0.0 || values.y > 1.0) {
         res.success = false;
-        TestResult::Offense o;
-        o.offender = key + ".y";
-        o.reason = TestResult::Offense::Reason::Verification;
-        res.offenses.push_back(o);
+        TestResult::Offense o = {
+            .offender = key + ".y",
+            .reason = TestResult::Offense::Reason::Verification
+        };
+        res.offenses.push_back(std::move(o));
     }
 
     if (values.z < 0.0 || values.z > 1.0) {
         res.success = false;
-        TestResult::Offense o;
-        o.offender = key + ".z";
-        o.reason = TestResult::Offense::Reason::Verification;
-        res.offenses.push_back(o);
+        TestResult::Offense o = {
+            .offender = key + ".z",
+            .reason = TestResult::Offense::Reason::Verification
+        };
+        res.offenses.push_back(std::move(o));
     }
 
     return res;
 }
 
 std::string Color3Verifier::type() const {
-    return std::string("Color3");
+    return "Color3";
 }
 
 TestResult Color4Verifier::operator()(const ghoul::Dictionary& dictionary,
@@ -377,44 +390,48 @@ TestResult Color4Verifier::operator()(const ghoul::Dictionary& dictionary,
         return res;
     }
 
-    glm::dvec4 values = dictionary.value<glm::dvec4>(key);
+    const glm::dvec4 values = dictionary.value<glm::dvec4>(key);
     if (values.x < 0.0 || values.x > 1.0) {
         res.success = false;
-        TestResult::Offense o;
-        o.offender = key + ".x";
-        o.reason = TestResult::Offense::Reason::Verification;
-        res.offenses.push_back(o);
+        TestResult::Offense o = {
+            .offender = key + ".x",
+            .reason = TestResult::Offense::Reason::Verification
+        };
+        res.offenses.push_back(std::move(o));
     }
 
     if (values.y < 0.0 || values.y > 1.0) {
         res.success = false;
-        TestResult::Offense o;
-        o.offender = key + ".y";
-        o.reason = TestResult::Offense::Reason::Verification;
-        res.offenses.push_back(o);
+        TestResult::Offense o = {
+            .offender = key + ".y",
+            .reason = TestResult::Offense::Reason::Verification
+        };
+        res.offenses.push_back(std::move(o));
     }
 
     if (values.z < 0.0 || values.z > 1.0) {
         res.success = false;
-        TestResult::Offense o;
-        o.offender = key + ".z";
-        o.reason = TestResult::Offense::Reason::Verification;
-        res.offenses.push_back(o);
+        TestResult::Offense o = {
+            .offender = key + ".z",
+            .reason = TestResult::Offense::Reason::Verification
+        };
+        res.offenses.push_back(std::move(o));
     }
 
     if (values.w < 0.0 || values.w > 1.0) {
         res.success = false;
-        TestResult::Offense o;
-        o.offender = key + ".a";
-        o.reason = TestResult::Offense::Reason::Verification;
-        res.offenses.push_back(o);
+        TestResult::Offense o = {
+            .offender = key + ".a",
+            .reason = TestResult::Offense::Reason::Verification
+        };
+        res.offenses.push_back(std::move(o));
     }
 
     return res;
 }
 
 std::string Color4Verifier::type() const {
-    return std::string("Color4");
+    return "Color4";
 }
 
 template <>
@@ -429,9 +446,9 @@ TestResult TemplateVerifier<glm::ivec2>::operator()(const ghoul::Dictionary& dic
     else {
         if (dict.hasKey(key)) {
             if (dict.hasValue<glm::dvec2>(key)) {
-                glm::dvec2 value = dict.value<glm::dvec2>(key);
+                const glm::dvec2 value = dict.value<glm::dvec2>(key);
                 glm::dvec2 intPart;
-                glm::bvec2 isInt = glm::bvec2(
+                const glm::bvec2 isInt = glm::bvec2(
                     modf(value.x, &intPart.x) == 0.0,
                     modf(value.y, &intPart.y) == 0.0
                 );
@@ -443,30 +460,33 @@ TestResult TemplateVerifier<glm::ivec2>::operator()(const ghoul::Dictionary& dic
                 else {
                     TestResult res;
                     res.success = false;
-                    TestResult::Offense o;
-                    o.offender = key;
-                    o.reason = TestResult::Offense::Reason::WrongType;
-                    res.offenses.push_back(o);
+                    TestResult::Offense o = {
+                        .offender = key,
+                        .reason = TestResult::Offense::Reason::WrongType
+                    };
+                    res.offenses.push_back(std::move(o));
                     return res;
                 }
             }
             else {
                 TestResult res;
                 res.success = false;
-                TestResult::Offense o;
-                o.offender = key;
-                o.reason = TestResult::Offense::Reason::WrongType;
-                res.offenses.push_back(o);
+                TestResult::Offense o = {
+                    .offender = key,
+                    .reason = TestResult::Offense::Reason::WrongType
+                };
+                res.offenses.push_back(std::move(o));
                 return res;
             }
         }
         else {
             TestResult res;
             res.success = false;
-            TestResult::Offense o;
-            o.offender = key;
-            o.reason = TestResult::Offense::Reason::MissingKey;
-            res.offenses.push_back(o);
+            TestResult::Offense o = {
+                .offender = key,
+                .reason = TestResult::Offense::Reason::MissingKey
+            };
+            res.offenses.push_back(std::move(o));
             return res;
         }
     }
@@ -484,9 +504,9 @@ TestResult TemplateVerifier<glm::ivec3>::operator()(const ghoul::Dictionary& dic
     else {
         if (dict.hasKey(key)) {
             if (dict.hasValue<glm::dvec3>(key)) {
-                glm::dvec3 value = dict.value<glm::dvec3>(key);
+                const glm::dvec3 value = dict.value<glm::dvec3>(key);
                 glm::dvec3 intPart;
-                glm::bvec3 isInt = glm::bvec3(
+                const glm::bvec3 isInt = glm::bvec3(
                     modf(value.x, &intPart.x) == 0.0,
                     modf(value.y, &intPart.y) == 0.0,
                     modf(value.z, &intPart.z) == 0.0
@@ -499,30 +519,33 @@ TestResult TemplateVerifier<glm::ivec3>::operator()(const ghoul::Dictionary& dic
                 else {
                     TestResult res;
                     res.success = false;
-                    TestResult::Offense o;
-                    o.offender = key;
-                    o.reason = TestResult::Offense::Reason::WrongType;
-                    res.offenses.push_back(o);
+                    TestResult::Offense o = {
+                        .offender = key,
+                        .reason = TestResult::Offense::Reason::WrongType
+                    };
+                    res.offenses.push_back(std::move(o));
                     return res;
                 }
             }
             else {
                 TestResult res;
                 res.success = false;
-                TestResult::Offense o;
-                o.offender = key;
-                o.reason = TestResult::Offense::Reason::WrongType;
-                res.offenses.push_back(o);
+                TestResult::Offense o = {
+                    .offender = key,
+                    .reason = TestResult::Offense::Reason::WrongType
+                };
+                res.offenses.push_back(std::move(o));
                 return res;
             }
         }
         else {
             TestResult res;
             res.success = false;
-            TestResult::Offense o;
-            o.offender = key;
-            o.reason = TestResult::Offense::Reason::MissingKey;
-            res.offenses.push_back(o);
+            TestResult::Offense o = {
+                .offender = key,
+                .reason = TestResult::Offense::Reason::MissingKey
+            };
+            res.offenses.push_back(std::move(o));
             return res;
         }
     }
@@ -540,46 +563,50 @@ TestResult TemplateVerifier<glm::ivec4>::operator()(const ghoul::Dictionary& dic
     else {
         if (dict.hasKey(key)) {
             if (dict.hasValue<glm::dvec4>(key)) {
-                glm::dvec4 value = dict.value<glm::dvec4>(key);
+                const glm::dvec4 value = dict.value<glm::dvec4>(key);
                 glm::dvec4 intPart;
-                glm::bvec4 isInt = glm::bvec4(
+                const glm::bvec4 isInt = glm::bvec4(
                     modf(value.x, &intPart.x) == 0.0,
                     modf(value.y, &intPart.y) == 0.0,
                     modf(value.z, &intPart.z) == 0.0,
                     modf(value.w, &intPart.w) == 0.0
                 );
                 if (isInt.x && isInt.y && isInt.z && isInt.w) {
-                    TestResult res;
-                    res.success = true;
+                    TestResult res = {
+                        .success = true
+                    };
                     return res;
                 }
                 else {
                     TestResult res;
                     res.success = false;
-                    TestResult::Offense o;
-                    o.offender = key;
-                    o.reason = TestResult::Offense::Reason::WrongType;
-                    res.offenses.push_back(o);
+                    TestResult::Offense o = {
+                        .offender = key,
+                        .reason = TestResult::Offense::Reason::WrongType
+                    };
+                    res.offenses.push_back(std::move(o));
                     return res;
                 }
             }
             else {
                 TestResult res;
                 res.success = false;
-                TestResult::Offense o;
-                o.offender = key;
-                o.reason = TestResult::Offense::Reason::WrongType;
-                res.offenses.push_back(o);
+                TestResult::Offense o = {
+                    .offender = key,
+                    .reason = TestResult::Offense::Reason::WrongType
+                };
+                res.offenses.push_back(std::move(o));
                 return res;
             }
         }
         else {
             TestResult res;
             res.success = false;
-            TestResult::Offense o;
-            o.offender = key;
-            o.reason = TestResult::Offense::Reason::MissingKey;
-            res.offenses.push_back(o);
+            TestResult::Offense o = {
+                .offender = key,
+                .reason = TestResult::Offense::Reason::MissingKey
+            };
+            res.offenses.push_back(std::move(o));
             return res;
         }
     }
@@ -593,8 +620,8 @@ TestResult TableVerifier::operator()(const ghoul::Dictionary& dictionary,
                                      const std::string& key) const
 {
     if (dictionary.hasValue<Type>(key)) {
-        ghoul::Dictionary d = dictionary.value<ghoul::Dictionary>(key);
-        Documentation doc = { .entries = documentations };
+        const ghoul::Dictionary d = dictionary.value<ghoul::Dictionary>(key);
+        const Documentation doc = { .entries = documentations };
         TestResult res = testSpecification(doc, d);
 
         // Add the 'key' as a prefix to make the new offender a fully qualified identifer
@@ -613,19 +640,21 @@ TestResult TableVerifier::operator()(const ghoul::Dictionary& dictionary,
         if (dictionary.hasKey(key)) {
             TestResult res;
             res.success = false;
-            TestResult::Offense o;
-            o.offender = key;
-            o.reason = TestResult::Offense::Reason::WrongType;
-            res.offenses.push_back(o);
+            TestResult::Offense o = {
+                .offender = key,
+                .reason = TestResult::Offense::Reason::WrongType
+            };
+            res.offenses.push_back(std::move(o));
             return res;
         }
         else {
             TestResult res;
             res.success = false;
-            TestResult::Offense o;
-            o.offender = key;
-            o.reason = TestResult::Offense::Reason::MissingKey;
-            res.offenses.push_back(o);
+            TestResult::Offense o = {
+                .offender = key,
+                .reason = TestResult::Offense::Reason::MissingKey
+            };
+            res.offenses.push_back(std::move(o));
             return res;
         }
     }
@@ -676,14 +705,15 @@ TestResult ReferencingVerifier::operator()(const ghoul::Dictionary& dictionary,
 
         if (it == docs.end()) {
             res.success = false;
-            TestResult::Offense o;
-            o.offender = key;
-            o.reason = TestResult::Offense::Reason::UnknownIdentifier;
-            res.offenses.push_back(o);
+            TestResult::Offense o = {
+                .offender = key,
+                .reason = TestResult::Offense::Reason::UnknownIdentifier
+            };
+            res.offenses.push_back(std::move(o));
             return res;
         }
 
-        ghoul::Dictionary d = dictionary.value<ghoul::Dictionary>(key);
+        const ghoul::Dictionary d = dictionary.value<ghoul::Dictionary>(key);
         TestResult r = testSpecification(*it, d);
 
         // Add the 'key' as a prefix to make the offender a fully qualified identifer
@@ -708,7 +738,7 @@ std::string ReferencingVerifier::documentation() const {
 }
 
 OrVerifier::OrVerifier(
-            const std::vector<std::variant<Verifier*, std::shared_ptr<Verifier>>> values_)
+           const std::vector<std::variant<Verifier*, std::shared_ptr<Verifier>>>& values_)
 {
     ghoul_assert(!values_.empty(), "values must not be empty");
     for (const std::variant<Verifier*, std::shared_ptr<Verifier>>& v : values_) {
@@ -741,17 +771,19 @@ TestResult OrVerifier::operator()(const ghoul::Dictionary& dictionary,
     );
 
     if (success) {
-        TestResult r;
-        r.success = true;
+        TestResult r = {
+            .success = true
+        };
         return r;
     }
     else {
         TestResult r;
         r.success = false;
-        TestResult::Offense o;
-        o.offender = key;
-        o.reason = TestResult::Offense::Reason::Verification;
-        r.offenses.push_back(o);
+        TestResult::Offense o = {
+            .offender = key,
+            .reason = TestResult::Offense::Reason::Verification
+        };
+        r.offenses.push_back(std::move(o));
         return r;
     }
 }
diff --git a/src/engine/configuration.cpp b/src/engine/configuration.cpp
index 60b3aed5e1..1dc0d6fcd0 100644
--- a/src/engine/configuration.cpp
+++ b/src/engine/configuration.cpp
@@ -340,8 +340,8 @@ ghoul::Dictionary Configuration::createDictionary() {
     res.setValue("GlobalCustomizationScripts", globalCustomizationScriptsDict);
 
     ghoul::Dictionary fontsDict;
-    for (auto it = fonts.begin(); it != fonts.end(); it++) {
-        fontsDict.setValue(it->first, it->second);
+    for (const auto& [name, path] : fonts) {
+        fontsDict.setValue(name, path);
     }
     res.setValue("Fonts", fontsDict);
 
@@ -413,8 +413,8 @@ ghoul::Dictionary Configuration::createDictionary() {
     res.setValue("LayerServer", layerServerToString(layerServer));
 
     ghoul::Dictionary moduleConfigurationsDict;
-    for (auto it = moduleConfigurations.begin(); it != moduleConfigurations.end(); it++) {
-        moduleConfigurationsDict.setValue(it->first, it->second);
+    for (const auto& [key, value] : moduleConfigurations) {
+        moduleConfigurationsDict.setValue(key, value);
     }
     res.setValue("ModuleConfigurations", moduleConfigurationsDict);
 
@@ -447,7 +447,7 @@ ghoul::Dictionary Configuration::createDictionary() {
                     static_cast<int>(openGLDebugContext.identifierFilters[i].identifier)
                 );
 
-                openGLDebugContextDict.setValue(std::to_string(i), identifierFilterDict);
+                identifierFiltersDict.setValue(std::to_string(i), identifierFilterDict);
             }
         }
         openGLDebugContextDict.setValue("IdentifierFilters", identifierFiltersDict);
@@ -486,7 +486,7 @@ void parseLuaState(Configuration& configuration) {
 
     // Shorten the rest of this function
     Configuration& c = configuration;
-    LuaState& s = c.state;
+    const LuaState& s = c.state;
 
     // The sgctConfigNameInitialized is a bit special
     lua_getglobal(s, "sgctconfiginitializeString");
@@ -503,7 +503,9 @@ void parseLuaState(Configuration& configuration) {
 
     // We go through all of the entries and lift them from global scope into the table on
     // the stack so that we can create a ghoul::Dictionary from this new table
-    documentation::Documentation doc = codegen::doc<Parameters>("core_configuration");
+    const documentation::Documentation doc = codegen::doc<Parameters>(
+        "core_configuration"
+    );
     for (const documentation::DocumentationEntry& e : doc.entries) {
         lua_pushstring(s, e.key.c_str());
         lua_getglobal(s, e.key.c_str());
@@ -544,7 +546,7 @@ void parseLuaState(Configuration& configuration) {
     c.isPrintingEvents = p.printEvents.value_or(c.isPrintingEvents);
 
     if (p.consoleKey.has_value()) {
-        KeyWithModifier km = stringToKey(*p.consoleKey);
+        const KeyWithModifier km = stringToKey(*p.consoleKey);
         if (km.modifier != KeyModifier::None) {
             throw ghoul::RuntimeError(fmt::format(
                 "Console key '{}' must be a 'bare' key and cannot contain any modifiers",
@@ -680,7 +682,7 @@ std::filesystem::path findConfiguration(const std::string& filename) {
         }
 
         // Otherwise, we traverse the directory tree up
-        std::filesystem::path nextDirectory = directory.parent_path();
+        const std::filesystem::path nextDirectory = directory.parent_path();
 
         if (directory == nextDirectory) {
             // We have reached the root of the file system and did not find the file
@@ -702,7 +704,7 @@ Configuration loadConfigurationFromFile(const std::filesystem::path& configurati
     Configuration result;
 
     // Injecting the resolution of the primary screen into the Lua state
-    std::string script = fmt::format(
+    const std::string script = fmt::format(
         "ScreenResolution = {{ x = {}, y = {} }}",
         primaryMonitorResolution.x, primaryMonitorResolution.y
     );
@@ -719,7 +721,7 @@ Configuration loadConfigurationFromFile(const std::filesystem::path& configurati
     parseLuaState(result);
 
     if (std::filesystem::is_regular_file(settingsFile)) {
-        Settings settings = loadSettings(settingsFile);
+        const Settings settings = loadSettings(settingsFile);
 
         patchConfiguration(result, settings);
     }
diff --git a/src/engine/downloadmanager.cpp b/src/engine/downloadmanager.cpp
index db3b36867f..c91e34c528 100644
--- a/src/engine/downloadmanager.cpp
+++ b/src/engine/downloadmanager.cpp
@@ -46,13 +46,13 @@ namespace {
     };
 
     size_t writeData(void* ptr, size_t size, size_t nmemb, FILE* stream) {
-        size_t written = fwrite(ptr, size, nmemb, stream);
+        const size_t written = fwrite(ptr, size, nmemb, stream);
         return written;
     }
 
     size_t writeMemoryCallback(void* contents, size_t size, size_t nmemb, void* userp) {
-        size_t realsize = size * nmemb;
-        auto mem = static_cast<openspace::DownloadManager::MemoryFile*>(userp);
+        const size_t realsize = size * nmemb;
+        auto* mem = static_cast<openspace::DownloadManager::MemoryFile*>(userp);
 
         // @TODO(abock): Remove this and replace mem->buffer with std::vector<char>
         mem->buffer = reinterpret_cast<char*>(
@@ -128,7 +128,7 @@ std::shared_ptr<DownloadManager::FileFuture> DownloadManager::downloadFile(
                                                                   FailOnError failOnError,
                                                                 unsigned int timeout_secs,
                                                 DownloadFinishedCallback finishedCallback,
-                                                DownloadProgressCallback progressCallback)
+                                          DownloadProgressCallback progressCallback) const
 {
     if (!overrideFile && std::filesystem::is_regular_file(file)) {
         return nullptr;
@@ -184,7 +184,7 @@ std::shared_ptr<DownloadManager::FileFuture> DownloadManager::downloadFile(
             #endif
             curl_easy_setopt(curl, CURLOPT_NOPROGRESS, 0L);
 
-            CURLcode res = curl_easy_perform(curl);
+            const CURLcode res = curl_easy_perform(curl);
             curl_easy_cleanup(curl);
             fclose(fp);
 
@@ -192,7 +192,7 @@ std::shared_ptr<DownloadManager::FileFuture> DownloadManager::downloadFile(
                 future->isFinished = true;
             }
             else {
-                long rescode;
+                long rescode = 0;
                 curl_easy_getinfo(curl, CURLINFO_RESPONSE_CODE, &rescode);
                 future->errorMessage = fmt::format(
                     "{}. HTTP code: {}", curl_easy_strerror(res), rescode
@@ -256,7 +256,7 @@ std::future<DownloadManager::MemoryFile> DownloadManager::fetchFile(
         CURLcode res = curl_easy_perform(curl);
         if (res == CURLE_OK) {
             // ask for the content-type
-            char* ct;
+            char* ct = nullptr;
             res = curl_easy_getinfo(curl, CURLINFO_CONTENT_TYPE, &ct);
             if (res == CURLE_OK) {
                 std::string extension = std::string(ct);
@@ -293,8 +293,8 @@ std::future<DownloadManager::MemoryFile> DownloadManager::fetchFile(
     return std::async(std::launch::async, downloadFunction);
 }
 
-void DownloadManager::getFileExtension(const std::string& url,
-                                       RequestFinishedCallback finishedCallback)
+void DownloadManager::fileExtension(const std::string& url,
+                                    RequestFinishedCallback finishedCallback) const
 {
     auto requestFunction = [url, finishedCb = std::move(finishedCallback)]() {
         CURL* curl = curl_easy_init();
@@ -304,7 +304,7 @@ void DownloadManager::getFileExtension(const std::string& url,
             curl_easy_setopt(curl, CURLOPT_NOBODY, 1);
             CURLcode res = curl_easy_perform(curl);
             if (CURLE_OK == res) {
-                char* ct;
+                char* ct = nullptr;
                 // ask for the content-type
                 res = curl_easy_getinfo(curl, CURLINFO_CONTENT_TYPE, &ct);
                 if ((res == CURLE_OK) && ct && finishedCb) {
diff --git a/src/engine/logfactory.cpp b/src/engine/logfactory.cpp
index cb163c1456..c0f0020bbb 100644
--- a/src/engine/logfactory.cpp
+++ b/src/engine/logfactory.cpp
@@ -98,25 +98,25 @@ documentation::Documentation LogFactoryDocumentation() {
 std::unique_ptr<ghoul::logging::Log> createLog(const ghoul::Dictionary& dictionary) {
     const Parameters p = codegen::bake<Parameters>(dictionary);
 
-    std::filesystem::path filename = absPath(p.file);
-    bool append = p.append.value_or(true);
-    int nLogRotation = p.logRotation.value_or(0);
-    bool timeStamp = p.timeStamping.value_or(true);
-    bool dateStamp = p.dateStamping.value_or(true);
-    bool categoryStamp = p.categoryStamping.value_or(true);
-    bool logLevelStamp = p.logLevelStamping.value_or(true);
-    ghoul::logging::LogLevel level = codegen::map<ghoul::logging::LogLevel>(
+    const std::filesystem::path filename = absPath(p.file);
+    const bool append = p.append.value_or(true);
+    const int nLogRotation = p.logRotation.value_or(0);
+    const bool timeStamp = p.timeStamping.value_or(true);
+    const bool dateStamp = p.dateStamping.value_or(true);
+    const bool categoryStamp = p.categoryStamping.value_or(true);
+    const bool logLevelStamp = p.logLevelStamping.value_or(true);
+    const ghoul::logging::LogLevel level = codegen::map<ghoul::logging::LogLevel>(
         p.logLevel.value_or(Parameters::LogLevel::AllLogging)
     );
 
     switch (p.type) {
         case Parameters::Type::Html:
         {
-            std::vector<std::string> cssFiles{
+            const std::vector<std::string> cssFiles = {
                 absPath(BootstrapPath).string(),
                 absPath(CssPath).string()
             };
-            std::vector<std::string> jsFiles{ absPath(JsPath).string() };
+            const std::vector<std::string> jsFiles = { absPath(JsPath).string() };
 
             return std::make_unique<ghoul::logging::HTMLLog>(
                 filename.string(),
@@ -142,7 +142,7 @@ std::unique_ptr<ghoul::logging::Log> createLog(const ghoul::Dictionary& dictiona
                 level
             );
         default:
-            throw new ghoul::MissingCaseException();
+            throw ghoul::MissingCaseException();
     }
 }
 
diff --git a/src/engine/moduleengine.cpp b/src/engine/moduleengine.cpp
index 4cf8da503c..fd1f8450fd 100644
--- a/src/engine/moduleengine.cpp
+++ b/src/engine/moduleengine.cpp
@@ -63,7 +63,7 @@ void ModuleEngine::initialize(
 {
     ZoneScoped;
 
-    std::vector<OpenSpaceModule*> modules = AllModules();
+    const std::vector<OpenSpaceModule*> modules = AllModules();
 
     std::vector<std::string> moduleNames;
     moduleNames.reserve(modules.size());
diff --git a/src/engine/openspaceengine.cpp b/src/engine/openspaceengine.cpp
index f0d44b83be..18dd74ca45 100644
--- a/src/engine/openspaceengine.cpp
+++ b/src/engine/openspaceengine.cpp
@@ -178,11 +178,17 @@ namespace {
     }
 
     void resetPropertyChangeFlags() {
+        using namespace openspace;
+
         ZoneScoped;
 
-        std::vector<openspace::SceneGraphNode*> nodes =
-            openspace::global::renderEngine->scene()->allSceneGraphNodes();
-        for (openspace::SceneGraphNode* n : nodes) {
+        Scene* scene = global::renderEngine->scene();
+        if (!scene) {
+            return;
+        }
+
+        const std::vector<SceneGraphNode*> nodes = scene->allSceneGraphNodes();
+        for (SceneGraphNode* n : nodes) {
             resetPropertyChangeFlagsOfSubowners(n);
         }
     }
@@ -300,10 +306,10 @@ void OpenSpaceEngine::initialize() {
         ghoul::logging::LogManager::deinitialize();
     }
 
-    ghoul::logging::LogLevel level = ghoul::from_string<ghoul::logging::LogLevel>(
+    const ghoul::logging::LogLevel level = ghoul::from_string<ghoul::logging::LogLevel>(
         global::configuration->logging.level
     );
-    bool immediateFlush = global::configuration->logging.forceImmediateFlush;
+    const bool immediateFlush = global::configuration->logging.forceImmediateFlush;
 
     using ImmediateFlush = ghoul::logging::LogManager::ImmediateFlush;
     ghoul::logging::LogManager::initialize(level, ImmediateFlush(immediateFlush));
@@ -341,9 +347,9 @@ void OpenSpaceEngine::initialize() {
         while (rot > 0) {
             // Move all of the existing logs one position up
 
-            std::filesystem::path file = absPath(global::configuration->scriptLog);
-            std::string fname = file.stem().string();
-            std::string ext = file.extension().string();
+            const std::filesystem::path file = absPath(global::configuration->scriptLog);
+            const std::string fname = file.stem().string();
+            const std::string ext = file.extension().string();
 
             std::filesystem::path newCandidate = file;
             newCandidate.replace_filename(fmt::format("{}-{}{}", fname, rot, ext));
@@ -393,10 +399,10 @@ void OpenSpaceEngine::initialize() {
     // Process profile file
     std::filesystem::path profile;
     if (!std::filesystem::is_regular_file(global::configuration->profile)) {
-        std::filesystem::path userCandidate = absPath(fmt::format(
+        const std::filesystem::path userCandidate = absPath(fmt::format(
             "${{USER_PROFILES}}/{}.profile", global::configuration->profile
         ));
-        std::filesystem::path profileCandidate = absPath(fmt::format(
+        const std::filesystem::path profileCandidate = absPath(fmt::format(
             "${{PROFILES}}/{}.profile", global::configuration->profile
         ));
 
@@ -432,7 +438,7 @@ void OpenSpaceEngine::initialize() {
     for (OpenSpaceModule* module : global::moduleEngine->modules()) {
         global::scriptEngine->addLibrary(module->luaLibrary());
 
-        for (scripting::LuaLibrary& l : module->luaLibraries()) {
+        for (const scripting::LuaLibrary& l : module->luaLibraries()) {
             global::scriptEngine->addLibrary(l);
         }
     }
@@ -472,7 +478,7 @@ void OpenSpaceEngine::initializeGL() {
     SysCap.detectCapabilities();
 
     using Verbosity = ghoul::systemcapabilities::SystemCapabilitiesComponent::Verbosity;
-    Verbosity verbosity = ghoul::from_string<Verbosity>(
+    const Verbosity verbosity = ghoul::from_string<Verbosity>(
         global::configuration->logging.capabilitiesVerbosity
     );
     SysCap.logCapabilities(verbosity);
@@ -483,7 +489,7 @@ void OpenSpaceEngine::initializeGL() {
     }
 
     // Check the required OpenGL versions of the registered modules
-    ghoul::systemcapabilities::Version version =
+    const ghoul::systemcapabilities::Version version =
         global::moduleEngine->requiredOpenGLVersion();
     LINFO(fmt::format("Required OpenGL version: {}", ghoul::to_string(version)));
 
@@ -558,7 +564,7 @@ void OpenSpaceEngine::initializeGL() {
     if (debugActive) {
         using namespace ghoul::opengl::debug;
 
-        bool synchronous = global::configuration->openGLDebugContext.isSynchronous;
+        const bool synchronous = global::configuration->openGLDebugContext.isSynchronous;
         setDebugOutput(DebugOutput(debugActive), SynchronousOutput(synchronous));
 
         for (const Configuration::OpenGLDebugContext::IdentifierFilter& f :
@@ -586,7 +592,7 @@ void OpenSpaceEngine::initializeGL() {
 
         ghoul::opengl::debug::setDebugCallback(
             [](Source source, Type type, Severity severity, unsigned int id,
-               std::string message)
+                const std::string& message)
             {
                 const std::string s = ghoul::to_string(source);
                 const std::string t = ghoul::to_string(type);
@@ -681,7 +687,9 @@ void OpenSpaceEngine::initializeGL() {
 
     if (global::configuration->isLoggingOpenGLCalls) {
         using namespace ghoul::logging;
-        LogLevel lvl = ghoul::from_string<LogLevel>(global::configuration->logging.level);
+        const LogLevel lvl = ghoul::from_string<LogLevel>(
+            global::configuration->logging.level
+        );
         if (lvl > LogLevel::Trace) {
             LWARNING(
                 "Logging OpenGL calls is enabled, but the selected log level does "
@@ -751,11 +759,11 @@ void OpenSpaceEngine::loadAssets() {
 
     std::unique_ptr<SceneInitializer> sceneInitializer;
     if (global::configuration->useMultithreadedInitialization) {
-        unsigned int nAvailableThreads = std::min(
+        const unsigned int nAvailableThreads = std::min(
             std::thread::hardware_concurrency() - 1,
             4u
         );
-        unsigned int nThreads = nAvailableThreads == 0 ? 2 : nAvailableThreads;
+        const unsigned int nThreads = nAvailableThreads == 0 ? 2 : nAvailableThreads;
         sceneInitializer = std::make_unique<MultiThreadedSceneInitializer>(nThreads);
     }
     else {
@@ -895,7 +903,7 @@ void OpenSpaceEngine::runGlobalCustomizationScripts() {
     ZoneScoped;
 
     LINFO("Running Global initialization scripts");
-    ghoul::lua::LuaState state;
+    const ghoul::lua::LuaState state;
     global::scriptEngine->initializeLuaState(state);
 
     for (const std::string& script : global::configuration->globalCustomizationScripts) {
@@ -929,7 +937,7 @@ void OpenSpaceEngine::loadFonts() {
         }
 
         LDEBUG(fmt::format("Registering font '{}' with key '{}'", fontName, key));
-        bool success = global::fontManager->registerFontPath(key, fontName);
+        const bool success = global::fontManager->registerFontPath(key, fontName);
 
         if (!success) {
             LERROR(fmt::format(
@@ -1023,7 +1031,7 @@ void OpenSpaceEngine::preSynchronization() {
         global::windowDelegate->setSynchronization(false);
     }
 
-    bool master = global::windowDelegate->isMaster();
+    const bool master = global::windowDelegate->isMaster();
 
     global::syncEngine->preSynchronization(SyncEngine::IsMaster(master));
     if (master) {
@@ -1034,10 +1042,10 @@ void OpenSpaceEngine::preSynchronization() {
 
         global::timeManager->preSynchronization(dt);
 
-        std::vector<std::string> scheduledScripts = global::scriptScheduler->progressTo(
+        const std::vector<std::string> schedScripts = global::scriptScheduler->progressTo(
             global::timeManager->time().j2000Seconds()
         );
-        for (const std::string& script : scheduledScripts) {
+        for (const std::string& script : schedScripts) {
             global::scriptEngine->queueScript(
                 script,
                 scripting::ScriptEngine::ShouldBeSynchronized::Yes,
@@ -1088,7 +1096,7 @@ void OpenSpaceEngine::postSynchronizationPreDraw() {
     TracyGpuZone("postSynchronizationPreDraw");
     LTRACE("OpenSpaceEngine::postSynchronizationPreDraw(begin)");
 
-    bool master = global::windowDelegate->isMaster();
+    const bool master = global::windowDelegate->isMaster();
     global::syncEngine->postSynchronization(SyncEngine::IsMaster(master));
 
     if (_shutdown.inShutdown) {
@@ -1259,8 +1267,8 @@ void OpenSpaceEngine::keyboardCallback(Key key, KeyModifier mod, KeyAction actio
     }
 
     if (!global::configuration->isConsoleDisabled) {
-        bool isConsoleConsumed = global::luaConsole->keyboardCallback(key, mod, action);
-        if (isConsoleConsumed) {
+        const bool isConsumed = global::luaConsole->keyboardCallback(key, mod, action);
+        if (isConsumed) {
             return;
         }
     }
@@ -1280,7 +1288,7 @@ void OpenSpaceEngine::charCallback(unsigned int codepoint, KeyModifier modifier,
     ZoneScoped;
 
     for (const global::callback::CharacterCallback& func : *global::callback::character) {
-        bool isConsumed = func(codepoint, modifier, isGuiWindow);
+        const bool isConsumed = func(codepoint, modifier, isGuiWindow);
         if (isConsumed) {
             return;
         }
@@ -1327,7 +1335,8 @@ void OpenSpaceEngine::mouseButtonCallback(MouseButton button, MouseAction action
     // Check if the user clicked on one of the 'buttons' the RenderEngine is drawing.
     // Only handle the clicks if we are in a GUI window
     if (action == MouseAction::Press && isGuiWindow) {
-        bool isConsumed = global::renderEngine->mouseActivationCallback(_mousePosition);
+        const bool isConsumed =
+            global::renderEngine->mouseActivationCallback(_mousePosition);
         if (isConsumed) {
             return;
         }
@@ -1373,7 +1382,7 @@ void OpenSpaceEngine::mouseScrollWheelCallback(double posX, double posY,
 
     using F = global::callback::MouseScrollWheelCallback;
     for (const F& func : *global::callback::mouseScrollWheel) {
-        bool isConsumed = func(posX, posY, isGuiWindow);
+        const bool isConsumed = func(posX, posY, isGuiWindow);
         if (isConsumed) {
             return;
         }
@@ -1387,7 +1396,7 @@ void OpenSpaceEngine::touchDetectionCallback(TouchInput input) {
     ZoneScoped;
 
     for (const std::function<bool(TouchInput)>& func : *global::callback::touchDetected) {
-        bool isConsumed = func(input);
+        const bool isConsumed = func(input);
         if (isConsumed) {
             return;
         }
@@ -1398,7 +1407,7 @@ void OpenSpaceEngine::touchUpdateCallback(TouchInput input) {
     ZoneScoped;
 
     for (const std::function<bool(TouchInput)>& func : *global::callback::touchUpdated) {
-        bool isConsumed = func(input);
+        const bool isConsumed = func(input);
         if (isConsumed) {
             return;
         }
@@ -1414,11 +1423,11 @@ void OpenSpaceEngine::touchExitCallback(TouchInput input) {
 }
 
 void OpenSpaceEngine::handleDragDrop(std::filesystem::path file) {
-    ghoul::lua::LuaState s(ghoul::lua::LuaState::IncludeStandardLibrary::Yes);
-    std::filesystem::path absolutePath = absPath("${SCRIPTS}/drag_drop_handler.lua");
-    int status = luaL_loadfile(s, absolutePath.string().c_str());
+    const ghoul::lua::LuaState s(ghoul::lua::LuaState::IncludeStandardLibrary::Yes);
+    const std::filesystem::path path = absPath("${SCRIPTS}/drag_drop_handler.lua");
+    int status = luaL_loadfile(s, path.string().c_str());
     if (status != LUA_OK) {
-        std::string error = lua_tostring(s, -1);
+        const std::string error = lua_tostring(s, -1);
         LERROR(error);
         return;
     }
@@ -1427,7 +1436,7 @@ void OpenSpaceEngine::handleDragDrop(std::filesystem::path file) {
     lua_setglobal(s, "filename");
 
     std::string basename = file.filename().string();
-    ghoul::lua::push(s, basename);
+    ghoul::lua::push(s, std::move(basename));
     lua_setglobal(s, "basename");
 
     std::string extension = file.extension().string();
@@ -1438,7 +1447,7 @@ void OpenSpaceEngine::handleDragDrop(std::filesystem::path file) {
 
     status = lua_pcall(s, 0, 1, 0);
     if (status != LUA_OK) {
-        std::string error = lua_tostring(s, -1);
+        const std::string error = lua_tostring(s, -1);
         LERROR(error);
         return;
     }
@@ -1450,7 +1459,7 @@ void OpenSpaceEngine::handleDragDrop(std::filesystem::path file) {
 
     std::string script = ghoul::lua::value<std::string>(s);
     global::scriptEngine->queueScript(
-        script,
+        std::move(script),
         scripting::ScriptEngine::ShouldBeSynchronized::Yes,
         scripting::ScriptEngine::ShouldSendToRemote::Yes
     );
@@ -1526,7 +1535,7 @@ void OpenSpaceEngine::resetMode() {
 OpenSpaceEngine::CallbackHandle OpenSpaceEngine::addModeChangeCallback(
                                                                     ModeChangeCallback cb)
 {
-    CallbackHandle handle = _nextCallbackHandle++;
+    const CallbackHandle handle = _nextCallbackHandle++;
     _modeChangeCallbacks.emplace_back(handle, std::move(cb));
     return handle;
 }
@@ -1652,12 +1661,12 @@ void setCameraFromProfile(const Profile& p) {
 
                 checkNodeExists(node.anchor);
 
-                NodeCameraStateSpec spec = {
+                NodeCameraStateSpec spc = {
                     .identifier = node.anchor,
                     .height = node.height,
                     .useTargetUpDirection = true
                 };
-                global::navigationHandler->setCameraFromNodeSpecNextFrame(spec);
+                global::navigationHandler->setCameraFromNodeSpecNextFrame(std::move(spc));
             }
         },
         p.camera.value()
diff --git a/src/engine/settings.cpp b/src/engine/settings.cpp
index 111c54a8a1..8eee78e707 100644
--- a/src/engine/settings.cpp
+++ b/src/engine/settings.cpp
@@ -100,8 +100,8 @@ namespace version1 {
 std::filesystem::path findSettings(const std::string& filename) {
     // Right now the settings file lives next to the openspace.cfg file
 
-    std::filesystem::path path = findConfiguration();
-    std::filesystem::path result = path.parent_path() / filename;
+    const std::filesystem::path path = findConfiguration();
+    const std::filesystem::path result = path.parent_path() / filename;
     return result;
 }
 
@@ -110,10 +110,12 @@ Settings loadSettings(const std::filesystem::path& filename) {
         return Settings();
     }
 
-    std::ifstream f(filename);
     std::stringstream buffer;
-    buffer << f.rdbuf();
-    std::string contents = buffer.str();
+    {
+        const std::ifstream f = std::ifstream(filename);
+        buffer << f.rdbuf();
+    }
+    const std::string contents = buffer.str();
 
     nlohmann::json setting = nlohmann::json::parse(contents);
     if (setting.empty()) {
@@ -186,8 +188,8 @@ void saveSettings(const Settings& settings, const std::filesystem::path& filenam
         json["mrf"] = mrf;
     }
 
-    std::string content = json.dump(2);
-    std::ofstream f(filename);
+    std::ofstream f = std::ofstream(filename);
+    const std::string content = json.dump(2);
     f << content;
 }
 
diff --git a/src/events/event.cpp b/src/events/event.cpp
index b6cdf174b6..59bba16046 100644
--- a/src/events/event.cpp
+++ b/src/events/event.cpp
@@ -74,7 +74,7 @@ void log(int i, [[ maybe_unused ]] const EventProfileLoadingFinished& e) {
 
 void log(int i, const EventApplicationShutdown& e) {
     ghoul_assert(e.type == EventApplicationShutdown::Type, "Wrong type");
-    std::string t = [](EventApplicationShutdown::State state) {
+    const std::string t = [](EventApplicationShutdown::State state) {
         switch (state) {
             case EventApplicationShutdown::State::Started:  return "started";
             case EventApplicationShutdown::State::Aborted:  return "aborted";
diff --git a/src/events/eventengine.cpp b/src/events/eventengine.cpp
index d52842b6ed..a827cbfae7 100644
--- a/src/events/eventengine.cpp
+++ b/src/events/eventengine.cpp
@@ -80,14 +80,14 @@ void EventEngine::registerEventTopic(size_t topicId, events::Event::Type type,
 {
     TopicInfo ti;
     ti.id = topicId;
-    ti.callback = callback;
+    ti.callback = std::move(callback);
 
     _eventTopics[type].push_back(ti);
 }
 
 void EventEngine::unregisterEventAction(events::Event::Type type,
                                         const std::string& identifier,
-                                        std::optional<ghoul::Dictionary> filter)
+                                        const std::optional<ghoul::Dictionary>& filter)
 {
     const auto it = _eventActions.find(type);
     if (it != _eventActions.end()) {
@@ -204,7 +204,7 @@ void EventEngine::triggerActions() const {
     while (e) {
         const auto it = _eventActions.find(e->type);
         if (it != _eventActions.end()) {
-            ghoul::Dictionary params = toParameter(*e);
+            const ghoul::Dictionary params = toParameter(*e);
             for (const ActionInfo& ai : it->second) {
                 if (ai.isEnabled &&
                     (!ai.filter.has_value() || params.isSubset(*ai.filter)))
@@ -235,7 +235,7 @@ void EventEngine::triggerTopics() const {
         const auto it = _eventTopics.find(e->type);
 
         if (it != _eventTopics.end()) {
-            ghoul::Dictionary params = toParameter(*e);
+            const ghoul::Dictionary params = toParameter(*e);
             for (const TopicInfo& ti : it->second) {
                 ti.callback(params);
             }
diff --git a/src/interaction/actionmanager.cpp b/src/interaction/actionmanager.cpp
index 608ce69005..becc063264 100644
--- a/src/interaction/actionmanager.cpp
+++ b/src/interaction/actionmanager.cpp
@@ -101,14 +101,14 @@ void ActionManager::triggerAction(const std::string& identifier,
 
     if (!shouldBeSynchronized || a.isLocal) {
         global::scriptEngine->queueScript(
-            script,
+            std::move(script),
             scripting::ScriptEngine::ShouldBeSynchronized::No,
             scripting::ScriptEngine::ShouldSendToRemote::No
         );
     }
     else {
         global::scriptEngine->queueScript(
-            script,
+            std::move(script),
             scripting::ScriptEngine::ShouldBeSynchronized::Yes,
             scripting::ScriptEngine::ShouldSendToRemote::Yes
         );
diff --git a/src/interaction/camerainteractionstates.cpp b/src/interaction/camerainteractionstates.cpp
index 428d07a6d8..c0118d664a 100644
--- a/src/interaction/camerainteractionstates.cpp
+++ b/src/interaction/camerainteractionstates.cpp
@@ -84,7 +84,7 @@ void CameraInteractionStates::resetVelocities() {
     _globalRollState.velocity.setHard({ 0.0, 0.0 });
 }
 
-bool CameraInteractionStates::hasNonZeroVelocities(bool checkOnlyMovement) {
+bool CameraInteractionStates::hasNonZeroVelocities(bool checkOnlyMovement) const {
     glm::dvec2 sum = glm::dvec2(0.0);
     sum += globalRotationVelocity();
     sum += truckMovementVelocity();
diff --git a/src/interaction/joystickcamerastates.cpp b/src/interaction/joystickcamerastates.cpp
index b8d34f2278..66f18db6b3 100644
--- a/src/interaction/joystickcamerastates.cpp
+++ b/src/interaction/joystickcamerastates.cpp
@@ -47,7 +47,7 @@ void JoystickCameraStates::updateStateFromInput(
                                            const JoystickInputStates& joystickInputStates,
                                                 double deltaTime)
 {
-    OpenSpaceEngine::Mode mode = global::openSpaceEngine->currentMode();
+    const OpenSpaceEngine::Mode mode = global::openSpaceEngine->currentMode();
     if (mode == OpenSpaceEngine::Mode::CameraPath ||
         mode == OpenSpaceEngine::Mode::SessionRecordingPlayback)
     {
@@ -71,7 +71,7 @@ void JoystickCameraStates::updateStateFromInput(
             continue;
         }
 
-        int nAxes = joystickInputStates.numAxes(joystickInputState.name);
+        const int nAxes = joystickInputStates.numAxes(joystickInputState.name);
         for (int i = 0;
              i < std::min(nAxes, static_cast<int>(joystick->axisMapping.size()));
              i++)
@@ -81,7 +81,7 @@ void JoystickCameraStates::updateStateFromInput(
                 continue;
             }
 
-            float rawValue = joystickInputStates.axis(joystickInputState.name, i);
+            const float rawValue = joystickInputStates.axis(joystickInputState.name, i);
             float value = rawValue;
 
             if (t.isSticky) {
@@ -162,7 +162,7 @@ void JoystickCameraStates::updateStateFromInput(
                     localRotation.second.y += value;
                     break;
                 case AxisType::Property:
-                    std::string script = fmt::format(
+                    const std::string script = fmt::format(
                         "openspace.setPropertyValue('{}', {});",
                         t.propertyUri, value
                     );
@@ -176,11 +176,11 @@ void JoystickCameraStates::updateStateFromInput(
             }
         }
 
-        int nButtons = joystickInputStates.numButtons(joystickInputState.name);
+        const int nButtons = joystickInputStates.numButtons(joystickInputState.name);
         for (int i = 0; i < nButtons; i++) {
             auto itRange = joystick->buttonMapping.equal_range(i);
             for (auto it = itRange.first; it != itRange.second; it++) {
-                bool active = global::joystickInputStates->button(
+                const bool active = global::joystickInputStates->button(
                     joystickInputState.name,
                     i,
                     it->second.action
@@ -237,7 +237,7 @@ void JoystickCameraStates::updateStateFromInput(
     }
 }
 
-void JoystickCameraStates::setAxisMapping(std::string joystickName,
+void JoystickCameraStates::setAxisMapping(const std::string& joystickName,
                                           int axis, AxisType mapping,
                                           AxisInvert shouldInvert,
                                           JoystickType joystickType,
@@ -267,7 +267,7 @@ void JoystickCameraStates::setAxisMapping(std::string joystickName,
         global::joystickInputStates->axis(joystickName, axis);
 }
 
-void JoystickCameraStates::setAxisMappingProperty(std::string joystickName,
+void JoystickCameraStates::setAxisMappingProperty(const std::string& joystickName,
                                                   int axis,
                                                   std::string propertyUri,
                                                   float min, float max,
@@ -287,7 +287,7 @@ void JoystickCameraStates::setAxisMappingProperty(std::string joystickName,
 
     joystickCameraState->axisMapping[axis].type = AxisType::Property;
     joystickCameraState->axisMapping[axis].invert = shouldInvert;
-    joystickCameraState->axisMapping[axis].propertyUri = propertyUri;
+    joystickCameraState->axisMapping[axis].propertyUri = std::move(propertyUri);
     joystickCameraState->axisMapping[axis].minValue = min;
     joystickCameraState->axisMapping[axis].maxValue = max;
     joystickCameraState->axisMapping[axis].isRemote = isRemote;
@@ -431,7 +431,7 @@ JoystickCameraStates::findOrAddJoystickCameraState(const std::string& joystickNa
     JoystickCameraState* joystick = joystickCameraState(joystickName);
     if (!joystick) {
         if (_joystickCameraStates.size() < JoystickInputStates::MaxNumJoysticks) {
-            _joystickCameraStates.push_back(JoystickCameraState());
+            _joystickCameraStates.emplace_back();
             joystick = &_joystickCameraStates.back();
             joystick->joystickName = joystickName;
         }
diff --git a/src/interaction/joystickinputstate.cpp b/src/interaction/joystickinputstate.cpp
index b79a444ec9..321b0b5f0d 100644
--- a/src/interaction/joystickinputstate.cpp
+++ b/src/interaction/joystickinputstate.cpp
@@ -44,9 +44,9 @@ int JoystickInputStates::numAxes(const std::string& joystickName) const {
         return maxNumAxes;
     }
 
-    for (auto it = begin(); it < end(); it++) {
-        if (it->name == joystickName) {
-            return it->nAxes;
+    for (const JoystickInputState& state : *this) {
+        if (state.name == joystickName) {
+            return state.nAxes;
         }
     }
     return -1;
@@ -55,19 +55,20 @@ int JoystickInputStates::numAxes(const std::string& joystickName) const {
 int JoystickInputStates::numButtons(const std::string& joystickName) const {
     if (joystickName.empty()) {
         int maxNumButtons = -1;
-        for (auto it = begin(); it < end(); it++) {
-            if (it->nButtons > maxNumButtons) {
-                maxNumButtons = it->nButtons;
+        for (const JoystickInputState& state : *this) {
+            if (state.nButtons > maxNumButtons) {
+                maxNumButtons = state.nButtons;
             }
         }
         return maxNumButtons;
     }
 
-    for (auto it = begin(); it < end(); it++) {
-        if (it->name == joystickName) {
-            return it->nButtons;
+    for (const JoystickInputState& state : *this) {
+        if (state.name == joystickName) {
+            return state.nButtons;
         }
     }
+
     return -1;
 }
 
@@ -75,7 +76,7 @@ float JoystickInputStates::axis(const std::string& joystickName, int axis) const
     ghoul_precondition(axis >= 0, "axis must be 0 or positive");
 
     if (joystickName.empty()) {
-        float res = std::accumulate(
+        const float res = std::accumulate(
             begin(),
             end(),
             0.f,
@@ -93,18 +94,13 @@ float JoystickInputStates::axis(const std::string& joystickName, int axis) const
         return res;
     }
 
-    const JoystickInputState* state = nullptr;
-    for (auto it = begin(); it < end(); it++) {
-        if (it->name == joystickName) {
-            state = &(*it);
+    for (const JoystickInputState& state : *this) {
+        if (state.name == joystickName) {
+            return state.axes[axis];
         }
     }
 
-    if (!state) {
-        return 0.f;
-    }
-
-    return state->axes[axis];
+    return 0.f;
 }
 
 bool JoystickInputStates::button(const std::string& joystickName, int button,
@@ -113,7 +109,7 @@ bool JoystickInputStates::button(const std::string& joystickName, int button,
     ghoul_precondition(button >= 0, "button must be 0 or positive");
 
     if (joystickName.empty()) {
-        bool res = std::any_of(
+        const bool res = std::any_of(
             begin(),
             end(),
             [button, action](const JoystickInputState& state) {
@@ -123,18 +119,13 @@ bool JoystickInputStates::button(const std::string& joystickName, int button,
         return res;
     }
 
-    const JoystickInputState* state = nullptr;
-    for (auto it = begin(); it < end(); it++) {
-        if (it->name == joystickName) {
-            state = &(*it);
+    for (const JoystickInputState& state : *this) {
+        if (state.name == joystickName) {
+            return state.isConnected ? (state.buttons[button] == action) : false;
         }
     }
 
-    if (!state) {
-        return false;
-    }
-
-    return state->isConnected ? (state->buttons[button] == action) : false;
+    return false;
 }
 
 } // namespace openspace::interaction
diff --git a/src/interaction/keybindingmanager.cpp b/src/interaction/keybindingmanager.cpp
index 76f8d97b1a..5409964524 100644
--- a/src/interaction/keybindingmanager.cpp
+++ b/src/interaction/keybindingmanager.cpp
@@ -38,8 +38,6 @@
 
 namespace openspace::interaction {
 
-KeybindingManager::KeybindingManager() {}
-
 void KeybindingManager::keyboardCallback(Key key, KeyModifier modifier, KeyAction action)
 {
     if (action == KeyAction::Press || action == KeyAction::Repeat) {
@@ -78,7 +76,7 @@ void KeybindingManager::bindKey(Key key, KeyModifier modifier, std::string actio
 #endif // WIN32
     ghoul_assert(!action.empty(), "Action must not be empty");
 
-    KeyWithModifier km = { key, modifier };
+    const KeyWithModifier km = { key, modifier };
     _keyLua.insert({ km, std::move(action) });
 }
 
diff --git a/src/interaction/mousecamerastates.cpp b/src/interaction/mousecamerastates.cpp
index 8b2121efcc..d74502d8af 100644
--- a/src/interaction/mousecamerastates.cpp
+++ b/src/interaction/mousecamerastates.cpp
@@ -38,32 +38,35 @@ MouseCameraStates::MouseCameraStates(double sensitivity, double velocityScaleFac
     : CameraInteractionStates(sensitivity, velocityScaleFactor)
 {}
 
-void MouseCameraStates::updateStateFromInput(const MouseInputState& mouseinputState,
-                                             const KeyboardInputState& keyboardinputState,
+void MouseCameraStates::updateStateFromInput(const MouseInputState& mouseState,
+                                             const KeyboardInputState& keyboardState,
                                              double deltaTime)
 {
-    MouseButton primary =
+    const MouseButton primary =
         _isMouseButtonInverted ? MouseButton::Button2 : MouseButton::Button1;
-    MouseButton secondary =
+    const MouseButton secondary =
         _isMouseButtonInverted ? MouseButton::Button1 : MouseButton::Button2;
 
-    glm::dvec2 mousePosition = mouseinputState.mousePosition();
+    const glm::dvec2 mousePosition = mouseState.mousePosition();
 
-    bool primaryPressed = mouseinputState.isMouseButtonPressed(primary);
-    bool secondaryPressed = mouseinputState.isMouseButtonPressed(secondary);
-    bool button3Pressed = mouseinputState.isMouseButtonPressed(MouseButton::Button3);
-    bool keyCtrlPressed = keyboardinputState.isKeyPressed(Key::LeftControl) ||
-                          keyboardinputState.isKeyPressed(Key::RightControl);
-    bool keyShiftPressed = keyboardinputState.isKeyPressed(Key::LeftShift) ||
-                           keyboardinputState.isKeyPressed(Key::RightShift);
-    bool keyAltPressed = keyboardinputState.isKeyPressed(Key::LeftAlt) ||
-                         keyboardinputState.isKeyPressed(Key::RightAlt);
+    const bool primaryPressed = mouseState.isMouseButtonPressed(primary);
+    const bool secondaryPressed = mouseState.isMouseButtonPressed(secondary);
+    const bool button3Pressed = mouseState.isMouseButtonPressed(MouseButton::Button3);
+    const bool keyCtrlPressed =
+        keyboardState.isKeyPressed(Key::LeftControl) ||
+        keyboardState.isKeyPressed(Key::RightControl);
+    const bool keyShiftPressed =
+        keyboardState.isKeyPressed(Key::LeftShift) ||
+        keyboardState.isKeyPressed(Key::RightShift);
+    const bool keyAltPressed =
+        keyboardState.isKeyPressed(Key::LeftAlt) ||
+        keyboardState.isKeyPressed(Key::RightAlt);
 
     // Update the mouse states
     if (primaryPressed && !keyShiftPressed && !keyAltPressed) {
         if (keyCtrlPressed) {
-            glm::dvec2 mousePositionDelta = _localRotationState.previousPosition -
-                                             mousePosition;
+            const glm::dvec2 mousePositionDelta =
+                _localRotationState.previousPosition - mousePosition;
             _localRotationState.velocity.set(
                 mousePositionDelta * _sensitivity,
                 deltaTime
@@ -73,8 +76,8 @@ void MouseCameraStates::updateStateFromInput(const MouseInputState& mouseinputSt
             _globalRotationState.velocity.decelerate(deltaTime);
         }
         else {
-            glm::dvec2 mousePositionDelta = _globalRotationState.previousPosition -
-                                            mousePosition;
+            const glm::dvec2 mousePositionDelta =
+                _globalRotationState.previousPosition - mousePosition;
             _globalRotationState.velocity.set(
                 mousePositionDelta * _sensitivity,
                 deltaTime
@@ -92,14 +95,14 @@ void MouseCameraStates::updateStateFromInput(const MouseInputState& mouseinputSt
         _globalRotationState.velocity.decelerate(deltaTime);
     }
     if (secondaryPressed || (keyAltPressed && primaryPressed)) {
-        glm::dvec2 mousePositionDelta = _truckMovementState.previousPosition -
-                                        mousePosition;
+        const glm::dvec2 mousePositionDelta =
+            _truckMovementState.previousPosition - mousePosition;
 
         double sensitivity = _sensitivity;
-        if (keyboardinputState.isKeyPressed(Key::Z)) {
+        if (keyboardState.isKeyPressed(Key::Z)) {
             sensitivity *= SENSITIVITY_ADJUSTMENT_INCREASE;
         }
-        else if (keyboardinputState.isKeyPressed(Key::X)) {
+        else if (keyboardState.isKeyPressed(Key::X)) {
             sensitivity *= SENSITIVITY_ADJUSTMENT_DECREASE;
         }
 
@@ -114,7 +117,7 @@ void MouseCameraStates::updateStateFromInput(const MouseInputState& mouseinputSt
     }
     if (button3Pressed || (keyShiftPressed && primaryPressed)) {
         if (keyCtrlPressed) {
-            glm::dvec2 mousePositionDelta = _localRollState.previousPosition -
+            const glm::dvec2 mousePositionDelta = _localRollState.previousPosition -
                                             mousePosition;
             _localRollState.velocity.set(
                 mousePositionDelta * _sensitivity,
@@ -125,7 +128,7 @@ void MouseCameraStates::updateStateFromInput(const MouseInputState& mouseinputSt
             _globalRollState.velocity.decelerate(deltaTime);
         }
         else {
-            glm::dvec2 mousePositionDelta = _globalRollState.previousPosition -
+            const glm::dvec2 mousePositionDelta = _globalRollState.previousPosition -
                                             mousePosition;
             _globalRollState.velocity.set(
                 mousePositionDelta * _sensitivity,
diff --git a/src/interaction/sessionrecording.cpp b/src/interaction/sessionrecording.cpp
index 057eae02c7..bd7ad87bbb 100644
--- a/src/interaction/sessionrecording.cpp
+++ b/src/interaction/sessionrecording.cpp
@@ -120,9 +120,6 @@ SessionRecording::SessionRecording(bool isGlobal)
     }
 }
 
-SessionRecording::~SessionRecording() {
-}
-
 void SessionRecording::deinitialize() {
     stopRecording();
     stopPlayback();
@@ -132,7 +129,9 @@ void SessionRecording::setRecordDataFormat(DataMode dataMode) {
     _recordingDataMode = dataMode;
 }
 
-bool SessionRecording::hasFileExtension(std::string filename, std::string extension) {
+bool SessionRecording::hasFileExtension(const std::string& filename,
+                                        const std::string& extension)
+{
     if (filename.length() <= extension.length()) {
         return false;
     }
@@ -142,12 +141,12 @@ bool SessionRecording::hasFileExtension(std::string filename, std::string extens
 }
 
 bool SessionRecording::isPath(std::string& filename) {
-    size_t unixDelimiter = filename.find("/");
-    size_t windowsDelimiter = filename.find("\\");
+    const size_t unixDelimiter = filename.find('/');
+    const size_t windowsDelimiter = filename.find('\\');
     return (unixDelimiter != std::string::npos || windowsDelimiter != std::string::npos);
 }
 
-void SessionRecording::removeTrailingPathSlashes(std::string& filename) {
+void SessionRecording::removeTrailingPathSlashes(std::string& filename) const {
     while (filename.substr(filename.length() - 1, 1) == "/") {
         filename.pop_back();
     }
@@ -219,7 +218,7 @@ bool SessionRecording::startRecording(const std::string& filename) {
         std::filesystem::create_directories(absPath("${RECORDINGS}"));
     }
 
-    bool recordingFileOK = handleRecordingFile(filename);
+    const bool recordingFileOK = handleRecordingFile(filename);
 
     if (recordingFileOK) {
         _state = SessionState::Recording;
@@ -260,17 +259,17 @@ bool SessionRecording::startRecording(const std::string& filename) {
 }
 
 void SessionRecording::recordCurrentTimePauseState() {
-    bool isPaused = global::timeManager->isPaused();
+    const bool isPaused = global::timeManager->isPaused();
     std::string initialTimePausedCommand = "openspace.time.setPause(" +
         std::string(isPaused ? "true" : "false") + ")";
-    saveScriptKeyframeToPropertiesBaseline(initialTimePausedCommand);
+    saveScriptKeyframeToPropertiesBaseline(std::move(initialTimePausedCommand));
 }
 
 void SessionRecording::recordCurrentTimeRate() {
     std::string initialTimeRateCommand = fmt::format(
         "openspace.time.setDeltaTime({})", global::timeManager->targetDeltaTime()
     );
-    saveScriptKeyframeToPropertiesBaseline(initialTimeRateCommand);
+    saveScriptKeyframeToPropertiesBaseline(std::move(initialTimeRateCommand));
 }
 
 void SessionRecording::stopRecording() {
@@ -300,8 +299,8 @@ void SessionRecording::stopRecording() {
                         std::move(kf.position),
                         std::move(kf.rotation),
                         std::move(kf.focusNode),
-                        std::move(kf.followFocusNodeRotation),
-                        std::move(kf.scale)
+                        kf.followFocusNodeRotation,
+                        kf.scale
                     );
                     saveSingleKeyframeCamera(
                         kfMsg,
@@ -390,7 +389,7 @@ bool SessionRecording::startPlayback(std::string& filename,
     // Open in ASCII first
     _playbackFile.open(_playbackFilename, std::ifstream::in);
     // Read header
-    std::string readBackHeaderString = readHeaderElement(
+    const std::string readBackHeaderString = readHeaderElement(
         _playbackFile,
         FileHeaderTitle.length()
     );
@@ -419,7 +418,7 @@ bool SessionRecording::startPlayback(std::string& filename,
         // past the header, version, and data type
         _playbackFile.close();
         _playbackFile.open(_playbackFilename, std::ifstream::in | std::ios::binary);
-        size_t headerSize = FileHeaderTitle.length() + FileHeaderVersionLength
+        const size_t headerSize = FileHeaderTitle.length() + FileHeaderVersionLength
             + sizeof(DataFormatBinaryTag) + sizeof('\n');
         std::vector<char> hBuffer;
         hBuffer.resize(headerSize);
@@ -456,7 +455,7 @@ bool SessionRecording::startPlayback(std::string& filename,
         return false;
     }
 
-    bool canTriggerPlayback = global::openSpaceEngine->setMode(
+    const bool canTriggerPlayback = global::openSpaceEngine->setMode(
         OpenSpaceEngine::Mode::SessionRecordingPlayback
     );
 
@@ -512,7 +511,7 @@ bool SessionRecording::initializePlayback_timeline() {
         return false;
     }
     if (_playbackForceSimTimeAtStart) {
-        Timestamps times = _timeline[_idxTimeline_cameraFirstInTimeline].t3stamps;
+        const Timestamps times = _timeline[_idxTimeline_cameraFirstInTimeline].t3stamps;
         global::timeManager->setTimeNextFrame(Time(times.timeSim));
         _saveRenderingCurrentRecordedTime = times.timeRec;
     }
@@ -640,9 +639,9 @@ void SessionRecording::cleanUpPlayback() {
     ghoul_assert(camera != nullptr, "Camera must not be nullptr");
     Scene* scene = camera->parent()->scene();
     if (!_timeline.empty()) {
-        unsigned int p =
+        const unsigned int p =
             _timeline[_idxTimeline_cameraPtrPrev].idxIntoKeyframeTypeArray;
-        if (_keyframesCamera.size() > 0) {
+        if (!_keyframesCamera.empty()) {
             const SceneGraphNode* n = scene->sceneGraphNode(
                 _keyframesCamera[p].focusNode
             );
@@ -728,7 +727,7 @@ void SessionRecording::saveStringToFile(const std::string& s,
                                         std::ofstream& file)
 {
     size_t strLen = s.size();
-    size_t writeSize_bytes = sizeof(size_t);
+    const size_t writeSize_bytes = sizeof(size_t);
 
     idx = 0;
     unsigned char const *p = reinterpret_cast<unsigned char const*>(&strLen);
@@ -740,18 +739,18 @@ void SessionRecording::saveStringToFile(const std::string& s,
 }
 
 bool SessionRecording::hasCameraChangedFromPrev(
-                                             datamessagestructures::CameraKeyframe kfNew)
+                                       const datamessagestructures::CameraKeyframe& kfNew)
 {
     constexpr double threshold = 1e-2;
     bool hasChanged = false;
 
-    glm::dvec3 positionDiff = kfNew._position - _prevRecordedCameraKeyframe._position;
-    if (glm::length(positionDiff) > threshold) {
+    const glm::dvec3 position = kfNew._position - _prevRecordedCameraKeyframe._position;
+    if (glm::length(position) > threshold) {
         hasChanged = true;
     }
 
-    double rotationDiff = dot(kfNew._rotation, _prevRecordedCameraKeyframe._rotation);
-    if (std::abs(rotationDiff - 1.0) > threshold) {
+    const double rotation = dot(kfNew._rotation, _prevRecordedCameraKeyframe._rotation);
+    if (std::abs(rotation - 1.0) > threshold) {
         hasChanged = true;
     }
 
@@ -759,10 +758,12 @@ bool SessionRecording::hasCameraChangedFromPrev(
     return hasChanged;
 }
 
-SessionRecording::Timestamps SessionRecording::generateCurrentTimestamp3(double kfTime) {
+SessionRecording::Timestamps SessionRecording::generateCurrentTimestamp3(
+                                                                double keyframeTime) const
+{
     return {
-        kfTime,
-        kfTime - _timestampRecordStarted,
+        keyframeTime,
+        keyframeTime - _timestampRecordStarted,
         global::timeManager->time().j2000Seconds()
     };
 }
@@ -780,7 +781,7 @@ void SessionRecording::saveCameraKeyframeToTimeline() {
 
     Timestamps times = generateCurrentTimestamp3(kf._timestamp);
     interaction::KeyframeNavigator::CameraPose pbFrame(std::move(kf));
-    addKeyframe(times, pbFrame, _recordingEntryNum++);
+    addKeyframe(std::move(times), std::move(pbFrame), _recordingEntryNum++);
 }
 
 void SessionRecording::saveHeaderBinary(Timestamps& times,
@@ -825,7 +826,7 @@ void SessionRecording::saveCameraKeyframeAscii(Timestamps& times,
 {
     if (_addModelMatrixinAscii) {
         SceneGraphNode* node = sceneGraphNode(kf._focusNode);
-        glm::dmat4 modelTransform = node->modelTransform();
+        const glm::dmat4 modelTransform = node->modelTransform();
 
         file << HeaderCommentAscii << ' ' << ghoul::to_string(modelTransform) << '\n';
     }
@@ -838,11 +839,11 @@ void SessionRecording::saveCameraKeyframeAscii(Timestamps& times,
 
 void SessionRecording::saveTimeKeyframeToTimeline() {
     // Create a time keyframe, then call to populate it with current time props
-    datamessagestructures::TimeKeyframe kf =
+    const datamessagestructures::TimeKeyframe kf =
         datamessagestructures::generateTimeKeyframe();
 
     Timestamps times = generateCurrentTimestamp3(kf._timestamp);
-    addKeyframe(times, kf, _recordingEntryNum++);
+    addKeyframe(std::move(times), kf, _recordingEntryNum++);
 }
 
 void SessionRecording::saveTimeKeyframeBinary(Timestamps& times,
@@ -869,33 +870,28 @@ void SessionRecording::saveTimeKeyframeAscii(Timestamps& times,
 }
 
 void SessionRecording::saveScriptKeyframeToTimeline(std::string script) {
-    if (doesStartWithSubstring(script, scriptReturnPrefix)) {
+    if (script.starts_with(scriptReturnPrefix)) {
         script = script.substr(scriptReturnPrefix.length());
     }
-    for (std::string reject : _scriptRejects) {
-        if (doesStartWithSubstring(script, reject)) {
+    for (const std::string& reject : _scriptRejects) {
+        if (script.starts_with(reject)) {
             return;
         }
     }
     trimCommandsFromScriptIfFound(script);
     replaceCommandsFromScriptIfFound(script);
-    datamessagestructures::ScriptMessage sm
+    const datamessagestructures::ScriptMessage sm
         = datamessagestructures::generateScriptMessage(script);
 
     Timestamps times = generateCurrentTimestamp3(sm._timestamp);
-    addKeyframe(times, sm._script, _playbackLineNum);
-}
-
-bool SessionRecording::doesStartWithSubstring(const std::string& s,
-                                              const std::string& matchSubstr)
-{
-    return s.substr(0, matchSubstr.length()) == matchSubstr;
+    addKeyframe(std::move(times), sm._script, _playbackLineNum);
 }
 
 void SessionRecording::saveScriptKeyframeToPropertiesBaseline(std::string script) {
-    Timestamps times =
-        generateCurrentTimestamp3(global::windowDelegate->applicationTime());
-    size_t indexIntoScriptKeyframesFromMainTimeline =
+    const Timestamps times = generateCurrentTimestamp3(
+        global::windowDelegate->applicationTime()
+    );
+    const size_t indexIntoScriptKeyframesFromMainTimeline =
         _keyframesSavePropertiesBaseline_scripts.size();
     _keyframesSavePropertiesBaseline_scripts.push_back(std::move(script));
     addKeyframeToTimeline(
@@ -908,7 +904,7 @@ void SessionRecording::saveScriptKeyframeToPropertiesBaseline(std::string script
 }
 
 void SessionRecording::trimCommandsFromScriptIfFound(std::string& script) {
-    for (std::string trimSnippet : _scriptsToBeTrimmed) {
+    for (const std::string& trimSnippet : _scriptsToBeTrimmed) {
         auto findIdx = script.find(trimSnippet);
         if (findIdx != std::string::npos) {
             auto findClosingParens = script.find_first_of(')', findIdx);
@@ -918,7 +914,7 @@ void SessionRecording::trimCommandsFromScriptIfFound(std::string& script) {
 }
 
 void SessionRecording::replaceCommandsFromScriptIfFound(std::string& script) {
-    for (ScriptSubstringReplace replacementSnippet : _scriptsToBeReplaced) {
+    for (const ScriptSubstringReplace& replacementSnippet : _scriptsToBeReplaced) {
         auto findIdx = script.find(replacementSnippet.substringFound);
         if (findIdx != std::string::npos) {
             script.erase(findIdx, replacementSnippet.substringFound.length());
@@ -950,24 +946,24 @@ void SessionRecording::saveScriptKeyframeAscii(Timestamps& times,
     // Erase all \r (from windows newline), and all \n from line endings and replace with
     // ';' so that lua will treat them as separate lines. This is done in order to treat
     // a multi-line script as a single line in the file.
-    size_t startPos = sm._script.find("\r", 0);
+    size_t startPos = sm._script.find('\r', 0);
     while (startPos != std::string::npos) {
         sm._script.erase(startPos, 1);
-        startPos = sm._script.find("\r", startPos);
+        startPos = sm._script.find('\r', startPos);
     }
-    startPos = sm._script.find("\n", 0);
+    startPos = sm._script.find('\n', 0);
     while (startPos != std::string::npos) {
         sm._script.replace(startPos, 1, ";");
-        startPos = sm._script.find("\n", startPos);
+        startPos = sm._script.find('\n', startPos);
     }
     sm.write(keyframeLine);
     saveKeyframeToFile(keyframeLine.str(), file);
 }
 
 void SessionRecording::savePropertyBaseline(properties::Property& prop) {
-    std::string propIdentifier = prop.fullyQualifiedIdentifier();
+    const std::string propIdentifier = prop.fullyQualifiedIdentifier();
     if (isPropertyAllowedForBaseline(propIdentifier)) {
-        bool isPropAlreadySaved = (
+        const bool isPropAlreadySaved = (
             std::find(
                 _propertyBaselinesSaved.begin(),
                 _propertyBaselinesSaved.end(),
@@ -976,7 +972,7 @@ void SessionRecording::savePropertyBaseline(properties::Property& prop) {
             != _propertyBaselinesSaved.end()
             );
         if (!isPropAlreadySaved) {
-            std::string initialScriptCommand = fmt::format(
+            const std::string initialScriptCommand = fmt::format(
                 "openspace.setPropertyValueSingle(\"{}\", {})",
                 propIdentifier, prop.stringValue()
             );
@@ -987,8 +983,8 @@ void SessionRecording::savePropertyBaseline(properties::Property& prop) {
 }
 
 bool SessionRecording::isPropertyAllowedForBaseline(const std::string& propString) {
-    for (std::string reject : _propertyBaselineRejects) {
-        if (doesStartWithSubstring(propString, reject)) {
+    for (const std::string& reject : _propertyBaselineRejects) {
+        if (propString.starts_with(reject)) {
             return false;
         }
     }
@@ -1035,15 +1031,15 @@ void SessionRecording::render() {
 
     constexpr std::string_view FontName = "Mono";
     constexpr float FontSizeFrameinfo = 32.f;
-    std::shared_ptr<ghoul::fontrendering::Font> font =
+    const std::shared_ptr<ghoul::fontrendering::Font> font =
         global::fontManager->font(FontName, FontSizeFrameinfo);
 
-    glm::vec2 res = global::renderEngine->fontResolution();
+    const glm::vec2 res = global::renderEngine->fontResolution();
     glm::vec2 penPosition = glm::vec2(
         res.x / 2 - 150.f,
         res.y / 4
     );
-    std::string text1 = std::to_string(currentTime());
+    const std::string text1 = std::to_string(currentTime());
     ghoul::fontrendering::RenderFont(
         *font,
         penPosition,
@@ -1051,7 +1047,7 @@ void SessionRecording::render() {
         glm::vec4(1.f),
         ghoul::fontrendering::CrDirection::Down
     );
-    std::string text2 = fmt::format(
+    const std::string text2 = fmt::format(
         "Scale: {}", global::navigationHandler->camera()->scaling()
     );
     ghoul::fontrendering::RenderFont(*font, penPosition, text2, glm::vec4(1.f));
@@ -1251,7 +1247,7 @@ bool SessionRecording::playbackCamera() {
         _playbackLineNum
     );
 
-    interaction::KeyframeNavigator::CameraPose pbFrame(std::move(kf));
+    const interaction::KeyframeNavigator::CameraPose pbFrame(std::move(kf));
     if (success) {
         success = addKeyframe(
             {times.timeOs, times.timeRec, times.timeSim},
@@ -1269,7 +1265,7 @@ bool SessionRecording::convertCamera(std::stringstream& inStream, DataMode mode,
     Timestamps times;
     datamessagestructures::CameraKeyframe kf;
 
-    bool success = readSingleKeyframeCamera(
+    const bool success = readSingleKeyframeCamera(
         kf,
         times,
         mode,
@@ -1353,13 +1349,11 @@ bool SessionRecording::readCameraKeyframeBinary(Timestamps& times,
 
 bool SessionRecording::readCameraKeyframeAscii(Timestamps& times,
                                                datamessagestructures::CameraKeyframe& kf,
-                                               std::string currentParsingLine,
+                                               const std::string& currentParsingLine,
                                                int lineN)
 {
-    std::string rotationFollowing;
+    std::istringstream iss = std::istringstream(currentParsingLine);
     std::string entryType;
-
-    std::istringstream iss(currentParsingLine);
     iss >> entryType;
     iss >> times.timeOs >> times.timeRec >> times.timeSim;
     kf.read(iss);
@@ -1404,7 +1398,7 @@ bool SessionRecording::convertTimeChange(std::stringstream& inStream, DataMode m
     Timestamps times;
     datamessagestructures::TimeKeyframe kf;
 
-    bool success = readSingleKeyframeTime(
+    const bool success = readSingleKeyframeTime(
         kf,
         times,
         mode,
@@ -1484,7 +1478,7 @@ bool SessionRecording::readTimeKeyframeBinary(Timestamps& times,
 
 bool SessionRecording::readTimeKeyframeAscii(Timestamps& times,
                                              datamessagestructures::TimeKeyframe& kf,
-                                             std::string currentParsingLine,
+                                             const std::string& currentParsingLine,
                                              int lineN)
 {
     std::string entryType;
@@ -1504,18 +1498,18 @@ bool SessionRecording::readTimeKeyframeAscii(Timestamps& times,
 }
 
 std::string SessionRecording::readHeaderElement(std::ifstream& stream,
-                                                size_t readLen_chars)
+                                                size_t readLenChars)
 {
-    std::vector<char> readTemp(readLen_chars);
-    stream.read(&readTemp[0], readLen_chars);
+    std::vector<char> readTemp(readLenChars);
+    stream.read(readTemp.data(), readLenChars);
     return std::string(readTemp.begin(), readTemp.end());
 }
 
 std::string SessionRecording::readHeaderElement(std::stringstream& stream,
-                                                size_t readLen_chars)
+                                                size_t readLenChars)
 {
-    std::vector<char> readTemp(readLen_chars);
-    stream.read(&readTemp[0], readLen_chars);
+    std::vector<char> readTemp = std::vector<char>(readLenChars);
+    stream.read(readTemp.data(), readLenChars);
     return std::string(readTemp.begin(), readTemp.end());
 }
 
@@ -1545,7 +1539,7 @@ bool SessionRecording::playbackScript() {
 }
 
 void SessionRecording::populateListofLoadedSceneGraphNodes() {
-    std::vector<SceneGraphNode*> nodes =
+    const std::vector<SceneGraphNode*> nodes =
         global::renderEngine->scene()->allSceneGraphNodes();
     for (SceneGraphNode* n : nodes) {
         _loadedNodes.push_back(n->identifier());
@@ -1557,16 +1551,15 @@ void SessionRecording::checkIfScriptUsesScenegraphNode(std::string s) {
         s.erase(0, scriptReturnPrefix.length());
     }
     // This works for both setPropertyValue and setPropertyValueSingle
-    bool containsSetPropertyVal = (s.rfind("openspace.setPropertyValue", 0) == 0);
-    bool containsParensStart = (s.find("(") != std::string::npos);
+    const bool containsSetPropertyVal = (s.rfind("openspace.setPropertyValue", 0) == 0);
+    const bool containsParensStart = (s.find('(') != std::string::npos);
     if (containsSetPropertyVal && containsParensStart) {
-        std::string subjectOfSetProp = isolateTermFromQuotes(s.substr(s.find("(") + 1));
+        std::string subjectOfSetProp = isolateTermFromQuotes(s.substr(s.find('(') + 1));
         if (checkForScenegraphNodeAccessNav(subjectOfSetProp)) {
-            size_t commaPos = s.find(",");
+            const size_t commaPos = s.find(',');
             std::string navNode = isolateTermFromQuotes(s.substr(commaPos + 1));
             if (navNode != "nil") {
-                std::vector<std::string>::iterator it =
-                    std::find(_loadedNodes.begin(), _loadedNodes.end(), navNode);
+                auto it = std::find(_loadedNodes.begin(), _loadedNodes.end(), navNode);
                 if (it == _loadedNodes.end()) {
                     LWARNING(fmt::format(
                         "Playback file contains a property setting of navigation using "
@@ -1578,7 +1571,7 @@ void SessionRecording::checkIfScriptUsesScenegraphNode(std::string s) {
         else if (checkForScenegraphNodeAccessScene(subjectOfSetProp)) {
             std::string found = extractScenegraphNodeFromScene(subjectOfSetProp);
             if (!found.empty()) {
-                std::vector<properties::Property*> matchHits =
+                const std::vector<properties::Property*> matchHits =
                     global::renderEngine->scene()->propertiesMatchingRegex(
                         subjectOfSetProp
                     );
@@ -1593,17 +1586,17 @@ void SessionRecording::checkIfScriptUsesScenegraphNode(std::string s) {
     }
 }
 
-bool SessionRecording::checkForScenegraphNodeAccessScene(std::string& s) {
+bool SessionRecording::checkForScenegraphNodeAccessScene(const std::string& s) {
     const std::string scene = "Scene.";
     return (s.find(scene) != std::string::npos);
 }
 
-std::string SessionRecording::extractScenegraphNodeFromScene(std::string& s) {
+std::string SessionRecording::extractScenegraphNodeFromScene(const std::string& s) {
     const std::string scene = "Scene.";
     std::string extracted;
-    size_t posScene = s.find(scene);
+    const size_t posScene = s.find(scene);
     if (posScene != std::string::npos) {
-        size_t posDot = s.find(".", posScene + scene.length() + 1);
+        const size_t posDot = s.find('.', posScene + scene.length() + 1);
         if (posDot > posScene && posDot != std::string::npos) {
             extracted = s.substr(posScene + scene.length(), posDot -
                 (posScene + scene.length()));
@@ -1614,9 +1607,9 @@ std::string SessionRecording::extractScenegraphNodeFromScene(std::string& s) {
 
 bool SessionRecording::checkForScenegraphNodeAccessNav(std::string& navTerm) {
     const std::string nextTerm = "NavigationHandler.OrbitalNavigator.";
-    size_t posNav = navTerm.find(nextTerm);
+    const size_t posNav = navTerm.find(nextTerm);
     if (posNav != std::string::npos) {
-        for (std::string accessName : _navScriptsUsingNodes) {
+        for (const std::string& accessName : _navScriptsUsingNodes) {
               if (navTerm.find(accessName) != std::string::npos) {
                   return true;
               }
@@ -1634,14 +1627,14 @@ std::string SessionRecording::isolateTermFromQuotes(std::string s) {
     while (possibleQuotes.find(s.front()) != std::string::npos) {
         s.erase(0, 1);
     }
-    for (char q : possibleQuotes) {
+    for (const char q : possibleQuotes) {
         if (s.find(q) != std::string::npos) {
             s = s.substr(0, s.find(q));
             return s;
         }
     }
     //If no quotes found, remove other possible characters from end
-    std::string unwantedChars = " );";
+    const std::string unwantedChars = " );";
     while (!s.empty() && (unwantedChars.find(s.back()) != std::string::npos)) {
         s.pop_back();
     }
@@ -1654,10 +1647,10 @@ void SessionRecording::eraseSpacesFromString(std::string& s) {
 
 std::string SessionRecording::getNameFromSurroundingQuotes(std::string& s) {
     std::string result;
-    char quote = s.at(0);
+    const char quote = s.at(0);
     // Handle either ' or " marks
     if (quote == '\'' || quote == '\"') {
-        size_t quoteCount = std::count(s.begin(), s.end(), quote);
+        const size_t quoteCount = std::count(s.begin(), s.end(), quote);
         // Must be an opening and closing quote char
         if (quoteCount == 2) {
             result = s.substr(1, s.rfind(quote) - 1);
@@ -1666,18 +1659,20 @@ std::string SessionRecording::getNameFromSurroundingQuotes(std::string& s) {
     return result;
 }
 
-bool SessionRecording::checkIfInitialFocusNodeIsLoaded(unsigned int camIdx1) {
-    if (_keyframesCamera.size() > 0) {
-        std::string startFocusNode
-            = _keyframesCamera[_timeline[camIdx1].idxIntoKeyframeTypeArray].focusNode;
-        auto it = std::find(_loadedNodes.begin(), _loadedNodes.end(), startFocusNode);
-        if (it == _loadedNodes.end()) {
-            LERROR(fmt::format(
-                "Playback file requires scenegraph node '{}', which is "
-                "not currently loaded", startFocusNode
-            ));
-            return false;
-        }
+bool SessionRecording::checkIfInitialFocusNodeIsLoaded(unsigned int firstCamIndex) {
+    if (_keyframesCamera.empty()) {
+        return true;
+    }
+
+    std::string startFocusNode =
+        _keyframesCamera[_timeline[firstCamIndex].idxIntoKeyframeTypeArray].focusNode;
+    auto it = std::find(_loadedNodes.begin(), _loadedNodes.end(), startFocusNode);
+    if (it == _loadedNodes.end()) {
+        LERROR(fmt::format(
+            "Playback file requires scenegraph node '{}', which is "
+            "not currently loaded", startFocusNode
+        ));
+        return false;
     }
     return true;
 }
@@ -1690,7 +1685,7 @@ bool SessionRecording::convertScript(std::stringstream& inStream, DataMode mode,
     Timestamps times;
     datamessagestructures::ScriptMessage kf;
 
-    bool success = readSingleKeyframeScript(
+    const bool success = readSingleKeyframeScript(
         kf,
         times,
         mode,
@@ -1774,7 +1769,8 @@ bool SessionRecording::readScriptKeyframeBinary(Timestamps& times,
 
 bool SessionRecording::readScriptKeyframeAscii(Timestamps& times,
                                                datamessagestructures::ScriptMessage& kf,
-                                               std::string currentParsingLine, int lineN)
+                                               const std::string& currentParsingLine,
+                                               int lineN)
 {
     std::string entryType;
     std::istringstream iss(currentParsingLine);
@@ -1819,7 +1815,7 @@ bool SessionRecording::addKeyframe(Timestamps t3stamps,
                                    interaction::KeyframeNavigator::CameraPose keyframe,
                                    int lineNum)
 {
-    size_t indexIntoCameraKeyframesFromMainTimeline = _keyframesCamera.size();
+    const size_t indexIntoCameraKeyframesFromMainTimeline = _keyframesCamera.size();
     _keyframesCamera.push_back(std::move(keyframe));
     return addKeyframeToTimeline(
         _timeline,
@@ -1834,7 +1830,7 @@ bool SessionRecording::addKeyframe(Timestamps t3stamps,
                                    datamessagestructures::TimeKeyframe keyframe,
                                    int lineNum)
 {
-    size_t indexIntoTimeKeyframesFromMainTimeline = _keyframesTime.size();
+    const size_t indexIntoTimeKeyframesFromMainTimeline = _keyframesTime.size();
     _keyframesTime.push_back(std::move(keyframe));
     return addKeyframeToTimeline(
         _timeline,
@@ -1849,7 +1845,7 @@ bool SessionRecording::addKeyframe(Timestamps t3stamps,
                                    std::string scriptToQueue,
                                    int lineNum)
 {
-    size_t indexIntoScriptKeyframesFromMainTimeline = _keyframesScript.size();
+    const size_t indexIntoScriptKeyframesFromMainTimeline = _keyframesScript.size();
     _keyframesScript.push_back(std::move(scriptToQueue));
     return addKeyframeToTimeline(
         _timeline,
@@ -1863,14 +1859,14 @@ bool SessionRecording::addKeyframe(Timestamps t3stamps,
 void SessionRecording::moveAheadInTime() {
     using namespace std::chrono;
 
-    bool playbackPaused = (_state == SessionState::PlaybackPaused);
+    const bool playbackPaused = (_state == SessionState::PlaybackPaused);
     if (playbackPaused) {
         _playbackPauseOffset
             += global::windowDelegate->applicationTime() - _previousTime;
     }
     _previousTime = global::windowDelegate->applicationTime();
 
-    double currTime = currentTime();
+    const double currTime = currentTime();
     lookForNonCameraKeyframesThatHaveComeDue(currTime);
     updateCameraWithOrWithoutNewKeyframes(currTime);
     // Unfortunately the first frame is sometimes rendered because globebrowsing reports
@@ -1922,12 +1918,11 @@ void SessionRecording::updateCameraWithOrWithoutNewKeyframes(double currTime) {
         return;
     }
 
-    bool didFindFutureCameraKeyframes = findNextFutureCameraIndex(currTime);
-
-    bool isPrevAtFirstKeyframe = (_idxTimeline_cameraPtrPrev ==
-                                  _idxTimeline_cameraFirstInTimeline);
-    bool isFirstTimelineCameraKeyframeInFuture = (currTime <
-                                                  _cameraFirstInTimeline_timestamp);
+    const bool didFindFutureCameraKeyframes = findNextFutureCameraIndex(currTime);
+    const bool isPrevAtFirstKeyframe =
+        (_idxTimeline_cameraPtrPrev == _idxTimeline_cameraFirstInTimeline);
+    const bool isFirstTimelineCameraKeyframeInFuture =
+        (currTime < _cameraFirstInTimeline_timestamp);
 
     if (! (isPrevAtFirstKeyframe && isFirstTimelineCameraKeyframeInFuture)) {
         processCameraKeyframe(currTime);
@@ -1938,8 +1933,8 @@ void SessionRecording::updateCameraWithOrWithoutNewKeyframes(double currTime) {
 }
 
 bool SessionRecording::isTimeToHandleNextNonCameraKeyframe(double currTime) {
-    bool isNonCameraPlaybackActive = (_playbackActive_time || _playbackActive_script);
-    return (currTime > getNextTimestamp()) && isNonCameraPlaybackActive;
+    const bool nonCameraPlaybackActive = (_playbackActive_time || _playbackActive_script);
+    return (currTime > getNextTimestamp()) && nonCameraPlaybackActive;
 }
 
 bool SessionRecording::findNextFutureCameraIndex(double currTime) {
@@ -1951,9 +1946,9 @@ bool SessionRecording::findNextFutureCameraIndex(double currTime) {
         }
 
         if (doesTimelineEntryContainCamera(seekAheadIndex)) {
-            unsigned int indexIntoCameraKeyframes =
+            const unsigned int indexIntoCameraKeyframes =
                 _timeline[seekAheadIndex].idxIntoKeyframeTypeArray;
-            double seekAheadKeyframeTimestamp
+            const double seekAheadKeyframeTimestamp
                 = appropriateTimestamp(_timeline[seekAheadIndex].t3stamps);
 
             if (indexIntoCameraKeyframes >= (_keyframesCamera.size() - 1)) {
@@ -1973,7 +1968,7 @@ bool SessionRecording::findNextFutureCameraIndex(double currTime) {
             }
         }
 
-        double interpolationUpperBoundTimestamp =
+        const double interpolationUpperBoundTimestamp =
             appropriateTimestamp(_timeline[_idxTimeline_cameraPtrNext].t3stamps);
         if ((currTime > interpolationUpperBoundTimestamp) && _hasHitEndOfCameraKeyframes)
         {
@@ -2033,8 +2028,8 @@ bool SessionRecording::processCameraKeyframe(double now) {
     interaction::KeyframeNavigator::CameraPose nextPose;
     interaction::KeyframeNavigator::CameraPose prevPose;
 
-    unsigned int prevIdx;
-    unsigned int nextIdx;
+    unsigned int prevIdx = 0;
+    unsigned int nextIdx = 0;
     if (!_playbackActive_camera) {
         return false;
     }
@@ -2049,19 +2044,16 @@ bool SessionRecording::processCameraKeyframe(double now) {
     }
 
     // getPrevTimestamp();
-    double prevTime = appropriateTimestamp(
+    const double prevTime = appropriateTimestamp(
         _timeline[_idxTimeline_cameraPtrPrev].t3stamps
     );
     // getNextTimestamp();
-    double nextTime = appropriateTimestamp(
+    const double nextTime = appropriateTimestamp(
         _timeline[_idxTimeline_cameraPtrNext].t3stamps
     );
 
-    double t;
-    if ((nextTime - prevTime) < 1e-7) {
-        t = 0;
-    }
-    else {
+    double t = 0.0;
+    if ((nextTime - prevTime) >= 1e-7) {
         t = (now - prevTime) / (nextTime - prevTime);
     }
 
@@ -2098,7 +2090,7 @@ bool SessionRecording::processScriptKeyframe() {
         return false;
     }
     else {
-        std::string nextScript = nextKeyframeObj(
+        const std::string nextScript = nextKeyframeObj(
             _idxScript,
             _keyframesScript,
             ([this]() { signalPlaybackFinishedForComponent(RecordedType::Script); })
@@ -2176,14 +2168,14 @@ void SessionRecording::saveKeyframeToFileBinary(unsigned char* buffer,
     file.write(reinterpret_cast<char*>(buffer), size);
 }
 
-void SessionRecording::saveKeyframeToFile(std::string entry, std::ofstream& file) {
-    file << std::move(entry) << std::endl;
+void SessionRecording::saveKeyframeToFile(const std::string& entry, std::ofstream& file) {
+    file << entry << '\n';
 }
 
 SessionRecording::CallbackHandle SessionRecording::addStateChangeCallback(
                                                                    StateChangeCallback cb)
 {
-    CallbackHandle handle = _nextCallbackHandle++;
+    const CallbackHandle handle = _nextCallbackHandle++;
     _stateChangeCallbacks.emplace_back(handle, std::move(cb));
     return handle;
 }
@@ -2222,7 +2214,7 @@ std::vector<std::string> SessionRecording::playbackList() const {
             DWORD attributes = GetFileAttributes(e.path().string().c_str());
             bool isHidden = attributes & FILE_ATTRIBUTE_HIDDEN;
 #else
-            bool isHidden = filename.find(".") == 0;
+            const bool isHidden = filename.find('.') == 0;
 #endif // WIN32
             if (!isHidden) {
                 // Don't add hidden files
@@ -2238,7 +2230,7 @@ void SessionRecording::readPlaybackHeader_stream(std::stringstream& conversionIn
                                                  std::string& version, DataMode& mode)
 {
     // Read header
-    std::string readBackHeaderString = readHeaderElement(
+    const std::string readBackHeaderString = readHeaderElement(
         conversionInStream,
         FileHeaderTitle.length()
     );
@@ -2261,13 +2253,15 @@ void SessionRecording::readPlaybackHeader_stream(std::stringstream& conversionIn
     readHeaderElement(conversionInStream, 1);
 }
 
-SessionRecording::DataMode SessionRecording::readModeFromHeader(std::string filename) {
-    DataMode mode;
+SessionRecording::DataMode SessionRecording::readModeFromHeader(
+                                                              const std::string& filename)
+{
+    DataMode mode = DataMode::Unknown;
     std::ifstream inputFile;
     // Open in ASCII first
     inputFile.open(filename, std::ifstream::in);
     // Read header
-    std::string readBackHeaderString = readHeaderElement(
+    const std::string readBackHeaderString = readHeaderElement(
         inputFile,
         FileHeaderTitle.length()
     );
@@ -2300,7 +2294,7 @@ void SessionRecording::readFileIntoStringStream(std::string filename,
         ));
     }
 
-    DataMode mode = readModeFromHeader(conversionInFilename.string());
+    const DataMode mode = readModeFromHeader(conversionInFilename.string());
 
     stream.str("");
     stream.clear();
@@ -2321,7 +2315,8 @@ void SessionRecording::readFileIntoStringStream(std::string filename,
 }
 
 void SessionRecording::convertFileRelativePath(std::string filenameRelative) {
-    convertFile(absPath(filenameRelative).string());
+    const std::filesystem::path path = absPath(std::move(filenameRelative));
+    convertFile(path.string());
 }
 
 std::string SessionRecording::convertFile(std::string filename, int depth) {
@@ -2335,14 +2330,14 @@ std::string SessionRecording::convertFile(std::string filename, int depth) {
     std::string newFilename = filename;
     try {
         readFileIntoStringStream(filename, conversionInFile, conversionInStream);
-        DataMode mode;
+        DataMode mode = DataMode::Unknown;
         std::string fileVersion;
         readPlaybackHeader_stream(
             conversionInStream,
             fileVersion,
             mode
         );
-        int conversionLineNum = 1;
+        const int conversionLineNum = 1;
 
         // If this instance of the SessionRecording class isn't the instance with the
         // correct version of the file to be converted, then call getLegacy() to recurse
@@ -2554,7 +2549,7 @@ bool SessionRecording::convertEntries(std::string& inFilename,
 
 std::string SessionRecording::getLegacyConversionResult(std::string filename, int depth) {
     SessionRecording_legacy_0085 legacy;
-    return legacy.convertFile(filename, depth);
+    return legacy.convertFile(std::move(filename), depth);
 }
 
 std::string SessionRecording_legacy_0085::getLegacyConversionResult(std::string filename,
@@ -2579,15 +2574,15 @@ std::string SessionRecording::targetFileFormatVersion() {
     return std::string(FileHeaderVersion);
 }
 
-std::string SessionRecording::determineConversionOutFilename(const std::string filename,
+std::string SessionRecording::determineConversionOutFilename(const std::string& filename,
                                                              DataMode mode)
 {
     std::string filenameSansExtension = filename;
-    std::string fileExtension = (mode == DataMode::Binary) ?
+    const std::string fileExtension = (mode == DataMode::Binary) ?
         FileExtensionBinary : FileExtensionAscii;
 
-    if (filename.find_last_of(".") != std::string::npos) {
-        filenameSansExtension = filename.substr(0, filename.find_last_of("."));
+    if (filename.find_last_of('.') != std::string::npos) {
+        filenameSansExtension = filename.substr(0, filename.find_last_of('.'));
     }
     filenameSansExtension += "_" + fileFormatVersion() + "-" + targetFileFormatVersion();
     return filenameSansExtension + fileExtension;
@@ -2602,7 +2597,7 @@ bool SessionRecording_legacy_0085::convertScript(std::stringstream& inStream,
     Timestamps times;
     ScriptMessage_legacy_0085 kf;
 
-    bool success = readSingleKeyframeScript(
+    const bool success = readSingleKeyframeScript(
         kf,
         times,
         mode,
diff --git a/src/interaction/tasks/convertrecfileversiontask.cpp b/src/interaction/tasks/convertrecfileversiontask.cpp
index d17a229217..48bf123ee8 100644
--- a/src/interaction/tasks/convertrecfileversiontask.cpp
+++ b/src/interaction/tasks/convertrecfileversiontask.cpp
@@ -62,9 +62,7 @@ ConvertRecFileVersionTask::ConvertRecFileVersionTask(const ghoul::Dictionary& di
 }
 
 ConvertRecFileVersionTask::~ConvertRecFileVersionTask() {
-    if (sessRec != nullptr) {
-        delete sessRec;
-    }
+    delete sessRec;
 }
 
 std::string ConvertRecFileVersionTask::description() {
@@ -80,11 +78,11 @@ void ConvertRecFileVersionTask::perform(const Task::ProgressCallback&) {
 }
 
 void ConvertRecFileVersionTask::convert() {
-    bool hasBinaryFileExtension = sessRec->hasFileExtension(
+    const bool hasBinaryFileExtension = SessionRecording::hasFileExtension(
         _inFilename,
         SessionRecording::FileExtensionBinary
     );
-    bool hasAsciiFileExtension = sessRec->hasFileExtension(
+    const bool hasAsciiFileExtension = SessionRecording::hasFileExtension(
         _inFilename,
         SessionRecording::FileExtensionAscii
     );
diff --git a/src/interaction/tasks/convertrecformattask.cpp b/src/interaction/tasks/convertrecformattask.cpp
index 09323a4515..9e6952ff53 100644
--- a/src/interaction/tasks/convertrecformattask.cpp
+++ b/src/interaction/tasks/convertrecformattask.cpp
@@ -38,6 +38,17 @@ namespace {
 
     constexpr std::string_view KeyInFilePath = "InputFilePath";
     constexpr std::string_view KeyOutFilePath = "OutputFilePath";
+
+    std::string addFileSuffix(const std::string& filePath, const std::string& suffix) {
+        const size_t lastdot = filePath.find_last_of('.');
+        const std::string extension = filePath.substr(0, lastdot);
+        if (lastdot == std::string::npos) {
+            return filePath + suffix;
+        }
+        else {
+            return filePath.substr(0, lastdot) + suffix + extension;
+        }
+    }
 } // namespace
 
 namespace openspace::interaction {
@@ -66,9 +77,7 @@ ConvertRecFormatTask::ConvertRecFormatTask(const ghoul::Dictionary& dictionary)
 ConvertRecFormatTask::~ConvertRecFormatTask() {
     _iFile.close();
     _oFile.close();
-    if (sessRec != nullptr) {
-        delete sessRec;
-    }
+    delete sessRec;
 }
 
 std::string ConvertRecFormatTask::description() {
@@ -92,7 +101,8 @@ void ConvertRecFormatTask::perform(const Task::ProgressCallback&) {
 }
 
 void ConvertRecFormatTask::convert() {
-    std::string expectedFileExtension_in, expectedFileExtension_out;
+    std::string expectedFileExtension_in;
+    std::string expectedFileExtension_out;
     std::string currentFormat;
     if (_fileFormatType == SessionRecording::DataMode::Binary) {
         currentFormat = "binary";
@@ -185,23 +195,21 @@ void ConvertRecFormatTask::determineFormatType() {
 void ConvertRecFormatTask::convertToAscii() {
     SessionRecording::Timestamps times;
     datamessagestructures::CameraKeyframe ckf;
-    datamessagestructures::TimeKeyframe   tkf;
-    datamessagestructures::ScriptMessage  skf;
+    datamessagestructures::TimeKeyframe tkf;
+    datamessagestructures::ScriptMessage skf;
     int lineNum = 1;
     _oFile.open(_outFilePath, std::ifstream::app);
-    char tmpType = SessionRecording::DataFormatAsciiTag;
+    const char tmpType = SessionRecording::DataFormatAsciiTag;
     _oFile.write(&tmpType, 1);
     _oFile.write("\n", 1);
 
-    bool fileReadOk = true;
-    while (fileReadOk) {
-        unsigned char frameType = readFromPlayback<unsigned char>(_iFile);
+    while (true) {
+        const unsigned char frameType = readFromPlayback<unsigned char>(_iFile);
         // Check if have reached EOF
         if (!_iFile) {
             LINFO(fmt::format(
                 "Finished converting {} entries from file '{}'", lineNum - 1, _inFilePath
             ));
-            fileReadOk = false;
             break;
         }
 
@@ -210,20 +218,29 @@ void ConvertRecFormatTask::convertToAscii() {
 
         if (frameType == SessionRecording::HeaderCameraBinary) {
             sessRec->readCameraKeyframeBinary(times, ckf, _iFile, lineNum);
-            sessRec->saveHeaderAscii(times, SessionRecording::HeaderCameraAscii,
-                keyframeLine);
+            SessionRecording::saveHeaderAscii(
+                times,
+                SessionRecording::HeaderCameraAscii,
+                keyframeLine
+            );
             ckf.write(keyframeLine);
         }
         else if (frameType == SessionRecording::HeaderTimeBinary) {
             sessRec->readTimeKeyframeBinary(times, tkf, _iFile, lineNum);
-            sessRec->saveHeaderAscii(times, SessionRecording::HeaderTimeAscii,
-                keyframeLine);
+            SessionRecording::saveHeaderAscii(
+                times,
+                SessionRecording::HeaderTimeAscii,
+                keyframeLine
+            );
             tkf.write(keyframeLine);
         }
         else if (frameType == SessionRecording::HeaderScriptBinary) {
             sessRec->readScriptKeyframeBinary(times, skf, _iFile, lineNum);
-            sessRec->saveHeaderAscii(times, SessionRecording::HeaderScriptAscii,
-                keyframeLine);
+            SessionRecording::saveHeaderAscii(
+                times,
+                SessionRecording::HeaderScriptAscii,
+                keyframeLine
+            );
             skf.write(keyframeLine);
         }
         else {
@@ -237,19 +254,18 @@ void ConvertRecFormatTask::convertToAscii() {
         SessionRecording::saveKeyframeToFile(keyframeLine.str(), _oFile);
         lineNum++;
     }
-    _oFile.close();
 }
 
 void ConvertRecFormatTask::convertToBinary() {
     SessionRecording::Timestamps times;
     datamessagestructures::CameraKeyframe ckf;
-    datamessagestructures::TimeKeyframe   tkf;
-    datamessagestructures::ScriptMessage  skf;
+    datamessagestructures::TimeKeyframe tkf;
+    datamessagestructures::ScriptMessage skf;
     int lineNum = 1;
     std::string lineContents;
-    unsigned char keyframeBuffer[SessionRecording::_saveBufferMaxSize_bytes];
+    std::array<unsigned char, SessionRecording::_saveBufferMaxSize_bytes> keyframeBuffer;
     _oFile.open(_outFilePath, std::ifstream::app | std::ios::binary);
-    char tmpType = SessionRecording::DataFormatBinaryTag;
+    const char tmpType = SessionRecording::DataFormatBinaryTag;
     _oFile.write(&tmpType, 1);
     _oFile.write("\n", 1);
 
@@ -267,17 +283,17 @@ void ConvertRecFormatTask::convertToBinary() {
 
         if (entryType == SessionRecording::HeaderCameraAscii) {
             sessRec->readCameraKeyframeAscii(times, ckf, lineContents, lineNum);
-            sessRec->saveCameraKeyframeBinary(times, ckf, keyframeBuffer,
+            sessRec->saveCameraKeyframeBinary(times, ckf, keyframeBuffer.data(),
             _oFile);
         }
         else if (entryType == SessionRecording::HeaderTimeAscii) {
             sessRec->readTimeKeyframeAscii(times, tkf, lineContents, lineNum);
-            sessRec->saveTimeKeyframeBinary(times, tkf, keyframeBuffer,
+            sessRec->saveTimeKeyframeBinary(times, tkf, keyframeBuffer.data(),
             _oFile);
         }
         else if (entryType == SessionRecording::HeaderScriptAscii) {
             sessRec->readScriptKeyframeAscii(times, skf, lineContents, lineNum);
-            sessRec->saveScriptKeyframeBinary(times, skf, keyframeBuffer,
+            sessRec->saveScriptKeyframeBinary(times, skf, keyframeBuffer.data(),
             _oFile);
         }
         else if (entryType.substr(0, 1) == SessionRecording::HeaderCommentAscii) {
@@ -297,19 +313,6 @@ void ConvertRecFormatTask::convertToBinary() {
     ));
 }
 
-std::string ConvertRecFormatTask::addFileSuffix(const std::string& filePath,
-                                                const std::string& suffix)
-{
-    size_t lastdot = filePath.find_last_of(".");
-    std::string extension = filePath.substr(0, lastdot);
-    if (lastdot == std::string::npos) {
-        return filePath + suffix;
-    }
-    else {
-        return filePath.substr(0, lastdot) + suffix + extension;
-    }
-}
-
 documentation::Documentation ConvertRecFormatTask::documentation() {
     using namespace documentation;
     return {
diff --git a/src/interaction/websocketcamerastates.cpp b/src/interaction/websocketcamerastates.cpp
index 2a4ab47f6e..0262cfd3ea 100644
--- a/src/interaction/websocketcamerastates.cpp
+++ b/src/interaction/websocketcamerastates.cpp
@@ -50,13 +50,13 @@ void WebsocketCameraStates::updateStateFromInput(
 
     if (!websocketInputStates.empty()) {
         for (int i = 0; i < WebsocketInputState::MaxAxes; i++) {
-            AxisInformation t = _axisMapping[i];
+            const AxisInformation t = _axisMapping[i];
             if (t.type == AxisType::None) {
                 continue;
             }
 
             float value = websocketInputStates.axis(i);
-            bool hasValue = std::fabs(value) > t.deadzone;
+            const bool hasValue = std::fabs(value) > t.deadzone;
 
             if (!hasValue) {
                 value = 0.f;
diff --git a/src/interaction/websocketinputstate.cpp b/src/interaction/websocketinputstate.cpp
index ea07a518ee..4ea18f55b2 100644
--- a/src/interaction/websocketinputstate.cpp
+++ b/src/interaction/websocketinputstate.cpp
@@ -36,7 +36,7 @@ namespace openspace::interaction {
 float WebsocketInputStates::axis(int axis) const {
     ghoul_precondition(axis >= 0, "axis must be 0 or positive");
 
-    float res = std::accumulate(
+    const float res = std::accumulate(
         begin(),
         end(),
         0.f,
@@ -58,7 +58,7 @@ float WebsocketInputStates::axis(int axis) const {
 bool WebsocketInputStates::button(int button, WebsocketAction action) const {
     ghoul_precondition(button >= 0, "button must be 0 or positive");
 
-    bool res = std::any_of(
+    const bool res = std::any_of(
         begin(),
         end(),
         [button, action](const std::pair<const size_t, const WebsocketInputState *> state)
diff --git a/src/mission/mission.cpp b/src/mission/mission.cpp
index ab98243f04..589e86ad3d 100644
--- a/src/mission/mission.cpp
+++ b/src/mission/mission.cpp
@@ -114,10 +114,10 @@ MissionPhase::MissionPhase(const ghoul::Dictionary& dictionary) {
 
         // user may specify an overall time range. In that case expand this timerange
         if (p.timeRange.has_value()) {
-            std::string start = p.timeRange->start;
-            std::string end = p.timeRange->end.value_or(start);
+            const std::string start = p.timeRange->start;
+            const std::string end = p.timeRange->end.value_or(start);
 
-            TimeRange overallTimeRange = TimeRange(
+            const TimeRange overallTimeRange = TimeRange(
                 SpiceManager::ref().ephemerisTimeFromDate(start),
                 SpiceManager::ref().ephemerisTimeFromDate(end)
             );
@@ -139,8 +139,8 @@ MissionPhase::MissionPhase(const ghoul::Dictionary& dictionary) {
     }
     else {
         if (p.timeRange.has_value()) {
-            std::string start = p.timeRange->start;
-            std::string end = p.timeRange->end.value_or(start);
+            const std::string start = p.timeRange->start;
+            const std::string end = p.timeRange->end.value_or(start);
 
             _timeRange = TimeRange(
                 SpiceManager::ref().ephemerisTimeFromDate(start),
@@ -165,8 +165,8 @@ MissionPhase::MissionPhase(const ghoul::Dictionary& dictionary) {
             std::string name = milestone.name;
             Time newTime = Time(milestone.date);
             Milestone newDate = {
-                .name = name,
-                .date = newTime
+                .name = std::move(name),
+                .date = std::move(newTime)
             };
             if (milestone.description.has_value()) {
                 newDate.description = milestone.description.value();
@@ -235,7 +235,7 @@ void MissionPhase::phaseTrace(double time, Trace& trace, int maxDepth) const {
 
     for (const MissionPhase& phase : _subphases) {
         if (phase.timeRange().includes(time)) {
-            trace.push_back(phase);
+            trace.emplace_back(phase);
             phase.phaseTrace(time, trace, maxDepth - 1);
             return;
         }
diff --git a/src/mission/missionmanager.cpp b/src/mission/missionmanager.cpp
index 7ff5e0d3e7..39814f6032 100644
--- a/src/mission/missionmanager.cpp
+++ b/src/mission/missionmanager.cpp
@@ -60,8 +60,8 @@ bool MissionManager::hasCurrentMission() const {
 
 std::string MissionManager::loadMission(Mission mission) {
     // Changing the values might invalidate the _currentMission iterator
-    std::string currentMission = hasCurrentMission() ? _currentMission->first : "";
-    std::string missionName = mission.name();
+    const std::string currentMission = hasCurrentMission() ? _currentMission->first : "";
+    const std::string missionName = mission.name();
     _missionMap.insert({ missionName, std::move(mission) });
     if (_missionMap.size() == 1) {
         setCurrentMission(missionName);
diff --git a/src/navigation/keyframenavigator.cpp b/src/navigation/keyframenavigator.cpp
index 5f71578f6b..0c133d46c2 100644
--- a/src/navigation/keyframenavigator.cpp
+++ b/src/navigation/keyframenavigator.cpp
@@ -35,24 +35,18 @@
 
 #include <glm/gtx/quaternion.hpp>
 
-#ifdef INTERPOLATION_DEBUG_PRINT
-namespace {
-    constexpr std::string_view _loggerCat = "KeyframeNavigator";
-} // namespace
-#endif
-
 namespace openspace::interaction {
 
 KeyframeNavigator::CameraPose::CameraPose(datamessagestructures::CameraKeyframe&& kf)
     : position(std::move(kf._position))
     , rotation(std::move(kf._rotation))
     , focusNode(std::move(kf._focusNode))
-    , scale(std::move(kf._scale))
-    , followFocusNodeRotation(std::move(kf._followNodeRotation))
+    , scale(kf._scale)
+    , followFocusNodeRotation(kf._followNodeRotation)
 {}
 
 bool KeyframeNavigator::updateCamera(Camera& camera, bool ignoreFutureKeyframes) {
-    double now = currentTime();
+    const double now = currentTime();
     bool foundPrevKeyframe = false;
 
     if (_cameraPoseTimeline.nKeyframes() == 0) {
@@ -100,8 +94,8 @@ bool KeyframeNavigator::updateCamera(Camera& camera, bool ignoreFutureKeyframes)
     return updateCamera(&camera, prevPose, nextPose, t, ignoreFutureKeyframes);
 }
 
-bool KeyframeNavigator::updateCamera(Camera* camera, const CameraPose prevPose,
-                                     const CameraPose nextPose, double t,
+bool KeyframeNavigator::updateCamera(Camera* camera, const CameraPose& prevPose,
+                                     const CameraPose& nextPose, double t,
                                      bool ignoreFutureKeyframes)
 {
     Scene* scene = camera->parent()->scene();
@@ -142,16 +136,16 @@ bool KeyframeNavigator::updateCamera(Camera* camera, const CameraPose prevPose,
 
     // Linear interpolation
     t = std::max(0.0, std::min(1.0, t));
-    glm::dvec3 nowCameraPosition = prevKeyframeCameraPosition * (1.0 - t) +
-                                   nextKeyframeCameraPosition * t;
+    const glm::dvec3 nowCameraPosition =
+        prevKeyframeCameraPosition * (1.0 - t) + nextKeyframeCameraPosition * t;
     glm::dquat nowCameraRotation = glm::slerp(
         prevKeyframeCameraRotation,
         nextKeyframeCameraRotation,
         t
     );
 
-    camera->setPositionVec3(nowCameraPosition);
-    camera->setRotation(nowCameraRotation);
+    camera->setPositionVec3(std::move(nowCameraPosition));
+    camera->setRotation(std::move(nowCameraRotation));
 
     // We want to affect view scaling, such that we achieve
     // logarithmic interpolation of distance to an imagined focus node.
@@ -165,19 +159,6 @@ bool KeyframeNavigator::updateCamera(Camera* camera, const CameraPose prevPose,
         camera->setScaling(1.f / glm::exp(interpolatedInvScaleExp));
     }
 
-#ifdef INTERPOLATION_DEBUG_PRINT
-    LINFO(fmt::format(
-        "Cam pos = {} {} {}  rot = {} {} {} {}",
-        nowCameraPosition.x,
-        nowCameraPosition.y,
-        nowCameraPosition.z,
-        nowCameraRotation.x,
-        nowCameraRotation.y,
-        nowCameraRotation.z,
-        nowCameraRotation.w
-    ));
-#endif
-
     return true;
 }
 
diff --git a/src/navigation/navigationhandler.cpp b/src/navigation/navigationhandler.cpp
index a45ceb3b27..96329c6e79 100644
--- a/src/navigation/navigationhandler.cpp
+++ b/src/navigation/navigationhandler.cpp
@@ -187,8 +187,8 @@ void NavigationHandler::updateCamera(double deltaTime) {
         return;
     }
 
-    OpenSpaceEngine::Mode mode = global::openSpaceEngine->currentMode();
-    bool playbackMode = (mode == OpenSpaceEngine::Mode::SessionRecordingPlayback);
+    const OpenSpaceEngine::Mode mode = global::openSpaceEngine->currentMode();
+    const bool playbackMode = (mode == OpenSpaceEngine::Mode::SessionRecordingPlayback);
 
     // If we're in session recording payback mode, the session recording is responsible
     // for navigation. So don't do anything more here
@@ -225,14 +225,14 @@ void NavigationHandler::applyPendingState() {
 
     std::variant<NodeCameraStateSpec, NavigationState> pending = *_pendingState;
     if (std::holds_alternative<NavigationState>(pending)) {
-        NavigationState ns = std::get<NavigationState>(pending);
+        const NavigationState ns = std::get<NavigationState>(pending);
         _orbitalNavigator.setAnchorNode(ns.anchor);
         _orbitalNavigator.setAimNode(ns.aim);
         _camera->setPose(ns.cameraPose());
     }
     else if (std::holds_alternative<NodeCameraStateSpec>(pending)) {
-        NodeCameraStateSpec spec = std::get<NodeCameraStateSpec>(pending);
-        Waypoint wp = computeWaypointFromNodeInfo(spec);
+        const NodeCameraStateSpec spec = std::get<NodeCameraStateSpec>(pending);
+        const Waypoint wp = computeWaypointFromNodeInfo(spec);
 
         _orbitalNavigator.setAnchorNode(wp.nodeIdentifier());
         _orbitalNavigator.setAimNode("");
@@ -271,13 +271,13 @@ void NavigationHandler::updateCameraTransitions() {
 
     // Updated checks compared to last time, so we can check if we are still in the
     // approach or anchor sphere
-    bool isInApproachSphere = currDistance < d * af;
-    bool isInReachSphere = currDistance < d * rf;
+    const bool isInApproachSphere = currDistance < d * af;
+    const bool isInReachSphere = currDistance < d * rf;
 
     // Compare these to the values from last frame, to trigger the correct transition
     // events
-    bool wasInApproachSphere = _inAnchorApproachSphere;
-    bool wasInReachSphere = _inAnchorReachSphere;
+    const bool wasInApproachSphere = _inAnchorApproachSphere;
+    const bool wasInReachSphere = _inAnchorReachSphere;
     _inAnchorApproachSphere = isInApproachSphere;
     _inAnchorReachSphere = isInReachSphere;
 
@@ -377,7 +377,7 @@ void NavigationHandler::updateCameraTransitions() {
         );
     };
 
-    bool anchorWasChanged = anchorNode() != _lastAnchor;
+    const bool anchorWasChanged = anchorNode() != _lastAnchor;
     if (anchorWasChanged) {
         // The anchor was changed between frames, so the transitions we have to check
         // are a bit different. Just directly trigger the relevant events for the
@@ -509,8 +509,8 @@ NavigationState NavigationHandler::navigationState(
         glm::normalize(_camera->lookUpVectorWorldSpace())
     ));
 
-    glm::dquat localRotation = invNeutralRotation * _camera->rotationQuaternion();
-    glm::dvec3 eulerAngles = glm::eulerAngles(localRotation);
+    const glm::dquat localRotation = invNeutralRotation * _camera->rotationQuaternion();
+    const glm::dvec3 eulerAngles = glm::eulerAngles(localRotation);
 
     const double pitch = eulerAngles.x;
     const double yaw = -eulerAngles.y;
@@ -536,7 +536,7 @@ NavigationState NavigationHandler::navigationState(
 }
 
 void NavigationHandler::saveNavigationState(const std::filesystem::path& filepath,
-                                            const std::string& referenceFrameIdentifier)
+                                        const std::string& referenceFrameIdentifier) const
 {
     ghoul_precondition(!filepath.empty(), "File path must not be empty");
 
@@ -582,14 +582,14 @@ void NavigationHandler::loadNavigationState(const std::string& filepath) {
         throw ghoul::FileNotFoundError(absolutePath.string(), "NavigationState");
     }
 
-    std::ifstream f(filepath);
+    std::ifstream f = std::ifstream(filepath);
     std::string contents = std::string(
         std::istreambuf_iterator<char>(f),
         std::istreambuf_iterator<char>()
     );
-    nlohmann::json json = nlohmann::json::parse(contents);
+    const nlohmann::json json = nlohmann::json::parse(contents);
 
-    NavigationState state = NavigationState(json);
+    const NavigationState state = NavigationState(json);
     setNavigationStateNextFrame(state);
 }
 
diff --git a/src/navigation/navigationstate.cpp b/src/navigation/navigationstate.cpp
index 03f8460a4e..ca63aa4386 100644
--- a/src/navigation/navigationstate.cpp
+++ b/src/navigation/navigationstate.cpp
@@ -170,22 +170,20 @@ CameraPose NavigationState::cameraPose() const {
     resultingPose.position = anchorNode->worldPosition() +
         referenceFrameTransform * glm::dvec3(position);
 
-    glm::dvec3 upVector = up.has_value() ?
+    const glm::dvec3 upVector = up.has_value() ?
         glm::normalize(referenceFrameTransform * *up) :
         glm::dvec3(0.0, 1.0, 0.0);
 
     // Construct vectors of a "neutral" view, i.e. when the anchor is centered in view
-    glm::dvec3 neutralView =
+    const glm::dvec3 neutralView =
         glm::normalize(anchorNode->worldPosition() - resultingPose.position);
 
-    glm::dquat neutralCameraRotation = glm::inverse(glm::quat_cast(glm::lookAt(
-        glm::dvec3(0.0),
-        neutralView,
-        upVector
-    )));
+    const glm::dquat neutralCameraRotation = glm::inverse(glm::quat_cast(
+        glm::lookAt(glm::dvec3(0.0), neutralView, upVector)
+    ));
 
-    glm::dquat pitchRotation = glm::angleAxis(pitch, glm::dvec3(1.0, 0.0, 0.0));
-    glm::dquat yawRotation = glm::angleAxis(yaw, glm::dvec3(0.0, -1.0, 0.0));
+    const glm::dquat pitchRotation = glm::angleAxis(pitch, glm::dvec3(1.0, 0.0, 0.0));
+    const glm::dquat yawRotation = glm::angleAxis(yaw, glm::dvec3(0.0, -1.0, 0.0));
 
     resultingPose.rotation = neutralCameraRotation * yawRotation * pitchRotation;
 
diff --git a/src/navigation/orbitalnavigator.cpp b/src/navigation/orbitalnavigator.cpp
index f8b75006de..80a8c82032 100644
--- a/src/navigation/orbitalnavigator.cpp
+++ b/src/navigation/orbitalnavigator.cpp
@@ -411,6 +411,28 @@ namespace {
         "choice for globes, and the Y-axis is a good choice for models",
         openspace::properties::Property::Visibility::AdvancedUser
     };
+
+    /**
+     * Calculates a SurfacePositionHandle given a camera position in world space.
+     */
+    openspace::SurfacePositionHandle calculateSurfacePositionHandle(
+                                                    const openspace::SceneGraphNode& node,
+                                               const glm::dvec3& cameraPositionWorldSpace)
+    {
+        ghoul_assert(
+            glm::length(cameraPositionWorldSpace) > 0.0,
+            "Cannot have degenerate vector"
+        );
+
+        const glm::dmat4 inverseModelTransform = glm::inverse(node.modelTransform());
+        const glm::dvec3 cameraPositionModelSpace =
+            glm::dvec3(inverseModelTransform * glm::dvec4(cameraPositionWorldSpace, 1.0));
+        const openspace::SurfacePositionHandle posHandle =
+            node.calculateSurfacePositionHandle(cameraPositionModelSpace);
+
+        return posHandle;
+    }
+
 } // namespace
 
 namespace openspace::interaction {
@@ -468,7 +490,7 @@ OrbitalNavigator::IdleBehavior::IdleBehavior()
 OrbitalNavigator::LimitZoom::LimitZoom()
     : properties::PropertyOwner(LimitZoomInfo)
     , enableZoomInLimit(EnabledMinimumAllowedDistanceInfo, true)
-    , minimumAllowedDistance(MinimumDistanceInfo, 10.0f, 0.0f, 10000.f)
+    , minimumAllowedDistance(MinimumDistanceInfo, 10.f, 0.f, 10000.f)
     , enableZoomOutLimit(EnabledMaximumDistanceInfo, false)
     , maximumAllowedDistance(
         MaximumDistanceInfo,
@@ -498,8 +520,8 @@ OrbitalNavigator::OrbitalNavigator()
     , _disableZoom(DisableZoomInfo, false)
     , _disableRoll(DisableRollInfo, false)
     , _mouseSensitivity(MouseSensitivityInfo, 15.f, 1.f, 50.f)
-    , _joystickSensitivity(JoystickSensitivityInfo, 10.f, 1.0f, 50.f)
-    , _websocketSensitivity(WebsocketSensitivityInfo, 5.f, 1.0f, 50.f)
+    , _joystickSensitivity(JoystickSensitivityInfo, 10.f, 1.f, 50.f)
+    , _websocketSensitivity(WebsocketSensitivityInfo, 5.f, 1.f, 50.f)
     , _useAdaptiveStereoscopicDepth(UseAdaptiveStereoscopicDepthInfo, true)
     , _stereoscopicDepthOfFocusSurface(
         StereoscopicDepthOfFocusSurfaceInfo,
@@ -734,7 +756,7 @@ glm::dvec3 OrbitalNavigator::anchorNodeToCameraVector() const {
 }
 
 glm::quat OrbitalNavigator::anchorNodeToCameraRotation() const {
-    glm::dmat4 invWorldRotation = glm::dmat4(
+    const glm::dmat4 invWorldRotation = glm::dmat4(
         glm::inverse(anchorNode()->worldRotationMatrix())
     );
     return glm::quat(invWorldRotation) * glm::quat(_camera->rotationQuaternion());
@@ -777,7 +799,8 @@ void OrbitalNavigator::updateStatesFromInput(const MouseInputState& mouseInputSt
     _websocketStates.updateStateFromInput(*global::websocketInputStates, deltaTime);
     _scriptStates.updateStateFromInput(deltaTime);
 
-    bool interactionHappened = _mouseStates.hasNonZeroVelocities() ||
+    const bool interactionHappened =
+        _mouseStates.hasNonZeroVelocities() ||
         _joystickStates.hasNonZeroVelocities() ||
         _websocketStates.hasNonZeroVelocities() ||
         _scriptStates.hasNonZeroVelocities();
@@ -789,7 +812,8 @@ void OrbitalNavigator::updateStatesFromInput(const MouseInputState& mouseInputSt
         tickIdleBehaviorTimer(deltaTime);
     }
 
-    bool cameraLocationChanged = _mouseStates.hasNonZeroVelocities(true) ||
+    const bool cameraLocationChanged =
+        _mouseStates.hasNonZeroVelocities(true) ||
         _joystickStates.hasNonZeroVelocities(true) ||
         _websocketStates.hasNonZeroVelocities(true) ||
         _scriptStates.hasNonZeroVelocities(true);
@@ -869,7 +893,7 @@ void OrbitalNavigator::updateCameraStateFromStates(double deltaTime) {
 
     // Rotate with the object by finding a differential rotation from the previous
     // to the current rotation
-    glm::dquat anchorRotation = glm::quat_cast(_anchorNode->worldRotationMatrix());
+    const glm::dquat anchorRotation = glm::quat_cast(_anchorNode->worldRotationMatrix());
 
     glm::dquat anchorNodeRotationDiff = _previousAnchorNodeRotation.has_value() ?
         *_previousAnchorNodeRotation * glm::inverse(anchorRotation) :
@@ -893,7 +917,7 @@ void OrbitalNavigator::updateCameraStateFromStates(double deltaTime) {
     camRot.localRotation = interpolateLocalRotation(deltaTime, camRot.localRotation);
     camRot.localRotation = rotateLocally(deltaTime, camRot.localRotation);
 
-    double horizontalTranslationSpeedScale =
+    const double horizontalTranslationSpeedScale =
         rotationSpeedScaleFromCameraHeight(pose.position, posHandle);
 
     // Rotation around target object's up vector based on user input
@@ -986,8 +1010,10 @@ void OrbitalNavigator::updateCameraScalingFromAnchor(double deltaTime) {
             return;
         }
 
-        SurfacePositionHandle posHandle =
-            calculateSurfacePositionHandle(*_anchorNode, cameraPos);
+        const SurfacePositionHandle posHandle = calculateSurfacePositionHandle(
+            *_anchorNode,
+            cameraPos
+        );
 
         double targetCameraToSurfaceDistance = glm::length(
             cameraToSurfaceVector(cameraPos, anchorPos, posHandle)
@@ -1046,7 +1072,7 @@ void OrbitalNavigator::tickIdleBehaviorTimer(double deltaTime) {
 }
 
 glm::dquat OrbitalNavigator::composeCameraRotation(
-                                        const CameraRotationDecomposition& decomposition)
+                                   const CameraRotationDecomposition& decomposition) const
 {
     return decomposition.globalRotation * decomposition.localRotation;
 }
@@ -1063,13 +1089,13 @@ glm::dvec3 OrbitalNavigator::cameraToSurfaceVector(const glm::dvec3& cameraPos,
                                                    const glm::dvec3& centerPos,
                                                    const SurfacePositionHandle& posHandle)
 {
-    glm::dmat4 modelTransform = _anchorNode->modelTransform();
-    glm::dvec3 posDiff = cameraPos - centerPos;
-    glm::dvec3 centerToActualSurfaceModelSpace =
+    const glm::dmat4 modelTransform = _anchorNode->modelTransform();
+    const glm::dvec3 posDiff = cameraPos - centerPos;
+    const glm::dvec3 centerToActualSurfaceModelSpace =
         posHandle.centerToReferenceSurface +
         posHandle.referenceSurfaceOutDirection * posHandle.heightToSurface;
 
-    glm::dvec3 centerToActualSurface =
+    const glm::dvec3 centerToActualSurface =
         glm::dmat3(modelTransform) * centerToActualSurfaceModelSpace;
 
     return centerToActualSurface - posDiff;
@@ -1256,7 +1282,7 @@ bool OrbitalNavigator::shouldFollowAnchorRotation(const glm::dvec3& cameraPositi
 
     const double distanceToCamera =
         glm::distance(cameraPosition, _anchorNode->worldPosition());
-    bool shouldFollow = distanceToCamera < maximumDistanceForRotation;
+    const bool shouldFollow = distanceToCamera < maximumDistanceForRotation;
     return shouldFollow;
 }
 
@@ -1296,7 +1322,7 @@ double OrbitalNavigator::maxAllowedDistance() const {
 }
 
 OrbitalNavigator::CameraRotationDecomposition
-    OrbitalNavigator::decomposeCameraRotationSurface(CameraPose cameraPose,
+    OrbitalNavigator::decomposeCameraRotationSurface(const CameraPose& cameraPose,
                                                      const SceneGraphNode& reference)
 {
     const glm::dvec3 cameraUp = cameraPose.rotation * Camera::UpDirectionCameraSpace;
@@ -1330,8 +1356,8 @@ OrbitalNavigator::CameraRotationDecomposition
 }
 
 OrbitalNavigator::CameraRotationDecomposition
-    OrbitalNavigator::decomposeCameraRotation(CameraPose cameraPose,
-                                              glm::dvec3 reference)
+OrbitalNavigator::decomposeCameraRotation(const CameraPose& cameraPose,
+                                          const glm::dvec3& reference)
 {
     const glm::dvec3 cameraUp = cameraPose.rotation * glm::dvec3(0.0, 1.0, 0.0);
     const glm::dvec3 cameraViewDirection = ghoul::viewDirection(cameraPose.rotation);
@@ -1349,8 +1375,8 @@ OrbitalNavigator::CameraRotationDecomposition
     return { localCameraRotation, globalCameraRotation };
 }
 
-CameraPose OrbitalNavigator::followAim(CameraPose pose, glm::dvec3 cameraToAnchor,
-                                       Displacement anchorToAim)
+CameraPose OrbitalNavigator::followAim(CameraPose pose, const glm::dvec3& cameraToAnchor,
+                                       const Displacement& anchorToAim)
 {
     CameraRotationDecomposition anchorDecomp =
         decomposeCameraRotation(pose, pose.position + cameraToAnchor);
@@ -1368,7 +1394,7 @@ CameraPose OrbitalNavigator::followAim(CameraPose pose, glm::dvec3 cameraToAncho
         // 2. Adjustment of the camera to account for radial displacement of the aim
 
         // Step 1 (Rotation around anchor based on aim's projection)
-        glm::dvec3 newAnchorToProjectedAim =
+        const glm::dvec3 newAnchorToProjectedAim =
             glm::length(anchorToAim.first) * glm::normalize(anchorToAim.second);
         const double spinRotationAngle = glm::angle(
             glm::normalize(anchorToAim.first), glm::normalize(newAnchorToProjectedAim)
@@ -1432,11 +1458,11 @@ CameraPose OrbitalNavigator::followAim(CameraPose pose, glm::dvec3 cameraToAncho
         const double newCameraAimAngle =
             glm::pi<double>() - anchorAimAngle - newCameraAnchorAngle;
 
-        double distanceRotationAngle = correctionFactor *
+        const double distanceRotationAngle = correctionFactor *
                                        (newCameraAimAngle - prevCameraAimAngle);
 
         if (glm::abs(distanceRotationAngle) > AngleEpsilon) {
-            glm::dvec3 distanceRotationAxis = glm::normalize(
+            const glm::dvec3 distanceRotationAxis = glm::normalize(
                 glm::cross(intermediateCameraToAnchor, newAnchorToProjectedAim)
             );
             const glm::dquat orbitRotation =
@@ -1540,62 +1566,67 @@ glm::dquat OrbitalNavigator::interpolateLocalRotation(double deltaTime,
 
 OrbitalNavigator::Displacement
 OrbitalNavigator::interpolateRetargetAim(double deltaTime, CameraPose pose,
-                                         glm::dvec3 prevCameraToAnchor,
+                                         const glm::dvec3& prevCameraToAnchor,
                                          Displacement anchorToAim)
 {
-    if (_retargetAimInterpolator.isInterpolating()) {
-        double t = _retargetAimInterpolator.value();
-        _retargetAimInterpolator.setDeltaTime(static_cast<float>(deltaTime));
-        _retargetAimInterpolator.step();
+    if (!_retargetAimInterpolator.isInterpolating()) {
+        return anchorToAim;
+    }
 
-        const glm::dvec3 prevCameraToAim = prevCameraToAnchor + anchorToAim.first;
-        const double aimDistance = glm::length(prevCameraToAim);
-        const glm::dquat prevRotation = pose.rotation;
+    const double t = _retargetAimInterpolator.value();
+    _retargetAimInterpolator.setDeltaTime(static_cast<float>(deltaTime));
+    _retargetAimInterpolator.step();
 
-        // Introduce a virtual aim - a position straight ahead of the camera,
-        // that should be rotated around the camera, until it reaches the aim node.
+    const glm::dvec3 prevCameraToAim = prevCameraToAnchor + anchorToAim.first;
+    const double aimDistance = glm::length(prevCameraToAim);
+    const glm::dquat prevRotation = pose.rotation;
 
-        const glm::dvec3 prevCameraToVirtualAim =
-            aimDistance * (prevRotation * Camera::ViewDirectionCameraSpace);
+    // Introduce a virtual aim - a position straight ahead of the camera,
+    // that should be rotated around the camera, until it reaches the aim node.
 
-        // Max angle: the maximum possible angle between anchor and aim, given that
-        // the camera orbits the anchor on a fixed distance.
-        const double maxAngle =
-            glm::atan(glm::length(anchorToAim.first), glm::length(prevCameraToAnchor));
+    const glm::dvec3 prevCameraToVirtualAim =
+        aimDistance * (prevRotation * Camera::ViewDirectionCameraSpace);
 
-        // Requested angle: The angle between the vector straight ahead from the
-        // camera and the vector from camera to anchor should remain constant, in
-        // order for the anchor not to move in screen space.
-        const double requestedAngle = glm::angle(
-            glm::normalize(prevCameraToVirtualAim),
-            glm::normalize(prevCameraToAnchor)
+    // Max angle: the maximum possible angle between anchor and aim, given that
+    // the camera orbits the anchor on a fixed distance.
+    const double maxAngle =
+        glm::atan(glm::length(anchorToAim.first), glm::length(prevCameraToAnchor));
+
+    // Requested angle: The angle between the vector straight ahead from the
+    // camera and the vector from camera to anchor should remain constant, in
+    // order for the anchor not to move in screen space.
+    const double requestedAngle = glm::angle(
+        glm::normalize(prevCameraToVirtualAim),
+        glm::normalize(prevCameraToAnchor)
+    );
+
+    if (requestedAngle <= maxAngle) {
+        const glm::dvec3 aimPos = pose.position + prevCameraToAnchor + anchorToAim.second;
+        const CameraRotationDecomposition aimDecomp = decomposeCameraRotation(
+            std::move(pose),
+            aimPos
         );
 
-        if (requestedAngle <= maxAngle) {
-            glm::dvec3 aimPos = pose.position + prevCameraToAnchor + anchorToAim.second;
-            CameraRotationDecomposition aimDecomp = decomposeCameraRotation(pose, aimPos);
+        const glm::dquat interpolatedRotation = glm::slerp(
+            prevRotation,
+            aimDecomp.globalRotation,
+            glm::min(t * _retargetAimInterpolator.deltaTimeScaled(), 1.0)
+        );
 
-            const glm::dquat interpolatedRotation = glm::slerp(
-                prevRotation,
-                aimDecomp.globalRotation,
-                glm::min(t * _retargetAimInterpolator.deltaTimeScaled(), 1.0)
-            );
+        const glm::dvec3 recomputedCameraToVirtualAim =
+            aimDistance * (interpolatedRotation * Camera::ViewDirectionCameraSpace);
 
-            const glm::dvec3 recomputedCameraToVirtualAim =
-                aimDistance * (interpolatedRotation * Camera::ViewDirectionCameraSpace);
-
-            return {
-                prevCameraToVirtualAim - prevCameraToAnchor,
-                recomputedCameraToVirtualAim - prevCameraToAnchor
-            };
-        }
-        else {
-            // Bail out.
-            // Cannot put aim node in center without moving anchor in screen space.
-            // Future work: Rotate as much as possible,
-            // or possibly use some other DOF to find solution, like moving the camera.
-            _retargetAimInterpolator.end();
-        }
+        return {
+            prevCameraToVirtualAim - prevCameraToAnchor,
+            recomputedCameraToVirtualAim - prevCameraToAnchor
+        };
+    }
+    else {
+        // Bail out.
+        // Cannot put aim node in center without moving anchor in screen space.
+        // Future work: Rotate as much as possible,
+        // or possibly use some other DOF to find solution, like moving the camera.
+        _retargetAimInterpolator.end();
     }
     return anchorToAim;
 }
@@ -1609,18 +1640,18 @@ double OrbitalNavigator::interpolateCameraToSurfaceDistance(double deltaTime,
         return targetDistance;
     }
 
-    double t = _cameraToSurfaceDistanceInterpolator.value();
+    const double t = _cameraToSurfaceDistanceInterpolator.value();
     _cameraToSurfaceDistanceInterpolator.setDeltaTime(static_cast<float>(deltaTime));
     _cameraToSurfaceDistanceInterpolator.step();
 
     // Interpolate distance logarithmically
-    double result = glm::exp(glm::mix(
+    const double result = glm::exp(glm::mix(
         glm::log(currentDistance),
         glm::log(targetDistance),
         glm::min(t * _cameraToSurfaceDistanceInterpolator.deltaTimeScaled(), 1.0))
     );
 
-    double ratio = currentDistance / targetDistance;
+    const double ratio = currentDistance / targetDistance;
     if (glm::abs(ratio - 1.0) < 0.000001) {
         _cameraToSurfaceDistanceInterpolator.end();
     }
@@ -1641,12 +1672,12 @@ void OrbitalNavigator::rotateAroundAnchorUp(double deltaTime, double speedScale,
         }
     }(UpDirectionChoice(_upToUseForRotation.value()));
 
-    double combinedXInput = _mouseStates.globalRotationVelocity().x +
+    const double combinedXInput = _mouseStates.globalRotationVelocity().x +
         _joystickStates.globalRotationVelocity().x +
         _websocketStates.globalRotationVelocity().x +
         _scriptStates.globalRotationVelocity().x;
 
-    double angle = combinedXInput * deltaTime * speedScale;
+    const double angle = combinedXInput * deltaTime * speedScale;
     orbitAroundAxis(axis, angle, cameraPosition, globalCameraRotation);
 }
 
@@ -1658,9 +1689,9 @@ glm::dvec3 OrbitalNavigator::translateHorizontally(double deltaTime, double spee
 {
     // If we are orbiting around an up vector, we only want to allow verical
     // movement and not use the x velocity
-    bool useX = !_shouldRotateAroundUp;
+    const bool useX = !_shouldRotateAroundUp;
 
-    double angleScale = deltaTime * speedScale;
+    const double angleScale = deltaTime * speedScale;
 
     // Get rotation in camera space
     const glm::dquat mouseRotationDiffCamSpace = glm::dquat(glm::dvec3(
@@ -1792,10 +1823,10 @@ glm::dvec3 OrbitalNavigator::pushToSurface(const glm::dvec3& cameraPosition,
                                            const glm::dvec3& objectPosition,
                                         const SurfacePositionHandle& positionHandle) const
 {
-    double minHeight = _limitZoom.enableZoomInLimit ?
+    const double minHeight = _limitZoom.enableZoomInLimit ?
         static_cast<double>(_limitZoom.minimumAllowedDistance) : 0.0;
 
-    double maxHeight = _limitZoom.enableZoomOutLimit ?
+    const double maxHeight = _limitZoom.enableZoomOutLimit ?
         static_cast<double>(_limitZoom.maximumAllowedDistance) : -1.0;
 
     if (maxHeight > 0.0 && minHeight > maxHeight) {
@@ -1854,24 +1885,6 @@ glm::dquat OrbitalNavigator::interpolateRotationDifferential(double deltaTime,
     );
 }
 
-SurfacePositionHandle OrbitalNavigator::calculateSurfacePositionHandle(
-                                                const SceneGraphNode& node,
-                                        const glm::dvec3& cameraPositionWorldSpace) const
-{
-    ghoul_assert(
-        glm::length(cameraPositionWorldSpace) > 0.0,
-        "Cannot have degenerate vector"
-    );
-
-    const glm::dmat4 inverseModelTransform = glm::inverse(node.modelTransform());
-    const glm::dvec3 cameraPositionModelSpace =
-        glm::dvec3(inverseModelTransform * glm::dvec4(cameraPositionWorldSpace, 1.0));
-    const SurfacePositionHandle posHandle =
-        node.calculateSurfacePositionHandle(cameraPositionModelSpace);
-
-    return posHandle;
-}
-
 JoystickCameraStates& OrbitalNavigator::joystickStates() {
     return _joystickStates;
 }
@@ -1897,7 +1910,7 @@ const ScriptCameraStates& OrbitalNavigator::scriptStates() const {
 }
 
 void OrbitalNavigator::triggerIdleBehavior(std::string_view choice) {
-    OpenSpaceEngine::Mode mode = global::openSpaceEngine->currentMode();
+    const OpenSpaceEngine::Mode mode = global::openSpaceEngine->currentMode();
     if (mode != OpenSpaceEngine::Mode::UserControl) {
         LERROR(
             "Could not start idle behavior. The camera is being controlled "
@@ -1910,7 +1923,7 @@ void OrbitalNavigator::triggerIdleBehavior(std::string_view choice) {
         _idleBehavior.chosenBehavior = std::nullopt;
     }
     else {
-        IdleBehavior::Behavior behavior;
+        IdleBehavior::Behavior behavior = IdleBehavior::Behavior::Orbit;
         if (choice == IdleKeyOrbit) {
             behavior = IdleBehavior::Behavior::Orbit;
         }
@@ -1921,9 +1934,9 @@ void OrbitalNavigator::triggerIdleBehavior(std::string_view choice) {
             behavior = IdleBehavior::Behavior::OrbitAroundUp;
         }
         else {
-            throw ghoul::RuntimeError(
-                fmt::format("No existing IdleBehavior with identifier '{}'", choice)
-            );
+            throw ghoul::RuntimeError(fmt::format(
+                "No existing IdleBehavior with identifier '{}'", choice
+            ));
         }
         _idleBehavior.chosenBehavior = behavior;
     }
@@ -1950,8 +1963,10 @@ void OrbitalNavigator::applyIdleBehavior(double deltaTime, glm::dvec3& position,
         return;
     }
 
-    SurfacePositionHandle posHandle =
-        calculateSurfacePositionHandle(*_anchorNode, position);
+    const SurfacePositionHandle posHandle = calculateSurfacePositionHandle(
+        *_anchorNode,
+        position
+    );
 
     // Same speed scale as horizontal translation
     double speedScale = rotationSpeedScaleFromCameraHeight(position, posHandle);
@@ -1964,10 +1979,10 @@ void OrbitalNavigator::applyIdleBehavior(double deltaTime, glm::dvec3& position,
     }
 
     // Interpolate so that the start and end are smooth
-    double s = _idleBehaviorDampenInterpolator.value();
+    const double s = _idleBehaviorDampenInterpolator.value();
     speedScale *= _invertIdleBehaviorInterpolation ? (1.0 - s) : s;
 
-    double angle = deltaTime * speedScale;
+    const double angle = deltaTime * speedScale;
 
     // Apply the chosen behavior
     const IdleBehavior::Behavior choice = _idleBehavior.chosenBehavior.value_or(
@@ -2021,7 +2036,7 @@ void OrbitalNavigator::orbitAnchor(double angle, glm::dvec3& position,
     position += rotationDiffVec3;
 }
 
-void OrbitalNavigator::orbitAroundAxis(const glm::dvec3 axis, double angle,
+void OrbitalNavigator::orbitAroundAxis(const glm::dvec3& axis, double angle,
                                        glm::dvec3& position, glm::dquat& globalRotation)
 {
     ghoul_assert(_anchorNode != nullptr, "Node to orbit must be set");
diff --git a/src/navigation/path.cpp b/src/navigation/path.cpp
index a2bb04cce1..1a404cd302 100644
--- a/src/navigation/path.cpp
+++ b/src/navigation/path.cpp
@@ -118,8 +118,8 @@ documentation::Documentation Path::Documentation() {
 }
 
 Path::Path(Waypoint start, Waypoint end, Type type, std::optional<float> duration)
-    : _start(start)
-    , _end(end)
+    : _start(std::move(start))
+    , _end(std::move(end))
     , _type(type)
 {
     switch (_type) {
@@ -196,7 +196,7 @@ CameraPose Path::traversePath(double dt, float speedScale) {
 
     double speed = speedAlongPath(_traveledDistance);
     speed *= static_cast<double>(speedScale);
-    double displacement = dt * speed;
+    const double displacement = dt * speed;
 
     const double prevDistance = _traveledDistance;
 
@@ -231,7 +231,7 @@ void Path::quitPath() {
 }
 
 std::string Path::currentAnchor() const {
-    bool pastHalfway = (_traveledDistance / pathLength()) > 0.5;
+    const bool pastHalfway = (_traveledDistance / pathLength()) > 0.5;
     return (pastHalfway) ? _end.nodeIdentifier() : _start.nodeIdentifier();
 }
 
@@ -243,10 +243,10 @@ bool Path::hasReachedEnd() const {
     // @TODO (emmbr, 2022-11-07) Handle linear paths separately, as they might
     // abort prematurely due to the "isPositionFinished" condition
 
-    bool isPositionFinished = (_traveledDistance / pathLength()) >= 1.0;
+    const bool isPositionFinished = (_traveledDistance / pathLength()) >= 1.0;
 
     constexpr double RotationEpsilon = 0.0001;
-    bool isRotationFinished = ghoul::isSameOrientation(
+    const bool isRotationFinished = ghoul::isSameOrientation(
         _prevPose.rotation,
         _end.rotation(),
         RotationEpsilon
@@ -280,8 +280,8 @@ CameraPose Path::linearInterpolatedPose(double distance, double displacement) {
         const glm::dvec3 lineDir = glm::normalize(prevPosToEnd);
         pose.position = _prevPose.position - displacement * lineDir;
 
-        double newRemainingDistance = glm::length(pose.position - _end.position());
-        double diff = remainingDistance - newRemainingDistance;
+        const double newRemainingDistance = glm::length(pose.position - _end.position());
+        const double diff = remainingDistance - newRemainingDistance;
         // Avoid remaining distances close to zero, or even negative
         if (relativeDistance > 0.5 && diff < LengthEpsilon) {
             // The positions are too large, so we are not making progress because of
@@ -342,7 +342,7 @@ glm::dquat Path::linearPathRotation(double) const {
     double factor = 5.0 / glm::half_pi<double>();
     factor *= global::navigationHandler->pathNavigator().linearRotationSpeedFactor();
 
-    double turnDuration = std::max(angle * factor, 1.0); // Always at least 1 second
+    const double turnDuration = std::max(angle * factor, 1.0); // Always at least 1 second
     const double time = glm::clamp(_progressedTime / turnDuration, 0.0, 1.0);
     return easedSlerpRotation(time);
 
@@ -433,10 +433,10 @@ glm::dquat Path::lookAtTargetsRotation(double t) const {
     // camera, but just the "hint" up vector for the lookAt. This leads to fast rolling
     // when the up vector gets close to the camera's forward vector. Should be improved
     // so any rolling is spread out over the entire motion instead
-    double tUp = ghoul::sineEaseInOut(t);
-    glm::dvec3 startUp = _start.rotation() * glm::dvec3(0.0, 1.0, 0.0);
-    glm::dvec3 endUp = _end.rotation() * glm::dvec3(0.0, 1.0, 0.0);
-    glm::dvec3 up = ghoul::interpolateLinear(tUp, startUp, endUp);
+    const double tUp = ghoul::sineEaseInOut(t);
+    const glm::dvec3 startUp = _start.rotation() * glm::dvec3(0.0, 1.0, 0.0);
+    const glm::dvec3 endUp = _end.rotation() * glm::dvec3(0.0, 1.0, 0.0);
+    const glm::dvec3 up = ghoul::interpolateLinear(tUp, startUp, endUp);
 
     return ghoul::lookAtQuaternion(_curve->positionAt(t), lookAtPos, up);
 }
@@ -448,7 +448,7 @@ double Path::speedAlongPath(double traveledDistance) const {
     // Set speed based on distance to closest node
     const double distanceToEndNode = glm::distance(_prevPose.position, endNodePos);
     const double distanceToStartNode = glm::distance(_prevPose.position, startNodePos);
-    bool isCloserToEnd = distanceToEndNode < distanceToStartNode;
+    const bool isCloserToEnd = (distanceToEndNode < distanceToStartNode);
 
     const glm::dvec3 closestPos = isCloserToEnd ? endNodePos : startNodePos;
     const double distanceToClosestNode = glm::distance(closestPos, _prevPose.position);
@@ -541,7 +541,7 @@ Path createPathFromDictionary(const ghoul::Dictionary& dictionary,
 
     const std::optional<float> duration = p.duration;
 
-    Path::Type type;
+    Path::Type type = Path::Type::Linear;
     if (forceType.has_value()) {
         type = *forceType;
     }
@@ -552,7 +552,7 @@ Path createPathFromDictionary(const ghoul::Dictionary& dictionary,
         type = global::navigationHandler->pathNavigator().defaultPathType();
     }
 
-    bool hasStart = p.startState.has_value();
+    const bool hasStart = p.startState.has_value();
     const Waypoint startPoint = hasStart ?
         Waypoint(NavigationState(p.startState.value())) :
         interaction::waypointFromCamera();
@@ -592,14 +592,14 @@ Path createPathFromDictionary(const ghoul::Dictionary& dictionary,
                 ));
             }
 
-            interaction::NodeCameraStateSpec info {
+            const interaction::NodeCameraStateSpec info {
                 nodeIdentifier,
                 p.position,
                 p.height,
                 p.useTargetUpDirection.value_or(false)
             };
 
-            double startToTargetCenterDistance = glm::distance(
+            const double startToTargetCenterDistance = glm::distance(
                 startPoint.position(),
                 targetNode->worldPosition()
             );
@@ -607,7 +607,7 @@ Path createPathFromDictionary(const ghoul::Dictionary& dictionary,
             // Use a linear path if camera start is within the bounding sphere
             const PathNavigator& navigator = global::navigationHandler->pathNavigator();
             const double bs = navigator.findValidBoundingSphere(targetNode);
-            bool withinTargetBoundingSphere = startToTargetCenterDistance < bs;
+            const bool withinTargetBoundingSphere = (startToTargetCenterDistance < bs);
             if (withinTargetBoundingSphere) {
                 LINFO(
                     "Camera is within the bounding sphere of the target node. "
@@ -616,7 +616,7 @@ Path createPathFromDictionary(const ghoul::Dictionary& dictionary,
                 type = Path::Type::Linear;
             }
 
-            bool isLinear = type == Path::Type::Linear;
+            const bool isLinear = type == Path::Type::Linear;
             waypoints = { computeWaypointFromNodeInfo(info, startPoint, isLinear) };
             break;
         }
diff --git a/src/navigation/pathcurve.cpp b/src/navigation/pathcurve.cpp
index edd4152f47..8553e6c8dc 100644
--- a/src/navigation/pathcurve.cpp
+++ b/src/navigation/pathcurve.cpp
@@ -83,9 +83,9 @@ void PathCurve::initializeParameterData() {
     _lengthSums.reserve(_nSegments + 1);
     _lengthSums.push_back(0.0);
     for (unsigned int i = 1; i <= _nSegments; i++) {
-        double u = _curveParameterSteps[i];
-        double uPrev = _curveParameterSteps[i - 1];
-        double length = arcLength(uPrev, u);
+        const double u = _curveParameterSteps[i];
+        const double uPrev = _curveParameterSteps[i - 1];
+        const double length = arcLength(uPrev, u);
         _lengthSums.push_back(_lengthSums[i - 1] + length);
     }
     _totalLength = _lengthSums.back();
@@ -100,13 +100,13 @@ void PathCurve::initializeParameterData() {
     _parameterSamples.reserve(Steps * _nSegments + 1);
 
     for (unsigned int i = 0; i < _nSegments; i++) {
-        double uStart = _curveParameterSteps[i];
-        double sStart = _lengthSums[i];
+        const double uStart = _curveParameterSteps[i];
+        const double sStart = _lengthSums[i];
         _parameterSamples.push_back({ uStart, sStart });
         // Intermediate sampels
         for (int j = 1; j < Steps; j++) {
-            double u = uStart + j * uStep;
-            double s = sStart + arcLength(uStart, u);
+            const double u = uStart + j * uStep;
+            const double s = sStart + arcLength(uStart, u);
             // Identify samples that are indistinguishable due to precision limitations
             if (std::abs(s - _parameterSamples.back().s) < LengthEpsilon) {
                 throw InsufficientPrecisionError(
@@ -133,8 +133,12 @@ void PathCurve::initializeParameterData() {
 // Input s is a length value, in the range [0, _totalLength]
 // Returns curve parameter in range [0, _nSegments]
 double PathCurve::curveParameter(double s) const {
-    if (s <= 0.0) return 0.0;
-    if (s >= (_totalLength - LengthEpsilon)) return _curveParameterSteps.back();
+    if (s <= 0.0) {
+        return 0.0;
+    }
+    if (s >= (_totalLength - LengthEpsilon)) {
+        return _curveParameterSteps.back();
+    }
 
     unsigned int segmentIndex = 1;
     while (s > _lengthSums[segmentIndex]) {
@@ -158,8 +162,8 @@ double PathCurve::curveParameter(double s) const {
         return std::distance(samples.begin(), it);
     };
 
-    size_t startIndex = findIndexOfFirstEqualOrLarger_u(uMin);
-    size_t endIndex = findIndexOfFirstEqualOrLarger_u(uMax);
+    const size_t startIndex = findIndexOfFirstEqualOrLarger_u(uMin);
+    const size_t endIndex = findIndexOfFirstEqualOrLarger_u(uMax);
 
     // Use samples to find an initial guess for Newton's method
     // Find first sample with s larger than input s
@@ -186,7 +190,7 @@ double PathCurve::curveParameter(double s) const {
     double upper = uMax;
 
     for (int i = 0; i < maxIterations; i++) {
-        double F = arcLength(uMin, u) - segmentS;
+        const double F = arcLength(uMin, u) - segmentS;
 
         // The error we tolerate, in meters. Note that distances are very large
         constexpr double tolerance = 0.5;
@@ -195,8 +199,8 @@ double PathCurve::curveParameter(double s) const {
         }
 
         // Generate a candidate for Newton's method
-        double dfdu = approximatedDerivative(u); // > 0
-        double uCandidate = u - F / dfdu;
+        const double dfdu = approximatedDerivative(u); // > 0
+        const double uCandidate = u - F / dfdu;
 
         // Update root-bounding interval and test candidate
         if (F > 0) {  // => candidate < u <= upper
@@ -248,15 +252,15 @@ glm::dvec3 PathCurve::interpolate(double u) const {
         return *(_points.end() - 2);
     }
 
-    std::vector<double>::const_iterator segmentEndIt =
+    const std::vector<double>::const_iterator segmentEndIt =
         std::lower_bound(_curveParameterSteps.begin(), _curveParameterSteps.end(), u);
 
     const int index =
         static_cast<int>((segmentEndIt - 1) - _curveParameterSteps.begin());
 
-    double segmentStart = _curveParameterSteps[index];
-    double segmentDuration = (_curveParameterSteps[index + 1] - segmentStart);
-    double uSegment = (u - segmentStart) / segmentDuration;
+    const double segmentStart = _curveParameterSteps[index];
+    const double segmentDuration = (_curveParameterSteps[index + 1] - segmentStart);
+    const double uSegment = (u - segmentStart) / segmentDuration;
 
     return ghoul::interpolateCatmullRom(
         uSegment,
diff --git a/src/navigation/pathcurves/avoidcollisioncurve.cpp b/src/navigation/pathcurves/avoidcollisioncurve.cpp
index 2c0eac480a..82061f8f1e 100644
--- a/src/navigation/pathcurves/avoidcollisioncurve.cpp
+++ b/src/navigation/pathcurves/avoidcollisioncurve.cpp
@@ -51,9 +51,9 @@ namespace {
 
 namespace openspace::interaction {
 
-AvoidCollisionCurve::AvoidCollisionCurve(const Waypoint& start, const Waypoint& end) {
-    _relevantNodes = global::navigationHandler->pathNavigator().relevantNodes();
-
+AvoidCollisionCurve::AvoidCollisionCurve(const Waypoint& start, const Waypoint& end)
+    : _relevantNodes(global::navigationHandler->pathNavigator().relevantNodes())
+{
     if (!start.node() || !end.node()) { // guard, but should never happen
         LERROR("Something went wrong. The start or end node does not exist");
         return;
@@ -70,7 +70,7 @@ AvoidCollisionCurve::AvoidCollisionCurve(const Waypoint& start, const Waypoint&
     _points.push_back(start.position());
 
     // Add an extra point to first go backwards if starting close to planet
-    glm::dvec3 nodeToStart = start.position() - startNodeCenter;
+    const glm::dvec3 nodeToStart = start.position() - startNodeCenter;
     const double distanceToStartNode = glm::length(nodeToStart);
 
     // Note that the factor 2.0 is arbitrarily chosen to look ok.
@@ -83,8 +83,8 @@ AvoidCollisionCurve::AvoidCollisionCurve(const Waypoint& start, const Waypoint&
 
     if (distanceToStartNode < closeToNodeThresholdFactor * startNodeRadius) {
         const double distance = startNodeRadius;
-        glm::dvec3 newPos = start.position() + distance * glm::normalize(nodeToStart);
-        _points.push_back(newPos);
+        glm::dvec3 newP = start.position() + distance * glm::normalize(nodeToStart);
+        _points.push_back(std::move(newP));
     }
 
     const glm::dvec3 startToEnd = end.position() - start.position();
@@ -92,12 +92,12 @@ AvoidCollisionCurve::AvoidCollisionCurve(const Waypoint& start, const Waypoint&
     // Add point for moving out if the end state is far away and in opposite direction.
     // This helps with avoiding fast rotation in the center of the path
     const double maxRadius = std::max(startNodeRadius, endNodeRadius);
-    bool nodesAreDifferent = start.nodeIdentifier() != end.nodeIdentifier();
+    const bool nodesAreDifferent = (start.nodeIdentifier() != end.nodeIdentifier());
     if (glm::length(startToEnd) >  0.5 * maxRadius && nodesAreDifferent) {
-        double cosAngleToTarget = glm::dot(
+        const double cosAngleToTarget = glm::dot(
             normalize(-startViewDir), normalize(startToEnd)
         );
-        bool targetInOppositeDirection = cosAngleToTarget > 0.7;
+        const bool targetInOppositeDirection = (cosAngleToTarget > 0.7);
 
         if (targetInOppositeDirection) {
             const glm::dquat midleRot = glm::slerp(start.rotation(), end.rotation(), 0.5);
@@ -106,8 +106,7 @@ AvoidCollisionCurve::AvoidCollisionCurve(const Waypoint& start, const Waypoint&
 
             glm::dvec3 newPos = start.position() + 0.2 * startToEnd -
                 stepOutDistance * glm::normalize(middleViewDir);
-
-            _points.push_back(newPos);
+            _points.push_back(std::move(newPos));
         }
     }
 
@@ -118,7 +117,7 @@ AvoidCollisionCurve::AvoidCollisionCurve(const Waypoint& start, const Waypoint&
     if (distanceToEndNode < closeToNodeThresholdFactor * endNodeRadius) {
         const double distance = endNodeRadius;
         glm::dvec3 newPos = end.position() + distance * glm::normalize(nodeToEnd);
-        _points.push_back(newPos);
+        _points.push_back(std::move(newPos));
     }
 
     _points.push_back(end.position());
@@ -148,32 +147,36 @@ void AvoidCollisionCurve::removeCollisions(int step) {
         }
 
         for (SceneGraphNode* node : _relevantNodes) {
+            using namespace collision;
+
             // Do collision check in relative coordinates, to avoid huge numbers
             const glm::dmat4 modelTransform = node->modelTransform();
-            glm::dvec3 p1 = glm::inverse(modelTransform) * glm::dvec4(lineStart, 1.0);
-            glm::dvec3 p2 = glm::inverse(modelTransform) * glm::dvec4(lineEnd, 1.0);
+            const glm::dvec3 p1 =
+                glm::inverse(modelTransform) * glm::dvec4(lineStart, 1.0);
+            const glm::dvec3 p2 =
+                glm::inverse(modelTransform) * glm::dvec4(lineEnd, 1.0);
 
             // Sphere to check for collision. Make sure it does not have radius zero.
             const double minValidBoundingSphere =
                 global::navigationHandler->pathNavigator().minValidBoundingSphere();
 
             double radius = std::max(node->boundingSphere(), minValidBoundingSphere);
-            glm::dvec3 center = glm::dvec3(0.0, 0.0, 0.0);
+            constexpr glm::dvec3 Center = glm::dvec3(0.0, 0.0, 0.0);
 
             // Add a buffer to avoid passing too close to the node.
             // Dont't add it if any point is inside the buffer
-            double buffer = CollisionBufferSizeRadiusMultiplier * radius;
-            bool p1IsInside = collision::isPointInsideSphere(p1, center, radius + buffer);
-            bool p2IsInside = collision::isPointInsideSphere(p2, center, radius + buffer);
+            const double buffer = CollisionBufferSizeRadiusMultiplier * radius;
+            const bool p1IsInside = isPointInsideSphere(p1, Center, radius + buffer);
+            const bool p2IsInside = isPointInsideSphere(p2, Center, radius + buffer);
             if (!p1IsInside && !p2IsInside) {
                 radius += buffer;
             }
 
             glm::dvec3 intersectionPointModelCoords;
-            bool collision = collision::lineSphereIntersection(
+            const bool collision = lineSphereIntersection(
                 p1,
                 p2,
-                center,
+                Center,
                 radius,
                 intersectionPointModelCoords
             );
@@ -182,12 +185,12 @@ void AvoidCollisionCurve::removeCollisions(int step) {
                 continue;
             }
 
-            glm::dvec3 collisionPoint = modelTransform *
+            const glm::dvec3 collisionPoint = modelTransform *
                 glm::dvec4(intersectionPointModelCoords, 1.0);
 
             // before collision response, make sure none of the points are inside the node
-            bool isStartInsideNode = collision::isPointInsideSphere(p1, center, radius);
-            bool isEndInsideNode = collision::isPointInsideSphere(p2, center, radius);
+            const bool isStartInsideNode = isPointInsideSphere(p1, Center, radius);
+            const bool isEndInsideNode = isPointInsideSphere(p2, Center, radius);
             if (isStartInsideNode || isEndInsideNode) {
                 LWARNING(fmt::format(
                     "Something went wrong! "
@@ -209,7 +212,7 @@ void AvoidCollisionCurve::removeCollisions(int step) {
             const double avoidCollisionDistance =
                 AvoidCollisionDistanceRadiusMultiplier * radius;
 
-            glm::dvec3 extraKnot = collisionPoint -
+            const glm::dvec3 extraKnot = collisionPoint -
                 avoidCollisionDistance * glm::normalize(orthogonal);
 
             // Don't add invalid positions (indicating precision issues)
diff --git a/src/navigation/pathcurves/zoomoutoverviewcurve.cpp b/src/navigation/pathcurves/zoomoutoverviewcurve.cpp
index 36367c7224..e34b051a4f 100644
--- a/src/navigation/pathcurves/zoomoutoverviewcurve.cpp
+++ b/src/navigation/pathcurves/zoomoutoverviewcurve.cpp
@@ -71,8 +71,8 @@ ZoomOutOverviewCurve::ZoomOutOverviewCurve(const Waypoint& start, const Waypoint
     if (start.nodeIdentifier() != end.nodeIdentifier() &&
         glm::length(startPosToEndPos) > Epsilon)
     {
-        const glm::dvec3 n1 = startTangentDir;
-        const glm::dvec3 n2 = endTangentDir;
+        const glm::dvec3& n1 = startTangentDir;
+        const glm::dvec3& n2 = endTangentDir;
         const glm::dvec3 halfWayPos = start.position() + 0.5 * startPosToEndPos;
 
         // Decide the step direction for the "overview point" based on the directions
diff --git a/src/navigation/pathnavigator.cpp b/src/navigation/pathnavigator.cpp
index 3b1daed7ce..b5410c03fa 100644
--- a/src/navigation/pathnavigator.cpp
+++ b/src/navigation/pathnavigator.cpp
@@ -32,7 +32,6 @@
 #include <openspace/events/eventengine.h>
 #include <openspace/navigation/navigationhandler.h>
 #include <openspace/navigation/navigationstate.h>
-#include <openspace/navigation/pathnavigator.h>
 #include <openspace/query/query.h>
 #include <openspace/rendering/renderengine.h>
 #include <openspace/scene/scene.h>
@@ -267,7 +266,7 @@ void PathNavigator::updateCamera(double deltaTime) {
 
     // Set anchor node in orbitalNavigator, to render visible nodes and add activate
     // navigation when we reach the end.
-    std::string currentAnchor = anchor()->identifier();
+    const std::string currentAnchor = anchor()->identifier();
     if (currentAnchor != newAnchor) {
         global::navigationHandler->orbitalNavigator().setFocusNode(newAnchor, false);
     }
@@ -294,7 +293,7 @@ void PathNavigator::updateCamera(double deltaTime) {
 }
 
 void PathNavigator::createPath(const ghoul::Dictionary& dictionary) {
-    OpenSpaceEngine::Mode m = global::openSpaceEngine->currentMode();
+    const OpenSpaceEngine::Mode m = global::openSpaceEngine->currentMode();
     if (m == OpenSpaceEngine::Mode::SessionRecordingPlayback) {
         // Silently ignore any paths that are being created during a session recording
         // playback. The camera path should already have been recorded
@@ -334,7 +333,9 @@ void PathNavigator::startPath() {
         return;
     }
 
-    bool success = global::openSpaceEngine->setMode(OpenSpaceEngine::Mode::CameraPath);
+    const bool success = global::openSpaceEngine->setMode(
+        OpenSpaceEngine::Mode::CameraPath
+    );
     if (!success) {
         LERROR("Could not start camera path");
         return; // couldn't switch to camera path mode
@@ -427,8 +428,8 @@ double PathNavigator::findValidBoundingSphere(const SceneGraphNode* node) const
         // Use the biggest of the bounding sphere and interaction sphere,
         // so we don't accidentally choose a bounding sphere that is much smaller
         // than the interaction sphere of the node
-        double bs = n->boundingSphere();
-        double is = n->interactionSphere();
+        const double bs = n->boundingSphere();
+        const double is = n->interactionSphere();
         return std::max(is, bs);
     };
 
@@ -497,7 +498,7 @@ void PathNavigator::findRelevantNodes() {
     }
 
     auto isRelevant = [&relevantTags](const SceneGraphNode* node) {
-        const std::vector<std::string> tags = node->tags();
+        const std::vector<std::string>& tags = node->tags();
         auto result = std::find_first_of(
             relevantTags.begin(),
             relevantTags.end(),
@@ -547,7 +548,7 @@ SceneGraphNode* PathNavigator::findNodeNearTarget(const SceneGraphNode* node) {
         const glm::dvec3 posInModelCoords =
             glm::inverse(n->modelTransform()) * glm::dvec4(node->worldPosition(), 1.0);
 
-        bool isClose = collision::isPointInsideSphere(
+        const bool isClose = collision::isPointInsideSphere(
             posInModelCoords,
             glm::dvec3(0.0, 0.0, 0.0),
             proximityRadius
@@ -561,7 +562,7 @@ SceneGraphNode* PathNavigator::findNodeNearTarget(const SceneGraphNode* node) {
     return nullptr;
 }
 
-void PathNavigator::removeRollRotation(CameraPose& pose) {
+void PathNavigator::removeRollRotation(CameraPose& pose) const {
     // The actual position for the camera does not really matter. Use the origin,
     // to avoid precision problems when we have large values for the position
     const glm::dvec3 cameraPos = glm::dvec3(0.0);
@@ -573,9 +574,9 @@ void PathNavigator::removeRollRotation(CameraPose& pose) {
     // enough away from the camera
     constexpr double NotTooCloseDistance = 10000.0;
 
-    glm::dvec3 lookAtPos = cameraPos + NotTooCloseDistance * cameraDir;
+    const glm::dvec3 lookAtPos = cameraPos + NotTooCloseDistance * cameraDir;
 
-    glm::dquat rollFreeRotation = ghoul::lookAtQuaternion(
+    const glm::dquat rollFreeRotation = ghoul::lookAtQuaternion(
         cameraPos,
         lookAtPos,
         camera()->lookUpVectorWorldSpace()
diff --git a/src/navigation/waypoint.cpp b/src/navigation/waypoint.cpp
index 155a0852f8..7fad87329c 100644
--- a/src/navigation/waypoint.cpp
+++ b/src/navigation/waypoint.cpp
@@ -43,8 +43,8 @@ namespace {
 
 namespace openspace::interaction {
 
-Waypoint::Waypoint(const glm::dvec3& pos, const glm::dquat& rot, const std::string& ref)
-    : _nodeIdentifier(ref)
+Waypoint::Waypoint(const glm::dvec3& pos, const glm::dquat& rot, std::string ref)
+    : _nodeIdentifier(std::move(ref))
 {
     _pose = { .position = pos, .rotation = rot };
 
@@ -172,7 +172,7 @@ glm::dvec3 computeGoodStepDirection(const SceneGraphNode* targetNode,
 }
 
 Waypoint computeWaypointFromNodeInfo(const NodeCameraStateSpec& spec,
-                                     std::optional<Waypoint> startPoint,
+                                     const std::optional<Waypoint>& startPoint,
                                      bool useLinear)
 {
     const SceneGraphNode* targetNode = sceneGraphNode(spec.identifier);
@@ -182,14 +182,14 @@ Waypoint computeWaypointFromNodeInfo(const NodeCameraStateSpec& spec,
     }
 
     // Use current camera position if no previous point was specified
-    Waypoint prevPoint = startPoint.value_or(waypointFromCamera());
+    const Waypoint prevPoint = startPoint.value_or(waypointFromCamera());
 
     glm::dvec3 stepDir;
-    glm::dvec3 targetPos;
+    glm::dvec3 cameraPos;
     if (spec.position.has_value()) {
         // The position in instruction is given in the targetNode's local coordinates.
         // Convert to world coordinates
-        targetPos = glm::dvec3(
+        cameraPos = glm::dvec3(
             targetNode->modelTransform() * glm::dvec4(*spec.position, 1.0)
         );
     }
@@ -203,14 +203,14 @@ Waypoint computeWaypointFromNodeInfo(const NodeCameraStateSpec& spec,
 
         if (useLinear) {
             // If linear path, compute position along line form start to end point
-            glm::dvec3 endNodePos = targetNode->worldPosition();
+            const glm::dvec3 endNodePos = targetNode->worldPosition();
             stepDir = glm::normalize(prevPoint.position() - endNodePos);
         }
         else {
             stepDir = computeGoodStepDirection(targetNode, prevPoint);
         }
 
-        targetPos = targetNode->worldPosition() + stepDir * distanceFromNodeCenter;
+        cameraPos = targetNode->worldPosition() + stepDir * distanceFromNodeCenter;
     }
 
     glm::dvec3 up = global::navigationHandler->camera()->lookUpVectorWorldSpace();
@@ -224,20 +224,20 @@ Waypoint computeWaypointFromNodeInfo(const NodeCameraStateSpec& spec,
     // Compute rotation so the camera is looking at the targetted node
     glm::dvec3 lookAtPos = targetNode->worldPosition();
 
-    // Check if we can distinguish between targetpos and lookAt pos. Otherwise, move it
+    // Check if we can distinguish between cameraPos and lookAt pos. Otherwise, move it
     // further away
-    const glm::dvec3 diff = targetPos - lookAtPos;
-    double distSquared = glm::dot(diff, diff);
+    const glm::dvec3 diff = cameraPos - lookAtPos;
+    const double distSquared = glm::dot(diff, diff);
     if (std::isnan(distSquared) || distSquared < LengthEpsilon) {
-        double startToEndDist = glm::length(
+        const double startToEndDist = glm::length(
             prevPoint.position() - targetNode->worldPosition()
         );
-        lookAtPos = targetPos - stepDir * 0.1 * startToEndDist;
+        lookAtPos = cameraPos - stepDir * 0.1 * startToEndDist;
     }
 
-    const glm::dquat targetRot = ghoul::lookAtQuaternion(targetPos, lookAtPos, up);
+    const glm::dquat targetRot = ghoul::lookAtQuaternion(cameraPos, lookAtPos, up);
 
-    return Waypoint(targetPos, targetRot, spec.identifier);
+    return Waypoint(cameraPos, targetRot, spec.identifier);
 }
 
 } // namespace openspace::interaction
diff --git a/src/network/parallelconnection.cpp b/src/network/parallelconnection.cpp
index a2729d1f08..36a013b6cf 100644
--- a/src/network/parallelconnection.cpp
+++ b/src/network/parallelconnection.cpp
@@ -158,7 +158,7 @@ ParallelConnection::Message ParallelConnection::receiveMessage() {
     }
 
     // Make sure that header matches this version of OpenSpace
-    if (!(headerBuffer[0] == 'O' && headerBuffer[1] == 'S')) {
+    if (headerBuffer[0] != 'O' || headerBuffer[1] != 'S') {
         LERROR("Expected to read message header 'OS' from socket");
         throw ConnectionLostError();
     }
diff --git a/src/network/parallelpeer.cpp b/src/network/parallelpeer.cpp
index 988ec47d1d..c3296a4ccd 100644
--- a/src/network/parallelpeer.cpp
+++ b/src/network/parallelpeer.cpp
@@ -247,7 +247,7 @@ void ParallelPeer::sendAuthentication() {
 }
 
 void ParallelPeer::queueInMessage(const ParallelConnection::Message& message) {
-    std::lock_guard unqlock(_receiveBufferMutex);
+    const std::lock_guard unqlock(_receiveBufferMutex);
     _receiveBuffer.push_back(message);
 }
 
@@ -269,7 +269,7 @@ void ParallelPeer::handleMessage(const ParallelConnection::Message& message) {
 }
 
 void ParallelPeer::analyzeTimeDifference(double messageTimestamp) {
-    std::lock_guard latencyLock(_latencyMutex);
+    const std::lock_guard latencyLock(_latencyMutex);
 
     const double timeDiff = global::windowDelegate->applicationTime() - messageTimestamp;
     if (_latencyDiffs.empty()) {
@@ -283,7 +283,7 @@ void ParallelPeer::analyzeTimeDifference(double messageTimestamp) {
 }
 
 double ParallelPeer::convertTimestamp(double messageTimestamp) {
-    std::lock_guard latencyLock(_latencyMutex);
+    const std::lock_guard latencyLock(_latencyMutex);
     return messageTimestamp + _initialTimeDiff + _bufferTime;
 }
 
@@ -291,7 +291,7 @@ double ParallelPeer::convertTimestamp(double messageTimestamp) {
 double ParallelPeer::latencyStandardDeviation() const {
     double accumulatedLatencyDiffSquared = 0;
     double accumulatedLatencyDiff = 0;
-    for (double diff : _latencyDiffs) {
+    for (const double diff : _latencyDiffs) {
         accumulatedLatencyDiff += diff;
         accumulatedLatencyDiffSquared += diff*diff;
     }
@@ -319,11 +319,10 @@ void ParallelPeer::dataMessageReceived(const std::vector<char>& message) {
 
     analyzeTimeDifference(timestamp);
 
-    std::vector<char> buffer(message.begin() + offset, message.end());
-
+    const std::vector<char> buffer(message.begin() + offset, message.end());
     switch (static_cast<datamessagestructures::Type>(type)) {
         case datamessagestructures::Type::CameraData: {
-            datamessagestructures::CameraKeyframe kf(buffer);
+            const datamessagestructures::CameraKeyframe kf(buffer);
             const double convertedTimestamp = convertTimestamp(kf._timestamp);
 
             global::navigationHandler->keyframeNavigator().removeKeyframesAfter(
@@ -345,7 +344,7 @@ void ParallelPeer::dataMessageReceived(const std::vector<char>& message) {
         }
         case datamessagestructures::Type::TimelineData: {
             const double now = global::windowDelegate->applicationTime();
-            datamessagestructures::TimeTimeline timelineMessage(buffer);
+            const datamessagestructures::TimeTimeline timelineMessage(buffer);
 
             if (timelineMessage._clear) {
                 global::timeManager->removeKeyframesAfter(
@@ -435,7 +434,6 @@ void ParallelPeer::connectionStatusMessageReceived(const std::vector<char>& mess
     if (hostNameSize > 0) {
         hostName = std::string(&message[pointer], hostNameSize);
     }
-    pointer += hostNameSize;
 
     if (status > ParallelConnection::Status::Host) {
         LERROR("Invalid status");
@@ -463,16 +461,17 @@ void ParallelPeer::nConnectionsMessageReceived(const std::vector<char>& message)
         LERROR("Malformed host info message");
         return;
     }
-    const uint32_t nConnections = *(reinterpret_cast<const uint32_t*>(&message[0]));
+    const uint32_t nConnections = *(reinterpret_cast<const uint32_t*>(message.data()));
     setNConnections(nConnections);
 }
 
 void ParallelPeer::handleCommunication() {
     while (!_shouldDisconnect && _connection.isConnectedOrConnecting()) {
         try {
-            ParallelConnection::Message m = _connection.receiveMessage();
+            const ParallelConnection::Message m = _connection.receiveMessage();
             queueInMessage(m);
-        } catch (const ParallelConnection::ConnectionLostError& e) {
+        }
+        catch (const ParallelConnection::ConnectionLostError& e) {
             if (e.shouldLogError) {
                 LERROR("Parallel connection lost");
             }
@@ -504,18 +503,21 @@ void ParallelPeer::requestHostship() {
     );
     buffer.insert(buffer.end(), hostPw.begin(), hostPw.end());
 
-    _connection.sendMessage(ParallelConnection::Message(
-        ParallelConnection::MessageType::HostshipRequest,
-        buffer
-    ));
+    _connection.sendMessage(
+        ParallelConnection::Message(
+            ParallelConnection::MessageType::HostshipRequest,
+            buffer
+        )
+    );
 }
 
 void ParallelPeer::resignHostship() {
-    std::vector<char> buffer;
-    _connection.sendMessage(ParallelConnection::Message(
-        ParallelConnection::MessageType::HostshipResignation,
-        buffer
-    ));
+    _connection.sendMessage(
+        ParallelConnection::Message(
+            ParallelConnection::MessageType::HostshipResignation,
+            std::vector<char>()
+        )
+    );
 }
 
 void ParallelPeer::setPassword(std::string password) {
@@ -537,8 +539,8 @@ void ParallelPeer::sendScript(std::string script) {
     std::vector<char> buffer;
     sm.serialize(buffer);
 
-    double timestamp = global::windowDelegate->applicationTime();
-    ParallelConnection::DataMessage message(
+    const double timestamp = global::windowDelegate->applicationTime();
+    const ParallelConnection::DataMessage message = ParallelConnection::DataMessage(
         datamessagestructures::Type::ScriptData,
         timestamp,
         buffer
@@ -549,22 +551,22 @@ void ParallelPeer::sendScript(std::string script) {
 void ParallelPeer::resetTimeOffset() {
     global::navigationHandler->keyframeNavigator().clearKeyframes();
     global::timeManager->clearKeyframes();
-    std::lock_guard latencyLock(_latencyMutex);
+    const std::lock_guard latencyLock(_latencyMutex);
     _latencyDiffs.clear();
 }
 
 void ParallelPeer::preSynchronization() {
     ZoneScoped;
 
-    std::unique_lock<std::mutex> unlock(_receiveBufferMutex);
+    const std::unique_lock unlock(_receiveBufferMutex);
     while (!_receiveBuffer.empty()) {
-        ParallelConnection::Message& message = _receiveBuffer.front();
+        const ParallelConnection::Message& message = _receiveBuffer.front();
         handleMessage(message);
         _receiveBuffer.pop_front();
     }
 
     if (isHost()) {
-        double now = global::windowDelegate->applicationTime();
+        const double now = global::windowDelegate->applicationTime();
 
         if (_lastCameraKeyframeTimestamp + _cameraKeyframeInterval < now) {
             sendCameraKeyframe();
@@ -586,7 +588,7 @@ void ParallelPeer::preSynchronization() {
 
 void ParallelPeer::setStatus(ParallelConnection::Status status) {
     if (_status != status) {
-        ParallelConnection::Status prevStatus = _status;
+        const ParallelConnection::Status prevStatus = _status;
         _status = status;
         _timeJumped = true;
         _connectionEvent->publish("statusChanged");
@@ -768,7 +770,7 @@ void ParallelPeer::sendTimeTimeline() {
     // Fill the timeline buffer
     timelineMessage.serialize(buffer);
 
-    double timestamp = global::windowDelegate->applicationTime();
+    const double timestamp = global::windowDelegate->applicationTime();
     // Send message
     _connection.sendDataMessage(ParallelConnection::DataMessage(
         datamessagestructures::Type::TimelineData,
diff --git a/src/properties/list/doublelistproperty.cpp b/src/properties/list/doublelistproperty.cpp
index f7918f0afc..eb3ae55a6b 100644
--- a/src/properties/list/doublelistproperty.cpp
+++ b/src/properties/list/doublelistproperty.cpp
@@ -46,7 +46,7 @@ int DoubleListProperty::typeLua() const {
 }
 
 std::string DoubleListProperty::toStringConversion() const {
-    nlohmann::json json(_value);
+    const nlohmann::json json(_value);
     return json.dump();
 }
 
diff --git a/src/properties/list/intlistproperty.cpp b/src/properties/list/intlistproperty.cpp
index 04b30da344..82669b0ad5 100644
--- a/src/properties/list/intlistproperty.cpp
+++ b/src/properties/list/intlistproperty.cpp
@@ -45,7 +45,7 @@ int IntListProperty::typeLua() const {
 }
 
 std::string IntListProperty::toStringConversion() const {
-    nlohmann::json json(_value);
+    const nlohmann::json json = _value;
     return json.dump();
 }
 
diff --git a/src/properties/list/stringlistproperty.cpp b/src/properties/list/stringlistproperty.cpp
index 8f1458f063..64f198f4d7 100644
--- a/src/properties/list/stringlistproperty.cpp
+++ b/src/properties/list/stringlistproperty.cpp
@@ -46,7 +46,7 @@ int StringListProperty::typeLua() const {
 }
 
 std::string StringListProperty::toStringConversion() const {
-    nlohmann::json json(_value);
+    const nlohmann::json json = nlohmann::json(_value);
     return json.dump();
 }
 
diff --git a/src/properties/optionproperty.cpp b/src/properties/optionproperty.cpp
index 65f754373e..d1b28ffac3 100644
--- a/src/properties/optionproperty.cpp
+++ b/src/properties/optionproperty.cpp
@@ -59,7 +59,7 @@ const std::vector<OptionProperty::Option>& OptionProperty::options() const {
 }
 
 void OptionProperty::addOption(int value, std::string desc) {
-    Option option = { .value = std::move(value), .description = std::move(desc) };
+    Option option = { .value = value, .description = std::move(desc) };
 
     for (const Option& o : _options) {
         if (o.value == option.value) {
@@ -79,7 +79,7 @@ void OptionProperty::addOption(int value, std::string desc) {
 
 void OptionProperty::addOptions(std::vector<std::pair<int, std::string>> options) {
     for (std::pair<int, std::string>& p : options) {
-        addOption(std::move(p.first), std::move(p.second));
+        addOption(p.first, std::move(p.second));
     }
 }
 
@@ -96,9 +96,8 @@ void OptionProperty::clearOptions() {
 
 void OptionProperty::setValue(int value) {
     // Check if the passed value belongs to any option
-    for (size_t i = 0; i < _options.size(); i++) {
-        const Option& o = _options[i];
-        if (o.value == value) {
+    for (const Option& option : _options) {
+        if (option.value == value) {
             // If it does, set it by calling the superclasses setValue method
             // @TODO(abock): This should be setValue(value) instead or otherwise the
             //               stored indices and option values start to drift if the
@@ -154,14 +153,13 @@ std::string OptionProperty::getDescriptionByValue(int value) {
 
 std::string OptionProperty::generateAdditionalJsonDescription() const {
     // @REFACTOR from selectionproperty.cpp, possible refactoring? ---abock
-    std::string result =
-        "{ \"" + OptionsKey + "\": [";
+    std::string result = "{ \"" + OptionsKey + "\": [";
     for (size_t i = 0; i < _options.size(); i++) {
         const Option& o = _options[i];
-        std::string v = std::to_string(o.value);
-        std::string vSan = escapedJson(v);
-        std::string d = o.description;
-        std::string dSan = escapedJson(d);
+        const std::string v = std::to_string(o.value);
+        const std::string vSan = escapedJson(v);
+        const std::string d = o.description;
+        const std::string dSan = escapedJson(d);
 
         result += '{';
         result += fmt::format(R"("{}": "{}")", vSan, dSan);
diff --git a/src/properties/property.cpp b/src/properties/property.cpp
index 344f7721dd..206511bd49 100644
--- a/src/properties/property.cpp
+++ b/src/properties/property.cpp
@@ -80,9 +80,9 @@ std::string Property::fullyQualifiedIdentifier() const {
     std::string identifier = _identifier;
     PropertyOwner* currentOwner = owner();
     while (currentOwner) {
-        std::string ownerId = currentOwner->identifier();
+        const std::string& ownerId = currentOwner->identifier();
         if (!ownerId.empty()) {
-            identifier = ownerId + "." + identifier;
+            identifier = fmt::format("{}.{}", ownerId, identifier);
         }
         currentOwner = currentOwner->owner();
     }
@@ -157,7 +157,7 @@ void Property::setNeedsConfirmation(bool state) {
 
 void Property::setViewOption(std::string option, bool value) {
     ghoul::Dictionary d;
-    d.setValue(option, value);
+    d.setValue(std::move(option), value);
     _metaData.setValue(std::string(MetaDataKeyViewOptions), d);
 }
 
@@ -165,7 +165,8 @@ bool Property::viewOption(const std::string& option, bool defaultValue) const {
     if (!_metaData.hasValue<ghoul::Dictionary>(MetaDataKeyViewOptions)) {
         return defaultValue;
     }
-    ghoul::Dictionary d = _metaData.value<ghoul::Dictionary>(MetaDataKeyViewOptions);
+    const ghoul::Dictionary d =
+        _metaData.value<ghoul::Dictionary>(MetaDataKeyViewOptions);
     if (d.hasKey(option)) {
         return d.value<bool>(option);
     }
@@ -185,7 +186,7 @@ std::string Property::jsonValue() const {
 Property::OnChangeHandle Property::onChange(std::function<void()> callback) {
     ghoul_assert(callback, "The callback must not be empty");
 
-    OnChangeHandle handle = _currentHandleValue++;
+    const OnChangeHandle handle = _currentHandleValue++;
     _onChangeCallbacks.emplace_back(handle, std::move(callback));
     return handle;
 }
@@ -193,7 +194,7 @@ Property::OnChangeHandle Property::onChange(std::function<void()> callback) {
 Property::OnChangeHandle Property::onDelete(std::function<void()> callback) {
     ghoul_assert(callback, "The callback must not be empty");
 
-    OnDeleteHandle handle = _currentHandleValue++;
+    const OnDeleteHandle handle = _currentHandleValue++;
     _onDeleteCallbacks.emplace_back(handle, std::move(callback));
     return handle;
 }
@@ -266,13 +267,13 @@ void Property::resetToUnchanged() {
 }
 
 std::string Property::generateJsonDescription() const {
-    std::string cName = escapedJson(std::string(className()));
-    std::string identifier = fullyQualifiedIdentifier();
-    std::string identifierSan = escapedJson(identifier);
-    std::string gName = guiName();
-    std::string gNameSan = escapedJson(gName);
-    std::string metaData = generateMetaDataJsonDescription();
-    std::string description = generateAdditionalJsonDescription();
+    const std::string cName = escapedJson(std::string(className()));
+    const std::string identifier = fullyQualifiedIdentifier();
+    const std::string identifierSan = escapedJson(identifier);
+    const std::string gName = guiName();
+    const std::string gNameSan = escapedJson(gName);
+    const std::string metaData = generateMetaDataJsonDescription();
+    const std::string description = generateAdditionalJsonDescription();
 
     return fmt::format(
         R"({{"{}":"{}","{}":"{}","{}":"{}","{}":{},"{}":{}}})",
@@ -290,8 +291,9 @@ std::string Property::generateMetaDataJsonDescription() const {
         { Visibility::Developer, "Developer" },
         { Visibility::Hidden, "Hidden" }
     };
-    Visibility visibility = static_cast<Visibility>(
-        _metaData.value<std::underlying_type_t<Visibility>>(MetaDataKeyVisibility));
+    const Visibility visibility = static_cast<Visibility>(
+        _metaData.value<std::underlying_type_t<Visibility>>(MetaDataKeyVisibility)
+    );
     const std::string& vis = VisibilityConverter.at(visibility);
 
     bool isReadOnly = false;
@@ -306,8 +308,8 @@ std::string Property::generateMetaDataJsonDescription() const {
     }
     std::string needsConfirmationString = (needsConfirmation ? "true" : "false");
 
-    std::string groupId = groupIdentifier();
-    std::string sanitizedGroupId = escapedJson(groupId);
+    const std::string groupId = groupIdentifier();
+    const std::string sanitizedGroupId = escapedJson(groupId);
 
     std::string viewOptions = "{}";
     if (_metaData.hasValue<ghoul::Dictionary>(MetaDataKeyViewOptions)) {
diff --git a/src/properties/propertyowner.cpp b/src/properties/propertyowner.cpp
index 6478b7ec11..cfb7332b25 100644
--- a/src/properties/propertyowner.cpp
+++ b/src/properties/propertyowner.cpp
@@ -58,7 +58,7 @@ namespace {
         for (properties::Property* p : properties) {
             nlohmann::json propertyJson;
             std::string name = !p->guiName().empty() ? p->guiName() : p->identifier();
-            propertyJson["name"] = name;
+            propertyJson["name"] = std::move(name);
             propertyJson["type"] = p->className();
             propertyJson["uri"] = p->fullyQualifiedIdentifier();
             propertyJson["identifier"] = p->identifier();
@@ -70,7 +70,6 @@ namespace {
 
         auto propertyOwners = owner->propertySubOwners();
         for (properties::PropertyOwner* o : propertyOwners) {
-            nlohmann::json propertyOwner;
             json["propertyOwners"].push_back(createJson(o));
         }
         sortJson(json["propertyOwners"], "name");
@@ -157,10 +156,7 @@ bool PropertyOwner::hasProperty(const std::string& uri) const {
 bool PropertyOwner::hasProperty(const Property* prop) const {
     ghoul_precondition(prop != nullptr, "prop must not be nullptr");
 
-    std::vector<Property*>::const_iterator it = std::find(
-        _properties.begin(), _properties.end(), prop
-    );
-
+    auto it = std::find(_properties.begin(), _properties.end(), prop);
     return it != _properties.end();
 }
 
@@ -169,7 +165,7 @@ const std::vector<PropertyOwner*>& PropertyOwner::propertySubOwners() const {
 }
 
 PropertyOwner* PropertyOwner::propertySubOwner(const std::string& identifier) const {
-    std::vector<PropertyOwner*>::const_iterator it = std::find_if(
+    auto it = std::find_if(
         _subOwners.begin(),
         _subOwners.end(),
         [&identifier](PropertyOwner* owner) { return owner->identifier() == identifier; }
@@ -209,7 +205,7 @@ void PropertyOwner::addProperty(Property* prop) {
         return;
     }
     // See if we can find the identifier of the property to add in the properties list
-    std::vector<Property*>::const_iterator it = std::find_if(
+    auto it = std::find_if(
         _properties.begin(),
         _properties.end(),
         [id = prop->identifier()](Property* p) { return p->identifier() == id; }
@@ -253,7 +249,7 @@ void PropertyOwner::addPropertySubOwner(openspace::properties::PropertyOwner* ow
     );
 
     // See if we can find the name of the propertyowner to add using the lower bound
-    std::vector<PropertyOwner*>::const_iterator it = std::find_if(
+    auto it = std::find_if(
         _subOwners.begin(),
         _subOwners.end(),
         [identifier = owner->identifier()](PropertyOwner* o) {
@@ -294,7 +290,7 @@ void PropertyOwner::removeProperty(Property* prop) {
     ghoul_precondition(prop != nullptr, "prop must not be nullptr");
 
     // See if we can find the identifier of the property to add in the properties list
-    std::vector<Property*>::const_iterator it = std::find_if(
+    auto it = std::find_if(
         _properties.begin(),
         _properties.end(),
         [id = prop->identifier()](Property* p) { return p->identifier() == id; }
@@ -320,7 +316,7 @@ void PropertyOwner::removePropertySubOwner(openspace::properties::PropertyOwner*
     ghoul_precondition(owner != nullptr, "owner must not be nullptr");
 
     // See if we can find the name of the propertyowner to add
-    std::vector<PropertyOwner*>::const_iterator it = std::find_if(
+    auto it = std::find_if(
         _subOwners.begin(),
         _subOwners.end(),
         [identifier = owner->identifier()](PropertyOwner* o) {
@@ -390,12 +386,11 @@ nlohmann::json PropertyOwner::generateJson() const {
     ZoneScoped;
 
     nlohmann::json json;
-    std::vector<PropertyOwner*> subOwners = propertySubOwners();
+    const std::vector<PropertyOwner*>& subOwners = propertySubOwners();
     for (PropertyOwner* owner : subOwners) {
         if (owner->identifier() != "Scene") {
             nlohmann::json jsonOwner = createJson(owner);
-
-            json.push_back(jsonOwner);
+            json.push_back(std::move(jsonOwner));
         }
     }
     sortJson(json, "name");
diff --git a/src/properties/selectionproperty.cpp b/src/properties/selectionproperty.cpp
index 00dd9390fe..8830ca4c83 100644
--- a/src/properties/selectionproperty.cpp
+++ b/src/properties/selectionproperty.cpp
@@ -99,7 +99,7 @@ void SelectionProperty::setOptions(const std::vector<std::string>& keys) {
     sortOptions();
 
     // In case we have a selection, remove non-existing options
-    bool changed = removeInvalidKeys(_value);
+    const bool changed = removeInvalidKeys(_value);
     if (changed) {
         _isValueDirty = true;
     }
@@ -135,12 +135,12 @@ std::set<std::string> SelectionProperty::fromLuaConversion(lua_State* state) con
 }
 
 void SelectionProperty::toLuaConversion(lua_State* state) const {
-    std::vector<std::string> value(_value.begin(), _value.end());
+    const std::vector<std::string> value(_value.begin(), _value.end());
     ghoul::lua::push(state, value);
 }
 
 std::string SelectionProperty::toStringConversion() const {
-    nlohmann::json json(_value);
+    const nlohmann::json json(_value);
     return json.dump();
 }
 
@@ -148,9 +148,9 @@ void SelectionProperty::sortOptions() {
     std::sort(_options.begin(), _options.end());
 }
 
-bool SelectionProperty::removeInvalidKeys(std::set<std::string>& keys) {
+bool SelectionProperty::removeInvalidKeys(std::set<std::string>& keys) const {
     bool changed = false;
-    std::set<std::string>::iterator it = keys.begin();
+    auto it = keys.begin();
     while (it != keys.end()) {
         if (!hasOption(*it)) {
             LWARNING(fmt::format(
@@ -167,10 +167,10 @@ bool SelectionProperty::removeInvalidKeys(std::set<std::string>& keys) {
 }
 
 std::string SelectionProperty::generateAdditionalJsonDescription() const {
-    nlohmann::json optionsJson(_options);
-    std::string result = "{ ";
-    result += fmt::format("\"{}\": {}", OptionsKey, optionsJson.dump());
-    result += " }";
+    const nlohmann::json optionsJson(_options);
+    std::string result = fmt::format(
+        R"({{ "{}": {} }})", OptionsKey, optionsJson.dump()
+    );
     return result;
 }
 
diff --git a/src/rendering/colormappingcomponent.cpp b/src/rendering/colormappingcomponent.cpp
index 0300b296a8..44abbbdd1f 100644
--- a/src/rendering/colormappingcomponent.cpp
+++ b/src/rendering/colormappingcomponent.cpp
@@ -240,7 +240,7 @@ ColorMappingComponent::ColorMappingComponent()
     addProperty(setRangeFromData);
 
     colorMapFile.onChange([this]() {
-        bool fileExists = std::filesystem::exists(colorMapFile.value());
+        const bool fileExists = std::filesystem::exists(colorMapFile.value());
         if (!fileExists) {
             LERROR(fmt::format("Could not find cmap file: {}", colorMapFile.value()));
         }
@@ -354,9 +354,9 @@ void ColorMappingComponent::initializeTexture() {
         return;
     }
 
-    unsigned int width = static_cast<unsigned int>(_colorMap.entries.size());
-    unsigned int height = 1;
-    unsigned int size = width * height;
+    const unsigned int width = static_cast<unsigned int>(_colorMap.entries.size());
+    const unsigned int height = 1;
+    const unsigned int size = width * height;
     std::vector<GLubyte> img;
     img.reserve(size * 4);
 
@@ -399,14 +399,14 @@ void ColorMappingComponent::update(const dataloader::Dataset& dataset) {
 }
 
 glm::vec4 ColorMappingComponent::colorFromColorMap(float valueToColorFrom) const {
-    glm::vec2 currentColorRange = valueRange;
-    float cmax = currentColorRange.y;
-    float cmin = currentColorRange.x;
+    const glm::vec2 currentColorRange = valueRange;
+    const float cmax = currentColorRange.y;
+    const float cmin = currentColorRange.x;
 
-    float nColors = static_cast<float>(_colorMap.entries.size());
+    const float nColors = static_cast<float>(_colorMap.entries.size());
 
-    bool isOutsideMin = valueToColorFrom < cmin;
-    bool isOutsideMax = valueToColorFrom > cmax;
+    const bool isOutsideMin = valueToColorFrom < cmin;
+    const bool isOutsideMax = valueToColorFrom > cmax;
 
     if (hideOutsideRange && (isOutsideMin || isOutsideMax)) {
         return glm::vec4(0.f);
@@ -417,7 +417,7 @@ glm::vec4 ColorMappingComponent::colorFromColorMap(float valueToColorFrom) const
     }
 
     // Find color value using Nearest neighbor (same as texture)
-    float normalization = (cmax != cmin) ? (nColors) / (cmax - cmin) : 0;
+    const float normalization = (cmax != cmin) ? (nColors) / (cmax - cmin) : 0;
     int colorIndex = static_cast<int>((valueToColorFrom - cmin) * normalization);
 
     // Clamp color index to valid range
@@ -434,8 +434,8 @@ void ColorMappingComponent::initializeParameterData(const dataloader::Dataset& d
 
     // Initialize empty ranges based on values in the dataset
     for (const properties::OptionProperty::Option& option : dataColumn.options()) {
-        int optionIndex = option.value;
-        int colorParameterIndex = dataset.index(option.description);
+        const int optionIndex = option.value;
+        const int colorParameterIndex = dataset.index(option.description);
 
         glm::vec2& range = _colorRangeData[optionIndex];
         if (glm::length(range) < glm::epsilon<float>()) {
diff --git a/src/rendering/dashboarditem.cpp b/src/rendering/dashboarditem.cpp
index 2fce1a640f..2d73518b8b 100644
--- a/src/rendering/dashboarditem.cpp
+++ b/src/rendering/dashboarditem.cpp
@@ -61,7 +61,7 @@ documentation::Documentation DashboardItem::Documentation() {
 }
 
 std::unique_ptr<DashboardItem> DashboardItem::createFromDictionary(
-                                                             ghoul::Dictionary dictionary)
+                                                      const ghoul::Dictionary& dictionary)
 {
     ghoul::TemplateFactory<DashboardItem>* factory =
         FactoryManager::ref().factory<DashboardItem>();
@@ -69,7 +69,7 @@ std::unique_ptr<DashboardItem> DashboardItem::createFromDictionary(
 
     const std::string& dashboardType = dictionary.value<std::string>(KeyType);
 
-    DashboardItem* item = factory->create(dashboardType, std::move(dictionary));
+    DashboardItem* item = factory->create(dashboardType, dictionary);
     item->_type = dashboardType;
 
     return std::unique_ptr<DashboardItem>(item);
diff --git a/src/rendering/framebufferrenderer.cpp b/src/rendering/framebufferrenderer.cpp
index 7aa3fa0e8d..209d308ebc 100644
--- a/src/rendering/framebufferrenderer.cpp
+++ b/src/rendering/framebufferrenderer.cpp
@@ -77,7 +77,7 @@ namespace {
     constexpr std::string_view RenderFragmentShaderPath =
         "${SHADERS}/framebuffer/renderframebuffer.frag";
 
-    const GLenum ColorAttachmentArray[4] = {
+    constexpr std::array<GLenum, 4> ColorAttachmentArray = {
        GL_COLOR_ATTACHMENT0,
        GL_COLOR_ATTACHMENT1,
        GL_COLOR_ATTACHMENT2,
@@ -92,7 +92,7 @@ namespace openspace {
 //============================//
 GLuint FramebufferRenderer::additionalColorTexture1() const {
     // Gives access to the currently NOT used pingPongTexture
-    int unusedPingPongIndex = _pingPongIndex == 0 ? 1 : 0;
+    const int unusedPingPongIndex = _pingPongIndex == 0 ? 1 : 0;
     return _pingPongBuffers.colorTexture[unusedPingPongIndex];
 }
 
@@ -140,7 +140,7 @@ void FramebufferRenderer::initialize() {
 
     LDEBUG("Initializing FramebufferRenderer");
 
-    const GLfloat vertexData[] = {
+    constexpr std::array<GLfloat, 12> VertexData = {
         // x     y
         -1.f, -1.f,
          1.f,  1.f,
@@ -156,7 +156,7 @@ void FramebufferRenderer::initialize() {
     glGenBuffers(1, &_vertexPositionBuffer);
     glBindBuffer(GL_ARRAY_BUFFER, _vertexPositionBuffer);
 
-    glBufferData(GL_ARRAY_BUFFER, sizeof(vertexData), vertexData, GL_STATIC_DRAW);
+    glBufferData(GL_ARRAY_BUFFER, sizeof(VertexData), VertexData.data(), GL_STATIC_DRAW);
     glVertexAttribPointer(0, 2, GL_FLOAT, GL_FALSE, 2 * sizeof(GLfloat), nullptr);
     glEnableVertexAttribArray(0);
 
@@ -492,8 +492,8 @@ void FramebufferRenderer::applyFXAA(const glm::ivec4& viewport) {
         renderedTextureUnit
     );
 
-    glm::vec2 inverseScreenSize = glm::vec2(1.f / _resolution.x, 1.f / _resolution.y);
-    _fxaaProgram->setUniform(_fxaaUniformCache.inverseScreenSize, inverseScreenSize);
+    const glm::vec2 invScreenSize = glm::vec2(1.f / _resolution.x, 1.f / _resolution.y);
+    _fxaaProgram->setUniform(_fxaaUniformCache.inverseScreenSize, invScreenSize);
     _fxaaProgram->setUniform(_fxaaUniformCache.Viewport, glm::vec4(viewport));
     _fxaaProgram->setUniform(_fxaaUniformCache.Resolution, glm::vec2(_resolution));
 
@@ -510,8 +510,8 @@ void FramebufferRenderer::applyFXAA(const glm::ivec4& viewport) {
     _fxaaProgram->deactivate();
 }
 
-void FramebufferRenderer::updateDownscaleTextures() {
-    float cdf = _downscaleVolumeRendering.currentDownscaleFactor;
+void FramebufferRenderer::updateDownscaleTextures() const {
+    const float cdf = _downscaleVolumeRendering.currentDownscaleFactor;
 
     glBindTexture(GL_TEXTURE_2D, _downscaleVolumeRendering.colorTexture);
     glTexImage2D(
@@ -833,7 +833,7 @@ void FramebufferRenderer::updateResolution() {
         glObjectLabel(GL_TEXTURE, _fxaaBuffers.fxaaTexture, -1, "FXAA");
     }
 
-    float cdf = _downscaleVolumeRendering.currentDownscaleFactor;
+    const float cdf = _downscaleVolumeRendering.currentDownscaleFactor;
 
     // Downscale Volume Rendering
     glBindTexture(GL_TEXTURE_2D, _downscaleVolumeRendering.colorTexture);
@@ -853,8 +853,8 @@ void FramebufferRenderer::updateResolution() {
     glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR);
     glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR);
 
-    float volumeBorderColor[] = { 0.f, 0.f, 0.f, 1.f };
-    glTexParameterfv(GL_TEXTURE_2D, GL_TEXTURE_BORDER_COLOR, volumeBorderColor);
+    constexpr std::array<float, 4> VolumeBorderColor = { 0.f, 0.f, 0.f, 1.f };
+    glTexParameterfv(GL_TEXTURE_2D, GL_TEXTURE_BORDER_COLOR, VolumeBorderColor.data());
     if (glbinding::Binding::ObjectLabel.isResolved()) {
         glObjectLabel(
             GL_TEXTURE,
@@ -1019,14 +1019,14 @@ void FramebufferRenderer::updateDeferredcastData() {
     for (Deferredcaster* caster : deferredcasters) {
         DeferredcastData data = { .id = nextId++, .namespaceName = "HELPER" };
 
-        std::filesystem::path vsPath = caster->deferredcastVSPath();
-        std::filesystem::path fsPath = caster->deferredcastFSPath();
+        const std::filesystem::path vsPath = caster->deferredcastVSPath();
+        const std::filesystem::path fsPath = caster->deferredcastFSPath();
 
         ghoul::Dictionary dict;
         dict.setValue("rendererData", _rendererData);
         //dict.setValue("fragmentPath", fsPath);
         dict.setValue("id", data.id);
-        std::filesystem::path helperPath = caster->helperPath();
+        const std::filesystem::path helperPath = caster->helperPath();
         ghoul::Dictionary helpersDict;
         if (!helperPath.empty()) {
             helpersDict.setValue("0", helperPath.string());
@@ -1090,10 +1090,10 @@ void FramebufferRenderer::render(Scene* scene, Camera* camera, float blackoutFac
     glGetIntegerv(GL_FRAMEBUFFER_BINDING, &_defaultFBO);
     global::renderEngine->openglStateCache().setDefaultFramebuffer(_defaultFBO);
 
-    GLint vp[4] = { 0 };
-    glGetIntegerv(GL_VIEWPORT, vp);
-    global::renderEngine->openglStateCache().setViewportState(vp);
-    glm::ivec4 viewport = glm::ivec4(vp[0], vp[1], vp[2], vp[3]);
+    std::array<GLint, 4> vp = {};
+    glGetIntegerv(GL_VIEWPORT, vp.data());
+    global::renderEngine->openglStateCache().setViewportState(vp.data());
+    const glm::ivec4 viewport = glm::ivec4(vp[0], vp[1], vp[2], vp[3]);
 
     // Reset Render Pipeline State
     global::renderEngine->openglStateCache().resetCachedStates();
@@ -1110,36 +1110,35 @@ void FramebufferRenderer::render(Scene* scene, Camera* camera, float blackoutFac
         TracyGpuZone("Deferred G-Buffer");
 
         glBindFramebuffer(GL_FRAMEBUFFER, _gBuffers.framebuffer);
-        glDrawBuffers(3, ColorAttachmentArray);
+        glDrawBuffers(3, ColorAttachmentArray.data());
         glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);
         glClearBufferfv(GL_COLOR, 1, glm::value_ptr(PosBufferClearVal));
     }
-    Time time = global::timeManager->time();
 
     RenderData data = {
         .camera = *camera,
-        .time = std::move(time),
+        .time = global::timeManager->time(),
         .renderBinMask = 0
     };
     RendererTasks tasks;
 
     {
         TracyGpuZone("Background")
-        ghoul::GLDebugGroup group("Background");
+        const ghoul::GLDebugGroup group("Background");
         data.renderBinMask = static_cast<int>(Renderable::RenderBin::Background);
         scene->render(data, tasks);
     }
 
     {
         TracyGpuZone("Opaque")
-        ghoul::GLDebugGroup group("Opaque");
+        const ghoul::GLDebugGroup group("Opaque");
         data.renderBinMask = static_cast<int>(Renderable::RenderBin::Opaque);
         scene->render(data, tasks);
     }
 
     {
         TracyGpuZone("PreDeferredTransparent")
-        ghoul::GLDebugGroup group("PreDeferredTransparent");
+        const ghoul::GLDebugGroup group("PreDeferredTransparent");
         data.renderBinMask = static_cast<int>(
             Renderable::RenderBin::PreDeferredTransparent
         );
@@ -1149,13 +1148,13 @@ void FramebufferRenderer::render(Scene* scene, Camera* camera, float blackoutFac
     // Run Volume Tasks
     {
         TracyGpuZone("Raycaster Tasks")
-        ghoul::GLDebugGroup group("Raycaster Tasks");
+        const ghoul::GLDebugGroup group("Raycaster Tasks");
         performRaycasterTasks(tasks.raycasterTasks, viewport);
     }
 
     if (!tasks.deferredcasterTasks.empty()) {
         TracyGpuZone("Deferred Caster Tasks")
-        ghoul::GLDebugGroup group("Deferred Caster Tasks");
+        const ghoul::GLDebugGroup group("Deferred Caster Tasks");
 
         // We use ping pong rendering in order to be able to render multiple deferred
         // tasks at same time (e.g. more than 1 ATM being seen at once) to the same final
@@ -1171,14 +1170,14 @@ void FramebufferRenderer::render(Scene* scene, Camera* camera, float blackoutFac
 
     {
         TracyGpuZone("Overlay")
-        ghoul::GLDebugGroup group("Overlay");
+        const ghoul::GLDebugGroup group("Overlay");
         data.renderBinMask = static_cast<int>(Renderable::RenderBin::Overlay);
         scene->render(data, tasks);
     }
 
     {
         TracyGpuZone("PostDeferredTransparent")
-        ghoul::GLDebugGroup group("PostDeferredTransparent");
+        const ghoul::GLDebugGroup group("PostDeferredTransparent");
         data.renderBinMask = static_cast<int>(
             Renderable::RenderBin::PostDeferredTransparent
         );
@@ -1187,7 +1186,7 @@ void FramebufferRenderer::render(Scene* scene, Camera* camera, float blackoutFac
 
     {
         TracyGpuZone("Sticker")
-        ghoul::GLDebugGroup group("Sticker");
+        const ghoul::GLDebugGroup group("Sticker");
         data.renderBinMask = static_cast<int>(
             Renderable::RenderBin::Sticker
         );
@@ -1201,7 +1200,7 @@ void FramebufferRenderer::render(Scene* scene, Camera* camera, float blackoutFac
 
     if (_enableFXAA) {
         glBindFramebuffer(GL_FRAMEBUFFER, _fxaaBuffers.fxaaFramebuffer);
-        glDrawBuffers(1, ColorAttachmentArray);
+        glDrawBuffers(1, ColorAttachmentArray.data());
         glDisable(GL_BLEND);
 
     }
@@ -1214,14 +1213,14 @@ void FramebufferRenderer::render(Scene* scene, Camera* camera, float blackoutFac
     {
         // Apply the selected TMO on the results and resolve the result to the default FBO
         TracyGpuZone("Apply TMO");
-        ghoul::GLDebugGroup group("Apply TMO");
+        const ghoul::GLDebugGroup group("Apply TMO");
 
         applyTMO(blackoutFactor, viewport);
     }
 
     if (_enableFXAA) {
         TracyGpuZone("Apply FXAA")
-        ghoul::GLDebugGroup group("Apply FXAA");
+        const ghoul::GLDebugGroup group("Apply FXAA");
         glBindFramebuffer(GL_FRAMEBUFFER, _defaultFBO);
         applyFXAA(viewport);
     }
@@ -1251,13 +1250,13 @@ void FramebufferRenderer::performRaycasterTasks(const std::vector<RaycasterTask>
         if (raycaster->downscaleRender() < 1.f) {
             glBindFramebuffer(GL_FRAMEBUFFER, _downscaleVolumeRendering.framebuffer);
             const float s = raycaster->downscaleRender();
-            GLint newVP[4] = {
+            const std::array<GLint, 4> newVP = {
                 static_cast<GLint>(viewport[0] * s),
                 static_cast<GLint>(viewport[1] * s),
                 static_cast<GLint>(viewport[2] * s),
                 static_cast<GLint>(viewport[3] * s)
             };
-            global::renderEngine->openglStateCache().setViewportState(newVP);
+            global::renderEngine->openglStateCache().setViewportState(newVP.data());
 
             if (_downscaleVolumeRendering.currentDownscaleFactor != s) {
                 _downscaleVolumeRendering.currentDownscaleFactor = s;
@@ -1270,7 +1269,7 @@ void FramebufferRenderer::performRaycasterTasks(const std::vector<RaycasterTask>
         }
 
         glm::vec3 cameraPosition = glm::vec3(0.f);
-        bool isCameraInside = raycaster->isCameraInside(
+        const bool isCameraInside = raycaster->isCameraInside(
             raycasterTask.renderData,
             cameraPosition
         );
@@ -1320,7 +1319,7 @@ void FramebufferRenderer::performRaycasterTasks(const std::vector<RaycasterTask>
             raycastProgram->setUniform("mainDepthTexture", mainDepthTextureUnit);
 
             if (raycaster->downscaleRender() < 1.f) {
-                float scaleDown = raycaster->downscaleRender();
+                const float scaleDown = raycaster->downscaleRender();
                 raycastProgram->setUniform(
                     "windowSize",
                     glm::vec2(_resolution.x * scaleDown, _resolution.y * scaleDown)
@@ -1379,7 +1378,7 @@ void FramebufferRenderer::performDeferredTasks(
 
         if (deferredcastProgram) {
             _pingPongIndex = _pingPongIndex == 0 ? 1 : 0;
-            int fromIndex = _pingPongIndex == 0 ? 1 : 0;
+            const int fromIndex = _pingPongIndex == 0 ? 1 : 0;
             glDrawBuffers(1, &ColorAttachmentArray[_pingPongIndex]);
             glDisablei(GL_BLEND, 0);
             glDisablei(GL_BLEND, 1);
@@ -1462,25 +1461,25 @@ void FramebufferRenderer::setResolution(glm::ivec2 res) {
 }
 
 void FramebufferRenderer::setDisableHDR(bool disable) {
-    _disableHDR = std::move(disable);
+    _disableHDR = disable;
 }
 
 void FramebufferRenderer::setHDRExposure(float hdrExposure) {
     ghoul_assert(hdrExposure > 0.f, "HDR exposure must be greater than zero");
-    _hdrExposure = std::move(hdrExposure);
+    _hdrExposure = hdrExposure;
     updateRendererData();
 }
 
 void FramebufferRenderer::setGamma(float gamma) {
     ghoul_assert(gamma > 0.f, "Gamma value must be greater than zero");
-    _gamma = std::move(gamma);
+    _gamma = gamma;
 }
 
 void FramebufferRenderer::setHueValueSaturation(float hue, float value, float saturation)
 {
-    _hue = std::move(hue);
-    _value = std::move(value);
-    _saturation = std::move(saturation);
+    _hue = hue;
+    _value = value;
+    _saturation = saturation;
 }
 
 void FramebufferRenderer::enableFXAA(bool enable) {
diff --git a/src/rendering/helper.cpp b/src/rendering/helper.cpp
index 3c45e65b0d..817fab517f 100644
--- a/src/rendering/helper.cpp
+++ b/src/rendering/helper.cpp
@@ -221,11 +221,11 @@ void initialize() {
     glBindBuffer(GL_ARRAY_BUFFER, vertexObjects.square.vbo);
 
     struct VertexXYUVRGBA {
-        GLfloat xy[2];
-        GLfloat uv[2];
-        GLfloat rgba[4];
+        std::array<GLfloat, 2> xy;
+        std::array<GLfloat, 2> uv;
+        std::array<GLfloat, 4> rgba;
     };
-    VertexXYUVRGBA data[] = {
+    constexpr std::array<VertexXYUVRGBA, 6> Vtx = {
         // X     Y    U    V    R    G    B    A
         -1.f, -1.f, 0.f, 0.f, 1.f, 1.f, 1.f, 1.f,
         -1.f,  1.f, 0.f, 1.f, 1.f, 1.f, 1.f, 1.f,
@@ -235,16 +235,28 @@ void initialize() {
          1.f,  1.f, 1.f, 1.f, 1.f, 1.f, 1.f, 1.f,
          1.f, -1.f, 1.f, 0.f, 1.f, 1.f, 1.f, 1.f
     };
-    glBufferData(GL_ARRAY_BUFFER, 6 * sizeof(VertexXYUVRGBA), data, GL_STATIC_DRAW);
+    glBufferData(GL_ARRAY_BUFFER, 6 * sizeof(VertexXYUVRGBA), Vtx.data(), GL_STATIC_DRAW);
 
     glEnableVertexAttribArray(0);
     glVertexAttribPointer(0, 2, GL_FLOAT, GL_FALSE, sizeof(VertexXYUVRGBA), nullptr);
     glEnableVertexAttribArray(1);
-    glVertexAttribPointer(1, 2, GL_FLOAT, GL_FALSE, sizeof(VertexXYUVRGBA),
-        reinterpret_cast<GLvoid*>(offsetof(VertexXYUVRGBA, uv)));
+    glVertexAttribPointer(
+        1,
+        2,
+        GL_FLOAT,
+        GL_FALSE,
+        sizeof(VertexXYUVRGBA),
+        reinterpret_cast<GLvoid*>(offsetof(VertexXYUVRGBA, uv))
+    );
     glEnableVertexAttribArray(2);
-    glVertexAttribPointer(2, 4, GL_FLOAT, GL_FALSE, sizeof(VertexXYUVRGBA),
-        reinterpret_cast<GLvoid*>(offsetof(VertexXYUVRGBA, rgba)));
+    glVertexAttribPointer(
+        2,
+        4,
+        GL_FLOAT,
+        GL_FALSE,
+        sizeof(VertexXYUVRGBA),
+        reinterpret_cast<GLvoid*>(offsetof(VertexXYUVRGBA, rgba))
+    );
     glBindVertexArray(0);
 
 
@@ -502,7 +514,7 @@ std::vector<VertexXYZ> convert(std::vector<Vertex> v) {
 }
 
 Vertex computeCircleVertex(int i, int nSegments, float radius,
-                           glm::vec4 color = glm::vec4(1.f))
+                           const glm::vec4& color = glm::vec4(1.f))
 {
     const float fsegments = static_cast<float>(nSegments);
 
@@ -520,7 +532,7 @@ Vertex computeCircleVertex(int i, int nSegments, float radius,
     return { x, y, z, u, v, color.r, color.g, color.b, color.a };
 }
 
-std::vector<Vertex> createRing(int nSegments, float radius, glm::vec4 colors) {
+std::vector<Vertex> createRing(int nSegments, float radius, const glm::vec4& colors) {
     const int nVertices = nSegments + 1;
     std::vector<Vertex> vertices(nVertices);
 
@@ -535,14 +547,14 @@ std::vector<VertexXYZ> createRingXYZ(int nSegments, float radius) {
     std::vector<VertexXYZ> vertices(nVertices);
 
     for (int i = 0; i <= nSegments; i++) {
-        Vertex fullVertex = computeCircleVertex(i, nSegments, radius);
+        const Vertex fullVertex = computeCircleVertex(i, nSegments, radius);
         vertices[i] = { fullVertex.xyz[0], fullVertex.xyz[1], fullVertex.xyz[2] };
     }
     return vertices;
 }
 
 VertexIndexListCombo<Vertex> createSphere(int nSegments, glm::vec3 radii,
-                                          glm::vec4 colors)
+                                          const glm::vec4& colors)
 {
     std::vector<Vertex> vertices;
     vertices.reserve(nSegments * nSegments);
@@ -558,9 +570,10 @@ VertexIndexListCombo<Vertex> createSphere(int nSegments, glm::vec3 radii,
             // 0 -> 2*PI
             const float phi = fj * glm::pi<float>() * 2.f / nSegments;
 
-            const float x = radii[0] * sin(theta) * cos(phi);
-            const float y = radii[1] * sin(theta) * sin(phi);
-            const float z = radii[2] * cos(theta); // Z points towards pole (theta = 0)
+            const float x = radii[0] * std::sin(theta) * std::cos(phi);
+            const float y = radii[1] * std::sin(theta) * std::sin(phi);
+            // Z points towards pole (theta = 0)
+            const float z = radii[2] * std::cos(theta);
 
             Vertex v;
             v.xyz[0] = x;
@@ -640,7 +653,7 @@ VertexIndexListCombo<VertexXYZNormal> createConicalCylinder(unsigned int nSegmen
             );
         }
         else {
-            glm::vec3 p = glm::closestPointOnLine(
+            const glm::vec3 p = glm::closestPointOnLine(
                 glm::vec3(0.f),
                 glm::vec3(vBot.xyz[0], vBot.xyz[1], vBot.xyz[2]),
                 glm::vec3(vTop.xyz[0], vTop.xyz[1], vTop.xyz[2])
@@ -693,12 +706,15 @@ VertexIndexListCombo<VertexXYZNormal> createConicalCylinder(unsigned int nSegmen
         return static_cast<GLushort>(1 + ringIndex * (nSegments + 1) + i);
     };
 
-    GLushort botCenterIndex = 0;
-    GLushort topCenterIndex = static_cast<GLushort>(vertices.size()) - 1;
+    const GLushort botCenterIndex = 0;
+    const GLushort topCenterIndex = static_cast<GLushort>(vertices.size()) - 1;
 
     for (unsigned int i = 0; i < nSegments; i++) {
-        bool isLast = (i == nSegments - 1);
-        GLushort v0, v1, v2, v3;
+        const bool isLast = (i == nSegments - 1);
+        GLushort v0 = 0;
+        GLushort v1 = 0;
+        GLushort v2 = 0;
+        GLushort v3 = 0;
 
         // Bottom triangle
         v0 = ringVerticeIndex(0, i);
diff --git a/src/rendering/labelscomponent.cpp b/src/rendering/labelscomponent.cpp
index e8320cffe7..7d05765eee 100644
--- a/src/rendering/labelscomponent.cpp
+++ b/src/rendering/labelscomponent.cpp
@@ -289,9 +289,10 @@ void LabelsComponent::render(const RenderData& data,
     if (!_enabled) {
         return;
     }
-    float scale = static_cast<float>(toMeter(_unit));
+    const float scale = static_cast<float>(toMeter(_unit));
 
-    int renderOption = _faceCamera ? RenderOptionFaceCamera : RenderOptionPositionNormal;
+    const int renderOption =
+        _faceCamera ? RenderOptionFaceCamera : RenderOptionPositionNormal;
 
     ghoul::fontrendering::FontRenderer::ProjectedLabelsInformation labelInfo;
     labelInfo.orthoRight = orthoRight;
@@ -306,7 +307,7 @@ void LabelsComponent::render(const RenderData& data,
     labelInfo.enableDepth = true;
     labelInfo.enableFalseDepth = false;
 
-    glm::vec4 textColor = glm::vec4(glm::vec3(_color), opacity() * fadeInVariable);
+    const glm::vec4 textColor = glm::vec4(glm::vec3(_color), opacity() * fadeInVariable);
 
     for (const dataloader::Labelset::Entry& e : _labelset.entries) {
         if (!e.isEnabled) {
@@ -314,9 +315,10 @@ void LabelsComponent::render(const RenderData& data,
         }
 
         // Transform and scale the labels
-        glm::vec3 transformedPos(_transformationMatrix * glm::dvec4(e.position, 1.0));
-        glm::vec3 scaledPos(transformedPos);
-        scaledPos *= scale;
+        const glm::vec3 transformedPos = glm::vec3(
+            _transformationMatrix * glm::dvec4(e.position, 1.0)
+        );
+        const glm::vec3 scaledPos = glm::vec3(transformedPos * scale);
 
         ghoul::fontrendering::FontRenderer::defaultProjectionRenderer().render(
             *_font,
diff --git a/src/rendering/loadingscreen.cpp b/src/rendering/loadingscreen.cpp
index aa017b195e..9f92771c01 100644
--- a/src/rendering/loadingscreen.cpp
+++ b/src/rendering/loadingscreen.cpp
@@ -84,15 +84,11 @@ namespace {
         rhsLl -= glm::vec2(ItemStandoffDistance / 2.f);
         rhsUr += glm::vec2(ItemStandoffDistance / 2.f);
 
-        return !(
-            lhsUr.x < rhsLl.x ||
-            lhsLl.x > rhsUr.x ||
-            lhsUr.y < rhsLl.y ||
-            lhsLl.y > rhsUr.y
-        );
+        return lhsUr.x >= rhsLl.x && lhsLl.x <= rhsUr.x &&
+               lhsUr.y >= rhsLl.y && lhsLl.y <= rhsUr.y;
     }
 
-    glm::vec2 ndcToScreen(glm::vec2 ndc, glm::ivec2 res) {
+    glm::vec2 ndcToScreen(glm::vec2 ndc, const glm::ivec2& res) {
         ndc.x = (ndc.x + 1.f) / 2.f * res.x;
         ndc.y = (ndc.y + 1.f) / 2.f * res.y;
         return ndc;
@@ -261,7 +257,7 @@ void LoadingScreen::exec(AssetManager& manager, Scene& scene) {
             return;
         }
 
-        bool finishedLoading = std::all_of(
+        const bool finishedLoading = std::all_of(
             allAssets.begin(),
             allAssets.end(),
             [](const Asset* asset) { return asset->isInitialized() || asset->isFailed(); }
@@ -298,9 +294,9 @@ void LoadingScreen::render() {
     const glm::ivec2 res =
         glm::vec2(global::windowDelegate->firstWindowResolution()) * dpiScaling;
 
-    float screenAspectRatio = static_cast<float>(res.x) / static_cast<float>(res.y);
+    const float screenAspectRatio = static_cast<float>(res.x) / static_cast<float>(res.y);
 
-    float textureAspectRatio = static_cast<float>(_logoTexture->dimensions().x) /
+    const float textureAspectRatio = static_cast<float>(_logoTexture->dimensions().x) /
         static_cast<float>(_logoTexture->dimensions().y);
 
     ghoul::fontrendering::FontRenderer::defaultRenderer().setFramebufferSize(res);
@@ -359,7 +355,7 @@ void LoadingScreen::render() {
     glm::vec2 messageLl = glm::vec2(0.f);
     glm::vec2 messageUr = glm::vec2(0.f);
     if (_showMessage) {
-        std::lock_guard guard(_messageMutex);
+        const std::lock_guard guard(_messageMutex);
 
         const glm::vec2 bboxMessage = _messageFont->boundingBox(_message);
 
@@ -373,8 +369,8 @@ void LoadingScreen::render() {
         renderer.render(*_messageFont, messageLl, _message);
     }
 
-    glm::vec2 logLl = glm::vec2(0.f, 0.f);
-    glm::vec2 logUr = glm::vec2(res.x, res.y * (LogBackgroundPosition + 0.015));
+    const glm::vec2 logLl = glm::vec2(0.f, 0.f);
+    const glm::vec2 logUr = glm::vec2(res.x, res.y * (LogBackgroundPosition + 0.015));
 
     // Font rendering enables depth testing so we disable again to render the log box
     glDisable(GL_DEPTH_TEST);
@@ -389,9 +385,9 @@ void LoadingScreen::render() {
     }
 
     if (_showNodeNames) {
-        std::lock_guard guard(_itemsMutex);
+        const std::lock_guard guard(_itemsMutex);
 
-        std::chrono::system_clock::time_point now = std::chrono::system_clock::now();
+        const auto now = std::chrono::system_clock::now();
 
         const glm::vec2 logoLl = glm::vec2(LogoCenter.x - size.x,  LogoCenter.y - size.y);
         const glm::vec2 logoUr = glm::vec2(LogoCenter.x + size.x,  LogoCenter.y + size.y);
@@ -585,7 +581,7 @@ void LoadingScreen::renderLogMessages() const {
     const std::vector<ScreenLog::LogEntry>& entries = _log->entries();
 
     size_t nRows = 0;
-    size_t j = std::min(MaxNumberMessages, entries.size());
+    const size_t j = std::min(MaxNumberMessages, entries.size());
     for (size_t i = 1; i <= j; i++) {
         ZoneScopedN("Entry");
 
@@ -630,13 +626,13 @@ void LoadingScreen::renderLogMessages() const {
 
     // Render # of warnings and error messages
     std::map<ghoul::logging::LogLevel, size_t> numberOfErrorsPerLevel;
-    for (auto& entry : _log->entries()) {
+    for (const auto& entry : _log->entries()) {
         numberOfErrorsPerLevel[entry.level]++;
     }
     size_t row = 0;
     for (auto& [level, amount] : numberOfErrorsPerLevel) {
         const std::string text = fmt::format("{}: {}", ghoul::to_string(level), amount);
-        glm::vec2 bbox = _logFont->boundingBox(text);
+        const glm::vec2 bbox = _logFont->boundingBox(text);
         renderer.render(
             *_logFont,
             glm::vec2(
@@ -651,7 +647,7 @@ void LoadingScreen::renderLogMessages() const {
 }
 
 void LoadingScreen::postMessage(std::string message) {
-    std::lock_guard guard(_messageMutex);
+    const std::lock_guard guard(_messageMutex);
     _message = std::move(message);
 }
 
@@ -688,7 +684,7 @@ void LoadingScreen::updateItem(const std::string& itemIdentifier,
         // also would create any of the text information
         return;
     }
-    std::lock_guard guard(_itemsMutex);
+    const std::lock_guard guard(_itemsMutex);
 
     auto it = std::find_if(
         _items.begin(),
diff --git a/src/rendering/luaconsole.cpp b/src/rendering/luaconsole.cpp
index 23bfa33d81..5794169419 100644
--- a/src/rendering/luaconsole.cpp
+++ b/src/rendering/luaconsole.cpp
@@ -56,8 +56,8 @@ namespace {
     constexpr uint64_t CurrentVersion = 0xFEEE'FEEE'0000'0001;
 
     constexpr std::string_view FontName = "Console";
-    constexpr float EntryFontSize = 14.0f;
-    constexpr float HistoryFontSize = 11.0f;
+    constexpr float EntryFontSize = 14.f;
+    constexpr float HistoryFontSize = 11.f;
 
     // Additional space between the entry text and the history (in pixels)
     constexpr float SeparatorSpace = 30.f;
@@ -183,8 +183,6 @@ LuaConsole::LuaConsole()
     addProperty(_historyTextColor);
 }
 
-LuaConsole::~LuaConsole() {}
-
 void LuaConsole::initialize() {
     ZoneScoped;
 
@@ -197,7 +195,7 @@ void LuaConsole::initialize() {
 
         if (file.good()) {
             // Read the number of commands from the history
-            uint64_t version;
+            uint64_t version = 0;
             file.read(reinterpret_cast<char*>(&version), sizeof(uint64_t));
 
             if (version != CurrentVersion) {
@@ -207,16 +205,16 @@ void LuaConsole::initialize() {
                 );
             }
             else {
-                int64_t nCommands;
+                int64_t nCommands = 0;
                 file.read(reinterpret_cast<char*>(&nCommands), sizeof(int64_t));
 
                 for (int64_t i = 0; i < nCommands; i++) {
-                    int64_t length;
+                    int64_t length = 0;
                     file.read(reinterpret_cast<char*>(&length), sizeof(int64_t));
 
                     std::vector<char> tmp(length);
                     file.read(tmp.data(), length);
-                    _commandsHistory.emplace_back(std::string(tmp.begin(), tmp.end()));
+                    _commandsHistory.emplace_back(tmp.begin(), tmp.end());
                 }
             }
         }
@@ -244,7 +242,7 @@ void LuaConsole::initialize() {
         "luaConsole",
         "statusChanged",
         [this]() {
-            ParallelConnection::Status status = global::parallelPeer->status();
+            const ParallelConnection::Status status = global::parallelPeer->status();
             parallelConnectionChanged(status);
         }
     );
@@ -451,7 +449,7 @@ bool LuaConsole::keyboardCallback(Key key, KeyModifier modifier, KeyAction actio
     }
 
     if (key == Key::Enter || key == Key::KeypadEnter) {
-        std::string cmd = _commands.at(_activeCommand);
+        const std::string cmd = _commands.at(_activeCommand);
         if (!cmd.empty()) {
             global::scriptEngine->queueScript(
                 cmd,
@@ -489,7 +487,7 @@ bool LuaConsole::keyboardCallback(Key key, KeyModifier modifier, KeyAction actio
         std::vector<std::string> allCommands = global::scriptEngine->allLuaFunctions();
         std::sort(allCommands.begin(), allCommands.end());
 
-        std::string currentCommand = _commands.at(_activeCommand);
+        const std::string currentCommand = _commands.at(_activeCommand);
 
         // Check if it is the first time the tab has been pressed. If so, we need to
         // store the already entered command so that we can later start the search
@@ -510,10 +508,11 @@ bool LuaConsole::keyboardCallback(Key key, KeyModifier modifier, KeyAction actio
             const size_t fullLength = _autoCompleteInfo.initialValue.length();
             const bool correctLength = command.length() >= fullLength;
 
-            std::string commandLowerCase = ghoul::toLowerCase(command);
+            const std::string commandLowerCase = ghoul::toLowerCase(command);
 
-            std::string initialValueLowerCase =
-                ghoul::toLowerCase(_autoCompleteInfo.initialValue);
+            const std::string initialValueLowerCase = ghoul::toLowerCase(
+                _autoCompleteInfo.initialValue
+            );
 
             const bool correctCommand =
                 commandLowerCase.substr(0, fullLength) == initialValueLowerCase;
@@ -661,7 +660,7 @@ void LuaConsole::render() {
 
     using namespace ghoul::fontrendering;
 
-    ghoul::GLDebugGroup group("LuaConsole");
+    const ghoul::GLDebugGroup group("LuaConsole");
 
     // Don't render the console if it's collapsed.
     if (_currentHeight < 1.f) {
@@ -831,7 +830,7 @@ void LuaConsole::render() {
     else if (_shouldSendToRemote) {
         const glm::vec4 Red(1.f, 0.f, 0.f, 1.f);
 
-        ParallelConnection::Status status = global::parallelPeer->status();
+        const ParallelConnection::Status status = global::parallelPeer->status();
         const int nClients =
             status != ParallelConnection::Status::Disconnected ?
             global::parallelPeer->nConnections() - 1 :
@@ -863,9 +862,9 @@ void LuaConsole::setCommandInputButton(Key key) {
     _commandInputButton = key;
 }
 
-void LuaConsole::addToCommand(std::string c) {
+void LuaConsole::addToCommand(const std::string& c) {
     const size_t length = c.length();
-    _commands.at(_activeCommand).insert(_inputPosition, std::move(c));
+    _commands.at(_activeCommand).insert(_inputPosition, c);
     _inputPosition += length;
 }
 
diff --git a/src/rendering/renderable.cpp b/src/rendering/renderable.cpp
index d40ffeb414..732adc40e8 100644
--- a/src/rendering/renderable.cpp
+++ b/src/rendering/renderable.cpp
@@ -116,7 +116,7 @@ documentation::Documentation Renderable::Documentation() {
 }
 
 ghoul::mm_unique_ptr<Renderable> Renderable::createFromDictionary(
-                                                             ghoul::Dictionary dictionary)
+                                                      const ghoul::Dictionary& dictionary)
 {
     if (!dictionary.hasKey(KeyType)) {
         throw ghoul::RuntimeError("Tried to create Renderable but no 'Type' was found");
@@ -125,7 +125,7 @@ ghoul::mm_unique_ptr<Renderable> Renderable::createFromDictionary(
     // This should be done in the constructor instead with noexhaustive
     documentation::testSpecificationAndThrow(Documentation(), dictionary, "Renderable");
 
-    std::string renderableType = dictionary.value<std::string>(KeyType);
+    const std::string renderableType = dictionary.value<std::string>(KeyType);
     ghoul::TemplateFactory<Renderable>* factory =
         FactoryManager::ref().factory<Renderable>();
     ghoul_assert(factory, "Renderable factory did not exist");
@@ -142,7 +142,6 @@ ghoul::mm_unique_ptr<Renderable> Renderable::createFromDictionary(
 
 Renderable::Renderable(const ghoul::Dictionary& dictionary, RenderableSettings settings)
     : properties::PropertyOwner({ "Renderable" })
-    , Fadeable()
     , _enabled(EnabledInfo, true)
     , _renderableType(RenderableTypeInfo, "Renderable")
     , _dimInAtmosphere(DimInAtmosphereInfo, false)
@@ -340,29 +339,29 @@ bool Renderable::hasOverrideRenderBin() const noexcept {
 glm::dmat4 Renderable::calcModelTransform(const RenderData& data,
                                           const AlternativeTransform& altTransform) const
 {
-    glm::dvec3 translation =
+    const glm::dvec3 translation =
         altTransform.translation.value_or(data.modelTransform.translation);
-    glm::dmat3 rotation = altTransform.rotation.value_or(data.modelTransform.rotation);
-    glm::dvec3 scale = altTransform.scale.value_or(data.modelTransform.scale);
+    const glm::dmat3 rot = altTransform.rotation.value_or(data.modelTransform.rotation);
+    const glm::dvec3 scale = altTransform.scale.value_or(data.modelTransform.scale);
 
     return glm::translate(glm::dmat4(1.0), translation) *
-        glm::dmat4(rotation) *
+        glm::dmat4(rot) *
         glm::scale(glm::dmat4(1.0), scale);
 }
 
 glm::dmat4 Renderable::calcModelViewTransform(const RenderData& data,
-                                           std::optional<glm::dmat4> modelTransform) const
+                                    const std::optional<glm::dmat4>& modelTransform) const
 {
-    glm::dmat4 modelMatrix = modelTransform.value_or(calcModelTransform(data));
+    const glm::dmat4 modelMatrix = modelTransform.value_or(calcModelTransform(data));
     return data.camera.combinedViewMatrix() * modelMatrix;
 }
 
 glm::dmat4 Renderable::calcModelViewProjectionTransform(const RenderData& data,
-                                           std::optional<glm::dmat4> modelTransform) const
+                                    const std::optional<glm::dmat4>& modelTransform) const
 {
-    glm::dmat4 modelMatrix = modelTransform.value_or(calcModelTransform(data));
-    glm::dmat4 viewMatrix = data.camera.combinedViewMatrix();
-    glm::dmat4 projectionMatrix = data.camera.projectionMatrix();
+    const glm::dmat4& modelMatrix = modelTransform.value_or(calcModelTransform(data));
+    const glm::dmat4 viewMatrix = data.camera.combinedViewMatrix();
+    const glm::dmat4 projectionMatrix = data.camera.projectionMatrix();
     return glm::dmat4(projectionMatrix * viewMatrix * modelMatrix);
 }
 
@@ -370,9 +369,9 @@ std::tuple<glm::dmat4, glm::dmat4, glm::dmat4> Renderable::calcAllTransforms(
                                                                    const RenderData& data,
                                       const AlternativeTransform& altModelTransform) const
 {
-    glm::dmat4 modelTransform = calcModelTransform(data, altModelTransform);
-    glm::dmat4 modelViewTransform = calcModelViewTransform(data, modelTransform);
-    glm::dmat4 modelViewProjectionTransform = calcModelViewProjectionTransform(
+    const glm::dmat4 modelTransform = calcModelTransform(data, altModelTransform);
+    const glm::dmat4 modelViewTransform = calcModelViewTransform(data, modelTransform);
+    const glm::dmat4 modelViewProjectionTransform = calcModelViewProjectionTransform(
         data,
         modelTransform
     );
diff --git a/src/rendering/renderengine.cpp b/src/rendering/renderengine.cpp
index b1440caeaa..17a28b076e 100644
--- a/src/rendering/renderengine.cpp
+++ b/src/rendering/renderengine.cpp
@@ -330,7 +330,7 @@ RenderEngine::RenderEngine()
     , _hdrExposure(HDRExposureInfo, 3.7f, 0.01f, 10.f)
     , _gamma(GammaInfo, 0.95f, 0.01f, 5.f)
     , _hue(HueInfo, 0.f, 0.f, 360.f)
-    , _saturation(SaturationInfo, 1.f, 0.0f, 2.f)
+    , _saturation(SaturationInfo, 1.f, 0.f, 2.f)
     , _value(ValueInfo, 1.f, 0.f, 2.f)
     , _framerateLimit(FramerateLimitInfo, 0, 0, 500)
     , _horizFieldOfView(HorizFieldOfViewInfo, 80.f, 1.f, 179.f)
@@ -407,13 +407,13 @@ RenderEngine::RenderEngine()
             // Going from 'false' -> 'true'
             // We might need to create the folder first
 
-            std::time_t now = std::time(nullptr);
+            const std::time_t now = std::time(nullptr);
             std::tm* nowTime = std::localtime(&now);
-            char date[128];
-            strftime(date, sizeof(date), "%Y-%m-%d-%H-%M", nowTime);
+            std::array<char, 128> date;
+            strftime(date.data(), sizeof(date), "%Y-%m-%d-%H-%M", nowTime);
 
-            std::filesystem::path newFolder = absPath(
-                "${STARTUP_SCREENSHOT}/" + std::string(date)
+            const std::filesystem::path newFolder = absPath(
+                "${STARTUP_SCREENSHOT}/" + std::string(date.data())
             );
 
             FileSys.registerPathToken(
@@ -494,7 +494,7 @@ void RenderEngine::initialize() {
     if (global::versionChecker->hasLatestVersionInfo()) {
         VersionChecker::SemanticVersion latest = global::versionChecker->latestVersion();
 
-        VersionChecker::SemanticVersion current {
+        const VersionChecker::SemanticVersion current {
             OPENSPACE_VERSION_MAJOR,
             OPENSPACE_VERSION_MINOR,
             OPENSPACE_VERSION_PATCH
@@ -525,7 +525,7 @@ void RenderEngine::initializeGL() {
     // initialized window
     _horizFieldOfView = static_cast<float>(global::windowDelegate->getHorizFieldOfView());
 
-    Configuration::FontSizes fontSize = global::configuration->fontSize;
+    const Configuration::FontSizes fontSize = global::configuration->fontSize;
     {
         ZoneScopedN("Fonts");
         TracyGpuZone("Fonts");
@@ -632,21 +632,21 @@ glm::ivec2 RenderEngine::fontResolution() const {
 }
 
 glm::mat4 RenderEngine::globalRotation() const {
-    glm::vec3 rot = _globalRotation;
+    const glm::vec3 rot = _globalRotation;
 
-    glm::quat pitch = glm::angleAxis(rot.x, glm::vec3(1.f, 0.f, 0.f));
-    glm::quat yaw = glm::angleAxis(rot.y, glm::vec3(0.f, 1.f, 0.f));
-    glm::quat roll = glm::angleAxis(rot.z, glm::vec3(0.f, 0.f, 1.f));
+    const glm::quat pitch = glm::angleAxis(rot.x, glm::vec3(1.f, 0.f, 0.f));
+    const glm::quat yaw = glm::angleAxis(rot.y, glm::vec3(0.f, 1.f, 0.f));
+    const glm::quat roll = glm::angleAxis(rot.z, glm::vec3(0.f, 0.f, 1.f));
 
     return glm::mat4_cast(glm::normalize(pitch * yaw * roll));
 }
 
 glm::mat4 RenderEngine::screenSpaceRotation() const {
-    glm::vec3 rot = _screenSpaceRotation;
+    const glm::vec3 rot = _screenSpaceRotation;
 
-    glm::quat pitch = glm::angleAxis(rot.x, glm::vec3(1.f, 0.f, 0.f));
-    glm::quat yaw = glm::angleAxis(rot.y, glm::vec3(0.f, 1.f, 0.f));
-    glm::quat roll = glm::angleAxis(rot.z, glm::vec3(0.f, 0.f, 1.f));
+    const glm::quat pitch = glm::angleAxis(rot.x, glm::vec3(1.f, 0.f, 0.f));
+    const glm::quat yaw = glm::angleAxis(rot.y, glm::vec3(0.f, 1.f, 0.f));
+    const glm::quat roll = glm::angleAxis(rot.z, glm::vec3(0.f, 0.f, 1.f));
 
     return glm::mat4_cast(glm::normalize(pitch * yaw * roll));
 }
@@ -655,11 +655,11 @@ glm::mat4 RenderEngine::nodeRotation() const {
     if (!global::windowDelegate->isMaster()) {
         return glm::mat4(1.f);
     }
-    glm::vec3 rot = _masterRotation;
+    const glm::vec3 rot = _masterRotation;
 
-    glm::quat pitch = glm::angleAxis(rot.x, glm::vec3(1.f, 0.f, 0.f));
-    glm::quat yaw = glm::angleAxis(rot.y, glm::vec3(0.f, 1.f, 0.f));
-    glm::quat roll = glm::angleAxis(rot.z, glm::vec3(0.f, 0.f, 1.f));
+    const glm::quat pitch = glm::angleAxis(rot.x, glm::vec3(1.f, 0.f, 0.f));
+    const glm::quat yaw = glm::angleAxis(rot.y, glm::vec3(0.f, 1.f, 0.f));
+    const glm::quat roll = glm::angleAxis(rot.z, glm::vec3(0.f, 0.f, 1.f));
 
     return glm::mat4_cast(glm::normalize(pitch * yaw * roll));
 }
@@ -679,7 +679,7 @@ void RenderEngine::render(const glm::mat4& sceneMatrix, const glm::mat4& viewMat
 
     const glm::mat4 globalRot = globalRotation();
     const glm::mat4 nodeRot = nodeRotation();
-    glm::mat4 combinedGlobalRot = nodeRot * globalRot;
+    const glm::mat4 combinedGlobalRot = nodeRot * globalRot;
 
     if (_camera) {
         _camera->sgctInternal.setViewMatrix(viewMatrix * combinedGlobalRot * sceneMatrix);
@@ -719,7 +719,7 @@ void RenderEngine::render(const glm::mat4& sceneMatrix, const glm::mat4& viewMat
         );
 
         std::string fn = std::to_string(_frameNumber);
-        WindowDelegate::Frustum frustum = global::windowDelegate->frustumMode();
+        const WindowDelegate::Frustum frustum = global::windowDelegate->frustumMode();
         std::string fr = [](WindowDelegate::Frustum f) -> std::string {
             switch (f) {
                 case WindowDelegate::Frustum::Mono:     return "";
@@ -733,7 +733,7 @@ void RenderEngine::render(const glm::mat4& sceneMatrix, const glm::mat4& viewMat
         std::string dt = std::to_string(global::windowDelegate->deltaTime());
         std::string avgDt = std::to_string(global::windowDelegate->averageDeltaTime());
 
-        std::string res = fmt::format(
+        const std::string res = fmt::format(
             "Frame: {} {}\nSwap group frame: {}\nDt: {}\nAvg Dt: {}",
             fn, fr, sgFn, dt, avgDt
         );
@@ -782,12 +782,12 @@ bool RenderEngine::mouseActivationCallback(const glm::dvec2& mousePosition) cons
 
 
     if (intersects(mousePosition, _cameraButtonLocations.rotation)) {
-        constexpr const char ToggleRotationFrictionScript[] = R"(
+        constexpr std::string_view ToggleRotationFrictionScript = R"(
             local f = 'NavigationHandler.OrbitalNavigator.Friction.RotationalFriction';
             openspace.setPropertyValueSingle(f, not openspace.propertyValue(f));)";
 
         global::scriptEngine->queueScript(
-            ToggleRotationFrictionScript,
+            std::string(ToggleRotationFrictionScript),
             scripting::ScriptEngine::ShouldBeSynchronized::Yes,
             scripting::ScriptEngine::ShouldSendToRemote::Yes
         );
@@ -795,12 +795,12 @@ bool RenderEngine::mouseActivationCallback(const glm::dvec2& mousePosition) cons
     }
 
     if (intersects(mousePosition, _cameraButtonLocations.zoom)) {
-        constexpr const char ToggleZoomFrictionScript[] = R"(
+        constexpr std::string_view ToggleZoomFrictionScript = R"(
             local f = 'NavigationHandler.OrbitalNavigator.Friction.ZoomFriction';
             openspace.setPropertyValueSingle(f, not openspace.propertyValue(f));)";
 
         global::scriptEngine->queueScript(
-            ToggleZoomFrictionScript,
+            std::string(ToggleZoomFrictionScript),
             scripting::ScriptEngine::ShouldBeSynchronized::Yes,
             scripting::ScriptEngine::ShouldSendToRemote::Yes
         );
@@ -808,12 +808,12 @@ bool RenderEngine::mouseActivationCallback(const glm::dvec2& mousePosition) cons
     }
 
     if (intersects(mousePosition, _cameraButtonLocations.roll)) {
-        constexpr const char ToggleRollFrictionScript[] = R"(
+        constexpr std::string_view ToggleRollFrictionScript = R"(
             local f = 'NavigationHandler.OrbitalNavigator.Friction.RollFriction';
             openspace.setPropertyValueSingle(f, not openspace.propertyValue(f));)";
 
         global::scriptEngine->queueScript(
-            ToggleRollFrictionScript,
+            std::string(ToggleRollFrictionScript),
             scripting::ScriptEngine::ShouldBeSynchronized::Yes,
             scripting::ScriptEngine::ShouldSendToRemote::Yes
         );
@@ -871,7 +871,7 @@ void RenderEngine::renderShutdownInformation(float timer, float fullTime) {
     glEnable(GL_BLEND);
 
     // t = 1.f -> start of shutdown counter    t = 0.f -> timer has reached shutdown
-    float t = 1.f - (timer / fullTime);
+    const float t = 1.f - (timer / fullTime);
 
     rendering::helper::renderBox(
         glm::vec2(0.f),
@@ -905,10 +905,10 @@ void RenderEngine::renderShutdownInformation(float timer, float fullTime) {
     RenderFont(*_fontShutdown, penPosition, "Press ESC again to abort");
 }
 
-void RenderEngine::renderDashboard() {
+void RenderEngine::renderDashboard() const {
     ZoneScoped;
 
-    glm::vec2 dashboardStart = global::dashboard->getStartPositionOffset();
+    const glm::vec2 dashboardStart = global::dashboard->getStartPositionOffset();
     glm::vec2 penPosition = glm::vec2(
         dashboardStart.x,
         dashboardStart.y + fontResolution().y - global::luaConsole->currentHeight()
@@ -965,7 +965,7 @@ bool RenderEngine::isHdrDisabled() const {
 std::unique_ptr<ghoul::opengl::ProgramObject> RenderEngine::buildRenderProgram(
                                                                   const std::string& name,
                                                       const std::filesystem::path& vsPath,
-                                                             std::filesystem::path fsPath,
+                                                      const std::filesystem::path& fsPath,
                                                                    ghoul::Dictionary data)
 {
     ghoul::Dictionary dict = std::move(data);
@@ -997,7 +997,7 @@ std::unique_ptr<ghoul::opengl::ProgramObject> RenderEngine::buildRenderProgram(
 std::unique_ptr<ghoul::opengl::ProgramObject> RenderEngine::buildRenderProgram(
                                                                   const std::string& name,
                                                       const std::filesystem::path& vsPath,
-                                                             std::filesystem::path fsPath,
+                                                      const std::filesystem::path& fsPath,
                                                       const std::filesystem::path& csPath,
                                                                    ghoul::Dictionary data)
 {
@@ -1275,8 +1275,8 @@ void RenderEngine::renderVersionInformation() {
         );
     }
 
-    [[maybe_unused]] float debugOffset = 0.f;
 #ifdef _DEBUG
+    [[maybe_unused]] float debugOffset = 0.f;
     {
         const glm::vec2 debugBox = _fontVersionInfo->boundingBox("Debug build");
         debugOffset = debugBox.y;
@@ -1291,6 +1291,8 @@ void RenderEngine::renderVersionInformation() {
             glm::vec4(0.2f, 0.75f, 0.15f, 1.f)
         );
     }
+#else // !_DEBUG
+    [[maybe_unused]] const float debugOffset = 0.f;
 #endif // _DEBUG
 
 #ifdef TRACY_ENABLE
@@ -1348,14 +1350,15 @@ void RenderEngine::renderScreenLog() {
             const double d = (diff - ttf).count();
             const float t = static_cast<float>(d) / static_cast<float>(FadeTime.count());
             const float p = 0.8f - t;
-            alpha = (p <= 0.f) ? 0.f : pow(p, 0.4f);
+            alpha = (p <= 0.f) ? 0.f : std::pow(p, 0.4f);
         }
 
         // Since all log entries are ordered, once one exceeds alpha, all have
         if (alpha <= 0.f) {
             break;
         }
-        std::string_view message = std::string_view(it.message).substr(0, MessageLength);
+        const std::string_view message =
+            std::string_view(it.message).substr(0, MessageLength);
         nRows += std::count(message.begin(), message.end(), '\n');
 
         const glm::vec4 white = glm::vec4(0.9f, 0.9f, 0.9f, alpha);
@@ -1370,7 +1373,6 @@ void RenderEngine::renderScreenLog() {
                 std::string_view(it.category).substr(0, CategoryLength),
                 it.category.length() > CategoryLength ? "..." : ""
             );
-            std::string_view text = std::string_view(buf.data(), end - buf.data());
 
             RenderFont(
                 *_fontLog,
@@ -1378,7 +1380,7 @@ void RenderEngine::renderScreenLog() {
                     10.f,
                     _fontLog->pointSize() * nRows * 2 + fontRes.y * _verticalLogOffset
                 ),
-                text,
+                std::string_view(buf.data(), end - buf.data()),
                 white
             );
         }
@@ -1390,14 +1392,13 @@ void RenderEngine::renderScreenLog() {
             const std::string_view lvl = ghoul::to_string(it.level);
             std::fill(buf.begin(), buf.end(), char(0));
             char* end = fmt::format_to(buf.data(), "({})", lvl);
-            std::string_view levelText = std::string_view(buf.data(), end - buf.data());
             RenderFont(
                 *_fontLog,
                 glm::vec2(
                     10 + (30 + 3) * _fontLog->pointSize(),
                     _fontLog->pointSize() * nRows * 2 + fontRes.y * _verticalLogOffset
                 ),
-                levelText,
+                std::string_view(buf.data(), end - buf.data()),
                 color
             );
         }
diff --git a/src/rendering/screenspacerenderable.cpp b/src/rendering/screenspacerenderable.cpp
index 11c55fb8d1..af8f29ea08 100644
--- a/src/rendering/screenspacerenderable.cpp
+++ b/src/rendering/screenspacerenderable.cpp
@@ -283,7 +283,7 @@ std::string ScreenSpaceRenderable::makeUniqueIdentifier(std::string name) {
         return taken;
     };
 
-    std::string baseName = name;
+    const std::string baseName = name;
     int i = 1;
     while (nameTaken(name)) {
         name = baseName + std::to_string(i);
@@ -424,7 +424,7 @@ ScreenSpaceRenderable::ScreenSpaceRenderable(const ghoul::Dictionary& dictionary
         // when this triggerProperty was pressed in the gui, therefor it has already been
         // synced and sent to the connected nodes and peers
         global::scriptEngine->queueScript(
-            script,
+            std::move(script),
             scripting::ScriptEngine::ShouldBeSynchronized::No,
             scripting::ScriptEngine::ShouldSendToRemote::No
         );
@@ -459,7 +459,7 @@ bool ScreenSpaceRenderable::deinitializeGL() {
 void ScreenSpaceRenderable::render(float blackoutFactor) {
     ZoneScoped;
 
-    glm::mat4 mat =
+    const glm::mat4 mat =
         globalRotationMatrix() *
         translationMatrix() *
         localRotationMatrix() *
@@ -533,7 +533,7 @@ void ScreenSpaceRenderable::createShaders() {
 
 glm::mat4 ScreenSpaceRenderable::scaleMatrix() {
     // to scale the plane
-    float textureRatio =
+    const float textureRatio =
         static_cast<float>(_objectSize.y) / static_cast<float>(_objectSize.x);
 
     glm::mat4 scale = glm::scale(
@@ -549,7 +549,8 @@ glm::vec2 ScreenSpaceRenderable::screenSpacePosition() {
 }
 
 glm::vec2 ScreenSpaceRenderable::screenSpaceDimensions() {
-    float ratio = static_cast<float>(_objectSize.x) / static_cast<float>(_objectSize.y);
+    const float ratio =
+        static_cast<float>(_objectSize.x) / static_cast<float>(_objectSize.y);
     return glm::vec2(2.f * _scale * ratio, 2.f * _scale);
 }
 
@@ -561,22 +562,22 @@ glm::vec2 ScreenSpaceRenderable::lowerLeftCornerScreenSpace() {
     return screenSpacePosition() - (screenSpaceDimensions() / 2.0f);
 }
 
-bool ScreenSpaceRenderable::isIntersecting(glm::vec2 coord) {
-    bool isUnderTopBorder = coord.x < upperRightCornerScreenSpace().x;
-    bool isLeftToRightBorder = coord.y < upperRightCornerScreenSpace().y;
-    bool isRightToLeftBorder = coord.x > lowerLeftCornerScreenSpace().x;
-    bool isOverBottomBorder = coord.y > lowerLeftCornerScreenSpace().y;
+bool ScreenSpaceRenderable::isIntersecting(const glm::vec2& coord) {
+    const bool isUnderTopBorder = coord.x < upperRightCornerScreenSpace().x;
+    const bool isLeftToRightBorder = coord.y < upperRightCornerScreenSpace().y;
+    const bool isRightToLeftBorder = coord.x > lowerLeftCornerScreenSpace().x;
+    const bool isOverBottomBorder = coord.y > lowerLeftCornerScreenSpace().y;
 
     return  isUnderTopBorder && isLeftToRightBorder &&
             isRightToLeftBorder && isOverBottomBorder;
 }
 
 void ScreenSpaceRenderable::translate(glm::vec2 translation, glm::vec2 position) {
-    glm::mat4 translationMatrix = glm::translate(
+    const glm::mat4 translationMatrix = glm::translate(
         glm::mat4(1.f),
-        glm::vec3(translation, 0.0f)
+        glm::vec3(translation, 0.f)
     );
-    glm::vec4 origin = glm::vec4(position, _cartesianPosition.value().z, 1.0f);
+    const glm::vec4 origin = glm::vec4(position, _cartesianPosition.value().z, 1.f);
     _cartesianPosition = translationMatrix * origin;
 }
 
@@ -597,7 +598,7 @@ glm::mat4 ScreenSpaceRenderable::globalRotationMatrix() {
     // 1) The global rotation of the view applied in the render engine
     // 2) sgct's scene matrix (also called model matrix by sgct)
 
-    glm::mat4 inverseRotation = glm::inverse(
+    const glm::mat4 inverseRotation = glm::inverse(
         global::renderEngine->globalRotation() *
         global::windowDelegate->modelMatrix()
     );
@@ -609,7 +610,7 @@ glm::mat4 ScreenSpaceRenderable::globalRotationMatrix() {
 glm::mat4 ScreenSpaceRenderable::localRotationMatrix() {
     glm::mat4 rotation = glm::mat4(1.f);
     if (_faceCamera) {
-        glm::vec3 translation = _useRadiusAzimuthElevation ?
+        const glm::vec3 translation = _useRadiusAzimuthElevation ?
             sphericalToCartesian(raeToSpherical(_raePosition)) :
             _cartesianPosition;
 
@@ -620,9 +621,9 @@ glm::mat4 ScreenSpaceRenderable::localRotationMatrix() {
         ));
     }
 
-    float roll = _localRotation.value().x;
-    float pitch = _localRotation.value().y;
-    float yaw = _localRotation.value().z;
+    const float roll = _localRotation.value().x;
+    const float pitch = _localRotation.value().y;
+    const float yaw = _localRotation.value().z;
     return rotation * glm::mat4(glm::quat(glm::vec3(pitch, yaw, roll)));
 }
 
@@ -635,19 +636,19 @@ glm::vec3 ScreenSpaceRenderable::cartesianToRae(const glm::vec3& cartesian) cons
 }
 
 glm::mat4 ScreenSpaceRenderable::translationMatrix() {
-    glm::vec3 translation = _useRadiusAzimuthElevation ?
+    const glm::vec3 translation = _useRadiusAzimuthElevation ?
         sphericalToCartesian(raeToSpherical(_raePosition)) :
         _cartesianPosition;
 
     return glm::translate(glm::mat4(1.f), translation);
 }
 
-void ScreenSpaceRenderable::draw(glm::mat4 modelTransform, float blackoutFactor) {
+void ScreenSpaceRenderable::draw(const glm::mat4& modelTransform, float blackoutFactor) {
     glDisable(GL_CULL_FACE);
 
     _shader->activate();
     // Calculate the border from pixels to UV coordinates
-    glm::vec2 borderUV = glm::vec2(
+    const glm::vec2 borderUV = glm::vec2(
         _borderWidth / static_cast<float>(_objectSize.x),
         _borderWidth / static_cast<float>(_objectSize.y)
     );
@@ -715,18 +716,18 @@ glm::vec3 ScreenSpaceRenderable::sphericalToCartesian(glm::vec3 spherical) const
 
 glm::vec3 ScreenSpaceRenderable::cartesianToSpherical(const glm::vec3& cartesian) const {
     // Rotate cartesian coordinates.
-    glm::vec3 rotated = glm::vec3(cartesian.x, cartesian.z, -cartesian.y);
+    const glm::vec3 rotated = glm::vec3(cartesian.x, cartesian.z, -cartesian.y);
 
-    const float r = sqrt(
-        pow(rotated.x, 2.f) + pow(rotated.y, 2.f) + pow(rotated.z, 2.f)
+    const float r = std::sqrt(
+        std::pow(rotated.x, 2.f) + std::pow(rotated.y, 2.f) + std::pow(rotated.z, 2.f)
     );
-    const float theta = acos(rotated.z / r);
-    const float phi = atan2(rotated.y, rotated.x);
+    const float theta = std::acos(rotated.z / r);
+    const float phi = std::atan2(rotated.y, rotated.x);
     return sanitizeSphericalCoordinates(glm::vec3(r, theta, phi));
 }
 
 // Radius, azimiuth, elevation to spherical coordinates.
-glm::vec3 ScreenSpaceRenderable::raeToSpherical(glm::vec3 rae) const {
+glm::vec3 ScreenSpaceRenderable::raeToSpherical(const glm::vec3& rae) const {
     //return rae;
     const float r = rae.x;
 
@@ -741,15 +742,15 @@ glm::vec3 ScreenSpaceRenderable::raeToSpherical(glm::vec3 rae) const {
 }
 
 // Spherical coordinates to radius, azimuth and elevation.
-glm::vec3 ScreenSpaceRenderable::sphericalToRae(glm::vec3 spherical) const {
+glm::vec3 ScreenSpaceRenderable::sphericalToRae(const glm::vec3& spherical) const {
     //return spherical;
     const float r = spherical.x;
 
     // Azimuth on screen is angle from negative y, as opposed to from x.
-    float azimuth = spherical.z + glm::half_pi<float>();
+    const float azimuth = spherical.z + glm::half_pi<float>();
 
     // Elevation is polar angle - pi/2
-    float elevation = wrap(
+    const float elevation = wrap(
         spherical.y - glm::half_pi<float>(),
         -glm::pi<float>(),
         glm::pi<float>()
diff --git a/src/rendering/transferfunction.cpp b/src/rendering/transferfunction.cpp
index ebf0755960..893119cfd3 100644
--- a/src/rendering/transferfunction.cpp
+++ b/src/rendering/transferfunction.cpp
@@ -26,7 +26,6 @@
 
 #include <ghoul/filesystem/file.h>
 #include <ghoul/filesystem/filesystem.h>
-#include <ghoul/filesystem/file.h>
 #include <ghoul/io/texture/texturereader.h>
 #include <ghoul/logging/logmanager.h>
 #include <ghoul/opengl/texture.h>
@@ -56,7 +55,7 @@ void TransferFunction::setPath(const std::string& filepath) {
     if (_file) {
         _file = nullptr;
     }
-    std::filesystem::path f = absPath(filepath);
+    const std::filesystem::path f = absPath(filepath);
     if (!std::filesystem::is_regular_file(f)) {
         LERROR("Could not find transfer function file");
         _file = nullptr;
@@ -71,7 +70,7 @@ void TransferFunction::setPath(const std::string& filepath) {
 ghoul::opengl::Texture& TransferFunction::texture() {
     ghoul_assert(_texture != nullptr, "Transfer function is null");
     update();
-    return *_texture.get();
+    return *_texture;
 }
 
 void TransferFunction::update() {
@@ -127,8 +126,8 @@ void TransferFunction::setTextureFromTxt() {
             upper = glm::clamp(upper, lower, 1.f);
         }
         else if (key == "mappingkey") {
-            float intensity;
-            glm::vec4 rgba = glm::vec4(0.f);
+            float intensity = 0.f;
+            glm::vec4 rgba;
             iss >> intensity;
             for(int i = 0; i < 4; i++) {
                 iss >> rgba[i];
@@ -156,8 +155,12 @@ void TransferFunction::setTextureFromTxt() {
         transferFunction[i] = 0.f;
     }
 
-    size_t lowerIndex = static_cast<size_t>(floorf(lower * static_cast<float>(width-1)));
-    size_t upperIndex = static_cast<size_t>(floorf(upper * static_cast<float>(width-1)));
+    const size_t lowerIndex = static_cast<size_t>(
+        std::floor(lower * static_cast<float>(width - 1))
+    );
+    const size_t upperIndex = static_cast<size_t>(
+        std::floor(upper * static_cast<float>(width - 1))
+    );
 
     auto prevKey = mappingKeys.begin();
     auto currentKey = prevKey + 1;
diff --git a/src/scene/assetmanager.cpp b/src/scene/assetmanager.cpp
index 02776a1a4b..694c682f5e 100644
--- a/src/scene/assetmanager.cpp
+++ b/src/scene/assetmanager.cpp
@@ -194,7 +194,7 @@ void AssetManager::update() {
     for (const std::string& asset : _assetAddQueue) {
         ZoneScopedN("Adding queued assets");
 
-        std::filesystem::path path = generateAssetPath(_assetRootDirectory, asset);
+        const std::filesystem::path path = generateAssetPath(_assetRootDirectory, asset);
         Asset* a = nullptr;
         try {
             a = retrieveAsset(path, "");
@@ -384,18 +384,18 @@ bool AssetManager::loadAsset(Asset* asset, Asset* parent) {
     lua_getglobal(*_luaState, AssetGlobalVariableName);
     ghoul_assert(lua_istable(*_luaState, -1), "Expected 'asset' table");
     lua_getfield(*_luaState, -1, "meta");
-    ghoul::Dictionary metaDict = ghoul::lua::luaDictionaryFromState(*_luaState);
+    const ghoul::Dictionary metaDict = ghoul::lua::luaDictionaryFromState(*_luaState);
     if (!metaDict.isEmpty()) {
-        Parameters p = codegen::bake<Parameters>(metaDict);
+        const Parameters p = codegen::bake<Parameters>(metaDict);
 
         Asset::MetaInformation meta;
-        meta.name = p.name.value_or("");
-        meta.version = p.version.value_or("");
-        meta.description = p.description.value_or("");
-        meta.author = p.author.value_or("");
-        meta.url = p.url.value_or("");
-        meta.license = p.license.value_or("");
-        meta.identifiers = p.identifiers.value_or(std::vector<std::string>());
+        meta.name = p.name.value_or(meta.name);
+        meta.version = p.version.value_or(meta.version);
+        meta.description = p.description.value_or(meta.description);
+        meta.author = p.author.value_or(meta.author);
+        meta.url = p.url.value_or(meta.url);
+        meta.license = p.license.value_or(meta.license);
+        meta.identifiers = p.identifiers.value_or(meta.identifiers);
 
         // We need to do this as the asset might have 'export'ed identifiers before
         // defining the meta table.  Therefore the meta information already contains some
@@ -415,12 +415,12 @@ bool AssetManager::loadAsset(Asset* asset, Asset* parent) {
 void AssetManager::unloadAsset(Asset* asset) {
     ghoul_precondition(asset, "Asset must not be nullptr");
 
-    for (int ref : _onInitializeFunctionRefs[asset]) {
+    for (const int ref : _onInitializeFunctionRefs[asset]) {
        luaL_unref(*_luaState, LUA_REGISTRYINDEX, ref);
     }
     _onInitializeFunctionRefs[asset].clear();
 
-    for (int ref : _onDeinitializeFunctionRefs[asset]) {
+    for (const int ref : _onDeinitializeFunctionRefs[asset]) {
         luaL_unref(*_luaState, LUA_REGISTRYINDEX, ref);
     }
     _onDeinitializeFunctionRefs[asset].clear();
@@ -435,7 +435,7 @@ void AssetManager::unloadAsset(Asset* asset) {
     ghoul::lua::push(*_luaState, ghoul::lua::nil_t());
 
     // Clear entry from global asset table (pushed to the Lua stack earlier)
-    std::string path = asset->path().string();
+    const std::string path = asset->path().string();
     lua_setfield(*_luaState, globalTableIndex, path.c_str());
     lua_settop(*_luaState, top);
 
@@ -509,11 +509,12 @@ void AssetManager::setUpAssetLuaTable(Asset* asset) {
             ghoul::lua::checkArgumentsAndThrow(L, { 0, 1 }, "lua::resource");
 
             if (ghoul::lua::hasValue<ghoul::Dictionary>(L)) {
-                ghoul::Dictionary d = ghoul::lua::value<ghoul::Dictionary>(L);
+                const ghoul::Dictionary d = ghoul::lua::value<ghoul::Dictionary>(L);
                 std::unique_ptr<ResourceSynchronization> s =
                     ResourceSynchronization::createFromDictionary(d);
 
-                std::string uid = d.value<std::string>("Type") + "/" + s->generateUid();
+                const std::string uid =
+                    d.value<std::string>("Type") + "/" + s->generateUid();
                 SyncItem* syncItem = nullptr;
                 auto it = manager->_synchronizations.find(uid);
                 if (it == manager->_synchronizations.end()) {
@@ -539,7 +540,7 @@ void AssetManager::setUpAssetLuaTable(Asset* asset) {
             }
             else if (ghoul::lua::hasValue<std::optional<std::string>>(L)) {
                 auto [name] = ghoul::lua::values<std::optional<std::string>>(L);
-                std::filesystem::path path =
+                const std::filesystem::path path =
                     name.has_value() ?
                     thisAsset->path().parent_path() / *name :
                     thisAsset->path().parent_path();
@@ -569,7 +570,7 @@ void AssetManager::setUpAssetLuaTable(Asset* asset) {
             ghoul::lua::checkArgumentsAndThrow(L, { 0, 1 }, "lua::resource");
 
             auto [name] = ghoul::lua::values<std::optional<std::string>>(L);
-            std::filesystem::path path =
+            const std::filesystem::path path =
                 name.has_value() ?
                 thisAsset->path().parent_path() / *name :
                 thisAsset->path().parent_path();
@@ -595,11 +596,11 @@ void AssetManager::setUpAssetLuaTable(Asset* asset) {
             Asset* thisAsset = ghoul::lua::userData<Asset>(L, 2);
             ghoul::lua::checkArgumentsAndThrow(L, { 0, 1 }, "lua::resource");
 
-            ghoul::Dictionary d = ghoul::lua::value<ghoul::Dictionary>(L);
+            const ghoul::Dictionary d = ghoul::lua::value<ghoul::Dictionary>(L);
             std::unique_ptr<ResourceSynchronization> s =
                 ResourceSynchronization::createFromDictionary(d);
 
-            std::string uid = d.value<std::string>("Type") + "/" + s->generateUid();
+            const std::string uid = d.value<std::string>("Type") + "/" + s->generateUid();
             SyncItem* syncItem = nullptr;
             auto it = manager->_synchronizations.find(uid);
             if (it == manager->_synchronizations.end()) {
@@ -645,7 +646,7 @@ void AssetManager::setUpAssetLuaTable(Asset* asset) {
             auto [assetName, explicitEnable] =
                 ghoul::lua::values<std::string, std::optional<bool>>(L);
 
-            std::filesystem::path path = manager->generateAssetPath(
+            const std::filesystem::path path = manager->generateAssetPath(
                 parent->path().parent_path(),
                 assetName
             );
@@ -683,7 +684,7 @@ void AssetManager::setUpAssetLuaTable(Asset* asset) {
 
             // Get the exports table
             lua_rawgeti(L, LUA_REGISTRYINDEX, manager->_assetsTableRef);
-            std::string p = dependency->path().string();
+            const std::string p = dependency->path().string();
             lua_getfield(L, -1, p.c_str());
             lua_getfield(L, -1, ExportsTableName);
             return 1;
@@ -705,7 +706,7 @@ void AssetManager::setUpAssetLuaTable(Asset* asset) {
             ghoul::lua::checkArgumentsAndThrow(L, 1, "lua::exists");
             const std::string name = ghoul::lua::value<std::string>(L);
 
-            std::filesystem::path path = manager->generateAssetPath(
+            const std::filesystem::path path = manager->generateAssetPath(
                 thisAsset->path().parent_path(),
                 name
             );
@@ -728,12 +729,16 @@ void AssetManager::setUpAssetLuaTable(Asset* asset) {
 
             AssetManager* manager = ghoul::lua::userData<AssetManager>(L, 1);
             Asset* thisAsset = ghoul::lua::userData<Asset>(L, 2);
-            int n = ghoul::lua::checkArgumentsAndThrow(L, { 1 , 2 }, "lua::exportAsset");
+            const int n = ghoul::lua::checkArgumentsAndThrow(
+                L,
+                { 1 , 2 },
+                "lua::exportAsset"
+            );
             std::string exportName;
             std::string identifier;
-            int targetLocation;
+            int targetLocation = 0;
             if (n == 1) {
-                ghoul::Dictionary d = ghoul::lua::value<ghoul::Dictionary>(
+                const ghoul::Dictionary d = ghoul::lua::value<ghoul::Dictionary>(
                     L,
                     1,
                     ghoul::lua::PopValue::No
@@ -762,7 +767,7 @@ void AssetManager::setUpAssetLuaTable(Asset* asset) {
                     // the identifier if it actually is a table *and* if that table
                     // contains the 'Identifier' key
 
-                    ghoul::Dictionary d = ghoul::lua::value<ghoul::Dictionary>(
+                    const ghoul::Dictionary d = ghoul::lua::value<ghoul::Dictionary>(
                         L,
                         2,
                         ghoul::lua::PopValue::No
@@ -779,7 +784,7 @@ void AssetManager::setUpAssetLuaTable(Asset* asset) {
 
 
             lua_rawgeti(L, LUA_REGISTRYINDEX, manager->_assetsTableRef);
-            std::string path = thisAsset->path().string();
+            const std::string path = thisAsset->path().string();
             lua_getfield(L, -1, path.c_str());
             lua_getfield(L, -1, ExportsTableName);
             const int exportsTableIndex = lua_gettop(L);
@@ -864,7 +869,7 @@ void AssetManager::setUpAssetLuaTable(Asset* asset) {
 
     // Extend global asset info table (pushed to the Lua stack earlier)
     // with this AssetInfo table
-    std::string path = asset->path().string();
+    const std::string path = asset->path().string();
     lua_setfield(*_luaState, globalTableIndex, path.c_str());
     lua_settop(*_luaState, top);
 }
@@ -935,7 +940,7 @@ void AssetManager::callOnInitialize(Asset* asset) const {
         return;
     }
 
-    for (int init : it->second) {
+    for (const int init : it->second) {
         lua_rawgeti(*_luaState, LUA_REGISTRYINDEX, init);
         if (lua_pcall(*_luaState, 0, 0, 0) != LUA_OK) {
             throw ghoul::lua::LuaRuntimeException(fmt::format(
@@ -958,7 +963,7 @@ void AssetManager::callOnDeinitialize(Asset* asset) const {
         return;
     }
 
-    for (int deinit : it->second) {
+    for (const int deinit : it->second) {
         lua_rawgeti(*_luaState, LUA_REGISTRYINDEX, deinit);
         if (lua_pcall(*_luaState, 0, 0, 0) != LUA_OK) {
             throw ghoul::lua::LuaRuntimeException(fmt::format(
@@ -983,7 +988,7 @@ void AssetManager::setCurrentAsset(Asset* asset) {
     else {
         // Set `asset` lua global to point to the current asset table
         lua_rawgeti(*_luaState, LUA_REGISTRYINDEX, _assetsTableRef);
-        std::string path = asset->path().string();
+        const std::string path = asset->path().string();
         lua_getfield(*_luaState, -1, path.c_str());
         lua_getfield(*_luaState, -1, AssetTableName);
         lua_setglobal(*_luaState, AssetGlobalVariableName);
@@ -1000,7 +1005,7 @@ std::filesystem::path AssetManager::generateAssetPath(
     // 3) Absolute paths (*:/* or /*)
     // 2) Relative to the global asset root (*)
 
-    PathType pathType = classifyPath(assetPath);
+    const PathType pathType = classifyPath(assetPath);
     std::string prefix;
     if (pathType == PathType::RelativeToAsset) {
         prefix = baseDirectory.string() + '/';
diff --git a/src/scene/profile.cpp b/src/scene/profile.cpp
index cc7b42e131..6f06d27024 100644
--- a/src/scene/profile.cpp
+++ b/src/scene/profile.cpp
@@ -83,7 +83,7 @@ namespace {
             }
         }
         else {
-            const nlohmann::json value = j[key];
+            const nlohmann::json& value = j[key];
             if (!(value.*checkFunc)()) {
                 std::string type = [](auto c) {
                     if (c == &nlohmann::json::is_string) { return "a string"; }
@@ -229,7 +229,7 @@ void to_json(nlohmann::json& j, const Profile::Property::SetType& v) {
 }
 
 void from_json(const nlohmann::json& j, Profile::Property::SetType& v) {
-    std::string value = j.get<std::string>();
+    const std::string value = j.get<std::string>();
     if (value == "setPropertyValue") {
         v = Profile::Property::SetType::SetPropertyValue;
     }
@@ -315,7 +315,7 @@ void to_json(nlohmann::json& j, const Profile::Time::Type& v) {
 }
 
 void from_json(const nlohmann::json& j, Profile::Time::Type& v) {
-    std::string value = j.get<std::string>();
+    const std::string value = j.get<std::string>();
     if (value == "absolute") {
         v = Profile::Time::Type::Absolute;
     }
@@ -381,14 +381,14 @@ void to_json(nlohmann::json& j, const Profile::CameraNavState& v) {
         j["aim"] = *v.aim;
     }
     j["frame"] = v.referenceFrame;
-    nlohmann::json p {
+    const nlohmann::json p {
         { "x", v.position.x },
         { "y", v.position.y },
         { "z", v.position.z }
     };
     j["position"] = p;
     if (v.up.has_value()) {
-        nlohmann::json u {
+        const nlohmann::json u {
             { "x", v.up->x },
             { "y", v.up->y },
             { "z", v.up->z }
@@ -577,14 +577,14 @@ void convertVersion10to11(nlohmann::json& profile) {
         profile.at("keybindings").get<std::vector<version10::Keybinding>>();
     for (size_t i = 0; i < kbs.size(); i++) {
         version10::Keybinding& kb = kbs[i];
-        std::string identifier = fmt::format("profile.keybind.{}", i);
+        const std::string identifier = fmt::format("profile.keybind.{}", i);
 
         Profile::Action action;
         action.identifier = identifier;
         action.documentation = std::move(kb.documentation);
         action.name = std::move(kb.name);
         action.guiPath = std::move(kb.guiPath);
-        action.isLocal = std::move(kb.isLocal);
+        action.isLocal = kb.isLocal;
         action.script = std::move(kb.script);
         actions.push_back(std::move(action));
 
@@ -635,7 +635,7 @@ void Profile::saveCurrentSettingsToProfile(const properties::PropertyOwner& root
     version = Profile::CurrentVersion;
 
     // Update properties
-    std::vector<properties::Property*> ps = changedProperties(rootOwner);
+    const std::vector<properties::Property*> ps = changedProperties(rootOwner);
 
     for (properties::Property* prop : ps) {
         Property p;
@@ -754,8 +754,8 @@ Profile::Profile(const std::filesystem::path& path) {
         ));
     }
 
-    std::string content(
-        (std::istreambuf_iterator<char>(inFile)),
+    const std::string content = std::string(
+        std::istreambuf_iterator<char>(inFile),
         std::istreambuf_iterator<char>()
     );
 
@@ -830,7 +830,7 @@ Profile::Profile(const std::filesystem::path& path) {
     }
     catch (const nlohmann::json::exception& e) {
         std::string err = e.what();
-        throw ParsingError(ParsingError::Severity::Error, err);
+        throw ParsingError(ParsingError::Severity::Error, std::move(err));
     }
 }
 
diff --git a/src/scene/scene.cpp b/src/scene/scene.cpp
index 4b281d174f..35a58cc915 100644
--- a/src/scene/scene.cpp
+++ b/src/scene/scene.cpp
@@ -90,6 +90,16 @@ namespace {
     }
 #endif // TRACY_ENABLE
 
+    std::chrono::steady_clock::time_point currentTimeForInterpolation() {
+        using namespace openspace::global;
+        if (sessionRecording->isSavingFramesDuringPlayback()) {
+            return sessionRecording->currentPlaybackInterpolationTime();
+        }
+        else {
+            return std::chrono::steady_clock::now();
+        }
+    }
+
     template <class... Ts> struct overloaded : Ts... { using Ts::operator()...; };
     template <class... Ts> overloaded(Ts...) -> overloaded<Ts...>;
 } // namespace
@@ -146,7 +156,7 @@ Camera* Scene::camera() const {
 }
 
 void Scene::registerNode(SceneGraphNode* node) {
-    if (_nodesByIdentifier.count(node->identifier())) {
+    if (_nodesByIdentifier.contains(node->identifier())) {
         throw Scene::InvalidSceneError(fmt::format(
             "Node with identifier '{}' already exists", node->identifier()
         ));
@@ -276,8 +286,8 @@ bool Scene::isInitializing() const {
 void Scene::update(const UpdateData& data) {
     ZoneScoped;
 
-    std::vector<SceneGraphNode*> initializedNodes = _initializer->takeInitializedNodes();
-    for (SceneGraphNode* node : initializedNodes) {
+    const std::vector<SceneGraphNode*> initialized = _initializer->takeInitializedNodes();
+    for (SceneGraphNode* node : initialized) {
         try {
             node->initializeGL();
         }
@@ -394,12 +404,12 @@ SceneGraphNode* Scene::loadNode(const ghoul::Dictionary& nodeDictionary) {
             // TODO: Throw exception
             LERROR("Dependencies did not have the corrent type");
         }
-        ghoul::Dictionary nodeDependencies =
+        const ghoul::Dictionary nodeDependencies =
             nodeDictionary.value<ghoul::Dictionary>(SceneGraphNode::KeyDependencies);
 
-        for (std::string_view key : nodeDependencies.keys()) {
+        for (const std::string_view key : nodeDependencies.keys()) {
             std::string value = nodeDependencies.value<std::string>(key);
-            dependencyNames.push_back(value);
+            dependencyNames.push_back(std::move(value));
         }
     }
 
@@ -437,15 +447,6 @@ SceneGraphNode* Scene::loadNode(const ghoul::Dictionary& nodeDictionary) {
     return rawNodePointer;
 }
 
-std::chrono::steady_clock::time_point Scene::currentTimeForInterpolation() {
-    if (global::sessionRecording->isSavingFramesDuringPlayback()) {
-        return global::sessionRecording->currentPlaybackInterpolationTime();
-    }
-    else {
-        return std::chrono::steady_clock::now();
-    }
-}
-
 void Scene::addPropertyInterpolation(properties::Property* prop, float durationSeconds,
                                      std::string postScript,
                                      ghoul::EasingFunction easingFunction)
@@ -469,7 +470,7 @@ void Scene::addPropertyInterpolation(properties::Property* prop, float durationS
         ghoul::easingFunction<float>(easingFunction);
 
     // First check if the current property already has an interpolation information
-    std::chrono::steady_clock::time_point now = currentTimeForInterpolation();
+    const std::chrono::steady_clock::time_point now = currentTimeForInterpolation();
     for (PropertyInterpolationInfo& info : _propertyInterpolationInfos) {
         if (info.prop == prop) {
             info.beginTime = now;
@@ -520,10 +521,10 @@ void Scene::updateInterpolations() {
 
     using namespace std::chrono;
 
-    steady_clock::time_point now = currentTimeForInterpolation();
+    const steady_clock::time_point now = currentTimeForInterpolation();
     // First, let's update the properties
     for (PropertyInterpolationInfo& i : _propertyInterpolationInfos) {
-        long long us =
+        const long long us =
             duration_cast<std::chrono::microseconds>(now - i.beginTime).count();
 
         const float t = glm::clamp(
@@ -636,7 +637,7 @@ ProfilePropertyLua Scene::propertyProcessValue(ghoul::lua::LuaState& L,
                                                                  const std::string& value)
 {
     ProfilePropertyLua result;
-    PropertyValueType pType = propertyValueType(value);
+    const PropertyValueType pType = propertyValueType(value);
 
     switch (pType) {
         case PropertyValueType::Boolean:
@@ -648,27 +649,31 @@ ProfilePropertyLua Scene::propertyProcessValue(ghoul::lua::LuaState& L,
         case PropertyValueType::Nil:
             result = ghoul::lua::nil_t();
             break;
-        case PropertyValueType::Table:
-            ghoul::trimSurroundingCharacters(const_cast<std::string&>(value), '{');
-            ghoul::trimSurroundingCharacters(const_cast<std::string&>(value), '}');
-            handlePropertyLuaTableEntry(L, value);
+        case PropertyValueType::Table: {
+            std::string val = value;
+            ghoul::trimSurroundingCharacters(val, '{');
+            ghoul::trimSurroundingCharacters(val, '}');
+            handlePropertyLuaTableEntry(L, val);
             _valueIsTable = true;
             break;
+        }
         case PropertyValueType::String:
-        default:
-            ghoul::trimSurroundingCharacters(const_cast<std::string&>(value), '\"');
-            ghoul::trimSurroundingCharacters(const_cast<std::string&>(value), '[');
-            ghoul::trimSurroundingCharacters(const_cast<std::string&>(value), ']');
-            result = value;
+        default: {
+            std::string val = value;
+            ghoul::trimSurroundingCharacters(val, '\"');
+            ghoul::trimSurroundingCharacters(val, '[');
+            ghoul::trimSurroundingCharacters(val, ']');
+            result = val;
             break;
+        }
     }
     return result;
 }
 
 void Scene::handlePropertyLuaTableEntry(ghoul::lua::LuaState& L, const std::string& value)
 {
-    PropertyValueType enclosedType;
-    size_t commaPos = value.find(',', 0);
+    PropertyValueType enclosedType = PropertyValueType::Nil;
+    const size_t commaPos = value.find(',', 0);
     if (commaPos != std::string::npos) {
         enclosedType = propertyValueType(value.substr(0, commaPos));
     }
@@ -767,7 +772,7 @@ PropertyValueType Scene::propertyValueType(const std::string& value) {
 }
 
 std::vector<properties::Property*> Scene::propertiesMatchingRegex(
-                                                               std::string propertyString)
+                                                        const std::string& propertyString)
 {
     return findMatchesInAllProperties(propertyString, allProperties(), "");
 }
diff --git a/src/scene/scene_lua.inl b/src/scene/scene_lua.inl
index 41a22f49fe..83fc57afd9 100644
--- a/src/scene/scene_lua.inl
+++ b/src/scene/scene_lua.inl
@@ -578,7 +578,6 @@ namespace {
         else if (!nodeName.empty()) {
             size_t nodePos = id.find(nodeName);
             if (nodePos != std::string::npos) {
-
                 // Check tag
                 if (!groupName.empty()) {
                     properties::PropertyOwner* matchingTaggedOwner =
diff --git a/src/scene/scenegraphnode.cpp b/src/scene/scenegraphnode.cpp
index 32fcb655d1..1a39016b90 100644
--- a/src/scene/scenegraphnode.cpp
+++ b/src/scene/scenegraphnode.cpp
@@ -689,8 +689,7 @@ void SceneGraphNode::update(const UpdateData& data) {
     ZoneScoped;
     ZoneName(identifier().c_str(), identifier().size());
 
-    State s = _state;
-    if (s != State::Initialized && _state != State::GLInitialized) {
+    if (_state != State::Initialized && _state != State::GLInitialized) {
         return;
     }
     if (!isTimeFrameActive(data.time)) {
@@ -719,12 +718,13 @@ void SceneGraphNode::update(const UpdateData& data) {
     newUpdateData.modelTransform.rotation = _worldRotationCached;
     newUpdateData.modelTransform.scale = _worldScaleCached;
 
-    glm::dmat4 translation = glm::translate(
+    const glm::dmat4 translation = glm::translate(
         glm::dmat4(1.0),
         newUpdateData.modelTransform.translation
     );
-    glm::dmat4 rotation = glm::dmat4(newUpdateData.modelTransform.rotation);
-    glm::dmat4 scaling = glm::scale(glm::dmat4(1.0), newUpdateData.modelTransform.scale);
+    const glm::dmat4 rotation = glm::dmat4(newUpdateData.modelTransform.rotation);
+    const glm::dmat4 scaling =
+        glm::scale(glm::dmat4(1.0), newUpdateData.modelTransform.scale);
 
     _modelTransformCached = translation * rotation * scaling;
 
@@ -780,7 +780,7 @@ void SceneGraphNode::render(const RenderData& data, RendererTasks& tasks) {
         }
     }
 
-    bool isInStickerBin =
+    const bool isInStickerBin =
         data.renderBinMask & static_cast<int>(Renderable::RenderBin::Sticker);
 
     if (_showDebugSphere && isInStickerBin) {
@@ -794,15 +794,17 @@ void SceneGraphNode::render(const RenderData& data, RendererTasks& tasks) {
     }
 }
 
-void SceneGraphNode::renderDebugSphere(const Camera& camera, double size, glm::vec4 color)
+void SceneGraphNode::renderDebugSphere(const Camera& camera, double size,
+                                       const glm::vec4& color)
 {
-    glm::dvec3 scaleVec = _worldScaleCached * size;
-    glm::dmat4 modelTransform =
+    const glm::dvec3 scaleVec = _worldScaleCached * size;
+    const glm::dmat4 modelTransform =
         glm::translate(glm::dmat4(1.0), _worldPositionCached) *
         glm::dmat4(_worldRotationCached) *
         glm::scale(glm::dmat4(1.0), scaleVec);
 
-    glm::mat4 modelViewProjection = camera.projectionMatrix() *
+
+    const glm::mat4 modelViewProjection = camera.projectionMatrix() *
         glm::mat4(camera.combinedViewMatrix() * modelTransform);
 
     _debugSphereProgram->activate();
@@ -982,13 +984,14 @@ void SceneGraphNode::computeScreenSpaceData(RenderData& newData) {
         return;
     }
 
-    glm::ivec2 res = global::windowDelegate->currentSubwindowSize();
+    const glm::ivec2 res = global::windowDelegate->currentSubwindowSize();
 
     // Get the radius of node
-    double nodeRadius = boundingSphere();
+    const double nodeRadius = boundingSphere();
 
     // Distance from the camera to the node
-    double distFromCamToNode = glm::distance(cam.positionVec3(), worldPos) - nodeRadius;
+    const double distFromCamToNode =
+        glm::distance(cam.positionVec3(), worldPos) - nodeRadius;
 
     // Fix to limit the update of properties
     if (distFromCamToNode >= _visibilityDistance) {
@@ -1182,6 +1185,7 @@ void SceneGraphNode::setScene(Scene* scene) {
 
 std::vector<SceneGraphNode*> SceneGraphNode::children() const {
     std::vector<SceneGraphNode*> nodes;
+    nodes.reserve(_children.size());
     for (const ghoul::mm_unique_ptr<SceneGraphNode>& child : _children) {
         nodes.push_back(child.get());
     }
diff --git a/src/scene/sceneinitializer.cpp b/src/scene/sceneinitializer.cpp
index 387b61618f..9425a13e99 100644
--- a/src/scene/sceneinitializer.cpp
+++ b/src/scene/sceneinitializer.cpp
@@ -71,7 +71,7 @@ void MultiThreadedSceneInitializer::initializeNode(SceneGraphNode* node) {
         catch (const ghoul::RuntimeError& e) {
             LERRORC(e.component, e.message);
         }
-        std::lock_guard g(_mutex);
+        const std::lock_guard g(_mutex);
         _initializedNodes.push_back(node);
         _initializingNodes.erase(node);
 
@@ -98,7 +98,7 @@ void MultiThreadedSceneInitializer::initializeNode(SceneGraphNode* node) {
         );
     }
 
-    std::lock_guard g(_mutex);
+    const std::lock_guard g(_mutex);
     _initializingNodes.insert(node);
     _threadPool.enqueue(initFunction);
 }
@@ -111,13 +111,13 @@ std::vector<SceneGraphNode*> MultiThreadedSceneInitializer::takeInitializedNodes
         std::this_thread::sleep_for(std::chrono::milliseconds(1));
     }
 
-    std::lock_guard g(_mutex);
+    const std::lock_guard g(_mutex);
     std::vector<SceneGraphNode*> nodes = std::move(_initializedNodes);
     return nodes;
 }
 
 bool MultiThreadedSceneInitializer::isInitializing() const {
-    std::lock_guard g(_mutex);
+    const std::lock_guard g(_mutex);
     return !_initializingNodes.empty();
 }
 
diff --git a/src/scripting/scriptengine.cpp b/src/scripting/scriptengine.cpp
index 9c11565c9a..c409b9cc64 100644
--- a/src/scripting/scriptengine.cpp
+++ b/src/scripting/scriptengine.cpp
@@ -60,11 +60,16 @@ namespace {
 
         std::vector<std::string> result;
 
-        std::string total = prefix;
+        std::string total = std::move(prefix);
         if (!library.name.empty()) {
             total += library.name + ".";
         }
 
+        result.reserve(
+            library.functions.size() +
+            library.subLibraries.size() +
+            library.documentations.size()
+        );
         for (const LuaLibrary::Function& function : library.functions) {
             result.push_back(total + function.name);
         }
@@ -193,7 +198,7 @@ bool ScriptEngine::hasLibrary(const std::string& name) {
     return (it != _registeredLibraries.end());
 }
 
-bool ScriptEngine::runScript(const std::string& script, ScriptCallback callback) {
+bool ScriptEngine::runScript(const std::string& script, const ScriptCallback& callback) {
     ZoneScoped;
 
     ghoul_assert(!script.empty(), "Script must not be empty");
@@ -207,7 +212,7 @@ bool ScriptEngine::runScript(const std::string& script, ScriptCallback callback)
         if (callback) {
             ghoul::Dictionary returnValue =
                 ghoul::lua::loadArrayDictionaryFromString(script, _state);
-            callback(returnValue);
+            callback(std::move(returnValue));
         }
         else {
             ghoul::lua::runScript(_state, script);
@@ -370,7 +375,7 @@ void ScriptEngine::addLibraryFunctions(lua_State* state, LuaLibrary& library,
 
         lua_pushnil(state);
         while (lua_next(state, -2)) {
-            ghoul::Dictionary d = ghoul::lua::luaDictionaryFromState(state);
+            const ghoul::Dictionary d = ghoul::lua::luaDictionaryFromState(state);
             try {
                 const Parameters p = codegen::bake<Parameters>(d);
 
@@ -454,25 +459,24 @@ nlohmann::json ScriptEngine::generateJson() const {
     nlohmann::json json;
 
     for (const LuaLibrary& l : _registeredLibraries) {
-        using namespace openspace;
-        using namespace openspace::scripting;
-
         nlohmann::json library;
-        std::string libraryName = l.name;
+        const std::string libraryName = l.name;
         // Keep the library key for backwards compatability
         library["library"] = libraryName;
         library["name"] = libraryName;
-        std::string os = "openspace";
-        library["fullName"] = libraryName.empty() ? os : os  + "." + libraryName;
+        library["fullName"] =
+            libraryName.empty() ?
+            "openspace" :
+            "openspace." + libraryName;
 
         for (const LuaLibrary::Function& f : l.functions) {
-            bool hasSourceLocation = true;
-            library["functions"].push_back(toJson(f, hasSourceLocation));
+            constexpr bool HasSourceLocation = true;
+            library["functions"].push_back(toJson(f, HasSourceLocation));
         }
 
         for (const LuaLibrary::Function& f : l.documentations) {
-            bool hasSourceLocation = false;
-            library["functions"].push_back(toJson(f, hasSourceLocation));
+            constexpr bool HasSourceLocation = false;
+            library["functions"].push_back(toJson(f, HasSourceLocation));
         }
         sortJson(library["functions"], "name");
         json.push_back(library);
@@ -495,7 +499,10 @@ void ScriptEngine::writeLog(const std::string& script) {
             LDEBUG(fmt::format("Using script log file '{}'", _logFilename));
 
             // Test file and clear previous input
-            std::ofstream file(_logFilename, std::ofstream::out | std::ofstream::trunc);
+            const std::ofstream file = std::ofstream(
+                _logFilename,
+                std::ofstream::out | std::ofstream::trunc
+            );
 
             if (!file.good()) {
                 LERROR(fmt::format(
@@ -524,10 +531,10 @@ void ScriptEngine::writeLog(const std::string& script) {
 void ScriptEngine::preSync(bool isMaster) {
     ZoneScoped;
 
-    std::lock_guard guard(_clientScriptsMutex);
+    const std::lock_guard guard(_clientScriptsMutex);
     if (isMaster) {
         while (!_incomingScripts.empty()) {
-            QueueItem item = std::move(_incomingScripts.front());
+            const QueueItem item = std::move(_incomingScripts.front());
             _incomingScripts.pop();
 
             // Not really a received script but the master also needs to run the script...
@@ -552,9 +559,9 @@ void ScriptEngine::preSync(bool isMaster) {
     }
     else {
         while (!_incomingScripts.empty()) {
-            QueueItem item = std::move(_incomingScripts.front());
-            _incomingScripts.pop();
+            const QueueItem& item = std::move(_incomingScripts.front());
             _clientScriptQueue.push(item.script);
+            _incomingScripts.pop();
         }
     }
 }
@@ -562,7 +569,7 @@ void ScriptEngine::preSync(bool isMaster) {
 void ScriptEngine::encode(SyncBuffer* syncBuffer) {
     ZoneScoped;
 
-    size_t nScripts = _scriptsToSync.size();
+    const size_t nScripts = _scriptsToSync.size();
     syncBuffer->encode(nScripts);
     for (const std::string& s : _scriptsToSync) {
         syncBuffer->encode(s);
@@ -573,8 +580,8 @@ void ScriptEngine::encode(SyncBuffer* syncBuffer) {
 void ScriptEngine::decode(SyncBuffer* syncBuffer) {
     ZoneScoped;
 
-    std::lock_guard guard(_clientScriptsMutex);
-    size_t nScripts;
+    const std::lock_guard guard(_clientScriptsMutex);
+    size_t nScripts = 0;
     syncBuffer->decode(nScripts);
 
     for (size_t i = 0; i < nScripts; i++) {
@@ -589,11 +596,11 @@ void ScriptEngine::postSync(bool isMaster) {
 
     if (isMaster) {
         while (!_masterScriptQueue.empty()) {
-            std::string script = std::move(_masterScriptQueue.front().script);
-            ScriptCallback callback = std::move(_masterScriptQueue.front().callback);
+            const std::string script = std::move(_masterScriptQueue.front().script);
+            const ScriptCallback cb = std::move(_masterScriptQueue.front().callback);
             _masterScriptQueue.pop();
             try {
-                runScript(script, callback);
+                runScript(script, cb);
             }
             catch (const ghoul::RuntimeError& e) {
                 LERRORC(e.component, e.message);
@@ -602,7 +609,7 @@ void ScriptEngine::postSync(bool isMaster) {
         }
     }
     else {
-        std::lock_guard guard(_clientScriptsMutex);
+        const std::lock_guard guard(_clientScriptsMutex);
         while (!_clientScriptQueue.empty()) {
             try {
                 runScript(_clientScriptQueue.front());
@@ -712,7 +719,7 @@ void ScriptEngine::addBaseLibrary() {
             codegen::lua::UnzipFile
         }
     };
-    addLibrary(lib);
+    addLibrary(std::move(lib));
 }
 
 } // namespace openspace::scripting
diff --git a/src/scripting/scriptscheduler.cpp b/src/scripting/scriptscheduler.cpp
index 4c41bc0c65..5024fd1ba1 100644
--- a/src/scripting/scriptscheduler.cpp
+++ b/src/scripting/scriptscheduler.cpp
@@ -120,7 +120,7 @@ void ScriptScheduler::loadScripts(std::vector<ScheduledScript> scheduledScripts)
     );
 
     for (ScheduledScript& script : scheduledScripts) {
-        _scripts.push_back(script);
+        _scripts.push_back(std::move(script));
     }
 
     // Re-sort so it is always in sorted order in regards to time
@@ -176,7 +176,7 @@ std::vector<std::string> ScriptScheduler::progressTo(double newTime) {
     if (newTime > _currentTime) {
         // Moving forward in time; we need to find the highest entry in the timings
         // vector that is still smaller than the newTime
-        size_t prevIndex = _currentIndex;
+        const size_t prevIndex = _currentIndex;
         const auto it = std::upper_bound(
             _scripts.begin() + prevIndex, // We only need to start at the previous time
             _scripts.end(),
@@ -201,7 +201,7 @@ std::vector<std::string> ScriptScheduler::progressTo(double newTime) {
             std::string script = iter->universalScript.empty() ?
                 iter->forwardScript :
                 iter->universalScript + "; " + iter->forwardScript;
-            result.push_back(script);
+            result.push_back(std::move(script));
         }
 
         return result;
@@ -234,7 +234,7 @@ std::vector<std::string> ScriptScheduler::progressTo(double newTime) {
             std::string script = iter->universalScript.empty() ?
                 iter->backwardScript :
                 iter->universalScript + "; " + iter->backwardScript;
-            result.push_back(script);
+            result.push_back(std::move(script));
 
             if (iter == _scripts.begin()) {
                 break;
@@ -255,7 +255,7 @@ double ScriptScheduler::currentTime() const {
 
 void ScriptScheduler::setCurrentTime(double time) {
     // Ensure _currentIndex and _currentTime is accurate after time jump
-    std::vector<std::string> scheduledScripts = progressTo(time);
+    const std::vector<std::string> scheduledScripts = progressTo(time);
 
     if (_shouldRunAllTimeJump) {
         // Queue all scripts for the time jump
diff --git a/src/util/blockplaneintersectiongeometry.cpp b/src/util/blockplaneintersectiongeometry.cpp
index 5b73618863..888c826c3d 100644
--- a/src/util/blockplaneintersectiongeometry.cpp
+++ b/src/util/blockplaneintersectiongeometry.cpp
@@ -37,8 +37,8 @@ namespace openspace {
 BlockPlaneIntersectionGeometry::BlockPlaneIntersectionGeometry(glm::vec3 blockSize,
                                                                glm::vec3 planeNormal,
                                                                float planeDistance)
-    : _size(blockSize)
-    , _normal(planeNormal)
+    : _size(std::move(blockSize))
+    , _normal(std::move(planeNormal))
     , _planeDistance(planeDistance)
 {}
 
@@ -52,7 +52,7 @@ void BlockPlaneIntersectionGeometry::setBlockSize(glm::vec3 size) {
     updateVertices();
 }
 
-void BlockPlaneIntersectionGeometry::setPlane(glm::vec3 normal, float distance) {
+void BlockPlaneIntersectionGeometry::setPlane(const glm::vec3& normal, float distance) {
     _normal = glm::normalize(normal);
     _planeDistance = distance;
     updateVertices();
@@ -61,7 +61,7 @@ void BlockPlaneIntersectionGeometry::setPlane(glm::vec3 normal, float distance)
 void BlockPlaneIntersectionGeometry::updateVertices() {
     _vertices.clear();
 
-    const int cornersInLines[24] = {
+    constexpr std::array<int, 24> CornersInLines = {
         0, 1,
         1, 5,
         5, 4,
@@ -84,23 +84,24 @@ void BlockPlaneIntersectionGeometry::updateVertices() {
     int nIntersections = 0;
 
     for (int i = 0; i < 12; i++) {
-        int iCorner0 = cornersInLines[i * 2];
-        int iCorner1 = cornersInLines[i * 2 + 1];
+        const int iCorner0 = CornersInLines[i * 2];
+        const int iCorner1 = CornersInLines[i * 2 + 1];
 
-        glm::vec3 corner0 = glm::vec3(
+        const glm::vec3 corner0 = glm::vec3(
             iCorner0 % 2,
             (iCorner0 / 2) % 2,
             iCorner0 / 4
         ) - halfSize;
-        glm::vec3 corner1 = glm::vec3(
+        const glm::vec3 corner1 = glm::vec3(
             iCorner1 % 2,
             (iCorner1 / 2) % 2,
             iCorner1 / 4
         ) - halfSize;
 
-        glm::vec3 line = corner1 - corner0;
+        const glm::vec3 line = corner1 - corner0;
 
-        float t = (_planeDistance - glm::dot(corner0, _normal)) / glm::dot(line, _normal);
+        const float t =
+            (_planeDistance - glm::dot(corner0, _normal)) / glm::dot(line, _normal);
         if (t >= 0.0 && t <= 1.0) {
             intersections[nIntersections++] = corner0 + t * line;
         }
@@ -115,13 +116,13 @@ void BlockPlaneIntersectionGeometry::updateVertices() {
 
     std::vector<std::pair<int, float>> angles(nIntersections - 1);
 
-    glm::vec3 vector1 = glm::normalize(intersections[1] - intersections[0]);
-    angles[0] = std::pair<int, float>(1, 0.0f);
+    const glm::vec3 vec1 = glm::normalize(intersections[1] - intersections[0]);
+    angles[0] = std::pair<int, float>(1, 0.f);
 
     for (int i = 2; i < nIntersections; i++) {
-        glm::vec3 vectorI = glm::normalize(intersections[i] - intersections[0]);
-        float sinA = glm::dot(glm::cross(vector1, vectorI), _normal);
-        float cosA = glm::dot(vector1, vectorI);
+        const glm::vec3 vectorI = glm::normalize(intersections[i] - intersections[0]);
+        const float sinA = glm::dot(glm::cross(vec1, vectorI), _normal);
+        const float cosA = glm::dot(vec1, vectorI);
         angles[i - 1] = { i, glm::sign(sinA) * (1.f - cosA) };
     }
 
@@ -137,7 +138,7 @@ void BlockPlaneIntersectionGeometry::updateVertices() {
     _vertices.push_back(intersections[0].z);
     //_vertices.push_back(_w);
     for (int i = 0; i < nIntersections - 1; i++) {
-        int j = angles[i].first;
+        const int j = angles[i].first;
         _vertices.push_back(intersections[j].x);
         _vertices.push_back(intersections[j].y);
         _vertices.push_back(intersections[j].z);
diff --git a/src/util/boxgeometry.cpp b/src/util/boxgeometry.cpp
index 6c06e54b89..335eefb264 100644
--- a/src/util/boxgeometry.cpp
+++ b/src/util/boxgeometry.cpp
@@ -47,27 +47,27 @@ bool BoxGeometry::initialize() {
     const float y = _size.y * 0.5f;
     const float z = _size.z * 0.5f;
 
-    const GLfloat vertices[] = {
+    const std::array<GLfloat, 108> vertices = {
         -x, -y,  z, // blue corner
-        x,  y,  z,  // white corner
+         x,  y,  z,  // white corner
         -x,  y,  z, // cyan corner
         -x, -y,  z, // blue corner
-        x, -y,  z,  // magenta corner
-        x,  y,  z,  // white corner
+         x, -y,  z,  // magenta corner
+         x,  y,  z,  // white corner
 
         -x, -y, -z, // black corner
         -x,  y, -z, // green
-        x,  y, -z,  // yellow corner
+         x,  y, -z,  // yellow corner
         -x, -y, -z, // black
-        x,  y, -z, // yellow
-        x, -y, -z, // red
+         x,  y, -z, // yellow
+         x, -y, -z, // red
 
-        x, -y, -z, // red
-        x,  y,  z, // yellow
-        x, -y,  z, // magenta
-        x, -y, -z, // red
-        x,  y, -z, // yellow
-        x,  y,  z, // white
+         x, -y, -z, // red
+         x,  y,  z, // yellow
+         x, -y,  z, // magenta
+         x, -y, -z, // red
+         x,  y, -z, // yellow
+         x,  y,  z, // white
 
         -x, -y, -z, // black
         -x, -y,  z, // blue
@@ -76,19 +76,19 @@ bool BoxGeometry::initialize() {
         -x,  y,  z, // cyan
         -x,  y, -z, // green
 
-        x,  y,  z, // white
+         x,  y,  z, // white
         -x,  y, -z, // green
         -x,  y,  z, // cyan
         -x,  y, -z, // green
-        x,  y,  z, // white
-        x,  y, -z, // yellow
+         x,  y,  z, // white
+         x,  y, -z, // yellow
 
         -x, -y, -z, // black
-        x, -y,  z, // magenta
+         x, -y,  z, // magenta
         -x, -y,  z, // blue
         -x, -y, -z, // black
-        x, -y, -z, // red
-        x, -y,  z // magenta
+         x, -y, -z, // red
+         x, -y,  z // magenta
     };
 
     if (_vaoId == 0) {
@@ -97,18 +97,12 @@ bool BoxGeometry::initialize() {
 
     if (_vBufferId == 0) {
         glGenBuffers(1, &_vBufferId);
-
-        if (_vBufferId == 0) {
-            LERROR("Could not create vertex buffer");
-            return false;
-        }
     }
 
-    // First VAO setup
     glBindVertexArray(_vaoId);
 
     glBindBuffer(GL_ARRAY_BUFFER, _vBufferId);
-    glBufferData(GL_ARRAY_BUFFER, sizeof(vertices), &vertices, GL_STATIC_DRAW);
+    glBufferData(GL_ARRAY_BUFFER, sizeof(vertices), vertices.data(), GL_STATIC_DRAW);
 
     glEnableVertexAttribArray(0);
     glVertexAttribPointer(0, 3, GL_FLOAT, GL_FALSE, sizeof(GLfloat) * 3, nullptr);
@@ -117,7 +111,7 @@ bool BoxGeometry::initialize() {
     return true;
 }
 
-void BoxGeometry::render() {
+void BoxGeometry::render() const {
     glBindVertexArray(_vaoId);  // select first VAO
     glDrawArrays(GL_TRIANGLES, 0, 6*6);
     glBindVertexArray(0);
diff --git a/src/util/collisionhelper.cpp b/src/util/collisionhelper.cpp
index af74c2df77..3e7f727313 100644
--- a/src/util/collisionhelper.cpp
+++ b/src/util/collisionhelper.cpp
@@ -29,21 +29,21 @@
 namespace openspace::collision {
 
 // Source: http://paulbourke.net/geometry/circlesphere/raysphere.c
-bool lineSphereIntersection(glm::dvec3 p1, glm::dvec3 p2, glm::dvec3 center,
-                            double r, glm::dvec3& intersectionPoint)
+bool lineSphereIntersection(const glm::dvec3& p1, const glm::dvec3& p2,
+                            const glm::dvec3& center, double r,
+                            glm::dvec3& intersectionPoint)
 {
-    double a, b, c;
     const glm::dvec3 diffp = p2 - p1;
 
-    a = diffp.x * diffp.x + diffp.y * diffp.y + diffp.z * diffp.z;
-    b = 2.0 * (diffp.x * (p1.x - center.x) + diffp.y * (p1.y - center.y) +
+    const double a = diffp.x * diffp.x + diffp.y * diffp.y + diffp.z * diffp.z;
+    const double b = 2.0 * (diffp.x * (p1.x - center.x) + diffp.y * (p1.y - center.y) +
         diffp.z * (p1.z - center.z));
-    c = center.x * center.x + center.y * center.y + center.z * center.z;
+    double c = center.x * center.x + center.y * center.y + center.z * center.z;
     c += p1.x * p1.x + p1.y * p1.y + p1.z * p1.z;
     c -= 2.0 * (center.x * p1.x + center.y * p1.y + center.z * p1.z);
     c -= r * r;
 
-    double intersectionTest = b * b - 4.0 * a * c;
+    const double intersectionTest = b * b - 4.0 * a * c;
 
     // No intersection
     if (std::abs(a) < 0 || intersectionTest < 0.0) {
diff --git a/src/util/coordinateconversion.cpp b/src/util/coordinateconversion.cpp
index 0f700060b3..cf2819cf45 100644
--- a/src/util/coordinateconversion.cpp
+++ b/src/util/coordinateconversion.cpp
@@ -42,10 +42,10 @@ namespace {
                      double& seconds)
     {
         // Find hms or dms indicies
-        size_t hOrDIndex =
+        const size_t hOrDIndex =
             (str.find('h') != std::string::npos) ? str.find('h') : str.find('d');
-        size_t mIndex = str.find('m');
-        size_t sIndex = str.find('s');
+        const size_t mIndex = str.find('m');
+        const size_t sIndex = str.find('s');
         if (hOrDIndex == std::string::npos || mIndex == std::string::npos ||
             sIndex == std::string::npos)
         {
@@ -56,9 +56,9 @@ namespace {
         }
 
         // Construct the number strings
-        std::string sHoursOrDegrees = str.substr(0, hOrDIndex);
-        std::string sMinutes = str.substr(hOrDIndex + 1, mIndex - hOrDIndex - 1);
-        std::string sSeconds = str.substr(mIndex + 1, sIndex - mIndex - 1);
+        const std::string sHoursOrDegrees = str.substr(0, hOrDIndex);
+        const std::string sMinutes = str.substr(hOrDIndex + 1, mIndex - hOrDIndex - 1);
+        const std::string sSeconds = str.substr(mIndex + 1, sIndex - mIndex - 1);
 
         // Convert the strings to numbers
         try {
@@ -176,21 +176,23 @@ namespace openspace {
 // https://www.atnf.csiro.au/people/Tobias.Westmeier/tools_coords.php
 glm::dvec3 icrsToGalacticCartesian(double ra, double dec, double distance) {
     // (Ra, Dec) -> (a, d)
-    double a = glm::radians(ra);
-    double d = glm::radians(dec);
+    const double a = glm::radians(ra);
+    const double d = glm::radians(dec);
 
     // Convert to galactic reference frame
-    double l = L0 - atan2(
-        cos(d) * sin(a - A0),
-        sin(d) * cos(D0) - cos(d) * sin(D0) * cos(a - A0)
+    const double l = L0 - std::atan2(
+        std::cos(d) * std::sin(a - A0),
+        std::sin(d) * std::cos(D0) - std::cos(d) * std::sin(D0) * std::cos(a - A0)
+    );
+    const double b = std::asin(
+        std::sin(d) * std::sin(D0) + std::cos(d) * std::cos(D0) * std::cos(a - A0)
     );
-    double b = asin(sin(d) * sin(D0) + cos(d) * cos(D0) * cos(a - A0));
 
     // Convert to cartesian
-    glm::dvec3 rGalactic = glm::dvec3(
-        cos(b) * cos(l),
-        cos(b) * sin(l),
-        sin(b)
+    const glm::dvec3 rGalactic = glm::dvec3(
+        std::cos(b) * std::cos(l),
+        std::cos(b) * std::sin(l),
+        std::sin(b)
     );
 
     return distance * rGalactic;
@@ -211,13 +213,15 @@ glm::dvec2 icrsToDecimalDegrees(const std::string& ra, const std::string& dec) {
     }
 
     // Parse right ascension
-    int raHours, raMinutes;
-    double raSeconds;
+    int raHours = 0;
+    int raMinutes = 0;
+    double raSeconds = 0.0;
     parseRa(ra, raHours, raMinutes, raSeconds);
 
     // Parse declination
-    int decDegrees, decMinutes;
-    double decSeconds;
+    int decDegrees = 0;
+    int decMinutes = 0;
+    double decSeconds = 0.0;
     parseDec(dec, decDegrees, decMinutes, decSeconds);
 
     const bool isValid = isRaDecValid(raHours,
@@ -236,12 +240,12 @@ glm::dvec2 icrsToDecimalDegrees(const std::string& ra, const std::string& dec) {
     }
 
     // Convert from hours/degrees, minutes, seconds to decimal degrees
-    double sign = std::signbit(static_cast<float>(decDegrees)) ? -1.0 : 1.0;
-    double raDeg = (raHours * 15.0) +
+    const double sign = std::signbit(static_cast<float>(decDegrees)) ? -1.0 : 1.0;
+    const double raDeg = (raHours * 15.0) +
         (raMinutes * 15.0 / 60.0) +
         (raSeconds * 15.0 / 3600.0);
 
-    double decDeg = (abs(decDegrees) +
+    const double decDeg = (std::abs(decDegrees) +
         (decMinutes / 60.0) +
         (decSeconds / 3600.0)) * sign;
 
@@ -255,22 +259,24 @@ glm::dvec2 icrsToDecimalDegrees(const std::string& ra, const std::string& dec) {
 // https://en.wikipedia.org/wiki/Celestial_coordinate_system
 glm::dvec3 galacticCartesianToIcrs(double x, double y, double z) {
     // Normalize
-    double distance = sqrt(x*x + y*y + z*z);
-    double nX = x / distance;
-    double nY = y / distance;
-    double nZ = z / distance;
+    const double distance = std::sqrt(x*x + y*y + z*z);
+    double const nX = x / distance;
+    const double nY = y / distance;
+    const double nZ = z / distance;
 
     // Convert from cartesian
     // (x, y, z) -> (l, b)
-    double l = atan2(nY, nX);
-    double b = asin(nZ);
+    const double l = std::atan2(nY, nX);
+    const double b = std::asin(nZ);
 
     // Convert to equatorial reference frame
-    double a = atan2(
-        cos(b) * sin(L0 - l),
-        sin(b) * cos(D0) - cos(b) * sin(D0) * cos(L0 - l)
+    const double a = std::atan2(
+        std::cos(b) * std::sin(L0 - l),
+        std::sin(b) * std::cos(D0) - std::cos(b) * std::sin(D0) * std::cos(L0 - l)
     ) + A0;
-    double d = asin(sin(b) * sin(D0) + cos(b) * cos(D0) * cos(L0 - l));
+    const double d = std::asin(
+        std::sin(b) * std::sin(D0) + std::cos(b) * std::cos(D0) * std::cos(L0 - l)
+    );
 
     return glm::dvec3(glm::degrees(a), glm::degrees(d), distance);
 }
@@ -281,12 +287,8 @@ glm::dvec3 galacticCartesianToIcrs(double x, double y, double z) {
 // https://math.stackexchange.com/questions/15323/how-do-i-calculate-the-cartesian-
 // coordinates-of-stars
 std::pair<std::string, std::string> decimalDegreesToIcrs(double ra, double dec) {
-    // Radians to degrees
-    double raDeg = ra;
-    double decDeg = dec;
-
     // Check input
-    if (raDeg < 0 || raDeg > 360 || decDeg < -90 || decDeg > 90) {
+    if (ra < 0.0 || ra > 360.0 || dec < -90.0 || dec > 90.0) {
         LWARNING(fmt::format(
             "Ra '{}' or Dec '{}' is outside the allowed range, result may be incorrect",
             ra, dec
@@ -294,16 +296,16 @@ std::pair<std::string, std::string> decimalDegreesToIcrs(double ra, double dec)
     }
 
     // Calculate Ra
-    int raHours = static_cast<int>(std::trunc(raDeg) / 15.0);
-    double raMinutesFull = (raDeg - raHours * 15.0) * 60.0 / 15.0;
-    int raMinutes = static_cast<int>(std::trunc(raMinutesFull));
-    double raSeconds = (raMinutesFull - raMinutes) * 60.0;
+    const int raHours = static_cast<int>(std::trunc(ra) / 15.0);
+    const double raMinutesFull = (ra - raHours * 15.0) * 60.0 / 15.0;
+    const int raMinutes = static_cast<int>(std::trunc(raMinutesFull));
+    const double raSeconds = (raMinutesFull - raMinutes) * 60.0;
 
     // Calculate Dec
-    int decDegrees = static_cast<int>(std::trunc(decDeg));
-    double decMinutesFull = (std::abs(decDeg) - std::abs(decDegrees)) * 60.0;
-    int decMinutes = static_cast<int>(std::trunc(decMinutesFull));
-    double decSeconds = (decMinutesFull - decMinutes) * 60.0;
+    const int decDegrees = static_cast<int>(std::trunc(dec));
+    const double decMinutesFull = (std::abs(dec) - std::abs(decDegrees)) * 60.0;
+    const int decMinutes = static_cast<int>(std::trunc(decMinutesFull));
+    const double decSeconds = (decMinutesFull - decMinutes) * 60.0;
 
     // Construct strings
     std::pair<std::string, std::string> result;
diff --git a/src/util/distanceconversion.cpp b/src/util/distanceconversion.cpp
index 31eb085530..0767890fa9 100644
--- a/src/util/distanceconversion.cpp
+++ b/src/util/distanceconversion.cpp
@@ -99,11 +99,11 @@ std::pair<double, std::string_view> simplifyDistance(double meters,
 }
 
 float convertMasPerYearToMeterPerSecond(float masPerYear, float parallax) {
-    double degreeFromMas = 1.0 / 3600000.0;
-    double radiusInMeter = (distanceconstants::Parsec * 1000.0) / parallax;
-    double perYearToPerSecond = 1.0 / SecondsPerYear;
-    double meterPerSecond = masPerYear * degreeFromMas * radiusInMeter *
-                            perYearToPerSecond;
+    const double degreeFromMas = 1.0 / 3600000.0;
+    const double radiusInMeter = (distanceconstants::Parsec * 1000.0) / parallax;
+    const double perYearToPerSecond = 1.0 / SecondsPerYear;
+    const double meterPerSecond =
+        masPerYear * degreeFromMas * radiusInMeter * perYearToPerSecond;
     return static_cast<float>(meterPerSecond);
 }
 
diff --git a/src/util/factorymanager.cpp b/src/util/factorymanager.cpp
index 48665796a0..8adcd7178d 100644
--- a/src/util/factorymanager.cpp
+++ b/src/util/factorymanager.cpp
@@ -81,8 +81,8 @@ nlohmann::json generateJsonDocumentation(const Documentation& d) {
             }
         }
         else if (tv) {
-            Documentation doc = { .entries = tv->documentations };
-            nlohmann::json restrictions = generateJsonDocumentation(doc);
+            const Documentation doc = { .entries = tv->documentations };
+            const nlohmann::json restrictions = generateJsonDocumentation(doc);
             // We have a TableVerifier, so we need to recurse
             entry["restrictions"] = restrictions;
         }
@@ -160,7 +160,7 @@ nlohmann::json FactoryManager::generateJson() const {
                 return d.name == factoryInfo.name;
             });
         if (factoryDoc != docs.end()) {
-            nlohmann::json documentation = generateJsonDocumentation(*factoryDoc);
+            const nlohmann::json documentation = generateJsonDocumentation(*factoryDoc);
             factory["classes"].push_back(documentation);
             // Remove documentation from list check at the end if all docs got put in
             docs.erase(factoryDoc);
@@ -182,7 +182,7 @@ nlohmann::json FactoryManager::generateJson() const {
                     return d.name == c;
                 });
             if (found != docs.end()) {
-                nlohmann::json documentation = generateJsonDocumentation(*found);
+                const nlohmann::json documentation = generateJsonDocumentation(*found);
                 factory["classes"].push_back(documentation);
                 docs.erase(found);
             }
diff --git a/src/util/histogram.cpp b/src/util/histogram.cpp
index db8432bc33..3f96709933 100644
--- a/src/util/histogram.cpp
+++ b/src/util/histogram.cpp
@@ -76,7 +76,7 @@ bool Histogram::add(float value, float repeat) {
 
     const float normalizedValue = (value - _minValue) / (_maxValue - _minValue);
     const int binIndex = static_cast<int>(std::min(
-        static_cast<float>(floor(normalizedValue * _numBins)),
+        static_cast<float>(std::floor(normalizedValue * _numBins)),
         _numBins - 1.f
     )); // [0, _numBins - 1]
 
@@ -92,16 +92,16 @@ void Histogram::changeRange(float minValue, float maxValue){
     }
 
     float* oldData = _data;
-    float oldMin = _minValue;
-    float oldMax = _maxValue;
+    const float oldMin = _minValue;
+    const float oldMax = _maxValue;
 
     float* newData = new float[_numBins]{0.0};
     for(int i=0; i<_numBins; i++){
-        float unNormalizedValue = i*(oldMax-oldMin)+oldMin;
-        float normalizedValue = (unNormalizedValue - _minValue) /
-                                (_maxValue - _minValue);      // [0.0, 1.0]
-        int binIndex = static_cast<int>(std::min(
-            static_cast<float>(floor(normalizedValue * _numBins)),
+        const float unNormalizedValue = i * (oldMax - oldMin) + oldMin;
+        const float normalizedValue = (unNormalizedValue - _minValue) /
+                                      (_maxValue - _minValue);      // [0.0, 1.0]
+        const int binIndex = static_cast<int>(std::min(
+            static_cast<float>(std::floor(normalizedValue * _numBins)),
             _numBins - 1.f
         )); // [0, _numBins - 1]
 
@@ -153,8 +153,8 @@ bool Histogram::addRectangle(float lowBin, float highBin, float value) {
     const float lowBinIndex = normalizedLowBin * _numBins;
     const float highBinIndex = normalizedHighBin * _numBins;
 
-    const int fillLow = static_cast<int>(floor(lowBinIndex));
-    const int fillHigh = static_cast<int>(ceil(highBinIndex));
+    const int fillLow = static_cast<int>(std::floor(lowBinIndex));
+    const int fillHigh = static_cast<int>(std::ceil(highBinIndex));
 
     for (int i = fillLow; i < fillHigh; i++) {
         _data[i] += value;
@@ -176,9 +176,9 @@ float Histogram::interpolate(float bin) const {
     const float normalizedBin = (bin - _minValue) / (_maxValue - _minValue);
     const float binIndex = normalizedBin * _numBins - 0.5f; // Center
 
-    const float interpolator = binIndex - floor(binIndex);
-    int binLow = static_cast<int>(floor(binIndex));
-    int binHigh = static_cast<int>(ceil(binIndex));
+    const float interpolator = binIndex - std::floor(binIndex);
+    int binLow = static_cast<int>(std::floor(binIndex));
+    int binHigh = static_cast<int>(std::ceil(binIndex));
 
     // Clamp bins
     if (binLow < 0) {
@@ -222,11 +222,11 @@ void Histogram::normalize() {
  * value will be the value at the index.
  */
 void Histogram::generateEqualizer() {
-    float previousCdf = 0.0f;
-    _equalizer = std::vector<float>(_numBins, 0.0f);
+    float previousCdf = 0.f;
+    _equalizer = std::vector<float>(_numBins, 0.f);
     for (int i = 0; i < _numBins; i++) {
         const float probability = _data[i] / static_cast<float>(_numValues);
-        const float cdf = std::min(1.0f, previousCdf + probability);
+        const float cdf = std::min(1.f, previousCdf + probability);
         _equalizer[i] = cdf * (_numBins-1);
         previousCdf = cdf;
     }
@@ -257,8 +257,8 @@ float Histogram::equalize(float value) const {
     //         " val: " + std::to_string(value)
     //     );
     // }
-    float normalizedValue = (value-_minValue)/(_maxValue-_minValue);
-    int bin = static_cast<int>(floor(normalizedValue * _numBins));
+    const float normalizedValue = (value - _minValue) / (_maxValue - _minValue);
+    int bin = static_cast<int>(std::floor(normalizedValue * _numBins));
     // If value == _maxValues then bin == _numBins, which is a invalid index.
     bin = std::min(_numBins-1, bin);
     bin = std::max(0, bin);
@@ -271,7 +271,7 @@ float Histogram::entropy() {
     for (int i = 0; i < _numBins; i++) {
         if (_data[i] != 0) {
             entropy -= (_data[i] / static_cast<float>(_numValues)) *
-                        (log2(_data[i]) / static_cast<float>(_numValues));
+                        (std::log2(_data[i]) / static_cast<float>(_numValues));
         }
     }
     return entropy;
@@ -326,9 +326,9 @@ float Histogram::highestBinValue(bool equalized, int overBins){
 
 
     if (!equalized) {
-        float low = _minValue + static_cast<float>(highestBin) /
-                    _numBins * (_maxValue - _minValue);
-        float high = low + (_maxValue - _minValue) / static_cast<float>(_numBins);
+        const float low = _minValue + static_cast<float>(highestBin) /
+                          _numBins * (_maxValue - _minValue);
+        const float high = low + (_maxValue - _minValue) / static_cast<float>(_numBins);
         return (high+low) / 2.f;
     }
     else {
@@ -337,7 +337,7 @@ float Histogram::highestBinValue(bool equalized, int overBins){
     }
 }
 
-float Histogram::binWidth() {
+float Histogram::binWidth() const {
     return (_maxValue - _minValue) / _numBins;
 }
 
diff --git a/src/util/httprequest.cpp b/src/util/httprequest.cpp
index 22e1e42d82..1a56a7d4f0 100644
--- a/src/util/httprequest.cpp
+++ b/src/util/httprequest.cpp
@@ -72,7 +72,8 @@ bool HttpRequest::perform(std::chrono::milliseconds timeout) {
         CURLOPT_HEADERFUNCTION,
         +[](char* ptr, size_t size, size_t nmemb, void* userData) {
             HttpRequest* r = reinterpret_cast<HttpRequest*>(userData);
-            bool shouldContinue = r->_onHeader ? r->_onHeader(ptr, size * nmemb) : true;
+            const bool shouldContinue =
+                r->_onHeader ? r->_onHeader(ptr, size * nmemb) : true;
             return shouldContinue ? size * nmemb : 0;
         }
     );
@@ -83,7 +84,7 @@ bool HttpRequest::perform(std::chrono::milliseconds timeout) {
         CURLOPT_WRITEFUNCTION,
         +[](char* ptr, size_t size, size_t nmemb, void* userData) {
             HttpRequest* r = reinterpret_cast<HttpRequest*>(userData);
-            bool shouldContinue = r->_onData ? r->_onData(ptr, size * nmemb) : true;
+            const bool shouldContinue = r->_onData ? r->_onData(ptr, size * nmemb) : true;
             return shouldContinue ? size * nmemb : 0;
         }
     );
@@ -103,7 +104,8 @@ bool HttpRequest::perform(std::chrono::milliseconds timeout) {
                 totalBytes = nTotalDownloadBytes;
             }
 
-            bool shouldContinue = r->_onProgress ?
+            const bool shouldContinue =
+                r->_onProgress ?
                 r->_onProgress(nDownloadedBytes, totalBytes) :
                 true;
             return shouldContinue ? 0 : 1;
@@ -112,10 +114,10 @@ bool HttpRequest::perform(std::chrono::milliseconds timeout) {
 
     curl_easy_setopt(curl, CURLOPT_TIMEOUT_MS, static_cast<long>(timeout.count()));
 
-    CURLcode res = curl_easy_perform(curl);
+    const CURLcode res = curl_easy_perform(curl);
     bool success = false;
     if (res == CURLE_OK) {
-        long responseCode;
+        long responseCode = 0;
         curl_easy_getinfo(curl, CURLINFO_RESPONSE_CODE, &responseCode);
 
         if (responseCode >= 400) {
@@ -156,8 +158,8 @@ HttpDownload::HttpDownload(std::string url)
     });
 
     _httpRequest.onProgress(
-        [this](int64_t downloadedBytes, std::optional<int64_t> totalBytes) {
-            bool cont = _onProgress ? _onProgress(downloadedBytes, totalBytes) : true;
+        [this](int64_t nDownloaded, std::optional<int64_t> nTotal) {
+            const bool cont =_onProgress ? _onProgress(nDownloaded, nTotal) : true;
             return cont && !_shouldCancel;
         }
     );
@@ -262,8 +264,8 @@ HttpFileDownload::HttpFileDownload(std::string url, std::filesystem::path destin
 
 bool HttpFileDownload::setup() {
     {
-        std::lock_guard g(_directoryCreationMutex);
-        std::filesystem::path d = _destination.parent_path();
+        const std::lock_guard g(_directoryCreationMutex);
+        const std::filesystem::path d = _destination.parent_path();
         if (!std::filesystem::is_directory(d)) {
             std::filesystem::create_directories(d);
         }
@@ -310,12 +312,13 @@ bool HttpFileDownload::setup() {
 #else // ^^^ WIN32 / !WIN32 vvv
     if (errno) {
 #ifdef __unix__
-        char buffer[256];
+        std::array<char, 256> buffer;
         LERRORC(
             "HttpFileDownload",
             fmt::format(
                 "Cannot open file '{}': {}",
-                _destination, std::string(strerror_r(errno, buffer, sizeof(buffer)))
+                _destination,
+                std::string(strerror_r(errno, buffer.data(), sizeof(buffer)))
             )
         );
         return false;
diff --git a/src/util/json_helper.cpp b/src/util/json_helper.cpp
index 8515ab0a04..644d294a11 100644
--- a/src/util/json_helper.cpp
+++ b/src/util/json_helper.cpp
@@ -91,8 +91,8 @@ void sortJson(nlohmann::json& json, const std::string& key) {
         json.begin(),
         json.end(),
         [&key](const nlohmann::json& lhs, const nlohmann::json& rhs) {
-            std::string lhsString = ghoul::toLowerCase(lhs[key]);
-            std::string rhsString = ghoul::toLowerCase(rhs[key]);
+            const std::string lhsString = ghoul::toLowerCase(lhs[key]);
+            const std::string rhsString = ghoul::toLowerCase(rhs[key]);
 
             return rhsString > lhsString;
         }
@@ -116,7 +116,7 @@ ghoul::Dictionary jsonToDictionary(const nlohmann::json& json) {
                 break;
             case nlohmann::json::value_t::object: {
                 ghoul::Dictionary subDict = jsonToDictionary(j);
-                dict.setValue(key, std::move(subDict));
+                dict.setValue(std::move(key), std::move(subDict));
                 break;
             }
             case nlohmann::json::value_t::array: {
@@ -128,19 +128,19 @@ ghoul::Dictionary jsonToDictionary(const nlohmann::json& json) {
                     // We add 1 to the key to make Lua happy :-/
                     addToDict(subDict, fmt::format("{}", i + 1), value);
                 }
-                dict.setValue(key, std::move(subDict));
+                dict.setValue(std::move(key), std::move(subDict));
                 break;
             }
             case nlohmann::json::value_t::string:
-                dict.setValue(key, j.get<std::string>());
+                dict.setValue(std::move(key), j.get<std::string>());
                 break;
             case nlohmann::json::value_t::boolean:
-                dict.setValue(key, j.get<bool>());
+                dict.setValue(std::move(key), j.get<bool>());
                 break;
             case nlohmann::json::value_t::number_integer:
             case nlohmann::json::value_t::number_unsigned:
             case nlohmann::json::value_t::number_float:
-                dict.setValue(key, j.get<double>());
+                dict.setValue(std::move(key), j.get<double>());
                 break;
             case nlohmann::json::value_t::binary:
                 throw ghoul::RuntimeError(
diff --git a/src/util/keys.cpp b/src/util/keys.cpp
index 1e97dcce4a..0d4fd26aca 100644
--- a/src/util/keys.cpp
+++ b/src/util/keys.cpp
@@ -34,7 +34,7 @@
 
 namespace openspace {
 
-KeyWithModifier stringToKey(std::string str) {
+KeyWithModifier stringToKey(const std::string& str) {
     std::vector<std::string> tokens = ghoul::tokenizeString(str, '+');
     // "Keypad +" will tokenize into "Keypad " + ""
     if (tokens.size() == 2 && tokens[0] == "Keypad " && tokens[1].empty()) {
@@ -49,7 +49,7 @@ KeyWithModifier stringToKey(std::string str) {
     // default is unknown
     Key key = Key::Unknown;
     std::string keyName = tokens.back();
-    std::string keyNameOriginal = originalTokens.back();
+    const std::string keyNameOriginal = originalTokens.back();
     for (const KeyInfo& ki : KeyInfos) {
         if (ki.identifier == keyName || ki.name == keyName ||
             ki.identifier == keyNameOriginal || ki.name == keyNameOriginal)
@@ -120,9 +120,9 @@ std::string keyToString(KeyWithModifier keyWithModifier) {
 namespace ghoul {
 
 template <>
-std::string to_string(const openspace::Key& key) {
+std::string to_string(const openspace::Key& value) {
     for (const openspace::KeyInfo& ki : openspace::KeyInfos) {
-        if (ki.key == key) {
+        if (ki.key == value) {
             return std::string(ki.name);
         }
     }
@@ -131,20 +131,20 @@ std::string to_string(const openspace::Key& key) {
 }
 
 template <>
-std::string to_string(const openspace::KeyModifier& mod) {
+std::string to_string(const openspace::KeyModifier& value) {
     using namespace openspace;
 
-    if (mod == KeyModifier::None) {
+    if (value == KeyModifier::None) {
         return "";
     }
 
     std::string result;
-    for (const openspace::KeyModifierInfo& kmi : openspace::KeyModifierInfos) {
+    for (const KeyModifierInfo& kmi : KeyModifierInfos) {
         // No need for an extra check for the empty modifier since that is mapped to 0,
         // meaning that the `hasKeyModifier` will always fail for it since it checks
         // internally against != 0
 
-        if (hasKeyModifier(mod, kmi.modifier)) {
+        if (hasKeyModifier(value, kmi.modifier)) {
             result += fmt::format("{}+", kmi.name);
         }
 
@@ -156,12 +156,12 @@ std::string to_string(const openspace::KeyModifier& mod) {
 }
 
 template <>
-std::string to_string(const openspace::KeyWithModifier& key) {
-    if (key.modifier == openspace::KeyModifier::None) {
-        return to_string(key.key);
+std::string to_string(const openspace::KeyWithModifier& value) {
+    if (value.modifier == openspace::KeyModifier::None) {
+        return to_string(value.key);
     }
     else {
-        return fmt::format("{}+{}", to_string(key.modifier), to_string(key.key));
+        return fmt::format("{}+{}", to_string(value.modifier), to_string(value.key));
     }
 }
 
diff --git a/src/util/openspacemodule.cpp b/src/util/openspacemodule.cpp
index abb03cec72..46f748fb8d 100644
--- a/src/util/openspacemodule.cpp
+++ b/src/util/openspacemodule.cpp
@@ -50,14 +50,14 @@ void OpenSpaceModule::initialize(const ghoul::Dictionary& configuration) {
     ZoneScoped;
     ZoneName(identifier().c_str(), identifier().size());
 
-    std::string upperIdentifier = ghoul::toUpperCase(identifier());
+    const std::string upperIdentifier = ghoul::toUpperCase(identifier());
 
     std::string moduleToken = "${" + std::string(ModuleBaseToken) + upperIdentifier + "}";
 
     std::filesystem::path path = modulePath();
     if (!path.empty()) {
         LDEBUG(fmt::format("Registering module path '{}' -> {}", moduleToken, path));
-        FileSys.registerPathToken(moduleToken, std::move(path));
+        FileSys.registerPathToken(std::move(moduleToken), std::move(path));
     }
 
     internalInitialize(configuration);
@@ -105,10 +105,10 @@ std::vector<std::string> OpenSpaceModule::requiredOpenGLExtensions() const {
 }
 
 std::filesystem::path OpenSpaceModule::modulePath() const {
-    std::string moduleIdentifier = ghoul::toLowerCase(identifier());
+    const std::string moduleIdentifier = ghoul::toLowerCase(identifier());
 
     // First try the internal module directory
-    std::filesystem::path path = absPath("${MODULES}/" + moduleIdentifier);
+    const std::filesystem::path path = absPath("${MODULES}/" + moduleIdentifier);
     return std::filesystem::is_directory(path) ? path : "";
 }
 
diff --git a/src/util/planegeometry.cpp b/src/util/planegeometry.cpp
index fa139d54be..5212c7bbe3 100644
--- a/src/util/planegeometry.cpp
+++ b/src/util/planegeometry.cpp
@@ -53,7 +53,7 @@ void PlaneGeometry::deinitialize() {
     _vBufferId = 0;
 }
 
-void PlaneGeometry::render() {
+void PlaneGeometry::render() const {
     glBindVertexArray(_vaoId);
     glDrawArrays(GL_TRIANGLES, 0, 6);
     glBindVertexArray(0);
@@ -77,18 +77,18 @@ void PlaneGeometry::updateGeometry() {
         GLfloat t;
     };
 
-    VertexData vertices[] = {
-        { -size.x, -size.y, 0.f, 0.f },
-        {  size.x,  size.y, 1.f, 1.f },
-        { -size.x,  size.y, 0.f, 1.f },
-        { -size.x, -size.y, 0.f, 0.f },
-        {  size.x, -size.y, 1.f, 0.f },
-        {  size.x,  size.y, 1.f, 1.f }
+    const std::array<VertexData, 6> vertices = {
+        VertexData{ -size.x, -size.y, 0.f, 0.f },
+        VertexData{  size.x,  size.y, 1.f, 1.f },
+        VertexData{ -size.x,  size.y, 0.f, 1.f },
+        VertexData{ -size.x, -size.y, 0.f, 0.f },
+        VertexData{  size.x, -size.y, 1.f, 0.f },
+        VertexData{  size.x,  size.y, 1.f, 1.f }
     };
 
     glBindVertexArray(_vaoId);
     glBindBuffer(GL_ARRAY_BUFFER, _vBufferId);
-    glBufferData(GL_ARRAY_BUFFER, sizeof(vertices), &vertices, GL_STATIC_DRAW);
+    glBufferData(GL_ARRAY_BUFFER, sizeof(vertices), vertices.data(), GL_STATIC_DRAW);
     glEnableVertexAttribArray(0);
     glVertexAttribPointer(0, 2, GL_FLOAT, GL_FALSE, sizeof(VertexData), nullptr);
     glEnableVertexAttribArray(1);
diff --git a/src/util/progressbar.cpp b/src/util/progressbar.cpp
index eb8c84f639..b078b9f957 100644
--- a/src/util/progressbar.cpp
+++ b/src/util/progressbar.cpp
@@ -42,7 +42,7 @@ ProgressBar::~ProgressBar() {
 
 void ProgressBar::print(int current) {
     const float progress = static_cast<float>(current) / static_cast<float>(_end);
-    const int iprogress = static_cast<int>(progress * 100.0f);
+    const int iprogress = static_cast<int>(progress * 100.f);
     if (iprogress != _previous) {
         const int pos = static_cast<int>(static_cast<float>(_width)* progress);
         const int eqWidth = pos + 1;
diff --git a/src/util/screenlog.cpp b/src/util/screenlog.cpp
index a5a24aff49..ba70dba597 100644
--- a/src/util/screenlog.cpp
+++ b/src/util/screenlog.cpp
@@ -29,14 +29,14 @@
 namespace openspace {
 
 ScreenLog::ScreenLog(std::chrono::seconds timeToLive, LogLevel logLevel)
-    : _timeToLive(std::move(timeToLive))
+    : _timeToLive(timeToLive)
     , _logLevel(logLevel)
 {
     _entries.reserve(64);
 }
 
 void ScreenLog::removeExpiredEntries() {
-    std::lock_guard guard(_mutex);
+    const std::lock_guard guard(_mutex);
     const auto t = std::chrono::steady_clock::now();
 
     const auto rit = std::remove_if(
@@ -49,7 +49,7 @@ void ScreenLog::removeExpiredEntries() {
 }
 
 void ScreenLog::log(LogLevel level, std::string_view category, std::string_view message) {
-    std::lock_guard guard(_mutex);
+    const std::lock_guard guard(_mutex);
     if (level >= _logLevel) {
         _entries.push_back({
             level,
diff --git a/src/util/sphere.cpp b/src/util/sphere.cpp
index 8e717ed325..224708684f 100644
--- a/src/util/sphere.cpp
+++ b/src/util/sphere.cpp
@@ -61,9 +61,10 @@ Sphere::Sphere(glm::vec3 radius, int segments)
             // Spherical coordinates based on ISO standard.
             // https://en.wikipedia.org/wiki/Spherical_coordinate_system
 
-            const float x = radius[0] * sin(theta) * cos(phi);
-            const float y = radius[1] * sin(theta) * sin(phi);
-            const float z = radius[2] * cos(theta); // Z points towards pole (theta = 0)
+            // Z points towards pole (theta = 0)
+            const float x = radius[0] * std::sin(theta) * std::cos(phi);
+            const float y = radius[1] * std::sin(theta) * std::sin(phi);
+            const float z = radius[2] * std::cos(theta);
 
             _varray[nr].location[0] = x;
             _varray[nr].location[1] = y;
@@ -71,7 +72,7 @@ Sphere::Sphere(glm::vec3 radius, int segments)
             _varray[nr].location[3] = 0.0;
 
             glm::vec3 normal = glm::vec3(x, y, z);
-            if (!(x == 0.f && y == 0.f && z == 0.f)) {
+            if (x != 0.f || y != 0.f || z != 0.f) {
                 normal = glm::vec3(glm::normalize(glm::dvec3(normal)));
             }
 
@@ -197,8 +198,8 @@ bool Sphere::initialize() {
     return true;
 }
 
-void Sphere::render() {
-    glBindVertexArray(_vaoID);  // select first VAO
+void Sphere::render() const {
+    glBindVertexArray(_vaoID);
     glBindBuffer(GL_ELEMENT_ARRAY_BUFFER, _iBufferID);
     glDrawElements(GL_TRIANGLES, _isize, GL_UNSIGNED_INT, nullptr);
     glBindVertexArray(0);
diff --git a/src/util/spicemanager.cpp b/src/util/spicemanager.cpp
index 2d5b4de9d1..0882c63a9e 100644
--- a/src/util/spicemanager.cpp
+++ b/src/util/spicemanager.cpp
@@ -150,10 +150,19 @@ SpiceManager::TerminatorType SpiceManager::terminatorTypeFromString(
 }
 
 SpiceManager::SpiceManager() {
+    // The third parameter for the erract_c function is a SpiceChar*, not ConstSpiceChar*
+    // so we have to do this weird memory copying trick
+    std::array<char, 7> buffer;
+
     // Set the SPICE library to not exit the program if an error occurs
-    erract_c("SET", 0, const_cast<char*>("REPORT"));
+    std::memset(buffer.data(), 0, buffer.size());
+    std::strcpy(buffer.data(), "REPORT");
+    erract_c("SET", 0, buffer.data());
+
     // But we do not want SPICE to print the errors, we will fetch them ourselves
-    errprt_c("SET", 0, const_cast<char*>("NONE"));
+    std::memset(buffer.data(), 0, buffer.size());
+    std::strcpy(buffer.data(), "NONE");
+    errprt_c("SET", 0, buffer.data());
 
     loadLeapSecondsSpiceKernel();
 }
@@ -193,8 +202,9 @@ SpiceManager& SpiceManager::ref() {
 // If an error occurred, true is returned, otherwise, false
 void throwSpiceError(const std::string& errorMessage) {
     if (openspace::SpiceManager::ref().exceptionHandling()) {
-        char buffer[SpiceErrorBufferSize];
-        getmsg_c("LONG", SpiceErrorBufferSize, buffer);
+        std::string buffer;
+        buffer.resize(SpiceErrorBufferSize);
+        getmsg_c("LONG", SpiceErrorBufferSize, buffer.data());
         reset_c();
         throw openspace::SpiceManager::SpiceException(errorMessage + ": " + buffer);
     }
@@ -217,7 +227,7 @@ SpiceManager::KernelHandle SpiceManager::loadKernel(std::string filePath) {
         )
     );
 
-    std::filesystem::path path = absPath(std::move(filePath));
+    const std::filesystem::path path = absPath(std::move(filePath));
     const auto it = std::find_if(
         _loadedKernels.begin(),
         _loadedKernels.end(),
@@ -232,9 +242,9 @@ SpiceManager::KernelHandle SpiceManager::loadKernel(std::string filePath) {
     // We need to set the current directory as meta-kernels are usually defined relative
     // to the directory they reside in. The directory change is not necessary for regular
     // kernels
-    std::filesystem::path currentDirectory = std::filesystem::current_path();
+    const std::filesystem::path currentDirectory = std::filesystem::current_path();
 
-    std::filesystem::path p = path.parent_path();
+    const std::filesystem::path p = path.parent_path();
     std::filesystem::current_path(p);
 
     LINFO(fmt::format("Loading SPICE kernel '{}'", path));
@@ -248,7 +258,7 @@ SpiceManager::KernelHandle SpiceManager::loadKernel(std::string filePath) {
         throwSpiceError("Kernel loading");
     }
 
-    std::filesystem::path fileExtension = path.extension();
+    const std::filesystem::path fileExtension = path.extension();
     if (fileExtension == ".bc" || fileExtension == ".BC") {
         findCkCoverage(path.string()); // binary ck kernel
     }
@@ -256,7 +266,7 @@ SpiceManager::KernelHandle SpiceManager::loadKernel(std::string filePath) {
         findSpkCoverage(path.string()); // binary spk kernel
     }
 
-    KernelHandle kernelId = ++_lastAssignedKernel;
+    const KernelHandle kernelId = ++_lastAssignedKernel;
     ghoul_assert(kernelId != 0, "Kernel Handle wrapped around to 0");
     _loadedKernels.push_back({ path.string(), kernelId, 1 });
     return kernelId;
@@ -291,7 +301,7 @@ void SpiceManager::unloadKernel(KernelHandle kernelId) {
 void SpiceManager::unloadKernel(std::string filePath) {
     ghoul_assert(!filePath.empty(), "Empty filename");
 
-    std::filesystem::path path = absPath(std::move(filePath));
+    const std::filesystem::path path = absPath(std::move(filePath));
 
     const auto it = std::find_if(
         _loadedKernels.begin(),
@@ -415,8 +425,7 @@ std::vector<std::pair<int, std::string>> SpiceManager::spiceBodies(
 {
     std::vector<std::pair<int, std::string>> bodies;
 
-    constexpr int Frnmln = 33;
-    static SpiceInt idsetBuffer[SPICE_CELL_CTRLSZ + 8192];
+    static std::array<SpiceInt, SPICE_CELL_CTRLSZ + 8192> idsetBuffer;
     static SpiceCell idset = {
         SPICE_INT,
         0,
@@ -425,11 +434,12 @@ std::vector<std::pair<int, std::string>> SpiceManager::spiceBodies(
         SPICETRUE,
         SPICEFALSE,
         SPICEFALSE,
-        &idsetBuffer,
-        &(idsetBuffer[SPICE_CELL_CTRLSZ])
+        idsetBuffer.data(),
+        idsetBuffer.data() + SPICE_CELL_CTRLSZ
     };
 
-    SpiceChar frname[Frnmln];
+    constexpr int Frnmln = 33;
+    std::array<SpiceChar, Frnmln> frname;
 
     for (SpiceInt i = 1; i <= 6; i++) {
         if (i < 6) {
@@ -453,13 +463,11 @@ std::vector<std::pair<int, std::string>> SpiceManager::spiceBodies(
             frmnam_c(
                 (reinterpret_cast<SpiceInt*>(idset.data))[j],
                 Frnmln,
-                frname
+                frname.data()
             );
-            bodies.push_back(
-                std::make_pair(
-                    static_cast<long>(reinterpret_cast<SpiceInt*>(idset.data)[j]),
-                    frname
-                )
+            bodies.emplace_back(
+                static_cast<long>(reinterpret_cast<SpiceInt*>(idset.data)[j]),
+                frname.data()
             );
         }
     }
@@ -474,15 +482,15 @@ bool SpiceManager::hasValue(const std::string& body, const std::string& item) co
     ghoul_assert(!body.empty(), "Empty body");
     ghoul_assert(!item.empty(), "Empty item");
 
-    int id = naifId(body);
+    const int id = naifId(body);
     return hasValue(id, item);
 }
 
 int SpiceManager::naifId(const std::string& body) const {
     ghoul_assert(!body.empty(), "Empty body");
 
-    SpiceBoolean success;
-    SpiceInt id;
+    SpiceBoolean success = SPICEFALSE;
+    SpiceInt id = 0;
     bods2c_c(body.c_str(), &id, &success);
     if (!success && _useExceptions) {
         throw SpiceException(fmt::format("Could not find NAIF ID of body '{}'", body));
@@ -493,8 +501,8 @@ int SpiceManager::naifId(const std::string& body) const {
 bool SpiceManager::hasNaifId(const std::string& body) const {
     ghoul_assert(!body.empty(), "Empty body");
 
-    SpiceBoolean success;
-    SpiceInt id;
+    SpiceBoolean success = SPICEFALSE;
+    SpiceInt id = 0;
     bods2c_c(body.c_str(), &id, &success);
     reset_c();
     return success;
@@ -503,7 +511,7 @@ bool SpiceManager::hasNaifId(const std::string& body) const {
 int SpiceManager::frameId(const std::string& frame) const {
     ghoul_assert(!frame.empty(), "Empty frame");
 
-    SpiceInt id;
+    SpiceInt id = 0;
     namfrm_c(frame.c_str(), &id);
     if (id == 0 && _useExceptions) {
         throw SpiceException(fmt::format("Could not find NAIF ID of frame '{}'", frame));
@@ -514,7 +522,7 @@ int SpiceManager::frameId(const std::string& frame) const {
 bool SpiceManager::hasFrameId(const std::string& frame) const {
     ghoul_assert(!frame.empty(), "Empty frame");
 
-    SpiceInt id;
+    SpiceInt id = 0;
     namfrm_c(frame.c_str(), &id);
     return id != 0;
 }
@@ -526,7 +534,7 @@ void getValueInternal(const std::string& body, const std::string& value, int siz
     ghoul_assert(!value.empty(), "Empty value");
     ghoul_assert(v != nullptr, "Empty value pointer");
 
-    SpiceInt n;
+    SpiceInt n = 0;
     bodvrd_c(body.c_str(), value.c_str(), size, &n, v);
 
     if (failed_c()) {
@@ -568,11 +576,13 @@ void SpiceManager::getValue(const std::string& body, const std::string& value,
     getValueInternal(body, value, static_cast<int>(v.size()), v.data());
 }
 
-double SpiceManager::spacecraftClockToET(const std::string& craft, double craftTicks) {
+double SpiceManager::spacecraftClockToET(const std::string& craft,
+                                         double craftTicks) const
+{
     ghoul_assert(!craft.empty(), "Empty craft");
 
-    int craftId = naifId(craft);
-    double et;
+    const int craftId = naifId(craft);
+    double et = 0.0;
     sct2e_c(craftId, craftTicks, &et);
     if (failed_c()) {
         throwSpiceError(fmt::format(
@@ -589,7 +599,7 @@ double SpiceManager::ephemerisTimeFromDate(const std::string& timeString) const
 }
 
 double SpiceManager::ephemerisTimeFromDate(const char* timeString) const {
-    double et;
+    double et = 0.0;
     str2et_c(timeString, &et);
     if (failed_c()) {
         throwSpiceError(fmt::format("Error converting date '{}'", timeString));
@@ -600,10 +610,10 @@ double SpiceManager::ephemerisTimeFromDate(const char* timeString) const {
 std::string SpiceManager::dateFromEphemerisTime(double ephemerisTime, const char* format)
 {
     constexpr int BufferSize = 128;
-    char Buffer[BufferSize];
-    std::memset(Buffer, char(0), BufferSize);
+    std::array<char, BufferSize> Buffer;
+    std::memset(Buffer.data(), char(0), BufferSize);
 
-    timout_c(ephemerisTime, format, BufferSize, Buffer);
+    timout_c(ephemerisTime, format, BufferSize, Buffer.data());
     if (failed_c()) {
         throwSpiceError(fmt::format(
             "Error converting ephemeris time '{}' to date with format '{}'",
@@ -613,11 +623,11 @@ std::string SpiceManager::dateFromEphemerisTime(double ephemerisTime, const char
     if (Buffer[0] == '*') {
         // The conversion failed and we need to use et2utc
         constexpr int SecondsPrecision = 3;
-        et2utc_c(ephemerisTime, "C", SecondsPrecision, BufferSize, Buffer);
+        et2utc_c(ephemerisTime, "C", SecondsPrecision, BufferSize, Buffer.data());
     }
 
 
-    return std::string(Buffer);
+    return std::string(Buffer.data());
 }
 
 glm::dvec3 SpiceManager::targetPosition(const std::string& target,
@@ -630,8 +640,8 @@ glm::dvec3 SpiceManager::targetPosition(const std::string& target,
     ghoul_assert(!observer.empty(), "Observer is not empty");
     ghoul_assert(!referenceFrame.empty(), "Reference frame is not empty");
 
-    bool targetHasCoverage = hasSpkCoverage(target, ephemerisTime);
-    bool observerHasCoverage = hasSpkCoverage(observer, ephemerisTime);
+    const bool targetHasCoverage = hasSpkCoverage(target, ephemerisTime);
+    const bool observerHasCoverage = hasSpkCoverage(observer, ephemerisTime);
     if (!targetHasCoverage && !observerHasCoverage) {
         if (_useExceptions) {
             throw SpiceException(
@@ -665,10 +675,12 @@ glm::dvec3 SpiceManager::targetPosition(const std::string& target,
         return position;
     }
     else if (targetHasCoverage) {
-        // observer has no coverage
+        // observer has no coverage, so we try getting position from the reverse
+        const std::string& invObserver = target;
+        const std::string& invTarget = observer;
         return getEstimatedPosition(
-            observer,
-            target,
+            invTarget,
+            invObserver,
             referenceFrame,
             aberrationCorrection,
             ephemerisTime,
@@ -754,7 +766,7 @@ SpiceManager::SurfaceInterceptResult SpiceManager::surfaceIntercept(
 
     SurfaceInterceptResult result;
 
-    SpiceBoolean found;
+    SpiceBoolean found = SPICEFALSE;
     sincpt_c(ComputationMethod.c_str(),
         target.c_str(),
         ephemerisTime,
@@ -795,8 +807,9 @@ bool SpiceManager::isTargetInFieldOfView(const std::string& target,
     ghoul_assert(!referenceFrame.empty(), "Reference frame must not be empty");
     ghoul_assert(!instrument.empty(), "Instrument must not be empty");
 
-    int visible;
-    fovtrg_c(instrument.c_str(),
+    int visible = 0;
+    fovtrg_c(
+        instrument.c_str(),
         target.c_str(),
         toString(method),
         referenceFrame.c_str(),
@@ -897,7 +910,7 @@ glm::dmat3 SpiceManager::positionTransformMatrix(const std::string& sourceFrame,
     if (failed_c()) {
         throwSpiceError("");
     }
-    SpiceBoolean success = !(failed_c());
+    const SpiceBoolean success = !(failed_c());
     reset_c();
     if (!success) {
         result = getEstimatedTransformMatrix(
@@ -950,7 +963,7 @@ SpiceManager::FieldOfViewResult SpiceManager::fieldOfView(int instrument) const
 
     FieldOfViewResult res;
 
-    SpiceInt nrReturned;
+    SpiceInt nrReturned = 0;
     double boundsArr[MaxBoundsSize][3];
     char fovShapeBuffer[BufferSize];
     char frameNameBuffer[BufferSize];
@@ -977,7 +990,7 @@ SpiceManager::FieldOfViewResult SpiceManager::fieldOfView(int instrument) const
         res.bounds.emplace_back(boundsArr[i][0], boundsArr[i][1], boundsArr[i][2]);
     }
 
-    std::string shape = std::string(fovShapeBuffer);
+    const std::string shape = std::string(fovShapeBuffer);
     static const std::map<std::string, FieldOfViewResult::Shape> Map = {
         { "POLYGON", FieldOfViewResult::Shape::Polygon },
         { "RECTANGLE" , FieldOfViewResult::Shape::Rectangle },
@@ -1080,7 +1093,8 @@ void SpiceManager::findCkCoverage(const std::string& path) {
 
         for (SpiceInt j = 0; j < numberOfIntervals; j++) {
             // Get the endpoints of the jth interval.
-            SpiceDouble b, e;
+            SpiceDouble b = 0.0;
+            SpiceDouble e = 0.0;
             wnfetd_c(&cover, j, &b, &e);
             if (failed_c()) {
                 throwSpiceError("Error finding Ck Coverage");
@@ -1139,7 +1153,8 @@ void SpiceManager::findSpkCoverage(const std::string& path) {
 
         for (SpiceInt j = 0; j < numberOfIntervals; j++) {
             //Get the endpoints of the jth interval.
-            SpiceDouble b, e;
+            SpiceDouble b = 0.0;
+            SpiceDouble e = 0.0;
             wnfetd_c(&cover, j, &b, &e);
             if (failed_c()) {
                 throwSpiceError("Error finding Spk coverage");
@@ -1167,7 +1182,7 @@ glm::dvec3 SpiceManager::getEstimatedPosition(const std::string& target,
     ghoul_assert(!referenceFrame.empty(), "Reference frame must not be empty");
     ghoul_assert(target != observer, "Target and observer must be different");
 
-    int targetId = naifId(target);
+    const int targetId = naifId(target);
 
     if (targetId == 0) {
         // SOLAR SYSTEM BARYCENTER special case, no definition in kernels
@@ -1227,8 +1242,8 @@ glm::dvec3 SpiceManager::getEstimatedPosition(const std::string& target,
     else {
         // coverage both earlier and later, interpolate these positions
         glm::dvec3 posEarlier = glm::dvec3(0.0);
-        double ltEarlier;
-        double timeEarlier = *std::prev((coveredTimes.lower_bound(ephemerisTime)));
+        double ltEarlier = 0.0;
+        const double timeEarlier = *std::prev((coveredTimes.lower_bound(ephemerisTime)));
         spkpos_c(
             target.c_str(),
             timeEarlier,
@@ -1240,8 +1255,8 @@ glm::dvec3 SpiceManager::getEstimatedPosition(const std::string& target,
         );
 
         glm::dvec3 posLater = glm::dvec3(0.0);
-        double ltLater;
-        double timeLater = *(coveredTimes.upper_bound(ephemerisTime));
+        double ltLater = 0.0;
+        const double timeLater = *(coveredTimes.upper_bound(ephemerisTime));
         spkpos_c(
             target.c_str(),
             timeLater,
@@ -1322,8 +1337,8 @@ glm::dmat3 SpiceManager::getEstimatedTransformMatrix(const std::string& fromFram
     }
     else {
         // coverage both earlier and later, interpolate these transformations
-        double earlier = *std::prev((coveredTimes.lower_bound(time)));
-        double later = *(coveredTimes.upper_bound(time));
+        const double earlier = *std::prev((coveredTimes.lower_bound(time)));
+        const double later = *(coveredTimes.upper_bound(time));
 
         glm::dmat3 earlierTransform = glm::dmat3(1.0);
         pxform_c(
@@ -1515,8 +1530,8 @@ DELTET/DELTA_AT        = ( 10,   @1972-JAN-1
 
 
 )";
-    std::filesystem::path path = std::filesystem::temp_directory_path();
-    std::filesystem::path file = path / "naif0012.tls";
+const std::filesystem::path path = std::filesystem::temp_directory_path();
+    const std::filesystem::path file = path / "naif0012.tls";
     {
         std::ofstream f(file);
         f << Naif00012tlsSource;
diff --git a/src/util/syncbuffer.cpp b/src/util/syncbuffer.cpp
index bef545df42..7fc24d91e4 100644
--- a/src/util/syncbuffer.cpp
+++ b/src/util/syncbuffer.cpp
@@ -34,12 +34,10 @@ SyncBuffer::SyncBuffer(size_t n)
     _dataStream.resize(_n);
 }
 
-SyncBuffer::~SyncBuffer() {}
-
 void SyncBuffer::encode(const std::string& s) {
     ZoneScoped;
 
-    int32_t anticpatedBufferSize = static_cast<int32_t>(
+    const int32_t anticpatedBufferSize = static_cast<int32_t>(
         _encodeOffset + (sizeof(char) * s.size()) + sizeof(int32_t)
     );
     if (anticpatedBufferSize >= static_cast<int32_t>(_n)) {
@@ -60,8 +58,8 @@ void SyncBuffer::encode(const std::string& s) {
 std::string SyncBuffer::decode() {
     ZoneScoped;
 
-    int32_t length;
-    memcpy(
+    int32_t length = 0;
+    std::memcpy(
         reinterpret_cast<char*>(&length),
         _dataStream.data() + _decodeOffset,
         sizeof(int32_t)
diff --git a/src/util/taskloader.cpp b/src/util/taskloader.cpp
index 050f5b498e..a6c25bb224 100644
--- a/src/util/taskloader.cpp
+++ b/src/util/taskloader.cpp
@@ -42,19 +42,19 @@ namespace {
 namespace openspace {
 
 std::vector<std::unique_ptr<Task>> TaskLoader::tasksFromDictionary(
-                                                 const ghoul::Dictionary& tasksDictionary)
+                                                      const ghoul::Dictionary& dictionary)
 {
     std::vector<std::unique_ptr<Task>> tasks;
 
-    for (std::string_view key : tasksDictionary.keys()) {
-        if (tasksDictionary.hasValue<std::string>(key)) {
-            std::string taskName = tasksDictionary.value<std::string>(key);
+    for (const std::string_view key : dictionary.keys()) {
+        if (dictionary.hasValue<std::string>(key)) {
+            const std::string taskName = dictionary.value<std::string>(key);
             const std::string path = taskName + ".task";
             std::vector<std::unique_ptr<Task>> subTasks = tasksFromFile(path);
             std::move(subTasks.begin(), subTasks.end(), std::back_inserter(tasks));
         }
-        else if (tasksDictionary.hasValue<ghoul::Dictionary>(key)) {
-            ghoul::Dictionary subTask = tasksDictionary.value<ghoul::Dictionary>(key);
+        else if (dictionary.hasValue<ghoul::Dictionary>(key)) {
+            const ghoul::Dictionary subTask = dictionary.value<ghoul::Dictionary>(key);
             const std::string& taskType = subTask.value<std::string>("Type");
             std::unique_ptr<Task> task = Task::createFromDictionary(subTask);
             if (!task) {
diff --git a/src/util/threadpool.cpp b/src/util/threadpool.cpp
index dbcee5d3e2..3b426c1422 100644
--- a/src/util/threadpool.cpp
+++ b/src/util/threadpool.cpp
@@ -31,9 +31,8 @@ Worker::Worker(ThreadPool& p) : pool(p) {}
 void Worker::operator()() {
     std::function<void()> task;
     while (true) {
-        // acquire lock
         {
-            std::unique_lock<std::mutex> lock(pool.queue_mutex);
+            std::unique_lock lock(pool.queue_mutex);
 
             // look for a work item
             while (!pool.stop && pool.tasks.empty()) {
@@ -48,8 +47,7 @@ void Worker::operator()() {
             // get the task from the queue
             task = pool.tasks.front();
             pool.tasks.pop_front();
-
-        } // release lock
+        }
 
         // execute the task
         task();
@@ -58,7 +56,7 @@ void Worker::operator()() {
 
 ThreadPool::ThreadPool(size_t numThreads) : stop(false) {
     for (size_t i = 0; i < numThreads; i++) {
-        workers.emplace_back(std::thread(Worker(*this)));
+        workers.emplace_back(Worker(*this));
     }
 }
 
@@ -68,7 +66,7 @@ ThreadPool::ThreadPool(const ThreadPool& toCopy) : ThreadPool(toCopy.workers.siz
 ThreadPool::~ThreadPool() {
     // stop all threads
     {
-        std::unique_lock<std::mutex> lock(queue_mutex);
+        const std::unique_lock lock(queue_mutex);
         stop = true;
     }
     condition.notify_all();
@@ -81,22 +79,20 @@ ThreadPool::~ThreadPool() {
 
 // add new work item to the pool
 void ThreadPool::enqueue(std::function<void()> f) {
-    { // acquire lock
-        std::unique_lock<std::mutex> lock(queue_mutex);
+    {
+        const std::unique_lock lock(queue_mutex);
 
         // add the task
         tasks.push_back(std::move(f));
-    } // release lock
+    }
 
     // wake up one thread
     condition.notify_one();
 }
 
 void ThreadPool::clearTasks() {
-    { // acquire lock
-        std::unique_lock<std::mutex> lock(queue_mutex);
-        tasks.clear();
-    } // release lock
+    const std::unique_lock lock(queue_mutex);
+    tasks.clear();
 }
 
 bool ThreadPool::hasOutstandingTasks() const {
diff --git a/src/util/time.cpp b/src/util/time.cpp
index d5b682939f..452d5bf0a1 100644
--- a/src/util/time.cpp
+++ b/src/util/time.cpp
@@ -61,10 +61,9 @@ double Time::convertTime(const char* time) {
 }
 
 std::string Time::currentWallTime() {
-    std::time_t t = std::time(nullptr);
+    const std::time_t t = std::time(nullptr);
     std::tm* utcTime = std::gmtime(&t);
-
-    std::string time = fmt::format(
+    const std::string time = fmt::format(
         "{:04d}-{:02d}-{:02d}T{:02d}:{:02d}:{:02d}",
         utcTime->tm_year + 1900, utcTime->tm_mon + 1, utcTime->tm_mday,
         utcTime->tm_hour, utcTime->tm_min, utcTime->tm_sec
@@ -79,20 +78,19 @@ Time::Time(const std::string& time) :
 {}
 
 Time Time::now() {
-    Time now;
-    time_t secondsSince1970;
-    secondsSince1970 = time(nullptr);
+    const time_t secondsSince1970 = time(nullptr);
 
     const time_t secondsInAYear = static_cast<time_t>(365.25 * 24 * 60 * 60);
     const double secondsSince2000 = static_cast<double>(
         secondsSince1970 - 30 * secondsInAYear
     );
+    Time now;
     now.setTime(secondsSince2000);
     return now;
 }
 
-void Time::setTime(double value) {
-    _time = value;
+void Time::setTime(double j2000Seconds) {
+    _time = j2000Seconds;
 }
 
 double Time::j2000Seconds() const {
@@ -144,8 +142,8 @@ void Time::ISO8601(char* buffer) const {
     SpiceManager::ref().dateFromEphemerisTime(_time, buffer, S, Format);
 }
 
-std::string Time::advancedTime(std::string base, std::string change) {
-    double j2000Seconds = Time::convertTime(base);
+std::string Time::advancedTime(const std::string& base, std::string change) {
+    const double j2000Seconds = Time::convertTime(base);
 
     double dt = 0.0;
     if (change.empty()) {
@@ -168,8 +166,8 @@ std::string Time::advancedTime(std::string base, std::string change) {
     );
 
     try {
-        double value = std::stod(std::string(change.begin(), it));
-        std::string uName = std::string(it, change.end());
+        const double value = std::stod(std::string(change.begin(), it));
+        const std::string_view uName = std::string_view(it, change.end());
 
         TimeUnit unit = TimeUnit::Second;
         if (uName == "s") { unit = TimeUnit::Second; }
@@ -193,7 +191,7 @@ std::string Time::advancedTime(std::string base, std::string change) {
         ));
     }
 
-    std::string_view ret = Time(j2000Seconds + dt).ISO8601();
+    const std::string_view ret = Time(j2000Seconds + dt).ISO8601();
     return std::string(ret);
 }
 
diff --git a/src/util/timeconversion.cpp b/src/util/timeconversion.cpp
index cea0ebc87d..63e0178662 100644
--- a/src/util/timeconversion.cpp
+++ b/src/util/timeconversion.cpp
@@ -78,9 +78,8 @@ namespace {
 namespace openspace {
 
 std::pair<double, std::string_view> simplifyTime(double seconds, bool forceSingularForm) {
-    std::pair<double, TimeUnit> p = extractUnit(seconds);
-
-    bool pluralForm = (p.first != 1.0 && !forceSingularForm);
+    const std::pair<double, TimeUnit> p = extractUnit(seconds);
+    const bool pluralForm = (p.first != 1.0 && !forceSingularForm);
     return { p.first, nameForTimeUnit(p.second, pluralForm) };
 }
 
@@ -92,21 +91,21 @@ std::vector<std::pair<double, std::string_view>> splitTime(double seconds,
     double secondsVal = std::abs(seconds);
 
     do {
-        std::pair<double, TimeUnit> p = extractUnit(secondsVal);
+        const std::pair<double, TimeUnit> p = extractUnit(secondsVal);
 
         if (p.second == TimeUnit::Nanosecond) {
             // We have reached the lowest supported time unit
 
-            bool pluralForm = (p.first != 1.0 && !forceSingularForm);
-            res.push_back({ p.first, nameForTimeUnit(p.second, pluralForm) });
+            const bool pluralForm = (p.first != 1.0 && !forceSingularForm);
+            res.emplace_back(p.first, nameForTimeUnit(p.second, pluralForm));
             break;
         }
 
-        double pt = std::floor(p.first);
+        const double pt = std::floor(p.first);
 
         // Add the unit the list
-        bool pluralForm = (p.first != 1.0 && !forceSingularForm);
-        res.push_back({ pt, nameForTimeUnit(p.second, pluralForm) });
+        const bool pluralForm = (p.first != 1.0 && !forceSingularForm);
+        res.emplace_back(pt, nameForTimeUnit(p.second, pluralForm));
 
         // Adjust the remaining time
         secondsVal -= convertTime(pt, p.second, TimeUnit::Second);
diff --git a/src/util/timeline.cpp b/src/util/timeline.cpp
index 8d9e3e2a49..4abd3d112f 100644
--- a/src/util/timeline.cpp
+++ b/src/util/timeline.cpp
@@ -26,6 +26,11 @@
 
 namespace openspace {
 
+KeyframeBase::KeyframeBase(size_t id_, double timestamp_)
+    : id(id_)
+    , timestamp(timestamp_)
+{}
+
 bool compareKeyframeTimes(const KeyframeBase& a, const KeyframeBase& b) {
     return a.timestamp < b.timestamp;
 }
diff --git a/src/util/timemanager.cpp b/src/util/timemanager.cpp
index a562264289..473c2a9356 100644
--- a/src/util/timemanager.cpp
+++ b/src/util/timemanager.cpp
@@ -81,8 +81,6 @@ namespace {
 
 namespace openspace {
 
-using datamessagestructures::TimeKeyframe;
-
 TimeManager::TimeManager()
     : properties::PropertyOwner({ "TimeManager", "Time Manager" })
     , _defaultTimeInterpolationDuration(DefaultTimeInterpolationDurationInfo,
@@ -118,7 +116,7 @@ TimeManager::TimeManager()
 void TimeManager::interpolateTime(double targetTime, double durationSeconds) {
     ghoul_precondition(durationSeconds > 0.f, "durationSeconds must be positive");
 
-    OpenSpaceEngine::Mode m = global::openSpaceEngine->currentMode();
+    const OpenSpaceEngine::Mode m = global::openSpaceEngine->currentMode();
     if (m == OpenSpaceEngine::Mode::CameraPath) {
         LERROR("Cannot change simulation time during camera path");
         return;
@@ -240,7 +238,7 @@ TimeKeyframeData TimeManager::interpolate(double applicationTime) {
     else if (hasPastKeyframes) {
         // Extrapolate based on last past keyframe
         const double deltaApplicationTime = applicationTime - lastPastKeyframe->timestamp;
-        Time predictedTime(
+        const Time predictedTime = Time(
             lastPastKeyframe->data.time.j2000Seconds() +
             deltaApplicationTime *
                 (lastPastKeyframe->data.pause ? 0.0 : lastPastKeyframe->data.delta)
@@ -259,7 +257,7 @@ TimeKeyframeData TimeManager::interpolate(double applicationTime) {
 void TimeManager::progressTime(double dt) {
     ZoneScoped;
 
-    OpenSpaceEngine::Mode m = global::openSpaceEngine->currentMode();
+    const OpenSpaceEngine::Mode m = global::openSpaceEngine->currentMode();
     if (m == OpenSpaceEngine::Mode::CameraPath) {
         // We don't want to progress time when a camera path is playing, so return
         return;
@@ -298,7 +296,7 @@ void TimeManager::progressTime(double dt) {
     const double now = currentApplicationTimeForInterpolation();
     const std::deque<Keyframe<TimeKeyframeData>>& keyframes = _timeline.keyframes();
 
-    std::function<bool(const KeyframeBase&, double)> comparisonFunc =
+    const std::function<bool(const KeyframeBase&, double)> comparisonFunc =
         (isPlayingBackSessionRecording()) ?
         &compareKeyframeTimeWithTime_playbackWithFrames : &compareKeyframeTimeWithTime;
 
@@ -323,7 +321,7 @@ void TimeManager::progressTime(double dt) {
     if (hasFutureKeyframes && hasPastKeyframes && !firstFutureKeyframe->data.jump) {
         // If keyframes exist before and after this frame,
         // interpolate between those.
-        TimeKeyframeData interpolated = interpolate(
+        const TimeKeyframeData interpolated = interpolate(
             *lastPastKeyframe,
             *firstFutureKeyframe,
             now
@@ -409,7 +407,7 @@ void TimeManager::addKeyframe(double timestamp, TimeKeyframeData time) {
 }
 
 void TimeManager::removeKeyframesAfter(double timestamp, bool inclusive) {
-    size_t nKeyframes = _timeline.nKeyframes();
+    const size_t nKeyframes = _timeline.nKeyframes();
     _timeline.removeKeyframesAfter(timestamp, inclusive);
     if (nKeyframes != _timeline.nKeyframes()) {
         _timelineChanged = true;
@@ -417,7 +415,7 @@ void TimeManager::removeKeyframesAfter(double timestamp, bool inclusive) {
 }
 
 void TimeManager::removeKeyframesBefore(double timestamp, bool inclusive) {
-    size_t nKeyframes = _timeline.nKeyframes();
+    const size_t nKeyframes = _timeline.nKeyframes();
     _timeline.removeKeyframesBefore(timestamp, inclusive);
     if (nKeyframes != _timeline.nKeyframes()) {
         _timelineChanged = true;
@@ -425,7 +423,7 @@ void TimeManager::removeKeyframesBefore(double timestamp, bool inclusive) {
 }
 
 void TimeManager::clearKeyframes() {
-    size_t nKeyframes = _timeline.nKeyframes();
+    const size_t nKeyframes = _timeline.nKeyframes();
     _timeline.clearKeyframes();
     if (nKeyframes != _timeline.nKeyframes()) {
         _timelineChanged = true;
@@ -433,7 +431,7 @@ void TimeManager::clearKeyframes() {
 }
 
 void TimeManager::setTimeNextFrame(Time t) {
-    OpenSpaceEngine::Mode m = global::openSpaceEngine->currentMode();
+    const OpenSpaceEngine::Mode m = global::openSpaceEngine->currentMode();
     if (m == OpenSpaceEngine::Mode::CameraPath) {
         LERROR("Cannot change simulation time during camera path");
         return;
@@ -455,7 +453,7 @@ void TimeManager::setDeltaTimeSteps(std::vector<double> deltaTimes) {
         deltaTimes.begin(),
         deltaTimes.end(),
         std::back_inserter(negatives),
-        std::negate<double>()
+        std::negate<>()
     );
 
     deltaTimes.reserve(2 * deltaTimes.size());
@@ -535,7 +533,7 @@ void TimeManager::addDeltaTimesKeybindings() {
             modifier = KeyModifier::Control;
         }
 
-        KeyModifier negativeModifier = modifier | KeyModifier::Alt;
+        const KeyModifier negativeModifier = modifier | KeyModifier::Alt;
 
         addDeltaTimeKeybind(key, modifier, deltaTimeStep);
         addDeltaTimeKeybind(key, negativeModifier, -deltaTimeStep);
@@ -556,7 +554,7 @@ void TimeManager::addDeltaTimesKeybindings() {
 void TimeManager::clearDeltaTimesKeybindings() {
     // Iterate over all of the registered actions with the common prefix that we created
     // in the addDeltaTimesKeybindings function
-    std::vector<interaction::Action> actions = global::actionManager->actions();
+    const std::vector<interaction::Action> actions = global::actionManager->actions();
     for (const interaction::Action& action : actions) {
         if (action.identifier.starts_with(DeltaTimeActionPrefix)) {
             global::actionManager->removeAction(action.identifier);
@@ -603,14 +601,14 @@ std::vector<Syncable*> TimeManager::syncables() {
 }
 
 TimeManager::CallbackHandle TimeManager::addTimeChangeCallback(TimeChangeCallback cb) {
-    CallbackHandle handle = _nextCallbackHandle++;
+    const CallbackHandle handle = _nextCallbackHandle++;
     _timeChangeCallbacks.emplace_back(handle, std::move(cb));
     return handle;
 }
 
 TimeManager::CallbackHandle TimeManager::addDeltaTimeChangeCallback(TimeChangeCallback cb)
 {
-    CallbackHandle handle = _nextCallbackHandle++;
+    const CallbackHandle handle = _nextCallbackHandle++;
     _deltaTimeChangeCallbacks.emplace_back(handle, std::move(cb));
     return handle;
 }
@@ -618,21 +616,21 @@ TimeManager::CallbackHandle TimeManager::addDeltaTimeChangeCallback(TimeChangeCa
 TimeManager::CallbackHandle
 TimeManager::addDeltaTimeStepsChangeCallback(TimeChangeCallback cb)
 {
-    CallbackHandle handle = _nextCallbackHandle++;
+    const CallbackHandle handle = _nextCallbackHandle++;
     _deltaTimeStepsChangeCallbacks.emplace_back(handle, std::move(cb));
     return handle;
 }
 
 TimeManager::CallbackHandle TimeManager::addTimeJumpCallback(TimeChangeCallback cb) {
-    CallbackHandle handle = _nextCallbackHandle++;
+    const CallbackHandle handle = _nextCallbackHandle++;
     _timeJumpCallbacks.emplace_back(handle, std::move(cb));
     return handle;
 }
 
 TimeManager::CallbackHandle TimeManager::addTimelineChangeCallback(TimeChangeCallback cb)
 {
-    CallbackHandle handle = _nextCallbackHandle++;
-    _timelineChangeCallbacks.push_back({ handle, std::move(cb) });
+    const  CallbackHandle handle = _nextCallbackHandle++;
+    _timelineChangeCallbacks.emplace_back(handle, std::move(cb));
     return handle;
 }
 
@@ -766,17 +764,17 @@ void TimeManager::interpolateDeltaTime(double newDeltaTime, double interpolation
         return;
     }
 
-    Time newTime(
+    const Time newTime = Time(
         time().j2000Seconds() + (_deltaTime + newDeltaTime) * 0.5 * interpolationDuration
     );
 
-    TimeKeyframeData currentKeyframe = {
+    const TimeKeyframeData currentKeyframe = {
         .time = time(),
         .delta = _deltaTime,
         .pause = false,
         .jump = false
     };
-    TimeKeyframeData futureKeyframe = {
+    const TimeKeyframeData futureKeyframe = {
         .time = newTime,
         .delta = newDeltaTime,
         .pause = false,
@@ -785,7 +783,7 @@ void TimeManager::interpolateDeltaTime(double newDeltaTime, double interpolation
 
     _targetDeltaTime = newDeltaTime;
 
-    double now = isPlayingBackSessionRecording() ?
+    const double now = isPlayingBackSessionRecording() ?
         previousApplicationTimeForInterpolation() :
         currentApplicationTimeForInterpolation();
 
@@ -797,7 +795,8 @@ std::optional<double> TimeManager::nextDeltaTimeStep() {
     if (!hasNextDeltaTimeStep()) {
         return std::nullopt;
     }
-    std::vector<double>::iterator nextStepIterator = std::upper_bound(
+
+    const std::vector<double>::iterator nextStepIterator = std::upper_bound(
         _deltaTimeSteps.begin(),
         _deltaTimeSteps.end(),
         _targetDeltaTime
@@ -814,7 +813,7 @@ std::optional<double> TimeManager::previousDeltaTimeStep() {
     if (!hasPreviousDeltaTimeStep()) {
         return std::nullopt;
     }
-    std::vector<double>::iterator lowerBoundIterator = std::lower_bound(
+    const std::vector<double>::iterator lowerBoundIterator = std::lower_bound(
         _deltaTimeSteps.begin(),
         _deltaTimeSteps.end(),
         _targetDeltaTime
@@ -824,20 +823,22 @@ std::optional<double> TimeManager::previousDeltaTimeStep() {
         return std::nullopt; // should not get here
     }
 
-    std::vector<double>::iterator prevStepIterator = lowerBoundIterator - 1;
+    const std::vector<double>::iterator prevStepIterator = lowerBoundIterator - 1;
     return *prevStepIterator;
 }
 
 bool TimeManager::hasNextDeltaTimeStep() const {
-    if (_deltaTimeSteps.empty())
+    if (_deltaTimeSteps.empty()) {
         return false;
+    }
 
     return _targetDeltaTime < _deltaTimeSteps.back();
 }
 
 bool TimeManager::hasPreviousDeltaTimeStep() const {
-    if (_deltaTimeSteps.empty())
+    if (_deltaTimeSteps.empty()) {
         return false;
+    }
 
     return _targetDeltaTime > _deltaTimeSteps.front();
 }
@@ -851,18 +852,20 @@ void TimeManager::setPreviousDeltaTimeStep() {
 }
 
 void TimeManager::interpolateNextDeltaTimeStep(double durationSeconds) {
-    if (!hasNextDeltaTimeStep())
+    if (!hasNextDeltaTimeStep()) {
         return;
+    }
 
-    double nextDeltaTime = nextDeltaTimeStep().value();
+    const double nextDeltaTime = nextDeltaTimeStep().value();
     interpolateDeltaTime(nextDeltaTime, durationSeconds);
 }
 
 void TimeManager::interpolatePreviousDeltaTimeStep(double durationSeconds) {
-    if (!hasPreviousDeltaTimeStep())
+    if (!hasPreviousDeltaTimeStep()) {
         return;
+    }
 
-    double previousDeltaTime = previousDeltaTimeStep().value();
+    const double previousDeltaTime = previousDeltaTimeStep().value();
     interpolateDeltaTime(previousDeltaTime, durationSeconds);
 }
 
@@ -875,24 +878,24 @@ void TimeManager::interpolatePause(bool pause, double interpolationDuration) {
         return;
     }
 
-    OpenSpaceEngine::Mode engineMode = global::openSpaceEngine->currentMode();
+    const OpenSpaceEngine::Mode engineMode = global::openSpaceEngine->currentMode();
     if (!pause && engineMode == OpenSpaceEngine::Mode::CameraPath) {
         LERROR("Cannot unpause simulation time during camera path");
         return;
     }
 
-    double targetDelta = pause ? 0.0 : _targetDeltaTime;
-    Time newTime(
+    const double targetDelta = pause ? 0.0 : _targetDeltaTime;
+    const Time newTime = Time(
         time().j2000Seconds() + (_deltaTime + targetDelta) * 0.5 * interpolationDuration
     );
 
-    TimeKeyframeData currentKeyframe = {
+    const TimeKeyframeData currentKeyframe = {
         .time = time(),
         .delta = _deltaTime,
         .pause = false,
         .jump = false
     };
-    TimeKeyframeData futureKeyframe = {
+    const TimeKeyframeData futureKeyframe = {
         .time = newTime,
         .delta = _targetDeltaTime,
         .pause = pause,
@@ -900,7 +903,7 @@ void TimeManager::interpolatePause(bool pause, double interpolationDuration) {
     };
     _timePaused = pause;
 
-    double now = isPlayingBackSessionRecording() ?
+    const double now = isPlayingBackSessionRecording() ?
         previousApplicationTimeForInterpolation() :
         currentApplicationTimeForInterpolation();
 
@@ -942,7 +945,7 @@ void TimeManager::setTimeFromProfile(const Profile& p) {
         switch (p.time->type) {
             case Profile::Time::Type::Relative:
             {
-                std::string t = Time::currentWallTime();
+                const std::string t = Time::currentWallTime();
                 std::variant<std::string, double> t2 =
                     Time::advancedTime(t, p.time->value);
                 ghoul_assert(std::holds_alternative<std::string>(t2), "Wrong type");
diff --git a/src/util/touch.cpp b/src/util/touch.cpp
index f4297bbe3e..e24e5ac33e 100644
--- a/src/util/touch.cpp
+++ b/src/util/touch.cpp
@@ -39,12 +39,12 @@ TouchInput::TouchInput(size_t touchDeviceId_, size_t fingerId_, float x_, float
     , timestamp(timestamp_)
 {}
 
-glm::vec2 TouchInput::screenCoordinates(glm::vec2 resolution) const {
+glm::vec2 TouchInput::screenCoordinates(const glm::vec2& resolution) const {
     return { std::floor(x * resolution.x + 0.5f), std::floor(y * resolution.y + 0.5f) };
 }
 
 glm::vec2 TouchInput::currentWindowCoordinates() const {
-    glm::vec2 res = global::windowDelegate->currentSubwindowSize();
+    const glm::vec2 res = global::windowDelegate->currentSubwindowSize();
     return { std::floor(x * res.x + 0.5f), std::floor(y * res.y + 0.5f) };
 }
 
diff --git a/src/util/tstring.cpp b/src/util/tstring.cpp
index 6551a33e6e..6eafbdb2c4 100644
--- a/src/util/tstring.cpp
+++ b/src/util/tstring.cpp
@@ -42,7 +42,7 @@ tstring temporaryString(std::string_view str) {
 }
 
 tstring temporaryString(const char str[]) {
-    size_t size = strlen(str);
+    const size_t size = strlen(str);
     void* ptr = global::memoryManager->TemporaryMemory.do_allocate(size, 8);
     std::strcpy(reinterpret_cast<char*>(ptr), str);
     return tstring(reinterpret_cast<char*>(ptr), size);
diff --git a/src/util/universalhelpers.cpp b/src/util/universalhelpers.cpp
index 10ff42980d..2dbfd10117 100644
--- a/src/util/universalhelpers.cpp
+++ b/src/util/universalhelpers.cpp
@@ -32,7 +32,7 @@ double shiftAndScale(double t, double start, double end) {
         "Values must be 0.0 < start < end < 1.0"
     );
 
-    double tScaled = t / (end - start) - start;
+    const double tScaled = t / (end - start) - start;
     return std::max(0.0, std::min(tScaled, 1.0));
 }
 
diff --git a/src/util/versionchecker.cpp b/src/util/versionchecker.cpp
index df9a8d853c..d4efdd8e9a 100644
--- a/src/util/versionchecker.cpp
+++ b/src/util/versionchecker.cpp
@@ -79,16 +79,16 @@ void VersionChecker::cancel() {
         if (_request->hasSucceeded()) {
             _request->wait();
             std::vector<char> data = _request->downloadedData();
-            std::string versionString(data.begin(), data.end());
+            const std::string versionString(data.begin(), data.end());
             std::istringstream versionData(versionString);
 
             std::string token;
             std::getline(versionData, token, '.');
-            int major = std::atoi(token.c_str());
+            const int major = std::atoi(token.c_str());
             std::getline(versionData, token, '.');
-            int minor = std::atoi(token.c_str());
+            const int minor = std::atoi(token.c_str());
             std::getline(versionData, token, '.');
-            int patch = std::atoi(token.c_str());
+            const int patch = std::atoi(token.c_str());
 
             _latestVersion = { major, minor, patch };
             _request = nullptr;
@@ -125,10 +125,11 @@ void VersionChecker::cancel() {
             _request->cancel();
             _request->wait();
             std::vector<char> data = _request->downloadedData();
-            std::string response(data.begin(), data.end());
+            const std::string response = std::string(data.begin(), data.end());
             LWARNING(fmt::format(
-                "Failed to get latest OpenSpace version information from {}",
-                _request->url()
+                "Failed to get OpenSpace version information from {}. Response: {}",
+                _request->url(),
+                response
             ));
             _request = nullptr;
             return false;
diff --git a/support/coding/codegen b/support/coding/codegen
index 3cae27731c..6fae00541a 160000
--- a/support/coding/codegen
+++ b/support/coding/codegen
@@ -1 +1 @@
-Subproject commit 3cae27731c6a0b8a7a0e81c916d4298a860f4e1b
+Subproject commit 6fae00541aadf1fdd2634e9e633be69d16c8bc70
diff --git a/tests/main.cpp b/tests/main.cpp
index 64eece4647..7f918ca4d8 100644
--- a/tests/main.cpp
+++ b/tests/main.cpp
@@ -58,9 +58,9 @@ int main(int argc, char** argv) {
         ghoul::filesystem::FileSystem::Override::Yes
     );
 
-    std::filesystem::path configFile = findConfiguration();
+    const std::filesystem::path configFile = findConfiguration();
     // Register the base path as the directory where 'filename' lives
-    std::filesystem::path base = configFile.parent_path();
+    const std::filesystem::path base = configFile.parent_path();
     FileSys.registerPathToken("${BASE}", base);
 
     *global::configuration = loadConfigurationFromFile(
@@ -82,7 +82,8 @@ int main(int argc, char** argv) {
     // All of the relevant tests initialize the SpiceManager
     openspace::SpiceManager::deinitialize();
 
-    int result = Catch::Session().run(argc, argv);
+
+    const int result = Catch::Session().run(argc, argv);
 
     // And the deinitialization needs the SpiceManager to be initialized
     openspace::SpiceManager::initialize();
diff --git a/tests/property/test_property_listproperties.cpp b/tests/property/test_property_listproperties.cpp
index 1939ebf17c..c3d95f47e9 100644
--- a/tests/property/test_property_listproperties.cpp
+++ b/tests/property/test_property_listproperties.cpp
@@ -35,10 +35,10 @@
 #include <vector>
 
 TEST_CASE("StringListProperty: Class Name and Default Value", "[stringlistproperty]") {
-    openspace::properties::StringListProperty p({ "id", "gui", "desc" });
+    const openspace::properties::StringListProperty p({ "id", "gui", "desc" });
 
     CHECK(p.className() == "StringListProperty");
-    CHECK(p.value() == std::vector<std::string>());
+    CHECK(p.value().empty());
 }
 
 TEST_CASE("StringListProperty: Set Value", "[stringlistproperty]") {
@@ -51,7 +51,7 @@ TEST_CASE("StringListProperty: Set Value", "[stringlistproperty]") {
 
     // Empty value
     p.setValue({});
-    CHECK(p.value() == std::vector<std::string>());
+    CHECK(p.value().empty());
 }
 
 TEST_CASE("StringListProperty: Get String Value", "[stringlistproperty]") {
@@ -70,7 +70,7 @@ TEST_CASE("StringListProperty: Set Lua Value", "[stringlistproperty]") {
 
     const std::vector<std::string> list{ "a", "b", "c" };
 
-    ghoul::lua::LuaState L;
+    const ghoul::lua::LuaState L;
     ghoul::lua::push(L, list);
 
     p.setLuaValue(L);
@@ -81,17 +81,17 @@ TEST_CASE("StringListProperty: Set Lua Value", "[stringlistproperty]") {
 TEST_CASE("StringListProperty: Set Lua Value - Empty", "[stringlistproperty]") {
     openspace::properties::StringListProperty p({ "id", "gui", "desc" });
 
-    ghoul::lua::LuaState L;
+    const ghoul::lua::LuaState L;
     ghoul::lua::push(L, std::vector<std::string>{});
     p.setLuaValue(L);
 
-    CHECK(p.value() == std::vector<std::string>{});
+    CHECK(p.value().empty());
 }
 
 TEST_CASE("StringListProperty: Invalid Set Lua Value - Not List", "[stringlistproperty]") {
     openspace::properties::StringListProperty p({ "id", "gui", "desc" });
 
-    ghoul::lua::LuaState L;
+    const ghoul::lua::LuaState L;
     ghoul::lua::push(L, 2); // Not a list
 
     CHECK_THROWS(p.setLuaValue(L));
@@ -103,7 +103,7 @@ TEST_CASE("StringListProperty: Get Lua Value", "[stringlistproperty]") {
     const std::vector<std::string> list{ "a", "b", "c" };
     p.setValue(list);
 
-    ghoul::lua::LuaState L;
+    const ghoul::lua::LuaState L;
     p.getLuaValue(L);
 
     CHECK(ghoul::lua::luaValueToString(L, 1) ==
@@ -112,9 +112,9 @@ TEST_CASE("StringListProperty: Get Lua Value", "[stringlistproperty]") {
 }
 
 TEST_CASE("StringListProperty: Get Empty Lua Value", "[stringlistproperty]") {
-    openspace::properties::StringListProperty p({ "id", "gui", "desc" });
+    const openspace::properties::StringListProperty p({ "id", "gui", "desc" });
 
-    ghoul::lua::LuaState L;
+    const ghoul::lua::LuaState L;
     p.getLuaValue(L);
 
     CHECK(ghoul::lua::luaValueToString(L, 1) == "{}");
@@ -132,10 +132,10 @@ TEST_CASE("StringListProperty: Value From Copying Variable", "[stringlistpropert
 // IntListProperty
 
 TEST_CASE("IntListProperty: Class Name and Default Value", "[intlistproperty]") {
-    openspace::properties::IntListProperty p({ "id", "gui", "desc" });
+    const openspace::properties::IntListProperty p({ "id", "gui", "desc" });
 
     CHECK(p.className() == "IntListProperty");
-    CHECK(p.value() == std::vector<int>());
+    CHECK(p.value().empty());
 }
 
 TEST_CASE("IntListProperty: Set Value", "[intlistproperty]") {
@@ -148,7 +148,7 @@ TEST_CASE("IntListProperty: Set Value", "[intlistproperty]") {
 
     // Empty value
     p.setValue({});
-    CHECK(p.value() == std::vector<int>());
+    CHECK(p.value().empty());
 }
 
 TEST_CASE("IntListProperty: Get String Value", "[intlistproperty]") {
@@ -167,7 +167,7 @@ TEST_CASE("IntListProperty: Set Lua Value", "[intlistproperty]") {
 
     const std::vector<int> list{ 1, 2, 3 };
 
-    ghoul::lua::LuaState L;
+    const ghoul::lua::LuaState L;
     ghoul::lua::push(L, list);
 
     p.setLuaValue(L);
@@ -178,26 +178,26 @@ TEST_CASE("IntListProperty: Set Lua Value", "[intlistproperty]") {
 TEST_CASE("IntListProperty: Set Lua Value - Empty", "[intlistproperty]") {
     openspace::properties::IntListProperty p({ "id", "gui", "desc" });
 
-    ghoul::lua::LuaState L;
+    const ghoul::lua::LuaState L;
     ghoul::lua::push(L, std::vector<int>());
     p.setLuaValue(L);
 
-    CHECK(p.value() == std::vector<int>());
+    CHECK(p.value().empty());
 }
 
 TEST_CASE("IntListProperty: Set Lua Value - Non-number", "[intlistproperty]") {
     openspace::properties::IntListProperty p({ "id", "gui", "desc" });
 
-    ghoul::lua::LuaState L;
+    const ghoul::lua::LuaState L;
     ghoul::lua::push(L, std::vector{ "not a number", "oops" });
     CHECK_THROWS(p.setLuaValue(L));
-    CHECK(p.value() == std::vector<int>());
+    CHECK(p.value().empty());
 }
 
 TEST_CASE("IntListProperty: Invalid Set Lua Value - Not List", "[intlistproperty]") {
     openspace::properties::IntListProperty p({ "id", "gui", "desc" });
 
-    ghoul::lua::LuaState L;
+    const ghoul::lua::LuaState L;
     ghoul::lua::push(L, 2); // Not a list
 
     CHECK_THROWS(p.setLuaValue(L));
@@ -209,7 +209,7 @@ TEST_CASE("IntListProperty: Get Lua Value", "[intlistproperty]") {
     const std::vector<int> list{ 1, 2, 3 };
     p.setValue(list);
 
-    ghoul::lua::LuaState L;
+    const ghoul::lua::LuaState L;
     p.getLuaValue(L);
 
     CHECK(ghoul::lua::luaValueToString(L, 1) ==
@@ -218,9 +218,9 @@ TEST_CASE("IntListProperty: Get Lua Value", "[intlistproperty]") {
 }
 
 TEST_CASE("IntListProperty: Get Empty Lua Value", "[intlistproperty]") {
-    openspace::properties::IntListProperty p({ "id", "gui", "desc" });
+    const openspace::properties::IntListProperty p({ "id", "gui", "desc" });
 
-    ghoul::lua::LuaState L;
+    const ghoul::lua::LuaState L;
     p.getLuaValue(L);
 
     CHECK(ghoul::lua::luaValueToString(L, 1) == "{}");
@@ -238,10 +238,10 @@ TEST_CASE("IntListProperty: Value From Copying Variable", "[intlistproperty]") {
 // DoubleListProperty
 
 TEST_CASE("DoubleListProperty: Class Name and Default Value", "[doublelistproperty]") {
-    openspace::properties::DoubleListProperty p({ "id", "gui", "desc" });
+    const openspace::properties::DoubleListProperty p({ "id", "gui", "desc" });
 
     CHECK(p.className() == "DoubleListProperty");
-    CHECK(p.value() == std::vector<double>());
+    CHECK(p.value().empty());
 }
 
 TEST_CASE("DoubleListProperty: Set Value", "[doublelistproperty]") {
@@ -254,7 +254,7 @@ TEST_CASE("DoubleListProperty: Set Value", "[doublelistproperty]") {
 
     // Empty value
     p.setValue({});
-    CHECK(p.value() == std::vector<double>());
+    CHECK(p.value().empty());
 }
 
 TEST_CASE("DoubleListProperty: Get String Value", "[doublelistproperty]") {
@@ -273,7 +273,7 @@ TEST_CASE("DoubleListProperty: Set Lua Value", "[doublelistproperty]") {
 
     const std::vector<double> list{ 1.0, 2.0, 3.0 };
 
-    ghoul::lua::LuaState L;
+    const ghoul::lua::LuaState L;
     ghoul::lua::push(L, list);
 
     p.setLuaValue(L);
@@ -284,26 +284,26 @@ TEST_CASE("DoubleListProperty: Set Lua Value", "[doublelistproperty]") {
 TEST_CASE("DoubleListProperty: Set Lua Value - Empty", "[doublelistproperty]") {
     openspace::properties::DoubleListProperty p({ "id", "gui", "desc" });
 
-    ghoul::lua::LuaState L;
+    const ghoul::lua::LuaState L;
     ghoul::lua::push(L, std::vector<double>());
     p.setLuaValue(L);
 
-    CHECK(p.value() == std::vector<double>());
+    CHECK(p.value().empty());
 }
 
 TEST_CASE("DoubleListProperty: Set Lua Value - Non-number", "[doublelistproperty]") {
     openspace::properties::DoubleListProperty p({ "id", "gui", "desc" });
 
-    ghoul::lua::LuaState L;
+    const ghoul::lua::LuaState L;
     ghoul::lua::push(L, std::vector{"not a number", "oops"});
     CHECK_THROWS(p.setLuaValue(L));
-    CHECK(p.value() == std::vector<double>());
+    CHECK(p.value().empty());
 }
 
 TEST_CASE("DoubleListProperty: Invalid Set Lua Value - Not List", "[doublelistproperty]") {
     openspace::properties::DoubleListProperty p({ "id", "gui", "desc" });
 
-    ghoul::lua::LuaState L;
+    const ghoul::lua::LuaState L;
     ghoul::lua::push(L, 2); // Not a list
 
     CHECK_THROWS(p.setLuaValue(L));
@@ -315,7 +315,7 @@ TEST_CASE("DoubleListProperty: Get Lua Value", "[doublelistproperty]") {
     const std::vector<double> list{ 1.0, 2.1, 3.2 };
     p.setValue(list);
 
-    ghoul::lua::LuaState L;
+    const ghoul::lua::LuaState L;
     p.getLuaValue(L);
 
     CHECK(ghoul::lua::luaValueToString(L, 1) ==
@@ -324,9 +324,9 @@ TEST_CASE("DoubleListProperty: Get Lua Value", "[doublelistproperty]") {
 }
 
 TEST_CASE("DoubleListProperty: Get Empty Lua Value", "[doublelistproperty]") {
-    openspace::properties::DoubleListProperty p({ "id", "gui", "desc" });
+    const openspace::properties::DoubleListProperty p({ "id", "gui", "desc" });
 
-    ghoul::lua::LuaState L;
+    const ghoul::lua::LuaState L;
     p.getLuaValue(L);
 
     CHECK(ghoul::lua::luaValueToString(L, 1) == "{}");
diff --git a/tests/property/test_property_optionproperty.cpp b/tests/property/test_property_optionproperty.cpp
index 1d52f2644e..061143c7de 100644
--- a/tests/property/test_property_optionproperty.cpp
+++ b/tests/property/test_property_optionproperty.cpp
@@ -27,7 +27,7 @@
 #include <openspace/properties/optionproperty.h>
 
 TEST_CASE("OptionProperty: No Option", "[optionproperty]") {
-    openspace::properties::OptionProperty p({ "id", "gui", "desc" });
+    const openspace::properties::OptionProperty p({ "id", "gui", "desc" });
 
     CHECK_FALSE(p.hasOption());
 }
diff --git a/tests/property/test_property_selectionproperty.cpp b/tests/property/test_property_selectionproperty.cpp
index 1f4b41654d..6aa34276a7 100644
--- a/tests/property/test_property_selectionproperty.cpp
+++ b/tests/property/test_property_selectionproperty.cpp
@@ -33,10 +33,10 @@
 #include <vector>
 
 TEST_CASE("SelectionProperty: Class Name and Default Value", "[selectionproperty]") {
-    openspace::properties::SelectionProperty p({ "id", "gui", "desc" });
+    const openspace::properties::SelectionProperty p({ "id", "gui", "desc" });
 
     CHECK(p.className() == "SelectionProperty");
-    CHECK(p.value() == std::set<std::string>());
+    CHECK(p.value().empty());
     CHECK(p.options().empty());
 }
 
@@ -51,7 +51,7 @@ TEST_CASE("SelectionProperty: Set Value", "[selectionproperty]") {
 
     // Empty value
     p.setValue({});
-    CHECK(p.value() == std::set<std::string>());
+    CHECK(p.value().empty());
 }
 
 TEST_CASE("SelectionProperty: Set Value - Invalid Input", "[selectionproperty]") {
@@ -133,7 +133,7 @@ TEST_CASE("SelectionProperty: Set Lua Value", "[selectionproperty]") {
     openspace::properties::SelectionProperty p({ "id", "gui", "desc" });
     p.setOptions({ "a", "b", "c" });
 
-    ghoul::lua::LuaState L;
+    const ghoul::lua::LuaState L;
     ghoul::lua::push(L, std::vector{ "a", "b" });
 
     p.setLuaValue(L);
@@ -145,7 +145,7 @@ TEST_CASE("SelectionProperty: Set Lua Value - Duplicates", "[selectionproperty]"
     openspace::properties::SelectionProperty p({ "id", "gui", "desc" });
     p.setOptions({ "a", "b", "c" });
 
-    ghoul::lua::LuaState L;
+    const ghoul::lua::LuaState L;
     ghoul::lua::push(L, std::vector{ "a", "a", "b" });
 
     p.setLuaValue(L);
@@ -157,7 +157,7 @@ TEST_CASE("SelectionProperty: Set Lua Value - Invalid Key", "[selectionproperty]
     openspace::properties::SelectionProperty p({ "id", "gui", "desc" });
     p.setOptions({ "a", "b", "c" });
 
-    ghoul::lua::LuaState L;
+    const ghoul::lua::LuaState L;
     ghoul::lua::push(L, std::vector{ "a", "d" });
 
     p.setLuaValue(L);
@@ -172,7 +172,7 @@ TEST_CASE("SelectionProperty: Get Lua Value", "[selectionproperty]") {
     const std::set<std::string> list{ "a", "b" };
     p.setValue(list);
 
-    ghoul::lua::LuaState L;
+    const ghoul::lua::LuaState L;
     p.getLuaValue(L);
 
     ghoul::Dictionary reference;
@@ -193,7 +193,7 @@ TEST_CASE("SelectionProperty: Get Empty Lua Value", "[selectionproperty]") {
     openspace::properties::SelectionProperty p({ "id", "gui", "desc" });
     p.setOptions({ "a", "b", "c" });
 
-    ghoul::lua::LuaState L;
+    const ghoul::lua::LuaState L;
     p.getLuaValue(L);
 
     ghoul::Dictionary res = ghoul::lua::value<ghoul::Dictionary>(L);
diff --git a/tests/test_assetloader.cpp b/tests/test_assetloader.cpp
index 4856be28c1..c170b506e9 100644
--- a/tests/test_assetloader.cpp
+++ b/tests/test_assetloader.cpp
@@ -40,35 +40,32 @@
 #include <memory>
 
 TEST_CASE("AssetLoader: Assertion", "[assetloader]") {
-    openspace::Scene scene(std::make_unique<openspace::SingleThreadedSceneInitializer>());
-    ghoul::lua::LuaState* state = openspace::global::scriptEngine->luaState();
-    openspace::AssetManager assetLoader(
-        state,
-        absPath("${TESTDIR}/AssetLoaderTest/").string()
-    );
+    using namespace openspace;
+
+    const Scene scene = Scene(std::make_unique<SingleThreadedSceneInitializer>());
+    ghoul::lua::LuaState* state = global::scriptEngine->luaState();
+    AssetManager assetLoader(state, absPath("${TESTDIR}/AssetLoaderTest/"));
 
     CHECK_NOTHROW(assetLoader.add("passassertion"));
     CHECK_NOTHROW(assetLoader.add("failassertion"));
 }
 
 TEST_CASE("AssetLoader: Basic Export Import", "[assetloader]") {
-    openspace::Scene scene(std::make_unique<openspace::SingleThreadedSceneInitializer>());
-    ghoul::lua::LuaState* state = openspace::global::scriptEngine->luaState();
-    openspace::AssetManager assetLoader(
-        state,
-        absPath("${TESTDIR}/AssetLoaderTest/").string()
-    );
+    using namespace openspace;
+
+    const Scene scene = Scene(std::make_unique<SingleThreadedSceneInitializer>());
+    ghoul::lua::LuaState* state = global::scriptEngine->luaState();
+    AssetManager assetLoader(state, absPath("${TESTDIR}/AssetLoaderTest/"));
 
     CHECK_NOTHROW(assetLoader.add("require"));
 }
 
 TEST_CASE("AssetLoader: Asset Functions", "[assetloader]") {
-    openspace::Scene scene(std::make_unique<openspace::SingleThreadedSceneInitializer>());
-    ghoul::lua::LuaState* state = openspace::global::scriptEngine->luaState();
-    openspace::AssetManager assetLoader(
-        state,
-        absPath("${TESTDIR}/AssetLoaderTest/").string()
-    );
+    using namespace openspace;
+
+    const Scene scene = Scene(std::make_unique<SingleThreadedSceneInitializer>());
+    ghoul::lua::LuaState* state = global::scriptEngine->luaState();
+    AssetManager assetLoader(state, absPath("${TESTDIR}/AssetLoaderTest/"));
 
     CHECK_NOTHROW(assetLoader.add("assetfunctionsexist"));
 }
diff --git a/tests/test_concurrentqueue.cpp b/tests/test_concurrentqueue.cpp
index 64f97e2d7a..36b94498fa 100644
--- a/tests/test_concurrentqueue.cpp
+++ b/tests/test_concurrentqueue.cpp
@@ -31,6 +31,6 @@ TEST_CASE("ConcurrentQueue: Basic", "[concurrentqueue]") {
 
     ConcurrentQueue<int> q1;
     q1.push(4);
-    int val = q1.pop();
+    const int val = q1.pop();
     CHECK(val == 4);
 }
diff --git a/tests/test_distanceconversion.cpp b/tests/test_distanceconversion.cpp
index 7c9408d75b..b94bb42787 100644
--- a/tests/test_distanceconversion.cpp
+++ b/tests/test_distanceconversion.cpp
@@ -31,229 +31,229 @@
 using namespace openspace;
 
 TEST_CASE("DistanceConversion: Convert to meters", "[distanceconversion]") {
-    const double unit = 1.0;
-    double res;
+    constexpr double Unit = 1.0;
+    double res = 0.0;
 
-    res = convertDistance(unit, DistanceUnit::Nanometer, DistanceUnit::Meter);
+    res = convertDistance(Unit, DistanceUnit::Nanometer, DistanceUnit::Meter);
     CHECK(res == Catch::Approx(1e-9));
 
-    res = convertDistance(unit, DistanceUnit::Micrometer, DistanceUnit::Meter);
+    res = convertDistance(Unit, DistanceUnit::Micrometer, DistanceUnit::Meter);
     CHECK(res == Catch::Approx(1e-6));
 
-    res = convertDistance(unit, DistanceUnit::Millimeter, DistanceUnit::Meter);
+    res = convertDistance(Unit, DistanceUnit::Millimeter, DistanceUnit::Meter);
     CHECK(res == Catch::Approx(1e-3));
 
-    res = convertDistance(unit, DistanceUnit::Centimeter, DistanceUnit::Meter);
+    res = convertDistance(Unit, DistanceUnit::Centimeter, DistanceUnit::Meter);
     CHECK(res == Catch::Approx(1e-2));
 
-    res = convertDistance(unit, DistanceUnit::Decimeter, DistanceUnit::Meter);
+    res = convertDistance(Unit, DistanceUnit::Decimeter, DistanceUnit::Meter);
     CHECK(res == Catch::Approx(1e-1));
 
-    res = convertDistance(unit, DistanceUnit::Meter, DistanceUnit::Meter);
+    res = convertDistance(Unit, DistanceUnit::Meter, DistanceUnit::Meter);
     CHECK(res == Catch::Approx(1.0));
 
-    res = convertDistance(unit, DistanceUnit::Kilometer, DistanceUnit::Meter);
+    res = convertDistance(Unit, DistanceUnit::Kilometer, DistanceUnit::Meter);
     CHECK(res == Catch::Approx(1000.0));
 
-    res = convertDistance(unit, DistanceUnit::AU, DistanceUnit::Meter);
+    res = convertDistance(Unit, DistanceUnit::AU, DistanceUnit::Meter);
     CHECK(res == Catch::Approx(1.495978707E11));
 
-    res = convertDistance(unit, DistanceUnit::Lighthour, DistanceUnit::Meter);
+    res = convertDistance(Unit, DistanceUnit::Lighthour, DistanceUnit::Meter);
     CHECK(res == Catch::Approx(1.0799921E12));
 
-    res = convertDistance(unit, DistanceUnit::Lightday, DistanceUnit::Meter);
+    res = convertDistance(Unit, DistanceUnit::Lightday, DistanceUnit::Meter);
     CHECK(res == Catch::Approx(2.591981E13));
 
-    res = convertDistance(unit, DistanceUnit::Lightmonth, DistanceUnit::Meter);
+    res = convertDistance(Unit, DistanceUnit::Lightmonth, DistanceUnit::Meter);
     CHECK(res == Catch::Approx(7.8839421E14));
 
-    res = convertDistance(unit, DistanceUnit::Lightyear, DistanceUnit::Meter);
+    res = convertDistance(Unit, DistanceUnit::Lightyear, DistanceUnit::Meter);
     CHECK(res == Catch::Approx(9.4607304725808E15));
 
-    res = convertDistance(unit, DistanceUnit::Parsec, DistanceUnit::Meter);
+    res = convertDistance(Unit, DistanceUnit::Parsec, DistanceUnit::Meter);
     CHECK(res == Catch::Approx(3.0856776E16));
 
-    res = convertDistance(unit, DistanceUnit::Kiloparsec, DistanceUnit::Meter);
+    res = convertDistance(Unit, DistanceUnit::Kiloparsec, DistanceUnit::Meter);
     CHECK(res == Catch::Approx(1e3 * 3.0856776E16));
 
-    res = convertDistance(unit, DistanceUnit::Megaparsec, DistanceUnit::Meter);
+    res = convertDistance(Unit, DistanceUnit::Megaparsec, DistanceUnit::Meter);
     CHECK(res == Catch::Approx(1e6 * 3.0856776E16));
 
-    res = convertDistance(unit, DistanceUnit::Gigaparsec, DistanceUnit::Meter);
+    res = convertDistance(Unit, DistanceUnit::Gigaparsec, DistanceUnit::Meter);
     CHECK(res == Catch::Approx(1e9 * 3.0856776E16));
 
-    res = convertDistance(unit, DistanceUnit::Thou, DistanceUnit::Meter);
+    res = convertDistance(Unit, DistanceUnit::Thou, DistanceUnit::Meter);
     CHECK(res == Catch::Approx(1e-3 * 0.0254));
 
-    res = convertDistance(unit, DistanceUnit::Inch, DistanceUnit::Meter);
+    res = convertDistance(Unit, DistanceUnit::Inch, DistanceUnit::Meter);
     CHECK(res == Catch::Approx(0.0254));
 
-    res = convertDistance(unit, DistanceUnit::Foot, DistanceUnit::Meter);
+    res = convertDistance(Unit, DistanceUnit::Foot, DistanceUnit::Meter);
     CHECK(res == Catch::Approx(0.3048));
 
-    res = convertDistance(unit, DistanceUnit::Yard, DistanceUnit::Meter);
+    res = convertDistance(Unit, DistanceUnit::Yard, DistanceUnit::Meter);
     CHECK(res == Catch::Approx(0.9144));
 
-    res = convertDistance(unit, DistanceUnit::Chain, DistanceUnit::Meter);
+    res = convertDistance(Unit, DistanceUnit::Chain, DistanceUnit::Meter);
     CHECK(res == Catch::Approx(20.1168));
 
-    res = convertDistance(unit, DistanceUnit::Furlong, DistanceUnit::Meter);
+    res = convertDistance(Unit, DistanceUnit::Furlong, DistanceUnit::Meter);
     CHECK(res == Catch::Approx(10.0 * 20.1168));
 
-    res = convertDistance(unit, DistanceUnit::Mile, DistanceUnit::Meter);
+    res = convertDistance(Unit, DistanceUnit::Mile, DistanceUnit::Meter);
     CHECK(res == Catch::Approx(1609.344));
 
-    res = convertDistance(unit, DistanceUnit::League, DistanceUnit::Meter);
+    res = convertDistance(Unit, DistanceUnit::League, DistanceUnit::Meter);
     CHECK(res == Catch::Approx(3.0 * 1609.344));
 }
 
 TEST_CASE("DistanceConversion: Convert from meters", "[distanceconversion]") {
-    const double meters = 1.0;
-    double res;
+    constexpr double Meters = 1.0;
+    double res = 0.0;
 
-    res = convertDistance(meters, DistanceUnit::Meter, DistanceUnit::Nanometer);
-    CHECK(res == Catch::Approx(meters / 1e-9));
+    res = convertDistance(Meters, DistanceUnit::Meter, DistanceUnit::Nanometer);
+    CHECK(res == Catch::Approx(Meters / 1e-9));
 
-    res = convertDistance(meters, DistanceUnit::Meter, DistanceUnit::Micrometer);
-    CHECK(res == Catch::Approx(meters / 1e-6));
+    res = convertDistance(Meters, DistanceUnit::Meter, DistanceUnit::Micrometer);
+    CHECK(res == Catch::Approx(Meters / 1e-6));
 
-    res = convertDistance(meters, DistanceUnit::Meter, DistanceUnit::Millimeter);
-    CHECK(res == Catch::Approx(meters / 1e-3));
+    res = convertDistance(Meters, DistanceUnit::Meter, DistanceUnit::Millimeter);
+    CHECK(res == Catch::Approx(Meters / 1e-3));
 
-    res = convertDistance(meters, DistanceUnit::Meter, DistanceUnit::Centimeter);
-    CHECK(res == Catch::Approx(meters / 1e-2));
+    res = convertDistance(Meters, DistanceUnit::Meter, DistanceUnit::Centimeter);
+    CHECK(res == Catch::Approx(Meters / 1e-2));
 
-    res = convertDistance(meters, DistanceUnit::Meter, DistanceUnit::Decimeter);
-    CHECK(res == Catch::Approx(meters / 1e-1));
+    res = convertDistance(Meters, DistanceUnit::Meter, DistanceUnit::Decimeter);
+    CHECK(res == Catch::Approx(Meters / 1e-1));
 
-    res = convertDistance(meters, DistanceUnit::Meter, DistanceUnit::Meter);
+    res = convertDistance(Meters, DistanceUnit::Meter, DistanceUnit::Meter);
     CHECK(res == Catch::Approx(1.0));
 
-    res = convertDistance(meters, DistanceUnit::Meter, DistanceUnit::Kilometer);
-    CHECK(res == Catch::Approx(meters / 1000.0));
+    res = convertDistance(Meters, DistanceUnit::Meter, DistanceUnit::Kilometer);
+    CHECK(res == Catch::Approx(Meters / 1000.0));
 
-    res = convertDistance(meters, DistanceUnit::Meter, DistanceUnit::AU);
-    CHECK(res == Catch::Approx(meters / 1.495978707E11));
+    res = convertDistance(Meters, DistanceUnit::Meter, DistanceUnit::AU);
+    CHECK(res == Catch::Approx(Meters / 1.495978707E11));
 
-    res = convertDistance(meters, DistanceUnit::Meter, DistanceUnit::Lighthour);
-    CHECK(res == Catch::Approx(meters / 1.0799921E12));
+    res = convertDistance(Meters, DistanceUnit::Meter, DistanceUnit::Lighthour);
+    CHECK(res == Catch::Approx(Meters / 1.0799921E12));
 
-    res = convertDistance(meters, DistanceUnit::Meter, DistanceUnit::Lightday);
-    CHECK(res == Catch::Approx(meters / 2.591981E13));
+    res = convertDistance(Meters, DistanceUnit::Meter, DistanceUnit::Lightday);
+    CHECK(res == Catch::Approx(Meters / 2.591981E13));
 
-    res = convertDistance(meters, DistanceUnit::Meter, DistanceUnit::Lightmonth);
-    CHECK(res == Catch::Approx(meters / 7.8839421E14));
+    res = convertDistance(Meters, DistanceUnit::Meter, DistanceUnit::Lightmonth);
+    CHECK(res == Catch::Approx(Meters / 7.8839421E14));
 
-    res = convertDistance(meters, DistanceUnit::Meter, DistanceUnit::Lightyear);
-    CHECK(res == Catch::Approx(meters / 9.4607304725808E15));
+    res = convertDistance(Meters, DistanceUnit::Meter, DistanceUnit::Lightyear);
+    CHECK(res == Catch::Approx(Meters / 9.4607304725808E15));
 
-    res = convertDistance(meters, DistanceUnit::Meter, DistanceUnit::Parsec);
-    CHECK(res == Catch::Approx(meters / 3.0856776E16));
+    res = convertDistance(Meters, DistanceUnit::Meter, DistanceUnit::Parsec);
+    CHECK(res == Catch::Approx(Meters / 3.0856776E16));
 
-    res = convertDistance(meters, DistanceUnit::Meter, DistanceUnit::Kiloparsec);
-    CHECK(res == Catch::Approx(meters / (1e3 * 3.0856776E16)));
+    res = convertDistance(Meters, DistanceUnit::Meter, DistanceUnit::Kiloparsec);
+    CHECK(res == Catch::Approx(Meters / (1e3 * 3.0856776E16)));
 
-    res = convertDistance(meters, DistanceUnit::Meter, DistanceUnit::Megaparsec);
-    CHECK(res == Catch::Approx(meters / (1e6 * 3.0856776E16)));
+    res = convertDistance(Meters, DistanceUnit::Meter, DistanceUnit::Megaparsec);
+    CHECK(res == Catch::Approx(Meters / (1e6 * 3.0856776E16)));
 
-    res = convertDistance(meters, DistanceUnit::Meter, DistanceUnit::Gigaparsec);
-    CHECK(res == Catch::Approx(meters / (1e9 * 3.0856776E16)));
+    res = convertDistance(Meters, DistanceUnit::Meter, DistanceUnit::Gigaparsec);
+    CHECK(res == Catch::Approx(Meters / (1e9 * 3.0856776E16)));
 
-    res = convertDistance(meters, DistanceUnit::Meter, DistanceUnit::Thou);
-    CHECK(res == Catch::Approx(meters / (1e-3 * 0.0254)));
+    res = convertDistance(Meters, DistanceUnit::Meter, DistanceUnit::Thou);
+    CHECK(res == Catch::Approx(Meters / (1e-3 * 0.0254)));
 
-    res = convertDistance(meters, DistanceUnit::Meter, DistanceUnit::Inch);
-    CHECK(res == Catch::Approx(meters / 0.0254));
+    res = convertDistance(Meters, DistanceUnit::Meter, DistanceUnit::Inch);
+    CHECK(res == Catch::Approx(Meters / 0.0254));
 
-    res = convertDistance(meters, DistanceUnit::Meter, DistanceUnit::Foot);
-    CHECK(res == Catch::Approx(meters / 0.3048));
+    res = convertDistance(Meters, DistanceUnit::Meter, DistanceUnit::Foot);
+    CHECK(res == Catch::Approx(Meters / 0.3048));
 
-    res = convertDistance(meters, DistanceUnit::Meter, DistanceUnit::Yard);
-    CHECK(res == Catch::Approx(meters / 0.9144));
+    res = convertDistance(Meters, DistanceUnit::Meter, DistanceUnit::Yard);
+    CHECK(res == Catch::Approx(Meters / 0.9144));
 
-    res = convertDistance(meters, DistanceUnit::Meter, DistanceUnit::Chain);
-    CHECK(res == Catch::Approx(meters / 20.1168));
+    res = convertDistance(Meters, DistanceUnit::Meter, DistanceUnit::Chain);
+    CHECK(res == Catch::Approx(Meters / 20.1168));
 
-    res = convertDistance(meters, DistanceUnit::Meter, DistanceUnit::Furlong);
-    CHECK(res == Catch::Approx(meters / (10.0 * 20.1168)));
+    res = convertDistance(Meters, DistanceUnit::Meter, DistanceUnit::Furlong);
+    CHECK(res == Catch::Approx(Meters / (10.0 * 20.1168)));
 
-    res = convertDistance(meters, DistanceUnit::Meter, DistanceUnit::Mile);
-    CHECK(res == Catch::Approx(meters / 1609.344));
+    res = convertDistance(Meters, DistanceUnit::Meter, DistanceUnit::Mile);
+    CHECK(res == Catch::Approx(Meters / 1609.344));
 
-    res = convertDistance(meters, DistanceUnit::Meter, DistanceUnit::League);
-    CHECK(res == Catch::Approx(meters / (3.0 * 1609.344)));
+    res = convertDistance(Meters, DistanceUnit::Meter, DistanceUnit::League);
+    CHECK(res == Catch::Approx(Meters / (3.0 * 1609.344)));
 }
 
 TEST_CASE("DistanceConversion: Cross conversion", "[distanceconversion]") {
-    const double unit = 1.0;
-    double res;
+    constexpr double Unit = 1.0;
+    double res = 0.0;
 
-    res = convertDistance(unit, DistanceUnit::Nanometer, DistanceUnit::Kilometer);
+    res = convertDistance(Unit, DistanceUnit::Nanometer, DistanceUnit::Kilometer);
     CHECK(res == Catch::Approx(1e-12));
 
-    res = convertDistance(unit, DistanceUnit::Micrometer, DistanceUnit::Decimeter);
+    res = convertDistance(Unit, DistanceUnit::Micrometer, DistanceUnit::Decimeter);
     CHECK(res == Catch::Approx(1e-5));
 
-    res = convertDistance(unit, DistanceUnit::Millimeter, DistanceUnit::Nanometer);
+    res = convertDistance(Unit, DistanceUnit::Millimeter, DistanceUnit::Nanometer);
     CHECK(res == Catch::Approx(1e6));
 
-    res = convertDistance(unit, DistanceUnit::Centimeter, DistanceUnit::Micrometer);
+    res = convertDistance(Unit, DistanceUnit::Centimeter, DistanceUnit::Micrometer);
     CHECK(res == Catch::Approx(1e4));
 
-    res = convertDistance(unit, DistanceUnit::Decimeter, DistanceUnit::Millimeter);
+    res = convertDistance(Unit, DistanceUnit::Decimeter, DistanceUnit::Millimeter);
     CHECK(res == Catch::Approx(1e2));
 
-    res = convertDistance(unit, DistanceUnit::Kilometer, DistanceUnit::Centimeter);
+    res = convertDistance(Unit, DistanceUnit::Kilometer, DistanceUnit::Centimeter);
     CHECK(res == Catch::Approx(1e5));
 
-    res = convertDistance(unit, DistanceUnit::AU, DistanceUnit::Parsec);
+    res = convertDistance(Unit, DistanceUnit::AU, DistanceUnit::Parsec);
     CHECK(res == Catch::Approx(4.84813681e-6));
 
-    res = convertDistance(unit, DistanceUnit::Lighthour, DistanceUnit::Lightmonth);
+    res = convertDistance(Unit, DistanceUnit::Lighthour, DistanceUnit::Lightmonth);
     CHECK(res == Catch::Approx(1.36986305e-3));
 
-    res = convertDistance(unit, DistanceUnit::Lightday, DistanceUnit::Kiloparsec);
+    res = convertDistance(Unit, DistanceUnit::Lightday, DistanceUnit::Kiloparsec);
     CHECK(res == Catch::Approx(8.40003829e-7));
 
-    res = convertDistance(unit, DistanceUnit::Lightmonth, DistanceUnit::Lightday);
+    res = convertDistance(Unit, DistanceUnit::Lightmonth, DistanceUnit::Lightday);
     CHECK(res == Catch::Approx(30.4166662487));
 
-    res = convertDistance(unit, DistanceUnit::Lightyear, DistanceUnit::Gigaparsec);
+    res = convertDistance(Unit, DistanceUnit::Lightyear, DistanceUnit::Gigaparsec);
     CHECK(res == Catch::Approx(3.0660139e-10));
 
-    res = convertDistance(unit, DistanceUnit::Parsec, DistanceUnit::Lightyear);
+    res = convertDistance(Unit, DistanceUnit::Parsec, DistanceUnit::Lightyear);
     CHECK(res == Catch::Approx(3.26156379673));
 
-    res = convertDistance(unit, DistanceUnit::Kiloparsec, DistanceUnit::AU);
+    res = convertDistance(Unit, DistanceUnit::Kiloparsec, DistanceUnit::AU);
     CHECK(res == Catch::Approx(2.06264806E8));
 
-    res = convertDistance(unit, DistanceUnit::Megaparsec, DistanceUnit::Lighthour);
+    res = convertDistance(Unit, DistanceUnit::Megaparsec, DistanceUnit::Lighthour);
     CHECK(res == Catch::Approx(2.85712978826E10));
 
-    res = convertDistance(unit, DistanceUnit::Gigaparsec, DistanceUnit::Megaparsec);
+    res = convertDistance(Unit, DistanceUnit::Gigaparsec, DistanceUnit::Megaparsec);
     CHECK(res == Catch::Approx(1e3));
 
-    res = convertDistance(unit, DistanceUnit::Thou, DistanceUnit::Yard);
+    res = convertDistance(Unit, DistanceUnit::Thou, DistanceUnit::Yard);
     CHECK(res == Catch::Approx(2.77777778e-5));
 
-    res = convertDistance(unit, DistanceUnit::Inch, DistanceUnit::Foot);
+    res = convertDistance(Unit, DistanceUnit::Inch, DistanceUnit::Foot);
     CHECK(res == Catch::Approx(8.33333333e-2));
 
-    res = convertDistance(unit, DistanceUnit::Foot, DistanceUnit::Mile);
+    res = convertDistance(Unit, DistanceUnit::Foot, DistanceUnit::Mile);
     CHECK(res == Catch::Approx(1.89393939e-4));
 
-    res = convertDistance(unit, DistanceUnit::Yard, DistanceUnit::Chain);
+    res = convertDistance(Unit, DistanceUnit::Yard, DistanceUnit::Chain);
     CHECK(res == Catch::Approx(4.54545455e-2));
 
-    res = convertDistance(unit, DistanceUnit::Chain, DistanceUnit::League);
+    res = convertDistance(Unit, DistanceUnit::Chain, DistanceUnit::League);
     CHECK(res == Catch::Approx(4.16666666e-3));
 
-    res = convertDistance(unit, DistanceUnit::Furlong, DistanceUnit::Thou);
+    res = convertDistance(Unit, DistanceUnit::Furlong, DistanceUnit::Thou);
     CHECK(res == Catch::Approx(7.92E6));
 
-    res = convertDistance(unit, DistanceUnit::Mile, DistanceUnit::Inch);
+    res = convertDistance(Unit, DistanceUnit::Mile, DistanceUnit::Inch);
     CHECK(res == Catch::Approx(6.3360E4));
 
-    res = convertDistance(unit, DistanceUnit::League, DistanceUnit::Furlong);
+    res = convertDistance(Unit, DistanceUnit::League, DistanceUnit::Furlong);
     CHECK(res == Catch::Approx(24.0));
 }
diff --git a/tests/test_documentation.cpp b/tests/test_documentation.cpp
index f7bb1983be..82ec21cdc4 100644
--- a/tests/test_documentation.cpp
+++ b/tests/test_documentation.cpp
@@ -277,66 +277,66 @@ TEST_CASE("Documentation: Constructor", "[documentation]") {
 TEST_CASE("Documentation: Initializer Constructor", "[documentation]") {
     using namespace openspace::documentation;
 
-    Documentation doc = {
+    const Documentation doc = {
         .entries = {
             // Basic Verifiers
-            {"BoolVerifier", new BoolVerifier, Optional::No },
-            {"DoubleVerifier", new DoubleVerifier, Optional::No },
-            {"IntVerifier", new IntVerifier, Optional::No },
-            {"StringVerifier", new StringVerifier, Optional::No },
-            {"IdentifierVerifier", new IdentifierVerifier, Optional::No },
-            {"FileVerifier", new FileVerifier, Optional::No },
-            {"DirectoryVerifier", new DirectoryVerifier, Optional::No },
-            {"DateTimeVerifier", new DateTimeVerifier, Optional::No },
-            {"TableVerifier", new TableVerifier, Optional::No },
+            { "BoolVerifier", new BoolVerifier, Optional::No },
+            { "DoubleVerifier", new DoubleVerifier, Optional::No },
+            { "IntVerifier", new IntVerifier, Optional::No },
+            { "StringVerifier", new StringVerifier, Optional::No },
+            { "IdentifierVerifier", new IdentifierVerifier, Optional::No },
+            { "FileVerifier", new FileVerifier, Optional::No },
+            { "DirectoryVerifier", new DirectoryVerifier, Optional::No },
+            { "DateTimeVerifier", new DateTimeVerifier, Optional::No },
+            { "TableVerifier", new TableVerifier, Optional::No },
 
             // Operator Verifiers
             { "LessDouble", new DoubleLessVerifier(0.0), Optional::No },
             { "LessInt", new IntLessVerifier(0), Optional::No },
 
-            {"LessEqualDouble", new DoubleLessEqualVerifier(0.0), Optional::No },
-            {"LessEqualInt", new IntLessEqualVerifier(0), Optional::No },
+            { "LessEqualDouble", new DoubleLessEqualVerifier(0.0), Optional::No },
+            { "LessEqualInt", new IntLessEqualVerifier(0), Optional::No },
 
-            {"GreaterDouble", new DoubleGreaterVerifier(0.0), Optional::No },
-            {"GreaterInt", new IntGreaterVerifier(0), Optional::No },
+            { "GreaterDouble", new DoubleGreaterVerifier(0.0), Optional::No },
+            { "GreaterInt", new IntGreaterVerifier(0), Optional::No },
 
-            {"GreaterEqualDouble", new DoubleGreaterEqualVerifier(0.0), Optional::No },
-            {"GreaterEqualInt", new IntGreaterEqualVerifier(0), Optional::No },
+            { "GreaterEqualDouble", new DoubleGreaterEqualVerifier(0.0), Optional::No },
+            { "GreaterEqualInt", new IntGreaterEqualVerifier(0), Optional::No },
 
-            {"EqualBool", new BoolEqualVerifier(false), Optional::No },
-            {"EqualDouble", new DoubleEqualVerifier(0.0), Optional::No },
-            {"EqualInt", new IntEqualVerifier(0), Optional::No },
-            {"EqualString", new StringEqualVerifier(""), Optional::No },
+            { "EqualBool", new BoolEqualVerifier(false), Optional::No },
+            { "EqualDouble", new DoubleEqualVerifier(0.0), Optional::No },
+            { "EqualInt", new IntEqualVerifier(0), Optional::No },
+            { "EqualString", new StringEqualVerifier(""), Optional::No },
 
-            {"UnequalBool", new BoolUnequalVerifier(false), Optional::No },
-            {"UnequalDouble", new DoubleUnequalVerifier(0.0), Optional::No },
-            {"UnequalInt", new IntUnequalVerifier(0), Optional::No },
-            {"UnequalString", new StringUnequalVerifier(""), Optional::No },
+            { "UnequalBool", new BoolUnequalVerifier(false), Optional::No },
+            { "UnequalDouble", new DoubleUnequalVerifier(0.0), Optional::No },
+            { "UnequalInt", new IntUnequalVerifier(0), Optional::No },
+            { "UnequalString", new StringUnequalVerifier(""), Optional::No },
 
             // List Verifiers
-            {"InListBool", new BoolInListVerifier({ true, false }), Optional::No },
-            {"InListDouble", new DoubleInListVerifier({ 0.0, 1.0 }), Optional::No },
-            {"InListInt", new IntInListVerifier({ 0, 1 }), Optional::No },
-            {"InListString", new StringInListVerifier({ "", "a" }), Optional::No },
+            { "InListBool", new BoolInListVerifier({ true, false }), Optional::No },
+            { "InListDouble", new DoubleInListVerifier({ 0.0, 1.0 }), Optional::No },
+            { "InListInt", new IntInListVerifier({ 0, 1 }), Optional::No },
+            { "InListString", new StringInListVerifier({ "", "a" }), Optional::No },
 
-            {"NotInListBool", new BoolNotInListVerifier({ true, false }), Optional::No },
-            {"NotInListDouble", new DoubleNotInListVerifier({ 0.0, 1.0 }), Optional::No },
-            {"NotInListInt", new IntNotInListVerifier({ 0, 1 }), Optional::No },
-            {"NotInListString", new StringNotInListVerifier({ "", "a" }), Optional::No },
+            { "NotInListBool", new BoolNotInListVerifier({ true, false }), Optional::No },
+            { "NotInListDouble", new DoubleNotInListVerifier({ 0.0, 1.0 }), Optional::No },
+            { "NotInListInt", new IntNotInListVerifier({ 0, 1 }), Optional::No },
+            { "NotInListString", new StringNotInListVerifier({ "", "a" }), Optional::No },
 
             // Range Verifiers
-            {"InRangeDouble", new DoubleInRangeVerifier(0.0, 1.0), Optional::No },
-            {"InRangeInt", new IntInRangeVerifier(0, 1), Optional::No },
+            { "InRangeDouble", new DoubleInRangeVerifier(0.0, 1.0), Optional::No },
+            { "InRangeInt", new IntInRangeVerifier(0, 1), Optional::No },
 
-            {"InRangeDouble", new DoubleNotInRangeVerifier(0.0, 1.0), Optional::No },
-            {"InRangeInt", new IntNotInRangeVerifier(0, 1), Optional::No },
+            { "InRangeDouble", new DoubleNotInRangeVerifier(0.0, 1.0), Optional::No },
+            { "InRangeInt", new IntNotInRangeVerifier(0, 1), Optional::No },
 
             // Misc Verifiers
-            {"AnnotationBool", new BoolAnnotationVerifier("Bool"), Optional::No },
-            {"AnnotationDouble", new DoubleAnnotationVerifier("Double"), Optional::No },
-            {"AnnotationInt", new IntAnnotationVerifier("Int"), Optional::No },
-            {"AnnotationString", new StringAnnotationVerifier("String"), Optional::No },
-            {"AnnotationTable", new TableAnnotationVerifier("Table"), Optional::No }
+            { "AnnotationBool", new BoolAnnotationVerifier("Bool"), Optional::No },
+            { "AnnotationDouble", new DoubleAnnotationVerifier("Double"), Optional::No },
+            { "AnnotationInt", new IntAnnotationVerifier("Int"), Optional::No },
+            { "AnnotationString", new StringAnnotationVerifier("String"), Optional::No },
+            { "AnnotationTable", new TableAnnotationVerifier("Table"), Optional::No }
         }
     };
 }
@@ -344,7 +344,7 @@ TEST_CASE("Documentation: Initializer Constructor", "[documentation]") {
 TEST_CASE("Documentation: BoolVerifier", "[documentation]") {
     using namespace openspace::documentation;
 
-    Documentation doc = {
+    const Documentation doc = {
         .entries = {
             { "Bool", new BoolVerifier, Optional::No }
         }
@@ -352,8 +352,7 @@ TEST_CASE("Documentation: BoolVerifier", "[documentation]") {
 
     ghoul::Dictionary positive;
     positive.setValue("Bool", true);
-
-    TestResult positiveRes = testSpecification(doc, positive);
+    const TestResult positiveRes = testSpecification(doc, positive);
     CHECK(positiveRes.success);
     CHECK(positiveRes.offenses.empty());
 
@@ -378,7 +377,7 @@ TEST_CASE("Documentation: BoolVerifier", "[documentation]") {
 TEST_CASE("Documentation: DoubleVerifier", "[documentation]") {
     using namespace openspace::documentation;
 
-    Documentation doc = {
+    const Documentation doc = {
         .entries = {
             { "Double", new DoubleVerifier, Optional::No }
         }
@@ -386,8 +385,7 @@ TEST_CASE("Documentation: DoubleVerifier", "[documentation]") {
 
     ghoul::Dictionary positive;
     positive.setValue("Double", 0.0);
-
-    TestResult positiveRes = testSpecification(doc, positive);
+    const TestResult positiveRes = testSpecification(doc, positive);
     CHECK(positiveRes.success);
     CHECK(positiveRes.offenses.empty());
 
@@ -411,7 +409,7 @@ TEST_CASE("Documentation: DoubleVerifier", "[documentation]") {
 TEST_CASE("Documentation: IntVerifier", "[documentation]") {
     using namespace openspace::documentation;
 
-    Documentation doc = {
+    const Documentation doc = {
         .entries = {
             { "Int", new IntVerifier, Optional::No }
         }
@@ -450,7 +448,7 @@ TEST_CASE("Documentation: StringVerifier", "[documentation]") {
     using namespace openspace::documentation;
     using namespace std::string_literals;
 
-    Documentation doc = {
+    const Documentation doc = {
         .entries = {
             { "String", new StringVerifier, Optional::No }
         }
@@ -458,7 +456,7 @@ TEST_CASE("Documentation: StringVerifier", "[documentation]") {
 
     ghoul::Dictionary positive;
     positive.setValue("String", ""s);
-    TestResult positiveRes = testSpecification(doc, positive);
+    const TestResult positiveRes = testSpecification(doc, positive);
     CHECK(positiveRes.success);
     CHECK(positiveRes.offenses.empty());
 
@@ -483,7 +481,7 @@ TEST_CASE("Documentation: IdentifierVerifier", "[documentation]") {
     using namespace openspace::documentation;
     using namespace std::string_literals;
 
-    Documentation doc = {
+    const Documentation doc = {
         .entries = {
             { "Identifier", new IdentifierVerifier, Optional::No }
         }
@@ -491,7 +489,7 @@ TEST_CASE("Documentation: IdentifierVerifier", "[documentation]") {
 
     ghoul::Dictionary positive;
     positive.setValue("Identifier", "abcdef"s);
-    TestResult positiveRes = testSpecification(doc, positive);
+    const TestResult positiveRes = testSpecification(doc, positive);
     CHECK(positiveRes.success);
     CHECK(positiveRes.offenses.empty());
 
@@ -548,7 +546,7 @@ TEST_CASE("Documentation: FileVerifier", "[documentation]") {
     using namespace openspace::documentation;
     using namespace std::string_literals;
 
-    Documentation doc = {
+    const Documentation doc = {
         .entries = {
             { "File", new FileVerifier, Optional::No }
         }
@@ -556,7 +554,7 @@ TEST_CASE("Documentation: FileVerifier", "[documentation]") {
 
     ghoul::Dictionary positive;
     positive.setValue("File", absPath("${TESTDIR}/verifier/dummyfile.txt").string());
-    TestResult positiveRes = testSpecification(doc, positive);
+    const TestResult positiveRes = testSpecification(doc, positive);
     CHECK(positiveRes.success);
     CHECK(positiveRes.offenses.empty());
 
@@ -589,7 +587,7 @@ TEST_CASE("Documentation: DirectoryVerifier", "[documentation]") {
     using namespace openspace::documentation;
     using namespace std::string_literals;
 
-    Documentation doc = {
+    const Documentation doc = {
         .entries = {
             { "Dir", new DirectoryVerifier, Optional::No }
         }
@@ -597,7 +595,7 @@ TEST_CASE("Documentation: DirectoryVerifier", "[documentation]") {
 
     ghoul::Dictionary positive;
     positive.setValue("Dir", absPath("${TESTDIR}/verifier").string());
-    TestResult positiveRes = testSpecification(doc, positive);
+    const TestResult positiveRes = testSpecification(doc, positive);
     CHECK(positiveRes.success);
     CHECK(positiveRes.offenses.empty());
 
@@ -630,7 +628,7 @@ TEST_CASE("Documentation: DateTimeVerifier", "[documentation]") {
     using namespace openspace::documentation;
     using namespace std::string_literals;
 
-    Documentation doc = {
+    const Documentation doc = {
         .entries = {
             { "DateTime", new DateTimeVerifier, Optional::No }
         }
@@ -638,7 +636,7 @@ TEST_CASE("Documentation: DateTimeVerifier", "[documentation]") {
 
     ghoul::Dictionary positive;
     positive.setValue("DateTime", "1969 07 20 20:17:00"s);
-    TestResult positiveRes = testSpecification(doc, positive);
+    const TestResult positiveRes = testSpecification(doc, positive);
     CHECK(positiveRes.success);
     CHECK(positiveRes.offenses.empty());
 
@@ -670,7 +668,7 @@ TEST_CASE("Documentation: DateTimeVerifier", "[documentation]") {
 TEST_CASE("Documentation: TableVerifierType", "[documentation]") {
     using namespace openspace::documentation;
 
-    Documentation doc = {
+    const Documentation doc = {
         .entries = {
             { "Table", new TableVerifier, Optional::No }
         }
@@ -678,7 +676,7 @@ TEST_CASE("Documentation: TableVerifierType", "[documentation]") {
 
     ghoul::Dictionary positive;
     positive.setValue("Table", ghoul::Dictionary());
-    TestResult positiveRes = testSpecification(doc, positive);
+    const TestResult positiveRes = testSpecification(doc, positive);
     CHECK(positiveRes.success);
     CHECK(positiveRes.offenses.empty());
 
@@ -703,7 +701,7 @@ TEST_CASE("Documentation: StringListVerifierType", "[documentation]") {
     using namespace openspace::documentation;
     using namespace std::string_literals;
 
-    Documentation doc = {
+    const Documentation doc = {
         .entries = {
             { "StringList", new StringListVerifier, Optional::No }
         }
@@ -717,7 +715,7 @@ TEST_CASE("Documentation: StringListVerifierType", "[documentation]") {
         inner.setValue("3", "c"s);
         positive.setValue("StringList", inner);
     }
-    TestResult positiveRes = testSpecification(doc, positive);
+    const TestResult positiveRes = testSpecification(doc, positive);
     CHECK(positiveRes.success);
     CHECK(positiveRes.offenses.empty());
 
@@ -757,7 +755,7 @@ TEST_CASE("Documentation: IntListVerifierType", "[documentation]") {
     using namespace openspace::documentation;
     using namespace std::string_literals;
 
-    Documentation doc = {
+    const Documentation doc = {
         .entries = {
             { "IntList", new IntListVerifier, Optional::No }
         }
@@ -771,7 +769,7 @@ TEST_CASE("Documentation: IntListVerifierType", "[documentation]") {
         inner.setValue("3", 3);
         positive.setValue("IntList", inner);
     }
-    TestResult positiveRes = testSpecification(doc, positive);
+    const TestResult positiveRes = testSpecification(doc, positive);
     CHECK(positiveRes.success);
     CHECK(positiveRes.offenses.empty());
 
@@ -810,7 +808,7 @@ TEST_CASE("Documentation: MixedVerifiers", "[documentation]") {
     using namespace openspace::documentation;
     using namespace std::string_literals;
 
-    Documentation doc = {
+    const Documentation doc = {
         .entries = {
             { "Bool", new BoolVerifier, Optional::No },
             { "Double", new DoubleVerifier, Optional::No },
@@ -861,7 +859,7 @@ TEST_CASE("Documentation: NestedTables", "[documentation]") {
     using namespace openspace::documentation;
     using namespace std::string_literals;
 
-    Documentation doc = {
+    const Documentation doc = {
         .entries = {
             { "Outer_Int", new IntVerifier, Optional::No },
             { "Outer_Table", new TableVerifier({
@@ -1040,7 +1038,7 @@ TEST_CASE("Documentation: NestedTables", "[documentation]") {
 TEST_CASE("Documentation: Optional", "[documentation]") {
     using namespace openspace::documentation;
 
-    Documentation doc = {
+    const Documentation doc = {
         .entries = {
             { "Bool_Force", new BoolVerifier, Optional::No },
             { "Bool_Optional", new BoolVerifier, Optional::Yes }
@@ -1088,7 +1086,7 @@ TEST_CASE("Documentation: Optional", "[documentation]") {
 TEST_CASE("Documentation: Required In Optional", "[documentation]") {
     using namespace openspace::documentation;
 
-    Documentation doc = {
+    const Documentation doc = {
         .entries = {
             {
                 "a",
@@ -1141,7 +1139,7 @@ TEST_CASE("Documentation: Required In Optional", "[documentation]") {
         inner.setValue("c", 2);
         negative.setValue("a", inner);
     }
-    TestResult negativeRes = testSpecification(doc, negative);
+    const TestResult negativeRes = testSpecification(doc, negative);
     CHECK_FALSE(negativeRes.success);
     REQUIRE(negativeRes.offenses.size() == 1);
     CHECK(negativeRes.offenses[0].offender == "a.b");
@@ -1151,7 +1149,7 @@ TEST_CASE("Documentation: Required In Optional", "[documentation]") {
 TEST_CASE("Documentation: Exhaustive", "[documentation]") {
     using namespace openspace::documentation;
 
-    Documentation doc = {
+    const Documentation doc = {
         .entries = {
             { "Int", new IntVerifier, Optional::No }
         }
@@ -1159,7 +1157,7 @@ TEST_CASE("Documentation: Exhaustive", "[documentation]") {
 
     ghoul::Dictionary positive;
     positive.setValue("Int", 1);
-    TestResult positiveRes = testSpecification(doc, positive);
+    const TestResult positiveRes = testSpecification(doc, positive);
     CHECK(positiveRes.success);
     CHECK(positiveRes.offenses.empty());
 
@@ -1183,7 +1181,7 @@ TEST_CASE("Documentation: Exhaustive", "[documentation]") {
 TEST_CASE("Documentation: Nested Exhaustive", "[documentation]") {
     using namespace openspace::documentation;
 
-    Documentation doc = {
+    const Documentation doc = {
         .entries = {
             {
                 "Table",
@@ -1199,7 +1197,7 @@ TEST_CASE("Documentation: Nested Exhaustive", "[documentation]") {
         inner.setValue("a", 1);
         positive.setValue("Table", inner);
     }
-    TestResult positiveRes = testSpecification(doc, positive);
+    const TestResult positiveRes = testSpecification(doc, positive);
     CHECK(positiveRes.success);
     CHECK(positiveRes.offenses.empty());
 
@@ -1209,7 +1207,7 @@ TEST_CASE("Documentation: Nested Exhaustive", "[documentation]") {
         inner.setValue("b", 2.0);
         negative.setValue("Table", inner);
     }
-    TestResult negativeRes = testSpecification(doc, negative);
+    const TestResult negativeRes = testSpecification(doc, negative);
     CHECK_FALSE(negativeRes.success);
     REQUIRE(negativeRes.offenses.size() == 1);
     CHECK(negativeRes.offenses[0].offender == "Table.a");
@@ -1219,7 +1217,7 @@ TEST_CASE("Documentation: Nested Exhaustive", "[documentation]") {
 TEST_CASE("Documentation: Empty Entries Non Exhaustive", "[documentation]") {
     using namespace openspace::documentation;
 
-    Documentation doc;
+    const Documentation doc;
 
     ghoul::Dictionary positive {};
     TestResult positiveRes = testSpecification(doc, positive);
@@ -1236,7 +1234,7 @@ TEST_CASE("Documentation: Empty Entries Non Exhaustive", "[documentation]") {
 TEST_CASE("Documentation: Empty Nested Exhaustive", "[documentation]") {
     using namespace openspace::documentation;
 
-    Documentation doc = {
+    const Documentation doc = {
         .entries = {
             { "Table", new TableVerifier(), Optional::No }
         }
@@ -1244,7 +1242,7 @@ TEST_CASE("Documentation: Empty Nested Exhaustive", "[documentation]") {
 
     ghoul::Dictionary positive;
     positive.setValue("Table", ghoul::Dictionary());
-    TestResult positiveRes = testSpecification(doc, positive);
+    const TestResult positiveRes = testSpecification(doc, positive);
     CHECK(positiveRes.success);
     CHECK(positiveRes.offenses.empty());
 
@@ -1254,7 +1252,7 @@ TEST_CASE("Documentation: Empty Nested Exhaustive", "[documentation]") {
         inner.setValue("a", 1);
         negative.setValue("Table", inner);
     }
-    TestResult negativeRes = testSpecification(doc, negative);
+    const TestResult negativeRes = testSpecification(doc, negative);
     CHECK(negativeRes.success);
     CHECK(negativeRes.offenses.empty());
 }
@@ -1262,7 +1260,7 @@ TEST_CASE("Documentation: Empty Nested Exhaustive", "[documentation]") {
 TEST_CASE("Documentation: Less Int", "[documentation]") {
     using namespace openspace::documentation;
 
-    Documentation doc = {
+    const Documentation doc = {
         .entries = {
             { "Int", new IntLessVerifier(5), Optional::No }
         }
@@ -1270,13 +1268,13 @@ TEST_CASE("Documentation: Less Int", "[documentation]") {
 
     ghoul::Dictionary positive;
     positive.setValue("Int", 0.0);
-    TestResult positiveRes = testSpecification(doc, positive);
+    const TestResult positiveRes = testSpecification(doc, positive);
     CHECK(positiveRes.success);
     CHECK(positiveRes.offenses.empty());
 
     ghoul::Dictionary negative;
     negative.setValue("Int", 10.0);
-    TestResult negativeRes = testSpecification(doc, negative);
+    const TestResult negativeRes = testSpecification(doc, negative);
     CHECK_FALSE(negativeRes.success);
     REQUIRE(negativeRes.offenses.size() == 1);
     CHECK(negativeRes.offenses[0].offender == "Int");
@@ -1286,19 +1284,19 @@ TEST_CASE("Documentation: Less Int", "[documentation]") {
 TEST_CASE("Documentation: Less Double", "[documentation]") {
     using namespace openspace::documentation;
 
-    Documentation doc = {
+    const Documentation doc = {
         .entries = { { "Double", new DoubleLessVerifier(5.0), Optional::No } }
     };
 
     ghoul::Dictionary positive;
     positive.setValue("Double", 0.0);
-    TestResult positiveRes = testSpecification(doc, positive);
+    const TestResult positiveRes = testSpecification(doc, positive);
     CHECK(positiveRes.success);
     CHECK(positiveRes.offenses.empty());
 
     ghoul::Dictionary negative;
     negative.setValue("Double", 10.0);
-    TestResult negativeRes = testSpecification(doc, negative);
+    const TestResult negativeRes = testSpecification(doc, negative);
     CHECK_FALSE(negativeRes.success);
     REQUIRE(negativeRes.offenses.size() == 1);
     CHECK(negativeRes.offenses[0].offender == "Double");
@@ -1308,7 +1306,7 @@ TEST_CASE("Documentation: Less Double", "[documentation]") {
 TEST_CASE("Documentation: LessEqual Int", "[documentation]") {
     using namespace openspace::documentation;
 
-    Documentation doc = {
+    const Documentation doc = {
         .entries = { { "Int", new IntLessEqualVerifier(5), Optional::No } }
     };
 
@@ -1326,7 +1324,7 @@ TEST_CASE("Documentation: LessEqual Int", "[documentation]") {
 
     ghoul::Dictionary negative;
     negative.setValue("Int", 10.0);
-    TestResult negativeRes = testSpecification(doc, negative);
+    const TestResult negativeRes = testSpecification(doc, negative);
     CHECK_FALSE(negativeRes.success);
     REQUIRE(negativeRes.offenses.size() == 1);
     CHECK(negativeRes.offenses[0].offender == "Int");
@@ -1336,7 +1334,7 @@ TEST_CASE("Documentation: LessEqual Int", "[documentation]") {
 TEST_CASE("Documentation: LessEqual Double", "[documentation]") {
     using namespace openspace::documentation;
 
-    Documentation doc = {
+    const Documentation doc = {
         .entries = { { "Double", new DoubleLessEqualVerifier(5.0), Optional::No } }
     };
 
@@ -1354,7 +1352,7 @@ TEST_CASE("Documentation: LessEqual Double", "[documentation]") {
 
     ghoul::Dictionary negative;
     negative.setValue("Double", 10.0);
-    TestResult negativeRes = testSpecification(doc, negative);
+    const TestResult negativeRes = testSpecification(doc, negative);
     CHECK_FALSE(negativeRes.success);
     REQUIRE(negativeRes.offenses.size() == 1);
     CHECK(negativeRes.offenses[0].offender == "Double");
@@ -1364,19 +1362,19 @@ TEST_CASE("Documentation: LessEqual Double", "[documentation]") {
 TEST_CASE("Documentation: Greater Int", "[documentation]") {
     using namespace openspace::documentation;
 
-    Documentation doc = {
+    const Documentation doc = {
         .entries = { { "Int", new IntGreaterVerifier(5), Optional::No } }
     };
 
     ghoul::Dictionary positive;
     positive.setValue("Int", 10.0);
-    TestResult positiveRes = testSpecification(doc, positive);
+    const TestResult positiveRes = testSpecification(doc, positive);
     CHECK(positiveRes.success);
     CHECK(positiveRes.offenses.empty());
 
     ghoul::Dictionary negative;
     negative.setValue("Int", 0.0);
-    TestResult negativeRes = testSpecification(doc, negative);
+    const TestResult negativeRes = testSpecification(doc, negative);
     CHECK_FALSE(negativeRes.success);
     REQUIRE(negativeRes.offenses.size() == 1);
     CHECK(negativeRes.offenses[0].offender == "Int");
@@ -1386,19 +1384,19 @@ TEST_CASE("Documentation: Greater Int", "[documentation]") {
 TEST_CASE("Documentation: Greater Double", "[documentation]") {
     using namespace openspace::documentation;
 
-    Documentation doc = {
+    const Documentation doc = {
         .entries = { { "Double", new DoubleGreaterVerifier(5.0), Optional::No } }
     };
 
     ghoul::Dictionary positive;
     positive.setValue("Double", 10.0);
-    TestResult positiveRes = testSpecification(doc, positive);
+    const TestResult positiveRes = testSpecification(doc, positive);
     CHECK(positiveRes.success);
     CHECK(positiveRes.offenses.empty());
 
     ghoul::Dictionary negative;
     negative.setValue("Double", 0.0);
-    TestResult negativeRes = testSpecification(doc, negative);
+    const TestResult negativeRes = testSpecification(doc, negative);
     CHECK_FALSE(negativeRes.success);
     REQUIRE(negativeRes.offenses.size() == 1);
     CHECK(negativeRes.offenses[0].offender == "Double");
@@ -1408,7 +1406,7 @@ TEST_CASE("Documentation: Greater Double", "[documentation]") {
 TEST_CASE("Documentation: GreaterEqual Int", "[documentation]") {
     using namespace openspace::documentation;
 
-    Documentation doc = {
+    const Documentation doc = {
         .entries = { { "Int", new IntGreaterEqualVerifier(5), Optional::No } }
     };
 
@@ -1426,7 +1424,7 @@ TEST_CASE("Documentation: GreaterEqual Int", "[documentation]") {
 
     ghoul::Dictionary negative;
     negative.setValue("Int", 0.0);
-    TestResult negativeRes = testSpecification(doc, negative);
+    const TestResult negativeRes = testSpecification(doc, negative);
     CHECK_FALSE(negativeRes.success);
     REQUIRE(negativeRes.offenses.size() == 1);
     CHECK(negativeRes.offenses[0].offender == "Int");
@@ -1436,7 +1434,7 @@ TEST_CASE("Documentation: GreaterEqual Int", "[documentation]") {
 TEST_CASE("Documentation: GreaterEqual Double", "[documentation]") {
     using namespace openspace::documentation;
 
-    Documentation doc = {
+    const Documentation doc = {
         .entries = { { "Double", new DoubleGreaterEqualVerifier(5.0), Optional::No } }
     };
 
@@ -1454,7 +1452,7 @@ TEST_CASE("Documentation: GreaterEqual Double", "[documentation]") {
 
     ghoul::Dictionary negative;
     negative.setValue("Double", 0.0);
-    TestResult negativeRes = testSpecification(doc, negative);
+    const TestResult negativeRes = testSpecification(doc, negative);
     CHECK_FALSE(negativeRes.success);
     REQUIRE(negativeRes.offenses.size() == 1);
     CHECK(negativeRes.offenses[0].offender == "Double");
@@ -1464,19 +1462,19 @@ TEST_CASE("Documentation: GreaterEqual Double", "[documentation]") {
 TEST_CASE("Documentation: Equal Bool", "[documentation]") {
     using namespace openspace::documentation;
 
-    Documentation doc = {
+    const Documentation doc = {
         .entries = { { "Bool", new BoolEqualVerifier(true), Optional::No } }
     };
 
     ghoul::Dictionary positive;
     positive.setValue("Bool", true);
-    TestResult positiveRes = testSpecification(doc, positive);
+    const TestResult positiveRes = testSpecification(doc, positive);
     CHECK(positiveRes.success);
     CHECK(positiveRes.offenses.empty());
 
     ghoul::Dictionary negative;
     negative.setValue("Bool", false);
-    TestResult negativeRes = testSpecification(doc, negative);
+    const TestResult negativeRes = testSpecification(doc, negative);
     CHECK_FALSE(negativeRes.success);
     REQUIRE(negativeRes.offenses.size() == 1);
     CHECK(negativeRes.offenses[0].offender == "Bool");
@@ -1486,19 +1484,19 @@ TEST_CASE("Documentation: Equal Bool", "[documentation]") {
 TEST_CASE("Documentation: Equal Int", "[documentation]") {
     using namespace openspace::documentation;
 
-    Documentation doc = {
+    const Documentation doc = {
         .entries = { { "Int", new IntEqualVerifier(1), Optional::No } }
     };
 
     ghoul::Dictionary positive;
     positive.setValue("Int", 1.0);
-    TestResult positiveRes = testSpecification(doc, positive);
+    const TestResult positiveRes = testSpecification(doc, positive);
     CHECK(positiveRes.success);
     CHECK(positiveRes.offenses.empty());
 
     ghoul::Dictionary negative;
     negative.setValue("Int", 0.0);
-    TestResult negativeRes = testSpecification(doc, negative);
+    const TestResult negativeRes = testSpecification(doc, negative);
     CHECK_FALSE(negativeRes.success);
     REQUIRE(negativeRes.offenses.size() == 1);
     CHECK(negativeRes.offenses[0].offender == "Int");
@@ -1508,19 +1506,19 @@ TEST_CASE("Documentation: Equal Int", "[documentation]") {
 TEST_CASE("Documentation: Equal Double", "[documentation]") {
     using namespace openspace::documentation;
 
-    Documentation doc = {
+    const Documentation doc = {
         .entries = { { "Double", new DoubleEqualVerifier(1.0), Optional::No } }
     };
 
     ghoul::Dictionary positive;
     positive.setValue("Double", 1.0);
-    TestResult positiveRes = testSpecification(doc, positive);
+    const TestResult positiveRes = testSpecification(doc, positive);
     CHECK(positiveRes.success);
     CHECK(positiveRes.offenses.empty());
 
     ghoul::Dictionary negative;
     negative.setValue("Double", 0.0);
-    TestResult negativeRes = testSpecification(doc, negative);
+    const TestResult negativeRes = testSpecification(doc, negative);
     CHECK_FALSE(negativeRes.success);
     REQUIRE(negativeRes.offenses.size() == 1);
     CHECK(negativeRes.offenses[0].offender == "Double");
@@ -1531,19 +1529,19 @@ TEST_CASE("Documentation: Equal String", "[documentation]") {
     using namespace openspace::documentation;
     using namespace std::string_literals;
 
-    Documentation doc = {
+    const Documentation doc = {
         .entries = { { "String", new StringEqualVerifier("string"s), Optional::No } }
     };
 
     ghoul::Dictionary positive;
     positive.setValue("String", "string"s);
-    TestResult positiveRes = testSpecification(doc, positive);
+    const TestResult positiveRes = testSpecification(doc, positive);
     CHECK(positiveRes.success);
     CHECK(positiveRes.offenses.empty());
 
     ghoul::Dictionary negative;
     negative.setValue("String", "no_string"s);
-    TestResult negativeRes = testSpecification(doc, negative);
+    const TestResult negativeRes = testSpecification(doc, negative);
     CHECK_FALSE(negativeRes.success);
     REQUIRE(negativeRes.offenses.size() == 1);
     CHECK(negativeRes.offenses[0].offender == "String");
@@ -1553,19 +1551,19 @@ TEST_CASE("Documentation: Equal String", "[documentation]") {
 TEST_CASE("Documentation: Unequal Bool", "[documentation]") {
     using namespace openspace::documentation;
 
-    Documentation doc = {
+    const Documentation doc = {
         .entries = { { "Bool", new BoolUnequalVerifier(true), Optional::No } }
     };
 
     ghoul::Dictionary positive;
     positive.setValue("Bool", false);
-    TestResult positiveRes = testSpecification(doc, positive);
+    const TestResult positiveRes = testSpecification(doc, positive);
     CHECK(positiveRes.success);
     CHECK(positiveRes.offenses.empty());
 
     ghoul::Dictionary negative;
     negative.setValue("Bool", true);
-    TestResult negativeRes = testSpecification(doc, negative);
+    const TestResult negativeRes = testSpecification(doc, negative);
     CHECK_FALSE(negativeRes.success);
     REQUIRE(negativeRes.offenses.size() == 1);
     CHECK(negativeRes.offenses[0].offender == "Bool");
@@ -1575,19 +1573,19 @@ TEST_CASE("Documentation: Unequal Bool", "[documentation]") {
 TEST_CASE("Documentation: Unequal Int", "[documentation]") {
     using namespace openspace::documentation;
 
-    Documentation doc = {
+    const Documentation doc = {
         .entries = { { "Int", new IntUnequalVerifier(1), Optional::No } }
     };
 
     ghoul::Dictionary positive;
     positive.setValue("Int", 0.0);
-    TestResult positiveRes = testSpecification(doc, positive);
+    const TestResult positiveRes = testSpecification(doc, positive);
     CHECK(positiveRes.success);
     CHECK(positiveRes.offenses.empty());
 
     ghoul::Dictionary negative;
     negative.setValue("Int", 1.0);
-    TestResult negativeRes = testSpecification(doc, negative);
+    const TestResult negativeRes = testSpecification(doc, negative);
     CHECK_FALSE(negativeRes.success);
     REQUIRE(negativeRes.offenses.size() == 1);
     CHECK(negativeRes.offenses[0].offender == "Int");
@@ -1597,19 +1595,19 @@ TEST_CASE("Documentation: Unequal Int", "[documentation]") {
 TEST_CASE("Documentation: Unequal Double", "[documentation]") {
     using namespace openspace::documentation;
 
-    Documentation doc = {
+    const Documentation doc = {
         .entries = { { "Double", new DoubleUnequalVerifier(1.0), Optional::No } }
     };
 
     ghoul::Dictionary positive;
     positive.setValue("Double", 0.0);
-    TestResult positiveRes = testSpecification(doc, positive);
+    const TestResult positiveRes = testSpecification(doc, positive);
     CHECK(positiveRes.success);
     CHECK(positiveRes.offenses.empty());
 
     ghoul::Dictionary negative;
     negative.setValue("Double", 1.0);
-    TestResult negativeRes = testSpecification(doc, negative);
+    const TestResult negativeRes = testSpecification(doc, negative);
     CHECK_FALSE(negativeRes.success);
     REQUIRE(negativeRes.offenses.size() == 1);
     CHECK(negativeRes.offenses[0].offender == "Double");
@@ -1620,19 +1618,19 @@ TEST_CASE("Documentation: Unequal String", "[documentation]") {
     using namespace openspace::documentation;
     using namespace std::string_literals;
 
-    Documentation doc = {
+    const Documentation doc = {
         .entries = { { "String", new StringUnequalVerifier("string"s), Optional::No } }
     };
 
     ghoul::Dictionary positive;
     positive.setValue("String", "no_string"s);
-    TestResult positiveRes = testSpecification(doc, positive);
+    const TestResult positiveRes = testSpecification(doc, positive);
     CHECK(positiveRes.success);
     CHECK(positiveRes.offenses.empty());
 
     ghoul::Dictionary negative;
     negative.setValue("String", "string"s);
-    TestResult negativeRes = testSpecification(doc, negative);
+    const TestResult negativeRes = testSpecification(doc, negative);
     CHECK_FALSE(negativeRes.success);
     REQUIRE(negativeRes.offenses.size() == 1);
     CHECK(negativeRes.offenses[0].offender == "String");
@@ -1642,19 +1640,19 @@ TEST_CASE("Documentation: Unequal String", "[documentation]") {
 TEST_CASE("Documentation: List Bool", "[documentation]") {
     using namespace openspace::documentation;
 
-    Documentation doc = {
+    const Documentation doc = {
         .entries = { { "Bool" , new BoolInListVerifier({ true }), Optional::No } }
     };
 
     ghoul::Dictionary positive;
     positive.setValue("Bool", true);
-    TestResult positiveRes = testSpecification(doc, positive);
+    const TestResult positiveRes = testSpecification(doc, positive);
     CHECK(positiveRes.success);
     CHECK(positiveRes.offenses.empty());
 
     ghoul::Dictionary negative;
     negative.setValue("Bool", false);
-    TestResult negativeRes = testSpecification(doc, negative);
+    const TestResult negativeRes = testSpecification(doc, negative);
     CHECK_FALSE(negativeRes.success);
     REQUIRE(negativeRes.offenses.size() == 1);
     CHECK(negativeRes.offenses[0].offender == "Bool");
@@ -1664,7 +1662,7 @@ TEST_CASE("Documentation: List Bool", "[documentation]") {
 TEST_CASE("Documentation: List Int", "[documentation]") {
     using namespace openspace::documentation;
 
-    Documentation doc = {
+    const Documentation doc = {
         .entries = { { "Int" , new IntInListVerifier({ 0, 1, 2 }), Optional::No } }
     };
 
@@ -1682,7 +1680,7 @@ TEST_CASE("Documentation: List Int", "[documentation]") {
 
     ghoul::Dictionary negative;
     negative.setValue("Int", 5.0);
-    TestResult negativeRes = testSpecification(doc, negative);
+    const TestResult negativeRes = testSpecification(doc, negative);
     CHECK_FALSE(negativeRes.success);
     REQUIRE(negativeRes.offenses.size() == 1);
     CHECK(negativeRes.offenses[0].offender == "Int");
@@ -1692,7 +1690,7 @@ TEST_CASE("Documentation: List Int", "[documentation]") {
 TEST_CASE("Documentation: List Double", "[documentation]") {
     using namespace openspace::documentation;
 
-    Documentation doc = {
+    const Documentation doc = {
         .entries = {
             { "Double" , new DoubleInListVerifier({ 0.0, 1.0, 2.0 }), Optional::No }
         }
@@ -1712,7 +1710,7 @@ TEST_CASE("Documentation: List Double", "[documentation]") {
 
     ghoul::Dictionary negative;
     negative.setValue("Double", 5.0);
-    TestResult negativeRes = testSpecification(doc, negative);
+    const TestResult negativeRes = testSpecification(doc, negative);
     CHECK_FALSE(negativeRes.success);
     REQUIRE(negativeRes.offenses.size() == 1);
     CHECK(negativeRes.offenses[0].offender == "Double");
@@ -1723,7 +1721,7 @@ TEST_CASE("Documentation: List String", "[documentation]") {
     using namespace openspace::documentation;
     using namespace std::string_literals;
 
-    Documentation doc = {
+    const Documentation doc = {
         .entries = {
             { "String" , new StringInListVerifier({ "0"s, "1"s, "2"s }), Optional::No }
         }
@@ -1753,19 +1751,19 @@ TEST_CASE("Documentation: List String", "[documentation]") {
 TEST_CASE("Documentation: NotList Bool", "[documentation]") {
     using namespace openspace::documentation;
 
-    Documentation doc = {
+    const Documentation doc = {
         .entries = { { "Bool" , new BoolNotInListVerifier({ true }), Optional::No } }
     };
 
     ghoul::Dictionary positive;
     positive.setValue("Bool", false);
-    TestResult positiveRes = testSpecification(doc, positive);
+    const TestResult positiveRes = testSpecification(doc, positive);
     CHECK(positiveRes.success);
     CHECK(positiveRes.offenses.empty());
 
     ghoul::Dictionary negative;
     negative.setValue("Bool", true);
-    TestResult negativeRes = testSpecification(doc, negative);
+    const TestResult negativeRes = testSpecification(doc, negative);
     CHECK_FALSE(negativeRes.success);
     REQUIRE(negativeRes.offenses.size() == 1);
     CHECK(negativeRes.offenses[0].offender == "Bool");
@@ -1775,7 +1773,7 @@ TEST_CASE("Documentation: NotList Bool", "[documentation]") {
 TEST_CASE("Documentation: NotList Int", "[documentation]") {
     using namespace openspace::documentation;
 
-    Documentation doc = {
+    const Documentation doc = {
         .entries = { { "Int" , new IntNotInListVerifier({ 0, 1, 2 }), Optional::No } }
     };
 
@@ -1793,7 +1791,7 @@ TEST_CASE("Documentation: NotList Int", "[documentation]") {
 
     ghoul::Dictionary negative;
     negative.setValue("Int", 2.0);
-    TestResult negativeRes = testSpecification(doc, negative);
+    const TestResult negativeRes = testSpecification(doc, negative);
     CHECK_FALSE(negativeRes.success);
     REQUIRE(negativeRes.offenses.size() == 1);
     CHECK(negativeRes.offenses[0].offender == "Int");
@@ -1803,7 +1801,7 @@ TEST_CASE("Documentation: NotList Int", "[documentation]") {
 TEST_CASE("Documentation: NotList Double", "[documentation]") {
     using namespace openspace::documentation;
 
-    Documentation doc = {
+    const Documentation doc = {
         .entries = {
             { "Double" , new DoubleNotInListVerifier({ 0.0, 1.0, 2.0 }), Optional::No }
         }
@@ -1823,7 +1821,7 @@ TEST_CASE("Documentation: NotList Double", "[documentation]") {
 
     ghoul::Dictionary negative;
     negative.setValue("Double", 1.0);
-    TestResult negativeRes = testSpecification(doc, negative);
+    const TestResult negativeRes = testSpecification(doc, negative);
     CHECK_FALSE(negativeRes.success);
     REQUIRE(negativeRes.offenses.size() == 1);
     CHECK(negativeRes.offenses[0].offender == "Double");
@@ -1834,7 +1832,7 @@ TEST_CASE("Documentation: NotList String", "[documentation]") {
     using namespace openspace::documentation;
     using namespace std::string_literals;
 
-    Documentation doc = {
+    const Documentation doc = {
         .entries = {
             { "String" , new StringNotInListVerifier({ "0"s, "1"s, "2"s }), Optional::No }
         }
@@ -1854,7 +1852,7 @@ TEST_CASE("Documentation: NotList String", "[documentation]") {
 
     ghoul::Dictionary negative;
     negative.setValue("String", "1"s);
-    TestResult negativeRes = testSpecification(doc, negative);
+    const TestResult negativeRes = testSpecification(doc, negative);
     CHECK_FALSE(negativeRes.success);
     REQUIRE(negativeRes.offenses.size() == 1);
     CHECK(negativeRes.offenses[0].offender == "String");
@@ -1864,19 +1862,19 @@ TEST_CASE("Documentation: NotList String", "[documentation]") {
 TEST_CASE("Documentation: Annotation Bool", "[documentation]") {
     using namespace openspace::documentation;
 
-    Documentation doc = {
+    const Documentation doc = {
         .entries = { { "Bool", new BoolAnnotationVerifier("Bool"), Optional::No } }
     };
 
     ghoul::Dictionary positive;
     positive.setValue("Bool", true);
-    TestResult positiveRes = testSpecification(doc, positive);
+    const TestResult positiveRes = testSpecification(doc, positive);
     CHECK(positiveRes.success);
     CHECK(positiveRes.offenses.empty());
 
     ghoul::Dictionary negative;
     negative.setValue("Bool", 0);
-    TestResult negativeRes = testSpecification(doc, negative);
+    const TestResult negativeRes = testSpecification(doc, negative);
     CHECK_FALSE(negativeRes.success);
     REQUIRE(negativeRes.offenses.size() == 1);
     CHECK(negativeRes.offenses[0].offender == "Bool");
@@ -1886,19 +1884,19 @@ TEST_CASE("Documentation: Annotation Bool", "[documentation]") {
 TEST_CASE("Documentation: Annotation Int", "[documentation]") {
     using namespace openspace::documentation;
 
-    Documentation doc = {
+    const Documentation doc = {
         .entries = { { "Int", new IntAnnotationVerifier("Int"), Optional::No } }
     };
 
     ghoul::Dictionary positive;
     positive.setValue("Int", 1.0);
-    TestResult positiveRes = testSpecification(doc, positive);
+    const TestResult positiveRes = testSpecification(doc, positive);
     CHECK(positiveRes.success);
     CHECK(positiveRes.offenses.empty());
 
     ghoul::Dictionary negative;
     negative.setValue("Int", 1.1);
-    TestResult negativeRes = testSpecification(doc, negative);
+    const TestResult negativeRes = testSpecification(doc, negative);
     CHECK_FALSE(negativeRes.success);
     REQUIRE(negativeRes.offenses.size() == 1);
     CHECK(negativeRes.offenses[0].offender == "Int");
@@ -1908,19 +1906,19 @@ TEST_CASE("Documentation: Annotation Int", "[documentation]") {
 TEST_CASE("Documentation: Annotation Double", "[documentation]") {
     using namespace openspace::documentation;
 
-    Documentation doc = {
+    const Documentation doc = {
         .entries = { { "Double", new DoubleAnnotationVerifier("Double"), Optional::No } }
     };
 
     ghoul::Dictionary positive;
     positive.setValue("Double", 0.0);
-    TestResult positiveRes = testSpecification(doc, positive);
+    const TestResult positiveRes = testSpecification(doc, positive);
     CHECK(positiveRes.success);
     CHECK(positiveRes.offenses.empty());
 
     ghoul::Dictionary negative;
     negative.setValue("Double", true);
-    TestResult negativeRes = testSpecification(doc, negative);
+    const TestResult negativeRes = testSpecification(doc, negative);
     CHECK_FALSE(negativeRes.success);
     REQUIRE(negativeRes.offenses.size() == 1);
     CHECK(negativeRes.offenses[0].offender == "Double");
@@ -1931,19 +1929,19 @@ TEST_CASE("Documentation: Annotation String", "[documentation]") {
     using namespace openspace::documentation;
     using namespace std::string_literals;
 
-    Documentation doc = {
+    const Documentation doc = {
         .entries = { { "String", new StringAnnotationVerifier("String"), Optional::No } }
     };
 
     ghoul::Dictionary positive;
     positive.setValue("String", ""s);
-    TestResult positiveRes = testSpecification(doc, positive);
+    const TestResult positiveRes = testSpecification(doc, positive);
     CHECK(positiveRes.success);
     CHECK(positiveRes.offenses.empty());
 
     ghoul::Dictionary negative;
     negative.setValue("String", 1);
-    TestResult negativeRes = testSpecification(doc, negative);
+    const TestResult negativeRes = testSpecification(doc, negative);
     CHECK_FALSE(negativeRes.success);
     REQUIRE(negativeRes.offenses.size() == 1);
     CHECK(negativeRes.offenses[0].offender == "String");
@@ -1953,19 +1951,19 @@ TEST_CASE("Documentation: Annotation String", "[documentation]") {
 TEST_CASE("Documentation: Annotation Table", "[documentation]") {
     using namespace openspace::documentation;
 
-    Documentation doc = {
+    const Documentation doc = {
         .entries = { { "Table", new TableAnnotationVerifier("Table"), Optional::No } }
     };
 
     ghoul::Dictionary positive;
     positive.setValue("Table", ghoul::Dictionary());
-    TestResult positiveRes = testSpecification(doc, positive);
+    const TestResult positiveRes = testSpecification(doc, positive);
     CHECK(positiveRes.success);
     CHECK(positiveRes.offenses.empty());
 
     ghoul::Dictionary negative;
     negative.setValue("Table", 1);
-    TestResult negativeRes = testSpecification(doc, negative);
+    const TestResult negativeRes = testSpecification(doc, negative);
     CHECK_FALSE(negativeRes.success);
     REQUIRE(negativeRes.offenses.size() == 1);
     CHECK(negativeRes.offenses[0].offender == "Table");
@@ -1975,7 +1973,7 @@ TEST_CASE("Documentation: Annotation Table", "[documentation]") {
 TEST_CASE("Documentation: InRange Int", "[documentation]") {
     using namespace openspace::documentation;
 
-    Documentation doc = {
+    const Documentation doc = {
         .entries = { { "Int", new InRangeVerifier<IntVerifier>(0, 5), Optional::No } }
     };
 
@@ -1999,7 +1997,7 @@ TEST_CASE("Documentation: InRange Int", "[documentation]") {
 
     ghoul::Dictionary negative;
     negative.setValue("Int", 10.0);
-    TestResult negativeRes = testSpecification(doc, negative);
+    const TestResult negativeRes = testSpecification(doc, negative);
     CHECK_FALSE(negativeRes.success);
     REQUIRE(negativeRes.offenses.size() == 1);
     CHECK(negativeRes.offenses[0].offender == "Int");
@@ -2009,7 +2007,7 @@ TEST_CASE("Documentation: InRange Int", "[documentation]") {
 TEST_CASE("Documentation: InRange Double", "[documentation]") {
     using namespace openspace::documentation;
 
-    Documentation doc = {
+    const Documentation doc = {
         .entries = {
             { "Double", new InRangeVerifier<DoubleVerifier>(0.0, 5.0), Optional::No }
         }
@@ -2041,7 +2039,7 @@ TEST_CASE("Documentation: InRange Double", "[documentation]") {
 
     ghoul::Dictionary negative;
     negative.setValue("Double", 10.0);
-    TestResult negativeRes = testSpecification(doc, negative);
+    const TestResult negativeRes = testSpecification(doc, negative);
     CHECK_FALSE(negativeRes.success);
     REQUIRE(negativeRes.offenses.size() == 1);
     CHECK(negativeRes.offenses[0].offender == "Double");
@@ -2051,7 +2049,7 @@ TEST_CASE("Documentation: InRange Double", "[documentation]") {
 TEST_CASE("Documentation: NotInRange Int", "[documentation]") {
     using namespace openspace::documentation;
 
-    Documentation doc = {
+    const Documentation doc = {
         .entries = { { "Int", new NotInRangeVerifier<IntVerifier>(0, 5), Optional::No } }
     };
 
@@ -2095,7 +2093,7 @@ TEST_CASE("Documentation: NotInRange Int", "[documentation]") {
 TEST_CASE("Documentation: NotInRange Double", "[documentation]") {
     using namespace openspace::documentation;
 
-    Documentation doc = {
+    const Documentation doc = {
         .entries = {
             { "Double", new NotInRangeVerifier<DoubleVerifier>(0.0, 5.0), Optional::No }
         }
@@ -2141,7 +2139,7 @@ TEST_CASE("Documentation: NotInRange Double", "[documentation]") {
 TEST_CASE("Documentation: Wildcard", "[documentation]") {
     using namespace openspace::documentation;
 
-    Documentation doc = {
+    const Documentation doc = {
         .entries = { { DocumentationEntry::Wildcard, new IntVerifier, Optional::No } }
     };
 
@@ -2149,7 +2147,7 @@ TEST_CASE("Documentation: Wildcard", "[documentation]") {
     positive.setValue("a", 1);
     positive.setValue("b", 2);
     positive.setValue("c", 3);
-    TestResult positiveRes = testSpecification(doc, positive);
+    const TestResult positiveRes = testSpecification(doc, positive);
     CHECK(positiveRes.success);
     CHECK(positiveRes.offenses.empty());
 
@@ -2193,7 +2191,7 @@ TEST_CASE("Documentation: Wildcard", "[documentation]") {
 TEST_CASE("Documentation: Wildcard Mixed", "[documentation]") {
     using namespace openspace::documentation;
 
-    Documentation doc = {
+    const Documentation doc = {
         .entries = {
             { DocumentationEntry::Wildcard, new IntVerifier, Optional::No },
             { "b", new IntGreaterVerifier(5), Optional::No }
@@ -2204,7 +2202,7 @@ TEST_CASE("Documentation: Wildcard Mixed", "[documentation]") {
     positive.setValue("a", 1.0);
     positive.setValue("b", 8.0);
     positive.setValue("c", 3.0);
-    TestResult positiveRes = testSpecification(doc, positive);
+    const TestResult positiveRes = testSpecification(doc, positive);
     CHECK(positiveRes.success);
     CHECK(positiveRes.offenses.empty());
 
@@ -2262,7 +2260,7 @@ TEST_CASE("Documentation: Wildcard Mixed", "[documentation]") {
 TEST_CASE("Documentation: Referencing", "[documentation]") {
     using namespace openspace::documentation;
 
-    Documentation referenced = {
+    const Documentation referenced = {
         "Referenced Name",
         "referenced_id",
         "",
@@ -2273,7 +2271,7 @@ TEST_CASE("Documentation: Referencing", "[documentation]") {
     };
     DocEng.addDocumentation(referenced);
 
-    Documentation doc = {
+    const Documentation doc = {
         .entries = {
             { "Table", new ReferencingVerifier("referenced_id"), Optional::No }
         }
@@ -2286,7 +2284,7 @@ TEST_CASE("Documentation: Referencing", "[documentation]") {
         inner.setValue("b", 2.0);
         positive.setValue("Table", inner);
     };
-    TestResult positiveRes = testSpecification(doc, positive);
+    const TestResult positiveRes = testSpecification(doc, positive);
     CHECK(positiveRes.success);
     CHECK(positiveRes.offenses.empty());
 
@@ -2337,7 +2335,7 @@ TEST_CASE("Documentation: OrOperator", "[documentation]") {
     using namespace openspace::documentation;
     using namespace std::string_literals;
 
-    Documentation doc = {
+    const Documentation doc = {
         .entries = {
             { "a", new OrVerifier({ new StringVerifier, new IntVerifier }), Optional::No }
         }
@@ -2357,7 +2355,7 @@ TEST_CASE("Documentation: OrOperator", "[documentation]") {
 
     ghoul::Dictionary negative;
     negative.setValue("a", false);
-    TestResult negativeRes = testSpecification(doc, negative);
+    const TestResult negativeRes = testSpecification(doc, negative);
     CHECK_FALSE(negativeRes.success);
     REQUIRE(negativeRes.offenses.size() == 1);
     CHECK(negativeRes.offenses[0].offender == "a");
@@ -2367,7 +2365,7 @@ TEST_CASE("Documentation: OrOperator", "[documentation]") {
 TEST_CASE("Documentation: IntVector2Verifier", "[documentation]") {
     using namespace openspace::documentation;
 
-    Documentation doc = {
+    const Documentation doc = {
         .entries = {
             { "a", new IntVector2Verifier, Optional::No }
         }
@@ -2375,7 +2373,7 @@ TEST_CASE("Documentation: IntVector2Verifier", "[documentation]") {
 
     ghoul::Dictionary positive;
     positive.setValue("a", glm::ivec2(2));
-    TestResult positiveRes = testSpecification(doc, positive);
+    const TestResult positiveRes = testSpecification(doc, positive);
     CHECK(positiveRes.success);
     CHECK(positiveRes.offenses.empty());
 
@@ -2404,7 +2402,7 @@ TEST_CASE("Documentation: IntVector2Verifier", "[documentation]") {
 TEST_CASE("Documentation: DoubleVector2Verifier", "[documentation]") {
     using namespace openspace::documentation;
 
-    Documentation doc = {
+    const Documentation doc = {
         .entries = {
             { "a", new DoubleVector2Verifier, Optional::No }
         }
@@ -2412,7 +2410,7 @@ TEST_CASE("Documentation: DoubleVector2Verifier", "[documentation]") {
 
     ghoul::Dictionary positive;
     positive.setValue("a", glm::dvec2(2.0));
-    TestResult positiveRes = testSpecification(doc, positive);
+    const TestResult positiveRes = testSpecification(doc, positive);
     CHECK(positiveRes.success);
     CHECK(positiveRes.offenses.empty());
 
@@ -2442,7 +2440,7 @@ TEST_CASE("Documentation: IntVector3Verifier", "[documentation]") {
     using namespace openspace::documentation;
     using namespace std::string_literals;
 
-    Documentation doc = {
+    const Documentation doc = {
         .entries = {
             { "a", new IntVector3Verifier, Optional::No }
         }
@@ -2450,7 +2448,7 @@ TEST_CASE("Documentation: IntVector3Verifier", "[documentation]") {
 
     ghoul::Dictionary positive;
     positive.setValue("a", glm::ivec3(2));
-    TestResult positiveRes = testSpecification(doc, positive);
+    const TestResult positiveRes = testSpecification(doc, positive);
     CHECK(positiveRes.success);
     CHECK(positiveRes.offenses.empty());
 
@@ -2481,7 +2479,7 @@ TEST_CASE("Documentation: DoubleVector3Verifier", "[documentation]") {
     using namespace openspace::documentation;
     using namespace std::string_literals;
 
-    Documentation doc = {
+    const Documentation doc = {
         .entries = {
             { "a", new DoubleVector3Verifier, Optional::No }
         }
@@ -2489,7 +2487,7 @@ TEST_CASE("Documentation: DoubleVector3Verifier", "[documentation]") {
 
     ghoul::Dictionary positive;
     positive.setValue("a", glm::dvec3(2.0));
-    TestResult positiveRes = testSpecification(doc, positive);
+    const TestResult positiveRes = testSpecification(doc, positive);
     CHECK(positiveRes.success);
     CHECK(positiveRes.offenses.empty());
 
@@ -2520,7 +2518,7 @@ TEST_CASE("Documentation: IntVector4Verifier", "[documentation]") {
     using namespace openspace::documentation;
     using namespace std::string_literals;
 
-    Documentation doc = {
+    const Documentation doc = {
         .entries = {
             { "a", new IntVector4Verifier, Optional::No }
         }
@@ -2528,7 +2526,7 @@ TEST_CASE("Documentation: IntVector4Verifier", "[documentation]") {
 
     ghoul::Dictionary positive;
     positive.setValue("a", glm::ivec4(2));
-    TestResult positiveRes = testSpecification(doc, positive);
+    const TestResult positiveRes = testSpecification(doc, positive);
     CHECK(positiveRes.success);
     CHECK(positiveRes.offenses.empty());
 
@@ -2560,7 +2558,7 @@ TEST_CASE("Documentation: DoubleVector4Verifier", "[documentation]") {
     using namespace openspace::documentation;
     using namespace std::string_literals;
 
-    Documentation doc = {
+    const Documentation doc = {
         .entries = {
             { "a", new DoubleVector4Verifier, Optional::No }
         }
@@ -2568,7 +2566,7 @@ TEST_CASE("Documentation: DoubleVector4Verifier", "[documentation]") {
 
     ghoul::Dictionary positive;
     positive.setValue("a", glm::dvec4(2.0));
-    TestResult positiveRes = testSpecification(doc, positive);
+    const TestResult positiveRes = testSpecification(doc, positive);
     CHECK(positiveRes.success);
     CHECK(positiveRes.offenses.empty());
 
@@ -2600,7 +2598,7 @@ TEST_CASE("Documentation: DoubleMatrix2x2Verifier", "[documentation]") {
     using namespace openspace::documentation;
     using namespace std::string_literals;
 
-    Documentation doc = {
+    const Documentation doc = {
         .entries = {
             { "a", new DoubleMatrix2x2Verifier, Optional::No }
         }
@@ -2608,7 +2606,7 @@ TEST_CASE("Documentation: DoubleMatrix2x2Verifier", "[documentation]") {
 
     ghoul::Dictionary positive;
     positive.setValue("a", glm::dmat2x2(1.0));
-    TestResult positiveRes = testSpecification(doc, positive);
+    const TestResult positiveRes = testSpecification(doc, positive);
     CHECK(positiveRes.success);
     CHECK(positiveRes.offenses.empty());
 
@@ -2639,7 +2637,7 @@ TEST_CASE("Documentation: DoubleMatrix2x3Verifier", "[documentation]") {
     using namespace openspace::documentation;
     using namespace std::string_literals;
 
-    Documentation doc = {
+    const Documentation doc = {
         .entries = {
             { "a", new DoubleMatrix2x3Verifier, Optional::No }
         }
@@ -2647,7 +2645,7 @@ TEST_CASE("Documentation: DoubleMatrix2x3Verifier", "[documentation]") {
 
     ghoul::Dictionary positive;
     positive.setValue("a", glm::dmat2x3(1.0));
-    TestResult positiveRes = testSpecification(doc, positive);
+    const TestResult positiveRes = testSpecification(doc, positive);
     CHECK(positiveRes.success);
     CHECK(positiveRes.offenses.empty());
 
@@ -2678,7 +2676,7 @@ TEST_CASE("Documentation: DoubleMatrix2x4Verifier", "[documentation]") {
     using namespace openspace::documentation;
     using namespace std::string_literals;
 
-    Documentation doc = {
+    const Documentation doc = {
         .entries = {
             { "a", new DoubleMatrix2x4Verifier, Optional::No }
         }
@@ -2686,7 +2684,7 @@ TEST_CASE("Documentation: DoubleMatrix2x4Verifier", "[documentation]") {
 
     ghoul::Dictionary positive;
     positive.setValue("a", glm::dmat2x4(1.0));
-    TestResult positiveRes = testSpecification(doc, positive);
+    const TestResult positiveRes = testSpecification(doc, positive);
     CHECK(positiveRes.success);
     CHECK(positiveRes.offenses.empty());
 
@@ -2717,7 +2715,7 @@ TEST_CASE("Documentation: DoubleMatrix3x2Verifier", "[documentation]") {
     using namespace openspace::documentation;
     using namespace std::string_literals;
 
-    Documentation doc = {
+    const Documentation doc = {
         .entries = {
             { "a", new DoubleMatrix3x2Verifier, Optional::No }
         }
@@ -2725,7 +2723,7 @@ TEST_CASE("Documentation: DoubleMatrix3x2Verifier", "[documentation]") {
 
     ghoul::Dictionary positive;
     positive.setValue("a", glm::dmat3x2(1.0));
-    TestResult positiveRes = testSpecification(doc, positive);
+    const TestResult positiveRes = testSpecification(doc, positive);
     CHECK(positiveRes.success);
     CHECK(positiveRes.offenses.empty());
 
@@ -2756,7 +2754,7 @@ TEST_CASE("Documentation: DoubleMatrix3x3Verifier", "[documentation]") {
     using namespace openspace::documentation;
     using namespace std::string_literals;
 
-    Documentation doc = {
+    const Documentation doc = {
         .entries = {
             { "a", new DoubleMatrix3x3Verifier, Optional::No }
         }
@@ -2764,7 +2762,7 @@ TEST_CASE("Documentation: DoubleMatrix3x3Verifier", "[documentation]") {
 
     ghoul::Dictionary positive;
     positive.setValue("a", glm::dmat3x3(1.0));
-    TestResult positiveRes = testSpecification(doc, positive);
+    const TestResult positiveRes = testSpecification(doc, positive);
     CHECK(positiveRes.success);
     CHECK(positiveRes.offenses.empty());
 
@@ -2795,7 +2793,7 @@ TEST_CASE("Documentation: DoubleMatrix3x4Verifier", "[documentation]") {
     using namespace openspace::documentation;
     using namespace std::string_literals;
 
-    Documentation doc = {
+    const Documentation doc = {
         .entries = {
             { "a", new DoubleMatrix3x4Verifier, Optional::No }
         }
@@ -2803,7 +2801,7 @@ TEST_CASE("Documentation: DoubleMatrix3x4Verifier", "[documentation]") {
 
     ghoul::Dictionary positive;
     positive.setValue("a", glm::dmat3x4(1.0));
-    TestResult positiveRes = testSpecification(doc, positive);
+    const TestResult positiveRes = testSpecification(doc, positive);
     CHECK(positiveRes.success);
     CHECK(positiveRes.offenses.empty());
 
@@ -2834,7 +2832,7 @@ TEST_CASE("Documentation: DoubleMatrix4x2Verifier", "[documentation]") {
     using namespace openspace::documentation;
     using namespace std::string_literals;
 
-    Documentation doc = {
+    const Documentation doc = {
         .entries = {
             { "a", new DoubleMatrix4x2Verifier, Optional::No }
         }
@@ -2842,7 +2840,7 @@ TEST_CASE("Documentation: DoubleMatrix4x2Verifier", "[documentation]") {
 
     ghoul::Dictionary positive;
     positive.setValue("a", glm::dmat4x2(1.0));
-    TestResult positiveRes = testSpecification(doc, positive);
+    const TestResult positiveRes = testSpecification(doc, positive);
     CHECK(positiveRes.success);
     CHECK(positiveRes.offenses.empty());
 
@@ -2873,7 +2871,7 @@ TEST_CASE("Documentation: DoubleMatrix4x3Verifier", "[documentation]") {
     using namespace openspace::documentation;
     using namespace std::string_literals;
 
-    Documentation doc = {
+    const Documentation doc = {
         .entries = {
             { "a", new DoubleMatrix4x3Verifier, Optional::No }
         }
@@ -2881,7 +2879,7 @@ TEST_CASE("Documentation: DoubleMatrix4x3Verifier", "[documentation]") {
 
     ghoul::Dictionary positive;
     positive.setValue("a", glm::dmat4x3(1.0));
-    TestResult positiveRes = testSpecification(doc, positive);
+    const TestResult positiveRes = testSpecification(doc, positive);
     CHECK(positiveRes.success);
     CHECK(positiveRes.offenses.empty());
 
@@ -2912,7 +2910,7 @@ TEST_CASE("Documentation: DoubleMatrix4x4Verifier", "[documentation]") {
     using namespace openspace::documentation;
     using namespace std::string_literals;
 
-    Documentation doc = {
+    const Documentation doc = {
         .entries = {
             { "a", new DoubleMatrix4x4Verifier, Optional::No }
         }
@@ -2920,7 +2918,7 @@ TEST_CASE("Documentation: DoubleMatrix4x4Verifier", "[documentation]") {
 
     ghoul::Dictionary positive;
     positive.setValue("a", glm::dmat4x4(1.0));
-    TestResult positiveRes = testSpecification(doc, positive);
+    const TestResult positiveRes = testSpecification(doc, positive);
     CHECK(positiveRes.success);
     CHECK(positiveRes.offenses.empty());
 
@@ -2951,126 +2949,126 @@ TEST_CASE("Documentation: Verifier Type Post Conditions", "[documentation]") {
     using namespace openspace::documentation;
     using namespace std::string_literals;
 
-    CHECK(BoolVerifier().type() != "");
-    CHECK(DoubleVerifier().type() != "");
-    CHECK(IntVerifier().type() != "");
-    CHECK(StringVerifier().type() != "");
-    CHECK(TableVerifier().type() != "");
+    CHECK(!BoolVerifier().type().empty());
+    CHECK(!DoubleVerifier().type().empty());
+    CHECK(!IntVerifier().type().empty());
+    CHECK(!StringVerifier().type().empty());
+    CHECK(!TableVerifier().type().empty());
 
-    CHECK(IntVector2Verifier().type() != "");
-    CHECK(DoubleVector2Verifier().type() != "");
-    CHECK(IntVector3Verifier().type() != "");
-    CHECK(DoubleVector3Verifier().type() != "");
-    CHECK(IntVector4Verifier().type() != "");
-    CHECK(DoubleVector4Verifier().type() != "");
+    CHECK(!IntVector2Verifier().type().empty());
+    CHECK(!DoubleVector2Verifier().type().empty());
+    CHECK(!IntVector3Verifier().type().empty());
+    CHECK(!DoubleVector3Verifier().type().empty());
+    CHECK(!IntVector4Verifier().type().empty());
+    CHECK(!DoubleVector4Verifier().type().empty());
 
-    CHECK(IntLessVerifier(0).type() != "");
-    CHECK(DoubleLessVerifier(0.0).type() != "");
-    CHECK(IntLessEqualVerifier(0).type() != "");
-    CHECK(DoubleLessEqualVerifier(0.0).type() != "");
-    CHECK(IntGreaterVerifier(0).type() != "");
-    CHECK(DoubleGreaterVerifier(0.0).type() != "");
-    CHECK(IntGreaterEqualVerifier(0).type() != "");
-    CHECK(DoubleGreaterEqualVerifier(0.0).type() != "");
+    CHECK(!IntLessVerifier(0).type().empty());
+    CHECK(!DoubleLessVerifier(0.0).type().empty());
+    CHECK(!IntLessEqualVerifier(0).type().empty());
+    CHECK(!DoubleLessEqualVerifier(0.0).type().empty());
+    CHECK(!IntGreaterVerifier(0).type().empty());
+    CHECK(!DoubleGreaterVerifier(0.0).type().empty());
+    CHECK(!IntGreaterEqualVerifier(0).type().empty());
+    CHECK(!DoubleGreaterEqualVerifier(0.0).type().empty());
 
-    CHECK(BoolEqualVerifier(true).type() != "");
-    CHECK(IntEqualVerifier(0).type() != "");
-    CHECK(DoubleEqualVerifier(0.0).type() != "");
-    CHECK(StringEqualVerifier(""s).type() != "");
-    CHECK(BoolUnequalVerifier(true).type() != "");
-    CHECK(IntUnequalVerifier(0).type() != "");
-    CHECK(DoubleUnequalVerifier(0.0).type() != "");
-    CHECK(StringUnequalVerifier(""s).type() != "");
+    CHECK(!BoolEqualVerifier(true).type().empty());
+    CHECK(!IntEqualVerifier(0).type().empty());
+    CHECK(!DoubleEqualVerifier(0.0).type().empty());
+    CHECK(!StringEqualVerifier(""s).type().empty());
+    CHECK(!BoolUnequalVerifier(true).type().empty());
+    CHECK(!IntUnequalVerifier(0).type().empty());
+    CHECK(!DoubleUnequalVerifier(0.0).type().empty());
+    CHECK(!StringUnequalVerifier(""s).type().empty());
 
-    CHECK(BoolInListVerifier({ true }).type() != "");
-    CHECK(IntInListVerifier({ 0 }).type() != "");
-    CHECK(DoubleInListVerifier({ 0.0 }).type() != "");
-    CHECK(StringInListVerifier({ ""s }).type() != "");
-    CHECK(BoolNotInListVerifier({ true }).type() != "");
-    CHECK(IntNotInListVerifier({ 0 }).type() != "");
-    CHECK(DoubleNotInListVerifier({ 0.0 }).type() != "");
-    CHECK(StringNotInListVerifier({ ""s }).type() != "");
+    CHECK(!BoolInListVerifier({ true }).type().empty());
+    CHECK(!IntInListVerifier({ 0 }).type().empty());
+    CHECK(!DoubleInListVerifier({ 0.0 }).type().empty());
+    CHECK(!StringInListVerifier({ ""s }).type().empty());
+    CHECK(!BoolNotInListVerifier({ true }).type().empty());
+    CHECK(!IntNotInListVerifier({ 0 }).type().empty());
+    CHECK(!DoubleNotInListVerifier({ 0.0 }).type().empty());
+    CHECK(!StringNotInListVerifier({ ""s }).type().empty());
 
-    CHECK(IntInRangeVerifier({ 0, 1 }).type() != "");
-    CHECK(DoubleInRangeVerifier({ 0.0, 1.0 }).type() != "");
-    CHECK(IntNotInRangeVerifier({ 0, 1 }).type() != "");
-    CHECK(DoubleNotInRangeVerifier({ 0.0, 1.0 }).type() != "");
+    CHECK(!IntInRangeVerifier({ 0, 1 }).type().empty());
+    CHECK(!DoubleInRangeVerifier({ 0.0, 1.0 }).type().empty());
+    CHECK(!IntNotInRangeVerifier({ 0, 1 }).type().empty());
+    CHECK(!DoubleNotInRangeVerifier({ 0.0, 1.0 }).type().empty());
 
-    CHECK(BoolAnnotationVerifier("A"s).type() != "");
-    CHECK(IntAnnotationVerifier("A"s).type() != "");
-    CHECK(DoubleAnnotationVerifier("A"s).type() != "");
-    CHECK(StringAnnotationVerifier("A"s).type() != "");
-    CHECK(TableAnnotationVerifier("A"s).type() != "");
-    CHECK(AnnotationVerifier<IntVector2Verifier>("A"s).type() != "");
-    CHECK(AnnotationVerifier<DoubleVector2Verifier>("A"s).type() != "");
-    CHECK(AnnotationVerifier<IntVector3Verifier>("A"s).type() != "");
-    CHECK(AnnotationVerifier<DoubleVector3Verifier>("A"s).type() != "");
-    CHECK(AnnotationVerifier<IntVector4Verifier>("A"s).type() != "");
-    CHECK(AnnotationVerifier<DoubleVector4Verifier>("A"s).type() != "");
+    CHECK(!BoolAnnotationVerifier("A"s).type().empty());
+    CHECK(!IntAnnotationVerifier("A"s).type().empty());
+    CHECK(!DoubleAnnotationVerifier("A"s).type().empty());
+    CHECK(!StringAnnotationVerifier("A"s).type().empty());
+    CHECK(!TableAnnotationVerifier("A"s).type().empty());
+    CHECK(!AnnotationVerifier<IntVector2Verifier>("A"s).type().empty());
+    CHECK(!AnnotationVerifier<DoubleVector2Verifier>("A"s).type().empty());
+    CHECK(!AnnotationVerifier<IntVector3Verifier>("A"s).type().empty());
+    CHECK(!AnnotationVerifier<DoubleVector3Verifier>("A"s).type().empty());
+    CHECK(!AnnotationVerifier<IntVector4Verifier>("A"s).type().empty());
+    CHECK(!AnnotationVerifier<DoubleVector4Verifier>("A"s).type().empty());
 
-    CHECK(ReferencingVerifier("identifier"s).type() != "");
+    CHECK(!ReferencingVerifier("identifier"s).type().empty());
 }
 
 TEST_CASE("Documentation: Verifier Documentation Post Conditions", "[documentation]") {
     using namespace openspace::documentation;
     using namespace std::string_literals;
 
-    CHECK(BoolVerifier().documentation() != "");
-    CHECK(DoubleVerifier().documentation() != "");
-    CHECK(IntVerifier().documentation() != "");
-    CHECK(StringVerifier().documentation() != "");
-    CHECK(TableVerifier().documentation() != "");
+    CHECK(!BoolVerifier().documentation().empty());
+    CHECK(!DoubleVerifier().documentation().empty());
+    CHECK(!IntVerifier().documentation().empty());
+    CHECK(!StringVerifier().documentation().empty());
+    CHECK(!TableVerifier().documentation().empty());
 
-    CHECK(IntVector2Verifier().documentation() != "");
-    CHECK(DoubleVector2Verifier().documentation() != "");
-    CHECK(IntVector3Verifier().documentation() != "");
-    CHECK(DoubleVector3Verifier().documentation() != "");
-    CHECK(IntVector4Verifier().documentation() != "");
-    CHECK(DoubleVector4Verifier().documentation() != "");
+    CHECK(!IntVector2Verifier().documentation().empty());
+    CHECK(!DoubleVector2Verifier().documentation().empty());
+    CHECK(!IntVector3Verifier().documentation().empty());
+    CHECK(!DoubleVector3Verifier().documentation().empty());
+    CHECK(!IntVector4Verifier().documentation().empty());
+    CHECK(!DoubleVector4Verifier().documentation().empty());
 
-    CHECK(IntLessVerifier(0).documentation() != "");
-    CHECK(DoubleLessVerifier(0.0).documentation() != "");
-    CHECK(IntLessEqualVerifier(0).documentation() != "");
-    CHECK(DoubleLessEqualVerifier(0.0).documentation() != "");
-    CHECK(IntGreaterVerifier(0).documentation() != "");
-    CHECK(DoubleGreaterVerifier(0.0).documentation() != "");
-    CHECK(IntGreaterEqualVerifier(0).documentation() != "");
-    CHECK(DoubleGreaterEqualVerifier(0.0).documentation() != "");
+    CHECK(!IntLessVerifier(0).documentation().empty());
+    CHECK(!DoubleLessVerifier(0.0).documentation().empty());
+    CHECK(!IntLessEqualVerifier(0).documentation().empty());
+    CHECK(!DoubleLessEqualVerifier(0.0).documentation().empty());
+    CHECK(!IntGreaterVerifier(0).documentation().empty());
+    CHECK(!DoubleGreaterVerifier(0.0).documentation().empty());
+    CHECK(!IntGreaterEqualVerifier(0).documentation().empty());
+    CHECK(!DoubleGreaterEqualVerifier(0.0).documentation().empty());
 
-    CHECK(BoolEqualVerifier(true).documentation() != "");
-    CHECK(IntEqualVerifier(0).documentation() != "");
-    CHECK(DoubleEqualVerifier(0.0).documentation() != "");
-    CHECK(StringEqualVerifier(""s).documentation() != "");
-    CHECK(BoolUnequalVerifier(true).documentation() != "");
-    CHECK(IntUnequalVerifier(0).documentation() != "");
-    CHECK(DoubleUnequalVerifier(0.0).documentation() != "");
-    CHECK(StringUnequalVerifier(""s).documentation() != "");
+    CHECK(!BoolEqualVerifier(true).documentation().empty());
+    CHECK(!IntEqualVerifier(0).documentation().empty());
+    CHECK(!DoubleEqualVerifier(0.0).documentation().empty());
+    CHECK(!StringEqualVerifier(""s).documentation().empty());
+    CHECK(!BoolUnequalVerifier(true).documentation().empty());
+    CHECK(!IntUnequalVerifier(0).documentation().empty());
+    CHECK(!DoubleUnequalVerifier(0.0).documentation().empty());
+    CHECK(!StringUnequalVerifier(""s).documentation().empty());
 
-    CHECK(BoolInListVerifier({ true }).documentation() != "");
-    CHECK(IntInListVerifier({ 0 }).documentation() != "");
-    CHECK(DoubleInListVerifier({ 0.0 }).documentation() != "");
-    CHECK(StringInListVerifier({ ""s }).documentation() != "");
-    CHECK(BoolNotInListVerifier({ true }).documentation() != "");
-    CHECK(IntNotInListVerifier({ 0 }).documentation() != "");
-    CHECK(DoubleNotInListVerifier({ 0.0 }).documentation() != "");
-    CHECK(StringNotInListVerifier({ ""s }).documentation() != "");
+    CHECK(!BoolInListVerifier({ true }).documentation().empty());
+    CHECK(!IntInListVerifier({ 0 }).documentation().empty());
+    CHECK(!DoubleInListVerifier({ 0.0 }).documentation().empty());
+    CHECK(!StringInListVerifier({ ""s }).documentation().empty());
+    CHECK(!BoolNotInListVerifier({ true }).documentation().empty());
+    CHECK(!IntNotInListVerifier({ 0 }).documentation().empty());
+    CHECK(!DoubleNotInListVerifier({ 0.0 }).documentation().empty());
+    CHECK(!StringNotInListVerifier({ ""s }).documentation().empty());
 
-    CHECK(IntInRangeVerifier({ 0, 1 }).documentation() != "");
-    CHECK(DoubleInRangeVerifier({ 0.0, 1.0 }).documentation() != "");
-    CHECK(IntNotInRangeVerifier({ 0, 1 }).documentation() != "");
-    CHECK(DoubleNotInRangeVerifier({ 0.0, 1.0 }).documentation() != "");
+    CHECK(!IntInRangeVerifier({ 0, 1 }).documentation().empty());
+    CHECK(!DoubleInRangeVerifier({ 0.0, 1.0 }).documentation().empty());
+    CHECK(!IntNotInRangeVerifier({ 0, 1 }).documentation().empty());
+    CHECK(!DoubleNotInRangeVerifier({ 0.0, 1.0 }).documentation().empty());
 
-    CHECK(BoolAnnotationVerifier("A"s).documentation() != "");
-    CHECK(IntAnnotationVerifier("A"s).documentation() != "");
-    CHECK(DoubleAnnotationVerifier("A"s).documentation() != "");
-    CHECK(StringAnnotationVerifier("A"s).documentation() != "");
-    CHECK(TableAnnotationVerifier("A"s).documentation() != "");
-    CHECK(AnnotationVerifier<IntVector2Verifier>("A"s).documentation() != "");
-    CHECK(AnnotationVerifier<DoubleVector2Verifier>("A"s).documentation() != "");
-    CHECK(AnnotationVerifier<IntVector3Verifier>("A"s).documentation() != "");
-    CHECK(AnnotationVerifier<DoubleVector3Verifier>("A"s).documentation() != "");
-    CHECK(AnnotationVerifier<IntVector4Verifier>("A"s).documentation() != "");
-    CHECK(AnnotationVerifier<DoubleVector4Verifier>("A"s).documentation() != "");
+    CHECK(!BoolAnnotationVerifier("A"s).documentation().empty());
+    CHECK(!IntAnnotationVerifier("A"s).documentation().empty());
+    CHECK(!DoubleAnnotationVerifier("A"s).documentation().empty());
+    CHECK(!StringAnnotationVerifier("A"s).documentation().empty());
+    CHECK(!TableAnnotationVerifier("A"s).documentation().empty());
+    CHECK(!AnnotationVerifier<IntVector2Verifier>("A"s).documentation().empty());
+    CHECK(!AnnotationVerifier<DoubleVector2Verifier>("A"s).documentation().empty());
+    CHECK(!AnnotationVerifier<IntVector3Verifier>("A"s).documentation().empty());
+    CHECK(!AnnotationVerifier<DoubleVector3Verifier>("A"s).documentation().empty());
+    CHECK(!AnnotationVerifier<IntVector4Verifier>("A"s).documentation().empty());
+    CHECK(!AnnotationVerifier<DoubleVector4Verifier>("A"s).documentation().empty());
 
-    CHECK(ReferencingVerifier("identifier"s).documentation() != "");
+    CHECK(!ReferencingVerifier("identifier"s).documentation().empty());
 }
diff --git a/tests/test_horizons.cpp b/tests/test_horizons.cpp
index d9e37b206a..da50c539c7 100644
--- a/tests/test_horizons.cpp
+++ b/tests/test_horizons.cpp
@@ -45,10 +45,10 @@ struct HorizonsTestData {
 // Avoid repetitive code by using these functions
 #ifdef OPENSPACE_MODULE_SPACE_ENABLED
 void testHorizonsAnswer(const HorizonsTestData& data, HorizonsType type,
-                        std::filesystem::path filePath,
+                        const std::filesystem::path& filePath,
                         HorizonsResultCode expectedAnswerCode)
 {
-    std::string url = constructHorizonsUrl(
+    const std::string url = constructHorizonsUrl(
         type,
         data.target,
         data.observer,
@@ -57,7 +57,7 @@ void testHorizonsAnswer(const HorizonsTestData& data, HorizonsType type,
         data.step,
         data.unit
     );
-    json answer = sendHorizonsRequest(url, filePath);
+    const json answer = sendHorizonsRequest(url, filePath);
     HorizonsResultCode code = isValidHorizonsAnswer(answer);
     CHECK(code == expectedAnswerCode);
 
@@ -67,12 +67,12 @@ void testHorizonsAnswer(const HorizonsTestData& data, HorizonsType type,
 }
 
 void testHorizonsAnswerAndResult(const HorizonsTestData& data, HorizonsType type,
-                                 std::filesystem::path filePath,
+                                 const std::filesystem::path& filePath,
                                  HorizonsResultCode expectedAnswerCode,
                                  HorizonsResultCode expectedResultCode,
                                  bool shouldDeleteFile = true)
 {
-    std::string url = constructHorizonsUrl(
+    const std::string url = constructHorizonsUrl(
         type,
         data.target,
         data.observer,
@@ -89,7 +89,7 @@ void testHorizonsAnswerAndResult(const HorizonsTestData& data, HorizonsType type
     auto result = answer.find("result");
     CHECK(result != answer.end());
 
-    HorizonsFile horizonsFile(filePath, *result);
+    const HorizonsFile horizonsFile(filePath, *result);
     HorizonsResultCode resultCode = isValidHorizonsFile(horizonsFile.file());
     CHECK(resultCode == expectedResultCode);
 
@@ -100,13 +100,13 @@ void testHorizonsAnswerAndResult(const HorizonsTestData& data, HorizonsType type
     }
 }
 
-void testReadingHorizons(HorizonsType type, std::filesystem::path filePath,
+void testReadingHorizons(HorizonsType type, const std::filesystem::path& filePath,
                        const double t0, const double x0, const double y0, const double z0,
                        const double t1, const double x1, const double y1, const double z1,
                        const double t2, const double x2, const double y2, const double z2)
 {
     // Get files and make sure they exist
-    std::filesystem::path kernel = absPath("${TESTDIR}/horizonsTest/naif0012.tls");
+    const std::filesystem::path kernel = absPath("${TESTDIR}/horizonsTest/naif0012.tls");
     CHECK(std::filesystem::is_regular_file(kernel));
     CHECK(std::filesystem::is_regular_file(filePath));
 
@@ -169,8 +169,10 @@ TEST_CASE("HorizonsFile: File size too large", "[horizonsfile]") {
     data.stop = "2022-07-01 00:00:00";
     data.step = "1";
     data.unit = "m";
-    std::filesystem::path filePath = absPath("${TESTDIR}/horizonsTest/horizonstest_1.hrz");
-    HorizonsResultCode expectedAnswerCode = HorizonsResultCode::ErrorSize;
+    const std::filesystem::path filePath = absPath(
+        "${TESTDIR}/horizonsTest/horizonstest_1.hrz"
+    );
+    const HorizonsResultCode expectedAnswerCode = HorizonsResultCode::ErrorSize;
 
     // Test Vector format
     HorizonsType type = HorizonsType::Vector;
@@ -191,8 +193,10 @@ TEST_CASE("HorizonsFile: Time steps too large", "[horizonsfile]") {
     data.stop = "2022-07-01 00:00:00";
     data.step = "1111111111";
     data.unit = "d";
-    std::filesystem::path filePath = absPath("${TESTDIR}/horizonsTest/horizonstest_2.hrz");
-    HorizonsResultCode expectedAnswerCode = HorizonsResultCode::ErrorSpan;
+    const std::filesystem::path filePath = absPath(
+        "${TESTDIR}/horizonsTest/horizonstest_2.hrz"
+    );
+    const HorizonsResultCode expectedAnswerCode = HorizonsResultCode::ErrorSpan;
 
     // Test Vector format
     HorizonsType type = HorizonsType::Vector;
@@ -213,8 +217,10 @@ TEST_CASE("HorizonsFile: Outside available time range", "[horizonsfile]") {
     data.stop = "2000-05-19 00:00:00";
     data.step = "1";
     data.unit = "d";
-    std::filesystem::path filePath = absPath("${TESTDIR}/horizonsTest/horizonstest_3.hrz");
-    HorizonsResultCode expectedAnswerCode = HorizonsResultCode::ErrorTimeRange;
+    const std::filesystem::path filePath = absPath(
+        "${TESTDIR}/horizonsTest/horizonstest_3.hrz"
+    );
+    const HorizonsResultCode expectedAnswerCode = HorizonsResultCode::ErrorTimeRange;
 
     // Test Vector format
     HorizonsType type = HorizonsType::Vector;
@@ -235,16 +241,18 @@ TEST_CASE("HorizonsFile: No observer", "[horizonsfile]") {
     data.stop = "2022-05-19 00:00:00";
     data.step = "1";
     data.unit = "d";
-    std::filesystem::path filePath = absPath("${TESTDIR}/horizonsTest/horizonstest_4.hrz");
-    HorizonsResultCode expectedAnswerCode = HorizonsResultCode::ErrorNoObserver;
+    const std::filesystem::path filePath = absPath(
+        "${TESTDIR}/horizonsTest/horizonstest_4.hrz"
+    );
+    const HorizonsResultCode answer = HorizonsResultCode::ErrorNoObserver;
 
     // Test Vector format
     HorizonsType type = HorizonsType::Vector;
-    testHorizonsAnswer(data, type, filePath, expectedAnswerCode);
+    testHorizonsAnswer(data, type, filePath, answer);
 
     // Test Observer format
     type = HorizonsType::Observer;
-    testHorizonsAnswer(data, type, filePath, expectedAnswerCode);
+    testHorizonsAnswer(data, type, filePath, answer);
 #endif // OPENSPACE_MODULE_SPACE_ENABLED
 }
 
@@ -257,12 +265,14 @@ TEST_CASE("HorizonsFile: Observer and target same", "[horizonsfile]") {
     data.stop = "2022-05-19 00:00:00";
     data.step = "1";
     data.unit = "d";
-    std::filesystem::path filePath = absPath("${TESTDIR}/horizonsTest/horizonstest_5.hrz");
-    HorizonsResultCode expectedAnswerCode = HorizonsResultCode::ErrorObserverTargetSame;
+    const std::filesystem::path filePath = absPath(
+        "${TESTDIR}/horizonsTest/horizonstest_5.hrz"
+    );
+    const HorizonsResultCode answer = HorizonsResultCode::ErrorObserverTargetSame;
 
     // This test is only for Observer type format
     HorizonsType type = HorizonsType::Observer;
-    testHorizonsAnswer(data, type, filePath, expectedAnswerCode);
+    testHorizonsAnswer(data, type, filePath, answer);
 #endif // OPENSPACE_MODULE_SPACE_ENABLED
 }
 
@@ -275,16 +285,18 @@ TEST_CASE("HorizonsFile: Multiple observer stations", "[horizonsfile]") {
     data.stop = "2022-05-19 00:00:00";
     data.step = "1";
     data.unit = "d";
-    std::filesystem::path filePath = absPath("${TESTDIR}/horizonsTest/horizonstest_6.hrz");
-    HorizonsResultCode expectedAnswerCode = HorizonsResultCode::MultipleObserverStations;
+    const std::filesystem::path filePath = absPath(
+        "${TESTDIR}/horizonsTest/horizonstest_6.hrz"
+    );
+    const HorizonsResultCode answer = HorizonsResultCode::MultipleObserverStations;
 
     // Test Vector format
     HorizonsType type = HorizonsType::Vector;
-    testHorizonsAnswer(data, type, filePath, expectedAnswerCode);
+    testHorizonsAnswer(data, type, filePath, answer);
 
     // Test Observer format
     type = HorizonsType::Observer;
-    testHorizonsAnswer(data, type, filePath, expectedAnswerCode);
+    testHorizonsAnswer(data, type, filePath, answer);
 #endif // OPENSPACE_MODULE_SPACE_ENABLED
 }
 
@@ -299,9 +311,11 @@ TEST_CASE("HorizonsFile: Multiple observers", "[horizonsfile]") {
     data.stop = "2022-05-19 00:00:00";
     data.step = "1";
     data.unit = "d";
-    std::filesystem::path filePath = absPath("${TESTDIR}/horizonsTest/horizonstest_7.hrz");
-    HorizonsResultCode expectedAnswerCode = HorizonsResultCode::Valid;
-    HorizonsResultCode expectedResultCode = HorizonsResultCode::MultipleObserver;
+    const std::filesystem::path filePath = absPath(
+        "${TESTDIR}/horizonsTest/horizonstest_7.hrz"
+    );
+    const HorizonsResultCode expectedAnswerCode = HorizonsResultCode::Valid;
+    const HorizonsResultCode expectedResultCode = HorizonsResultCode::MultipleObserver;
 
     // Test Vector format
     HorizonsType type = HorizonsType::Vector;
@@ -334,9 +348,11 @@ TEST_CASE("HorizonsFile: No target", "[horizonsfile]") {
     data.stop = "2022-05-20 00:00:00";
     data.step = "1";
     data.unit = "d";
-    std::filesystem::path filePath = absPath("${TESTDIR}/horizonsTest/horizonstest_8.hrz");
-    HorizonsResultCode expectedAnswerCode = HorizonsResultCode::Valid;
-    HorizonsResultCode expectedResultCode = HorizonsResultCode::ErrorNoTarget;
+    const std::filesystem::path filePath = absPath(
+        "${TESTDIR}/horizonsTest/horizonstest_8.hrz"
+    );
+    const HorizonsResultCode expectedAnswerCode = HorizonsResultCode::Valid;
+    const HorizonsResultCode expectedResultCode = HorizonsResultCode::ErrorNoTarget;
 
     // Test Vector format
     HorizonsType type = HorizonsType::Vector;
@@ -369,9 +385,11 @@ TEST_CASE("HorizonsFile: Multiple targets (major bodies)", "[horizonsfile]") {
     data.stop = "2022-05-20 00:00:00";
     data.step = "1";
     data.unit = "d";
-    std::filesystem::path filePath = absPath("${TESTDIR}/horizonsTest/horizonstest_9.hrz");
-    HorizonsResultCode expectedAnswerCode = HorizonsResultCode::Valid;
-    HorizonsResultCode expectedResultCode = HorizonsResultCode::MultipleTarget;
+    const std::filesystem::path filePath = absPath(
+        "${TESTDIR}/horizonsTest/horizonstest_9.hrz"
+    );
+    const HorizonsResultCode expectedAnswerCode = HorizonsResultCode::Valid;
+    const HorizonsResultCode expectedResultCode = HorizonsResultCode::MultipleTarget;
 
     // Test Vector format
     HorizonsType type = HorizonsType::Vector;
@@ -404,9 +422,11 @@ TEST_CASE("HorizonsFile: Multiple targets (minor bodies case 1)", "[horizonsfile
     data.stop = "2022-05-20 00:00:00";
     data.step = "1";
     data.unit = "d";
-    std::filesystem::path filePath = absPath("${TESTDIR}/horizonsTest/horizonstest_10.hrz");
-    HorizonsResultCode expectedAnswerCode = HorizonsResultCode::Valid;
-    HorizonsResultCode expectedResultCode = HorizonsResultCode::MultipleTarget;
+    const std::filesystem::path filePath = absPath(
+        "${TESTDIR}/horizonsTest/horizonstest_10.hrz"
+    );
+    const HorizonsResultCode expectedAnswerCode = HorizonsResultCode::Valid;
+    const HorizonsResultCode expectedResultCode = HorizonsResultCode::MultipleTarget;
 
     // Test Vector format
     HorizonsType type = HorizonsType::Vector;
@@ -439,9 +459,11 @@ TEST_CASE("HorizonsFile: Multiple targets (minor bodies case 2)", "[horizonsfile
     data.stop = "2022-05-20 00:00:00";
     data.step = "1";
     data.unit = "d";
-    std::filesystem::path filePath = absPath("${TESTDIR}/horizonsTest/horizonstest_11.hrz");
-    HorizonsResultCode expectedAnswerCode = HorizonsResultCode::Valid;
-    HorizonsResultCode expectedResultCode = HorizonsResultCode::MultipleTarget;
+    const std::filesystem::path filePath = absPath(
+        "${TESTDIR}/horizonsTest/horizonstest_11.hrz"
+    );
+    const HorizonsResultCode expectedAnswerCode = HorizonsResultCode::Valid;
+    const HorizonsResultCode expectedResultCode = HorizonsResultCode::MultipleTarget;
 
     // Test Vector format
     HorizonsType type = HorizonsType::Vector;
@@ -474,9 +496,11 @@ TEST_CASE("HorizonsFile: Detect multiple observers or targets", "[horizonsfile]"
     data.stop = "2022-05-23 00:00:00";
     data.step = "1";
     data.unit = "d";
-    std::filesystem::path filePath = absPath("${TESTDIR}/horizonsTest/horizonstest_12.hrz");
-    HorizonsResultCode expectedAnswerCode = HorizonsResultCode::Valid;
-    HorizonsResultCode expectedResultCode = HorizonsResultCode::MultipleObserver;
+    const std::filesystem::path filePath = absPath(
+        "${TESTDIR}/horizonsTest/horizonstest_12.hrz"
+    );
+    const HorizonsResultCode expectedAnswerCode = HorizonsResultCode::Valid;
+    const HorizonsResultCode expectedResultCode = HorizonsResultCode::MultipleObserver;
 
     // Test Vector format
     HorizonsType type = HorizonsType::Vector;
@@ -509,10 +533,14 @@ TEST_CASE("HorizonsFile: Valid request and response", "[horizonsfile]") {
     data.stop = "2022-05-23 00:00:00";
     data.step = "12";
     data.unit = "h";
-    std::filesystem::path filePathVector = absPath("${TESTDIR}/horizonsTest/validVectorFile.hrz");
-    std::filesystem::path filePathObserver = absPath("${TESTDIR}/horizonsTest/validObserverFile.hrz");
-    HorizonsResultCode expectedAnswerCode = HorizonsResultCode::Valid;
-    HorizonsResultCode expectedResultCode = HorizonsResultCode::Valid;
+    const std::filesystem::path filePathVector = absPath(
+        "${TESTDIR}/horizonsTest/validVectorFile.hrz"
+    );
+    const std::filesystem::path filePathObserver = absPath(
+        "${TESTDIR}/horizonsTest/validObserverFile.hrz"
+    );
+    const HorizonsResultCode expectedAnswerCode = HorizonsResultCode::Valid;
+    const HorizonsResultCode expectedResultCode = HorizonsResultCode::Valid;
 
     // Test Vector format
     HorizonsType type = HorizonsType::Vector;
@@ -543,12 +571,12 @@ TEST_CASE("HorizonsFile: Valid request and response", "[horizonsfile]") {
 // Since data can get updated this is tested towards stored files
 TEST_CASE("HorizonsFile: Parsing time range with time", "[horizonsfile]") {
 #ifdef OPENSPACE_MODULE_SPACE_ENABLED
-    std::filesystem::path filePath =
+    const std::filesystem::path filePath =
         absPath("${TESTDIR}/horizonsTest/timerange_time.hrz");
-    HorizonsFile horizonsFile(filePath);
+    const HorizonsFile horizonsFile(filePath);
 
     // Parse time range
-    std::pair<std::string, std::string> timeRange = horizonsFile.parseValidTimeRange(
+    const std::pair<std::string, std::string> timeRange = horizonsFile.parseValidTimeRange(
         "Trajectory files",
         "************",
         "Trajectory name"
@@ -561,12 +589,12 @@ TEST_CASE("HorizonsFile: Parsing time range with time", "[horizonsfile]") {
 
 TEST_CASE("HorizonsFile: Parsing time range without time", "[horizonsfile]") {
 #ifdef OPENSPACE_MODULE_SPACE_ENABLED
-    std::filesystem::path filePath =
+    const std::filesystem::path filePath =
         absPath("${TESTDIR}/horizonsTest/timerange_no_time.hrz");
-    HorizonsFile horizonsFile(filePath);
+    const HorizonsFile horizonsFile(filePath);
 
     // Parse time range
-    std::pair<std::string, std::string> timeRange = horizonsFile.parseValidTimeRange(
+    const std::pair<std::string, std::string> timeRange = horizonsFile.parseValidTimeRange(
         "Trajectory files",
         "************",
         "Trajectory name",
@@ -583,12 +611,12 @@ TEST_CASE("HorizonsFile: Parsing time range without time", "[horizonsfile]") {
 // Since data can get updated this is tested towards stored files
 TEST_CASE("HorizonsFile: Parsing multiple matching observers", "[horizonsfile]") {
 #ifdef OPENSPACE_MODULE_SPACE_ENABLED
-    std::filesystem::path filePath =
+    const std::filesystem::path filePath =
         absPath("${TESTDIR}/horizonsTest/parse_multiple_observers.hrz");
-    HorizonsFile horizonsFile(filePath);
+    const HorizonsFile horizonsFile(filePath);
 
     // Parse matches
-    std::vector<std::string> matches =
+    const std::vector<std::string> matches =
         horizonsFile.parseMatches("Name", "matches", ">MATCH NAME<");
 
     REQUIRE(matches.size() == 3);
@@ -606,12 +634,12 @@ TEST_CASE("HorizonsFile: Parsing multiple matching observers", "[horizonsfile]")
 
 TEST_CASE("HorizonsFile: Parsing multiple matching targets", "[horizonsfile]") {
 #ifdef OPENSPACE_MODULE_SPACE_ENABLED
-    std::filesystem::path filePath =
+    const std::filesystem::path filePath =
         absPath("${TESTDIR}/horizonsTest/parse_multiple_targets.hrz");
-    HorizonsFile horizonsFile(filePath);
+    const HorizonsFile horizonsFile(filePath);
 
     // Parse matches
-    std::vector<std::string> matches =
+    const std::vector<std::string> matches =
         horizonsFile.parseMatches("Name", "matches", ">MATCH NAME<");
 
     REQUIRE(matches.size() == 11);
@@ -653,13 +681,13 @@ TEST_CASE("HorizonsFile: Parsing multiple matching targets", "[horizonsfile]") {
 
 TEST_CASE("HorizonsFile: Parsing multiple matching stations", "[horizonsfile]") {
 #ifdef OPENSPACE_MODULE_SPACE_ENABLED
-    std::filesystem::path filePath =
+    const std::filesystem::path filePath =
         absPath("${TESTDIR}/horizonsTest/parse_multiple_stations.hrz");
     CHECK(std::filesystem::is_regular_file(filePath));
-    HorizonsFile horizonsFile(filePath);
+    const HorizonsFile horizonsFile(filePath);
 
     // Parse matches
-    std::vector<std::string> matches =
+    const std::vector<std::string> matches =
         horizonsFile.parseMatches("Observatory Name", "Multiple matching stations found");
 
     REQUIRE(matches.size() == 11);
@@ -703,8 +731,8 @@ TEST_CASE("HorizonsFile: Parsing multiple matching stations", "[horizonsfile]")
 // Test reading of data and compare a recent request with a stored file
 TEST_CASE("HorizonsFile: Reading Vector data from request", "[horizonsfile]") {
 #ifdef OPENSPACE_MODULE_SPACE_ENABLED
-    HorizonsType type = HorizonsType::Vector;
-    std::filesystem::path filePathVector =
+    const HorizonsType type = HorizonsType::Vector;
+    const std::filesystem::path filePathVector =
         absPath("${TESTDIR}/horizonsTest/validVectorFile.hrz");
 
     const double t0 = 706449669.18513119;
@@ -737,8 +765,8 @@ TEST_CASE("HorizonsFile: Reading Vector data from request", "[horizonsfile]") {
 
 TEST_CASE("HorizonsFile: Reading Observer data from request", "[horizonsfile]") {
 #ifdef OPENSPACE_MODULE_SPACE_ENABLED
-    HorizonsType type = HorizonsType::Observer;
-    std::filesystem::path filePathObserver =
+    const HorizonsType type = HorizonsType::Observer;
+    const std::filesystem::path filePathObserver =
         absPath("${TESTDIR}/horizonsTest/validObserverFile.hrz");
 
     const double t0 = 706449669.18513119;
@@ -772,8 +800,8 @@ TEST_CASE("HorizonsFile: Reading Observer data from request", "[horizonsfile]")
 
 TEST_CASE("HorizonsFile: Reading Vector data from file", "[horizonsfile]") {
 #ifdef OPENSPACE_MODULE_SPACE_ENABLED
-    HorizonsType type = HorizonsType::Vector;
-    std::filesystem::path filePathVector =
+    const HorizonsType type = HorizonsType::Vector;
+    const std::filesystem::path filePathVector =
         absPath("${TESTDIR}/horizonsTest/vectorFileTest.hrz");
 
     const double t0 = 706449669.18513119;
@@ -802,8 +830,8 @@ TEST_CASE("HorizonsFile: Reading Vector data from file", "[horizonsfile]") {
 
 TEST_CASE("HorizonsFile: Reading Observer data from file", "[horizonsfile]") {
 #ifdef OPENSPACE_MODULE_SPACE_ENABLED
-    HorizonsType type = HorizonsType::Observer;
-    std::filesystem::path filePathObserver =
+    const HorizonsType type = HorizonsType::Observer;
+    const std::filesystem::path filePathObserver =
         absPath("${TESTDIR}/horizonsTest/observerFileTest.hrz");
 
     const double t0 = 706449669.18513119;
diff --git a/tests/test_jsonformatting.cpp b/tests/test_jsonformatting.cpp
index b65f7bbe48..e63a9acfa9 100644
--- a/tests/test_jsonformatting.cpp
+++ b/tests/test_jsonformatting.cpp
@@ -54,11 +54,11 @@ TEMPLATE_TEST_CASE("FormatJson", "[formatjson]", glm::vec2, glm::vec3,
 }
 
 TEST_CASE("FormatJson - Bool", "[formatjson]") {
-    bool trueVal = true;
-    bool falseVal = false;
+    constexpr bool TrueVal = true;
+    constexpr bool FalseVal = false;
 
-    CHECK(openspace::formatJson(trueVal) == "true");
-    CHECK(openspace::formatJson(falseVal) == "false");
+    CHECK(openspace::formatJson(TrueVal) == "true");
+    CHECK(openspace::formatJson(FalseVal) == "false");
 }
 
 TEST_CASE("FormatJson - Infinity & Nan", "[formatjson]") {
diff --git a/tests/test_latlonpatch.cpp b/tests/test_latlonpatch.cpp
index dc585e7187..02897bf3b2 100644
--- a/tests/test_latlonpatch.cpp
+++ b/tests/test_latlonpatch.cpp
@@ -31,22 +31,22 @@
 TEST_CASE("LatLonPatch: findCenterControlPoint", "[latlonpatch]") {
     using namespace openspace::globebrowsing;
 
-    GeodeticPatch patch(0, 0, glm::pi<float>() / 4.f, glm::pi<float>() / 4.f);
+    const GeodeticPatch patch(0, 0, glm::pi<float>() / 4.f, glm::pi<float>() / 4.f);
 }
 
 TEST_CASE("LatLonPatch: Find Closest Corner", "[latlonpatch]") {
     using namespace openspace::globebrowsing;
 
     constexpr float piOver4 = glm::pi<float>() / 4.f;
-    Geodetic2 halfSize { piOver4, piOver4 };
-    Geodetic2 center { 0, 0 };
-    GeodeticPatch patch(center, halfSize);
+    const Geodetic2 halfSize { piOver4, piOver4 };
+    const Geodetic2 center { 0, 0 };
+    const GeodeticPatch patch(center, halfSize);
 
     constexpr float piOver3 = glm::pi<float>() / 3.f;
-    Geodetic2 point { piOver3, piOver3 };
+    const Geodetic2 point { piOver3, piOver3 };
 
-    Geodetic2 closestCorner = patch.closestCorner(point);
-    Geodetic2 northEastCorner = patch.corner(NORTH_EAST);
+    const Geodetic2 closestCorner = patch.closestCorner(point);
+    const Geodetic2 northEastCorner = patch.corner(NORTH_EAST);
 
     CHECK(closestCorner.lat == northEastCorner.lat);
     CHECK(closestCorner.lon == northEastCorner.lon);
@@ -57,14 +57,14 @@ TEST_CASE("LatLonPatch: Find Closest Corner 2", "[latlonpatch]") {
 
     constexpr float piOver6 = glm::pi<float>() / 4.f;
 
-    Geodetic2 halfSize { 1.1 * piOver6, 1.1 * piOver6 };
-    Geodetic2 center { piOver6, piOver6 };
-    GeodeticPatch patch(center, halfSize);
+    const Geodetic2 halfSize { 1.1 * piOver6, 1.1 * piOver6 };
+    const Geodetic2 center { piOver6, piOver6 };
+    const GeodeticPatch patch(center, halfSize);
 
-    Geodetic2 point { 0, 0 };
+    constexpr Geodetic2 Point { 0, 0 };
 
-    Geodetic2 closestCorner = patch.closestCorner(point);
-    Geodetic2 expectedCorner = patch.corner(SOUTH_WEST);
+    const Geodetic2 closestCorner = patch.closestCorner(Point);
+    const Geodetic2 expectedCorner = patch.corner(SOUTH_WEST);
 
     CHECK(closestCorner.lat == expectedCorner.lat);
     CHECK(closestCorner.lon == expectedCorner.lon);
diff --git a/tests/test_lua_createsinglecolorimage.cpp b/tests/test_lua_createsinglecolorimage.cpp
index 64696d47d5..bd0f518523 100644
--- a/tests/test_lua_createsinglecolorimage.cpp
+++ b/tests/test_lua_createsinglecolorimage.cpp
@@ -37,7 +37,7 @@
 TEST_CASE("CreateSingleColorImage: Create image and check return value",
           "[createsinglecolorimage]")
 {
-    std::filesystem::path path = createSingleColorImage(
+    const std::filesystem::path path = createSingleColorImage(
         "colorFile",
         glm::dvec3(1.0, 0.0, 0.0)
     );
@@ -65,7 +65,7 @@ TEST_CASE("CreateSingleColorImage: Faulty color value (invalid values)",
 TEST_CASE("CreateSingleColorImage: Check if file was created",
           "[createsinglecolorimage]")
 {
-    std::filesystem::path path = createSingleColorImage(
+    const std::filesystem::path path = createSingleColorImage(
         "colorFile2",
         glm::dvec3(0.0, 1.0, 0.0)
     );
@@ -73,19 +73,19 @@ TEST_CASE("CreateSingleColorImage: Check if file was created",
 }
 
 TEST_CASE("CreateSingleColorImage: Load created image", "[createsinglecolorimage]") {
-    std::filesystem::path path = createSingleColorImage(
+    const std::filesystem::path path = createSingleColorImage(
         "colorFile",
         glm::dvec3(1.0, 0.0, 0.0)
     );
 
     // Read the PPM file and check the image dimensions
     // (maybe too hard coded, but cannot load a texture here...)
-    std::ifstream ppmFile(path, std::ifstream::binary);
+    std::ifstream ppmFile = std::ifstream(path, std::ifstream::binary);
     REQUIRE(ppmFile.is_open());
 
     std::string version;
-    unsigned int width;
-    unsigned int height;
+    unsigned int width = 0;
+    unsigned int height = 0;
 
     ppmFile >> version >> width >> height;
 
diff --git a/tests/test_profile.cpp b/tests/test_profile.cpp
index 7f28f11e43..51a5d99ef8 100644
--- a/tests/test_profile.cpp
+++ b/tests/test_profile.cpp
@@ -169,15 +169,14 @@ TEST_CASE("Basic Meta (full)", "[profile]") {
 
     Profile ref;
     ref.version = Profile::CurrentVersion;
-
-    Profile::Meta meta;
-    meta.name = "name";
-    meta.version = "version";
-    meta.description = "description";
-    meta.author = "author";
-    meta.url = "url";
-    meta.license = "license";
-    ref.meta = meta;
+    ref.meta = {
+        .name = "name",
+        .version = "version",
+        .description = "description",
+        .author = "author",
+        .url = "url",
+        .license = "license"
+    };
 
     CHECK(profile == ref);
 }
@@ -188,9 +187,7 @@ TEST_CASE("Basic Meta (empty)", "[profile]") {
 
     Profile ref;
     ref.version = Profile::CurrentVersion;
-
-    Profile::Meta meta;
-    ref.meta = meta;
+    ref.meta = Profile::Meta();
 
     CHECK(profile == ref);
 }
@@ -201,14 +198,14 @@ TEST_CASE("Basic Meta (no name)", "[profile]") {
 
     Profile ref;
     ref.version = Profile::CurrentVersion;
+    ref.meta = {
+        .version = "version",
+        .description = "description",
+        .author = "author",
+        .url = "url",
+        .license = "license"
+    };
 
-    Profile::Meta meta;
-    meta.version = "version";
-    meta.description = "description";
-    meta.author = "author";
-    meta.url = "url";
-    meta.license = "license";
-    ref.meta = meta;
 
     CHECK(profile == ref);
 }
@@ -219,14 +216,13 @@ TEST_CASE("Basic Meta (no version)", "[profile]") {
 
     Profile ref;
     ref.version = Profile::CurrentVersion;
-
-    Profile::Meta meta;
-    meta.name = "name";
-    meta.description = "description";
-    meta.author = "author";
-    meta.url = "url";
-    meta.license = "license";
-    ref.meta = meta;
+    ref.meta = {
+        .name = "name",
+        .description = "description",
+        .author = "author",
+        .url = "url",
+        .license = "license"
+    };
 
     CHECK(profile == ref);
 }
@@ -237,14 +233,13 @@ TEST_CASE("Basic Meta (no description)", "[profile]") {
 
     Profile ref;
     ref.version = Profile::CurrentVersion;
-
-    Profile::Meta meta;
-    meta.name = "name";
-    meta.version = "version";
-    meta.author = "author";
-    meta.url = "url";
-    meta.license = "license";
-    ref.meta = meta;
+    ref.meta = {
+        .name = "name",
+        .version = "version",
+        .author = "author",
+        .url = "url",
+        .license = "license"
+    };
 
     CHECK(profile == ref);
 }
@@ -255,14 +250,13 @@ TEST_CASE("Basic Meta (no author)", "[profile]") {
 
     Profile ref;
     ref.version = Profile::CurrentVersion;
-
-    Profile::Meta meta;
-    meta.name = "name";
-    meta.version = "version";
-    meta.description = "description";
-    meta.url = "url";
-    meta.license = "license";
-    ref.meta = meta;
+    ref.meta = {
+        .name = "name",
+        .version = "version",
+        .description = "description",
+        .url = "url",
+        .license = "license"
+    };
 
     CHECK(profile == ref);
 }
@@ -273,14 +267,13 @@ TEST_CASE("Basic Meta (no url)", "[profile]") {
 
     Profile ref;
     ref.version = Profile::CurrentVersion;
-
-    Profile::Meta meta;
-    meta.name = "name";
-    meta.version = "version";
-    meta.description = "description";
-    meta.author = "author";
-    meta.license = "license";
-    ref.meta = meta;
+    ref.meta = {
+        .name = "name",
+        .version = "version",
+        .description = "description",
+        .author = "author",
+        .license = "license"
+    };
 
     CHECK(profile == ref);
 }
@@ -291,14 +284,13 @@ TEST_CASE("Basic Meta (no license)", "[profile]") {
 
     Profile ref;
     ref.version = Profile::CurrentVersion;
-
-    Profile::Meta meta;
-    meta.name = "name";
-    meta.version = "version";
-    meta.description = "description";
-    meta.author = "author";
-    meta.url = "url";
-    ref.meta = meta;
+    ref.meta = {
+        .name = "name",
+        .version = "version",
+        .description = "description",
+        .author = "author",
+        .url = "url"
+    };
 
     CHECK(profile == ref);
 }
@@ -309,31 +301,22 @@ TEST_CASE("Basic Module", "[profile]") {
 
     Profile ref;
     ref.version = Profile::CurrentVersion;
-
-    {
-        Profile::Module m;
-        m.name = "abs-module";
-        ref.modules.push_back(m);
-    }
-    {
-        Profile::Module m;
-        m.name = "def-module";
-        m.loadedInstruction = "instr";
-        ref.modules.push_back(m);
-    }
-    {
-        Profile::Module m;
-        m.name = "ghi-module";
-        m.notLoadedInstruction = "not_instr";
-        ref.modules.push_back(m);
-    }
-    {
-        Profile::Module m;
-        m.name = "jkl-module";
-        m.loadedInstruction = "instr";
-        m.notLoadedInstruction = "not_instr";
-        ref.modules.push_back(m);
-    }
+    ref.modules.push_back({
+        .name = "abs-module"
+    });
+    ref.modules.push_back({
+        .name = "def-module",
+        .loadedInstruction = "instr"
+    });
+    ref.modules.push_back({
+        .name = "ghi-module",
+        .notLoadedInstruction = "not_instr"
+    });
+    ref.modules.push_back({
+        .name = "jkl-module",
+        .loadedInstruction = "instr",
+        .notLoadedInstruction = "not_instr"
+    });
 
     CHECK(profile == ref);
 }
@@ -344,10 +327,9 @@ TEST_CASE("Basic Assets", "[profile]") {
 
     Profile ref;
     ref.version = Profile::CurrentVersion;
-
-    ref.assets.push_back("folder1/folder2/asset");
-    ref.assets.push_back("folder3/folder4/asset2");
-    ref.assets.push_back("folder5/folder6/asset3");
+    ref.assets.emplace_back("folder1/folder2/asset");
+    ref.assets.emplace_back("folder3/folder4/asset2");
+    ref.assets.emplace_back("folder5/folder6/asset3");
 
     CHECK(profile == ref);
 }
@@ -358,49 +340,36 @@ TEST_CASE("Basic Properties", "[profile]") {
 
     Profile ref;
     ref.version = Profile::CurrentVersion;
-
-    {
-        Profile::Property p;
-        p.setType = Profile::Property::SetType::SetPropertyValue;
-        p.name = "property_name_1";
-        p.value = "property_value_1";
-        ref.properties.push_back(p);
-    }
-    {
-        Profile::Property p;
-        p.setType = Profile::Property::SetType::SetPropertyValue;
-        p.name = "property_name_2";
-        p.value = "property_value_2";
-        ref.properties.push_back(p);
-    }
-    {
-        Profile::Property p;
-        p.setType = Profile::Property::SetType::SetPropertyValue;
-        p.name = "property_name_3";
-        p.value = "property_value_3";
-        ref.properties.push_back(p);
-    }
-    {
-        Profile::Property p;
-        p.setType = Profile::Property::SetType::SetPropertyValueSingle;
-        p.name = "property_name_4";
-        p.value = "property_value_4";
-        ref.properties.push_back(p);
-    }
-    {
-        Profile::Property p;
-        p.setType = Profile::Property::SetType::SetPropertyValueSingle;
-        p.name = "property_name_5";
-        p.value = "property_value_5";
-        ref.properties.push_back(p);
-    }
-    {
-        Profile::Property p;
-        p.setType = Profile::Property::SetType::SetPropertyValueSingle;
-        p.name = "property_name_6";
-        p.value = "property_value_6";
-        ref.properties.push_back(p);
-    }
+    ref.properties.push_back({
+        .setType = Profile::Property::SetType::SetPropertyValue,
+        .name = "property_name_1",
+        .value = "property_value_1"
+    });
+    ref.properties.push_back({
+        .setType = Profile::Property::SetType::SetPropertyValue,
+        .name = "property_name_2",
+        .value = "property_value_2"
+    });
+    ref.properties.push_back({
+        .setType = Profile::Property::SetType::SetPropertyValue,
+        .name = "property_name_3",
+        .value = "property_value_3"
+    });
+    ref.properties.push_back({
+        .setType = Profile::Property::SetType::SetPropertyValueSingle,
+        .name = "property_name_4",
+        .value = "property_value_4"
+    });
+    ref.properties.push_back({
+        .setType = Profile::Property::SetType::SetPropertyValueSingle,
+        .name = "property_name_5",
+        .value = "property_value_5"
+    });
+    ref.properties.push_back({
+        .setType = Profile::Property::SetType::SetPropertyValueSingle,
+        .name = "property_name_6",
+        .value = "property_value_6"
+    });
 
     CHECK(profile == ref);
 }
@@ -411,52 +380,44 @@ TEST_CASE("Basic Keybindings", "[profile]") {
 
     Profile ref;
     ref.version = Profile::CurrentVersion;
+    ref.actions.push_back({
+        .identifier = "profile.keybind.0",
+        .documentation = "T documentation",
+        .name = "T name",
+        .guiPath = "T Gui-Path",
+        .isLocal = true,
+        .script = "T script"
+    });
+    ref.keybindings.push_back({
+        .key = { Key::T, KeyModifier::None },
+        .action = "profile.keybind.0"
+    });
 
-    {
-        Profile::Action a;
-        a.identifier = "profile.keybind.0";
-        a.documentation = "T documentation";
-        a.name = "T name";
-        a.guiPath = "T Gui-Path";
-        a.isLocal = true;
-        a.script = "T script";
-        ref.actions.push_back(a);
+    ref.actions.push_back({
+        .identifier = "profile.keybind.1",
+        .documentation = "U documentation",
+        .name = "U name",
+        .guiPath = "U Gui-Path",
+        .isLocal = false,
+        .script = "U script"
+    });
+    ref.keybindings.push_back({
+        .key = { Key::U, KeyModifier::None },
+        .action = "profile.keybind.1"
+    });
 
-        Profile::Keybinding k;
-        k.action = "profile.keybind.0";
-        k.key = { Key::T, KeyModifier::None };
-        ref.keybindings.push_back(k);
-    }
-    {
-        Profile::Action a;
-        a.identifier = "profile.keybind.1";
-        a.documentation = "U documentation";
-        a.name = "U name";
-        a.guiPath = "U Gui-Path";
-        a.isLocal = false;
-        a.script = "U script";
-        ref.actions.push_back(a);
-
-        Profile::Keybinding k;
-        k.action = "profile.keybind.1";
-        k.key = { Key::U, KeyModifier::None };
-        ref.keybindings.push_back(k);
-    }
-    {
-        Profile::Action a;
-        a.identifier = "profile.keybind.2";
-        a.documentation = "CTRL+V documentation";
-        a.name = "CTRL+V name";
-        a.guiPath = "CTRL+V Gui-Path";
-        a.isLocal = false;
-        a.script = "CTRL+V script";
-        ref.actions.push_back(a);
-
-        Profile::Keybinding k;
-        k.action = "profile.keybind.2";
-        k.key = { Key::V, KeyModifier::Control };
-        ref.keybindings.push_back(k);
-    }
+    ref.actions.push_back({
+        .identifier = "profile.keybind.2",
+        .documentation = "CTRL+V documentation",
+        .name = "CTRL+V name",
+        .guiPath = "CTRL+V Gui-Path",
+        .isLocal = false,
+        .script = "CTRL+V script"
+    });
+    ref.keybindings.push_back({
+        .key = { Key::V, KeyModifier::Control },
+        .action = "profile.keybind.2"
+    });
 
     CHECK(profile == ref);
 }
@@ -467,11 +428,10 @@ TEST_CASE("Basic Time Relative", "[profile]") {
 
     Profile ref;
     ref.version = Profile::CurrentVersion;
-
-    Profile::Time time;
-    time.type = Profile::Time::Type::Relative;
-    time.value = "-1d";
-    ref.time = time;
+    ref.time = {
+        .type = Profile::Time::Type::Relative,
+        .value = "-1d"
+    };
 
     CHECK(profile == ref);
 }
@@ -482,11 +442,10 @@ TEST_CASE("Basic Time Absolute", "[profile]") {
 
     Profile ref;
     ref.version = Profile::CurrentVersion;
-
-    Profile::Time time;
-    time.type = Profile::Time::Type::Absolute;
-    time.value = "2020-06-01T12:00:00";
-    ref.time = time;
+    ref.time = {
+        .type = Profile::Time::Type::Absolute,
+        .value = "2020-06-01T12:00:00"
+    };
 
     CHECK(profile == ref);
 }
@@ -497,7 +456,6 @@ TEST_CASE("Basic Delta Times", "[profile]") {
 
     Profile ref;
     ref.version = Profile::CurrentVersion;
-
     ref.deltaTimes.push_back(1.0);
     ref.deltaTimes.push_back(30.0);
     ref.deltaTimes.push_back(60.0);
@@ -513,16 +471,15 @@ TEST_CASE("Basic Camera NavState (full)", "[profile]") {
 
     Profile ref;
     ref.version = Profile::CurrentVersion;
-
-    Profile::CameraNavState camera;
-    camera.anchor = "none";
-    camera.aim = "aim";
-    camera.referenceFrame = "root";
-    camera.position = glm::dvec3(1.0, 2.0, 3.0);
-    camera.up = glm::dvec3(4.0, 5.0, 6.0);
-    camera.yaw = 10.0;
-    camera.pitch = -10.0;
-    ref.camera = camera;
+    ref.camera = Profile::CameraNavState {
+        .anchor = "none",
+        .aim = "aim",
+        .referenceFrame = "root",
+        .position = glm::dvec3(1.0, 2.0, 3.0),
+        .up = glm::dvec3(4.0, 5.0, 6.0),
+        .yaw = 10.0,
+        .pitch = -10.0
+    };
 
     CHECK(profile == ref);
 }
@@ -534,15 +491,14 @@ TEST_CASE("Basic Camera NavState (no aim)", "[profile]") {
 
     Profile ref;
     ref.version = Profile::CurrentVersion;
-
-    Profile::CameraNavState camera;
-    camera.anchor = "none";
-    camera.referenceFrame = "root";
-    camera.position = glm::dvec3(1.0, 2.0, 3.0);
-    camera.up = glm::dvec3(4.0, 5.0, 6.0);
-    camera.yaw = 10.0;
-    camera.pitch = -10.0;
-    ref.camera = camera;
+    ref.camera = Profile::CameraNavState {
+        .anchor = "none",
+        .referenceFrame = "root",
+        .position = glm::dvec3(1.0, 2.0, 3.0),
+        .up = glm::dvec3(4.0, 5.0, 6.0),
+        .yaw = 10.0,
+        .pitch = -10.0
+    };
 
     CHECK(profile == ref);
 }
@@ -554,15 +510,14 @@ TEST_CASE("Basic Camera NavState (no pitch)", "[profile]") {
 
     Profile ref;
     ref.version = Profile::CurrentVersion;
-
-    Profile::CameraNavState camera;
-    camera.anchor = "none";
-    camera.aim = "aim";
-    camera.referenceFrame = "root";
-    camera.position = glm::dvec3(1.0, 2.0, 3.0);
-    camera.up = glm::dvec3(4.0, 5.0, 6.0);
-    camera.yaw = 10.0;
-    ref.camera = camera;
+    ref.camera = Profile::CameraNavState {
+        .anchor = "none",
+        .aim = "aim",
+        .referenceFrame = "root",
+        .position = glm::dvec3(1.0, 2.0, 3.0),
+        .up = glm::dvec3(4.0, 5.0, 6.0),
+        .yaw = 10.0
+    };
 
     CHECK(profile == ref);
 }
@@ -574,15 +529,14 @@ TEST_CASE("Basic Camera NavState (no up)", "[profile]") {
 
     Profile ref;
     ref.version = Profile::CurrentVersion;
-
-    Profile::CameraNavState camera;
-    camera.anchor = "none";
-    camera.aim = "aim";
-    camera.referenceFrame = "root";
-    camera.position = glm::dvec3(1.0, 2.0, 3.0);
-    camera.yaw = 10.0;
-    camera.pitch = -10.0;
-    ref.camera = camera;
+    ref.camera = Profile::CameraNavState {
+        .anchor = "none",
+        .aim = "aim",
+        .referenceFrame = "root",
+        .position = glm::dvec3(1.0, 2.0, 3.0),
+        .yaw = 10.0,
+        .pitch = -10.0
+    };
 
     CHECK(profile == ref);
 }
@@ -594,15 +548,14 @@ TEST_CASE("Basic Camera NavState (no yaw)", "[profile]") {
 
     Profile ref;
     ref.version = Profile::CurrentVersion;
-
-    Profile::CameraNavState camera;
-    camera.anchor = "none";
-    camera.aim = "aim";
-    camera.referenceFrame = "root";
-    camera.position = glm::dvec3(1.0, 2.0, 3.0);
-    camera.up = glm::dvec3(4.0, 5.0, 6.0);
-    camera.pitch = -10.0;
-    ref.camera = camera;
+    ref.camera = Profile::CameraNavState {
+        .anchor = "none",
+        .aim = "aim",
+        .referenceFrame = "root",
+        .position = glm::dvec3(1.0, 2.0, 3.0),
+        .up = glm::dvec3(4.0, 5.0, 6.0),
+        .pitch = -10.0,
+    };
 
     CHECK(profile == ref);
 }
@@ -613,12 +566,11 @@ TEST_CASE("Basic Camera GoToGeo (full)", "[profile]") {
 
     Profile ref;
     ref.version = Profile::CurrentVersion;
-
-    Profile::CameraGoToGeo camera;
-    camera.anchor = "anchor";
-    camera.latitude = 1.0;
-    camera.longitude = 2.0;
-    ref.camera = camera;
+    ref.camera = Profile::CameraGoToGeo {
+        .anchor = "anchor",
+        .latitude = 1.0,
+        .longitude = 2.0
+    };
 
     CHECK(profile == ref);
 }
@@ -630,13 +582,12 @@ TEST_CASE("Basic Camera GoToGeo (with altitude)", "[profile]") {
 
     Profile ref;
     ref.version = Profile::CurrentVersion;
-
-    Profile::CameraGoToGeo camera;
-    camera.anchor = "anchor";
-    camera.latitude = 1.0;
-    camera.longitude = 2.0;
-    camera.altitude = 4.0;
-    ref.camera = camera;
+    ref.camera = Profile::CameraGoToGeo {
+        .anchor = "anchor",
+        .latitude = 1.0,
+        .longitude = 2.0,
+        .altitude = 4.0
+    };
 
     CHECK(profile == ref);
 }
@@ -648,10 +599,9 @@ TEST_CASE("Basic Camera GoToNode", "[profile]") {
 
     Profile ref;
     ref.version = Profile::CurrentVersion;
-
-    Profile::CameraGoToNode camera;
-    camera.anchor = "anchor";
-    ref.camera = camera;
+    ref.camera = Profile::CameraGoToNode {
+        .anchor = "anchor"
+    };
 
     CHECK(profile == ref);
 }
@@ -663,11 +613,10 @@ TEST_CASE("Basic Camera GoToNode (with height)", "[profile]") {
 
     Profile ref;
     ref.version = Profile::CurrentVersion;
-
-    Profile::CameraGoToNode camera;
-    camera.anchor = "anchor";
-    camera.height = 100.0;
-    ref.camera = camera;
+    ref.camera = Profile::CameraGoToNode {
+        .anchor = "anchor",
+        .height = 100.0
+    };
 
     CHECK(profile == ref);
 }
@@ -678,10 +627,9 @@ TEST_CASE("Basic Mark Nodes", "[profile]") {
 
     Profile ref;
     ref.version = Profile::CurrentVersion;
-
-    ref.markNodes.push_back("node-1");
-    ref.markNodes.push_back("node-2");
-    ref.markNodes.push_back("node-3");
+    ref.markNodes.emplace_back("node-1");
+    ref.markNodes.emplace_back("node-2");
+    ref.markNodes.emplace_back("node-3");
 
     CHECK(profile == ref);
 }
@@ -693,10 +641,9 @@ TEST_CASE("Basic Additional Scripts", "[profile]") {
 
     Profile ref;
     ref.version = Profile::CurrentVersion;
-
-    ref.additionalScripts.push_back("script-1");
-    ref.additionalScripts.push_back("script-2");
-    ref.additionalScripts.push_back("script-3");
+    ref.additionalScripts.emplace_back("script-1");
+    ref.additionalScripts.emplace_back("script-2");
+    ref.additionalScripts.emplace_back("script-3");
 
     CHECK(profile == ref);
 }
@@ -710,163 +657,130 @@ TEST_CASE("Integration Full Test", "[profile]") {
 
     Profile ref;
     ref.version = Profile::CurrentVersion;
+    ref.meta = {
+        .name = "name",
+        .version = "version",
+        .description = "description",
+        .author = "author",
+        .url = "url",
+        .license = "license"
+    };
+    ref.modules.push_back({
+        .name = "abs-module"
+    });
+    ref.modules.push_back({
+        .name = "def-module",
+        .loadedInstruction = "instr"
+    });
+    ref.modules.push_back({
+        .name = "ghi-module",
+        .notLoadedInstruction = "not_instr"
+    });
+    ref.modules.push_back({
+        .name = "jkl-module",
+        .loadedInstruction = "instr",
+        .notLoadedInstruction = "not_instr"
+    });
+    ref.assets.emplace_back("scene/solarsystem/planets/earth/earth");
+    ref.assets.emplace_back("scene/solarsystem/planets/earth/satellites/satellites");
+    ref.assets.emplace_back("folder1/folder2/asset");
+    ref.assets.emplace_back("folder3/folder4/asset2");
+    ref.assets.emplace_back("folder5/folder6/asset3");
+    ref.properties.push_back({
+        .setType = Profile::Property::SetType::SetPropertyValue,
+        .name = "{earth_satellites}.Renderable.Enabled",
+        .value = "false"
+    });
+    ref.properties.push_back({
+        .setType = Profile::Property::SetType::SetPropertyValue,
+        .name = "property_name_1",
+        .value = "property_value_1"
+    });
+    ref.properties.push_back({
+        .setType = Profile::Property::SetType::SetPropertyValue,
+        .name = "property_name_2",
+        .value = "property_value_2"
+    });
+    ref.properties.push_back({
+        .setType = Profile::Property::SetType::SetPropertyValue,
+        .name = "property_name_3",
+        .value = "property_value_3"
+    });
+    ref.properties.push_back({
+        .setType = Profile::Property::SetType::SetPropertyValueSingle,
+        .name = "property_name_4",
+        .value = "property_value_4"
+    });
+    ref.properties.push_back({
+        .setType = Profile::Property::SetType::SetPropertyValueSingle,
+        .name = "property_name_5",
+        .value = "property_value_5"
+    });
+    ref.properties.push_back({
+        .setType = Profile::Property::SetType::SetPropertyValueSingle,
+        .name = "property_name_6",
+        .value = "property_value_6"
+    });
 
-    Profile::Meta meta;
-    meta.name = "name";
-    meta.version = "version";
-    meta.description = "description";
-    meta.author = "author";
-    meta.url = "url";
-    meta.license = "license";
-    ref.meta = meta;
+    ref.actions.push_back({
+        .identifier = "profile.keybind.0",
+        .documentation = "T documentation",
+        .name = "T name",
+        .guiPath = "T Gui-Path",
+        .isLocal = true,
+        .script = "T script"
+    });
+    ref.keybindings.push_back({
+        .key = { Key::T, KeyModifier::None },
+        .action = "profile.keybind.0"
+    });
 
-    {
-        Profile::Module m;
-        m.name = "abs-module";
-        ref.modules.push_back(m);
-    }
-    {
-        Profile::Module m;
-        m.name = "def-module";
-        m.loadedInstruction = "instr";
-        ref.modules.push_back(m);
-    }
-    {
-        Profile::Module m;
-        m.name = "ghi-module";
-        m.notLoadedInstruction = "not_instr";
-        ref.modules.push_back(m);
-    }
-    {
-        Profile::Module m;
-        m.name = "jkl-module";
-        m.loadedInstruction = "instr";
-        m.notLoadedInstruction = "not_instr";
-        ref.modules.push_back(m);
-    }
+    ref.actions.push_back({
+        .identifier = "profile.keybind.1",
+        .documentation = "U documentation",
+        .name = "U name",
+        .guiPath = "U Gui-Path",
+        .isLocal = false,
+        .script = "U script"
+    });
+    ref.keybindings.push_back({
+        .key = { Key::U, KeyModifier::None },
+        .action = "profile.keybind.1"
+    });
 
-    ref.assets.push_back("scene/solarsystem/planets/earth/earth");
-    ref.assets.push_back("scene/solarsystem/planets/earth/satellites/satellites");
-    ref.assets.push_back("folder1/folder2/asset");
-    ref.assets.push_back("folder3/folder4/asset2");
-    ref.assets.push_back("folder5/folder6/asset3");
+    ref.actions.push_back({
+        .identifier = "profile.keybind.2",
+        .documentation = "CTRL+V documentation",
+        .name = "CTRL+V name",
+        .guiPath = "CTRL+V Gui-Path",
+        .isLocal = false,
+        .script = "CTRL+V script"
+    });
+    ref.keybindings.push_back({
+        .key = { Key::V, KeyModifier::Control },
+        .action = "profile.keybind.2"
+    });
 
-    {
-        Profile::Property p;
-        p.setType = Profile::Property::SetType::SetPropertyValue;
-        p.name = "{earth_satellites}.Renderable.Enabled";
-        p.value = "false";
-        ref.properties.push_back(p);
-    }
-    {
-        Profile::Property p;
-        p.setType = Profile::Property::SetType::SetPropertyValue;
-        p.name = "property_name_1";
-        p.value = "property_value_1";
-        ref.properties.push_back(p);
-    }
-    {
-        Profile::Property p;
-        p.setType = Profile::Property::SetType::SetPropertyValue;
-        p.name = "property_name_2";
-        p.value = "property_value_2";
-        ref.properties.push_back(p);
-    }
-    {
-        Profile::Property p;
-        p.setType = Profile::Property::SetType::SetPropertyValue;
-        p.name = "property_name_3";
-        p.value = "property_value_3";
-        ref.properties.push_back(p);
-    }
-    {
-        Profile::Property p;
-        p.setType = Profile::Property::SetType::SetPropertyValueSingle;
-        p.name = "property_name_4";
-        p.value = "property_value_4";
-        ref.properties.push_back(p);
-    }
-    {
-        Profile::Property p;
-        p.setType = Profile::Property::SetType::SetPropertyValueSingle;
-        p.name = "property_name_5";
-        p.value = "property_value_5";
-        ref.properties.push_back(p);
-    }
-    {
-        Profile::Property p;
-        p.setType = Profile::Property::SetType::SetPropertyValueSingle;
-        p.name = "property_name_6";
-        p.value = "property_value_6";
-        ref.properties.push_back(p);
-    }
+    ref.time = {
+        .type = Profile::Time::Type::Relative,
+        .value = "-1d"
+    };
 
-    {
-        Profile::Action a;
-        a.identifier = "profile.keybind.0";
-        a.documentation = "T documentation";
-        a.name = "T name";
-        a.guiPath = "T Gui-Path";
-        a.isLocal = true;
-        a.script = "T script";
-        ref.actions.push_back(a);
+    ref.camera = Profile::CameraGoToGeo {
+        .anchor = "Earth",
+        .latitude = 58.5877,
+        .longitude = 16.1924,
+        .altitude = 2.0e+07
+    };
 
-        Profile::Keybinding k;
-        k.action = "profile.keybind.0";
-        k.key = { Key::T, KeyModifier::None };
-        ref.keybindings.push_back(k);
-    }
-    {
-        Profile::Action a;
-        a.identifier = "profile.keybind.1";
-        a.documentation = "U documentation";
-        a.name = "U name";
-        a.guiPath = "U Gui-Path";
-        a.isLocal = false;
-        a.script = "U script";
-        ref.actions.push_back(a);
+    ref.markNodes.emplace_back("Earth");
+    ref.markNodes.emplace_back("Mars");
+    ref.markNodes.emplace_back("Moon");
+    ref.markNodes.emplace_back("Sun");
 
-        Profile::Keybinding k;
-        k.action = "profile.keybind.1";
-        k.key = { Key::U, KeyModifier::None };
-        ref.keybindings.push_back(k);
-    }
-    {
-        Profile::Action a;
-        a.identifier = "profile.keybind.2";
-        a.documentation = "CTRL+V documentation";
-        a.name = "CTRL+V name";
-        a.guiPath = "CTRL+V Gui-Path";
-        a.isLocal = false;
-        a.script = "CTRL+V script";
-        ref.actions.push_back(a);
-
-        Profile::Keybinding k;
-        k.action = "profile.keybind.2";
-        k.key = { Key::V, KeyModifier::Control };
-        ref.keybindings.push_back(k);
-    }
-
-    Profile::Time time;
-    time.type = Profile::Time::Type::Relative;
-    time.value = "-1d";
-    ref.time = time;
-
-    Profile::CameraGoToGeo camera;
-    camera.anchor = "Earth";
-    camera.latitude = 58.5877;
-    camera.longitude = 16.1924;
-    camera.altitude = 2.0e+07;
-    ref.camera = camera;
-
-    ref.markNodes.push_back("Earth");
-    ref.markNodes.push_back("Mars");
-    ref.markNodes.push_back("Moon");
-    ref.markNodes.push_back("Sun");
-
-    ref.additionalScripts.push_back("script-1");
-    ref.additionalScripts.push_back("script-2");
-    ref.additionalScripts.push_back("script-3");
+    ref.additionalScripts.emplace_back("script-1");
+    ref.additionalScripts.emplace_back("script-2");
+    ref.additionalScripts.emplace_back("script-3");
 
     CHECK(profile == ref);
 }
@@ -891,13 +805,13 @@ TEST_CASE("Add asset to empty Profile (ignored)", "[profile]") {
     profile.ignoreUpdates = true;
     profile.addAsset("new-asset");
 
-    CHECK(profile.assets.size() == 0);
+    CHECK(profile.assets.empty());
 }
 
 TEST_CASE("Add asset to not-empty Profile", "[profile]") {
     Profile profile;
     profile.version = Profile::CurrentVersion;
-    profile.assets.push_back("old-asset");
+    profile.assets.emplace_back("old-asset");
 
     profile.addAsset("new-asset");
 
@@ -909,7 +823,7 @@ TEST_CASE("Add asset to not-empty Profile", "[profile]") {
 TEST_CASE("Add asset to not-empty Profile (ignored)", "[profile]") {
     Profile profile;
     profile.version = Profile::CurrentVersion;
-    profile.assets.push_back("old-asset");
+    profile.assets.emplace_back("old-asset");
 
     profile.ignoreUpdates = true;
     profile.addAsset("new-asset");
@@ -974,8 +888,8 @@ TEST_CASE("Removing non-exisiting asset", "[profile]") {
     Profile profile;
     profile.version = Profile::CurrentVersion;
 
-    profile.assets.push_back("asset1");
-    profile.assets.push_back("asset3");
+    profile.assets.emplace_back("asset1");
+    profile.assets.emplace_back("asset3");
 
     CHECK_NOTHROW(profile.removeAsset("unknown-asset"));
 }
@@ -984,8 +898,8 @@ TEST_CASE("Removing non-exisiting asset (ignored)", "[profile]") {
     Profile profile;
     profile.version = Profile::CurrentVersion;
 
-    profile.assets.push_back("asset1");
-    profile.assets.push_back("asset3");
+    profile.assets.emplace_back("asset1");
+    profile.assets.emplace_back("asset3");
 
     profile.ignoreUpdates = true;
     CHECK_NOTHROW(profile.removeAsset("unknown-asset"));
diff --git a/tests/test_rawvolumeio.cpp b/tests/test_rawvolumeio.cpp
index 4370ce1554..6e0b6fddb4 100644
--- a/tests/test_rawvolumeio.cpp
+++ b/tests/test_rawvolumeio.cpp
@@ -58,17 +58,16 @@ TEST_CASE("RawVolumeIO: TinyInputOutput", "[rawvolumeio]") {
 TEST_CASE("RawVolumeIO: BasicInputOutput", "[rawvolumeio]") {
     using namespace openspace::volume;
 
-    glm::uvec3 dims(2, 4, 8);
+    const glm::uvec3 dims = glm::uvec3(2, 4, 8);
     auto value = [dims](glm::uvec3 v) {
         return static_cast<float>(v.z * dims.z * dims.y + v.y * dims.y + v.x);
     };
 
     RawVolume<float> vol(dims);
     vol.forEachVoxel([&vol, &value](glm::uvec3 x, float) { vol.set(x, value(x)); });
+    vol.forEachVoxel([&value](const glm::uvec3& x, float v) { CHECK(v == value(x)); });
 
-    vol.forEachVoxel([&value](glm::uvec3 x, float v) { CHECK(v == value(x)); });
-
-    std::filesystem::path volumePath = absPath("${TESTDIR}/basicvolume.rawvolume");
+    const std::filesystem::path volumePath = absPath("${TESTDIR}/basicvolume.rawvolume");
 
     // Write the 2x4x8 volume to disk
     RawVolumeWriter<float> writer(volumePath.string());
@@ -76,8 +75,8 @@ TEST_CASE("RawVolumeIO: BasicInputOutput", "[rawvolumeio]") {
 
     // Read the 2x4x8 volume and make sure the value is the same.
     RawVolumeReader<float> reader(volumePath.string(), dims);
-    std::unique_ptr<RawVolume<float>> storedVolume = reader.read();
-    vol.forEachVoxel([&value](glm::uvec3 x, float v) {
+    const std::unique_ptr<RawVolume<float>> storedVolume = reader.read();
+    vol.forEachVoxel([&value](const glm::uvec3& x, float v) {
         CHECK(v == value(x));
     });
 }
diff --git a/tests/test_scriptscheduler.cpp b/tests/test_scriptscheduler.cpp
index 2a7cc2ee9c..0288c26e96 100644
--- a/tests/test_scriptscheduler.cpp
+++ b/tests/test_scriptscheduler.cpp
@@ -280,16 +280,16 @@ TEST_CASE("ScriptScheduler: Empty", "[scriptscheduler]") {
     };
 
     // First test if a new ScriptScheduler will return an empty list
-    for (double t : TestTimes) {
+    for (const double t : TestTimes) {
         ScriptScheduler scheduler;
-        std::vector<std::string> res = scheduler.progressTo(t);
+        const std::vector<std::string> res = scheduler.progressTo(t);
         CHECK(res.empty());
     }
 
     // Then test the same thing but keeping the same ScriptScheduler
     ScriptScheduler scheduler;
-    for (double t : TestTimes) {
-        std::vector<std::string> res = scheduler.progressTo(t);
+    for (const double t : TestTimes) {
+        const std::vector<std::string> res = scheduler.progressTo(t);
         CHECK(res.empty());
     }
 
@@ -398,7 +398,7 @@ TEST_CASE("ScriptScheduler: CurrentTime", "[scriptscheduler]") {
         -std::numeric_limits<double>::max(), std::numeric_limits<double>::max()
     };
 
-    for (double t : TestValues) {
+    for (const double t : TestValues) {
         ScriptScheduler scheduler;
         scheduler.progressTo(t);
         CHECK(t == scheduler.currentTime());
diff --git a/tests/test_settings.cpp b/tests/test_settings.cpp
index ade6863421..de869f6988 100644
--- a/tests/test_settings.cpp
+++ b/tests/test_settings.cpp
@@ -40,14 +40,14 @@ TEST_CASE("Settings Load: Empty", "[settings]") {
 }
 )";
 
-    std::filesystem::path path = std::filesystem::temp_directory_path();
-    std::filesystem::path file = path / "test_settings_load_empty.json";
+    const std::filesystem::path path = std::filesystem::temp_directory_path();
+    const std::filesystem::path file = path / "test_settings_load_empty.json";
     {
         std::ofstream f(file);
         f << Source;
     }
 
-    Settings settings = loadSettings(file);
+    const Settings settings = loadSettings(file);
 
     CHECK(!settings.hasStartedBefore.has_value());
     CHECK(!settings.configuration.has_value());
@@ -67,14 +67,14 @@ TEST_CASE("Settings Load: Really Empty", "[settings]") {
 }
 )";
 
-    std::filesystem::path path = std::filesystem::temp_directory_path();
-    std::filesystem::path file = path / "test_settings_load_really-empty.json";
+    const std::filesystem::path path = std::filesystem::temp_directory_path();
+    const std::filesystem::path file = path / "test_settings_load_really-empty.json";
     {
         std::ofstream f(file);
         f << Source;
     }
 
-    Settings settings = loadSettings(file);
+    const Settings settings = loadSettings(file);
 
     CHECK(!settings.hasStartedBefore.has_value());
     CHECK(!settings.configuration.has_value());
@@ -89,13 +89,13 @@ TEST_CASE("Settings Load: Really Empty", "[settings]") {
 }
 
 TEST_CASE("Settings Save: Empty", "[settings]") {
-    std::filesystem::path path = std::filesystem::temp_directory_path();
-    std::filesystem::path file = path / "test_settings_save_empty.json";
+    const std::filesystem::path path = std::filesystem::temp_directory_path();
+    const std::filesystem::path file = path / "test_settings_save_empty.json";
 
-    Settings srcSettings;
+    const Settings srcSettings;
     saveSettings(srcSettings, file);
 
-    Settings cmpSettings = loadSettings(file);
+    const Settings cmpSettings = loadSettings(file);
     CHECK(srcSettings == cmpSettings);
 }
 
@@ -107,14 +107,14 @@ TEST_CASE("Settings Load: Started Before", "[settings]") {
 }
 )";
 
-    std::filesystem::path path = std::filesystem::temp_directory_path();
-    std::filesystem::path file = path / "test_settings_load_started-before.json";
+    const std::filesystem::path path = std::filesystem::temp_directory_path();
+    const std::filesystem::path file = path / "test_settings_load_started-before.json";
     {
         std::ofstream f(file);
         f << Source;
     }
 
-    Settings settings = loadSettings(file);
+    const Settings settings = loadSettings(file);
 
     REQUIRE(settings.hasStartedBefore.has_value());
     CHECK(*settings.hasStartedBefore == false);
@@ -130,15 +130,15 @@ TEST_CASE("Settings Load: Started Before", "[settings]") {
 }
 
 TEST_CASE("Settings Save: Started Before", "[settings]") {
-    std::filesystem::path path = std::filesystem::temp_directory_path();
-    std::filesystem::path file = path / "test_settings_save_started-before.json";
+    const std::filesystem::path path = std::filesystem::temp_directory_path();
+    const std::filesystem::path file = path / "test_settings_save_started-before.json";
 
-    Settings srcSettings = {
+    const Settings srcSettings = {
         .hasStartedBefore = false
     };
     saveSettings(srcSettings, file);
 
-    Settings cmpSettings = loadSettings(file);
+    const Settings cmpSettings = loadSettings(file);
     CHECK(srcSettings == cmpSettings);
 }
 
@@ -150,14 +150,14 @@ TEST_CASE("Settings Load: Configuration", "[settings]") {
 }
 )";
 
-    std::filesystem::path path = std::filesystem::temp_directory_path();
-    std::filesystem::path file = path / "test_settings_load_config.json";
+    const std::filesystem::path path = std::filesystem::temp_directory_path();
+    const std::filesystem::path file = path / "test_settings_load_config.json";
     {
         std::ofstream f(file);
         f << Source;
     }
 
-    Settings settings = loadSettings(file);
+    const Settings settings = loadSettings(file);
 
     CHECK(!settings.hasStartedBefore.has_value());
     REQUIRE(settings.configuration.has_value());
@@ -173,15 +173,15 @@ TEST_CASE("Settings Load: Configuration", "[settings]") {
 }
 
 TEST_CASE("Settings Save: Configuration", "[settings]") {
-    std::filesystem::path path = std::filesystem::temp_directory_path();
-    std::filesystem::path file = path / "test_settings_save_config.json";
+    const std::filesystem::path path = std::filesystem::temp_directory_path();
+    const std::filesystem::path file = path / "test_settings_save_config.json";
 
-    Settings srcSettings = {
+    const Settings srcSettings = {
         .configuration = "abc"
     };
     saveSettings(srcSettings, file);
 
-    Settings cmpSettings = loadSettings(file);
+    const Settings cmpSettings = loadSettings(file);
     CHECK(srcSettings == cmpSettings);
 }
 
@@ -193,14 +193,14 @@ TEST_CASE("Settings Load: Configuration Remember", "[settings]") {
 }
 )";
 
-    std::filesystem::path path = std::filesystem::temp_directory_path();
-    std::filesystem::path file = path / "test_settings_load_config_remember.json";
+    const std::filesystem::path path = std::filesystem::temp_directory_path();
+    const std::filesystem::path file = path / "test_settings_load_config_remember.json";
     {
         std::ofstream f(file);
         f << Source;
     }
 
-    Settings settings = loadSettings(file);
+    const Settings settings = loadSettings(file);
 
     CHECK(!settings.hasStartedBefore.has_value());
     CHECK(!settings.configuration.has_value());
@@ -216,15 +216,15 @@ TEST_CASE("Settings Load: Configuration Remember", "[settings]") {
 }
 
 TEST_CASE("Settings Save: Configuration Remember", "[settings]") {
-    std::filesystem::path path = std::filesystem::temp_directory_path();
-    std::filesystem::path file = path / "test_settings_save_config_remember.json";
+    const std::filesystem::path path = std::filesystem::temp_directory_path();
+    const std::filesystem::path file = path / "test_settings_save_config_remember.json";
 
-    Settings srcSettings = {
+    const Settings srcSettings = {
         .rememberLastConfiguration = true
     };
     saveSettings(srcSettings, file);
 
-    Settings cmpSettings = loadSettings(file);
+    const Settings cmpSettings = loadSettings(file);
     CHECK(srcSettings == cmpSettings);
 }
 
@@ -236,14 +236,14 @@ TEST_CASE("Settings Load: Profile", "[settings]") {
 }
 )";
 
-    std::filesystem::path path = std::filesystem::temp_directory_path();
-    std::filesystem::path file = path / "test_settings_load_profile.json";
+    const std::filesystem::path path = std::filesystem::temp_directory_path();
+    const std::filesystem::path file = path / "test_settings_load_profile.json";
     {
         std::ofstream f(file);
         f << Source;
     }
 
-    Settings settings = loadSettings(file);
+    const Settings settings = loadSettings(file);
 
     CHECK(!settings.hasStartedBefore.has_value());
     CHECK(!settings.configuration.has_value());
@@ -259,15 +259,15 @@ TEST_CASE("Settings Load: Profile", "[settings]") {
 }
 
 TEST_CASE("Settings Save: Profile", "[settings]") {
-    std::filesystem::path path = std::filesystem::temp_directory_path();
-    std::filesystem::path file = path / "test_settings_save_profile.json";
+    const std::filesystem::path path = std::filesystem::temp_directory_path();
+    const std::filesystem::path file = path / "test_settings_save_profile.json";
 
-    Settings srcSettings = {
+    const Settings srcSettings = {
         .profile = "def"
     };
     saveSettings(srcSettings, file);
 
-    Settings cmpSettings = loadSettings(file);
+    const Settings cmpSettings = loadSettings(file);
     CHECK(srcSettings == cmpSettings);
 }
 
@@ -279,14 +279,14 @@ TEST_CASE("Settings Load: Profile Remember", "[settings]") {
 }
 )";
 
-    std::filesystem::path path = std::filesystem::temp_directory_path();
-    std::filesystem::path file = path / "test_settings_load_profile_remember.json";
+    const std::filesystem::path path = std::filesystem::temp_directory_path();
+    const std::filesystem::path file = path / "test_settings_load_profile_remember.json";
     {
         std::ofstream f(file);
         f << Source;
     }
 
-    Settings settings = loadSettings(file);
+    const Settings settings = loadSettings(file);
 
     CHECK(!settings.hasStartedBefore.has_value());
     CHECK(!settings.configuration.has_value());
@@ -302,15 +302,15 @@ TEST_CASE("Settings Load: Profile Remember", "[settings]") {
 }
 
 TEST_CASE("Settings Save: Profile Remember", "[settings]") {
-    std::filesystem::path path = std::filesystem::temp_directory_path();
-    std::filesystem::path file = path / "test_settings_save_profile.json";
+    const std::filesystem::path path = std::filesystem::temp_directory_path();
+    const std::filesystem::path file = path / "test_settings_save_profile.json";
 
-    Settings srcSettings = {
+    const Settings srcSettings = {
         .rememberLastProfile = false
     };
     saveSettings(srcSettings, file);
 
-    Settings cmpSettings = loadSettings(file);
+    const Settings cmpSettings = loadSettings(file);
     CHECK(srcSettings == cmpSettings);
 }
 
@@ -322,14 +322,14 @@ TEST_CASE("Settings Load: Visibility/NoviceUser", "[settings]") {
 }
 )";
 
-    std::filesystem::path path = std::filesystem::temp_directory_path();
-    std::filesystem::path file = path / "test_settings_load_visibility_novice.json";
+    const std::filesystem::path path = std::filesystem::temp_directory_path();
+    const std::filesystem::path file = path / "test_settings_load_visibility_novice.json";
     {
         std::ofstream f(file);
         f << Source;
     }
 
-    Settings settings = loadSettings(file);
+    const Settings settings = loadSettings(file);
 
     CHECK(!settings.hasStartedBefore.has_value());
     CHECK(!settings.configuration.has_value());
@@ -345,15 +345,15 @@ TEST_CASE("Settings Load: Visibility/NoviceUser", "[settings]") {
 }
 
 TEST_CASE("Settings Save: Visibility/NoviceUser", "[settings]") {
-    std::filesystem::path path = std::filesystem::temp_directory_path();
-    std::filesystem::path file = path / "test_settings_save_noviceuser.json";
+    const std::filesystem::path path = std::filesystem::temp_directory_path();
+    const std::filesystem::path file = path / "test_settings_save_noviceuser.json";
 
-    Settings srcSettings = {
+    const Settings srcSettings = {
         .visibility = openspace::properties::Property::Visibility::NoviceUser
     };
     saveSettings(srcSettings, file);
 
-    Settings cmpSettings = loadSettings(file);
+    const Settings cmpSettings = loadSettings(file);
     CHECK(srcSettings == cmpSettings);
 }
 
@@ -365,14 +365,14 @@ TEST_CASE("Settings Load: Visibility/User", "[settings]") {
 }
 )";
 
-    std::filesystem::path path = std::filesystem::temp_directory_path();
-    std::filesystem::path file = path / "test_settings_load_visibility_user.json";
+    const std::filesystem::path path = std::filesystem::temp_directory_path();
+    const std::filesystem::path file = path / "test_settings_load_visibility_user.json";
     {
         std::ofstream f(file);
         f << Source;
     }
 
-    Settings settings = loadSettings(file);
+    const Settings settings = loadSettings(file);
 
     CHECK(!settings.hasStartedBefore.has_value());
     CHECK(!settings.configuration.has_value());
@@ -388,15 +388,15 @@ TEST_CASE("Settings Load: Visibility/User", "[settings]") {
 }
 
 TEST_CASE("Settings Save: Visibility/User", "[settings]") {
-    std::filesystem::path path = std::filesystem::temp_directory_path();
-    std::filesystem::path file = path / "test_settings_save_user.json";
+    const std::filesystem::path path = std::filesystem::temp_directory_path();
+    const std::filesystem::path file = path / "test_settings_save_user.json";
 
-    Settings srcSettings = {
+    const Settings srcSettings = {
         .visibility = openspace::properties::Property::Visibility::User
     };
     saveSettings(srcSettings, file);
 
-    Settings cmpSettings = loadSettings(file);
+    const Settings cmpSettings = loadSettings(file);
     CHECK(srcSettings == cmpSettings);
 }
 
@@ -408,14 +408,14 @@ TEST_CASE("Settings Load: Visibility/AdvancedUser", "[settings]") {
 }
 )";
 
-    std::filesystem::path path = std::filesystem::temp_directory_path();
-    std::filesystem::path file = path / "test_settings_load_visibility_advanced.json";
+    const  std::filesystem::path path = std::filesystem::temp_directory_path();
+    const std::filesystem::path file = path / "test_settings_load_vis_advanced.json";
     {
         std::ofstream f(file);
         f << Source;
     }
 
-    Settings settings = loadSettings(file);
+    const Settings settings = loadSettings(file);
 
     CHECK(!settings.hasStartedBefore.has_value());
     CHECK(!settings.configuration.has_value());
@@ -431,15 +431,15 @@ TEST_CASE("Settings Load: Visibility/AdvancedUser", "[settings]") {
 }
 
 TEST_CASE("Settings Save: Visibility/AdvancedUser", "[settings]") {
-    std::filesystem::path path = std::filesystem::temp_directory_path();
-    std::filesystem::path file = path / "test_settings_save_advanceduser.json";
+    const std::filesystem::path path = std::filesystem::temp_directory_path();
+    const std::filesystem::path file = path / "test_settings_save_advanceduser.json";
 
-    Settings srcSettings = {
+    const Settings srcSettings = {
         .visibility = openspace::properties::Property::Visibility::AdvancedUser
     };
     saveSettings(srcSettings, file);
 
-    Settings cmpSettings = loadSettings(file);
+    const Settings cmpSettings = loadSettings(file);
     CHECK(srcSettings == cmpSettings);
 }
 
@@ -451,14 +451,14 @@ TEST_CASE("Settings Load: Visibility/Developer", "[settings]") {
 }
 )";
 
-    std::filesystem::path path = std::filesystem::temp_directory_path();
-    std::filesystem::path file = path / "test_settings_load_visibility_developer.json";
+    const std::filesystem::path path = std::filesystem::temp_directory_path();
+    const std::filesystem::path file = path / "test_settings_load_vis_developer.json";
     {
         std::ofstream f(file);
         f << Source;
     }
 
-    Settings settings = loadSettings(file);
+    const Settings settings = loadSettings(file);
 
     CHECK(!settings.hasStartedBefore.has_value());
     CHECK(!settings.configuration.has_value());
@@ -474,15 +474,15 @@ TEST_CASE("Settings Load: Visibility/Developer", "[settings]") {
 }
 
 TEST_CASE("Settings Save: Visibility/Developer", "[settings]") {
-    std::filesystem::path path = std::filesystem::temp_directory_path();
-    std::filesystem::path file = path / "test_settings_save_developer.json";
+    const std::filesystem::path path = std::filesystem::temp_directory_path();
+    const std::filesystem::path file = path / "test_settings_save_developer.json";
 
-    Settings srcSettings = {
+    const Settings srcSettings = {
         .visibility = openspace::properties::Property::Visibility::Developer
     };
     saveSettings(srcSettings, file);
 
-    Settings cmpSettings = loadSettings(file);
+    const Settings cmpSettings = loadSettings(file);
     CHECK(srcSettings == cmpSettings);
 }
 
@@ -494,14 +494,14 @@ TEST_CASE("Settings Load: Bypass Launcher", "[settings]") {
 }
 )";
 
-    std::filesystem::path path = std::filesystem::temp_directory_path();
-    std::filesystem::path file = path / "test_settings_load_bypass.json";
+    const std::filesystem::path path = std::filesystem::temp_directory_path();
+    const std::filesystem::path file = path / "test_settings_load_bypass.json";
     {
         std::ofstream f(file);
         f << Source;
     }
 
-    Settings settings = loadSettings(file);
+    const Settings settings = loadSettings(file);
 
     CHECK(!settings.hasStartedBefore.has_value());
     CHECK(!settings.configuration.has_value());
@@ -517,15 +517,15 @@ TEST_CASE("Settings Load: Bypass Launcher", "[settings]") {
 }
 
 TEST_CASE("Settings Save: Bypass Launcher", "[settings]") {
-    std::filesystem::path path = std::filesystem::temp_directory_path();
-    std::filesystem::path file = path / "test_settings_save_bypass.json";
+    const std::filesystem::path path = std::filesystem::temp_directory_path();
+    const std::filesystem::path file = path / "test_settings_save_bypass.json";
 
-    Settings srcSettings = {
+    const Settings srcSettings = {
         .bypassLauncher = false
     };
     saveSettings(srcSettings, file);
 
-    Settings cmpSettings = loadSettings(file);
+    const Settings cmpSettings = loadSettings(file);
     CHECK(srcSettings == cmpSettings);
 }
 
@@ -537,14 +537,14 @@ TEST_CASE("Settings Load: LayerServer/All", "[settings]") {
 }
 )";
 
-    std::filesystem::path path = std::filesystem::temp_directory_path();
-    std::filesystem::path file = path / "test_settings_load_layerserver_all.json";
+    const std::filesystem::path path = std::filesystem::temp_directory_path();
+    const std::filesystem::path file = path / "test_settings_load_layerserver_all.json";
     {
         std::ofstream f(file);
         f << Source;
     }
 
-    Settings settings = loadSettings(file);
+    const Settings settings = loadSettings(file);
 
     CHECK(!settings.hasStartedBefore.has_value());
     CHECK(!settings.configuration.has_value());
@@ -560,15 +560,15 @@ TEST_CASE("Settings Load: LayerServer/All", "[settings]") {
 }
 
 TEST_CASE("Settings Save: LayerServer/All", "[settings]") {
-    std::filesystem::path path = std::filesystem::temp_directory_path();
-    std::filesystem::path file = path / "test_settings_save_layerserver_all.json";
+    const std::filesystem::path path = std::filesystem::temp_directory_path();
+    const std::filesystem::path file = path / "test_settings_save_layerserver_all.json";
 
-    Settings srcSettings = {
+    const Settings srcSettings = {
         .layerServer = openspace::Configuration::LayerServer::All
     };
     saveSettings(srcSettings, file);
 
-    Settings cmpSettings = loadSettings(file);
+    const Settings cmpSettings = loadSettings(file);
     CHECK(srcSettings == cmpSettings);
 }
 
@@ -580,14 +580,14 @@ TEST_CASE("Settings Load: LayerServer/NewYork", "[settings]") {
 }
 )";
 
-    std::filesystem::path path = std::filesystem::temp_directory_path();
-    std::filesystem::path file = path / "test_settings_load_layerserver_newyork.json";
+    const std::filesystem::path path = std::filesystem::temp_directory_path();
+    const std::filesystem::path file = path / "test_settings_load_layerserver_nyc.json";
     {
         std::ofstream f(file);
         f << Source;
     }
 
-    Settings settings = loadSettings(file);
+    const Settings settings = loadSettings(file);
 
     CHECK(!settings.hasStartedBefore.has_value());
     CHECK(!settings.configuration.has_value());
@@ -603,15 +603,15 @@ TEST_CASE("Settings Load: LayerServer/NewYork", "[settings]") {
 }
 
 TEST_CASE("Settings Save: LayerServer/NewYork", "[settings]") {
-    std::filesystem::path path = std::filesystem::temp_directory_path();
-    std::filesystem::path file = path / "test_settings_save_layerserver_newyork.json";
+    const std::filesystem::path path = std::filesystem::temp_directory_path();
+    const std::filesystem::path file = path / "test_settings_save_layerserver_nyc.json";
 
-    Settings srcSettings = {
+    const Settings srcSettings = {
         .layerServer = openspace::Configuration::LayerServer::NewYork
     };
     saveSettings(srcSettings, file);
 
-    Settings cmpSettings = loadSettings(file);
+    const Settings cmpSettings = loadSettings(file);
     CHECK(srcSettings == cmpSettings);
 }
 
@@ -623,14 +623,15 @@ TEST_CASE("Settings Load: LayerServer/Sweden", "[settings]") {
 }
 )";
 
-    std::filesystem::path path = std::filesystem::temp_directory_path();
-    std::filesystem::path file = path / "test_settings_load_layerserver_sweden.json";
+    const std::filesystem::path path = std::filesystem::temp_directory_path();
+    const std::filesystem::path file =
+        path / "test_settings_load_layerserver_sweden.json";
     {
         std::ofstream f(file);
         f << Source;
     }
 
-    Settings settings = loadSettings(file);
+    const Settings settings = loadSettings(file);
 
     CHECK(!settings.hasStartedBefore.has_value());
     CHECK(!settings.configuration.has_value());
@@ -646,15 +647,15 @@ TEST_CASE("Settings Load: LayerServer/Sweden", "[settings]") {
 }
 
 TEST_CASE("Settings Save: LayerServer/Sweden", "[settings]") {
-    std::filesystem::path path = std::filesystem::temp_directory_path();
-    std::filesystem::path file = path / "test_settings_save_layerserver_sweden.json";
+    const std::filesystem::path path = std::filesystem::temp_directory_path();
+    const std::filesystem::path file = path / "test_settings_save_layers_sweden.json";
 
-    Settings srcSettings = {
+    const Settings srcSettings = {
         .layerServer = openspace::Configuration::LayerServer::Sweden
     };
     saveSettings(srcSettings, file);
 
-    Settings cmpSettings = loadSettings(file);
+    const Settings cmpSettings = loadSettings(file);
     CHECK(srcSettings == cmpSettings);
 }
 
@@ -666,14 +667,14 @@ TEST_CASE("Settings Load: LayerServer/Utah", "[settings]") {
 }
 )";
 
-    std::filesystem::path path = std::filesystem::temp_directory_path();
-    std::filesystem::path file = path / "test_settings_load_layerserver_utah.json";
+    const std::filesystem::path path = std::filesystem::temp_directory_path();
+    const std::filesystem::path file = path / "test_settings_load_layerserver_utah.json";
     {
         std::ofstream f(file);
         f << Source;
     }
 
-    Settings settings = loadSettings(file);
+    const Settings settings = loadSettings(file);
 
     CHECK(!settings.hasStartedBefore.has_value());
     CHECK(!settings.configuration.has_value());
@@ -689,15 +690,15 @@ TEST_CASE("Settings Load: LayerServer/Utah", "[settings]") {
 }
 
 TEST_CASE("Settings Save: LayerServer/Utah", "[settings]") {
-    std::filesystem::path path = std::filesystem::temp_directory_path();
-    std::filesystem::path file = path / "test_settings_save_layerserver_utah.json";
+    const std::filesystem::path path = std::filesystem::temp_directory_path();
+    const std::filesystem::path file = path / "test_settings_save_layerserver_utah.json";
 
-    Settings srcSettings = {
+    const Settings srcSettings = {
         .layerServer = openspace::Configuration::LayerServer::Utah
     };
     saveSettings(srcSettings, file);
 
-    Settings cmpSettings = loadSettings(file);
+    const Settings cmpSettings = loadSettings(file);
     CHECK(srcSettings == cmpSettings);
 }
 
@@ -709,14 +710,14 @@ TEST_CASE("Settings Load: LayerServer/None", "[settings]") {
 }
 )";
 
-    std::filesystem::path path = std::filesystem::temp_directory_path();
-    std::filesystem::path file = path / "test_settings_load_layerserver_none.json";
+    const std::filesystem::path path = std::filesystem::temp_directory_path();
+    const std::filesystem::path file = path / "test_settings_load_layerserver_none.json";
     {
         std::ofstream f(file);
         f << Source;
     }
 
-    Settings settings = loadSettings(file);
+    const Settings settings = loadSettings(file);
 
     CHECK(!settings.hasStartedBefore.has_value());
     CHECK(!settings.configuration.has_value());
@@ -732,15 +733,15 @@ TEST_CASE("Settings Load: LayerServer/None", "[settings]") {
 }
 
 TEST_CASE("Settings Save: LayerServer/None", "[settings]") {
-    std::filesystem::path path = std::filesystem::temp_directory_path();
-    std::filesystem::path file = path / "test_settings_save_layerserver_none.json";
+    const std::filesystem::path path = std::filesystem::temp_directory_path();
+    const std::filesystem::path file = path / "test_settings_save_layerserver_none.json";
 
-    Settings srcSettings = {
+    const Settings srcSettings = {
         .layerServer = openspace::Configuration::LayerServer::None
     };
     saveSettings(srcSettings, file);
 
-    Settings cmpSettings = loadSettings(file);
+    const Settings cmpSettings = loadSettings(file);
     CHECK(srcSettings == cmpSettings);
 }
 
@@ -754,14 +755,14 @@ TEST_CASE("Settings Load: MRF IsEnabled", "[settings]") {
 }
 )";
 
-    std::filesystem::path path = std::filesystem::temp_directory_path();
-    std::filesystem::path file = path / "test_settings_load_mrf_isenabled.json";
+    const std::filesystem::path path = std::filesystem::temp_directory_path();
+    const std::filesystem::path file = path / "test_settings_load_mrf_isenabled.json";
     {
         std::ofstream f(file);
         f << Source;
     }
 
-    Settings settings = loadSettings(file);
+    const Settings settings = loadSettings(file);
 
     CHECK(!settings.hasStartedBefore.has_value());
     CHECK(!settings.configuration.has_value());
@@ -777,17 +778,17 @@ TEST_CASE("Settings Load: MRF IsEnabled", "[settings]") {
 }
 
 TEST_CASE("Settings Save: MRF IsEnabled", "[settings]") {
-    std::filesystem::path path = std::filesystem::temp_directory_path();
-    std::filesystem::path file = path / "test_settings_save_mrf_isenabled.json";
+    const std::filesystem::path path = std::filesystem::temp_directory_path();
+    const std::filesystem::path file = path / "test_settings_save_mrf_isenabled.json";
 
-    Settings srcSettings = {
+    const Settings srcSettings = {
         .mrf = Settings::MRF {
             .isEnabled = true
         }
     };
     saveSettings(srcSettings, file);
 
-    Settings cmpSettings = loadSettings(file);
+    const Settings cmpSettings = loadSettings(file);
     CHECK(srcSettings == cmpSettings);
 }
 
@@ -801,14 +802,14 @@ TEST_CASE("Settings Load: MRF Location", "[settings]") {
 }
 )";
 
-    std::filesystem::path path = std::filesystem::temp_directory_path();
-    std::filesystem::path file = path / "test_settings_load_mrf_location.json";
+    const std::filesystem::path path = std::filesystem::temp_directory_path();
+    const std::filesystem::path file = path / "test_settings_load_mrf_location.json";
     {
         std::ofstream f(file);
         f << Source;
     }
 
-    Settings settings = loadSettings(file);
+    const Settings settings = loadSettings(file);
 
     CHECK(!settings.hasStartedBefore.has_value());
     CHECK(!settings.configuration.has_value());
@@ -824,17 +825,17 @@ TEST_CASE("Settings Load: MRF Location", "[settings]") {
 }
 
 TEST_CASE("Settings Save: MRF Location", "[settings]") {
-    std::filesystem::path path = std::filesystem::temp_directory_path();
-    std::filesystem::path file = path / "test_settings_save_mrf_location.json";
+    const std::filesystem::path path = std::filesystem::temp_directory_path();
+    const std::filesystem::path file = path / "test_settings_save_mrf_location.json";
 
-    Settings srcSettings = {
+    const Settings srcSettings = {
         .mrf = Settings::MRF {
             .location = "ghi"
         }
     };
     saveSettings(srcSettings, file);
 
-    Settings cmpSettings = loadSettings(file);
+    const Settings cmpSettings = loadSettings(file);
     CHECK(srcSettings == cmpSettings);
 }
 
@@ -857,14 +858,14 @@ TEST_CASE("Settings Load: Full", "[settings]") {
 }
 )";
 
-    std::filesystem::path path = std::filesystem::temp_directory_path();
-    std::filesystem::path file = path / "test_settings_load_full.json";
+    const std::filesystem::path path = std::filesystem::temp_directory_path();
+    const std::filesystem::path file = path / "test_settings_load_full.json";
     {
         std::ofstream f(file);
         f << Source;
     }
 
-    Settings settings = loadSettings(file);
+    const Settings settings = loadSettings(file);
 
     REQUIRE(settings.hasStartedBefore.has_value());
     CHECK(*settings.hasStartedBefore == false);
@@ -889,10 +890,10 @@ TEST_CASE("Settings Load: Full", "[settings]") {
 }
 
 TEST_CASE("Settings Save: Full", "[settings]") {
-    std::filesystem::path path = std::filesystem::temp_directory_path();
-    std::filesystem::path file = path / "test_settings_save_full.json";
+    const std::filesystem::path path = std::filesystem::temp_directory_path();
+    const std::filesystem::path file = path / "test_settings_save_full.json";
 
-    Settings srcSettings = {
+    const Settings srcSettings = {
         .hasStartedBefore = false,
         .configuration = "abc",
         .rememberLastConfiguration = true,
@@ -908,7 +909,7 @@ TEST_CASE("Settings Save: Full", "[settings]") {
     };
     saveSettings(srcSettings, file);
 
-    Settings cmpSettings = loadSettings(file);
+    const Settings cmpSettings = loadSettings(file);
     CHECK(srcSettings == cmpSettings);
 }
 
@@ -919,8 +920,8 @@ TEST_CASE("Settings Load Fail: Illegal version", "[settings]") {
 }
 )";
 
-    std::filesystem::path path = std::filesystem::temp_directory_path();
-    std::filesystem::path file = path / "test_settings_load_fail_illegal_version.json";
+    const std::filesystem::path path = std::filesystem::temp_directory_path();
+    const std::filesystem::path file = path / "test_settings_load_fail_illegal_ver.json";
     {
         std::ofstream f(file);
         f << Source;
@@ -937,8 +938,8 @@ TEST_CASE("Settings Load Fail: Started before", "[settings]") {
 }
 )";
 
-    std::filesystem::path path = std::filesystem::temp_directory_path();
-    std::filesystem::path file = path / "test_settings_load_fail_started-before.json";
+    const std::filesystem::path path = std::filesystem::temp_directory_path();
+    const std::filesystem::path file = path / "test_settings_load_fail_start-before.json";
     {
         std::ofstream f(file);
         f << Source;
@@ -955,8 +956,8 @@ TEST_CASE("Settings Load Fail: Config", "[settings]") {
 }
 )";
 
-    std::filesystem::path path = std::filesystem::temp_directory_path();
-    std::filesystem::path file = path / "test_settings_load_fail_config.json";
+    const std::filesystem::path path = std::filesystem::temp_directory_path();
+    const std::filesystem::path file = path / "test_settings_load_fail_config.json";
     {
         std::ofstream f(file);
         f << Source;
@@ -973,8 +974,8 @@ TEST_CASE("Settings Load Fail: Profile", "[settings]") {
 }
 )";
 
-    std::filesystem::path path = std::filesystem::temp_directory_path();
-    std::filesystem::path file = path / "test_settings_load_fail_profile.json";
+    const std::filesystem::path path = std::filesystem::temp_directory_path();
+    const std::filesystem::path file = path / "test_settings_load_fail_profile.json";
     {
         std::ofstream f(file);
         f << Source;
@@ -991,8 +992,8 @@ TEST_CASE("Settings Load Fail: Visibility type", "[settings]") {
 }
 )";
 
-    std::filesystem::path path = std::filesystem::temp_directory_path();
-    std::filesystem::path file = path / "test_settings_load_fail_visibility_type.json";
+    const std::filesystem::path path = std::filesystem::temp_directory_path();
+    const std::filesystem::path file = path / "test_settings_load_fail_vis_type.json";
     {
         std::ofstream f(file);
         f << Source;
@@ -1009,8 +1010,8 @@ TEST_CASE("Settings Load Fail: Visibility value", "[settings]") {
 }
 )";
 
-    std::filesystem::path path = std::filesystem::temp_directory_path();
-    std::filesystem::path file = path / "test_settings_load_fail_visibility_value.json";
+    const std::filesystem::path path = std::filesystem::temp_directory_path();
+    const std::filesystem::path file = path / "test_settings_load_fail_vis_value.json";
     {
         std::ofstream f(file);
         f << Source;
@@ -1027,8 +1028,8 @@ TEST_CASE("Settings Load Fail: Bypass Launcher", "[settings]") {
 }
 )";
 
-    std::filesystem::path path = std::filesystem::temp_directory_path();
-    std::filesystem::path file = path / "test_settings_load_fail_bypass.json";
+    const std::filesystem::path path = std::filesystem::temp_directory_path();
+    const std::filesystem::path file = path / "test_settings_load_fail_bypass.json";
     {
         std::ofstream f(file);
         f << Source;
@@ -1045,8 +1046,9 @@ TEST_CASE("Settings Load Fail: LayerServer type", "[settings]") {
 }
 )";
 
-    std::filesystem::path path = std::filesystem::temp_directory_path();
-    std::filesystem::path file = path / "test_settings_load_fail_layerserver_type.json";
+    const std::filesystem::path path = std::filesystem::temp_directory_path();
+    const std::filesystem::path file =
+        path / "test_settings_load_fail_layerserver_type.json";
     {
         std::ofstream f(file);
         f << Source;
@@ -1063,8 +1065,8 @@ TEST_CASE("Settings Load Fail: LayerServer value", "[settings]") {
 }
 )";
 
-    std::filesystem::path path = std::filesystem::temp_directory_path();
-    std::filesystem::path file = path / "test_settings_load_fail_layerserver_value.json";
+    const std::filesystem::path path = std::filesystem::temp_directory_path();
+    const std::filesystem::path file = path / "test_settings_load_fail_layer_value.json";
     {
         std::ofstream f(file);
         f << Source;
@@ -1081,8 +1083,8 @@ TEST_CASE("Settings Load Fail: MRF", "[settings]") {
 }
 )";
 
-    std::filesystem::path path = std::filesystem::temp_directory_path();
-    std::filesystem::path file = path / "test_settings_load_fail_mrf.json";
+    const std::filesystem::path path = std::filesystem::temp_directory_path();
+    const std::filesystem::path file = path / "test_settings_load_fail_mrf.json";
     {
         std::ofstream f(file);
         f << Source;
@@ -1101,8 +1103,8 @@ TEST_CASE("Settings Load Fail: MRF/enabled", "[settings]") {
 }
 )";
 
-    std::filesystem::path path = std::filesystem::temp_directory_path();
-    std::filesystem::path file = path / "test_settings_load_fail_mrf_enabled.json";
+    const std::filesystem::path path = std::filesystem::temp_directory_path();
+    const std::filesystem::path file = path / "test_settings_load_fail_mrf_enabled.json";
     {
         std::ofstream f(file);
         f << Source;
@@ -1121,8 +1123,8 @@ TEST_CASE("Settings Load Fail: MRF/location", "[settings]") {
 }
 )";
 
-    std::filesystem::path path = std::filesystem::temp_directory_path();
-    std::filesystem::path file = path / "test_settings_load_fail_mrf_location.json";
+    const std::filesystem::path path = std::filesystem::temp_directory_path();
+    const std::filesystem::path file = path / "test_settings_load_fail_mrf_location.json";
     {
         std::ofstream f(file);
         f << Source;
diff --git a/tests/test_sgctedit.cpp b/tests/test_sgctedit.cpp
index 3e56f0da30..0ac97f351d 100644
--- a/tests/test_sgctedit.cpp
+++ b/tests/test_sgctedit.cpp
@@ -38,17 +38,16 @@
 using namespace openspace;
 
 namespace {
-    std::string stringify(const std::string filename) {
-        std::ifstream myfile;
-        myfile.open(filename);
+    std::string stringify(const std::string& filename) {
+        const std::ifstream myfile = std::ifstream(filename);
         std::stringstream buffer;
         buffer << myfile.rdbuf();
         return buffer.str();
     }
 
-    void attemptValidation(const std::string cfgString) {
-        std::filesystem::path schemaDir = absPath("${TESTDIR}/../config/schema");
-        std::string schemaString = stringify(
+    void attemptValidation(const std::string& cfgString) {
+        const std::filesystem::path schemaDir = absPath("${TESTDIR}/../config/schema");
+        const std::string schemaString = stringify(
             schemaDir.string() + "/sgcteditor.schema.json"
         );
         sgct::validateConfigAgainstSchema(cfgString, schemaString, schemaDir);
@@ -452,9 +451,9 @@ R"({
 
 TEST_CASE("SgctEdit: minimumVersion", "[sgctedit]") {
     const sgct::config::GeneratorVersion minVersion { "SgctWindowConfig", 1, 1 };
-    std::string inputCfg =
+    const std::string inputCfg =
         absPath("${TESTDIR}/sgctedit/fails_minimum_version.json").string();
-    sgct::config::GeneratorVersion ver = sgct::readConfigGenerator(inputCfg);
+    const sgct::config::GeneratorVersion ver = sgct::readConfigGenerator(inputCfg);
     CHECK_FALSE(ver.versionCheck(minVersion));
 }
 
diff --git a/tests/test_spicemanager.cpp b/tests/test_spicemanager.cpp
index 2a7001e416..0b9d8f72ab 100644
--- a/tests/test_spicemanager.cpp
+++ b/tests/test_spicemanager.cpp
@@ -30,69 +30,60 @@
 #include "SpiceUsr.h"
 #include "SpiceZpr.h"
 
+using namespace openspace;
+
 namespace {
-    constexpr int FILLEN = 128;
-    constexpr int TYPLEN = 32;
-    constexpr int SRCLEN = 128;
-
-    namespace spicemanager_constants {
-        SpiceInt handle;
-        char file[FILLEN], filtyp[TYPLEN], source[SRCLEN];
-    } // namespace spicemanager_constants
-
-
-
     // In this testclass only a handset of the testfunctions require a single kernel.
     // The remaining methods rely on multiple kernels, loaded as a SPICE 'meta-kernel'
     void loadMetaKernel() {
-        const int k1 = openspace::SpiceManager::ref().loadKernel(
+        const int k1 = SpiceManager::ref().loadKernel(
             absPath("${TESTDIR}/SpiceTest/spicekernels/naif0008.tls").string()
         );
         CHECK(k1 == 1);
 
-        const int k2 = openspace::SpiceManager::ref().loadKernel(
+        const int k2 = SpiceManager::ref().loadKernel(
             absPath("${TESTDIR}/SpiceTest/spicekernels/cas00084.tsc").string()
         );
         CHECK(k2 == 2);
 
-        const int k3 = openspace::SpiceManager::ref().loadKernel(
+        const int k3 = SpiceManager::ref().loadKernel(
             absPath("${TESTDIR}/SpiceTest/spicekernels/981005_PLTEPH-DE405S.bsp").string()
         );
         CHECK(k3 == 3);
 
-        const int k4 = openspace::SpiceManager::ref().loadKernel(
+        const int k4 = SpiceManager::ref().loadKernel(
             absPath("${TESTDIR}/SpiceTest/spicekernels/020514_SE_SAT105.bsp").string()
         );
         CHECK(k4 == 4);
 
-        const int k5 = openspace::SpiceManager::ref().loadKernel(
+        const int k5 = SpiceManager::ref().loadKernel(
             absPath("${TESTDIR}/SpiceTest/spicekernels/030201AP_SK_SM546_T45.bsp").string()
         );
         CHECK(k5 == 5);
 
-        const int k6 = openspace::SpiceManager::ref().loadKernel(
+        const int k6 = SpiceManager::ref().loadKernel(
             absPath("${TESTDIR}/SpiceTest/spicekernels/cas_v37.tf").string()
         );
         CHECK(k6 == 6);
 
-        const int k7 = openspace::SpiceManager::ref().loadKernel(
+        const int k7 = SpiceManager::ref().loadKernel(
             absPath("${TESTDIR}/SpiceTest/spicekernels/04135_04171pc_psiv2.bc").string()
         );
         CHECK(k7 == 7);
 
-        const int k8 = openspace::SpiceManager::ref().loadKernel(
+        const int k8 = SpiceManager::ref().loadKernel(
             absPath("${TESTDIR}/SpiceTest/spicekernels/cpck05Mar2004.tpc").string()
         );
         CHECK(k8 == 8);
 
-        const int k9 = openspace::SpiceManager::ref().loadKernel(
+        const int k9 = SpiceManager::ref().loadKernel(
             absPath("${TESTDIR}/SpiceTest/spicekernels/cas_iss_v09.ti").string()
         );
         CHECK(k9 == 9);
     }
 
     int loadLSKKernel() {
-        int kernelID = openspace::SpiceManager::ref().loadKernel(
+        const int kernelID = SpiceManager::ref().loadKernel(
             absPath("${TESTDIR}/SpiceTest/spicekernels/naif0008.tls").string()
         );
         CHECK(kernelID == 1);
@@ -100,7 +91,7 @@ namespace {
     }
 
     int loadPCKKernel() {
-        int kernelID = openspace::SpiceManager::ref().loadKernel(
+        const int kernelID = SpiceManager::ref().loadKernel(
             absPath("${TESTDIR}/SpiceTest/spicekernels/cpck05Mar2004.tpc").string()
         );
         CHECK(kernelID == 1);
@@ -109,51 +100,66 @@ namespace {
 } // namespace
 
 TEST_CASE("SpiceManager: Load Single Kernel", "[spicemanager]") {
-    openspace::SpiceManager::initialize();
+    constexpr int FileLength = 128;
+    constexpr int TypeLength = 32;
+    constexpr int SourceLength = 128;
+
+    SpiceManager::initialize();
 
     loadLSKKernel();
-    // naif0008.tls is a text file, check if loaded.
-    SpiceBoolean found;
+
+    SpiceInt handle = 0;
+    std::array<char, FileLength> file;
+    std::array<char, TypeLength> filtyp;
+    std::array<char, SourceLength> source;
+    SpiceBoolean found = SPICEFALSE;
     kdata_c(
         0,
         "text",
-        FILLEN,
-        TYPLEN,
-        SRCLEN,
-        spicemanager_constants::file,
-        spicemanager_constants::filtyp,
-        spicemanager_constants::source,
-        &spicemanager_constants::handle,
+        FileLength,
+        TypeLength,
+        SourceLength,
+        file.data(),
+        filtyp.data(),
+        source.data(),
+        &handle,
         &found
     );
-
     CHECK(found == SPICETRUE);
 
-    openspace::SpiceManager::deinitialize();
+    SpiceManager::deinitialize();
 }
 
 TEST_CASE("SpiceManager: Unload Kernel String", "[spicemanager]") {
-    openspace::SpiceManager::initialize();
+    constexpr int FileLength = 128;
+    constexpr int TypeLength = 32;
+    constexpr int SourceLength = 128;
+
+    SpiceManager::initialize();
 
     loadLSKKernel();
-    // naif0008.tls is a text file, check if loaded.
-    SpiceBoolean found;
+
+    SpiceInt handle = 0;
+    std::array<char, FileLength> file;
+    std::array<char, TypeLength> filtyp;
+    std::array<char, SourceLength> source;
+    SpiceBoolean found = SPICEFALSE;
     kdata_c(
         0,
         "text",
-        FILLEN,
-        TYPLEN,
-        SRCLEN,
-        spicemanager_constants::file,
-        spicemanager_constants::filtyp,
-        spicemanager_constants::source,
-        &spicemanager_constants::handle,
+        FileLength,
+        TypeLength,
+        SourceLength,
+        file.data(),
+        filtyp.data(),
+        source.data(),
+        &handle,
         &found
     );
     CHECK(found == SPICETRUE);
 
     // unload using string keyword
-    openspace::SpiceManager::ref().unloadKernel(
+    SpiceManager::ref().unloadKernel(
         absPath("${TESTDIR}/SpiceTest/spicekernels/naif0008.tls").string()
     );
 
@@ -161,121 +167,125 @@ TEST_CASE("SpiceManager: Unload Kernel String", "[spicemanager]") {
     kdata_c(
         0,
         "text",
-        FILLEN,
-        TYPLEN,
-        SRCLEN,
-        spicemanager_constants::file,
-        spicemanager_constants::filtyp,
-        spicemanager_constants::source,
-        &spicemanager_constants::handle,
+        FileLength,
+        TypeLength,
+        SourceLength,
+        file.data(),
+        filtyp.data(),
+        source.data(),
+        &handle,
         &found
     );
     CHECK(found != SPICETRUE);
 
-    openspace::SpiceManager::deinitialize();
+    SpiceManager::deinitialize();
 }
 
 TEST_CASE("SpiceManager: Unload Kernel Integer", "[spicemanager]") {
-    openspace::SpiceManager::initialize();
+    constexpr int FileLength = 128;
+    constexpr int TypeLength = 32;
+    constexpr int SourceLength = 128;
 
-    int kernelID = loadLSKKernel();
-    // naif0008.tls is a text file, check if loaded.
-    SpiceBoolean found;
+    SpiceManager::initialize();
+
+    const int kernelID = loadLSKKernel();
+
+    SpiceInt handle = 0;
+    std::array<char, FileLength> file;
+    std::array<char, TypeLength> filtyp;
+    std::array<char, SourceLength> source;
+    SpiceBoolean found = SPICEFALSE;
     kdata_c(
         0,
         "text",
-        FILLEN,
-        TYPLEN,
-        SRCLEN,
-        spicemanager_constants::file,
-        spicemanager_constants::filtyp,
-        spicemanager_constants::source,
-        &spicemanager_constants::handle,
+        FileLength,
+        TypeLength,
+        SourceLength,
+        file.data(),
+        filtyp.data(),
+        source.data(),
+        &handle,
         &found
     );
     CHECK(found == SPICETRUE);
 
     // unload using unique int ID
-    openspace::SpiceManager::ref().unloadKernel(kernelID);
+    SpiceManager::ref().unloadKernel(kernelID);
 
     found = SPICEFALSE;
     kdata_c(
         0,
         "text",
-        FILLEN,
-        TYPLEN,
-        SRCLEN,
-        spicemanager_constants::file,
-        spicemanager_constants::filtyp,
-        spicemanager_constants::source,
-        &spicemanager_constants::handle,
+        FileLength,
+        TypeLength,
+        SourceLength,
+        file.data(),
+        filtyp.data(),
+        source.data(),
+        &handle,
         &found
     );
     CHECK(found != SPICETRUE);
 
-    openspace::SpiceManager::deinitialize();
+    SpiceManager::deinitialize();
 }
 
 TEST_CASE("SpiceManager: Has Value", "[spicemanager]") {
-    openspace::SpiceManager::initialize();
+    SpiceManager::initialize();
 
     loadPCKKernel();
 
-    int naifId = 399; // Earth
-
-    std::string kernelPoolValue = "RADII";
-
-    const bool found = openspace::SpiceManager::ref().hasValue(naifId, kernelPoolValue);
+    const int naifId = 399; // Earth
+    const std::string kernelPoolValue = "RADII";
+    const bool found = SpiceManager::ref().hasValue(naifId, kernelPoolValue);
     CHECK(found);
 
-    openspace::SpiceManager::deinitialize();
+    SpiceManager::deinitialize();
 }
 
 TEST_CASE("SpiceManager: Get Value From ID 1D", "[spicemanager]") {
-    openspace::SpiceManager::initialize();
+    SpiceManager::initialize();
 
     loadPCKKernel();
 
-    std::string target  = "EARTH";
-    std::string value1D = "MAG_NORTH_POLE_LAT";
-
+    const std::string target  = "EARTH";
+    const std::string value1D = "MAG_NORTH_POLE_LAT";
     double return1D = 0.0;
-    CHECK_NOTHROW(openspace::SpiceManager::ref().getValue(target, value1D, return1D));
+    CHECK_NOTHROW(SpiceManager::ref().getValue(target, value1D, return1D));
     CHECK(return1D == 78.565);
 
-    openspace::SpiceManager::deinitialize();
+    SpiceManager::deinitialize();
 }
 
 TEST_CASE("SpiceManager: Get Value From ID 3D", "[spicemanager]") {
-    openspace::SpiceManager::initialize();
+    SpiceManager::initialize();
 
     loadPCKKernel();
 
-    std::string target  = "EARTH";
-    std::string value3D = "RADII";
-
+    const std::string target  = "EARTH";
+    const std::string value3D = "RADII";
     glm::dvec3 return3D = glm::dvec3(0.0);
-    CHECK_NOTHROW(openspace::SpiceManager::ref().getValue(target, value3D, return3D));
+    CHECK_NOTHROW(SpiceManager::ref().getValue(target, value3D, return3D));
 
     CHECK(return3D.x == 6378.14);
     CHECK(return3D.y == 6378.14);
     CHECK(return3D.z == 6356.75);
 
-    openspace::SpiceManager::deinitialize();
+    SpiceManager::deinitialize();
 }
 
 TEST_CASE("SpiceManager: Get Value From ID ND", "[spicemanager]") {
-    openspace::SpiceManager::initialize();
+    SpiceManager::initialize();
 
     loadPCKKernel();
 
-    std::string target  = "SATURN";
-    std::string valueND = "RING6_A";
+    const std::string target = "SATURN";
+    const std::string valueND = "RING6_A";
+    std::vector<double> returnND;
+    returnND.resize(5);
+    CHECK_NOTHROW(SpiceManager::ref().getValue(target, valueND, returnND));
 
-    std::vector<double> returnND(5);
-    CHECK_NOTHROW(openspace::SpiceManager::ref().getValue(target, valueND, returnND));
-
-    std::vector<double> controlVec{ 189870.0, 256900.0, 9000.0, 9000.0, 0.000003 };
+    std::vector<double> controlVec = { 189870.0, 256900.0, 9000.0, 9000.0, 0.000003 };
 
     CHECK(controlVec.size() == returnND.size());
 
@@ -283,45 +293,42 @@ TEST_CASE("SpiceManager: Get Value From ID ND", "[spicemanager]") {
         CHECK(controlVec[i] == returnND[i]);
     }
 
-    openspace::SpiceManager::deinitialize();
+    SpiceManager::deinitialize();
 }
 
 TEST_CASE("SpiceManager: String To Ephemeris Time", "[spicemanager]") {
-    openspace::SpiceManager::initialize();
+    SpiceManager::initialize();
 
     loadLSKKernel();
 
-    double ephemerisTime = -1.0;
     double control_ephemerisTime = 0.0;
-    char date[SRCLEN] = "Thu Mar 20 12:53:29 PST 1997";
-    str2et_c(date, &control_ephemerisTime);
+    const std::string date = "Thu Mar 20 12:53:29 PST 1997";
+    str2et_c(date.c_str(), &control_ephemerisTime);
 
-    CHECK_NOTHROW(
-        ephemerisTime = openspace::SpiceManager::ref().ephemerisTimeFromDate(date)
-    );
+    double ephemerisTime = -1.0;
+    CHECK_NOTHROW(ephemerisTime = SpiceManager::ref().ephemerisTimeFromDate(date));
 
     CHECK(ephemerisTime == control_ephemerisTime);
 
-    openspace::SpiceManager::deinitialize();
+    SpiceManager::deinitialize();
 }
 
 TEST_CASE("SpiceManager: Get Target Position", "[spicemanager]") {
-    openspace::SpiceManager::initialize();
+    SpiceManager::initialize();
 
-    using openspace::SpiceManager;
     loadMetaKernel();
 
+    const std::string utctime = "2004 JUN 11 19:32:00";
     double et = 0.0;
-    double pos[3] = { 0.0, 0.0, 0.0 };
-    double lt = 0.0;
-    char utctime[SRCLEN] = "2004 jun 11 19:32:00";
+    str2et_c(utctime.c_str(), &et);
 
-    str2et_c(utctime, &et);
-    spkpos_c("EARTH", et, "J2000", "LT+S", "CASSINI", pos, &lt);
+    std::array<double, 3> pos = { 0.0, 0.0, 0.0 };
+    double lt = 0.0;
+    spkpos_c("EARTH", et, "J2000", "LT+S", "CASSINI", pos.data(), &lt);
 
     glm::dvec3 targetPosition = glm::dvec3(0.0);
     double lightTime = 0.0;
-    SpiceManager::AberrationCorrection corr = {
+    const SpiceManager::AberrationCorrection corr = {
         SpiceManager::AberrationCorrection::Type::LightTimeStellar,
         SpiceManager::AberrationCorrection::Direction::Reception
     };
@@ -329,7 +336,12 @@ TEST_CASE("SpiceManager: Get Target Position", "[spicemanager]") {
     CHECK_NOTHROW(
         [&]() {
             targetPosition = SpiceManager::ref().targetPosition(
-                "EARTH", "CASSINI", "J2000", corr, et, lightTime
+                "EARTH",
+                "CASSINI",
+                "J2000",
+                corr,
+                et,
+                lightTime
             );
         }()
     );
@@ -337,24 +349,23 @@ TEST_CASE("SpiceManager: Get Target Position", "[spicemanager]") {
     CHECK(pos[1] == Catch::Approx(targetPosition[1]));
     CHECK(pos[2] == Catch::Approx(targetPosition[2]));
 
-    openspace::SpiceManager::deinitialize();
+    SpiceManager::deinitialize();
 }
 
 TEST_CASE("SpiceManager: Get Target State", "[spicemanager]") {
-    openspace::SpiceManager::initialize();
+    SpiceManager::initialize();
 
-    using openspace::SpiceManager;
     loadMetaKernel();
 
-    double et;
-    double state[6];
-    double lt;
-    char utctime[SRCLEN] = "2004 jun 11 19:32:00";
+    double et = 0.0;
+    const std::string utctime = "2004 JUN 11 19:32:00";
+    str2et_c(utctime.c_str(), &et);
 
-    str2et_c(utctime, &et);
-    spkezr_c("EARTH", et, "J2000", "LT+S", "CASSINI", state, &lt);
+    std::array<double, 6> state;
+    double lt = 0.0;
+    spkezr_c("EARTH", et, "J2000", "LT+S", "CASSINI", state.data(), &lt);
 
-    SpiceManager::AberrationCorrection corr = {
+    const SpiceManager::AberrationCorrection corr = {
         SpiceManager::AberrationCorrection::Type::LightTimeStellar,
         SpiceManager::AberrationCorrection::Direction::Reception
     };
@@ -364,33 +375,37 @@ TEST_CASE("SpiceManager: Get Target State", "[spicemanager]") {
         res = SpiceManager::ref().targetState("EARTH", "CASSINI", "J2000", corr, et)
     );
 
-    // x,y,z
     for (int i = 0; i < 3; i++){
         CHECK(state[i] == Catch::Approx(res.position[i]));
         CHECK(state[i+3] == Catch::Approx(res.velocity[i]));
     }
 
-    openspace::SpiceManager::deinitialize();
+    SpiceManager::deinitialize();
 }
 
 TEST_CASE("SpiceManager: Transform matrix", "[spicemanager]") {
-    openspace::SpiceManager::initialize();
+    SpiceManager::initialize();
 
-   loadMetaKernel();
+    loadMetaKernel();
 
-   double et;
-   double state[6];
-   double lt;
-   double referenceMatrix[6][6];
 
-   str2et_c("2004 jun 11 19:32:00", &et);
-   spkezr_c("PHOEBE", et, "J2000", "LT+S", "CASSINI", state, &lt);
-   sxform_c("J2000", "IAU_PHOEBE", et, referenceMatrix);
+    double et = 0.0;
+    str2et_c("2004 JUN 11 19:32:00", &et);
 
-   openspace::SpiceManager::TransformMatrix stateMatrix;
-   CHECK_NOTHROW(
-     stateMatrix = openspace::SpiceManager::ref().stateTransformMatrix(
-        "J2000", "IAU_PHOEBE", et)
+    std::array<double, 6> state;
+    double lt = 0.0;
+    spkezr_c("PHOEBE", et, "J2000", "LT+S", "CASSINI", state.data(), &lt);
+
+    std::array<double[6], 6> referenceMatrix;
+    sxform_c("J2000", "IAU_PHOEBE", et, referenceMatrix.data());
+
+    SpiceManager::TransformMatrix stateMatrix;
+    CHECK_NOTHROW(
+        stateMatrix = SpiceManager::ref().stateTransformMatrix(
+            "J2000",
+             "IAU_PHOEBE",
+             et
+        )
     );
 
    // check for matrix consistency
@@ -400,24 +415,23 @@ TEST_CASE("SpiceManager: Transform matrix", "[spicemanager]") {
        }
    }
 
-    openspace::SpiceManager::deinitialize();
+    SpiceManager::deinitialize();
 }
 
 TEST_CASE("SpiceManager: Get Position Transform Matrix", "[spicemanager]") {
-    openspace::SpiceManager::initialize();
+    SpiceManager::initialize();
 
-    using openspace::SpiceManager;
     loadMetaKernel();
 
-    double et;
-    double state[3] = { 1.0, 1.0, 1.0 };
-    double state_t[3];
-    double referenceMatrix[3][3];
 
-    str2et_c("2004 jun 11 19:32:00", &et);
-    pxform_c("CASSINI_HGA", "J2000", et, referenceMatrix);
+    double et = 0.0;
+    str2et_c("2004 JUN 11 19:32:00", &et);
+
+    std::array<double[3], 3> referenceMatrix;
+    pxform_c("CASSINI_HGA", "J2000", et, referenceMatrix.data());
 
     glm::dmat3 positionMatrix = glm::dmat3(1.0);
+    std::array<double, 3> state = { 1.0, 1.0, 1.0 };
     glm::dvec3 position(state[0], state[1], state[2]);
     CHECK_NOTHROW(
         [&]() {
@@ -443,7 +457,8 @@ TEST_CASE("SpiceManager: Get Position Transform Matrix", "[spicemanager]") {
 #endif
 
     // transform reference position into new frame
-    mxvg_c(referenceMatrix, state, 3, 3, state_t);
+    std::array<double, 3> stateTransformed;
+    mxvg_c(referenceMatrix.data(), state.data(), 3, 3, stateTransformed.data());
 
 #if defined __clang__
 #pragma clang diagnostic pop
@@ -454,32 +469,45 @@ TEST_CASE("SpiceManager: Get Position Transform Matrix", "[spicemanager]") {
     position = positionMatrix * position;
     // check transformed values match
     for (int i = 0; i < 3; i++) {
-        CHECK(position[i] == Catch::Approx(state_t[i]));
+        CHECK(position[i] == Catch::Approx(stateTransformed[i]));
     }
 
-    openspace::SpiceManager::deinitialize();
+    SpiceManager::deinitialize();
 }
 
 TEST_CASE("SpiceManager: Get Field Of View", "[spicemanager]") {
-    openspace::SpiceManager::initialize();
+    constexpr int NameLength = 128;
+    constexpr int ShapeLength = 32;
+
+    SpiceManager::initialize();
 
-    using openspace::SpiceManager;
     loadMetaKernel();
 
-    SpiceInt n;
-    SpiceInt cassini_ID;
-    double et;
-    double bounds_ref[5][3];
-    char shape_ref[TYPLEN];
-    char name_ref[FILLEN];
-    double boresightVec[3];
 
-    str2et_c("2004 jun 11 19:32:00", &et);
-    SpiceBoolean found;
-    bodn2c_c("CASSINI_ISS_NAC", &cassini_ID, &found);
+    double et = 0.0;
+    str2et_c("2004 JUN 11 19:32:00", &et);
+
+    SpiceInt id = 0;
+    SpiceBoolean found = SPICETRUE;
+    bodn2c_c("CASSINI_ISS_NAC", &id, &found);
     CHECK(found == SPICETRUE);
 
-    getfov_c(cassini_ID, 5, TYPLEN, TYPLEN, shape_ref, name_ref, boresightVec, &n, bounds_ref);
+    std::array<char, ShapeLength> shapeRef;
+    std::array<char, NameLength> nameRef;
+    std::array<double, 3> boresightVec;
+    SpiceInt n = 0;
+    std::array<double[3], 5> boundsRef;
+    getfov_c(
+        id,
+        5,
+        ShapeLength,
+        NameLength,
+        shapeRef.data(),
+        nameRef.data(),
+        boresightVec.data(),
+        &n,
+        boundsRef.data()
+    );
 
     SpiceManager::FieldOfViewResult res;
 
@@ -490,10 +518,11 @@ TEST_CASE("SpiceManager: Get Field Of View", "[spicemanager]") {
     for (size_t i = 0; i < res.bounds.size(); i++) {
         for (size_t j = 0; j < 3; j++) {
             CHECK(
-                bounds_ref[i][j] == Catch::Approx(res.bounds[i][static_cast<glm::length_t>(j)])
+                boundsRef[i][j] ==
+                Catch::Approx(res.bounds[i][static_cast<glm::length_t>(j)])
             );
         }
     }
 
-    openspace::SpiceManager::deinitialize();
+    SpiceManager::deinitialize();
 }
diff --git a/tests/test_timequantizer.cpp b/tests/test_timequantizer.cpp
index 594bfcada6..1a82d0137e 100644
--- a/tests/test_timequantizer.cpp
+++ b/tests/test_timequantizer.cpp
@@ -35,7 +35,7 @@ using namespace openspace;
 
 namespace {
     int loadLSKKernel() {
-        int kernelID = openspace::SpiceManager::ref().loadKernel(
+        const int kernelID = openspace::SpiceManager::ref().loadKernel(
             absPath("${TESTDIR}/SpiceTest/spicekernels/naif0008.tls").string()
         );
         CHECK(kernelID == 1);
@@ -50,8 +50,9 @@ namespace {
         CHECK(t.ISO8601() == expected);
     }
 
-    void singleResolutionTest(globebrowsing::TimeQuantizer& tq, std::string resolution,
-                              std::string expectedType, bool expectFailure)
+    void singleResolutionTest(globebrowsing::TimeQuantizer& tq,
+                              const std::string& resolution,
+                              const std::string& expectedType, bool expectFailure)
     {
         std::string res;
         try {
@@ -69,8 +70,9 @@ namespace {
         }
     }
 
-    void singleStartTimeTest(globebrowsing::TimeQuantizer& tq, std::string startTime,
-                             std::string expectedErrSubstring, bool expectFailure)
+    void singleStartTimeTest(globebrowsing::TimeQuantizer& tq,
+                             const std::string& startTime,
+                             const std::string& expectedErrSubstring, bool expectFailure)
     {
         std::string res;
         try {
@@ -88,12 +90,12 @@ namespace {
         }
     }
 
-    void singleStartTimeTest(std::string startTime, std::string expectedErrSubstring,
-                             bool expectFailure)
+    void singleStartTimeTest(const std::string& startTime,
+                             const std::string& expectedErrSubstring, bool expectFailure)
     {
         std::string res;
         try {
-            globebrowsing::TimeQuantizer tq(startTime, startTime, "1d");
+            const globebrowsing::TimeQuantizer tq(startTime, startTime, "1d");
         }
         catch (const ghoul::RuntimeError & e) {
             res = e.message;

From 6c89de373a9bcde1cc84cecf309493d2293a3b70 Mon Sep 17 00:00:00 2001
From: Alexander Bock <alexander.bock@liu.se>
Date: Sun, 17 Mar 2024 00:59:36 +0100
Subject: [PATCH 312/701] Add the ability to convert TLE files to SPICE kernels
 and apply change to ISS (#3073)

* Fix orientation of ISS with dynamic frame kernel
---
 .../planets/earth/satellites/misc/iss.asset   |  64 +++++---
 include/openspace/util/spicemanager.h         |   6 +
 modules/space/scripts/spice.lua               |  46 ++++++
 modules/space/spacemodule.cpp                 |   8 +-
 src/util/spicemanager.cpp                     | 136 ++++++++++++++++
 src/util/spicemanager_lua.inl                 | 147 ++++++++++++++++++
 6 files changed, 381 insertions(+), 26 deletions(-)
 create mode 100644 modules/space/scripts/spice.lua

diff --git a/data/assets/scene/solarsystem/planets/earth/satellites/misc/iss.asset b/data/assets/scene/solarsystem/planets/earth/satellites/misc/iss.asset
index f6a5d79657..a62df31c6f 100644
--- a/data/assets/scene/solarsystem/planets/earth/satellites/misc/iss.asset
+++ b/data/assets/scene/solarsystem/planets/earth/satellites/misc/iss.asset
@@ -11,6 +11,13 @@ local models = asset.resource({
   Version = 3
 })
 
+local kernels = asset.resource({
+  Name = "ISS Kernels",
+  Type = "HttpSynchronization",
+  Identifier = "iss_kernels",
+  Version = 1
+})
+
 local omm = asset.resource({
   Name = "Satellite OMM Data (ISS)",
   Type = "UrlSynchronization",
@@ -20,23 +27,22 @@ local omm = asset.resource({
   SecondsUntilResync = 24 * 60 * 60
 })
 
+local tle = asset.resource({
+  Name = "Satellite TLE Data (ISS)",
+  Type = "UrlSynchronization",
+  Identifier = "satellite_tle_data_iss",
+  Url = "https://www.celestrak.com/NORAD/elements/gp.php?CATNR=25544&FORMAT=tle",
+  Filename = "ISS.txt",
+  SecondsUntilResync = 24 * 60 * 60
+})
+
 
 local IssPosition = {
   Identifier = "ISSPosition",
   Parent = transforms.EarthInertial.Identifier,
   BoundingSphere = 54.5, -- half the width
   Transform = {
-    Translation = {
-      Type = "GPTranslation",
-      Observer = transforms.EarthInertial.Identifier,
-      File = omm .. "ISS.txt",
-      Format = "OMM"
-    },
-    Rotation = {
-      Type = "SpiceRotation",
-      SourceFrame = coreKernels.Frame.Galactic,
-      DestinationFrame = coreKernels.Frame.J2000
-    }
+    Translation = {}, -- This translation is provided in the onInitialize
   },
   Tag = { "earth_satellite", "ISS" },
   GUI = {
@@ -51,11 +57,9 @@ local IssModel = {
   Parent = IssPosition.Identifier,
   Transform = {
     Rotation = {
-      Type = "FixedRotation",
-      Attached = "ISS",
-      XAxis = { 0.01, -1.0, 0.56 },
-      XAxisOrthogonal = true,
-      YAxis = transforms.EarthInertial.Identifier
+      Type = "SpiceRotation",
+      SourceFrame = "ISS",
+      DestinationFrame = coreKernels.Frame.J2000
     }
   },
   Renderable = {
@@ -79,12 +83,7 @@ local IssTrail = {
   Parent = transforms.EarthInertial.Identifier,
   Renderable = {
     Type = "RenderableTrailOrbit",
-    Translation = {
-      Type = "GPTranslation",
-      Observer = transforms.EarthInertial.Identifier,
-      File = omm .. "ISS.txt",
-      Format = "OMM"
-    },
+    Translation = {}, -- This translation is provided in the onInitialize
     RenderBinMode = "PostDeferredTransparent",
     Color = { 0.9, 0.6715, 0.0 },
     Fade = 1.5,
@@ -135,19 +134,36 @@ local FocusIss = {
 }
 
 
+local kernelFile
 asset.onInitialize(function()
+  -- In order to get the orientation of the ISS correctly, we need to have its position
+  -- available as a SPICE object. We don't want to just convert the TLE file once as we
+  -- want it to update with every startup.
+  -- For this reason we convert the TLE file into a type 10 SPICE kernel and since we are
+  -- already doing that, we can also get a more accurate position for free, too
+  local translation, kernel = openspace.space.tleToSpiceTranslation(tle .. "ISS.txt")
+  kernelFile = kernel -- Store the path for the deinitialize function
+  openspace.spice.loadKernel(kernelFile)
+  IssPosition.Transform.Translation = translation;
+  IssTrail.Renderable.Translation = translation;
+
+  openspace.spice.loadKernel(kernels .. "iss.tf")
+
   local i = openspace.space.readKeplerFile(omm .. "ISS.txt", "OMM")
   IssTrail.Renderable.Period = i[1].Period / (60 * 60 * 24)
 
+
   openspace.addSceneGraphNode(IssPosition)
   openspace.addSceneGraphNode(IssModel)
   openspace.addSceneGraphNode(IssTrail)
 
-  openspace.setPropertyValueSingle("Scene.ISS.Rotation.yAxisInvertObject", true)
   openspace.action.registerAction(FocusIss)
 end)
 
 asset.onDeinitialize(function()
+  openspace.spice.unloadKernel(kernels .. "iss.tf")
+  openspace.spice.unloadKernel(kernelFile)
+
   openspace.action.removeAction(FocusIss)
 
   openspace.removeSceneGraphNode(IssTrail)
@@ -163,7 +179,7 @@ asset.export(IssPosition)
 
 asset.meta = {
   Name = "ISS",
-  Version = "2.0",
+  Version = "3.0",
   Description = [[Model and Trail for ISS. Model from NASA 3D models, trail from
     Celestrak.]],
   Author = "OpenSpace Team",
diff --git a/include/openspace/util/spicemanager.h b/include/openspace/util/spicemanager.h
index 9255b1dea5..7cf10f7b9d 100644
--- a/include/openspace/util/spicemanager.h
+++ b/include/openspace/util/spicemanager.h
@@ -1122,6 +1122,12 @@ private:
      */
     void loadLeapSecondsSpiceKernel();
 
+    /**
+     * Loads pre defined geophysical constants kernel (geophysical.ker)
+     */
+    void loadGeophysicalConstantsKernel();
+
+
     /// A list of all loaded kernels
     std::vector<KernelInformation> _loadedKernels;
 
diff --git a/modules/space/scripts/spice.lua b/modules/space/scripts/spice.lua
new file mode 100644
index 0000000000..0c9dc9f851
--- /dev/null
+++ b/modules/space/scripts/spice.lua
@@ -0,0 +1,46 @@
+openspace.space.documentation = {
+  {
+    Name = "tleToSpiceTranslation",
+    Arguments = { tlePath = "String" },
+    Return = "{ Translation, SpiceKernel }",
+    Documentation = [[
+        Takes the provided TLE file, converts it into a SPICE kernel and returns a
+        SpiceTranslation instance that can be used to access the information in the TLE
+        file using SPICE's superior integral solver.
+
+        The second return value is the spice kernel that should be loaded and unloaded by
+        whoever called this function.
+    ]]
+  }
+}
+
+openspace.space.tleToSpiceTranslation = function(tlePath)
+  --
+  -- First we have to create a name for the temporary file
+  --
+
+  -- We first pass the path through the absPath function to both get rid of path tokens,
+  -- but more importantly harmonize the path separators so we don't have to deal with
+  -- / and \ variants
+  tlePath = openspace.absPath(tlePath)
+
+  -- We don't have a function to return the file component so we extract the directory
+  -- and remove as many characters as it is long instead
+  local dirComponent = openspace.directoryForPath(tlePath)
+  -- +2 because the sub function is inclusive and we have a trailing \ or / at the end
+  local filename = tlePath:sub(dirComponent:len() + 2, tlePath:len())
+  local temporaryFile = openspace.absPath("${TEMPORARY}/" .. filename .. ".bsp")
+  -- Now the temporary file for, for example ISS.txt will be the solution for:
+  -- ${TEMPORARY}/ISS.txt.bsp
+
+  local id = openspace.spice.convertTLEtoSPK(tlePath, temporaryFile)
+
+  local translation = {
+    Type = "SpiceTranslation",
+    Target = tostring(id),
+    Observer = "Earth",
+    Frame = "J2000"
+  }
+
+  return translation, temporaryFile
+end
diff --git a/modules/space/spacemodule.cpp b/modules/space/spacemodule.cpp
index 2b025106c1..588fef8258 100644
--- a/modules/space/spacemodule.cpp
+++ b/modules/space/spacemodule.cpp
@@ -45,6 +45,7 @@
 #include <openspace/util/coordinateconversion.h>
 #include <openspace/util/factorymanager.h>
 #include <openspace/util/spicemanager.h>
+#include <ghoul/filesystem/filesystem.h>
 #include <ghoul/misc/assert.h>
 #include <ghoul/misc/templatefactory.h>
 
@@ -138,11 +139,14 @@ std::vector<documentation::Documentation> SpaceModule::documentations() const {
 
 scripting::LuaLibrary SpaceModule::luaLibrary() const {
     return {
-        "space",
-        {
+        .name = "space",
+        .functions = {
             codegen::lua::ConvertFromRaDec,
             codegen::lua::ConvertToRaDec,
             codegen::lua::ReadKeplerFile
+        },
+        .scripts = {
+            absPath("${MODULE_SPACE}/scripts/spice.lua")
         }
     };
 }
diff --git a/src/util/spicemanager.cpp b/src/util/spicemanager.cpp
index 0882c63a9e..a2def26b7d 100644
--- a/src/util/spicemanager.cpp
+++ b/src/util/spicemanager.cpp
@@ -165,6 +165,7 @@ SpiceManager::SpiceManager() {
     errprt_c("SET", 0, buffer.data());
 
     loadLeapSecondsSpiceKernel();
+    loadGeophysicalConstantsKernel();
 }
 
 SpiceManager::~SpiceManager() {
@@ -1540,6 +1541,140 @@ const std::filesystem::path path = std::filesystem::temp_directory_path();
     std::filesystem::remove(file);
 }
 
+void SpiceManager::loadGeophysicalConstantsKernel() {
+    constexpr std::string_view GeoPhysicalConstantsKernelSource = R"(
+KPL/PCK
+
+      The SPK creations applications (mkspk, mkspk_c) require the data in
+      this kernel to produce Type 10 SPK segments based upon the Two-Line
+      element sets available from NORAD/SPACETRACK. The data applies ONLY
+      to the Two-Line Element sets and only to the SGP4 implementations
+      included in the SPICE library [1][2]. The SPK application copies 
+      this data to the constants partition of the Type 10 segment, so the
+      user has no need for the kernel after creation of the corresponding
+      SPK.
+
+      Bill Taber (JPL)
+      Edward Wright (JPL)
+
+      The assigned values are taken from the Spacetrack #3 report, referred
+      to as WGS721 in Vallado [2]. It is possible to edit this file
+      to use the high accuracy WGS-72 values (WGS72) or the WGS-84
+      values (WGS84). The KE parameter value for WGS72 and WGS84
+      is calculated from the MU and ER values. The lists include MU only
+      for the calculation of KE.
+
+      MU, the standard gravitational parameter, in cubic kilometer per
+      second squared.
+
+      WGS721 (STR#3 values) [1]
+
+         ER =    6378.135
+
+         J2   =    0.001082616
+         J3   =   -0.00000253881
+         J4   =   -0.00000165597
+
+         KE   =    0.0743669161
+
+
+      WGS72 [2]
+
+         MU   =  398600.8
+         ER   =  6378.135
+
+         J2   =   0.001082616
+         J3   =  -0.00000253881
+         J4   =  -0.00000165597
+
+         KE   =  60.0D0/DSQRT(ER**3/MU)
+              =  0.074366916133173
+
+
+      WGS84 [2]
+
+         MU   =  398600.5
+         ER   =  6378.137
+
+         J2   =   0.00108262998905
+         J3   =  -0.00000253215306
+         J4   =  -0.00000161098761
+
+         KE   =  60.0D0/DSQRT(ER**3/MU)
+              =  0.074366853168714
+
+
+      The BODY399_Jn values are un-normalized zonal harmonic values
+      for the earth. These numbers are dimensionless.
+
+\begindata
+
+      BODY399_J2 =    1.082616D-3
+      BODY399_J3 =   -2.53881D-6
+      BODY399_J4 =   -1.65597D-6
+
+\begintext
+
+      The next item is the square root of GM for the earth given
+      in units of earth-radii**1.5/Minute
+
+\begindata
+
+      BODY399_KE =    7.43669161D-2
+
+\begintext
+
+      The next two items define the top and bottom of the atmospheric
+      drag model, distance above the surface in kilometers, used by
+      the type 10 ephemeris type.
+
+\begindata
+
+      BODY399_QO =  120.0D0
+      BODY399_SO =   78.0D0
+
+\begintext
+
+      The equatorial radius of the earth in kilometers as used by
+      the TLE propagator.
+
+\begindata
+
+      BODY399_ER = 6378.135D0
+
+\begintext
+
+      The value of AE is the number of distance units per earth
+      radii used by the NORAD state propagation software. Don't
+      change this value.
+
+\begindata
+
+      BODY399_AE = 1.0D0
+
+\begintext
+
+References:
+
+   [1] Hoots, F. R., and Roehrich, R., l. 1980. "Spacetrack Report #3, Models
+       for Propagation of the NORAD Element Sets." U.S. Air Force, CO.
+
+   [2] Vallado, David, Crawford, Paul, Hujsak, Richard,
+       and Kelso, T.S. 2006. Revisiting Spacetrack Report #3. Paper
+       AIAA 2006-6753 presented at the AIAA/AAS Astrodynamics
+       Specialist Conference, August 21-24, 2006. Keystone, CO.
+)";
+
+      std::filesystem::path path = std::filesystem::temp_directory_path();
+      std::filesystem::path file = path / "geophysical.ker";
+      {
+          std::ofstream f(file);
+          f << GeoPhysicalConstantsKernelSource;
+      }
+      loadKernel(file.string());
+      std::filesystem::remove(file);
+}
+
 void SpiceManager::setExceptionHandling(UseException useException) {
     _useExceptions = useException;
 }
@@ -1558,6 +1693,7 @@ scripting::LuaLibrary SpiceManager::luaLibrary() {
             codegen::lua::SpiceBodies,
             codegen::lua::RotationMatrix,
             codegen::lua::Position,
+            codegen::lua::ConvertTLEtoSPK
         }
     };
 }
diff --git a/src/util/spicemanager_lua.inl b/src/util/spicemanager_lua.inl
index b08c9af17e..1322c43b6a 100644
--- a/src/util/spicemanager_lua.inl
+++ b/src/util/spicemanager_lua.inl
@@ -22,6 +22,8 @@
  * OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                                         *
  ****************************************************************************************/
 
+#include <ghoul/misc/stringhelper.h>
+
 namespace {
 
 /**
@@ -131,6 +133,151 @@ namespace {
     return position;
 }
 
+/**
+ * This function converts a TLE file into SPK format and saves it at the provided path.
+ * The last parameter is only used if there are multiple craft specified in the provided
+ * TLE file and is selecting which (0-based index) of the list to create a kernel from.
+ *
+ * This function returns the SPICE ID of the object for which the kernel was created
+ */
+[[codegen::luawrap]] int convertTLEtoSPK(std::filesystem::path tle,
+                                         std::filesystem::path spk,
+                                         int elementToExtract = 0)
+{
+    // Code adopted from
+    // https://naif.jpl.nasa.gov/pub/naif/toolkit_docs/C/cspice/getelm_c.html
+    SpiceInt n = 0;
+
+    //
+    // First exact the constants required by a type 10 SPK kernel.
+    //
+
+    std::array<double, 8> constants;
+    // J2 gravitational harmonic for Earth
+    bodvcd_c(399, "J2", 1, &n, &constants[0]);
+
+    // J3 gravitational harmonic for Earth
+    bodvcd_c(399, "J3", 1, &n, &constants[1]);
+
+    // J4 gravitational harmonic for Earth
+    bodvcd_c(399, "J4", 1, &n, &constants[2]);
+
+    // Square root of the GM for Earth
+    bodvcd_c(399, "KE", 1, &n, &constants[3]);
+
+    // High altitude bound for atmospheric model
+    bodvcd_c(399, "QO", 1, &n, &constants[4]);
+
+    // Low altitude bound for atmospheric model
+    bodvcd_c(399, "SO", 1, &n, &constants[5]);
+
+    // Equatorial radius of the Earth
+    bodvcd_c(399, "ER", 1, &n, &constants[6]);
+
+    // Distance units/earth radius
+    bodvcd_c(399, "AE", 1, &n, &constants[7]);
+
+    //
+    // Load the TLE file
+    //
+    std::ifstream f = std::ifstream(tle);
+    std::string contents = std::string(
+        std::istreambuf_iterator<char>(f),
+        std::istreambuf_iterator<char>()
+    );
+
+    // The TLE files returned by Celestrak are of the 3-line variant where the first line
+    // contains a human-readable name for the spacecraft
+
+    std::vector<std::string> lines = ghoul::tokenizeString(contents, '\n');
+    const size_t nElements = lines.size() / 3;
+    if (elementToExtract > nElements) {
+        throw ghoul::RuntimeError(fmt::format(
+            "Error loading {}. Element number {} requested, but only {} found",
+            tle, nElements, elementToExtract
+        ));
+    }
+
+    constexpr int TLEColumnWidth = 70;
+
+    // It should be 70, but we're removing the \n character at the end in the tokenization
+    std::string line1 = lines[3 * elementToExtract + 1];
+    if (line1.size() != TLEColumnWidth - 1) {
+        throw ghoul::RuntimeError(fmt::format(
+            "Illformed TLE file {}, expected {} characters per line, got {}",
+            tle, TLEColumnWidth, line1.size()
+        ));
+    }
+    std::string line2 = lines[3 * elementToExtract + 2];
+    if (line2.size() != TLEColumnWidth - 1) {
+        throw ghoul::RuntimeError(fmt::format(
+            "Illformed TLE file {}, expected {} characters per line, got {}",
+            tle, TLEColumnWidth, line2.size()
+        ));
+    }
+
+    // Copy the lines into a format that SPICE understands
+    SpiceChar spiceLines[2][TLEColumnWidth];
+    std::strcpy(spiceLines[0], line1.c_str());
+    std::strcpy(spiceLines[1], line2.c_str());
+
+
+    // Convert the Two Line Elements lines to the element sets
+    SpiceDouble epoch;
+    std::array<SpiceDouble, 10> elems;
+    getelm_c(1950, TLEColumnWidth, spiceLines, &epoch, elems.data());
+
+    // The size of a type SPK10 spice kernel is not affected by the time validity, so we
+    // just pick the greatest one
+    SpiceDouble first = -std::numeric_limits<double>::max();
+    SpiceDouble last = std::numeric_limits<double>::max();
+
+    // Extract the body id
+    std::vector<std::string> tokens = ghoul::tokenizeString(line2, ' ');
+    if (tokens.size() < 2) {
+        throw ghoul::RuntimeError(fmt::format(
+            "Error parsing TLE file {}. Expected 8-9 elements in the second row, got {}",
+            tle, tokens.size()
+        ));
+    }
+    // Earth-orbiting spacecraft usually lack a DSN identification code, so the NAIF ID
+    // is derived from the tracking ID assigned to it by NORAD via:
+    //   NAIF ID = -100000 - NORAD ID
+    int bodyId = -100000 - std::stoi(tokens[1]);
+
+
+    // Write the elements to a new SPK file
+    const SpiceInt nCommentCharacters = 0;
+    std::string internalFileName = fmt::format("Type 10 SPK for {}", tle);
+    std::string segmentId = "Segment";
+
+    if (std::filesystem::exists(spk)) {
+        std::filesystem::remove(spk);
+    }
+
+    std::string outFile = spk.string();
+    SpiceInt handle;
+    spkopn_c(outFile.c_str(), internalFileName.c_str(), nCommentCharacters, &handle);
+
+    spkw10_c(
+        handle,
+        bodyId,
+        399,
+        "J2000",
+        first,
+        last,
+        segmentId.c_str(),
+        constants.data(),
+        1,
+        elems.data(),
+        &epoch
+    );
+
+    spkcls_c(handle);
+
+    return bodyId;
+}
+
 #include "spicemanager_lua_codegen.cpp"
 
 } // namespace

From 795df7d03de79109bf359e375cb43449f096fb11 Mon Sep 17 00:00:00 2001
From: GPayne <payne.gene@gmail.com>
Date: Sun, 17 Mar 2024 11:27:56 -0600
Subject: [PATCH 313/701] Handle DOS newline in session recording file header &
 bump sgct version

---
 apps/OpenSpace/ext/sgct              |  2 +-
 src/interaction/sessionrecording.cpp | 12 +++++++++---
 2 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/apps/OpenSpace/ext/sgct b/apps/OpenSpace/ext/sgct
index c020f067f9..fc5248adb7 160000
--- a/apps/OpenSpace/ext/sgct
+++ b/apps/OpenSpace/ext/sgct
@@ -1 +1 @@
-Subproject commit c020f067f96099ae4491edcdabaf65ef7808b595
+Subproject commit fc5248adb7e372d1cae7306b2fba5c1627af0179
diff --git a/src/interaction/sessionrecording.cpp b/src/interaction/sessionrecording.cpp
index c9b295b497..2e480e936e 100644
--- a/src/interaction/sessionrecording.cpp
+++ b/src/interaction/sessionrecording.cpp
@@ -410,8 +410,13 @@ bool SessionRecording::startPlayback(std::string& filename,
         LERROR("Unknown data type in header (should be Ascii or Binary)");
         cleanUpPlayback();
     }
-    // throwaway newline character
-    readHeaderElement(_playbackFile, 1);
+    // throwaway newline character(s)
+    std::string lineEnd = readHeaderElement(_playbackFile, 1);
+    bool isDosLineEnding = (lineEnd == "\r");
+    if (isDosLineEnding) {
+        // throwaway the second newline character (\n) also
+        readHeaderElement(_playbackFile, 1);
+    }
 
     if (_recordingDataMode == DataMode::Binary) {
         // Close & re-open the file, starting from the beginning, and do dummy read
@@ -419,7 +424,8 @@ bool SessionRecording::startPlayback(std::string& filename,
         _playbackFile.close();
         _playbackFile.open(_playbackFilename, std::ifstream::in | std::ios::binary);
         size_t headerSize = FileHeaderTitle.length() + FileHeaderVersionLength
-            + sizeof(DataFormatBinaryTag) + sizeof('\n');
+            + sizeof(DataFormatBinaryTag) + sizeof('\n')
+            + ((isDosLineEnding) ? sizeof('\r') : 0);
         std::vector<char> hBuffer;
         hBuffer.resize(headerSize);
         _playbackFile.read(hBuffer.data(), headerSize);

From 4b18b27b6ea599b33f6409e426517be6315b472b Mon Sep 17 00:00:00 2001
From: GPayne <payne.gene@gmail.com>
Date: Sun, 17 Mar 2024 12:26:54 -0600
Subject: [PATCH 314/701] Added check for std::getline to style guide python
 checker

---
 support/coding/check_style_guide.py | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

diff --git a/support/coding/check_style_guide.py b/support/coding/check_style_guide.py
index a9ee0de76d..4e2b04148b 100644
--- a/support/coding/check_style_guide.py
+++ b/support/coding/check_style_guide.py
@@ -342,6 +342,18 @@ def check_for_tab(lines):
   else:
     return ''
 
+
+
+def check_for_std_getline(lines):
+  index = [i for i,s in enumerate(lines)
+          if 'std::getline' in s]
+  if len(index) > 0:
+    return 'File used wrong glm include. Use "#include <ghoul/glm.h>" instead'
+  else:
+    return ''
+
+
+
 previousSymbols  = {}
 def check_header_file(file, component):
   with open(file, 'r+', encoding="utf8") as f:
@@ -544,6 +556,10 @@ def check_source_file(file, component):
     if tabs:
       print(file, '\t', 'TABs found: ', tabs)
 
+    std_getlines = check_for_std_getline(lines)
+    if std_getlines:
+      if not 'ghoul/src/misc/stringhelper.cpp' in file:
+        print(file, '\t', 'std::getline found instead of ghoul::getline: ', std_getlines)
 
 
 

From 8e49847a47b3c192bbc67895ef09c5b73d658eb1 Mon Sep 17 00:00:00 2001
From: Malin E <malin.ejdbo@gmail.com>
Date: Mon, 18 Mar 2024 09:28:43 +0100
Subject: [PATCH 315/701] Add two more joystick controller assets

---
 data/assets/util/joysticks/any-joystick.asset |  13 +
 .../joysticks/microsoft-xbox-360-pad.asset    | 220 +++++++++++++++
 data/assets/util/joysticks/ps4.asset          |   9 +
 data/assets/util/joysticks/ps5.asset          | 252 ++++++++++++++++++
 .../space-mouse-compact-wireless.asset        |   9 +
 .../util/joysticks/space-mouse-compact.asset  |   9 +
 .../space-mouse-enterprise-wireless.asset     |   9 +
 .../joysticks/space-mouse-enterprise.asset    |   9 +
 .../assets/util/joysticks/xbox-wireless.asset |   9 +
 data/assets/util/joysticks/xbox.asset         |   9 +
 10 files changed, 548 insertions(+)
 create mode 100644 data/assets/util/joysticks/microsoft-xbox-360-pad.asset
 create mode 100644 data/assets/util/joysticks/ps5.asset

diff --git a/data/assets/util/joysticks/any-joystick.asset b/data/assets/util/joysticks/any-joystick.asset
index c159d8e859..db699dd070 100644
--- a/data/assets/util/joysticks/any-joystick.asset
+++ b/data/assets/util/joysticks/any-joystick.asset
@@ -13,6 +13,8 @@ local function addJoystickAsset(joystick)
     openspace.asset.add("./util/joysticks/xbox")
   elseif joystick == "Wireless Xbox Controller" then
     openspace.asset.add("./util/joysticks/xbox-wireless")
+  elseif joystick == "Microsoft X-Box 360 pad" then
+    openspace.asset.add("./util/joysticks/microsoft-xbox-360-pad")
   elseif joystick == "SpaceNavigator" then
     openspace.asset.add("./util/joysticks/space-mouse-compact")
   elseif joystick == "SpaceMouse Enterprise" then
@@ -74,3 +76,14 @@ asset.onDeinitialize(function()
     openspace.asset.remove("./util/joysticks/space-mouse-enterprise")
   end
 end)
+
+asset.meta = {
+  Name = "Joystick controller: Any",
+  Version = "1.0",
+  Description = [[
+    Checks the name on the connected controllers and adds the cooresponding joystick asset
+  ]],
+  Author = "OpenSpace Team",
+  URL = "http://openspaceproject.com",
+  License = "MIT license"
+}
diff --git a/data/assets/util/joysticks/microsoft-xbox-360-pad.asset b/data/assets/util/joysticks/microsoft-xbox-360-pad.asset
new file mode 100644
index 0000000000..c548de7c7f
--- /dev/null
+++ b/data/assets/util/joysticks/microsoft-xbox-360-pad.asset
@@ -0,0 +1,220 @@
+local propertyHelper = asset.require("../property_helper")
+local joystickHelper = asset.require("./joystick_helper")
+
+
+
+-- Allowed values for the third parameter of bindJoystickAxis:
+-- "None"
+-- "Orbit X"
+-- "Orbit Y"
+-- "Zoom" -- both in and out
+-- "Zoom In"
+-- "Zoom Out"
+-- "LocalRoll"
+-- "GlobalRoll"
+-- "Pan X"
+-- "Pan Y"
+-- Fourth parameter determines whether the axis should be inverted
+-- Fifth parameter determines whether the axis behaves like a joystick or a Trigger.
+--       Allowed values are "JoystickLike" and "TriggerLike", the first one is the default
+-- Sixth parameters determins if the axis should be "Sticky" or not.
+--       The axis values can either go back to 0 when the joystick is released or it can
+--       stay at the value it was before the joystick was released.
+--       The latter is called a sticky axis, when the values don't go back to 0.
+-- Seventh parameter can be used to reverse the camera movement for the axis
+-- Eighth parameter is the sensitivity for the axis
+
+local XBoxController = {
+  -- Axes
+  LeftThumbStick = {
+    LeftRight = 0,
+    UpDown = 1
+  },
+  RightThumbStick = {
+    LeftRight = 3,
+    UpDown = 4
+  },
+  LeftTrigger = 2,
+  RightTrigger = 5,
+
+  -- Buttons
+  A = 0,
+  B = 1,
+  X = 2,
+  Y = 3,
+  LB = 4,
+  RB = 5,
+  Back = 6,
+  Start = 7,
+  LeftStickButton = 9,
+  RightStickButton = 10,
+  DPad = {
+    Up = 11,
+    Right = 12,
+    Down = 13,
+    Left = 14
+  }
+}
+
+
+asset.onInitialize(function()
+  local controller = XBoxController
+  local name = "Microsoft X-Box 360 pad"
+
+  local deadzoneJoysticks = 0.2
+  local deadzoneTriggers = 0.05
+  openspace.navigation.setAxisDeadZone(name, controller.LeftThumbStick.LeftRight, deadzoneJoysticks)
+  openspace.navigation.setAxisDeadZone(name, controller.LeftThumbStick.UpDown, deadzoneJoysticks)
+  openspace.navigation.setAxisDeadZone(name, controller.RightThumbStick.LeftRight, deadzoneJoysticks)
+  openspace.navigation.setAxisDeadZone(name, controller.RightThumbStick.UpDown, deadzoneJoysticks)
+  openspace.navigation.setAxisDeadZone(name, controller.LeftTrigger, deadzoneTriggers)
+  openspace.navigation.setAxisDeadZone(name, controller.RightTrigger, deadzoneTriggers)
+
+  openspace.navigation.bindJoystickAxis(name, controller.LeftThumbStick.LeftRight, "Orbit X")
+  openspace.navigation.bindJoystickAxis(name, controller.LeftThumbStick.UpDown, "Orbit Y")
+  openspace.navigation.bindJoystickAxis(name, controller.RightThumbStick.LeftRight, "Pan X", true)
+  openspace.navigation.bindJoystickAxis(name, controller.RightThumbStick.UpDown, "Pan Y", true)
+  openspace.navigation.bindJoystickAxis(name, controller.LeftTrigger, "Zoom Out", false, "TriggerLike")
+  openspace.navigation.bindJoystickAxis(name, controller.RightTrigger, "Zoom In", false, "TriggerLike")
+
+  -- Roll
+  openspace.navigation.bindJoystickButton(
+    name,
+    controller.DPad.Up,
+    joystickHelper.bindLocalRoll(name, controller.RightThumbStick.LeftRight) ..
+    "openspace.navigation.bindJoystickAxis('" .. name .. "', " .. controller.RightThumbStick.UpDown .. ", 'None')",
+    "Switch to roll mode"
+  )
+  openspace.navigation.bindJoystickButton(
+    name,
+    controller.DPad.Up,
+    joystickHelper.unbindRoll(name, controller.RightThumbStick.LeftRight) ..
+    "openspace.navigation.bindJoystickAxis('" .. name .. "', " .. controller.RightThumbStick.UpDown .. ", 'Pan Y', true)",
+    "Switch back to normal mode",
+    "Release"
+  )
+
+  -- Switch focus in the interesting nodes menu
+  openspace.navigation.bindJoystickButton(
+    name,
+    controller.LB,
+    [[
+      openspace.navigation.targetPreviousInterestingAnchor()
+      openspace.navigation.retargetAnchor()
+    ]],
+    "Switch target to the previous interesting node"
+  )
+
+  openspace.navigation.bindJoystickButton(
+    name,
+    controller.RB,
+    [[
+      openspace.navigation.targetNextInterestingAnchor()
+      openspace.navigation.retargetAnchor()
+    ]],
+    "Switch target to the next interesting node"
+  )
+
+  -- Toggle Frictions
+  openspace.navigation.bindJoystickButton(
+    name,
+    controller.A,
+    propertyHelper.invert("NavigationHandler.OrbitalNavigator.Friction.RotationalFriction"),
+    "Toggle rotational friction"
+  )
+  openspace.navigation.bindJoystickButton(
+    name,
+    controller.B,
+    propertyHelper.invert("NavigationHandler.OrbitalNavigator.Friction.ZoomFriction"),
+    "Toggle zoom friction"
+  )
+  openspace.navigation.bindJoystickButton(
+    name,
+    controller.Y,
+    propertyHelper.invert("NavigationHandler.OrbitalNavigator.Friction.RollFriction"),
+    "Toggle roll friction"
+  )
+
+  -- Refocus
+  openspace.navigation.bindJoystickButton(
+    name,
+    controller.RightStickButton,
+    "openspace.navigation.retargetAnchor()",
+    "Retarget on current focus"
+  )
+
+  -- Time
+  openspace.navigation.bindJoystickButton(
+    name,
+    controller.DPad.Left,
+    "openspace.time.interpolatePreviousDeltaTimeStep()",
+    "Go backwards in time, faster the more times this button is pressed"
+  )
+
+  openspace.navigation.bindJoystickButton(
+    name,
+    controller.DPad.Down,
+    "openspace.time.interpolateDeltaTime(1)",
+    "Reset realtime"
+  )
+
+  openspace.navigation.bindJoystickButton(
+    name,
+    controller.DPad.Right,
+    "openspace.time.interpolateNextDeltaTimeStep()",
+    "Go forwards in time, faster the more times this button is pressed"
+  )
+
+  -- Reset Time to yesterday
+  openspace.navigation.bindJoystickButton(
+    name,
+    controller.Back,
+    [[
+      openspace.time.setDeltaTime(1)
+      local yesterday = openspace.time.advancedTime(openspace.time.currentWallTime(), "-1d")
+      openspace.time.setTime(yesterday)
+    ]],
+    "Reset to yesterday realtime"
+  )
+
+  -- Pause
+  openspace.navigation.bindJoystickButton(
+    name,
+    controller.Start,
+    "openspace.time.togglePause()",
+    "Pause time simulation"
+  )
+
+  -- Open buttons that can be customized
+  -- X
+  openspace.navigation.bindJoystickButton(
+    name,
+    controller.X,
+    [[
+      -- <-- Copy paste your custom script here
+    ]],
+    ""  -- <-- Description of your custom script here (optional)
+  )
+
+  -- Left Joystick Button
+  openspace.navigation.bindJoystickButton(
+    name,
+    controller.LeftStickButton,
+    [[
+      -- <-- Copy paste your custom script here
+    ]],
+    ""  -- <-- Description of your custom script here (optional)
+  )
+end)
+
+asset.meta = {
+  Name = "Joystick controller: Microsoft X-Box 360 pad",
+  Version = "1.0",
+  Description = "Joystick controller configuration for Microsoft X-Box 360 pad",
+  Author = [[
+    OpenSpace Team & Winston
+    https://openspacesupport.slack.com/archives/CLMQXJJDQ/p1710388096683769
+  ]],
+  URL = "http://openspaceproject.com",
+  License = "MIT license"
+}
diff --git a/data/assets/util/joysticks/ps4.asset b/data/assets/util/joysticks/ps4.asset
index 1ca140dfe8..17efac0dfd 100644
--- a/data/assets/util/joysticks/ps4.asset
+++ b/data/assets/util/joysticks/ps4.asset
@@ -228,3 +228,12 @@ asset.onInitialize(function()
     ""  -- <-- Description of your custom script here (optional)
   )
 end)
+
+asset.meta = {
+  Name = "Joystick controller: PS4",
+  Version = "1.0",
+  Description = "Joystick controller configuration for PS4",
+  Author = "OpenSpace Team",
+  URL = "http://openspaceproject.com",
+  License = "MIT license"
+}
diff --git a/data/assets/util/joysticks/ps5.asset b/data/assets/util/joysticks/ps5.asset
new file mode 100644
index 0000000000..2320c53bd3
--- /dev/null
+++ b/data/assets/util/joysticks/ps5.asset
@@ -0,0 +1,252 @@
+local propertyHelper = asset.require("../property_helper")
+local joystickHelper = asset.require("./joystick_helper")
+
+
+
+-- Allowed values for the third parameter of bindJoystickAxis:
+-- "None"
+-- "Orbit X"
+-- "Orbit Y"
+-- "Zoom" -- both in and out
+-- "Zoom In"
+-- "Zoom Out"
+-- "LocalRoll"
+-- "GlobalRoll"
+-- "Pan X"
+-- "Pan Y"
+-- Fourth parameter determines whether the axis should be inverted
+-- Fifth parameter determines whether the axis behaves like a joystick or a Trigger.
+--       Allowed values are "JoystickLike" and "TriggerLike", the first one is the default
+-- Sixth parameters determins if the axis should be "Sticky" or not.
+--       The axis values can either go back to 0 when the joystick is released or it can
+--       stay at the value it was before the joystick was released.
+--       The latter is called a sticky axis, when the values don't go back to 0.
+-- Seventh parameter can be used to reverse the camera movement for the axis
+-- Eighth parameter is the sensitivity for the axis
+
+local PS5Controller = {
+  -- Axes
+  LeftThumbStick = {
+    LeftRight = 0,
+    UpDown = 1
+  },
+  RightThumbStick = {
+    LeftRight = 2,
+    UpDown = 5
+  },
+  L2 = 3,
+  R2 = 4,
+
+  -- Buttons
+  Cross = 1,
+  Circle = 2,
+  Square = 0,
+  Triangle = 3,
+  L1 = 4,
+  R1 = 5,
+  L2Press = 6,
+  R2Press = 7,
+  Share = 8,
+  Options = 9,
+  PS = 12,
+  LeftStickButton = 10,
+  RightStickButton = 11,
+  TouchPad = 13,
+  Mute = 14,
+  DPad = {
+    Up = 15,
+    Right = 16,
+    Down = 17,
+    Left = 18
+  }
+}
+
+
+asset.onInitialize(function()
+  local controller = PS5Controller
+  local name = "DualSense Wireless Controller"
+
+  local deadzoneJoysticks = 0.2
+  local deadzoneTriggers = 0.05
+  openspace.navigation.setAxisDeadZone(name, controller.LeftThumbStick.LeftRight, deadzoneJoysticks)
+  openspace.navigation.setAxisDeadZone(name, controller.LeftThumbStick.UpDown, deadzoneJoysticks)
+  openspace.navigation.setAxisDeadZone(name, controller.RightThumbStick.LeftRight, deadzoneJoysticks)
+  openspace.navigation.setAxisDeadZone(name, controller.RightThumbStick.UpDown, deadzoneJoysticks)
+  openspace.navigation.setAxisDeadZone(name, controller.L2, deadzoneTriggers)
+  openspace.navigation.setAxisDeadZone(name, controller.R2, deadzoneTriggers)
+
+  openspace.navigation.bindJoystickAxis(name, controller.LeftThumbStick.LeftRight, "Orbit X")
+  openspace.navigation.bindJoystickAxis(name, controller.LeftThumbStick.UpDown, "Orbit Y")
+  openspace.navigation.bindJoystickAxis(name, controller.RightThumbStick.LeftRight, "Pan X", true)
+  openspace.navigation.bindJoystickAxis(name, controller.RightThumbStick.UpDown, "Pan Y", true)
+  openspace.navigation.bindJoystickAxis(name, controller.L2, "Zoom Out", false, "TriggerLike")
+  openspace.navigation.bindJoystickAxis(name, controller.R2, "Zoom In", false, "TriggerLike")
+
+  -- Roll
+  openspace.navigation.bindJoystickButton(
+    name,
+    controller.DPad.Up,
+    joystickHelper.bindLocalRoll(name, controller.RightThumbStick.LeftRight) ..
+    "openspace.navigation.bindJoystickAxis('" .. name .. "', " .. controller.RightThumbStick.UpDown .. ", 'None')",
+    "Switch to roll mode"
+  )
+  openspace.navigation.bindJoystickButton(
+    name,
+    controller.DPad.Up,
+    joystickHelper.unbindRoll(name, controller.RightThumbStick.LeftRight) ..
+    "openspace.navigation.bindJoystickAxis('" .. name .. "', " .. controller.RightThumbStick.UpDown .. ", 'Pan Y', true)",
+    "Switch back to normal mode",
+    "Release"
+  )
+
+  -- Switch focus in the interesting nodes menu
+  openspace.navigation.bindJoystickButton(
+    name,
+    controller.L1,
+    [[
+      openspace.navigation.targetPreviousInterestingAnchor()
+      openspace.navigation.retargetAnchor()
+    ]],
+    "Switch target to the previous interesting node"
+  )
+
+  openspace.navigation.bindJoystickButton(
+    name,
+    controller.R1,
+    [[
+      openspace.navigation.targetNextInterestingAnchor()
+      openspace.navigation.retargetAnchor()
+    ]],
+    "Switch target to the next interesting node"
+  )
+
+  -- Toggle Frictions
+  openspace.navigation.bindJoystickButton(
+    name,
+    controller.Cross,
+    propertyHelper.invert("NavigationHandler.OrbitalNavigator.Friction.RotationalFriction"),
+    "Toggle rotational friction"
+  )
+  openspace.navigation.bindJoystickButton(
+    name,
+    controller.Circle,
+    propertyHelper.invert("NavigationHandler.OrbitalNavigator.Friction.ZoomFriction"),
+    "Toggle zoom friction"
+  )
+  openspace.navigation.bindJoystickButton(
+    name,
+    controller.Triangle,
+    propertyHelper.invert("NavigationHandler.OrbitalNavigator.Friction.RollFriction"),
+    "Toggle roll friction"
+  )
+
+  -- Refocus
+  openspace.navigation.bindJoystickButton(
+    name,
+    controller.RightStickButton,
+    "openspace.navigation.retargetAnchor()",
+    "Retarget on current focus"
+  )
+
+  -- Time
+  openspace.navigation.bindJoystickButton(
+    name,
+    controller.DPad.Left,
+    "openspace.time.interpolatePreviousDeltaTimeStep()",
+    "Go backwards in time, faster the more times this button is pressed"
+  )
+
+  openspace.navigation.bindJoystickButton(
+    name,
+    controller.DPad.Down,
+    "openspace.time.interpolateDeltaTime(1)",
+    "Reset realtime"
+  )
+
+  openspace.navigation.bindJoystickButton(
+    name,
+    controller.DPad.Right,
+    "openspace.time.interpolateNextDeltaTimeStep()",
+    "Go forwards in time, faster the more times this button is pressed"
+  )
+
+  -- Reset Time to yesterday
+  openspace.navigation.bindJoystickButton(
+    name,
+    controller.Options,
+    [[
+      openspace.time.setDeltaTime(1)
+      local yesterday = openspace.time.advancedTime(openspace.time.currentWallTime(), "-1d")
+      openspace.time.setTime(yesterday)
+    ]],
+    "Reset to yesterday realtime"
+  )
+
+  -- Pause
+  openspace.navigation.bindJoystickButton(
+    name,
+    controller.TouchPad,
+    "openspace.time.togglePause()",
+    "Pause time simulation"
+  )
+
+  -- Open buttons that can be customized
+  -- Square
+  openspace.navigation.bindJoystickButton(
+    name,
+    controller.Square,
+    [[
+      -- <-- Copy paste your custom script here
+    ]],
+    ""  -- <-- Description of your custom script here (optional)
+  )
+
+  -- Share button
+  openspace.navigation.bindJoystickButton(
+    name,
+    controller.Share,
+    [[
+      -- <-- Copy paste your custom script here
+    ]],
+    ""  -- <-- Description of your custom script here (optional)
+  )
+
+  -- Left Joystick Button
+  openspace.navigation.bindJoystickButton(
+    name,
+    controller.LeftStickButton,
+    [[
+      -- <-- Copy paste your custom script here
+    ]],
+    ""  -- <-- Description of your custom script here (optional)
+  )
+
+  -- Playstation button
+  openspace.navigation.bindJoystickButton(
+    name,
+    controller.PS,
+    [[
+      -- <-- Copy paste your custom script here
+    ]],
+    ""  -- <-- Description of your custom script here (optional)
+  )
+
+  -- Microphone mute button
+  openspace.navigation.bindJoystickButton(
+    name,
+    controller.Mute,
+    [[
+      -- <-- Copy paste your custom script here
+    ]],
+    ""  -- <-- Description of your custom script here (optional)
+  )
+end)
+
+asset.meta = {
+  Name = "Joystick controller: PS5",
+  Version = "1.0",
+  Description = "Joystick controller configuration for PS5",
+  Author = "OpenSpace Team",
+  URL = "http://openspaceproject.com",
+  License = "MIT license"
+}
diff --git a/data/assets/util/joysticks/space-mouse-compact-wireless.asset b/data/assets/util/joysticks/space-mouse-compact-wireless.asset
index 4352f161ac..3e21752519 100644
--- a/data/assets/util/joysticks/space-mouse-compact-wireless.asset
+++ b/data/assets/util/joysticks/space-mouse-compact-wireless.asset
@@ -69,3 +69,12 @@ asset.onInitialize(function()
     "Switch to global roll mode"
   )
 end)
+
+asset.meta = {
+  Name = "Joystick controller: SpaceMouse compact wireless",
+  Version = "1.0",
+  Description = "Joystick controller configuration for SpaceMouse compact wireless",
+  Author = "OpenSpace Team",
+  URL = "http://openspaceproject.com",
+  License = "MIT license"
+}
diff --git a/data/assets/util/joysticks/space-mouse-compact.asset b/data/assets/util/joysticks/space-mouse-compact.asset
index d6935347e7..14246bf476 100644
--- a/data/assets/util/joysticks/space-mouse-compact.asset
+++ b/data/assets/util/joysticks/space-mouse-compact.asset
@@ -69,3 +69,12 @@ asset.onInitialize(function()
     "Switch to global roll mode"
   )
 end)
+
+asset.meta = {
+  Name = "Joystick controller: SpaceMouse compact (wired)",
+  Version = "1.0",
+  Description = "Joystick controller configuration for SpaceMouse compact (wired)",
+  Author = "OpenSpace Team",
+  URL = "http://openspaceproject.com",
+  License = "MIT license"
+}
diff --git a/data/assets/util/joysticks/space-mouse-enterprise-wireless.asset b/data/assets/util/joysticks/space-mouse-enterprise-wireless.asset
index d84e309d18..4e5695a797 100644
--- a/data/assets/util/joysticks/space-mouse-enterprise-wireless.asset
+++ b/data/assets/util/joysticks/space-mouse-enterprise-wireless.asset
@@ -63,3 +63,12 @@ asset.onInitialize(function()
   openspace.navigation.bindJoystickAxis(name, controller.Push.UpDown, "Zoom")
   openspace.navigation.bindJoystickAxis(name, controller.Tilt.LeftRight, "LocalRoll")
 end)
+
+asset.meta = {
+  Name = "Joystick controller: SpaceMouse enterprise wireless",
+  Version = "1.0",
+  Description = "Joystick controller configuration for SpaceMouse enterprise wireless",
+  Author = "OpenSpace Team",
+  URL = "http://openspaceproject.com",
+  License = "MIT license"
+}
diff --git a/data/assets/util/joysticks/space-mouse-enterprise.asset b/data/assets/util/joysticks/space-mouse-enterprise.asset
index b7d7a963c8..d458f23417 100644
--- a/data/assets/util/joysticks/space-mouse-enterprise.asset
+++ b/data/assets/util/joysticks/space-mouse-enterprise.asset
@@ -63,3 +63,12 @@ asset.onInitialize(function()
   openspace.navigation.bindJoystickAxis(name, controller.Push.UpDown, "Zoom")
   openspace.navigation.bindJoystickAxis(name, controller.Tilt.LeftRight, "LocalRoll")
 end)
+
+asset.meta = {
+  Name = "Joystick controller: SpaceMouse enterprise (wired)",
+  Version = "1.0",
+  Description = "Joystick controller configuration for SpaceMouse enterprise (wired)",
+  Author = "OpenSpace Team",
+  URL = "http://openspaceproject.com",
+  License = "MIT license"
+}
diff --git a/data/assets/util/joysticks/xbox-wireless.asset b/data/assets/util/joysticks/xbox-wireless.asset
index 5afbb5d82c..754464d484 100644
--- a/data/assets/util/joysticks/xbox-wireless.asset
+++ b/data/assets/util/joysticks/xbox-wireless.asset
@@ -206,3 +206,12 @@ asset.onInitialize(function()
     ""  -- <-- Description of your custom script here (optional)
   )
 end)
+
+asset.meta = {
+  Name = "Joystick controller: Xbox wireless",
+  Version = "1.0",
+  Description = "Joystick controller configuration for Xbox wireless",
+  Author = "OpenSpace Team",
+  URL = "http://openspaceproject.com",
+  License = "MIT license"
+}
diff --git a/data/assets/util/joysticks/xbox.asset b/data/assets/util/joysticks/xbox.asset
index 40f01210d4..5041a6a321 100644
--- a/data/assets/util/joysticks/xbox.asset
+++ b/data/assets/util/joysticks/xbox.asset
@@ -206,3 +206,12 @@ asset.onInitialize(function()
     ""  -- <-- Description of your custom script here (optional)
   )
 end)
+
+asset.meta = {
+  Name = "Joystick controller: Xbox (wired)",
+  Version = "1.0",
+  Description = "Joystick controller configuration for Xbox (wired)",
+  Author = "OpenSpace Team",
+  URL = "http://openspaceproject.com",
+  License = "MIT license"
+}
\ No newline at end of file

From 534f92c485931a233d2df2cc1cb74a68a6e687e1 Mon Sep 17 00:00:00 2001
From: Alexander Bock <alexander.bock@liu.se>
Date: Mon, 18 Mar 2024 22:46:17 +0100
Subject: [PATCH 316/701] Second linting pass and adding .clang_tidy file
 (#3128)

---
 .clang_tidy                                   | 65 +++++++++++++++++++
 .../launcher/include/profile/actiondialog.h   |  8 +--
 .../ext/launcher/src/launcherwindow.cpp       | 12 ++--
 .../ext/launcher/src/profile/actiondialog.cpp | 15 +++--
 .../ext/launcher/src/profile/cameradialog.cpp | 10 +--
 apps/OpenSpace/ext/sgct                       |  2 +-
 ext/ghoul                                     |  2 +-
 .../openspace/interaction/sessionrecording.h  | 13 ++--
 .../openspace/navigation/orbitalnavigator.h   | 12 ++--
 .../openspace/network/parallelconnection.h    |  4 +-
 .../rendering/colormappingcomponent.h         |  2 +-
 include/openspace/scene/profile.h             |  2 +-
 include/openspace/scene/scenegraphnode.h      |  2 +-
 .../base/dashboard/dashboarditemframerate.cpp |  2 +-
 .../pointcloud/renderablepointcloud.cpp       |  2 +-
 .../pointcloud/renderablepolygoncloud.cpp     | 10 +--
 modules/base/rendering/renderableplane.cpp    |  4 +-
 .../renderableplanetimevaryingimage.h         |  2 +-
 .../rendering/renderabledebugplane.cpp        |  4 +-
 modules/gaia/tasks/readfilejob.cpp            |  2 +-
 .../src/geojson/geojsoncomponent.cpp          |  2 +-
 .../src/globelabelscomponent.cpp              | 25 ++-----
 modules/globebrowsing/src/layermanager.h      |  4 +-
 .../globebrowsing/src/layerrendersettings.cpp |  4 +-
 .../globebrowsing/src/rawtiledatareader.cpp   |  4 +-
 modules/globebrowsing/src/renderableglobe.h   |  2 +-
 modules/globebrowsing/src/skirtedgrid.h       |  6 +-
 modules/globebrowsing/src/tileindex.h         |  2 +-
 .../src/tileprovider/defaulttileprovider.cpp  |  2 +-
 .../src/tileprovider/temporaltileprovider.cpp |  6 +-
 .../src/tileprovider/texttileprovider.h       |  2 +-
 modules/imgui/src/guimissioncomponent.cpp     |  2 +-
 modules/imgui/src/guispacetimecomponent.cpp   |  2 +-
 modules/server/src/jsonconverters.cpp         | 38 +++++------
 modules/server/src/serverinterface.cpp        |  3 +-
 modules/skybrowser/skybrowsermodule.h         |  2 +-
 modules/skybrowser/src/utility.cpp            | 10 +--
 modules/sound/ext/soloud                      |  1 +
 modules/space/horizonsfile.cpp                |  2 +-
 modules/space/horizonsfile.h                  |  2 +-
 .../rendering/renderableorbitalkepler.cpp     |  2 +-
 modules/space/rendering/renderablestars.cpp   |  4 +-
 .../rendering/renderablemodelprojection.cpp   |  2 +-
 .../rendering/renderableplaneprojection.cpp   |  6 +-
 modules/statemachine/statemachinemodule.h     |  2 +-
 modules/sync/syncs/httpsynchronization.cpp    |  4 +-
 modules/video/src/videoplayer.cpp             |  2 +-
 modules/volume/envelope.cpp                   | 25 +++----
 modules/volume/envelope.h                     |  2 +-
 modules/volume/transferfunction.cpp           |  4 +-
 modules/webbrowser/webbrowsermodule.cpp       |  2 +
 modules/webbrowser/webbrowsermodule.h         |  2 +-
 src/data/dataloader.cpp                       |  4 +-
 src/data/datamapping.cpp                      |  2 +-
 src/documentation/documentationengine.cpp     |  2 +-
 src/engine/moduleengine.cpp                   | 14 ++--
 src/events/eventengine.cpp                    |  2 +-
 src/interaction/mousecamerastates.cpp         | 10 +--
 src/interaction/sessionrecording.cpp          | 28 ++++----
 .../tasks/convertrecfileversiontask.cpp       |  2 +-
 .../tasks/convertrecformattask.cpp            |  2 +-
 src/mission/mission.cpp                       |  3 +-
 src/navigation/navigationhandler.cpp          |  2 +-
 src/navigation/orbitalnavigator.cpp           |  6 +-
 src/network/parallelconnection.cpp            |  9 ++-
 src/properties/stringproperty.cpp             |  2 +-
 src/query/query.cpp                           |  2 +-
 src/rendering/renderengine.cpp                |  4 +-
 src/scene/scene.cpp                           | 12 ++--
 src/scene/scene_lua.inl                       |  2 +-
 src/util/factorymanager.cpp                   |  3 +-
 src/util/spicemanager.cpp                     |  4 +-
 src/util/time.cpp                             |  4 +-
 src/util/timeline.cpp                         |  2 +-
 src/util/timemanager.cpp                      | 12 ++--
 support/coding/codegen                        |  2 +-
 tests/test_documentation.cpp                  | 12 ++--
 tests/test_horizons.cpp                       |  2 +-
 tests/test_profile.cpp                        |  7 ++
 tests/test_rawvolumeio.cpp                    | 12 ++--
 80 files changed, 291 insertions(+), 230 deletions(-)
 create mode 100644 .clang_tidy
 create mode 160000 modules/sound/ext/soloud

diff --git a/.clang_tidy b/.clang_tidy
new file mode 100644
index 0000000000..01370763ac
--- /dev/null
+++ b/.clang_tidy
@@ -0,0 +1,65 @@
+Checks: >-
+  -*,
+  bugprone-*,
+  -bugprone-easily-swappable-parameters,
+  -bugprone-implicit-widening-of-multiplication-result,
+  -bugprone-narrowing-conversions,
+  -bugprone-suspicious-include,
+  -bugprone-switch-missing-default-case,
+  -bugprone-unchecked-optional-access,
+  clang-analyzer-*,
+  -clang-analyzer-security.FloatLoopCounter,
+  cppcoreguidelines-*,
+  -cppcoreguidelines-avoid-do-while,
+  -cppcoreguidelines-avoid-magic-numbers,
+  -cppcoreguidelines-avoid-non-const-global-variables,
+  -cppcoreguidelines-narrowing-conversions,
+  -cppcoreguidelines-no-malloc,
+  -cppcoreguidelines-owning-memory,
+  -cppcoreguidelines-pro-bounds-array-to-pointer-decay,
+  -cppcoreguidelines-pro-bounds-constant-array-index,
+  -cppcoreguidelines-pro-bounds-pointer-arithmetic,
+  -cppcoreguidelines-pro-type-member-init,
+  -cppcoreguidelines-pro-type-reinterpret-cast,
+  -cppcoreguidelines-pro-type-static-cast-downcast,
+  -cppcoreguidelines-pro-type-union-access,
+  -cppcoreguidelines-pro-type-vararg,
+  google-*,
+  -google-objc-*,
+  -google-build-using-namespace,
+  -google-default-arguments,
+  -google-readability-casting,
+  -google-readability-function-size,
+  -google-readability-namespace-comments,
+  -google-runtime-int,
+  -google-explicit-constructor,
+  llvm-*,
+  -llvm-else-after-return,
+  -llvm-include-order,
+  -llvm-qualified-auto,
+  misc-*,
+  -misc-include-cleaner,
+  -misc-no-recursion,
+  -misc-non-private-member-variables-in-classes,
+  modernize-*,
+  -modernize-return-braced-init-list,
+  -modernize-use-trailing-return-type,
+  -modernize-use-auto,
+  performance-*,
+  -performance-no-int-to-ptr,
+  portability-*,
+  readability-*,
+  -readability-avoid-unconditional-preprocessor-if,
+  -readability-convert-member-functions-to-static,
+  -readability-else-after-return,
+  -readability-function-cognitive-complexity,
+  -readability-identifier-length,
+  -readability-implicit-bool-conversion,
+  -readability-magic-numbers,
+  -readability-named-parameter,
+  -readability-uppercase-literal-suffix,
+  -readability-use-anyofallof
+
+CheckOptions:
+  - key:             performance-move-const-arg.CheckTriviallyCopyableMove
+    value:           False
diff --git a/apps/OpenSpace/ext/launcher/include/profile/actiondialog.h b/apps/OpenSpace/ext/launcher/include/profile/actiondialog.h
index c81263ad8b..e7ec4b81b0 100644
--- a/apps/OpenSpace/ext/launcher/include/profile/actiondialog.h
+++ b/apps/OpenSpace/ext/launcher/include/profile/actiondialog.h
@@ -56,18 +56,18 @@ private:
     void actionRemove();
     void actionSelected();
     void actionSaved();
-    void clearActionFields();
+    void clearActionFields() const;
     void actionRejected();
     void chooseScripts();
-    void appendScriptsToTextfield(std::vector<std::string> scripts);
+    void appendScriptsToTextfield(const std::vector<std::string>& scripts) const;
 
     openspace::Profile::Keybinding* selectedKeybinding();
     void keybindingAdd();
     void keybindingRemove();
     void keybindingSelected();
-    void keybindingActionSelected(int);
+    void keybindingActionSelected(int) const;
     void keybindingSaved();
-    void clearKeybindingFields();
+    void clearKeybindingFields() const;
     void keybindingRejected();
 
     std::vector<openspace::Profile::Action>* _actions = nullptr;
diff --git a/apps/OpenSpace/ext/launcher/src/launcherwindow.cpp b/apps/OpenSpace/ext/launcher/src/launcherwindow.cpp
index 5c8766efc9..065e1dbf67 100644
--- a/apps/OpenSpace/ext/launcher/src/launcherwindow.cpp
+++ b/apps/OpenSpace/ext/launcher/src/launcherwindow.cpp
@@ -94,7 +94,7 @@ namespace {
             SettingsIconSize,
             SettingsIconSize
         );
-    } // geometry
+    } // namespace geometry
 
     std::optional<Profile> loadProfileFromFile(QWidget* parent, std::string filename) {
         // Verify that the file actually exists
@@ -787,7 +787,8 @@ void LauncherWindow::openProfileEditor(const std::string& profile, bool isUserPr
         if (editor.specifiedFilename() != profile) {
             saveProfilePath = _userProfilePath;
         }
-        std::string path = saveProfilePath + editor.specifiedFilename() + ".profile";
+        const std::string path =
+            saveProfilePath + editor.specifiedFilename() + ".profile";
         saveProfile(this, path, *p);
         populateProfilesList(editor.specifiedFilename());
     }
@@ -898,7 +899,10 @@ void LauncherWindow::handleReturnFromWindowEditor(const sgct::config::Cluster& c
     savePath.replace_extension(".json");
     saveWindowConfig(this, savePath, cluster);
     // Truncate path to convert this back to path relative to _userConfigPath
-    std::filesystem::path p = std::filesystem::proximate(savePath, saveWindowCfgPath);
+    const std::filesystem::path p = std::filesystem::proximate(
+        savePath,
+        saveWindowCfgPath
+    );
     populateWindowConfigsList(p.string());
 }
 
@@ -912,7 +916,7 @@ std::string LauncherWindow::selectedProfile() const {
 }
 
 std::string LauncherWindow::selectedWindowConfig() const {
-    int idx = _windowConfigBox->currentIndex();
+    const int idx = _windowConfigBox->currentIndex();
     if (idx == 0) {
         return _sgctConfigName;
     }
diff --git a/apps/OpenSpace/ext/launcher/src/profile/actiondialog.cpp b/apps/OpenSpace/ext/launcher/src/profile/actiondialog.cpp
index 5e311b1219..1a6f59ebcb 100644
--- a/apps/OpenSpace/ext/launcher/src/profile/actiondialog.cpp
+++ b/apps/OpenSpace/ext/launcher/src/profile/actiondialog.cpp
@@ -639,7 +639,7 @@ void ActionDialog::actionSaved() {
     clearActionFields();
 }
 
-void ActionDialog::clearActionFields() {
+void ActionDialog::clearActionFields() const {
     _actionWidgets.list->setCurrentRow(-1);
     _actionWidgets.identifier->clear();
     _actionWidgets.identifier->setEnabled(false);
@@ -679,8 +679,9 @@ void ActionDialog::chooseScripts() {
     d.exec();
 }
 
-void ActionDialog::appendScriptsToTextfield(std::vector<std::string> scripts) {
-    for (const std::string script : scripts) {
+void ActionDialog::appendScriptsToTextfield(const std::vector<std::string>& scripts) const
+{
+    for (const std::string& script : scripts) {
         _actionWidgets.script->append(QString::fromStdString(script));
     }
 }
@@ -693,7 +694,7 @@ Profile::Keybinding* ActionDialog::selectedKeybinding() {
 
 void ActionDialog::keybindingAdd() {
     _keybindingWidgets.list->addItem("");
-    _keybindingsData.push_back(Profile::Keybinding());
+    _keybindingsData.emplace_back();
     _keybindingWidgets.list->setCurrentRow(_keybindingWidgets.list->count() - 1);
 }
 
@@ -733,7 +734,7 @@ void ActionDialog::keybindingSelected() {
             hasKeyModifier(keybinding->key.modifier, KeyModifier::Alt)
         );
 
-        std::string key = ghoul::to_string(keybinding->key.key);
+        const std::string key = ghoul::to_string(keybinding->key.key);
         _keybindingWidgets.key->setCurrentText(QString::fromStdString(key));
         _keybindingWidgets.key->setEnabled(true);
         _keybindingWidgets.action->setCurrentText(
@@ -771,7 +772,7 @@ void ActionDialog::keybindingSelected() {
     }
 }
 
-void ActionDialog::keybindingActionSelected(int) {
+void ActionDialog::keybindingActionSelected(int) const {
     _keybindingWidgets.actionText->setText(_keybindingWidgets.action->currentText());
 }
 
@@ -812,7 +813,7 @@ void ActionDialog::keybindingSaved() {
     clearKeybindingFields();
 }
 
-void ActionDialog::clearKeybindingFields() {
+void ActionDialog::clearKeybindingFields() const {
     _keybindingWidgets.list->setCurrentRow(-1);
     _keybindingWidgets.shiftModifier->setChecked(false);
     _keybindingWidgets.shiftModifier->setEnabled(false);
diff --git a/apps/OpenSpace/ext/launcher/src/profile/cameradialog.cpp b/apps/OpenSpace/ext/launcher/src/profile/cameradialog.cpp
index 1f1e0d8f07..7d941ccfe6 100644
--- a/apps/OpenSpace/ext/launcher/src/profile/cameradialog.cpp
+++ b/apps/OpenSpace/ext/launcher/src/profile/cameradialog.cpp
@@ -53,10 +53,7 @@ namespace {
         if (!validConversion) {
             return false;
         }
-        if (value < min || value > max) {
-            return false;
-        }
-        return true;
+        return (value >= min) && (value <= max);
     }
 
     bool isNumericalLargerThan(QLineEdit* le, float limit) {
@@ -66,10 +63,7 @@ namespace {
         if (!validConversion) {
             return false;
         }
-        if (value > limit) {
-            return true;
-        }
-        return false;
+        return value > limit;
     }
 } // namespace
 
diff --git a/apps/OpenSpace/ext/sgct b/apps/OpenSpace/ext/sgct
index 19603f0bbd..9fad60cfb2 160000
--- a/apps/OpenSpace/ext/sgct
+++ b/apps/OpenSpace/ext/sgct
@@ -1 +1 @@
-Subproject commit 19603f0bbd18073d0c7d68bfd5c94315572193d1
+Subproject commit 9fad60cfb2aabf1768e6129365fa64f2bb07d35e
diff --git a/ext/ghoul b/ext/ghoul
index 43c025377f..fffdcec63a 160000
--- a/ext/ghoul
+++ b/ext/ghoul
@@ -1 +1 @@
-Subproject commit 43c025377fe5077c90e37f1a1a408e1865de6b14
+Subproject commit fffdcec63a4e47678f7286c8e2d787f843f8d1ba
diff --git a/include/openspace/interaction/sessionrecording.h b/include/openspace/interaction/sessionrecording.h
index 27dc7d615d..988f4b1a73 100644
--- a/include/openspace/interaction/sessionrecording.h
+++ b/include/openspace/interaction/sessionrecording.h
@@ -282,9 +282,9 @@ public:
      * Used to trigger a save of a script to the recording file, but only if a recording
      * is currently in progress.
      *
-     * \param scriptToSave String of the Lua command to be saved
+     * \param script String of the Lua command to be saved
      */
-    void saveScriptKeyframeToTimeline(std::string scriptToSave);
+    void saveScriptKeyframeToTimeline(std::string script);
 
     /**
      * \return The Lua library that contains all Lua functions available to affect the
@@ -633,7 +633,7 @@ protected:
     Timestamps generateCurrentTimestamp3(double keyframeTime) const;
     static void saveStringToFile(const std::string& s, unsigned char* kfBuffer,
         size_t& idx, std::ofstream& file);
-    static void saveKeyframeToFileBinary(unsigned char* bufferSource, size_t size,
+    static void saveKeyframeToFileBinary(unsigned char* buffer, size_t size,
         std::ofstream& file);
 
     bool addKeyframe(Timestamps t3stamps,
@@ -689,11 +689,12 @@ protected:
     bool convertEntries(std::string& inFilename, std::stringstream& inStream,
         DataMode mode, int lineNum, std::ofstream& outFile);
     virtual bool convertCamera(std::stringstream& inStream, DataMode mode, int lineNum,
-        std::string& inputLine, std::ofstream& outFile, unsigned char* buff);
+        std::string& inputLine, std::ofstream& outFile, unsigned char* buffer);
     virtual bool convertTimeChange(std::stringstream& inStream, DataMode mode,
-        int lineNum, std::string& inputLine, std::ofstream& outFile, unsigned char* buff);
+        int lineNum, std::string& inputLine, std::ofstream& outFile,
+        unsigned char* buffer);
     virtual bool convertScript(std::stringstream& inStream, DataMode mode, int lineNum,
-        std::string& inputLine, std::ofstream& outFile, unsigned char* buff);
+        std::string& inputLine, std::ofstream& outFile, unsigned char* buffer);
     DataMode readModeFromHeader(const std::string& filename);
     void readPlaybackHeader_stream(std::stringstream& conversionInStream,
         std::string& version, DataMode& mode);
diff --git a/include/openspace/navigation/orbitalnavigator.h b/include/openspace/navigation/orbitalnavigator.h
index cde98848f3..c5f1cd05ee 100644
--- a/include/openspace/navigation/orbitalnavigator.h
+++ b/include/openspace/navigation/orbitalnavigator.h
@@ -274,8 +274,8 @@ private:
      * from the global to the current total rotation so that
      * `cameraRotation = globalRotation * localRotation`.
      */
-    CameraRotationDecomposition decomposeCameraRotationSurface(const CameraPose& pose,
-        const SceneGraphNode& reference);
+    CameraRotationDecomposition decomposeCameraRotationSurface(
+        const CameraPose& cameraPose, const SceneGraphNode& reference);
 
     /**
      * Decomposes the camera's rotation in to a global and a local rotation defined by
@@ -285,7 +285,7 @@ private:
      * The local rotation defines the differential from the global to the current total
      * rotation so that `cameraRotation = globalRotation * localRotation`.
      */
-    CameraRotationDecomposition decomposeCameraRotation(const CameraPose& pose,
+    CameraRotationDecomposition decomposeCameraRotation(const CameraPose& cameraPose,
         const glm::dvec3& reference);
 
     /**
@@ -293,7 +293,7 @@ private:
      * the world rotation for a camera.
      */
     glm::dquat composeCameraRotation(
-        const CameraRotationDecomposition& composition) const;
+        const CameraRotationDecomposition& decomposition) const;
 
     /**
      * Moves and rotates the camera around the anchor node in order to maintain the screen
@@ -326,8 +326,8 @@ private:
     glm::dquat interpolateLocalRotation(double deltaTime,
         const glm::dquat& localCameraRotation);
 
-    Displacement interpolateRetargetAim(double deltaTime, CameraPose pose,
-        const glm::dvec3& cameraToAnchor, Displacement anchorToAim);
+    Displacement interpolateRetargetAim(double deltaTime, const CameraPose& pose,
+        const glm::dvec3& prevCameraToAnchor, Displacement anchorToAim);
 
     double interpolateCameraToSurfaceDistance(double deltaTime, double currentDistance,
         double targetDistance);
diff --git a/include/openspace/network/parallelconnection.h b/include/openspace/network/parallelconnection.h
index a633f3ab89..60f67b7172 100644
--- a/include/openspace/network/parallelconnection.h
+++ b/include/openspace/network/parallelconnection.h
@@ -61,7 +61,7 @@ public:
 
     struct DataMessage {
         DataMessage() = default;
-        DataMessage(datamessagestructures::Type t, double timestamp, std::vector<char> c);
+        DataMessage(datamessagestructures::Type t, double time, std::vector<char> c);
 
         datamessagestructures::Type type;
         double timestamp;
@@ -70,7 +70,7 @@ public:
 
     class ConnectionLostError : public ghoul::RuntimeError {
     public:
-        explicit ConnectionLostError(bool shouldLogError = true);
+        explicit ConnectionLostError(bool shouldLogError_ = true);
 
         bool shouldLogError;
     };
diff --git a/include/openspace/rendering/colormappingcomponent.h b/include/openspace/rendering/colormappingcomponent.h
index 6443a46975..c67dfd107d 100644
--- a/include/openspace/rendering/colormappingcomponent.h
+++ b/include/openspace/rendering/colormappingcomponent.h
@@ -74,7 +74,7 @@ public:
 
     static documentation::Documentation Documentation();
 
-    glm::vec4 colorFromColorMap(float value) const;
+    glm::vec4 colorFromColorMap(float valueToColorFrom) const;
 
     properties::BoolProperty enabled;
     properties::BoolProperty invert;
diff --git a/include/openspace/scene/profile.h b/include/openspace/scene/profile.h
index 13ca783062..f745be9aed 100644
--- a/include/openspace/scene/profile.h
+++ b/include/openspace/scene/profile.h
@@ -46,7 +46,7 @@ public:
     struct ParsingError : public ghoul::RuntimeError {
         enum class Severity { Info, Warning, Error };
 
-        explicit ParsingError(Severity severity, std::string msg);
+        explicit ParsingError(Severity severity_, std::string msg);
 
         Severity severity;
     };
diff --git a/include/openspace/scene/scenegraphnode.h b/include/openspace/scene/scenegraphnode.h
index 224ed69a52..dc269e07e8 100644
--- a/include/openspace/scene/scenegraphnode.h
+++ b/include/openspace/scene/scenegraphnode.h
@@ -140,7 +140,7 @@ public:
 
     bool supportsDirectInteraction() const;
 
-    SceneGraphNode* childNode(const std::string& identifier);
+    SceneGraphNode* childNode(const std::string& id);
 
     const Renderable* renderable() const;
     Renderable* renderable();
diff --git a/modules/base/dashboard/dashboarditemframerate.cpp b/modules/base/dashboard/dashboarditemframerate.cpp
index 6712ae7192..51fa1aad01 100644
--- a/modules/base/dashboard/dashboarditemframerate.cpp
+++ b/modules/base/dashboard/dashboarditemframerate.cpp
@@ -223,7 +223,7 @@ void DashboardItemFramerate::render(glm::vec2& penPosition) {
         global::windowDelegate->maxDeltaTime() * 1000.0
     );
 
-    FrametimeType frametimeType = FrametimeType(_frametimeType.value());
+    const FrametimeType frametimeType = FrametimeType(_frametimeType.value());
 
     std::fill(_buffer.begin(), _buffer.end(), char(0));
     char* end = format(
diff --git a/modules/base/rendering/pointcloud/renderablepointcloud.cpp b/modules/base/rendering/pointcloud/renderablepointcloud.cpp
index 85d05f1e45..65c99497e7 100644
--- a/modules/base/rendering/pointcloud/renderablepointcloud.cpp
+++ b/modules/base/rendering/pointcloud/renderablepointcloud.cpp
@@ -101,7 +101,7 @@ namespace {
         openspace::properties::Property::Visibility::NoviceUser
     };
 
-    static const openspace::properties::PropertyOwner::PropertyOwnerInfo LabelsInfo = {
+    const openspace::properties::PropertyOwner::PropertyOwnerInfo LabelsInfo = {
         "Labels",
         "Labels",
         "The labels for the points. If no label file is provided, the labels will be "
diff --git a/modules/base/rendering/pointcloud/renderablepolygoncloud.cpp b/modules/base/rendering/pointcloud/renderablepolygoncloud.cpp
index 9797bce49c..cdfd786524 100644
--- a/modules/base/rendering/pointcloud/renderablepolygoncloud.cpp
+++ b/modules/base/rendering/pointcloud/renderablepolygoncloud.cpp
@@ -131,16 +131,16 @@ void RenderablePolygonCloud::renderToTexture(GLuint textureToRenderTo,
     LDEBUG("Rendering to Texture");
 
     // Saves initial Application's OpenGL State
-    GLint defaultFBO;
-    GLint viewport[4];
+    GLint defaultFBO = 0;
+    std::array<GLint, 4> viewport;
     glGetIntegerv(GL_FRAMEBUFFER_BINDING, &defaultFBO);
-    glGetIntegerv(GL_VIEWPORT, viewport);
+    glGetIntegerv(GL_VIEWPORT, viewport.data());
 
     GLuint textureFBO;
     glGenFramebuffers(1, &textureFBO);
     glBindFramebuffer(GL_FRAMEBUFFER, textureFBO);
-    GLenum drawBuffers[1] = { GL_COLOR_ATTACHMENT0 };
-    glDrawBuffers(1, drawBuffers);
+    const GLenum drawBuffers = GL_COLOR_ATTACHMENT0;
+    glDrawBuffers(1, &drawBuffers);
 
     glFramebufferTexture(GL_FRAMEBUFFER, GL_COLOR_ATTACHMENT0, textureToRenderTo, 0);
 
diff --git a/modules/base/rendering/renderableplane.cpp b/modules/base/rendering/renderableplane.cpp
index 4224b57c9d..9baf51f932 100644
--- a/modules/base/rendering/renderableplane.cpp
+++ b/modules/base/rendering/renderableplane.cpp
@@ -322,7 +322,7 @@ void RenderablePlane::update(const UpdateData&) {
 void RenderablePlane::createPlane() {
     const GLfloat sizeX = _size.value().x;
     const GLfloat sizeY = _size.value().y;
-    const GLfloat vertexData[] = {
+    const std::array<GLfloat, 36> vertexData = {
         //   x       y    z    w    s    t
         -sizeX, -sizeY, 0.f, 0.f, 0.f, 0.f,
          sizeX,  sizeY, 0.f, 0.f, 1.f, 1.f,
@@ -334,7 +334,7 @@ void RenderablePlane::createPlane() {
 
     glBindVertexArray(_quad);
     glBindBuffer(GL_ARRAY_BUFFER, _vertexPositionBuffer);
-    glBufferData(GL_ARRAY_BUFFER, sizeof(vertexData), vertexData, GL_STATIC_DRAW);
+    glBufferData(GL_ARRAY_BUFFER, sizeof(vertexData), vertexData.data(), GL_STATIC_DRAW);
     glEnableVertexAttribArray(0);
     glVertexAttribPointer(0, 4, GL_FLOAT, GL_FALSE, sizeof(GLfloat) * 6, nullptr);
 
diff --git a/modules/base/rendering/renderableplanetimevaryingimage.h b/modules/base/rendering/renderableplanetimevaryingimage.h
index adb667868b..8afde80dc2 100644
--- a/modules/base/rendering/renderableplanetimevaryingimage.h
+++ b/modules/base/rendering/renderableplanetimevaryingimage.h
@@ -57,7 +57,7 @@ private:
     ghoul::opengl::Texture* loadTexture() const;
     void extractTriggerTimesFromFileNames();
     bool extractMandatoryInfoFromDictionary();
-    int updateActiveTriggerTimeIndex(double currenttime) const;
+    int updateActiveTriggerTimeIndex(double currentTime) const;
     void computeSequenceEndTime();
 
     // If there's just one state it should never disappear
diff --git a/modules/debugging/rendering/renderabledebugplane.cpp b/modules/debugging/rendering/renderabledebugplane.cpp
index 541d1e6fff..906d21f5bc 100644
--- a/modules/debugging/rendering/renderabledebugplane.cpp
+++ b/modules/debugging/rendering/renderabledebugplane.cpp
@@ -227,7 +227,7 @@ void RenderableDebugPlane::createPlane() {
     // ============================
     const GLfloat size = _size;
 
-    const GLfloat vertexData[] = {
+    const std::array<GLfloat, 36> vertexData = {
         //  x      y    z    w    s    t
         -size, -size, 0.f, 0.f, 0.f, 0.f,
          size,  size, 0.f, 0.f, 1.f, 1.f,
@@ -239,7 +239,7 @@ void RenderableDebugPlane::createPlane() {
 
     glBindVertexArray(_quad); // bind array
     glBindBuffer(GL_ARRAY_BUFFER, _vertexPositionBuffer); // bind buffer
-    glBufferData(GL_ARRAY_BUFFER, sizeof(vertexData), vertexData, GL_STATIC_DRAW);
+    glBufferData(GL_ARRAY_BUFFER, sizeof(vertexData), vertexData.data(), GL_STATIC_DRAW);
     glEnableVertexAttribArray(0);
     glVertexAttribPointer(0, 4, GL_FLOAT, GL_FALSE, sizeof(GLfloat) * 6, nullptr);
     glEnableVertexAttribArray(1);
diff --git a/modules/gaia/tasks/readfilejob.cpp b/modules/gaia/tasks/readfilejob.cpp
index 716471a252..c3f98af875 100644
--- a/modules/gaia/tasks/readfilejob.cpp
+++ b/modules/gaia/tasks/readfilejob.cpp
@@ -264,4 +264,4 @@ std::vector<std::vector<float>> ReadFileJob::product() {
     return _octants;
 }
 
-} // namespace openspace::gaiamission
+} // namespace openspace::gaia
diff --git a/modules/globebrowsing/src/geojson/geojsoncomponent.cpp b/modules/globebrowsing/src/geojson/geojsoncomponent.cpp
index b943747989..1ce8ada611 100644
--- a/modules/globebrowsing/src/geojson/geojsoncomponent.cpp
+++ b/modules/globebrowsing/src/geojson/geojsoncomponent.cpp
@@ -250,7 +250,7 @@ documentation::Documentation GeoJsonComponent::Documentation() {
 
 GeoJsonComponent::SubFeatureProps::SubFeatureProps(
                                        properties::PropertyOwner::PropertyOwnerInfo info)
-    : properties::PropertyOwner(info)
+    : properties::PropertyOwner(std::move(info))
     , enabled(EnabledInfo, true)
     , centroidLatLong(
         CentroidCoordinateInfo,
diff --git a/modules/globebrowsing/src/globelabelscomponent.cpp b/modules/globebrowsing/src/globelabelscomponent.cpp
index 2993a744c2..cd6350402e 100644
--- a/modules/globebrowsing/src/globelabelscomponent.cpp
+++ b/modules/globebrowsing/src/globelabelscomponent.cpp
@@ -202,23 +202,12 @@ namespace {
         // farDistance *= invMagFar;
 
         constexpr float Radius = 1.0;
-        if ((glm::dot(leftNormal, position) + leftDistance) < -Radius) {
-            return false;
-        }
-        else if ((glm::dot(rightNormal, position) + rightDistance) < -Radius) {
-            return false;
-        }
-        else if ((glm::dot(bottomNormal, position) + bottomDistance) < -Radius) {
-            return false;
-        }
-        else if ((glm::dot(topNormal, position) + topDistance) < -Radius) {
-            return false;
-        }
-        else if ((glm::dot(nearNormal, position) + nearDistance) < -Radius) {
-            return false;
-        }
-
-        return true;
+        const bool res = ((glm::dot(leftNormal, position) + leftDistance) < -Radius) ||
+            ((glm::dot(rightNormal, position) + rightDistance) < -Radius) ||
+            ((glm::dot(bottomNormal, position) + bottomDistance) < -Radius) ||
+            ((glm::dot(topNormal, position) + topDistance) < -Radius) ||
+            ((glm::dot(nearNormal, position) + nearDistance) < -Radius);
+        return !res;
     }
 
     struct [[codegen::Dictionary(GlobeLabelsComponent)]] Parameters {
@@ -452,7 +441,7 @@ bool GlobeLabelsComponent::readLabelsFile(const std::filesystem::path& file) {
             strncpy(lEntry.feature, token.c_str(), 255);
             int tokenChar = 0;
             while (tokenChar < 256) {
-                if (lEntry.feature[tokenChar] < 0 && lEntry.feature[tokenChar]) {
+                if (lEntry.feature[tokenChar] < 0 || lEntry.feature[tokenChar] == '\0') {
                     lEntry.feature[tokenChar] = '*';
                 }
                 else if (lEntry.feature[tokenChar] == '\"') {
diff --git a/modules/globebrowsing/src/layermanager.h b/modules/globebrowsing/src/layermanager.h
index 024734af6a..f55341c610 100644
--- a/modules/globebrowsing/src/layermanager.h
+++ b/modules/globebrowsing/src/layermanager.h
@@ -55,8 +55,8 @@ public:
     void initialize(const ghoul::Dictionary& layerGroupsDict);
     void deinitialize();
 
-    Layer* addLayer(layers::Group::ID groupId, const ghoul::Dictionary& layerDict);
-    void deleteLayer(layers::Group::ID groupId, const std::string& layerName);
+    Layer* addLayer(layers::Group::ID id, const ghoul::Dictionary& layerDict);
+    void deleteLayer(layers::Group::ID id, const std::string& layerName);
 
     LayerGroup& layerGroup(layers::Group::ID groupId);
     const LayerGroup& layerGroup(layers::Group::ID groupId) const;
diff --git a/modules/globebrowsing/src/layerrendersettings.cpp b/modules/globebrowsing/src/layerrendersettings.cpp
index e50a39d070..144289775a 100644
--- a/modules/globebrowsing/src/layerrendersettings.cpp
+++ b/modules/globebrowsing/src/layerrendersettings.cpp
@@ -88,9 +88,9 @@ void LayerRenderSettings::onChange(const std::function<void()>& callback) {
     offset.onChange(callback);
 }
 
-float LayerRenderSettings::performLayerSettings(float v) const {
+float LayerRenderSettings::performLayerSettings(float value) const {
     return
-        ((glm::sign(v) * glm::pow(glm::abs(v), gamma) * multiplier) + offset);
+        ((glm::sign(value) * glm::pow(glm::abs(value), gamma) * multiplier) + offset);
 }
 
 glm::vec4 LayerRenderSettings::performLayerSettings(const glm::vec4& currentValue) const {
diff --git a/modules/globebrowsing/src/rawtiledatareader.cpp b/modules/globebrowsing/src/rawtiledatareader.cpp
index f456046efb..0374d9681c 100644
--- a/modules/globebrowsing/src/rawtiledatareader.cpp
+++ b/modules/globebrowsing/src/rawtiledatareader.cpp
@@ -415,8 +415,8 @@ void RawTileDataReader::initialize() {
             case GL_SHORT:          return 1ULL << 15ULL;
             case GL_UNSIGNED_INT:   return 1ULL << 32ULL;
             case GL_INT:            return 1ULL << 31ULL;
-            case GL_HALF_FLOAT:     return 1ULL;
-            case GL_FLOAT:          return 1ULL;
+            case GL_HALF_FLOAT:
+            case GL_FLOAT:
             case GL_DOUBLE:         return 1ULL;
             default:                throw ghoul::MissingCaseException();
         }
diff --git a/modules/globebrowsing/src/renderableglobe.h b/modules/globebrowsing/src/renderableglobe.h
index f4ce5e70e5..a3baeb1ff6 100644
--- a/modules/globebrowsing/src/renderableglobe.h
+++ b/modules/globebrowsing/src/renderableglobe.h
@@ -70,7 +70,7 @@ struct Chunk {
         WantSplit
     };
 
-    Chunk(const TileIndex& tileIndex);
+    Chunk(const TileIndex& ti);
 
     const TileIndex tileIndex;
     const GeodeticPatch surfacePatch;
diff --git a/modules/globebrowsing/src/skirtedgrid.h b/modules/globebrowsing/src/skirtedgrid.h
index 85360432ca..0dd21926cc 100644
--- a/modules/globebrowsing/src/skirtedgrid.h
+++ b/modules/globebrowsing/src/skirtedgrid.h
@@ -39,10 +39,10 @@ namespace openspace::globebrowsing {
 class SkirtedGrid {
 public:
     /**
-     * \param xSegments is the number of grid cells in the x direction
-     * \param ySegments is the number of grid cells in the y direction
+     * \param xSeg is the number of grid cells in the x direction
+     * \param ySeg is the number of grid cells in the y direction
      */
-    SkirtedGrid(unsigned int xSegments, unsigned int ySegments);
+    SkirtedGrid(unsigned int xSeg, unsigned int ySeg);
     ~SkirtedGrid() = default;
 
     void initializeGL();
diff --git a/modules/globebrowsing/src/tileindex.h b/modules/globebrowsing/src/tileindex.h
index 10f89628b7..3a0098a4ad 100644
--- a/modules/globebrowsing/src/tileindex.h
+++ b/modules/globebrowsing/src/tileindex.h
@@ -34,7 +34,7 @@ namespace openspace::globebrowsing {
 struct TileIndex {
     using TileHashKey = uint64_t;
 
-    TileIndex(uint32_t x, uint32_t y, uint8_t level);
+    TileIndex(uint32_t x_, uint32_t y_, uint8_t level_);
 
     uint32_t x = 0;
     uint32_t y = 0;
diff --git a/modules/globebrowsing/src/tileprovider/defaulttileprovider.cpp b/modules/globebrowsing/src/tileprovider/defaulttileprovider.cpp
index 5450f4681c..400e058db0 100644
--- a/modules/globebrowsing/src/tileprovider/defaulttileprovider.cpp
+++ b/modules/globebrowsing/src/tileprovider/defaulttileprovider.cpp
@@ -142,7 +142,7 @@ DefaultTileProvider::DefaultTileProvider(const ghoul::Dictionary& dictionary)
     const int pixelSize = p.tilePixelSize.value_or(0);
 
     // Only preprocess height layers by default
-    _performPreProcessing = _layerGroupID == layers::Group::ID::HeightLayers;
+    _performPreProcessing = (_layerGroupID == layers::Group::ID::HeightLayers);
     _performPreProcessing = p.performPreProcessing.value_or(_performPreProcessing);
 
     // Get the name of the layergroup to which this layer belongs
diff --git a/modules/globebrowsing/src/tileprovider/temporaltileprovider.cpp b/modules/globebrowsing/src/tileprovider/temporaltileprovider.cpp
index 1792b6f056..34616b46d4 100644
--- a/modules/globebrowsing/src/tileprovider/temporaltileprovider.cpp
+++ b/modules/globebrowsing/src/tileprovider/temporaltileprovider.cpp
@@ -398,7 +398,7 @@ DefaultTileProvider TemporalTileProvider::createTileProvider(
         case Mode::Prototype: {
             static const std::vector<std::string> IgnoredTokens = {
                 // From: http://www.gdal.org/frmt_wms.html
-                "${x}", "${y}", "${z}", "${version}" "${format}", "${layer}"
+                "${x}", "${y}", "${z}", "${version}", "${format}", "${layer}"
             };
 
             value = _prototyped.prototype;
@@ -768,8 +768,8 @@ Tile TemporalTileProvider::InterpolateTileProvider::tile(const TileIndex& tileIn
     glBindFramebuffer(GL_FRAMEBUFFER, fbo);
     glFramebufferTexture(GL_FRAMEBUFFER, GL_COLOR_ATTACHMENT0, *writeTexture, 0);
     glDisable(GL_BLEND);
-    GLenum textureBuffers[1] = { GL_COLOR_ATTACHMENT0 };
-    glDrawBuffers(1, textureBuffers);
+    const GLenum textureBuffers = GL_COLOR_ATTACHMENT0;
+    glDrawBuffers(1, &textureBuffers);
 
     // Setup our own viewport settings
     const GLsizei w = static_cast<GLsizei>(writeTexture->width());
diff --git a/modules/globebrowsing/src/tileprovider/texttileprovider.h b/modules/globebrowsing/src/tileprovider/texttileprovider.h
index a9bf92ec43..4d8ec98b86 100644
--- a/modules/globebrowsing/src/tileprovider/texttileprovider.h
+++ b/modules/globebrowsing/src/tileprovider/texttileprovider.h
@@ -31,7 +31,7 @@ namespace openspace::globebrowsing {
 
 class TextTileProvider : public TileProvider {
 public:
-    TextTileProvider(TileTextureInitData initData, size_t fontSize = 48);
+    TextTileProvider(TileTextureInitData initData_, size_t fontSize_ = 48);
     ~TextTileProvider() override;
 
     void reset() override;
diff --git a/modules/imgui/src/guimissioncomponent.cpp b/modules/imgui/src/guimissioncomponent.cpp
index 7fd9022d08..eae88610b6 100644
--- a/modules/imgui/src/guimissioncomponent.cpp
+++ b/modules/imgui/src/guimissioncomponent.cpp
@@ -118,4 +118,4 @@ void GuiMissionComponent::render() {
     ImGui::End();
 }
 
-} // namespace openspace gui
+} // namespace openspace::gui
diff --git a/modules/imgui/src/guispacetimecomponent.cpp b/modules/imgui/src/guispacetimecomponent.cpp
index 15844b7985..d650336be6 100644
--- a/modules/imgui/src/guispacetimecomponent.cpp
+++ b/modules/imgui/src/guispacetimecomponent.cpp
@@ -627,4 +627,4 @@ void GuiSpaceTimeComponent::render() {
     ImGui::End();
 }
 
-} // namespace openspace gui
+} // namespace openspace::gui
diff --git a/modules/server/src/jsonconverters.cpp b/modules/server/src/jsonconverters.cpp
index 3481455972..18960ed5d4 100644
--- a/modules/server/src/jsonconverters.cpp
+++ b/modules/server/src/jsonconverters.cpp
@@ -70,37 +70,37 @@ void to_json(json& j, const PropertyOwner* p) {
 
 namespace ghoul {
 
-void to_json(json& j, const Dictionary& dictionary) {
+void to_json(json& j, const Dictionary& d) {
     json object;
-    for (const std::string_view k : dictionary.keys()) {
+    for (const std::string_view k : d.keys()) {
         const std::string key = std::string(k);
-        if (dictionary.hasValue<glm::dvec4>(key)) {
-            const glm::dvec4 v = dictionary.value<glm::dvec4>(key);
+        if (d.hasValue<glm::dvec4>(key)) {
+            const glm::dvec4 v = d.value<glm::dvec4>(key);
             object[key] = json::array({ v[0], v[1], v[2], v[3] });
         }
-        else if (dictionary.hasValue<glm::dvec3>(key)) {
-            const glm::dvec3 v = dictionary.value<glm::dvec3>(key);
+        else if (d.hasValue<glm::dvec3>(key)) {
+            const glm::dvec3 v = d.value<glm::dvec3>(key);
             object[key] = json::array({ v[0], v[1], v[2] });
         }
-        else if (dictionary.hasValue<glm::dvec2>(key)) {
-            const glm::dvec2 v = dictionary.value<glm::dvec2>(key);
+        else if (d.hasValue<glm::dvec2>(key)) {
+            const glm::dvec2 v = d.value<glm::dvec2>(key);
             object[key] = json::array({ v[0], v[1] });
         }
-        else if (dictionary.hasValue<double>(key)) {
-            object[key] = dictionary.value<double>(key);
+        else if (d.hasValue<double>(key)) {
+            object[key] = d.value<double>(key);
         }
-        else if (dictionary.hasValue<int>(key)) {
-            object[key] = dictionary.value<int>(key);
+        else if (d.hasValue<int>(key)) {
+            object[key] = d.value<int>(key);
         }
-        else if (dictionary.hasValue<std::string>(key)) {
-            object[key] = dictionary.value<std::string>(key);
+        else if (d.hasValue<std::string>(key)) {
+            object[key] = d.value<std::string>(key);
         }
-        else if (dictionary.hasValue<bool>(key)) {
-            object[key] = dictionary.value<bool>(key);
+        else if (d.hasValue<bool>(key)) {
+            object[key] = d.value<bool>(key);
         }
-        else if (dictionary.hasValue<Dictionary>(key)) {
+        else if (d.hasValue<Dictionary>(key)) {
             json child;
-            to_json(child, dictionary.value<Dictionary>(key));
+            to_json(child, d.value<Dictionary>(key));
             object[key] = child;
         }
         else {
@@ -167,4 +167,4 @@ void to_json(json& j, const dvec3& v) {
     };
 }
 
-} // namepsace glm
+} // namespace glm
diff --git a/modules/server/src/serverinterface.cpp b/modules/server/src/serverinterface.cpp
index 4679ed9414..c9bf5a08f5 100644
--- a/modules/server/src/serverinterface.cpp
+++ b/modules/server/src/serverinterface.cpp
@@ -297,5 +297,4 @@ ghoul::io::SocketServer* ServerInterface::server() {
     return _socketServer.get();
 }
 
-
-}
+} // namespace openspace
diff --git a/modules/skybrowser/skybrowsermodule.h b/modules/skybrowser/skybrowsermodule.h
index 40006f2084..b194768f83 100644
--- a/modules/skybrowser/skybrowsermodule.h
+++ b/modules/skybrowser/skybrowsermodule.h
@@ -74,7 +74,7 @@ public:
     bool isSelectedPairUsingRae() const;
 
     // Managing the target browser pairs
-    void removeTargetBrowserPair(const std::string& browserId);
+    void removeTargetBrowserPair(const std::string& id);
     void addTargetBrowserPair(const std::string& targetId, const std::string& browserId);
 
     // Hover circle
diff --git a/modules/skybrowser/src/utility.cpp b/modules/skybrowser/src/utility.cpp
index f7f1a0cef8..b9e3923fa6 100644
--- a/modules/skybrowser/src/utility.cpp
+++ b/modules/skybrowser/src/utility.cpp
@@ -61,12 +61,12 @@ glm::dvec3 sphericalToCartesian(const glm::dvec2& coords) {
 }
 
 // Converts from cartesian coordianates to spherical in the unit of degrees
-glm::dvec2 cartesianToSpherical(const glm::dvec3& coord) {
+glm::dvec2 cartesianToSpherical(const glm::dvec3& coords) {
     // Equatorial coordinates RA = right ascension, Dec = declination
-    double ra = atan2(coord.y, coord.x);
+    double ra = atan2(coords.y, coords.x);
     const double dec = atan2(
-        coord.z,
-        glm::sqrt((coord.x * coord.x) + (coord.y * coord.y))
+        coords.z,
+        glm::sqrt((coords.x * coords.x) + (coords.y * coords.y))
     );
 
     ra = ra > 0.0 ? ra : ra + glm::two_pi<double>();
@@ -275,4 +275,4 @@ glm::dvec3 Animation<glm::dvec3>::newValue() const {
     return glm::dvec3(rotMat * glm::dvec4(_start, 1.0));;
 }
 
-} // namespace openspace
+} // namespace openspace::skybrowser
diff --git a/modules/sound/ext/soloud b/modules/sound/ext/soloud
new file mode 160000
index 0000000000..1157475881
--- /dev/null
+++ b/modules/sound/ext/soloud
@@ -0,0 +1 @@
+Subproject commit 1157475881da0d7f76102578255b937c7d4e8f57
diff --git a/modules/space/horizonsfile.cpp b/modules/space/horizonsfile.cpp
index 6dedaf89b6..1bf0cf13ca 100644
--- a/modules/space/horizonsfile.cpp
+++ b/modules/space/horizonsfile.cpp
@@ -116,7 +116,7 @@ std::string constructHorizonsUrl(HorizonsType type, const std::string& target,
     return url;
 }
 
-json sendHorizonsRequest(const std::string& url, std::filesystem::path filePath) {
+json sendHorizonsRequest(const std::string& url, const std::filesystem::path& filePath) {
     // Set up HTTP request and download result
     const auto download = std::make_unique<HttpFileDownload>(
         url,
diff --git a/modules/space/horizonsfile.h b/modules/space/horizonsfile.h
index 25b0cf6aae..92bc18fd01 100644
--- a/modules/space/horizonsfile.h
+++ b/modules/space/horizonsfile.h
@@ -128,7 +128,7 @@ std::string constructHorizonsUrl(HorizonsType type, const std::string& target,
     const std::string& stopTime, const std::string& stepSize,
     const std::string& unit);
 nlohmann::json sendHorizonsRequest(const std::string& url,
-    std::filesystem::path filePath);
+    const std::filesystem::path& filePath);
 nlohmann::json convertHorizonsDownloadToJson(const std::filesystem::path& filePath);
 HorizonsResultCode isValidHorizonsAnswer(const nlohmann::json& answer);
 HorizonsResultCode isValidHorizonsFile(const std::filesystem::path& file);
diff --git a/modules/space/rendering/renderableorbitalkepler.cpp b/modules/space/rendering/renderableorbitalkepler.cpp
index 217efc3f89..a5b6e29633 100644
--- a/modules/space/rendering/renderableorbitalkepler.cpp
+++ b/modules/space/rendering/renderableorbitalkepler.cpp
@@ -446,4 +446,4 @@ void RenderableOrbitalKepler::updateBuffers() {
     setBoundingSphere(maxSemiMajorAxis * 1000);
 }
 
-} // namespace opensapce
+} // namespace openspace
diff --git a/modules/space/rendering/renderablestars.cpp b/modules/space/rendering/renderablestars.cpp
index 444f7e63bc..39eca50620 100644
--- a/modules/space/rendering/renderablestars.cpp
+++ b/modules/space/rendering/renderablestars.cpp
@@ -929,8 +929,8 @@ void RenderableStars::renderPSFToTexture() {
     GLuint psfFBO = 0;
     glGenFramebuffers(1, &psfFBO);
     glBindFramebuffer(GL_FRAMEBUFFER, psfFBO);
-    GLenum drawBuffers[1] = { GL_COLOR_ATTACHMENT0 };
-    glDrawBuffers(1, drawBuffers);
+    GLenum drawBuffers = GL_COLOR_ATTACHMENT0;
+    glDrawBuffers(1, &drawBuffers);
 
     glFramebufferTexture(GL_FRAMEBUFFER, GL_COLOR_ATTACHMENT0, _psfTexture, 0);
     glViewport(0, 0, PsfTextureSize, PsfTextureSize);
diff --git a/modules/spacecraftinstruments/rendering/renderablemodelprojection.cpp b/modules/spacecraftinstruments/rendering/renderablemodelprojection.cpp
index 9278edbf31..97a5371bea 100644
--- a/modules/spacecraftinstruments/rendering/renderablemodelprojection.cpp
+++ b/modules/spacecraftinstruments/rendering/renderablemodelprojection.cpp
@@ -431,7 +431,7 @@ glm::mat4 RenderableModelProjection::attitudeParameters(double time, const glm::
         time
     );
 
-    const SpiceManager::FieldOfViewResult res = SpiceManager::ref().fieldOfView(
+    SpiceManager::FieldOfViewResult res = SpiceManager::ref().fieldOfView(
         _projectionComponent.instrumentId()
     );
     _boresight = std::move(res.boresightVector);
diff --git a/modules/spacecraftinstruments/rendering/renderableplaneprojection.cpp b/modules/spacecraftinstruments/rendering/renderableplaneprojection.cpp
index 53534ce988..1bbadb7caa 100644
--- a/modules/spacecraftinstruments/rendering/renderableplaneprojection.cpp
+++ b/modules/spacecraftinstruments/rendering/renderableplaneprojection.cpp
@@ -68,10 +68,10 @@ documentation::Documentation RenderablePlaneProjection::Documentation() {
     return codegen::doc<Parameters>("spacecraftinstruments_renderableplaneprojection");
 }
 
-RenderablePlaneProjection::RenderablePlaneProjection(const ghoul::Dictionary& dict)
-    : Renderable(dict)
+RenderablePlaneProjection::RenderablePlaneProjection(const ghoul::Dictionary& dictionary)
+    : Renderable(dictionary)
 {
-    const Parameters p = codegen::bake<Parameters>(dict);
+    const Parameters p = codegen::bake<Parameters>(dictionary);
     _spacecraft = p.spacecraft;
     _instrument = p.instrument;
     _defaultTarget = p.defaultTarget.value_or(_defaultTarget);
diff --git a/modules/statemachine/statemachinemodule.h b/modules/statemachine/statemachinemodule.h
index 9f6708bc25..dfb45d81df 100644
--- a/modules/statemachine/statemachinemodule.h
+++ b/modules/statemachine/statemachinemodule.h
@@ -58,7 +58,7 @@ public:
      * Save the state machine to a file given by the name and optional directory.
      * If no directory is given, the TEMP folder is used.
      */
-    void saveToFile(const std::string& fileName,
+    void saveToFile(const std::string& filename,
         std::string directory = "${TEMPORARY}/") const;
 
     scripting::LuaLibrary luaLibrary() const override;
diff --git a/modules/sync/syncs/httpsynchronization.cpp b/modules/sync/syncs/httpsynchronization.cpp
index 7b5dd027cb..12979a5a77 100644
--- a/modules/sync/syncs/httpsynchronization.cpp
+++ b/modules/sync/syncs/httpsynchronization.cpp
@@ -240,8 +240,8 @@ bool HttpSynchronization::isEachFileDownloaded() {
 }
 
 HttpSynchronization::SynchronizationState
-HttpSynchronization::trySyncFromUrl(std::string listUrl) {
-    HttpMemoryDownload fileListDownload(std::move(listUrl));
+HttpSynchronization::trySyncFromUrl(std::string url) {
+    HttpMemoryDownload fileListDownload = HttpMemoryDownload(std::move(url));
     fileListDownload.onProgress([&c = _shouldCancel](int64_t, std::optional<int64_t>) {
         return !c;
     });
diff --git a/modules/video/src/videoplayer.cpp b/modules/video/src/videoplayer.cpp
index b6a8225dd0..dd79ab5e45 100644
--- a/modules/video/src/videoplayer.cpp
+++ b/modules/video/src/videoplayer.cpp
@@ -909,4 +909,4 @@ void VideoPlayer::resizeTexture(glm::ivec2 size) {
     }
 }
 
-} // namespace openspace::video
+} // namespace openspace
diff --git a/modules/volume/envelope.cpp b/modules/volume/envelope.cpp
index 061e310bd9..31cedf7995 100644
--- a/modules/volume/envelope.cpp
+++ b/modules/volume/envelope.cpp
@@ -33,8 +33,8 @@ using json = nlohmann::json;
 namespace openspace::volume {
 
 EnvelopePoint::EnvelopePoint(glm::vec3 c, float x, float y)
-    : color(c)
-    , colorHex(hexadecimalFromVec3(std::move(c)))
+    : color(std::move(c))
+    , colorHex(hexadecimalFromVec3(color))
     , position({ x, y })
 {}
 
@@ -44,9 +44,9 @@ EnvelopePoint::EnvelopePoint(std::string c, float x, float y)
     , position(std::make_pair(x, y))
 {}
 
-Envelope::Envelope(std::vector<EnvelopePoint> vec) {
-    _points = std::move(vec);
-}
+Envelope::Envelope(std::vector<EnvelopePoint> vec)
+    : _points(std::move(vec))
+{}
 
 bool Envelope::operator!=(const Envelope& env) const {
     constexpr double MinDist = 0.0001;
@@ -87,13 +87,14 @@ bool Envelope::isEnvelopeValid() const {
          nextIter != _points.end();
          ++currentIter, ++nextIter)
     {
-        if (currentIter->position.first > nextIter->position.first)
+        if (currentIter->position.first > nextIter->position.first) {
             return false;
+        }
     }
     return true;
 }
 
-glm::vec3 Envelope::normalizeColor(glm::vec3 vec) const {
+glm::vec3 Envelope::normalizeColor(const glm::vec3& vec) const {
     return { vec.r / 255.f, vec.g / 255.f , vec.b / 255.f };
 }
 
@@ -110,7 +111,7 @@ glm::vec4 Envelope::valueAtPosition(float pos) const {
     }
     auto beforeIter = afterIter - 1;
 
-    float dist = afterIter->position.first - beforeIter->position.first;
+    const float dist = afterIter->position.first - beforeIter->position.first;
     if (dist < 0.0001) {
         return {
             normalizeColor((beforeIter->color + afterIter->color) / 2.f),
@@ -158,7 +159,7 @@ std::string EnvelopePoint::decimalToHexadecimal(int dec) const {
 
     std::string hexStr;
     while (dec > 0) {
-        int hex = dec % 16;
+        const int hex = dec % 16;
 
         if (hex < 10) {
             hexStr = hexStr.insert(0, std::string(1, static_cast<char>(hex + 48)));
@@ -180,9 +181,9 @@ glm::vec3 EnvelopePoint::hexadecimalToRGBConversion(const std::string& hex) cons
 }
 
 std::string EnvelopePoint::hexadecimalFromVec3(const glm::vec3& vec) const {
-    std::string r = decimalToHexadecimal(static_cast<int>(vec.r));
-    std::string g = decimalToHexadecimal(static_cast<int>(vec.g));
-    std::string b = decimalToHexadecimal(static_cast<int>(vec.b));
+    const std::string r = decimalToHexadecimal(static_cast<int>(vec.r));
+    const std::string g = decimalToHexadecimal(static_cast<int>(vec.g));
+    const std::string b = decimalToHexadecimal(static_cast<int>(vec.b));
 
     return ("#" + r + g + b);
 }
diff --git a/modules/volume/envelope.h b/modules/volume/envelope.h
index ee31491667..4723630cc4 100644
--- a/modules/volume/envelope.h
+++ b/modules/volume/envelope.h
@@ -56,7 +56,7 @@ public:
     const std::vector<EnvelopePoint>& points() const;
 
     glm::vec4 valueAtPosition(float pos) const;
-    glm::vec3 normalizeColor(glm::vec3 vec) const;
+    glm::vec3 normalizeColor(const glm::vec3& vec) const;
     nlohmann::json jsonPoints() const;
     nlohmann::json jsonEnvelope() const;
     void setEnvelopeLuaTable(lua_State* state) const;
diff --git a/modules/volume/transferfunction.cpp b/modules/volume/transferfunction.cpp
index b62082565c..f07afd4ce8 100644
--- a/modules/volume/transferfunction.cpp
+++ b/modules/volume/transferfunction.cpp
@@ -33,8 +33,8 @@ using json = nlohmann::json;
 
 namespace openspace::volume {
 
-TransferFunction::TransferFunction(const std::string& s) {
-    setEnvelopesFromString(s);
+TransferFunction::TransferFunction(const std::string& string) {
+    setEnvelopesFromString(string);
 }
 
 bool TransferFunction::setEnvelopesFromString(const std::string& s) {
diff --git a/modules/webbrowser/webbrowsermodule.cpp b/modules/webbrowser/webbrowsermodule.cpp
index 35788be99d..f9a3d60677 100644
--- a/modules/webbrowser/webbrowsermodule.cpp
+++ b/modules/webbrowser/webbrowsermodule.cpp
@@ -123,6 +123,8 @@ WebBrowserModule::WebBrowserModule()
     addProperty(_browserUpdateInterval);
 }
 
+WebBrowserModule::~WebBrowserModule() {}
+
 void WebBrowserModule::internalDeinitialize() {
     ZoneScoped;
 
diff --git a/modules/webbrowser/webbrowsermodule.h b/modules/webbrowser/webbrowsermodule.h
index b6215a8acc..3ec9a233f4 100644
--- a/modules/webbrowser/webbrowsermodule.h
+++ b/modules/webbrowser/webbrowsermodule.h
@@ -49,7 +49,7 @@ public:
     static constexpr const char* Name = "WebBrowser";
 
     WebBrowserModule();
-    ~WebBrowserModule() override = default;
+    ~WebBrowserModule() override;
 
     void addBrowser(BrowserInstance*);
     void removeBrowser(BrowserInstance*);
diff --git a/src/data/dataloader.cpp b/src/data/dataloader.cpp
index b2b10bb94c..a97327ad0b 100644
--- a/src/data/dataloader.cpp
+++ b/src/data/dataloader.cpp
@@ -449,9 +449,9 @@ void saveCachedFile(const Labelset& labelset, const std::filesystem::path& path)
     }
 }
 
-Labelset loadFileWithCache(std::filesystem::path filePath) {
+Labelset loadFileWithCache(std::filesystem::path path) {
     return internalLoadFileWithCache<Labelset>(
-        std::move(filePath),
+        std::move(path),
         std::nullopt,
         &loadFile,
         &loadCachedFile,
diff --git a/src/data/datamapping.cpp b/src/data/datamapping.cpp
index 172e3753d9..3b8f24cd8a 100644
--- a/src/data/datamapping.cpp
+++ b/src/data/datamapping.cpp
@@ -107,7 +107,7 @@ namespace {
         std::optional<std::vector<std::string>> excludeColumns;
     };
 #include "datamapping_codegen.cpp"
-}
+} // namespace
 
 namespace openspace::dataloader {
 
diff --git a/src/documentation/documentationengine.cpp b/src/documentation/documentationengine.cpp
index 73e3df7788..89a28af415 100644
--- a/src/documentation/documentationengine.cpp
+++ b/src/documentation/documentationengine.cpp
@@ -83,7 +83,7 @@ nlohmann::json generateJsonDocumentation(const Documentation& d) {
     for (const DocumentationEntry& p : d.entries) {
         nlohmann::json entry;
         entry["key"] = p.key;
-        entry["optional"] = p.optional ? true : false;
+        entry["optional"] = static_cast<bool>(p.optional);
         entry["type"] = p.verifier->type();
         entry["documentation"] = p.documentation;
 
diff --git a/src/engine/moduleengine.cpp b/src/engine/moduleengine.cpp
index fd1f8450fd..4212596462 100644
--- a/src/engine/moduleengine.cpp
+++ b/src/engine/moduleengine.cpp
@@ -135,27 +135,27 @@ void ModuleEngine::deinitializeGL() {
     LDEBUG("Finished deinitializing OpenGL of modules");
 }
 
-void ModuleEngine::registerModule(std::unique_ptr<OpenSpaceModule> mod) {
+void ModuleEngine::registerModule(std::unique_ptr<OpenSpaceModule> module) {
     ZoneScoped;
 
-    ghoul_assert(mod, "Module must not be nullptr");
+    ghoul_assert(module, "Module must not be nullptr");
 
     auto it = std::find_if(
         _modules.begin(),
         _modules.end(),
-        [&mod](std::unique_ptr<OpenSpaceModule>& rhs) {
-            return rhs->identifier() == mod->identifier();
+        [&module](std::unique_ptr<OpenSpaceModule>& rhs) {
+            return rhs->identifier() == module->identifier();
         }
     );
     if (it != _modules.end()) {
         throw ghoul::RuntimeError(
-            fmt::format("Module name '{}' was registered before", mod->identifier()),
+            fmt::format("Module name '{}' was registered before", module->identifier()),
             "ModuleEngine"
         );
     }
 
-    LDEBUG(fmt::format("Registered module '{}'", mod->identifier()));
-    _modules.push_back(std::move(mod));
+    LDEBUG(fmt::format("Registered module '{}'", module->identifier()));
+    _modules.push_back(std::move(module));
 }
 
 std::vector<OpenSpaceModule*> ModuleEngine::modules() const {
diff --git a/src/events/eventengine.cpp b/src/events/eventengine.cpp
index a827cbfae7..da1f06c9f9 100644
--- a/src/events/eventengine.cpp
+++ b/src/events/eventengine.cpp
@@ -31,7 +31,7 @@
 
 namespace {
     constexpr std::string_view _loggerCat = "EventEngine";
-}
+} // namespace
 
 namespace openspace {
 
diff --git a/src/interaction/mousecamerastates.cpp b/src/interaction/mousecamerastates.cpp
index d74502d8af..219183c061 100644
--- a/src/interaction/mousecamerastates.cpp
+++ b/src/interaction/mousecamerastates.cpp
@@ -28,9 +28,9 @@
 #include <openspace/interaction/keyboardinputstate.h>
 
 namespace {
-    const double SENSITIVITY_ADJUSTMENT_INCREASE = 8.0;
-    const double SENSITIVITY_ADJUSTMENT_DECREASE = 0.5;
-}
+    constexpr double SensitivityAdjustmentIncrease = 8.0;
+    constexpr double SensitivityAdjustmentDecrease = 0.5;
+} // namespace
 
 namespace openspace::interaction {
 
@@ -100,10 +100,10 @@ void MouseCameraStates::updateStateFromInput(const MouseInputState& mouseState,
 
         double sensitivity = _sensitivity;
         if (keyboardState.isKeyPressed(Key::Z)) {
-            sensitivity *= SENSITIVITY_ADJUSTMENT_INCREASE;
+            sensitivity *= SensitivityAdjustmentIncrease;
         }
         else if (keyboardState.isKeyPressed(Key::X)) {
-            sensitivity *= SENSITIVITY_ADJUSTMENT_DECREASE;
+            sensitivity *= SensitivityAdjustmentDecrease;
         }
 
         _truckMovementState.velocity.set(
diff --git a/src/interaction/sessionrecording.cpp b/src/interaction/sessionrecording.cpp
index bd7ad87bbb..b30297c21b 100644
--- a/src/interaction/sessionrecording.cpp
+++ b/src/interaction/sessionrecording.cpp
@@ -2083,24 +2083,20 @@ bool SessionRecording::processCameraKeyframe(double now) {
 }
 
 bool SessionRecording::processScriptKeyframe() {
-    if (!_playbackActive_script) {
+    if (!_playbackActive_script || _keyframesScript.empty()) {
         return false;
     }
-    else if (_keyframesScript.empty()) {
-        return false;
-    }
-    else {
-        const std::string nextScript = nextKeyframeObj(
-            _idxScript,
-            _keyframesScript,
-            ([this]() { signalPlaybackFinishedForComponent(RecordedType::Script); })
-        );
-        global::scriptEngine->queueScript(
-            nextScript,
-            scripting::ScriptEngine::ShouldBeSynchronized::Yes,
-            scripting::ScriptEngine::ShouldSendToRemote::Yes
-        );
-    }
+
+    const std::string nextScript = nextKeyframeObj(
+        _idxScript,
+        _keyframesScript,
+        ([this]() { signalPlaybackFinishedForComponent(RecordedType::Script); })
+    );
+    global::scriptEngine->queueScript(
+        nextScript,
+        scripting::ScriptEngine::ShouldBeSynchronized::Yes,
+        scripting::ScriptEngine::ShouldSendToRemote::Yes
+    );
 
     return true;
 }
diff --git a/src/interaction/tasks/convertrecfileversiontask.cpp b/src/interaction/tasks/convertrecfileversiontask.cpp
index 48bf123ee8..1bc49b77b8 100644
--- a/src/interaction/tasks/convertrecfileversiontask.cpp
+++ b/src/interaction/tasks/convertrecfileversiontask.cpp
@@ -113,4 +113,4 @@ documentation::Documentation ConvertRecFileVersionTask::documentation() {
     };
 }
 
-}
+} // namespace openspace::interaction
diff --git a/src/interaction/tasks/convertrecformattask.cpp b/src/interaction/tasks/convertrecformattask.cpp
index 9e6952ff53..635e13d835 100644
--- a/src/interaction/tasks/convertrecformattask.cpp
+++ b/src/interaction/tasks/convertrecformattask.cpp
@@ -336,4 +336,4 @@ documentation::Documentation ConvertRecFormatTask::documentation() {
     };
 }
 
-}
+} // namespace openspace::interaction
diff --git a/src/mission/mission.cpp b/src/mission/mission.cpp
index 589e86ad3d..4a04fe6bc2 100644
--- a/src/mission/mission.cpp
+++ b/src/mission/mission.cpp
@@ -163,10 +163,9 @@ MissionPhase::MissionPhase(const ghoul::Dictionary& dictionary) {
         _milestones.reserve(p.milestones->size());
         for (const Parameters::Milestone& milestone : *p.milestones) {
             std::string name = milestone.name;
-            Time newTime = Time(milestone.date);
             Milestone newDate = {
                 .name = std::move(name),
-                .date = std::move(newTime)
+                .date = Time(milestone.date)
             };
             if (milestone.description.has_value()) {
                 newDate.description = milestone.description.value();
diff --git a/src/navigation/navigationhandler.cpp b/src/navigation/navigationhandler.cpp
index 96329c6e79..e53b6bc487 100644
--- a/src/navigation/navigationhandler.cpp
+++ b/src/navigation/navigationhandler.cpp
@@ -583,7 +583,7 @@ void NavigationHandler::loadNavigationState(const std::string& filepath) {
     }
 
     std::ifstream f = std::ifstream(filepath);
-    std::string contents = std::string(
+    const std::string contents = std::string(
         std::istreambuf_iterator<char>(f),
         std::istreambuf_iterator<char>()
     );
diff --git a/src/navigation/orbitalnavigator.cpp b/src/navigation/orbitalnavigator.cpp
index 80a8c82032..01baef8f30 100644
--- a/src/navigation/orbitalnavigator.cpp
+++ b/src/navigation/orbitalnavigator.cpp
@@ -331,7 +331,7 @@ namespace {
         openspace::properties::Property::Visibility::AdvancedUser
     };
 
-    static const openspace::properties::PropertyOwner::PropertyOwnerInfo LimitZoomInfo = {
+    const openspace::properties::PropertyOwner::PropertyOwnerInfo LimitZoomInfo = {
         "LimitZoom",
         "Limit Zoom",
         "Settings to limit the camera from going to close to or too far away from the "
@@ -1565,7 +1565,7 @@ glm::dquat OrbitalNavigator::interpolateLocalRotation(double deltaTime,
 }
 
 OrbitalNavigator::Displacement
-OrbitalNavigator::interpolateRetargetAim(double deltaTime, CameraPose pose,
+OrbitalNavigator::interpolateRetargetAim(double deltaTime, const CameraPose& pose,
                                          const glm::dvec3& prevCameraToAnchor,
                                          Displacement anchorToAim)
 {
@@ -1603,7 +1603,7 @@ OrbitalNavigator::interpolateRetargetAim(double deltaTime, CameraPose pose,
     if (requestedAngle <= maxAngle) {
         const glm::dvec3 aimPos = pose.position + prevCameraToAnchor + anchorToAim.second;
         const CameraRotationDecomposition aimDecomp = decomposeCameraRotation(
-            std::move(pose),
+            pose,
             aimPos
         );
 
diff --git a/src/network/parallelconnection.cpp b/src/network/parallelconnection.cpp
index 36a013b6cf..5b09e9ceea 100644
--- a/src/network/parallelconnection.cpp
+++ b/src/network/parallelconnection.cpp
@@ -112,13 +112,12 @@ bool ParallelConnection::sendMessage(const Message& message) {
         reinterpret_cast<const char*>(&messageSizeOut) + sizeof(uint32_t)
     );
 
-    if (!_socket->put<char>(header.data(), header.size())) {
+    const bool res = _socket->put<char>(header.data(), header.size());
+    if (!res) {
         return false;
     }
-    if (!_socket->put<char>(message.content.data(), message.content.size())) {
-        return false;
-    }
-    return true;
+    const bool res2 = _socket->put<char>(message.content.data(), message.content.size());
+    return res2;
 }
 
 void ParallelConnection::disconnect() {
diff --git a/src/properties/stringproperty.cpp b/src/properties/stringproperty.cpp
index 5f114bbce7..492420dd2d 100644
--- a/src/properties/stringproperty.cpp
+++ b/src/properties/stringproperty.cpp
@@ -31,7 +31,7 @@
 namespace openspace::properties {
 
 StringProperty::StringProperty(Property::PropertyInfo info, std::string value)
-    : TemplateProperty<std::string>(info, value)
+    : TemplateProperty<std::string>(std::move(info), std::move(value))
 {}
 
 std::string_view StringProperty::className() const {
diff --git a/src/query/query.cpp b/src/query/query.cpp
index c932accdb5..4bb2d64e87 100644
--- a/src/query/query.cpp
+++ b/src/query/query.cpp
@@ -59,4 +59,4 @@ std::vector<properties::Property*> allProperties() {
     return global::rootPropertyOwner->propertiesRecursive();
 }
 
-}  // namespace
+}  // namespace openspace
diff --git a/src/rendering/renderengine.cpp b/src/rendering/renderengine.cpp
index 17a28b076e..4a68fa2fba 100644
--- a/src/rendering/renderengine.cpp
+++ b/src/rendering/renderengine.cpp
@@ -982,7 +982,7 @@ std::unique_ptr<ghoul::opengl::ProgramObject> RenderEngine::buildRenderProgram(
         name,
         vsPath,
         absPath(RenderFsPath),
-        std::move(dict)
+        dict
     );
 
     if (program) {
@@ -1015,7 +1015,7 @@ std::unique_ptr<ghoul::opengl::ProgramObject> RenderEngine::buildRenderProgram(
         vsPath,
         absPath(RenderFsPath),
         csPath,
-        std::move(dict)
+        dict
     );
 
     if (program) {
diff --git a/src/scene/scene.cpp b/src/scene/scene.cpp
index 35a58cc915..05ea76406f 100644
--- a/src/scene/scene.cpp
+++ b/src/scene/scene.cpp
@@ -880,19 +880,19 @@ scripting::LuaLibrary Scene::luaLibrary() {
     };
 }
 
-std::string makeIdentifier(std::string s) {
+std::string makeIdentifier(std::string str) {
     // Note that we want to preserve '-' and '_', but replace any other punctuation
     // marks. Hence, we first convert '_' to whitespaces to avoid them being replaced
     // in the puncutation check
-    std::replace(s.begin(), s.end(), '_', ' ');
+    std::replace(str.begin(), str.end(), '_', ' ');
     std::replace_if(
-        s.begin(),
-        s.end(),
+        str.begin(),
+        str.end(),
         [](unsigned char c) { return std::ispunct(c) != 0; },
         '-'
     );
-    std::replace(s.begin(), s.end(), ' ', '_');
-    return s;
+    std::replace(str.begin(), str.end(), ' ', '_');
+    return str;
 }
 
 }  // namespace openspace
diff --git a/src/scene/scene_lua.inl b/src/scene/scene_lua.inl
index 83fc57afd9..df30467c15 100644
--- a/src/scene/scene_lua.inl
+++ b/src/scene/scene_lua.inl
@@ -253,7 +253,7 @@ void applyRegularExpression(lua_State* L, const std::string& regex,
                 global::renderEngine->scene()->addPropertyInterpolation(
                     prop,
                     static_cast<float>(interpolationDuration),
-                    std::move(postScript),
+                    postScript,
                     easingFunction
                 );
             }
diff --git a/src/util/factorymanager.cpp b/src/util/factorymanager.cpp
index 8adcd7178d..fb67d3464f 100644
--- a/src/util/factorymanager.cpp
+++ b/src/util/factorymanager.cpp
@@ -95,7 +95,8 @@ nlohmann::json generateJsonDocumentation(const Documentation& d) {
 
     return json;
 }
-}
+
+} // namespace
 
 namespace openspace {
 
diff --git a/src/util/spicemanager.cpp b/src/util/spicemanager.cpp
index a2def26b7d..6830a8a55f 100644
--- a/src/util/spicemanager.cpp
+++ b/src/util/spicemanager.cpp
@@ -1665,8 +1665,8 @@ References:
        Specialist Conference, August 21-24, 2006. Keystone, CO.
 )";
 
-      std::filesystem::path path = std::filesystem::temp_directory_path();
-      std::filesystem::path file = path / "geophysical.ker";
+      const std::filesystem::path path = std::filesystem::temp_directory_path();
+      const std::filesystem::path file = path / "geophysical.ker";
       {
           std::ofstream f(file);
           f << GeoPhysicalConstantsKernelSource;
diff --git a/src/util/time.cpp b/src/util/time.cpp
index 452d5bf0a1..85f3259b25 100644
--- a/src/util/time.cpp
+++ b/src/util/time.cpp
@@ -97,8 +97,8 @@ double Time::j2000Seconds() const {
     return _time;
 }
 
-double Time::advanceTime(double delta) {
-    _time += delta;
+double Time::advanceTime(double deltaTime) {
+    _time += deltaTime;
     return _time;
 }
 
diff --git a/src/util/timeline.cpp b/src/util/timeline.cpp
index 4abd3d112f..e326cb492d 100644
--- a/src/util/timeline.cpp
+++ b/src/util/timeline.cpp
@@ -47,4 +47,4 @@ bool compareKeyframeTimeWithTime_playbackWithFrames(const KeyframeBase& a, doubl
     return a.timestamp <= b;
 }
 
-} // namespace
+} // namespace openspace
diff --git a/src/util/timemanager.cpp b/src/util/timemanager.cpp
index 473c2a9356..74ac17eb4a 100644
--- a/src/util/timemanager.cpp
+++ b/src/util/timemanager.cpp
@@ -347,7 +347,7 @@ void TimeManager::progressTime(double dt) {
 
 TimeKeyframeData TimeManager::interpolate(const Keyframe<TimeKeyframeData>& past,
                                           const Keyframe<TimeKeyframeData>& future,
-                                          double appTime)
+                                          double time)
 {
     // https://en.wikipedia.org/wiki/Spline_interpolation
     // interpolatedTime = (1 - t)y1 + t*y2 + t(1 - t)(a(1 - t) + bt), where
@@ -363,7 +363,7 @@ TimeKeyframeData TimeManager::interpolate(const Keyframe<TimeKeyframeData>& past
     const double deltaAppTime = future.timestamp - past.timestamp;
     const double deltaSimTime = futureSimTime - pastSimTime;
 
-    const double t = (appTime - past.timestamp) / deltaAppTime;
+    const double t = (time - past.timestamp) / deltaAppTime;
     const double a = pastDerivative * deltaAppTime - deltaSimTime;
     const double b = -futureDerivative * deltaAppTime + deltaSimTime;
 
@@ -387,8 +387,8 @@ TimeKeyframeData TimeManager::interpolate(const Keyframe<TimeKeyframeData>& past
     return data;
 }
 
-void TimeManager::applyKeyframeData(const TimeKeyframeData& keyframeData, double dt) {
-    const Time& currentTime = keyframeData.time;
+void TimeManager::applyKeyframeData(const TimeKeyframeData& keyframe, double dt) {
+    const Time& currentTime = keyframe.time;
     _deltaTime = _timePaused ? 0.0 : _targetDeltaTime;
     if (isPlayingBackSessionRecording()) {
         _currentTime.data().advanceTime(dt * _deltaTime);
@@ -396,8 +396,8 @@ void TimeManager::applyKeyframeData(const TimeKeyframeData& keyframeData, double
     else {
         _currentTime.data().setTime(currentTime.j2000Seconds());
     }
-    _timePaused = keyframeData.pause;
-    _targetDeltaTime = keyframeData.delta;
+    _timePaused = keyframe.pause;
+    _targetDeltaTime = keyframe.delta;
     _deltaTime = _timePaused ? 0.0 : _targetDeltaTime;
 }
 
diff --git a/support/coding/codegen b/support/coding/codegen
index 6fae00541a..871a465402 160000
--- a/support/coding/codegen
+++ b/support/coding/codegen
@@ -1 +1 @@
-Subproject commit 6fae00541aadf1fdd2634e9e633be69d16c8bc70
+Subproject commit 871a4654024fc1043cc2120a94d05fb3edc88887
diff --git a/tests/test_documentation.cpp b/tests/test_documentation.cpp
index 82ec21cdc4..d76b851dcd 100644
--- a/tests/test_documentation.cpp
+++ b/tests/test_documentation.cpp
@@ -824,7 +824,7 @@ TEST_CASE("Documentation: MixedVerifiers", "[documentation]") {
     positive.setValue("Int", 0);
     positive.setValue("String", ""s);
     positive.setValue("Table", ghoul::Dictionary());
-    TestResult positiveRes = testSpecification(doc, positive);
+    const TestResult positiveRes = testSpecification(doc, positive);
     CHECK(positiveRes.success);
     CHECK(positiveRes.offenses.empty());
 
@@ -897,7 +897,7 @@ TEST_CASE("Documentation: NestedTables", "[documentation]") {
         }
         positive.setValue("Outer_Table2", inner);
     }
-    TestResult positiveRes = testSpecification(doc, positive);
+    const TestResult positiveRes = testSpecification(doc, positive);
     CHECK(positiveRes.success);
     CHECK(positiveRes.offenses.empty());
 
@@ -1058,7 +1058,7 @@ TEST_CASE("Documentation: Optional", "[documentation]") {
     CHECK(positiveRes.success);
     CHECK(positiveRes.offenses.empty());
 
-    ghoul::Dictionary negative;
+    const ghoul::Dictionary negative;
     TestResult negativeRes = testSpecification(doc, negative);
     CHECK_FALSE(negativeRes.success);
     REQUIRE(negativeRes.offenses.size() == 1);
@@ -1128,7 +1128,7 @@ TEST_CASE("Documentation: Required In Optional", "[documentation]") {
     CHECK(positiveRes.success);
     CHECK(positiveRes.offenses.empty());
 
-    ghoul::Dictionary positive3;
+    const ghoul::Dictionary positive3;
     positiveRes = testSpecification(doc, positive3);
     CHECK(positiveRes.success);
     CHECK(positiveRes.offenses.empty());
@@ -1219,7 +1219,7 @@ TEST_CASE("Documentation: Empty Entries Non Exhaustive", "[documentation]") {
 
     const Documentation doc;
 
-    ghoul::Dictionary positive {};
+    const ghoul::Dictionary positive {};
     TestResult positiveRes = testSpecification(doc, positive);
     CHECK(positiveRes.success);
     CHECK(positiveRes.offenses.empty());
@@ -2310,7 +2310,7 @@ TEST_CASE("Documentation: Referencing", "[documentation]") {
     CHECK(negativeRes.offenses[0].reason == TestResult::Offense::Reason::WrongType);
 
 
-    Documentation wrongDoc = {
+    const Documentation wrongDoc = {
         .entries = {
             { "Table", new ReferencingVerifier("WRONG"), Optional::No }
         }
diff --git a/tests/test_horizons.cpp b/tests/test_horizons.cpp
index da50c539c7..c87537e1d2 100644
--- a/tests/test_horizons.cpp
+++ b/tests/test_horizons.cpp
@@ -271,7 +271,7 @@ TEST_CASE("HorizonsFile: Observer and target same", "[horizonsfile]") {
     const HorizonsResultCode answer = HorizonsResultCode::ErrorObserverTargetSame;
 
     // This test is only for Observer type format
-    HorizonsType type = HorizonsType::Observer;
+    const HorizonsType type = HorizonsType::Observer;
     testHorizonsAnswer(data, type, filePath, answer);
 #endif // OPENSPACE_MODULE_SPACE_ENABLED
 }
diff --git a/tests/test_profile.cpp b/tests/test_profile.cpp
index 51a5d99ef8..19255ebe4e 100644
--- a/tests/test_profile.cpp
+++ b/tests/test_profile.cpp
@@ -36,6 +36,11 @@
 #include <fstream>
 #include <json/json.hpp>
 
+// clang-tidy is convinced that it is possible to use emplace_back instead of push_back
+// for the profiole types, but I haven't been able to convince the Visual Studio
+// compiler to agree
+// NOLINTBEGIN(modernize-use-emplace)
+
 namespace openspace {
     bool operator==(const openspace::Profile::Version& lhs,
                     const openspace::Profile::Version& rhs) noexcept
@@ -1587,3 +1592,5 @@ TEST_CASE("(Error) Camera (GoToNode): Missing value 'anchor'", "[profile]") {
 //        Catch::Matchers::Equals("(profile) 'camera.height' must be a larger than zero")
 //    );
 //}
+
+// NOLINTEND(modernize-use-emplace)
diff --git a/tests/test_rawvolumeio.cpp b/tests/test_rawvolumeio.cpp
index 6e0b6fddb4..6aa574be19 100644
--- a/tests/test_rawvolumeio.cpp
+++ b/tests/test_rawvolumeio.cpp
@@ -35,15 +35,15 @@
 TEST_CASE("RawVolumeIO: TinyInputOutput", "[rawvolumeio]") {
     using namespace openspace::volume;
 
-    glm::uvec3 dims(1);
-    float value = 0.5f;
+    const glm::uvec3 dims = glm::uvec3(1, 1, 1);
+    const float value = 0.5f;
 
     RawVolume<float> vol(dims);
 
     vol.set({ 0, 0, 0 }, value);
     CHECK(vol.get({ 0, 0, 0 }) == value);
 
-    std::filesystem::path volumePath = absPath("${TESTDIR}/tinyvolume.rawvolume");
+    const std::filesystem::path volumePath = absPath("${TESTDIR}/tinyvolume.rawvolume");
 
     // Write the 1x1x1 volume to disk
     RawVolumeWriter<float> writer(volumePath.string());
@@ -59,12 +59,14 @@ TEST_CASE("RawVolumeIO: BasicInputOutput", "[rawvolumeio]") {
     using namespace openspace::volume;
 
     const glm::uvec3 dims = glm::uvec3(2, 4, 8);
-    auto value = [dims](glm::uvec3 v) {
+    auto value = [dims](const glm::uvec3& v) {
         return static_cast<float>(v.z * dims.z * dims.y + v.y * dims.y + v.x);
     };
 
     RawVolume<float> vol(dims);
-    vol.forEachVoxel([&vol, &value](glm::uvec3 x, float) { vol.set(x, value(x)); });
+    vol.forEachVoxel(
+        [&vol, &value](const glm::uvec3& x, float) { vol.set(x, value(x)); }
+    );
     vol.forEachVoxel([&value](const glm::uvec3& x, float v) { CHECK(v == value(x)); });
 
     const std::filesystem::path volumePath = absPath("${TESTDIR}/basicvolume.rawvolume");

From f36868d1c45a249a554f589a24b102cf6986e8f9 Mon Sep 17 00:00:00 2001
From: Emma Broman <emma.broman@liu.se>
Date: Tue, 19 Mar 2024 13:17:25 +0100
Subject: [PATCH 317/701] Feature/textured points (#3068)

* WIP: Start usign texture arrays instead of just a single texture

Now the texture array is sucessfully created, sent over and sampled on the GPU

* Include information about the texture format alpha channel and do a conversion

* Make one draw wcall per texture array

* Add scale to size mapping and move to a separate component

* WIP: Make single textures work again, with texture array

Although this breaks the polygon cloud..

* Also make the polygon cloud work again

* Refactor rendering code

* handle array layer seprately from texture coordinates

* Make sure use size mapping uniform is always set

Fixes point cloud disappearing when multi-textures points are enabled

* Add has value check to size mapping

* Fix indentation

* Make sure points are rendered even when no texture is used

* Clean up texture handling a bit and add comment about storage creation

* Add comment and temporary asset changes

* Clean up handling of color mode (number of colro channels)

* Make interpolated points work with new rendering code

* Refactor

* Bring back check for valid index for color and size data

* Make sure to check if the provided data file exists

* Fix full path ont showing in error message

* Refactor rendering code a bit

* Change how the multitexture setup is configured in the asset and add documentation

Separating made documentation a lot easier..

* Add a todo comment for future discussion

* Add settings for texture compression

* Preserve aspects ratio of rendered textures

* Restructure input parameters for texture details

* Simplify color mode - we decided to not support grayscale

* Add option to set "useAlpha" from asset

* Enable texture per default and fix aspect ratio problem when no texture is used

* tiny refactor

* Fix polygon rendering that broke when adding texture compression

* Remove color in polygon shader

The color would be applied twice in rendering

* Restructure textures code and prevent loading the same texture twice

* Better handling of extra texture parameter in speck files

That does not lead to limitations in using dashes in texture names

* Add some docs and communicate texture mode to the user

* Fix so that single texture can be changed during runtime

* Allow changing compression and usealpha during runtime

* Update texture storage allocation to something that works in older OpenGL versions

* Add a check that checks if we use more texture layers than allowed

* Even more robust check of texture line in speck file (allow extra whitespaces)

* Update data mapping to include texture information and clean up code a bit

* Error handling and prevent loading non-used textures in texture map

* Update some docs

* Small cleanup

* Add one more error message for fault texture map file format

* Remove test version of tully images dataset

* Small refactor

* Add example asset

* Update Ghoul - for larger uniform cache

* Purge texture from ram when we're done with it

* Cleanup (comments, ugly png check, etc)

* Apply suggestions from code review

Co-authored-by: Alexander Bock <alexander.bock@liu.se>

* Apply suggestions from code review

* Adress some more review comments and fix broken asset

* More code review fixes

* Read provided sizemapping parameter from asset

* Fix warnings from trying to shift 16 bit int 32 bits :)

* simplify datamapping hash string

* Update comment that was not 100% correct. The file names may be specified as relative paths to a folder

* Small update based on previous code review comments

* Fix multi textured points gui path not same as other points

* Update Folder description to reduce some confusion

* Apply suggestions from code review

Co-authored-by: Ylva Selling <ylva.selling@gmail.com>

* Prevent updates to polygon cloud texture during runtime

This lead to rendering problems.

* Add describing comments to data files

* Clarify why speck version is disabled per default

* Update and clarify confusing size mapping parameters

* Apply suggestions from code review

Co-authored-by: Ylva Selling <ylva.selling@gmail.com>

* Apply suggestions from code review

---------

Co-authored-by: Alexander Bock <alexander.bock@liu.se>
Co-authored-by: Ylva Selling <ylva.selling@gmail.com>
---
 .../examples/pointclouds/data/dummydata.csv   |   3 +
 .../pointclouds/data/interpolation_expand.csv |   9 +
 .../data/interpolation_randomwalk.csv         |   2 +
 .../data/textured_csv/textured_points.csv     |   9 +
 .../data/textured_csv/texturemap.tmap         |   8 +
 .../data/textured_speck/textures_points.speck |  16 +
 .../pointclouds/multitextured_points.asset    | 107 +++
 data/assets/examples/pointclouds/points.asset |  26 +-
 data/assets/scene/digitaluniverse/2dF.asset   |   4 +-
 data/assets/scene/digitaluniverse/2mass.asset |   4 +-
 data/assets/scene/digitaluniverse/6dF.asset   |   4 +-
 data/assets/scene/digitaluniverse/abell.asset |   6 +-
 .../scene/digitaluniverse/deepsky.asset       |   6 +-
 .../assets/scene/digitaluniverse/dwarfs.asset |   6 +-
 .../scene/digitaluniverse/exoplanets.asset    |   6 +-
 .../exoplanets_candidates.asset               |   4 +-
 data/assets/scene/digitaluniverse/hdf.asset   |   4 +-
 .../digitaluniverse/obassociations.asset      |   5 +-
 .../scene/digitaluniverse/quasars.asset       |   4 +-
 data/assets/scene/digitaluniverse/sdss.asset  |   4 +-
 .../scene/digitaluniverse/superclusters.asset |   6 +-
 data/assets/scene/digitaluniverse/tully.asset |   4 +-
 include/openspace/data/csvloader.h            |   3 +
 include/openspace/data/datamapping.h          |   7 +
 modules/base/CMakeLists.txt                   |   2 +
 modules/base/basemodule.cpp                   |   3 +
 .../renderableinterpolatedpoints.cpp          | 233 ++---
 .../pointcloud/renderableinterpolatedpoints.h |  30 +-
 .../pointcloud/renderablepointcloud.cpp       | 820 +++++++++++++-----
 .../pointcloud/renderablepointcloud.h         | 112 ++-
 .../pointcloud/renderablepolygoncloud.cpp     |  59 +-
 .../pointcloud/renderablepolygoncloud.h       |   7 +-
 .../pointcloud/sizemappingcomponent.cpp       | 131 +++
 .../pointcloud/sizemappingcomponent.h         |  56 ++
 .../shaders/pointcloud/billboardpoint_fs.glsl |  19 +-
 .../shaders/pointcloud/billboardpoint_gs.glsl |  12 +-
 .../billboardpoint_interpolated_vs.glsl       |   5 +
 .../shaders/pointcloud/billboardpoint_vs.glsl |   3 +
 modules/base/shaders/polygon_fs.glsl          |   5 +-
 src/data/csvloader.cpp                        | 120 ++-
 src/data/datamapping.cpp                      |  84 +-
 src/data/speckloader.cpp                      |  19 +-
 42 files changed, 1561 insertions(+), 416 deletions(-)
 create mode 100644 data/assets/examples/pointclouds/data/textured_csv/textured_points.csv
 create mode 100644 data/assets/examples/pointclouds/data/textured_csv/texturemap.tmap
 create mode 100644 data/assets/examples/pointclouds/data/textured_speck/textures_points.speck
 create mode 100644 data/assets/examples/pointclouds/multitextured_points.asset
 create mode 100644 modules/base/rendering/pointcloud/sizemappingcomponent.cpp
 create mode 100644 modules/base/rendering/pointcloud/sizemappingcomponent.h

diff --git a/data/assets/examples/pointclouds/data/dummydata.csv b/data/assets/examples/pointclouds/data/dummydata.csv
index e8b698833f..0df526dbac 100644
--- a/data/assets/examples/pointclouds/data/dummydata.csv
+++ b/data/assets/examples/pointclouds/data/dummydata.csv
@@ -1,3 +1,6 @@
+# A dummy dataset with an xyz position and some random data columns.
+# The last two columns has data values with either missing values or
+# Nan values (which can be handled seprately when color mapping)
 x,y,z,a,b,normaldist_withMissing,number_withNan
 13428000,26239000,45870000,-3.226548224,33.95773276,-0.357778948,29
 14727000,45282000,10832000,45.05941924,-106.0395917,,29
diff --git a/data/assets/examples/pointclouds/data/interpolation_expand.csv b/data/assets/examples/pointclouds/data/interpolation_expand.csv
index 3bd9aede78..b0f3e25a9a 100644
--- a/data/assets/examples/pointclouds/data/interpolation_expand.csv
+++ b/data/assets/examples/pointclouds/data/interpolation_expand.csv
@@ -1,3 +1,12 @@
+# A test dataset for interpolation, where the xyz positions expand outward in each
+# time step. There are 10 points per timestep, as illustrated by the time column.
+# There are also two columns that may be used for color mapping:
+#
+# static_value has values that are the same for the correpsonding point in each
+#              time step
+# dynamic_value has values that change for every timestep. The change will be
+#               reflected in the interpolation
+#
 time,x,y,z,dynamic_value,static_value
 0.0,675.0297905065192,1672.6820684730765,-124.14442820502654,1,1
 0.0,9.0852354697237,1080.363474597831,266.4506394528842,3,3
diff --git a/data/assets/examples/pointclouds/data/interpolation_randomwalk.csv b/data/assets/examples/pointclouds/data/interpolation_randomwalk.csv
index f8681b6d42..09ed368662 100644
--- a/data/assets/examples/pointclouds/data/interpolation_randomwalk.csv
+++ b/data/assets/examples/pointclouds/data/interpolation_randomwalk.csv
@@ -1,3 +1,5 @@
+# A test dataset for interpolation, where the xyz vary in a random walk patterin
+# time step. There are 10 points per timestep, as illustrated by the time column
 time,x,y,z
 0.0,675.0297905065192,1672.6820684730765,-124.14442820502654
 0.0,9.0852354697237,1080.363474597831,266.4506394528842
diff --git a/data/assets/examples/pointclouds/data/textured_csv/textured_points.csv b/data/assets/examples/pointclouds/data/textured_csv/textured_points.csv
new file mode 100644
index 0000000000..0bf863e4e6
--- /dev/null
+++ b/data/assets/examples/pointclouds/data/textured_csv/textured_points.csv
@@ -0,0 +1,9 @@
+# A dummy dataset with an xyz position, some random values and an integer value to
+# use for texturing the points
+#
+# The texture mapping from index to file is handled in another file
+x,y,z,a,b,texture
+13428000,26239000,45870000,-3.226548224,33.95773276,1
+14727000,45282000,10832000,45.05941924,-106.0395917,0
+24999000,28370000,19911000,-70.58906931,154.1851656,2
+26539000,36165000,39582000,-13.3663358,71.79484733,3
diff --git a/data/assets/examples/pointclouds/data/textured_csv/texturemap.tmap b/data/assets/examples/pointclouds/data/textured_csv/texturemap.tmap
new file mode 100644
index 0000000000..0a475f8d61
--- /dev/null
+++ b/data/assets/examples/pointclouds/data/textured_csv/texturemap.tmap
@@ -0,0 +1,8 @@
+# The texture map is a mapping between an index and the name of an image file.
+# All the images should be located in the same folder, or the name need to be specified as a path relative
+# to a specific folder
+
+0 test3.jpg
+1 test2.jpg
+2 test.jpg
+3 openspace-horiz-logo.png
diff --git a/data/assets/examples/pointclouds/data/textured_speck/textures_points.speck b/data/assets/examples/pointclouds/data/textured_speck/textures_points.speck
new file mode 100644
index 0000000000..2e8b763c2c
--- /dev/null
+++ b/data/assets/examples/pointclouds/data/textured_speck/textures_points.speck
@@ -0,0 +1,16 @@
+# A dummy dataset with an xyz position, some random values and an integer value to
+# use for texturing the points
+
+datavar 0 a
+datavar 1 b
+datavar 2 texture
+texturevar 2  # The index of the data column that has the texture data
+texture 0 test3.jpg
+texture 1 test.jpg
+texture 2 test.jpg
+texture 3 openspace-horiz-logo.png
+
+13428000 26239000 45870000 -3.226548224 33.95773276 0
+14727000 45282000 10832000 45.05941924 -106.0395917 2
+24999000 28370000 19911000 -70.58906931 154.1851656 3
+26539000 36165000 39582000 -13.3663358  71.79484733 1
diff --git a/data/assets/examples/pointclouds/multitextured_points.asset b/data/assets/examples/pointclouds/multitextured_points.asset
new file mode 100644
index 0000000000..e236893562
--- /dev/null
+++ b/data/assets/examples/pointclouds/multitextured_points.asset
@@ -0,0 +1,107 @@
+-- CSV
+local Test = {
+  Identifier = "TexturedPointCloudExample_CSV",
+  Renderable = {
+    Type = "RenderablePointCloud",
+    File = asset.resource("data/textured_csv/textured_points.csv"),
+    DataMapping = {
+      -- The name of the column in the CSV file that corresponds to the texture (should
+      -- be an integer)
+      TextureColumn = "texture",
+      -- A Texture mapping file that provides information about which value/index
+      -- corresponds to which texture file
+      TextureMapFile = asset.resource("data/textured_csv/texturemap.tmap")
+    },
+    Texture = {
+      -- Where to find the texture files (in this case, in the OpenSpace data folder)
+      Folder = openspace.absPath("${DATA}")
+    },
+    UseAdditiveBlending = false
+  },
+  GUI = {
+    Name = "Multi-Textured Points",
+    Path = "/Example/Point Clouds/Multi-Textured"
+  }
+}
+
+
+-- Interpolated
+-- Multi-texturing works also for interpolated point clouds. Here we let the same
+-- dataset as used above be interpreted as representing only two points, with a different
+-- texture. Note that the textures will be set based on the first two data items and will
+-- not be changed during interpolation
+local Test_Interpolated = {
+  Identifier = "TexturedPointCloudExample_Interpolated",
+  Renderable = {
+    Type = "RenderableInterpolatedPoints",
+    File = asset.resource("data/textured_csv/textured_points.csv"),
+    NumberOfObjects = 2,
+    DataMapping = {
+      TextureColumn = "texture",
+      TextureMapFile = asset.resource("data/textured_csv/texturemap.tmap")
+    },
+    Texture = {
+      Folder = openspace.absPath("${DATA}")
+    },
+    UseAdditiveBlending = false
+  },
+  GUI = {
+    Name = "Multi-Textured Points (Interpolation)",
+    Path = "/Example/Point Clouds/Multi-Textured"
+  }
+}
+
+-- Speck file (allows storing all data in one single file, including the texture mapping)
+-- Note that we disable this scene graph node per default here, as it shows the same
+-- information as the CSV version
+local Test_Speck = {
+  Identifier = "TexturedPointCloudExample_Speck",
+  Renderable = {
+    Type = "RenderablePointCloud",
+    Enabled = false,
+    -- When loading multi-texture information from a speck file, we do not need a
+    -- DataMapping entry - all information is in the file
+    File = asset.resource("data/textured_speck/textures_points.speck"),
+    Texture = {
+      -- However, we do still need to specify where the textures are located
+      Folder = openspace.absPath("${DATA}")
+    },
+    UseAdditiveBlending = false
+  },
+  GUI = {
+    Name = "Multi-Textured Points (Speck file)",
+    Path = "/Example/Point Clouds/Multi-Textured"
+  }
+}
+
+
+asset.onInitialize(function()
+  openspace.addSceneGraphNode(Test)
+  openspace.addSceneGraphNode(Test_Interpolated)
+  openspace.addSceneGraphNode(Test_Speck)
+end)
+
+asset.onDeinitialize(function()
+  openspace.removeSceneGraphNode(Test_Speck)
+  openspace.removeSceneGraphNode(Test_Interpolated)
+  openspace.removeSceneGraphNode(Test)
+end)
+
+asset.export(Test)
+asset.export(Test_Interpolated)
+asset.export(Test_Speck)
+
+
+asset.meta = {
+  Name = "Multi-textured Points",
+  Version = "1.0",
+  Description = [[Example of point clouds where multiple textures are used for the points,
+    based on information in the dataset. The dataset may be either CSV or Speck format.
+    If CSV is used, additional information must be provided through the DataMapping: 1)
+    Which column in the dataset that corresponds to the texture, and a separate file that
+    maps that value to a texture file
+  ]],
+  Author = "OpenSpace Team",
+  URL = "http://openspaceproject.com",
+  License = "MIT license"
+}
diff --git a/data/assets/examples/pointclouds/points.asset b/data/assets/examples/pointclouds/points.asset
index b14f00906e..9129b14046 100644
--- a/data/assets/examples/pointclouds/points.asset
+++ b/data/assets/examples/pointclouds/points.asset
@@ -100,13 +100,19 @@ local FixedColor_ScaleBasedOnData = {
       FixedColor = { 0.5, 0.5, 0.0 }
     },
     SizeSettings = {
-      -- The options for the columns that the points can be scaled by. The first
-      -- alternative is chosen per default
-      SizeMapping = { "number_withNan", "a" },
+      SizeMapping = {
+        -- The options for the columns that the points can be scaled by. The first
+        -- alternative in the list is chosen per default
+        ParameterOptions = { "a", "b" },
+        -- Specify which option we want to use for size mapping at start up. Here we
+        -- use the last of the provided options rather than the first one, which is
+        -- otherwise used by default
+        Parameter = "b"
+      },
       -- Use a slightly smaller scale than above for the base size of the points
       -- (will decide the size of the smallest point). That way, the points don't
       -- become too big when scaled by the data parameter
-      ScaleExponent = 5
+      ScaleExponent = 5.0
     }
   },
   GUI = {
@@ -131,11 +137,13 @@ local Textured = {
   Renderable = {
     Type = "RenderablePointCloud",
     File = asset.resource("data/dummydata.csv"),
-    -- The path to the texture file. Here we use openspace.absPath so that we can use
-    -- the ${DATA} token to get the path to a texture in the "OpenSpace/data" folder,
-    -- but for a file at a relative location it would also work to use asset.resource,
-    -- like for the data file above
-    Texture = openspace.absPath("${DATA}/test3.jpg"),
+    Texture = {
+      -- The path to the texture file. Here we use openspace.absPath so that we can use
+      -- the ${DATA} token to get the path to a texture in the "OpenSpace/data" folder,
+      -- but for a file at a relative location it would also work to use asset.resource,
+      -- like for the data file above
+      File = openspace.absPath("${DATA}/test3.jpg"),
+    },
     -- Disable additive blending, so that points will be rendered with their actual color
     -- and overlapping points will be sorted by depth. This works best when the points
     -- have an opacity of 1
diff --git a/data/assets/scene/digitaluniverse/2dF.asset b/data/assets/scene/digitaluniverse/2dF.asset
index 48441443d8..ff2b40703c 100644
--- a/data/assets/scene/digitaluniverse/2dF.asset
+++ b/data/assets/scene/digitaluniverse/2dF.asset
@@ -21,7 +21,9 @@ local Object = {
     Opacity = 1.0,
     File = speck .. "2dF.speck",
     Unit = "Mpc",
-    Texture = textures .. "point3A.png",
+    Texture = {
+      File = textures .. "point3A.png",
+    },
     Coloring = {
       ColorMapping = {
         File = speck .. "2dF.cmap",
diff --git a/data/assets/scene/digitaluniverse/2mass.asset b/data/assets/scene/digitaluniverse/2mass.asset
index daf8dfe6d9..2dc58b4cfe 100644
--- a/data/assets/scene/digitaluniverse/2mass.asset
+++ b/data/assets/scene/digitaluniverse/2mass.asset
@@ -21,7 +21,9 @@ local Object = {
     Opacity = 1.0,
     File = speck .. "2MASS.speck",
     Unit = "Mpc",
-    Texture = textures .. "point3A.png",
+    Texture = {
+      File = textures .. "point3A.png",
+    },
     Coloring = {
       FixedColor = { 1.0, 0.4, 0.2 },
       ColorMapping = {
diff --git a/data/assets/scene/digitaluniverse/6dF.asset b/data/assets/scene/digitaluniverse/6dF.asset
index f3d5528369..248971a60d 100644
--- a/data/assets/scene/digitaluniverse/6dF.asset
+++ b/data/assets/scene/digitaluniverse/6dF.asset
@@ -21,7 +21,9 @@ local Object = {
     Opacity = 1.0,
     File = speck .. "6dF.speck",
     Unit = "Mpc",
-    Texture = textures .. "point3A.png",
+    Texture = {
+      File = textures .. "point3A.png",
+    },
     Coloring = {
       FixedColor = { 1.0, 1.0, 0.0 },
       ColorMapping = {
diff --git a/data/assets/scene/digitaluniverse/abell.asset b/data/assets/scene/digitaluniverse/abell.asset
index 43ef6c6796..793ff0fcb6 100644
--- a/data/assets/scene/digitaluniverse/abell.asset
+++ b/data/assets/scene/digitaluniverse/abell.asset
@@ -25,6 +25,7 @@ local Object = {
   Renderable = {
     Type = "RenderablePointCloud",
     Enabled = false,
+    File = speck .. "abell.speck",
     Labels = {
       File = speck .. "abell.label",
       Opacity = 1.0,
@@ -39,8 +40,9 @@ local Object = {
       FixedColor = { 1.0, 0.4, 0.2 },
       --ColorMap = speck .. "abell.cmap", -- TODO: Decide whether to add
     },
-    File = speck .. "abell.speck",
-    Texture = textures .. "point3A.png",
+    Texture = {
+      File = textures .. "point3A.png",
+    },
     Unit = "Mpc",
     TransformationMatrix = TransformMatrix,
     SizeSettings = {
diff --git a/data/assets/scene/digitaluniverse/deepsky.asset b/data/assets/scene/digitaluniverse/deepsky.asset
index 5aa89ea88b..c17f0d6c1f 100644
--- a/data/assets/scene/digitaluniverse/deepsky.asset
+++ b/data/assets/scene/digitaluniverse/deepsky.asset
@@ -18,6 +18,7 @@ local DeepSkyObjects = {
   Renderable = {
     Type = "RenderablePointCloud",
     Enabled = false,
+    File = speck .. "dso.speck",
     Labels = {
       File = speck .. "dso.label",
       Color = { 0.1, 0.4, 0.6 },
@@ -29,8 +30,9 @@ local DeepSkyObjects = {
     Coloring = {
       FixedColor = { 1.0, 1.0, 0.0 }
     },
-    File = speck .. "dso.speck",
-    Texture = textures .. "point3.png",
+    Texture = {
+      File = textures .. "point3.png",
+    },
     Unit = "pc",
     --FadeInDistances = { 0.05, 1.0 }, -- Fade in value in the same unit as "Unit"
     SizeSettings = {
diff --git a/data/assets/scene/digitaluniverse/dwarfs.asset b/data/assets/scene/digitaluniverse/dwarfs.asset
index fd13e0e4ec..b45473517d 100644
--- a/data/assets/scene/digitaluniverse/dwarfs.asset
+++ b/data/assets/scene/digitaluniverse/dwarfs.asset
@@ -18,6 +18,7 @@ local Object = {
   Renderable = {
     Type = "RenderablePointCloud",
     Enabled = false,
+    File = speck .. "dwarfs.speck",
     Labels = {
       File = speck .. "dwarfs.label",
       Color = { 0.5, 0.1, 0.2 },
@@ -26,8 +27,9 @@ local Object = {
       Unit = "pc"
     },
     Opacity = 1.0,
-    File = speck .. "dwarfs.speck",
-    Texture = textures .. "point3.png",
+    Texture = {
+      File = textures .. "point3.png",
+    },
     Unit = "pc",
     Coloring = {
       FixedColor = { 0.4, 0.0, 0.1 },
diff --git a/data/assets/scene/digitaluniverse/exoplanets.asset b/data/assets/scene/digitaluniverse/exoplanets.asset
index c53f3ae27d..43e604ed61 100644
--- a/data/assets/scene/digitaluniverse/exoplanets.asset
+++ b/data/assets/scene/digitaluniverse/exoplanets.asset
@@ -18,6 +18,7 @@ local Object = {
   Renderable = {
     Type = "RenderablePointCloud",
     Enabled = false,
+    File = speck .. "expl.speck",
     Labels = {
       File = speck .. "expl.label",
       Color = { 0.3, 0.3, 0.8 },
@@ -26,8 +27,9 @@ local Object = {
       Unit = "pc"
     },
     Opacity = 1.0,
-    Texture = textures .. "target-blue.png",
-    File = speck .. "expl.speck",
+    Texture = {
+      File = textures .. "target-blue.png",
+    },
     Unit = "pc",
     SizeSettings = {
       ScaleExponent = 16.9,
diff --git a/data/assets/scene/digitaluniverse/exoplanets_candidates.asset b/data/assets/scene/digitaluniverse/exoplanets_candidates.asset
index e0bb934486..6c95b2e68d 100644
--- a/data/assets/scene/digitaluniverse/exoplanets_candidates.asset
+++ b/data/assets/scene/digitaluniverse/exoplanets_candidates.asset
@@ -21,7 +21,9 @@ local Object = {
     Opacity = 0.99,
     File = speck .. "exoplanet_candidates.speck",
     Unit = "pc",
-    Texture = textures .. "halo.png",
+    Texture = {
+      File = textures .. "halo.png",
+    },
     Coloring = {
       FixedColor = { 1.0, 1.0, 0.0 }
     },
diff --git a/data/assets/scene/digitaluniverse/hdf.asset b/data/assets/scene/digitaluniverse/hdf.asset
index 964144e69c..9598b46ba6 100644
--- a/data/assets/scene/digitaluniverse/hdf.asset
+++ b/data/assets/scene/digitaluniverse/hdf.asset
@@ -27,7 +27,9 @@ local Object = {
     Enabled = false,
     Opacity = 1.0,
     File = HUDFSpeck .. "hudf.speck",
-    Texture = circle .. "circle.png",
+    Texture = {
+      File = circle .. "circle.png",
+    },
     Coloring = {
       ColorMapping = {
         File = ColorMap .. "hudf.cmap",
diff --git a/data/assets/scene/digitaluniverse/obassociations.asset b/data/assets/scene/digitaluniverse/obassociations.asset
index fd0610c6f1..3c26a82179 100644
--- a/data/assets/scene/digitaluniverse/obassociations.asset
+++ b/data/assets/scene/digitaluniverse/obassociations.asset
@@ -36,10 +36,11 @@ local Object = {
     Opacity = 0.7,
     File = speck .. "ob.speck",
     Unit = "pc",
-    Texture = textures .. "point4.png",
     PolygonSides = 7,
     SizeSettings = {
-      SizeMapping = { "diameter" },
+      SizeMapping = {
+        ParameterOptions = { "diameter" }
+      },
       ScaleExponent = 16.9,
       MaxSize = 17,
       EnableMaxSizeControl = true
diff --git a/data/assets/scene/digitaluniverse/quasars.asset b/data/assets/scene/digitaluniverse/quasars.asset
index 93efec3236..0594ad74c4 100644
--- a/data/assets/scene/digitaluniverse/quasars.asset
+++ b/data/assets/scene/digitaluniverse/quasars.asset
@@ -27,7 +27,9 @@ local Object = {
     Enabled = true,
     Opacity = 0.95,
     File = speck .. "quasars.speck",
-    Texture = textures .. "point3A.png",
+    Texture = {
+      File = textures .. "point3A.png",
+    },
     Unit = "Mpc",
     Fading = {
       FadeInDistances = { 1000.0, 10000.0 } -- Fade in value in the same unit as "Unit"
diff --git a/data/assets/scene/digitaluniverse/sdss.asset b/data/assets/scene/digitaluniverse/sdss.asset
index 0ffa195d31..cb3103e1d1 100644
--- a/data/assets/scene/digitaluniverse/sdss.asset
+++ b/data/assets/scene/digitaluniverse/sdss.asset
@@ -30,7 +30,9 @@ local Object = {
         }
       }
     },
-    Texture = textures .. "point3A.png",
+    Texture = {
+      File = textures .. "point3A.png",
+    },
     Unit = "Mpc",
     Fading = {
       FadeInDistances = { 220.0, 650.0 } -- Fade in value in the same unit as "Unit"
diff --git a/data/assets/scene/digitaluniverse/superclusters.asset b/data/assets/scene/digitaluniverse/superclusters.asset
index 77260619f7..4ec85bc0a0 100644
--- a/data/assets/scene/digitaluniverse/superclusters.asset
+++ b/data/assets/scene/digitaluniverse/superclusters.asset
@@ -18,6 +18,7 @@ local Object = {
   Renderable = {
     Type = "RenderablePointCloud",
     Enabled = false,
+    File = speck .. "superclust.speck",
     Labels = {
       Enabled = true,
       File = speck .. "superclust.label",
@@ -28,8 +29,9 @@ local Object = {
     },
     DrawElements = false,
     Opacity = 0.65,
-    File = speck .. "superclust.speck",
-    Texture = textures .. "point3A.png",
+    Texture = {
+      File = textures .. "point3A.png",
+    },
     Unit = "Mpc",
     SizeSettings = {
       ScaleExponent = 23.1,
diff --git a/data/assets/scene/digitaluniverse/tully.asset b/data/assets/scene/digitaluniverse/tully.asset
index b7739c503d..040c386ae2 100644
--- a/data/assets/scene/digitaluniverse/tully.asset
+++ b/data/assets/scene/digitaluniverse/tully.asset
@@ -35,7 +35,9 @@ local TullyGalaxies = {
     },
     Opacity = 0.99,
     File = speck .. "tully.speck",
-    Texture = textures .. "point3A.png",
+    Texture = {
+      File = textures .. "point3A.png"
+    },
     Coloring = {
       FixedColor = { 1.0, 0.4, 0.2 },
       ColorMapping = {
diff --git a/include/openspace/data/csvloader.h b/include/openspace/data/csvloader.h
index a6f3734e61..911e2fe3db 100644
--- a/include/openspace/data/csvloader.h
+++ b/include/openspace/data/csvloader.h
@@ -34,6 +34,9 @@ namespace openspace::dataloader::csv {
 Dataset loadCsvFile(std::filesystem::path path,
     std::optional<DataMapping> specs = std::nullopt);
 
+std::vector<Dataset::Texture> loadTextureMapFile(std::filesystem::path path,
+    const std::set<int>& texturesInData);
+
 } // namespace openspace::dataloader
 
 #endif // __OPENSPACE_CORE___CSVLOADER___H__
diff --git a/include/openspace/data/datamapping.h b/include/openspace/data/datamapping.h
index 5f2b98beb2..9504a78aab 100644
--- a/include/openspace/data/datamapping.h
+++ b/include/openspace/data/datamapping.h
@@ -41,10 +41,15 @@ struct DataMapping {
     bool hasExcludeColumns() const;
     bool isExcludeColumn(std::string_view column) const;
 
+    bool checkIfAllProvidedColumnsExist(const std::vector<std::string>& columns) const;
+
     std::optional<std::string> xColumnName;
     std::optional<std::string> yColumnName;
     std::optional<std::string> zColumnName;
     std::optional<std::string> nameColumn;
+    std::optional<std::string> textureColumn;
+
+    std::optional<std::filesystem::path> textureMap;
 
     std::optional<float> missingDataValue;
 
@@ -72,6 +77,8 @@ bool isColumnZ(const std::string& c, const std::optional<DataMapping>& mapping);
 
 bool isNameColumn(const std::string& c, const std::optional<DataMapping>& mapping);
 
+bool isTextureColumn(const std::string& c, const std::optional<DataMapping>& mapping);
+
 } // namespace openspace::dataloader
 
 #endif // __OPENSPACE_CORE___DATAMAPPING___H__
diff --git a/modules/base/CMakeLists.txt b/modules/base/CMakeLists.txt
index e3168b3272..53ad712da3 100644
--- a/modules/base/CMakeLists.txt
+++ b/modules/base/CMakeLists.txt
@@ -47,6 +47,7 @@ set(HEADER_FILES
   rendering/pointcloud/renderableinterpolatedpoints.h
   rendering/pointcloud/renderablepointcloud.h
   rendering/pointcloud/renderablepolygoncloud.h
+  rendering/pointcloud/sizemappingcomponent.h
   rendering/renderablecartesianaxes.h
   rendering/renderabledisc.h
   rendering/renderablelabel.h
@@ -109,6 +110,7 @@ set(SOURCE_FILES
   rendering/pointcloud/renderableinterpolatedpoints.cpp
   rendering/pointcloud/renderablepointcloud.cpp
   rendering/pointcloud/renderablepolygoncloud.cpp
+  rendering/pointcloud/sizemappingcomponent.cpp
   rendering/renderablecartesianaxes.cpp
   rendering/renderabledisc.cpp
   rendering/renderablelabel.cpp
diff --git a/modules/base/basemodule.cpp b/modules/base/basemodule.cpp
index 9dc5c9e9b4..011cce0547 100644
--- a/modules/base/basemodule.cpp
+++ b/modules/base/basemodule.cpp
@@ -46,6 +46,7 @@
 #include <modules/base/rendering/pointcloud/renderableinterpolatedpoints.h>
 #include <modules/base/rendering/pointcloud/renderablepointcloud.h>
 #include <modules/base/rendering/pointcloud/renderablepolygoncloud.h>
+#include <modules/base/rendering/pointcloud/sizemappingcomponent.h>
 #include <modules/base/rendering/renderablecartesianaxes.h>
 #include <modules/base/rendering/renderabledisc.h>
 #include <modules/base/rendering/renderablelabel.h>
@@ -251,6 +252,8 @@ std::vector<documentation::Documentation> BaseModule::documentations() const {
         RenderableTrailOrbit::Documentation(),
         RenderableTrailTrajectory::Documentation(),
 
+        SizeMappingComponent::Documentation(),
+
         ScreenSpaceDashboard::Documentation(),
         ScreenSpaceFramebuffer::Documentation(),
         ScreenSpaceImageLocal::Documentation(),
diff --git a/modules/base/rendering/pointcloud/renderableinterpolatedpoints.cpp b/modules/base/rendering/pointcloud/renderableinterpolatedpoints.cpp
index 81faf785fe..e11dc65d5a 100644
--- a/modules/base/rendering/pointcloud/renderableinterpolatedpoints.cpp
+++ b/modules/base/rendering/pointcloud/renderableinterpolatedpoints.cpp
@@ -130,6 +130,10 @@ namespace {
     // the first set of positions for the objects, the next N rows to the second set of
     // positions, and so on. The number of objects in the dataset must be specified in the
     // asset.
+    //
+    // MultiTexture:
+    // Note that if using multiple textures for the points based on values in the dataset,
+    // the used texture will be decided based on the first N set of points.
     struct [[codegen::Dictionary(RenderableInterpolatedPoints)]] Parameters {
         // The number of objects to read from the dataset. Every N:th datapoint will
         // be interpreted as the same point, but at a different step in the interpolation
@@ -328,13 +332,12 @@ void RenderableInterpolatedPoints::deinitializeShaders() {
     _program = nullptr;
 }
 
-void RenderableInterpolatedPoints::bindDataForPointRendering() {
-    RenderablePointCloud::bindDataForPointRendering();
-
+void RenderableInterpolatedPoints::setExtraUniforms() {
     float t0 = computeCurrentLowerValue();
     float t = glm::clamp(_interpolation.value - t0, 0.f, 1.f);
+
     _program->setUniform("interpolationValue", t);
-    _program->setUniform("useSpline", _interpolation.useSpline);
+    _program->setUniform("useSpline", useSplineInterpolation());
 }
 
 void RenderableInterpolatedPoints::preUpdate() {
@@ -346,103 +349,96 @@ void RenderableInterpolatedPoints::preUpdate() {
 
 int RenderableInterpolatedPoints::nAttributesPerPoint() const {
     int n = RenderablePointCloud::nAttributesPerPoint();
-    // Need twice as much information as the regular points
-    n *= 2;
-    if (_interpolation.useSpline) {
+
+    // Always at least three extra position values (xyz)
+    n += 3;
+    if (useSplineInterpolation()) {
         // Use two more positions (xyz)
         n += 2 * 3;
     }
+    // And potentially some more color and size data
+    n += _hasColorMapFile ? 1 : 0;
+    n += _hasDatavarSize ? 1 : 0;
+
     return n;
 }
 
-std::vector<float> RenderableInterpolatedPoints::createDataSlice() {
-    ZoneScoped;
+bool RenderableInterpolatedPoints::useSplineInterpolation() const {
+    return _interpolation.useSpline && _interpolation.nSteps > 1;
+}
 
-    if (_dataset.entries.empty()) {
-        return std::vector<float>();
+void RenderableInterpolatedPoints::addPositionDataForPoint(unsigned int index,
+                                                           std::vector<float>& result,
+                                                           double& maxRadius) const
+{
+    using namespace dataloader;
+    auto [firstIndex, secondIndex] = interpolationIndices(index);
+
+    const Dataset::Entry& e0 = _dataset.entries[firstIndex];
+    const Dataset::Entry& e1 = _dataset.entries[secondIndex];
+
+    glm::dvec3 position0 = transformedPosition(e0);
+    glm::dvec3 position1 = transformedPosition(e1);
+
+    const double r = glm::max(glm::length(position0), glm::length(position1));
+    maxRadius = glm::max(maxRadius, r);
+
+    for (int j = 0; j < 3; ++j) {
+        result.push_back(static_cast<float>(position0[j]));
     }
 
-    std::vector<float> result;
-    result.reserve(nAttributesPerPoint() * _nDataPoints);
+    for (int j = 0; j < 3; ++j) {
+        result.push_back(static_cast<float>(position1[j]));
+    }
 
-    // Find the information we need for the interpolation and to identify the points,
-    // and make sure these result in valid indices in all cases
-    float t0 = computeCurrentLowerValue();
-    float t1 = t0 + 1.f;
-    t1 = glm::clamp(t1, 0.f, _interpolation.value.maxValue());
-    unsigned int t0Index = static_cast<unsigned int>(t0);
-    unsigned int t1Index = static_cast<unsigned int>(t1);
+    if (useSplineInterpolation()) {
+        // Compute the extra positions, before and after the other ones. But make sure
+        // we do not overflow the allowed bound for the current interpolation step
+        int beforeIndex = glm::max(static_cast<int>(firstIndex - _nDataPoints), 0);
+        int maxT = static_cast<int>(_interpolation.value.maxValue() - 1.f);
+        int maxAllowedindex = maxT * _nDataPoints + index;
+        int afterIndex = glm::min(
+            static_cast<int>(secondIndex + _nDataPoints),
+            maxAllowedindex
+        );
+
+        const Dataset::Entry& e00 = _dataset.entries[beforeIndex];
+        const Dataset::Entry& e11 = _dataset.entries[afterIndex];
+        glm::dvec3 positionBefore = transformedPosition(e00);
+        glm::dvec3 positionAfter = transformedPosition(e11);
+
+        for (int j = 0; j < 3; ++j) {
+            result.push_back(static_cast<float>(positionBefore[j]));
+        }
+
+        for (int j = 0; j < 3; ++j) {
+            result.push_back(static_cast<float>(positionAfter[j]));
+        }
+    }
+}
+
+void RenderableInterpolatedPoints::addColorAndSizeDataForPoint(unsigned int index,
+                                                         std::vector<float>& result) const
+{
+    using namespace dataloader;
+    auto [firstIndex, secondIndex] = interpolationIndices(index);
+    const Dataset::Entry& e0 = _dataset.entries[firstIndex];
+    const Dataset::Entry& e1 = _dataset.entries[secondIndex];
 
-    // What datavar is in use for the index color
     int colorParamIndex = currentColorParameterIndex();
-
-    // What datavar is in use for the size scaling (if present)
-    int sizeParamIndex = currentSizeParameterIndex();
-
-    double maxRadius = 0.0;
-
-    for (unsigned int i = 0; i < _nDataPoints; i++) {
-        using namespace dataloader;
-        const Dataset::Entry& e0 = _dataset.entries[t0Index * _nDataPoints + i];
-        const Dataset::Entry& e1 = _dataset.entries[t1Index * _nDataPoints + i];
-        glm::dvec3 position0 = transformedPosition(e0);
-        glm::dvec3 position1 = transformedPosition(e1);
-
-        const double r = glm::max(glm::length(position0), glm::length(position1));
-        maxRadius = glm::max(maxRadius, r);
-
-        // Positions
-        for (int j = 0; j < 3; j++) {
-            result.push_back(static_cast<float>(position0[j]));
-        }
-
-        for (int j = 0; j < 3; j++) {
-            result.push_back(static_cast<float>(position1[j]));
-        }
-
-        if (_interpolation.useSpline && _interpolation.nSteps > 1) {
-            // Compute the extra positions, before and after the other ones
-            unsigned int beforeIndex = static_cast<unsigned int>(
-                glm::max(t0 - 1.f, 0.f)
-            );
-            unsigned int afterIndex = static_cast<unsigned int>(
-                glm::min(t1 + 1.f, _interpolation.value.maxValue() - 1.f)
-            );
-
-            const Dataset::Entry& e00 = _dataset.entries[beforeIndex * _nDataPoints + i];
-            const Dataset::Entry& e11 = _dataset.entries[afterIndex * _nDataPoints + i];
-            glm::dvec3 positionBefore = transformedPosition(e00);
-            glm::dvec3 positionAfter = transformedPosition(e11);
-
-            for (int j = 0; j < 3; j++) {
-                result.push_back(static_cast<float>(positionBefore[j]));
-            }
-
-            for (int j = 0; j < 3; j++) {
-                result.push_back(static_cast<float>(positionAfter[j]));
-            }
-        }
-
-        // Colors
-        if (_hasColorMapFile) {
-            result.push_back(e0.data[colorParamIndex]);
-            result.push_back(e1.data[colorParamIndex]);
-        }
-
-        // Size data
-        if (_hasDatavarSize) {
-            // @TODO: Consider more detailed control over the scaling. Currently the value
-            // is multiplied with the value as is. Should have similar mapping properties
-            // as the color mapping
-            result.push_back(e0.data[sizeParamIndex]);
-            result.push_back(e1.data[sizeParamIndex]);
-        }
-
-        // @TODO: Also need to update label positions, if we have created labels from the dataset
-        // And make sure these are created from only the first set of points..
+    if (_hasColorMapFile && colorParamIndex >= 0) {
+        result.push_back(e0.data[colorParamIndex]);
+        result.push_back(e1.data[colorParamIndex]);
+    }
+
+    int sizeParamIndex = currentSizeParameterIndex();
+    if (_hasDatavarSize && sizeParamIndex >= 0) {
+        // @TODO: Consider more detailed control over the scaling. Currently the value
+        // is multiplied with the value as is. Should have similar mapping properties
+        // as the color mapping
+        result.push_back(e0.data[sizeParamIndex]);
+        result.push_back(e1.data[sizeParamIndex]);
     }
-    setBoundingSphere(maxRadius);
-    return result;
 }
 
 void RenderableInterpolatedPoints::initializeBufferData() {
@@ -463,40 +459,28 @@ void RenderableInterpolatedPoints::initializeBufferData() {
     glBindBuffer(GL_ARRAY_BUFFER, _vbo);
     glBufferData(GL_ARRAY_BUFFER, bufferSize, nullptr, GL_DYNAMIC_DRAW);
 
-    int attributeOffset = 0;
+    int offset = 0;
 
-    auto addFloatAttribute = [&](const std::string& name, GLint nValues) {
-        GLint attrib = _program->attributeLocation(name);
-        glEnableVertexAttribArray(attrib);
-        glVertexAttribPointer(
-            attrib,
-            nValues,
-            GL_FLOAT,
-            GL_FALSE,
-            attibutesPerPoint * sizeof(float),
-            (attributeOffset > 0) ?
-                reinterpret_cast<void*>(attributeOffset * sizeof(float)) :
-                nullptr
-        );
-        attributeOffset += nValues;
-    };
+    offset = bufferVertexAttribute("in_position0", 3, attibutesPerPoint, offset);
+    offset = bufferVertexAttribute("in_position1", 3, attibutesPerPoint, offset);
 
-    addFloatAttribute("in_position0", 3);
-    addFloatAttribute("in_position1", 3);
-
-    if (_interpolation.useSpline) {
-        addFloatAttribute("in_position_before", 3);
-        addFloatAttribute("in_position_after", 3);
+    if (useSplineInterpolation()) {
+        offset = bufferVertexAttribute("in_position_before", 3, attibutesPerPoint, offset);
+        offset = bufferVertexAttribute("in_position_after", 3, attibutesPerPoint, offset);
     }
 
     if (_hasColorMapFile) {
-        addFloatAttribute("in_colorParameter0", 1);
-        addFloatAttribute("in_colorParameter1", 1);
+        offset = bufferVertexAttribute("in_colorParameter0", 1, attibutesPerPoint, offset);
+        offset = bufferVertexAttribute("in_colorParameter1", 1, attibutesPerPoint, offset);
     }
 
     if (_hasDatavarSize) {
-        addFloatAttribute("in_scalingParameter0", 1);
-        addFloatAttribute("in_scalingParameter1", 1);
+        offset = bufferVertexAttribute("in_scalingParameter0", 1, attibutesPerPoint, offset);
+        offset = bufferVertexAttribute("in_scalingParameter1", 1, attibutesPerPoint, offset);
+    }
+
+    if (_hasSpriteTexture) {
+        offset = bufferVertexAttribute("in_textureLayer", 1, attibutesPerPoint, offset);
     }
 
     glBindVertexArray(0);
@@ -541,4 +525,25 @@ float RenderableInterpolatedPoints::computeCurrentLowerValue() const {
     return t0;
 }
 
+float RenderableInterpolatedPoints::computeCurrentUpperValue() const {
+    float t0 = computeCurrentLowerValue();
+    float t1 = t0 + 1.f;
+    t1 = glm::clamp(t1, 0.f, _interpolation.value.maxValue());
+    return t1;
+}
+
+std::pair<size_t, size_t>
+RenderableInterpolatedPoints::interpolationIndices(unsigned int index) const
+{
+    float t0 = computeCurrentLowerValue();
+    float t1 = computeCurrentUpperValue();
+    unsigned int t0Index = static_cast<unsigned int>(t0);
+    unsigned int t1Index = static_cast<unsigned int>(t1);
+
+    size_t lower = size_t(t0Index * _nDataPoints + index);
+    size_t upper = size_t(t1Index * _nDataPoints + index);
+
+    return { lower, upper };
+}
+
 } // namespace openspace
diff --git a/modules/base/rendering/pointcloud/renderableinterpolatedpoints.h b/modules/base/rendering/pointcloud/renderableinterpolatedpoints.h
index 27b238fa74..8ead53ad92 100644
--- a/modules/base/rendering/pointcloud/renderableinterpolatedpoints.h
+++ b/modules/base/rendering/pointcloud/renderableinterpolatedpoints.h
@@ -52,20 +52,34 @@ public:
 protected:
     void initializeShadersAndGlExtras() override;
     void deinitializeShaders() override;
-    void bindDataForPointRendering() override;
+    void setExtraUniforms() override;
     void preUpdate() override;
 
     int nAttributesPerPoint() const override;
 
+    bool useSplineInterpolation() const;
+
     /**
-     * Create the data slice to use for rendering the points. Compared to the regular
-     * point cloud, the data slice for an interpolated set of points will have to be
-     * recreated when the interpolation value changes, and will only include a subset of
-     * the points in the entire dataset
+     * Create the rendering data for the positions for the point with the given index
+     * and append that to the result. Compared to the base class, this class may require
+     * 2-4 positions, depending on if * spline interpolation is used or not.
      *
-     * \return The dataslice to use for rendering the points
+     * The values are computed based on the current interpolation value.
+     *
+     * Also, compute the maxRadius to use for setting the bounding sphere.
      */
-    std::vector<float> createDataSlice() override;
+    void addPositionDataForPoint(unsigned int index, std::vector<float>& result,
+        double& maxRadius) const override;
+
+    /**
+     * Create the rendering data for the color and size data for the point with the given
+     * index and append that to the result. Compared to the base class, this class require
+     * 2 values per data value, to use for interpolation.
+     *
+     * The values are computed based on the current interpolation value.
+     */
+    void addColorAndSizeDataForPoint(unsigned int index,
+        std::vector<float>& result) const override;
 
     void initializeBufferData();
     void updateBufferData() override;
@@ -73,6 +87,8 @@ protected:
 private:
     bool isAtKnot() const;
     float computeCurrentLowerValue() const;
+    float computeCurrentUpperValue() const;
+    std::pair<size_t, size_t> interpolationIndices(unsigned int index) const;
 
     struct Interpolation : public properties::PropertyOwner {
         Interpolation();
diff --git a/modules/base/rendering/pointcloud/renderablepointcloud.cpp b/modules/base/rendering/pointcloud/renderablepointcloud.cpp
index 65c99497e7..3d03a94a56 100644
--- a/modules/base/rendering/pointcloud/renderablepointcloud.cpp
+++ b/modules/base/rendering/pointcloud/renderablepointcloud.cpp
@@ -41,6 +41,7 @@
 #include <ghoul/opengl/openglstatecache.h>
 #include <ghoul/opengl/programobject.h>
 #include <ghoul/opengl/texture.h>
+#include <ghoul/opengl/textureconversion.h>
 #include <ghoul/opengl/textureunit.h>
 #include <glm/gtx/string_cast.hpp>
 #include <array>
@@ -55,14 +56,15 @@
 namespace {
     constexpr std::string_view _loggerCat = "RenderablePointCloud";
 
-    constexpr std::array<const char*, 32> UniformNames = {
+    constexpr std::array<const char*, 34> UniformNames = {
         "cameraViewMatrix", "projectionMatrix", "modelMatrix", "cameraPosition",
         "cameraLookUp", "renderOption", "maxAngularSize", "color", "opacity",
         "scaleExponent", "scaleFactor", "up", "right", "fadeInValue", "hasSpriteTexture",
         "spriteTexture", "useColorMap", "colorMapTexture", "cmapRangeMin", "cmapRangeMax",
         "nanColor", "useNanColor", "hideOutsideRange", "enableMaxSizeControl",
         "aboveRangeColor", "useAboveRangeColor", "belowRangeColor", "useBelowRangeColor",
-        "hasDvarScaling", "enableOutline", "outlineColor", "outlineWeight"
+        "hasDvarScaling", "dvarScaleFactor", "enableOutline", "outlineColor",
+        "outlineWeight", "aspectRatioScale"
     };
 
     enum RenderOption {
@@ -70,18 +72,55 @@ namespace {
         PositionNormal
     };
 
-    constexpr openspace::properties::Property::PropertyInfo SpriteTextureInfo = {
-        "Texture",
-        "Point Sprite Texture",
-        "The path to the texture that should be used as the point sprite",
+    constexpr openspace::properties::Property::PropertyInfo TextureEnabledInfo = {
+        "Enabled",
+        "Enabled",
+        "If true, use a provided sprite texture to render the point. If false, draw "
+        "the points using the default point shape.",
         openspace::properties::Property::Visibility::AdvancedUser
     };
 
-    constexpr openspace::properties::Property::PropertyInfo UseSpriteTextureInfo = {
-        "UseTexture",
-        "Use Texture",
-        "If true, use the provided sprite texture to render the point. If false, draw "
-        "the points using the default point shape.",
+    constexpr openspace::properties::Property::PropertyInfo AllowTextureCompressionInfo =
+    {
+        "AllowCompression",
+        "Allow Compression",
+        "If true, the textures will be compressed to preserve graphics card memory. This "
+        "is enabled per default, but may lead to visible artefacts for certain images, "
+        "especially up close. Set this to false to disable any hardware compression of "
+        "the textures, and represent each color channel with 8 bits.",
+        openspace::properties::Property::Visibility::AdvancedUser
+    };
+
+    constexpr openspace::properties::Property::PropertyInfo UseAlphaInfo = {
+        "UseAlphaChannel",
+        "Use Alpha Channel",
+        "If true, include transparency information in the loaded textures, if there "
+        "is any. If false, all loaded textures will be converted to RGB format. \n"
+        "This setting can be used if you have textures with transparency, but do not "
+        "need the transparency information. This may be the case when using additive "
+        "blending, for example. Converting the files to RGB on load may then reduce the "
+        "memory footprint and/or lead to some optimization in terms of rendering speed.",
+        openspace::properties::Property::Visibility::AdvancedUser
+    };
+
+    constexpr openspace::properties::Property::PropertyInfo SpriteTextureInfo = {
+        "File",
+        "Point Sprite Texture File",
+        "The path to the texture that should be used as the point sprite. Note that if "
+        "multiple textures option is set in the asset, by providing a texture folder, "
+        "this value will be ignored.",
+        openspace::properties::Property::Visibility::AdvancedUser
+    };
+
+    constexpr openspace::properties::Property::PropertyInfo TextureModeInfo = {
+        "TextureMode",
+        "Texture Mode",
+        "This tells which texture mode is being used for this renderable. There are "
+        "three different texture modes: 1) One single sprite texture used for all "
+        "points, 2) Multiple textures, that are mapped to the points based on a column "
+        "in the dataset, and 3) Other, which is used for specific subtypes where the "
+        "texture is internally controlled by the renderable and can't be set from a "
+        "file (such as the RenderablePolygonCloud).",
         openspace::properties::Property::Visibility::AdvancedUser
     };
 
@@ -282,7 +321,7 @@ namespace {
     struct [[codegen::Dictionary(RenderablePointCloud)]] Parameters {
         // The path to the data file that contains information about the point to be
         // rendered. Can be either a CSV or SPECK file
-        std::optional<std::string> file;
+        std::optional<std::filesystem::path> file;
 
         // If true (default), the loaded dataset will be cached so that it can be loaded
         // faster at a later time. This does however mean that any updates to the values
@@ -296,11 +335,29 @@ namespace {
         std::optional<ghoul::Dictionary> dataMapping
             [[codegen::reference("dataloader_datamapping")]];
 
-        // [[codegen::verbatim(SpriteTextureInfo.description)]]
-        std::optional<std::string> texture;
+        struct Texture {
+            // [[codegen::verbatim(TextureEnabledInfo.description)]]
+            std::optional<bool> enabled;
 
-        // [[codegen::verbatim(UseSpriteTextureInfo.description)]]
-        std::optional<bool> useTexture;
+            // [[codegen::verbatim(SpriteTextureInfo.description)]]
+            std::optional<std::filesystem::path> file;
+
+            // The folder where the textures are located when using multiple different
+            // textures to render the points. Setting this value means that multiple
+            // textures shall be used and any single sprite texture file is ignored.
+            //
+            // Note that the textures can be any format, but rendering efficiency will
+            // be best if using textures with the exact same resolution.
+            std::optional<std::filesystem::path> folder [[codegen::directory()]];
+
+            // [[codegen::verbatim(AllowTextureCompressionInfo.description)]]
+            std::optional<bool> allowCompression;
+
+            // [[codegen::verbatim(UseAlphaInfo.description)]]
+            std::optional<bool> useAlphaChannel;
+        };
+        // Settings related to the texturing of the points
+        std::optional<Texture> texture;
 
         // [[codegen::verbatim(DrawElementsInfo.description)]]
         std::optional<bool> drawElements;
@@ -333,9 +390,9 @@ namespace {
             [[codegen::reference("labelscomponent")]];
 
         struct SizeSettings {
-            // A list specifying all parameters that may be used for size mapping, i.e.
-            // scaling the points based on the provided data columns
-            std::optional<std::vector<std::string>> sizeMapping;
+            // Settings related to scaling the points based on data
+            std::optional<ghoul::Dictionary> sizeMapping
+                [[codegen::reference("base_sizemappingcomponent")]];
 
             // [[codegen::verbatim(ScaleExponentInfo.description)]]
             std::optional<float> scaleExponent;
@@ -420,14 +477,10 @@ RenderablePointCloud::SizeSettings::SizeSettings(const ghoul::Dictionary& dictio
         maxAngularSize = settings.maxSize.value_or(maxAngularSize);
 
         if (settings.sizeMapping.has_value()) {
-            std::vector<std::string> opts = *settings.sizeMapping;
-            for (size_t i = 0; i < opts.size(); i++) {
-                // Note that options are added in order
-                sizeMapping.parameterOption.addOption(static_cast<int>(i), opts[i]);
-            }
-            sizeMapping.enabled = true;
-
-            addPropertySubOwner(sizeMapping);
+            sizeMapping = std::make_unique<SizeMappingComponent>(
+                *settings.sizeMapping
+            );
+            addPropertySubOwner(sizeMapping.get());
         }
     }
 
@@ -437,18 +490,6 @@ RenderablePointCloud::SizeSettings::SizeSettings(const ghoul::Dictionary& dictio
     addProperty(maxAngularSize);
 }
 
-RenderablePointCloud::SizeSettings::SizeMapping::SizeMapping()
-    : properties::PropertyOwner({ "SizeMapping", "Size Mapping", "" })
-    , enabled(SizeMappingEnabledInfo, false)
-    , parameterOption(
-        SizeMappingOptionInfo,
-        properties::OptionProperty::DisplayType::Dropdown
-    )
-{
-    addProperty(enabled);
-    addProperty(parameterOption);
-}
-
 RenderablePointCloud::ColorSettings::ColorSettings(const ghoul::Dictionary& dictionary)
     : properties::PropertyOwner({ "Coloring", "Coloring", "" })
     , pointColor(PointColorInfo, glm::vec3(1.f), glm::vec3(0.f), glm::vec3(1.f))
@@ -485,6 +526,23 @@ RenderablePointCloud::ColorSettings::ColorSettings(const ghoul::Dictionary& dict
     addProperty(outlineWeight);
 }
 
+RenderablePointCloud::Texture::Texture()
+    : properties::PropertyOwner({ "Texture", "Texture", "" })
+    , enabled(TextureEnabledInfo, true)
+    , allowCompression(AllowTextureCompressionInfo, true)
+    , useAlphaChannel(UseAlphaInfo, true)
+    , spriteTexturePath(SpriteTextureInfo)
+    , inputMode(TextureModeInfo)
+{
+    addProperty(enabled);
+    addProperty(allowCompression);
+    addProperty(useAlphaChannel);
+    addProperty(spriteTexturePath);
+
+    inputMode.setReadOnly(true);
+    addProperty(inputMode);
+}
+
 RenderablePointCloud::Fading::Fading(const ghoul::Dictionary& dictionary)
     : properties::PropertyOwner({ "Fading", "Fading", "" })
     , enabled(EnableDistanceFadeInfo, false)
@@ -520,8 +578,6 @@ RenderablePointCloud::Fading::Fading(const ghoul::Dictionary& dictionary)
 
 RenderablePointCloud::RenderablePointCloud(const ghoul::Dictionary& dictionary)
     : Renderable(dictionary)
-    , _spriteTexturePath(SpriteTextureInfo)
-    , _useSpriteTexture(UseSpriteTextureInfo, true)
     , _drawElements(DrawElementsInfo, true)
     , _useAdditiveBlending(UseAdditiveBlendingInfo, true)
     , _renderOption(RenderOptionInfo, properties::OptionProperty::DisplayType::Dropdown)
@@ -567,22 +623,46 @@ RenderablePointCloud::RenderablePointCloud(const ghoul::Dictionary& dictionary)
         _unit = DistanceUnit::Meter;
     }
 
-    _spriteTexturePath.onChange([this]() { _spriteTextureIsDirty = true; });
-    addProperty(_spriteTexturePath);
-
-    _useSpriteTexture = p.useTexture.value_or(_useSpriteTexture);
-    addProperty(_useSpriteTexture);
+    addPropertySubOwner(_texture);
 
     if (p.texture.has_value()) {
-        _spriteTexturePath = absPath(*p.texture).string();
+        const Parameters::Texture t = *p.texture;
+
+        // Read texture information. Multi-texture is prioritized over single-texture
+        if (t.folder.has_value()) {
+            _textureMode = TextureInputMode::Multi;
+            _hasSpriteTexture = true;
+            _texturesDirectory = absPath(*t.folder).string();
+
+            if (t.file.has_value()) {
+                LWARNING(fmt::format(
+                    "Both a single texture File and multi-texture Folder was provided. "
+                    "The folder '{}' has priority and the single texture with the "
+                    "following path will be ignored: '{}'", *t.folder, *t.file
+                ));
+            }
+
+            _texture.removeProperty(_texture.spriteTexturePath);
+        }
+        else if (t.file.has_value()) {
+            _textureMode = TextureInputMode::Single;
+            _hasSpriteTexture = true;
+            _texture.spriteTexturePath = absPath(*t.file).string();
+            _texture.spriteTexturePath.onChange([this]() { _spriteTextureIsDirty = true; });
+        }
+
+        _texture.enabled = t.enabled.value_or(_texture.enabled);
+        _texture.allowCompression = t.allowCompression.value_or(_texture.allowCompression);
+        _texture.useAlphaChannel = t.useAlphaChannel.value_or(_texture.useAlphaChannel);
     }
 
-    _hasSpriteTexture = p.texture.has_value();
+    _texture.allowCompression.onChange([this]() { _spriteTextureIsDirty = true; });
+    _texture.useAlphaChannel.onChange([this]() { _spriteTextureIsDirty = true; });
 
     _transformationMatrix = p.transformationMatrix.value_or(_transformationMatrix);
 
     if (p.sizeSettings.has_value() && p.sizeSettings->sizeMapping.has_value()) {
-        _sizeSettings.sizeMapping.parameterOption.onChange(
+        _sizeSettings.sizeMapping->parameterOption.onChange(
             [this]() { _dataIsDirty = true; }
         );
         _hasDatavarSize = true;
@@ -642,7 +722,7 @@ RenderablePointCloud::RenderablePointCloud(const ghoul::Dictionary& dictionary)
 
     if (p.labels.has_value()) {
         if (!p.labels->hasKey("File") && _hasDataFile) {
-            // Load the labelset from the dataset if no file was included
+            // Load the labelset from the dataset if no label file was included
             _labels = std::make_unique<LabelsComponent>(*p.labels, _dataset, _unit);
         }
         else {
@@ -651,7 +731,7 @@ RenderablePointCloud::RenderablePointCloud(const ghoul::Dictionary& dictionary)
 
         _hasLabels = true;
         addPropertySubOwner(_labels.get());
-        // Fading of the labels should also depend on the fading of the renderable
+        // Fading of the labels should depend on the fading of the renderable
         _labels->setParentFadeable(this);
     }
 
@@ -661,8 +741,6 @@ RenderablePointCloud::RenderablePointCloud(const ghoul::Dictionary& dictionary)
 
 bool RenderablePointCloud::isReady() const {
     bool isReady = _program;
-
-    // If we have labels, they also need to be loaded
     if (_hasLabels) {
         isReady = isReady && _labels->isReady();
     }
@@ -672,6 +750,20 @@ bool RenderablePointCloud::isReady() const {
 void RenderablePointCloud::initialize() {
     ZoneScoped;
 
+    switch (_textureMode) {
+        case TextureInputMode::Single:
+            _texture.inputMode = "Single Sprite Texture";
+            break;
+        case TextureInputMode::Multi:
+            _texture.inputMode = "Multipe Textures / Data-based";
+            break;
+        case TextureInputMode::Other:
+            _texture.inputMode = "Other";
+            break;
+        default:
+            break;
+    }
+
     if (_hasDataFile && _hasColorMapFile) {
         _colorSettings.colorMapping->initialize(_dataset);
     }
@@ -687,6 +779,22 @@ void RenderablePointCloud::initializeGL() {
     initializeShadersAndGlExtras();
 
     ghoul::opengl::updateUniformLocations(*_program, _uniformCache, UniformNames);
+
+    if (_hasSpriteTexture) {
+        switch (_textureMode) {
+            case TextureInputMode::Single:
+                initializeSingleTexture();
+                break;
+            case TextureInputMode::Multi:
+                initializeMultiTextures();
+                break;
+            case TextureInputMode::Other:
+                initializeCustomTexture();
+                break;
+            default:
+                break;
+        }
+    }
 }
 
 void RenderablePointCloud::deinitializeGL() {
@@ -697,8 +805,7 @@ void RenderablePointCloud::deinitializeGL() {
 
     deinitializeShaders();
 
-    BaseModule::TextureManager.release(_spriteTexture);
-    _spriteTexture = nullptr;
+    clearTextureDataStructures();
 }
 
 void RenderablePointCloud::initializeShadersAndGlExtras() {
@@ -725,9 +832,210 @@ void RenderablePointCloud::deinitializeShaders() {
     _program = nullptr;
 }
 
-void RenderablePointCloud::bindTextureForRendering() const {
-    if (_spriteTexture) {
-        _spriteTexture->bind();
+void RenderablePointCloud::initializeCustomTexture() {}
+
+void RenderablePointCloud::initializeSingleTexture() {
+    if (_texture.spriteTexturePath.value().empty()) {
+        return;
+    }
+
+    std::filesystem::path p = absPath(_texture.spriteTexturePath);
+
+    if (!std::filesystem::is_regular_file(p)) {
+        throw ghoul::RuntimeError(fmt::format(
+            "Could not find image file '{}'", p
+        ));
+    }
+
+    loadTexture(p, 0);
+    generateArrayTextures();
+}
+
+void RenderablePointCloud::initializeMultiTextures() {
+    for (const dataloader::Dataset::Texture& tex : _dataset.textures) {
+        std::filesystem::path path = _texturesDirectory / tex.file;
+
+        if (!std::filesystem::is_regular_file(path)) {
+            throw ghoul::RuntimeError(fmt::format(
+                "Could not find image file '{}'", path
+            ));
+        }
+        loadTexture(path, tex.index);
+    }
+
+    generateArrayTextures();
+}
+
+void RenderablePointCloud::clearTextureDataStructures() {
+    _textures.clear();
+    _textureNameToIndex.clear();
+    _indexInDataToTextureIndex.clear();
+    _textureMapByFormat.clear();
+    // Unload texture arrays from GPU memory
+    for (const TextureArrayInfo& arrayInfo : _textureArrays) {
+        glDeleteTextures(1, &arrayInfo.renderId);
+    }
+    _textureArrays.clear();
+    _textureIndexToArrayMap.clear();
+}
+
+void RenderablePointCloud::loadTexture(const std::filesystem::path& path, int index) {
+    if (path.empty()) {
+        return;
+    }
+
+    std::string filename = path.filename().string();
+    auto search = _textureNameToIndex.find(filename);
+    if (search != _textureNameToIndex.end()) {
+        // The texture has already been loaded. Find the index
+        size_t indexInTextureArray = _textureNameToIndex[filename];
+        _indexInDataToTextureIndex[index] = indexInTextureArray;
+        return;
+    }
+
+    std::unique_ptr<ghoul::opengl::Texture> t =
+        ghoul::io::TextureReader::ref().loadTexture(path.string(), 2);
+
+    bool useAlpha = (t->numberOfChannels() > 3) && _texture.useAlphaChannel;
+
+    if (t) {
+        LINFOC("RenderablePlanesCloud", fmt::format("Loaded texture {}", path));
+        // Do not upload the loaded texture to the GPU, we just want it to hold the data.
+        // However, convert textures make sure they all use the same format
+        ghoul::opengl::Texture::Format targetFormat = glFormat(useAlpha);
+        convertTextureFormat(*t, targetFormat);
+    }
+    else {
+        throw ghoul::RuntimeError(fmt::format(
+            "Could not find image file {}", path
+        ));
+    }
+
+    TextureFormat format = {
+        .resolution = glm::uvec2(t->width(), t->height()),
+        .useAlpha = useAlpha
+    };
+
+    size_t indexInTextureArray = _textures.size();
+    _textures.push_back(std::move(t));
+    _textureNameToIndex[filename] = indexInTextureArray;
+    _textureMapByFormat[format].push_back(indexInTextureArray);
+    _indexInDataToTextureIndex[index] = indexInTextureArray;
+}
+
+void RenderablePointCloud::initAndAllocateTextureArray(unsigned int textureId,
+                                                       glm::uvec2 resolution,
+                                                       size_t nLayers,
+                                                       bool useAlpha)
+{
+    float w = static_cast<float>(resolution.x);
+    float h = static_cast<float>(resolution.y);
+    glm::vec2 aspectScale = w > h ? glm::vec2(1.f, h / w) : glm::vec2(w / h, 1.f);
+
+    _textureArrays.push_back({
+        .renderId = textureId,
+        .aspectRatioScale = aspectScale
+    });
+
+    gl::GLenum internalFormat = internalGlFormat(useAlpha);
+    gl::GLenum format = gl::GLenum(glFormat(useAlpha));
+
+    // Create storage for the texture
+    // The nicer way would be to use glTexStorage3D, but that is only available in OpenGl
+    // 4.2 and above
+    glTexImage3D(
+        GL_TEXTURE_2D_ARRAY,
+        0,
+        internalFormat,
+        resolution.x,
+        resolution.y,
+        static_cast<gl::GLsizei>(nLayers),
+        0,
+        format,
+        GL_UNSIGNED_BYTE,
+        nullptr
+    );
+
+    glTexParameteri(GL_TEXTURE_2D_ARRAY, GL_TEXTURE_MIN_FILTER, GL_LINEAR);
+    glTexParameteri(GL_TEXTURE_2D_ARRAY, GL_TEXTURE_MAG_FILTER, GL_LINEAR);
+    glTexParameteri(GL_TEXTURE_2D_ARRAY, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE);
+    glTexParameteri(GL_TEXTURE_2D_ARRAY, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE);
+}
+
+void RenderablePointCloud::fillAndUploadTextureLayer(unsigned int arrayIndex,
+                                                     unsigned int layer,
+                                                     size_t textureIndex,
+                                                     glm::uvec2 resolution,
+                                                     bool useAlpha,
+                                                     const void* pixelData)
+{
+    gl::GLenum format = gl::GLenum(glFormat(useAlpha));
+
+    glTexSubImage3D(
+        GL_TEXTURE_2D_ARRAY,
+        0, // Mipmap number
+        0, // xoffset
+        0, // yoffset
+        gl::GLint(layer), // zoffset
+        gl::GLsizei(resolution.x), // width
+        gl::GLsizei(resolution.y), // height
+        1, // depth
+        format,
+        GL_UNSIGNED_BYTE, // type
+        pixelData
+    );
+
+    // Keep track of which layer in which texture array corresponds to the texture with
+    // this index, so we can use it when generating vertex data
+    _textureIndexToArrayMap[textureIndex] = {
+        .arrayId = arrayIndex,
+        .layer = layer
+    };
+}
+
+void RenderablePointCloud::generateArrayTextures() {
+    using Entry = std::pair<TextureFormat, std::vector<size_t>>;
+    unsigned int arrayIndex = 0;
+    for (const Entry& e : _textureMapByFormat) {
+        glm::uvec2 res = e.first.resolution;
+        bool useAlpha = e.first.useAlpha;
+        std::vector<size_t> textureListIndices = e.second;
+        size_t nLayers = textureListIndices.size();
+
+        // Generate an array texture storage
+        unsigned int id = 0;
+        glGenTextures(1, &id);
+        glBindTexture(GL_TEXTURE_2D_ARRAY, id);
+
+        initAndAllocateTextureArray(id, res, nLayers, useAlpha);
+
+        // Fill that storage with the data from the individual textures
+        unsigned int layer = 0;
+        for (const size_t& i : textureListIndices) {
+            ghoul::opengl::Texture* texture = _textures[i].get();
+            fillAndUploadTextureLayer(arrayIndex, layer, i, res, useAlpha, texture->pixelData());
+            layer++;
+
+            // At this point we don't need the keep the texture data around anymore. If
+            // the textures need updating, we will reload them from file
+            texture->purgeFromRAM();
+        }
+
+        int nMaxTextureLayers = 0;
+        glGetIntegerv(GL_MAX_ARRAY_TEXTURE_LAYERS, &nMaxTextureLayers);
+        if (static_cast<int>(layer) > nMaxTextureLayers) {
+            LERROR(fmt::format(
+                "Too many layers bound in the same texture array. Found {} textures with "
+                "resolution {}x{} pixels. Max supported is {}.",
+                layer, res.x, res.y, nMaxTextureLayers
+            ));
+            // @TODO: Should we split the array up? Do we think this will ever become
+            // a problem?
+        }
+
+        glBindTexture(GL_TEXTURE_2D_ARRAY, 0);
+
+        arrayIndex++;
     }
 }
 
@@ -759,7 +1067,54 @@ float RenderablePointCloud::computeDistanceFadeValue(const RenderData& data) con
     return fadeValue * funcValue;
 }
 
-void RenderablePointCloud::bindDataForPointRendering() {
+void RenderablePointCloud::setExtraUniforms() {}
+
+void RenderablePointCloud::renderBillboards(const RenderData& data,
+                                            const glm::dmat4& modelMatrix,
+                                            const glm::dvec3& orthoRight,
+                                            const glm::dvec3& orthoUp,
+                                            float fadeInVariable)
+{
+    if (!_hasDataFile || _dataset.entries.empty()) {
+        return;
+    }
+
+    glEnablei(GL_BLEND, 0);
+
+    if (_useAdditiveBlending) {
+        glDepthMask(false);
+        glBlendFunc(GL_SRC_ALPHA, GL_ONE);
+    }
+    else {
+        // Normal blending, with transparency
+        glDepthMask(true);
+        glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
+    }
+
+    _program->activate();
+
+    _program->setUniform(_uniformCache.cameraPos, data.camera.positionVec3());
+    _program->setUniform(
+        _uniformCache.cameraLookup,
+        glm::vec3(data.camera.lookUpVectorWorldSpace())
+    );
+    _program->setUniform(_uniformCache.renderOption, _renderOption.value());
+    _program->setUniform(_uniformCache.modelMatrix, modelMatrix);
+
+    _program->setUniform(
+        _uniformCache.cameraViewMatrix,
+        data.camera.combinedViewMatrix()
+    );
+
+    _program->setUniform(
+        _uniformCache.projectionMatrix,
+        glm::dmat4(data.camera.projectionMatrix())
+    );
+
+    _program->setUniform(_uniformCache.up, glm::vec3(orthoUp));
+    _program->setUniform(_uniformCache.right, glm::vec3(orthoRight));
+    _program->setUniform(_uniformCache.fadeInValue, fadeInVariable);
+
     _program->setUniform(_uniformCache.renderOption, _renderOption.value());
     _program->setUniform(_uniformCache.opacity, opacity());
 
@@ -770,16 +1125,17 @@ void RenderablePointCloud::bindDataForPointRendering() {
         _sizeSettings.useMaxSizeControl
     );
     _program->setUniform(_uniformCache.maxAngularSize, _sizeSettings.maxAngularSize);
-    _program->setUniform(_uniformCache.hasDvarScaling, _sizeSettings.sizeMapping.enabled);
 
-    bool useTexture = _hasSpriteTexture && _useSpriteTexture;
-    _program->setUniform(_uniformCache.hasSpriteTexture, useTexture);
+    bool useSizeMapping = _hasDatavarSize && _sizeSettings.sizeMapping &&
+        _sizeSettings.sizeMapping->enabled;
 
-    ghoul::opengl::TextureUnit spriteTextureUnit;
-    _program->setUniform(_uniformCache.spriteTexture, spriteTextureUnit);
-    if (useTexture) {
-        spriteTextureUnit.activate();
-        bindTextureForRendering();
+    _program->setUniform(_uniformCache.hasDvarScaling, useSizeMapping);
+
+    if (useSizeMapping) {
+        _program->setUniform(
+            _uniformCache.dvarScaleFactor,
+            _sizeSettings.sizeMapping->scaleFactor
+        );
     }
 
     _program->setUniform(_uniformCache.color, _colorSettings.pointColor);
@@ -834,58 +1190,38 @@ void RenderablePointCloud::bindDataForPointRendering() {
             _colorSettings.colorMapping->useBelowRangeColor
         );
     }
-}
 
-void RenderablePointCloud::renderBillboards(const RenderData& data,
-                                            const glm::dmat4& modelMatrix,
-                                            const glm::dvec3& orthoRight,
-                                            const glm::dvec3& orthoUp,
-                                            float fadeInVariable)
-{
-    if (!_hasDataFile || _dataset.entries.empty()) {
-        return;
-    }
+    bool useTexture = _hasSpriteTexture && _texture.enabled;
+    _program->setUniform(_uniformCache.hasSpriteTexture, useTexture);
 
-    glEnablei(GL_BLEND, 0);
+    ghoul::opengl::TextureUnit spriteTextureUnit;
+    _program->setUniform(_uniformCache.spriteTexture, spriteTextureUnit);
 
-    if (_useAdditiveBlending) {
-        glDepthMask(false);
-        glBlendFunc(GL_SRC_ALPHA, GL_ONE);
-    }
-    else {
-        // Normal blending, with transparency
-        glDepthMask(true);
-        glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
-    }
-
-    _program->activate();
-
-    _program->setUniform(_uniformCache.cameraPos, data.camera.positionVec3());
-    _program->setUniform(
-        _uniformCache.cameraLookup,
-        glm::vec3(data.camera.lookUpVectorWorldSpace())
-    );
-    _program->setUniform(_uniformCache.renderOption, _renderOption.value());
-    _program->setUniform(_uniformCache.modelMatrix, modelMatrix);
-
-    _program->setUniform(
-        _uniformCache.cameraViewMatrix,
-        data.camera.combinedViewMatrix()
-    );
-
-    _program->setUniform(
-        _uniformCache.projectionMatrix,
-        glm::dmat4(data.camera.projectionMatrix())
-    );
-
-    _program->setUniform(_uniformCache.up, glm::vec3(orthoUp));
-    _program->setUniform(_uniformCache.right, glm::vec3(orthoRight));
-    _program->setUniform(_uniformCache.fadeInValue, fadeInVariable);
-
-    bindDataForPointRendering();
+    setExtraUniforms();
 
     glBindVertexArray(_vao);
-    glDrawArrays(GL_POINTS, 0, static_cast<GLsizei>(_nDataPoints));
+
+    if (useTexture && !_textureArrays.empty()) {
+        spriteTextureUnit.activate();
+        for (const TextureArrayInfo& arrayInfo : _textureArrays) {
+            _program->setUniform(
+                _uniformCache.aspectRatioScale,
+                arrayInfo.aspectRatioScale
+            );
+            glBindTexture(GL_TEXTURE_2D_ARRAY, arrayInfo.renderId);
+            glDrawArrays(
+                GL_POINTS,
+                arrayInfo.startOffset,
+                static_cast<GLsizei>(arrayInfo.nPoints)
+            );
+        }
+        glBindTexture(GL_TEXTURE_2D_ARRAY, 0);
+    }
+    else {
+        _program->setUniform(_uniformCache.aspectRatioScale, glm::vec2(1.f));
+        glDrawArrays(GL_POINTS, 0, static_cast<GLsizei>(_nDataPoints));
+    }
+
     glBindVertexArray(0);
     _program->deactivate();
 
@@ -940,13 +1276,13 @@ void RenderablePointCloud::update(const UpdateData&) {
         _colorSettings.colorMapping->update(_dataset);
     }
 
-    if (_dataIsDirty) {
-        updateBufferData();
-    }
-
     if (_spriteTextureIsDirty) {
         updateSpriteTexture();
     }
+
+    if (_dataIsDirty) {
+        updateBufferData();
+    }
 }
 
 glm::dvec3 RenderablePointCloud::transformedPosition(
@@ -961,9 +1297,27 @@ int RenderablePointCloud::nAttributesPerPoint() const {
     int n = 3; // position
     n += _hasColorMapFile ? 1 : 0;
     n += _hasDatavarSize ? 1 : 0;
+    n += _hasSpriteTexture ? 1 : 0; // texture id
     return n;
 }
 
+int RenderablePointCloud::bufferVertexAttribute(const std::string& name, GLint nValues,
+                                                 int nAttributesPerPoint, int offset) const
+{
+    GLint attrib = _program->attributeLocation(name);
+    glEnableVertexAttribArray(attrib);
+    glVertexAttribPointer(
+        attrib,
+        nValues,
+        GL_FLOAT,
+        GL_FALSE,
+        nAttributesPerPoint * sizeof(float),
+        reinterpret_cast<void*>(offset * sizeof(float))
+    );
+
+    return offset + nValues;
+}
+
 void RenderablePointCloud::updateBufferData() {
     if (!_hasDataFile || _dataset.entries.empty()) {
         return;
@@ -991,45 +1345,20 @@ void RenderablePointCloud::updateBufferData() {
     glBufferData(GL_ARRAY_BUFFER, size * sizeof(float), slice.data(), GL_STATIC_DRAW);
 
     const int attibutesPerPoint = nAttributesPerPoint();
-    int attributeOffset = 0;
+    int offset = 0;
 
-    GLint positionAttrib = _program->attributeLocation("in_position");
-    glEnableVertexAttribArray(positionAttrib);
-    glVertexAttribPointer(
-        positionAttrib,
-        3,
-        GL_FLOAT,
-        GL_FALSE,
-        attibutesPerPoint * sizeof(float),
-        nullptr
-    );
-    attributeOffset += 3;
+    offset = bufferVertexAttribute("in_position", 3, attibutesPerPoint, offset);
 
     if (_hasColorMapFile) {
-        GLint colorParamAttrib = _program->attributeLocation("in_colorParameter");
-        glEnableVertexAttribArray(colorParamAttrib);
-        glVertexAttribPointer(
-            colorParamAttrib,
-            1,
-            GL_FLOAT,
-            GL_FALSE,
-            attibutesPerPoint * sizeof(float),
-            reinterpret_cast<void*>(attributeOffset * sizeof(float))
-        );
-        attributeOffset += 1;
+        offset = bufferVertexAttribute("in_colorParameter", 1, attibutesPerPoint, offset);
     }
 
     if (_hasDatavarSize) {
-        GLint scalingAttrib = _program->attributeLocation("in_scalingParameter");
-        glEnableVertexAttribArray(scalingAttrib);
-        glVertexAttribPointer(
-            scalingAttrib,
-            1,
-            GL_FLOAT,
-            GL_FALSE,
-            attibutesPerPoint * sizeof(float),
-            reinterpret_cast<void*>(attributeOffset * sizeof(float))
-        );
+        offset = bufferVertexAttribute("in_scalingParameter", 1, attibutesPerPoint, offset);
+    }
+
+    if (_hasSpriteTexture) {
+        offset = bufferVertexAttribute("in_textureLayer", 1, attibutesPerPoint, offset);
     }
 
     glBindVertexArray(0);
@@ -1038,8 +1367,7 @@ void RenderablePointCloud::updateBufferData() {
 }
 
 void RenderablePointCloud::updateSpriteTexture() {
-    bool shouldUpdate = _hasSpriteTexture && _spriteTextureIsDirty &&
-        !_spriteTexturePath.value().empty();
+    bool shouldUpdate = _hasSpriteTexture && _spriteTextureIsDirty;
 
     if (!shouldUpdate) {
         return;
@@ -1048,26 +1376,34 @@ void RenderablePointCloud::updateSpriteTexture() {
     ZoneScopedN("Sprite texture");
     TracyGpuZone("Sprite texture");
 
-    ghoul::opengl::Texture* texture = _spriteTexture;
+    clearTextureDataStructures();
 
-    unsigned int hash = ghoul::hashCRC32File(_spriteTexturePath);
+    // We also have to update the dataset, to update the texture array offsets
+    _dataIsDirty = true;
 
-    _spriteTexture = BaseModule::TextureManager.request(
-        std::to_string(hash),
-        [path = _spriteTexturePath]() -> std::unique_ptr<ghoul::opengl::Texture> {
-            std::filesystem::path p = absPath(path);
-            LINFO(fmt::format("Loaded texture from {}", p));
-            std::unique_ptr<ghoul::opengl::Texture> t =
-                ghoul::io::TextureReader::ref().loadTexture(p.string(), 2);
-            t->uploadTexture();
-            t->setFilter(ghoul::opengl::Texture::FilterMode::AnisotropicMipMap);
-            t->purgeFromRAM();
-            return t;
-        }
-    );
-
-    BaseModule::TextureManager.release(texture);
+    // Always set the is-dirty flag, even if the loading fails, as to not try to reload
+    // the texture without the input file being changed
     _spriteTextureIsDirty = false;
+
+    switch (_textureMode) {
+        case TextureInputMode::Single:
+            initializeSingleTexture();
+            // Note that these are usually set when the data slice initialized. However,
+            // we want to avoid reinitializing the data, and here we know that all points
+            // will be rendered using the same texture array and hence the data can stay fixed
+            _textureArrays.front().nPoints = _nDataPoints;
+            _textureArrays.front().startOffset = 0;
+            _dataIsDirty = false;
+            break;
+        case TextureInputMode::Multi:
+            initializeMultiTextures();
+            break;
+        case TextureInputMode::Other:
+            initializeCustomTexture();
+            break;
+        default:
+            break;
+    }
 }
 
 int RenderablePointCloud::currentColorParameterIndex() const {
@@ -1083,7 +1419,7 @@ int RenderablePointCloud::currentColorParameterIndex() const {
 
 int RenderablePointCloud::currentSizeParameterIndex() const {
     const properties::OptionProperty& property =
-        _sizeSettings.sizeMapping.parameterOption;
+        _sizeSettings.sizeMapping->parameterOption;
 
     if (!_hasDatavarSize || property.options().empty()) {
         return 0;
@@ -1092,6 +1428,41 @@ int RenderablePointCloud::currentSizeParameterIndex() const {
     return _dataset.index(property.option().description);
 }
 
+void RenderablePointCloud::addPositionDataForPoint(unsigned int index,
+                                                   std::vector<float>& result,
+                                                   double& maxRadius) const
+{
+    const dataloader::Dataset::Entry& e = _dataset.entries[index];
+    glm::dvec3 position = transformedPosition(e);
+    const double r = glm::length(position);
+
+    // Add values to result
+    for (int j = 0; j < 3; ++j) {
+        result.push_back(static_cast<float>(position[j]));
+    }
+
+    maxRadius = std::max(maxRadius, r);
+}
+
+void RenderablePointCloud::addColorAndSizeDataForPoint(unsigned int index,
+                                                       std::vector<float>& result) const
+{
+    const dataloader::Dataset::Entry& e = _dataset.entries[index];
+
+    int colorParamIndex = currentColorParameterIndex();
+    if (_hasColorMapFile && colorParamIndex >= 0) {
+        result.push_back(e.data[colorParamIndex]);
+    }
+
+    int sizeParamIndex = currentSizeParameterIndex();
+    if (_hasDatavarSize && sizeParamIndex >= 0) {
+        // @TODO: Consider more detailed control over the scaling. Currently the value
+        // is multiplied with the value as is. Should have similar mapping properties
+        // as the color mapping
+        result.push_back(e.data[sizeParamIndex]);
+    }
+}
+
 std::vector<float> RenderablePointCloud::createDataSlice() {
     ZoneScoped;
 
@@ -1099,43 +1470,100 @@ std::vector<float> RenderablePointCloud::createDataSlice() {
         return std::vector<float>();
     }
 
-    std::vector<float> result;
-    result.reserve(nAttributesPerPoint() * _dataset.entries.size());
-
-    // What datavar is in use for the index color
-    int colorParamIndex = currentColorParameterIndex();
-
-    // What datavar is in use for the size scaling (if present)
-    int sizeParamIndex = currentSizeParameterIndex();
+    // What datavar is the texture, if any
+    int textureIdIndex = _dataset.textureDataIndex;
 
     double maxRadius = 0.0;
 
-    for (const dataloader::Dataset::Entry& e : _dataset.entries) {
-        glm::dvec3 position = transformedPosition(e);
+    // One sub-array per texture array, since each of these will correspond to a separate
+    // draw call. We need at least one sub result array
+    std::vector<std::vector<float>> subResults = std::vector<std::vector<float>>(
+        !_textureArrays.empty() ? _textureArrays.size() : 1
+    );
 
-        const double r = glm::length(position);
-        maxRadius = std::max(maxRadius, r);
+    // Reserve enough space for all points in each for now
+    for (std::vector<float>& subres : subResults) {
+        subres.reserve(nAttributesPerPoint() * _dataset.entries.size());
+    }
 
-        // Positions
-        for (int j = 0; j < 3; j++) {
-            result.push_back(static_cast<float>(position[j]));
+    for (unsigned int i = 0; i < _nDataPoints; i++) {
+        const dataloader::Dataset::Entry& e = _dataset.entries[i];
+
+        unsigned int subresultIndex = 0;
+        float textureLayer = 0.f;
+
+        bool useMultiTexture = (_textureMode == TextureInputMode::Multi) &&
+            (textureIdIndex >= 0);
+
+        if (_hasSpriteTexture && useMultiTexture) {
+            int texId = static_cast<int>(e.data[textureIdIndex]);
+            size_t texIndex = _indexInDataToTextureIndex[texId];
+            textureLayer = static_cast<float>(
+                _textureIndexToArrayMap[texIndex].layer
+            );
+            subresultIndex = _textureIndexToArrayMap[texIndex].arrayId;
         }
 
-        // Colors
-        if (_hasColorMapFile && colorParamIndex > -1) {
-            result.push_back(e.data[colorParamIndex]);
-        }
+        std::vector<float>& subArrayToUse = subResults[subresultIndex];
 
-        // Size data
-        if (_hasDatavarSize && sizeParamIndex > -1) {
-            // @TODO: Consider more detailed control over the scaling. Currently the value
-            // is multiplied with the value as is. Should have similar mapping properties
-            // as the color mapping
-            result.push_back(e.data[sizeParamIndex]);
+        // Add position, color and size data (subclasses may compute these differently)
+        addPositionDataForPoint(i, subArrayToUse, maxRadius);
+        addColorAndSizeDataForPoint(i, subArrayToUse);
+
+        // Texture layer
+        if (_hasSpriteTexture) {
+            subArrayToUse.push_back(static_cast<float>(textureLayer));
         }
     }
+
+    for (std::vector<float>& subres : subResults) {
+        subres.shrink_to_fit();
+    }
+
+    // Combine subresults, which should be in same order as texture arrays
+    std::vector<float> result;
+    result.reserve(nAttributesPerPoint() * _dataset.entries.size());
+    size_t vertexCount = 0;
+    for (size_t i = 0; i < subResults.size(); ++i) {
+        result.insert(result.end(), subResults[i].begin(), subResults[i].end());
+        int nVertices = static_cast<int>(subResults[i].size()) / nAttributesPerPoint();
+        if (!_textureArrays.empty()) {
+            _textureArrays[i].nPoints = nVertices;
+            _textureArrays[i].startOffset = static_cast<GLint>(vertexCount);
+        }
+        vertexCount += nVertices;
+    }
+    result.shrink_to_fit();
+
     setBoundingSphere(maxRadius);
     return result;
 }
 
+
+gl::GLenum RenderablePointCloud::internalGlFormat(bool useAlpha) const {
+    if (useAlpha) {
+        return _texture.allowCompression ? GL_COMPRESSED_RGBA_S3TC_DXT5_EXT : GL_RGBA8;
+    }
+    else {
+        return _texture.allowCompression ? GL_COMPRESSED_RGB_S3TC_DXT1_EXT : GL_RGB8;
+    }
+}
+
+ghoul::opengl::Texture::Format RenderablePointCloud::glFormat(bool useAlpha) const {
+    using Texture = ghoul::opengl::Texture;
+    return useAlpha ? Texture::Format::RGBA : Texture::Format::RGB;
+}
+
+bool operator==(const TextureFormat& l, const TextureFormat& r) {
+    return (l.resolution == r.resolution) && (l.useAlpha == r.useAlpha);
+}
+
+size_t TextureFormatHash::operator()(const TextureFormat& k) const {
+    size_t res = 0;
+    res += static_cast<uint64_t>(k.resolution.x) << 32;
+    res += static_cast<uint64_t>(k.resolution.y) << 16;
+    res += k.useAlpha ? 0 : 1;
+    return res;
+}
+
 } // namespace openspace
diff --git a/modules/base/rendering/pointcloud/renderablepointcloud.h b/modules/base/rendering/pointcloud/renderablepointcloud.h
index c1ec0b0be5..05e2cf3a65 100644
--- a/modules/base/rendering/pointcloud/renderablepointcloud.h
+++ b/modules/base/rendering/pointcloud/renderablepointcloud.h
@@ -27,6 +27,7 @@
 
 #include <openspace/rendering/renderable.h>
 
+#include <modules/base/rendering/pointcloud/sizemappingcomponent.h>
 #include <openspace/properties/optionproperty.h>
 #include <openspace/properties/stringproperty.h>
 #include <openspace/properties/triggerproperty.h>
@@ -52,6 +53,16 @@ namespace openspace {
 
 namespace documentation { struct Documentation; }
 
+struct TextureFormat {
+    glm::uvec2 resolution;
+    bool useAlpha = false;
+
+    friend bool operator==(const TextureFormat& l, const TextureFormat& r);
+};
+struct TextureFormatHash {
+    size_t operator()(const TextureFormat& k) const;
+};
+
 /**
  * This class describes a point cloud renderable that can be used to draw billboraded
  * points based on a data file with 3D positions.  Alternatively the points can also
@@ -74,15 +85,30 @@ public:
     static documentation::Documentation Documentation();
 
 protected:
+    enum class TextureInputMode {
+        Single = 0,
+        Multi,
+        Other // For subclasses that need to handle their own texture
+    };
+
     virtual void initializeShadersAndGlExtras();
     virtual void deinitializeShaders();
-    virtual void bindDataForPointRendering();
+    virtual void setExtraUniforms();
     virtual void preUpdate();
 
     glm::dvec3 transformedPosition(const dataloader::Dataset::Entry& e) const;
 
     virtual int nAttributesPerPoint() const;
 
+    /**
+     * Helper function to buffer the vertex attribute with the given name and number
+     * of values. Assumes that the value is a float value.
+     *
+     * Returns the updated offset after this attribute is added
+     */
+    int bufferVertexAttribute(const std::string& name, GLint nValues,
+        int nAttributesPerPoint, int offset) const;
+
     virtual void updateBufferData();
     void updateSpriteTexture();
 
@@ -91,17 +117,42 @@ protected:
     /// Find the index of the currently chosen size parameter in the dataset
     int currentSizeParameterIndex() const;
 
-    virtual std::vector<float> createDataSlice();
+    virtual void addPositionDataForPoint(unsigned int index, std::vector<float>& result,
+        double& maxRadius) const;
+    virtual void addColorAndSizeDataForPoint(unsigned int index,
+        std::vector<float>& result) const;
 
-    virtual void bindTextureForRendering() const;
+    std::vector<float> createDataSlice();
+
+    /**
+     * A function that subclasses could override to initialize their own textures to
+     * use for rendering, when the `_textureMode` is set to Other
+     */
+    virtual void initializeCustomTexture();
+    void initializeSingleTexture();
+    void initializeMultiTextures();
+    void clearTextureDataStructures();
+
+    void loadTexture(const std::filesystem::path& path, int index);
+
+    void initAndAllocateTextureArray(unsigned int textureId,
+        glm::uvec2 resolution, size_t nLayers, bool useAlpha);
+
+    void fillAndUploadTextureLayer(unsigned int arrayindex, unsigned int layer,
+        size_t textureIndex, glm::uvec2 resolution, bool useAlpha, const void* pixelData);
+
+    void generateArrayTextures();
 
     float computeDistanceFadeValue(const RenderData& data) const;
 
     void renderBillboards(const RenderData& data, const glm::dmat4& modelMatrix,
         const glm::dvec3& orthoRight, const glm::dvec3& orthoUp, float fadeInVariable);
 
+    gl::GLenum internalGlFormat(bool useAlpha) const;
+    ghoul::opengl::Texture::Format glFormat(bool useAlpha) const;
+
     bool _dataIsDirty = true;
-    bool _spriteTextureIsDirty = true;
+    bool _spriteTextureIsDirty = false;
     bool _cmapIsDirty = true;
 
     bool _hasSpriteTexture = false;
@@ -113,12 +164,7 @@ protected:
     struct SizeSettings : properties::PropertyOwner {
         explicit SizeSettings(const ghoul::Dictionary& dictionary);
 
-        struct SizeMapping : properties::PropertyOwner {
-            SizeMapping();
-            properties::BoolProperty enabled;
-            properties::OptionProperty parameterOption;
-        };
-        SizeMapping sizeMapping;
+        std::unique_ptr<SizeMappingComponent> sizeMapping;
 
         properties::FloatProperty scaleExponent;
         properties::FloatProperty scaleFactor;
@@ -146,9 +192,6 @@ protected:
     };
     Fading _fading;
 
-    properties::BoolProperty _useSpriteTexture;
-    properties::StringProperty _spriteTexturePath;
-
     properties::BoolProperty _useAdditiveBlending;
 
     properties::BoolProperty _drawElements;
@@ -156,7 +199,18 @@ protected:
 
     properties::UIntProperty _nDataPoints;
 
-    ghoul::opengl::Texture* _spriteTexture = nullptr;
+    struct Texture : properties::PropertyOwner {
+        Texture();
+        properties::BoolProperty enabled;
+        properties::BoolProperty allowCompression;
+        properties::BoolProperty useAlphaChannel;
+        properties::StringProperty spriteTexturePath;
+        properties::StringProperty inputMode;
+    };
+    Texture _texture;
+    TextureInputMode _textureMode = TextureInputMode::Single;
+    std::filesystem::path _texturesDirectory;
+
     ghoul::opengl::ProgramObject* _program = nullptr;
 
     UniformCache(
@@ -165,7 +219,8 @@ protected:
         right, fadeInValue, hasSpriteTexture, spriteTexture, useColormap, colorMapTexture,
         cmapRangeMin, cmapRangeMax, nanColor, useNanColor, hideOutsideRange,
         enableMaxSizeControl, aboveRangeColor, useAboveRangeColor, belowRangeColor,
-        useBelowRangeColor, hasDvarScaling, enableOutline, outlineColor, outlineWeight
+        useBelowRangeColor, hasDvarScaling, dvarScaleFactor, enableOutline, outlineColor,
+        outlineWeight, aspectRatioScale
     ) _uniformCache;
 
     std::string _dataFile;
@@ -181,6 +236,33 @@ protected:
 
     GLuint _vao = 0;
     GLuint _vbo = 0;
+
+    // List of (unique) loaded textures. The other maps refer to the index in this vector
+    std::vector<std::unique_ptr<ghoul::opengl::Texture>> _textures;
+    std::unordered_map<std::string, size_t> _textureNameToIndex;
+
+    // Texture index in dataset to index in vector of textures
+    std::unordered_map<int, size_t> _indexInDataToTextureIndex;
+
+    // Resolution/format to index in textures vector (used to generate one texture
+    // array per unique format)
+    std::unordered_map<TextureFormat, std::vector<size_t>, TextureFormatHash>
+        _textureMapByFormat;
+
+    // One per resolution above
+    struct TextureArrayInfo {
+        GLuint renderId;
+        GLint startOffset = -1;
+        int nPoints = -1;
+        glm::vec2 aspectRatioScale = glm::vec2(1.f);
+    };
+    std::vector<TextureArrayInfo> _textureArrays;
+
+    struct TextureId {
+        unsigned int arrayId;
+        unsigned int layer;
+    };
+    std::unordered_map<size_t, TextureId> _textureIndexToArrayMap;
 };
 
 } // namespace openspace
diff --git a/modules/base/rendering/pointcloud/renderablepolygoncloud.cpp b/modules/base/rendering/pointcloud/renderablepolygoncloud.cpp
index cdfd786524..8b165d9529 100644
--- a/modules/base/rendering/pointcloud/renderablepolygoncloud.cpp
+++ b/modules/base/rendering/pointcloud/renderablepolygoncloud.cpp
@@ -38,8 +38,9 @@ namespace {
     // A RenderablePolygonCloud is a RenderablePointCloud where the shape of the points
     // is a uniform polygon with a given number of sides instead of a texture. For
     // instance, PolygonSides = 5 results in the points being rendered as pentagons.
-    // Note that while this renderable inherits the texture property from
-    // RenderablePointCloud, any added texture value will be ignored in favor of the
+    //
+    // Note that while this renderable inherits the texture component from
+    // RenderablePointCloud, any added texture information will be ignored in favor of the
     // polygon shape.
     //
     // See documentation of RenderablePointCloud for details on the other parts of the
@@ -70,15 +71,11 @@ RenderablePolygonCloud::RenderablePolygonCloud(const ghoul::Dictionary& dictiona
     _nPolygonSides = p.polygonSides.value_or(_nPolygonSides);
 
     // The texture to use for the rendering will be generated in initializeGl. Make sure
-    // we use it in the rnedering
+    // we use it in the rendering
     _hasSpriteTexture = true;
-}
 
-void RenderablePolygonCloud::initializeGL() {
-    ZoneScoped;
-
-    RenderablePointCloud::initializeGL();
-    createPolygonTexture();
+    _textureMode = TextureInputMode::Other;
+    removePropertySubOwner(_texture);
 }
 
 void RenderablePolygonCloud::deinitializeGL() {
@@ -92,16 +89,24 @@ void RenderablePolygonCloud::deinitializeGL() {
     RenderablePointCloud::deinitializeGL();
 }
 
-void RenderablePolygonCloud::bindTextureForRendering() const {
-    glBindTexture(GL_TEXTURE_2D, _pTexture);
-}
-
-void RenderablePolygonCloud::createPolygonTexture() {
+void RenderablePolygonCloud::initializeCustomTexture() {
     ZoneScoped;
 
+    if (_textureIsInitialized) {
+        LWARNING("RenderablePolygonCloud texture cannot be updated during runtime");
+        return;
+    }
+
     LDEBUG("Creating Polygon Texture");
     constexpr gl::GLsizei TexSize = 512;
 
+    // We don't use the helper function for the format and internal format here,
+    // as we don't want the compression to be used for the polygon texture and we
+    // always want alpha. This is also why we do not need to update the texture
+    bool useAlpha = true;
+    gl::GLenum format = gl::GLenum(glFormat(useAlpha));
+    gl::GLenum internalFormat = GL_RGBA8;
+
     glGenTextures(1, &_pTexture);
     glBindTexture(GL_TEXTURE_2D, _pTexture);
     glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR);
@@ -113,16 +118,35 @@ void RenderablePolygonCloud::createPolygonTexture() {
     glTexImage2D(
         GL_TEXTURE_2D,
         0,
-        GL_RGBA8,
+        internalFormat,
         TexSize,
         TexSize,
         0,
-        GL_RGBA,
-        GL_BYTE,
+        format,
+        GL_UNSIGNED_BYTE,
         nullptr
     );
 
     renderToTexture(_pTexture, TexSize, TexSize);
+
+    // Download the data and use it to intialize the data we need to rendering.
+    // Allocate memory: N channels, with one byte each
+    constexpr unsigned int nChannels = 4;
+    unsigned int arraySize = TexSize * TexSize * nChannels;
+    std::vector<GLubyte> pixelData;
+    pixelData.resize(arraySize);
+    glBindTexture(GL_TEXTURE_2D, _pTexture);
+    glGetTexImage(GL_TEXTURE_2D, 0, format, GL_UNSIGNED_BYTE, pixelData.data());
+
+    // Create array from data, size and format
+    unsigned int id = 0;
+    glGenTextures(1, &id);
+    glBindTexture(GL_TEXTURE_2D_ARRAY, id);
+    initAndAllocateTextureArray(id, glm::uvec2(TexSize), 1, useAlpha);
+    fillAndUploadTextureLayer(0, 0, 0, glm::uvec2(TexSize), useAlpha, pixelData.data());
+    glBindTexture(GL_TEXTURE_2D_ARRAY, 0);
+
+    _textureIsInitialized = true;
 }
 
 void RenderablePolygonCloud::renderToTexture(GLuint textureToRenderTo,
@@ -191,7 +215,6 @@ void RenderablePolygonCloud::renderPolygonGeometry(GLuint vao) {
     glClearBufferfv(GL_COLOR, 0, glm::value_ptr(Black));
 
     program->setUniform("sides", _nPolygonSides);
-    program->setUniform("polygonColor", _colorSettings.pointColor);
 
     glBindVertexArray(vao);
     glDrawArrays(GL_POINTS, 0, 1);
diff --git a/modules/base/rendering/pointcloud/renderablepolygoncloud.h b/modules/base/rendering/pointcloud/renderablepolygoncloud.h
index 745f16b0ac..9af0282401 100644
--- a/modules/base/rendering/pointcloud/renderablepolygoncloud.h
+++ b/modules/base/rendering/pointcloud/renderablepolygoncloud.h
@@ -44,25 +44,24 @@ public:
     explicit RenderablePolygonCloud(const ghoul::Dictionary& dictionary);
     ~RenderablePolygonCloud() override = default;
 
-    void initializeGL() override;
     void deinitializeGL() override;
 
     static documentation::Documentation Documentation();
 
 private:
-    void createPolygonTexture();
+    void initializeCustomTexture() override;
     void renderToTexture(GLuint textureToRenderTo, GLuint textureWidth,
         GLuint textureHeight);
     void renderPolygonGeometry(GLuint vao);
 
-    void bindTextureForRendering() const override;
-
     int _nPolygonSides = 3;
 
     GLuint _pTexture = 0;
 
     GLuint _polygonVao = 0;
     GLuint _polygonVbo = 0;
+
+    bool _textureIsInitialized = false;
 };
 
 } // namespace openspace
diff --git a/modules/base/rendering/pointcloud/sizemappingcomponent.cpp b/modules/base/rendering/pointcloud/sizemappingcomponent.cpp
new file mode 100644
index 0000000000..a69d580d3e
--- /dev/null
+++ b/modules/base/rendering/pointcloud/sizemappingcomponent.cpp
@@ -0,0 +1,131 @@
+/*****************************************************************************************
+ *                                                                                       *
+ * OpenSpace                                                                             *
+ *                                                                                       *
+ * Copyright (c) 2014-2024                                                               *
+ *                                                                                       *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
+ * software and associated documentation files (the "Software"), to deal in the Software *
+ * without restriction, including without limitation the rights to use, copy, modify,    *
+ * merge, publish, distribute, sublicense, and/or sell copies of the Software, and to    *
+ * permit persons to whom the Software is furnished to do so, subject to the following   *
+ * conditions:                                                                           *
+ *                                                                                       *
+ * The above copyright notice and this permission notice shall be included in all copies *
+ * or substantial portions of the Software.                                              *
+ *                                                                                       *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED,   *
+ * INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A         *
+ * PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT    *
+ * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF  *
+ * CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE  *
+ * OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                                         *
+ ****************************************************************************************/
+
+#include <modules/base/rendering/pointcloud/sizemappingcomponent.h>
+
+#include <openspace/documentation/documentation.h>
+#include <ghoul/logging/logmanager.h>
+
+namespace {
+    constexpr std::string_view _loggerCat = "SizeMapping";
+
+    constexpr openspace::properties::Property::PropertyInfo EnabledInfo = {
+        "Enabled",
+        "Size Mapping Enabled",
+        "If this value is set to 'true' and at least one column was loaded as an option "
+        "for size mapping, the chosen data column will be used to scale the size of the "
+        "points. The first option in the list is selected per default.",
+        openspace::properties::Property::Visibility::NoviceUser
+    };
+
+    constexpr openspace::properties::Property::PropertyInfo OptionInfo = {
+        "Parameter",
+        "Parameter Option",
+        "This value determines which parameter is used for scaling of the point. The "
+        "parameter value will be used as a multiplicative factor to scale the size of "
+        "the points. Note that they may however still be scaled by max size adjustment "
+        "effects.",
+        openspace::properties::Property::Visibility::AdvancedUser
+    };
+
+    constexpr openspace::properties::Property::PropertyInfo ScaleFactorInfo = {
+        "ScaleFactor",
+        "Scale Factor",
+        "This value is a multiplicative factor that is applied to the data values that "
+        "are used to scale the points, when size mapping is applied.",
+        openspace::properties::Property::Visibility::AdvancedUser
+    };
+
+    struct [[codegen::Dictionary(SizeMappingComponent)]] Parameters {
+        // [[codegen::verbatim(EnabledInfo.description)]]
+        std::optional<bool> enabled;
+
+        // A list specifying all parameters that may be used for size mapping, i.e.
+        // scaling the points based on the provided data columns
+        std::optional<std::vector<std::string>> parameterOptions;
+
+        // [[codegen::verbatim(OptionInfo.description)]]
+        std::optional<std::string> parameter;
+
+        // [[codegen::verbatim(ScaleFactorInfo.description)]]
+        std::optional<float> scaleFactor;
+    };
+#include "sizemappingcomponent_codegen.cpp"
+}  // namespace
+
+namespace openspace {
+
+documentation::Documentation SizeMappingComponent::Documentation() {
+    return codegen::doc<Parameters>("base_sizemappingcomponent");
+}
+
+SizeMappingComponent::SizeMappingComponent()
+    : properties::PropertyOwner({ "SizeMapping", "Size Mapping", "" })
+    , enabled(EnabledInfo, true)
+    , parameterOption(
+        OptionInfo,
+        properties::OptionProperty::DisplayType::Dropdown
+    )
+    , scaleFactor(ScaleFactorInfo, 1.f, 0.f, 1000.f)
+{
+    addProperty(enabled);
+    addProperty(parameterOption);
+    addProperty(scaleFactor);
+}
+
+SizeMappingComponent::SizeMappingComponent(const ghoul::Dictionary& dictionary)
+    : SizeMappingComponent()
+{
+    const Parameters p = codegen::bake<Parameters>(dictionary);
+
+    enabled = p.enabled.value_or(enabled);
+
+    int indexOfProvidedOption = -1;
+
+    if (p.parameterOptions.has_value()) {
+        std::vector<std::string> opts = *p.parameterOptions;
+        for (size_t i = 0; i < opts.size(); ++i) {
+            // Note that options are added in order
+            parameterOption.addOption(static_cast<int>(i), opts[i]);
+
+            if (p.parameter.has_value() && *p.parameter == opts[i]) {
+                indexOfProvidedOption = i;
+            }
+        }
+    }
+
+    if (indexOfProvidedOption >= 0) {
+        parameterOption = indexOfProvidedOption;
+    }
+    else if (p.parameter.has_value()) {
+        LERROR(fmt::format(
+            "Error when reading Parameter. Could not find provided parameter '{}' in "
+            "list of parameter options. Using default.", *p.parameter
+        ));
+    }
+
+    scaleFactor = p.scaleFactor.value_or(scaleFactor);
+}
+
+} // namespace openspace
diff --git a/modules/base/rendering/pointcloud/sizemappingcomponent.h b/modules/base/rendering/pointcloud/sizemappingcomponent.h
new file mode 100644
index 0000000000..800436a09f
--- /dev/null
+++ b/modules/base/rendering/pointcloud/sizemappingcomponent.h
@@ -0,0 +1,56 @@
+/*****************************************************************************************
+ *                                                                                       *
+ * OpenSpace                                                                             *
+ *                                                                                       *
+ * Copyright (c) 2014-2024                                                               *
+ *                                                                                       *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
+ * software and associated documentation files (the "Software"), to deal in the Software *
+ * without restriction, including without limitation the rights to use, copy, modify,    *
+ * merge, publish, distribute, sublicense, and/or sell copies of the Software, and to    *
+ * permit persons to whom the Software is furnished to do so, subject to the following   *
+ * conditions:                                                                           *
+ *                                                                                       *
+ * The above copyright notice and this permission notice shall be included in all copies *
+ * or substantial portions of the Software.                                              *
+ *                                                                                       *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED,   *
+ * INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A         *
+ * PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT    *
+ * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF  *
+ * CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE  *
+ * OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                                         *
+ ****************************************************************************************/
+
+#ifndef __OPENSPACE_MODULE_BASE___SIZEMAPPINGCOMPONENT___H__
+#define __OPENSPACE_MODULE_BASE___SIZEMAPPINGCOMPONENT___H__
+
+#include <openspace/properties/propertyowner.h>
+
+#include <openspace/properties/optionproperty.h>
+#include <openspace/properties/scalar/boolproperty.h>
+#include <openspace/properties/scalar/floatproperty.h>
+
+namespace openspace {
+
+namespace documentation { struct Documentation; }
+
+/**
+ * This is a component that can be used to hold parameters and properties for scaling
+ * point cloud points (or other data-based entities) based a parameter in a dataset.
+ */
+struct SizeMappingComponent : public properties::PropertyOwner {
+    SizeMappingComponent();
+    explicit SizeMappingComponent(const ghoul::Dictionary& dictionary);
+    ~SizeMappingComponent() override = default;
+
+    static documentation::Documentation Documentation();
+
+    properties::BoolProperty enabled;
+    properties::OptionProperty parameterOption;
+    properties::FloatProperty scaleFactor;
+};
+
+} // namespace openspace
+
+#endif // __OPENSPACE_MODULE_BASE___SIZEMAPPINGCOMPONENT___H__
diff --git a/modules/base/shaders/pointcloud/billboardpoint_fs.glsl b/modules/base/shaders/pointcloud/billboardpoint_fs.glsl
index 629d1ff7a3..3e69bd8913 100644
--- a/modules/base/shaders/pointcloud/billboardpoint_fs.glsl
+++ b/modules/base/shaders/pointcloud/billboardpoint_fs.glsl
@@ -28,6 +28,7 @@ flat in float gs_colorParameter;
 flat in float vs_screenSpaceDepth;
 flat in vec4 vs_positionViewSpace;
 in vec2 texCoord;
+flat in int layer;
 
 uniform float opacity;
 uniform vec3 color;
@@ -42,7 +43,7 @@ uniform vec4 belowRangeColor;
 uniform bool useBelowRangeColor;
 
 uniform bool hasSpriteTexture;
-uniform sampler2D spriteTexture;
+uniform sampler2DArray spriteTexture;
 
 uniform bool useColorMap;
 uniform sampler1D colorMapTexture;
@@ -85,23 +86,19 @@ Fragment getFragment() {
 
   // Moving the origin to the center and calculating the length
   float lengthFromCenter = length((texCoord - vec2(0.5)) * 2.0);
-  if (!hasSpriteTexture) {
-    if (lengthFromCenter > 1.0) {
-      discard;
-    }
+  if (!hasSpriteTexture && (lengthFromCenter > 1.0)) {
+    discard;
   }
 
-  vec4 fullColor = vec4(1.0);
+  vec4 fullColor = glm::vec4(color, 1.0);
   if (useColorMap) {
     fullColor = sampleColorMap(gs_colorParameter);
   }
-  else {
-    fullColor.rgb = color;
-  }
 
   if (hasSpriteTexture) {
-    fullColor *= texture(spriteTexture, texCoord);
-  } else if (enableOutline && (lengthFromCenter > (1.0 - outlineWeight))) {
+    fullColor *= texture(spriteTexture, vec3(texCoord, layer));
+  }
+  else if (enableOutline && (lengthFromCenter > (1.0 - outlineWeight))) {
     fullColor.rgb = outlineColor;
   }
 
diff --git a/modules/base/shaders/pointcloud/billboardpoint_gs.glsl b/modules/base/shaders/pointcloud/billboardpoint_gs.glsl
index 87f9d5eca3..a3114b8dd9 100644
--- a/modules/base/shaders/pointcloud/billboardpoint_gs.glsl
+++ b/modules/base/shaders/pointcloud/billboardpoint_gs.glsl
@@ -27,12 +27,14 @@
 #include "PowerScaling/powerScalingMath.hglsl"
 
 layout(points) in;
+flat in float textureLayer[];
 flat in float colorParameter[];
 flat in float scalingParameter[];
 
 layout(triangle_strip, max_vertices = 4) out;
 flat out float gs_colorParameter;
 out vec2 texCoord;
+flat out int layer;
 flat out float vs_screenSpaceDepth;
 flat out vec4 vs_positionViewSpace;
 
@@ -45,6 +47,7 @@ uniform dmat4 projectionMatrix;
 uniform dmat4 modelMatrix;
 uniform bool enableMaxSizeControl;
 uniform bool hasDvarScaling;
+uniform float dvarScaleFactor;
 
 // RenderOption: CameraViewDirection
 uniform vec3 up;
@@ -58,6 +61,8 @@ uniform vec3 cameraLookUp;
 // The max size is an angle, in degrees, for the diameter
 uniform float maxAngularSize;
 
+uniform vec2 aspectRatioScale;
+
 const vec2 corners[4] = vec2[4](
   vec2(0.0, 0.0),
   vec2(1.0, 0.0),
@@ -70,13 +75,14 @@ const int RenderOptionCameraPositionNormal = 1;
 
 void main() {
   vec4 pos = gl_in[0].gl_Position;
+  layer = int(textureLayer[0]);
   gs_colorParameter = colorParameter[0];
 
   dvec4 dpos = modelMatrix * dvec4(dvec3(pos.xyz), 1.0);
 
   float scaleMultiply = pow(10.0, scaleExponent);
   if (hasDvarScaling) {
-    scaleMultiply *= scalingParameter[0];
+    scaleMultiply *= scalingParameter[0] * dvarScaleFactor;
   }
 
   vec3 scaledRight = vec3(0.0);
@@ -116,9 +122,9 @@ void main() {
   dmat4 cameraViewProjectionMatrix = projectionMatrix * cameraViewMatrix;
 
   vec4 dposClip = vec4(cameraViewProjectionMatrix * dpos);
-  vec4 scaledRightClip = scaleFactor *
+  vec4 scaledRightClip = scaleFactor * aspectRatioScale.x *
     vec4(cameraViewProjectionMatrix * dvec4(scaledRight, 0.0));
-  vec4 scaledUpClip = scaleFactor *
+  vec4 scaledUpClip = scaleFactor * aspectRatioScale.y *
     vec4(cameraViewProjectionMatrix * dvec4(scaledUp, 0.0));
 
   vec4 dposViewSpace= vec4(cameraViewMatrix * dpos);
diff --git a/modules/base/shaders/pointcloud/billboardpoint_interpolated_vs.glsl b/modules/base/shaders/pointcloud/billboardpoint_interpolated_vs.glsl
index 88b558620a..a6a3407f2e 100644
--- a/modules/base/shaders/pointcloud/billboardpoint_interpolated_vs.glsl
+++ b/modules/base/shaders/pointcloud/billboardpoint_interpolated_vs.glsl
@@ -38,9 +38,12 @@ in float in_colorParameter1;
 in float in_scalingParameter0;
 in float in_scalingParameter1;
 
+in float in_textureLayer;
+
 uniform bool useSpline;
 uniform float interpolationValue;
 
+flat out float textureLayer;
 flat out float colorParameter;
 flat out float scalingParameter;
 
@@ -87,5 +90,7 @@ void main() {
     );
   }
 
+  textureLayer = in_textureLayer;
+
   gl_Position = vec4(position, 1.0);
 }
diff --git a/modules/base/shaders/pointcloud/billboardpoint_vs.glsl b/modules/base/shaders/pointcloud/billboardpoint_vs.glsl
index 476a994e11..2a1e661ba5 100644
--- a/modules/base/shaders/pointcloud/billboardpoint_vs.glsl
+++ b/modules/base/shaders/pointcloud/billboardpoint_vs.glsl
@@ -27,13 +27,16 @@
 #include "PowerScaling/powerScaling_vs.hglsl"
 
 in vec3 in_position;
+in float in_textureLayer;
 in float in_colorParameter;
 in float in_scalingParameter;
 
+flat out float textureLayer;
 flat out float colorParameter;
 flat out float scalingParameter;
 
 void main() {
+  textureLayer = in_textureLayer;
   colorParameter = in_colorParameter;
   scalingParameter = in_scalingParameter;
   gl_Position = vec4(in_position, 1.0);
diff --git a/modules/base/shaders/polygon_fs.glsl b/modules/base/shaders/polygon_fs.glsl
index 495bdc6232..7f44e3fd7d 100644
--- a/modules/base/shaders/polygon_fs.glsl
+++ b/modules/base/shaders/polygon_fs.glsl
@@ -26,9 +26,6 @@
 
 out vec4 finalColor;
 
-uniform vec3 polygonColor;
-
-
 void main() {
-  finalColor = vec4(polygonColor, 1.0);
+  finalColor = vec4(1.0);
 }
diff --git a/src/data/csvloader.cpp b/src/data/csvloader.cpp
index b9ad97c06e..7ab566f015 100644
--- a/src/data/csvloader.cpp
+++ b/src/data/csvloader.cpp
@@ -33,11 +33,13 @@
 #include <ghoul/logging/logmanager.h>
 #include <ghoul/misc/assert.h>
 #include <ghoul/misc/exception.h>
+#include <ghoul/misc/stringhelper.h>
 #include <algorithm>
 #include <cmath>
 #include <cctype>
 #include <fstream>
 #include <functional>
+#include <sstream>
 #include <string_view>
 
 namespace {
@@ -94,6 +96,7 @@ Dataset loadCsvFile(std::filesystem::path filePath, std::optional<DataMapping> s
     int yColumn = -1;
     int zColumn = -1;
     int nameColumn = -1;
+    int textureColumn = -1;
 
     int nDataColumns = 0;
     const bool hasExcludeColumns = specs.has_value() && specs->hasExcludeColumns();
@@ -119,11 +122,17 @@ Dataset loadCsvFile(std::filesystem::path filePath, std::optional<DataMapping> s
         else if (isNameColumn(col, specs)) {
             nameColumn = static_cast<int>(i);
         }
-        else if (hasExcludeColumns && (*specs).isExcludeColumn(col)) {
+        else if (hasExcludeColumns && specs->isExcludeColumn(col)) {
             skipColumns.push_back(i);
             continue;
         }
         else {
+            // Note that the texture column is also a regular column. Just save the index
+            if (isTextureColumn(col, specs)) {
+                res.textureDataIndex = nDataColumns;
+                textureColumn = static_cast<int>(i);
+            }
+
             res.variables.push_back({
                 .index = nDataColumns,
                 .name = col
@@ -132,6 +141,33 @@ Dataset loadCsvFile(std::filesystem::path filePath, std::optional<DataMapping> s
         }
     }
 
+    // Some errors / warnings
+    if (specs.has_value()) {
+        bool hasAllProvided = specs->checkIfAllProvidedColumnsExist(columns);
+        if (!hasAllProvided) {
+            LERROR(fmt::format(
+                "Error loading data file {}. Not all columns provided in data mapping "
+                "exists in dataset", filePath
+            ));
+        }
+    }
+
+    bool hasProvidedTextureFile = specs.has_value() && specs->textureMap.has_value();
+    bool hasTextureIndex = (res.textureDataIndex >= 0);
+
+    if (hasProvidedTextureFile && !hasTextureIndex && !specs->textureColumn.has_value()) {
+        throw ghoul::RuntimeError(fmt::format(
+            "Error loading data file {}. No texture column was specified in the data "
+            "mapping", filePath
+        ));
+    }
+    if (!hasProvidedTextureFile && hasTextureIndex) {
+        throw ghoul::RuntimeError(fmt::format(
+            "Error loading data file {}. Missing texture map file location in data "
+            "mapping", filePath
+        ));
+    }
+
     if (xColumn < 0 || yColumn < 0 || zColumn < 0) {
         // One or more position columns weren't read
         LERROR(fmt::format(
@@ -142,6 +178,8 @@ Dataset loadCsvFile(std::filesystem::path filePath, std::optional<DataMapping> s
     LINFO(fmt::format("Loading {} rows with {} columns", rows.size(), columns.size()));
     ProgressBar progress = ProgressBar(static_cast<int>(rows.size()));
 
+    std::set<int> uniqueTextureIndicesInData;
+
     // Skip first row (column names)
     for (size_t rowIdx = 1; rowIdx < rows.size(); ++rowIdx) {
         const std::vector<std::string>& row = rows[rowIdx];
@@ -180,6 +218,10 @@ Dataset loadCsvFile(std::filesystem::path filePath, std::optional<DataMapping> s
             else {
                 entry.data.push_back(value);
             }
+
+            if (i == textureColumn) {
+                uniqueTextureIndicesInData.emplace(static_cast<int>(value));
+            }
         }
 
         const glm::vec3 positive = glm::abs(entry.position);
@@ -193,6 +235,82 @@ Dataset loadCsvFile(std::filesystem::path filePath, std::optional<DataMapping> s
         progress.print(static_cast<int>(rowIdx + 1));
     }
 
+    // Load the textures. Skip textures that are not included in the dataset
+    if (hasProvidedTextureFile) {
+        const std::filesystem::path path = *specs->textureMap;
+        if (!std::filesystem::is_regular_file(path)) {
+            throw ghoul::RuntimeError(fmt::format(
+                "Failed to open texture map file {}", path
+            ));
+        }
+        res.textures = loadTextureMapFile(path, uniqueTextureIndicesInData);
+    }
+
+    return res;
+}
+
+std::vector<Dataset::Texture> loadTextureMapFile(std::filesystem::path path,
+                                          const std::set<int>& texturesInData)
+{
+    ghoul_assert(std::filesystem::exists(path), "File must exist");
+
+    std::ifstream file(path);
+    if (!file.good()) {
+        throw ghoul::RuntimeError(fmt::format(
+            "Failed to open texture map file {}", path
+        ));
+    }
+
+    int currentLineNumber = 0;
+
+    std::vector<Dataset::Texture> res;
+
+    std::string line;
+    while (std::getline(file, line)) {
+        ghoul::trimWhitespace(line);
+        currentLineNumber++;
+
+        if (line.empty() || line.starts_with("#")) {
+            continue;
+        }
+
+        std::vector<std::string> tokens = ghoul::tokenizeString(line, ' ');
+        int nNonEmptyTokens = static_cast<int>(std::count_if(
+            tokens.begin(),
+            tokens.end(),
+            [](const std::string& t) { return !t.empty(); }
+        ));
+
+        if (nNonEmptyTokens > 2) {
+            throw ghoul::RuntimeError(fmt::format(
+                "Error loading texture map file {}: Line {} has too many parameters. "
+                "Expected 2: an integer index followed by a filename, where the file "
+                "name may not include whitespaces",
+                path, currentLineNumber
+            ));
+        }
+
+        std::stringstream str(line);
+
+        // Each line is following the template:
+        // <idx> <file name>
+        Dataset::Texture texture;
+        str >> texture.index >> texture.file;
+
+        for (const Dataset::Texture& t : res) {
+            if (t.index == texture.index) {
+                throw ghoul::RuntimeError(fmt::format(
+                    "Error loading texture map file {}: Texture index '{}' defined twice",
+                    path, texture.index
+                ));
+            }
+        }
+
+        if (texturesInData.contains(texture.index)) {
+            res.push_back(texture);
+        }
+    }
+
     return res;
 }
 
diff --git a/src/data/datamapping.cpp b/src/data/datamapping.cpp
index 3b8f24cd8a..0d14002a2e 100644
--- a/src/data/datamapping.cpp
+++ b/src/data/datamapping.cpp
@@ -31,6 +31,8 @@
 #include <string_view>
 
 namespace {
+    constexpr std::string_view _loggerCat = "RenderablePolygonCloud";
+
     constexpr std::string_view DefaultX = "x";
     constexpr std::string_view DefaultY = "y";
     constexpr std::string_view DefaultZ = "z";
@@ -48,19 +50,19 @@ namespace {
         if (mapping.has_value()) {
             switch (columnCase) {
                 case PositionColumn::X:
-                    column = (*mapping).xColumnName.value_or(column);
+                    column = mapping->xColumnName.value_or(column);
                     break;
                 case PositionColumn::Y:
-                    column = (*mapping).yColumnName.value_or(column);
+                    column = mapping->yColumnName.value_or(column);
                     break;
                 case PositionColumn::Z:
-                    column = (*mapping).zColumnName.value_or(column);
+                    column = mapping->zColumnName.value_or(column);
                     break;
             }
         }
 
         // Per default, allow both lower case and upper case versions of column names
-        if (!mapping.has_value() || !(*mapping).isCaseSensitive) {
+        if (!mapping.has_value() || !mapping->isCaseSensitive) {
             column = ghoul::toLowerCase(column);
             testColumn = ghoul::toLowerCase(testColumn);
         }
@@ -68,6 +70,27 @@ namespace {
         return testColumn == column;
     }
 
+    bool isSameStringColumn(const std::string& left, const std::string& right,
+                            bool isCaseSensitive)
+    {
+        std::string l = isCaseSensitive ? ghoul::toLowerCase(left) : left;
+        std::string r = isCaseSensitive ? ghoul::toLowerCase(right) : right;
+        return (l == r);
+    }
+
+    bool containsColumn(const std::string& c, const std::vector<std::string>& columns,
+                        bool isCaseSensitive)
+    {
+        auto it = std::find_if(
+            columns.begin(),
+            columns.end(),
+            [&c, &isCaseSensitive](const std::string& col) {
+                return isSameStringColumn(c, col, isCaseSensitive);
+            }
+        );
+        return it != columns.end();
+    }
+
     // This is a data mapping structure that can be used when creating point cloud
     // datasets, e.g. from a CSV or Speck file.
     //
@@ -92,6 +115,18 @@ namespace {
         // files, where the name is given by the comment at the end of each line
         std::optional<std::string> name;
 
+        // Specifies a column name for a column that has the data for which texture to
+        // use for each point (given as an integer index). If included, a texture map
+        // file need to be included as well
+        std::optional<std::string> textureColumn;
+
+        // A file where each line contains an integer index and an image file name.
+        // Not valid for SPECK files, which includes this information as part of its
+        // data format. This map will be used to map the data in the TextureColumn to
+        // an image file to use for rendering the points. Note that only the files with
+        // indices that are used in the dataset will actually be loaded
+        std::optional<std::filesystem::path> textureMapFile;
+
         // Specifies whether to do case sensitive checks when reading column names.
         // Default is not to, so that 'X' and 'x' are both valid column names for the
         // x position column, for example
@@ -124,6 +159,8 @@ DataMapping DataMapping::createFromDictionary(const ghoul::Dictionary& dictionar
     result.yColumnName = p.y;
     result.zColumnName = p.z;
     result.nameColumn = p.name;
+    result.textureColumn = p.textureColumn;
+    result.textureMap = p.textureMapFile;
 
     result.missingDataValue = p.missingDataValue;
 
@@ -142,6 +179,28 @@ bool DataMapping::isExcludeColumn(std::string_view column) const {
     return (found != excludeColumns.end());
 }
 
+bool DataMapping::checkIfAllProvidedColumnsExist(
+                                            const std::vector<std::string>& columns) const
+{
+    auto checkColumnIsOk = [this, &columns](std::optional<std::string> col,
+                                            std::string_view key)
+    {
+        if (col.has_value() && !containsColumn(*col, columns, isCaseSensitive)) {
+            LWARNING(fmt::format("Could not find provided {} column: '{}'", key, *col));
+            return false;
+        }
+        return true;
+    };
+
+    bool hasAll = true;
+    hasAll &= checkColumnIsOk(xColumnName, "X");
+    hasAll &= checkColumnIsOk(yColumnName, "Y");
+    hasAll &= checkColumnIsOk(zColumnName, "Z");
+    hasAll &= checkColumnIsOk(nameColumn, "Name");
+    hasAll &= checkColumnIsOk(textureColumn, "Texture");
+    return hasAll;
+}
+
 std::string generateHashString(const DataMapping& dm) {
     std::string a;
     for (const std::string_view c : dm.excludeColumns) {
@@ -150,13 +209,14 @@ std::string generateHashString(const DataMapping& dm) {
     unsigned int excludeColumnsHash = ghoul::hashCRC32(a);
 
     return fmt::format(
-        "DM|x{}|y{}|z{}|name{}|m{}|{}|{}",
+        "DM|{}|{}|{}|{}|{}|{}|{}|{}",
         dm.xColumnName.value_or(""),
         dm.yColumnName.value_or(""),
         dm.zColumnName.value_or(""),
         dm.nameColumn.value_or(""),
+        dm.textureColumn.value_or(""),
         dm.missingDataValue.has_value() ? ghoul::to_string(*dm.missingDataValue) : "",
-        dm.isCaseSensitive ? "1" : "0",
+        dm.isCaseSensitive ? 1 : 0,
         excludeColumnsHash
     );
 }
@@ -181,14 +241,14 @@ bool isNameColumn(const std::string& c, const std::optional<DataMapping>& mappin
     if (!mapping.has_value() || !mapping->nameColumn.has_value()) {
         return false;
     }
+    return isSameStringColumn(c, *mapping->nameColumn, mapping->isCaseSensitive);
+}
 
-    std::string testColumn = c;
-    std::string mappedColumn = *mapping->nameColumn;
-    if (!mapping->isCaseSensitive) {
-        testColumn = ghoul::toLowerCase(testColumn);
-        mappedColumn = ghoul::toLowerCase(mappedColumn);
+bool isTextureColumn(const std::string& c, const std::optional<DataMapping>& mapping) {
+    if (!mapping.has_value() || !mapping->textureColumn.has_value()) {
+        return false;
     }
-    return testColumn == mappedColumn;
+    return isSameStringColumn(c, *mapping->textureColumn, mapping->isCaseSensitive);
 }
 
 } // namespace openspace::dataloader
diff --git a/src/data/speckloader.cpp b/src/data/speckloader.cpp
index 3b192c0973..9dc2e3e6db 100644
--- a/src/data/speckloader.cpp
+++ b/src/data/speckloader.cpp
@@ -176,12 +176,27 @@ Dataset loadSpeckFile(std::filesystem::path path, std::optional<DataMapping> spe
             // 2:   texture 1 M1.sgi
             // The parameter in #1 is currently being ignored
 
+            std::vector<std::string> tokens = ghoul::tokenizeString(line, ' ');
+            int nNonEmptyTokens = static_cast<int>(std::count_if(
+                tokens.begin(),
+                tokens.end(),
+                [](const std::string& t) { return !t.empty(); }
+            ));
+
+            if (nNonEmptyTokens > 4) {
+                throw ghoul::RuntimeError(fmt::format(
+                    "Error loading speck file {}: Too many arguments for texture on line {}",
+                    path, currentLineNumber
+                ));
+            }
+
+            bool hasExtraParameter = nNonEmptyTokens > 3;
+
             std::stringstream str(line);
 
             std::string dummy;
             str >> dummy;
-
-            if (line.find('-') != std::string::npos) {
+            if (hasExtraParameter) {
                 str >> dummy;
             }
 

From 3b2759721369dd92756aca2af7a779c510e9f721 Mon Sep 17 00:00:00 2001
From: Emma Broman <emma.broman@liu.se>
Date: Tue, 19 Mar 2024 14:08:37 +0100
Subject: [PATCH 318/701] Fix "invert" for color mapping not being read from
 asset file

---
 src/rendering/colormappingcomponent.cpp | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/rendering/colormappingcomponent.cpp b/src/rendering/colormappingcomponent.cpp
index 44abbbdd1f..a6dd578abe 100644
--- a/src/rendering/colormappingcomponent.cpp
+++ b/src/rendering/colormappingcomponent.cpp
@@ -321,6 +321,8 @@ ColorMappingComponent::ColorMappingComponent(const ghoul::Dictionary& dictionary
     if (p.file.has_value()) {
         colorMapFile = absPath(*p.file).string();
     }
+
+    invert = p.invert.value_or(invert);
 }
 
 ghoul::opengl::Texture* ColorMappingComponent::texture() const {

From e0ab7ae1d6f51364adad93931f4cf0d3b4143081 Mon Sep 17 00:00:00 2001
From: Alexander Bock <alexander.bock@liu.se>
Date: Tue, 19 Mar 2024 14:49:44 +0100
Subject: [PATCH 319/701] Coding style fixes

---
 ext/ghoul                                                  | 2 +-
 include/openspace/interaction/sessionrecording.h           | 3 ++-
 include/openspace/rendering/colormappingcomponent.h        | 6 +++---
 .../rendering/pointcloud/renderableinterpolatedpoints.cpp  | 7 ++++---
 modules/exoplanets/exoplanetsmodule_lua.inl                | 3 ++-
 modules/space/rendering/renderablestars.cpp                | 4 +++-
 src/engine/configuration.cpp                               | 5 ++++-
 src/util/spicemanager.cpp                                  | 2 +-
 8 files changed, 20 insertions(+), 12 deletions(-)

diff --git a/ext/ghoul b/ext/ghoul
index fffdcec63a..638b32ed52 160000
--- a/ext/ghoul
+++ b/ext/ghoul
@@ -1 +1 @@
-Subproject commit fffdcec63a4e47678f7286c8e2d787f843f8d1ba
+Subproject commit 638b32ed52bf100c2b029425d5a40462270bd18b
diff --git a/include/openspace/interaction/sessionrecording.h b/include/openspace/interaction/sessionrecording.h
index 988f4b1a73..1adfbce109 100644
--- a/include/openspace/interaction/sessionrecording.h
+++ b/include/openspace/interaction/sessionrecording.h
@@ -590,7 +590,8 @@ public:
      *
      * \return pathname of the converted version of the file
      */
-    std::string determineConversionOutFilename(const std::string& filename, DataMode mode);
+    std::string determineConversionOutFilename(const std::string& filename,
+        DataMode mode);
 
 protected:
     properties::BoolProperty _renderPlaybackInformation;
diff --git a/include/openspace/rendering/colormappingcomponent.h b/include/openspace/rendering/colormappingcomponent.h
index c67dfd107d..fb7881819e 100644
--- a/include/openspace/rendering/colormappingcomponent.h
+++ b/include/openspace/rendering/colormappingcomponent.h
@@ -22,8 +22,8 @@
  * OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                                         *
  ****************************************************************************************/
 
-#ifndef __OPENSPACE_CORE___COLORMAPCOMPONENT___H__
-#define __OPENSPACE_CORE___COLORMAPCOMPONENT___H__
+#ifndef __OPENSPACE_CORE___COLORMAPPINGCOMPONENT___H__
+#define __OPENSPACE_CORE___COLORMAPPINGCOMPONENT___H__
 
 #include <openspace/properties/propertyowner.h>
 
@@ -120,4 +120,4 @@ private:
 
 } // namespace openspace
 
-#endif // __OPENSPACE_CORE___COLORMAPCOMPONENT___H__
+#endif // __OPENSPACE_CORE___COLORMAPPINGCOMPONENT___H__
diff --git a/modules/base/rendering/pointcloud/renderableinterpolatedpoints.cpp b/modules/base/rendering/pointcloud/renderableinterpolatedpoints.cpp
index e11dc65d5a..e7ed5c5d39 100644
--- a/modules/base/rendering/pointcloud/renderableinterpolatedpoints.cpp
+++ b/modules/base/rendering/pointcloud/renderableinterpolatedpoints.cpp
@@ -310,11 +310,12 @@ void RenderableInterpolatedPoints::initializeShadersAndGlExtras() {
     _program = BaseModule::ProgramObjectManager.request(
         "RenderablePointCloud_Interpolated",
         []() {
+            std::filesystem::path path = absPath("${MODULE_BASE}/shaders/pointcloud/");
             return global::renderEngine->buildRenderProgram(
                 "RenderablePointCloud_Interpolated",
-                absPath("${MODULE_BASE}/shaders/pointcloud/billboardpoint_interpolated_vs.glsl"),
-                absPath("${MODULE_BASE}/shaders/pointcloud/billboardpoint_fs.glsl"),
-                absPath("${MODULE_BASE}/shaders/pointcloud/billboardpoint_gs.glsl")
+                path / "billboardpoint_interpolated_vs.glsl",
+                path / "billboardpoint_fs.glsl",
+                path / "billboardpoint_gs.glsl"
             );
         }
     );
diff --git a/modules/exoplanets/exoplanetsmodule_lua.inl b/modules/exoplanets/exoplanetsmodule_lua.inl
index 5ea8a5874e..091c790076 100644
--- a/modules/exoplanets/exoplanetsmodule_lua.inl
+++ b/modules/exoplanets/exoplanetsmodule_lua.inl
@@ -707,7 +707,8 @@ listOfExoplanetsDeprecated()
  *
  * We recommend downloading the file from the Exoplanet Archive's Composite data table,
  * where multiple sources are combined into one row per planet.
- * https://exoplanetarchive.ipac.caltech.edu/cgi-bin/TblView/nph-tblView?app=ExoTbls&config=PSCompPars
+ * https://exoplanetarchive.ipac.caltech.edu
+ * /cgi-bin/TblView/nph-tblView?app=ExoTbls&config=PSCompPars
  *
  * Please remember to include all columns in the file download, as missing data columns
  * may lead to an incomplete visualization.
diff --git a/modules/space/rendering/renderablestars.cpp b/modules/space/rendering/renderablestars.cpp
index 39eca50620..2c1d202be4 100644
--- a/modules/space/rendering/renderablestars.cpp
+++ b/modules/space/rendering/renderablestars.cpp
@@ -1073,7 +1073,9 @@ void RenderableStars::render(const RenderData& data, RendererTasks&) {
 
     float fadeInVariable = 1.f;
     if (!_disableFadeInDistance) {
-        const float distCamera = static_cast<float>(glm::length(data.camera.positionVec3()));
+        const float distCamera = static_cast<float>(
+            glm::length(data.camera.positionVec3())
+        );
         const glm::vec2 fadeRange = _fadeInDistances;
         const double a = 1.f / ((fadeRange.y - fadeRange.x) * PARSEC);
         const double b = -(fadeRange.x / (fadeRange.y - fadeRange.x));
diff --git a/src/engine/configuration.cpp b/src/engine/configuration.cpp
index 1dc0d6fcd0..9eb8c9d0a4 100644
--- a/src/engine/configuration.cpp
+++ b/src/engine/configuration.cpp
@@ -387,7 +387,10 @@ ghoul::Dictionary Configuration::createDictionary() {
     {
         ghoul::Dictionary loadingScreenDict;
         loadingScreenDict.setValue("IsShowingMessages", loadingScreen.isShowingMessages);
-        loadingScreenDict.setValue("IsShowingNodeNames", loadingScreen.isShowingNodeNames);
+        loadingScreenDict.setValue(
+            "IsShowingNodeNames",
+            loadingScreen.isShowingNodeNames
+        );
         loadingScreenDict.setValue(
             "IsShowingLogMessages",
             loadingScreen.isShowingLogMessages
diff --git a/src/util/spicemanager.cpp b/src/util/spicemanager.cpp
index 6830a8a55f..03059610b0 100644
--- a/src/util/spicemanager.cpp
+++ b/src/util/spicemanager.cpp
@@ -1549,7 +1549,7 @@ KPL/PCK
       this kernel to produce Type 10 SPK segments based upon the Two-Line
       element sets available from NORAD/SPACETRACK. The data applies ONLY
       to the Two-Line Element sets and only to the SGP4 implementations
-      included in the SPICE library [1][2]. The SPK application copies 
+      included in the SPICE library [1][2]. The SPK application copies
       this data to the constants partition of the Type 10 segment, so the
       user has no need for the kernel after creation of the corresponding
       SPK.

From 99ae87bd034c9413fa29be6429a256a14fca3f06 Mon Sep 17 00:00:00 2001
From: Emma Broman <emma.broman@liu.se>
Date: Wed, 20 Mar 2024 11:38:34 +0100
Subject: [PATCH 320/701] Remove comment about faulty color mapping that is no
 longer an issue (#2983)

---
 data/assets/scene/digitaluniverse/localdwarfs.asset | 9 ++-------
 1 file changed, 2 insertions(+), 7 deletions(-)

diff --git a/data/assets/scene/digitaluniverse/localdwarfs.asset b/data/assets/scene/digitaluniverse/localdwarfs.asset
index b09da57150..a9a9022bd6 100644
--- a/data/assets/scene/digitaluniverse/localdwarfs.asset
+++ b/data/assets/scene/digitaluniverse/localdwarfs.asset
@@ -18,6 +18,8 @@ local Object = {
   Renderable = {
     Type = "RenderablePolygonCloud",
     Enabled = false,
+    Opacity = 0.3,
+    File = speck .. "localgroup.speck",
     Labels = {
       File = speck .. "localgroup.label",
       Color = { 0.3, 0.3, 1.0 },
@@ -27,11 +29,6 @@ local Object = {
     },
     Coloring = {
       FixedColor = { 0.0, 1.0, 0.0 },
-      -- @TODO: This one wasn't actually properly used before the point cloud update.
-      -- All points were mapped to green. Decide if we want it around.
-      -- @TODO: Also, the cmap is currently not applied correctly, due to speck file
-      -- not being read properly (it inlcudes more information than just datavar-s).
-      -- This should be adressed. (2023-12-13, emmbr)
       ColorMapping = {
         File = speck .. "localgroup.cmap",
         ParameterOptions = {
@@ -39,8 +36,6 @@ local Object = {
         }
       }
     },
-    Opacity = 0.3,
-    File = speck .. "localgroup.speck",
     PolygonSides = 12,
     Unit = "Mpc",
     SizeSettings = {

From ffe0babab52bbf27fcba01a05e6c02bbfb7bd6a4 Mon Sep 17 00:00:00 2001
From: Alexander Bock <alexander.bock@liu.se>
Date: Wed, 20 Mar 2024 13:56:23 +0100
Subject: [PATCH 321/701] Remove accidentally added dependency

---
 modules/sound/ext/soloud | 1 -
 1 file changed, 1 deletion(-)
 delete mode 160000 modules/sound/ext/soloud

diff --git a/modules/sound/ext/soloud b/modules/sound/ext/soloud
deleted file mode 160000
index 1157475881..0000000000
--- a/modules/sound/ext/soloud
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 1157475881da0d7f76102578255b937c7d4e8f57

From 397769919df85fe81f2ecd0e048bff30ace59ff8 Mon Sep 17 00:00:00 2001
From: Alexander Bock <alexander.bock@liu.se>
Date: Wed, 20 Mar 2024 17:19:50 +0100
Subject: [PATCH 322/701] Update the UI hash to make the webui work again

---
 data/assets/util/webgui.asset | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/data/assets/util/webgui.asset b/data/assets/util/webgui.asset
index eb5ae44c16..e45b8665d5 100644
--- a/data/assets/util/webgui.asset
+++ b/data/assets/util/webgui.asset
@@ -4,7 +4,7 @@ local guiCustomization = asset.require("customization/gui")
 
 
 -- Select which commit hashes to use for the frontend and backend
-local frontendHash = "95683e59c7fa1891e7db7b83e4eeea15f9da11f1"
+local frontendHash = "65c0238b8ba931b958cf3cada2ab226c8f1c9880"
 
 local frontend = asset.resource({
   Identifier = "WebGuiFrontend",

From 05231c705f45a35963caf973944b4ed6c4e11f06 Mon Sep 17 00:00:00 2001
From: GPayne <payne.gene@gmail.com>
Date: Wed, 20 Mar 2024 21:02:08 -0600
Subject: [PATCH 323/701] Code review changes

---
 .../ext/launcher/src/profile/additionalscriptsdialog.cpp   | 2 +-
 src/interaction/sessionrecording.cpp                       | 7 +++----
 support/coding/check_style_guide.py                        | 2 +-
 3 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/apps/OpenSpace/ext/launcher/src/profile/additionalscriptsdialog.cpp b/apps/OpenSpace/ext/launcher/src/profile/additionalscriptsdialog.cpp
index 6686846304..b871b33aa1 100644
--- a/apps/OpenSpace/ext/launcher/src/profile/additionalscriptsdialog.cpp
+++ b/apps/OpenSpace/ext/launcher/src/profile/additionalscriptsdialog.cpp
@@ -26,8 +26,8 @@
 
 #include "profile/line.h"
 #include "profile/scriptlogdialog.h"
-#include <ghoul/misc/stringhelper.h>
 #include <openspace/scene/profile.h>
+#include <ghoul/misc/stringhelper.h>
 #include <QDialogButtonBox>
 #include <QHBoxLayout>
 #include <QLabel>
diff --git a/src/interaction/sessionrecording.cpp b/src/interaction/sessionrecording.cpp
index 2e480e936e..addc8efbcc 100644
--- a/src/interaction/sessionrecording.cpp
+++ b/src/interaction/sessionrecording.cpp
@@ -412,8 +412,8 @@ bool SessionRecording::startPlayback(std::string& filename,
     }
     // throwaway newline character(s)
     std::string lineEnd = readHeaderElement(_playbackFile, 1);
-    bool isDosLineEnding = (lineEnd == "\r");
-    if (isDosLineEnding) {
+    bool hasDosLineEnding = (lineEnd == "\r");
+    if (hasDosLineEnding) {
         // throwaway the second newline character (\n) also
         readHeaderElement(_playbackFile, 1);
     }
@@ -424,8 +424,7 @@ bool SessionRecording::startPlayback(std::string& filename,
         _playbackFile.close();
         _playbackFile.open(_playbackFilename, std::ifstream::in | std::ios::binary);
         size_t headerSize = FileHeaderTitle.length() + FileHeaderVersionLength
-            + sizeof(DataFormatBinaryTag) + sizeof('\n')
-            + ((isDosLineEnding) ? sizeof('\r') : 0);
+            + sizeof(DataFormatBinaryTag) + sizeof('\n');
         std::vector<char> hBuffer;
         hBuffer.resize(headerSize);
         _playbackFile.read(hBuffer.data(), headerSize);
diff --git a/support/coding/check_style_guide.py b/support/coding/check_style_guide.py
index 4e2b04148b..f06c90d108 100644
--- a/support/coding/check_style_guide.py
+++ b/support/coding/check_style_guide.py
@@ -348,7 +348,7 @@ def check_for_std_getline(lines):
   index = [i for i,s in enumerate(lines)
           if 'std::getline' in s]
   if len(index) > 0:
-    return 'File used wrong glm include. Use "#include <ghoul/glm.h>" instead'
+    return 'File used wrong std::getline function. Use ghoul::getline from "ghoul/misc/stringhelper.h" instead'
   else:
     return ''
 

From d2f5dd43a556aae44a5c74a7db673429140a69d3 Mon Sep 17 00:00:00 2001
From: Emma Broman <emma.broman@liu.se>
Date: Thu, 21 Mar 2024 20:48:57 +0100
Subject: [PATCH 324/701] Include timestamp in navigation state (#3078)

* Add optional timestamp to navigation state

* add option to include timetamp when setting/loading navigation state

* Don't require file extension when loading navstate

for symmetry with save function

* Update Navstate docs

* Apply suggestions from code review

Co-authored-by: Alexander Bock <alexander.bock@liu.se>

---------

Co-authored-by: Alexander Bock <alexander.bock@liu.se>
---
 .../openspace/navigation/navigationhandler.h  |  2 +-
 .../openspace/navigation/navigationstate.h    |  5 +-
 src/navigation/navigationhandler.cpp          | 32 ++++++++--
 src/navigation/navigationhandler_lua.inl      | 30 +++++++---
 src/navigation/navigationstate.cpp            | 60 ++++++++++++++++---
 5 files changed, 106 insertions(+), 23 deletions(-)

diff --git a/include/openspace/navigation/navigationhandler.h b/include/openspace/navigation/navigationhandler.h
index f0818d268e..3069ec0b1c 100644
--- a/include/openspace/navigation/navigationhandler.h
+++ b/include/openspace/navigation/navigationhandler.h
@@ -145,7 +145,7 @@ public:
     void saveNavigationState(const std::filesystem::path& filepath,
         const std::string& referenceFrameIdentifier) const;
 
-    void loadNavigationState(const std::string& filepath);
+    void loadNavigationState(const std::string& filepath, bool useTimeStamp);
 
     /**
      * Set camera state from a provided navigation state next frame. The actual position
diff --git a/include/openspace/navigation/navigationstate.h b/include/openspace/navigation/navigationstate.h
index 864e014d0a..cc4dc376a3 100644
--- a/include/openspace/navigation/navigationstate.h
+++ b/include/openspace/navigation/navigationstate.h
@@ -41,7 +41,8 @@ struct NavigationState {
     explicit NavigationState(const nlohmann::json& json);
     NavigationState(std::string anchor, std::string aim, std::string referenceFrame,
         glm::dvec3 position, std::optional<glm::dvec3> up = std::nullopt,
-        double yaw = 0.0, double pitch = 0.0);
+        double yaw = 0.0, double pitch = 0.0,
+        std::optional<double> timestamp = std::nullopt);
 
     CameraPose cameraPose() const;
     ghoul::Dictionary dictionary() const;
@@ -55,6 +56,8 @@ struct NavigationState {
     std::optional<glm::dvec3> up;
     double yaw = 0.0;
     double pitch = 0.0;
+
+    std::optional<double> timestamp;
 };
 
 } // namespace openspace::interaction
diff --git a/src/navigation/navigationhandler.cpp b/src/navigation/navigationhandler.cpp
index e53b6bc487..1312877b70 100644
--- a/src/navigation/navigationhandler.cpp
+++ b/src/navigation/navigationhandler.cpp
@@ -35,12 +35,13 @@
 #include <openspace/navigation/navigationstate.h>
 #include <openspace/navigation/waypoint.h>
 #include <openspace/network/parallelpeer.h>
+#include <openspace/query/query.h>
 #include <openspace/scene/profile.h>
 #include <openspace/scene/scene.h>
 #include <openspace/scene/scenegraphnode.h>
 #include <openspace/scripting/lualibrary.h>
 #include <openspace/scripting/scriptengine.h>
-#include <openspace/query/query.h>
+#include <openspace/util/timemanager.h>
 #include <ghoul/filesystem/file.h>
 #include <ghoul/filesystem/filesystem.h>
 #include <ghoul/logging/logmanager.h>
@@ -531,7 +532,10 @@ NavigationState NavigationHandler::navigationState(
         _orbitalNavigator.aimNode() ? _orbitalNavigator.aimNode()->identifier() : "",
         referenceFrame.identifier(),
         position,
-        invReferenceFrameTransform * neutralUp, yaw, pitch
+        invReferenceFrameTransform * neutralUp,
+        yaw,
+        pitch,
+        global::timeManager->time().j2000Seconds()
     );
 }
 
@@ -574,23 +578,41 @@ void NavigationHandler::saveNavigationState(const std::filesystem::path& filepat
     ofs << state.toJson().dump(2);
 }
 
-void NavigationHandler::loadNavigationState(const std::string& filepath) {
-    const std::filesystem::path absolutePath = absPath(filepath);
+void NavigationHandler::loadNavigationState(const std::string& filepath,
+                                            bool useTimeStamp)
+{
+    std::filesystem::path absolutePath = absPath(filepath);
     LINFO(fmt::format("Reading camera state from file: {}", absolutePath));
 
+    if (!absolutePath.has_extension()) {
+        // Adding the .navstate extension to the filepath if it came without one
+        absolutePath.replace_extension(".navstate");
+    }
+
     if (!std::filesystem::is_regular_file(absolutePath)) {
         throw ghoul::FileNotFoundError(absolutePath.string(), "NavigationState");
     }
 
-    std::ifstream f = std::ifstream(filepath);
+    std::ifstream f = std::ifstream(absolutePath);
     const std::string contents = std::string(
         std::istreambuf_iterator<char>(f),
         std::istreambuf_iterator<char>()
     );
+
+    if (contents.empty()) {
+        throw::ghoul::RuntimeError(fmt::format(
+            "Failed reading camera state from file: {}. File is empty", absolutePath
+        ));
+    }
+
     const nlohmann::json json = nlohmann::json::parse(contents);
 
     const NavigationState state = NavigationState(json);
     setNavigationStateNextFrame(state);
+
+    if (useTimeStamp && state.timestamp.has_value()) {
+        global::timeManager->setTimeNextFrame(Time(*state.timestamp));
+    }
 }
 
 std::vector<std::string> NavigationHandler::listAllJoysticks() const {
diff --git a/src/navigation/navigationhandler_lua.inl b/src/navigation/navigationhandler_lua.inl
index 7045a1dc81..3e94397f51 100644
--- a/src/navigation/navigationhandler_lua.inl
+++ b/src/navigation/navigationhandler_lua.inl
@@ -27,14 +27,20 @@ namespace {
 /**
  * Load a navigation state from file. The file should be a lua file returning the
  * navigation state as a table formatted as a Navigation State, such as the output files
- * of saveNavigationState.
+ * of saveNavigationState. If usetimeStamp is set to true and the provided navigation
+ * state has a timestamp, time will be set as well.
  */
-[[codegen::luawrap]] void loadNavigationState(std::string cameraStateFilePath) {
+[[codegen::luawrap]] void loadNavigationState(std::string cameraStateFilePath,
+                                              bool useTimeStamp = false)
+{
     if (cameraStateFilePath.empty()) {
         throw ghoul::lua::LuaError("Filepath string is empty");
     }
 
-    openspace::global::navigationHandler->loadNavigationState(cameraStateFilePath);
+    openspace::global::navigationHandler->loadNavigationState(
+        cameraStateFilePath,
+        useTimeStamp
+    );
 }
 
 /**
@@ -66,13 +72,21 @@ namespace {
     return state.dictionary();
 }
 
-// Set the navigation state. The argument must be a valid Navigation State.
-[[codegen::luawrap]] void setNavigationState(ghoul::Dictionary navigationState) {
+// Set the navigation state. The first argument must be a valid Navigation State. If
+// useTimeStamp is set to true and the provided navigation state has a timestamp, time
+// will be set as well.
+[[codegen::luawrap]] void setNavigationState(ghoul::Dictionary navigationState,
+                                             bool useTimeStamp = false)
+{
     using namespace openspace;
 
-    global::navigationHandler->setNavigationStateNextFrame(
-        interaction::NavigationState(navigationState)
-    );
+    interaction::NavigationState ns = interaction::NavigationState(navigationState);
+
+    global::navigationHandler->setNavigationStateNextFrame(ns);
+
+    if (useTimeStamp && ns.timestamp.has_value()) {
+        global::timeManager->setTimeNextFrame(Time(*ns.timestamp));
+    }
 }
 
 /**
diff --git a/src/navigation/navigationstate.cpp b/src/navigation/navigationstate.cpp
index ca63aa4386..c80ce7f44a 100644
--- a/src/navigation/navigationstate.cpp
+++ b/src/navigation/navigationstate.cpp
@@ -25,8 +25,9 @@
 #include <openspace/camera/camerapose.h>
 #include <ghoul/logging/logmanager.h>
 #include <openspace/navigation/navigationstate.h>
-#include <openspace/scene/scenegraphnode.h>
 #include <openspace/query/query.h>
+#include <openspace/scene/scenegraphnode.h>
+#include <openspace/util/spicemanager.h>
 
 namespace {
     constexpr std::string_view _loggerCat = "NavigationState";
@@ -45,12 +46,10 @@ namespace {
     // To get the current navigation state of the camera, use the
     // `openspace.navigation.getNavigationState()` function in the Scripting API.
     //
-    // Note that a NavigationState does not include information about what timestamp
-    // within OpenSpace that the NavigationState was generated. When laoding a
-    // NavigationState, the visuals may be different depending on what the simulation
-    // timestamp is, as the relative positions of objects in the scene may have changed.
-    // The get the exact same visuals as when the NavigationState was saved, make sure
-    // to also set the time to be the same as on save.
+    // Note that when loading a NavigationState, the visuals may be different depending
+    // on what the simulation timestamp is, as the relative positions of objects in the
+    // scene may have changed. The get the exact same visuals as when the NavigationState
+    // was saved you need to also set the simulation time to correpsond to the timestamp.
     struct [[codegen::Dictionary(NavigationState)]] Parameters {
         // The identifier of the anchor node
         std::string anchor;
@@ -74,6 +73,11 @@ namespace {
 
         // The pitch angle in radians. Positive angle means pitching camera upwards
         std::optional<double> pitch;
+
+        // The timestamp for when the navigation state was captured or is valid. Specified
+        // either as seconds past the J2000 epoch, or as a date string in ISO 8601 format:
+        // 'YYYY MM DD HH:mm:ss.xxx'
+        std::optional<std::variant<double, std::string>> timestamp;
     };
 #include "navigationstate_codegen.cpp"
 } // namespace
@@ -92,6 +96,17 @@ NavigationState::NavigationState(const ghoul::Dictionary& dictionary) {
     up = p.up;
     yaw = p.yaw.value_or(yaw);
     pitch = p.pitch.value_or(pitch);
+
+    if (p.timestamp.has_value()) {
+        if (std::holds_alternative<double>(*p.timestamp)) {
+            timestamp = std::get<double>(*p.timestamp);
+        }
+        else {
+            timestamp = SpiceManager::ref().ephemerisTimeFromDate(
+                std::get<std::string>(*p.timestamp)
+            );
+        }
+    }
 }
 
 NavigationState::NavigationState(const nlohmann::json& json) {
@@ -126,12 +141,24 @@ NavigationState::NavigationState(const nlohmann::json& json) {
     if (auto it = json.find("pitch");  it != json.end()) {
         pitch = it->get<double>();
     }
+
+    if (auto it = json.find("timestamp");  it != json.end()) {
+        if (it->is_string()) {
+            timestamp = SpiceManager::ref().ephemerisTimeFromDate(
+                it->get<std::string>()
+            );
+        }
+        else {
+            timestamp = it->get<double>();
+        }
+    }
 }
 
 NavigationState::NavigationState(std::string anchor_, std::string aim_,
                                  std::string referenceFrame_, glm::dvec3 position_,
                                  std::optional<glm::dvec3> up_,
-                                 double yaw_, double pitch_)
+                                 double yaw_, double pitch_,
+                                 std::optional<double> timestamp_)
     : anchor(std::move(anchor_))
     , aim(std::move(aim_))
     , referenceFrame(std::move(referenceFrame_))
@@ -139,6 +166,7 @@ NavigationState::NavigationState(std::string anchor_, std::string aim_,
     , up(std::move(up_))
     , yaw(yaw_)
     , pitch(pitch_)
+    , timestamp(timestamp_)
 {}
 
 CameraPose NavigationState::cameraPose() const {
@@ -210,6 +238,15 @@ ghoul::Dictionary NavigationState::dictionary() const {
     if (std::abs(pitch) > Epsilon) {
         cameraDict.setValue("Pitch", pitch);
     }
+    if (timestamp.has_value()) {
+        cameraDict.setValue(
+            "Timestamp",
+            SpiceManager::ref().dateFromEphemerisTime(
+                *timestamp,
+                "YYYY MON DD HR:MN:SC"
+            )
+        );
+    }
     return cameraDict;
 }
 
@@ -252,6 +289,13 @@ nlohmann::json NavigationState::toJson() const {
         result["pitch"] = pitch;
     }
 
+    if (timestamp.has_value()) {
+        result["timestamp"] = SpiceManager::ref().dateFromEphemerisTime(
+            *timestamp,
+            "YYYY MON DD HR:MN:SC"
+        );
+    }
+
     return result;
 }
 

From 424429bce66336e39373d542634c6bcfe062d1e0 Mon Sep 17 00:00:00 2001
From: Alexander Bock <mail@alexanderbock.eu>
Date: Thu, 21 Mar 2024 22:57:40 +0100
Subject: [PATCH 325/701] Update Kameleon submodule to fix compile error

---
 modules/kameleon/ext/kameleon | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/kameleon/ext/kameleon b/modules/kameleon/ext/kameleon
index ae831dc372..353c9f00f2 160000
--- a/modules/kameleon/ext/kameleon
+++ b/modules/kameleon/ext/kameleon
@@ -1 +1 @@
-Subproject commit ae831dc372c3713f97658cf1ff5f50ffeb23e54f
+Subproject commit 353c9f00f24074dd296770217d53db3990352166

From d719cf2ef94d420159e4772bb6fa02fa6732b5e8 Mon Sep 17 00:00:00 2001
From: Alexander Bock <alexander.bock@liu.se>
Date: Fri, 22 Mar 2024 09:42:13 +0100
Subject: [PATCH 326/701] Update clang-tidy file

---
 .clang_tidy | 32 ++++++++++++++++++++++++++------
 1 file changed, 26 insertions(+), 6 deletions(-)

diff --git a/.clang_tidy b/.clang_tidy
index 01370763ac..60ff8d9752 100644
--- a/.clang_tidy
+++ b/.clang_tidy
@@ -1,6 +1,7 @@
 Checks: >-
   -*,
   bugprone-*,
+  -bugprone-argument-comment,
   -bugprone-easily-swappable-parameters,
   -bugprone-implicit-widening-of-multiplication-result,
   -bugprone-narrowing-conversions,
@@ -8,7 +9,10 @@ Checks: >-
   -bugprone-switch-missing-default-case,
   -bugprone-unchecked-optional-access,
   clang-analyzer-*,
+  -clang-analyzer-apiModeling*,
+  -clang-analyzer-osx*,
   -clang-analyzer-security.FloatLoopCounter,
+  -clang-analyzer-webkit*,
   cppcoreguidelines-*,
   -cppcoreguidelines-avoid-do-while,
   -cppcoreguidelines-avoid-magic-numbers,
@@ -31,8 +35,8 @@ Checks: >-
   -google-readability-casting,
   -google-readability-function-size,
   -google-readability-namespace-comments,
-  -google-runtime-int,
   -google-explicit-constructor,
+  -google-runtime-int,
   llvm-*,
   -llvm-else-after-return,
   -llvm-include-order,
@@ -40,17 +44,15 @@ Checks: >-
   misc-*,
   -misc-include-cleaner,
   -misc-no-recursion,
-  -misc-non-private-member-variables-in-classes,
   modernize-*,
+  -modernize-raw-string-literal,
   -modernize-return-braced-init-list,
   -modernize-use-trailing-return-type,
   -modernize-use-auto,
   performance-*,
   -performance-no-int-to-ptr,
-  portability-*,
   readability-*,
   -readability-avoid-unconditional-preprocessor-if,
-  -readability-convert-member-functions-to-static,
   -readability-else-after-return,
   -readability-function-cognitive-complexity,
   -readability-identifier-length,
@@ -61,5 +63,23 @@ Checks: >-
   -readability-use-anyofallof
 
 CheckOptions:
-  - key:             performance-move-const-arg.CheckTriviallyCopyableMove
-    value:           False
+  - key:    bugprone-assert-side-effect.AssertMacros
+    value:  ghoul_assert,ghoul_precondition
+  - key:    cppcoreguidelines-rvalue-reference-param-not-moved.AllowPartialMove
+    value:  True
+  - key:    misc-non-private-member-variables-in-classes.IgnoreClassesWithAllMemberVariablesBeingPublic
+    value:  True
+  - key:    modernize-loop-convert.UseCxx20ReverseRanges
+    value:  False
+  - key:    performance-move-const-arg.CheckTriviallyCopyableMove
+    value:  False
+  - key:    performance-unnecessary-value-param.AllowedTypes
+    value:  glm::vec2;glm::vec3;glm::vec4;glm::ivec2;glm::ivec3;glm::ivec4;glm::dvec2;glm::dvec3;glm::dvec4;glm::uvec2;glm::uvec3;glm::uvec4;glm::mat2;glm::mat3;glm::mat4;glm::mat[2-4]x[2-4];glm::dmat2;glm::dmat3;glm::dmat4;glm::dmat[2-4]x[2-4];glm::quat;glm::dquat
+  - key:    readability-inconsistent-declaration-parameter-name.Strict
+    value:  True
+  - key:    readability-qualified-auto.AddConstToQualified
+    value:  False
+  - key:    readability-simplify-boolean-expr.ChainedConditionalReturn
+    value:  True
+  - key:    readability-simplify-boolean-expr.ChainedConditionalAssignment
+    value:  True

From 9878bfc8f789751c2e8cdee60bd1e2538797771c Mon Sep 17 00:00:00 2001
From: Alexander Bock <alexander.bock@liu.se>
Date: Sun, 24 Mar 2024 17:22:41 +0100
Subject: [PATCH 327/701] Update submodules (#3136)

* Updating Ghoul and SGCT submodules
* Jenkins fixes
---
 Jenkinsfile                                   |  5 ++-
 apps/OpenSpace/ext/sgct                       |  2 +-
 ext/ghoul                                     |  2 +-
 .../src/geojson/geojsonproperties.cpp         |  8 ++---
 modules/kameleon/CMakeLists.txt               |  1 -
 modules/kameleon/ext/kameleon                 |  2 +-
 modules/skybrowser/skybrowsermodule_lua.inl   |  2 +-
 modules/space/kepler.cpp                      | 31 ++++++++++++-------
 .../renderableconstellationlines.cpp          |  5 +--
 9 files changed, 33 insertions(+), 25 deletions(-)

diff --git a/Jenkinsfile b/Jenkinsfile
index 69935d0b96..e2d8a59ff7 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -51,16 +51,15 @@ parallel tools: {
     stage('tools/scm') {
       deleteDir();
       gitHelper.checkoutGit(url, branch, false);
-      helper.createDirectory('build');
     }
     stage('tools/cppcheck') {
       sh(
-        script: 'cppcheck --enable=all --xml --xml-version=2 -i ext --suppressions-list=support/cppcheck/suppressions.txt include modules src tests 2> build/cppcheck.xml',
+        script: 'cppcheck --enable=all --xml --xml-version=2 -i ext --suppressions-list=support/cppcheck/suppressions.txt include modules src tests 2> cppcheck.xml',
         label: 'CPPCheck'
       )
       recordIssues(
         id: 'tools-cppcheck',
-        tool: cppCheck(pattern: 'build/cppcheck.xml')
+        tool: cppCheck(pattern: 'cppcheck.xml')
       )
     }
     cleanWs()
diff --git a/apps/OpenSpace/ext/sgct b/apps/OpenSpace/ext/sgct
index 9fad60cfb2..5c5ffb9d2d 160000
--- a/apps/OpenSpace/ext/sgct
+++ b/apps/OpenSpace/ext/sgct
@@ -1 +1 @@
-Subproject commit 9fad60cfb2aabf1768e6129365fa64f2bb07d35e
+Subproject commit 5c5ffb9d2d6039a7a40c668625188aaed45cb451
diff --git a/ext/ghoul b/ext/ghoul
index 638b32ed52..580fe25d6c 160000
--- a/ext/ghoul
+++ b/ext/ghoul
@@ -1 +1 @@
-Subproject commit 638b32ed52bf100c2b029425d5a40462270bd18b
+Subproject commit 580fe25d6ce12842f397b451601e815d03d95bec
diff --git a/modules/globebrowsing/src/geojson/geojsonproperties.cpp b/modules/globebrowsing/src/geojson/geojsonproperties.cpp
index de214a93d7..c30f1effa7 100644
--- a/modules/globebrowsing/src/geojson/geojsonproperties.cpp
+++ b/modules/globebrowsing/src/geojson/geojsonproperties.cpp
@@ -28,7 +28,7 @@
 #include <openspace/documentation/documentation.h>
 #include <ghoul/logging/logmanager.h>
 #include <geos/io/GeoJSON.h>
-#include <scn/scn.h>
+#include <scn/scan.h>
 #include <algorithm>
 #include <cstdio>
 
@@ -100,10 +100,10 @@ namespace {
     }
 
     std::optional<glm::vec3> hexToRgb(std::string_view hexColor) {
-        glm::ivec3 rgb;
-        auto ret = scn::scan(hexColor, "#{:2x}{:2x}{:2x}", rgb.r, rgb.g, rgb.b);
+        auto ret = scn::scan<int, int, int>(hexColor, "#{:2x}{:2x}{:2x}");
         if (ret) {
-            return (1.f / 255.f) * glm::vec3(rgb);
+            auto [x, y, z] = ret->values();
+            return (1.f / 255.f) * glm::vec3(x, y, z);
         }
         else {
             return std::nullopt;
diff --git a/modules/kameleon/CMakeLists.txt b/modules/kameleon/CMakeLists.txt
index 08ea00b1be..be25d7dc12 100644
--- a/modules/kameleon/CMakeLists.txt
+++ b/modules/kameleon/CMakeLists.txt
@@ -82,5 +82,4 @@ target_precompile_headers(ccmc PRIVATE
   "$<$<COMPILE_LANGUAGE:CXX>:map>"
   "$<$<COMPILE_LANGUAGE:CXX>:unordered_map>"
   "$<$<COMPILE_LANGUAGE:CXX>:vector>"
-  "$<$<COMPILE_LANGUAGE:CXX>:boost/unordered_map.hpp>"
 )
diff --git a/modules/kameleon/ext/kameleon b/modules/kameleon/ext/kameleon
index 353c9f00f2..18aa3fdd93 160000
--- a/modules/kameleon/ext/kameleon
+++ b/modules/kameleon/ext/kameleon
@@ -1 +1 @@
-Subproject commit 353c9f00f24074dd296770217d53db3990352166
+Subproject commit 18aa3fdd932e5a4a8e6cd9725b88acaa1fdafb49
diff --git a/modules/skybrowser/skybrowsermodule_lua.inl b/modules/skybrowser/skybrowsermodule_lua.inl
index 131fe47d3a..32c72c36c5 100644
--- a/modules/skybrowser/skybrowsermodule_lua.inl
+++ b/modules/skybrowser/skybrowsermodule_lua.inl
@@ -35,7 +35,7 @@
 #include <openspace/scripting/scriptengine.h>
 #include <ghoul/filesystem/filesystem.h>
 #include <ghoul/logging/logmanager.h>
-#include <scn/scn.h>
+#include <scn/scan.h>
 
 namespace {
 constexpr std::string_view _loggerCat = "SkyBrowserModule";
diff --git a/modules/space/kepler.cpp b/modules/space/kepler.cpp
index 3da2484d7a..280352004f 100644
--- a/modules/space/kepler.cpp
+++ b/modules/space/kepler.cpp
@@ -28,8 +28,7 @@
 #include <ghoul/filesystem/filesystem.h>
 #include <ghoul/logging/logmanager.h>
 #include <ghoul/misc/stringhelper.h>
-#include <scn/scn.h>
-#include <scn/tuple_return.h>
+#include <scn/scan.h>
 #include <fstream>
 #include <optional>
 #include <sstream>
@@ -209,10 +208,13 @@ namespace {
         if (e.find('.') == std::string::npos) {
             e += ".0";
         }
-        auto [res, year, daysInYear] = scn::scan_tuple<int, double>(e, "{:2}{}");
+        // @TODO(abock) The 'd' suffix can be removed when
+        // https://github.com/eliaskosunen/scnlib/issues/104 is fixed
+        auto res = scn::scan<int, double>(e, "{:2d}{}");
         if (!res) {
             throw ghoul::RuntimeError(fmt::format("Error parsing epoch '{}'", epoch));
         }
+        auto [year, daysInYear] = res->values();
         year += year > 57 ? 1900 : 2000;
         const int daysSince2000 = countDays(year);
 
@@ -265,11 +267,11 @@ namespace {
             [](char c) { return c == '-'; }
         );
         const std::string format = (nDashes == 2) ? "{:4}-{:2}-{:2}{}" : "{:4}{:2}{:2}{}";
-        auto [res, year, monthNum, dayOfMonthNum, fractionOfDay] =
-            scn::scan_tuple<int, int, int, double>(e, format);
+        auto res = scn::scan<int, int, int, double>(e, scn::runtime_format(format));
         if (!res) {
             throw ghoul::RuntimeError(fmt::format("Error parsing epoch '{}'", epoch));
         }
+        auto [year, monthNum, dayOfMonthNum, fractionOfDay] = res->values();
         const int daysSince2000 = countDays(year);
         const int wholeDaysInto = daysIntoGivenYear(year, monthNum, dayOfMonthNum);
         const double daysInYear = static_cast<double>(wholeDaysInto) + fractionOfDay;
@@ -330,25 +332,32 @@ namespace {
             // We have the first form
             int month = 0;
             int days = 0;
-            auto res = scn::scan(
-                epoch, "{:4}-{:2}-{:2}T{:2}:{:2}:{}",
-                date.year, month, days, date.hours, date.minutes, date.seconds
+            // @TODO(abock) The 'd' suffix can be removed when
+            // https://github.com/eliaskosunen/scnlib/issues/104 is fixed
+            auto res = scn::scan<int, int, int, int, int, double>(
+                epoch, "{:4d}-{:2d}-{:2d}T{:2d}:{:2d}:{}"
             );
             if (!res) {
                 throw ghoul::RuntimeError(fmt::format("Error parsing epoch '{}'", epoch));
             }
+            std::tie(date.year, month, days, date.hours, date.minutes, date.seconds) =
+                res->values();
             date.nDays = daysIntoGivenYear(date.year, month, days);
         }
         else if (pos == 8) {
             // We have the second form
 
-            auto res = scn::scan(
-                epoch, "{:4}-{:3}T{:2}:{:2}:{}",
-                date.year, date.nDays, date.hours, date.minutes, date.seconds
+            // @TODO(abock) The 'd' suffix can be removed when
+            // https://github.com/eliaskosunen/scnlib/issues/104 is fixed
+            auto res = scn::scan<int, int, int, int, double>(
+                epoch, "{:4d}-{:3d}T{:2d}:{:2d}:{}"
+                //date.year, date.nDays, date.hours, date.minutes, date.seconds
             );
             if (!res) {
                 throw ghoul::RuntimeError(fmt::format("Error parsing epoch '{}'", epoch));
             }
+            std::tie(date.year, date.nDays, date.hours, date.minutes, date.seconds) =
+                res->values();
         }
         else {
             throw ghoul::RuntimeError(fmt::format("Malformed epoch string '{}'", epoch));
diff --git a/modules/space/rendering/renderableconstellationlines.cpp b/modules/space/rendering/renderableconstellationlines.cpp
index 22c6ffe78f..f7e0218ada 100644
--- a/modules/space/rendering/renderableconstellationlines.cpp
+++ b/modules/space/rendering/renderableconstellationlines.cpp
@@ -34,7 +34,7 @@
 #include <ghoul/misc/stringhelper.h>
 #include <ghoul/opengl/openglstatecache.h>
 #include <ghoul/opengl/programobject.h>
-#include <scn/scn.h>
+#include <scn/scan.h>
 #include <array>
 #include <filesystem>
 #include <fstream>
@@ -404,8 +404,9 @@ bool RenderableConstellationLines::readSpeckFile() {
 
             // Try to read three values for the position
             glm::vec3 pos;
-            auto reading = scn::scan(line, "{} {} {}", pos.x, pos.y, pos.z);
+            auto reading = scn::scan<float, float, float>(line, "{} {} {}");
             if (reading) {
+                std::tie(pos.x, pos.y, pos.z) = reading->values();
                 pos *= scale;
                 constellationLine.vertices.push_back(pos.x);
                 constellationLine.vertices.push_back(pos.y);

From 3ba346a227aaa96073f08e12baadfa23ef2aee7f Mon Sep 17 00:00:00 2001
From: Alexander Bock <alexander.bock@liu.se>
Date: Sun, 24 Mar 2024 20:19:14 +0100
Subject: [PATCH 328/701] Remove fmt::format and replace with std::format

---
 apps/OpenSpace-MinVR/main.cpp                 |  6 +-
 .../ext/launcher/src/filesystemaccess.cpp     |  2 +-
 .../ext/launcher/src/launcherwindow.cpp       | 32 ++++----
 .../ext/launcher/src/profile/actiondialog.cpp |  4 +-
 .../ext/launcher/src/profile/assetsdialog.cpp |  4 +-
 .../ext/launcher/src/profile/cameradialog.cpp |  1 +
 .../launcher/src/profile/deltatimesdialog.cpp |  6 +-
 .../launcher/src/profile/horizonsdialog.cpp   | 66 +++++++--------
 .../ext/launcher/src/profile/profileedit.cpp  |  6 +-
 .../launcher/src/profile/scriptlogdialog.cpp  |  4 +-
 .../ext/launcher/src/profile/timedialog.cpp   |  4 +-
 .../src/sgctedit/displaywindowunion.cpp       |  2 +-
 .../launcher/src/sgctedit/windowcontrol.cpp   |  4 +-
 apps/OpenSpace/ext/sgct                       |  2 +-
 apps/OpenSpace/main.cpp                       | 20 ++---
 apps/Sync/main.cpp                            |  2 +-
 apps/TaskRunner/main.cpp                      |  6 +-
 ext/ghoul                                     |  2 +-
 include/openspace/documentation/verifier.inl  |  6 +-
 .../interaction/joystickcamerastates.h        |  4 +-
 .../interaction/joystickinputstate.h          |  2 +-
 include/openspace/network/messagestructures.h |  2 +-
 .../properties/numericalproperty.inl          |  2 +-
 include/openspace/util/json_helper.inl        |  4 +-
 include/openspace/util/spicemanager.h         |  2 +-
 .../rendering/atmospheredeferredcaster.cpp    | 12 +--
 modules/base/dashboard/dashboarditemangle.cpp |  4 +-
 modules/base/dashboard/dashboarditemdate.cpp  | 10 ++-
 .../base/dashboard/dashboarditemdistance.cpp  | 16 ++--
 .../dashboard/dashboarditemelapsedtime.cpp    | 15 ++--
 .../base/dashboard/dashboarditemframerate.cpp | 12 +--
 .../base/dashboard/dashboarditemmission.cpp   |  6 +-
 .../dashboarditemparallelconnection.cpp       | 14 ++--
 .../dashboard/dashboarditempropertyvalue.cpp  | 75 ++++++++++++-----
 .../dashboarditemsimulationincrement.cpp      | 28 ++++---
 .../base/dashboard/dashboarditemvelocity.cpp  |  6 +-
 .../renderableinterpolatedpoints.cpp          |  8 +-
 .../pointcloud/renderablepointcloud.cpp       | 16 ++--
 .../pointcloud/sizemappingcomponent.cpp       |  2 +-
 modules/base/rendering/renderablemodel.cpp    | 18 ++---
 .../base/rendering/renderablenodearrow.cpp    | 10 +--
 modules/base/rendering/renderablenodeline.cpp | 12 +--
 .../rendering/renderableplaneimagelocal.cpp   |  2 +-
 .../rendering/renderableplaneimageonline.cpp  |  2 +-
 .../renderableplanetimevaryingimage.cpp       |  4 +-
 .../rendering/renderablesphereimagelocal.cpp  |  4 +-
 .../rendering/renderablesphereimageonline.cpp |  6 +-
 .../base/rendering/screenspaceimagelocal.cpp  |  4 +-
 .../base/rendering/screenspaceimageonline.cpp |  2 +-
 modules/base/rotation/fixedrotation.cpp       |  2 +-
 modules/base/rotation/luarotation.cpp         |  4 +-
 modules/base/scale/luascale.cpp               |  4 +-
 modules/base/translation/luatranslation.cpp   |  4 +-
 modules/cefwebgui/cefwebguimodule.cpp         |  2 +-
 modules/debugging/debuggingmodule_lua.inl     | 24 +++---
 .../rendering/renderabledumeshes.cpp          |  6 +-
 .../rendering/renderableplanescloud.cpp       |  6 +-
 modules/exoplanets/exoplanetshelper.cpp       |  2 +-
 modules/exoplanets/exoplanetsmodule.cpp       |  6 +-
 modules/exoplanets/exoplanetsmodule_lua.inl   | 28 +++----
 .../tasks/exoplanetsdatapreparationtask.cpp   | 14 ++--
 .../rendering/renderablefieldlines.cpp        | 26 +++---
 .../renderablefieldlinessequence.cpp          | 18 ++---
 .../util/fieldlinesstate.cpp                  | 10 +--
 .../util/kameleonfieldlinehelper.cpp          |  6 +-
 modules/fitsfilereader/src/fitsfilereader.cpp | 14 ++--
 modules/gaia/rendering/octreemanager.cpp      | 22 ++---
 .../gaia/rendering/renderablegaiastars.cpp    | 44 +++++-----
 modules/gaia/tasks/constructoctreetask.cpp    | 30 +++----
 modules/gaia/tasks/readfilejob.cpp            |  2 +-
 modules/gaia/tasks/readfitstask.cpp           | 16 ++--
 modules/gaia/tasks/readspecktask.cpp          |  4 +-
 modules/galaxy/rendering/renderablegalaxy.cpp | 10 +--
 modules/globebrowsing/globebrowsingmodule.cpp |  2 +-
 .../globebrowsing/globebrowsingmodule_lua.inl | 12 +--
 .../src/asynctiledataprovider.cpp             |  6 +-
 .../src/dashboarditemglobelocation.cpp        | 25 +++---
 modules/globebrowsing/src/gdalwrapper.cpp     |  4 +-
 .../src/geojson/geojsoncomponent.cpp          | 18 ++---
 .../src/geojson/geojsonproperties.cpp         | 10 +--
 .../src/geojson/globegeometryfeature.cpp      |  8 +-
 .../src/globelabelscomponent.cpp              | 14 ++--
 modules/globebrowsing/src/globerotation.cpp   |  2 +-
 .../globebrowsing/src/globetranslation.cpp    |  2 +-
 modules/globebrowsing/src/gpulayergroup.cpp   |  4 +-
 modules/globebrowsing/src/layergroupid.h      |  4 +-
 modules/globebrowsing/src/layermanager.cpp    |  2 +-
 .../globebrowsing/src/rawtiledatareader.cpp   | 14 ++--
 modules/globebrowsing/src/renderableglobe.cpp | 22 ++---
 modules/globebrowsing/src/ringscomponent.cpp  | 12 +--
 modules/globebrowsing/src/shadowcomponent.cpp |  2 +-
 .../src/tileprovider/defaulttileprovider.cpp  |  4 +-
 .../tileprovider/singleimagetileprovider.cpp  |  2 +-
 .../sizereferencetileprovider.cpp             |  2 +-
 .../src/tileprovider/temporaltileprovider.cpp | 10 +--
 .../tileprovider/tileindextileprovider.cpp    |  2 +-
 modules/globebrowsing/src/timequantizer.cpp   | 26 +++---
 modules/imgui/imguimodule.cpp                 |  2 +-
 modules/imgui/src/guigibscomponent.cpp        |  6 +-
 .../imgui/src/guiglobebrowsingcomponent.cpp   |  4 +-
 modules/imgui/src/guiparallelcomponent.cpp    | 16 ++--
 modules/imgui/src/guispacetimecomponent.cpp   |  4 +-
 modules/imgui/src/renderproperties.cpp        |  4 +-
 modules/iswa/rendering/iswakameleongroup.cpp  |  4 +-
 modules/iswa/rendering/kameleonplane.cpp      |  4 +-
 modules/iswa/rendering/texturecygnet.cpp      |  2 +-
 modules/iswa/util/iswamanager.cpp             |  6 +-
 modules/iswa/util/iswamanager_lua.inl         |  4 +-
 modules/kameleon/src/kameleonhelper.cpp       |  6 +-
 modules/kameleon/src/kameleonwrapper.cpp      | 34 ++++----
 .../kameleonvolume/kameleonvolumereader.cpp   |  2 +-
 .../rendering/renderablekameleonvolume.cpp    |  4 +-
 .../tasks/kameleondocumentationtask.cpp       |  2 +-
 .../tasks/kameleonmetadatatojsontask.cpp      |  2 +-
 .../tasks/kameleonvolumetorawtask.cpp         |  2 +-
 .../multiresvolume/rendering/brickmanager.cpp | 28 +++----
 .../rendering/errorhistogrammanager.cpp       |  2 +-
 .../rendering/localerrorhistogrammanager.cpp  | 10 +--
 .../rendering/renderablemultiresvolume.cpp    | 30 +++----
 modules/multiresvolume/rendering/tsp.cpp      | 48 +++++------
 modules/server/src/connection.cpp             | 10 +--
 .../src/topics/flightcontrollertopic.cpp      | 16 ++--
 .../server/src/topics/getpropertytopic.cpp    |  2 +-
 modules/server/src/topics/luascripttopic.cpp  |  2 +-
 .../server/src/topics/setpropertytopic.cpp    |  2 +-
 .../server/src/topics/subscriptiontopic.cpp   |  2 +-
 .../src/topics/triggerpropertytopic.cpp       |  2 +-
 modules/skybrowser/skybrowsermodule.cpp       |  8 +-
 modules/skybrowser/skybrowsermodule_lua.inl   |  6 +-
 modules/skybrowser/src/browser.cpp            |  2 +-
 .../skybrowser/src/screenspaceskybrowser.cpp  |  2 +-
 modules/skybrowser/src/targetbrowserpair.cpp  |  4 +-
 modules/skybrowser/src/wwtcommunicator.cpp    |  8 +-
 modules/skybrowser/src/wwtdatahandler.cpp     | 12 +--
 modules/space/horizonsfile.cpp                | 38 ++++-----
 modules/space/kepler.cpp                      | 28 +++----
 .../renderableconstellationbounds.cpp         |  4 +-
 .../renderableconstellationlines.cpp          | 10 +--
 .../renderableconstellationsbase.cpp          |  2 +-
 .../space/rendering/renderablefluxnodes.cpp   |  8 +-
 .../rendering/renderableorbitalkepler.cpp     |  6 +-
 modules/space/rendering/renderablerings.cpp   |  2 +-
 modules/space/rendering/renderablestars.cpp   | 12 +--
 modules/space/spacemodule_lua.inl             |  2 +-
 .../space/tasks/generatedebrisvolumetask.cpp  | 38 ++++-----
 modules/space/translation/gptranslation.cpp   |  2 +-
 .../space/translation/horizonstranslation.cpp | 18 ++---
 .../dashboard/dashboarditeminstruments.cpp    | 16 ++--
 .../rendering/renderablefov.cpp               |  4 +-
 .../spacecraftinstrumentsmodule.cpp           |  2 +-
 .../util/hongkangparser.cpp                   |  4 +-
 .../util/instrumenttimesparser.cpp            |  4 +-
 .../util/labelparser.cpp                      | 14 ++--
 .../util/projectioncomponent.cpp              | 14 ++--
 modules/spout/spoutwrapper.cpp                | 16 ++--
 modules/statemachine/src/statemachine.cpp     | 16 ++--
 modules/statemachine/statemachinemodule.cpp   |  4 +-
 .../statemachine/statemachinemodule_lua.inl   |  2 +-
 modules/sync/syncs/httpsynchronization.cpp    | 18 ++---
 modules/sync/syncs/urlsynchronization.cpp     | 18 ++---
 modules/touch/src/touchinteraction.cpp        | 10 +--
 modules/touch/src/win32_touch.cpp             |  2 +-
 modules/touch/touchmodule.cpp                 |  2 +-
 modules/video/src/videoplayer.cpp             | 30 +++----
 .../rendering/renderabledistancelabel.cpp     |  6 +-
 modules/volume/rawvolumewriter.inl            |  2 +-
 .../rendering/renderabletimevaryingvolume.cpp |  4 +-
 .../volume/tasks/generaterawvolumetask.cpp    |  2 +-
 modules/webbrowser/src/browserinstance.cpp    |  4 +-
 modules/webbrowser/src/cefhost.cpp            |  4 +-
 modules/webbrowser/src/eventhandler.cpp       |  2 +-
 modules/webbrowser/src/screenspacebrowser.cpp |  2 +-
 modules/webbrowser/src/webrenderhandler.cpp   |  1 -
 modules/webbrowser/webbrowsermodule.cpp       |  8 +-
 modules/webgui/webguimodule.cpp               |  8 +-
 src/data/csvloader.cpp                        | 20 ++---
 src/data/dataloader.cpp                       | 20 ++---
 src/data/datamapping.cpp                      |  4 +-
 src/data/speckloader.cpp                      | 30 +++----
 src/documentation/documentation.cpp           | 12 +--
 src/documentation/documentationengine.cpp     |  2 +-
 src/documentation/verifier.cpp                | 12 +--
 src/engine/configuration.cpp                  |  6 +-
 src/engine/downloadmanager.cpp                | 10 +--
 src/engine/moduleengine.cpp                   | 12 +--
 src/engine/openspaceengine.cpp                | 76 +++++++++---------
 src/engine/openspaceengine_lua.inl            | 14 ++--
 src/engine/settings.cpp                       |  4 +-
 src/events/event.cpp                          | 48 +++++------
 src/events/eventengine.cpp                    |  6 +-
 src/interaction/actionmanager.cpp             |  4 +-
 src/interaction/actionmanager_lua.inl         | 10 +--
 src/interaction/joystickcamerastates.cpp      |  6 +-
 src/interaction/keybindingmanager_lua.inl     |  4 +-
 src/interaction/sessionrecording.cpp          | 80 +++++++++----------
 .../tasks/convertrecfileversiontask.cpp       |  6 +-
 .../tasks/convertrecformattask.cpp            | 22 ++---
 src/interaction/touchbar.mm                   |  2 +-
 src/mission/mission.cpp                       |  4 +-
 src/navigation/navigationhandler.cpp          | 10 +--
 src/navigation/navigationhandler_lua.inl      |  2 +-
 src/navigation/navigationstate.cpp            |  4 +-
 src/navigation/orbitalnavigator.cpp           |  6 +-
 src/navigation/path.cpp                       |  4 +-
 .../pathcurves/avoidcollisioncurve.cpp        |  2 +-
 src/navigation/pathnavigator.cpp              |  4 +-
 src/navigation/pathnavigator_lua.inl          |  2 +-
 src/navigation/waypoint.cpp                   |  8 +-
 src/network/parallelconnection.cpp            |  2 +-
 src/network/parallelpeer.cpp                  |  2 +-
 src/properties/optionproperty.cpp             |  6 +-
 src/properties/property.cpp                   |  6 +-
 src/properties/propertyowner.cpp              | 12 +--
 src/properties/selectionproperty.cpp          |  8 +-
 src/rendering/colormappingcomponent.cpp       |  6 +-
 src/rendering/dashboard_lua.inl               |  2 +-
 src/rendering/framebufferrenderer.cpp         |  8 +-
 src/rendering/labelscomponent.cpp             |  2 +-
 src/rendering/loadingscreen.cpp               | 10 +--
 src/rendering/luaconsole.cpp                  |  2 +-
 src/rendering/renderengine.cpp                | 14 ++--
 src/rendering/texturecomponent.cpp            |  2 +-
 src/scene/asset.cpp                           | 16 ++--
 src/scene/assetmanager.cpp                    | 33 +++-----
 src/scene/profile.cpp                         | 10 +--
 src/scene/profile_lua.inl                     | 20 ++---
 src/scene/scene.cpp                           | 18 ++---
 src/scene/scene_lua.inl                       | 54 ++++++-------
 src/scene/scenegraphnode.cpp                  | 28 +++----
 src/scripting/lualibrary.cpp                  |  2 +-
 src/scripting/scriptengine.cpp                | 30 +++----
 src/scripting/scriptengine_lua.inl            |  6 +-
 src/util/coordinateconversion.cpp             | 32 ++++----
 src/util/httprequest.cpp                      | 22 ++---
 src/util/json_helper.cpp                      |  2 +-
 src/util/keys.cpp                             | 10 +--
 src/util/openspacemodule.cpp                  |  2 +-
 src/util/spicemanager.cpp                     | 74 ++++++++---------
 src/util/spicemanager_lua.inl                 | 14 ++--
 src/util/taskloader.cpp                       |  8 +-
 src/util/time.cpp                             |  6 +-
 src/util/time_lua.inl                         |  2 +-
 src/util/timemanager.cpp                      | 16 ++--
 src/util/versionchecker.cpp                   |  8 +-
 support/coding/codegen                        |  2 +-
 tests/test_sgctedit.cpp                       |  1 -
 246 files changed, 1343 insertions(+), 1300 deletions(-)

diff --git a/apps/OpenSpace-MinVR/main.cpp b/apps/OpenSpace-MinVR/main.cpp
index 382d23499e..46357781ca 100644
--- a/apps/OpenSpace-MinVR/main.cpp
+++ b/apps/OpenSpace-MinVR/main.cpp
@@ -104,7 +104,7 @@ void Handler::onVREvent(const VRDataIndex& eventData) {
     else {
         LERRORC(
             "onVREvent()",
-            fmt::format("Received an event named {} of unknown type", eventData.getName())
+            std::format("Received an event named {} of unknown type", eventData.getName())
         );
     }
 
@@ -244,7 +244,7 @@ void Handler::onVREvent(const VRDataIndex& eventData) {
         global::openSpaceEngine.decode(std::move(synchronizationBuffer));
     }
     else {
-        LERRORC("onVREvent()", fmt::format("Received an event of unknown type {}", type));
+        LERRORC("onVREvent()", std::format("Received an event of unknown type {}", type));
     }
 }
 
@@ -372,7 +372,7 @@ int main(int argc, char** argv) {
             LFATALC("main", "Could not find configuration: " + configurationFilePath);
             exit(EXIT_FAILURE);
         }
-        LINFO(fmt::format("Configuration Path: '{}'", configurationFilePath));
+        LINFO(std::format("Configuration Path: '{}'", configurationFilePath));
 
         // Loading configuration from disk
         LDEBUG("Loading configuration from disk");
diff --git a/apps/OpenSpace/ext/launcher/src/filesystemaccess.cpp b/apps/OpenSpace/ext/launcher/src/filesystemaccess.cpp
index 208b04a30c..075280fee9 100644
--- a/apps/OpenSpace/ext/launcher/src/filesystemaccess.cpp
+++ b/apps/OpenSpace/ext/launcher/src/filesystemaccess.cpp
@@ -60,7 +60,7 @@ void FileSystemAccess::parseChildDirElements(const QFileInfo& fileInfo,
     for (const QFileInfo& fi : fileList) {
         std::string res = space + fi.fileName().toStdString();
         if (level == 0 && userAssets) {
-            res = fmt::format("${{USER_ASSETS}}/{}", res);
+            res = std::format("${{USER_ASSETS}}/{}", res);
         }
         if (fi.isDir()) {
             dirNames.push_back(res);
diff --git a/apps/OpenSpace/ext/launcher/src/launcherwindow.cpp b/apps/OpenSpace/ext/launcher/src/launcherwindow.cpp
index 065e1dbf67..6f4dfce048 100644
--- a/apps/OpenSpace/ext/launcher/src/launcherwindow.cpp
+++ b/apps/OpenSpace/ext/launcher/src/launcherwindow.cpp
@@ -102,7 +102,7 @@ namespace {
             QMessageBox::critical(
                 parent,
                 "Exception",
-                QString::fromStdString(fmt::format(
+                QString::fromStdString(std::format(
                     "Could not open profile file '{}'", filename
                 ))
             );
@@ -117,7 +117,7 @@ namespace {
             QMessageBox::critical(
                 parent,
                 "Exception",
-                QString::fromStdString(fmt::format(
+                QString::fromStdString(std::format(
                     "ParsingError exception in '{}': {}, {}",
                     filename, e.component, e.message
                 ))
@@ -128,7 +128,7 @@ namespace {
             QMessageBox::critical(
                 parent,
                 "Exception",
-                QString::fromStdString(fmt::format(
+                QString::fromStdString(std::format(
                     "RuntimeError exception in '{}', component {}: {}",
                     filename, e.component, e.message
                 ))
@@ -153,7 +153,7 @@ namespace {
                     QMessageBox::critical(
                         parent,
                         "Exception",
-                        QString::fromStdString(fmt::format(
+                        QString::fromStdString(std::format(
                             "Error writing data to file '{}' as file is marked hidden",
                             path
                         ))
@@ -165,7 +165,7 @@ namespace {
             QMessageBox::critical(
                 parent,
                 "Exception",
-                QString::fromStdString(fmt::format(
+                QString::fromStdString(std::format(
                     "Error writing data to file '{}': {}", path, e.what()
                 ))
             );
@@ -188,7 +188,7 @@ namespace {
             QMessageBox::critical(
                 parent,
                 "Exception",
-                QString::fromStdString(fmt::format(
+                QString::fromStdString(std::format(
                     "Error writing data to file '{}': {}", path, e.what()
                 ))
             );
@@ -481,7 +481,7 @@ void LauncherWindow::populateProfilesList(const std::string& preset) {
     if (!std::filesystem::exists(_profilePath)) {
         LINFOC(
             "LauncherWindow",
-            fmt::format("Could not find profile folder '{}'", _profilePath)
+            std::format("Could not find profile folder '{}'", _profilePath)
         );
         return;
     }
@@ -517,7 +517,7 @@ void LauncherWindow::populateProfilesList(const std::string& preset) {
             const std::optional<std::string>& d = p->meta.value().description;
             if (d.has_value()) {
                 // Tooltip has to be 'rich text' to linebreak properly
-                const QString tooltip = QString::fromStdString(fmt::format(
+                const QString tooltip = QString::fromStdString(std::format(
                     "<p>{}</p>", *d
                 ));
                 _profileBox->setItemData(idx, tooltip, Qt::ToolTipRole);
@@ -555,7 +555,7 @@ void LauncherWindow::populateProfilesList(const std::string& preset) {
             const std::optional<std::string>& d = p->meta.value().description;
             if (d.has_value()) {
                 // Tooltip has to be 'rich text' to linebreak properly
-                const QString tooltip = QString::fromStdString(fmt::format(
+                const QString tooltip = QString::fromStdString(std::format(
                     "<p>{}</p>", *d
                 ));
                 _profileBox->setItemData(idx, tooltip, Qt::ToolTipRole);
@@ -602,7 +602,7 @@ bool handleConfigurationFile(QComboBox& box, const std::filesystem::directory_en
         }
         if (!tooltipDescription.empty()) {
             const QString toolTip = QString::fromStdString(
-                fmt::format("<p>{}</p>", tooltipDescription)
+                std::format("<p>{}</p>", tooltipDescription)
             );
             box.setItemData(box.count() - 1, toolTip, Qt::ToolTipRole);
         }
@@ -671,7 +671,7 @@ void LauncherWindow::populateWindowConfigsList(const std::string& preset) {
     else {
         LINFOC(
             "LauncherWindow",
-            fmt::format("Could not find config folder '{}'", _configPath)
+            std::format("Could not find config folder '{}'", _configPath)
         );
     }
 
@@ -729,7 +729,7 @@ void LauncherWindow::onNewWindowConfigSelection(int newIndex) {
     else if (newIndex >= _preDefinedConfigStartingIdx) {
         _editWindowButton->setEnabled(false);
         _editWindowButton->setToolTip(
-            QString::fromStdString(fmt::format(
+            QString::fromStdString(std::format(
                 "Cannot edit '{}'\nsince it is one of the configuration "
                 "files provided in the OpenSpace installation", fileSelected
             ))
@@ -741,7 +741,7 @@ void LauncherWindow::onNewWindowConfigSelection(int newIndex) {
                 sgct::readConfigGenerator(fileSelected);
             if (!versionCheck(previewGenVersion)) {
                 _editWindowButton->setEnabled(false);
-                _editWindowButton->setToolTip(QString::fromStdString(fmt::format(
+                _editWindowButton->setToolTip(QString::fromStdString(std::format(
                     "This file does not meet the minimum required version of {}.",
                     versionMin.versionString()
                 )));
@@ -851,7 +851,7 @@ void LauncherWindow::openWindowEditor(const std::string& winCfg, bool isUserWinC
                 }
                 catch (const std::runtime_error& e) {
                     //Re-throw an SGCT error exception with the runtime exception message
-                    throw std::runtime_error(fmt::format(
+                    throw std::runtime_error(std::format(
                         "Importing of this configuration file failed because of a "
                         "problem detected in the readConfig function:\n\n{}", e.what()
                     ));
@@ -874,7 +874,7 @@ void LauncherWindow::openWindowEditor(const std::string& winCfg, bool isUserWinC
             else {
                 editRefusalDialog(
                     "File Format Version Error",
-                    fmt::format(
+                    std::format(
                         "File '{}' does not meet the minimum required version of {}",
                         winCfg, versionMin.versionString()
                     ),
@@ -885,7 +885,7 @@ void LauncherWindow::openWindowEditor(const std::string& winCfg, bool isUserWinC
         catch (const std::runtime_error& e) {
             editRefusalDialog(
                 "Format Validation Error",
-                fmt::format("Parsing error found in file '{}'", winCfg),
+                std::format("Parsing error found in file '{}'", winCfg),
                 e.what()
             );
         }
diff --git a/apps/OpenSpace/ext/launcher/src/profile/actiondialog.cpp b/apps/OpenSpace/ext/launcher/src/profile/actiondialog.cpp
index 1a6f59ebcb..f9b7b8d9bd 100644
--- a/apps/OpenSpace/ext/launcher/src/profile/actiondialog.cpp
+++ b/apps/OpenSpace/ext/launcher/src/profile/actiondialog.cpp
@@ -56,7 +56,7 @@ namespace {
 
     void updateListItem(QListWidgetItem* item, const Profile::Keybinding& kb) {
         ghoul_assert(item, "Item must exist at this point");
-        const std::string n = fmt::format("{}\t{}", ghoul::to_string(kb.key), kb.action);
+        const std::string n = std::format("{}\t{}", ghoul::to_string(kb.key), kb.action);
         item->setText(QString::fromStdString(n));
     }
 } // namespace
@@ -474,7 +474,7 @@ void ActionDialog::actionRemove() {
         const QMessageBox::StandardButton button = QMessageBox::information(
             this,
             "Remove action",
-            QString::fromStdString(fmt::format(
+            QString::fromStdString(std::format(
                 "Action '{}' is used in the keybind '{}' and cannot be removed unless "
                 "the keybind is removed as well. Do you want to remove the keybind as "
                 "well?",
diff --git a/apps/OpenSpace/ext/launcher/src/profile/assetsdialog.cpp b/apps/OpenSpace/ext/launcher/src/profile/assetsdialog.cpp
index cb7800ddb7..07d36c74b1 100644
--- a/apps/OpenSpace/ext/launcher/src/profile/assetsdialog.cpp
+++ b/apps/OpenSpace/ext/launcher/src/profile/assetsdialog.cpp
@@ -253,8 +253,8 @@ QString AssetsDialog::createTextSummary() {
         const bool existsInFilesystem = summaryItems.at(i)->doesExistInFilesystem();
 
         const std::string s = existsInFilesystem ?
-            fmt::format("{}<br>", summaryPaths.at(i)) :
-            fmt::format("<font color='red'>{}</font><br>", summaryPaths.at(i));
+            std::format("{}<br>", summaryPaths.at(i)) :
+            std::format("<font color='red'>{}</font><br>", summaryPaths.at(i));
         summary += QString::fromStdString(s);
     }
     return summary;
diff --git a/apps/OpenSpace/ext/launcher/src/profile/cameradialog.cpp b/apps/OpenSpace/ext/launcher/src/profile/cameradialog.cpp
index 7d941ccfe6..82e4360098 100644
--- a/apps/OpenSpace/ext/launcher/src/profile/cameradialog.cpp
+++ b/apps/OpenSpace/ext/launcher/src/profile/cameradialog.cpp
@@ -37,6 +37,7 @@
 #include <QPlainTextEdit>
 #include <QPushButton>
 #include <QTabWidget>
+#include <fstream>
 
 namespace {
     constexpr int CameraTypeNode = 0;
diff --git a/apps/OpenSpace/ext/launcher/src/profile/deltatimesdialog.cpp b/apps/OpenSpace/ext/launcher/src/profile/deltatimesdialog.cpp
index 5c208e9e0e..f564dc9257 100644
--- a/apps/OpenSpace/ext/launcher/src/profile/deltatimesdialog.cpp
+++ b/apps/OpenSpace/ext/launcher/src/profile/deltatimesdialog.cpp
@@ -60,7 +60,7 @@ namespace {
 
     std::string checkForTimeDescription(int intervalIndex, double value) {
         double amount = value / TimeIntervals[intervalIndex].secondsPerInterval;
-        std::string description = fmt::format("{}", amount);
+        std::string description = std::format("{}", amount);
         description += " " + TimeIntervals[intervalIndex].intervalName + "/sec";
         return description;
     }
@@ -202,7 +202,7 @@ std::string DeltaTimesDialog::createSummaryForDeltaTime(size_t idx, bool forList
     }
 
     if (forListView) {
-        s += fmt::format(
+        s += std::format(
             "\t{}\t{}", _deltaTimesData.at(idx), timeDescription(_deltaTimesData.at(idx))
         );
     }
@@ -237,7 +237,7 @@ void DeltaTimesDialog::setLabelForKey(int index, bool editMode, std::string_view
     if (editMode) {
         labelS += " '" + createSummaryForDeltaTime(index, false) + "':";
     }
-    _adjustLabel->setText(QString::fromStdString(fmt::format(
+    _adjustLabel->setText(QString::fromStdString(std::format(
         "<font color='{}'>{}</font>", color, labelS
     )));
 }
diff --git a/apps/OpenSpace/ext/launcher/src/profile/horizonsdialog.cpp b/apps/OpenSpace/ext/launcher/src/profile/horizonsdialog.cpp
index 1ed5f5d636..e340b5ff50 100644
--- a/apps/OpenSpace/ext/launcher/src/profile/horizonsdialog.cpp
+++ b/apps/OpenSpace/ext/launcher/src/profile/horizonsdialog.cpp
@@ -164,7 +164,7 @@ void HorizonsDialog::importTimeRange() {
             }
 
             _errorMsg->setText("Could not import time range");
-            const std::string msg = fmt::format(
+            const std::string msg = std::format(
                 "Could not import time range '{}' to '{}'",
                 _validTimeRange.first, _validTimeRange.second
             );
@@ -438,7 +438,7 @@ bool HorizonsDialog::isValidInput() {
     bool couldConvert = false;
     const int32_t step = _stepEdit->text().toInt(&couldConvert);
     if (!couldConvert) {
-        _errorMsg->setText(QString::fromStdString(fmt::format(
+        _errorMsg->setText(QString::fromStdString(std::format(
             "Step size needs to be a number in range 1 to {}",
             std::numeric_limits<int32_t>::max()
         )));
@@ -458,7 +458,7 @@ bool HorizonsDialog::isValidInput() {
     // website as a uint32_t. If step size over 32 bit int is sent, this error message is
     // received: Cannot read numeric value -- re-enter
     if (step < 1) {
-        _errorMsg->setText(QString::fromStdString(fmt::format(
+        _errorMsg->setText(QString::fromStdString(std::format(
             "Step size is outside valid range 1 to '{}'",
             std::numeric_limits<int32_t>::max()
         )));
@@ -503,7 +503,7 @@ nlohmann::json HorizonsDialog::handleReply(QNetworkReply* reply) {
         const QVariant statusCode =
             reply->attribute(QNetworkRequest::HttpStatusCodeAttribute);
         if (!checkHttpStatus(statusCode)) {
-            const std::string msg = fmt::format(
+            const std::string msg = std::format(
                 "Connection Error '{}'", reply->errorString().toStdString()
             );
             appendLog(msg, HorizonsDialog::LogLevel::Error);
@@ -519,7 +519,7 @@ nlohmann::json HorizonsDialog::handleReply(QNetworkReply* reply) {
             redirect = reply->url().resolved(redirect);
         }
 
-        const std::string msg = fmt::format(
+        const std::string msg = std::format(
             "Redirecting request to '{}'", redirect.toString().toStdString()
         );
         appendLog(msg, HorizonsDialog::LogLevel::Info);
@@ -530,7 +530,7 @@ nlohmann::json HorizonsDialog::handleReply(QNetworkReply* reply) {
     reply->deleteLater();
 
     if (answer.isEmpty()) {
-        const std::string msg = fmt::format(
+        const std::string msg = std::format(
             "Connection Error '{}'", reply->errorString().toStdString()
         );
         appendLog(msg, HorizonsDialog::LogLevel::Error);
@@ -568,7 +568,7 @@ bool HorizonsDialog::checkHttpStatus(const QVariant& statusCode) {
                     "later time";
                 break;
             default:
-                message = fmt::format(
+                message = std::format(
                     "HTTP status code '{}' was returned",
                     statusCode.toString().toStdString()
                 );
@@ -666,7 +666,7 @@ std::pair<std::string, std::string> HorizonsDialog::readTimeRange() {
                 }
                 else {
                     _errorMsg->setText("Could not parse time range");
-                    const std::string msg = fmt::format(
+                    const std::string msg = std::format(
                         "Could not read time range '{}' to '{}'",
                         timeRange.first, timeRange.second
                     );
@@ -675,7 +675,7 @@ std::pair<std::string, std::string> HorizonsDialog::readTimeRange() {
                 return std::pair<std::string, std::string>();
             }
             else {
-                const std::string msg = fmt::format(
+                const std::string msg = std::format(
                     "Could not find all time range information. Latest Horizons "
                     "mesage: {}", _latestHorizonsError
                 );
@@ -741,7 +741,7 @@ bool HorizonsDialog::handleRequest() {
 
         std::filesystem::rename(oldFile, newFile);
 
-        const std::string msg = fmt::format(
+        const std::string msg = std::format(
             "For more information, see the saved error file '{}'", newFile
         );
         appendLog(msg, LogLevel::Info);
@@ -794,13 +794,13 @@ std::string HorizonsDialog::constructUrl() {
         _observerName = center;
     }
 
-    _startTime = fmt::format(
+    _startTime = std::format(
         "{} {}",
         _startEdit->date().toString("yyyy-MM-dd").toStdString(),
         _startEdit->time().toString("hh:mm:ss").toStdString()
     );
 
-    _endTime = fmt::format(
+    _endTime = std::format(
         "{} {}",
         _endEdit->date().toString("yyyy-MM-dd").toStdString(),
         _endEdit->time().toString("hh:mm:ss").toStdString()
@@ -872,7 +872,7 @@ openspace::HorizonsFile HorizonsDialog::handleAnswer(nlohmann::json& answer) {
 
     auto result = answer.find("result");
     if (result == answer.end()) {
-        const std::string msg = fmt::format(
+        const std::string msg = std::format(
             "Malformed answer received '{}'", answer.dump()
         );
         appendLog(msg, HorizonsDialog::LogLevel::Error);
@@ -929,7 +929,7 @@ bool HorizonsDialog::handleResult(openspace::HorizonsResultCode& result) {
         case HorizonsResultCode::Empty: {
             _errorMsg->setText("The horizons file is empty");
             if (!_latestHorizonsError.empty()) {
-                const std::string msg = fmt::format(
+                const std::string msg = std::format(
                     "Latest Horizons error: {}", _latestHorizonsError
                 );
                 appendLog(msg, LogLevel::Error);
@@ -939,7 +939,7 @@ bool HorizonsDialog::handleResult(openspace::HorizonsResultCode& result) {
             break;
         }
         case HorizonsResultCode::ErrorSize: {
-            const std::string msg = fmt::format(
+            const std::string msg = std::format(
                 "Time range '{}' to '{}' with step size '{} {}' is too big, try to "
                 "increase the step size and/or decrease the time range",
                 _startTime, _endTime, _stepEdit->text().toStdString(),
@@ -963,7 +963,7 @@ bool HorizonsDialog::handleResult(openspace::HorizonsResultCode& result) {
             std::filesystem::remove(_horizonsFile.file());
             break;
         case HorizonsResultCode::ErrorTimeRange: {
-            std::string msg = fmt::format(
+            std::string msg = std::format(
                 "Time range is outside the valid range for target '{}'", _targetName
             );
             appendLog(msg, HorizonsDialog::LogLevel::Error);
@@ -973,13 +973,13 @@ bool HorizonsDialog::handleResult(openspace::HorizonsResultCode& result) {
             _validTimeRange = readTimeRange();
             if (_validTimeRange.first.empty() || _validTimeRange.second.empty()) {
                 if (!_latestHorizonsError.empty()) {
-                    msg = fmt::format("Latest Horizons error: {}", _latestHorizonsError);
+                    msg = std::format("Latest Horizons error: {}", _latestHorizonsError);
                     appendLog(msg, LogLevel::Error);
                 }
                 break;
             }
 
-            msg = fmt::format(
+            msg = std::format(
                 "Valid time range is '{}' to '{}'",
                 _validTimeRange.first, _validTimeRange.second
             );
@@ -990,12 +990,12 @@ bool HorizonsDialog::handleResult(openspace::HorizonsResultCode& result) {
             break;
         }
         case HorizonsResultCode::ErrorNoObserver: {
-            std::string msg = fmt::format(
+            std::string msg = std::format(
                 "No match was found for observer '{}'", _observerName
             );
             appendLog(msg, HorizonsDialog::LogLevel::Error);
 
-            msg = fmt::format(
+            msg = std::format(
                 "Try to use '@{}' as observer to search for possible matches",
                 _observerName
             );
@@ -1006,7 +1006,7 @@ bool HorizonsDialog::handleResult(openspace::HorizonsResultCode& result) {
             break;
         }
         case HorizonsResultCode::ErrorObserverTargetSame: {
-            const std::string msg = fmt::format(
+            const std::string msg = std::format(
                 "The observer '{}' and target '{}' are the same. Please use another "
                 "observer for the current target", _observerName, _targetName
             );
@@ -1018,7 +1018,7 @@ bool HorizonsDialog::handleResult(openspace::HorizonsResultCode& result) {
             break;
         }
         case HorizonsResultCode::ErrorNoData: {
-            const std::string msg = fmt::format(
+            const std::string msg = std::format(
                 "There is not enough data to compute the state of target '{}' in "
                 "relation to the observer '{}' for the time range '{}' to '{}'. Try to "
                 "use another observer for the current target or another time range",
@@ -1030,13 +1030,13 @@ bool HorizonsDialog::handleResult(openspace::HorizonsResultCode& result) {
             break;
         }
         case HorizonsResultCode::MultipleObserverStations: {
-            std::string msg = fmt::format(
+            std::string msg = std::format(
                 "Multiple matching observer stations were found for observer '{}'",
                 _observerName
             );
             appendLog(msg, HorizonsDialog::LogLevel::Warning);
 
-            msg = fmt::format(
+            msg = std::format(
                 "Did not find what you were looking for? Use '@{}' as observer to search "
                 "for alternatives", _observerName
             );
@@ -1054,7 +1054,7 @@ bool HorizonsDialog::handleResult(openspace::HorizonsResultCode& result) {
                     HorizonsDialog::LogLevel::Error
                 );
                 if (!_latestHorizonsError.empty()) {
-                    msg = fmt::format("Latest Horizons error: {}", _latestHorizonsError);
+                    msg = std::format("Latest Horizons error: {}", _latestHorizonsError);
                     appendLog(msg, LogLevel::Error);
                 }
                 break;
@@ -1073,7 +1073,7 @@ bool HorizonsDialog::handleResult(openspace::HorizonsResultCode& result) {
             break;
         }
         case HorizonsResultCode::MultipleObserver: {
-            std::string msg = fmt::format(
+            std::string msg = std::format(
                 "Multiple matches were found for observer '{}'", _observerName
             );
             appendLog(msg, HorizonsDialog::LogLevel::Warning);
@@ -1087,7 +1087,7 @@ bool HorizonsDialog::handleResult(openspace::HorizonsResultCode& result) {
                     HorizonsDialog::LogLevel::Error
                 );
                 if (!_latestHorizonsError.empty()) {
-                    msg = fmt::format("Latest Horizons error: {}", _latestHorizonsError);
+                    msg = std::format("Latest Horizons error: {}", _latestHorizonsError);
                     appendLog(msg, LogLevel::Error);
                 }
                 break;
@@ -1106,12 +1106,12 @@ bool HorizonsDialog::handleResult(openspace::HorizonsResultCode& result) {
             break;
         }
         case HorizonsResultCode::ErrorNoTarget: {
-            std::string msg = fmt::format(
+            std::string msg = std::format(
                 "No match was found for target '{}'", _targetName
             );
             appendLog(msg, HorizonsDialog::LogLevel::Error);
 
-            msg = fmt::format(
+            msg = std::format(
                 "Try to use '{}*' as target to search for possible matches", _targetName
             );
             appendLog(msg, HorizonsDialog::LogLevel::Info);
@@ -1132,7 +1132,7 @@ bool HorizonsDialog::handleResult(openspace::HorizonsResultCode& result) {
             // Format: ID#, Name, Designation, IAU/aliases/other
             // Line after data: Number of matches =  X. Use ID# to make unique selection.
 
-            std::string msg = fmt::format(
+            std::string msg = std::format(
                 "Multiple matches were found for target '{}'", _targetName
             );
             appendLog(msg, HorizonsDialog::LogLevel::Warning);
@@ -1146,7 +1146,7 @@ bool HorizonsDialog::handleResult(openspace::HorizonsResultCode& result) {
                     HorizonsDialog::LogLevel::Error
                 );
                 if (!_latestHorizonsError.empty()) {
-                    msg = fmt::format("Latest Horizons error: {}", _latestHorizonsError);
+                    msg = std::format("Latest Horizons error: {}", _latestHorizonsError);
                     appendLog(msg, LogLevel::Error);
                 }
                 break;
@@ -1167,7 +1167,7 @@ bool HorizonsDialog::handleResult(openspace::HorizonsResultCode& result) {
         case HorizonsResultCode::UnknownError: {
             appendLog("Unknown error", LogLevel::Error);
             if (!_latestHorizonsError.empty()) {
-                const std::string msg = fmt::format(
+                const std::string msg = std::format(
                     "Latest Horizons error: {}", _latestHorizonsError
                 );
                 appendLog(msg, LogLevel::Error);
@@ -1177,7 +1177,7 @@ bool HorizonsDialog::handleResult(openspace::HorizonsResultCode& result) {
         }
         default: {
             if (!_latestHorizonsError.empty()) {
-                const std::string msg = fmt::format(
+                const std::string msg = std::format(
                     "Latest Horizons error: {}", _latestHorizonsError
                 );
                 appendLog(msg, LogLevel::Error);
diff --git a/apps/OpenSpace/ext/launcher/src/profile/profileedit.cpp b/apps/OpenSpace/ext/launcher/src/profile/profileedit.cpp
index 233de812ff..6d9abae5e5 100644
--- a/apps/OpenSpace/ext/launcher/src/profile/profileedit.cpp
+++ b/apps/OpenSpace/ext/launcher/src/profile/profileedit.cpp
@@ -81,7 +81,7 @@ namespace {
             );
 
             std::string name = it != actions.end() ? it->name : "Unknown action";
-            results += fmt::format("{} ({})\n", name, ghoul::to_string(k.key));
+            results += std::format("{} ({})\n", name, ghoul::to_string(k.key));
         }
         return results;
     }
@@ -89,7 +89,7 @@ namespace {
     std::string summarizeProperties(const std::vector<Profile::Property>& properties) {
         std::string results;
         for (openspace::Profile::Property p : properties) {
-            results += fmt::format("{} = {}\n", p.name, p.value);
+            results += std::format("{} = {}\n", p.name, p.value);
         }
         return results;
     }
@@ -489,7 +489,7 @@ void ProfileEdit::approved() {
         return;
     }
 
-    const std::filesystem::path p = fmt::format(
+    const std::filesystem::path p = std::format(
         "{}/{}.profile", _builtInProfilesPath, profileName
     );
     if (std::filesystem::exists(p)) {
diff --git a/apps/OpenSpace/ext/launcher/src/profile/scriptlogdialog.cpp b/apps/OpenSpace/ext/launcher/src/profile/scriptlogdialog.cpp
index 191c2006b7..2287f48423 100644
--- a/apps/OpenSpace/ext/launcher/src/profile/scriptlogdialog.cpp
+++ b/apps/OpenSpace/ext/launcher/src/profile/scriptlogdialog.cpp
@@ -65,7 +65,7 @@ void ScriptlogDialog::createWidgets() {
 
     QGridLayout* layout = new QGridLayout(this);
     {
-        QLabel* heading = new QLabel(QString::fromStdString(fmt::format(
+        QLabel* heading = new QLabel(QString::fromStdString(std::format(
             "Choose commands from \"{}\"", _scriptLogFile
         )));
         heading->setObjectName("heading");
@@ -84,7 +84,7 @@ void ScriptlogDialog::createWidgets() {
                 );
                 _scriptLogFile = file.toStdString();
         
-                heading->setText(QString::fromStdString(fmt::format(
+                heading->setText(QString::fromStdString(std::format(
                     "Choose commands from \"{}\"", _scriptLogFile
                 )));
                 loadScriptFile();
diff --git a/apps/OpenSpace/ext/launcher/src/profile/timedialog.cpp b/apps/OpenSpace/ext/launcher/src/profile/timedialog.cpp
index ca81de16e2..6aa1998b04 100644
--- a/apps/OpenSpace/ext/launcher/src/profile/timedialog.cpp
+++ b/apps/OpenSpace/ext/launcher/src/profile/timedialog.cpp
@@ -33,7 +33,7 @@
 #include <QLabel>
 #include <QLineEdit>
 #include <QVBoxLayout>
-#include <fmt/format.h>
+#include <format>
 #include <algorithm>
 
 using namespace openspace;
@@ -175,7 +175,7 @@ void TimeDialog::approved() {
     else {
         Profile::Time t;
         t.type = Profile::Time::Type::Absolute;
-        t.value = fmt::format(
+        t.value = std::format(
             "{}T{}",
             _absoluteEdit->date().toString("yyyy-MM-dd").toStdString(),
             _absoluteEdit->time().toString().toStdString()
diff --git a/apps/OpenSpace/ext/launcher/src/sgctedit/displaywindowunion.cpp b/apps/OpenSpace/ext/launcher/src/sgctedit/displaywindowunion.cpp
index b411b8979d..88961d3c9f 100644
--- a/apps/OpenSpace/ext/launcher/src/sgctedit/displaywindowunion.cpp
+++ b/apps/OpenSpace/ext/launcher/src/sgctedit/displaywindowunion.cpp
@@ -94,7 +94,7 @@ void DisplayWindowUnion::createWidgets(int nMaxWindows,
         layoutMonButton->addStretch(1);
 
         _addWindowButton = new QPushButton("Add Window");
-        _addWindowButton->setToolTip(QString::fromStdString(fmt::format(
+        _addWindowButton->setToolTip(QString::fromStdString(std::format(
             "Add a window to the configuration (up to {} windows allowed)", nMaxWindows
         )));
         _addWindowButton->setFocusPolicy(Qt::NoFocus);
diff --git a/apps/OpenSpace/ext/launcher/src/sgctedit/windowcontrol.cpp b/apps/OpenSpace/ext/launcher/src/sgctedit/windowcontrol.cpp
index ba7a7358cd..40500298f0 100644
--- a/apps/OpenSpace/ext/launcher/src/sgctedit/windowcontrol.cpp
+++ b/apps/OpenSpace/ext/launcher/src/sgctedit/windowcontrol.cpp
@@ -76,7 +76,7 @@ namespace {
     QList<QString> monitorNames(const std::vector<QRect>& resolutions) {
         QList<QString> monitorNames;
         for (size_t i = 0; i < resolutions.size(); i++) {
-            const std::string fullName = fmt::format(
+            const std::string fullName = std::format(
                 "{} ({}x{})",
                 MonitorNames[i], resolutions[i].width(), resolutions[i].height()
             );
@@ -122,7 +122,7 @@ void WindowControl::createWidgets(const QColor& windowColor) {
     layout->setRowStretch(8, 1);
     
     _windowNumber = new QLabel("Window " + QString::number(_windowIndex + 1));
-    _windowNumber->setStyleSheet(QString::fromStdString(fmt::format(
+    _windowNumber->setStyleSheet(QString::fromStdString(std::format(
         "QLabel {{ color : #{:02x}{:02x}{:02x}; }}",
         windowColor.red(), windowColor.green(), windowColor.blue()
     )));
diff --git a/apps/OpenSpace/ext/sgct b/apps/OpenSpace/ext/sgct
index 5c5ffb9d2d..9bcd52ac18 160000
--- a/apps/OpenSpace/ext/sgct
+++ b/apps/OpenSpace/ext/sgct
@@ -1 +1 @@
-Subproject commit 5c5ffb9d2d6039a7a40c668625188aaed45cb451
+Subproject commit 9bcd52ac187bc6ecff7af069b106d07dfc22a9be
diff --git a/apps/OpenSpace/main.cpp b/apps/OpenSpace/main.cpp
index bd7199198e..f999623859 100644
--- a/apps/OpenSpace/main.cpp
+++ b/apps/OpenSpace/main.cpp
@@ -140,7 +140,7 @@ LONG WINAPI generateMiniDump(EXCEPTION_POINTERS* exceptionPointers) {
         LINFO(s);
     }
 
-    std::string dumpFile = fmt::format(
+    std::string dumpFile = std::format(
         "OpenSpace_{}_{}_{}-{}-{}-{}-{}-{}-{}--{}--{}.dmp",
         OPENSPACE_VERSION_MAJOR,
         OPENSPACE_VERSION_MINOR,
@@ -155,7 +155,7 @@ LONG WINAPI generateMiniDump(EXCEPTION_POINTERS* exceptionPointers) {
         GetCurrentThreadId()
     );
 
-    LINFO(fmt::format("Creating dump file: {}", dumpFile));
+    LINFO(std::format("Creating dump file: {}", dumpFile));
 
     HANDLE hDumpFile = CreateFileA(
         dumpFile.c_str(),
@@ -826,7 +826,7 @@ void setSgctDelegateFunctions() {
         glfwGetWindowContentScale(dpiWindow->windowHandle(), &scale.x, &scale.y);
 
         if (scale.x != scale.y) {
-            LWARNING(fmt::format(
+            LWARNING(std::format(
                 "Non-square window scaling detected ({0}x{1}), using {0}x{0} instead",
                 scale.x, scale.y
             ));
@@ -1029,7 +1029,7 @@ std::string setWindowConfigPresetForGui(const std::string& labelFromCfgFile,
     std::string preset;
     const bool sgctCfgFileSpecifiedByLua = !config.sgctConfigNameInitialized.empty();
     if (haveCliSGCTConfig) {
-        preset = fmt::format("{} (from CLI)", config.windowConfiguration);
+        preset = std::format("{} (from CLI)", config.windowConfiguration);
     }
     else if (sgctCfgFileSpecifiedByLua) {
         preset = config.sgctConfigNameInitialized + labelFromCfgFile;
@@ -1066,7 +1066,7 @@ std::string selectedSgctProfileFromLauncher(LauncherWindow& lw, bool hasCliSGCTC
                     config += ".json";
                 }
                 else {
-                    throw ghoul::RuntimeError(fmt::format(
+                    throw ghoul::RuntimeError(std::format(
                         "Error loading configuration file '{}'. File could not be found",
                         config
                     ));
@@ -1119,7 +1119,7 @@ int main(int argc, char* argv[]) {
         std::filesystem::current_path() / std::filesystem::path(argv[0]).parent_path(),
         ghoul::filesystem::FileSystem::Override::Yes
     );
-    LDEBUG(fmt::format("Registering ${{BIN}} to '{}'", absPath("${BIN}")));
+    LDEBUG(std::format("Registering ${{BIN}} to '{}'", absPath("${BIN}")));
 
     //
     // Parse commandline arguments
@@ -1203,11 +1203,11 @@ int main(int argc, char* argv[]) {
         if (!std::filesystem::is_regular_file(configurationFilePath)) {
             LFATALC(
                 "main",
-                fmt::format("Could not find configuration '{}'", configurationFilePath)
+                std::format("Could not find configuration '{}'", configurationFilePath)
             );
             exit(EXIT_FAILURE);
         }
-        LINFO(fmt::format("Configuration Path '{}'", configurationFilePath));
+        LINFO(std::format("Configuration Path '{}'", configurationFilePath));
 
         // Register the base path as the directory where the configuration file lives
         std::filesystem::path base = configurationFilePath.parent_path();
@@ -1265,7 +1265,7 @@ int main(int argc, char* argv[]) {
                     properties::Property::Visibility::Developer;
             }
             else {
-                throw ghoul::RuntimeError(fmt::format(
+                throw ghoul::RuntimeError(std::format(
                     "Unknown property visibility value '{}'",
                     *commandlineArguments.propertyVisibility
                 ));
@@ -1329,7 +1329,7 @@ int main(int argc, char* argv[]) {
             QMessageBox::warning(
                 nullptr,
                 "OpenSpace",
-                QString::fromStdString(fmt::format(
+                QString::fromStdString(std::format(
                     "The OpenSpace folder is started must not contain any of \"'\", "
                     "\"\"\", [, or ]. Path is: {}. Unexpected errors will occur when "
                     "proceeding to run the software", pwd
diff --git a/apps/Sync/main.cpp b/apps/Sync/main.cpp
index 3a4255997e..d40c84b4ba 100644
--- a/apps/Sync/main.cpp
+++ b/apps/Sync/main.cpp
@@ -64,7 +64,7 @@ int main(int, char**) {
         Task& task = *tasks[i].get();
         LINFOC(
             "Sync",
-            fmt::format(
+            std::format(
                 "Synchronizing scene {} out of {}: {}",
                 i + 1, tasks.size(), task.description()
             )
diff --git a/apps/TaskRunner/main.cpp b/apps/TaskRunner/main.cpp
index 81316a9d04..a3593ea4a9 100644
--- a/apps/TaskRunner/main.cpp
+++ b/apps/TaskRunner/main.cpp
@@ -74,12 +74,12 @@ void performTasks(const std::string& path) {
         LINFO("Task queue has 1 item");
     }
     else {
-        LINFO(fmt::format("Task queue has {} items", tasks.size()));
+        LINFO(std::format("Task queue has {} items", tasks.size()));
     }
 
     for (size_t i = 0; i < tasks.size(); i++) {
         Task& task = *tasks[i].get();
-        LINFO(fmt::format(
+        LINFO(std::format(
             "Performing task {} out of {}: {}", i + 1, tasks.size(), task.description()
         ));
         ProgressBar progressBar(100);
@@ -164,7 +164,7 @@ int main(int argc, char** argv) {
 
     // If no task file was specified in as argument, run in CLI mode.
 
-    LINFO(fmt::format("Task root: {}", absPath("${TASKS}")));
+    LINFO(std::format("Task root: {}", absPath("${TASKS}")));
     std::filesystem::current_path(absPath("${TASKS}"));
 
     std::cout << "TASK > ";
diff --git a/ext/ghoul b/ext/ghoul
index 580fe25d6c..c5164de300 160000
--- a/ext/ghoul
+++ b/ext/ghoul
@@ -1 +1 @@
-Subproject commit 580fe25d6ce12842f397b451601e815d03d95bec
+Subproject commit c5164de300f56b5034ec94fcefe7e6a6c03e4bfe
diff --git a/include/openspace/documentation/verifier.inl b/include/openspace/documentation/verifier.inl
index 8ed86be2b3..39ebc08663 100644
--- a/include/openspace/documentation/verifier.inl
+++ b/include/openspace/documentation/verifier.inl
@@ -378,12 +378,12 @@ TestResult InListVerifier<T>::operator()(const ghoul::Dictionary& dict,
             std::string list = std::accumulate(
                 values.begin() + 1,
                 values.end(),
-                fmt::format("{}", values.front()),
+                std::format("{}", values.front()),
                 [](std::string lhs, typename T::Type rhs) {
-                    return fmt::format("{}, {}", lhs, rhs);
+                    return std::format("{}, {}", lhs, rhs);
                 }
             );
-            o.explanation = fmt::format(
+            o.explanation = std::format(
                 "'{}' not in list of accepted values '{}'",
                 key, list
             );
diff --git a/include/openspace/interaction/joystickcamerastates.h b/include/openspace/interaction/joystickcamerastates.h
index 5b2a993d04..46cc3f6d7b 100644
--- a/include/openspace/interaction/joystickcamerastates.h
+++ b/include/openspace/interaction/joystickcamerastates.h
@@ -196,7 +196,7 @@ from_string(std::string_view string)
     if (string == "Pan Y") { return T::PanY; }
     if (string == "Property") { return T::Property; }
 
-    throw RuntimeError(fmt::format("Unknown axis type '{}'", string), "Joystick");
+    throw RuntimeError(std::format("Unknown axis type '{}'", string), "Joystick");
 }
 
 template <>
@@ -220,7 +220,7 @@ from_string(std::string_view string)
     if (string == "JoystickLike") { return T::JoystickLike; }
     if (string == "TriggerLike") { return T::TriggerLike; }
 
-    throw RuntimeError(fmt::format("Unknown joystick type '{}'", string), "Joystick");
+    throw RuntimeError(std::format("Unknown joystick type '{}'", string), "Joystick");
 }
 
 } // namespace ghoul
diff --git a/include/openspace/interaction/joystickinputstate.h b/include/openspace/interaction/joystickinputstate.h
index 0370470589..9c7a182c3f 100644
--- a/include/openspace/interaction/joystickinputstate.h
+++ b/include/openspace/interaction/joystickinputstate.h
@@ -150,7 +150,7 @@ constexpr openspace::interaction::JoystickAction from_string(std::string_view st
     if (string == "Repeat")  { return openspace::interaction::JoystickAction::Repeat; }
     if (string == "Release") { return openspace::interaction::JoystickAction::Release; }
 
-    throw RuntimeError(fmt::format("Unknown action '{}'", string));
+    throw RuntimeError(std::format("Unknown action '{}'", string));
 }
 
 } // namespace ghoul
diff --git a/include/openspace/network/messagestructures.h b/include/openspace/network/messagestructures.h
index f959ddc9b1..0cbc6281b0 100644
--- a/include/openspace/network/messagestructures.h
+++ b/include/openspace/network/messagestructures.h
@@ -407,7 +407,7 @@ struct ScriptMessage {
         if (buffer.size() != (sizeof(uint32_t) + len)) {
             LERRORC(
                 "ParallelPeer",
-                fmt::format(
+                std::format(
                     "Received buffer with wrong size. Expected {} got {}",
                     len, buffer.size()
                 )
diff --git a/include/openspace/properties/numericalproperty.inl b/include/openspace/properties/numericalproperty.inl
index ce87cd47b0..284b821e35 100644
--- a/include/openspace/properties/numericalproperty.inl
+++ b/include/openspace/properties/numericalproperty.inl
@@ -110,7 +110,7 @@ void NumericalProperty<T>::setExponent(float exponent) {
         if (!isValidRange(_minimumValue, _maximumValue)) {
             LWARNINGC(
                 "NumericalProperty: setExponent",
-                fmt::format(
+                std::format(
                     "Setting exponent for properties with negative values in "
                     "[min, max] range is not yet supported. Property: {}",
                     this->fullyQualifiedIdentifier()
diff --git a/include/openspace/util/json_helper.inl b/include/openspace/util/json_helper.inl
index 33e8e827c9..62a4c96f9b 100644
--- a/include/openspace/util/json_helper.inl
+++ b/include/openspace/util/json_helper.inl
@@ -76,7 +76,7 @@ std::string formatJson(T value) {
             values += std::to_string(value[i]) + ',';
         }
         values.pop_back();
-        return fmt::format("[{}]", values);
+        return std::format("[{}]", values);
     }
     else if constexpr (internal::isGlmMatrix<T>()) {
         std::string values;
@@ -86,7 +86,7 @@ std::string formatJson(T value) {
             }
         }
         values.pop_back();
-        return fmt::format("[{}]", values);
+        return std::format("[{}]", values);
     }
     else {
         static_assert(sizeof(T) == 0, "JSON formatting of type T not implemented");
diff --git a/include/openspace/util/spicemanager.h b/include/openspace/util/spicemanager.h
index 7cf10f7b9d..bd01734f9d 100644
--- a/include/openspace/util/spicemanager.h
+++ b/include/openspace/util/spicemanager.h
@@ -578,7 +578,7 @@ public:
 
         timout_c(ephemerisTime, format, bufferSize, outBuf);
         if (failed_c()) {
-            throwSpiceError(fmt::format(
+            throwSpiceError(std::format(
                 "Error converting ephemeris time '{}' to date with format '{}'",
                     ephemerisTime, format
             ));
diff --git a/modules/atmosphere/rendering/atmospheredeferredcaster.cpp b/modules/atmosphere/rendering/atmospheredeferredcaster.cpp
index 5bdee24199..0bcf5b29e5 100644
--- a/modules/atmosphere/rendering/atmospheredeferredcaster.cpp
+++ b/modules/atmosphere/rendering/atmospheredeferredcaster.cpp
@@ -488,7 +488,7 @@ void AtmosphereDeferredcaster::preRaycast(const RenderData& data, const Deferred
         unsigned int counter = 0;
         for (const ShadowRenderingStruct& sd : _shadowDataArrayCache) {
             // Add the counter
-            char* bf = fmt::format_to(_uniformNameBuffer + 16, "{}", counter);
+            char* bf = std::format_to(_uniformNameBuffer + 16, "{}", counter);
 
             std::strcpy(bf, "].isShadowing\0");
             program.setUniform(_uniformNameBuffer, sd.isShadowing);
@@ -842,7 +842,7 @@ void AtmosphereDeferredcaster::calculateDeltaJ(int scatteringOrder,
     }
     if (_saveCalculationTextures) {
         saveTextureFile(
-            fmt::format("deltaJ_texture-scattering_order-{}.ppm", scatteringOrder),
+            std::format("deltaJ_texture-scattering_order-{}.ppm", scatteringOrder),
             glm::ivec2(_textureSize)
         );
     }
@@ -882,7 +882,7 @@ void AtmosphereDeferredcaster::calculateDeltaE(int scatteringOrder,
     glDrawArrays(GL_TRIANGLES, 0, 6);
     if (_saveCalculationTextures) {
         saveTextureFile(
-            fmt::format("deltaE_texture-scattering_order-{}.ppm", scatteringOrder),
+            std::format("deltaE_texture-scattering_order-{}.ppm", scatteringOrder),
             _deltaETableSize
         );
     }
@@ -922,7 +922,7 @@ void AtmosphereDeferredcaster::calculateDeltaS(int scatteringOrder,
     }
     if (_saveCalculationTextures) {
         saveTextureFile(
-            fmt::format("deltaS_texture-scattering_order-{}.ppm", scatteringOrder),
+            std::format("deltaS_texture-scattering_order-{}.ppm", scatteringOrder),
             glm::ivec2(_textureSize)
         );
     }
@@ -953,7 +953,7 @@ void AtmosphereDeferredcaster::calculateIrradiance(int scatteringOrder,
     glDrawArrays(GL_TRIANGLES, 0, 6);
     if (_saveCalculationTextures) {
         saveTextureFile(
-            fmt::format("irradianceTable_order-{}.ppm", scatteringOrder),
+            std::format("irradianceTable_order-{}.ppm", scatteringOrder),
             _deltaETableSize
         );
     }
@@ -990,7 +990,7 @@ void AtmosphereDeferredcaster::calculateInscattering(int scatteringOrder,
     }
     if (_saveCalculationTextures) {
         saveTextureFile(
-            fmt::format("inscatteringTable_order-{}.ppm", scatteringOrder),
+            std::format("inscatteringTable_order-{}.ppm", scatteringOrder),
             glm::ivec2(_textureSize)
         );
     }
diff --git a/modules/base/dashboard/dashboarditemangle.cpp b/modules/base/dashboard/dashboarditemangle.cpp
index 7a8857d8e0..4a59cbdd66 100644
--- a/modules/base/dashboard/dashboarditemangle.cpp
+++ b/modules/base/dashboard/dashboarditemangle.cpp
@@ -269,7 +269,7 @@ void DashboardItemAngle::render(glm::vec2& penPosition) {
 
     std::fill(_buffer.begin(), _buffer.end(), char(0));
     if (glm::length(a) == 0.0 || glm::length(b) == 0) {
-        char* end = fmt::format_to(
+        char* end = std::format_to(
             _buffer.data(),
             "Could not compute angle at {} between {} and {}",
             sourceInfo.second, destinationInfo.second, referenceInfo.second
@@ -286,7 +286,7 @@ void DashboardItemAngle::render(glm::vec2& penPosition) {
             glm::acos(glm::dot(a, b) / (glm::length(a) * glm::length(b)))
         );
 
-        char* end = fmt::format_to(
+        char* end = std::format_to(
             _buffer.data(),
             "Angle at {} between {} and {}: {} degrees",
             sourceInfo.second, destinationInfo.second, referenceInfo.second, angle
diff --git a/modules/base/dashboard/dashboarditemdate.cpp b/modules/base/dashboard/dashboarditemdate.cpp
index 2a9d6574b9..f2fe23b3a3 100644
--- a/modules/base/dashboard/dashboarditemdate.cpp
+++ b/modules/base/dashboard/dashboarditemdate.cpp
@@ -97,10 +97,11 @@ void DashboardItemDate::render(glm::vec2& penPosition) {
         RenderFont(
             *_font,
             penPosition,
-            fmt::format(fmt::runtime(_formatString.value()), time)
+            // @CPP26(abock): This can be replaced with std::runtime_format
+            std::vformat(_formatString.value(), std::make_format_args(time))
         );
     }
-    catch (const fmt::format_error&) {
+    catch (const std::format_error&) {
         LERRORC("DashboardItemDate", "Illegal format string");
     }
     penPosition.y -= _font->height();
@@ -110,7 +111,10 @@ glm::vec2 DashboardItemDate::size() const {
     ZoneScoped;
 
     std::string_view time = global::timeManager->time().UTC();
-    return _font->boundingBox(fmt::format(fmt::runtime(_formatString.value()), time));
+    // @CPP26(abock): This can be replaced with std::runtime_format
+    return _font->boundingBox(
+        std::vformat(_formatString.value(), std::make_format_args(time))
+    );
 }
 
 } // namespace openspace
diff --git a/modules/base/dashboard/dashboarditemdistance.cpp b/modules/base/dashboard/dashboarditemdistance.cpp
index 241024118f..b3dcf73d25 100644
--- a/modules/base/dashboard/dashboarditemdistance.cpp
+++ b/modules/base/dashboard/dashboarditemdistance.cpp
@@ -369,16 +369,22 @@ void DashboardItemDistance::render(glm::vec2& penPosition) {
 
     std::fill(_buffer.begin(), _buffer.end(), char(0));
     try {
-        char* end = fmt::format_to(
+        // @CPP26(abock): This can be replaced with std::runtime_format
+        char* end = std::vformat_to(
             _buffer.data(),
-            fmt::runtime(_formatString.value()),
-            sourceInfo.second, destinationInfo.second, dist.first, dist.second
+            _formatString.value(),
+            std::make_format_args(
+                sourceInfo.second,
+                destinationInfo.second,
+                dist.first,
+                dist.second
+            )
         );
 
         const std::string_view t = std::string_view(_buffer.data(), end - _buffer.data());
         RenderFont(*_font, penPosition, t);
     }
-    catch (const fmt::format_error&) {
+    catch (const std::format_error&) {
         LERRORC("DashboardItemDate", "Illegal format string");
     }
     penPosition.y -= _font->height();
@@ -399,7 +405,7 @@ glm::vec2 DashboardItemDistance::size() const {
     }
 
     return _font->boundingBox(
-        fmt::format("Distance from focus: {} {}", dist.first, dist.second)
+        std::format("Distance from focus: {} {}", dist.first, dist.second)
     );
 }
 
diff --git a/modules/base/dashboard/dashboarditemelapsedtime.cpp b/modules/base/dashboard/dashboarditemelapsedtime.cpp
index b1b623bd8c..9e231f8840 100644
--- a/modules/base/dashboard/dashboarditemelapsedtime.cpp
+++ b/modules/base/dashboard/dashboarditemelapsedtime.cpp
@@ -153,7 +153,7 @@ void DashboardItemElapsedTime::render(glm::vec2& penPosition) {
         const std::vector<std::pair<double, std::string_view>> ts = splitTime(delta);
         std::string time;
         for (const std::pair<double, std::string_view>& t : ts) {
-            time += fmt::format("{} {} ", t.first, t.second);
+            time += std::format("{} {} ", t.first, t.second);
             if (t.second == lowestUnitS || t.second == lowestUnitP) {
                 // We have reached the lowest unit the user was interested in
                 break;
@@ -166,15 +166,17 @@ void DashboardItemElapsedTime::render(glm::vec2& penPosition) {
         RenderFont(
             *_font,
             penPosition,
-            fmt::format(fmt::runtime(_formatString.value()), time)
+            // @CPP26(abock): This can be replaced with std::runtime_format
+            std::vformat(_formatString.value(), std::make_format_args(time))
         );
     }
     else {
-        std::string time = fmt::format("{} s", delta);
+        std::string time = std::format("{} s", delta);
         RenderFont(
             *_font,
             penPosition,
-            fmt::format(fmt::runtime(_formatString.value()), time)
+            // @CPP26(abock): This can be replaced with std::runtime_format
+            std::vformat(_formatString.value(), std::make_format_args(time))
         );
     }
 
@@ -185,7 +187,10 @@ glm::vec2 DashboardItemElapsedTime::size() const {
     ZoneScoped;
 
     const double delta = global::timeManager->time().j2000Seconds() - _referenceJ2000;
-    return _font->boundingBox(fmt::format(fmt::runtime(_formatString.value()), delta));
+    // @CPP26(abock): This can be replaced with std::runtime_format
+    return _font->boundingBox(
+        std::vformat(_formatString.value(), std::make_format_args(delta))
+    );
 }
 
 } // namespace openspace
diff --git a/modules/base/dashboard/dashboarditemframerate.cpp b/modules/base/dashboard/dashboarditemframerate.cpp
index 51fa1aad01..279c9e200b 100644
--- a/modules/base/dashboard/dashboarditemframerate.cpp
+++ b/modules/base/dashboard/dashboarditemframerate.cpp
@@ -62,7 +62,7 @@ namespace {
     };
 
     [[ nodiscard ]] char* formatDt(std::vector<char>& buffer) {
-        return fmt::format_to(
+        return std::format_to(
             buffer.data(),
             "Avg. Frametime: {:.2f} ms\0",
             openspace::global::windowDelegate->averageDeltaTime() * 1000.0
@@ -73,7 +73,7 @@ namespace {
                                            double minFrametimeCache,
                                            double maxFrametimeCache)
     {
-        return fmt::format_to(
+        return std::format_to(
             buffer.data(),
             "Last frametimes between: {:.2f} and {:.2f} ms\n"
             "Overall between: {:.2f} and {:.2f} ms\0",
@@ -85,7 +85,7 @@ namespace {
     }
 
     [[ nodiscard ]] char* formatDtStandardDeviation(std::vector<char>& buffer) {
-        return fmt::format_to(
+        return std::format_to(
             buffer.data(),
             "Frametime standard deviation : {:.2f} ms\0",
             openspace::global::windowDelegate->deltaTimeStandardDeviation() * 1000.0
@@ -93,7 +93,7 @@ namespace {
     }
 
     [[ nodiscard ]] char* formatDtCoefficientOfVariation(std::vector<char>& buffer) {
-        return fmt::format_to(
+        return std::format_to(
             buffer.data(),
             "Frametime coefficient of variation : {:.2f} %\0",
             openspace::global::windowDelegate->deltaTimeStandardDeviation() /
@@ -102,7 +102,7 @@ namespace {
     }
 
     [[ nodiscard ]] char* formatFps(std::vector<char>& buffer) {
-        return fmt::format_to(
+        return std::format_to(
             buffer.data(),
             "FPS: {:3.2f}\0",
             1.0 / openspace::global::windowDelegate->deltaTime()
@@ -110,7 +110,7 @@ namespace {
     }
 
     [[ nodiscard ]] char* formatAverageFps(std::vector<char>& buffer) {
-        return fmt::format_to(
+        return std::format_to(
             buffer.data(),
             "Avg. FPS: {:3.2f}\0",
             1.0 / openspace::global::windowDelegate->averageDeltaTime()
diff --git a/modules/base/dashboard/dashboarditemmission.cpp b/modules/base/dashboard/dashboarditemmission.cpp
index 8fb771448c..bd6c589e5d 100644
--- a/modules/base/dashboard/dashboarditemmission.cpp
+++ b/modules/base/dashboard/dashboarditemmission.cpp
@@ -107,7 +107,7 @@ void DashboardItemMission::render(glm::vec2& penPosition) {
         RenderFont(
             *_font,
             penPosition,
-            fmt::format("{:.0f} s {:s} {:.1f} %", remaining, progress, t * 100),
+            std::format("{:.0f} s {:s} {:.1f} %", remaining, progress, t * 100),
             missionProgressColor
         );
     }
@@ -119,7 +119,7 @@ void DashboardItemMission::render(glm::vec2& penPosition) {
         RenderFont(
             *_font,
             penPosition,
-            fmt::format("{:.0f} s", remaining),
+            std::format("{:.0f} s", remaining),
             nextMissionColor
         );
     }
@@ -148,7 +148,7 @@ void DashboardItemMission::render(glm::vec2& penPosition) {
             RenderFont(
                 *_font,
                 penPosition,
-                fmt::format(
+                std::format(
                     "{:s}  {:s} {:.1f} %",
                     phase->name(),progress,t * 100
                 ),
diff --git a/modules/base/dashboard/dashboarditemparallelconnection.cpp b/modules/base/dashboard/dashboarditemparallelconnection.cpp
index 22d3b6f4ce..7e475b2e14 100644
--- a/modules/base/dashboard/dashboarditemparallelconnection.cpp
+++ b/modules/base/dashboard/dashboarditemparallelconnection.cpp
@@ -68,8 +68,8 @@ void DashboardItemParallelConnection::render(glm::vec2& penPosition) {
 
         connectionInfo =
             (nClients == 1) ?
-            fmt::format(Singular, nClients) :
-            fmt::format(Plural, nClients);
+            std::format(Singular, nClients) :
+            std::format(Plural, nClients);
     }
     else if (status == ParallelConnection::Status::ClientWithHost) {
         nClients--;
@@ -86,11 +86,11 @@ void DashboardItemParallelConnection::render(glm::vec2& penPosition) {
 
         if (nClients > 2) {
             constexpr std::string_view Plural = "You and {} more clients are tuned in";
-            connectionInfo += fmt::format(Plural, nClients - 1);
+            connectionInfo += std::format(Plural, nClients - 1);
         }
         else if (nClients == 2) {
             constexpr std::string_view Singular = "You and {} more client are tuned in";
-            connectionInfo += fmt::format(Singular, nClients - 1);
+            connectionInfo += std::format(Singular, nClients - 1);
         }
         else if (nClients == 1) {
             connectionInfo += "You are the only client";
@@ -120,7 +120,7 @@ glm::vec2 DashboardItemParallelConnection::size() const {
             connectionInfo = "Hosting session with 1 client";
         }
         else {
-            connectionInfo = fmt::format("Hosting session with {} clients", nClients);
+            connectionInfo = std::format("Hosting session with {} clients", nClients);
         }
     }
     else if (status == ParallelConnection::Status::ClientWithHost) {
@@ -137,11 +137,11 @@ glm::vec2 DashboardItemParallelConnection::size() const {
         connectionInfo += "\n";
         if (nClients > 2) {
             constexpr std::string_view Plural = "You and {} more clients are tuned in";
-            connectionInfo += fmt::format(Plural, nClients);
+            connectionInfo += std::format(Plural, nClients);
         }
         else if (nClients == 2) {
             constexpr std::string_view Singular = "You and {} more client are tuned in";
-            connectionInfo += fmt::format(Singular, nClients - 1);
+            connectionInfo += std::format(Singular, nClients - 1);
         }
         else if (nClients == 1) {
             connectionInfo += "You are the only client";
diff --git a/modules/base/dashboard/dashboarditempropertyvalue.cpp b/modules/base/dashboard/dashboarditempropertyvalue.cpp
index 0846e8c680..49f48920a5 100644
--- a/modules/base/dashboard/dashboarditempropertyvalue.cpp
+++ b/modules/base/dashboard/dashboarditempropertyvalue.cpp
@@ -124,7 +124,8 @@ void DashboardItemPropertyValue::render(glm::vec2& penPosition) {
             RenderFont(
                 *_font,
                 penPosition,
-                fmt::format(fmt::runtime(_displayString.value()), value)
+                // @CPP26(abock): This can be replaced with std::runtime_format
+                std::vformat(_displayString.value(), std::make_format_args(value))
             );
         }
         else if (type == "FloatProperty") {
@@ -132,7 +133,8 @@ void DashboardItemPropertyValue::render(glm::vec2& penPosition) {
             RenderFont(
                 *_font,
                 penPosition,
-                fmt::format(fmt::runtime(_displayString.value()), value)
+                // @CPP26(abock): This can be replaced with std::runtime_format
+                std::vformat(_displayString.value(), std::make_format_args(value))
             );
         }
         else if (type == "IntProperty") {
@@ -140,7 +142,8 @@ void DashboardItemPropertyValue::render(glm::vec2& penPosition) {
             RenderFont(
                 *_font,
                 penPosition,
-                fmt::format(fmt::runtime(_displayString.value()), value)
+                // @CPP26(abock): This can be replaced with std::runtime_format
+                std::vformat(_displayString.value(), std::make_format_args(value))
             );
         }
         else if (type == "LongProperty") {
@@ -148,7 +151,8 @@ void DashboardItemPropertyValue::render(glm::vec2& penPosition) {
             RenderFont(
                 *_font,
                 penPosition,
-                fmt::format(fmt::runtime(_displayString.value()), value)
+                // @CPP26(abock): This can be replaced with std::runtime_format
+                std::vformat(_displayString.value(), std::make_format_args(value))
             );
         }
         else if (type == "ShortProperty") {
@@ -156,7 +160,8 @@ void DashboardItemPropertyValue::render(glm::vec2& penPosition) {
             RenderFont(
                 *_font,
                 penPosition,
-                fmt::format(fmt::runtime(_displayString.value()), value)
+                // @CPP26(abock): This can be replaced with std::runtime_format
+                std::vformat(_displayString.value(), std::make_format_args(value))
             );
         }
         else if (type == "UIntProperty") {
@@ -164,7 +169,8 @@ void DashboardItemPropertyValue::render(glm::vec2& penPosition) {
             RenderFont(
                 *_font,
                 penPosition,
-                fmt::format(fmt::runtime(_displayString.value()), v)
+                // @CPP26(abock): This can be replaced with std::runtime_format
+                std::vformat(_displayString.value(), std::make_format_args(v))
             );
         }
         else if (type == "ULongProperty") {
@@ -172,7 +178,8 @@ void DashboardItemPropertyValue::render(glm::vec2& penPosition) {
             RenderFont(
                 *_font,
                 penPosition,
-                fmt::format(fmt::runtime(_displayString.value()), v)
+                // @CPP26(abock): This can be replaced with std::runtime_format
+                std::vformat(_displayString.value(), std::make_format_args(v))
             );
         }
         else if (type == "UShortProperty") {
@@ -181,7 +188,8 @@ void DashboardItemPropertyValue::render(glm::vec2& penPosition) {
             RenderFont(
                 *_font,
                 penPosition,
-                fmt::format(fmt::runtime(_displayString.value()), v)
+                // @CPP26(abock): This can be replaced with std::runtime_format
+                std::vformat(_displayString.value(), std::make_format_args(v))
             );
         }
         else if (type == "DVec2Property") {
@@ -189,7 +197,8 @@ void DashboardItemPropertyValue::render(glm::vec2& penPosition) {
             RenderFont(
                 *_font,
                 penPosition,
-                fmt::format(fmt::runtime(_displayString.value()), v.x, v.y)
+                // @CPP26(abock): This can be replaced with std::runtime_format
+                std::vformat(_displayString.value(), std::make_format_args(v.x, v.y))
             );
         }
         else if (type == "DVec3Property") {
@@ -197,7 +206,8 @@ void DashboardItemPropertyValue::render(glm::vec2& penPosition) {
             RenderFont(
                 *_font,
                 penPosition,
-                fmt::format(fmt::runtime(_displayString.value()), v.x, v.y, v.z)
+                // @CPP26(abock): This can be replaced with std::runtime_format
+                std::vformat(_displayString.value(), std::make_format_args(v.x, v.y, v.z))
             );
         }
         else if (type == "DVec4Property") {
@@ -205,7 +215,11 @@ void DashboardItemPropertyValue::render(glm::vec2& penPosition) {
             RenderFont(
                 *_font,
                 penPosition,
-                fmt::format(fmt::runtime(_displayString.value()), v.x, v.y, v.z, v.w)
+                // @CPP26(abock): This can be replaced with std::runtime_format
+                std::vformat(
+                    _displayString.value(),
+                    std::make_format_args(v.x, v.y, v.z, v.w)
+                )
             );
         }
         else if (type == "IVec2Property") {
@@ -213,7 +227,8 @@ void DashboardItemPropertyValue::render(glm::vec2& penPosition) {
             RenderFont(
                 *_font,
                 penPosition,
-                fmt::format(fmt::runtime(_displayString.value()), v.x, v.y)
+                // @CPP26(abock): This can be replaced with std::runtime_format
+                std::vformat(_displayString.value(), std::make_format_args(v.x, v.y))
             );
         }
         else if (type == "IVec3Property") {
@@ -221,7 +236,8 @@ void DashboardItemPropertyValue::render(glm::vec2& penPosition) {
             RenderFont(
                 *_font,
                 penPosition,
-                fmt::format(fmt::runtime(_displayString.value()), v.x, v.y, v.z)
+                // @CPP26(abock): This can be replaced with std::runtime_format
+                std::vformat(_displayString.value(), std::make_format_args(v.x, v.y, v.z))
             );
         }
         else if (type == "IVec4Property") {
@@ -229,7 +245,11 @@ void DashboardItemPropertyValue::render(glm::vec2& penPosition) {
             RenderFont(
                 *_font,
                 penPosition,
-                fmt::format(fmt::runtime(_displayString.value()), v.x, v.y, v.z, v.w)
+                // @CPP26(abock): This can be replaced with std::runtime_format
+                std::vformat(
+                    _displayString.value(),
+                    std::make_format_args(v.x, v.y, v.z, v.w)
+                )
             );
         }
         else if (type == "UVec2Property") {
@@ -237,7 +257,8 @@ void DashboardItemPropertyValue::render(glm::vec2& penPosition) {
             RenderFont(
                 *_font,
                 penPosition,
-                fmt::format(fmt::runtime(_displayString.value()), v.x, v.y)
+                // @CPP26(abock): This can be replaced with std::runtime_format
+                std::vformat(_displayString.value(), std::make_format_args(v.x, v.y))
             );
         }
         else if (type == "UVec3Property") {
@@ -245,7 +266,8 @@ void DashboardItemPropertyValue::render(glm::vec2& penPosition) {
             RenderFont(
                 *_font,
                 penPosition,
-                fmt::format(fmt::runtime(_displayString.value()), v.x, v.y, v.z)
+                // @CPP26(abock): This can be replaced with std::runtime_format
+                std::vformat(_displayString.value(), std::make_format_args(v.x, v.y, v.z))
             );
         }
         else if (type == "UVec4Property") {
@@ -253,7 +275,11 @@ void DashboardItemPropertyValue::render(glm::vec2& penPosition) {
             RenderFont(
                 *_font,
                 penPosition,
-                fmt::format(fmt::runtime(_displayString.value()), v.x, v.y, v.z, v.w)
+                // @CPP26(abock): This can be replaced with std::runtime_format
+                std::vformat(
+                    _displayString.value(),
+                    std::make_format_args(v.x, v.y, v.z, v.w)
+                )
             );
         }
         else if (type == "Vec2Property") {
@@ -261,7 +287,8 @@ void DashboardItemPropertyValue::render(glm::vec2& penPosition) {
             RenderFont(
                 *_font,
                 penPosition,
-                fmt::format(fmt::runtime(_displayString.value()), v.x, v.y)
+                // @CPP26(abock): This can be replaced with std::runtime_format
+                std::vformat(_displayString.value(), std::make_format_args(v.x, v.y))
             );
         }
         else if (type == "Vec3Property") {
@@ -269,7 +296,8 @@ void DashboardItemPropertyValue::render(glm::vec2& penPosition) {
             RenderFont(
                 *_font,
                 penPosition,
-                fmt::format(fmt::runtime(_displayString.value()), v.x, v.y, v.z)
+                // @CPP26(abock): This can be replaced with std::runtime_format
+                std::vformat(_displayString.value(), std::make_format_args(v.x, v.y, v.z))
             );
         }
         else if (type == "Vec4Property") {
@@ -277,7 +305,11 @@ void DashboardItemPropertyValue::render(glm::vec2& penPosition) {
             RenderFont(
                 *_font,
                 penPosition,
-                fmt::format(fmt::runtime(_displayString.value()), v.x, v.y, v.z, v.w)
+                // @CPP26(abock): This can be replaced with std::runtime_format
+                std::vformat(
+                    _displayString.value(),
+                    std::make_format_args(v.x, v.y, v.z, v.w)
+                )
             );
         }
         else {
@@ -287,7 +319,8 @@ void DashboardItemPropertyValue::render(glm::vec2& penPosition) {
             RenderFont(
                 *_font,
                 penPosition,
-                fmt::format(fmt::runtime(_displayString.value()), value)
+                // @CPP26(abock): This can be replaced with std::runtime_format
+                std::vformat(_displayString.value(), std::make_format_args(value))
             );
         }
 
diff --git a/modules/base/dashboard/dashboarditemsimulationincrement.cpp b/modules/base/dashboard/dashboarditemsimulationincrement.cpp
index c8193215ab..3707c7ce08 100644
--- a/modules/base/dashboard/dashboarditemsimulationincrement.cpp
+++ b/modules/base/dashboard/dashboarditemsimulationincrement.cpp
@@ -195,11 +195,14 @@ void DashboardItemSimulationIncrement::render(glm::vec2& penPosition) {
             RenderFont(
                 *_font,
                 penPosition,
-                fmt::format(
-                    fmt::runtime(_transitionFormat.value()),
-                    targetDeltaTime.first, targetDeltaTime.second,
-                    pauseText,
-                    currentDeltaTime.first, currentDeltaTime.second
+                // @CPP26(abock): This can be replaced with std::runtime_format
+                std::vformat(
+                    _transitionFormat.value(),
+                    std::make_format_args(
+                        targetDeltaTime.first, targetDeltaTime.second,
+                        pauseText,
+                        currentDeltaTime.first, currentDeltaTime.second
+                    )
                 )
             );
         }
@@ -207,14 +210,19 @@ void DashboardItemSimulationIncrement::render(glm::vec2& penPosition) {
             RenderFont(
                 *_font,
                 penPosition,
-                fmt::format(
-                    fmt::runtime(_regularFormat.value()),
-                    targetDeltaTime.first, targetDeltaTime.second, pauseText
+                // @CPP26(abock): This can be replaced with std::runtime_format
+                std::vformat(
+                    _regularFormat.value(),
+                    std::make_format_args(
+                        targetDeltaTime.first,
+                        targetDeltaTime.second,
+                        pauseText
+                    )
                 )
             );
         }
     }
-    catch (const fmt::format_error&) {
+    catch (const std::format_error&) {
         LERRORC("DashboardItemDate", "Illegal format string");
     }
     penPosition.y -= _font->height();
@@ -238,7 +246,7 @@ glm::vec2 DashboardItemSimulationIncrement::size() const {
     }
 
     return _font->boundingBox(
-        fmt::format(
+        std::format(
             "Simulation increment: {:.1f} {:s} / second",
             deltaTime.first, deltaTime.second
         )
diff --git a/modules/base/dashboard/dashboarditemvelocity.cpp b/modules/base/dashboard/dashboarditemvelocity.cpp
index fdf99a67c5..bea74ca374 100644
--- a/modules/base/dashboard/dashboarditemvelocity.cpp
+++ b/modules/base/dashboard/dashboarditemvelocity.cpp
@@ -145,9 +145,7 @@ void DashboardItemVelocity::render(glm::vec2& penPosition) {
     RenderFont(
         *_font,
         penPosition,
-        fmt::format(
-            "Camera velocity: {:.4f} {}/s", dist.first, dist.second
-        )
+        std::format("Camera velocity: {:.4f} {}/s", dist.first, dist.second)
     );
     penPosition.y -= _font->height();
 
@@ -169,7 +167,7 @@ glm::vec2 DashboardItemVelocity::size() const {
     }
 
     return _font->boundingBox(
-        fmt::format("Camera velocity: {} {}/s", dist.first, dist.second)
+        std::format("Camera velocity: {} {}/s", dist.first, dist.second)
     );
 }
 
diff --git a/modules/base/rendering/pointcloud/renderableinterpolatedpoints.cpp b/modules/base/rendering/pointcloud/renderableinterpolatedpoints.cpp
index e7ed5c5d39..138bc24391 100644
--- a/modules/base/rendering/pointcloud/renderableinterpolatedpoints.cpp
+++ b/modules/base/rendering/pointcloud/renderableinterpolatedpoints.cpp
@@ -181,7 +181,7 @@ RenderableInterpolatedPoints::Interpolation::Interpolation()
     addProperty(value);
 
     auto triggerInterpolation = [](std::string_view identifier, float v, float d) {
-        std::string script = fmt::format(
+        std::string script = std::format(
             "openspace.setPropertyValueSingle(\"{}\", {}, {})",
             identifier, v, d
         );
@@ -275,7 +275,7 @@ RenderableInterpolatedPoints::RenderableInterpolatedPoints(
     // corresponded to
 
     if (_nDataPoints % nObjects != 0) {
-        LERROR(fmt::format(
+        LERROR(std::format(
             "Mismatch between provided number of data entries and the specified number "
             "of points. Expected the number of entries in the data file '{}' to be "
             "evenly divisible by the number of points", _dataFile
@@ -445,11 +445,11 @@ void RenderableInterpolatedPoints::addColorAndSizeDataForPoint(unsigned int inde
 void RenderableInterpolatedPoints::initializeBufferData() {
     if (_vao == 0) {
         glGenVertexArrays(1, &_vao);
-        LDEBUG(fmt::format("Generating Vertex Array id '{}'", _vao));
+        LDEBUG(std::format("Generating Vertex Array id '{}'", _vao));
     }
     if (_vbo == 0) {
         glGenBuffers(1, &_vbo);
-        LDEBUG(fmt::format("Generating Vertex Buffer Object id '{}'", _vbo));
+        LDEBUG(std::format("Generating Vertex Buffer Object id '{}'", _vbo));
     }
 
     const int attibutesPerPoint = nAttributesPerPoint();
diff --git a/modules/base/rendering/pointcloud/renderablepointcloud.cpp b/modules/base/rendering/pointcloud/renderablepointcloud.cpp
index 3d03a94a56..f2ab0ff57c 100644
--- a/modules/base/rendering/pointcloud/renderablepointcloud.cpp
+++ b/modules/base/rendering/pointcloud/renderablepointcloud.cpp
@@ -635,7 +635,7 @@ RenderablePointCloud::RenderablePointCloud(const ghoul::Dictionary& dictionary)
             _texturesDirectory = absPath(*t.folder).string();
 
             if (t.file.has_value()) {
-                LWARNING(fmt::format(
+                LWARNING(std::format(
                     "Both a single texture File and multi-texture Folder was provided. "
                     "The folder '{}' has priority and the single texture with the "
                     "following path will be ignored: '{}'", *t.folder, *t.file
@@ -842,7 +842,7 @@ void RenderablePointCloud::initializeSingleTexture() {
     std::filesystem::path p = absPath(_texture.spriteTexturePath);
 
     if (!std::filesystem::is_regular_file(p)) {
-        throw ghoul::RuntimeError(fmt::format(
+        throw ghoul::RuntimeError(std::format(
             "Could not find image file '{}'", p
         ));
     }
@@ -856,7 +856,7 @@ void RenderablePointCloud::initializeMultiTextures() {
         std::filesystem::path path = _texturesDirectory / tex.file;
 
         if (!std::filesystem::is_regular_file(path)) {
-            throw ghoul::RuntimeError(fmt::format(
+            throw ghoul::RuntimeError(std::format(
                 "Could not find image file '{}'", path
             ));
         }
@@ -899,14 +899,14 @@ void RenderablePointCloud::loadTexture(const std::filesystem::path& path, int in
     bool useAlpha = (t->numberOfChannels() > 3) && _texture.useAlphaChannel;
 
     if (t) {
-        LINFOC("RenderablePlanesCloud", fmt::format("Loaded texture {}", path));
+        LINFOC("RenderablePlanesCloud", std::format("Loaded texture {}", path));
         // Do not upload the loaded texture to the GPU, we just want it to hold the data.
         // However, convert textures make sure they all use the same format
         ghoul::opengl::Texture::Format targetFormat = glFormat(useAlpha);
         convertTextureFormat(*t, targetFormat);
     }
     else {
-        throw ghoul::RuntimeError(fmt::format(
+        throw ghoul::RuntimeError(std::format(
             "Could not find image file {}", path
         ));
     }
@@ -1024,7 +1024,7 @@ void RenderablePointCloud::generateArrayTextures() {
         int nMaxTextureLayers = 0;
         glGetIntegerv(GL_MAX_ARRAY_TEXTURE_LAYERS, &nMaxTextureLayers);
         if (static_cast<int>(layer) > nMaxTextureLayers) {
-            LERROR(fmt::format(
+            LERROR(std::format(
                 "Too many layers bound in the same texture array. Found {} textures with "
                 "resolution {}x{} pixels. Max supported is {}.",
                 layer, res.x, res.y, nMaxTextureLayers
@@ -1333,11 +1333,11 @@ void RenderablePointCloud::updateBufferData() {
 
     if (_vao == 0) {
         glGenVertexArrays(1, &_vao);
-        LDEBUG(fmt::format("Generating Vertex Array id '{}'", _vao));
+        LDEBUG(std::format("Generating Vertex Array id '{}'", _vao));
     }
     if (_vbo == 0) {
         glGenBuffers(1, &_vbo);
-        LDEBUG(fmt::format("Generating Vertex Buffer Object id '{}'", _vbo));
+        LDEBUG(std::format("Generating Vertex Buffer Object id '{}'", _vbo));
     }
 
     glBindVertexArray(_vao);
diff --git a/modules/base/rendering/pointcloud/sizemappingcomponent.cpp b/modules/base/rendering/pointcloud/sizemappingcomponent.cpp
index a69d580d3e..df57fc143c 100644
--- a/modules/base/rendering/pointcloud/sizemappingcomponent.cpp
+++ b/modules/base/rendering/pointcloud/sizemappingcomponent.cpp
@@ -119,7 +119,7 @@ SizeMappingComponent::SizeMappingComponent(const ghoul::Dictionary& dictionary)
         parameterOption = indexOfProvidedOption;
     }
     else if (p.parameter.has_value()) {
-        LERROR(fmt::format(
+        LERROR(std::format(
             "Error when reading Parameter. Could not find provided parameter '{}' in "
             "list of parameter options. Using default.", *p.parameter
         ));
diff --git a/modules/base/rendering/renderablemodel.cpp b/modules/base/rendering/renderablemodel.cpp
index 6f7a1fa0f7..8ef6682a6b 100644
--- a/modules/base/rendering/renderablemodel.cpp
+++ b/modules/base/rendering/renderablemodel.cpp
@@ -357,7 +357,7 @@ RenderableModel::RenderableModel(const ghoul::Dictionary& dictionary)
 
     _file = absPath(p.geometryFile.string());
     if (!std::filesystem::exists(_file)) {
-        throw ghoul::RuntimeError(fmt::format("Cannot find model file '{}'", _file));
+        throw ghoul::RuntimeError(std::format("Cannot find model file '{}'", _file));
     }
 
     _invertModelScale = p.invertModelScale.value_or(_invertModelScale);
@@ -469,7 +469,7 @@ RenderableModel::RenderableModel(const ghoul::Dictionary& dictionary)
 
     _modelScale.onChange([this]() {
         if (!_geometry) {
-            LWARNING(fmt::format(
+            LWARNING(std::format(
                 "Cannot set scale for model '{}': not loaded yet", _file
             ));
             return;
@@ -487,12 +487,12 @@ RenderableModel::RenderableModel(const ghoul::Dictionary& dictionary)
 
     _enableAnimation.onChange([this]() {
         if (!_modelHasAnimation) {
-            LWARNING(fmt::format(
+            LWARNING(std::format(
                 "Cannot enable animation for model '{}': it does not have any", _file
             ));
         }
         else if (_enableAnimation && _animationStart.empty()) {
-            LWARNING(fmt::format(
+            LWARNING(std::format(
                 "Cannot enable animation for model '{}': it does not have a start time",
                 _file
             ));
@@ -500,7 +500,7 @@ RenderableModel::RenderableModel(const ghoul::Dictionary& dictionary)
         }
         else {
             if (!_geometry) {
-                LWARNING(fmt::format(
+                LWARNING(std::format(
                     "Cannot enable animation for model '{}': not loaded yet", _file
                 ));
                 return;
@@ -560,13 +560,13 @@ void RenderableModel::initializeGL() {
 
     if (!_modelHasAnimation) {
         if (!_animationStart.empty()) {
-            LWARNING(fmt::format(
+            LWARNING(std::format(
                 "Animation start time given to model '{}' without animation", _file
             ));
         }
 
         if (_enableAnimation) {
-            LWARNING(fmt::format(
+            LWARNING(std::format(
                 "Cannot enable animation for model '{}': it does not have any", _file
             ));
             _enableAnimation = false;
@@ -576,13 +576,13 @@ void RenderableModel::initializeGL() {
     }
     else {
         if (_enableAnimation && _animationStart.empty()) {
-            LWARNING(fmt::format(
+            LWARNING(std::format(
                 "Cannot enable animation for model '{}': it does not have a start time",
                 _file
             ));
         }
         else if (!_enableAnimation) {
-            LINFO(fmt::format(
+            LINFO(std::format(
                 "Model '{}' with deactivated animation was found. The animation can be "
                 "activated by entering a start time in the asset file", _file
             ));
diff --git a/modules/base/rendering/renderablenodearrow.cpp b/modules/base/rendering/renderablenodearrow.cpp
index 6b4ff18b9e..43a37c69fd 100644
--- a/modules/base/rendering/renderablenodearrow.cpp
+++ b/modules/base/rendering/renderablenodearrow.cpp
@@ -228,7 +228,7 @@ namespace {
 
         SceneGraphNode* startNode = sceneGraphNode(nodeName);
         if (!startNode) {
-            LERROR(fmt::format("Could not find start node '{}'", nodeName));
+            LERROR(std::format("Could not find start node '{}'", nodeName));
             return;
         }
         const double boundingSphere = startNode->boundingSphere();
@@ -242,7 +242,7 @@ namespace {
         else {
             // Recompute distance (previous value was in meters)
             if (boundingSphere < std::numeric_limits<double>::epsilon()) {
-                LERROR(fmt::format(
+                LERROR(std::format(
                     "Start node '{}' has invalid bounding sphere", nodeName
                 ));
                 return;
@@ -383,12 +383,12 @@ void RenderableNodeArrow::updateShapeTransforms(const RenderData& data) {
     SceneGraphNode* endNode = sceneGraphNode(_end);
 
     if (!startNode) {
-        LERROR(fmt::format("Could not find start node '{}'", _start.value()));
+        LERROR(std::format("Could not find start node '{}'", _start.value()));
         return;
     }
 
     if (!endNode) {
-        LERROR(fmt::format("Could not find end node '{}'", _end.value()));
+        LERROR(std::format("Could not find end node '{}'", _end.value()));
         return;
     }
 
@@ -397,7 +397,7 @@ void RenderableNodeArrow::updateShapeTransforms(const RenderData& data) {
         boundingSphere < std::numeric_limits<double>::epsilon();
 
     if (hasNoBoundingSphere && (_useRelativeLength || _useRelativeOffset)) {
-        LERROR(fmt::format(
+        LERROR(std::format(
             "Node '{}' has no valid bounding sphere. Can not use relative values",
             _end.value()
         ));
diff --git a/modules/base/rendering/renderablenodeline.cpp b/modules/base/rendering/renderablenodeline.cpp
index 68a39ed79e..b48f8b04d1 100644
--- a/modules/base/rendering/renderablenodeline.cpp
+++ b/modules/base/rendering/renderablenodeline.cpp
@@ -181,7 +181,7 @@ RenderableNodeLine::RenderableNodeLine(const ghoul::Dictionary& dictionary)
             if (!node || node->boundingSphere() > 0.0) {
                 return;
             }
-            LWARNING(fmt::format(
+            LWARNING(std::format(
                 "Setting StartOffset for node line '{}': Trying to use relative offsets "
                 "for start node '{}' that has no bounding sphere. This will result in no "
                 "offset. Use direct values by setting UseRelativeOffsets to false",
@@ -198,7 +198,7 @@ RenderableNodeLine::RenderableNodeLine(const ghoul::Dictionary& dictionary)
             if (!node || node->boundingSphere() > 0.0) {
                 return;
             }
-            LWARNING(fmt::format(
+            LWARNING(std::format(
                 "Setting EndOffset for node line '{}': Trying to use relative offsets "
                 "for end node '{}' that has no bounding sphere. This will result in no "
                 "offset. Use direct values by setting UseRelativeOffsets to false",
@@ -213,7 +213,7 @@ RenderableNodeLine::RenderableNodeLine(const ghoul::Dictionary& dictionary)
         SceneGraphNode* endNode = global::renderEngine->scene()->sceneGraphNode(_end);
 
         if (!startNode) {
-            LERROR(fmt::format(
+            LERROR(std::format(
                 "Error when recomputing node line offsets for scene graph node '{}'. "
                 "Could not find start node '{}'", parent()->identifier(), _start.value()
             ));
@@ -221,7 +221,7 @@ RenderableNodeLine::RenderableNodeLine(const ghoul::Dictionary& dictionary)
         }
 
         if (!endNode) {
-            LERROR(fmt::format(
+            LERROR(std::format(
                 "Error when recomputing node line offsets for scene graph node '{}'. "
                 "Could not find end node '{}'", parent()->identifier(), _end.value()
             ));
@@ -310,12 +310,12 @@ void RenderableNodeLine::updateVertexData() {
     SceneGraphNode* endNode = global::renderEngine->scene()->sceneGraphNode(_end);
 
     if (!startNode) {
-        LERROR(fmt::format("Could not find start node '{}'", _start.value()));
+        LERROR(std::format("Could not find start node '{}'", _start.value()));
         return;
     }
 
     if (!endNode) {
-        LERROR(fmt::format("Could not find end node '{}'", _end.value()));
+        LERROR(std::format("Could not find end node '{}'", _end.value()));
         return;
     }
 
diff --git a/modules/base/rendering/renderableplaneimagelocal.cpp b/modules/base/rendering/renderableplaneimagelocal.cpp
index 122c232e7d..9066e74764 100644
--- a/modules/base/rendering/renderableplaneimagelocal.cpp
+++ b/modules/base/rendering/renderableplaneimagelocal.cpp
@@ -175,7 +175,7 @@ void RenderablePlaneImageLocal::loadTexture() {
 
                 LDEBUGC(
                     "RenderablePlaneImageLocal",
-                    fmt::format("Loaded texture from '{}'", absPath(path))
+                    std::format("Loaded texture from '{}'", absPath(path))
                 );
                 texture->uploadTexture();
                 texture->setFilter(ghoul::opengl::Texture::FilterMode::LinearMipMap);
diff --git a/modules/base/rendering/renderableplaneimageonline.cpp b/modules/base/rendering/renderableplaneimageonline.cpp
index 88d2d89db3..142542c671 100644
--- a/modules/base/rendering/renderableplaneimageonline.cpp
+++ b/modules/base/rendering/renderableplaneimageonline.cpp
@@ -133,7 +133,7 @@ void RenderablePlaneImageOnline::update(const UpdateData& data) {
         if (imageFile.corrupted) {
             LERRORC(
                 "ScreenSpaceImageOnline",
-                fmt::format("Error loading image from URL '{}'", _texturePath.value())
+                std::format("Error loading image from URL '{}'", _texturePath.value())
             );
             return;
         }
diff --git a/modules/base/rendering/renderableplanetimevaryingimage.cpp b/modules/base/rendering/renderableplanetimevaryingimage.cpp
index c41ebb4b7a..ed6dc0e92a 100644
--- a/modules/base/rendering/renderableplanetimevaryingimage.cpp
+++ b/modules/base/rendering/renderableplanetimevaryingimage.cpp
@@ -96,7 +96,7 @@ RenderablePlaneTimeVaryingImage::RenderablePlaneTimeVaryingImage(
 
     _sourceFolder = p.sourceFolder;
     if (!std::filesystem::is_directory(absPath(_sourceFolder))) {
-        LERROR(fmt::format(
+        LERROR(std::format(
             "Time varying image, '{}' is not a valid directory",
             _sourceFolder.value()
         ));
@@ -174,7 +174,7 @@ bool RenderablePlaneTimeVaryingImage::extractMandatoryInfoFromDictionary() {
     std::sort(_sourceFiles.begin(), _sourceFiles.end());
     // Ensure that there are available and valid source files left
     if (_sourceFiles.empty()) {
-        LERROR(fmt::format(
+        LERROR(std::format(
             "{}: Plane sequence filepath '{}' was empty",
             _identifier, _sourceFolder.value()
         ));
diff --git a/modules/base/rendering/renderablesphereimagelocal.cpp b/modules/base/rendering/renderablesphereimagelocal.cpp
index e68de2767a..7740aa4ab0 100644
--- a/modules/base/rendering/renderablesphereimagelocal.cpp
+++ b/modules/base/rendering/renderablesphereimagelocal.cpp
@@ -117,14 +117,14 @@ void RenderableSphereImageLocal::loadTexture() {
     if (!texture) {
         LWARNINGC(
             "RenderableSphereImageLocal",
-            fmt::format("Could not load texture from '{}'", absPath(_texturePath))
+            std::format("Could not load texture from '{}'", absPath(_texturePath))
         );
         return;
     }
 
     LDEBUGC(
         "RenderableSphereImageLocal",
-        fmt::format("Loaded texture from '{}'", absPath(_texturePath))
+        std::format("Loaded texture from '{}'", absPath(_texturePath))
     );
     texture->uploadTexture();
     texture->setFilter(ghoul::opengl::Texture::FilterMode::LinearMipMap);
diff --git a/modules/base/rendering/renderablesphereimageonline.cpp b/modules/base/rendering/renderablesphereimageonline.cpp
index a4b5c64397..bf2757bdc1 100644
--- a/modules/base/rendering/renderablesphereimageonline.cpp
+++ b/modules/base/rendering/renderablesphereimageonline.cpp
@@ -53,13 +53,13 @@ namespace {
             [url](const DownloadManager::MemoryFile&) {
                 LDEBUGC(
                     "RenderableSphereImageOnline",
-                    fmt::format("Download to memory finished for image '{}'", url)
+                    std::format("Download to memory finished for image '{}'", url)
                 );
             },
             [url](const std::string& err) {
                 LDEBUGC(
                     "RenderableSphereImageOnline",
-                    fmt::format("Download to memory failed for image '{}': {}", url, err)
+                    std::format("Download to memory failed for image '{}': {}", url, err)
                 );
             }
         );
@@ -120,7 +120,7 @@ void RenderableSphereImageOnline::update(const UpdateData& data) {
         if (imageFile.corrupted) {
             LERRORC(
                 "RenderableSphereImageOnline",
-                fmt::format("Error loading image from URL '{}'", _textureUrl.value())
+                std::format("Error loading image from URL '{}'", _textureUrl.value())
             );
             return;
         }
diff --git a/modules/base/rendering/screenspaceimagelocal.cpp b/modules/base/rendering/screenspaceimagelocal.cpp
index e9e361ece7..504f6db33f 100644
--- a/modules/base/rendering/screenspaceimagelocal.cpp
+++ b/modules/base/rendering/screenspaceimagelocal.cpp
@@ -85,7 +85,7 @@ ScreenSpaceImageLocal::ScreenSpaceImageLocal(const ghoul::Dictionary& dictionary
         if (!std::filesystem::is_regular_file(absPath(_texturePath))) {
             LWARNINGC(
                 "ScreenSpaceImageLocal",
-                fmt::format(
+                std::format(
                     "Image '{}' did not exist for '{}'", _texturePath.value(), _identifier
                 )
             );
@@ -103,7 +103,7 @@ ScreenSpaceImageLocal::ScreenSpaceImageLocal(const ghoul::Dictionary& dictionary
         else {
             LWARNINGC(
                 "ScreenSpaceImageLocal",
-                fmt::format(
+                std::format(
                     "Image '{}' did not exist for '{}'", *p.texturePath, _identifier
                 )
             );
diff --git a/modules/base/rendering/screenspaceimageonline.cpp b/modules/base/rendering/screenspaceimageonline.cpp
index c804a8fed0..a7b6ac55dc 100644
--- a/modules/base/rendering/screenspaceimageonline.cpp
+++ b/modules/base/rendering/screenspaceimageonline.cpp
@@ -110,7 +110,7 @@ void ScreenSpaceImageOnline::update() {
             if (imageFile.corrupted) {
                 LERRORC(
                     "ScreenSpaceImageOnline",
-                    fmt::format("Error loading image from URL '{}'", _texturePath.value())
+                    std::format("Error loading image from URL '{}'", _texturePath.value())
                 );
                 return;
             }
diff --git a/modules/base/rotation/fixedrotation.cpp b/modules/base/rotation/fixedrotation.cpp
index d546486fa2..a176e16cca 100644
--- a/modules/base/rotation/fixedrotation.cpp
+++ b/modules/base/rotation/fixedrotation.cpp
@@ -530,7 +530,7 @@ glm::dmat3 FixedRotation::matrix(const UpdateData&) const {
     {
         LWARNINGC(
             "FixedRotation",
-            fmt::format(
+            std::format(
                 "Near-collinear vectors detected: "
                 "x ({}, {}, {}) y ({}, {}, {}) z ({}, {}, {})",
                 x.x, x.y, x.z, y.x, y.y, y.z, z.x, z.y, z.z
diff --git a/modules/base/rotation/luarotation.cpp b/modules/base/rotation/luarotation.cpp
index cfcad65f20..b7937c1eac 100644
--- a/modules/base/rotation/luarotation.cpp
+++ b/modules/base/rotation/luarotation.cpp
@@ -89,7 +89,7 @@ glm::dmat3 LuaRotation::matrix(const UpdateData& data) const {
     if (!isFunction) {
         LERRORC(
             "LuaRotation",
-            fmt::format(
+            std::format(
                 "Script '{}' does not have a function 'rotation'", _luaScriptFile.value()
             )
         );
@@ -112,7 +112,7 @@ glm::dmat3 LuaRotation::matrix(const UpdateData& data) const {
     if (success != 0) {
         LERRORC(
             "LuaScale",
-            fmt::format("Error executing 'rotation': {}", lua_tostring(_state, -1))
+            std::format("Error executing 'rotation': {}", lua_tostring(_state, -1))
         );
     }
 
diff --git a/modules/base/scale/luascale.cpp b/modules/base/scale/luascale.cpp
index 466467db4d..5a0e994fd6 100644
--- a/modules/base/scale/luascale.cpp
+++ b/modules/base/scale/luascale.cpp
@@ -87,7 +87,7 @@ glm::dvec3 LuaScale::scaleValue(const UpdateData& data) const {
     if (!isFunction) {
         LERRORC(
             "LuaScale",
-            fmt::format(
+            std::format(
                 "Script '{}' does not have a function 'scale'", _luaScriptFile.value()
             )
         );
@@ -110,7 +110,7 @@ glm::dvec3 LuaScale::scaleValue(const UpdateData& data) const {
     if (success != 0) {
         LERRORC(
             "LuaScale",
-            fmt::format("Error executing 'scale': {}", lua_tostring(_state, -1))
+            std::format("Error executing 'scale': {}", lua_tostring(_state, -1))
         );
     }
 
diff --git a/modules/base/translation/luatranslation.cpp b/modules/base/translation/luatranslation.cpp
index 7a790c4a03..986135f156 100644
--- a/modules/base/translation/luatranslation.cpp
+++ b/modules/base/translation/luatranslation.cpp
@@ -91,7 +91,7 @@ glm::dvec3 LuaTranslation::position(const UpdateData& data) const {
     if (!isFunction) {
         LERRORC(
             "LuaScale",
-            fmt::format(
+            std::format(
                 "Script '{}' does not have a function 'translation'",
                 _luaScriptFile.value()
             )
@@ -115,7 +115,7 @@ glm::dvec3 LuaTranslation::position(const UpdateData& data) const {
     if (success != 0) {
         LERRORC(
             "LuaScale",
-            fmt::format("Error executing 'translation': {}", lua_tostring(_state, -1))
+            std::format("Error executing 'translation': {}", lua_tostring(_state, -1))
         );
     }
 
diff --git a/modules/cefwebgui/cefwebguimodule.cpp b/modules/cefwebgui/cefwebguimodule.cpp
index 30c9023f79..944bde0782 100644
--- a/modules/cefwebgui/cefwebguimodule.cpp
+++ b/modules/cefwebgui/cefwebguimodule.cpp
@@ -102,7 +102,7 @@ void CefWebGuiModule::startOrStopGui() {
     const bool isMaster = global::windowDelegate->isMaster();
 
     if (_enabled && isMaster) {
-        LDEBUGC("WebBrowser", fmt::format("Loading GUI from '{}'", _url.value()));
+        LDEBUGC("WebBrowser", std::format("Loading GUI from '{}'", _url.value()));
 
         if (!_instance) {
             _instance = std::make_unique<BrowserInstance>(
diff --git a/modules/debugging/debuggingmodule_lua.inl b/modules/debugging/debuggingmodule_lua.inl
index ac83715d8a..06d543cc1e 100644
--- a/modules/debugging/debuggingmodule_lua.inl
+++ b/modules/debugging/debuggingmodule_lua.inl
@@ -56,7 +56,7 @@ constexpr glm::vec3 OrientationLineColor = glm::vec3(0.0, 1.0, 1.0);
 
     // Parent node. Note that we only render one path at a time, so remove the previously
     // rendered one, if any
-    std::string addParentScript = fmt::format(
+    std::string addParentScript = std::format(
         "if openspace.hasSceneGraphNode('{0}') then "
             "openspace.removeSceneGraphNode('{0}') "
         "end "
@@ -82,7 +82,7 @@ constexpr glm::vec3 OrientationLineColor = glm::vec3(0.0, 1.0, 1.0);
 
     // Create node lines between the positions
     auto pointIdentifier = [](int i) {
-        return fmt::format("Point_{}", i);
+        return std::format("Point_{}", i);
     };
 
     auto addPoint = [](const std::string& id, glm::dvec3 p) {
@@ -98,7 +98,7 @@ constexpr glm::vec3 OrientationLineColor = glm::vec3(0.0, 1.0, 1.0);
         "}";
 
         global::scriptEngine->queueScript(
-            fmt::format("openspace.addSceneGraphNode({})", pointNode),
+            std::format("openspace.addSceneGraphNode({})", pointNode),
             scripting::ScriptEngine::ShouldBeSynchronized::Yes,
             scripting::ScriptEngine::ShouldSendToRemote::Yes
         );
@@ -108,7 +108,7 @@ constexpr glm::vec3 OrientationLineColor = glm::vec3(0.0, 1.0, 1.0);
                                    const glm::vec3& color, float lineWidth)
     {
         const std::string lineNode = "{"
-            "Identifier = '" + fmt::format("Line{}", id1) + "',"
+            "Identifier = '" + std::format("Line{}", id1) + "',"
             "Parent = '" + RenderedPathIdentifier + "',"
             "Renderable = {"
                 "Enabled = true,"
@@ -121,7 +121,7 @@ constexpr glm::vec3 OrientationLineColor = glm::vec3(0.0, 1.0, 1.0);
         "}";
 
         global::scriptEngine->queueScript(
-            fmt::format("openspace.addSceneGraphNode({})", lineNode),
+            std::format("openspace.addSceneGraphNode({})", lineNode),
             scripting::ScriptEngine::ShouldBeSynchronized::Yes,
             scripting::ScriptEngine::ShouldSendToRemote::Yes
         );
@@ -133,7 +133,7 @@ constexpr glm::vec3 OrientationLineColor = glm::vec3(0.0, 1.0, 1.0);
     {
         const glm::dvec3 dir = glm::normalize(p.rotation * glm::dvec3(0.0, 0.0, -1.0));
         const glm::dvec3 pointPosition = p.position + lineLength * dir;
-        const std::string id = fmt::format("{}_orientation", pointId);
+        const std::string id = std::format("{}_orientation", pointId);
 
         addPoint(id, pointPosition);
         addLineBetweenPoints(id, pointId, OrientationLineColor, 2.f);
@@ -159,7 +159,7 @@ constexpr glm::vec3 OrientationLineColor = glm::vec3(0.0, 1.0, 1.0);
 [[codegen::luawrap]] void removeRenderedCameraPath() {
     using namespace openspace;
     global::scriptEngine->queueScript(
-        fmt::format("openspace.removeSceneGraphNode('{}');", RenderedPathIdentifier),
+        std::format("openspace.removeSceneGraphNode('{}');", RenderedPathIdentifier),
         scripting::ScriptEngine::ShouldBeSynchronized::Yes,
         scripting::ScriptEngine::ShouldSendToRemote::Yes
     );
@@ -183,7 +183,7 @@ constexpr glm::vec3 OrientationLineColor = glm::vec3(0.0, 1.0, 1.0);
 
     // Parent node. Note that we only render one set of points at a time, so remove any
     // previously rendered ones
-    std::string addParentScript = fmt::format(
+    std::string addParentScript = std::format(
         "if openspace.hasSceneGraphNode('{0}') then "
             "openspace.removeSceneGraphNode('{0}') "
         "end "
@@ -200,7 +200,7 @@ constexpr glm::vec3 OrientationLineColor = glm::vec3(0.0, 1.0, 1.0);
     const std::vector<glm::dvec3> points = currentPath->controlPoints();
 
     const std::string guiPath =
-        fmt::format("{}/Camera Path Control Points", DebuggingGuiPath);
+        std::format("{}/Camera Path Control Points", DebuggingGuiPath);
 
     const char* colorTexturePath = "openspace.absPath("
         "openspace.createSingleColorImage('point_color', { 0.0, 1.0, 0.0 })"
@@ -230,7 +230,7 @@ constexpr glm::vec3 OrientationLineColor = glm::vec3(0.0, 1.0, 1.0);
         "}";
 
         global::scriptEngine->queueScript(
-            fmt::format("openspace.addSceneGraphNode({})", node),
+            std::format("openspace.addSceneGraphNode({})", node),
             scripting::ScriptEngine::ShouldBeSynchronized::Yes,
             scripting::ScriptEngine::ShouldSendToRemote::Yes
         );
@@ -241,7 +241,7 @@ constexpr glm::vec3 OrientationLineColor = glm::vec3(0.0, 1.0, 1.0);
 [[codegen::luawrap]] void removePathControlPoints() {
     using namespace openspace;
     global::scriptEngine->queueScript(
-        fmt::format("openspace.removeSceneGraphNode('{}');", RenderedPointsIdentifier),
+        std::format("openspace.removeSceneGraphNode('{}');", RenderedPointsIdentifier),
         scripting::ScriptEngine::ShouldBeSynchronized::Yes,
         scripting::ScriptEngine::ShouldSendToRemote::Yes
     );
@@ -297,7 +297,7 @@ constexpr glm::vec3 OrientationLineColor = glm::vec3(0.0, 1.0, 1.0);
     "}";
 
     global::scriptEngine->queueScript(
-        fmt::format("openspace.addSceneGraphNode({});", axes),
+        std::format("openspace.addSceneGraphNode({});", axes),
         scripting::ScriptEngine::ShouldBeSynchronized::Yes,
         scripting::ScriptEngine::ShouldSendToRemote::Yes
     );
diff --git a/modules/digitaluniverse/rendering/renderabledumeshes.cpp b/modules/digitaluniverse/rendering/renderabledumeshes.cpp
index 13e99aa896..4a81521c28 100644
--- a/modules/digitaluniverse/rendering/renderabledumeshes.cpp
+++ b/modules/digitaluniverse/rendering/renderabledumeshes.cpp
@@ -448,7 +448,7 @@ void RenderableDUMeshes::update(const UpdateData&) {
 bool RenderableDUMeshes::loadData() {
     bool success = false;
     if (_hasSpeckFile) {
-        LINFO(fmt::format("Loading Speck file '{}'", _speckFile));
+        LINFO(std::format("Loading Speck file '{}'", _speckFile));
         success = readSpeckFile();
         if (!success) {
             return false;
@@ -466,7 +466,7 @@ bool RenderableDUMeshes::loadData() {
 bool RenderableDUMeshes::readSpeckFile() {
     std::ifstream file(_speckFile);
     if (!file.good()) {
-        LERROR(fmt::format("Failed to open Speck file '{}'", _speckFile));
+        LERROR(std::format("Failed to open Speck file '{}'", _speckFile));
         return false;
     }
 
@@ -576,7 +576,7 @@ bool RenderableDUMeshes::readSpeckFile() {
                 }
 
                 if (!success) {
-                    LERROR(fmt::format(
+                    LERROR(std::format(
                         "Failed reading position on line {} of mesh {} in file '{}'. "
                         "Stopped reading mesh data", l, meshIndex, _speckFile
                     ));
diff --git a/modules/digitaluniverse/rendering/renderableplanescloud.cpp b/modules/digitaluniverse/rendering/renderableplanescloud.cpp
index fb5006e7fa..4316e1876d 100644
--- a/modules/digitaluniverse/rendering/renderableplanescloud.cpp
+++ b/modules/digitaluniverse/rendering/renderableplanescloud.cpp
@@ -507,7 +507,7 @@ void RenderablePlanesCloud::loadTextures() {
         }
         else {
             // We can't really recover from this as it would crash during rendering anyway
-            throw ghoul::RuntimeError(fmt::format(
+            throw ghoul::RuntimeError(std::format(
                 "Could not find image file '{}'", tex.file
             ));
         }
@@ -516,14 +516,14 @@ void RenderablePlanesCloud::loadTextures() {
             ghoul::io::TextureReader::ref().loadTexture(path.string(), 2);
 
         if (t) {
-            LINFOC("RenderablePlanesCloud", fmt::format("Loaded texture '{}'", path));
+            LINFOC("RenderablePlanesCloud", std::format("Loaded texture '{}'", path));
             t->uploadTexture();
             t->setFilter(ghoul::opengl::Texture::FilterMode::LinearMipMap);
             t->purgeFromRAM();
         }
         else {
             // Same here, we won't be able to recover from this nullptr
-            throw ghoul::RuntimeError(fmt::format(
+            throw ghoul::RuntimeError(std::format(
                 "Could not find image file '{}'", tex.file
             ));
         }
diff --git a/modules/exoplanets/exoplanetshelper.cpp b/modules/exoplanets/exoplanetshelper.cpp
index 120c9571b4..c4c3ebc9d4 100644
--- a/modules/exoplanets/exoplanetshelper.cpp
+++ b/modules/exoplanets/exoplanetshelper.cpp
@@ -64,7 +64,7 @@ glm::vec3 computeStarColor(float bv) {
     std::ifstream colorMap(absPath(bvColormapPath), std::ios::in);
 
     if (!colorMap.good()) {
-        LERROR(fmt::format(
+        LERROR(std::format(
             "Failed to open colormap data file '{}'", absPath(bvColormapPath)
         ));
         return glm::vec3(0.f);
diff --git a/modules/exoplanets/exoplanetsmodule.cpp b/modules/exoplanets/exoplanetsmodule.cpp
index e713c95154..d26ad79e7a 100644
--- a/modules/exoplanets/exoplanetsmodule.cpp
+++ b/modules/exoplanets/exoplanetsmodule.cpp
@@ -268,7 +268,7 @@ std::string ExoplanetsModule::exoplanetsDataPath() const {
     ghoul_assert(hasDataFiles(), "Data files not loaded");
 
     return absPath(
-        fmt::format("{}/{}", _exoplanetsDataFolder.value(), ExoplanetsDataFileName)
+        std::format("{}/{}", _exoplanetsDataFolder.value(), ExoplanetsDataFileName)
     ).string();
 }
 
@@ -276,14 +276,14 @@ std::string ExoplanetsModule::lookUpTablePath() const {
     ghoul_assert(hasDataFiles(), "Data files not loaded");
 
     return absPath(
-        fmt::format("{}/{}", _exoplanetsDataFolder.value(), LookupTableFileName)
+        std::format("{}/{}", _exoplanetsDataFolder.value(), LookupTableFileName)
     ).string();
 }
 
 std::string ExoplanetsModule::teffToBvConversionFilePath() const {
     ghoul_assert(hasDataFiles(), "Data files not loaded");
 
-    return absPath(fmt::format(
+    return absPath(std::format(
         "{}/{}", _exoplanetsDataFolder.value(), TeffToBvConversionFileName
     )).string();
 }
diff --git a/modules/exoplanets/exoplanetsmodule_lua.inl b/modules/exoplanets/exoplanetsmodule_lua.inl
index 091c790076..7ae1e275ee 100644
--- a/modules/exoplanets/exoplanetsmodule_lua.inl
+++ b/modules/exoplanets/exoplanetsmodule_lua.inl
@@ -53,14 +53,14 @@ openspace::exoplanets::ExoplanetSystem findExoplanetSystemInData(
     const std::string binPath = module->exoplanetsDataPath();
     std::ifstream data(absPath(binPath), std::ios::in | std::ios::binary);
     if (!data.good()) {
-        LERROR(fmt::format("Failed to open exoplanets data file '{}'", binPath));
+        LERROR(std::format("Failed to open exoplanets data file '{}'", binPath));
         return ExoplanetSystem();
     }
 
     const std::string lutPath = module->lookUpTablePath();
     std::ifstream lut(absPath(lutPath));
     if (!lut.good()) {
-        LERROR(fmt::format("Failed to open exoplanets look-up table '{}'", lutPath));
+        LERROR(std::format("Failed to open exoplanets look-up table '{}'", lutPath));
         return ExoplanetSystem();
     }
 
@@ -90,7 +90,7 @@ openspace::exoplanets::ExoplanetSystem findExoplanetSystemInData(
         sanitizeNameString(name);
 
         if (!hasSufficientData(p)) {
-            LWARNING(fmt::format("Insufficient data for exoplanet '{}'", name));
+            LWARNING(std::format("Insufficient data for exoplanet '{}'", name));
             continue;
         }
 
@@ -115,11 +115,11 @@ void createExoplanetSystem(const std::string& starName,
     std::string sanitizedStarName = starName;
     sanitizeNameString(sanitizedStarName);
 
-    const std::string guiPath = fmt::format("{}{}", ExoplanetsGuiPath, sanitizedStarName);
+    const std::string guiPath = std::format("{}{}", ExoplanetsGuiPath, sanitizedStarName);
 
     SceneGraphNode* existingStarNode = sceneGraphNode(starIdentifier);
     if (existingStarNode) {
-        LERROR(fmt::format(
+        LERROR(std::format(
             "Adding of exoplanet system '{}' failed. The system has already been added",
             starName
         ));
@@ -128,7 +128,7 @@ void createExoplanetSystem(const std::string& starName,
 
     const glm::vec3 starPosInParsec = system.starData.position;
     if (!isValidPosition(starPosInParsec)) {
-        LERROR(fmt::format(
+        LERROR(std::format(
             "Insufficient data available for exoplanet system '{}'. Could not determine "
             "star position", starName
         ));
@@ -560,14 +560,14 @@ std::vector<std::string> hostStarsWithSufficientData() {
     const std::string lutPath = module->lookUpTablePath();
     std::ifstream lookupTableFile(absPath(lutPath));
     if (!lookupTableFile.good()) {
-        LERROR(fmt::format("Failed to open lookup table file '{}'", lutPath));
+        LERROR(std::format("Failed to open lookup table file '{}'", lutPath));
         return {};
     }
 
     const std::string binPath = module->exoplanetsDataPath();
     std::ifstream data(absPath(binPath), std::ios::in | std::ios::binary);
     if (!data.good()) {
-        LERROR(fmt::format("Failed to open data file '{}'", binPath));
+        LERROR(std::format("Failed to open data file '{}'", binPath));
         return {};
     }
 
@@ -634,7 +634,7 @@ std::vector<std::string> hostStarsWithSufficientData() {
             findExoplanetSystemInData(starName);
 
         if (systemData.planetsData.empty()) {
-            LERROR(fmt::format("Exoplanet system '{}' could not be found", starName));
+            LERROR(std::format("Exoplanet system '{}' could not be found", starName));
             return;
         }
 
@@ -691,7 +691,7 @@ listOfExoplanetsDeprecated()
     output.pop_back();
     output.pop_back();
 
-    LINFO(fmt::format(
+    LINFO(std::format(
         "There is data available for the following {} exoplanet systems: {}",
         names.size(), output
     ));
@@ -724,7 +724,7 @@ listOfExoplanetsDeprecated()
 
     std::ifstream inputDataFile(csvFile);
     if (!inputDataFile.good()) {
-        LERROR(fmt::format("Failed to open input file '{}'", csvFile));
+        LERROR(std::format("Failed to open input file '{}'", csvFile));
         return;
     }
 
@@ -746,10 +746,10 @@ listOfExoplanetsDeprecated()
             module->teffToBvConversionFilePath()
         );
 
-        LINFO(fmt::format("Reading data for planet '{}'", planetData.name));
+        LINFO(std::format("Reading data for planet '{}'", planetData.name));
 
         if (!hasSufficientData(planetData.dataEntry)) {
-            LWARNING(fmt::format(
+            LWARNING(std::format(
                 "Insufficient data for exoplanet '{}'", planetData.name
             ));
             continue;
@@ -785,7 +785,7 @@ listOfExoplanetsDeprecated()
         createExoplanetSystem(hostName, data);
     }
 
-    LINFO(fmt::format(
+    LINFO(std::format(
         "Read data for {} exoplanet systems from CSV file: {}. Please wait until "
         "they are all finished initializing. You may have to reload the user interface.",
         hostNameToSystemDataMap.size(), csvFile
diff --git a/modules/exoplanets/tasks/exoplanetsdatapreparationtask.cpp b/modules/exoplanets/tasks/exoplanetsdatapreparationtask.cpp
index d43faba2da..a6b13e56d1 100644
--- a/modules/exoplanets/tasks/exoplanetsdatapreparationtask.cpp
+++ b/modules/exoplanets/tasks/exoplanetsdatapreparationtask.cpp
@@ -100,7 +100,7 @@ ExoplanetsDataPreparationTask::ExoplanetsDataPreparationTask(
 }
 
 std::string ExoplanetsDataPreparationTask::description() {
-    return fmt::format(
+    return std::format(
         "Extract data about exoplanets from file '{}' and write as bin to '{}'. The data "
         "file should be a csv version of the Planetary Systems Composite Data from the "
         "NASA exoplanets archive (https://exoplanetarchive.ipac.caltech.edu/)",
@@ -113,7 +113,7 @@ void ExoplanetsDataPreparationTask::perform(
 {
     std::ifstream inputDataFile(_inputDataPath);
     if (!inputDataFile.good()) {
-        LERROR(fmt::format("Failed to open input file '{}'", _inputDataPath));
+        LERROR(std::format("Failed to open input file '{}'", _inputDataPath));
         return;
     }
 
@@ -121,7 +121,7 @@ void ExoplanetsDataPreparationTask::perform(
     std::ofstream lutFile(_outputLutPath);
 
     if (!binFile.good()) {
-        LERROR(fmt::format("Error when writing to '{}'",_outputBinPath));
+        LERROR(std::format("Error when writing to '{}'",_outputBinPath));
         if (!std::filesystem::is_directory(_outputBinPath.parent_path())) {
             LERROR("Output directory does not exist");
         }
@@ -129,7 +129,7 @@ void ExoplanetsDataPreparationTask::perform(
     }
 
     if (!lutFile.good()) {
-        LERROR(fmt::format("Error when writing to '{}'", _outputLutPath));
+        LERROR(std::format("Error when writing to '{}'", _outputLutPath));
         if (!std::filesystem::is_directory(_outputLutPath.parent_path())) {
             LERROR("Output directory does not exist");
         }
@@ -156,7 +156,7 @@ void ExoplanetsDataPreparationTask::perform(
     // containing the data names, again
     readFirstDataRow(inputDataFile);
 
-    LINFO(fmt::format("Loading {} exoplanets", total));
+    LINFO(std::format("Loading {} exoplanets", total));
 
     int exoplanetCount = 0;
     while (std::getline(inputDataFile, row)) {
@@ -453,7 +453,7 @@ glm::vec3 ExoplanetsDataPreparationTask::starPosition(const std::string& starNam
 
     std::ifstream exoplanetsFile(sourceFile);
     if (!exoplanetsFile) {
-        LERROR(fmt::format("Error opening file '{}'", sourceFile));
+        LERROR(std::format("Error opening file '{}'", sourceFile));
     }
 
     std::string line;
@@ -499,7 +499,7 @@ float ExoplanetsDataPreparationTask::bvFromTeff(float teff,
 
     std::ifstream teffToBvFile(conversionFile);
     if (!teffToBvFile.good()) {
-        LERROR(fmt::format("Failed to open file '{}'", conversionFile));
+        LERROR(std::format("Failed to open file '{}'", conversionFile));
         return std::numeric_limits<float>::quiet_NaN();
     }
 
diff --git a/modules/fieldlines/rendering/renderablefieldlines.cpp b/modules/fieldlines/rendering/renderablefieldlines.cpp
index 7f616485b4..f9a019110f 100644
--- a/modules/fieldlines/rendering/renderablefieldlines.cpp
+++ b/modules/fieldlines/rendering/renderablefieldlines.cpp
@@ -125,21 +125,21 @@ RenderableFieldlines::RenderableFieldlines(const ghoul::Dictionary& dictionary)
     setIdentifier(identifier);
 
     if (!dictionary.hasValue<ghoul::Dictionary>(KeyVectorField)) {
-        LERROR(fmt::format("Renderable does not contain a key for '{}'", KeyVectorField));
+        LERROR(std::format("Renderable does not contain a key for '{}'", KeyVectorField));
     }
     else {
         _vectorFieldInfo = dictionary.value<ghoul::Dictionary>(KeyVectorField);
     }
 
     if (!dictionary.hasValue<ghoul::Dictionary>(KeyFieldlines)) {
-        LERROR(fmt::format("Renderable does not contain a key for '{}'", KeyFieldlines));
+        LERROR(std::format("Renderable does not contain a key for '{}'", KeyFieldlines));
     }
     else {
         _fieldlineInfo = dictionary.value<ghoul::Dictionary>(KeyFieldlines);
     }
 
     if (!dictionary.hasValue<ghoul::Dictionary>(KeySeedPoints)) {
-        LERROR(fmt::format("Renderable does not contain a key for '{}'", KeySeedPoints));
+        LERROR(std::format("Renderable does not contain a key for '{}'", KeySeedPoints));
     }
     else {
         _seedPointsInfo = dictionary.value<ghoul::Dictionary>(KeySeedPoints);
@@ -302,7 +302,7 @@ void RenderableFieldlines::update(const UpdateData&) {
                 fieldlines[j].end()
             );
         }
-        LDEBUG(fmt::format("Number of vertices: {}", vertexData.size()));
+        LDEBUG(std::format("Number of vertices: {}", vertexData.size()));
 
         if (_fieldlineVAO == 0) {
             glGenVertexArrays(1, &_fieldlineVAO);
@@ -363,11 +363,11 @@ void RenderableFieldlines::loadSeedPoints() {
 }
 
 void RenderableFieldlines::loadSeedPointsFromFile() {
-    LINFO(fmt::format("Reading seed points from '{}'", _seedPointSourceFile.value()));
+    LINFO(std::format("Reading seed points from '{}'", _seedPointSourceFile.value()));
 
     std::ifstream seedFile(_seedPointSourceFile);
     if (!seedFile.good())
-        LERROR(fmt::format(
+        LERROR(std::format(
             "Could not open seed points file '{}'", _seedPointSourceFile.value()
         ));
     else {
@@ -393,7 +393,7 @@ void RenderableFieldlines::loadSeedPointsFromTable() {
     ghoul::Dictionary seedpointsDictionary =
         _seedPointsInfo.value<ghoul::Dictionary>(KeySeedPointsType);
     for (std::string_view index : seedpointsDictionary.keys()) {
-        std::string key = fmt::format("{}.{}", KeySeedPointsTable, index);
+        std::string key = std::format("{}.{}", KeySeedPointsTable, index);
         // (2020-12-31, abock)  Looks to me as if this should be seedpointsDictionary
         if (_fieldlineInfo.hasValue<glm::dvec3>(key)) {
             glm::dvec3 seedPos = _fieldlineInfo.value<glm::dvec3>(key);
@@ -404,7 +404,7 @@ void RenderableFieldlines::loadSeedPointsFromTable() {
 
 std::vector<RenderableFieldlines::Line> RenderableFieldlines::generateFieldlines() {
     if (!_vectorFieldInfo.hasValue<std::string>(KeyVectorFieldType)) {
-        LERROR(fmt::format(
+        LERROR(std::format(
             "'{}' does not contain a '{}' key", KeyVectorField, KeyVectorFieldType
         ));
         return {};
@@ -415,7 +415,7 @@ std::vector<RenderableFieldlines::Line> RenderableFieldlines::generateFieldlines
         return generateFieldlinesVolumeKameleon();
     }
     else {
-        LERROR(fmt::format(
+        LERROR(std::format(
             "{}.{} does not name a valid type", KeyVectorField, KeyVectorFieldType
         ));
         return {};
@@ -426,14 +426,14 @@ std::vector<RenderableFieldlines::Line>
 RenderableFieldlines::generateFieldlinesVolumeKameleon()
 {
     if (!_vectorFieldInfo.hasValue<std::string>(KeyVectorFieldVolumeModel)) {
-        LERROR(fmt::format("'{}' does not name a model", KeyVectorField));
+        LERROR(std::format("'{}' does not name a model", KeyVectorField));
         return {};
     }
 
     std::string model = _vectorFieldInfo.value<std::string>(KeyVectorFieldVolumeModel);
 
     if (!_vectorFieldInfo.hasValue<std::string>(KeyVectorFieldFile)) {
-        LERROR(fmt::format("'{}' does not name a file", KeyVectorField));
+        LERROR(std::format("'{}' does not name a file", KeyVectorField));
         return {};
     }
     std::string fileName = _vectorFieldInfo.value<std::string>(KeyVectorFieldFile);
@@ -443,7 +443,7 @@ RenderableFieldlines::generateFieldlinesVolumeKameleon()
     if (model != VectorFieldKameleonModelBATSRUS) {
         //modelType = KameleonWrapper::Model::BATSRUS;
     //else {
-        LERROR(fmt::format(
+        LERROR(std::format(
             "{}.{} model '{}' not supported",
             KeyVectorField, KeyVectorFieldVolumeModel, model
         ));
@@ -463,7 +463,7 @@ RenderableFieldlines::generateFieldlinesVolumeKameleon()
         (_vectorFieldInfo.value<std::string>(v1) == VectorFieldKameleonVariableLorentz);
 
     if (!threeVariables && !lorentzForce) {
-        LERROR(fmt::format("'{}' does not name variables", KeyVectorField));
+        LERROR(std::format("'{}' does not name variables", KeyVectorField));
         return {};
     }
 
diff --git a/modules/fieldlinessequence/rendering/renderablefieldlinessequence.cpp b/modules/fieldlinessequence/rendering/renderablefieldlinessequence.cpp
index 69d5652e8b..f24d90322c 100644
--- a/modules/fieldlinessequence/rendering/renderablefieldlinessequence.cpp
+++ b/modules/fieldlinessequence/rendering/renderablefieldlinessequence.cpp
@@ -369,7 +369,7 @@ RenderableFieldlinesSequence::RenderableFieldlinesSequence(
             }
             else {
                 _tracingVariable = "b"; //  Magnetic field variable as default
-                LWARNING(fmt::format(
+                LWARNING(std::format(
                     "No tracing variable, using default '{}'", _tracingVariable
                 ));
             }
@@ -388,7 +388,7 @@ RenderableFieldlinesSequence::RenderableFieldlinesSequence(
     // the files with the same extension as fileTypeString
     std::filesystem::path sourcePath = p.sourceFolder;
     if (!std::filesystem::is_directory(sourcePath)) {
-        LERROR(fmt::format(
+        LERROR(std::format(
             "FieldlinesSequence '{}' is not a valid directory", sourcePath
         ));
     }
@@ -420,7 +420,7 @@ RenderableFieldlinesSequence::RenderableFieldlinesSequence(
 
     // Ensure that there are available and valid source files left
     if (_sourceFiles.empty()) {
-        LERROR(fmt::format(
+        LERROR(std::format(
             "'{}' contains no {} files", sourcePath.string(), fileTypeString
         ));
     }
@@ -490,7 +490,7 @@ RenderableFieldlinesSequence::RenderableFieldlinesSequence(
     _outputFolderPath = p.outputFolder.value_or(_outputFolderPath);
     if (!_outputFolderPath.empty() && !std::filesystem::is_directory(_outputFolderPath)) {
         _outputFolderPath.clear();
-        LERROR(fmt::format(
+        LERROR(std::format(
             "The specified output path '{}' does not exist", _outputFolderPath
         ));
     }
@@ -617,7 +617,7 @@ void RenderableFieldlinesSequence::loadOsflsStatesIntoRAM() {
             }
         }
         else {
-            LWARNING(fmt::format("Failed to load state from '{}'", filePath));
+            LWARNING(std::format("Failed to load state from '{}'", filePath));
         }
     }
 }
@@ -851,7 +851,7 @@ std::unordered_map<std::string, std::vector<glm::vec3>>
     std::unordered_map<std::string, std::vector<glm::vec3>> outMap;
 
     if (!std::filesystem::is_directory(filePath)) {
-        LERROR(fmt::format(
+        LERROR(std::format(
             "The specified seed point directory '{}' does not exist", filePath
         ));
         return outMap;
@@ -868,12 +868,12 @@ std::unordered_map<std::string, std::vector<glm::vec3>>
 
         std::ifstream seedFile(seedFilePath);
         if (!seedFile.good()) {
-            LERROR(fmt::format("Could not open seed points file '{}'", seedFilePath));
+            LERROR(std::format("Could not open seed points file '{}'", seedFilePath));
             outMap.clear();
             return {};
         }
 
-        LDEBUG(fmt::format("Reading seed points from file '{}'", seedFilePath));
+        LDEBUG(std::format("Reading seed points from file '{}'", seedFilePath));
         std::string line;
         std::vector<glm::vec3> outVec;
         while (std::getline(seedFile, line)) {
@@ -886,7 +886,7 @@ std::unordered_map<std::string, std::vector<glm::vec3>>
         }
 
         if (outVec.empty()) {
-            LERROR(fmt::format("Found no seed points in '{}'", seedFilePath));
+            LERROR(std::format("Found no seed points in '{}'", seedFilePath));
             outMap.clear();
             return {};
         }
diff --git a/modules/fieldlinessequence/util/fieldlinesstate.cpp b/modules/fieldlinessequence/util/fieldlinesstate.cpp
index 571088c3c7..e4e746b62b 100644
--- a/modules/fieldlinessequence/util/fieldlinesstate.cpp
+++ b/modules/fieldlinessequence/util/fieldlinesstate.cpp
@@ -140,7 +140,7 @@ bool FieldlinesState::loadStateFromJson(const std::string& pathToJsonFile,
     std::ifstream ifs(pathToJsonFile);
 
     if (!ifs.is_open()) {
-        LERROR(fmt::format("Failed to open file '{}'", pathToJsonFile));
+        LERROR(std::format("Failed to open file '{}'", pathToJsonFile));
         return false;
     }
 
@@ -252,7 +252,7 @@ void FieldlinesState::saveStateToOsfls(const std::string& absPath) {
 
     std::ofstream ofs(absPath + fileName, std::ofstream::binary | std::ofstream::trunc);
     if (!ofs.is_open()) {
-        LERROR(fmt::format(
+        LERROR(std::format(
             "Failed to save state to binary file: {}{}", absPath, fileName
         ));
         return;
@@ -326,12 +326,12 @@ void FieldlinesState::saveStateToJson(const std::string& absPath) {
     const char* ext = ".json";
     std::ofstream ofs(absPath + ext, std::ofstream::trunc);
     if (!ofs.is_open()) {
-        LERROR(fmt::format(
+        LERROR(std::format(
             "Failed to save state to json file at location: {}{}", absPath, ext
         ));
         return;
     }
-    LINFO(fmt::format("Saving fieldline state to: {}{}", absPath, ext));
+    LINFO(std::format("Saving fieldline state to: {}{}", absPath, ext));
 
     json jColumns = { "x", "y", "z" };
     for (const std::string& s : _extraQuantityNames) {
@@ -371,7 +371,7 @@ void FieldlinesState::saveStateToJson(const std::string& absPath) {
     const int indentationSpaces = 2;
     ofs << std::setw(indentationSpaces) << jFile << std::endl;
 
-    LINFO(fmt::format("Saved fieldline state to: {}{}", absPath, ext));
+    LINFO(std::format("Saved fieldline state to: {}{}", absPath, ext));
 }
 
 void FieldlinesState::setModel(fls::Model m) {
diff --git a/modules/fieldlinessequence/util/kameleonfieldlinehelper.cpp b/modules/fieldlinessequence/util/kameleonfieldlinehelper.cpp
index 266fa2a554..86741017dd 100644
--- a/modules/fieldlinessequence/util/kameleonfieldlinehelper.cpp
+++ b/modules/fieldlinessequence/util/kameleonfieldlinehelper.cpp
@@ -311,7 +311,7 @@ void prepareStateAndKameleonForExtras(ccmc::Kameleon* kameleon,
             str = TAsPOverRho;
         }
         if (!success) {
-            LWARNING(fmt::format("Failed to load extra variable '{}'. Ignoring", str));
+            LWARNING(std::format("Failed to load extra variable '{}'. Ignoring", str));
             extraScalarVars.erase(extraScalarVars.begin() + i);
             --i;
         }
@@ -349,7 +349,7 @@ void prepareStateAndKameleonForExtras(ccmc::Kameleon* kameleon,
                 name = JParallelB;
             }
             if (!success) {
-                LWARNING(fmt::format(
+                LWARNING(std::format(
                     "Failed to load at least one of the magnitude variables: '{}', '{}', "
                     "'{}'. Removing ability to store corresponding magnitude",
                     s1, s2, s3
@@ -368,7 +368,7 @@ void prepareStateAndKameleonForExtras(ccmc::Kameleon* kameleon,
     else {
         // WRONG NUMBER OF MAGNITUDE VARIABLES.. REMOVE ALL!
         extraMagVars.clear();
-        LWARNING(fmt::format(
+        LWARNING(std::format(
             "Wrong number of variables provided for storing magnitudes. Expects multiple "
             "of 3 but {} are provided",
             extraMagVars.size()
diff --git a/modules/fitsfilereader/src/fitsfilereader.cpp b/modules/fitsfilereader/src/fitsfilereader.cpp
index ec5260afd3..ae905c3940 100644
--- a/modules/fitsfilereader/src/fitsfilereader.cpp
+++ b/modules/fitsfilereader/src/fitsfilereader.cpp
@@ -185,7 +185,7 @@ std::shared_ptr<TableData<T>> FitsFileReader::readTable(const std::filesystem::p
         }
     }
     catch (FitsException& e) {
-        LERROR(fmt::format(
+        LERROR(std::format(
             "Could not read FITS table from file '{}'. Make sure it's not an image file",
             e.message()
         ));
@@ -248,7 +248,7 @@ std::vector<float> FitsFileReader::readFitsFile(std::filesystem::path filePath,
     );
 
     if (!table) {
-        throw ghoul::RuntimeError(fmt::format("Failed to open Fits file '{}'", filePath));
+        throw ghoul::RuntimeError(std::format("Failed to open Fits file '{}'", filePath));
     }
 
     int nStars = table->readRows - firstRow + 1;
@@ -385,7 +385,7 @@ std::vector<float> FitsFileReader::readFitsFile(std::filesystem::path filePath,
     auto table = readTable<float>(filePath, allColumnNames, firstRow, lastRow);
 
     if (!table) {
-        throw ghoul::RuntimeError(fmt::format("Failed to open Fits file '{}'", filePath));
+        throw ghoul::RuntimeError(std::format("Failed to open Fits file '{}'", filePath));
     }
 
     int nStars = table->readRows - firstRow + 1;
@@ -517,8 +517,8 @@ std::vector<float> FitsFileReader::readFitsFile(std::filesystem::path filePath,
         fullData.insert(fullData.end(), values.begin(), values.end());
     }*/
 
-    LINFO(fmt::format("{} out of {} read stars were null arrays", nNullArr, nStars));
-    LINFO(fmt::format("Multiplier: {}", multiplier));
+    LINFO(std::format("{} out of {} read stars were null arrays", nNullArr, nStars));
+    LINFO(std::format("Multiplier: {}", multiplier));
 
     return fullData;
 }
@@ -531,7 +531,7 @@ std::vector<float> FitsFileReader::readSpeckFile(const std::filesystem::path& fi
     std::ifstream fileStream(filePath);
 
     if (!fileStream.good()) {
-        LERROR(fmt::format("Failed to open Speck file '{}'", filePath));
+        LERROR(std::format("Failed to open Speck file '{}'", filePath));
         return fullData;
     }
 
@@ -649,7 +649,7 @@ std::vector<float> FitsFileReader::readSpeckFile(const std::filesystem::path& fi
 
     } while (!fileStream.eof());
 
-    LINFO(fmt::format("{} out of {} read stars were null arrays", nNullArr, nStars));
+    LINFO(std::format("{} out of {} read stars were null arrays", nNullArr, nStars));
 
     return fullData;
 }
diff --git a/modules/gaia/rendering/octreemanager.cpp b/modules/gaia/rendering/octreemanager.cpp
index aeca54ea8e..b8c8ea8e8b 100644
--- a/modules/gaia/rendering/octreemanager.cpp
+++ b/modules/gaia/rendering/octreemanager.cpp
@@ -159,10 +159,10 @@ void OctreeManager::printStarsPerNode() const {
         const std::string prefix = "{" + std::to_string(i);
         accumulatedString += printStarsPerNode(*_root->children[i], prefix);
     }
-    LINFO(fmt::format("Number of stars per node: \n{}", accumulatedString));
-    LINFO(fmt::format("Number of leaf nodes: {}", std::to_string(_numLeafNodes)));
-    LINFO(fmt::format("Number of inner nodes: {}", std::to_string(_numInnerNodes)));
-    LINFO(fmt::format("Depth of tree: {}", std::to_string(_totalDepth)));
+    LINFO(std::format("Number of stars per node: \n{}", accumulatedString));
+    LINFO(std::format("Number of leaf nodes: {}", std::to_string(_numLeafNodes)));
+    LINFO(std::format("Number of inner nodes: {}", std::to_string(_numInnerNodes)));
+    LINFO(std::format("Depth of tree: {}", std::to_string(_totalDepth)));
 }
 
 void OctreeManager::fetchSurroundingNodes(const glm::dvec3& cameraPos,
@@ -426,7 +426,7 @@ std::map<int, std::vector<float>> OctreeManager::traverseData(const glm::dmat4&
         // Uses a reverse loop to try to decrease the biggest chunk
         if (*removedKey == static_cast<int>(_biggestChunkIndexInUse) - 1) {
             _biggestChunkIndexInUse = *removedKey;
-            LDEBUG(fmt::format(
+            LDEBUG(std::format(
                 "Decreased size to: {} Free Spots in VBO: {}",
                 _biggestChunkIndexInUse, _freeSpotsInBuffer.size()
             ));
@@ -442,7 +442,7 @@ std::map<int, std::vector<float>> OctreeManager::traverseData(const glm::dmat4&
     if ((_biggestChunkIndexInUse > _maxStackSize * 4 / 5) &&
         (_freeSpotsInBuffer.size() > _maxStackSize * 5 / 6))
     {
-        LDEBUG(fmt::format(
+        LDEBUG(std::format(
             "Rebuilding VBO. Biggest Chunk: {}  4/5: {} FreeSpotsInVBO: {} 5/6: {}",
             _biggestChunkIndexInUse, _maxStackSize * 4 / 5, _freeSpotsInBuffer.size(),
             _maxStackSize * 5 / 6
@@ -521,7 +521,7 @@ std::map<int, std::vector<float>> OctreeManager::traverseData(const glm::dmat4&
         // Clear potential removed keys for both VBO and SSBO
         _removedKeysInPrevCall.clear();
 
-        LDEBUG(fmt::format(
+        LDEBUG(std::format(
             "After rebuilding branch {} - Biggest chunk: {} Free spots in buffer: {}",
             _traversedBranchesInRenderCall, _biggestChunkIndexInUse,
             _freeSpotsInBuffer.size()
@@ -620,7 +620,7 @@ int OctreeManager::readFromFile(std::ifstream& inFileStream, bool readData,
     inFileStream.read(reinterpret_cast<char*>(&MAX_STARS_PER_NODE), sizeof(int32_t));
     inFileStream.read(reinterpret_cast<char*>(&MAX_DIST), sizeof(int32_t));
 
-    LDEBUG(fmt::format(
+    LDEBUG(std::format(
         "Max stars per node in read Octree: {} - Radius of root layer: {}",
         MAX_STARS_PER_NODE, MAX_DIST
     ));
@@ -708,7 +708,7 @@ void OctreeManager::writeToMultipleFiles(const std::string& outFolderPath,
     writeNodeToMultipleFiles(outFilePrefix, *_root->children[branchIndex], false);
 
     // Clear all data in branch.
-    LINFO(fmt::format("Clear all data from branch {} in octree", branchIndex));
+    LINFO(std::format("Clear all data from branch {} in octree", branchIndex));
     clearNodeData(*_root->children[branchIndex]);
 }
 
@@ -738,7 +738,7 @@ void OctreeManager::writeNodeToMultipleFiles(const std::string& outFilePrefix,
             outFileStream.close();
         }
         else {
-            LERROR(fmt::format("Error opening file '{}' as output data file", outPath));
+            LERROR(std::format("Error opening file '{}' as output data file", outPath));
         }
     }
 
@@ -1088,7 +1088,7 @@ std::string OctreeManager::printStarsPerNode(const OctreeNode& node,
         return str + " - [Leaf] \n";
     }
     else {
-        str += fmt::format("LOD: {} - [Parent]\n", node.posData.size() / POS_SIZE);
+        str += std::format("LOD: {} - [Parent]\n", node.posData.size() / POS_SIZE);
         for (int i = 0; i < 8; i++) {
             auto pref = prefix + "->" + std::to_string(i);
             str += printStarsPerNode(*node.children[i], pref);
diff --git a/modules/gaia/rendering/renderablegaiastars.cpp b/modules/gaia/rendering/renderablegaiastars.cpp
index a6d943d28f..c345b1f5f0 100644
--- a/modules/gaia/rendering/renderablegaiastars.cpp
+++ b/modules/gaia/rendering/renderablegaiastars.cpp
@@ -511,7 +511,7 @@ RenderableGaiaStars::RenderableGaiaStars(const ghoul::Dictionary& dictionary)
             _dataIsDirty = true;
         }
         else {
-            LWARNING(fmt::format("File not found: {}", _filePath.value()));
+            LWARNING(std::format("File not found: {}", _filePath.value()));
         }
     });
     addProperty(_filePath);
@@ -597,7 +597,7 @@ RenderableGaiaStars::RenderableGaiaStars(const ghoul::Dictionary& dictionary)
         if (_ssboData != 0) {
             glDeleteBuffers(1, &_ssboData);
             glGenBuffers(1, &_ssboData);
-            LDEBUG(fmt::format(
+            LDEBUG(std::format(
                 "Re-generating Data Shader Storage Buffer Object id '{}'", _ssboData
             ));
         }
@@ -876,7 +876,7 @@ void RenderableGaiaStars::initializeGL() {
         &nCurrentAvailMemoryInKB
     );
 
-    LDEBUG(fmt::format(
+    LDEBUG(std::format(
         "nDedicatedVidMemoryKB: {} - nTotalMemoryKB: {} - nCurrentAvailMemoryKB: {}",
         nDedicatedVidMemoryInKB, nTotalMemoryInKB, nCurrentAvailMemoryInKB
     ));
@@ -899,7 +899,7 @@ void RenderableGaiaStars::initializeGL() {
         4294967296;
     _cpuRamBudgetProperty.setMaxValue(static_cast<float>(_cpuRamBudgetInBytes));
 
-    LDEBUG(fmt::format(
+    LDEBUG(std::format(
         "GPU Memory Budget (bytes): {} - CPU RAM Budget (bytes): {}",
         _gpuMemoryBudgetInBytes, _cpuRamBudgetInBytes
     ));
@@ -1755,7 +1755,7 @@ void RenderableGaiaStars::update(const UpdateData&) {
             removeProperty(_additionalNodes);
         }
 
-        LDEBUG(fmt::format(
+        LDEBUG(std::format(
             "Chunk size: {} - Max streaming budget (bytes): {} - Max nodes in stream: {}",
             _chunkSize, _maxStreamingBudgetInBytes, maxNodesInStream
         ));
@@ -1780,17 +1780,17 @@ void RenderableGaiaStars::update(const UpdateData&) {
             // Generate SSBO Buffers and bind them.
             if (_vaoEmpty == 0) {
                 glGenVertexArrays(1, &_vaoEmpty);
-                LDEBUG(fmt::format("Generating Empty Vertex Array id '{}'", _vaoEmpty));
+                LDEBUG(std::format("Generating Empty Vertex Array id '{}'", _vaoEmpty));
             }
             if (_ssboIdx == 0) {
                 glGenBuffers(1, &_ssboIdx);
-                LDEBUG(fmt::format(
+                LDEBUG(std::format(
                     "Generating Index Shader Storage Buffer Object id '{}'", _ssboIdx
                 ));
             }
             if (_ssboData == 0) {
                 glGenBuffers(1, &_ssboData);
-                LDEBUG(fmt::format(
+                LDEBUG(std::format(
                     "Generating Data Shader Storage Buffer Object id '{}'", _ssboData
                 ));
             }
@@ -1870,23 +1870,23 @@ void RenderableGaiaStars::update(const UpdateData&) {
             // Generate VAO and VBOs
             if (_vao == 0) {
                 glGenVertexArrays(1, &_vao);
-                LDEBUG(fmt::format("Generating Vertex Array id '{}'", _vao));
+                LDEBUG(std::format("Generating Vertex Array id '{}'", _vao));
             }
             if (_vboPos == 0) {
                 glGenBuffers(1, &_vboPos);
-                LDEBUG(fmt::format(
+                LDEBUG(std::format(
                     "Generating Position Vertex Buffer Object id '{}'", _vboPos
                 ));
             }
             if (_vboCol == 0) {
                 glGenBuffers(1, &_vboCol);
-                LDEBUG(fmt::format(
+                LDEBUG(std::format(
                     "Generating Color Vertex Buffer Object id '{}'", _vboCol
                 ));
             }
             if (_vboVel == 0) {
                 glGenBuffers(1, &_vboVel);
-                LDEBUG(fmt::format(
+                LDEBUG(std::format(
                     "Generating Velocity Vertex Buffer Object id '{}'", _vboVel
                 ));
             }
@@ -2012,11 +2012,11 @@ void RenderableGaiaStars::update(const UpdateData&) {
         // Generate VAO and VBO for Quad.
         if (_vaoQuad == 0) {
             glGenVertexArrays(1, &_vaoQuad);
-            LDEBUG(fmt::format("Generating Quad Vertex Array id '{}'", _vaoQuad));
+            LDEBUG(std::format("Generating Quad Vertex Array id '{}'", _vaoQuad));
         }
         if (_vboQuad == 0) {
             glGenBuffers(1, &_vboQuad);
-            LDEBUG(fmt::format("Generating Quad Vertex Buffer Object id '{}'", _vboQuad));
+            LDEBUG(std::format("Generating Quad Vertex Buffer Object id '{}'", _vboQuad));
         }
 
         // Bind VBO and VAO for Quad rendering.
@@ -2058,7 +2058,7 @@ void RenderableGaiaStars::update(const UpdateData&) {
         // Generate Framebuffer Object and Texture.
         if (_fbo == 0) {
             glGenFramebuffers(1, &_fbo);
-            LDEBUG(fmt::format("Generating Framebuffer Object id '{}'", _fbo));
+            LDEBUG(std::format("Generating Framebuffer Object id '{}'", _fbo));
         }
         if (!_fboTexture) {
             // Generate a new texture and attach it to our FBO.
@@ -2106,7 +2106,7 @@ void RenderableGaiaStars::update(const UpdateData&) {
             );
 
             if (_pointSpreadFunctionTexture) {
-                LDEBUG(fmt::format(
+                LDEBUG(std::format(
                     "Loaded texture from '{}'", absPath(_pointSpreadFunctionTexturePath)
                ));
                 _pointSpreadFunctionTexture->uploadTexture();
@@ -2134,7 +2134,7 @@ void RenderableGaiaStars::update(const UpdateData&) {
                 1
             );
             if (_colorTexture) {
-                LDEBUG(fmt::format(
+                LDEBUG(std::format(
                     "Loaded texture from '{}'", absPath(_colorTexturePath)
                 ));
                 _colorTexture->uploadTexture();
@@ -2195,7 +2195,7 @@ bool RenderableGaiaStars::readDataFile() {
     _octreeManager.initOctree(_cpuRamBudgetInBytes);
 
     std::filesystem::path file = absPath(_filePath.value());
-    LINFO(fmt::format("Loading data file '{}'", file));
+    LINFO(std::format("Loading data file '{}'", file));
 
     switch (fileReaderOption) {
         case gaia::FileReaderOption::Fits:
@@ -2225,7 +2225,7 @@ bool RenderableGaiaStars::readDataFile() {
 
     //_octreeManager->printStarsPerNode();
     _nRenderedStars.setMaxValue(nReadStars);
-    LINFO(fmt::format("Dataset contains a total of {} stars", nReadStars));
+    LINFO(std::format("Dataset contains a total of {} stars", nReadStars));
     _totalDatasetSizeInBytes = nReadStars * (PositionSize + ColorSize + VelocitySize) * 4;
 
     return nReadStars > 0;
@@ -2303,7 +2303,7 @@ int RenderableGaiaStars::readBinaryRawFile(const std::filesystem::path& filePath
         fileStream.close();
     }
     else {
-        LERROR(fmt::format(
+        LERROR(std::format(
             "Error opening file '{}' for loading raw binary file", filePath
         ));
         return nReadStars;
@@ -2321,7 +2321,7 @@ int RenderableGaiaStars::readBinaryOctreeFile(const std::filesystem::path& fileP
         fileStream.close();
     }
     else {
-        LERROR(fmt::format(
+        LERROR(std::format(
             "Error opening file '{}' for loading binary Octree file", filePath
         ));
         return nReadStars;
@@ -2342,7 +2342,7 @@ int RenderableGaiaStars::readBinaryOctreeStructureFile(
         fileStream.close();
     }
     else {
-        LERROR(fmt::format(
+        LERROR(std::format(
             "Error opening file '{}' for loading binary Octree file", indexFile
         ));
         return nReadStars;
diff --git a/modules/gaia/tasks/constructoctreetask.cpp b/modules/gaia/tasks/constructoctreetask.cpp
index 7b5de63695..338d788617 100644
--- a/modules/gaia/tasks/constructoctreetask.cpp
+++ b/modules/gaia/tasks/constructoctreetask.cpp
@@ -295,7 +295,7 @@ ConstructOctreeTask::ConstructOctreeTask(const ghoul::Dictionary& dictionary) {
 }
 
 std::string ConstructOctreeTask::description() {
-    return fmt::format(
+    return std::format(
         "Read bin file (or files in folder) '{}' and write octree data file (or files) "
         "into '{}'", _inFileOrFolderPath, _outFileOrFolderPath
     );
@@ -325,9 +325,9 @@ void ConstructOctreeTask::constructOctreeFromSingleFile(
 
     _octreeManager->initOctree(0, _maxDist, _maxStarsPerNode);
 
-    LINFO(fmt::format("Reading data file '{}'", _inFileOrFolderPath));
+    LINFO(std::format("Reading data file '{}'", _inFileOrFolderPath));
 
-    LINFO(fmt::format(
+    LINFO(std::format(
         "MAX DIST: {} - MAX STARS PER NODE: {}",
         _octreeManager->maxDist(), _octreeManager->maxStarsPerNode()
     ));
@@ -405,16 +405,16 @@ void ConstructOctreeTask::constructOctreeFromSingleFile(
         inFileStream.close();
     }
     else {
-        LERROR(fmt::format(
+        LERROR(std::format(
             "Error opening file '{}' for loading preprocessed file", _inFileOrFolderPath
         ));
     }
-    LINFO(fmt::format("{} of {} read stars were filtered", nFilteredStars, nTotalStars));
+    LINFO(std::format("{} of {} read stars were filtered", nFilteredStars, nTotalStars));
 
     // Slice LOD data before writing to files.
     _octreeManager->sliceLodData();
 
-    LINFO(fmt::format("Writing octree to '{}'", _outFileOrFolderPath));
+    LINFO(std::format("Writing octree to '{}'", _outFileOrFolderPath));
     std::ofstream outFileStream(_outFileOrFolderPath, std::ofstream::binary);
     if (outFileStream.good()) {
         if (nValues == 0) {
@@ -425,7 +425,7 @@ void ConstructOctreeTask::constructOctreeFromSingleFile(
         outFileStream.close();
     }
     else {
-        LERROR(fmt::format(
+        LERROR(std::format(
             "Error opening file '{}' as output data file", _outFileOrFolderPath
         ));
     }
@@ -470,7 +470,7 @@ void ConstructOctreeTask::constructOctreeFromFolder(
 
     const float processOneFile = 1.f / allInputFiles.size();
 
-    LINFO(fmt::format(
+    LINFO(std::format(
         "MAX DIST: {} - MAX STARS PER NODE: {}",
         _indexOctreeManager->maxDist(), _indexOctreeManager->maxStarsPerNode()
     ));
@@ -479,7 +479,7 @@ void ConstructOctreeTask::constructOctreeFromFolder(
         std::filesystem::path inFilePath = allInputFiles[idx];
         int nStarsInfile = 0;
 
-        LINFO(fmt::format("Reading data file '{}'", inFilePath));
+        LINFO(std::format("Reading data file '{}'", inFilePath));
 
         std::ifstream inFileStream(inFilePath, std::ifstream::binary);
         if (inFileStream.good()) {
@@ -536,7 +536,7 @@ void ConstructOctreeTask::constructOctreeFromFolder(
             inFileStream.close();
         }
         else {
-            LERROR(fmt::format(
+            LERROR(std::format(
                 "Error opening file '{}' for loading preprocessed file", inFilePath
             ));
         }
@@ -548,8 +548,8 @@ void ConstructOctreeTask::constructOctreeFromFolder(
         progressCallback((idx + 1) * processOneFile);
         nStars += nStarsInfile;
 
-        LINFO(fmt::format("Writing {} stars to octree files", nStarsInfile));
-        LINFO(fmt::format(
+        LINFO(std::format("Writing {} stars to octree files", nStarsInfile));
+        LINFO(std::format(
             "Number leaf nodes: {}\n Number inner nodes: {}\n Total depth of tree: {}",
             _indexOctreeManager->numLeafNodes(),
             _indexOctreeManager->numInnerNodes(),
@@ -567,7 +567,7 @@ void ConstructOctreeTask::constructOctreeFromFolder(
         writeThreads[idx] = std::move(t);
     }
 
-    LINFO(fmt::format(
+    LINFO(std::format(
         "A total of {} stars were read from files and distributed into {} total nodes",
         nStars, _indexOctreeManager->totalNodes()
     ));
@@ -591,7 +591,7 @@ void ConstructOctreeTask::constructOctreeFromFolder(
     //    " - 5000kPc is " + std::to_string(starsOutside5000));
 
     // Write index file of Octree structure.
-    std::filesystem::path indexFileOutPath = fmt::format(
+    std::filesystem::path indexFileOutPath = std::format(
         "{}/index.bin", _outFileOrFolderPath.string()
     );
     std::ofstream outFileStream(indexFileOutPath, std::ofstream::binary);
@@ -602,7 +602,7 @@ void ConstructOctreeTask::constructOctreeFromFolder(
         outFileStream.close();
     }
     else {
-        LERROR(fmt::format(
+        LERROR(std::format(
             "Error opening file '{}' as index output file", indexFileOutPath
         ));
     }
diff --git a/modules/gaia/tasks/readfilejob.cpp b/modules/gaia/tasks/readfilejob.cpp
index c3f98af875..34e4760bd9 100644
--- a/modules/gaia/tasks/readfilejob.cpp
+++ b/modules/gaia/tasks/readfilejob.cpp
@@ -59,7 +59,7 @@ void ReadFileJob::execute() {
 
     if (!table) {
         throw ghoul::RuntimeError(
-            fmt::format("Failed to open Fits file '{}'", _inFilePath
+            std::format("Failed to open Fits file '{}'", _inFilePath
         ));
     }
 
diff --git a/modules/gaia/tasks/readfitstask.cpp b/modules/gaia/tasks/readfitstask.cpp
index c13e64014b..dcad2ef70c 100644
--- a/modules/gaia/tasks/readfitstask.cpp
+++ b/modules/gaia/tasks/readfitstask.cpp
@@ -106,7 +106,7 @@ ReadFitsTask::ReadFitsTask(const ghoul::Dictionary& dictionary) {
 }
 
 std::string ReadFitsTask::description() {
-    return fmt::format(
+    return std::format(
         "Read the specified fits file (or all fits files in specified folder): '{}'\n "
         "and write raw star data into: '{}'\nAll columns required for default rendering "
         "and filtering parameters will always be read but user can define additional "
@@ -144,7 +144,7 @@ void ReadFitsTask::readSingleFitsFile(const Task::ProgressCallback& progressCall
     std::ofstream outFileStream(_outFileOrFolderPath, std::ofstream::binary);
     if (outFileStream.good()) {
         int32_t nValues = static_cast<int32_t>(fullData.size());
-        LINFO(fmt::format(
+        LINFO(std::format(
             "Writing {} values to file '{}'", nValues, _outFileOrFolderPath
         ));
         LINFO("Number of values per star: " + std::to_string(nValuesPerStar));
@@ -167,7 +167,7 @@ void ReadFitsTask::readSingleFitsFile(const Task::ProgressCallback& progressCall
         outFileStream.close();
     }
     else {
-        LERROR(fmt::format(
+        LERROR(std::format(
             "Error opening file '{}' as output data file", _outFileOrFolderPath
         ));
     }
@@ -300,24 +300,24 @@ void ReadFitsTask::readAllFitsFilesFromFolder(const Task::ProgressCallback&) {
             }
         }
     }
-    LINFO(fmt::format("A total of {} stars were written to binary files", totalStars));
+    LINFO(std::format("A total of {} stars were written to binary files", totalStars));
 }
 
 int ReadFitsTask::writeOctantToFile(const std::vector<float>& octantData, int index,
                                     std::vector<bool>& isFirstWrite, int nValuesPerStar)
 {
-    std::string outPath = fmt::format("{}octant_{}.bin", _outFileOrFolderPath, index);
+    std::string outPath = std::format("{}octant_{}.bin", _outFileOrFolderPath, index);
     std::ofstream fileStream(outPath, std::ofstream::binary | std::ofstream::app);
     if (fileStream.good()) {
         int32_t nValues = static_cast<int32_t>(octantData.size());
-        LINFO(fmt::format("Write {} values to {}", nValues, outPath));
+        LINFO(std::format("Write {} values to {}", nValues, outPath));
 
         if (nValues == 0) {
             LERROR("Error writing file - No values were read from file");
         }
         // If this is the first write then write number of values per star!
         if (isFirstWrite[index]) {
-            LINFO(fmt::format("First write for Octant_{}", index));
+            LINFO(std::format("First write for Octant_{}", index));
             fileStream.write(
                 reinterpret_cast<const char*>(&nValuesPerStar),
                 sizeof(int32_t)
@@ -334,7 +334,7 @@ int ReadFitsTask::writeOctantToFile(const std::vector<float>& octantData, int in
         return nValues / nValuesPerStar;
     }
     else {
-        LERROR(fmt::format("Error opening file '{}' as output data file", outPath));
+        LERROR(std::format("Error opening file '{}' as output data file", outPath));
         return 0;
     }
 }
diff --git a/modules/gaia/tasks/readspecktask.cpp b/modules/gaia/tasks/readspecktask.cpp
index f20ecab5b6..915368c986 100644
--- a/modules/gaia/tasks/readspecktask.cpp
+++ b/modules/gaia/tasks/readspecktask.cpp
@@ -59,7 +59,7 @@ ReadSpeckTask::ReadSpeckTask(const ghoul::Dictionary& dictionary) {
 }
 
 std::string ReadSpeckTask::description() {
-    return fmt::format(
+    return std::format(
         "Read speck file '{}' and write raw star data into '{}'",
         _inFilePath, _outFilePath
     );
@@ -95,7 +95,7 @@ void ReadSpeckTask::perform(const Task::ProgressCallback& onProgress) {
         fileStream.close();
     }
     else {
-        LERROR(fmt::format("Error opening file '{}' as output data file", _outFilePath));
+        LERROR(std::format("Error opening file '{}' as output data file", _outFilePath));
     }
 
     onProgress(1.f);
diff --git a/modules/galaxy/rendering/renderablegalaxy.cpp b/modules/galaxy/rendering/renderablegalaxy.cpp
index ddbd8eb497..32ab56f184 100644
--- a/modules/galaxy/rendering/renderablegalaxy.cpp
+++ b/modules/galaxy/rendering/renderablegalaxy.cpp
@@ -222,7 +222,7 @@ namespace {
         std::ofstream fileStream(file, std::ofstream::binary);
 
         if (!fileStream.good()) {
-            LERROR(fmt::format("Error opening file '{}' for save cache file", file));
+            LERROR(std::format("Error opening file '{}' for save cache file", file));
             return;
         }
 
@@ -361,7 +361,7 @@ void RenderableGalaxy::initialize() {
     );
     const bool hasCachedFile = std::filesystem::is_regular_file(cachedPointsFile);
     if (hasCachedFile) {
-        LINFO(fmt::format("Cached file '{}' used for galaxy point file '{}'",
+        LINFO(std::format("Cached file '{}' used for galaxy point file '{}'",
             cachedPointsFile, _pointsFilename
         ));
 
@@ -459,7 +459,7 @@ void RenderableGalaxy::initializeGL() {
         );
 
         if (_pointSpreadFunctionTexture) {
-            LDEBUG(fmt::format(
+            LDEBUG(std::format(
                 "Loaded texture from '{}'", absPath(_pointSpreadFunctionTexturePath)
             ));
             _pointSpreadFunctionTexture->uploadTexture();
@@ -783,14 +783,14 @@ RenderableGalaxy::Result RenderableGalaxy::loadCachedFile(
 {
     std::ifstream fileStream = std::ifstream(file, std::ifstream::binary);
     if (!fileStream.good()) {
-        LERROR(fmt::format("Error opening file '{}' for loading cache file", file));
+        LERROR(std::format("Error opening file '{}' for loading cache file", file));
         return { false, {}, {} };
     }
 
     int8_t cacheVersion = 0;
     fileStream.read(reinterpret_cast<char*>(&cacheVersion), sizeof(int8_t));
     if (cacheVersion != CurrentCacheVersion) {
-        LINFO(fmt::format("Removing cache file '{}' as the version changed", file));
+        LINFO(std::format("Removing cache file '{}' as the version changed", file));
         return { false, {}, {} };
     }
 
diff --git a/modules/globebrowsing/globebrowsingmodule.cpp b/modules/globebrowsing/globebrowsingmodule.cpp
index bdf082d5c5..1a63f355b2 100644
--- a/modules/globebrowsing/globebrowsingmodule.cpp
+++ b/modules/globebrowsing/globebrowsingmodule.cpp
@@ -232,7 +232,7 @@ void GlobeBrowsingModule::internalInitialize(const ghoul::Dictionary& dict) {
         else {
             LWARNINGC(
                 "GlobeBrowsingModule",
-                fmt::format(
+                std::format(
                     "The provided texture file '{}' for the default geo point texture "
                     "does not exist", path
                 )
diff --git a/modules/globebrowsing/globebrowsingmodule_lua.inl b/modules/globebrowsing/globebrowsingmodule_lua.inl
index 2efab28eb2..fbf03fff1a 100644
--- a/modules/globebrowsing/globebrowsingmodule_lua.inl
+++ b/modules/globebrowsing/globebrowsingmodule_lua.inl
@@ -191,7 +191,7 @@ namespace {
 
     SceneGraphNode* n = sceneGraphNode(globeIdentifier);
     if (!n) {
-        throw ghoul::lua::LuaError(fmt::format("Unknown globe '{}'", globeIdentifier));
+        throw ghoul::lua::LuaError(std::format("Unknown globe '{}'", globeIdentifier));
     }
 
     RenderableGlobe* globe = dynamic_cast<RenderableGlobe*>(n->renderable());
@@ -201,7 +201,7 @@ namespace {
 
     layers::Group::ID group = ghoul::from_string<layers::Group::ID>(layerGroup);
     if (group == layers::Group::ID::Unknown) {
-        throw ghoul::lua::LuaError(fmt::format("Unknown layer group '{}'", layerGroup));
+        throw ghoul::lua::LuaError(std::format("Unknown layer group '{}'", layerGroup));
     }
 
     LayerGroup& lg = globe->layerManager().layerGroup(group);
@@ -225,7 +225,7 @@ namespace {
             }
         );
         if (it == layers.cend()) {
-            throw ghoul::lua::LuaError(fmt::format(
+            throw ghoul::lua::LuaError(std::format(
                 "Could not find source layer '{}'", std::get<std::string>(source)
             ));
         }
@@ -245,7 +245,7 @@ namespace {
             }
         );
         if (it == layers.cend()) {
-            throw ghoul::lua::LuaError(fmt::format(
+            throw ghoul::lua::LuaError(std::format(
                 "Could not find destination layer '{}'", std::get<std::string>(source)
             ));
         }
@@ -668,7 +668,7 @@ geoPositionForCameraDeprecated(bool useEyePosition = false)
 
     std::filesystem::path path = absPath(filename);
     if (!std::filesystem::is_regular_file(path)) {
-        throw ghoul::lua::LuaError(fmt::format(
+        throw ghoul::lua::LuaError(std::format(
             "Could not find the provided file '{}'", filename
         ));
     }
@@ -677,7 +677,7 @@ geoPositionForCameraDeprecated(bool useEyePosition = false)
     extension = ghoul::toLowerCase(extension);
 
     if (extension != ".geojson" && extension != ".json") {
-        throw ghoul::lua::LuaError(fmt::format(
+        throw ghoul::lua::LuaError(std::format(
             "Unexpected file type '{}'. Expected '.geojson' or '.json' file", filename
         ));
     }
diff --git a/modules/globebrowsing/src/asynctiledataprovider.cpp b/modules/globebrowsing/src/asynctiledataprovider.cpp
index 15b58653ce..39df0e623e 100644
--- a/modules/globebrowsing/src/asynctiledataprovider.cpp
+++ b/modules/globebrowsing/src/asynctiledataprovider.cpp
@@ -141,7 +141,7 @@ void AsyncTileDataProvider::update() {
             // Only allow resetting if there are no jobs currently running
             if (_enqueuedTileRequests.empty()) {
                 performReset(ResetRawTileDataReader::Yes);
-                LINFO(fmt::format("Tile data reader '{}' reset successfully", _name));
+                LINFO(std::format("Tile data reader '{}' reset successfully", _name));
             }
             break;
         case ResetMode::ShouldResetAllButRawTileDataReader:
@@ -150,7 +150,7 @@ void AsyncTileDataProvider::update() {
             // Only allow resetting if there are no jobs currently running
             if (_enqueuedTileRequests.empty()) {
                 performReset(ResetRawTileDataReader::No);
-                LINFO(fmt::format("Tile data reader '{}' reset successfully", _name));
+                LINFO(std::format("Tile data reader '{}' reset successfully", _name));
             }
             break;
         case ResetMode::ShouldBeDeleted:
@@ -172,7 +172,7 @@ void AsyncTileDataProvider::reset() {
     // we need to wait until _enqueuedTileRequests is empty before finishing up.
     _resetMode = ResetMode::ShouldResetAll;
     endEnqueuedJobs();
-    LINFO(fmt::format("Prepairing for resetting of tile reader '{}'", _name));
+    LINFO(std::format("Prepairing for resetting of tile reader '{}'", _name));
 }
 
 void AsyncTileDataProvider::prepareToBeDeleted() {
diff --git a/modules/globebrowsing/src/dashboarditemglobelocation.cpp b/modules/globebrowsing/src/dashboarditemglobelocation.cpp
index 1fc998c0b8..740e15d10f 100644
--- a/modules/globebrowsing/src/dashboarditemglobelocation.cpp
+++ b/modules/globebrowsing/src/dashboarditemglobelocation.cpp
@@ -92,14 +92,14 @@ DashboardItemGlobeLocation::DashboardItemGlobeLocation(
     auto updateFormatString = [this]() {
         switch (_displayFormat.value()) {
             case static_cast<int>(DisplayFormat::DecimalDegrees):
-                _formatString = fmt::format(
+                _formatString = std::format(
                     "Position: {{:03.{0}f}}, {{:03.{0}f}}  "
                     "Altitude: {{:03.{0}f}} {{}}",
                     _significantDigits.value()
                 );
                 break;
             case static_cast<int>(DisplayFormat::DegreeMinuteSeconds):
-                _formatString = fmt::format(
+                _formatString = std::format(
                     "Position: {{}}d {{}}' {{:03.{0}f}}\" {{}}, "
                     "{{}}d {{}}' {{:03.{0}f}}\" {{}}  "
                     "Altitude: {{:03.{0}f}} {{}}",
@@ -157,9 +157,11 @@ void DashboardItemGlobeLocation::render(glm::vec2& penPosition) {
     switch (_displayFormat.value()) {
         case static_cast<int>(DisplayFormat::DecimalDegrees):
         {
-            end = fmt::format_to(
+            // @CPP26(abock): This can be replaced with std::runtime_format
+            end = std::vformat_to(
                 _buffer.data(),
-                fmt::runtime(_formatString), lat, lon, dist.first, dist.second
+                _formatString,
+                std::make_format_args(lat, lon, dist.first, dist.second)
             );
             break;
         }
@@ -184,12 +186,15 @@ void DashboardItemGlobeLocation::render(glm::vec2& penPosition) {
             const double lonSec = lonMinRemainder * 60.f;
 
 
-            end = fmt::format_to(
+            // @CPP26(abock): This can be replaced with std::runtime_format
+            end = std::vformat_to(
                 _buffer.data(),
-                fmt::runtime(_formatString),
-                latDeg, latMin, latSec, isNorth ? "N" : "S",
-                lonDeg, lonMin, lonSec, isEast ? "E" : "W",
-                dist.first, dist.second
+                _formatString,
+                std::make_format_args(
+                    latDeg, latMin, latSec, isNorth ? "N" : "S",
+                    lonDeg, lonMin, lonSec, isEast ? "E" : "W",
+                    dist.first, dist.second
+                )
             );
 
             break;
@@ -205,7 +210,7 @@ glm::vec2 DashboardItemGlobeLocation::size() const {
     ZoneScoped;
 
     return _font->boundingBox(
-        fmt::format("Position: {}, {}  Altitude: {}", 1.f, 1.f, 1.f)
+        std::format("Position: {}, {}  Altitude: {}", 1.f, 1.f, 1.f)
     );
 }
 
diff --git a/modules/globebrowsing/src/gdalwrapper.cpp b/modules/globebrowsing/src/gdalwrapper.cpp
index b8797751cc..3bb7c0093d 100644
--- a/modules/globebrowsing/src/gdalwrapper.cpp
+++ b/modules/globebrowsing/src/gdalwrapper.cpp
@@ -140,13 +140,13 @@ void GdalWrapper::setGdalProxyConfiguration() {
 
         const std::string proxy = address + ":" + std::to_string(port);
         CPLSetConfigOption("GDAL_HTTP_PROXY", proxy.c_str());
-        LDEBUG(fmt::format("Using proxy server '{}'", proxy));
+        LDEBUG(std::format("Using proxy server '{}'", proxy));
 
         if (!user.empty() && !password.empty()) {
             const std::string userPwd = user + ":" + password;
             CPLSetConfigOption("GDAL_HTTP_PROXYUSERPWD", userPwd.c_str());
             CPLSetConfigOption("GDAL_HTTP_PROXYAUTH", auth.c_str());
-            LDEBUG(fmt::format("Using authentication method: {}", auth));
+            LDEBUG(std::format("Using authentication method: {}", auth));
         }
     }
 }
diff --git a/modules/globebrowsing/src/geojson/geojsoncomponent.cpp b/modules/globebrowsing/src/geojson/geojsoncomponent.cpp
index 1ce8ada611..cd86bac7f8 100644
--- a/modules/globebrowsing/src/geojson/geojsoncomponent.cpp
+++ b/modules/globebrowsing/src/geojson/geojsoncomponent.cpp
@@ -368,7 +368,7 @@ GeoJsonComponent::GeoJsonComponent(const ghoul::Dictionary& dictionary,
             _textureIsDirty = true;
         }
         else {
-            LERROR(fmt::format(
+            LERROR(std::format(
                 "Provided texture file does not exist: {}",
                 _defaultProperties.pointTexture.value()
             ));
@@ -594,7 +594,7 @@ void GeoJsonComponent::readFile() {
     std::ifstream file(_geoJsonFile);
 
     if (!file.good()) {
-        LERROR(fmt::format("Failed to open GeoJSON file: {}", _geoJsonFile.value()));
+        LERROR(std::format("Failed to open GeoJSON file: {}", _geoJsonFile.value()));
         return;
     }
 
@@ -617,7 +617,7 @@ void GeoJsonComponent::readFile() {
         }
 
         if (_geometryFeatures.empty()) {
-            LWARNING(fmt::format(
+            LWARNING(std::format(
                 "No GeoJson features could be successfully created for GeoJson layer "
                 "with identifier '{}'. Disabling layer.", identifier()
             ));
@@ -625,7 +625,7 @@ void GeoJsonComponent::readFile() {
         }
     }
     catch (const geos::util::GEOSException& e) {
-        LERROR(fmt::format(
+        LERROR(std::format(
             "Error creating GeoJson layer with identifier '{}'. Problem reading "
             "GeoJson file '{}'. Error: {}", identifier(), _geoJsonFile.value(), e.what()
         ));
@@ -646,7 +646,7 @@ void GeoJsonComponent::parseSingleFeature(const geos::io::GeoJSONFeature& featur
     std::vector<const geos::geom::Geometry*> geomsToAdd;
     if (!geom) {
         // Null geometry => no geometries to add
-        LWARNING(fmt::format(
+        LWARNING(std::format(
             "Feature {} in GeoJson file '{}' is a null geometry and will not be loaded",
             indexInFile, _geoJsonFile.value()
         ));
@@ -683,7 +683,7 @@ void GeoJsonComponent::parseSingleFeature(const geos::io::GeoJSONFeature& featur
             // If there is already an owner with that name as an identifier, make a
             // unique one
             if (_featuresPropertyOwner.hasPropertySubOwner(identifier)) {
-                identifier = fmt::format("Feature{}-", index, identifier);
+                identifier = std::format("Feature{}-", index, identifier);
             }
 
             const properties::PropertyOwner::PropertyOwnerInfo info = {
@@ -698,7 +698,7 @@ void GeoJsonComponent::parseSingleFeature(const geos::io::GeoJSONFeature& featur
             _featuresPropertyOwner.addPropertySubOwner(_features.back().get());
         }
         catch (const ghoul::RuntimeError& error) {
-            LERROR(fmt::format(
+            LERROR(std::format(
                 "Error creating GeoJson layer with identifier '{}'. Problem reading "
                 "feature {} in GeoJson file '{}'.",
                 identifier(), indexInFile, _geoJsonFile.value()
@@ -835,7 +835,7 @@ void GeoJsonComponent::flyToFeature(std::optional<int> index) const {
     float lon = centroidLon + _latLongOffset.value().y;
 
     global::scriptEngine->queueScript(
-        fmt::format(
+        std::format(
             "openspace.globebrowsing.flyToGeo([[{}]], {}, {}, {})",
             _globeNode.owner()->identifier(), lat, lon, d
         ),
@@ -846,7 +846,7 @@ void GeoJsonComponent::flyToFeature(std::optional<int> index) const {
 
 void GeoJsonComponent::triggerDeletion() const {
     global::scriptEngine->queueScript(
-        fmt::format(
+        std::format(
             "openspace.globebrowsing.deleteGeoJson([[{}]], [[{}]])",
             _globeNode.owner()->identifier(), _identifier
         ),
diff --git a/modules/globebrowsing/src/geojson/geojsonproperties.cpp b/modules/globebrowsing/src/geojson/geojsonproperties.cpp
index c30f1effa7..1dab4ec7e8 100644
--- a/modules/globebrowsing/src/geojson/geojsonproperties.cpp
+++ b/modules/globebrowsing/src/geojson/geojsonproperties.cpp
@@ -120,7 +120,7 @@ namespace {
                 // Should add some more information on which file the reading failed for
                 LERRORC(
                     "GeoJson",
-                    fmt::format(
+                    std::format(
                         "Failed reading color property. Expected 3 values, got {}",
                         val.size()
                     )
@@ -140,7 +140,7 @@ namespace {
             if (!c) {
                 LERRORC(
                     "GeoJson",
-                    fmt::format(
+                    std::format(
                         "Failed reading color property. Did not find a hex color, got {}",
                         hex
                     )
@@ -532,7 +532,7 @@ GeoJsonOverrideProperties propsFromGeoJson(const geos::io::GeoJSONFeature& featu
                 result.pointTextureAnchor = GeoJsonProperties::PointTextureAnchor::Center;
             }
             else {
-                LERRORC("GeoJson", fmt::format(
+                LERRORC("GeoJson", std::format(
                     "Point texture anchor mode '{}' not supported", mode
                 ));
             }
@@ -554,7 +554,7 @@ GeoJsonOverrideProperties propsFromGeoJson(const geos::io::GeoJSONFeature& featu
             //    result.altitudeMode = GeoJsonProperties::AltitudeMode::ClampToGround;
             //}
             else {
-                LERRORC("GeoJson", fmt::format(
+                LERRORC("GeoJson", std::format(
                     "Altitude mode '{}' not supported", mode
                 ));
             }
@@ -587,7 +587,7 @@ GeoJsonOverrideProperties propsFromGeoJson(const geos::io::GeoJSONFeature& featu
         }
         catch (const geos::io::GeoJSONValue::GeoJSONTypeError&) {
             // @TODO: Should add some more information on which file the reading failed
-            LERRORC("GeoJson", fmt::format(
+            LERRORC("GeoJson", std::format(
                 "Error reading GeoJson property '{}'. Value has wrong type", key
             ));
         }
diff --git a/modules/globebrowsing/src/geojson/globegeometryfeature.cpp b/modules/globebrowsing/src/geojson/globegeometryfeature.cpp
index ebfcb7ab5e..b925be7797 100644
--- a/modules/globebrowsing/src/geojson/globegeometryfeature.cpp
+++ b/modules/globebrowsing/src/geojson/globegeometryfeature.cpp
@@ -151,7 +151,7 @@ void GlobeGeometryFeature::updateTexture(bool isInitializeStep) {
         _pointTexture->uploadToGpu();
     }
     else {
-        LERROR(fmt::format(
+        LERROR(std::format(
             "Trying to use texture file that does not exist: {}", texturePath
         ));
     }
@@ -235,7 +235,7 @@ void GlobeGeometryFeature::createFromSingleGeosGeometry(const geos::geom::Geomet
                 _type = GeometryType::Polygon;
             }
             catch (geos::util::IllegalStateException& e) {
-                throw ghoul::RuntimeError(fmt::format(
+                throw ghoul::RuntimeError(std::format(
                     "Non-simple (e.g. self-intersecting) polygons not supported yet. "
                     "GEOS error: {}", e.what()
                 ));
@@ -244,7 +244,7 @@ void GlobeGeometryFeature::createFromSingleGeosGeometry(const geos::geom::Geomet
                 // https://www.sciencedirect.com/science/article/pii/S0304397520304199
             }
             catch (geos::util::GEOSException& e) {
-                throw ghoul::RuntimeError(fmt::format(
+                throw ghoul::RuntimeError(std::format(
                     "Unknown geos error: {}", e.what()
                 ));
             }
@@ -282,7 +282,7 @@ void GlobeGeometryFeature::createFromSingleGeosGeometry(const geos::geom::Geomet
         _key = *_properties.overrideValues.name;
     }
     else {
-        _key = fmt::format("Feature {} - {}", index, geo->getGeometryType());
+        _key = std::format("Feature {} - {}", index, geo->getGeometryType());
     }
 }
 
diff --git a/modules/globebrowsing/src/globelabelscomponent.cpp b/modules/globebrowsing/src/globelabelscomponent.cpp
index cd6350402e..60f8409dc7 100644
--- a/modules/globebrowsing/src/globelabelscomponent.cpp
+++ b/modules/globebrowsing/src/globelabelscomponent.cpp
@@ -376,7 +376,7 @@ bool GlobeLabelsComponent::loadLabelsData(const std::filesystem::path& file) {
 
     const bool hasCachedFile = std::filesystem::is_regular_file(cachedFile);
     if (hasCachedFile) {
-        LINFO(fmt::format(
+        LINFO(std::format(
             "Cached file '{}' used for labels file '{}'", cachedFile, file
         ));
 
@@ -391,9 +391,9 @@ bool GlobeLabelsComponent::loadLabelsData(const std::filesystem::path& file) {
         }
     }
     else {
-        LINFO(fmt::format("Cache for labels file '{}' not found", file));
+        LINFO(std::format("Cache for labels file '{}' not found", file));
     }
-    LINFO(fmt::format("Loading labels file '{}'", file));
+    LINFO(std::format("Loading labels file '{}'", file));
 
     const bool success = readLabelsFile(file);
     if (success) {
@@ -406,7 +406,7 @@ bool GlobeLabelsComponent::readLabelsFile(const std::filesystem::path& file) {
     try {
         std::fstream csvLabelFile(file);
         if (!csvLabelFile.good()) {
-            LERROR(fmt::format("Failed to open labels file '{}'", file));
+            LERROR(std::format("Failed to open labels file '{}'", file));
             return false;
         }
         if (!csvLabelFile.is_open()) {
@@ -491,7 +491,7 @@ bool GlobeLabelsComponent::readLabelsFile(const std::filesystem::path& file) {
         return true;
     }
     catch (const std::fstream::failure& e) {
-        LERROR(fmt::format("Failed reading labels file '{}'", file));
+        LERROR(std::format("Failed reading labels file '{}'", file));
         LERROR(e.what());
         return false;
     }
@@ -500,7 +500,7 @@ bool GlobeLabelsComponent::readLabelsFile(const std::filesystem::path& file) {
 bool GlobeLabelsComponent::loadCachedFile(const std::filesystem::path& file) {
     std::ifstream fileStream(file, std::ifstream::binary);
     if (!fileStream.good()) {
-        LERROR(fmt::format("Error opening file '{}' for loading cache file", file));
+        LERROR(std::format("Error opening file '{}' for loading cache file", file));
         return false;
     }
 
@@ -530,7 +530,7 @@ bool GlobeLabelsComponent::loadCachedFile(const std::filesystem::path& file) {
 bool GlobeLabelsComponent::saveCachedFile(const std::filesystem::path& file) const {
     std::ofstream fileStream = std::ofstream(file, std::ofstream::binary);
     if (!fileStream.good()) {
-        LERROR(fmt::format("Error opening file '{}' for save cache file", file));
+        LERROR(std::format("Error opening file '{}' for save cache file", file));
         return false;
     }
     fileStream.write(reinterpret_cast<const char*>(&CurrentCacheVersion), sizeof(int8_t));
diff --git a/modules/globebrowsing/src/globerotation.cpp b/modules/globebrowsing/src/globerotation.cpp
index 5d9f6471ff..62dd959b4f 100644
--- a/modules/globebrowsing/src/globerotation.cpp
+++ b/modules/globebrowsing/src/globerotation.cpp
@@ -230,7 +230,7 @@ glm::dmat3 GlobeRotation::matrix(const UpdateData&) const {
     if (!_globeNode) {
         LERRORC(
             "GlobeRotation",
-            fmt::format("Could not find globe '{}'", _globe.value())
+            std::format("Could not find globe '{}'", _globe.value())
         );
         return _matrix;
     }
diff --git a/modules/globebrowsing/src/globetranslation.cpp b/modules/globebrowsing/src/globetranslation.cpp
index 68cc127e8e..2d997e1727 100644
--- a/modules/globebrowsing/src/globetranslation.cpp
+++ b/modules/globebrowsing/src/globetranslation.cpp
@@ -225,7 +225,7 @@ glm::dvec3 GlobeTranslation::position(const UpdateData&) const {
     if (!_attachedNode) {
         LERRORC(
             "GlobeRotation",
-            fmt::format("Could not find attached node '{}'", _globe.value())
+            std::format("Could not find attached node '{}'", _globe.value())
         );
         return _position;
     }
diff --git a/modules/globebrowsing/src/gpulayergroup.cpp b/modules/globebrowsing/src/gpulayergroup.cpp
index be7096f18f..319ae6ea7c 100644
--- a/modules/globebrowsing/src/gpulayergroup.cpp
+++ b/modules/globebrowsing/src/gpulayergroup.cpp
@@ -116,7 +116,7 @@ void GPULayerGroup::bind(ghoul::opengl::ProgramObject& p, const LayerGroup& laye
         GPULayer& gal = _gpuActiveLayers[i];
         auto& galuc = gal.uniformCache;
         const Layer& al = *activeLayers[i];
-        const std::string name = fmt::format("{}[{}].", layerGroup.identifier(), i);
+        const std::string name = std::format("{}[{}].", layerGroup.identifier(), i);
 
         if (layerGroup.isHeightLayer()) {
             gal.isHeightLayer = true;
@@ -152,7 +152,7 @@ void GPULayerGroup::bind(ghoul::opengl::ProgramObject& p, const LayerGroup& laye
                 for (size_t j = 0; j < gal.gpuChunkTiles.size(); j++) {
                     GPULayer::GPUChunkTile& t = gal.gpuChunkTiles[j];
                     auto& tuc = t.uniformCache;
-                    const std::string n = fmt::format("{}pile.chunkTile{}.", name, j);
+                    const std::string n = std::format("{}pile.chunkTile{}.", name, j);
 
                     tuc.texture = p.uniformLocation(n + "textureSampler");
                     tuc.uvOffset = p.uniformLocation(n + "uvTransform.uvOffset");
diff --git a/modules/globebrowsing/src/layergroupid.h b/modules/globebrowsing/src/layergroupid.h
index b8e6d92c11..a1d5f159fd 100644
--- a/modules/globebrowsing/src/layergroupid.h
+++ b/modules/globebrowsing/src/layergroupid.h
@@ -210,7 +210,7 @@ constexpr openspace::globebrowsing::layers::Layer::ID from_string(std::string_vi
         return it->id;
     }
     else {
-        throw ghoul::RuntimeError(fmt::format(
+        throw ghoul::RuntimeError(std::format(
             "Could not find Layer of type '{}'", string
         ));
     }
@@ -231,7 +231,7 @@ constexpr openspace::globebrowsing::layers::Group::ID from_string(std::string_vi
         return it->id;
     }
     else {
-        throw ghoul::RuntimeError(fmt::format(
+        throw ghoul::RuntimeError(std::format(
             "Could not find Group of type '{}'", string
         ));
     }
diff --git a/modules/globebrowsing/src/layermanager.cpp b/modules/globebrowsing/src/layermanager.cpp
index 2387fa5bc8..3c088952fc 100644
--- a/modules/globebrowsing/src/layermanager.cpp
+++ b/modules/globebrowsing/src/layermanager.cpp
@@ -72,7 +72,7 @@ void LayerManager::initialize(const ghoul::Dictionary& layerGroupsDict) {
             _layerGroups[static_cast<int>(id)]->setLayersFromDict(d);
         }
         else {
-            LWARNINGC("LayerManager", fmt::format("Unknown layer group '{}'", group));
+            LWARNINGC("LayerManager", std::format("Unknown layer group '{}'", group));
         }
     }
 
diff --git a/modules/globebrowsing/src/rawtiledatareader.cpp b/modules/globebrowsing/src/rawtiledatareader.cpp
index 0374d9681c..feb2a6f75f 100644
--- a/modules/globebrowsing/src/rawtiledatareader.cpp
+++ b/modules/globebrowsing/src/rawtiledatareader.cpp
@@ -111,7 +111,7 @@ GDALDataType toGDALDataType(GLenum glType) {
         default:
             LERRORC(
                 "GDALRawTileDataReader",
-                fmt::format(
+                std::format(
                     "OpenGL data type unknown to GDAL: {}", static_cast<int>(glType)
                 )
             );
@@ -282,7 +282,7 @@ std::optional<std::string> RawTileDataReader::mrfCache() {
 
     for (std::string_view fmt : Unsupported) {
         if (_datasetFilePath.ends_with(fmt)) {
-            LWARNING(fmt::format(
+            LWARNING(std::format(
                 "Unsupported file format for MRF caching: '{}', Dataset: '{}'",
                 fmt, _datasetFilePath
             ));
@@ -294,7 +294,7 @@ std::optional<std::string> RawTileDataReader::mrfCache() {
 
     const std::string datasetIdentifier =
         std::to_string(std::hash<std::string>{}(_datasetFilePath));
-    const std::string path = fmt::format("{}/{}/{}/",
+    const std::string path = std::format("{}/{}/{}/",
         mod.mrfCacheLocation(), _cacheProperties.path, datasetIdentifier);
     const std::string root = absPath(path).string();
     std::string mrf = root + datasetIdentifier + ".mrf";
@@ -304,7 +304,7 @@ std::optional<std::string> RawTileDataReader::mrfCache() {
         if (!std::filesystem::create_directories(root, ec)) {
             // Already existing directories causes a 'failure' but no error
             if (ec) {
-                LWARNING(fmt::format(
+                LWARNING(std::format(
                     "Failed to create directories for cache at: '{}'. "
                     "Error Code: '{}', message: {}",
                     root, std::to_string(ec.value()), ec.message()
@@ -319,7 +319,7 @@ std::optional<std::string> RawTileDataReader::mrfCache() {
                 GDALOpen(_datasetFilePath.c_str(), GA_ReadOnly)
             );
             if (!src) {
-                LWARNING(fmt::format(
+                LWARNING(std::format(
                     "Failed to load dataset '{}'. GDAL error: {}",
                     _datasetFilePath, CPLGetLastErrorMsg()
                 ));
@@ -356,7 +356,7 @@ std::optional<std::string> RawTileDataReader::mrfCache() {
                 driver->CreateCopy(mrf.c_str(), src, false, createOpts, nullptr, nullptr)
             );
             if (!dst) {
-                LWARNING(fmt::format(
+                LWARNING(std::format(
                     "Failed to create MRF Caching dataset dataset '{}'. GDAL error: {}",
                     mrf, CPLGetLastErrorMsg()
                 ));
@@ -397,7 +397,7 @@ void RawTileDataReader::initialize() {
         ZoneScopedN("GDALOpen");
         _dataset = static_cast<GDALDataset*>(GDALOpen(content.c_str(), GA_ReadOnly));
         if (!_dataset) {
-            throw ghoul::RuntimeError(fmt::format(
+            throw ghoul::RuntimeError(std::format(
                 "Failed to load dataset '{}'. GDAL error: {}",
                 _datasetFilePath, CPLGetLastErrorMsg()
             ));
diff --git a/modules/globebrowsing/src/renderableglobe.cpp b/modules/globebrowsing/src/renderableglobe.cpp
index 2ecd96ec4a..ff921efe5b 100644
--- a/modules/globebrowsing/src/renderableglobe.cpp
+++ b/modules/globebrowsing/src/renderableglobe.cpp
@@ -866,7 +866,7 @@ void RenderableGlobe::renderSecondary(const RenderData& data, RendererTasks&) {
         _globeLabelsComponent.draw(data);
     }
     catch (const ghoul::opengl::TextureUnit::TextureUnitError& e) {
-        LERROR(fmt::format("Error on drawing globe labels '{}'", e.message));
+        LERROR(std::format("Error on drawing globe labels '{}'", e.message));
     }
 
     if (_geoJsonManager.isReady()) {
@@ -1726,21 +1726,21 @@ void RenderableGlobe::recompileShaders() {
         // lastLayerIndex must be at least 0 for the shader to compile,
         // the layer type is inactivated by setting use to false
         shaderDictionary.setValue(
-            fmt::format("lastLayerIndex{}", layers::Groups[i].identifier),
+            std::format("lastLayerIndex{}", layers::Groups[i].identifier),
             glm::max(preprocessingData.layeredTextureInfo[i].lastLayerIdx, 0)
         );
         shaderDictionary.setValue(
-            fmt::format("use{}", layers::Groups[i].identifier),
+            std::format("use{}", layers::Groups[i].identifier),
             preprocessingData.layeredTextureInfo[i].lastLayerIdx >= 0
         );
         shaderDictionary.setValue(
-            fmt::format("blend{}", layers::Groups[i].identifier),
+            std::format("blend{}", layers::Groups[i].identifier),
             preprocessingData.layeredTextureInfo[i].layerBlendingEnabled
         );
 
         // This is to avoid errors from shader preprocessor
         shaderDictionary.setValue(
-            fmt::format("{}0LayerType", layers::Groups[i].identifier),
+            std::format("{}0LayerType", layers::Groups[i].identifier),
             0
         );
 
@@ -2198,17 +2198,17 @@ void RenderableGlobe::calculateEclipseShadows(ghoul::opengl::ProgramObject& prog
         constexpr std::string_view NameSource = "shadowDataArray[{}].sourceCasterVec";
         constexpr std::string_view NamePos = "shadowDataArray[{}].casterPositionVec";
 
-        programObject.setUniform(fmt::format(NameIsShadowing, counter), sd.isShadowing);
+        programObject.setUniform(std::format(NameIsShadowing, counter), sd.isShadowing);
 
         if (sd.isShadowing) {
-            programObject.setUniform(fmt::format(NameXp, counter), sd.xp);
-            programObject.setUniform(fmt::format(NameXu, counter), sd.xu);
-            programObject.setUniform(fmt::format(NameRc, counter), sd.rc);
+            programObject.setUniform(std::format(NameXp, counter), sd.xp);
+            programObject.setUniform(std::format(NameXu, counter), sd.xu);
+            programObject.setUniform(std::format(NameRc, counter), sd.rc);
             programObject.setUniform(
-                fmt::format(NameSource, counter), sd.sourceCasterVec
+                std::format(NameSource, counter), sd.sourceCasterVec
             );
             programObject.setUniform(
-                fmt::format(NamePos, counter), sd.casterPositionVec
+                std::format(NamePos, counter), sd.casterPositionVec
             );
         }
         counter++;
diff --git a/modules/globebrowsing/src/ringscomponent.cpp b/modules/globebrowsing/src/ringscomponent.cpp
index 195a2afe2c..a7fe337ac0 100644
--- a/modules/globebrowsing/src/ringscomponent.cpp
+++ b/modules/globebrowsing/src/ringscomponent.cpp
@@ -665,7 +665,7 @@ void RingsComponent::loadTexture() {
         if (texture) {
             LDEBUGC(
                 "RingsComponent",
-                fmt::format("Loaded texture from '{}'", absPath(_texturePath))
+                std::format("Loaded texture from '{}'", absPath(_texturePath))
             );
             _texture = std::move(texture);
 
@@ -688,7 +688,7 @@ void RingsComponent::loadTexture() {
         if (textureForwards) {
             LDEBUGC(
                 "RingsComponent",
-                fmt::format(
+                std::format(
                     "Loaded forwards scattering texture from '{}'",
                     absPath(_textureFwrdPath)
                 )
@@ -715,7 +715,7 @@ void RingsComponent::loadTexture() {
         if (textureBackwards) {
             LDEBUGC(
                 "RingsComponent",
-                fmt::format(
+                std::format(
                     "Loaded backwards scattering texture from '{}'",
                     absPath(_textureBckwrdPath)
                 )
@@ -742,7 +742,7 @@ void RingsComponent::loadTexture() {
         if (textureUnlit) {
             LDEBUGC(
                 "RingsComponent",
-                fmt::format("Loaded unlit texture from '{}'", absPath(_textureUnlitPath))
+                std::format("Loaded unlit texture from '{}'", absPath(_textureUnlitPath))
             );
             _textureUnlit = std::move(textureUnlit);
 
@@ -765,7 +765,7 @@ void RingsComponent::loadTexture() {
         if (textureColor) {
             LDEBUGC(
                 "RingsComponent",
-                fmt::format("Loaded color texture from '{}'", absPath(_textureColorPath))
+                std::format("Loaded color texture from '{}'", absPath(_textureColorPath))
             );
             _textureColor = std::move(textureColor);
 
@@ -788,7 +788,7 @@ void RingsComponent::loadTexture() {
         if (textureTransparency) {
             LDEBUGC(
                 "RingsComponent",
-                fmt::format("Loaded unlit texture from '{}'", absPath(_textureUnlitPath))
+                std::format("Loaded unlit texture from '{}'", absPath(_textureUnlitPath))
             );
             _textureTransparency = std::move(textureTransparency);
 
diff --git a/modules/globebrowsing/src/shadowcomponent.cpp b/modules/globebrowsing/src/shadowcomponent.cpp
index 82b8d3ba50..7d0034e24e 100644
--- a/modules/globebrowsing/src/shadowcomponent.cpp
+++ b/modules/globebrowsing/src/shadowcomponent.cpp
@@ -534,7 +534,7 @@ void ShadowComponent::saveDepthBuffer() const {
         for (int i = 0; i < _shadowDepthTextureWidth; i++) {
             for (int j = 0; j < _shadowDepthTextureHeight; j++, k++) {
                 const unsigned int val = static_cast<unsigned int>(buffer[k]);
-                ppmFile << fmt::format("{0} {0} {0} ", val);
+                ppmFile << std::format("{0} {0} {0} ", val);
             }
             ppmFile << '\n';
         }
diff --git a/modules/globebrowsing/src/tileprovider/defaulttileprovider.cpp b/modules/globebrowsing/src/tileprovider/defaulttileprovider.cpp
index 400e058db0..b791c499f0 100644
--- a/modules/globebrowsing/src/tileprovider/defaulttileprovider.cpp
+++ b/modules/globebrowsing/src/tileprovider/defaulttileprovider.cpp
@@ -130,7 +130,7 @@ DefaultTileProvider::DefaultTileProvider(const ghoul::Dictionary& dictionary)
     const Parameters p = codegen::bake<Parameters>(dictionary);
 
     name = p.name.value_or("Name unspecified");
-    const std::string _loggerCat = fmt::format("DefaultTileProvider ({})", name);
+    const std::string _loggerCat = std::format("DefaultTileProvider ({})", name);
 
     // 1. Get required Keys
     _filePath = p.filePath;
@@ -162,7 +162,7 @@ DefaultTileProvider::DefaultTileProvider(const ghoul::Dictionary& dictionary)
     std::string identifier = p.identifier.value_or("unspecified");
     std::string enclosing = p.globeName.value_or("unspecified");
 
-    std::string path = fmt::format("{}/{}/{}/", enclosing, layerGroup, identifier);
+    std::string path = std::format("{}/{}/{}/", enclosing, layerGroup, identifier);
 
     const GlobeBrowsingModule& mod = *global::moduleEngine->module<GlobeBrowsingModule>();
     bool enabled = mod.isMRFCachingEnabled();
diff --git a/modules/globebrowsing/src/tileprovider/singleimagetileprovider.cpp b/modules/globebrowsing/src/tileprovider/singleimagetileprovider.cpp
index 38f06a658a..cd7f1af860 100644
--- a/modules/globebrowsing/src/tileprovider/singleimagetileprovider.cpp
+++ b/modules/globebrowsing/src/tileprovider/singleimagetileprovider.cpp
@@ -85,7 +85,7 @@ void SingleImageProvider::reset() {
     _tileTexture = ghoul::io::TextureReader::ref().loadTexture(_filePath, 2);
     if (!_tileTexture) {
         throw ghoul::RuntimeError(
-            fmt::format("Unable to load texture '{}'", _filePath.value())
+            std::format("Unable to load texture '{}'", _filePath.value())
         );
     }
 
diff --git a/modules/globebrowsing/src/tileprovider/sizereferencetileprovider.cpp b/modules/globebrowsing/src/tileprovider/sizereferencetileprovider.cpp
index 95d5051464..136582a69e 100644
--- a/modules/globebrowsing/src/tileprovider/sizereferencetileprovider.cpp
+++ b/modules/globebrowsing/src/tileprovider/sizereferencetileprovider.cpp
@@ -94,7 +94,7 @@ Tile SizeReferenceTileProvider::tile(const TileIndex& tileIndex) {
         unit = "m";
     }
 
-    const std::string text = fmt::format("{:.0f} {:s}", tileLongitudalLength, unit);
+    const std::string text = std::format("{:.0f} {:s}", tileLongitudalLength, unit);
     const glm::vec2 textPosition = glm::vec2(
         0.f,
         aboveEquator ?
diff --git a/modules/globebrowsing/src/tileprovider/temporaltileprovider.cpp b/modules/globebrowsing/src/tileprovider/temporaltileprovider.cpp
index 34616b46d4..1456f92ba4 100644
--- a/modules/globebrowsing/src/tileprovider/temporaltileprovider.cpp
+++ b/modules/globebrowsing/src/tileprovider/temporaltileprovider.cpp
@@ -217,13 +217,13 @@ TemporalTileProvider::TemporalTileProvider(const ghoul::Dictionary& dictionary)
             _prototyped.temporalResolution = p.prototyped->temporalResolution;
         }
         catch (const ghoul::RuntimeError& e) {
-            throw ghoul::RuntimeError(fmt::format(
+            throw ghoul::RuntimeError(std::format(
                 "Could not create time quantizer for Temporal GDAL dataset: {}", e.message
             ));
         }
 
         if (p.prototyped->timeFormat.size() >= 64) {
-            throw ghoul::RuntimeError(fmt::format(
+            throw ghoul::RuntimeError(std::format(
                 "Time format string '{}' too large. Maximum length of 64 is allowed",
                 p.prototyped->timeFormat
             ));
@@ -257,7 +257,7 @@ TemporalTileProvider::TemporalTileProvider(const ghoul::Dictionary& dictionary)
                     // unfortunately.  Luckily, Spice understands DOY date formats, so
                     // we can specify those directly and noone would use a DOY and a DOM
                     // time string in the same format string, right?  Right?!
-                    date = fmt::format(
+                    date = std::format(
                         "{}-{}T{}:{}:{}",
                         tm.tm_year + 1900,
                         tm.tm_yday,
@@ -267,7 +267,7 @@ TemporalTileProvider::TemporalTileProvider(const ghoul::Dictionary& dictionary)
                     );
                 }
                 else {
-                    date = fmt::format(
+                    date = std::format(
                         "{}-{}-{} {}:{}:{}",
                         tm.tm_year + 1900,
                         tm.tm_mon + 1,
@@ -294,7 +294,7 @@ TemporalTileProvider::TemporalTileProvider(const ghoul::Dictionary& dictionary)
         );
 
         if (_folder.files.empty()) {
-            throw ghoul::RuntimeError(fmt::format(
+            throw ghoul::RuntimeError(std::format(
                 "Error loading layer '{}'. Folder '{}' does not contain any files that "
                 "matched the time format",
                 _identifier, _folder.folder
diff --git a/modules/globebrowsing/src/tileprovider/tileindextileprovider.cpp b/modules/globebrowsing/src/tileprovider/tileindextileprovider.cpp
index fb6fe49bea..a0b186a5db 100644
--- a/modules/globebrowsing/src/tileprovider/tileindextileprovider.cpp
+++ b/modules/globebrowsing/src/tileprovider/tileindextileprovider.cpp
@@ -59,7 +59,7 @@ TileIndexTileProvider::TileIndexTileProvider(const ghoul::Dictionary& dictionary
 
 Tile TileIndexTileProvider::tile(const TileIndex& tileIndex) {
     ZoneScoped;
-    const std::string text = fmt::format(
+    const std::string text = std::format(
         "level: {}\nx: {}\ny: {}", tileIndex.level, tileIndex.x, tileIndex.y
     );
     const glm::vec2 position = glm::vec2(
diff --git a/modules/globebrowsing/src/timequantizer.cpp b/modules/globebrowsing/src/timequantizer.cpp
index 61daaa95f0..e54c51b352 100644
--- a/modules/globebrowsing/src/timequantizer.cpp
+++ b/modules/globebrowsing/src/timequantizer.cpp
@@ -169,7 +169,7 @@ void DateTime::setTime(std::string_view input) {
 }
 
 std::string DateTime::ISO8601() const {
-    return fmt::format(
+    return std::format(
         "{:0>4}-{:0>2}-{:0>2}T{:0>2}:{:0>2}:{:0>2}",
         _year, _month, _day, _hour, _minute, _second
     );
@@ -178,7 +178,7 @@ std::string DateTime::ISO8601() const {
 double DateTime::J2000() const {
     char Buffer[20];
     std::memset(Buffer, 0, 20);
-    fmt::format_to(
+    std::format_to(
         Buffer,
         "{:0>4}-{:0>2}-{:0>2}T{:0>2}:{:0>2}:{:0>2}",
         _year, _month, _day, _hour, _minute, _second
@@ -226,7 +226,7 @@ void DateTime::incrementOnce(int value, char unit) {
             _year += value;
             break;
         default:
-            throw ghoul::RuntimeError(fmt::format(
+            throw ghoul::RuntimeError(std::format(
                 "Invalid unit in incrementOnce '{}'. Expected 'y', 'M', 'd', 'h', or 'm'",
                 unit
             ));
@@ -387,13 +387,13 @@ void TimeQuantizer::verifyStartTimeRestrictions() {
         dayUpperLimit = 31;
     }
     if (_start.day() < 1 || _start.day() > dayUpperLimit) {
-        throw ghoul::RuntimeError(fmt::format(
+        throw ghoul::RuntimeError(std::format(
             "Invalid start day value of {} for {}, valid days are 1 - {}",
             _start.day(), helpfulDescription, dayUpperLimit
         ));
     }
     if (_start.hour() != 0 || _start.minute() != 0 || _start.second() != 0) {
-        throw ghoul::RuntimeError(fmt::format(
+        throw ghoul::RuntimeError(std::format(
             "Invalid start time value of {}:{}:{}, time must be 00:00:00",
             _start.hour(), _start.minute(), _start.second()
         ));
@@ -406,7 +406,7 @@ void TimeQuantizer::verifyResolutionRestrictions(const int value, const char uni
             break;
         case 'M':
             if (value < 1 || value > 6) {
-                throw ghoul::RuntimeError(fmt::format(
+                throw ghoul::RuntimeError(std::format(
                     "Invalid resolution count of {} for (M)onth option. Valid counts are "
                     "1, 2, 3, 4, or 6", value
                 ));
@@ -414,7 +414,7 @@ void TimeQuantizer::verifyResolutionRestrictions(const int value, const char uni
             break;
         case 'd':
             if (value < 1 || value > 28) {
-                throw ghoul::RuntimeError(fmt::format(
+                throw ghoul::RuntimeError(std::format(
                     "Invalid resolution count of {} for (d)ay option. Valid counts are "
                     "1 - 28", value
                 ));
@@ -422,7 +422,7 @@ void TimeQuantizer::verifyResolutionRestrictions(const int value, const char uni
             break;
         case 'h':
             if ((value < 1 || value > 4) && value != 6 && value != 12) {
-                throw ghoul::RuntimeError(fmt::format(
+                throw ghoul::RuntimeError(std::format(
                     "Invalid resolution count of {} for (h)our option. Valid counts are "
                     "1, 2, 3, 4, 6, or 12", value
                 ));
@@ -430,14 +430,14 @@ void TimeQuantizer::verifyResolutionRestrictions(const int value, const char uni
             break;
         case 'm':
             if (value != 15 && value != 30) {
-                throw ghoul::RuntimeError(fmt::format(
+                throw ghoul::RuntimeError(std::format(
                     "Invalid resolution count of {} for (m)inute option. Valid counts "
                     "are 15 or 30", value
                 ));
             }
             break;
         default:
-            throw ghoul::RuntimeError(fmt::format(
+            throw ghoul::RuntimeError(std::format(
                 "Invalid unit format '{}'. Expected 'y', 'M', 'd', 'h', or 'm'", unit
             ));
     }
@@ -469,7 +469,7 @@ double TimeQuantizer::computeSecondsFromResolution(const int valueIn, const char
             break;
 
         default:
-            throw ghoul::RuntimeError(fmt::format(
+            throw ghoul::RuntimeError(std::format(
                 "Invalid resolution unit format '{}'. Expected 'y', 'M', 'd', 'h', 'm', "
                 "or 's'", unit
             ));
@@ -531,7 +531,7 @@ bool TimeQuantizer::quantize(Time& t, bool clamp) {
         }
         char Buffer[20];
         std::memset(Buffer, 0, 20);
-        fmt::format_to(
+        std::format_to(
             Buffer,
             "{:0>4}-{:0>2}-{:0>2}T{:0>2}:{:0>2}:{:0>2}",
             quantized.year(), quantized.month(), quantized.day(),
@@ -615,7 +615,7 @@ void TimeQuantizer::doFirstApproximation(DateTime& quantized, const DateTime& un
             }
             break;
         default:
-            throw ghoul::RuntimeError(fmt::format(
+            throw ghoul::RuntimeError(std::format(
                 "Invalid unit '{}'. Expected 'y', 'M', 'd', 'h', or 'm'", unit
             ));
     }
diff --git a/modules/imgui/imguimodule.cpp b/modules/imgui/imguimodule.cpp
index 6f98369a6f..2521998b77 100644
--- a/modules/imgui/imguimodule.cpp
+++ b/modules/imgui/imguimodule.cpp
@@ -281,7 +281,7 @@ void ImGUIModule::internalDeinitialize() {
 
 void ImGUIModule::internalInitializeGL() {
     std::filesystem::path file = FileSys.cacheManager()->cachedFilename("imgui.ini", "");
-    LDEBUG(fmt::format("Using '{}' as ImGUI cache location", file));
+    LDEBUG(std::format("Using '{}' as ImGUI cache location", file));
 
     _iniFileBuffer.resize(file.string().size() + 1);
 
diff --git a/modules/imgui/src/guigibscomponent.cpp b/modules/imgui/src/guigibscomponent.cpp
index 857e1485f2..22ff4ea0d0 100644
--- a/modules/imgui/src/guigibscomponent.cpp
+++ b/modules/imgui/src/guigibscomponent.cpp
@@ -114,7 +114,7 @@ void GuiGIBSComponent::render() {
         std::string imageFormat = std::string(ImageFormatBuffer.data());
 
         // Construct the components of the Lua function
-        std::string xmlFunc = fmt::format(
+        std::string xmlFunc = std::format(
             "openspace.globebrowsing.createTemporalGibsGdalXml('{}', '{}', '{}')",
             layer, imageRes, imageFormat
         );
@@ -122,7 +122,7 @@ void GuiGIBSComponent::render() {
         if (startDate == "Present") {
             startDate.clear();
         }
-        std::string layerScript = fmt::format(
+        std::string layerScript = std::format(
             "{{"
             "    Identifier = '{}',"
             "    Type = 'TemporalTileLayer',"
@@ -141,7 +141,7 @@ void GuiGIBSComponent::render() {
             layer, startDate, endDate, temporalRes, temporalFormat, xmlFunc
         );
 
-        std::string script = fmt::format(
+        std::string script = std::format(
             "openspace.globebrowsing.addLayer('Earth', 'ColorLayers', {})",
             layerScript
         );
diff --git a/modules/imgui/src/guiglobebrowsingcomponent.cpp b/modules/imgui/src/guiglobebrowsingcomponent.cpp
index a97bf190dc..be43f8f425 100644
--- a/modules/imgui/src/guiglobebrowsingcomponent.cpp
+++ b/modules/imgui/src/guiglobebrowsingcomponent.cpp
@@ -270,7 +270,7 @@ void GuiGlobeBrowsingComponent::render() {
     const Capabilities cap = module->capabilities(_currentServer);
 
     if (cap.empty()) {
-        LWARNINGC("GlobeBrowsing", fmt::format("Unknown server '{}'", _currentServer));
+        LWARNINGC("GlobeBrowsing", std::format("Unknown server '{}'", _currentServer));
     }
 
     ImGui::Columns(6, nullptr, false);
@@ -327,7 +327,7 @@ void GuiGlobeBrowsingComponent::render() {
                 layerName.end()
             );
             global::scriptEngine->queueScript(
-                fmt::format(
+                std::format(
                     "openspace.globebrowsing.addLayer(\
                         '{}', \
                         '{}', \
diff --git a/modules/imgui/src/guiparallelcomponent.cpp b/modules/imgui/src/guiparallelcomponent.cpp
index f54147ae89..b7f001865d 100644
--- a/modules/imgui/src/guiparallelcomponent.cpp
+++ b/modules/imgui/src/guiparallelcomponent.cpp
@@ -45,7 +45,7 @@ namespace {
             connectionInfo = "Hosting session with 1 client";
         }
         else {
-            connectionInfo = fmt::format("Hosting session with {} clients", nClients);
+            connectionInfo = std::format("Hosting session with {} clients", nClients);
         }
 
         ImGui::Text("%s", connectionInfo.c_str());
@@ -90,12 +90,12 @@ void GuiParallelComponent::renderClientWithHost() {
     const size_t nClients = nConnections - 1;
 
     if (nClients > 2) {
-        connectionInfo += fmt::format(
+        connectionInfo += std::format(
             "You and {} more clients are connected", nClients - 1
         );
     }
     else if (nClients == 2) {
-        connectionInfo += fmt::format(
+        connectionInfo += std::format(
             "You and {} more client are connected", nClients - 1
         );
     }
@@ -110,13 +110,13 @@ void GuiParallelComponent::renderClientWithHost() {
     const size_t nCameraKeyframes =
         global::navigationHandler->keyframeNavigator().nKeyframes();
 
-    const std::string timeKeyframeInfo = fmt::format(
+    const std::string timeKeyframeInfo = std::format(
         "TimeKeyframes: {}", nTimeKeyframes
     );
-    const std::string cameraKeyframeInfo = fmt::format(
+    const std::string cameraKeyframeInfo = std::format(
         "CameraKeyframes: {}", nCameraKeyframes
     );
-    const std::string latencyStandardDeviation = fmt::format(
+    const std::string latencyStandardDeviation = std::format(
         "Latency standard deviation: {} s", parallel.latencyStandardDeviation()
     );
 
@@ -136,12 +136,12 @@ void GuiParallelComponent::renderClientWithoutHost() {
     const size_t nConnections = global::parallelPeer->nConnections();
 
     if (nConnections > 2) {
-        connectionInfo += fmt::format(
+        connectionInfo += std::format(
             "You and {} more users are connected", nConnections - 1
         );
     }
     else if (nConnections == 2) {
-        connectionInfo += fmt::format(
+        connectionInfo += std::format(
             "You and {} more users are connected", nConnections - 1
         );
     }
diff --git a/modules/imgui/src/guispacetimecomponent.cpp b/modules/imgui/src/guispacetimecomponent.cpp
index d650336be6..a851c9a1e6 100644
--- a/modules/imgui/src/guispacetimecomponent.cpp
+++ b/modules/imgui/src/guispacetimecomponent.cpp
@@ -211,7 +211,7 @@ void GuiSpaceTimeComponent::render() {
         // No sync or send because time settings are always synced and sent to the
         // connected nodes and peers
         global::scriptEngine->queueScript(
-            fmt::format("openspace.time.setTime([[{}]])", std::string_view(Buffer)),
+            std::format("openspace.time.setTime([[{}]])", std::string_view(Buffer)),
             scripting::ScriptEngine::ShouldBeSynchronized::No,
             scripting::ScriptEngine::ShouldSendToRemote::No
         );
@@ -345,7 +345,7 @@ void GuiSpaceTimeComponent::render() {
                 openspace::TimeUnits.end(),
                 std::string(""),
                 [](const std::string& a, const openspace::TimeUnit& unit) {
-                    return fmt::format(
+                    return std::format(
                         "{}{} / second", a, nameForTimeUnit(unit, true)
                     ) + '\0';
                 }
diff --git a/modules/imgui/src/renderproperties.cpp b/modules/imgui/src/renderproperties.cpp
index bb90409c85..4e1b285951 100644
--- a/modules/imgui/src/renderproperties.cpp
+++ b/modules/imgui/src/renderproperties.cpp
@@ -73,7 +73,7 @@ void renderTooltip(Property* prop, double delay) {
 
 void executeSetPropertyScript(const std::string& id, const std::string& value) {
     global::scriptEngine->queueScript(
-        fmt::format("openspace.setPropertyValueSingle('{}', {});", id, value),
+        std::format("openspace.setPropertyValueSingle('{}', {});", id, value),
         scripting::ScriptEngine::ShouldBeSynchronized::Yes,
         scripting::ScriptEngine::ShouldSendToRemote::Yes
     );
@@ -194,7 +194,7 @@ void renderSelectionProperty(Property* prop, const std::string& ownerName,
         if (selectionChanged) {
             std::string parameters = "{";
             for (const std::string& s : newSelected) {
-                parameters += fmt::format("'{}',", s);
+                parameters += std::format("'{}',", s);
             }
             if (!newSelected.empty()) {
                 parameters.pop_back();
diff --git a/modules/iswa/rendering/iswakameleongroup.cpp b/modules/iswa/rendering/iswakameleongroup.cpp
index 3f2482731a..f9af386224 100644
--- a/modules/iswa/rendering/iswakameleongroup.cpp
+++ b/modules/iswa/rendering/iswakameleongroup.cpp
@@ -99,12 +99,12 @@ void IswaKameleonGroup::registerProperties() {
 }
 
 void IswaKameleonGroup::readFieldlinePaths(const std::string& indexFile) {
-    LINFO(fmt::format("Reading seed points paths from file '{}'", indexFile));
+    LINFO(std::format("Reading seed points paths from file '{}'", indexFile));
 
     // Read the index file from disk
     std::ifstream seedFile(indexFile);
     if (!seedFile.good()) {
-        LERROR(fmt::format("Could not open seed points file '{}'", indexFile));
+        LERROR(std::format("Could not open seed points file '{}'", indexFile));
     }
     else {
         std::string line;
diff --git a/modules/iswa/rendering/kameleonplane.cpp b/modules/iswa/rendering/kameleonplane.cpp
index b9ab4e93dc..707aa8dd45 100644
--- a/modules/iswa/rendering/kameleonplane.cpp
+++ b/modules/iswa/rendering/kameleonplane.cpp
@@ -318,7 +318,7 @@ void KameleonPlane::updateFieldlineSeeds() {
 }
 
 void KameleonPlane::readFieldlinePaths(const std::string& indexFile) {
-    LINFO(fmt::format("Reading seed points paths from file '{}'", indexFile));
+    LINFO(std::format("Reading seed points paths from file '{}'", indexFile));
     if (_group) {
         dynamic_cast<IswaKameleonGroup*>(_group)->setFieldlineInfo(
             indexFile,
@@ -330,7 +330,7 @@ void KameleonPlane::readFieldlinePaths(const std::string& indexFile) {
     // Read the index file from disk
     std::ifstream seedFile(indexFile);
     if (!seedFile.good()) {
-        LERROR(fmt::format("Could not open seed points file '{}'", indexFile));
+        LERROR(std::format("Could not open seed points file '{}'", indexFile));
     }
     else {
         try {
diff --git a/modules/iswa/rendering/texturecygnet.cpp b/modules/iswa/rendering/texturecygnet.cpp
index 81bc8666cd..280f07f9b7 100644
--- a/modules/iswa/rendering/texturecygnet.cpp
+++ b/modules/iswa/rendering/texturecygnet.cpp
@@ -52,7 +52,7 @@ bool TextureCygnet::updateTexture() {
     );
 
     if (texture) {
-        LDEBUG(fmt::format(
+        LDEBUG(std::format(
             "Loaded texture from image iswa cygnet with id '{}'", _data.id
         ));
         texture->uploadTexture();
diff --git a/modules/iswa/util/iswamanager.cpp b/modules/iswa/util/iswamanager.cpp
index 7dd7108247..40e60e7397 100644
--- a/modules/iswa/util/iswamanager.cpp
+++ b/modules/iswa/util/iswamanager.cpp
@@ -276,7 +276,7 @@ std::string IswaManager::iswaUrl(int id, double timestamp, const std::string& ty
     std::getline(ss, token, ' ');
     url += token + "-";
     std::getline(ss, token, ' ');
-    url = fmt::format("{}{}-", url, monthNumber(token));
+    url = std::format("{}{}-", url, monthNumber(token));
     std::getline(ss, token, 'T');
     url += token + "%20";
     std::getline(ss, token, '.');
@@ -622,7 +622,7 @@ void IswaManager::createKameleonPlane(CdfInfo info, std::string cut) {
     }
     else {
         LWARNING(
-            fmt::format("'{}' is not a CDF file or cannot be found", absPath(info.path))
+            std::format("'{}' is not a CDF file or cannot be found", absPath(info.path))
         );
     }
 }
@@ -744,7 +744,7 @@ void IswaManager::addCdfFiles(std::string cdfpath) {
         }
     }
     else {
-        LWARNING(fmt::format("'{}' is not a CDF file or cannot be found", cdfFile));
+        LWARNING(std::format("'{}' is not a CDF file or cannot be found", cdfFile));
     }
 }
 
diff --git a/modules/iswa/util/iswamanager_lua.inl b/modules/iswa/util/iswamanager_lua.inl
index b65d16a411..fa98b9966d 100644
--- a/modules/iswa/util/iswamanager_lua.inl
+++ b/modules/iswa/util/iswamanager_lua.inl
@@ -50,7 +50,7 @@ namespace {
     info->selected = true;
 
     if (global::renderEngine->screenSpaceRenderable(name)) {
-        throw ghoul::lua::LuaError(fmt::format(
+        throw ghoul::lua::LuaError(std::format(
             "A cygnet with the name '{}' already exist", name
         ));
     }
@@ -91,7 +91,7 @@ namespace {
     std::shared_ptr<CygnetInfo> info = cygnetInformation[id];
     info->selected = false;
 
-    std::string script = fmt::format(
+    std::string script = std::format(
         "openspace.unregisterScreenSpaceRenderable('{}');", cygnetInformation[id]->name
     );
 
diff --git a/modules/kameleon/src/kameleonhelper.cpp b/modules/kameleon/src/kameleonhelper.cpp
index 460cfddff8..8ae94553f0 100644
--- a/modules/kameleon/src/kameleonhelper.cpp
+++ b/modules/kameleon/src/kameleonhelper.cpp
@@ -50,17 +50,17 @@ namespace openspace::kameleonHelper {
 
 std::unique_ptr<ccmc::Kameleon> createKameleonObject(const std::string& cdfFilePath) {
     auto kameleon = std::make_unique<ccmc::Kameleon>();
-    LDEBUG(fmt::format("Opening the CDF file '{}'", cdfFilePath));
+    LDEBUG(std::format("Opening the CDF file '{}'", cdfFilePath));
     long kamStatus = kameleon->open(cdfFilePath);
 
     if (kamStatus != ccmc::FileReader::OK) {
-        LERROR(fmt::format(
+        LERROR(std::format(
             "Failed to create a Kameleon Object from file '{}'",
             cdfFilePath
         ));
        return nullptr;
     }
-    LDEBUG(fmt::format("Successfully opened '{}'", cdfFilePath));
+    LDEBUG(std::format("Successfully opened '{}'", cdfFilePath));
     return kameleon;
 }
 
diff --git a/modules/kameleon/src/kameleonwrapper.cpp b/modules/kameleon/src/kameleonwrapper.cpp
index 94c3982a76..e78fcbcfd9 100644
--- a/modules/kameleon/src/kameleonwrapper.cpp
+++ b/modules/kameleon/src/kameleonwrapper.cpp
@@ -117,9 +117,9 @@ bool KameleonWrapper::open(const std::string& filename) {
         _zCoordVar = v[2];
         _type = modelType();
 
-        LDEBUG(fmt::format("x: {}", _xCoordVar));
-        LDEBUG(fmt::format("y: {}", _yCoordVar));
-        LDEBUG(fmt::format("z: {}", _zCoordVar));
+        LDEBUG(std::format("x: {}", _xCoordVar));
+        LDEBUG(std::format("y: {}", _yCoordVar));
+        LDEBUG(std::format("z: {}", _zCoordVar));
 
         _min = glm::vec3(
             _model->getVariableAttribute(_xCoordVar, "actual_min").getAttributeFloat(),
@@ -172,7 +172,7 @@ float* KameleonWrapper::uniformSampledValues(const std::string& var,
 {
     ghoul_assert(_model && _interpolator, "Model and interpolator must exist");
 
-    LINFO(fmt::format(
+    LINFO(std::format(
         "Loading variable '{}' from CDF data with a uniform sampling", var
     ));
 
@@ -183,10 +183,10 @@ float* KameleonWrapper::uniformSampledValues(const std::string& var,
 
     const double varMin =
         _model->getVariableAttribute(var, "actual_min").getAttributeFloat();
-    LDEBUG(fmt::format("{} Min: {}", var, varMin));
+    LDEBUG(std::format("{} Min: {}", var, varMin));
     const double varMax =
         _model->getVariableAttribute(var, "actual_max").getAttributeFloat();
-    LDEBUG(fmt::format("{} Max: {}", var, varMax));
+    LDEBUG(std::format("{} Max: {}", var, varMax));
 
     // HISTOGRAM
     constexpr int NBins = 200;
@@ -308,10 +308,10 @@ float* KameleonWrapper::uniformSampledValues(const std::string& var,
 
         data[i] = static_cast<float>(glm::clamp(normalizedVal, 0.0, 1.0));
         if (data[i] < 0.f) {
-            LERROR(fmt::format("Datapoint {} less than 0", i));
+            LERROR(std::format("Datapoint {} less than 0", i));
         }
         if (data[i] > 1.f) {
-            LERROR(fmt::format("Datapoint {} more than 1", i));
+            LERROR(std::format("Datapoint {} more than 1", i));
         }
     }
 
@@ -324,7 +324,7 @@ float* KameleonWrapper::uniformSliceValues(const std::string& var,
                                            float slice) const
 {
     ghoul_assert(_model && _interpolator, "Model and interpolator must exist");
-    LINFO(fmt::format(
+    LINFO(std::format(
         "Loading variable '{}' from CDF data with a uniform sampling",
         var
     ));
@@ -352,8 +352,8 @@ float* KameleonWrapper::uniformSliceValues(const std::string& var,
     const double yDim = hasYSlice ? 1.0 : outDimensions.y - 1;
     const double zDim = hasZSlice ? 1.0 : outDimensions.z - 1;
 
-    LDEBUG(fmt::format("{} min: {}", var, varMin));
-    LDEBUG(fmt::format("{} max: {}", var, varMax));
+    LDEBUG(std::format("{} min: {}", var, varMin));
+    LDEBUG(std::format("{} max: {}", var, varMax));
 
     //double maxValue = 0.0;
     //double minValue = std::numeric_limits<double>::max();
@@ -455,7 +455,7 @@ float* KameleonWrapper::uniformSampledVectorValues(const std::string& xVar,
 {
     ghoul_assert(_model && _interpolator, "Model and interpolator must exist");
 
-    LINFO(fmt::format(
+    LINFO(std::format(
         "Loading variables {} {} {} from CDF data with a uniform sampling",
         xVar,
         yVar,
@@ -530,7 +530,7 @@ KameleonWrapper::Fieldlines KameleonWrapper::classifiedFieldLines(const std::str
                                                                      float stepSize) const
 {
     ghoul_assert(_model && _interpolator, "Model and interpolator must exist");
-    LINFO(fmt::format(
+    LINFO(std::format(
         "Creating {} fieldlines from variables {} {} {}",
         seedPoints.size(), xVar, yVar, zVar
     ));
@@ -592,7 +592,7 @@ KameleonWrapper::Fieldlines KameleonWrapper::fieldLines(const std::string& xVar,
 {
     ghoul_assert(_model && _interpolator, "Model and interpolator must exist");
 
-    LINFO(fmt::format(
+    LINFO(std::format(
         "Creating {} fieldlines from variables {} {} {}",
         seedPoints.size(), xVar, yVar, zVar
     ));
@@ -647,7 +647,7 @@ KameleonWrapper::Fieldlines KameleonWrapper::lorentzTrajectories(
                                                                const glm::vec4& /*color*/,
                                                                          float step) const
 {
-    LINFO(fmt::format("Creating {} Lorentz force trajectories", seedPoints.size()));
+    LINFO(std::format("Creating {} Lorentz force trajectories", seedPoints.size()));
 
     Fieldlines trajectories;
 
@@ -840,7 +840,7 @@ KameleonWrapper::TraceLine KameleonWrapper::traceCartesianFieldline(
 
         ++numSteps;
         if (numSteps > MaxSteps) {
-            LDEBUG(fmt::format("Max number of steps taken ({})", MaxSteps));
+            LDEBUG(std::format("Max number of steps taken ({})", MaxSteps));
             break;
         }
     }
@@ -954,7 +954,7 @@ KameleonWrapper::TraceLine KameleonWrapper::traceLorentzTrajectory(
 
         ++numSteps;
         if (numSteps > MaxSteps) {
-            LDEBUG(fmt::format("Max number of steps taken ({})", MaxSteps));
+            LDEBUG(std::format("Max number of steps taken ({})", MaxSteps));
             break;
         }
     }
diff --git a/modules/kameleonvolume/kameleonvolumereader.cpp b/modules/kameleonvolume/kameleonvolumereader.cpp
index 577611b777..d3d7c61b89 100644
--- a/modules/kameleonvolume/kameleonvolumereader.cpp
+++ b/modules/kameleonvolume/kameleonvolumereader.cpp
@@ -83,7 +83,7 @@ KameleonVolumeReader::KameleonVolumeReader(std::string path) : _path(std::move(p
 
     const long status = _kameleon->open(_path);
     if (status != ccmc::FileReader::OK) {
-        throw ghoul::RuntimeError(fmt::format(
+        throw ghoul::RuntimeError(std::format(
             "Failed to open file '{}' with Kameleon", _path
         ));
     }
diff --git a/modules/kameleonvolume/rendering/renderablekameleonvolume.cpp b/modules/kameleonvolume/rendering/renderablekameleonvolume.cpp
index 9de9405784..3413e7c901 100644
--- a/modules/kameleonvolume/rendering/renderablekameleonvolume.cpp
+++ b/modules/kameleonvolume/rendering/renderablekameleonvolume.cpp
@@ -339,7 +339,7 @@ bool RenderableKameleonVolume::isCachingEnabled() const {
 
 void RenderableKameleonVolume::load() {
     if (!std::filesystem::is_regular_file(_sourcePath.value())) {
-        LERROR(fmt::format("File '{}' does not exist", _sourcePath.value()));
+        LERROR(std::format("File '{}' does not exist", _sourcePath.value()));
         return;
     }
     if (!isCachingEnabled()) {
@@ -361,7 +361,7 @@ void RenderableKameleonVolume::load() {
 
 std::string RenderableKameleonVolume::cacheSuffix() const {
     glm::uvec3 dims = _dimensions;
-    return fmt::format(".{}.{}x{}x{}", _variable.value(), dims[0], dims[1], dims[2]);
+    return std::format(".{}.{}x{}x{}", _variable.value(), dims[0], dims[1], dims[2]);
 }
 
 void RenderableKameleonVolume::loadFromPath(const std::string& path) {
diff --git a/modules/kameleonvolume/tasks/kameleondocumentationtask.cpp b/modules/kameleonvolume/tasks/kameleondocumentationtask.cpp
index 9993c8db9d..f3d9ba8042 100644
--- a/modules/kameleonvolume/tasks/kameleondocumentationtask.cpp
+++ b/modules/kameleonvolume/tasks/kameleondocumentationtask.cpp
@@ -64,7 +64,7 @@ KameleonDocumentationTask::KameleonDocumentationTask(const ghoul::Dictionary& di
 }
 
 std::string KameleonDocumentationTask::description() {
-    return fmt::format(
+    return std::format(
         "Extract metadata from CDF file '{}' and output HTML documentation to '{}'",
         _inputPath, _outputPath
     );
diff --git a/modules/kameleonvolume/tasks/kameleonmetadatatojsontask.cpp b/modules/kameleonvolume/tasks/kameleonmetadatatojsontask.cpp
index 833a046885..4493a589a3 100644
--- a/modules/kameleonvolume/tasks/kameleonmetadatatojsontask.cpp
+++ b/modules/kameleonvolume/tasks/kameleonmetadatatojsontask.cpp
@@ -58,7 +58,7 @@ KameleonMetadataToJsonTask::KameleonMetadataToJsonTask(
 }
 
 std::string KameleonMetadataToJsonTask::description() {
-    return fmt::format(
+    return std::format(
         "Extract metadata from CDF file '{}' and write as JSON to '{}'",
         _inputPath, _outputPath
     );
diff --git a/modules/kameleonvolume/tasks/kameleonvolumetorawtask.cpp b/modules/kameleonvolume/tasks/kameleonvolumetorawtask.cpp
index f6ca029cbc..c551aa8961 100644
--- a/modules/kameleonvolume/tasks/kameleonvolumetorawtask.cpp
+++ b/modules/kameleonvolume/tasks/kameleonvolumetorawtask.cpp
@@ -97,7 +97,7 @@ KameleonVolumeToRawTask::KameleonVolumeToRawTask(const ghoul::Dictionary& dictio
 }
 
 std::string KameleonVolumeToRawTask::description() {
-    return fmt::format(
+    return std::format(
         "Extract volumetric data from CDF file '{}'. Write raw volume data into '{}' "
         "and dictionary with metadata to '{}'",
         _inputPath, _rawVolumeOutputPath, _dictionaryOutputPath
diff --git a/modules/multiresvolume/rendering/brickmanager.cpp b/modules/multiresvolume/rendering/brickmanager.cpp
index 7039745a64..959b11522e 100644
--- a/modules/multiresvolume/rendering/brickmanager.cpp
+++ b/modules/multiresvolume/rendering/brickmanager.cpp
@@ -49,13 +49,13 @@ bool BrickManager::readHeader() {
 
     _header = _tsp->header();
 
-    LDEBUG(fmt::format("Grid type: {}", _header.gridType));
-    LDEBUG(fmt::format("Original num timesteps: {}", _header.numOrigTimesteps));
-    LDEBUG(fmt::format("Num timesteps: {}", _header.numTimesteps));
-    LDEBUG(fmt::format(
+    LDEBUG(std::format("Grid type: {}", _header.gridType));
+    LDEBUG(std::format("Original num timesteps: {}", _header.numOrigTimesteps));
+    LDEBUG(std::format("Num timesteps: {}", _header.numTimesteps));
+    LDEBUG(std::format(
         "Brick dims: {} {} {}", _header.xBrickDim, _header.yBrickDim, _header.zBrickDim
     ));
-    LDEBUG(fmt::format(
+    LDEBUG(std::format(
         "Num bricks: {} {} {}",
         _header.xNumBricks,
         _header.yNumBricks,
@@ -67,8 +67,8 @@ bool BrickManager::readHeader() {
     _paddedBrickDim = _brickDim + _paddingWidth * 2;
     _atlasDim = _paddedBrickDim*_numBricks;
 
-    LDEBUG(fmt::format("Padded brick dim: {}", _paddedBrickDim));
-    LDEBUG(fmt::format("Atlas dim: {}", _atlasDim));
+    LDEBUG(std::format("Padded brick dim: {}", _paddedBrickDim));
+    LDEBUG(std::format("Atlas dim: {}", _atlasDim));
 
     _numBrickVals = _paddedBrickDim*_paddedBrickDim*_paddedBrickDim;
     // Number of bricks per frame
@@ -81,11 +81,11 @@ bool BrickManager::readHeader() {
     unsigned int numOTNodes = static_cast<unsigned int>((pow(8, numOTLevels) - 1) / 7);
     unsigned int numBSTNodes = _header.numTimesteps * 2 - 1;
     _numBricksTree = numOTNodes * numBSTNodes;
-    LDEBUG(fmt::format("Num OT levels: {}", numOTLevels));
-    LDEBUG(fmt::format("Num OT nodes: {}", numOTNodes));
-    LDEBUG(fmt::format("Num BST nodes: {}", numBSTNodes));
-    LDEBUG(fmt::format("Num bricks in tree: {}", _numBricksTree));
-    LDEBUG(fmt::format("Num values per brick: {}", _numBrickVals));
+    LDEBUG(std::format("Num OT levels: {}", numOTLevels));
+    LDEBUG(std::format("Num OT nodes: {}", numOTNodes));
+    LDEBUG(std::format("Num BST nodes: {}", numBSTNodes));
+    LDEBUG(std::format("Num bricks in tree: {}", _numBricksTree));
+    LDEBUG(std::format("Num values per brick: {}", _numBrickVals));
 
     _brickSize = sizeof(float) * _numBrickVals;
     _volumeSize = _brickSize * _numBricksFrame;
@@ -99,8 +99,8 @@ bool BrickManager::readHeader() {
 
     if (fileSize != calcFileSize) {
         LERROR("Sizes do not match");
-        LERROR(fmt::format("Calculated file size: {}", calcFileSize));
-        LERROR(fmt::format("File size: {}", fileSize));
+        LERROR(std::format("Calculated file size: {}", calcFileSize));
+        LERROR(std::format("File size: {}", fileSize));
         return false;
     }
 
diff --git a/modules/multiresvolume/rendering/errorhistogrammanager.cpp b/modules/multiresvolume/rendering/errorhistogrammanager.cpp
index bfe0f41156..c2ad719530 100644
--- a/modules/multiresvolume/rendering/errorhistogrammanager.cpp
+++ b/modules/multiresvolume/rendering/errorhistogrammanager.cpp
@@ -53,7 +53,7 @@ bool ErrorHistogramManager::buildHistograms(int numBins) {
     _histograms = std::vector<Histogram>(_numInnerNodes);
     LINFOC(
         "ErrorHistogramManager",
-        fmt::format("Build {} histograms with {} bins each", _numInnerNodes, numBins)
+        std::format("Build {} histograms with {} bins each", _numInnerNodes, numBins)
     );
 
     // All TSP Leaves
diff --git a/modules/multiresvolume/rendering/localerrorhistogrammanager.cpp b/modules/multiresvolume/rendering/localerrorhistogrammanager.cpp
index e750f653aa..75d276767f 100644
--- a/modules/multiresvolume/rendering/localerrorhistogrammanager.cpp
+++ b/modules/multiresvolume/rendering/localerrorhistogrammanager.cpp
@@ -38,7 +38,7 @@ namespace openspace {
 LocalErrorHistogramManager::LocalErrorHistogramManager(TSP* tsp) : _tsp(tsp) {}
 
 bool LocalErrorHistogramManager::buildHistograms(int numBins) {
-    LINFO(fmt::format("Build histograms with {} bins each", numBins));
+    LINFO(std::format("Build histograms with {} bins each", numBins));
     _numBins = numBins;
 
     _file = &(_tsp->file());
@@ -133,7 +133,7 @@ bool LocalErrorHistogramManager::buildFromOctreeChild(unsigned int bstOffset,
                 childValues = it->second;
             }
             else {
-                LERROR(fmt::format(
+                LERROR(std::format(
                     "Child {} visited without cache, {}, {}",
                     childIndex, bstOffset, octreeOffset
                 ));
@@ -152,7 +152,7 @@ bool LocalErrorHistogramManager::buildFromOctreeChild(unsigned int bstOffset,
                 parentValues = it->second;
             }
             else {
-                LERROR(fmt::format("Parent {} visited without cache", parentIndex));
+                LERROR(std::format("Parent {} visited without cache", parentIndex));
                 return false;
             }
         }
@@ -237,7 +237,7 @@ bool LocalErrorHistogramManager::buildFromBstChild(unsigned int bstOffset,
                 childValues = it->second;
             }
             else {
-                LERROR(fmt::format("Child {} visited without cache", childIndex));
+                LERROR(std::format("Child {} visited without cache", childIndex));
                 return false;
             }
         }
@@ -253,7 +253,7 @@ bool LocalErrorHistogramManager::buildFromBstChild(unsigned int bstOffset,
                 parentValues = it->second;
             }
             else {
-                LERROR(fmt::format("Parent {} visited without cache", parentIndex));
+                LERROR(std::format("Parent {} visited without cache", parentIndex));
                 return false;
             }
         }
diff --git a/modules/multiresvolume/rendering/renderablemultiresvolume.cpp b/modules/multiresvolume/rendering/renderablemultiresvolume.cpp
index 614757096e..924a59ea24 100644
--- a/modules/multiresvolume/rendering/renderablemultiresvolume.cpp
+++ b/modules/multiresvolume/rendering/renderablemultiresvolume.cpp
@@ -192,7 +192,7 @@ RenderableMultiresVolume::RenderableMultiresVolume(const ghoul::Dictionary& dict
         _filename = absPath(dictionary.value<std::string>(KeyDataSource)).string();
     }
     else {
-        LERROR(fmt::format("Node did not contain a valid '{}'", KeyDataSource));
+        LERROR(std::format("Node did not contain a valid '{}'", KeyDataSource));
         return;
     }
 
@@ -245,7 +245,7 @@ RenderableMultiresVolume::RenderableMultiresVolume(const ghoul::Dictionary& dict
         _transferFunction = std::make_shared<TransferFunction>(_transferFunctionPath);
     }
     else {
-        LERROR(fmt::format("Node did not contain a valid '{}'", KeyTransferFunction));
+        LERROR(std::format("Node did not contain a valid '{}'", KeyTransferFunction));
         return;
     }
 
@@ -474,7 +474,7 @@ bool RenderableMultiresVolume::initializeSelector() {
         case Selector::TF:
             if (_errorHistogramManager) {
                  std::filesystem::path cached = FileSys.cacheManager()->cachedFilename(
-                     fmt::format(
+                     std::format(
                          "{}_{}_errorHistograms",
                          std::filesystem::path(_filename).stem().string(), nHistograms
                      ),
@@ -485,13 +485,13 @@ bool RenderableMultiresVolume::initializeSelector() {
                     // Read histograms from cache
                     cacheFile.close();
                     LINFO(
-                        fmt::format("Loading histograms from cache '{}'", cached)
+                        std::format("Loading histograms from cache '{}'", cached)
                     );
                     success &= _errorHistogramManager->loadFromFile(cached);
                 }
                 else if (!_errorHistogramsPath.empty()) {
                     // Read histograms from scene data
-                    LINFO(fmt::format(
+                    LINFO(std::format(
                         "Loading histograms from scene data '{}'", _errorHistogramsPath
                     ));
                     success &= _errorHistogramManager->loadFromFile(
@@ -500,10 +500,10 @@ bool RenderableMultiresVolume::initializeSelector() {
                 }
                 else {
                     // Build histograms from tsp file
-                    LWARNING(fmt::format("Failed to open '{}'", cached));
+                    LWARNING(std::format("Failed to open '{}'", cached));
                     success &= _errorHistogramManager->buildHistograms(nHistograms);
                     if (success) {
-                        LINFO(fmt::format("Writing cache to '{}'", cached));
+                        LINFO(std::format("Writing cache to '{}'", cached));
                         _errorHistogramManager->saveToFile(cached);
                     }
                 }
@@ -514,7 +514,7 @@ bool RenderableMultiresVolume::initializeSelector() {
         case Selector::SIMPLE:
             if (_histogramManager) {
                 std::filesystem::path cached = FileSys.cacheManager()->cachedFilename(
-                    fmt::format("{}_{}_histogram",
+                    std::format("{}_{}_histogram",
                         std::filesystem::path(_filename).stem().string(), nHistograms
                     ),
                     ""
@@ -523,18 +523,18 @@ bool RenderableMultiresVolume::initializeSelector() {
                 if (cacheFile.is_open()) {
                     // Read histograms from cache.
                     cacheFile.close();
-                    LINFO(fmt::format("Loading histograms from '{}'", cached));
+                    LINFO(std::format("Loading histograms from '{}'", cached));
                     success &= _histogramManager->loadFromFile(cached);
                 }
                 else {
                     // Build histograms from tsp file.
-                    LWARNING(fmt::format("Failed to open '{}'", cached));
+                    LWARNING(std::format("Failed to open '{}'", cached));
                     success &= _histogramManager->buildHistograms(
                         _tsp.get(),
                         nHistograms
                     );
                     if (success) {
-                        LINFO(fmt::format("Writing cache to '{}'", cached));
+                        LINFO(std::format("Writing cache to '{}'", cached));
                         _histogramManager->saveToFile(cached);
                     }
                 }
@@ -545,7 +545,7 @@ bool RenderableMultiresVolume::initializeSelector() {
         case Selector::LOCAL:
             if (_localErrorHistogramManager) {
                  std::filesystem::path cached = FileSys.cacheManager()->cachedFilename(
-                    fmt::format(
+                    std::format(
                         "{}_{}_localErrorHistograms",
                         std::filesystem::path(_filename).stem().string(), nHistograms
                     ),
@@ -555,15 +555,15 @@ bool RenderableMultiresVolume::initializeSelector() {
                 if (cacheFile.is_open()) {
                     // Read histograms from cache.
                     cacheFile.close();
-                    LINFO(fmt::format("Loading histograms from '{}'", cached));
+                    LINFO(std::format("Loading histograms from '{}'", cached));
                     success &= _localErrorHistogramManager->loadFromFile(cached);
                 }
                 else {
                     // Build histograms from tsp file.
-                    LWARNING(fmt::format("Failed to open '{}'", cached));
+                    LWARNING(std::format("Failed to open '{}'", cached));
                     success &= _localErrorHistogramManager->buildHistograms(nHistograms);
                     if (success) {
-                        LINFO(fmt::format("Writing cache to '{}'", cached));
+                        LINFO(std::format("Writing cache to '{}'", cached));
                         _localErrorHistogramManager->saveToFile(cached);
                     }
                 }
diff --git a/modules/multiresvolume/rendering/tsp.cpp b/modules/multiresvolume/rendering/tsp.cpp
index 37f1ad074e..a51c26d064 100644
--- a/modules/multiresvolume/rendering/tsp.cpp
+++ b/modules/multiresvolume/rendering/tsp.cpp
@@ -96,12 +96,12 @@ bool TSP::readHeader() {
 
     _file.read(reinterpret_cast<char*>(&_header), sizeof(Header));
 
-    LDEBUG(fmt::format("Grid type: {}", _header.gridType));
-    LDEBUG(fmt::format(
+    LDEBUG(std::format("Grid type: {}", _header.gridType));
+    LDEBUG(std::format(
         "Brick dimensions: {} {} {}",
         _header.xBrickDim, _header.yBrickDim, _header.zBrickDim
     ));
-    LDEBUG(fmt::format(
+    LDEBUG(std::format(
         "Num bricks: {} {} {}",
         _header.xNumBricks, _header.yNumBricks, _header.zNumBricks
     ));
@@ -118,15 +118,15 @@ bool TSP::readHeader() {
     _numBSTNodes = _header.numTimesteps * 2 - 1;
     _numTotalNodes = _numOTNodes * _numBSTNodes;
 
-    LDEBUG(fmt::format("Num OT levels: {}", _numOTLevels));
-    LDEBUG(fmt::format("Num OT nodes: {}", _numOTNodes));
-    LDEBUG(fmt::format("Num BST levels: {}", _numBSTLevels));
-    LDEBUG(fmt::format("Num BST nodes: {}", _numBSTNodes));
-    LDEBUG(fmt::format("Num total nodes: {}", _numTotalNodes));
+    LDEBUG(std::format("Num OT levels: {}", _numOTLevels));
+    LDEBUG(std::format("Num OT nodes: {}", _numOTNodes));
+    LDEBUG(std::format("Num BST levels: {}", _numBSTLevels));
+    LDEBUG(std::format("Num BST nodes: {}", _numBSTNodes));
+    LDEBUG(std::format("Num total nodes: {}", _numTotalNodes));
 
     // Allocate space for TSP structure
     _data.resize(_numTotalNodes*NUM_DATA);
-    LDEBUG(fmt::format("Data size: {}",  _data.size()));
+    LDEBUG(std::format("Data size: {}",  _data.size()));
 
     return true;
 }
@@ -385,9 +385,9 @@ bool TSP::calculateSpatialError() {
     _maxSpatialError = maxNorm;
     _medianSpatialError = medNorm;
 
-    LDEBUG(fmt::format("Min normalized spatial std dev: {}", minNorm));
-    LDEBUG(fmt::format("Max normalized spatial std dev: {}", maxNorm));
-    LDEBUG(fmt::format("Median normalized spatial std dev: {}", medNorm));
+    LDEBUG(std::format("Min normalized spatial std dev: {}", minNorm));
+    LDEBUG(std::format("Max normalized spatial std dev: {}", maxNorm));
+    LDEBUG(std::format("Median normalized spatial std dev: {}", medNorm));
 
     return true;
 }
@@ -496,9 +496,9 @@ bool TSP::calculateTemporalError() {
     _maxTemporalError = maxNorm;
     _medianTemporalError = medNorm;
 
-    LDEBUG(fmt::format("Min normalized temporal std dev: {}", minNorm));
-    LDEBUG(fmt::format("Max normalized temporal std dev: {}", maxNorm));
-    LDEBUG(fmt::format("Median normalized temporal std dev: {}", medNorm));
+    LDEBUG(std::format("Min normalized temporal std dev: {}", minNorm));
+    LDEBUG(std::format("Max normalized temporal std dev: {}", maxNorm));
+    LDEBUG(std::format("Median normalized temporal std dev: {}", medNorm));
 
     return true;
 }
@@ -514,7 +514,7 @@ bool TSP::readCache() {
 
     std::ifstream file(cacheFilename, std::ios::in | std::ios::binary);
     if (!file.is_open()) {
-        LWARNING(fmt::format("Failed to open {}", cacheFilename));
+        LWARNING(std::format("Failed to open {}", cacheFilename));
         return false;
     }
 
@@ -530,12 +530,12 @@ bool TSP::readCache() {
     file.close();
 
     LDEBUG("Cached errors:");
-    LDEBUG(fmt::format("Min spatial error: {}", _minSpatialError));
-    LDEBUG(fmt::format("Max spatial error: {}", _maxSpatialError));
-    LDEBUG(fmt::format("Median spatial error: {}", _medianSpatialError));
-    LDEBUG(fmt::format("Min temporal error: {}", _minTemporalError));
-    LDEBUG(fmt::format("Max temporal error: {}", _maxTemporalError));
-    LDEBUG(fmt::format("Median temporal error: {}", _medianTemporalError));
+    LDEBUG(std::format("Min spatial error: {}", _minSpatialError));
+    LDEBUG(std::format("Max spatial error: {}", _maxSpatialError));
+    LDEBUG(std::format("Median spatial error: {}", _medianSpatialError));
+    LDEBUG(std::format("Min temporal error: {}", _minTemporalError));
+    LDEBUG(std::format("Max temporal error: {}", _maxTemporalError));
+    LDEBUG(std::format("Median temporal error: {}", _medianTemporalError));
 
     return true;
 }
@@ -552,10 +552,10 @@ bool TSP::writeCache() {
 
     std::ofstream file(cacheFilename, std::ios::out | std::ios::binary);
     if (!file.is_open()) {
-        LWARNING(fmt::format("Failed to open {}", cacheFilename));
+        LWARNING(std::format("Failed to open {}", cacheFilename));
         return false;
     }
-    LINFO(fmt::format("Writing cache to {}", cacheFilename));
+    LINFO(std::format("Writing cache to {}", cacheFilename));
 
     file.write(reinterpret_cast<char*>(&_minSpatialError), sizeof(float));
     file.write(reinterpret_cast<char*>(&_maxSpatialError), sizeof(float));
diff --git a/modules/server/src/connection.cpp b/modules/server/src/connection.cpp
index 41526cfb34..37e1f2709d 100644
--- a/modules/server/src/connection.cpp
+++ b/modules/server/src/connection.cpp
@@ -50,8 +50,8 @@
 #include <ghoul/io/socket/tcpsocketserver.h>
 #include <ghoul/io/socket/websocketserver.h>
 #include <ghoul/logging/logmanager.h>
+#include <ghoul/fmt.h>
 #include <ghoul/misc/profiling.h>
-#include <fmt/format.h>
 
 namespace {
     constexpr std::string_view _loggerCat = "ServerModule: Connection";
@@ -114,11 +114,11 @@ void Connection::handleMessage(const std::string& message) {
             handleJson(j);
         }
         catch (const std::domain_error& e) {
-            LERROR(fmt::format("JSON handling error from: {}. {}", message, e.what()));
+            LERROR(std::format("JSON handling error from: {}. {}", message, e.what()));
         }
     }
     catch (const std::out_of_range& e) {
-        LERROR(fmt::format("JSON handling error from: {}. {}", message, e.what()));
+        LERROR(std::format("JSON handling error from: {}. {}", message, e.what()));
     }
     catch (const std::exception& e) {
         LERROR(e.what());
@@ -126,7 +126,7 @@ void Connection::handleMessage(const std::string& message) {
     catch (...) {
         if (!isAuthorized()) {
             _socket->disconnect();
-            LERROR(fmt::format(
+            LERROR(std::format(
                 "Could not parse JSON '{}'. Connection is unauthorized. Disconnecting",
                 message
             ));
@@ -142,7 +142,7 @@ void Connection::handleMessage(const std::string& message) {
                 return std::isprint(c, std::locale("")) ? char(c) : ' ';
             }
         );
-        LERROR(fmt::format("Could not parse JSON '{}'", sanitizedString));
+        LERROR(std::format("Could not parse JSON '{}'", sanitizedString));
     }
 }
 
diff --git a/modules/server/src/topics/flightcontrollertopic.cpp b/modules/server/src/topics/flightcontrollertopic.cpp
index f1b1e75fa7..7deecc1773 100644
--- a/modules/server/src/topics/flightcontrollertopic.cpp
+++ b/modules/server/src/topics/flightcontrollertopic.cpp
@@ -175,7 +175,7 @@ void FlightControllerTopic::handleJson(const nlohmann::json& json) {
     auto it = CommandMap.find(json[TypeKey]);
     if (it == CommandMap.end()) {
         LWARNING(
-            fmt::format("Malformed JSON command: no '{}' in payload", TypeKey)
+            std::format("Malformed JSON command: no '{}' in payload", TypeKey)
         );
         return;
     }
@@ -203,7 +203,7 @@ void FlightControllerTopic::handleJson(const nlohmann::json& json) {
             processLua(json[Lua]);
             break;
         default:
-            LWARNING(fmt::format("Unrecognized action: {}", it->first));
+            LWARNING(std::format("Unrecognized action: {}", it->first));
             break;
     }
 }
@@ -270,14 +270,14 @@ void FlightControllerTopic::changeFocus(const nlohmann::json& json) const {
     if (json.find(FocusKey) == json.end()) {
         const std::string j = json;
         LWARNING(
-            fmt::format("Could not find '{}' key in JSON. JSON was:\n{}", FocusKey, j)
+            std::format("Could not find '{}' key in JSON. JSON was:\n{}", FocusKey, j)
         );
         if (json.find(AimKey) == json.end()) {
             LWARNING(
-                fmt::format("Could not find '{}' key in JSON. JSON was:\n{}", AimKey, j)
+                std::format("Could not find '{}' key in JSON. JSON was:\n{}", AimKey, j)
             );
             if (json.find(AnchorKey) == json.end()) {
-                LWARNING(fmt::format(
+                LWARNING(std::format(
                     "Could not find '{}' key in JSON. JSON was:\n{}", AnchorKey, j
                 ));
                 return;
@@ -324,7 +324,7 @@ void FlightControllerTopic::setRenderableEnabled(const nlohmann::json& json) con
     if (json[RenderableKey].find(SceneNodeName) == json[RenderableKey].end()) {
         const std::string j = json;
         LWARNING(
-            fmt::format("Could not find '{}' key in JSON. JSON was:\n{}", FocusKey, j)
+            std::format("Could not find '{}' key in JSON. JSON was:\n{}", FocusKey, j)
         );
         return;
     }
@@ -393,7 +393,7 @@ void FlightControllerTopic::engageAutopilot(const nlohmann::json &json) {
         const auto mapIt = AxisIndexMap.find(it.key());
         if (mapIt == AxisIndexMap.end()) {
             if (it.key() != TypeKey || CommandMap.find(it.value()) == CommandMap.end()) {
-                LWARNING(fmt::format(
+                LWARNING(std::format(
                     "No axis, button, or command named '{}' (value: {})",
                     it.key(), static_cast<int>(it.value())
                 ));
@@ -433,7 +433,7 @@ void FlightControllerTopic::processInputState(const nlohmann::json& json) {
         const auto mapIt = AxisIndexMap.find(it.key());
         if (mapIt == AxisIndexMap.end()) {
             if (it.key() != TypeKey || CommandMap.find(it.value()) == CommandMap.end()) {
-                LWARNING(fmt::format(
+                LWARNING(std::format(
                     "No axis, button, or command named '{}' (value: {})",
                     it.key() , static_cast<int>(it.value())
                 ));
diff --git a/modules/server/src/topics/getpropertytopic.cpp b/modules/server/src/topics/getpropertytopic.cpp
index 2bf2866c0c..4c0f037ba6 100644
--- a/modules/server/src/topics/getpropertytopic.cpp
+++ b/modules/server/src/topics/getpropertytopic.cpp
@@ -100,7 +100,7 @@ json GetPropertyTopic::propertyFromKey(const std::string& key) {
         return wrappedPayload(prop);
     }
 
-    return wrappedError(fmt::format("Property '{}' not found", key), 404);
+    return wrappedError(std::format("Property '{}' not found", key), 404);
 }
 
 } // namespace openspace
diff --git a/modules/server/src/topics/luascripttopic.cpp b/modules/server/src/topics/luascripttopic.cpp
index d4ab44aec3..bb0ac24bd4 100644
--- a/modules/server/src/topics/luascripttopic.cpp
+++ b/modules/server/src/topics/luascripttopic.cpp
@@ -102,7 +102,7 @@ namespace {
             return formatArrayAsLuaTable(it->get<nlohmann::json>());
         }
         if (it->is_number()) {
-            return fmt::format("{}", it->get<double>());
+            return std::format("{}", it->get<double>());
         }
         if (it->is_string()) {
             return formatLuaString(it->get<std::string>());
diff --git a/modules/server/src/topics/setpropertytopic.cpp b/modules/server/src/topics/setpropertytopic.cpp
index 12a34b3b4d..4c2d84612f 100644
--- a/modules/server/src/topics/setpropertytopic.cpp
+++ b/modules/server/src/topics/setpropertytopic.cpp
@@ -123,7 +123,7 @@ void SetPropertyTopic::handleJson(const nlohmann::json& json) {
             std::string literal = luaLiteralFromJson(value);
 
             global::scriptEngine->queueScript(
-                fmt::format(
+                std::format(
                     "openspace.setPropertyValueSingle(\"{}\", {})", propertyKey, literal
                 ),
                 scripting::ScriptEngine::ShouldBeSynchronized::Yes,
diff --git a/modules/server/src/topics/subscriptiontopic.cpp b/modules/server/src/topics/subscriptiontopic.cpp
index 0eba60161c..383f695e9f 100644
--- a/modules/server/src/topics/subscriptiontopic.cpp
+++ b/modules/server/src/topics/subscriptiontopic.cpp
@@ -92,7 +92,7 @@ void SubscriptionTopic::handleJson(const nlohmann::json& json) {
             onChange();
         }
         else {
-            LWARNING(fmt::format("Could not subscribe. Property '{}' not found", key));
+            LWARNING(std::format("Could not subscribe. Property '{}' not found", key));
         }
     }
     if (event == StopSubscription) {
diff --git a/modules/server/src/topics/triggerpropertytopic.cpp b/modules/server/src/topics/triggerpropertytopic.cpp
index a7d4e00445..c20f0afdfa 100644
--- a/modules/server/src/topics/triggerpropertytopic.cpp
+++ b/modules/server/src/topics/triggerpropertytopic.cpp
@@ -41,7 +41,7 @@ void TriggerPropertyTopic::handleJson(const nlohmann::json& json) {
     try {
         const std::string& propertyKey = json.at("property").get<std::string>();
         global::scriptEngine->queueScript(
-            fmt::format(
+            std::format(
                 "openspace.setPropertyValueSingle(\"{}\", nil)", propertyKey
             ),
             scripting::ScriptEngine::ShouldBeSynchronized::Yes,
diff --git a/modules/skybrowser/skybrowsermodule.cpp b/modules/skybrowser/skybrowsermodule.cpp
index 27983cfe07..693d9566ea 100644
--- a/modules/skybrowser/skybrowsermodule.cpp
+++ b/modules/skybrowser/skybrowsermodule.cpp
@@ -350,7 +350,7 @@ void SkyBrowserModule::moveHoverCircle(const std::string& imageUrl, bool useScri
 
     // Show the circle
     if (useScript) {
-        const std::string script = fmt::format(
+        const std::string script = std::format(
             "openspace.setPropertyValueSingle('Scene.{}.Renderable.Fade', 1.0);",
             id
         );
@@ -374,7 +374,7 @@ void SkyBrowserModule::moveHoverCircle(const std::string& imageUrl, bool useScri
     pos *= skybrowser::CelestialSphereRadius * 1.1;
 
     // Note that the position can only be set through the script engine
-    const std::string script = fmt::format(
+    const std::string script = std::format(
         "openspace.setPropertyValueSingle('Scene.{}.Translation.Position', {});",
         id, ghoul::to_string(pos)
     );
@@ -388,7 +388,7 @@ void SkyBrowserModule::moveHoverCircle(const std::string& imageUrl, bool useScri
 void SkyBrowserModule::disableHoverCircle(bool useScript) {
     if (_hoverCircle && _hoverCircle->renderable()) {
         if (useScript) {
-            const std::string script = fmt::format(
+            const std::string script = std::format(
                 "openspace.setPropertyValueSingle('Scene.{}.Renderable.Fade', 0.0);",
                 _hoverCircle->identifier()
             );
@@ -439,7 +439,7 @@ TargetBrowserPair* SkyBrowserModule::pair(std::string_view id) const {
     );
     TargetBrowserPair* found = it != _targetsBrowsers.end() ? it->get() : nullptr;
     if (found == nullptr) {
-        LINFO(fmt::format("Identifier '{}' not found", id));
+        LINFO(std::format("Identifier '{}' not found", id));
     }
     return found;
 }
diff --git a/modules/skybrowser/skybrowsermodule_lua.inl b/modules/skybrowser/skybrowsermodule_lua.inl
index 32c72c36c5..f5894e5fba 100644
--- a/modules/skybrowser/skybrowsermodule_lua.inl
+++ b/modules/skybrowser/skybrowsermodule_lua.inl
@@ -111,7 +111,7 @@ std::string prunedIdentifier(std::string identifier) {
                 imageUrl
             );
             if (!found.has_value()) {
-                LINFO(fmt::format(
+                LINFO(std::format(
                     "No image with identifier '{}' was found in the collection.", imageUrl
                 ));
                 return;
@@ -160,7 +160,7 @@ std::string prunedIdentifier(std::string identifier) {
 
     SceneGraphNode* circle = global::renderEngine->scene()->sceneGraphNode(identifier);
     if (!circle) {
-        throw ghoul::lua::LuaError(fmt::format(
+        throw ghoul::lua::LuaError(std::format(
             "Could not find node to set as hover circle: {}", identifier
         ));
     }
@@ -242,7 +242,7 @@ std::string prunedIdentifier(std::string identifier) {
         for (const std::unique_ptr<TargetBrowserPair>& pair : pairs) {
             std::string id = pair->browserId();
             glm::ivec3 color = pair->borderColor();
-            std::string script = fmt::format(
+            std::string script = std::format(
                 "openspace.skybrowser.setBorderColor('{}', {}, {}, {})",
                 id, color.r, color.g, color.b
             );
diff --git a/modules/skybrowser/src/browser.cpp b/modules/skybrowser/src/browser.cpp
index a9db81735b..333f840c50 100644
--- a/modules/skybrowser/src/browser.cpp
+++ b/modules/skybrowser/src/browser.cpp
@@ -142,7 +142,7 @@ void Browser::deinitializeGL() {
 
     _texture = nullptr;
 
-    LDEBUG(fmt::format("Deinitializing browser '{}'", _url.value()));
+    LDEBUG(std::format("Deinitializing browser '{}'", _url.value()));
 
     _browserInstance->close(true);
 
diff --git a/modules/skybrowser/src/screenspaceskybrowser.cpp b/modules/skybrowser/src/screenspaceskybrowser.cpp
index 1e03e88ebb..ebe5db7eb8 100644
--- a/modules/skybrowser/src/screenspaceskybrowser.cpp
+++ b/modules/skybrowser/src/screenspaceskybrowser.cpp
@@ -221,7 +221,7 @@ bool ScreenSpaceSkyBrowser::shouldUpdateWhileTargetAnimates() const {
 
 void ScreenSpaceSkyBrowser::setIdInBrowser() const {
     int currentNode = global::windowDelegate->currentNode();
-    WwtCommunicator::setIdInBrowser(fmt::format("{}_{}", identifier(), currentNode));
+    WwtCommunicator::setIdInBrowser(std::format("{}_{}", identifier(), currentNode));
 }
 
 void ScreenSpaceSkyBrowser::setIsInitialized(bool isInitialized) {
diff --git a/modules/skybrowser/src/targetbrowserpair.cpp b/modules/skybrowser/src/targetbrowserpair.cpp
index e2a4ac1e70..acd3430e92 100644
--- a/modules/skybrowser/src/targetbrowserpair.cpp
+++ b/modules/skybrowser/src/targetbrowserpair.cpp
@@ -45,7 +45,7 @@ namespace {
         const glm::dvec3 positionCelestial = glm::normalize(direction) *
             openspace::skybrowser::CelestialSphereRadius;
 
-        const std::string script = fmt::format(
+        const std::string script = std::format(
             "openspace.setPropertyValueSingle('Scene.{}.Translation.Position', {});",
             id, ghoul::to_string(positionCelestial)
         );
@@ -322,7 +322,7 @@ void TargetBrowserPair::incrementallyAnimateToCoordinate() {
 }
 
 void TargetBrowserPair::startFading(float goal, float fadeTime) {
-    const std::string script = fmt::format(
+    const std::string script = std::format(
         "openspace.setPropertyValueSingle('Scene.{0}.Renderable.Fade', {2}, {3});"
         "openspace.setPropertyValueSingle('ScreenSpace.{1}.Fade', {2}, {3});",
         _targetNode->identifier(), _browser->identifier(), goal, fadeTime
diff --git a/modules/skybrowser/src/wwtcommunicator.cpp b/modules/skybrowser/src/wwtcommunicator.cpp
index aee43cce12..3507f2f513 100644
--- a/modules/skybrowser/src/wwtcommunicator.cpp
+++ b/modules/skybrowser/src/wwtcommunicator.cpp
@@ -187,7 +187,7 @@ void WwtCommunicator::removeSelectedImage(const std::string& imageUrl) {
 
 void WwtCommunicator::sendMessageToWwt(const ghoul::Dictionary& msg) const {
     std::string m = ghoul::formatJson(msg);
-    executeJavascript(fmt::format("sendMessageToWWT({});", m));
+    executeJavascript(std::format("sendMessageToWWT({});", m));
 }
 
 std::vector<std::string> WwtCommunicator::selectedImages() const {
@@ -239,12 +239,12 @@ void WwtCommunicator::setBorderColor(glm::ivec3 color) {
 
 void WwtCommunicator::setBorderRadius(double radius) {
     _borderRadius = radius;
-    const std::string scr = fmt::format("setBorderRadius({});", radius);
+    const std::string scr = std::format("setBorderRadius({});", radius);
     executeJavascript(scr);
 }
 
 void WwtCommunicator::updateBorderColor() const {
-    const std::string script = fmt::format(
+    const std::string script = std::format(
         "setBackgroundColor('rgb({},{},{})');",
         _wwtBorderColor.x, _wwtBorderColor.y, _wwtBorderColor.z
     );
@@ -348,7 +348,7 @@ void WwtCommunicator::setImageCollectionIsLoaded(bool isLoaded) {
 
 void WwtCommunicator::setIdInBrowser(const std::string& id) const {
     // Send ID to its browser
-    executeJavascript(fmt::format("setId('{}')", id));
+    executeJavascript(std::format("setId('{}')", id));
 }
 
 glm::ivec3 WwtCommunicator::borderColor() const {
diff --git a/modules/skybrowser/src/wwtdatahandler.cpp b/modules/skybrowser/src/wwtdatahandler.cpp
index 0390b3fcbf..7da2fe075b 100644
--- a/modules/skybrowser/src/wwtdatahandler.cpp
+++ b/modules/skybrowser/src/wwtdatahandler.cpp
@@ -135,7 +135,7 @@ namespace {
         const std::filesystem::path file = directory.string() + fileName + ".aspx";
         const bool success = downloadFile(url, file);
         if (!success) {
-            LINFO(fmt::format(
+            LINFO(std::format(
                 "Could not download file '{}' to directory '{}'", url, directory
             ));
             return false;
@@ -154,7 +154,7 @@ namespace {
         // If the file contains no folders, or there are folders but without urls,
         // stop recursion
         if (!folderExists || folderContainNoUrls) {
-            LINFO(fmt::format("Saving '{}'", url));
+            LINFO(std::format("Saving '{}'", url));
             return true;
         }
 
@@ -261,7 +261,7 @@ void WwtDataHandler::loadImages(const std::string& root,
 
     // 1.
     if (!directoryExists(directory)) {
-        LINFO(fmt::format("Creating directory '{}'", directory));
+        LINFO(std::format("Creating directory '{}'", directory));
         std::filesystem::create_directory(directory);
     }
 
@@ -291,7 +291,7 @@ void WwtDataHandler::loadImages(const std::string& root,
     // Check if the hash has changed. This will be ignored if either the local of remote
     // hash does not exist
     if (!localHash.empty() && !remoteHash.empty() && localHash != remoteHash) {
-        LINFO(fmt::format(
+        LINFO(std::format(
             "Local hash '{}' differs from remote hash '{}'. Cleaning directory",
             localHash, remoteHash
         ));
@@ -338,7 +338,7 @@ void WwtDataHandler::loadImages(const std::string& root,
         _images[imageVector[i].imageUrl].identifier = std::to_string(i);
     }
 
-    LINFO(fmt::format("Loaded {} WorldWide Telescope images", _images.size()));
+    LINFO(std::format("Loaded {} WorldWide Telescope images", _images.size()));
 }
 
 int WwtDataHandler::nLoadedImages() const {
@@ -380,7 +380,7 @@ void WwtDataHandler::saveImagesFromXml(const tinyxml2::XMLElement* root,
         // If node is another folder, open recursively
         else if (name == Folder) {
             const std::string nodeName = attribute(node, Name);
-            const std::string newCollectionName = fmt::format(
+            const std::string newCollectionName = std::format(
                 "{}/{}", collection, nodeName
             );
             saveImagesFromXml(node, newCollectionName);
diff --git a/modules/space/horizonsfile.cpp b/modules/space/horizonsfile.cpp
index 1bf0cf13ca..7fc790b4b0 100644
--- a/modules/space/horizonsfile.cpp
+++ b/modules/space/horizonsfile.cpp
@@ -96,7 +96,7 @@ std::string constructHorizonsUrl(HorizonsType type, const std::string& target,
             break;
     }
 
-    url += fmt::format(
+    url += std::format(
         "{}'{}'{}'{}'{}'{}'{}'{}'",
         Command, ghoul::encodeUrl(target),
         Center, ghoul::encodeUrl(observer),
@@ -105,10 +105,10 @@ std::string constructHorizonsUrl(HorizonsType type, const std::string& target,
     );
 
     if (unit.empty()) {
-        url += fmt::format("{}'{}'", StepSize, ghoul::encodeUrl(stepSize));
+        url += std::format("{}'{}'", StepSize, ghoul::encodeUrl(stepSize));
     }
     else {
-        url += fmt::format(
+        url += std::format(
             "{}'{}%20{}'", StepSize, ghoul::encodeUrl(stepSize), unit
         );
     }
@@ -130,7 +130,7 @@ json sendHorizonsRequest(const std::string& url, const std::filesystem::path& fi
     bool failed = false;
     dl->wait();
     if (!dl->hasSucceeded()) {
-        LERROR(fmt::format("Error downloading horizons file with URL '{}'", dl->url()));
+        LERROR(std::format("Error downloading horizons file with URL '{}'", dl->url()));
         failed = true;
     }
 
@@ -163,7 +163,7 @@ HorizonsResultCode isValidHorizonsAnswer(const json& answer) {
     if (auto signature = answer.find("signature");  signature != answer.end()) {
         if (auto source = signature->find("source");  source != signature->end()) {
             if (*source != static_cast<std::string>(ApiSource)) {
-                LWARNING(fmt::format(
+                LWARNING(std::format(
                     "Horizons answer from unknown source '{}'", source->dump()
                 ));
             }
@@ -178,7 +178,7 @@ HorizonsResultCode isValidHorizonsAnswer(const json& answer) {
             v = v.substr(0, v.find('.'));
 
             if (v != CurrentMajorVersion) {
-                LWARNING(fmt::format(
+                LWARNING(std::format(
                     "Unknown Horizons major version '{}' found. The currently supported "
                     "major version is {}", version->dump(), CurrentMajorVersion
                 ));
@@ -388,7 +388,7 @@ void HorizonsFile::displayErrorMessage(HorizonsResultCode code) const {
                 break;
             }
 
-            LINFO(fmt::format(
+            LINFO(std::format(
                 "Valid time range is '{}' to '{}'",
                 validTimeRange.first, validTimeRange.second
             ));
@@ -423,7 +423,7 @@ void HorizonsFile::displayErrorMessage(HorizonsResultCode code) const {
             for (const std::string& station : matchingstations) {
                 matches += '\n' + station;
             }
-            LINFO(fmt::format("Matching Observer Stations: {}", matches));
+            LINFO(std::format("Matching Observer Stations: {}", matches));
             break;
         }
         case HorizonsResultCode::MultipleObserver: {
@@ -440,7 +440,7 @@ void HorizonsFile::displayErrorMessage(HorizonsResultCode code) const {
             for (const std::string& observer : matchingObservers) {
                 matches += '\n' + observer;
             }
-            LINFO(fmt::format("Matching Observers: {}", matches));
+            LINFO(std::format("Matching Observers: {}", matches));
             break;
         }
         case HorizonsResultCode::ErrorNoTarget:
@@ -471,7 +471,7 @@ void HorizonsFile::displayErrorMessage(HorizonsResultCode code) const {
             for (const std::string& target : matchingTargets) {
                 matches += '\n' + target;
             }
-            LINFO(fmt::format("Matching targets: {}", matches));
+            LINFO(std::format("Matching targets: {}", matches));
             break;
         }
         case HorizonsResultCode::UnknownError:
@@ -495,7 +495,7 @@ HorizonsResult readHorizonsFile(std::filesystem::path file) {
     std::ifstream fileStream(file);
 
     if (!fileStream.good()) {
-        LERROR(fmt::format("Failed to open Horizons file '{}'", file));
+        LERROR(std::format("Failed to open Horizons file '{}'", file));
         return HorizonsResult();
     }
 
@@ -527,7 +527,7 @@ HorizonsResult readHorizonsVectorFile(std::filesystem::path file) {
 
     std::ifstream fileStream(file);
     if (!fileStream.good()) {
-        LERROR(fmt::format("Failed to open Horizons text file {}", file));
+        LERROR(std::format("Failed to open Horizons text file {}", file));
         return HorizonsResult();
     }
 
@@ -557,7 +557,7 @@ HorizonsResult readHorizonsVectorFile(std::filesystem::path file) {
         // Get next line of same data point
         std::getline(fileStream, line);
         if (!fileStream.good()) {
-            LERROR(fmt::format("Malformed Horizons file '{}'", file));
+            LERROR(std::format("Malformed Horizons file '{}'", file));
             return HorizonsResult();
         }
         std::stringstream str2(line);
@@ -569,7 +569,7 @@ HorizonsResult readHorizonsVectorFile(std::filesystem::path file) {
         str2 >> xPos >> yPos >> zPos;
 
         // Convert date and time to seconds after 2000
-        const std::string timeString = fmt::format("{} {}", date, time);
+        const std::string timeString = std::format("{} {}", date, time);
         const double timeInJ2000 = Time::convertTime(timeString);
         glm::dvec3 pos = glm::dvec3(1000 * xPos, 1000 * yPos, 1000 * zPos);
         const glm::dmat3 transform =
@@ -596,7 +596,7 @@ HorizonsResult readHorizonsObserverFile(std::filesystem::path file) {
 
     std::ifstream fileStream(file);
     if (!fileStream.good()) {
-        LERROR(fmt::format("Failed to open Horizons text file '{}'", file));
+        LERROR(std::format("Failed to open Horizons text file '{}'", file));
         return HorizonsResult();
     }
 
@@ -631,7 +631,7 @@ HorizonsResult readHorizonsObserverFile(std::filesystem::path file) {
 
         // Convert date and time to seconds after 2000
         // and pos to Galactic positions in meter from Observer.
-        const std::string timeString = fmt::format("{} {}", date, time);
+        const std::string timeString = std::format("{} {}", date, time);
 
         // Add position to stored data
         dataPoint.time = Time::convertTime(timeString);
@@ -793,10 +793,10 @@ std::pair<std::string, std::string> HorizonsFile::parseValidTimeRange(
         // Parse time stamps backwards
         // Format: Trajectory file Name, Start, End (yyyy-mon-dd hh:mm)
         if (hasTime && words.size() > 4) {
-            startTime = fmt::format(
+            startTime = std::format(
                 "{} T {}", words[words.size() - 4], words[words.size() - 3]
             );
-            endTime = fmt::format(
+            endTime = std::format(
                 "{} T {}", words[words.size() - 2], words[words.size() - 1]
             );
         }
@@ -831,7 +831,7 @@ std::pair<std::string, std::string> HorizonsFile::parseValidTimeRange(
         // Parse time stamps backwards
         // Format: Trajectory file Name, Start, End (yyyy-mon-dd hh:mm)
         if (hasTime && words.size() > 4) {
-            endTime = fmt::format(
+            endTime = std::format(
                 "{} T {}", words[words.size() - 2], words[words.size() - 1]
             );
         }
diff --git a/modules/space/kepler.cpp b/modules/space/kepler.cpp
index 280352004f..7c5059585b 100644
--- a/modules/space/kepler.cpp
+++ b/modules/space/kepler.cpp
@@ -212,7 +212,7 @@ namespace {
         // https://github.com/eliaskosunen/scnlib/issues/104 is fixed
         auto res = scn::scan<int, double>(e, "{:2d}{}");
         if (!res) {
-            throw ghoul::RuntimeError(fmt::format("Error parsing epoch '{}'", epoch));
+            throw ghoul::RuntimeError(std::format("Error parsing epoch '{}'", epoch));
         }
         auto [year, daysInYear] = res->values();
         year += year > 57 ? 1900 : 2000;
@@ -269,7 +269,7 @@ namespace {
         const std::string format = (nDashes == 2) ? "{:4}-{:2}-{:2}{}" : "{:4}{:2}{:2}{}";
         auto res = scn::scan<int, int, int, double>(e, scn::runtime_format(format));
         if (!res) {
-            throw ghoul::RuntimeError(fmt::format("Error parsing epoch '{}'", epoch));
+            throw ghoul::RuntimeError(std::format("Error parsing epoch '{}'", epoch));
         }
         auto [year, monthNum, dayOfMonthNum, fractionOfDay] = res->values();
         const int daysSince2000 = countDays(year);
@@ -338,7 +338,7 @@ namespace {
                 epoch, "{:4d}-{:2d}-{:2d}T{:2d}:{:2d}:{}"
             );
             if (!res) {
-                throw ghoul::RuntimeError(fmt::format("Error parsing epoch '{}'", epoch));
+                throw ghoul::RuntimeError(std::format("Error parsing epoch '{}'", epoch));
             }
             std::tie(date.year, month, days, date.hours, date.minutes, date.seconds) =
                 res->values();
@@ -354,13 +354,13 @@ namespace {
                 //date.year, date.nDays, date.hours, date.minutes, date.seconds
             );
             if (!res) {
-                throw ghoul::RuntimeError(fmt::format("Error parsing epoch '{}'", epoch));
+                throw ghoul::RuntimeError(std::format("Error parsing epoch '{}'", epoch));
             }
             std::tie(date.year, date.nDays, date.hours, date.minutes, date.seconds) =
                 res->values();
         }
         else {
-            throw ghoul::RuntimeError(fmt::format("Malformed epoch string '{}'", epoch));
+            throw ghoul::RuntimeError(std::format("Malformed epoch string '{}'", epoch));
         }
 
         const int daysSince2000 = countDays(date.year);
@@ -430,7 +430,7 @@ std::vector<Parameters> readTleFile(const std::filesystem::path& file) {
         std::string firstLine;
         std::getline(f, firstLine);
         if (f.bad() || firstLine[0] != '1') {
-            throw ghoul::RuntimeError(fmt::format(
+            throw ghoul::RuntimeError(std::format(
                 "Malformed TLE file '{}' at line {}", file, lineNum + 1
             ));
         }
@@ -442,7 +442,7 @@ std::vector<Parameters> readTleFile(const std::filesystem::path& file) {
                 const int year = std::atoi(y.c_str());
                 return year >= 57 ? "19" : "20";
             }();
-            p.id = fmt::format("{}{}-{}", prefix, id.substr(0, 2), id.substr(3));
+            p.id = std::format("{}{}-{}", prefix, id.substr(0, 2), id.substr(3));
         }
         p.epoch = epochFromSubstring(firstLine.substr(18, 14)); // should be 13?
 
@@ -462,7 +462,7 @@ std::vector<Parameters> readTleFile(const std::filesystem::path& file) {
         std::string secondLine;
         std::getline(f, secondLine);
         if (f.bad() || secondLine[0] != '2') {
-            throw ghoul::RuntimeError(fmt::format(
+            throw ghoul::RuntimeError(std::format(
                 "Malformed TLE file '{}' at line {}", file, lineNum + 1
             ));
         }
@@ -534,7 +534,7 @@ std::vector<Parameters> readOmmFile(const std::filesystem::path& file) {
         }
 
         if (parts.size() != 2) {
-            throw ghoul::RuntimeError(fmt::format(
+            throw ghoul::RuntimeError(std::format(
                 "Malformed line '{}' at {}", line, lineNum
             ));
         }
@@ -543,7 +543,7 @@ std::vector<Parameters> readOmmFile(const std::filesystem::path& file) {
             if (parts[1] != "2.0") {
                 LWARNINGC(
                     "OMM",
-                    fmt::format(
+                    std::format(
                         "Only version 2.0 is currently supported but found {}. "
                         "Parsing might fail",
                         parts[1]
@@ -617,7 +617,7 @@ std::vector<Parameters> readSbdbFile(const std::filesystem::path& file) {
     // Newer versions downloaded from the JPL SBDB website have " around variables
     line.erase(remove(line.begin(), line.end(), '\"'), line.end());
     if (line != ExpectedHeader) {
-        throw ghoul::RuntimeError(fmt::format(
+        throw ghoul::RuntimeError(std::format(
             "Expected JPL SBDB file to start with '{}' but found '{}' instead",
             ExpectedHeader, line.substr(0, 100)
         ));
@@ -629,7 +629,7 @@ std::vector<Parameters> readSbdbFile(const std::filesystem::path& file) {
 
         std::vector<std::string> parts = ghoul::tokenizeString(line, ',');
         if (parts.size() != NDataFields) {
-            throw ghoul::RuntimeError(fmt::format(
+            throw ghoul::RuntimeError(std::format(
                 "Malformed line {}, expected 8 data fields, got {}", line, parts.size()
             ));
         }
@@ -742,7 +742,7 @@ std::optional<std::vector<Parameters>> loadCache(const std::filesystem::path& fi
 std::vector<Parameters> readFile(std::filesystem::path file, Format format) {
     std::filesystem::path cachedFile = FileSys.cacheManager()->cachedFilename(file);
     if (std::filesystem::is_regular_file(cachedFile)) {
-        LINFO(fmt::format(
+        LINFO(std::format(
             "Cached file '{}' used for Kepler file '{}'", cachedFile, file
         ));
 
@@ -767,7 +767,7 @@ std::vector<Parameters> readFile(std::filesystem::path file, Format format) {
             break;
     }
 
-    LINFO(fmt::format("Saving cache '{}' for Kepler file '{}'", cachedFile, file));
+    LINFO(std::format("Saving cache '{}' for Kepler file '{}'", cachedFile, file));
     saveCache(res, cachedFile);
     return res;
 }
diff --git a/modules/space/rendering/renderableconstellationbounds.cpp b/modules/space/rendering/renderableconstellationbounds.cpp
index a822d4801c..a0ad6493ec 100644
--- a/modules/space/rendering/renderableconstellationbounds.cpp
+++ b/modules/space/rendering/renderableconstellationbounds.cpp
@@ -114,7 +114,7 @@ void RenderableConstellationBounds::initialize() {
 
                 if (it == options.end()) {
                     // The user has specified a constellation name that doesn't exist
-                    LWARNING(fmt::format(
+                    LWARNING(std::format(
                         "Option '{}' not found in list of constellations", s
                     ));
                 }
@@ -257,7 +257,7 @@ bool RenderableConstellationBounds::loadVertexFile() {
         if (!s.good()) {
             // If this evaluates to true, the stream was not completely filled, which
             // means that the line was incomplete, so there was an error
-            LERROR(fmt::format(
+            LERROR(std::format(
                 "Error reading file '{}' at line #{}", fileName, currentLineNumber
             ));
             break;
diff --git a/modules/space/rendering/renderableconstellationlines.cpp b/modules/space/rendering/renderableconstellationlines.cpp
index f7e0218ada..7e35fac3c9 100644
--- a/modules/space/rendering/renderableconstellationlines.cpp
+++ b/modules/space/rendering/renderableconstellationlines.cpp
@@ -198,7 +198,7 @@ void RenderableConstellationLines::initialize() {
 
                 if (it == options.end()) {
                     // The user has specified a constellation name that doesn't exist
-                    LWARNING(fmt::format(
+                    LWARNING(std::format(
                         "Option '{}' not found in list of constellations", s
                     ));
                 }
@@ -314,10 +314,10 @@ bool RenderableConstellationLines::readSpeckFile() {
     }
     std::filesystem::path fileName = absPath(_speckFile);
 
-    LINFO(fmt::format("Loading Speck file '{}'", fileName));
+    LINFO(std::format("Loading Speck file '{}'", fileName));
     std::ifstream file(fileName);
     if (!file.good()) {
-        LERROR(fmt::format("Failed to open Speck file '{}'", fileName));
+        LERROR(std::format("Failed to open Speck file '{}'", fileName));
         return false;
     }
 
@@ -368,7 +368,7 @@ bool RenderableConstellationLines::readSpeckFile() {
                 str >> constellationLine.colorIndex; // color index
             }
             else {
-                LWARNING(fmt::format(
+                LWARNING(std::format(
                     "Unknown command '{}' found in constellation file '{}'",
                     dummy, fileName
                 ));
@@ -413,7 +413,7 @@ bool RenderableConstellationLines::readSpeckFile() {
                 constellationLine.vertices.push_back(pos.z);
             }
             else {
-                LERROR(fmt::format(
+                LERROR(std::format(
                     "Failed reading position on line {} of mesh {} in file '{}'. "
                     "Stopped reading constellation data", l, lineIndex, fileName
                 ));
diff --git a/modules/space/rendering/renderableconstellationsbase.cpp b/modules/space/rendering/renderableconstellationsbase.cpp
index 7e63dd3df6..48bf87f33f 100644
--- a/modules/space/rendering/renderableconstellationsbase.cpp
+++ b/modules/space/rendering/renderableconstellationsbase.cpp
@@ -140,7 +140,7 @@ std::string RenderableConstellationsBase::constellationFullName(
         return _namesTranslation.at(identifier);
     }
 
-    throw ghoul::RuntimeError(fmt::format(
+    throw ghoul::RuntimeError(std::format(
         "Identifier '{}' could not be found in list of constellations", identifier
     ));
 }
diff --git a/modules/space/rendering/renderablefluxnodes.cpp b/modules/space/rendering/renderablefluxnodes.cpp
index c1679c2057..5260cf04f4 100644
--- a/modules/space/rendering/renderablefluxnodes.cpp
+++ b/modules/space/rendering/renderablefluxnodes.cpp
@@ -359,11 +359,11 @@ RenderableFluxNodes::RenderableFluxNodes(const ghoul::Dictionary& dictionary)
 
         // Ensure that there are available and valid source files left
         if (_binarySourceFiles.empty()) {
-            LERROR(fmt::format("'{}' contains no files", _binarySourceFolderPath));
+            LERROR(std::format("'{}' contains no files", _binarySourceFolderPath));
         }
     }
     else {
-        LERROR(fmt::format(
+        LERROR(std::format(
             "Source folder '{}' is not a valid directory", _binarySourceFolderPath
         ));
     }
@@ -456,7 +456,7 @@ void RenderableFluxNodes::loadNodeData(int energybinOption) {
     std::ifstream fileStream3(file3, std::ifstream::binary);
 
     if (!fileStream.good()) {
-        LERROR(fmt::format("Could not read file '{}'", file));
+        LERROR(std::format("Could not read file '{}'", file));
         return;
     }
 
@@ -646,7 +646,7 @@ void RenderableFluxNodes::populateStartTimes() {
                 _startTimes.push_back(triggerTime);
             }
             else {
-                LERROR(fmt::format(
+                LERROR(std::format(
                     "Error in file formating. Last column in file '{}' is not on UTC "
                     "ISO8601 format", timeFile
                 ));
diff --git a/modules/space/rendering/renderableorbitalkepler.cpp b/modules/space/rendering/renderableorbitalkepler.cpp
index a5b6e29633..48c16d13d8 100644
--- a/modules/space/rendering/renderableorbitalkepler.cpp
+++ b/modules/space/rendering/renderableorbitalkepler.cpp
@@ -307,7 +307,7 @@ void RenderableOrbitalKepler::updateBuffers() {
     _numObjects = parameters.size();
 
     if (_startRenderIdx >= _numObjects) {
-        throw ghoul::RuntimeError(fmt::format(
+        throw ghoul::RuntimeError(std::format(
             "Start index {} out of range [0, {}]", _startRenderIdx.value(), _numObjects
         ));
     }
@@ -315,7 +315,7 @@ void RenderableOrbitalKepler::updateBuffers() {
     long long endElement = _startRenderIdx + _sizeRender - 1;
     endElement = (endElement >= _numObjects) ? _numObjects - 1 : endElement;
     if (endElement < 0 || endElement >= _numObjects) {
-        throw ghoul::RuntimeError(fmt::format(
+        throw ghoul::RuntimeError(std::format(
             "End index {} out of range [0, {}]", endElement, _numObjects
         ));
     }
@@ -330,7 +330,7 @@ void RenderableOrbitalKepler::updateBuffers() {
         if (_startRenderIdx >= parameters.size() ||
             (_startRenderIdx + _sizeRender) >= parameters.size())
         {
-            throw ghoul::RuntimeError(fmt::format(
+            throw ghoul::RuntimeError(std::format(
                 "Tried to load {} objects but only {} are available",
                 _startRenderIdx + _sizeRender, parameters.size()
             ));
diff --git a/modules/space/rendering/renderablerings.cpp b/modules/space/rendering/renderablerings.cpp
index 574a29fa2a..fbd66b88cd 100644
--- a/modules/space/rendering/renderablerings.cpp
+++ b/modules/space/rendering/renderablerings.cpp
@@ -246,7 +246,7 @@ void RenderableRings::loadTexture() {
         if (texture) {
             LDEBUGC(
                 "RenderableRings",
-                fmt::format("Loaded texture from '{}'", absPath(_texturePath))
+                std::format("Loaded texture from '{}'", absPath(_texturePath))
             );
             _texture = std::move(texture);
 
diff --git a/modules/space/rendering/renderablestars.cpp b/modules/space/rendering/renderablestars.cpp
index 2c1d202be4..76f8dede5e 100644
--- a/modules/space/rendering/renderablestars.cpp
+++ b/modules/space/rendering/renderablestars.cpp
@@ -662,7 +662,7 @@ RenderableStars::RenderableStars(const ghoul::Dictionary& dictionary)
             _colorTextureIsDirty = true;
         }
         else {
-            LWARNING(fmt::format("File not found: {}", _colorTexturePath.value()));
+            LWARNING(std::format("File not found: {}", _colorTexturePath.value()));
         }
     });
     _colorTextureFile->setCallback([this]() { _colorTextureIsDirty = true; });
@@ -682,7 +682,7 @@ RenderableStars::RenderableStars(const ghoul::Dictionary& dictionary)
             _otherDataColorMapIsDirty = true;
         }
         else {
-            LWARNING(fmt::format("File not found: {}", _otherDataColorMapPath.value()));
+            LWARNING(std::format("File not found: {}", _otherDataColorMapPath.value()));
         }
     });
 
@@ -800,7 +800,7 @@ void RenderableStars::initializeGL() {
     if (!_queuedOtherData.empty()) {
         const int idx = _dataset.index(_queuedOtherData);
         if (idx == -1) {
-            LERROR(fmt::format("Could not find other data column {}", _queuedOtherData));
+            LERROR(std::format("Could not find other data column {}", _queuedOtherData));
         }
         else {
             _otherDataOption = idx;
@@ -905,7 +905,7 @@ void RenderableStars::loadPSFTexture() {
         );
 
         if (_pointSpreadFunctionTexture) {
-            LDEBUG(fmt::format(
+            LDEBUG(std::format(
                 "Loaded texture from '{}'", absPath(_pointSpreadFunctionTexturePath)
             ));
             _pointSpreadFunctionTexture->uploadTexture();
@@ -1308,7 +1308,7 @@ void RenderableStars::update(const UpdateData&) {
                 1
             );
             if (_colorTexture) {
-                LDEBUG(fmt::format(
+                LDEBUG(std::format(
                     "Loaded texture from '{}'", absPath(_colorTexturePath)
                 ));
                 _colorTexture->uploadTexture();
@@ -1333,7 +1333,7 @@ void RenderableStars::update(const UpdateData&) {
                 1
             );
             if (_otherDataColorMapTexture) {
-                LDEBUG(fmt::format(
+                LDEBUG(std::format(
                     "Loaded texture from '{}'", absPath(_otherDataColorMapPath)
                 ));
                 _otherDataColorMapTexture->uploadTexture();
diff --git a/modules/space/spacemodule_lua.inl b/modules/space/spacemodule_lua.inl
index 0b63785b0f..7f0da56a5d 100644
--- a/modules/space/spacemodule_lua.inl
+++ b/modules/space/spacemodule_lua.inl
@@ -93,7 +93,7 @@ std::vector<ghoul::Dictionary> readKeplerFile(std::filesystem::path p, std::stri
         f = openspace::kepler::Format::SBDB;
     }
     else {
-        throw ghoul::lua::LuaError(fmt::format("Unsupported format '{}'", type));
+        throw ghoul::lua::LuaError(std::format("Unsupported format '{}'", type));
     }
 
     std::vector<openspace::kepler::Parameters> params = openspace::kepler::readFile(p, f);
diff --git a/modules/space/tasks/generatedebrisvolumetask.cpp b/modules/space/tasks/generatedebrisvolumetask.cpp
index 5c535ce4fc..28027fdb10 100644
--- a/modules/space/tasks/generatedebrisvolumetask.cpp
+++ b/modules/space/tasks/generatedebrisvolumetask.cpp
@@ -291,7 +291,7 @@ std::vector<KeplerParameters> readTLEFile(const std::string& filename){
             keplerElements.epoch = epochFromSubstring(line.substr(18, 14));
         }
         else {
-            throw ghoul::RuntimeError(fmt::format(
+            throw ghoul::RuntimeError(std::format(
                 "File {} @ line {} does not have '1' header", filename // linNum + 1
             ));
         }
@@ -344,7 +344,7 @@ std::vector<KeplerParameters> readTLEFile(const std::string& filename){
             stream >> keplerElements.meanMotion;
         }
         else {
-            throw ghoul::RuntimeError(fmt::format(
+            throw ghoul::RuntimeError(std::format(
                 "File {} @ line {} does not have '2' header", filename  // , lineNum + 2
             ));
         }
@@ -402,7 +402,7 @@ std::vector<glm::dvec3> getPositionBuffer(std::vector<KeplerParameters> tleData,
             Time(0.0),
             false
         });
-        // LINFO(fmt::format("cart: {} ", position));
+        // LINFO(std::format("cart: {} ", position));
         glm::dvec3 sphPos;
         if (gridType == "Spherical"){
             sphPos = cartesianToSphericalCoord(position);
@@ -419,7 +419,7 @@ std::vector<glm::dvec3> getPositionBuffer(std::vector<KeplerParameters> tleData,
             if (sphPos.z > maxPhi){
                 maxPhi = sphPos.z;
             }
-            // LINFO(fmt::format("pos: {} ", sphPos));
+            // LINFO(std::format("pos: {} ", sphPos));
             positionBuffer.push_back(sphPos);
 
         }
@@ -430,10 +430,10 @@ std::vector<glm::dvec3> getPositionBuffer(std::vector<KeplerParameters> tleData,
 
 
     }
-    LINFO(fmt::format("max theta: {} ", maxTheta));
-    LINFO(fmt::format("max phi: {} ", maxPhi));
-    LINFO(fmt::format("min theta: {} ", minTheta));
-    LINFO(fmt::format("min phi: {} ", minPhi));
+    LINFO(std::format("max theta: {} ", maxTheta));
+    LINFO(std::format("max phi: {} ", maxPhi));
+    LINFO(std::format("min theta: {} ", minTheta));
+    LINFO(std::format("min phi: {} ", minPhi));
 
     return positionBuffer;
 }
@@ -456,7 +456,7 @@ float getDensityAt(glm::uvec3 cell,  double* densityArray, RawVolume<float>& raw
     // return value at position cell from _densityPerVoxel
     size_t index = raw.coordsToIndex(cell);
     value = static_cast<float>(densityArray[index]);
-    //LINFO(fmt::format("indensity: {} ", index));
+    //LINFO(std::format("indensity: {} ", index));
 
     return value;
 }
@@ -537,9 +537,9 @@ double* mapDensityToVoxels(double* densityArray, std::vector<glm::dvec3> positio
 {
 
     for (const glm::dvec3& position : positions) {
-        //LINFO(fmt::format("pos: {} ", position));
+        //LINFO(std::format("pos: {} ", position));
         int index = getIndexFromPosition(position, dim, maxApogee, gridType);
-        //LINFO(fmt::format("index: {} ", index));
+        //LINFO(std::format("index: {} ", index));
         if (gridType == "Cartesian"){
             ++densityArray[index];
         }
@@ -645,7 +645,7 @@ void GenerateDebrisVolumeTask::perform(const Task::ProgressCallback& progressCal
     }
 
     // float maxApogee = getMaxApogee(_TLEDataVector);
-    LINFO(fmt::format("Max Apogee: {} ", _maxApogee));
+    LINFO(std::format("Max Apogee: {} ", _maxApogee));
 
     /**  SEQUENCE
     *   1. handle timeStep
@@ -663,7 +663,7 @@ void GenerateDebrisVolumeTask::perform(const Task::ProgressCallback& progressCal
 
     // 1.1
      int numberOfIterations = static_cast<int>(timeSpan/timeStep);
-    LINFO(fmt::format("timestep: {} ", numberOfIterations));
+    LINFO(std::format("timestep: {} ", numberOfIterations));
 
     std::queue<volume::RawVolume<float>> rawVolumeQueue = {};
     const int size = _dimensions.x *_dimensions.y *_dimensions.z;
@@ -676,7 +676,7 @@ void GenerateDebrisVolumeTask::perform(const Task::ProgressCallback& progressCal
             startTimeInSeconds + (i * timeStep),
             _gridType
         );   //+(i*timeStep)
-        //LINFO(fmt::format("pos: {} ", startPositionBuffer[4]));
+        //LINFO(std::format("pos: {} ", startPositionBuffer[4]));
 
         double *densityArrayp = new double[size]();
         //densityArrayp = mapDensityToVoxels(
@@ -726,8 +726,8 @@ void GenerateDebrisVolumeTask::perform(const Task::ProgressCallback& progressCal
 
             minVal = std::min(minVal, value);
             maxVal = std::max(maxVal, value);
-            /*LINFO(fmt::format("min: {} ", minVal));
-            LINFO(fmt::format("max: {} ", maxVal));*/
+            /*LINFO(std::format("min: {} ", minVal));
+            LINFO(std::format("max: {} ", maxVal));*/
         });
         rawVolumeQueue.push(rawVolume);
         delete[] densityArrayp;
@@ -735,7 +735,7 @@ void GenerateDebrisVolumeTask::perform(const Task::ProgressCallback& progressCal
 
     // two loops is used to get a global min and max value for voxels.
     for(int i=0 ; i<=numberOfIterations ; ++i){
-        // LINFO(fmt::format("raw file output name: {} ", _rawVolumeOutputPath));
+        // LINFO(std::format("raw file output name: {} ", _rawVolumeOutputPath));
 
         size_t lastIndex = _rawVolumeOutputPath.find_last_of(".");
         std::string rawOutputName = _rawVolumeOutputPath.substr(0, lastIndex);
@@ -772,8 +772,8 @@ void GenerateDebrisVolumeTask::perform(const Task::ProgressCallback& progressCal
         metadata.minValue = minVal;
         metadata.maxValue = maxVal;
 
-        /*LINFO(fmt::format("min2: {} ", minVal));
-        LINFO(fmt::format("max2: {} ", maxVal));*/
+        /*LINFO(std::format("min2: {} ", minVal));
+        LINFO(std::format("max2: {} ", maxVal));*/
 
         ghoul::Dictionary outputDictionary = metadata.dictionary();
         ghoul::DictionaryLuaFormatter formatter;
diff --git a/modules/space/translation/gptranslation.cpp b/modules/space/translation/gptranslation.cpp
index 145acd8772..ad27c563e3 100644
--- a/modules/space/translation/gptranslation.cpp
+++ b/modules/space/translation/gptranslation.cpp
@@ -72,7 +72,7 @@ GPTranslation::GPTranslation(const ghoul::Dictionary& dictionary) {
     );
 
     if (element > static_cast<int>(parameters.size())) {
-        throw ghoul::RuntimeError(fmt::format(
+        throw ghoul::RuntimeError(std::format(
             "Requested element {} but only {} are available", element, parameters.size()
         ));
     }
diff --git a/modules/space/translation/horizonstranslation.cpp b/modules/space/translation/horizonstranslation.cpp
index ced6f1ec14..8e34504f8f 100644
--- a/modules/space/translation/horizonstranslation.cpp
+++ b/modules/space/translation/horizonstranslation.cpp
@@ -85,7 +85,7 @@ HorizonsTranslation::HorizonsTranslation(const ghoul::Dictionary& dictionary)
     if (std::holds_alternative<std::string>(p.horizonsTextFile)) {
         std::string file = std::get<std::string>(p.horizonsTextFile);
         if (!std::filesystem::is_regular_file(absPath(file))) {
-            LWARNING(fmt::format("The Horizons text file '{}' could not be found", file));
+            LWARNING(std::format("The Horizons text file '{}' could not be found", file));
             return;
         }
 
@@ -99,7 +99,7 @@ HorizonsTranslation::HorizonsTranslation(const ghoul::Dictionary& dictionary)
 
         for (const std::string& file : files) {
             if (!std::filesystem::is_regular_file(absPath(file))) {
-                LWARNING(fmt::format(
+                LWARNING(std::format(
                     "The Horizons text file '{}' could not be found", file
                 ));
                 return;
@@ -145,14 +145,14 @@ void HorizonsTranslation::loadData() {
     for (const std::string& filePath : _horizonsTextFiles.value()) {
         std::filesystem::path file = absPath(filePath);
         if (!std::filesystem::is_regular_file(file)) {
-            LWARNING(fmt::format("The Horizons text file '{}' could not be found", file));
+            LWARNING(std::format("The Horizons text file '{}' could not be found", file));
             return;
         }
 
         std::filesystem::path cachedFile = FileSys.cacheManager()->cachedFilename(file);
         const bool hasCachedFile = std::filesystem::is_regular_file(cachedFile);
         if (hasCachedFile) {
-            LINFO(fmt::format(
+            LINFO(std::format(
                 "Cached file '{}' used for Horizon file '{}'", cachedFile, file
             ));
 
@@ -166,13 +166,13 @@ void HorizonsTranslation::loadData() {
             }
         }
         else {
-            LINFO(fmt::format("Cache for Horizon file '{}' not found", file));
+            LINFO(std::format("Cache for Horizon file '{}' not found", file));
         }
-        LINFO(fmt::format("Loading Horizon file '{}'", file));
+        LINFO(std::format("Loading Horizon file '{}'", file));
 
         HorizonsFile horizonsFile(file);
         if (!readHorizonsTextFile(horizonsFile)) {
-            LERROR(fmt::format("Could not read data from Horizons file '{}'", file));
+            LERROR(std::format("Could not read data from Horizons file '{}'", file));
             return;
         }
 
@@ -210,7 +210,7 @@ bool HorizonsTranslation::loadCachedFile(const std::filesystem::path& file) {
     std::ifstream fileStream(file, std::ifstream::binary);
 
     if (!fileStream.good()) {
-        LERROR(fmt::format("Error opening file '{}' for loading cache file", file));
+        LERROR(std::format("Error opening file '{}' for loading cache file", file));
         return false;
     }
 
@@ -259,7 +259,7 @@ bool HorizonsTranslation::loadCachedFile(const std::filesystem::path& file) {
 void HorizonsTranslation::saveCachedFile(const std::filesystem::path& file) const {
     std::ofstream fileStream(file, std::ofstream::binary);
     if (!fileStream.good()) {
-        LERROR(fmt::format("Error opening file '{}' for save cache file", file));
+        LERROR(std::format("Error opening file '{}' for save cache file", file));
         return;
     }
 
diff --git a/modules/spacecraftinstruments/dashboard/dashboarditeminstruments.cpp b/modules/spacecraftinstruments/dashboard/dashboarditeminstruments.cpp
index c4f38f3e46..66409cab5a 100644
--- a/modules/spacecraftinstruments/dashboard/dashboarditeminstruments.cpp
+++ b/modules/spacecraftinstruments/dashboard/dashboarditeminstruments.cpp
@@ -160,7 +160,7 @@ void DashboardItemInstruments::render(glm::vec2& penPosition) {
         RenderFont(
             *_font,
             penPosition,
-            fmt::format(
+            std::format(
                 "{:4.0f} {:s} |{:s}>{:s}| {:.1f} %",
                 remainingConv.first,
                 remainingConv.second,
@@ -180,7 +180,7 @@ void DashboardItemInstruments::render(glm::vec2& penPosition) {
         RenderFont(
             *_font,
             penPosition,
-            fmt::format("Data acquisition time: {}", str),
+            std::format("Data acquisition time: {}", str),
             glm::vec4(_activeColor.value(), 1.f),
             ghoul::fontrendering::CrDirection::Down
         );
@@ -203,7 +203,7 @@ void DashboardItemInstruments::render(glm::vec2& penPosition) {
     RenderFont(
         *_font,
         penPosition,
-        fmt::format(
+        std::format(
             "Next image: [{:02d}:{:02d}:{:02d}]", tlh.count(), tlm.count(), tls.count()
         ),
         targetColor,
@@ -234,7 +234,7 @@ void DashboardItemInstruments::render(glm::vec2& penPosition) {
             RenderFont(*_font, penPosition, "  |", glm::vec4(0.3f, 0.3f, 0.3f, 1.f));
             RenderFont(*_font,
                 penPosition,
-                fmt::format("    {:5s}", m.first),
+                std::format("    {:5s}", m.first),
                 glm::vec4(_activeColor.value(), 1.f),
                 ghoul::fontrendering::CrDirection::Down
             );
@@ -244,7 +244,7 @@ void DashboardItemInstruments::render(glm::vec2& penPosition) {
             RenderFont(
                 *_font,
                 penPosition,
-                fmt::format("    {:5s}", m.first),
+                std::format("    {:5s}", m.first),
                 glm::vec4(0.3f, 0.3f, 0.3f, 1.f),
                 ghoul::fontrendering::CrDirection::Down
             );
@@ -279,13 +279,13 @@ glm::vec2 DashboardItemInstruments::size() const {
         size = addToBoundingbox(
             size,
             _font->boundingBox(
-                fmt::format("{:.0f} s {:s} {:.1f} %", remaining, progress, t * 100.f)
+                std::format("{:.0f} s {:s} {:.1f} %", remaining, progress, t * 100.f)
             )
         );
 
         size = addToBoundingbox(
             size,
-            _font->boundingBox(fmt::format("Data acquisition time: {}", str))
+            _font->boundingBox(std::format("Data acquisition time: {}", str))
         );
     }
     const std::pair<double, std::string> nextTarget = sequencer.nextTarget(time);
@@ -323,7 +323,7 @@ glm::vec2 DashboardItemInstruments::size() const {
     size = addToBoundingbox(
         size,
         _font->boundingBox(
-            fmt::format("Data acquisition adjacency: [{}:{}:{}]", hh, mm, ss)
+            std::format("Data acquisition adjacency: [{}:{}:{}]", hh, mm, ss)
         )
     );
 
diff --git a/modules/spacecraftinstruments/rendering/renderablefov.cpp b/modules/spacecraftinstruments/rendering/renderablefov.cpp
index de5bc927f5..4af3d48cbb 100644
--- a/modules/spacecraftinstruments/rendering/renderablefov.cpp
+++ b/modules/spacecraftinstruments/rendering/renderablefov.cpp
@@ -301,7 +301,7 @@ void RenderableFov::initializeGL() {
         res.shape == SpiceManager::FieldOfViewResult::Shape::Rectangle;
     if (!supportedShape) {
         throw ghoul::RuntimeError(
-            fmt::format("'{}' has unsupported shape", _instrument.name),
+            std::format("'{}' has unsupported shape", _instrument.name),
             "RenderableFov"
         );
     }
@@ -329,7 +329,7 @@ void RenderableFov::initializeGL() {
 
         LINFOC(
             _instrument.name,
-            fmt::format("Simplified from {} to {}", sizeBefore, sizeAfter)
+            std::format("Simplified from {} to {}", sizeBefore, sizeAfter)
         );
     }
 
diff --git a/modules/spacecraftinstruments/spacecraftinstrumentsmodule.cpp b/modules/spacecraftinstruments/spacecraftinstrumentsmodule.cpp
index 9efca1a851..34ed44b2b3 100644
--- a/modules/spacecraftinstruments/spacecraftinstrumentsmodule.cpp
+++ b/modules/spacecraftinstruments/spacecraftinstrumentsmodule.cpp
@@ -113,7 +113,7 @@ std::string SpacecraftInstrumentsModule::frameFromBody(const std::string& body)
 
     constexpr std::string_view unionPrefix = "IAU_";
     if (body.find(unionPrefix) == std::string::npos) {
-        return fmt::format("{}{}", unionPrefix, body);
+        return std::format("{}{}", unionPrefix, body);
     }
     else {
         return body;
diff --git a/modules/spacecraftinstruments/util/hongkangparser.cpp b/modules/spacecraftinstruments/util/hongkangparser.cpp
index 0a1acaba44..87842787b7 100644
--- a/modules/spacecraftinstruments/util/hongkangparser.cpp
+++ b/modules/spacecraftinstruments/util/hongkangparser.cpp
@@ -86,7 +86,7 @@ HongKangParser::HongKangParser(std::string name, std::string fileName,
                 translationDictionary.value<ghoul::Dictionary>(decoderType);
             // for each playbook call -> create a Decoder object
             for (std::string_view key : typeDictionary.keys()) {
-                const std::string& currentKey = fmt::format("{}.{}", decoderType, key);
+                const std::string& currentKey = std::format("{}.{}", decoderType, key);
 
                 ghoul::Dictionary decoderDictionary;
                 if (translationDictionary.hasValue<ghoul::Dictionary>(currentKey)) {
@@ -132,7 +132,7 @@ bool HongKangParser::create() {
     const bool hasObserver = SpiceManager::ref().hasNaifId(_spacecraft);
     if (!hasObserver) {
         throw ghoul::RuntimeError(
-            fmt::format("SPICE has no observer '{}' in kernel pool", _spacecraft),
+            std::format("SPICE has no observer '{}' in kernel pool", _spacecraft),
             "HongKangParser"
         );
     }
diff --git a/modules/spacecraftinstruments/util/instrumenttimesparser.cpp b/modules/spacecraftinstruments/util/instrumenttimesparser.cpp
index 8f19337625..130bde2a08 100644
--- a/modules/spacecraftinstruments/util/instrumenttimesparser.cpp
+++ b/modules/spacecraftinstruments/util/instrumenttimesparser.cpp
@@ -76,7 +76,7 @@ InstrumentTimesParser::InstrumentTimesParser(std::string name, std::string seque
 bool InstrumentTimesParser::create() {
     std::filesystem::path sequenceDir = absPath(_fileName);
     if (!std::filesystem::is_directory(sequenceDir)) {
-        LERROR(fmt::format("Could not load label directory '{}'", sequenceDir));
+        LERROR(std::format("Could not load label directory '{}'", sequenceDir));
         return false;
     }
 
@@ -88,7 +88,7 @@ bool InstrumentTimesParser::create() {
             std::filesystem::path filepath = sequenceDir / filename;
 
             if (!std::filesystem::is_regular_file(filepath)) {
-                LERROR(fmt::format("Unable to read file '{}'. Skipping file", filepath));
+                LERROR(std::format("Unable to read file '{}'. Skipping file", filepath));
                 continue;
             }
 
diff --git a/modules/spacecraftinstruments/util/labelparser.cpp b/modules/spacecraftinstruments/util/labelparser.cpp
index d73a738765..ee4b92db42 100644
--- a/modules/spacecraftinstruments/util/labelparser.cpp
+++ b/modules/spacecraftinstruments/util/labelparser.cpp
@@ -139,7 +139,7 @@ std::string LabelParser::encode(const std::string& line) const {
 bool LabelParser::create() {
     std::filesystem::path sequenceDir = absPath(_fileName);
     if (!std::filesystem::is_directory(sequenceDir)) {
-        LERROR(fmt::format("Could not load label directory '{}'", sequenceDir));
+        LERROR(std::format("Could not load label directory '{}'", sequenceDir));
         return false;
     }
 
@@ -165,7 +165,7 @@ bool LabelParser::create() {
         std::ifstream file(path);
 
         if (!file.good()) {
-            LERROR(fmt::format("Failed to open label file '{}'", path));
+            LERROR(std::format("Failed to open label file '{}'", path));
             return false;
         }
 
@@ -195,21 +195,21 @@ bool LabelParser::create() {
             if (read == "TARGET_NAME") {
                 _target = decode(line);
                 if (_target.empty()) {
-                    LWARNING(fmt::format(ErrorMsg, "TARGET_NAME", line, path));
+                    LWARNING(std::format(ErrorMsg, "TARGET_NAME", line, path));
                 }
                 count++;
             }
             if (read == "INSTRUMENT_HOST_NAME") {
                 _instrumentHostID = decode(line);
                 if (_instrumentHostID.empty()) {
-                    LWARNING(fmt::format(ErrorMsg, "INSTRUMENT_HOST_NAME", line, path));
+                    LWARNING(std::format(ErrorMsg, "INSTRUMENT_HOST_NAME", line, path));
                 }
                 count++;
             }
             if (read == "INSTRUMENT_ID") {
                 _instrumentID = decode(line);
                 if (_instrumentID.empty()) {
-                    LWARNING(fmt::format(ErrorMsg, "INSTRUMENT_ID", line, path));
+                    LWARNING(std::format(ErrorMsg, "INSTRUMENT_ID", line, path));
                 }
                 lblName = encode(line);
                 count++;
@@ -217,7 +217,7 @@ bool LabelParser::create() {
             if (read == "DETECTOR_TYPE") {
                 _detectorType = decode(line);
                 if (_detectorType.empty()) {
-                    LWARNING(fmt::format(ErrorMsg, "DETECTOR_TYPE", line, path));
+                    LWARNING(std::format(ErrorMsg, "DETECTOR_TYPE", line, path));
                 }
                 count++;
             }
@@ -248,7 +248,7 @@ bool LabelParser::create() {
                     count++;
                 }
                 else{
-                    LERROR(fmt::format(
+                    LERROR(std::format(
                         "Label file '{}' deviates from generic standard", path
                     ));
                     LINFO(
diff --git a/modules/spacecraftinstruments/util/projectioncomponent.cpp b/modules/spacecraftinstruments/util/projectioncomponent.cpp
index e9b0b6ce4c..8a735f1889 100644
--- a/modules/spacecraftinstruments/util/projectioncomponent.cpp
+++ b/modules/spacecraftinstruments/util/projectioncomponent.cpp
@@ -425,7 +425,7 @@ void ProjectionComponent::imageProjectBegin() {
 
     if (_textureSizeDirty) {
         glm::ivec2 size = _textureSize;
-        LDEBUG(fmt::format("Changing texture size to ({}, {})", size.x, size.y));
+        LDEBUG(std::format("Changing texture size to ({}, {})", size.x, size.y));
 
         // If the texture size has changed, we have to allocate new memory and copy
         // the image texture to the new target
@@ -453,7 +453,7 @@ void ProjectionComponent::imageProjectBegin() {
 
             GLenum status = glCheckFramebufferStatus(GL_READ_FRAMEBUFFER);
             if (!FramebufferObject::errorChecking(status).empty()) {
-                LERROR(fmt::format(
+                LERROR(std::format(
                     "Read Buffer ({}): {}", msg, FramebufferObject::errorChecking(status)
                 ));
             }
@@ -462,7 +462,7 @@ void ProjectionComponent::imageProjectBegin() {
 
             status = glCheckFramebufferStatus(GL_DRAW_FRAMEBUFFER);
             if (!FramebufferObject::errorChecking(status).empty()) {
-                LERROR(fmt::format(
+                LERROR(std::format(
                     "Draw Buffer ({}): {}", msg, FramebufferObject::errorChecking(status)
                 ));
             }
@@ -482,7 +482,7 @@ void ProjectionComponent::imageProjectBegin() {
 
             GLenum status = glCheckFramebufferStatus(GL_READ_FRAMEBUFFER);
             if (!FramebufferObject::errorChecking(status).empty()) {
-                LERROR(fmt::format(
+                LERROR(std::format(
                     "Read Buffer ({}): {}", msg, FramebufferObject::errorChecking(status)
                 ));
             }
@@ -491,7 +491,7 @@ void ProjectionComponent::imageProjectBegin() {
 
             status = glCheckFramebufferStatus(GL_DRAW_FRAMEBUFFER);
             if (!FramebufferObject::errorChecking(status).empty()) {
-                LERROR(fmt::format(
+                LERROR(std::format(
                     "Draw Buffer ({}): {}", msg, FramebufferObject::errorChecking(status)
                 ));
             }
@@ -904,7 +904,7 @@ std::shared_ptr<ghoul::opengl::Texture> ProjectionComponent::loadProjectionTextu
 }
 
 bool ProjectionComponent::generateProjectionLayerTexture(const glm::ivec2& size) {
-    LINFO(fmt::format("Creating projection texture of size ({}, {})", size.x, size.y));
+    LINFO(std::format("Creating projection texture of size ({}, {})", size.x, size.y));
 
     using namespace ghoul::opengl;
     _projectionTexture = std::make_unique<Texture>(
@@ -943,7 +943,7 @@ bool ProjectionComponent::generateProjectionLayerTexture(const glm::ivec2& size)
 }
 
 bool ProjectionComponent::generateDepthTexture(const glm::ivec2& size) {
-    LINFO(fmt::format("Creating depth texture of size ({}, {})", size.x, size.y));
+    LINFO(std::format("Creating depth texture of size ({}, {})", size.x, size.y));
 
     _shadowing.texture = std::make_unique<ghoul::opengl::Texture>(
         glm::uvec3(size, 1),
diff --git a/modules/spout/spoutwrapper.cpp b/modules/spout/spoutwrapper.cpp
index 739a3170bb..fe03d8a2c3 100644
--- a/modules/spout/spoutwrapper.cpp
+++ b/modules/spout/spoutwrapper.cpp
@@ -213,7 +213,7 @@ bool SpoutReceiver::updateReceiverName(const std::string& name) {
     bool hasCreated = _spoutHandle->CreateReceiver(nameBuf, width, height);
     if (!hasCreated) {
         if (!_isErrorMessageDisplayed) {
-            LWARNING(fmt::format(
+            LWARNING(std::format(
                 "Could not create receiver for {} -> {}x{}", name, width, height
             ));
             _isErrorMessageDisplayed = true;
@@ -294,7 +294,7 @@ bool SpoutReceiver::updateTexture(unsigned int width, unsigned int height) {
         if (_spoutTexture) {
             _spoutTexture->uploadTexture();
             if (_onUpdateTextureCallback && !_onUpdateTextureCallback(width, height)) {
-                LWARNING(fmt::format(
+                LWARNING(std::format(
                     "Could not create callback texture for {} -> {}x{}",
                     _currentSpoutName, width, height
                 ));
@@ -304,7 +304,7 @@ bool SpoutReceiver::updateTexture(unsigned int width, unsigned int height) {
             _spoutHeight = height;
         }
         else {
-            LWARNING(fmt::format(
+            LWARNING(std::format(
                 "Could not create texture for {} -> {}x{}",
                 _currentSpoutName, width, height
             ));
@@ -376,7 +376,7 @@ SpoutReceiverPropertyProxy::SpoutReceiverPropertyProxy(properties::PropertyOwner
         for (int i = 0; i < static_cast<int>(receiverList.size()); i++) {
             _spoutSelection.addOption(i + 1, receiverList[i]);
 
-            LWARNING(fmt::format("List {}", receiverList[i]));
+            LWARNING(std::format("List {}", receiverList[i]));
 
             if (!_isSelectAny && _spoutName.value() == receiverList[i]) {
                 idx = i + 1;
@@ -424,7 +424,7 @@ bool SpoutSender::updateSenderStatus() {
     if (!_isSending) {
         if (_spoutWidth == 0 || _spoutHeight == 0) {
             if (!_isErrorMessageDisplayed) {
-                LWARNING(fmt::format(
+                LWARNING(std::format(
                     "Could not create sender for {}, dimensions invalid {}x{}",
                     _currentSpoutName, _spoutWidth, _spoutHeight
                 ));
@@ -435,7 +435,7 @@ bool SpoutSender::updateSenderStatus() {
 
         if (_currentSpoutName.empty()) {
             if (!_isErrorMessageDisplayed) {
-                LWARNING(fmt::format("Could not create sender, invalid name"));
+                LWARNING(std::format("Could not create sender, invalid name"));
                 _isErrorMessageDisplayed = true;
             }
             return false;
@@ -448,7 +448,7 @@ bool SpoutSender::updateSenderStatus() {
         bool hasCreated = _spoutHandle->CreateSender(name, _spoutWidth, _spoutHeight);
         if (!hasCreated) {
             if (!_isErrorMessageDisplayed) {
-                LWARNING(fmt::format(
+                LWARNING(std::format(
                     "Could not create sender for {} -> {}x{}",
                     _currentSpoutName, _spoutWidth, _spoutHeight
                 ));
@@ -588,7 +588,7 @@ SpoutSenderPropertyProxy::SpoutSenderPropertyProxy(properties::PropertyOwner& ow
         _spoutName = dictionary.value<std::string>(NameSenderInfo.identifier);
     }
     else {
-        LWARNING(fmt::format("Sender does not have a name"));
+        LWARNING(std::format("Sender does not have a name"));
     }
 
     _spoutName.onChange([this]() { _isSpoutDirty = true; });
diff --git a/modules/statemachine/src/statemachine.cpp b/modules/statemachine/src/statemachine.cpp
index 3311f9b968..3acfd33ca4 100644
--- a/modules/statemachine/src/statemachine.cpp
+++ b/modules/statemachine/src/statemachine.cpp
@@ -74,7 +74,7 @@ StateMachine::StateMachine(const ghoul::Dictionary& dictionary) {
             _transitions.push_back(trans);
         }
         else {
-            LERROR(fmt::format(
+            LERROR(std::format(
                 "Invalid transition from '{}' to '{}'. One or both of the states do not "
                 "exist in the state machine", trans.from(), trans.to()
             ));
@@ -99,7 +99,7 @@ void StateMachine::setInitialState(const std::string& initialState) {
     const int stateIndex = findState(initialState);
 
     if (stateIndex == -1) {
-        LWARNING(fmt::format(
+        LWARNING(std::format(
             "Attempting to initialize with undefined state '{}'", initialState
         ));
         return;
@@ -127,7 +127,7 @@ void StateMachine::transitionTo(const std::string& newState) {
 
     const int stateIndex = findState(newState);
     if (stateIndex == -1) {
-        LWARNING(fmt::format(
+        LWARNING(std::format(
             "Attempting to transition to undefined state '{}'", newState
         ));
         return;
@@ -135,7 +135,7 @@ void StateMachine::transitionTo(const std::string& newState) {
 
     const int transitionIndex = findTransitionTo(newState);
     if (transitionIndex == -1) {
-        LWARNING(fmt::format(
+        LWARNING(std::format(
             "Transition from '{}' to '{}' is undefined",
             currentState()->name(), newState
         ));
@@ -202,7 +202,7 @@ void StateMachine::saveToDotFile(const std::string& filename) const {
 
     std::ofstream file(outputFile);
     if (!file.good()) {
-        LERROR(fmt::format(
+        LERROR(std::format(
             "Error opening file '{}' for saving state machine dot file", outputFile
         ));
         return;
@@ -210,14 +210,14 @@ void StateMachine::saveToDotFile(const std::string& filename) const {
 
     file << "digraph statemachine {\n";
     for (const State& s : _states) {
-        file << fmt::format("\t{};\n", s.name());
+        file << std::format("\t{};\n", s.name());
     }
     for (const Transition& t : _transitions) {
-        file << fmt::format("\t{} -> {};\n", t.from(), t.to());
+        file << std::format("\t{} -> {};\n", t.from(), t.to());
     }
     file << "}\n";
 
-    LINFO(fmt::format("Saved state machine to file: {}", outputFile));
+    LINFO(std::format("Saved state machine to file: {}", outputFile));
 }
 
 } // namespace openspace
diff --git a/modules/statemachine/statemachinemodule.cpp b/modules/statemachine/statemachinemodule.cpp
index 43e2edac28..0654a8ecd4 100644
--- a/modules/statemachine/statemachinemodule.cpp
+++ b/modules/statemachine/statemachinemodule.cpp
@@ -64,12 +64,12 @@ void StateMachineModule::initializeStateMachine(const ghoul::Dictionary& states,
 
     try {
         _machine = std::make_unique<StateMachine>(dictionary);
-        LINFO(fmt::format(
+        LINFO(std::format(
             "State machine was created with start state: {}", currentState()
         ));
     }
     catch (const documentation::SpecificationError& e) {
-        LERROR(fmt::format("Error loading state machine: {}", e.what()));
+        LERROR(std::format("Error loading state machine: {}", e.what()));
         logError(e);
     }
 }
diff --git a/modules/statemachine/statemachinemodule_lua.inl b/modules/statemachine/statemachinemodule_lua.inl
index 0a583bad8e..6672835113 100644
--- a/modules/statemachine/statemachinemodule_lua.inl
+++ b/modules/statemachine/statemachinemodule_lua.inl
@@ -113,7 +113,7 @@ namespace {
         std::vector<std::string> transitions = module->possibleTransitions();
         LINFOC(
             "StateMachine",
-            fmt::format(
+            std::format(
                 "Currently in state: '{}'. Can transition to states: [ {} ]",
                 currentState,
                 ghoul::join(transitions, ",")
diff --git a/modules/sync/syncs/httpsynchronization.cpp b/modules/sync/syncs/httpsynchronization.cpp
index 12979a5a77..22e917dca1 100644
--- a/modules/sync/syncs/httpsynchronization.cpp
+++ b/modules/sync/syncs/httpsynchronization.cpp
@@ -111,7 +111,7 @@ void HttpSynchronization::start() {
         return;
     }
 
-    const std::string query = fmt::format(
+    const std::string query = std::format(
         "?identifier={}&file_version={}&application_version={}",
         _identifier, _version, ApplicationVersion
     );
@@ -158,7 +158,7 @@ void HttpSynchronization::cancel() {
 }
 
 std::string HttpSynchronization::generateUid() {
-    return fmt::format("{}/{}", _identifier, _version);
+    return std::format("{}/{}", _identifier, _version);
 }
 
 void HttpSynchronization::createSyncFile(bool isFullySynchronized) const {
@@ -168,7 +168,7 @@ void HttpSynchronization::createSyncFile(bool isFullySynchronized) const {
     dir.replace_extension("ossync");
     std::ofstream syncFile(dir, std::ofstream::out);
 
-    syncFile << fmt::format(
+    syncFile << std::format(
         "{}\n{}\n",
         OssyncVersionNumber,
         (isFullySynchronized ? SynchronizationToken : "Partial Synchronized")
@@ -227,7 +227,7 @@ bool HttpSynchronization::isEachFileDownloaded() {
         }
     }
     else {
-        LERROR(fmt::format(
+        LERROR(std::format(
             "{}: Unknown ossync version number read."
             "Got {} while {} and below are valid.",
             _identifier,
@@ -286,7 +286,7 @@ HttpSynchronization::trySyncFromUrl(std::string url) {
         const std::filesystem::path destination = directory() / (filename + ".tmp");
 
         if (sizeData.find(line) != sizeData.end()) {
-            LWARNING(fmt::format("{}: Duplicate entry for {}", _identifier, line));
+            LWARNING(std::format("{}: Duplicate entry for {}", _identifier, line));
             continue;
         }
 
@@ -372,7 +372,7 @@ HttpSynchronization::trySyncFromUrl(std::string url) {
     for (const std::unique_ptr<HttpFileDownload>& d : downloads) {
         d->wait();
         if (!d->hasSucceeded()) {
-            LERROR(fmt::format("Error downloading file from URL '{}'", d->url()));
+            LERROR(std::format("Error downloading file from URL '{}'", d->url()));
             failed = true;
             continue;
         }
@@ -391,7 +391,7 @@ HttpSynchronization::trySyncFromUrl(std::string url) {
         std::error_code ec;
         std::filesystem::rename(tempName, originalName, ec);
         if (ec) {
-            LERROR(fmt::format("Error renaming '{}' to '{}'", tempName, originalName));
+            LERROR(std::format("Error renaming '{}' to '{}'", tempName, originalName));
             failed = true;
         }
 
@@ -407,7 +407,7 @@ HttpSynchronization::trySyncFromUrl(std::string url) {
             zip_close(z);
 
             if (is64) {
-                LERROR(fmt::format(
+                LERROR(std::format(
                     "Error while unzipping '{}': Zip64 archives are not supported", source
                 ));
                 continue;
@@ -415,7 +415,7 @@ HttpSynchronization::trySyncFromUrl(std::string url) {
 
             int ret = zip_extract(source.c_str(), dest.c_str(), nullptr, nullptr);
             if (ret != 0) {
-                LERROR(fmt::format("Error '{}' while unzipping '{}'", ret, source));
+                LERROR(std::format("Error '{}' while unzipping '{}'", ret, source));
                 continue;
             }
 
diff --git a/modules/sync/syncs/urlsynchronization.cpp b/modules/sync/syncs/urlsynchronization.cpp
index f58b1434f8..5ca58329b2 100644
--- a/modules/sync/syncs/urlsynchronization.cpp
+++ b/modules/sync/syncs/urlsynchronization.cpp
@@ -99,7 +99,7 @@ UrlSynchronization::UrlSynchronization(const ghoul::Dictionary& dictionary,
     }
 
     if (p.filename.has_value() && _urls.size() > 1) {
-        throw ghoul::RuntimeError(fmt::format(
+        throw ghoul::RuntimeError(std::format(
             "UrlSynchronization ({}) requested overwrite filename but specified {} URLs "
             "to download, which is not legal",
             p.identifier, _urls.size()
@@ -128,11 +128,11 @@ UrlSynchronization::UrlSynchronization(const ghoul::Dictionary& dictionary,
         size_t hash = std::hash<std::string>{}(
             std::accumulate(urls.begin(), urls.end(), std::string())
         );
-        _identifier += fmt::format("({})", hash);
+        _identifier += std::format("({})", hash);
     }
 
     if (p.forceOverride.has_value()) {
-        LWARNING(fmt::format(
+        LWARNING(std::format(
             "{}: The variable ForceOverride has been deprecated. "
             "Optionally, use SecondsUntilResync instead to specify file validity date.",
             p.identifier
@@ -230,7 +230,7 @@ bool UrlSynchronization::isEachFileValid() {
 
         // Issue warning if file is kept but user changed setting to download on startup.
         if ((fileValidAsJ2000 > todaysDateAsJ2000) && _secondsUntilResync == 0) {
-            LWARNING(fmt::format(
+            LWARNING(std::format(
                 "{}: File is valid to {} but asset specifies SecondsUntilResync = {} "
                 "Did you mean to re-download the file? If so, remove file from sync "
                 "folder to resync",
@@ -247,7 +247,7 @@ bool UrlSynchronization::isEachFileValid() {
         return false;
     }
     else {
-        LERROR(fmt::format(
+        LERROR(std::format(
             "{}: Unknown ossync version number read. Got {} while {} and below are valid",
             _identifier, ossyncVersion, OssyncVersionNumber
         ));
@@ -279,7 +279,7 @@ void UrlSynchronization::createSyncFile(bool) const {
         "YYYY-MM-DDTHR:MN:SC.###"
     );
 
-    const std::string msg = fmt::format("{}\n{}\n", OssyncVersionNumber, fileIsValidTo);
+    const std::string msg = std::format("{}\n{}\n", OssyncVersionNumber, fileIsValidTo);
     syncFile << msg;
 }
 
@@ -311,7 +311,7 @@ bool UrlSynchronization::trySyncUrls() {
         std::filesystem::path destination = directory() / (_filename + ".tmp");
 
         if (sizeData.find(url) != sizeData.end()) {
-            LWARNING(fmt::format("{}: Duplicate entry for '{}'", _identifier, url));
+            LWARNING(std::format("{}: Duplicate entry for '{}'", _identifier, url));
             continue;
         }
 
@@ -360,7 +360,7 @@ bool UrlSynchronization::trySyncUrls() {
         d->wait();
         if (!d->hasSucceeded()) {
             failed = true;
-            LERROR(fmt::format("Error downloading file from URL: {}", d->url()));
+            LERROR(std::format("Error downloading file from URL: {}", d->url()));
             continue;
         }
 
@@ -381,7 +381,7 @@ bool UrlSynchronization::trySyncUrls() {
         if (ec) {
             LERRORC(
                 "URLSynchronization",
-                fmt::format("Error renaming file '{}' to '{}'", tempName, originalName)
+                std::format("Error renaming file '{}' to '{}'", tempName, originalName)
             );
 
             failed = true;
diff --git a/modules/touch/src/touchinteraction.cpp b/modules/touch/src/touchinteraction.cpp
index 59c788e193..1822ce108a 100644
--- a/modules/touch/src/touchinteraction.cpp
+++ b/modules/touch/src/touchinteraction.cpp
@@ -741,7 +741,7 @@ void TouchInteraction::computeVelocities(const std::vector<TouchInputHolder>& li
 
     if (pinchConsecCt > 0 && action != InteractionType::PINCH) {
         if (pinchConsecCt > 3) {
-            LDEBUG(fmt::format(
+            LDEBUG(std::format(
                 "PINCH gesture ended with {} drag distance and {} counts",
                 pinchConsecZoomFactor, pinchConsecCt
             ));
@@ -1005,7 +1005,7 @@ void TouchInteraction::step(double dt, bool directTouch) {
                 // Because of heightmaps we need to ensure we don't go through the surface
                 if (_zoomInLimit.value() < nodeRadius) {
 #ifdef TOUCH_DEBUG_PROPERTIES
-                    LINFO(fmt::format(
+                    LINFO(std::format(
                         "Zoom In limit should be larger than anchor "
                         "center to surface, setting it to {}", zoomInBounds
                     ));
@@ -1021,7 +1021,7 @@ void TouchInteraction::step(double dt, bool directTouch) {
 
             // Make sure zoom in limit is not larger than zoom out limit
             if (zoomInBounds > zoomOutBounds) {
-               LWARNING(fmt::format(
+               LWARNING(std::format(
                    "Zoom In Limit should be smaller than Zoom Out Limit",
                     zoomOutBounds
                ));
@@ -1069,7 +1069,7 @@ void TouchInteraction::step(double dt, bool directTouch) {
             }
             else if (currentPosViolatingZoomOutLimit) {
 #ifdef TOUCH_DEBUG_PROPERTIES
-                LINFO(fmt::format(
+                LINFO(std::format(
                     "You are outside zoom out {} limit, only zoom in allowed",
                     zoomOutBounds
                 ));
@@ -1112,7 +1112,7 @@ void TouchInteraction::step(double dt, bool directTouch) {
         //Show velocity status every N frames
         if (++stepVelUpdate >= 60) {
             stepVelUpdate = 0;
-            LINFO(fmt::format(
+            LINFO(std::format(
                 "DistToFocusNode {} stepZoomVelUpdate {}",
                 length(centerToCamera), _vel.zoom
             ));
diff --git a/modules/touch/src/win32_touch.cpp b/modules/touch/src/win32_touch.cpp
index ce08d85ff1..06dff64ab9 100644
--- a/modules/touch/src/win32_touch.cpp
+++ b/modules/touch/src/win32_touch.cpp
@@ -254,7 +254,7 @@ Win32TouchHook::Win32TouchHook(void* nativeWindow) {
         }
 
         if (!gTouchHook) {
-            LINFO(fmt::format("Failed to setup WindowsHook for touch input redirection"));
+            LINFO(std::format("Failed to setup WindowsHook for touch input redirection"));
 #ifdef ENABLE_TUIOMESSAGES
             delete gTuioServer;
 #endif
diff --git a/modules/touch/touchmodule.cpp b/modules/touch/touchmodule.cpp
index 91976bd1bb..6330111fd7 100644
--- a/modules/touch/touchmodule.cpp
+++ b/modules/touch/touchmodule.cpp
@@ -95,7 +95,7 @@ TouchModule::TouchModule()
                 FactoryManager::ref().factory<Renderable>();
 
             if (!fRenderable->hasClass(s)) {
-                LWARNING(fmt::format(
+                LWARNING(std::format(
                     "In property 'DefaultDirectTouchRenderableTypes': '{}' is not a "
                     "registered renderable type. Ignoring", s
                 ));
diff --git a/modules/video/src/videoplayer.cpp b/modules/video/src/videoplayer.cpp
index dd79ab5e45..856a0a9850 100644
--- a/modules/video/src/videoplayer.cpp
+++ b/modules/video/src/videoplayer.cpp
@@ -133,7 +133,7 @@ namespace {
 
 bool checkMpvError(int status) {
     if (status < 0) {
-        LERROR(fmt::format("Libmpv API error: {}", mpv_error_string(status)));
+        LERROR(std::format("Libmpv API error: {}", mpv_error_string(status)));
         return false;
     }
     return true;
@@ -166,7 +166,7 @@ void VideoPlayer::observePropertyMpv(MpvKey key) {
 void VideoPlayer::setPropertyStringMpv(const char* name, const char* value) {
     const int result = mpv_set_property_string(_mpvHandle, name, value);
     if (!checkMpvError(result)) {
-        LWARNING(fmt::format("Error setting property '{}'", name));
+        LWARNING(std::format("Error setting property '{}'", name));
     }
 }
 
@@ -226,7 +226,7 @@ void VideoPlayer::getPropertyAsyncMpv(MpvKey key) {
         formats[key]
     );
     if (!checkMpvError(result)) {
-        LWARNING(fmt::format("Could not find property '{}'", keys[key]));
+        LWARNING(std::format("Could not find property '{}'", keys[key]));
         return;
     }
 }
@@ -234,7 +234,7 @@ void VideoPlayer::getPropertyAsyncMpv(MpvKey key) {
 void VideoPlayer::commandAsyncMpv(const char* cmd[], MpvKey key) {
     const int result = mpv_command_async(_mpvHandle, static_cast<uint64_t>(key), cmd);
     if (!checkMpvError(result)) {
-        LERROR(fmt::format("Could not execute command '{}'", keys[key]));
+        LERROR(std::format("Could not execute command '{}'", keys[key]));
         return;
     }
 }
@@ -579,7 +579,7 @@ void VideoPlayer::handleMpvEvents() {
             break;
         }
         if (!checkMpvError(event->error)) {
-            LWARNING(fmt::format(
+            LWARNING(std::format(
                 "Error at mpv event: {} {}",
                 static_cast<int>(event->event_id), event->reply_userdata
             ));
@@ -603,7 +603,7 @@ void VideoPlayer::handleMpvEvents() {
                 // Validate reply with what we have stored
                 const MpvKey key = static_cast<MpvKey>(event->reply_userdata);
                 if (formats[key] != prop->format) {
-                    LINFO(fmt::format("Wrong format for property '{}'", keys[key]));
+                    LINFO(std::format("Wrong format for property '{}'", keys[key]));
                     break;
                 }
                 getPropertyAsyncMpv(key);
@@ -616,7 +616,7 @@ void VideoPlayer::handleMpvEvents() {
             case MPV_EVENT_LOG_MESSAGE: {
                 mpv_event_log_message* msg =
                     reinterpret_cast<mpv_event_log_message*>(event->data);
-                LINFO(fmt::format("[{}] {}: {}", msg->prefix, msg->level, msg->text));
+                LINFO(std::format("[{}] {}: {}", msg->prefix, msg->level, msg->text));
                 break;
             }
             default: {
@@ -631,7 +631,7 @@ void VideoPlayer::handleMpvProperties(mpv_event* event) {
     const MpvKey key = static_cast<MpvKey>(event->reply_userdata);
 
     if (!event->data) {
-        LERROR(fmt::format("Could not find data for property: {}", keys[key]));
+        LERROR(std::format("Could not find data for property: {}", keys[key]));
         return;
     }
     // Cast event to node or property depending on its format
@@ -641,7 +641,7 @@ void VideoPlayer::handleMpvProperties(mpv_event* event) {
         const int result = mpv_event_to_node(&node, event);
         if (!checkMpvError(result)) {
             LWARNING(
-                fmt::format("Error getting data from libmpv property: {}", keys[key])
+                std::format("Error getting data from libmpv property: {}", keys[key])
             );
         }
     }
@@ -667,7 +667,7 @@ void VideoPlayer::handleMpvProperties(mpv_event* event) {
                 updateFrameDuration();
             }
 
-            LINFO(fmt::format("Duration: {}", *duration));
+            LINFO(std::format("Duration: {}", *duration));
             break;
         }
         case MpvKey::Height: {
@@ -682,7 +682,7 @@ void VideoPlayer::handleMpvProperties(mpv_event* event) {
             }
 
             resizeTexture(glm::ivec2(_videoResolution.x, *height));
-            LINFO(fmt::format("New height: {}", *height));
+            LINFO(std::format("New height: {}", *height));
 
             // Each time a size property is updated, it means libmpv is updating the video
             // so we have to re-render the first frame to show it
@@ -702,7 +702,7 @@ void VideoPlayer::handleMpvProperties(mpv_event* event) {
             }
 
             resizeTexture(glm::ivec2(* width, _videoResolution.y));
-            LINFO(fmt::format("New width: {}", *width));
+            LINFO(std::format("New width: {}", *width));
 
             // Each time a size property is updated, it means libmpv is updating the video
             // so we have to re-render the first frame to show it
@@ -750,7 +750,7 @@ void VideoPlayer::handleMpvProperties(mpv_event* event) {
                 updateFrameDuration();
             }
 
-            LINFO(fmt::format("Detected fps: {}", *fps));
+            LINFO(std::format("Detected fps: {}", *fps));
             _seekThreshold = 2.0 * (1.0 / _fps);
             break;
         }
@@ -860,7 +860,7 @@ double VideoPlayer::correctVideoPlaybackTime() const {
 }
 
 void VideoPlayer::createTexture(glm::ivec2 size) {
-    LINFO(fmt::format("Creating new FBO with width: {} and height: {}", size.x, size.y));
+    LINFO(std::format("Creating new FBO with width: {} and height: {}", size.x, size.y));
 
     if (size.x <= 0 || size.y <= 0) {
         LERROR("Cannot create empty fbo");
@@ -900,7 +900,7 @@ void VideoPlayer::resizeTexture(glm::ivec2 size) {
     const bool isNew = size != _videoResolution;
     if (isValid && isNew) {
         _videoResolution = size;
-        LINFO(fmt::format("Resizing texture: width: {} height: {}", size.x, size.y));
+        LINFO(std::format("Resizing texture: width: {} height: {}", size.x, size.y));
 
         // Delete texture
         _frameTexture = nullptr;
diff --git a/modules/vislab/rendering/renderabledistancelabel.cpp b/modules/vislab/rendering/renderabledistancelabel.cpp
index 05726662c5..3e03e64851 100644
--- a/modules/vislab/rendering/renderabledistancelabel.cpp
+++ b/modules/vislab/rendering/renderabledistancelabel.cpp
@@ -135,7 +135,7 @@ void RenderableDistanceLabel::update(const UpdateData&) {
         distanceText.erase(pos, subStr.size());
 
         // Create final label text and set it
-        const std::string finalText = fmt::format("{} {}", distanceText, unitDescriptor);
+        const std::string finalText = std::format("{} {}", distanceText, unitDescriptor);
         setLabelText(finalText);
 
         // Update placement of label with transformation matrix
@@ -148,14 +148,14 @@ void RenderableDistanceLabel::update(const UpdateData&) {
             _transformationMatrix = glm::translate(glm::dmat4(1.0), goalPos);
         }
         else {
-            LERROR(fmt::format(
+            LERROR(std::format(
                 "Could not find scene graph node '{}' or '{}'",
                 nodeline->start(), nodeline->end()
             ));
         }
     }
     else {
-        LERROR(fmt::format(
+        LERROR(std::format(
             "There is no scenegraph node with id {}", _nodelineId.value()
         ));
         _errorThrown = true;
diff --git a/modules/volume/rawvolumewriter.inl b/modules/volume/rawvolumewriter.inl
index 7b8c5091da..01845da3aa 100644
--- a/modules/volume/rawvolumewriter.inl
+++ b/modules/volume/rawvolumewriter.inl
@@ -100,7 +100,7 @@ void RawVolumeWriter<VoxelType>::write(const RawVolume<VoxelType>& volume) {
     std::ofstream file(_path, std::ios::binary);
 
     if (!file.good()) {
-        throw ghoul::RuntimeError(fmt::format("Could not create file '{}'", _path));
+        throw ghoul::RuntimeError(std::format("Could not create file '{}'", _path));
     }
 
     file.write(buffer, length);
diff --git a/modules/volume/rendering/renderabletimevaryingvolume.cpp b/modules/volume/rendering/renderabletimevaryingvolume.cpp
index 464c140a5e..f936f027aa 100644
--- a/modules/volume/rendering/renderabletimevaryingvolume.cpp
+++ b/modules/volume/rendering/renderabletimevaryingvolume.cpp
@@ -232,7 +232,7 @@ void RenderableTimeVaryingVolume::initializeGL() {
     std::filesystem::path sequenceDir = absPath(_sourceDirectory);
 
     if (!std::filesystem::is_directory(sequenceDir)) {
-        LERROR(fmt::format("Could not load sequence directory '{}'", sequenceDir));
+        LERROR(std::format("Could not load sequence directory '{}'", sequenceDir));
         return;
     }
 
@@ -246,7 +246,7 @@ void RenderableTimeVaryingVolume::initializeGL() {
     // TODO: defer loading of data to later (separate thread or at least not when loading)
     for (std::pair<const double, Timestep>& p : _volumeTimesteps) {
         Timestep& t = p.second;
-        const std::string path = fmt::format(
+        const std::string path = std::format(
             "{}/{}.rawvolume", _sourceDirectory.value(), t.baseName
         );
         RawVolumeReader<float> reader(path, t.metadata.dimensions);
diff --git a/modules/volume/tasks/generaterawvolumetask.cpp b/modules/volume/tasks/generaterawvolumetask.cpp
index 880857d079..159d01aa85 100644
--- a/modules/volume/tasks/generaterawvolumetask.cpp
+++ b/modules/volume/tasks/generaterawvolumetask.cpp
@@ -88,7 +88,7 @@ GenerateRawVolumeTask::GenerateRawVolumeTask(const ghoul::Dictionary& dictionary
 }
 
 std::string GenerateRawVolumeTask::description() {
-    return fmt::format(
+    return std::format(
         "Generate a raw volume with dimenstions: ({}, {}, {}). For each cell, set the "
         "value by evaluating the lua function: `{}`, with three arguments (x, y, z) "
         "ranging from ({}, {}, {}) to ({}, {}, {}). Write raw volume data into '{}' and "
diff --git a/modules/webbrowser/src/browserinstance.cpp b/modules/webbrowser/src/browserinstance.cpp
index 81bbcfa7bc..b2e523e7ea 100644
--- a/modules/webbrowser/src/browserinstance.cpp
+++ b/modules/webbrowser/src/browserinstance.cpp
@@ -88,7 +88,7 @@ void BrowserInstance::loadUrl(const std::string& url) {
     ghoul_assert(_isInitialized, "BrowserInstance should be initialized");
 
     if (!url.empty()) {
-        LDEBUG(fmt::format("Loading URL '{}'", url));
+        LDEBUG(std::format("Loading URL '{}'", url));
         _browser->GetMainFrame()->LoadURL(url);
     }
     else {
@@ -98,7 +98,7 @@ void BrowserInstance::loadUrl(const std::string& url) {
 
 bool BrowserInstance::loadLocalPath(std::string path) {
     if (!std::filesystem::is_regular_file(path)) {
-        LDEBUG(fmt::format("Could not find path '{}', verify that it is correct", path));
+        LDEBUG(std::format("Could not find path '{}', verify that it is correct", path));
         return false;
     }
 
diff --git a/modules/webbrowser/src/cefhost.cpp b/modules/webbrowser/src/cefhost.cpp
index 1ee11dc811..2c6e7870a4 100644
--- a/modules/webbrowser/src/cefhost.cpp
+++ b/modules/webbrowser/src/cefhost.cpp
@@ -28,7 +28,7 @@
 #include <openspace/engine/globalscallbacks.h>
 #include <ghoul/logging/logmanager.h>
 #include <ghoul/misc/profiling.h>
-#include <fmt/format.h>
+#include <format>
 
 #ifdef __APPLE__
 #include <include/wrapper/cef_library_loader.h>
@@ -81,7 +81,7 @@ CefHost::~CefHost() {
 void CefHost::attachDebugSettings(CefSettings &settings) {
     settings.remote_debugging_port = 8088;
 
-    LDEBUG(fmt::format(
+    LDEBUG(std::format(
         "Remote WebBrowser debugging available on http://localhost:{}",
         settings.remote_debugging_port
     ));
diff --git a/modules/webbrowser/src/eventhandler.cpp b/modules/webbrowser/src/eventhandler.cpp
index 174fc00930..df745a55df 100644
--- a/modules/webbrowser/src/eventhandler.cpp
+++ b/modules/webbrowser/src/eventhandler.cpp
@@ -32,7 +32,7 @@
 #include <openspace/interaction/keyboardinputstate.h>
 #include <openspace/navigation/navigationhandler.h>
 #include <ghoul/logging/logmanager.h>
-#include <fmt/format.h>
+#include <ghoul/fmt.h>
 
 namespace {
     constexpr std::string_view _loggerCat = "WebBrowser:EventHandler";
diff --git a/modules/webbrowser/src/screenspacebrowser.cpp b/modules/webbrowser/src/screenspacebrowser.cpp
index c9c6a7d3c2..026c6f9f9a 100644
--- a/modules/webbrowser/src/screenspacebrowser.cpp
+++ b/modules/webbrowser/src/screenspacebrowser.cpp
@@ -136,7 +136,7 @@ bool ScreenSpaceBrowser::deinitializeGL() {
     _renderHandler->setTexture(0);
     _texture = nullptr;
 
-    LDEBUG(fmt::format("Deinitializing ScreenSpaceBrowser: {}", _url.value()));
+    LDEBUG(std::format("Deinitializing ScreenSpaceBrowser: {}", _url.value()));
 
     _browserInstance->close(true);
 
diff --git a/modules/webbrowser/src/webrenderhandler.cpp b/modules/webbrowser/src/webrenderhandler.cpp
index 81c7f75cc8..0bdccd183b 100644
--- a/modules/webbrowser/src/webrenderhandler.cpp
+++ b/modules/webbrowser/src/webrenderhandler.cpp
@@ -25,7 +25,6 @@
 #include <modules/webbrowser/include/webrenderhandler.h>
 
 #include <ghoul/glm.h>
-#include <fmt/format.h>
 #include <ghoul/logging/logmanager.h>
 
 namespace openspace {
diff --git a/modules/webbrowser/webbrowsermodule.cpp b/modules/webbrowser/webbrowsermodule.cpp
index f9a3d60677..61fd0e8360 100644
--- a/modules/webbrowser/webbrowsermodule.cpp
+++ b/modules/webbrowser/webbrowsermodule.cpp
@@ -77,11 +77,11 @@ namespace {
      * \return the absolute path to the file
      */
     std::filesystem::path findHelperExecutable() {
-        const std::filesystem::path execLocation = absPath(fmt::format(
+        const std::filesystem::path execLocation = absPath(std::format(
             "${{BIN}}/{}", SubprocessPath
         ));
         if (!std::filesystem::is_regular_file(execLocation)) {
-            LERROR(fmt::format(
+            LERROR(std::format(
                 "Could not find web helper executable at location: {}", execLocation
             ));
         }
@@ -154,7 +154,7 @@ void WebBrowserModule::internalInitialize(const ghoul::Dictionary& dictionary) {
         _enabled = dictionary.value<bool>("Enabled");
     }
 
-    LDEBUG(fmt::format("CEF using web helper executable: {}", _webHelperLocation));
+    LDEBUG(std::format("CEF using web helper executable: {}", _webHelperLocation));
     _cefHost = std::make_unique<CefHost>(_webHelperLocation.string());
     LDEBUG("Starting CEF... done");
 
@@ -205,7 +205,7 @@ void WebBrowserModule::removeBrowser(BrowserInstance* browser) {
         global::callback::webBrowserPerformanceHotfix = nullptr;
     }
 
-    LDEBUG(fmt::format("Number of browsers stored: {}", _browsers.size()));
+    LDEBUG(std::format("Number of browsers stored: {}", _browsers.size()));
 }
 
 void WebBrowserModule::attachEventHandler(BrowserInstance* browserInstance) {
diff --git a/modules/webgui/webguimodule.cpp b/modules/webgui/webguimodule.cpp
index d9c8fe4f51..5e8ca13470 100644
--- a/modules/webgui/webguimodule.cpp
+++ b/modules/webgui/webguimodule.cpp
@@ -273,10 +273,10 @@ void WebGuiModule::startProcess() {
 
     std::string defaultEndpoint;
     if (!_defaultEndpoint.value().empty()) {
-        defaultEndpoint = fmt::format("--redirect \"{}\"", _defaultEndpoint.value());
+        defaultEndpoint = std::format("--redirect \"{}\"", _defaultEndpoint.value());
     }
 
-    const std::string command = fmt::format(
+    const std::string command = std::format(
         "\"{}\" \"{}\" --directories \"{}\" {} --http-port \"{}\" --ws-address \"{}\" "
         "--ws-port {} --auto-close --local",
         node.string(), absPath(_entryPoint.value()).string(), formattedDirectories,
@@ -288,11 +288,11 @@ void WebGuiModule::startProcess() {
         absPath("${BIN}").string(),
         [](const char* data, size_t n) {
             const std::string str(data, n);
-            LDEBUG(fmt::format("Web GUI server output: {}", str));
+            LDEBUG(std::format("Web GUI server output: {}", str));
         },
         [](const char* data, size_t n) {
             const std::string str(data, n);
-            LERROR(fmt::format("Web GUI server error: {}", str));
+            LERROR(std::format("Web GUI server error: {}", str));
         }
     );
 }
diff --git a/src/data/csvloader.cpp b/src/data/csvloader.cpp
index 7ab566f015..4fa73168d2 100644
--- a/src/data/csvloader.cpp
+++ b/src/data/csvloader.cpp
@@ -80,7 +80,7 @@ Dataset loadCsvFile(std::filesystem::path filePath, std::optional<DataMapping> s
     );
 
     if (rows.size() < 2) {
-        LWARNING(fmt::format(
+        LWARNING(std::format(
             "Error loading data file '{}'. No data items read", filePath
         ));
         return Dataset();
@@ -145,7 +145,7 @@ Dataset loadCsvFile(std::filesystem::path filePath, std::optional<DataMapping> s
     if (specs.has_value()) {
         bool hasAllProvided = specs->checkIfAllProvidedColumnsExist(columns);
         if (!hasAllProvided) {
-            LERROR(fmt::format(
+            LERROR(std::format(
                 "Error loading data file {}. Not all columns provided in data mapping "
                 "exists in dataset", filePath
             ));
@@ -156,13 +156,13 @@ Dataset loadCsvFile(std::filesystem::path filePath, std::optional<DataMapping> s
     bool hasTextureIndex = (res.textureDataIndex >= 0);
 
     if (hasProvidedTextureFile && !hasTextureIndex && !specs->textureColumn.has_value()) {
-        throw ghoul::RuntimeError(fmt::format(
+        throw ghoul::RuntimeError(std::format(
             "Error loading data file {}. No texture column was specified in the data "
             "mapping", filePath
         ));
     }
     if (!hasProvidedTextureFile && hasTextureIndex) {
-        throw ghoul::RuntimeError(fmt::format(
+        throw ghoul::RuntimeError(std::format(
             "Error loading data file {}. Missing texture map file location in data "
             "mapping", filePath
         ));
@@ -170,12 +170,12 @@ Dataset loadCsvFile(std::filesystem::path filePath, std::optional<DataMapping> s
 
     if (xColumn < 0 || yColumn < 0 || zColumn < 0) {
         // One or more position columns weren't read
-        LERROR(fmt::format(
+        LERROR(std::format(
             "Error loading data file '{}'. Missing X, Y or Z position column", filePath
         ));
     }
 
-    LINFO(fmt::format("Loading {} rows with {} columns", rows.size(), columns.size()));
+    LINFO(std::format("Loading {} rows with {} columns", rows.size(), columns.size()));
     ProgressBar progress = ProgressBar(static_cast<int>(rows.size()));
 
     std::set<int> uniqueTextureIndicesInData;
@@ -239,7 +239,7 @@ Dataset loadCsvFile(std::filesystem::path filePath, std::optional<DataMapping> s
     if (hasProvidedTextureFile) {
         const std::filesystem::path path = *specs->textureMap;
         if (!std::filesystem::is_regular_file(path)) {
-            throw ghoul::RuntimeError(fmt::format(
+            throw ghoul::RuntimeError(std::format(
                 "Failed to open texture map file {}", path
             ));
         }
@@ -256,7 +256,7 @@ std::vector<Dataset::Texture> loadTextureMapFile(std::filesystem::path path,
 
     std::ifstream file(path);
     if (!file.good()) {
-        throw ghoul::RuntimeError(fmt::format(
+        throw ghoul::RuntimeError(std::format(
             "Failed to open texture map file {}", path
         ));
     }
@@ -282,7 +282,7 @@ std::vector<Dataset::Texture> loadTextureMapFile(std::filesystem::path path,
         ));
 
         if (nNonEmptyTokens > 2) {
-            throw ghoul::RuntimeError(fmt::format(
+            throw ghoul::RuntimeError(std::format(
                 "Error loading texture map file {}: Line {} has too many parameters. "
                 "Expected 2: an integer index followed by a filename, where the file "
                 "name may not include whitespaces",
@@ -299,7 +299,7 @@ std::vector<Dataset::Texture> loadTextureMapFile(std::filesystem::path path,
 
         for (const Dataset::Texture& t : res) {
             if (t.index == texture.index) {
-                throw ghoul::RuntimeError(fmt::format(
+                throw ghoul::RuntimeError(std::format(
                     "Error loading texture map file {}: Texture index '{}' defined twice",
                     path, texture.index
                 ));
diff --git a/src/data/dataloader.cpp b/src/data/dataloader.cpp
index a97327ad0b..c1815e60e8 100644
--- a/src/data/dataloader.cpp
+++ b/src/data/dataloader.cpp
@@ -47,7 +47,7 @@ namespace {
     template <typename T, typename U>
     void checkSize(U value, std::string_view message) {
         if (value > std::numeric_limits<U>::max()) {
-            throw ghoul::RuntimeError(fmt::format("Error saving file '{}'", message));
+            throw ghoul::RuntimeError(std::format("Error saving file '{}'", message));
         }
     }
 
@@ -87,7 +87,7 @@ namespace {
         if (std::filesystem::exists(cached)) {
             LINFOC(
                 "DataLoader",
-                fmt::format("Cached file {} used for file {}", cached, filePath)
+                std::format("Cached file {} used for file {}", cached, filePath)
             );
 
             std::optional<T> dataset = loadCacheFunction(cached);
@@ -99,7 +99,7 @@ namespace {
                 FileSys.cacheManager()->removeCacheFile(cached);
             }
         }
-        LINFOC("DataLoader", fmt::format("Loading file '{}'", filePath));
+        LINFOC("DataLoader", std::format("Loading file '{}'", filePath));
         T dataset = loadFunction(filePath, specs);
 
         if (!dataset.entries.empty()) {
@@ -120,7 +120,7 @@ Dataset loadFile(std::filesystem::path path, std::optional<DataMapping> specs) {
 
     const std::ifstream file = std::ifstream(path);
     if (!file.good()) {
-        throw ghoul::RuntimeError(fmt::format("Failed to open data file '{}'", path));
+        throw ghoul::RuntimeError(std::format("Failed to open data file '{}'", path));
     }
 
     const std::string extension = ghoul::toLowerCase(path.extension().string());
@@ -133,7 +133,7 @@ Dataset loadFile(std::filesystem::path path, std::optional<DataMapping> specs) {
         res = speck::loadSpeckFile(path, std::move(specs));
     }
     else {
-        LERRORC("DataLoader", fmt::format(
+        LERRORC("DataLoader", std::format(
             "Could not read data file '{}'. File format '{}' is not supported",
             path, path.extension()
         ));
@@ -349,7 +349,7 @@ Labelset loadFile(std::filesystem::path path, std::optional<DataMapping>) {
 
     const std::ifstream file = std::ifstream(path);
     if (!file.good()) {
-        throw ghoul::RuntimeError(fmt::format("Failed to open dataset file '{}'", path));
+        throw ghoul::RuntimeError(std::format("Failed to open dataset file '{}'", path));
     }
 
     const std::string extension = ghoul::toLowerCase(path.extension().string());
@@ -359,7 +359,7 @@ Labelset loadFile(std::filesystem::path path, std::optional<DataMapping>) {
         res = speck::loadLabelFile(path);
     }
     else {
-        LERRORC("DataLoader", fmt::format(
+        LERRORC("DataLoader", std::format(
             "Could not read label data file '{}'. File format '{}' is not supported",
             path, path.extension()
         ));
@@ -469,7 +469,7 @@ Labelset loadFromDataset(const Dataset& dataset) {
         label.position = entry.position;
         label.text = entry.comment.value_or("MISSING LABEL");
         // @TODO: make is possible to configure this identifier?
-        label.identifier = fmt::format("Point-{}", count);
+        label.identifier = std::format("Point-{}", count);
         res.entries.push_back(std::move(label));
     }
 
@@ -485,7 +485,7 @@ ColorMap loadFile(std::filesystem::path path, std::optional<DataMapping>) {
 
     const std::ifstream file = std::ifstream(path);
     if (!file.good()) {
-        throw ghoul::RuntimeError(fmt::format("Failed to open colormap file '{}'", path));
+        throw ghoul::RuntimeError(std::format("Failed to open colormap file '{}'", path));
     }
 
     const std::string extension = ghoul::toLowerCase(path.extension().string());
@@ -495,7 +495,7 @@ ColorMap loadFile(std::filesystem::path path, std::optional<DataMapping>) {
         res = speck::loadCmapFile(path);
     }
     else {
-        LERRORC("DataLoader", fmt::format(
+        LERRORC("DataLoader", std::format(
             "Could not read color map file '{}'. File format '{}' is not supported",
             path, path.extension()
         ));
diff --git a/src/data/datamapping.cpp b/src/data/datamapping.cpp
index 0d14002a2e..9907d49ba5 100644
--- a/src/data/datamapping.cpp
+++ b/src/data/datamapping.cpp
@@ -186,7 +186,7 @@ bool DataMapping::checkIfAllProvidedColumnsExist(
                                             std::string_view key)
     {
         if (col.has_value() && !containsColumn(*col, columns, isCaseSensitive)) {
-            LWARNING(fmt::format("Could not find provided {} column: '{}'", key, *col));
+            LWARNING(std::format("Could not find provided {} column: '{}'", key, *col));
             return false;
         }
         return true;
@@ -208,7 +208,7 @@ std::string generateHashString(const DataMapping& dm) {
     }
     unsigned int excludeColumnsHash = ghoul::hashCRC32(a);
 
-    return fmt::format(
+    return std::format(
         "DM|{}|{}|{}|{}|{}|{}|{}|{}",
         dm.xColumnName.value_or(""),
         dm.yColumnName.value_or(""),
diff --git a/src/data/speckloader.cpp b/src/data/speckloader.cpp
index 9dc2e3e6db..e4a8c2e1cd 100644
--- a/src/data/speckloader.cpp
+++ b/src/data/speckloader.cpp
@@ -76,7 +76,7 @@ Dataset loadSpeckFile(std::filesystem::path path, std::optional<DataMapping> spe
 
     std::ifstream file(path);
     if (!file.good()) {
-        throw ghoul::RuntimeError(fmt::format("Failed to open speck file '{}'", path));
+        throw ghoul::RuntimeError(std::format("Failed to open speck file '{}'", path));
     }
 
     Dataset res;
@@ -129,7 +129,7 @@ Dataset loadSpeckFile(std::filesystem::path path, std::optional<DataMapping> spe
             // texturevar <idx>
             // where <idx> is the data value index where the texture index is stored
             if (res.textureDataIndex != -1) {
-                throw ghoul::RuntimeError(fmt::format(
+                throw ghoul::RuntimeError(std::format(
                     "Error loading speck file '{}': Texturevar defined twice", path
                 ));
             }
@@ -148,7 +148,7 @@ Dataset loadSpeckFile(std::filesystem::path path, std::optional<DataMapping> spe
             // starts. There are 6 values stored in total, xyz + uvw
 
             if (res.orientationDataIndex != -1) {
-                throw ghoul::RuntimeError(fmt::format(
+                throw ghoul::RuntimeError(std::format(
                     "Error loading speck file '{}': Orientation index defined twice", path
                 ));
             }
@@ -184,7 +184,7 @@ Dataset loadSpeckFile(std::filesystem::path path, std::optional<DataMapping> spe
             ));
 
             if (nNonEmptyTokens > 4) {
-                throw ghoul::RuntimeError(fmt::format(
+                throw ghoul::RuntimeError(std::format(
                     "Error loading speck file {}: Too many arguments for texture on line {}",
                     path, currentLineNumber
                 ));
@@ -205,7 +205,7 @@ Dataset loadSpeckFile(std::filesystem::path path, std::optional<DataMapping> spe
 
             for (const Dataset::Texture& t : res.textures) {
                 if (t.index == texture.index) {
-                    throw ghoul::RuntimeError(fmt::format(
+                    throw ghoul::RuntimeError(std::format(
                         "Error loading speck file '{}': Texture index '{}' defined twice",
                         path, texture.index
                     ));
@@ -224,7 +224,7 @@ Dataset loadSpeckFile(std::filesystem::path path, std::optional<DataMapping> spe
         // If we get this far, we had an illegal header as it wasn't an empty line and
         // didn't start with either '#' denoting a comment line, and didn't start with
         // either the 'datavar', 'texturevar', 'polyorivar', or 'texture' keywords
-        throw ghoul::RuntimeError(fmt::format(
+        throw ghoul::RuntimeError(std::format(
             "Error in line {} while reading the header information of file '{}'. Line is "
             "neither a comment line, nor starts with one of the supported keywords for "
             "SPECK files",
@@ -273,7 +273,7 @@ Dataset loadSpeckFile(std::filesystem::path path, std::optional<DataMapping> spe
         // If the first character is a digit, we have left the preamble and are in the
         // data section of the file
         if (!std::isdigit(line[0]) && line[0] != '-') {
-            throw ghoul::RuntimeError(fmt::format(
+            throw ghoul::RuntimeError(std::format(
                 "Error loading speck file '{}': Header information and datasegment "
                 "intermixed", path
             ));
@@ -297,7 +297,7 @@ Dataset loadSpeckFile(std::filesystem::path path, std::optional<DataMapping> spe
         if (!str.good()) {
             // Need to subtract one of the line number here as we increase the current
             // line count in the beginning of the while loop we are currently in
-            throw ghoul::RuntimeError(fmt::format(
+            throw ghoul::RuntimeError(std::format(
                 "Error loading position information out of data line {} in file '{}'. "
                 "Value was not a number",
                 currentLineNumber - 1, path
@@ -331,7 +331,7 @@ Dataset loadSpeckFile(std::filesystem::path path, std::optional<DataMapping> spe
                     // Need to subtract one of the line number here as we increase the
                     // current line count in the beginning of the while loop we are
                     // currently in
-                    throw ghoul::RuntimeError(fmt::format(
+                    throw ghoul::RuntimeError(std::format(
                         "Error loading data value {} out of data line {} in file '{}'. "
                         "Value was not a number",
                         i, currentLineNumber - 1, path
@@ -376,7 +376,7 @@ Labelset loadLabelFile(std::filesystem::path path) {
 
     std::ifstream file(path);
     if (!file.good()) {
-        throw ghoul::RuntimeError(fmt::format("Failed to open dataset file '{}'", path));
+        throw ghoul::RuntimeError(std::format("Failed to open dataset file '{}'", path));
     }
 
     Labelset res;
@@ -410,7 +410,7 @@ Labelset loadLabelFile(std::filesystem::path path) {
             // really sure how these configuration files work, but they don't seem to be
             // included in the speck file)
             if (res.textColorIndex != -1) {
-                throw ghoul::RuntimeError(fmt::format(
+                throw ghoul::RuntimeError(std::format(
                     "Error loading label file '{}': Textcolor defined twice", path
                 ));
             }
@@ -448,7 +448,7 @@ Labelset loadLabelFile(std::filesystem::path path) {
         // If the first character is a digit, we have left the preamble and are in the
         // data section of the file
         if (!std::isdigit(line[0]) && line[0] != '-') {
-            throw ghoul::RuntimeError(fmt::format(
+            throw ghoul::RuntimeError(std::format(
                 "Error loading label file '{}': Header information and datasegment "
                 "intermixed", path
             ));
@@ -477,7 +477,7 @@ Labelset loadLabelFile(std::filesystem::path path) {
             rest = rest.substr(index);
         }
         if (!startsWith(rest, "text")) {
-            throw ghoul::RuntimeError(fmt::format(
+            throw ghoul::RuntimeError(std::format(
                 "Error loading label file '{}': File contains an unsupported value "
                 "between positions and text label", path
             ));
@@ -510,7 +510,7 @@ ColorMap loadCmapFile(std::filesystem::path path) {
 
     std::ifstream file = std::ifstream(path);
     if (!file.good()) {
-        throw ghoul::RuntimeError(fmt::format(
+        throw ghoul::RuntimeError(std::format(
             "Failed to open color map file '{}'", path
         ));
     }
@@ -575,7 +575,7 @@ ColorMap loadCmapFile(std::filesystem::path path) {
     res.entries.shrink_to_fit();
 
     if (nColorLines != static_cast<int>(res.entries.size())) {
-        LWARNINGC("SpeckLoader", fmt::format(
+        LWARNINGC("SpeckLoader", std::format(
             "While loading color map '{}', the expected number of color values '{}' was "
             "different from the actual number of color values '{}'",
             path, nColorLines, res.entries.size()
diff --git a/src/documentation/documentation.cpp b/src/documentation/documentation.cpp
index 9c74ff5fc2..a7820bc02f 100644
--- a/src/documentation/documentation.cpp
+++ b/src/documentation/documentation.cpp
@@ -74,15 +74,15 @@ std::string to_string(const openspace::documentation::TestResult& value) {
         stream << "Specification Failure. ";
 
         for (const TestResult::Offense& offense : value.offenses) {
-            stream << fmt::format(" {}", ghoul::to_string(offense));
+            stream << std::format(" {}", ghoul::to_string(offense));
             if (!offense.explanation.empty()) {
-                stream << fmt::format(" ({})", offense.explanation);
+                stream << std::format(" ({})", offense.explanation);
             }
             stream << '\n';
         }
 
         for (const TestResult::Warning& warning : value.warnings) {
-            stream << fmt::format(" {}\n", ghoul::to_string(warning));
+            stream << std::format(" {}\n", ghoul::to_string(warning));
         }
 
         return stream.str();
@@ -95,7 +95,7 @@ std::string to_string(const openspace::documentation::TestResult::Offense& value
     stream << value.offender + ": " + ghoul::to_string(value.reason);
 
     if (!value.explanation.empty()) {
-        stream << fmt::format(" ({})", value.explanation);
+        stream << std::format(" ({})", value.explanation);
     }
 
     return stream.str();
@@ -159,7 +159,7 @@ void logError(const SpecificationError& error, std::string component) {
         LERRORC(error.component, error.message);
     }
     else {
-        LERRORC(fmt::format("{}: {}", component, error.component), error.message);
+        LERRORC(std::format("{}: {}", component, error.component), error.message);
     }
     for (const documentation::TestResult::Offense& o : error.result.offenses) {
         if (o.explanation.empty()) {
@@ -168,7 +168,7 @@ void logError(const SpecificationError& error, std::string component) {
         else {
             LERRORC(
                 ghoul::to_string(o.reason),
-                fmt::format("{}: {}", o.offender, o.explanation)
+                std::format("{}: {}", o.offender, o.explanation)
             );
         }
     }
diff --git a/src/documentation/documentationengine.cpp b/src/documentation/documentationengine.cpp
index 89a28af415..42cacd2dd9 100644
--- a/src/documentation/documentationengine.cpp
+++ b/src/documentation/documentationengine.cpp
@@ -41,7 +41,7 @@ DocumentationEngine* DocumentationEngine::_instance = nullptr;
 
 DocumentationEngine::DuplicateDocumentationException::DuplicateDocumentationException(
                                                                         Documentation doc)
-    : ghoul::RuntimeError(fmt::format(
+    : ghoul::RuntimeError(std::format(
         "Duplicate Documentation with name '{}' and id '{}'", doc.name, doc.id
     ))
     , documentation(std::move(doc))
diff --git a/src/documentation/verifier.cpp b/src/documentation/verifier.cpp
index 81a7f36a11..f221454833 100644
--- a/src/documentation/verifier.cpp
+++ b/src/documentation/verifier.cpp
@@ -626,12 +626,12 @@ TestResult TableVerifier::operator()(const ghoul::Dictionary& dictionary,
 
         // Add the 'key' as a prefix to make the new offender a fully qualified identifer
         for (TestResult::Offense& s : res.offenses) {
-            s.offender = fmt::format("{}.{}", key, s.offender);
+            s.offender = std::format("{}.{}", key, s.offender);
         }
 
         // Add the 'key' as a prefix to make the new warning a fully qualified identifer
         for (TestResult::Warning& w : res.warnings) {
-            w.offender = fmt::format("{}.{}", key, w.offender);
+            w.offender = std::format("{}.{}", key, w.offender);
         }
 
         return res;
@@ -718,12 +718,12 @@ TestResult ReferencingVerifier::operator()(const ghoul::Dictionary& dictionary,
 
         // Add the 'key' as a prefix to make the offender a fully qualified identifer
         for (TestResult::Offense& s : r.offenses) {
-            s.offender = fmt::format("{}.{}", key, s.offender);
+            s.offender = std::format("{}.{}", key, s.offender);
         }
 
         // Add the 'key' as a prefix to make the warning a fully qualified identifer
         for (TestResult::Warning& w : r.warnings) {
-            w.offender = fmt::format("{}.{}", key, w.offender);
+            w.offender = std::format("{}.{}", key, w.offender);
         }
 
         return r;
@@ -797,7 +797,7 @@ std::string OrVerifier::type() const {
         types.begin(),
         std::mem_fn(&Verifier::type)
     );
-    types.push_back(fmt::format("or {}", values.back()->type()));
+    types.push_back(std::format("or {}", values.back()->type()));
 
     return ghoul::join(types, ", ");
 }
@@ -811,7 +811,7 @@ std::string OrVerifier::documentation() const {
         documentations.begin(),
         std::mem_fn(&Verifier::documentation)
     );
-    documentations.push_back(fmt::format("or {}", values.back()->documentation()));
+    documentations.push_back(std::format("or {}", values.back()->documentation()));
 
     return ghoul::join(documentations, ", ");
 }
diff --git a/src/engine/configuration.cpp b/src/engine/configuration.cpp
index 9eb8c9d0a4..7f6f1dd0a9 100644
--- a/src/engine/configuration.cpp
+++ b/src/engine/configuration.cpp
@@ -551,7 +551,7 @@ void parseLuaState(Configuration& configuration) {
     if (p.consoleKey.has_value()) {
         const KeyWithModifier km = stringToKey(*p.consoleKey);
         if (km.modifier != KeyModifier::None) {
-            throw ghoul::RuntimeError(fmt::format(
+            throw ghoul::RuntimeError(std::format(
                 "Console key '{}' must be a 'bare' key and cannot contain any modifiers",
                 *p.consoleKey
             ));
@@ -690,7 +690,7 @@ std::filesystem::path findConfiguration(const std::string& filename) {
         if (directory == nextDirectory) {
             // We have reached the root of the file system and did not find the file
             throw ghoul::RuntimeError(
-                fmt::format("Could not find configuration file '{}'", filename),
+                std::format("Could not find configuration file '{}'", filename),
                 "ConfigurationManager"
             );
         }
@@ -707,7 +707,7 @@ Configuration loadConfigurationFromFile(const std::filesystem::path& configurati
     Configuration result;
 
     // Injecting the resolution of the primary screen into the Lua state
-    const std::string script = fmt::format(
+    const std::string script = std::format(
         "ScreenResolution = {{ x = {}, y = {} }}",
         primaryMonitorResolution.x, primaryMonitorResolution.y
     );
diff --git a/src/engine/downloadmanager.cpp b/src/engine/downloadmanager.cpp
index c91e34c528..c3768943ec 100644
--- a/src/engine/downloadmanager.cpp
+++ b/src/engine/downloadmanager.cpp
@@ -140,7 +140,7 @@ std::shared_ptr<DownloadManager::FileFuture> DownloadManager::downloadFile(
     FILE* fp;
     errno_t error = fopen_s(&fp, file.string().c_str(), "wb");
     if (error != 0) {
-        LERROR(fmt::format(
+        LERROR(std::format(
             "Could not open/create file: {}. Errno: {}", file, errno
         ));
     }
@@ -148,7 +148,7 @@ std::shared_ptr<DownloadManager::FileFuture> DownloadManager::downloadFile(
     FILE* fp = fopen(file.string().c_str(), "wb"); // write binary
 #endif // WIN32
     if (!fp) {
-        LERROR(fmt::format(
+        LERROR(std::format(
             "Could not open/create file: {}. Errno: {}", file, errno
         ));
     }
@@ -194,7 +194,7 @@ std::shared_ptr<DownloadManager::FileFuture> DownloadManager::downloadFile(
             else {
                 long rescode = 0;
                 curl_easy_getinfo(curl, CURLINFO_RESPONSE_CODE, &rescode);
-                future->errorMessage = fmt::format(
+                future->errorMessage = std::format(
                     "{}. HTTP code: {}", curl_easy_strerror(res), rescode
                 );
             }
@@ -227,7 +227,7 @@ std::future<DownloadManager::MemoryFile> DownloadManager::fetchFile(
                                                           SuccessCallback successCallback,
                                                               ErrorCallback errorCallback)
 {
-    LDEBUG(fmt::format("Start downloading file '{}' into memory", url));
+    LDEBUG(std::format("Start downloading file '{}' into memory", url));
 
     auto downloadFunction = [url, successCb = std::move(successCallback),
                              errorCb = std::move(errorCallback)]()
@@ -278,7 +278,7 @@ std::future<DownloadManager::MemoryFile> DownloadManager::fetchFile(
                 errorCb(err);
             }
             else {
-                LWARNING(fmt::format("Error downloading '{}': {}", url, err));
+                LWARNING(std::format("Error downloading '{}': {}", url, err));
             }
             curl_easy_cleanup(curl);
             // Set a boolean variable in MemoryFile to determine if it is
diff --git a/src/engine/moduleengine.cpp b/src/engine/moduleengine.cpp
index 4212596462..e098301e56 100644
--- a/src/engine/moduleengine.cpp
+++ b/src/engine/moduleengine.cpp
@@ -97,7 +97,7 @@ void ModuleEngine::initializeGL() {
 
     LDEBUG("Initializing OpenGL of modules");
     for (std::unique_ptr<OpenSpaceModule>& m : _modules) {
-        LDEBUG(fmt::format("Initializing OpenGL of module '{}'", m->identifier()));
+        LDEBUG(std::format("Initializing OpenGL of module '{}'", m->identifier()));
         m->initializeGL();
     }
     LDEBUG("Finished initializing OpenGL of modules");
@@ -109,13 +109,13 @@ void ModuleEngine::deinitialize() {
     LDEBUG("Deinitializing modules");
 
     for (auto mIt = _modules.rbegin(); mIt != _modules.rend(); ++mIt) {
-        LDEBUG(fmt::format("Deinitializing module '{}'", (*mIt)->identifier()));
+        LDEBUG(std::format("Deinitializing module '{}'", (*mIt)->identifier()));
         (*mIt)->deinitialize();
     }
     LDEBUG("Finished deinitializing modules");
 
     for (auto mIt = _modules.rbegin(); mIt != _modules.rend(); ++mIt) {
-        LDEBUG(fmt::format("Destroying module '{}'", (*mIt)->identifier()));
+        LDEBUG(std::format("Destroying module '{}'", (*mIt)->identifier()));
         (*mIt) = nullptr;
     }
     LDEBUG("Finished destroying modules");
@@ -128,7 +128,7 @@ void ModuleEngine::deinitializeGL() {
 
     LDEBUG("Deinitializing OpenGL of modules");
     for (auto mIt = _modules.rbegin(); mIt != _modules.rend(); ++mIt) {
-        LDEBUG(fmt::format("Deinitializing OpenGL of module '{}'", (*mIt)->identifier()));
+        LDEBUG(std::format("Deinitializing OpenGL of module '{}'", (*mIt)->identifier()));
         (*mIt)->deinitializeGL();
 
     }
@@ -149,12 +149,12 @@ void ModuleEngine::registerModule(std::unique_ptr<OpenSpaceModule> module) {
     );
     if (it != _modules.end()) {
         throw ghoul::RuntimeError(
-            fmt::format("Module name '{}' was registered before", module->identifier()),
+            std::format("Module name '{}' was registered before", module->identifier()),
             "ModuleEngine"
         );
     }
 
-    LDEBUG(fmt::format("Registered module '{}'", module->identifier()));
+    LDEBUG(std::format("Registered module '{}'", module->identifier()));
     _modules.push_back(std::move(module));
 }
 
diff --git a/src/engine/openspaceengine.cpp b/src/engine/openspaceengine.cpp
index 18dd74ca45..8ee9db5957 100644
--- a/src/engine/openspaceengine.cpp
+++ b/src/engine/openspaceengine.cpp
@@ -236,11 +236,11 @@ void OpenSpaceEngine::registerPathTokens() {
     using T = std::string;
     for (const std::pair<const T, T>& path : global::configuration->pathTokens) {
         std::string fullKey = "${" + path.first + "}";
-        LDEBUG(fmt::format("Registering path '{}': {}", fullKey, path.second));
+        LDEBUG(std::format("Registering path '{}': {}", fullKey, path.second));
 
         const bool overrideBase = (fullKey == "${BASE}");
         if (overrideBase) {
-            LINFO(fmt::format("Overriding base path with '{}'", path.second));
+            LINFO(std::format("Overriding base path with '{}'", path.second));
         }
 
         const bool overrideTemporary = (fullKey == "${TEMPORARY}");
@@ -273,8 +273,8 @@ void OpenSpaceEngine::initialize() {
     if (global::configuration->usePerProfileCache) {
         cacheFolder = cacheFolder + "-" + global::configuration->profile;
 
-        LINFO(fmt::format("Old cache: {}", absPath("${CACHE}")));
-        LINFO(fmt::format("New cache: {}", cacheFolder));
+        LINFO(std::format("Old cache: {}", absPath("${CACHE}")));
+        LINFO(std::format("New cache: {}", cacheFolder));
         FileSys.registerPathToken(
             "${CACHE}",
             cacheFolder,
@@ -352,13 +352,13 @@ void OpenSpaceEngine::initialize() {
             const std::string ext = file.extension().string();
 
             std::filesystem::path newCandidate = file;
-            newCandidate.replace_filename(fmt::format("{}-{}{}", fname, rot, ext));
+            newCandidate.replace_filename(std::format("{}-{}{}", fname, rot, ext));
 
             std::filesystem::path oldCandidate = file;
             if (rot > 1) {
                 // We don't actually have a -0 version, it is just the base name
                 oldCandidate.replace_filename(
-                    fmt::format("{}-{}{}", fname, rot - 1, ext)
+                    std::format("{}-{}{}", fname, rot - 1, ext)
                 );
             }
 
@@ -399,10 +399,10 @@ void OpenSpaceEngine::initialize() {
     // Process profile file
     std::filesystem::path profile;
     if (!std::filesystem::is_regular_file(global::configuration->profile)) {
-        const std::filesystem::path userCandidate = absPath(fmt::format(
+        const std::filesystem::path userCandidate = absPath(std::format(
             "${{USER_PROFILES}}/{}.profile", global::configuration->profile
         ));
-        const std::filesystem::path profileCandidate = absPath(fmt::format(
+        const std::filesystem::path profileCandidate = absPath(std::format(
             "${{PROFILES}}/{}.profile", global::configuration->profile
         ));
 
@@ -414,7 +414,7 @@ void OpenSpaceEngine::initialize() {
             profile = profileCandidate;
         }
         else {
-            throw ghoul::RuntimeError(fmt::format(
+            throw ghoul::RuntimeError(std::format(
                 "Could not load profile '{}': File does not exist",
                 global::configuration->profile
             ));
@@ -491,7 +491,7 @@ void OpenSpaceEngine::initializeGL() {
     // Check the required OpenGL versions of the registered modules
     const ghoul::systemcapabilities::Version version =
         global::moduleEngine->requiredOpenGLVersion();
-    LINFO(fmt::format("Required OpenGL version: {}", ghoul::to_string(version)));
+    LINFO(std::format("Required OpenGL version: {}", ghoul::to_string(version)));
 
     if (OpenGLCap.openGLVersion() < version) {
         throw ghoul::RuntimeError(
@@ -507,7 +507,7 @@ void OpenSpaceEngine::initializeGL() {
         for (OpenSpaceModule* m : global::moduleEngine->modules()) {
             for (const std::string& ext : m->requiredOpenGLExtensions()) {
                 if (!SysCap.component<OCC>().isExtensionSupported(ext)) {
-                    LFATAL(fmt::format(
+                    LFATAL(std::format(
                         "Module '{}' required OpenGL extension '{}' which is not "
                         "available on this system. Some functionality related to this "
                         "module will probably not work",
@@ -597,7 +597,7 @@ void OpenSpaceEngine::initializeGL() {
                 const std::string s = ghoul::to_string(source);
                 const std::string t = ghoul::to_string(type);
 
-                const std::string cat = fmt::format("OpenGL ({}) [{}] {{{}}}", s, t, id);
+                const std::string cat = std::format("OpenGL ({}) [{}] {{{}}}", s, t, id);
                 switch (severity) {
                     case Severity::High:
                         LERRORC(cat, message);
@@ -619,7 +619,7 @@ void OpenSpaceEngine::initializeGL() {
                     std::string stackString = "Stacktrace\n";
                     std::vector<std::string> stack = ghoul::stackTrace();
                     for (size_t i = 0; i < stack.size(); i++) {
-                        stackString += fmt::format("{}: {}\n", i, stack[i]);
+                        stackString += std::format("{}: {}\n", i, stack[i]);
                     }
                     LDEBUGC(cat, stackString);
                 }
@@ -645,26 +645,26 @@ void OpenSpaceEngine::initializeGL() {
                 case GL_INVALID_ENUM:
                     LERRORC(
                         "OpenGL Invalid State",
-                        fmt::format("Function '{}': GL_INVALID_ENUM", f.function->name())
+                        std::format("Function '{}': GL_INVALID_ENUM", f.function->name())
                     );
                     break;
                 case GL_INVALID_VALUE:
                     LERRORC(
                         "OpenGL Invalid State",
-                        fmt::format("Function '{}': GL_INVALID_VALUE", f.function->name())
+                        std::format("Function '{}': GL_INVALID_VALUE", f.function->name())
                     );
                     break;
                 case GL_INVALID_OPERATION:
                     LERRORC(
                         "OpenGL Invalid State",
-                        fmt::format(
+                        std::format(
                             "Function '{}': GL_INVALID_OPERATION", f.function->name()
                         ));
                     break;
                 case GL_INVALID_FRAMEBUFFER_OPERATION:
                     LERRORC(
                         "OpenGL Invalid State",
-                        fmt::format(
+                        std::format(
                             "Function '{}': GL_INVALID_FRAMEBUFFER_OPERATION",
                             f.function->name()
                         )
@@ -673,13 +673,13 @@ void OpenSpaceEngine::initializeGL() {
                 case GL_OUT_OF_MEMORY:
                     LERRORC(
                         "OpenGL Invalid State",
-                        fmt::format("Function '{}': GL_OUT_OF_MEMORY", f.function->name())
+                        std::format("Function '{}': GL_OUT_OF_MEMORY", f.function->name())
                     );
                     break;
                 default:
                     LERRORC(
                         "OpenGL Invalid State",
-                        fmt::format("Unknown error code: {0:x}", static_cast<int>(error))
+                        std::format("Unknown error code: {0:x}", static_cast<int>(error))
                     );
             }
         });
@@ -910,7 +910,7 @@ void OpenSpaceEngine::runGlobalCustomizationScripts() {
         std::filesystem::path s = absPath(script);
         if (std::filesystem::is_regular_file(s)) {
             try {
-                LINFO(fmt::format("Running global customization script: {}", s));
+                LINFO(std::format("Running global customization script: {}", s));
                 ghoul::lua::runScriptFile(state, s.string());
             }
             catch (const ghoul::RuntimeError& e) {
@@ -918,7 +918,7 @@ void OpenSpaceEngine::runGlobalCustomizationScripts() {
             }
         }
         else {
-            LDEBUG(fmt::format("Ignoring non-existing script file: {}", s));
+            LDEBUG(std::format("Ignoring non-existing script file: {}", s));
         }
     }
 }
@@ -932,15 +932,15 @@ void OpenSpaceEngine::loadFonts() {
         std::filesystem::path fontName = absPath(font.second);
 
         if (!std::filesystem::is_regular_file(fontName)) {
-            LERROR(fmt::format("Could not find font '{}' for key '{}'", fontName, key));
+            LERROR(std::format("Could not find font '{}' for key '{}'", fontName, key));
             continue;
         }
 
-        LDEBUG(fmt::format("Registering font '{}' with key '{}'", fontName, key));
+        LDEBUG(std::format("Registering font '{}' with key '{}'", fontName, key));
         const bool success = global::fontManager->registerFontPath(key, fontName);
 
         if (!success) {
-            LERROR(fmt::format(
+            LERROR(std::format(
                 "Error registering font '{}' with key '{}'", fontName, key
             ));
         }
@@ -1136,13 +1136,13 @@ void OpenSpaceEngine::postSynchronizationPreDraw() {
     int fatalCounter = LogMgr.messageCounter(ghoul::logging::LogLevel::Fatal);
 
     if (warningCounter > 0) {
-        LWARNINGC("Logging", fmt::format("Number of Warnings: {}", warningCounter));
+        LWARNINGC("Logging", std::format("Number of Warnings: {}", warningCounter));
     }
     if (errorCounter > 0) {
-        LWARNINGC("Logging", fmt::format("Number of Errors: {}", errorCounter));
+        LWARNINGC("Logging", std::format("Number of Errors: {}", errorCounter));
     }
     if (fatalCounter > 0) {
-        LWARNINGC("Logging", fmt::format("Number of Fatals: {}", fatalCounter));
+        LWARNINGC("Logging", std::format("Number of Fatals: {}", fatalCounter));
     }
 
     LogMgr.resetMessageCounters();
@@ -1453,7 +1453,7 @@ void OpenSpaceEngine::handleDragDrop(std::filesystem::path file) {
     }
 
     if (lua_isnil(s, -1)) {
-        LWARNING(fmt::format("Unhandled file dropped: {}", file));
+        LWARNING(std::format("Unhandled file dropped: {}", file));
         return;
     }
 
@@ -1514,14 +1514,14 @@ bool OpenSpaceEngine::setMode(Mode newMode) {
         return false;
     }
     else if (_currentMode != Mode::UserControl && newMode != Mode::UserControl) {
-        LERROR(fmt::format(
+        LERROR(std::format(
             "Cannot switch to mode '{}' when in '{}' mode",
             stringify(newMode), stringify(_currentMode)
         ));
         return false;
     }
 
-    LDEBUG(fmt::format("Mode: {}", stringify(newMode)));
+    LDEBUG(std::format("Mode: {}", stringify(newMode)));
 
     _currentMode = newMode;
     return true;
@@ -1529,7 +1529,7 @@ bool OpenSpaceEngine::setMode(Mode newMode) {
 
 void OpenSpaceEngine::resetMode() {
     _currentMode = Mode::UserControl;
-    LDEBUG(fmt::format("Reset engine mode to '{}'", stringify(_currentMode)));
+    LDEBUG(std::format("Reset engine mode to '{}'", stringify(_currentMode)));
 }
 
 OpenSpaceEngine::CallbackHandle OpenSpaceEngine::addModeChangeCallback(
@@ -1603,7 +1603,7 @@ void setCameraFromProfile(const Profile& p) {
 
     auto checkNodeExists = [](const std::string& node) {
         if (global::renderEngine->scene()->sceneGraphNode(node) == nullptr) {
-            throw ghoul::RuntimeError(fmt::format(
+            throw ghoul::RuntimeError(std::format(
                 "Error when setting camera from profile. Could not find node '{}'", node
             ));
         }
@@ -1644,10 +1644,10 @@ void setCameraFromProfile(const Profile& p) {
                 // dependency in this core code. Eventually, goToGeo will be incorporated
                 // in the OpenSpace core and this code will change.
                 checkNodeExists(geo.anchor);
-                std::string geoScript = fmt::format("openspace.globebrowsing.goToGeo"
+                std::string geoScript = std::format("openspace.globebrowsing.goToGeo"
                     "([[{}]], {}, {}", geo.anchor, geo.latitude, geo.longitude);
                 if (geo.altitude.has_value()) {
-                    geoScript += fmt::format(", {}", geo.altitude.value());
+                    geoScript += std::format(", {}", geo.altitude.value());
                 }
                 geoScript += ")";
                 global::scriptEngine->queueScript(
@@ -1707,12 +1707,12 @@ void setActionsFromProfile(const Profile& p) {
             LERROR("Identifier must to provided to register action");
         }
         if (global::actionManager->hasAction(a.identifier)) {
-            LERROR(fmt::format(
+            LERROR(std::format(
                 "Action for identifier '{}' already existed & registered", a.identifier
             ));
         }
         if (a.script.empty()) {
-            LERROR(fmt::format(
+            LERROR(std::format(
                 "Identifier '{}' does not provide a Lua command to execute", a.identifier
             ));
         }
@@ -1733,10 +1733,10 @@ void setKeybindingsFromProfile(const Profile& p) {
             LERROR("Action must not be empty");
         }
         if (!global::actionManager->hasAction(k.action)) {
-            LERROR(fmt::format("Action '{}' does not exist", k.action));
+            LERROR(std::format("Action '{}' does not exist", k.action));
         }
         if (k.key.key == openspace::Key::Unknown) {
-            LERROR(fmt::format(
+            LERROR(std::format(
                 "Could not find key '{}'",
                 std::to_string(static_cast<uint16_t>(k.key.key))
             ));
diff --git a/src/engine/openspaceengine_lua.inl b/src/engine/openspaceengine_lua.inl
index d1aafdb5a6..42efc4ebb0 100644
--- a/src/engine/openspaceengine_lua.inl
+++ b/src/engine/openspaceengine_lua.inl
@@ -66,7 +66,7 @@ namespace {
 
     SceneGraphNode* node = global::renderEngine->scene()->sceneGraphNode(uri);
     if (!node) {
-        throw ghoul::lua::LuaError(fmt::format("Unknown scene graph node '{}'", uri));
+        throw ghoul::lua::LuaError(std::format("Unknown scene graph node '{}'", uri));
     }
 
     node->addTag(std::move(tag));
@@ -78,7 +78,7 @@ namespace {
 
     SceneGraphNode* node = global::renderEngine->scene()->sceneGraphNode(uri);
     if (!node) {
-        throw ghoul::lua::LuaError(fmt::format("Unknown scene graph node '{}'", uri));
+        throw ghoul::lua::LuaError(std::format("Unknown scene graph node '{}'", uri));
     }
 
     node->removeTag(tag);
@@ -90,7 +90,7 @@ namespace {
 {
     using namespace openspace;
 
-    LINFOC("OpenSpaceEngine", fmt::format("Downloading file from '{}'", url));
+    LINFOC("OpenSpaceEngine", std::format("Downloading file from '{}'", url));
     std::shared_ptr<DownloadManager::FileFuture> future =
         global::downloadManager->downloadFile(
             url,
@@ -103,7 +103,7 @@ namespace {
     if (waitForCompletion) {
         while (!future->isFinished && future->errorMessage.empty()) {
             // just wait
-            LTRACEC("OpenSpaceEngine", fmt::format("waiting '{}'", future->errorMessage));
+            LTRACEC("OpenSpaceEngine", std::format("waiting '{}'", future->errorMessage));
         }
     }
 }
@@ -142,7 +142,7 @@ namespace {
     );
     const bool hasCachedFile = std::filesystem::is_regular_file(fileName);
     if (hasCachedFile) {
-        LDEBUGC("OpenSpaceEngine", fmt::format("Cached file '{}' used", fileName));
+        LDEBUGC("OpenSpaceEngine", std::format("Cached file '{}' used", fileName));
         return fileName;
     }
     else {
@@ -220,7 +220,7 @@ namespace {
                                                             bool includeFirstLine = false)
 {
     if (!std::filesystem::exists(file) || !std::filesystem::is_regular_file(file)) {
-        throw ghoul::lua::LuaError(fmt::format("Could not find file '{}'", file));
+        throw ghoul::lua::LuaError(std::format("Could not find file '{}'", file));
     }
 
     std::vector<std::vector<std::string>> res =
@@ -258,7 +258,7 @@ namespace {
  */
 [[codegen::luawrap]] ghoul::Dictionary loadJson(std::filesystem::path path) {
     if (!std::filesystem::exists(path)) {
-        throw ghoul::RuntimeError(fmt::format("File '{}' did not exist", path));
+        throw ghoul::RuntimeError(std::format("File '{}' did not exist", path));
     }
 
     std::ifstream f(path);
diff --git a/src/engine/settings.cpp b/src/engine/settings.cpp
index 8eee78e707..2b6a09b989 100644
--- a/src/engine/settings.cpp
+++ b/src/engine/settings.cpp
@@ -68,7 +68,7 @@ namespace version1 {
                 settings.visibility = properties::Property::Visibility::Developer;
             }
             else {
-                throw ghoul::RuntimeError(fmt::format(
+                throw ghoul::RuntimeError(std::format(
                     "Unknown visibility value '{}'", *visibility
                 ));
             }
@@ -127,7 +127,7 @@ Settings loadSettings(const std::filesystem::path& filename) {
         return version1::parseSettings(setting);
     }
 
-    throw ghoul::RuntimeError(fmt::format(
+    throw ghoul::RuntimeError(std::format(
         "Unrecognized version for setting: {}", version
     ));
 }
diff --git a/src/events/event.cpp b/src/events/event.cpp
index 59bba16046..f1aa87de91 100644
--- a/src/events/event.cpp
+++ b/src/events/event.cpp
@@ -45,12 +45,12 @@ namespace openspace::events {
 
 void log(int i, const EventSceneGraphNodeAdded& e) {
     ghoul_assert(e.type == EventSceneGraphNodeAdded::Type, "Wrong type");
-    LINFO(fmt::format("[{}] SceneGraphNodeAdded: {}", i, e.node));
+    LINFO(std::format("[{}] SceneGraphNodeAdded: {}", i, e.node));
 }
 
 void log(int i, const EventSceneGraphNodeRemoved& e) {
     ghoul_assert(e.type == EventSceneGraphNodeRemoved::Type, "Wrong type");
-    LINFO(fmt::format("[{}] SceneGraphNodeRemoved: {}", i, e.node));
+    LINFO(std::format("[{}] SceneGraphNodeRemoved: {}", i, e.node));
 }
 
 void log(int i, const EventParallelConnection& e) {
@@ -64,12 +64,12 @@ void log(int i, const EventParallelConnection& e) {
             default:                                  throw ghoul::MissingCaseException();
         }
     }(e.state);
-    LINFO(fmt::format("[{}] ParallelConnection ({})", i, state));
+    LINFO(std::format("[{}] ParallelConnection ({})", i, state));
 }
 
 void log(int i, [[ maybe_unused ]] const EventProfileLoadingFinished& e) {
     ghoul_assert(e.type == EventProfileLoadingFinished::Type, "Wrong type");
-    LINFO(fmt::format("[{}] ProfileLoadingFinished", i));
+    LINFO(std::format("[{}] ProfileLoadingFinished", i));
 }
 
 void log(int i, const EventApplicationShutdown& e) {
@@ -82,17 +82,17 @@ void log(int i, const EventApplicationShutdown& e) {
             default:                                  throw ghoul::MissingCaseException();
         }
     }(e.state);
-    LINFO(fmt::format("[{}] ApplicationShutdown", i));
+    LINFO(std::format("[{}] ApplicationShutdown", i));
 }
 
 void log(int i, const EventScreenSpaceRenderableAdded& e) {
     ghoul_assert(e.type == EventScreenSpaceRenderableAdded::Type, "Wrong type");
-    LINFO(fmt::format("[{}] ScreenSpaceRenderableAdded: {}", i, e.renderable));
+    LINFO(std::format("[{}] ScreenSpaceRenderableAdded: {}", i, e.renderable));
 }
 
 void log(int i, const EventScreenSpaceRenderableRemoved& e) {
     ghoul_assert(e.type == EventScreenSpaceRenderableRemoved::Type, "Wrong type");
-    LINFO(fmt::format("[{}] ScreenSpaceRenderableRemoved: {}", i, e.renderable));
+    LINFO(std::format("[{}] ScreenSpaceRenderableRemoved: {}", i, e.renderable));
 }
 
 void log(int i, const EventCameraFocusTransition& e) {
@@ -112,7 +112,7 @@ void log(int i, const EventCameraFocusTransition& e) {
         }
     }(e.transition);
 
-    LINFO(fmt::format(
+    LINFO(std::format(
         "[{}] CameraTransition: {}, {} ({})",
         i, reinterpret_cast<const void*>(e.camera), e.node, t
     ));
@@ -120,7 +120,7 @@ void log(int i, const EventCameraFocusTransition& e) {
 
 void log(int i, const EventTimeOfInterestReached& e) {
     ghoul_assert(e.type == EventTimeOfInterestReached::Type, "Wrong type");
-    LINFO(fmt::format(
+    LINFO(std::format(
         "[{}] TimeOfInterestReached: {},  {}",
         i, e.time->UTC(), reinterpret_cast<const void*>(e.camera)
     ));
@@ -128,32 +128,32 @@ void log(int i, const EventTimeOfInterestReached& e) {
 
 void log(int i, [[ maybe_unused ]] const EventMissionEventReached& e) {
     ghoul_assert(e.type == EventMissionEventReached::Type, "Wrong type");
-    LINFO(fmt::format("[{}] MissionEventReached", i));
+    LINFO(std::format("[{}] MissionEventReached", i));
 }
 
 void log(int i, const EventPlanetEclipsed& e) {
     ghoul_assert(e.type == EventPlanetEclipsed::Type, "Wrong type");
-    LINFO(fmt::format("[{}] PlanetEclipsed: {} -> {}", i, e.eclipsee, e.eclipser));
+    LINFO(std::format("[{}] PlanetEclipsed: {} -> {}", i, e.eclipsee, e.eclipser));
 }
 
 void log(int i, [[ maybe_unused ]] const EventInterpolationFinished& e) {
     ghoul_assert(e.type == EventInterpolationFinished::Type, "Wrong type");
-    LINFO(fmt::format("[{}] InterpolationFinished", i));
+    LINFO(std::format("[{}] InterpolationFinished", i));
 }
 
 void log(int i, const EventFocusNodeChanged& e) {
     ghoul_assert(e.type == EventFocusNodeChanged::Type, "Wrong type");
-    LINFO(fmt::format("[{}] FocusNodeChanged: {} -> {}", i, e.oldNode, e.newNode));
+    LINFO(std::format("[{}] FocusNodeChanged: {} -> {}", i, e.oldNode, e.newNode));
 }
 
 void log(int i, const EventLayerAdded& e) {
     ghoul_assert(e.type == EventLayerAdded::Type, "Wrong type");
-    LINFO(fmt::format("[{}] LayerAdded: {}", i, e.layer));
+    LINFO(std::format("[{}] LayerAdded: {}", i, e.layer));
 }
 
 void log(int i, const EventLayerRemoved& e) {
     ghoul_assert(e.type == EventLayerRemoved::Type, "Wrong type");
-    LINFO(fmt::format("[{}] LayerRemoved: {}", i, e.layer));
+    LINFO(std::format("[{}] LayerRemoved: {}", i, e.layer));
 }
 
 void log(int i, const EventSessionRecordingPlayback& e) {
@@ -169,12 +169,12 @@ void log(int i, const EventSessionRecordingPlayback& e) {
         }
     }(e.state);
 
-    LINFO(fmt::format("[{}] SessionRecordingPlayback: {}", i, state));
+    LINFO(std::format("[{}] SessionRecordingPlayback: {}", i, state));
 }
 
 void log(int i, const EventPointSpacecraft& e) {
     ghoul_assert(e.type == EventPointSpacecraft::Type, "Wrong type");
-    LINFO(fmt::format(
+    LINFO(std::format(
         "[{}] PointSpacecraft: Ra: {}, Dec: {}, Duration: {}", i, e.ra, e.dec,
         e.duration
     ));
@@ -182,17 +182,17 @@ void log(int i, const EventPointSpacecraft& e) {
 
 void log(int i, const EventRenderableEnabled& e) {
     ghoul_assert(e.type == EventRenderableEnabled::Type, "Wrong type");
-    LINFO(fmt::format("[{}] EventRenderableEnabled: {}", i, e.node));
+    LINFO(std::format("[{}] EventRenderableEnabled: {}", i, e.node));
 }
 
 void log(int i, const EventRenderableDisabled& e) {
     ghoul_assert(e.type == EventRenderableDisabled::Type, "Wrong type");
-    LINFO(fmt::format("[{}] EventRenderableDisabled: {}", i, e.node));
+    LINFO(std::format("[{}] EventRenderableDisabled: {}", i, e.node));
 }
 
 void log(int i, const EventCameraPathStarted& e) {
     ghoul_assert(e.type == EventCameraPathStarted::Type, "Wrong type");
-    LINFO(fmt::format(
+    LINFO(std::format(
         "[{}] EventCameraPathStarted:  Origin: '{}'  Destination: '{}'",
         i, e.origin, e.destination
     ));
@@ -200,7 +200,7 @@ void log(int i, const EventCameraPathStarted& e) {
 
 void log(int i, const EventCameraPathFinished& e) {
     ghoul_assert(e.type == EventCameraPathFinished::Type, "Wrong type");
-    LINFO(fmt::format(
+    LINFO(std::format(
         "[{}] EventCameraPathFinished:  Origin: '{}'  Destination: '{}'",
         i, e.origin, e.destination
     ));
@@ -208,12 +208,12 @@ void log(int i, const EventCameraPathFinished& e) {
 
 void log(int i, const EventCameraMovedPosition& e) {
     ghoul_assert(e.type == EventCameraMovedPosition::Type, "Wrong type");
-    LINFO(fmt::format("[{}] EventCameraMovedPosition", i));
+    LINFO(std::format("[{}] EventCameraMovedPosition", i));
 }
 
 void log(int i, const CustomEvent& e) {
     ghoul_assert(e.type == CustomEvent::Type, "Wrong type");
-    LINFO(fmt::format("[{}] CustomEvent: {} ({})", i, e.subtype, e.payload));
+    LINFO(std::format("[{}] CustomEvent: {} ({})", i, e.subtype, e.payload));
 }
 
 std::string_view toString(Event::Type type) {
@@ -318,7 +318,7 @@ Event::Type fromString(std::string_view str) {
         return Event::Type::Custom;
     }
 
-    throw ghoul::RuntimeError(fmt::format("Unknown event type '{}'", str));
+    throw ghoul::RuntimeError(std::format("Unknown event type '{}'", str));
 }
 
 ghoul::Dictionary toParameter(const Event& e) {
diff --git a/src/events/eventengine.cpp b/src/events/eventengine.cpp
index da1f06c9f9..b135b72c13 100644
--- a/src/events/eventengine.cpp
+++ b/src/events/eventengine.cpp
@@ -124,7 +124,7 @@ void EventEngine::unregisterEventAction(uint32_t identifier) {
     }
 
     // If we get this far, we haven't found the identifier
-    throw ghoul::RuntimeError(fmt::format(
+    throw ghoul::RuntimeError(std::format(
         "Could not find event with identifier '{}'", identifier
     ));
 }
@@ -148,13 +148,13 @@ void EventEngine::unregisterEventTopic(size_t topicId, events::Event::Type type)
             }
         }
         else {
-            LWARNING(fmt::format("Could not find registered event '{}' with topicId: {}",
+            LWARNING(std::format("Could not find registered event '{}' with topicId: {}",
                 events::toString(type), topicId)
             );
         }
     }
     else {
-        LWARNING(fmt::format("Could not find registered event '{}'",
+        LWARNING(std::format("Could not find registered event '{}'",
             events::toString(type))
         );
     }
diff --git a/src/interaction/actionmanager.cpp b/src/interaction/actionmanager.cpp
index becc063264..5f72d9cbc1 100644
--- a/src/interaction/actionmanager.cpp
+++ b/src/interaction/actionmanager.cpp
@@ -88,7 +88,7 @@ void ActionManager::triggerAction(const std::string& identifier,
     if (!hasAction(identifier)) {
         LWARNINGC(
             "ActionManager",
-            fmt::format("Action '{}' not found in the list", identifier)
+            std::format("Action '{}' not found in the list", identifier)
         );
         return;
     }
@@ -97,7 +97,7 @@ void ActionManager::triggerAction(const std::string& identifier,
     std::string script =
         arguments.isEmpty() ?
         a.command :
-        fmt::format("args = {}\n{}", ghoul::formatLua(arguments), a.command);
+        std::format("args = {}\n{}", ghoul::formatLua(arguments), a.command);
 
     if (!shouldBeSynchronized || a.isLocal) {
         global::scriptEngine->queueScript(
diff --git a/src/interaction/actionmanager_lua.inl b/src/interaction/actionmanager_lua.inl
index f07d82b63a..be68d6672f 100644
--- a/src/interaction/actionmanager_lua.inl
+++ b/src/interaction/actionmanager_lua.inl
@@ -64,7 +64,7 @@ namespace {
     }
     if (!global::actionManager->hasAction(identifier)) {
         throw ghoul::lua::LuaError(
-            fmt::format("Identifier '{}' for action not found", identifier)
+            std::format("Identifier '{}' for action not found", identifier)
         );
     }
 
@@ -105,7 +105,7 @@ struct [[codegen::Dictionary(Action)]] Action {
     using namespace openspace;
 
     if (global::actionManager->hasAction(action.identifier)) {
-        throw ghoul::lua::LuaError(fmt::format(
+        throw ghoul::lua::LuaError(std::format(
             "Identifier '{}' for action already registered", action.identifier
         ));
     }
@@ -118,7 +118,7 @@ struct [[codegen::Dictionary(Action)]] Action {
     a.guiPath = action.guiPath.value_or(a.guiPath);
     if (!a.guiPath.starts_with('/')) {
         throw ghoul::RuntimeError(
-            fmt::format(
+            std::format(
                 "Tried to register action: '{}'. The field 'GuiPath' is set to '{}' but "
                 "should be '/{}' ", a.name, a.guiPath, a.guiPath)
         );
@@ -141,7 +141,7 @@ struct [[codegen::Dictionary(Action)]] Action {
     }
     if (!global::actionManager->hasAction(identifier)) {
         throw ghoul::lua::LuaError(
-            fmt::format("Identifier '{}' for action not found", identifier)
+            std::format("Identifier '{}' for action not found", identifier)
         );
     }
 
@@ -189,7 +189,7 @@ struct [[codegen::Dictionary(Action)]] Action {
         throw ghoul::lua::LuaError("Identifier must not be empty");
     }
     if (!global::actionManager->hasAction(id)) {
-        throw ghoul::lua::LuaError(fmt::format("Action '{}' not found", id));
+        throw ghoul::lua::LuaError(std::format("Action '{}' not found", id));
     }
 
     // No sync because this is already inside a Lua script, therefor it has
diff --git a/src/interaction/joystickcamerastates.cpp b/src/interaction/joystickcamerastates.cpp
index 66f18db6b3..676130bbe4 100644
--- a/src/interaction/joystickcamerastates.cpp
+++ b/src/interaction/joystickcamerastates.cpp
@@ -162,7 +162,7 @@ void JoystickCameraStates::updateStateFromInput(
                     localRotation.second.y += value;
                     break;
                 case AxisType::Property:
-                    const std::string script = fmt::format(
+                    const std::string script = std::format(
                         "openspace.setPropertyValue('{}', {});",
                         t.propertyUri, value
                     );
@@ -421,7 +421,7 @@ JoystickCameraStates::joystickCameraState(const std::string& joystickName) const
         }
     }
 
-    LWARNING(fmt::format("Cannot find JoystickCameraState with name '{}'", joystickName));
+    LWARNING(std::format("Cannot find JoystickCameraState with name '{}'", joystickName));
     return nullptr;
 }
 
@@ -436,7 +436,7 @@ JoystickCameraStates::findOrAddJoystickCameraState(const std::string& joystickNa
             joystick->joystickName = joystickName;
         }
         else {
-            LWARNING(fmt::format(
+            LWARNING(std::format(
                 "Cannot add more joysticks, only {} joysticks are supported",
                 JoystickInputStates::MaxNumJoysticks
             ));
diff --git a/src/interaction/keybindingmanager_lua.inl b/src/interaction/keybindingmanager_lua.inl
index 6343059530..a6d369110c 100644
--- a/src/interaction/keybindingmanager_lua.inl
+++ b/src/interaction/keybindingmanager_lua.inl
@@ -35,12 +35,12 @@ namespace {
         throw ghoul::lua::LuaError("Action must not be empty");
     }
     if (!global::actionManager->hasAction(action)) {
-        throw ghoul::lua::LuaError(fmt::format("Action '{}' does not exist", action));
+        throw ghoul::lua::LuaError(std::format("Action '{}' does not exist", action));
     }
 
     openspace::KeyWithModifier iKey = openspace::stringToKey(key);
     if (iKey.key == openspace::Key::Unknown) {
-        throw ghoul::lua::LuaError(fmt::format("Could not find key '{}'", key));
+        throw ghoul::lua::LuaError(std::format("Could not find key '{}'", key));
     }
 
     global::keybindingManager->bindKey(iKey.key, iKey.modifier, std::move(action));
diff --git a/src/interaction/sessionrecording.cpp b/src/interaction/sessionrecording.cpp
index b30297c21b..2012271d3e 100644
--- a/src/interaction/sessionrecording.cpp
+++ b/src/interaction/sessionrecording.cpp
@@ -183,7 +183,7 @@ bool SessionRecording::handleRecordingFile(std::string filenameIn) {
     std::filesystem::path absFilename = absPath("${RECORDINGS}/" + filenameIn);
 
     if (std::filesystem::is_regular_file(absFilename)) {
-        LERROR(fmt::format(
+        LERROR(std::format(
             "Unable to start recording; file '{}' already exists", absFilename
         ));
         return false;
@@ -196,7 +196,7 @@ bool SessionRecording::handleRecordingFile(std::string filenameIn) {
     }
 
     if (!_recordFile.is_open() || !_recordFile.good()) {
-        LERROR(fmt::format(
+        LERROR(std::format(
             "Unable to open file '{}' for keyframe recording", absFilename
         ));
         return false;
@@ -266,7 +266,7 @@ void SessionRecording::recordCurrentTimePauseState() {
 }
 
 void SessionRecording::recordCurrentTimeRate() {
-    std::string initialTimeRateCommand = fmt::format(
+    std::string initialTimeRateCommand = std::format(
         "openspace.time.setDeltaTime({})", global::timeManager->targetDeltaTime()
     );
     saveScriptKeyframeToPropertiesBaseline(std::move(initialTimeRateCommand));
@@ -426,7 +426,7 @@ bool SessionRecording::startPlayback(std::string& filename,
     }
 
     if (!_playbackFile.is_open() || !_playbackFile.good()) {
-        LERROR(fmt::format(
+        LERROR(std::format(
             "Unable to open file '{}' for keyframe playback", absFilename.c_str()
         ));
         stopPlayback();
@@ -464,7 +464,7 @@ bool SessionRecording::startPlayback(std::string& filename,
         return false;
     }
 
-    LINFO(fmt::format(
+    LINFO(std::format(
         "Playback session started: ({:8.3f},0.0,{:13.3f}) with {}/{}/{} entries, "
         "forceTime={}",
         now, _timestampPlaybackStarted_simulation, _keyframesCamera.size(),
@@ -972,7 +972,7 @@ void SessionRecording::savePropertyBaseline(properties::Property& prop) {
             != _propertyBaselinesSaved.end()
             );
         if (!isPropAlreadySaved) {
-            const std::string initialScriptCommand = fmt::format(
+            const std::string initialScriptCommand = std::format(
                 "openspace.setPropertyValueSingle(\"{}\", {})",
                 propIdentifier, prop.stringValue()
             );
@@ -1047,7 +1047,7 @@ void SessionRecording::render() {
         glm::vec4(1.f),
         ghoul::fontrendering::CrDirection::Down
     );
-    const std::string text2 = fmt::format(
+    const std::string text2 = std::format(
         "Scale: {}", global::navigationHandler->camera()->scaling()
     );
     ghoul::fontrendering::RenderFont(*font, penPosition, text2, glm::vec4(1.f));
@@ -1081,7 +1081,7 @@ bool SessionRecording::playbackAddEntriesToTimeline() {
             unsigned char frameType = readFromPlayback<unsigned char>(_playbackFile);
             // Check if have reached EOF
             if (!_playbackFile) {
-                LINFO(fmt::format(
+                LINFO(std::format(
                     "Finished parsing {} entries from playback file '{}'",
                     _playbackLineNum - 1, _playbackFilename
                 ));
@@ -1097,7 +1097,7 @@ bool SessionRecording::playbackAddEntriesToTimeline() {
                 parsingStatusOk = playbackScript();
             }
             else {
-                LERROR(fmt::format(
+                LERROR(std::format(
                     "Unknown frame type {} @ index {} of playback file '{}'",
                     frameType, _playbackLineNum - 1, _playbackFilename
                 ));
@@ -1115,7 +1115,7 @@ bool SessionRecording::playbackAddEntriesToTimeline() {
             std::istringstream iss(_playbackLineParsing);
             std::string entryType;
             if (!(iss >> entryType)) {
-                LERROR(fmt::format(
+                LERROR(std::format(
                     "Error reading entry type @ line {} of playback file '{}'",
                     _playbackLineNum, _playbackFilename
                 ));
@@ -1135,7 +1135,7 @@ bool SessionRecording::playbackAddEntriesToTimeline() {
                 continue;
             }
             else {
-                LERROR(fmt::format(
+                LERROR(std::format(
                     "Unknown frame type {} @ line {} of playback file '{}'",
                     entryType, _playbackLineNum, _playbackFilename
                 ));
@@ -1143,7 +1143,7 @@ bool SessionRecording::playbackAddEntriesToTimeline() {
                 break;
             }
         }
-        LINFO(fmt::format(
+        LINFO(std::format(
             "Finished parsing {} entries from playback file '{}'",
             _playbackLineNum, _playbackFilename
         ));
@@ -1323,14 +1323,14 @@ bool SessionRecording::readCameraKeyframeBinary(Timestamps& times,
         kf.read(&file);
     }
     catch (std::bad_alloc&) {
-        LERROR(fmt::format(
+        LERROR(std::format(
             "Allocation error with camera playback from keyframe entry {}",
             lineN - 1
         ));
         return false;
     }
     catch (std::length_error&) {
-        LERROR(fmt::format(
+        LERROR(std::format(
             "length_error with camera playback from keyframe entry {}",
             lineN - 1
         ));
@@ -1338,7 +1338,7 @@ bool SessionRecording::readCameraKeyframeBinary(Timestamps& times,
     }
 
     if (!file) {
-        LINFO(fmt::format(
+        LINFO(std::format(
             "Error reading camera playback from keyframe entry {}",
             lineN - 1
         ));
@@ -1361,7 +1361,7 @@ bool SessionRecording::readCameraKeyframeAscii(Timestamps& times,
     kf._timestamp = times.timeOs;
 
     if (iss.fail() || !iss.eof()) {
-        LERROR(fmt::format("Error parsing camera line {} of playback file", lineN));
+        LERROR(std::format("Error parsing camera line {} of playback file", lineN));
         return false;
     }
     return true;
@@ -1453,14 +1453,14 @@ bool SessionRecording::readTimeKeyframeBinary(Timestamps& times,
         kf.read(&file);
     }
     catch (std::bad_alloc&) {
-        LERROR(fmt::format(
+        LERROR(std::format(
             "Allocation error with time playback from keyframe entry {}",
             lineN - 1
         ));
         return false;
     }
     catch (std::length_error&) {
-        LERROR(fmt::format(
+        LERROR(std::format(
             "length_error with time playback from keyframe entry {}",
             lineN - 1
         ));
@@ -1468,7 +1468,7 @@ bool SessionRecording::readTimeKeyframeBinary(Timestamps& times,
     }
 
     if (!file) {
-        LERROR(fmt::format(
+        LERROR(std::format(
             "Error reading time playback from keyframe entry {}", lineN - 1
         ));
         return false;
@@ -1489,7 +1489,7 @@ bool SessionRecording::readTimeKeyframeAscii(Timestamps& times,
     kf.read(iss);
 
     if (iss.fail() || !iss.eof()) {
-        LERROR(fmt::format(
+        LERROR(std::format(
             "Error parsing time line {} of playback file", lineN
         ));
         return false;
@@ -1561,7 +1561,7 @@ void SessionRecording::checkIfScriptUsesScenegraphNode(std::string s) {
             if (navNode != "nil") {
                 auto it = std::find(_loadedNodes.begin(), _loadedNodes.end(), navNode);
                 if (it == _loadedNodes.end()) {
-                    LWARNING(fmt::format(
+                    LWARNING(std::format(
                         "Playback file contains a property setting of navigation using "
                         "scenegraph node '{}', which is not currently loaded", navNode
                     ));
@@ -1576,7 +1576,7 @@ void SessionRecording::checkIfScriptUsesScenegraphNode(std::string s) {
                         subjectOfSetProp
                     );
                 if (matchHits.empty()) {
-                    LWARNING(fmt::format(
+                    LWARNING(std::format(
                         "Playback file contains a property setting of scenegraph "
                         "node '{}', which is not currently loaded", found
                     ));
@@ -1668,7 +1668,7 @@ bool SessionRecording::checkIfInitialFocusNodeIsLoaded(unsigned int firstCamInde
         _keyframesCamera[_timeline[firstCamIndex].idxIntoKeyframeTypeArray].focusNode;
     auto it = std::find(_loadedNodes.begin(), _loadedNodes.end(), startFocusNode);
     if (it == _loadedNodes.end()) {
-        LERROR(fmt::format(
+        LERROR(std::format(
             "Playback file requires scenegraph node '{}', which is "
             "not currently loaded", startFocusNode
         ));
@@ -1743,14 +1743,14 @@ bool SessionRecording::readScriptKeyframeBinary(Timestamps& times,
         kf.read(&file);
     }
     catch (std::bad_alloc&) {
-        LERROR(fmt::format(
+        LERROR(std::format(
             "Allocation error with script playback from keyframe entry {}",
             lineN - 1
         ));
         return false;
     }
     catch (std::length_error&) {
-        LERROR(fmt::format(
+        LERROR(std::format(
             "length_error with script playback from keyframe entry {}",
             lineN - 1
         ));
@@ -1758,7 +1758,7 @@ bool SessionRecording::readScriptKeyframeBinary(Timestamps& times,
     }
 
     if (!file) {
-        LERROR(fmt::format(
+        LERROR(std::format(
             "Error reading script playback from keyframe entry {}",
             lineN - 1
         ));
@@ -1778,11 +1778,11 @@ bool SessionRecording::readScriptKeyframeAscii(Timestamps& times,
     iss >> times.timeOs >> times.timeRec >> times.timeSim;
     kf.read(iss);
     if (iss.fail()) {
-        LERROR(fmt::format("Error parsing script line {} of playback file", lineN));
+        LERROR(std::format("Error parsing script line {} of playback file", lineN));
         return false;
     }
     else if (!iss.eof()) {
-        LERROR(fmt::format("Did not find an EOL at line {} of playback file", lineN));
+        LERROR(std::format("Did not find an EOL at line {} of playback file", lineN));
         return false;
     }
     return true;
@@ -1801,7 +1801,7 @@ bool SessionRecording::addKeyframeToTimeline(std::vector<TimelineEntry>& timelin
         });
     }
     catch(...) {
-        LERROR(fmt::format(
+        LERROR(std::format(
             "Timeline memory allocation error trying to add keyframe {}. The playback "
             "file may be too large for system memory",
             lineNum - 1
@@ -2004,7 +2004,7 @@ bool SessionRecording::processNextNonCameraKeyframeAheadInTime() {
             _idxScript = _timeline[_idxTimeline_nonCamera].idxIntoKeyframeTypeArray;
             return processScriptKeyframe();
         default:
-            LERROR(fmt::format(
+            LERROR(std::format(
                 "Bad keyframe type encountered during playback at index {}",
                 _idxTimeline_nonCamera
             ));
@@ -2284,7 +2284,7 @@ void SessionRecording::readFileIntoStringStream(std::string filename,
 {
     std::filesystem::path conversionInFilename = absPath(filename);
     if (!std::filesystem::is_regular_file(conversionInFilename)) {
-        throw ConversionError(fmt::format(
+        throw ConversionError(std::format(
             "Cannot find the specified playback file '{}' to convert",
             conversionInFilename
         ));
@@ -2303,7 +2303,7 @@ void SessionRecording::readFileIntoStringStream(std::string filename,
     }
     stream << inputFstream.rdbuf();
     if (!inputFstream.is_open() || !inputFstream.good()) {
-        throw ConversionError(fmt::format(
+        throw ConversionError(std::format(
             "Unable to open file '{}' for conversion", filename
         ));
     }
@@ -2355,7 +2355,7 @@ std::string SessionRecording::convertFile(std::string filename, int depth) {
         }
         if (depth != 0) {
             conversionOutFilename = determineConversionOutFilename(filename, mode);
-            LINFO(fmt::format(
+            LINFO(std::format(
                 "Starting conversion on rec file '{}', version {} in {} mode. "
                 "Writing result to '{}'",
                 newFilename, fileVersion, (mode == DataMode::Ascii) ? "ascii" : "binary",
@@ -2369,7 +2369,7 @@ std::string SessionRecording::convertFile(std::string filename, int depth) {
                 conversionOutFile.open(conversionOutFilename);
             }
             if (!conversionOutFile.is_open() || !conversionOutFile.good()) {
-                LERROR(fmt::format(
+                LERROR(std::format(
                     "Unable to open file '{}' for conversion result",
                     conversionOutFilename
                 ));
@@ -2422,7 +2422,7 @@ bool SessionRecording::convertEntries(std::string& inFilename,
             unsigned char frameType = readFromPlayback<unsigned char>(inStream);
             // Check if have reached EOF
             if (!inStream) {
-                LINFO(fmt::format(
+                LINFO(std::format(
                     "Finished converting {} entries from playback file '{}'",
                     lineNum - 1, inFilename
                 ));
@@ -2465,7 +2465,7 @@ bool SessionRecording::convertEntries(std::string& inFilename,
                 }
             }
             else {
-                LERROR(fmt::format(
+                LERROR(std::format(
                     "Unknown frame type {} @ index {} of conversion file '{}'",
                     frameType, lineNum - 1, inFilename
                 ));
@@ -2481,7 +2481,7 @@ bool SessionRecording::convertEntries(std::string& inFilename,
             std::istringstream iss(lineParsing);
             std::string entryType;
             if (!(iss >> entryType)) {
-                LERROR(fmt::format(
+                LERROR(std::format(
                     "Error reading entry type @ line {} of conversion file '{}'",
                     lineNum, inFilename
                 ));
@@ -2528,14 +2528,14 @@ bool SessionRecording::convertEntries(std::string& inFilename,
                 continue;
             }
             else {
-                LERROR(fmt::format(
+                LERROR(std::format(
                     "Unknown frame type {} @ line {} of conversion file '{}'",
                     entryType, lineNum, inFilename
                 ));
                 conversionStatusOk = false;
             }
         }
-        LINFO(fmt::format(
+        LINFO(std::format(
             "Finished parsing {} entries from conversion file '{}'",
             lineNum, inFilename
         ));
@@ -2553,7 +2553,7 @@ std::string SessionRecording_legacy_0085::getLegacyConversionResult(std::string
 {
     // This method is overriden in each legacy subclass, but does nothing in this instance
     // as the oldest supported legacy version.
-    LERROR(fmt::format(
+    LERROR(std::format(
         "Version 00.85 is the oldest supported legacy file format; no conversion "
         "can be made. It is possible that file '{}' has a corrupted header or an invalid "
         "file format version number",
diff --git a/src/interaction/tasks/convertrecfileversiontask.cpp b/src/interaction/tasks/convertrecfileversiontask.cpp
index 1bc49b77b8..930f7a0112 100644
--- a/src/interaction/tasks/convertrecfileversiontask.cpp
+++ b/src/interaction/tasks/convertrecfileversiontask.cpp
@@ -54,7 +54,7 @@ ConvertRecFileVersionTask::ConvertRecFileVersionTask(const ghoul::Dictionary& di
 
     ghoul_assert(std::filesystem::is_regular_file(_inFilePath), "The file must exist");
     if (!std::filesystem::is_regular_file(_inFilePath)) {
-        LERROR(fmt::format("Failed to load session recording file: {}", _inFilePath));
+        LERROR(std::format("Failed to load session recording file: {}", _inFilePath));
     }
     else {
         sessRec = new SessionRecording(false);
@@ -66,7 +66,7 @@ ConvertRecFileVersionTask::~ConvertRecFileVersionTask() {
 }
 
 std::string ConvertRecFileVersionTask::description() {
-    std::string description = fmt::format(
+    std::string description = std::format(
         "Convert file format of session recording file '{}' to current version",
         _inFilePath
     );
@@ -87,7 +87,7 @@ void ConvertRecFileVersionTask::convert() {
         SessionRecording::FileExtensionAscii
     );
     if (!hasBinaryFileExtension && !hasAsciiFileExtension) {
-        LERROR(fmt::format(
+        LERROR(std::format(
             "Input filename does not have expected '{}' or '{}' extension",
             SessionRecording::FileExtensionBinary, SessionRecording::FileExtensionAscii
         ));
diff --git a/src/interaction/tasks/convertrecformattask.cpp b/src/interaction/tasks/convertrecformattask.cpp
index 635e13d835..b8010199fb 100644
--- a/src/interaction/tasks/convertrecformattask.cpp
+++ b/src/interaction/tasks/convertrecformattask.cpp
@@ -65,7 +65,7 @@ ConvertRecFormatTask::ConvertRecFormatTask(const ghoul::Dictionary& dictionary)
 
     ghoul_assert(std::filesystem::is_regular_file(_inFilePath), "The file must exist");
     if (!std::filesystem::is_regular_file(_inFilePath)) {
-        LERROR(fmt::format("Failed to load session recording file: {}", _inFilePath));
+        LERROR(std::format("Failed to load session recording file: {}", _inFilePath));
     }
     else {
         _iFile.open(_inFilePath, std::ifstream::in | std::ifstream::binary);
@@ -82,7 +82,7 @@ ConvertRecFormatTask::~ConvertRecFormatTask() {
 
 std::string ConvertRecFormatTask::description() {
     std::string description =
-        fmt::format("Convert session recording file '{}'", _inFilePath);
+        std::format("Convert session recording file '{}'", _inFilePath);
     if (_fileFormatType == SessionRecording::DataMode::Ascii) {
         description += "(ascii format) ";
     }
@@ -92,7 +92,7 @@ std::string ConvertRecFormatTask::description() {
     else {
         description += "(UNKNOWN format) ";
     }
-    description += fmt::format("conversion to file '{}'", _outFilePath);
+    description += std::format("conversion to file '{}'", _outFilePath);
     return description;
 }
 
@@ -116,13 +116,13 @@ void ConvertRecFormatTask::convert() {
     }
 
     if (_inFilePath.extension() != expectedFileExtension_in) {
-        LWARNING(fmt::format(
+        LWARNING(std::format(
             "Input filename doesn't have expected '{}' format file extension",
             currentFormat
         ));
     }
     if (_outFilePath.extension() == expectedFileExtension_in) {
-        LERROR(fmt::format(
+        LERROR(std::format(
             "Output filename has '{}' file extension, but is conversion from '{}'",
             currentFormat, currentFormat
         ));
@@ -172,7 +172,7 @@ void ConvertRecFormatTask::determineFormatType() {
     if (line.substr(0, SessionRecording::FileHeaderTitle.length())
         != SessionRecording::FileHeaderTitle)
     {
-        LERROR(fmt::format(
+        LERROR(std::format(
             "Session recording file '{}' does not have expected header", _inFilePath
         ));
     }
@@ -207,7 +207,7 @@ void ConvertRecFormatTask::convertToAscii() {
         const unsigned char frameType = readFromPlayback<unsigned char>(_iFile);
         // Check if have reached EOF
         if (!_iFile) {
-            LINFO(fmt::format(
+            LINFO(std::format(
                 "Finished converting {} entries from file '{}'", lineNum - 1, _inFilePath
             ));
             break;
@@ -244,7 +244,7 @@ void ConvertRecFormatTask::convertToAscii() {
             skf.write(keyframeLine);
         }
         else {
-            LERROR(fmt::format(
+            LERROR(std::format(
                 "Unknown frame type @ index {} of playback file '{}'",
                 lineNum - 1, _inFilePath
             ));
@@ -275,7 +275,7 @@ void ConvertRecFormatTask::convertToBinary() {
         std::istringstream iss(lineContents);
         std::string entryType;
         if (!(iss >> entryType)) {
-            LERROR(fmt::format(
+            LERROR(std::format(
                 "Error reading entry type @ line {} of file '{}'", lineNum, _inFilePath
             ));
             break;
@@ -300,7 +300,7 @@ void ConvertRecFormatTask::convertToBinary() {
             continue;
         }
         else {
-            LERROR(fmt::format(
+            LERROR(std::format(
                 "Unknown frame type {} @ line {} of file '{}'",
                 entryType, lineContents, _inFilePath
             ));
@@ -308,7 +308,7 @@ void ConvertRecFormatTask::convertToBinary() {
         }
     }
     _oFile.close();
-    LINFO(fmt::format(
+    LINFO(std::format(
         "Finished converting {} entries from file '{}'", lineNum, _inFilePath
     ));
 }
diff --git a/src/interaction/touchbar.mm b/src/interaction/touchbar.mm
index d96f89837f..8cc7149f73 100644
--- a/src/interaction/touchbar.mm
+++ b/src/interaction/touchbar.mm
@@ -190,7 +190,7 @@ NSArray* focusIdentifiers;
 
         NSString* title = [button title];
 
-        std::string str = fmt::format(
+        std::string str = std::format(
             "openspace.setPropertyValueSingle('{}', '{}');\
              openspace.setPropertyValueSingle('{}', '');\
              openspace.setPropertyValueSingle('{}', '');",
diff --git a/src/mission/mission.cpp b/src/mission/mission.cpp
index 4a04fe6bc2..c22dd8441e 100644
--- a/src/mission/mission.cpp
+++ b/src/mission/mission.cpp
@@ -123,7 +123,7 @@ MissionPhase::MissionPhase(const ghoul::Dictionary& dictionary) {
             );
 
             if (!overallTimeRange.includes(timeRangeSubPhases)) {
-                throw ghoul::RuntimeError(fmt::format(
+                throw ghoul::RuntimeError(std::format(
                     "User specified time range must at least include its subphases'",
                     "Mission ({})", _name
                 ));
@@ -148,7 +148,7 @@ MissionPhase::MissionPhase(const ghoul::Dictionary& dictionary) {
             );
         }
         else {
-            throw ghoul::RuntimeError(fmt::format(
+            throw ghoul::RuntimeError(std::format(
                 "If there are no subphases specified, the time range has to be specified",
                 "Mission ({})", _name
             ));
diff --git a/src/navigation/navigationhandler.cpp b/src/navigation/navigationhandler.cpp
index 1312877b70..0b6f8f589c 100644
--- a/src/navigation/navigationhandler.cpp
+++ b/src/navigation/navigationhandler.cpp
@@ -548,7 +548,7 @@ void NavigationHandler::saveNavigationState(const std::filesystem::path& filepat
     if (!referenceFrameIdentifier.empty()) {
         const SceneGraphNode* referenceFrame = sceneGraphNode(referenceFrameIdentifier);
         if (!referenceFrame) {
-            LERROR(fmt::format(
+            LERROR(std::format(
                 "Could not find node '{}' to use as reference frame",
                 referenceFrameIdentifier
             ));
@@ -565,12 +565,12 @@ void NavigationHandler::saveNavigationState(const std::filesystem::path& filepat
         // Adding the .navstate extension to the filepath if it came without one
         absolutePath.replace_extension(".navstate");
     }
-    LINFO(fmt::format("Saving camera position: {}", absolutePath));
+    LINFO(std::format("Saving camera position: {}", absolutePath));
 
     std::ofstream ofs(absolutePath);
 
     if (!ofs.good()) {
-        throw ghoul::RuntimeError(fmt::format(
+        throw ghoul::RuntimeError(std::format(
             "Error saving navigation state to '{}'", filepath
         ));
     }
@@ -582,7 +582,7 @@ void NavigationHandler::loadNavigationState(const std::string& filepath,
                                             bool useTimeStamp)
 {
     std::filesystem::path absolutePath = absPath(filepath);
-    LINFO(fmt::format("Reading camera state from file: {}", absolutePath));
+    LINFO(std::format("Reading camera state from file: {}", absolutePath));
 
     if (!absolutePath.has_extension()) {
         // Adding the .navstate extension to the filepath if it came without one
@@ -600,7 +600,7 @@ void NavigationHandler::loadNavigationState(const std::string& filepath,
     );
 
     if (contents.empty()) {
-        throw::ghoul::RuntimeError(fmt::format(
+        throw::ghoul::RuntimeError(std::format(
             "Failed reading camera state from file: {}. File is empty", absolutePath
         ));
     }
diff --git a/src/navigation/navigationhandler_lua.inl b/src/navigation/navigationhandler_lua.inl
index 3e94397f51..7a805751e6 100644
--- a/src/navigation/navigationhandler_lua.inl
+++ b/src/navigation/navigationhandler_lua.inl
@@ -60,7 +60,7 @@ namespace {
         const SceneGraphNode* referenceFrame = sceneGraphNode(*frame);
         if (!referenceFrame) {
             throw ghoul::lua::LuaError(
-                fmt::format("Could not find node '{}' as reference frame", *frame)
+                std::format("Could not find node '{}' as reference frame", *frame)
             );
         }
         state = global::navigationHandler->navigationState(*referenceFrame);
diff --git a/src/navigation/navigationstate.cpp b/src/navigation/navigationstate.cpp
index c80ce7f44a..a8c2d035c2 100644
--- a/src/navigation/navigationstate.cpp
+++ b/src/navigation/navigationstate.cpp
@@ -174,14 +174,14 @@ CameraPose NavigationState::cameraPose() const {
     const SceneGraphNode* anchorNode = sceneGraphNode(anchor);
 
     if (!anchorNode) {
-        LERROR(fmt::format(
+        LERROR(std::format(
             "Could not find scene graph node '{}' used as anchor", anchor
         ));
         return CameraPose();
     }
 
     if (!referenceFrameNode) {
-        LERROR(fmt::format(
+        LERROR(std::format(
             "Could not find scene graph node '{}' used as reference frame",
             referenceFrame
         ));
diff --git a/src/navigation/orbitalnavigator.cpp b/src/navigation/orbitalnavigator.cpp
index 01baef8f30..f9b801b683 100644
--- a/src/navigation/orbitalnavigator.cpp
+++ b/src/navigation/orbitalnavigator.cpp
@@ -555,7 +555,7 @@ OrbitalNavigator::OrbitalNavigator()
             );
         }
         else {
-            LERROR(fmt::format(
+            LERROR(std::format(
                 "No scenegraph node with identifier '{}' exists", _anchor.value()
             ));
         }
@@ -571,7 +571,7 @@ OrbitalNavigator::OrbitalNavigator()
             setAimNode(node);
         }
         else {
-            LERROR(fmt::format(
+            LERROR(std::format(
                 "No scenegraph node with identifier '{}' exists", _aim.value()
             ));
         }
@@ -1934,7 +1934,7 @@ void OrbitalNavigator::triggerIdleBehavior(std::string_view choice) {
             behavior = IdleBehavior::Behavior::OrbitAroundUp;
         }
         else {
-            throw ghoul::RuntimeError(fmt::format(
+            throw ghoul::RuntimeError(std::format(
                 "No existing IdleBehavior with identifier '{}'", choice
             ));
         }
diff --git a/src/navigation/path.cpp b/src/navigation/path.cpp
index 1a404cd302..4a89772f36 100644
--- a/src/navigation/path.cpp
+++ b/src/navigation/path.cpp
@@ -569,7 +569,7 @@ Path createPathFromDictionary(const ghoul::Dictionary& dictionary,
 
             const SceneGraphNode* targetNode = sceneGraphNode(navigationState.anchor);
             if (!targetNode) {
-                throw ghoul::RuntimeError(fmt::format(
+                throw ghoul::RuntimeError(std::format(
                     "Could not find anchor node '{}' in provided navigation state",
                     navigationState.anchor
                 ));
@@ -587,7 +587,7 @@ Path createPathFromDictionary(const ghoul::Dictionary& dictionary,
             const SceneGraphNode* targetNode = sceneGraphNode(nodeIdentifier);
 
             if (!targetNode) {
-                throw ghoul::RuntimeError(fmt::format(
+                throw ghoul::RuntimeError(std::format(
                     "Could not find target node '{}'", nodeIdentifier
                 ));
             }
diff --git a/src/navigation/pathcurves/avoidcollisioncurve.cpp b/src/navigation/pathcurves/avoidcollisioncurve.cpp
index 82061f8f1e..ebb3286e48 100644
--- a/src/navigation/pathcurves/avoidcollisioncurve.cpp
+++ b/src/navigation/pathcurves/avoidcollisioncurve.cpp
@@ -192,7 +192,7 @@ void AvoidCollisionCurve::removeCollisions(int step) {
             const bool isStartInsideNode = isPointInsideSphere(p1, Center, radius);
             const bool isEndInsideNode = isPointInsideSphere(p2, Center, radius);
             if (isStartInsideNode || isEndInsideNode) {
-                LWARNING(fmt::format(
+                LWARNING(std::format(
                     "Something went wrong! "
                     "At least one point in the path is inside node: {}",
                     node->identifier()
diff --git a/src/navigation/pathnavigator.cpp b/src/navigation/pathnavigator.cpp
index b5410c03fa..c623b79946 100644
--- a/src/navigation/pathnavigator.cpp
+++ b/src/navigation/pathnavigator.cpp
@@ -313,7 +313,7 @@ void PathNavigator::createPath(const ghoul::Dictionary& dictionary) {
         // Do nothing
     }
     catch (const ghoul::RuntimeError& e) {
-        LERROR(fmt::format("Could not create path. Reason: {}", e.message));
+        LERROR(std::format("Could not create path. Reason: {}", e.message));
         return;
     }
 
@@ -436,7 +436,7 @@ double PathNavigator::findValidBoundingSphere(const SceneGraphNode* node) const
     double result = sphere(node);
 
     if (result < _minValidBoundingSphere) {
-        LDEBUG(fmt::format(
+        LDEBUG(std::format(
             "The scene graph node '{}' has no, or a very small, bounding sphere. Using "
             "minimal value of {}. This might lead to unexpected results",
             node->identifier(), _minValidBoundingSphere.value()
diff --git a/src/navigation/pathnavigator_lua.inl b/src/navigation/pathnavigator_lua.inl
index 97d8999681..060fe7f0d5 100644
--- a/src/navigation/pathnavigator_lua.inl
+++ b/src/navigation/pathnavigator_lua.inl
@@ -173,7 +173,7 @@ namespace {
     }
     catch (const documentation::SpecificationError& e) {
         logError(e, "flyToNavigationState");
-        throw ghoul::lua::LuaError(fmt::format("Unable to create a path: {}", e.what()));
+        throw ghoul::lua::LuaError(std::format("Unable to create a path: {}", e.what()));
     }
 
     ghoul::Dictionary instruction;
diff --git a/src/navigation/waypoint.cpp b/src/navigation/waypoint.cpp
index 7fad87329c..bb8be8f1c5 100644
--- a/src/navigation/waypoint.cpp
+++ b/src/navigation/waypoint.cpp
@@ -50,7 +50,7 @@ Waypoint::Waypoint(const glm::dvec3& pos, const glm::dquat& rot, std::string ref
 
     const SceneGraphNode* node = sceneGraphNode(_nodeIdentifier);
     if (!node) {
-        LERROR(fmt::format("Could not find node '{}'", _nodeIdentifier));
+        LERROR(std::format("Could not find node '{}'", _nodeIdentifier));
         return;
     }
 
@@ -62,7 +62,7 @@ Waypoint::Waypoint(const NavigationState& ns) {
     const SceneGraphNode* anchorNode = sceneGraphNode(ns.anchor);
 
     if (!anchorNode) {
-        LERROR(fmt::format("Could not find node '{}' to target", ns.anchor));
+        LERROR(std::format("Could not find node '{}' to target", ns.anchor));
         return;
     }
 
@@ -71,7 +71,7 @@ Waypoint::Waypoint(const NavigationState& ns) {
     if (!ns.aim.empty()) {
         const SceneGraphNode* aimNode = sceneGraphNode(ns.aim);
         if (!aimNode) {
-            LERROR(fmt::format("Could not find node '{}' to use as aim", ns.aim));
+            LERROR(std::format("Could not find node '{}' to use as aim", ns.aim));
             return;
         }
         _aimNodeIdentifier = ns.aim;
@@ -177,7 +177,7 @@ Waypoint computeWaypointFromNodeInfo(const NodeCameraStateSpec& spec,
 {
     const SceneGraphNode* targetNode = sceneGraphNode(spec.identifier);
     if (!targetNode) {
-        LERROR(fmt::format("Could not find target node '{}'", spec.identifier));
+        LERROR(std::format("Could not find target node '{}'", spec.identifier));
         return Waypoint();
     }
 
diff --git a/src/network/parallelconnection.cpp b/src/network/parallelconnection.cpp
index 5b09e9ceea..4c51f97286 100644
--- a/src/network/parallelconnection.cpp
+++ b/src/network/parallelconnection.cpp
@@ -168,7 +168,7 @@ ParallelConnection::Message ParallelConnection::receiveMessage() {
     offset += sizeof(uint8_t);
 
     if (protocolVersionIn != ProtocolVersion) {
-        LERROR(fmt::format(
+        LERROR(std::format(
             "Protocol versions do not match. Remote version: {}, Local version: {}",
             protocolVersionIn,
             ProtocolVersion
diff --git a/src/network/parallelpeer.cpp b/src/network/parallelpeer.cpp
index c3296a4ccd..53d7b99f80 100644
--- a/src/network/parallelpeer.cpp
+++ b/src/network/parallelpeer.cpp
@@ -401,7 +401,7 @@ void ParallelPeer::dataMessageReceived(const std::vector<char>& message) {
             break;
         }
         default:
-            LERROR(fmt::format(
+            LERROR(std::format(
                 "Unidentified message with identifier '{}' received in parallel "
                 "connection",
                 type
diff --git a/src/properties/optionproperty.cpp b/src/properties/optionproperty.cpp
index d1b28ffac3..98b1be9a3c 100644
--- a/src/properties/optionproperty.cpp
+++ b/src/properties/optionproperty.cpp
@@ -63,7 +63,7 @@ void OptionProperty::addOption(int value, std::string desc) {
 
     for (const Option& o : _options) {
         if (o.value == option.value) {
-            LWARNING(fmt::format(
+            LWARNING(std::format(
                 "The value of option {{ {} -> {} }} was already registered when trying "
                 "to add option {{ {} -> {} }}",
                 o.value, o.description, option.value, option.description
@@ -108,7 +108,7 @@ void OptionProperty::setValue(int value) {
     }
 
     // Otherwise, log an error
-    LERROR(fmt::format("Could not find an option for value '{}'", value));
+    LERROR(std::format("Could not find an option for value '{}'", value));
 }
 
 bool OptionProperty::hasOption() const {
@@ -162,7 +162,7 @@ std::string OptionProperty::generateAdditionalJsonDescription() const {
         const std::string dSan = escapedJson(d);
 
         result += '{';
-        result += fmt::format(R"("{}": "{}")", vSan, dSan);
+        result += std::format(R"("{}": "{}")", vSan, dSan);
         result += '}';
 
         if (i != _options.size() - 1) {
diff --git a/src/properties/property.cpp b/src/properties/property.cpp
index 206511bd49..ef54ba8367 100644
--- a/src/properties/property.cpp
+++ b/src/properties/property.cpp
@@ -82,7 +82,7 @@ std::string Property::fullyQualifiedIdentifier() const {
     while (currentOwner) {
         const std::string& ownerId = currentOwner->identifier();
         if (!ownerId.empty()) {
-            identifier = fmt::format("{}.{}", ownerId, identifier);
+            identifier = std::format("{}.{}", ownerId, identifier);
         }
         currentOwner = currentOwner->owner();
     }
@@ -275,7 +275,7 @@ std::string Property::generateJsonDescription() const {
     const std::string metaData = generateMetaDataJsonDescription();
     const std::string description = generateAdditionalJsonDescription();
 
-    return fmt::format(
+    return std::format(
         R"({{"{}":"{}","{}":"{}","{}":"{}","{}":{},"{}":{}}})",
         TypeKey, cName, IdentifierKey, identifierSan, NameKey, gNameSan, MetaDataKey,
         metaData, AdditionalDataKey, description
@@ -318,7 +318,7 @@ std::string Property::generateMetaDataJsonDescription() const {
         );
     }
 
-    std::string result = fmt::format(
+    std::string result = std::format(
         R"({{"{}":"{}","{}":"{}","{}":{},"{}":{},"{}":{}}})",
         MetaDataKeyGroup, sanitizedGroupId,
         MetaDataKeyVisibility, vis,
diff --git a/src/properties/propertyowner.cpp b/src/properties/propertyowner.cpp
index cfb7332b25..db9c3b2910 100644
--- a/src/properties/propertyowner.cpp
+++ b/src/properties/propertyowner.cpp
@@ -213,7 +213,7 @@ void PropertyOwner::addProperty(Property* prop) {
 
     // If we found the property identifier, we need to bail out
     if (it != _properties.end() && (*it)->identifier() == prop->identifier()) {
-        LERROR(fmt::format(
+        LERROR(std::format(
             "Property identifier '{}' already present in PropertyOwner '{}'",
             prop->identifier(),
             identifier()
@@ -224,7 +224,7 @@ void PropertyOwner::addProperty(Property* prop) {
         // Otherwise we still have to look if there is a PropertyOwner with the same name
         const bool hasOwner = hasPropertySubOwner(prop->identifier());
         if (hasOwner) {
-            LERROR(fmt::format(
+            LERROR(std::format(
                 "Property identifier '{}' already names a registered PropertyOwner",
                 prop->identifier()
             ));
@@ -259,7 +259,7 @@ void PropertyOwner::addPropertySubOwner(openspace::properties::PropertyOwner* ow
 
     // If we found the propertyowner's name, we need to bail out
     if (it != _subOwners.end() && (*it)->identifier() == owner->identifier()) {
-        LERROR(fmt::format(
+        LERROR(std::format(
             "PropertyOwner '{}' already present in PropertyOwner '{}'",
             owner->identifier(),
             identifier()
@@ -270,7 +270,7 @@ void PropertyOwner::addPropertySubOwner(openspace::properties::PropertyOwner* ow
         // We still need to check if the PropertyOwners name is used in a Property
         const bool hasProp = hasProperty(owner->identifier());
         if (hasProp) {
-            LERROR(fmt::format(
+            LERROR(std::format(
                 "PropertyOwner '{}'s name already names a Property", owner->identifier()
             ));
             return;
@@ -302,7 +302,7 @@ void PropertyOwner::removeProperty(Property* prop) {
         _properties.erase(it);
     }
     else {
-        LERROR(fmt::format(
+        LERROR(std::format(
             "Property with identifier '{}' not found for removal", prop->identifier()
         ));
     }
@@ -329,7 +329,7 @@ void PropertyOwner::removePropertySubOwner(openspace::properties::PropertyOwner*
         _subOwners.erase(it);
     }
     else {
-        LERROR(fmt::format(
+        LERROR(std::format(
             "PropertyOwner with name '{}' not found for removal", owner->identifier()
         ));
     }
diff --git a/src/properties/selectionproperty.cpp b/src/properties/selectionproperty.cpp
index 8830ca4c83..c652b05c85 100644
--- a/src/properties/selectionproperty.cpp
+++ b/src/properties/selectionproperty.cpp
@@ -92,7 +92,7 @@ void SelectionProperty::setOptions(const std::vector<std::string>& keys) {
             _options.push_back(key);
         }
         else {
-            LWARNING(fmt::format("Ignoring duplicated key '{}'", key));
+            LWARNING(std::format("Ignoring duplicated key '{}'", key));
         }
     }
     _options.shrink_to_fit();
@@ -109,7 +109,7 @@ void SelectionProperty::setOptions(const std::vector<std::string>& keys) {
 
 void SelectionProperty::addOption(const std::string& key) {
     if (hasOption(key)) {
-        LWARNING(fmt::format("Cannot add option. Key '{}' already exists", key));
+        LWARNING(std::format("Cannot add option. Key '{}' already exists", key));
         return;
     }
 
@@ -153,7 +153,7 @@ bool SelectionProperty::removeInvalidKeys(std::set<std::string>& keys) const {
     auto it = keys.begin();
     while (it != keys.end()) {
         if (!hasOption(*it)) {
-            LWARNING(fmt::format(
+            LWARNING(std::format(
                 "Key '{}' is not a valid option and is removed from selection", *it
             ));
             it = keys.erase(it);
@@ -168,7 +168,7 @@ bool SelectionProperty::removeInvalidKeys(std::set<std::string>& keys) const {
 
 std::string SelectionProperty::generateAdditionalJsonDescription() const {
     const nlohmann::json optionsJson(_options);
-    std::string result = fmt::format(
+    std::string result = std::format(
         R"({{ "{}": {} }})", OptionsKey, optionsJson.dump()
     );
     return result;
diff --git a/src/rendering/colormappingcomponent.cpp b/src/rendering/colormappingcomponent.cpp
index a6dd578abe..6070f3c4af 100644
--- a/src/rendering/colormappingcomponent.cpp
+++ b/src/rendering/colormappingcomponent.cpp
@@ -242,7 +242,7 @@ ColorMappingComponent::ColorMappingComponent()
     colorMapFile.onChange([this]() {
         const bool fileExists = std::filesystem::exists(colorMapFile.value());
         if (!fileExists) {
-            LERROR(fmt::format("Could not find cmap file: {}", colorMapFile.value()));
+            LERROR(std::format("Could not find cmap file: {}", colorMapFile.value()));
         }
         _colorMapFileIsDirty = true;
     });
@@ -478,7 +478,7 @@ void ColorMappingComponent::initializeParameterData(const dataloader::Dataset& d
             }
 
             if (!found) {
-                LWARNING(fmt::format(
+                LWARNING(std::format(
                     "Dataset does not contain specified parameter '{}'", o
                 ));
             }
@@ -491,7 +491,7 @@ void ColorMappingComponent::initializeParameterData(const dataloader::Dataset& d
 
     if (_providedParameter.has_value()) {
         if (indexOfProvidedOption == -1) {
-            LERROR(fmt::format(
+            LERROR(std::format(
                 "Error when reading Parameter. Could not find provided parameter '{}' in "
                 "list of parameter options", *_providedParameter
             ));
diff --git a/src/rendering/dashboard_lua.inl b/src/rendering/dashboard_lua.inl
index 0cc98277cb..a7533b834a 100644
--- a/src/rendering/dashboard_lua.inl
+++ b/src/rendering/dashboard_lua.inl
@@ -33,7 +33,7 @@ namespace {
         );
     }
     catch (const ghoul::RuntimeError& e) {
-        throw ghoul::lua::LuaError(fmt::format(
+        throw ghoul::lua::LuaError(std::format(
             "Error adding dashboard item: {}", e.what()
         ));
     }
diff --git a/src/rendering/framebufferrenderer.cpp b/src/rendering/framebufferrenderer.cpp
index 209d308ebc..d63722b271 100644
--- a/src/rendering/framebufferrenderer.cpp
+++ b/src/rendering/framebufferrenderer.cpp
@@ -970,7 +970,7 @@ void FramebufferRenderer::updateRaycastData() {
 
         try {
             _exitPrograms[raycaster] = ghoul::opengl::ProgramObject::Build(
-                fmt::format("Volume {} exit", data.id),
+                std::format("Volume {} exit", data.id),
                 absPath(vsPath),
                 absPath(ExitFragmentShaderPath),
                 dict
@@ -983,7 +983,7 @@ void FramebufferRenderer::updateRaycastData() {
             ghoul::Dictionary outsideDict = dict;
             outsideDict.setValue("getEntryPath", std::string(GetEntryOutsidePath));
             _raycastPrograms[raycaster] = ghoul::opengl::ProgramObject::Build(
-                fmt::format("Volume {} raycast", data.id),
+                std::format("Volume {} raycast", data.id),
                 absPath(vsPath),
                 absPath(RaycastFragmentShaderPath),
                 outsideDict
@@ -996,7 +996,7 @@ void FramebufferRenderer::updateRaycastData() {
             ghoul::Dictionary insideDict = dict;
             insideDict.setValue("getEntryPath", std::string(GetEntryInsidePath));
             _insideRaycastPrograms[raycaster] = ghoul::opengl::ProgramObject::Build(
-                fmt::format("Volume {} inside raycast", data.id),
+                std::format("Volume {} inside raycast", data.id),
                 absPath("${SHADERS}/framebuffer/resolveframebuffer.vert"),
                 absPath(RaycastFragmentShaderPath),
                 insideDict
@@ -1037,7 +1037,7 @@ void FramebufferRenderer::updateDeferredcastData() {
 
         try {
             _deferredcastPrograms[caster] = ghoul::opengl::ProgramObject::Build(
-                fmt::format("Deferred {} raycast", data.id),
+                std::format("Deferred {} raycast", data.id),
                 vsPath,
                 fsPath,
                 dict
diff --git a/src/rendering/labelscomponent.cpp b/src/rendering/labelscomponent.cpp
index 7d05765eee..4d5e47643f 100644
--- a/src/rendering/labelscomponent.cpp
+++ b/src/rendering/labelscomponent.cpp
@@ -258,7 +258,7 @@ void LabelsComponent::initialize() {
 }
 
 void LabelsComponent::loadLabels() {
-    LINFO(fmt::format("Loading label file '{}'", _labelFile));
+    LINFO(std::format("Loading label file '{}'", _labelFile));
 
     if (_createdFromDataset) {
         // The labelset should already have been loaded
diff --git a/src/rendering/loadingscreen.cpp b/src/rendering/loadingscreen.cpp
index 9f92771c01..7a23ccd012 100644
--- a/src/rendering/loadingscreen.cpp
+++ b/src/rendering/loadingscreen.cpp
@@ -508,7 +508,7 @@ void LoadingScreen::render() {
                 int p = static_cast<int>(std::round(info.progress * 100));
                 if (isTotalSizeKnown) {
                     if (info.totalSize < 1024 * 1024) { // 1MB
-                        text = fmt::format(
+                        text = std::format(
                             "{} ({}%)\n{}/{} {}",
                             text, p, info.currentSize, info.totalSize, "bytes"
                         );
@@ -517,7 +517,7 @@ void LoadingScreen::render() {
                         float curr = info.currentSize / (1024.f * 1024.f);
                         float total = info.totalSize / (1024.f * 1024.f);
 
-                        text = fmt::format(
+                        text = std::format(
                             "{} ({}%)\n{:.3f}/{:.3f} {}",
                             text, p, curr, total, "MB"
                         );
@@ -526,11 +526,11 @@ void LoadingScreen::render() {
                 else {
                     // We don't know the total size but we have started downloading data
                     if (info.currentSize < 1024 * 1024) {
-                        text = fmt::format("{}\n{} {}", text, info.currentSize, "bytes");
+                        text = std::format("{}\n{} {}", text, info.currentSize, "bytes");
                     }
                     else {
                         float curr = info.currentSize / (1024.f * 1024.f);
-                        text = fmt::format("{}\n{:.3f} {}", text, curr, "MB");
+                        text = std::format("{}\n{:.3f} {}", text, curr, "MB");
                     }
                 }
             }
@@ -631,7 +631,7 @@ void LoadingScreen::renderLogMessages() const {
     }
     size_t row = 0;
     for (auto& [level, amount] : numberOfErrorsPerLevel) {
-        const std::string text = fmt::format("{}: {}", ghoul::to_string(level), amount);
+        const std::string text = std::format("{}: {}", ghoul::to_string(level), amount);
         const glm::vec2 bbox = _logFont->boundingBox(text);
         renderer.render(
             *_logFont,
diff --git a/src/rendering/luaconsole.cpp b/src/rendering/luaconsole.cpp
index 5794169419..fd1ea36d20 100644
--- a/src/rendering/luaconsole.cpp
+++ b/src/rendering/luaconsole.cpp
@@ -201,7 +201,7 @@ void LuaConsole::initialize() {
             if (version != CurrentVersion) {
                 LWARNINGC(
                     "LuaConsole",
-                    fmt::format("Outdated console history version: {}", version)
+                    std::format("Outdated console history version: {}", version)
                 );
             }
             else {
diff --git a/src/rendering/renderengine.cpp b/src/rendering/renderengine.cpp
index 4a68fa2fba..4f21e42357 100644
--- a/src/rendering/renderengine.cpp
+++ b/src/rendering/renderengine.cpp
@@ -500,7 +500,7 @@ void RenderEngine::initialize() {
             OPENSPACE_VERSION_PATCH
         };
         if (current < latest) {
-            _versionString += fmt::format(
+            _versionString += std::format(
                 " [Available: {}.{}.{}]", latest.major, latest.minor, latest.patch
             );
         }
@@ -733,7 +733,7 @@ void RenderEngine::render(const glm::mat4& sceneMatrix, const glm::mat4& viewMat
         std::string dt = std::to_string(global::windowDelegate->deltaTime());
         std::string avgDt = std::to_string(global::windowDelegate->averageDeltaTime());
 
-        const std::string res = fmt::format(
+        const std::string res = std::format(
             "Frame: {} {}\nSwap group frame: {}\nDt: {}\nAvg Dt: {}",
             fn, fr, sgFn, dt, avgDt
         );
@@ -887,7 +887,7 @@ void RenderEngine::renderShutdownInformation(float timer, float fullTime) {
 
     constexpr std::string_view FirstLine = "Shutdown in: {:.2f}s/{:.2f}s";
     const glm::vec2 size1 = _fontShutdown->boundingBox(
-        fmt::format(FirstLine, timer, fullTime)
+        std::format(FirstLine, timer, fullTime)
     );
 
     glm::vec2 penPosition = glm::vec2(
@@ -898,7 +898,7 @@ void RenderEngine::renderShutdownInformation(float timer, float fullTime) {
     RenderFont(
         *_fontShutdown,
         penPosition,
-        fmt::format(FirstLine, timer, fullTime),
+        std::format(FirstLine, timer, fullTime),
         ghoul::fontrendering::CrDirection::Down
     );
     // Important: Length of this string is the same as the first line to make them align
@@ -1104,7 +1104,7 @@ void RenderEngine::addScreenSpaceRenderable(std::unique_ptr<ScreenSpaceRenderabl
         }
     );
     if (it != global::screenSpaceRenderables->end()) {
-        LERROR(fmt::format(
+        LERROR(std::format(
             "Cannot add scene space renderable. Identifier '{}' already exists",
             identifier
         ));
@@ -1366,7 +1366,7 @@ void RenderEngine::renderScreenLog() {
         std::array<char, 15 + 1 + CategoryLength + 3> buf;
         {
             std::fill(buf.begin(), buf.end(), char(0));
-            char* end = fmt::format_to(
+            char* end = std::format_to(
                 buf.data(),
                 "{:<15} {}{}",
                 it.timeString,
@@ -1391,7 +1391,7 @@ void RenderEngine::renderScreenLog() {
 
             const std::string_view lvl = ghoul::to_string(it.level);
             std::fill(buf.begin(), buf.end(), char(0));
-            char* end = fmt::format_to(buf.data(), "({})", lvl);
+            char* end = std::format_to(buf.data(), "({})", lvl);
             RenderFont(
                 *_fontLog,
                 glm::vec2(
diff --git a/src/rendering/texturecomponent.cpp b/src/rendering/texturecomponent.cpp
index 4a7ed293ab..dcda824d91 100644
--- a/src/rendering/texturecomponent.cpp
+++ b/src/rendering/texturecomponent.cpp
@@ -99,7 +99,7 @@ void TextureComponent::loadFromFile(const std::filesystem::path& path) {
         );
 
         if (texture) {
-            LDEBUG(fmt::format("Loaded texture from '{}'", absolutePath));
+            LDEBUG(std::format("Loaded texture from '{}'", absolutePath));
             _texture = std::move(texture);
 
             _textureFile = std::make_unique<ghoul::filesystem::File>(absolutePath);
diff --git a/src/scene/asset.cpp b/src/scene/asset.cpp
index 08fe0884ec..309ce7de86 100644
--- a/src/scene/asset.cpp
+++ b/src/scene/asset.cpp
@@ -279,10 +279,10 @@ void Asset::initialize() {
         return;
     }
     if (!isSynchronized()) {
-        LERROR(fmt::format("Cannot initialize unsynchronized asset '{}'", _assetPath));
+        LERROR(std::format("Cannot initialize unsynchronized asset '{}'", _assetPath));
         return;
     }
-    LDEBUG(fmt::format("Initializing asset '{}'", _assetPath));
+    LDEBUG(std::format("Initializing asset '{}'", _assetPath));
 
     // 1. Initialize requirements
     for (Asset* child : _requiredAssets) {
@@ -294,14 +294,14 @@ void Asset::initialize() {
         _manager.callOnInitialize(this);
     }
     catch (const documentation::SpecificationError& e) {
-        LERROR(fmt::format("Failed to initialize asset '{}'", path()));
+        LERROR(std::format("Failed to initialize asset '{}'", path()));
         documentation::logError(e);
         setState(State::InitializationFailed);
         return;
     }
     catch (const ghoul::RuntimeError& e) {
-        LERROR(fmt::format("Failed to initialize asset '{}'", path()));
-        LERROR(fmt::format("{}: {}", e.component, e.message));
+        LERROR(std::format("Failed to initialize asset '{}'", path()));
+        LERROR(std::format("{}: {}", e.component, e.message));
         setState(State::InitializationFailed);
         return;
     }
@@ -314,7 +314,7 @@ void Asset::deinitialize() {
     if (!isInitialized()) {
         return;
     }
-    LDEBUG(fmt::format("Deinitializing asset '{}'", _assetPath));
+    LDEBUG(std::format("Deinitializing asset '{}'", _assetPath));
 
     // Perform inverse actions as in initialize, in reverse order (3 - 1)
 
@@ -326,8 +326,8 @@ void Asset::deinitialize() {
         _manager.callOnDeinitialize(this);
     }
     catch (const ghoul::lua::LuaRuntimeException& e) {
-        LERROR(fmt::format("Failed to deinitialize asset '{}'", _assetPath));
-        LERROR(fmt::format("{}: {}", e.component, e.message));
+        LERROR(std::format("Failed to deinitialize asset '{}'", _assetPath));
+        LERROR(std::format("{}: {}", e.component, e.message));
         return;
     }
 
diff --git a/src/scene/assetmanager.cpp b/src/scene/assetmanager.cpp
index 694c682f5e..7a9dc5e14f 100644
--- a/src/scene/assetmanager.cpp
+++ b/src/scene/assetmanager.cpp
@@ -106,21 +106,6 @@ namespace {
 #include "assetmanager_codegen.cpp"
 } // namespace
 
-namespace fmt {
-    template <typename T>
-    struct formatter<std::optional<T>> :fmt::formatter<T> {
-
-        template <typename FormatContext>
-        auto format(const std::optional<T>& opt, FormatContext& ctx) {
-            if (opt) {
-                fmt::formatter<T>::format(*opt, ctx);
-                return ctx.out();
-            }
-            return fmt::format_to(ctx.out(), "<none>");
-        }
-    };
-} // namespace fmt
-
 namespace openspace {
 
 AssetManager::AssetManager(ghoul::lua::LuaState* state,
@@ -238,7 +223,7 @@ void AssetManager::update() {
             [&path](const std::unique_ptr<Asset>& a) { return a->path() == path; }
         );
         if (it == _assets.cend()) {
-            LWARNING(fmt::format("Tried to remove unknown asset '{}'. Skipping", asset));
+            LWARNING(std::format("Tried to remove unknown asset '{}'. Skipping", asset));
             continue;
         }
 
@@ -288,7 +273,7 @@ void AssetManager::update() {
             it = _unfinishedSynchronizations.erase(it);
         }
         else if (si->synchronization->isRejected()) {
-            LERROR(fmt::format(
+            LERROR(std::format(
                 "Failed to synchronize resource '{}'", si->synchronization->name()
             ));
             for (Asset* a : si->assets) {
@@ -362,7 +347,7 @@ bool AssetManager::loadAsset(Asset* asset, Asset* parent) {
     };
 
     if (!std::filesystem::is_regular_file(asset->path())) {
-        LERROR(fmt::format(
+        LERROR(std::format(
             "Could not load asset '{}': File does not exist", asset->path())
         );
         return false;
@@ -372,7 +357,7 @@ bool AssetManager::loadAsset(Asset* asset, Asset* parent) {
         ghoul::lua::runScriptFile(*_luaState, asset->path());
     }
     catch (const ghoul::lua::LuaRuntimeException& e) {
-        LERROR(fmt::format("Could not load asset '{}': {}", asset->path(), e.message));
+        LERROR(std::format("Could not load asset '{}': {}", asset->path(), e.message));
         return false;
     }
     catch (const ghoul::RuntimeError& e) {
@@ -658,7 +643,7 @@ void AssetManager::setUpAssetLuaTable(Asset* asset) {
             if (!dependency) {
                 return ghoul::lua::luaError(
                     L,
-                    fmt::format("Asset '{}' not found", assetName)
+                    std::format("Asset '{}' not found", assetName)
                 );
             }
             // this = parent ;  child = dependency
@@ -892,7 +877,7 @@ Asset* AssetManager::retrieveAsset(const std::filesystem::path& path,
             if (a->firstParent()) {
                 // The first request came from another asset, so we can mention it in the
                 // error message
-                LWARNING(fmt::format(
+                LWARNING(std::format(
                     "Loading asset {0} from {1} with enable state {3} different from "
                     "initial loading from {2} with state {4}. Only {4} will have an "
                     "effect",
@@ -919,7 +904,7 @@ Asset* AssetManager::retrieveAsset(const std::filesystem::path& path,
     }
 
     if (!std::filesystem::is_regular_file(path)) {
-        throw ghoul::RuntimeError(fmt::format(
+        throw ghoul::RuntimeError(std::format(
             "Could not find asset file '{}' requested by '{}'",
             path, retriever
         ));
@@ -943,7 +928,7 @@ void AssetManager::callOnInitialize(Asset* asset) const {
     for (const int init : it->second) {
         lua_rawgeti(*_luaState, LUA_REGISTRYINDEX, init);
         if (lua_pcall(*_luaState, 0, 0, 0) != LUA_OK) {
-            throw ghoul::lua::LuaRuntimeException(fmt::format(
+            throw ghoul::lua::LuaRuntimeException(std::format(
                 "When initializing '{}': {}",
                 asset->path(),
                 ghoul::lua::value<std::string>(*_luaState, -1)
@@ -966,7 +951,7 @@ void AssetManager::callOnDeinitialize(Asset* asset) const {
     for (const int deinit : it->second) {
         lua_rawgeti(*_luaState, LUA_REGISTRYINDEX, deinit);
         if (lua_pcall(*_luaState, 0, 0, 0) != LUA_OK) {
-            throw ghoul::lua::LuaRuntimeException(fmt::format(
+            throw ghoul::lua::LuaRuntimeException(std::format(
                 "When deinitializing '{}': {}",
                 asset->path(),
                 ghoul::lua::value<std::string>(*_luaState, -1)
diff --git a/src/scene/profile.cpp b/src/scene/profile.cpp
index 6f06d27024..571a232506 100644
--- a/src/scene/profile.cpp
+++ b/src/scene/profile.cpp
@@ -78,7 +78,7 @@ namespace {
             if (!isOptional) {
                 throw Profile::ParsingError(
                     Profile::ParsingError::Severity::Error,
-                    fmt::format("'{}.{}' field is missing", keyPrefix, key)
+                    std::format("'{}.{}' field is missing", keyPrefix, key)
                 );
             }
         }
@@ -98,7 +98,7 @@ namespace {
 
                 throw Profile::ParsingError(
                     Profile::ParsingError::Severity::Error,
-                    fmt::format("'{}.{}' must be {}", keyPrefix, key, type)
+                    std::format("'{}.{}' must be {}", keyPrefix, key, type)
                 );
             }
         }
@@ -111,7 +111,7 @@ namespace {
             if (allowedKeys.find(key) == allowedKeys.end()) {
                 LINFOC(
                     "Profile",
-                    fmt::format("Key '{}' not supported in '{}'", key, prefix)
+                    std::format("Key '{}' not supported in '{}'", key, prefix)
                 );
             }
         }
@@ -577,7 +577,7 @@ void convertVersion10to11(nlohmann::json& profile) {
         profile.at("keybindings").get<std::vector<version10::Keybinding>>();
     for (size_t i = 0; i < kbs.size(); i++) {
         version10::Keybinding& kb = kbs[i];
-        const std::string identifier = fmt::format("profile.keybind.{}", i);
+        const std::string identifier = std::format("profile.keybind.{}", i);
 
         Profile::Action action;
         action.identifier = identifier;
@@ -749,7 +749,7 @@ Profile::Profile(const std::filesystem::path& path) {
         inFile.open(path, std::ifstream::in);
     }
     catch (const std::ifstream::failure& e) {
-        throw ghoul::RuntimeError(fmt::format(
+        throw ghoul::RuntimeError(std::format(
             "Exception opening profile file for read '{}': {}", path, e.what()
         ));
     }
diff --git a/src/scene/profile_lua.inl b/src/scene/profile_lua.inl
index 358fa66750..9fd8f3de0f 100644
--- a/src/scene/profile_lua.inl
+++ b/src/scene/profile_lua.inl
@@ -43,7 +43,7 @@ namespace {
         std::tm* utcTime = std::gmtime(&t);
         ghoul_assert(utcTime, "Conversion to UTC failed");
 
-        std::string time = fmt::format(
+        std::string time = std::format(
             "{:04d}-{:02d}-{:02d}T{:02d}_{:02d}_{:02d}",
             utcTime->tm_year + 1900,
             utcTime->tm_mon + 1,
@@ -54,24 +54,24 @@ namespace {
         );
         std::filesystem::path path = global::configuration->profile;
         path.replace_extension();
-        std::string newFile = fmt::format("{}_{}", path.string(), time);
-        std::string sourcePath = fmt::format(
+        std::string newFile = std::format("{}_{}", path.string(), time);
+        std::string sourcePath = std::format(
             "{}/{}.profile",
             absPath("${USER_PROFILES}").string(), global::configuration->profile
         );
-        std::string destPath = fmt::format(
+        std::string destPath = std::format(
             "{}/{}.profile",
             absPath("${PROFILES}").string(), global::configuration->profile
         );
         if (!std::filesystem::is_regular_file(sourcePath)) {
-            sourcePath = fmt::format(
+            sourcePath = std::format(
                 "{}/{}.profile",
                 absPath("${USER_PROFILES}").string(), global::configuration->profile
             );
         }
         LINFOC(
             "Profile",
-            fmt::format("Saving a copy of the old profile as '{}'", newFile)
+            std::format("Saving a copy of the old profile as '{}'", newFile)
         );
         std::filesystem::copy(sourcePath, destPath);
         saveFilePath = global::configuration->profile;
@@ -98,7 +98,7 @@ namespace {
         );
     }
 
-    std::string absFilename = fmt::format(
+    std::string absFilename = std::format(
         "{}/{}.profile", absPath("${PROFILES}").string(), *saveFilePath
     );
     if (!std::filesystem::is_regular_file(absFilename)) {
@@ -107,7 +107,7 @@ namespace {
 
     if (std::filesystem::is_regular_file(absFilename) && !overwrite) {
         throw ghoul::lua::LuaError(
-            fmt::format(
+            std::format(
                 "Unable to save profile '{}'. File of same name already exists",
                 absFilename
             )
@@ -121,7 +121,7 @@ namespace {
     }
     catch (const std::ofstream::failure& e) {
         throw ghoul::lua::LuaError(
-            fmt::format(
+            std::format(
                 "Exception opening profile file for write '{}': {}", absFilename, e.what()
             )
         );
@@ -132,7 +132,7 @@ namespace {
     }
     catch (const std::ofstream::failure& e) {
         throw ghoul::lua::LuaError(
-            fmt::format("Data write error to file '{}': {}", absFilename, e.what())
+            std::format("Data write error to file '{}': {}", absFilename, e.what())
         );
     }
 }
diff --git a/src/scene/scene.cpp b/src/scene/scene.cpp
index 05ea76406f..9d5da1b66d 100644
--- a/src/scene/scene.cpp
+++ b/src/scene/scene.cpp
@@ -128,7 +128,7 @@ Scene::~Scene() {
             continue;
         }
 
-        LWARNING(fmt::format(
+        LWARNING(std::format(
             "SceneGraphNode '{}' was not removed before shutdown",
             node->identifier()
         ));
@@ -157,7 +157,7 @@ Camera* Scene::camera() const {
 
 void Scene::registerNode(SceneGraphNode* node) {
     if (_nodesByIdentifier.contains(node->identifier())) {
-        throw Scene::InvalidSceneError(fmt::format(
+        throw Scene::InvalidSceneError(std::format(
             "Node with identifier '{}' already exists", node->identifier()
         ));
     }
@@ -260,7 +260,7 @@ void Scene::sortTopologically() {
         }
     }
     if (!inDegrees.empty()) {
-        LERROR(fmt::format(
+        LERROR(std::format(
             "The scene contains circular dependencies. {} nodes will be disabled",
             inDegrees.size()
         ));
@@ -374,7 +374,7 @@ SceneGraphNode* Scene::loadNode(const ghoul::Dictionary& nodeDictionary) {
     const bool hasParent = nodeDictionary.hasKey(KeyParent);
 
     if (_nodesByIdentifier.find(nodeIdentifier) != _nodesByIdentifier.end()) {
-        LERROR(fmt::format(
+        LERROR(std::format(
             "Cannot add scene graph node '{}'. A node with that name already exists",
             nodeIdentifier
         ));
@@ -387,7 +387,7 @@ SceneGraphNode* Scene::loadNode(const ghoul::Dictionary& nodeDictionary) {
         parent = sceneGraphNode(parentIdentifier);
         if (!parent) {
             // TODO: Throw exception
-            LERROR(fmt::format(
+            LERROR(std::format(
                 "Could not find parent '{}' for '{}'", parentIdentifier, nodeIdentifier
             ));
             return nullptr;
@@ -420,7 +420,7 @@ SceneGraphNode* Scene::loadNode(const ghoul::Dictionary& nodeDictionary) {
         SceneGraphNode* dep = sceneGraphNode(depName);
         if (!dep) {
             // TODO: Throw exception
-            LERROR(fmt::format(
+            LERROR(std::format(
                 "Could not find dependency '{}' for '{}'", depName, nodeIdentifier
             ));
             foundAllDeps = false;
@@ -683,7 +683,7 @@ void Scene::handlePropertyLuaTableEntry(ghoul::lua::LuaState& L, const std::stri
 
     switch (enclosedType) {
         case PropertyValueType::Boolean:
-            LERROR(fmt::format(
+            LERROR(std::format(
                 "A Lua table of bool values is not supported. (processing property '{}')",
                 _profilePropertyName
             ));
@@ -704,7 +704,7 @@ void Scene::handlePropertyLuaTableEntry(ghoul::lua::LuaState& L, const std::stri
             break;
         case PropertyValueType::Table:
         default:
-            LERROR(fmt::format(
+            LERROR(std::format(
                 "Table-within-a-table values are not supported for profile a "
                 "property (processing property '{}')", _profilePropertyName
             ));
@@ -734,7 +734,7 @@ void Scene::processPropertyValueTableEntries(ghoul::lua::LuaState& L,
             table.push_back(std::get<T>(tableElement));
         }
         catch (std::bad_variant_access&) {
-            LERROR(fmt::format(
+            LERROR(std::format(
                 "Error attempting to parse profile property setting for '{}' using "
                 "value = {}", _profilePropertyName, value
             ));
diff --git a/src/scene/scene_lua.inl b/src/scene/scene_lua.inl
index df30467c15..765193ab7c 100644
--- a/src/scene/scene_lua.inl
+++ b/src/scene/scene_lua.inl
@@ -109,7 +109,7 @@ std::vector<openspace::properties::Property*> findMatchesInAllProperties(
         if (propertyName.empty() && nodeName.empty()) {
             LERRORC(
                 "findMatchesInAllProperties",
-                fmt::format(
+                std::format(
                     "Malformed regular expression: '{}': Empty both before and after '*'",
                     regex
                 )
@@ -121,7 +121,7 @@ std::vector<openspace::properties::Property*> findMatchesInAllProperties(
         if (regex.find_first_of("*", wildPos + 1) != std::string::npos) {
             LERRORC(
                 "findMatchesInAllProperties",
-                fmt::format(
+                std::format(
                     "Malformed regular expression: '{}': Currently only one '*' is "
                     "supported", regex
                 )
@@ -224,7 +224,7 @@ void applyRegularExpression(lua_State* L, const std::string& regex,
         if (type != prop->typeLua()) {
             LERRORC(
                 "property_setValue",
-                fmt::format(
+                std::format(
                     "{}: Property '{}' does not accept input of type '{}'. Requested "
                     "type: {}",
                     errorLocation(L), prop->fullyQualifiedIdentifier(),
@@ -263,7 +263,7 @@ void applyRegularExpression(lua_State* L, const std::string& regex,
     if (!foundMatching) {
         LERRORC(
             "property_setValue",
-            fmt::format(
+            std::format(
                 "{}: No property matched the requested URI '{}'", errorLocation(L), regex
             )
         );
@@ -303,7 +303,7 @@ int setPropertyCallSingle(properties::Property& prop, const std::string& uri,
     if (type != prop.typeLua()) {
         LERRORC(
             "property_setValue",
-            fmt::format(
+            std::format(
                 "{}: Property '{}' does not accept input of type '{}'. "
                 "Requested type: {}",
                 errorLocation(L), uri, luaTypeToString(type),
@@ -363,7 +363,7 @@ int propertySetValue(lua_State* L) {
                 ghoul::lua::value<double>(L, 3, ghoul::lua::PopValue::No);
         }
         else {
-            std::string msg = fmt::format(
+            std::string msg = std::format(
                 "Unexpected type '{}' in argument 3",
                 ghoul::lua::luaTypeToString(lua_type(L, 3))
             );
@@ -376,7 +376,7 @@ int propertySetValue(lua_State* L) {
                 ghoul::lua::value<std::string>(L, 4, ghoul::lua::PopValue::No);
         }
         else {
-            std::string msg = fmt::format(
+            std::string msg = std::format(
                 "Unexpected type '{}' in argument 4",
                 ghoul::lua::luaTypeToString(lua_type(L, 4))
             );
@@ -389,7 +389,7 @@ int propertySetValue(lua_State* L) {
                 ghoul::lua::value<std::string>(L, 5, ghoul::lua::PopValue::No);
         }
         else {
-            std::string msg = fmt::format(
+            std::string msg = std::format(
                 "Unexpected type '{}' in argument 5",
                 ghoul::lua::luaTypeToString(lua_type(L, 5))
             );
@@ -402,7 +402,7 @@ int propertySetValue(lua_State* L) {
         if (!correctName) {
             LWARNINGC(
                 "propertySetValue",
-                fmt::format("'{}' is not a valid easing method", easingMethodName)
+                std::format("'{}' is not a valid easing method", easingMethodName)
             );
         }
         else {
@@ -415,7 +415,7 @@ int propertySetValue(lua_State* L) {
         if (!prop) {
             LERRORC(
                 "property_setValue",
-                fmt::format(
+                std::format(
                     "{}: Property with URI '{}' was not found",
                     ghoul::lua::errorLocation(L), uriOrRegex
                 )
@@ -459,7 +459,7 @@ int propertyGetValue(lua_State* L) {
     if (!prop) {
         LERRORC(
             "propertyGetValue",
-            fmt::format(
+            std::format(
                 "{}: Property with URI '{}' was not found",
                 ghoul::lua::errorLocation(L), uri
             )
@@ -517,7 +517,7 @@ namespace {
 
         // If none then malformed regular expression
         if (propertyName.empty() && nodeName.empty()) {
-            throw ghoul::lua::LuaError(fmt::format(
+            throw ghoul::lua::LuaError(std::format(
                 "Malformed regular expression: '{}': Empty both before and after '*'",
                 regex
             ));
@@ -525,7 +525,7 @@ namespace {
 
         // Currently do not support several wildcards
         if (regex.find_first_of("*", wildPos + 1) != std::string::npos) {
-            throw ghoul::lua::LuaError(fmt::format(
+            throw ghoul::lua::LuaError(std::format(
                 "Malformed regular expression: '{}': Currently only one '*' is supported",
                 regex
             ));
@@ -637,12 +637,12 @@ namespace {
         logError(e, cat);
 
         throw ghoul::lua::LuaError(
-            fmt::format("Error loading scene graph node: {}", e.what())
+            std::format("Error loading scene graph node: {}", e.what())
         );
     }
     catch (const ghoul::RuntimeError& e) {
         throw ghoul::lua::LuaError(
-            fmt::format("Error loading scene graph node: {}", e.what())
+            std::format("Error loading scene graph node: {}", e.what())
         );
     }
 }
@@ -676,7 +676,7 @@ namespace {
     SceneGraphNode* foundNode = sceneGraphNode(identifier);
     if (!foundNode) {
         throw ghoul::lua::LuaError(
-            fmt::format("Did not find a match for identifier: {}", identifier)
+            std::format("Did not find a match for identifier: {}", identifier)
         );
     }
 
@@ -738,7 +738,7 @@ namespace {
         // If none then malformed regular expression
         if (propertyName.empty() && nodeName.empty()) {
             throw ghoul::lua::LuaError(
-                fmt::format(
+                std::format(
                     "Malformed regular expression: '{}': Empty both before and after '*'",
                     name
                 )
@@ -748,7 +748,7 @@ namespace {
         // Currently do not support several wildcards
         if (name.find_first_of("*", wildPos + 1) != std::string::npos) {
             throw ghoul::lua::LuaError(
-                fmt::format(
+                std::format(
                     "Malformed regular expression: '{}': "
                     "Currently only one '*' is supported",
                     name
@@ -812,7 +812,7 @@ namespace {
 
     if (!foundMatch) {
         throw ghoul::lua::LuaError(
-            fmt::format("Did not find a match for identifier: {}", name)
+            std::format("Did not find a match for identifier: {}", name)
         );
     }
 
@@ -931,7 +931,7 @@ namespace {
     SceneGraphNode* node = sceneGraphNode(identifier);
     if (!node) {
         throw ghoul::lua::LuaError(
-            fmt::format("Did not find a match for identifier: {} ", identifier)
+            std::format("Did not find a match for identifier: {} ", identifier)
         );
     }
 
@@ -948,7 +948,7 @@ namespace {
     SceneGraphNode* node = sceneGraphNode(identifier);
     if (!node) {
         throw ghoul::lua::LuaError(
-            fmt::format("Did not find a match for identifier: {} ", identifier)
+            std::format("Did not find a match for identifier: {} ", identifier)
         );
     }
 
@@ -964,13 +964,13 @@ namespace {
     using namespace openspace;
     SceneGraphNode* node = sceneGraphNode(identifier);
     if (!node) {
-        throw ghoul::lua::LuaError(fmt::format(
+        throw ghoul::lua::LuaError(std::format(
             "Did not find a match for identifier: {}", identifier
         ));
     }
     SceneGraphNode* newParentNode = sceneGraphNode(newParent);
     if (!newParentNode) {
-        throw ghoul::lua::LuaError(fmt::format(
+        throw ghoul::lua::LuaError(std::format(
             "Did not find a match for new parent identifier: {}", newParent
         ));
     }
@@ -987,7 +987,7 @@ namespace {
     using namespace openspace;
     SceneGraphNode* node = sceneGraphNode(identifier);
     if (!node) {
-        throw ghoul::lua::LuaError(fmt::format(
+        throw ghoul::lua::LuaError(std::format(
             "Did not find a match for identifier: {}", identifier
         ));
     }
@@ -1004,7 +1004,7 @@ namespace {
     using namespace openspace;
     SceneGraphNode* node = sceneGraphNode(identifier);
     if (!node) {
-        throw ghoul::lua::LuaError(fmt::format(
+        throw ghoul::lua::LuaError(std::format(
             "Did not find a match for identifier: {}", identifier
         ));
     }
@@ -1096,7 +1096,7 @@ enum class [[codegen::enum]] CustomPropertyType {
     }
 
     if (global::userPropertyOwner->hasProperty(identifier)) {
-        throw ghoul::lua::LuaError(fmt::format(
+        throw ghoul::lua::LuaError(std::format(
             "Failed to register property '{}' since a user-defined property with that "
             "name already exists",
             identifier
@@ -1218,7 +1218,7 @@ enum class [[codegen::enum]] CustomPropertyType {
         delete p;
     }
     else {
-        throw ghoul::lua::LuaError(fmt::format(
+        throw ghoul::lua::LuaError(std::format(
             "Could not find user-defined property '{}'", identifier
         ));
     }
diff --git a/src/scene/scenegraphnode.cpp b/src/scene/scenegraphnode.cpp
index 1a39016b90..e35d569367 100644
--- a/src/scene/scenegraphnode.cpp
+++ b/src/scene/scenegraphnode.cpp
@@ -380,7 +380,7 @@ ghoul::mm_unique_ptr<SceneGraphNode> SceneGraphNode::createFromDictionary(
                 *p.transform->translation
             );
 
-            LDEBUG(fmt::format(
+            LDEBUG(std::format(
                 "Successfully created ephemeris for '{}'", result->identifier()
             ));
         }
@@ -390,7 +390,7 @@ ghoul::mm_unique_ptr<SceneGraphNode> SceneGraphNode::createFromDictionary(
                 *p.transform->rotation
             );
 
-            LDEBUG(fmt::format(
+            LDEBUG(std::format(
                 "Successfully created rotation for '{}'", result->identifier()
             ));
         }
@@ -398,7 +398,7 @@ ghoul::mm_unique_ptr<SceneGraphNode> SceneGraphNode::createFromDictionary(
         if (p.transform->scale.has_value()) {
             result->_transform.scale = Scale::createFromDictionary(*p.transform->scale);
 
-            LDEBUG(fmt::format(
+            LDEBUG(std::format(
                 "Successfully created scale for '{}'", result->identifier()
             ));
         }
@@ -411,7 +411,7 @@ ghoul::mm_unique_ptr<SceneGraphNode> SceneGraphNode::createFromDictionary(
     if (p.timeFrame.has_value()) {
         result->_timeFrame = TimeFrame::createFromDictionary(*p.timeFrame);
 
-        LDEBUG(fmt::format(
+        LDEBUG(std::format(
             "Successfully created time frame for '{}'", result->identifier()
         ));
         result->addPropertySubOwner(result->_timeFrame.get());
@@ -423,7 +423,7 @@ ghoul::mm_unique_ptr<SceneGraphNode> SceneGraphNode::createFromDictionary(
         ghoul_assert(result->_renderable, "Failed to create Renderable");
         result->_renderable->_parent = result.get();
         result->addPropertySubOwner(result->_renderable.get());
-        LDEBUG(fmt::format(
+        LDEBUG(std::format(
             "Successfully created renderable for '{}'", result->identifier()
         ));
     }
@@ -481,7 +481,7 @@ ghoul::mm_unique_ptr<SceneGraphNode> SceneGraphNode::createFromDictionary(
         }
     }
 
-    LDEBUG(fmt::format("Successfully created SceneGraphNode '{}'", result->identifier()));
+    LDEBUG(std::format("Successfully created SceneGraphNode '{}'", result->identifier()));
 
     result->_lastScreenSpaceUpdateTime = std::chrono::high_resolution_clock::now();
     result->_type = "SceneGraphNode";
@@ -584,7 +584,7 @@ void SceneGraphNode::initialize() {
     ZoneScoped;
     ZoneName(identifier().c_str(), identifier().size());
 
-    LDEBUG(fmt::format("Initializing: {}", identifier()));
+    LDEBUG(std::format("Initializing: {}", identifier()));
 
     if (_renderable) {
         _renderable->initialize();
@@ -605,14 +605,14 @@ void SceneGraphNode::initialize() {
     _evaluatedBoundingSphere = boundingSphere();
     _evaluatedInteractionSphere = interactionSphere();
 
-    LDEBUG(fmt::format("Finished initializing: {}", identifier()));
+    LDEBUG(std::format("Finished initializing: {}", identifier()));
 }
 
 void SceneGraphNode::initializeGL() {
     ZoneScoped;
     ZoneName(identifier().c_str(), identifier().size());
 
-    LDEBUG(fmt::format("Initializing GL: {}", identifier()));
+    LDEBUG(std::format("Initializing GL: {}", identifier()));
 
     if (_renderable) {
         _renderable->initializeGL();
@@ -638,14 +638,14 @@ void SceneGraphNode::initializeGL() {
 
     _state = State::GLInitialized;
 
-    LDEBUG(fmt::format("Finished initializating GL: {}", identifier()));
+    LDEBUG(std::format("Finished initializating GL: {}", identifier()));
 }
 
 void SceneGraphNode::deinitialize() {
     ZoneScoped;
     ZoneName(identifier().c_str(), identifier().size());
 
-    LDEBUG(fmt::format("Deinitializing: {}", identifier()));
+    LDEBUG(std::format("Deinitializing: {}", identifier()));
 
     setScene(nullptr);
 
@@ -655,20 +655,20 @@ void SceneGraphNode::deinitialize() {
     clearChildren();
     _parent = nullptr;
 
-    LDEBUG(fmt::format("Finished deinitializing: {}", identifier()));
+    LDEBUG(std::format("Finished deinitializing: {}", identifier()));
 }
 
 void SceneGraphNode::deinitializeGL() {
     ZoneScoped;
     ZoneName(identifier().c_str(), identifier().size());
 
-    LDEBUG(fmt::format("Deinitializing GL: {}", identifier()));
+    LDEBUG(std::format("Deinitializing GL: {}", identifier()));
 
     if (_renderable) {
         _renderable->deinitializeGL();
     }
 
-    LDEBUG(fmt::format("Finished deinitializing GL: {}", identifier()));
+    LDEBUG(std::format("Finished deinitializing GL: {}", identifier()));
 }
 
 void SceneGraphNode::traversePreOrder(const std::function<void(SceneGraphNode*)>& fn) {
diff --git a/src/scripting/lualibrary.cpp b/src/scripting/lualibrary.cpp
index c3c77999ca..2c4045a4bb 100644
--- a/src/scripting/lualibrary.cpp
+++ b/src/scripting/lualibrary.cpp
@@ -46,7 +46,7 @@ void LuaLibrary::merge(LuaLibrary rhs) {
             // want to overwrite it
             LERRORC(
                 "LuaLibrary",
-                fmt::format(
+                std::format(
                     "Lua function '{}' in library '{}' has been defined twice",
                     fun.name, rhs.name
                 )
diff --git a/src/scripting/scriptengine.cpp b/src/scripting/scriptengine.cpp
index c409b9cc64..78fea8233e 100644
--- a/src/scripting/scriptengine.cpp
+++ b/src/scripting/scriptengine.cpp
@@ -247,7 +247,7 @@ bool ScriptEngine::runScriptFile(const std::filesystem::path& filename) {
     ZoneScoped;
 
     if (!std::filesystem::is_regular_file(filename)) {
-        LERROR(fmt::format("Script with name '{}' did not exist", filename));
+        LERROR(std::format("Script with name '{}' did not exist", filename));
         return false;
     }
 
@@ -282,35 +282,35 @@ bool ScriptEngine::isLibraryNameAllowed(lua_State* state, const std::string& nam
             result = true;
             break;
         case LUA_TBOOLEAN:
-            LERROR(fmt::format("Library name '{}' specifies a boolean", name));
+            LERROR(std::format("Library name '{}' specifies a boolean", name));
             break;
         case LUA_TLIGHTUSERDATA:
-            LERROR(fmt::format("Library name '{}' specifies a light user data", name));
+            LERROR(std::format("Library name '{}' specifies a light user data", name));
             break;
         case LUA_TNUMBER:
-            LERROR(fmt::format("Library name '{}' specifies a number", name));
+            LERROR(std::format("Library name '{}' specifies a number", name));
             break;
         case LUA_TSTRING:
-            LERROR(fmt::format("Library name '{}' specifies a string", name));
+            LERROR(std::format("Library name '{}' specifies a string", name));
             break;
         case LUA_TTABLE:
             if (hasLibrary(name)) {
-                LERROR(fmt::format(
+                LERROR(std::format(
                     "Library with name '{}' has been registered before", name
                 ));
             }
             else {
-                LERROR(fmt::format("Library name '{}' specifies a table", name));
+                LERROR(std::format("Library name '{}' specifies a table", name));
             }
             break;
         case LUA_TFUNCTION:
-            LERROR(fmt::format("Library name '{}' specifies a function", name));
+            LERROR(std::format("Library name '{}' specifies a function", name));
             break;
         case LUA_TUSERDATA:
-            LERROR(fmt::format("Library name '{}' specifies a user data", name));
+            LERROR(std::format("Library name '{}' specifies a user data", name));
             break;
         case LUA_TTHREAD:
-            LERROR(fmt::format("Library name '{}' specifies a thread", name));
+            LERROR(std::format("Library name '{}' specifies a thread", name));
             break;
     }
 
@@ -329,7 +329,7 @@ void ScriptEngine::addLibraryFunctions(lua_State* state, LuaLibrary& library,
             lua_getfield(state, -1, p.name.c_str());
             const bool isNil = lua_isnil(state, -1);
             if (!isNil) {
-                LERROR(fmt::format("Function name '{}' was already assigned", p.name));
+                LERROR(std::format("Function name '{}' was already assigned", p.name));
                 return;
             }
             lua_pop(state, 1);
@@ -365,7 +365,7 @@ void ScriptEngine::addLibraryFunctions(lua_State* state, LuaLibrary& library,
         ghoul::lua::push(state, "documentation");
         lua_gettable(state, -2);
         if (lua_isnil(state, -1)) {
-            LERROR(fmt::format(
+            LERROR(std::format(
                 "Module '{}' did not provide a documentation in script file '{}'",
                 library.name, script
             ));
@@ -496,7 +496,7 @@ void ScriptEngine::writeLog(const std::string& script) {
             _logFilename = absPath(global::configuration->scriptLog).string();
             _logFileExists = true;
 
-            LDEBUG(fmt::format("Using script log file '{}'", _logFilename));
+            LDEBUG(std::format("Using script log file '{}'", _logFilename));
 
             // Test file and clear previous input
             const std::ofstream file = std::ofstream(
@@ -505,7 +505,7 @@ void ScriptEngine::writeLog(const std::string& script) {
             );
 
             if (!file.good()) {
-                LERROR(fmt::format(
+                LERROR(std::format(
                     "Could not open file '{}' for logging scripts", _logFilename
                 ));
 
@@ -521,7 +521,7 @@ void ScriptEngine::writeLog(const std::string& script) {
     // Simple text output to logfile
     std::ofstream file(_logFilename, std::ofstream::app);
     if (!file.good()) {
-        LERROR(fmt::format("Could not open file '{}' for logging scripts", _logFilename));
+        LERROR(std::format("Could not open file '{}' for logging scripts", _logFilename));
         return;
     }
 
diff --git a/src/scripting/scriptengine_lua.inl b/src/scripting/scriptengine_lua.inl
index a9b55d46ed..64b6e60d9b 100644
--- a/src/scripting/scriptengine_lua.inl
+++ b/src/scripting/scriptengine_lua.inl
@@ -93,7 +93,7 @@ namespace {
 [[codegen::luawrap]] std::string readFile(std::filesystem::path file) {
     std::filesystem::path p = absPath(file);
     if (!std::filesystem::is_regular_file(p)) {
-        throw ghoul::lua::LuaError(fmt::format("Could not open file '{}'", file));
+        throw ghoul::lua::LuaError(std::format("Could not open file '{}'", file));
     }
 
     std::ifstream f(p);
@@ -224,14 +224,14 @@ std::vector<std::string> walkCommon(std::string path, bool recursive, bool sorte
     zip_close(z);
 
     if (is64) {
-        throw ghoul::lua::LuaError(fmt::format(
+        throw ghoul::lua::LuaError(std::format(
             "Error while unzipping '{}': Zip64 archives are not supported", source
         ));
     }
 
     int ret = zip_extract(source.c_str(), destination.c_str(), nullptr, nullptr);
     if (ret != 0) {
-        throw ghoul::lua::LuaError(fmt::format(
+        throw ghoul::lua::LuaError(std::format(
             "Error while unzipping '{}': {}", source, ret
         ));
     }
diff --git a/src/util/coordinateconversion.cpp b/src/util/coordinateconversion.cpp
index cf2819cf45..f7638aa095 100644
--- a/src/util/coordinateconversion.cpp
+++ b/src/util/coordinateconversion.cpp
@@ -49,7 +49,7 @@ namespace {
         if (hOrDIndex == std::string::npos || mIndex == std::string::npos ||
             sIndex == std::string::npos)
         {
-            throw ghoul::lua::LuaRuntimeException(fmt::format(
+            throw ghoul::lua::LuaRuntimeException(std::format(
                 "Ra or Dec '{}' format is incorrect. Correct format is: Ra 'XhYmZs', "
                 "and Dec 'XdYmZs'", str
             ));
@@ -65,7 +65,7 @@ namespace {
             // Hours or degrees must be an integer
             double temp = std::stod(sHoursOrDegrees);
             if (std::floor(temp) != temp) {
-                throw ghoul::lua::LuaRuntimeException(fmt::format(
+                throw ghoul::lua::LuaRuntimeException(std::format(
                     "Ra or Dec '{}' format is incorrect. Correct format is: Ra 'XhYmZs', "
                     "and Dec 'XdYmZs', where X must be an integer", str
                 ));
@@ -75,7 +75,7 @@ namespace {
             // Minutes must be an integer
             temp = std::stod(sMinutes);
             if (std::floor(temp) != temp) {
-                throw ghoul::lua::LuaRuntimeException(fmt::format(
+                throw ghoul::lua::LuaRuntimeException(std::format(
                     "Ra or Dec '{}' format is incorrect. Correct format is: Ra 'XhYmZs', "
                     "and Dec 'XdYmZs', where Y must be an integer", str
                 ));
@@ -86,7 +86,7 @@ namespace {
             seconds = std::stod(sSeconds);
         }
         catch (const std::invalid_argument&) {
-            throw ghoul::lua::LuaRuntimeException(fmt::format(
+            throw ghoul::lua::LuaRuntimeException(std::format(
                 "Ra or Dec '{}' format is incorrect. Correct format is: Ra 'XhYmZs', "
                 "and Dec 'XdYmZs'", str
             ));
@@ -95,7 +95,7 @@ namespace {
 
     void parseRa(const std::string& ra, int& hours, int& minutes, double& seconds) {
         if (ra.find('d') != std::string::npos) {
-            throw ghoul::lua::LuaRuntimeException(fmt::format(
+            throw ghoul::lua::LuaRuntimeException(std::format(
                 "Ra '{}' format is incorrect. Correct format is: 'XhYmZs'", ra
             ));
         }
@@ -104,7 +104,7 @@ namespace {
 
     void parseDec(const std::string& dec, int& degrees, int& minutes, double& seconds) {
         if (dec.find('h') != std::string::npos) {
-            throw ghoul::lua::LuaRuntimeException(fmt::format(
+            throw ghoul::lua::LuaRuntimeException(std::format(
                 "Dec '{}' format is incorrect. Correct format is: 'XdYmZs'", dec
             ));
         }
@@ -114,21 +114,21 @@ namespace {
     bool isRaDecValid(int raH, int raM, double raS, int decD, int decM, double decS) {
         // Ra
         if (raH < 0.0 || raH >= 24.0) {
-            LWARNING(fmt::format(
+            LWARNING(std::format(
                 "Right ascension hours '{}' is outside the allowed range of 0 to 24 "
                 "hours (exclusive)", raH
             ));
             return false;
         }
         if (raM < 0.0 || raM >= 60.0) {
-            LWARNING(fmt::format(
+            LWARNING(std::format(
                 "Right ascension minutes '{}' is outside the allowed range of 0 to 60 "
                 "minutes (exclusive)", raM
             ));
             return false;
         }
         if (raS < 0.0 || raS >= 60.0) {
-            LWARNING(fmt::format(
+            LWARNING(std::format(
                 "Right ascension seconds '{}' is outside the allowed "
                 "range of 0 to 60 seconds (exclusive)", raS
             ));
@@ -137,7 +137,7 @@ namespace {
 
         // Dec
         if (decD < -90.0 || decD > 90.0) {
-            LWARNING(fmt::format("Declination degrees '{}' is outside the allowed range "
+            LWARNING(std::format("Declination degrees '{}' is outside the allowed range "
                 "of -90 to 90 degrees (inclusive)", decD
             ));
             return false;
@@ -150,14 +150,14 @@ namespace {
             return false;
         }
         if (decM < 0.0 || decM >= 60.0) {
-            LWARNING(fmt::format(
+            LWARNING(std::format(
                 "Declination minutes '{}' is outside the allowed range of 0 to 60 "
                 "minutes (exclusive)", decM
             ));
             return false;
         }
         if (decS < 0.0 || decS >= 60.0) {
-            LWARNING(fmt::format(
+            LWARNING(std::format(
                 "Declination seconds '{}' is outside the allowed range of 0 to 60 "
                 "seconds (exclusive)", decS
             ));
@@ -206,7 +206,7 @@ glm::dvec3 icrsToGalacticCartesian(double ra, double dec, double distance) {
 // coordinates-of-stars
 glm::dvec2 icrsToDecimalDegrees(const std::string& ra, const std::string& dec) {
     if (ra.size() < 6 || dec.size() < 6) {
-        throw ghoul::lua::LuaRuntimeException(fmt::format(
+        throw ghoul::lua::LuaRuntimeException(std::format(
             "Ra '{}' or Dec '{}' format is incorrect. Correct format is: Ra 'XhYmZs', "
             "and Dec 'XdYmZs'", ra, dec
         ));
@@ -233,7 +233,7 @@ glm::dvec2 icrsToDecimalDegrees(const std::string& ra, const std::string& dec) {
     );
 
     if (!isValid) {
-        LWARNING(fmt::format(
+        LWARNING(std::format(
             "Ra '{}' or Dec '{}' is outside the allowed range, result may be incorrect",
             ra, dec
         ));
@@ -289,7 +289,7 @@ glm::dvec3 galacticCartesianToIcrs(double x, double y, double z) {
 std::pair<std::string, std::string> decimalDegreesToIcrs(double ra, double dec) {
     // Check input
     if (ra < 0.0 || ra > 360.0 || dec < -90.0 || dec > 90.0) {
-        LWARNING(fmt::format(
+        LWARNING(std::format(
             "Ra '{}' or Dec '{}' is outside the allowed range, result may be incorrect",
             ra, dec
         ));
@@ -327,7 +327,7 @@ std::pair<std::string, std::string> decimalDegreesToIcrs(double ra, double dec)
     );
 
     if (!isValid) {
-        LWARNING(fmt::format(
+        LWARNING(std::format(
             "Resulting Ra '{}' or Dec '{}' is outside the allowed range, result may be "
             "incorrect", result.first, result.second
         ));
diff --git a/src/util/httprequest.cpp b/src/util/httprequest.cpp
index 1a56a7d4f0..6861cca777 100644
--- a/src/util/httprequest.cpp
+++ b/src/util/httprequest.cpp
@@ -123,7 +123,7 @@ bool HttpRequest::perform(std::chrono::milliseconds timeout) {
         if (responseCode >= 400) {
             LERRORC(
                 "HttpRequest",
-                fmt::format("Failed download '{}' with code {}", _url, responseCode)
+                std::format("Failed download '{}' with code {}", _url, responseCode)
             );
             success = false;
         }
@@ -134,7 +134,7 @@ bool HttpRequest::perform(std::chrono::milliseconds timeout) {
     else {
         LERRORC(
             "HttpRequest",
-            fmt::format(
+            std::format(
                 "Failed download '{}' with error {}", _url, curl_easy_strerror(res)
             )
         );
@@ -189,7 +189,7 @@ void HttpDownload::start(std::chrono::milliseconds timeout) {
     _isDownloading = true;
     _downloadThread = std::thread([this, timeout]() {
         _isFinished = false;
-        LTRACEC("HttpDownload", fmt::format("Start download '{}'", _httpRequest.url()));
+        LTRACEC("HttpDownload", std::format("Start download '{}'", _httpRequest.url()));
 
         const bool setupSuccess = setup();
         if (setupSuccess) {
@@ -206,13 +206,13 @@ void HttpDownload::start(std::chrono::milliseconds timeout) {
         if (_isSuccessful) {
             LTRACEC(
                 "HttpDownload",
-                fmt::format("Finished async download '{}'", _httpRequest.url())
+                std::format("Finished async download '{}'", _httpRequest.url())
             );
         }
         else {
             LTRACEC(
                 "HttpDownload",
-                fmt::format("Failed async download '{}'", _httpRequest.url())
+                std::format("Failed async download '{}'", _httpRequest.url())
             );
         }
 
@@ -258,7 +258,7 @@ HttpFileDownload::HttpFileDownload(std::string url, std::filesystem::path destin
     , _destination(std::move(destination))
 {
     if (!overwrite && std::filesystem::is_regular_file(_destination)) {
-        throw ghoul::RuntimeError(fmt::format("File '{}' already exists", _destination));
+        throw ghoul::RuntimeError(std::format("File '{}' already exists", _destination));
     }
 }
 
@@ -288,7 +288,7 @@ bool HttpFileDownload::setup() {
     // GetLastError() gives more details than errno.
     DWORD errorId = GetLastError();
     if (errorId == 0) {
-        LERRORC("HttpFileDownload", fmt::format("Cannot open file '{}'", _destination));
+        LERRORC("HttpFileDownload", std::format("Cannot open file '{}'", _destination));
         return false;
     }
     std::array<char, 256> Buffer;
@@ -306,7 +306,7 @@ bool HttpFileDownload::setup() {
     std::string message(Buffer.data(), size);
     LERRORC(
         "HttpFileDownload",
-        fmt::format("Cannot open file '{}': {}", _destination, message)
+        std::format("Cannot open file '{}': {}", _destination, message)
     );
     return false;
 #else // ^^^ WIN32 / !WIN32 vvv
@@ -315,7 +315,7 @@ bool HttpFileDownload::setup() {
         std::array<char, 256> buffer;
         LERRORC(
             "HttpFileDownload",
-            fmt::format(
+            std::format(
                 "Cannot open file '{}': {}",
                 _destination,
                 std::string(strerror_r(errno, buffer.data(), sizeof(buffer)))
@@ -325,7 +325,7 @@ bool HttpFileDownload::setup() {
 #else // ^^^ __unix__ / !__unix__ vvv
         LERRORC(
             "HttpFileDownload",
-            fmt::format(
+            std::format(
                 "Cannot open file '{}': {}", _destination, std::string(strerror(errno))
             )
         );
@@ -333,7 +333,7 @@ bool HttpFileDownload::setup() {
 #endif // __unix__
     }
 
-    LERRORC("HttpFileDownload", fmt::format("Cannot open file '{}'", _destination));
+    LERRORC("HttpFileDownload", std::format("Cannot open file '{}'", _destination));
     return false;
 #endif // WIN32
 }
diff --git a/src/util/json_helper.cpp b/src/util/json_helper.cpp
index 644d294a11..4d32fb52b3 100644
--- a/src/util/json_helper.cpp
+++ b/src/util/json_helper.cpp
@@ -126,7 +126,7 @@ ghoul::Dictionary jsonToDictionary(const nlohmann::json& json) {
                 for (int i = 0; i < j.size(); i++) {
                     const nlohmann::json& value = j[i];
                     // We add 1 to the key to make Lua happy :-/
-                    addToDict(subDict, fmt::format("{}", i + 1), value);
+                    addToDict(subDict, std::format("{}", i + 1), value);
                 }
                 dict.setValue(std::move(key), std::move(subDict));
                 break;
diff --git a/src/util/keys.cpp b/src/util/keys.cpp
index 0d4fd26aca..52dbfda6f7 100644
--- a/src/util/keys.cpp
+++ b/src/util/keys.cpp
@@ -59,7 +59,7 @@ KeyWithModifier stringToKey(const std::string& str) {
         }
     }
     if (key == Key::Unknown) {
-        throw ghoul::RuntimeError(fmt::format("Could not find key for '{}'", keyName));
+        throw ghoul::RuntimeError(std::format("Could not find key for '{}'", keyName));
     }
 
     KeyModifier m = KeyModifier::None;
@@ -77,7 +77,7 @@ KeyWithModifier stringToKey(const std::string& str) {
                 }
             }
             if (!found) {
-                throw ghoul::RuntimeError(fmt::format("Unknown modifier key '{}'", s));
+                throw ghoul::RuntimeError(std::format("Unknown modifier key '{}'", s));
             }
         }
     );
@@ -98,7 +98,7 @@ std::string keyToString(KeyWithModifier keyWithModifier) {
             // checks internally against != 0
 
             if (hasKeyModifier(keyWithModifier.modifier, kmi.modifier)) {
-                modifier += fmt::format("{}+", kmi.identifier);
+                modifier += std::format("{}+", kmi.identifier);
             }
         }
     }
@@ -145,7 +145,7 @@ std::string to_string(const openspace::KeyModifier& value) {
         // internally against != 0
 
         if (hasKeyModifier(value, kmi.modifier)) {
-            result += fmt::format("{}+", kmi.name);
+            result += std::format("{}+", kmi.name);
         }
 
     }
@@ -161,7 +161,7 @@ std::string to_string(const openspace::KeyWithModifier& value) {
         return to_string(value.key);
     }
     else {
-        return fmt::format("{}+{}", to_string(value.modifier), to_string(value.key));
+        return std::format("{}+{}", to_string(value.modifier), to_string(value.key));
     }
 }
 
diff --git a/src/util/openspacemodule.cpp b/src/util/openspacemodule.cpp
index 46f748fb8d..ab736d235e 100644
--- a/src/util/openspacemodule.cpp
+++ b/src/util/openspacemodule.cpp
@@ -56,7 +56,7 @@ void OpenSpaceModule::initialize(const ghoul::Dictionary& configuration) {
 
     std::filesystem::path path = modulePath();
     if (!path.empty()) {
-        LDEBUG(fmt::format("Registering module path '{}' -> {}", moduleToken, path));
+        LDEBUG(std::format("Registering module path '{}' -> {}", moduleToken, path));
         FileSys.registerPathToken(std::move(moduleToken), std::move(path));
     }
 
diff --git a/src/util/spicemanager.cpp b/src/util/spicemanager.cpp
index 03059610b0..b1766b6f44 100644
--- a/src/util/spicemanager.cpp
+++ b/src/util/spicemanager.cpp
@@ -26,7 +26,6 @@
 
 #include <openspace/engine/globals.h>
 #include <openspace/scripting/lualibrary.h>
-#include <ghoul/fmt.h>
 #include <ghoul/logging/logmanager.h>
 #include <ghoul/filesystem/file.h>
 #include <ghoul/filesystem/filesystem.h>
@@ -34,6 +33,7 @@
 #include <ghoul/misc/profiling.h>
 #include <algorithm>
 #include <filesystem>
+#include <format>
 #include "SpiceUsr.h"
 #include "SpiceZpr.h"
 
@@ -100,7 +100,7 @@ SpiceManager::AberrationCorrection::AberrationCorrection(const std::string& iden
     auto it = Mapping.find(identifier);
 
     ghoul_assert(!identifier.empty(), "Identifier may not be empty");
-    ghoul_assert(it != Mapping.end(), fmt::format("Invalid identifer '{}'", identifier));
+    ghoul_assert(it != Mapping.end(), std::format("Invalid identifer '{}'", identifier));
 
     type = it->second.first;
     direction = it->second.second;
@@ -218,11 +218,11 @@ SpiceManager::KernelHandle SpiceManager::loadKernel(std::string filePath) {
     ghoul_assert(!filePath.empty(), "Empty file path");
     ghoul_assert(
         std::filesystem::is_regular_file(filePath),
-        fmt::format("File '{}' ({}) does not exist", filePath, absPath(filePath))
+        std::format("File '{}' ({}) does not exist", filePath, absPath(filePath))
     );
     ghoul_assert(
         std::filesystem::is_directory(std::filesystem::path(filePath).parent_path()),
-        fmt::format(
+        std::format(
             "File '{}' exists, but directory '{}' does not",
             absPath(filePath), std::filesystem::path(filePath).parent_path()
         )
@@ -248,7 +248,7 @@ SpiceManager::KernelHandle SpiceManager::loadKernel(std::string filePath) {
     const std::filesystem::path p = path.parent_path();
     std::filesystem::current_path(p);
 
-    LINFO(fmt::format("Loading SPICE kernel '{}'", path));
+    LINFO(std::format("Loading SPICE kernel '{}'", path));
     // Load the kernel
     furnsh_c(path.string().c_str());
 
@@ -287,14 +287,14 @@ void SpiceManager::unloadKernel(KernelHandle kernelId) {
         // If there was only one part interested in the kernel, we can unload it
         if (it->refCount == 1) {
             // No need to check for errors as we do not allow empty path names
-            LINFO(fmt::format("Unloading SPICE kernel '{}'", it->path));
+            LINFO(std::format("Unloading SPICE kernel '{}'", it->path));
             unload_c(it->path.c_str());
             _loadedKernels.erase(it);
         }
         // Otherwise, we hold on to it, but reduce the reference counter by 1
         else {
             it->refCount--;
-            LDEBUG(fmt::format("Reducing reference counter to: {}", it->refCount));
+            LDEBUG(std::format("Reducing reference counter to: {}", it->refCount));
         }
     }
 }
@@ -313,7 +313,7 @@ void SpiceManager::unloadKernel(std::string filePath) {
     if (it == _loadedKernels.end()) {
         if (_useExceptions) {
             throw SpiceException(
-                fmt::format("'{}' did not correspond to a loaded kernel", path)
+                std::format("'{}' did not correspond to a loaded kernel", path)
             );
         }
         else {
@@ -323,14 +323,14 @@ void SpiceManager::unloadKernel(std::string filePath) {
     else {
         // If there was only one part interested in the kernel, we can unload it
         if (it->refCount == 1) {
-            LINFO(fmt::format("Unloading SPICE kernel '{}'", path));
+            LINFO(std::format("Unloading SPICE kernel '{}'", path));
             unload_c(path.string().c_str());
             _loadedKernels.erase(it);
         }
         else {
             // Otherwise, we hold on to it, but reduce the reference counter by 1
             it->refCount--;
-            LDEBUG(fmt::format("Reducing reference counter to: {}", it->refCount));
+            LDEBUG(std::format("Reducing reference counter to: {}", it->refCount));
         }
     }
 }
@@ -494,7 +494,7 @@ int SpiceManager::naifId(const std::string& body) const {
     SpiceInt id = 0;
     bods2c_c(body.c_str(), &id, &success);
     if (!success && _useExceptions) {
-        throw SpiceException(fmt::format("Could not find NAIF ID of body '{}'", body));
+        throw SpiceException(std::format("Could not find NAIF ID of body '{}'", body));
     }
     return id;
 }
@@ -515,7 +515,7 @@ int SpiceManager::frameId(const std::string& frame) const {
     SpiceInt id = 0;
     namfrm_c(frame.c_str(), &id);
     if (id == 0 && _useExceptions) {
-        throw SpiceException(fmt::format("Could not find NAIF ID of frame '{}'", frame));
+        throw SpiceException(std::format("Could not find NAIF ID of frame '{}'", frame));
     }
     return id;
 }
@@ -540,7 +540,7 @@ void getValueInternal(const std::string& body, const std::string& value, int siz
 
     if (failed_c()) {
         throwSpiceError(
-            fmt::format("Error getting value '{}' for body '{}'", value, body)
+            std::format("Error getting value '{}' for body '{}'", value, body)
         );
     }
 }
@@ -586,7 +586,7 @@ double SpiceManager::spacecraftClockToET(const std::string& craft,
     double et = 0.0;
     sct2e_c(craftId, craftTicks, &et);
     if (failed_c()) {
-        throwSpiceError(fmt::format(
+        throwSpiceError(std::format(
             "Error transforming spacecraft clock of '{}' at time {}", craft, craftTicks
         ));
     }
@@ -603,7 +603,7 @@ double SpiceManager::ephemerisTimeFromDate(const char* timeString) const {
     double et = 0.0;
     str2et_c(timeString, &et);
     if (failed_c()) {
-        throwSpiceError(fmt::format("Error converting date '{}'", timeString));
+        throwSpiceError(std::format("Error converting date '{}'", timeString));
     }
     return et;
 }
@@ -616,7 +616,7 @@ std::string SpiceManager::dateFromEphemerisTime(double ephemerisTime, const char
 
     timout_c(ephemerisTime, format, BufferSize, Buffer.data());
     if (failed_c()) {
-        throwSpiceError(fmt::format(
+        throwSpiceError(std::format(
             "Error converting ephemeris time '{}' to date with format '{}'",
             ephemerisTime, format
         ));
@@ -646,7 +646,7 @@ glm::dvec3 SpiceManager::targetPosition(const std::string& target,
     if (!targetHasCoverage && !observerHasCoverage) {
         if (_useExceptions) {
             throw SpiceException(
-                fmt::format(
+                std::format(
                     "Neither target '{}' nor observer '{}' has SPK coverage at time '{}'",
                     target, observer, ephemerisTime
                 )
@@ -668,7 +668,7 @@ glm::dvec3 SpiceManager::targetPosition(const std::string& target,
             &lightTime
         );
         if (failed_c()) {
-            throwSpiceError(fmt::format(
+            throwSpiceError(std::format(
                 "Error getting position from '{}' to '{}' in frame '{}' at time '{}'",
                 target, observer, referenceFrame, ephemerisTime
             ));
@@ -736,7 +736,7 @@ glm::dmat3 SpiceManager::frameTransformationMatrix(const std::string& from,
 
     if (failed_c()) {
         throwSpiceError(
-            fmt::format("Error converting from frame '{}' to frame '{}' at time '{}'",
+            std::format("Error converting from frame '{}' to frame '{}' at time '{}'",
                 from, to, ephemerisTime
             )
         );
@@ -784,7 +784,7 @@ SpiceManager::SurfaceInterceptResult SpiceManager::surfaceIntercept(
     result.interceptFound = (found == SPICETRUE);
 
     if (failed_c()) {
-        throwSpiceError(fmt::format(
+        throwSpiceError(std::format(
             "Error retrieving surface intercept on target '{}' viewed from observer '{}' "
             "in reference frame '{}' at time '{}'",
             target, observer, referenceFrame, ephemerisTime
@@ -821,7 +821,7 @@ bool SpiceManager::isTargetInFieldOfView(const std::string& target,
     );
 
     if (failed_c()) {
-        throwSpiceError(fmt::format(
+        throwSpiceError(std::format(
             "Checking if target '{}' is in view of instrument '{}' failed",
             target, instrument
         ));
@@ -856,7 +856,7 @@ SpiceManager::TargetStateResult SpiceManager::targetState(const std::string& tar
     );
 
     if (failed_c()) {
-        throwSpiceError(fmt::format(
+        throwSpiceError(std::format(
             "Error retrieving state of target '{}' viewed from observer '{}' in "
             "reference frame '{}' at time '{}'",
             target, observer, referenceFrame, ephemerisTime
@@ -884,7 +884,7 @@ SpiceManager::TransformMatrix SpiceManager::stateTransformMatrix(
         reinterpret_cast<double(*)[6]>(m.data())
     );
     if (failed_c()) {
-        throwSpiceError(fmt::format(
+        throwSpiceError(std::format(
             "Error retrieved state transform matrix from frame '{}' to frame '{}' at "
             "time '{}'",
             sourceFrame, destinationFrame, ephemerisTime
@@ -942,7 +942,7 @@ glm::dmat3 SpiceManager::positionTransformMatrix(const std::string& sourceFrame,
         reinterpret_cast<double(*)[3]>(glm::value_ptr(result))
     );
     if (failed_c()) {
-        throwSpiceError(fmt::format(
+        throwSpiceError(std::format(
             "Error retrieving position transform matrix from '{}' at time '{}' to frame "
             "'{}' at time '{}'",
             sourceFrame, ephemerisTimeFrom, destinationFrame, ephemerisTimeTo
@@ -980,7 +980,7 @@ SpiceManager::FieldOfViewResult SpiceManager::fieldOfView(int instrument) const
     );
 
     if (failed_c()) {
-        throwSpiceError(fmt::format(
+        throwSpiceError(std::format(
             "Error getting field-of-view parameters for instrument '{}'", instrument
         ));
         return res;
@@ -1039,7 +1039,7 @@ SpiceManager::TerminatorEllipseResult SpiceManager::terminatorEllipse(
         reinterpret_cast<double(*)[3]>(res.terminatorPoints.data())
     );
     if (failed_c()) {
-        throwSpiceError(fmt::format(
+        throwSpiceError(std::format(
             "Error getting terminator ellipse for target '{}' from observer '{}' in "
             "frame '{}' with light source '{}' at time '{}'",
             target, observer, frame, lightSource, ephemerisTime
@@ -1052,7 +1052,7 @@ void SpiceManager::findCkCoverage(const std::string& path) {
     ghoul_assert(!path.empty(), "Empty file path");
     ghoul_assert(
         std::filesystem::is_regular_file(path),
-        fmt::format("File '{}' does not exist", path)
+        std::format("File '{}' does not exist", path)
     );
 
     constexpr unsigned int MaxObj = 1024;
@@ -1112,7 +1112,7 @@ void SpiceManager::findSpkCoverage(const std::string& path) {
     ghoul_assert(!path.empty(), "Empty file path");
     ghoul_assert(
         std::filesystem::is_regular_file(path),
-        fmt::format("File '{}' does not exist", path)
+        std::format("File '{}' does not exist", path)
     );
 
     constexpr unsigned int MaxObj = 1024;
@@ -1193,7 +1193,7 @@ glm::dvec3 SpiceManager::getEstimatedPosition(const std::string& target,
     if (_spkCoverageTimes.find(targetId) == _spkCoverageTimes.end()) {
         if (_useExceptions) {
             // no coverage
-            throw SpiceException(fmt::format("No position for '{}' at any time", target));
+            throw SpiceException(std::format("No position for '{}' at any time", target));
         }
         else {
             return glm::dvec3(0.0);
@@ -1215,7 +1215,7 @@ glm::dvec3 SpiceManager::getEstimatedPosition(const std::string& target,
             &lightTime
         );
         if (failed_c()) {
-            throwSpiceError(fmt::format(
+            throwSpiceError(std::format(
                 "Error estimating position for '{}' with observer '{}' in frame '{}'",
                 target, observer, referenceFrame
             ));
@@ -1234,7 +1234,7 @@ glm::dvec3 SpiceManager::getEstimatedPosition(const std::string& target,
             &lightTime
         );
         if (failed_c()) {
-            throwSpiceError(fmt::format(
+            throwSpiceError(std::format(
                 "Error estimating position for '{}' with observer '{}' in frame '{}'",
                 target, observer, referenceFrame
             ));
@@ -1269,7 +1269,7 @@ glm::dvec3 SpiceManager::getEstimatedPosition(const std::string& target,
         );
 
         if (failed_c()) {
-            throwSpiceError(fmt::format(
+            throwSpiceError(std::format(
                 "Error estimating position for '{}' with observer '{}' in frame '{}'",
                 target, observer, referenceFrame
             ));
@@ -1294,7 +1294,7 @@ glm::dmat3 SpiceManager::getEstimatedTransformMatrix(const std::string& fromFram
     if (_ckCoverageTimes.find(idFrame) == _ckCoverageTimes.end()) {
         if (_useExceptions) {
             // no coverage
-            throw SpiceException(fmt::format(
+            throw SpiceException(std::format(
                 "No data available for transform matrix from '{}' to '{}' at any time",
                 fromFrame, toFrame
             ));
@@ -1315,7 +1315,7 @@ glm::dmat3 SpiceManager::getEstimatedTransformMatrix(const std::string& fromFram
             reinterpret_cast<double(*)[3]>(glm::value_ptr(result))
         );
         if (failed_c()) {
-            throwSpiceError(fmt::format(
+            throwSpiceError(std::format(
                 "Error estimating transform matrix from '{}' to from '{}' at time '{}'",
                 fromFrame, toFrame, time
             ));
@@ -1330,7 +1330,7 @@ glm::dmat3 SpiceManager::getEstimatedTransformMatrix(const std::string& fromFram
             reinterpret_cast<double(*)[3]>(glm::value_ptr(result))
         );
         if (failed_c()) {
-            throwSpiceError(fmt::format(
+            throwSpiceError(std::format(
                 "Error estimating transform matrix from frame '{}' to '{}' at time '{}'",
                 fromFrame, toFrame, time
             ));
@@ -1349,7 +1349,7 @@ glm::dmat3 SpiceManager::getEstimatedTransformMatrix(const std::string& fromFram
             reinterpret_cast<double(*)[3]>(glm::value_ptr(earlierTransform))
         );
         if (failed_c()) {
-            throwSpiceError(fmt::format(
+            throwSpiceError(std::format(
                 "Error estimating transform matrix from frame '{}' to '{}' at time '{}'",
                 fromFrame, toFrame, time
             ));
@@ -1363,7 +1363,7 @@ glm::dmat3 SpiceManager::getEstimatedTransformMatrix(const std::string& fromFram
             reinterpret_cast<double(*)[3]>(glm::value_ptr(laterTransform))
         );
         if (failed_c()) {
-            throwSpiceError(fmt::format(
+            throwSpiceError(std::format(
                 "Error estimating transform matrix from frame '{}' to '{}' at time '{}'",
                 fromFrame, toFrame, time
             ));
diff --git a/src/util/spicemanager_lua.inl b/src/util/spicemanager_lua.inl
index 1322c43b6a..dec8e0df24 100644
--- a/src/util/spicemanager_lua.inl
+++ b/src/util/spicemanager_lua.inl
@@ -36,7 +36,7 @@ namespace {
     if (std::holds_alternative<std::string>(kernel)) {
         std::string k = std::get<std::string>(kernel);
         if (!std::filesystem::is_regular_file(k)) {
-            throw ghoul::lua::LuaError(fmt::format("Kernel file '{}' did not exist", k));
+            throw ghoul::lua::LuaError(std::format("Kernel file '{}' did not exist", k));
         }
         openspace::SpiceManager::ref().loadKernel(k);
     }
@@ -44,7 +44,7 @@ namespace {
         std::vector<std::string> ks = std::get<std::vector<std::string>>(kernel);
         for (const std::string& k : ks) {
             if (!std::filesystem::is_regular_file(k)) {
-                throw ghoul::lua::LuaError(fmt::format(
+                throw ghoul::lua::LuaError(std::format(
                     "Kernel file '{}' did not exist", k
                 ));
             }
@@ -192,7 +192,7 @@ namespace {
     std::vector<std::string> lines = ghoul::tokenizeString(contents, '\n');
     const size_t nElements = lines.size() / 3;
     if (elementToExtract > nElements) {
-        throw ghoul::RuntimeError(fmt::format(
+        throw ghoul::RuntimeError(std::format(
             "Error loading {}. Element number {} requested, but only {} found",
             tle, nElements, elementToExtract
         ));
@@ -203,14 +203,14 @@ namespace {
     // It should be 70, but we're removing the \n character at the end in the tokenization
     std::string line1 = lines[3 * elementToExtract + 1];
     if (line1.size() != TLEColumnWidth - 1) {
-        throw ghoul::RuntimeError(fmt::format(
+        throw ghoul::RuntimeError(std::format(
             "Illformed TLE file {}, expected {} characters per line, got {}",
             tle, TLEColumnWidth, line1.size()
         ));
     }
     std::string line2 = lines[3 * elementToExtract + 2];
     if (line2.size() != TLEColumnWidth - 1) {
-        throw ghoul::RuntimeError(fmt::format(
+        throw ghoul::RuntimeError(std::format(
             "Illformed TLE file {}, expected {} characters per line, got {}",
             tle, TLEColumnWidth, line2.size()
         ));
@@ -235,7 +235,7 @@ namespace {
     // Extract the body id
     std::vector<std::string> tokens = ghoul::tokenizeString(line2, ' ');
     if (tokens.size() < 2) {
-        throw ghoul::RuntimeError(fmt::format(
+        throw ghoul::RuntimeError(std::format(
             "Error parsing TLE file {}. Expected 8-9 elements in the second row, got {}",
             tle, tokens.size()
         ));
@@ -248,7 +248,7 @@ namespace {
 
     // Write the elements to a new SPK file
     const SpiceInt nCommentCharacters = 0;
-    std::string internalFileName = fmt::format("Type 10 SPK for {}", tle);
+    std::string internalFileName = std::format("Type 10 SPK for {}", tle);
     std::string segmentId = "Segment";
 
     if (std::filesystem::exists(spk)) {
diff --git a/src/util/taskloader.cpp b/src/util/taskloader.cpp
index a6c25bb224..045e4680ce 100644
--- a/src/util/taskloader.cpp
+++ b/src/util/taskloader.cpp
@@ -58,7 +58,7 @@ std::vector<std::unique_ptr<Task>> TaskLoader::tasksFromDictionary(
             const std::string& taskType = subTask.value<std::string>("Type");
             std::unique_ptr<Task> task = Task::createFromDictionary(subTask);
             if (!task) {
-                LERROR(fmt::format(
+                LERROR(std::format(
                     "Failed to create a Task object of type '{}'", taskType
                 ));
             }
@@ -71,7 +71,7 @@ std::vector<std::unique_ptr<Task>> TaskLoader::tasksFromDictionary(
 std::vector<std::unique_ptr<Task>> TaskLoader::tasksFromFile(const std::string& path) {
     std::filesystem::path absTasksFile = absPath(path);
     if (!std::filesystem::is_regular_file(absTasksFile)) {
-        LERROR(fmt::format(
+        LERROR(std::format(
             "Could not load tasks file '{}'. File not found", absTasksFile
         ));
         return std::vector<std::unique_ptr<Task>>();
@@ -82,7 +82,7 @@ std::vector<std::unique_ptr<Task>> TaskLoader::tasksFromFile(const std::string&
         ghoul::lua::loadDictionaryFromFile(absTasksFile.string(), tasksDictionary);
     }
     catch (const ghoul::RuntimeError& e) {
-        LERROR(fmt::format(
+        LERROR(std::format(
             "Could not load tasks file '{}'. Lua error: ({}) {}",
             absTasksFile, e.message, e.component
         ));
@@ -93,7 +93,7 @@ std::vector<std::unique_ptr<Task>> TaskLoader::tasksFromFile(const std::string&
         return tasksFromDictionary(tasksDictionary);
     }
     catch (const documentation::SpecificationError& e) {
-        LERROR(fmt::format("Could not load tasks file '{}': {}", absTasksFile, e.what()));
+        LERROR(std::format("Could not load tasks file '{}': {}", absTasksFile, e.what()));
         logError(e);
 
         return std::vector<std::unique_ptr<Task>>();
diff --git a/src/util/time.cpp b/src/util/time.cpp
index 85f3259b25..51419dcc90 100644
--- a/src/util/time.cpp
+++ b/src/util/time.cpp
@@ -63,7 +63,7 @@ double Time::convertTime(const char* time) {
 std::string Time::currentWallTime() {
     const std::time_t t = std::time(nullptr);
     std::tm* utcTime = std::gmtime(&t);
-    const std::string time = fmt::format(
+    const std::string time = std::format(
         "{:04d}-{:02d}-{:02d}T{:02d}:{:02d}:{:02d}",
         utcTime->tm_year + 1900, utcTime->tm_mon + 1, utcTime->tm_mday,
         utcTime->tm_hour, utcTime->tm_min, utcTime->tm_sec
@@ -177,7 +177,7 @@ std::string Time::advancedTime(const std::string& base, std::string change) {
         else if (uName == "M") { unit = TimeUnit::Month; }
         else if (uName == "y") { unit = TimeUnit::Year; }
         else {
-            throw ghoul::RuntimeError(fmt::format("Unknown unit '{}'", uName));
+            throw ghoul::RuntimeError(std::format("Unknown unit '{}'", uName));
         }
 
         dt = openspace::convertTime(value, unit, TimeUnit::Second);
@@ -186,7 +186,7 @@ std::string Time::advancedTime(const std::string& base, std::string change) {
         }
     }
     catch (...) {
-        throw ghoul::RuntimeError(fmt::format(
+        throw ghoul::RuntimeError(std::format(
             "Error parsing relative time offset '{}'", change
         ));
     }
diff --git a/src/util/time_lua.inl b/src/util/time_lua.inl
index 5cbd3c942d..811c808a13 100644
--- a/src/util/time_lua.inl
+++ b/src/util/time_lua.inl
@@ -329,7 +329,7 @@ namespace {
     }
     else {
         double v = std::get<double>(change);
-        c = fmt::format("{}s", v);
+        c = std::format("{}s", v);
     }
 
     std::string res = openspace::Time::advancedTime(std::move(b), std::move(c));
diff --git a/src/util/timemanager.cpp b/src/util/timemanager.cpp
index 74ac17eb4a..2f704f39a4 100644
--- a/src/util/timemanager.cpp
+++ b/src/util/timemanager.cpp
@@ -499,16 +499,16 @@ void TimeManager::addDeltaTimesKeybindings() {
     );
 
     auto addDeltaTimeKeybind = [this](Key key, KeyModifier mod, double step) {
-        const std::string s = fmt::format("{:.0f}", step);
+        const std::string s = std::format("{:.0f}", step);
 
-        std::string identifier = fmt::format("{}.{}", DeltaTimeActionPrefix, s);
+        std::string identifier = std::format("{}.{}", DeltaTimeActionPrefix, s);
         interaction::Action action;
         action.identifier = identifier;
-        action.command = fmt::format("openspace.time.interpolateDeltaTime({})", s);
-        action.documentation = fmt::format(
+        action.command = std::format("openspace.time.interpolateDeltaTime({})", s);
+        action.documentation = std::format(
             "Setting the simulation speed to {} seconds per realtime second", s
         );
-        action.name = fmt::format("Set: {}", s);
+        action.name = std::format("Set: {}", s);
         action.guiPath = DeltaTimeStepsGuiPath;
         action.isLocal = interaction::Action::IsLocal::Yes;
         global::actionManager->registerAction(std::move(action));
@@ -542,7 +542,7 @@ void TimeManager::addDeltaTimesKeybindings() {
     LINFO("Added keybindings for specified delta time steps");
     const int maxKeyBinds = 3 * nKeys;
     if (nSteps > maxKeyBinds) {
-        LWARNING(fmt::format(
+        LWARNING(std::format(
             "Error settings delta time keys: Too many delta times, so not all could be "
             "mapped to a key. Total: {} steps, which is {} more than the number of "
             "available keybindings",
@@ -567,9 +567,9 @@ void TimeManager::clearDeltaTimesKeybindings() {
         if (bindings.size() > 1) {
             std::string names;
             for (auto& b : bindings) {
-                names += fmt::format("'{}' ", b.second);
+                names += std::format("'{}' ", b.second);
             }
-            LWARNING(fmt::format(
+            LWARNING(std::format(
                 "Updating keybindings for new delta time steps: More than one action "
                 "was bound to key '{}'. The following actions are removed: {}",
                 ghoul::to_string(kb), names
diff --git a/src/util/versionchecker.cpp b/src/util/versionchecker.cpp
index d4efdd8e9a..bbe89433c0 100644
--- a/src/util/versionchecker.cpp
+++ b/src/util/versionchecker.cpp
@@ -47,7 +47,7 @@ void VersionChecker::requestLatestVersion(const std::string& url) {
     std::string operatingSystem = SysCap.component<GCC>().operatingSystemString();
     operatingSystem = ghoul::encodeUrl(operatingSystem);
 
-    std::string fullUrl = fmt::format(
+    std::string fullUrl = std::format(
         "{}?client_version={}&commit_hash={}&operating_system={}",
         url, OPENSPACE_VERSION_NUMBER, OPENSPACE_GIT_COMMIT, operatingSystem
     );
@@ -100,7 +100,7 @@ void VersionChecker::cancel() {
             };
 
             if (currentVersion < _latestVersion) {
-                LINFO(fmt::format(
+                LINFO(std::format(
                     "Newer OpenSpace version {}.{}.{} is available. "
                     "Currently running {}.{}.{}",
                     _latestVersion->major,
@@ -112,7 +112,7 @@ void VersionChecker::cancel() {
                 ));
             }
             else {
-                LINFO(fmt::format(
+                LINFO(std::format(
                     "OpenSpace version {}.{}.{} is up to date",
                     currentVersion.major,
                     currentVersion.minor,
@@ -126,7 +126,7 @@ void VersionChecker::cancel() {
             _request->wait();
             std::vector<char> data = _request->downloadedData();
             const std::string response = std::string(data.begin(), data.end());
-            LWARNING(fmt::format(
+            LWARNING(std::format(
                 "Failed to get OpenSpace version information from {}. Response: {}",
                 _request->url(),
                 response
diff --git a/support/coding/codegen b/support/coding/codegen
index 871a465402..8798d8a462 160000
--- a/support/coding/codegen
+++ b/support/coding/codegen
@@ -1 +1 @@
-Subproject commit 871a4654024fc1043cc2120a94d05fb3edc88887
+Subproject commit 8798d8a462d93dd5a2fd3b8dfa8917083e50a6ee
diff --git a/tests/test_sgctedit.cpp b/tests/test_sgctedit.cpp
index 0ac97f351d..283cbcf3ac 100644
--- a/tests/test_sgctedit.cpp
+++ b/tests/test_sgctedit.cpp
@@ -26,7 +26,6 @@
 #include <catch2/matchers/catch_matchers_exception.hpp>
 
 #include <ghoul/filesystem/filesystem.h>
-#include <ghoul/fmt.h>
 #include <nlohmann/json.hpp>
 #include <nlohmann/json-schema.hpp>
 #include <sgct/readconfig.h>

From 9efbc58c89dceaa1075e1ecc6053e1247f8e5e7f Mon Sep 17 00:00:00 2001
From: Alexander Bock <alexander.bock@liu.se>
Date: Sun, 24 Mar 2024 22:16:21 +0100
Subject: [PATCH 329/701] Add support for audio playback (#3085)

* Add support for audio playback using the SoLoud library
* Add 3D audio and some comments
* Add documentation and examples
---
 .gitmodules                                   |   3 +
 apps/OpenSpace/main.cpp                       |   2 +
 .../examples/audio/audio_playback.asset       |  21 +
 .../audio/audio_playback_advanced.asset       |  71 +++
 modules/audio/CMakeLists.txt                  |  58 +++
 modules/audio/audiomodule.cpp                 | 409 ++++++++++++++++++
 modules/audio/audiomodule.h                   | 315 ++++++++++++++
 modules/audio/audiomodule_lua.inl             | 354 +++++++++++++++
 modules/audio/ext/soloud                      |   1 +
 modules/globebrowsing/globebrowsingmodule.cpp |   1 -
 modules/sound/ext/soloud                      |   1 +
 11 files changed, 1235 insertions(+), 1 deletion(-)
 create mode 100644 data/assets/examples/audio/audio_playback.asset
 create mode 100644 data/assets/examples/audio/audio_playback_advanced.asset
 create mode 100644 modules/audio/CMakeLists.txt
 create mode 100644 modules/audio/audiomodule.cpp
 create mode 100644 modules/audio/audiomodule.h
 create mode 100644 modules/audio/audiomodule_lua.inl
 create mode 160000 modules/audio/ext/soloud
 create mode 160000 modules/sound/ext/soloud

diff --git a/.gitmodules b/.gitmodules
index d98a1a3adf..48dc166939 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -41,3 +41,6 @@
 [submodule "support/doxygen/css"]
 	path = support/doxygen/css
 	url = https://github.com/jothepro/doxygen-awesome-css.git
+[submodule "modules/audio/ext/soloud"]
+	path = modules/audio/ext/soloud
+	url = https://github.com/jarikomppa/soloud
diff --git a/apps/OpenSpace/main.cpp b/apps/OpenSpace/main.cpp
index f999623859..7bcbbcbaa9 100644
--- a/apps/OpenSpace/main.cpp
+++ b/apps/OpenSpace/main.cpp
@@ -1085,6 +1085,8 @@ std::string selectedSgctProfileFromLauncher(LauncherWindow& lw, bool hasCliSGCTC
 
 
 int main(int argc, char* argv[]) {
+    ZoneScoped;
+
 #ifdef OPENSPACE_BREAK_ON_FLOATING_POINT_EXCEPTION
     _clearfp();
     _controlfp(_controlfp(0, 0) & ~(_EM_ZERODIVIDE | _EM_OVERFLOW), _MCW_EM);
diff --git a/data/assets/examples/audio/audio_playback.asset b/data/assets/examples/audio/audio_playback.asset
new file mode 100644
index 0000000000..b236dd744d
--- /dev/null
+++ b/data/assets/examples/audio/audio_playback.asset
@@ -0,0 +1,21 @@
+-- Lets first download a file that we can use for our examples. If you have files
+-- locally, you can skip this part.
+-- The song in the example comes from https://incompetech.com/ which is a fantastic
+-- webpage for very high quality royalty-free music
+openspace.downloadFile(
+  "https://incompetech.com/music/royalty-free/mp3-royaltyfree/Arcadia.mp3",
+  openspace.absPath("${TEMPORARY}/Arcadia.mp3"),
+  true
+)
+
+local soundName = "Example_Sound_1"
+
+asset.onInitialize(function()
+  -- Start playing the song immediately
+  openspace.audio.playAudio(openspace.absPath("${TEMPORARY}/Arcadia.mp3"), soundName)
+end)
+
+asset.onDeinitialize(function()
+  -- When we remove this asset, we want to audio to stop playing no matter what
+  openspace.audio.stopAudio(soundName)
+end)
diff --git a/data/assets/examples/audio/audio_playback_advanced.asset b/data/assets/examples/audio/audio_playback_advanced.asset
new file mode 100644
index 0000000000..7ba43bdb01
--- /dev/null
+++ b/data/assets/examples/audio/audio_playback_advanced.asset
@@ -0,0 +1,71 @@
+-- Lets first download a file that we can use for our examples. If you have files
+-- locally, you can skip this part.
+-- The song in the example comes from https://incompetech.com/ which is a fantastic
+-- webpage for very high quality royalty-free music
+openspace.downloadFile(
+  "https://incompetech.com/music/royalty-free/mp3-royaltyfree/Sneaky%20Adventure.mp3",
+  openspace.absPath("${TEMPORARY}/SneakyAdventure.mp3"),
+  true
+)
+local soundName = "Advanced_Example_Sound_1"
+
+local panleft = {
+  Identifier = "os.examples.PanLeft",
+  Name = "Example Audio Pan Left",
+  Command = [[openspace.audio.set3dSourcePosition("Advanced_Example_Sound_1", { -1, 0, 0 })]],
+  GuiPath = "/Example/Audio"
+}
+
+local pancenter = {
+  Identifier = "os.examples.PanCenter",
+  Name = "Example Audio Pan Center",
+  Command = [[openspace.audio.set3dSourcePosition("Advanced_Example_Sound_1", { 0, 0, 0 })]],
+  GuiPath = "/Example/Audio"
+}
+
+local panright = {
+  Identifier = "os.examples.PanRight",
+  Name = "Example Audio Pan Right",
+  Command = [[openspace.audio.set3dSourcePosition("Advanced_Example_Sound_1", { 1, 0, 0 })]],
+  GuiPath = "/Example/Audio"
+}
+
+local lowvolume = {
+  Identifier = "os.examples.LowVolume",
+  Name = "Example Audio Volume Low",
+  Command = [[openspace.audio.setVolume("Advanced_Example_Sound_1", 0.15)]],
+  GuiPath = "/Example/Audio"
+}
+
+local fullvolume = {
+  Identifier = "os.examples.FullVolume",
+  Name = "Example Audio Volume Full",
+  Command = [[openspace.audio.setVolume("Advanced_Example_Sound_1", 1.0)]],
+  GuiPath = "/Example/Audio"
+}
+
+asset.onInitialize(function()
+  -- Start playing the song immediately in 3D. Place the audio straight in front of us
+  openspace.audio.playAudio3d(
+    openspace.absPath("${TEMPORARY}/SneakyAdventure.mp3"),
+    soundName,
+    { 0.0, 0.0, 0.0 }
+  )
+
+  openspace.action.registerAction(panleft)
+  openspace.action.registerAction(pancenter)
+  openspace.action.registerAction(panright)
+  openspace.action.registerAction(lowvolume)
+  openspace.action.registerAction(fullvolume)
+end)
+
+asset.onDeinitialize(function()
+  openspace.action.removeAction(fullvolume)
+  openspace.action.removeAction(lowvolume)
+  openspace.action.removeAction(panright)
+  openspace.action.removeAction(pancenter)
+  openspace.action.removeAction(panleft)
+
+  -- When we remove this asset, we want to audio to stop playing no matter what
+  openspace.audio.stopAudio(soundName)
+end)
diff --git a/modules/audio/CMakeLists.txt b/modules/audio/CMakeLists.txt
new file mode 100644
index 0000000000..76129785b6
--- /dev/null
+++ b/modules/audio/CMakeLists.txt
@@ -0,0 +1,58 @@
+##########################################################################################
+#                                                                                        #
+# OpenSpace                                                                              #
+#                                                                                        #
+# Copyright (c) 2014-2023                                                                #
+#                                                                                        #
+# Permission is hereby granted, free of charge, to any person obtaining a copy of this   #
+# software and associated documentation files (the "Software"), to deal in the Software  #
+# without restriction, including without limitation the rights to use, copy, modify,     #
+# merge, publish, distribute, sublicense, and/or sell copies of the Software, and to     #
+# permit persons to whom the Software is furnished to do so, subject to the following    #
+# conditions:                                                                            #
+#                                                                                        #
+# The above copyright notice and this permission notice shall be included in all copies  #
+# or substantial portions of the Software.                                               #
+#                                                                                        #
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED,    #
+# INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A          #
+# PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT     #
+# HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF   #
+# CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE   #
+# OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                                          #
+##########################################################################################
+
+include(${PROJECT_SOURCE_DIR}/support/cmake/module_definition.cmake)
+
+set(HEADER_FILES
+  audiomodule.h
+)
+source_group("Header Files" FILES ${HEADER_FILES})
+
+set(SOURCE_FILES
+  audiomodule.cpp
+  audiomodule_lua.inl
+)
+source_group("Source Files" FILES ${SOURCE_FILES})
+
+create_new_module(
+  "Audio"
+  audio_module
+  STATIC
+  ${HEADER_FILES} ${SOURCE_FILES} ${SHADER_FILES}
+)
+
+begin_dependency("SoLoud")
+set(SOLOUD_BACKEND_SDL2 OFF CACHE BOOL "")
+if (WIN32)
+  set(SOLOUD_BACKEND_WINMM ON CACHE BOOL "")
+elseif (UNIX)
+  set(SOLOUD_BACKEND_ALSA ON CACHE BOOL "")
+endif ()
+add_subdirectory(ext/soloud/contrib)
+
+# Unfortunately, the soloud cmake tarket doesn't set the include directories correctly
+target_include_directories(openspace-module-audio SYSTEM PRIVATE ext/soloud/include)
+target_link_libraries(openspace-module-audio PRIVATE soloud)
+set_property(TARGET soloud PROPERTY FOLDER "External")
+end_dependency("SoLoud")
diff --git a/modules/audio/audiomodule.cpp b/modules/audio/audiomodule.cpp
new file mode 100644
index 0000000000..7af25633e8
--- /dev/null
+++ b/modules/audio/audiomodule.cpp
@@ -0,0 +1,409 @@
+/*****************************************************************************************
+ *                                                                                       *
+ * OpenSpace                                                                             *
+ *                                                                                       *
+ * Copyright (c) 2014-2024                                                               *
+ *                                                                                       *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
+ * software and associated documentation files (the "Software"), to deal in the Software *
+ * without restriction, including without limitation the rights to use, copy, modify,    *
+ * merge, publish, distribute, sublicense, and/or sell copies of the Software, and to    *
+ * permit persons to whom the Software is furnished to do so, subject to the following   *
+ * conditions:                                                                           *
+ *                                                                                       *
+ * The above copyright notice and this permission notice shall be included in all copies *
+ * or substantial portions of the Software.                                              *
+ *                                                                                       *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED,   *
+ * INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A         *
+ * PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT    *
+ * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF  *
+ * CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE  *
+ * OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                                         *
+ ****************************************************************************************/
+
+#include <modules/audio/audiomodule.h>
+
+#include <openspace/engine/globals.h>
+#include <openspace/engine/globalscallbacks.h>
+#include <ghoul/logging/logmanager.h>
+
+#include "audiomodule_lua.inl"
+
+#include <soloud.h>
+#include <soloud_wav.h>
+
+namespace {
+    constexpr std::string_view _loggerCat = "AudioModule";
+
+    struct [[codegen::Dictionary(AudioModule)]] Parameters {
+        // Sets the maximum number of simultaneous channels that can be played back by the
+        // audio subsystem. If this value is not specified, it defaults to 128.
+        std::optional<int> maxNumberOfChannels [[codegen::greater(0)]];
+    };
+
+#include "audiomodule_codegen.cpp"
+} // namespace
+
+namespace openspace {
+
+AudioModule::AudioModule()
+    : OpenSpaceModule(Name)
+    , _engine(std::make_unique<SoLoud::Soloud>())
+{}
+
+AudioModule::~AudioModule() {}
+
+void AudioModule::internalInitialize(const ghoul::Dictionary& dictionary) {
+    const Parameters p = codegen::bake<Parameters>(dictionary);
+
+    LDEBUG(fmt::format("Initializing SoLoud version: {}", SOLOUD_VERSION));
+
+    _engine->init();
+    _engine->setGlobalVolume(0.5f);
+    const int nChannels = p.maxNumberOfChannels.value_or(16);
+    _engine->setMaxActiveVoiceCount(static_cast<unsigned int>(nChannels));
+
+    global::callback::postDraw->emplace_back([this]() {
+        if (!_sounds.empty()) {
+            _engine->update3dAudio();
+        }
+    });
+
+    LDEBUG(fmt::format("Audio backend: {}", _engine->getBackendString()));
+    LDEBUG(fmt::format("Number of channels: {}", _engine->getBackendChannels()));
+}
+
+void AudioModule::internalDeinitializeGL() {
+    ghoul_assert(_engine, "No audio engine loaded");
+
+    _sounds.clear();
+    _engine->deinit();
+    _engine = nullptr;
+}
+
+std::unique_ptr<SoLoud::Wav> AudioModule::loadSound(const std::filesystem::path& path) {
+    ghoul_assert(_engine, "No audio engine loaded");
+
+    std::unique_ptr<SoLoud::Wav> sound = std::make_unique<SoLoud::Wav>();
+    const std::string p = path.string();
+    SoLoud::result res = sound->load(p.c_str());
+    if (res != 0) {
+        throw ghoul::RuntimeError(fmt::format(
+            "Error loading sound from {}. {}: {}",
+            path, static_cast<int>(res), _engine->getErrorString(res)
+        ));
+    }
+
+    // While we are loading a sound, we also want to do a little garbage collection on our
+    // internal data structure to remove the songs that someone has loaded at some point
+    // and that have since organically stopped. In general, this should only happen if the
+    // song was started without looping and has ended
+    for (auto it = _sounds.begin(); it != _sounds.end();) {
+        if (!isPlaying(it->first)) {
+            // We have found one of the candidates
+            LDEBUG(fmt::format("Removing song {} as it has ended", it->first));
+            _sounds.erase(it);
+            // It is easier to just reset the iterator to the beginning than deal with the
+            // off-by-one error when deleting the last element in the list and the
+            // subsequent crash
+            it = _sounds.begin();
+        }
+        else {
+            it++;
+        }
+    }
+
+    return sound;
+}
+
+void AudioModule::playAudio(const std::filesystem::path& path, std::string identifier,
+                            ShouldLoop loop)
+{
+    ghoul_assert(_engine, "No audio engine loaded");
+    if (_sounds.find(identifier) != _sounds.end()) {
+        LERROR(fmt::format("Sound with name '{}' already played", identifier));
+        return;
+    }
+
+    std::unique_ptr<SoLoud::Wav> sound = loadSound(path);
+    sound->setLooping(loop);
+    SoLoud::handle handle = _engine->playBackground(*sound);
+
+    ghoul_assert(_sounds.find(identifier) == _sounds.end(), "Handle already used");
+    _sounds[identifier] = {
+        .sound = std::move(sound),
+        .handle = handle
+    };
+}
+
+void AudioModule::playAudio3d(const std::filesystem::path& path, std::string identifier,
+                              const glm::vec3& position, ShouldLoop loop)
+{
+    ghoul_assert(_engine, "No audio engine loaded");
+    if (_sounds.find(identifier) != _sounds.end()) {
+        LERROR(fmt::format("Sound with name '{}' already played", identifier));
+        return;
+    }
+
+    std::unique_ptr<SoLoud::Wav> sound = loadSound(path);
+    sound->setLooping(loop);
+    SoLoud::handle handle = _engine->play3d(*sound, position.x, position.y, position.z);
+
+    _sounds[identifier] = {
+        .sound = std::move(sound),
+        .handle = handle
+    };
+}
+
+void AudioModule::stopAudio(const std::string& identifier) {
+    ghoul_assert(_engine, "No audio engine loaded");
+
+    auto it = _sounds.find(identifier);
+    if (it != _sounds.end()) {
+        _engine->stop(it->second.handle);
+        _sounds.erase(it);
+    }
+}
+
+void AudioModule::stopAll() {
+    ghoul_assert(_engine, "No audio engine loaded");
+
+    _engine->stopAll();
+    _sounds.clear();
+}
+
+void AudioModule::pauseAll() const {
+    for (const std::pair<const std::string, Info>& sound : _sounds) {
+        pauseAudio(sound.first);
+    }
+}
+
+void AudioModule::resumeAll() const {
+    for (const std::pair<const std::string, Info>& sound : _sounds) {
+        resumeAudio(sound.first);
+    }
+}
+
+void AudioModule::playAllFromStart() const {
+    for (const std::pair<const std::string, Info>& sound : _sounds) {
+        _engine->seek(sound.second.handle, 0.f);
+    }
+    resumeAll();
+}
+
+bool AudioModule::isPlaying(const std::string& identifier) const {
+    ghoul_assert(_engine, "No audio engine loaded");
+
+    auto it = _sounds.find(identifier);
+    if (it != _sounds.end()) {
+        return _engine->isValidVoiceHandle(it->second.handle);
+    }
+    else {
+        return false;
+    }
+}
+
+void AudioModule::pauseAudio(const std::string& identifier) const {
+    ghoul_assert(_engine, "No audio engine loaded");
+
+    auto it = _sounds.find(identifier);
+    if (it != _sounds.end()) {
+        _engine->setPause(it->second.handle, true);
+    }
+}
+
+void AudioModule::resumeAudio(const std::string& identifier) const {
+    ghoul_assert(_engine, "No audio engine loaded");
+
+    auto it = _sounds.find(identifier);
+    if (it != _sounds.end()) {
+        _engine->setPause(it->second.handle, false);
+    }
+}
+
+bool AudioModule::isPaused(const std::string& identifier) const {
+    ghoul_assert(_engine, "No audio engine loaded");
+
+    auto it = _sounds.find(identifier);
+    if (it != _sounds.end()) {
+        const bool isPaused = _engine->getPause(it->second.handle);
+        return isPaused;
+    }
+    else {
+        return true;
+    }
+}
+
+void AudioModule::setLooping(const std::string& identifier, ShouldLoop loop) const {
+    ghoul_assert(_engine, "No audio engine loaded");
+
+    auto it = _sounds.find(identifier);
+    if (it != _sounds.end()) {
+        _engine->setLooping(it->second.handle, loop);
+    }
+}
+
+AudioModule::ShouldLoop AudioModule::isLooping(const std::string& identifier) const {
+    ghoul_assert(_engine, "No audio engine loaded");
+
+    auto it = _sounds.find(identifier);
+    if (it != _sounds.end()) {
+        return _engine->getLooping(it->second.handle) ? ShouldLoop::Yes : ShouldLoop::No;
+    }
+    else {
+        return ShouldLoop::No;
+    }
+}
+
+void AudioModule::setVolume(const std::string& identifier, float volume, float fade) const
+{
+    ghoul_assert(_engine, "No audio engine loaded");
+
+    auto it = _sounds.find(identifier);
+    if (it == _sounds.end()) {
+        return;
+    }
+
+    // We clamp the volume level between [0, 1] to not accidentally blow any speakers
+    volume = glm::clamp(volume, 0.f, 1.f);
+    if (fade == 0.f) {
+        _engine->setVolume(it->second.handle, volume);
+    }
+    else {
+        _engine->fadeVolume(it->second.handle, volume, fade);
+    }
+}
+
+float AudioModule::volume(const std::string& identifier) const {
+    ghoul_assert(_engine, "No audio engine loaded");
+
+    auto it = _sounds.find(identifier);
+    if (it != _sounds.end()) {
+        const float volume = _engine->getVolume(it->second.handle);
+        return volume;
+    }
+    else {
+        return 0.f;
+    }
+}
+
+void AudioModule::set3dSourcePosition(const std::string& identifier,
+                                      const glm::vec3& position) const
+{
+    ghoul_assert(_engine, "No audio engine loaded");
+
+    auto it = _sounds.find(identifier);
+    if (it != _sounds.end()) {
+        _engine->set3dSourcePosition(
+            it->second.handle,
+            position.x, position.y, position.z
+        );
+    }
+}
+
+std::vector<std::string> AudioModule::currentlyPlaying() const {
+    // This function is *technically* not the ones that are playing, but that ones that we
+    // are keeping track of. So we still have songs in our internal data structure that
+    // were started as not-looping and that have ended playing. We need to filter them out
+    // here.
+    // The alternative would be to have a periodic garbage collection running, but that
+    // feels worse. We are doing the garbage collection in the two playAudio functions
+    // instead, since we have to do some work their either way
+
+    std::vector<std::string> res;
+    res.reserve(_sounds.size());
+    for (const std::pair<const std::string, Info>& sound : _sounds) {
+        if (isPlaying(sound.first)) {
+            res.push_back(sound.first);
+        }
+    }
+    return res;
+}
+
+void AudioModule::setGlobalVolume(float volume, float fade) const {
+    ghoul_assert(_engine, "No audio engine loaded");
+
+    // We clamp the volume level between [0, 1] to not accidentally blow any speakers
+    volume = glm::clamp(volume, 0.f, 1.f);
+    if (fade == 0.f) {
+        _engine->setGlobalVolume(volume);
+    }
+    else {
+        _engine->fadeGlobalVolume(volume, fade);
+    }
+}
+
+float AudioModule::globalVolume() const {
+    ghoul_assert(_engine, "No audio engine loaded");
+    return _engine->getGlobalVolume();
+}
+
+void AudioModule::set3dListenerParameters(const std::optional<glm::vec3>& position,
+                                          const std::optional<glm::vec3>& lookAt,
+                                          const std::optional<glm::vec3>& up) const
+{
+    ghoul_assert(_engine, "No audio engine loaded");
+
+    if (position.has_value()) {
+        _engine->set3dListenerPosition(position->x, position->y, position->z);
+    }
+    if (lookAt.has_value()) {
+        _engine->set3dListenerAt(lookAt->x, lookAt->y, lookAt->z);
+    }
+    if (up.has_value()) {
+        _engine->set3dListenerUp(up->x, up->y, up->z);
+    }
+}
+
+void AudioModule::setSpeakerPosition(int channel, const glm::vec3& position) const {
+    ghoul_assert(_engine, "No audio engine loaded");
+    _engine->setSpeakerPosition(channel, position.x, position.y, position.z);
+}
+
+glm::vec3 AudioModule::speakerPosition(int channel) const {
+    ghoul_assert(_engine, "No audio engine loaded");
+
+    float x = 0.f;
+    float y = 0.f;
+    float z = 0.f;
+    _engine->getSpeakerPosition(channel, x, y, z);
+    return glm::vec3(x, y, z);
+}
+
+std::vector<documentation::Documentation> AudioModule::documentations() const {
+    return {
+    };
+}
+
+scripting::LuaLibrary AudioModule::luaLibrary() const {
+    return {
+        "audio",
+        {
+            codegen::lua::PlayAudio,
+            codegen::lua::PlayAudio3d,
+            codegen::lua::StopAudio,
+            codegen::lua::StopAll,
+            codegen::lua::PauseAll,
+            codegen::lua::ResumeAll,
+            codegen::lua::PlayAllFromStart,
+            codegen::lua::IsPlaying,
+            codegen::lua::PauseAudio,
+            codegen::lua::ResumeAudio,
+            codegen::lua::IsPaused,
+            codegen::lua::SetLooping,
+            codegen::lua::IsLooping,
+            codegen::lua::SetVolume,
+            codegen::lua::Volume,
+            codegen::lua::Set3dSourcePosition,
+            codegen::lua::CurrentlyPlaying,
+            codegen::lua::SetGlobalVolume,
+            codegen::lua::GlobalVolume,
+            codegen::lua::Set3dListenerPosition,
+            codegen::lua::SetSpeakerPosition,
+            codegen::lua::SpeakerPosition
+        }
+    };
+}
+
+} // namespace openspace
diff --git a/modules/audio/audiomodule.h b/modules/audio/audiomodule.h
new file mode 100644
index 0000000000..18f5deecee
--- /dev/null
+++ b/modules/audio/audiomodule.h
@@ -0,0 +1,315 @@
+/*****************************************************************************************
+ *                                                                                       *
+ * OpenSpace                                                                             *
+ *                                                                                       *
+ * Copyright (c) 2014-2024                                                               *
+ *                                                                                       *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
+ * software and associated documentation files (the "Software"), to deal in the Software *
+ * without restriction, including without limitation the rights to use, copy, modify,    *
+ * merge, publish, distribute, sublicense, and/or sell copies of the Software, and to    *
+ * permit persons to whom the Software is furnished to do so, subject to the following   *
+ * conditions:                                                                           *
+ *                                                                                       *
+ * The above copyright notice and this permission notice shall be included in all copies *
+ * or substantial portions of the Software.                                              *
+ *                                                                                       *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED,   *
+ * INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A         *
+ * PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT    *
+ * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF  *
+ * CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE  *
+ * OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                                         *
+ ****************************************************************************************/
+
+#ifndef __OPENSPACE_MODULE_SPACE___AUDIOMODULE___H__
+#define __OPENSPACE_MODULE_SPACE___AUDIOMODULE___H__
+
+#include <openspace/util/openspacemodule.h>
+
+#include <openspace/documentation/documentation.h>
+#include <openspace/scripting/lualibrary.h>
+#include <ghoul/misc/boolean.h>
+
+namespace SoLoud {
+    class Soloud;
+    class Wav;
+} // namespace SoLoud
+
+namespace openspace {
+
+class AudioModule : public OpenSpaceModule {
+public:
+    constexpr static const char* Name = "Audio";
+
+    AudioModule();
+    ~AudioModule() override;
+    std::vector<documentation::Documentation> documentations() const override;
+
+    scripting::LuaLibrary luaLibrary() const override;
+
+    BooleanType(ShouldLoop);
+
+    /**
+     * Starts playing the audio file located and the provided \p path. The \p loop
+     * parameter determines whether the file is only played once, or on a loop. The sound
+     * is later referred to by the \p identifier name. The audio file will be played in
+     * "background" mode, which means that each channel will be played at full volume. To
+     * play a video using spatial audio, use the #playAudio3d function instead.
+     *
+     * \param path The audio file that should be played
+     * \param identifier The name for the sound that is used to refer to the sound
+     * \param loop If `Yes` then the song will be played in a loop until the program is
+     *        closed or the playing is stopped through the #stopAudio function
+     */
+    void playAudio(const std::filesystem::path& path, std::string identifier,
+        ShouldLoop loop);
+
+    /**
+     * Starts playing the audio file located and the provided \p path. The \p loop
+     * parameter determines whether the file is only played once, or on a loop. The sound
+     * is later referred to by the \p identifier name. The \p position parameter
+     * determines the spatial location of the sound in a meter-based coordinate system.
+     * The position of the listener is (0,0,0) with the forward direction along the +y
+     * axis. This means that the "left" channel in a stereo setting is towards -x and the
+     * "right" channel towards x. This default value can be customized through the
+     * #set3dListenerParameters function. If you want to play a video without spatial
+     * audio, use the #playAudio function instead.
+     *
+     * \param path The audio file that should be played
+     * \param identifier The name for the sound that is used to refer to the sound
+     * \param position The position of the audio file in the 3D environment
+     * \param loop If `Yes` then the song will be played in a loop until the program is
+     *        closed or the playing is stopped through the #stopAudio function
+     */
+    void playAudio3d(const std::filesystem::path& path, std::string identifier,
+        const glm::vec3& position, ShouldLoop loop);
+
+    /**
+     * Stops the audio referenced by the \p identifier. The \p identifier must be a name
+     * for a sound that was started through the #playAudio or #playAudio3d functions.
+     * After this function, the \p identifier can not be used for any other function
+     * anymore except for #playAudio or #playAudio3d to start a new sound.
+     *
+     * \param identifier The identifier to the track that should be stopped
+     */
+    void stopAudio(const std::string& identifier);
+
+    /**
+     * Stops all currently playing tracks. After this function, none of the identifiers
+     * used to previously play a sound a valid any longer, but can still be used by the
+     * #playAudio or #playAudio3d functions to start a new sound.
+     * This function behaves the same way as if manually calling #stopAudio on all of the
+     * sounds that have been started.
+     */
+    void stopAll();
+
+    /**
+     * Pauses the playback for all sounds, while keeping them valid. This function behaves
+     * the same as if calling #pauseAudio on all of the sounds that are currently playing.
+     */
+    void pauseAll() const;
+
+    /**
+     * Resumes the playback for all sounds that have been paused. Please note that this
+     * will also resume the playback for the sounds that have been manually paused, not
+     * just those that were paused through the #pauseAll function.
+     */
+    void resumeAll() const;
+
+    /**
+     * Takes all of the sounds that are currently registers, unpauses them and plays them
+     * from their starting points
+     */
+    void playAllFromStart() const;
+
+    /**
+     * Returns whether the track referred to by the \p identifier is currently playing. A
+     * volume of 0 is still considered to be playing. The \p identifier must be a name for
+     * a sound that was started through the #playAudio or #playAudio3d functions.
+     *
+     * \param identifier The identifier to the track that should be stopped
+     * \return `true` if the track is currently playing, `false` otherwise
+     */
+    bool isPlaying(const std::string& identifier) const;
+
+    /**
+     * Pauses the playback of the track referred to by the \p identifier. The playback can
+     * later be resumed through the #resumeAudio function. Trying to pause an already
+     * paused track will not do anything, but is valid. The \p identifier must be a name
+     * for a sound that was started through the #playAudio or #playAudio3d functions.
+     *
+     * \param identifier The identifier to the track that should be stopped
+     */
+    void pauseAudio(const std::string& identifier) const;
+
+    /**
+     * Resumes the playback of a track that was previously paused through the #pauseAudio
+     * function. Trying to resume an already playing track will not do anything, but is
+     * valid. The \p identifier must be a name for a sound that was started through the
+     * #playAudio or #playAudio3d functions.
+     *
+     * \param identifier The identifier to the track that should be stopped
+     */
+    void resumeAudio(const std::string& identifier) const;
+
+    /**
+     * Returns whether the track refered to by the \p identifier is currently playing or
+     * paused. If it was be paused through a previous call to #pauseAudio, this function
+     * will return `true`. If it has just been created or resumed through a call to
+     * #resumeAudio, it will return `false`. The \p identifier must be a name for a sound
+     * that was started through the #playAudio or #playAudio3d functions.
+     *
+     * \param identifier The identifier to the track that should be stopped
+     * \return `true` if the track is currently paused, `false` if it is playing
+     */
+    bool isPaused(const std::string& identifier) const;
+
+    /**
+     * Controls whether the track referred to by the \p identifier should be looping or
+     * just be played once. If a track is converted to not looping, it will finish playing
+     * until the end of the file. The \p identifier must be a name for a sound that was
+     * started through the #playAudio or #playAudio3d functions.
+     *
+     * \param identifier The identifier to the track that should be stopped
+     * \param loop If `Yes` then the song will be played in a loop until the program is
+     *        closed or the playing is stopped through the #stopAudio function
+     */
+    void setLooping(const std::string& identifier, ShouldLoop loop) const;
+
+    /**
+     * Returns whether the track referred to by the \p identifier is set to be looping or
+     * whether it should played only once. The \p identifier must be a name for a sound
+     * that was started through the #playAudio or #playAudio3d functions.
+     *
+     * \param identifier The identifier to the track that should be stopped
+     * \return `Yes` if the track is looping, `No` otherwise
+     */
+    ShouldLoop isLooping(const std::string& identifier) const;
+
+    /**
+     * Sets the volume of the track referred to by \p identifier to the new \p volume. The
+     * volume should be a number bigger than 0, where 1 is the maximum volume level.
+     * The \p fade controls whether the volume change should be immediately (if
+     * it is 0) or over how many seconds it should change. The default is for it to change
+     * over 500 ms. The \p identifier must be a name for a sound that was started through
+     * the #playAudio or #playAudio3d functions.
+     *
+     * \param identifier The identifier to the track that should be stopped
+     * \param volume The new volume level. Must be greater or equal to 0
+     * \param fade How much time the fade from the current volume to the new volume should
+     *        take
+     */
+    void setVolume(const std::string& identifier, float volume, float fade = 0.5f) const;
+
+    /**
+     * Returns the volume for the track referred to by the \p handle. The number returned
+     * will be greater or equal to 0. The \p identifier must be a name for a sound that
+     * was started through the #playAudio or #playAudio3d functions.
+     *
+     * \param identifier The identifier to the track that should be stopped
+     * \return The volume for the track referred to by the \p handle, which will be
+     *         greater or equal to 0
+     */
+    float volume(const std::string& identifier) const;
+
+    /**
+     * Updates the 3D position of a track started through the #playAudio3d function. See
+     * that function and the #set3dListenerParameters function for a complete description.
+     * The \p identifier must be a name for a sound that was started through the
+     * #playAudio3d function.
+     *
+     * \param handle A valid handle for a track started through the #playAudio3d function
+     * \param position The new position from which the track originates
+     */
+    void set3dSourcePosition(const std::string& identifier,
+        const glm::vec3& position) const;
+
+    /**
+     * Returns the list of all tracks that are currently playing.
+     *
+     * \return The list of all tracks that are currently playing
+     */
+    std::vector<std::string> currentlyPlaying() const;
+
+    /**
+     * Sets the global volume for all track referred to the new \p volume. The total
+     * for each track is the global volume set by this function multiplied with the volume
+     * for the specific track set through the #setVolume function. The default value for
+     * the global volume is 0.5. The volume should be a number bigger than 0, where 1 is
+     * the maximum volume level. The \p fade controls whether the volume change should be
+     * immediately (if it is 0) or over how many seconds it should change. The default is
+     * for it to change over 500 ms.
+     *
+     * \param volume The new volume level. Must be greater or equal to 0
+     * \param fade How much time the fade from the current volume to the new volume should
+     *        take
+     */
+    void setGlobalVolume(float volume, float fade = 0.5f) const;
+
+    /**
+     * Returns the global volume for all track. The number returned will be greater or
+     * equal to 0.
+     *
+     * \return The global volume
+     */
+    float globalVolume() const;
+
+    /**
+     * Sets the position and orientation of the listener. This new position is
+     * automatically used to adjust the relative position of all 3D tracks. Each parameter
+     * to this function call is optional and if a value is omitted, the currently set
+     * value continues to be used instead. The coordinate system for the tracks and the
+     * listener is a meter-based coordinate system.
+     *
+     * \param position The position of the listener.
+     * \param lookAt The direction vector of the forward direction
+     * \param up The up-vector of the coordinate system
+     */
+    void set3dListenerParameters(const std::optional<glm::vec3>& position,
+        const std::optional<glm::vec3>& lookAt = std::nullopt,
+        const std::optional<glm::vec3>& up = std::nullopt) const;
+
+    /**
+     * Sets the position of the speaker for the provided \p channel to the provided
+     * \position. In general, this is considered an advanced feature to accommodate
+     * non-standard audio environments.
+     *
+     * \param channel The channel whose speaker's position should be changed
+     * \param position The new position for the speaker
+     */
+    void setSpeakerPosition(int channel, const glm::vec3& position) const;
+
+    /**
+     * Returns the position for the speaker of the provided \p channel.
+     * \return The position for the speaker of the provided \p channel
+     */
+    glm::vec3 speakerPosition(int channel) const;
+
+private:
+    struct Info {
+        std::unique_ptr<SoLoud::Wav> sound;
+        unsigned int handle = 0;
+    };
+
+    void internalInitialize(const ghoul::Dictionary&) override;
+    void internalDeinitializeGL() override;
+
+    /**
+     * Loads the sound at the provided \p path as an audio source and returns the pointer
+     * to it. The sound has only been loaded and no other attributes have changed.
+     *
+     * \param path The path to the audio file on disk that should be loaded
+     * \return The SoLoud::Wav object of the loaded file
+     * \throw ghoul::RuntimeError If the \p path is not a loadable audio file
+     */
+    std::unique_ptr<SoLoud::Wav> loadSound(const std::filesystem::path& path);
+
+    std::unique_ptr<SoLoud::Soloud> _engine = nullptr;
+
+    std::map<std::string, Info> _sounds;
+};
+
+} // namespace openspace
+
+#endif // __OPENSPACE_MODULE_SPACE___AUDIOMODULE___H__
diff --git a/modules/audio/audiomodule_lua.inl b/modules/audio/audiomodule_lua.inl
new file mode 100644
index 0000000000..79a1b524f3
--- /dev/null
+++ b/modules/audio/audiomodule_lua.inl
@@ -0,0 +1,354 @@
+/*****************************************************************************************
+ *                                                                                       *
+ * OpenSpace                                                                             *
+ *                                                                                       *
+ * Copyright (c) 2014-2024                                                               *
+ *                                                                                       *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
+ * software and associated documentation files (the "Software"), to deal in the Software *
+ * without restriction, including without limitation the rights to use, copy, modify,    *
+ * merge, publish, distribute, sublicense, and/or sell copies of the Software, and to    *
+ * permit persons to whom the Software is furnished to do so, subject to the following   *
+ * conditions:                                                                           *
+ *                                                                                       *
+ * The above copyright notice and this permission notice shall be included in all copies *
+ * or substantial portions of the Software.                                              *
+ *                                                                                       *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED,   *
+ * INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A         *
+ * PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT    *
+ * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF  *
+ * CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE  *
+ * OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                                         *
+ ****************************************************************************************/
+
+#include <openspace/engine/moduleengine.h>
+
+namespace {
+
+/**
+ * Starts playing the audio file located and the provided \p path. The \p loop parameter
+ * determines whether the file is only played once, or on a loop. The sound is later
+ * referred to by the \p identifier name. The audio file will be played in "background"
+ * mode, which means that each channel will be played at full volume. To play a video
+ * using spatial audio, use the #playAudio3d function instead.
+ *
+ * \param path The audio file that should be played
+ * \param identifier The name for the sound that is used to refer to the sound
+ * \param loop If `Yes` then the song will be played in a loop until the program is closed
+ *        or the playing is stopped through the #stopAudio function
+ */
+[[codegen::luawrap]] void playAudio(std::filesystem::path path, std::string identifier,
+                                    bool shouldLoop = true)
+{
+    using namespace openspace;
+
+    global::moduleEngine->module<AudioModule>()->playAudio(
+        path,
+        std::move(identifier),
+        AudioModule::ShouldLoop(shouldLoop)
+    );
+}
+
+/**
+ * Starts playing the audio file located and the provided \p path. The \p loop parameter
+ * determines whether the file is only played once, or on a loop. The sound is later
+ * referred to by the \p identifier name. The \p position parameter determines the spatial
+ * location of the sound in a meter-based coordinate system. The position of the listener
+ * is (0,0,0) with the forward direction along the +y axis. This means that the "left"
+ * channel in a stereo setting is towards -x and the "right" channel towards x. This
+ * default value can be customized through the #set3dListenerParameters function. If you
+ * want to play a video without spatial audio, use the #playAudio function instead.
+ *
+ * \param path The audio file that should be played
+ * \param identifier The name for the sound that is used to refer to the sound
+ * \param position The position of the audio file in the 3D environment
+ * \param loop If `Yes` then the song will be played in a loop until the program is closed
+ *        or the playing is stopped through the #stopAudio function
+ */
+[[codegen::luawrap]] void playAudio3d(std::filesystem::path path, std::string identifier,
+                                      glm::vec3 position, bool shouldLoop = true)
+{
+    using namespace openspace;
+
+    global::moduleEngine->module<AudioModule>()->playAudio3d(
+        path,
+        std::move(identifier),
+        position,
+        AudioModule::ShouldLoop(shouldLoop)
+    );
+}
+
+/**
+ * Stops the audio referenced by the \p identifier. The \p identifier must be a name for a
+ * sound that was started through the #playAudio or #playAudio3d functions. After this
+ * function, the \p identifier can not be used for any other function anymore except for
+ * #playAudio or #playAudio3d to start a new sound.
+ *
+ * \param identifier The identifier to the track that should be stopped
+ */
+[[codegen::luawrap]] void stopAudio(std::string identifier) {
+    using namespace openspace;
+    global::moduleEngine->module<AudioModule>()->stopAudio(identifier);
+}
+
+/**
+ * Stops all currently playing tracks. After this function, none of the identifiers used
+ * to previously play a sound a valid any longer, but can still be used by the #playAudio
+ * or #playAudio3d functions to start a new sound. This function behaves the same way as
+ * if manually calling #stopAudio on all of the sounds that have been started.
+ */
+[[codegen::luawrap]] void stopAll() {
+    using namespace openspace;
+    global::moduleEngine->module<AudioModule>()->stopAll();
+}
+
+/**
+ * Pauses the playback for all sounds, while keeping them valid. This function behaves the
+ * same as if calling #pauseAudio on all of the sounds that are currently playing.
+ */
+[[codegen::luawrap]] void pauseAll() {
+    using namespace openspace;
+    global::moduleEngine->module<AudioModule>()->pauseAll();
+}
+
+/**
+ * Resumes the playback for all sounds that have been paused. Please note that this will
+ * also resume the playback for the sounds that have been manually paused, not just those
+ * that were paused through the #pauseAll function.
+ */
+[[codegen::luawrap]] void resumeAll() {
+    using namespace openspace;
+    global::moduleEngine->module<AudioModule>()->resumeAll();
+}
+
+/**
+ * Takes all of the sounds that are currently registers, unpauses them and plays them
+ * from their starting points
+ */
+[[codegen::luawrap]] void playAllFromStart() {
+    using namespace openspace;
+    global::moduleEngine->module<AudioModule>()->playAllFromStart();
+}
+
+/**
+ * Returns whether the track referred to by the \p identifier is currently playing. A
+ * volume of 0 is still considered to be playing. The \p identifier must be a name for a
+ * sound that was started through the #playAudio or #playAudio3d functions.
+ *
+ * \param identifier The identifier to the track that should be stopped
+ * \return `true` if the track is currently playing, `false` otherwise
+ */
+[[codegen::luawrap]] bool isPlaying(std::string identifier) {
+    using namespace openspace;
+    return global::moduleEngine->module<AudioModule>()->isPlaying(identifier);
+}
+
+/**
+ * Pauses the playback of the track referred to by the \p identifier. The playback can
+ * later be resumed through the #resumeAudio function. Trying to pause an already paused
+ * track will not do anything, but is valid. The \p identifier must be a name for a sound
+ * that was started through the #playAudio or #playAudio3d functions.
+ *
+ * \param identifier The identifier to the track that should be stopped
+ */
+[[codegen::luawrap]] void pauseAudio(std::string identifier) {
+    using namespace openspace;
+    global::moduleEngine->module<AudioModule>()->pauseAudio(identifier);
+}
+
+/**
+ * Returns whether the track refered to by the \p identifier is currently playing or
+ * paused. If it was be paused through a previous call to #pauseAudio, this function will
+ * return `true`. If it has just been created or resumed through a call to #resumeAudio,
+ * it will return `false`. The \p identifier must be a name for a sound that was started
+ * through the #playAudio or #playAudio3d functions.
+ *
+ * \param identifier The identifier to the track that should be stopped
+ * \return `true` if the track is currently paused, `false` if it is playing
+ */
+[[codegen::luawrap]] bool isPaused(std::string identifier) {
+    using namespace openspace;
+    return global::moduleEngine->module<AudioModule>()->isPaused(identifier);
+}
+
+/**
+ * Resumes the playback of a track that was previously paused through the #pauseAudio
+ * function. Trying to resume an already playing track will not do anything, but is valid.
+ * The \p identifier must be a name for a sound that was started through the #playAudio or
+ * #playAudio3d functions.
+ *
+ * \param identifier The identifier to the track that should be stopped
+ */
+[[codegen::luawrap]] void resumeAudio(std::string identifier) {
+    using namespace openspace;
+    global::moduleEngine->module<AudioModule>()->resumeAudio(identifier);
+}
+
+/**
+ * Controls whether the track referred to by the \p identifier should be looping or just
+ * be played once. If a track is converted to not looping, it will finish playing until
+ * the end of the file. The \p identifier must be a name for a sound that was started
+ * through the #playAudio or #playAudio3d functions.
+ *
+ * \param identifier The identifier to the track that should be stopped
+ * \param loop If `Yes` then the song will be played in a loop until the program is closed
+ *        or the playing is stopped through the #stopAudio function
+ */
+[[codegen::luawrap]] void setLooping(std::string identifier, bool shouldLoop) {
+    using namespace openspace;
+    global::moduleEngine->module<AudioModule>()->setLooping(
+        identifier,
+        AudioModule::ShouldLoop(shouldLoop)
+    );
+}
+
+/**
+ * Returns whether the track referred to by the \p identifier is set to be looping or
+ * whether it should played only once. The \p identifier must be a name for a sound that
+ * was started through the #playAudio or #playAudio3d functions.
+ *
+ * \param identifier The identifier to the track that should be stopped
+ * \return `Yes` if the track is looping, `No` otherwise
+ */
+[[codegen::luawrap]] bool isLooping(std::string identifier) {
+    using namespace openspace;
+    return global::moduleEngine->module<AudioModule>()->isLooping(identifier);
+}
+
+/**
+ * Sets the volume of the track referred to by \p handle to the new \p volume. The volume
+ * should be a number bigger than 0, where 1 is the maximum volume level. The \p fade
+ * controls whether the volume change should be immediately (if it is 0) or over how many
+ * seconds it should change. The default is for it to change over 500 ms.
+ *
+ * \param handle The handle to the track whose volume should be changed
+ * \param volume The new volume level. Must be greater or equal to 0
+ * \param fade How much time the fade from the current volume to the new volume should
+ *        take
+ */
+[[codegen::luawrap]] void setVolume(std::string identifier, float volume,
+                                    float fade = 0.5f)
+{
+    using namespace openspace;
+    global::moduleEngine->module<AudioModule>()->setVolume(identifier, volume, fade);
+}
+
+/**
+ * Returns the volume for the track referred to by the \p handle. The number returned will
+ * be greater or equal to 0.
+ *
+ * \return The volume for the track referred to by the \p handle, which will be
+ *         greater or equal to 0
+ */
+[[codegen::luawrap]] float volume(std::string identifier) {
+    using namespace openspace;
+    return global::moduleEngine->module<AudioModule>()->volume(identifier);
+}
+
+/**
+ * Updates the 3D position of a track started through the #playAudio3d function. See that
+ * function and the #set3dListenerParameters function for a complete description. The
+ * \p identifier must be a name for a sound that was started through the #playAudio3d
+ * function.
+ *
+ * \param handle A valid handle for a track started through the #playAudio3d function
+ * \param position The new position from which the track originates
+ */
+[[codegen::luawrap]] void set3dSourcePosition(std::string identifier,
+                                              glm::vec3 position)
+{
+    using namespace openspace;
+    global::moduleEngine->module<AudioModule>()->set3dSourcePosition(
+        identifier,
+        position
+    );
+}
+
+/**
+ * Returns the list of all tracks that are currently playing.
+ *
+ * \return The list of all tracks that are currently playing
+ */
+[[codegen::luawrap]] std::vector<std::string> currentlyPlaying() {
+    using namespace openspace;
+    return global::moduleEngine->module<AudioModule>()->currentlyPlaying();
+}
+
+/**
+ * Sets the global volume for all track referred to the new \p volume. The total for each
+ * track is the global volume set by this function multiplied with the volume for the
+ * specific track set through the #setVolume function. The default value for the global
+ * volume is 0.5. The volume should be a number bigger than 0, where 1 is the maximum
+ * volume level. The \p fade controls whether the volume change should be immediately (if
+ * it is 0) or over how many seconds it should change. The default is for it to change
+ * over 500 ms.
+ *
+ * \param volume The new volume level. Must be greater or equal to 0
+ * \param fade How much time the fade from the current volume to the new volume should
+ *        take
+ */
+[[codegen::luawrap]] void setGlobalVolume(float volume, float fade = 0.5f) {
+    using namespace openspace;
+    global::moduleEngine->module<AudioModule>()->setGlobalVolume(volume, fade);
+}
+
+/**
+ * Returns the global volume for all track. The number returned will be greater or equal
+ * to 0.
+ *
+ * \return The global volume
+ */
+[[codegen::luawrap]] float globalVolume() {
+    using namespace openspace;
+    return global::moduleEngine->module<AudioModule>()->globalVolume();
+}
+
+/**
+ * Sets the position and orientation of the listener. This new position is automatically
+ * used to adjust the relative position of all 3D tracks. Each parameter to this function
+ * call is optional and if a value is omitted, the currently set value continues to be
+ * used instead. The coordinate system for the tracks and the listener is a meter-based
+ * coordinate system.
+ *
+ * \param position The position of the listener.
+ * \param lookAt The direction vector of the forward direction
+ * \param up The up-vector of the coordinate system
+ */
+[[codegen::luawrap]] void set3dListenerPosition(glm::vec3 position,
+                                                std::optional<glm::vec3> lookAt,
+                                                std::optional<glm::vec3> up)
+{
+    using namespace openspace;
+    global::moduleEngine->module<AudioModule>()->set3dListenerParameters(
+        position,
+        lookAt,
+        up
+    );
+}
+
+/**
+ * Sets the position of the speaker for the provided \p channel to the provided
+ * \p position. In general, this is considered an advanced feature to accommodate
+ * non-standard audio environments.
+ *
+ * \param channel The channel whose speaker's position should be changed
+ * \param position The new position for the speaker
+ */
+[[codegen::luawrap]] void setSpeakerPosition(int handle, glm::vec3 position) {
+    using namespace openspace;
+    global::moduleEngine->module<AudioModule>()->setSpeakerPosition(handle, position);
+}
+
+/**
+ * Returns the position for the speaker of the provided \p channel.
+ * \return The position for the speaker of the provided \p channel
+ */
+[[codegen::luawrap]] glm::vec3 speakerPosition(int handle) {
+    using namespace openspace;
+    return global::moduleEngine->module<AudioModule>()->speakerPosition(handle);
+}
+
+#include "audiomodule_lua_codegen.cpp"
+
+} // namespace
diff --git a/modules/audio/ext/soloud b/modules/audio/ext/soloud
new file mode 160000
index 0000000000..1157475881
--- /dev/null
+++ b/modules/audio/ext/soloud
@@ -0,0 +1 @@
+Subproject commit 1157475881da0d7f76102578255b937c7d4e8f57
diff --git a/modules/globebrowsing/globebrowsingmodule.cpp b/modules/globebrowsing/globebrowsingmodule.cpp
index 1a63f355b2..934d855f1b 100644
--- a/modules/globebrowsing/globebrowsingmodule.cpp
+++ b/modules/globebrowsing/globebrowsingmodule.cpp
@@ -181,7 +181,6 @@ namespace {
     }
 
     struct [[codegen::Dictionary(GlobeBrowsingModule)]] Parameters {
-
         // [[codegen::verbatim(TileCacheSizeInfo.description)]]
         std::optional<int> tileCacheSize;
 
diff --git a/modules/sound/ext/soloud b/modules/sound/ext/soloud
new file mode 160000
index 0000000000..1157475881
--- /dev/null
+++ b/modules/sound/ext/soloud
@@ -0,0 +1 @@
+Subproject commit 1157475881da0d7f76102578255b937c7d4e8f57

From 17336563b87b29f70cdce336dd6cbae31d18b327 Mon Sep 17 00:00:00 2001
From: Alexander Bock <mail@alexanderbock.eu>
Date: Sun, 24 Mar 2024 22:34:28 +0100
Subject: [PATCH 330/701] Update codegen repository

---
 support/coding/codegen | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/support/coding/codegen b/support/coding/codegen
index 8798d8a462..3ad0877c74 160000
--- a/support/coding/codegen
+++ b/support/coding/codegen
@@ -1 +1 @@
-Subproject commit 8798d8a462d93dd5a2fd3b8dfa8917083e50a6ee
+Subproject commit 3ad0877c74aa55a98ee24d18ba8335df9e1d4bcb

From 024d457cc974447faee1a9bce8d8c2ce3ec94e23 Mon Sep 17 00:00:00 2001
From: Alexander Bock <mail@alexanderbock.eu>
Date: Sun, 24 Mar 2024 23:09:30 +0100
Subject: [PATCH 331/701] Remove end time from JWST (closes #3135)

---
 .../scene/solarsystem/telescopes/jwst/jwst.asset    | 13 ++++---------
 1 file changed, 4 insertions(+), 9 deletions(-)

diff --git a/data/assets/scene/solarsystem/telescopes/jwst/jwst.asset b/data/assets/scene/solarsystem/telescopes/jwst/jwst.asset
index c9649f8ed0..333329a0bd 100644
--- a/data/assets/scene/solarsystem/telescopes/jwst/jwst.asset
+++ b/data/assets/scene/solarsystem/telescopes/jwst/jwst.asset
@@ -22,15 +22,13 @@ local band = asset.resource({
 
 
 local LaunchTime = "2021 DEC 25 12:20:00"
-local EndTime = "2024 JAN 22 00:00:00"
 
 local JWSTBand = {
   Identifier = "JWSTBand",
   Parent = transforms.JWSTPosition.Identifier,
   TimeFrame = {
     Type = "TimeFrameInterval",
-    Start = LaunchTime,
-    End = EndTime
+    Start = LaunchTime
   },
   Transform = {
     Rotation = {
@@ -65,8 +63,7 @@ local JWSTModel = {
   Parent = transforms.JWSTRotation.Identifier,
   TimeFrame = {
     Type = "TimeFrameInterval",
-    Start = LaunchTime,
-    End = EndTime
+    Start = LaunchTime
   },
   Renderable = {
     Type = "RenderableModel",
@@ -96,8 +93,7 @@ local JWSTFov = {
   Parent = JWSTModel.Identifier,
   TimeFrame = {
     Type = "TimeFrameInterval",
-    Start = LaunchTime,
-    End = EndTime
+    Start = LaunchTime
   },
   Renderable = {
     Type = "RenderablePrism",
@@ -129,8 +125,7 @@ local JWSTLabel = {
   Parent = transforms.JWSTPosition.Identifier,
   TimeFrame = {
     Type = "TimeFrameInterval",
-    Start = LaunchTime,
-    End = EndTime
+    Start = LaunchTime
   },
   Renderable = {
     Type = "RenderableLabel",

From cc76a5953f08c1516278556e0c634e197e4d6ce8 Mon Sep 17 00:00:00 2001
From: Alexander Bock <mail@alexanderbock.eu>
Date: Sun, 24 Mar 2024 23:13:57 +0100
Subject: [PATCH 332/701] Add new Lua file that reports if we are recording
 (closes #2559)

---
 src/interaction/sessionrecording.cpp     | 3 ++-
 src/interaction/sessionrecording_lua.inl | 5 +++++
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/src/interaction/sessionrecording.cpp b/src/interaction/sessionrecording.cpp
index 2012271d3e..83d6c9fd33 100644
--- a/src/interaction/sessionrecording.cpp
+++ b/src/interaction/sessionrecording.cpp
@@ -2624,7 +2624,8 @@ scripting::LuaLibrary SessionRecording::luaLibrary() {
             codegen::lua::FileFormatConversion,
             codegen::lua::SetPlaybackPause,
             codegen::lua::TogglePlaybackPause,
-            codegen::lua::IsPlayingBack
+            codegen::lua::IsPlayingBack,
+            codegen::lua::IsRecording
         }
     };
 }
diff --git a/src/interaction/sessionrecording_lua.inl b/src/interaction/sessionrecording_lua.inl
index 6b76b6cf49..1fb6164865 100644
--- a/src/interaction/sessionrecording_lua.inl
+++ b/src/interaction/sessionrecording_lua.inl
@@ -202,6 +202,11 @@ namespace {
     return openspace::global::sessionRecording->isPlayingBack();
 }
 
+// Returns true if session recording is currently recording a recording.
+[[codegen::luawrap]] bool isRecording() {
+    return openspace::global::sessionRecording->isRecording();
+}
+
 #include "sessionrecording_lua_codegen.cpp"
 
 } // namespace

From f625dc296b91b412efa8958eb3a3994b0dbd0c46 Mon Sep 17 00:00:00 2001
From: Ylva Selling <ylva.selling@liu.se>
Date: Mon, 25 Mar 2024 11:23:00 +0100
Subject: [PATCH 333/701] Update PR according to comments

---
 include/openspace/util/factorymanager.h          | 1 +
 modules/server/src/topics/documentationtopic.cpp | 7 ++-----
 src/documentation/documentationengine.cpp        | 5 +----
 src/engine/openspaceengine.cpp                   | 1 -
 4 files changed, 4 insertions(+), 10 deletions(-)

diff --git a/include/openspace/util/factorymanager.h b/include/openspace/util/factorymanager.h
index 69af7fc621..1662e04a34 100644
--- a/include/openspace/util/factorymanager.h
+++ b/include/openspace/util/factorymanager.h
@@ -42,6 +42,7 @@ public:
         std::unique_ptr<ghoul::TemplateFactoryBase> factory;
         std::string name;
     };
+
     /**
      * This exception is thrown if the ghoul::TemplateFactory could not be found in the
      * #factory method.
diff --git a/modules/server/src/topics/documentationtopic.cpp b/modules/server/src/topics/documentationtopic.cpp
index b8910f6c12..3c9cb8b763 100644
--- a/modules/server/src/topics/documentationtopic.cpp
+++ b/modules/server/src/topics/documentationtopic.cpp
@@ -27,7 +27,7 @@
 #include <modules/server/include/connection.h>
 #include <modules/server/include/jsonconverters.h>
 #include <openspace/engine/globals.h>
-
+#include <openspace/properties/propertyowner.h>
 #include <openspace/documentation/documentationengine.h>
 #include <openspace/util/factorymanager.h>
 #include <openspace/interaction/keybindingmanager.h>
@@ -42,9 +42,6 @@ void DocumentationTopic::handleJson(const nlohmann::json& json) {
 
     nlohmann::json response;
 
-    // @emiax: Proposed future refector.
-    // Do not parse generated json. Instead implement ability to get
-    // ghoul::Dictionary objects from ScriptEngine, FactoryManager, and KeybindingManager.
     if (requestedType == "lua") {
         response = DocEng.generateScriptEngineJson();
     }
@@ -55,7 +52,7 @@ void DocumentationTopic::handleJson(const nlohmann::json& json) {
         response = DocEng.generateKeybindingsJson();
     }
     else if (requestedType == "asset") {
-        // TODO: Add asset documentation here
+        DocEng.generatePropertyOwnerJson(global::rootPropertyOwner);
     }
     else if (requestedType == "meta") {
         response = DocEng.generateLicenseListJson();
diff --git a/src/documentation/documentationengine.cpp b/src/documentation/documentationengine.cpp
index 772f30c061..0540c44813 100644
--- a/src/documentation/documentationengine.cpp
+++ b/src/documentation/documentationengine.cpp
@@ -131,9 +131,7 @@ namespace {
     constexpr const char* FiltersKey = "filters";
     constexpr const char* ActionsKey = "actions";
 
-    nlohmann::json documentationToJson(
-                                         const openspace::documentation::Documentation& d)
-    {
+    nlohmann::json documentationToJson(const openspace::documentation::Documentation& d) {
         using namespace openspace::documentation;
 
         nlohmann::json json;
@@ -357,7 +355,6 @@ nlohmann::json DocumentationEngine::generateLicenseGroupsJson() const {
         }
 
         nlohmann::json assetJson;
-
         assetJson[NameKey] = meta.has_value() ? meta->name : NoDataName;
         assetJson[VersionKey] = meta.has_value() ? meta->version : NoDataName;
         assetJson[DescriptionKey] = meta.has_value() ? meta->description : NoDataName;
diff --git a/src/engine/openspaceengine.cpp b/src/engine/openspaceengine.cpp
index 3ecf2286f8..faacf68ece 100644
--- a/src/engine/openspaceengine.cpp
+++ b/src/engine/openspaceengine.cpp
@@ -806,7 +806,6 @@ void OpenSpaceEngine::loadAssets() {
 
     runGlobalCustomizationScripts();
 
-    
     _writeDocumentationTask = std::async(
         &documentation::DocumentationEngine::writeDocumentation,
         DocEng

From 2feaff20134bdb9ff3a285427bb3fad30f45ee77 Mon Sep 17 00:00:00 2001
From: Micah Acinapura <micahnyc@gmail.com>
Date: Mon, 25 Mar 2024 15:20:11 -0400
Subject: [PATCH 334/701] decreased limit zoom for orex profile; closes #2473
 (#3130)

* decreased limit zoom for orex profile; closes #2473

* Update data/profiles/osirisrex.profile

Co-authored-by: Alexander Bock <alexander.bock@liu.se>

---------

Co-authored-by: Alexander Bock <alexander.bock@liu.se>
---
 data/profiles/osirisrex.profile | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/data/profiles/osirisrex.profile b/data/profiles/osirisrex.profile
index 796a9e6b3b..3cd0af20d1 100644
--- a/data/profiles/osirisrex.profile
+++ b/data/profiles/osirisrex.profile
@@ -88,6 +88,11 @@
       "name": "NavigationHandler.OrbitalNavigator.FollowAnchorNodeRotationDistance",
       "type": "setPropertyValue",
       "value": "20.0"
+    },
+    {
+      "name": "NavigationHandler.OrbitalNavigator.LimitZoom.MinimumAllowedDistance",
+      "type": "setPropertyValueSingle",
+      "value": "3.0"
     }
   ],
   "time": {

From 49fc538c173015f44a8f5eeda914aff7136a7a35 Mon Sep 17 00:00:00 2001
From: Alexander Bock <mail@alexanderbock.eu>
Date: Mon, 25 Mar 2024 23:19:52 +0100
Subject: [PATCH 335/701] Rename fmt.h to format.h and enable audio module on
 default

---
 apps/OpenSpace-MinVR/main.cpp                             | 4 ++--
 apps/OpenSpace/ext/launcher/src/launcherwindow.cpp        | 2 +-
 apps/OpenSpace/ext/launcher/src/profile/actiondialog.cpp  | 2 +-
 apps/OpenSpace/ext/launcher/src/profile/assetsdialog.cpp  | 2 +-
 .../ext/launcher/src/profile/deltatimesdialog.cpp         | 2 +-
 .../OpenSpace/ext/launcher/src/profile/horizonsdialog.cpp | 2 +-
 apps/OpenSpace/ext/launcher/src/profile/profileedit.cpp   | 2 +-
 .../ext/launcher/src/profile/scriptlogdialog.cpp          | 2 +-
 .../ext/launcher/src/sgctedit/displaywindowunion.cpp      | 2 +-
 .../OpenSpace/ext/launcher/src/sgctedit/windowcontrol.cpp | 2 +-
 apps/OpenSpace/ext/sgct                                   | 2 +-
 apps/OpenSpace/main.cpp                                   | 2 +-
 apps/Sync/main.cpp                                        | 5 ++---
 ext/ghoul                                                 | 2 +-
 include/openspace/documentation/documentationengine.h     | 1 +
 include/openspace/documentation/verifier.inl              | 2 +-
 include/openspace/interaction/joystickinputstate.h        | 2 +-
 include/openspace/network/messagestructures.h             | 2 +-
 include/openspace/util/json_helper.inl                    | 2 +-
 include/openspace/util/spicemanager.h                     | 2 +-
 modules/audio/include.cmake                               | 1 +
 modules/base/rotation/fixedrotation.cpp                   | 2 +-
 modules/base/translation/luatranslation.cpp               | 2 +-
 modules/cefwebgui/cefwebguimodule.cpp                     | 2 +-
 modules/exoplanets/exoplanetshelper.cpp                   | 2 +-
 modules/exoplanets/exoplanetsmodule.cpp                   | 2 +-
 .../exoplanets/tasks/exoplanetsdatapreparationtask.cpp    | 2 +-
 modules/fieldlinessequence/util/fieldlinesstate.cpp       | 2 +-
 .../fieldlinessequence/util/kameleonfieldlinehelper.cpp   | 2 +-
 modules/fitsfilereader/src/fitsfilereader.cpp             | 2 +-
 modules/gaia/rendering/octreemanager.cpp                  | 2 +-
 modules/gaia/rendering/renderablegaiastars.cpp            | 2 +-
 modules/gaia/tasks/constructoctreetask.cpp                | 2 +-
 modules/gaia/tasks/readfilejob.cpp                        | 4 ++--
 modules/gaia/tasks/readfitstask.cpp                       | 4 ++--
 modules/gaia/tasks/readspecktask.cpp                      | 2 +-
 modules/galaxy/rendering/renderablegalaxy.cpp             | 4 ++--
 modules/globebrowsing/globebrowsingmodule.cpp             | 2 +-
 modules/globebrowsing/src/geojson/geojsoncomponent.cpp    | 2 +-
 .../globebrowsing/src/geojson/globegeometryfeature.cpp    | 2 +-
 modules/globebrowsing/src/rawtiledatareader.cpp           | 2 +-
 modules/globebrowsing/src/timequantizer.cpp               | 2 +-
 modules/imgui/src/guiglobebrowsingcomponent.cpp           | 2 +-
 modules/imgui/src/guiparallelcomponent.cpp                | 2 +-
 modules/kameleon/src/kameleonhelper.cpp                   | 2 +-
 modules/kameleon/src/kameleonwrapper.cpp                  | 4 ++--
 modules/kameleonvolume/kameleonvolumereader.cpp           | 2 +-
 .../kameleonvolume/tasks/kameleonmetadatatojsontask.cpp   | 2 +-
 modules/kameleonvolume/tasks/kameleonvolumetorawtask.cpp  | 2 +-
 modules/multiresvolume/rendering/brickmanager.cpp         | 2 +-
 .../multiresvolume/rendering/errorhistogrammanager.cpp    | 2 +-
 .../rendering/localerrorhistogrammanager.cpp              | 2 +-
 .../multiresvolume/rendering/renderablemultiresvolume.cpp | 4 ++--
 modules/multiresvolume/rendering/tsp.cpp                  | 4 ++--
 modules/server/servermodule.cpp                           | 2 +-
 modules/server/src/connection.cpp                         | 4 ++--
 modules/server/src/topics/eventtopic.cpp                  | 2 +-
 modules/server/src/topics/flightcontrollertopic.cpp       | 2 +-
 modules/server/src/topics/setpropertytopic.cpp            | 2 +-
 modules/server/src/topics/subscriptiontopic.cpp           | 2 +-
 modules/space/horizonsfile.cpp                            | 2 +-
 modules/space/translation/horizonstranslation.cpp         | 2 +-
 modules/spacecraftinstruments/util/hongkangparser.cpp     | 8 +++-----
 .../spacecraftinstruments/util/instrumenttimesparser.cpp  | 4 ++--
 modules/spacecraftinstruments/util/labelparser.cpp        | 2 +-
 modules/spout/spoutwrapper.cpp                            | 2 +-
 modules/statemachine/src/statemachine.cpp                 | 2 +-
 modules/touch/src/touchinteraction.cpp                    | 2 +-
 modules/volume/rawvolumewriter.inl                        | 2 +-
 modules/volume/tasks/generaterawvolumetask.cpp            | 2 +-
 modules/webbrowser/src/browserinstance.cpp                | 2 +-
 modules/webbrowser/src/eventhandler.cpp                   | 2 +-
 modules/webgui/webguimodule.cpp                           | 2 +-
 src/CMakeLists.txt                                        | 2 +-
 src/data/csvloader.cpp                                    | 2 +-
 src/data/dataloader.cpp                                   | 2 +-
 src/data/speckloader.cpp                                  | 2 +-
 src/documentation/documentationengine.cpp                 | 2 +-
 src/engine/downloadmanager.cpp                            | 2 +-
 src/events/event.cpp                                      | 2 +-
 src/interaction/touchbar.mm                               | 2 +-
 src/network/parallelconnection.cpp                        | 3 +--
 src/properties/propertyowner.cpp                          | 2 +-
 src/rendering/loadingscreen.cpp                           | 2 +-
 src/scene/asset.cpp                                       | 2 +-
 src/scene/profile.cpp                                     | 2 +-
 src/util/coordinateconversion.cpp                         | 2 +-
 src/util/httprequest.cpp                                  | 2 +-
 src/util/keys.cpp                                         | 2 +-
 src/util/openspacemodule.cpp                              | 2 +-
 src/util/taskloader.cpp                                   | 2 +-
 src/util/time.cpp                                         | 2 +-
 src/util/versionchecker.cpp                               | 2 +-
 support/cmake/module_definition.cmake                     | 2 +-
 support/coding/codegen                                    | 2 +-
 95 files changed, 107 insertions(+), 109 deletions(-)
 create mode 100644 modules/audio/include.cmake

diff --git a/apps/OpenSpace-MinVR/main.cpp b/apps/OpenSpace-MinVR/main.cpp
index 46357781ca..bf1deb5c1a 100644
--- a/apps/OpenSpace-MinVR/main.cpp
+++ b/apps/OpenSpace-MinVR/main.cpp
@@ -29,10 +29,10 @@
 #include <openspace/engine/windowdelegate.h>
 #include <openspace/util/keys.h>
 #include <openspace/util/mouse.h>
-#include <ghoul/fmt.h>
-#include <ghoul/ghoul.h>
 #include <ghoul/filesystem/file.h>
 #include <ghoul/filesystem/filesystem.h>
+#include <ghoul/format.h>
+#include <ghoul/ghoul.h>
 #include <ghoul/logging/consolelog.h>
 #include <ghoul/logging/logmanager.h>
 #include <ghoul/logging/visualstudiooutputlog.h>
diff --git a/apps/OpenSpace/ext/launcher/src/launcherwindow.cpp b/apps/OpenSpace/ext/launcher/src/launcherwindow.cpp
index 6f4dfce048..8d7c14b5d8 100644
--- a/apps/OpenSpace/ext/launcher/src/launcherwindow.cpp
+++ b/apps/OpenSpace/ext/launcher/src/launcherwindow.cpp
@@ -30,7 +30,7 @@
 #include <openspace/engine/configuration.h>
 #include <openspace/openspace.h>
 #include <ghoul/filesystem/filesystem.h>
-#include <ghoul/fmt.h>
+#include <ghoul/format.h>
 #include <ghoul/logging/logmanager.h>
 #include <sgct/readconfig.h>
 #include <QComboBox>
diff --git a/apps/OpenSpace/ext/launcher/src/profile/actiondialog.cpp b/apps/OpenSpace/ext/launcher/src/profile/actiondialog.cpp
index f9b7b8d9bd..ec7b0e4ec2 100644
--- a/apps/OpenSpace/ext/launcher/src/profile/actiondialog.cpp
+++ b/apps/OpenSpace/ext/launcher/src/profile/actiondialog.cpp
@@ -27,7 +27,7 @@
 #include "profile/line.h"
 #include "profile/scriptlogdialog.h"
 #include <openspace/util/keys.h>
-#include <ghoul/fmt.h>
+#include <ghoul/format.h>
 #include <ghoul/misc/assert.h>
 #include <QCheckBox>
 #include <QComboBox>
diff --git a/apps/OpenSpace/ext/launcher/src/profile/assetsdialog.cpp b/apps/OpenSpace/ext/launcher/src/profile/assetsdialog.cpp
index 07d36c74b1..6e9b5e697d 100644
--- a/apps/OpenSpace/ext/launcher/src/profile/assetsdialog.cpp
+++ b/apps/OpenSpace/ext/launcher/src/profile/assetsdialog.cpp
@@ -27,7 +27,7 @@
 #include "profile/assetedit.h"
 #include "profile/line.h"
 #include <openspace/scene/profile.h>
-#include <ghoul/fmt.h>
+#include <ghoul/format.h>
 #include <QDialogButtonBox>
 #include <QHeaderView>
 #include <QLabel>
diff --git a/apps/OpenSpace/ext/launcher/src/profile/deltatimesdialog.cpp b/apps/OpenSpace/ext/launcher/src/profile/deltatimesdialog.cpp
index f564dc9257..8a8fcb1688 100644
--- a/apps/OpenSpace/ext/launcher/src/profile/deltatimesdialog.cpp
+++ b/apps/OpenSpace/ext/launcher/src/profile/deltatimesdialog.cpp
@@ -26,7 +26,7 @@
 
 #include "profile/line.h"
 #include <openspace/scene/profile.h>
-#include <ghoul/fmt.h>
+#include <ghoul/format.h>
 #include <QDialogButtonBox>
 #include <QDoubleValidator>
 #include <QEvent>
diff --git a/apps/OpenSpace/ext/launcher/src/profile/horizonsdialog.cpp b/apps/OpenSpace/ext/launcher/src/profile/horizonsdialog.cpp
index e340b5ff50..31f9755d1e 100644
--- a/apps/OpenSpace/ext/launcher/src/profile/horizonsdialog.cpp
+++ b/apps/OpenSpace/ext/launcher/src/profile/horizonsdialog.cpp
@@ -26,7 +26,7 @@
 
 #include "profile/line.h"
 #include <ghoul/filesystem/filesystem.h>
-#include <ghoul/fmt.h>
+#include <ghoul/format.h>
 #include <ghoul/logging/logmanager.h>
 #include <ghoul/misc/boolean.h>
 #include <QComboBox>
diff --git a/apps/OpenSpace/ext/launcher/src/profile/profileedit.cpp b/apps/OpenSpace/ext/launcher/src/profile/profileedit.cpp
index 6d9abae5e5..cb36d5ed21 100644
--- a/apps/OpenSpace/ext/launcher/src/profile/profileedit.cpp
+++ b/apps/OpenSpace/ext/launcher/src/profile/profileedit.cpp
@@ -36,7 +36,7 @@
 #include "profile/propertiesdialog.h"
 #include "profile/timedialog.h"
 #include <openspace/scene/profile.h>
-#include <ghoul/fmt.h>
+#include <ghoul/format.h>
 #include <QDialogButtonBox>
 #include <QKeyEvent>
 #include <QLabel>
diff --git a/apps/OpenSpace/ext/launcher/src/profile/scriptlogdialog.cpp b/apps/OpenSpace/ext/launcher/src/profile/scriptlogdialog.cpp
index 2287f48423..c0893a974c 100644
--- a/apps/OpenSpace/ext/launcher/src/profile/scriptlogdialog.cpp
+++ b/apps/OpenSpace/ext/launcher/src/profile/scriptlogdialog.cpp
@@ -29,7 +29,7 @@
 #include <openspace/engine/globals.h>
 #include <openspace/scene/profile.h>
 #include <ghoul/filesystem/filesystem.h>
-#include <ghoul/fmt.h>
+#include <ghoul/format.h>
 #include <QGridLayout>
 #include <QDialogButtonBox>
 #include <QFileDialog>
diff --git a/apps/OpenSpace/ext/launcher/src/sgctedit/displaywindowunion.cpp b/apps/OpenSpace/ext/launcher/src/sgctedit/displaywindowunion.cpp
index 88961d3c9f..cba7f49461 100644
--- a/apps/OpenSpace/ext/launcher/src/sgctedit/displaywindowunion.cpp
+++ b/apps/OpenSpace/ext/launcher/src/sgctedit/displaywindowunion.cpp
@@ -25,7 +25,7 @@
 #include "sgctedit/displaywindowunion.h"
 
 #include "sgctedit/windowcontrol.h"
-#include <ghoul/fmt.h>
+#include <ghoul/format.h>
 #include <QColor>
 #include <QFrame>
 #include <QPushButton>
diff --git a/apps/OpenSpace/ext/launcher/src/sgctedit/windowcontrol.cpp b/apps/OpenSpace/ext/launcher/src/sgctedit/windowcontrol.cpp
index 40500298f0..d66e350306 100644
--- a/apps/OpenSpace/ext/launcher/src/sgctedit/windowcontrol.cpp
+++ b/apps/OpenSpace/ext/launcher/src/sgctedit/windowcontrol.cpp
@@ -24,8 +24,8 @@
 
 #include "sgctedit/windowcontrol.h"
 
+#include <ghoul/format.h>
 #include <ghoul/misc/assert.h>
-#include <ghoul/fmt.h>
 #include "sgctedit/displaywindowunion.h"
 #include "sgctedit/monitorbox.h"
 #include <QCheckBox>
diff --git a/apps/OpenSpace/ext/sgct b/apps/OpenSpace/ext/sgct
index 9bcd52ac18..e8ee8b48fd 160000
--- a/apps/OpenSpace/ext/sgct
+++ b/apps/OpenSpace/ext/sgct
@@ -1 +1 @@
-Subproject commit 9bcd52ac187bc6ecff7af069b106d07dfc22a9be
+Subproject commit e8ee8b48fdcfd9164efcac03e7914af5fb5b1ce2
diff --git a/apps/OpenSpace/main.cpp b/apps/OpenSpace/main.cpp
index 7bcbbcbaa9..49cab344db 100644
--- a/apps/OpenSpace/main.cpp
+++ b/apps/OpenSpace/main.cpp
@@ -30,8 +30,8 @@
 #include <openspace/engine/windowdelegate.h>
 #include <openspace/interaction/joystickinputstate.h>
 #include <openspace/openspace.h>
+#include <ghoul/format.h>
 #include <ghoul/ghoul.h>
-#include <ghoul/fmt.h>
 #include <ghoul/glm.h>
 #include <ghoul/cmdparser/commandlineparser.h>
 #include <ghoul/cmdparser/multiplecommand.h>
diff --git a/apps/Sync/main.cpp b/apps/Sync/main.cpp
index d40c84b4ba..db1f64a6f6 100644
--- a/apps/Sync/main.cpp
+++ b/apps/Sync/main.cpp
@@ -34,10 +34,9 @@
 #include <openspace/util/resourcesynchronization.h>
 #include <openspace/util/task.h>
 #include <openspace/util/taskloader.h>
-
-#include <ghoul/fmt.h>
-#include <ghoul/ghoul.h>
 #include <ghoul/filesystem/filesystem.h>
+#include <ghoul/format.h>
+#include <ghoul/ghoul.h>
 #include <ghoul/logging/logmanager.h>
 #include <ghoul/logging/consolelog.h>
 
diff --git a/ext/ghoul b/ext/ghoul
index c5164de300..c8a56a6e63 160000
--- a/ext/ghoul
+++ b/ext/ghoul
@@ -1 +1 @@
-Subproject commit c5164de300f56b5034ec94fcefe7e6a6c03e4bfe
+Subproject commit c8a56a6e63b81e13a3a957c5af43edc4ab1b838b
diff --git a/include/openspace/documentation/documentationengine.h b/include/openspace/documentation/documentationengine.h
index 392d36cf10..17a9bb0991 100644
--- a/include/openspace/documentation/documentationengine.h
+++ b/include/openspace/documentation/documentationengine.h
@@ -27,6 +27,7 @@
 
 #include <openspace/documentation/documentation.h>
 #include <openspace/json.h>
+#include <openspace/properties/propertyowner.h>
 #include <ghoul/misc/exception.h>
 
 namespace openspace::documentation {
diff --git a/include/openspace/documentation/verifier.inl b/include/openspace/documentation/verifier.inl
index 39ebc08663..40a623cd54 100644
--- a/include/openspace/documentation/verifier.inl
+++ b/include/openspace/documentation/verifier.inl
@@ -24,7 +24,7 @@
 
 #include <ghoul/misc/dictionary.h>
 
-#include <ghoul/fmt.h>
+#include <ghoul/format.h>
 #include <ghoul/misc/assert.h>
 #include <iterator>
 #include <numeric>
diff --git a/include/openspace/interaction/joystickinputstate.h b/include/openspace/interaction/joystickinputstate.h
index 9c7a182c3f..87aa4f7497 100644
--- a/include/openspace/interaction/joystickinputstate.h
+++ b/include/openspace/interaction/joystickinputstate.h
@@ -25,10 +25,10 @@
 #ifndef __OPENSPACE_CORE___JOYSTICKINPUTSTATE___H__
 #define __OPENSPACE_CORE___JOYSTICKINPUTSTATE___H__
 
+#include <ghoul/format.h>
 #include <ghoul/misc/assert.h>
 #include <ghoul/misc/exception.h>
 #include <ghoul/misc/stringconversion.h>
-#include <ghoul/fmt.h>
 #include <array>
 #include <memory>
 #include <string>
diff --git a/include/openspace/network/messagestructures.h b/include/openspace/network/messagestructures.h
index 0cbc6281b0..75fdc1621b 100644
--- a/include/openspace/network/messagestructures.h
+++ b/include/openspace/network/messagestructures.h
@@ -25,7 +25,7 @@
 #ifndef __OPENSPACE_CORE___MESSAGESTRUCTURES___H__
 #define __OPENSPACE_CORE___MESSAGESTRUCTURES___H__
 
-#include <ghoul/fmt.h>
+#include <ghoul/format.h>
 #include <ghoul/glm.h>
 #include <ghoul/logging/logmanager.h>
 #include <algorithm>
diff --git a/include/openspace/util/json_helper.inl b/include/openspace/util/json_helper.inl
index 62a4c96f9b..cb7b8d8347 100644
--- a/include/openspace/util/json_helper.inl
+++ b/include/openspace/util/json_helper.inl
@@ -22,7 +22,7 @@
  * OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                                         *
  ****************************************************************************************/
 
-#include <ghoul/fmt.h>
+#include <ghoul/format.h>
 #include <ghoul/glm.h>
 #include <ghoul/misc/dictionaryjsonformatter.h>
 #include <type_traits>
diff --git a/include/openspace/util/spicemanager.h b/include/openspace/util/spicemanager.h
index bd01734f9d..7428bc89ad 100644
--- a/include/openspace/util/spicemanager.h
+++ b/include/openspace/util/spicemanager.h
@@ -25,7 +25,7 @@
 #ifndef __OPENSPACE_CORE___SPICEMANAGER___H__
 #define __OPENSPACE_CORE___SPICEMANAGER___H__
 
-#include <ghoul/fmt.h>
+#include <ghoul/format.h>
 #include <ghoul/glm.h>
 #include <ghoul/misc/assert.h>
 #include <ghoul/misc/boolean.h>
diff --git a/modules/audio/include.cmake b/modules/audio/include.cmake
new file mode 100644
index 0000000000..ffea0ac430
--- /dev/null
+++ b/modules/audio/include.cmake
@@ -0,0 +1 @@
+set(DEFAULT_MODULE ON)
diff --git a/modules/base/rotation/fixedrotation.cpp b/modules/base/rotation/fixedrotation.cpp
index a176e16cca..2a03a54a02 100644
--- a/modules/base/rotation/fixedrotation.cpp
+++ b/modules/base/rotation/fixedrotation.cpp
@@ -28,7 +28,7 @@
 #include <openspace/documentation/verifier.h>
 #include <openspace/query/query.h>
 #include <openspace/scene/scenegraphnode.h>
-#include <ghoul/fmt.h>
+#include <ghoul/format.h>
 #include <ghoul/logging/logmanager.h>
 #include <ghoul/misc/assert.h>
 #include <ghoul/misc/profiling.h>
diff --git a/modules/base/translation/luatranslation.cpp b/modules/base/translation/luatranslation.cpp
index 986135f156..0d1f8ff9db 100644
--- a/modules/base/translation/luatranslation.cpp
+++ b/modules/base/translation/luatranslation.cpp
@@ -27,9 +27,9 @@
 #include <openspace/documentation/documentation.h>
 #include <openspace/documentation/verifier.h>
 #include <openspace/util/updatestructures.h>
-#include <ghoul/fmt.h>
 #include <ghoul/filesystem/file.h>
 #include <ghoul/filesystem/filesystem.h>
+#include <ghoul/format.h>
 #include <ghoul/logging/logmanager.h>
 #include <ghoul/lua/ghoul_lua.h>
 #include <ghoul/lua/lua_helper.h>
diff --git a/modules/cefwebgui/cefwebguimodule.cpp b/modules/cefwebgui/cefwebguimodule.cpp
index 944bde0782..818505ccc0 100644
--- a/modules/cefwebgui/cefwebguimodule.cpp
+++ b/modules/cefwebgui/cefwebguimodule.cpp
@@ -32,7 +32,7 @@
 #include <openspace/engine/globalscallbacks.h>
 #include <openspace/engine/moduleengine.h>
 #include <openspace/engine/windowdelegate.h>
-#include <ghoul/fmt.h>
+#include <ghoul/format.h>
 #include <ghoul/logging/logmanager.h>
 #include <ghoul/misc/dictionary.h>
 #include <ghoul/misc/profiling.h>
diff --git a/modules/exoplanets/exoplanetshelper.cpp b/modules/exoplanets/exoplanetshelper.cpp
index c4c3ebc9d4..bc6e58ca9e 100644
--- a/modules/exoplanets/exoplanetshelper.cpp
+++ b/modules/exoplanets/exoplanetshelper.cpp
@@ -29,7 +29,7 @@
 #include <openspace/engine/moduleengine.h>
 #include <openspace/util/spicemanager.h>
 #include <ghoul/filesystem/filesystem.h>
-#include <ghoul/fmt.h>
+#include <ghoul/format.h>
 #include <ghoul/logging/logmanager.h>
 #include <glm/gtx/quaternion.hpp>
 #include <glm/gtx/transform.hpp>
diff --git a/modules/exoplanets/exoplanetsmodule.cpp b/modules/exoplanets/exoplanetsmodule.cpp
index d26ad79e7a..37f9b366f4 100644
--- a/modules/exoplanets/exoplanetsmodule.cpp
+++ b/modules/exoplanets/exoplanetsmodule.cpp
@@ -39,7 +39,7 @@
 #include <openspace/util/timeconversion.h>
 #include <openspace/util/timemanager.h>
 #include <ghoul/filesystem/filesystem.h>
-#include <ghoul/fmt.h>
+#include <ghoul/format.h>
 #include <ghoul/glm.h>
 #include <ghoul/logging/logmanager.h>
 #include <ghoul/misc/assert.h>
diff --git a/modules/exoplanets/tasks/exoplanetsdatapreparationtask.cpp b/modules/exoplanets/tasks/exoplanetsdatapreparationtask.cpp
index a6b13e56d1..56fae7652b 100644
--- a/modules/exoplanets/tasks/exoplanetsdatapreparationtask.cpp
+++ b/modules/exoplanets/tasks/exoplanetsdatapreparationtask.cpp
@@ -29,7 +29,7 @@
 #include <openspace/documentation/verifier.h>
 #include <openspace/util/coordinateconversion.h>
 #include <ghoul/filesystem/filesystem.h>
-#include <ghoul/fmt.h>
+#include <ghoul/format.h>
 #include <ghoul/glm.h>
 #include <ghoul/logging/logmanager.h>
 #include <ghoul/misc/dictionary.h>
diff --git a/modules/fieldlinessequence/util/fieldlinesstate.cpp b/modules/fieldlinessequence/util/fieldlinesstate.cpp
index e4e746b62b..b2e1b828fd 100644
--- a/modules/fieldlinessequence/util/fieldlinesstate.cpp
+++ b/modules/fieldlinessequence/util/fieldlinesstate.cpp
@@ -26,7 +26,7 @@
 
 #include <openspace/json.h>
 #include <openspace/util/time.h>
-#include <ghoul/fmt.h>
+#include <ghoul/format.h>
 #include <ghoul/logging/logmanager.h>
 #include <fstream>
 #include <iomanip>
diff --git a/modules/fieldlinessequence/util/kameleonfieldlinehelper.cpp b/modules/fieldlinessequence/util/kameleonfieldlinehelper.cpp
index 86741017dd..149f93c924 100644
--- a/modules/fieldlinessequence/util/kameleonfieldlinehelper.cpp
+++ b/modules/fieldlinessequence/util/kameleonfieldlinehelper.cpp
@@ -27,7 +27,7 @@
 #include <modules/fieldlinessequence/util/commons.h>
 #include <modules/fieldlinessequence/util/fieldlinesstate.h>
 #include <openspace/util/spicemanager.h>
-#include <ghoul/fmt.h>
+#include <ghoul/format.h>
 #include <ghoul/logging/logmanager.h>
 #include <memory>
 
diff --git a/modules/fitsfilereader/src/fitsfilereader.cpp b/modules/fitsfilereader/src/fitsfilereader.cpp
index ae905c3940..9a6189eff2 100644
--- a/modules/fitsfilereader/src/fitsfilereader.cpp
+++ b/modules/fitsfilereader/src/fitsfilereader.cpp
@@ -25,7 +25,7 @@
 #include <modules/fitsfilereader/include/fitsfilereader.h>
 
 #include <openspace/util/distanceconversion.h>
-#include <ghoul/fmt.h>
+#include <ghoul/format.h>
 #include <ghoul/logging/logmanager.h>
 #include <ghoul/misc/dictionary.h>
 #include <fstream>
diff --git a/modules/gaia/rendering/octreemanager.cpp b/modules/gaia/rendering/octreemanager.cpp
index b8c8ea8e8b..f77492ad78 100644
--- a/modules/gaia/rendering/octreemanager.cpp
+++ b/modules/gaia/rendering/octreemanager.cpp
@@ -26,7 +26,7 @@
 
 #include <modules/gaia/rendering/octreeculler.h>
 #include <openspace/util/distanceconstants.h>
-#include <ghoul/fmt.h>
+#include <ghoul/format.h>
 #include <ghoul/glm.h>
 #include <ghoul/logging/logmanager.h>
 #include <fstream>
diff --git a/modules/gaia/rendering/renderablegaiastars.cpp b/modules/gaia/rendering/renderablegaiastars.cpp
index c345b1f5f0..8caea6a862 100644
--- a/modules/gaia/rendering/renderablegaiastars.cpp
+++ b/modules/gaia/rendering/renderablegaiastars.cpp
@@ -35,8 +35,8 @@
 #include <openspace/rendering/renderengine.h>
 #include <openspace/util/distanceconversion.h>
 #include <openspace/util/updatestructures.h>
-#include <ghoul/fmt.h>
 #include <ghoul/filesystem/filesystem.h>
+#include <ghoul/format.h>
 #include <ghoul/io/texture/texturereader.h>
 #include <ghoul/misc/templatefactory.h>
 #include <ghoul/opengl/programobject.h>
diff --git a/modules/gaia/tasks/constructoctreetask.cpp b/modules/gaia/tasks/constructoctreetask.cpp
index 338d788617..b555002cdd 100644
--- a/modules/gaia/tasks/constructoctreetask.cpp
+++ b/modules/gaia/tasks/constructoctreetask.cpp
@@ -26,8 +26,8 @@
 
 #include <openspace/documentation/documentation.h>
 #include <openspace/documentation/verifier.h>
-#include <ghoul/fmt.h>
 #include <ghoul/filesystem/filesystem.h>
+#include <ghoul/format.h>
 #include <ghoul/logging/logmanager.h>
 #include <ghoul/misc/dictionary.h>
 #include <filesystem>
diff --git a/modules/gaia/tasks/readfilejob.cpp b/modules/gaia/tasks/readfilejob.cpp
index 34e4760bd9..2e9e0ffca3 100644
--- a/modules/gaia/tasks/readfilejob.cpp
+++ b/modules/gaia/tasks/readfilejob.cpp
@@ -25,9 +25,9 @@
 #include <modules/gaia/tasks/readfilejob.h>
 
 #include <openspace/util/distanceconversion.h>
-#include <ghoul/misc/dictionary.h>
+#include <ghoul/format.h>
 #include <ghoul/logging/logmanager.h>
-#include <ghoul/fmt.h>
+#include <ghoul/misc/dictionary.h>
 
 namespace {
     constexpr std::string_view _loggerCat = "ReadFileJob";
diff --git a/modules/gaia/tasks/readfitstask.cpp b/modules/gaia/tasks/readfitstask.cpp
index dcad2ef70c..c44ab59257 100644
--- a/modules/gaia/tasks/readfitstask.cpp
+++ b/modules/gaia/tasks/readfitstask.cpp
@@ -28,10 +28,10 @@
 #include <openspace/documentation/documentation.h>
 #include <openspace/documentation/verifier.h>
 
+#include <ghoul/logging/logmanager.h>
 #include <ghoul/misc/dictionary.h>
 #include <ghoul/filesystem/filesystem.h>
-#include <ghoul/logging/logmanager.h>
-#include <ghoul/fmt.h>
+#include <ghoul/format.h>
 #include <filesystem>
 #include <fstream>
 #include <set>
diff --git a/modules/gaia/tasks/readspecktask.cpp b/modules/gaia/tasks/readspecktask.cpp
index 915368c986..ebd6aec48e 100644
--- a/modules/gaia/tasks/readspecktask.cpp
+++ b/modules/gaia/tasks/readspecktask.cpp
@@ -27,8 +27,8 @@
 #include <modules/fitsfilereader/include/fitsfilereader.h>
 #include <openspace/documentation/documentation.h>
 #include <openspace/documentation/verifier.h>
-#include <ghoul/fmt.h>
 #include <ghoul/filesystem/filesystem.h>
+#include <ghoul/format.h>
 #include <ghoul/logging/logmanager.h>
 #include <ghoul/misc/dictionary.h>
 #include <fstream>
diff --git a/modules/galaxy/rendering/renderablegalaxy.cpp b/modules/galaxy/rendering/renderablegalaxy.cpp
index 32ab56f184..8069010734 100644
--- a/modules/galaxy/rendering/renderablegalaxy.cpp
+++ b/modules/galaxy/rendering/renderablegalaxy.cpp
@@ -35,10 +35,10 @@
 #include <openspace/util/boxgeometry.h>
 #include <openspace/util/distanceconstants.h>
 #include <openspace/util/updatestructures.h>
-#include <ghoul/fmt.h>
-#include <ghoul/glm.h>
 #include <ghoul/filesystem/cachemanager.h>
 #include <ghoul/filesystem/filesystem.h>
+#include <ghoul/format.h>
+#include <ghoul/glm.h>
 #include <ghoul/io/texture/texturereader.h>
 #include <ghoul/logging/logmanager.h>
 #include <ghoul/misc/profiling.h>
diff --git a/modules/globebrowsing/globebrowsingmodule.cpp b/modules/globebrowsing/globebrowsingmodule.cpp
index 934d855f1b..7688d89bda 100644
--- a/modules/globebrowsing/globebrowsingmodule.cpp
+++ b/modules/globebrowsing/globebrowsingmodule.cpp
@@ -67,8 +67,8 @@
 #include <openspace/util/factorymanager.h>
 #include <openspace/util/updatestructures.h>
 #include <ghoul/filesystem/filesystem.h>
+#include <ghoul/format.h>
 #include <ghoul/logging/logmanager.h>
-#include <ghoul/fmt.h>
 #include <ghoul/misc/assert.h>
 #include <ghoul/misc/templatefactory.h>
 #include <ghoul/misc/profiling.h>
diff --git a/modules/globebrowsing/src/geojson/geojsoncomponent.cpp b/modules/globebrowsing/src/geojson/geojsoncomponent.cpp
index cd86bac7f8..a296b70dc7 100644
--- a/modules/globebrowsing/src/geojson/geojsoncomponent.cpp
+++ b/modules/globebrowsing/src/geojson/geojsoncomponent.cpp
@@ -37,7 +37,7 @@
 #include <openspace/scripting/scriptengine.h>
 #include <openspace/util/updatestructures.h>
 #include <ghoul/filesystem/filesystem.h>
-#include <ghoul/fmt.h>
+#include <ghoul/format.h>
 #include <ghoul/logging/logmanager.h>
 #include <ghoul/opengl/openglstatecache.h>
 #include <ghoul/opengl/programobject.h>
diff --git a/modules/globebrowsing/src/geojson/globegeometryfeature.cpp b/modules/globebrowsing/src/geojson/globegeometryfeature.cpp
index b925be7797..f022c9a602 100644
--- a/modules/globebrowsing/src/geojson/globegeometryfeature.cpp
+++ b/modules/globebrowsing/src/geojson/globegeometryfeature.cpp
@@ -35,7 +35,7 @@
 #include <openspace/scene/scenegraphnode.h>
 #include <openspace/util/updatestructures.h>
 #include <ghoul/filesystem/filesystem.h>
-#include <ghoul/fmt.h>
+#include <ghoul/format.h>
 #include <ghoul/logging/logmanager.h>
 #include <ghoul/opengl/openglstatecache.h>
 #include <ghoul/opengl/programobject.h>
diff --git a/modules/globebrowsing/src/rawtiledatareader.cpp b/modules/globebrowsing/src/rawtiledatareader.cpp
index feb2a6f75f..47fd4447c4 100644
--- a/modules/globebrowsing/src/rawtiledatareader.cpp
+++ b/modules/globebrowsing/src/rawtiledatareader.cpp
@@ -28,9 +28,9 @@
 #include <modules/globebrowsing/src/geodeticpatch.h>
 #include <openspace/engine/globals.h>
 #include <openspace/engine/moduleengine.h>
-#include <ghoul/fmt.h>
 #include <ghoul/filesystem/file.h>
 #include <ghoul/filesystem/filesystem.h>
+#include <ghoul/format.h>
 #include <ghoul/logging/logmanager.h>
 #include <ghoul/misc/exception.h>
 #include <ghoul/misc/profiling.h>
diff --git a/modules/globebrowsing/src/timequantizer.cpp b/modules/globebrowsing/src/timequantizer.cpp
index e54c51b352..31af4b3b96 100644
--- a/modules/globebrowsing/src/timequantizer.cpp
+++ b/modules/globebrowsing/src/timequantizer.cpp
@@ -26,7 +26,7 @@
 
 #include <openspace/util/spicemanager.h>
 #include <openspace/util/time.h>
-#include <ghoul/fmt.h>
+#include <ghoul/format.h>
 #include <ghoul/glm.h>
 #include <ghoul/misc/assert.h>
 #include <ghoul/misc/exception.h>
diff --git a/modules/imgui/src/guiglobebrowsingcomponent.cpp b/modules/imgui/src/guiglobebrowsingcomponent.cpp
index be43f8f425..fa197fb116 100644
--- a/modules/imgui/src/guiglobebrowsingcomponent.cpp
+++ b/modules/imgui/src/guiglobebrowsingcomponent.cpp
@@ -35,7 +35,7 @@
 #include <openspace/rendering/renderengine.h>
 #include <openspace/scene/scene.h>
 #include <openspace/scripting/scriptengine.h>
-#include <ghoul/fmt.h>
+#include <ghoul/format.h>
 #include <ghoul/logging/logmanager.h>
 #include <numeric>
 
diff --git a/modules/imgui/src/guiparallelcomponent.cpp b/modules/imgui/src/guiparallelcomponent.cpp
index b7f001865d..06717bba5b 100644
--- a/modules/imgui/src/guiparallelcomponent.cpp
+++ b/modules/imgui/src/guiparallelcomponent.cpp
@@ -31,7 +31,7 @@
 #include <openspace/network/parallelpeer.h>
 #include <openspace/network/messagestructures.h>
 #include <openspace/util/timemanager.h>
-#include <ghoul/fmt.h>
+#include <ghoul/format.h>
 #include <algorithm>
 #include <numeric>
 
diff --git a/modules/kameleon/src/kameleonhelper.cpp b/modules/kameleon/src/kameleonhelper.cpp
index 8ae94553f0..237e1c7fea 100644
--- a/modules/kameleon/src/kameleonhelper.cpp
+++ b/modules/kameleon/src/kameleonhelper.cpp
@@ -25,7 +25,7 @@
 #include <modules/kameleon/include/kameleonhelper.h>
 
 #include <openspace/util/time.h>
-#include <ghoul/fmt.h>
+#include <ghoul/format.h>
 #include <ghoul/logging/logmanager.h>
 
 #ifdef _MSC_VER
diff --git a/modules/kameleon/src/kameleonwrapper.cpp b/modules/kameleon/src/kameleonwrapper.cpp
index e78fcbcfd9..17e7bc59bf 100644
--- a/modules/kameleon/src/kameleonwrapper.cpp
+++ b/modules/kameleon/src/kameleonwrapper.cpp
@@ -26,9 +26,9 @@
 
 #include <ghoul/filesystem/file.h>
 #include <ghoul/filesystem/filesystem.h>
-#include <ghoul/logging/logmanager.h>
-#include <ghoul/fmt.h>
+#include <ghoul/format.h>
 #include <ghoul/glm.h>
+#include <ghoul/logging/logmanager.h>
 #include <ghoul/misc/assert.h>
 #include <ghoul/misc/stringhelper.h>
 #include <filesystem>
diff --git a/modules/kameleonvolume/kameleonvolumereader.cpp b/modules/kameleonvolume/kameleonvolumereader.cpp
index d3d7c61b89..e217b42208 100644
--- a/modules/kameleonvolume/kameleonvolumereader.cpp
+++ b/modules/kameleonvolume/kameleonvolumereader.cpp
@@ -26,9 +26,9 @@
 
 #include <modules/kameleon/include/kameleonwrapper.h>
 #include <modules/volume/rawvolume.h>
-#include <ghoul/fmt.h>
 #include <ghoul/filesystem/file.h>
 #include <ghoul/filesystem/filesystem.h>
+#include <ghoul/format.h>
 #include <ghoul/logging/logmanager.h>
 #include <ghoul/misc/dictionary.h>
 #include <filesystem>
diff --git a/modules/kameleonvolume/tasks/kameleonmetadatatojsontask.cpp b/modules/kameleonvolume/tasks/kameleonmetadatatojsontask.cpp
index 4493a589a3..1855ebcaf7 100644
--- a/modules/kameleonvolume/tasks/kameleonmetadatatojsontask.cpp
+++ b/modules/kameleonvolume/tasks/kameleonmetadatatojsontask.cpp
@@ -26,8 +26,8 @@
 
 #include <modules/kameleonvolume/kameleonvolumereader.h>
 #include <openspace/documentation/verifier.h>
-#include <ghoul/fmt.h>
 #include <ghoul/filesystem/filesystem.h>
+#include <ghoul/format.h>
 #include <ghoul/misc/dictionaryjsonformatter.h>
 #include <filesystem>
 #include <fstream>
diff --git a/modules/kameleonvolume/tasks/kameleonvolumetorawtask.cpp b/modules/kameleonvolume/tasks/kameleonvolumetorawtask.cpp
index c551aa8961..0452e04f8c 100644
--- a/modules/kameleonvolume/tasks/kameleonvolumetorawtask.cpp
+++ b/modules/kameleonvolume/tasks/kameleonvolumetorawtask.cpp
@@ -27,8 +27,8 @@
 #include <modules/kameleonvolume/kameleonvolumereader.h>
 #include <modules/volume/rawvolumewriter.h>
 #include <openspace/documentation/verifier.h>
-#include <ghoul/fmt.h>
 #include <ghoul/filesystem/filesystem.h>
+#include <ghoul/format.h>
 #include <ghoul/misc/dictionaryluaformatter.h>
 #include <array>
 #include <filesystem>
diff --git a/modules/multiresvolume/rendering/brickmanager.cpp b/modules/multiresvolume/rendering/brickmanager.cpp
index 959b11522e..7c171a2a48 100644
--- a/modules/multiresvolume/rendering/brickmanager.cpp
+++ b/modules/multiresvolume/rendering/brickmanager.cpp
@@ -24,7 +24,7 @@
 
 #include <modules/multiresvolume/rendering/brickmanager.h>
 
-#include <ghoul/fmt.h>
+#include <ghoul/format.h>
 #include <ghoul/glm.h>
 #include <ghoul/logging/logmanager.h>
 #include <ghoul/opengl/texture.h>
diff --git a/modules/multiresvolume/rendering/errorhistogrammanager.cpp b/modules/multiresvolume/rendering/errorhistogrammanager.cpp
index c2ad719530..23320c6770 100644
--- a/modules/multiresvolume/rendering/errorhistogrammanager.cpp
+++ b/modules/multiresvolume/rendering/errorhistogrammanager.cpp
@@ -27,7 +27,7 @@
 #include <modules/multiresvolume/rendering/tsp.h>
 #include <openspace/util/progressbar.h>
 #include <ghoul/logging/logmanager.h>
-#include <ghoul/fmt.h>
+#include <ghoul/format.h>
 
 namespace openspace {
 
diff --git a/modules/multiresvolume/rendering/localerrorhistogrammanager.cpp b/modules/multiresvolume/rendering/localerrorhistogrammanager.cpp
index 75d276767f..248f5f3aa2 100644
--- a/modules/multiresvolume/rendering/localerrorhistogrammanager.cpp
+++ b/modules/multiresvolume/rendering/localerrorhistogrammanager.cpp
@@ -27,7 +27,7 @@
 #include <modules/multiresvolume/rendering/tsp.h>
 #include <openspace/util/progressbar.h>
 #include <ghoul/logging/logmanager.h>
-#include <ghoul/fmt.h>
+#include <ghoul/format.h>
 
 namespace {
     constexpr std::string_view _loggerCat = "LocalErrorHistogramManager";
diff --git a/modules/multiresvolume/rendering/renderablemultiresvolume.cpp b/modules/multiresvolume/rendering/renderablemultiresvolume.cpp
index 924a59ea24..89a30c0e6f 100644
--- a/modules/multiresvolume/rendering/renderablemultiresvolume.cpp
+++ b/modules/multiresvolume/rendering/renderablemultiresvolume.cpp
@@ -42,11 +42,11 @@
 #include <openspace/util/spicemanager.h>
 #include <openspace/util/time.h>
 #include <openspace/util/updatestructures.h>
-#include <ghoul/fmt.h>
-#include <ghoul/glm.h>
 #include <ghoul/filesystem/cachemanager.h>
 #include <ghoul/filesystem/file.h>
 #include <ghoul/filesystem/filesystem.h>
+#include <ghoul/format.h>
+#include <ghoul/glm.h>
 #include <ghoul/io/texture/texturereader.h>
 #include <ghoul/misc/dictionary.h>
 #include <ghoul/opengl/framebufferobject.h>
diff --git a/modules/multiresvolume/rendering/tsp.cpp b/modules/multiresvolume/rendering/tsp.cpp
index a51c26d064..0bcd739914 100644
--- a/modules/multiresvolume/rendering/tsp.cpp
+++ b/modules/multiresvolume/rendering/tsp.cpp
@@ -24,11 +24,11 @@
 
 #include <modules/multiresvolume/rendering/tsp.h>
 
-#include <ghoul/fmt.h>
-#include <ghoul/glm.h>
 #include <ghoul/filesystem/file.h>
 #include <ghoul/filesystem/filesystem.h>
 #include <ghoul/filesystem/cachemanager.h>
+#include <ghoul/format.h>
+#include <ghoul/glm.h>
 #include <ghoul/logging/logmanager.h>
 #include <filesystem>
 #include <numeric>
diff --git a/modules/server/servermodule.cpp b/modules/server/servermodule.cpp
index aebcaf068f..6aae5399ce 100644
--- a/modules/server/servermodule.cpp
+++ b/modules/server/servermodule.cpp
@@ -31,7 +31,7 @@
 #include <openspace/engine/globalscallbacks.h>
 #include <openspace/engine/globals.h>
 #include <openspace/engine/windowdelegate.h>
-#include <ghoul/fmt.h>
+#include <ghoul/format.h>
 #include <ghoul/io/socket/socket.h>
 #include <ghoul/io/socket/tcpsocketserver.h>
 #include <ghoul/io/socket/websocket.h>
diff --git a/modules/server/src/connection.cpp b/modules/server/src/connection.cpp
index 37e1f2709d..6007ee706c 100644
--- a/modules/server/src/connection.cpp
+++ b/modules/server/src/connection.cpp
@@ -46,11 +46,11 @@
 #include <modules/server/include/topics/versiontopic.h>
 #include <openspace/engine/configuration.h>
 #include <openspace/engine/globals.h>
+#include <ghoul/format.h>
+#include <ghoul/logging/logmanager.h>
 #include <ghoul/io/socket/socket.h>
 #include <ghoul/io/socket/tcpsocketserver.h>
 #include <ghoul/io/socket/websocketserver.h>
-#include <ghoul/logging/logmanager.h>
-#include <ghoul/fmt.h>
 #include <ghoul/misc/profiling.h>
 
 namespace {
diff --git a/modules/server/src/topics/eventtopic.cpp b/modules/server/src/topics/eventtopic.cpp
index bb04159b15..206b3522b0 100644
--- a/modules/server/src/topics/eventtopic.cpp
+++ b/modules/server/src/topics/eventtopic.cpp
@@ -29,7 +29,7 @@
 #include <openspace/engine/globals.h>
 #include <openspace/events/event.h>
 #include <openspace/events/eventengine.h>
-#include <ghoul/fmt.h>
+#include <ghoul/format.h>
 #include <ghoul/logging/logmanager.h>
 
 namespace {
diff --git a/modules/server/src/topics/flightcontrollertopic.cpp b/modules/server/src/topics/flightcontrollertopic.cpp
index 7deecc1773..653b5998c5 100644
--- a/modules/server/src/topics/flightcontrollertopic.cpp
+++ b/modules/server/src/topics/flightcontrollertopic.cpp
@@ -39,7 +39,7 @@
 #include <openspace/util/timemanager.h>
 #include <ghoul/filesystem/file.h>
 #include <ghoul/filesystem/filesystem.h>
-#include <ghoul/fmt.h>
+#include <ghoul/format.h>
 #include <ghoul/logging/logmanager.h>
 #include <ghoul/lua/ghoul_lua.h>
 #include <iterator>
diff --git a/modules/server/src/topics/setpropertytopic.cpp b/modules/server/src/topics/setpropertytopic.cpp
index 4c2d84612f..e9d8bc04e3 100644
--- a/modules/server/src/topics/setpropertytopic.cpp
+++ b/modules/server/src/topics/setpropertytopic.cpp
@@ -30,7 +30,7 @@
 #include <openspace/query/query.h>
 #include <openspace/util/timemanager.h>
 #include <openspace/util/time.h>
-#include <ghoul/fmt.h>
+#include <ghoul/format.h>
 #include <ghoul/logging/logmanager.h>
 
 namespace {
diff --git a/modules/server/src/topics/subscriptiontopic.cpp b/modules/server/src/topics/subscriptiontopic.cpp
index 383f695e9f..52d7894b53 100644
--- a/modules/server/src/topics/subscriptiontopic.cpp
+++ b/modules/server/src/topics/subscriptiontopic.cpp
@@ -29,7 +29,7 @@
 #include <openspace/properties/property.h>
 #include <openspace/query/query.h>
 #include <openspace/util/timemanager.h>
-#include <ghoul/fmt.h>
+#include <ghoul/format.h>
 #include <ghoul/logging/logmanager.h>
 
 namespace {
diff --git a/modules/space/horizonsfile.cpp b/modules/space/horizonsfile.cpp
index 7fc790b4b0..8f09a289e8 100644
--- a/modules/space/horizonsfile.cpp
+++ b/modules/space/horizonsfile.cpp
@@ -28,7 +28,7 @@
 #include <openspace/util/spicemanager.h>
 #include <openspace/util/time.h>
 #include <ghoul/filesystem/filesystem.h>
-#include <ghoul/fmt.h>
+#include <ghoul/format.h>
 #include <ghoul/logging/logmanager.h>
 #include <ghoul/misc/stringhelper.h>
 #include <filesystem>
diff --git a/modules/space/translation/horizonstranslation.cpp b/modules/space/translation/horizonstranslation.cpp
index 8e34504f8f..7895a4e2ee 100644
--- a/modules/space/translation/horizonstranslation.cpp
+++ b/modules/space/translation/horizonstranslation.cpp
@@ -27,9 +27,9 @@
 #include <openspace/documentation/documentation.h>
 #include <openspace/documentation/verifier.h>
 #include <openspace/util/updatestructures.h>
-#include <ghoul/fmt.h>
 #include <ghoul/filesystem/cachemanager.h>
 #include <ghoul/filesystem/filesystem.h>
+#include <ghoul/format.h>
 #include <ghoul/logging/logmanager.h>
 #include <ghoul/lua/ghoul_lua.h>
 #include <ghoul/lua/lua_helper.h>
diff --git a/modules/spacecraftinstruments/util/hongkangparser.cpp b/modules/spacecraftinstruments/util/hongkangparser.cpp
index 87842787b7..9ed374c81c 100644
--- a/modules/spacecraftinstruments/util/hongkangparser.cpp
+++ b/modules/spacecraftinstruments/util/hongkangparser.cpp
@@ -26,15 +26,13 @@
 
 #include <modules/spacecraftinstruments/util/imagesequencer.h>
 #include <modules/spacecraftinstruments/util/instrumentdecoder.h>
-
 #include <openspace/util/spicemanager.h>
-
+#include <ghoul/filesystem/file.h>
+#include <ghoul/filesystem/filesystem.h>
+#include <ghoul/format.h>
 #include <ghoul/logging/logmanager.h>
 #include <ghoul/misc/dictionary.h>
 #include <ghoul/misc/stringhelper.h>
-#include <ghoul/filesystem/file.h>
-#include <ghoul/filesystem/filesystem.h>
-#include <ghoul/fmt.h>
 #include <filesystem>
 #include <fstream>
 
diff --git a/modules/spacecraftinstruments/util/instrumenttimesparser.cpp b/modules/spacecraftinstruments/util/instrumenttimesparser.cpp
index 130bde2a08..3735399dac 100644
--- a/modules/spacecraftinstruments/util/instrumenttimesparser.cpp
+++ b/modules/spacecraftinstruments/util/instrumenttimesparser.cpp
@@ -26,10 +26,10 @@
 
 #include <openspace/documentation/documentation.h>
 #include <openspace/util/spicemanager.h>
-#include <ghoul/fmt.h>
-#include <ghoul/logging/logmanager.h>
 #include <ghoul/filesystem/file.h>
 #include <ghoul/filesystem/filesystem.h>
+#include <ghoul/format.h>
+#include <ghoul/logging/logmanager.h>
 #include <ghoul/misc/dictionary.h>
 #include <filesystem>
 #include <fstream>
diff --git a/modules/spacecraftinstruments/util/labelparser.cpp b/modules/spacecraftinstruments/util/labelparser.cpp
index ee4b92db42..f85e055058 100644
--- a/modules/spacecraftinstruments/util/labelparser.cpp
+++ b/modules/spacecraftinstruments/util/labelparser.cpp
@@ -25,9 +25,9 @@
 #include <modules/spacecraftinstruments/util/labelparser.h>
 
 #include <openspace/util/spicemanager.h>
-#include <ghoul/fmt.h>
 #include <ghoul/filesystem/file.h>
 #include <ghoul/filesystem/filesystem.h>
+#include <ghoul/format.h>
 #include <ghoul/io/texture/texturereader.h>
 #include <ghoul/logging/logmanager.h>
 #include <ghoul/misc/dictionary.h>
diff --git a/modules/spout/spoutwrapper.cpp b/modules/spout/spoutwrapper.cpp
index fe03d8a2c3..cc225a01f3 100644
--- a/modules/spout/spoutwrapper.cpp
+++ b/modules/spout/spoutwrapper.cpp
@@ -24,7 +24,7 @@
 
 #include "modules/spout/spoutwrapper.h"
 
-#include <ghoul/fmt.h>
+#include <ghoul/format.h>
 #include <ghoul/logging/logmanager.h>
 #include <ghoul/opengl/ghoul_gl.h>
 #include <ghoul/opengl/texture.h>
diff --git a/modules/statemachine/src/statemachine.cpp b/modules/statemachine/src/statemachine.cpp
index 3acfd33ca4..ca1a743b79 100644
--- a/modules/statemachine/src/statemachine.cpp
+++ b/modules/statemachine/src/statemachine.cpp
@@ -25,7 +25,7 @@
 #include <modules/statemachine/include/statemachine.h>
 
 #include <openspace/documentation/documentation.h>
-#include <ghoul/fmt.h>
+#include <ghoul/format.h>
 #include <ghoul/logging/logmanager.h>
 #include <fstream>
 #include <optional>
diff --git a/modules/touch/src/touchinteraction.cpp b/modules/touch/src/touchinteraction.cpp
index 1822ce108a..a524919b17 100644
--- a/modules/touch/src/touchinteraction.cpp
+++ b/modules/touch/src/touchinteraction.cpp
@@ -39,7 +39,7 @@
 #include <openspace/util/keys.h>
 #include <openspace/util/time.h>
 #include <openspace/util/updatestructures.h>
-#include <ghoul/fmt.h>
+#include <ghoul/format.h>
 #include <ghoul/logging/logmanager.h>
 #include <ghoul/misc/invariants.h>
 #include <glm/gtx/quaternion.hpp>
diff --git a/modules/volume/rawvolumewriter.inl b/modules/volume/rawvolumewriter.inl
index 01845da3aa..54caacbd62 100644
--- a/modules/volume/rawvolumewriter.inl
+++ b/modules/volume/rawvolumewriter.inl
@@ -24,8 +24,8 @@
 
 #include <modules/volume/rawvolume.h>
 #include <modules/volume/volumeutils.h>
+#include <ghoul/format.h>
 #include <ghoul/misc/exception.h>
-#include <ghoul/fmt.h>
 #include <fstream>
 
 namespace openspace::volume {
diff --git a/modules/volume/tasks/generaterawvolumetask.cpp b/modules/volume/tasks/generaterawvolumetask.cpp
index 159d01aa85..4a8279d622 100644
--- a/modules/volume/tasks/generaterawvolumetask.cpp
+++ b/modules/volume/tasks/generaterawvolumetask.cpp
@@ -30,9 +30,9 @@
 #include <openspace/documentation/verifier.h>
 #include <openspace/util/time.h>
 #include <openspace/util/spicemanager.h>
-#include <ghoul/fmt.h>
 #include <ghoul/filesystem/filesystem.h>
 #include <ghoul/filesystem/file.h>
+#include <ghoul/format.h>
 #include <ghoul/logging/logmanager.h>
 #include <ghoul/lua/luastate.h>
 #include <ghoul/lua/lua_helper.h>
diff --git a/modules/webbrowser/src/browserinstance.cpp b/modules/webbrowser/src/browserinstance.cpp
index b2e523e7ea..f62d5aec0e 100644
--- a/modules/webbrowser/src/browserinstance.cpp
+++ b/modules/webbrowser/src/browserinstance.cpp
@@ -29,9 +29,9 @@
 #include <modules/webbrowser/include/webkeyboardhandler.h>
 #include <openspace/engine/globals.h>
 #include <openspace/engine/windowdelegate.h>
-#include <ghoul/fmt.h>
 #include <ghoul/filesystem/file.h>
 #include <ghoul/filesystem/filesystem.h>
+#include <ghoul/format.h>
 #include <ghoul/logging/logmanager.h>
 #include <ghoul/misc/assert.h>
 #include <ghoul/misc/profiling.h>
diff --git a/modules/webbrowser/src/eventhandler.cpp b/modules/webbrowser/src/eventhandler.cpp
index df745a55df..cff278d280 100644
--- a/modules/webbrowser/src/eventhandler.cpp
+++ b/modules/webbrowser/src/eventhandler.cpp
@@ -31,8 +31,8 @@
 #include <openspace/interaction/interactionmonitor.h>
 #include <openspace/interaction/keyboardinputstate.h>
 #include <openspace/navigation/navigationhandler.h>
+#include <ghoul/format.h>
 #include <ghoul/logging/logmanager.h>
-#include <ghoul/fmt.h>
 
 namespace {
     constexpr std::string_view _loggerCat = "WebBrowser:EventHandler";
diff --git a/modules/webgui/webguimodule.cpp b/modules/webgui/webguimodule.cpp
index 5e8ca13470..acc3add544 100644
--- a/modules/webgui/webguimodule.cpp
+++ b/modules/webgui/webguimodule.cpp
@@ -30,8 +30,8 @@
 #include <openspace/engine/globals.h>
 #include <openspace/engine/moduleengine.h>
 #include <openspace/util/json_helper.h>
-#include <ghoul/fmt.h>
 #include <ghoul/filesystem/filesystem.h>
+#include <ghoul/format.h>
 #include <ghoul/logging/logmanager.h>
 #include <ghoul/misc/dictionary.h>
 #include <ghoul/misc/profiling.h>
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index b92e05ea8a..1faaebc1b9 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -460,7 +460,7 @@ target_include_directories(openspace-core
 target_precompile_headers(openspace-core PRIVATE
   <openspace/json.h>
   <openspace/properties/numericalproperty.h>
-  [["ghoul/fmt.h"]]
+  [["ghoul/format.h"]]
   [["ghoul/glm.h"]]
   [["ghoul/misc/assert.h"]]
   [["ghoul/misc/boolean.h"]]
diff --git a/src/data/csvloader.cpp b/src/data/csvloader.cpp
index 4fa73168d2..e59e205676 100644
--- a/src/data/csvloader.cpp
+++ b/src/data/csvloader.cpp
@@ -26,10 +26,10 @@
 
 #include <openspace/data/datamapping.h>
 #include <openspace/util/progressbar.h>
-#include <ghoul/fmt.h>
 #include <ghoul/filesystem/cachemanager.h>
 #include <ghoul/filesystem/file.h>
 #include <ghoul/filesystem/filesystem.h>
+#include <ghoul/format.h>
 #include <ghoul/logging/logmanager.h>
 #include <ghoul/misc/assert.h>
 #include <ghoul/misc/exception.h>
diff --git a/src/data/dataloader.cpp b/src/data/dataloader.cpp
index c1815e60e8..057b82dece 100644
--- a/src/data/dataloader.cpp
+++ b/src/data/dataloader.cpp
@@ -26,10 +26,10 @@
 
 #include <openspace/data/csvloader.h>
 #include <openspace/data/speckloader.h>
-#include <ghoul/fmt.h>
 #include <ghoul/filesystem/cachemanager.h>
 #include <ghoul/filesystem/file.h>
 #include <ghoul/filesystem/filesystem.h>
+#include <ghoul/format.h>
 #include <ghoul/logging/logmanager.h>
 #include <ghoul/misc/assert.h>
 #include <ghoul/misc/exception.h>
diff --git a/src/data/speckloader.cpp b/src/data/speckloader.cpp
index e4a8c2e1cd..0bc44e6f91 100644
--- a/src/data/speckloader.cpp
+++ b/src/data/speckloader.cpp
@@ -24,10 +24,10 @@
 
 #include <openspace/data/speckloader.h>
 
-#include <ghoul/fmt.h>
 #include <ghoul/filesystem/cachemanager.h>
 #include <ghoul/filesystem/file.h>
 #include <ghoul/filesystem/filesystem.h>
+#include <ghoul/format.h>
 #include <ghoul/logging/logmanager.h>
 #include <ghoul/misc/assert.h>
 #include <ghoul/misc/stringhelper.h>
diff --git a/src/documentation/documentationengine.cpp b/src/documentation/documentationengine.cpp
index 0540c44813..39f4d6ed1a 100644
--- a/src/documentation/documentationengine.cpp
+++ b/src/documentation/documentationengine.cpp
@@ -43,8 +43,8 @@
 #include <openspace/scripting/scriptengine.h>
 #include <openspace/util/factorymanager.h>
 #include <openspace/util/json_helper.h>
-#include <ghoul/fmt.h>
 #include <ghoul/filesystem/filesystem.h>
+#include <ghoul/format.h>
 #include <ghoul/misc/profiling.h>
 #include <fstream>
 #include <future>
diff --git a/src/engine/downloadmanager.cpp b/src/engine/downloadmanager.cpp
index c3768943ec..db92317fa7 100644
--- a/src/engine/downloadmanager.cpp
+++ b/src/engine/downloadmanager.cpp
@@ -24,9 +24,9 @@
 
 #include <openspace/engine/downloadmanager.h>
 
-#include <ghoul/fmt.h>
 #include <ghoul/filesystem/file.h>
 #include <ghoul/filesystem/filesystem.h>
+#include <ghoul/format.h>
 #include <ghoul/logging/logmanager.h>
 #include <ghoul/misc/assert.h>
 #include <ghoul/misc/thread.h>
diff --git a/src/events/event.cpp b/src/events/event.cpp
index f1aa87de91..da0a6ca00d 100644
--- a/src/events/event.cpp
+++ b/src/events/event.cpp
@@ -30,7 +30,7 @@
 #include <openspace/scene/scenegraphnode.h>
 #include <openspace/util/time.h>
 #include <openspace/util/tstring.h>
-#include <ghoul/fmt.h>
+#include <ghoul/format.h>
 #include <ghoul/logging/logmanager.h>
 #include <ghoul/misc/assert.h>
 #include <functional>
diff --git a/src/interaction/touchbar.mm b/src/interaction/touchbar.mm
index 8cc7149f73..9264045a27 100644
--- a/src/interaction/touchbar.mm
+++ b/src/interaction/touchbar.mm
@@ -31,7 +31,7 @@
 #include <openspace/scene/scenegraphnode.h>
 #include <openspace/scripting/scriptengine.h>
 #include <openspace/util/timemanager.h>
-#include <ghoul/fmt.h>
+#include <ghoul/format.h>
 
 using namespace openspace;
 
diff --git a/src/network/parallelconnection.cpp b/src/network/parallelconnection.cpp
index 4c51f97286..8757ce8b7b 100644
--- a/src/network/parallelconnection.cpp
+++ b/src/network/parallelconnection.cpp
@@ -26,8 +26,7 @@
 
 #include <openspace/engine/globals.h>
 #include <openspace/engine/windowdelegate.h>
-
-#include <ghoul/fmt.h>
+#include <ghoul/format.h>
 #include <ghoul/io/socket/tcpsocket.h>
 #include <ghoul/logging/logmanager.h>
 
diff --git a/src/properties/propertyowner.cpp b/src/properties/propertyowner.cpp
index 29e87914b6..bbe708ba3a 100644
--- a/src/properties/propertyowner.cpp
+++ b/src/properties/propertyowner.cpp
@@ -29,7 +29,7 @@
 #include <openspace/events/eventengine.h>
 #include <openspace/properties/property.h>
 #include <openspace/scene/scene.h>
-#include <ghoul/fmt.h>
+#include <ghoul/format.h>
 #include <ghoul/logging/logmanager.h>
 #include <ghoul/misc/assert.h>
 #include <ghoul/misc/invariants.h>
diff --git a/src/rendering/loadingscreen.cpp b/src/rendering/loadingscreen.cpp
index 7a23ccd012..17b2145937 100644
--- a/src/rendering/loadingscreen.cpp
+++ b/src/rendering/loadingscreen.cpp
@@ -31,11 +31,11 @@
 #include <openspace/scene/assetmanager.h>
 #include <openspace/scene/scene.h>
 #include <openspace/util/resourcesynchronization.h>
-#include <ghoul/fmt.h>
 #include <ghoul/filesystem/filesystem.h>
 #include <ghoul/font/font.h>
 #include <ghoul/font/fontmanager.h>
 #include <ghoul/font/fontrenderer.h>
+#include <ghoul/format.h>
 #include <ghoul/io/texture/texturereader.h>
 #include <ghoul/logging/logmanager.h>
 #include <ghoul/misc/profiling.h>
diff --git a/src/scene/asset.cpp b/src/scene/asset.cpp
index 309ce7de86..1bbea55cd2 100644
--- a/src/scene/asset.cpp
+++ b/src/scene/asset.cpp
@@ -26,9 +26,9 @@
 
 #include <openspace/documentation/documentation.h>
 #include <openspace/scene/assetmanager.h>
-#include <ghoul/fmt.h>
 #include <ghoul/filesystem/filesystem.h>
 #include <ghoul/filesystem/file.h>
+#include <ghoul/format.h>
 #include <ghoul/logging/logmanager.h>
 #include <ghoul/lua/ghoul_lua.h>
 #include <ghoul/misc/profiling.h>
diff --git a/src/scene/profile.cpp b/src/scene/profile.cpp
index 571a232506..29f2516531 100644
--- a/src/scene/profile.cpp
+++ b/src/scene/profile.cpp
@@ -35,7 +35,7 @@
 #include <openspace/util/timemanager.h>
 #include <ghoul/filesystem/file.h>
 #include <ghoul/filesystem/filesystem.h>
-#include <ghoul/fmt.h>
+#include <ghoul/format.h>
 #include <ghoul/misc/assert.h>
 #include <ghoul/logging/logmanager.h>
 #include <ghoul/misc/profiling.h>
diff --git a/src/util/coordinateconversion.cpp b/src/util/coordinateconversion.cpp
index f7638aa095..2b19ca6496 100644
--- a/src/util/coordinateconversion.cpp
+++ b/src/util/coordinateconversion.cpp
@@ -24,7 +24,7 @@
 
 #include <openspace/util/coordinateconversion.h>
 
-#include <ghoul/fmt.h>
+#include <ghoul/format.h>
 #include <ghoul/logging/logmanager.h>
 #include <ghoul/lua/ghoul_lua.h>
 
diff --git a/src/util/httprequest.cpp b/src/util/httprequest.cpp
index 6861cca777..8b371c1e31 100644
--- a/src/util/httprequest.cpp
+++ b/src/util/httprequest.cpp
@@ -24,9 +24,9 @@
 
 #include <openspace/util/httprequest.h>
 
-#include <ghoul/fmt.h>
 #include <ghoul/filesystem/file.h>
 #include <ghoul/filesystem/filesystem.h>
+#include <ghoul/format.h>
 #include <ghoul/logging/logmanager.h>
 #include <curl/curl.h>
 #include <filesystem>
diff --git a/src/util/keys.cpp b/src/util/keys.cpp
index 52dbfda6f7..db49fd8bff 100644
--- a/src/util/keys.cpp
+++ b/src/util/keys.cpp
@@ -24,7 +24,7 @@
 
 #include <openspace/util/keys.h>
 
-#include <ghoul/fmt.h>
+#include <ghoul/format.h>
 #include <ghoul/logging/logmanager.h>
 #include <ghoul/misc/assert.h>
 #include <ghoul/misc/exception.h>
diff --git a/src/util/openspacemodule.cpp b/src/util/openspacemodule.cpp
index ab736d235e..92e8153e8c 100644
--- a/src/util/openspacemodule.cpp
+++ b/src/util/openspacemodule.cpp
@@ -26,8 +26,8 @@
 
 #include <openspace/documentation/documentation.h>
 #include <openspace/scripting/lualibrary.h>
-#include <ghoul/fmt.h>
 #include <ghoul/filesystem/filesystem.h>
+#include <ghoul/format.h>
 #include <ghoul/logging/logmanager.h>
 #include <ghoul/misc/dictionary.h>
 #include <ghoul/misc/profiling.h>
diff --git a/src/util/taskloader.cpp b/src/util/taskloader.cpp
index 045e4680ce..4ca220b510 100644
--- a/src/util/taskloader.cpp
+++ b/src/util/taskloader.cpp
@@ -26,9 +26,9 @@
 
 #include <openspace/documentation/documentation.h>
 #include <openspace/util/task.h>
-#include <ghoul/fmt.h>
 #include <ghoul/filesystem/file.h>
 #include <ghoul/filesystem/filesystem.h>
+#include <ghoul/format.h>
 #include <ghoul/logging/logmanager.h>
 #include <ghoul/lua/ghoul_lua.h>
 #include <ghoul/misc/dictionary.h>
diff --git a/src/util/time.cpp b/src/util/time.cpp
index 51419dcc90..5567f75111 100644
--- a/src/util/time.cpp
+++ b/src/util/time.cpp
@@ -38,7 +38,7 @@
 #include <openspace/util/timeconversion.h>
 #include <openspace/util/timemanager.h>
 #include <ghoul/filesystem/filesystem.h>
-#include <ghoul/fmt.h>
+#include <ghoul/format.h>
 #include <ghoul/misc/assert.h>
 #include <ghoul/misc/profiling.h>
 #include <ghoul/misc/stringhelper.h>
diff --git a/src/util/versionchecker.cpp b/src/util/versionchecker.cpp
index bbe89433c0..bbe12264bc 100644
--- a/src/util/versionchecker.cpp
+++ b/src/util/versionchecker.cpp
@@ -25,7 +25,7 @@
 #include <openspace/util/versionchecker.h>
 
 #include <openspace/openspace.h>
-#include <ghoul/fmt.h>
+#include <ghoul/format.h>
 #include <ghoul/logging/logmanager.h>
 #include <ghoul/misc/stringhelper.h>
 #include <ghoul/systemcapabilities/systemcapabilities.h>
diff --git a/support/cmake/module_definition.cmake b/support/cmake/module_definition.cmake
index d5d458bc7d..19d2c726ae 100644
--- a/support/cmake/module_definition.cmake
+++ b/support/cmake/module_definition.cmake
@@ -94,7 +94,7 @@ function (handle_module_dependencies target_name module_name)
   # We always want to link against Ghoul and the core library
   target_link_libraries(${library_name} PRIVATE Ghoul openspace-core)
   target_precompile_headers(${library_name} PRIVATE
-    [["ghoul/fmt.h"]]
+    [["ghoul/format.h"]]
     [["ghoul/glm.h"]]
     [["ghoul/misc/assert.h"]]
     [["ghoul/misc/boolean.h"]]
diff --git a/support/coding/codegen b/support/coding/codegen
index 3ad0877c74..ef31f904b6 160000
--- a/support/coding/codegen
+++ b/support/coding/codegen
@@ -1 +1 @@
-Subproject commit 3ad0877c74aa55a98ee24d18ba8335df9e1d4bcb
+Subproject commit ef31f904b6ee02c5d1cc4c4bbddef821dbb505c8

From 892a474a200b62f116769bf65375b10de8ac6677 Mon Sep 17 00:00:00 2001
From: Alexander Bock <mail@alexanderbock.eu>
Date: Tue, 26 Mar 2024 01:12:56 +0100
Subject: [PATCH 336/701] Move Sun light source specification from sun.asset to
 transforms.asset

---
 data/assets/educational/scale/arc_de_triomphe.asset |  2 +-
 data/assets/educational/scale/big_ben.asset         |  2 +-
 data/assets/educational/scale/burj_khalifa.asset    |  2 +-
 data/assets/educational/scale/eiffeltower.asset     |  2 +-
 .../educational/scale/empire_state_building.asset   |  2 +-
 data/assets/educational/scale/gateway_arch.asset    |  2 +-
 .../educational/scale/golden_gate_bridge.asset      |  2 +-
 .../educational/scale/kuala_lumpur_tower.asset      |  2 +-
 data/assets/educational/scale/rose_bowl.asset       |  2 +-
 data/assets/educational/scale/school_bus.asset      |  2 +-
 data/assets/educational/scale/scientist.asset       |  2 +-
 .../educational/scale/statue_of_liberty.asset       |  2 +-
 data/assets/examples/animation.asset                |  2 +-
 data/assets/examples/approachevents.asset           |  2 +-
 .../geojson/geojson_extruded_shaded_polygon.asset   |  2 +-
 data/assets/examples/globerotation.asset            |  2 +-
 data/assets/examples/globetranslation.asset         |  2 +-
 .../scene/milkyway/objects/orionnebula/nebula.asset |  2 +-
 .../solarsystem/dwarf_planets/eris/planet.asset     |  2 +-
 .../solarsystem/dwarf_planets/gonggong/planet.asset |  1 -
 .../solarsystem/dwarf_planets/haumea/planet.asset   |  2 +-
 .../solarsystem/dwarf_planets/makemake/planet.asset |  2 +-
 .../solarsystem/dwarf_planets/orcus/planet.asset    |  2 +-
 .../solarsystem/dwarf_planets/sedna/planet.asset    |  1 -
 .../solarsystem/dwarf_planets/vesta/planet.asset    |  2 +-
 .../solarsystem/missions/apollo/11/apollo11.asset   |  2 +-
 .../scene/solarsystem/missions/apollo/11/lem.asset  |  2 +-
 .../solarsystem/missions/apollo/15/apollo15.asset   |  2 +-
 .../missions/apollo/17/bouldersstation2.asset       |  2 +-
 .../missions/apollo/17/bouldersstation6.asset       |  2 +-
 .../missions/apollo/17/bouldersstation7.asset       |  2 +-
 .../scene/solarsystem/missions/apollo/17/lem.asset  |  2 +-
 .../missions/apollo/8/launch_model.asset            |  2 +-
 .../scene/solarsystem/missions/apollo/8/model.asset |  2 +-
 .../scene/solarsystem/missions/artemis/model.asset  |  2 +-
 .../solarsystem/missions/bepicolombo/model.asset    |  2 +-
 .../scene/solarsystem/missions/dawn/dawn.asset      |  2 +-
 .../scene/solarsystem/missions/insight/edl.asset    |  2 +-
 .../scene/solarsystem/missions/juno/juno.asset      |  2 +-
 .../solarsystem/missions/messenger/messenger.asset  |  2 +-
 .../solarsystem/missions/newhorizons/model.asset    |  2 +-
 .../solarsystem/missions/osirisrex/bennu.asset      |  2 +-
 .../solarsystem/missions/osirisrex/model.asset      |  2 +-
 .../solarsystem/missions/perseverance/model.asset   |  2 +-
 .../solarsystem/missions/pioneer/pioneermodel.asset |  2 +-
 .../solarsystem/missions/rosetta/rosetta.asset      |  2 +-
 .../solarsystem/missions/voyager/voyager1.asset     |  5 ++---
 .../solarsystem/missions/voyager/voyager2.asset     |  5 ++---
 .../planets/earth/satellites/misc/iss.asset         |  2 +-
 .../planets/earth/satellites/misc/tiangong.asset    |  2 +-
 .../solarsystem/planets/mars/moons/deimos.asset     |  2 +-
 .../solarsystem/planets/mars/moons/phobos.asset     |  2 +-
 data/assets/scene/solarsystem/sssb/itokawa.asset    |  3 +--
 data/assets/scene/solarsystem/sun/sun.asset         | 13 +++++--------
 data/assets/scene/solarsystem/sun/transforms.asset  |  8 ++++++++
 .../scene/solarsystem/telescopes/euclid/model.asset |  2 +-
 .../scene/solarsystem/telescopes/gaia/gaia.asset    |  2 +-
 .../scene/solarsystem/telescopes/jwst/jwst.asset    |  3 +--
 58 files changed, 69 insertions(+), 70 deletions(-)

diff --git a/data/assets/educational/scale/arc_de_triomphe.asset b/data/assets/educational/scale/arc_de_triomphe.asset
index 1669995813..a3d0b5eb8d 100644
--- a/data/assets/educational/scale/arc_de_triomphe.asset
+++ b/data/assets/educational/scale/arc_de_triomphe.asset
@@ -1,5 +1,5 @@
 local earthAsset = asset.require("scene/solarsystem/planets/earth/earth")
-local sunAsset = asset.require("scene/solarsystem/sun/sun")
+local sunAsset = asset.require("scene/solarsystem/sun/transforms")
 
 
 
diff --git a/data/assets/educational/scale/big_ben.asset b/data/assets/educational/scale/big_ben.asset
index 20cce7e0e2..327711fd91 100644
--- a/data/assets/educational/scale/big_ben.asset
+++ b/data/assets/educational/scale/big_ben.asset
@@ -1,5 +1,5 @@
 local earthAsset = asset.require("scene/solarsystem/planets/earth/earth")
-local sunAsset = asset.require("scene/solarsystem/sun/sun")
+local sunAsset = asset.require("scene/solarsystem/sun/transforms")
 
 
 
diff --git a/data/assets/educational/scale/burj_khalifa.asset b/data/assets/educational/scale/burj_khalifa.asset
index 5215a971d7..762af22a95 100644
--- a/data/assets/educational/scale/burj_khalifa.asset
+++ b/data/assets/educational/scale/burj_khalifa.asset
@@ -1,5 +1,5 @@
 local earthAsset = asset.require("scene/solarsystem/planets/earth/earth")
-local sunAsset = asset.require("scene/solarsystem/sun/sun")
+local sunAsset = asset.require("scene/solarsystem/sun/transforms")
 
 
 
diff --git a/data/assets/educational/scale/eiffeltower.asset b/data/assets/educational/scale/eiffeltower.asset
index 5495949158..99c4aaae31 100644
--- a/data/assets/educational/scale/eiffeltower.asset
+++ b/data/assets/educational/scale/eiffeltower.asset
@@ -1,5 +1,5 @@
 local earthAsset = asset.require("scene/solarsystem/planets/earth/earth")
-local sunAsset = asset.require("scene/solarsystem/sun/sun")
+local sunAsset = asset.require("scene/solarsystem/sun/transforms")
 
 
 
diff --git a/data/assets/educational/scale/empire_state_building.asset b/data/assets/educational/scale/empire_state_building.asset
index eec3bf3c24..21eb832497 100644
--- a/data/assets/educational/scale/empire_state_building.asset
+++ b/data/assets/educational/scale/empire_state_building.asset
@@ -1,5 +1,5 @@
 local earthAsset = asset.require("scene/solarsystem/planets/earth/earth")
-local sunAsset = asset.require("scene/solarsystem/sun/sun")
+local sunAsset = asset.require("scene/solarsystem/sun/transforms")
 
 
 
diff --git a/data/assets/educational/scale/gateway_arch.asset b/data/assets/educational/scale/gateway_arch.asset
index 3946149d10..973d4ef50b 100644
--- a/data/assets/educational/scale/gateway_arch.asset
+++ b/data/assets/educational/scale/gateway_arch.asset
@@ -1,5 +1,5 @@
 local earthAsset = asset.require("scene/solarsystem/planets/earth/earth")
-local sunAsset = asset.require("scene/solarsystem/sun/sun")
+local sunAsset = asset.require("scene/solarsystem/sun/transforms")
 
 
 
diff --git a/data/assets/educational/scale/golden_gate_bridge.asset b/data/assets/educational/scale/golden_gate_bridge.asset
index 75df110e7f..6c15a3e2e7 100644
--- a/data/assets/educational/scale/golden_gate_bridge.asset
+++ b/data/assets/educational/scale/golden_gate_bridge.asset
@@ -1,5 +1,5 @@
 local earthAsset = asset.require("scene/solarsystem/planets/earth/earth")
-local sunAsset = asset.require("scene/solarsystem/sun/sun")
+local sunAsset = asset.require("scene/solarsystem/sun/transforms")
 
 
 
diff --git a/data/assets/educational/scale/kuala_lumpur_tower.asset b/data/assets/educational/scale/kuala_lumpur_tower.asset
index 3d64296e95..f872ae5b45 100644
--- a/data/assets/educational/scale/kuala_lumpur_tower.asset
+++ b/data/assets/educational/scale/kuala_lumpur_tower.asset
@@ -1,5 +1,5 @@
 local earthAsset = asset.require("scene/solarsystem/planets/earth/earth")
-local sunAsset = asset.require("scene/solarsystem/sun/sun")
+local sunAsset = asset.require("scene/solarsystem/sun/transforms")
 
 
 
diff --git a/data/assets/educational/scale/rose_bowl.asset b/data/assets/educational/scale/rose_bowl.asset
index 46e30ccf9f..ddf3019dc0 100644
--- a/data/assets/educational/scale/rose_bowl.asset
+++ b/data/assets/educational/scale/rose_bowl.asset
@@ -1,5 +1,5 @@
 local earthAsset = asset.require("scene/solarsystem/planets/earth/earth")
-local sunAsset = asset.require("scene/solarsystem/sun/sun")
+local sunAsset = asset.require("scene/solarsystem/sun/transforms")
 
 
 
diff --git a/data/assets/educational/scale/school_bus.asset b/data/assets/educational/scale/school_bus.asset
index ef2875b6a9..3e6c95f75a 100644
--- a/data/assets/educational/scale/school_bus.asset
+++ b/data/assets/educational/scale/school_bus.asset
@@ -1,5 +1,5 @@
 local earthAsset = asset.require("scene/solarsystem/planets/earth/earth")
-local sunAsset = asset.require("scene/solarsystem/sun/sun")
+local sunAsset = asset.require("scene/solarsystem/sun/transforms")
 
 
 
diff --git a/data/assets/educational/scale/scientist.asset b/data/assets/educational/scale/scientist.asset
index 621654dea5..c67a7cc94a 100644
--- a/data/assets/educational/scale/scientist.asset
+++ b/data/assets/educational/scale/scientist.asset
@@ -1,5 +1,5 @@
 local earthAsset = asset.require("scene/solarsystem/planets/earth/earth")
-local sunAsset = asset.require("scene/solarsystem/sun/sun")
+local sunAsset = asset.require("scene/solarsystem/sun/transforms")
 
 
 
diff --git a/data/assets/educational/scale/statue_of_liberty.asset b/data/assets/educational/scale/statue_of_liberty.asset
index e40bf4a21a..8688e777dd 100644
--- a/data/assets/educational/scale/statue_of_liberty.asset
+++ b/data/assets/educational/scale/statue_of_liberty.asset
@@ -1,5 +1,5 @@
 local earthAsset = asset.require("scene/solarsystem/planets/earth/earth")
-local sunAsset = asset.require("scene/solarsystem/sun/sun")
+local sunAsset = asset.require("scene/solarsystem/sun/transforms")
 
 
 
diff --git a/data/assets/examples/animation.asset b/data/assets/examples/animation.asset
index 6406ae0e96..ed70f9b6bd 100644
--- a/data/assets/examples/animation.asset
+++ b/data/assets/examples/animation.asset
@@ -1,4 +1,4 @@
-local sun = asset.require("scene/solarsystem/sun/sun")
+local sun = asset.require("scene/solarsystem/sun/transforms")
 local transforms = asset.require("scene/solarsystem/planets/earth/transforms")
 
 
diff --git a/data/assets/examples/approachevents.asset b/data/assets/examples/approachevents.asset
index 46e71fd254..6083ab4ccb 100644
--- a/data/assets/examples/approachevents.asset
+++ b/data/assets/examples/approachevents.asset
@@ -1,4 +1,4 @@
-local sun = asset.require("scene/solarsystem/sun/sun")
+local sun = asset.require("scene/solarsystem/sun/transforms")
 local transforms = asset.require("scene/solarsystem/planets/earth/transforms")
 
 
diff --git a/data/assets/examples/geojson/geojson_extruded_shaded_polygon.asset b/data/assets/examples/geojson/geojson_extruded_shaded_polygon.asset
index f192dec785..7efae986d7 100644
--- a/data/assets/examples/geojson/geojson_extruded_shaded_polygon.asset
+++ b/data/assets/examples/geojson/geojson_extruded_shaded_polygon.asset
@@ -1,5 +1,5 @@
 local earth = asset.require("scene/solarsystem/planets/earth/earth")
-local sun = asset.require("scene/solarsystem/sun/sun")
+local sun = asset.require("scene/solarsystem/sun/transforms")
 
 
 
diff --git a/data/assets/examples/globerotation.asset b/data/assets/examples/globerotation.asset
index 25bfe9258f..f3b903fc5f 100644
--- a/data/assets/examples/globerotation.asset
+++ b/data/assets/examples/globerotation.asset
@@ -1,4 +1,4 @@
-local sun = asset.require("scene/solarsystem/sun/sun")
+local sun = asset.require("scene/solarsystem/sun/transforms")
 local earth = asset.require("scene/solarsystem/planets/earth/earth")
 
 
diff --git a/data/assets/examples/globetranslation.asset b/data/assets/examples/globetranslation.asset
index 7cccfb64f5..e1006b2cd4 100644
--- a/data/assets/examples/globetranslation.asset
+++ b/data/assets/examples/globetranslation.asset
@@ -1,4 +1,4 @@
-local sun = asset.require("scene/solarsystem/sun/sun")
+local sun = asset.require("scene/solarsystem/sun/transforms")
 local earth = asset.require("scene/solarsystem/planets/earth/earth")
 
 
diff --git a/data/assets/scene/milkyway/objects/orionnebula/nebula.asset b/data/assets/scene/milkyway/objects/orionnebula/nebula.asset
index 0845c6dfae..5c6d4bbd20 100644
--- a/data/assets/scene/milkyway/objects/orionnebula/nebula.asset
+++ b/data/assets/scene/milkyway/objects/orionnebula/nebula.asset
@@ -1,4 +1,4 @@
-local sun = asset.require("scene/solarsystem/sun/sun")
+local sun = asset.require("scene/solarsystem/sun/transforms")
 local transforms = asset.require("./transforms")
 
 
diff --git a/data/assets/scene/solarsystem/dwarf_planets/eris/planet.asset b/data/assets/scene/solarsystem/dwarf_planets/eris/planet.asset
index 29248d81fd..8d49133b3f 100644
--- a/data/assets/scene/solarsystem/dwarf_planets/eris/planet.asset
+++ b/data/assets/scene/solarsystem/dwarf_planets/eris/planet.asset
@@ -1,4 +1,4 @@
-local sun = asset.require("scene/solarsystem/sun/sun")
+local sun = asset.require("scene/solarsystem/sun/transforms")
 local transforms = asset.require("./transforms")
 
 
diff --git a/data/assets/scene/solarsystem/dwarf_planets/gonggong/planet.asset b/data/assets/scene/solarsystem/dwarf_planets/gonggong/planet.asset
index e07a4d695f..4bcc0d6d2f 100644
--- a/data/assets/scene/solarsystem/dwarf_planets/gonggong/planet.asset
+++ b/data/assets/scene/solarsystem/dwarf_planets/gonggong/planet.asset
@@ -1,4 +1,3 @@
-local sun = asset.require("scene/solarsystem/sun/sun")
 local transforms = asset.require("./transforms")
 
 
diff --git a/data/assets/scene/solarsystem/dwarf_planets/haumea/planet.asset b/data/assets/scene/solarsystem/dwarf_planets/haumea/planet.asset
index 6f3acf92ff..3737f5c710 100644
--- a/data/assets/scene/solarsystem/dwarf_planets/haumea/planet.asset
+++ b/data/assets/scene/solarsystem/dwarf_planets/haumea/planet.asset
@@ -1,4 +1,4 @@
-local sun = asset.require("scene/solarsystem/sun/sun")
+local sun = asset.require("scene/solarsystem/sun/transforms")
 local transforms = asset.require("./transforms")
 
 
diff --git a/data/assets/scene/solarsystem/dwarf_planets/makemake/planet.asset b/data/assets/scene/solarsystem/dwarf_planets/makemake/planet.asset
index 22e1780f5b..c2072f119f 100644
--- a/data/assets/scene/solarsystem/dwarf_planets/makemake/planet.asset
+++ b/data/assets/scene/solarsystem/dwarf_planets/makemake/planet.asset
@@ -1,4 +1,4 @@
-local sun = asset.require("scene/solarsystem/sun/sun")
+local sun = asset.require("scene/solarsystem/sun/transforms")
 local transforms = asset.require("./transforms")
 
 
diff --git a/data/assets/scene/solarsystem/dwarf_planets/orcus/planet.asset b/data/assets/scene/solarsystem/dwarf_planets/orcus/planet.asset
index a96bfc62e8..6805642f4f 100644
--- a/data/assets/scene/solarsystem/dwarf_planets/orcus/planet.asset
+++ b/data/assets/scene/solarsystem/dwarf_planets/orcus/planet.asset
@@ -1,4 +1,4 @@
-local sun = asset.require("scene/solarsystem/sun/sun")
+local sun = asset.require("scene/solarsystem/sun/transforms")
 local transforms = asset.require("./transforms")
 
 
diff --git a/data/assets/scene/solarsystem/dwarf_planets/sedna/planet.asset b/data/assets/scene/solarsystem/dwarf_planets/sedna/planet.asset
index 1ca65a678d..795c7fe36f 100644
--- a/data/assets/scene/solarsystem/dwarf_planets/sedna/planet.asset
+++ b/data/assets/scene/solarsystem/dwarf_planets/sedna/planet.asset
@@ -1,4 +1,3 @@
-local sun = asset.require("scene/solarsystem/sun/sun")
 local transforms = asset.require("./transforms")
 
 
diff --git a/data/assets/scene/solarsystem/dwarf_planets/vesta/planet.asset b/data/assets/scene/solarsystem/dwarf_planets/vesta/planet.asset
index 25c6c13c16..ea5bda4d06 100644
--- a/data/assets/scene/solarsystem/dwarf_planets/vesta/planet.asset
+++ b/data/assets/scene/solarsystem/dwarf_planets/vesta/planet.asset
@@ -1,4 +1,4 @@
-local sun = asset.require("scene/solarsystem/sun/sun")
+local sun = asset.require("scene/solarsystem/sun/transforms")
 local transforms = asset.require("./transforms")
 
 
diff --git a/data/assets/scene/solarsystem/missions/apollo/11/apollo11.asset b/data/assets/scene/solarsystem/missions/apollo/11/apollo11.asset
index 94bc748185..aa059a69ba 100644
--- a/data/assets/scene/solarsystem/missions/apollo/11/apollo11.asset
+++ b/data/assets/scene/solarsystem/missions/apollo/11/apollo11.asset
@@ -1,6 +1,6 @@
 asset.require("../actions")
 asset.require("./actions")
-local sun = asset.require("scene/solarsystem/sun/sun")
+local sun = asset.require("scene/solarsystem/sun/transforms")
 local moonTransforms = asset.require("scene/solarsystem/planets/earth/moon/moon")
 local descentKeyframes = asset.require("./lem_descent")
 local descentRotationKeyframes = asset.require("./lem_descent_rotation")
diff --git a/data/assets/scene/solarsystem/missions/apollo/11/lem.asset b/data/assets/scene/solarsystem/missions/apollo/11/lem.asset
index 74e36012d0..dfdf7e861e 100644
--- a/data/assets/scene/solarsystem/missions/apollo/11/lem.asset
+++ b/data/assets/scene/solarsystem/missions/apollo/11/lem.asset
@@ -1,4 +1,4 @@
-local sun = asset.require("scene/solarsystem/sun/sun")
+local sun = asset.require("scene/solarsystem/sun/transforms")
 local moon_asset = asset.require("scene/solarsystem/planets/earth/moon/moon")
 
 
diff --git a/data/assets/scene/solarsystem/missions/apollo/15/apollo15.asset b/data/assets/scene/solarsystem/missions/apollo/15/apollo15.asset
index 73aeabc4f4..acfae57516 100644
--- a/data/assets/scene/solarsystem/missions/apollo/15/apollo15.asset
+++ b/data/assets/scene/solarsystem/missions/apollo/15/apollo15.asset
@@ -1,6 +1,6 @@
 asset.require("../actions")
 local moonTransforms = asset.require("scene/solarsystem/planets/earth/moon/moon")
-local sun = asset.require("scene/solarsystem/sun/sun")
+local sun = asset.require("scene/solarsystem/sun/transforms")
 local kernels = asset.require("./kernels")
 local coreKernels = asset.require("spice/core")
 
diff --git a/data/assets/scene/solarsystem/missions/apollo/17/bouldersstation2.asset b/data/assets/scene/solarsystem/missions/apollo/17/bouldersstation2.asset
index a00bc27562..c082eaac53 100644
--- a/data/assets/scene/solarsystem/missions/apollo/17/bouldersstation2.asset
+++ b/data/assets/scene/solarsystem/missions/apollo/17/bouldersstation2.asset
@@ -1,4 +1,4 @@
-local sun = asset.require("scene/solarsystem/sun/sun")
+local sun = asset.require("scene/solarsystem/sun/transforms")
 local moonAsset = asset.require("scene/solarsystem/planets/earth/moon/moon")
 
 
diff --git a/data/assets/scene/solarsystem/missions/apollo/17/bouldersstation6.asset b/data/assets/scene/solarsystem/missions/apollo/17/bouldersstation6.asset
index 3626401732..b971c3dbe2 100644
--- a/data/assets/scene/solarsystem/missions/apollo/17/bouldersstation6.asset
+++ b/data/assets/scene/solarsystem/missions/apollo/17/bouldersstation6.asset
@@ -1,4 +1,4 @@
-local sun = asset.require("scene/solarsystem/sun/sun")
+local sun = asset.require("scene/solarsystem/sun/transforms")
 local moonAsset = asset.require("scene/solarsystem/planets/earth/moon/moon")
 
 
diff --git a/data/assets/scene/solarsystem/missions/apollo/17/bouldersstation7.asset b/data/assets/scene/solarsystem/missions/apollo/17/bouldersstation7.asset
index bcaa71aa44..9ddf9748e8 100644
--- a/data/assets/scene/solarsystem/missions/apollo/17/bouldersstation7.asset
+++ b/data/assets/scene/solarsystem/missions/apollo/17/bouldersstation7.asset
@@ -1,4 +1,4 @@
-local sun = asset.require("scene/solarsystem/sun/sun")
+local sun = asset.require("scene/solarsystem/sun/transforms")
 local moonAsset = asset.require("scene/solarsystem/planets/earth/moon/moon")
 
 
diff --git a/data/assets/scene/solarsystem/missions/apollo/17/lem.asset b/data/assets/scene/solarsystem/missions/apollo/17/lem.asset
index a5b5189c44..d1a8daca1e 100644
--- a/data/assets/scene/solarsystem/missions/apollo/17/lem.asset
+++ b/data/assets/scene/solarsystem/missions/apollo/17/lem.asset
@@ -1,4 +1,4 @@
-local sun = asset.require("scene/solarsystem/sun/sun")
+local sun = asset.require("scene/solarsystem/sun/transforms")
 local moonAsset = asset.require("scene/solarsystem/planets/earth/moon/moon")
 
 
diff --git a/data/assets/scene/solarsystem/missions/apollo/8/launch_model.asset b/data/assets/scene/solarsystem/missions/apollo/8/launch_model.asset
index 5ea9f835e5..b231d1ffb8 100644
--- a/data/assets/scene/solarsystem/missions/apollo/8/launch_model.asset
+++ b/data/assets/scene/solarsystem/missions/apollo/8/launch_model.asset
@@ -1,5 +1,5 @@
 local earth_transforms = asset.require("scene/solarsystem/planets/earth/transforms")
-local sun = asset.require("scene/solarsystem/sun/sun")
+local sun = asset.require("scene/solarsystem/sun/transforms")
 local kernels = asset.require("./kernels")
 local coreKernels = asset.require("spice/core")
 
diff --git a/data/assets/scene/solarsystem/missions/apollo/8/model.asset b/data/assets/scene/solarsystem/missions/apollo/8/model.asset
index ca61a6c91e..a4f89cff77 100644
--- a/data/assets/scene/solarsystem/missions/apollo/8/model.asset
+++ b/data/assets/scene/solarsystem/missions/apollo/8/model.asset
@@ -1,5 +1,5 @@
 local earth_transforms = asset.require("scene/solarsystem/planets/earth/transforms")
-local sun = asset.require("scene/solarsystem/sun/sun")
+local sun = asset.require("scene/solarsystem/sun/transforms")
 local kernels = asset.require("./kernels")
 local coreKernels = asset.require("spice/core")
 
diff --git a/data/assets/scene/solarsystem/missions/artemis/model.asset b/data/assets/scene/solarsystem/missions/artemis/model.asset
index 8d7e8665df..1d3cd6974b 100644
--- a/data/assets/scene/solarsystem/missions/artemis/model.asset
+++ b/data/assets/scene/solarsystem/missions/artemis/model.asset
@@ -1,4 +1,4 @@
-local sun = asset.require("scene/solarsystem/sun/sun")
+local sun = asset.require("scene/solarsystem/sun/transforms")
 local transforms = asset.require("./transforms")
 
 
diff --git a/data/assets/scene/solarsystem/missions/bepicolombo/model.asset b/data/assets/scene/solarsystem/missions/bepicolombo/model.asset
index 05aec4d10e..d0d4fd8db5 100644
--- a/data/assets/scene/solarsystem/missions/bepicolombo/model.asset
+++ b/data/assets/scene/solarsystem/missions/bepicolombo/model.asset
@@ -1,5 +1,5 @@
 local transform = asset.require("scene/solarsystem/sun/transforms")
-local sun = asset.require("scene/solarsystem/sun/sun")
+local sun = asset.require("scene/solarsystem/sun/transforms")
 local kernels = asset.require("./kernels")
 local coreKernels = asset.require("spice/core")
 
diff --git a/data/assets/scene/solarsystem/missions/dawn/dawn.asset b/data/assets/scene/solarsystem/missions/dawn/dawn.asset
index 3a841bdb9d..07984361d6 100644
--- a/data/assets/scene/solarsystem/missions/dawn/dawn.asset
+++ b/data/assets/scene/solarsystem/missions/dawn/dawn.asset
@@ -1,6 +1,6 @@
 asset.require("scene/solarsystem/missions/dawn/mission")
 local transforms = asset.require("scene/solarsystem/sun/transforms")
-local sun = asset.require("scene/solarsystem/sun/sun")
+local sun = asset.require("scene/solarsystem/sun/transforms")
 local kernels = asset.require("./kernels")
 local coreKernels = asset.require("spice/core")
 
diff --git a/data/assets/scene/solarsystem/missions/insight/edl.asset b/data/assets/scene/solarsystem/missions/insight/edl.asset
index 0e69fdb4a2..039f473695 100644
--- a/data/assets/scene/solarsystem/missions/insight/edl.asset
+++ b/data/assets/scene/solarsystem/missions/insight/edl.asset
@@ -1,6 +1,6 @@
 asset.require("./actions")
 asset.require("scene/solarsystem/planets/mars/default_layers")
-local sun = asset.require("scene/solarsystem/sun/sun")
+local sun = asset.require("scene/solarsystem/sun/transforms")
 local mars = asset.require("scene/solarsystem/planets/mars/mars")
 local kernels = asset.require("./kernels")
 local coreKernels = asset.require("spice/core")
diff --git a/data/assets/scene/solarsystem/missions/juno/juno.asset b/data/assets/scene/solarsystem/missions/juno/juno.asset
index 2dd5272206..89eef4a490 100644
--- a/data/assets/scene/solarsystem/missions/juno/juno.asset
+++ b/data/assets/scene/solarsystem/missions/juno/juno.asset
@@ -1,7 +1,7 @@
 asset.require("scene/solarsystem/missions/juno/mission")
 asset.require("scene/solarsystem/planets/jupiter/layers/colorlayers/jupiter_video")
 local transforms = asset.require("scene/solarsystem/planets/jupiter/transforms")
-local sun = asset.require("scene/solarsystem/sun/sun")
+local sun = asset.require("scene/solarsystem/sun/transforms")
 local kernels = asset.require("./kernels")
 local coreKernels = asset.require("spice/core")
 
diff --git a/data/assets/scene/solarsystem/missions/messenger/messenger.asset b/data/assets/scene/solarsystem/missions/messenger/messenger.asset
index e2b6821054..e779b7177c 100644
--- a/data/assets/scene/solarsystem/missions/messenger/messenger.asset
+++ b/data/assets/scene/solarsystem/missions/messenger/messenger.asset
@@ -1,4 +1,4 @@
-local sun = asset.require("scene/solarsystem/sun/sun")
+local sun = asset.require("scene/solarsystem/sun/transforms")
 local sunTransforms = asset.require("scene/solarsystem/sun/transforms")
 local mercuryTransforms = asset.require("scene/solarsystem/planets/mercury/transforms")
 local kernels = asset.require("./kernels")
diff --git a/data/assets/scene/solarsystem/missions/newhorizons/model.asset b/data/assets/scene/solarsystem/missions/newhorizons/model.asset
index da1e5f6901..f6e3ef6109 100644
--- a/data/assets/scene/solarsystem/missions/newhorizons/model.asset
+++ b/data/assets/scene/solarsystem/missions/newhorizons/model.asset
@@ -1,5 +1,5 @@
 local transforms = asset.require("./transforms")
-local sun = asset.require("scene/solarsystem/sun/sun")
+local sun = asset.require("scene/solarsystem/sun/transforms")
 
 
 
diff --git a/data/assets/scene/solarsystem/missions/osirisrex/bennu.asset b/data/assets/scene/solarsystem/missions/osirisrex/bennu.asset
index 9c7e223645..bafdcab1f2 100644
--- a/data/assets/scene/solarsystem/missions/osirisrex/bennu.asset
+++ b/data/assets/scene/solarsystem/missions/osirisrex/bennu.asset
@@ -1,5 +1,5 @@
 local transforms = asset.require("./transforms")
-local sun = asset.require("scene/solarsystem/sun/sun")
+local sun = asset.require("scene/solarsystem/sun/transforms")
 local kernels = asset.require("./kernels")
 local coreKernels = asset.require("spice/core")
 
diff --git a/data/assets/scene/solarsystem/missions/osirisrex/model.asset b/data/assets/scene/solarsystem/missions/osirisrex/model.asset
index 2d1da05bc7..ac98b5bee2 100644
--- a/data/assets/scene/solarsystem/missions/osirisrex/model.asset
+++ b/data/assets/scene/solarsystem/missions/osirisrex/model.asset
@@ -1,5 +1,5 @@
 local transforms = asset.require("./transforms")
-local sun = asset.require("scene/solarsystem/sun/sun")
+local sun = asset.require("scene/solarsystem/sun/transforms")
 local sunTransforms = asset.require("scene/solarsystem/sun/transforms")
 local earthTransforms = asset.require("scene/solarsystem/planets/earth/transforms")
 local kernels = asset.require("./kernels")
diff --git a/data/assets/scene/solarsystem/missions/perseverance/model.asset b/data/assets/scene/solarsystem/missions/perseverance/model.asset
index dc2cc3d92b..36a73de73a 100644
--- a/data/assets/scene/solarsystem/missions/perseverance/model.asset
+++ b/data/assets/scene/solarsystem/missions/perseverance/model.asset
@@ -1,6 +1,6 @@
 local trail = asset.require("./trail")
 local marsTransforms = asset.require("scene/solarsystem/planets/mars/transforms")
-local sun = asset.require("scene/solarsystem/sun/sun")
+local sun = asset.require("scene/solarsystem/sun/transforms")
 local kernels = asset.require("./kernels")
 local coreKernels = asset.require("spice/core")
 
diff --git a/data/assets/scene/solarsystem/missions/pioneer/pioneermodel.asset b/data/assets/scene/solarsystem/missions/pioneer/pioneermodel.asset
index ce63f52782..b1a7935e87 100644
--- a/data/assets/scene/solarsystem/missions/pioneer/pioneermodel.asset
+++ b/data/assets/scene/solarsystem/missions/pioneer/pioneermodel.asset
@@ -1,4 +1,4 @@
-local sun = asset.require("scene/solarsystem/sun/sun")
+local sun = asset.require("scene/solarsystem/sun/transforms")
 
 
 
diff --git a/data/assets/scene/solarsystem/missions/rosetta/rosetta.asset b/data/assets/scene/solarsystem/missions/rosetta/rosetta.asset
index c2bed9f39b..a531ac30a0 100644
--- a/data/assets/scene/solarsystem/missions/rosetta/rosetta.asset
+++ b/data/assets/scene/solarsystem/missions/rosetta/rosetta.asset
@@ -1,4 +1,4 @@
-local sun = asset.require("scene/solarsystem/sun/sun")
+local sun = asset.require("scene/solarsystem/sun/transforms")
 local sunTransforms = asset.require("scene/solarsystem/sun/transforms")
 local transforms = asset.require("./67p")
 local kernels = asset.require("./kernels")
diff --git a/data/assets/scene/solarsystem/missions/voyager/voyager1.asset b/data/assets/scene/solarsystem/missions/voyager/voyager1.asset
index 0fafe2af1d..0ed2011173 100644
--- a/data/assets/scene/solarsystem/missions/voyager/voyager1.asset
+++ b/data/assets/scene/solarsystem/missions/voyager/voyager1.asset
@@ -1,4 +1,3 @@
-local sun = asset.require("scene/solarsystem/sun/sun")
 local sunTransforms = asset.require("scene/solarsystem/sun/transforms")
 local coreKernels = asset.require("spice/core")
 
@@ -73,7 +72,7 @@ local Voyager1Main = {
     GeometryFile = models .. "voyager-main.obj",
     ModelTransform = RotationMatrix,
     LightSources = {
-      sun.LightSource,
+      sunTransforms.LightSource,
       {
         Identifier = "Camera",
         Type = "CameraLightSource",
@@ -97,7 +96,7 @@ local Voyager1Antenna = {
     GeometryFile = models .. "voyager-antenna.obj",
     ModelTransform = RotationMatrix,
     LightSources = {
-      sun.LightSource,
+      sunTransforms.LightSource,
       {
         Identifier = "Camera",
         Type = "CameraLightSource",
diff --git a/data/assets/scene/solarsystem/missions/voyager/voyager2.asset b/data/assets/scene/solarsystem/missions/voyager/voyager2.asset
index 169d7fbe06..a521bbeb2d 100644
--- a/data/assets/scene/solarsystem/missions/voyager/voyager2.asset
+++ b/data/assets/scene/solarsystem/missions/voyager/voyager2.asset
@@ -1,4 +1,3 @@
-local sun = asset.require("scene/solarsystem/sun/sun")
 local sunTransforms = asset.require("scene/solarsystem/sun/transforms")
 local coreKernels = asset.require("spice/core")
 
@@ -76,7 +75,7 @@ local Voyager2Main = {
     GeometryFile = models .. "voyager-main.obj",
     ModelTransform = RotationMatrix,
     LightSources = {
-      sun.LightSource,
+      sunTransforms.LightSource,
       {
         Identifier = "Camera",
         Type = "CameraLightSource",
@@ -100,7 +99,7 @@ local Voyager2Antenna = {
     GeometryFile = models .. "voyager-antenna.obj",
     ModelTransform = RotationMatrix,
     LightSources = {
-      sun.LightSource,
+      sunTransforms.LightSource,
       {
         Identifier = "Camera",
         Type = "CameraLightSource",
diff --git a/data/assets/scene/solarsystem/planets/earth/satellites/misc/iss.asset b/data/assets/scene/solarsystem/planets/earth/satellites/misc/iss.asset
index a62df31c6f..b920308d81 100644
--- a/data/assets/scene/solarsystem/planets/earth/satellites/misc/iss.asset
+++ b/data/assets/scene/solarsystem/planets/earth/satellites/misc/iss.asset
@@ -1,5 +1,5 @@
 local transforms = asset.require("scene/solarsystem/planets/earth/transforms")
-local sun = asset.require("scene/solarsystem/sun/sun")
+local sun = asset.require("scene/solarsystem/sun/transforms")
 local coreKernels = asset.require("spice/core")
 
 
diff --git a/data/assets/scene/solarsystem/planets/earth/satellites/misc/tiangong.asset b/data/assets/scene/solarsystem/planets/earth/satellites/misc/tiangong.asset
index 7e38ed719e..620f7b2ce9 100644
--- a/data/assets/scene/solarsystem/planets/earth/satellites/misc/tiangong.asset
+++ b/data/assets/scene/solarsystem/planets/earth/satellites/misc/tiangong.asset
@@ -1,5 +1,5 @@
 local transforms = asset.require("scene/solarsystem/planets/earth/transforms")
-local sun = asset.require("scene/solarsystem/sun/sun")
+local sun = asset.require("scene/solarsystem/sun/transforms")
 local coreKernels = asset.require("spice/core")
 
 
diff --git a/data/assets/scene/solarsystem/planets/mars/moons/deimos.asset b/data/assets/scene/solarsystem/planets/mars/moons/deimos.asset
index b4d428b8cf..f8fa99883e 100644
--- a/data/assets/scene/solarsystem/planets/mars/moons/deimos.asset
+++ b/data/assets/scene/solarsystem/planets/mars/moons/deimos.asset
@@ -1,6 +1,6 @@
 local transforms = asset.require("scene/solarsystem/planets/mars/transforms")
 local sunTransforms = asset.require("scene/solarsystem/sun/transforms")
-local sun = asset.require("scene/solarsystem/sun/sun")
+local sun = asset.require("scene/solarsystem/sun/transforms")
 local kernels = asset.require("./kernels")
 local coreKernels = asset.require("spice/core")
 
diff --git a/data/assets/scene/solarsystem/planets/mars/moons/phobos.asset b/data/assets/scene/solarsystem/planets/mars/moons/phobos.asset
index 8e3fb4ecd8..f40f8e6bce 100644
--- a/data/assets/scene/solarsystem/planets/mars/moons/phobos.asset
+++ b/data/assets/scene/solarsystem/planets/mars/moons/phobos.asset
@@ -1,6 +1,6 @@
 local transforms = asset.require("scene/solarsystem/planets/mars/transforms")
 local sunTransforms = asset.require("scene/solarsystem/sun/transforms")
-local sun = asset.require("scene/solarsystem/sun/sun")
+local sun = asset.require("scene/solarsystem/sun/transforms")
 local kernels = asset.require("./kernels")
 local coreKernels = asset.require("spice/core")
 
diff --git a/data/assets/scene/solarsystem/sssb/itokawa.asset b/data/assets/scene/solarsystem/sssb/itokawa.asset
index 758ff32a7f..ce47b20119 100644
--- a/data/assets/scene/solarsystem/sssb/itokawa.asset
+++ b/data/assets/scene/solarsystem/sssb/itokawa.asset
@@ -1,5 +1,4 @@
 local sunTransforms = asset.require("scene/solarsystem/sun/transforms")
-local sun = asset.require("scene/solarsystem/sun/sun")
 
 
 
@@ -68,7 +67,7 @@ local ItokawaModel = {
     Type = "RenderableModel",
     GeometryFile = model .. "itokawa.glb",
     LightSources = {
-      sun.LightSource
+      sunTransforms.LightSource
     },
     PerformShading = true,
     SpecularIntensity = 0.0
diff --git a/data/assets/scene/solarsystem/sun/sun.asset b/data/assets/scene/solarsystem/sun/sun.asset
index e50dc5ace6..5188eb0748 100644
--- a/data/assets/scene/solarsystem/sun/sun.asset
+++ b/data/assets/scene/solarsystem/sun/sun.asset
@@ -11,6 +11,11 @@ local Sun = {
     Radii = { 695700000, 695700000, 695700000 },
     SegmentsPerPatch = 64,
     Layers = {},
+    LightSource = {
+      Identifier = "Camera",
+      Type = "CameraLightSource",
+      Intensity = 1.0
+    },
     PerformShading = false
   },
   ApproachFactor = 15.0,
@@ -46,13 +51,6 @@ local SunLabel = {
   }
 }
 
-local LightSource = {
-  Type = "SceneGraphLightSource",
-  Identifier = "Sun",
-  Node = Sun.Identifier,
-  Intensity = 1.0
-}
-
 
 asset.onInitialize(function()
   openspace.addSceneGraphNode(Sun)
@@ -66,7 +64,6 @@ end)
 
 asset.export(Sun)
 asset.export(SunLabel)
-asset.export("LightSource", LightSource)
 
 
 
diff --git a/data/assets/scene/solarsystem/sun/transforms.asset b/data/assets/scene/solarsystem/sun/transforms.asset
index 5bd3152753..173973ad9b 100644
--- a/data/assets/scene/solarsystem/sun/transforms.asset
+++ b/data/assets/scene/solarsystem/sun/transforms.asset
@@ -81,6 +81,13 @@ local SunEclipJ2000 = {
   }
 }
 
+local LightSource = {
+  Type = "SceneGraphLightSource",
+  Identifier = "Sun",
+  Node = SunIAU.Identifier,
+  Intensity = 1.0
+}
+
 
 asset.onInitialize(function()
   openspace.addSceneGraphNode(SolarSystemBarycenter)
@@ -100,6 +107,7 @@ asset.export(SolarSystemBarycenter)
 asset.export(SunCenter)
 asset.export(SunIAU)
 asset.export(SunEclipJ2000)
+asset.export("LightSource", LightSource)
 
 
 
diff --git a/data/assets/scene/solarsystem/telescopes/euclid/model.asset b/data/assets/scene/solarsystem/telescopes/euclid/model.asset
index a809d2f482..1b2f2976aa 100644
--- a/data/assets/scene/solarsystem/telescopes/euclid/model.asset
+++ b/data/assets/scene/solarsystem/telescopes/euclid/model.asset
@@ -1,5 +1,5 @@
 local transform = asset.require("scene/solarsystem/planets/earth/transforms")
-local sun = asset.require("scene/solarsystem/sun/sun")
+local sun = asset.require("scene/solarsystem/sun/transforms")
 local kernels = asset.require("./kernels")
 local coreKernels = asset.require("spice/core")
 
diff --git a/data/assets/scene/solarsystem/telescopes/gaia/gaia.asset b/data/assets/scene/solarsystem/telescopes/gaia/gaia.asset
index de2a916640..7a141b65c9 100644
--- a/data/assets/scene/solarsystem/telescopes/gaia/gaia.asset
+++ b/data/assets/scene/solarsystem/telescopes/gaia/gaia.asset
@@ -1,5 +1,5 @@
 local transforms = asset.require("./transforms")
-local sun = asset.require("scene/solarsystem/sun/sun")
+local sun = asset.require("scene/solarsystem/sun/transforms")
 
 
 
diff --git a/data/assets/scene/solarsystem/telescopes/jwst/jwst.asset b/data/assets/scene/solarsystem/telescopes/jwst/jwst.asset
index 333329a0bd..e6a242a38b 100644
--- a/data/assets/scene/solarsystem/telescopes/jwst/jwst.asset
+++ b/data/assets/scene/solarsystem/telescopes/jwst/jwst.asset
@@ -1,6 +1,5 @@
 asset.require("./actions")
 asset.require("./mission")
-local sun = asset.require("scene/solarsystem/sun/sun")
 local sunTransforms = asset.require("scene/solarsystem/sun/transforms")
 local transforms = asset.require("./transforms")
 
@@ -74,7 +73,7 @@ local JWSTModel = {
     AnimationTimeScale = "Millisecond",
     AnimationMode = "Once",
     LightSources = {
-      sun.LightSource
+      sunTransforms.LightSource
     },
     PerformShading = true
   },

From 5ec67f8226d106e8a9553eb8bb125d8a29257b85 Mon Sep 17 00:00:00 2001
From: Ylva Selling <ylva.selling@liu.se>
Date: Tue, 26 Mar 2024 09:43:11 +0100
Subject: [PATCH 337/701] Update documentation submodule

---
 documentation | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/documentation b/documentation
index 3d6a26821f..3bd1b1600a 160000
--- a/documentation
+++ b/documentation
@@ -1 +1 @@
-Subproject commit 3d6a26821fe51b4ca8b6e182476246683a12080f
+Subproject commit 3bd1b1600a015172cd38bf8bbaf6be99dd81d162

From 9777f3cca422e729f1fc5e1bde85bb83cd5d5905 Mon Sep 17 00:00:00 2001
From: Ylva Selling <ylva.selling@liu.se>
Date: Tue, 26 Mar 2024 11:55:10 +0100
Subject: [PATCH 338/701] Add members variable with an empty array for
 components that don't have members

This is for easier processing later
---
 src/documentation/documentationengine.cpp | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/documentation/documentationengine.cpp b/src/documentation/documentationengine.cpp
index 0323e6be76..8423694f7a 100644
--- a/src/documentation/documentationengine.cpp
+++ b/src/documentation/documentationengine.cpp
@@ -512,6 +512,7 @@ nlohmann::json DocumentationEngine::generateFactoryManagerJson() const {
             nlohmann::json documentation;
             documentation[NameKey] = factoryInfo.name;
             documentation[IdentifierKey] = factoryInfo.name;
+            documentation[MembersKey] = nlohmann::json::array();
             factory[ClassesKey].push_back(documentation);
         }
 
@@ -532,6 +533,7 @@ nlohmann::json DocumentationEngine::generateFactoryManagerJson() const {
                 nlohmann::json documentation;
                 documentation[NameKey] = c;
                 documentation[IdentifierKey] = c;
+                documentation[MembersKey] = nlohmann::json::array();
                 factory[ClassesKey].push_back(documentation);
             }
         }

From f0951bc6b578ba52b607c05558f5714a012db0c8 Mon Sep 17 00:00:00 2001
From: Ylva Selling <ylva.selling@liu.se>
Date: Tue, 26 Mar 2024 11:55:47 +0100
Subject: [PATCH 339/701] Make lists have a whitespace after a comma

It will make the string more readable and enable linebreaks in a table
---
 include/openspace/documentation/verifier.inl | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/include/openspace/documentation/verifier.inl b/include/openspace/documentation/verifier.inl
index 40a623cd54..dab3c5d699 100644
--- a/include/openspace/documentation/verifier.inl
+++ b/include/openspace/documentation/verifier.inl
@@ -404,12 +404,12 @@ std::string InListVerifier<T>::documentation() const {
     std::copy(
         values.begin(),
         values.end(),
-        std::ostream_iterator<typename T::Type>(s, ",")
+        std::ostream_iterator<typename T::Type>(s, ", ")
     );
 
     std::string joined = s.str();
-    // We need to remove a trailing ',' at the end of the string
-    result += joined.substr(0, joined.size() - 1);
+    // We need to remove a trailing ',' and whitespace at the end of the string
+    result += joined.substr(0, joined.size() - 2);
 
     result += " }";
     return result;

From 0d0f4eef462b27c6b7b17ecd4d67781439698f37 Mon Sep 17 00:00:00 2001
From: Alexander Bock <mail@alexanderbock.eu>
Date: Tue, 26 Mar 2024 22:44:40 +0100
Subject: [PATCH 340/701] Fix compile issue on linux and small warnings

---
 modules/audio/audiomodule.h            | 2 +-
 src/events/eventengine.cpp             | 4 ++--
 src/interaction/joystickinputstate.cpp | 3 +--
 3 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/modules/audio/audiomodule.h b/modules/audio/audiomodule.h
index 18f5deecee..ee93f24424 100644
--- a/modules/audio/audiomodule.h
+++ b/modules/audio/audiomodule.h
@@ -305,7 +305,7 @@ private:
      */
     std::unique_ptr<SoLoud::Wav> loadSound(const std::filesystem::path& path);
 
-    std::unique_ptr<SoLoud::Soloud> _engine = nullptr;
+    std::unique_ptr<SoLoud::Soloud> _engine;
 
     std::map<std::string, Info> _sounds;
 };
diff --git a/src/events/eventengine.cpp b/src/events/eventengine.cpp
index 7ac200a65b..6a7bf85070 100644
--- a/src/events/eventengine.cpp
+++ b/src/events/eventengine.cpp
@@ -78,7 +78,7 @@ void EventEngine::registerEventTopic(size_t topicId, events::Event::Type type,
                                      ScriptCallback callback)
 {
     TopicInfo ti;
-    ti.id = topicId;
+    ti.id = static_cast<uint32_t>(topicId);
     ti.callback = std::move(callback);
 
     _eventTopics[type].push_back(ti);
@@ -169,7 +169,7 @@ std::vector<EventEngine::ActionInfo> EventEngine::registeredActions() const {
     return result;
 }
 
-const std::unordered_map<events::Event::Type, std::vector<EventEngine::ActionInfo>>& const
+const std::unordered_map<events::Event::Type, std::vector<EventEngine::ActionInfo>>&
 EventEngine::eventActions() const
 {
     return _eventActions;
diff --git a/src/interaction/joystickinputstate.cpp b/src/interaction/joystickinputstate.cpp
index 321b0b5f0d..81ebeea250 100644
--- a/src/interaction/joystickinputstate.cpp
+++ b/src/interaction/joystickinputstate.cpp
@@ -90,8 +90,7 @@ float JoystickInputStates::axis(const std::string& joystickName, int axis) const
 
         // If multiple joysticks are connected, we might get values outside the -1,1 range
         // by summing them up
-        glm::clamp(res, -1.f, 1.f);
-        return res;
+        return glm::clamp(res, -1.f, 1.f);
     }
 
     for (const JoystickInputState& state : *this) {

From 06523463d0674ef4f44bb1d1b62915a00a44b622 Mon Sep 17 00:00:00 2001
From: Alexander Bock <mail@alexanderbock.eu>
Date: Tue, 26 Mar 2024 22:59:18 +0100
Subject: [PATCH 341/701] Change audiomodule from fmt to std

---
 modules/audio/audiomodule.cpp | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/modules/audio/audiomodule.cpp b/modules/audio/audiomodule.cpp
index 7af25633e8..13a3ec3fea 100644
--- a/modules/audio/audiomodule.cpp
+++ b/modules/audio/audiomodule.cpp
@@ -57,7 +57,7 @@ AudioModule::~AudioModule() {}
 void AudioModule::internalInitialize(const ghoul::Dictionary& dictionary) {
     const Parameters p = codegen::bake<Parameters>(dictionary);
 
-    LDEBUG(fmt::format("Initializing SoLoud version: {}", SOLOUD_VERSION));
+    LDEBUG(std::format("Initializing SoLoud version: {}", SOLOUD_VERSION));
 
     _engine->init();
     _engine->setGlobalVolume(0.5f);
@@ -70,8 +70,8 @@ void AudioModule::internalInitialize(const ghoul::Dictionary& dictionary) {
         }
     });
 
-    LDEBUG(fmt::format("Audio backend: {}", _engine->getBackendString()));
-    LDEBUG(fmt::format("Number of channels: {}", _engine->getBackendChannels()));
+    LDEBUG(std::format("Audio backend: {}", _engine->getBackendString()));
+    LDEBUG(std::format("Number of channels: {}", _engine->getBackendChannels()));
 }
 
 void AudioModule::internalDeinitializeGL() {
@@ -89,7 +89,7 @@ std::unique_ptr<SoLoud::Wav> AudioModule::loadSound(const std::filesystem::path&
     const std::string p = path.string();
     SoLoud::result res = sound->load(p.c_str());
     if (res != 0) {
-        throw ghoul::RuntimeError(fmt::format(
+        throw ghoul::RuntimeError(std::format(
             "Error loading sound from {}. {}: {}",
             path, static_cast<int>(res), _engine->getErrorString(res)
         ));
@@ -102,7 +102,7 @@ std::unique_ptr<SoLoud::Wav> AudioModule::loadSound(const std::filesystem::path&
     for (auto it = _sounds.begin(); it != _sounds.end();) {
         if (!isPlaying(it->first)) {
             // We have found one of the candidates
-            LDEBUG(fmt::format("Removing song {} as it has ended", it->first));
+            LDEBUG(std::format("Removing song {} as it has ended", it->first));
             _sounds.erase(it);
             // It is easier to just reset the iterator to the beginning than deal with the
             // off-by-one error when deleting the last element in the list and the
@@ -122,7 +122,7 @@ void AudioModule::playAudio(const std::filesystem::path& path, std::string ident
 {
     ghoul_assert(_engine, "No audio engine loaded");
     if (_sounds.find(identifier) != _sounds.end()) {
-        LERROR(fmt::format("Sound with name '{}' already played", identifier));
+        LERROR(std::format("Sound with name '{}' already played", identifier));
         return;
     }
 
@@ -142,7 +142,7 @@ void AudioModule::playAudio3d(const std::filesystem::path& path, std::string ide
 {
     ghoul_assert(_engine, "No audio engine loaded");
     if (_sounds.find(identifier) != _sounds.end()) {
-        LERROR(fmt::format("Sound with name '{}' already played", identifier));
+        LERROR(std::format("Sound with name '{}' already played", identifier));
         return;
     }
 

From 3e893ee19d872318b800f92f7fcca97cf624802b Mon Sep 17 00:00:00 2001
From: Alexander Bock <alexander.bock@liu.se>
Date: Wed, 27 Mar 2024 10:20:42 +0100
Subject: [PATCH 342/701] Disable the ninja builds for now as they fail with
 the current Docker setup

---
 Jenkinsfile | 176 ++++++++++++++++++++++++++--------------------------
 1 file changed, 88 insertions(+), 88 deletions(-)

diff --git a/Jenkinsfile b/Jenkinsfile
index e2d8a59ff7..5a435c5893 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -111,50 +111,50 @@ linux_gcc_make: {
     } // node('linux')
   }
 },
-linux_gcc_ninja: {
-  if (env.USE_BUILD_OS_LINUX == 'true') {
-    node('linux-gcc') {
-      stage('linux-gcc-ninja/scm') {
-        deleteDir();
-        gitHelper.checkoutGit(url, branch);
-      }
-
-      stage('linux-gcc-ninja/build') {
-          def cmakeCompileOptions = moduleCMakeFlags();
-          cmakeCompileOptions += '-DMAKE_BUILD_TYPE=Release';
-          // Not sure why the linking of OpenSpaceTest takes so long
-          compileHelper.build(compileHelper.Ninja(), compileHelper.Gcc(), cmakeCompileOptions, '', 'build-ninja');
-      }
-
-      if (env.RUN_UNIT_TESTS == 'true') {
-        stage('linux-gcc-ninja/test-codegen') {
-          timeout(time: 2, unit: 'MINUTES') {
-            testHelper.runUnitTests('bin/codegentest');
-          }
-        }
-
-        stage('linux-gcc-ninja/test-sgct') {
-          timeout(time: 2, unit: 'MINUTES') {
-            testHelper.runUnitTests('bin/SGCTTest');
-          }
-        }
-
-        stage('linux-gcc-ninja/test-ghoul') {
-          timeout(time: 2, unit: 'MINUTES') {
-            testHelper.runUnitTests('bin/GhoulTest');
-          }
-        }
-
-        stage('linux-gcc-ninja/test-openspace') {
-          timeout(time: 2, unit: 'MINUTES') {
-            testHelper.runUnitTests('bin/OpenSpaceTest');
-          }
-        }
-      }
-      cleanWs()
-    } // node('linux')
-  }
-},
+// linux_gcc_ninja: {
+//   if (env.USE_BUILD_OS_LINUX == 'true') {
+//     node('linux-gcc') {
+//       stage('linux-gcc-ninja/scm') {
+//         deleteDir();
+//         gitHelper.checkoutGit(url, branch);
+//       }
+// 
+//       stage('linux-gcc-ninja/build') {
+//           def cmakeCompileOptions = moduleCMakeFlags();
+//           cmakeCompileOptions += '-DMAKE_BUILD_TYPE=Release';
+//           // Not sure why the linking of OpenSpaceTest takes so long
+//           compileHelper.build(compileHelper.Ninja(), compileHelper.Gcc(), cmakeCompileOptions, '', 'build-ninja');
+//       }
+// 
+//       if (env.RUN_UNIT_TESTS == 'true') {
+//         stage('linux-gcc-ninja/test-codegen') {
+//           timeout(time: 2, unit: 'MINUTES') {
+//             testHelper.runUnitTests('bin/codegentest');
+//           }
+//         }
+// 
+//         stage('linux-gcc-ninja/test-sgct') {
+//           timeout(time: 2, unit: 'MINUTES') {
+//             testHelper.runUnitTests('bin/SGCTTest');
+//           }
+//         }
+// 
+//         stage('linux-gcc-ninja/test-ghoul') {
+//           timeout(time: 2, unit: 'MINUTES') {
+//             testHelper.runUnitTests('bin/GhoulTest');
+//           }
+//         }
+// 
+//         stage('linux-gcc-ninja/test-openspace') {
+//           timeout(time: 2, unit: 'MINUTES') {
+//             testHelper.runUnitTests('bin/OpenSpaceTest');
+//           }
+//         }
+//       }
+//       cleanWs()
+//     } // node('linux')
+//   }
+// },
 linux_clang_make: {
   if (env.USE_BUILD_OS_LINUX == 'true') {
     node('linux-clang') {
@@ -200,50 +200,50 @@ linux_clang_make: {
     } // node('linux')
   }
 },
-linux_clang_ninja: {
-  if (env.USE_BUILD_OS_LINUX == 'true') {
-    node('linux-clang') {
-      stage('linux-clang-ninja/scm') {
-        deleteDir()
-        gitHelper.checkoutGit(url, branch);
-      }
-
-      stage('linux-clang-ninja/build') {
-          def cmakeCompileOptions = moduleCMakeFlags()
-          cmakeCompileOptions += '-DMAKE_BUILD_TYPE=Release'
-          // Not sure why the linking of OpenSpaceTest takes so long
-          compileHelper.build(compileHelper.Ninja(), compileHelper.Clang(), cmakeCompileOptions, '', 'build-ninja');
-      }
-
-      if (env.RUN_UNIT_TESTS == 'true') {
-        stage('linux-clang-ninja/test-codegen') {
-          timeout(time: 2, unit: 'MINUTES') {
-            testHelper.runUnitTests('bin/codegentest');
-          }
-        }
-
-        stage('linux-clang-ninja/test-sgct') {
-          timeout(time: 2, unit: 'MINUTES') {
-            testHelper.runUnitTests('bin/SGCTTest');
-          }
-        }
-
-        stage('linux-clang-ninja/test-ghoul') {
-          timeout(time: 2, unit: 'MINUTES') {
-            testHelper.runUnitTests('bin/GhoulTest');
-          }
-        }
-
-        stage('linux-clang-ninja/test-openspace') {
-          timeout(time: 2, unit: 'MINUTES') {
-            testHelper.runUnitTests('bin/OpenSpaceTest');
-          }
-        }
-      }
-      cleanWs()
-    } // node('linux')
-  }
-},
+// linux_clang_ninja: {
+//   if (env.USE_BUILD_OS_LINUX == 'true') {
+//     node('linux-clang') {
+//       stage('linux-clang-ninja/scm') {
+//         deleteDir()
+//         gitHelper.checkoutGit(url, branch);
+//       }
+// 
+//       stage('linux-clang-ninja/build') {
+//           def cmakeCompileOptions = moduleCMakeFlags()
+//           cmakeCompileOptions += '-DMAKE_BUILD_TYPE=Release'
+//           // Not sure why the linking of OpenSpaceTest takes so long
+//           compileHelper.build(compileHelper.Ninja(), compileHelper.Clang(), cmakeCompileOptions, '', 'build-ninja');
+//       }
+// 
+//       if (env.RUN_UNIT_TESTS == 'true') {
+//         stage('linux-clang-ninja/test-codegen') {
+//           timeout(time: 2, unit: 'MINUTES') {
+//             testHelper.runUnitTests('bin/codegentest');
+//           }
+//         }
+// 
+//         stage('linux-clang-ninja/test-sgct') {
+//           timeout(time: 2, unit: 'MINUTES') {
+//             testHelper.runUnitTests('bin/SGCTTest');
+//           }
+//         }
+// 
+//         stage('linux-clang-ninja/test-ghoul') {
+//           timeout(time: 2, unit: 'MINUTES') {
+//             testHelper.runUnitTests('bin/GhoulTest');
+//           }
+//         }
+// 
+//         stage('linux-clang-ninja/test-openspace') {
+//           timeout(time: 2, unit: 'MINUTES') {
+//             testHelper.runUnitTests('bin/OpenSpaceTest');
+//           }
+//         }
+//       }
+//       cleanWs()
+//     } // node('linux')
+//   }
+// },
 windows_msvc: {
   if (env.USE_BUILD_OS_WINDOWS == 'true') {
     node('windows') {

From 318a3b6f4537f54a12dcd7dbfcc009d813e067ec Mon Sep 17 00:00:00 2001
From: Ylva Selling <ylva.selling@liu.se>
Date: Wed, 27 Mar 2024 11:17:59 +0100
Subject: [PATCH 343/701] Write two json files for the asset components and the
 scripting api and .gitignore them

---
 documentation                             |  2 +-
 src/documentation/documentationengine.cpp | 17 +++++++++++++++--
 2 files changed, 16 insertions(+), 3 deletions(-)

diff --git a/documentation b/documentation
index 3bd1b1600a..15696c6d5c 160000
--- a/documentation
+++ b/documentation
@@ -1 +1 @@
-Subproject commit 3bd1b1600a015172cd38bf8bbaf6be99dd81d162
+Subproject commit 15696c6d5c95bf51b136efb76a6467a6d2ecfa8f
diff --git a/src/documentation/documentationengine.cpp b/src/documentation/documentationengine.cpp
index 8423694f7a..fdfb11971f 100644
--- a/src/documentation/documentationengine.cpp
+++ b/src/documentation/documentationengine.cpp
@@ -649,15 +649,28 @@ void DocumentationEngine::writeDocumentation() const {
     scriptingResult[DataKey] = scripting;
 
     nlohmann::json documentation = {
-        sceneGraph, sceneProperties, actions, events, keybindings, license,
-        scriptingResult, factory
+        sceneGraph, sceneProperties, actions, events, keybindings, license
     };
 
     nlohmann::json result;
     result[DocumentationKey] = documentation;
 
+    // Make into a javascript variable so that it is possible to open with static html
     std::ofstream out = std::ofstream(absPath("${DOCUMENTATION}/documentationData.js"));
     out << "var data = " << result.dump();
+    out.close();
+
+    // Write two json files for the static docs page - asset components and scripting api
+    out.open(absPath("${DOCUMENTATION}/assetComponents.json"));
+    if (out) {
+        out << factory.dump();
+    }
+    out.close();
+    out.open(absPath("${DOCUMENTATION}/scriptingApi.json"));
+    if (out) {
+        out << scriptingResult.dump();
+    }
+    out.close();
 }
 
 nlohmann::json DocumentationEngine::generateActionJson() const {

From 3f8bff5a625835343d23ee3ed40e3f19d77d28a5 Mon Sep 17 00:00:00 2001
From: Emma Broman <emma.broman@liu.se>
Date: Thu, 28 Mar 2024 01:10:07 +0100
Subject: [PATCH 344/701] General performance improvements (#3142)

* Adding some Tracy zones
* Move point cloud dataset loading to initialize function to speed up startup
* Switch order of operations in memoryaware tile cache to speed up startup
* Move point cloud dataset loading to initialize function
* Add more Zone Scoped and rearrange SDSS loading
* More speed up

---------

Co-authored-by: Alexander Bock <mail@alexanderbock.eu>
---
 apps/OpenSpace/ext/sgct                       |  2 +-
 data/assets/base.asset                        |  5 +-
 .../digitaluniverse/digitaluniverse.asset     |  2 +-
 ext/ghoul                                     |  2 +-
 include/openspace/rendering/labelscomponent.h | 25 ++++---
 include/openspace/util/screenlog.h            |  3 +-
 .../pointcloud/renderablepointcloud.cpp       | 60 ++++++++++-------
 .../pointcloud/renderablepointcloud.h         |  4 ++
 modules/galaxy/rendering/renderablegalaxy.cpp |  2 +
 .../src/memoryawaretilecache.cpp              |  4 +-
 modules/volume/rawvolumereader.inl            | 20 +++---
 src/data/dataloader.cpp                       | 67 +++++++++++++++++--
 src/data/datamapping.cpp                      |  2 +
 src/engine/openspaceengine.cpp                |  4 +-
 src/properties/propertyowner.cpp              |  4 ++
 src/rendering/colormappingcomponent.cpp       |  2 +
 src/rendering/labelscomponent.cpp             | 39 ++++++-----
 src/rendering/renderable.cpp                  |  2 +
 src/scene/assetmanager.cpp                    |  1 +
 src/scene/rotation.cpp                        |  2 +
 src/scene/scale.cpp                           |  2 +
 src/scene/scene.cpp                           |  6 +-
 src/scene/scene_lua.inl                       |  2 +
 src/scene/scenegraphnode.cpp                  | 27 +++++++-
 src/scene/sceneinitializer.cpp                |  4 ++
 src/scene/timeframe.cpp                       |  2 +
 src/scene/translation.cpp                     |  2 +
 src/util/openspacemodule.cpp                  |  1 +
 src/util/screenlog.cpp                        |  2 +
 29 files changed, 217 insertions(+), 83 deletions(-)

diff --git a/apps/OpenSpace/ext/sgct b/apps/OpenSpace/ext/sgct
index e8ee8b48fd..49d1c03a28 160000
--- a/apps/OpenSpace/ext/sgct
+++ b/apps/OpenSpace/ext/sgct
@@ -1 +1 @@
-Subproject commit e8ee8b48fdcfd9164efcac03e7914af5fb5b1ce2
+Subproject commit 49d1c03a2857d370afcb419c361a158cda0e31a7
diff --git a/data/assets/base.asset b/data/assets/base.asset
index 3c3b08a2d6..3f07199c09 100644
--- a/data/assets/base.asset
+++ b/data/assets/base.asset
@@ -4,6 +4,10 @@
 
 asset.require("./base_blank")
 
+-- We load the SDSS dataset first as that is the one that takes the longest, so the
+-- earlier we start, the sooner the loading is done
+asset.require("scene/digitaluniverse/sdss")
+
 -- Specifying which other assets should be loaded in this scene
 asset.require("scene/solarsystem/sun/sun")
 asset.require("scene/solarsystem/sun/glare")
@@ -61,7 +65,6 @@ asset.require("scene/digitaluniverse/openclusters")
 asset.require("scene/digitaluniverse/planetarynebulae")
 asset.require("scene/digitaluniverse/pulsars")
 asset.require("scene/digitaluniverse/quasars")
-asset.require("scene/digitaluniverse/sdss")
 asset.require("scene/digitaluniverse/starlabels")
 asset.require("scene/digitaluniverse/starorbits")
 asset.require("scene/digitaluniverse/stars")
diff --git a/data/assets/scene/digitaluniverse/digitaluniverse.asset b/data/assets/scene/digitaluniverse/digitaluniverse.asset
index b128554315..8b929314bd 100644
--- a/data/assets/scene/digitaluniverse/digitaluniverse.asset
+++ b/data/assets/scene/digitaluniverse/digitaluniverse.asset
@@ -1,3 +1,4 @@
+asset.require("./sdss")
 asset.require("./2dF")
 asset.require("./2mass")
 asset.require("./6dF")
@@ -26,7 +27,6 @@ asset.require("./openclusters")
 asset.require("./planetarynebulae")
 asset.require("./pulsars")
 asset.require("./quasars")
-asset.require("./sdss")
 asset.require("./starlabels")
 asset.require("./starorbits")
 asset.require("./stars")
diff --git a/ext/ghoul b/ext/ghoul
index c8a56a6e63..c6d49eda51 160000
--- a/ext/ghoul
+++ b/ext/ghoul
@@ -1 +1 @@
-Subproject commit c8a56a6e63b81e13a3a957c5af43edc4ab1b838b
+Subproject commit c6d49eda51ce34e729bf931d69e638c73c8e254a
diff --git a/include/openspace/rendering/labelscomponent.h b/include/openspace/rendering/labelscomponent.h
index 3d4aef8740..c729670534 100644
--- a/include/openspace/rendering/labelscomponent.h
+++ b/include/openspace/rendering/labelscomponent.h
@@ -48,19 +48,6 @@ class LabelsComponent : public properties::PropertyOwner, public Fadeable {
 public:
     explicit LabelsComponent(const ghoul::Dictionary& dictionary);
 
-    /**
-     * Create a labels component from an already loaded dataset. That dataset should have
-     * a comment per point to be used for the labels.
-     *
-     * \param dictionary A dictionary with the other information used for constructing
-     *        the dataset
-     * \param dataset The dataset to create the labelset from, including xyz position and
-     *        a string to be used for the text.
-     * \param unit The unit to use when interpreting the point information in the dataset
-     */
-    explicit LabelsComponent(const ghoul::Dictionary& dictionary,
-        const dataloader::Dataset& dataset, DistanceUnit unit);
-
     ~LabelsComponent() override = default;
 
     dataloader::Labelset& labelSet();
@@ -68,6 +55,18 @@ public:
 
     void initialize();
 
+    /**
+     * Create the labels from an already loaded dataset. That dataset should have a comment
+     * per point to be used for the labels.
+     *
+     * This function should be called before the labels are initialized
+     *
+     * \param dataset The dataset to create the labelset from, including xyz position and
+     *        a string to be used for the text.
+     * \param unit The unit to use when interpreting the point information in the dataset
+     */
+    void loadLabelsFromDataset(const dataloader::Dataset& dataset, DistanceUnit unit);
+
     void loadLabels();
 
     bool isReady() const;
diff --git a/include/openspace/util/screenlog.h b/include/openspace/util/screenlog.h
index b5e883f295..7b9b8333f2 100644
--- a/include/openspace/util/screenlog.h
+++ b/include/openspace/util/screenlog.h
@@ -27,6 +27,7 @@
 
 #include <ghoul/logging/log.h>
 
+#include <ghoul/misc/profiling.h>
 #include <chrono>
 #include <mutex>
 #include <string_view>
@@ -124,7 +125,7 @@ private:
 
     /// A mutex to ensure thread-safety since the logging and the removal of expired
     /// entires can occur on different threads
-    mutable std::mutex _mutex;
+    mutable TracyLockable(std::mutex, _mutex);
 };
 
 } // namespace openspace
diff --git a/modules/base/rendering/pointcloud/renderablepointcloud.cpp b/modules/base/rendering/pointcloud/renderablepointcloud.cpp
index f2ab0ff57c..e102bab029 100644
--- a/modules/base/rendering/pointcloud/renderablepointcloud.cpp
+++ b/modules/base/rendering/pointcloud/renderablepointcloud.cpp
@@ -586,6 +586,8 @@ RenderablePointCloud::RenderablePointCloud(const ghoul::Dictionary& dictionary)
     , _colorSettings(dictionary)
     , _sizeSettings(dictionary)
 {
+    ZoneScoped;
+
     const Parameters p = codegen::bake<Parameters>(dictionary);
 
     addProperty(Fadeable::_opacity);
@@ -697,38 +699,19 @@ RenderablePointCloud::RenderablePointCloud(const ghoul::Dictionary& dictionary)
         });
     }
 
-    if (_hasDataFile) {
-        bool useCaching = p.useCaching.value_or(true);
-        if (useCaching) {
-            _dataset = dataloader::data::loadFileWithCache(_dataFile, _dataMapping);
-        }
-        else {
-            _dataset = dataloader::data::loadFile(_dataFile, _dataMapping);
-        }
-        _nDataPoints = static_cast<unsigned int>(_dataset.entries.size());
+    _useCaching = p.useCaching.value_or(true);
 
-        // If no scale exponent was specified, compute one that will at least show the
-        // points based on the scale of the positions in the dataset
-        if (!p.sizeSettings.has_value() || !p.sizeSettings->scaleExponent.has_value()) {
-            double dist = _dataset.maxPositionComponent * toMeter(_unit);
-            if (dist > 0.0) {
-                float exponent = static_cast<float>(std::log10(dist));
-                // Reduce the actually used exponent a little bit, as just using the
-                // logarithm as is leads to very large points
-                _sizeSettings.scaleExponent = 0.9f * exponent;
-            }
-        }
+    // If no scale exponent was specified, compute one that will at least show the
+    // points based on the scale of the positions in the dataset
+    if (!p.sizeSettings.has_value() || !p.sizeSettings->scaleExponent.has_value()) {
+        _shouldComputeScaleExponent = true;
     }
 
     if (p.labels.has_value()) {
         if (!p.labels->hasKey("File") && _hasDataFile) {
-            // Load the labelset from the dataset if no label file was included
-            _labels = std::make_unique<LabelsComponent>(*p.labels, _dataset, _unit);
+            _createLabelsFromDataset = true;
         }
-        else {
-            _labels = std::make_unique<LabelsComponent>(*p.labels);
-        }
-
+        _labels = std::make_unique<LabelsComponent>(*p.labels);
         _hasLabels = true;
         addPropertySubOwner(_labels.get());
         // Fading of the labels should depend on the fading of the renderable
@@ -764,11 +747,36 @@ void RenderablePointCloud::initialize() {
             break;
     }
 
+    if (_hasDataFile) {
+        if (_useCaching) {
+            _dataset = dataloader::data::loadFileWithCache(_dataFile, _dataMapping);
+        }
+        else {
+            _dataset = dataloader::data::loadFile(_dataFile, _dataMapping);
+        }
+        _nDataPoints = static_cast<unsigned int>(_dataset.entries.size());
+
+        // If no scale exponent was specified, compute one that will at least show the
+        // points based on the scale of the positions in the dataset
+        if (_shouldComputeScaleExponent) {
+            double dist = _dataset.maxPositionComponent * toMeter(_unit);
+            if (dist > 0.0) {
+                float exponent = static_cast<float>(std::log10(dist));
+                // Reduce the actually used exponent a little bit, as just using the
+                // logarithm as is leads to very large points
+                _sizeSettings.scaleExponent = 0.9f * exponent;
+            }
+        }
+    }
+
     if (_hasDataFile && _hasColorMapFile) {
         _colorSettings.colorMapping->initialize(_dataset);
     }
 
     if (_hasLabels) {
+        if (_createLabelsFromDataset) {
+            _labels->loadLabelsFromDataset(_dataset, _unit);
+        }
         _labels->initialize();
     }
 }
diff --git a/modules/base/rendering/pointcloud/renderablepointcloud.h b/modules/base/rendering/pointcloud/renderablepointcloud.h
index 05e2cf3a65..428aaf44ee 100644
--- a/modules/base/rendering/pointcloud/renderablepointcloud.h
+++ b/modules/base/rendering/pointcloud/renderablepointcloud.h
@@ -227,6 +227,10 @@ protected:
 
     DistanceUnit _unit = DistanceUnit::Parsec;
 
+    bool _useCaching = true;
+    bool _shouldComputeScaleExponent = false;
+    bool _createLabelsFromDataset = false;
+
     dataloader::Dataset _dataset;
     dataloader::DataMapping _dataMapping;
 
diff --git a/modules/galaxy/rendering/renderablegalaxy.cpp b/modules/galaxy/rendering/renderablegalaxy.cpp
index 8069010734..7843120f92 100644
--- a/modules/galaxy/rendering/renderablegalaxy.cpp
+++ b/modules/galaxy/rendering/renderablegalaxy.cpp
@@ -781,6 +781,8 @@ RenderableGalaxy::Result RenderableGalaxy::loadPointFile() {
 RenderableGalaxy::Result RenderableGalaxy::loadCachedFile(
                                                         const std::filesystem::path& file)
 {
+    ZoneScoped;
+
     std::ifstream fileStream = std::ifstream(file, std::ifstream::binary);
     if (!fileStream.good()) {
         LERROR(std::format("Error opening file '{}' for loading cache file", file));
diff --git a/modules/globebrowsing/src/memoryawaretilecache.cpp b/modules/globebrowsing/src/memoryawaretilecache.cpp
index ac35f07a88..e9d0a5d5c0 100644
--- a/modules/globebrowsing/src/memoryawaretilecache.cpp
+++ b/modules/globebrowsing/src/memoryawaretilecache.cpp
@@ -221,6 +221,8 @@ void MemoryAwareTileCache::TextureContainer::reset() {
         ghoul::opengl::Texture::FilterMode::AnisotropicMipMap;
 
     for (size_t i = 0; i < _numTextures; i++) {
+        ZoneScopedN("Texture");
+
         using namespace ghoul::opengl;
 
         std::unique_ptr<Texture> tex = std::make_unique<Texture>(
@@ -235,8 +237,8 @@ void MemoryAwareTileCache::TextureContainer::reset() {
         );
 
         tex->setDataOwnership(Texture::TakeOwnership::Yes);
-        tex->uploadTexture();
         tex->setFilter(mode);
+        tex->uploadTexture();
 
         _textures.push_back(std::move(tex));
     }
diff --git a/modules/volume/rawvolumereader.inl b/modules/volume/rawvolumereader.inl
index f17fcc1215..0b3ed74269 100644
--- a/modules/volume/rawvolumereader.inl
+++ b/modules/volume/rawvolumereader.inl
@@ -79,22 +79,22 @@ glm::uvec3 RawVolumeReader<VoxelType>::indexToCoords(size_t linear) const {
 
 template <typename VoxelType>
 std::unique_ptr<RawVolume<VoxelType>> RawVolumeReader<VoxelType>::read(bool invertZ) {
-    glm::uvec3 dims = dimensions();
-    auto volume = std::make_unique<RawVolume<VoxelType>>(dims);
-
-    std::ifstream file(_path, std::ios::binary);
-    char* buffer = reinterpret_cast<char*>(volume->data());
+    ZoneScoped;
 
+    std::ifstream file = std::ifstream(_path, std::ios::binary);
     if (file.fail()) {
         throw ghoul::FileNotFoundError("Volume file not found");
     }
 
-    size_t length = static_cast<size_t>(dims.x) *
-                    static_cast<size_t>(dims.y) *
-                    static_cast<size_t>(dims.z) *
-                    sizeof(VoxelType);
+    glm::uvec3 dims = dimensions();
+    auto volume = std::make_unique<RawVolume<VoxelType>>(dims);
 
-    file.read(buffer, length);
+    char* buffer = reinterpret_cast<char*>(volume->data());
+    size_t length = glm::compMul(dims) * sizeof(VoxelType);
+    {
+        ZoneScopedN("read");
+        file.read(buffer, length);
+    }
 
     if (file.fail()) {
         throw ghoul::RuntimeError("Error reading volume file");
diff --git a/src/data/dataloader.cpp b/src/data/dataloader.cpp
index 057b82dece..9402acc9bc 100644
--- a/src/data/dataloader.cpp
+++ b/src/data/dataloader.cpp
@@ -40,7 +40,7 @@
 #include <string_view>
 
 namespace {
-    constexpr int8_t DataCacheFileVersion = 11;
+    constexpr int8_t DataCacheFileVersion = 12;
     constexpr int8_t LabelCacheFileVersion = 11;
     constexpr int8_t ColorCacheFileVersion = 11;
 
@@ -75,6 +75,8 @@ namespace {
             std::is_same_v<T, openspace::dataloader::ColorMap>
         );
 
+        ZoneScoped;
+
         std::string info;
         if (specs.has_value()) {
             info = openspace::dataloader::generateHashString(*specs);
@@ -93,12 +95,13 @@ namespace {
             std::optional<T> dataset = loadCacheFunction(cached);
             if (dataset.has_value()) {
                 // We could load the cache file and we are now done with this
-                return *dataset;
+                return std::move(*dataset);
             }
             else {
                 FileSys.cacheManager()->removeCacheFile(cached);
             }
         }
+
         LINFOC("DataLoader", std::format("Loading file '{}'", filePath));
         T dataset = loadFunction(filePath, specs);
 
@@ -116,6 +119,8 @@ namespace openspace::dataloader {
 namespace data {
 
 Dataset loadFile(std::filesystem::path path, std::optional<DataMapping> specs) {
+    ZoneScoped;
+
     ghoul_assert(std::filesystem::exists(path), "File must exist");
 
     const std::ifstream file = std::ifstream(path);
@@ -143,6 +148,8 @@ Dataset loadFile(std::filesystem::path path, std::optional<DataMapping> specs) {
 }
 
 std::optional<Dataset> loadCachedFile(const std::filesystem::path& path) {
+    ZoneScoped;
+
     std::ifstream file = std::ifstream(path, std::ios::binary);
     if (!file.good()) {
         return std::nullopt;
@@ -163,6 +170,8 @@ std::optional<Dataset> loadCachedFile(const std::filesystem::path& path) {
     file.read(reinterpret_cast<char*>(&nVariables), sizeof(uint16_t));
     result.variables.resize(nVariables);
     for (int i = 0; i < nVariables; i += 1) {
+        ZoneScopedN("Variable");
+
         Dataset::Variable var;
 
         int16_t idx = 0;
@@ -183,6 +192,8 @@ std::optional<Dataset> loadCachedFile(const std::filesystem::path& path) {
     file.read(reinterpret_cast<char*>(&nTextures), sizeof(uint16_t));
     result.textures.resize(nTextures);
     for (int i = 0; i < nTextures; i += 1) {
+        ZoneScopedN("Texture");
+
         Dataset::Texture tex;
 
         int16_t idx = 0;
@@ -213,28 +224,55 @@ std::optional<Dataset> loadCachedFile(const std::filesystem::path& path) {
     file.read(reinterpret_cast<char*>(&nEntries), sizeof(uint64_t));
     result.entries.reserve(nEntries);
     for (uint64_t i = 0; i < nEntries; i += 1) {
+        ZoneScopedN("Dataset");
+
         Dataset::Entry e;
-        file.read(reinterpret_cast<char*>(&e.position.x), sizeof(float));
-        file.read(reinterpret_cast<char*>(&e.position.y), sizeof(float));
-        file.read(reinterpret_cast<char*>(&e.position.z), sizeof(float));
+        file.read(reinterpret_cast<char*>(&e.position.x), 3 * sizeof(float));
 
         uint16_t nValues = 0;
         file.read(reinterpret_cast<char*>(&nValues), sizeof(uint16_t));
         e.data.resize(nValues);
         file.read(reinterpret_cast<char*>(e.data.data()), nValues * sizeof(float));
 
+        // For now we just store the length of the comment. Since the comments are stored
+        // in one block after the data entries, we can use the length later to extract the
+        // contents of this entries comment out of the big block
         uint16_t len = 0;
         file.read(reinterpret_cast<char*>(&len), sizeof(uint16_t));
         if (len > 0) {
+            // If there is a comment, we already allocate the space for it here. This way
+            // we don't need to separately store the length of it, but can use the size of
+            // the vector instead
             std::string comment;
             comment.resize(len);
-            file.read(comment.data(), len);
             e.comment = std::move(comment);
         }
 
         result.entries.push_back(std::move(e));
     }
 
+    //
+    // Read comments in one block and then assign them to the data entries
+    uint64_t totalCommentLength = 0;
+    file.read(reinterpret_cast<char*>(&totalCommentLength), sizeof(uint64_t));
+    std::vector<char> commentBuffer;
+    commentBuffer.resize(totalCommentLength);
+    file.read(commentBuffer.data(), totalCommentLength);
+    // idx is the running index into the total comment buffer
+    int idx = 0;
+    for (Dataset::Entry& e : result.entries) {
+        if (e.comment.has_value()) {
+            ghoul_assert(idx < commentBuffer.size(), "Index too large");
+
+            // If we have a comment, we need to extract its length's worth of characters
+            // from the buffer
+            std::memcpy(e.comment->data(), &commentBuffer[idx], e.comment->size());
+
+            // and then advance the index
+            idx += e.comment->size();
+        }
+    }
+
     //
     // Read max data point variable
     float max = 0.f;
@@ -245,6 +283,8 @@ std::optional<Dataset> loadCachedFile(const std::filesystem::path& path) {
 }
 
 void saveCachedFile(const Dataset& dataset, const std::filesystem::path& path) {
+    ZoneScoped;
+
     std::ofstream file = std::ofstream(path, std::ofstream::binary);
 
     file.write(reinterpret_cast<const char*>(&DataCacheFileVersion), sizeof(int8_t));
@@ -297,6 +337,7 @@ void saveCachedFile(const Dataset& dataset, const std::filesystem::path& path) {
     checkSize<uint64_t>(dataset.entries.size(), "Too many entries");
     uint64_t nEntries = static_cast<uint64_t>(dataset.entries.size());
     file.write(reinterpret_cast<const char*>(&nEntries), sizeof(uint64_t));
+    uint64_t totalCommentLength = 0;
     for (const Dataset::Entry& e : dataset.entries) {
         file.write(reinterpret_cast<const char*>(&e.position.x), sizeof(float));
         file.write(reinterpret_cast<const char*>(&e.position.y), sizeof(float));
@@ -317,6 +358,18 @@ void saveCachedFile(const Dataset& dataset, const std::filesystem::path& path) {
             static_cast<uint16_t>(e.comment->size()) :
             0;
         file.write(reinterpret_cast<const char*>(&commentLen), sizeof(uint16_t));
+        totalCommentLength += commentLen;
+        //if (e.comment.has_value()) {
+        //    file.write(e.comment->data(), e.comment->size());
+        //}
+    }
+
+    //
+    // Write all of the comments next. We don't have to store the individual comment
+    // lengths as the data values written before already have those stored. And since we
+    // are reading the comments in the same order as the dataset entries, we're good
+    file.write(reinterpret_cast<const char*>(&totalCommentLength), sizeof(uint64_t));
+    for (const Dataset::Entry& e : dataset.entries) {
         if (e.comment.has_value()) {
             file.write(e.comment->data(), e.comment->size());
         }
@@ -345,6 +398,8 @@ Dataset loadFileWithCache(std::filesystem::path path, std::optional<DataMapping>
 namespace label {
 
 Labelset loadFile(std::filesystem::path path, std::optional<DataMapping>) {
+    ZoneScoped;
+
     ghoul_assert(std::filesystem::exists(path), "File must exist");
 
     const std::ifstream file = std::ifstream(path);
diff --git a/src/data/datamapping.cpp b/src/data/datamapping.cpp
index 9907d49ba5..5e523b9092 100644
--- a/src/data/datamapping.cpp
+++ b/src/data/datamapping.cpp
@@ -151,6 +151,8 @@ documentation::Documentation DataMapping::Documentation() {
 }
 
 DataMapping DataMapping::createFromDictionary(const ghoul::Dictionary& dictionary) {
+    ZoneScoped;
+
     const Parameters p = codegen::bake<Parameters>(dictionary);
 
     DataMapping result;
diff --git a/src/engine/openspaceengine.cpp b/src/engine/openspaceengine.cpp
index faacf68ece..cb64544433 100644
--- a/src/engine/openspaceengine.cpp
+++ b/src/engine/openspaceengine.cpp
@@ -757,8 +757,8 @@ void OpenSpaceEngine::loadAssets() {
 
     std::unique_ptr<SceneInitializer> sceneInitializer;
     if (global::configuration->useMultithreadedInitialization) {
-        const unsigned int nAvailableThreads = std::min(
-            std::thread::hardware_concurrency() - 1,
+        const unsigned int nAvailableThreads = std::max(
+            std::thread::hardware_concurrency() / 2,
             4u
         );
         const unsigned int nThreads = nAvailableThreads == 0 ? 2 : nAvailableThreads;
diff --git a/src/properties/propertyowner.cpp b/src/properties/propertyowner.cpp
index bbe708ba3a..1585493e25 100644
--- a/src/properties/propertyowner.cpp
+++ b/src/properties/propertyowner.cpp
@@ -163,6 +163,8 @@ std::string PropertyOwner::propertyGroupName(const std::string& groupID) const {
 }
 
 void PropertyOwner::addProperty(Property* prop) {
+    ZoneScoped;
+
     ghoul_precondition(prop != nullptr, "prop must not be nullptr");
 
     if (prop->identifier().empty()) {
@@ -207,6 +209,8 @@ void PropertyOwner::addProperty(Property& prop) {
 }
 
 void PropertyOwner::addPropertySubOwner(openspace::properties::PropertyOwner* owner) {
+    ZoneScoped;
+
     ghoul_precondition(owner != nullptr, "owner must not be nullptr");
     ghoul_precondition(
         !owner->identifier().empty(),
diff --git a/src/rendering/colormappingcomponent.cpp b/src/rendering/colormappingcomponent.cpp
index 6070f3c4af..4dbf91e9ee 100644
--- a/src/rendering/colormappingcomponent.cpp
+++ b/src/rendering/colormappingcomponent.cpp
@@ -330,6 +330,8 @@ ghoul::opengl::Texture* ColorMappingComponent::texture() const {
 }
 
 void ColorMappingComponent::initialize(const dataloader::Dataset& dataset) {
+    ZoneScoped;
+
     _colorMap = dataloader::color::loadFileWithCache(colorMapFile.value());
 
     initializeParameterData(dataset);
diff --git a/src/rendering/labelscomponent.cpp b/src/rendering/labelscomponent.cpp
index 4d5e47643f..8222e4c663 100644
--- a/src/rendering/labelscomponent.cpp
+++ b/src/rendering/labelscomponent.cpp
@@ -223,21 +223,6 @@ LabelsComponent::LabelsComponent(const ghoul::Dictionary& dictionary)
     _transformationMatrix = p.transformationMatrix.value_or(_transformationMatrix);
 }
 
-LabelsComponent::LabelsComponent(const ghoul::Dictionary& dictionary,
-                                 const dataloader::Dataset& dataset,
-                                 DistanceUnit unit)
-    : LabelsComponent(dictionary)
-{
-    // The unit should match the one in the dataset, not the one that was included in the
-    // asset (if any)
-    _unit = unit;
-
-    // Load the labelset directly based on the dataset, and keep track of that it has
-    // already been loaded this way
-    _labelset = dataloader::label::loadFromDataset(dataset);
-    _createdFromDataset = true;
-}
-
 dataloader::Labelset& LabelsComponent::labelSet() {
     return _labelset;
 }
@@ -247,6 +232,8 @@ const dataloader::Labelset& LabelsComponent::labelSet() const {
 }
 
 void LabelsComponent::initialize() {
+    ZoneScoped;
+
     _font = global::fontManager->font(
         "Mono",
         _fontSize,
@@ -257,14 +244,34 @@ void LabelsComponent::initialize() {
     loadLabels();
 }
 
+void LabelsComponent::loadLabelsFromDataset(const dataloader::Dataset& dataset,
+                                            DistanceUnit unit)
+{
+    ZoneScoped;
+
+    LINFO("Loading labels from dataset");
+
+    // The unit should match the one in the dataset, not the one that was included in the
+    // asset (if any)
+    _unit = unit;
+
+    // Load the labelset directly based on the dataset, and keep track of that it has
+    // already been loaded this way
+    _labelset = dataloader::label::loadFromDataset(dataset);
+
+    _createdFromDataset = true;
+}
+
 void LabelsComponent::loadLabels() {
-    LINFO(std::format("Loading label file '{}'", _labelFile));
+    ZoneScoped;
 
     if (_createdFromDataset) {
         // The labelset should already have been loaded
         return;
     }
 
+    LINFO(std::format("Loading label file '{}'", _labelFile));
+
     if (_useCache) {
         _labelset = dataloader::label::loadFileWithCache(_labelFile);
     }
diff --git a/src/rendering/renderable.cpp b/src/rendering/renderable.cpp
index 732adc40e8..2f76630659 100644
--- a/src/rendering/renderable.cpp
+++ b/src/rendering/renderable.cpp
@@ -118,6 +118,8 @@ documentation::Documentation Renderable::Documentation() {
 ghoul::mm_unique_ptr<Renderable> Renderable::createFromDictionary(
                                                       const ghoul::Dictionary& dictionary)
 {
+    ZoneScoped;
+
     if (!dictionary.hasKey(KeyType)) {
         throw ghoul::RuntimeError("Tried to create Renderable but no 'Type' was found");
     }
diff --git a/src/scene/assetmanager.cpp b/src/scene/assetmanager.cpp
index 7a9dc5e14f..21a5772115 100644
--- a/src/scene/assetmanager.cpp
+++ b/src/scene/assetmanager.cpp
@@ -918,6 +918,7 @@ Asset* AssetManager::retrieveAsset(const std::filesystem::path& path,
 
 void AssetManager::callOnInitialize(Asset* asset) const {
     ZoneScoped;
+    ZoneText(asset->path().string().c_str(), asset->path().string().length());
     ghoul_precondition(asset, "Asset must not be nullptr");
 
     auto it = _onInitializeFunctionRefs.find(asset);
diff --git a/src/scene/rotation.cpp b/src/scene/rotation.cpp
index 1ac84efc36..2ba4a76e3e 100644
--- a/src/scene/rotation.cpp
+++ b/src/scene/rotation.cpp
@@ -54,6 +54,8 @@ documentation::Documentation Rotation::Documentation() {
 ghoul::mm_unique_ptr<Rotation> Rotation::createFromDictionary(
                                                       const ghoul::Dictionary& dictionary)
 {
+    ZoneScoped;
+
     const Parameters p = codegen::bake<Parameters>(dictionary);
 
     Rotation* result = FactoryManager::ref().factory<Rotation>()->create(
diff --git a/src/scene/scale.cpp b/src/scene/scale.cpp
index 0a75b5af80..812a029fd5 100644
--- a/src/scene/scale.cpp
+++ b/src/scene/scale.cpp
@@ -53,6 +53,8 @@ documentation::Documentation Scale::Documentation() {
 ghoul::mm_unique_ptr<Scale> Scale::createFromDictionary(
                                                       const ghoul::Dictionary& dictionary)
 {
+    ZoneScoped;
+
     const Parameters p = codegen::bake<Parameters>(dictionary);
 
     Scale* result = FactoryManager::ref().factory<Scale>()->create(
diff --git a/src/scene/scene.cpp b/src/scene/scene.cpp
index 0f9af62620..802beb24c4 100644
--- a/src/scene/scene.cpp
+++ b/src/scene/scene.cpp
@@ -200,6 +200,8 @@ void Scene::updateNodeRegistry() {
 }
 
 void Scene::sortTopologically() {
+    ZoneScoped;
+
     _topologicallySortedNodes.insert(
         _topologicallySortedNodes.end(),
         std::make_move_iterator(_circularNodes.begin()),
@@ -310,7 +312,7 @@ void Scene::update(const UpdateData& data) {
 
 void Scene::render(const RenderData& data, RendererTasks& tasks) {
     ZoneScoped;
-    ZoneName(
+    ZoneText(
         renderBinToString(data.renderBinMask),
         strlen(renderBinToString(data.renderBinMask))
     );
@@ -366,6 +368,8 @@ const std::vector<SceneGraphNode*>& Scene::allSceneGraphNodes() const {
 }
 
 SceneGraphNode* Scene::loadNode(const ghoul::Dictionary& nodeDictionary) {
+    ZoneScoped;
+
     // First interpret the dictionary
     std::vector<std::string> dependencyNames;
 
diff --git a/src/scene/scene_lua.inl b/src/scene/scene_lua.inl
index 765193ab7c..f49a254de3 100644
--- a/src/scene/scene_lua.inl
+++ b/src/scene/scene_lua.inl
@@ -619,6 +619,8 @@ namespace {
  * Loads the SceneGraphNode described in the table and adds it to the SceneGraph.
  */
 [[codegen::luawrap]] void addSceneGraphNode(ghoul::Dictionary node) {
+    ZoneScoped;
+
     using namespace openspace;
     try {
         SceneGraphNode* n = global::renderEngine->scene()->loadNode(node);
diff --git a/src/scene/scenegraphnode.cpp b/src/scene/scenegraphnode.cpp
index e35d569367..df5c9537e0 100644
--- a/src/scene/scenegraphnode.cpp
+++ b/src/scene/scenegraphnode.cpp
@@ -330,6 +330,8 @@ int SceneGraphNode::nextIndex = 0;
 ghoul::mm_unique_ptr<SceneGraphNode> SceneGraphNode::createFromDictionary(
                                                       const ghoul::Dictionary& dictionary)
 {
+    ZoneScoped;
+
     const Parameters p = codegen::bake<Parameters>(dictionary);
 
     SceneGraphNode* n = global::memoryManager->PersistentMemory.alloc<SceneGraphNode>();
@@ -342,6 +344,8 @@ ghoul::mm_unique_ptr<SceneGraphNode> SceneGraphNode::createFromDictionary(
     result->setIdentifier(p.identifier);
 
     if (p.gui.has_value()) {
+        ZoneScopedN("GUI");
+
         if (p.gui->name.has_value()) {
             result->setGuiName(*p.gui->name);
             result->_guiDisplayName = result->guiName();
@@ -375,6 +379,8 @@ ghoul::mm_unique_ptr<SceneGraphNode> SceneGraphNode::createFromDictionary(
     result->_reachFactor = p.reachFactor.value_or(result->_reachFactor);
 
     if (p.transform.has_value()) {
+        ZoneScopedN("Transform");
+
         if (p.transform->translation.has_value()) {
             result->_transform.translation = Translation::createFromDictionary(
                 *p.transform->translation
@@ -409,6 +415,8 @@ ghoul::mm_unique_ptr<SceneGraphNode> SceneGraphNode::createFromDictionary(
 
 
     if (p.timeFrame.has_value()) {
+        ZoneScopedN("TimeFrame");
+
         result->_timeFrame = TimeFrame::createFromDictionary(*p.timeFrame);
 
         LDEBUG(std::format(
@@ -419,17 +427,21 @@ ghoul::mm_unique_ptr<SceneGraphNode> SceneGraphNode::createFromDictionary(
 
     // We initialize the renderable last as it probably has the most dependencies
     if (p.renderable.has_value()) {
+        ZoneScopedN("Renderable");
+
         result->_renderable = Renderable::createFromDictionary(*p.renderable);
         ghoul_assert(result->_renderable, "Failed to create Renderable");
         result->_renderable->_parent = result.get();
         result->addPropertySubOwner(result->_renderable.get());
-        LDEBUG(std::format(
-            "Successfully created renderable for '{}'", result->identifier()
-        ));
+        //LDEBUG(std::format(
+        //    "Successfully created renderable for '{}'", result->identifier()
+        //));
     }
 
     // Extracting the actions from the dictionary
     if (p.onApproach.has_value()) {
+        ZoneScopedN("OnApproach");
+
         if (std::holds_alternative<std::string>(*p.onApproach)) {
             result->_onApproachAction = { std::get<std::string>(*p.onApproach) };
         }
@@ -439,6 +451,8 @@ ghoul::mm_unique_ptr<SceneGraphNode> SceneGraphNode::createFromDictionary(
     }
 
     if (p.onReach.has_value()) {
+        ZoneScopedN("OnReach");
+
         if (std::holds_alternative<std::string>(*p.onReach)) {
             result->_onReachAction = { std::get<std::string>(*p.onReach) };
         }
@@ -448,6 +462,8 @@ ghoul::mm_unique_ptr<SceneGraphNode> SceneGraphNode::createFromDictionary(
     }
 
     if (p.onRecede.has_value()) {
+        ZoneScopedN("OnRecede");
+
         if (std::holds_alternative<std::string>(*p.onRecede)) {
             result->_onRecedeAction = { std::get<std::string>(*p.onRecede) };
         }
@@ -457,6 +473,8 @@ ghoul::mm_unique_ptr<SceneGraphNode> SceneGraphNode::createFromDictionary(
     }
 
     if (p.onExit.has_value()) {
+        ZoneScopedN("OnExit");
+
         if (std::holds_alternative<std::string>(*p.onExit)) {
             result->_onExitAction = { std::get<std::string>(*p.onExit) };
         }
@@ -466,6 +484,8 @@ ghoul::mm_unique_ptr<SceneGraphNode> SceneGraphNode::createFromDictionary(
     }
 
     if (p.tag.has_value()) {
+        ZoneScopedN("Tag");
+
         if (std::holds_alternative<std::string>(*p.tag)) {
             result->addTag(std::get<std::string>(*p.tag));
         }
@@ -611,6 +631,7 @@ void SceneGraphNode::initialize() {
 void SceneGraphNode::initializeGL() {
     ZoneScoped;
     ZoneName(identifier().c_str(), identifier().size());
+    TracyGpuZone("initializeGL")
 
     LDEBUG(std::format("Initializing GL: {}", identifier()));
 
diff --git a/src/scene/sceneinitializer.cpp b/src/scene/sceneinitializer.cpp
index 9425a13e99..79d911d296 100644
--- a/src/scene/sceneinitializer.cpp
+++ b/src/scene/sceneinitializer.cpp
@@ -51,7 +51,11 @@ MultiThreadedSceneInitializer::MultiThreadedSceneInitializer(unsigned int nThrea
 {}
 
 void MultiThreadedSceneInitializer::initializeNode(SceneGraphNode* node) {
+    ZoneScoped;
+
     auto initFunction = [this, node]() {
+        ZoneScopedN("MultiThreadedInit");
+
         LoadingScreen* loadingScreen = global::openSpaceEngine->loadingScreen();
 
         LoadingScreen::ProgressInfo progressInfo;
diff --git a/src/scene/timeframe.cpp b/src/scene/timeframe.cpp
index 7af39c2632..4d79d3d6c4 100644
--- a/src/scene/timeframe.cpp
+++ b/src/scene/timeframe.cpp
@@ -53,6 +53,8 @@ documentation::Documentation TimeFrame::Documentation() {
 ghoul::mm_unique_ptr<TimeFrame> TimeFrame::createFromDictionary(
                                                             const ghoul::Dictionary& dict)
 {
+    ZoneScoped;
+
     const Parameters p = codegen::bake<Parameters>(dict);
 
     TimeFrame* result = FactoryManager::ref().factory<TimeFrame>()->create(p.type, dict);
diff --git a/src/scene/translation.cpp b/src/scene/translation.cpp
index f2e70b6a83..717242f402 100644
--- a/src/scene/translation.cpp
+++ b/src/scene/translation.cpp
@@ -52,6 +52,8 @@ documentation::Documentation Translation::Documentation() {
 ghoul::mm_unique_ptr<Translation> Translation::createFromDictionary(
                                                       const ghoul::Dictionary& dictionary)
 {
+    ZoneScoped;
+
     const Parameters p = codegen::bake<Parameters>(dictionary);
 
     Translation* result = FactoryManager::ref().factory<Translation>()->create(
diff --git a/src/util/openspacemodule.cpp b/src/util/openspacemodule.cpp
index 92e8153e8c..3200400660 100644
--- a/src/util/openspacemodule.cpp
+++ b/src/util/openspacemodule.cpp
@@ -66,6 +66,7 @@ void OpenSpaceModule::initialize(const ghoul::Dictionary& configuration) {
 void OpenSpaceModule::initializeGL() {
     ZoneScoped;
     ZoneName(identifier().c_str(), identifier().size());
+    TracyGpuZone("initializeGL")
 
     internalInitializeGL();
 }
diff --git a/src/util/screenlog.cpp b/src/util/screenlog.cpp
index ba70dba597..e3d45623a6 100644
--- a/src/util/screenlog.cpp
+++ b/src/util/screenlog.cpp
@@ -49,6 +49,8 @@ void ScreenLog::removeExpiredEntries() {
 }
 
 void ScreenLog::log(LogLevel level, std::string_view category, std::string_view message) {
+    ZoneScoped;
+
     const std::lock_guard guard(_mutex);
     if (level >= _logLevel) {
         _entries.push_back({

From cdf98f78899f5040361c17cf7498c2bdd0b9c270 Mon Sep 17 00:00:00 2001
From: Alexander Bock <alexander.bock@liu.se>
Date: Thu, 28 Mar 2024 14:30:12 +0100
Subject: [PATCH 345/701] Optimizing the data loading. Adding more Tracy macros

---
 modules/server/src/connection.cpp             |  5 ++
 .../server/src/topics/getpropertytopic.cpp    |  6 +-
 modules/skybrowser/src/wwtdatahandler.cpp     |  2 +
 src/data/dataloader.cpp                       | 70 ++++++++++++-------
 src/engine/openspaceengine.cpp                |  5 +-
 src/scripting/scriptengine.cpp                |  3 +-
 support/coding/codegen                        |  2 +-
 7 files changed, 61 insertions(+), 32 deletions(-)

diff --git a/modules/server/src/connection.cpp b/modules/server/src/connection.cpp
index 6007ee706c..74b367af8c 100644
--- a/modules/server/src/connection.cpp
+++ b/modules/server/src/connection.cpp
@@ -167,6 +167,8 @@ void Connection::handleJson(const nlohmann::json& json) {
     auto topicIt = _topics.find(topicId);
 
     if (topicIt == _topics.end()) {
+        ZoneScopedN("New Topic");
+
         // The topic id is not registered: Initialize a new topic.
         auto typeJson = json.find(MessageKeyType);
         if (typeJson == json.end() || !typeJson->is_string()) {
@@ -174,6 +176,7 @@ void Connection::handleJson(const nlohmann::json& json) {
             return;
         }
         const std::string type = *typeJson;
+        ZoneText(type.c_str(), type.size());
 
         if (!isAuthorized() && (type != "authorize")) {
             LERROR("Connection is not authorized");
@@ -188,6 +191,8 @@ void Connection::handleJson(const nlohmann::json& json) {
         }
     }
     else {
+        ZoneScopedN("Existing Topic");
+
         if (!isAuthorized()) {
             LERROR("Connection is not authorized");
             return;
diff --git a/modules/server/src/topics/getpropertytopic.cpp b/modules/server/src/topics/getpropertytopic.cpp
index 4c0f037ba6..9089704baf 100644
--- a/modules/server/src/topics/getpropertytopic.cpp
+++ b/modules/server/src/topics/getpropertytopic.cpp
@@ -52,14 +52,18 @@ namespace {
 namespace openspace {
 
 void GetPropertyTopic::handleJson(const nlohmann::json& json) {
+    ZoneScoped;
+
     const std::string requestedKey = json.at("property").get<std::string>();
+    ZoneText(requestedKey.c_str(), requestedKey.size());
     LDEBUG("Getting property '" + requestedKey + "'...");
     nlohmann::json response;
     if (requestedKey == AllPropertiesValue) {
         response = allProperties();
     }
     else if (requestedKey == AllNodesValue) {
-        response = wrappedPayload(sceneGraph()->allSceneGraphNodes());
+        const std::vector<SceneGraphNode*>& nodes = sceneGraph()->allSceneGraphNodes();
+        response = wrappedPayload(nodes);
     }
     else if (requestedKey == AllScreenSpaceRenderablesValue) {
         response = wrappedPayload({
diff --git a/modules/skybrowser/src/wwtdatahandler.cpp b/modules/skybrowser/src/wwtdatahandler.cpp
index 7da2fe075b..3789c998a2 100644
--- a/modules/skybrowser/src/wwtdatahandler.cpp
+++ b/modules/skybrowser/src/wwtdatahandler.cpp
@@ -253,6 +253,8 @@ namespace openspace {
 void WwtDataHandler::loadImages(const std::string& root,
                                 const std::filesystem::path& directory)
 {
+    ZoneScoped;
+
     // Steps to download new images
     // 1. Create the target directory if it doesn't already exist
     // 2. If the 'root' has an associated hash file, download and compare it with the
diff --git a/src/data/dataloader.cpp b/src/data/dataloader.cpp
index 9402acc9bc..bf3c16bae7 100644
--- a/src/data/dataloader.cpp
+++ b/src/data/dataloader.cpp
@@ -40,7 +40,7 @@
 #include <string_view>
 
 namespace {
-    constexpr int8_t DataCacheFileVersion = 12;
+    constexpr int8_t DataCacheFileVersion = 13;
     constexpr int8_t LabelCacheFileVersion = 11;
     constexpr int8_t ColorCacheFileVersion = 11;
 
@@ -224,16 +224,9 @@ std::optional<Dataset> loadCachedFile(const std::filesystem::path& path) {
     file.read(reinterpret_cast<char*>(&nEntries), sizeof(uint64_t));
     result.entries.reserve(nEntries);
     for (uint64_t i = 0; i < nEntries; i += 1) {
-        ZoneScopedN("Dataset");
-
         Dataset::Entry e;
         file.read(reinterpret_cast<char*>(&e.position.x), 3 * sizeof(float));
 
-        uint16_t nValues = 0;
-        file.read(reinterpret_cast<char*>(&nValues), sizeof(uint16_t));
-        e.data.resize(nValues);
-        file.read(reinterpret_cast<char*>(e.data.data()), nValues * sizeof(float));
-
         // For now we just store the length of the comment. Since the comments are stored
         // in one block after the data entries, we can use the length later to extract the
         // contents of this entries comment out of the big block
@@ -251,6 +244,17 @@ std::optional<Dataset> loadCachedFile(const std::filesystem::path& path) {
         result.entries.push_back(std::move(e));
     }
 
+    //
+    // Read the data values next
+    uint16_t nValues = 0;
+    file.read(reinterpret_cast<char*>(&nValues), sizeof(uint16_t));
+    std::vector<float> entriesBuffer;
+    entriesBuffer.resize(nEntries * nValues);
+    file.read(
+        reinterpret_cast<char*>(entriesBuffer.data()),
+        nEntries * nValues * sizeof(float)
+    );
+
     //
     // Read comments in one block and then assign them to the data entries
     uint64_t totalCommentLength = 0;
@@ -258,18 +262,28 @@ std::optional<Dataset> loadCachedFile(const std::filesystem::path& path) {
     std::vector<char> commentBuffer;
     commentBuffer.resize(totalCommentLength);
     file.read(commentBuffer.data(), totalCommentLength);
-    // idx is the running index into the total comment buffer
-    int idx = 0;
+
+    //
+    // Now we have the comments and the data values, we need to implant them into the
+    // data entries
+
+    // commentIdx is the running index into the total comment buffer
+    int commentIdx = 0;
+    int valuesIdx = 0;
     for (Dataset::Entry& e : result.entries) {
+        e.data.resize(nValues);
+        std::memcpy(e.data.data(), entriesBuffer.data() + valuesIdx, nValues);
+        valuesIdx += nValues;
+
         if (e.comment.has_value()) {
-            ghoul_assert(idx < commentBuffer.size(), "Index too large");
+            ghoul_assert(commentIdx < commentBuffer.size(), "Index too large");
 
             // If we have a comment, we need to extract its length's worth of characters
             // from the buffer
-            std::memcpy(e.comment->data(), &commentBuffer[idx], e.comment->size());
+            std::memcpy(e.comment->data(), &commentBuffer[commentIdx], e.comment->size());
 
             // and then advance the index
-            idx += e.comment->size();
+            commentIdx += e.comment->size();
         }
     }
 
@@ -337,19 +351,19 @@ void saveCachedFile(const Dataset& dataset, const std::filesystem::path& path) {
     checkSize<uint64_t>(dataset.entries.size(), "Too many entries");
     uint64_t nEntries = static_cast<uint64_t>(dataset.entries.size());
     file.write(reinterpret_cast<const char*>(&nEntries), sizeof(uint64_t));
+
+    // We assume the number of values for each dataset to be the same, so we can store
+    // them upfront
+    uint16_t nValues = dataset.entries.empty() ? 0 : dataset.entries[0].data.size();
+    checkSize<uint16_t>(nValues, "Too many data variables");
+    std::vector<float> valuesBuffer;
+    valuesBuffer.reserve(dataset.entries.size() * nValues);
+
     uint64_t totalCommentLength = 0;
     for (const Dataset::Entry& e : dataset.entries) {
-        file.write(reinterpret_cast<const char*>(&e.position.x), sizeof(float));
-        file.write(reinterpret_cast<const char*>(&e.position.y), sizeof(float));
-        file.write(reinterpret_cast<const char*>(&e.position.z), sizeof(float));
+        file.write(reinterpret_cast<const char*>(&e.position.x), 3 * sizeof(float));
 
-        checkSize<uint16_t>(e.data.size(), "Too many data variables");
-        uint16_t nValues = static_cast<uint16_t>(e.data.size());
-        file.write(reinterpret_cast<const char*>(&nValues), sizeof(uint16_t));
-        file.write(
-            reinterpret_cast<const char*>(e.data.data()),
-            e.data.size() * sizeof(float)
-        );
+        valuesBuffer.insert(valuesBuffer.end(), e.data.begin(), e.data.end());
 
         if (e.comment.has_value()) {
             checkSize<uint16_t>(e.comment->size(), "Comment too long");
@@ -359,11 +373,15 @@ void saveCachedFile(const Dataset& dataset, const std::filesystem::path& path) {
             0;
         file.write(reinterpret_cast<const char*>(&commentLen), sizeof(uint16_t));
         totalCommentLength += commentLen;
-        //if (e.comment.has_value()) {
-        //    file.write(e.comment->data(), e.comment->size());
-        //}
     }
 
+    // Write all of the datavalues next
+    file.write(reinterpret_cast<const char*>(&nValues), sizeof(uint16_t));
+    file.write(
+        reinterpret_cast<const char*>(valuesBuffer.data()),
+        valuesBuffer.size() * sizeof(float)
+    );
+
     //
     // Write all of the comments next. We don't have to store the individual comment
     // lengths as the data values written before already have those stored. And since we
diff --git a/src/engine/openspaceengine.cpp b/src/engine/openspaceengine.cpp
index cb64544433..54d74d0f65 100644
--- a/src/engine/openspaceengine.cpp
+++ b/src/engine/openspaceengine.cpp
@@ -757,11 +757,10 @@ void OpenSpaceEngine::loadAssets() {
 
     std::unique_ptr<SceneInitializer> sceneInitializer;
     if (global::configuration->useMultithreadedInitialization) {
-        const unsigned int nAvailableThreads = std::max(
-            std::thread::hardware_concurrency() / 2,
+        const unsigned int nThreads = std::max(
+            std::thread::hardware_concurrency() / 4,
             4u
         );
-        const unsigned int nThreads = nAvailableThreads == 0 ? 2 : nAvailableThreads;
         sceneInitializer = std::make_unique<MultiThreadedSceneInitializer>(nThreads);
     }
     else {
diff --git a/src/scripting/scriptengine.cpp b/src/scripting/scriptengine.cpp
index 1fbadf409f..f7361e9705 100644
--- a/src/scripting/scriptengine.cpp
+++ b/src/scripting/scriptengine.cpp
@@ -165,6 +165,7 @@ bool ScriptEngine::hasLibrary(const std::string& name) {
 
 bool ScriptEngine::runScript(const std::string& script, const ScriptCallback& callback) {
     ZoneScoped;
+    ZoneText(script.c_str(), script.size());
 
     ghoul_assert(!script.empty(), "Script must not be empty");
 
@@ -177,7 +178,7 @@ bool ScriptEngine::runScript(const std::string& script, const ScriptCallback& ca
         if (callback) {
             ghoul::Dictionary returnValue =
                 ghoul::lua::loadArrayDictionaryFromString(script, _state);
-            callback(returnValue);
+            callback(std::move(returnValue));
         }
         else {
             ghoul::lua::runScript(_state, script);
diff --git a/support/coding/codegen b/support/coding/codegen
index ef31f904b6..e8fe5144e0 160000
--- a/support/coding/codegen
+++ b/support/coding/codegen
@@ -1 +1 @@
-Subproject commit ef31f904b6ee02c5d1cc4c4bbddef821dbb505c8
+Subproject commit e8fe5144e0903e85ca931b6c59992119579aeb69

From 2203eb6df66c27d21fd70613a2d8ffa0a8a10286 Mon Sep 17 00:00:00 2001
From: Alexander Bock <alexander.bock@liu.se>
Date: Thu, 28 Mar 2024 16:05:06 +0100
Subject: [PATCH 346/701] Enable memory profiling and fix compile issues when
 building without tracy

---
 apps/OpenSpace/CMakeLists.txt | 3 +++
 apps/OpenSpace/ext/sgct       | 2 +-
 ext/ghoul                     | 2 +-
 3 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/apps/OpenSpace/CMakeLists.txt b/apps/OpenSpace/CMakeLists.txt
index f79ee8f174..3afa51cfed 100644
--- a/apps/OpenSpace/CMakeLists.txt
+++ b/apps/OpenSpace/CMakeLists.txt
@@ -115,6 +115,9 @@ set(SGCT_DEP_INCLUDE_FREETYPE OFF CACHE BOOL "" FORCE)
 set(SGCT_DEP_INCLUDE_FMT OFF CACHE BOOL "" FORCE)
 set(SGCT_DEP_INCLUDE_SCN OFF CACHE BOOL "" FORCE)
 set(SGCT_DEP_INCLUDE_CATCH2 OFF CACHE BOOL "" FORCE)
+if (TRACY_ENABLE)
+  set(SGCT_MEMORY_PROFILING ON CACHE BOOL "" FORCE)
+endif ()
 
 add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/ext/sgct)
 target_link_libraries(OpenSpace PRIVATE sgct)
diff --git a/apps/OpenSpace/ext/sgct b/apps/OpenSpace/ext/sgct
index 49d1c03a28..3a92028182 160000
--- a/apps/OpenSpace/ext/sgct
+++ b/apps/OpenSpace/ext/sgct
@@ -1 +1 @@
-Subproject commit 49d1c03a2857d370afcb419c361a158cda0e31a7
+Subproject commit 3a9202818242eb707f34093e068cf9b8f8f9dbb1
diff --git a/ext/ghoul b/ext/ghoul
index c6d49eda51..9198ad2135 160000
--- a/ext/ghoul
+++ b/ext/ghoul
@@ -1 +1 @@
-Subproject commit c6d49eda51ce34e729bf931d69e638c73c8e254a
+Subproject commit 9198ad2135c73dea10168a8f6e9072b95755ae52

From 5115638c097266647bc89c30ad71a42637c6f065 Mon Sep 17 00:00:00 2001
From: Alexander Bock <alexander.bock@liu.se>
Date: Thu, 28 Mar 2024 16:39:44 +0100
Subject: [PATCH 347/701] Disable memory profiling again as it causes
 exceptions in tracy

---
 apps/OpenSpace/CMakeLists.txt | 3 ---
 ext/ghoul                     | 2 +-
 2 files changed, 1 insertion(+), 4 deletions(-)

diff --git a/apps/OpenSpace/CMakeLists.txt b/apps/OpenSpace/CMakeLists.txt
index 3afa51cfed..f79ee8f174 100644
--- a/apps/OpenSpace/CMakeLists.txt
+++ b/apps/OpenSpace/CMakeLists.txt
@@ -115,9 +115,6 @@ set(SGCT_DEP_INCLUDE_FREETYPE OFF CACHE BOOL "" FORCE)
 set(SGCT_DEP_INCLUDE_FMT OFF CACHE BOOL "" FORCE)
 set(SGCT_DEP_INCLUDE_SCN OFF CACHE BOOL "" FORCE)
 set(SGCT_DEP_INCLUDE_CATCH2 OFF CACHE BOOL "" FORCE)
-if (TRACY_ENABLE)
-  set(SGCT_MEMORY_PROFILING ON CACHE BOOL "" FORCE)
-endif ()
 
 add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/ext/sgct)
 target_link_libraries(OpenSpace PRIVATE sgct)
diff --git a/ext/ghoul b/ext/ghoul
index 9198ad2135..c26a8b1686 160000
--- a/ext/ghoul
+++ b/ext/ghoul
@@ -1 +1 @@
-Subproject commit 9198ad2135c73dea10168a8f6e9072b95755ae52
+Subproject commit c26a8b1686732143892ab063de4a9c60c6dd3240

From 9cf5e55ad6fed5ea0d2c514138cab4ab76052d32 Mon Sep 17 00:00:00 2001
From: Alexander Bock <alexander.bock@liu.se>
Date: Thu, 28 Mar 2024 17:57:15 +0100
Subject: [PATCH 348/701] Update codegen submodule

---
 support/coding/codegen | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/support/coding/codegen b/support/coding/codegen
index e8fe5144e0..7dcdb14583 160000
--- a/support/coding/codegen
+++ b/support/coding/codegen
@@ -1 +1 @@
-Subproject commit e8fe5144e0903e85ca931b6c59992119579aeb69
+Subproject commit 7dcdb145830916da1202efb1707ce9890193b606

From 48ba2d776d56ea0de8ce3a8f0b3fdecd04b50df3 Mon Sep 17 00:00:00 2001
From: Alexander Bock <alexander.bock@liu.se>
Date: Thu, 28 Mar 2024 20:15:44 +0100
Subject: [PATCH 349/701] Update third party licenses. Add text and remove
 unused libraries

---
 LICENSE.md              |    5 +-
 THIRD_PARTY_LICENSES.md | 1167 +++++++++++++++++++++++++++++++++++++++
 apps/OpenSpace/ext/sgct |    2 +-
 ext/ghoul               |    2 +-
 ext/tinythread.cpp      |  303 ----------
 ext/tinythread.h        |  714 ------------------------
 ext/vld/lib/vld.lib     |  Bin 6348 -> 0 bytes
 ext/vld/vld.h           |  343 ------------
 ext/vld/vld_def.h       |   46 --
 9 files changed, 1173 insertions(+), 1409 deletions(-)
 create mode 100644 THIRD_PARTY_LICENSES.md
 delete mode 100644 ext/tinythread.cpp
 delete mode 100644 ext/tinythread.h
 delete mode 100644 ext/vld/lib/vld.lib
 delete mode 100644 ext/vld/vld.h
 delete mode 100644 ext/vld/vld_def.h

diff --git a/LICENSE.md b/LICENSE.md
index 7c377d85c8..410a6a9215 100644
--- a/LICENSE.md
+++ b/LICENSE.md
@@ -1,4 +1,4 @@
-Copyright (c) 2014-2023
+Copyright (c) 2014-2024
 
 Permission is hereby granted, free of charge, to any person obtaining a copy of this
 software and associated documentation files (the "Software"), to deal in the Software
@@ -16,3 +16,6 @@ PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIG
 HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF
 CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE
 OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+See the THIRD_PARTY_LICENSES.md for a list an acknowledgement of all external libraries that
+SGCT uses.
diff --git a/THIRD_PARTY_LICENSES.md b/THIRD_PARTY_LICENSES.md
new file mode 100644
index 0000000000..5761b146e4
--- /dev/null
+++ b/THIRD_PARTY_LICENSES.md
@@ -0,0 +1,1167 @@
+# Third Party Licenses
+This file lists all of the licenses for third-party libraries that are used to make OpenSpace.
+
+
+
+## curl
+https://curl.se
+
+
+Copyright (c) 1996 - 2024, Daniel Stenberg, daniel@haxx.se, and many contributors, see the THANKS file.
+
+All rights reserved.
+
+Permission to use, copy, modify, and distribute this software for any purpose with or without fee is hereby granted, provided that the above copyright notice and this permission notice appear in all copies.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT OF THIRD PARTY RIGHTS. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+Except as contained in this notice, the name of a copyright holder shall not be used in advertising or otherwise to promote the sale, use or other dealings in this Software without prior written authorization of the copyright holder.
+
+
+
+## date
+https://howardhinnant.github.io/date/date.html
+
+
+The MIT License (MIT)
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
+
+
+
+## Ghoul - General Helpful Open Utility Library
+https://github.com/OpenSpace/Ghoul
+
+
+Copyright (c) 2012-2024
+
+Permission is hereby granted, free of charge, to any person obtaining a copy of this
+software and associated documentation files (the "Software"), to deal in the Software
+without restriction, including without limitation the rights to use, copy, modify,
+merge, publish, distribute, sublicense, and/or sell copies of the Software, and to
+permit persons to whom the Software is furnished to do so, subject to the following
+conditions:
+
+The above copyright notice and this permission notice shall be included in all copies
+or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED,
+INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A
+PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF
+CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE
+OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+
+
+### catch2
+https://github.com/catchorg/Catch2
+
+
+Boost Software License - Version 1.0 - August 17th, 2003
+
+Permission is hereby granted, free of charge, to any person or organization
+obtaining a copy of the software and accompanying documentation covered by
+this license (the "Software") to use, reproduce, display, distribute,
+execute, and transmit the Software, and to prepare derivative works of the
+Software, and to permit third-parties to whom the Software is furnished to
+do so, all subject to the following:
+
+The copyright notices in the Software and this entire statement, including
+the above license grant, this restriction and the following disclaimer,
+must be included in all copies of the Software, in whole or in part, and
+all derivative works of the Software, unless such copies or derivative
+works are solely in the form of machine-executable object code generated by
+a source language processor.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT
+SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE
+FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE,
+ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+DEALINGS IN THE SOFTWARE.
+
+
+
+### glbinding
+https://glbinding.org/
+
+
+Copyright (c) 2014-2023 Computer Graphics Systems Group at the Hasso-Plattner-Institute, Digital Engineering Company, University of Potsdam and CG Internals, Germany. 
+
+Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+
+
+### GLM
+https://github.com/g-truc/glm
+
+
+Copyright (c) 2005 - G-Truc Creation
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.
+
+
+
+### JSON for Modern C++
+https://github.com/nlohmann/json
+
+
+    __ _____ _____ _____
+ __|  |   __|     |   | |  JSON for Modern C++
+|  |  |__   |  |  | | | |  version 3.9.1
+|_____|_____|_____|_|___|  https://github.com/nlohmann/json
+
+Licensed under the MIT License <http://opensource.org/licenses/MIT>.
+SPDX-License-Identifier: MIT
+Copyright (c) 2013-2019 Niels Lohmann <http://nlohmann.me>.
+
+Permission is hereby  granted, free of charge, to any  person obtaining a copy
+of this software and associated  documentation files (the "Software"), to deal
+in the Software  without restriction, including without  limitation the rights
+to  use, copy,  modify, merge,  publish, distribute,  sublicense, and/or  sell
+copies  of  the Software,  and  to  permit persons  to  whom  the Software  is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE  IS PROVIDED "AS  IS", WITHOUT WARRANTY  OF ANY KIND,  EXPRESS OR
+IMPLIED,  INCLUDING BUT  NOT  LIMITED TO  THE  WARRANTIES OF  MERCHANTABILITY,
+FITNESS FOR  A PARTICULAR PURPOSE AND  NONINFRINGEMENT. IN NO EVENT  SHALL THE
+AUTHORS  OR COPYRIGHT  HOLDERS  BE  LIABLE FOR  ANY  CLAIM,  DAMAGES OR  OTHER
+LIABILITY, WHETHER IN AN ACTION OF  CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE  OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
+
+
+
+### Lua
+https://lua.org/
+
+
+Copyright (C) 1994-2017 Lua.org, PUC-Rio.
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of this software and associated documentation files (the
+"Software"), to deal in the Software without restriction, including
+without limitation the rights to use, copy, modify, merge, publish,
+distribute, sublicense, and/or sell copies of the Software, and to
+permit persons to whom the Software is furnished to do so, subject to
+the following conditions:
+
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
+CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
+TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
+SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+
+
+### LZ4
+https://lz4.org/
+
+
+LZ4 Library
+Copyright (c) 2011-2014, Yann Collet
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without modification,
+are permitted provided that the following conditions are met:
+
+* Redistributions of source code must retain the above copyright notice, this
+  list of conditions and the following disclaimer.
+
+* Redistributions in binary form must reproduce the above copyright notice, this
+  list of conditions and the following disclaimer in the documentation and/or
+  other materials provided with the distribution.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR
+ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+
+
+### RenderDoc
+https://renderdoc.org/
+
+
+Copyright (c) 2019-2023 Baldur Karlsson
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.
+
+
+
+### scnlib
+scnlib/blob/master/LICENSE
+
+
+Copyright 2017 Elias Kosunen
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    https://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+
+
+
+### Open Asset Import Library (assimp)
+https://www.assimp.org/
+
+
+Copyright (c) 2006-2021, assimp team
+All rights reserved.
+
+Redistribution and use of this software in source and binary forms,
+with or without modification, are permitted provided that the
+following conditions are met:
+
+* Redistributions of source code must retain the above
+  copyright notice, this list of conditions and the
+  following disclaimer.
+
+* Redistributions in binary form must reproduce the above
+  copyright notice, this list of conditions and the
+  following disclaimer in the documentation and/or other
+  materials provided with the distribution.
+
+* Neither the name of the assimp team, nor the names of its
+  contributors may be used to endorse or promote products
+  derived from this software without specific prior
+  written permission of the assimp team.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+
+
+#### Poly2Tri
+http://code.google.com/p/poly2tri/
+
+
+Poly2Tri Copyright (c) 2009-2010, Poly2Tri Contributors
+http://code.google.com/p/poly2tri/
+
+All rights reserved.
+Redistribution and use in source and binary forms, with or without modification,
+are permitted provided that the following conditions are met:
+
+* Redistributions of source code must retain the above copyright notice,
+  this list of conditions and the following disclaimer.
+* Redistributions in binary form must reproduce the above copyright notice,
+  this list of conditions and the following disclaimer in the documentation
+  and/or other materials provided with the distribution.
+* Neither the name of Poly2Tri nor the names of its contributors may be
+  used to endorse or promote products derived from this software without specific
+  prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR
+CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+
+
+### Freetype2
+https://www.freetype.org
+
+
+Portions of this software are copyright © 2024 The FreeType
+Project (www.freetype.org).  All rights reserved.
+
+
+
+### Stackwalker
+https://github.com/JochenKalmbach/StackWalker
+
+
+Copyright (c) 2005 - 2019, Jochen Kalmbach
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+
+1. Redistributions of source code must retain the above copyright notice, this
+   list of conditions and the following disclaimer.
+
+2. Redistributions in binary form must reproduce the above copyright notice,
+   this list of conditions and the following disclaimer in the documentation
+   and/or other materials provided with the distribution.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
+FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+
+
+
+### stb_image
+https://github.com/nothings/stb
+
+
+This is free and unencumbered software released into the public domain.
+Anyone is free to copy, modify, publish, use, compile, sell, or distribute this
+software, either in source code form or as a compiled binary, for any purpose,
+commercial or non-commercial, and by any means.
+In jurisdictions that recognize copyright laws, the author or authors of this
+software dedicate any and all copyright interest in the software to the public
+domain. We make this dedication for the benefit of the public at large and to
+the detriment of our heirs and successors. We intend this dedication to be an
+overt act of relinquishment in perpetuity of all present and future rights to
+this software under copyright law.
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
+ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+
+### Tiny Process Library
+https://github.com/eidheim/tiny-process-library
+
+
+Copyright (c) 2015-2020 Ole Christian Eidheim
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
+
+
+
+### Tracy
+https://github.com/wolfpld/tracy
+
+
+Copyright (c) 2017-2023, Bartosz Taudul <wolf@nereid.pl>
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+    * Redistributions of source code must retain the above copyright
+      notice, this list of conditions and the following disclaimer.
+    * Redistributions in binary form must reproduce the above copyright
+      notice, this list of conditions and the following disclaimer in the
+      documentation and/or other materials provided with the distribution.
+    * Neither the name of the <organization> nor the
+      names of its contributors may be used to endorse or promote products
+      derived from this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+DISCLAIMED. IN NO EVENT SHALL <COPYRIGHT HOLDER> BE LIABLE FOR ANY
+DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+
+
+
+### WebsocketPP
+https://www.zaphoyd.com/projects/websocketpp/
+
+
+Copyright (c) 2014, Peter Thorson. All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+    * Redistributions of source code must retain the above copyright
+      notice, this list of conditions and the following disclaimer.
+    * Redistributions in binary form must reproduce the above copyright
+      notice, this list of conditions and the following disclaimer in the
+      documentation and/or other materials provided with the distribution.
+    * Neither the name of the WebSocket++ Project nor the
+      names of its contributors may be used to endorse or promote products
+      derived from this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ARE DISCLAIMED. IN NO EVENT SHALL PETER THORSON BE LIABLE FOR ANY
+DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+
+
+#### base64 library
+https://github.com/ReneNyffenegger/cpp-base64
+
+
+Copyright (C) 2004-2008 René Nyffenegger
+
+This source code is provided 'as-is', without any express or implied
+warranty. In no event will the author be held liable for any damages
+arising from the use of this software.
+
+Permission is granted to anyone to use this software for any purpose,
+including commercial applications, and to alter it and redistribute it
+freely, subject to the following restrictions:
+
+1. The origin of this source code must not be misrepresented; you must not
+  claim that you wrote the original source code. If you use this source code
+  in a product, an acknowledgment in the product documentation would be
+  appreciated but is not required.
+
+2. Altered source versions must be plainly marked as such, and must not be
+  misrepresented as being the original source code.
+
+3. This notice may not be removed or altered from any source distribution.
+
+René Nyffenegger rene.nyffenegger@adp-gmbh.ch
+
+
+
+### MD5 Library
+Copyright (C) 1999, 2002 Aladdin Enterprises.  All rights reserved.
+
+This software is provided 'as-is', without any express or implied
+warranty.  In no event will the authors be held liable for any damages
+arising from the use of this software.
+
+Permission is granted to anyone to use this software for any purpose,
+including commercial applications, and to alter it and redistribute it
+freely, subject to the following restrictions:
+
+1. The origin of this software must not be misrepresented; you must not
+ claim that you wrote the original software. If you use this software
+ in a product, an acknowledgment in the product documentation would be
+ appreciated but is not required.
+2. Altered source versions must be plainly marked as such, and must not be
+ misrepresented as being the original software.
+3. This notice may not be removed or altered from any source distribution.
+
+L. Peter Deutsch
+ghost@aladdin.com
+
+
+#### SHA-1 library
+http://code.google.com/p/smallsha1/
+
+
+Copyright (c) 2011, Micael Hildenborg
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+   * Redistributions of source code must retain the above copyright
+     notice, this list of conditions and the following disclaimer.
+   * Redistributions in binary form must reproduce the above copyright
+     notice, this list of conditions and the following disclaimer in the
+     documentation and/or other materials provided with the distribution.
+   * Neither the name of Micael Hildenborg nor the
+     names of its contributors may be used to endorse or promote products
+     derived from this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY Micael Hildenborg ''AS IS'' AND ANY
+EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+DISCLAIMED. IN NO EVENT SHALL Micael Hildenborg BE LIABLE FOR ANY
+DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+
+#### UTF8 Validation logic
+Copyright (c) 2008-2009 Bjoern Hoehrmann <bjoern@hoehrmann.de>
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
+
+
+## JSON for Modern C++
+https://github.com/nlohmann/json
+
+
+    __ _____ _____ _____
+ __|  |   __|     |   | |  JSON for Modern C++
+|  |  |__   |  |  | | | |  version 3.9.1
+|_____|_____|_____|_|___|  https://github.com/nlohmann/json
+
+Licensed under the MIT License <http://opensource.org/licenses/MIT>.
+SPDX-License-Identifier: MIT
+Copyright (c) 2013-2019 Niels Lohmann <http://nlohmann.me>.
+
+Permission is hereby  granted, free of charge, to any  person obtaining a copy
+of this software and associated  documentation files (the "Software"), to deal
+in the Software  without restriction, including without  limitation the rights
+to  use, copy,  modify, merge,  publish, distribute,  sublicense, and/or  sell
+copies  of  the Software,  and  to  permit persons  to  whom  the Software  is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE  IS PROVIDED "AS  IS", WITHOUT WARRANTY  OF ANY KIND,  EXPRESS OR
+IMPLIED,  INCLUDING BUT  NOT  LIMITED TO  THE  WARRANTIES OF  MERCHANTABILITY,
+FITNESS FOR  A PARTICULAR PURPOSE AND  NONINFRINGEMENT. IN NO EVENT  SHALL THE
+AUTHORS  OR COPYRIGHT  HOLDERS  BE  LIABLE FOR  ANY  CLAIM,  DAMAGES OR  OTHER
+LIABILITY, WHETHER IN AN ACTION OF  CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE  OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
+
+
+
+## Simple Graphics Cluster Toolkit
+https://github.com/sgct/sgct
+
+
+Simple Graphics Cluster Toolkit
+
+Copyright (c) 2012-2023
+Miroslav Andel, Linköping University
+Alexander Bock, Linköping University
+
+Contributors: Alexander Fridlund, Joel Kronander, Daniel Jönsson, Erik Sundén, Gene Payne,
+              Peter Steneteg
+
+For any questions or information about the project contact: alexander.bock@liu.se
+
+Redistribution and use in source and binary forms, with or without modification, are
+permitted provided that the following conditions are met:
+
+1. Redistributions of source code must retain the above copyright notice, this list of
+   conditions and the following disclaimer.
+2. Redistributions in binary form must reproduce the above copyright notice, this list of
+   conditions and the following disclaimer in the documentation and/or other materials
+   provided with the distribution.
+3. Neither the name of the copyright holder nor the names of its contributors may be used
+   to endorse or promote products derived from this software without specific prior
+   written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS 'AS IS' AND ANY
+EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+COPYRIGHT HOLDERS AND CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT INCIDENTAL, SPECIAL,
+EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR
+TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+
+
+### catch2
+https://github.com/catchorg/Catch2
+
+
+Boost Software License - Version 1.0 - August 17th, 2003
+
+Permission is hereby granted, free of charge, to any person or organization
+obtaining a copy of the software and accompanying documentation covered by
+this license (the "Software") to use, reproduce, display, distribute,
+execute, and transmit the Software, and to prepare derivative works of the
+Software, and to permit third-parties to whom the Software is furnished to
+do so, all subject to the following:
+
+The copyright notices in the Software and this entire statement, including
+the above license grant, this restriction and the following disclaimer,
+must be included in all copies of the Software, in whole or in part, and
+all derivative works of the Software, unless such copies or derivative
+works are solely in the form of machine-executable object code generated by
+a source language processor.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT
+SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE
+FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE,
+ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+DEALINGS IN THE SOFTWARE.
+
+
+
+### Freetype2
+https://www.freetype.org
+
+
+Portions of this software are copyright © 2024 The FreeType
+Project (www.freetype.org).  All rights reserved.
+
+
+
+### GLAD
+https://github.com/Dav1dde/glad
+
+
+The MIT License (MIT)
+
+Copyright (c) 2013-2022 David Herberth
+
+Permission is hereby granted, free of charge, to any person obtaining a copy of
+this software and associated documentation files (the "Software"), to deal in
+the Software without restriction, including without limitation the rights to
+use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
+the Software, and to permit persons to whom the Software is furnished to do so,
+subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
+FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
+COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
+IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+
+
+### GLFW
+https://www.glfw.org/
+
+
+Copyright (c) 2002-2006 Marcus Geelnard
+
+Copyright (c) 2006-2019 Camilla Löwy
+
+This software is provided 'as-is', without any express or implied
+warranty. In no event will the authors be held liable for any damages
+arising from the use of this software.
+
+Permission is granted to anyone to use this software for any purpose,
+including commercial applications, and to alter it and redistribute it
+freely, subject to the following restrictions:
+
+1. The origin of this software must not be misrepresented; you must not
+   claim that you wrote the original software. If you use this software
+   in a product, an acknowledgment in the product documentation would
+   be appreciated but is not required.
+
+2. Altered source versions must be plainly marked as such, and must not
+   be misrepresented as being the original software.
+
+3. This notice may not be removed or altered from any source
+   distribution.
+
+
+
+### GLM
+https://github.com/g-truc/glm
+
+
+Copyright (c) 2005 - G-Truc Creation
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.
+
+
+
+### JSON for Modern C++
+https://github.com/nlohmann/json
+
+
+    __ _____ _____ _____
+ __|  |   __|     |   | |  JSON for Modern C++
+|  |  |__   |  |  | | | |  version 3.9.1
+|_____|_____|_____|_|___|  https://github.com/nlohmann/json
+
+Licensed under the MIT License <http://opensource.org/licenses/MIT>.
+SPDX-License-Identifier: MIT
+Copyright (c) 2013-2019 Niels Lohmann <http://nlohmann.me>.
+
+Permission is hereby  granted, free of charge, to any  person obtaining a copy
+of this software and associated  documentation files (the "Software"), to deal
+in the Software  without restriction, including without  limitation the rights
+to  use, copy,  modify, merge,  publish, distribute,  sublicense, and/or  sell
+copies  of  the Software,  and  to  permit persons  to  whom  the Software  is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE  IS PROVIDED "AS  IS", WITHOUT WARRANTY  OF ANY KIND,  EXPRESS OR
+IMPLIED,  INCLUDING BUT  NOT  LIMITED TO  THE  WARRANTIES OF  MERCHANTABILITY,
+FITNESS FOR  A PARTICULAR PURPOSE AND  NONINFRINGEMENT. IN NO EVENT  SHALL THE
+AUTHORS  OR COPYRIGHT  HOLDERS  BE  LIABLE FOR  ANY  CLAIM,  DAMAGES OR  OTHER
+LIABILITY, WHETHER IN AN ACTION OF  CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE  OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
+
+
+
+### Modern C++ JSON schema validator
+https://github.com/pboettch/json-schema-validator
+
+
+Modern C++ JSON schema validator is licensed under the MIT License
+<http://opensource.org/licenses/MIT>:
+
+Copyright (c) 2016 Patrick Boettcher
+
+Permission is hereby granted, free of charge, to any person obtaining a copy of
+this software and associated documentation files (the "Software"), to deal in
+the Software without restriction, including without limitation the rights to
+use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies
+of the Software, and to permit persons to whom the Software is furnished to do
+so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
+
+
+
+### LIBPNG
+   There is no warranty against interference with your enjoyment of the
+   library or against infringement.  There is no warranty that our
+   efforts or the library will fulfill any of your particular purposes
+   or needs.  This library is provided with all faults, and the entire
+   risk of satisfactory quality, performance, accuracy, and effort is with
+   the user.
+
+libpng versions 0.97, January 1998, through 1.0.6, March 20, 2000, are
+Copyright (c) 1998, 1999 Glenn Randers-Pehrson, and are
+distributed according to the same disclaimer and license as libpng-0.96,
+with the following individuals added to the list of Contributing Authors:
+
+   Tom Lane
+   Glenn Randers-Pehrson
+   Willem van Schaik
+
+libpng versions 0.89, June 1996, through 0.96, May 1997, are
+Copyright (c) 1996, 1997 Andreas Dilger
+Distributed according to the same disclaimer and license as libpng-0.88,
+with the following individuals added to the list of Contributing Authors:
+
+   John Bowler
+   Kevin Bracey
+   Sam Bushell
+   Magnus Holmgren
+   Greg Roelofs
+   Tom Tanner
+
+libpng versions 0.5, May 1995, through 0.88, January 1996, are
+Copyright (c) 1995, 1996 Guy Eric Schalnat, Group 42, Inc.
+
+For the purposes of this copyright and license, "Contributing Authors"
+is defined as the following set of individuals:
+
+   Andreas Dilger
+   Dave Martindale
+   Guy Eric Schalnat
+   Paul Schmidt
+   Tim Wegner
+
+The PNG Reference Library is supplied "AS IS".  The Contributing Authors
+and Group 42, Inc. disclaim all warranties, expressed or implied,
+including, without limitation, the warranties of merchantability and of
+fitness for any purpose.  The Contributing Authors and Group 42, Inc.
+assume no liability for direct, indirect, incidental, special, exemplary,
+or consequential damages, which may result from the use of the PNG
+Reference Library, even if advised of the possibility of such damage.
+
+Permission is hereby granted to use, copy, modify, and distribute this
+source code, or portions hereof, for any purpose, without fee, subject
+to the following restrictions:
+
+1. The origin of this source code must not be misrepresented.
+
+2. Altered versions must be plainly marked as such and must not
+   be misrepresented as being the original source.
+
+3. This Copyright notice may not be removed or altered from any
+   source or altered source distribution.
+
+The Contributing Authors and Group 42, Inc. specifically permit, without
+fee, and encourage the use of this source code as a component to
+supporting the PNG file format in commercial products.  If you use this
+source code in a product, acknowledgment is not required but would be
+appreciated.
+
+
+
+### OpenVR
+https://github.com/ValveSoftware/openvr
+
+
+Copyright (c) 2015, Valve Corporation
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without modification,
+are permitted provided that the following conditions are met:
+
+1. Redistributions of source code must retain the above copyright notice, this
+list of conditions and the following disclaimer.
+
+2. Redistributions in binary form must reproduce the above copyright notice,
+this list of conditions and the following disclaimer in the documentation and/or
+other materials provided with the distribution.
+
+3. Neither the name of the copyright holder nor the names of its contributors
+may be used to endorse or promote products derived from this software without
+specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR
+ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+
+
+### scnlib
+scnlib/blob/master/LICENSE
+
+
+Copyright 2017 Elias Kosunen
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    https://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+
+
+
+### SPOUT
+https://github.com/leadedge/Spout2
+
+
+Copyright (c) 2020-2024, Lynn Jarvis
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+
+1. Redistributions of source code must retain the above copyright notice, this
+   list of conditions and the following disclaimer.
+
+2. Redistributions in binary form must reproduce the above copyright notice,
+   this list of conditions and the following disclaimer in the documentation
+   and/or other materials provided with the distribution.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
+FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+
+
+### stb_image
+https://github.com/nothings/stb
+
+
+This is free and unencumbered software released into the public domain.
+Anyone is free to copy, modify, publish, use, compile, sell, or distribute this
+software, either in source code form or as a compiled binary, for any purpose,
+commercial or non-commercial, and by any means.
+In jurisdictions that recognize copyright laws, the author or authors of this
+software dedicate any and all copyright interest in the software to the public
+domain. We make this dedication for the benefit of the public at large and to
+the detriment of our heirs and successors. We intend this dedication to be an
+overt act of relinquishment in perpetuity of all present and future rights to
+this software under copyright law.
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
+ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+
+
+### TinyXML
+https://github.com/leethomason/tinyxml2
+
+
+This software is provided 'as-is', without any express or implied
+warranty. In no event will the authors be held liable for any
+damages arising from the use of this software.
+
+Permission is granted to anyone to use this software for any
+purpose, including commercial applications, and to alter it and
+redistribute it freely, subject to the following restrictions:
+
+1. The origin of this software must not be misrepresented; you must
+not claim that you wrote the original software. If you use this
+software in a product, an acknowledgment in the product documentation
+would be appreciated but is not required.
+
+2. Altered source versions must be plainly marked as such, and
+must not be misrepresented as being the original software.
+
+3. This notice may not be removed or altered from any source
+distribution.
+
+
+
+### Tracy
+https://github.com/wolfpld/tracy
+
+
+Copyright (c) 2017-2023, Bartosz Taudul <wolf@nereid.pl>
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+    * Redistributions of source code must retain the above copyright
+      notice, this list of conditions and the following disclaimer.
+    * Redistributions in binary form must reproduce the above copyright
+      notice, this list of conditions and the following disclaimer in the
+      documentation and/or other materials provided with the distribution.
+    * Neither the name of the <organization> nor the
+      names of its contributors may be used to endorse or promote products
+      derived from this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+DISCLAIMED. IN NO EVENT SHALL <COPYRIGHT HOLDER> BE LIABLE FOR ANY
+DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+
+
+### VRPN
+https://vrpn.github.io/
+
+
+Boost Software License 1.0 (BSL1.0)
+
+Permission is hereby granted, free of charge, to any person or organization obtaining a copy of the software and accompanying documentation covered by this license (the "Software") to use, reproduce, display, distribute, execute, and transmit the Software, and to prepare derivative works of the Software, and to permit third-parties to whom the Software is furnished to do so, all subject to the following:
+
+The copyright notices in the Software and this entire statement, including the above license grant, this restriction and the following disclaimer, must be included in all copies of the Software, in whole or in part, and all derivative works of the Software, unless such copies or derivative works are solely in the form of machine-executable object code generated by a source language processor.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+Additional requests follow:
+
+1. Please acknowledge this library in any publication, written, videotaped,
+	or otherwise produced, that results from making programs using it.
+	The acknowledgement will credit
+
+	CISMM Project
+	University of North Carolina at Chapel Hill,
+	Supported by the NIH/NCRR and the NIH/NIBIB.
+
+2. Please furnish us a copy of any publication, including videotape,
+	that you produce and disseminate outside your group using our
+	program.  These should be addressed to Professor R.M. Taylor
+	at taylorr@cs.unc.edu.
+
+3. Please send us derived classes and drivers for new devices that you
+	create for the library.  We will attempt to include them in
+	future releases of the library for you and others to use.  This
+	is the fastest way to get a working system for everyone.
+
+
+
+### zlib
+http://zlib.net/
+
+
+Copyright (C) 1995-2013 Jean-loup Gailly and Mark Adler
+
+This software is provided 'as-is', without any express or implied
+warranty.  In no event will the authors be held liable for any damages
+arising from the use of this software.
+
+Permission is granted to anyone to use this software for any purpose,
+including commercial applications, and to alter it and redistribute it
+freely, subject to the following restrictions:
+
+1. The origin of this software must not be misrepresented; you must not
+   claim that you wrote the original software. If you use this software
+   in a product, an acknowledgment in the product documentation would be
+   appreciated but is not required.
+2. Altered source versions must be plainly marked as such, and must not be
+   misrepresented as being the original software.
+3. This notice may not be removed or altered from any source distribution.
+
+Jean-loup Gailly        Mark Adler
+jloup@gzip.org          madler@alumni.caltech.edu
+
+
+The data format used by the zlib library is described by RFCs (Request for
+Comments) 1950 to 1952 in the files http://tools.ietf.org/html/rfc1950
+(zlib format), rfc1951 (deflate format) and rfc1952 (gzip format).
+
+
+
+## SPICE
+https://naif.jpl.nasa.gov
+
+
+The SPICE system is implemented and maintained by Caltech/Jet Propulsion Laboratory under contract to the National Aeronautics and Space Administration. It is sponsored by the Planetary Science Division of NASA's Science Mission Directorate.
+
+THIS SOFTWARE AND ANY RELATED MATERIALS WERE CREATED BY THE CALIFORNIA INSTITUTE OF TECHNOLOGY (CALTECH) UNDER A U.S. GOVERNMENT CONTRACT WITH THE NATIONAL AERONAUTICS AND SPACE ADMINISTRATION (NASA). THE SOFTWARE IS TECHNOLOGY AND SOFTWARE PUBLICLY AVAILABLE UNDER U.S. EXPORT LAWS AND IS PROVIDED "AS-IS" TO THE RECIPIENT WITHOUT WARRANTY OF ANY KIND, INCLUDING ANY WARRANTIES OF PERFORMANCE OR MERCHANTABILITY OR FITNESS FOR A PARTICULAR USE OR PURPOSE (AS SET FORTH IN UNITED STATES UCC§2312-§2313) OR FOR ANY PURPOSE WHATSOEVER, FOR THE SOFTWARE AND RELATED MATERIALS, HOWEVER USED.
+
+IN NO EVENT SHALL CALTECH, ITS JET PROPULSION LABORATORY, OR NASA BE LIABLE FOR ANY DAMAGES AND/OR COSTS, INCLUDING, BUT NOT LIMITED TO, INCIDENTAL OR CONSEQUENTIAL DAMAGES OF ANY KIND, INCLUDING ECONOMIC DAMAGE OR INJURY TO PROPERTY AND LOST PROFITS, REGARDLESS OF WHETHER CALTECH, JPL, OR NASA BE ADVISED, HAVE REASON TO KNOW, OR, IN FACT, SHALL KNOW OF THE POSSIBILITY.
+
+RECIPIENT BEARS ALL RISK RELATING TO QUALITY AND PERFORMANCE OF THE SOFTWARE AND ANY RELATED MATERIALS, AND AGREES TO INDEMNIFY CALTECH AND NASA FOR ALL THIRD-PARTY CLAIMS RESULTING FROM THE ACTIONS OF RECIPIENT IN THE USE OF THE SOFTWARE
diff --git a/apps/OpenSpace/ext/sgct b/apps/OpenSpace/ext/sgct
index 3a92028182..cbcf4aa7d5 160000
--- a/apps/OpenSpace/ext/sgct
+++ b/apps/OpenSpace/ext/sgct
@@ -1 +1 @@
-Subproject commit 3a9202818242eb707f34093e068cf9b8f8f9dbb1
+Subproject commit cbcf4aa7d5a7a248f97237ca003b1efe3a9ae17c
diff --git a/ext/ghoul b/ext/ghoul
index c26a8b1686..51a579e7c7 160000
--- a/ext/ghoul
+++ b/ext/ghoul
@@ -1 +1 @@
-Subproject commit c26a8b1686732143892ab063de4a9c60c6dd3240
+Subproject commit 51a579e7c7a5260d66a2e16944f51d6009c56ddd
diff --git a/ext/tinythread.cpp b/ext/tinythread.cpp
deleted file mode 100644
index 690eceea1a..0000000000
--- a/ext/tinythread.cpp
+++ /dev/null
@@ -1,303 +0,0 @@
-/* -*- mode: c++; tab-width: 2; indent-tabs-mode: nil; -*-
-Copyright (c) 2010-2012 Marcus Geelnard
-
-This software is provided 'as-is', without any express or implied
-warranty. In no event will the authors be held liable for any damages
-arising from the use of this software.
-
-Permission is granted to anyone to use this software for any purpose,
-including commercial applications, and to alter it and redistribute it
-freely, subject to the following restrictions:
-
-    1. The origin of this software must not be misrepresented; you must not
-    claim that you wrote the original software. If you use this software
-    in a product, an acknowledgment in the product documentation would be
-    appreciated but is not required.
-
-    2. Altered source versions must be plainly marked as such, and must not be
-    misrepresented as being the original software.
-
-    3. This notice may not be removed or altered from any source
-    distribution.
-*/
-
-#include <exception>
-#include "tinythread.h"
-
-#if defined(_TTHREAD_POSIX_)
-  #include <unistd.h>
-  #include <map>
-#elif defined(_TTHREAD_WIN32_)
-  #include <process.h>
-#endif
-
-
-namespace tthread {
-
-//------------------------------------------------------------------------------
-// condition_variable
-//------------------------------------------------------------------------------
-// NOTE 1: The Win32 implementation of the condition_variable class is based on
-// the corresponding implementation in GLFW, which in turn is based on a
-// description by Douglas C. Schmidt and Irfan Pyarali:
-// http://www.cs.wustl.edu/~schmidt/win32-cv-1.html
-//
-// NOTE 2: Windows Vista actually has native support for condition variables
-// (InitializeConditionVariable, WakeConditionVariable, etc), but we want to
-// be portable with pre-Vista Windows versions, so TinyThread++ does not use
-// Vista condition variables.
-//------------------------------------------------------------------------------
-
-#if defined(_TTHREAD_WIN32_)
-  #define _CONDITION_EVENT_ONE 0
-  #define _CONDITION_EVENT_ALL 1
-#endif
-
-#if defined(_TTHREAD_WIN32_)
-condition_variable::condition_variable() : mWaitersCount(0)
-{
-  mEvents[_CONDITION_EVENT_ONE] = CreateEvent(NULL, FALSE, FALSE, NULL);
-  mEvents[_CONDITION_EVENT_ALL] = CreateEvent(NULL, TRUE, FALSE, NULL);
-  InitializeCriticalSection(&mWaitersCountLock);
-}
-#endif
-
-#if defined(_TTHREAD_WIN32_)
-condition_variable::~condition_variable()
-{
-  CloseHandle(mEvents[_CONDITION_EVENT_ONE]);
-  CloseHandle(mEvents[_CONDITION_EVENT_ALL]);
-  DeleteCriticalSection(&mWaitersCountLock);
-}
-#endif
-
-#if defined(_TTHREAD_WIN32_)
-void condition_variable::_wait()
-{
-  // Wait for either event to become signaled due to notify_one() or
-  // notify_all() being called
-  int result = WaitForMultipleObjects(2, mEvents, FALSE, INFINITE);
-
-  // Check if we are the last waiter
-  EnterCriticalSection(&mWaitersCountLock);
-  -- mWaitersCount;
-  bool lastWaiter = (result == (WAIT_OBJECT_0 + _CONDITION_EVENT_ALL)) &&
-                    (mWaitersCount == 0);
-  LeaveCriticalSection(&mWaitersCountLock);
-
-  // If we are the last waiter to be notified to stop waiting, reset the event
-  if(lastWaiter)
-    ResetEvent(mEvents[_CONDITION_EVENT_ALL]);
-}
-#endif
-
-#if defined(_TTHREAD_WIN32_)
-void condition_variable::notify_one()
-{
-  // Are there any waiters?
-  EnterCriticalSection(&mWaitersCountLock);
-  bool haveWaiters = (mWaitersCount > 0);
-  LeaveCriticalSection(&mWaitersCountLock);
-
-  // If we have any waiting threads, send them a signal
-  if(haveWaiters)
-    SetEvent(mEvents[_CONDITION_EVENT_ONE]);
-}
-#endif
-
-#if defined(_TTHREAD_WIN32_)
-void condition_variable::notify_all()
-{
-  // Are there any waiters?
-  EnterCriticalSection(&mWaitersCountLock);
-  bool haveWaiters = (mWaitersCount > 0);
-  LeaveCriticalSection(&mWaitersCountLock);
-
-  // If we have any waiting threads, send them a signal
-  if(haveWaiters)
-    SetEvent(mEvents[_CONDITION_EVENT_ALL]);
-}
-#endif
-
-
-//------------------------------------------------------------------------------
-// POSIX pthread_t to unique thread::id mapping logic.
-// Note: Here we use a global thread safe std::map to convert instances of
-// pthread_t to small thread identifier numbers (unique within one process).
-// This method should be portable across different POSIX implementations.
-//------------------------------------------------------------------------------
-
-#if defined(_TTHREAD_POSIX_)
-static thread::id _pthread_t_to_ID(const pthread_t &aHandle)
-{
-  static mutex idMapLock;
-  static std::map<pthread_t, unsigned long int> idMap;
-  static unsigned long int idCount(1);
-
-  lock_guard<mutex> guard(idMapLock);
-  if(idMap.find(aHandle) == idMap.end())
-    idMap[aHandle] = idCount ++;
-  return thread::id(idMap[aHandle]);
-}
-#endif // _TTHREAD_POSIX_
-
-
-//------------------------------------------------------------------------------
-// thread
-//------------------------------------------------------------------------------
-
-/// Information to pass to the new thread (what to run).
-struct _thread_start_info {
-  void (*mFunction)(void *); ///< Pointer to the function to be executed.
-  void * mArg;               ///< Function argument for the thread function.
-  thread * mThread;          ///< Pointer to the thread object.
-};
-
-// Thread wrapper function.
-#if defined(_TTHREAD_WIN32_)
-unsigned WINAPI thread::wrapper_function(void * aArg)
-#elif defined(_TTHREAD_POSIX_)
-void * thread::wrapper_function(void * aArg)
-#endif
-{
-  // Get thread startup information
-  _thread_start_info * ti = (_thread_start_info *) aArg;
-
-  try
-  {
-    // Call the actual client thread function
-    ti->mFunction(ti->mArg);
-  }
-  catch(...)
-  {
-    // Uncaught exceptions will terminate the application (default behavior
-    // according to C++11)
-    std::terminate();
-  }
-
-  // The thread is no longer executing
-  lock_guard<mutex> guard(ti->mThread->mDataMutex);
-  ti->mThread->mNotAThread = true;
-
-  // The thread is responsible for freeing the startup information
-  delete ti;
-
-  return 0;
-}
-
-thread::thread(void (*aFunction)(void *), void * aArg)
-{
-  // Serialize access to this thread structure
-  lock_guard<mutex> guard(mDataMutex);
-
-  // Fill out the thread startup information (passed to the thread wrapper,
-  // which will eventually free it)
-  _thread_start_info * ti = new _thread_start_info;
-  ti->mFunction = aFunction;
-  ti->mArg = aArg;
-  ti->mThread = this;
-
-  // The thread is now alive
-  mNotAThread = false;
-
-  // Create the thread
-#if defined(_TTHREAD_WIN32_)
-  mHandle = (HANDLE) _beginthreadex(0, 0, wrapper_function, (void *) ti, 0, &mWin32ThreadID);
-#elif defined(_TTHREAD_POSIX_)
-  if(pthread_create(&mHandle, NULL, wrapper_function, (void *) ti) != 0)
-    mHandle = 0;
-#endif
-
-  // Did we fail to create the thread?
-  if(!mHandle)
-  {
-    mNotAThread = true;
-    delete ti;
-  }
-}
-
-thread::~thread()
-{
-  if(joinable())
-    std::terminate();
-}
-
-void thread::join()
-{
-  if(joinable())
-  {
-#if defined(_TTHREAD_WIN32_)
-    WaitForSingleObject(mHandle, INFINITE);
-    CloseHandle(mHandle);
-#elif defined(_TTHREAD_POSIX_)
-    pthread_join(mHandle, NULL);
-#endif
-  }
-}
-
-bool thread::joinable() const
-{
-  mDataMutex.lock();
-  bool result = !mNotAThread;
-  mDataMutex.unlock();
-  return result;
-}
-
-void thread::detach()
-{
-  mDataMutex.lock();
-  if(!mNotAThread)
-  {
-#if defined(_TTHREAD_WIN32_)
-    CloseHandle(mHandle);
-#elif defined(_TTHREAD_POSIX_)
-    pthread_detach(mHandle);
-#endif
-    mNotAThread = true;
-  }
-  mDataMutex.unlock();
-}
-
-thread::id thread::get_id() const
-{
-  if(!joinable())
-    return id();
-#if defined(_TTHREAD_WIN32_)
-  return id((unsigned long int) mWin32ThreadID);
-#elif defined(_TTHREAD_POSIX_)
-  return _pthread_t_to_ID(mHandle);
-#endif
-}
-
-unsigned thread::hardware_concurrency()
-{
-#if defined(_TTHREAD_WIN32_)
-  SYSTEM_INFO si;
-  GetSystemInfo(&si);
-  return (int) si.dwNumberOfProcessors;
-#elif defined(_SC_NPROCESSORS_ONLN)
-  return (int) sysconf(_SC_NPROCESSORS_ONLN);
-#elif defined(_SC_NPROC_ONLN)
-  return (int) sysconf(_SC_NPROC_ONLN);
-#else
-  // The standard requires this function to return zero if the number of
-  // hardware cores could not be determined.
-  return 0;
-#endif
-}
-
-
-//------------------------------------------------------------------------------
-// this_thread
-//------------------------------------------------------------------------------
-
-thread::id this_thread::get_id()
-{
-#if defined(_TTHREAD_WIN32_)
-  return thread::id((unsigned long int) GetCurrentThreadId());
-#elif defined(_TTHREAD_POSIX_)
-  return _pthread_t_to_ID(pthread_self());
-#endif
-}
-
-}
diff --git a/ext/tinythread.h b/ext/tinythread.h
deleted file mode 100644
index aed7b5856b..0000000000
--- a/ext/tinythread.h
+++ /dev/null
@@ -1,714 +0,0 @@
-/* -*- mode: c++; tab-width: 2; indent-tabs-mode: nil; -*-
-Copyright (c) 2010-2012 Marcus Geelnard
-
-This software is provided 'as-is', without any express or implied
-warranty. In no event will the authors be held liable for any damages
-arising from the use of this software.
-
-Permission is granted to anyone to use this software for any purpose,
-including commercial applications, and to alter it and redistribute it
-freely, subject to the following restrictions:
-
-    1. The origin of this software must not be misrepresented; you must not
-    claim that you wrote the original software. If you use this software
-    in a product, an acknowledgment in the product documentation would be
-    appreciated but is not required.
-
-    2. Altered source versions must be plainly marked as such, and must not be
-    misrepresented as being the original software.
-
-    3. This notice may not be removed or altered from any source
-    distribution.
-*/
-
-#ifndef _TINYTHREAD_H_
-#define _TINYTHREAD_H_
-
-/// @file
-/// @mainpage TinyThread++ API Reference
-///
-/// @section intro_sec Introduction
-/// TinyThread++ is a minimal, portable implementation of basic threading
-/// classes for C++.
-///
-/// They closely mimic the functionality and naming of the C++11 standard, and
-/// should be easily replaceable with the corresponding std:: variants.
-///
-/// @section port_sec Portability
-/// The Win32 variant uses the native Win32 API for implementing the thread
-/// classes, while for other systems, the POSIX threads API (pthread) is used.
-///
-/// @section class_sec Classes
-/// In order to mimic the threading API of the C++11 standard, subsets of
-/// several classes are provided. The fundamental classes are:
-/// @li tthread::thread
-/// @li tthread::mutex
-/// @li tthread::recursive_mutex
-/// @li tthread::condition_variable
-/// @li tthread::lock_guard
-/// @li tthread::fast_mutex
-///
-/// @section misc_sec Miscellaneous
-/// The following special keywords are available: #thread_local.
-///
-/// For more detailed information (including additional classes), browse the
-/// different sections of this documentation. A good place to start is:
-/// tinythread.h.
-
-// Which platform are we on?
-#if !defined(_TTHREAD_PLATFORM_DEFINED_)
-  #if defined(_WIN32) || defined(__WIN32__) || defined(__WINDOWS__)
-    #define _TTHREAD_WIN32_
-  #else
-    #define _TTHREAD_POSIX_
-  #endif
-  #define _TTHREAD_PLATFORM_DEFINED_
-#endif
-
-// Platform specific includes
-#if defined(_TTHREAD_WIN32_)
-  #ifndef WIN32_LEAN_AND_MEAN
-    #define WIN32_LEAN_AND_MEAN
-    #define __UNDEF_LEAN_AND_MEAN
-  #endif
-  #include <windows.h>
-  #ifdef __UNDEF_LEAN_AND_MEAN
-    #undef WIN32_LEAN_AND_MEAN
-    #undef __UNDEF_LEAN_AND_MEAN
-  #endif
-#else
-  #include <pthread.h>
-  #include <signal.h>
-  #include <sched.h>
-  #include <unistd.h>
-#endif
-
-// Generic includes
-#include <ostream>
-
-/// TinyThread++ version (major number).
-#define TINYTHREAD_VERSION_MAJOR 1
-/// TinyThread++ version (minor number).
-#define TINYTHREAD_VERSION_MINOR 1
-/// TinyThread++ version (full version).
-#define TINYTHREAD_VERSION (TINYTHREAD_VERSION_MAJOR * 100 + TINYTHREAD_VERSION_MINOR)
-
-// Do we have a fully featured C++11 compiler?
-#if (__cplusplus > 199711L) || (defined(__STDCXX_VERSION__) && (__STDCXX_VERSION__ >= 201001L))
-  #define _TTHREAD_CPP11_
-#endif
-
-// ...at least partial C++11?
-#if defined(_TTHREAD_CPP11_) || defined(__GXX_EXPERIMENTAL_CXX0X__) || defined(__GXX_EXPERIMENTAL_CPP0X__)
-  #define _TTHREAD_CPP11_PARTIAL_
-#endif
-
-// Macro for disabling assignments of objects.
-#ifdef _TTHREAD_CPP11_PARTIAL_
-  #define _TTHREAD_DISABLE_ASSIGNMENT(name) \
-      name(const name&) = delete; \
-      name& operator=(const name&) = delete;
-#else
-  #define _TTHREAD_DISABLE_ASSIGNMENT(name) \
-      name(const name&); \
-      name& operator=(const name&);
-#endif
-
-/// @def thread_local
-/// Thread local storage keyword.
-/// A variable that is declared with the @c thread_local keyword makes the
-/// value of the variable local to each thread (known as thread-local storage,
-/// or TLS). Example usage:
-/// @code
-/// // This variable is local to each thread.
-/// thread_local int variable;
-/// @endcode
-/// @note The @c thread_local keyword is a macro that maps to the corresponding
-/// compiler directive (e.g. @c __declspec(thread)). While the C++11 standard
-/// allows for non-trivial types (e.g. classes with constructors and
-/// destructors) to be declared with the @c thread_local keyword, most pre-C++11
-/// compilers only allow for trivial types (e.g. @c int). So, to guarantee
-/// portable code, only use trivial types for thread local storage.
-/// @note This directive is currently not supported on Mac OS X (it will give
-/// a compiler error), since compile-time TLS is not supported in the Mac OS X
-/// executable format. Also, some older versions of MinGW (before GCC 4.x) do
-/// not support this directive.
-/// @hideinitializer
-
-#if !defined(_TTHREAD_CPP11_) && !defined(thread_local)
- #if defined(__GNUC__) || defined(__INTEL_COMPILER) || defined(__SUNPRO_CC) || defined(__IBMCPP__)
-  #define thread_local __thread
- #else
-  #define thread_local __declspec(thread)
- #endif
-#endif
-
-
-/// Main name space for TinyThread++.
-/// This namespace is more or less equivalent to the @c std namespace for the
-/// C++11 thread classes. For instance, the tthread::mutex class corresponds to
-/// the std::mutex class.
-namespace tthread {
-
-/// Mutex class.
-/// This is a mutual exclusion object for synchronizing access to shared
-/// memory areas for several threads. The mutex is non-recursive (i.e. a
-/// program may deadlock if the thread that owns a mutex object calls lock()
-/// on that object).
-/// @see recursive_mutex
-class mutex {
-  public:
-    /// Constructor.
-    mutex()
-#if defined(_TTHREAD_WIN32_)
-      : mAlreadyLocked(false)
-#endif
-    {
-#if defined(_TTHREAD_WIN32_)
-      InitializeCriticalSection(&mHandle);
-#else
-      pthread_mutex_init(&mHandle, NULL);
-#endif
-    }
-
-    /// Destructor.
-    ~mutex()
-    {
-#if defined(_TTHREAD_WIN32_)
-      DeleteCriticalSection(&mHandle);
-#else
-      pthread_mutex_destroy(&mHandle);
-#endif
-    }
-
-    /// Lock the mutex.
-    /// The method will block the calling thread until a lock on the mutex can
-    /// be obtained. The mutex remains locked until @c unlock() is called.
-    /// @see lock_guard
-    inline void lock()
-    {
-#if defined(_TTHREAD_WIN32_)
-      EnterCriticalSection(&mHandle);
-      while(mAlreadyLocked) Sleep(1000); // Simulate deadlock...
-      mAlreadyLocked = true;
-#else
-      pthread_mutex_lock(&mHandle);
-#endif
-    }
-
-    /// Try to lock the mutex.
-    /// The method will try to lock the mutex. If it fails, the function will
-    /// return immediately (non-blocking).
-    /// @return @c true if the lock was acquired, or @c false if the lock could
-    /// not be acquired.
-    inline bool try_lock()
-    {
-#if defined(_TTHREAD_WIN32_)
-      bool ret = (TryEnterCriticalSection(&mHandle) ? true : false);
-      if(ret && mAlreadyLocked)
-      {
-        LeaveCriticalSection(&mHandle);
-        ret = false;
-      }
-      return ret;
-#else
-      return (pthread_mutex_trylock(&mHandle) == 0) ? true : false;
-#endif
-    }
-
-    /// Unlock the mutex.
-    /// If any threads are waiting for the lock on this mutex, one of them will
-    /// be unblocked.
-    inline void unlock()
-    {
-#if defined(_TTHREAD_WIN32_)
-      mAlreadyLocked = false;
-      LeaveCriticalSection(&mHandle);
-#else
-      pthread_mutex_unlock(&mHandle);
-#endif
-    }
-
-    _TTHREAD_DISABLE_ASSIGNMENT(mutex)
-
-  private:
-#if defined(_TTHREAD_WIN32_)
-    CRITICAL_SECTION mHandle;
-    bool mAlreadyLocked;
-#else
-    pthread_mutex_t mHandle;
-#endif
-
-    friend class condition_variable;
-};
-
-/// Recursive mutex class.
-/// This is a mutual exclusion object for synchronizing access to shared
-/// memory areas for several threads. The mutex is recursive (i.e. a thread
-/// may lock the mutex several times, as long as it unlocks the mutex the same
-/// number of times).
-/// @see mutex
-class recursive_mutex {
-  public:
-    /// Constructor.
-    recursive_mutex()
-    {
-#if defined(_TTHREAD_WIN32_)
-      InitializeCriticalSection(&mHandle);
-#else
-      pthread_mutexattr_t attr;
-      pthread_mutexattr_init(&attr);
-      pthread_mutexattr_settype(&attr, PTHREAD_MUTEX_RECURSIVE);
-      pthread_mutex_init(&mHandle, &attr);
-#endif
-    }
-
-    /// Destructor.
-    ~recursive_mutex()
-    {
-#if defined(_TTHREAD_WIN32_)
-      DeleteCriticalSection(&mHandle);
-#else
-      pthread_mutex_destroy(&mHandle);
-#endif
-    }
-
-    /// Lock the mutex.
-    /// The method will block the calling thread until a lock on the mutex can
-    /// be obtained. The mutex remains locked until @c unlock() is called.
-    /// @see lock_guard
-    inline void lock()
-    {
-#if defined(_TTHREAD_WIN32_)
-      EnterCriticalSection(&mHandle);
-#else
-      pthread_mutex_lock(&mHandle);
-#endif
-    }
-
-    /// Try to lock the mutex.
-    /// The method will try to lock the mutex. If it fails, the function will
-    /// return immediately (non-blocking).
-    /// @return @c true if the lock was acquired, or @c false if the lock could
-    /// not be acquired.
-    inline bool try_lock()
-    {
-#if defined(_TTHREAD_WIN32_)
-      return TryEnterCriticalSection(&mHandle) ? true : false;
-#else
-      return (pthread_mutex_trylock(&mHandle) == 0) ? true : false;
-#endif
-    }
-
-    /// Unlock the mutex.
-    /// If any threads are waiting for the lock on this mutex, one of them will
-    /// be unblocked.
-    inline void unlock()
-    {
-#if defined(_TTHREAD_WIN32_)
-      LeaveCriticalSection(&mHandle);
-#else
-      pthread_mutex_unlock(&mHandle);
-#endif
-    }
-
-    _TTHREAD_DISABLE_ASSIGNMENT(recursive_mutex)
-
-  private:
-#if defined(_TTHREAD_WIN32_)
-    CRITICAL_SECTION mHandle;
-#else
-    pthread_mutex_t mHandle;
-#endif
-
-    friend class condition_variable;
-};
-
-/// Lock guard class.
-/// The constructor locks the mutex, and the destructor unlocks the mutex, so
-/// the mutex will automatically be unlocked when the lock guard goes out of
-/// scope. Example usage:
-/// @code
-/// mutex m;
-/// int counter;
-///
-/// void increment()
-/// {
-///   lock_guard<mutex> guard(m);
-///   ++ counter;
-/// }
-/// @endcode
-
-template <class T>
-class lock_guard {
-  public:
-    typedef T mutex_type;
-
-    lock_guard() : mMutex(0) {}
-
-    /// The constructor locks the mutex.
-    explicit lock_guard(mutex_type &aMutex)
-    {
-      mMutex = &aMutex;
-      mMutex->lock();
-    }
-
-    /// The destructor unlocks the mutex.
-    ~lock_guard()
-    {
-      if(mMutex)
-        mMutex->unlock();
-    }
-
-  private:
-    mutex_type * mMutex;
-};
-
-/// Condition variable class.
-/// This is a signalling object for synchronizing the execution flow for
-/// several threads. Example usage:
-/// @code
-/// // Shared data and associated mutex and condition variable objects
-/// int count;
-/// mutex m;
-/// condition_variable cond;
-///
-/// // Wait for the counter to reach a certain number
-/// void wait_counter(int targetCount)
-/// {
-///   lock_guard<mutex> guard(m);
-///   while(count < targetCount)
-///     cond.wait(m);
-/// }
-///
-/// // Increment the counter, and notify waiting threads
-/// void increment()
-/// {
-///   lock_guard<mutex> guard(m);
-///   ++ count;
-///   cond.notify_all();
-/// }
-/// @endcode
-class condition_variable {
-  public:
-    /// Constructor.
-#if defined(_TTHREAD_WIN32_)
-    condition_variable();
-#else
-    condition_variable()
-    {
-      pthread_cond_init(&mHandle, NULL);
-    }
-#endif
-
-    /// Destructor.
-#if defined(_TTHREAD_WIN32_)
-    ~condition_variable();
-#else
-    ~condition_variable()
-    {
-      pthread_cond_destroy(&mHandle);
-    }
-#endif
-
-    /// Wait for the condition.
-    /// The function will block the calling thread until the condition variable
-    /// is woken by @c notify_one(), @c notify_all() or a spurious wake up.
-    /// @param[in] aMutex A mutex that will be unlocked when the wait operation
-    ///   starts, an locked again as soon as the wait operation is finished.
-    template <class _mutexT>
-    inline void wait(_mutexT &aMutex)
-    {
-#if defined(_TTHREAD_WIN32_)
-      // Increment number of waiters
-      EnterCriticalSection(&mWaitersCountLock);
-      ++ mWaitersCount;
-      LeaveCriticalSection(&mWaitersCountLock);
-
-      // Release the mutex while waiting for the condition (will decrease
-      // the number of waiters when done)...
-      aMutex.unlock();
-      _wait();
-      aMutex.lock();
-#else
-      pthread_cond_wait(&mHandle, &aMutex.mHandle);
-#endif
-    }
-
-    /// Notify one thread that is waiting for the condition.
-    /// If at least one thread is blocked waiting for this condition variable,
-    /// one will be woken up.
-    /// @note Only threads that started waiting prior to this call will be
-    /// woken up.
-#if defined(_TTHREAD_WIN32_)
-    void notify_one();
-#else
-    inline void notify_one()
-    {
-      pthread_cond_signal(&mHandle);
-    }
-#endif
-
-    /// Notify all threads that are waiting for the condition.
-    /// All threads that are blocked waiting for this condition variable will
-    /// be woken up.
-    /// @note Only threads that started waiting prior to this call will be
-    /// woken up.
-#if defined(_TTHREAD_WIN32_)
-    void notify_all();
-#else
-    inline void notify_all()
-    {
-      pthread_cond_broadcast(&mHandle);
-    }
-#endif
-
-    _TTHREAD_DISABLE_ASSIGNMENT(condition_variable)
-
-  private:
-#if defined(_TTHREAD_WIN32_)
-    void _wait();
-    HANDLE mEvents[2];                  ///< Signal and broadcast event HANDLEs.
-    unsigned int mWaitersCount;         ///< Count of the number of waiters.
-    CRITICAL_SECTION mWaitersCountLock; ///< Serialize access to mWaitersCount.
-#else
-    pthread_cond_t mHandle;
-#endif
-};
-
-
-/// Thread class.
-class thread {
-  public:
-#if defined(_TTHREAD_WIN32_)
-    typedef HANDLE native_handle_type;
-#else
-    typedef pthread_t native_handle_type;
-#endif
-
-    class id;
-
-    /// Default constructor.
-    /// Construct a @c thread object without an associated thread of execution
-    /// (i.e. non-joinable).
-    thread() : mHandle(0), mNotAThread(true)
-#if defined(_TTHREAD_WIN32_)
-    , mWin32ThreadID(0)
-#endif
-    {}
-
-    /// Thread starting constructor.
-    /// Construct a @c thread object with a new thread of execution.
-    /// @param[in] aFunction A function pointer to a function of type:
-    ///          <tt>void fun(void * arg)</tt>
-    /// @param[in] aArg Argument to the thread function.
-    /// @note This constructor is not fully compatible with the standard C++
-    /// thread class. It is more similar to the pthread_create() (POSIX) and
-    /// CreateThread() (Windows) functions.
-    thread(void (*aFunction)(void *), void * aArg);
-
-    /// Destructor.
-    /// @note If the thread is joinable upon destruction, @c std::terminate()
-    /// will be called, which terminates the process. It is always wise to do
-    /// @c join() before deleting a thread object.
-    ~thread();
-
-    /// Wait for the thread to finish (join execution flows).
-    /// After calling @c join(), the thread object is no longer associated with
-    /// a thread of execution (i.e. it is not joinable, and you may not join
-    /// with it nor detach from it).
-    void join();
-
-    /// Check if the thread is joinable.
-    /// A thread object is joinable if it has an associated thread of execution.
-    bool joinable() const;
-
-    /// Detach from the thread.
-    /// After calling @c detach(), the thread object is no longer assicated with
-    /// a thread of execution (i.e. it is not joinable). The thread continues
-    /// execution without the calling thread blocking, and when the thread
-    /// ends execution, any owned resources are released.
-    void detach();
-
-    /// Return the thread ID of a thread object.
-    id get_id() const;
-
-    /// Get the native handle for this thread.
-    /// @note Under Windows, this is a @c HANDLE, and under POSIX systems, this
-    /// is a @c pthread_t.
-    inline native_handle_type native_handle()
-    {
-      return mHandle;
-    }
-
-    /// Determine the number of threads which can possibly execute concurrently.
-    /// This function is useful for determining the optimal number of threads to
-    /// use for a task.
-    /// @return The number of hardware thread contexts in the system.
-    /// @note If this value is not defined, the function returns zero (0).
-    static unsigned hardware_concurrency();
-
-    _TTHREAD_DISABLE_ASSIGNMENT(thread)
-
-  private:
-    native_handle_type mHandle;   ///< Thread handle.
-    mutable mutex mDataMutex;     ///< Serializer for access to the thread private data.
-    bool mNotAThread;             ///< True if this object is not a thread of execution.
-#if defined(_TTHREAD_WIN32_)
-    unsigned int mWin32ThreadID;  ///< Unique thread ID (filled out by _beginthreadex).
-#endif
-
-    // This is the internal thread wrapper function.
-#if defined(_TTHREAD_WIN32_)
-    static unsigned WINAPI wrapper_function(void * aArg);
-#else
-    static void * wrapper_function(void * aArg);
-#endif
-};
-
-/// Thread ID.
-/// The thread ID is a unique identifier for each thread.
-/// @see thread::get_id()
-class thread::id {
-  public:
-    /// Default constructor.
-    /// The default constructed ID is that of thread without a thread of
-    /// execution.
-    id() : mId(0) {};
-
-    id(unsigned long int aId) : mId(aId) {};
-
-    id(const id& aId) : mId(aId.mId) {};
-
-    inline id & operator=(const id &aId)
-    {
-      mId = aId.mId;
-      return *this;
-    }
-
-    inline friend bool operator==(const id &aId1, const id &aId2)
-    {
-      return (aId1.mId == aId2.mId);
-    }
-
-    inline friend bool operator!=(const id &aId1, const id &aId2)
-    {
-      return (aId1.mId != aId2.mId);
-    }
-
-    inline friend bool operator<=(const id &aId1, const id &aId2)
-    {
-      return (aId1.mId <= aId2.mId);
-    }
-
-    inline friend bool operator<(const id &aId1, const id &aId2)
-    {
-      return (aId1.mId < aId2.mId);
-    }
-
-    inline friend bool operator>=(const id &aId1, const id &aId2)
-    {
-      return (aId1.mId >= aId2.mId);
-    }
-
-    inline friend bool operator>(const id &aId1, const id &aId2)
-    {
-      return (aId1.mId > aId2.mId);
-    }
-
-    inline friend std::ostream& operator <<(std::ostream &os, const id &obj)
-    {
-      os << obj.mId;
-      return os;
-    }
-
-  private:
-    unsigned long int mId;
-};
-
-
-// Related to <ratio> - minimal to be able to support chrono.
-typedef long long __intmax_t;
-
-/// Minimal implementation of the @c ratio class. This class provides enough
-/// functionality to implement some basic @c chrono classes.
-template <__intmax_t N, __intmax_t D = 1> class ratio {
-  public:
-    static double _as_double() { return double(N) / double(D); }
-};
-
-/// Minimal implementation of the @c chrono namespace.
-/// The @c chrono namespace provides types for specifying time intervals.
-namespace chrono {
-  /// Duration template class. This class provides enough functionality to
-  /// implement @c this_thread::sleep_for().
-  template <class _Rep, class _Period = ratio<1> > class duration {
-    private:
-      _Rep rep_;
-    public:
-      typedef _Rep rep;
-      typedef _Period period;
-
-      /// Construct a duration object with the given duration.
-      template <class _Rep2>
-        explicit duration(const _Rep2& r) : rep_(r) {};
-
-      /// Return the value of the duration object.
-      rep count() const
-      {
-        return rep_;
-      }
-  };
-
-  // Standard duration types.
-  typedef duration<__intmax_t, ratio<1, 1000000000> > nanoseconds; ///< Duration with the unit nanoseconds.
-  typedef duration<__intmax_t, ratio<1, 1000000> > microseconds;   ///< Duration with the unit microseconds.
-  typedef duration<__intmax_t, ratio<1, 1000> > milliseconds;      ///< Duration with the unit milliseconds.
-  typedef duration<__intmax_t> seconds;                            ///< Duration with the unit seconds.
-  typedef duration<__intmax_t, ratio<60> > minutes;                ///< Duration with the unit minutes.
-  typedef duration<__intmax_t, ratio<3600> > hours;                ///< Duration with the unit hours.
-}
-
-/// The namespace @c this_thread provides methods for dealing with the
-/// calling thread.
-namespace this_thread {
-  /// Return the thread ID of the calling thread.
-  thread::id get_id();
-
-  /// Yield execution to another thread.
-  /// Offers the operating system the opportunity to schedule another thread
-  /// that is ready to run on the current processor.
-  inline void yield()
-  {
-#if defined(_TTHREAD_WIN32_)
-    Sleep(0);
-#else
-    sched_yield();
-#endif
-  }
-
-  /// Blocks the calling thread for a period of time.
-  /// @param[in] aTime Minimum time to put the thread to sleep.
-  /// Example usage:
-  /// @code
-  /// // Sleep for 100 milliseconds
-  /// this_thread::sleep_for(chrono::milliseconds(100));
-  /// @endcode
-  /// @note Supported duration types are: nanoseconds, microseconds,
-  /// milliseconds, seconds, minutes and hours.
-  template <class _Rep, class _Period> void sleep_for(const chrono::duration<_Rep, _Period>& aTime)
-  {
-#if defined(_TTHREAD_WIN32_)
-    Sleep(int(double(aTime.count()) * (1000.0 * _Period::_as_double()) + 0.5));
-#else
-    usleep(int(double(aTime.count()) * (1000000.0 * _Period::_as_double()) + 0.5));
-#endif
-  }
-}
-
-}
-
-// Define/macro cleanup
-#undef _TTHREAD_DISABLE_ASSIGNMENT
-
-#endif // _TINYTHREAD_H_
diff --git a/ext/vld/lib/vld.lib b/ext/vld/lib/vld.lib
deleted file mode 100644
index 6325a37c8258c8c56191b60cf7bd547fc3dcc210..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 6348
zcmcIo%}*Og6o26(B<9PQU}&I~qedx_DvH5&K|<}i5E>K%ks+L-m<4ZQi-kpAgL;V6
zOO#WUQ;yBC*Bo+dPN>I7m3nDzJ@g-la?T}vvoo{%cD%c>vAfdq?7n$3zj?F2_x6pi
zE$OxW%6GAEQvNGFznEJ{FQn5MzkXIcrsw8F&u$C=W&vVT00XN4gO34*-U1|-xJ=v!
zU@}tSGM)r*<Q=w5o^VNM08B=3ER*5aT;k6Fm|S@;<P=*b2+Jh#ic9<h+M$fS5%K_A
zl+ouxZeWX&e90v~jrJ(RMJA=v+WOti;&y4}*4A=y?e6wwv2<#dOF!i@P%3TQD-;?H
z;AdgM`?qi3+qhF&$#3UzMD_5v^!+0?g{IB#>{RU&-7FaT!HQ8g_Ul$n)AF!WSScE|
zWu6+#x@p>VegD7~Lj$`|xn<Og#<5kaZywjH))6sp=t1irjrzJ(J~0iuP_^sc)QX<Z
z8)%8MQaxS4ZOc0FrgY&QHMa{|qtx-$abH%erg5Yn8s2QUK&6Y@%h7y){W^SFsoMIU
zY48<$v-#C%ck3v~%%?@GqVce1*cIWwH=UwK%XPhWuwAJcdYQdqJ8$#F8)a`$xQQ5_
zHywV24i4zYk+@L=c-cBR^1tSWPCmw2W}`JxqaAmG%;0&`*yY+gbEuYF$*@gpPdE8a
zdqzI3Yb9QrY9`eVqK%<Mc!S~OD6mh(5YN~nCvZt56|LvM`5aG&yRoa7iKZ|Ut_}b^
z9t3zh1hA9@xIY0<8NrM*4)6};35u4$e$>4l26z?+c#mo9RHU<4*!KZ-Z^i%~pgbQ1
zxPkH#=bA=+5y#9T)>RmU&tM2fp$`V29}+MQNf?1R48s`a#a@_zOAv$0a1ky*7xc6=
zqMPL=xh>wU2rO@R-8-)b8R@4{W3oYw3}l=Dp8{i@5RWsJ**f$g3safH!YnvaA_K57
zr1_Fu-i8ofP2RXfLcze~NjwkAnH)$Oo$IUA+{dSZ{i;IEqQL>BTKQkUJEuYds`q?l
z-^@TlQ1b>_c%43SC~9@}Aw+RUh110~QAk7d>;oN`2g%~Sv=&_h_!FE$DHjv<4g2V)
z7d7>hEVPOd)y+)VG@aD=shTjeI4`Qh-B|f)H~evy-|D{rn1}c^Q#STa9$nuOkC4Zk
zU*v;mHHiN(Q!VRt{ra5jVyW>@lz)Yy8(R%#&xBo0s4))$d_<9UOs_%etP9%&W<qxL
z6Q{m{(Rd%~{&IS-g2i_7MPj|WU$boMVLdfnyqPMjZQK$4zJ`IZg)jk3uj~%<GbUbk
zM^Hf9w+@eSt&=Z)g^##CZv>iRYGxu`)&QL4R;0#pj^hZM470&O;M!z84b!LCkGR<E
z0E^;@HC=%9E|Ra4<!+3)+Z0pgvhp0kn9}7i<#%UsY>5CtOeym&_m?nbUMd+=ev=QP
zWlZ^B7|_gn{Tvq&dVFYk*A_&%k@Di}9|YhpIe6D1;wvjRip3|3FM4U9$@t1hJ+u2;
zK8Tjtb$oZ5-Pw+1uAF<yWv5vdq~)h9dwuPA*$baK$&oinL%*q5$jGFLZ<S(Wp@@}R
z53R%~Ov^EsS(GPvKMtcPs}J$ZD+(*|O>YlvE*K5VSWJKpn)oDB7;@j--Yo>9Od(1S
zMG0`JWvqz(>*ZMf;)ei0%Wum~kP0ilK+i6^XxuG+x~FjDzPWvriA6zUr<y(&O;#9W
z_LkY64PpB=M7rc6@dCyDUw{I(zLVKtj(mxTmt90sneo#`TbNO?7897hYPCJIh$!f%
zXdQ^SYzP+qv4-`R6W1Z7HFc5PH^t9fI`|#lMAShKmApjq9}EHOY#a`8WaS({;mCbc
zerCQ6_Hz>b9F}O_>4Hpu4$mSYF;20_uF`PtEaHenRFBkc`55(WO}L285vwhnsBAsT
wag>uAg(LUPu_Pi}Uvbeok*%Zh*qDpNv$gZbFLC7@{0ONTQpo<Kf)?c6e`EJl)c^nh

diff --git a/ext/vld/vld.h b/ext/vld/vld.h
deleted file mode 100644
index 52686dcb8c..0000000000
--- a/ext/vld/vld.h
+++ /dev/null
@@ -1,343 +0,0 @@
-////////////////////////////////////////////////////////////////////////////////
-//
-//  Visual Leak Detector - Import Library Header
-//  Copyright (c) 2005-2014 VLD Team
-//
-//  This library is free software; you can redistribute it and/or
-//  modify it under the terms of the GNU Lesser General Public
-//  License as published by the Free Software Foundation; either
-//  version 2.1 of the License, or (at your option) any later version.
-//
-//  This library is distributed in the hope that it will be useful,
-//  but WITHOUT ANY WARRANTY; without even the implied warranty of
-//  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-//  Lesser General Public License for more details.
-//
-//  You should have received a copy of the GNU Lesser General Public
-//  License along with this library; if not, write to the Free Software
-//  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
-//
-//  See COPYING.txt for the full terms of the GNU Lesser General Public License.
-//
-////////////////////////////////////////////////////////////////////////////////
-
-#pragma once
-
-#include "vld_def.h"
-
-typedef int            VLD_BOOL;
-typedef unsigned int   VLD_UINT;
-typedef size_t         VLD_SIZET;
-typedef void*          VLD_HMODULE;
-
-#if defined _DEBUG || defined VLD_FORCE_ENABLE
-
-#pragma comment(lib, "vld.lib")
-
-// Force a symbolic reference to the global VisualLeakDetector class object from
-// the DLL. This ensures that the DLL is loaded and linked with the program,
-// even if no code otherwise imports any of the DLL's exports.
-#pragma comment(linker, "/include:__imp_?g_vld@@3VVisualLeakDetector@@A")
-
-////////////////////////////////////////////////////////////////////////////////
-//
-//  Visual Leak Detector APIs
-//
-
-#ifdef __cplusplus
-extern "C" {
-#endif // __cplusplus
-
-// VLDDisable - Disables Visual Leak Detector's memory leak detection at
-//   runtime. If memory leak detection is already disabled, then calling this
-//   function has no effect.
-//
-//  Note: In multithreaded programs, this function operates on a per-thread
-//    basis. In other words, if you call this function from one thread, then
-//    memory leak detection is only disabled for that thread. If memory leak
-//    detection is enabled for other threads, then it will remain enabled for
-//    those other threads. It was designed to work this way to insulate you,
-//    the programmer, from having to ensure thread synchronization when calling
-//    VLDEnable() and VLDDisable(). Without this, calling these two functions
-//    unsynchronized could result in unpredictable and unintended behavior.
-//    But this also means that if you want to disable memory leak detection
-//    process-wide, then you need to call this function from every thread in
-//    the process.
-//
-//  Return Value:
-//
-//    None.
-//
-__declspec(dllimport) void VLDDisable ();
-
-// VLDEnable - Enables Visual Leak Detector's memory leak detection at runtime.
-//   If memory leak detection is already enabled, which it is by default, then
-//   calling this function has no effect.
-//
-//  Note: In multithreaded programs, this function operates on a per-thread
-//    basis. In other words, if you call this function from one thread, then
-//    memory leak detection is only enabled for that thread. If memory leak
-//    detection is disabled for other threads, then it will remain disabled for
-//    those other threads. It was designed to work this way to insulate you,
-//    the programmer, from having to ensure thread synchronization when calling
-//    VLDEnable() and VLDDisable(). Without this, calling these two functions
-//    unsynchronized could result in unpredictable and unintended behavior.
-//    But this also means that if you want to enable memory leak detection
-//    process-wide, then you need to call this function from every thread in
-//    the process.
-//
-//  Return Value:
-//
-//    None.
-//
-__declspec(dllimport) void VLDEnable ();
-
-// VLDRestore - Restore Visual Leak Detector's previous state.
-//
-//  Return Value:
-//
-//    None.
-//
-__declspec(dllimport) void VLDRestore ();
-
-// VLDGlobalDisable - Disables Visual Leak Detector's memory leak detection at
-//   runtime in all threads. If memory leak detection is already disabled, 
-//   then calling this function has no effect.
-//
-//  Return Value:
-//
-//    None.
-//
-__declspec(dllimport) void VLDGlobalDisable ();
-
-// VLDGlobalEnable - Enables Visual Leak Detector's memory leak detection 
-//   at runtime in all threads. If memory leak detection is already enabled, 
-//   which it is by default, then calling this function has no effect.
-//
-//  Return Value:
-//
-//    None.
-//
-__declspec(dllimport) void VLDGlobalEnable ();
-
-// VLDReportLeaks - Report leaks up to the execution point.
-//
-//  Return Value:
-//
-//    None.
-//
-__declspec(dllimport) VLD_UINT VLDReportLeaks ();
-
-// VLDReportThreadLeaks - Report thread leaks up to the execution point.
-//
-// threadId: thread Id.
-//
-//  Return Value:
-//
-//    None.
-//
-__declspec(dllimport) VLD_UINT VLDReportThreadLeaks (VLD_UINT threadId);
-
-// VLDGetLeaksCount - Return memory leaks count to the execution point.
-//
-//  Return Value:
-//
-//    None.
-//
-__declspec(dllimport) VLD_UINT VLDGetLeaksCount ();
-
-// VLDGetThreadLeaksCount - Return thread memory leaks count to the execution point.
-//
-// threadId: thread Id.
-//
-//  Return Value:
-//
-//    None.
-//
-__declspec(dllimport) VLD_UINT VLDGetThreadLeaksCount (VLD_UINT threadId);
-
-// VLDMarkAllLeaksAsReported - Mark all leaks as reported.
-//
-//  Return Value:
-//
-//    None.
-//
-__declspec(dllimport) void VLDMarkAllLeaksAsReported ();
-
-// VLDMarkThreadLeaksAsReported - Mark thread leaks as reported.
-//
-// threadId: thread Id.
-//
-//  Return Value:
-//
-//    None.
-//
-__declspec(dllimport) void VLDMarkThreadLeaksAsReported (VLD_UINT threadId);
-
-
-// VLDRefreshModules - Look for recently loaded DLLs and patch them if necessary.
-//
-//  Return Value:
-//
-//    None.
-//
-__declspec(dllimport) void VLDRefreshModules();
-
-
-// VLDEnableModule - Enable Memory leak checking on the specified module.
-//
-// module: module handle.
-//
-//  Return Value:
-//
-//    None.
-//
-
-__declspec(dllimport) void VLDEnableModule(VLD_HMODULE module);
-
-
-// VLDDisableModule - Disable Memory leak checking on the specified module.
-//
-// module: module handle.
-//
-//  Return Value:
-//
-//    None.
-//
-__declspec(dllimport) void VLDDisableModule(VLD_HMODULE module);
-
-// VLDGetOptions - Return all current options.
-//
-//  Return Value:
-//
-//    Mask of current options.
-//
-__declspec(dllimport) VLD_UINT VLDGetOptions();
-
-// VLDGetReportFilename - Return current report filename.
-//
-// filename: current report filename (max characters - MAX_PATH).
-//
-//  Return Value:
-//
-//    None.
-//
-__declspec(dllimport) void VLDGetReportFilename(wchar_t *filename);
-
-// VLDSetOptions - Update the report options via function call rather than INI file.
-//
-// option_mask: Only the following flags are checked
-// VLD_OPT_AGGREGATE_DUPLICATES
-// VLD_OPT_MODULE_LIST_INCLUDE
-// VLD_OPT_SAFE_STACK_WALK
-// VLD_OPT_SLOW_DEBUGGER_DUMP
-// VLD_OPT_TRACE_INTERNAL_FRAMES
-// VLD_OPT_START_DISABLED
-// VLD_OPT_SKIP_HEAPFREE_LEAKS
-// VLD_OPT_VALIDATE_HEAPFREE
-//
-// maxDataDump: maximum number of user-data bytes to dump for each leaked block.
-//
-// maxTraceFrames: maximum number of frames per stack trace for each leaked block.
-//
-//  Return Value:
-//
-//    None.
-//
-__declspec(dllimport) void VLDSetOptions(VLD_UINT option_mask, VLD_SIZET maxDataDump, VLD_UINT maxTraceFrames);
-
-// VLDSetModulesList - Set list of modules included/excluded in leak detection
-// depending on parameter "includeModules".
-//
-// modules: list of modules to be forcefully included/excluded in leak detection.
-//
-// includeModules: include or exclude that modules.
-//
-//  Return Value:
-//
-//    None.
-//
-__declspec(dllimport) void VLDSetModulesList(const wchar_t *modules, VLD_BOOL includeModules);
-
-// VLDGetModulesList - Return current list of included/excluded modules
-// depending on flag VLD_OPT_TRACE_INTERNAL_FRAMES.
-//
-// modules: destination string for list of included/excluded modules (maximum length 512 characters).
-//
-// size: maximum string size.
-//
-//  Return Value:
-//
-//    VLD_BOOL: TRUE if include modules, otherwise FALSE.
-//
-__declspec(dllimport) VLD_BOOL VLDGetModulesList(wchar_t *modules, VLD_UINT size);
-
-// VLDSetReportOptions - Update the report options via function call rather than INI file.
-//
-// Only the following flags are checked
-// VLD_OPT_REPORT_TO_DEBUGGER
-// VLD_OPT_REPORT_TO_FILE
-// VLD_OPT_REPORT_TO_STDOUT
-// VLD_OPT_UNICODE_REPORT
-//
-// filename is optional and can be NULL.
-//
-//  Return Value:
-//
-//    None.
-//
-__declspec(dllimport) void VLDSetReportOptions(VLD_UINT option_mask, const wchar_t *filename);
-
-// VLDSetReportHook - Installs or uninstalls a client-defined reporting function by hooking it 
-//  into the C run-time debug reporting process (debug version only).
-//
-// mode: The action to take: VLD_RPTHOOK_INSTALL or VLD_RPTHOOK_REMOVE.
-//
-// pfnNewHook: Report hook to install or remove.
-//
-//  Return Value:
-//
-//    int: 0 if success.
-//
-__declspec(dllimport) int VLDSetReportHook(int mode,  VLD_REPORT_HOOK pfnNewHook);
-
-// VLDResolveCallstacks - Performs symbol resolution for all saved extent CallStack's that have
-// been tracked by Visual Leak Detector. This function is necessary for applications that 
-// dynamically load and unload modules, and through which memory leaks might be included.
-// If this is NOT called, stack traces may have stack frames with no symbol information. This 
-// happens because the symbol API's cannot look up symbols for a binary / module that has been unloaded
-// from the process.
-//
-//  Return Value:
-//
-//    None.
-//
-__declspec(dllexport) void VLDResolveCallstacks();
-
-#ifdef __cplusplus
-}
-#endif // __cplusplus
-
-#else // !_DEBUG
-
-#define VLDEnable()
-#define VLDDisable()
-#define VLDRestore()
-#define VLDReportLeaks() (0)
-#define VLDReportThreadLeaks() (0)
-#define VLDGetLeaksCount() (0)
-#define VLDGetThreadLeaksCount() (0)
-#define VLDMarkAllLeaksAsReported()
-#define VLDMarkThreadLeaksAsReported(a)
-#define VLDRefreshModules()
-#define VLDEnableModule(a)
-#define VLDDisableModule(b)
-#define VLDGetOptions() (0)
-#define VLDGetReportFilename(a)
-#define VLDSetOptions(a, b, c)
-#define VLDSetReportHook(a, b)
-#define VLDSetModulesList(a)
-#define VLDGetModulesList(a, b) (FALSE)
-#define VLDSetReportOptions(a, b)
-
-#endif // _DEBUG
diff --git a/ext/vld/vld_def.h b/ext/vld/vld_def.h
deleted file mode 100644
index 4b6d92ed89..0000000000
--- a/ext/vld/vld_def.h
+++ /dev/null
@@ -1,46 +0,0 @@
-////////////////////////////////////////////////////////////////////////////////
-//
-//  Visual Leak Detector - Import Library Header
-//  Copyright (c) 2005-2014 VLD Team
-//
-//  This library is free software; you can redistribute it and/or
-//  modify it under the terms of the GNU Lesser General Public
-//  License as published by the Free Software Foundation; either
-//  version 2.1 of the License, or (at your option) any later version.
-//
-//  This library is distributed in the hope that it will be useful,
-//  but WITHOUT ANY WARRANTY; without even the implied warranty of
-//  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-//  Lesser General Public License for more details.
-//
-//  You should have received a copy of the GNU Lesser General Public
-//  License along with this library; if not, write to the Free Software
-//  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
-//
-//  See COPYING.txt for the full terms of the GNU Lesser General Public License.
-//
-////////////////////////////////////////////////////////////////////////////////
-
-#pragma once
-
-#include <wchar.h>
-
-#define VLD_OPT_AGGREGATE_DUPLICATES    0x0001 //   If set, aggregate duplicate leaks in the leak report.
-#define VLD_OPT_MODULE_LIST_INCLUDE     0x0002 //   If set, modules in the module list are included, all others are excluded.
-#define VLD_OPT_REPORT_TO_DEBUGGER      0x0004 //   If set, the memory leak report is sent to the debugger.
-#define VLD_OPT_REPORT_TO_FILE          0x0008 //   If set, the memory leak report is sent to a file.
-#define VLD_OPT_SAFE_STACK_WALK         0x0010 //   If set, the stack is walked using the "safe" method (StackWalk64).
-#define VLD_OPT_SELF_TEST               0x0020 //   If set, perform a self-test to verify memory leak self-checking.
-#define VLD_OPT_SLOW_DEBUGGER_DUMP      0x0040 //   If set, inserts a slight delay between sending output to the debugger.
-#define VLD_OPT_START_DISABLED          0x0080 //   If set, memory leak detection will initially disabled.
-#define VLD_OPT_TRACE_INTERNAL_FRAMES   0x0100 //   If set, include useless frames (e.g. internal to VLD) in call stacks.
-#define VLD_OPT_UNICODE_REPORT          0x0200 //   If set, the leak report will be encoded UTF-16 instead of ASCII.
-#define VLD_OPT_VLDOFF                  0x0400 //   If set, VLD will be completely deactivated. It will not attach to any modules.
-#define VLD_OPT_REPORT_TO_STDOUT        0x0800 //   If set, the memory leak report is sent to stdout.
-#define VLD_OPT_SKIP_HEAPFREE_LEAKS     0x1000 //   If set, VLD skip HeapFree memory leaks.
-#define VLD_OPT_VALIDATE_HEAPFREE       0x2000 //   If set, VLD verifies and reports heap consistency for HeapFree calls.
-
-#define VLD_RPTHOOK_INSTALL  0
-#define VLD_RPTHOOK_REMOVE   1
-
-typedef int (__cdecl * VLD_REPORT_HOOK)(int reportType, wchar_t *message, int *returnValue);

From b7da56c2df98ea59b4843bc2becc75600ded1724 Mon Sep 17 00:00:00 2001
From: Alexander Bock <alexander.bock@liu.se>
Date: Thu, 28 Mar 2024 20:22:40 +0100
Subject: [PATCH 350/701] Extract the correct number of values when loading a
 cached data file

---
 src/data/dataloader.cpp | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/src/data/dataloader.cpp b/src/data/dataloader.cpp
index bf3c16bae7..5627d3a4a8 100644
--- a/src/data/dataloader.cpp
+++ b/src/data/dataloader.cpp
@@ -272,7 +272,11 @@ std::optional<Dataset> loadCachedFile(const std::filesystem::path& path) {
     int valuesIdx = 0;
     for (Dataset::Entry& e : result.entries) {
         e.data.resize(nValues);
-        std::memcpy(e.data.data(), entriesBuffer.data() + valuesIdx, nValues);
+        std::memcpy(
+            e.data.data(),
+            entriesBuffer.data() + valuesIdx,
+            nValues * sizeof(float)
+        );
         valuesIdx += nValues;
 
         if (e.comment.has_value()) {
@@ -283,7 +287,7 @@ std::optional<Dataset> loadCachedFile(const std::filesystem::path& path) {
             std::memcpy(e.comment->data(), &commentBuffer[commentIdx], e.comment->size());
 
             // and then advance the index
-            commentIdx += e.comment->size();
+            commentIdx += static_cast<int>(e.comment->size());
         }
     }
 
@@ -354,8 +358,9 @@ void saveCachedFile(const Dataset& dataset, const std::filesystem::path& path) {
 
     // We assume the number of values for each dataset to be the same, so we can store
     // them upfront
-    uint16_t nValues = dataset.entries.empty() ? 0 : dataset.entries[0].data.size();
-    checkSize<uint16_t>(nValues, "Too many data variables");
+    size_t nValuesF = dataset.entries.empty() ? 0 : dataset.entries[0].data.size();
+    checkSize<uint16_t>(nValuesF, "Too many data variables");
+    uint16_t nValues = static_cast<uint16_t>(nValuesF);
     std::vector<float> valuesBuffer;
     valuesBuffer.reserve(dataset.entries.size() * nValues);
 

From 9eb2344c271a92fb9c88cc639acc0feaad078ed7 Mon Sep 17 00:00:00 2001
From: Gene Payne <payne.gene@gmail.com>
Date: Thu, 28 Mar 2024 14:22:03 -0600
Subject: [PATCH 351/701] Added missing profiling header to prevent Tracy error

---
 modules/volume/rawvolumereader.inl | 1 +
 1 file changed, 1 insertion(+)

diff --git a/modules/volume/rawvolumereader.inl b/modules/volume/rawvolumereader.inl
index 0b3ed74269..2e0113803e 100644
--- a/modules/volume/rawvolumereader.inl
+++ b/modules/volume/rawvolumereader.inl
@@ -23,6 +23,7 @@
  ****************************************************************************************/
 
 #include <ghoul/misc/exception.h>
+#include <ghoul/misc/profiling.h>
 #include <fstream>
 
 namespace openspace::volume {

From 046aea0776cde5f5e7442d55adc211e3c13dea00 Mon Sep 17 00:00:00 2001
From: Emma Broman <emma.broman@liu.se>
Date: Tue, 2 Apr 2024 14:19:54 +0200
Subject: [PATCH 352/701] Fix an oopsie in point cloud shader

---
 modules/base/shaders/pointcloud/billboardpoint_fs.glsl | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/base/shaders/pointcloud/billboardpoint_fs.glsl b/modules/base/shaders/pointcloud/billboardpoint_fs.glsl
index 3e69bd8913..9c0b0ef7b7 100644
--- a/modules/base/shaders/pointcloud/billboardpoint_fs.glsl
+++ b/modules/base/shaders/pointcloud/billboardpoint_fs.glsl
@@ -90,7 +90,7 @@ Fragment getFragment() {
     discard;
   }
 
-  vec4 fullColor = glm::vec4(color, 1.0);
+  vec4 fullColor = vec4(color, 1.0);
   if (useColorMap) {
     fullColor = sampleColorMap(gs_colorParameter);
   }

From 2fc801cae088483921a95c7bdb1acac4e7d0b8bf Mon Sep 17 00:00:00 2001
From: Alexander Bock <mail@alexanderbock.eu>
Date: Tue, 2 Apr 2024 23:37:37 +0200
Subject: [PATCH 353/701] Double-remove soloud submodule from the wrong path

---
 modules/sound/ext/soloud | 1 -
 1 file changed, 1 deletion(-)
 delete mode 160000 modules/sound/ext/soloud

diff --git a/modules/sound/ext/soloud b/modules/sound/ext/soloud
deleted file mode 160000
index 1157475881..0000000000
--- a/modules/sound/ext/soloud
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 1157475881da0d7f76102578255b937c7d4e8f57

From d48f77fd9e5525d747fccb52f1285284b35a9722 Mon Sep 17 00:00:00 2001
From: Emma Broman <emma.broman@liu.se>
Date: Wed, 3 Apr 2024 09:23:32 +0200
Subject: [PATCH 354/701] Adress a couple of warnings

---
 modules/base/rendering/pointcloud/sizemappingcomponent.cpp | 2 +-
 src/navigation/orbitalnavigator.cpp                        | 3 +--
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/modules/base/rendering/pointcloud/sizemappingcomponent.cpp b/modules/base/rendering/pointcloud/sizemappingcomponent.cpp
index df57fc143c..c9e3bdad8d 100644
--- a/modules/base/rendering/pointcloud/sizemappingcomponent.cpp
+++ b/modules/base/rendering/pointcloud/sizemappingcomponent.cpp
@@ -110,7 +110,7 @@ SizeMappingComponent::SizeMappingComponent(const ghoul::Dictionary& dictionary)
             parameterOption.addOption(static_cast<int>(i), opts[i]);
 
             if (p.parameter.has_value() && *p.parameter == opts[i]) {
-                indexOfProvidedOption = i;
+                indexOfProvidedOption = static_cast<int>(i);
             }
         }
     }
diff --git a/src/navigation/orbitalnavigator.cpp b/src/navigation/orbitalnavigator.cpp
index f9b801b683..8aabc7398b 100644
--- a/src/navigation/orbitalnavigator.cpp
+++ b/src/navigation/orbitalnavigator.cpp
@@ -1953,8 +1953,7 @@ void OrbitalNavigator::resetIdleBehavior() {
 }
 
 void OrbitalNavigator::applyIdleBehavior(double deltaTime, glm::dvec3& position,
-                                         glm::dquat& localRotation,
-                                         glm::dquat& globalRotation)
+                                         glm::dquat&, glm::dquat& globalRotation)
 {
     _idleBehaviorDampenInterpolator.setDeltaTime(static_cast<float>(deltaTime));
     _idleBehaviorDampenInterpolator.step();

From 19f0f707dcc0c32046b2d54634e5f8338b620c19 Mon Sep 17 00:00:00 2001
From: Emma Broman <emma.broman@liu.se>
Date: Wed, 3 Apr 2024 09:23:49 +0200
Subject: [PATCH 355/701] Issue/2174 - Show items with no GUI tag in asset in
 the GUI (#3133)

* Always add GUI properties, even if tag is not in the asset

To make objects wihtout GUI tag be included in the UI

* Hide the hover circle, to clean up scene menu list a little

* set root node gui hidden property to true

* Properly add the gui properties for all scene graph nodes (even root)

* Update GUI hash
---
 data/assets/modules/skybrowser/hover_circle.asset |  3 ++-
 data/assets/util/webgui.asset                     |  2 +-
 include/openspace/scene/scenegraphnode.h          |  1 +
 src/scene/scene.cpp                               |  1 +
 src/scene/scenegraphnode.cpp                      | 13 +++++++++----
 5 files changed, 14 insertions(+), 6 deletions(-)

diff --git a/data/assets/modules/skybrowser/hover_circle.asset b/data/assets/modules/skybrowser/hover_circle.asset
index 027c2a09cb..80f19603b8 100644
--- a/data/assets/modules/skybrowser/hover_circle.asset
+++ b/data/assets/modules/skybrowser/hover_circle.asset
@@ -23,7 +23,8 @@ local circle = {
     Description = [[A circular marker that shows the position on the night sky
       of the object hovered in the sky browser UI. The circle will hide/show up
       dynamically, depending on the interaction with the items in the UI]],
-    Path = "/SkyBrowser"
+    Path = "/SkyBrowser",
+    Hidden = true
   }
 }
 
diff --git a/data/assets/util/webgui.asset b/data/assets/util/webgui.asset
index e45b8665d5..11b3aad4ac 100644
--- a/data/assets/util/webgui.asset
+++ b/data/assets/util/webgui.asset
@@ -4,7 +4,7 @@ local guiCustomization = asset.require("customization/gui")
 
 
 -- Select which commit hashes to use for the frontend and backend
-local frontendHash = "65c0238b8ba931b958cf3cada2ab226c8f1c9880"
+local frontendHash = "e1ebc90f79f10bafe46aea72eb91fdf0e86876ad"
 
 local frontend = asset.resource({
   Identifier = "WebGuiFrontend",
diff --git a/include/openspace/scene/scenegraphnode.h b/include/openspace/scene/scenegraphnode.h
index dc269e07e8..fbd426ab14 100644
--- a/include/openspace/scene/scenegraphnode.h
+++ b/include/openspace/scene/scenegraphnode.h
@@ -147,6 +147,7 @@ public:
 
     std::string guiPath() const;
     bool hasGuiHintHidden() const;
+    void setGuiHintHidden(bool value);
 
     static documentation::Documentation Documentation();
 
diff --git a/src/scene/scene.cpp b/src/scene/scene.cpp
index 802beb24c4..2987fa8ed2 100644
--- a/src/scene/scene.cpp
+++ b/src/scene/scene.cpp
@@ -116,6 +116,7 @@ Scene::Scene(std::unique_ptr<SceneInitializer> initializer)
 {
     _rootNode.setIdentifier(RootNodeIdentifier);
     _rootNode.setScene(this);
+    _rootNode.setGuiHintHidden(true);
 
     _camera->setParent(&_rootNode);
 }
diff --git a/src/scene/scenegraphnode.cpp b/src/scene/scenegraphnode.cpp
index df5c9537e0..a6ec5deab3 100644
--- a/src/scene/scenegraphnode.cpp
+++ b/src/scene/scenegraphnode.cpp
@@ -350,18 +350,15 @@ ghoul::mm_unique_ptr<SceneGraphNode> SceneGraphNode::createFromDictionary(
             result->setGuiName(*p.gui->name);
             result->_guiDisplayName = result->guiName();
         }
-        result->addProperty(result->_guiDisplayName);
 
         if (p.gui->description.has_value()) {
             result->setDescription(*p.gui->description);
             result->_guiDescription = result->description();
         }
-        result->addProperty(result->_guiDescription);
 
         if (p.gui->hidden.has_value()) {
             result->_guiHidden = *p.gui->hidden;
         }
-        result->addProperty(result->_guiHidden);
 
         if (p.gui->path.has_value()) {
             if (!p.gui->path->starts_with('/')) {
@@ -369,7 +366,6 @@ ghoul::mm_unique_ptr<SceneGraphNode> SceneGraphNode::createFromDictionary(
             }
             result->_guiPath = *p.gui->path;
         }
-        result->addProperty(result->_guiPath);
     }
 
     result->_boundingSphere = p.boundingSphere.value_or(result->_boundingSphere);
@@ -596,6 +592,11 @@ SceneGraphNode::SceneGraphNode()
     addProperty(_showDebugSphere);
 
     addProperty(_supportsDirectInteraction);
+
+    addProperty(_guiDisplayName);
+    addProperty(_guiDescription);
+    addProperty(_guiHidden);
+    addProperty(_guiPath);
 }
 
 SceneGraphNode::~SceneGraphNode() {}
@@ -1123,6 +1124,10 @@ bool SceneGraphNode::hasGuiHintHidden() const {
     return _guiHidden;
 }
 
+void SceneGraphNode::setGuiHintHidden(bool value) {
+    _guiHidden = value;
+}
+
 glm::dvec3 SceneGraphNode::calculateWorldPosition() const {
     // recursive up the hierarchy if there are parents available
     if (_parent) {

From e2a82a170e971ed8cd44aae462e4b0b2f3ea7053 Mon Sep 17 00:00:00 2001
From: Alexander Bock <alexander.bock@liu.se>
Date: Wed, 3 Apr 2024 12:43:41 +0200
Subject: [PATCH 356/701] Remove SoLoud...

---
 modules/audio/ext/soloud | 1 -
 1 file changed, 1 deletion(-)
 delete mode 160000 modules/audio/ext/soloud

diff --git a/modules/audio/ext/soloud b/modules/audio/ext/soloud
deleted file mode 160000
index 1157475881..0000000000
--- a/modules/audio/ext/soloud
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 1157475881da0d7f76102578255b937c7d4e8f57

From 2450435c3d8230195bfb897aa92b27c295c52b14 Mon Sep 17 00:00:00 2001
From: Alexander Bock <alexander.bock@liu.se>
Date: Wed, 3 Apr 2024 12:44:49 +0200
Subject: [PATCH 357/701] ... from gitmodules ...

---
 .gitmodules | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/.gitmodules b/.gitmodules
index 48dc166939..02b175d8de 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -41,6 +41,4 @@
 [submodule "support/doxygen/css"]
 	path = support/doxygen/css
 	url = https://github.com/jothepro/doxygen-awesome-css.git
-[submodule "modules/audio/ext/soloud"]
-	path = modules/audio/ext/soloud
-	url = https://github.com/jarikomppa/soloud
+

From c47eb8fc7ab137b6ad13c36d2fdc9ef060167f69 Mon Sep 17 00:00:00 2001
From: Alexander Bock <alexander.bock@liu.se>
Date: Wed, 3 Apr 2024 12:45:55 +0200
Subject: [PATCH 358/701] ... and then re-add it again

---
 .gitmodules              | 3 +++
 modules/audio/ext/soloud | 1 +
 2 files changed, 4 insertions(+)
 create mode 160000 modules/audio/ext/soloud

diff --git a/.gitmodules b/.gitmodules
index 02b175d8de..8bffd188f8 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -42,3 +42,6 @@
 	path = support/doxygen/css
 	url = https://github.com/jothepro/doxygen-awesome-css.git
 
+[submodule "modules/audio/ext/soloud"]
+	path = modules/audio/ext/soloud
+	url = https://github.com/jarikomppa/soloud
diff --git a/modules/audio/ext/soloud b/modules/audio/ext/soloud
new file mode 160000
index 0000000000..1157475881
--- /dev/null
+++ b/modules/audio/ext/soloud
@@ -0,0 +1 @@
+Subproject commit 1157475881da0d7f76102578255b937c7d4e8f57

From a82af895d7c78e2dceff6772863088dbee877589 Mon Sep 17 00:00:00 2001
From: Emma Broman <emma.broman@liu.se>
Date: Thu, 4 Apr 2024 10:20:24 +0200
Subject: [PATCH 359/701] Issue/3016 - Settings for jumpTo (#3080)

* Add script for jumpTo scene graph node and navigation state

* Add property to control how long the fading takes (navigation handler)

* Update GUI hash

---------

Co-authored-by: Alexander Bock <alexander.bock@liu.se>
---
 data/assets/util/webgui.asset                 |  2 +-
 ext/ghoul                                     |  2 +-
 .../openspace/navigation/navigationhandler.h  | 15 ++++
 src/navigation/navigationhandler.cpp          | 39 ++++++++++
 src/navigation/pathnavigator.cpp              |  3 +
 src/navigation/pathnavigator_lua.inl          | 75 +++++++++++++++++++
 6 files changed, 134 insertions(+), 2 deletions(-)

diff --git a/data/assets/util/webgui.asset b/data/assets/util/webgui.asset
index 11b3aad4ac..4f9fce44be 100644
--- a/data/assets/util/webgui.asset
+++ b/data/assets/util/webgui.asset
@@ -4,7 +4,7 @@ local guiCustomization = asset.require("customization/gui")
 
 
 -- Select which commit hashes to use for the frontend and backend
-local frontendHash = "e1ebc90f79f10bafe46aea72eb91fdf0e86876ad"
+local frontendHash = "0f745d1672eb63c37eaa9164f1e5f991f6c7795c"
 
 local frontend = asset.resource({
   Identifier = "WebGuiFrontend",
diff --git a/ext/ghoul b/ext/ghoul
index 51a579e7c7..d752364d0b 160000
--- a/ext/ghoul
+++ b/ext/ghoul
@@ -1 +1 @@
-Subproject commit 51a579e7c7a5260d66a2e16944f51d6009c56ddd
+Subproject commit d752364d0bb792f94a47097a0cceaf375e57448e
diff --git a/include/openspace/navigation/navigationhandler.h b/include/openspace/navigation/navigationhandler.h
index 3069ec0b1c..5ba261b7ee 100644
--- a/include/openspace/navigation/navigationhandler.h
+++ b/include/openspace/navigation/navigationhandler.h
@@ -85,7 +85,9 @@ public:
     OrbitalNavigator& orbitalNavigator();
     KeyframeNavigator& keyframeNavigator();
     PathNavigator& pathNavigator();
+
     bool isKeyFrameInteractionEnabled() const;
+    float jumpToFadeDuration() const;
     float interpolationTime() const;
 
     // Callback functions
@@ -165,6 +167,18 @@ public:
      */
     void setCameraFromNodeSpecNextFrame(NodeCameraStateSpec spec);
 
+    /**
+     * Trigger a transition script after first fading out the rendering, and fading in
+     * the rendering when the script is finished. One example use case could be to fade
+     * out, move the camera to another focus node, and then fade in
+     *
+     * \param transitionScript The Lua script to handle the transition. Can be anything
+     * \param fadeDuration An optional duration for the fading. If unspecified, use the
+     *                     JumpToFadeDuration property
+     */
+    void triggerFadeToTransition(const std::string& transitionScript,
+        std::optional<float> fadeDuration = std::nullopt);
+
     /**
      * \return The Lua library that contains all Lua functions available to affect the
      *         interaction
@@ -195,6 +209,7 @@ private:
     properties::BoolProperty _disableMouseInputs;
     properties::BoolProperty _disableJoystickInputs;
     properties::BoolProperty _useKeyFrameInteraction;
+    properties::FloatProperty _jumpToFadeDuration;
 };
 
 } // namespace openspace::interaction
diff --git a/src/navigation/navigationhandler.cpp b/src/navigation/navigationhandler.cpp
index 0b6f8f589c..4e45a6041f 100644
--- a/src/navigation/navigationhandler.cpp
+++ b/src/navigation/navigationhandler.cpp
@@ -90,6 +90,15 @@ namespace {
         "than using the mouse interaction",
         openspace::properties::Property::Visibility::Developer
     };
+
+    constexpr openspace::properties::Property::PropertyInfo JumpToFadeDurationInfo = {
+        "JumpToFadeDuration",
+        "JumpTo Fade Duration",
+        "The number of seconds the fading of the rendering should take per default when "
+        "navigating through a 'jump' transition. This is when the rendering is first "
+        "faded to black, then the camera is moved, and then the rendering fades in again",
+        openspace::properties::Property::Visibility::User
+    };
 } // namespace
 
 namespace openspace::interaction {
@@ -100,6 +109,7 @@ NavigationHandler::NavigationHandler()
     , _disableMouseInputs(DisableMouseInputInfo, false)
     , _disableJoystickInputs(DisableJoystickInputInfo, false)
     , _useKeyFrameInteraction(FrameInfo, false)
+    , _jumpToFadeDuration(JumpToFadeDurationInfo, 1.f, 0.f, 10.f)
 {
     addPropertySubOwner(_orbitalNavigator);
     addPropertySubOwner(_pathNavigator);
@@ -108,6 +118,7 @@ NavigationHandler::NavigationHandler()
     addProperty(_disableMouseInputs);
     addProperty(_disableJoystickInputs);
     addProperty(_useKeyFrameInteraction);
+    addProperty(_jumpToFadeDuration);
 }
 
 NavigationHandler::~NavigationHandler() {}
@@ -170,6 +181,10 @@ bool NavigationHandler::isKeyFrameInteractionEnabled() const {
     return _useKeyFrameInteraction;
 }
 
+float NavigationHandler::jumpToFadeDuration() const {
+    return _jumpToFadeDuration;
+}
+
 float NavigationHandler::interpolationTime() const {
     return _orbitalNavigator.retargetInterpolationTime();
 }
@@ -178,6 +193,30 @@ void NavigationHandler::setInterpolationTime(float durationInSeconds) {
     _orbitalNavigator.setRetargetInterpolationTime(durationInSeconds);
 }
 
+void NavigationHandler::triggerFadeToTransition(const std::string& transitionScript,
+                                                std::optional<float> fadeDuration)
+{
+    const float duration = fadeDuration.value_or(_jumpToFadeDuration);
+
+    const std::string onArrivalScript = std::format(
+        "{} "
+        "openspace.setPropertyValueSingle("
+        "'RenderEngine.BlackoutFactor', 1, {}, 'QuadraticEaseIn'"
+        ")", transitionScript, duration
+    );
+    const std::string script = std::format(
+        "openspace.setPropertyValueSingle("
+        "'RenderEngine.BlackoutFactor', 0, {}, 'QuadraticEaseOut', [[{}]]"
+        ")", duration, onArrivalScript
+    );
+    // No syncing, as this was called from a script that should have been synced already
+    global::scriptEngine->queueScript(
+        std::move(script),
+        scripting::ScriptEngine::ShouldBeSynchronized::No,
+        scripting::ScriptEngine::ShouldSendToRemote::No
+    );
+}
+
 void NavigationHandler::updateCamera(double deltaTime) {
     ghoul_assert(_camera != nullptr, "Camera must not be nullptr");
 
diff --git a/src/navigation/pathnavigator.cpp b/src/navigation/pathnavigator.cpp
index c623b79946..6d23a11721 100644
--- a/src/navigation/pathnavigator.cpp
+++ b/src/navigation/pathnavigator.cpp
@@ -44,6 +44,7 @@
 #include <ghoul/filesystem/file.h>
 #include <ghoul/filesystem/filesystem.h>
 #include <ghoul/logging/logmanager.h>
+#include <ghoul/misc/dictionaryluaformatter.h>
 #include <glm/gtx/quaternion.hpp>
 #include <glm/gtx/vector_angle.hpp>
 #include <vector>
@@ -600,6 +601,8 @@ scripting::LuaLibrary PathNavigator::luaLibrary() {
             codegen::lua::ZoomToFocus,
             codegen::lua::ZoomToDistance,
             codegen::lua::ZoomToDistanceRelative,
+            codegen::lua::JumpTo,
+            codegen::lua::JumpToNavigationState,
             codegen::lua::CreatePath
         }
     };
diff --git a/src/navigation/pathnavigator_lua.inl b/src/navigation/pathnavigator_lua.inl
index 060fe7f0d5..b9b3e0e18b 100644
--- a/src/navigation/pathnavigator_lua.inl
+++ b/src/navigation/pathnavigator_lua.inl
@@ -307,6 +307,81 @@ namespace {
     }
 }
 
+/**
+ * Fade rendering to black, jump to the specified node, and then fade in. This is done by
+ * triggering another script that handles the logic.
+ *
+ * If no fade duration is specified, use the property from Navigation Handler
+ */
+[[codegen::luawrap]] void jumpToNavigationState(ghoul::Dictionary navigationState,
+                                                std::optional<double> fadeDuration)
+{
+    using namespace openspace;
+    try {
+        documentation::testSpecificationAndThrow(
+            interaction::NavigationState::Documentation(),
+            navigationState,
+            "NavigationState"
+        );
+    }
+    catch (const documentation::SpecificationError& e) {
+        logError(e, "jumpToNavigationState");
+        throw ghoul::lua::LuaError(std::format(
+            "Unable to jump to navigation state: {}", e.what()
+        ));
+    }
+
+    // When copy pasting a printed navigation state from the console, the formatting of
+    // the navigation state dictionary won't be completely correct if using the
+    // dictionary directly, due to the number keys for arrays. We solve this by first
+    // creating an object of the correct datatype
+    // (@TODO emmbr 2024-04-03, This formatting problem should probably be fixed)
+    interaction::NavigationState ns = interaction::NavigationState(navigationState);
+
+    const std::string script = std::format(
+        "openspace.navigation.setNavigationState({})", ghoul::formatLua(ns.dictionary())
+    );
+
+    if (fadeDuration.has_value()) {
+        global::navigationHandler->triggerFadeToTransition(
+            std::move(script),
+            static_cast<float>(*fadeDuration)
+        );
+    }
+    else {
+        global::navigationHandler->triggerFadeToTransition(script);
+    }
+}
+
+/**
+ * Fade rendering to black, jump to the specified navigation state, and then fade in.
+ * This is done by triggering another script that handles the logic.
+ *
+ * If no fade duration is specified, use the property from Navigation Handler
+ */
+[[codegen::luawrap]] void jumpTo(std::string nodeIdentifier,
+                                 std::optional<double> fadeDuration)
+{
+    using namespace openspace;
+    if (SceneGraphNode* n = sceneGraphNode(nodeIdentifier);  !n) {
+        throw ghoul::lua::LuaError("Unknown node name: " + nodeIdentifier);
+    }
+
+    const std::string script = std::format(
+        "openspace.pathnavigation.flyTo('{}', 0)", nodeIdentifier
+    );
+
+    if (fadeDuration.has_value()) {
+        global::navigationHandler->triggerFadeToTransition(
+            std::move(script),
+            static_cast<float>(*fadeDuration)
+        );
+    }
+    else {
+        global::navigationHandler->triggerFadeToTransition(script);
+    }
+}
+
 // Create a camera path as described by the lua table input argument.
 [[codegen::luawrap]] void createPath(ghoul::Dictionary path) {
     using namespace openspace;

From 9558f2bcbbf966df393735e9a2891736f1abede5 Mon Sep 17 00:00:00 2001
From: Alexander Bock <alexander.bock@liu.se>
Date: Thu, 4 Apr 2024 16:16:01 +0200
Subject: [PATCH 360/701] Add the ability to specifiy local Sun position for
 the RenderableGlobe and RenderableAtmosphere (#3137)

* Add the ability to specifiy local Sun position for the RenderableGlobe and RenderableAtmosphere

Note that for planets with atmospheres, the SunNode has to be specified for _both_ the globe and the atmosphere separately

 - Closes #1745
 - Closes #2243
---
 .../rendering/atmospheredeferredcaster.cpp    |  9 ++-
 .../rendering/atmospheredeferredcaster.h      |  3 +-
 .../rendering/renderableatmosphere.cpp        | 41 ++++++++++++-
 .../rendering/renderableatmosphere.h          |  2 +
 modules/exoplanets/exoplanetsmodule_lua.inl   |  5 +-
 modules/globebrowsing/src/renderableglobe.cpp | 60 +++++++++++++++++--
 modules/globebrowsing/src/renderableglobe.h   |  6 +-
 7 files changed, 113 insertions(+), 13 deletions(-)

diff --git a/modules/atmosphere/rendering/atmospheredeferredcaster.cpp b/modules/atmosphere/rendering/atmospheredeferredcaster.cpp
index 0bcf5b29e5..bae86d11ee 100644
--- a/modules/atmosphere/rendering/atmospheredeferredcaster.cpp
+++ b/modules/atmosphere/rendering/atmospheredeferredcaster.cpp
@@ -382,7 +382,9 @@ void AtmosphereDeferredcaster::preRaycast(const RenderData& data, const Deferred
             invModelMatrix * glm::dvec4(data.camera.eyePositionVec3(), 1.0);
         program.setUniform(_uniformCache.camPosObj, glm::dvec3(camPosObjCoords));
 
-        SceneGraphNode* node = sceneGraph()->sceneGraphNode("Sun");
+        // For the lighting we use the provided node, or the Sun
+        SceneGraphNode* node =
+            _lightSourceNode ? _lightSourceNode : sceneGraph()->sceneGraphNode("Sun");
         const glm::dvec3 sunPosWorld = node ? node->worldPosition() : glm::dvec3(0.0);
 
         glm::dvec3 sunPosObj;
@@ -574,7 +576,8 @@ void AtmosphereDeferredcaster::setParameters(float atmosphereRadius, float plane
                                              glm::vec3 ozoneExtinctionCoefficients,
                                              glm::vec3 mieScatteringCoefficients,
                                              glm::vec3 mieExtinctionCoefficients,
-                                             bool sunFollowing, float sunAngularSize)
+                                             bool sunFollowing, float sunAngularSize,
+                                             SceneGraphNode* lightSourceNode)
 {
     _atmosphereRadius = atmosphereRadius;
     _atmospherePlanetRadius = planetRadius;
@@ -592,6 +595,8 @@ void AtmosphereDeferredcaster::setParameters(float atmosphereRadius, float plane
     _mieExtinctionCoeff = std::move(mieExtinctionCoefficients);
     _sunFollowingCameraEnabled = sunFollowing;
     _sunAngularSize = sunAngularSize;
+    // The light source may be nullptr which we interpret to mean a position of (0,0,0)
+    _lightSourceNode = lightSourceNode;
 }
 
 void AtmosphereDeferredcaster::setHardShadows(bool enabled) {
diff --git a/modules/atmosphere/rendering/atmospheredeferredcaster.h b/modules/atmosphere/rendering/atmospheredeferredcaster.h
index 89e80d075f..861a161c6b 100644
--- a/modules/atmosphere/rendering/atmospheredeferredcaster.h
+++ b/modules/atmosphere/rendering/atmospheredeferredcaster.h
@@ -88,7 +88,7 @@ public:
         float mieHeightScale, float miePhaseConstant, float sunRadiance,
         glm::vec3 rayScatteringCoefficients, glm::vec3 ozoneExtinctionCoefficients,
         glm::vec3 mieScatteringCoefficients, glm::vec3 mieExtinctionCoefficients,
-        bool sunFollowing, float sunAngularSize);
+        bool sunFollowing, float sunAngularSize, SceneGraphNode* lightSourceNode);
 
     void setHardShadows(bool enabled);
 
@@ -142,6 +142,7 @@ private:
     float _miePhaseConstant = 0.f;
     float _sunRadianceIntensity = 5.f;
     float _sunAngularSize = 0.3f;
+    SceneGraphNode* _lightSourceNode = nullptr;
 
     glm::vec3 _rayleighScatteringCoeff = glm::vec3(0.f);
     glm::vec3 _ozoneExtinctionCoeff = glm::vec3(0.f);
diff --git a/modules/atmosphere/rendering/renderableatmosphere.cpp b/modules/atmosphere/rendering/renderableatmosphere.cpp
index fa189f8542..9d93a18803 100644
--- a/modules/atmosphere/rendering/renderableatmosphere.cpp
+++ b/modules/atmosphere/rendering/renderableatmosphere.cpp
@@ -30,6 +30,7 @@
 #include <openspace/documentation/verifier.h>
 #include <openspace/engine/globals.h>
 #include <openspace/navigation/navigationhandler.h>
+#include <openspace/query/query.h>
 #include <ghoul/misc/profiling.h>
 #include <openspace/properties/property.h>
 #include <openspace/rendering/deferredcastermanager.h>
@@ -182,6 +183,15 @@ namespace {
         openspace::properties::Property::Visibility::AdvancedUser
     };
 
+    constexpr openspace::properties::Property::PropertyInfo LightSourceNodeInfo = {
+        "LightSourceNode",
+        "Name of the light source",
+        "This value is the name of a scene graph node that should be used as the source "
+        "of illumination for the atmosphere. If this value is not specified, the solar "
+        "system's Sun is used instead",
+        openspace::properties::Property::Visibility::AdvancedUser
+    };
+
     struct [[codegen::Dictionary(RenderableAtmosphere)]] Parameters {
         struct ShadowGroup {
             // Individual light sources
@@ -270,6 +280,9 @@ namespace {
 
         // [[codegen::verbatim(SunAngularSize.description)]]
         std::optional<float> sunAngularSize [[codegen::inrange(0.0, 180.0)]];
+
+        // [[codegen::verbatim(LightSourceNodeInfo.description)]]
+        std::optional<std::string> lightSourceNode;
     };
 #include "renderableatmosphere_codegen.cpp"
 
@@ -311,6 +324,7 @@ RenderableAtmosphere::RenderableAtmosphere(const ghoul::Dictionary& dictionary)
     , _sunFollowingCameraEnabled(EnableSunOnCameraPositionInfo, false)
     , _hardShadowsEnabled(EclipseHardShadowsInfo, false)
     , _sunAngularSize(SunAngularSize, 0.3f, 0.f, 180.f)
+    , _lightSourceNodeName(LightSourceNodeInfo)
     , _atmosphereDimmingHeight(AtmosphereDimmingHeightInfo, 0.7f, 0.f, 1.f)
     , _atmosphereDimmingSunsetAngle(
         SunsetAngleInfo,
@@ -435,6 +449,30 @@ RenderableAtmosphere::RenderableAtmosphere(const ghoul::Dictionary& dictionary)
     _sunAngularSize = p.sunAngularSize.value_or(_sunAngularSize);
     _sunAngularSize.onChange(updateWithoutCalculation);
     addProperty(_sunAngularSize);
+
+    _lightSourceNodeName.onChange([this]() {
+        if (_lightSourceNodeName.value().empty()) {
+            _lightSourceNode = nullptr;
+            return;
+        }
+
+        SceneGraphNode* n = sceneGraphNode(_lightSourceNodeName);
+        if (!n) {
+            LERRORC(
+                "RenderabeAtmosphere",
+                std::format(
+                    "Could not find node '{}' as illumination for '{}'",
+                    _lightSourceNodeName.value(), identifier()
+                )
+            );
+        }
+        else {
+            _lightSourceNode = n;
+            _deferredCasterNeedsUpdate = true;
+        }
+    });
+    _lightSourceNodeName = p.lightSourceNode.value_or("");
+    addProperty(_lightSourceNodeName);
 }
 
 void RenderableAtmosphere::deinitializeGL() {
@@ -510,7 +548,8 @@ void RenderableAtmosphere::updateAtmosphereParameters() {
         _mieScatteringCoeff,
         _mieExtinctionCoeff,
         _sunFollowingCameraEnabled,
-        _sunAngularSize
+        _sunAngularSize,
+        _lightSourceNode
     );
     _deferredcaster->setHardShadows(_hardShadowsEnabled);
 }
diff --git a/modules/atmosphere/rendering/renderableatmosphere.h b/modules/atmosphere/rendering/renderableatmosphere.h
index 589119da7f..e038b9fd46 100644
--- a/modules/atmosphere/rendering/renderableatmosphere.h
+++ b/modules/atmosphere/rendering/renderableatmosphere.h
@@ -97,6 +97,8 @@ private:
     properties::BoolProperty _sunFollowingCameraEnabled;
     properties::BoolProperty _hardShadowsEnabled;
     properties::FloatProperty _sunAngularSize;
+    SceneGraphNode* _lightSourceNode = nullptr;
+    properties::StringProperty _lightSourceNodeName;
 
     // Atmosphere dimming
     properties::FloatProperty _atmosphereDimmingHeight;
diff --git a/modules/exoplanets/exoplanetsmodule_lua.inl b/modules/exoplanets/exoplanetsmodule_lua.inl
index 7de1de7e6f..5b00eae729 100644
--- a/modules/exoplanets/exoplanetsmodule_lua.inl
+++ b/modules/exoplanets/exoplanetsmodule_lua.inl
@@ -295,8 +295,9 @@ void createExoplanetSystem(const std::string& starName,
                 "Enabled = " + enabled + ","
                 "Radii = " + std::to_string(planetRadius) + "," // in meters
                 "SegmentsPerPatch = 64,"
-                "PerformShading = false,"
-                "Layers = {}"
+                "PerformShading = true,"
+                "Layers = {},"
+                "LightSourceNode = '" + starIdentifier + "'"
             "},"
             "Transform = { "
                 "Translation = " + planetKeplerTranslation + ""
diff --git a/modules/globebrowsing/src/renderableglobe.cpp b/modules/globebrowsing/src/renderableglobe.cpp
index ff921efe5b..4cedebc51a 100644
--- a/modules/globebrowsing/src/renderableglobe.cpp
+++ b/modules/globebrowsing/src/renderableglobe.cpp
@@ -34,6 +34,7 @@
 #include <openspace/documentation/verifier.h>
 #include <openspace/engine/globals.h>
 #include <openspace/interaction/sessionrecording.h>
+#include <openspace/query/query.h>
 #include <openspace/rendering/renderengine.h>
 #include <openspace/scene/scenegraphnode.h>
 #include <openspace/scene/scene.h>
@@ -180,6 +181,15 @@ namespace {
         openspace::properties::Property::Visibility::AdvancedUser
     };
 
+    constexpr openspace::properties::Property::PropertyInfo LightSourceNodeInfo = {
+        "LightSourceNode",
+        "Name of the light source",
+        "This value is the name of a scene graph node that should be used as the source "
+        "of illumination for the globe. If this value is not specified, the solar "
+        "system's Sun is used instead",
+        openspace::properties::Property::Visibility::AdvancedUser
+    };
+
     constexpr openspace::properties::Property::PropertyInfo EclipseInfo = {
         "Eclipse",
         "Eclipse",
@@ -310,6 +320,9 @@ namespace {
 
         std::optional<ghoul::Dictionary> shadows
             [[codegen::reference("globebrowsing_shadows_component")]];
+
+        // [[codegen::verbatim(LightSourceNodeInfo.description)]]
+        std::optional<std::string> lightSourceNode;
     };
 #include "renderableglobe_codegen.cpp"
 } // namespace
@@ -531,6 +544,24 @@ bool intersects(const AABB3& bb, const AABB3& o) {
         && (bb.min.z <= o.max.z) && (o.min.z <= bb.max.z);
 }
 
+/**
+ * Calculates the direction towards the local light source. If \p illumination is a
+ * `nullptr`, it is interpreted to be (0,0,0)
+ */
+glm::dvec3 directionToLightSource(const glm::dvec3& pos, SceneGraphNode* lightSource) {
+    // For the lighting we use the provided node, or the Sun
+    SceneGraphNode* node =
+        lightSource ? lightSource : sceneGraph()->sceneGraphNode("Sun");
+
+    if (lightSource) {
+        return lightSource->worldPosition() - pos;
+    }
+    else {
+        const glm::dvec3 dir = length(pos) > 0.0 ? glm::normalize(-pos) : glm::dvec3(0.0);
+        return dir;
+    }
+}
+
 } // namespace
 
 Chunk::Chunk(const TileIndex& ti)
@@ -573,6 +604,7 @@ RenderableGlobe::RenderableGlobe(const ghoul::Dictionary& dictionary)
     , _grid(DefaultSkirtedGridSegments, DefaultSkirtedGridSegments)
     , _leftRoot(Chunk(LeftHemisphereIndex))
     , _rightRoot(Chunk(RightHemisphereIndex))
+    , _lightSourceNodeName(LightSourceNodeInfo)
 {
     const Parameters p = codegen::bake<Parameters>(dictionary);
 
@@ -615,6 +647,26 @@ RenderableGlobe::RenderableGlobe(const ghoul::Dictionary& dictionary)
     addProperty(_generalProperties.useAccurateNormals);
     addProperty(_generalProperties.renderAtDistance);
 
+    _lightSourceNodeName.onChange([this]() {
+        if (_lightSourceNodeName.value().empty()) {
+            _lightSourceNode = nullptr;
+            return;
+        }
+
+        SceneGraphNode* n = sceneGraphNode(_lightSourceNodeName);
+        if (!n) {
+            LERROR(std::format(
+                "Could not find node '{}' as illumination for '{}'",
+                _lightSourceNodeName.value(), identifier()
+            ));
+        }
+        else {
+            _lightSourceNode = n;
+        }
+    });
+    _lightSourceNodeName = p.lightSourceNode.value_or("");
+    addProperty(_lightSourceNodeName);
+
     if (p.shadowGroup.has_value()) {
         std::vector<Ellipsoid::ShadowConfiguration> shadowConfArray;
         for (const Parameters::ShadowGroup::Source& source : p.shadowGroup->sources) {
@@ -1165,9 +1217,7 @@ void RenderableGlobe::renderChunks(const RenderData& data, RendererTasks&,
 
     if (nightLayersActive || waterLayersActive || _generalProperties.performShading) {
         const glm::dvec3 directionToSunWorldSpace =
-            length(data.modelTransform.translation) > 0.0 ?
-            glm::normalize(-data.modelTransform.translation) :
-            glm::dvec3(0.0);
+            directionToLightSource(data.modelTransform.translation, _lightSourceNode);
 
         const glm::vec3 directionToSunCameraSpace = glm::vec3(viewTransform *
             glm::dvec4(directionToSunWorldSpace, 0));
@@ -1193,9 +1243,7 @@ void RenderableGlobe::renderChunks(const RenderData& data, RendererTasks&,
 
     if (nightLayersActive || waterLayersActive || _generalProperties.performShading) {
         const glm::dvec3 directionToSunWorldSpace =
-            length(data.modelTransform.translation) > 0.0 ?
-            glm::normalize(-data.modelTransform.translation) :
-            glm::dvec3(0.0);
+            directionToLightSource(data.modelTransform.translation, _lightSourceNode);
 
         const glm::vec3 directionToSunCameraSpace = glm::vec3(viewTransform *
             glm::dvec4(directionToSunWorldSpace, 0));
diff --git a/modules/globebrowsing/src/renderableglobe.h b/modules/globebrowsing/src/renderableglobe.h
index a3baeb1ff6..3b5046e97d 100644
--- a/modules/globebrowsing/src/renderableglobe.h
+++ b/modules/globebrowsing/src/renderableglobe.h
@@ -37,9 +37,10 @@
 #include <modules/globebrowsing/src/shadowcomponent.h>
 #include <modules/globebrowsing/src/skirtedgrid.h>
 #include <modules/globebrowsing/src/tileindex.h>
+#include <openspace/properties/scalar/boolproperty.h>
 #include <openspace/properties/scalar/floatproperty.h>
 #include <openspace/properties/scalar/intproperty.h>
-#include <openspace/properties/scalar/boolproperty.h>
+#include <openspace/properties/stringproperty.h>
 #include <ghoul/misc/memorypool.h>
 #include <ghoul/opengl/uniformcache.h>
 #include <cstddef>
@@ -288,6 +289,9 @@ private:
         std::array<GPULayerGroup, LayerManager::NumLayerGroups> gpuLayerGroups;
     } _localRenderer;
 
+    SceneGraphNode* _lightSourceNode = nullptr;
+    properties::StringProperty _lightSourceNodeName;
+
     bool _shadersNeedRecompilation = true;
     bool _lodScaleFactorDirty = true;
     bool _chunkCornersDirty = true;

From 4049501406023ef3e42c58df956384e2b6e17844 Mon Sep 17 00:00:00 2001
From: Alexander Bock <alexander.bock@liu.se>
Date: Thu, 4 Apr 2024 17:09:34 +0200
Subject: [PATCH 361/701] Adding a function to return whether OpenSpace
 currently is paused

---
 include/openspace/util/timemanager.h        | 17 +++---
 modules/imgui/src/guispacetimecomponent.cpp |  7 ++-
 src/network/parallelpeer.cpp                |  9 +--
 src/util/time.cpp                           |  1 +
 src/util/time_lua.inl                       |  7 +++
 src/util/timemanager.cpp                    | 67 ++++++++++++---------
 6 files changed, 61 insertions(+), 47 deletions(-)

diff --git a/include/openspace/util/timemanager.h b/include/openspace/util/timemanager.h
index da1775b6a7..cc4fdfecb7 100644
--- a/include/openspace/util/timemanager.h
+++ b/include/openspace/util/timemanager.h
@@ -41,18 +41,18 @@
 
 namespace openspace {
 
-struct TimeKeyframeData {
-    Time time;
-    double delta = 0.0;
-    bool pause = false;
-    bool jump = false;
-};
-
 class TimeManager : public properties::PropertyOwner {
 public:
     using CallbackHandle = int;
     using TimeChangeCallback = std::function<void()>;
 
+    struct TimeKeyframeData {
+        Time time;
+        double delta = 0.0;
+        bool pause = false;
+        bool jump = false;
+    };
+
     TimeManager();
 
     const Time& time() const;
@@ -137,11 +137,8 @@ private:
 
     void addDeltaTimesKeybindings();
     void clearDeltaTimesKeybindings();
-    double currentApplicationTimeForInterpolation() const;
     double previousApplicationTimeForInterpolation() const;
 
-    bool isPlayingBackSessionRecording() const;
-
     Timeline<TimeKeyframeData> _timeline;
     SyncData<Time> _currentTime;
     SyncData<Time> _integrateFromTime;
diff --git a/modules/imgui/src/guispacetimecomponent.cpp b/modules/imgui/src/guispacetimecomponent.cpp
index a851c9a1e6..4801528fd6 100644
--- a/modules/imgui/src/guispacetimecomponent.cpp
+++ b/modules/imgui/src/guispacetimecomponent.cpp
@@ -230,9 +230,10 @@ void GuiSpaceTimeComponent::render() {
 
         const float duration = global::timeManager->defaultTimeInterpolationDuration();
 
-        const TimeKeyframeData predictedTime = global::timeManager->interpolate(
-            global::windowDelegate->applicationTime() + duration
-        );
+        const TimeManager::TimeKeyframeData predictedTime =
+            global::timeManager->interpolate(
+                global::windowDelegate->applicationTime() + duration
+            );
         const double j2000 = predictedTime.time.j2000Seconds();
         const long long seconds = duration_cast<std::chrono::seconds>(
             std::chrono::hours(24) * std::abs(days)
diff --git a/src/network/parallelpeer.cpp b/src/network/parallelpeer.cpp
index 53d7b99f80..693e22efa2 100644
--- a/src/network/parallelpeer.cpp
+++ b/src/network/parallelpeer.cpp
@@ -367,7 +367,7 @@ void ParallelPeer::dataMessageReceived(const std::vector<char>& message) {
 
             for (const datamessagestructures::TimeKeyframe& kfMessage : keyframesMessage)
             {
-                TimeKeyframeData timeKeyframeData;
+                TimeManager::TimeKeyframeData timeKeyframeData;
                 timeKeyframeData.delta = kfMessage._dt;
                 timeKeyframeData.pause = kfMessage._paused;
                 timeKeyframeData.time = Time(kfMessage._time);
@@ -732,8 +732,9 @@ void ParallelPeer::sendCameraKeyframe() {
 
 void ParallelPeer::sendTimeTimeline() {
     // Create a keyframe with current position and orientation of camera
-    const Timeline<TimeKeyframeData>& timeline = global::timeManager->timeline();
-    std::deque<Keyframe<TimeKeyframeData>> keyframes = timeline.keyframes();
+    const Timeline<TimeManager::TimeKeyframeData>& timeline =
+        global::timeManager->timeline();
+    std::deque<Keyframe<TimeManager::TimeKeyframeData>> keyframes = timeline.keyframes();
 
     datamessagestructures::TimeTimeline timelineMessage;
     timelineMessage._clear = true;
@@ -741,7 +742,7 @@ void ParallelPeer::sendTimeTimeline() {
 
     // Case 1: Copy all keyframes from the native timeline
     for (size_t i = 0; i < timeline.nKeyframes(); i++) {
-        const Keyframe<TimeKeyframeData>& kf = keyframes.at(i);
+        const Keyframe<TimeManager::TimeKeyframeData>& kf = keyframes.at(i);
 
         datamessagestructures::TimeKeyframe kfMessage;
         kfMessage._time = kf.data.time.j2000Seconds();
diff --git a/src/util/time.cpp b/src/util/time.cpp
index 5567f75111..d46edef658 100644
--- a/src/util/time.cpp
+++ b/src/util/time.cpp
@@ -212,6 +212,7 @@ scripting::LuaLibrary Time::luaLibrary() {
             codegen::lua::PauseToggleViaKeyboard,
             codegen::lua::SetPause,
             codegen::lua::InterpolatePause,
+            codegen::lua::IsPaused,
             codegen::lua::SetTime,
             codegen::lua::InterpolateTime,
             codegen::lua::InterpolateTimeRelative,
diff --git a/src/util/time_lua.inl b/src/util/time_lua.inl
index 811c808a13..a0dd915112 100644
--- a/src/util/time_lua.inl
+++ b/src/util/time_lua.inl
@@ -191,6 +191,13 @@ namespace {
     global::timeManager->interpolatePause(isPaused, interp);
 }
 
+/**
+ * Returns whether the simulation time is currently paused or is progressing.
+ */
+[[codegen::luawrap]] bool isPaused() {
+    return openspace::global::timeManager->isPaused();
+}
+
 /**
  * Sets the current simulation time to the specified value. If the parameter is a number,
  * the value is the number of seconds past the J2000 epoch. If it is a string, it has to
diff --git a/src/util/timemanager.cpp b/src/util/timemanager.cpp
index 2f704f39a4..52884a9927 100644
--- a/src/util/timemanager.cpp
+++ b/src/util/timemanager.cpp
@@ -77,13 +77,33 @@ namespace {
     constexpr std::string_view DeltaTimeStepsGuiPath = "/Time/Simulation Speed/Steps";
 
     constexpr std::string_view DeltaTimeActionPrefix = "core.time.delta_time";
+
+    bool isPlayingBackSessionRecording() {
+        using namespace openspace;
+
+        return (global::openSpaceEngine->currentMode() ==
+                OpenSpaceEngine::Mode::SessionRecordingPlayback);
+    }
+
+    double currentApplicationTimeForInterpolation() {
+        using namespace openspace;
+
+        if (global::sessionRecording->isSavingFramesDuringPlayback()) {
+            return global::sessionRecording->currentApplicationInterpolationTime();
+        }
+        else {
+            return global::windowDelegate->applicationTime();
+    }
+}
+
 } // namespace
 
 namespace openspace {
 
 TimeManager::TimeManager()
     : properties::PropertyOwner({ "TimeManager", "Time Manager" })
-    , _defaultTimeInterpolationDuration(DefaultTimeInterpolationDurationInfo,
+    , _defaultTimeInterpolationDuration(
+        DefaultTimeInterpolationDurationInfo,
         2.f,
         0.f,
         5.f
@@ -125,13 +145,13 @@ void TimeManager::interpolateTime(double targetTime, double durationSeconds) {
     const double now = currentApplicationTimeForInterpolation();
     const bool pause = isPaused();
 
-    const TimeKeyframeData current = {
+    TimeKeyframeData current = {
         .time = time(),
         .delta = deltaTime(),
         .pause = false,
         .jump = false
     };
-    const TimeKeyframeData next = {
+    TimeKeyframeData next = {
         .time = Time(targetTime),
         .delta = targetDeltaTime(),
         .pause = pause,
@@ -139,8 +159,8 @@ void TimeManager::interpolateTime(double targetTime, double durationSeconds) {
     };
 
     clearKeyframes();
-    addKeyframe(now, current);
-    addKeyframe(now + durationSeconds, next);
+    addKeyframe(now, std::move(current));
+    addKeyframe(now + durationSeconds, std::move(next));
 }
 
 void TimeManager::interpolateTimeRelative(double delta, double durationSeconds) {
@@ -211,7 +231,7 @@ void TimeManager::preSynchronization(double dt) {
     _previousApplicationTime = currentApplicationTimeForInterpolation();
 }
 
-TimeKeyframeData TimeManager::interpolate(double applicationTime) {
+TimeManager::TimeKeyframeData TimeManager::interpolate(double applicationTime) {
     const std::deque<Keyframe<TimeKeyframeData>>& keyframes = _timeline.keyframes();
 
     auto firstFutureKeyframe = std::lower_bound(
@@ -345,9 +365,10 @@ void TimeManager::progressTime(double dt) {
     }
 }
 
-TimeKeyframeData TimeManager::interpolate(const Keyframe<TimeKeyframeData>& past,
-                                          const Keyframe<TimeKeyframeData>& future,
-                                          double time)
+TimeManager::TimeKeyframeData TimeManager::interpolate(
+                                                   const Keyframe<TimeKeyframeData>& past,
+                                                 const Keyframe<TimeKeyframeData>& future,
+                                                                              double time)
 {
     // https://en.wikipedia.org/wiki/Spline_interpolation
     // interpolatedTime = (1 - t)y1 + t*y2 + t(1 - t)(a(1 - t) + bt), where
@@ -592,7 +613,7 @@ const Time& TimeManager::integrateFromTime() const {
     return _integrateFromTime;
 }
 
-const Timeline<TimeKeyframeData>& TimeManager::timeline() const {
+const Timeline<TimeManager::TimeKeyframeData>& TimeManager::timeline() const {
     return _timeline;
 }
 
@@ -613,8 +634,8 @@ TimeManager::CallbackHandle TimeManager::addDeltaTimeChangeCallback(TimeChangeCa
     return handle;
 }
 
-TimeManager::CallbackHandle
-TimeManager::addDeltaTimeStepsChangeCallback(TimeChangeCallback cb)
+TimeManager::CallbackHandle TimeManager::addDeltaTimeStepsChangeCallback(
+                                                                    TimeChangeCallback cb)
 {
     const CallbackHandle handle = _nextCallbackHandle++;
     _deltaTimeStepsChangeCallbacks.emplace_back(handle, std::move(cb));
@@ -768,13 +789,13 @@ void TimeManager::interpolateDeltaTime(double newDeltaTime, double interpolation
         time().j2000Seconds() + (_deltaTime + newDeltaTime) * 0.5 * interpolationDuration
     );
 
-    const TimeKeyframeData currentKeyframe = {
+    TimeKeyframeData currentKeyframe = {
         .time = time(),
         .delta = _deltaTime,
         .pause = false,
         .jump = false
     };
-    const TimeKeyframeData futureKeyframe = {
+    TimeKeyframeData futureKeyframe = {
         .time = newTime,
         .delta = newDeltaTime,
         .pause = false,
@@ -787,8 +808,8 @@ void TimeManager::interpolateDeltaTime(double newDeltaTime, double interpolation
         previousApplicationTimeForInterpolation() :
         currentApplicationTimeForInterpolation();
 
-    addKeyframe(now, currentKeyframe);
-    addKeyframe(now + interpolationDuration, futureKeyframe);
+    addKeyframe(now, std::move(currentKeyframe));
+    addKeyframe(now + interpolationDuration, std::move(futureKeyframe));
 }
 
 std::optional<double> TimeManager::nextDeltaTimeStep() {
@@ -914,15 +935,6 @@ void TimeManager::interpolatePause(bool pause, double interpolationDuration) {
     addKeyframe(now + interpolationDuration, futureKeyframe);
 }
 
-double TimeManager::currentApplicationTimeForInterpolation() const {
-    if (global::sessionRecording->isSavingFramesDuringPlayback()) {
-        return global::sessionRecording->currentApplicationInterpolationTime();
-    }
-    else {
-        return global::windowDelegate->applicationTime();
-    }
-}
-
 double TimeManager::previousApplicationTimeForInterpolation() const {
     // If playing back with frames, this function needs to be called when a time rate
     // interpolation (either speed change or pause) begins and ends. If the application
@@ -935,11 +947,6 @@ double TimeManager::previousApplicationTimeForInterpolation() const {
     return _previousApplicationTime;
 }
 
-bool TimeManager::isPlayingBackSessionRecording() const {
-    return (global::openSpaceEngine->currentMode() ==
-        OpenSpaceEngine::Mode::SessionRecordingPlayback);
-}
-
 void TimeManager::setTimeFromProfile(const Profile& p) {
     if (p.time.has_value()) {
         switch (p.time->type) {

From 68983e1c6b986c12f460b06fbc49071e5493f97b Mon Sep 17 00:00:00 2001
From: Alexander Bock <mail@alexanderbock.eu>
Date: Thu, 4 Apr 2024 22:40:39 +0200
Subject: [PATCH 362/701] Update copyright header

---
 apps/OpenSpace/ext/sgct | 2 +-
 ext/ghoul               | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/apps/OpenSpace/ext/sgct b/apps/OpenSpace/ext/sgct
index cbcf4aa7d5..98c7b2f838 160000
--- a/apps/OpenSpace/ext/sgct
+++ b/apps/OpenSpace/ext/sgct
@@ -1 +1 @@
-Subproject commit cbcf4aa7d5a7a248f97237ca003b1efe3a9ae17c
+Subproject commit 98c7b2f83822d7aef447256f35f42107b5afad5e
diff --git a/ext/ghoul b/ext/ghoul
index d752364d0b..4f09dfcd6c 160000
--- a/ext/ghoul
+++ b/ext/ghoul
@@ -1 +1 @@
-Subproject commit d752364d0bb792f94a47097a0cceaf375e57448e
+Subproject commit 4f09dfcd6c2628af1d3646afefc0aa50ced3bd50

From 76b99a2e01c338d51569108cd36fdf10c201f8dc Mon Sep 17 00:00:00 2001
From: Alexander Bock <alexander.bock@liu.se>
Date: Fri, 5 Apr 2024 11:18:32 +0200
Subject: [PATCH 363/701] Mutex-protect the time conversion in the
 URLSynchronization to prevent a rare crash when accessing SpiceManager
 multithreaded

---
 modules/sync/syncs/urlsynchronization.cpp | 5 ++++-
 modules/sync/syncs/urlsynchronization.h   | 2 ++
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/modules/sync/syncs/urlsynchronization.cpp b/modules/sync/syncs/urlsynchronization.cpp
index f40c55d748..817032e00b 100644
--- a/modules/sync/syncs/urlsynchronization.cpp
+++ b/modules/sync/syncs/urlsynchronization.cpp
@@ -222,8 +222,11 @@ bool UrlSynchronization::isEachFileValid() {
     // Valid to: yyyy-mm-ddThr:mn:sc.xxx
 
     if (ossyncVersion == "1.0") {
+        // We need to mutex-protect the access to the time conversion for now
+        std::lock_guard guard(_mutex);
+
         ghoul::getline(file >> std::ws, line);
-        std::string& fileIsValidToDate = line;
+        const std::string& fileIsValidToDate = line;
         const double fileValidAsJ2000 = Time::convertTime(fileIsValidToDate);
 
         const std::string todaysDate = Time::currentWallTime();
diff --git a/modules/sync/syncs/urlsynchronization.h b/modules/sync/syncs/urlsynchronization.h
index 6707f7e3bc..b569de3595 100644
--- a/modules/sync/syncs/urlsynchronization.h
+++ b/modules/sync/syncs/urlsynchronization.h
@@ -122,6 +122,8 @@ private:
 
     /// Determines how long the file is valid before it should be downloaded again
     double _secondsUntilResync = MaxDateAsJ2000;
+
+    std::mutex _mutex;
 };
 
 } // namespace openspace

From c26f903e47fbc553eb1fa1ba8cec1bbe0625cafb Mon Sep 17 00:00:00 2001
From: Emma Broman <emma.broman@liu.se>
Date: Fri, 5 Apr 2024 14:19:31 +0200
Subject: [PATCH 364/701] Correctly reset face culling state after
 RenderableSphere rendering (closes #1128)

---
 modules/base/rendering/renderablesphere.cpp | 1 +
 1 file changed, 1 insertion(+)

diff --git a/modules/base/rendering/renderablesphere.cpp b/modules/base/rendering/renderablesphere.cpp
index ac8b2db74b..c0b5070127 100644
--- a/modules/base/rendering/renderablesphere.cpp
+++ b/modules/base/rendering/renderablesphere.cpp
@@ -350,6 +350,7 @@ void RenderableSphere::render(const RenderData& data, RendererTasks&) {
     // Reset
     global::renderEngine->openglStateCache().resetBlendState();
     global::renderEngine->openglStateCache().resetDepthState();
+    global::renderEngine->openglStateCache().resetPolygonAndClippingState();
     unbindTexture();
 
     if (orientation == Orientation::Inside) {

From 2af06fb6417cfce91eaa849ac9911769b8920588 Mon Sep 17 00:00:00 2001
From: Emma Broman <emma.broman@liu.se>
Date: Fri, 5 Apr 2024 14:20:11 +0200
Subject: [PATCH 365/701] Add asset setting to skip first data point in
 RenderablePointCloud (#3161)

* Add asset setting to skip first data point

To hide our galaxy in the Tully datasets

* Apply suggestions from code review

Co-authored-by: Alexander Bock <alexander.bock@liu.se>

---------

Co-authored-by: Alexander Bock <alexander.bock@liu.se>
---
 data/assets/scene/digitaluniverse/tully.asset        |  1 +
 .../pointcloud/renderableinterpolatedpoints.cpp      |  8 ++++++++
 .../rendering/pointcloud/renderablepointcloud.cpp    | 12 +++++++++++-
 .../base/rendering/pointcloud/renderablepointcloud.h |  1 +
 4 files changed, 21 insertions(+), 1 deletion(-)

diff --git a/data/assets/scene/digitaluniverse/tully.asset b/data/assets/scene/digitaluniverse/tully.asset
index 040c386ae2..dbbd1db0b5 100644
--- a/data/assets/scene/digitaluniverse/tully.asset
+++ b/data/assets/scene/digitaluniverse/tully.asset
@@ -35,6 +35,7 @@ local TullyGalaxies = {
     },
     Opacity = 0.99,
     File = speck .. "tully.speck",
+    SkipFirstDataPoint = true,
     Texture = {
       File = textures .. "point3A.png"
     },
diff --git a/modules/base/rendering/pointcloud/renderableinterpolatedpoints.cpp b/modules/base/rendering/pointcloud/renderableinterpolatedpoints.cpp
index 138bc24391..26a4aed43d 100644
--- a/modules/base/rendering/pointcloud/renderableinterpolatedpoints.cpp
+++ b/modules/base/rendering/pointcloud/renderableinterpolatedpoints.cpp
@@ -304,6 +304,14 @@ RenderableInterpolatedPoints::RenderableInterpolatedPoints(
     // should be rendered. So make sure it is updated once we know the number of
     // interpolation steps
     _nDataPoints = nObjects;
+
+    if (_skipFirstDataPoint) {
+        LWARNING(
+            "Found setting to skip first data point in asset. This is not supported for "
+            "interpolated point clouds. Ignoring"
+        );
+        _skipFirstDataPoint = false;
+    }
 }
 
 void RenderableInterpolatedPoints::initializeShadersAndGlExtras() {
diff --git a/modules/base/rendering/pointcloud/renderablepointcloud.cpp b/modules/base/rendering/pointcloud/renderablepointcloud.cpp
index e102bab029..901f9488e3 100644
--- a/modules/base/rendering/pointcloud/renderablepointcloud.cpp
+++ b/modules/base/rendering/pointcloud/renderablepointcloud.cpp
@@ -372,6 +372,9 @@ namespace {
         // [[codegen::verbatim(UseAdditiveBlendingInfo.description)]]
         std::optional<bool> useAdditiveBlending;
 
+        // If true, skip the first data point in the loaded dataset
+        std::optional<bool> skipFirstDataPoint;
+
         enum class [[codegen::map(openspace::DistanceUnit)]] Unit {
             Meter [[codegen::key("m")]],
             Kilometer [[codegen::key("Km")]],
@@ -699,7 +702,9 @@ RenderablePointCloud::RenderablePointCloud(const ghoul::Dictionary& dictionary)
         });
     }
 
-    _useCaching = p.useCaching.value_or(true);
+    _useCaching = p.useCaching.value_or(_useCaching);
+
+    _skipFirstDataPoint = p.skipFirstDataPoint.value_or(_skipFirstDataPoint);
 
     // If no scale exponent was specified, compute one that will at least show the
     // points based on the scale of the positions in the dataset
@@ -754,6 +759,11 @@ void RenderablePointCloud::initialize() {
         else {
             _dataset = dataloader::data::loadFile(_dataFile, _dataMapping);
         }
+
+        if (_skipFirstDataPoint) {
+            _dataset.entries.erase(_dataset.entries.begin());
+        }
+
         _nDataPoints = static_cast<unsigned int>(_dataset.entries.size());
 
         // If no scale exponent was specified, compute one that will at least show the
diff --git a/modules/base/rendering/pointcloud/renderablepointcloud.h b/modules/base/rendering/pointcloud/renderablepointcloud.h
index 428aaf44ee..8537585498 100644
--- a/modules/base/rendering/pointcloud/renderablepointcloud.h
+++ b/modules/base/rendering/pointcloud/renderablepointcloud.h
@@ -230,6 +230,7 @@ protected:
     bool _useCaching = true;
     bool _shouldComputeScaleExponent = false;
     bool _createLabelsFromDataset = false;
+    bool _skipFirstDataPoint = false;
 
     dataloader::Dataset _dataset;
     dataloader::DataMapping _dataMapping;

From 4328476d2606cb5c604e78f8aff3129b904d177d Mon Sep 17 00:00:00 2001
From: Alexander Bock <alexander.bock@liu.se>
Date: Sat, 6 Apr 2024 19:50:39 +0200
Subject: [PATCH 366/701] Use more filesystem::path where applicable

---
 .../ext/launcher/include/launcherwindow.h     | 17 +++--
 .../launcher/include/profile/assetsdialog.h   |  3 +-
 .../launcher/include/profile/profileedit.h    | 13 ++--
 .../ext/launcher/include/sgctedit/sgctedit.h  |  6 +-
 .../ext/launcher/src/filesystemaccess.cpp     |  2 +-
 .../ext/launcher/src/launcherwindow.cpp       | 74 +++++++++----------
 .../ext/launcher/src/profile/assetsdialog.cpp |  6 +-
 .../launcher/src/profile/horizonsdialog.cpp   |  8 +-
 .../ext/launcher/src/profile/profileedit.cpp  | 14 ++--
 .../launcher/src/profile/scriptlogdialog.cpp  |  4 +-
 .../ext/launcher/src/sgctedit/sgctedit.cpp    |  8 +-
 apps/OpenSpace/ext/sgct                       |  2 +-
 apps/OpenSpace/main.cpp                       | 11 +--
 ext/ghoul                                     |  2 +-
 include/openspace/documentation/verifier.h    |  6 +-
 include/openspace/engine/downloadmanager.h    |  4 +-
 .../openspace/rendering/transferfunction.h    |  4 +-
 include/openspace/rendering/volumeraycaster.h |  9 ++-
 include/openspace/scripting/scriptengine.h    |  2 +-
 include/openspace/util/spicemanager.h         | 13 ++--
 .../pointcloud/renderablepointcloud.cpp       | 13 ++--
 .../pointcloud/renderablepointcloud.h         |  3 +-
 modules/base/rendering/renderablemodel.cpp    |  2 +-
 .../rendering/renderableplaneimagelocal.cpp   |  5 +-
 .../renderableplanetimevaryingimage.cpp       |  8 +-
 .../renderableplanetimevaryingimage.h         |  4 +-
 .../rendering/renderablesphereimagelocal.cpp  |  2 +-
 .../rendering/renderabletimevaryingsphere.cpp |  8 +-
 .../rendering/renderabletimevaryingsphere.h   |  4 +-
 .../base/rendering/screenspaceimagelocal.cpp  |  5 +-
 .../rendering/renderabledumeshes.cpp          |  7 +-
 .../rendering/renderabledumeshes.h            |  5 +-
 .../rendering/renderableplanescloud.cpp       |  4 +-
 modules/exoplanets/exoplanetshelper.cpp       |  2 +-
 modules/exoplanets/exoplanetsmodule.cpp       | 50 ++++++-------
 modules/exoplanets/exoplanetsmodule.h         | 19 ++---
 modules/exoplanets/exoplanetsmodule_lua.inl   | 25 ++++---
 .../rendering/renderablefieldlines.cpp        |  9 ++-
 .../fieldlinessequencemodule.cpp              |  8 +-
 .../fieldlinessequencemodule.h                |  4 +-
 .../renderablefieldlinessequence.cpp          | 18 ++---
 .../rendering/renderablefieldlinessequence.h  |  2 +-
 modules/gaia/rendering/octreemanager.cpp      | 10 ++-
 modules/gaia/rendering/octreemanager.h        |  8 +-
 .../gaia/rendering/renderablegaiastars.cpp    | 32 ++++----
 modules/gaia/tasks/constructoctreetask.cpp    |  8 +-
 modules/gaia/tasks/readfilejob.cpp            |  7 +-
 modules/gaia/tasks/readfilejob.h              |  7 +-
 modules/gaia/tasks/readfitstask.cpp           |  4 +-
 modules/galaxy/rendering/galaxyraycaster.cpp  | 17 +++--
 modules/galaxy/rendering/galaxyraycaster.h    |  8 +-
 modules/galaxy/rendering/renderablegalaxy.cpp |  8 +-
 modules/galaxy/rendering/renderablegalaxy.h   |  7 +-
 .../globebrowsing/globebrowsingmodule_lua.inl |  2 +-
 modules/globebrowsing/src/gdalwrapper.cpp     | 15 ++--
 .../src/globelabelscomponent.cpp              |  2 +-
 .../globebrowsing/src/rawtiledatareader.cpp   |  4 +-
 modules/globebrowsing/src/ringscomponent.cpp  | 44 +++++------
 .../tileprovider/singleimagetileprovider.cpp  |  2 +-
 modules/iswa/rendering/iswakameleongroup.cpp  |  6 +-
 modules/iswa/rendering/iswakameleongroup.h    |  9 ++-
 modules/iswa/rendering/kameleonplane.cpp      |  4 +-
 modules/iswa/rendering/kameleonplane.h        |  2 +-
 modules/iswa/util/iswamanager.cpp             |  8 +-
 modules/iswa/util/iswamanager.h               |  3 +-
 modules/kameleon/include/kameleonwrapper.h    |  5 +-
 modules/kameleon/src/kameleonwrapper.cpp      |  6 +-
 .../kameleonvolume/kameleonvolumereader.cpp   |  6 +-
 modules/kameleonvolume/kameleonvolumereader.h |  5 +-
 .../rendering/renderablekameleonvolume.cpp    |  2 +-
 .../tasks/kameleondocumentationtask.cpp       |  4 +-
 .../tasks/kameleonmetadatatojsontask.cpp      |  4 +-
 .../tasks/kameleonvolumetorawtask.cpp         |  6 +-
 .../rendering/multiresvolumeraycaster.cpp     | 17 +++--
 .../rendering/multiresvolumeraycaster.h       |  8 +-
 .../rendering/renderablemultiresvolume.cpp    | 20 ++---
 .../rendering/renderablemultiresvolume.h      |  4 +-
 modules/multiresvolume/rendering/tsp.cpp      |  2 +-
 modules/multiresvolume/rendering/tsp.h        |  5 +-
 modules/skybrowser/src/wwtdatahandler.cpp     |  5 +-
 .../renderableconstellationbounds.cpp         |  2 +-
 .../renderableconstellationlines.cpp          |  2 +-
 .../renderableconstellationsbase.cpp          |  2 +-
 .../space/rendering/renderablefluxnodes.cpp   | 54 +++++++-------
 modules/space/rendering/renderablefluxnodes.h |  3 +-
 modules/space/rendering/renderablerings.cpp   |  6 +-
 modules/space/rendering/renderablestars.cpp   |  8 +-
 .../rendering/renderablemodelprojection.cpp   |  4 +-
 .../rendering/renderableplaneprojection.cpp   |  4 +-
 .../rendering/renderableplaneprojection.h     |  3 +-
 .../rendering/renderableplanetprojection.cpp  |  4 +-
 .../util/hongkangparser.cpp                   | 13 +---
 .../util/hongkangparser.h                     |  6 +-
 modules/spacecraftinstruments/util/image.h    |  2 +-
 .../util/imagesequencer.cpp                   |  2 +-
 .../util/imagesequencer.h                     |  2 +-
 .../util/instrumenttimesparser.cpp            |  3 +-
 .../util/instrumenttimesparser.h              |  5 +-
 .../util/labelparser.cpp                      | 20 ++---
 .../spacecraftinstruments/util/labelparser.h  |  7 +-
 .../util/projectioncomponent.cpp              | 36 ++++-----
 .../util/projectioncomponent.h                |  2 +-
 modules/statemachine/include/statemachine.h   |  2 +-
 modules/statemachine/src/statemachine.cpp     |  9 ++-
 modules/statemachine/statemachinemodule.cpp   |  2 +-
 modules/sync/syncs/httpsynchronization.cpp    |  2 +-
 .../rendering/toyvolumeraycaster.cpp          | 14 ++--
 .../toyvolume/rendering/toyvolumeraycaster.h  |  8 +-
 .../volume/rendering/basicvolumeraycaster.cpp | 16 ++--
 .../volume/rendering/basicvolumeraycaster.h   |  8 +-
 .../rendering/renderabletimevaryingvolume.cpp | 11 +--
 .../rendering/renderabletimevaryingvolume.h   |  4 +-
 .../volume/tasks/generaterawvolumetask.cpp    |  4 +-
 modules/volume/transferfunctionhandler.cpp    |  2 +-
 modules/webgui/webguimodule.cpp               |  8 +-
 src/data/csvloader.cpp                        |  6 +-
 src/documentation/documentationengine.cpp     |  4 +-
 src/documentation/verifier.cpp                | 19 ++++-
 src/engine/configuration.cpp                  |  4 +-
 src/engine/downloadmanager.cpp                | 10 ++-
 src/engine/logfactory.cpp                     | 12 +--
 src/engine/openspaceengine.cpp                | 15 ++--
 src/engine/openspaceengine_lua.inl            |  5 +-
 src/navigation/navigationhandler.cpp          |  2 +-
 src/rendering/colormappingcomponent.cpp       |  4 +-
 src/rendering/framebufferrenderer.cpp         | 12 +--
 src/rendering/loadingscreen.cpp               |  2 +-
 src/rendering/renderengine.cpp                |  4 +-
 src/rendering/texturecomponent.cpp            | 36 ++++-----
 src/rendering/transferfunction.cpp            | 11 ++-
 src/scene/assetmanager.cpp                    | 12 +--
 src/scene/assetmanager_lua.inl                | 12 +--
 src/scene/profile_lua.inl                     | 12 ++-
 src/scripting/scriptengine.cpp                | 11 +--
 src/scripting/scriptengine_lua.inl            | 28 ++++---
 src/util/spicemanager.cpp                     | 61 +++++++--------
 src/util/spicemanager_lua.inl                 |  2 +-
 src/util/taskloader.cpp                       |  2 +-
 support/coding/codegen                        |  2 +-
 tests/main.cpp                                |  6 +-
 tests/test_documentation.cpp                  |  8 +-
 tests/test_horizons.cpp                       |  4 +-
 tests/test_lua_createsinglecolorimage.cpp     | 10 +--
 tests/test_rawvolumeio.cpp                    |  8 +-
 tests/test_scriptscheduler.cpp                | 44 +++++------
 tests/test_sgctedit.cpp                       | 12 ++-
 tests/test_spicemanager.cpp                   | 24 +++---
 tests/test_timequantizer.cpp                  |  2 +-
 148 files changed, 712 insertions(+), 705 deletions(-)

diff --git a/apps/OpenSpace/ext/launcher/include/launcherwindow.h b/apps/OpenSpace/ext/launcher/include/launcherwindow.h
index 6a67b1eaff..6ea2a689f7 100644
--- a/apps/OpenSpace/ext/launcher/include/launcherwindow.h
+++ b/apps/OpenSpace/ext/launcher/include/launcherwindow.h
@@ -32,6 +32,7 @@
 #include <sgct/error.h>
 #include <sgct/readconfig.h>
 #include <QApplication>
+#include <filesystem>
 #include <optional>
 
 namespace openspace { struct Configuration; }
@@ -89,7 +90,7 @@ public:
 
 private:
     QWidget* createCentralWidget();
-    void setBackgroundImage(const std::string& syncPath);
+    void setBackgroundImage(const std::filesystem::path& syncPath);
 
     void openProfileEditor(const std::string& profile, bool isUserProfile);
     void openWindowEditor(const std::string& winCfg, bool isUserWinCfg);
@@ -99,15 +100,15 @@ private:
     void populateProfilesList(const std::string& preset);
     void populateWindowConfigsList(const std::string& preset);
     void handleReturnFromWindowEditor(const sgct::config::Cluster& cluster,
-        std::filesystem::path savePath, const std::string& saveWindowCfgPath);
+        std::filesystem::path savePath, const std::filesystem::path& saveWindowCfgPath);
     void onNewWindowConfigSelection(int newIndex);
 
-    const std::string _assetPath;
-    const std::string _userAssetPath;
-    const std::string _configPath;
-    const std::string _userConfigPath;
-    const std::string _profilePath;
-    const std::string _userProfilePath;
+    const std::filesystem::path _assetPath;
+    const std::filesystem::path _userAssetPath;
+    const std::filesystem::path _configPath;
+    const std::filesystem::path _userConfigPath;
+    const std::filesystem::path _profilePath;
+    const std::filesystem::path _userProfilePath;
     bool _shouldLaunch = false;
     int _userAssetCount = 0;
     int _userConfigStartingIdx = 0;
diff --git a/apps/OpenSpace/ext/launcher/include/profile/assetsdialog.h b/apps/OpenSpace/ext/launcher/include/profile/assetsdialog.h
index ba17c32986..ec06ba98bb 100644
--- a/apps/OpenSpace/ext/launcher/include/profile/assetsdialog.h
+++ b/apps/OpenSpace/ext/launcher/include/profile/assetsdialog.h
@@ -74,7 +74,8 @@ public:
      *        living
      */
     AssetsDialog(QWidget* parent, openspace::Profile* profile,
-        const std::string& assetBasePath, const std::string& userAssetBasePath);
+        const std::filesystem::path& assetBasePath,
+        const std::filesystem::path& userAssetBasePath);
 
 private slots:
     void searchTextChanged(const QString& text);
diff --git a/apps/OpenSpace/ext/launcher/include/profile/profileedit.h b/apps/OpenSpace/ext/launcher/include/profile/profileedit.h
index 6a1203b17a..e50a490a7c 100644
--- a/apps/OpenSpace/ext/launcher/include/profile/profileedit.h
+++ b/apps/OpenSpace/ext/launcher/include/profile/profileedit.h
@@ -53,8 +53,9 @@ public:
      * \param parent Pointer to parent Qt widget
      */
     ProfileEdit(openspace::Profile& profile, const std::string& profileName,
-        std::string assetBasePath, std::string userAssetBasePath,
-        std::string builtInProfileBasePath, std::string profileBasePath, QWidget* parent);
+        std::filesystem::path assetBasePath, std::filesystem::path userAssetBasePath,
+        std::filesystem::path builtInProfileBasePath,
+        std::filesystem::path profileBasePath, QWidget* parent);
 
     /**
      * Gets the status of the save when the window is closed; was the file saved?
@@ -98,10 +99,10 @@ private:
     void initSummaryTextForEachCategory();
 
     openspace::Profile& _profile;
-    const std::string _assetBasePath;
-    const std::string _userAssetBasePath;
-    const std::string _profileBasePath;
-    const std::string _builtInProfilesPath;
+    const std::filesystem::path _assetBasePath;
+    const std::filesystem::path _userAssetBasePath;
+    const std::filesystem::path _profileBasePath;
+    const std::filesystem::path _builtInProfilesPath;
     bool _saveSelected = false;
 
     QLineEdit* _profileEdit = nullptr;
diff --git a/apps/OpenSpace/ext/launcher/include/sgctedit/sgctedit.h b/apps/OpenSpace/ext/launcher/include/sgctedit/sgctedit.h
index 4db02f5a9b..850364dafc 100644
--- a/apps/OpenSpace/ext/launcher/include/sgctedit/sgctedit.h
+++ b/apps/OpenSpace/ext/launcher/include/sgctedit/sgctedit.h
@@ -54,7 +54,7 @@ public:
      * \param userConfigPath A string containing the file path of the user config
      *        directory where all window configs are stored
      */
-    SgctEdit(QWidget* parent, std::string userConfigPath);
+    SgctEdit(QWidget* parent, std::filesystem::path userConfigPath);
 
     /**
      * Constructor for SgctEdit class, the underlying class for the full window
@@ -67,7 +67,7 @@ public:
      * \param parent Pointer to parent Qt widget
      */
     SgctEdit(sgct::config::Cluster& cluster, std::string configName,
-        std::string& configBasePath, QWidget* parent);
+        std::filesystem::path& configBasePath, QWidget* parent);
 
     /**
      * Returns the saved filename.
@@ -124,7 +124,7 @@ private:
     DisplayWindowUnion* _displayWidget = nullptr;
     SettingsWidget* _settingsWidget = nullptr;
     sgct::config::Cluster _cluster;
-    const std::string _userConfigPath;
+    const std::filesystem::path _userConfigPath;
     const std::array<QColor, 4> _colorsForWindows = {
         QColor(0x2B, 0x9E, 0xC3),
         QColor(0xFC, 0xAB, 0x10),
diff --git a/apps/OpenSpace/ext/launcher/src/filesystemaccess.cpp b/apps/OpenSpace/ext/launcher/src/filesystemaccess.cpp
index 075280fee9..f6ca441454 100644
--- a/apps/OpenSpace/ext/launcher/src/filesystemaccess.cpp
+++ b/apps/OpenSpace/ext/launcher/src/filesystemaccess.cpp
@@ -101,7 +101,7 @@ void FileSystemAccess::parseChildFile(std::string filename, bool& hasDirHeaderBe
 
     if (!hasDirHeaderBeenAdded) {
         for (const std::string& d : dirNames) {
-            if (d.length() > 0) {
+            if (!d.empty()) {
                 output.push_back(cbox + d);
             }
         }
diff --git a/apps/OpenSpace/ext/launcher/src/launcherwindow.cpp b/apps/OpenSpace/ext/launcher/src/launcherwindow.cpp
index 8d7c14b5d8..162d11b0d9 100644
--- a/apps/OpenSpace/ext/launcher/src/launcherwindow.cpp
+++ b/apps/OpenSpace/ext/launcher/src/launcherwindow.cpp
@@ -96,7 +96,9 @@ namespace {
         );
     } // namespace geometry
 
-    std::optional<Profile> loadProfileFromFile(QWidget* parent, std::string filename) {
+    std::optional<Profile> loadProfileFromFile(QWidget* parent,
+                                               std::filesystem::path filename)
+    {
         // Verify that the file actually exists
         if (!std::filesystem::exists(filename)) {
             QMessageBox::critical(
@@ -210,14 +212,12 @@ LauncherWindow::LauncherWindow(bool profileEnabled,
                                bool sgctConfigEnabled, std::string sgctConfigName,
                                QWidget* parent)
     : QMainWindow(parent)
-    , _assetPath(absPath(globalConfig.pathTokens.at("ASSETS")).string() + '/')
-    , _userAssetPath(absPath(globalConfig.pathTokens.at("USER_ASSETS")).string() + '/')
-    , _configPath(absPath(globalConfig.pathTokens.at("CONFIG")).string() + '/')
-    , _userConfigPath(absPath(globalConfig.pathTokens.at("USER_CONFIG")).string() + '/')
-    , _profilePath(absPath(globalConfig.pathTokens.at("PROFILES")).string() + '/')
-    , _userProfilePath(
-        absPath(globalConfig.pathTokens.at("USER_PROFILES")).string() + '/'
-    )
+    , _assetPath(absPath(globalConfig.pathTokens.at("ASSETS")) / "")
+    , _userAssetPath(absPath(globalConfig.pathTokens.at("USER_ASSETS")) / "")
+    , _configPath(absPath(globalConfig.pathTokens.at("CONFIG")) / "")
+    , _userConfigPath(absPath(globalConfig.pathTokens.at("USER_CONFIG")) / "")
+    , _profilePath(absPath(globalConfig.pathTokens.at("PROFILES")) / "")
+    , _userProfilePath(absPath(globalConfig.pathTokens.at("USER_PROFILES")) / "")
     , _sgctConfigName(std::move(sgctConfigName))
 {
     Q_INIT_RESOURCE(resources);
@@ -256,7 +256,7 @@ LauncherWindow::LauncherWindow(bool profileEnabled,
     );
     if (std::filesystem::exists(p)) {
         try {
-            setBackgroundImage(p.string());
+            setBackgroundImage(p);
         }
         catch (const std::exception& e) {
             std::cerr << "Error occurrred while reading background images: " << e.what();
@@ -414,7 +414,7 @@ QWidget* LauncherWindow::createCentralWidget() {
     return centralWidget;
 }
 
-void LauncherWindow::setBackgroundImage(const std::string& syncPath) {
+void LauncherWindow::setBackgroundImage(const std::filesystem::path& syncPath) {
     namespace fs = std::filesystem;
 
     // First, we iterate through all folders in the launcher_images sync folder and we get
@@ -444,17 +444,17 @@ void LauncherWindow::setBackgroundImage(const std::string& syncPath) {
     }
 
     // Now we know which folder to use, we will pick an image at random
-    std::vector<std::string> files;
+    std::vector<std::filesystem::path> files;
     for (const fs::directory_entry& p : fs::directory_iterator(latest.path)) {
-        files.push_back(p.path().string());
+        files.push_back(p.path());
     }
     std::random_device rd;
     std::mt19937 g(rd());
     std::shuffle(files.begin(), files.end(), g);
     // We know there has to be at least one folder, so it's fine to just pick the first
     while (!files.empty()) {
-        const std::string& p = files.front();
-        if (std::filesystem::path(p).extension() == ".png") {
+        const std::filesystem::path& p = files.front();
+        if (p.extension() == ".png") {
             // If the top path starts with the png extension, we have found our candidate
             break;
         }
@@ -467,7 +467,7 @@ void LauncherWindow::setBackgroundImage(const std::string& syncPath) {
 
     // There better be at least one file left, but just in in case
     if (!files.empty()) {
-        const std::string& image = files.front();
+        std::string image = files.front().string();
         _backgroundImage->setPixmap(QPixmap(QString::fromStdString(image)));
     }
 }
@@ -510,8 +510,8 @@ void LauncherWindow::populateProfilesList(const std::string& preset) {
             QString::fromStdString(path.string())
         );
 
-        // Add toooltip
-        std::optional<Profile> p = loadProfileFromFile(this, path.string());
+        // Add tooltip
+        std::optional<Profile> p = loadProfileFromFile(this, path);
         const int idx = _profileBox->count() - 1;
         if (p.has_value() && (*p).meta.has_value()) {
             const std::optional<std::string>& d = p->meta.value().description;
@@ -549,7 +549,7 @@ void LauncherWindow::populateProfilesList(const std::string& preset) {
         );
 
         // Add toooltip
-        std::optional<Profile> p = loadProfileFromFile(this, path.string());
+        std::optional<Profile> p = loadProfileFromFile(this, path);
         const int idx = _profileBox->count() - 1;
         if (p.has_value() && (*p).meta.has_value()) {
             const std::optional<std::string>& d = p->meta.value().description;
@@ -594,7 +594,7 @@ bool handleConfigurationFile(QComboBox& box, const std::filesystem::directory_en
     if (isJson) {
         std::string tooltipDescription;
         try {
-            const sgct::config::Meta meta = sgct::readMeta(p.path().string());
+            const sgct::config::Meta meta = sgct::readMeta(p.path());
             tooltipDescription = meta.description;
         }
         catch (const sgct::Error&) {
@@ -719,7 +719,6 @@ void LauncherWindow::populateWindowConfigsList(const std::string& preset) {
 
 void LauncherWindow::onNewWindowConfigSelection(int newIndex) {
     const std::filesystem::path pathSelected = absPath(selectedWindowConfig());
-    const std::string fileSelected = pathSelected.string();
     if (newIndex == _windowConfigBoxIndexSgctCfgDefault) {
         _editWindowButton->setEnabled(false);
         _editWindowButton->setToolTip(
@@ -731,14 +730,14 @@ void LauncherWindow::onNewWindowConfigSelection(int newIndex) {
         _editWindowButton->setToolTip(
             QString::fromStdString(std::format(
                 "Cannot edit '{}'\nsince it is one of the configuration "
-                "files provided in the OpenSpace installation", fileSelected
+                "files provided in the OpenSpace installation", pathSelected
             ))
         );
     }
     else {
         try {
             sgct::config::GeneratorVersion previewGenVersion =
-                sgct::readConfigGenerator(fileSelected);
+                sgct::readConfigGenerator(pathSelected);
             if (!versionCheck(previewGenVersion)) {
                 _editWindowButton->setEnabled(false);
                 _editWindowButton->setToolTip(QString::fromStdString(std::format(
@@ -759,14 +758,14 @@ void LauncherWindow::onNewWindowConfigSelection(int newIndex) {
 
 void LauncherWindow::openProfileEditor(const std::string& profile, bool isUserProfile) {
     std::optional<Profile> p;
-    std::string saveProfilePath = isUserProfile ? _userProfilePath : _profilePath;
+    std::filesystem::path savePath = isUserProfile ? _userProfilePath : _profilePath;
     if (profile.empty()) {
         // If the requested profile is the empty string, then we want to create a new one
         p = Profile();
     }
     else {
         // Otherwise, we want to load that profile
-        std::string fullProfilePath = saveProfilePath + profile + ".profile";
+        std::string fullProfilePath = std::format("{}{}.profile", savePath, profile);
         p = loadProfileFromFile(this, std::move(fullProfilePath));
         if (!p.has_value()) {
             return;
@@ -779,16 +778,17 @@ void LauncherWindow::openProfileEditor(const std::string& profile, bool isUserPr
         _assetPath,
         _userAssetPath,
         _profilePath,
-        saveProfilePath,
+        savePath,
         this
     );
     editor.exec();
     if (editor.wasSaved()) {
         if (editor.specifiedFilename() != profile) {
-            saveProfilePath = _userProfilePath;
+            savePath = _userProfilePath;
         }
-        const std::string path =
-            saveProfilePath + editor.specifiedFilename() + ".profile";
+        const std::string path = std::format(
+            "{}{}.profile", savePath, editor.specifiedFilename()
+        );
         saveProfile(this, path, *p);
         populateProfilesList(editor.specifiedFilename());
     }
@@ -812,7 +812,7 @@ void LauncherWindow::editRefusalDialog(const std::string& title, const std::stri
 void LauncherWindow::openWindowEditor(const std::string& winCfg, bool isUserWinCfg) {
     using namespace sgct;
 
-    std::string saveWindowCfgPath = isUserWinCfg ? _userConfigPath : _configPath;
+    std::filesystem::path saveWindowPath = isUserWinCfg ? _userConfigPath : _configPath;
     int ret = QDialog::DialogCode::Rejected;
     config::Cluster preview;
     if (winCfg.empty()) {
@@ -822,7 +822,7 @@ void LauncherWindow::openWindowEditor(const std::string& winCfg, bool isUserWinC
             handleReturnFromWindowEditor(
                 editor.cluster(),
                 editor.saveFilename(),
-                saveWindowCfgPath
+                saveWindowPath
             );
         }
     }
@@ -831,12 +831,12 @@ void LauncherWindow::openWindowEditor(const std::string& winCfg, bool isUserWinC
             config::GeneratorVersion previewGenVersion = readConfigGenerator(winCfg);
             loadFileAndSchemaThenValidate(
                 winCfg,
-                _configPath + "/schema/sgct.schema.json",
+                _configPath / "schema/sgct.schema.json",
                 "This configuration file is unable to generate a proper display"
             );
             loadFileAndSchemaThenValidate(
                 winCfg,
-                _configPath + "/schema/sgcteditor.schema.json",
+                _configPath / "schema/sgcteditor.schema.json",
                 "This configuration file is valid for generating a display, but "
                 "its format does not match the window editor requirements and "
                 "cannot be opened in the editor"
@@ -856,10 +856,10 @@ void LauncherWindow::openWindowEditor(const std::string& winCfg, bool isUserWinC
                         "problem detected in the readConfig function:\n\n{}", e.what()
                     ));
                 }
-                SgctEdit editor(
+                SgctEdit editor = SgctEdit(
                     preview,
                     winCfg,
-                    saveWindowCfgPath,
+                    saveWindowPath,
                     this
                 );
                 ret = editor.exec();
@@ -867,7 +867,7 @@ void LauncherWindow::openWindowEditor(const std::string& winCfg, bool isUserWinC
                     handleReturnFromWindowEditor(
                         editor.cluster(),
                         editor.saveFilename(),
-                        saveWindowCfgPath
+                        saveWindowPath
                     );
                 }
             }
@@ -894,7 +894,7 @@ void LauncherWindow::openWindowEditor(const std::string& winCfg, bool isUserWinC
 
 void LauncherWindow::handleReturnFromWindowEditor(const sgct::config::Cluster& cluster,
                                                   std::filesystem::path savePath,
-                                                  const std::string& saveWindowCfgPath)
+                                           const std::filesystem::path& saveWindowCfgPath)
 {
     savePath.replace_extension(".json");
     saveWindowConfig(this, savePath, cluster);
diff --git a/apps/OpenSpace/ext/launcher/src/profile/assetsdialog.cpp b/apps/OpenSpace/ext/launcher/src/profile/assetsdialog.cpp
index 6e9b5e697d..d44fa22386 100644
--- a/apps/OpenSpace/ext/launcher/src/profile/assetsdialog.cpp
+++ b/apps/OpenSpace/ext/launcher/src/profile/assetsdialog.cpp
@@ -125,13 +125,13 @@ namespace {
 } // namespace
 
 AssetsDialog::AssetsDialog(QWidget* parent, openspace::Profile* profile,
-                           const std::string& assetBasePath,
-                           const std::string& userAssetBasePath)
+                           const std::filesystem::path& assetBasePath,
+                           const std::filesystem::path& userAssetBasePath)
     : QDialog(parent)
     , _profile(profile)
 {
     setWindowTitle("Assets");
-    _assetTreeModel.importModelData(assetBasePath, userAssetBasePath);
+    _assetTreeModel.importModelData(assetBasePath.string(), userAssetBasePath.string());
 
     QBoxLayout* layout = new QVBoxLayout(this);
     {
diff --git a/apps/OpenSpace/ext/launcher/src/profile/horizonsdialog.cpp b/apps/OpenSpace/ext/launcher/src/profile/horizonsdialog.cpp
index 31f9755d1e..94b5d24882 100644
--- a/apps/OpenSpace/ext/launcher/src/profile/horizonsdialog.cpp
+++ b/apps/OpenSpace/ext/launcher/src/profile/horizonsdialog.cpp
@@ -733,11 +733,11 @@ bool HorizonsDialog::handleRequest() {
 
     const bool isValid = handleResult(result);
     if (!isValid && std::filesystem::is_regular_file(_horizonsFile.file())) {
-        const std::string newName = _horizonsFile.file().filename().stem().string();
+        const std::filesystem::path newName = _horizonsFile.file().filename().stem();
 
         const std::filesystem::path& oldFile = _horizonsFile.file();
         std::filesystem::path newFile = oldFile;
-        newFile.replace_filename(newName + "_error.txt");
+        newFile.replace_filename(std::format("{}_error.txt", newName));
 
         std::filesystem::rename(oldFile, newFile);
 
@@ -916,9 +916,9 @@ bool HorizonsDialog::handleResult(openspace::HorizonsResultCode& result) {
             // If the request worked then delete the corresponding error file if it exist
             std::filesystem::path validFile =_horizonsFile.file();
 
-            const std::string errorName = validFile.filename().stem().string();
+            const std::filesystem::path errorName = validFile.filename().stem();
             const std::filesystem::path errorFile = validFile.replace_filename(
-                errorName + "_error.txt"
+                std::format("{}_error.txt", errorName)
             );
 
             if (std::filesystem::is_regular_file(errorFile)) {
diff --git a/apps/OpenSpace/ext/launcher/src/profile/profileedit.cpp b/apps/OpenSpace/ext/launcher/src/profile/profileedit.cpp
index cb36d5ed21..64760c0205 100644
--- a/apps/OpenSpace/ext/launcher/src/profile/profileedit.cpp
+++ b/apps/OpenSpace/ext/launcher/src/profile/profileedit.cpp
@@ -96,10 +96,10 @@ namespace {
 } // namespace
 
 ProfileEdit::ProfileEdit(Profile& profile, const std::string& profileName, 
-                         std::string assetBasePath,
-                         std::string userAssetBasePath,
-                         std::string builtInProfileBasePath,
-                         std::string profileBasePath,
+                         std::filesystem::path assetBasePath,
+                         std::filesystem::path userAssetBasePath,
+                         std::filesystem::path builtInProfileBasePath,
+                         std::filesystem::path profileBasePath,
                          QWidget* parent)
     : QDialog(parent)
     , _profile(profile)
@@ -392,8 +392,10 @@ void ProfileEdit::duplicateProfile() {
     while (true) {
         version++;
 
-        const std::string candidate = profile + Separator + std::to_string(version);
-        const std::string candidatePath = _profileBasePath + candidate + ".profile";
+        const std::string candidate = std::format("{}{}{}", profile, Separator, version);
+        const std::string candidatePath = std::format(
+            "{}{}.profile", _profileBasePath, candidate
+        );
 
         if (!std::filesystem::exists(candidatePath)) {
             _profileEdit->setText(QString::fromStdString(candidate));
diff --git a/apps/OpenSpace/ext/launcher/src/profile/scriptlogdialog.cpp b/apps/OpenSpace/ext/launcher/src/profile/scriptlogdialog.cpp
index c0893a974c..97496890ed 100644
--- a/apps/OpenSpace/ext/launcher/src/profile/scriptlogdialog.cpp
+++ b/apps/OpenSpace/ext/launcher/src/profile/scriptlogdialog.cpp
@@ -126,8 +126,8 @@ void ScriptlogDialog::createWidgets() {
 void ScriptlogDialog::loadScriptFile() {
     _scripts.clear();
 
-    const std::string log = absPath(_scriptLogFile).string();
-    QFile file(QString::fromStdString(log));
+    const std::filesystem::path log = absPath(_scriptLogFile);
+    QFile file = QFile(QString::fromStdString(log.string()));
     if (file.open(QIODevice::ReadOnly | QIODevice::Text)) {
         QTextStream in(&file);
         while (!in.atEnd()) {
diff --git a/apps/OpenSpace/ext/launcher/src/sgctedit/sgctedit.cpp b/apps/OpenSpace/ext/launcher/src/sgctedit/sgctedit.cpp
index 0adde4e76c..5db67f8228 100644
--- a/apps/OpenSpace/ext/launcher/src/sgctedit/sgctedit.cpp
+++ b/apps/OpenSpace/ext/launcher/src/sgctedit/sgctedit.cpp
@@ -70,7 +70,7 @@ namespace {
     template <class... Ts> overloaded(Ts...) -> overloaded<Ts...>;
 } // namespace
 
-SgctEdit::SgctEdit(QWidget* parent, std::string userConfigPath)
+SgctEdit::SgctEdit(QWidget* parent, std::filesystem::path userConfigPath)
     : QDialog(parent)
     , _userConfigPath(std::move(userConfigPath))
 {
@@ -79,7 +79,7 @@ SgctEdit::SgctEdit(QWidget* parent, std::string userConfigPath)
 }
 
 SgctEdit::SgctEdit(sgct::config::Cluster& cluster, std::string configName,
-                   std::string& configBasePath, QWidget* parent)
+                   std::filesystem::path& configBasePath, QWidget* parent)
     : QDialog(parent)
     , _cluster(cluster)
     , _userConfigPath(configBasePath)
@@ -411,7 +411,7 @@ void SgctEdit::save() {
         const QString fileName = QFileDialog::getSaveFileName(
             this,
             "Save Window Configuration File",
-            QString::fromStdString(_userConfigPath),
+            QString::fromStdString(_userConfigPath.string()),
             "Window Configuration (*.json)",
             nullptr
 #ifdef __linux__
@@ -444,7 +444,7 @@ void SgctEdit::apply() {
         }
     }
 
-    std::string userCfgTempDir = _userConfigPath;
+    std::string userCfgTempDir = _userConfigPath.string();
     if (userCfgTempDir.back() != '/') {
         userCfgTempDir += '/';
     }
diff --git a/apps/OpenSpace/ext/sgct b/apps/OpenSpace/ext/sgct
index 98c7b2f838..5ffaa631d3 160000
--- a/apps/OpenSpace/ext/sgct
+++ b/apps/OpenSpace/ext/sgct
@@ -1 +1 @@
-Subproject commit 98c7b2f83822d7aef447256f35f42107b5afad5e
+Subproject commit 5ffaa631d35bed3ea6b94ed4ff3c3a766bc00d9f
diff --git a/apps/OpenSpace/main.cpp b/apps/OpenSpace/main.cpp
index 49cab344db..79936ec5b8 100644
--- a/apps/OpenSpace/main.cpp
+++ b/apps/OpenSpace/main.cpp
@@ -282,7 +282,7 @@ void mainInitFunc(GLFWwindow*) {
     // We save the startup value of the screenshots just in case we want to add a date
     // to them later in the RenderEngine
     std::filesystem::path screenshotPath = absPath("${SCREENSHOTS}");
-    sgct::Settings::instance().setCapturePath(screenshotPath.string());
+    sgct::Settings::instance().setCapturePath(screenshotPath);
     FileSys.registerPathToken("${STARTUP_SCREENSHOT}", std::move(screenshotPath));
 
     LDEBUG("Initializing OpenSpace Engine started");
@@ -296,7 +296,8 @@ void mainInitFunc(GLFWwindow*) {
         int x = 0;
         int y = 0;
         int n = 0;
-        unsigned char* data = stbi_load(path.string().c_str(), &x, &y, &n, 0);
+        const std::string p = path.string();
+        unsigned char* data = stbi_load(p.c_str(), &x, &y, &n, 0);
 
         GLFWimage icon;
         icon.pixels = data;
@@ -1236,7 +1237,7 @@ int main(int argc, char* argv[]) {
         // Loading configuration from disk
         LDEBUG("Loading configuration from disk");
         *global::configuration = loadConfigurationFromFile(
-            configurationFilePath.string(),
+            configurationFilePath,
             findSettings(),
             size
         );
@@ -1332,7 +1333,7 @@ int main(int argc, char* argv[]) {
                 nullptr,
                 "OpenSpace",
                 QString::fromStdString(std::format(
-                    "The OpenSpace folder is started must not contain any of \"'\", "
+                    "The OpenSpace folder is started from must not contain any of \"'\", "
                     "\"\"\", [, or ]. Path is: {}. Unexpected errors will occur when "
                     "proceeding to run the software", pwd
                 ))
@@ -1389,7 +1390,7 @@ int main(int argc, char* argv[]) {
 #endif // WIN32
 
         *global::configuration = loadConfigurationFromFile(
-            configurationFilePath.string(),
+            configurationFilePath,
             findSettings(),
             size
         );
diff --git a/ext/ghoul b/ext/ghoul
index 4f09dfcd6c..0ce1437b33 160000
--- a/ext/ghoul
+++ b/ext/ghoul
@@ -1 +1 @@
-Subproject commit 4f09dfcd6c2628af1d3646afefc0aa50ced3bd50
+Subproject commit 0ce1437b338cd83248925e9ed84d85bb615ad8b4
diff --git a/include/openspace/documentation/verifier.h b/include/openspace/documentation/verifier.h
index 8b9d10ee90..5fa838f988 100644
--- a/include/openspace/documentation/verifier.h
+++ b/include/openspace/documentation/verifier.h
@@ -253,8 +253,11 @@ public:
      * \param documentationEntries The DocumentationEntry%s that are used to recursively
      *        test the ghoul::Dictionary that is contained inside. If this list is empty,
      *        only a type check is performed
+     * \param nEntries The exact number of entries that should be in the table. If the
+     *        value is not provided, any number (including 0) is allowed
      */
-    TableVerifier(std::vector<DocumentationEntry> documentationEntries = {});
+    TableVerifier(std::vector<DocumentationEntry> documentationEntries = {},
+        std::optional<int> nEntries = std::nullopt);
 
     /**
      * Checks whether the \p key%'s value is a table (= ghoul::Dictionary) and (if
@@ -277,6 +280,7 @@ public:
 
     /// The documentations passed in the constructor
     std::vector<DocumentationEntry> documentations;
+    std::optional<int> count;
 };
 
 /**
diff --git a/include/openspace/engine/downloadmanager.h b/include/openspace/engine/downloadmanager.h
index 8549415175..11bf5d7081 100644
--- a/include/openspace/engine/downloadmanager.h
+++ b/include/openspace/engine/downloadmanager.h
@@ -44,7 +44,7 @@ public:
         // Since the FileFuture object will be used from multiple threads, we have to be
         // careful about the access pattern, that is, no values should be read and written
         // by both the DownloadManager and the outside threads.
-        FileFuture(std::string file);
+        FileFuture(std::filesystem::path file);
 
         // Values that are written by the DownloadManager to be consumed by others
         long long currentSize = -1;
@@ -53,7 +53,7 @@ public:
         float secondsRemaining = -1.f;
         bool isFinished = false;
         bool isAborted = false;
-        std::string filePath;
+        std::filesystem::path filePath;
         std::string errorMessage;
         std::string format;
         // Values set by others to be consumed by the DownloadManager
diff --git a/include/openspace/rendering/transferfunction.h b/include/openspace/rendering/transferfunction.h
index cf6e923b16..3e70eb8d34 100644
--- a/include/openspace/rendering/transferfunction.h
+++ b/include/openspace/rendering/transferfunction.h
@@ -40,13 +40,13 @@ class TransferFunction {
 public:
     using TfChangedCallback = std::function<void (const TransferFunction&)>;
 
-    TransferFunction(const std::string& filepath,
+    TransferFunction(const std::filesystem::path& filepath,
         TfChangedCallback tfChangedCallback = TfChangedCallback());
     ~TransferFunction();
 
     TransferFunction(TransferFunction&& rhs) = default;
 
-    void setPath(const std::string& filepath);
+    void setPath(const std::filesystem::path& filepath);
     ghoul::opengl::Texture& texture();
     void bind();
     void update();
diff --git a/include/openspace/rendering/volumeraycaster.h b/include/openspace/rendering/volumeraycaster.h
index 25949e67d9..586f3e62c6 100644
--- a/include/openspace/rendering/volumeraycaster.h
+++ b/include/openspace/rendering/volumeraycaster.h
@@ -26,6 +26,7 @@
 #define __OPENSPACE_CORE___VOLUMERAYCASTER___H__
 
 #include <ghoul/glm.h>
+#include <filesystem>
 #include <string>
 #include <vector>
 
@@ -84,7 +85,7 @@ public:
      * The shader preprocessor will have access to:
      *   - A `#{namespace}` variable (unique per helper file)
      */
-    virtual std::string boundsVertexShaderPath() const = 0;
+    virtual std::filesystem::path boundsVertexShaderPath() const = 0;
 
     /**
      * Return a path to a file with the functions, uniforms and fragment shader in
@@ -95,7 +96,7 @@ public:
      * The shader preprocessor will have access to:
      *   - A `#{namespace}` variable (unique per helper file)
      */
-    virtual std::string boundsFragmentShaderPath() const = 0;
+    virtual std::filesystem::path boundsFragmentShaderPath() const = 0;
 
     /**
      * Return a path to a file with all the uniforms, functions, etc. Required to perform
@@ -114,7 +115,7 @@ public:
      *   - An #{id} variable (unique per volume)
      *   - A #{namespace} variable (unique per helper file)
      */
-    virtual std::string raycasterPath() const = 0;
+    virtual std::filesystem::path raycasterPath() const = 0;
 
     /**
      * Return a path to a glsl file with helper functions required for the transformation
@@ -125,7 +126,7 @@ public:
      * The shader preprocessor will have access to the #{namespace} variable (unique per
      * helper file) which should be a prefix to all symbols defined by the helper
      */
-    virtual std::string helperPath() const = 0;
+    virtual std::filesystem::path helperPath() const = 0;
 
     void setMaxSteps(int nsteps);
 
diff --git a/include/openspace/scripting/scriptengine.h b/include/openspace/scripting/scriptengine.h
index 7041c7514c..8776856ec4 100644
--- a/include/openspace/scripting/scriptengine.h
+++ b/include/openspace/scripting/scriptengine.h
@@ -127,7 +127,7 @@ private:
     // Logging variables
     bool _logFileExists = false;
     bool _logScripts = true;
-    std::string _logFilename;
+    std::filesystem::path _logFilename;
 };
 
 } // namespace openspace::scripting
diff --git a/include/openspace/util/spicemanager.h b/include/openspace/util/spicemanager.h
index 7428bc89ad..52b1369d5f 100644
--- a/include/openspace/util/spicemanager.h
+++ b/include/openspace/util/spicemanager.h
@@ -31,6 +31,7 @@
 #include <ghoul/misc/boolean.h>
 #include <ghoul/misc/exception.h>
 #include <array>
+#include <filesystem>
 #include <map>
 #include <string>
 #include <vector>
@@ -214,7 +215,7 @@ public:
      *
      * \see http://naif.jpl.nasa.gov/pub/naif/toolkit_docs/C/cspice/furnsh_c.html
      */
-    KernelHandle loadKernel(std::string filePath);
+    KernelHandle loadKernel(std::filesystem::path filePath);
 
     /**
      * Unloads a SPICE kernel identified by the \p kernelId which was returned by the
@@ -238,7 +239,7 @@ public:
      *
      * \return The list of all loaded kernels that have been loaded through this manager
      */
-    std::vector<std::string> loadedKernels() const;
+    std::vector<std::filesystem::path> loadedKernels() const;
 
     /**
      * Unloads a SPICE kernel identified by the \p filePath which was used in the
@@ -254,7 +255,7 @@ public:
      *
      * \see http://naif.jpl.nasa.gov/pub/naif/toolkit_docs/C/cspice/unload_c.html
      */
-    void unloadKernel(std::string filePath);
+    void unloadKernel(std::filesystem::path filePath);
 
     /**
      * Returns whether a given \p target has an SPK kernel covering it at the designated
@@ -1017,7 +1018,7 @@ private:
      */
     struct KernelInformation {
         /// The path from which the kernel was loaded
-        std::string path;
+        std::filesystem::path path;
         /// A unique identifier for each kernel
         KernelHandle id;
         /// How many parts loaded this kernel and are interested in it
@@ -1049,7 +1050,7 @@ private:
      * \see http://naif.jpl.nasa.gov/pub/naif/toolkit_docs/C/cspice/ckobj_c.html
      * \see http://naif.jpl.nasa.gov/pub/naif/toolkit_docs/C/cspice/ckcov_c.html
      */
-    void findCkCoverage(const std::string& path);
+    void findCkCoverage(const std::filesystem::path& path);
 
     /**
      * Function to find and store the intervals covered by a spk file, this is done
@@ -1063,7 +1064,7 @@ private:
      * \see http://naif.jpl.nasa.gov/pub/naif/toolkit_docs/C/cspice/spkobj_c.html
      * \see http://naif.jpl.nasa.gov/pub/naif/toolkit_docs/C/cspice/spkcov_c.html
      */
-    void findSpkCoverage(const std::string& path);
+    void findSpkCoverage(const std::filesystem::path& path);
 
     /**
      * If a position is requested for an uncovered time in the SPK kernels, this function
diff --git a/modules/base/rendering/pointcloud/renderablepointcloud.cpp b/modules/base/rendering/pointcloud/renderablepointcloud.cpp
index 901f9488e3..c43cd3ff3f 100644
--- a/modules/base/rendering/pointcloud/renderablepointcloud.cpp
+++ b/modules/base/rendering/pointcloud/renderablepointcloud.cpp
@@ -597,7 +597,7 @@ RenderablePointCloud::RenderablePointCloud(const ghoul::Dictionary& dictionary)
 
     if (p.file.has_value()) {
         _hasDataFile = true;
-        _dataFile = absPath(*p.file).string();
+        _dataFile = absPath(*p.file);
     }
 
     if (p.dataMapping.has_value()) {
@@ -637,7 +637,7 @@ RenderablePointCloud::RenderablePointCloud(const ghoul::Dictionary& dictionary)
         if (t.folder.has_value()) {
             _textureMode = TextureInputMode::Multi;
             _hasSpriteTexture = true;
-            _texturesDirectory = absPath(*t.folder).string();
+            _texturesDirectory = absPath(*t.folder);
 
             if (t.file.has_value()) {
                 LWARNING(std::format(
@@ -653,11 +653,14 @@ RenderablePointCloud::RenderablePointCloud(const ghoul::Dictionary& dictionary)
             _textureMode = TextureInputMode::Single;
             _hasSpriteTexture = true;
             _texture.spriteTexturePath = absPath(*t.file).string();
-            _texture.spriteTexturePath.onChange([this]() { _spriteTextureIsDirty = true; });
+            _texture.spriteTexturePath.onChange(
+                [this]() { _spriteTextureIsDirty = true; }
+            );
         }
 
         _texture.enabled = t.enabled.value_or(_texture.enabled);
-        _texture.allowCompression = t.allowCompression.value_or(_texture.allowCompression);
+        _texture.allowCompression =
+            t.allowCompression.value_or(_texture.allowCompression);
         _texture.useAlphaChannel = t.useAlphaChannel.value_or(_texture.useAlphaChannel);
     }
 
@@ -912,7 +915,7 @@ void RenderablePointCloud::loadTexture(const std::filesystem::path& path, int in
     }
 
     std::unique_ptr<ghoul::opengl::Texture> t =
-        ghoul::io::TextureReader::ref().loadTexture(path.string(), 2);
+        ghoul::io::TextureReader::ref().loadTexture(path, 2);
 
     bool useAlpha = (t->numberOfChannels() > 3) && _texture.useAlphaChannel;
 
diff --git a/modules/base/rendering/pointcloud/renderablepointcloud.h b/modules/base/rendering/pointcloud/renderablepointcloud.h
index 8537585498..28f5d28e62 100644
--- a/modules/base/rendering/pointcloud/renderablepointcloud.h
+++ b/modules/base/rendering/pointcloud/renderablepointcloud.h
@@ -42,6 +42,7 @@
 #include <openspace/util/distanceconversion.h>
 #include <ghoul/opengl/ghoul_gl.h>
 #include <ghoul/opengl/uniformcache.h>
+#include <filesystem>
 #include <functional>
 
 namespace ghoul::opengl {
@@ -223,7 +224,7 @@ protected:
         outlineWeight, aspectRatioScale
     ) _uniformCache;
 
-    std::string _dataFile;
+    std::filesystem::path _dataFile;
 
     DistanceUnit _unit = DistanceUnit::Parsec;
 
diff --git a/modules/base/rendering/renderablemodel.cpp b/modules/base/rendering/renderablemodel.cpp
index 8ef6682a6b..7d303292ee 100644
--- a/modules/base/rendering/renderablemodel.cpp
+++ b/modules/base/rendering/renderablemodel.cpp
@@ -355,7 +355,7 @@ RenderableModel::RenderableModel(const ghoul::Dictionary& dictionary)
         }
     }
 
-    _file = absPath(p.geometryFile.string());
+    _file = absPath(p.geometryFile);
     if (!std::filesystem::exists(_file)) {
         throw ghoul::RuntimeError(std::format("Cannot find model file '{}'", _file));
     }
diff --git a/modules/base/rendering/renderableplaneimagelocal.cpp b/modules/base/rendering/renderableplaneimagelocal.cpp
index 9066e74764..83787db5de 100644
--- a/modules/base/rendering/renderableplaneimagelocal.cpp
+++ b/modules/base/rendering/renderableplaneimagelocal.cpp
@@ -168,10 +168,7 @@ void RenderablePlaneImageLocal::loadTexture() {
             std::to_string(hash),
             [path = _texturePath]() -> std::unique_ptr<ghoul::opengl::Texture> {
                 std::unique_ptr<ghoul::opengl::Texture> texture =
-                    ghoul::io::TextureReader::ref().loadTexture(
-                        absPath(path).string(),
-                        2
-                    );
+                    ghoul::io::TextureReader::ref().loadTexture(absPath(path), 2);
 
                 LDEBUGC(
                     "RenderablePlaneImageLocal",
diff --git a/modules/base/rendering/renderableplanetimevaryingimage.cpp b/modules/base/rendering/renderableplanetimevaryingimage.cpp
index ed6dc0e92a..4e367ccf39 100644
--- a/modules/base/rendering/renderableplanetimevaryingimage.cpp
+++ b/modules/base/rendering/renderableplanetimevaryingimage.cpp
@@ -145,7 +145,7 @@ void RenderablePlaneTimeVaryingImage::initializeGL() {
     _textureFiles.resize(_sourceFiles.size());
     for (size_t i = 0; i < _sourceFiles.size(); i++) {
         _textureFiles[i] = ghoul::io::TextureReader::ref().loadTexture(
-            absPath(_sourceFiles[i]).string(),
+            absPath(_sourceFiles[i]),
             2
         );
         _textureFiles[i]->setInternalFormat(GL_COMPRESSED_RGBA);
@@ -168,7 +168,7 @@ bool RenderablePlaneTimeVaryingImage::extractMandatoryInfoFromDictionary() {
     namespace fs = std::filesystem;
     for (const fs::directory_entry& e : fs::directory_iterator(sourceFolder)) {
         if (e.is_regular_file()) {
-            _sourceFiles.push_back(e.path().string());
+            _sourceFiles.push_back(e.path());
         }
     }
     std::sort(_sourceFiles.begin(), _sourceFiles.end());
@@ -246,9 +246,9 @@ void RenderablePlaneTimeVaryingImage::render(const RenderData& data, RendererTas
 
 // Requires time to be formated as such: 'YYYY-MM-DDTHH-MM-SS-XXX'
 void RenderablePlaneTimeVaryingImage::extractTriggerTimesFromFileNames() {
-    for (const std::string& filePath : _sourceFiles) {
+    for (const std::filesystem::path& filePath : _sourceFiles) {
         // Extract the filename from the path (without extension)
-        std::string timeString = std::filesystem::path(filePath).stem().string();
+        std::string timeString = filePath.stem().string();
 
         // Ensure the separators are correct
         timeString.replace(4, 1, "-");
diff --git a/modules/base/rendering/renderableplanetimevaryingimage.h b/modules/base/rendering/renderableplanetimevaryingimage.h
index 8afde80dc2..e61d64ce59 100644
--- a/modules/base/rendering/renderableplanetimevaryingimage.h
+++ b/modules/base/rendering/renderableplanetimevaryingimage.h
@@ -27,6 +27,8 @@
 
 #include <modules/base/rendering/renderableplane.h>
 
+#include <filesystem>
+
 namespace ghoul::filesystem { class File; }
 namespace ghoul::opengl { class Texture; }
 
@@ -62,7 +64,7 @@ private:
 
     // If there's just one state it should never disappear
     double _sequenceEndTime = std::numeric_limits<double>::max();
-    std::vector<std::string> _sourceFiles;
+    std::vector<std::filesystem::path> _sourceFiles;
     std::vector<double> _startTimes;
     int _activeTriggerTimeIndex = 0;
     properties::StringProperty _sourceFolder;
diff --git a/modules/base/rendering/renderablesphereimagelocal.cpp b/modules/base/rendering/renderablesphereimagelocal.cpp
index 7740aa4ab0..c82abf7788 100644
--- a/modules/base/rendering/renderablesphereimagelocal.cpp
+++ b/modules/base/rendering/renderablesphereimagelocal.cpp
@@ -112,7 +112,7 @@ void RenderableSphereImageLocal::loadTexture() {
     }
 
     std::unique_ptr<ghoul::opengl::Texture> texture =
-        ghoul::io::TextureReader::ref().loadTexture(_texturePath, 2);
+        ghoul::io::TextureReader::ref().loadTexture(_texturePath.value(), 2);
 
     if (!texture) {
         LWARNINGC(
diff --git a/modules/base/rendering/renderabletimevaryingsphere.cpp b/modules/base/rendering/renderabletimevaryingsphere.cpp
index affa8e718d..317a414155 100644
--- a/modules/base/rendering/renderabletimevaryingsphere.cpp
+++ b/modules/base/rendering/renderabletimevaryingsphere.cpp
@@ -36,9 +36,9 @@
 namespace {
     // Extract J2000 time from file names
     // Requires files to be named as such: 'YYYY-MM-DDTHH-MM-SS-XXX.png'
-    double extractTriggerTimeFromFileName(const std::string& filePath) {
+    double extractTriggerTimeFromFileName(const std::filesystem::path& filePath) {
         // Extract the filename from the path (without extension)
-        std::string timeString = std::filesystem::path(filePath).stem().string();
+        std::string timeString = filePath.stem().string();
 
         // Ensure the separators are correct
         timeString.replace(4, 1, "-");
@@ -118,7 +118,7 @@ void RenderableTimeVaryingSphere::extractMandatoryInfoFromSourceFolder() {
         if (!e.is_regular_file()) {
             continue;
         }
-        const std::string filePath = e.path().string();
+        std::filesystem::path filePath = e.path();
         const double time = extractTriggerTimeFromFileName(filePath);
         std::unique_ptr<ghoul::opengl::Texture> t =
             ghoul::io::TextureReader::ref().loadTexture(filePath, 2);
@@ -128,7 +128,7 @@ void RenderableTimeVaryingSphere::extractMandatoryInfoFromSourceFolder() {
         t->setFilter(ghoul::opengl::Texture::FilterMode::Linear);
         t->purgeFromRAM();
 
-        _files.push_back({ filePath, time, std::move(t) });
+        _files.push_back({ std::move(filePath), time, std::move(t) });
     }
 
     std::sort(
diff --git a/modules/base/rendering/renderabletimevaryingsphere.h b/modules/base/rendering/renderabletimevaryingsphere.h
index 3add139bbe..d869d6e544 100644
--- a/modules/base/rendering/renderabletimevaryingsphere.h
+++ b/modules/base/rendering/renderabletimevaryingsphere.h
@@ -27,6 +27,8 @@
 
 #include <modules/base/rendering/renderablesphere.h>
 
+#include <filesystem>
+
 namespace ghoul::opengl { class Texture; }
 
 namespace openspace {
@@ -54,7 +56,7 @@ protected:
 
 private:
     struct FileData {
-        std::string path;
+        std::filesystem::path path;
         double time;
         std::unique_ptr<ghoul::opengl::Texture> texture;
     };
diff --git a/modules/base/rendering/screenspaceimagelocal.cpp b/modules/base/rendering/screenspaceimagelocal.cpp
index 504f6db33f..188423fdde 100644
--- a/modules/base/rendering/screenspaceimagelocal.cpp
+++ b/modules/base/rendering/screenspaceimagelocal.cpp
@@ -120,10 +120,7 @@ bool ScreenSpaceImageLocal::deinitializeGL() {
 void ScreenSpaceImageLocal::update() {
     if (_textureIsDirty && !_texturePath.value().empty()) {
         std::unique_ptr<ghoul::opengl::Texture> texture =
-            ghoul::io::TextureReader::ref().loadTexture(
-                absPath(_texturePath).string(),
-                2
-            );
+            ghoul::io::TextureReader::ref().loadTexture(absPath(_texturePath), 2);
 
         if (texture) {
             // Images don't need to start on 4-byte boundaries, for example if the
diff --git a/modules/digitaluniverse/rendering/renderabledumeshes.cpp b/modules/digitaluniverse/rendering/renderabledumeshes.cpp
index a5e87cc96f..aa17764658 100644
--- a/modules/digitaluniverse/rendering/renderabledumeshes.cpp
+++ b/modules/digitaluniverse/rendering/renderabledumeshes.cpp
@@ -203,7 +203,7 @@ RenderableDUMeshes::RenderableDUMeshes(const ghoul::Dictionary& dictionary)
 
     addProperty(Fadeable::_opacity);
 
-    _speckFile = absPath(p.file).string();
+    _speckFile = absPath(p.file);
     _drawElements.onChange([this]() { _hasSpeckFile = !_hasSpeckFile; });
     addProperty(_drawElements);
 
@@ -230,7 +230,7 @@ RenderableDUMeshes::RenderableDUMeshes(const ghoul::Dictionary& dictionary)
     addProperty(_lineWidth);
 
     if (p.labelFile.has_value()) {
-        _labelFile = absPath(*p.labelFile).string();
+        _labelFile = absPath(*p.labelFile);
         _hasLabel = true;
 
         _drawLabels = p.drawLabels.value_or(_drawLabels);
@@ -456,8 +456,7 @@ bool RenderableDUMeshes::loadData() {
         }
     }
 
-    const std::string labelFile = _labelFile;
-    if (!labelFile.empty()) {
+    if (!_labelFile.empty()) {
         _labelset = dataloader::label::loadFileWithCache(_labelFile);
     }
 
diff --git a/modules/digitaluniverse/rendering/renderabledumeshes.h b/modules/digitaluniverse/rendering/renderabledumeshes.h
index d24962ffa9..1ecb169ee0 100644
--- a/modules/digitaluniverse/rendering/renderabledumeshes.h
+++ b/modules/digitaluniverse/rendering/renderabledumeshes.h
@@ -37,6 +37,7 @@
 #include <openspace/util/distanceconversion.h>
 #include <ghoul/opengl/ghoul_gl.h>
 #include <ghoul/opengl/uniformcache.h>
+#include <filesystem>
 #include <unordered_map>
 
 namespace ghoul::filesystem { class File; }
@@ -124,8 +125,8 @@ private:
         color) _uniformCache;
     std::shared_ptr<ghoul::fontrendering::Font> _font = nullptr;
 
-    std::string _speckFile;
-    std::string _labelFile;
+    std::filesystem::path _speckFile;
+    std::filesystem::path _labelFile;
 
     DistanceUnit _unit = DistanceUnit::Parsec;
 
diff --git a/modules/digitaluniverse/rendering/renderableplanescloud.cpp b/modules/digitaluniverse/rendering/renderableplanescloud.cpp
index 4316e1876d..b26d2029a8 100644
--- a/modules/digitaluniverse/rendering/renderableplanescloud.cpp
+++ b/modules/digitaluniverse/rendering/renderableplanescloud.cpp
@@ -494,7 +494,7 @@ void RenderablePlanesCloud::update(const UpdateData&) {
 
 void RenderablePlanesCloud::loadTextures() {
     for (const dataloader::Dataset::Texture& tex : _dataset.textures) {
-        std::filesystem::path fullPath = absPath(_texturesPath.string() + '/' + tex.file);
+        std::filesystem::path fullPath = absPath(_texturesPath / tex.file);
         std::filesystem::path pngPath = fullPath;
         pngPath.replace_extension(".png");
 
@@ -513,7 +513,7 @@ void RenderablePlanesCloud::loadTextures() {
         }
 
         std::unique_ptr<ghoul::opengl::Texture> t =
-            ghoul::io::TextureReader::ref().loadTexture(path.string(), 2);
+            ghoul::io::TextureReader::ref().loadTexture(path, 2);
 
         if (t) {
             LINFOC("RenderablePlanesCloud", std::format("Loaded texture '{}'", path));
diff --git a/modules/exoplanets/exoplanetshelper.cpp b/modules/exoplanets/exoplanetshelper.cpp
index 24d7fc8d98..ff8c5287bc 100644
--- a/modules/exoplanets/exoplanetshelper.cpp
+++ b/modules/exoplanets/exoplanetshelper.cpp
@@ -60,7 +60,7 @@ bool hasSufficientData(const ExoplanetDataEntry& p) {
 
 glm::vec3 computeStarColor(float bv) {
     const ExoplanetsModule* module = global::moduleEngine->module<ExoplanetsModule>();
-    const std::string bvColormapPath = module->bvColormapPath();
+    const std::filesystem::path bvColormapPath = module->bvColormapPath();
 
     std::ifstream colorMap(absPath(bvColormapPath), std::ios::in);
 
diff --git a/modules/exoplanets/exoplanetsmodule.cpp b/modules/exoplanets/exoplanetsmodule.cpp
index 37f9b366f4..bfc6137b23 100644
--- a/modules/exoplanets/exoplanetsmodule.cpp
+++ b/modules/exoplanets/exoplanetsmodule.cpp
@@ -264,52 +264,52 @@ bool ExoplanetsModule::hasDataFiles() const {
     return !_exoplanetsDataFolder.value().empty();
 }
 
-std::string ExoplanetsModule::exoplanetsDataPath() const {
+std::filesystem::path ExoplanetsModule::exoplanetsDataPath() const {
     ghoul_assert(hasDataFiles(), "Data files not loaded");
 
     return absPath(
         std::format("{}/{}", _exoplanetsDataFolder.value(), ExoplanetsDataFileName)
-    ).string();
+    );
 }
 
-std::string ExoplanetsModule::lookUpTablePath() const {
+std::filesystem::path ExoplanetsModule::lookUpTablePath() const {
     ghoul_assert(hasDataFiles(), "Data files not loaded");
 
     return absPath(
         std::format("{}/{}", _exoplanetsDataFolder.value(), LookupTableFileName)
-    ).string();
+    );
 }
 
-std::string ExoplanetsModule::teffToBvConversionFilePath() const {
+std::filesystem::path ExoplanetsModule::teffToBvConversionFilePath() const {
     ghoul_assert(hasDataFiles(), "Data files not loaded");
 
     return absPath(std::format(
         "{}/{}", _exoplanetsDataFolder.value(), TeffToBvConversionFileName
-    )).string();
+    ));
 }
 
-std::string ExoplanetsModule::bvColormapPath() const {
-    return _bvColorMapPath;
+std::filesystem::path ExoplanetsModule::bvColormapPath() const {
+    return _bvColorMapPath.value();
 }
 
-std::string ExoplanetsModule::starTexturePath() const {
-    return _starTexturePath;
+std::filesystem::path ExoplanetsModule::starTexturePath() const {
+    return _starTexturePath.value();
 }
 
-std::string ExoplanetsModule::starGlareTexturePath() const {
-    return _starGlareTexturePath;
+std::filesystem::path ExoplanetsModule::starGlareTexturePath() const {
+    return _starGlareTexturePath.value();
 }
 
-std::string ExoplanetsModule::noDataTexturePath() const {
-    return _noDataTexturePath;
+std::filesystem::path ExoplanetsModule::noDataTexturePath() const {
+    return _noDataTexturePath.value();
 }
 
-std::string ExoplanetsModule::orbitDiscTexturePath() const {
-    return _orbitDiscTexturePath;
+std::filesystem::path ExoplanetsModule::orbitDiscTexturePath() const {
+    return _orbitDiscTexturePath.value();
 }
 
-std::string ExoplanetsModule::habitableZoneTexturePath() const {
-    return _habitableZoneTexturePath;
+std::filesystem::path ExoplanetsModule::habitableZoneTexturePath() const {
+    return _habitableZoneTexturePath.value();
 }
 
 glm::vec3 ExoplanetsModule::comparisonCircleColor() const {
@@ -342,31 +342,31 @@ void ExoplanetsModule::internalInitialize(const ghoul::Dictionary& dict) {
     _enabled = p.enabled.value_or(_enabled);
 
     if (p.dataFolder.has_value()) {
-        _exoplanetsDataFolder = p.dataFolder.value().string();
+        _exoplanetsDataFolder = p.dataFolder->string();
     }
 
     if (p.bvColormap.has_value()) {
-        _bvColorMapPath = p.bvColormap.value().string();
+        _bvColorMapPath = p.bvColormap->string();
     }
 
     if (p.starTexture.has_value()) {
-        _starTexturePath = p.starTexture.value().string();
+        _starTexturePath = p.starTexture->string();
     }
 
     if (p.starGlareTexture.has_value()) {
-        _starGlareTexturePath = p.starGlareTexture.value().string();
+        _starGlareTexturePath = p.starGlareTexture->string();
     }
 
     if (p.noDataTexture.has_value()) {
-        _noDataTexturePath = p.noDataTexture.value().string();
+        _noDataTexturePath = p.noDataTexture->string();
     }
 
     if (p.orbitDiscTexture.has_value()) {
-        _orbitDiscTexturePath = p.orbitDiscTexture.value().string();
+        _orbitDiscTexturePath = p.orbitDiscTexture->string();
     }
 
     if (p.habitableZoneTexture.has_value()) {
-        _habitableZoneTexturePath = p.habitableZoneTexture.value().string();
+        _habitableZoneTexturePath = p.habitableZoneTexture->string();
     }
 
     _comparisonCircleColor = p.comparisonCircleColor.value_or(_comparisonCircleColor);
diff --git a/modules/exoplanets/exoplanetsmodule.h b/modules/exoplanets/exoplanetsmodule.h
index 0cba1a263f..c1ff4a787a 100644
--- a/modules/exoplanets/exoplanetsmodule.h
+++ b/modules/exoplanets/exoplanetsmodule.h
@@ -32,6 +32,7 @@
 #include <openspace/properties/scalar/floatproperty.h>
 #include <openspace/properties/stringproperty.h>
 #include <openspace/properties/vector/vec3property.h>
+#include <filesystem>
 
 namespace openspace {
 
@@ -43,15 +44,15 @@ public:
     ~ExoplanetsModule() override = default;
 
     bool hasDataFiles() const;
-    std::string exoplanetsDataPath() const;
-    std::string lookUpTablePath() const;
-    std::string teffToBvConversionFilePath() const;
-    std::string bvColormapPath() const;
-    std::string starTexturePath() const;
-    std::string starGlareTexturePath() const;
-    std::string noDataTexturePath() const;
-    std::string orbitDiscTexturePath() const;
-    std::string habitableZoneTexturePath() const;
+    std::filesystem::path exoplanetsDataPath() const;
+    std::filesystem::path lookUpTablePath() const;
+    std::filesystem::path teffToBvConversionFilePath() const;
+    std::filesystem::path bvColormapPath() const;
+    std::filesystem::path starTexturePath() const;
+    std::filesystem::path starGlareTexturePath() const;
+    std::filesystem::path noDataTexturePath() const;
+    std::filesystem::path orbitDiscTexturePath() const;
+    std::filesystem::path habitableZoneTexturePath() const;
     glm::vec3 comparisonCircleColor() const;
     bool showComparisonCircle() const;
     bool showOrbitUncertainty() const;
diff --git a/modules/exoplanets/exoplanetsmodule_lua.inl b/modules/exoplanets/exoplanetsmodule_lua.inl
index 5b00eae729..2a12c3ddb5 100644
--- a/modules/exoplanets/exoplanetsmodule_lua.inl
+++ b/modules/exoplanets/exoplanetsmodule_lua.inl
@@ -37,8 +37,8 @@ constexpr std::string_view _loggerCat = "ExoplanetsModule";
 constexpr std::string_view ExoplanetsGuiPath = "/Milky Way/Exoplanets/Exoplanet Systems/";
 
 // Lua cannot handle backslashes, so replace these with forward slashes
-std::string formatPathToLua(const std::string& path) {
-    std::string resPath = path;
+std::string formatPathToLua(const std::filesystem::path& path) {
+    std::string resPath = path.string();
     std::replace(resPath.begin(), resPath.end(), '\\', '/');
     return resPath;
 }
@@ -51,14 +51,14 @@ openspace::exoplanets::ExoplanetSystem findExoplanetSystemInData(
 
     const ExoplanetsModule* module = global::moduleEngine->module<ExoplanetsModule>();
 
-    const std::string binPath = module->exoplanetsDataPath();
+    const std::filesystem::path binPath = module->exoplanetsDataPath();
     std::ifstream data(absPath(binPath), std::ios::in | std::ios::binary);
     if (!data.good()) {
         LERROR(std::format("Failed to open exoplanets data file '{}'", binPath));
         return ExoplanetSystem();
     }
 
-    const std::string lutPath = module->lookUpTablePath();
+    const std::filesystem::path lutPath = module->lookUpTablePath();
     std::ifstream lut(absPath(lutPath));
     if (!lut.good()) {
         LERROR(std::format("Failed to open exoplanets look-up table '{}'", lutPath));
@@ -154,7 +154,7 @@ void createExoplanetSystem(const std::string& starName,
 
     if (!std::isnan(bv)) {
         starColor = computeStarColor(bv);
-        const std::string starTexture = module->starTexturePath();
+        const std::filesystem::path starTexture = module->starTexturePath();
         colorLayers =
             "{"
                 "Identifier = 'StarColor',"
@@ -171,7 +171,7 @@ void createExoplanetSystem(const std::string& starName,
             "}";
     }
     else {
-        const std::string noDataTexture = module->noDataTexturePath();
+        const std::filesystem::path noDataTexture = module->noDataTexturePath();
         colorLayers =
             "{"
                 "Identifier = 'NoDataStarTexture',"
@@ -355,7 +355,7 @@ void createExoplanetSystem(const std::string& starName,
             const float lowerOffset = static_cast<float>(planet.aLower / planet.a);
             const float upperOffset = static_cast<float>(planet.aUpper / planet.a);
 
-            const std::string discTexture = module->orbitDiscTexturePath();
+            const std::filesystem::path discTexture = module->orbitDiscTexturePath();
 
             bool isDiscEnabled = module->showOrbitUncertainty();
 
@@ -462,7 +462,7 @@ void createExoplanetSystem(const std::string& starName,
             "the greenhouse effect would not be able to maintain surface temperature "
             "above freezing anywhere on the planet";
 
-        const std::string hzTexture = module->habitableZoneTexturePath();
+        const std::filesystem::path hzTexture = module->habitableZoneTexturePath();
         bool isHzEnabled = module->showHabitableZone();
         bool useOptimistic = module->useOptimisticZone();
         float opacity = module->habitableZoneOpacity();
@@ -514,7 +514,7 @@ void createExoplanetSystem(const std::string& starName,
                 size *= std::pow(system.starData.teff / sunTeff, 2.0);
             }
 
-            const std::string glareTexture = module->starGlareTexturePath();
+            const std::filesystem::path glareTexture = module->starGlareTexturePath();
 
             const std::string starGlare = "{"
                 "Identifier = '" + starIdentifier + "_Glare',"
@@ -559,14 +559,14 @@ std::vector<std::string> hostStarsWithSufficientData() {
         return {};
     }
 
-    const std::string lutPath = module->lookUpTablePath();
+    const std::filesystem::path lutPath = module->lookUpTablePath();
     std::ifstream lookupTableFile(absPath(lutPath));
     if (!lookupTableFile.good()) {
         LERROR(std::format("Failed to open lookup table file '{}'", lutPath));
         return {};
     }
 
-    const std::string binPath = module->exoplanetsDataPath();
+    const std::filesystem::path binPath = module->exoplanetsDataPath();
     std::ifstream data(absPath(binPath), std::ios::in | std::ios::binary);
     if (!data.good()) {
         LERROR(std::format("Failed to open data file '{}'", binPath));
@@ -734,7 +734,8 @@ listOfExoplanetsDeprecated()
         ExoplanetsDataPreparationTask::readFirstDataRow(inputDataFile);
 
     const ExoplanetsModule* module = global::moduleEngine->module<ExoplanetsModule>();
-    const std::string teffBvConversionPath = module->teffToBvConversionFilePath();
+    const std::filesystem::path
+        teffBvConversionPath = module->teffToBvConversionFilePath();
 
     std::map<std::string, ExoplanetSystem> hostNameToSystemDataMap;
 
diff --git a/modules/fieldlines/rendering/renderablefieldlines.cpp b/modules/fieldlines/rendering/renderablefieldlines.cpp
index 1d6d04d7dd..f382a7b532 100644
--- a/modules/fieldlines/rendering/renderablefieldlines.cpp
+++ b/modules/fieldlines/rendering/renderablefieldlines.cpp
@@ -437,8 +437,9 @@ RenderableFieldlines::generateFieldlinesVolumeKameleon()
         LERROR(std::format("'{}' does not name a file", KeyVectorField));
         return {};
     }
-    std::string fileName = _vectorFieldInfo.value<std::string>(KeyVectorFieldFile);
-    fileName = absPath(fileName).string();
+    std::filesystem::path fileName = absPath(
+        _vectorFieldInfo.value<std::string>(KeyVectorFieldFile)
+    );
 
     //KameleonWrapper::Model modelType;
     if (model != VectorFieldKameleonModelBATSRUS) {
@@ -473,7 +474,7 @@ RenderableFieldlines::generateFieldlinesVolumeKameleon()
         std::string yVariable = _vectorFieldInfo.value<std::string>(v2);
         std::string zVariable = _vectorFieldInfo.value<std::string>(v3);
 
-        KameleonWrapper kw(fileName);
+        KameleonWrapper kw = KameleonWrapper(fileName);
         return kw.classifiedFieldLines(
             xVariable,
             yVariable,
@@ -484,7 +485,7 @@ RenderableFieldlines::generateFieldlinesVolumeKameleon()
     }
 
     if (lorentzForce) {
-        KameleonWrapper kw(fileName);
+        KameleonWrapper kw = KameleonWrapper(fileName);
         return kw.lorentzTrajectories(_seedPoints, _fieldlineColor, _stepSize);
     }
 
diff --git a/modules/fieldlinessequence/fieldlinessequencemodule.cpp b/modules/fieldlinessequence/fieldlinessequencemodule.cpp
index 9973fd4fa5..9c98e97bb2 100644
--- a/modules/fieldlinessequence/fieldlinessequencemodule.cpp
+++ b/modules/fieldlinessequence/fieldlinessequencemodule.cpp
@@ -48,14 +48,12 @@ mappingkey 1.0   255  255  255  255
 
 namespace openspace {
 
-std::string FieldlinesSequenceModule::DefaultTransferFunctionFile = "";
+std::filesystem::path FieldlinesSequenceModule::DefaultTransferFunctionFile = "";
 
 FieldlinesSequenceModule::FieldlinesSequenceModule() : OpenSpaceModule(Name) {
-    DefaultTransferFunctionFile = absPath(
-        "${TEMPORARY}/default_transfer_function.txt"
-    ).string();
+    DefaultTransferFunctionFile = absPath("${TEMPORARY}/default_transfer_function.txt");
 
-    std::ofstream file(DefaultTransferFunctionFile);
+    std::ofstream file = std::ofstream(DefaultTransferFunctionFile);
     file << DefaultTransferfunctionSource;
 }
 
diff --git a/modules/fieldlinessequence/fieldlinessequencemodule.h b/modules/fieldlinessequence/fieldlinessequencemodule.h
index e9a71fb144..2272170596 100644
--- a/modules/fieldlinessequence/fieldlinessequencemodule.h
+++ b/modules/fieldlinessequence/fieldlinessequencemodule.h
@@ -27,6 +27,8 @@
 
 #include <openspace/util/openspacemodule.h>
 
+#include <filesystem>
+
 namespace openspace {
 
 class FieldlinesSequenceModule : public OpenSpaceModule {
@@ -37,7 +39,7 @@ public:
 
     std::vector<documentation::Documentation> documentations() const override;
 
-    static std::string DefaultTransferFunctionFile;
+    static std::filesystem::path DefaultTransferFunctionFile;
 
 private:
     void internalInitialize(const ghoul::Dictionary&) override;
diff --git a/modules/fieldlinessequence/rendering/renderablefieldlinessequence.cpp b/modules/fieldlinessequence/rendering/renderablefieldlinessequence.cpp
index 9bf9d159d5..e68845d67c 100644
--- a/modules/fieldlinessequence/rendering/renderablefieldlinessequence.cpp
+++ b/modules/fieldlinessequence/rendering/renderablefieldlinessequence.cpp
@@ -232,7 +232,7 @@ namespace {
 
         // A list of paths to transferfunction .txt files containing color tables
         // used for colorizing the fieldlines according to different parameters
-        std::optional<std::vector<std::string>> colorTablePaths;
+        std::optional<std::vector<std::filesystem::path>> colorTablePaths;
 
         // [[codegen::verbatim(ColorMethodInfo.description)]]
         std::optional<std::string> colorMethod;
@@ -420,9 +420,7 @@ RenderableFieldlinesSequence::RenderableFieldlinesSequence(
 
     // Ensure that there are available and valid source files left
     if (_sourceFiles.empty()) {
-        LERROR(std::format(
-            "'{}' contains no {} files", sourcePath.string(), fileTypeString
-        ));
+        LERROR(std::format("'{}' contains no {} files", sourcePath, fileTypeString));
     }
     _extraVars = p.extraVariables.value_or(_extraVars);
     _flowEnabled = p.flowEnabled.value_or(_flowEnabled);
@@ -438,7 +436,7 @@ RenderableFieldlinesSequence::RenderableFieldlinesSequence(
     _maskingEnabled = p.maskingEnabled.value_or(_maskingEnabled);
     _maskingQuantityTemp = p.maskingQuantity.value_or(_maskingQuantityTemp);
     if (p.colorTablePaths.has_value()) {
-        _colorTablePaths = p.colorTablePaths.value();
+        _colorTablePaths = *p.colorTablePaths;
     }
     else {
         // Set a default color table, just in case the (optional) user defined paths are
@@ -499,9 +497,7 @@ RenderableFieldlinesSequence::RenderableFieldlinesSequence(
 }
 
 void RenderableFieldlinesSequence::initialize() {
-    _transferFunction = std::make_unique<TransferFunction>(
-        absPath(_colorTablePaths[0]).string()
-    );
+    _transferFunction = std::make_unique<TransferFunction>(absPath(_colorTablePaths[0]));
 }
 
 void RenderableFieldlinesSequence::initializeGL() {
@@ -680,7 +676,7 @@ void RenderableFieldlinesSequence::setupProperties() {
         // Each quantity should have its own color table and color table range
         // no more, no less
         _colorTablePaths.resize(nExtraQuantities, _colorTablePaths.back());
-        _colorTablePath = _colorTablePaths[0];
+        _colorTablePath = _colorTablePaths[0].string();
         _colorTableRanges.resize(nExtraQuantities, _colorTableRanges.back());
         _maskingRanges.resize(nExtraQuantities, _maskingRanges.back());
     }
@@ -704,11 +700,11 @@ void RenderableFieldlinesSequence::definePropertyCallbackFunctions() {
         _colorQuantity.onChange([this]() {
             _shouldUpdateColorBuffer = true;
             _colorQuantityMinMax = _colorTableRanges[_colorQuantity];
-            _colorTablePath = _colorTablePaths[_colorQuantity];
+            _colorTablePath = _colorTablePaths[_colorQuantity].string();
         });
 
         _colorTablePath.onChange([this]() {
-            _transferFunction->setPath(_colorTablePath);
+            _transferFunction->setPath(_colorTablePath.value());
         });
 
         _colorQuantityMinMax.onChange([this]() {
diff --git a/modules/fieldlinessequence/rendering/renderablefieldlinessequence.h b/modules/fieldlinessequence/rendering/renderablefieldlinessequence.h
index b704a9b8d3..b2bcb92e1d 100644
--- a/modules/fieldlinessequence/rendering/renderablefieldlinessequence.h
+++ b/modules/fieldlinessequence/rendering/renderablefieldlinessequence.h
@@ -147,7 +147,7 @@ private:
     std::unique_ptr<TransferFunction> _transferFunction;
 
     // Paths to color tables. One for each 'extraQuantity'
-    std::vector<std::string> _colorTablePaths;
+    std::vector<std::filesystem::path> _colorTablePaths;
     // Values represents min & max values represented in the color table
     std::vector<glm::vec2> _colorTableRanges;
     // Values represents min & max limits for valid masking range
diff --git a/modules/gaia/rendering/octreemanager.cpp b/modules/gaia/rendering/octreemanager.cpp
index f77492ad78..506c3c7e4b 100644
--- a/modules/gaia/rendering/octreemanager.cpp
+++ b/modules/gaia/rendering/octreemanager.cpp
@@ -604,7 +604,7 @@ void OctreeManager::writeNodeToFile(std::ofstream& outFileStream, const OctreeNo
 }
 
 int OctreeManager::readFromFile(std::ifstream& inFileStream, bool readData,
-                                const std::string& folderPath)
+                                const std::filesystem::path& folderPath)
 {
     int nStarsRead = 0;
     const int oldMaxdist = static_cast<int>(MAX_DIST);
@@ -699,11 +699,11 @@ int OctreeManager::readNodeFromFile(std::ifstream& inFileStream, OctreeNode& nod
     return numStars;
 }
 
-void OctreeManager::writeToMultipleFiles(const std::string& outFolderPath,
+void OctreeManager::writeToMultipleFiles(const std::filesystem::path& outFolderPath,
                                          size_t branchIndex)
 {
     // Write entire branch to disc, with one file per node
-    const std::string outFilePrefix = outFolderPath + std::to_string(branchIndex);
+    const std::string outFilePrefix = std::format("{}{}", outFolderPath, branchIndex);
     // More threads doesn't make it much faster, disk speed still the limiter
     writeNodeToMultipleFiles(outFilePrefix, *_root->children[branchIndex], false);
 
@@ -797,7 +797,9 @@ void OctreeManager::fetchNodeDataFromFile(OctreeNode& node) {
     std::string posId = std::to_string(node.octreePositionIndex);
     posId.erase(posId.begin());
 
-    const std::string inFilePath = _streamFolderPath + posId + BINARY_SUFFIX;
+    const std::string inFilePath = std::format(
+        "{}{}{}", _streamFolderPath, posId, BINARY_SUFFIX
+    );
     std::ifstream inFileStream(inFilePath, std::ifstream::binary);
     // LINFO("Fetch node data file: " + inFilePath);
 
diff --git a/modules/gaia/rendering/octreemanager.h b/modules/gaia/rendering/octreemanager.h
index 05a56a5908..5be8d38d53 100644
--- a/modules/gaia/rendering/octreemanager.h
+++ b/modules/gaia/rendering/octreemanager.h
@@ -29,6 +29,7 @@
 #include <ghoul/glm.h>
 #include <ghoul/opengl/ghoul_gl.h>
 #include <array>
+#include <filesystem>
 #include <map>
 #include <mutex>
 #include <queue>
@@ -150,7 +151,7 @@ public:
      * \return the total number of (distinct) stars read
      */
     int readFromFile(std::ifstream& inFileStream, bool readData,
-        const std::string& folderPath = std::string());
+        const std::filesystem::path& folderPath = std::filesystem::path());
 
     /**
      * Write specified part of Octree to multiple files, including all data.
@@ -159,7 +160,8 @@ public:
      * \param branchIndex Defines which branch to write. Clears specified branch after
      *        writing is done. Calls `writeNodeToMultipleFiles()` for the specified branch
      */
-    void writeToMultipleFiles(const std::string& outFolderPath, size_t branchIndex);
+    void writeToMultipleFiles(const std::filesystem::path& outFolderPath,
+        size_t branchIndex);
 
     /**
      * Getters.
@@ -410,7 +412,7 @@ private:
     long long _cpuRamBudget = 0;
     long long _maxCpuRamBudget = 0;
     unsigned long long _parentNodeOfCamera = 8;
-    std::string _streamFolderPath;
+    std::filesystem::path _streamFolderPath;
     size_t _traversedBranchesInRenderCall = 0;
 
 }; // class OctreeManager
diff --git a/modules/gaia/rendering/renderablegaiastars.cpp b/modules/gaia/rendering/renderablegaiastars.cpp
index 8caea6a862..ee99034969 100644
--- a/modules/gaia/rendering/renderablegaiastars.cpp
+++ b/modules/gaia/rendering/renderablegaiastars.cpp
@@ -2101,7 +2101,7 @@ void RenderableGaiaStars::update(const UpdateData&) {
         _pointSpreadFunctionTexture = nullptr;
         if (!_pointSpreadFunctionTexturePath.value().empty()) {
             _pointSpreadFunctionTexture = ghoul::io::TextureReader::ref().loadTexture(
-                absPath(_pointSpreadFunctionTexturePath).string(),
+                absPath(_pointSpreadFunctionTexturePath),
                 2
             );
 
@@ -2130,7 +2130,7 @@ void RenderableGaiaStars::update(const UpdateData&) {
         _colorTexture = nullptr;
         if (!_colorTexturePath.value().empty()) {
             _colorTexture = ghoul::io::TextureReader::ref().loadTexture(
-                absPath(_colorTexturePath).string(),
+                absPath(_colorTexturePath),
                 1
             );
             if (_colorTexture) {
@@ -2199,24 +2199,24 @@ bool RenderableGaiaStars::readDataFile() {
 
     switch (fileReaderOption) {
         case gaia::FileReaderOption::Fits:
-            // Read raw fits file and construct Octree.
+            // Read raw fits file and construct Octree
             nReadStars = readFitsFile(file);
             break;
         case gaia::FileReaderOption::Speck:
-            // Read raw speck file and construct Octree.
+            // Read raw speck file and construct Octree
             nReadStars = readSpeckFile(file);
             break;
         case gaia::FileReaderOption::BinaryRaw:
-            // Stars are stored in an ordered binary file.
+            // Stars are stored in an ordered binary file
             nReadStars = readBinaryRawFile(file);
             break;
         case gaia::FileReaderOption::BinaryOctree:
-            // Octree already constructed and stored as a binary file.
+            // Octree already constructed and stored as a binary file
             nReadStars = readBinaryOctreeFile(file);
             break;
         case gaia::FileReaderOption::StreamOctree:
-            // Read Octree structure from file, without data.
-            nReadStars = readBinaryOctreeStructureFile(file.string());
+            // Read Octree structure from file, without data
+            nReadStars = readBinaryOctreeStructureFile(file);
             break;
         default:
             LERROR("Wrong FileReaderOption - no data file loaded");
@@ -2332,21 +2332,17 @@ int RenderableGaiaStars::readBinaryOctreeFile(const std::filesystem::path& fileP
 int RenderableGaiaStars::readBinaryOctreeStructureFile(
                                                   const std::filesystem::path& folderPath)
 {
-    int nReadStars = 0;
-    std::string indexFile = folderPath.string() + "index.bin";
+    std::filesystem::path indexFile = folderPath / "index.bin";
 
-    std::ifstream fileStream(indexFile, std::ifstream::binary);
-    if (fileStream.good()) {
-        nReadStars = _octreeManager.readFromFile(fileStream, false, folderPath.string());
-
-        fileStream.close();
-    }
-    else {
+    std::ifstream fileStream = std::ifstream(indexFile, std::ifstream::binary);
+    if (!fileStream.good()) {
         LERROR(std::format(
             "Error opening file '{}' for loading binary Octree file", indexFile
         ));
-        return nReadStars;
+        return 0;
     }
+
+    const int nReadStars = _octreeManager.readFromFile(fileStream, false, folderPath);
     return nReadStars;
 }
 
diff --git a/modules/gaia/tasks/constructoctreetask.cpp b/modules/gaia/tasks/constructoctreetask.cpp
index b555002cdd..1151890488 100644
--- a/modules/gaia/tasks/constructoctreetask.cpp
+++ b/modules/gaia/tasks/constructoctreetask.cpp
@@ -561,7 +561,7 @@ void ConstructOctreeTask::constructOctreeFromFolder(
         std::thread t(
             &OctreeManager::writeToMultipleFiles,
             _indexOctreeManager,
-            _outFileOrFolderPath.string(),
+            _outFileOrFolderPath,
             idx
         );
         writeThreads[idx] = std::move(t);
@@ -591,10 +591,8 @@ void ConstructOctreeTask::constructOctreeFromFolder(
     //    " - 5000kPc is " + std::to_string(starsOutside5000));
 
     // Write index file of Octree structure.
-    std::filesystem::path indexFileOutPath = std::format(
-        "{}/index.bin", _outFileOrFolderPath.string()
-    );
-    std::ofstream outFileStream(indexFileOutPath, std::ofstream::binary);
+    std::filesystem::path indexFileOutPath = _outFileOrFolderPath / "index.bin";
+    std::ofstream outFileStream = std::ofstream(indexFileOutPath, std::ofstream::binary);
     if (outFileStream.good()) {
         LINFO("Writing index file");
         _indexOctreeManager->writeToFile(outFileStream, false);
diff --git a/modules/gaia/tasks/readfilejob.cpp b/modules/gaia/tasks/readfilejob.cpp
index 2e9e0ffca3..f9b21efcda 100644
--- a/modules/gaia/tasks/readfilejob.cpp
+++ b/modules/gaia/tasks/readfilejob.cpp
@@ -35,9 +35,10 @@ namespace {
 
 namespace openspace::gaia {
 
-ReadFileJob::ReadFileJob(std::string filePath, std::vector<std::string> allColumns,
-                         int firstRow, int lastRow, size_t nDefaultCols,
-                         int nValuesPerStar, std::shared_ptr<FitsFileReader> fitsReader)
+ReadFileJob::ReadFileJob(std::filesystem::path filePath,
+                         std::vector<std::string> allColumns, int firstRow, int lastRow,
+                         size_t nDefaultCols, int nValuesPerStar,
+                         std::shared_ptr<FitsFileReader> fitsReader)
     : _inFilePath(std::move(filePath))
     , _firstRow(firstRow)
     , _lastRow(lastRow)
diff --git a/modules/gaia/tasks/readfilejob.h b/modules/gaia/tasks/readfilejob.h
index 9409704084..6ab2469a33 100644
--- a/modules/gaia/tasks/readfilejob.h
+++ b/modules/gaia/tasks/readfilejob.h
@@ -28,6 +28,7 @@
 #include <openspace/util/concurrentjobmanager.h>
 
 #include <modules/fitsfilereader/include/fitsfilereader.h>
+#include <filesystem>
 
 namespace openspace::gaia {
 
@@ -49,8 +50,8 @@ struct ReadFileJob : public Job<std::vector<std::vector<float>>> {
      * \param nValuesPerStar Defines how many values that will be stored per star
      * \param fitsReader The reader that should be used in this job
      */
-    ReadFileJob(std::string filePath, std::vector<std::string> allColumns, int firstRow,
-        int lastRow, size_t nDefaultCols, int nValuesPerStar,
+    ReadFileJob(std::filesystem::path filePath, std::vector<std::string> allColumns,
+        int firstRow, int lastRow, size_t nDefaultCols, int nValuesPerStar,
         std::shared_ptr<FitsFileReader> fitsReader);
 
     ~ReadFileJob() override = default;
@@ -60,7 +61,7 @@ struct ReadFileJob : public Job<std::vector<std::vector<float>>> {
     std::vector<std::vector<float>> product() override;
 
 private:
-    std::string _inFilePath;
+    std::filesystem::path _inFilePath;
     int _firstRow;
     int _lastRow;
     size_t _nDefaultCols;
diff --git a/modules/gaia/tasks/readfitstask.cpp b/modules/gaia/tasks/readfitstask.cpp
index c44ab59257..a334b62ba5 100644
--- a/modules/gaia/tasks/readfitstask.cpp
+++ b/modules/gaia/tasks/readfitstask.cpp
@@ -132,7 +132,7 @@ void ReadFitsTask::readSingleFitsFile(const Task::ProgressCallback& progressCall
 
     FitsFileReader fileReader(false);
     std::vector<float> fullData = fileReader.readFitsFile(
-        _inFileOrFolderPath.string(),
+        _inFileOrFolderPath,
         nValuesPerStar,
         _firstRow,
         _lastRow,
@@ -255,7 +255,7 @@ void ReadFitsTask::readAllFitsFilesFromFolder(const Task::ProgressCallback&) {
 
         // Add reading of file to jobmanager, which will distribute it to our threadpool.
         auto readFileJob = std::make_shared<gaia::ReadFileJob>(
-            fileToRead.string(),
+            fileToRead,
             _allColumnNames,
             _firstRow,
             _lastRow,
diff --git a/modules/galaxy/rendering/galaxyraycaster.cpp b/modules/galaxy/rendering/galaxyraycaster.cpp
index a550a98eef..649de64569 100644
--- a/modules/galaxy/rendering/galaxyraycaster.cpp
+++ b/modules/galaxy/rendering/galaxyraycaster.cpp
@@ -26,8 +26,9 @@
 
 #include <openspace/rendering/renderable.h>
 #include <openspace/util/updatestructures.h>
-#include <ghoul/opengl/ghoul_gl.h>
+#include <ghoul/filesystem/filesystem.h>
 #include <ghoul/misc/profiling.h>
+#include <ghoul/opengl/ghoul_gl.h>
 #include <ghoul/opengl/programobject.h>
 #include <ghoul/opengl/textureunit.h>
 #include <ghoul/opengl/texture.h>
@@ -142,19 +143,19 @@ bool GalaxyRaycaster::isCameraInside(const RenderData& data, glm::vec3& localPos
         localPosition.z > 0 && localPosition.z < 1);
 }
 
-std::string GalaxyRaycaster::boundsVertexShaderPath() const {
-    return std::string(GlslBoundsVsPath);
+std::filesystem::path GalaxyRaycaster::boundsVertexShaderPath() const {
+    return absPath(GlslBoundsVsPath);
 }
 
-std::string GalaxyRaycaster::boundsFragmentShaderPath() const {
-    return std::string(GlslBoundsFsPath);
+std::filesystem::path GalaxyRaycaster::boundsFragmentShaderPath() const {
+    return absPath(GlslBoundsFsPath);
 }
 
-std::string GalaxyRaycaster::raycasterPath() const {
-    return _raycastingShader.string();
+std::filesystem::path GalaxyRaycaster::raycasterPath() const {
+    return _raycastingShader;
 }
 
-std::string GalaxyRaycaster::helperPath() const {
+std::filesystem::path GalaxyRaycaster::helperPath() const {
     return ""; // no helper file
 }
 
diff --git a/modules/galaxy/rendering/galaxyraycaster.h b/modules/galaxy/rendering/galaxyraycaster.h
index 25da69373b..f364fb6b98 100644
--- a/modules/galaxy/rendering/galaxyraycaster.h
+++ b/modules/galaxy/rendering/galaxyraycaster.h
@@ -62,10 +62,10 @@ public:
     bool isCameraInside(const RenderData& data,
         glm::vec3& localPosition) override;
 
-    std::string boundsVertexShaderPath() const override;
-    std::string boundsFragmentShaderPath() const override;
-    std::string raycasterPath() const override;
-    std::string helperPath() const override;
+    std::filesystem::path boundsVertexShaderPath() const override;
+    std::filesystem::path boundsFragmentShaderPath() const override;
+    std::filesystem::path raycasterPath() const override;
+    std::filesystem::path helperPath() const override;
 
     void setAspect(const glm::vec3& aspect);
     void setModelTransform(glm::mat4 transform);
diff --git a/modules/galaxy/rendering/renderablegalaxy.cpp b/modules/galaxy/rendering/renderablegalaxy.cpp
index f14fd544ac..ea11d39242 100644
--- a/modules/galaxy/rendering/renderablegalaxy.cpp
+++ b/modules/galaxy/rendering/renderablegalaxy.cpp
@@ -302,15 +302,15 @@ RenderableGalaxy::RenderableGalaxy(const ghoul::Dictionary& dictionary)
 
     _rotation = p.rotation.value_or(_rotation);
 
-    _volumeFilename = p.volume.filename.string();
+    _volumeFilename = p.volume.filename;
     _volumeDimensions = p.volume.dimensions;
     _volumeSize = p.volume.size;
     _numberOfRayCastingSteps = p.volume.steps.value_or(_numberOfRayCastingSteps);
     _downScaleVolumeRendering = p.volume.downscale.value_or(_downScaleVolumeRendering);
 
-    _pointsFilename = p.points.filename.string();
+    _pointsFilename = p.points.filename;
     _enabledPointsRatio = p.points.enabledPointsRatio.value_or(_enabledPointsRatio);
-    _pointSpreadFunctionTexturePath = p.points.texture.string();
+    _pointSpreadFunctionTexturePath = p.points.texture;
     _pointSpreadFunctionFile = std::make_unique<ghoul::filesystem::File>(
         _pointSpreadFunctionTexturePath
     );
@@ -455,7 +455,7 @@ void RenderableGalaxy::initializeGL() {
 
     if (!_pointSpreadFunctionTexturePath.empty()) {
         _pointSpreadFunctionTexture = ghoul::io::TextureReader::ref().loadTexture(
-            absPath(_pointSpreadFunctionTexturePath).string(),
+            absPath(_pointSpreadFunctionTexturePath),
             2
         );
 
diff --git a/modules/galaxy/rendering/renderablegalaxy.h b/modules/galaxy/rendering/renderablegalaxy.h
index 4da5da407e..39639363b9 100644
--- a/modules/galaxy/rendering/renderablegalaxy.h
+++ b/modules/galaxy/rendering/renderablegalaxy.h
@@ -32,6 +32,7 @@
 #include <openspace/properties/optionproperty.h>
 #include <ghoul/opengl/ghoul_gl.h>
 #include <ghoul/opengl/uniformcache.h>
+#include <filesystem>
 
 namespace ghoul::opengl { class ProgramObject; }
 
@@ -84,10 +85,10 @@ private:
     std::unique_ptr<ghoul::opengl::Texture> _pointSpreadFunctionTexture;
     std::unique_ptr<ghoul::filesystem::File> _pointSpreadFunctionFile;
 
-    std::string _volumeFilename;
+    std::filesystem::path _volumeFilename;
     glm::ivec3 _volumeDimensions = glm::ivec3(0);
-    std::string _pointsFilename;
-    std::string _pointSpreadFunctionTexturePath;
+    std::filesystem::path _pointsFilename;
+    std::filesystem::path _pointSpreadFunctionTexturePath;
     std::filesystem::path _raycastingShader;
 
     std::unique_ptr<GalaxyRaycaster> _raycaster;
diff --git a/modules/globebrowsing/globebrowsingmodule_lua.inl b/modules/globebrowsing/globebrowsingmodule_lua.inl
index fbf03fff1a..956823ea4f 100644
--- a/modules/globebrowsing/globebrowsingmodule_lua.inl
+++ b/modules/globebrowsing/globebrowsingmodule_lua.inl
@@ -701,7 +701,7 @@ geoPositionForCameraDeprecated(bool useEyePosition = false)
 
     std::string identifier = makeIdentifier(name.value_or(path.stem().string()));
     d.setValue("Identifier", identifier);
-    d.setValue("File", path.string());
+    d.setValue("File", path);
     if (name.has_value()) {
         d.setValue("Name", *name);
     }
diff --git a/modules/globebrowsing/src/gdalwrapper.cpp b/modules/globebrowsing/src/gdalwrapper.cpp
index 3bb7c0093d..de23b519a7 100644
--- a/modules/globebrowsing/src/gdalwrapper.cpp
+++ b/modules/globebrowsing/src/gdalwrapper.cpp
@@ -97,9 +97,9 @@ GdalWrapper::GdalWrapper(size_t maximumCacheSize, size_t maximumMaximumCacheSize
     , _gdalMaximumCacheSize(
         GdalMaximumCacheInfo,
         static_cast<int>(maximumCacheSize / (1024ULL * 1024ULL)), // Default
-        0,                                          // Minimum: No caching
+        0, // Minimum: No caching
         static_cast<int>(maximumMaximumCacheSize / (1024ULL * 1024ULL)), // Maximum
-        1                                           // Step: One MB
+        1 // Step: One MB
     )
 {
     ZoneScoped;
@@ -108,11 +108,10 @@ GdalWrapper::GdalWrapper(size_t maximumCacheSize, size_t maximumMaximumCacheSize
     addProperty(_gdalMaximumCacheSize);
 
     GDALAllRegister();
-    CPLSetConfigOption(
-        "GDAL_DATA",
-        absPath("${MODULE_GLOBEBROWSING}/gdal_data").string().c_str()
-    );
-    CPLSetConfigOption("CPL_TMPDIR", absPath("${BASE}").string().c_str());
+    const std::string data = absPath("${MODULE_GLOBEBROWSING}/gdal_data").string();
+    CPLSetConfigOption("GDAL_DATA", data.c_str());
+    const std::string base = absPath("${BASE}").string();
+    CPLSetConfigOption("CPL_TMPDIR", base.c_str());
     CPLSetConfigOption("GDAL_HTTP_UNSAFESSL", "YES");
 
     CPLSetConfigOption("GDAL_HTTP_TIMEOUT", "3"); // 3 seconds
@@ -121,7 +120,7 @@ GdalWrapper::GdalWrapper(size_t maximumCacheSize, size_t maximumMaximumCacheSize
     setGdalProxyConfiguration();
     CPLSetErrorHandler(gdalErrorHandler);
 
-    _gdalMaximumCacheSize.onChange([&] {
+    _gdalMaximumCacheSize.onChange([this] {
         // MB to Bytes
         GDALSetCacheMax64(
             static_cast<int64_t>(_gdalMaximumCacheSize) * 1024ULL * 1024ULL
diff --git a/modules/globebrowsing/src/globelabelscomponent.cpp b/modules/globebrowsing/src/globelabelscomponent.cpp
index 5211972ea7..ce1253a0a6 100644
--- a/modules/globebrowsing/src/globelabelscomponent.cpp
+++ b/modules/globebrowsing/src/globelabelscomponent.cpp
@@ -327,7 +327,7 @@ void GlobeLabelsComponent::initialize(const ghoul::Dictionary& dictionary,
         return;
     }
 
-    const bool loadSuccess = loadLabelsData(absPath(p.fileName->string()).string());
+    const bool loadSuccess = loadLabelsData(absPath(*p.fileName));
     if (!loadSuccess) {
         return;
     }
diff --git a/modules/globebrowsing/src/rawtiledatareader.cpp b/modules/globebrowsing/src/rawtiledatareader.cpp
index 47fd4447c4..0b0ff30478 100644
--- a/modules/globebrowsing/src/rawtiledatareader.cpp
+++ b/modules/globebrowsing/src/rawtiledatareader.cpp
@@ -296,8 +296,8 @@ std::optional<std::string> RawTileDataReader::mrfCache() {
         std::to_string(std::hash<std::string>{}(_datasetFilePath));
     const std::string path = std::format("{}/{}/{}/",
         mod.mrfCacheLocation(), _cacheProperties.path, datasetIdentifier);
-    const std::string root = absPath(path).string();
-    std::string mrf = root + datasetIdentifier + ".mrf";
+    const std::filesystem::path root = absPath(path);
+    const std::string mrf = std::format("{}{}.mrf", root, datasetIdentifier);
 
     if (!std::filesystem::exists(mrf)) {
         std::error_code ec;
diff --git a/modules/globebrowsing/src/ringscomponent.cpp b/modules/globebrowsing/src/ringscomponent.cpp
index a7fe337ac0..20bc7cd980 100644
--- a/modules/globebrowsing/src/ringscomponent.cpp
+++ b/modules/globebrowsing/src/ringscomponent.cpp
@@ -285,7 +285,7 @@ void RingsComponent::initialize() {
     addProperty(_size);
 
     if (p.texture.has_value()) {
-        _texturePath = absPath(p.texture->string()).string();
+        _texturePath = absPath(*p.texture).string();
         _textureFile = std::make_unique<File>(_texturePath.value());
         _texturePath.onChange([this]() { loadTexture(); });
         addProperty(_texturePath);
@@ -293,7 +293,7 @@ void RingsComponent::initialize() {
     }
 
     if (p.textureFwrd.has_value()) {
-        _textureFwrdPath = absPath(p.textureFwrd->string()).string();
+        _textureFwrdPath = absPath(*p.textureFwrd).string();
         _textureFileForwards = std::make_unique<File>(_textureFwrdPath.value());
         _textureFwrdPath.onChange([this]() { loadTexture(); });
         addProperty(_textureFwrdPath);
@@ -301,7 +301,7 @@ void RingsComponent::initialize() {
     }
 
     if (p.textureBckwrd.has_value()) {
-        _textureBckwrdPath = absPath(p.textureBckwrd->string()).string();
+        _textureBckwrdPath = absPath(*p.textureBckwrd).string();
         _textureFileBackwards = std::make_unique<File>(_textureBckwrdPath.value());
         _textureBckwrdPath.onChange([this]() { loadTexture(); });
         addProperty(_textureBckwrdPath);
@@ -309,7 +309,7 @@ void RingsComponent::initialize() {
     }
 
     if (p.textureUnlit.has_value()) {
-        _textureUnlitPath = absPath(p.textureUnlit->string()).string();
+        _textureUnlitPath = absPath(*p.textureUnlit).string();
         _textureFileUnlit = std::make_unique<File>(_textureUnlitPath.value());
         _textureUnlitPath.onChange([this]() { loadTexture(); });
         addProperty(_textureUnlitPath);
@@ -317,7 +317,7 @@ void RingsComponent::initialize() {
     }
 
     if (p.textureColor.has_value()) {
-        _textureColorPath = absPath(p.textureColor->string()).string();
+        _textureColorPath = absPath(*p.textureColor).string();
         _textureFileColor = std::make_unique<File>(_textureColorPath.value());
         _textureColorPath.onChange([this]() { loadTexture(); });
         addProperty(_textureColorPath);
@@ -325,7 +325,7 @@ void RingsComponent::initialize() {
     }
 
     if (p.textureTransparency.has_value()) {
-        _textureTransparencyPath = absPath(p.textureTransparency->string()).string();
+        _textureTransparencyPath = absPath(*p.textureTransparency).string();
         _textureFileTransparency = std::make_unique<File>(
             _textureTransparencyPath.value()
         );
@@ -658,15 +658,12 @@ void RingsComponent::loadTexture() {
 
     if (!_texturePath.value().empty()) {
         std::unique_ptr<Texture> texture = TextureReader::ref().loadTexture(
-            absPath(_texturePath).string(),
+            absPath(_texturePath),
             1
         );
 
         if (texture) {
-            LDEBUGC(
-                "RingsComponent",
-                std::format("Loaded texture from '{}'", absPath(_texturePath))
-            );
+            LDEBUG(std::format("Loaded texture from '{}'", absPath(_texturePath)));
             _texture = std::move(texture);
 
             _texture->uploadTexture();
@@ -681,13 +678,12 @@ void RingsComponent::loadTexture() {
 
     if (!_textureFwrdPath.value().empty()) {
         std::unique_ptr<Texture> textureForwards = TextureReader::ref().loadTexture(
-            absPath(_textureFwrdPath).string(),
+            absPath(_textureFwrdPath),
             1
         );
 
         if (textureForwards) {
-            LDEBUGC(
-                "RingsComponent",
+            LDEBUG(
                 std::format(
                     "Loaded forwards scattering texture from '{}'",
                     absPath(_textureFwrdPath)
@@ -708,13 +704,12 @@ void RingsComponent::loadTexture() {
 
     if (!_textureBckwrdPath.value().empty()) {
         std::unique_ptr<Texture> textureBackwards = TextureReader::ref().loadTexture(
-            absPath(_textureBckwrdPath).string(),
+            absPath(_textureBckwrdPath),
             1
         );
 
         if (textureBackwards) {
-            LDEBUGC(
-                "RingsComponent",
+            LDEBUG(
                 std::format(
                     "Loaded backwards scattering texture from '{}'",
                     absPath(_textureBckwrdPath)
@@ -735,13 +730,12 @@ void RingsComponent::loadTexture() {
 
     if (!_textureUnlitPath.value().empty()) {
         std::unique_ptr<Texture> textureUnlit = TextureReader::ref().loadTexture(
-            absPath(_textureUnlitPath).string(),
+            absPath(_textureUnlitPath),
             1
         );
 
         if (textureUnlit) {
-            LDEBUGC(
-                "RingsComponent",
+            LDEBUG(
                 std::format("Loaded unlit texture from '{}'", absPath(_textureUnlitPath))
             );
             _textureUnlit = std::move(textureUnlit);
@@ -758,13 +752,12 @@ void RingsComponent::loadTexture() {
 
     if (!_textureColorPath.value().empty()) {
         std::unique_ptr<Texture> textureColor = TextureReader::ref().loadTexture(
-            absPath(_textureColorPath).string(),
+            absPath(_textureColorPath),
             1
         );
 
         if (textureColor) {
-            LDEBUGC(
-                "RingsComponent",
+            LDEBUG(
                 std::format("Loaded color texture from '{}'", absPath(_textureColorPath))
             );
             _textureColor = std::move(textureColor);
@@ -781,13 +774,12 @@ void RingsComponent::loadTexture() {
 
     if (!_textureTransparencyPath.value().empty()) {
         std::unique_ptr<Texture> textureTransparency = TextureReader::ref().loadTexture(
-            absPath(_textureTransparencyPath).string(),
+            absPath(_textureTransparencyPath),
             1
         );
 
         if (textureTransparency) {
-            LDEBUGC(
-                "RingsComponent",
+            LDEBUG(
                 std::format("Loaded unlit texture from '{}'", absPath(_textureUnlitPath))
             );
             _textureTransparency = std::move(textureTransparency);
diff --git a/modules/globebrowsing/src/tileprovider/singleimagetileprovider.cpp b/modules/globebrowsing/src/tileprovider/singleimagetileprovider.cpp
index cd7f1af860..0ddfef9fd0 100644
--- a/modules/globebrowsing/src/tileprovider/singleimagetileprovider.cpp
+++ b/modules/globebrowsing/src/tileprovider/singleimagetileprovider.cpp
@@ -82,7 +82,7 @@ void SingleImageProvider::reset() {
         return;
     }
 
-    _tileTexture = ghoul::io::TextureReader::ref().loadTexture(_filePath, 2);
+    _tileTexture = ghoul::io::TextureReader::ref().loadTexture(_filePath.value(), 2);
     if (!_tileTexture) {
         throw ghoul::RuntimeError(
             std::format("Unable to load texture '{}'", _filePath.value())
diff --git a/modules/iswa/rendering/iswakameleongroup.cpp b/modules/iswa/rendering/iswakameleongroup.cpp
index c7fa089606..0cf2b1e6d0 100644
--- a/modules/iswa/rendering/iswakameleongroup.cpp
+++ b/modules/iswa/rendering/iswakameleongroup.cpp
@@ -73,8 +73,8 @@ std::set<std::string> IswaKameleonGroup::fieldlineValue() const {
     return _fieldlines;
 }
 
-void IswaKameleonGroup::setFieldlineInfo(std::string fieldlineIndexFile,
-                                         std::string kameleonPath)
+void IswaKameleonGroup::setFieldlineInfo(std::filesystem::path fieldlineIndexFile,
+                                         std::filesystem::path kameleonPath)
 {
     if (fieldlineIndexFile != _fieldlineIndexFile) {
         _fieldlineIndexFile = std::move(fieldlineIndexFile);
@@ -99,7 +99,7 @@ void IswaKameleonGroup::registerProperties() {
     _fieldlines.onChange([this]() { updateFieldlineSeeds(); });
 }
 
-void IswaKameleonGroup::readFieldlinePaths(const std::string& indexFile) {
+void IswaKameleonGroup::readFieldlinePaths(const std::filesystem::path& indexFile) {
     LINFO(std::format("Reading seed points paths from file '{}'", indexFile));
 
     // Read the index file from disk
diff --git a/modules/iswa/rendering/iswakameleongroup.h b/modules/iswa/rendering/iswakameleongroup.h
index f0532560cb..2c8e4f223e 100644
--- a/modules/iswa/rendering/iswakameleongroup.h
+++ b/modules/iswa/rendering/iswakameleongroup.h
@@ -37,21 +37,22 @@ public:
     virtual void clearGroup() override;
 
     std::set<std::string> fieldlineValue() const;
-    void setFieldlineInfo(std::string fieldlineIndexFile, std::string kameleonPath);
+    void setFieldlineInfo(std::filesystem::path fieldlineIndexFile,
+        std::filesystem::path kameleonPath);
     void changeCdf(std::string path);
 
 protected:
     void registerProperties();
 
-    void readFieldlinePaths(const std::string& indexFile);
+    void readFieldlinePaths(const std::filesystem::path& indexFile);
     void updateFieldlineSeeds();
     void clearFieldlines();
 
     properties::FloatProperty _resolution;
     properties::SelectionProperty _fieldlines;
 
-    std::string _fieldlineIndexFile;
-    std::string _kameleonPath;
+    std::filesystem::path _fieldlineIndexFile;
+    std::filesystem::path _kameleonPath;
     std::map<int, std::tuple<std::string, std::string, bool>> _fieldlineState;
 };
 
diff --git a/modules/iswa/rendering/kameleonplane.cpp b/modules/iswa/rendering/kameleonplane.cpp
index 707aa8dd45..3bc8372b16 100644
--- a/modules/iswa/rendering/kameleonplane.cpp
+++ b/modules/iswa/rendering/kameleonplane.cpp
@@ -134,7 +134,7 @@ void KameleonPlane::initializeGL() {
     initializeTime();
     createGeometry();
 
-    readFieldlinePaths(absPath(_fieldlineIndexFile).string());
+    readFieldlinePaths(absPath(_fieldlineIndexFile));
 
     if (_group) {
         _dataProcessor = _group->dataProcessor();
@@ -317,7 +317,7 @@ void KameleonPlane::updateFieldlineSeeds() {
     }
 }
 
-void KameleonPlane::readFieldlinePaths(const std::string& indexFile) {
+void KameleonPlane::readFieldlinePaths(const std::filesystem::path& indexFile) {
     LINFO(std::format("Reading seed points paths from file '{}'", indexFile));
     if (_group) {
         dynamic_cast<IswaKameleonGroup*>(_group)->setFieldlineInfo(
diff --git a/modules/iswa/rendering/kameleonplane.h b/modules/iswa/rendering/kameleonplane.h
index 52e6041608..f0abf5ca78 100644
--- a/modules/iswa/rendering/kameleonplane.h
+++ b/modules/iswa/rendering/kameleonplane.h
@@ -66,7 +66,7 @@ private:
      *
      * \param indexFile Path to json index file
      */
-    void readFieldlinePaths(const std::string& indexFile);
+    void readFieldlinePaths(const std::filesystem::path& indexFile);
 
     /**
      * Updates the _fieldlineState map to match the _fieldlines SelectionProperty and
diff --git a/modules/iswa/util/iswamanager.cpp b/modules/iswa/util/iswamanager.cpp
index ba8469e968..f3d06cc35a 100644
--- a/modules/iswa/util/iswamanager.cpp
+++ b/modules/iswa/util/iswamanager.cpp
@@ -413,7 +413,7 @@ std::string IswaManager::parseKWToLuaTable(const CdfInfo& info, const std::strin
 
     std::filesystem::path ext = std::filesystem::path(absPath(info.path)).extension();
     if (ext == ".cdf") {
-        KameleonWrapper kw = KameleonWrapper(absPath(info.path).string());
+        KameleonWrapper kw = KameleonWrapper(absPath(info.path));
 
         std::string parent = kw.parent();
         std::string frame = kw.frame();
@@ -628,7 +628,7 @@ void IswaManager::createKameleonPlane(CdfInfo info, std::string cut) {
     }
 }
 
-void IswaManager::createFieldline(std::string name, std::string cdfPath,
+void IswaManager::createFieldline(std::string name, std::filesystem::path cdfPath,
                                   std::string seedPath)
 {
     std::filesystem::path ext = absPath(cdfPath).extension();
@@ -640,7 +640,7 @@ void IswaManager::createFieldline(std::string name, std::string cdfPath,
                 "Type = 'RenderableFieldlines',"
                 "VectorField = {"
                     "Type = 'VolumeKameleon',"
-                    "File = '" + cdfPath + "',"
+                    "File = '" + cdfPath.string() + "',"
                     "Model = 'BATSRUS',"
                     "Variables = {'bx', 'by', 'bz'}"
                 "},"
@@ -664,7 +664,7 @@ void IswaManager::createFieldline(std::string name, std::string cdfPath,
         }
     }
     else {
-        LWARNING(cdfPath + " is not a cdf file or can't be found");
+        LWARNING(std::format("{} is not a CDF file or cannot be found", cdfPath));
     }
 }
 
diff --git a/modules/iswa/util/iswamanager.h b/modules/iswa/util/iswamanager.h
index a2f4b44115..cb1aa92607 100644
--- a/modules/iswa/util/iswamanager.h
+++ b/modules/iswa/util/iswamanager.h
@@ -83,7 +83,8 @@ public:
     void addIswaCygnet(int id, const std::string& type = "Texture",
         std::string group = "");
     void addKameleonCdf(std::string group, int pos);
-    void createFieldline(std::string name, std::string cdfPath, std::string seedPath);
+    void createFieldline(std::string name, std::filesystem::path cdfPath,
+        std::string seedPath);
 
     std::future<DownloadManager::MemoryFile> fetchImageCygnet(int id, double timestamp);
     std::future<DownloadManager::MemoryFile> fetchDataCygnet(int id, double timestamp);
diff --git a/modules/kameleon/include/kameleonwrapper.h b/modules/kameleon/include/kameleonwrapper.h
index 63e583b893..37e2b468d3 100644
--- a/modules/kameleon/include/kameleonwrapper.h
+++ b/modules/kameleon/include/kameleonwrapper.h
@@ -28,6 +28,7 @@
 #include <ghoul/glm.h>
 #include <glm/gtx/std_based_type.hpp>
 #include <array>
+#include <filesystem>
 #include <string>
 #include <vector>
 
@@ -78,10 +79,10 @@ public:
 
     using Fieldlines = std::vector<std::vector<LinePoint>>;
 
-    explicit KameleonWrapper(const std::string& filename);
+    explicit KameleonWrapper(const std::filesystem::path& filename);
     ~KameleonWrapper();
 
-    bool open(const std::string& filename);
+    bool open(const std::filesystem::path& filename);
     void close();
 
     float* uniformSampledValues(const std::string& var,
diff --git a/modules/kameleon/src/kameleonwrapper.cpp b/modules/kameleon/src/kameleonwrapper.cpp
index 17e7bc59bf..c103d86625 100644
--- a/modules/kameleon/src/kameleonwrapper.cpp
+++ b/modules/kameleon/src/kameleonwrapper.cpp
@@ -90,7 +90,7 @@ std::array<std::string, 3> gridVariables(ccmc::Model* model) {
     return { x, y, z };
 }
 
-KameleonWrapper::KameleonWrapper(const std::string& filename) {
+KameleonWrapper::KameleonWrapper(const std::filesystem::path& filename) {
     open(filename);
 }
 
@@ -98,7 +98,7 @@ KameleonWrapper::~KameleonWrapper() {
     close();
 }
 
-bool KameleonWrapper::open(const std::string& filename) {
+bool KameleonWrapper::open(const std::filesystem::path& filename) {
     close();
 
     if (!std::filesystem::is_regular_file(filename)) {
@@ -106,7 +106,7 @@ bool KameleonWrapper::open(const std::string& filename) {
     }
 
     _kameleon = new ccmc::Kameleon;
-    long status = _kameleon->open(filename);
+    long status = _kameleon->open(filename.string());
     if (status == ccmc::FileReader::OK) {
         _model = _kameleon->model;
         _interpolator = _model->createNewInterpolator();
diff --git a/modules/kameleonvolume/kameleonvolumereader.cpp b/modules/kameleonvolume/kameleonvolumereader.cpp
index e217b42208..b920611377 100644
--- a/modules/kameleonvolume/kameleonvolumereader.cpp
+++ b/modules/kameleonvolume/kameleonvolumereader.cpp
@@ -76,12 +76,14 @@ namespace {
 
 namespace openspace::kameleonvolume {
 
-KameleonVolumeReader::KameleonVolumeReader(std::string path) : _path(std::move(path)) {
+KameleonVolumeReader::KameleonVolumeReader(std::filesystem::path path)
+    : _path(std::move(path))
+{
     if (!std::filesystem::is_regular_file(_path)) {
         throw ghoul::FileNotFoundError(_path);
     }
 
-    const long status = _kameleon->open(_path);
+    const long status = _kameleon->open(_path.string());
     if (status != ccmc::FileReader::OK) {
         throw ghoul::RuntimeError(std::format(
             "Failed to open file '{}' with Kameleon", _path
diff --git a/modules/kameleonvolume/kameleonvolumereader.h b/modules/kameleonvolume/kameleonvolumereader.h
index 665224d8c6..7c53b30bc8 100644
--- a/modules/kameleonvolume/kameleonvolumereader.h
+++ b/modules/kameleonvolume/kameleonvolumereader.h
@@ -26,6 +26,7 @@
 #define __OPENSPACE_MODULE_KAMELEONVOLUME___KAMELEONVOLUMEREADER___H__
 
 #include <ghoul/glm.h>
+#include <filesystem>
 #include <memory>
 #include <string>
 #include <vector>
@@ -43,7 +44,7 @@ namespace openspace::kameleonvolume {
 
 class KameleonVolumeReader {
 public:
-    KameleonVolumeReader(std::string path);
+    KameleonVolumeReader(std::filesystem::path path);
     ~KameleonVolumeReader();
 
     std::unique_ptr<volume::RawVolume<float>> readFloatVolume(
@@ -75,7 +76,7 @@ private:
     static void addAttributeToDictionary(ghoul::Dictionary& dictionary,
         const std::string& key, ccmc::Attribute& attr);
 
-    std::string _path;
+    std::filesystem::path _path;
     std::unique_ptr<ccmc::Kameleon> _kameleon;
     std::unique_ptr<ccmc::Interpolator> _interpolator;
 };
diff --git a/modules/kameleonvolume/rendering/renderablekameleonvolume.cpp b/modules/kameleonvolume/rendering/renderablekameleonvolume.cpp
index 3413e7c901..96b948be76 100644
--- a/modules/kameleonvolume/rendering/renderablekameleonvolume.cpp
+++ b/modules/kameleonvolume/rendering/renderablekameleonvolume.cpp
@@ -182,7 +182,7 @@ RenderableKameleonVolume::RenderableKameleonVolume(const ghoul::Dictionary& dict
     if (dictionary.hasValue<std::string>(KeyTransferFunction)) {
         _transferFunctionPath = dictionary.value<std::string>(KeyTransferFunction);
         _transferFunction = std::make_shared<openspace::TransferFunction>(
-            _transferFunctionPath, [](const openspace::TransferFunction&) {}
+            _transferFunctionPath.value()
         );
     }
 
diff --git a/modules/kameleonvolume/tasks/kameleondocumentationtask.cpp b/modules/kameleonvolume/tasks/kameleondocumentationtask.cpp
index f3d9ba8042..9cca71ce20 100644
--- a/modules/kameleonvolume/tasks/kameleondocumentationtask.cpp
+++ b/modules/kameleonvolume/tasks/kameleondocumentationtask.cpp
@@ -59,7 +59,7 @@ documentation::Documentation KameleonDocumentationTask::documentation() {
 KameleonDocumentationTask::KameleonDocumentationTask(const ghoul::Dictionary& dictionary)
 {
     const Parameters p = codegen::bake<Parameters>(dictionary);
-    _inputPath = absPath(p.input.string());
+    _inputPath = absPath(p.input);
     _outputPath = absPath(p.output);
 }
 
@@ -71,7 +71,7 @@ std::string KameleonDocumentationTask::description() {
 }
 
 void KameleonDocumentationTask::perform(const Task::ProgressCallback & progressCallback) {
-    KameleonVolumeReader reader(_inputPath.string());
+    KameleonVolumeReader reader = KameleonVolumeReader(_inputPath.string());
     ghoul::Dictionary kameleonDictionary = reader.readMetaData();
     progressCallback(0.33f);
 
diff --git a/modules/kameleonvolume/tasks/kameleonmetadatatojsontask.cpp b/modules/kameleonvolume/tasks/kameleonmetadatatojsontask.cpp
index 1855ebcaf7..bb2edd39f6 100644
--- a/modules/kameleonvolume/tasks/kameleonmetadatatojsontask.cpp
+++ b/modules/kameleonvolume/tasks/kameleonmetadatatojsontask.cpp
@@ -53,7 +53,7 @@ KameleonMetadataToJsonTask::KameleonMetadataToJsonTask(
                                                       const ghoul::Dictionary& dictionary)
 {
     const Parameters p = codegen::bake<Parameters>(dictionary);
-    _inputPath = absPath(p.input.string());
+    _inputPath = absPath(p.input);
     _outputPath = absPath(p.output);
 }
 
@@ -65,7 +65,7 @@ std::string KameleonMetadataToJsonTask::description() {
 }
 
 void KameleonMetadataToJsonTask::perform(const Task::ProgressCallback& progressCallback) {
-    KameleonVolumeReader reader(_inputPath.string());
+    KameleonVolumeReader reader = KameleonVolumeReader(_inputPath);
     ghoul::Dictionary dictionary = reader.readMetaData();
     progressCallback(0.5f);
 
diff --git a/modules/kameleonvolume/tasks/kameleonvolumetorawtask.cpp b/modules/kameleonvolume/tasks/kameleonvolumetorawtask.cpp
index 0452e04f8c..db84c5aa65 100644
--- a/modules/kameleonvolume/tasks/kameleonvolumetorawtask.cpp
+++ b/modules/kameleonvolume/tasks/kameleonvolumetorawtask.cpp
@@ -75,7 +75,7 @@ documentation::Documentation KameleonVolumeToRawTask::documentation() {
 KameleonVolumeToRawTask::KameleonVolumeToRawTask(const ghoul::Dictionary& dictionary) {
     const Parameters p = codegen::bake<Parameters>(dictionary);
 
-    _inputPath = absPath(p.input.string());
+    _inputPath = p.input;
     _rawVolumeOutputPath = absPath(p.rawVolumeOutput);
     _dictionaryOutputPath = absPath(p.dictionaryOutput);
     _variable = p.variable;
@@ -105,7 +105,7 @@ std::string KameleonVolumeToRawTask::description() {
 }
 
 void KameleonVolumeToRawTask::perform(const Task::ProgressCallback& progressCallback) {
-    KameleonVolumeReader reader(_inputPath.string());
+    KameleonVolumeReader reader = KameleonVolumeReader(_inputPath);
 
     std::array<std::string, 3> variables = reader.gridVariableNames();
 
@@ -132,7 +132,7 @@ void KameleonVolumeToRawTask::perform(const Task::ProgressCallback& progressCall
 
     progressCallback(0.5f);
 
-    volume::RawVolumeWriter<float> writer(_rawVolumeOutputPath.string());
+    volume::RawVolumeWriter<float> writer(_rawVolumeOutputPath);
     writer.write(*rawVolume);
 
     progressCallback(0.9f);
diff --git a/modules/multiresvolume/rendering/multiresvolumeraycaster.cpp b/modules/multiresvolume/rendering/multiresvolumeraycaster.cpp
index 64ad947e1c..3b8217f713 100644
--- a/modules/multiresvolume/rendering/multiresvolumeraycaster.cpp
+++ b/modules/multiresvolume/rendering/multiresvolumeraycaster.cpp
@@ -29,6 +29,7 @@
 #include <openspace/rendering/renderable.h>
 #include <openspace/rendering/transferfunction.h>
 #include <openspace/util/updatestructures.h>
+#include <ghoul/filesystem/filesystem.h>
 #include <ghoul/opengl/programobject.h>
 #include <ghoul/opengl/texture.h>
 
@@ -173,20 +174,20 @@ void MultiresVolumeRaycaster::postRaycast(const RaycastData&,
     _tfUnit = nullptr;
 }
 
-std::string MultiresVolumeRaycaster::boundsVertexShaderPath() const {
-    return std::string(GlslBoundsVsPath);
+std::filesystem::path MultiresVolumeRaycaster::boundsVertexShaderPath() const {
+    return absPath(GlslBoundsVsPath);
 }
 
-std::string MultiresVolumeRaycaster::boundsFragmentShaderPath() const {
-    return std::string(GlslBoundsFsPath);
+std::filesystem::path MultiresVolumeRaycaster::boundsFragmentShaderPath() const {
+    return absPath(GlslBoundsFsPath);
 }
 
-std::string MultiresVolumeRaycaster::raycasterPath() const {
-    return std::string(GlslRaycastPath);
+std::filesystem::path MultiresVolumeRaycaster::raycasterPath() const {
+    return absPath(GlslRaycastPath);
 }
 
-std::string MultiresVolumeRaycaster::helperPath() const {
-    return std::string(GlslHelperPath); // no helper file
+std::filesystem::path MultiresVolumeRaycaster::helperPath() const {
+    return absPath(GlslHelperPath); // no helper file
 }
 
 void MultiresVolumeRaycaster::setModelTransform(glm::mat4 transform) {
diff --git a/modules/multiresvolume/rendering/multiresvolumeraycaster.h b/modules/multiresvolume/rendering/multiresvolumeraycaster.h
index 075b71a166..1f14f7c851 100644
--- a/modules/multiresvolume/rendering/multiresvolumeraycaster.h
+++ b/modules/multiresvolume/rendering/multiresvolumeraycaster.h
@@ -66,10 +66,10 @@ public:
         ghoul::opengl::ProgramObject& program) override;
     bool isCameraInside(const RenderData& data, glm::vec3& localPosition) override;
 
-    std::string boundsVertexShaderPath() const override;
-    std::string boundsFragmentShaderPath() const override;
-    std::string raycasterPath() const override;
-    std::string helperPath() const override;
+    std::filesystem::path boundsVertexShaderPath() const override;
+    std::filesystem::path boundsFragmentShaderPath() const override;
+    std::filesystem::path raycasterPath() const override;
+    std::filesystem::path helperPath() const override;
 
     void setModelTransform(glm::mat4 transform);
     //void setTime(double time);
diff --git a/modules/multiresvolume/rendering/renderablemultiresvolume.cpp b/modules/multiresvolume/rendering/renderablemultiresvolume.cpp
index 89a30c0e6f..805e8f8fe0 100644
--- a/modules/multiresvolume/rendering/renderablemultiresvolume.cpp
+++ b/modules/multiresvolume/rendering/renderablemultiresvolume.cpp
@@ -189,7 +189,7 @@ RenderableMultiresVolume::RenderableMultiresVolume(const ghoul::Dictionary& dict
     , _scaling(ScalingInfo, glm::vec3(1.f), glm::vec3(0.f), glm::vec3(10.f))
 {
     if (dictionary.hasValue<std::string>(KeyDataSource)) {
-        _filename = absPath(dictionary.value<std::string>(KeyDataSource)).string();
+        _filename = absPath(dictionary.value<std::string>(KeyDataSource));
     }
     else {
         LERROR(std::format("Node did not contain a valid '{}'", KeyDataSource));
@@ -241,7 +241,7 @@ RenderableMultiresVolume::RenderableMultiresVolume(const ghoul::Dictionary& dict
     if (dictionary.hasValue<std::string>(KeyTransferFunction)) {
         _transferFunctionPath = absPath(
             dictionary.value<std::string>(KeyTransferFunction)
-        ).string();
+        );
         _transferFunction = std::make_shared<TransferFunction>(_transferFunctionPath);
     }
     else {
@@ -474,10 +474,7 @@ bool RenderableMultiresVolume::initializeSelector() {
         case Selector::TF:
             if (_errorHistogramManager) {
                  std::filesystem::path cached = FileSys.cacheManager()->cachedFilename(
-                     std::format(
-                         "{}_{}_errorHistograms",
-                         std::filesystem::path(_filename).stem().string(), nHistograms
-                     ),
+                     std::format("{}_{}_errorHistograms", _filename.stem(), nHistograms),
                      ""
                 );
                 std::ifstream cacheFile(cached, std::ios::in | std::ios::binary);
@@ -494,9 +491,7 @@ bool RenderableMultiresVolume::initializeSelector() {
                     LINFO(std::format(
                         "Loading histograms from scene data '{}'", _errorHistogramsPath
                     ));
-                    success &= _errorHistogramManager->loadFromFile(
-                        _errorHistogramsPath.string()
-                    );
+                    success &= _errorHistogramManager->loadFromFile(_errorHistogramsPath);
                 }
                 else {
                     // Build histograms from tsp file
@@ -514,9 +509,7 @@ bool RenderableMultiresVolume::initializeSelector() {
         case Selector::SIMPLE:
             if (_histogramManager) {
                 std::filesystem::path cached = FileSys.cacheManager()->cachedFilename(
-                    std::format("{}_{}_histogram",
-                        std::filesystem::path(_filename).stem().string(), nHistograms
-                    ),
+                    std::format("{}_{}_histogram", _filename.stem(), nHistograms),
                     ""
                 );
                 std::ifstream cacheFile(cached, std::ios::in | std::ios::binary);
@@ -546,8 +539,7 @@ bool RenderableMultiresVolume::initializeSelector() {
             if (_localErrorHistogramManager) {
                  std::filesystem::path cached = FileSys.cacheManager()->cachedFilename(
                     std::format(
-                        "{}_{}_localErrorHistograms",
-                        std::filesystem::path(_filename).stem().string(), nHistograms
+                        "{}_{}_localErrorHistograms", _filename.stem(), nHistograms
                     ),
                     ""
                 );
diff --git a/modules/multiresvolume/rendering/renderablemultiresvolume.h b/modules/multiresvolume/rendering/renderablemultiresvolume.h
index ab906a7b63..87edab8b84 100644
--- a/modules/multiresvolume/rendering/renderablemultiresvolume.h
+++ b/modules/multiresvolume/rendering/renderablemultiresvolume.h
@@ -117,12 +117,12 @@ private:
 
     int _timestep = 0;
 
-    std::string _filename;
+    std::filesystem::path _filename;
 
     std::string _transferFunctionName;
     std::string _volumeName;
 
-    std::string _transferFunctionPath;
+    std::filesystem::path _transferFunctionPath;
     std::filesystem::path _errorHistogramsPath;
 
     std::shared_ptr<TransferFunction> _transferFunction;
diff --git a/modules/multiresvolume/rendering/tsp.cpp b/modules/multiresvolume/rendering/tsp.cpp
index 0bcd739914..0cacd4cae6 100644
--- a/modules/multiresvolume/rendering/tsp.cpp
+++ b/modules/multiresvolume/rendering/tsp.cpp
@@ -40,7 +40,7 @@ namespace {
 
 namespace openspace {
 
-TSP::TSP(const std::string& filename)
+TSP::TSP(const std::filesystem::path& filename)
     : _filename(filename)
 {
     _file.open(_filename, std::ios::in | std::ios::binary);
diff --git a/modules/multiresvolume/rendering/tsp.h b/modules/multiresvolume/rendering/tsp.h
index 1ef06fd9fd..9148a2f6e0 100644
--- a/modules/multiresvolume/rendering/tsp.h
+++ b/modules/multiresvolume/rendering/tsp.h
@@ -26,6 +26,7 @@
 #define __OPENSPACE_MODULE_MULTIRESVOLUME___TSP___H__
 
 #include <ghoul/opengl/ghoul_gl.h>
+#include <filesystem>
 #include <fstream>
 #include <list>
 #include <string>
@@ -55,7 +56,7 @@ public:
         NUM_DATA
     };
 
-    TSP(const std::string& filename);
+    TSP(const std::filesystem::path& filename);
     ~TSP();
 
     // load performs readHeader, readCache, writeCache and construct
@@ -113,7 +114,7 @@ private:
      */
     std::list<unsigned int> childBricks(unsigned int brickIndex);
 
-    std::string _filename;
+    std::filesystem::path _filename;
     std::ifstream _file;
     std::streampos _dataOffset;
 
diff --git a/modules/skybrowser/src/wwtdatahandler.cpp b/modules/skybrowser/src/wwtdatahandler.cpp
index 3789c998a2..85b198cc8e 100644
--- a/modules/skybrowser/src/wwtdatahandler.cpp
+++ b/modules/skybrowser/src/wwtdatahandler.cpp
@@ -132,7 +132,7 @@ namespace {
     {
         using namespace openspace;
         // Download file from url
-        const std::filesystem::path file = directory.string() + fileName + ".aspx";
+        const std::filesystem::path file = std::format("{}{}.aspx", directory, fileName);
         const bool success = downloadFile(url, file);
         if (!success) {
             LINFO(std::format(
@@ -143,7 +143,8 @@ namespace {
 
         // Parse file to XML
         auto document = std::make_unique<tinyxml2::XMLDocument>();
-        document->LoadFile(file.string().c_str());
+        const std::string f = file.string();
+        document->LoadFile(f.c_str());
 
         // Search XML file for folders with urls
         const tinyxml2::XMLElement* root = document->RootElement();
diff --git a/modules/space/rendering/renderableconstellationbounds.cpp b/modules/space/rendering/renderableconstellationbounds.cpp
index 3d3ad545f9..a2e0f3444f 100644
--- a/modules/space/rendering/renderableconstellationbounds.cpp
+++ b/modules/space/rendering/renderableconstellationbounds.cpp
@@ -85,7 +85,7 @@ RenderableConstellationBounds::RenderableConstellationBounds(
     const Parameters p = codegen::bake<Parameters>(dictionary);
 
     // Avoid reading files here, instead do it in multithreaded initialize()
-    _vertexFilename = absPath(p.file.string()).string();
+    _vertexFilename = absPath(p.file).string();
     _vertexFilename.onChange([this](){ loadData(); });
     addProperty(_vertexFilename);
 
diff --git a/modules/space/rendering/renderableconstellationlines.cpp b/modules/space/rendering/renderableconstellationlines.cpp
index a54bd31aa6..727c9f7ba1 100644
--- a/modules/space/rendering/renderableconstellationlines.cpp
+++ b/modules/space/rendering/renderableconstellationlines.cpp
@@ -113,7 +113,7 @@ RenderableConstellationLines::RenderableConstellationLines(
     const Parameters p = codegen::bake<Parameters>(dictionary);
 
     // Avoid reading files here, instead do it in multithreaded initialize()
-    _speckFile = absPath(p.file.string()).string();
+    _speckFile = absPath(p.file).string();
     _speckFile.onChange([this]() { loadData(); });
     addProperty(_speckFile);
 
diff --git a/modules/space/rendering/renderableconstellationsbase.cpp b/modules/space/rendering/renderableconstellationsbase.cpp
index 172fe0dd83..7de1232b4c 100644
--- a/modules/space/rendering/renderableconstellationsbase.cpp
+++ b/modules/space/rendering/renderableconstellationsbase.cpp
@@ -106,7 +106,7 @@ RenderableConstellationsBase::RenderableConstellationsBase(
 
     // Avoid reading files here, instead do it in multithreaded initialize()
     if (p.namesFile.has_value()) {
-        _namesFilename = absPath(p.namesFile.value().string()).string();
+        _namesFilename = absPath(*p.namesFile).string();
     }
     _namesFilename.onChange([this]() { loadConstellationFile(); });
     addProperty(_namesFilename);
diff --git a/modules/space/rendering/renderablefluxnodes.cpp b/modules/space/rendering/renderablefluxnodes.cpp
index a4d30c1065..2e7112a6fd 100644
--- a/modules/space/rendering/renderablefluxnodes.cpp
+++ b/modules/space/rendering/renderablefluxnodes.cpp
@@ -342,7 +342,7 @@ RenderableFluxNodes::RenderableFluxNodes(const ghoul::Dictionary& dictionary)
     const Parameters p = codegen::bake<Parameters>(dictionary);
 
     _colorTablePath = p.colorTablePath;
-    _transferFunction = std::make_unique<TransferFunction>(_colorTablePath);
+    _transferFunction = std::make_unique<TransferFunction>(_colorTablePath.value());
     _colorTableRange = p.colorTableRange.value_or(_colorTableRange);
 
     _binarySourceFolderPath = p.sourceFolder;
@@ -353,7 +353,7 @@ RenderableFluxNodes::RenderableFluxNodes(const ghoul::Dictionary& dictionary)
             fs::directory_iterator(_binarySourceFolderPath))
         {
             if (e.is_regular_file()) {
-                _binarySourceFiles.push_back(e.path().string());
+                _binarySourceFiles.push_back(e.path());
             }
         }
         std::sort(_binarySourceFiles.begin(), _binarySourceFiles.end());
@@ -431,7 +431,7 @@ void RenderableFluxNodes::definePropertyCallbackFunctions() {
         loadNodeData(_goesEnergyBins.option().value);
     });
     _colorTablePath.onChange([this]() {
-        _transferFunction->setPath(_colorTablePath);
+        _transferFunction->setPath(_colorTablePath.value());
     });
 }
 
@@ -448,13 +448,19 @@ void RenderableFluxNodes::loadNodeData(int energybinOption) {
             break;
     }
 
-    const std::string file = _binarySourceFolderPath.string() + "\\positions" + energybin;
-    const std::string file2 = _binarySourceFolderPath.string() + "\\fluxes" + energybin;
-    const std::string file3 = _binarySourceFolderPath.string() + "\\radiuses" + energybin;
+    const std::string file = std::format(
+        "{}/positions{}", _binarySourceFolderPath, energybin
+    );
+    const std::string file2 = std::format(
+        "{}/fluxes/{}", _binarySourceFolderPath, energybin
+    );
+    const std::string file3 = std::format(
+        "{}/radiuses{}", _binarySourceFolderPath, energybin
+    );
 
-    std::ifstream fileStream(file, std::ifstream::binary);
-    std::ifstream fileStream2(file2, std::ifstream::binary);
-    std::ifstream fileStream3(file3, std::ifstream::binary);
+    std::ifstream fileStream = std::ifstream(file, std::ifstream::binary);
+    std::ifstream fileStream2 = std::ifstream(file2, std::ifstream::binary);
+    std::ifstream fileStream3 = std::ifstream(file3, std::ifstream::binary);
 
     if (!fileStream.good()) {
         LERROR(std::format("Could not read file '{}'", file));
@@ -580,27 +586,21 @@ bool RenderableFluxNodes::isReady() const {
 }
 
 void RenderableFluxNodes::populateStartTimes() {
-    std::string timeFile;
-    for (const std::string& filePath : _binarySourceFiles) {
-        if (filePath.substr(filePath.find_last_of('.') + 1) == "csv") {
-            timeFile = filePath;
-            break;
-        }
-        else if (filePath.substr(filePath.find_last_of('.') + 1) == "dat") {
-            timeFile = filePath;
-            break;
-        }
-        else if (filePath.substr(filePath.find_last_of('.') + 1) == "txt") {
-            timeFile = filePath;
-            break;
-        }
-        //if no file extention but word "time" in file name
-        else if (filePath.find("time") != std::string::npos &&
-                 filePath.find('.') == std::string::npos)
+    std::filesystem::path timeFile;
+    for (const std::filesystem::path& filePath : _binarySourceFiles) {
+        if (filePath.extension() == ".csv" || filePath.extension() == ".dat" ||
+            filePath.extension() == ".txt")
         {
             timeFile = filePath;
             break;
         }
+
+        const std::string f = filePath.string();
+        // if no file extention but word "time" in file name
+        if (f.find("time") != std::string::npos && f.find('.') == std::string::npos) {
+            timeFile = filePath;
+            break;
+        }
     }
 
     if (timeFile.empty()) {
@@ -611,7 +611,7 @@ void RenderableFluxNodes::populateStartTimes() {
     }
 
     // time filestream
-    std::ifstream tfs(timeFile);
+    std::ifstream tfs = std::ifstream(timeFile);
     if (!tfs.is_open()) {
         throw ghoul::RuntimeError("Could not open file");
     }
diff --git a/modules/space/rendering/renderablefluxnodes.h b/modules/space/rendering/renderablefluxnodes.h
index 917a16748c..fd77b34b13 100644
--- a/modules/space/rendering/renderablefluxnodes.h
+++ b/modules/space/rendering/renderablefluxnodes.h
@@ -36,6 +36,7 @@
 #include <openspace/rendering/transferfunction.h>
 #include <ghoul/opengl/uniformcache.h>
 #include <atomic>
+#include <filesystem>
 
 namespace openspace {
 
@@ -129,7 +130,7 @@ private:
     // Transfer function used to color lines when _colorMethod is set to by_flux_value
     std::unique_ptr<TransferFunction> _transferFunction;
 
-    std::vector<std::string> _binarySourceFiles;
+    std::vector<std::filesystem::path> _binarySourceFiles;
     // Contains the _triggerTimes for all streams in the sequence
     std::vector<double> _startTimes;
     // Contains vertexPositions
diff --git a/modules/space/rendering/renderablerings.cpp b/modules/space/rendering/renderablerings.cpp
index fbd66b88cd..d7241129c0 100644
--- a/modules/space/rendering/renderablerings.cpp
+++ b/modules/space/rendering/renderablerings.cpp
@@ -88,7 +88,7 @@ namespace {
 
     struct [[codegen::Dictionary(RenderableRings)]] Parameters {
         // [[codegen::verbatim(TextureInfo.description)]]
-        std::string texture;
+        std::filesystem::path texture;
 
         // [[codegen::verbatim(SizeInfo.description)]]
         float size;
@@ -128,7 +128,7 @@ RenderableRings::RenderableRings(const ghoul::Dictionary& dictionary)
     _size.onChange([this]() { _planeIsDirty = true; });
     addProperty(_size);
 
-    _texturePath = absPath(p.texture).string();
+    _texturePath = p.texture.string();
     _textureFile = std::make_unique<File>(_texturePath.value());
 
     _offset = p.offset.value_or(_offset);
@@ -239,7 +239,7 @@ void RenderableRings::loadTexture() {
         using namespace ghoul::io;
         using namespace ghoul::opengl;
         std::unique_ptr<Texture> texture = TextureReader::ref().loadTexture(
-            absPath(_texturePath).string(),
+            absPath(_texturePath),
             1
         );
 
diff --git a/modules/space/rendering/renderablestars.cpp b/modules/space/rendering/renderablestars.cpp
index 76f8dede5e..cfa5a658ed 100644
--- a/modules/space/rendering/renderablestars.cpp
+++ b/modules/space/rendering/renderablestars.cpp
@@ -701,7 +701,7 @@ RenderableStars::RenderableStars(const ghoul::Dictionary& dictionary)
 
     _renderingMethodOption = codegen::map<RenderMethod>(p.renderMethod);
 
-    _pointSpreadFunctionTexturePath = absPath(p.texture.string()).string();
+    _pointSpreadFunctionTexturePath = absPath(p.texture).string();
     _pointSpreadFunctionFile = std::make_unique<File>(
         _pointSpreadFunctionTexturePath.value()
     );
@@ -900,7 +900,7 @@ void RenderableStars::loadPSFTexture() {
         std::filesystem::exists(_pointSpreadFunctionTexturePath.value()))
     {
         _pointSpreadFunctionTexture = ghoul::io::TextureReader::ref().loadTexture(
-            absPath(_pointSpreadFunctionTexturePath).string(),
+            absPath(_pointSpreadFunctionTexturePath),
             2
         );
 
@@ -1304,7 +1304,7 @@ void RenderableStars::update(const UpdateData&) {
         _colorTexture = nullptr;
         if (!_colorTexturePath.value().empty()) {
             _colorTexture = ghoul::io::TextureReader::ref().loadTexture(
-                absPath(_colorTexturePath).string(),
+                absPath(_colorTexturePath),
                 1
             );
             if (_colorTexture) {
@@ -1329,7 +1329,7 @@ void RenderableStars::update(const UpdateData&) {
         _otherDataColorMapTexture = nullptr;
         if (!_otherDataColorMapPath.value().empty()) {
             _otherDataColorMapTexture = ghoul::io::TextureReader::ref().loadTexture(
-                absPath(_otherDataColorMapPath).string(),
+                absPath(_otherDataColorMapPath),
                 1
             );
             if (_otherDataColorMapTexture) {
diff --git a/modules/spacecraftinstruments/rendering/renderablemodelprojection.cpp b/modules/spacecraftinstruments/rendering/renderablemodelprojection.cpp
index 97a5371bea..028aeac567 100644
--- a/modules/spacecraftinstruments/rendering/renderablemodelprojection.cpp
+++ b/modules/spacecraftinstruments/rendering/renderablemodelprojection.cpp
@@ -118,9 +118,9 @@ RenderableModelProjection::RenderableModelProjection(const ghoul::Dictionary& di
 {
     const Parameters p = codegen::bake<Parameters>(dictionary);
 
-    const std::filesystem::path file = absPath(p.geometryFile.string());
+    const std::filesystem::path file = absPath(p.geometryFile);
     _geometry = ghoul::io::ModelReader::ref().loadModel(
-        file.string(),
+        file,
         ghoul::io::ModelReader::ForceRenderInvisible::No,
         ghoul::io::ModelReader::NotifyInvisibleDropped::Yes
     );
diff --git a/modules/spacecraftinstruments/rendering/renderableplaneprojection.cpp b/modules/spacecraftinstruments/rendering/renderableplaneprojection.cpp
index 1bbadb7caa..6017a83789 100644
--- a/modules/spacecraftinstruments/rendering/renderableplaneprojection.cpp
+++ b/modules/spacecraftinstruments/rendering/renderableplaneprojection.cpp
@@ -77,7 +77,7 @@ RenderablePlaneProjection::RenderablePlaneProjection(const ghoul::Dictionary& di
     _defaultTarget = p.defaultTarget.value_or(_defaultTarget);
 
     if (p.texture.has_value()) {
-        _texturePath = absPath(*p.texture).string();
+        _texturePath = absPath(*p.texture);
         _textureFile = std::make_unique<ghoul::filesystem::File>(_texturePath);
     }
 }
@@ -185,7 +185,7 @@ void RenderablePlaneProjection::loadTexture() {
     }
 
     std::unique_ptr<ghoul::opengl::Texture> texture =
-        ghoul::io::TextureReader::ref().loadTexture(absPath(_texturePath).string(), 2);
+        ghoul::io::TextureReader::ref().loadTexture(absPath(_texturePath), 2);
     if (!texture) {
         return;
     }
diff --git a/modules/spacecraftinstruments/rendering/renderableplaneprojection.h b/modules/spacecraftinstruments/rendering/renderableplaneprojection.h
index fcb974c765..6a33874f7b 100644
--- a/modules/spacecraftinstruments/rendering/renderableplaneprojection.h
+++ b/modules/spacecraftinstruments/rendering/renderableplaneprojection.h
@@ -28,6 +28,7 @@
 #include <openspace/rendering/renderable.h>
 
 #include <ghoul/opengl/ghoul_gl.h>
+#include <filesystem>
 #include <memory>
 
 namespace ghoul::filesystem { class File; }
@@ -63,7 +64,7 @@ private:
     void updatePlane(const Image& img, double currentTime);
     void setTarget(std::string body);
 
-    std::string _texturePath;
+    std::filesystem::path _texturePath;
 
     bool _planeIsDirty = false;
 
diff --git a/modules/spacecraftinstruments/rendering/renderableplanetprojection.cpp b/modules/spacecraftinstruments/rendering/renderableplanetprojection.cpp
index 4668b24a38..5cd40e7710 100644
--- a/modules/spacecraftinstruments/rendering/renderableplanetprojection.cpp
+++ b/modules/spacecraftinstruments/rendering/renderableplanetprojection.cpp
@@ -653,7 +653,7 @@ void RenderablePlanetProjection::loadColorTexture() {
     _baseTexture = nullptr;
     if (selectedPath != NoImageText) {
         _baseTexture = ghoul::io::TextureReader::ref().loadTexture(
-            absPath(selectedPath).string(),
+            absPath(selectedPath),
             2
         );
         if (_baseTexture) {
@@ -676,7 +676,7 @@ void RenderablePlanetProjection::loadHeightTexture() {
     _heightMapTexture = nullptr;
     if (selectedPath != NoImageText) {
         _heightMapTexture = ghoul::io::TextureReader::ref().loadTexture(
-            absPath(selectedPath).string(),
+            absPath(selectedPath),
             2
         );
         if (_heightMapTexture) {
diff --git a/modules/spacecraftinstruments/util/hongkangparser.cpp b/modules/spacecraftinstruments/util/hongkangparser.cpp
index 919d98881c..ee21d3269e 100644
--- a/modules/spacecraftinstruments/util/hongkangparser.cpp
+++ b/modules/spacecraftinstruments/util/hongkangparser.cpp
@@ -59,7 +59,7 @@ namespace {
 
 namespace openspace {
 
-HongKangParser::HongKangParser(std::string name, std::string fileName,
+HongKangParser::HongKangParser(std::string name, std::filesystem::path fileName,
                                std::string spacecraft,
                                const ghoul::Dictionary& translationDictionary,
                                std::vector<std::string> potentialTargets)
@@ -140,12 +140,7 @@ bool HongKangParser::create() {
             "HongKangParser"
         );
     }
-    const size_t position = _fileName.find_last_of('.') + 1;
-    if (position == 0 || position == std::string::npos) {
-        return true;
-    }
-
-    if (std::filesystem::path(_fileName).extension() != ".txt") {
+    if (_fileName.extension() != ".txt") {
         return true;
     }
 
@@ -192,7 +187,7 @@ bool HongKangParser::create() {
                 // fill image
                 Image image = {
                     .timeRange = TimeRange(time, time + Exposure),
-                    .path = _defaultCaptureImage.string(),
+                    .path = _defaultCaptureImage,
                     .activeInstruments = std::move(cameraSpiceID),
                     .target = cameraTarget,
                     .isPlaceholder = true,
@@ -242,7 +237,7 @@ bool HongKangParser::create() {
                         // store individual image
                         Image image = {
                             .timeRange = std::move(scanRange),
-                            .path = _defaultCaptureImage.string(),
+                            .path = _defaultCaptureImage,
                             .activeInstruments = it->second->translations(),
                             .target = cameraTarget,
                             .isPlaceholder = true,
diff --git a/modules/spacecraftinstruments/util/hongkangparser.h b/modules/spacecraftinstruments/util/hongkangparser.h
index 16acd7920b..2bbe754efd 100644
--- a/modules/spacecraftinstruments/util/hongkangparser.h
+++ b/modules/spacecraftinstruments/util/hongkangparser.h
@@ -33,8 +33,8 @@ namespace openspace {
 
 class HongKangParser : public SequenceParser {
 public:
-    HongKangParser(std::string name, std::string fileName, std::string spacecraft,
-        const ghoul::Dictionary& translationDictionary,
+    HongKangParser(std::string name, std::filesystem::path fileName,
+        std::string spacecraft, const ghoul::Dictionary& translationDictionary,
         std::vector<std::string> potentialTargets);
 
     bool create() override;
@@ -45,7 +45,7 @@ private:
     double _metRef = 299180517;
 
     std::string _name;
-    std::string _fileName;
+    std::filesystem::path _fileName;
     std::string _spacecraft;
     std::vector<std::string> _potentialTargets;
 };
diff --git a/modules/spacecraftinstruments/util/image.h b/modules/spacecraftinstruments/util/image.h
index 98433ea121..92169c0458 100644
--- a/modules/spacecraftinstruments/util/image.h
+++ b/modules/spacecraftinstruments/util/image.h
@@ -34,7 +34,7 @@ namespace openspace {
 
 struct Image {
     TimeRange timeRange;
-    std::string path;
+    std::filesystem::path path;
     std::vector<std::string> activeInstruments;
     std::string target;
     bool isPlaceholder = false;
diff --git a/modules/spacecraftinstruments/util/imagesequencer.cpp b/modules/spacecraftinstruments/util/imagesequencer.cpp
index 0d50e38327..5bb97c6e90 100644
--- a/modules/spacecraftinstruments/util/imagesequencer.cpp
+++ b/modules/spacecraftinstruments/util/imagesequencer.cpp
@@ -45,7 +45,7 @@ ImageSequencer& ImageSequencer::ref() {
 void ImageSequencer::initialize() {
     ghoul_assert(_instance == nullptr, "Instance already has been initialized");
     _instance = new ImageSequencer;
-    _instance->_defaultCaptureImage = absPath("${DATA}/placeholder.png").string();
+    _instance->_defaultCaptureImage = absPath("${DATA}/placeholder.png");
 }
 
 void ImageSequencer::deinitialize() {
diff --git a/modules/spacecraftinstruments/util/imagesequencer.h b/modules/spacecraftinstruments/util/imagesequencer.h
index ea7dbb8ee5..d7b4799335 100644
--- a/modules/spacecraftinstruments/util/imagesequencer.h
+++ b/modules/spacecraftinstruments/util/imagesequencer.h
@@ -181,7 +181,7 @@ private:
     std::vector<double> _captureProgression;
 
     // default capture image
-    std::string _defaultCaptureImage;
+    std::filesystem::path _defaultCaptureImage;
 
     std::map<std::string, Image> _latestImages;
 
diff --git a/modules/spacecraftinstruments/util/instrumenttimesparser.cpp b/modules/spacecraftinstruments/util/instrumenttimesparser.cpp
index c93606a75f..5dfcaacfc0 100644
--- a/modules/spacecraftinstruments/util/instrumenttimesparser.cpp
+++ b/modules/spacecraftinstruments/util/instrumenttimesparser.cpp
@@ -50,7 +50,8 @@ namespace {
 
 namespace openspace {
 
-InstrumentTimesParser::InstrumentTimesParser(std::string name, std::string sequenceSource,
+InstrumentTimesParser::InstrumentTimesParser(std::string name,
+                                             std::filesystem::path sequenceSource,
                                              ghoul::Dictionary& inputDict)
     : _pattern("\"(.{23})\" \"(.{23})\"")
     , _name(std::move(name))
diff --git a/modules/spacecraftinstruments/util/instrumenttimesparser.h b/modules/spacecraftinstruments/util/instrumenttimesparser.h
index 31af6937f1..2667e01573 100644
--- a/modules/spacecraftinstruments/util/instrumenttimesparser.h
+++ b/modules/spacecraftinstruments/util/instrumenttimesparser.h
@@ -27,13 +27,14 @@
 
 #include <modules/spacecraftinstruments/util/sequenceparser.h>
 
+#include <filesystem>
 #include <regex>
 
 namespace openspace {
 
 class InstrumentTimesParser : public SequenceParser {
 public:
-    InstrumentTimesParser(std::string name, std::string sequenceSource,
+    InstrumentTimesParser(std::string name, std::filesystem::path sequenceSource,
         ghoul::Dictionary& inputDict);
 
     bool create() override;
@@ -44,7 +45,7 @@ private:
     std::map<std::string, std::vector<std::string>> _instrumentFiles;
 
     std::string _name;
-    std::string _fileName;
+    std::filesystem::path _fileName;
     std::string _spacecraft;
     std::vector<std::string> _specsOfInterest;
 
diff --git a/modules/spacecraftinstruments/util/labelparser.cpp b/modules/spacecraftinstruments/util/labelparser.cpp
index a9a52c3bd2..1fd93bd8d5 100644
--- a/modules/spacecraftinstruments/util/labelparser.cpp
+++ b/modules/spacecraftinstruments/util/labelparser.cpp
@@ -43,7 +43,8 @@ namespace {
 
 namespace openspace {
 
-LabelParser::LabelParser(std::string fileName, const ghoul::Dictionary& dictionary)
+LabelParser::LabelParser(std::filesystem::path fileName,
+                         const ghoul::Dictionary& dictionary)
     : _fileName(std::move(fileName))
 {
     using ghoul::Dictionary;
@@ -151,19 +152,13 @@ bool LabelParser::create() {
             continue;
         }
 
-        std::string path = e.path().string();
-
-        const size_t position = path.find_last_of('.') + 1;
-        if (position == 0 || position == std::string::npos) {
-            continue;
-        }
-
-        const std::filesystem::path extension = std::filesystem::path(path).extension();
+        const std::filesystem::path path = e.path();
+        const std::filesystem::path extension = path.extension();
         if (extension != ".lbl" && extension != ".LBL") {
             continue;
         }
 
-        std::ifstream file(path);
+        std::ifstream file = std::ifstream(path);
 
         if (!file.good()) {
             LERROR(std::format("Failed to open label file '{}'", path));
@@ -264,10 +259,9 @@ bool LabelParser::create() {
 
                 count = 0;
 
-                using namespace std::literals;
-                const std::string p = path.substr(0, path.size() - ("lbl"s).size());
                 for (const std::string& ext : extensions) {
-                    const std::string imagePath = p + ext;
+                    std::filesystem::path imagePath = path;
+                    imagePath.replace_extension(ext);
                     if (std::filesystem::is_regular_file(imagePath)) {
                         std::vector<std::string> spiceInstrument;
                         spiceInstrument.push_back(_instrumentID);
diff --git a/modules/spacecraftinstruments/util/labelparser.h b/modules/spacecraftinstruments/util/labelparser.h
index 50982b602f..f17d8fc1a4 100644
--- a/modules/spacecraftinstruments/util/labelparser.h
+++ b/modules/spacecraftinstruments/util/labelparser.h
@@ -27,11 +27,14 @@
 
 #include <modules/spacecraftinstruments/util/sequenceparser.h>
 
+#include <filesystem>
+
 namespace openspace {
 
 class LabelParser : public SequenceParser {
 public:
-    LabelParser(std::string fileName, const ghoul::Dictionary& translationDictionary);
+    LabelParser(std::filesystem::path fileName,
+        const ghoul::Dictionary& translationDictionary);
 
     bool create() override;
 
@@ -39,7 +42,7 @@ private:
     std::string encode(const std::string& line) const;
     std::string decode(const std::string& line);
 
-    std::string _fileName;
+    std::filesystem::path _fileName;
     std::vector<std::string> _specsOfInterest;
 
     std::string _target;
diff --git a/modules/spacecraftinstruments/util/projectioncomponent.cpp b/modules/spacecraftinstruments/util/projectioncomponent.cpp
index 8a735f1889..8f76694284 100644
--- a/modules/spacecraftinstruments/util/projectioncomponent.cpp
+++ b/modules/spacecraftinstruments/util/projectioncomponent.cpp
@@ -96,7 +96,9 @@ namespace {
         // This value specifies one or more directories from which images are being used
         // for image projections. If the sequence type is set to 'playbook', this value is
         // ignored
-        std::optional<std::variant<std::string, std::vector<std::string>>> sequence;
+        std::optional<
+           std::variant<std::filesystem::path, std::vector<std::filesystem::path>>
+        > sequence [[codegen::directory()]];
 
         struct Instrument {
             // The instrument that is used to perform the projections
@@ -123,7 +125,7 @@ namespace {
         // uses both methods
         std::optional<Type> sequenceType;
 
-        std::optional<std::string> eventFile;
+        std::optional<std::filesystem::path> eventFile;
 
         // The observer that is doing the projection. This has to be a valid SPICE name
         // or SPICE integer
@@ -208,30 +210,28 @@ void ProjectionComponent::initialize(const std::string& identifier,
     _shadowing.isEnabled = p.shadowMap.value_or(_shadowing.isEnabled);
     _projectionTextureAspectRatio = p.aspectRatio.value_or(_projectionTextureAspectRatio);
 
-
     if (!p.sequence.has_value()) {
         // we are done here, the rest only applies if we do have a sequence
         return;
     }
 
-    std::variant<std::string, std::vector<std::string>> sequence = *p.sequence;
+    //std::variant<std::filesystem::path, std::vector<std::filesystem::path>> s = *p.sequence;
 
-    std::vector<std::string> sequenceSources;
-    if (std::holds_alternative<std::string>(sequence)) {
-        sequenceSources.push_back(absPath(std::get<std::string>(sequence)).string());
+    std::vector<std::filesystem::path> sequenceSources;
+    if (std::holds_alternative<std::filesystem::path>(*p.sequence)) {
+        sequenceSources.push_back(absPath(std::get<std::filesystem::path>(*p.sequence)));
     }
     else {
         ghoul_assert(
-            std::holds_alternative<std::vector<std::string>>(sequence),
+            std::holds_alternative<std::vector<std::filesystem::path>>(*p.sequence),
             "Something is wrong with the generated documentation"
         );
-        sequenceSources = std::get<std::vector<std::string>>(sequence);
-        for (std::string& s : sequenceSources) {
-            s = absPath(s).string();
+        sequenceSources = std::get<std::vector<std::filesystem::path>>(*p.sequence);
+        for (std::filesystem::path& s : sequenceSources) {
+            s = absPath(s);
         }
     }
 
-
     if (!p.sequenceType.has_value()) {
         throw ghoul::RuntimeError("Missing SequenceType");
     }
@@ -246,7 +246,7 @@ void ProjectionComponent::initialize(const std::string& identifier,
     }
 
     std::vector<std::unique_ptr<SequenceParser>> parsers;
-    for (std::string& source : sequenceSources) {
+    for (std::filesystem::path& source : sequenceSources) {
         switch (*p.sequenceType) {
             case Parameters::Type::Playbook:
                 parsers.push_back(
@@ -274,7 +274,7 @@ void ProjectionComponent::initialize(const std::string& identifier,
                     parsers.push_back(
                         std::make_unique<HongKangParser>(
                             identifier,
-                            absPath(*p.eventFile).string(),
+                            *p.eventFile,
                             _projectorID,
                             translations,
                             _potentialTargets
@@ -312,7 +312,7 @@ void ProjectionComponent::initialize(const std::string& identifier,
                 parsers.push_back(
                     std::make_unique<InstrumentTimesParser>(
                         identifier,
-                        absPath(*p.timesSequence).string(),
+                        *p.timesSequence,
                         timesTranslationDictionary
                     )
                 );
@@ -360,7 +360,7 @@ bool ProjectionComponent::initializeGL() {
     using ghoul::opengl::Texture;
 
     std::unique_ptr<Texture> texture = ghoul::io::TextureReader::ref().loadTexture(
-        absPath(placeholderFile).string(),
+        absPath(placeholderFile),
         2
     );
     if (texture) {
@@ -877,7 +877,7 @@ void ProjectionComponent::generateMipMap() {
 }
 
 std::shared_ptr<ghoul::opengl::Texture> ProjectionComponent::loadProjectionTexture(
-                                                           const std::string& texturePath,
+                                                 const std::filesystem::path& texturePath,
                                                            bool isPlaceholder)
 {
     using ghoul::opengl::Texture;
@@ -887,7 +887,7 @@ std::shared_ptr<ghoul::opengl::Texture> ProjectionComponent::loadProjectionTextu
     }
 
     std::unique_ptr<Texture> texture = ghoul::io::TextureReader::ref().loadTexture(
-        absPath(texturePath).string(),
+        absPath(texturePath),
         2
     );
     if (texture) {
diff --git a/modules/spacecraftinstruments/util/projectioncomponent.h b/modules/spacecraftinstruments/util/projectioncomponent.h
index c8ca7855ff..0681d9330f 100644
--- a/modules/spacecraftinstruments/util/projectioncomponent.h
+++ b/modules/spacecraftinstruments/util/projectioncomponent.h
@@ -66,7 +66,7 @@ public:
     bool depthRendertarget();
 
     std::shared_ptr<ghoul::opengl::Texture> loadProjectionTexture(
-        const std::string& texturePath, bool isPlaceholder = false);
+        const std::filesystem::path& texturePath, bool isPlaceholder = false);
 
     glm::mat4 computeProjectorMatrix(const glm::vec3& loc, const glm::dvec3& aim,
         const glm::vec3& up, const glm::dmat3& instrumentMatrix, float fieldOfViewY,
diff --git a/modules/statemachine/include/statemachine.h b/modules/statemachine/include/statemachine.h
index 62761dbe7b..18d7f725f1 100644
--- a/modules/statemachine/include/statemachine.h
+++ b/modules/statemachine/include/statemachine.h
@@ -54,7 +54,7 @@ public:
      * \param filename This is the full name of the file, including the directory,
      *        but without the extension
      */
-    void saveToDotFile(const std::string& filename) const;
+    void saveToDotFile(const std::filesystem::path& filename) const;
 
     static documentation::Documentation Documentation();
 
diff --git a/modules/statemachine/src/statemachine.cpp b/modules/statemachine/src/statemachine.cpp
index ca1a743b79..9c1dbe4f64 100644
--- a/modules/statemachine/src/statemachine.cpp
+++ b/modules/statemachine/src/statemachine.cpp
@@ -197,10 +197,13 @@ std::vector<std::string> StateMachine::possibleTransitions() const {
     return res;
 }
 
-void StateMachine::saveToDotFile(const std::string& filename) const {
-    const std::string outputFile = filename + ".dot";
+void StateMachine::saveToDotFile(const std::filesystem::path& filename) const {
+    std::filesystem::path outputFile = filename;
+    if (!outputFile.has_extension()) {
+        outputFile.replace_extension(".dot");
+    }
 
-    std::ofstream file(outputFile);
+    std::ofstream file = std::ofstream(outputFile);
     if (!file.good()) {
         LERROR(std::format(
             "Error opening file '{}' for saving state machine dot file", outputFile
diff --git a/modules/statemachine/statemachinemodule.cpp b/modules/statemachine/statemachinemodule.cpp
index 0654a8ecd4..356c3775c6 100644
--- a/modules/statemachine/statemachinemodule.cpp
+++ b/modules/statemachine/statemachinemodule.cpp
@@ -140,7 +140,7 @@ void StateMachineModule::saveToFile(const std::string& filename,
         directory += '/';
     }
 
-    const std::string outputFile = absPath(directory + filename).string();
+    const std::filesystem::path outputFile = absPath(directory + filename);
     _machine->saveToDotFile(outputFile);
 }
 
diff --git a/modules/sync/syncs/httpsynchronization.cpp b/modules/sync/syncs/httpsynchronization.cpp
index 08d66a95f4..f179178bc6 100644
--- a/modules/sync/syncs/httpsynchronization.cpp
+++ b/modules/sync/syncs/httpsynchronization.cpp
@@ -401,7 +401,7 @@ HttpSynchronization::trySyncFromUrl(std::string url) {
             const std::string dest =
                 _unzipFilesDestination.has_value() ?
                 (originalName.parent_path() / *_unzipFilesDestination).string() :
-                originalName.replace_extension().string();;
+                originalName.replace_extension().string();
 
             struct zip_t* z = zip_open(source.c_str(), 0, 'r');
             const bool is64 = zip_is64(z);
diff --git a/modules/toyvolume/rendering/toyvolumeraycaster.cpp b/modules/toyvolume/rendering/toyvolumeraycaster.cpp
index be3acef255..16b4c79804 100644
--- a/modules/toyvolume/rendering/toyvolumeraycaster.cpp
+++ b/modules/toyvolume/rendering/toyvolumeraycaster.cpp
@@ -125,19 +125,19 @@ bool ToyVolumeRaycaster::isCameraInside(const RenderData& data, glm::vec3& local
             localPosition.z > 0.f && localPosition.z < 1.f);
 }
 
-std::string ToyVolumeRaycaster::boundsVertexShaderPath() const {
-    return absPath(GlslBoundsVsPath).string();
+std::filesystem::path ToyVolumeRaycaster::boundsVertexShaderPath() const {
+    return absPath(GlslBoundsVsPath);
 }
 
-std::string ToyVolumeRaycaster::boundsFragmentShaderPath() const {
-    return absPath(GlslBoundsFsPath).string();
+std::filesystem::path ToyVolumeRaycaster::boundsFragmentShaderPath() const {
+    return absPath(GlslBoundsFsPath);
 }
 
-std::string ToyVolumeRaycaster::raycasterPath() const {
-    return absPath(GlslRaycastPath).string();
+std::filesystem::path ToyVolumeRaycaster::raycasterPath() const {
+    return absPath(GlslRaycastPath);
 }
 
-std::string ToyVolumeRaycaster::helperPath() const {
+std::filesystem::path ToyVolumeRaycaster::helperPath() const {
     return ""; // no helper file
 }
 
diff --git a/modules/toyvolume/rendering/toyvolumeraycaster.h b/modules/toyvolume/rendering/toyvolumeraycaster.h
index 25e371707f..f980300e05 100644
--- a/modules/toyvolume/rendering/toyvolumeraycaster.h
+++ b/modules/toyvolume/rendering/toyvolumeraycaster.h
@@ -58,10 +58,10 @@ public:
         ghoul::opengl::ProgramObject& program) override;
     bool isCameraInside(const RenderData& data, glm::vec3& localPosition) override;
 
-    std::string boundsVertexShaderPath() const override;
-    std::string boundsFragmentShaderPath() const override;
-    std::string raycasterPath() const override;
-    std::string helperPath() const override;
+    std::filesystem::path boundsVertexShaderPath() const override;
+    std::filesystem::path boundsFragmentShaderPath() const override;
+    std::filesystem::path raycasterPath() const override;
+    std::filesystem::path helperPath() const override;
 
     void setColor(glm::vec4 color);
     void setModelTransform(glm::mat4 transform);
diff --git a/modules/volume/rendering/basicvolumeraycaster.cpp b/modules/volume/rendering/basicvolumeraycaster.cpp
index 75f350b7c8..f8d7e5ced3 100644
--- a/modules/volume/rendering/basicvolumeraycaster.cpp
+++ b/modules/volume/rendering/basicvolumeraycaster.cpp
@@ -161,20 +161,20 @@ bool BasicVolumeRaycaster::isCameraInside(const RenderData& data,
             localPosition.z > 0 && localPosition.z < 1);
 }
 
-std::string BasicVolumeRaycaster::boundsVertexShaderPath() const {
-    return absPath(GlslBoundsVs).string();
+std::filesystem::path BasicVolumeRaycaster::boundsVertexShaderPath() const {
+    return absPath(GlslBoundsVs);
 }
 
-std::string BasicVolumeRaycaster::boundsFragmentShaderPath() const {
-    return absPath(GlslBoundsFs).string();
+std::filesystem::path BasicVolumeRaycaster::boundsFragmentShaderPath() const {
+    return absPath(GlslBoundsFs);
 }
 
-std::string BasicVolumeRaycaster::raycasterPath() const {
-    return absPath(GlslRaycast).string();
+std::filesystem::path BasicVolumeRaycaster::raycasterPath() const {
+    return absPath(GlslRaycast);
 }
 
-std::string BasicVolumeRaycaster::helperPath() const {
-    return absPath(GlslHelper).string();
+std::filesystem::path BasicVolumeRaycaster::helperPath() const {
+    return absPath(GlslHelper);
 }
 
 void BasicVolumeRaycaster::setTransferFunction(
diff --git a/modules/volume/rendering/basicvolumeraycaster.h b/modules/volume/rendering/basicvolumeraycaster.h
index 43c3d24208..7fc60f5379 100644
--- a/modules/volume/rendering/basicvolumeraycaster.h
+++ b/modules/volume/rendering/basicvolumeraycaster.h
@@ -68,10 +68,10 @@ public:
         ghoul::opengl::ProgramObject& program) override;
     bool isCameraInside(const RenderData& data, glm::vec3& localPosition) override;
 
-    std::string boundsVertexShaderPath() const override;
-    std::string boundsFragmentShaderPath() const override;
-    std::string raycasterPath() const override;
-    std::string helperPath() const override;
+    std::filesystem::path boundsVertexShaderPath() const override;
+    std::filesystem::path boundsFragmentShaderPath() const override;
+    std::filesystem::path raycasterPath() const override;
+    std::filesystem::path helperPath() const override;
 
 
     void setVolumeTexture(std::shared_ptr<ghoul::opengl::Texture> texture);
diff --git a/modules/volume/rendering/renderabletimevaryingvolume.cpp b/modules/volume/rendering/renderabletimevaryingvolume.cpp
index f936f027aa..22ca620a4b 100644
--- a/modules/volume/rendering/renderabletimevaryingvolume.cpp
+++ b/modules/volume/rendering/renderabletimevaryingvolume.cpp
@@ -194,7 +194,7 @@ RenderableTimeVaryingVolume::RenderableTimeVaryingVolume(
     _sourceDirectory = absPath(p.sourceDirectory).string();
     _transferFunctionPath = absPath(p.transferFunction).string();
     _transferFunction = std::make_shared<openspace::TransferFunction>(
-        _transferFunctionPath,
+        _transferFunctionPath.value(),
         [](const openspace::TransferFunction&) {}
     );
 
@@ -239,7 +239,7 @@ void RenderableTimeVaryingVolume::initializeGL() {
     namespace fs = std::filesystem;
     for (const fs::directory_entry& e : fs::recursive_directory_iterator(sequenceDir)) {
         if (e.is_regular_file() && e.path().extension() == ".dictionary") {
-            loadTimestepMetadata(e.path().string());
+            loadTimestepMetadata(e.path());
         }
     }
 
@@ -328,13 +328,14 @@ void RenderableTimeVaryingVolume::initializeGL() {
 
     _transferFunctionPath.onChange([this] {
         _transferFunction = std::make_shared<openspace::TransferFunction>(
-            _transferFunctionPath
+            _transferFunctionPath.value()
         );
         _raycaster->setTransferFunction(_transferFunction);
     });
 }
 
-void RenderableTimeVaryingVolume::loadTimestepMetadata(const std::string& path) {
+void RenderableTimeVaryingVolume::loadTimestepMetadata(const std::filesystem::path& path)
+{
     RawVolumeMetadata metadata;
 
     try {
@@ -351,7 +352,7 @@ void RenderableTimeVaryingVolume::loadTimestepMetadata(const std::string& path)
 
     Timestep t;
     t.metadata = metadata;
-    t.baseName = std::filesystem::path(path).stem().string();
+    t.baseName = path.stem();
     t.inRam = false;
     t.onGpu = false;
 
diff --git a/modules/volume/rendering/renderabletimevaryingvolume.h b/modules/volume/rendering/renderabletimevaryingvolume.h
index a5d1f1a9cd..ecdd2be8f9 100644
--- a/modules/volume/rendering/renderabletimevaryingvolume.h
+++ b/modules/volume/rendering/renderabletimevaryingvolume.h
@@ -61,7 +61,7 @@ public:
 
 private:
     struct Timestep {
-        std::string baseName;
+        std::filesystem::path baseName;
         bool inRam;
         bool onGpu;
         RawVolumeMetadata metadata;
@@ -75,7 +75,7 @@ private:
     Timestep* timestepFromIndex(int target);
     void jumpToTimestep(int target);
 
-    void loadTimestepMetadata(const std::string& path);
+    void loadTimestepMetadata(const std::filesystem::path& path);
 
     properties::OptionProperty _gridType;
     std::shared_ptr<VolumeClipPlanes> _clipPlanes;
diff --git a/modules/volume/tasks/generaterawvolumetask.cpp b/modules/volume/tasks/generaterawvolumetask.cpp
index 4a8279d622..23685f6c07 100644
--- a/modules/volume/tasks/generaterawvolumetask.cpp
+++ b/modules/volume/tasks/generaterawvolumetask.cpp
@@ -104,7 +104,7 @@ void GenerateRawVolumeTask::perform(const Task::ProgressCallback& progressCallba
     // Spice kernel is required for time conversions.
     // Todo: Make this dependency less hard coded.
     SpiceManager::KernelHandle kernel = SpiceManager::ref().loadKernel(
-        absPath("${DATA}/assets/spice/naif0012.tls").string()
+        absPath("${DATA}/assets/spice/naif0012.tls")
     );
 
     defer {
@@ -169,7 +169,7 @@ void GenerateRawVolumeTask::perform(const Task::ProgressCallback& progressCallba
         std::filesystem::create_directories(directory);
     }
 
-    volume::RawVolumeWriter<float> writer(_rawVolumeOutputPath.string());
+    volume::RawVolumeWriter<float> writer(_rawVolumeOutputPath);
     writer.write(rawVolume);
 
     progressCallback(0.9f);
diff --git a/modules/volume/transferfunctionhandler.cpp b/modules/volume/transferfunctionhandler.cpp
index b840c5516d..d8dec3f83d 100644
--- a/modules/volume/transferfunctionhandler.cpp
+++ b/modules/volume/transferfunctionhandler.cpp
@@ -78,7 +78,7 @@ TransferFunctionHandler::TransferFunctionHandler(properties::StringProperty prop
     , _transferFunctionProperty(TransferFunctionInfo)
 {
     _transferFunction = std::make_shared<openspace::TransferFunction>(
-        _transferFunctionPath
+        _transferFunctionPath.value()
     );
 }
 
diff --git a/modules/webgui/webguimodule.cpp b/modules/webgui/webguimodule.cpp
index acc3add544..1cf99bd700 100644
--- a/modules/webgui/webguimodule.cpp
+++ b/modules/webgui/webguimodule.cpp
@@ -279,19 +279,19 @@ void WebGuiModule::startProcess() {
     const std::string command = std::format(
         "\"{}\" \"{}\" --directories \"{}\" {} --http-port \"{}\" --ws-address \"{}\" "
         "--ws-port {} --auto-close --local",
-        node.string(), absPath(_entryPoint.value()).string(), formattedDirectories,
+        node.string(), absPath(_entryPoint.value()), formattedDirectories,
         defaultEndpoint, _port.value(), _address.value(), webSocketPort
     );
 
     _process = std::make_unique<ghoul::Process>(
         command,
-        absPath("${BIN}").string(),
+        absPath("${BIN}"),
         [](const char* data, size_t n) {
-            const std::string str(data, n);
+            const std::string str = std::string(data, n);
             LDEBUG(std::format("Web GUI server output: {}", str));
         },
         [](const char* data, size_t n) {
-            const std::string str(data, n);
+            const std::string str = std::string(data, n);
             LERROR(std::format("Web GUI server error: {}", str));
         }
     );
diff --git a/src/data/csvloader.cpp b/src/data/csvloader.cpp
index e59e205676..f29cdf061a 100644
--- a/src/data/csvloader.cpp
+++ b/src/data/csvloader.cpp
@@ -74,11 +74,7 @@ Dataset loadCsvFile(std::filesystem::path filePath, std::optional<DataMapping> s
 
     LDEBUG("Parsing CSV file");
 
-    std::vector<std::vector<std::string>> rows = ghoul::loadCSVFile(
-        filePath.string(),
-        true
-    );
-
+    std::vector<std::vector<std::string>> rows = ghoul::loadCSVFile(filePath, true);
     if (rows.size() < 2) {
         LWARNING(std::format(
             "Error loading data file '{}'. No data items read", filePath
diff --git a/src/documentation/documentationengine.cpp b/src/documentation/documentationengine.cpp
index 0323e6be76..3597e53e00 100644
--- a/src/documentation/documentationengine.cpp
+++ b/src/documentation/documentationengine.cpp
@@ -608,12 +608,10 @@ void DocumentationEngine::writeDocumentation() const {
     ZoneScoped;
 
     // Write documentation to json files if config file supplies path for doc files
-    std::string path = global::configuration->documentation.path;
-    if (path.empty()) {
+    if (global::configuration->documentation.path.empty()) {
         // if path was empty, that means that no documentation is requested
         return;
     }
-    path = absPath(path).string() + '/';
 
     // Start the async requests as soon as possible so they are finished when we need them
     std::future<nlohmann::json> settings = std::async(
diff --git a/src/documentation/verifier.cpp b/src/documentation/verifier.cpp
index f221454833..ac8911163b 100644
--- a/src/documentation/verifier.cpp
+++ b/src/documentation/verifier.cpp
@@ -612,8 +612,10 @@ TestResult TemplateVerifier<glm::ivec4>::operator()(const ghoul::Dictionary& dic
     }
 }
 
-TableVerifier::TableVerifier(std::vector<DocumentationEntry> documentationEntries)
+TableVerifier::TableVerifier(std::vector<DocumentationEntry> documentationEntries,
+                             std::optional<int> nEntries)
     : documentations(std::move(documentationEntries))
+    , count(nEntries)
 {}
 
 TestResult TableVerifier::operator()(const ghoul::Dictionary& dictionary,
@@ -625,8 +627,8 @@ TestResult TableVerifier::operator()(const ghoul::Dictionary& dictionary,
         TestResult res = testSpecification(doc, d);
 
         // Add the 'key' as a prefix to make the new offender a fully qualified identifer
-        for (TestResult::Offense& s : res.offenses) {
-            s.offender = std::format("{}.{}", key, s.offender);
+        for (TestResult::Offense& o : res.offenses) {
+            o.offender = std::format("{}.{}", key, o.offender);
         }
 
         // Add the 'key' as a prefix to make the new warning a fully qualified identifer
@@ -634,6 +636,17 @@ TestResult TableVerifier::operator()(const ghoul::Dictionary& dictionary,
             w.offender = std::format("{}.{}", key, w.offender);
         }
 
+        if (count.has_value()) {
+            if (d.size() != *count) {
+                res.success = false;
+                res.offenses.emplace_back(
+                    "Count",
+                    TestResult::Offense::Reason::Verification,
+                    std::format("Expected {} entries, but only got {}", *count, d.size())
+                );
+            }
+        }
+
         return res;
     }
     else {
diff --git a/src/engine/configuration.cpp b/src/engine/configuration.cpp
index 7f6f1dd0a9..4bde284f72 100644
--- a/src/engine/configuration.cpp
+++ b/src/engine/configuration.cpp
@@ -715,11 +715,11 @@ Configuration loadConfigurationFromFile(const std::filesystem::path& configurati
 
     // If there is an initial config helper file, load it into the state
     if (std::filesystem::is_regular_file(absPath(InitialConfigHelper))) {
-        ghoul::lua::runScriptFile(result.state, absPath(InitialConfigHelper).string());
+        ghoul::lua::runScriptFile(result.state, absPath(InitialConfigHelper));
     }
 
     // Load the configuration file into the state
-    ghoul::lua::runScriptFile(result.state, configurationFile.string());
+    ghoul::lua::runScriptFile(result.state, configurationFile);
 
     parseLuaState(result);
 
diff --git a/src/engine/downloadmanager.cpp b/src/engine/downloadmanager.cpp
index d611e5d1a9..34e5691e39 100644
--- a/src/engine/downloadmanager.cpp
+++ b/src/engine/downloadmanager.cpp
@@ -112,7 +112,7 @@ namespace {
 
 namespace openspace {
 
-DownloadManager::FileFuture::FileFuture(std::string file)
+DownloadManager::FileFuture::FileFuture(std::filesystem::path file)
     : filePath(std::move(file))
 {}
 
@@ -135,18 +135,20 @@ std::shared_ptr<DownloadManager::FileFuture> DownloadManager::downloadFile(
         return nullptr;
     }
 
-    auto future = std::make_shared<FileFuture>(file.filename().string());
+    auto future = std::make_shared<FileFuture>(file.filename());
     errno = 0;
 #ifdef WIN32
     FILE* fp;
-    errno_t error = fopen_s(&fp, file.string().c_str(), "wb");
+    const std::string f = file.string();
+    errno_t error = fopen_s(&fp, f.c_str(), "wb");
     if (error != 0) {
         LERROR(std::format(
             "Could not open/create file: {}. Errno: {}", file, errno
         ));
     }
 #else
-    FILE* fp = fopen(file.string().c_str(), "wb"); // write binary
+    const std::string f = file.string();
+    FILE* fp = fopen(f.c_str(), "wb"); // write binary
 #endif // WIN32
     if (!fp) {
         LERROR(std::format(
diff --git a/src/engine/logfactory.cpp b/src/engine/logfactory.cpp
index c0f0020bbb..69ff60a67e 100644
--- a/src/engine/logfactory.cpp
+++ b/src/engine/logfactory.cpp
@@ -112,14 +112,14 @@ std::unique_ptr<ghoul::logging::Log> createLog(const ghoul::Dictionary& dictiona
     switch (p.type) {
         case Parameters::Type::Html:
         {
-            const std::vector<std::string> cssFiles = {
-                absPath(BootstrapPath).string(),
-                absPath(CssPath).string()
+            const std::vector<std::filesystem::path> cssFiles = {
+                absPath(BootstrapPath),
+                absPath(CssPath)
             };
-            const std::vector<std::string> jsFiles = { absPath(JsPath).string() };
+            const std::vector<std::filesystem::path> jsFiles = { absPath(JsPath) };
 
             return std::make_unique<ghoul::logging::HTMLLog>(
-                filename.string(),
+                filename,
                 nLogRotation,
                 ghoul::logging::Log::TimeStamping(timeStamp),
                 ghoul::logging::Log::DateStamping(dateStamp),
@@ -132,7 +132,7 @@ std::unique_ptr<ghoul::logging::Log> createLog(const ghoul::Dictionary& dictiona
         }
         case Parameters::Type::Text:
             return std::make_unique<ghoul::logging::TextLog>(
-                filename.string(),
+                filename,
                 nLogRotation,
                 ghoul::logging::TextLog::Append(append),
                 ghoul::logging::Log::TimeStamping(timeStamp),
diff --git a/src/engine/openspaceengine.cpp b/src/engine/openspaceengine.cpp
index 54d74d0f65..cf91a8cf1c 100644
--- a/src/engine/openspaceengine.cpp
+++ b/src/engine/openspaceengine.cpp
@@ -267,9 +267,9 @@ void OpenSpaceEngine::initialize() {
     _printEvents = global::configuration->isPrintingEvents;
     _visibility = static_cast<int>(global::configuration->propertyVisibility);
 
-    std::string cacheFolder = absPath("${CACHE}").string();
+    std::filesystem::path cacheFolder = absPath("${CACHE}");
     if (global::configuration->usePerProfileCache) {
-        cacheFolder = cacheFolder + "-" + global::configuration->profile;
+        cacheFolder = std::format("{}-{}", cacheFolder, global::configuration->profile);
 
         LINFO(std::format("Old cache: {}", absPath("${CACHE}")));
         LINFO(std::format("New cache: {}", cacheFolder));
@@ -346,8 +346,8 @@ void OpenSpaceEngine::initialize() {
             // Move all of the existing logs one position up
 
             const std::filesystem::path file = absPath(global::configuration->scriptLog);
-            const std::string fname = file.stem().string();
-            const std::string ext = file.extension().string();
+            const std::filesystem::path fname = file.stem();
+            const std::filesystem::path ext = file.extension();
 
             std::filesystem::path newCandidate = file;
             newCandidate.replace_filename(std::format("{}-{}{}", fname, rot, ext));
@@ -911,7 +911,7 @@ void OpenSpaceEngine::runGlobalCustomizationScripts() {
         if (std::filesystem::is_regular_file(s)) {
             try {
                 LINFO(std::format("Running global customization script: {}", s));
-                ghoul::lua::runScriptFile(state, s.string());
+                ghoul::lua::runScriptFile(state, s);
             }
             catch (const ghoul::RuntimeError& e) {
                 LERRORC(e.component, e.message);
@@ -1374,7 +1374,8 @@ void OpenSpaceEngine::touchExitCallback(TouchInput input) {
 void OpenSpaceEngine::handleDragDrop(std::filesystem::path file) {
     const ghoul::lua::LuaState s(ghoul::lua::LuaState::IncludeStandardLibrary::Yes);
     const std::filesystem::path path = absPath("${SCRIPTS}/drag_drop_handler.lua");
-    int status = luaL_loadfile(s, path.string().c_str());
+    const std::string p = path.string();
+    int status = luaL_loadfile(s, p.c_str());
     if (status != LUA_OK) {
         const std::string error = lua_tostring(s, -1);
         LERROR(error);
@@ -1384,7 +1385,7 @@ void OpenSpaceEngine::handleDragDrop(std::filesystem::path file) {
     ghoul::lua::push(s, file);
     lua_setglobal(s, "filename");
 
-    std::string basename = file.filename().string();
+    std::filesystem::path basename = file.filename();
     ghoul::lua::push(s, std::move(basename));
     lua_setglobal(s, "basename");
 
diff --git a/src/engine/openspaceengine_lua.inl b/src/engine/openspaceengine_lua.inl
index c615a72fa1..031eaa5193 100644
--- a/src/engine/openspaceengine_lua.inl
+++ b/src/engine/openspaceengine_lua.inl
@@ -223,9 +223,8 @@ namespace {
         throw ghoul::lua::LuaError(std::format("Could not find file '{}'", file));
     }
 
-    std::vector<std::vector<std::string>> res =
-        ghoul::loadCSVFile(file.string(), includeFirstLine);
-    return res;
+    std::vector<std::vector<std::string>> r = ghoul::loadCSVFile(file, includeFirstLine);
+    return r;
 }
 
 /**
diff --git a/src/navigation/navigationhandler.cpp b/src/navigation/navigationhandler.cpp
index 4e45a6041f..c3e56d725e 100644
--- a/src/navigation/navigationhandler.cpp
+++ b/src/navigation/navigationhandler.cpp
@@ -629,7 +629,7 @@ void NavigationHandler::loadNavigationState(const std::string& filepath,
     }
 
     if (!std::filesystem::is_regular_file(absolutePath)) {
-        throw ghoul::FileNotFoundError(absolutePath.string(), "NavigationState");
+        throw ghoul::FileNotFoundError(absolutePath, "NavigationState");
     }
 
     std::ifstream f = std::ifstream(absolutePath);
diff --git a/src/rendering/colormappingcomponent.cpp b/src/rendering/colormappingcomponent.cpp
index 4dbf91e9ee..79d5398158 100644
--- a/src/rendering/colormappingcomponent.cpp
+++ b/src/rendering/colormappingcomponent.cpp
@@ -155,7 +155,7 @@ namespace {
         std::optional<bool> enabled;
 
         // [[codegen::verbatim(FileInfo.description)]]
-        std::optional<std::string> file;
+        std::optional<std::filesystem::path> file;
 
         struct ColorMapParameter {
             // The key for the data variable to use for color
@@ -319,7 +319,7 @@ ColorMappingComponent::ColorMappingComponent(const ghoul::Dictionary& dictionary
     }
 
     if (p.file.has_value()) {
-        colorMapFile = absPath(*p.file).string();
+        colorMapFile = p.file->string();
     }
 
     invert = p.invert.value_or(invert);
diff --git a/src/rendering/framebufferrenderer.cpp b/src/rendering/framebufferrenderer.cpp
index d63722b271..be3f1d9db3 100644
--- a/src/rendering/framebufferrenderer.cpp
+++ b/src/rendering/framebufferrenderer.cpp
@@ -950,18 +950,18 @@ void FramebufferRenderer::updateRaycastData() {
 
         RaycastData data = { .id = nextId++, .namespaceName = "Helper" };
 
-        const std::string& vsPath = raycaster->boundsVertexShaderPath();
-        std::string fsPath = raycaster->boundsFragmentShaderPath();
+        const std::filesystem::path& vsPath = raycaster->boundsVertexShaderPath();
+        std::filesystem::path fsPath = raycaster->boundsFragmentShaderPath();
 
         ghoul::Dictionary dict;
         dict.setValue("rendererData", _rendererData);
-        dict.setValue("fragmentPath", std::move(fsPath));
+        dict.setValue("fragmentPath", fsPath);
         dict.setValue("id", data.id);
 
-        std::string helperPath = raycaster->helperPath();
+        std::filesystem::path helperPath = raycaster->helperPath();
         ghoul::Dictionary helpersDict;
         if (!helperPath.empty()) {
-            helpersDict.setValue("0", std::move(helperPath));
+            helpersDict.setValue("0", helperPath);
         }
         dict.setValue("helperPaths", std::move(helpersDict));
         dict.setValue("raycastPath", raycaster->raycasterPath());
@@ -1029,7 +1029,7 @@ void FramebufferRenderer::updateDeferredcastData() {
         const std::filesystem::path helperPath = caster->helperPath();
         ghoul::Dictionary helpersDict;
         if (!helperPath.empty()) {
-            helpersDict.setValue("0", helperPath.string());
+            helpersDict.setValue("0", helperPath);
         }
         dict.setValue("helperPaths", helpersDict);
 
diff --git a/src/rendering/loadingscreen.cpp b/src/rendering/loadingscreen.cpp
index 17b2145937..7e4b043769 100644
--- a/src/rendering/loadingscreen.cpp
+++ b/src/rendering/loadingscreen.cpp
@@ -151,7 +151,7 @@ LoadingScreen::LoadingScreen(ShowMessage showMessage, ShowNodeNames showNodeName
     {
         // Logo stuff
         _logoTexture = ghoul::io::TextureReader::ref().loadTexture(
-            absPath("${DATA}/openspace-logo.png").string(),
+            absPath("${DATA}/openspace-logo.png"),
             2
         );
         _logoTexture->uploadTexture();
diff --git a/src/rendering/renderengine.cpp b/src/rendering/renderengine.cpp
index 4f21e42357..fe71de25d7 100644
--- a/src/rendering/renderengine.cpp
+++ b/src/rendering/renderengine.cpp
@@ -975,7 +975,7 @@ std::unique_ptr<ghoul::opengl::ProgramObject> RenderEngine::buildRenderProgram(
     // parameterize the main fragment shader program with specific contents.
     // fsPath should point to a shader file defining a Fragment getFragment() function
     // instead of a void main() setting glFragColor, glFragDepth, etc.
-    dict.setValue("fragmentPath", fsPath.string());
+    dict.setValue("fragmentPath", fsPath);
 
     using namespace ghoul::opengl;
     std::unique_ptr<ProgramObject> program = ProgramObject::Build(
@@ -1007,7 +1007,7 @@ std::unique_ptr<ghoul::opengl::ProgramObject> RenderEngine::buildRenderProgram(
     // parameterize the main fragment shader program with specific contents.
     // fsPath should point to a shader file defining a Fragment getFragment() function
     // instead of a void main() setting glFragColor, glFragDepth, etc.
-    dict.setValue("fragmentPath", fsPath.string());
+    dict.setValue("fragmentPath", fsPath);
 
     using namespace ghoul::opengl;
     std::unique_ptr<ProgramObject> program = ProgramObject::Build(
diff --git a/src/rendering/texturecomponent.cpp b/src/rendering/texturecomponent.cpp
index dcda824d91..bcd825bfe2 100644
--- a/src/rendering/texturecomponent.cpp
+++ b/src/rendering/texturecomponent.cpp
@@ -87,29 +87,31 @@ void TextureComponent::uploadToGpu() {
 }
 
 void TextureComponent::loadFromFile(const std::filesystem::path& path) {
-    if (!path.empty()) {
-        using namespace ghoul::io;
-        using namespace ghoul::opengl;
+    if (path.empty()) {
+        return;
+    }
 
-        std::filesystem::path absolutePath = absPath(path);
+    using namespace ghoul::io;
+    using namespace ghoul::opengl;
 
-        std::unique_ptr<Texture> texture = TextureReader::ref().loadTexture(
-            absolutePath.string(),
-            _nDimensions
-        );
+    std::filesystem::path absolutePath = absPath(path);
 
-        if (texture) {
-            LDEBUG(std::format("Loaded texture from '{}'", absolutePath));
-            _texture = std::move(texture);
+    std::unique_ptr<Texture> texture = TextureReader::ref().loadTexture(
+        absolutePath,
+        _nDimensions
+    );
 
-            _textureFile = std::make_unique<ghoul::filesystem::File>(absolutePath);
-            if (_shouldWatchFile) {
-                _textureFile->setCallback([this]() { _fileIsDirty = true; });
-            }
+    if (texture) {
+        LDEBUG(std::format("Loaded texture from '{}'", absolutePath));
+        _texture = std::move(texture);
 
-            _fileIsDirty = false;
-            _textureIsDirty = true;
+        _textureFile = std::make_unique<ghoul::filesystem::File>(absolutePath);
+        if (_shouldWatchFile) {
+            _textureFile->setCallback([this]() { _fileIsDirty = true; });
         }
+
+        _fileIsDirty = false;
+        _textureIsDirty = true;
     }
 }
 
diff --git a/src/rendering/transferfunction.cpp b/src/rendering/transferfunction.cpp
index 9773746445..232437a9c5 100644
--- a/src/rendering/transferfunction.cpp
+++ b/src/rendering/transferfunction.cpp
@@ -42,7 +42,7 @@ namespace {
 
 namespace openspace {
 
-TransferFunction::TransferFunction(const std::string& filepath,
+TransferFunction::TransferFunction(const std::filesystem::path& filepath,
                                    TfChangedCallback tfChangedCallback)
     : _filepath(filepath)
 {
@@ -52,7 +52,7 @@ TransferFunction::TransferFunction(const std::string& filepath,
 
 TransferFunction::~TransferFunction() {}
 
-void TransferFunction::setPath(const std::string& filepath) {
+void TransferFunction::setPath(const std::filesystem::path& filepath) {
     if (_file) {
         _file = nullptr;
     }
@@ -95,11 +95,10 @@ void TransferFunction::setCallback(TfChangedCallback callback) {
 }
 
 void TransferFunction::setTextureFromTxt() {
-    std::ifstream in;
-    in.open(_filepath);
+    std::ifstream in = std::ifstream(_filepath);
 
     if (!in.is_open()) {
-        throw ghoul::FileNotFoundError(_filepath.string());
+        throw ghoul::FileNotFoundError(_filepath);
     }
 
     int width = 512;
@@ -209,7 +208,7 @@ void TransferFunction::setTextureFromTxt() {
 }
 
 void TransferFunction::setTextureFromImage() {
-    _texture = ghoul::io::TextureReader::ref().loadTexture(_filepath.string(), 1);
+    _texture = ghoul::io::TextureReader::ref().loadTexture(_filepath, 1);
     _texture->setWrapping(ghoul::opengl::Texture::WrappingMode::ClampToEdge);
 }
 
diff --git a/src/scene/assetmanager.cpp b/src/scene/assetmanager.cpp
index 21a5772115..0ce4a6109a 100644
--- a/src/scene/assetmanager.cpp
+++ b/src/scene/assetmanager.cpp
@@ -992,20 +992,20 @@ std::filesystem::path AssetManager::generateAssetPath(
     // 2) Relative to the global asset root (*)
 
     const PathType pathType = classifyPath(assetPath);
-    std::string prefix;
+    std::filesystem::path prefix;
     if (pathType == PathType::RelativeToAsset) {
-        prefix = baseDirectory.string() + '/';
+        prefix = baseDirectory / "";
     }
     else if (pathType == PathType::RelativeToAssetRoot) {
-        prefix = _assetRootDirectory.string() + '/';
+        prefix = _assetRootDirectory / "";
     }
     // We treat the Absolute and the Tokenized paths the same here since they will
     // behave the same when passed into the `absPath` function
 
     // Construct the full path including the .asset extension
-    std::string fullAssetPath = prefix + assetPath;
-    if (std::filesystem::path(assetPath).extension() != ".asset") {
-        fullAssetPath += ".asset";
+    std::filesystem::path fullAssetPath = std::format("{}{}", prefix, assetPath);
+    if (fullAssetPath.extension() != ".asset") {
+        fullAssetPath.replace_extension(".asset");
     }
 
     // We don't check whether the file exists here as the error will be more
diff --git a/src/scene/assetmanager_lua.inl b/src/scene/assetmanager_lua.inl
index 5c3a7f0a84..623409b5f6 100644
--- a/src/scene/assetmanager_lua.inl
+++ b/src/scene/assetmanager_lua.inl
@@ -73,13 +73,13 @@ namespace {
  * Returns the paths to all loaded assets, loaded directly or indirectly, as a table
  * containing the paths to all loaded assets.
  */
-[[codegen::luawrap]] std::vector<std::string> allAssets() {
+[[codegen::luawrap]] std::vector<std::filesystem::path> allAssets() {
     using namespace openspace;
     std::vector<const Asset*> as = global::openSpaceEngine->assetManager().allAssets();
-    std::vector<std::string> res;
+    std::vector<std::filesystem::path> res;
     res.reserve(as.size());
     for (const Asset* a : as) {
-        res.push_back(a->path().string());
+        res.push_back(a->path());
     }
     return res;
 }
@@ -88,13 +88,13 @@ namespace {
  * Returns the paths to all loaded root assets, which are assets that are loaded directly
  * either through a profile or by calling the `openspace.asset.add` method.
  */
-[[codegen::luawrap]] std::vector<std::string> rootAssets() {
+[[codegen::luawrap]] std::vector<std::filesystem::path> rootAssets() {
     using namespace openspace;
     std::vector<const Asset*> as = global::openSpaceEngine->assetManager().rootAssets();
-    std::vector<std::string> res;
+    std::vector<std::filesystem::path> res;
     res.reserve(as.size());
     for (const Asset* a : as) {
-        res.push_back(a->path().string());
+        res.push_back(a->path());
     }
     return res;
 }
diff --git a/src/scene/profile_lua.inl b/src/scene/profile_lua.inl
index 9fd8f3de0f..57eb927230 100644
--- a/src/scene/profile_lua.inl
+++ b/src/scene/profile_lua.inl
@@ -54,19 +54,17 @@ namespace {
         );
         std::filesystem::path path = global::configuration->profile;
         path.replace_extension();
-        std::string newFile = std::format("{}_{}", path.string(), time);
+        std::string newFile = std::format("{}_{}", path, time);
         std::string sourcePath = std::format(
-            "{}/{}.profile",
-            absPath("${USER_PROFILES}").string(), global::configuration->profile
+            "{}/{}.profile", absPath("${USER_PROFILES}"), global::configuration->profile
         );
         std::string destPath = std::format(
-            "{}/{}.profile",
-            absPath("${PROFILES}").string(), global::configuration->profile
+            "{}/{}.profile", absPath("${PROFILES}"), global::configuration->profile
         );
         if (!std::filesystem::is_regular_file(sourcePath)) {
             sourcePath = std::format(
                 "{}/{}.profile",
-                absPath("${USER_PROFILES}").string(), global::configuration->profile
+                absPath("${USER_PROFILES}"), global::configuration->profile
             );
         }
         LINFOC(
@@ -99,7 +97,7 @@ namespace {
     }
 
     std::string absFilename = std::format(
-        "{}/{}.profile", absPath("${PROFILES}").string(), *saveFilePath
+        "{}/{}.profile", absPath("${PROFILES}"), *saveFilePath
     );
     if (!std::filesystem::is_regular_file(absFilename)) {
         absFilename = absPath("${USER_PROFILES}/" + *saveFilePath + ".profile").string();
diff --git a/src/scripting/scriptengine.cpp b/src/scripting/scriptengine.cpp
index f7361e9705..773a4ec609 100644
--- a/src/scripting/scriptengine.cpp
+++ b/src/scripting/scriptengine.cpp
@@ -324,7 +324,7 @@ void ScriptEngine::addLibraryFunctions(lua_State* state, LuaLibrary& library,
     library.documentations.clear();
     for (const std::filesystem::path& script : library.scripts) {
         // First we run the script to set its values in the current state
-        ghoul::lua::runScriptFile(state, script.string());
+        ghoul::lua::runScriptFile(state, script);
 
 
         // Then, we extract the documentation information from the file
@@ -430,20 +430,17 @@ void ScriptEngine::writeLog(const std::string& script) {
     if (!_logFileExists) {
         // If a ScriptLogFile was specified, generate it now
         if (!global::configuration->scriptLog.empty()) {
-            _logFilename = absPath(global::configuration->scriptLog).string();
+            _logFilename = absPath(global::configuration->scriptLog);
             _logFileExists = true;
 
-            LDEBUG(std::format(
-                "Using script log file {}", std::filesystem::path(_logFilename)
-            ));
+            LDEBUG(std::format("Using script log file '{}'", _logFilename));
 
             // Test file and clear previous input
             std::ofstream file(_logFilename, std::ofstream::out | std::ofstream::trunc);
 
             if (!file.good()) {
                 LERROR(std::format(
-                    "Could not open file {} for logging scripts",
-                    std::filesystem::path(_logFilename)
+                    "Could not open file '{}' for logging scripts", _logFilename
                 ));
 
                 return;
diff --git a/src/scripting/scriptengine_lua.inl b/src/scripting/scriptengine_lua.inl
index 64b6e60d9b..135a11ecb5 100644
--- a/src/scripting/scriptengine_lua.inl
+++ b/src/scripting/scriptengine_lua.inl
@@ -109,23 +109,24 @@ namespace {
     return e;
 }
 
-std::vector<std::string> walkCommon(std::string path, bool recursive, bool sorted,
+std::vector<std::filesystem::path> walkCommon(const std::filesystem::path& path,
+                                              bool recursive, bool sorted,
                                  std::function<bool(const std::filesystem::path&)> filter)
 {
     namespace fs = std::filesystem;
-    std::vector<std::string> result;
+    std::vector<std::filesystem::path> result;
     if (fs::is_directory(path)) {
         if (recursive) {
             for (fs::directory_entry e : fs::recursive_directory_iterator(path)) {
                 if (filter(e)) {
-                    result.push_back(e.path().string());
+                    result.push_back(e.path());
                 }
             }
         }
         else {
             for (fs::directory_entry e : fs::directory_iterator(path)) {
                 if (filter(e)) {
-                    result.push_back(e.path().string());
+                    result.push_back(e.path());
                 }
             }
         }
@@ -143,9 +144,10 @@ std::vector<std::string> walkCommon(std::string path, bool recursive, bool sorte
  * default value for this parameter is "false". The third argument determines whether the
  * table that is returned is sorted. The default value for this parameter is "false".
  */
-[[codegen::luawrap]] std::vector<std::string> walkDirectory(std::string path,
-                                                            bool recursive = false,
-                                                            bool sorted = false)
+[[codegen::luawrap]] std::vector<std::filesystem::path> walkDirectory(
+                                                               std::filesystem::path path,
+                                                                   bool recursive = false,
+                                                                      bool sorted = false)
 {
     namespace fs = std::filesystem;
     return walkCommon(
@@ -163,9 +165,10 @@ std::vector<std::string> walkCommon(std::string path, bool recursive, bool sorte
  * default value for this parameter is "false". The third argument determines whether the
  * table that is returned is sorted. The default value for this parameter is "false".
  */
-[[codegen::luawrap]] std::vector<std::string> walkDirectoryFiles(std::string path,
-                                                                 bool recursive = false,
-                                                                 bool sorted = false)
+[[codegen::luawrap]] std::vector<std::filesystem::path> walkDirectoryFiles(
+                                                               std::filesystem::path path,
+                                                                   bool recursive = false,
+                                                                      bool sorted = false)
 {
     namespace fs = std::filesystem;
     return walkCommon(
@@ -183,9 +186,10 @@ std::vector<std::string> walkCommon(std::string path, bool recursive, bool sorte
  * default value for this parameter is "false". The third argument determines whether the
  * table that is returned is sorted. The default value for this parameter is "false".
  */
-[[codegen::luawrap]] std::vector<std::string> walkDirectoryFolders(std::string path,
+[[codegen::luawrap]] std::vector<std::filesystem::path> walkDirectoryFolders(
+                                                               std::filesystem::path path,
                                                                    bool recursive = false,
-                                                                   bool sorted = false)
+                                                                      bool sorted = false)
 {
     namespace fs = std::filesystem;
     return walkCommon(
diff --git a/src/util/spicemanager.cpp b/src/util/spicemanager.cpp
index b1766b6f44..1b3557c220 100644
--- a/src/util/spicemanager.cpp
+++ b/src/util/spicemanager.cpp
@@ -170,7 +170,8 @@ SpiceManager::SpiceManager() {
 
 SpiceManager::~SpiceManager() {
     for (const KernelInformation& i : _loadedKernels) {
-        unload_c(i.path.c_str());
+        const std::string p = i.path.string();
+        unload_c(p.c_str());
     }
 
     // Set values back to default
@@ -214,7 +215,7 @@ void throwSpiceError(const std::string& errorMessage) {
     }
 }
 
-SpiceManager::KernelHandle SpiceManager::loadKernel(std::string filePath) {
+SpiceManager::KernelHandle SpiceManager::loadKernel(std::filesystem::path filePath) {
     ghoul_assert(!filePath.empty(), "Empty file path");
     ghoul_assert(
         std::filesystem::is_regular_file(filePath),
@@ -228,11 +229,10 @@ SpiceManager::KernelHandle SpiceManager::loadKernel(std::string filePath) {
         )
     );
 
-    const std::filesystem::path path = absPath(std::move(filePath));
     const auto it = std::find_if(
         _loadedKernels.begin(),
         _loadedKernels.end(),
-        [path](const KernelInformation& info) { return info.path == path; }
+        [filePath](const KernelInformation& info) { return info.path == filePath; }
     );
 
     if (it != _loadedKernels.end()) {
@@ -245,12 +245,13 @@ SpiceManager::KernelHandle SpiceManager::loadKernel(std::string filePath) {
     // kernels
     const std::filesystem::path currentDirectory = std::filesystem::current_path();
 
-    const std::filesystem::path p = path.parent_path();
+    const std::filesystem::path p = filePath.parent_path();
     std::filesystem::current_path(p);
 
-    LINFO(std::format("Loading SPICE kernel '{}'", path));
+    LINFO(std::format("Loading SPICE kernel '{}'", filePath));
     // Load the kernel
-    furnsh_c(path.string().c_str());
+    const std::string k = filePath.string();
+    furnsh_c(k.c_str());
 
     // Reset the current directory to the previous one
     std::filesystem::current_path(currentDirectory);
@@ -259,17 +260,17 @@ SpiceManager::KernelHandle SpiceManager::loadKernel(std::string filePath) {
         throwSpiceError("Kernel loading");
     }
 
-    const std::filesystem::path fileExtension = path.extension();
+    const std::filesystem::path fileExtension = filePath.extension();
     if (fileExtension == ".bc" || fileExtension == ".BC") {
-        findCkCoverage(path.string()); // binary ck kernel
+        findCkCoverage(filePath); // binary ck kernel
     }
     else if (fileExtension == ".bsp" || fileExtension == ".BSP") {
-        findSpkCoverage(path.string()); // binary spk kernel
+        findSpkCoverage(filePath); // binary spk kernel
     }
 
     const KernelHandle kernelId = ++_lastAssignedKernel;
     ghoul_assert(kernelId != 0, "Kernel Handle wrapped around to 0");
-    _loadedKernels.push_back({ path.string(), kernelId, 1 });
+    _loadedKernels.push_back({ std::move(filePath), kernelId, 1 });
     return kernelId;
 }
 
@@ -288,7 +289,8 @@ void SpiceManager::unloadKernel(KernelHandle kernelId) {
         if (it->refCount == 1) {
             // No need to check for errors as we do not allow empty path names
             LINFO(std::format("Unloading SPICE kernel '{}'", it->path));
-            unload_c(it->path.c_str());
+            const std::string p = it->path.string();
+            unload_c(p.c_str());
             _loadedKernels.erase(it);
         }
         // Otherwise, we hold on to it, but reduce the reference counter by 1
@@ -299,21 +301,19 @@ void SpiceManager::unloadKernel(KernelHandle kernelId) {
     }
 }
 
-void SpiceManager::unloadKernel(std::string filePath) {
+void SpiceManager::unloadKernel(std::filesystem::path filePath) {
     ghoul_assert(!filePath.empty(), "Empty filename");
 
-    const std::filesystem::path path = absPath(std::move(filePath));
-
     const auto it = std::find_if(
         _loadedKernels.begin(),
         _loadedKernels.end(),
-        [&path](const KernelInformation& info) { return info.path == path; }
+        [&filePath](const KernelInformation& info) { return info.path == filePath; }
     );
 
     if (it == _loadedKernels.end()) {
         if (_useExceptions) {
             throw SpiceException(
-                std::format("'{}' did not correspond to a loaded kernel", path)
+                std::format("'{}' did not correspond to a loaded kernel", filePath)
             );
         }
         else {
@@ -323,8 +323,9 @@ void SpiceManager::unloadKernel(std::string filePath) {
     else {
         // If there was only one part interested in the kernel, we can unload it
         if (it->refCount == 1) {
-            LINFO(std::format("Unloading SPICE kernel '{}'", path));
-            unload_c(path.string().c_str());
+            LINFO(std::format("Unloading SPICE kernel '{}'", filePath));
+            const std::string p = filePath.string();
+            unload_c(p.c_str());
             _loadedKernels.erase(it);
         }
         else {
@@ -335,8 +336,8 @@ void SpiceManager::unloadKernel(std::string filePath) {
     }
 }
 
-std::vector<std::string> SpiceManager::loadedKernels() const {
-    std::vector<std::string> res;
+std::vector<std::filesystem::path> SpiceManager::loadedKernels() const {
+    std::vector<std::filesystem::path> res;
     res.reserve(_loadedKernels.size());
     for (const KernelInformation& info : _loadedKernels) {
         res.push_back(info.path);
@@ -1048,7 +1049,7 @@ SpiceManager::TerminatorEllipseResult SpiceManager::terminatorEllipse(
     return res;
 }
 
-void SpiceManager::findCkCoverage(const std::string& path) {
+void SpiceManager::findCkCoverage(const std::filesystem::path& path) {
     ghoul_assert(!path.empty(), "Empty file path");
     ghoul_assert(
         std::filesystem::is_regular_file(path),
@@ -1069,7 +1070,8 @@ void SpiceManager::findCkCoverage(const std::string& path) {
     SPICEINT_CELL(ids, MaxObj);
     SPICEDOUBLE_CELL(cover, WinSiz);
 
-    ckobj_c(path.c_str(), &ids);
+    const std::string p = path.string();
+    ckobj_c(p.c_str(), &ids);
     if (failed_c()) {
         throwSpiceError("Error finding Ck Coverage");
     }
@@ -1084,7 +1086,7 @@ void SpiceManager::findCkCoverage(const std::string& path) {
 #endif
 
         scard_c(0, &cover);
-        ckcov_c(path.c_str(), frame, SPICEFALSE, "SEGMENT", 0.0, "TDB", &cover);
+        ckcov_c(p.c_str(), frame, SPICEFALSE, "SEGMENT", 0.0, "TDB", &cover);
         if (failed_c()) {
             throwSpiceError("Error finding Ck Coverage");
         }
@@ -1108,7 +1110,7 @@ void SpiceManager::findCkCoverage(const std::string& path) {
     }
 }
 
-void SpiceManager::findSpkCoverage(const std::string& path) {
+void SpiceManager::findSpkCoverage(const std::filesystem::path &path) {
     ghoul_assert(!path.empty(), "Empty file path");
     ghoul_assert(
         std::filesystem::is_regular_file(path),
@@ -1129,7 +1131,8 @@ void SpiceManager::findSpkCoverage(const std::string& path) {
     SPICEINT_CELL(ids, MaxObj);
     SPICEDOUBLE_CELL(cover, WinSiz);
 
-    spkobj_c(path.c_str(), &ids);
+    const std::string p = path.string();
+    spkobj_c(p.c_str(), &ids);
     if (failed_c()) {
         throwSpiceError("Error finding Spk ID for coverage");
     }
@@ -1144,7 +1147,7 @@ void SpiceManager::findSpkCoverage(const std::string& path) {
 #endif
 
         scard_c(0, &cover);
-        spkcov_c(path.c_str(), obj, &cover);
+        spkcov_c(p.c_str(), obj, &cover);
         if (failed_c()) {
             throwSpiceError("Error finding Spk coverage");
         }
@@ -1537,7 +1540,7 @@ const std::filesystem::path path = std::filesystem::temp_directory_path();
         std::ofstream f(file);
         f << Naif00012tlsSource;
     }
-    loadKernel(file.string());
+    loadKernel(file);
     std::filesystem::remove(file);
 }
 
@@ -1671,7 +1674,7 @@ References:
           std::ofstream f(file);
           f << GeoPhysicalConstantsKernelSource;
       }
-      loadKernel(file.string());
+      loadKernel(file);
       std::filesystem::remove(file);
 }
 
diff --git a/src/util/spicemanager_lua.inl b/src/util/spicemanager_lua.inl
index dec8e0df24..c7af06d963 100644
--- a/src/util/spicemanager_lua.inl
+++ b/src/util/spicemanager_lua.inl
@@ -73,7 +73,7 @@ namespace {
 /**
  * Returns a list of all loaded kernels
  */
-[[codegen::luawrap]] std::vector<std::string> kernels() {
+[[codegen::luawrap]] std::vector<std::filesystem::path> kernels() {
     return openspace::SpiceManager::ref().loadedKernels();
 }
 
diff --git a/src/util/taskloader.cpp b/src/util/taskloader.cpp
index 4ca220b510..1139e34d64 100644
--- a/src/util/taskloader.cpp
+++ b/src/util/taskloader.cpp
@@ -79,7 +79,7 @@ std::vector<std::unique_ptr<Task>> TaskLoader::tasksFromFile(const std::string&
 
     ghoul::Dictionary tasksDictionary;
     try {
-        ghoul::lua::loadDictionaryFromFile(absTasksFile.string(), tasksDictionary);
+        ghoul::lua::loadDictionaryFromFile(absTasksFile, tasksDictionary);
     }
     catch (const ghoul::RuntimeError& e) {
         LERROR(std::format(
diff --git a/support/coding/codegen b/support/coding/codegen
index 7dcdb14583..dd4812b4ea 160000
--- a/support/coding/codegen
+++ b/support/coding/codegen
@@ -1 +1 @@
-Subproject commit 7dcdb145830916da1202efb1707ce9890193b606
+Subproject commit dd4812b4ea775fa7b208474900b98a54603edfa9
diff --git a/tests/main.cpp b/tests/main.cpp
index 7f918ca4d8..77dd2a7844 100644
--- a/tests/main.cpp
+++ b/tests/main.cpp
@@ -63,11 +63,7 @@ int main(int argc, char** argv) {
     const std::filesystem::path base = configFile.parent_path();
     FileSys.registerPathToken("${BASE}", base);
 
-    *global::configuration = loadConfigurationFromFile(
-        configFile.string(),
-        "",
-        glm::ivec2(0)
-    );
+    *global::configuration = loadConfigurationFromFile(configFile, "", glm::ivec2(0));
     global::openSpaceEngine->registerPathTokens();
     global::openSpaceEngine->initialize();
 
diff --git a/tests/test_documentation.cpp b/tests/test_documentation.cpp
index d76b851dcd..35f53fc078 100644
--- a/tests/test_documentation.cpp
+++ b/tests/test_documentation.cpp
@@ -553,13 +553,13 @@ TEST_CASE("Documentation: FileVerifier", "[documentation]") {
     };
 
     ghoul::Dictionary positive;
-    positive.setValue("File", absPath("${TESTDIR}/verifier/dummyfile.txt").string());
+    positive.setValue("File", absPath("${TESTDIR}/verifier/dummyfile.txt"));
     const TestResult positiveRes = testSpecification(doc, positive);
     CHECK(positiveRes.success);
     CHECK(positiveRes.offenses.empty());
 
     ghoul::Dictionary negative404;
-    negative404.setValue("File", absPath("${TESTDIR}/verifier/404.txt").string());
+    negative404.setValue("File", absPath("${TESTDIR}/verifier/404.txt"));
     TestResult negativeRes = testSpecification(doc, negative404);
     CHECK(!negativeRes.success);
     REQUIRE(negativeRes.offenses.size() == 1);
@@ -594,13 +594,13 @@ TEST_CASE("Documentation: DirectoryVerifier", "[documentation]") {
     };
 
     ghoul::Dictionary positive;
-    positive.setValue("Dir", absPath("${TESTDIR}/verifier").string());
+    positive.setValue("Dir", absPath("${TESTDIR}/verifier"));
     const TestResult positiveRes = testSpecification(doc, positive);
     CHECK(positiveRes.success);
     CHECK(positiveRes.offenses.empty());
 
     ghoul::Dictionary negative404;
-    negative404.setValue("Dir", absPath("${TESTDIR}/verifier404").string());
+    negative404.setValue("Dir", absPath("${TESTDIR}/verifier404"));
     TestResult negativeRes = testSpecification(doc, negative404);
     CHECK(!negativeRes.success);
     REQUIRE(negativeRes.offenses.size() == 1);
diff --git a/tests/test_horizons.cpp b/tests/test_horizons.cpp
index c87537e1d2..477b37362e 100644
--- a/tests/test_horizons.cpp
+++ b/tests/test_horizons.cpp
@@ -112,7 +112,7 @@ void testReadingHorizons(HorizonsType type, const std::filesystem::path& filePat
 
     // Initialize SpiceManager and load leap second kernel
     SpiceManager::initialize();
-    openspace::SpiceManager::ref().loadKernel(kernel.string());
+    openspace::SpiceManager::ref().loadKernel(kernel);
 
     // Read the file
     HorizonsResult result = readHorizonsFile(filePath);
@@ -142,7 +142,7 @@ void testReadingHorizons(HorizonsType type, const std::filesystem::path& filePat
     CHECK(data[2].position.z == Catch::Approx(z2));
 
     // Clean up
-    openspace::SpiceManager::ref().unloadKernel(kernel.string());
+    openspace::SpiceManager::ref().unloadKernel(kernel);
     openspace::SpiceManager::deinitialize();
 }
 #endif // OPENSPACE_MODULE_SPACE_ENABLED
diff --git a/tests/test_lua_createsinglecolorimage.cpp b/tests/test_lua_createsinglecolorimage.cpp
index bd0f518523..d23ab2163c 100644
--- a/tests/test_lua_createsinglecolorimage.cpp
+++ b/tests/test_lua_createsinglecolorimage.cpp
@@ -42,20 +42,14 @@ TEST_CASE("CreateSingleColorImage: Create image and check return value",
         glm::dvec3(1.0, 0.0, 0.0)
     );
 
-    CHECK_THAT(
-        path.string(),
-        Catch::Matchers::ContainsSubstring("colorFile.ppm")
-    );
+    CHECK_THAT(path, Catch::Matchers::ContainsSubstring("colorFile.ppm"));
 }
 
 TEST_CASE("CreateSingleColorImage: Faulty color value (invalid values)",
           "[createsinglecolorimage]")
 {
     CHECK_THROWS_WITH(
-        createSingleColorImage(
-            "notCreatedColorFile",
-            glm::dvec3(255.0, 0.0, 0.0)
-        ).string(),
+        createSingleColorImage("notCreatedColorFile", glm::dvec3(255.0, 0.0, 0.0)),
         Catch::Matchers::Equals(
             "Invalid color. Expected three double values {r, g, b} in range 0 to 1"
         )
diff --git a/tests/test_rawvolumeio.cpp b/tests/test_rawvolumeio.cpp
index 6aa574be19..b890e0c6d6 100644
--- a/tests/test_rawvolumeio.cpp
+++ b/tests/test_rawvolumeio.cpp
@@ -46,11 +46,11 @@ TEST_CASE("RawVolumeIO: TinyInputOutput", "[rawvolumeio]") {
     const std::filesystem::path volumePath = absPath("${TESTDIR}/tinyvolume.rawvolume");
 
     // Write the 1x1x1 volume to disk
-    RawVolumeWriter<float> writer(volumePath.string());
+    RawVolumeWriter<float> writer(volumePath);
     writer.write(vol);
 
     // Read the 1x1x1 volume and make sure the value is the same.
-    RawVolumeReader<float> reader(volumePath.string(), dims);
+    RawVolumeReader<float> reader(volumePath, dims);
     std::unique_ptr<RawVolume<float>> storedVolume = reader.read();
     CHECK(storedVolume->get({ 0, 0, 0 }) == value);
 }
@@ -72,11 +72,11 @@ TEST_CASE("RawVolumeIO: BasicInputOutput", "[rawvolumeio]") {
     const std::filesystem::path volumePath = absPath("${TESTDIR}/basicvolume.rawvolume");
 
     // Write the 2x4x8 volume to disk
-    RawVolumeWriter<float> writer(volumePath.string());
+    RawVolumeWriter<float> writer(volumePath);
     writer.write(vol);
 
     // Read the 2x4x8 volume and make sure the value is the same.
-    RawVolumeReader<float> reader(volumePath.string(), dims);
+    RawVolumeReader<float> reader(volumePath, dims);
     const std::unique_ptr<RawVolume<float>> storedVolume = reader.read();
     vol.forEachVoxel([&value](const glm::uvec3& x, float v) {
         CHECK(v == value(x));
diff --git a/tests/test_scriptscheduler.cpp b/tests/test_scriptscheduler.cpp
index 0288c26e96..42ac160e85 100644
--- a/tests/test_scriptscheduler.cpp
+++ b/tests/test_scriptscheduler.cpp
@@ -37,7 +37,7 @@ TEST_CASE("ScriptScheduler: Simple Forward", "[scriptscheduler]") {
 
     SpiceManager::initialize();
     SpiceManager::ref().loadKernel(
-        absPath("${TESTDIR}/SpiceTest/spicekernels/naif0008.tls").string()
+        absPath("${TESTDIR}/SpiceTest/spicekernels/naif0008.tls")
     );
 
 
@@ -71,7 +71,7 @@ TEST_CASE("ScriptScheduler: Multiple Forward Single Jump", "[scriptscheduler]")
 
     SpiceManager::initialize();
     SpiceManager::ref().loadKernel(
-        absPath("${TESTDIR}/SpiceTest/spicekernels/naif0008.tls").string()
+        absPath("${TESTDIR}/SpiceTest/spicekernels/naif0008.tls")
     );
 
     std::vector<ScriptScheduler::ScheduledScript> scripts;
@@ -114,7 +114,7 @@ TEST_CASE("ScriptScheduler: Multiple Forward Ordering", "[scriptscheduler]") {
 
     SpiceManager::initialize();
     SpiceManager::ref().loadKernel(
-        absPath("${TESTDIR}/SpiceTest/spicekernels/naif0008.tls").string()
+        absPath("${TESTDIR}/SpiceTest/spicekernels/naif0008.tls")
     );
 
 
@@ -155,7 +155,7 @@ TEST_CASE("ScriptScheduler: Simple Backward", "[scriptscheduler]") {
 
     SpiceManager::initialize();
     SpiceManager::ref().loadKernel(
-        absPath("${TESTDIR}/SpiceTest/spicekernels/naif0008.tls").string()
+        absPath("${TESTDIR}/SpiceTest/spicekernels/naif0008.tls")
     );
 
     std::vector<ScriptScheduler::ScheduledScript> scripts;
@@ -188,7 +188,7 @@ TEST_CASE("ScriptScheduler: Multiple Backward Single Jump", "[scriptscheduler]")
 
     SpiceManager::initialize();
     SpiceManager::ref().loadKernel(
-        absPath("${TESTDIR}/SpiceTest/spicekernels/naif0008.tls").string()
+        absPath("${TESTDIR}/SpiceTest/spicekernels/naif0008.tls")
     );
 
 
@@ -232,7 +232,7 @@ TEST_CASE("ScriptScheduler: Multiple Backward Ordering", "[scriptscheduler]") {
 
     SpiceManager::initialize();
     SpiceManager::ref().loadKernel(
-        absPath("${TESTDIR}/SpiceTest/spicekernels/naif0008.tls").string()
+        absPath("${TESTDIR}/SpiceTest/spicekernels/naif0008.tls")
     );
 
     std::vector<ScriptScheduler::ScheduledScript> scripts;
@@ -271,7 +271,7 @@ TEST_CASE("ScriptScheduler: Empty", "[scriptscheduler]") {
 
     SpiceManager::initialize();
     SpiceManager::ref().loadKernel(
-        absPath("${TESTDIR}/SpiceTest/spicekernels/naif0008.tls").string()
+        absPath("${TESTDIR}/SpiceTest/spicekernels/naif0008.tls")
     );
 
     static const std::vector<double> TestTimes = {
@@ -303,7 +303,7 @@ TEST_CASE("ScriptScheduler: Forward Backwards", "[scriptscheduler]") {
 
     SpiceManager::initialize();
     SpiceManager::ref().loadKernel(
-        absPath("${TESTDIR}/SpiceTest/spicekernels/naif0008.tls").string()
+        absPath("${TESTDIR}/SpiceTest/spicekernels/naif0008.tls")
     );
 
     std::vector<ScriptScheduler::ScheduledScript> scripts;
@@ -350,7 +350,7 @@ TEST_CASE("ScriptScheduler: Rewind", "[scriptscheduler]") {
 
     SpiceManager::initialize();
     SpiceManager::ref().loadKernel(
-        absPath("${TESTDIR}/SpiceTest/spicekernels/naif0008.tls").string()
+        absPath("${TESTDIR}/SpiceTest/spicekernels/naif0008.tls")
     );
 
     std::vector<ScriptScheduler::ScheduledScript> scripts;
@@ -390,7 +390,7 @@ TEST_CASE("ScriptScheduler: CurrentTime", "[scriptscheduler]") {
 
     SpiceManager::initialize();
     SpiceManager::ref().loadKernel(
-        absPath("${TESTDIR}/SpiceTest/spicekernels/naif0008.tls").string()
+        absPath("${TESTDIR}/SpiceTest/spicekernels/naif0008.tls")
     );
 
     static const std::vector<double> TestValues = {
@@ -414,7 +414,7 @@ TEST_CASE("ScriptScheduler: All Scripts", "[scriptscheduler]") {
 
     SpiceManager::initialize();
     SpiceManager::ref().loadKernel(
-        absPath("${TESTDIR}/SpiceTest/spicekernels/naif0008.tls").string()
+        absPath("${TESTDIR}/SpiceTest/spicekernels/naif0008.tls")
     );
 
     std::vector<ScriptScheduler::ScheduledScript> scripts;
@@ -457,7 +457,7 @@ TEST_CASE("ScriptScheduler: Jump Equal", "[scriptscheduler]") {
 
     SpiceManager::initialize();
     SpiceManager::ref().loadKernel(
-        absPath("${TESTDIR}/SpiceTest/spicekernels/naif0008.tls").string()
+        absPath("${TESTDIR}/SpiceTest/spicekernels/naif0008.tls")
     );
 
     std::vector<ScriptScheduler::ScheduledScript> scripts;
@@ -497,7 +497,7 @@ TEST_CASE("ScriptScheduler: Same Time", "[scriptscheduler]") {
 
     SpiceManager::initialize();
     SpiceManager::ref().loadKernel(
-        absPath("${TESTDIR}/SpiceTest/spicekernels/naif0008.tls").string()
+        absPath("${TESTDIR}/SpiceTest/spicekernels/naif0008.tls")
     );
 
     std::vector<ScriptScheduler::ScheduledScript> scripts;
@@ -530,7 +530,7 @@ TEST_CASE("ScriptScheduler: Multi Inner Jump", "[scriptscheduler]") {
 
     SpiceManager::initialize();
     SpiceManager::ref().loadKernel(
-        absPath("${TESTDIR}/SpiceTest/spicekernels/naif0008.tls").string()
+        absPath("${TESTDIR}/SpiceTest/spicekernels/naif0008.tls")
     );
 
     std::vector<ScriptScheduler::ScheduledScript> scripts;
@@ -572,7 +572,7 @@ TEST_CASE(
 
     SpiceManager::initialize();
     SpiceManager::ref().loadKernel(
-        absPath("${TESTDIR}/SpiceTest/spicekernels/naif0008.tls").string()
+        absPath("${TESTDIR}/SpiceTest/spicekernels/naif0008.tls")
     );
 
     ScriptScheduler::ScheduledScript script1;
@@ -613,7 +613,7 @@ TEST_CASE("ScriptScheduler: Multiple Forward Ordering Multiple Load" "[scriptsch
 
     SpiceManager::initialize();
     SpiceManager::ref().loadKernel(
-        absPath("${TESTDIR}/SpiceTest/spicekernels/naif0008.tls").string()
+        absPath("${TESTDIR}/SpiceTest/spicekernels/naif0008.tls")
     );
 
     ScriptScheduler::ScheduledScript script1;
@@ -652,7 +652,7 @@ TEST_CASE(
 
     SpiceManager::initialize();
     SpiceManager::ref().loadKernel(
-        absPath("${TESTDIR}/SpiceTest/spicekernels/naif0008.tls").string()
+        absPath("${TESTDIR}/SpiceTest/spicekernels/naif0008.tls")
     );
 
     ScriptScheduler::ScheduledScript script1;
@@ -694,7 +694,7 @@ TEST_CASE(
 
     SpiceManager::initialize();
     SpiceManager::ref().loadKernel(
-        absPath("${TESTDIR}/SpiceTest/spicekernels/naif0008.tls").string()
+        absPath("${TESTDIR}/SpiceTest/spicekernels/naif0008.tls")
     );
 
     ScriptScheduler scheduler;
@@ -731,7 +731,7 @@ TEST_CASE("ScriptScheduler: Forward Backwards Multiple Load", "[scriptscheduler]
 
     SpiceManager::initialize();
     SpiceManager::ref().loadKernel(
-        absPath("${TESTDIR}/SpiceTest/spicekernels/naif0008.tls").string()
+        absPath("${TESTDIR}/SpiceTest/spicekernels/naif0008.tls")
     );
 
     ScriptScheduler::ScheduledScript script1;
@@ -774,7 +774,7 @@ TEST_CASE("ScriptScheduler: Rewind Multiple Load", "[scriptscheduler]") {
 
     SpiceManager::initialize();
     SpiceManager::ref().loadKernel(
-        absPath("${TESTDIR}/SpiceTest/spicekernels/naif0008.tls").string()
+        absPath("${TESTDIR}/SpiceTest/spicekernels/naif0008.tls")
     );
 
     ScriptScheduler::ScheduledScript script1;
@@ -811,7 +811,7 @@ TEST_CASE("ScriptScheduler: All Scripts Multiple Load", "[scriptscheduler]") {
 
     SpiceManager::initialize();
     SpiceManager::ref().loadKernel(
-        absPath("${TESTDIR}/SpiceTest/spicekernels/naif0008.tls").string()
+        absPath("${TESTDIR}/SpiceTest/spicekernels/naif0008.tls")
     );
 
     ScriptScheduler::ScheduledScript script1;
@@ -850,7 +850,7 @@ TEST_CASE("ScriptScheduler: All Scripts Mixed Load", "[scriptscheduler]") {
 
     SpiceManager::initialize();
     SpiceManager::ref().loadKernel(
-        absPath("${TESTDIR}/SpiceTest/spicekernels/naif0008.tls").string()
+        absPath("${TESTDIR}/SpiceTest/spicekernels/naif0008.tls")
     );
 
     ScriptScheduler::ScheduledScript script1;
diff --git a/tests/test_sgctedit.cpp b/tests/test_sgctedit.cpp
index 283cbcf3ac..6efb810e24 100644
--- a/tests/test_sgctedit.cpp
+++ b/tests/test_sgctedit.cpp
@@ -37,7 +37,7 @@
 using namespace openspace;
 
 namespace {
-    std::string stringify(const std::string& filename) {
+    std::string stringify(const std::filesystem::path& filename) {
         const std::ifstream myfile = std::ifstream(filename);
         std::stringstream buffer;
         buffer << myfile.rdbuf();
@@ -46,9 +46,7 @@ namespace {
 
     void attemptValidation(const std::string& cfgString) {
         const std::filesystem::path schemaDir = absPath("${TESTDIR}/../config/schema");
-        const std::string schemaString = stringify(
-            schemaDir.string() + "/sgcteditor.schema.json"
-        );
+        const std::string schemaString = stringify(schemaDir / "sgcteditor.schema.json");
         sgct::validateConfigAgainstSchema(cfgString, schemaString, schemaDir);
     }
 } // namespace
@@ -450,9 +448,9 @@ R"({
 
 TEST_CASE("SgctEdit: minimumVersion", "[sgctedit]") {
     const sgct::config::GeneratorVersion minVersion { "SgctWindowConfig", 1, 1 };
-    const std::string inputCfg =
-        absPath("${TESTDIR}/sgctedit/fails_minimum_version.json").string();
-    const sgct::config::GeneratorVersion ver = sgct::readConfigGenerator(inputCfg);
+    const std::filesystem::path cfg =
+        absPath("${TESTDIR}/sgctedit/fails_minimum_version.json");
+    const sgct::config::GeneratorVersion ver = sgct::readConfigGenerator(cfg);
     CHECK_FALSE(ver.versionCheck(minVersion));
 }
 
diff --git a/tests/test_spicemanager.cpp b/tests/test_spicemanager.cpp
index 0b9d8f72ab..2f8b2be770 100644
--- a/tests/test_spicemanager.cpp
+++ b/tests/test_spicemanager.cpp
@@ -37,54 +37,54 @@ namespace {
     // The remaining methods rely on multiple kernels, loaded as a SPICE 'meta-kernel'
     void loadMetaKernel() {
         const int k1 = SpiceManager::ref().loadKernel(
-            absPath("${TESTDIR}/SpiceTest/spicekernels/naif0008.tls").string()
+            absPath("${TESTDIR}/SpiceTest/spicekernels/naif0008.tls")
         );
         CHECK(k1 == 1);
 
         const int k2 = SpiceManager::ref().loadKernel(
-            absPath("${TESTDIR}/SpiceTest/spicekernels/cas00084.tsc").string()
+            absPath("${TESTDIR}/SpiceTest/spicekernels/cas00084.tsc")
         );
         CHECK(k2 == 2);
 
         const int k3 = SpiceManager::ref().loadKernel(
-            absPath("${TESTDIR}/SpiceTest/spicekernels/981005_PLTEPH-DE405S.bsp").string()
+            absPath("${TESTDIR}/SpiceTest/spicekernels/981005_PLTEPH-DE405S.bsp")
         );
         CHECK(k3 == 3);
 
         const int k4 = SpiceManager::ref().loadKernel(
-            absPath("${TESTDIR}/SpiceTest/spicekernels/020514_SE_SAT105.bsp").string()
+            absPath("${TESTDIR}/SpiceTest/spicekernels/020514_SE_SAT105.bsp")
         );
         CHECK(k4 == 4);
 
         const int k5 = SpiceManager::ref().loadKernel(
-            absPath("${TESTDIR}/SpiceTest/spicekernels/030201AP_SK_SM546_T45.bsp").string()
+            absPath("${TESTDIR}/SpiceTest/spicekernels/030201AP_SK_SM546_T45.bsp")
         );
         CHECK(k5 == 5);
 
         const int k6 = SpiceManager::ref().loadKernel(
-            absPath("${TESTDIR}/SpiceTest/spicekernels/cas_v37.tf").string()
+            absPath("${TESTDIR}/SpiceTest/spicekernels/cas_v37.tf")
         );
         CHECK(k6 == 6);
 
         const int k7 = SpiceManager::ref().loadKernel(
-            absPath("${TESTDIR}/SpiceTest/spicekernels/04135_04171pc_psiv2.bc").string()
+            absPath("${TESTDIR}/SpiceTest/spicekernels/04135_04171pc_psiv2.bc")
         );
         CHECK(k7 == 7);
 
         const int k8 = SpiceManager::ref().loadKernel(
-            absPath("${TESTDIR}/SpiceTest/spicekernels/cpck05Mar2004.tpc").string()
+            absPath("${TESTDIR}/SpiceTest/spicekernels/cpck05Mar2004.tpc")
         );
         CHECK(k8 == 8);
 
         const int k9 = SpiceManager::ref().loadKernel(
-            absPath("${TESTDIR}/SpiceTest/spicekernels/cas_iss_v09.ti").string()
+            absPath("${TESTDIR}/SpiceTest/spicekernels/cas_iss_v09.ti")
         );
         CHECK(k9 == 9);
     }
 
     int loadLSKKernel() {
         const int kernelID = SpiceManager::ref().loadKernel(
-            absPath("${TESTDIR}/SpiceTest/spicekernels/naif0008.tls").string()
+            absPath("${TESTDIR}/SpiceTest/spicekernels/naif0008.tls")
         );
         CHECK(kernelID == 1);
         return kernelID;
@@ -92,7 +92,7 @@ namespace {
 
     int loadPCKKernel() {
         const int kernelID = SpiceManager::ref().loadKernel(
-            absPath("${TESTDIR}/SpiceTest/spicekernels/cpck05Mar2004.tpc").string()
+            absPath("${TESTDIR}/SpiceTest/spicekernels/cpck05Mar2004.tpc")
         );
         CHECK(kernelID == 1);
         return kernelID;
@@ -160,7 +160,7 @@ TEST_CASE("SpiceManager: Unload Kernel String", "[spicemanager]") {
 
     // unload using string keyword
     SpiceManager::ref().unloadKernel(
-        absPath("${TESTDIR}/SpiceTest/spicekernels/naif0008.tls").string()
+        absPath("${TESTDIR}/SpiceTest/spicekernels/naif0008.tls")
     );
 
     found = SPICEFALSE;
diff --git a/tests/test_timequantizer.cpp b/tests/test_timequantizer.cpp
index 1a82d0137e..25df8bee32 100644
--- a/tests/test_timequantizer.cpp
+++ b/tests/test_timequantizer.cpp
@@ -36,7 +36,7 @@ using namespace openspace;
 namespace {
     int loadLSKKernel() {
         const int kernelID = openspace::SpiceManager::ref().loadKernel(
-            absPath("${TESTDIR}/SpiceTest/spicekernels/naif0008.tls").string()
+            absPath("${TESTDIR}/SpiceTest/spicekernels/naif0008.tls")
         );
         CHECK(kernelID == 1);
         return kernelID;

From f8f587ed1d8195c6e4bd772e3cc242df0d8a97be Mon Sep 17 00:00:00 2001
From: Alexander Bock <alexander.bock@liu.se>
Date: Sun, 7 Apr 2024 01:22:06 +0200
Subject: [PATCH 367/701] Jenkins compile fix

---
 apps/OpenSpace/ext/sgct                   | 2 +-
 ext/ghoul                                 | 2 +-
 support/coding/codegen                    | 2 +-
 tests/test_lua_createsinglecolorimage.cpp | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/apps/OpenSpace/ext/sgct b/apps/OpenSpace/ext/sgct
index 5ffaa631d3..1be7e65ef1 160000
--- a/apps/OpenSpace/ext/sgct
+++ b/apps/OpenSpace/ext/sgct
@@ -1 +1 @@
-Subproject commit 5ffaa631d35bed3ea6b94ed4ff3c3a766bc00d9f
+Subproject commit 1be7e65ef1d64fdbf28c86b468ac0ead59ab04a6
diff --git a/ext/ghoul b/ext/ghoul
index 0ce1437b33..6d7fcb22d1 160000
--- a/ext/ghoul
+++ b/ext/ghoul
@@ -1 +1 @@
-Subproject commit 0ce1437b338cd83248925e9ed84d85bb615ad8b4
+Subproject commit 6d7fcb22d14b9aefa2f2cb02da24684d16042641
diff --git a/support/coding/codegen b/support/coding/codegen
index dd4812b4ea..f2f263d86d 160000
--- a/support/coding/codegen
+++ b/support/coding/codegen
@@ -1 +1 @@
-Subproject commit dd4812b4ea775fa7b208474900b98a54603edfa9
+Subproject commit f2f263d86de2c9367ce8d2236b2eb854d5147b76
diff --git a/tests/test_lua_createsinglecolorimage.cpp b/tests/test_lua_createsinglecolorimage.cpp
index d23ab2163c..b4ac72ef88 100644
--- a/tests/test_lua_createsinglecolorimage.cpp
+++ b/tests/test_lua_createsinglecolorimage.cpp
@@ -42,7 +42,7 @@ TEST_CASE("CreateSingleColorImage: Create image and check return value",
         glm::dvec3(1.0, 0.0, 0.0)
     );
 
-    CHECK_THAT(path, Catch::Matchers::ContainsSubstring("colorFile.ppm"));
+    CHECK_THAT(path.string(), Catch::Matchers::ContainsSubstring("colorFile.ppm"));
 }
 
 TEST_CASE("CreateSingleColorImage: Faulty color value (invalid values)",

From 3d62571c442d392796f8ed21c8d3e86aa59f3ebf Mon Sep 17 00:00:00 2001
From: Alexander Bock <alexander.bock@liu.se>
Date: Sun, 7 Apr 2024 01:53:16 +0200
Subject: [PATCH 368/701] Remove warning on Jenkins

---
 .../launcher/src/sgctedit/settingswidget.cpp  |  6 ++--
 apps/OpenSpace/main.cpp                       | 28 -------------------
 ext/ghoul                                     |  2 +-
 .../pointcloud/renderablepointcloud.cpp       | 16 +++++------
 modules/globebrowsing/src/renderableglobe.cpp |  8 +-----
 modules/globebrowsing/src/timequantizer.cpp   |  4 +--
 modules/volume/volumegridtype.cpp             |  6 ++--
 modules/volume/volumegridtype.h               |  2 +-
 modules/webbrowser/src/screenspacebrowser.cpp |  2 +-
 9 files changed, 20 insertions(+), 54 deletions(-)

diff --git a/apps/OpenSpace/ext/launcher/src/sgctedit/settingswidget.cpp b/apps/OpenSpace/ext/launcher/src/sgctedit/settingswidget.cpp
index 7244a7d961..75a8a2a6c5 100644
--- a/apps/OpenSpace/ext/launcher/src/sgctedit/settingswidget.cpp
+++ b/apps/OpenSpace/ext/launcher/src/sgctedit/settingswidget.cpp
@@ -32,11 +32,11 @@
 SettingsWidget::SettingsWidget(sgct::quat orientation, QWidget* parent)
     : QWidget(parent)
     , _orientationValue(std::move(orientation))
-    , _firstWindowGraphicsSelection(new QComboBox)
-    , _firstWindowSelectionLayout(new QHBoxLayout)
-    ,_showUiOnFirstWindow(new QCheckBox(
+    , _showUiOnFirstWindow(new QCheckBox(
         "Show user interface only on first window using graphics:"
     ))
+    , _firstWindowGraphicsSelection(new QComboBox)
+    , _firstWindowSelectionLayout(new QHBoxLayout)
 {
     QBoxLayout* layout = new QVBoxLayout(this);
     layout->setContentsMargins(0, 0, 0, 0);
diff --git a/apps/OpenSpace/main.cpp b/apps/OpenSpace/main.cpp
index 79936ec5b8..fdba7c8016 100644
--- a/apps/OpenSpace/main.cpp
+++ b/apps/OpenSpace/main.cpp
@@ -994,34 +994,6 @@ void setSgctDelegateFunctions() {
     };
 }
 
-void checkCommandLineForSettings(int& argc, char** argv, bool& hasSGCT, bool& hasProfile,
-                                 std::string& sgctFunctionName)
-{
-    for (int i = 1; i < argc; i++) {
-        const std::string arg = argv[i];
-        if (arg == "-c" || arg == "--config") {
-            std::string p = ((i + 1) < argc) ? argv[i + 1] : "";
-            p.erase(std::remove_if(p.begin(), p.end(), ::isspace), p.end());
-
-            const std::string sgctAssignment = "SGCTConfig=";
-            const size_t findSgct = p.find(sgctAssignment);
-            const size_t findBracket = p.find('}');
-            if (findSgct != std::string::npos) {
-                if (findBracket != std::string::npos) {
-                    sgctFunctionName = arg.substr(
-                        findSgct + sgctAssignment.length(),
-                        findBracket - findSgct
-                    );
-                }
-                hasSGCT = true;
-            }
-            if (p.find("Profile=") != std::string::npos) {
-                hasProfile = true;
-            }
-        }
-    }
-}
-
 std::string setWindowConfigPresetForGui(const std::string& labelFromCfgFile,
                                         bool haveCliSGCTConfig)
 {
diff --git a/ext/ghoul b/ext/ghoul
index 6d7fcb22d1..689b1cec8b 160000
--- a/ext/ghoul
+++ b/ext/ghoul
@@ -1 +1 @@
-Subproject commit 6d7fcb22d14b9aefa2f2cb02da24684d16042641
+Subproject commit 689b1cec8ba22530b3401df06697388ef9e1e26e
diff --git a/modules/base/rendering/pointcloud/renderablepointcloud.cpp b/modules/base/rendering/pointcloud/renderablepointcloud.cpp
index c43cd3ff3f..8d8ed3aef9 100644
--- a/modules/base/rendering/pointcloud/renderablepointcloud.cpp
+++ b/modules/base/rendering/pointcloud/renderablepointcloud.cpp
@@ -548,13 +548,13 @@ RenderablePointCloud::Texture::Texture()
 
 RenderablePointCloud::Fading::Fading(const ghoul::Dictionary& dictionary)
     : properties::PropertyOwner({ "Fading", "Fading", "" })
-    , enabled(EnableDistanceFadeInfo, false)
     , fadeInDistances(
         FadeInDistancesInfo,
         glm::vec2(0.f),
         glm::vec2(0.f),
         glm::vec2(100.f)
     )
+    , enabled(EnableDistanceFadeInfo, false)
     , invert(InvertFadeInfo, false)
 {
     const Parameters p = codegen::bake<Parameters>(dictionary);
@@ -581,13 +581,13 @@ RenderablePointCloud::Fading::Fading(const ghoul::Dictionary& dictionary)
 
 RenderablePointCloud::RenderablePointCloud(const ghoul::Dictionary& dictionary)
     : Renderable(dictionary)
-    , _drawElements(DrawElementsInfo, true)
+    , _sizeSettings(dictionary)
+    , _colorSettings(dictionary)
+    , _fading(dictionary)
     , _useAdditiveBlending(UseAdditiveBlendingInfo, true)
+    , _drawElements(DrawElementsInfo, true)
     , _renderOption(RenderOptionInfo, properties::OptionProperty::DisplayType::Dropdown)
     , _nDataPoints(NumShownDataPointsInfo, 0)
-    , _fading(dictionary)
-    , _colorSettings(dictionary)
-    , _sizeSettings(dictionary)
 {
     ZoneScoped;
 
@@ -1015,7 +1015,7 @@ void RenderablePointCloud::fillAndUploadTextureLayer(unsigned int arrayIndex,
 }
 
 void RenderablePointCloud::generateArrayTextures() {
-    using Entry = std::pair<TextureFormat, std::vector<size_t>>;
+    using Entry = std::pair<const TextureFormat, std::vector<size_t>>;
     unsigned int arrayIndex = 0;
     for (const Entry& e : _textureMapByFormat) {
         glm::uvec2 res = e.first.resolution;
@@ -1571,8 +1571,8 @@ gl::GLenum RenderablePointCloud::internalGlFormat(bool useAlpha) const {
 }
 
 ghoul::opengl::Texture::Format RenderablePointCloud::glFormat(bool useAlpha) const {
-    using Texture = ghoul::opengl::Texture;
-    return useAlpha ? Texture::Format::RGBA : Texture::Format::RGB;
+    using Tex = ghoul::opengl::Texture;
+    return useAlpha ? Tex::Format::RGBA : Tex::Format::RGB;
 }
 
 bool operator==(const TextureFormat& l, const TextureFormat& r) {
diff --git a/modules/globebrowsing/src/renderableglobe.cpp b/modules/globebrowsing/src/renderableglobe.cpp
index 4cedebc51a..d9188dafd6 100644
--- a/modules/globebrowsing/src/renderableglobe.cpp
+++ b/modules/globebrowsing/src/renderableglobe.cpp
@@ -553,13 +553,7 @@ glm::dvec3 directionToLightSource(const glm::dvec3& pos, SceneGraphNode* lightSo
     SceneGraphNode* node =
         lightSource ? lightSource : sceneGraph()->sceneGraphNode("Sun");
 
-    if (lightSource) {
-        return lightSource->worldPosition() - pos;
-    }
-    else {
-        const glm::dvec3 dir = length(pos) > 0.0 ? glm::normalize(-pos) : glm::dvec3(0.0);
-        return dir;
-    }
+    return glm::normalize(node->worldPosition() - pos);
 }
 
 } // namespace
diff --git a/modules/globebrowsing/src/timequantizer.cpp b/modules/globebrowsing/src/timequantizer.cpp
index 31af4b3b96..22a9cc7840 100644
--- a/modules/globebrowsing/src/timequantizer.cpp
+++ b/modules/globebrowsing/src/timequantizer.cpp
@@ -333,9 +333,9 @@ void DateTime::setSecond(int s) {
 
 TimeQuantizer::TimeQuantizer(std::string start, std::string end,
                              const std::string& resolution)
-    : _start(start)
+    : _resolution(parseTimeResolutionStr(resolution))
+    , _start(start)
     , _timerange(std::move(start), std::move(end))
-    , _resolution(parseTimeResolutionStr(resolution))
 {
     verifyStartTimeRestrictions();
 }
diff --git a/modules/volume/volumegridtype.cpp b/modules/volume/volumegridtype.cpp
index 57ced6d10f..f301ed671b 100644
--- a/modules/volume/volumegridtype.cpp
+++ b/modules/volume/volumegridtype.cpp
@@ -26,9 +26,9 @@
 
 namespace openspace::volume {
 
-InvalidGridTypeError::InvalidGridTypeError(std::string gridType)
-    : RuntimeError("Invalid grid type: '" + gridType + "'")
-    , gridType(std::move(gridType))
+InvalidGridTypeError::InvalidGridTypeError(std::string gridType_)
+    : RuntimeError("Invalid grid type: '" + gridType_ + "'")
+    , gridType(std::move(gridType_))
 {}
 
 VolumeGridType parseGridType(const std::string& gridType) {
diff --git a/modules/volume/volumegridtype.h b/modules/volume/volumegridtype.h
index f652bd92da..3c41faa053 100644
--- a/modules/volume/volumegridtype.h
+++ b/modules/volume/volumegridtype.h
@@ -36,7 +36,7 @@ enum class VolumeGridType : int {
 };
 
 struct InvalidGridTypeError : public ghoul::RuntimeError {
-    explicit InvalidGridTypeError(std::string gridType);
+    explicit InvalidGridTypeError(std::string gridType_);
 
     std::string gridType;
 };
diff --git a/modules/webbrowser/src/screenspacebrowser.cpp b/modules/webbrowser/src/screenspacebrowser.cpp
index 026c6f9f9a..5ca4bfbdb0 100644
--- a/modules/webbrowser/src/screenspacebrowser.cpp
+++ b/modules/webbrowser/src/screenspacebrowser.cpp
@@ -83,9 +83,9 @@ ScreenSpaceBrowser::ScreenSpaceBrowser(const ghoul::Dictionary& dictionary)
     : ScreenSpaceRenderable(dictionary)
     , _dimensions(DimensionsInfo, glm::vec2(0.f), glm::vec2(0.f), glm::vec2(3000.f))
     , _renderHandler(new ScreenSpaceRenderHandler)
-    , _keyboardHandler(new WebKeyboardHandler)
     , _url(UrlInfo)
     , _reload(ReloadInfo)
+    , _keyboardHandler(new WebKeyboardHandler)
 {
     const Parameters p = codegen::bake<Parameters>(dictionary);
 

From db2b2c1ca0b357549232e603cd2068807086e89d Mon Sep 17 00:00:00 2001
From: Alexander Bock <alexander.bock@liu.se>
Date: Sun, 7 Apr 2024 12:18:59 +0200
Subject: [PATCH 369/701] Update compilation requirements

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 4362c8c955..dcec2c1483 100644
--- a/README.md
+++ b/README.md
@@ -38,7 +38,7 @@ This repository contains the source code and example profiles for OpenSpace, but
 
 Requirements for compiling are:
  - CMake version 3.25 or above
- - C++ compiler supporting C++20 (MSVC 19.31, GCC11, Clang14, AppleClang 13.1.6)
+ - C++ compiler supporting C++20/C++23 (MSVC 19.39, GCC13, Clang17, AppleClang 15.0.0)
  - [Boost](http://www.boost.org/)
  - [Qt](http://www.qt.io/download)
 

From 51c26454f76c03e6af0d727a4640af65d5cc43a5 Mon Sep 17 00:00:00 2001
From: Alexander Bock <alexander.bock@liu.se>
Date: Sun, 7 Apr 2024 17:11:08 +0200
Subject: [PATCH 370/701] Fix Euclid asset (closes #3165)

---
 .../assets/scene/solarsystem/telescopes/euclid/trails.asset | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/data/assets/scene/solarsystem/telescopes/euclid/trails.asset b/data/assets/scene/solarsystem/telescopes/euclid/trails.asset
index 9f54671974..659d243239 100644
--- a/data/assets/scene/solarsystem/telescopes/euclid/trails.asset
+++ b/data/assets/scene/solarsystem/telescopes/euclid/trails.asset
@@ -63,7 +63,7 @@ local EuclidTrailOrbit = {
     Translation = {
       Type = "SpiceTranslation",
       Target = kernels.ID.Euclid,
-      Observer = l2.ID.L2,
+      Observer = transforms.ID.L2,
       Frame = coreKernels.Frame.Galactic
     },
     Color = { 0.863, 0.0, 0.902 },
@@ -90,8 +90,8 @@ local EuclidTrailCoRevOrbit = {
     Translation = {
       Type = "SpiceTranslation",
       Target = kernels.ID.Euclid,
-      Observer = l2.ID.L2,
-      Frame = l2.Frame.L2Corevolving
+      Observer = transforms.ID.L2,
+      Frame = transforms.Frame.L2Corevolving
     },
     Color = { 0.863, 0.0, 0.902 },
     Period = 182.621099, -- About 6 months

From 88decaf414d4a796d11a0b189320f8eedba0322e Mon Sep 17 00:00:00 2001
From: Alexander Bock <alexander.bock@liu.se>
Date: Sun, 7 Apr 2024 17:29:01 +0200
Subject: [PATCH 371/701] Remove the ability to have optional parameters in the
 beginning of Lua functions (closes #3151). Make the `goToGeo` and `flyToGeo`
 globe first parameter required

---
 .../globebrowsing/globebrowsingmodule_lua.inl | 38 +++++++++----------
 support/coding/codegen                        |  2 +-
 2 files changed, 20 insertions(+), 20 deletions(-)

diff --git a/modules/globebrowsing/globebrowsingmodule_lua.inl b/modules/globebrowsing/globebrowsingmodule_lua.inl
index 956823ea4f..470437ae95 100644
--- a/modules/globebrowsing/globebrowsingmodule_lua.inl
+++ b/modules/globebrowsing/globebrowsingmodule_lua.inl
@@ -279,24 +279,24 @@ namespace {
 
 /**
  * Go to geographic coordinates of a globe. The first (optional) argument is the
- * identifier of a scene graph node that has a RenderableGlobe attached. If no globe is
- * passed in, the current anchor will be used. The second argument is latitude and the
- * third is longitude (degrees). North and East are expressed as positive angles, while
- * South and West are negative. The optional fourh argument is the altitude in meters. If
- * no altitude is provided, the altitude will be kept as the current distance to the
- * surface of the specified globe.
+ * identifier of a scene graph node that has a RenderableGlobe attached. If the name of
+ * the globe is empty, the current anchor will be used. The second argument is latitude
+ * and the third is longitude (degrees). North and East are expressed as positive angles,
+ * while South and West are negative. The optional fourth argument is the altitude in
+ * meters. If no altitude is provided, the altitude will be kept as the current distance
+ * to the surface of the specified globe.
  */
-[[codegen::luawrap]] void goToGeo(std::optional<std::string> globe, double latitude,
-                                  double longitude, std::optional<double> altitude)
+[[codegen::luawrap]] void goToGeo(std::string globe, double latitude, double longitude,
+                                  std::optional<double> altitude)
 {
     using namespace openspace;
     using namespace globebrowsing;
 
     const SceneGraphNode* n;
-    if (globe.has_value()) {
-        n = sceneGraphNode(*globe);
+    if (!globe.empty()) {
+        n = sceneGraphNode(globe);
         if (!n) {
-            throw ghoul::lua::LuaError("Unknown globe name: " + *globe);
+            throw ghoul::lua::LuaError("Unknown globe name: " + globe);
         }
     }
     else {
@@ -334,13 +334,13 @@ namespace {
 /**
  * Fly the camera to geographic coordinates of a globe, using the path navigation system.
  * The first (optional) argument is the identifier of a scene graph node with a
- * RenderableGlobe. If no globe is passed in, the current anchor will be used. The second
- * and third argument is latitude and longitude (degrees). The fourth argument is the
- * altitude, in meters. The last two optional arguments are: a bool specifying whether the
- * up vector at the target position should be set to the globe's North vector, and a
+ * RenderableGlobe. If the globe name is empty, the current anchor will be used. The
+ * second and third argument is latitude and longitude (degrees). The fourth argument is
+ * the altitude, in meters. The last two optional arguments are: a bool specifying whether
+ * the up vector at the target position should be set to the globe's North vector, and a
  * duration for the motion, in seconds. Either of the two can be left out.
  */
-[[codegen::luawrap]] void flyToGeo(std::optional<std::string> globe, double latitude,
+[[codegen::luawrap]] void flyToGeo(std::string globe, double latitude,
                                    double longitude, double altitude,
                                    std::optional<double> duration,
                                    std::optional<bool> shouldUseUpVector)
@@ -349,10 +349,10 @@ namespace {
     using namespace globebrowsing;
 
     const SceneGraphNode* n;
-    if (globe.has_value()) {
-        n = sceneGraphNode(*globe);
+    if (!globe.empty()) {
+        n = sceneGraphNode(globe);
         if (!n) {
-            throw ghoul::lua::LuaError("Unknown globe name: " + *globe);
+            throw ghoul::lua::LuaError("Unknown globe name: " + globe);
         }
     }
     else {
diff --git a/support/coding/codegen b/support/coding/codegen
index f2f263d86d..627436584f 160000
--- a/support/coding/codegen
+++ b/support/coding/codegen
@@ -1 +1 @@
-Subproject commit f2f263d86de2c9367ce8d2236b2eb854d5147b76
+Subproject commit 627436584fe0b78bc915654e7648bdaf67f26eb4

From 2a8852179515b22525dea74fc95262290bb59ee9 Mon Sep 17 00:00:00 2001
From: Alexander Bock <alexander.bock@liu.se>
Date: Sun, 7 Apr 2024 17:44:21 +0200
Subject: [PATCH 372/701] Properly disable appropriate code when compiled
 without globebrowsing support (closes #3146)

---
 modules/imgui/src/guiglobebrowsingcomponent.cpp | 6 ++++++
 modules/server/src/topics/cameratopic.cpp       | 9 +++++++++
 2 files changed, 15 insertions(+)

diff --git a/modules/imgui/src/guiglobebrowsingcomponent.cpp b/modules/imgui/src/guiglobebrowsingcomponent.cpp
index fa197fb116..5492fdd6b0 100644
--- a/modules/imgui/src/guiglobebrowsingcomponent.cpp
+++ b/modules/imgui/src/guiglobebrowsingcomponent.cpp
@@ -24,8 +24,10 @@
 
 #include <modules/imgui/include/guiglobebrowsingcomponent.h>
 
+#ifdef OPENSPACE_MODULE_SPACE_ENABLED
 #include <modules/globebrowsing/globebrowsingmodule.h>
 #include <modules/globebrowsing/src/renderableglobe.h>
+#endif // OPENSPACE_MODULE_SPACE_ENABLED
 #include <modules/imgui/include/imgui_include.h>
 #include <openspace/engine/globals.h>
 #include <openspace/engine/moduleengine.h>
@@ -50,6 +52,7 @@ GuiGlobeBrowsingComponent::GuiGlobeBrowsingComponent()
 {}
 
 void GuiGlobeBrowsingComponent::render() {
+#ifdef OPENSPACE_MODULE_SPACE_ENABLED
     GlobeBrowsingModule* module = global::moduleEngine->module<GlobeBrowsingModule>();
     using UrlInfo = GlobeBrowsingModule::UrlInfo;
     using Capabilities = GlobeBrowsingModule::Capabilities;
@@ -368,6 +371,9 @@ void GuiGlobeBrowsingComponent::render() {
         ImGui::PopID();
     }
     ImGui::Columns(1);
+#else // ^^^ OPENSPACE_MODULE_SPACE_ENABLED ||| !OPENSPACE_MODULE_SPACE_ENABLED vvv
+    ImGui::Text("%s", "OpenSpace compiled without GlobeBrowsing support");
+#endif // OPENSPACE_MODULE_SPACE_ENABLED
 }
 
 } // namespace openspace::gui
diff --git a/modules/server/src/topics/cameratopic.cpp b/modules/server/src/topics/cameratopic.cpp
index 9e10c80518..857bf1f3f0 100644
--- a/modules/server/src/topics/cameratopic.cpp
+++ b/modules/server/src/topics/cameratopic.cpp
@@ -24,7 +24,9 @@
 
 #include <modules/server/include/topics/cameratopic.h>
 
+#ifdef OPENSPACE_MODULE_SPACE_ENABLED
 #include <modules/globebrowsing/globebrowsingmodule.h>
+#endif // OPENSPACE_MODULE_SPACE_ENABLED
 #include <modules/server/include/connection.h>
 #include <modules/server/servermodule.h>
 #include <openspace/engine/moduleengine.h>
@@ -79,6 +81,7 @@ void CameraTopic::handleJson(const nlohmann::json& json) {
 }
 
 void CameraTopic::sendCameraData() {
+#ifdef OPENSPACE_MODULE_SPACE_ENABLED
     GlobeBrowsingModule* module = global::moduleEngine->module<GlobeBrowsingModule>();
     glm::dvec3 position = module->geoPosition();
     std::pair<double, std::string_view> altSimplified = simplifyDistance(position.z);
@@ -91,6 +94,12 @@ void CameraTopic::sendCameraData() {
     };
 
     _connection->sendJson(wrappedPayload(jsonData));
+#else // ^^^ OPENSPACE_MODULE_SPACE_ENABLED ||| !OPENSPACE_MODULE_SPACE_ENABLED vvv
+    LWARNINGC(
+        "CameraTopic",
+        "Cannot send camera data, compiled without globebrowsing support"
+    );
+#endif // OPENSPACE_MODULE_SPACE_ENABLED
 }
 
 } // namespace openspace

From bd8200030880bfc987eb3a77964a6756851ddbfb Mon Sep 17 00:00:00 2001
From: Gene Payne <payne.gene@gmail.com>
Date: Sun, 7 Apr 2024 10:38:17 -0600
Subject: [PATCH 373/701] Allow sessionrecording to write a file outside of
 user/recordings/ (#3150)

---
 src/interaction/sessionrecording.cpp | 21 +++++++++++++++------
 1 file changed, 15 insertions(+), 6 deletions(-)

diff --git a/src/interaction/sessionrecording.cpp b/src/interaction/sessionrecording.cpp
index 388dfaa59c..68b8367427 100644
--- a/src/interaction/sessionrecording.cpp
+++ b/src/interaction/sessionrecording.cpp
@@ -157,11 +157,6 @@ void SessionRecording::removeTrailingPathSlashes(std::string& filename) const {
 }
 
 bool SessionRecording::handleRecordingFile(std::string filenameIn) {
-    if (isPath(filenameIn)) {
-        LERROR("Recording filename must not contain path (/) elements");
-        return false;
-    }
-
     if (_recordingDataMode == DataMode::Binary) {
         if (hasFileExtension(filenameIn, FileExtensionAscii)) {
             LERROR("Specified filename for binary recording has ascii file extension");
@@ -181,7 +176,21 @@ bool SessionRecording::handleRecordingFile(std::string filenameIn) {
         }
     }
 
-    std::filesystem::path absFilename = absPath("${RECORDINGS}/" + filenameIn);
+    std::filesystem::path absFilename = filenameIn;
+    if (absFilename.parent_path().empty() || absFilename.parent_path() == absFilename) {
+        absFilename = absPath("${RECORDINGS}/" + filenameIn);
+    }
+    else if (absFilename.parent_path().is_relative()) {
+        LERROR("If path is provided with the filename, then it must be an absolute path");
+        return false;
+    }
+    else if (!std::filesystem::exists(absFilename.parent_path())) {
+        LERROR(std::format(
+            "The recording filename path '{}' is not a valid location in the filesytem",
+            absFilename.parent_path().string()
+        ));
+        return false;
+    }
 
     if (std::filesystem::is_regular_file(absFilename)) {
         LERROR(std::format(

From 6f4f8bbd0b06dc0b060faacfdca7e23e0f19369a Mon Sep 17 00:00:00 2001
From: Alexander Bock <mail@alexanderbock.eu>
Date: Mon, 8 Apr 2024 08:59:53 +0200
Subject: [PATCH 374/701] Accurately report when a profile-requested asset does
 not exist

---
 src/scene/assetmanager.cpp | 15 +++++++++++----
 1 file changed, 11 insertions(+), 4 deletions(-)

diff --git a/src/scene/assetmanager.cpp b/src/scene/assetmanager.cpp
index 0ce4a6109a..419ec68e92 100644
--- a/src/scene/assetmanager.cpp
+++ b/src/scene/assetmanager.cpp
@@ -904,10 +904,17 @@ Asset* AssetManager::retrieveAsset(const std::filesystem::path& path,
     }
 
     if (!std::filesystem::is_regular_file(path)) {
-        throw ghoul::RuntimeError(std::format(
-            "Could not find asset file '{}' requested by '{}'",
-            path, retriever
-        ));
+        if (retriever.empty()) {
+            throw ghoul::RuntimeError(std::format(
+                "Could not find asset file '{}' requested by profile", path
+            ));
+        }
+        else {
+            throw ghoul::RuntimeError(std::format(
+                "Could not find asset file '{}' requested by '{}'",
+                path, retriever
+            ));
+        }
     }
     auto asset = std::make_unique<Asset>(*this, path, explicitEnable);
     Asset* res = asset.get();

From ee6b9a5ed848e162b511504b912b8478df0d7d5b Mon Sep 17 00:00:00 2001
From: Alexander Bock <mail@alexanderbock.eu>
Date: Mon, 8 Apr 2024 09:02:54 +0200
Subject: [PATCH 375/701] Prevent crash when rendering globes when the Sun node
 is not loaded in the scene

---
 modules/globebrowsing/src/renderableglobe.cpp | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/modules/globebrowsing/src/renderableglobe.cpp b/modules/globebrowsing/src/renderableglobe.cpp
index d9188dafd6..42127e1c38 100644
--- a/modules/globebrowsing/src/renderableglobe.cpp
+++ b/modules/globebrowsing/src/renderableglobe.cpp
@@ -553,7 +553,13 @@ glm::dvec3 directionToLightSource(const glm::dvec3& pos, SceneGraphNode* lightSo
     SceneGraphNode* node =
         lightSource ? lightSource : sceneGraph()->sceneGraphNode("Sun");
 
-    return glm::normalize(node->worldPosition() - pos);
+    if (node) {
+        return node->worldPosition() - pos;
+    }
+    else {
+        const glm::dvec3 dir = length(pos) > 0.0 ? glm::normalize(-pos) : glm::dvec3(0.0);
+        return dir;
+    }
 }
 
 } // namespace

From 731b6a5407b61856a1fdc958445a58e30790e4eb Mon Sep 17 00:00:00 2001
From: Emma Broman <emma.broman@liu.se>
Date: Mon, 8 Apr 2024 10:07:23 +0200
Subject: [PATCH 376/701] Fix broken interpolated points

Broke from moving dataset loading to initialise in 3f8bff5a625835343d23ee3ed40e3f19d77d28a5, and resulted in a crash..
---
 .../renderableinterpolatedpoints.cpp          | 47 ++++++++++---------
 .../pointcloud/renderableinterpolatedpoints.h |  3 ++
 2 files changed, 28 insertions(+), 22 deletions(-)

diff --git a/modules/base/rendering/pointcloud/renderableinterpolatedpoints.cpp b/modules/base/rendering/pointcloud/renderableinterpolatedpoints.cpp
index 26a4aed43d..be13a0ab67 100644
--- a/modules/base/rendering/pointcloud/renderableinterpolatedpoints.cpp
+++ b/modules/base/rendering/pointcloud/renderableinterpolatedpoints.cpp
@@ -168,7 +168,7 @@ documentation::Documentation RenderableInterpolatedPoints::Documentation() {
 RenderableInterpolatedPoints::Interpolation::Interpolation()
     : properties::PropertyOwner({ "Interpolation", "Interpolation", "" })
     , value(InterpolationValueInfo, 0.f, 0.f, 1.f)
-    , nSteps(StepsInfo)
+    , nSteps(StepsInfo, 1)
     , goToNextStep(JumpToNextInfo)
     , goToPrevStep(JumpToPrevInfo)
     , interpolateToNextStep(InterpolateToNextInfo)
@@ -268,23 +268,6 @@ RenderableInterpolatedPoints::RenderableInterpolatedPoints(
         );
     }
 
-    unsigned int nObjects = static_cast<unsigned int>(p.numberOfObjects);
-
-    // At this point, the dataset has been loaded and the number of points computed. We
-    // need to recompute them and compute how many steps the number of points
-    // corresponded to
-
-    if (_nDataPoints % nObjects != 0) {
-        LERROR(std::format(
-            "Mismatch between provided number of data entries and the specified number "
-            "of points. Expected the number of entries in the data file '{}' to be "
-            "evenly divisible by the number of points", _dataFile
-        ));
-    }
-
-    _interpolation.nSteps = _nDataPoints / nObjects;
-    _interpolation.value.setMaxValue(static_cast<float>(_interpolation.nSteps - 1));
-
     _interpolation.value.onChange([this]() {
         bool passedAKnot =
             glm::ceil(_interpolation.value) != glm::ceil(_prevInterpolationValue);
@@ -300,10 +283,7 @@ RenderableInterpolatedPoints::RenderableInterpolatedPoints(
         _shouldReinitializeBufferdata = true;
     });
 
-    // This property is mostly for show in the UI, but also used to tell how many points
-    // should be rendered. So make sure it is updated once we know the number of
-    // interpolation steps
-    _nDataPoints = nObjects;
+    _nObjectsInDataset = static_cast<unsigned int>(p.numberOfObjects);
 
     if (_skipFirstDataPoint) {
         LWARNING(
@@ -314,6 +294,29 @@ RenderableInterpolatedPoints::RenderableInterpolatedPoints(
     }
 }
 
+void RenderableInterpolatedPoints::initialize() {
+    RenderablePointCloud::initialize();
+
+    // At this point, the dataset has been loaded and we know how many data points it
+    // contains => we can compute the number of interpolation steps
+    if (_nDataPoints % _nObjectsInDataset != 0) {
+        LERROR(std::format(
+            "Mismatch between provided number of data entries and the specified number "
+            "of points. Expected the number of entries in the data file '{}' to be "
+            "evenly divisible by the number of objects", _dataFile
+        ));
+    }
+
+    if (_nObjectsInDataset > 0) {
+        _interpolation.nSteps = _nDataPoints / _nObjectsInDataset;
+    }
+    _interpolation.value.setMaxValue(static_cast<float>(_interpolation.nSteps - 1));
+
+    // This is the property that is shown in the user interface, so update it so the user
+    // can get an idea of how many points will be rendered
+    _nDataPoints = _nObjectsInDataset;
+}
+
 void RenderableInterpolatedPoints::initializeShadersAndGlExtras() {
     _program = BaseModule::ProgramObjectManager.request(
         "RenderablePointCloud_Interpolated",
diff --git a/modules/base/rendering/pointcloud/renderableinterpolatedpoints.h b/modules/base/rendering/pointcloud/renderableinterpolatedpoints.h
index 8ead53ad92..c457729253 100644
--- a/modules/base/rendering/pointcloud/renderableinterpolatedpoints.h
+++ b/modules/base/rendering/pointcloud/renderableinterpolatedpoints.h
@@ -50,6 +50,7 @@ public:
     static documentation::Documentation Documentation();
 
 protected:
+    void initialize() override;
     void initializeShadersAndGlExtras() override;
     void deinitializeShaders() override;
     void setExtraUniforms() override;
@@ -109,6 +110,8 @@ private:
 
     float _prevInterpolationValue = 0.f;
     bool _shouldReinitializeBufferdata = false;
+
+    unsigned int _nObjectsInDataset = 0;
 };
 
 } // namespace openspace

From 22c00f243797e012dd8e7c0270941603acda7ae8 Mon Sep 17 00:00:00 2001
From: Ylva Selling <ylva.selling@liu.se>
Date: Mon, 8 Apr 2024 13:45:01 +0200
Subject: [PATCH 377/701] Clean up typos and duplicates in documentation

---
 .../earth/moon/nasa-treks/LRO_Narrow_Angle_Camera.asset      | 2 +-
 modules/base/rendering/renderablesphereimagelocal.cpp        | 2 +-
 modules/base/rendering/renderablesphereimageonline.cpp       | 2 +-
 modules/base/rendering/screenspaceframebuffer.cpp            | 2 +-
 modules/gaia/scripts/filtering.lua                           | 5 -----
 modules/space/rendering/renderabletravelspeed.cpp            | 2 +-
 modules/video/src/screenspacevideo.cpp                       | 5 +----
 7 files changed, 6 insertions(+), 14 deletions(-)

diff --git a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_Narrow_Angle_Camera.asset b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_Narrow_Angle_Camera.asset
index 78de5ec0a9..314df1893f 100644
--- a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_Narrow_Angle_Camera.asset
+++ b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_Narrow_Angle_Camera.asset
@@ -293,7 +293,7 @@ asset.export("NAC_DTM_APOLLO17_SLOPE", treks_NAC_DTM_APOLLO17_SLOPE)
 
 
 asset.meta = {
-  Name = [[NASA Treks Layers for Moon LRO_Narrow_Angle_Camera],
+  Name = [NASA Treks Layers for Moon LRO_Narrow_Angle_Camera],
   Version = "1.0",
   Author = "NASA/Treks",
   URL = "https://trek.nasa.gov/moon",
diff --git a/modules/base/rendering/renderablesphereimagelocal.cpp b/modules/base/rendering/renderablesphereimagelocal.cpp
index c82abf7788..c1f1cf97a3 100644
--- a/modules/base/rendering/renderablesphereimagelocal.cpp
+++ b/modules/base/rendering/renderablesphereimagelocal.cpp
@@ -43,7 +43,7 @@ namespace {
         openspace::properties::Property::Visibility::User
     };
 
-    struct [[codegen::Dictionary(RenderableSphere)]] Parameters {
+    struct [[codegen::Dictionary(RenderableSphereImageLocal)]] Parameters {
         // [[codegen::verbatim(TextureInfo.description)]]
         std::string texture;
 
diff --git a/modules/base/rendering/renderablesphereimageonline.cpp b/modules/base/rendering/renderablesphereimageonline.cpp
index bf2757bdc1..c9090bce1d 100644
--- a/modules/base/rendering/renderablesphereimageonline.cpp
+++ b/modules/base/rendering/renderablesphereimageonline.cpp
@@ -65,7 +65,7 @@ namespace {
         );
     }
 
-    struct [[codegen::Dictionary(RenderableSphere)]] Parameters {
+    struct [[codegen::Dictionary(RenderableSphereImageOnline)]] Parameters {
         // [[codegen::verbatim(TextureInfo.description)]]
         std::string url [[codegen::key("URL")]];
     };
diff --git a/modules/base/rendering/screenspaceframebuffer.cpp b/modules/base/rendering/screenspaceframebuffer.cpp
index 81380c5ede..d0d555e027 100644
--- a/modules/base/rendering/screenspaceframebuffer.cpp
+++ b/modules/base/rendering/screenspaceframebuffer.cpp
@@ -47,7 +47,7 @@ namespace openspace {
 documentation::Documentation ScreenSpaceFramebuffer::Documentation() {
     using namespace documentation;
     return {
-        "ScreenSpace Framebuffer",
+        "ScreenSpaceFramebuffer",
         "base_screenspace_framebuffer",
         {}
     };
diff --git a/modules/gaia/scripts/filtering.lua b/modules/gaia/scripts/filtering.lua
index f070583daf..a1f7adea56 100644
--- a/modules/gaia/scripts/filtering.lua
+++ b/modules/gaia/scripts/filtering.lua
@@ -13,11 +13,6 @@ openspace.gaia.documentation = {
         Name = "addClippingSphere",
         Arguments = { name = "String", radius = "Number" },
         Documentation = "Creates a clipping sphere for the Gaia renderable in the first argument"
-    },
-    {
-        Name = "removeClippingBox",
-        Arguments = {},
-        Documentation = ""
     }
 }
 
diff --git a/modules/space/rendering/renderabletravelspeed.cpp b/modules/space/rendering/renderabletravelspeed.cpp
index 5b3ab4d252..afbb068ae8 100644
--- a/modules/space/rendering/renderabletravelspeed.cpp
+++ b/modules/space/rendering/renderabletravelspeed.cpp
@@ -86,7 +86,7 @@ namespace {
         openspace::properties::Property::Visibility::User
     };
 
-    struct [[codegen::Dictionary(RenderableLightTravel)]] Parameters {
+    struct [[codegen::Dictionary(RenderableTravelSpeed)]] Parameters {
         // [[codegen::verbatim(TargetInfo.description)]]
         std::string target;
 
diff --git a/modules/video/src/screenspacevideo.cpp b/modules/video/src/screenspacevideo.cpp
index 9d5f62964c..fed1d4b58b 100644
--- a/modules/video/src/screenspacevideo.cpp
+++ b/modules/video/src/screenspacevideo.cpp
@@ -38,13 +38,10 @@
 namespace openspace {
 
 documentation::Documentation ScreenSpaceVideo::Documentation() {
-    documentation::Documentation doc = ScreenSpaceRenderable::Documentation();
+    documentation::Documentation doc = VideoPlayer::Documentation();
     doc.name = "ScreenSpaceVideo";
     doc.id = "video_screenspacevideo";
 
-    documentation::Documentation vp = VideoPlayer::Documentation();
-    doc.entries.insert(doc.entries.end(), vp.entries.begin(), vp.entries.end());
-
     return doc;
 }
 

From 5fdc3bf45fca75cd581ee63371143ff1b81e83da Mon Sep 17 00:00:00 2001
From: Ylva Selling <ylva.selling@liu.se>
Date: Mon, 8 Apr 2024 14:10:37 +0200
Subject: [PATCH 378/701] Remove todo link (as the documentation will link to
 asset)

---
 modules/base/rendering/renderablecartesianaxes.cpp | 2 --
 1 file changed, 2 deletions(-)

diff --git a/modules/base/rendering/renderablecartesianaxes.cpp b/modules/base/rendering/renderablecartesianaxes.cpp
index da67e3c4ce..12b1791a29 100644
--- a/modules/base/rendering/renderablecartesianaxes.cpp
+++ b/modules/base/rendering/renderablecartesianaxes.cpp
@@ -71,8 +71,6 @@ namespace {
     // other node as the Parent of the node with this renderable. Also, the axes have to
     // be scaled to match the parent object for the axes to be visible in the scene, for
     // example using a StaticScale.
-    //
-    // See example asset (@TODO: link to asset file).
     struct [[codegen::Dictionary(RenderableCartesianAxes)]] Parameters {
         // [[codegen::verbatim(XColorInfo.description)]]
         std::optional<glm::vec3> xColor [[codegen::color()]];

From cd30d5f1d3beab954d7c247de3039fd57f87adb0 Mon Sep 17 00:00:00 2001
From: Andreas Engberg <adde.engberg@gmail.com>
Date: Tue, 9 Apr 2024 16:05:02 +0200
Subject: [PATCH 379/701] Fixed broken asset

---
 data/assets/scene/solarsystem/telescopes/gaia/gaia.asset | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/data/assets/scene/solarsystem/telescopes/gaia/gaia.asset b/data/assets/scene/solarsystem/telescopes/gaia/gaia.asset
index 7a141b65c9..7528a0a9a7 100644
--- a/data/assets/scene/solarsystem/telescopes/gaia/gaia.asset
+++ b/data/assets/scene/solarsystem/telescopes/gaia/gaia.asset
@@ -1,5 +1,6 @@
 local transforms = asset.require("./transforms")
-local sun = asset.require("scene/solarsystem/sun/transforms")
+local sunTransform = asset.require("scene/solarsystem/sun/transforms")
+local sun = asset.require("scene/solarsystem/sun/sun")
 
 
 
@@ -33,7 +34,7 @@ local Gaia = {
     Type = "RenderableModel",
     GeometryFile = model .. "gaia.obj",
     LightSources = {
-      sun.LightSource,
+      sunTransform.LightSource,
       {
         Identifier = "Camera",
         Type = "CameraLightSource",

From e22af5cd567003f21afcf8b901a6fe2a4827295c Mon Sep 17 00:00:00 2001
From: Alexander Bock <mail@alexanderbock.eu>
Date: Wed, 10 Apr 2024 22:33:27 +0200
Subject: [PATCH 380/701] Update version number to 0.20.0 in preparation for
 the release

---
 CMakeLists.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index ca6c1ccb60..6c2c22a0b7 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -28,7 +28,7 @@ cmake_policy(VERSION 3.25)
 project(OpenSpace)
 
 set(OPENSPACE_VERSION_MAJOR 0)
-set(OPENSPACE_VERSION_MINOR 19)
+set(OPENSPACE_VERSION_MINOR 20)
 set(OPENSPACE_VERSION_PATCH 0)
 set(OPENSPACE_VERSION_STRING "<dev>")
 

From ca5d02cc02a940eec9f4e1614ecf756fc20f2f9d Mon Sep 17 00:00:00 2001
From: Alexander Bock <alexander.bock@liu.se>
Date: Thu, 11 Apr 2024 20:09:24 +0200
Subject: [PATCH 381/701] Fix logging and documentation for LuaTranslation and
 LuaRotation (closes #3176)

---
 modules/base/rotation/luarotation.cpp       | 2 +-
 modules/base/translation/luatranslation.cpp | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/modules/base/rotation/luarotation.cpp b/modules/base/rotation/luarotation.cpp
index b7937c1eac..183ba342b6 100644
--- a/modules/base/rotation/luarotation.cpp
+++ b/modules/base/rotation/luarotation.cpp
@@ -111,7 +111,7 @@ glm::dmat3 LuaRotation::matrix(const UpdateData& data) const {
     const int success = lua_pcall(_state, 2, 9, 0);
     if (success != 0) {
         LERRORC(
-            "LuaScale",
+            "LuaRotation",
             std::format("Error executing 'rotation': {}", lua_tostring(_state, -1))
         );
     }
diff --git a/modules/base/translation/luatranslation.cpp b/modules/base/translation/luatranslation.cpp
index 0d1f8ff9db..e22857ff37 100644
--- a/modules/base/translation/luatranslation.cpp
+++ b/modules/base/translation/luatranslation.cpp
@@ -41,7 +41,7 @@ namespace {
         "Script",
         "This value is the path to the Lua script that will be executed to compute the "
         "translation for this transformation. The script needs to define a function "
-        "'translate' that takes the current simulation time in seconds past the J2000 "
+        "'translation' that takes the current simulation time in seconds past the J2000 "
         "epoch as the first argument, the current wall time as milliseconds past the "
         "J2000 epoch as the second argument and computes the translation",
         // @VISIBILITY(3.75)
@@ -90,7 +90,7 @@ glm::dvec3 LuaTranslation::position(const UpdateData& data) const {
     const bool isFunction = lua_isfunction(_state, -1);
     if (!isFunction) {
         LERRORC(
-            "LuaScale",
+            "LuaTranslation",
             std::format(
                 "Script '{}' does not have a function 'translation'",
                 _luaScriptFile.value()
@@ -114,7 +114,7 @@ glm::dvec3 LuaTranslation::position(const UpdateData& data) const {
     const int success = lua_pcall(_state, 2, 3, 0);
     if (success != 0) {
         LERRORC(
-            "LuaScale",
+            "LuaTranslation",
             std::format("Error executing 'translation': {}", lua_tostring(_state, -1))
         );
     }

From f14bb06852fef4e92f89d3353e19db9ebffebb08 Mon Sep 17 00:00:00 2001
From: Alexander Bock <mail@alexanderbock.eu>
Date: Fri, 12 Apr 2024 00:44:59 +0200
Subject: [PATCH 382/701] Update codegen submodule

---
 support/coding/codegen | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/support/coding/codegen b/support/coding/codegen
index 627436584f..0db6463700 160000
--- a/support/coding/codegen
+++ b/support/coding/codegen
@@ -1 +1 @@
-Subproject commit 627436584fe0b78bc915654e7648bdaf67f26eb4
+Subproject commit 0db6463700e41305a61df1512a450aeb412840f0

From cfb400e7b8e919b8f8df87ac31d80f393a79cb18 Mon Sep 17 00:00:00 2001
From: Micah Acinapura <micahnyc@gmail.com>
Date: Tue, 16 Apr 2024 08:15:03 +0200
Subject: [PATCH 383/701] added user panel token and folder needed for webgui
 pr (#3141)

---
 data/assets/util/webgui.asset  | 3 +++
 openspace.cfg                  | 1 +
 src/engine/openspaceengine.cpp | 3 +++
 3 files changed, 7 insertions(+)

diff --git a/data/assets/util/webgui.asset b/data/assets/util/webgui.asset
index 4f9fce44be..7d5f1babca 100644
--- a/data/assets/util/webgui.asset
+++ b/data/assets/util/webgui.asset
@@ -33,6 +33,9 @@ asset.onInitialize(function()
   local directories = openspace.propertyValue("Modules.WebGui.Directories")
   directories[#directories + 1] = "frontend"
   directories[#directories + 1] = frontend .. "frontend"
+  --Add user directory for webpanels
+  directories[#directories + 1] = "webpanels"
+  directories[#directories + 1] = openspace.absPath("${USER_PANELS}")
 
   openspace.setPropertyValueSingle("Modules.WebGui.Directories", directories)
   openspace.setPropertyValueSingle("Modules.WebGui.DefaultEndpoint", "frontend")
diff --git a/openspace.cfg b/openspace.cfg
index 7c5976b387..c9ac15e200 100644
--- a/openspace.cfg
+++ b/openspace.cfg
@@ -101,6 +101,7 @@ Paths = {
     USER_ASSETS = "${USER}/data/assets",
     USER_PROFILES = "${USER}/data/profiles",
     USER_CONFIG = "${USER}/config",
+    USER_PANELS = "${USER}/webpanels",
     FONTS = "${DATA}/fonts",
     TASKS = "${DATA}/tasks",
     -- If the the 'OPENSPACE_SYNC' environment variable is defined on the system, use that
diff --git a/src/engine/openspaceengine.cpp b/src/engine/openspaceengine.cpp
index cf91a8cf1c..2baa25f088 100644
--- a/src/engine/openspaceengine.cpp
+++ b/src/engine/openspaceengine.cpp
@@ -897,6 +897,9 @@ void OpenSpaceEngine::createUserDirectoriesIfNecessary() {
     if (!std::filesystem::exists(absPath("${USER_CONFIG}"))) {
         std::filesystem::create_directories(absPath("${USER_CONFIG}"));
     }
+    if (!std::filesystem::is_directory(absPath("${USER_PANELS}"))) {
+        std::filesystem::create_directories(absPath("${USER_PANELS}"));
+    }
 }
 
 void OpenSpaceEngine::runGlobalCustomizationScripts() {

From 41143d8483b40d370438cca50a582ffcc69f3509 Mon Sep 17 00:00:00 2001
From: Micah Acinapura <micahnyc@gmail.com>
Date: Tue, 16 Apr 2024 08:29:20 +0200
Subject: [PATCH 384/701] Added asset showing only the Big Dipper (#3157)

* added big dipper only asset

* code review updates
---
 .../milkyway/constellations/big_dipper.asset  | 58 +++++++++++++++++++
 1 file changed, 58 insertions(+)
 create mode 100644 data/assets/scene/milkyway/constellations/big_dipper.asset

diff --git a/data/assets/scene/milkyway/constellations/big_dipper.asset b/data/assets/scene/milkyway/constellations/big_dipper.asset
new file mode 100644
index 0000000000..a122190dcd
--- /dev/null
+++ b/data/assets/scene/milkyway/constellations/big_dipper.asset
@@ -0,0 +1,58 @@
+local speck = asset.resource({
+  Name = "Big Dipper Constellation Files",
+  Type = "HttpSynchronization",
+  Identifier = "digitaluniverse_constellations_bigdipper",
+  Version = 1
+})
+
+
+local BigDipper = {
+  Identifier = "BigDipperConstellation",
+  Renderable = {
+    Type = "RenderableConstellationLines",
+    Enabled = false,
+    Labels = {
+      File = speck .. "bigdipper.label",
+      Opacity = 0.3,
+      Color = { 0.8, 0.8, 0.8 },
+      Size = 14.5,
+      MinMaxSize = { 8, 170 },
+      Unit = "pc"
+    },
+    Opacity = 0.3,
+    File = speck .. "bigdipper.speck",
+    NamesFile = speck .. "bigdipper.dat",
+    Colors = { { 0.6, 0.4, 0.4 }, { 0.8, 0.0, 0.0 }, { 0.0, 0.3, 0.8 } },
+    Unit = "pc",
+    DimInAtmosphere = true
+  },
+  Tag = { "daytime_hidden" },
+  GUI = {
+    Name = "Big Dipper",
+    Path = "/Milky Way/Constellations",
+    Description = [[This item only draws the big dipper, and not the rest of the
+      lines of the Ursa Major constellation.]]
+  }
+}
+
+
+asset.onInitialize(function()
+  openspace.addSceneGraphNode(BigDipper)
+end)
+
+asset.onDeinitialize(function()
+  openspace.removeSceneGraphNode(BigDipper)
+end)
+
+asset.export(BigDipper)
+
+
+
+asset.meta = {
+  Name = "Big Dipper",
+  Version = "1.0",
+  Description = "Constellation lines for the Big Dipper",
+  Author = "OpenSpace Team",
+  URL = "https://www.openspaceproject.com",
+  License = "MIT"
+}

From b1048269aee44157c79000c89328907dc0c207bb Mon Sep 17 00:00:00 2001
From: Micah Acinapura <micahnyc@gmail.com>
Date: Tue, 16 Apr 2024 08:34:25 +0200
Subject: [PATCH 385/701] Added time reversal and sidereal actions (#3159)

* added reverse and sidereal actions

* code review updates
---
 data/assets/actions/time.asset | 60 ++++++++++++++++++++++++++++++++++
 1 file changed, 60 insertions(+)
 create mode 100644 data/assets/actions/time.asset

diff --git a/data/assets/actions/time.asset b/data/assets/actions/time.asset
new file mode 100644
index 0000000000..89133c30e0
--- /dev/null
+++ b/data/assets/actions/time.asset
@@ -0,0 +1,60 @@
+local ReverseRate = {
+  Identifier = "os.time.reverseRate",
+  Name = "Reverse rate of time",
+  Command = [[
+openspace.time.setDeltaTime(-openspace.time.deltaTime())
+  ]],
+  Documentation = [[Reverse the rate of time]],
+  GuiPath = "/Time/Simulation Speed",
+  IsLocal = false
+}
+
+local SiderealDayIncrease = {
+  Identifier = "os.time.siderealDayIncrease",
+  Name = "Advance 1 sidereal day",
+  Command = [[
+openspace.time.setTime(openspace.time.advancedTime(openspace.time.currentTime(), 86164.0905));
+  ]],
+  Documentation = [[Advances time by a sidereal day (Instant)]],
+  GuiPath = "/Time",
+  IsLocal = false
+}
+
+local SiderealDayDecrease = {
+  Identifier = "os.time.siderealDayDecrease",
+  Name = "Decrement 1 sidereal day",
+  Command = [[
+openspace.time.setTime(openspace.time.advancedTime(openspace.time.currentTime(), -86164.0905));
+  ]],
+  Documentation = [[Decrements time by a sidereal day (Instant)]],
+  GuiPath = "/Time",
+  IsLocal = false
+}
+
+
+asset.onInitialize(function()
+  openspace.action.registerAction(ReverseRate)
+  openspace.action.registerAction(SiderealDayIncrease)
+  openspace.action.registerAction(SiderealDayDecrease)
+end)
+
+asset.onDeinitialize(function()
+  openspace.action.removeAction(SiderealDayDecrease)
+  openspace.action.removeAction(SiderealDayIncrease)
+  openspace.action.removeAction(ReverseRate)
+end)
+
+asset.export("ReverseRate", ReverseRate.Identifier)
+asset.export("SiderealDayIncrease", SiderealDayIncrease.Identifier)
+asset.export("SiderealDayDecrease", SiderealDayDecrease.Identifier)
+
+
+
+asset.meta = {
+  Name = "Actions - Time",
+  Version = "1.0",
+  Description = "Asset providing actions around time",
+  Author = "OpenSpace Team",
+  URL = "http://openspaceproject.com",
+  License = "MIT license"
+}

From 50dadb37a8498d2fd90164e1ac0917384e5f1f46 Mon Sep 17 00:00:00 2001
From: Alexander Bock <mail@alexanderbock.eu>
Date: Tue, 16 Apr 2024 20:40:17 +0200
Subject: [PATCH 386/701] Rename filesystem token from USER_PANELS to
 USER_WEBPANELS

---
 data/assets/util/webgui.asset  | 4 ++--
 openspace.cfg                  | 2 +-
 src/engine/openspaceengine.cpp | 4 ++--
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/data/assets/util/webgui.asset b/data/assets/util/webgui.asset
index 7d5f1babca..1af67cd9c7 100644
--- a/data/assets/util/webgui.asset
+++ b/data/assets/util/webgui.asset
@@ -33,9 +33,9 @@ asset.onInitialize(function()
   local directories = openspace.propertyValue("Modules.WebGui.Directories")
   directories[#directories + 1] = "frontend"
   directories[#directories + 1] = frontend .. "frontend"
-  --Add user directory for webpanels
+  -- Add user directory for webpanels
   directories[#directories + 1] = "webpanels"
-  directories[#directories + 1] = openspace.absPath("${USER_PANELS}")
+  directories[#directories + 1] = openspace.absPath("${USER_WEBPANELS}")
 
   openspace.setPropertyValueSingle("Modules.WebGui.Directories", directories)
   openspace.setPropertyValueSingle("Modules.WebGui.DefaultEndpoint", "frontend")
diff --git a/openspace.cfg b/openspace.cfg
index c9ac15e200..322fe97fa8 100644
--- a/openspace.cfg
+++ b/openspace.cfg
@@ -101,7 +101,7 @@ Paths = {
     USER_ASSETS = "${USER}/data/assets",
     USER_PROFILES = "${USER}/data/profiles",
     USER_CONFIG = "${USER}/config",
-    USER_PANELS = "${USER}/webpanels",
+    USER_WEBPANELS = "${USER}/webpanels",
     FONTS = "${DATA}/fonts",
     TASKS = "${DATA}/tasks",
     -- If the the 'OPENSPACE_SYNC' environment variable is defined on the system, use that
diff --git a/src/engine/openspaceengine.cpp b/src/engine/openspaceengine.cpp
index 2baa25f088..ca649bc1f0 100644
--- a/src/engine/openspaceengine.cpp
+++ b/src/engine/openspaceengine.cpp
@@ -897,8 +897,8 @@ void OpenSpaceEngine::createUserDirectoriesIfNecessary() {
     if (!std::filesystem::exists(absPath("${USER_CONFIG}"))) {
         std::filesystem::create_directories(absPath("${USER_CONFIG}"));
     }
-    if (!std::filesystem::is_directory(absPath("${USER_PANELS}"))) {
-        std::filesystem::create_directories(absPath("${USER_PANELS}"));
+    if (!std::filesystem::is_directory(absPath("${USER_WEBPANELS}"))) {
+        std::filesystem::create_directories(absPath("${USER_WEBPANELS}"));
     }
 }
 

From 0794423fef172a5144e14ee268d4dd56cf997d9c Mon Sep 17 00:00:00 2001
From: Alexander Bock <mail@alexanderbock.eu>
Date: Tue, 16 Apr 2024 22:57:46 +0200
Subject: [PATCH 387/701] Clarify UrlSynchronization resync time documentation

---
 modules/sync/syncs/urlsynchronization.cpp | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/modules/sync/syncs/urlsynchronization.cpp b/modules/sync/syncs/urlsynchronization.cpp
index 817032e00b..7f2ad2ee96 100644
--- a/modules/sync/syncs/urlsynchronization.cpp
+++ b/modules/sync/syncs/urlsynchronization.cpp
@@ -70,7 +70,9 @@ namespace {
 
         // This variable determines the validity period of a file(s) in seconds before it
         // needs to be re-downloaded. The default value keeps the file permanently cached,
-        // while a value of 0 forces the file to be downloaded on every startup.
+        // while a value of 0 forces the file to be downloaded on every startup. If the
+        // symbolic value `math.huge` is used, a file is never redownloaded after the
+        // first time.
         std::optional<double> secondsUntilResync [[codegen::greaterequal(0.0)]];
     };
 #include "urlsynchronization_codegen.cpp"

From 7a2298e8e0dfda1567222a5dc43978d90b5426df Mon Sep 17 00:00:00 2001
From: Alexander Bock <alexander.bock@liu.se>
Date: Wed, 17 Apr 2024 16:22:57 +0200
Subject: [PATCH 388/701] Update the Webgui hash to include the user panel
 changes

---
 data/assets/util/webgui.asset | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/data/assets/util/webgui.asset b/data/assets/util/webgui.asset
index 1af67cd9c7..97243e803e 100644
--- a/data/assets/util/webgui.asset
+++ b/data/assets/util/webgui.asset
@@ -4,7 +4,7 @@ local guiCustomization = asset.require("customization/gui")
 
 
 -- Select which commit hashes to use for the frontend and backend
-local frontendHash = "0f745d1672eb63c37eaa9164f1e5f991f6c7795c"
+local frontendHash = "c6ed5469319f922c64319298ef8daef0970f8d55"
 
 local frontend = asset.resource({
   Identifier = "WebGuiFrontend",

From 2b5b882e14dec3bdeb9a560bd8d53d4a8526854b Mon Sep 17 00:00:00 2001
From: Gene Payne <payne.gene@gmail.com>
Date: Wed, 17 Apr 2024 19:31:57 -0600
Subject: [PATCH 389/701] Disable minor moons of jupiter and saturn on profile
 startup (#3169)

---
 data/profiles/voyager.profile | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/data/profiles/voyager.profile b/data/profiles/voyager.profile
index a14681d2c6..7fdae4dea9 100644
--- a/data/profiles/voyager.profile
+++ b/data/profiles/voyager.profile
@@ -1,4 +1,8 @@
 {
+  "additional_scripts": [
+    "openspace.action.triggerAction('os.solarsystem.JupiterMinorMoonsOff')",
+    "openspace.action.triggerAction('os.solarsystem.SaturnMinorMoonsOff')"
+  ],
   "assets": [
     "base",
     "base_keybindings",

From 82ddbc57f875e2df550811aa1778008b62e345a3 Mon Sep 17 00:00:00 2001
From: Emma Broman <emma.broman@liu.se>
Date: Thu, 18 Apr 2024 14:06:55 +0200
Subject: [PATCH 390/701] Include orientation data in new point cloud and
 remove RenderablePlanesCloud (#3168)

* WIP start including rotation data

* Fix option to use orientation data or not

* Renames to reflect that points are no longer billboarded (at least not always)

* Increase max value for scale factor

* Fix correct scaling for tully and deep sky objects

* Remove the old RenderablePlanesCloud, we don't need it anymore

* Add unit handling for size scaling from data values

* Clarify some documentation about the points being rendered as planes

* Update datasets to the new ones on the server

* Use quaternions for orientation instead of vectors (simplifies interpolation and requires less data)

* Make interpolation of orientation work

* Fix size for deep sky objects being too small due to data being radius rather than diameter

* Add IsRadius flag for deepsky

* Update asset versions (major number update, due to breaking changes)

---------

Co-authored-by: Alexander Bock <alexander.bock@liu.se>
---
 .../scene/digitaluniverse/deepsky.asset       |  30 +-
 .../scene/digitaluniverse/milkyway.asset      |  47 +-
 .../digitaluniverse/milkyway_arm_labels.asset |  38 +-
 data/assets/scene/digitaluniverse/tully.asset |  34 +-
 modules/base/CMakeLists.txt                   |   8 +-
 .../renderableinterpolatedpoints.cpp          |  64 +-
 .../pointcloud/renderableinterpolatedpoints.h |   5 +-
 .../pointcloud/renderablepointcloud.cpp       | 231 ++++--
 .../pointcloud/renderablepointcloud.h         |  14 +-
 .../pointcloud/sizemappingcomponent.cpp       |  56 +-
 .../pointcloud/sizemappingcomponent.h         |   1 +
 ...lboardpoint_fs.glsl => pointcloud_fs.glsl} |   3 -
 ...lboardpoint_gs.glsl => pointcloud_gs.glsl} |  43 +-
 ...s.glsl => pointcloud_interpolated_vs.glsl} |  54 ++
 ...lboardpoint_vs.glsl => pointcloud_vs.glsl} |   3 +
 modules/digitaluniverse/CMakeLists.txt        |   2 -
 .../digitaluniverse/digitaluniversemodule.cpp |   3 -
 .../rendering/renderableplanescloud.cpp       | 669 ------------------
 .../rendering/renderableplanescloud.h         | 127 ----
 19 files changed, 491 insertions(+), 941 deletions(-)
 rename modules/base/shaders/pointcloud/{billboardpoint_fs.glsl => pointcloud_fs.glsl} (98%)
 rename modules/base/shaders/pointcloud/{billboardpoint_gs.glsl => pointcloud_gs.glsl} (83%)
 rename modules/base/shaders/pointcloud/{billboardpoint_interpolated_vs.glsl => pointcloud_interpolated_vs.glsl} (71%)
 rename modules/base/shaders/pointcloud/{billboardpoint_vs.glsl => pointcloud_vs.glsl} (95%)
 delete mode 100644 modules/digitaluniverse/rendering/renderableplanescloud.cpp
 delete mode 100644 modules/digitaluniverse/rendering/renderableplanescloud.h

diff --git a/data/assets/scene/digitaluniverse/deepsky.asset b/data/assets/scene/digitaluniverse/deepsky.asset
index c17f0d6c1f..cb4bcf2012 100644
--- a/data/assets/scene/digitaluniverse/deepsky.asset
+++ b/data/assets/scene/digitaluniverse/deepsky.asset
@@ -9,7 +9,7 @@ local speck = asset.resource({
   Name = "Deep Sky Objects Speck Files",
   Type = "HttpSynchronization",
   Identifier = "digitaluniverse_deepsky_speck",
-  Version = 1
+  Version = 2
 })
 
 
@@ -57,19 +57,27 @@ local DeepSkyObjects = {
 local DeepSkyObjectsImages = {
   Identifier = "DeepSkyObjectsImages",
   Renderable = {
-    Type = "RenderablePlanesCloud",
+    Type = "RenderablePointCloud",
     Enabled = false,
-    Color = { 1.0, 1.0, 1.0 },
     Opacity = 0.99,
-    ScaleFactor = 1.0,
     File = speck .. "dso.speck",
-    TexturePath = textures,
-    Luminosity = "radius",
-    ScaleLuminosity = 0.001,
+    Texture = {
+      Folder = textures
+    },
+    -- Use fixed orientation, and rotate planes based on orientation information in
+    -- the dataset
+    OrientationRenderOption = "Fixed Rotation",
+    UseOrientationData = true,
     Unit = "pc",
-    -- Fade in value in the same unit as "Unit"
-    --FadeInDistances = {0.001, 0.05010},
-    PlaneMinSize = 5.0
+    SizeSettings = {
+      SizeMapping = {
+        ParameterOptions = { "radius" },
+        ScaleFactor = "Parsec",
+        IsRadius = true
+      },
+      -- No exponential scaling, just use size mapping to set the correct size
+      ScaleExponent = 0.0
+    }
   },
   Transform = {
     Rotation = {
@@ -111,7 +119,7 @@ asset.export(DeepSkyObjectsImages)
 
 asset.meta = {
   Name = "Deep Sky Objects Images",
-  Version = "2.0",
+  Version = "3.0",
   Description = "Digital Universe asset for Deep Sky Objects and their Images",
   Author = "Nate Greenstein, Matt Everhart, Brian Abbott (AMNH)",
   URL = "https://www.amnh.org/research/hayden-planetarium/digital-universe",
diff --git a/data/assets/scene/digitaluniverse/milkyway.asset b/data/assets/scene/digitaluniverse/milkyway.asset
index 6e1445e36f..ee0c393536 100644
--- a/data/assets/scene/digitaluniverse/milkyway.asset
+++ b/data/assets/scene/digitaluniverse/milkyway.asset
@@ -1,34 +1,41 @@
-local planeTextures = asset.resource({
+local textures = asset.resource({
   Name = "Milky Way Plane Textures",
   Type = "HttpSynchronization",
   Identifier = "digitaluniverse_milkyway_textures",
   Version = 2
 })
 
-local planeSpeck = asset.resource({
+local speck = asset.resource({
   Name = "Milky Way Plane Speck",
   Type = "HttpSynchronization",
   Identifier = "digitaluniverse_milkyway_speck",
-  Version = 1
+  Version = 2
 })
 
 
-local Plane = {
+local Object = {
   Identifier = "MilkyWayGalaxyImage",
-  Parent = "Root",
   Renderable = {
-    Type = "RenderablePlanesCloud",
-    Enabled = true,
-    Color = { 1.0, 1.0, 1.0 },
+    Type = "RenderablePointCloud",
     Opacity = 0.99,
-    ScaleFactor = 2.8,
-    File = planeSpeck .. "galaxy.speck",
-    TexturePath = planeTextures,
-    Luminosity = "size",
-    ScaleLuminosity = 1.0,
-    FadeInDistances = { 3000.0, 50000.0 },
-    PlaneMinSize = 5.0,
-    Unit = "pc"
+    File = speck .. "galaxy.speck",
+    Texture = {
+      Folder = textures
+    },
+    -- Use fixed orientation, and rotate planes based on orientation information in
+    -- the dataset
+    OrientationRenderOption = "Fixed Rotation",
+    UseOrientationData = true,
+    Unit = "pc",
+    Fading = {
+      FadeInDistances = { 16000.0, 100000.0 } -- Fade in value in the same unit as "Unit"
+    },
+    SizeSettings = {
+      SizeMapping = {
+        ParameterOptions = { "size" }
+      },
+      ScaleExponent = 16.936
+    },
   },
   GUI = {
     Name = "Milky Way Galaxy Image",
@@ -46,20 +53,20 @@ local Plane = {
 
 
 asset.onInitialize(function()
-  openspace.addSceneGraphNode(Plane)
+  openspace.addSceneGraphNode(Object)
 end)
 
 asset.onDeinitialize(function()
-  openspace.removeSceneGraphNode(Plane)
+  openspace.removeSceneGraphNode(Object)
 end)
 
-asset.export(Plane)
+asset.export(Object)
 
 
 
 asset.meta = {
   Name = "MilkyWay Galaxy",
-  Version = "2.1",
+  Version = "3.0",
   Description = [[Digital Universe asset containt 2D image of the MilkyWay. For
     extragalactic viewing]],
   Author = "Brian Abbott, Carter Emmart (AMNH)",
diff --git a/data/assets/scene/digitaluniverse/milkyway_arm_labels.asset b/data/assets/scene/digitaluniverse/milkyway_arm_labels.asset
index 4961fc648a..84b08bf565 100644
--- a/data/assets/scene/digitaluniverse/milkyway_arm_labels.asset
+++ b/data/assets/scene/digitaluniverse/milkyway_arm_labels.asset
@@ -1,34 +1,42 @@
-local planeTextures = asset.resource({
+local textures = asset.resource({
   Name = "Milky Way Plane Textures",
   Type = "HttpSynchronization",
   Identifier = "digitaluniverse_milkyway_textures",
   Version = 2
 })
 
-local planeSpeck = asset.resource({
+local speck = asset.resource({
   Name = "Milky Way Plane Speck",
   Type = "HttpSynchronization",
   Identifier = "digitaluniverse_milkyway_speck",
-  Version = 1
+  Version = 2
 })
 
 
 local Object = {
   Identifier = "MilkyWayGalaxyArmLabelsImage",
-  Parent = "Root",
   Renderable = {
-    Type = "RenderablePlanesCloud",
+    Type = "RenderablePointCloud",
     Enabled = false,
-    Color = { 1.0, 1.0, 1.0 },
     Opacity = 0.99,
-    ScaleFactor = 2.8,
-    File = planeSpeck .. "galaxyArmLabels.speck",
-    TexturePath = planeTextures,
-    Luminosity = "size",
-    ScaleLuminosity = 1.0,
-    FadeInDistances = { 3000.0, 50000.0 },
-    PlaneMinSize = 5.0,
-    Unit = "pc"
+    File = speck .. "galaxyArmLabels.speck",
+    Texture = {
+      Folder = textures
+    },
+    -- Use fixed orientation, and rotate planes based on orientation information in
+    -- the dataset
+    OrientationRenderOption = "Fixed Rotation",
+    UseOrientationData = true,
+    Unit = "pc",
+    Fading = {
+      FadeInDistances = { 8000.0, 140000.0 } -- Fade in value in the same unit as "Unit"
+    },
+    SizeSettings = {
+      SizeMapping = {
+        ParameterOptions = { "size" }
+      },
+      ScaleExponent = 16.936
+    },
   },
   GUI = {
     Name = "Milky Way Arms Labels",
@@ -56,7 +64,7 @@ asset.export(Object)
 
 asset.meta = {
   Name = "Milky Way Arms Labels",
-  Version = "1.1",
+  Version = "2.0",
   Description = "Image with arm labels for the Milky Way galaxy",
   Author = "Brian Abbott (AMNH)",
   URL = "https://www.amnh.org/research/hayden-planetarium/digital-universe",
diff --git a/data/assets/scene/digitaluniverse/tully.asset b/data/assets/scene/digitaluniverse/tully.asset
index dbbd1db0b5..855f3bb862 100644
--- a/data/assets/scene/digitaluniverse/tully.asset
+++ b/data/assets/scene/digitaluniverse/tully.asset
@@ -9,7 +9,7 @@ local speck = asset.resource({
   Name = "Tully Speck Files",
   Type = "HttpSynchronization",
   Identifier = "digitaluniverse_tully_speck",
-  Version = 3
+  Version = 4
 })
 
 
@@ -84,20 +84,30 @@ local TullyGalaxies = {
 local TullyGalaxiesImages = {
   Identifier = "TullyGalaxiesImages",
   Renderable = {
-    Type = "RenderablePlanesCloud",
-    Enabled = true,
-    Color = { 1.0, 1.0, 1.0 },
+    Type = "RenderablePointCloud",
     Opacity = 0.99,
-    ScaleFactor = 1.0,
     File = speck .. "tully.speck",
-    TexturePath = textures,
-    Luminosity = "diamkpc",
-    ScaleLuminosity = 0.001,
+    SkipFirstDataPoint = true,
+    Texture = {
+      Folder = textures
+    },
     TransformationMatrix = TransformMatrix,
+    -- Use fixed orientation, and rotate planes based on orientation information in
+    -- the dataset
+    OrientationRenderOption = "Fixed Rotation",
+    UseOrientationData = true,
     Unit = "Mpc",
-    -- Fade in value in the same unit as "Unit"
-    FadeInDistances = {0.0005, 0.003},
-    PlaneMinSize = 1.0
+    Fading = {
+      FadeInDistances = { 0.0005, 0.003 } -- Fade in value in the same unit as "Unit"
+    },
+    SizeSettings = {
+      SizeMapping = {
+        ParameterOptions = { "diamkpc" },
+        ScaleFactor = "Kiloparsec"
+      },
+      -- No exponential scaling, just use size mapping to set the correct size
+      ScaleExponent = 0.0
+    }
   },
   GUI = {
     Name = "Tully Galaxies Images",
@@ -133,7 +143,7 @@ asset.export(TullyGalaxiesImages)
 
 asset.meta = {
   Name = "Tully Galaxies",
-  Version = "4.0",
+  Version = "5.0",
   Description = [[Digital Universe asset for Tully Galaxies, including point cloud and
     images]],
   Author = "Stuart Levy (NCSA/UIUC), Brian Abbott (AMNH)",
diff --git a/modules/base/CMakeLists.txt b/modules/base/CMakeLists.txt
index 53ad712da3..54bbd06ec7 100644
--- a/modules/base/CMakeLists.txt
+++ b/modules/base/CMakeLists.txt
@@ -168,10 +168,10 @@ set(SHADER_FILES
   shaders/model_vs.glsl
   shaders/plane_fs.glsl
   shaders/plane_vs.glsl
-  shaders/pointcloud/billboardpoint_fs.glsl
-  shaders/pointcloud/billboardpoint_gs.glsl
-  shaders/pointcloud/billboardpoint_vs.glsl
-  shaders/pointcloud/billboardpoint_interpolated_vs.glsl
+  shaders/pointcloud/pointcloud_fs.glsl
+  shaders/pointcloud/pointcloud_gs.glsl
+  shaders/pointcloud/pointcloud_vs.glsl
+  shaders/pointcloud/pointcloud_interpolated_vs.glsl
   shaders/polygon_fs.glsl
   shaders/polygon_gs.glsl
   shaders/polygon_vs.glsl
diff --git a/modules/base/rendering/pointcloud/renderableinterpolatedpoints.cpp b/modules/base/rendering/pointcloud/renderableinterpolatedpoints.cpp
index be13a0ab67..5d04e0242a 100644
--- a/modules/base/rendering/pointcloud/renderableinterpolatedpoints.cpp
+++ b/modules/base/rendering/pointcloud/renderableinterpolatedpoints.cpp
@@ -321,12 +321,12 @@ void RenderableInterpolatedPoints::initializeShadersAndGlExtras() {
     _program = BaseModule::ProgramObjectManager.request(
         "RenderablePointCloud_Interpolated",
         []() {
-            std::filesystem::path path = absPath("${MODULE_BASE}/shaders/pointcloud/");
+            std::filesystem::path path = absPath("${MODULE_BASE}/shaders/pointcloud");
             return global::renderEngine->buildRenderProgram(
                 "RenderablePointCloud_Interpolated",
-                path / "billboardpoint_interpolated_vs.glsl",
-                path / "billboardpoint_fs.glsl",
-                path / "billboardpoint_gs.glsl"
+                path / "pointcloud_interpolated_vs.glsl",
+                path / "pointcloud_fs.glsl",
+                path / "pointcloud_gs.glsl"
             );
         }
     );
@@ -368,9 +368,13 @@ int RenderableInterpolatedPoints::nAttributesPerPoint() const {
         // Use two more positions (xyz)
         n += 2 * 3;
     }
+    if (useOrientationData()) {
+        // Use one more orientation quaternion (wxyz)
+        n += 4;
+    }
     // And potentially some more color and size data
-    n += _hasColorMapFile ? 1 : 0;
-    n += _hasDatavarSize ? 1 : 0;
+    n += hasColorData() ? 1 : 0;
+    n += hasSizeData() ? 1 : 0;
 
     return n;
 }
@@ -430,29 +434,54 @@ void RenderableInterpolatedPoints::addPositionDataForPoint(unsigned int index,
 }
 
 void RenderableInterpolatedPoints::addColorAndSizeDataForPoint(unsigned int index,
-                                                         std::vector<float>& result) const
+                                                        std::vector<float>& result) const
 {
     using namespace dataloader;
     auto [firstIndex, secondIndex] = interpolationIndices(index);
     const Dataset::Entry& e0 = _dataset.entries[firstIndex];
     const Dataset::Entry& e1 = _dataset.entries[secondIndex];
 
-    int colorParamIndex = currentColorParameterIndex();
-    if (_hasColorMapFile && colorParamIndex >= 0) {
+    if (hasColorData()) {
+        const int colorParamIndex = currentColorParameterIndex();
         result.push_back(e0.data[colorParamIndex]);
         result.push_back(e1.data[colorParamIndex]);
     }
 
-    int sizeParamIndex = currentSizeParameterIndex();
-    if (_hasDatavarSize && sizeParamIndex >= 0) {
+    if (hasSizeData()) {
+        const int sizeParamIndex = currentSizeParameterIndex();
         // @TODO: Consider more detailed control over the scaling. Currently the value
         // is multiplied with the value as is. Should have similar mapping properties
         // as the color mapping
-        result.push_back(e0.data[sizeParamIndex]);
-        result.push_back(e1.data[sizeParamIndex]);
+
+        // Convert to diameter if data is given as radius
+        float multiplier = _sizeSettings.sizeMapping->isRadius ? 2.f : 1.f;
+        result.push_back(multiplier * e0.data[sizeParamIndex]);
+        result.push_back(multiplier * e1.data[sizeParamIndex]);
     }
 }
 
+void RenderableInterpolatedPoints::addOrientationDataForPoint(unsigned int index,
+                                                        std::vector<float>& result) const
+{
+    using namespace dataloader;
+    auto [firstIndex, secondIndex] = interpolationIndices(index);
+    const Dataset::Entry& e0 = _dataset.entries[firstIndex];
+    const Dataset::Entry& e1 = _dataset.entries[secondIndex];
+
+    glm::quat q0 = orientationQuaternion(e0);
+    glm::quat q1 = orientationQuaternion(e1);
+
+    result.push_back(q0.x);
+    result.push_back(q0.y);
+    result.push_back(q0.z);
+    result.push_back(q0.w);
+
+    result.push_back(q1.x);
+    result.push_back(q1.y);
+    result.push_back(q1.z);
+    result.push_back(q1.w);
+}
+
 void RenderableInterpolatedPoints::initializeBufferData() {
     if (_vao == 0) {
         glGenVertexArrays(1, &_vao);
@@ -481,16 +510,21 @@ void RenderableInterpolatedPoints::initializeBufferData() {
         offset = bufferVertexAttribute("in_position_after", 3, attibutesPerPoint, offset);
     }
 
-    if (_hasColorMapFile) {
+    if (hasColorData()) {
         offset = bufferVertexAttribute("in_colorParameter0", 1, attibutesPerPoint, offset);
         offset = bufferVertexAttribute("in_colorParameter1", 1, attibutesPerPoint, offset);
     }
 
-    if (_hasDatavarSize) {
+    if (hasSizeData()) {
         offset = bufferVertexAttribute("in_scalingParameter0", 1, attibutesPerPoint, offset);
         offset = bufferVertexAttribute("in_scalingParameter1", 1, attibutesPerPoint, offset);
     }
 
+    if (useOrientationData()) {
+        offset = bufferVertexAttribute("in_orientation0", 4, attibutesPerPoint, offset);
+        offset = bufferVertexAttribute("in_orientation1", 4, attibutesPerPoint, offset);
+    }
+
     if (_hasSpriteTexture) {
         offset = bufferVertexAttribute("in_textureLayer", 1, attibutesPerPoint, offset);
     }
diff --git a/modules/base/rendering/pointcloud/renderableinterpolatedpoints.h b/modules/base/rendering/pointcloud/renderableinterpolatedpoints.h
index c457729253..085fbb442e 100644
--- a/modules/base/rendering/pointcloud/renderableinterpolatedpoints.h
+++ b/modules/base/rendering/pointcloud/renderableinterpolatedpoints.h
@@ -63,7 +63,7 @@ protected:
     /**
      * Create the rendering data for the positions for the point with the given index
      * and append that to the result. Compared to the base class, this class may require
-     * 2-4 positions, depending on if * spline interpolation is used or not.
+     * 2-4 positions, depending on if spline interpolation is used or not.
      *
      * The values are computed based on the current interpolation value.
      *
@@ -82,6 +82,9 @@ protected:
     void addColorAndSizeDataForPoint(unsigned int index,
         std::vector<float>& result) const override;
 
+    void addOrientationDataForPoint(unsigned int index,
+        std::vector<float>& result) const override;
+
     void initializeBufferData();
     void updateBufferData() override;
 
diff --git a/modules/base/rendering/pointcloud/renderablepointcloud.cpp b/modules/base/rendering/pointcloud/renderablepointcloud.cpp
index 8d8ed3aef9..861b2edb4e 100644
--- a/modules/base/rendering/pointcloud/renderablepointcloud.cpp
+++ b/modules/base/rendering/pointcloud/renderablepointcloud.cpp
@@ -44,6 +44,8 @@
 #include <ghoul/opengl/textureconversion.h>
 #include <ghoul/opengl/textureunit.h>
 #include <glm/gtx/string_cast.hpp>
+#include <glm/gtx/quaternion.hpp>
+#include <glm/gtx/vector_angle.hpp>
 #include <array>
 #include <cmath>
 #include <cstdint>
@@ -56,7 +58,7 @@
 namespace {
     constexpr std::string_view _loggerCat = "RenderablePointCloud";
 
-    constexpr std::array<const char*, 34> UniformNames = {
+    constexpr std::array<const char*, 35> UniformNames = {
         "cameraViewMatrix", "projectionMatrix", "modelMatrix", "cameraPosition",
         "cameraLookUp", "renderOption", "maxAngularSize", "color", "opacity",
         "scaleExponent", "scaleFactor", "up", "right", "fadeInValue", "hasSpriteTexture",
@@ -64,12 +66,13 @@ namespace {
         "nanColor", "useNanColor", "hideOutsideRange", "enableMaxSizeControl",
         "aboveRangeColor", "useAboveRangeColor", "belowRangeColor", "useBelowRangeColor",
         "hasDvarScaling", "dvarScaleFactor", "enableOutline", "outlineColor",
-        "outlineWeight", "aspectRatioScale"
+        "outlineWeight", "aspectRatioScale", "useOrientationData"
     };
 
     enum RenderOption {
         ViewDirection = 0,
-        PositionNormal
+        PositionNormal,
+        FixedRotation
     };
 
     constexpr openspace::properties::Property::PropertyInfo TextureEnabledInfo = {
@@ -146,15 +149,7 @@ namespace {
         "The labels for the points. If no label file is provided, the labels will be "
         "created to match the points in the data file. For a CSV file, you should then "
         "specify which column is the 'Name' column in the data mapping. For SPECK files "
-        "the labels are created from the comment at the end of each line"
-    };
-
-    constexpr openspace::properties::Property::PropertyInfo RenderOptionInfo = {
-        "RenderOption",
-        "Render Option",
-        "Option wether the point billboards should face the camera or not. Used for "
-        "non-linear display environments such as fisheye.",
-        openspace::properties::Property::Visibility::AdvancedUser
+        "the labels are created from the comment at the end of each line."
     };
 
     constexpr openspace::properties::Property::PropertyInfo FadeInDistancesInfo = {
@@ -199,6 +194,29 @@ namespace {
         openspace::properties::Property::Visibility::AdvancedUser
     };
 
+    constexpr openspace::properties::Property::PropertyInfo UseOrientationDataInfo = {
+        "UseOrientationData",
+        "Use Orientation Data",
+        "Include the orietation data in the dataset when rendering the points, if there "
+        "is any. To see the rotation, you also need to set the \"Orientation Render "
+        "Option\" to \"Fixed Rotation\".",
+        openspace::properties::Property::Visibility::AdvancedUser
+    };
+
+    constexpr openspace::properties::Property::PropertyInfo OrientationRenderOptionInfo = {
+        "OrientationRenderOption",
+        "Orientation Render Option",
+        "Controls how the planes for the points will be oriented. \"Camera View "
+        "Direction\" rotates the points so that the plane is orthogonal to the viewing "
+        "direction of the camera (useful for planar displays), and \"Camera Position "
+        "Normal\" rotates the points towards the position of the camera (useful for "
+        "spherical displays, like dome theaters). In both these cases the points will "
+        "be billboarded towards the camera. In contrast, \"Fixed Rotation\" does not "
+        "rotate the points at all based on the camera and should be used when the "
+        "dataset contains orientation information for the points.",
+        openspace::properties::Property::Visibility::AdvancedUser
+    };
+
     constexpr openspace::properties::Property::PropertyInfo NumShownDataPointsInfo = {
         "NumberOfDataPoints",
         "Number of Shown Data Points",
@@ -207,6 +225,13 @@ namespace {
         openspace::properties::Property::Visibility::User
     };
 
+    constexpr openspace::properties::Property::PropertyInfo HasOrientationDataInfo = {
+        "HasOrientationData",
+        "Has Orientation Data",
+        "Set to true if orientation data was read from the dataset",
+        openspace::properties::Property::Visibility::AdvancedUser
+    };
+
     constexpr openspace::properties::Property::PropertyInfo ScaleExponentInfo = {
         "ScaleExponent",
         "Scale Exponent",
@@ -215,7 +240,8 @@ namespace {
         "value should be. If not included, it is computed based on the maximum "
         "positional component of the data points. This is useful for showing the "
         "dataset at all, but you will likely want to change it to something that looks "
-        "good.",
+        "good. Note that a scale exponent of 0 leads to the points having a diameter of "
+        "1 meter, i.e. no exponential scaling.",
         openspace::properties::Property::Visibility::User
     };
 
@@ -298,7 +324,7 @@ namespace {
     // fading, sprite texture, color mapping and whether the colors of overlapping points
     // should be blended additively or not.
     //
-    // The point size depends on a few different things:
+    // The points are rendered as planes whose size depends on a few different things:
     //
     // - At the core, scaling is done based on an exponential value, the 'ScaleExponent'.
     //   A relatively small change to this value will lead to a large change in size.
@@ -312,6 +338,9 @@ namespace {
     // - There is also an option to limit the size of the points based on a given max
     //   size value.
     //
+    // - And an option to scale the points based on a data value (see 'SizeMapping' in
+    //   'SizeSettings')
+    //
     // - To easily change the visual size of the points, the multiplicative 'ScaleFactor'
     //   may be used. A value of 2 makes the points twice as large, visually, compared
     //   to 1.
@@ -364,10 +393,14 @@ namespace {
 
         enum class [[codegen::map(RenderOption)]] RenderOption {
             ViewDirection [[codegen::key("Camera View Direction")]],
-            PositionNormal [[codegen::key("Camera Position Normal")]]
+            PositionNormal [[codegen::key("Camera Position Normal")]],
+            FixedRotation [[codegen::key("Fixed Rotation")]]
         };
-        // [[codegen::verbatim(RenderOptionInfo.description)]]
-        std::optional<RenderOption> renderOption;
+        // [[codegen::verbatim(OrientationRenderOptionInfo.description)]]
+        std::optional<RenderOption> orientationRenderOption;
+
+        // [[codegen::verbatim(UseOrientationDataInfo.description)]]
+        std::optional<bool> useOrientationData;
 
         // [[codegen::verbatim(UseAdditiveBlendingInfo.description)]]
         std::optional<bool> useAdditiveBlending;
@@ -465,7 +498,7 @@ documentation::Documentation RenderablePointCloud::Documentation() {
 RenderablePointCloud::SizeSettings::SizeSettings(const ghoul::Dictionary& dictionary)
     : properties::PropertyOwner({ "Sizing", "Sizing", ""})
     , scaleExponent(ScaleExponentInfo, 1.f, 0.f, 25.f)
-    , scaleFactor(ScaleFactorInfo, 1.f, 0.f, 50.f)
+    , scaleFactor(ScaleFactorInfo, 1.f, 0.f, 100.f)
     , useMaxSizeControl(UseMaxSizeControlInfo, false)
     , maxAngularSize(MaxSizeInfo, 1.f, 0.f, 45.f)
 {
@@ -586,8 +619,13 @@ RenderablePointCloud::RenderablePointCloud(const ghoul::Dictionary& dictionary)
     , _fading(dictionary)
     , _useAdditiveBlending(UseAdditiveBlendingInfo, true)
     , _drawElements(DrawElementsInfo, true)
-    , _renderOption(RenderOptionInfo, properties::OptionProperty::DisplayType::Dropdown)
+    , _useRotation(UseOrientationDataInfo, false)
+    , _renderOption(
+        OrientationRenderOptionInfo,
+        properties::OptionProperty::DisplayType::Dropdown
+    )
     , _nDataPoints(NumShownDataPointsInfo, 0)
+    , _hasOrientationData(HasOrientationDataInfo, false)
 {
     ZoneScoped;
 
@@ -609,15 +647,20 @@ RenderablePointCloud::RenderablePointCloud(const ghoul::Dictionary& dictionary)
 
     _renderOption.addOption(RenderOption::ViewDirection, "Camera View Direction");
     _renderOption.addOption(RenderOption::PositionNormal, "Camera Position Normal");
+    _renderOption.addOption(RenderOption::FixedRotation, "Fixed Rotation");
 
-    if (p.renderOption.has_value()) {
-        _renderOption = codegen::map<RenderOption>(*p.renderOption);
+    if (p.orientationRenderOption.has_value()) {
+        _renderOption = codegen::map<RenderOption>(*p.orientationRenderOption);
     }
     else {
         _renderOption = RenderOption::ViewDirection;
     }
     addProperty(_renderOption);
 
+    _useRotation = p.useOrientationData.value_or(_useRotation);
+    _useRotation.onChange([this]() { _dataIsDirty = true; });
+    addProperty(_useRotation);
+
     _useAdditiveBlending = p.useAdditiveBlending.value_or(_useAdditiveBlending);
     addProperty(_useAdditiveBlending);
 
@@ -669,10 +712,11 @@ RenderablePointCloud::RenderablePointCloud(const ghoul::Dictionary& dictionary)
 
     _transformationMatrix = p.transformationMatrix.value_or(_transformationMatrix);
 
-    if (p.sizeSettings.has_value() && p.sizeSettings->sizeMapping.has_value()) {
+    if (_sizeSettings.sizeMapping != nullptr) {
         _sizeSettings.sizeMapping->parameterOption.onChange(
             [this]() { _dataIsDirty = true; }
         );
+        _sizeSettings.sizeMapping->isRadius.onChange([this]() { _dataIsDirty = true; });
         _hasDatavarSize = true;
     }
 
@@ -728,6 +772,9 @@ RenderablePointCloud::RenderablePointCloud(const ghoul::Dictionary& dictionary)
 
     _nDataPoints.setReadOnly(true);
     addProperty(_nDataPoints);
+
+    _hasOrientationData.setReadOnly(true);
+    addProperty(_hasOrientationData);
 }
 
 bool RenderablePointCloud::isReady() const {
@@ -768,6 +815,7 @@ void RenderablePointCloud::initialize() {
         }
 
         _nDataPoints = static_cast<unsigned int>(_dataset.entries.size());
+        _hasOrientationData = _dataset.orientationDataIndex >= 0;
 
         // If no scale exponent was specified, compute one that will at least show the
         // points based on the scale of the positions in the dataset
@@ -835,9 +883,9 @@ void RenderablePointCloud::initializeShadersAndGlExtras() {
         []() {
             return global::renderEngine->buildRenderProgram(
                 "RenderablePointCloud",
-                absPath("${MODULE_BASE}/shaders/pointcloud/billboardpoint_vs.glsl"),
-                absPath("${MODULE_BASE}/shaders/pointcloud/billboardpoint_fs.glsl"),
-                absPath("${MODULE_BASE}/shaders/pointcloud/billboardpoint_gs.glsl")
+                absPath("${MODULE_BASE}/shaders/pointcloud/pointcloud_vs.glsl"),
+                absPath("${MODULE_BASE}/shaders/pointcloud/pointcloud_fs.glsl"),
+                absPath("${MODULE_BASE}/shaders/pointcloud/pointcloud_gs.glsl")
             );
         }
     );
@@ -1090,11 +1138,11 @@ float RenderablePointCloud::computeDistanceFadeValue(const RenderData& data) con
 
 void RenderablePointCloud::setExtraUniforms() {}
 
-void RenderablePointCloud::renderBillboards(const RenderData& data,
-                                            const glm::dmat4& modelMatrix,
-                                            const glm::dvec3& orthoRight,
-                                            const glm::dvec3& orthoUp,
-                                            float fadeInVariable)
+void RenderablePointCloud::renderPoints(const RenderData& data,
+                                        const glm::dmat4& modelMatrix,
+                                        const glm::dvec3& orthoRight,
+                                        const glm::dvec3& orthoUp,
+                                        float fadeInVariable)
 {
     if (!_hasDataFile || _dataset.entries.empty()) {
         return;
@@ -1164,7 +1212,7 @@ void RenderablePointCloud::renderBillboards(const RenderData& data,
     _program->setUniform(_uniformCache.outlineColor, _colorSettings.outlineColor);
     _program->setUniform(_uniformCache.outlineWeight, _colorSettings.outlineWeight);
 
-    bool useColorMap = _hasColorMapFile && _colorSettings.colorMapping->enabled &&
+    bool useColorMap = hasColorData() && _colorSettings.colorMapping->enabled &&
         _colorSettings.colorMapping->texture();
 
     _program->setUniform(_uniformCache.useColormap, useColorMap);
@@ -1212,6 +1260,8 @@ void RenderablePointCloud::renderBillboards(const RenderData& data,
         );
     }
 
+    _program->setUniform(_uniformCache.useOrientationData, useOrientationData());
+
     bool useTexture = _hasSpriteTexture && _texture.enabled;
     _program->setUniform(_uniformCache.hasSpriteTexture, useTexture);
 
@@ -1275,7 +1325,7 @@ void RenderablePointCloud::render(const RenderData& data, RendererTasks&) {
     glm::dvec3 orthoUp = glm::normalize(glm::cross(cameraViewDirectionWorld, orthoRight));
 
     if (_hasDataFile && _drawElements) {
-        renderBillboards(data, modelMatrix, orthoRight, orthoUp, fadeInVar);
+        renderPoints(data, modelMatrix, orthoRight, orthoUp, fadeInVar);
     }
 
     if (_hasLabels) {
@@ -1314,10 +1364,52 @@ glm::dvec3 RenderablePointCloud::transformedPosition(
     return glm::dvec3(_transformationMatrix * position);
 }
 
+glm::quat RenderablePointCloud::orientationQuaternion(
+                                                const dataloader::Dataset::Entry& e) const
+{
+    const int orientationDataIndex = _dataset.orientationDataIndex;
+
+    const glm::vec3 u = glm::normalize(glm::vec3(
+        _transformationMatrix *
+        glm::dvec4(
+            e.data[orientationDataIndex + 0],
+            e.data[orientationDataIndex + 1],
+            e.data[orientationDataIndex + 2],
+            1.f
+        )
+    ));
+
+    const glm::vec3 v = glm::normalize(glm::vec3(
+        _transformationMatrix *
+        glm::dvec4(
+            e.data[orientationDataIndex + 3],
+            e.data[orientationDataIndex + 4],
+            e.data[orientationDataIndex + 5],
+            1.f
+        )
+    ));
+
+    // Get the quaternion that represents the rotation from XY plane to the plane that is
+    // spanned by the UV vectors.
+
+    // First rotate to align the z-axis with plane normal
+    const glm::vec3 planeNormal = glm::normalize(glm::cross(u, v));
+    glm::quat q = glm::normalize(glm::rotation(glm::vec3(0.f, 0.f, 1.f), planeNormal));
+
+    // Add rotation around plane normal (rotate new x-axis to u)
+    const glm::vec3 rotatedRight = glm::normalize(
+        glm::vec3(glm::mat4_cast(q) * glm::vec4(1.f, 0.f, 0.f, 1.f))
+    );
+    q = glm::normalize(glm::rotation(rotatedRight, u)) * q;
+
+    return q;
+}
+
 int RenderablePointCloud::nAttributesPerPoint() const {
     int n = 3; // position
-    n += _hasColorMapFile ? 1 : 0;
-    n += _hasDatavarSize ? 1 : 0;
+    n += hasColorData() ? 1 : 0;
+    n += hasSizeData() ? 1 : 0;
+    n += useOrientationData() ? 4 : 0;
     n += _hasSpriteTexture ? 1 : 0; // texture id
     return n;
 }
@@ -1370,14 +1462,18 @@ void RenderablePointCloud::updateBufferData() {
 
     offset = bufferVertexAttribute("in_position", 3, attibutesPerPoint, offset);
 
-    if (_hasColorMapFile) {
+    if (hasColorData()) {
         offset = bufferVertexAttribute("in_colorParameter", 1, attibutesPerPoint, offset);
     }
 
-    if (_hasDatavarSize) {
+    if (hasSizeData()) {
         offset = bufferVertexAttribute("in_scalingParameter", 1, attibutesPerPoint, offset);
     }
 
+    if (useOrientationData()) {
+        offset = bufferVertexAttribute("in_orientation", 4, attibutesPerPoint, offset);
+    }
+
     if (_hasSpriteTexture) {
         offset = bufferVertexAttribute("in_textureLayer", 1, attibutesPerPoint, offset);
     }
@@ -1432,7 +1528,7 @@ int RenderablePointCloud::currentColorParameterIndex() const {
         _colorSettings.colorMapping->dataColumn;
 
     if (!_hasColorMapFile || property.options().empty()) {
-        return 0;
+        return -1;
     }
 
     return _dataset.index(property.option().description);
@@ -1443,12 +1539,32 @@ int RenderablePointCloud::currentSizeParameterIndex() const {
         _sizeSettings.sizeMapping->parameterOption;
 
     if (!_hasDatavarSize || property.options().empty()) {
-        return 0;
+        return -1;
     }
 
     return _dataset.index(property.option().description);
 }
 
+bool RenderablePointCloud::hasColorData() const {
+    const int colorParamIndex = currentColorParameterIndex();
+    return _hasColorMapFile && colorParamIndex >= 0;
+}
+
+bool RenderablePointCloud::hasSizeData() const {
+    const int sizeParamIndex = currentSizeParameterIndex();
+    return _hasDatavarSize && sizeParamIndex >= 0;
+}
+
+bool RenderablePointCloud::hasMultiTextureData() const {
+    // What datavar is the texture, if any
+    const int textureIdIndex = _dataset.textureDataIndex;
+    return _hasSpriteTexture && textureIdIndex >= 0;
+}
+
+bool RenderablePointCloud::useOrientationData() const {
+    return _hasOrientationData && _useRotation;
+}
+
 void RenderablePointCloud::addPositionDataForPoint(unsigned int index,
                                                    std::vector<float>& result,
                                                    double& maxRadius) const
@@ -1470,20 +1586,35 @@ void RenderablePointCloud::addColorAndSizeDataForPoint(unsigned int index,
 {
     const dataloader::Dataset::Entry& e = _dataset.entries[index];
 
-    int colorParamIndex = currentColorParameterIndex();
-    if (_hasColorMapFile && colorParamIndex >= 0) {
+    if (hasColorData()) {
+        const int colorParamIndex = currentColorParameterIndex();
         result.push_back(e.data[colorParamIndex]);
     }
 
-    int sizeParamIndex = currentSizeParameterIndex();
-    if (_hasDatavarSize && sizeParamIndex >= 0) {
+    if (hasSizeData()) {
+        const int sizeParamIndex = currentSizeParameterIndex();
         // @TODO: Consider more detailed control over the scaling. Currently the value
         // is multiplied with the value as is. Should have similar mapping properties
         // as the color mapping
-        result.push_back(e.data[sizeParamIndex]);
+
+        // Convert to diameter if data is given as radius
+        float multiplier = _sizeSettings.sizeMapping->isRadius ? 2.f : 1.f;
+        result.push_back(multiplier * e.data[sizeParamIndex]);
     }
 }
 
+void RenderablePointCloud::addOrientationDataForPoint(unsigned int index,
+                                                      std::vector<float>& result) const
+{
+    const dataloader::Dataset::Entry& e = _dataset.entries[index];
+    glm::quat q = orientationQuaternion(e);
+
+    result.push_back(q.x);
+    result.push_back(q.y);
+    result.push_back(q.z);
+    result.push_back(q.w);
+}
+
 std::vector<float> RenderablePointCloud::createDataSlice() {
     ZoneScoped;
 
@@ -1491,9 +1622,6 @@ std::vector<float> RenderablePointCloud::createDataSlice() {
         return std::vector<float>();
     }
 
-    // What datavar is the texture, if any
-    int textureIdIndex = _dataset.textureDataIndex;
-
     double maxRadius = 0.0;
 
     // One sub-array per texture array, since each of these will correspond to a separate
@@ -1511,13 +1639,14 @@ std::vector<float> RenderablePointCloud::createDataSlice() {
         const dataloader::Dataset::Entry& e = _dataset.entries[i];
 
         unsigned int subresultIndex = 0;
+        // Default texture layer for single texture is zero
         float textureLayer = 0.f;
 
         bool useMultiTexture = (_textureMode == TextureInputMode::Multi) &&
-            (textureIdIndex >= 0);
+            hasMultiTextureData();
 
-        if (_hasSpriteTexture && useMultiTexture) {
-            int texId = static_cast<int>(e.data[textureIdIndex]);
+        if (useMultiTexture) {
+            int texId = static_cast<int>(e.data[_dataset.textureDataIndex]);
             size_t texIndex = _indexInDataToTextureIndex[texId];
             textureLayer = static_cast<float>(
                 _textureIndexToArrayMap[texIndex].layer
@@ -1531,6 +1660,10 @@ std::vector<float> RenderablePointCloud::createDataSlice() {
         addPositionDataForPoint(i, subArrayToUse, maxRadius);
         addColorAndSizeDataForPoint(i, subArrayToUse);
 
+        if (useOrientationData()) {
+            addOrientationDataForPoint(i, subArrayToUse);
+        }
+
         // Texture layer
         if (_hasSpriteTexture) {
             subArrayToUse.push_back(static_cast<float>(textureLayer));
diff --git a/modules/base/rendering/pointcloud/renderablepointcloud.h b/modules/base/rendering/pointcloud/renderablepointcloud.h
index 28f5d28e62..6051d66e67 100644
--- a/modules/base/rendering/pointcloud/renderablepointcloud.h
+++ b/modules/base/rendering/pointcloud/renderablepointcloud.h
@@ -98,6 +98,7 @@ protected:
     virtual void preUpdate();
 
     glm::dvec3 transformedPosition(const dataloader::Dataset::Entry& e) const;
+    glm::quat orientationQuaternion(const dataloader::Dataset::Entry& e) const;
 
     virtual int nAttributesPerPoint() const;
 
@@ -118,10 +119,17 @@ protected:
     /// Find the index of the currently chosen size parameter in the dataset
     int currentSizeParameterIndex() const;
 
+    bool hasColorData() const;
+    bool hasSizeData() const;
+    bool hasMultiTextureData() const;
+    bool useOrientationData() const;
+
     virtual void addPositionDataForPoint(unsigned int index, std::vector<float>& result,
         double& maxRadius) const;
     virtual void addColorAndSizeDataForPoint(unsigned int index,
         std::vector<float>& result) const;
+    virtual void addOrientationDataForPoint(unsigned int index,
+        std::vector<float>& result) const;
 
     std::vector<float> createDataSlice();
 
@@ -146,7 +154,7 @@ protected:
 
     float computeDistanceFadeValue(const RenderData& data) const;
 
-    void renderBillboards(const RenderData& data, const glm::dmat4& modelMatrix,
+    void renderPoints(const RenderData& data, const glm::dmat4& modelMatrix,
         const glm::dvec3& orthoRight, const glm::dvec3& orthoUp, float fadeInVariable);
 
     gl::GLenum internalGlFormat(bool useAlpha) const;
@@ -194,11 +202,13 @@ protected:
     Fading _fading;
 
     properties::BoolProperty _useAdditiveBlending;
+    properties::BoolProperty _useRotation;
 
     properties::BoolProperty _drawElements;
     properties::OptionProperty _renderOption;
 
     properties::UIntProperty _nDataPoints;
+    properties::BoolProperty _hasOrientationData;
 
     struct Texture : properties::PropertyOwner {
         Texture();
@@ -221,7 +231,7 @@ protected:
         cmapRangeMin, cmapRangeMax, nanColor, useNanColor, hideOutsideRange,
         enableMaxSizeControl, aboveRangeColor, useAboveRangeColor, belowRangeColor,
         useBelowRangeColor, hasDvarScaling, dvarScaleFactor, enableOutline, outlineColor,
-        outlineWeight, aspectRatioScale
+        outlineWeight, aspectRatioScale, useOrientationData
     ) _uniformCache;
 
     std::filesystem::path _dataFile;
diff --git a/modules/base/rendering/pointcloud/sizemappingcomponent.cpp b/modules/base/rendering/pointcloud/sizemappingcomponent.cpp
index c9e3bdad8d..ae01cefdc9 100644
--- a/modules/base/rendering/pointcloud/sizemappingcomponent.cpp
+++ b/modules/base/rendering/pointcloud/sizemappingcomponent.cpp
@@ -25,6 +25,7 @@
 #include <modules/base/rendering/pointcloud/sizemappingcomponent.h>
 
 #include <openspace/documentation/documentation.h>
+#include <openspace/util/distanceconversion.h>
 #include <ghoul/logging/logmanager.h>
 
 namespace {
@@ -57,6 +58,14 @@ namespace {
         openspace::properties::Property::Visibility::AdvancedUser
     };
 
+    constexpr openspace::properties::Property::PropertyInfo IsRadiusInfo = {
+        "IsRadius",
+        "Size is Radius",
+        "If true, the size value in the data is interpreted as the radius of the points. "
+        "Otherwise, it is interpreted as the diameter.",
+        openspace::properties::Property::Visibility::AdvancedUser
+    };
+
     struct [[codegen::Dictionary(SizeMappingComponent)]] Parameters {
         // [[codegen::verbatim(EnabledInfo.description)]]
         std::optional<bool> enabled;
@@ -69,7 +78,36 @@ namespace {
         std::optional<std::string> parameter;
 
         // [[codegen::verbatim(ScaleFactorInfo.description)]]
-        std::optional<float> scaleFactor;
+        enum class [[codegen::map(openspace::DistanceUnit)]] ScaleUnit {
+            Nanometer,
+            Micrometer,
+            Millimeter,
+            Centimeter,
+            Decimeter,
+            Meter,
+            Kilometer,
+            AU,
+            Lighthour,
+            Lightday,
+            Lightmonth,
+            Lightyear,
+            Parsec,
+            Kiloparsec,
+            Megaparsec,
+            Gigaparsec,
+            Gigalightyear
+        };
+
+        // The scale to use for the size values in the dataset, given as either a string
+        // representing a specific unit or a value to multiply all the datapoints with
+        // to convert the value to meter. The resulting value will be applied as a
+        // multiplicative factor. For example, if the size data is given in is in
+        // kilometers then specify either <code>ScaleFactor = 'Kilometer'</code> or
+        // <code>ScaleFactor = 1000.0</code>.
+        std::optional<std::variant<ScaleUnit, double>> scaleFactor;
+
+        // [[codegen::verbatim(IsRadiusInfo.description)]]
+        std::optional<bool> isRadius;
     };
 #include "sizemappingcomponent_codegen.cpp"
 }  // namespace
@@ -88,10 +126,12 @@ SizeMappingComponent::SizeMappingComponent()
         properties::OptionProperty::DisplayType::Dropdown
     )
     , scaleFactor(ScaleFactorInfo, 1.f, 0.f, 1000.f)
+    , isRadius(IsRadiusInfo, false)
 {
     addProperty(enabled);
     addProperty(parameterOption);
     addProperty(scaleFactor);
+    addProperty(isRadius);
 }
 
 SizeMappingComponent::SizeMappingComponent(const ghoul::Dictionary& dictionary)
@@ -125,7 +165,19 @@ SizeMappingComponent::SizeMappingComponent(const ghoul::Dictionary& dictionary)
         ));
     }
 
-    scaleFactor = p.scaleFactor.value_or(scaleFactor);
+    if (p.scaleFactor.has_value()) {
+        if (std::holds_alternative<Parameters::ScaleUnit>(*p.scaleFactor)) {
+            const Parameters::ScaleUnit scaleUnit =
+                std::get<Parameters::ScaleUnit>(*p.scaleFactor);
+            const DistanceUnit distanceUnit = codegen::map<DistanceUnit>(scaleUnit);
+            scaleFactor = toMeter(distanceUnit);
+        }
+        else if (std::holds_alternative<double>(*p.scaleFactor)) {
+            scaleFactor = std::get<double>(*p.scaleFactor);
+        }
+    }
+
+    isRadius = p.isRadius.value_or(isRadius);
 }
 
 } // namespace openspace
diff --git a/modules/base/rendering/pointcloud/sizemappingcomponent.h b/modules/base/rendering/pointcloud/sizemappingcomponent.h
index 800436a09f..3155309e1a 100644
--- a/modules/base/rendering/pointcloud/sizemappingcomponent.h
+++ b/modules/base/rendering/pointcloud/sizemappingcomponent.h
@@ -49,6 +49,7 @@ struct SizeMappingComponent : public properties::PropertyOwner {
     properties::BoolProperty enabled;
     properties::OptionProperty parameterOption;
     properties::FloatProperty scaleFactor;
+    properties::BoolProperty isRadius;
 };
 
 } // namespace openspace
diff --git a/modules/base/shaders/pointcloud/billboardpoint_fs.glsl b/modules/base/shaders/pointcloud/pointcloud_fs.glsl
similarity index 98%
rename from modules/base/shaders/pointcloud/billboardpoint_fs.glsl
rename to modules/base/shaders/pointcloud/pointcloud_fs.glsl
index 9c0b0ef7b7..ee160705f1 100644
--- a/modules/base/shaders/pointcloud/billboardpoint_fs.glsl
+++ b/modules/base/shaders/pointcloud/pointcloud_fs.glsl
@@ -103,9 +103,6 @@ Fragment getFragment() {
   }
 
   fullColor.a *= opacity * fadeInValue;
-  if (fullColor.a < 0.01) {
-    discard;
-  }
 
   Fragment frag;
   frag.color = fullColor;
diff --git a/modules/base/shaders/pointcloud/billboardpoint_gs.glsl b/modules/base/shaders/pointcloud/pointcloud_gs.glsl
similarity index 83%
rename from modules/base/shaders/pointcloud/billboardpoint_gs.glsl
rename to modules/base/shaders/pointcloud/pointcloud_gs.glsl
index a3114b8dd9..7e8af327c4 100644
--- a/modules/base/shaders/pointcloud/billboardpoint_gs.glsl
+++ b/modules/base/shaders/pointcloud/pointcloud_gs.glsl
@@ -30,6 +30,7 @@ layout(points) in;
 flat in float textureLayer[];
 flat in float colorParameter[];
 flat in float scalingParameter[];
+flat in vec4 orientation[]; // quaternion
 
 layout(triangle_strip, max_vertices = 4) out;
 flat out float gs_colorParameter;
@@ -48,6 +49,7 @@ uniform dmat4 modelMatrix;
 uniform bool enableMaxSizeControl;
 uniform bool hasDvarScaling;
 uniform float dvarScaleFactor;
+uniform bool useOrientationData;
 
 // RenderOption: CameraViewDirection
 uniform vec3 up;
@@ -72,6 +74,24 @@ const vec2 corners[4] = vec2[4](
 
 const int RenderOptionCameraViewDirection = 0;
 const int RenderOptionCameraPositionNormal = 1;
+const int RenderOptionFixedRotation = 2;
+
+// Quaternion math code from:
+// https://gist.github.com/mattatz/40a91588d5fb38240403f198a938a593
+
+vec4 quatMult(vec4 q1, vec4 q2) {
+  return vec4(
+    q2.xyz * q1.w + q1.xyz * q2.w + cross(q1.xyz, q2.xyz),
+    q1.w * q2.w - dot(q1.xyz, q2.xyz)
+  );
+}
+
+// Vector rotation with a quaternion
+// http://mathworld.wolfram.com/Quaternion.html
+vec3 rotate_vector(vec3 v, vec4 q) {
+  vec4 q_conjugate = q * vec4(-1.0, -1.0, -1.0, 1.0);
+  return quatMult(q, quatMult(vec4(v, 0.0), q_conjugate)).xyz;
+}
 
 void main() {
   vec4 pos = gl_in[0].gl_Position;
@@ -85,21 +105,32 @@ void main() {
     scaleMultiply *= scalingParameter[0] * dvarScaleFactor;
   }
 
-  vec3 scaledRight = vec3(0.0);
-  vec3 scaledUp = vec3(0.0);
+  vec3 scaledRight = vec3(1.0, 0.0, 0.0);
+  vec3 scaledUp = vec3(0.0, 1.0, 0.0);
 
   if (renderOption == RenderOptionCameraViewDirection) {
-    scaledRight = scaleMultiply * right * 0.5;
-    scaledUp = scaleMultiply * up * 0.5;
+    scaledRight = right;
+    scaledUp = up;
   }
   else if (renderOption == RenderOptionCameraPositionNormal) {
     vec3 normal = vec3(normalize(cameraPosition - dpos.xyz));
     vec3 newRight = normalize(cross(cameraLookUp, normal));
     vec3 newUp = cross(normal, newRight);
 
-    scaledRight = scaleMultiply * newRight * 0.5;
-    scaledUp = scaleMultiply * newUp * 0.5;
+    scaledRight = newRight;
+    scaledUp = newUp;
   }
+  else if (renderOption == RenderOptionFixedRotation) {
+    if (useOrientationData) {
+        vec4 quat = orientation[0];
+        scaledRight = normalize(rotate_vector(scaledRight, quat));
+        scaledUp =  normalize(rotate_vector(scaledUp, quat));
+    }
+    // Else use default
+  }
+
+  scaledRight *= scaleMultiply * 0.5;
+  scaledUp *= scaleMultiply * 0.5;
 
   if (enableMaxSizeControl) {
     // Limit the max size of the points, as the angle in "FOV" that the point is allowed
diff --git a/modules/base/shaders/pointcloud/billboardpoint_interpolated_vs.glsl b/modules/base/shaders/pointcloud/pointcloud_interpolated_vs.glsl
similarity index 71%
rename from modules/base/shaders/pointcloud/billboardpoint_interpolated_vs.glsl
rename to modules/base/shaders/pointcloud/pointcloud_interpolated_vs.glsl
index a6a3407f2e..5b28d95e7b 100644
--- a/modules/base/shaders/pointcloud/billboardpoint_interpolated_vs.glsl
+++ b/modules/base/shaders/pointcloud/pointcloud_interpolated_vs.glsl
@@ -40,6 +40,9 @@ in float in_scalingParameter1;
 
 in float in_textureLayer;
 
+in vec4 in_orientation0; // quaternion
+in vec4 in_orientation1; // quaternion
+
 uniform bool useSpline;
 uniform float interpolationValue;
 
@@ -47,6 +50,8 @@ flat out float textureLayer;
 flat out float colorParameter;
 flat out float scalingParameter;
 
+flat out vec4 orientation; // quaternion
+
 float interpolateDataValue(float v0, float v1, float t) {
   const float Epsilon = 1E-7;
   const float NaN = log(-1.0); // undefined
@@ -73,6 +78,53 @@ vec3 interpolateCatmullRom(float t, vec3 p0, vec3 p1, vec3 p2, vec3 p3) {
     );
 }
 
+// Quaternion math from: https://gist.github.com/mattatz/40a91588d5fb38240403f198a938a593
+vec4 quaternionSlerp(vec4 a, vec4 b, float t) {
+    // if either input is zero, return the other.
+    if (length(a) == 0.0) {
+        if (length(b) == 0.0) {
+            return vec4(0.0, 0.0, 0.0, 1.0);
+        }
+        return b;
+    }
+    else if (length(b) == 0.0) {
+        return a;
+    }
+
+    float cosHalfAngle = a.w * b.w + dot(a.xyz, b.xyz);
+
+    if (cosHalfAngle >= 1.0 || cosHalfAngle <= -1.0) {
+        return a;
+    }
+    else if (cosHalfAngle < 0.0) {
+        b.xyz = -b.xyz;
+        b.w = -b.w;
+        cosHalfAngle = -cosHalfAngle;
+    }
+
+    float blendA;
+    float blendB;
+    if (cosHalfAngle < 0.99) {
+        // Do proper slerp for big angles
+        float halfAngle = acos(cosHalfAngle);
+        float sinHalfAngle = sin(halfAngle);
+        float oneOverSinHalfAngle = 1.0 / sinHalfAngle;
+        blendA = sin(halfAngle * (1.0 - t)) * oneOverSinHalfAngle;
+        blendB = sin(halfAngle * t) * oneOverSinHalfAngle;
+    }
+    else {
+        // Do lerp if angle is really small
+        blendA = 1.0 - t;
+        blendB = t;
+    }
+
+    vec4 result = vec4(blendA * a.xyz + blendB * b.xyz, blendA * a.w + blendB * b.w);
+    if (length(result) > 0.0) {
+        return normalize(result);
+    }
+    return vec4(0.0, 0.0, 0.0, 1.0);
+}
+
 void main() {
   float t = interpolationValue;
 
@@ -90,6 +142,8 @@ void main() {
     );
   }
 
+  orientation = quaternionSlerp(in_orientation0, in_orientation1, t);
+
   textureLayer = in_textureLayer;
 
   gl_Position = vec4(position, 1.0);
diff --git a/modules/base/shaders/pointcloud/billboardpoint_vs.glsl b/modules/base/shaders/pointcloud/pointcloud_vs.glsl
similarity index 95%
rename from modules/base/shaders/pointcloud/billboardpoint_vs.glsl
rename to modules/base/shaders/pointcloud/pointcloud_vs.glsl
index 2a1e661ba5..aabc12c904 100644
--- a/modules/base/shaders/pointcloud/billboardpoint_vs.glsl
+++ b/modules/base/shaders/pointcloud/pointcloud_vs.glsl
@@ -30,14 +30,17 @@ in vec3 in_position;
 in float in_textureLayer;
 in float in_colorParameter;
 in float in_scalingParameter;
+in vec4 in_orientation; // quaternion
 
 flat out float textureLayer;
 flat out float colorParameter;
 flat out float scalingParameter;
+flat out vec4 orientation; // quaternion
 
 void main() {
   textureLayer = in_textureLayer;
   colorParameter = in_colorParameter;
   scalingParameter = in_scalingParameter;
+  orientation = in_orientation;
   gl_Position = vec4(in_position, 1.0);
 }
diff --git a/modules/digitaluniverse/CMakeLists.txt b/modules/digitaluniverse/CMakeLists.txt
index df3b0b2eeb..0815b5df8e 100644
--- a/modules/digitaluniverse/CMakeLists.txt
+++ b/modules/digitaluniverse/CMakeLists.txt
@@ -26,13 +26,11 @@ include(${PROJECT_SOURCE_DIR}/support/cmake/module_definition.cmake)
 
 set(HEADER_FILES
   rendering/renderabledumeshes.h
-  rendering/renderableplanescloud.h
 )
 source_group("Header Files" FILES ${HEADER_FILES})
 
 set(SOURCE_FILES
   rendering/renderabledumeshes.cpp
-  rendering/renderableplanescloud.cpp
 )
 source_group("Source Files" FILES ${SOURCE_FILES})
 
diff --git a/modules/digitaluniverse/digitaluniversemodule.cpp b/modules/digitaluniverse/digitaluniversemodule.cpp
index 38f510df56..03d69f996e 100644
--- a/modules/digitaluniverse/digitaluniversemodule.cpp
+++ b/modules/digitaluniverse/digitaluniversemodule.cpp
@@ -25,7 +25,6 @@
 #include <modules/digitaluniverse/digitaluniversemodule.h>
 
 #include <modules/digitaluniverse/rendering/renderabledumeshes.h>
-#include <modules/digitaluniverse/rendering/renderableplanescloud.h>
 #include <openspace/documentation/documentation.h>
 #include <openspace/rendering/renderable.h>
 #include <openspace/util/factorymanager.h>
@@ -46,7 +45,6 @@ void DigitalUniverseModule::internalInitialize(const ghoul::Dictionary&) {
         FactoryManager::ref().factory<Renderable>();
     ghoul_assert(fRenderable, "Renderable factory was not created");
 
-    fRenderable->registerClass<RenderablePlanesCloud>("RenderablePlanesCloud");
     fRenderable->registerClass<RenderableDUMeshes>("RenderableDUMeshes");
 }
 
@@ -57,7 +55,6 @@ void DigitalUniverseModule::internalDeinitializeGL() {
 
 std::vector<documentation::Documentation> DigitalUniverseModule::documentations() const {
     return {
-        RenderablePlanesCloud::Documentation(),
         RenderableDUMeshes::Documentation()
     };
 }
diff --git a/modules/digitaluniverse/rendering/renderableplanescloud.cpp b/modules/digitaluniverse/rendering/renderableplanescloud.cpp
deleted file mode 100644
index b26d2029a8..0000000000
--- a/modules/digitaluniverse/rendering/renderableplanescloud.cpp
+++ /dev/null
@@ -1,669 +0,0 @@
-/*****************************************************************************************
- *                                                                                       *
- * OpenSpace                                                                             *
- *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
- *                                                                                       *
- * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
- * software and associated documentation files (the "Software"), to deal in the Software *
- * without restriction, including without limitation the rights to use, copy, modify,    *
- * merge, publish, distribute, sublicense, and/or sell copies of the Software, and to    *
- * permit persons to whom the Software is furnished to do so, subject to the following   *
- * conditions:                                                                           *
- *                                                                                       *
- * The above copyright notice and this permission notice shall be included in all copies *
- * or substantial portions of the Software.                                              *
- *                                                                                       *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED,   *
- * INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A         *
- * PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT    *
- * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF  *
- * CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE  *
- * OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                                         *
- ****************************************************************************************/
-
-#include <modules/digitaluniverse/rendering/renderableplanescloud.h>
-
-#include <modules/digitaluniverse/digitaluniversemodule.h>
-#include <openspace/documentation/documentation.h>
-#include <openspace/documentation/verifier.h>
-#include <openspace/engine/globals.h>
-#include <openspace/rendering/renderengine.h>
-#include <openspace/util/updatestructures.h>
-#include <ghoul/filesystem/filesystem.h>
-#include <ghoul/io/texture/texturereader.h>
-#include <ghoul/logging/logmanager.h>
-#include <ghoul/misc/profiling.h>
-#include <ghoul/opengl/openglstatecache.h>
-#include <ghoul/opengl/programobject.h>
-#include <ghoul/opengl/texture.h>
-#include <ghoul/opengl/textureunit.h>
-#include <array>
-#include <filesystem>
-#include <fstream>
-#include <optional>
-#include <string>
-
-namespace {
-    constexpr std::string_view _loggerCat = "RenderablePlanesCloud";
-
-    constexpr int PlanesVertexDataSize = 36;
-
-    constexpr std::array<const char*, 4> UniformNames = {
-        "modelViewProjectionTransform", "alphaValue", "fadeInValue", "galaxyTexture"
-    };
-
-    enum BlendMode {
-        BlendModeNormal = 0,
-        BlendModeAdditive
-    };
-
-    constexpr openspace::properties::Property::PropertyInfo ScaleFactorInfo = {
-        "ScaleFactor",
-        "Scale Factor",
-        "This value is used as a multiplicative factor that is applied to the apparent "
-        "size of each point",
-        // @VISIBILITY(2.5)
-        openspace::properties::Property::Visibility::User
-    };
-
-    static const openspace::properties::PropertyOwner::PropertyOwnerInfo LabelsInfo = {
-        "Labels",
-        "Labels",
-        "The labels for the astronomical objects"
-    };
-
-    constexpr openspace::properties::Property::PropertyInfo DrawElementsInfo = {
-        "DrawElements",
-        "Draw Elements",
-        "Enables/Disables the drawing of the astronomical objects",
-        openspace::properties::Property::Visibility::NoviceUser
-    };
-
-    constexpr openspace::properties::Property::PropertyInfo TransformationMatrixInfo = {
-        "TransformationMatrix",
-        "Transformation Matrix",
-        "Transformation matrix to be applied to each astronomical object",
-        openspace::properties::Property::Visibility::Developer
-    };
-
-    constexpr openspace::properties::Property::PropertyInfo BlendModeInfo = {
-        "BlendMode",
-        "Blending Mode",
-        "This determines the blending mode that is applied to this plane",
-        openspace::properties::Property::Visibility::AdvancedUser
-    };
-
-    constexpr openspace::properties::Property::PropertyInfo TexturePathInfo = {
-        "TexturePath",
-        "Texture Path",
-        "This value specifies the path for the textures in disk",
-        openspace::properties::Property::Visibility::AdvancedUser
-    };
-
-    constexpr openspace::properties::Property::PropertyInfo LuminosityInfo = {
-        "Luminosity",
-        "Luminosity variable",
-        "Datavar variable to control the luminosity/size of the astronomical objects",
-        // @VISIBILITY(2.67)
-        openspace::properties::Property::Visibility::User
-    };
-
-    constexpr openspace::properties::Property::PropertyInfo ScaleLuminosityInfo = {
-        "ScaleLuminosity",
-        "ScaleLuminosity variable",
-        "Scaling control for the luminosity/size of the astronomical objects",
-        // @VISIBILITY(2.67)
-        openspace::properties::Property::Visibility::User
-    };
-
-    constexpr openspace::properties::Property::PropertyInfo RenderOptionInfo = {
-        "RenderOption",
-        "Render Option",
-        "Debug option for rendering of billboards and texts",
-        openspace::properties::Property::Visibility::AdvancedUser
-    };
-
-    constexpr openspace::properties::Property::PropertyInfo FadeInDistancesInfo = {
-        "FadeInDistances",
-        "Fade-In Start and End Distances",
-        "These values determine the initial and final distances from the center of "
-        "our galaxy from which the astronomical object will start and end fading-in",
-        openspace::properties::Property::Visibility::AdvancedUser
-    };
-
-    constexpr openspace::properties::Property::PropertyInfo DisableFadeInInfo = {
-        "DisableFadeIn",
-        "Disable Fade-in effect",
-        "Enables/Disables the Fade-in effect",
-        openspace::properties::Property::Visibility::User
-    };
-
-    constexpr openspace::properties::Property::PropertyInfo PlaneMinSizeInfo = {
-        "PlaneMinSize",
-        "Plane Min Size in Pixels",
-        "The min size (in pixels) for the plane representing the astronomical object",
-        openspace::properties::Property::Visibility::AdvancedUser
-    };
-
-    struct [[codegen::Dictionary(RenderablePlanesCloud)]] Parameters {
-        // The path to the SPECK file that contains information about the astronomical
-        // object being rendered
-        std::optional<std::string> file;
-
-        // [[codegen::verbatim(ScaleFactorInfo.description)]]
-        std::optional<float> scaleFactor;
-
-        // [[codegen::verbatim(LabelsInfo.description)]]
-        std::optional<ghoul::Dictionary> labels
-            [[codegen::reference("labelscomponent")]];
-
-        // [[codegen::verbatim(TransformationMatrixInfo.description)]]
-        std::optional<glm::dmat4x4> transformationMatrix;
-
-        enum class BlendMode {
-            Normal,
-            Additive
-        };
-
-        // [[codegen::verbatim(BlendModeInfo.description)]]
-        std::optional<BlendMode> blendMode;
-
-        enum class [[codegen::map(openspace::DistanceUnit)]] Unit {
-            Meter [[codegen::key("m")]],
-            Kilometer [[codegen::key("Km")]],
-            Parsec [[codegen::key("pc")]],
-            Kiloparsec [[codegen::key("Kpc")]],
-            Megaparsec [[codegen::key("Mpc")]],
-            Gigaparsec [[codegen::key("Gpc")]],
-            Gigalightyear [[codegen::key("Gly")]]
-        };
-        std::optional<Unit> unit;
-
-        // [[codegen::verbatim(TexturePathInfo.description)]]
-        std::string texturePath;
-
-        // [[codegen::verbatim(LuminosityInfo.description)]]
-        std::optional<std::string> luminosity;
-
-        // [[codegen::verbatim(ScaleLuminosityInfo.description)]]
-        std::optional<float> scaleLuminosity;
-
-        // [[codegen::verbatim(FadeInDistancesInfo.description)]]
-        std::optional<glm::vec2> fadeInDistances;
-
-        // [[codegen::verbatim(DisableFadeInInfo.description)]]
-        std::optional<bool> disableFadeIn;
-
-        // [[codegen::verbatim(PlaneMinSizeInfo.description)]]
-        std::optional<float> planeMinSize;
-    };
-#include "renderableplanescloud_codegen.cpp"
-}  // namespace
-
-namespace openspace {
-
-documentation::Documentation RenderablePlanesCloud::Documentation() {
-    return codegen::doc<Parameters>("digitaluniverse_RenderablePlanesCloud");
-}
-
-RenderablePlanesCloud::RenderablePlanesCloud(const ghoul::Dictionary& dictionary)
-    : Renderable(dictionary)
-    , _scaleFactor(ScaleFactorInfo, 1.f, 0.f, 1000.f)
-    , _drawElements(DrawElementsInfo, true)
-    , _blendMode(BlendModeInfo, properties::OptionProperty::DisplayType::Dropdown)
-    , _fadeInDistances(
-        FadeInDistancesInfo,
-        glm::vec2(0.f),
-        glm::vec2(0.f),
-        glm::vec2(200000.f)
-    )
-    , _disableFadeInDistance(DisableFadeInInfo, true)
-    , _planeMinSize(PlaneMinSizeInfo, 0.5, 0.0, 500.0)
-    , _renderOption(RenderOptionInfo, properties::OptionProperty::DisplayType::Dropdown)
-{
-    const Parameters p = codegen::bake<Parameters>(dictionary);
-
-    addProperty(Fadeable::_opacity);
-
-    if (p.file.has_value()) {
-        _speckFile = absPath(*p.file);
-        _hasSpeckFile = true;
-        _drawElements.onChange([this]() { _hasSpeckFile = !_hasSpeckFile; });
-        addProperty(_drawElements);
-    }
-
-    // DEBUG:
-    _renderOption.addOption(0, "Camera View Direction");
-    _renderOption.addOption(1, "Camera Position Normal");
-    _renderOption.addOption(2, "Screen center Position Normal");
-    addProperty(_renderOption);
-    //_renderOption = 1;
-
-    if (p.unit.has_value()) {
-        _unit = codegen::map<DistanceUnit>(*p.unit);
-    }
-    else {
-        _unit = DistanceUnit::Meter;
-    }
-
-    _scaleFactor = p.scaleFactor.value_or(_scaleFactor);
-    addProperty(_scaleFactor);
-    _scaleFactor.onChange([this]() { _dataIsDirty = true; });
-
-    if (p.labels.has_value()) {
-        _labels = std::make_unique<LabelsComponent>(*p.labels);
-        _hasLabels = true;
-        addPropertySubOwner(_labels.get());
-        // Fading of the labels should also depend on the fading of the renderable
-        _labels->setParentFadeable(this);
-    }
-
-    _transformationMatrix = p.transformationMatrix.value_or(_transformationMatrix);
-
-    _blendMode.addOptions({
-        { BlendModeNormal, "Normal" },
-        { BlendModeAdditive, "Additive" }
-    });
-    _blendMode.onChange([this]() {
-        BlendMode m = static_cast<BlendMode>(_blendMode.value());
-        switch (m) {
-            case BlendModeNormal:
-                setRenderBin(Renderable::RenderBin::Opaque);
-                break;
-            case BlendModeAdditive:
-                setRenderBin(Renderable::RenderBin::PreDeferredTransparent);
-                break;
-        }
-    });
-
-    if (p.blendMode.has_value()) {
-        switch (*p.blendMode) {
-            case Parameters::BlendMode::Normal:
-                _blendMode = BlendModeNormal;
-                break;
-            case Parameters::BlendMode::Additive:
-                _blendMode = BlendModeAdditive;
-                break;
-        }
-    }
-
-    _texturesPath = absPath(p.texturePath);
-
-    _luminosityVar = p.luminosity.value_or(_luminosityVar);
-    _sluminosity = p.scaleLuminosity.value_or(_sluminosity);
-
-    if (p.fadeInDistances.has_value()) {
-        _fadeInDistances = *p.fadeInDistances;
-        _disableFadeInDistance = false;
-        _fadeInDistances.setViewOption(properties::Property::ViewOptions::MinMaxRange);
-        addProperty(_fadeInDistances);
-        addProperty(_disableFadeInDistance);
-    }
-
-    _planeMinSize = p.planeMinSize.value_or(_planeMinSize);
-
-    if (p.planeMinSize.has_value()) {
-        addProperty(_planeMinSize);
-    }
-}
-
-bool RenderablePlanesCloud::isReady() const {
-    bool isReady = _program && !_dataset.entries.empty();
-
-    // If we have labels, they also need to be loaded
-    if (_hasLabels) {
-        isReady = isReady || _labels->isReady();
-    }
-    return isReady;
-}
-
-void RenderablePlanesCloud::initialize() {
-    ZoneScoped;
-
-    if (_hasSpeckFile && std::filesystem::is_regular_file(_speckFile)) {
-        _dataset = dataloader::data::loadFileWithCache(_speckFile);
-        if (_dataset.entries.empty()) {
-            throw ghoul::RuntimeError("Error loading data");
-        }
-    }
-
-    if (_hasLabels) {
-        _labels->initialize();
-    }
-}
-
-void RenderablePlanesCloud::initializeGL() {
-    ZoneScoped;
-
-    _program = DigitalUniverseModule::ProgramObjectManager.request(
-        "RenderablePlanesCloud",
-        []() -> std::unique_ptr<ghoul::opengl::ProgramObject> {
-            return global::renderEngine->buildRenderProgram(
-                "RenderablePlanesCloud",
-                absPath("${MODULE_DIGITALUNIVERSE}/shaders/plane_vs.glsl"),
-                absPath("${MODULE_DIGITALUNIVERSE}/shaders/plane_fs.glsl")
-            );
-        }
-    );
-
-    ghoul::opengl::updateUniformLocations(*_program, _uniformCache, UniformNames);
-
-    createPlanes();
-    loadTextures();
-}
-
-void RenderablePlanesCloud::deleteDataGPUAndCPU() {
-    for (std::unordered_map<int, PlaneAggregate>::reference pAMapItem : _planesMap) {
-        glDeleteBuffers(1, &pAMapItem.second.vbo);
-        glDeleteVertexArrays(1, &pAMapItem.second.vao);
-        pAMapItem.second.planesCoordinates.clear();
-    }
-    _planesMap.clear();
-}
-
-void RenderablePlanesCloud::deinitializeGL() {
-    deleteDataGPUAndCPU();
-
-    DigitalUniverseModule::ProgramObjectManager.release(
-        "RenderablePlanesCloud",
-        [](ghoul::opengl::ProgramObject* p) {
-            global::renderEngine->removeRenderProgram(p);
-        }
-    );
-}
-
-void RenderablePlanesCloud::renderPlanes(const RenderData&,
-                                         const glm::dmat4& modelViewTransform,
-                                         const glm::dmat4& projectionTransform,
-                                         const float fadeInVariable)
-{
-    glEnablei(GL_BLEND, 0);
-    glBlendFunc(GL_SRC_ALPHA, GL_ONE);
-    //glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
-    glDepthMask(false);
-
-    _program->activate();
-
-    glm::dmat4 modelViewProjectionTransform =
-        glm::dmat4(projectionTransform) * modelViewTransform;
-    _program->setUniform(
-        _uniformCache.modelViewProjectionTransform,
-        modelViewProjectionTransform
-    );
-    _program->setUniform(_uniformCache.alphaValue, opacity());
-    _program->setUniform(_uniformCache.fadeInValue, fadeInVariable);
-
-    glDisable(GL_CULL_FACE);
-
-    GLint viewport[4];
-    global::renderEngine->openglStateCache().viewport(viewport);
-
-    ghoul::opengl::TextureUnit unit;
-    unit.activate();
-    _program->setUniform(_uniformCache.galaxyTexture, unit);
-    int currentTextureIndex = -1;
-
-    for (std::unordered_map<int, PlaneAggregate>::reference pAMapItem : _planesMap) {
-        // For planes with undefined textures references
-        if (pAMapItem.first == 30) {
-            continue;
-        }
-
-        // We only bind a new texture when it is needed
-        if (currentTextureIndex != pAMapItem.first) {
-            _textureMap[pAMapItem.first]->bind();
-            currentTextureIndex = pAMapItem.first;
-        }
-        glBindVertexArray(pAMapItem.second.vao);
-        glDrawArrays(GL_TRIANGLES, 0, 6 * pAMapItem.second.numberOfPlanes);
-    }
-
-    glBindVertexArray(0);
-    _program->deactivate();
-
-    // Restores OpenGL Rendering State
-    global::renderEngine->openglStateCache().resetBlendState();
-    global::renderEngine->openglStateCache().resetDepthState();
-    global::renderEngine->openglStateCache().resetPolygonAndClippingState();
-}
-
-void RenderablePlanesCloud::render(const RenderData& data, RendererTasks&) {
-    const double scale = toMeter(_unit);
-
-    float fadeInVariable = 1.f;
-    if (!_disableFadeInDistance) {
-        float distCamera = static_cast<float>(glm::length(data.camera.positionVec3()));
-        distCamera = static_cast<float>(distCamera / scale);
-        const glm::vec2 fadeRange = _fadeInDistances;
-        //const float a = 1.f / ((fadeRange.y - fadeRange.x) * scale);
-        const float a = 1.f / ((fadeRange.y - fadeRange.x));
-        const float b = -(fadeRange.x / (fadeRange.y - fadeRange.x));
-        const float funcValue = a * distCamera + b;
-        fadeInVariable *= funcValue > 1.f ? 1.f : funcValue;
-
-        if (funcValue < 0.01f) {
-            return;
-        }
-    }
-
-    const glm::dmat4 modelTransform = calcModelTransform(data);
-    const glm::dmat4 modelViewTransform = calcModelViewTransform(data, modelTransform);
-    const glm::mat4 projectionTransform = data.camera.projectionMatrix();
-
-    if (_hasSpeckFile) {
-        renderPlanes(data, modelViewTransform, projectionTransform, fadeInVariable);
-    }
-
-    if (_hasLabels) {
-        const glm::dmat4 modelViewProjectionTransform =
-            glm::dmat4(projectionTransform) * modelViewTransform;
-
-        const glm::dmat4 invMVPParts = glm::inverse(modelTransform) *
-            glm::inverse(data.camera.combinedViewMatrix()) *
-            glm::inverse(glm::dmat4(projectionTransform));
-        const glm::dvec3 orthoRight = glm::normalize(
-            glm::dvec3(invMVPParts * glm::dvec4(1.0, 0.0, 0.0, 0.0))
-        );
-        const glm::dvec3 orthoUp = glm::normalize(
-            glm::dvec3(invMVPParts * glm::dvec4(0.0, 1.0, 0.0, 0.0))
-        );
-
-        _labels->render(
-            data,
-            modelViewProjectionTransform,
-            orthoRight,
-            orthoUp,
-            fadeInVariable
-        );
-    }
-}
-
-void RenderablePlanesCloud::update(const UpdateData&) {
-    if (_dataIsDirty  && _hasSpeckFile) {
-        deleteDataGPUAndCPU();
-        createPlanes();
-        _dataIsDirty = false;
-    }
-
-    if (_program->isDirty()) {
-        _program->rebuildFromFile();
-        ghoul::opengl::updateUniformLocations(*_program, _uniformCache, UniformNames);
-    }
-}
-
-void RenderablePlanesCloud::loadTextures() {
-    for (const dataloader::Dataset::Texture& tex : _dataset.textures) {
-        std::filesystem::path fullPath = absPath(_texturesPath / tex.file);
-        std::filesystem::path pngPath = fullPath;
-        pngPath.replace_extension(".png");
-
-        std::filesystem::path path;
-        if (std::filesystem::is_regular_file(fullPath)) {
-            path = fullPath;
-        }
-        else if (std::filesystem::is_regular_file(pngPath)) {
-            path = pngPath;
-        }
-        else {
-            // We can't really recover from this as it would crash during rendering anyway
-            throw ghoul::RuntimeError(std::format(
-                "Could not find image file '{}'", tex.file
-            ));
-        }
-
-        std::unique_ptr<ghoul::opengl::Texture> t =
-            ghoul::io::TextureReader::ref().loadTexture(path, 2);
-
-        if (t) {
-            LINFOC("RenderablePlanesCloud", std::format("Loaded texture '{}'", path));
-            t->uploadTexture();
-            t->setFilter(ghoul::opengl::Texture::FilterMode::LinearMipMap);
-            t->purgeFromRAM();
-        }
-        else {
-            // Same here, we won't be able to recover from this nullptr
-            throw ghoul::RuntimeError(std::format(
-                "Could not find image file '{}'", tex.file
-            ));
-        }
-
-        _textureMap.insert(std::pair(tex.index, std::move(t)));
-    }
-}
-
-void RenderablePlanesCloud::createPlanes() {
-    if (_dataIsDirty && _hasSpeckFile) {
-        const int lumIdx = std::max(_dataset.index(_luminosityVar), 0);
-        const double scale = toMeter(_unit);
-
-        LDEBUG("Creating planes...");
-        float maxSize = 0.f;
-        double maxRadius = 0.0;
-        for (const dataloader::Dataset::Entry& e : _dataset.entries) {
-            const glm::vec4 transformedPos = glm::vec4(
-                _transformationMatrix * glm::dvec4(e.position, 1.0)
-            );
-
-            const double r = glm::length(glm::dvec3(transformedPos) * scale);
-            maxRadius = std::max(maxRadius, r);
-
-            // Plane vectors u and v
-            glm::vec4 u = glm::vec4(
-                _transformationMatrix *
-                glm::dvec4(
-                    e.data[_dataset.orientationDataIndex + 0],
-                    e.data[_dataset.orientationDataIndex + 1],
-                    e.data[_dataset.orientationDataIndex + 2],
-                    1.f
-                )
-            );
-            u /= 2.f;
-            u.w = 0.f;
-
-            glm::vec4 v = glm::vec4(
-                _transformationMatrix *
-                glm::dvec4(
-                    e.data[_dataset.orientationDataIndex + 3],
-                    e.data[_dataset.orientationDataIndex + 4],
-                    e.data[_dataset.orientationDataIndex + 5],
-                    1.f
-                )
-            );
-            v /= 2.f;
-            v.w = 0.f;
-
-            if (!_luminosityVar.empty()) {
-                float lumS = e.data[lumIdx] * _sluminosity;
-                u *= lumS;
-                v *= lumS;
-            }
-
-            u *= _scaleFactor;
-            v *= _scaleFactor;
-
-            glm::vec4 vertex0 = transformedPos - u - v; // same as 3
-            glm::vec4 vertex1 = transformedPos + u + v; // same as 5
-            glm::vec4 vertex2 = transformedPos - u + v;
-            glm::vec4 vertex4 = transformedPos + u - v;
-
-            for (int i = 0; i < 3; i++) {
-                maxSize = std::max(maxSize, vertex0[i]);
-                maxSize = std::max(maxSize, vertex1[i]);
-                maxSize = std::max(maxSize, vertex2[i]);
-                maxSize = std::max(maxSize, vertex4[i]);
-            }
-
-            vertex0 = glm::vec4(glm::dvec4(vertex0) * scale);
-            vertex1 = glm::vec4(glm::dvec4(vertex1) * scale);
-            vertex2 = glm::vec4(glm::dvec4(vertex2) * scale);
-            vertex4 = glm::vec4(glm::dvec4(vertex4) * scale);
-
-            const std::array<GLfloat, 36> VertexData = {
-                //  x          y          z       w    s    t
-                vertex0.x, vertex0.y, vertex0.z, 1.f, 0.f, 0.f,
-                vertex1.x, vertex1.y, vertex1.z, 1.f, 1.f, 1.f,
-                vertex2.x, vertex2.y, vertex2.z, 1.f, 0.f, 1.f,
-                vertex0.x, vertex0.y, vertex0.z, 1.f, 0.f, 0.f,
-                vertex4.x, vertex4.y, vertex4.z, 1.f, 1.f, 0.f,
-                vertex1.x, vertex1.y, vertex1.z, 1.f, 1.f, 1.f,
-            };
-
-            int textureIndex = static_cast<int>(e.data[_dataset.textureDataIndex]);
-            std::unordered_map<int, PlaneAggregate>::iterator found =
-                _planesMap.find(textureIndex);
-            if (found != _planesMap.end()) {
-                for (int i = 0; i < PlanesVertexDataSize; i++) {
-                    found->second.planesCoordinates.push_back(VertexData[i]);
-                }
-                found->second.numberOfPlanes++;
-            }
-            else {
-                PlaneAggregate pA;
-                pA.textureIndex = textureIndex;
-                glGenVertexArrays(1, &pA.vao);
-                glGenBuffers(1, &pA.vbo);
-                pA.numberOfPlanes = 1;
-                for (int i = 0; i < PlanesVertexDataSize; i++) {
-                    pA.planesCoordinates.push_back(VertexData[i]);
-                }
-                _planesMap.insert(std::pair(textureIndex, pA));
-            }
-        }
-
-        // Send data to GPU
-        for (const std::pair<const int, PlaneAggregate>& pAMapItem : _planesMap) {
-            glBindVertexArray(pAMapItem.second.vao);
-            glBindBuffer(GL_ARRAY_BUFFER, pAMapItem.second.vbo);
-            glBufferData(
-                GL_ARRAY_BUFFER,
-                sizeof(GLfloat) * PlanesVertexDataSize * pAMapItem.second.numberOfPlanes,
-                pAMapItem.second.planesCoordinates.data(),
-                GL_STATIC_DRAW
-            );
-            // in_position
-            glEnableVertexAttribArray(0);
-            glVertexAttribPointer(0, 4, GL_FLOAT, GL_FALSE, 6 * sizeof(GLfloat), nullptr);
-
-            // texture coords
-            glEnableVertexAttribArray(1);
-            glVertexAttribPointer(
-                1,
-                2,
-                GL_FLOAT,
-                GL_FALSE,
-                6 * sizeof(GLfloat),
-                reinterpret_cast<GLvoid*>(4 * sizeof(GLfloat))
-            );
-
-            glBindVertexArray(0);
-        }
-
-        _dataIsDirty = false;
-
-        setBoundingSphere(maxRadius * _scaleFactor);
-        _fadeInDistances.setMaxValue(glm::vec2(10.f * maxSize));
-    }
-}
-
-} // namespace openspace
diff --git a/modules/digitaluniverse/rendering/renderableplanescloud.h b/modules/digitaluniverse/rendering/renderableplanescloud.h
deleted file mode 100644
index ed419bec63..0000000000
--- a/modules/digitaluniverse/rendering/renderableplanescloud.h
+++ /dev/null
@@ -1,127 +0,0 @@
-/*****************************************************************************************
- *                                                                                       *
- * OpenSpace                                                                             *
- *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
- *                                                                                       *
- * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
- * software and associated documentation files (the "Software"), to deal in the Software *
- * without restriction, including without limitation the rights to use, copy, modify,    *
- * merge, publish, distribute, sublicense, and/or sell copies of the Software, and to    *
- * permit persons to whom the Software is furnished to do so, subject to the following   *
- * conditions:                                                                           *
- *                                                                                       *
- * The above copyright notice and this permission notice shall be included in all copies *
- * or substantial portions of the Software.                                              *
- *                                                                                       *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED,   *
- * INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A         *
- * PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT    *
- * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF  *
- * CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE  *
- * OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                                         *
- ****************************************************************************************/
-
-#ifndef __OPENSPACE_MODULE_DIGITALUNIVERSE___RENDERABLEPLANESCLOUD___H__
-#define __OPENSPACE_MODULE_DIGITALUNIVERSE___RENDERABLEPLANESCLOUD___H__
-
-#include <openspace/rendering/renderable.h>
-
-#include <openspace/data/dataloader.h>
-#include <openspace/properties/optionproperty.h>
-#include <openspace/properties/stringproperty.h>
-#include <openspace/properties/scalar/boolproperty.h>
-#include <openspace/properties/scalar/floatproperty.h>
-#include <openspace/properties/vector/vec2property.h>
-#include <openspace/properties/vector/vec3property.h>
-#include <openspace/rendering/labelscomponent.h>
-#include <openspace/util/distanceconversion.h>
-#include <ghoul/opengl/ghoul_gl.h>
-#include <ghoul/opengl/uniformcache.h>
-#include <filesystem>
-#include <functional>
-#include <unordered_map>
-
-namespace ghoul::filesystem { class File; }
-namespace ghoul::opengl {
-    class ProgramObject;
-    class Texture;
-} // namespace ghoul::opengl
-
-namespace openspace {
-
-// (x, y, z, w, s, t) * 6 = 36
-
-namespace documentation { struct Documentation; }
-
-class RenderablePlanesCloud : public Renderable {
-public:
-    explicit RenderablePlanesCloud(const ghoul::Dictionary& dictionary);
-    ~RenderablePlanesCloud() override = default;
-
-    void initialize() override;
-    void initializeGL() override;
-    void deinitializeGL() override;
-
-    bool isReady() const override;
-
-    void render(const RenderData& data, RendererTasks& rendererTask) override;
-    void update(const UpdateData& data) override;
-
-    static documentation::Documentation Documentation();
-
-private:
-    struct PlaneAggregate {
-        int textureIndex;
-        int numberOfPlanes;
-        GLuint vao;
-        GLuint vbo;
-        std::vector<GLfloat> planesCoordinates;
-    };
-
-    void deleteDataGPUAndCPU();
-    void createPlanes();
-    void renderPlanes(const RenderData& data, const glm::dmat4& modelViewTransform,
-        const glm::dmat4& projectionTransform, float fadeInVariable);
-
-    void loadTextures();
-
-    bool _hasSpeckFile = false;
-    bool _dataIsDirty = true;
-    bool _hasLabels = false;
-
-    properties::FloatProperty _scaleFactor;
-    properties::BoolProperty _drawElements;
-    properties::OptionProperty _blendMode;
-    properties::Vec2Property _fadeInDistances;
-    properties::BoolProperty _disableFadeInDistance;
-    properties::FloatProperty _planeMinSize;
-    properties::OptionProperty _renderOption;
-
-    ghoul::opengl::ProgramObject* _program = nullptr;
-    UniformCache(
-        modelViewProjectionTransform, alphaValue, fadeInValue, galaxyTexture
-    ) _uniformCache;
-    std::unordered_map<int, std::unique_ptr<ghoul::opengl::Texture>> _textureMap;
-    std::unordered_map<int, std::string> _textureFileMap;
-    std::unordered_map<int, PlaneAggregate> _planesMap;
-
-    std::filesystem::path _speckFile;
-    std::filesystem::path _texturesPath;
-    std::string _luminosityVar;
-
-    DistanceUnit _unit = DistanceUnit::Parsec;
-
-    dataloader::Dataset _dataset;
-
-    // Everything related to the labels is handled by LabelsComponent
-    std::unique_ptr<LabelsComponent> _labels;
-
-    float _sluminosity = 1.f;
-
-    glm::dmat4 _transformationMatrix = glm::dmat4(1.0);
-};
-
-} // namespace openspace
-
-#endif // __OPENSPACE_MODULE_DIGITALUNIVERSE___RENDERABLEPLANESCLOUD___H__

From 447618474607c2ed3eb303f89f467962f34e5eea Mon Sep 17 00:00:00 2001
From: Alexander Bock <alexander.bock@liu.se>
Date: Thu, 18 Apr 2024 14:13:19 +0200
Subject: [PATCH 391/701] Updating the star rendering (#3164)

* Adding a new star renderer
* Remove PSF-based rendering
---
 data/assets/scene/digitaluniverse/stars.asset |  35 +-
 data/assets/scene/milkyway/gaia/apogee.asset  |   5 +-
 data/assets/scene/milkyway/gaia/galah.asset   |   5 +-
 .../objects/orionnebula/cluster.asset         |   5 +-
 data/assets/scene/milkyway/stars/denver.asset |   5 +-
 modules/space/rendering/renderablestars.cpp   | 985 ++++++------------
 modules/space/rendering/renderablestars.h     |  65 +-
 modules/space/shaders/star_fs.glsl            |  32 +-
 modules/space/shaders/star_ge.glsl            |  80 +-
 modules/space/shaders/star_vs.glsl            |   6 +-
 10 files changed, 438 insertions(+), 785 deletions(-)

diff --git a/data/assets/scene/digitaluniverse/stars.asset b/data/assets/scene/digitaluniverse/stars.asset
index 81ec0fa7d2..a353b64c8f 100644
--- a/data/assets/scene/digitaluniverse/stars.asset
+++ b/data/assets/scene/digitaluniverse/stars.asset
@@ -32,13 +32,20 @@ local Stars = {
   Renderable = {
     Type = "RenderableStars",
     File = speck .. "stars.speck",
-    Texture = textures .. "halo.png",
-    --ShapeTexture = textures .. "disc.png",
+    Halo = {
+      Texture = textures .. "halo.png",
+      Multiplier = 0.65
+    },
+    Glare = {
+      Texture = textures .. "glare.png",
+      Multiplier = 15.0,
+      Gamma = 1.66,
+      Scale = 0.18
+    },
+    MagnitudeExponent = 6.325,
     ColorMap = colormaps .. "colorbv.cmap",
     OtherDataColorMap = colormaps .. "viridis.cmap",
-    MagnitudeExponent = 6.2,
     SizeComposition = "Distance Modulus",
-    RenderMethod = "Texture Based", -- or PSF
     DataMapping = {
       Bv = "colorb_v",
       Luminance = "lum",
@@ -70,13 +77,21 @@ local SunStar = {
   Renderable = {
     Type = "RenderableStars",
     File = sunspeck .. "sunstar.speck",
-    Texture = textures .. "halo.png",
-    --ShapeTexture = textures .. "disc.png",
+    Halo = {
+      Texture = textures .. "halo.png",
+      Multiplier = 0.55,
+      Gamma = 1.1,
+      Size = 0.95
+    },
+    Glare = {
+      Texture = textures .. "glare.png",
+      Multiplier = 1.0,
+      Scale = 0.1
+    },
+    MagnitudeExponent = 6.25,
     ColorMap = colormaps .. "colorbv.cmap",
-    MagnitudeExponent = 6.2,
     SizeComposition = "Distance Modulus",
-    RenderMethod = "Texture Based", -- or PSF
-    FadeInDistances = { 0.0001, 0.1 },
+    FadeInDistances = { 0.0075, 0.1 },
     RenderableType = "PostDeferredTransparent",
     DataMapping = {
       Bv = "colorb_v",
@@ -116,7 +131,7 @@ asset.export(SunStar)
 
 asset.meta = {
   Name = "Stars",
-  Version = "2.1",
+  Version = "3.0",
   Description = "Digital Universe asset for the stars",
   Author = "Brian Abbott (AMNH)",
   URL = "https://www.amnh.org/research/hayden-planetarium/digital-universe",
diff --git a/data/assets/scene/milkyway/gaia/apogee.asset b/data/assets/scene/milkyway/gaia/apogee.asset
index 31a7fd0de8..e4965bdb89 100644
--- a/data/assets/scene/milkyway/gaia/apogee.asset
+++ b/data/assets/scene/milkyway/gaia/apogee.asset
@@ -30,8 +30,9 @@ local GaiaAbundanceApogee = {
     OtherData = "FeH",
     MagnitudeExponent = 7.25,
     SizeComposition = "Distance Modulus",
-    RenderMethod = "Texture Based",
-    Texture = textures .. "halo.png",
+    Halo = {
+      Texture = textures .. "halo.png"
+    },
     ColorRange = { { -0.8, 0.6 } },
     -- ShapeTexture = textures .. "disc.png",
     ColorMap = colormaps .. "colorbv.cmap",
diff --git a/data/assets/scene/milkyway/gaia/galah.asset b/data/assets/scene/milkyway/gaia/galah.asset
index d232f4eb9a..db21e477b3 100644
--- a/data/assets/scene/milkyway/gaia/galah.asset
+++ b/data/assets/scene/milkyway/gaia/galah.asset
@@ -26,11 +26,12 @@ local GaiaAbundanceGalah = {
     Type = "RenderableStars",
     Enabled = false,
     File = speck .. "GaiaAbundGalah.speck",
-    Texture = textures .. "halo.png",
+    Halo = {
+      Texture = textures .. "halo.png"
+    },
     -- ShapeTexture = textures .. "disc.png",
     MagnitudeExponent = 7.25,
     SizeComposition = "Distance Modulus",
-    RenderMethod = "Texture Based",
     ColorOption = "Other Data",
     OtherData = "FeH",
     ColorMap = colormaps .. "colorbv.cmap",
diff --git a/data/assets/scene/milkyway/objects/orionnebula/cluster.asset b/data/assets/scene/milkyway/objects/orionnebula/cluster.asset
index 7b7b927925..abd7e97d05 100644
--- a/data/assets/scene/milkyway/objects/orionnebula/cluster.asset
+++ b/data/assets/scene/milkyway/objects/orionnebula/cluster.asset
@@ -16,11 +16,12 @@ local OrionClusterStars = {
   Renderable = {
     Type = "RenderableStars",
     File = sync .. "oricluster.speck",
-    Texture = sync .. "halo.png",
+    Halo = {
+      Texture = sync .. "halo.png"
+    },
     ColorMap = sync .. "colorbv.cmap",
     MagnitudeExponent = 5.02,
     SizeComposition = "Distance Modulus",
-    RenderMethod = "Texture Based",
     DataMapping = {
       Bv = "colorb_v",
       Luminance = "lum",
diff --git a/data/assets/scene/milkyway/stars/denver.asset b/data/assets/scene/milkyway/stars/denver.asset
index e9a31d0592..9e5804c1bd 100644
--- a/data/assets/scene/milkyway/stars/denver.asset
+++ b/data/assets/scene/milkyway/stars/denver.asset
@@ -25,11 +25,12 @@ local Object = {
   Renderable = {
     Type = "RenderableStars",
     File = speck .. "denver_stars.speck",
-    Texture = textures .. "halo.png",
+    Halo = {
+      Texture = textures .. "halo.png"
+    },
     ColorMap = colorLUT .. "denver_colorbv.cmap",
     MagnitudeExponent = 6.2,
     SizeComposition = "Distance Modulus",
-    RenderMethod = "Texture Based", -- or PSF
     DataMapping = {
       Bv = "colorb_v",
       Luminance = "lum",
diff --git a/modules/space/rendering/renderablestars.cpp b/modules/space/rendering/renderablestars.cpp
index cfa5a658ed..06ec9a135e 100644
--- a/modules/space/rendering/renderablestars.cpp
+++ b/modules/space/rendering/renderablestars.cpp
@@ -50,33 +50,23 @@
 namespace {
     constexpr std::string_view _loggerCat = "RenderableStars";
 
-    constexpr std::array<const char*, 17> UniformNames = {
-        "modelMatrix", "cameraUp", "cameraViewProjectionMatrix", "colorOption",
-        "magnitudeExponent", "eyePosition", "psfParamConf", "lumCent", "radiusCent",
-        "brightnessCent", "colorTexture", "alphaValue", "psfTexture", "otherDataTexture",
-        "otherDataRange", "filterOutOfRange", "fixedColor"
-    };
-
-    enum RenderMethod {
-        PointSpreadFunction = 0,
-        TextureBased
+    constexpr std::array<const char*, 24> UniformNames = {
+        "modelMatrix", "cameraViewProjectionMatrix", "cameraUp", "eyePosition",
+        "colorOption", "magnitudeExponent", "sizeComposition", "lumCent", "radiusCent",
+        "colorTexture", "opacity", "otherDataTexture", "otherDataRange",
+        "filterOutOfRange", "fixedColor", "haloTexture", "haloMultiplier", "haloGamma",
+        "haloScale", "hasGlare", "glareTexture", "glareMultiplier", "glareGamma",
+        "glareScale"
     };
 
     enum SizeComposition {
-        AppBrightness = 0,
+        DistanceModulus = 0,
+        AppBrightness,
         LumSize,
-        LumSizeAppBrightness,
         AbsMagnitude,
-        AppMagnitude,
-        DistanceModulus
+        AppMagnitude
     };
 
-    constexpr int PsfMethodSpencer = 0;
-    constexpr int PsfMethodMoffat = 1;
-
-    constexpr int PsfTextureSize = 64;
-    constexpr int ConvolvedfTextureSize = 257;
-
     constexpr double PARSEC = 0.308567756E17;
 
     struct ColorVBOLayout {
@@ -84,7 +74,6 @@ namespace {
         float value;
         float luminance;
         float absoluteMagnitude;
-        float apparentMagnitude;
     };
 
     struct VelocityVBOLayout {
@@ -92,7 +81,6 @@ namespace {
         float value;
         float luminance;
         float absoluteMagnitude;
-        float apparentMagnitude;
 
         float vx; // v_x
         float vy; // v_y
@@ -104,7 +92,6 @@ namespace {
         float value;
         float luminance;
         float absoluteMagnitude;
-        float apparentMagnitude;
 
         float speed;
     };
@@ -114,7 +101,6 @@ namespace {
         float value;
         float luminance;
         float absoluteMagnitude;
-        float apparentMagnitude;
     };
 
     constexpr openspace::properties::Property::PropertyInfo SpeckFileInfo = {
@@ -156,14 +142,6 @@ namespace {
         openspace::properties::Property::Visibility::AdvancedUser
     };
 
-    constexpr openspace::properties::Property::PropertyInfo MappingAppMagnitudeInfo = {
-        "MappingAppMagnitude",
-        "Mapping (apparent magnitude)",
-        "The name of the variable in the speck file that is used as the apparent "
-        "magnitude variable",
-        openspace::properties::Property::Visibility::AdvancedUser
-    };
-
     constexpr openspace::properties::Property::PropertyInfo MappingVxInfo = {
         "MappingVx",
         "Mapping (vx)",
@@ -240,22 +218,43 @@ namespace {
         openspace::properties::Property::Visibility::AdvancedUser
     };
 
-    // Old Method
-    constexpr openspace::properties::Property::PropertyInfo PsfTextureInfo = {
+    const openspace::properties::PropertyOwner::PropertyOwnerInfo HaloOwnerInfo = {
+        "Halo",
+        "Halo",
+        "Settings for the halo portion of the star"
+    };
+
+    const openspace::properties::PropertyOwner::PropertyOwnerInfo GlareOwnerInfo = {
+        "Glare",
+        "Glare",
+        "Settings for the central glare portion of the star"
+    };
+
+    constexpr openspace::properties::Property::PropertyInfo TextureInfo = {
         "Texture",
-        "Point Spread Function Texture",
-        "The path to the texture that should be used as a point spread function for the "
-        "stars",
+        "Texture Path",
+        "The path to the texture that should be used",
         openspace::properties::Property::Visibility::AdvancedUser
     };
 
-    //constexpr openspace::properties::Property::PropertyInfo ShapeTextureInfo = {
-    //    "ShapeTexture",
-    //    "Shape Texture to be convolved",
-    //    "The path to the texture that should be used as the base shape for the stars"
-    //};
+    constexpr openspace::properties::Property::PropertyInfo MultiplierInfo = {
+        "Multiplier",
+        "Multiplier",
+        "An individual multiplication factor for this texture component. Using the "
+        "multiplier and gamma values for both components, it is possible to fine tune "
+        "the look of the stars or disable the contributions altogether by setting it to "
+        "0",
+        openspace::properties::Property::Visibility::AdvancedUser
+    };
+
+    constexpr openspace::properties::Property::PropertyInfo GammaInfo = {
+        "Gamma",
+        "Gamma",
+        "An individual gamma exponent for this texture component. Using the multiplier "
+        "and gamma values for both components, it is possible to finetune the look of "
+        "the stars."
+    };
 
-    // PSF
     constexpr openspace::properties::Property::PropertyInfo MagnitudeExponentInfo = {
         "MagnitudeExponent",
         "Magnitude Exponent",
@@ -266,47 +265,25 @@ namespace {
         openspace::properties::Property::Visibility::User
     };
 
-    constexpr openspace::properties::Property::PropertyInfo RenderMethodOptionInfo = {
-        "RenderMethod",
-        "Render Method",
-        "Render method for the stars",
+    constexpr openspace::properties::Property::PropertyInfo ScaleInfo = {
+        "Scale",
+        "Scale",
+        "A uniform scale factor that determines how much of the total size of the star "
+        "this component is using. If it is 0, it will be hidden. If it is 1, it will "
+        "take the entire size.",
         openspace::properties::Property::Visibility::AdvancedUser
     };
 
-    const openspace::properties::PropertyOwner::PropertyOwnerInfo
-        UserProvidedTextureOptionInfo =
-    {
-        "UserProvidedTexture",
-        "User Provided Texture",
-        ""
-    };
-
-    const openspace::properties::PropertyOwner::PropertyOwnerInfo
-        ParametersOwnerOptionInfo =
-    {
-        "ParametersOwner",
-        "Parameters Options",
-        ""
-    };
-
-    const openspace::properties::PropertyOwner::PropertyOwnerInfo MoffatMethodOptionInfo =
-    {
-        "MoffatMethodOption",
-        "Moffat Method",
-        ""
-    };
-
-    constexpr openspace::properties::Property::PropertyInfo PSFMethodOptionInfo = {
-        "PSFMethodOptionInfo",
-        "PSF Method Option",
-        "Debug option for PSF main function: Spencer or Moffat",
-        openspace::properties::Property::Visibility::AdvancedUser
-    };
-
-    constexpr openspace::properties::Property::PropertyInfo SizeCompositionOptionInfo = {
+    const openspace::properties::PropertyOwner::PropertyOwnerInfo SizeCompositionInfo = {
         "SizeComposition",
-        "Size Composition Option",
-        "Base multiplyer for the final stars' sizes",
+        "Size Composition",
+        ""
+    };
+
+    constexpr openspace::properties::Property::PropertyInfo SizeCompositionMethodInfo = {
+        "Method",
+        "Method",
+        "Method to determine the size for the stars",
         openspace::properties::Property::Visibility::AdvancedUser
     };
 
@@ -324,71 +301,6 @@ namespace {
         openspace::properties::Property::Visibility::AdvancedUser
     };
 
-    constexpr openspace::properties::Property::PropertyInfo BrightnessPercentInfo = {
-        "BrightnessPercent",
-        "App Brightness Contribution",
-        "App Brightness Contribution",
-        openspace::properties::Property::Visibility::AdvancedUser
-    };
-
-    const openspace::properties::PropertyOwner::PropertyOwnerInfo
-        SpencerPSFParamOwnerInfo =
-    {
-        "SpencerPSFParamOwner",
-        "Spencer PSF Paramameters",
-        "PSF parameters for Spencer"
-    };
-
-    constexpr openspace::properties::Property::PropertyInfo P0ParamInfo = {
-        "P0Param",
-        "P0",
-        "P0 parameter contribution",
-        openspace::properties::Property::Visibility::AdvancedUser
-    };
-
-    constexpr openspace::properties::Property::PropertyInfo P1ParamInfo = {
-        "P1Param",
-        "P1",
-        "P1 parameter contribution",
-        openspace::properties::Property::Visibility::AdvancedUser
-    };
-
-    constexpr openspace::properties::Property::PropertyInfo P2ParamInfo = {
-        "P2Param",
-        "P2",
-        "P2 parameter contribution",
-        openspace::properties::Property::Visibility::AdvancedUser
-    };
-
-    constexpr openspace::properties::Property::PropertyInfo AlphaConstInfo = {
-        "AlphaConst",
-        "Alpha",
-        "Empirical Alpha Constant",
-        openspace::properties::Property::Visibility::AdvancedUser
-    };
-
-    const openspace::properties::PropertyOwner::PropertyOwnerInfo
-        MoffatPSFParamOwnerInfo =
-    {
-        "MoffatPSFParam",
-        "Moffat PSF Parameters",
-        "PSF parameters for Moffat"
-    };
-
-    constexpr openspace::properties::Property::PropertyInfo FWHMInfo = {
-        "FWHM",
-        "FWHM",
-        "Moffat's FWHM",
-        openspace::properties::Property::Visibility::AdvancedUser
-    };
-
-    constexpr openspace::properties::Property::PropertyInfo BetaInfo = {
-        "Beta",
-        "Beta",
-        "Moffat's Beta Constant",
-        openspace::properties::Property::Visibility::AdvancedUser
-    };
-
     constexpr openspace::properties::Property::PropertyInfo FadeInDistancesInfo = {
         "FadeInDistances",
         "Fade-In Start and End Distances",
@@ -398,9 +310,9 @@ namespace {
         openspace::properties::Property::Visibility::AdvancedUser
     };
 
-    constexpr openspace::properties::Property::PropertyInfo DisableFadeInInfo = {
-        "DisableFadeIn",
-        "Disable Fade-in effect",
+    constexpr openspace::properties::Property::PropertyInfo EnableFadeInInfo = {
+        "EnableFadeIn",
+        "Enable Fade-in effect",
         "Enables/Disables the Fade-in effect",
         openspace::properties::Property::Visibility::AdvancedUser
     };
@@ -427,7 +339,7 @@ namespace {
         std::optional<std::string> otherData;
 
         // [[codegen::verbatim(OtherDataColorMapInfo.description)]]
-        std::optional<std::string> otherDataColorMap;
+        std::optional<std::filesystem::path> otherDataColorMap;
 
         // [[codegen::verbatim(FilterOutOfRangeInfo.description)]]
         std::optional<bool> filterOutOfRange;
@@ -440,30 +352,38 @@ namespace {
         // this value only makes sense if 'StaticFilter' is 'true', as well
         std::optional<float> staticFilterReplacement;
 
+        struct Texture {
+            // [[codegen::verbatim(TextureInfo.description)]]
+            std::filesystem::path texture;
+
+            // [[codegen::verbatim(MultiplierInfo.description)]]
+            std::optional<float> multiplier;
+
+            // [[codegen::verbatim(GammaInfo.description)]]
+            std::optional<float> gamma;
+
+            // [[codegen::verbatim(ScaleInfo.description)]]
+            std::optional<float> scale;
+        };
+
+        // [[codegen::verbatim(HaloOwnerInfo.description)]]
+        Texture halo;
+
+        // [[codegen::verbatim(GlareOwnerInfo.description)]]
+        std::optional<Texture> glare;
+
         // [[codegen::verbatim(MagnitudeExponentInfo.description)]]
         std::optional<float> magnitudeExponent;
 
-        enum class [[codegen::map(RenderMethod)]] RenderMethod {
-            PointSpreadFunction [[codegen::key("PSF")]],
-            TextureBased [[codegen::key("Texture Based")]]
-        };
-
-        // [[codegen::verbatim(RenderMethodOptionInfo.description)]]
-        RenderMethod renderMethod;
-
-        // [[codegen::verbatim(PsfTextureInfo.description)]]
-        std::filesystem::path texture;
-
         enum class [[codegen::map(SizeComposition)]] SizeComposition {
+            DistanceModulus [[codegen::key("Distance Modulus")]],
             AppBrightness [[codegen::key("App Brightness")]],
             LumSize [[codegen::key("Lum and Size")]],
-            LumSizeAppBrightness [[codegen::key("Lum, Size and App Brightness")]],
             AbsMagnitude [[codegen::key("Abs Magnitude")]],
-            AppMagnitude [[codegen::key("App Magnitude")]],
-            DistanceModulus [[codegen::key("Distance Modulus")]]
+            AppMagnitude [[codegen::key("App Magnitude")]]
         };
 
-        // [[codegen::verbatim(SizeCompositionOptionInfo.description)]]
+        // [[codegen::verbatim(SizeCompositionMethodInfo.description)]]
         std::optional<SizeComposition> sizeComposition;
 
         struct DataMapping {
@@ -473,8 +393,6 @@ namespace {
             std::optional<std::string> luminance;
             // [[codegen::verbatim(MappingAbsMagnitudeInfo.description)]]
             std::optional<std::string> absoluteMagnitude;
-            // [[codegen::verbatim(MappingAppMagnitudeInfo.description)]]
-            std::optional<std::string> apparentMagnitude;
             // [[codegen::verbatim(MappingVxInfo.description)]]
             std::optional<std::string> vx;
             // [[codegen::verbatim(MappingVyInfo.description)]]
@@ -491,8 +409,8 @@ namespace {
         // [[codegen::verbatim(FadeInDistancesInfo.description)]]
         std::optional<glm::dvec2> fadeInDistances;
 
-        // [[codegen::verbatim(DisableFadeInInfo.description)]]
-        std::optional<bool> disableFadeIn;
+        // [[codegen::verbatim(EnableFadeInInfo.description)]]
+        std::optional<bool> enableFadeIn;
     };
 #include "renderablestars_codegen.cpp"
 }  // namespace
@@ -507,13 +425,11 @@ RenderableStars::RenderableStars(const ghoul::Dictionary& dictionary)
     : Renderable(dictionary)
     , _speckFile(SpeckFileInfo)
     , _colorTexturePath(ColorTextureInfo)
-    //, _shapeTexturePath(ShapeTextureInfo)
-    , _dataMappingContainer({ "DataMapping", "Data Mapping" })
     , _dataMapping{
+        properties::PropertyOwner({ "DataMapping", "Data Mapping" }),
         properties::StringProperty(MappingBvInfo),
         properties::StringProperty(MappingLuminanceInfo),
         properties::StringProperty(MappingAbsMagnitudeInfo),
-        properties::StringProperty(MappingAppMagnitudeInfo),
         properties::StringProperty(MappingVxInfo),
         properties::StringProperty(MappingVyInfo),
         properties::StringProperty(MappingVzInfo),
@@ -533,100 +449,92 @@ RenderableStars::RenderableStars(const ghoul::Dictionary& dictionary)
     )
     , _fixedColor(FixedColorInfo, glm::vec3(1.f), glm::vec3(0.f), glm::vec3(1.f))
     , _filterOutOfRange(FilterOutOfRangeInfo, false)
-    , _pointSpreadFunctionTexturePath(PsfTextureInfo)
-    , _psfMethodOption(
-        PSFMethodOptionInfo,
-        properties::OptionProperty::DisplayType::Dropdown
-    )
-    , _psfMultiplyOption(
-        SizeCompositionOptionInfo,
-        properties::OptionProperty::DisplayType::Dropdown
-    )
-    , _lumCent(LumPercentInfo, 0.5f, 0.f, 3.f)
-    , _radiusCent(RadiusPercentInfo, 0.5f, 0.f, 3.f)
-    , _brightnessCent(BrightnessPercentInfo, 0.5f, 0.f, 3.f)
+    , _halo{
+        properties::PropertyOwner(HaloOwnerInfo),
+        properties::StringProperty(TextureInfo),
+        properties::FloatProperty(MultiplierInfo, 1.f, 0.f, 20.f),
+        properties::FloatProperty(GammaInfo, 1.f, 0.f, 5.f),
+        properties::FloatProperty(ScaleInfo, 1.f, 0.f, 1.f)
+    }
+    , _glare{
+        properties::PropertyOwner(GlareOwnerInfo),
+        properties::StringProperty(TextureInfo),
+        properties::FloatProperty(MultiplierInfo, 1.f, 0.f, 20.f),
+        properties::FloatProperty(GammaInfo, 1.f, 0.f, 5.f),
+        properties::FloatProperty(ScaleInfo, 1.f, 0.f, 1.f)
+    }
+    , _parameters{
+        properties::PropertyOwner(SizeCompositionInfo),
+        properties::OptionProperty(
+            SizeCompositionMethodInfo,
+            properties::OptionProperty::DisplayType::Dropdown
+        ),
+        properties::FloatProperty(LumPercentInfo, 0.5f, 0.f, 3.f),
+        properties::FloatProperty(RadiusPercentInfo, 0.5f, 0.f, 3.f)
+    }
     , _magnitudeExponent(MagnitudeExponentInfo, 6.2f, 5.f, 8.f)
-    , _spencerPSFParamOwner(SpencerPSFParamOwnerInfo)
-    , _p0Param(P0ParamInfo, 0.384f, 0.f, 1.f)
-    , _p1Param(P1ParamInfo, 0.478f, 0.f, 1.f)
-    , _p2Param(P2ParamInfo, 0.138f, 0.f, 1.f)
-    , _spencerAlphaConst(AlphaConstInfo, 0.02f, 0.000001f, 5.f)
-    , _moffatPSFParamOwner(MoffatPSFParamOwnerInfo)
-    , _FWHMConst(FWHMInfo, 10.4f, 0.f, 100.f)
-    , _moffatBetaConst(BetaInfo, 4.765f, 0.f, 100.f)
-    , _renderingMethodOption(
-        RenderMethodOptionInfo,
-        properties::OptionProperty::DisplayType::Dropdown
-    )
-    , _userProvidedTextureOwner(UserProvidedTextureOptionInfo)
-    , _parametersOwner(ParametersOwnerOptionInfo)
-    , _moffatMethodOwner(MoffatMethodOptionInfo)
     , _fadeInDistances(
         FadeInDistancesInfo,
         glm::vec2(0.f),
         glm::vec2(0.f),
         glm::vec2(100.f)
     )
-    , _disableFadeInDistance(DisableFadeInInfo, true)
+    , _enableFadeInDistance(EnableFadeInInfo, false)
 {
-    using File = ghoul::filesystem::File;
-
     const Parameters p = codegen::bake<Parameters>(dictionary);
 
     addProperty(Fadeable::_opacity);
 
-    _dataMapping.bvColor = p.dataMapping.bv.value_or("");
-    _dataMapping.bvColor.onChange([this]() { _dataIsDirty = true; });
-    _dataMappingContainer.addProperty(_dataMapping.bvColor);
-
-    _dataMapping.luminance = p.dataMapping.luminance.value_or("");
-    _dataMapping.luminance.onChange([this]() { _dataIsDirty = true; });
-    _dataMappingContainer.addProperty(_dataMapping.luminance);
-
-    _dataMapping.absoluteMagnitude = p.dataMapping.absoluteMagnitude.value_or("");
-    _dataMapping.absoluteMagnitude.onChange([this]() { _dataIsDirty = true; });
-    _dataMappingContainer.addProperty(_dataMapping.absoluteMagnitude);
-
-    _dataMapping.apparentMagnitude = p.dataMapping.apparentMagnitude.value_or("");
-    _dataMapping.apparentMagnitude.onChange([this]() { _dataIsDirty = true; });
-    _dataMappingContainer.addProperty(_dataMapping.apparentMagnitude);
-
-    _dataMapping.vx = p.dataMapping.vx.value_or("");
-    _dataMapping.vx.onChange([this]() { _dataIsDirty = true; });
-    _dataMappingContainer.addProperty(_dataMapping.vx);
-
-    _dataMapping.vy = p.dataMapping.vy.value_or("");
-    _dataMapping.vy.onChange([this]() { _dataIsDirty = true; });
-    _dataMappingContainer.addProperty(_dataMapping.vy);
-
-    _dataMapping.vz = p.dataMapping.vz.value_or("");
-    _dataMapping.vz.onChange([this]() { _dataIsDirty = true; });
-    _dataMappingContainer.addProperty(_dataMapping.vz);
-
-    _dataMapping.speed = p.dataMapping.speed.value_or("");
-    _dataMapping.speed.onChange([this]() { _dataIsDirty = true; });
-    _dataMappingContainer.addProperty(_dataMapping.speed);
-
-    addPropertySubOwner(_dataMappingContainer);
 
     _speckFile = p.speckFile.string();
     _speckFile.onChange([this]() { _speckFileIsDirty = true; });
     addProperty(_speckFile);
 
+
+    _colorTextureFile = std::make_unique<ghoul::filesystem::File>(p.colorMap);
+    _colorTextureFile->setCallback([this]() { _colorTextureIsDirty = true; });
     _colorTexturePath = p.colorMap.string();
-    _colorTextureFile = std::make_unique<File>(_colorTexturePath.value());
+    _colorTexturePath.onChange([&] {
+        if (std::filesystem::exists(_colorTexturePath.value())) {
+            _colorTextureIsDirty = true;
+        }
+        else {
+            LWARNING(std::format("File not found: {}", _colorTexturePath.value()));
+        }
+    });
+    addProperty(_colorTexturePath);
 
-    //_shapeTexturePath = absPath(dictionary.value<std::string>(
-    //    ShapeTextureInfo.identifier
-    //    ));
-    //_shapeTextureFile = std::make_unique<File>(_shapeTexturePath);
 
-    if (p.otherDataColorMap.has_value()) {
-        _otherDataColorMapPath = absPath(*p.otherDataColorMap).string();
-    }
+    _dataMapping.bvColor = p.dataMapping.bv.value_or(_dataMapping.bvColor);
+    _dataMapping.bvColor.onChange([this]() { _dataIsDirty = true; });
+    _dataMapping.container.addProperty(_dataMapping.bvColor);
+
+    _dataMapping.luminance = p.dataMapping.luminance.value_or(_dataMapping.luminance);
+    _dataMapping.luminance.onChange([this]() { _dataIsDirty = true; });
+    _dataMapping.container.addProperty(_dataMapping.luminance);
+
+    _dataMapping.absoluteMagnitude =
+        p.dataMapping.absoluteMagnitude.value_or(_dataMapping.absoluteMagnitude);
+    _dataMapping.absoluteMagnitude.onChange([this]() { _dataIsDirty = true; });
+    _dataMapping.container.addProperty(_dataMapping.absoluteMagnitude);
+
+    _dataMapping.vx = p.dataMapping.vx.value_or(_dataMapping.vx);
+    _dataMapping.vx.onChange([this]() { _dataIsDirty = true; });
+    _dataMapping.container.addProperty(_dataMapping.vx);
+
+    _dataMapping.vy = p.dataMapping.vy.value_or(_dataMapping.vy);
+    _dataMapping.vy.onChange([this]() { _dataIsDirty = true; });
+    _dataMapping.container.addProperty(_dataMapping.vy);
+
+    _dataMapping.vz = p.dataMapping.vz.value_or(_dataMapping.vz);
+    _dataMapping.vz.onChange([this]() { _dataIsDirty = true; });
+    _dataMapping.container.addProperty(_dataMapping.vz);
+
+    _dataMapping.speed = p.dataMapping.speed.value_or(_dataMapping.speed);
+    _dataMapping.speed.onChange([this]() { _dataIsDirty = true; });
+    _dataMapping.container.addProperty(_dataMapping.speed);
+    addPropertySubOwner(_dataMapping.container);
 
-    _fixedColor.setViewOption(properties::Property::ViewOptions::Color, true);
-    addProperty(_fixedColor);
 
     _colorOption.addOptions({
         { ColorOption::Color, "Color" },
@@ -654,132 +562,102 @@ RenderableStars::RenderableStars(const ghoul::Dictionary& dictionary)
                 break;
         }
     }
-    _colorOption.onChange([&] { _dataIsDirty = true; });
+    _colorOption.onChange([this]() { _dataIsDirty = true; });
     addProperty(_colorOption);
 
-    _colorTexturePath.onChange([&] {
-        if (std::filesystem::exists(_colorTexturePath.value())) {
-            _colorTextureIsDirty = true;
-        }
-        else {
-            LWARNING(std::format("File not found: {}", _colorTexturePath.value()));
-        }
-    });
-    _colorTextureFile->setCallback([this]() { _colorTextureIsDirty = true; });
-    addProperty(_colorTexturePath);
 
-    _queuedOtherData = p.otherData.value_or(_queuedOtherData);
 
     _otherDataOption.onChange([this]() { _dataIsDirty = true; });
     addProperty(_otherDataOption);
 
+
+    _otherDataColorMapPath.onChange([this]() { _otherDataColorMapIsDirty = true; });
+    if (p.otherDataColorMap.has_value()) {
+        _otherDataColorMapPath = p.otherDataColorMap->string();
+    }
+    addProperty(_otherDataColorMapPath);
+
+
     _otherDataRange.setViewOption(properties::Property::ViewOptions::MinMaxRange);
     addProperty(_otherDataRange);
 
-    addProperty(_otherDataColorMapPath);
-    _otherDataColorMapPath.onChange([this]() {
-        if (std::filesystem::exists(_otherDataColorMapPath.value())) {
-            _otherDataColorMapIsDirty = true;
-        }
-        else {
-            LWARNING(std::format("File not found: {}", _otherDataColorMapPath.value()));
-        }
-    });
 
-    _staticFilterValue = p.staticFilter;
-    _staticFilterReplacementValue =
-        p.staticFilterReplacement.value_or(_staticFilterReplacementValue);
+    _fixedColor.setViewOption(properties::Property::ViewOptions::Color, true);
+    addProperty(_fixedColor);
+
 
     addProperty(_filterOutOfRange);
 
-    _renderingMethodOption.addOption(
-        RenderMethod::PointSpreadFunction,
-        "Point Spread Function Based"
-    );
-    _renderingMethodOption.addOption(RenderMethod::TextureBased, "Textured Based");
-    addProperty(_renderingMethodOption);
 
-    _renderingMethodOption = codegen::map<RenderMethod>(p.renderMethod);
+    auto markTextureAsDirty = [this]() {_pointSpreadFunctionTextureIsDirty = true; };
 
-    _pointSpreadFunctionTexturePath = absPath(p.texture).string();
-    _pointSpreadFunctionFile = std::make_unique<File>(
-        _pointSpreadFunctionTexturePath.value()
-    );
-    _pointSpreadFunctionTexturePath.onChange([this]() {
-        _pointSpreadFunctionTextureIsDirty = true;
-    });
-    _pointSpreadFunctionFile->setCallback([this]() {
-        _pointSpreadFunctionTextureIsDirty = true;
-    });
-    _userProvidedTextureOwner.addProperty(_pointSpreadFunctionTexturePath);
+    _halo.texturePath = absPath(p.halo.texture).string();
+    _halo.texturePath.onChange(markTextureAsDirty);
+    _halo.file = std::make_unique<ghoul::filesystem::File>(_halo.texturePath.value());
+    _halo.file->setCallback(markTextureAsDirty);
+    _halo.container.addProperty(_halo.texturePath);
+    _halo.multiplier = p.halo.multiplier.value_or(_halo.multiplier);
+    _halo.container.addProperty(_halo.multiplier);
+    _halo.gamma = p.halo.gamma.value_or(_halo.gamma);
+    _halo.container.addProperty(_halo.gamma);
+    _halo.scale = p.halo.scale.value_or(_halo.scale);
+    _halo.container.addProperty(_halo.scale);
+    addPropertySubOwner(_halo.container);
 
-    _psfMethodOption.addOption(PsfMethodSpencer, "Spencer's Function");
-    _psfMethodOption.addOption(PsfMethodMoffat, "Moffat's Function");
-    _psfMethodOption = PsfMethodSpencer;
-    _psfMethodOption.onChange([this]() { renderPSFToTexture(); });
-    _parametersOwner.addProperty(_psfMethodOption);
-
-    _psfMultiplyOption.addOption(AppBrightness, "Use Star's Apparent Brightness");
-    _psfMultiplyOption.addOption(LumSize, "Use Star's Luminosity and Size");
-    _psfMultiplyOption.addOption(
-        LumSizeAppBrightness,
-        "Luminosity, Size, App Brightness"
-    );
-    _psfMultiplyOption.addOption(AbsMagnitude, "Absolute Magnitude");
-    _psfMultiplyOption.addOption(AppMagnitude, "Apparent Magnitude");
-    _psfMultiplyOption.addOption(DistanceModulus, "Distance Modulus");
-
-
-    if (p.sizeComposition.has_value()) {
-        _psfMultiplyOption =
-            static_cast<int>(codegen::map<SizeComposition>(*p.sizeComposition));
-    }
-    else {
-        _psfMultiplyOption = 5;
+    if (p.glare.has_value()) {
+        _glare.texturePath = absPath(p.glare->texture).string();
+        _glare.file =
+            std::make_unique<ghoul::filesystem::File>(_glare.texturePath.value());
+        _glare.file->setCallback(markTextureAsDirty);
+        _glare.multiplier = p.glare->multiplier.value_or(_glare.multiplier);
+        _glare.gamma = p.glare->gamma.value_or(_glare.gamma);
+        _glare.scale = p.glare->scale.value_or(_glare.scale);
     }
+    _glare.texturePath.onChange(markTextureAsDirty);
+    _glare.container.addProperty(_glare.texturePath);
+    _glare.container.addProperty(_glare.multiplier);
+    _glare.container.addProperty(_glare.gamma);
+    _glare.container.addProperty(_glare.scale);
+    addPropertySubOwner(_glare.container);
 
-    _parametersOwner.addProperty(_psfMultiplyOption);
-    _parametersOwner.addProperty(_lumCent);
-    _parametersOwner.addProperty(_radiusCent);
-    _parametersOwner.addProperty(_brightnessCent);
 
     _magnitudeExponent = p.magnitudeExponent.value_or(_magnitudeExponent);
-    _parametersOwner.addProperty(_magnitudeExponent);
+    addProperty(_magnitudeExponent);
 
-    auto renderPsf = [this]() { renderPSFToTexture(); };
 
-    _spencerPSFParamOwner.addProperty(_p0Param);
-    _p0Param.onChange(renderPsf);
-    _spencerPSFParamOwner.addProperty(_p1Param);
-    _p1Param.onChange(renderPsf);
-    _spencerPSFParamOwner.addProperty(_p2Param);
-    _p2Param.onChange(renderPsf);
-    _spencerPSFParamOwner.addProperty(_spencerAlphaConst);
-    _spencerAlphaConst.onChange(renderPsf);
+    _parameters.method.addOptions({
+        { DistanceModulus, "Distance Modulus" },
+        { AppBrightness, "Apparent Brightness" },
+        { LumSize, "Luminosity and Size" },
+        { AbsMagnitude, "Absolute Magnitude" },
+        { AppMagnitude, "Apparent Magnitude" }
+    });
+    _parameters.method =
+        p.sizeComposition.has_value() ?
+        static_cast<int>(codegen::map<SizeComposition>(*p.sizeComposition)) :
+        SizeComposition::DistanceModulus;
+    _parameters.container.addProperty(_parameters.method);
+    _parameters.container.addProperty(_parameters.lumCent);
+    _parameters.container.addProperty(_parameters.radiusCent);
+    addPropertySubOwner(_parameters.container);
 
-    _moffatPSFParamOwner.addProperty(_FWHMConst);
-    _FWHMConst.onChange(renderPsf);
-    _moffatPSFParamOwner.addProperty(_moffatBetaConst);
-    _moffatBetaConst.onChange(renderPsf);
-
-    _parametersOwner.addPropertySubOwner(_spencerPSFParamOwner);
-    _parametersOwner.addPropertySubOwner(_moffatPSFParamOwner);
-
-    addPropertySubOwner(_userProvidedTextureOwner);
-    addPropertySubOwner(_parametersOwner);
-    addPropertySubOwner(_moffatMethodOwner);
 
     if (p.fadeInDistances.has_value()) {
         _fadeInDistances = *p.fadeInDistances;
-        _disableFadeInDistance = false;
+        _enableFadeInDistance = true;
         _fadeInDistances.setViewOption(properties::Property::ViewOptions::MinMaxRange);
         addProperty(_fadeInDistances);
-        addProperty(_disableFadeInDistance);
+        addProperty(_enableFadeInDistance);
     }
+
+    _queuedOtherData = p.otherData.value_or(_queuedOtherData);
+    _staticFilterValue = p.staticFilter;
+    _staticFilterReplacementValue =
+        p.staticFilterReplacement.value_or(_staticFilterReplacementValue);
 }
 
 bool RenderableStars::isReady() const {
-    return _program && _pointSpreadFunctionTexture;
+    return _program && _halo.texture;
 }
 
 void RenderableStars::initializeGL() {
@@ -790,6 +668,13 @@ void RenderableStars::initializeGL() {
         absPath("${MODULE_SPACE}/shaders/star_ge.glsl")
     );
 
+    glGenVertexArrays(1, &_vao);
+    glGenBuffers(1, &_vbo);
+
+    glBindVertexArray(_vao);
+    glBindBuffer(GL_ARRAY_BUFFER, _vbo);
+    glBindVertexArray(0);
+
     ghoul::opengl::updateUniformLocations(*_program, _uniformCache, UniformNames);
 
     loadData();
@@ -809,84 +694,17 @@ void RenderableStars::initializeGL() {
     }
     _speckFileIsDirty = false;
 
-    LDEBUG("Creating Polygon Texture");
-
-    glGenVertexArrays(1, &_psfVao);
-    glGenBuffers(1, &_psfVbo);
-    glBindVertexArray(_psfVao);
-    glBindBuffer(GL_ARRAY_BUFFER, _psfVbo);
-
-    constexpr std::array<GLfloat, 24> VertexData = {
-        //x      y     s     t
-        -1.f, -1.f, 0.f, 0.f,
-         1.f,  1.f, 1.f, 1.f,
-        -1.f,  1.f, 0.f, 1.f,
-        -1.f, -1.f, 0.f, 0.f,
-         1.f, -1.f, 1.f, 0.f,
-         1.f,  1.f, 1.f, 1.f
-    };
-
-    glBufferData(GL_ARRAY_BUFFER, sizeof(VertexData), VertexData.data(), GL_STATIC_DRAW);
-    glVertexAttribPointer(0, 4, GL_FLOAT, GL_FALSE, 4 * sizeof(GLfloat), nullptr);
-    glEnableVertexAttribArray(0);
-    glBindVertexArray(0);
-
-    glGenTextures(1, &_psfTexture);
-    glBindTexture(GL_TEXTURE_2D, _psfTexture);
-    glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR);
-    glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR);
-    glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE);
-    glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE);
-    // Stopped using a buffer object for GL_PIXEL_UNPACK_BUFFER
-    glBindBuffer(GL_PIXEL_UNPACK_BUFFER, 0);
-    glTexImage2D(
-        GL_TEXTURE_2D,
-        0,
-        GL_RGBA8,
-        PsfTextureSize,
-        PsfTextureSize,
-        0,
-        GL_RGBA,
-        GL_BYTE,
-        nullptr
-    );
-
-
-    LDEBUG("Creating Convolution Texture");
-
-    glGenTextures(1, &_convolvedTexture);
-    glBindTexture(GL_TEXTURE_2D, _convolvedTexture);
-    glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR);
-    glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR);
-    glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE);
-    glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE);
-    // Stopped using a buffer object for GL_PIXEL_UNPACK_BUFFER
-    glBindBuffer(GL_PIXEL_UNPACK_BUFFER, 0);
-    glTexImage2D(
-        GL_TEXTURE_2D,
-        0,
-        GL_RGBA8,
-        ConvolvedfTextureSize,
-        ConvolvedfTextureSize,
-        0,
-        GL_RGBA,
-        GL_BYTE,
-        nullptr
-    );
-
-    //loadShapeTexture();
     loadPSFTexture();
-    renderPSFToTexture();
 }
 
 void RenderableStars::deinitializeGL() {
-    glDeleteBuffers(1, &_vbo);
-    _vbo = 0;
     glDeleteVertexArrays(1, &_vao);
     _vao = 0;
 
+    glDeleteBuffers(1, &_vbo);
+    _vbo = 0;
+
     _colorTexture = nullptr;
-    //_shapeTexture = nullptr;
 
     if (_program) {
         global::renderEngine->removeRenderProgram(_program.get());
@@ -895,137 +713,40 @@ void RenderableStars::deinitializeGL() {
 }
 
 void RenderableStars::loadPSFTexture() {
-    _pointSpreadFunctionTexture = nullptr;
-    if (!_pointSpreadFunctionTexturePath.value().empty() &&
-        std::filesystem::exists(_pointSpreadFunctionTexturePath.value()))
-    {
-        _pointSpreadFunctionTexture = ghoul::io::TextureReader::ref().loadTexture(
-            absPath(_pointSpreadFunctionTexturePath),
-            2
-        );
+    auto markPsfTextureAsDirty = [this]() { _pointSpreadFunctionTextureIsDirty = true; };
+    auto loadTexture = [markPsfTextureAsDirty](TextureComponent& component) {
+        using Texture = ghoul::opengl::Texture;
 
-        if (_pointSpreadFunctionTexture) {
-            LDEBUG(std::format(
-                "Loaded texture from '{}'", absPath(_pointSpreadFunctionTexturePath)
-            ));
-            _pointSpreadFunctionTexture->uploadTexture();
+        component.texture = nullptr;
+        const std::string path = component.texturePath;
+        if (path.empty() || !std::filesystem::exists(path)) {
+            return;
         }
-        _pointSpreadFunctionTexture->setFilter(
-            ghoul::opengl::Texture::FilterMode::AnisotropicMipMap
-        );
 
-        _pointSpreadFunctionFile = std::make_unique<ghoul::filesystem::File>(
-            _pointSpreadFunctionTexturePath.value()
-        );
-        _pointSpreadFunctionFile->setCallback(
-            [this]() { _pointSpreadFunctionTextureIsDirty = true; }
-        );
-    }
+        component.texture = ghoul::io::TextureReader::ref().loadTexture(absPath(path), 2);
+
+        if (!component.texture) {
+            return;
+        }
+
+        LDEBUG(std::format("Loaded texture from '{}'", absPath(component.texturePath)));
+        component.texture->uploadTexture();
+        component.texture->setWrapping(Texture::WrappingMode::ClampToBorder);
+
+        constexpr std::array<float, 4> border = { 0.f, 0.f, 0.f, 0.f };
+        glTexParameterfv(GL_TEXTURE_2D, GL_TEXTURE_BORDER_COLOR, border.data());
+        component.texture->setFilter(Texture::FilterMode::AnisotropicMipMap);
+
+        component.file = std::make_unique<ghoul::filesystem::File>(path);
+        component.file->setCallback(markPsfTextureAsDirty);
+    };
+
+    loadTexture(_halo);
+    loadTexture(_glare);
+
     _pointSpreadFunctionTextureIsDirty = false;
 }
 
-void RenderableStars::renderPSFToTexture() {
-    // Creates the FBO for the calculations
-    GLuint psfFBO = 0;
-    glGenFramebuffers(1, &psfFBO);
-    glBindFramebuffer(GL_FRAMEBUFFER, psfFBO);
-    GLenum drawBuffers = GL_COLOR_ATTACHMENT0;
-    glDrawBuffers(1, &drawBuffers);
-
-    glFramebufferTexture(GL_FRAMEBUFFER, GL_COLOR_ATTACHMENT0, _psfTexture, 0);
-    glViewport(0, 0, PsfTextureSize, PsfTextureSize);
-    glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
-
-    std::unique_ptr<ghoul::opengl::ProgramObject> program =
-        ghoul::opengl::ProgramObject::Build(
-            "RenderStarPSFToTexture",
-            absPath("${MODULE_SPACE}/shaders/psfToTexture_vs.glsl"),
-            absPath("${MODULE_SPACE}/shaders/psfToTexture_fs.glsl")
-        );
-
-    program->activate();
-    constexpr std::array<float, 4> Black = { 0.f, 0.f, 0.f, 0.f };
-    glClearBufferfv(GL_COLOR, 0, Black.data());
-
-    program->setUniform("psfMethod", _psfMethodOption.value());
-    program->setUniform("p0Param", _p0Param);
-    program->setUniform("p1Param", _p1Param);
-    program->setUniform("p2Param", _p2Param);
-    program->setUniform("alphaConst", _spencerAlphaConst);
-    program->setUniform("FWHM", _FWHMConst);
-    program->setUniform("betaConstant", _moffatBetaConst);
-
-    // Draws psf to texture
-    glBindVertexArray(_psfVao);
-    glDrawArrays(GL_TRIANGLES, 0, 6);
-    glBindVertexArray(0);
-
-    program->deactivate();
-
-    // JCC: Convolution is disabled while FFT is not enabled
-    //// Now convolves with a disc shape for final shape
-
-    //GLuint convolveFBO;
-    //glGenFramebuffers(1, &convolveFBO);
-    //glBindFramebuffer(GL_FRAMEBUFFER, convolveFBO);
-    //glDrawBuffers(1, drawBuffers);
-
-    //glFramebufferTexture(
-    //    GL_FRAMEBUFFER,
-    //    GL_COLOR_ATTACHMENT0,
-    //    _convolvedTexture,
-    //    0
-    //);
-
-    //glViewport(0, 0, _convolvedfTextureSize, _convolvedfTextureSize);
-
-    //std::unique_ptr<ghoul::opengl::ProgramObject> programConvolve =
-    //    ghoul::opengl::ProgramObject::Build("ConvolvePSFandStarShape",
-    //        absPath("${MODULE_SPACE}/shaders/convolution_vs.glsl"),
-    //        absPath("${MODULE_SPACE}/shaders/convolution_fs.glsl")
-    //    );
-
-    //programConvolve->activate();
-    //glClearBufferfv(GL_COLOR, 0, black);
-
-    //ghoul::opengl::TextureUnit psfTextureUnit;
-    //psfTextureUnit.activate();
-    //glBindTexture(GL_TEXTURE_2D, _psfTexture);
-    //programConvolve->setUniform("psfTexture", psfTextureUnit);
-    //
-    //ghoul::opengl::TextureUnit shapeTextureUnit;
-    //shapeTextureUnit.activate();
-    //_shapeTexture->bind();
-    //programConvolve->setUniform("shapeTexture", shapeTextureUnit);
-
-    //programConvolve->setUniform("psfTextureSize", _psfTextureSize);
-    //programConvolve->setUniform(
-    //    "convolvedfTextureSize",
-    //    _convolvedfTextureSize
-    //);
-
-    //// Convolves to texture
-    //glBindVertexArray(_psfVao);
-    //glDrawArrays(GL_TRIANGLES, 0, 6);
-    //glBindVertexArray(0);
-
-    //programConvolve->deactivate();
-
-    //// Restores system state
-    //glBindFramebuffer(GL_FRAMEBUFFER, defaultFBO);
-    //glViewport(
-    //    m_viewport[0],
-    //    m_viewport[1],
-    //    m_viewport[2],
-    //    m_viewport[3]
-    //);
-    glDeleteFramebuffers(1, &psfFBO);
-    //glDeleteFramebuffers(1, &convolveFBO);
-
-    // Restores OpenGL blending state
-    global::renderEngine->openglStateCache().resetBlendState();
-}
-
 void RenderableStars::render(const RenderData& data, RendererTasks&) {
     if (_dataset.entries.empty()) {
         return;
@@ -1045,24 +766,18 @@ void RenderableStars::render(const RenderData& data, RendererTasks&) {
     _program->setUniform(_uniformCache.cameraUp, cameraUp);
 
     const glm::dmat4 modelMatrix = calcModelTransform(data);
-
-    const glm::dmat4 projectionMatrix = glm::dmat4(data.camera.projectionMatrix());
-
-    const glm::dmat4 cameraViewProjectionMatrix =
-        projectionMatrix * data.camera.combinedViewMatrix();
-
     _program->setUniform(_uniformCache.modelMatrix, modelMatrix);
-    _program->setUniform(
-        _uniformCache.cameraViewProjectionMatrix,
-        cameraViewProjectionMatrix
-    );
+
+    const glm::dmat4 viewProjectionMatrix =
+        glm::dmat4(data.camera.projectionMatrix()) * data.camera.combinedViewMatrix();
+    _program->setUniform(_uniformCache.cameraViewProjectionMatrix, viewProjectionMatrix);
+
     _program->setUniform(_uniformCache.colorOption, _colorOption);
     _program->setUniform(_uniformCache.magnitudeExponent, _magnitudeExponent);
 
-    _program->setUniform(_uniformCache.psfParamConf, _psfMultiplyOption.value());
-    _program->setUniform(_uniformCache.lumCent, _lumCent);
-    _program->setUniform(_uniformCache.radiusCent, _radiusCent);
-    _program->setUniform(_uniformCache.brightnessCent, _brightnessCent);
+    _program->setUniform(_uniformCache.sizeComposition, _parameters.method.value());
+    _program->setUniform(_uniformCache.lumCent, _parameters.lumCent);
+    _program->setUniform(_uniformCache.radiusCent, _parameters.radiusCent);
 
     if (_colorOption == ColorOption::FixedColor) {
         if (_uniformCache.fixedColor == -1) {
@@ -1071,36 +786,38 @@ void RenderableStars::render(const RenderData& data, RendererTasks&) {
         _program->setUniform(_uniformCache.fixedColor, _fixedColor);
     }
 
-    float fadeInVariable = 1.f;
-    if (!_disableFadeInDistance) {
-        const float distCamera = static_cast<float>(
-            glm::length(data.camera.positionVec3())
-        );
+    if (_enableFadeInDistance) {
+        const double distCam = glm::length(data.camera.positionVec3());
         const glm::vec2 fadeRange = _fadeInDistances;
         const double a = 1.f / ((fadeRange.y - fadeRange.x) * PARSEC);
         const double b = -(fadeRange.x / (fadeRange.y - fadeRange.x));
-        const double funcValue = a * distCamera + b;
-        fadeInVariable *= static_cast<float>(funcValue > 1.f ? 1.f : funcValue);
+        const float funcValue = static_cast<float>(a * distCam + b);
+        const float fadeInValue = std::min(funcValue, 1.f);
 
-        _program->setUniform(_uniformCache.alphaValue, opacity() * fadeInVariable);
+        _program->setUniform(_uniformCache.opacity, opacity() * fadeInValue);
     }
     else {
-        _program->setUniform(_uniformCache.alphaValue, opacity());
+        _program->setUniform(_uniformCache.opacity, opacity());
     }
 
-    ghoul::opengl::TextureUnit psfUnit;
-    psfUnit.activate();
+    ghoul::opengl::TextureUnit haloUnit;
+    haloUnit.activate();
+    _halo.texture->bind();
+    _program->setUniform(_uniformCache.haloTexture, haloUnit);
+    _program->setUniform(_uniformCache.haloMultiplier, _halo.multiplier);
+    _program->setUniform(_uniformCache.haloGamma, _halo.gamma);
+    _program->setUniform(_uniformCache.haloScale, _halo.scale);
 
-    if (_renderingMethodOption.value() == RenderMethod::PointSpreadFunction) {
-        glBindTexture(GL_TEXTURE_2D, _psfTexture);\
-        // Convolutioned texture
-        //glBindTexture(GL_TEXTURE_2D, _convolvedTexture);
+    ghoul::opengl::TextureUnit glareUnit;
+    if (_glare.texture) {
+        glareUnit.activate();
+        _glare.texture->bind();
+        _program->setUniform(_uniformCache.glareTexture, glareUnit);
+        _program->setUniform(_uniformCache.glareMultiplier, _glare.multiplier);
+        _program->setUniform(_uniformCache.glareGamma, _glare.gamma);
+        _program->setUniform(_uniformCache.glareScale, _glare.scale);
     }
-    else if (_renderingMethodOption.value() == RenderMethod::TextureBased) {
-        _pointSpreadFunctionTexture->bind();
-    }
-
-    _program->setUniform(_uniformCache.psfTexture, psfUnit);
+    _program->setUniform(_uniformCache.hasGlare, _glare.texture != nullptr);
 
     ghoul::opengl::TextureUnit colorUnit;
     if (_colorTexture) {
@@ -1126,9 +843,7 @@ void RenderableStars::render(const RenderData& data, RendererTasks&) {
 
 
     glBindVertexArray(_vao);
-    const GLsizei nStars = static_cast<GLsizei>(_dataset.entries.size());
-    glDrawArrays(GL_POINTS, 0, nStars);
-
+    glDrawArrays(GL_POINTS, 0, static_cast<GLsizei>(_dataset.entries.size()));
     glBindVertexArray(0);
     _program->deactivate();
 
@@ -1154,12 +869,6 @@ void RenderableStars::update(const UpdateData&) {
 
         std::vector<float> slice = createDataSlice(ColorOption(value));
 
-        if (_vao == 0) {
-            glGenVertexArrays(1, &_vao);
-        }
-        if (_vbo == 0) {
-            glGenBuffers(1, &_vbo);
-        }
         glBindVertexArray(_vao);
         glBindBuffer(GL_ARRAY_BUFFER, _vbo);
         glBufferData(
@@ -1170,10 +879,8 @@ void RenderableStars::update(const UpdateData&) {
         );
 
         const GLint positionAttrib = _program->attributeLocation("in_position");
-        // bvLumAbsMagAppMag = bv color, luminosity, abs magnitude and app magnitude
-        const GLint bvLumAbsMagAppMagAttrib = _program->attributeLocation(
-            "in_bvLumAbsMagAppMag"
-        );
+        // in_bvLumAbsMag = bv color, luminosity, abs magnitude
+        const GLint bvLumAbsMagAttrib = _program->attributeLocation("in_bvLumAbsMag");
 
         const size_t nStars = _dataset.entries.size();
         const size_t nValues = slice.size() / nStars;
@@ -1181,25 +888,26 @@ void RenderableStars::update(const UpdateData&) {
         const GLsizei stride = static_cast<GLsizei>(sizeof(GLfloat) * nValues);
 
         glEnableVertexAttribArray(positionAttrib);
-        glEnableVertexAttribArray(bvLumAbsMagAppMagAttrib);
+        glVertexAttribPointer(
+            positionAttrib,
+            3,
+            GL_FLOAT,
+            GL_FALSE,
+            stride,
+            nullptr
+        );
+
+        glEnableVertexAttribArray(bvLumAbsMagAttrib);
         const int colorOption = _colorOption;
         switch (colorOption) {
             case ColorOption::Color:
             case ColorOption::FixedColor:
                 glVertexAttribPointer(
-                    positionAttrib,
+                    bvLumAbsMagAttrib,
                     3,
                     GL_FLOAT,
                     GL_FALSE,
                     stride,
-                    nullptr // = offsetof(ColorVBOLayout, position)
-                );
-                glVertexAttribPointer(
-                    bvLumAbsMagAppMagAttrib,
-                    4,
-                    GL_FLOAT,
-                    GL_FALSE,
-                    stride,
                     reinterpret_cast<void*>(offsetof(ColorVBOLayout, value))
                 );
 
@@ -1207,19 +915,11 @@ void RenderableStars::update(const UpdateData&) {
             case ColorOption::Velocity:
             {
                 glVertexAttribPointer(
-                    positionAttrib,
+                    bvLumAbsMagAttrib,
                     3,
                     GL_FLOAT,
                     GL_FALSE,
                     stride,
-                    nullptr // = offsetof(VelocityVBOLayout, position)
-                );
-                glVertexAttribPointer(
-                    bvLumAbsMagAppMagAttrib,
-                    4,
-                    GL_FLOAT,
-                    GL_FALSE,
-                    stride,
                     reinterpret_cast<void*>(offsetof(VelocityVBOLayout, value))
                 );
 
@@ -1239,19 +939,11 @@ void RenderableStars::update(const UpdateData&) {
             case ColorOption::Speed:
             {
                 glVertexAttribPointer(
-                    positionAttrib,
+                    bvLumAbsMagAttrib,
                     3,
                     GL_FLOAT,
                     GL_FALSE,
                     stride,
-                    nullptr // = offsetof(SpeedVBOLayout, position)
-                );
-                glVertexAttribPointer(
-                    bvLumAbsMagAppMagAttrib,
-                    4,
-                    GL_FLOAT,
-                    GL_FALSE,
-                    stride,
                     reinterpret_cast<void*>(offsetof(SpeedVBOLayout, value))
                 );
 
@@ -1268,27 +960,17 @@ void RenderableStars::update(const UpdateData&) {
                 break;
             }
             case ColorOption::OtherData:
-            {
                 glVertexAttribPointer(
-                    positionAttrib,
+                    bvLumAbsMagAttrib,
                     3,
                     GL_FLOAT,
                     GL_FALSE,
                     stride,
-                    nullptr // = offsetof(OtherDataLayout, position)
-                );
-                glVertexAttribPointer(
-                    bvLumAbsMagAppMagAttrib,
-                    4,
-                    GL_FLOAT,
-                    GL_FALSE,
-                    stride,
                     reinterpret_cast<void*>(offsetof(OtherDataLayout, value))
                 );
-            }
+                break;
         }
 
-        glBindBuffer(GL_ARRAY_BUFFER, 0);
         glBindVertexArray(0);
 
         _dataIsDirty = false;
@@ -1308,9 +990,7 @@ void RenderableStars::update(const UpdateData&) {
                 1
             );
             if (_colorTexture) {
-                LDEBUG(std::format(
-                    "Loaded texture from '{}'", absPath(_colorTexturePath)
-                ));
+                LDEBUG(std::format("Loaded texture '{}'", _colorTexturePath.value()));
                 _colorTexture->uploadTexture();
             }
 
@@ -1322,8 +1002,6 @@ void RenderableStars::update(const UpdateData&) {
         _colorTextureIsDirty = false;
     }
 
-    //loadShapeTexture();
-
     if (_otherDataColorMapIsDirty) {
         LDEBUG("Reloading Color Texture");
         _otherDataColorMapTexture = nullptr;
@@ -1334,7 +1012,7 @@ void RenderableStars::update(const UpdateData&) {
             );
             if (_otherDataColorMapTexture) {
                 LDEBUG(std::format(
-                    "Loaded texture from '{}'", absPath(_otherDataColorMapPath)
+                    "Loaded texture '{}'", _otherDataColorMapPath.value()
                 ));
                 _otherDataColorMapTexture->uploadTexture();
             }
@@ -1374,20 +1052,13 @@ void RenderableStars::loadData() {
 }
 
 std::vector<float> RenderableStars::createDataSlice(ColorOption option) {
-    const int bvIdx = std::max(_dataset.index(_dataMapping.bvColor.value()), 0);
-    const int lumIdx = std::max(_dataset.index(_dataMapping.luminance.value()), 0);
-    const int absMagIdx = std::max(
-        _dataset.index(_dataMapping.absoluteMagnitude.value()),
-        0
-    );
-    const int appMagIdx = std::max(
-        _dataset.index(_dataMapping.apparentMagnitude.value()),
-        0
-    );
-    const int vxIdx = std::max(_dataset.index(_dataMapping.vx.value()), 0);
-    const int vyIdx = std::max(_dataset.index(_dataMapping.vy.value()), 0);
-    const int vzIdx = std::max(_dataset.index(_dataMapping.vz.value()), 0);
-    const int speedIdx = std::max(_dataset.index(_dataMapping.speed.value()), 0);
+    const int bvIdx = std::max(_dataset.index(_dataMapping.bvColor), 0);
+    const int lumIdx = std::max(_dataset.index(_dataMapping.luminance), 0);
+    const int absMagIdx = std::max(_dataset.index(_dataMapping.absoluteMagnitude), 0);
+    const int vxIdx = std::max(_dataset.index(_dataMapping.vx), 0);
+    const int vyIdx = std::max(_dataset.index(_dataMapping.vy), 0);
+    const int vzIdx = std::max(_dataset.index(_dataMapping.vz), 0);
+    const int speedIdx = std::max(_dataset.index(_dataMapping.speed), 0);
 
     _otherDataRange = glm::vec2(
         std::numeric_limits<float>::max(),
@@ -1397,10 +1068,11 @@ std::vector<float> RenderableStars::createDataSlice(ColorOption option) {
     double maxRadius = 0.0;
 
     std::vector<float> result;
-    // 7 for the default Color option of 3 positions + bv + lum + abs + app magnitude
-    result.reserve(_dataset.entries.size() * 7);
+    // 6 for the default Color option of 3 positions + bv + lum + abs
+    result.reserve(_dataset.entries.size() * 6);
     for (const dataloader::Dataset::Entry& e : _dataset.entries) {
         glm::dvec3 position = glm::dvec3(e.position) * distanceconstants::Parsec;
+        glm::vec3 pos = position;
         maxRadius = std::max(maxRadius, glm::length(position));
 
         switch (option) {
@@ -1412,16 +1084,10 @@ std::vector<float> RenderableStars::createDataSlice(ColorOption option) {
                     std::array<float, sizeof(ColorVBOLayout) / sizeof(float)> data;
                 } layout;
 
-                layout.value.position = { {
-                    static_cast<float>(position[0]),
-                    static_cast<float>(position[1]),
-                    static_cast<float>(position[2])
-                }};
-
+                layout.value.position = { pos.x, pos.y, pos.z };
                 layout.value.value = e.data[bvIdx];
                 layout.value.luminance = e.data[lumIdx];
                 layout.value.absoluteMagnitude = e.data[absMagIdx];
-                layout.value.apparentMagnitude = e.data[appMagIdx];
 
                 result.insert(result.end(), layout.data.begin(), layout.data.end());
                 break;
@@ -1433,16 +1099,10 @@ std::vector<float> RenderableStars::createDataSlice(ColorOption option) {
                     std::array<float, sizeof(VelocityVBOLayout) / sizeof(float)> data;
                 } layout;
 
-                layout.value.position = {{
-                    static_cast<float>(position[0]),
-                    static_cast<float>(position[1]),
-                    static_cast<float>(position[2])
-                }};
-
+                layout.value.position = { pos.x, pos.y, pos.z };
                 layout.value.value = e.data[bvIdx];
                 layout.value.luminance = e.data[lumIdx];
                 layout.value.absoluteMagnitude = e.data[absMagIdx];
-                layout.value.apparentMagnitude = e.data[appMagIdx];
 
                 layout.value.vx = e.data[vxIdx];
                 layout.value.vy = e.data[vyIdx];
@@ -1458,16 +1118,10 @@ std::vector<float> RenderableStars::createDataSlice(ColorOption option) {
                     std::array<float, sizeof(SpeedVBOLayout) / sizeof(float)> data;
                 } layout;
 
-                layout.value.position = {{
-                    static_cast<float>(position[0]),
-                    static_cast<float>(position[1]),
-                    static_cast<float>(position[2])
-                }};
-
+                layout.value.position = { pos.x, pos.y, pos.z };
                 layout.value.value = e.data[bvIdx];
                 layout.value.luminance = e.data[lumIdx];
                 layout.value.absoluteMagnitude = e.data[absMagIdx];
-                layout.value.apparentMagnitude = e.data[appMagIdx];
                 layout.value.speed = e.data[speedIdx];
 
                 result.insert(result.end(), layout.data.begin(), layout.data.end());
@@ -1480,11 +1134,7 @@ std::vector<float> RenderableStars::createDataSlice(ColorOption option) {
                     std::array<float, sizeof(OtherDataLayout)> data;
                 } layout = {};
 
-                layout.value.position = {{
-                    static_cast<float>(position[0]),
-                    static_cast<float>(position[1]),
-                    static_cast<float>(position[2])
-                }};
+                layout.value.position = { pos.x, pos.y, pos.z };
 
                 const int index = _otherDataOption.value();
                 // plus 3 because of the position
@@ -1504,7 +1154,6 @@ std::vector<float> RenderableStars::createDataSlice(ColorOption option) {
 
                 layout.value.luminance = e.data[lumIdx];
                 layout.value.absoluteMagnitude = e.data[absMagIdx];
-                layout.value.apparentMagnitude = e.data[appMagIdx];
 
                 result.insert(result.end(), layout.data.begin(), layout.data.end());
                 break;
diff --git a/modules/space/rendering/renderablestars.h b/modules/space/rendering/renderablestars.h
index cc42931b15..f2716cb304 100644
--- a/modules/space/rendering/renderablestars.h
+++ b/modules/space/rendering/renderablestars.h
@@ -59,8 +59,6 @@ public:
 
     bool isReady() const override;
 
-    void loadPSFTexture();
-    void renderPSFToTexture();
     void render(const RenderData& data, RendererTasks& rendererTask) override;
     void update(const UpdateData& data) override;
 
@@ -75,6 +73,7 @@ private:
         FixedColor = 4
     };
 
+    void loadPSFTexture();
     void loadData();
     std::vector<float> createDataSlice(ColorOption option);
 
@@ -84,12 +83,12 @@ private:
     std::unique_ptr<ghoul::opengl::Texture> _colorTexture;
     std::unique_ptr<ghoul::filesystem::File> _colorTextureFile;
 
-    properties::PropertyOwner _dataMappingContainer;
     struct {
+        properties::PropertyOwner container;
+
         properties::StringProperty bvColor;
         properties::StringProperty luminance;
         properties::StringProperty absoluteMagnitude;
-        properties::StringProperty apparentMagnitude;
         properties::StringProperty vx;
         properties::StringProperty vy;
         properties::StringProperty vz;
@@ -103,43 +102,45 @@ private:
     std::unique_ptr<ghoul::opengl::Texture> _otherDataColorMapTexture;
     properties::Vec3Property _fixedColor;
     properties::BoolProperty _filterOutOfRange;
-    properties::StringProperty _pointSpreadFunctionTexturePath;
-    std::unique_ptr<ghoul::opengl::Texture> _pointSpreadFunctionTexture;
-    std::unique_ptr<ghoul::filesystem::File> _pointSpreadFunctionFile;
 
-    properties::OptionProperty _psfMethodOption;
-    properties::OptionProperty _psfMultiplyOption;
-    properties::FloatProperty _lumCent;
-    properties::FloatProperty _radiusCent;
-    properties::FloatProperty _brightnessCent;
+    struct TextureComponent {
+        properties::PropertyOwner container;
+
+        properties::StringProperty texturePath;
+        properties::FloatProperty multiplier;
+        properties::FloatProperty gamma;
+        properties::FloatProperty scale;
+
+        std::unique_ptr<ghoul::opengl::Texture> texture;
+        std::unique_ptr<ghoul::filesystem::File> file;
+    };
+
+    TextureComponent _halo;
+    TextureComponent _glare;
+
+    struct {
+        properties::PropertyOwner container;
+        properties::OptionProperty method;
+        properties::FloatProperty lumCent;
+        properties::FloatProperty radiusCent;
+    } _parameters;
+
     properties::FloatProperty _magnitudeExponent;
-    properties::PropertyOwner _spencerPSFParamOwner;
-    properties::FloatProperty _p0Param;
-    properties::FloatProperty _p1Param;
-    properties::FloatProperty _p2Param;
-    properties::FloatProperty _spencerAlphaConst;
-    properties::PropertyOwner _moffatPSFParamOwner;
-    properties::FloatProperty _FWHMConst;
-    properties::FloatProperty _moffatBetaConst;
-    properties::OptionProperty _renderingMethodOption;
-    properties::PropertyOwner _userProvidedTextureOwner;
-    properties::PropertyOwner _parametersOwner;
-    properties::PropertyOwner _moffatMethodOwner;
     properties::Vec2Property _fadeInDistances;
-    properties::BoolProperty _disableFadeInDistance;
+    properties::BoolProperty _enableFadeInDistance;
 
     std::unique_ptr<ghoul::opengl::ProgramObject> _program;
     UniformCache(
-        modelMatrix, cameraUp, cameraViewProjectionMatrix, colorOption, magnitudeExponent,
-        eyePosition, psfParamConf, lumCent, radiusCent, brightnessCent, colorTexture,
-        alphaValue, psfTexture, otherDataTexture, otherDataRange, filterOutOfRange,
-        fixedColor
+        modelMatrix, cameraViewProjectionMatrix, cameraUp, eyePosition, colorOption,
+        magnitudeExponent, sizeComposition, lumCent, radiusCent, colorTexture, opacity,
+        otherDataTexture, otherDataRange, filterOutOfRange, fixedColor, haloTexture,
+        haloMultiplier, haloGamma, haloScale, hasGlare, glareTexture, glareMultiplier,
+        glareGamma, glareScale
     ) _uniformCache;
 
     bool _speckFileIsDirty = true;
     bool _pointSpreadFunctionTextureIsDirty = true;
     bool _colorTextureIsDirty = true;
-    //bool _shapeTextureIsDirty = true;
     bool _dataIsDirty = true;
     bool _otherDataColorMapIsDirty = true;
 
@@ -152,10 +153,6 @@ private:
 
     GLuint _vao = 0;
     GLuint _vbo = 0;
-    GLuint _psfVao = 0;
-    GLuint _psfVbo = 0;
-    GLuint _psfTexture = 0;
-    GLuint _convolvedTexture = 0;
 };
 
 } // namespace openspace
diff --git a/modules/space/shaders/star_fs.glsl b/modules/space/shaders/star_fs.glsl
index 10917c260d..1e2e3957e3 100644
--- a/modules/space/shaders/star_fs.glsl
+++ b/modules/space/shaders/star_fs.glsl
@@ -32,14 +32,24 @@ flat in float ge_speed;
 flat in float gs_screenSpaceDepth;
 
 uniform sampler1D colorTexture;
-uniform sampler2D psfTexture;
-uniform float alphaValue;
+uniform sampler2D haloTexture;
+uniform float opacity;
 uniform vec3 fixedColor;
 uniform int colorOption;
 uniform sampler1D otherDataTexture;
 uniform vec2 otherDataRange;
 uniform bool filterOutOfRange;
 
+uniform float haloMultiplier;
+uniform float haloGamma;
+uniform float haloScale;
+
+uniform bool hasGlare;
+uniform sampler2D glareTexture;
+uniform float glareMultiplier;
+uniform float glareGamma;
+uniform float glareScale;
+
 // keep in sync with renderablestars.h:ColorOption enum
 const int ColorOptionColor = 0;
 const int ColorOptionVelocity = 1;
@@ -68,6 +78,7 @@ vec4 otherDataValue() {
 
 Fragment getFragment() {
   vec4 color = vec4(0.0);
+
   switch (colorOption) {
     case ColorOptionColor:
       color = bv2rgb(ge_bv);
@@ -92,8 +103,21 @@ Fragment getFragment() {
       break;
   }
 
-  vec4 textureColor = texture(psfTexture, texCoords);
-  vec4 fullColor = vec4(color.rgb, textureColor.a * alphaValue);
+  vec2 shiftedCoords = (texCoords - 0.5) * 2;
+
+  vec2 scaledCoordsHalo = shiftedCoords / haloScale;
+  vec2 unshiftedCoordsHalo = (scaledCoordsHalo + 1.0) / 2.0;
+  float haloValue = texture(haloTexture, unshiftedCoordsHalo).a;
+  float alpha = pow(haloValue, haloGamma) * haloMultiplier;
+  if (hasGlare) {
+    vec2 scaledCoordsGlare = shiftedCoords / glareScale;
+    vec2 unshiftedCoordsGlare = (scaledCoordsGlare + 1.0) / 2.0;
+    float glareValue = texture(glareTexture, unshiftedCoordsGlare).a;
+    float glare = pow(glareValue, glareGamma) * glareMultiplier;
+    alpha += glare;
+  }
+
+  vec4 fullColor = vec4(color.rgb, alpha * opacity);
 
   if (fullColor.a < 0.001) {
     discard;
diff --git a/modules/space/shaders/star_ge.glsl b/modules/space/shaders/star_ge.glsl
index b033fd0099..da590aa0b7 100644
--- a/modules/space/shaders/star_ge.glsl
+++ b/modules/space/shaders/star_ge.glsl
@@ -27,7 +27,7 @@
 #include "PowerScaling/powerScalingMath.hglsl"
 
 layout(points) in;
-in vec4 vs_bvLumAbsMagAppMag[];
+in vec3 vs_bvLumAbsMag[];
 in vec3 vs_velocity[];
 in float vs_speed[];
 
@@ -42,24 +42,21 @@ flat out float gs_screenSpaceDepth;
 uniform float magnitudeExponent;
 uniform dvec3 eyePosition;
 uniform dvec3 cameraUp;
-uniform int psfParamConf;
+uniform int sizeComposition;
 uniform float lumCent;
 uniform float radiusCent;
-uniform float brightnessCent;
 uniform dmat4 cameraViewProjectionMatrix;
 uniform dmat4 modelMatrix;
 
 const double PARSEC = 3.08567756E16;
-//const double PARSEC = 3.08567782E16;
 
 // FRAGILE
 // All of these values have to be synchronized with the values in the optionproperty
-const int SizeCompositionOptionAppBrightness = 0;
-const int SizeCompositionOptionLumSize = 1;
-const int SizeCompositionOptionLumSizeAppBrightness = 2;
+const int SizeCompositionOptionLumSizeDistanceModulus = 0;
+const int SizeCompositionOptionAppBrightness = 1;
+const int SizeCompositionOptionLumSize = 2;
 const int SizeCompositionOptionLumSizeAbsMagnitude = 3;
 const int SizeCompositionOptionLumSizeAppMagnitude = 4;
-const int SizeCompositionOptionLumSizeDistanceModulus = 5;
 
 const float SunTemperature = 5800.0;
 const float SunAbsMagnitude = 4.83;
@@ -88,21 +85,6 @@ double scaleForLuminositySize(float bv, float luminance, float absMagnitude) {
   return (lumCent * adjustedLuminance + (radiusCent * starRadius)) * pow(10.0, magnitudeExponent);
 }
 
-double scaleForLuminositySizeAppBrightness(dvec3 dpos, float bv, float luminance, float absMagnitude) {
-  double luminosity = double(1.0 - luminance);
-  double distanceToStarInParsecs = trunc(length(dpos - eyePosition) / PARSEC);
-  double apparentBrightness = luminosity / distanceToStarInParsecs;
-  float L_over_Lsun = pow(2.51, SunAbsMagnitude - absMagnitude);
-  float temperature = bvToKelvin(bv);
-  float relativeTemperature = SunTemperature / temperature;
-  double starRadius = SunRadius * pow(relativeTemperature, 2.0) * sqrt(L_over_Lsun);
-
-  double scaledLuminance = lumCent * (luminance + 5E9);
-  double scaledStarRadius = radiusCent * starRadius;
-  double scaledBrightness = brightnessCent * apparentBrightness * 5E15;
-  return (scaledLuminance + scaledStarRadius + scaledBrightness) * pow(10.0, magnitudeExponent);
-}
-
 double scaleForAbsoluteMagnitude(float absMagnitude) {
   return (-absMagnitude + 35) * pow(10.0, magnitudeExponent + 8.5);
 }
@@ -111,19 +93,8 @@ double scaleForApparentMagnitude(dvec3 dpos, float absMag) {
   double distanceToStarInMeters = length(dpos - eyePosition);
   double distanceToCenterInMeters = length(eyePosition);
   float distanceToStarInParsecs = float(distanceToStarInMeters/PARSEC);
-  //float appMag = absMag + 5*log(distanceToStarInParsecs) - 5.0;
   float appMag = absMag + 5.0 * (log(distanceToStarInParsecs/10.0)/log(2.0));
-  //appMag = vs_bvLumAbsMagAppMag[0].w;
-
-  //scaleMultiply = (30.623 - appMag) * pow(10.0, magnitudeExponent + 7.0);// *
-  //float(distanceToStarInMeters/distanceToCenterInMeters);
-
   return (-appMag + 50.0) * pow(10.0, magnitudeExponent + 7.5);
-  // return log(35.f + appMag) *  pow(10.0, magnitudeExponent + 6.5f);
-  // return exp((35.f - appMag) * 0.2) * pow(10.0, magnitudeExponent + 2.5f);
-  // return appMag * pow(10.0, magnitudeExponent + 8.5f);
-  // return exp((-30.0 - appMag) * 0.45) * pow(10.0, magnitudeExponent + 8.f);
-  // return pow(10.0, (appMag - absMag)*(1.0/5.0) + 1.0) * pow(10.0, magnitudeExponent + 3.f);
 }
 
 double scaleForDistanceModulus(float absMag) {
@@ -136,46 +107,39 @@ void main() {
   vs_position = pos; // in object space
   dvec4 dpos  = modelMatrix * dvec4(pos, 1.0);
 
-  ge_bv = vs_bvLumAbsMagAppMag[0].x;
+  ge_bv = vs_bvLumAbsMag[0].x;
   ge_velocity = vs_velocity[0];
   ge_speed = vs_speed[0];
 
   double scaleMultiply = 1.0;
 
-  if (psfParamConf == SizeCompositionOptionAppBrightness) {
-    float luminance = vs_bvLumAbsMagAppMag[0].y;
+  if (sizeComposition == SizeCompositionOptionLumSizeDistanceModulus) {
+    float absMagnitude = vs_bvLumAbsMag[0].z;
+
+    scaleMultiply = scaleForDistanceModulus(absMagnitude);
+  }
+  else if (sizeComposition == SizeCompositionOptionAppBrightness) {
+    float luminance = vs_bvLumAbsMag[0].y;
 
     scaleMultiply = scaleForApparentBrightness(dpos.xyz, luminance);
   }
-  else if (psfParamConf == SizeCompositionOptionLumSize) {
-    float bv = vs_bvLumAbsMagAppMag[0].x;
-    float luminance = vs_bvLumAbsMagAppMag[0].y;
-    float absMagnitude = vs_bvLumAbsMagAppMag[0].z;
+  else if (sizeComposition == SizeCompositionOptionLumSize) {
+    float bv = vs_bvLumAbsMag[0].x;
+    float luminance = vs_bvLumAbsMag[0].y;
+    float absMagnitude = vs_bvLumAbsMag[0].z;
 
     scaleMultiply = scaleForLuminositySize(bv, luminance, absMagnitude);
   }
-  else if (psfParamConf == SizeCompositionOptionLumSizeAppBrightness) {
-    float bv = vs_bvLumAbsMagAppMag[0].x;
-    float luminance = vs_bvLumAbsMagAppMag[0].y;
-    float absMagnitude = vs_bvLumAbsMagAppMag[0].z;
-
-    scaleMultiply = scaleForLuminositySizeAppBrightness(dpos.xyz, bv, luminance, absMagnitude);
-  }
-  else if (psfParamConf == SizeCompositionOptionLumSizeAbsMagnitude) {
-    float absMagnitude = vs_bvLumAbsMagAppMag[0].z;
+  else if (sizeComposition == SizeCompositionOptionLumSizeAbsMagnitude) {
+    float absMagnitude = vs_bvLumAbsMag[0].z;
 
     scaleMultiply = scaleForAbsoluteMagnitude(absMagnitude);
   }
-  else if (psfParamConf == SizeCompositionOptionLumSizeAppMagnitude) {
-    float absMagnitude = vs_bvLumAbsMagAppMag[0].z;
+  else if (sizeComposition == SizeCompositionOptionLumSizeAppMagnitude) {
+    float absMagnitude = vs_bvLumAbsMag[0].z;
 
     scaleMultiply = scaleForApparentMagnitude(dpos.xyz, absMagnitude);
   }
-  else if (psfParamConf == SizeCompositionOptionLumSizeDistanceModulus) {
-    float absMagnitude = vs_bvLumAbsMagAppMag[0].z;
-
-    scaleMultiply = scaleForDistanceModulus(absMagnitude);
-  }
 
   dvec3 normal = eyePosition - dpos.xyz;
   dvec3 newRight = normalize(cross(cameraUp, normal));
@@ -207,7 +171,7 @@ void main() {
   EmitVertex();
 
   gl_Position = lowerRight;
-  texCoords = vec2(1.0,0.0);
+  texCoords = vec2(1.0, 0.0);
   EmitVertex();
 
   gl_Position = upperLeft;
diff --git a/modules/space/shaders/star_vs.glsl b/modules/space/shaders/star_vs.glsl
index 40d65c8b63..74b845f8a3 100644
--- a/modules/space/shaders/star_vs.glsl
+++ b/modules/space/shaders/star_vs.glsl
@@ -25,17 +25,17 @@
 #version __CONTEXT__
 
 in vec3 in_position;
-in vec4 in_bvLumAbsMagAppMag;
+in vec3 in_bvLumAbsMag;
 in vec3 in_velocity;
 in float in_speed;
 
-out vec4 vs_bvLumAbsMagAppMag;
+out vec3 vs_bvLumAbsMag;
 out vec3 vs_velocity;
 out float vs_speed;
 
 
 void main() {
-  vs_bvLumAbsMagAppMag = in_bvLumAbsMagAppMag;
+  vs_bvLumAbsMag = in_bvLumAbsMag;
   vs_velocity = in_velocity;
   vs_speed = in_speed;
 

From e5306a7b59121480fa7c2e147f49a066a751edba Mon Sep 17 00:00:00 2001
From: Gene Payne <payne.gene@gmail.com>
Date: Thu, 18 Apr 2024 21:54:38 -0600
Subject: [PATCH 392/701] Fix for reading epoch due to scnlib format changes
 (#3166)

---
 modules/space/kepler.cpp | 15 ++++++++++-----
 1 file changed, 10 insertions(+), 5 deletions(-)

diff --git a/modules/space/kepler.cpp b/modules/space/kepler.cpp
index 98dd7f51fb..249b0473ef 100644
--- a/modules/space/kepler.cpp
+++ b/modules/space/kepler.cpp
@@ -266,15 +266,20 @@ namespace {
             epoch.end(),
             [](char c) { return c == '-'; }
         );
-        const std::string format = (nDashes == 2) ? "{:4}-{:2}-{:2}{}" : "{:4}{:2}{:2}{}";
-        auto res = scn::scan<int, int, int, double>(e, scn::runtime_format(format));
+        const std::string format = (nDashes == 2) ? "{:4d}-{:2d}-{}" : "{:4d}{:2d}{}";
+        auto res = scn::scan<int, int, double>(e, scn::runtime_format(format));
         if (!res) {
             throw ghoul::RuntimeError(std::format("Error parsing epoch '{}'", epoch));
         }
-        auto [year, monthNum, dayOfMonthNum, fractionOfDay] = res->values();
+        auto [year, monthNum, dayOfMonth] = res->values();
         const int daysSince2000 = countDays(year);
-        const int wholeDaysInto = daysIntoGivenYear(year, monthNum, dayOfMonthNum);
-        const double daysInYear = static_cast<double>(wholeDaysInto) + fractionOfDay;
+        const int daysInto = daysIntoGivenYear(
+            year,
+            monthNum,
+            static_cast<int>(dayOfMonth)
+        );
+        const double daysInYear = static_cast<double>(daysInto) +
+            (dayOfMonth - std::floor(dayOfMonth));
 
         // 3
         using namespace std::chrono;

From bb9f7c684084a128954f9ae98c1c6b0efda70d57 Mon Sep 17 00:00:00 2001
From: Gene Payne <payne.gene@gmail.com>
Date: Thu, 18 Apr 2024 22:59:54 -0600
Subject: [PATCH 393/701] Using SGCT version that support E&S mpcdi converted
 to TextureMappedProjection type (#3042)

* Bump to sgct submodule supporting TextureMappedProjection

* Bump to sgct submodule of latest master

From 9011f7f6e0b6aeeed63145dd1865f5a9e7a59b30 Mon Sep 17 00:00:00 2001
From: Andreas Engberg <adde.engberg@gmail.com>
Date: Fri, 19 Apr 2024 11:08:52 +0200
Subject: [PATCH 394/701] Moved bookmarks file to live in user folder, auto
 create default if it does not exists

---
 data/assets/customization/localbookmarks.csv |  2 --
 data/assets/global/localbookmarks.asset      | 24 ++++++++++++++++++--
 2 files changed, 22 insertions(+), 4 deletions(-)
 delete mode 100644 data/assets/customization/localbookmarks.csv

diff --git a/data/assets/customization/localbookmarks.csv b/data/assets/customization/localbookmarks.csv
deleted file mode 100644
index d12976e610..0000000000
--- a/data/assets/customization/localbookmarks.csv
+++ /dev/null
@@ -1,2 +0,0 @@
-Group (optional),Name (required),Globe (optional),Lat (required if globe),Lon (required if globe),Altitude (optional if globe),x (required if not globe),y (required if not globe),z (required if not globe),Scale (optional),LineWidth (optional)
-NASA,Kennedy Space Center,Earth,28.6658276,-80.70282839,,,,,,
diff --git a/data/assets/global/localbookmarks.asset b/data/assets/global/localbookmarks.asset
index d8fe0eca97..6ad40e5f43 100644
--- a/data/assets/global/localbookmarks.asset
+++ b/data/assets/global/localbookmarks.asset
@@ -4,12 +4,32 @@ local bookmarkHelper = asset.require("util/generate_bookmarks")
 -- ensure that it is loaded first
 asset.require("scene/solarsystem/planets/earth/earth")
 
+local localBookmarks = openspace.absPath("${USER}/bookmarks/localbookmarks.csv")
+
+-- Returns true if the file exists and can be opened for reading and false otherwise
+function file_exists(name)
+  local f=io.open(name,"r")
+  return f~=nil and io.close(f)
+end
+
+-- Create bookmarks file if it does not exist
+if not file_exists(localBookmarks) then
+  local file = io.open(localBookmarks, "w")
+  file:write(
+    "Group (optional),Name (required),Globe (optional),Lat (required if globe)," ..
+    "Lon (required if globe),Altitude (optional if globe),x (required if not globe)," ..
+    "y (required if not globe),z (required if not globe),Scale (optional)," ..
+    "LineWidth (optional)\n" ..
+    "NASA,Kennedy Space Center,Earth,28.6658276,-80.70282839,,,,,,\n"
+  )
+  file:close()
+end
+
 local nodes = bookmarkHelper.loadBookmarks(
   "Local Bookmarks",
-  "${ASSETS}/customization/localbookmarks.csv"
+  "${USER}/bookmarks/localbookmarks.csv"
 )
 
-
 asset.onInitialize(function()
   for _, n in ipairs(nodes) do
     local success, error = pcall(openspace.addSceneGraphNode, n)

From 7e65a3a32da038f861f4979c85b7ce3dec8e958b Mon Sep 17 00:00:00 2001
From: Andreas Engberg <adde.engberg@gmail.com>
Date: Fri, 19 Apr 2024 11:11:20 +0200
Subject: [PATCH 395/701] use openspace fileExists function

---
 data/assets/global/localbookmarks.asset | 8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)

diff --git a/data/assets/global/localbookmarks.asset b/data/assets/global/localbookmarks.asset
index 6ad40e5f43..2aa5833768 100644
--- a/data/assets/global/localbookmarks.asset
+++ b/data/assets/global/localbookmarks.asset
@@ -6,14 +6,8 @@ asset.require("scene/solarsystem/planets/earth/earth")
 
 local localBookmarks = openspace.absPath("${USER}/bookmarks/localbookmarks.csv")
 
--- Returns true if the file exists and can be opened for reading and false otherwise
-function file_exists(name)
-  local f=io.open(name,"r")
-  return f~=nil and io.close(f)
-end
-
 -- Create bookmarks file if it does not exist
-if not file_exists(localBookmarks) then
+if not openspace.fileExists(localBookmarks) then
   local file = io.open(localBookmarks, "w")
   file:write(
     "Group (optional),Name (required),Globe (optional),Lat (required if globe)," ..

From 9db86c79d4fb84469ae473ec1ad764e3f7b3ef42 Mon Sep 17 00:00:00 2001
From: Ylva Selling <ylva.selling@liu.se>
Date: Fri, 19 Apr 2024 11:13:19 +0200
Subject: [PATCH 396/701] Make abstract classes RenderablePlane and
 RenderableSphere, as well as VideoPlayer, not appear in the documentation.
 Add them to the derived classes instead

---
 modules/base/basemodule.cpp                            | 2 --
 modules/base/rendering/renderablesphereimagelocal.cpp  | 5 ++++-
 modules/base/rendering/renderablesphereimageonline.cpp | 5 ++++-
 modules/video/videomodule.cpp                          | 3 +--
 4 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/modules/base/basemodule.cpp b/modules/base/basemodule.cpp
index 011cce0547..73662afcf6 100644
--- a/modules/base/basemodule.cpp
+++ b/modules/base/basemodule.cpp
@@ -236,7 +236,6 @@ std::vector<documentation::Documentation> BaseModule::documentations() const {
         RenderableModel::Documentation(),
         RenderableNodeArrow::Documentation(),
         RenderableNodeLine::Documentation(),
-        RenderablePlane::Documentation(),
         RenderablePlaneImageLocal::Documentation(),
         RenderablePlaneImageOnline::Documentation(),
         RenderablePlaneTimeVaryingImage::Documentation(),
@@ -244,7 +243,6 @@ std::vector<documentation::Documentation> BaseModule::documentations() const {
         RenderablePolygonCloud::Documentation(),
         RenderablePrism::Documentation(),
         RenderableRadialGrid::Documentation(),
-        RenderableSphere::Documentation(),
         RenderableSphereImageLocal::Documentation(),
         RenderableSphereImageOnline::Documentation(),
         RenderableSphericalGrid::Documentation(),
diff --git a/modules/base/rendering/renderablesphereimagelocal.cpp b/modules/base/rendering/renderablesphereimagelocal.cpp
index c1f1cf97a3..044edb458b 100644
--- a/modules/base/rendering/renderablesphereimagelocal.cpp
+++ b/modules/base/rendering/renderablesphereimagelocal.cpp
@@ -58,7 +58,10 @@ namespace {
 namespace openspace {
 
 documentation::Documentation RenderableSphereImageLocal::Documentation() {
-    return codegen::doc<Parameters>("base_renderable_sphere_image_local");
+    return codegen::doc<Parameters>(
+        "base_renderable_sphere_image_local",
+        RenderableSphere::Documentation()
+    );
 }
 
 RenderableSphereImageLocal::RenderableSphereImageLocal(
diff --git a/modules/base/rendering/renderablesphereimageonline.cpp b/modules/base/rendering/renderablesphereimageonline.cpp
index c9090bce1d..9813fe52fe 100644
--- a/modules/base/rendering/renderablesphereimageonline.cpp
+++ b/modules/base/rendering/renderablesphereimageonline.cpp
@@ -75,7 +75,10 @@ namespace {
 namespace openspace {
 
 documentation::Documentation RenderableSphereImageOnline::Documentation() {
-    return codegen::doc<Parameters>("base_renderable_sphere_image_online");
+    return codegen::doc<Parameters>(
+        "base_renderable_sphere_image_online",
+        RenderableSphere::Documentation()
+    );
 }
 
 RenderableSphereImageOnline::RenderableSphereImageOnline(
diff --git a/modules/video/videomodule.cpp b/modules/video/videomodule.cpp
index cb914478c2..ba0652f03e 100644
--- a/modules/video/videomodule.cpp
+++ b/modules/video/videomodule.cpp
@@ -85,8 +85,7 @@ std::vector<documentation::Documentation> VideoModule::documentations() const {
         RenderableVideoPlane::Documentation(),
         RenderableVideoSphere::Documentation(),
         ScreenSpaceVideo::Documentation(),
-        globebrowsing::VideoTileProvider::Documentation(),
-        VideoPlayer::Documentation()
+        globebrowsing::VideoTileProvider::Documentation()
     };
 }
 

From 9f51549a2a980879c3fe7850ef23fba52baf0f9d Mon Sep 17 00:00:00 2001
From: Micah Acinapura <micahnyc@gmail.com>
Date: Fri, 19 Apr 2024 13:11:32 +0200
Subject: [PATCH 397/701] Issue/2518 epicycle (#3195)

* added epicycle asset; updated trailFromEarth period and colors; added FromEarth trails to trail toggle;

---------

Co-authored-by: Alexander Bock <alexander.bock@liu.se>
---
 .../actions/trails/toggle_all_trails.asset    |  1 +
 data/assets/educational/epicycle.asset        | 79 +++++++++++++++++++
 .../planets/jupiter/trail_earth.asset         |  4 +-
 .../planets/mars/trail_earth.asset            |  4 +-
 .../planets/mercury/trail_earth.asset         |  4 +-
 .../planets/neptune/trail_earth.asset         |  6 +-
 .../planets/saturn/trail_earth.asset          |  6 +-
 .../planets/uranus/trail_earth.asset          |  6 +-
 .../planets/venus/trail_earth.asset           |  2 +-
 9 files changed, 96 insertions(+), 16 deletions(-)
 create mode 100644 data/assets/educational/epicycle.asset

diff --git a/data/assets/actions/trails/toggle_all_trails.asset b/data/assets/actions/trails/toggle_all_trails.asset
index ff5aff14fe..c2f009d836 100644
--- a/data/assets/actions/trails/toggle_all_trails.asset
+++ b/data/assets/actions/trails/toggle_all_trails.asset
@@ -56,6 +56,7 @@ local ToggleTrails = {
       end
       openspace.setPropertyValue("Scene.*Trail.Renderable.Fade", newFade, 2)
       openspace.setPropertyValue("Scene.*trail.Renderable.Fade", newFade, 2)
+      openspace.setPropertyValue("Scene.*TrailEarth.Renderable.Fade", newFade, 2)
     end
   ]],
   Documentation = "Toggle fade for all trails in the Scene",
diff --git a/data/assets/educational/epicycle.asset b/data/assets/educational/epicycle.asset
new file mode 100644
index 0000000000..9158fed7c4
--- /dev/null
+++ b/data/assets/educational/epicycle.asset
@@ -0,0 +1,79 @@
+asset.require("scene/solarsystem/planets/mercury/trail_earth")
+asset.require("scene/solarsystem/planets/venus/trail_earth")
+asset.require("scene/solarsystem/planets/mars/trail_earth")
+asset.require("scene/solarsystem/planets/jupiter/trail_earth")
+asset.require("scene/solarsystem/planets/saturn/trail_earth")
+asset.require("scene/solarsystem/planets/uranus/trail_earth")
+asset.require("scene/solarsystem/planets/neptune/trail_earth")
+
+
+local FullCycleAction = {
+  Identifier = "os.epicycle.SetFull",
+  Name = "Set full epicycles",
+  Documentation = [[Sets EnableFade to false for all epicycle trails so that 
+    they show the entire period]],
+  Command = [[openspace.setPropertyValue("*TrailEarth.Renderable.Appearance.EnableFade", false)]],
+  GuiPath = "/Trails/Epicycle",
+  IsLocal = false
+}
+
+local FadedCycleAction = {
+  Identifier = "os.epicycle.SetFaded",
+  Name = "Set faded epicycles",
+  Documentation = [[Sets EnableFade to true for all epicycle trails so that 
+    they match the default planet trails]],
+  Command = [[openspace.setPropertyValue("*TrailEarth.Renderable.Appearance.EnableFade", true)]],
+  GuiPath = "/Trails/Epicycle",
+  IsLocal = false
+}
+
+local ShowCyclesAction = {
+  Identifier = "os.epicycle.ShowTrails",
+  Name = "Enable/Show epicycles",
+  Documentation = [[Enables and shows in all epicycle trails]],
+  Command = [[openspace.setPropertyValue("*TrailEarth.Renderable.Enabled", true);
+  openspace.setPropertyValue("*TrailEarth.Renderable.Fade", 1, 2);]],
+  GuiPath = "/Trails/Epicycle",
+  IsLocal = false
+}
+
+local FadeoutCyclesAction = {
+  Identifier = "os.epicycle.HideTrails",
+  Name = "Hide epicycles",
+  Documentation = [[Hides all epicycle trails]],
+  Command = [[openspace.setPropertyValue("*TrailEarth.Renderable.Fade", 0, 2)]],
+  GuiPath = "/Trails/Epicycle",
+  IsLocal = false
+}
+
+
+asset.onInitialize(function()
+  openspace.action.registerAction(FullCycleAction)
+  openspace.action.registerAction(FadedCycleAction)
+  openspace.action.registerAction(ShowCyclesAction)
+  openspace.action.registerAction(FadeoutCyclesAction)
+end)
+
+asset.onDeinitialize(function()
+  openspace.action.removeAction(FadeoutCyclesAction)
+  openspace.action.removeAction(ShowCyclesAction)
+  openspace.action.removeAction(FadedCycleAction)
+  openspace.action.removeAction(FullCycleAction)
+end)
+
+asset.export("FullCycleAction", FullCycleAction.Identifier)
+asset.export("FadedCycleAction", FadedCycleAction.Identifier)
+asset.export("ShowCyclesAction", ShowCyclesAction.Identifier)
+asset.export("FadeoutCyclesAction", FadeoutCyclesAction.Identifier)
+
+
+
+asset.meta = {
+  Name = "Epicycle",
+  Version = "1.0",
+  Description = [[This asset includes the trails of the planets from earth.
+    In addition, it provides some actions for manipulating them.]],
+  Author = "OpenSpace Team",
+  URL = "http://openspaceproject.com",
+  License = "MIT license"
+}
diff --git a/data/assets/scene/solarsystem/planets/jupiter/trail_earth.asset b/data/assets/scene/solarsystem/planets/jupiter/trail_earth.asset
index 5d8e9fc196..98491fc4b8 100644
--- a/data/assets/scene/solarsystem/planets/jupiter/trail_earth.asset
+++ b/data/assets/scene/solarsystem/planets/jupiter/trail_earth.asset
@@ -15,8 +15,8 @@ local JupiterTrailEarth = {
       Target = coreKernels.ID.Jupiter,
       Observer = coreKernels.ID.Earth
     },
-    Color = { 1.0, 0.5, 0.2 },
-    Period = 224.695,
+    Color = { 0.8, 0.7, 0.7 },
+    Period = 4375.0,
     Resolution = 1000
   },
   Tag = { "planetTrail_solarSystem_alt", "planetTrail_terrestrial_alt" },
diff --git a/data/assets/scene/solarsystem/planets/mars/trail_earth.asset b/data/assets/scene/solarsystem/planets/mars/trail_earth.asset
index 8498ffc6ec..90965cc77b 100644
--- a/data/assets/scene/solarsystem/planets/mars/trail_earth.asset
+++ b/data/assets/scene/solarsystem/planets/mars/trail_earth.asset
@@ -14,8 +14,8 @@ local MarsTrailEarth = {
       Target = coreKernels.ID.Mars,
       Observer = coreKernels.ID.Earth
     },
-    Color = { 1.0, 0.5, 0.2 },
-    Period = 224.695,
+    Color = { 0.814, 0.305, 0.220 },
+    Period = 5990.0,
     Resolution = 1000
   },
   Tag = { "planetTrail_solarSystem_alt", "planetTrail_terrestrial_alt" },
diff --git a/data/assets/scene/solarsystem/planets/mercury/trail_earth.asset b/data/assets/scene/solarsystem/planets/mercury/trail_earth.asset
index c8d38db592..8587b5cdc7 100644
--- a/data/assets/scene/solarsystem/planets/mercury/trail_earth.asset
+++ b/data/assets/scene/solarsystem/planets/mercury/trail_earth.asset
@@ -15,8 +15,8 @@ local MercuryTrailEarth = {
       Target = coreKernels.ID.Mercury,
       Observer = coreKernels.ID.Earth
     },
-    Color = { 1.0, 0.5, 0.2 },
-    Period = 224.695,
+    Color = { 0.6, 0.5, 0.5 },
+    Period = 380.0,
     Resolution = 1000
   },
   Tag = { "planetTrail_solarSystem_alt", "planetTrail_terrestrial_alt" },
diff --git a/data/assets/scene/solarsystem/planets/neptune/trail_earth.asset b/data/assets/scene/solarsystem/planets/neptune/trail_earth.asset
index 89a6c1ef73..5f90adafe2 100644
--- a/data/assets/scene/solarsystem/planets/neptune/trail_earth.asset
+++ b/data/assets/scene/solarsystem/planets/neptune/trail_earth.asset
@@ -15,9 +15,9 @@ local NeptuneTrailEarth = {
       Target = coreKernels.ID.Neptune,
       Observer = coreKernels.ID.Earth
     },
-    Color = { 1.0, 0.5, 0.2 },
-    Period = 224.695,
-    Resolution = 1000
+    Color = { 0.2, 0.5, 1.0 },
+    Period = 60250.0,
+    Resolution = 3000
   },
   Tag = { "planetTrail_solarSystem_alt", "planetTrail_terrestrial_alt" },
   GUI = {
diff --git a/data/assets/scene/solarsystem/planets/saturn/trail_earth.asset b/data/assets/scene/solarsystem/planets/saturn/trail_earth.asset
index 603c66ca9b..bf6d94f13a 100644
--- a/data/assets/scene/solarsystem/planets/saturn/trail_earth.asset
+++ b/data/assets/scene/solarsystem/planets/saturn/trail_earth.asset
@@ -14,9 +14,9 @@ local SaturnTrailEarth = {
       Target = coreKernels.ID.Saturn,
       Observer = coreKernels.ID.Earth
     },
-    Color = { 1.0, 0.5, 0.2 },
-    Period = 224.695,
-    Resolution = 1000
+    Color = { 0.85, 0.75, 0.51 },
+    Period = 10746.94,
+    Resolution = 3000
   },
   Tag = { "planetTrail_solarSystem_alt", "planetTrail_terrestrial_alt" },
   GUI = {
diff --git a/data/assets/scene/solarsystem/planets/uranus/trail_earth.asset b/data/assets/scene/solarsystem/planets/uranus/trail_earth.asset
index a012dc433d..6f10b3d6d2 100644
--- a/data/assets/scene/solarsystem/planets/uranus/trail_earth.asset
+++ b/data/assets/scene/solarsystem/planets/uranus/trail_earth.asset
@@ -14,9 +14,9 @@ local UranusTrailEarth = {
       Target = coreKernels.ID.Uranus,
       Observer = coreKernels.ID.Earth
     },
-    Color = { 1.0, 0.5, 0.2 },
-    Period = 224.695,
-    Resolution = 1000
+    Color = { 0.6, 0.95, 1.0 },
+    Period = 30588.74,
+    Resolution = 3000
   },
   Tag = { "planetTrail_solarSystem_alt", "planetTrail_terrestrial_alt" },
   GUI = {
diff --git a/data/assets/scene/solarsystem/planets/venus/trail_earth.asset b/data/assets/scene/solarsystem/planets/venus/trail_earth.asset
index 35fd04ca50..a44de7188f 100644
--- a/data/assets/scene/solarsystem/planets/venus/trail_earth.asset
+++ b/data/assets/scene/solarsystem/planets/venus/trail_earth.asset
@@ -16,7 +16,7 @@ local VenusTrailEarth = {
       Observer = coreKernels.ID.Earth
     },
     Color = { 1.0, 0.5, 0.2 },
-    Period = 224.695,
+    Period = 2900.0,
     Resolution = 1000
   },
   Tag = { "planetTrail_solarSystem_alt", "planetTrail_terrestrial_alt" },

From 58bc1bd29dadfaadc27a36cc3d01c0b178e79f7e Mon Sep 17 00:00:00 2001
From: Alexander Bock <alexander.bock@liu.se>
Date: Fri, 19 Apr 2024 13:27:15 +0200
Subject: [PATCH 398/701] Publish event when a scheduled script is executed
 (closes #1892)

---
 include/openspace/events/event.h | 15 +++++++++++++++
 src/engine/openspaceengine.cpp   |  8 ++++++++
 src/events/event.cpp             | 23 +++++++++++++++++++++++
 3 files changed, 46 insertions(+)

diff --git a/include/openspace/events/event.h b/include/openspace/events/event.h
index a4eb4efe61..5faac274b1 100644
--- a/include/openspace/events/event.h
+++ b/include/openspace/events/event.h
@@ -80,6 +80,7 @@ struct Event {
         CameraPathStarted,
         CameraPathFinished,
         CameraMovedPosition,
+        ScheduledScriptExecuted,
         Custom,
         Last // sentinel value
     };
@@ -574,6 +575,20 @@ struct EventCameraMovedPosition : public Event {
     EventCameraMovedPosition();
 };
 
+/**
+ * This event is created when a scheduled script is executed.
+ */
+struct EventScheduledScriptExecuted : public Event {
+    static constexpr Type Type = Event::Type::ScheduledScriptExecuted;
+
+    /**
+     * Creates an instance of an ScheduledScriptExecuted event.
+     */
+    EventScheduledScriptExecuted(std::string_view script_);
+
+    const tstring script;
+};
+
 /**
  * A custom event type that can be used in a pinch when no explicit event type is
  * available. This should only be used in special circumstances and it should be
diff --git a/src/engine/openspaceengine.cpp b/src/engine/openspaceengine.cpp
index ca649bc1f0..ec5161bff6 100644
--- a/src/engine/openspaceengine.cpp
+++ b/src/engine/openspaceengine.cpp
@@ -998,11 +998,19 @@ void OpenSpaceEngine::preSynchronization() {
             global::timeManager->time().j2000Seconds()
         );
         for (const std::string& script : schedScripts) {
+            if (script.empty()) {
+                continue;
+            }
+
             global::scriptEngine->queueScript(
                 script,
                 scripting::ScriptEngine::ShouldBeSynchronized::Yes,
                 scripting::ScriptEngine::ShouldSendToRemote::Yes
             );
+
+            global::eventEngine->publishEvent<events::EventScheduledScriptExecuted>(
+                script
+            );
         }
 
         global::renderEngine->updateScene();
diff --git a/src/events/event.cpp b/src/events/event.cpp
index da0a6ca00d..8119c012bb 100644
--- a/src/events/event.cpp
+++ b/src/events/event.cpp
@@ -211,6 +211,11 @@ void log(int i, const EventCameraMovedPosition& e) {
     LINFO(std::format("[{}] EventCameraMovedPosition", i));
 }
 
+void log(int i, const EventScheduledScriptExecuted& e) {
+    ghoul_assert(e.type == EventScheduledScriptExecuted::Type, "Wrong type");
+    LINFO(std::format("[{}] ScheduledScriptExecuted: Script '{}'", i, e.script));
+}
+
 void log(int i, const CustomEvent& e) {
     ghoul_assert(e.type == CustomEvent::Type, "Wrong type");
     LINFO(std::format("[{}] CustomEvent: {} ({})", i, e.subtype, e.payload));
@@ -241,6 +246,7 @@ std::string_view toString(Event::Type type) {
         case Event::Type::CameraPathStarted: return "CameraPathStarted";
         case Event::Type::CameraPathFinished: return "CameraPathFinished";
         case Event::Type::CameraMovedPosition: return "CameraMovedPosition";
+        case Event::Type::ScheduledScriptExecuted: return "ScheduledScriptExecuted";
         case Event::Type::Custom: return "Custom";
         default:
             throw ghoul::MissingCaseException();
@@ -314,6 +320,9 @@ Event::Type fromString(std::string_view str) {
     else if (str == "CameraMovedPosition") {
         return Event::Type::CameraMovedPosition;
     }
+    else if (str == "ScheduledScriptExecuted") {
+        return Event::Type::ScheduledScriptExecuted;
+    }
     else if (str == "Custom") {
         return Event::Type::Custom;
     }
@@ -508,6 +517,12 @@ ghoul::Dictionary toParameter(const Event& e) {
                 std::string(static_cast<const EventCameraPathFinished&>(e).destination)
             );
             break;
+        case Event::Type::ScheduledScriptExecuted:
+            d.setValue(
+                "Script",
+                std::string(static_cast<const EventScheduledScriptExecuted&>(e).script)
+            );
+            break;
         case Event::Type::Custom:
             d.setValue(
                 "Subtype", std::string(static_cast<const CustomEvent&>(e).subtype)
@@ -592,6 +607,9 @@ void logAllEvents(const Event* e) {
             case Event::Type::CameraMovedPosition:
                 log(i, *static_cast<const EventCameraMovedPosition*>(e));
                 break;
+            case Event::Type::ScheduledScriptExecuted:
+                log(i, *static_cast<const EventScheduledScriptExecuted*>(e));
+                break;
             case Event::Type::Custom:
                 log(i, *static_cast<const CustomEvent*>(e));
                 break;
@@ -738,6 +756,11 @@ EventCameraMovedPosition::EventCameraMovedPosition()
     : Event(Type)
 {}
 
+EventScheduledScriptExecuted::EventScheduledScriptExecuted(std::string_view script_)
+    : Event(Type)
+    , script(temporaryString(script_))
+{}
+
 CustomEvent::CustomEvent(std::string_view subtype_, std::string_view payload_)
     : Event(Type)
     , subtype(subtype_)

From f4bdb294f87b703a43ed00ca78127e8f1c4f4551 Mon Sep 17 00:00:00 2001
From: Alexander Bock <alexander.bock@liu.se>
Date: Fri, 19 Apr 2024 13:48:05 +0200
Subject: [PATCH 399/701] Request global customization script from the User
 folder instead (closes #3198)

---
 openspace.cfg | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/openspace.cfg b/openspace.cfg
index 322fe97fa8..042913cfe5 100644
--- a/openspace.cfg
+++ b/openspace.cfg
@@ -80,7 +80,7 @@ Profile = "default"
 -- it possible to have global overrides to default values or execute other scripts
 -- regardless of the scene that is loaded
 GlobalCustomizationScripts = {
-    "${SCRIPTS}/customization.lua"
+    "${USER}/customization.lua"
 }
 
 -- Determines how many settings in the menu are shown

From 392a5214234762dcbb38d991d6e7bd5fdb499ba6 Mon Sep 17 00:00:00 2001
From: Adam Rohdin <adam.rohdin@outlook.com>
Date: Fri, 19 Apr 2024 16:51:17 +0200
Subject: [PATCH 400/701] Fix for a lot of trail related stuff (#3193)

Fixes following issues: #625 , #1067 , #1212 , #1472 , #2072 , #2235, #2964
- Trails in `renderableTrailTrajectory` now goes through the spacecraft when using `AccurateTrailPositions`.
- Trail fading controls have been improved for classes using the `renderableTrail` class.
-  `renderableOrbitalKepler` (asteroids/satellites) can now be rendered as both trails and points (or both at once). Solution implements similar functionality/controls as `renderablePointCloud`.
- Default setting for SweepChunking has been changed from `true` to `false` (iterative calculations of `renderableTrailTrajectory`).
- Some fixes related to missing points or off-by-one errors related to trail rendering
---
 .../satellites/communications/amateur.asset   |   3 +-
 .../communications/experimental.asset         |   3 +-
 .../communications/geostationary.asset        |   3 +-
 .../communications/globalstar.asset           |   3 +-
 .../satellites/communications/gorizont.asset  |   3 +-
 .../satellites/communications/intelsat.asset  |   3 +-
 .../satellites/communications/iridium.asset   |   3 +-
 .../communications/iridium_next.asset         |   3 +-
 .../satellites/communications/molniya.asset   |   3 +-
 .../satellites/communications/orbcomm.asset   |   3 +-
 .../communications/other_comm.asset           |   3 +-
 .../satellites/communications/raduga.asset    |   3 +-
 .../earth/satellites/communications/ses.asset |   3 +-
 .../satellites/communications/starlink.asset  |   3 +-
 .../earth/satellites/debris/debris_asat.asset |   3 +-
 .../satellites/debris/debris_breezem.asset    |   3 +-
 .../satellites/debris/debris_fengyun.asset    |   3 +-
 .../satellites/debris/debris_iridium33.asset  |   3 +-
 .../satellites/debris/debris_kosmos2251.asset |   2 +-
 .../earth/satellites/misc/active.asset        |   3 +-
 .../earth/satellites/misc/brightest.asset     |   3 +-
 .../earth/satellites/misc/cubesats.asset      |   3 +-
 .../earth/satellites/misc/military.asset      |   3 +-
 .../planets/earth/satellites/misc/other.asset |   3 +-
 .../planets/earth/satellites/misc/radar.asset |   3 +-
 .../earth/satellites/misc/spacestations.asset |   3 +-
 .../earth/satellites/misc/tle-new.asset       |   3 +-
 .../earth/satellites/navigation/beidou.asset  |   3 +-
 .../earth/satellites/navigation/galileo.asset |   3 +-
 .../satellites/navigation/glosnass.asset      |   3 +-
 .../earth/satellites/navigation/gps.asset     |   3 +-
 .../earth/satellites/navigation/musson.asset  |   3 +-
 .../earth/satellites/navigation/nnss.asset    |   3 +-
 .../earth/satellites/navigation/sbas.asset    |   3 +-
 .../earth/satellites/science/education.asset  |   3 +-
 .../satellites/science/engineering.asset      |   3 +-
 .../earth/satellites/science/geodetic.asset   |   3 +-
 .../earth/satellites/science/spaceearth.asset |   3 +-
 .../earth/satellites/weather/argos.asset      |   3 +-
 .../earth/satellites/weather/dmc.asset        |   3 +-
 .../satellites/weather/earth_resources.asset  |   3 +-
 .../earth/satellites/weather/goes.asset       |   3 +-
 .../earth/satellites/weather/noaa.asset       |   3 +-
 .../earth/satellites/weather/planet.asset     |   3 +-
 .../earth/satellites/weather/sarsat.asset     |   3 +-
 .../earth/satellites/weather/spire.asset      |   3 +-
 .../earth/satellites/weather/tdrss.asset      |   3 +-
 .../earth/satellites/weather/weather.asset    |   3 +-
 .../solarsystem/sssb/amor_asteroid.asset      |   3 +-
 .../solarsystem/sssb/apollo_asteroid.asset    |   3 +-
 .../solarsystem/sssb/aten_asteroid.asset      |   3 +-
 .../solarsystem/sssb/atira_asteroid.asset     |   3 +-
 .../solarsystem/sssb/centaur_asteroid.asset   |   3 +-
 .../solarsystem/sssb/chiron-type_comet.asset  |   3 +-
 .../solarsystem/sssb/encke-type_comet.asset   |   3 +-
 .../solarsystem/sssb/halley-type_comet.asset  |   3 +-
 .../sssb/inner_main_belt_asteroid.asset       |   3 +-
 .../sssb/jupiter-family_comet.asset           |   3 +-
 .../sssb/jupiter_trojan_asteroid.asset        |   3 +-
 .../solarsystem/sssb/main_belt_asteroid.asset |   1 +
 .../sssb/mars-crossing_asteroid.asset         |   3 +-
 .../sssb/outer_main_belt_asteroid.asset       |   3 +-
 data/assets/scene/solarsystem/sssb/pha.asset  |   3 +-
 .../sssb/transneptunian_object_asteroid.asset |   3 +-
 modules/base/rendering/renderabletrail.cpp    | 165 ++++++--
 modules/base/rendering/renderabletrail.h      |  43 ++-
 .../base/rendering/renderabletrailorbit.cpp   |  16 +-
 .../rendering/renderabletrailtrajectory.cpp   | 298 ++++++++++++---
 .../rendering/renderabletrailtrajectory.h     |  22 +-
 .../shaders/renderabletrail_apple_fs.glsl     |   7 +-
 .../shaders/renderabletrail_apple_vs.glsl     |  46 ++-
 modules/base/shaders/renderabletrail_fs.glsl  |   7 +-
 modules/base/shaders/renderabletrail_vs.glsl  |  46 ++-
 modules/space/CMakeLists.txt                  |   7 +-
 .../rendering/renderableorbitalkepler.cpp     | 360 +++++++++++++++---
 .../space/rendering/renderableorbitalkepler.h |  41 +-
 modules/space/shaders/debrisVizPoints_fs.glsl |  63 +++
 modules/space/shaders/debrisVizPoints_gs.glsl | 145 +++++++
 modules/space/shaders/debrisVizPoints_vs.glsl |  48 +++
 ...risViz_fs.glsl => debrisVizTrails_fs.glsl} |  21 +-
 ...risViz_vs.glsl => debrisVizTrails_vs.glsl} |   2 +-
 81 files changed, 1238 insertions(+), 288 deletions(-)
 create mode 100644 modules/space/shaders/debrisVizPoints_fs.glsl
 create mode 100644 modules/space/shaders/debrisVizPoints_gs.glsl
 create mode 100644 modules/space/shaders/debrisVizPoints_vs.glsl
 rename modules/space/shaders/{debrisViz_fs.glsl => debrisVizTrails_fs.glsl} (90%)
 rename modules/space/shaders/{debrisViz_vs.glsl => debrisVizTrails_vs.glsl} (98%)

diff --git a/data/assets/scene/solarsystem/planets/earth/satellites/communications/amateur.asset b/data/assets/scene/solarsystem/planets/earth/satellites/communications/amateur.asset
index ee6c80271d..fd1f9471cb 100644
--- a/data/assets/scene/solarsystem/planets/earth/satellites/communications/amateur.asset
+++ b/data/assets/scene/solarsystem/planets/earth/satellites/communications/amateur.asset
@@ -21,7 +21,8 @@ local AmateurSatellites = {
     Format = "OMM",
     SegmentQuality = 3,
     Color = { 0.75, 0.75, 0.35 },
-    Fade = 1.5,
+    TrailFade = 15.0,
+    PointSizeExponent = 5.0,
     RenderBinMode = "PostDeferredTransparent"
   },
   Tag = { "earth_satellites" },
diff --git a/data/assets/scene/solarsystem/planets/earth/satellites/communications/experimental.asset b/data/assets/scene/solarsystem/planets/earth/satellites/communications/experimental.asset
index 7541fbbca9..f3046c1599 100644
--- a/data/assets/scene/solarsystem/planets/earth/satellites/communications/experimental.asset
+++ b/data/assets/scene/solarsystem/planets/earth/satellites/communications/experimental.asset
@@ -21,7 +21,8 @@ local ExperimentalSatellites = {
     Format = "OMM",
     SegmentQuality = 3,
     Color = { 0.75, 0.75, 0.35 },
-    Fade = 1.5,
+    TrailFade = 15,
+    PointSizeExponent = 5.0,
     RenderBinMode = "PostDeferredTransparent"
   },
   Tag = { "earth_satellites" },
diff --git a/data/assets/scene/solarsystem/planets/earth/satellites/communications/geostationary.asset b/data/assets/scene/solarsystem/planets/earth/satellites/communications/geostationary.asset
index 0d4097fecf..8127e6f042 100644
--- a/data/assets/scene/solarsystem/planets/earth/satellites/communications/geostationary.asset
+++ b/data/assets/scene/solarsystem/planets/earth/satellites/communications/geostationary.asset
@@ -21,7 +21,8 @@ local GeoStationarySatellites = {
     Format = "OMM",
     SegmentQuality = 3,
     Color = { 0.9, 0.9, 0.0 },
-    Fade = 1.5,
+    TrailFade = 5,
+    PointSizeExponent = 5.2,
     RenderBinMode = "PostDeferredTransparent"
   },
   Tag = { "earth_satellites" },
diff --git a/data/assets/scene/solarsystem/planets/earth/satellites/communications/globalstar.asset b/data/assets/scene/solarsystem/planets/earth/satellites/communications/globalstar.asset
index 2203bd564c..47c7f7a0da 100644
--- a/data/assets/scene/solarsystem/planets/earth/satellites/communications/globalstar.asset
+++ b/data/assets/scene/solarsystem/planets/earth/satellites/communications/globalstar.asset
@@ -21,7 +21,8 @@ local GlobalStarSatellites = {
     Format = "OMM",
     SegmentQuality = 3,
     Color = { 0.75, 0.75, 0.35 },
-    Fade = 1.5,
+    TrailFade = 15,
+    PointSizeExponent = 5.0,
     RenderBinMode = "PostDeferredTransparent"
   },
   Tag = { "earth_satellites" },
diff --git a/data/assets/scene/solarsystem/planets/earth/satellites/communications/gorizont.asset b/data/assets/scene/solarsystem/planets/earth/satellites/communications/gorizont.asset
index 13811ce9d8..b1e5cc98b3 100644
--- a/data/assets/scene/solarsystem/planets/earth/satellites/communications/gorizont.asset
+++ b/data/assets/scene/solarsystem/planets/earth/satellites/communications/gorizont.asset
@@ -21,7 +21,8 @@ local GorizontSatellites = {
     Format = "OMM",
     SegmentQuality = 3,
     Color = { 0.75, 0.75, 0.35 },
-    Fade = 1.5,
+    TrailFade = 5,
+    PointSizeExponent = 5.0,
     RenderBinMode = "PostDeferredTransparent"
   },
   Tag = { "earth_satellites" },
diff --git a/data/assets/scene/solarsystem/planets/earth/satellites/communications/intelsat.asset b/data/assets/scene/solarsystem/planets/earth/satellites/communications/intelsat.asset
index 7198b46408..a3761f43e7 100644
--- a/data/assets/scene/solarsystem/planets/earth/satellites/communications/intelsat.asset
+++ b/data/assets/scene/solarsystem/planets/earth/satellites/communications/intelsat.asset
@@ -21,7 +21,8 @@ local IntelsatSatellites = {
     Format = "OMM",
     SegmentQuality = 3,
     Color = { 0.75, 0.75, 0.35 },
-    Fade = 1.5,
+    TrailFade = 5,
+    PointSizeExponent = 5.0,
     RenderBinMode = "PostDeferredTransparent"
   },
   Tag = { "earth_satellites" },
diff --git a/data/assets/scene/solarsystem/planets/earth/satellites/communications/iridium.asset b/data/assets/scene/solarsystem/planets/earth/satellites/communications/iridium.asset
index 132919987f..1d809a0fc9 100644
--- a/data/assets/scene/solarsystem/planets/earth/satellites/communications/iridium.asset
+++ b/data/assets/scene/solarsystem/planets/earth/satellites/communications/iridium.asset
@@ -21,7 +21,8 @@ local IridiumSatellites = {
     Format = "OMM",
     SegmentQuality = 3,
     Color = { 0.75, 0.75, 0.35 },
-    Fade = 1.5,
+    TrailFade = 15,
+    PointSizeExponent = 5.0,
     RenderBinMode = "PostDeferredTransparent"
   },
   Tag = { "earth_satellites" },
diff --git a/data/assets/scene/solarsystem/planets/earth/satellites/communications/iridium_next.asset b/data/assets/scene/solarsystem/planets/earth/satellites/communications/iridium_next.asset
index 5019ebd3e6..f4cb86fd75 100644
--- a/data/assets/scene/solarsystem/planets/earth/satellites/communications/iridium_next.asset
+++ b/data/assets/scene/solarsystem/planets/earth/satellites/communications/iridium_next.asset
@@ -21,7 +21,8 @@ local IridiumNextSatellites = {
     Format = "OMM",
     SegmentQuality = 3,
     Color = { 0.75, 0.75, 0.35 },
-    Fade = 1.5,
+    TrailFade = 15,
+    PointSizeExponent = 5.0,
     RenderBinMode = "PostDeferredTransparent"
   },
   Tag = { "earth_satellites" },
diff --git a/data/assets/scene/solarsystem/planets/earth/satellites/communications/molniya.asset b/data/assets/scene/solarsystem/planets/earth/satellites/communications/molniya.asset
index 31632e7ad5..fb14536030 100644
--- a/data/assets/scene/solarsystem/planets/earth/satellites/communications/molniya.asset
+++ b/data/assets/scene/solarsystem/planets/earth/satellites/communications/molniya.asset
@@ -21,7 +21,8 @@ local MolniyaSatellites = {
     Format = "OMM",
     SegmentQuality = 3,
     Color = { 0.75, 0.75, 0.35 },
-    Fade = 1.5,
+    TrailFade = 15,
+    PointSizeExponent = 5.0,
     RenderBinMode = "PostDeferredTransparent"
   },
   Tag = { "earth_satellites" },
diff --git a/data/assets/scene/solarsystem/planets/earth/satellites/communications/orbcomm.asset b/data/assets/scene/solarsystem/planets/earth/satellites/communications/orbcomm.asset
index c1a759df97..be8fd83daa 100644
--- a/data/assets/scene/solarsystem/planets/earth/satellites/communications/orbcomm.asset
+++ b/data/assets/scene/solarsystem/planets/earth/satellites/communications/orbcomm.asset
@@ -21,7 +21,8 @@ local OrbcommSatellites = {
     Format = "OMM",
     SegmentQuality = 3,
     Color = { 0.75, 0.75, 0.35 },
-    Fade = 1.5,
+    TrailFade = 15,
+    PointSizeExponent = 5.0,
     RenderBinMode = "PostDeferredTransparent"
   },
   Tag = { "earth_satellites" },
diff --git a/data/assets/scene/solarsystem/planets/earth/satellites/communications/other_comm.asset b/data/assets/scene/solarsystem/planets/earth/satellites/communications/other_comm.asset
index 5fda8ec905..eec371989a 100644
--- a/data/assets/scene/solarsystem/planets/earth/satellites/communications/other_comm.asset
+++ b/data/assets/scene/solarsystem/planets/earth/satellites/communications/other_comm.asset
@@ -21,7 +21,8 @@ local OtherCommunicationSatellites = {
     Format = "OMM",
     SegmentQuality = 3,
     Color = { 0.75, 0.75, 0.35 },
-    Fade = 1.5,
+    TrailFade = 15,
+    PointSizeExponent = 5.0,
     RenderBinMode = "PostDeferredTransparent"
   },
   Tag = { "earth_satellites" },
diff --git a/data/assets/scene/solarsystem/planets/earth/satellites/communications/raduga.asset b/data/assets/scene/solarsystem/planets/earth/satellites/communications/raduga.asset
index cecf990b27..ba141dacc7 100644
--- a/data/assets/scene/solarsystem/planets/earth/satellites/communications/raduga.asset
+++ b/data/assets/scene/solarsystem/planets/earth/satellites/communications/raduga.asset
@@ -21,7 +21,8 @@ local RadugaSatellites = {
     Format = "OMM",
     SegmentQuality = 3,
     Color = { 0.75, 0.75, 0.35 },
-    Fade = 1.5,
+    TrailFade = 5,
+    PointSizeExponent = 5.0,
     RenderBinMode = "PostDeferredTransparent"
   },
   Tag = { "earth_satellites" },
diff --git a/data/assets/scene/solarsystem/planets/earth/satellites/communications/ses.asset b/data/assets/scene/solarsystem/planets/earth/satellites/communications/ses.asset
index 532977a477..cda1deecb2 100644
--- a/data/assets/scene/solarsystem/planets/earth/satellites/communications/ses.asset
+++ b/data/assets/scene/solarsystem/planets/earth/satellites/communications/ses.asset
@@ -21,7 +21,8 @@ local SesSatellites = {
     Format = "OMM",
     SegmentQuality = 3,
     Color = { 0.75, 0.75, 0.35 },
-    Fade = 1.5,
+    TrailFade = 10,
+    PointSizeExponent = 5.0,
     RenderBinMode = "PostDeferredTransparent"
   },
   Tag = { "earth_satellites" },
diff --git a/data/assets/scene/solarsystem/planets/earth/satellites/communications/starlink.asset b/data/assets/scene/solarsystem/planets/earth/satellites/communications/starlink.asset
index a0ad96956b..eaa376b2bf 100644
--- a/data/assets/scene/solarsystem/planets/earth/satellites/communications/starlink.asset
+++ b/data/assets/scene/solarsystem/planets/earth/satellites/communications/starlink.asset
@@ -21,7 +21,8 @@ local StarlinkSatellites = {
     Format = "OMM",
     SegmentQuality = 3,
     Color = { 0.65, 0.55, 0.55 },
-    Fade = 1.5,
+    TrailFade = 5,
+    PointSizeExponent = 5.0,
     RenderBinMode = "PostDeferredTransparent"
   },
   Tag = { "earth_satellites" },
diff --git a/data/assets/scene/solarsystem/planets/earth/satellites/debris/debris_asat.asset b/data/assets/scene/solarsystem/planets/earth/satellites/debris/debris_asat.asset
index d220142513..f8e6cac01d 100644
--- a/data/assets/scene/solarsystem/planets/earth/satellites/debris/debris_asat.asset
+++ b/data/assets/scene/solarsystem/planets/earth/satellites/debris/debris_asat.asset
@@ -21,7 +21,8 @@ local DebrisAsat = {
     Format = "OMM",
     SegmentQuality = 3,
     Color = { 0.25, 0.35, 0.45 },
-    Fade = 1.5,
+    TrailFade = 15,
+    PointSizeExponent = 5.0,
     RenderBinMode = "PostDeferredTransparent"
   },
   Tag = { "earth_satellites" },
diff --git a/data/assets/scene/solarsystem/planets/earth/satellites/debris/debris_breezem.asset b/data/assets/scene/solarsystem/planets/earth/satellites/debris/debris_breezem.asset
index 6820d20e93..964dfe81e4 100644
--- a/data/assets/scene/solarsystem/planets/earth/satellites/debris/debris_breezem.asset
+++ b/data/assets/scene/solarsystem/planets/earth/satellites/debris/debris_breezem.asset
@@ -21,7 +21,8 @@ local DebrisBreezem = {
     Format = "OMM",
     SegmentQuality = 3,
     Color = { 0.25, 0.35, 0.45 },
-    Fade = 1.5,
+    TrailFade = 15,
+    PointSizeExponent = 5.0,
     RenderBinMode = "PostDeferredTransparent"
   },
   Tag = { "earth_satellites" },
diff --git a/data/assets/scene/solarsystem/planets/earth/satellites/debris/debris_fengyun.asset b/data/assets/scene/solarsystem/planets/earth/satellites/debris/debris_fengyun.asset
index 78ae414dfa..a166d85a94 100644
--- a/data/assets/scene/solarsystem/planets/earth/satellites/debris/debris_fengyun.asset
+++ b/data/assets/scene/solarsystem/planets/earth/satellites/debris/debris_fengyun.asset
@@ -21,7 +21,8 @@ local DebrisFengyun = {
     Format = "OMM",
     SegmentQuality = 3,
     Color = { 0.784, 1.0, 0.737 },
-    Fade = 1.5,
+    TrailFade = 1.5,
+    PointSizeExponent = 5.0,
     RenderBinMode = "PostDeferredTransparent"
   },
   Tag = { "earth_satellites" },
diff --git a/data/assets/scene/solarsystem/planets/earth/satellites/debris/debris_iridium33.asset b/data/assets/scene/solarsystem/planets/earth/satellites/debris/debris_iridium33.asset
index 24176b22e9..71b4c49136 100644
--- a/data/assets/scene/solarsystem/planets/earth/satellites/debris/debris_iridium33.asset
+++ b/data/assets/scene/solarsystem/planets/earth/satellites/debris/debris_iridium33.asset
@@ -21,7 +21,8 @@ local DebrisIridium = {
     Format = "OMM",
     SegmentQuality = 3,
     Color = { 0.8, 0.0, 0.3 },
-    Fade = 1.5,
+    TrailFade = 5,
+    PointSizeExponent = 5.0,
     RenderBinMode = "PostDeferredTransparent"
   },
   Tag = { "earth_satellites" },
diff --git a/data/assets/scene/solarsystem/planets/earth/satellites/debris/debris_kosmos2251.asset b/data/assets/scene/solarsystem/planets/earth/satellites/debris/debris_kosmos2251.asset
index d91337ce68..9b9245e188 100644
--- a/data/assets/scene/solarsystem/planets/earth/satellites/debris/debris_kosmos2251.asset
+++ b/data/assets/scene/solarsystem/planets/earth/satellites/debris/debris_kosmos2251.asset
@@ -21,7 +21,7 @@ local DebrisCosmos = {
     Format = "OMM",
     SegmentQuality = 3,
     Color = { 0.66, 0.8, 0.5 },
-    Fade = 1.5,
+    TrailFade = 1.5,
     RenderBinMode = "PostDeferredTransparent"
   },
   Tag = { "earth_satellites" },
diff --git a/data/assets/scene/solarsystem/planets/earth/satellites/misc/active.asset b/data/assets/scene/solarsystem/planets/earth/satellites/misc/active.asset
index a01b2a68fb..f08555e840 100644
--- a/data/assets/scene/solarsystem/planets/earth/satellites/misc/active.asset
+++ b/data/assets/scene/solarsystem/planets/earth/satellites/misc/active.asset
@@ -21,7 +21,8 @@ local ActiveSatellites = {
     Format = "OMM",
     SegmentQuality = 3,
     Color = { 0.45, 0.25, 0.45 },
-    Fade = 1.5,
+    TrailFade = 5,
+    PointSizeExponent = 5.0,
     RenderBinMode = "PostDeferredTransparent"
   },
   Tag = { "earth_satellites" },
diff --git a/data/assets/scene/solarsystem/planets/earth/satellites/misc/brightest.asset b/data/assets/scene/solarsystem/planets/earth/satellites/misc/brightest.asset
index a9fc480c3a..0a7278e746 100644
--- a/data/assets/scene/solarsystem/planets/earth/satellites/misc/brightest.asset
+++ b/data/assets/scene/solarsystem/planets/earth/satellites/misc/brightest.asset
@@ -21,7 +21,8 @@ local BrightestSatellites = {
     Format = "OMM",
     SegmentQuality = 3,
     Color = { 0.55, 0.25, 0.65 },
-    Fade = 1.5,
+    TrailFade = 15,
+    PointSizeExponent = 5.0,
     RenderBinMode = "PostDeferredTransparent"
   },
   Tag = { "earth_satellites" },
diff --git a/data/assets/scene/solarsystem/planets/earth/satellites/misc/cubesats.asset b/data/assets/scene/solarsystem/planets/earth/satellites/misc/cubesats.asset
index e95fbb3df7..8f4c6b0a07 100644
--- a/data/assets/scene/solarsystem/planets/earth/satellites/misc/cubesats.asset
+++ b/data/assets/scene/solarsystem/planets/earth/satellites/misc/cubesats.asset
@@ -21,7 +21,8 @@ local Cubesats = {
     Format = "OMM",
     SegmentQuality = 3,
     Color = { 0.75, 0.75, 0.35 },
-    Fade = 1.5,
+    TrailFade = 15,
+    PointSizeExponent = 5.0,
     RenderBinMode = "PostDeferredTransparent"
   },
   Tag = { "earth_satellites" },
diff --git a/data/assets/scene/solarsystem/planets/earth/satellites/misc/military.asset b/data/assets/scene/solarsystem/planets/earth/satellites/misc/military.asset
index cadb37ead3..553271ae12 100644
--- a/data/assets/scene/solarsystem/planets/earth/satellites/misc/military.asset
+++ b/data/assets/scene/solarsystem/planets/earth/satellites/misc/military.asset
@@ -21,7 +21,8 @@ local MilitarySatellites = {
     Format = "OMM",
     SegmentQuality = 3,
     Color = { 0.75, 0.75, 0.35 },
-    Fade = 1.5,
+    TrailFade = 20,
+    PointSizeExponent = 5.0,
     RenderBinMode = "PostDeferredTransparent"
   },
   Tag = { "earth_satellites" },
diff --git a/data/assets/scene/solarsystem/planets/earth/satellites/misc/other.asset b/data/assets/scene/solarsystem/planets/earth/satellites/misc/other.asset
index ad63db30b2..972338a564 100644
--- a/data/assets/scene/solarsystem/planets/earth/satellites/misc/other.asset
+++ b/data/assets/scene/solarsystem/planets/earth/satellites/misc/other.asset
@@ -21,7 +21,8 @@ local OtherSatellites = {
     Format = "OMM",
     SegmentQuality = 3,
     Color = { 0.75, 0.75, 0.35 },
-    Fade = 1.5,
+    TrailFade = 15,
+    PointSizeExponent = 5.0,
     RenderBinMode = "PostDeferredTransparent"
   },
   Tag = { "earth_satellites" },
diff --git a/data/assets/scene/solarsystem/planets/earth/satellites/misc/radar.asset b/data/assets/scene/solarsystem/planets/earth/satellites/misc/radar.asset
index 74b5cdcc6f..b5c6e7148a 100644
--- a/data/assets/scene/solarsystem/planets/earth/satellites/misc/radar.asset
+++ b/data/assets/scene/solarsystem/planets/earth/satellites/misc/radar.asset
@@ -21,7 +21,8 @@ local RadarSatellites = {
     Format = "OMM",
     SegmentQuality = 3,
     Color = { 0.75, 0.75, 0.35 },
-    Fade = 1.5,
+    TrailFade = 15,
+    PointSizeExponent = 5.0,
     RenderBinMode = "PostDeferredTransparent"
   },
   Tag = { "earth_satellites" },
diff --git a/data/assets/scene/solarsystem/planets/earth/satellites/misc/spacestations.asset b/data/assets/scene/solarsystem/planets/earth/satellites/misc/spacestations.asset
index c1c3286224..154f92113b 100644
--- a/data/assets/scene/solarsystem/planets/earth/satellites/misc/spacestations.asset
+++ b/data/assets/scene/solarsystem/planets/earth/satellites/misc/spacestations.asset
@@ -21,7 +21,8 @@ local SpaceStations = {
     Format = "OMM",
     SegmentQuality = 3,
     Color = { 0.9, 0.1, 0.0 },
-    Fade = 1.5,
+    TrailFade = 20,
+    PointSizeExponent = 5.0,
     RenderBinMode = "PostDeferredTransparent"
   },
   Tag = { "earth_satellites" },
diff --git a/data/assets/scene/solarsystem/planets/earth/satellites/misc/tle-new.asset b/data/assets/scene/solarsystem/planets/earth/satellites/misc/tle-new.asset
index d616a0de3e..9e98e495c6 100644
--- a/data/assets/scene/solarsystem/planets/earth/satellites/misc/tle-new.asset
+++ b/data/assets/scene/solarsystem/planets/earth/satellites/misc/tle-new.asset
@@ -21,7 +21,8 @@ local Last30DaysSatellites = {
     Format = "OMM",
     SegmentQuality = 3,
     Color = { 0.65, 0.25, 0.45 },
-    Fade = 1.5,
+    TrailFade = 15,
+    PointSizeExponent = 5.0,
     RenderBinMode = "PostDeferredTransparent"
   },
   Tag = { "earth_satellites" },
diff --git a/data/assets/scene/solarsystem/planets/earth/satellites/navigation/beidou.asset b/data/assets/scene/solarsystem/planets/earth/satellites/navigation/beidou.asset
index f2b5412ba3..90899d50ac 100644
--- a/data/assets/scene/solarsystem/planets/earth/satellites/navigation/beidou.asset
+++ b/data/assets/scene/solarsystem/planets/earth/satellites/navigation/beidou.asset
@@ -21,7 +21,8 @@ local BeidouSatellites = {
     Format = "OMM",
     SegmentQuality = 3,
     Color = { 0.75, 0.75, 0.35 },
-    Fade = 1.5,
+    TrailFade = 15,
+    PointSizeExponent = 5.0,
     RenderBinMode = "PostDeferredTransparent"
   },
   Tag = { "earth_satellites" },
diff --git a/data/assets/scene/solarsystem/planets/earth/satellites/navigation/galileo.asset b/data/assets/scene/solarsystem/planets/earth/satellites/navigation/galileo.asset
index 8d81d92302..c42e571319 100644
--- a/data/assets/scene/solarsystem/planets/earth/satellites/navigation/galileo.asset
+++ b/data/assets/scene/solarsystem/planets/earth/satellites/navigation/galileo.asset
@@ -21,7 +21,8 @@ local GalileoSatellites = {
     Format = "OMM",
     SegmentQuality = 3,
     Color = { 0.75, 0.75, 0.35 },
-    Fade = 1.5,
+    TrailFade = 15,
+    PointSizeExponent = 5.0,
     RenderBinMode = "PostDeferredTransparent"
   },
   Tag = { "earth_satellites" },
diff --git a/data/assets/scene/solarsystem/planets/earth/satellites/navigation/glosnass.asset b/data/assets/scene/solarsystem/planets/earth/satellites/navigation/glosnass.asset
index fc6933875b..e850de00d2 100644
--- a/data/assets/scene/solarsystem/planets/earth/satellites/navigation/glosnass.asset
+++ b/data/assets/scene/solarsystem/planets/earth/satellites/navigation/glosnass.asset
@@ -21,7 +21,8 @@ local GlosnassSatellites = {
     Format = "OMM",
     SegmentQuality = 3,
     Color = { 0.75, 0.75, 0.35 },
-    Fade = 1.5,
+    TrailFade = 15,
+    PointSizeExponent = 5.0,
     RenderBinMode = "PostDeferredTransparent"
   },
   Tag = { "earth_satellites" },
diff --git a/data/assets/scene/solarsystem/planets/earth/satellites/navigation/gps.asset b/data/assets/scene/solarsystem/planets/earth/satellites/navigation/gps.asset
index 2d147c8e04..f29bf4fb67 100644
--- a/data/assets/scene/solarsystem/planets/earth/satellites/navigation/gps.asset
+++ b/data/assets/scene/solarsystem/planets/earth/satellites/navigation/gps.asset
@@ -21,7 +21,8 @@ local GpsSatellites = {
     Format = "OMM",
     SegmentQuality = 3,
     Color = { 0.9, 0.5, 0.0 },
-    Fade = 1.5,
+    TrailFade = 15,
+    PointSizeExponent = 5.5,
     RenderBinMode = "PostDeferredTransparent"
   },
   Tag = { "earth_satellites" },
diff --git a/data/assets/scene/solarsystem/planets/earth/satellites/navigation/musson.asset b/data/assets/scene/solarsystem/planets/earth/satellites/navigation/musson.asset
index 35664b2186..0b92789c24 100644
--- a/data/assets/scene/solarsystem/planets/earth/satellites/navigation/musson.asset
+++ b/data/assets/scene/solarsystem/planets/earth/satellites/navigation/musson.asset
@@ -21,7 +21,8 @@ local MussonSatellites = {
     Format = "OMM",
     SegmentQuality = 3,
     Color = { 0.75, 0.75, 0.35 },
-    Fade = 1.5,
+    TrailFade = 15,
+    PointSizeExponent = 5.0,
     RenderBinMode = "PostDeferredTransparent"
   },
   Tag = { "earth_satellites" },
diff --git a/data/assets/scene/solarsystem/planets/earth/satellites/navigation/nnss.asset b/data/assets/scene/solarsystem/planets/earth/satellites/navigation/nnss.asset
index 665d5a24cf..c33704cdee 100644
--- a/data/assets/scene/solarsystem/planets/earth/satellites/navigation/nnss.asset
+++ b/data/assets/scene/solarsystem/planets/earth/satellites/navigation/nnss.asset
@@ -21,7 +21,8 @@ local NavyNavigationSatellites = {
     Format = "OMM",
     SegmentQuality = 3,
     Color = { 0.75, 0.75, 0.35 },
-    Fade = 1.5,
+    TrailFade = 17,
+    PointSizeExponent = 5.0,
     RenderBinMode = "PostDeferredTransparent"
   },
   Tag = { "earth_satellites" },
diff --git a/data/assets/scene/solarsystem/planets/earth/satellites/navigation/sbas.asset b/data/assets/scene/solarsystem/planets/earth/satellites/navigation/sbas.asset
index 10d5dffa5c..9a23bff086 100644
--- a/data/assets/scene/solarsystem/planets/earth/satellites/navigation/sbas.asset
+++ b/data/assets/scene/solarsystem/planets/earth/satellites/navigation/sbas.asset
@@ -21,7 +21,8 @@ local SatelliteBasedAugmentationSatellites = {
     Format = "OMM",
     SegmentQuality = 3,
     Color = { 0.75, 0.75, 0.35 },
-    Fade = 1.5,
+    TrailFade = 15,
+    PointSizeExponent = 5.0,
     RenderBinMode = "PostDeferredTransparent"
   },
   Tag = { "earth_satellites" },
diff --git a/data/assets/scene/solarsystem/planets/earth/satellites/science/education.asset b/data/assets/scene/solarsystem/planets/earth/satellites/science/education.asset
index f7e003db03..7818ebe0d1 100644
--- a/data/assets/scene/solarsystem/planets/earth/satellites/science/education.asset
+++ b/data/assets/scene/solarsystem/planets/earth/satellites/science/education.asset
@@ -21,7 +21,8 @@ local EducationSatellites = {
     Format = "OMM",
     SegmentQuality = 3,
     Color = { 0.75, 0.75, 0.35 },
-    Fade = 1.5,
+    TrailFade = 20,
+    PointSizeExponent = 5.0,
     RenderBinMode = "PostDeferredTransparent"
   },
   Tag = { "earth_satellites" },
diff --git a/data/assets/scene/solarsystem/planets/earth/satellites/science/engineering.asset b/data/assets/scene/solarsystem/planets/earth/satellites/science/engineering.asset
index 3ba32d83f4..ab7d807f47 100644
--- a/data/assets/scene/solarsystem/planets/earth/satellites/science/engineering.asset
+++ b/data/assets/scene/solarsystem/planets/earth/satellites/science/engineering.asset
@@ -21,7 +21,8 @@ local EngineeringSatellites = {
     Format = "OMM",
     SegmentQuality = 3,
     Color = { 0.75, 0.75, 0.35 },
-    Fade = 1.5,
+    TrailFade = 17,
+    PointSizeExponent = 5.0,
     RenderBinMode = "PostDeferredTransparent"
   },
   Tag = { "earth_satellites" },
diff --git a/data/assets/scene/solarsystem/planets/earth/satellites/science/geodetic.asset b/data/assets/scene/solarsystem/planets/earth/satellites/science/geodetic.asset
index d9bb14f901..31edb287a1 100644
--- a/data/assets/scene/solarsystem/planets/earth/satellites/science/geodetic.asset
+++ b/data/assets/scene/solarsystem/planets/earth/satellites/science/geodetic.asset
@@ -21,7 +21,8 @@ local GeodeticSatellites = {
     Format = "OMM",
     SegmentQuality = 3,
     Color = { 0.75, 0.75, 0.35 },
-    Fade = 1.5,
+    TrailFade = 20,
+    PointSizeExponent = 5.0,
     RenderBinMode = "PostDeferredTransparent"
   },
   Tag = { "earth_satellites" },
diff --git a/data/assets/scene/solarsystem/planets/earth/satellites/science/spaceearth.asset b/data/assets/scene/solarsystem/planets/earth/satellites/science/spaceearth.asset
index a314217808..b8425c65d2 100644
--- a/data/assets/scene/solarsystem/planets/earth/satellites/science/spaceearth.asset
+++ b/data/assets/scene/solarsystem/planets/earth/satellites/science/spaceearth.asset
@@ -21,7 +21,8 @@ local ScienceSatellites = {
     Format = "OMM",
     SegmentQuality = 3,
     Color = { 0.75, 0.75, 0.35 },
-    Fade = 1.5,
+    TrailFade = 17,
+    PointSizeExponent = 5.0,
     RenderBinMode = "PostDeferredTransparent"
   },
   Tag = { "earth_satellites" },
diff --git a/data/assets/scene/solarsystem/planets/earth/satellites/weather/argos.asset b/data/assets/scene/solarsystem/planets/earth/satellites/weather/argos.asset
index 071d3d616d..8db1cb122f 100644
--- a/data/assets/scene/solarsystem/planets/earth/satellites/weather/argos.asset
+++ b/data/assets/scene/solarsystem/planets/earth/satellites/weather/argos.asset
@@ -21,7 +21,8 @@ local Argos = {
     Format = "OMM",
     SegmentQuality = 3,
     Color = { 0.75, 0.75, 0.35 },
-    Fade = 1.5,
+    TrailFade = 17,
+    PointSizeExponent = 5.0,
     RenderBinMode = "PostDeferredTransparent"
   },
   Tag = { "earth_satellites" },
diff --git a/data/assets/scene/solarsystem/planets/earth/satellites/weather/dmc.asset b/data/assets/scene/solarsystem/planets/earth/satellites/weather/dmc.asset
index 3c1fbd90c8..82f874ae58 100644
--- a/data/assets/scene/solarsystem/planets/earth/satellites/weather/dmc.asset
+++ b/data/assets/scene/solarsystem/planets/earth/satellites/weather/dmc.asset
@@ -21,7 +21,8 @@ local DisasterMonitoringConstellation = {
     Format = "OMM",
     SegmentQuality = 3,
     Color = { 0.75, 0.75, 0.35 },
-    Fade = 1.5,
+    TrailFade = 17,
+    PointSizeExponent = 5.0,
     RenderBinMode = "PostDeferredTransparent"
   },
   Tag = { "earth_satellites" },
diff --git a/data/assets/scene/solarsystem/planets/earth/satellites/weather/earth_resources.asset b/data/assets/scene/solarsystem/planets/earth/satellites/weather/earth_resources.asset
index 835560ac3a..631373fbcb 100644
--- a/data/assets/scene/solarsystem/planets/earth/satellites/weather/earth_resources.asset
+++ b/data/assets/scene/solarsystem/planets/earth/satellites/weather/earth_resources.asset
@@ -21,7 +21,8 @@ local ResourceSatellites = {
     Format = "OMM",
     SegmentQuality = 3,
     Color = { 0.75, 0.75, 0.35 },
-    Fade = 1.5,
+    TrailFade = 15,
+    PointSizeExponent = 5.0,
     RenderBinMode = "PostDeferredTransparent"
   },
   Tag = { "earth_satellites" },
diff --git a/data/assets/scene/solarsystem/planets/earth/satellites/weather/goes.asset b/data/assets/scene/solarsystem/planets/earth/satellites/weather/goes.asset
index 42a26fad92..419b87dd36 100644
--- a/data/assets/scene/solarsystem/planets/earth/satellites/weather/goes.asset
+++ b/data/assets/scene/solarsystem/planets/earth/satellites/weather/goes.asset
@@ -21,7 +21,8 @@ local GoesSatellites = {
     Format = "OMM",
     SegmentQuality = 3,
     Color = { 0.75, 0.75, 0.35 },
-    Fade = 1.5,
+    TrailFade = 15,
+    PointSizeExponent = 5.0,
     RenderBinMode = "PostDeferredTransparent"
   },
   Tag = { "earth_satellites" },
diff --git a/data/assets/scene/solarsystem/planets/earth/satellites/weather/noaa.asset b/data/assets/scene/solarsystem/planets/earth/satellites/weather/noaa.asset
index 4d8324c9a5..04aa30771e 100644
--- a/data/assets/scene/solarsystem/planets/earth/satellites/weather/noaa.asset
+++ b/data/assets/scene/solarsystem/planets/earth/satellites/weather/noaa.asset
@@ -21,7 +21,8 @@ local NoaaSatellites = {
     Format = "OMM",
     SegmentQuality = 3,
     Color = { 0.75, 0.75, 0.35 },
-    Fade = 1.5,
+    TrailFade = 17,
+    PointSizeExponent = 5.0,
     RenderBinMode = "PostDeferredTransparent"
   },
   Tag = { "earth_satellites" },
diff --git a/data/assets/scene/solarsystem/planets/earth/satellites/weather/planet.asset b/data/assets/scene/solarsystem/planets/earth/satellites/weather/planet.asset
index a8a9df324b..1e53d59d24 100644
--- a/data/assets/scene/solarsystem/planets/earth/satellites/weather/planet.asset
+++ b/data/assets/scene/solarsystem/planets/earth/satellites/weather/planet.asset
@@ -21,7 +21,8 @@ local PlanetSatellites = {
     Format = "OMM",
     SegmentQuality = 3,
     Color = { 0.75, 0.75, 0.35 },
-    Fade = 1.5,
+    TrailFade = 15,
+    PointSizeExponent = 5.0,
     RenderBinMode = "PostDeferredTransparent"
   },
   Tag = { "earth_satellites" },
diff --git a/data/assets/scene/solarsystem/planets/earth/satellites/weather/sarsat.asset b/data/assets/scene/solarsystem/planets/earth/satellites/weather/sarsat.asset
index 151c23c4dc..a945b6daec 100644
--- a/data/assets/scene/solarsystem/planets/earth/satellites/weather/sarsat.asset
+++ b/data/assets/scene/solarsystem/planets/earth/satellites/weather/sarsat.asset
@@ -21,7 +21,8 @@ local SarSatellites = {
     Format = "OMM",
     SegmentQuality = 3,
     Color = { 0.75, 0.75, 0.35 },
-    Fade = 1.5,
+    TrailFade = 10,
+    PointSizeExponent = 5.0,
     RenderBinMode = "PostDeferredTransparent"
   },
   Tag = { "earth_satellites" },
diff --git a/data/assets/scene/solarsystem/planets/earth/satellites/weather/spire.asset b/data/assets/scene/solarsystem/planets/earth/satellites/weather/spire.asset
index e991a56c90..9b12c8f373 100644
--- a/data/assets/scene/solarsystem/planets/earth/satellites/weather/spire.asset
+++ b/data/assets/scene/solarsystem/planets/earth/satellites/weather/spire.asset
@@ -21,7 +21,8 @@ local SpireSatellites = {
     Format = "OMM",
     SegmentQuality = 3,
     Color = { 0.75, 0.75, 0.35 },
-    Fade = 1.5,
+    TrailFade = 15,
+    PointSizeExponent = 5.0,
     RenderBinMode = "PostDeferredTransparent"
   },
   Tag = { "earth_satellites" },
diff --git a/data/assets/scene/solarsystem/planets/earth/satellites/weather/tdrss.asset b/data/assets/scene/solarsystem/planets/earth/satellites/weather/tdrss.asset
index 71da56bcda..3e82754028 100644
--- a/data/assets/scene/solarsystem/planets/earth/satellites/weather/tdrss.asset
+++ b/data/assets/scene/solarsystem/planets/earth/satellites/weather/tdrss.asset
@@ -21,7 +21,8 @@ local TrackingDataRelaySatellites = {
     Format = "OMM",
     SegmentQuality = 3,
     Color = { 0.75, 0.75, 0.35 },
-    Fade = 1.5,
+    TrailFade = 17,
+    PointSizeExponent = 5.0,
     RenderBinMode = "PostDeferredTransparent"
   },
   Tag = { "earth_satellites" },
diff --git a/data/assets/scene/solarsystem/planets/earth/satellites/weather/weather.asset b/data/assets/scene/solarsystem/planets/earth/satellites/weather/weather.asset
index 23ff2d1e37..ffeec49d3b 100644
--- a/data/assets/scene/solarsystem/planets/earth/satellites/weather/weather.asset
+++ b/data/assets/scene/solarsystem/planets/earth/satellites/weather/weather.asset
@@ -21,7 +21,8 @@ local WeatherSatellites = {
     Format = "OMM",
     SegmentQuality = 3,
     Color = { 0.75, 0.75, 0.35 },
-    Fade = 1.5,
+    TrailFade = 15,
+    PointSizeExponent = 5.0,
     RenderBinMode = "PostDeferredTransparent"
   },
   Tag = { "earth_satellites" },
diff --git a/data/assets/scene/solarsystem/sssb/amor_asteroid.asset b/data/assets/scene/solarsystem/sssb/amor_asteroid.asset
index 309bb069a0..cd27425391 100644
--- a/data/assets/scene/solarsystem/sssb/amor_asteroid.asset
+++ b/data/assets/scene/solarsystem/sssb/amor_asteroid.asset
@@ -20,7 +20,8 @@ local Object = {
     Segments = 200,
     SegmentQuality = 4,
     Color = { 1.0, 1.0, 1.0 },
-    TrailFade = 11
+    TrailFade = 11,
+    PointSizeExponent = 9.2
   },
   GUI = {
     Name = "Amor Asteroids",
diff --git a/data/assets/scene/solarsystem/sssb/apollo_asteroid.asset b/data/assets/scene/solarsystem/sssb/apollo_asteroid.asset
index 15e7af6a75..fb03b4f963 100644
--- a/data/assets/scene/solarsystem/sssb/apollo_asteroid.asset
+++ b/data/assets/scene/solarsystem/sssb/apollo_asteroid.asset
@@ -20,7 +20,8 @@ local Object = {
     Segments = 200,
     SegmentQuality = 6,
     Color = { 0.7, 0.7, 1.0 },
-    TrailFade = 10
+    TrailFade = 10,
+    PointSizeExponent = 9.2
   },
   GUI = {
     Name = "Apollo Asteroids",
diff --git a/data/assets/scene/solarsystem/sssb/aten_asteroid.asset b/data/assets/scene/solarsystem/sssb/aten_asteroid.asset
index f7ebb3b37e..3191d331ff 100644
--- a/data/assets/scene/solarsystem/sssb/aten_asteroid.asset
+++ b/data/assets/scene/solarsystem/sssb/aten_asteroid.asset
@@ -20,7 +20,8 @@ local Object = {
     Segments = 200,
     SegmentQuality = 2,
     Color = { 0.15, 0.15, 1.0 },
-    TrailFade = 18
+    TrailFade = 18,
+    PointSizeExponent = 9.2
   },
   GUI = {
     Name = "Aten Asteroids",
diff --git a/data/assets/scene/solarsystem/sssb/atira_asteroid.asset b/data/assets/scene/solarsystem/sssb/atira_asteroid.asset
index 6fd377dec0..a702c08910 100644
--- a/data/assets/scene/solarsystem/sssb/atira_asteroid.asset
+++ b/data/assets/scene/solarsystem/sssb/atira_asteroid.asset
@@ -20,7 +20,8 @@ local Object = {
     Segments = 200,
     SegmentQuality = 2,
     Color = { 0.5, 0.8, 1.0 },
-    TrailFade = 25
+    TrailFade = 25,
+    PointSizeExponent = 9.2
   },
   GUI = {
     Name = "Atira Asteroids",
diff --git a/data/assets/scene/solarsystem/sssb/centaur_asteroid.asset b/data/assets/scene/solarsystem/sssb/centaur_asteroid.asset
index e17785d9b3..1facef98d8 100644
--- a/data/assets/scene/solarsystem/sssb/centaur_asteroid.asset
+++ b/data/assets/scene/solarsystem/sssb/centaur_asteroid.asset
@@ -20,7 +20,8 @@ local Object = {
     Segments = 200,
     SegmentQuality = 6,
     Color = { 0.94, 0.96, 0.94 },
-    TrailFade = 18
+    TrailFade = 18,
+    PointSizeExponent = 10.2
   },
   GUI = {
     Name = "Centaur Asteroids",
diff --git a/data/assets/scene/solarsystem/sssb/chiron-type_comet.asset b/data/assets/scene/solarsystem/sssb/chiron-type_comet.asset
index 2718642c73..02139ccb64 100644
--- a/data/assets/scene/solarsystem/sssb/chiron-type_comet.asset
+++ b/data/assets/scene/solarsystem/sssb/chiron-type_comet.asset
@@ -20,7 +20,8 @@ local Object = {
     Segments = 200,
     SegmentQuality = 10,
     Color = { 0.15, 0.1, 1.0 },
-    TrailFade = 25
+    TrailFade = 25,
+    PointSizeExponent = 10.5
   },
   GUI = {
     Name = "Chiron-type Comets",
diff --git a/data/assets/scene/solarsystem/sssb/encke-type_comet.asset b/data/assets/scene/solarsystem/sssb/encke-type_comet.asset
index 41774601dd..88e73e1a1f 100644
--- a/data/assets/scene/solarsystem/sssb/encke-type_comet.asset
+++ b/data/assets/scene/solarsystem/sssb/encke-type_comet.asset
@@ -20,7 +20,8 @@ local Object = {
     Segments = 200,
     SegmentQuality = 2,
     Color = { 0.8, 0.34, 1.0 },
-    TrailFade = 23
+    TrailFade = 23,
+    PointSizeExponent = 10.0
   },
   GUI = {
     Name = "Encke-type Comets",
diff --git a/data/assets/scene/solarsystem/sssb/halley-type_comet.asset b/data/assets/scene/solarsystem/sssb/halley-type_comet.asset
index b90e5f1e20..df48071738 100644
--- a/data/assets/scene/solarsystem/sssb/halley-type_comet.asset
+++ b/data/assets/scene/solarsystem/sssb/halley-type_comet.asset
@@ -20,7 +20,8 @@ local Object = {
     Segments = 200,
     SegmentQuality = 9,
     Color = { 0.66, 0.66, 0.66 },
-    TrailFade = 18
+    TrailFade = 18,
+    PointSizeExponent = 10.6
   },
   GUI = {
     Name = "Halley-type Comets",
diff --git a/data/assets/scene/solarsystem/sssb/inner_main_belt_asteroid.asset b/data/assets/scene/solarsystem/sssb/inner_main_belt_asteroid.asset
index 263f4c8680..fd8bf9e42c 100644
--- a/data/assets/scene/solarsystem/sssb/inner_main_belt_asteroid.asset
+++ b/data/assets/scene/solarsystem/sssb/inner_main_belt_asteroid.asset
@@ -20,7 +20,8 @@ local Object = {
     Segments = 200,
     SegmentQuality = 1,
     Color = { 1.0, 1.0, 0.0 },
-    TrailFade = 0.5
+    TrailFade = 0.5,
+    PointSizeExponent = 9.2
   },
   GUI = {
     Name = "Inner Main Asteroid Belt",
diff --git a/data/assets/scene/solarsystem/sssb/jupiter-family_comet.asset b/data/assets/scene/solarsystem/sssb/jupiter-family_comet.asset
index 138eaf3442..0eb20c6323 100644
--- a/data/assets/scene/solarsystem/sssb/jupiter-family_comet.asset
+++ b/data/assets/scene/solarsystem/sssb/jupiter-family_comet.asset
@@ -20,7 +20,8 @@ local Object = {
     Segments = 200,
     SegmentQuality = 10,
     Color = { 0.2, 0.8, 0.2 },
-    TrailFade = 28
+    TrailFade = 28,
+    PointSizeExponent = 10.5
   },
   GUI = {
     Name = "Jupiter-family Comets",
diff --git a/data/assets/scene/solarsystem/sssb/jupiter_trojan_asteroid.asset b/data/assets/scene/solarsystem/sssb/jupiter_trojan_asteroid.asset
index a95b1e3913..51e76d53b5 100644
--- a/data/assets/scene/solarsystem/sssb/jupiter_trojan_asteroid.asset
+++ b/data/assets/scene/solarsystem/sssb/jupiter_trojan_asteroid.asset
@@ -20,7 +20,8 @@ local Object = {
     Segments = 200,
     SegmentQuality = 1,
     Color = { 0.5, 0.8, 0.5 },
-    TrailFade = 5
+    TrailFade = 5,
+    PointSizeExponent = 9.2
   },
   GUI = {
     Name = "Jupiter Trojan Asteroids",
diff --git a/data/assets/scene/solarsystem/sssb/main_belt_asteroid.asset b/data/assets/scene/solarsystem/sssb/main_belt_asteroid.asset
index d9407c163b..e04acf6d37 100644
--- a/data/assets/scene/solarsystem/sssb/main_belt_asteroid.asset
+++ b/data/assets/scene/solarsystem/sssb/main_belt_asteroid.asset
@@ -21,6 +21,7 @@ local Object = {
     SegmentQuality = 1,
     Color = { 0.0, 0.5, 0.0 },
     TrailFade = 0.1,
+    PointSizeExponent = 9.2,
     RenderSize = 50000
   },
   GUI = {
diff --git a/data/assets/scene/solarsystem/sssb/mars-crossing_asteroid.asset b/data/assets/scene/solarsystem/sssb/mars-crossing_asteroid.asset
index f6a13af867..a0e0564612 100644
--- a/data/assets/scene/solarsystem/sssb/mars-crossing_asteroid.asset
+++ b/data/assets/scene/solarsystem/sssb/mars-crossing_asteroid.asset
@@ -20,7 +20,8 @@ local Object = {
     Segments = 200,
     SegmentQuality = 1,
     Color = { 0.814, 0.305, 0.22 },
-    TrailFade = 13
+    TrailFade = 13,
+    PointSizeExponent = 9.2
   },
   GUI = {
     Name = "Mars-crossing Asteroids",
diff --git a/data/assets/scene/solarsystem/sssb/outer_main_belt_asteroid.asset b/data/assets/scene/solarsystem/sssb/outer_main_belt_asteroid.asset
index 23fa484398..2ceab60fdf 100644
--- a/data/assets/scene/solarsystem/sssb/outer_main_belt_asteroid.asset
+++ b/data/assets/scene/solarsystem/sssb/outer_main_belt_asteroid.asset
@@ -20,7 +20,8 @@ local Object = {
     Segments = 200,
     SegmentQuality = 1,
     Color = { 0.4, 0.4, 1.0 },
-    TrailFade = 2
+    TrailFade = 2,
+    PointSizeExponent = 9.2
   },
   GUI = {
     Name = "Outer Main Asteroid Belt",
diff --git a/data/assets/scene/solarsystem/sssb/pha.asset b/data/assets/scene/solarsystem/sssb/pha.asset
index f3c2e2e00e..7ae7d800f5 100644
--- a/data/assets/scene/solarsystem/sssb/pha.asset
+++ b/data/assets/scene/solarsystem/sssb/pha.asset
@@ -20,7 +20,8 @@ local Object = {
     Segments = 200,
     SegmentQuality = 3,
     Color = { 0.98, 0.09, 0.06 },
-    TrailFade = 17
+    TrailFade = 17,
+    PointSizeExponent = 9.2
   },
   GUI = {
     Name = "Potentially Hazardous Asteroids",
diff --git a/data/assets/scene/solarsystem/sssb/transneptunian_object_asteroid.asset b/data/assets/scene/solarsystem/sssb/transneptunian_object_asteroid.asset
index b5b6ce65ae..cb1e5f7a4c 100644
--- a/data/assets/scene/solarsystem/sssb/transneptunian_object_asteroid.asset
+++ b/data/assets/scene/solarsystem/sssb/transneptunian_object_asteroid.asset
@@ -20,7 +20,8 @@ local Object = {
     Segments = 200,
     SegmentQuality = 8,
     Color = { 0.56, 0.64, 0.95 },
-    TrailFade = 10
+    TrailFade = 10,
+    PointSizeExponent = 10.3
   },
   GUI = {
     Name = "Transneptunian Object Asteroids",
diff --git a/modules/base/rendering/renderabletrail.cpp b/modules/base/rendering/renderabletrail.cpp
index bc4c69ac27..01a7c24159 100644
--- a/modules/base/rendering/renderabletrail.cpp
+++ b/modules/base/rendering/renderabletrail.cpp
@@ -40,16 +40,18 @@
 
 namespace {
 #ifdef __APPLE__
-    constexpr std::array<const char*, 12> UniformNames = {
+    constexpr std::array<const char*, 16> UniformNames = {
         "opacity", "modelViewTransform", "projectionTransform", "color", "useLineFade",
-        "lineFade", "vertexSortingMethod", "idOffset", "nVertices", "stride", "pointSize",
-        "renderPhase"
+        "lineLength", "lineFadeAmount", "vertexSortingMethod", "idOffset", "nVertices",
+        "stride", "pointSize", "renderPhase", "useSplitRenderMode", "floatingOffset",
+        "numberOfUniqueVertices"
     };
 #else
-    constexpr std::array<const char*, 14> UniformNames = {
+    constexpr std::array<const char*, 18> UniformNames = {
         "opacity", "modelViewTransform", "projectionTransform", "color", "useLineFade",
-        "lineFade", "vertexSortingMethod", "idOffset", "nVertices", "stride", "pointSize",
-        "renderPhase", "viewport", "lineWidth"
+        "lineLength", "lineFadeAmount", "vertexSortingMethod", "idOffset", "nVertices",
+        "stride", "pointSize", "renderPhase", "viewport", "lineWidth", "floatingOffset",
+        "useSplitRenderMode", "numberOfUniqueVertices"
     };
 #endif
 
@@ -86,12 +88,28 @@ namespace {
         openspace::properties::Property::Visibility::NoviceUser
     };
 
-    constexpr openspace::properties::Property::PropertyInfo LineFadeInfo = {
-        "LineFade",
-        "Line fade",
-        "The fading factor that is applied to the trail if the 'EnableFade' value is "
-        "'true'. If it is 'false', this setting has no effect. The higher the number, "
-        "the less fading is applied",
+    constexpr openspace::properties::Property::PropertyInfo LineLengthInfo = {
+        "LineLength",
+        "Line Length",
+        "The extent of the rendered trail. A value of 0 will result in no trail and a "
+        "value of 1 will result in a trail that covers the entire extent. The setting "
+        "only applies if 'EnableFade' is 'true'. If it is 'false', this setting has "
+        "no effect.",
+        // @VISIBILITY(2.5)
+        openspace::properties::Property::Visibility::User
+    };
+
+    constexpr openspace::properties::Property::PropertyInfo LineFadeAmountInfo = {
+        "LineFadeAmount",
+        "Line Fade Amount",
+        "The amount of the trail that should be faded. If the value is 0 then the "
+        "trail will have no fading applied. A value of 0.6 will result in a trail "
+        "where 60% of the extent of the trail will have fading applied to it. In other"
+        "words, the 40% closest to the head of the trail will be solid and the rest "
+        "will fade until completely transparent at the end of the trail. A value of 1 "
+        "will result in a trail that starts fading immediately, becoming fully "
+        "transparent by the end of the trail. This setting only applies if the "
+        "'EnableFade' value is 'true'. If it is 'false', this setting has no effect.",
         // @VISIBILITY(2.5)
         openspace::properties::Property::Visibility::User
     };
@@ -120,15 +138,15 @@ namespace {
     constexpr openspace::properties::Property::PropertyInfo RenderingModeInfo = {
         "Rendering",
         "Rendering Mode",
-        "Determines how the trail should be rendered to the screen. If 'Lines' is "
+        "Determines how the trail should be rendered. If 'Lines' is "
         "selected, only the line part is visible, if 'Points' is selected, only the "
         "corresponding points (and subpoints) are shown. 'Lines+Points' shows both parts",
         openspace::properties::Property::Visibility::AdvancedUser
     };
 
     struct [[codegen::Dictionary(RenderableTrail)]] Parameters {
-        // This object is used to compute locations along the path. Any Translation object
-        // can be used here
+        // This object is used to compute locations along the path. Any Translation 
+        // object can be used here
         ghoul::Dictionary translation
             [[codegen::reference("core_transform_translation")]];
 
@@ -138,8 +156,11 @@ namespace {
         // [[codegen::verbatim(EnableFadeInfo.description)]]
         std::optional<bool> enableFade;
 
-        // [[codegen::verbatim(LineFadeInfo.description)]]
-        std::optional<float> lineFade;
+        // [[codegen::verbatim(LineLengthInfo.description)]]
+        std::optional<float> lineLength;
+
+        // [[codegen::verbatim(LineFadeAmountInfo.description)]]
+        std::optional<float> lineFadeAmount;
 
         // [[codegen::verbatim(LineWidthInfo.description)]]
         std::optional<float> lineWidth;
@@ -173,7 +194,8 @@ RenderableTrail::Appearance::Appearance()
     })
     , lineColor(LineColorInfo, glm::vec3(1.f), glm::vec3(0.f), glm::vec3(1.f))
     , useLineFade(EnableFadeInfo, true)
-    , lineFade(LineFadeInfo, 1.f, 0.f, 30.f)
+    , lineLength(LineLengthInfo, 1.f, 0.f, 1.f)
+    , lineFadeAmount(LineFadeAmountInfo, 1.f, 0.f, 1.f)
     , lineWidth(LineWidthInfo, 10.f, 1.f, 20.f)
     , pointSize(PointSizeInfo, 1, 1, 64)
     , renderingModes(
@@ -189,11 +211,12 @@ RenderableTrail::Appearance::Appearance()
 
     lineColor.setViewOption(properties::Property::ViewOptions::Color);
     addProperty(lineColor);
-    addProperty(useLineFade);
-    addProperty(lineFade);
     addProperty(lineWidth);
     addProperty(pointSize);
     addProperty(renderingModes);
+    addProperty(useLineFade);
+    addProperty(lineLength);
+    addProperty(lineFadeAmount);
 }
 
 RenderableTrail::RenderableTrail(const ghoul::Dictionary& dictionary)
@@ -211,7 +234,7 @@ RenderableTrail::RenderableTrail(const ghoul::Dictionary& dictionary)
 
     _appearance.lineColor = p.color;
     _appearance.useLineFade = p.enableFade.value_or(_appearance.useLineFade);
-    _appearance.lineFade = p.lineFade.value_or(_appearance.lineFade);
+    _appearance.lineLength = p.lineLength.value_or(_appearance.lineLength);
     _appearance.lineWidth = p.lineWidth.value_or(_appearance.lineWidth);
     _appearance.pointSize = p.pointSize.value_or(_appearance.pointSize);
 
@@ -284,7 +307,9 @@ bool RenderableTrail::isReady() const {
 void RenderableTrail::internalRender(bool renderLines, bool renderPoints,
                                      const RenderData& data,
                                      const glm::dmat4& modelTransform,
-                                     RenderInformation& info, int nVertices, int offset)
+                                     RenderInformation& info, int nVertices,
+                                     int ringOffset, bool useSplitRenderMode,
+                                     int numberOfUniqueVertices, int floatingOffset)
 {
     ZoneScoped;
 
@@ -312,9 +337,13 @@ void RenderableTrail::internalRender(bool renderLines, bool renderPoints,
     // This value is subtracted from the vertex id in the case of a potential ring
     // buffer (as used in RenderableTrailOrbit) to keep the first vertex at its
     // brightest
-    _programObject->setUniform(_uniformCache.idOffset, offset);
+    _programObject->setUniform(_uniformCache.idOffset, ringOffset);
 
     _programObject->setUniform(_uniformCache.nVertices, nVertices);
+    _programObject->setUniform(_uniformCache.floatingOffset, floatingOffset);
+    _programObject->setUniform(_uniformCache.useSplitRenderMode, useSplitRenderMode);
+    _programObject->setUniform(_uniformCache.numberOfUniqueVertices,
+        numberOfUniqueVertices);
 
 #if !defined(__APPLE__)
     std::array<GLint, 4> viewport;
@@ -399,7 +428,12 @@ void RenderableTrail::render(const RenderData& data, RendererTasks&) {
     _programObject->setUniform(_uniformCache.color, _appearance.lineColor);
     _programObject->setUniform(_uniformCache.useLineFade, _appearance.useLineFade);
     if (_appearance.useLineFade) {
-        _programObject->setUniform(_uniformCache.lineFade, _appearance.lineFade);
+        const float startPoint = 1.f - _appearance.lineLength;
+        const float remainingRange = 1.f - startPoint;
+        const float delta = remainingRange * _appearance.lineFadeAmount;
+        const float endPoint = std::min(startPoint + delta, 1.f);
+        _programObject->setUniform(_uniformCache.lineLength, startPoint);
+        _programObject->setUniform(_uniformCache.lineFadeAmount, endPoint);
     }
 
     /*glm::ivec2 resolution = global::renderEngine.renderingResolution();
@@ -448,31 +482,82 @@ void RenderableTrail::render(const RenderData& data, RendererTasks&) {
     //    global::renderEngine->openglStateCache().resetDepthState();
     //    return;
     //}
+    
+    if (_useSplitRenderMode) {
+        // Splits the trail up into three parts for more accurate rendering
+        // of renderableTrailTrajectory trails
 
-    // Render the primary batch of vertices
-    internalRender(
-        renderLines,
-        renderPoints,
-        data,
-        modelTransform,
-        _primaryRenderInformation,
-        totalNumber,
-        primaryOffset
-    );
-
-    // The secondary batch is optional, so we need to check whether we have any data here
-    if (_floatingRenderInformation._vaoID != 0 && _floatingRenderInformation.count != 0) {
+        internalRender(
+            renderLines,
+            renderPoints,
+            data,
+            modelTransform,
+            _primaryRenderInformation,
+            _primaryRenderInformation.count,
+            _primaryRenderInformation.first,
+            _useSplitRenderMode,
+            _numberOfUniqueVertices
+        );
+        
+        const int floatingOffset = std::max(0, _primaryRenderInformation.count - 1);
         internalRender(
             renderLines,
             renderPoints,
             data,
             modelTransform,
             _floatingRenderInformation,
-            totalNumber,
-            // -1 because we duplicate the penultimate point between the vertices
-            -(primaryOffset + _primaryRenderInformation.count - 1)
+            _floatingRenderInformation.count,
+            _floatingRenderInformation.first,
+            _useSplitRenderMode,
+            _numberOfUniqueVertices,
+            floatingOffset
         );
+
+        const int offset = (_floatingRenderInformation.count > 0) ? 1 : 0;
+        internalRender(
+            renderLines,
+            renderPoints,
+            data,
+            modelTransform,
+            _secondaryRenderInformation,
+            _secondaryRenderInformation.count,
+            _secondaryRenderInformation.first,
+            _useSplitRenderMode,
+            _numberOfUniqueVertices,
+            offset
+        );
+        
     }
+    else {
+        // Render the primary batch of vertices
+        internalRender(
+            renderLines,
+            renderPoints,
+            data,
+            modelTransform,
+            _primaryRenderInformation,
+            totalNumber,
+            primaryOffset
+        );
+
+        // The secondary batch is optional. We need to check whether we have any data
+        if (_floatingRenderInformation._vaoID != 0 &&
+            _floatingRenderInformation.count != 0) {
+            internalRender(
+                renderLines,
+                renderPoints,
+                data,
+                modelTransform,
+                _floatingRenderInformation,
+                totalNumber,
+                // -1 because we duplicate the penultimate point between the vertices
+                -(primaryOffset + _primaryRenderInformation.count - 1)
+            );
+        }
+    }
+    
+
+    
 
     if (renderPoints) {
         glDisable(GL_PROGRAM_POINT_SIZE);
diff --git a/modules/base/rendering/renderabletrail.h b/modules/base/rendering/renderabletrail.h
index 2840067d58..ca9bbdba50 100644
--- a/modules/base/rendering/renderabletrail.h
+++ b/modules/base/rendering/renderabletrail.h
@@ -32,7 +32,9 @@
 #include <openspace/properties/scalar/floatproperty.h>
 #include <openspace/properties/scalar/intproperty.h>
 #include <openspace/properties/stringproperty.h>
+#include <openspace/properties/vector/vec2property.h>
 #include <openspace/properties/vector/vec3property.h>
+#include <openspace/properties/vector/vec4property.h>
 #include <ghoul/misc/managedmemoryuniqueptr.h>
 #include <ghoul/opengl/ghoul_gl.h>
 #include <ghoul/opengl/uniformcache.h>
@@ -80,14 +82,16 @@ public:
         properties::Vec3Property lineColor;
         /// Settings that enables or disables the line fading
         properties::BoolProperty useLineFade;
-        /// Specifies a multiplicative factor that fades out the line
-        properties::FloatProperty lineFade;
         /// Line width for the line rendering part
         properties::FloatProperty lineWidth;
         /// Point size for the point rendering part
         properties::IntProperty pointSize;
         /// The option determining which rendering method to use
         properties::OptionProperty renderingModes;
+        /// Specifies how much of the orbit should have a trail
+        properties::FloatProperty lineLength;
+        /// Specifies how much of the trail should be faded
+        properties::FloatProperty lineFadeAmount;
     };
 
     virtual ~RenderableTrail() override = default;
@@ -112,16 +116,15 @@ protected:
 
     static documentation::Documentation Documentation();
 
-    /**
-     * The layout of the VBOs.
-     */
+    /// The layout of the VBOs (use float if sending as positions to shader)
+    template <typename T>
     struct TrailVBOLayout {
-        float x, y, z;
+        T x, y, z;
     };
 
     /// The backend storage for the vertex buffer object containing all points for this
     /// trail.
-    std::vector<TrailVBOLayout> _vertexArray;
+    std::vector<TrailVBOLayout<float>> _vertexArray;
 
     /// The index array that is potentially used in the draw call. If this is empty, no
     /// element draw call is used.
@@ -168,25 +171,37 @@ protected:
     /// Optional render information that contains information about the last, floating
     /// part of the trail
     RenderInformation _floatingRenderInformation;
+    /// Render information that contains information about trail segments after the
+    /// object point (renderableTrailTrajectory)
+    RenderInformation _secondaryRenderInformation;
+
+    /// Flag used to determine if we use a split trail or not during rendering
+    bool _useSplitRenderMode = false;
+    /// Number of unique vertices used when rendering segmented trails
+    int _numberOfUniqueVertices = 0;
 
 private:
     void internalRender(bool renderLines, bool renderPoints,
         const RenderData& data,
         const glm::dmat4& modelTransform,
-        RenderInformation& info, int nVertices, int offset);
+        RenderInformation& info, int nVertices, int ringOffset,
+        bool useSplitRenderMode = false, int numberOfUniqueVertices = 0,
+        int floatingOffset = 0);
 
    Appearance _appearance;
 
     /// Program object used to render the data stored in RenderInformation
     ghoul::opengl::ProgramObject* _programObject = nullptr;
 #ifdef __APPLE__
-    UniformCache(opacity, modelView, projection, color, useLineFade,
-                 lineFade, vertexSorting, idOffset, nVertices, stride,
-                 pointSize, renderPhase) _uniformCache;
+    UniformCache(opacity, modelView, projection, color, useLineFade, lineLength,
+        lineFadeAmount, vertexSorting, idOffset, nVertices, stride, pointSize,
+        renderPhase, useSplitRenderMode, floatingOffset, numberOfUniqueVertices
+    ) _uniformCache; 
 #else
-    UniformCache(opacity, modelView, projection, color, useLineFade, lineFade,
-        vertexSorting, idOffset, nVertices, stride, pointSize, renderPhase, viewport,
-        lineWidth) _uniformCache;
+    UniformCache(opacity, modelView, projection, color, useLineFade, lineLength,
+        lineFadeAmount, vertexSorting, idOffset, nVertices, stride, pointSize, renderPhase, 
+        viewport, lineWidth, floatingOffset, useSplitRenderMode, numberOfUniqueVertices
+    ) _uniformCache;
 #endif
 };
 
diff --git a/modules/base/rendering/renderabletrailorbit.cpp b/modules/base/rendering/renderabletrailorbit.cpp
index 58b8dd168a..5f0a473af0 100644
--- a/modules/base/rendering/renderabletrailorbit.cpp
+++ b/modules/base/rendering/renderabletrailorbit.cpp
@@ -229,8 +229,8 @@ void RenderableTrailOrbit::update(const UpdateData& data) {
             // floating value
             glBufferSubData(
                 GL_ARRAY_BUFFER,
-                _primaryRenderInformation.first * sizeof(TrailVBOLayout),
-                sizeof(TrailVBOLayout),
+                _primaryRenderInformation.first * sizeof(TrailVBOLayout<float>),
+                sizeof(TrailVBOLayout<float>),
                 _vertexArray.data() + _primaryRenderInformation.first
             );
         }
@@ -242,7 +242,7 @@ void RenderableTrailOrbit::update(const UpdateData& data) {
             // array
             glBufferData(
                 GL_ARRAY_BUFFER,
-                _vertexArray.size() * sizeof(TrailVBOLayout),
+                _vertexArray.size() * sizeof(TrailVBOLayout<float>),
                 _vertexArray.data(),
                 GL_STREAM_DRAW
             );
@@ -269,8 +269,8 @@ void RenderableTrailOrbit::update(const UpdateData& data) {
             auto upload = [this](int begin, int length) {
                 glBufferSubData(
                     GL_ARRAY_BUFFER,
-                    begin * sizeof(TrailVBOLayout),
-                    sizeof(TrailVBOLayout) * length,
+                    begin * sizeof(TrailVBOLayout<float>),
+                    sizeof(TrailVBOLayout<float>) * length,
                     _vertexArray.data() + begin
                 );
             };
@@ -417,8 +417,8 @@ RenderableTrailOrbit::UpdateReport RenderableTrailOrbit::updateTrails(
     else {
         // See how many new points needs to be generated. Delta is negative, so we need
         // to invert the ratio
-        const uint64_t nNewPoints =
-            -(static_cast<uint64_t>(floor(delta / secondsPerPoint)));
+        const int nNewPoints =
+            -(static_cast<int>(floor(delta / secondsPerPoint)));
 
         // If we would need to generate more new points than there are total points in the
         // array, it is faster to regenerate the entire array
@@ -494,7 +494,7 @@ void RenderableTrailOrbit::fullSweep(double time) {
     glm::vec3 maxVertex(-std::numeric_limits<float>::max());
     glm::vec3 minVertex(std::numeric_limits<float>::max());
 
-    auto setMax = [&maxVertex, &minVertex](const TrailVBOLayout& vertexData) {
+    auto setMax = [&maxVertex, &minVertex](const TrailVBOLayout<float>& vertexData) {
         maxVertex.x = std::max(maxVertex.x, vertexData.x);
         maxVertex.y = std::max(maxVertex.y, vertexData.y);
         maxVertex.z = std::max(maxVertex.z, vertexData.z);
diff --git a/modules/base/rendering/renderabletrailtrajectory.cpp b/modules/base/rendering/renderabletrailtrajectory.cpp
index fe694d2fac..8c9b6618d4 100644
--- a/modules/base/rendering/renderabletrailtrajectory.cpp
+++ b/modules/base/rendering/renderabletrailtrajectory.cpp
@@ -95,7 +95,25 @@ namespace {
         "The number of vertices that will be calculated each frame whenever the trail "
         "needs to be recalculated. "
         "A greater value will result in more calculations per frame.",
-        // @VISIBILITY(?)
+        openspace::properties::Property::Visibility::AdvancedUser
+    };
+
+    constexpr openspace::properties::Property::PropertyInfo EnableSweepChunkingInfo = {
+        "EnableSweepChunking",
+        "Use Sweep Chunking",
+        "Enable or Disable the use of iterative calculations (chunking) during full "
+        "sweep vertex calculations. When enabled, small part of the trail will be "
+        "calculated each frame instead of calculating the entire trail in one go. "
+        "The size of each 'chunk' can be altered by changing the sweep chunk size "
+        "property.",
+        openspace::properties::Property::Visibility::AdvancedUser
+    };
+
+    constexpr openspace::properties::Property::PropertyInfo AccurateTrailPositionsInfo = {
+        "AccurateTrailPositions",
+        "Number of Accurate Trail Points",
+        "The number of vertices, each side of the object, that will be recalculated "
+        "for greater accuracy. This also ensures that the object connects with the trail.",
         openspace::properties::Property::Visibility::AdvancedUser
     };
 
@@ -117,6 +135,12 @@ namespace {
 
         // [[codegen::verbatim(SweepChunkSizeInfo.description)]]
         std::optional<int> sweepChunkSize;
+
+        // [[codegen::verbatim(SweepChunkSizeInfo.description)]]
+        std::optional<int> enableSweepChunking;
+
+        // [[codegen::verbatim(AccurateTrailPositionsInfo.description)]]
+        std::optional<int> accurateTrailPositions;
     };
 #include "renderabletrailtrajectory_codegen.cpp"
 } // namespace
@@ -139,11 +163,17 @@ RenderableTrailTrajectory::RenderableTrailTrajectory(const ghoul::Dictionary& di
     , _renderFullTrail(RenderFullPathInfo, false)
     , _maxVertex(glm::vec3(-std::numeric_limits<float>::max()))
     , _minVertex(glm::vec3(std::numeric_limits<float>::max()))
+    , _sweepChunkSize(SweepChunkSizeInfo, 200, 50, 5000)
+    , _enableSweepChunking(EnableSweepChunkingInfo, false)
+    , _numberOfReplacementPoints(AccurateTrailPositionsInfo, 100, 0, 1000)
 {
     const Parameters p = codegen::bake<Parameters>(dictionary);
 
     _translation->onParameterChange([this]() { reset(); });
 
+    _renderFullTrail = p.showFullTrail.value_or(_renderFullTrail);
+    addProperty(_renderFullTrail);
+
     _startTime = p.startTime;
     _startTime.onChange([this] { reset(); });
     addProperty(_startTime);
@@ -161,13 +191,23 @@ RenderableTrailTrajectory::RenderableTrailTrajectory(const ghoul::Dictionary& di
     _timeStampSubsamplingFactor.onChange([this] { _subsamplingIsDirty = true; });
     addProperty(_timeStampSubsamplingFactor);
 
-    _renderFullTrail = p.showFullTrail.value_or(_renderFullTrail);
-    addProperty(_renderFullTrail);
+    _numberOfReplacementPoints = p.accurateTrailPositions.value_or(
+        _numberOfReplacementPoints
+    );
+    addProperty(_numberOfReplacementPoints);
+
+    _enableSweepChunking = p.enableSweepChunking.value_or(_enableSweepChunking);
+    addProperty(_enableSweepChunking);
 
     _sweepChunkSize = p.sweepChunkSize.value_or(_sweepChunkSize);
+    addProperty(_sweepChunkSize);
 
     // We store the vertices with ascending temporal order
     _primaryRenderInformation.sorting = RenderInformation::VertexSorting::OldestFirst;
+    _secondaryRenderInformation.sorting = RenderInformation::VertexSorting::OldestFirst;
+
+    // Activate special render mode for renderableTrailTrajectory 
+    _useSplitRenderMode = true;
 }
 
 void RenderableTrailTrajectory::initializeGL() {
@@ -182,6 +222,9 @@ void RenderableTrailTrajectory::initializeGL() {
     glGenVertexArrays(1, &_floatingRenderInformation._vaoID);
     glGenBuffers(1, &_floatingRenderInformation._vBufferID);
     _floatingRenderInformation.sorting = RenderInformation::VertexSorting::OldestFirst;
+
+    _secondaryRenderInformation._vaoID = _primaryRenderInformation._vaoID;
+    _secondaryRenderInformation._vBufferID = _primaryRenderInformation._vBufferID;
 }
 
 void RenderableTrailTrajectory::deinitializeGL() {
@@ -230,26 +273,38 @@ void RenderableTrailTrajectory::update(const UpdateData& data) {
 
             // Make space for the vertices
             _vertexArray.clear();
+            _dVertexArray.clear();
+            _timeVector.clear();
             _vertexArray.resize(_numberOfVertices + 1);
+            _dVertexArray.resize(_numberOfVertices + 1);
+            _timeVector.resize(_numberOfVertices + 1);
         }
 
         // Calculate sweeping range for this iteration
         const unsigned int startIndex = _sweepIteration * _sweepChunkSize;
         const unsigned int nextIndex = (_sweepIteration + 1) * _sweepChunkSize;
-        const unsigned int stopIndex = std::min(nextIndex, _numberOfVertices);
+        unsigned int stopIndex = std::min(nextIndex, _numberOfVertices);
+
+        // If iterative calculations are disabled
+        if (!_enableSweepChunking) {
+            stopIndex = _numberOfVertices;
+        }
 
         // Calculate all vertex positions
         for (unsigned int i = startIndex; i < stopIndex; i++) {
-            const glm::vec3 p = _translation->position({
+            const glm::dvec3 dp = _translation->position({
                 {},
                 Time(_start + i * _totalSampleInterval),
                 Time(0.0)
             });
+            const glm::vec3 p(dp.x, dp.y, dp.z);
             _vertexArray[i] = { p.x, p.y, p.z };
+            _timeVector[i] = Time(_start + i * _totalSampleInterval).j2000Seconds();
+            _dVertexArray[i] = {dp.x, dp.y, dp.z};
 
             // Set max and min vertex for bounding sphere calculations
-            _maxVertex = glm::max(_maxVertex, p);
-            _minVertex = glm::min(_minVertex, p);
+            _maxVertex = glm::max(_maxVertex, dp);
+            _minVertex = glm::min(_minVertex, dp);
         }
         ++_sweepIteration;
 
@@ -257,15 +312,18 @@ void RenderableTrailTrajectory::update(const UpdateData& data) {
         // Adds the last point in time to the _vertexArray so that we
         // ensure that points for _start and _end always exists
         if (stopIndex == _numberOfVertices) {
-            const glm::vec3 p = _translation->position({
+            const glm::dvec3 dp = _translation->position({
                 {},
                 Time(_end),
                 Time(0.0)
-            });
+                });
+            const glm::vec3 p(dp.x, dp.y, dp.z);
             _vertexArray[stopIndex] = { p.x, p.y, p.z };
+            _timeVector[stopIndex] = Time(_end).j2000Seconds();
+            _dVertexArray[stopIndex] = { dp.x, dp.y, dp.z };
 
             _sweepIteration = 0;
-            setBoundingSphere(glm::distance(_maxVertex, _minVertex) / 2.f);
+            setBoundingSphere(glm::distance(_maxVertex, _minVertex) / 2.0);
         }
         else {
             // Early return as we don't need to render if we are still
@@ -278,7 +336,7 @@ void RenderableTrailTrajectory::update(const UpdateData& data) {
         glBindBuffer(GL_ARRAY_BUFFER, _primaryRenderInformation._vBufferID);
         glBufferData(
             GL_ARRAY_BUFFER,
-            _vertexArray.size() * sizeof(TrailVBOLayout),
+            _vertexArray.size() * sizeof(TrailVBOLayout<float>),
             _vertexArray.data(),
             GL_STATIC_DRAW
         );
@@ -295,81 +353,192 @@ void RenderableTrailTrajectory::update(const UpdateData& data) {
     }
 
     // This has to be done every update step;
-    if (_renderFullTrail) {
-        // If the full trail should be rendered at all times, we can directly render the
-        // entire set
-        _primaryRenderInformation.first = 0;
-        _primaryRenderInformation.count = static_cast<GLsizei>(_vertexArray.size());
-    }
-    else {
-        // If only trail so far should be rendered, we need to find the corresponding time
-        // in the array and only render it until then
-        _primaryRenderInformation.first = 0;
-        const double t = std::max(
-            0.0,
-            (data.time.j2000Seconds() - _start) / (_end - _start)
+    const double j2k = data.time.j2000Seconds();
+
+    if (j2k >= _start && j2k < _end) {
+        _replacementPoints.clear();
+
+        // Calculates number of vertices for the first segment (start point to object)
+        _primaryRenderInformation.count = static_cast<GLsizei>(
+            std::distance(
+                _timeVector.begin(),
+                std::lower_bound(_timeVector.begin(), _timeVector.end(), j2k)
+            )
         );
-        if (data.time.j2000Seconds() < _end) {
-            _primaryRenderInformation.count = static_cast<GLsizei>(
-                std::max(
-                    1.0,
-                    floor(_vertexArray.size() - 1) * t
-                )
-                );
+        
+        if (_renderFullTrail) {
+            // Calculates number of vertices for the second segment (object to end point)
+            _secondaryRenderInformation.first = _primaryRenderInformation.count;
+            _secondaryRenderInformation.count = static_cast<GLsizei>(
+                _vertexArray.size() - (_primaryRenderInformation.count)
+            );
+
+            // Calculate number of vertices in the trail
+            _numberOfUniqueVertices = static_cast<GLsizei>(
+                std::distance(_timeVector.begin(), _timeVector.end())
+            );
         }
         else {
-            _primaryRenderInformation.count = static_cast<GLsizei>(_vertexArray.size());
+            // If we don't render full trail there's no trail after the object
+            _secondaryRenderInformation.first = 0;
+            _secondaryRenderInformation.count = 0;
+
+            // Set number of vertices in the trail
+            _numberOfUniqueVertices = _primaryRenderInformation.count;
         }
 
-    }
-
-    // If we are inside the valid time, we additionally want to draw a line from the last
-    // correct point to the current location of the object
-    if (data.time.j2000Seconds() > _start &&
-        data.time.j2000Seconds() <= _end && !_renderFullTrail)
-    {
-        ghoul_assert(_primaryRenderInformation.count > 0, "No vertices available");
-
-        // Copy the last valid location
-        const glm::dvec3 v0 = glm::dvec3(
-            _vertexArray[_primaryRenderInformation.count - 1].x,
-            _vertexArray[_primaryRenderInformation.count - 1].y,
-            _vertexArray[_primaryRenderInformation.count - 1].z
+        // Determine the number of points to be recalculated
+        int prePaddingDelta = 0;
+        if (!_renderFullTrail && _numberOfReplacementPoints == 0) {
+            // Enables trail from last point to current position
+            // if we don't do any replacement points
+            prePaddingDelta = 1;
+        }
+        else {
+            prePaddingDelta = std::min(
+                static_cast<int>(_primaryRenderInformation.count),
+                static_cast<int>(_numberOfReplacementPoints)
+            );
+        }
+        int postPaddingDelta = std::min(
+            static_cast<int>(_secondaryRenderInformation.count),
+            static_cast<int>(_numberOfReplacementPoints)
         );
 
-        // And get the current location of the object
+        // Get current position of the object
         const glm::dvec3 p = _translation->position(data);
-        const glm::dvec3 v1 = glm::dvec3(p.x, p.y, p.z);
 
-        // Comptue the difference between the points in double precision
-        const glm::dvec3 p0 = v0 - v1;
-        _auxiliaryVboData[0] = {
-            static_cast<float>(p0.x),
-            static_cast<float>(p0.y),
-            static_cast<float>(p0.z)
-        };
-        _auxiliaryVboData[1] = { 0.f, 0.f, 0.f };
+        // Calculates all replacement points before the object
+        glm::dvec3 v = p;
+        for (int i = 0; i < prePaddingDelta; ++i) {
+            const int floatPointIndex =
+                _primaryRenderInformation.count - prePaddingDelta + i;
 
-        // Fill the render info with the data
+            glm::dvec3 fp = glm::dvec3(
+                _vertexArray[floatPointIndex].x,
+                _vertexArray[floatPointIndex].y,
+                _vertexArray[floatPointIndex].z
+            );
+
+            glm::dvec3 dp = glm::dvec3(
+                _dVertexArray[floatPointIndex].x,
+                _dVertexArray[floatPointIndex].y,
+                _dVertexArray[floatPointIndex].z
+            );
+
+            glm::dvec3 dv = fp - dp;
+            glm::dvec3 newPoint = dp - v;
+
+            // Scales position offset for smooth transition from '
+            // original points to accurate points
+            double mult = 0.0;
+            if (i == prePaddingDelta - 1) {
+                mult = (i == 0) ? 1.0 : 0.0;
+            }
+            else {
+                mult = (prePaddingDelta - i) / static_cast<double>(prePaddingDelta);
+            }
+
+            newPoint = newPoint + dv * mult;
+            _replacementPoints.push_back({
+                static_cast<float>(newPoint.x),
+                static_cast<float>(newPoint.y),
+                static_cast<float>(newPoint.z)
+            });
+        }
+
+        // Mid-point (model-space position for the object)
+        if (_numberOfReplacementPoints > 0 || !_renderFullTrail) {
+            _replacementPoints.push_back({ 0.f, 0.f, 0.f });
+        }
+
+        // Calculates all replacement points after the object
+        v = glm::dvec3(p.x, p.y, p.z);
+        for (int i = 0; i < postPaddingDelta; ++i) {
+            const int floatPointIndex = _secondaryRenderInformation.first + i;
+
+            glm::dvec3 fp = glm::dvec3(
+                _vertexArray[floatPointIndex].x,
+                _vertexArray[floatPointIndex].y,
+                _vertexArray[floatPointIndex].z
+            );
+
+            glm::dvec3 dp = glm::dvec3(
+                _dVertexArray[floatPointIndex].x,
+                _dVertexArray[floatPointIndex].y,
+                _dVertexArray[floatPointIndex].z
+            );
+
+            glm::dvec3 dv = fp - dp;
+            glm::dvec3 newPoint = dp - v;
+
+            // Scales position offset for smooth transition from '
+            // original points to accurate points
+            double mult = (i == postPaddingDelta - 1) ?
+                1.0 :
+                1.0 - (postPaddingDelta - i) / static_cast<double>(postPaddingDelta);
+
+            newPoint = newPoint + dv * mult;
+            _replacementPoints.push_back({
+                static_cast<float>(newPoint.x),
+                static_cast<float>(newPoint.y),
+                static_cast<float>(newPoint.z)
+            });
+        }
+
+        // Set variables for floating segments
         _floatingRenderInformation.first = 0;
-        _floatingRenderInformation.count = 2;
+        _floatingRenderInformation.count =
+            static_cast<GLsizei>(_replacementPoints.size());
+
+        _floatingRenderInformation._localTransform = glm::translate(
+            glm::dmat4(1.0),
+            p
+        );
+
+        // Adjusts number of unique vertices if we have inserted a new mid point
+        if (_floatingRenderInformation.count > 0 && _renderFullTrail) {
+            _numberOfUniqueVertices++;
+        }
+
+        // Recalculate .count and .first based on the recalculated (floating) vertices
+        _primaryRenderInformation.count -= std::max(0, prePaddingDelta - 1);
+        _secondaryRenderInformation.first += std::max(0, postPaddingDelta - 1);
+        _secondaryRenderInformation.count -= std::max(0, postPaddingDelta - 1);
+
+        // Adjusts count such that it takes into account if we don't have any line
+        // connecting with the object
+        if (_renderFullTrail && _numberOfReplacementPoints == 0) {
+            _primaryRenderInformation.count += 1;
+        }
 
-        _floatingRenderInformation._localTransform = glm::translate(glm::dmat4(1.0), v1);
 
         glBindVertexArray(_floatingRenderInformation._vaoID);
         glBindBuffer(GL_ARRAY_BUFFER, _floatingRenderInformation._vBufferID);
         glBufferData(
             GL_ARRAY_BUFFER,
-            _auxiliaryVboData.size() * sizeof(TrailVBOLayout),
-            _auxiliaryVboData.data(),
+            _replacementPoints.size() * sizeof(TrailVBOLayout<float>),
+            _replacementPoints.data(),
             GL_DYNAMIC_DRAW
         );
-
         glEnableVertexAttribArray(0);
         glVertexAttribPointer(0, 3, GL_FLOAT, GL_FALSE, 0, nullptr);
     }
+    else if (j2k >= _end || (j2k < _start && _renderFullTrail)) {
+        // Renders the whole trail if time has passed the end time
+        _primaryRenderInformation.first = 0;
+        _primaryRenderInformation.count = static_cast<GLsizei>(_vertexArray.size());
+        _numberOfUniqueVertices = _primaryRenderInformation.count;
+        _secondaryRenderInformation.first = 0;
+        _secondaryRenderInformation.count = 0;
+        _floatingRenderInformation.first = 0;
+        _floatingRenderInformation.count = 0;
+    }
     else {
-        // if we are outside of the valid range, we don't render anything
+        _primaryRenderInformation.first = 0;
+        _primaryRenderInformation.count = 0;
+        _secondaryRenderInformation.first = 0;
+        _secondaryRenderInformation.count = 0;
         _floatingRenderInformation.first = 0;
         _floatingRenderInformation.count = 0;
     }
@@ -377,8 +546,11 @@ void RenderableTrailTrajectory::update(const UpdateData& data) {
     if (_subsamplingIsDirty) {
         // If the subsampling information has changed (either by a property change or by
         // a request of a full sweep) we update it here
+
         _primaryRenderInformation.stride = _timeStampSubsamplingFactor;
+        _secondaryRenderInformation.stride = _timeStampSubsamplingFactor;
         _floatingRenderInformation.stride = _timeStampSubsamplingFactor;
+
         _subsamplingIsDirty = false;
     }
 
diff --git a/modules/base/rendering/renderabletrailtrajectory.h b/modules/base/rendering/renderabletrailtrajectory.h
index 62247da9e4..9a4c69d3e4 100644
--- a/modules/base/rendering/renderabletrailtrajectory.h
+++ b/modules/base/rendering/renderabletrailtrajectory.h
@@ -67,7 +67,9 @@ private:
     void reset();
 
     /// The number of vertices that we calculate during each frame of the full sweep pass
-    unsigned int _sweepChunkSize = 200;
+    properties::IntProperty _sweepChunkSize;
+    /// Enables or disables iterative vertex calculations during a full sweep
+    properties::BoolProperty _enableSweepChunking;
 
     /// The start time of the trail
     properties::StringProperty _startTime;
@@ -80,6 +82,9 @@ private:
     properties::IntProperty _timeStampSubsamplingFactor;
     /// Determines whether the full trail should be rendered or the future trail removed
     properties::BoolProperty _renderFullTrail;
+    /// Determines how many vertices around the object that will be 
+    /// replaced during full trail rendering
+    properties::IntProperty _numberOfReplacementPoints;
 
     /// Dirty flag that determines whether the full vertex buffer needs to be resampled
     bool _needsFullSweep = true;
@@ -87,7 +92,7 @@ private:
     /// Dirty flag to determine whether the stride information needs to be changed
     bool _subsamplingIsDirty = true;
 
-    std::array<TrailVBOLayout, 2> _auxiliaryVboData = {};
+    std::array<TrailVBOLayout<float>, 2> _auxiliaryVboData = {};
 
     /// The conversion of the _startTime into the internal time format
     double _start = 0.0;
@@ -104,8 +109,17 @@ private:
     double _totalSampleInterval = 0.0;
 
     /// Max and min vertex used to calculate the bounding sphere
-    glm::vec3 _maxVertex;
-    glm::vec3 _minVertex;
+    glm::dvec3 _maxVertex;
+    glm::dvec3 _minVertex;
+
+    /// Contains all timestamps corresponding to the positions in _vertexArray
+    std::vector<double> _timeVector;
+    
+    /// Keeps track of all double precision vertices of trails
+    std::vector<TrailVBOLayout<double>> _dVertexArray;
+
+    /// Contains all the points that we will render in model-space
+    std::vector<TrailVBOLayout<float>> _replacementPoints;
 };
 
 } // namespace openspace
diff --git a/modules/base/shaders/renderabletrail_apple_fs.glsl b/modules/base/shaders/renderabletrail_apple_fs.glsl
index 16d57b3dd7..5911c97000 100644
--- a/modules/base/shaders/renderabletrail_apple_fs.glsl
+++ b/modules/base/shaders/renderabletrail_apple_fs.glsl
@@ -51,12 +51,7 @@ Fragment getFragment() {
     vec2 circCoord = 2.0 * gl_PointCoord - 1.0;
     //float circleClipping = 1.0 - smoothstep(1.0 - Delta, 1.0, dot(circCoord, circCoord));
     float circleClipping = smoothstep(1.0, 1.0 - Delta, dot(circCoord, circCoord));
-    float transparencyCorrection = frag.color.a * circleClipping;
-    if (transparencyCorrection < 0.9) {
-      discard;
-    }
-
-    frag.color.a = transparencyCorrection;
+    frag.color.a *= circleClipping;
   }
 
   frag.gPosition = vs_gPosition;
diff --git a/modules/base/shaders/renderabletrail_apple_vs.glsl b/modules/base/shaders/renderabletrail_apple_vs.glsl
index a7c45a93a9..cc307a5d18 100644
--- a/modules/base/shaders/renderabletrail_apple_vs.glsl
+++ b/modules/base/shaders/renderabletrail_apple_vs.glsl
@@ -37,13 +37,18 @@ uniform mat4 projectionTransform;
 uniform int idOffset;
 uniform int nVertices;
 uniform bool useLineFade;
-uniform float lineFade;
+uniform float lineLength;
+uniform float lineFadeAmount;
 uniform int vertexSortingMethod;
 uniform int pointSize;
 uniform int stride;
 
 uniform ivec2 resolution;
 
+uniform bool useSplitRenderMode;
+uniform int numberOfUniqueVertices;
+uniform int floatingOffset;
+
 // Fragile! Keep in sync with RenderableTrail::render
 #define VERTEX_SORTING_NEWESTFIRST 0
 #define VERTEX_SORTING_OLDESTFIRST 1
@@ -54,20 +59,43 @@ void main() {
   int modId = gl_VertexID;
 
   if ((vertexSortingMethod != VERTEX_SORTING_NOSORTING) && useLineFade) {
-    // Account for a potential rolling buffer
-    modId = gl_VertexID - idOffset;
-    if (modId < 0) {
-      modId += nVertices;
-    }
+    float id = 0;
 
-    // Convert the index to a [0,1] ranger
-    float id = float(modId) / float(nVertices);
+    if (useSplitRenderMode) {
+        // Calculates id for when using split render mode (renderableTrailTrajectory)
+        id = float(floatingOffset + modId) / float(max(1, numberOfUniqueVertices - 1));
+    }
+    else {
+        // Account for a potential rolling buffer
+        modId = gl_VertexID - idOffset;
+        if (modId < 0) {
+          modId += nVertices;
+        }
+        
+        // Convert the index to a [0,1] range
+        id = float(modId) / float(nVertices);
+    }
 
     if (vertexSortingMethod == VERTEX_SORTING_NEWESTFIRST) {
       id = 1.0 - id;
     }
 
-    fade = clamp(id * lineFade, 0.0, 1.0);
+    float b0 = lineLength;
+    float b1 = lineFadeAmount;
+
+    float fadeValue = 0.0;
+    if (id <= b0) {
+        fadeValue = 0.0;
+    }
+    else if (id > b0 && id < b1) {
+        float delta = b1 - b0;
+        fadeValue = (id - b0) / delta;
+    }
+    else {
+        fadeValue = 1.0;
+    }
+
+    fade = clamp(fadeValue, 0.0, 1.0);
   }
   else {
     fade = 1.0;
diff --git a/modules/base/shaders/renderabletrail_fs.glsl b/modules/base/shaders/renderabletrail_fs.glsl
index 668abf9d8c..daaf31985d 100644
--- a/modules/base/shaders/renderabletrail_fs.glsl
+++ b/modules/base/shaders/renderabletrail_fs.glsl
@@ -54,12 +54,7 @@ Fragment getFragment() {
     vec2 circCoord = 2.0 * gl_PointCoord - 1.0;
     //float circleClipping = 1.0 - smoothstep(1.0 - Delta, 1.0, dot(circCoord, circCoord));
     float circleClipping = smoothstep(1.0, 1.0 - Delta, dot(circCoord, circCoord));
-    float transparencyCorrection = frag.color.a * circleClipping;
-    if (transparencyCorrection < 0.9) {
-      discard;
-    }
-
-    frag.color.a = transparencyCorrection;
+    frag.color.a *= circleClipping;
   }
 
   // We can't expect a viewport of the form (0, 0, res.x, res.y) used to convert the
diff --git a/modules/base/shaders/renderabletrail_vs.glsl b/modules/base/shaders/renderabletrail_vs.glsl
index aa1fffcac7..af08539071 100644
--- a/modules/base/shaders/renderabletrail_vs.glsl
+++ b/modules/base/shaders/renderabletrail_vs.glsl
@@ -38,13 +38,18 @@ uniform mat4 projectionTransform;
 uniform int idOffset;
 uniform int nVertices;
 uniform bool useLineFade;
-uniform float lineFade;
+uniform float lineLength;
+uniform float lineFadeAmount;
 uniform int vertexSortingMethod;
 uniform int pointSize;
 uniform int stride;
 
 uniform vec4 viewport;
 
+uniform bool useSplitRenderMode;
+uniform int numberOfUniqueVertices;
+uniform int floatingOffset;
+
 // Fragile! Keep in sync with RenderableTrail::render
 #define VERTEX_SORTING_NEWESTFIRST 0
 #define VERTEX_SORTING_OLDESTFIRST 1
@@ -55,20 +60,43 @@ void main() {
   int modId = gl_VertexID;
 
   if ((vertexSortingMethod != VERTEX_SORTING_NOSORTING) && useLineFade) {
-    // Account for a potential rolling buffer
-    modId = gl_VertexID - idOffset;
-    if (modId < 0) {
-      modId += nVertices;
-    }
+    float id = 0;
 
-    // Convert the index to a [0,1] ranger
-    float id = float(modId) / float(nVertices);
+    if (useSplitRenderMode) {
+        // Calculates id for when using split render mode (renderableTrailTrajectory)
+        id = float(floatingOffset + modId) / float(max(1, numberOfUniqueVertices - 1));
+    }
+    else {
+        // Account for a potential rolling buffer
+        modId = gl_VertexID - idOffset;
+        if (modId < 0) {
+          modId += nVertices;
+        }
+        
+        // Convert the index to a [0,1] range
+        id = float(modId) / float(nVertices);
+    }
 
     if (vertexSortingMethod == VERTEX_SORTING_NEWESTFIRST) {
       id = 1.0 - id;
     }
 
-    fade = clamp(id * lineFade, 0.0, 1.0);
+    float b0 = lineLength;
+    float b1 = lineFadeAmount;
+
+    float fadeValue = 0.0;
+    if (id <= b0) {
+        fadeValue = 0.0;
+    }
+    else if (id > b0 && id < b1) {
+        float delta = b1 - b0;
+        fadeValue = (id - b0) / delta;
+    }
+    else {
+        fadeValue = 1.0;
+    }
+
+    fade = clamp(fadeValue, 0.0, 1.0);
   }
   else {
     fade = 1.0;
diff --git a/modules/space/CMakeLists.txt b/modules/space/CMakeLists.txt
index f191570586..cd891cdec9 100644
--- a/modules/space/CMakeLists.txt
+++ b/modules/space/CMakeLists.txt
@@ -72,8 +72,11 @@ set(SHADER_FILES
   shaders/constellationbounds_vs.glsl
   shaders/constellationlines_fs.glsl
   shaders/constellationlines_vs.glsl
-  shaders/debrisViz_fs.glsl
-  shaders/debrisViz_vs.glsl
+  shaders/debrisVizPoints_fs.glsl
+  shaders/debrisVizPoints_gs.glsl
+  shaders/debrisVizPoints_vs.glsl
+  shaders/debrisVizTrails_fs.glsl
+  shaders/debrisVizTrails_vs.glsl
   shaders/fluxnodes_fs.glsl
   shaders/fluxnodes_vs.glsl
   shaders/habitablezone_vs.glsl
diff --git a/modules/space/rendering/renderableorbitalkepler.cpp b/modules/space/rendering/renderableorbitalkepler.cpp
index 48c16d13d8..2c67548be0 100644
--- a/modules/space/rendering/renderableorbitalkepler.cpp
+++ b/modules/space/rendering/renderableorbitalkepler.cpp
@@ -45,6 +45,14 @@
 #include <vector>
 
 namespace {
+
+    // The possible values for the _renderingModes property
+    enum RenderingMode {
+        RenderingModeTrail = 0,
+        RenderingModePoint,
+        RenderingModePointTrail
+    };
+
     constexpr openspace::properties::Property::PropertyInfo PathInfo = {
         "Path",
         "Path",
@@ -63,30 +71,92 @@ namespace {
         openspace::properties::Property::Visibility::User
     };
 
-    constexpr openspace::properties::Property::PropertyInfo LineWidthInfo = {
-        "LineWidth",
-        "Line Width",
+    constexpr openspace::properties::Property::PropertyInfo TrailWidthInfo = {
+        "TrailWidth",
+        "Trail Width",
         "This value specifies the line width of the trail if the selected rendering "
         "method includes lines. If the rendering mode is set to Points, this value is "
         "ignored",
         openspace::properties::Property::Visibility::NoviceUser
     };
 
-    constexpr openspace::properties::Property::PropertyInfo LineColorInfo = {
+    constexpr openspace::properties::Property::PropertyInfo PointSizeExponentInfo = {
+        "PointSizeExponent",
+        "Point Size Exponent",
+        "This value is used as in exponential scaling to set the absolute size of the "
+        "point.",
+        // @VISIBILITY(2.4)
+        openspace::properties::Property::Visibility::User
+    };
+
+    constexpr openspace::properties::Property::PropertyInfo EnableMaxSizeInfo = {
+        "EnableMaxSize",
+        "Enable Max Size",
+        "If true, the Max Size property will be used as an upper limit for the size of "
+        "the point. This reduces the size of the points when approaching them, so that "
+        "they stick to a maximum visual size depending on the Max Size value.",
+        openspace::properties::Property::Visibility::AdvancedUser
+    };
+
+    constexpr openspace::properties::Property::PropertyInfo MaxSizeInfo = {
+        "MaxSize",
+        "Max Size",
+        "This value controls the maximum allowed size for the points, when the max size "
+        "control feature is enabled. This limits the visual size of the points based on "
+        "the distance to the camera. The larger the value, the larger the points are "
+        "allowed to be. In the background, the computations are made to limit the size "
+        "of the angle between the CameraToPointMid and CameraToPointEdge vectors.",
+        openspace::properties::Property::Visibility::AdvancedUser
+    };
+
+    constexpr openspace::properties::Property::PropertyInfo RenderingModeInfo = {
+        "Rendering",
+        "Rendering Mode",
+        "Determines how the trail should be rendered. If 'Trail' is selected, "
+        "only the line part is visible, if 'Point' is selected, only the "
+        "current satellite/debris point is visible.",
+        openspace::properties::Property::Visibility::AdvancedUser
+    };
+
+    constexpr openspace::properties::Property::PropertyInfo ColorInfo = {
         "Color",
         "Color",
-        "This value determines the RGB main color for the lines and points of the trail",
+        "This value determines the RGB main color for the trails and points.",
         openspace::properties::Property::Visibility::NoviceUser
     };
 
     constexpr openspace::properties::Property::PropertyInfo TrailFadeInfo = {
         "TrailFade",
-        "Trail Fade",
+        "Trail Fade Factor",
         "This value determines how fast the trail fades and is an appearance property.",
         // @VISIBILITY(2.5)
         openspace::properties::Property::Visibility::User
     };
 
+    constexpr openspace::properties::Property::PropertyInfo EnableOutlineInfo = {
+        "EnableOutline",
+        "Enable Point Outline",
+        "This setting determines if each point should have an outline or not. An outline "
+        "is only applied when rendering as colored points (not when using textures).",
+        openspace::properties::Property::Visibility::User
+    };
+
+    constexpr openspace::properties::Property::PropertyInfo OutlineColorInfo = {
+        "OutlineColor",
+        "Outline Color",
+        "This value defines the color of the outline. Darker colors will be "
+        "less visible if Additive Blending is enabled.",
+        openspace::properties::Property::Visibility::User
+    };
+
+    constexpr openspace::properties::Property::PropertyInfo OutlineWeightInfo = {
+        "OutlineWeight",
+        "Outline Weight",
+        "This setting determines the thickness of the outline. A value of 0 will "
+        "not show any outline, while a value of 1 will cover the whole point.",
+        openspace::properties::Property::Visibility::AdvancedUser
+    };
+
     constexpr openspace::properties::Property::PropertyInfo StartRenderIdxInfo = {
         "StartRenderIdx",
         "Contiguous Starting Index of Render",
@@ -130,15 +200,23 @@ namespace {
         // [[codegen::verbatim(SegmentQualityInfo.description)]]
         int segmentQuality;
 
-        // [[codegen::verbatim(LineWidthInfo.description)]]
-        std::optional<float> lineWidth;
+        // [[codegen::verbatim(TrailWidthInfo.description)]]
+        std::optional<float> trailWidth;
 
-        // [[codegen::verbatim(LineColorInfo.description)]]
+        // [[codegen::verbatim(ColorInfo.description)]]
         glm::dvec3 color [[codegen::color()]];
 
         // [[codegen::verbatim(TrailFadeInfo.description)]]
         std::optional<float> trailFade;
 
+        enum class RenderingMode {
+            Trail,
+            Point,
+            PointsTrails
+        };
+        // [[codegen::verbatim(RenderingModeInfo.description)]]
+        std::optional<RenderingMode> renderingMode [[codegen::key("Rendering")]];
+
         // [[codegen::verbatim(StartRenderIdxInfo.description)]]
         std::optional<int> startRenderIdx;
 
@@ -147,6 +225,24 @@ namespace {
 
         // [[codegen::verbatim(ContiguousModeInfo.description)]]
         std::optional<bool> contiguousMode;
+
+        // [[codegen::verbatim(PointSizeExponentInfo.description)]]
+        std::optional<float> pointSizeExponent;
+
+        // [[codegen::verbatim(EnableMaxSizeInfo.description)]]
+        std::optional<bool> enableMaxSize;
+
+        // [[codegen::verbatim(MaxSizeInfo.description)]]
+        std::optional<float> maxSize;
+
+        // [[codegen::verbatim(EnableOutlineInfo.description)]]
+        std::optional<bool> enableOutline;
+
+        // [[codegen::verbatim(OutlineColorInfo.description)]]
+        std::optional<glm::vec3> outlineColor;
+
+        // [[codegen::verbatim(OutlineColorInfo.description)]]
+        std::optional<float> outlineWeight;
     };
 #include "renderableorbitalkepler_codegen.cpp"
 } // namespace
@@ -157,6 +253,45 @@ documentation::Documentation RenderableOrbitalKepler::Documentation() {
     return codegen::doc<Parameters>("space_renderableorbitalkepler");
 }
 
+RenderableOrbitalKepler::Appearance::Appearance()
+    : properties::PropertyOwner({
+        "Appearance",
+        "Appearance",
+        "Appearance of RenderableOrbitalKepler"
+    })
+    , color(ColorInfo, glm::vec3(1.f), glm::vec3(0.f), glm::vec3(1.f))
+    , trailWidth(TrailWidthInfo, 2.f, 1.f, 20.f)
+    , pointSizeExponent(PointSizeExponentInfo, 1.0f, 0.f, 25.f)
+    , renderingModes(
+        RenderingModeInfo,
+        properties::OptionProperty::DisplayType::Dropdown
+    )
+    , trailFade(TrailFadeInfo, 20.f, 0.f, 30.f)
+    , enableMaxSize(EnableMaxSizeInfo, false)
+    , maxSize(MaxSizeInfo, 1.f, 0.f, 45.f)
+    , enableOutline(EnableOutlineInfo, true)
+    , outlineColor(OutlineColorInfo, glm::vec3(0.f), glm::vec3(0.f), glm::vec3(1.f))
+    , outlineWeight(OutlineWeightInfo, 0.2f, 0.f, 1.f)
+{
+    renderingModes.addOptions({
+        { RenderingModeTrail, "Trails" },
+        { RenderingModePoint, "Points" },
+        { RenderingModePointTrail , "Points+Trails" }
+    });
+
+    color.setViewOption(properties::Property::ViewOptions::Color);
+    addProperty(renderingModes);
+    addProperty(color);
+    addProperty(trailWidth);
+    addProperty(trailFade);
+    addProperty(pointSizeExponent);
+    addProperty(enableMaxSize);
+    addProperty(maxSize);
+    addProperty(enableOutline);
+    addProperty(outlineColor);
+    addProperty(outlineWeight);
+}
+
 RenderableOrbitalKepler::RenderableOrbitalKepler(const ghoul::Dictionary& dict)
     : Renderable(dict)
     , _segmentQuality(SegmentQualityInfo, 2, 1, 10)
@@ -173,9 +308,33 @@ RenderableOrbitalKepler::RenderableOrbitalKepler(const ghoul::Dictionary& dict)
     _segmentQuality.onChange([this]() { updateBuffers(); });
     addProperty(_segmentQuality);
 
-    _appearance.lineColor = p.color;
-    _appearance.lineFade = p.trailFade.value_or(20.f);
-    _appearance.lineWidth = p.lineWidth.value_or(2.f);
+    _appearance.color = p.color;
+    _appearance.trailFade = p.trailFade.value_or(_appearance.trailFade);
+    _appearance.trailWidth = p.trailWidth.value_or(_appearance.trailWidth);
+    _appearance.enableMaxSize = p.enableMaxSize.value_or(_appearance.enableMaxSize);
+    _appearance.maxSize = p.maxSize.value_or(_appearance.maxSize);
+    _appearance.enableOutline = p.enableOutline.value_or(_appearance.enableOutline);
+    _appearance.outlineColor = p.outlineColor.value_or(_appearance.outlineColor);
+    _appearance.outlineWeight = p.outlineWeight.value_or(_appearance.outlineWeight);
+    _appearance.pointSizeExponent =
+        p.pointSizeExponent.value_or(_appearance.pointSizeExponent);
+
+    if (p.renderingMode.has_value()) {
+        switch (*p.renderingMode) {
+            case Parameters::RenderingMode::Trail:
+                _appearance.renderingModes = RenderingModeTrail;
+                break;
+            case Parameters::RenderingMode::Point:
+                _appearance.renderingModes = RenderingModePoint;
+                break;
+            case Parameters::RenderingMode::PointsTrails:
+                _appearance.renderingModes = RenderingModePointTrail;
+                break;
+        }
+    }
+    else {
+        _appearance.renderingModes = RenderingModeTrail;
+    }
     addPropertySubOwner(_appearance);
 
     _path = p.path.string();
@@ -217,23 +376,59 @@ void RenderableOrbitalKepler::initializeGL() {
     glGenVertexArrays(1, &_vertexArray);
     glGenBuffers(1, &_vertexBuffer);
 
-    _programObject = SpaceModule::ProgramObjectManager.request(
-        "OrbitalKepler",
+    // Program for line rendering
+    _trailProgram = SpaceModule::ProgramObjectManager.request(
+        "OrbitalKeplerTrails",
        []() -> std::unique_ptr<ghoul::opengl::ProgramObject> {
            return global::renderEngine->buildRenderProgram(
-               "OrbitalKepler",
-               absPath("${MODULE_SPACE}/shaders/debrisViz_vs.glsl"),
-               absPath("${MODULE_SPACE}/shaders/debrisViz_fs.glsl")
+               "OrbitalKeplerTrails",
+               absPath("${MODULE_SPACE}/shaders/debrisVizTrails_vs.glsl"),
+               absPath("${MODULE_SPACE}/shaders/debrisVizTrails_fs.glsl")
            );
        }
    );
+   
+    // Program for point rendering
+    _pointProgram = SpaceModule::ProgramObjectManager.request(
+        "OrbitalKeplerPoints",
+        []() -> std::unique_ptr<ghoul::opengl::ProgramObject> {
+            return global::renderEngine->buildRenderProgram(
+                "OrbitalKeplerPoints",
+                absPath("${MODULE_SPACE}/shaders/debrisVizPoints_vs.glsl"),
+                absPath("${MODULE_SPACE}/shaders/debrisVizPoints_fs.glsl"),
+                absPath("${MODULE_SPACE}/shaders/debrisVizPoints_gs.glsl")
+            );
+        }
+    );
 
-    _uniformCache.modelView = _programObject->uniformLocation("modelViewTransform");
-    _uniformCache.projection = _programObject->uniformLocation("projectionTransform");
-    _uniformCache.lineFade = _programObject->uniformLocation("lineFade");
-    _uniformCache.inGameTime = _programObject->uniformLocation("inGameTime");
-    _uniformCache.color = _programObject->uniformLocation("color");
-    _uniformCache.opacity = _programObject->uniformLocation("opacity");
+    // Init cache for line rendering
+    _uniformTrailCache.modelView =
+        _trailProgram->uniformLocation("modelViewTransform");
+    _uniformTrailCache.projection =
+        _trailProgram->uniformLocation("projectionTransform");
+    _uniformTrailCache.trailFade = _trailProgram->uniformLocation("trailFade");
+    _uniformTrailCache.inGameTime = _trailProgram->uniformLocation("inGameTime");
+    _uniformTrailCache.color = _trailProgram->uniformLocation("color");
+    _uniformTrailCache.opacity = _trailProgram->uniformLocation("opacity");
+
+    // Init cache for point rendering
+    _uniformPointCache.modelTransform = _pointProgram->uniformLocation("modelTransform");
+    _uniformPointCache.viewTransform = _pointProgram->uniformLocation("viewTransform");
+    _uniformPointCache.cameraUpWorld = _pointProgram->uniformLocation("cameraUpWorld");
+    _uniformPointCache.inGameTime = _pointProgram->uniformLocation("inGameTime");
+    _uniformPointCache.color = _pointProgram->uniformLocation("color");
+    _uniformPointCache.enableMaxSize = _pointProgram->uniformLocation("enableMaxSize");
+    _uniformPointCache.maxSize = _pointProgram->uniformLocation("maxSize");
+    _uniformPointCache.enableOutline = _pointProgram->uniformLocation("enableOutline");
+    _uniformPointCache.outlineColor = _pointProgram->uniformLocation("outlineColor");
+    _uniformPointCache.outlineWeight = _pointProgram->uniformLocation("outlineWeight");
+    _uniformPointCache.opacity = _pointProgram->uniformLocation("opacity");
+    _uniformPointCache.projectionTransform =
+        _pointProgram->uniformLocation("projectionTransform");
+    _uniformPointCache.cameraPositionWorld =
+        _pointProgram->uniformLocation("cameraPositionWorld");
+    _uniformPointCache.pointSizeExponent =
+        _pointProgram->uniformLocation("pointSizeExponent");
 
     updateBuffers();
 }
@@ -243,16 +438,25 @@ void RenderableOrbitalKepler::deinitializeGL() {
     glDeleteVertexArrays(1, &_vertexArray);
 
     SpaceModule::ProgramObjectManager.release(
-        "OrbitalKepler",
+        "OrbitalKeplerTrails",
         [](ghoul::opengl::ProgramObject* p) {
             global::renderEngine->removeRenderProgram(p);
         }
     );
-    _programObject = nullptr;
+
+    SpaceModule::ProgramObjectManager.release(
+        "OrbitalKeplerPoints",
+        [](ghoul::opengl::ProgramObject* p) {
+            global::renderEngine->removeRenderProgram(p);
+        }
+    );
+
+    _pointProgram = nullptr;
+    _trailProgram = nullptr;
 }
 
 bool RenderableOrbitalKepler::isReady() const {
-    return _programObject != nullptr;
+    return _pointProgram != nullptr && _trailProgram != nullptr;
 }
 
 void RenderableOrbitalKepler::update(const UpdateData&) {
@@ -267,35 +471,89 @@ void RenderableOrbitalKepler::render(const RenderData& data, RendererTasks&) {
         return;
     }
 
-    _programObject->activate();
-    _programObject->setUniform(_uniformCache.opacity, opacity());
-    _programObject->setUniform(_uniformCache.inGameTime, data.time.j2000Seconds());
-
-    _programObject->setUniform(_uniformCache.modelView, calcModelViewTransform(data));
-
-    // Because we want the property to work similar to the planet trails
-    const float fade = std::pow(
-        _appearance.lineFade.maxValue() - _appearance.lineFade,
-        2.f
-    );
-
-    _programObject->setUniform(_uniformCache.projection, data.camera.projectionMatrix());
-    _programObject->setUniform(_uniformCache.color, _appearance.lineColor);
-    _programObject->setUniform(_uniformCache.lineFade, fade);
-
-    glLineWidth(_appearance.lineWidth);
-
-    //glDepthMask(false);
-    //glBlendFunc(GL_SRC_ALPHA, GL_ONE)
-
     GLint* _si = _startIndex.data();
     GLint* _ss = _segmentSize.data();
 
-    glBindVertexArray(_vertexArray);
-    glMultiDrawArrays(GL_LINE_STRIP, _si, _ss, static_cast<GLsizei>(_startIndex.size()));
-    glBindVertexArray(0);
+    const int selection = _appearance.renderingModes;
+    const bool renderPoints = (
+        selection == RenderingModePoint ||
+        selection == RenderingModePointTrail
+    );
+    const bool renderTrails = (
+        selection == RenderingModeTrail ||
+        selection == RenderingModePointTrail
+    );
 
-    _programObject->deactivate();
+    if (renderPoints) {
+        _pointProgram->activate();
+        _pointProgram->setUniform(_uniformPointCache.modelTransform,
+            calcModelTransform(data));
+        _pointProgram->setUniform(_uniformPointCache.viewTransform,
+            data.camera.combinedViewMatrix());
+        _pointProgram->setUniform(_uniformPointCache.projectionTransform,
+            data.camera.projectionMatrix());
+        _pointProgram->setUniform(_uniformPointCache.cameraPositionWorld,
+            data.camera.positionVec3());
+        _pointProgram->setUniform(_uniformPointCache.cameraUpWorld,
+            data.camera.lookUpVectorWorldSpace());
+        _pointProgram->setUniform(_uniformPointCache.inGameTime,
+            data.time.j2000Seconds());
+        _pointProgram->setUniform(_uniformPointCache.pointSizeExponent,
+            _appearance.pointSizeExponent);
+        _pointProgram->setUniform(_uniformPointCache.enableMaxSize,
+            _appearance.enableMaxSize);
+        _pointProgram->setUniform(_uniformPointCache.enableOutline,
+            _appearance.enableOutline);
+        _pointProgram->setUniform(_uniformPointCache.outlineColor,
+            _appearance.outlineColor);
+        _pointProgram->setUniform(_uniformPointCache.outlineWeight,
+            _appearance.outlineWeight);
+        _pointProgram->setUniform(_uniformPointCache.color, _appearance.color);
+        _pointProgram->setUniform(_uniformPointCache.maxSize, _appearance.maxSize);
+        _pointProgram->setUniform(_uniformPointCache.opacity, opacity());
+
+        glBindVertexArray(_vertexArray);
+        glMultiDrawArrays(
+            GL_LINE_STRIP,
+            _si,
+            _ss,
+            static_cast<GLsizei>(_startIndex.size())
+        );
+        glBindVertexArray(0);
+
+        _pointProgram->deactivate();
+    }
+
+    if (renderTrails) {
+        _trailProgram->activate();
+        _trailProgram->setUniform(_uniformTrailCache.opacity, opacity());
+        _trailProgram->setUniform(_uniformTrailCache.color, _appearance.color);
+        _trailProgram->setUniform(_uniformTrailCache.inGameTime,
+            data.time.j2000Seconds());
+        _trailProgram->setUniform(_uniformTrailCache.modelView,
+            calcModelViewTransform(data));
+        _trailProgram->setUniform(_uniformTrailCache.projection,
+            data.camera.projectionMatrix());
+
+        // Because we want the property to work similar to the planet trails
+        const float fade = pow(
+            _appearance.trailFade.maxValue() - _appearance.trailFade, 2.f
+        );
+        _trailProgram->setUniform(_uniformTrailCache.trailFade, fade);
+
+        glLineWidth(_appearance.trailWidth);
+
+        glBindVertexArray(_vertexArray);
+        glMultiDrawArrays(
+            GL_LINE_STRIP,
+            _si,
+            _ss,
+            static_cast<GLsizei>(_startIndex.size())
+        );
+        glBindVertexArray(0);
+
+        _trailProgram->deactivate();
+    }
 }
 
 void RenderableOrbitalKepler::updateBuffers() {
diff --git a/modules/space/rendering/renderableorbitalkepler.h b/modules/space/rendering/renderableorbitalkepler.h
index c3aef4d813..b7b39be55a 100644
--- a/modules/space/rendering/renderableorbitalkepler.h
+++ b/modules/space/rendering/renderableorbitalkepler.h
@@ -54,6 +54,30 @@ public:
     static documentation::Documentation Documentation();
 
 private:
+    struct Appearance : properties::PropertyOwner {
+        Appearance();
+        /// Specifies the base color of the line/point
+        properties::Vec3Property color;
+        /// Line width for the line rendering part
+        properties::FloatProperty trailWidth;
+        /// Point size exponent for the point rendering part
+        properties::FloatProperty pointSizeExponent;
+        /// The option determining which rendering method to use
+        properties::BoolProperty enableMaxSize;
+        /// The option enables or disables Max Angular Size limit
+        properties::FloatProperty maxSize;
+        /// Max angular size between vector cameraToPoint and edge of the point
+        properties::OptionProperty renderingModes;
+        /// Specifies a multiplicative factor that fades out the trail line
+        properties::FloatProperty trailFade;
+        /// Specifies if the point outline should be enabled
+        properties::BoolProperty enableOutline;
+        /// Specifies the color of the point outline
+        properties::Vec3Property outlineColor;
+        /// Specifies how much if the point should be covered by the outline
+        properties::FloatProperty outlineWeight;
+    };
+
     void updateBuffers();
 
     bool _updateDataBuffersAtNextRender = false;
@@ -80,14 +104,23 @@ private:
     GLuint _vertexArray;
     GLuint _vertexBuffer;
 
-    ghoul::opengl::ProgramObject* _programObject;
+    ghoul::opengl::ProgramObject* _trailProgram;
+    ghoul::opengl::ProgramObject* _pointProgram;
     properties::StringProperty _path;
     properties::BoolProperty _contiguousMode;
     kepler::Format _format;
-    RenderableTrail::Appearance _appearance;
+    RenderableOrbitalKepler::Appearance _appearance;
 
-    UniformCache(modelView, projection, lineFade, inGameTime, color, opacity,
-        numberOfSegments) _uniformCache;
+    // Line cache
+    UniformCache(modelView, projection, trailFade, inGameTime, color, opacity)
+        _uniformTrailCache;
+    
+    // Point cache
+    UniformCache(modelTransform, viewTransform, projectionTransform,
+        cameraPositionWorld, cameraUpWorld,  inGameTime, color,
+        pointSizeExponent, enableMaxSize, maxSize, enableOutline,
+        outlineColor, outlineWeight, opacity)
+        _uniformPointCache;
 };
 
 } // namespace openspace
diff --git a/modules/space/shaders/debrisVizPoints_fs.glsl b/modules/space/shaders/debrisVizPoints_fs.glsl
new file mode 100644
index 0000000000..51e7f339fe
--- /dev/null
+++ b/modules/space/shaders/debrisVizPoints_fs.glsl
@@ -0,0 +1,63 @@
+/*****************************************************************************************
+ *                                                                                       *
+ * OpenSpace                                                                             *
+ *                                                                                       *
+ * Copyright (c) 2014-2024                                                               *
+ *                                                                                       *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
+ * software and associated documentation files (the "Software"), to deal in the Software *
+ * without restriction, including without limitation the rights to use, copy, modify,    *
+ * merge, publish, distribute, sublicense, and/or sell copies of the Software, and to    *
+ * permit persons to whom the Software is furnished to do so, subject to the following   *
+ * conditions:                                                                           *
+ *                                                                                       *
+ * The above copyright notice and this permission notice shall be included in all copies *
+ * or substantial portions of the Software.                                              *
+ *                                                                                       *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED,   *
+ * INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A         *
+ * PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT    *
+ * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF  *
+ * CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE  *
+ * OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                                         *
+ ****************************************************************************************/
+
+#include "fragment.glsl"
+
+in float projectionViewDepth;
+in vec4 viewSpace;
+in vec2 texCoord;
+flat in int skip;
+
+uniform bool enableOutline;
+uniform vec3 outlineColor;
+uniform float outlineWeight;
+uniform vec3 color;
+uniform float opacity;
+
+Fragment getFragment() {
+  Fragment frag;
+  
+  if (skip == 1) {
+    discard;
+  }
+
+  // Only draw circle instead of entire quad
+  vec2 st = (texCoord - vec2(0.5)) * 2.0;
+  if (length(st) > 1.0) {
+    discard;
+  }
+
+  // Creates outline for circle
+  vec3 _color = color;
+  if (enableOutline && (length(st) > (1.0 - outlineWeight) && length(st) < 1.0)) {
+    _color = outlineColor;
+  }
+
+  frag.color = vec4(_color, opacity);
+  frag.depth = projectionViewDepth;
+  frag.gPosition = viewSpace;
+  frag.gNormal = vec4(0.0, 0.0, 0.0, 1.0);
+
+  return frag;
+}
diff --git a/modules/space/shaders/debrisVizPoints_gs.glsl b/modules/space/shaders/debrisVizPoints_gs.glsl
new file mode 100644
index 0000000000..c477d3b349
--- /dev/null
+++ b/modules/space/shaders/debrisVizPoints_gs.glsl
@@ -0,0 +1,145 @@
+/*****************************************************************************************
+ *                                                                                       *
+ * OpenSpace                                                                             *
+ *                                                                                       *
+ * Copyright (c) 2014-2024                                                               *
+ *                                                                                       *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
+ * software and associated documentation files (the "Software"), to deal in the Software *
+ * without restriction, including without limitation the rights to use, copy, modify,    *
+ * merge, publish, distribute, sublicense, and/or sell copies of the Software, and to    *
+ * permit persons to whom the Software is furnished to do so, subject to the following   *
+ * conditions:                                                                           *
+ *                                                                                       *
+ * The above copyright notice and this permission notice shall be included in all copies *
+ * or substantial portions of the Software.                                              *
+ *                                                                                       *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED,   *
+ * INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A         *
+ * PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT    *
+ * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF  *
+ * CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE  *
+ * OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                                         *
+ ****************************************************************************************/
+
+#version __CONTEXT__
+
+#include "PowerScaling/powerScalingMath.hglsl"
+
+layout(lines) in;
+flat in double currentRevolutionFraction[];
+flat in double vertexRevolutionFraction[];
+
+uniform dmat4 modelTransform;
+uniform dmat4 viewTransform;
+uniform mat4 projectionTransform;
+uniform dvec3 cameraPositionWorld;
+uniform dvec3 cameraUpWorld;
+uniform float pointSizeExponent;
+uniform bool enableMaxSize;
+uniform float maxSize;
+
+layout(triangle_strip, max_vertices = 4) out;
+out float projectionViewDepth;
+out vec4 viewSpace;
+out vec2 texCoord;
+flat out int skip;
+
+dvec4 dz_normalization(dvec4 dv_in) {
+  dvec4 dv_out = dv_in;
+  dv_out.z = 0;
+  return dv_out;
+}
+
+void main() {
+  skip = 0;
+  
+  double cFrac = currentRevolutionFraction[0];
+  double v0Frac = vertexRevolutionFraction[0];
+  double v1Frac = vertexRevolutionFraction[1];
+  if (cFrac >= v0Frac && cFrac <= v1Frac) {
+
+    // Interpolate position of point
+    double dFrac = abs(cFrac - v0Frac);
+    double vFrac = abs(v1Frac - v0Frac);
+    double percentage = dFrac / vFrac;
+
+    dvec4 v0Weighted = (1.0 - percentage) * gl_in[0].gl_Position;
+    dvec4 v1Weighted = (percentage) * gl_in[1].gl_Position;
+
+    dvec4 pos = v0Weighted + v1Weighted;
+    // ==========================
+
+    // Calculate current vertex position to world space
+    dvec4 vertPosWorldSpace = modelTransform * pos;
+
+    // Calculate new axis for plane
+    dvec3 normal = normalize(cameraPositionWorld - vertPosWorldSpace.xyz);
+    dvec3 right = normalize(cross(cameraUpWorld, normal));
+    dvec3 up = normalize(cross(normal, right));
+
+    // Calculate size of points
+    double initialSize = pow(10.0, pointSizeExponent);
+    right *= initialSize;
+    up *= initialSize;
+
+    double opp = length(right);
+    double adj = length(cameraPositionWorld.xyz - vertPosWorldSpace.xyz);
+    float angle = atan(float(opp/adj));
+    float maxAngle = radians(maxSize * 0.5);
+
+    // Controls the point size
+    if (enableMaxSize && (angle > maxAngle) && (adj > 0.0)) {
+      double correction = (adj * tan(maxAngle)) / opp;
+      right *= correction;
+      up *= correction;
+    }
+
+    // Calculate and set corners of the quad
+    dvec4 p0World = vertPosWorldSpace + (dvec4(up-right, 0.0));
+    dvec4 p1World = vertPosWorldSpace + (dvec4(-right-up,0.0));
+    dvec4 p2World = vertPosWorldSpace + (dvec4(right+up, 0.0));
+    dvec4 p3World = vertPosWorldSpace + (dvec4(right-up, 0.0));
+
+    dmat4 ViewProjectionTransform = dmat4(projectionTransform) * viewTransform;
+
+    // Set some additional out parameters
+    viewSpace = z_normalization(
+      vec4(projectionTransform * viewTransform * modelTransform * pos)
+    );
+    projectionViewDepth = viewSpace.w;
+
+    //left-top
+    vec4 p0Screen = vec4(dz_normalization(ViewProjectionTransform * p0World));
+    gl_Position = p0Screen;
+    texCoord = vec2(0.0, 0.0);
+    EmitVertex();
+
+    //left-bot
+    vec4 p1Screen = vec4(dz_normalization(ViewProjectionTransform * p1World));
+    gl_Position = p1Screen;
+    texCoord = vec2(1.0, 0.0);
+    EmitVertex();
+
+    //right-top
+    vec4 p2Screen = vec4(dz_normalization(ViewProjectionTransform * p2World));
+    gl_Position = p2Screen;
+    texCoord = vec2(0.0, 1.0);
+    EmitVertex();
+
+    //right-bot
+    vec4 p3Screen = vec4(dz_normalization(ViewProjectionTransform * p3World));
+    gl_Position = p3Screen;
+    texCoord = vec2(1.0, 1.0);
+    EmitVertex();
+    
+    // Primitive
+    EndPrimitive();
+
+  } 
+  else {
+    skip = 1;
+    EmitVertex();
+    EndPrimitive();
+  }
+}
diff --git a/modules/space/shaders/debrisVizPoints_vs.glsl b/modules/space/shaders/debrisVizPoints_vs.glsl
new file mode 100644
index 0000000000..4d0c23ac5b
--- /dev/null
+++ b/modules/space/shaders/debrisVizPoints_vs.glsl
@@ -0,0 +1,48 @@
+/*****************************************************************************************
+ *                                                                                       *
+ * OpenSpace                                                                             *
+ *                                                                                       *
+ * Copyright (c) 2014-2024                                                               *
+ *                                                                                       *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
+ * software and associated documentation files (the "Software"), to deal in the Software *
+ * without restriction, including without limitation the rights to use, copy, modify,    *
+ * merge, publish, distribute, sublicense, and/or sell copies of the Software, and to    *
+ * permit persons to whom the Software is furnished to do so, subject to the following   *
+ * conditions:                                                                           *
+ *                                                                                       *
+ * The above copyright notice and this permission notice shall be included in all copies *
+ * or substantial portions of the Software.                                              *
+ *                                                                                       *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED,   *
+ * INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A         *
+ * PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT    *
+ * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF  *
+ * CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE  *
+ * OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                                         *
+ ****************************************************************************************/
+
+#version __CONTEXT__
+
+layout (location = 0) in vec4 vertexData; // 1: x, 2: y, 3: z, 4: timeOffset,
+layout (location = 1) in vec2 orbitData; // 1: epoch, 2: period
+
+uniform double inGameTime;
+uniform dmat4 modelTransform;
+
+flat out double currentRevolutionFraction;
+flat out double vertexRevolutionFraction;
+
+void main() {
+  float epoch = orbitData.x;
+  float period = orbitData.y;
+  double numOfRevolutions = (inGameTime - epoch) / period;
+
+  vertexRevolutionFraction = vertexData.w / period;
+  currentRevolutionFraction = numOfRevolutions - double(int(numOfRevolutions));
+  if (currentRevolutionFraction < 0.0) {
+    currentRevolutionFraction += 1.0;
+  }
+
+  gl_Position = vec4(vertexData.xyz, 1.0);
+}
diff --git a/modules/space/shaders/debrisViz_fs.glsl b/modules/space/shaders/debrisVizTrails_fs.glsl
similarity index 90%
rename from modules/space/shaders/debrisViz_fs.glsl
rename to modules/space/shaders/debrisVizTrails_fs.glsl
index 590794c5a6..39e7af9289 100644
--- a/modules/space/shaders/debrisViz_fs.glsl
+++ b/modules/space/shaders/debrisVizTrails_fs.glsl
@@ -31,10 +31,18 @@ in float offsetPeriods;
 
 uniform vec3 color;
 uniform float opacity = 1.0;
-uniform float lineFade;
+uniform float trailFade;
 
+/// Different modes - sync with renderableorbitalkepler.cpp
+// RenderingModeLines = 0
+// RenderingModePoint = 1
 
 Fragment getFragment() {
+  Fragment frag;
+
+  float invert = 1.0;
+  float fade = 1.0;
+
   // float offsetPeriods = offset / period;
   // This is now done in the fragment shader instead to make smooth movement between
   // vertices. We want vertexDistance to be double up to this point, I think, (hence the
@@ -46,26 +54,23 @@ Fragment getFragment() {
   // float vertexID_perOrbit = mod(vertexID_f, numberOfSegments);
   // float nrOfSegments_f = float(numberOfSegments);
   // float vertexDistance = periodFraction - (vertexID_perOrbit/nrOfSegments_f);
-
   if (vertexDistance < 0.0) {
     vertexDistance += 1.0;
   }
 
-  float invert = pow((1.0 - vertexDistance), lineFade);
-  float fade = clamp(invert, 0.0, 1.0);
+  invert = pow((1.0 - vertexDistance), trailFade);  
+  fade = clamp(invert, 0.0, 1.0);
 
   // Currently even fully transparent lines can occlude other lines, thus we discard these
   // fragments since debris and satellites are rendered so close to each other
   if (fade < 0.05) {
     discard;
   }
-
-  Fragment frag;
+  
+  // Use additive blending for some values to make the discarding less abrupt
   if (fade < 0.15) {
-    // Use additive blending for some values to make the discarding less abrupt
     frag.blend = BLEND_MODE_ADDITIVE;
   }
-
   frag.color = vec4(color, fade * opacity);
   frag.depth = viewSpaceDepth;
   frag.gPosition = viewSpacePosition;
diff --git a/modules/space/shaders/debrisViz_vs.glsl b/modules/space/shaders/debrisVizTrails_vs.glsl
similarity index 98%
rename from modules/space/shaders/debrisViz_vs.glsl
rename to modules/space/shaders/debrisVizTrails_vs.glsl
index b66d821850..472be3ca12 100644
--- a/modules/space/shaders/debrisViz_vs.glsl
+++ b/modules/space/shaders/debrisVizTrails_vs.glsl
@@ -40,7 +40,7 @@ uniform double inGameTime;
 
 
 void main() {
-  // The way the position and line fade is calculated is:
+  // The way the position and trail fade is calculated is:
   // By using inGameTime, epoch and period of this orbit, we get how many revolutions it
   // has done since epoch. The fract of that, is how far into a revolution it has traveled
   // since epoch. Similarly we do the same but for this vertex, but calculating

From caea263090268f88e484da49217ab9132f0f035e Mon Sep 17 00:00:00 2001
From: Ylva Selling <ylva.selling@liu.se>
Date: Fri, 19 Apr 2024 17:20:53 +0200
Subject: [PATCH 401/701] Update GUI hash

---
 data/assets/util/webgui.asset | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/data/assets/util/webgui.asset b/data/assets/util/webgui.asset
index 97243e803e..17bfa0f10d 100644
--- a/data/assets/util/webgui.asset
+++ b/data/assets/util/webgui.asset
@@ -4,7 +4,7 @@ local guiCustomization = asset.require("customization/gui")
 
 
 -- Select which commit hashes to use for the frontend and backend
-local frontendHash = "c6ed5469319f922c64319298ef8daef0970f8d55"
+local frontendHash = "44fbbc001baedfe7d1a39d94e4a01d3e217e1b8d"
 
 local frontend = asset.resource({
   Identifier = "WebGuiFrontend",

From f5d68cbd5e12fe24da3c6a24c1b1386762bd691a Mon Sep 17 00:00:00 2001
From: Emma Broman <emma.broman@liu.se>
Date: Fri, 19 Apr 2024 17:48:28 +0200
Subject: [PATCH 402/701] Issue/3070 - Outline/border to textured points
 (#3191)

* Add option for outline styles (round, square, bottom)
* Apply color map to point borders
---
 .../pointcloud/renderablepointcloud.cpp       | 78 ++++++++++++++++---
 .../pointcloud/renderablepointcloud.h         |  4 +-
 .../shaders/pointcloud/pointcloud_fs.glsl     | 48 ++++++++++--
 3 files changed, 113 insertions(+), 17 deletions(-)

diff --git a/modules/base/rendering/pointcloud/renderablepointcloud.cpp b/modules/base/rendering/pointcloud/renderablepointcloud.cpp
index 861b2edb4e..96df080718 100644
--- a/modules/base/rendering/pointcloud/renderablepointcloud.cpp
+++ b/modules/base/rendering/pointcloud/renderablepointcloud.cpp
@@ -58,7 +58,7 @@
 namespace {
     constexpr std::string_view _loggerCat = "RenderablePointCloud";
 
-    constexpr std::array<const char*, 35> UniformNames = {
+    constexpr std::array<const char*, 37> UniformNames = {
         "cameraViewMatrix", "projectionMatrix", "modelMatrix", "cameraPosition",
         "cameraLookUp", "renderOption", "maxAngularSize", "color", "opacity",
         "scaleExponent", "scaleFactor", "up", "right", "fadeInValue", "hasSpriteTexture",
@@ -66,7 +66,8 @@ namespace {
         "nanColor", "useNanColor", "hideOutsideRange", "enableMaxSizeControl",
         "aboveRangeColor", "useAboveRangeColor", "belowRangeColor", "useBelowRangeColor",
         "hasDvarScaling", "dvarScaleFactor", "enableOutline", "outlineColor",
-        "outlineWeight", "aspectRatioScale", "useOrientationData"
+        "outlineWeight", "outlineStyle", "useCmapOutline", "aspectRatioScale",
+        "useOrientationData"
     };
 
     enum RenderOption {
@@ -75,6 +76,12 @@ namespace {
         FixedRotation
     };
 
+    enum OutlineStyle {
+        Round = 0,
+        Square,
+        Bottom
+    };
+
     constexpr openspace::properties::Property::PropertyInfo TextureEnabledInfo = {
         "Enabled",
         "Enabled",
@@ -318,6 +325,23 @@ namespace {
         openspace::properties::Property::Visibility::AdvancedUser
     };
 
+    constexpr openspace::properties::Property::PropertyInfo OutlineStyleInfo = {
+        "OutlineStyle",
+        "Outline Style",
+        "This setting decides the shape of points that have an outline (round, square, "
+        "or lust a line at the bottom). Note that anything but \"Round\" will lead to "
+        "the point being drawed as squares.",
+        openspace::properties::Property::Visibility::AdvancedUser
+    };
+
+    constexpr openspace::properties::Property::PropertyInfo ApplyColorMapToOutlineInfo = {
+        "ApplyColorMapToOutline",
+        "Apply Color Map to Outline",
+        "If true and the outline is enabled, the color map will be applied to the "
+        "outline rather than the point body. Only works if color mapping is enabled.",
+        openspace::properties::Property::Visibility::AdvancedUser
+    };
+
     // A RenderablePointCloud can be used to render point-based datasets in 3D space,
     // optionally including color mapping, a sprite texture and labels. There are several
     // properties that affect the visuals of the points, such as settings for scaling,
@@ -462,6 +486,17 @@ namespace {
 
             // [[codegen::verbatim(OutlineColorInfo.description)]]
             std::optional<float> outlineWeight;
+
+            enum class [[codegen::map(OutlineStyle)]] OutlineStyle {
+                Round,
+                Square,
+                Bottom
+            };
+            // [[codegen::verbatim(OutlineStyleInfo.description)]]
+            std::optional<OutlineStyle> outlineStyle;
+
+            // [[codegen::verbatim(ApplyColorMapToOutlineInfo.description)]]
+            std::optional<bool> applyColorMapToOutline;
         };
         // Settings related to the coloring of the points, such as a fixed color,
         // color map, etc.
@@ -532,9 +567,29 @@ RenderablePointCloud::ColorSettings::ColorSettings(const ghoul::Dictionary& dict
     , enableOutline(EnableOutlineInfo, false)
     , outlineColor(OutlineColorInfo, glm::vec3(0.23f), glm::vec3(0.f), glm::vec3(1.f))
     , outlineWeight(OutlineWeightInfo, 0.2f, 0.f, 1.f)
+    , outlineStyle(OutlineStyleInfo)
+    , applyCmapToOutline(ApplyColorMapToOutlineInfo, false)
 {
     const Parameters p = codegen::bake<Parameters>(dictionary);
 
+    pointColor.setViewOption(properties::Property::ViewOptions::Color);
+    addProperty(pointColor);
+
+    addProperty(enableOutline);
+
+    outlineColor.setViewOption(properties::Property::ViewOptions::Color);
+    addProperty(outlineColor);
+
+    addProperty(outlineWeight);
+
+    outlineStyle.addOption(OutlineStyle::Round, "Round");
+    outlineStyle.addOption(OutlineStyle::Square, "Square");
+    outlineStyle.addOption(OutlineStyle::Bottom, "Bottom");
+    outlineStyle = OutlineStyle::Round;
+    addProperty(outlineStyle);
+
+    addProperty(applyCmapToOutline);
+
     const bool hasColoring = p.coloring.has_value();
     if (hasColoring) {
         const Parameters::ColorSettings settings = *p.coloring;
@@ -550,16 +605,15 @@ RenderablePointCloud::ColorSettings::ColorSettings(const ghoul::Dictionary& dict
         enableOutline = p.coloring->enableOutline.value_or(enableOutline);
         outlineColor = p.coloring->outlineColor.value_or(outlineColor);
         outlineWeight = p.coloring->outlineWeight.value_or(outlineWeight);
+
+        if (p.coloring->outlineStyle.has_value()) {
+            outlineStyle = codegen::map<OutlineStyle>(*p.coloring->outlineStyle);
+        }
+
+        applyCmapToOutline = p.coloring->applyColorMapToOutline.value_or(
+            applyCmapToOutline
+        );
     }
-    pointColor.setViewOption(properties::Property::ViewOptions::Color);
-    addProperty(pointColor);
-
-    addProperty(enableOutline);
-
-    outlineColor.setViewOption(properties::Property::ViewOptions::Color);
-    addProperty(outlineColor);
-
-    addProperty(outlineWeight);
 }
 
 RenderablePointCloud::Texture::Texture()
@@ -1211,6 +1265,8 @@ void RenderablePointCloud::renderPoints(const RenderData& data,
     _program->setUniform(_uniformCache.enableOutline, _colorSettings.enableOutline);
     _program->setUniform(_uniformCache.outlineColor, _colorSettings.outlineColor);
     _program->setUniform(_uniformCache.outlineWeight, _colorSettings.outlineWeight);
+    _program->setUniform(_uniformCache.outlineStyle, _colorSettings.outlineStyle);
+    _program->setUniform(_uniformCache.useCmapOutline, _colorSettings.applyCmapToOutline);
 
     bool useColorMap = hasColorData() && _colorSettings.colorMapping->enabled &&
         _colorSettings.colorMapping->texture();
diff --git a/modules/base/rendering/pointcloud/renderablepointcloud.h b/modules/base/rendering/pointcloud/renderablepointcloud.h
index 6051d66e67..d0aed60b73 100644
--- a/modules/base/rendering/pointcloud/renderablepointcloud.h
+++ b/modules/base/rendering/pointcloud/renderablepointcloud.h
@@ -190,6 +190,8 @@ protected:
         properties::BoolProperty enableOutline;
         properties::Vec3Property outlineColor;
         properties::FloatProperty outlineWeight;
+        properties::OptionProperty outlineStyle;
+        properties::BoolProperty applyCmapToOutline;
     };
     ColorSettings _colorSettings;
 
@@ -231,7 +233,7 @@ protected:
         cmapRangeMin, cmapRangeMax, nanColor, useNanColor, hideOutsideRange,
         enableMaxSizeControl, aboveRangeColor, useAboveRangeColor, belowRangeColor,
         useBelowRangeColor, hasDvarScaling, dvarScaleFactor, enableOutline, outlineColor,
-        outlineWeight, aspectRatioScale, useOrientationData
+        outlineWeight, outlineStyle, useCmapOutline, aspectRatioScale, useOrientationData
     ) _uniformCache;
 
     std::filesystem::path _dataFile;
diff --git a/modules/base/shaders/pointcloud/pointcloud_fs.glsl b/modules/base/shaders/pointcloud/pointcloud_fs.glsl
index ee160705f1..af975b08ab 100644
--- a/modules/base/shaders/pointcloud/pointcloud_fs.glsl
+++ b/modules/base/shaders/pointcloud/pointcloud_fs.glsl
@@ -56,6 +56,13 @@ uniform float outlineWeight;
 
 uniform float fadeInValue;
 
+uniform bool useCmapOutline;
+uniform int outlineStyle;
+
+const int OutlineStyleRound = 0;
+const int OutlineStyleSquare = 1;
+const int OutlineStyleBottom = 2;
+
 vec4 sampleColorMap(float dataValue) {
     if (useNanColor && isnan(dataValue)) {
         return nanColor;
@@ -85,21 +92,52 @@ Fragment getFragment() {
   }
 
   // Moving the origin to the center and calculating the length
-  float lengthFromCenter = length((texCoord - vec2(0.5)) * 2.0);
-  if (!hasSpriteTexture && (lengthFromCenter > 1.0)) {
+  vec2 centeredTexCoords = (texCoord - vec2(0.5)) * 2.0;
+  float lengthFromCenter = length(centeredTexCoords);
+
+  bool shouldBeRound = (!hasSpriteTexture && !enableOutline) ||
+    (enableOutline && outlineStyle == OutlineStyleRound);
+
+  if (shouldBeRound && (lengthFromCenter > 1.0)) {
     discard;
   }
 
   vec4 fullColor = vec4(color, 1.0);
+  vec4 cmapColor = vec4(1.0);
   if (useColorMap) {
-    fullColor = sampleColorMap(gs_colorParameter);
+    cmapColor = sampleColorMap(gs_colorParameter);
+    if (!useCmapOutline) {
+      fullColor = cmapColor;
+    }
   }
 
+  vec4 textureColor = vec4(1.0);
   if (hasSpriteTexture) {
     fullColor *= texture(spriteTexture, vec3(texCoord, layer));
   }
-  else if (enableOutline && (lengthFromCenter > (1.0 - outlineWeight))) {
-    fullColor.rgb = outlineColor;
+
+  // Border
+  if (enableOutline) {
+    bool pixelIsOutline = false;
+    if (outlineStyle == OutlineStyleRound) {
+      pixelIsOutline = lengthFromCenter > (1.0 - outlineWeight);
+    }
+    else if (outlineStyle == OutlineStyleSquare) {
+      bool isOutsideY = abs(centeredTexCoords.y) > (1.0 - outlineWeight);
+      bool isOutsideX = abs(centeredTexCoords.x) > (1.0 - outlineWeight);
+      pixelIsOutline = isOutsideY || isOutsideX;
+    }
+    else if (outlineStyle == OutlineStyleBottom) {
+      pixelIsOutline = texCoord.y < 0.5 * outlineWeight;
+    }
+
+    if (pixelIsOutline) {
+      vec4 theOutlineColor = vec4(outlineColor, 1.0);
+      if (useColorMap && useCmapOutline) {
+        theOutlineColor = cmapColor;
+      }
+      fullColor = theOutlineColor;
+    }
   }
 
   fullColor.a *= opacity * fadeInValue;

From c5f9044c55d6561f7f51365a32ad7ab63c27ca4b Mon Sep 17 00:00:00 2001
From: Alexander Bock <alexander.bock@liu.se>
Date: Fri, 19 Apr 2024 17:50:20 +0200
Subject: [PATCH 403/701] Updating the mailmap file

---
 .mailmap   | 106 ++++++++++++++++++++++++++++++++++++++++++++---------
 CREDITS.md |  20 +++++-----
 2 files changed, 99 insertions(+), 27 deletions(-)

diff --git a/.mailmap b/.mailmap
index fb93aab2ef..d7ab0d7d56 100644
--- a/.mailmap
+++ b/.mailmap
@@ -1,37 +1,61 @@
 Adam Rohdin <adam.rohdin@outlook.com> <adam.rohdin@liu.se>
 Adam Rohdin <adam.rohdin@outlook.com> Arohdin <adam.rohdin@liu.se>
 Adam Rohdin <adam.rohdin@outlook.com> Arohdin <adam.rohdin@visualiseringscenter.se>
+Adam Rohdin <adam.rohdin@outlook.com> Arohdin <adam.rohdin@outlook.com>
+
+Agnes Heppich <agnhe421@student.liu.se> Agnes <agnhe421@student.liu.se>
+
+Alex Bergman <bergman.alex@gmail.com> Alex <bergman.alex@gmail.com>
 
 Alexander Bock <mail@alexanderbock.eu> <alexander.bock@liu.se>
 Alexander Bock <mail@alexanderbock.eu> <alexander.bock@me.com>
 
+Andreas Engberg <adde.engberg@gmail.com> <adde.engberg@gmal.com>
+Andreas Engberg <adde.engberg@gmail.com> <48772850+engbergandreas@users.noreply.github.com>
+
+Anders Lundkvist <lundkvistarn@live.se> Lundkvist <alundkvi@ndc.nasa.gov>
+Anders Lundkvist <lundkvistarn@live.se> lundkvistarn <lundkvistarn@live.se>
+
 Anton Arbring <antar420@student.liu.se> antar420 <antar420@student.liu.se>
 
+Axel Kollberg <skollber@ndc.nasa.gov> Kollberg <bollbergo@gmail.com>
+
+Caroline Gard <caroline.gard@hotmail.com> carolinegard <caroline.gard@hotmail.com>
+Caroline Gard <caroline.gard@hotmail.com> CarolineGard <caroline.gard@hotmail.com>
+
+Chris Paulusson <chrispaulusson@gmail.com> Christoffer Paulusson <chrpa821@student.liu.se>
+
 Elon Olsson <olssonelon@gmail.com> Elon <olssonelon@gmail.com>
 Elon Olsson <olssonelon@gmail.com> ElonOlsson <olssonelon@gmail.com>
 Elon Olsson <olssonelon@gmail.com> OLSSON <eolsson@ndc.nasa.gov>
 
-Emil Axelsson <nils.emil.axelsson@gmail.com> <mail@emilaxelsson.se>
-Emil Axelsson <nils.emil.axelsson@gmail.com> = <emil.axelsson@liu.se>
-Emil Axelsson <nils.emil.axelsson@gmail.com> <emiax775@student.liu.se>
-Emil Axelsson <nils.emil.axelsson@gmail.com> <emil@Emils-MBP.lan>
+Emil Axelsson <emil.axelsson@liu.se> <mail@emilaxelsson.se>
+Emil Axelsson <emil.axelsson@liu.se> = <emil.axelsson@liu.se>
+Emil Axelsson <emil.axelsson@liu.se> <emiax775@student.liu.se>
+Emil Axelsson <emil.axelsson@liu.se> <emil@Emils-MBP.lan>
+Emil Axelsson <emil.axelsson@liu.se> <nils.emil.axelsson@gmail.com>
 
 Emilie Ho <emeliewho@gmail.com> Emilie <emeliewho@gmail.com>
 
 Emma Broman <emmabroman740@gmail.com> <emma95.broman@hotmail.com>
-Emma Broman <emmabroman740@gmail.com> <emma.broman@liu.se> 
+Emma Broman <emmabroman740@gmail.com> <emma.broman@liu.se>
 Emma Broman <emmabroman740@gmail.com> <emmbr740@student.liu.se>
 
+Emma Segolsson <emma.segolsson@outlook.com> emmasegolsson <emma.segolsson@outlook.com>
+Emma Segolsson <emma.segolsson@outlook.com> <emmasegolsson@live.com>
+
 Eric Myers <EricMyers47@gmail.com> <myers@EricMyers.com>
 
 Erik Broberg <erikbroberg90@gmail.com> <Erik Broberg>
 Erik Broberg <erikbroberg90@gmail.com> nusic <erikbroberg90@gmail.com>
 
+Erik Salsborn <erik.salsborn@hotmail.com> eriksalsborn <erik.salsborn@hotmail.com>
+
 Erik Sunden <eriksunden85@gmail.com> eriksunden <eriksunden85@gmail.com>
 Erik Sunden <eriksunden85@gmail.com> eriksunden <eriksunden@users.noreply.github.com>
 
-Gene Payne <payne.gene@gmail.com> GPayne <payne.gene@gmail.com> 
-Gene Payne <payne.gene@gmail.com> <gpayne@c-67-216.eduroam.liu.se> 
+Gene Payne <payne.gene@gmail.com> GPayne <payne.gene@gmail.com>
+Gene Payne <payne.gene@gmail.com> <gpayne@c-67-216.eduroam.liu.se>
 Gene Payne <payne.gene@gmail.com> <gpayne@dhcp19217.sci.utah.edu>
 
 Hans-Christian Helltegen <hanhe945@student.liu.se> HC Helltegen <hanhe945@student.liu.se>
@@ -40,10 +64,21 @@ Hans-Christian Helltegen <hanhe945@student.liu.se> <hhellteg@gs674-ccmcviz2.gsfc
 Ingela Rossing <pringela@gmail.com> Lingis <pringela@gmail.com>
 Ingela Rossing <pringela@gmail.com> unknown <pringela@gmail.com>
 
+Jacob Molin <jacob.cb.molin@gmail.com> JACOB MOLIN <jacob.cb.molin@gmail.com>
+Jacob Molin <jacob.cb.molin@gmail.com> Jacob Molin <34372356+jacobmolin@users.noreply.github.com>
+
 Joakim Kilby <jockekilby@gmail.com> <joakim.kilby@liu.se>
 
+Johanna Granström <johanna.granstrom@gmail.com> johannagranstrom <johanna.granstrom@gmail.com>
+Johanna Granström <johanna.granstrom@gmail.com> Johann Granström <johanna.granstrom@gmail.com>
+Johanna Granström <johanna.granstrom@gmail.com> johannagranstroem <johanna.granstrom@gmail.com>
+Johanna Granström <johanna.granstrom@gmail.com> <johanna.granstrom@gmail.com>
+
 Jonas Strandstedt <jonas.strandstedt@gmail.com> jonasstrandstedt <jonas.strandstedt@gmail.com>
 
+Jonathan Grangien <jonathan.grangien@gmail.com> jon-grangien <jonathan.grangien@gmail.com>
+Jonathan Grangien <jonathan.grangien@gmail.com> codingInSpace <jonathan.grangien@gmail.com>
+
 Jonathas Costa <jon.costa@gmail.com> <jon.costa@gmailcom>
 
 Kalle Bladin <kallebladin@gmail.com> kalbl <kallebladin@gmail.com>
@@ -51,13 +86,23 @@ Kalle Bladin <kallebladin@gmail.com> Kalle <kallebladin@gmail.com>
 Kalle Bladin <kallebladin@gmail.com> kbladin <kallebladin@gmail.com>
 Kalle Bladin <kallebladin@gmail.com> Karl Bladin <Karl Bladin>
 
-Karin Reidarman <karin_lr@hotmail.com> KarRei <karin_lr@hotmail.com> 
+Karin Reidarman <karin_lr@hotmail.com> KarRei <karin_lr@hotmail.com>
+
+Kristin Back <kristin.s.back@gmail.com> kristinbackgit config --global user.name kristinback <kristin.s.back@gmail.com>
+Kristin Back <kristin.s.back@gmail.com> kristinback <kristin.s.back@gmail.com>
 
 Lovisa Hassler <lovisa.hassler@liu.se> liuloppan <lovisa.hassler@liu.se>
 Lovisa Hassler <lovisa.hassler@liu.se> <lovha71@liu.se>
 Lovisa Hassler <lovisa.hassler@liu.se> Your Name <you@example.com>
+Lovisa Hassler <lovisa.hassler@liu.se> <lovha997@student.liu.se>
+Lovisa Hassler <lovisa.hassler@liu.se> <lovisa.hassler@gmil.com>
 
 Malin Ejdbo <malin.ejdbo@gmail.com> Malin E <malin.ejdbo@gmail.com>
+Malin Ejdbo <malin.ejdbo@gmail.com> Malin <malin.ejdbo@gmail.com>
+Malin Ejdbo <malin.ejdbo@gmail.com> <16215103+Roxeena@users.noreply.github.com>
+
+Mathis Brossier <mathis.brossier@universite-paris-saclay.fr> mathis <mathis.brossier@universite-paris-saclay.fr>
+Mathis Brossier <mathis.brossier@universite-paris-saclay.fr> <mathis.brossier@gmail.com>
 
 Matthew Territo <github@mterrito.com> <territo-sci@users.noreply.github.com>
 Matthew Territo <github@mterrito.com> <wundahful@users.noreply.github.com>
@@ -66,19 +111,46 @@ Matthew Territo <github@mterrito.com> <wundahful@d>
 Matthew Territo <github@mterrito.com> wundahlful <github@mterrito.com>
 Matthew Territo <github@mterrito.com> wundahful <wundahful@no-reply.github.com>
 Matthew Territo <github@mterrito.com> <mterrito@WundahfulMacBook-2.local>
+Matthew Territo <github@mterrito.com> <territo@sci.utah.edu>
 
-Micah Acinapura <micahnyc@gmail.com> <micahnyc@nyu.edu> 
-Micah Acinapura <micahnyc@gmail.com> micahnyc <micahnyc@gmail.com> 
-Micah Acinapura <micahnyc@gmail.com> Micah <micahnyc@gmail.com> 
-Micah Acinapura <micahnyc@gmail.com> Micah <micah@Opens-MacBook-Pro.local> 
+Matthias Berg <matthias.berg@live.se> <mberg@gsfc674-ccmcviz.ndc.nasa.gov>
+Matthias Berg <matthias.berg@live.se> farbrorberg <matthias.berg@live.se>
+Matthias Berg <matthias.berg@live.se> Berg <gberg2@ndc.nasa.gov>
+
+Micah Acinapura <micahnyc@gmail.com> <micahnyc@nyu.edu>
+Micah Acinapura <micahnyc@gmail.com> micahnyc <micahnyc@gmail.com>
+Micah Acinapura <micahnyc@gmail.com> Micah <micahnyc@gmail.com>
+Micah Acinapura <micahnyc@gmail.com> Micah <micah@Opens-MacBook-Pro.local>
 
 Michal Marcinkowski <michal.j.marcinkowski@gmail.com> michal <michal.j.marcinkowski@gmail.com>
 
+Michael Novén <michael.f.noven@gmail.com> novalain <michael.f.noven@gmail.com>
+
+Michael Sjöström <micke_moj@hotmail.com> MichaelSjostrom <micke_moj@hotmail.com>
+
+Mikael Pettersson <mikael.pettersson@liu.se> Mikael <mikael.pettersson@liu.se>
+
+Nisse Bergman <nibe91@gmail.com> nissebergman <nibe91@gmail.com>
+
+Oskar Carlbaum <oskarcarlbaum@gmail.com> Carlbaum <oskarcarlbaum@gmail.com>
+
+Rickard Lindstedt <rickard.lindstedt@gmail.com> Rickard Lindstedt <rickard.lindstedt@gmail.com>
+
+Robin Skånberg <scanberg@gmail.com> scanberg <scanberg@gmail.com>
+Robin Skånberg <scanberg@gmail.com> <robin.skanberg@liu.se>
+
 Sebastian Piwell <sebastian.piwell@gmail.com> piwell <sebastian.piwell@gmail.com>
 
-Stefan Seibert <mail@stefanseibert.com> <stefan.seibert@liu.se>
+Simon Brefält <simbr615@student.liu.se> Simon <simbr615@student.liu.se>
 
-Ylva Selling <ylva.selling@gmail.com> <ylvse560@student.liu.se> 
-Ylva Selling <ylva.selling@gmail.com> <ys5140@nyu.edu>
-Ylva Selling <ylva.selling@gmail.com> ENG-VIDAVIZ-0\ylvas <ylva.selling@gmail.com>
-Ylva Selling <ylva.selling@gmail.com> sylvass <ylva.selling@gmail.com>
+Stefan Seibert <mail@stefanseibert.com> <stefan.seibert@liu.se>
+Stefan Seibert <mail@stefanseibert.com> stefanseibert <mail@stefanseibert.com>
+
+Victor Lindquist <victor.lindquist@outlook.com> VLLindqvist <victor.lindquist@outlook.com>
+Victor Lindquist <victor.lindquist@outlook.com> <VLLindqvist@users.noreply.github.com>
+
+Ylva Selling <ylva.selling@liu.se> <ylva.selling@gmail.com>
+Ylva Selling <ylva.selling@liu.se> <ylvse560@student.liu.se>
+Ylva Selling <ylva.selling@liu.se> <ys5140@nyu.edu>
+Ylva Selling <ylva.selling@liu.se> ENG-VIDAVIZ-0\ylvas <ylva.selling@gmail.com>
+Ylva Selling <ylva.selling@liu.se> sylvass <ylva.selling@gmail.com>
diff --git a/CREDITS.md b/CREDITS.md
index 91d3244a00..b3a6cb1f93 100644
--- a/CREDITS.md
+++ b/CREDITS.md
@@ -2,21 +2,21 @@
 Alexander Bock
 Emma Broman
 Malin Ejdbo
+Ylva Selling
 Gene Payne
+Elon Olsson
+Micah Acinapura
+Joakim Kilby
+Adam Rohdin
+Andreas Engberg
+Megan Villa
+
+
+Jonathas Costa
 Emil Axelsson
 Kalle Bladin
-Jonathas Costa
-Ylva Selling
-Micah Acinapura
-Elon Olsson
 Jonas Strandstedt
 Michal Marcinkowski
-Adam Rohdin
-Joakim Kilby
 Lovisa Hassler
-Mikael Petterson
-Erik Sundén
-Stefan Lindblad
-Megan Villa
 Corrie Roe
 Eric Myers

From cbca89e0985b3fedef686e8cfd83313dc40f7090 Mon Sep 17 00:00:00 2001
From: Alexander Bock <alexander.bock@liu.se>
Date: Fri, 19 Apr 2024 18:29:51 +0200
Subject: [PATCH 404/701] Prevent crash when trying to load a cluster
 configuration when not being part of the cluster

---
 CMakeLists.txt               | 2 +-
 apps/OpenSpace/ext/sgct      | 2 +-
 src/rendering/luaconsole.cpp | 4 ++++
 3 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 6c2c22a0b7..ae544a4837 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -30,7 +30,7 @@ project(OpenSpace)
 set(OPENSPACE_VERSION_MAJOR 0)
 set(OPENSPACE_VERSION_MINOR 20)
 set(OPENSPACE_VERSION_PATCH 0)
-set(OPENSPACE_VERSION_STRING "<dev>")
+set(OPENSPACE_VERSION_STRING "rc-1")
 
 include(${PROJECT_SOURCE_DIR}/support/cmake/module_common.cmake)
 include(${PROJECT_SOURCE_DIR}/ext/ghoul/support/cmake/message_macros.cmake)
diff --git a/apps/OpenSpace/ext/sgct b/apps/OpenSpace/ext/sgct
index 1be7e65ef1..afed86f624 160000
--- a/apps/OpenSpace/ext/sgct
+++ b/apps/OpenSpace/ext/sgct
@@ -1 +1 @@
-Subproject commit 1be7e65ef1d64fdbf28c86b468ac0ead59ab04a6
+Subproject commit afed86f62411893393b434e5f2baa698dd679069
diff --git a/src/rendering/luaconsole.cpp b/src/rendering/luaconsole.cpp
index fd1ea36d20..ac2a888ebe 100644
--- a/src/rendering/luaconsole.cpp
+++ b/src/rendering/luaconsole.cpp
@@ -251,6 +251,10 @@ void LuaConsole::initialize() {
 void LuaConsole::deinitialize() {
     ZoneScoped;
 
+    if (!FileSys.cacheManager()) {
+        return;
+    }
+
     const std::filesystem::path filename = FileSys.cacheManager()->cachedFilename(
         HistoryFile,
         ""

From 2dad47dd421d3f567ebb561212fb78829caed510 Mon Sep 17 00:00:00 2001
From: Alexander Bock <alexander.bock@liu.se>
Date: Fri, 19 Apr 2024 18:34:31 +0200
Subject: [PATCH 405/701] Update SGCT submodule

---
 apps/OpenSpace/ext/sgct | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/apps/OpenSpace/ext/sgct b/apps/OpenSpace/ext/sgct
index afed86f624..e18f67fe2f 160000
--- a/apps/OpenSpace/ext/sgct
+++ b/apps/OpenSpace/ext/sgct
@@ -1 +1 @@
-Subproject commit afed86f62411893393b434e5f2baa698dd679069
+Subproject commit e18f67fe2f5af6ab2e37b50d5489b918312b94ea

From 84bf1a559a965bd22af5a54089ef2535d23cc17d Mon Sep 17 00:00:00 2001
From: Alexander Bock <alexander.bock@liu.se>
Date: Fri, 19 Apr 2024 18:52:32 +0200
Subject: [PATCH 406/701] Fix issue with loading the IP addresses from the
 network driver in a clusered environment

---
 apps/OpenSpace/ext/sgct | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/apps/OpenSpace/ext/sgct b/apps/OpenSpace/ext/sgct
index e18f67fe2f..ea1f8a110f 160000
--- a/apps/OpenSpace/ext/sgct
+++ b/apps/OpenSpace/ext/sgct
@@ -1 +1 @@
-Subproject commit e18f67fe2f5af6ab2e37b50d5489b918312b94ea
+Subproject commit ea1f8a110fd151ad7fb925946b4be1aeacb58f41

From 2681171a82887c9e2431d65e9fa86c888a367b3b Mon Sep 17 00:00:00 2001
From: Alexander Bock <alexander.bock@liu.se>
Date: Mon, 22 Apr 2024 19:19:56 +0200
Subject: [PATCH 407/701] Clean up to the contributing document

---
 .github/CONTRIBUTING.md | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/.github/CONTRIBUTING.md b/.github/CONTRIBUTING.md
index 2366bc69ea..a011b7cc45 100644
--- a/.github/CONTRIBUTING.md
+++ b/.github/CONTRIBUTING.md
@@ -1,4 +1,5 @@
-## How to contribute
-The easiest way to contribute is through a separate fork of the repository and submitting a pull-request. One of the core developers will judge the pull request and integrate it into the main `master` branch. Preferably, there is an accompanying issue (created by you or not) which is solved by the PR. In this case, feel free to use the phrase "(closes #XXX)" in the text of the pull request, where `XXX` is the number of the issue that you have solved. The PR should be in its own separate branch following the naming `pr/feature`, where `feature` is a short, descripting name of the additional feature or bug contained in the PR.
+# How to contribute
+## Code changes
+The easiest way to contribute is through a separate fork of the repository and submitting a Pull Request. One of the core developers will review the pull request and integrate it into the `master` branch. Preferably, for each Pull Request, there is an accompanying issue (created by you or not) which the Pull Request addresses. In this case, feel free to use the phrase "(closes #XXX)" in the text of the Pull Request, where `XXX` is the number of the issue that you have solved. The PR should be in its own separate branch following the naming `pr/feature`, where `feature` is a short, descripting name of the additional feature or bug contained in the PR.
 
-For more information we refer to the [Wiki](https://openspace.github.io). If there are any questions, feel free to contact us via [email](mailto:mail@alexanderbock.eu?subject=OpenSpace: Contributing).
\ No newline at end of file
+For more information we refer to the [Documentation](https://docs.openspaceproject.com). If there are any questions, feel free to contact us via [email](mailto:support@openspaceproject.com?subject=OpenSpace: Contributing).

From 048dfdfde174c7a77172e93df01554ce515f2a9b Mon Sep 17 00:00:00 2001
From: Alexander Bock <alexander.bock@liu.se>
Date: Tue, 23 Apr 2024 08:45:54 +0200
Subject: [PATCH 408/701] Add example for `TimeFrameUnion` and properly use the
 parameters struct (#3179)

---
 data/assets/examples/timeframe/union.asset | 40 ++++++++++++++++++++++
 modules/base/timeframe/timeframeunion.cpp  | 28 +++++++--------
 2 files changed, 54 insertions(+), 14 deletions(-)
 create mode 100644 data/assets/examples/timeframe/union.asset

diff --git a/data/assets/examples/timeframe/union.asset b/data/assets/examples/timeframe/union.asset
new file mode 100644
index 0000000000..e7631ac7f5
--- /dev/null
+++ b/data/assets/examples/timeframe/union.asset
@@ -0,0 +1,40 @@
+-- This example creates a union out of two simpler TimeFrameIntervals and uses it for a
+-- SceneGraphNode. The first TimeFrameInterval covers January 1st, 2000 and the second
+-- TimeFrameInterval covers March 1st, 2002. The resulting TimeFrameUnion will cover both
+-- January 1st, 2000 and March 1st, 2002.
+
+local Node = {
+  Identifier = "TimeFrameUnion_Example",
+  TimeFrame = {
+    Type = "TimeFrameUnion",
+    TimeFrames = {
+      -- The first TimeFrameInterval for the first day
+      {
+        Type = "TimeFrameInterval",
+        Start = "2000 JAN 01 00:00:00.000",
+        End = "2000 JAN 01 23:59:59.999"
+      },
+      -- The second TimeFrameInterval for the second day
+      {
+        Type = "TimeFrameInterval",
+        Start = "2002 MAR 01 00:00:00.000",
+        End = "2002 MAR 01 23:59:59.999"
+      }
+    }
+  },
+  Renderable = {
+    Type = "RenderableCartesianAxes"
+  },
+  GUI = {
+    Name = "TimeFrameUnion",
+    Path = "/Examples"
+  }
+}
+
+asset.onInitialize(function()
+  openspace.addSceneGraphNode(Node)
+end)
+
+asset.onDeinitialize(function()
+  openspace.removeSceneGraphNode(Node)
+end)
diff --git a/modules/base/timeframe/timeframeunion.cpp b/modules/base/timeframe/timeframeunion.cpp
index de9335ab76..bee5206165 100644
--- a/modules/base/timeframe/timeframeunion.cpp
+++ b/modules/base/timeframe/timeframeunion.cpp
@@ -40,6 +40,12 @@ namespace {
         openspace::properties::Property::Visibility::AdvancedUser
     };
 
+    // This TimeFrame class will accept the union of all passed-in TimeFrames. This means
+    // that this TimeFrame will be active if at least one of the child TimeFrames is
+    // active and it will be inactive if none of the child TimeFrames are active.
+    //
+    // This can be used to create more complex TimeFrames that are made up of several,
+    // simpler TimeFrames themselves.
     struct [[codegen::Dictionary(TimeFrameUnion)]] Parameters {
         // [[codegen::verbatim(TimeFramesInfo.description)]]
         std::vector<ghoul::Dictionary> timeFrames
@@ -51,7 +57,7 @@ namespace {
 namespace openspace {
 
 documentation::Documentation TimeFrameUnion::Documentation() {
-    return codegen::doc<Parameters>("base_time_frame_union");
+    return codegen::doc<Parameters>("base_timeframe_union");
 }
 
 bool TimeFrameUnion::isActive(const Time& time) const {
@@ -64,21 +70,15 @@ bool TimeFrameUnion::isActive(const Time& time) const {
 }
 
 TimeFrameUnion::TimeFrameUnion(const ghoul::Dictionary& dictionary) {
-    // I don't know how we can actually help the reference attribute properly. Since the
-    // Parameter list only contains the monostate, there is no need to actually create
-    // the object here
-    codegen::bake<Parameters>(dictionary);
+    const Parameters p = codegen::bake<Parameters>(dictionary);
 
-    const ghoul::Dictionary frames =
-        dictionary.value<ghoul::Dictionary>(TimeFramesInfo.identifier);
-
-    for (const std::string_view k : frames.keys()) {
-        const ghoul::Dictionary& subDictionary = frames.value<ghoul::Dictionary>(k);
-        _timeFrames.push_back(TimeFrame::createFromDictionary(subDictionary));
+    for (size_t i = 0; i < p.timeFrames.size(); i++) {
+        const ghoul::Dictionary& frame = p.timeFrames[i];
+        _timeFrames.push_back(TimeFrame::createFromDictionary(frame));
         TimeFrame& subFrame = *_timeFrames.back();
-        subFrame.setIdentifier(std::string(k));
-        subFrame.setGuiName(std::string(k));
-        subFrame.setDescription(std::string(k));
+        subFrame.setIdentifier(std::format("{}", i));
+        subFrame.setGuiName(std::format("{}", i));
+        subFrame.setDescription(std::format("{}", i));
         addPropertySubOwner(*_timeFrames.back());
     }
 }

From 28845a5df66c3c258ee9e021d10031e1406210c3 Mon Sep 17 00:00:00 2001
From: Alexander Bock <alexander.bock@liu.se>
Date: Tue, 23 Apr 2024 08:48:50 +0200
Subject: [PATCH 409/701] Add examples and documentation for
 `TimeDependentScale`. Add more strict verifiers (#3180)

* Add examples and documentation for TimeDependentScale. Add more strict verifiers
* Update verifier to accept Spice-like YYYY MMM DD hh:mm::ss dates
---
 .../timedependentscale/timedependent.asset    | 29 ++++++++++++++++++
 .../timedependent_speed.asset                 | 30 +++++++++++++++++++
 modules/base/scale/timedependentscale.cpp     | 22 +++++++++-----
 src/documentation/verifier.cpp                | 26 +++++++++++-----
 4 files changed, 92 insertions(+), 15 deletions(-)
 create mode 100644 data/assets/examples/scale/timedependentscale/timedependent.asset
 create mode 100644 data/assets/examples/scale/timedependentscale/timedependent_speed.asset

diff --git a/data/assets/examples/scale/timedependentscale/timedependent.asset b/data/assets/examples/scale/timedependentscale/timedependent.asset
new file mode 100644
index 0000000000..95da1ad3a8
--- /dev/null
+++ b/data/assets/examples/scale/timedependentscale/timedependent.asset
@@ -0,0 +1,29 @@
+-- This asset creates a SceneGraphNode that only displays coordinate axes, which grow at
+-- a speed of 1 m/s starting on January 1st, 2000 00:00:00. This means that on
+-- that date, the coordinate axes will disappear and, for example, on January 1st, 2000
+-- 12:00:00, the coordinate axes will be 43200 meters long.
+
+local Node = {
+  Identifier = "TimeDependentScale_Example",
+  Transform = {
+    Scale = {
+      Type = "TimeDependentScale",
+      ReferenceDate = "2000 JAN 01 00:00:00"
+    }
+  },
+  Renderable = {
+    Type = "RenderableCartesianAxes"
+  },
+  GUI = {
+    Name = "TimeDependentScale",
+    Path = "/Examples"
+  }
+}
+
+asset.onInitialize(function()
+  openspace.addSceneGraphNode(Node)
+end)
+
+asset.onDeinitialize(function()
+  openspace.removeSceneGraphNode(Node)
+end)
diff --git a/data/assets/examples/scale/timedependentscale/timedependent_speed.asset b/data/assets/examples/scale/timedependentscale/timedependent_speed.asset
new file mode 100644
index 0000000000..44fa04a63f
--- /dev/null
+++ b/data/assets/examples/scale/timedependentscale/timedependent_speed.asset
@@ -0,0 +1,30 @@
+-- This asset creates a SceneGraphNode that only displays coordinate axes, which grow at
+-- a speed of 12 km/s starting on August 8th, 1969 12:00:00. This means that on
+-- that date, the coordinate axes will disappear and, for example, on August 8th, 1969
+-- 23:00:00, the coordinate axes will be 475200 km long.
+
+local Node = {
+  Identifier = "TimeDependentScale_Example_Speed",
+  Transform = {
+    Scale = {
+      Type = "TimeDependentScale",
+      ReferenceDate = "1969 AUG 08 12:00:00",
+      Speed = 12000
+    }
+  },
+  Renderable = {
+    Type = "RenderableCartesianAxes"
+  },
+  GUI = {
+    Name = "TimeDependentScale (Speed)",
+    Path = "/Examples"
+  }
+}
+
+asset.onInitialize(function()
+  openspace.addSceneGraphNode(Node)
+end)
+
+asset.onDeinitialize(function()
+  openspace.removeSceneGraphNode(Node)
+end)
diff --git a/modules/base/scale/timedependentscale.cpp b/modules/base/scale/timedependentscale.cpp
index a4ecf7da99..e70b077fa4 100644
--- a/modules/base/scale/timedependentscale.cpp
+++ b/modules/base/scale/timedependentscale.cpp
@@ -54,18 +54,27 @@ namespace {
     constexpr openspace::properties::Property::PropertyInfo ClampToPositiveInfo = {
         "ClampToPositive",
         "Clamp to Positive",
-        "If this value is true, the velocity computation will never result in any "
-        "negative values. This is useful for instantaneous events that only propagate "
-        "forwards. The default value is 'true'",
+        "If this value is true, the velocity computation will be clamped to a positive "
+        "value if the current simulation time is before the `ReferenceDate`. This is "
+        "useful for instantaneous events that only propagate forwards in time. The "
+        "default value is 'true'",
         openspace::properties::Property::Visibility::AdvancedUser
     };
 
+    // This Scale type provides the ability to scale an object dynamically as time in the
+    // simulation passes. The provided `ReferenceDate`, specifies when the total scale
+    // should be equal to 0 and the scales grows by `Speed` meters for every second in the
+    // simulation. If `ClampToPositive` is specified as `true`, then the resulting scale
+    // will always be positive or 0 if the simulation time is before the `ReferenceDate`.
+    //
+    // A common use-case for this Scale type would be to represent the Radiosphere, which
+    // grows at the speed of light.
     struct [[codegen::Dictionary(TimeDependentScale)]] Parameters {
         // [[codegen::verbatim(ReferenceDateInfo.description)]]
-        std::string referenceDate;
+        std::string referenceDate [[codegen::datetime()]];
 
         // [[codegen::verbatim(SpeedInfo.description)]]
-        std::optional<double> speed;
+        std::optional<double> speed [[codegen::greaterequal(0.0)]];
 
         // [[codegen::verbatim(ClampToPositiveInfo.description)]]
         std::optional<bool> clampToPositive;
@@ -93,8 +102,7 @@ TimeDependentScale::TimeDependentScale(const ghoul::Dictionary& dictionary)
     _speed = p.speed.value_or(_speed);
     addProperty(_speed);
 
-    // @TODO (abock, 2021-01-09) The clamp to positive value from the dictionary was never
-    // actually read. I think this should probably be done here?
+    _clampToPositive = p.clampToPositive.value_or(_clampToPositive);
     addProperty(_clampToPositive);
 }
 
diff --git a/src/documentation/verifier.cpp b/src/documentation/verifier.cpp
index ac8911163b..41a0b294dc 100644
--- a/src/documentation/verifier.cpp
+++ b/src/documentation/verifier.cpp
@@ -316,7 +316,8 @@ TestResult DateTimeVerifier::operator()(const ghoul::Dictionary& dict,
     }
 
     const std::string dateTime = dict.value<std::string>(key);
-    const std::string format = "%Y %m %d %H:%M:%S"; // YYYY MM DD hh:mm:ss
+    const std::string format = "%Y %b %d %H:%M:%S"; // YYYY MMM DD hh:mm:ss
+    const std::string format2 = "%Y %m %d %H:%M:%S"; // YYYY MM DD hh:mm:ss
 
     std::tm t = {};
     std::istringstream ss(dateTime);
@@ -324,13 +325,22 @@ TestResult DateTimeVerifier::operator()(const ghoul::Dictionary& dict,
 
     // first check format (automatically checks if valid time)
     if (ss.fail()) {
-        res.success = false;
-        TestResult::Offense o = {
-            .offender = key,
-            .reason = TestResult::Offense::Reason::Verification,
-            .explanation = "Not a valid format, should be: YYYY MM DD hh:mm:ss"
-        };
-        res.offenses.push_back(std::move(o));
+        // The format might be of the type "YYYY MM DD hh:mm:ss"
+        std::istringstream ss2(dateTime);
+        ss2 >> std::get_time(&t, format2.c_str());
+
+        if (ss2.fail()) {
+            // It fails if it is neither of the two formats
+            res.success = false;
+            TestResult::Offense o = {
+                .offender = key,
+                .reason = TestResult::Offense::Reason::Verification,
+                .explanation =
+                    "Not a valid format, should be: "
+                    "YYYY MM DD hh:mm:ss or YYYY MMM DD hh:mm:ss"
+            };
+            res.offenses.push_back(std::move(o));
+        }
     }
     return res;
 }

From c87a0901a2faa541c83d4c6c9ad779f328cc72f0 Mon Sep 17 00:00:00 2001
From: Alexander Bock <alexander.bock@liu.se>
Date: Tue, 23 Apr 2024 08:49:52 +0200
Subject: [PATCH 410/701] Add example and documentation for the `StaticScale`. 
 Extract the static scale as a double value instead of a float (#3181)

* Add example and documentation for the StaticScale.  Extract the static scale as a double value instead of a float
---
 .../examples/scale/staticscale/static.asset   | 29 +++++++++++++++
 modules/base/scale/staticscale.cpp            | 37 +++++++++++--------
 modules/base/scale/staticscale.h              |  4 +-
 3 files changed, 53 insertions(+), 17 deletions(-)
 create mode 100644 data/assets/examples/scale/staticscale/static.asset

diff --git a/data/assets/examples/scale/staticscale/static.asset b/data/assets/examples/scale/staticscale/static.asset
new file mode 100644
index 0000000000..35d7264c1f
--- /dev/null
+++ b/data/assets/examples/scale/staticscale/static.asset
@@ -0,0 +1,29 @@
+-- This asset creates a SceneGraphNode that only displays coordinate axes. The coordinate
+-- axis normally have a length of 1 meter and are scaled in this example by a factor of
+-- 149597870700, which means they will be 149597870700 m (1 AU) long, thus reaching the
+-- same distance as Earth's orbit around the Sun.
+
+local Node = {
+  Identifier = "StaticScale_Example",
+  Transform = {
+    Scale = {
+      Type = "StaticScale",
+      Scale = 149597870700
+    }
+  },
+  Renderable = {
+    Type = "RenderableCartesianAxes"
+  },
+  GUI = {
+    Name = "StaticScale",
+    Path = "/Examples"
+  }
+}
+
+asset.onInitialize(function()
+  openspace.addSceneGraphNode(Node)
+end)
+
+asset.onDeinitialize(function()
+  openspace.removeSceneGraphNode(Node)
+end)
diff --git a/modules/base/scale/staticscale.cpp b/modules/base/scale/staticscale.cpp
index 975e7a6b8c..4f916424cc 100644
--- a/modules/base/scale/staticscale.cpp
+++ b/modules/base/scale/staticscale.cpp
@@ -36,9 +36,14 @@ namespace {
         openspace::properties::Property::Visibility::NoviceUser
     };
 
+    // This Scale type scales the scene graph node that it is attached to by a fixed
+    // amount that does not change over time. It is possible to change the fixed scale
+    // after starting the application, but it otherwise remains unchanged. The scaling is
+    // a simple multiplication so that a `Scale` value of 10 means that the object will be
+    // 10 times larger than its original size.
     struct [[codegen::Dictionary(StaticScale)]] Parameters {
         // [[codegen::verbatim(ScaleInfo.description)]]
-        float scale;
+        double scale;
     };
 #include "staticscale_codegen.cpp"
 } // namespace
@@ -49,23 +54,25 @@ documentation::Documentation StaticScale::Documentation() {
     return codegen::doc<Parameters>("base_scale_static");
 }
 
-glm::dvec3 StaticScale::scaleValue(const UpdateData&) const {
-    return glm::dvec3(_scaleValue);
-}
-
-StaticScale::StaticScale() : _scaleValue(ScaleInfo, 1.f, 0.1f, 100.f) {
-    addProperty(_scaleValue);
-
-    _scaleValue.onChange([this]() {
-        requireUpdate();
-    });
-    _type = "StaticScale";
-}
-
-StaticScale::StaticScale(const ghoul::Dictionary& dictionary) : StaticScale() {
+StaticScale::StaticScale(const ghoul::Dictionary& dictionary)
+    : StaticScale()
+{
     const Parameters p = codegen::bake<Parameters>(dictionary);
     _scaleValue = p.scale;
     _type = "StaticScale";
 }
 
+StaticScale::StaticScale()
+    : _scaleValue(ScaleInfo, 1.0, 0.1, 100.0)
+{
+    addProperty(_scaleValue);
+
+    _scaleValue.onChange([this]() { requireUpdate(); });
+    _type = "StaticScale";
+}
+
+glm::dvec3 StaticScale::scaleValue(const UpdateData&) const {
+    return glm::dvec3(_scaleValue);
+}
+
 } // namespace openspace
diff --git a/modules/base/scale/staticscale.h b/modules/base/scale/staticscale.h
index c7f2c84bd2..4e9f9c03ad 100644
--- a/modules/base/scale/staticscale.h
+++ b/modules/base/scale/staticscale.h
@@ -27,7 +27,7 @@
 
 #include <openspace/scene/scale.h>
 
-#include <openspace/properties/scalar/floatproperty.h>
+#include <openspace/properties/scalar/doubleproperty.h>
 
 namespace openspace {
 
@@ -42,7 +42,7 @@ public:
     static documentation::Documentation Documentation();
 
 private:
-    properties::FloatProperty _scaleValue;
+    properties::DoubleProperty _scaleValue;
 };
 
 } // namespace openspace

From f23505db90ac089285996760ebf17eeac00b2459 Mon Sep 17 00:00:00 2001
From: Alexander Bock <alexander.bock@liu.se>
Date: Tue, 23 Apr 2024 08:53:24 +0200
Subject: [PATCH 411/701] Add documentation and examples for
 `NonUniformStaticScale`.  Remove the no-argument constructor and make the
 dictionary constructor explicit (#3182)

* Add documentation and examples for NonUniformStaticScale.  Remove the no-argument constructor and make the dictionary constructor explicit
---
 .../nonuniformstatic.asset                    | 31 ++++++++++++++++
 .../nonuniformstatic_ellipsoid.asset          | 28 ++++++++++++++
 modules/base/scale/nonuniformstaticscale.cpp  | 37 ++++++++++---------
 modules/base/scale/nonuniformstaticscale.h    |  3 +-
 4 files changed, 80 insertions(+), 19 deletions(-)
 create mode 100644 data/assets/examples/scale/nonuniformstaticscale/nonuniformstatic.asset
 create mode 100644 data/assets/examples/scale/nonuniformstaticscale/nonuniformstatic_ellipsoid.asset

diff --git a/data/assets/examples/scale/nonuniformstaticscale/nonuniformstatic.asset b/data/assets/examples/scale/nonuniformstaticscale/nonuniformstatic.asset
new file mode 100644
index 0000000000..ff8dcfd6b7
--- /dev/null
+++ b/data/assets/examples/scale/nonuniformstaticscale/nonuniformstatic.asset
@@ -0,0 +1,31 @@
+-- This asset creates a SceneGraphNode that only displays coordinate axes. The coordinate
+-- axis normally have a length of 1 meter and are scaled in this example by different
+-- values for each axis. The x axis is scaled by a factor of 149597870700,  which means
+-- they will be 149597870700 m (1 AU) long and thus reaching the same distance as Earth's
+-- orbit around the Sun. The y-axis stays at its original size, and the z-axis will be
+-- hidden entirely by setting the scale value close to 0.
+
+local Node = {
+  Identifier = "NonUniformStaticScale_Example",
+  Transform = {
+    Scale = {
+      Type = "NonUniformStaticScale",
+      Scale = { 149597870700, 1.0, 0.0005 }
+    }
+  },
+  Renderable = {
+    Type = "RenderableCartesianAxes"
+  },
+  GUI = {
+    Name = "NonUniformStaticScale",
+    Path = "/Examples"
+  }
+}
+
+asset.onInitialize(function()
+  openspace.addSceneGraphNode(Node)
+end)
+
+asset.onDeinitialize(function()
+  openspace.removeSceneGraphNode(Node)
+end)
diff --git a/data/assets/examples/scale/nonuniformstaticscale/nonuniformstatic_ellipsoid.asset b/data/assets/examples/scale/nonuniformstaticscale/nonuniformstatic_ellipsoid.asset
new file mode 100644
index 0000000000..7833417b40
--- /dev/null
+++ b/data/assets/examples/scale/nonuniformstaticscale/nonuniformstatic_ellipsoid.asset
@@ -0,0 +1,28 @@
+-- This asset creates a SceneGraphNode that is rendering a sphere which is adjust to an
+-- ellipsoidal shape by using a non-uniform scaling. In particular, the second axis is
+-- half as long as the first, and the third axis is a third as long.
+
+local Node = {
+  Identifier = "NonUniformStaticScale_Example_Ellipsoid",
+  Transform = {
+    Scale = {
+      Type = "NonUniformStaticScale",
+      Scale = { 149597870700, 149597870700 / 2, 149597870700 / 3 }
+    }
+  },
+  Renderable = {
+    Type = "RenderableSphericalGrid"
+  },
+  GUI = {
+    Name = "NonUniformStaticScale (Ellipsoid)",
+    Path = "/Examples"
+  }
+}
+
+asset.onInitialize(function()
+  openspace.addSceneGraphNode(Node)
+end)
+
+asset.onDeinitialize(function()
+  openspace.removeSceneGraphNode(Node)
+end)
diff --git a/modules/base/scale/nonuniformstaticscale.cpp b/modules/base/scale/nonuniformstaticscale.cpp
index a10c1e0c55..b7ba2ade87 100644
--- a/modules/base/scale/nonuniformstaticscale.cpp
+++ b/modules/base/scale/nonuniformstaticscale.cpp
@@ -36,6 +36,16 @@ namespace {
         openspace::properties::Property::Visibility::NoviceUser
     };
 
+    // This Scale type scales the scene graph node that it is attached to by a fixed
+    // amount that does not change over time. It is possible to change the fixed scale
+    // after starting the application, but it otherwise remains unchanged. The scaling is
+    // a simple multiplication so that a `Scale` value of 10 means that the object will be
+    // 10 times larger than its original size. In comparison to the StaticScale type, this
+    // type has the ability to scale an object by different amounts for each direction.
+    //
+    // This type can be used to adjust the aspect ratio of Renderable types, for example
+    // to make a RenderableSphericalGrid that is not a perfect spherical grid, but a
+    // tri-axial ellipsoid instead.
     struct [[codegen::Dictionary(NonUniformStaticScale)]] Parameters {
         // [[codegen::verbatim(ScaleInfo.description)]]
         glm::dvec3 scale;
@@ -49,25 +59,18 @@ documentation::Documentation NonUniformStaticScale::Documentation() {
     return codegen::doc<Parameters>("base_scale_nonuniformstatic");
 }
 
+NonUniformStaticScale::NonUniformStaticScale(const ghoul::Dictionary& dictionary)
+    : _scaleValue(ScaleInfo, glm::dvec3(1.0), glm::dvec3(0.1), glm::dvec3(100.0))
+{
+    const Parameters p = codegen::bake<Parameters>(dictionary);
+
+    _scaleValue = p.scale;
+    _scaleValue.onChange([this]() { requireUpdate(); });
+    addProperty(_scaleValue);
+}
+
 glm::dvec3 NonUniformStaticScale::scaleValue(const UpdateData&) const {
     return _scaleValue;
 }
 
-NonUniformStaticScale::NonUniformStaticScale()
-    : _scaleValue(ScaleInfo, glm::dvec3(1.0), glm::dvec3(0.1), glm::dvec3(100.0))
-{
-    addProperty(_scaleValue);
-
-    _scaleValue.onChange([this]() {
-        requireUpdate();
-    });
-}
-
-NonUniformStaticScale::NonUniformStaticScale(const ghoul::Dictionary& dictionary)
-    : NonUniformStaticScale()
-{
-    const Parameters p = codegen::bake<Parameters>(dictionary);
-    _scaleValue = p.scale;
-}
-
 } // namespace openspace
diff --git a/modules/base/scale/nonuniformstaticscale.h b/modules/base/scale/nonuniformstaticscale.h
index 59d25457e1..d82fcaeb29 100644
--- a/modules/base/scale/nonuniformstaticscale.h
+++ b/modules/base/scale/nonuniformstaticscale.h
@@ -35,8 +35,7 @@ namespace documentation { struct Documentation; }
 
 class NonUniformStaticScale : public Scale {
 public:
-    NonUniformStaticScale();
-    NonUniformStaticScale(const ghoul::Dictionary& dictionary);
+    explicit NonUniformStaticScale(const ghoul::Dictionary& dictionary);
     glm::dvec3 scaleValue(const UpdateData& data) const override;
 
     static documentation::Documentation Documentation();

From c9fd9543e699c15ecf3cf491ab1c016480470dc9 Mon Sep 17 00:00:00 2001
From: Alexander Bock <mail@alexanderbock.eu>
Date: Tue, 23 Apr 2024 20:13:52 +0200
Subject: [PATCH 412/701] Updating examples after discussions

---
 .../scale/nonuniformstaticscale/nonuniformstatic.asset       | 5 +++--
 .../nonuniformstaticscale/nonuniformstatic_ellipsoid.asset   | 5 +++--
 data/assets/examples/scale/staticscale/static.asset          | 5 +++--
 .../examples/scale/timedependentscale/timedependent.asset    | 5 +++--
 .../scale/timedependentscale/timedependent_speed.asset       | 5 +++--
 data/assets/examples/timeframe/union.asset                   | 5 +++--
 6 files changed, 18 insertions(+), 12 deletions(-)

diff --git a/data/assets/examples/scale/nonuniformstaticscale/nonuniformstatic.asset b/data/assets/examples/scale/nonuniformstaticscale/nonuniformstatic.asset
index ff8dcfd6b7..c1f43bab87 100644
--- a/data/assets/examples/scale/nonuniformstaticscale/nonuniformstatic.asset
+++ b/data/assets/examples/scale/nonuniformstaticscale/nonuniformstatic.asset
@@ -1,3 +1,4 @@
+-- Minimal
 -- This asset creates a SceneGraphNode that only displays coordinate axes. The coordinate
 -- axis normally have a length of 1 meter and are scaled in this example by different
 -- values for each axis. The x axis is scaled by a factor of 149597870700,  which means
@@ -17,8 +18,8 @@ local Node = {
     Type = "RenderableCartesianAxes"
   },
   GUI = {
-    Name = "NonUniformStaticScale",
-    Path = "/Examples"
+    Name = "Minimal",
+    Path = "/Examples/NonUniformStaticScale"
   }
 }
 
diff --git a/data/assets/examples/scale/nonuniformstaticscale/nonuniformstatic_ellipsoid.asset b/data/assets/examples/scale/nonuniformstaticscale/nonuniformstatic_ellipsoid.asset
index 7833417b40..ea18f1dbbd 100644
--- a/data/assets/examples/scale/nonuniformstaticscale/nonuniformstatic_ellipsoid.asset
+++ b/data/assets/examples/scale/nonuniformstaticscale/nonuniformstatic_ellipsoid.asset
@@ -1,3 +1,4 @@
+-- Ellipsoid
 -- This asset creates a SceneGraphNode that is rendering a sphere which is adjust to an
 -- ellipsoidal shape by using a non-uniform scaling. In particular, the second axis is
 -- half as long as the first, and the third axis is a third as long.
@@ -14,8 +15,8 @@ local Node = {
     Type = "RenderableSphericalGrid"
   },
   GUI = {
-    Name = "NonUniformStaticScale (Ellipsoid)",
-    Path = "/Examples"
+    Name = "Ellipsoid",
+    Path = "/Examples/NonUniformStaticScale"
   }
 }
 
diff --git a/data/assets/examples/scale/staticscale/static.asset b/data/assets/examples/scale/staticscale/static.asset
index 35d7264c1f..fd563e05a3 100644
--- a/data/assets/examples/scale/staticscale/static.asset
+++ b/data/assets/examples/scale/staticscale/static.asset
@@ -1,3 +1,4 @@
+-- Minimal
 -- This asset creates a SceneGraphNode that only displays coordinate axes. The coordinate
 -- axis normally have a length of 1 meter and are scaled in this example by a factor of
 -- 149597870700, which means they will be 149597870700 m (1 AU) long, thus reaching the
@@ -15,8 +16,8 @@ local Node = {
     Type = "RenderableCartesianAxes"
   },
   GUI = {
-    Name = "StaticScale",
-    Path = "/Examples"
+    Name = "Minimal",
+    Path = "/Examples/StaticScale"
   }
 }
 
diff --git a/data/assets/examples/scale/timedependentscale/timedependent.asset b/data/assets/examples/scale/timedependentscale/timedependent.asset
index 95da1ad3a8..7a97c50baf 100644
--- a/data/assets/examples/scale/timedependentscale/timedependent.asset
+++ b/data/assets/examples/scale/timedependentscale/timedependent.asset
@@ -1,3 +1,4 @@
+-- Minimal
 -- This asset creates a SceneGraphNode that only displays coordinate axes, which grow at
 -- a speed of 1 m/s starting on January 1st, 2000 00:00:00. This means that on
 -- that date, the coordinate axes will disappear and, for example, on January 1st, 2000
@@ -15,8 +16,8 @@ local Node = {
     Type = "RenderableCartesianAxes"
   },
   GUI = {
-    Name = "TimeDependentScale",
-    Path = "/Examples"
+    Name = "Minimal",
+    Path = "/Examples/TimeDependentScale"
   }
 }
 
diff --git a/data/assets/examples/scale/timedependentscale/timedependent_speed.asset b/data/assets/examples/scale/timedependentscale/timedependent_speed.asset
index 44fa04a63f..99c4093b4c 100644
--- a/data/assets/examples/scale/timedependentscale/timedependent_speed.asset
+++ b/data/assets/examples/scale/timedependentscale/timedependent_speed.asset
@@ -1,3 +1,4 @@
+-- with Speed
 -- This asset creates a SceneGraphNode that only displays coordinate axes, which grow at
 -- a speed of 12 km/s starting on August 8th, 1969 12:00:00. This means that on
 -- that date, the coordinate axes will disappear and, for example, on August 8th, 1969
@@ -16,8 +17,8 @@ local Node = {
     Type = "RenderableCartesianAxes"
   },
   GUI = {
-    Name = "TimeDependentScale (Speed)",
-    Path = "/Examples"
+    Name = "with Speed",
+    Path = "/Examples/TimeDependentScale"
   }
 }
 
diff --git a/data/assets/examples/timeframe/union.asset b/data/assets/examples/timeframe/union.asset
index e7631ac7f5..538f07da63 100644
--- a/data/assets/examples/timeframe/union.asset
+++ b/data/assets/examples/timeframe/union.asset
@@ -1,3 +1,4 @@
+-- Minimal
 -- This example creates a union out of two simpler TimeFrameIntervals and uses it for a
 -- SceneGraphNode. The first TimeFrameInterval covers January 1st, 2000 and the second
 -- TimeFrameInterval covers March 1st, 2002. The resulting TimeFrameUnion will cover both
@@ -26,8 +27,8 @@ local Node = {
     Type = "RenderableCartesianAxes"
   },
   GUI = {
-    Name = "TimeFrameUnion",
-    Path = "/Examples"
+    Name = "Minimal",
+    Path = "/Examples/TimeFrameUnion"
   }
 }
 

From 78b3b4fb2ebbd26fd513cb6ea673f9af5254fea3 Mon Sep 17 00:00:00 2001
From: Alexander Bock <mail@alexanderbock.eu>
Date: Tue, 23 Apr 2024 22:33:17 +0200
Subject: [PATCH 413/701] Adding periods to the description texts

---
 apps/OpenSpace/ext/sgct                       |  2 +-
 ext/ghoul                                     |  2 +-
 .../rendering/renderableatmosphere.cpp        | 44 ++++-----
 modules/base/dashboard/dashboarditemangle.cpp | 18 ++--
 modules/base/dashboard/dashboarditemdate.cpp  |  5 +-
 .../base/dashboard/dashboarditemdistance.cpp  | 18 ++--
 .../dashboard/dashboarditemelapsedtime.cpp    |  5 +-
 .../base/dashboard/dashboarditemframerate.cpp | 19 ++--
 .../dashboard/dashboarditeminputstate.cpp     | 15 +--
 .../dashboard/dashboarditempropertyvalue.cpp  |  6 +-
 .../dashboarditemsimulationincrement.cpp      | 10 +-
 .../base/dashboard/dashboarditemspacing.cpp   |  3 +-
 modules/base/dashboard/dashboarditemtext.cpp  |  2 +-
 .../base/dashboard/dashboarditemvelocity.cpp  |  4 +-
 .../base/lightsource/cameralightsource.cpp    |  3 +-
 .../lightsource/scenegraphlightsource.cpp     |  5 +-
 .../rendering/grids/renderableboxgrid.cpp     |  9 +-
 .../base/rendering/grids/renderablegrid.cpp   | 18 ++--
 .../rendering/grids/renderableradialgrid.cpp  | 16 ++-
 .../grids/renderablesphericalgrid.cpp         | 11 +--
 .../pointcloud/renderablepointcloud.cpp       |  8 +-
 .../rendering/renderablecartesianaxes.cpp     |  9 +-
 modules/base/rendering/renderabledisc.cpp     |  8 +-
 modules/base/rendering/renderablelabel.cpp    | 31 +++---
 modules/base/rendering/renderablemodel.cpp    | 30 +++---
 .../base/rendering/renderablenodearrow.cpp    | 30 +++---
 modules/base/rendering/renderablenodeline.cpp |  5 +-
 modules/base/rendering/renderableplane.cpp    | 11 +--
 .../rendering/renderableplaneimagelocal.cpp   |  3 +-
 .../rendering/renderableplaneimageonline.cpp  |  3 +-
 .../renderableplanetimevaryingimage.cpp       |  5 +-
 modules/base/rendering/renderableprism.cpp    | 21 ++--
 modules/base/rendering/renderablesphere.cpp   | 15 ++-
 .../rendering/renderablesphereimagelocal.cpp  |  3 +-
 .../rendering/renderablesphereimageonline.cpp |  3 +-
 .../rendering/renderabletimevaryingsphere.cpp |  2 +-
 modules/base/rendering/renderabletrail.cpp    | 19 ++--
 .../base/rendering/renderabletrailorbit.cpp   |  7 +-
 .../rendering/renderabletrailtrajectory.cpp   | 19 ++--
 .../base/rendering/screenspacedashboard.cpp   |  2 +-
 .../base/rendering/screenspaceframebuffer.cpp |  3 +-
 .../base/rendering/screenspaceimagelocal.cpp  |  3 +-
 .../base/rendering/screenspaceimageonline.cpp |  3 +-
 modules/base/rotation/constantrotation.cpp    |  6 +-
 modules/base/rotation/fixedrotation.cpp       | 35 ++++---
 modules/base/rotation/luarotation.cpp         |  3 +-
 modules/base/rotation/staticrotation.cpp      |  3 +-
 modules/base/rotation/timelinerotation.cpp    |  3 +-
 modules/base/scale/luascale.cpp               |  3 +-
 modules/base/scale/nonuniformstaticscale.cpp  |  2 +-
 modules/base/scale/staticscale.cpp            |  2 +-
 modules/base/scale/timedependentscale.cpp     |  8 +-
 modules/base/timeframe/timeframeinterval.cpp  | 12 +--
 modules/base/timeframe/timeframeunion.cpp     |  4 +-
 modules/base/translation/luatranslation.cpp   |  3 +-
 .../base/translation/statictranslation.cpp    |  2 +-
 .../base/translation/timelinetranslation.cpp  |  2 +-
 modules/cefwebgui/cefwebguimodule.cpp         | 13 +--
 .../rendering/renderabledebugplane.cpp        | 12 +--
 .../rendering/renderabledumeshes.cpp          | 22 ++---
 modules/exoplanets/exoplanetsmodule.cpp       | 31 +++---
 .../rendering/renderableorbitdisc.cpp         | 11 +--
 .../rendering/renderablefieldlines.cpp        |  4 +-
 .../renderablefieldlinessequence.cpp          | 51 +++++-----
 .../gaia/rendering/renderablegaiastars.cpp    | 78 +++++++--------
 modules/galaxy/rendering/renderablegalaxy.cpp | 23 ++---
 modules/globebrowsing/globebrowsingmodule.cpp |  8 +-
 .../src/dashboarditemglobelocation.cpp        |  6 +-
 modules/globebrowsing/src/gdalwrapper.cpp     |  4 +-
 .../src/geojson/geojsoncomponent.cpp          | 24 ++---
 .../src/geojson/geojsonproperties.cpp         | 26 ++---
 .../src/globelabelscomponent.cpp              | 29 +++---
 modules/globebrowsing/src/globerotation.cpp   | 17 ++--
 .../globebrowsing/src/globetranslation.cpp    | 21 ++--
 modules/globebrowsing/src/layer.cpp           | 18 ++--
 modules/globebrowsing/src/layeradjustment.cpp |  6 +-
 modules/globebrowsing/src/layergroup.cpp      |  3 +-
 .../globebrowsing/src/layerrendersettings.cpp | 11 +--
 .../src/memoryawaretilecache.cpp              |  6 +-
 .../globebrowsing/src/rawtiledatareader.cpp   |  2 +-
 modules/globebrowsing/src/renderableglobe.cpp | 45 ++++-----
 modules/globebrowsing/src/ringscomponent.cpp  | 27 +++---
 modules/globebrowsing/src/shadowcomponent.cpp | 11 +--
 .../src/tileprovider/defaulttileprovider.cpp  |  7 +-
 .../imagesequencetileprovider.cpp             | 11 +--
 .../tileprovider/singleimagetileprovider.cpp  |  2 +-
 .../src/tileprovider/temporaltileprovider.cpp |  4 +-
 .../tileprovider/tileindextileprovider.cpp    |  2 +-
 modules/globebrowsing/src/timequantizer.cpp   | 16 +--
 modules/imgui/imguimodule.cpp                 |  8 +-
 modules/imgui/src/guicomponent.cpp            |  6 +-
 modules/imgui/src/guipropertycomponent.cpp    |  6 +-
 modules/server/src/serverinterface.cpp        | 16 +--
 modules/skybrowser/skybrowsermodule.cpp       | 26 ++---
 modules/skybrowser/src/browser.cpp            |  8 +-
 .../skybrowser/src/renderableskytarget.cpp    | 11 +--
 .../skybrowser/src/screenspaceskybrowser.cpp  | 10 +-
 .../renderableconstellationbounds.cpp         |  4 +-
 .../renderableconstellationlines.cpp          |  6 +-
 .../renderableconstellationsbase.cpp          | 10 +-
 .../space/rendering/renderableeclipsecone.cpp | 25 +++--
 .../space/rendering/renderablefluxnodes.cpp   | 63 ++++++------
 .../rendering/renderablehabitablezone.cpp     | 12 +--
 .../rendering/renderableorbitalkepler.cpp     | 13 +--
 modules/space/rendering/renderablerings.cpp   | 10 +-
 modules/space/rendering/renderablestars.cpp   | 51 +++++-----
 .../space/rendering/renderabletravelspeed.cpp | 17 ++--
 modules/space/rotation/spicerotation.cpp      |  8 +-
 modules/space/spacemodule.cpp                 |  2 +-
 .../space/translation/horizonstranslation.cpp |  3 +-
 .../space/translation/keplertranslation.cpp   | 16 +--
 .../space/translation/spicetranslation.cpp    | 12 +--
 .../dashboard/dashboarditeminstruments.cpp    |  6 +-
 .../rendering/renderablefov.cpp               | 21 ++--
 .../rendering/renderablemodelprojection.cpp   |  3 +-
 .../rendering/renderableplanetprojection.cpp  | 26 ++---
 .../rendering/renderableshadowcylinder.cpp    | 20 ++--
 .../util/projectioncomponent.cpp              | 13 +--
 modules/spout/renderableplanespout.cpp        |  6 +-
 modules/spout/screenspacespout.cpp            |  6 +-
 modules/spout/spoutwrapper.cpp                |  8 +-
 modules/touch/src/touchinteraction.cpp        | 24 ++---
 modules/touch/touchmodule.cpp                 |  2 +-
 .../rendering/renderabletoyvolume.cpp         |  4 +-
 modules/video/src/videoplayer.cpp             |  6 +-
 modules/video/videomodule.cpp                 |  2 +-
 .../rendering/renderabledistancelabel.cpp     |  7 +-
 .../rendering/renderabletimevaryingvolume.cpp | 26 +++--
 modules/volume/transferfunctionhandler.cpp    | 11 +--
 .../webbrowser/src/defaultbrowserlauncher.cpp |  2 +-
 modules/webbrowser/src/screenspacebrowser.cpp |  7 +-
 modules/webbrowser/webbrowsermodule.cpp       |  4 +-
 modules/webgui/webguimodule.cpp               | 20 ++--
 src/engine/moduleengine.cpp                   |  3 +-
 src/engine/openspaceengine.cpp                |  7 +-
 src/events/event.cpp                          |  6 +-
 src/interaction/interactionmonitor.cpp        |  6 +-
 src/interaction/sessionrecording.cpp          |  6 +-
 src/navigation/navigationhandler.cpp          | 11 ++-
 src/navigation/orbitalnavigator.cpp           | 97 ++++++++-----------
 src/navigation/pathnavigator.cpp              | 18 ++--
 src/network/parallelpeer.cpp                  | 19 ++--
 src/rendering/colormappingcomponent.cpp       | 26 ++---
 src/rendering/dashboard.cpp                   |  5 +-
 src/rendering/dashboarditem.cpp               |  3 +-
 src/rendering/dashboardtextitem.cpp           |  6 +-
 src/rendering/fadeable.cpp                    |  6 +-
 src/rendering/labelscomponent.cpp             | 17 ++--
 src/rendering/luaconsole.cpp                  | 14 +--
 src/rendering/renderable.cpp                  | 11 +--
 src/rendering/renderengine.cpp                | 67 ++++++-------
 src/rendering/screenspacerenderable.cpp       | 34 +++----
 src/scene/lightsource.cpp                     |  2 +-
 src/scene/scenegraphnode.cpp                  | 36 +++----
 src/scripting/scriptscheduler.cpp             |  5 +-
 src/util/timemanager.cpp                      | 12 +--
 156 files changed, 887 insertions(+), 1194 deletions(-)

diff --git a/apps/OpenSpace/ext/sgct b/apps/OpenSpace/ext/sgct
index ea1f8a110f..206307c1e3 160000
--- a/apps/OpenSpace/ext/sgct
+++ b/apps/OpenSpace/ext/sgct
@@ -1 +1 @@
-Subproject commit ea1f8a110fd151ad7fb925946b4be1aeacb58f41
+Subproject commit 206307c1e3282a2e09e01cd763af74d36311d23b
diff --git a/ext/ghoul b/ext/ghoul
index 689b1cec8b..0fc36769cf 160000
--- a/ext/ghoul
+++ b/ext/ghoul
@@ -1 +1 @@
-Subproject commit 689b1cec8ba22530b3401df06697388ef9e1e26e
+Subproject commit 0fc36769cf20cea6e9c1b1157ec2e6c8d10cd421
diff --git a/modules/atmosphere/rendering/renderableatmosphere.cpp b/modules/atmosphere/rendering/renderableatmosphere.cpp
index 9d93a18803..418ee4811c 100644
--- a/modules/atmosphere/rendering/renderableatmosphere.cpp
+++ b/modules/atmosphere/rendering/renderableatmosphere.cpp
@@ -43,7 +43,7 @@ namespace {
     constexpr openspace::properties::Property::PropertyInfo AtmosphereHeightInfo = {
         "AtmosphereHeight",
         "Atmosphere Height (KM)",
-        "The thickness of the atmosphere in km",
+        "The thickness of the atmosphere in kilometers.",
         openspace::properties::Property::Visibility::AdvancedUser
     };
 
@@ -52,22 +52,22 @@ namespace {
         "AverageGroundReflectance",
         "Average Ground Reflectance (%)",
         "Average percentage of light reflected by the ground during the pre-calculation "
-        "phase",
+        "phase.",
         openspace::properties::Property::Visibility::AdvancedUser
     };
 
     constexpr openspace::properties::Property::PropertyInfo GroundRadianceEmissionInfo = {
         "GroundRadianceEmission",
         "Percentage of initial radiance emitted from ground",
-        "Multiplier of the ground radiance color during the rendering phase",
+        "Multiplier of the ground radiance color during the rendering phase.",
         openspace::properties::Property::Visibility::AdvancedUser
     };
 
     constexpr openspace::properties::Property::PropertyInfo RayleighHeightScaleInfo = {
         "RayleighHeightScale",
         "Rayleigh Scale Height (KM)",
-        "It is the vertical distance over which the density and pressure fall by a "
-        "constant factor",
+        "The vertical distance over which the density and pressure falls by a constant "
+        "factor.",
         openspace::properties::Property::Visibility::AdvancedUser
     };
 
@@ -75,14 +75,14 @@ namespace {
     {
         "RayleighScatteringCoeff",
         "Rayleigh Scattering Coeff",
-        "Rayleigh sea-level scattering coefficients in meters",
+        "Rayleigh sea-level scattering coefficients in meters.",
         openspace::properties::Property::Visibility::AdvancedUser
     };
 
     constexpr openspace::properties::Property::PropertyInfo OzoneLayerInfo = {
         "Ozone",
         "Ozone Layer Enabled",
-        "Enables/Disable Ozone Layer during pre-calculation phase",
+        "Enables/Disable Ozone Layer during pre-calculation phase.",
         openspace::properties::Property::Visibility::AdvancedUser
     };
 
@@ -90,14 +90,14 @@ namespace {
         "OzoneLayerHeightScale",
         "Ozone Scale Height (KM)",
         "It is the vertical distance over which the density and pressure fall by a "
-        "constant factor",
+        "constant factor.",
         openspace::properties::Property::Visibility::AdvancedUser
     };
 
     constexpr openspace::properties::Property::PropertyInfo OzoneLayerCoeffInfo = {
         "OzoneLayerCoeff",
         "Ozone Layer Extinction Coeff",
-        "Ozone scattering coefficients in meters",
+        "Ozone scattering coefficients in meters.",
         openspace::properties::Property::Visibility::AdvancedUser
     };
 
@@ -105,16 +105,14 @@ namespace {
         "MieHeightScale",
         "Mie Scale Height (KM)",
         "It is the vertical distance over which the density and pressure fall by a "
-        "constant factor",
-        // @VISIBILITY(3.2)
+        "constant factor.",
         openspace::properties::Property::Visibility::AdvancedUser
     };
 
     constexpr openspace::properties::Property::PropertyInfo MieScatteringCoeffInfo = {
         "MieScatteringCoeff",
         "Mie Scattering Coeff",
-        "Mie sea-level scattering coefficients in meters",
-        // @VISIBILITY(3.2)
+        "Mie sea-level scattering coefficients in meters.",
         openspace::properties::Property::Visibility::AdvancedUser
     };
 
@@ -123,24 +121,21 @@ namespace {
     {
         "MieScatteringExtinctionPropCoefficient",
         "Mie Scattering/Extinction Proportion Coefficient (%)",
-        "Mie Scattering/Extinction Proportion Coefficient (%)",
-        // @VISIBILITY(3.2)
+        "Mie Scattering/Extinction Proportion Coefficient.",
         openspace::properties::Property::Visibility::AdvancedUser
     };
 
     constexpr openspace::properties::Property::PropertyInfo MieAsymmetricFactorGInfo = {
         "MieAsymmetricFactorG",
         "Mie Asymmetric Factor G",
-        "Averaging of the scattering angle over a high number of scattering events",
-        // @VISIBILITY(3.2)
+        "Averaging of the scattering angle over a high number of scattering events.",
         openspace::properties::Property::Visibility::AdvancedUser
     };
 
     constexpr openspace::properties::Property::PropertyInfo SunIntensityInfo = {
         "SunIntensity",
         "Sun Intensity",
-        "Unitless for now",
-        // @VISIBILITY(2.6)
+        "Unitless for now.",
         openspace::properties::Property::Visibility::User
     };
 
@@ -149,7 +144,7 @@ namespace {
     {
         "SunFollowingCamera",
         "Enable Sun On Camera Position",
-        "When selected the Sun is artificially positioned behind the observer all times",
+        "When selected the Sun is artificially positioned behind the observer all times.",
         openspace::properties::Property::Visibility::User
     };
 
@@ -157,14 +152,13 @@ namespace {
         "EclipseHardShadowsInfo",
         "Enable Hard Shadows for Eclipses",
         "Enable/Disables hard shadows through the atmosphere",
-        // @VISIBILITY(2.8)
         openspace::properties::Property::Visibility::User
     };
 
     constexpr openspace::properties::Property::PropertyInfo AtmosphereDimmingHeightInfo ={
         "AtmosphereDimmingHeight",
         "Atmosphere Dimming Height",
-        "Percentage of the atmosphere where other objects, such as the stars, are faded",
+        "Percentage of the atmosphere where other objects, such as the stars, are faded.",
         openspace::properties::Property::Visibility::AdvancedUser
     };
 
@@ -172,14 +166,14 @@ namespace {
         "AtmosphereDimmingSunsetAngle",
         "Atmosphere Dimming Sunset Angle",
         "The angle (degrees) between the Camera and the Sun where the sunset starts, and "
-        "the atmosphere starts to fade in objects such as the stars",
+        "the atmosphere starts to fade in objects such as the stars.",
         openspace::properties::Property::Visibility::AdvancedUser
     };
 
     constexpr openspace::properties::Property::PropertyInfo SunAngularSize = {
         "SunAngularSize",
         "Angular Size of the Sun",
-        "Specifies the angular size of the Sun in degrees",
+        "Specifies the angular size of the Sun in degrees.",
         openspace::properties::Property::Visibility::AdvancedUser
     };
 
@@ -188,7 +182,7 @@ namespace {
         "Name of the light source",
         "This value is the name of a scene graph node that should be used as the source "
         "of illumination for the atmosphere. If this value is not specified, the solar "
-        "system's Sun is used instead",
+        "system's Sun is used instead.",
         openspace::properties::Property::Visibility::AdvancedUser
     };
 
diff --git a/modules/base/dashboard/dashboarditemangle.cpp b/modules/base/dashboard/dashboarditemangle.cpp
index 4a59cbdd66..511e261bff 100644
--- a/modules/base/dashboard/dashboarditemangle.cpp
+++ b/modules/base/dashboard/dashboarditemangle.cpp
@@ -50,8 +50,7 @@ namespace {
         "SourceType",
         "Source Type",
         "The type of position that is used as the triangle apex used to calculate the "
-        "angle. The default value is 'Camera'",
-        // @VISIBILITY(2.67)
+        "angle. The default value is 'Camera'.",
         openspace::properties::Property::Visibility::User
     };
 
@@ -61,8 +60,7 @@ namespace {
         "If a scene graph node is selected as type, this value specifies the name of the "
         "node that is to be used as the apex of the triangle used to calculate the "
         "angle. The computed angle is the incident angle to Source in the triangle ("
-        "Source, Reference, Destination)",
-        // @VISIBILITY(2.67)
+        "Source, Reference, Destination).",
         openspace::properties::Property::Visibility::User
     };
 
@@ -71,8 +69,7 @@ namespace {
         "Reference Type",
         "The type of position that is used as the destination of the reference line used "
         "to calculate the angle. The computed angle is the incident angle to Source in "
-        "the triangle (Source, Reference, Destination)",
-        // @VISIBILITY(2.67)
+        "the triangle (Source, Reference, Destination).",
         openspace::properties::Property::Visibility::User
     };
 
@@ -80,8 +77,7 @@ namespace {
         "ReferenceNodeName",
         "Reference Node Name",
         "If a scene graph node is selected as type, this value specifies the name of the "
-        "node that is to be used as the reference direction to compute the angle",
-        // @VISIBILITY(2.67)
+        "node that is to be used as the reference direction to compute the angle.",
         openspace::properties::Property::Visibility::User
     };
 
@@ -90,8 +86,7 @@ namespace {
         "Destination Type",
         "The type of position that is used as the destination to calculate the angle. "
         "The computed angle is the incident angle to Source in the triangle ("
-        "Source, Reference, Destination). The default value for this is 'Focus'",
-        // @VISIBILITY(2.67)
+        "Source, Reference, Destination). The default value for this is 'Focus'.",
         openspace::properties::Property::Visibility::User
     };
 
@@ -99,8 +94,7 @@ namespace {
         "DestinationNodeName",
         "Destination Node Name",
         "If a scene graph node is selected as type, this value specifies the name of the "
-        "node that is to be used as the destination for computing the angle",
-        // @VISIBILITY(2.67)
+        "node that is to be used as the destination for computing the angle.",
         openspace::properties::Property::Visibility::User
     };
 
diff --git a/modules/base/dashboard/dashboarditemdate.cpp b/modules/base/dashboard/dashboarditemdate.cpp
index f2fe23b3a3..5660386e00 100644
--- a/modules/base/dashboard/dashboarditemdate.cpp
+++ b/modules/base/dashboard/dashboarditemdate.cpp
@@ -40,7 +40,7 @@ namespace {
         "FormatString",
         "Format String",
         "The format text describing how this dashboard item renders its text. This text "
-        "must contain exactly one {} which is a placeholder that will contain the date",
+        "must contain exactly one {} which is a placeholder that will contain the date.",
         openspace::properties::Property::Visibility::AdvancedUser
     };
 
@@ -50,8 +50,7 @@ namespace {
         "The format string used for formatting the date/time before being passed to the "
         "string in FormatString. See "
         "https://naif.jpl.nasa.gov/pub/naif/toolkit_docs/C/cspice/timout_c.html for full "
-        "information about how to structure this format",
-        // @VISIBILITY(2.75)
+        "information about how to structure this format.",
         openspace::properties::Property::Visibility::User
     };
 
diff --git a/modules/base/dashboard/dashboarditemdistance.cpp b/modules/base/dashboard/dashboarditemdistance.cpp
index b3dcf73d25..d30a9ece34 100644
--- a/modules/base/dashboard/dashboarditemdistance.cpp
+++ b/modules/base/dashboard/dashboarditemdistance.cpp
@@ -52,8 +52,7 @@ namespace {
         "SourceType",
         "Source Type",
         "The type of position that is used as the source to calculate the distance. The "
-        "default value is 'Camera'",
-        // @VISIBILITY(2.67)
+        "default value is 'Camera'.",
         openspace::properties::Property::Visibility::User
     };
 
@@ -61,8 +60,7 @@ namespace {
         "SourceNodeName",
         "Source Node Name",
         "If a scene graph node is selected as type, this value specifies the name of the "
-        "node that is to be used as the source for computing the distance",
-        // @VISIBILITY(2.67)
+        "node that is to be used as the source for computing the distance.",
         openspace::properties::Property::Visibility::User
     };
 
@@ -70,8 +68,7 @@ namespace {
         "DestinationType",
         "Destination Type",
         "The type of position that is used as the destination to calculate the distance. "
-        "The default value for this is 'Focus'",
-        // @VISIBILITY(2.67)
+        "The default value for this is 'Focus'.",
         openspace::properties::Property::Visibility::User
     };
 
@@ -79,8 +76,7 @@ namespace {
         "DestinationNodeName",
         "Destination Node Name",
         "If a scene graph node is selected as type, this value specifies the name of the "
-        "node that is to be used as the destination for computing the distance",
-        // @VISIBILITY(2.33)
+        "node that is to be used as the destination for computing the distance.",
         openspace::properties::Property::Visibility::User
     };
 
@@ -89,7 +85,7 @@ namespace {
         "Simplification",
         "If this value is enabled, the distance is displayed in nuanced units, such as "
         "km, AU, light years, parsecs, etc. If this value is disabled, the unit can be "
-        "explicitly requested",
+        "explicitly requested.",
         openspace::properties::Property::Visibility::User
     };
 
@@ -97,7 +93,7 @@ namespace {
         "RequestedUnit",
         "Requested Unit",
         "If the simplification is disabled, this distance unit is used as a destination "
-        "to convert the meters into"
+        "to convert the meters into."
     };
 
     constexpr openspace::properties::Property::PropertyInfo FormatStringInfo = {
@@ -105,7 +101,7 @@ namespace {
         "Format String",
         "The format string that is used for formatting the distance string.  This format "
         "receives four parameters:  The name of the source, the name of the destination "
-        "the value of the distance and the unit of the distance",
+        "the value of the distance and the unit of the distance.",
         openspace::properties::Property::Visibility::AdvancedUser
     };
 
diff --git a/modules/base/dashboard/dashboarditemelapsedtime.cpp b/modules/base/dashboard/dashboarditemelapsedtime.cpp
index 9e231f8840..0ad562dda0 100644
--- a/modules/base/dashboard/dashboarditemelapsedtime.cpp
+++ b/modules/base/dashboard/dashboarditemelapsedtime.cpp
@@ -49,8 +49,7 @@ namespace {
         "ReferenceTime",
         "Reference Time",
         "The reference time relative to which the elapsed time is specified. The format "
-        "must be an ISO 8601-compliant date string",
-        // @VISIBILITY(2.75)
+        "must be an ISO 8601-compliant date string.",
         openspace::properties::Property::Visibility::User
     };
 
@@ -60,7 +59,6 @@ namespace {
         "If this value is enabled, the elapsed time will be simplified into seconds, "
         "minutes, hours, etc. If the value is disabled, the elapsed time is always "
         "presented in seconds. The default value for this is 'true'.",
-        // @VISIBILITY(2.25)
         openspace::properties::Property::Visibility::User
     };
 
@@ -69,7 +67,6 @@ namespace {
         "Lowest Time Unit when Simplifying",
         "If 'SimplifyTime' is enabled, this is the lowest time unit that will be shown. "
         "All finer grained timesteps will be ignored.",
-        // @VISIBILITY(2.75)
         openspace::properties::Property::Visibility::User
     };
 
diff --git a/modules/base/dashboard/dashboarditemframerate.cpp b/modules/base/dashboard/dashboarditemframerate.cpp
index 279c9e200b..139645c464 100644
--- a/modules/base/dashboard/dashboarditemframerate.cpp
+++ b/modules/base/dashboard/dashboarditemframerate.cpp
@@ -48,8 +48,7 @@ namespace {
     constexpr openspace::properties::Property::PropertyInfo FrametimeInfo = {
         "FrametimeType",
         "Type of the frame time display",
-        "This value determines the units in which the frame time is displayed",
-        // @VISIBILITY(2.75)
+        "This value determines the units in which the frame time is displayed.",
         openspace::properties::Property::Visibility::User
     };
 
@@ -57,11 +56,11 @@ namespace {
         "ClearCache",
         "Clear Cache",
         "Clears the cache of this DashboardItemFramerate item. If the selected option "
-        "does not use any caching, this trigger does not do anything",
+        "does not use any caching, this trigger does not do anything.",
         openspace::properties::Property::Visibility::AdvancedUser
     };
 
-    [[ nodiscard ]] char* formatDt(std::vector<char>& buffer) {
+    [[nodiscard]] char* formatDt(std::vector<char>& buffer) {
         return std::format_to(
             buffer.data(),
             "Avg. Frametime: {:.2f} ms\0",
@@ -69,7 +68,7 @@ namespace {
         );
     }
 
-    [[ nodiscard ]] char* formatDtExtremes(std::vector<char>& buffer,
+    [[nodiscard]] char* formatDtExtremes(std::vector<char>& buffer,
                                            double minFrametimeCache,
                                            double maxFrametimeCache)
     {
@@ -84,7 +83,7 @@ namespace {
         );
     }
 
-    [[ nodiscard ]] char* formatDtStandardDeviation(std::vector<char>& buffer) {
+    [[nodiscard]] char* formatDtStandardDeviation(std::vector<char>& buffer) {
         return std::format_to(
             buffer.data(),
             "Frametime standard deviation : {:.2f} ms\0",
@@ -92,7 +91,7 @@ namespace {
         );
     }
 
-    [[ nodiscard ]] char* formatDtCoefficientOfVariation(std::vector<char>& buffer) {
+    [[nodiscard]] char* formatDtCoefficientOfVariation(std::vector<char>& buffer) {
         return std::format_to(
             buffer.data(),
             "Frametime coefficient of variation : {:.2f} %\0",
@@ -101,7 +100,7 @@ namespace {
         );
     }
 
-    [[ nodiscard ]] char* formatFps(std::vector<char>& buffer) {
+    [[nodiscard]] char* formatFps(std::vector<char>& buffer) {
         return std::format_to(
             buffer.data(),
             "FPS: {:3.2f}\0",
@@ -109,7 +108,7 @@ namespace {
         );
     }
 
-    [[ nodiscard ]] char* formatAverageFps(std::vector<char>& buffer) {
+    [[nodiscard]] char* formatAverageFps(std::vector<char>& buffer) {
         return std::format_to(
             buffer.data(),
             "Avg. FPS: {:3.2f}\0",
@@ -117,7 +116,7 @@ namespace {
         );
     }
 
-    [[ nodiscard ]] char* format(std::vector<char>& buffer, FrametimeType frametimeType,
+    [[nodiscard]] char* format(std::vector<char>& buffer, FrametimeType frametimeType,
                                        double minFrametimeCache, double maxFrametimeCache)
     {
         using namespace openspace;
diff --git a/modules/base/dashboard/dashboarditeminputstate.cpp b/modules/base/dashboard/dashboarditeminputstate.cpp
index ed28511707..7463251f5b 100644
--- a/modules/base/dashboard/dashboarditeminputstate.cpp
+++ b/modules/base/dashboard/dashboarditeminputstate.cpp
@@ -37,40 +37,35 @@ namespace {
     constexpr openspace::properties::Property::PropertyInfo ShowWhenEnabledInfo = {
         "ShowWhenEnabled",
         "Show when enabled",
-        "Show text when the input is enabled",
-        // @VISIBILITY(?)
+        "Show text when the input is enabled.",
         openspace::properties::Property::Visibility::User
     };
 
     constexpr openspace::properties::Property::PropertyInfo ShowWhenDisabledInfo = {
         "ShowWhenDisabled",
         "Show when disabled",
-        "Show text when the input is disabled",
-        // @VISIBILITY(?)
+        "Show text when the input is disabled.",
         openspace::properties::Property::Visibility::User
     };
 
     constexpr openspace::properties::Property::PropertyInfo ShowKeyboardInfo = {
         "ShowKeyboard",
         "Show Keyboard information",
-        "Display the state of the keyboard input",
-        // @VISIBILITY(?)
+        "Display the state of the keyboard input.",
         openspace::properties::Property::Visibility::User
     };
 
     constexpr openspace::properties::Property::PropertyInfo ShowMouseInfo = {
         "ShowMouse",
         "Show Mouse information",
-        "Display the state of the mouse input",
-        // @VISIBILITY(?)
+        "Display the state of the mouse input.",
         openspace::properties::Property::Visibility::User
     };
 
     constexpr openspace::properties::Property::PropertyInfo ShowJoystickInfo = {
         "ShowJoystick",
         "Show Joystick information",
-        "Display the state of the joystick input",
-        // @VISIBILITY(?)
+        "Display the state of the joystick input.",
         openspace::properties::Property::Visibility::User
     };
 
diff --git a/modules/base/dashboard/dashboarditempropertyvalue.cpp b/modules/base/dashboard/dashboarditempropertyvalue.cpp
index 49f48920a5..10e8980339 100644
--- a/modules/base/dashboard/dashboarditempropertyvalue.cpp
+++ b/modules/base/dashboard/dashboarditempropertyvalue.cpp
@@ -56,8 +56,7 @@ namespace {
     constexpr openspace::properties::Property::PropertyInfo PropertyUriInfo = {
         "URI",
         "Property URI",
-        "The URI of the property that is displayed in this dashboarditem",
-        // @VISIBILITY(2.67)
+        "The URI of the property that is displayed in this dashboard item.",
         openspace::properties::Property::Visibility::User
     };
 
@@ -69,8 +68,7 @@ namespace {
         "instances of {}, which will be replaced with the value(s) of the property "
         "during rendering. For scalar types, there has to be exactly one instance of {}, "
         "for vector types, there need to be as many {} as there are compoents in the "
-        "vector, for example two {} for vec2 types, three for vec3 types, etc",
-        // @VISIBILITY(2.67)
+        "vector, for example two {} for vec2 types, three for vec3 types, etc.",
         openspace::properties::Property::Visibility::User
     };
 
diff --git a/modules/base/dashboard/dashboarditemsimulationincrement.cpp b/modules/base/dashboard/dashboarditemsimulationincrement.cpp
index 3707c7ce08..0d0c5353ba 100644
--- a/modules/base/dashboard/dashboarditemsimulationincrement.cpp
+++ b/modules/base/dashboard/dashboarditemsimulationincrement.cpp
@@ -41,8 +41,7 @@ namespace {
         "Time Simplification",
         "If this value is enabled, the time is displayed in nuanced units, such as "
         "minutes, hours, days, years, etc. If this value is disabled, it is always "
-        "displayed in seconds",
-        // @VISIBILITY(2.33)
+        "displayed in seconds.",
         openspace::properties::Property::Visibility::User
     };
 
@@ -50,8 +49,7 @@ namespace {
         "RequestedUnit",
         "Requested Unit",
         "If the simplification is disabled, this time unit is used as a destination to "
-        "convert the seconds into",
-        // @VISIBILITY(2.33)
+        "convert the seconds into.",
         openspace::properties::Property::Visibility::User
     };
 
@@ -63,7 +61,7 @@ namespace {
         "delta time. This format gets five parameters in this order:  The target delta "
         "time value, the target delta time unit, the string 'Paused' if the delta time "
         "is paused or the empty string otherwise, the current delta time value, and the "
-        "current delta time unit",
+        "current delta time unit.",
         openspace::properties::Property::Visibility::AdvancedUser
     };
 
@@ -73,7 +71,7 @@ namespace {
         "The format string used to format the text if the target delta time is the same "
         "as the current delta time. This format gets three parameters in this order:  "
         "The target delta value, the target delta unit, and the string 'Paused' if the "
-        "delta time is paused or the empty string otherwise",
+        "delta time is paused or the empty string otherwise.",
         openspace::properties::Property::Visibility::AdvancedUser
     };
 
diff --git a/modules/base/dashboard/dashboarditemspacing.cpp b/modules/base/dashboard/dashboarditemspacing.cpp
index 482e849d0a..30a5ca9069 100644
--- a/modules/base/dashboard/dashboarditemspacing.cpp
+++ b/modules/base/dashboard/dashboarditemspacing.cpp
@@ -33,8 +33,7 @@ namespace {
         "Spacing",
         "Spacing",
         "This value determines the spacing (in pixels) that this item represents. The "
-        "default value is 15",
-        // @VISIBILITY(2.33)
+        "default value is 15.",
         openspace::properties::Property::Visibility::User
     };
 
diff --git a/modules/base/dashboard/dashboarditemtext.cpp b/modules/base/dashboard/dashboarditemtext.cpp
index 10542723ab..149a478bd4 100644
--- a/modules/base/dashboard/dashboarditemtext.cpp
+++ b/modules/base/dashboard/dashboarditemtext.cpp
@@ -37,7 +37,7 @@ namespace {
     constexpr openspace::properties::Property::PropertyInfo TextInfo = {
         "Text",
         "Text",
-        "The text to be displayed",
+        "The text to be displayed.",
         openspace::properties::Property::Visibility::User
     };
 
diff --git a/modules/base/dashboard/dashboarditemvelocity.cpp b/modules/base/dashboard/dashboarditemvelocity.cpp
index bea74ca374..4fd8ac8d8c 100644
--- a/modules/base/dashboard/dashboarditemvelocity.cpp
+++ b/modules/base/dashboard/dashboarditemvelocity.cpp
@@ -45,7 +45,7 @@ namespace {
         "Simplification",
         "If this value is enabled, the velocity is displayed in nuanced units, such as "
         "m/s, AU/s, light years / s etc. If this value is disabled, the unit can be "
-        "explicitly requested",
+        "explicitly requested.",
         openspace::properties::Property::Visibility::User
     };
 
@@ -53,7 +53,7 @@ namespace {
         "RequestedUnit",
         "Requested Unit",
         "If the simplification is disabled, this distance unit is used for the velocity "
-        "display",
+        "display.",
         openspace::properties::Property::Visibility::User
     };
 
diff --git a/modules/base/lightsource/cameralightsource.cpp b/modules/base/lightsource/cameralightsource.cpp
index df58467ac0..e5285d02e9 100644
--- a/modules/base/lightsource/cameralightsource.cpp
+++ b/modules/base/lightsource/cameralightsource.cpp
@@ -33,8 +33,7 @@ namespace {
     constexpr openspace::properties::Property::PropertyInfo IntensityInfo = {
         "Intensity",
         "Intensity",
-        "The intensity of this light source",
-        // @VISIBILITY(1.75)
+        "The intensity of this light source.",
         openspace::properties::Property::Visibility::NoviceUser
     };
 
diff --git a/modules/base/lightsource/scenegraphlightsource.cpp b/modules/base/lightsource/scenegraphlightsource.cpp
index bcd035bfbd..fdb33d58ad 100644
--- a/modules/base/lightsource/scenegraphlightsource.cpp
+++ b/modules/base/lightsource/scenegraphlightsource.cpp
@@ -37,15 +37,14 @@ namespace {
     constexpr openspace::properties::Property::PropertyInfo IntensityInfo = {
         "Intensity",
         "Intensity",
-        "The intensity of this light source",
-        // @VISIBILITY(1.75)
+        "The intensity of this light source.",
         openspace::properties::Property::Visibility::NoviceUser
     };
 
     constexpr openspace::properties::Property::PropertyInfo NodeCameraStateInfo = {
         "Node",
         "Node",
-        "The identifier of the scene graph node to follow",
+        "The identifier of the scene graph node to follow.",
         openspace::properties::Property::Visibility::AdvancedUser
     };
 
diff --git a/modules/base/rendering/grids/renderableboxgrid.cpp b/modules/base/rendering/grids/renderableboxgrid.cpp
index d53632c94f..03028acddd 100644
--- a/modules/base/rendering/grids/renderableboxgrid.cpp
+++ b/modules/base/rendering/grids/renderableboxgrid.cpp
@@ -39,29 +39,28 @@ namespace {
     constexpr openspace::properties::Property::PropertyInfo ColorInfo = {
         "Color",
         "Color",
-        "This value determines the color of the grid lines that are rendered",
-        // @VISIBILITY(1.17)
+        "This value determines the color of the grid lines that are rendered.",
         openspace::properties::Property::Visibility::NoviceUser
     };
 
     constexpr openspace::properties::Property::PropertyInfo LineWidthInfo = {
         "LineWidth",
         "Line Width",
-        "This value specifies the line width of the spherical grid",
+        "This value specifies the line width of the spherical grid.",
         openspace::properties::Property::Visibility::User
     };
 
     constexpr openspace::properties::Property::PropertyInfo SizeInfo = {
         "Size",
         "Grid Size",
-        "This value species the size of each dimensions of the box",
+        "This value species the size of each dimensions of the box.",
         openspace::properties::Property::Visibility::AdvancedUser
     };
 
     const openspace::properties::PropertyOwner::PropertyOwnerInfo LabelsInfo = {
         "Labels",
         "Labels",
-        "The labels for the grid"
+        "The labels for the grid."
     };
 
     struct [[codegen::Dictionary(RenderableBoxGrid)]] Parameters {
diff --git a/modules/base/rendering/grids/renderablegrid.cpp b/modules/base/rendering/grids/renderablegrid.cpp
index ba03ab9f00..b530c843c6 100644
--- a/modules/base/rendering/grids/renderablegrid.cpp
+++ b/modules/base/rendering/grids/renderablegrid.cpp
@@ -39,16 +39,14 @@ namespace {
     constexpr openspace::properties::Property::PropertyInfo ColorInfo = {
         "Color",
         "Color",
-        "This value determines the color of the grid lines that are rendered",
-        // @VISIBILITY(1.25)
+        "This value determines the color of the grid lines that are rendered.",
         openspace::properties::Property::Visibility::NoviceUser
     };
 
     constexpr openspace::properties::Property::PropertyInfo HighlightColorInfo = {
         "HighlightColor",
         "Highlight Color",
-        "This value determines the color of the highlighted lines in the grid",
-        // @VISIBILITY(1.25)
+        "This value determines the color of the highlighted lines in the grid.",
         openspace::properties::Property::Visibility::NoviceUser
     };
 
@@ -56,8 +54,7 @@ namespace {
         "Segments",
         "Number of Segments",
         "This value specifies the number of segments that are used to render the "
-        "grid in each direction",
-        // @VISIBILITY(2.75)
+        "grid in each direction.",
         openspace::properties::Property::Visibility::User
     };
 
@@ -73,29 +70,28 @@ namespace {
     constexpr openspace::properties::Property::PropertyInfo LineWidthInfo = {
         "LineWidth",
         "Line Width",
-        "This value specifies the line width of the grid",
-        // @VISIBILITY(1.5)
+        "This value specifies the line width of the grid.",
         openspace::properties::Property::Visibility::NoviceUser
     };
 
     constexpr openspace::properties::Property::PropertyInfo HighlightLineWidthInfo = {
         "HighlightLineWidth",
         "Highlight Line Width",
-        "This value specifies the line width of the highlighted lines in the grid",
+        "This value specifies the line width of the highlighted lines in the grid.",
         openspace::properties::Property::Visibility::User
     };
 
     constexpr openspace::properties::Property::PropertyInfo SizeInfo = {
         "Size",
         "Grid Size",
-        "This value species the size of each dimensions of the grid",
+        "This value species the size of each dimensions of the grid.",
         openspace::properties::Property::Visibility::User
     };
 
     const openspace::properties::PropertyOwner::PropertyOwnerInfo LabelsInfo = {
         "Labels",
         "Labels",
-        "The labels for the grid"
+        "The labels for the grid."
     };
 
     struct [[codegen::Dictionary(RenderableGrid)]] Parameters {
diff --git a/modules/base/rendering/grids/renderableradialgrid.cpp b/modules/base/rendering/grids/renderableradialgrid.cpp
index 1449533ff7..4cc4dd3cdb 100644
--- a/modules/base/rendering/grids/renderableradialgrid.cpp
+++ b/modules/base/rendering/grids/renderableradialgrid.cpp
@@ -40,8 +40,7 @@ namespace {
     constexpr openspace::properties::Property::PropertyInfo ColorInfo = {
         "Color",
         "Color",
-        "This value determines the color of the grid lines that are rendered",
-        // @VISIBILITY(1.25)
+        "This value determines the color of the grid lines that are rendered.",
         openspace::properties::Property::Visibility::NoviceUser
     };
 
@@ -49,8 +48,7 @@ namespace {
         "GridSegments",
         "Number of Grid Segments",
         "Specifies the number of segments for the grid, in the radial and angular "
-        "direction respectively",
-        // @VISIBILITY(2.5)
+        "direction respectively.",
         openspace::properties::Property::Visibility::User
     };
 
@@ -58,15 +56,14 @@ namespace {
         "CircleSegments",
         "Number of Circle Segments",
         "This value specifies the number of segments that is used to render each circle "
-        "in the grid",
-        // @VISIBILITY(2.5)
+        "in the grid.",
         openspace::properties::Property::Visibility::User
     };
 
     constexpr openspace::properties::Property::PropertyInfo LineWidthInfo = {
         "LineWidth",
         "Line Width",
-        "This value specifies the line width of the spherical grid",
+        "This value specifies the line width of the spherical grid.",
         openspace::properties::Property::Visibility::User
     };
 
@@ -75,15 +72,14 @@ namespace {
         "Inner and Outer Radius",
         "The radii values that determine the size of the circular grid. The first value "
         "is the radius of the inmost ring and the second is the radius of the outmost "
-        "ring",
-        // @VISIBILITY(2.67)
+        "ring.",
         openspace::properties::Property::Visibility::User
     };
 
     const openspace::properties::PropertyOwner::PropertyOwnerInfo LabelsInfo = {
         "Labels",
         "Labels",
-        "The labels for the grid"
+        "The labels for the grid."
     };
 
     struct [[codegen::Dictionary(RenderableRadialGrid)]] Parameters {
diff --git a/modules/base/rendering/grids/renderablesphericalgrid.cpp b/modules/base/rendering/grids/renderablesphericalgrid.cpp
index 809bf737f9..f3d8aca5b2 100644
--- a/modules/base/rendering/grids/renderablesphericalgrid.cpp
+++ b/modules/base/rendering/grids/renderablesphericalgrid.cpp
@@ -39,8 +39,7 @@ namespace {
     constexpr openspace::properties::Property::PropertyInfo ColorInfo = {
         "Color",
         "Color",
-        "This value determines the color of the grid lines that are rendered",
-        // @VISIBILITY(1.25)
+        "This value determines the color of the grid lines that are rendered.",
         openspace::properties::Property::Visibility::NoviceUser
     };
 
@@ -48,23 +47,21 @@ namespace {
         "Segments",
         "Number of Segments",
         "This value specifies the number of segments that are used to render the "
-        "surrounding sphere",
-        // @VISIBILITY(2.25)
+        "surrounding sphere.",
         openspace::properties::Property::Visibility::User
     };
 
     constexpr openspace::properties::Property::PropertyInfo LineWidthInfo = {
         "LineWidth",
         "Line Width",
-        "This value specifies the line width of the spherical grid",
-        // @VISIBILITY(1.67)
+        "This value specifies the line width of the spherical grid.",
         openspace::properties::Property::Visibility::NoviceUser
     };
 
     const openspace::properties::PropertyOwner::PropertyOwnerInfo LabelsInfo = {
         "Labels",
         "Labels",
-        "The labels for the grid"
+        "The labels for the grid."
     };
 
     struct [[codegen::Dictionary(RenderableSphericalGrid)]] Parameters {
diff --git a/modules/base/rendering/pointcloud/renderablepointcloud.cpp b/modules/base/rendering/pointcloud/renderablepointcloud.cpp
index 96df080718..3b31642379 100644
--- a/modules/base/rendering/pointcloud/renderablepointcloud.cpp
+++ b/modules/base/rendering/pointcloud/renderablepointcloud.cpp
@@ -138,15 +138,14 @@ namespace {
         "FixedColor",
         "Fixed Color",
         "This value is used to define the color of the points when no color map is"
-        "used",
+        "used.",
         openspace::properties::Property::Visibility::NoviceUser
     };
 
     constexpr openspace::properties::Property::PropertyInfo DrawElementsInfo = {
         "DrawElements",
         "Draw Elements",
-        "Enables/Disables the drawing of the points",
-        // @VISIBILITY(1.25)
+        "Enables/Disables the drawing of the points.",
         openspace::properties::Property::Visibility::NoviceUser
     };
 
@@ -169,7 +168,6 @@ namespace {
         "camera is outside this range and fully invisible when inside the range. With "
         "inverted fading the situation is the opposite: the points are visible inside "
         "hen closer than the min value of the range and invisible when further away.",
-        // @VISIBILITY(3.25)
         openspace::properties::Property::Visibility::AdvancedUser
     };
 
@@ -235,7 +233,7 @@ namespace {
     constexpr openspace::properties::Property::PropertyInfo HasOrientationDataInfo = {
         "HasOrientationData",
         "Has Orientation Data",
-        "Set to true if orientation data was read from the dataset",
+        "Set to true if orientation data was read from the dataset.",
         openspace::properties::Property::Visibility::AdvancedUser
     };
 
diff --git a/modules/base/rendering/renderablecartesianaxes.cpp b/modules/base/rendering/renderablecartesianaxes.cpp
index da67e3c4ce..792fc17adf 100644
--- a/modules/base/rendering/renderablecartesianaxes.cpp
+++ b/modules/base/rendering/renderablecartesianaxes.cpp
@@ -40,24 +40,21 @@ namespace {
     constexpr openspace::properties::Property::PropertyInfo XColorInfo = {
         "XColor",
         "X Color",
-        "This value determines the color of the x axis",
-        // @VISIBILITY(1.5)
+        "This value determines the color of the x axis.",
         openspace::properties::Property::Visibility::NoviceUser
     };
 
     constexpr openspace::properties::Property::PropertyInfo YColorInfo = {
         "YColor",
         "Y Color",
-        "This value determines the color of the y axis",
-        // @VISIBILITY(1.5)
+        "This value determines the color of the y axis.",
         openspace::properties::Property::Visibility::NoviceUser
     };
 
     constexpr openspace::properties::Property::PropertyInfo ZColorInfo = {
         "ZColor",
         "Z Color",
-        "This value determines the color of the z axis",
-        // @VISIBILITY(1.5)
+        "This value determines the color of the z axis.",
         openspace::properties::Property::Visibility::NoviceUser
     };
 
diff --git a/modules/base/rendering/renderabledisc.cpp b/modules/base/rendering/renderabledisc.cpp
index a69435399c..dfbce826f2 100644
--- a/modules/base/rendering/renderabledisc.cpp
+++ b/modules/base/rendering/renderabledisc.cpp
@@ -47,16 +47,14 @@ namespace {
         "Texture",
         "Texture",
         "This value is the path to a texture on disk that contains a one-dimensional "
-        "texture to be used for the color",
-        // @VISIBILITY(2.75)
+        "texture to be used for the color.",
         openspace::properties::Property::Visibility::User
     };
 
     constexpr openspace::properties::Property::PropertyInfo SizeInfo = {
         "Size",
         "Size",
-        "This value specifies the outer radius of the disc in meter",
-        // @VISIBILITY(2.75)
+        "This value specifies the outer radius of the disc in meters.",
         openspace::properties::Property::Visibility::User
     };
 
@@ -65,7 +63,7 @@ namespace {
         "Width",
         "This value is used to set the width of the disc. The actual width is set "
         "based on the given size and this value should be set between 0 and 1. A value "
-        "of 1 results in a full circle and 0.5 a disc with an inner radius of 0.5*size",
+        "of 1 results in a full circle and 0.5 a disc with an inner radius of 0.5*size.",
         openspace::properties::Property::Visibility::AdvancedUser
     };
 
diff --git a/modules/base/rendering/renderablelabel.cpp b/modules/base/rendering/renderablelabel.cpp
index a73fdf0611..8ec38316bb 100644
--- a/modules/base/rendering/renderablelabel.cpp
+++ b/modules/base/rendering/renderablelabel.cpp
@@ -92,70 +92,63 @@ namespace {
     constexpr openspace::properties::Property::PropertyInfo BlendModeInfo = {
         "BlendMode",
         "Blending Mode",
-        "This determines the blending mode that is applied to the renderable",
+        "This determines the blending mode that is applied to the renderable.",
         openspace::properties::Property::Visibility::AdvancedUser
     };
 
     constexpr openspace::properties::Property::PropertyInfo ColorInfo = {
         "Color",
         "Color",
-        "The label text color",
-        // @VISIBILITY(1.33)
+        "The label text color.",
         openspace::properties::Property::Visibility::NoviceUser
     };
 
     constexpr openspace::properties::Property::PropertyInfo FontSizeInfo = {
         "FontSize",
         "Font Size",
-        "The font size (in points) for the label",
-        // @VISIBILITY(2.5)
+        "The font size (in points) for the label.",
         openspace::properties::Property::Visibility::User
     };
 
     constexpr openspace::properties::Property::PropertyInfo SizeInfo = {
         "Size",
         "Size",
-        "This value affects the size scale of the label",
-        // @VISIBILITY(2.75)
+        "This value affects the size scale of the label.",
         openspace::properties::Property::Visibility::User
     };
 
     constexpr openspace::properties::Property::PropertyInfo TextInfo = {
         "Text",
         "Text",
-        "The text that will be displayed on screen",
-        // @VISIBILITY(1.8)
+        "The text that will be displayed on screen.",
         openspace::properties::Property::Visibility::NoviceUser
     };
 
     constexpr openspace::properties::Property::PropertyInfo MinMaxSizeInfo = {
         "MinMaxSize",
         "Min and Max Size",
-        "The minimum and maximum size (in pixels) of the label",
+        "The minimum and maximum size (in pixels) of the label.",
         openspace::properties::Property::Visibility::AdvancedUser
     };
 
     constexpr openspace::properties::Property::PropertyInfo TransformationMatrixInfo = {
         "TransformationMatrix",
         "Transformation Matrix",
-        "Transformation matrix to be applied to the label",
-        // @VISIBILITY(3.6)
+        "Transformation matrix to be applied to the label.",
         openspace::properties::Property::Visibility::AdvancedUser
     };
 
     constexpr openspace::properties::Property::PropertyInfo OrientationOptionInfo = {
         "OrientationOption",
         "Orientation Option",
-        "Label orientation rendering mode",
-        // @VISIBILITY(2.8)
+        "Label orientation rendering mode.",
         openspace::properties::Property::Visibility::User
     };
 
     constexpr openspace::properties::Property::PropertyInfo EnableFadingEffectInfo = {
         "EnableFading",
         "Enable/Disable Fade-in Effect",
-        "Enable/Disable the Fade-in effect",
-        // @VISIBILITY(?)
+        "Enable/Disable the Fade-in effect.",
         openspace::properties::Property::Visibility::User
     };
 
@@ -166,7 +159,7 @@ namespace {
         "The first value is the distance before the closest distance and the second "
         "the one after the furthest distance. For example, with the unit Parsec (pc), "
         "a value of {1, 2} will make the label being fully faded out 1 Parsec before "
-        "the closest distance and 2 Parsec away from the furthest distance",
+        "the closest distance and 2 Parsec away from the furthest distance.",
         openspace::properties::Property::Visibility::AdvancedUser
     };
 
@@ -174,14 +167,14 @@ namespace {
         "FadeDistances",
         "Fade Distances",
         "The distance range in which the labels should be fully opaque, specified in "
-        "the chosen unit. The distance from the position of the label to the camera",
+        "the chosen unit. The distance from the position of the label to the camera.",
         openspace::properties::Property::Visibility::AdvancedUser
     };
 
     constexpr openspace::properties::Property::PropertyInfo FadeUnitOptionInfo = {
         "FadeUnit",
         "Fade Distance Unit",
-        "Distance unit for fade-in/-out distance calculations. Defaults to \"au\"",
+        "Distance unit for fade-in/-out distance calculations. Defaults to \"au\".",
         openspace::properties::Property::Visibility::AdvancedUser
     };
 
diff --git a/modules/base/rendering/renderablemodel.cpp b/modules/base/rendering/renderablemodel.cpp
index 7d303292ee..96a8d3452e 100644
--- a/modules/base/rendering/renderablemodel.cpp
+++ b/modules/base/rendering/renderablemodel.cpp
@@ -86,31 +86,28 @@ namespace {
     constexpr openspace::properties::Property::PropertyInfo EnableAnimationInfo = {
         "EnableAnimation",
         "Enable Animation",
-        "Enable or disable the animation for the model if it has any",
+        "Enable or disable the animation for the model if it has any.",
         openspace::properties::Property::Visibility::User
     };
 
     constexpr openspace::properties::Property::PropertyInfo AmbientIntensityInfo = {
         "AmbientIntensity",
         "Ambient Intensity",
-        "A multiplier for ambient lighting",
-        // @VISIBILITY(2.4)
+        "A multiplier for ambient lighting.",
         openspace::properties::Property::Visibility::User
     };
 
     constexpr openspace::properties::Property::PropertyInfo DiffuseIntensityInfo = {
         "DiffuseIntensity",
         "Diffuse Intensity",
-        "A multiplier for diffuse lighting",
-        // @VISIBILITY(2.4)
+        "A multiplier for diffuse lighting.",
         openspace::properties::Property::Visibility::User
     };
 
     constexpr openspace::properties::Property::PropertyInfo SpecularIntensityInfo = {
         "SpecularIntensity",
         "Specular Intensity",
-        "A multiplier for specular lighting",
-        // @VISIBILITY(2.4)
+        "A multiplier for specular lighting.",
         openspace::properties::Property::Visibility::User
     };
 
@@ -118,14 +115,14 @@ namespace {
         "PerformShading",
         "Perform Shading",
         "This value determines whether this model should be shaded by using the position "
-        "of the Sun",
+        "of the Sun.",
         openspace::properties::Property::Visibility::User
     };
 
     constexpr openspace::properties::Property::PropertyInfo EnableFaceCullingInfo = {
         "EnableFaceCulling",
         "Enable Face Culling",
-        "Enable OpenGL automatic face culling optimization",
+        "Enable OpenGL automatic face culling optimization.",
         openspace::properties::Property::Visibility::AdvancedUser
     };
 
@@ -133,14 +130,14 @@ namespace {
         "ModelTransform",
         "Model Transform",
         "This value specifies the model transform that is applied to the model before "
-        "all other transformations are applied",
+        "all other transformations are applied.",
         openspace::properties::Property::Visibility::Developer
     };
 
     constexpr openspace::properties::Property::PropertyInfo PivotInfo = {
         "Pivot",
         "Pivot",
-        "A vector that moves the place of origin for the model",
+        "A vector that moves the place of origin for the model.",
         openspace::properties::Property::Visibility::AdvancedUser
     };
 
@@ -151,29 +148,28 @@ namespace {
         "provided in the asset file, you can see and change it here. If instead a unit "
         "name was provided in the asset, this is the value that that name represents. "
         "For example 'Centimeter' becomes 0.01. For more information see "
-        "http://wiki.openspaceproject.com/docs/builders/models/model-scale.html",
+        "http://wiki.openspaceproject.com/docs/builders/models/model-scale.html.",
         openspace::properties::Property::Visibility::AdvancedUser
     };
 
     constexpr openspace::properties::Property::PropertyInfo RotationVecInfo = {
         "RotationVector",
         "Rotation Vector",
-        "Rotation Vector using degrees",
-        // @VISIBILITY(3.75)
+        "Rotation Vector using degrees.",
         openspace::properties::Property::Visibility::AdvancedUser
     };
 
     constexpr openspace::properties::Property::PropertyInfo LightSourcesInfo = {
         "LightSources",
         "Light Sources",
-        "A list of light sources that this model should accept light from",
+        "A list of light sources that this model should accept light from.",
         openspace::properties::Property::Visibility::AdvancedUser
     };
 
     constexpr openspace::properties::Property::PropertyInfo EnableDepthTestInfo = {
         "EnableDepthTest",
         "Enable Depth Test",
-        "Enable Depth Testing for the Model",
+        "Enable Depth Testing for the Model.",
         openspace::properties::Property::Visibility::AdvancedUser
     };
 
@@ -181,7 +177,7 @@ namespace {
         "BlendingOption",
         "Blending Options",
         "Changes the blending function used to calculate the colors of the model with "
-        "respect to the opacity",
+        "respect to the opacity.",
         openspace::properties::Property::Visibility::AdvancedUser
     };
 
diff --git a/modules/base/rendering/renderablenodearrow.cpp b/modules/base/rendering/renderablenodearrow.cpp
index 43a37c69fd..fa8e432a43 100644
--- a/modules/base/rendering/renderablenodearrow.cpp
+++ b/modules/base/rendering/renderablenodearrow.cpp
@@ -48,21 +48,21 @@ namespace {
     constexpr openspace::properties::Property::PropertyInfo StartNodeInfo = {
         "StartNode",
         "Start Node",
-        "The identifier of the node the arrow starts from",
+        "The identifier of the node the arrow starts from.",
         openspace::properties::Property::Visibility::NoviceUser
     };
 
     constexpr openspace::properties::Property::PropertyInfo EndNodeInfo = {
         "EndNode",
         "End Node",
-        "The identifier of the node the arrow should point towards",
+        "The identifier of the node the arrow should point towards.",
         openspace::properties::Property::Visibility::NoviceUser
     };
 
     constexpr openspace::properties::Property::PropertyInfo ColorInfo = {
         "Color",
         "Color",
-        "This value determines the RGB color for the arrow",
+        "This value determines the RGB color for the arrow.",
         openspace::properties::Property::Visibility::NoviceUser
     };
 
@@ -70,7 +70,7 @@ namespace {
         "Segments",
         "Number of Segments",
         "This value specifies the number of segments that the shapes for the arrow are "
-        "separated in. A higher number leads to a higher resolution",
+        "separated in. A higher number leads to a higher resolution.",
         openspace::properties::Property::Visibility::AdvancedUser
     };
 
@@ -87,7 +87,7 @@ namespace {
         "Arrow Head Size",
         "This size of the arrow head, given in relative value of the entire length of "
         "the arrow. For example, 0.1 makes the arrow head length be 10% of the full "
-        "arrow length",
+        "arrow length.",
         openspace::properties::Property::Visibility::AdvancedUser
     };
 
@@ -95,7 +95,7 @@ namespace {
         "ArrowHeadWidthFactor",
         "Arrow Head Width Factor",
         "A factor that is multiplied with the width, or the arrow itself, to determine "
-        "the width of the base of the arrow head",
+        "the width of the base of the arrow head.",
         openspace::properties::Property::Visibility::AdvancedUser
     };
 
@@ -105,7 +105,7 @@ namespace {
         "The distance from the center of the start node where the arrow starts. "
         "If 'UseRelativeOffset' is true, the value should be given as a factor to "
         "multiply with the bounding sphere of the node. Otherwise, the value is "
-        "specified in meters",
+        "specified in meters.",
         openspace::properties::Property::Visibility::AdvancedUser
     };
 
@@ -113,7 +113,7 @@ namespace {
         "UseRelativeOffset",
         "Use Relative Offset Distance",
         "Decide whether to use relative distances (in units of start node bounding "
-        "sphere) for the offset distance. If false, meters is used",
+        "sphere) for the offset distance. If false, meters is used.",
         openspace::properties::Property::Visibility::AdvancedUser
     };
 
@@ -122,7 +122,7 @@ namespace {
         "Length",
         "The length of the arrow, given either in meters or as a factor to be "
         "multiplied with the bounding sphere of the start node (if "
-        "'UseRelativeLength' is true)",
+        "'UseRelativeLength' is true).",
         openspace::properties::Property::Visibility::AdvancedUser
     };
 
@@ -130,42 +130,42 @@ namespace {
         "UseRelativeLength",
         "Use Relative Length",
         "Decide whether to use relative size (in units of start node bounding "
-        "sphere) for the length of the arrow. If false, meters is used",
+        "sphere) for the length of the arrow. If false, meters is used.",
         openspace::properties::Property::Visibility::AdvancedUser
     };
 
     constexpr openspace::properties::Property::PropertyInfo WidthInfo = {
         "Width",
         "Width",
-        "This value specifies the width of the arrow shape",
+        "This value specifies the width of the arrow shape.",
         openspace::properties::Property::Visibility::AdvancedUser
     };
 
     constexpr openspace::properties::Property::PropertyInfo AmbientIntensityInfo = {
         "AmbientIntensity",
         "Ambient Intensity",
-        "A multiplier for ambient lighting for the shading of the arrow",
+        "A multiplier for ambient lighting for the shading of the arrow.",
         openspace::properties::Property::Visibility::User
     };
 
     constexpr openspace::properties::Property::PropertyInfo DiffuseIntensityInfo = {
         "DiffuseIntensity",
         "Diffuse Intensity",
-        "A multiplier for diffuse lighting for the shading of the arrow",
+        "A multiplier for diffuse lighting for the shading of the arrow.",
         openspace::properties::Property::Visibility::User
     };
 
     constexpr openspace::properties::Property::PropertyInfo SpecularIntensityInfo = {
         "SpecularIntensity",
         "Specular Intensity",
-        "A multiplier for specular lighting for the shading of the arrow",
+        "A multiplier for specular lighting for the shading of the arrow.",
         openspace::properties::Property::Visibility::User
     };
 
     constexpr openspace::properties::Property::PropertyInfo ShadingEnabledInfo = {
         "PerformShading",
         "Perform Shading",
-        "This value determines whether shading should be applied to the arrow model",
+        "This value determines whether shading should be applied to the arrow model.",
         openspace::properties::Property::Visibility::User
     };
 
diff --git a/modules/base/rendering/renderablenodeline.cpp b/modules/base/rendering/renderablenodeline.cpp
index b48f8b04d1..91cabf5766 100644
--- a/modules/base/rendering/renderablenodeline.cpp
+++ b/modules/base/rendering/renderablenodeline.cpp
@@ -60,15 +60,14 @@ namespace {
     constexpr openspace::properties::Property::PropertyInfo LineColorInfo = {
         "Color",
         "Color",
-        "This value determines the RGB color for the line",
+        "This value determines the RGB color for the line.",
         openspace::properties::Property::Visibility::NoviceUser
     };
 
     constexpr openspace::properties::Property::PropertyInfo LineWidthInfo = {
         "LineWidth",
         "Line Width",
-        "This value specifies the line width",
-        // @VISIBILITY(1.75)
+        "This value specifies the line width.",
         openspace::properties::Property::Visibility::NoviceUser
     };
 
diff --git a/modules/base/rendering/renderableplane.cpp b/modules/base/rendering/renderableplane.cpp
index 9baf51f932..e11bc64a24 100644
--- a/modules/base/rendering/renderableplane.cpp
+++ b/modules/base/rendering/renderableplane.cpp
@@ -56,7 +56,7 @@ namespace {
         "Billboard mode",
         "This value specifies whether the plane is a billboard, which means that it is "
         "always facing the camera. If this is false, it can be oriented using other "
-        "transformations",
+        "transformations.",
         openspace::properties::Property::Visibility::AdvancedUser
     };
 
@@ -65,15 +65,14 @@ namespace {
         "Mirror backside of image plane",
         "If this value is set to false, the image plane will not be mirrored when "
         "looking from the backside. This is usually desirable when the image shows "
-        "data at a specific location, but not if it is displaying text for example",
-        // @VISIBILITY(2.67)
+        "data at a specific location, but not if it is displaying text for example.",
         openspace::properties::Property::Visibility::User
     };
 
     constexpr openspace::properties::Property::PropertyInfo SizeInfo = {
         "Size",
         "Size (in meters)",
-        "This value specifies the size of the plane in meters",
+        "This value specifies the size of the plane in meters.",
         openspace::properties::Property::Visibility::AdvancedUser
     };
 
@@ -87,7 +86,7 @@ namespace {
     constexpr openspace::properties::Property::PropertyInfo BlendModeInfo = {
         "BlendMode",
         "Blending Mode",
-        "This determines the blending mode that is applied to this plane",
+        "This determines the blending mode that is applied to this plane.",
         openspace::properties::Property::Visibility::AdvancedUser
     };
 
@@ -95,7 +94,7 @@ namespace {
         "MultiplyColor",
         "Multiply Color",
         "If set, the plane's texture is multiplied with this color. Useful for applying "
-        "a color grayscale images",
+        "a color grayscale images.",
         openspace::properties::Property::Visibility::User
     };
 
diff --git a/modules/base/rendering/renderableplaneimagelocal.cpp b/modules/base/rendering/renderableplaneimagelocal.cpp
index 83787db5de..b0e49da674 100644
--- a/modules/base/rendering/renderableplaneimagelocal.cpp
+++ b/modules/base/rendering/renderableplaneimagelocal.cpp
@@ -42,8 +42,7 @@ namespace {
         "Texture",
         "Texture",
         "This value specifies an image that is loaded from disk and is used as a texture "
-        "that is applied to this plane. This image has to be square",
-        // @VISIBILITY(2.25)
+        "that is applied to this plane. This image has to be square.",
         openspace::properties::Property::Visibility::User
     };
 
diff --git a/modules/base/rendering/renderableplaneimageonline.cpp b/modules/base/rendering/renderableplaneimageonline.cpp
index 142542c671..d9d0acb796 100644
--- a/modules/base/rendering/renderableplaneimageonline.cpp
+++ b/modules/base/rendering/renderableplaneimageonline.cpp
@@ -39,8 +39,7 @@ namespace {
         "Image URL",
         "Sets the URL of the texture that is displayed on this screen space plane. If "
         "this value is changed, the image at the new path will automatically be loaded "
-        "and displayed",
-        // @VISIBILITY(2.25)
+        "and displayed.",
         openspace::properties::Property::Visibility::User
     };
 
diff --git a/modules/base/rendering/renderableplanetimevaryingimage.cpp b/modules/base/rendering/renderableplanetimevaryingimage.cpp
index 4e367ccf39..34303d828a 100644
--- a/modules/base/rendering/renderableplanetimevaryingimage.cpp
+++ b/modules/base/rendering/renderableplanetimevaryingimage.cpp
@@ -45,7 +45,7 @@ namespace {
         "SourceFolder",
         "Source Folder",
         "This value specifies the image directory that is loaded from disk and "
-        "is used as a texture that is applied to this plane",
+        "is used as a texture that is applied to this plane.",
         openspace::properties::Property::Visibility::AdvancedUser
     };
 
@@ -53,8 +53,7 @@ namespace {
        "RenderType",
        "Render Type",
        "This value specifies if the plane should be rendered in the Background, "
-       "Opaque, Transparent, or Overlay rendering step",
-        // @VISIBILITY(3.67)
+       "Opaque, Transparent, or Overlay rendering step.",
         openspace::properties::Property::Visibility::AdvancedUser
     };
 
diff --git a/modules/base/rendering/renderableprism.cpp b/modules/base/rendering/renderableprism.cpp
index 9bac9b2a3d..a03209fcc0 100644
--- a/modules/base/rendering/renderableprism.cpp
+++ b/modules/base/rendering/renderableprism.cpp
@@ -44,8 +44,7 @@ namespace {
     constexpr openspace::properties::Property::PropertyInfo SegmentsInfo = {
         "Segments",
         "Segments",
-        "The number of segments the shape of the prism should have",
-        // @VISIBILITY(2.8)
+        "The number of segments the shape of the prism should have.",
         openspace::properties::Property::Visibility::User
     };
 
@@ -53,16 +52,14 @@ namespace {
         "NumLines",
         "Number of Lines",
         "The number of lines connecting the two shapes of the prism. They will be evenly "
-        "distributed around the bounding circle that makes up the shape of the prism",
-        // @VISIBILITY(2.8)
+        "distributed around the bounding circle that makes up the shape of the prism.",
         openspace::properties::Property::Visibility::User
     };
 
     constexpr openspace::properties::Property::PropertyInfo RadiusInfo = {
         "Radius",
         "Radius",
-        "The radius of the prism's shape in meters",
-        // @VISIBILITY(2.8)
+        "The radius of the prism's shape in meters.",
         openspace::properties::Property::Visibility::User
     };
 
@@ -70,32 +67,28 @@ namespace {
         "BaseRadius",
         "Base Radius",
         "The radius of the base of the prism's shape, in meters. By default it is given "
-        "the same radius as the outer shape",
-        // @VISIBILITY(2.8)
+        "the same radius as the outer shape.",
         openspace::properties::Property::Visibility::User
     };
 
     constexpr openspace::properties::Property::PropertyInfo LineWidthInfo = {
         "LineWidth",
         "Line Width",
-        "This value specifies the line width",
-        // @VISIBILITY(2.0)
+        "This value specifies the line width.",
         openspace::properties::Property::Visibility::User
     };
 
     constexpr openspace::properties::Property::PropertyInfo LineColorInfo = {
         "Color",
         "Color",
-        "This value determines the RGB color for the line",
-        // @VISIBILITY(1.2)
+        "This value determines the RGB color for the line.",
         openspace::properties::Property::Visibility::NoviceUser
     };
 
     constexpr openspace::properties::Property::PropertyInfo LengthInfo = {
         "Length",
         "Length",
-        "The length of the prism in meters",
-        // @VISIBILITY(2.8)
+        "The length of the prism in meters.",
         openspace::properties::Property::Visibility::User
     };
 
diff --git a/modules/base/rendering/renderablesphere.cpp b/modules/base/rendering/renderablesphere.cpp
index c0b5070127..efd1678d9b 100644
--- a/modules/base/rendering/renderablesphere.cpp
+++ b/modules/base/rendering/renderablesphere.cpp
@@ -48,15 +48,14 @@ namespace {
     constexpr openspace::properties::Property::PropertyInfo SizeInfo = {
         "Size",
         "Size (in meters)",
-        "This value specifies the radius of the sphere in meters",
+        "This value specifies the radius of the sphere in meters.",
         openspace::properties::Property::Visibility::AdvancedUser
     };
 
     constexpr openspace::properties::Property::PropertyInfo SegmentsInfo = {
         "Segments",
         "Number of Segments",
-        "This value specifies the number of segments that the sphere is separated in",
-        // @VISIBILITY(2.67)
+        "This value specifies the number of segments that the sphere is separated in.",
         openspace::properties::Property::Visibility::AdvancedUser
     };
 
@@ -70,21 +69,21 @@ namespace {
         "Orientation",
         "Orientation",
         "Specifies whether the texture is applied to the inside of the sphere, the "
-        "outside of the sphere, or both",
+        "outside of the sphere, or both.",
         openspace::properties::Property::Visibility::AdvancedUser
     };
 
     constexpr openspace::properties::Property::PropertyInfo MirrorTextureInfo = {
         "MirrorTexture",
         "Mirror Texture",
-        "Mirror the texture along the x-axis",
+        "Mirror the texture along the x-axis.",
         openspace::properties::Property::Visibility::AdvancedUser
     };
 
     constexpr openspace::properties::Property::PropertyInfo DisableFadeInOutInfo = {
         "DisableFadeInOut",
         "Disable Fade-In/Fade-Out effects",
-        "Enables/Disables the fade in and out effects",
+        "Enables/Disables the fade in and out effects.",
         openspace::properties::Property::Visibility::User
     };
 
@@ -94,7 +93,7 @@ namespace {
         "This value determines the distance from center of MilkyWay from where the "
         "astronomical object starts to fade in, given as a percentage of the size of "
         "the object. A negative or zero value means no fading in will happen. This is "
-        "also the default",
+        "also the default.",
         openspace::properties::Property::Visibility::AdvancedUser
     };
 
@@ -103,7 +102,7 @@ namespace {
         "Fade-Out Threshold",
         "This value determines percentage of the sphere that is visible before starting "
         "to fade it out. A negative or zero value means no fading out will happen. This "
-        "is also the default",
+        "is also the default.",
         openspace::properties::Property::Visibility::AdvancedUser
     };
 
diff --git a/modules/base/rendering/renderablesphereimagelocal.cpp b/modules/base/rendering/renderablesphereimagelocal.cpp
index c82abf7788..2a80a598dd 100644
--- a/modules/base/rendering/renderablesphereimagelocal.cpp
+++ b/modules/base/rendering/renderablesphereimagelocal.cpp
@@ -38,8 +38,7 @@ namespace {
         "Texture",
         "This value specifies an image that is loaded from disk and is used as a texture "
         "that is applied to this sphere. This image is expected to be an equirectangular "
-        "projection",
-        // @VISIBILITY(2.33)
+        "projection.",
         openspace::properties::Property::Visibility::User
     };
 
diff --git a/modules/base/rendering/renderablesphereimageonline.cpp b/modules/base/rendering/renderablesphereimageonline.cpp
index bf2757bdc1..df81368cbe 100644
--- a/modules/base/rendering/renderablesphereimageonline.cpp
+++ b/modules/base/rendering/renderablesphereimageonline.cpp
@@ -38,8 +38,7 @@ namespace {
         "Image URL",
         "Sets the URL of the texture that is displayed on this sphere. If "
         "this value is changed, the image at the new path will automatically be loaded "
-        "and displayed. This image is expected to be an equirectangular projection",
-        // @VISIBILITY(2.25)
+        "and displayed. This image is expected to be an equirectangular projection.",
         openspace::properties::Property::Visibility::User
     };
 
diff --git a/modules/base/rendering/renderabletimevaryingsphere.cpp b/modules/base/rendering/renderabletimevaryingsphere.cpp
index 317a414155..d7747c7d95 100644
--- a/modules/base/rendering/renderabletimevaryingsphere.cpp
+++ b/modules/base/rendering/renderabletimevaryingsphere.cpp
@@ -55,7 +55,7 @@ namespace {
         "Texture Source",
         "This value specifies a directory of images that are loaded from disk and is "
         "used as a texture that is applied to this sphere. The images are expected to "
-        "be an equirectangular projection",
+        "be an equirectangular projection.",
         openspace::properties::Property::Visibility::AdvancedUser
     };
 
diff --git a/modules/base/rendering/renderabletrail.cpp b/modules/base/rendering/renderabletrail.cpp
index 01a7c24159..3d0fe8551e 100644
--- a/modules/base/rendering/renderabletrail.cpp
+++ b/modules/base/rendering/renderabletrail.cpp
@@ -73,8 +73,7 @@ namespace {
     constexpr openspace::properties::Property::PropertyInfo LineColorInfo = {
         "Color",
         "Color",
-        "This value determines the RGB main color for the lines and points of the trail",
-        // @VISIBILITY(1.2)
+        "This value determines the RGB main color for the lines and points of the trail.",
         openspace::properties::Property::Visibility::NoviceUser
     };
 
@@ -83,8 +82,7 @@ namespace {
         "Enable line fading of old points",
         "Toggles whether the trail should fade older points out. If this value is "
         "'true', the 'Fade' parameter determines the speed of fading. If this value is "
-        "'false', the entire trail is rendered at full opacity and color",
-        // @VISIBILITY(1.25)
+        "'false', the entire trail is rendered at full opacity and color.",
         openspace::properties::Property::Visibility::NoviceUser
     };
 
@@ -95,7 +93,6 @@ namespace {
         "value of 1 will result in a trail that covers the entire extent. The setting "
         "only applies if 'EnableFade' is 'true'. If it is 'false', this setting has "
         "no effect.",
-        // @VISIBILITY(2.5)
         openspace::properties::Property::Visibility::User
     };
 
@@ -110,7 +107,6 @@ namespace {
         "will result in a trail that starts fading immediately, becoming fully "
         "transparent by the end of the trail. This setting only applies if the "
         "'EnableFade' value is 'true'. If it is 'false', this setting has no effect.",
-        // @VISIBILITY(2.5)
         openspace::properties::Property::Visibility::User
     };
 
@@ -119,8 +115,7 @@ namespace {
         "Line Width",
         "This value specifies the line width of the trail if the selected rendering "
         "method includes lines. If the rendering mode is set to Points, this value is "
-        "ignored",
-        // @VISIBILITY(2.4)
+        "ignored.",
         openspace::properties::Property::Visibility::User
     };
 
@@ -130,8 +125,7 @@ namespace {
         "This value specifies the base size of the points along the line if the selected "
         "rendering method includes points. If the rendering mode is set the Lines, this "
         "value is ignored. If a subsampling of the values is performed, the subsampled "
-        "values are half this size",
-        // @VISIBILITY(2.4)
+        "values are half this size.",
         openspace::properties::Property::Visibility::User
     };
 
@@ -140,12 +134,13 @@ namespace {
         "Rendering Mode",
         "Determines how the trail should be rendered. If 'Lines' is "
         "selected, only the line part is visible, if 'Points' is selected, only the "
-        "corresponding points (and subpoints) are shown. 'Lines+Points' shows both parts",
+        "corresponding points (and subpoints) are shown. 'Lines+Points' shows both "
+        "parts.",
         openspace::properties::Property::Visibility::AdvancedUser
     };
 
     struct [[codegen::Dictionary(RenderableTrail)]] Parameters {
-        // This object is used to compute locations along the path. Any Translation 
+        // This object is used to compute locations along the path. Any Translation
         // object can be used here
         ghoul::Dictionary translation
             [[codegen::reference("core_transform_translation")]];
diff --git a/modules/base/rendering/renderabletrailorbit.cpp b/modules/base/rendering/renderabletrailorbit.cpp
index 5f0a473af0..96ac84ad33 100644
--- a/modules/base/rendering/renderabletrailorbit.cpp
+++ b/modules/base/rendering/renderabletrailorbit.cpp
@@ -93,7 +93,7 @@ namespace {
         "The objects period, i.e. the length of its orbit around the parent object given "
         "in (Earth) days. In the case of Earth, this would be a sidereal year "
         "(=365.242 days). If this values is specified as multiples of the period, it is "
-        "possible to show the effects of precession",
+        "possible to show the effects of precession.",
         openspace::properties::Property::Visibility::User
     };
 
@@ -103,7 +103,7 @@ namespace {
         "The number of samples along the orbit. This determines the resolution of the "
         "trail; the tradeoff being that a higher resolution is able to resolve more "
         "detail, but will take more resources while rendering, too. The higher, the "
-        "smoother the trail, but also more memory will be used",
+        "smoother the trail, but also more memory will be used.",
         openspace::properties::Property::Visibility::AdvancedUser
     };
 
@@ -111,8 +111,7 @@ namespace {
        "RenderableType",
        "RenderableType",
        "This value specifies if the orbit should be rendered in the Background,"
-       "Opaque, Transparent, or Overlay rendering step. Default is Transparent",
-        // @VISIBILITY(3.25)
+       "Opaque, Transparent, or Overlay rendering step. Default is Transparent.",
         openspace::properties::Property::Visibility::AdvancedUser
     };
 
diff --git a/modules/base/rendering/renderabletrailtrajectory.cpp b/modules/base/rendering/renderabletrailtrajectory.cpp
index 8c9b6618d4..15016254d9 100644
--- a/modules/base/rendering/renderabletrailtrajectory.cpp
+++ b/modules/base/rendering/renderabletrailtrajectory.cpp
@@ -48,7 +48,7 @@ namespace {
         "StartTime",
         "Start Time",
         "The start time for the range of this trajectory. The date must be in ISO 8601 "
-        "format: YYYY MM DD HH:mm:ss.xxx",
+        "format: YYYY MM DD HH:mm:ss.xxx.",
         openspace::properties::Property::Visibility::AdvancedUser
     };
 
@@ -56,7 +56,7 @@ namespace {
         "EndTime",
         "End Time",
         "The end time for the range of this trajectory. The date must be in ISO 8601 "
-        "format: YYYY MM DD HH:mm:ss.xxx",
+        "format: YYYY MM DD HH:mm:ss.xxx.",
         openspace::properties::Property::Visibility::AdvancedUser
     };
 
@@ -66,7 +66,7 @@ namespace {
         "The interval between samples of the trajectory. This value (together with "
         "'TimeStampSubsampleFactor') determines how far apart (in time) the samples are "
         "spaced along the trajectory. The time interval between 'StartTime' and "
-        "'EndTime' is split into 'SampleInterval' * 'TimeStampSubsampleFactor' segments",
+        "'EndTime' is split into 'SampleInterval' * 'TimeStampSubsampleFactor' segments.",
         openspace::properties::Property::Visibility::AdvancedUser
     };
 
@@ -76,7 +76,7 @@ namespace {
         "The factor that is used to create subsamples along the trajectory. This value "
         "(together with 'SampleInterval') determines how far apart (in time) the samples "
         "are spaced along the trajectory. The time interval between 'StartTime' and "
-        "'EndTime' is split into 'SampleInterval' * 'TimeStampSubsampleFactor' segments",
+        "'EndTime' is split into 'SampleInterval' * 'TimeStampSubsampleFactor' segments.",
         openspace::properties::Property::Visibility::AdvancedUser
     };
 
@@ -84,8 +84,8 @@ namespace {
         "ShowFullTrail",
         "Render Full Trail",
         "If this value is set to 'true', the entire trail will be rendered; if it is "
-        "'false', only the trail until the current time in the application will be shown",
-        // @VISIBILITY(1.25)
+        "'false', only the trail until the current time in the application will be "
+        "shown.",
         openspace::properties::Property::Visibility::NoviceUser
     };
 
@@ -93,8 +93,8 @@ namespace {
         "SweepChunkSize",
         "Sweep Chunk Size",
         "The number of vertices that will be calculated each frame whenever the trail "
-        "needs to be recalculated. "
-        "A greater value will result in more calculations per frame.",
+        "needs to be recalculated. A greater value will result in more calculations per "
+        "frame.",
         openspace::properties::Property::Visibility::AdvancedUser
     };
 
@@ -113,7 +113,8 @@ namespace {
         "AccurateTrailPositions",
         "Number of Accurate Trail Points",
         "The number of vertices, each side of the object, that will be recalculated "
-        "for greater accuracy. This also ensures that the object connects with the trail.",
+        "for greater accuracy. This also ensures that the object connects with the "
+        "trail.",
         openspace::properties::Property::Visibility::AdvancedUser
     };
 
diff --git a/modules/base/rendering/screenspacedashboard.cpp b/modules/base/rendering/screenspacedashboard.cpp
index 32ee38765b..7d2904a788 100644
--- a/modules/base/rendering/screenspacedashboard.cpp
+++ b/modules/base/rendering/screenspacedashboard.cpp
@@ -41,7 +41,7 @@ namespace {
         "UseMainDashboard",
         "Use main dashboard",
         "If this value is set to 'true', this ScreenSpaceDashboard will use the "
-        "main dashboard instead of creating an independent one",
+        "main dashboard instead of creating an independent one.",
         openspace::properties::Property::Visibility::Developer
     };
 
diff --git a/modules/base/rendering/screenspaceframebuffer.cpp b/modules/base/rendering/screenspaceframebuffer.cpp
index 81380c5ede..6b8572578c 100644
--- a/modules/base/rendering/screenspaceframebuffer.cpp
+++ b/modules/base/rendering/screenspaceframebuffer.cpp
@@ -36,8 +36,7 @@ namespace {
     constexpr openspace::properties::Property::PropertyInfo SizeInfo = {
         "Size",
         "Size",
-        "This value explicitly specifies the size of the screen space plane",
-        // @VISIBILITY(3.75)
+        "This value explicitly specifies the size of the screen space plane.",
         openspace::properties::Property::Visibility::AdvancedUser
     };
 } // namespace
diff --git a/modules/base/rendering/screenspaceimagelocal.cpp b/modules/base/rendering/screenspaceimagelocal.cpp
index 188423fdde..b37666908c 100644
--- a/modules/base/rendering/screenspaceimagelocal.cpp
+++ b/modules/base/rendering/screenspaceimagelocal.cpp
@@ -42,8 +42,7 @@ namespace {
         "Sets the path of the texture that is displayed on this screen space plane. If "
         "this value is changed, the image at the new path will automatically be loaded "
         "and displayed. The size of the image will also automatically set the default "
-        "size of this plane",
-        // @VISIBILITY(2.4)
+        "size of this plane.",
         openspace::properties::Property::Visibility::User
     };
 
diff --git a/modules/base/rendering/screenspaceimageonline.cpp b/modules/base/rendering/screenspaceimageonline.cpp
index a7b6ac55dc..09c5261c0f 100644
--- a/modules/base/rendering/screenspaceimageonline.cpp
+++ b/modules/base/rendering/screenspaceimageonline.cpp
@@ -42,8 +42,7 @@ namespace {
         "Sets the URL of the texture that is displayed on this screen space plane. If "
         "this value is changed, the image at the new path will automatically be loaded "
         "and displayed. The size of the image will also automatically set the default "
-        "size of this plane",
-        // @VISIBILITY(2.4)
+        "size of this plane.",
         openspace::properties::Property::Visibility::User
     };
 
diff --git a/modules/base/rotation/constantrotation.cpp b/modules/base/rotation/constantrotation.cpp
index fb965c088c..0a14cbd1f3 100644
--- a/modules/base/rotation/constantrotation.cpp
+++ b/modules/base/rotation/constantrotation.cpp
@@ -34,16 +34,14 @@ namespace {
     constexpr openspace::properties::Property::PropertyInfo RotationInfo = {
         "RotationAxis",
         "Rotation Axis",
-        "This value is the rotation axis around which the object will rotate",
-        // @VISIBILITY(3.33)
+        "This value is the rotation axis around which the object will rotate.",
         openspace::properties::Property::Visibility::AdvancedUser
     };
 
     constexpr openspace::properties::Property::PropertyInfo RotationRateInfo = {
         "RotationRate",
         "Rotation Rate",
-        "This value determines the number of revolutions per in-game second",
-        // @VISIBILITY(3.33)
+        "This value determines the number of revolutions per in-game second.",
         openspace::properties::Property::Visibility::AdvancedUser
     };
 
diff --git a/modules/base/rotation/fixedrotation.cpp b/modules/base/rotation/fixedrotation.cpp
index 2a03a54a02..df1c24b4cb 100644
--- a/modules/base/rotation/fixedrotation.cpp
+++ b/modules/base/rotation/fixedrotation.cpp
@@ -42,8 +42,7 @@ namespace {
         "Enabled",
         "If this value is 'true', all the machinery of this rotation is used, of it is "
         "'false', it provides the ability to change its attributes without risking some "
-        "undefined behavior",
-        // @VISIBILITY(2.75)
+        "undefined behavior.",
         openspace::properties::Property::Visibility::User
     };
 
@@ -53,7 +52,7 @@ namespace {
         "This value specifies how this axis is being specified, that is whether it is "
         "referencing another object, specifying an absolute vector, or whether it is "
         "using the right handed coordinate system completion based off the other two "
-        "vectors",
+        "vectors.",
         openspace::properties::Property::Visibility::AdvancedUser
     };
 
@@ -63,7 +62,7 @@ namespace {
         "This value specifies how this axis is being specified, that is whether it is "
         "referencing another object, specifying an absolute vector, or whether it is "
         "using the right handed coordinate system completion based off the other two "
-        "vectors",
+        "vectors.",
         openspace::properties::Property::Visibility::AdvancedUser
     };
 
@@ -73,7 +72,7 @@ namespace {
         "This value specifies how this axis is being specified, that is whether it is "
         "referencing another object, specifying an absolute vector, or whether it is "
         "using the right handed coordinate system completion based off the other two "
-        "vectors",
+        "vectors.",
         openspace::properties::Property::Visibility::AdvancedUser
     };
 
@@ -82,7 +81,7 @@ namespace {
         "xAxis: Focus Object",
         "This is the object that the axis will focus on. This object must name an "
         "existing scene graph node in the currently loaded scene and the rotation will "
-        "stay fixed to the current position of that object",
+        "stay fixed to the current position of that object.",
         openspace::properties::Property::Visibility::AdvancedUser
     };
 
@@ -91,7 +90,7 @@ namespace {
         "yAxis: Focus Object",
         "This is the object that the axis will focus on. This object must name an "
         "existing scene graph node in the currently loaded scene and the rotation will "
-        "stay fixed to the current position of that object",
+        "stay fixed to the current position of that object.",
         openspace::properties::Property::Visibility::AdvancedUser
     };
 
@@ -100,7 +99,7 @@ namespace {
         "zAxis: Focus Object",
         "This is the object that the axis will focus on. This object must name an "
         "existing scene graph node in the currently loaded scene and the rotation will "
-        "stay fixed to the current position of that object",
+        "stay fixed to the current position of that object.",
         openspace::properties::Property::Visibility::AdvancedUser
     };
 
@@ -109,7 +108,7 @@ namespace {
         "xAxis: Invert Object Point Direction",
         "If this value is set to 'true', and the type is set to 'Object', the inverse of "
         "the pointing direction is used, causing the object to point away from the "
-        "referenced object",
+        "referenced object.",
         openspace::properties::Property::Visibility::AdvancedUser
     };
 
@@ -118,7 +117,7 @@ namespace {
         "yAxis: Invert Object Point Direction",
         "If this value is set to 'true', and the type is set to 'Object', the inverse of "
         "the pointing direction is used, causing the object to point away from the "
-        "referenced object",
+        "referenced object.",
         openspace::properties::Property::Visibility::AdvancedUser
     };
 
@@ -127,7 +126,7 @@ namespace {
         "zAxis: Invert Object Point Direction",
         "If this value is set to 'true', and the type is set to 'Object', the inverse of "
         "the pointing direction is used, causing the object to point away from the "
-        "referenced object",
+        "referenced object.",
         openspace::properties::Property::Visibility::AdvancedUser
     };
 
@@ -135,7 +134,7 @@ namespace {
         "xAxisVector",
         "xAxis: Direction vector",
         "This value specifies a static direction vector that is used for a fixed "
-        "rotation",
+        "rotation.",
         openspace::properties::Property::Visibility::AdvancedUser
     };
 
@@ -143,7 +142,7 @@ namespace {
         "yAxisVector",
         "yAxis: Direction vector",
         "This value specifies a static direction vector that is used for a fixed "
-        "rotation",
+        "rotation.",
         openspace::properties::Property::Visibility::AdvancedUser
     };
 
@@ -151,7 +150,7 @@ namespace {
         "zAxisVector",
         "zAxis: Direction vector",
         "This value specifies a static direction vector that is used for a fixed "
-        "rotation",
+        "rotation.",
         openspace::properties::Property::Visibility::AdvancedUser
     };
 
@@ -160,7 +159,7 @@ namespace {
         "xAxis: Vector is orthogonal",
         "This value determines whether the vector specified is used directly, or whether "
         "it is used together with another non-coordinate system completion vector to "
-        "construct an orthogonal vector instead",
+        "construct an orthogonal vector instead.",
         openspace::properties::Property::Visibility::AdvancedUser
     };
 
@@ -169,7 +168,7 @@ namespace {
         "yAxis: Vector is orthogonal",
         "This value determines whether the vector specified is used directly, or whether "
         "it is used together with another non-coordinate system completion vector to "
-        "construct an orthogonal vector instead",
+        "construct an orthogonal vector instead.",
         openspace::properties::Property::Visibility::AdvancedUser
     };
 
@@ -178,7 +177,7 @@ namespace {
         "zAxis: Vector is orthogonal",
         "This value determines whether the vector specified is used directly, or whether "
         "it is used together with another non-coordinate system completion vector to "
-        "construct an orthogonal vector instead",
+        "construct an orthogonal vector instead.",
         openspace::properties::Property::Visibility::AdvancedUser
     };
 
@@ -187,7 +186,7 @@ namespace {
         "Attached Node",
         "This is the name of the node that this rotation is attached to, this value is "
         "only needed if any of the three axis uses the Object type. In this case, the "
-        "location of the attached node is required to compute the relative direction",
+        "location of the attached node is required to compute the relative direction.",
         openspace::properties::Property::Visibility::AdvancedUser
     };
 
diff --git a/modules/base/rotation/luarotation.cpp b/modules/base/rotation/luarotation.cpp
index 183ba342b6..7608fb7664 100644
--- a/modules/base/rotation/luarotation.cpp
+++ b/modules/base/rotation/luarotation.cpp
@@ -43,8 +43,7 @@ namespace {
         "'rotation' that takes the current simulation time in seconds past the J2000 "
         "epoch as the first argument, the current wall time as milliseconds past the "
         "J2000 epoch as the second argument and computes the rotation returned as 9 "
-        "values",
-        // @VISIBILITY(3.25)
+        "values.",
         openspace::properties::Property::Visibility::AdvancedUser
     };
 
diff --git a/modules/base/rotation/staticrotation.cpp b/modules/base/rotation/staticrotation.cpp
index bf4ed3a55d..733456c96f 100644
--- a/modules/base/rotation/staticrotation.cpp
+++ b/modules/base/rotation/staticrotation.cpp
@@ -32,8 +32,7 @@ namespace {
         "Rotation",
         "Rotation",
         "This value is the used as a 3x3 rotation matrix that is applied to the scene "
-        "graph node that this transformation is attached to relative to its parent",
-        // @VISIBILITY(3.0)
+        "graph node that this transformation is attached to relative to its parent.",
         openspace::properties::Property::Visibility::AdvancedUser
     };
 
diff --git a/modules/base/rotation/timelinerotation.cpp b/modules/base/rotation/timelinerotation.cpp
index de2709f163..d8a628e17d 100644
--- a/modules/base/rotation/timelinerotation.cpp
+++ b/modules/base/rotation/timelinerotation.cpp
@@ -35,8 +35,7 @@ namespace {
         "ShouldInterpolate",
         "Should Interpolate",
         "If this value is set to 'true', an interpolation is applied between the given "
-        "keyframes. If this value is set to 'false', the interpolation is not applied",
-        // @VISIBILITY(3.2)
+        "keyframes. If this value is set to 'false', the interpolation is not applied.",
         openspace::properties::Property::Visibility::AdvancedUser
     };
 
diff --git a/modules/base/scale/luascale.cpp b/modules/base/scale/luascale.cpp
index 5a0e994fd6..23af817fd1 100644
--- a/modules/base/scale/luascale.cpp
+++ b/modules/base/scale/luascale.cpp
@@ -42,8 +42,7 @@ namespace {
         "scaling factor for this transformation. The script needs to define a function "
         "'scale' that takes the current simulation time in seconds past the J2000 epoch "
         "as the first argument, the current wall time as milliseconds past the J2000 "
-        "epoch the second argument and computes the three scaling factors",
-        // @VISIBILITY(3.25)
+        "epoch the second argument and computes the three scaling factors.",
         openspace::properties::Property::Visibility::AdvancedUser
     };
 
diff --git a/modules/base/scale/nonuniformstaticscale.cpp b/modules/base/scale/nonuniformstaticscale.cpp
index b7ba2ade87..cef4a0003c 100644
--- a/modules/base/scale/nonuniformstaticscale.cpp
+++ b/modules/base/scale/nonuniformstaticscale.cpp
@@ -32,7 +32,7 @@ namespace {
         "Scale",
         "Scale",
         "These values are used as scaling factors for the scene graph node that this "
-        "transformation is attached to relative to its parent",
+        "transformation is attached to relative to its parent.",
         openspace::properties::Property::Visibility::NoviceUser
     };
 
diff --git a/modules/base/scale/staticscale.cpp b/modules/base/scale/staticscale.cpp
index 4f916424cc..e577f2a852 100644
--- a/modules/base/scale/staticscale.cpp
+++ b/modules/base/scale/staticscale.cpp
@@ -32,7 +32,7 @@ namespace {
         "Scale",
         "Scale",
         "This value is used as a scaling factor for the scene graph node that this "
-        "transformation is attached to relative to its parent",
+        "transformation is attached to relative to its parent.",
         openspace::properties::Property::Visibility::NoviceUser
     };
 
diff --git a/modules/base/scale/timedependentscale.cpp b/modules/base/scale/timedependentscale.cpp
index e70b077fa4..e71e0310b6 100644
--- a/modules/base/scale/timedependentscale.cpp
+++ b/modules/base/scale/timedependentscale.cpp
@@ -37,8 +37,7 @@ namespace {
         "The date at which this scale will be 0. The current value of the scale is "
         "computed by taking the difference between the current time and the reference "
         "date and multiplying it by the speed. This field must be formatted as: "
-        "YYYY-MM-DDThh:mm:ss.uuu  where h is a 24h clock and u microseconds",
-        // @VISIBILITY(2.75)
+        "YYYY-MM-DDThh:mm:ss.uuu  where h is a 24h clock and u microseconds.",
         openspace::properties::Property::Visibility::User
     };
 
@@ -46,8 +45,7 @@ namespace {
         "Speed",
         "Speed",
         "The speed at which the value grows or shrinks. The units for this are meters "
-        "per second. The default value is 1 m/s",
-        // @VISIBILITY(2.75)
+        "per second. The default value is 1 m/s.",
         openspace::properties::Property::Visibility::User
     };
 
@@ -57,7 +55,7 @@ namespace {
         "If this value is true, the velocity computation will be clamped to a positive "
         "value if the current simulation time is before the `ReferenceDate`. This is "
         "useful for instantaneous events that only propagate forwards in time. The "
-        "default value is 'true'",
+        "default value is 'true'.",
         openspace::properties::Property::Visibility::AdvancedUser
     };
 
diff --git a/modules/base/timeframe/timeframeinterval.cpp b/modules/base/timeframe/timeframeinterval.cpp
index 7cf33cc43c..e7c76dbe5a 100644
--- a/modules/base/timeframe/timeframeinterval.cpp
+++ b/modules/base/timeframe/timeframeinterval.cpp
@@ -34,32 +34,28 @@ namespace {
     constexpr openspace::properties::Property::PropertyInfo HasStartInfo = {
         "HasStart",
         "Has Start",
-        "If enabled, this TimeFrame will be inactive before the Start",
-        // @VISIBILITY(2.75)
+        "If enabled, this TimeFrame will be inactive before the Start.",
         openspace::properties::Property::Visibility::User
     };
 
     constexpr openspace::properties::Property::PropertyInfo StartInfo = {
         "Start",
         "Start",
-        "Specifies the time when this TimeFrame becomes active",
-        // @VISIBILITY(2.75)
+        "Specifies the time when this TimeFrame becomes active.",
         openspace::properties::Property::Visibility::User
     };
 
     constexpr openspace::properties::Property::PropertyInfo HasEndInfo = {
         "HasEnd",
         "Has End",
-        "If enabled, this TimeFrame will be inactive after the End",
-        // @VISIBILITY(2.75)
+        "If enabled, this TimeFrame will be inactive after the End.",
         openspace::properties::Property::Visibility::User
     };
 
     constexpr openspace::properties::Property::PropertyInfo EndInfo = {
         "End",
         "End",
-        "Specifies the time when this TimeFrame becomes inactive",
-        // @VISIBILITY(2.75)
+        "Specifies the time when this TimeFrame becomes inactive.",
         openspace::properties::Property::Visibility::User
     };
 
diff --git a/modules/base/timeframe/timeframeunion.cpp b/modules/base/timeframe/timeframeunion.cpp
index bee5206165..78d36641c5 100644
--- a/modules/base/timeframe/timeframeunion.cpp
+++ b/modules/base/timeframe/timeframeunion.cpp
@@ -35,8 +35,8 @@ namespace {
         "TimeFrames",
         "Time Frames",
         "A vector of time frames to combine into one. The time frame is active when any "
-        "of the contained time frames are, but not in gaps between contained time frames",
-        // @VISIBILITY(3.75)
+        "of the contained time frames are, but not in gaps between contained time "
+        "frames.",
         openspace::properties::Property::Visibility::AdvancedUser
     };
 
diff --git a/modules/base/translation/luatranslation.cpp b/modules/base/translation/luatranslation.cpp
index e22857ff37..b5643108d2 100644
--- a/modules/base/translation/luatranslation.cpp
+++ b/modules/base/translation/luatranslation.cpp
@@ -43,8 +43,7 @@ namespace {
         "translation for this transformation. The script needs to define a function "
         "'translation' that takes the current simulation time in seconds past the J2000 "
         "epoch as the first argument, the current wall time as milliseconds past the "
-        "J2000 epoch as the second argument and computes the translation",
-        // @VISIBILITY(3.75)
+        "J2000 epoch as the second argument and computes the translation.",
         openspace::properties::Property::Visibility::AdvancedUser
     };
 
diff --git a/modules/base/translation/statictranslation.cpp b/modules/base/translation/statictranslation.cpp
index 079604db64..894c0f68e7 100644
--- a/modules/base/translation/statictranslation.cpp
+++ b/modules/base/translation/statictranslation.cpp
@@ -32,7 +32,7 @@ namespace {
         "Position",
         "Position",
         "This value is used as a static offset (in meters) that is applied to the scene "
-        "graph node that this transformation is attached to relative to its parent",
+        "graph node that this transformation is attached to relative to its parent.",
         // @VISIBILITY(2.25)
         openspace::properties::Property::Visibility::User
     };
diff --git a/modules/base/translation/timelinetranslation.cpp b/modules/base/translation/timelinetranslation.cpp
index e9a12adc0d..15c6c03fe3 100644
--- a/modules/base/translation/timelinetranslation.cpp
+++ b/modules/base/translation/timelinetranslation.cpp
@@ -35,7 +35,7 @@ namespace {
         "ShouldInterpolate",
         "Should Interpolate",
         "If this value is set to 'true', an interpolation is applied between the given "
-        "keyframes. If this value is set to 'false', the interpolation is not applied",
+        "keyframes. If this value is set to 'false', the interpolation is not applied.",
         openspace::properties::Property::Visibility::AdvancedUser
     };
 
diff --git a/modules/cefwebgui/cefwebguimodule.cpp b/modules/cefwebgui/cefwebguimodule.cpp
index 818505ccc0..308aa07347 100644
--- a/modules/cefwebgui/cefwebguimodule.cpp
+++ b/modules/cefwebgui/cefwebguimodule.cpp
@@ -41,38 +41,35 @@ namespace {
     constexpr openspace::properties::Property::PropertyInfo EnabledInfo = {
         "Enabled",
         "Enabled",
-        "This setting determines whether the browser should be enabled or not",
+        "This setting determines whether the browser should be enabled or not.",
         openspace::properties::Property::Visibility::AdvancedUser
     };
 
     constexpr openspace::properties::Property::PropertyInfo ReloadInfo = {
         "Reload",
         "Reload",
-        "Trigger this property to reload the browser",
-        // @VISIBILITY(2.2)
+        "Trigger this property to reload the browser.",
         openspace::properties::Property::Visibility::User
     };
 
     constexpr openspace::properties::Property::PropertyInfo VisibleInfo = {
         "Visible",
         "Is Visible",
-        "This setting determines whether the browser should be visible or not",
-        // @VISIBILITY(2.75)
+        "This setting determines whether the browser should be visible or not.",
         openspace::properties::Property::Visibility::User
     };
 
     constexpr openspace::properties::Property::PropertyInfo GuiUrlInfo = {
         "GuiUrl",
         "GUI URL",
-        "The URL of the webpage that is used to load the WebGUI from",
-        // @VISIBILITY(3.5)
+        "The URL of the webpage that is used to load the WebGUI from.",
         openspace::properties::Property::Visibility::AdvancedUser
     };
 
     constexpr openspace::properties::Property::PropertyInfo GuiScaleInfo = {
         "GuiScale",
         "Gui Scale",
-        "GUI scale multiplier",
+        "GUI scale multiplier.",
         openspace::properties::Property::Visibility::Always
     };
 } // namespace
diff --git a/modules/debugging/rendering/renderabledebugplane.cpp b/modules/debugging/rendering/renderabledebugplane.cpp
index 906d21f5bc..2509db87a2 100644
--- a/modules/debugging/rendering/renderabledebugplane.cpp
+++ b/modules/debugging/rendering/renderabledebugplane.cpp
@@ -51,8 +51,7 @@ namespace {
     constexpr openspace::properties::Property::PropertyInfo TextureInfo = {
         "Texture",
         "Texture",
-        "The OpenGL name of the texture that is displayed on this plane",
-        // @VISIBILITY(3.75)
+        "The OpenGL name of the texture that is displayed on this plane.",
         openspace::properties::Property::Visibility::AdvancedUser
     };
 
@@ -61,24 +60,21 @@ namespace {
         "Billboard mode",
         "This value specifies whether the plane is a billboard, which means that it is "
         "always facing the camera. If this is false, it can be oriented using other "
-        "transformations",
-        // @VISIBILITY(3.75)
+        "transformations.",
         openspace::properties::Property::Visibility::AdvancedUser
     };
 
     constexpr openspace::properties::Property::PropertyInfo SizeInfo = {
         "Size",
         "Size (in meters)",
-        "This value specifies the size of the plane in meters",
-        // @VISIBILITY(3.75)
+        "This value specifies the size of the plane in meters.",
         openspace::properties::Property::Visibility::AdvancedUser
     };
 
     constexpr openspace::properties::Property::PropertyInfo OriginInfo = {
         "Origin",
         "Texture Coordinate Origin",
-        "The origin of the texture coorinate system",
-        // @VISIBILITY(3.75)
+        "The origin of the texture coorinate system.",
         openspace::properties::Property::Visibility::AdvancedUser
     };
 
diff --git a/modules/digitaluniverse/rendering/renderabledumeshes.cpp b/modules/digitaluniverse/rendering/renderabledumeshes.cpp
index aa17764658..a933ccb66e 100644
--- a/modules/digitaluniverse/rendering/renderabledumeshes.cpp
+++ b/modules/digitaluniverse/rendering/renderabledumeshes.cpp
@@ -62,7 +62,7 @@ namespace {
     constexpr openspace::properties::Property::PropertyInfo TextColorInfo = {
         "TextColor",
         "Text Color",
-        "The text color for the astronomical object",
+        "The text color for the astronomical object.",
         openspace::properties::Property::Visibility::NoviceUser
     };
 
@@ -70,14 +70,14 @@ namespace {
         "TextOpacity",
         "Text Opacity",
         "Determines the transparency of the text label, where 1 is completely opaque "
-        "and 0 fully transparent",
+        "and 0 fully transparent.",
         openspace::properties::Property::Visibility::NoviceUser
     };
 
     constexpr openspace::properties::Property::PropertyInfo TextSizeInfo = {
         "TextSize",
         "Text Size",
-        "The text size for the astronomical object labels",
+        "The text size for the astronomical object labels.",
         openspace::properties::Property::Visibility::User
     };
 
@@ -85,7 +85,7 @@ namespace {
         "LabelFile",
         "Label File",
         "The path to the label file that contains information about the astronomical "
-        "objects being rendered",
+        "objects being rendered.",
         openspace::properties::Property::Visibility::AdvancedUser
     };
 
@@ -93,44 +93,42 @@ namespace {
         "TextMinMaxSize",
         "Text Min/Max Size",
         "The minimum and maximum size (in pixels) of the text for the labels for the "
-        "astronomical objects being rendered",
+        "astronomical objects being rendered.",
         openspace::properties::Property::Visibility::AdvancedUser
     };
 
     constexpr openspace::properties::Property::PropertyInfo LineWidthInfo = {
         "LineWidth",
         "Line Width",
-        "If the DU mesh is of wire type, this value determines the width of the lines",
-        // @VISIBILITY(1.75)
+        "If the DU mesh is of wire type, this value determines the width of the lines.",
         openspace::properties::Property::Visibility::NoviceUser
     };
 
     constexpr openspace::properties::Property::PropertyInfo DrawElementsInfo = {
         "DrawElements",
         "Draw Elements",
-        "Enables/Disables the drawing of the astronomical objects",
+        "Enables/Disables the drawing of the astronomical objects.",
         openspace::properties::Property::Visibility::NoviceUser
     };
 
     constexpr openspace::properties::Property::PropertyInfo DrawLabelInfo = {
         "DrawLabels",
         "Draw Labels",
-        "Determines whether labels should be drawn or hidden",
+        "Determines whether labels should be drawn or hidden.",
         openspace::properties::Property::Visibility::NoviceUser
     };
 
     constexpr openspace::properties::Property::PropertyInfo MeshColorInfo = {
         "MeshColor",
         "Meshes colors",
-        "The defined colors for the meshes to be rendered",
-        // @VISIBILITY(1.25)
+        "The defined colors for the meshes to be rendered.",
         openspace::properties::Property::Visibility::NoviceUser
     };
 
     constexpr openspace::properties::Property::PropertyInfo RenderOptionInfo = {
         "RenderOption",
         "Render Option",
-        "Debug option for rendering of billboards and texts",
+        "Debug option for rendering of billboards and texts.",
         openspace::properties::Property::Visibility::AdvancedUser
     };
 
diff --git a/modules/exoplanets/exoplanetsmodule.cpp b/modules/exoplanets/exoplanetsmodule.cpp
index bfc6137b23..454b89fbcc 100644
--- a/modules/exoplanets/exoplanetsmodule.cpp
+++ b/modules/exoplanets/exoplanetsmodule.cpp
@@ -53,28 +53,28 @@ namespace {
     constexpr openspace::properties::Property::PropertyInfo EnabledInfo = {
         "Enabled",
         "Enabled",
-        "Decides if the GUI for this module should be enabled",
+        "Decides if the GUI for this module should be enabled.",
         openspace::properties::Property::Visibility::AdvancedUser
     };
 
     constexpr openspace::properties::Property::PropertyInfo DataFolderInfo = {
         "DataFolder",
         "Data Folder",
-        "The path to the folder containing the exoplanets data and lookup table",
+        "The path to the folder containing the exoplanets data and lookup table.",
         openspace::properties::Property::Visibility::AdvancedUser
     };
 
     constexpr openspace::properties::Property::PropertyInfo BvColorMapInfo = {
         "BvColormap",
         "B-V Colormap",
-        "The path to a cmap file that maps a B-V color index to an RGB color",
+        "The path to a cmap file that maps a B-V color index to an RGB color.",
         openspace::properties::Property::Visibility::AdvancedUser
     };
 
     constexpr openspace::properties::Property::PropertyInfo StarTextureInfo = {
         "StarTexture",
         "Star Texture",
-        "The path to a grayscale image that is used for the host star surfaces",
+        "The path to a grayscale image that is used for the host star surfaces.",
         openspace::properties::Property::Visibility::AdvancedUser
     };
 
@@ -82,7 +82,7 @@ namespace {
         "StarGlareTexture",
         "Star Glare Texture",
         "The path to a grayscale image that is used for the glare effect of the "
-        "host stars",
+        "host stars.",
         openspace::properties::Property::Visibility::AdvancedUser
     };
 
@@ -90,7 +90,7 @@ namespace {
         "NoDataTexture",
         "No Data Star Texture",
         "A path to a texture that is used to represent that there is missing data about "
-        "the star. For example no color information",
+        "the star. For example no color information.",
         openspace::properties::Property::Visibility::AdvancedUser
     };
 
@@ -98,7 +98,7 @@ namespace {
         "OrbitDiscTexture",
         "Orbit Disc Texture",
         "A path to a 1-dimensional image used as a transfer function for the "
-        "exoplanets' orbit uncertainty disc",
+        "exoplanets' orbit uncertainty disc.",
         openspace::properties::Property::Visibility::AdvancedUser
     };
 
@@ -106,7 +106,7 @@ namespace {
         "HabitableZoneTexture",
         "Habitable Zone Texture",
         "A path to a 1-dimensional image used as a transfer function for the "
-        "habitable zone disc",
+        "habitable zone disc.",
         openspace::properties::Property::Visibility::AdvancedUser
     };
 
@@ -115,7 +115,7 @@ namespace {
         "Comparison Circle Color",
         "Decides the color of the 1 AU size comparison circles that are generated as "
         "part of an exoplanet system. Changing the color will not modify already "
-        "existing circles",
+        "existing circles.",
         openspace::properties::Property::Visibility::NoviceUser
     };
 
@@ -123,8 +123,7 @@ namespace {
         "ShowComparisonCircle",
         "Show Comparison Circle",
         "If true, the 1 AU size comparison circle is enabled per default when an "
-        "exoplanet system is created",
-        // @VISIBILITY(1.8)
+        "exoplanet system is created.",
         openspace::properties::Property::Visibility::NoviceUser
     };
 
@@ -132,7 +131,7 @@ namespace {
         "ShowOrbitUncertainty",
         "Show Orbit Uncertainty",
         "If true, a disc showing the uncertainty for each planetary orbit is enabled per "
-        "default when an exoplanet system is created",
+        "default when an exoplanet system is created.",
         openspace::properties::Property::Visibility::User
     };
 
@@ -140,7 +139,7 @@ namespace {
         "ShowHabitableZone",
         "Show Habitable Zone",
         "If true, the habitable zone disc is enabled per default when an exoplanet "
-        "system is created",
+        "system is created.",
         openspace::properties::Property::Visibility::User
     };
 
@@ -148,8 +147,7 @@ namespace {
         "UseOptimisticZone",
         "Use Optimistic Zone Boundaries",
         "If true, the habitable zone is computed with optimistic boundaries per default "
-        "when an exoplanet system is created",
-        // @VISIBILITY(2.8)
+        "when an exoplanet system is created.",
         openspace::properties::Property::Visibility::User
     };
 
@@ -157,8 +155,7 @@ namespace {
         "HabitableZoneOpacity",
         "Habitable Zone Opacity",
         "The opacity value used for the habitable zone renderable for a created "
-        "exoplanet system",
-        // @VISIBILITY(1.5)
+        "exoplanet system.",
         openspace::properties::Property::Visibility::NoviceUser
     };
 
diff --git a/modules/exoplanets/rendering/renderableorbitdisc.cpp b/modules/exoplanets/rendering/renderableorbitdisc.cpp
index edd8f9a81f..5e81661183 100644
--- a/modules/exoplanets/rendering/renderableorbitdisc.cpp
+++ b/modules/exoplanets/rendering/renderableorbitdisc.cpp
@@ -49,14 +49,14 @@ namespace {
         "Texture",
         "Texture",
         "This value is the path to a texture on disk that contains a one-dimensional "
-        "texture which is used for the color",
+        "texture which is used for the color.",
         openspace::properties::Property::Visibility::AdvancedUser
     };
 
     constexpr openspace::properties::Property::PropertyInfo SizeInfo = {
         "Size",
         "Size",
-        "This value specifies the semi-major axis of the orbit, in meter",
+        "This value specifies the semi-major axis of the orbit, in meters.",
         openspace::properties::Property::Visibility::AdvancedUser
     };
 
@@ -64,7 +64,7 @@ namespace {
         "Eccentricity",
         "Eccentricity",
         "This value determines the eccentricity, that is the deviation from a perfect "
-        "sphere, for this orbit",
+        "sphere, for this orbit.",
         openspace::properties::Property::Visibility::AdvancedUser
     };
 
@@ -74,7 +74,7 @@ namespace {
         "This property determines the width of the disc. The values specify the lower "
         "and upper deviation from the semi major axis, respectively. The values are "
         "relative to the size of the semi-major axis. That is, 0 means no deviation "
-        "from the semi-major axis and 1 is a whole semi-major axis's worth of deviation",
+        "from the semi-major axis and 1 is a whole semi-major axis's worth of deviation.",
         openspace::properties::Property::Visibility::AdvancedUser
     };
 
@@ -82,8 +82,7 @@ namespace {
         "MultiplyColor",
         "Multiply Color",
         "If set, the disc's texture is multiplied with this color. Useful for applying a "
-        "color grayscale images",
-        // @VISIBILITY(1.5)
+        "color grayscale images.",
         openspace::properties::Property::Visibility::NoviceUser
     };
 
diff --git a/modules/fieldlines/rendering/renderablefieldlines.cpp b/modules/fieldlines/rendering/renderablefieldlines.cpp
index f382a7b532..c311b69dd1 100644
--- a/modules/fieldlines/rendering/renderablefieldlines.cpp
+++ b/modules/fieldlines/rendering/renderablefieldlines.cpp
@@ -71,10 +71,8 @@ namespace {
 
     constexpr openspace::properties::Property::PropertyInfo StepSizeInfo = {
         "Stepsize",
-        //"StepSize",
-        "Fieldline Step Size",
+        "Fieldline Step Size.",
         "", // @TODO Missing documentation
-        // @VISIBILITY(2.75)
         openspace::properties::Property::Visibility::User
     };
 
diff --git a/modules/fieldlinessequence/rendering/renderablefieldlinessequence.cpp b/modules/fieldlinessequence/rendering/renderablefieldlinessequence.cpp
index e68845d67c..e72436b3e9 100644
--- a/modules/fieldlinessequence/rendering/renderablefieldlinessequence.cpp
+++ b/modules/fieldlinessequence/rendering/renderablefieldlinessequence.cpp
@@ -53,110 +53,104 @@ namespace {
         "ColorMethod",
         "Color Method",
         "Color lines uniformly or using color tables based on extra quantities like, for "
-        "examples, temperature or particle density",
+        "examples, temperature or particle density.",
         openspace::properties::Property::Visibility::AdvancedUser
     };
     constexpr openspace::properties::Property::PropertyInfo ColorQuantityInfo = {
         "ColorQuantity",
         "Quantity to Color By",
-        "Quantity used to color lines if the 'By Quantity' color method is selected",
-        // @VISIBILITY(2.67)
+        "Quantity used to color lines if the 'By Quantity' color method is selected.",
         openspace::properties::Property::Visibility::User
     };
     constexpr openspace::properties::Property::PropertyInfo ColorMinMaxInfo = {
         "ColorQuantityMinMax",
         "ColorTable Min Value",
-        "Value to map to the lowest and highest end of the color table",
+        "Value to map to the lowest and highest end of the color table.",
         openspace::properties::Property::Visibility::AdvancedUser
     };
     constexpr openspace::properties::Property::PropertyInfo ColorTablePathInfo = {
         "ColorTablePath",
         "Path to Color Table",
-        "Color Table/Transfer Function to use for 'By Quantity' coloring",
+        "Color Table/Transfer Function to use for 'By Quantity' coloring.",
         openspace::properties::Property::Visibility::AdvancedUser
     };
     constexpr openspace::properties::Property::PropertyInfo ColorUniformInfo = {
         "Color",
         "Uniform Line Color",
-        "The uniform color of lines shown when 'Color Method' is set to 'Uniform'",
-        // @VISIBILITY(1.67)
+        "The uniform color of lines shown when 'Color Method' is set to 'Uniform'.",
         openspace::properties::Property::Visibility::NoviceUser
     };
     constexpr openspace::properties::Property::PropertyInfo ColorUseABlendingInfo = {
         "ABlendingEnabled",
         "Additive Blending",
-        "Activate/deactivate additive blending",
+        "Activate/deactivate additive blending.",
         openspace::properties::Property::Visibility::AdvancedUser
     };
     constexpr openspace::properties::Property::PropertyInfo DomainEnabledInfo = {
         "DomainEnabled",
         "Domain Limits",
-        "Enable/Disable domain limits",
+        "Enable/Disable domain limits.",
         openspace::properties::Property::Visibility::User
     };
     constexpr openspace::properties::Property::PropertyInfo DomainXInfo = {
         "LimitsX",
         "X-limits",
-        "Valid range along the X-axis. [Min, Max]",
+        "Valid range along the X-axis. [Min, Max].",
         openspace::properties::Property::Visibility::AdvancedUser
     };
     constexpr openspace::properties::Property::PropertyInfo DomainYInfo = {
         "LimitsY",
         "Y-limits",
-        "Valid range along the Y-axis. [Min, Max]",
+        "Valid range along the Y-axis. [Min, Max].",
         openspace::properties::Property::Visibility::AdvancedUser
     };
     constexpr openspace::properties::Property::PropertyInfo DomainZInfo = {
         "LimitsZ",
         "Z-limits",
-        "Valid range along the Z-axis. [Min, Max]",
+        "Valid range along the Z-axis. [Min, Max].",
         openspace::properties::Property::Visibility::AdvancedUser
     };
     constexpr openspace::properties::Property::PropertyInfo DomainRInfo = {
         "LimitsR",
         "Radial limits",
-        "Valid radial range. [Min, Max]",
+        "Valid radial range. [Min, Max].",
         openspace::properties::Property::Visibility::AdvancedUser
     };
     constexpr openspace::properties::Property::PropertyInfo FlowColorInfo = {
         "FlowColor",
         "Flow Color",
-        "Color of particles flow direction indication",
-        // @VISIBILITY(1.33)
+        "Color of particles flow direction indication.",
         openspace::properties::Property::Visibility::NoviceUser
     };
     constexpr openspace::properties::Property::PropertyInfo FlowEnabledInfo = {
         "FlowEnabled",
         "Flow Direction",
         "Toggles the rendering of moving particles along the lines. Can, for example, "
-        "illustrate magnetic flow",
-        // @VISIBILITY(1.67)
+        "illustrate magnetic flow.",
         openspace::properties::Property::Visibility::NoviceUser
     };
     constexpr openspace::properties::Property::PropertyInfo FlowReversedInfo = {
         "Reversed",
         "Reversed Flow",
-        "Toggle to make the flow move in the opposite direction",
+        "Toggle to make the flow move in the opposite direction.",
         openspace::properties::Property::Visibility::User
     };
     constexpr openspace::properties::Property::PropertyInfo FlowParticleSizeInfo = {
         "ParticleSize",
         "Particle Size",
-        "Size of the particles",
-        // @VISIBILITY(2.33)
+        "Size of the particles.",
         openspace::properties::Property::Visibility::User
     };
     constexpr openspace::properties::Property::PropertyInfo FlowParticleSpacingInfo = {
         "ParticleSpacing",
         "Particle Spacing",
-        "Spacing inbetween particles",
-        // @VISIBILITY(2.33)
+        "Spacing inbetween particles.",
         openspace::properties::Property::Visibility::User
     };
     constexpr openspace::properties::Property::PropertyInfo FlowSpeedInfo = {
         "Speed",
         "Speed",
-        "Speed of the flow",
+        "Speed of the flow.",
         openspace::properties::Property::Visibility::User
     };
     constexpr openspace::properties::Property::PropertyInfo MaskingEnabledInfo = {
@@ -165,32 +159,31 @@ namespace {
         "Enable/disable masking. Use masking to show lines where a given quantity is "
         "within a given range, for example, if you only want to see where the "
         "temperature is between 10 and 20 degrees. Also used for masking out line "
-        "topologies like solar wind & closed lines",
+        "topologies like solar wind & closed lines.",
         openspace::properties::Property::Visibility::AdvancedUser
     };
     constexpr openspace::properties::Property::PropertyInfo MaskingMinMaxInfo = {
         "MaskingMinLimit",
         "Lower Limit",
-        "Lower and upper limit of the valid masking range",
+        "Lower and upper limit of the valid masking range.",
         openspace::properties::Property::Visibility::AdvancedUser
     };
     constexpr openspace::properties::Property::PropertyInfo MaskingQuantityInfo = {
         "MaskingQuantity",
         "Quantity used for Masking",
-        "Quantity used for masking",
+        "Quantity used for masking.",
         openspace::properties::Property::Visibility::AdvancedUser
     };
     constexpr openspace::properties::Property::PropertyInfo LineWidthInfo = {
         "LineWidth",
         "Line Width",
-        "This value specifies the line width of the fieldlines",
-        // @VISIBILITY(1.33)
+        "This value specifies the line width of the fieldlines.",
         openspace::properties::Property::Visibility::NoviceUser
     };
     constexpr openspace::properties::Property::PropertyInfo TimeJumpButtonInfo = {
         "TimeJumpToStart",
         "Jump to Start Of Sequence",
-        "Performs a time jump to the start of the sequence",
+        "Performs a time jump to the start of the sequence.",
         openspace::properties::Property::Visibility::NoviceUser
     };
 
diff --git a/modules/gaia/rendering/renderablegaiastars.cpp b/modules/gaia/rendering/renderablegaiastars.cpp
index ee99034969..ecb71c2a30 100644
--- a/modules/gaia/rendering/renderablegaiastars.cpp
+++ b/modules/gaia/rendering/renderablegaiastars.cpp
@@ -57,7 +57,7 @@ namespace {
     constexpr openspace::properties::Property::PropertyInfo FilePathInfo = {
         "File",
         "File Path",
-        "The path to the file with data for the stars to be rendered",
+        "The path to the file with data for the stars to be rendered.",
         openspace::properties::Property::Visibility::AdvancedUser
     };
 
@@ -71,8 +71,7 @@ namespace {
         "data, construct an Octree and render it. 'BinaryOctree' will read a constructed "
         "Octree from binary file and render full data. 'StreamOctree' will read an index "
         "file with full Octree structure and then stream nodes during runtime. (This "
-        "option is suited for bigger datasets)",
-        // @VISIBILITY(3.67)
+        "option is suited for bigger datasets).",
         openspace::properties::Property::Visibility::AdvancedUser
     };
 
@@ -81,7 +80,7 @@ namespace {
         "Render Mode",
         "This value determines which predefined columns to use in rendering. If "
         "'Static' only the position of the stars is used. 'Color' uses position + color "
-        "parameters and 'Motion' uses pos, color as well as velocity for the stars",
+        "parameters and 'Motion' uses pos, color as well as velocity for the stars.",
         openspace::properties::Property::Visibility::AdvancedUser
     };
 
@@ -93,7 +92,7 @@ namespace {
         "filter. If 'Billboard_*' is chosen then the geometry shaders will generate "
         "screen-faced billboards for all stars. For '*_SSBO' the data will be stored in "
         "Shader Storage Buffer Objects while '*_VBO' uses Vertex Buffer Objects for the "
-        "streaming. OBS! SSBO won't work on Apple",
+        "streaming. OBS! SSBO won't work on Apple.",
         openspace::properties::Property::Visibility::AdvancedUser
     };
 
@@ -101,7 +100,7 @@ namespace {
         "Texture",
         "Point Spread Function Texture",
         "The path to the texture that should be used as a point spread function for the "
-        "stars",
+        "stars.",
         openspace::properties::Property::Visibility::AdvancedUser
     };
 
@@ -109,8 +108,7 @@ namespace {
         "LuminosityMultiplier",
         "Luminosity Multiplier",
         "Factor by which to multiply the luminosity with. [Works in Color and Motion "
-        "modes]",
-        // @VISIBILITY(2.33)
+        "modes].",
         openspace::properties::Property::Visibility::User
     };
 
@@ -118,8 +116,7 @@ namespace {
         "MagnitudeBoost",
         "Magnitude Boost",
         "Sets what percent of the star magnitude that will be used as boost to star "
-        "size. [Works only with billboards in Color and Motion modes]",
-        // @VISIBILITY(2.33)
+        "size. [Works only with billboards in Color and Motion modes].",
         openspace::properties::Property::Visibility::User
     };
 
@@ -128,24 +125,21 @@ namespace {
         "Cut Off Threshold",
         "Set threshold for when to cut off star rendering. Stars closer than this "
         "threshold are given full opacity. Farther away, stars dim proportionally to the "
-        "4-logarithm of their distance",
-        // @VISIBILITY(2.33)
+        "4-logarithm of their distance.",
         openspace::properties::Property::Visibility::User
     };
 
     constexpr openspace::properties::Property::PropertyInfo SharpnessInfo = {
         "Sharpness",
         "Sharpness",
-        "Adjust star sharpness. [Works only with billboards]",
-        // @VISIBILITY(?)
+        "Adjust star sharpness. [Works only with billboards].",
         openspace::properties::Property::Visibility::AdvancedUser
     };
 
     constexpr openspace::properties::Property::PropertyInfo BillboardSizeInfo = {
         "BillboardSize",
         "Billboard Size",
-        "Set the billboard size of all stars. [Works only with billboards]",
-        // @VISIBILITY(?)
+        "Set the billboard size of all stars. [Works only with billboards].",
         openspace::properties::Property::Visibility::AdvancedUser
     };
 
@@ -153,7 +147,7 @@ namespace {
         "CloseUpBoostDist",
         "Close-Up Boost Distance [pc]",
         "Set the distance where stars starts to increase in size. Unit is Parsec [Works "
-        "only with billboards]",
+        "only with billboards].",
         openspace::properties::Property::Visibility::AdvancedUser
     };
 
@@ -161,7 +155,7 @@ namespace {
         "FilterSize",
         "Filter Size [px]",
         "Set the filter size in pixels used in tonemapping for point splatting rendering"
-        "[Works only with points]",
+        "[Works only with points].",
         openspace::properties::Property::Visibility::AdvancedUser
     };
 
@@ -169,7 +163,7 @@ namespace {
         "Sigma",
         "Normal Distribution Sigma",
         "Set the normal distribution sigma used in tonemapping for point splatting "
-        "rendering. [Works only with points]",
+        "rendering. [Works only with points].",
         openspace::properties::Property::Visibility::AdvancedUser
     };
 
@@ -179,7 +173,7 @@ namespace {
         "Determines how many additional nodes around the camera that will be fetched "
         "from disk. The first value determines how many additional layers of parents "
         "that will be fetched. The second value determines how many layers of descendant "
-        "that will be fetched from the found parents",
+        "that will be fetched from the found parents.",
         openspace::properties::Property::Visibility::AdvancedUser
     };
 
@@ -189,7 +183,7 @@ namespace {
         "Set the threshold for how big the elliptic weight of a pixel has to be to "
         "contribute to the final elliptic shape. A smaller value gives a more visually "
         "pleasing result while a bigger value will speed up the rendering on skewed "
-        "frustums (aka Domes)",
+        "frustums (aka Domes).",
         openspace::properties::Property::Visibility::AdvancedUser
     };
 
@@ -197,7 +191,7 @@ namespace {
         "ColorMap",
         "Color Texture",
         "The path to the texture that is used to convert from the magnitude of the star "
-        "to its color. The texture is used as a one dimensional lookup function",
+        "to its color. The texture is used as a one dimensional lookup function.",
         openspace::properties::Property::Visibility::AdvancedUser
     };
 
@@ -206,7 +200,7 @@ namespace {
         "First Row to Read",
         "Defines the first row that will be read from the specified FITS file No need to "
         "define if data already has been processed. [Works only with "
-        "FileReaderOption::Fits]",
+        "FileReaderOption::Fits].",
         openspace::properties::Property::Visibility::AdvancedUser
     };
 
@@ -215,7 +209,7 @@ namespace {
         "Last Row to Read",
         "Defines the last row that will be read from the specified FITS file; has to be "
         "equal to or greater than FirstRow. No need to define if data already has been "
-        "processed. [Works only with FileReaderOption::Fits]",
+        "processed. [Works only with FileReaderOption::Fits].",
         openspace::properties::Property::Visibility::AdvancedUser
     };
 
@@ -224,16 +218,14 @@ namespace {
         "Column Names",
         "A list of strings with the names of all the columns that are to be read from "
         "the specified FITS file. No need to define if data already has been processed. "
-        "[Works only with FileReaderOption::Fits]",
-        // @VISIBILITY(3.67)
+        "[Works only with FileReaderOption::Fits].",
         openspace::properties::Property::Visibility::AdvancedUser
     };
 
     constexpr openspace::properties::Property::PropertyInfo NumRenderedStarsInfo = {
         "NumRenderedStars",
         "Rendered Stars",
-        "The number of rendered stars in the current frame",
-        // @VISIBILITY(3.67)
+        "The number of rendered stars in the current frame.",
         openspace::properties::Property::Visibility::AdvancedUser
     };
 
@@ -241,8 +233,7 @@ namespace {
         "CpuRamBudget",
         "CPU RAM Budget",
         "Current remaining budget (bytes) on the CPU RAM for loading more node data "
-        "files",
-        // @VISIBILITY(3.33)
+        "files.",
         openspace::properties::Property::Visibility::AdvancedUser
     };
 
@@ -250,8 +241,7 @@ namespace {
         "GpuStreamBudget",
         "GPU Stream Budget",
         "Current remaining memory budget [in number of chunks] on the GPU for streaming "
-        "additional stars",
-        // @VISIBILITY(3.67)
+        "additional stars.",
         openspace::properties::Property::Visibility::AdvancedUser
     };
 
@@ -259,15 +249,14 @@ namespace {
         "LodPixelThreshold",
         "LOD Pixel Threshold",
         "The number of total pixels a nodes AABB can have in clipping space before its "
-        "parent is fetched as LOD cache",
+        "parent is fetched as LOD cache.",
         openspace::properties::Property::Visibility::AdvancedUser
     };
 
     constexpr openspace::properties::Property::PropertyInfo MaxGpuMemoryPercentInfo = {
         "MaxGpuMemoryPercent",
         "Max GPU Memory",
-        "Sets the max percent of existing GPU memory budget that the streaming will use",
-        // @VISIBILITY(3.33)
+        "Sets the max percent of existing GPU memory budget that the streaming will use.",
         openspace::properties::Property::Visibility::AdvancedUser
     };
 
@@ -275,8 +264,7 @@ namespace {
         "MaxCpuMemoryPercent",
         "Max CPU Memory",
         "Sets the max percent of existing CPU memory budget that the streaming of files "
-        "will use",
-        // @VISIBILITY(3.33)
+        "will use.",
         openspace::properties::Property::Visibility::AdvancedUser
     };
 
@@ -285,7 +273,7 @@ namespace {
         "PosX Threshold",
         "If defined then only stars with Position X values between [min, max] will be "
         "rendered (if min is set to 0.0 it is read as -Inf, if max is set to 0.0 it is "
-        "read as +Inf). Measured in kiloParsec",
+        "read as +Inf). Measured in kiloParsec.",
         openspace::properties::Property::Visibility::AdvancedUser
     };
 
@@ -294,7 +282,7 @@ namespace {
         "PosY Threshold",
         "If defined then only stars with Position Y values between [min, max] will be "
         "rendered (if min is set to 0.0 it is read as -Inf, if max is set to 0.0 it is "
-        "read as +Inf). Measured in kiloParsec",
+        "read as +Inf). Measured in kiloParsec.",
         openspace::properties::Property::Visibility::AdvancedUser
     };
 
@@ -303,7 +291,7 @@ namespace {
         "PosZ Threshold",
         "If defined then only stars with Position Z values between [min, max] will be "
         "rendered (if min is set to 0.0 it is read as -Inf, if max is set to 0.0 it is "
-        "read as +Inf). Measured in kiloParsec",
+        "read as +Inf). Measured in kiloParsec.",
         openspace::properties::Property::Visibility::AdvancedUser
     };
 
@@ -313,7 +301,7 @@ namespace {
         "If defined then only stars with G mean magnitude values between [min, max] will "
         "be rendered (if min is set to 20.0 it is read as -Inf, if max is set to 20.0 it "
         "is read as +Inf). If min = max then all values equal min|max will be filtered "
-        "away",
+        "away.",
         openspace::properties::Property::Visibility::AdvancedUser
     };
 
@@ -322,7 +310,8 @@ namespace {
         "Bp-Rp Threshold",
         "If defined then only stars with Bp-Rp color values between [min, max] will be "
         "rendered (if min is set to 0.0 it is read as -Inf, if max is set to 0.0 it is "
-        "read as +Inf). If min = max then all values equal min|max will be filtered away",
+        "read as +Inf). If min = max then all values equal min|max will be filtered "
+        "away.",
         openspace::properties::Property::Visibility::AdvancedUser
     };
 
@@ -331,15 +320,14 @@ namespace {
         "Dist Threshold",
         "If defined then only stars with Distances values between [min, max] will be "
         "rendered (if min is set to 0.0 it is read as -Inf, if max is set to 0.0 it is "
-        "read as +Inf). Measured in kParsec",
+        "read as +Inf). Measured in kParsec.",
         openspace::properties::Property::Visibility::AdvancedUser
     };
 
     constexpr openspace::properties::Property::PropertyInfo ReportGlErrorsInfo = {
         "ReportGlErrors",
         "Report GL Errors",
-        "If set to true, any OpenGL errors will be reported if encountered",
-        // @VISIBILITY(3.67)
+        "If set to true, any OpenGL errors will be reported if encountered.",
         openspace::properties::Property::Visibility::AdvancedUser
     };
 
diff --git a/modules/galaxy/rendering/renderablegalaxy.cpp b/modules/galaxy/rendering/renderablegalaxy.cpp
index ea11d39242..0e53203d10 100644
--- a/modules/galaxy/rendering/renderablegalaxy.cpp
+++ b/modules/galaxy/rendering/renderablegalaxy.cpp
@@ -78,7 +78,7 @@ namespace {
         "VolumeRenderingEnabled",
         "Volume Rendering",
         "If this value is enabled, the volume rendering component of the galaxy "
-        "rendering is turned on. Otherwise, the volume rendering is skipped",
+        "rendering is turned on. Otherwise, the volume rendering is skipped.",
         openspace::properties::Property::Visibility::User
     };
 
@@ -86,7 +86,7 @@ namespace {
         "StarRenderingEnabled",
         "Star Rendering",
         "If this value is enabled, the point-based star rendering component of the "
-        "galaxy rendering is turned on. Otherwise, the volume rendering is skipped",
+        "galaxy rendering is turned on. Otherwise, the volume rendering is skipped.",
         openspace::properties::Property::Visibility::User
     };
 
@@ -95,7 +95,7 @@ namespace {
         "Step Size",
         "Determines the distance between steps taken in the volume rendering. The lower "
         "the number is, the better the rendering looks, but also takes more "
-        "computational resources to render",
+        "computational resources to render.",
         openspace::properties::Property::Visibility::AdvancedUser
     };
 
@@ -104,8 +104,7 @@ namespace {
         "Absorption Multiplier",
         "A unit-less scale factor for the probability of dust absorbing a light "
         "particle. The amount of absorption determines the spectrum of the light that is "
-        "emitted from the galaxy",
-        // @VISIBILITY(2.5)
+        "emitted from the galaxy.",
         openspace::properties::Property::Visibility::User
     };
 
@@ -113,15 +112,14 @@ namespace {
         "EmissionMultiply",
         "Emission Multiplier",
         "A unit-less scale factor for the amount of light being emitted by dust in the "
-        "galaxy",
-        // @VISIBILITY(2.5)
+        "galaxy.",
         openspace::properties::Property::Visibility::User
     };
 
     constexpr openspace::properties::Property::PropertyInfo RotationInfo = {
         "Rotation",
         "Euler rotation",
-        "The internal rotation of the volume rendering in Euler angles",
+        "The internal rotation of the volume rendering in Euler angles.",
         openspace::properties::Property::Visibility::Developer
     };
 
@@ -129,7 +127,7 @@ namespace {
         "StarRenderingMethod",
         "Star Rendering Method",
         "This value determines which rendering method is used for visualization of the "
-        "stars",
+        "stars.",
         openspace::properties::Property::Visibility::AdvancedUser
     };
 
@@ -139,7 +137,7 @@ namespace {
         "The ratio of point-like stars that are rendered to produce the overall galaxy "
         "image. At a value of 0, no stars are rendered, at a value of 1 all points "
         "contained in the dataset are rendered. The specific value chosen is a "
-        "compromise between image fidelity and rendering performance",
+        "compromise between image fidelity and rendering performance.",
         openspace::properties::Property::Visibility::AdvancedUser
     };
 
@@ -147,8 +145,7 @@ namespace {
     {
         "Downscale",
         "Downscale Factor Volume Rendering",
-        "This value sets the downscaling factor when rendering the current volume",
-        // @VISIBILITY(2.5)
+        "This value sets the downscaling factor when rendering the current volume.",
         openspace::properties::Property::Visibility::User
     };
 
@@ -156,7 +153,7 @@ namespace {
     {
         "Steps",
         "Number of RayCasting Steps",
-        "This value set the number of integration steps during the raycasting procedure",
+        "This value set the number of integration steps during the raycasting procedure.",
         openspace::properties::Property::Visibility::AdvancedUser
     };
 
diff --git a/modules/globebrowsing/globebrowsingmodule.cpp b/modules/globebrowsing/globebrowsingmodule.cpp
index 7688d89bda..027417c196 100644
--- a/modules/globebrowsing/globebrowsingmodule.cpp
+++ b/modules/globebrowsing/globebrowsingmodule.cpp
@@ -98,16 +98,14 @@ namespace {
     constexpr openspace::properties::Property::PropertyInfo TileCacheSizeInfo = {
         "TileCacheSize",
         "Tile Cache Size",
-        "The maximum size of the MemoryAwareTileCache, on the CPU and GPU",
+        "The maximum size of the MemoryAwareTileCache, on the CPU and GPU.",
         openspace::properties::Property::Visibility::AdvancedUser
     };
 
-    constexpr openspace::properties::Property::PropertyInfo
-        DefaultGeoPointTextureInfo =
-    {
+    constexpr openspace::properties::Property::PropertyInfo DefaultGeoPointTextureInfo = {
         "DefaultGeoPointTexture",
         "Default Geo Point Texture",
-        "A path to a texture to use as default for GeoJson points"
+        "A path to a texture to use as default for GeoJson points."
     };
 
     constexpr openspace::properties::Property::PropertyInfo MRFCacheEnabledInfo = {
diff --git a/modules/globebrowsing/src/dashboarditemglobelocation.cpp b/modules/globebrowsing/src/dashboarditemglobelocation.cpp
index 740e15d10f..1a41a1deb6 100644
--- a/modules/globebrowsing/src/dashboarditemglobelocation.cpp
+++ b/modules/globebrowsing/src/dashboarditemglobelocation.cpp
@@ -45,15 +45,15 @@ namespace {
     constexpr openspace::properties::Property::PropertyInfo DisplayFormatInfo = {
         "DisplayFormat",
         "Display Format",
-        "Choosing the format in which the camera location is displayed",
+        "Choosing the format in which the camera location is displayed.",
         openspace::properties::Property::Visibility::AdvancedUser
     };
 
     constexpr openspace::properties::Property::PropertyInfo SignificantDigitsInfo = {
         "SignificantDigits",
         "Significant Digits",
-        "Determines the number of significant digits that are shown in the location text",
-        // @VISIBILITY(3.25)
+        "Determines the number of significant digits that are shown in the location "
+        "text.",
         openspace::properties::Property::Visibility::AdvancedUser
     };
 
diff --git a/modules/globebrowsing/src/gdalwrapper.cpp b/modules/globebrowsing/src/gdalwrapper.cpp
index de23b519a7..66007bd043 100644
--- a/modules/globebrowsing/src/gdalwrapper.cpp
+++ b/modules/globebrowsing/src/gdalwrapper.cpp
@@ -42,7 +42,7 @@ namespace {
         "LogGdalErrors",
         "Log GDAL errors",
         "If this value is enabled, any error that is raised by GDAL will be logged using "
-        "the logmanager. If this value is disabled, any error will be ignored",
+        "the logmanager. If this value is disabled, any error will be ignored.",
         openspace::properties::Property::Visibility::Developer
     };
 
@@ -50,7 +50,7 @@ namespace {
         "GdalMaximumCacheSize",
         "GDAL maximum cache size",
         "This function sets the maximum amount of RAM memory in MB that GDAL is "
-        "permitted to use for caching",
+        "permitted to use for caching.",
         openspace::properties::Property::Visibility::AdvancedUser
     };
 
diff --git a/modules/globebrowsing/src/geojson/geojsoncomponent.cpp b/modules/globebrowsing/src/geojson/geojsoncomponent.cpp
index a296b70dc7..3b9d7ca869 100644
--- a/modules/globebrowsing/src/geojson/geojsoncomponent.cpp
+++ b/modules/globebrowsing/src/geojson/geojsoncomponent.cpp
@@ -61,14 +61,14 @@ namespace {
     constexpr openspace::properties::Property::PropertyInfo EnabledInfo = {
         "Enabled",
         "Enabled",
-        "This setting determines whether this object will be visible or not",
+        "This setting determines whether this object will be visible or not.",
         openspace::properties::Property::Visibility::AdvancedUser
     };
 
     constexpr openspace::properties::Property::PropertyInfo FileInfo = {
         "File",
         "File",
-        "Path to the GeoJSON file to base the rendering on",
+        "Path to the GeoJSON file to base the rendering on.",
         openspace::properties::Property::Visibility::AdvancedUser
     };
 
@@ -76,7 +76,7 @@ namespace {
         "HeightOffset",
         "Height Offset",
         "A height offset value, in meters. Useful for moving a feature closer to or "
-        "farther away from the surface",
+        "farther away from the surface.",
         openspace::properties::Property::Visibility::NoviceUser
     };
 
@@ -86,7 +86,7 @@ namespace {
         "A latitude and longitude offset value, in decimal degrees. Can be used to "
         "move the object on the surface and correct potential mismatches with other "
         "renderings. Note that changing it during runtime leads to all positions being "
-        "recomputed",
+        "recomputed.",
         openspace::properties::Property::Visibility::AdvancedUser
     };
 
@@ -94,7 +94,7 @@ namespace {
         "DrawWireframe",
         "Wireframe",
         "If true, draw the wire frame of the polygons. Used for testing and to "
-        "investigate tessellation results",
+        "investigate tessellation results.",
         openspace::properties::Property::Visibility::Developer
     };
 
@@ -103,7 +103,7 @@ namespace {
         "Prevent Update From Heightmap",
         "If true, the polygon mesh will not be automatically updated based on the "
         "heightmap, even if the 'RelativeToGround' altitude option is set and the "
-        "heightmap updates. The data can still be force updated",
+        "heightmap updates. The data can still be force updated.",
         openspace::properties::Property::Visibility::AdvancedUser
     };
 
@@ -111,7 +111,7 @@ namespace {
         "ForceUpdateHeightData",
         "Force Update Height Data",
         "Triggering this leads to a recomputation of the heights based on the globe "
-        "height map value at the geometry's positions",
+        "height map value at the geometry's positions.",
         openspace::properties::Property::Visibility::AdvancedUser
     };
 
@@ -120,7 +120,7 @@ namespace {
         "Points Aligned to",
         "Decides how the billboards for the points should be rendered in terms of up "
         "direction and whether the plane should face the camera. See details on the "
-        "different options in the wiki",
+        "different options in the wiki.",
         openspace::properties::Property::Visibility::User
     };
 
@@ -128,7 +128,7 @@ namespace {
         "FlyToFeature",
         "Fly To Feature",
         "Triggering this leads to the camera flying to a position that show the GeoJson "
-        "feature. The flight will account for any lat, long or height offset",
+        "feature. The flight will account for any lat, long or height offset.",
         openspace::properties::Property::Visibility::NoviceUser
     };
 
@@ -136,7 +136,7 @@ namespace {
         "CentroidCoordinate",
         "Centroid Coordinate",
         "The lat long coordinate of the centroid position of the read geometry. Note "
-        "that this value does not incude the offset",
+        "that this value does not incude the offset.",
         openspace::properties::Property::Visibility::AdvancedUser
     };
 
@@ -144,7 +144,7 @@ namespace {
         "BoundingBox",
         "Bounding Box",
         "The lat long coordinates of the lower and upper corner of the bounding box of "
-        "the read geometry. Note that this value does not incude the offset",
+        "the read geometry. Note that this value does not incude the offset.",
         openspace::properties::Property::Visibility::AdvancedUser
     };
 
@@ -152,7 +152,7 @@ namespace {
         "PointSizeScale",
         "Point Size Scale",
         "An extra scale value that can be used to increase or decrease the scale of any "
-        "rendered points in the component, even if a value is set from the GeoJson file",
+        "rendered points in the component, even if a value is set from the GeoJson file.",
         openspace::properties::Property::Visibility::NoviceUser
     };
 
diff --git a/modules/globebrowsing/src/geojson/geojsonproperties.cpp b/modules/globebrowsing/src/geojson/geojsonproperties.cpp
index 1dab4ec7e8..b4f358fee1 100644
--- a/modules/globebrowsing/src/geojson/geojsonproperties.cpp
+++ b/modules/globebrowsing/src/geojson/geojsonproperties.cpp
@@ -157,7 +157,7 @@ namespace {
         "Opacity",
         "Opacity",
         "This value determines the opacity of this object. A value of 0 means "
-        "completely transparent",
+        "completely transparent.",
         openspace::properties::Property::Visibility::NoviceUser
     };
 
@@ -165,7 +165,7 @@ namespace {
         "Color",
         "Color",
         "The color of the rendered geometry. For points it will be used as a multiply"
-        "color for any provided texture",
+        "color for any provided texture.",
         openspace::properties::Property::Visibility::NoviceUser
     };
 
@@ -173,7 +173,7 @@ namespace {
         "FillOpacity",
         "Fill Opacity",
         "This value determines the opacity of the filled portion of a polygon. Will "
-        "also be used for extruded features",
+        "also be used for extruded features.",
         openspace::properties::Property::Visibility::NoviceUser
     };
 
@@ -181,14 +181,14 @@ namespace {
         "FillColor",
         "Fill Color",
         "The color of the filled portion of a rendered polygon. Will also be used for "
-        "extruded features",
+        "extruded features.",
         openspace::properties::Property::Visibility::NoviceUser
     };
 
     constexpr openspace::properties::Property::PropertyInfo LineWidthInfo = {
         "LineWidth",
         "Line Width",
-        "The width of any rendered lines",
+        "The width of any rendered lines.",
         openspace::properties::Property::Visibility::User
     };
 
@@ -196,7 +196,7 @@ namespace {
         "PointSize",
         "Point Size",
         "The size of any rendered points. The size will be scaled based on the "
-        "bounding sphere of the globe",
+        "bounding sphere of the globe.",
         openspace::properties::Property::Visibility::NoviceUser
     };
 
@@ -213,7 +213,7 @@ namespace {
         "Extrude",
         "Extrude",
         "If true, extrude the geometry to intersect the globe.Lines/polygons will be"
-        "extruded with polygons,and points with lines ",
+        "extruded with polygons,and points with lines.",
         openspace::properties::Property::Visibility::User
     };
 
@@ -222,7 +222,7 @@ namespace {
         "Perform Shading",
         "If true, perform shading on any create meshes, either from polygons or "
         "extruded lines. The shading will be computed based on any light sources of the "
-        "GeoJson component",
+        "GeoJson component.",
         openspace::properties::Property::Visibility::User
     };
 
@@ -233,7 +233,7 @@ namespace {
         "be interpreted. Absolute means that the height is interpreted as the height "
         "above the reference ellipsoid, while RelativeToGround takes the height map "
         "into account. For coordinates with only two values (latitude and longitude), "
-        "the height is considered to be equal to zero",
+        "the height is considered to be equal to zero.",
         openspace::properties::Property::Visibility::User
     };
 
@@ -241,7 +241,7 @@ namespace {
         "PointTextureAnchor",
         "Point Texture Anchor",
         "Decides the placement of the point texture in relation to the position. "
-        "Default is a the bottom of the texture, but it can also be put at the center",
+        "Default is a the bottom of the texture, but it can also be put at the center.",
         openspace::properties::Property::Visibility::User
     };
 
@@ -251,7 +251,7 @@ namespace {
         "If false, no tessellation to bend the geometry based on the curvature of the "
         "planet is performed. This leads to increased performance, but tessellation is "
         "neccessary for large geometry that spans a big portion of the globe. Otherwise "
-        "it may intersect the surface",
+        "it may intersect the surface.",
         openspace::properties::Property::Visibility::User
     };
 
@@ -261,7 +261,7 @@ namespace {
         "If true, use the 'Tessellation Level' to control the level of detail for the "
         "tessellation. The distance used will be the 'Tessellation Distance' divided by "
         "the 'Tessellation Level', so the higher the level value, the smaller each "
-        "segment in the geomoetry will be",
+        "segment in the geomoetry will be.",
         openspace::properties::Property::Visibility::AdvancedUser
     };
 
@@ -282,7 +282,7 @@ namespace {
         "larger than this distance will be automatically subdivided into smaller pieces "
         "matching this distance, while anything smaller will not be subdivided. Per "
         "default this will be set to a distance corresponding to about 1 degree "
-        "longitude on the globe",
+        "longitude on the globe.",
         openspace::properties::Property::Visibility::AdvancedUser
     };
 
diff --git a/modules/globebrowsing/src/globelabelscomponent.cpp b/modules/globebrowsing/src/globelabelscomponent.cpp
index ce1253a0a6..0f885963c5 100644
--- a/modules/globebrowsing/src/globelabelscomponent.cpp
+++ b/modules/globebrowsing/src/globelabelscomponent.cpp
@@ -64,30 +64,28 @@ namespace {
     constexpr openspace::properties::Property::PropertyInfo EnabledInfo = {
         "Enabled",
         "Enabled",
-        "Enables and disables labels' rendering",
+        "Enables and disables labels' rendering.",
         openspace::properties::Property::Visibility::NoviceUser
     };
 
     constexpr openspace::properties::Property::PropertyInfo FontSizeInfo = {
         "FontSize",
         "Font Size",
-        "Font size for the rendering labels. This is different fromt text size",
-        // @VISIBILITY(2.75)
+        "Font size for the rendering labels. This is different fromt text size.",
         openspace::properties::Property::Visibility::User
     };
 
     constexpr openspace::properties::Property::PropertyInfo MinMaxSizeInfo = {
         "MinMaxSize",
         "Min/Max Text Size",
-        "Minimum and maximum label size, in pixels",
+        "Minimum and maximum label size, in pixels.",
         openspace::properties::Property::Visibility::AdvancedUser
     };
 
     constexpr openspace::properties::Property::PropertyInfo SizeInfo = {
         "LabelsSize",
         "Labels Size",
-        "This value affects the size scale of the labels",
-        // @VISIBILITY(2.5)
+        "This value affects the size scale of the labels.",
         openspace::properties::Property::Visibility::User
     };
 
@@ -95,16 +93,14 @@ namespace {
         "HeightOffset",
         "Height Offset",
         "This value moves the label away from the globe surface by the specified "
-        "distance (in meters)",
-        // @VISIBILITY(2.75)
+        "distance (in meters).",
         openspace::properties::Property::Visibility::User
     };
 
     constexpr openspace::properties::Property::PropertyInfo ColorInfo = {
         "Color",
         "Color",
-        "The text color of the labels",
-        // @VISIBILITY(1.2)
+        "The text color of the labels.",
         openspace::properties::Property::Visibility::NoviceUser
     };
 
@@ -113,7 +109,7 @@ namespace {
         "Fade-In Distances",
         "The distances above the globe's surface at which the labels start fading in or "
         "out, given in meters. The final distances are also adjusted by the specified "
-        "height offset",
+        "height offset.",
         openspace::properties::Property::Visibility::AdvancedUser
     };
 
@@ -121,7 +117,7 @@ namespace {
         "FadeInEnabled",
         "Fade In Enabled",
         "Sets whether the labels fade in when approaching the globe from a distance. If "
-        "false, no fading happens and the labels immediately has full opacity",
+        "false, no fading happens and the labels immediately has full opacity.",
         openspace::properties::Property::Visibility::User
     };
 
@@ -129,29 +125,28 @@ namespace {
         "FadeOutEnabled",
         "Fade Out Enabled",
         "Sets whether the labels fade out when approaching the surface of the globe. If "
-        "false, no fading happens and the labels stays in full opacity",
+        "false, no fading happens and the labels stays in full opacity.",
         openspace::properties::Property::Visibility::User
     };
 
     constexpr openspace::properties::Property::PropertyInfo DisableCullingInfo = {
         "DisableCulling",
         "Culling Disabled",
-        "Labels culling disabled",
+        "Labels culling disabled.",
         openspace::properties::Property::Visibility::Developer
     };
 
     constexpr openspace::properties::Property::PropertyInfo DistanceEPSInfo = {
         "DistanceEPS",
         "Culling Distance",
-        "Labels culling distance from globe's center",
+        "Labels culling distance from globe's center.",
         openspace::properties::Property::Visibility::Developer
     };
 
     constexpr openspace::properties::Property::PropertyInfo AlignmentOptionInfo = {
         "AlignmentOption",
         "Alignment Option",
-        "Labels are aligned horizontally or circularly related to the planet",
-        // @VISIBILITY(2.75)
+        "Labels are aligned horizontally or circularly related to the planet.",
         openspace::properties::Property::Visibility::User
     };
 
diff --git a/modules/globebrowsing/src/globerotation.cpp b/modules/globebrowsing/src/globerotation.cpp
index 62dd959b4f..0dbe8ae0d4 100644
--- a/modules/globebrowsing/src/globerotation.cpp
+++ b/modules/globebrowsing/src/globerotation.cpp
@@ -40,8 +40,7 @@ namespace {
     constexpr openspace::properties::Property::PropertyInfo GlobeInfo = {
         "Globe",
         "Attached Globe",
-        "The globe on which the longitude/latitude is specified",
-        // @VISIBILITY(2.5)
+        "The globe on which the longitude/latitude is specified.",
         openspace::properties::Property::Visibility::User
     };
 
@@ -50,8 +49,7 @@ namespace {
         "Latitude",
         "The latitude of the location on the globe's surface. The value can range from "
         "-90 to 90, with negative values representing the southern hemisphere of the "
-        "globe. The default value is 0.0",
-        // @VISIBILITY(2.25)
+        "globe. The default value is 0.0.",
         openspace::properties::Property::Visibility::User
     };
 
@@ -60,8 +58,7 @@ namespace {
         "Longitude",
         "The longitude of the location on the globe's surface. The value can range from "
         "-180 to 180, with negative values representing the western hemisphere of the "
-        "globe. The default value is 0.0",
-        // @VISIBILITY(2.25)
+        "globe. The default value is 0.0.",
         openspace::properties::Property::Visibility::User
     };
 
@@ -69,7 +66,7 @@ namespace {
         "Angle",
         "Angle",
         "A rotation angle that can be used to rotate the object around its own y-axis, "
-        "which will be pointing out of the globe's surface",
+        "which will be pointing out of the globe's surface.",
         openspace::properties::Property::Visibility::AdvancedUser
     };
 
@@ -78,16 +75,14 @@ namespace {
         "Use Heightmap",
         "If set to true, the heightmap will be used when computing the surface normal. "
         "This means that the object will be rotated to lay flat on the surface at the "
-        "given coordinate and follow the shape of the landscape",
-        // @VISIBILITY(2.5)
+        "given coordinate and follow the shape of the landscape.",
         openspace::properties::Property::Visibility::User
     };
 
     constexpr openspace::properties::Property::PropertyInfo UseCameraInfo = {
         "UseCamera",
         "Use Camera",
-        "If this value is 'true', the lat and lon are updated to match the camera",
-        // @VISIBILITY(?)
+        "If this value is 'true', the lat and lon are updated to match the camera.",
         openspace::properties::Property::Visibility::AdvancedUser
     };
 
diff --git a/modules/globebrowsing/src/globetranslation.cpp b/modules/globebrowsing/src/globetranslation.cpp
index 2d997e1727..8766c99f60 100644
--- a/modules/globebrowsing/src/globetranslation.cpp
+++ b/modules/globebrowsing/src/globetranslation.cpp
@@ -39,8 +39,7 @@ namespace {
     constexpr openspace::properties::Property::PropertyInfo GlobeInfo = {
         "Globe",
         "Attached Globe",
-        "The globe on which the longitude/latitude is specified",
-        // @VISIBILITY(2.5)
+        "The globe on which the longitude/latitude is specified.",
         openspace::properties::Property::Visibility::User
     };
 
@@ -49,8 +48,7 @@ namespace {
         "Latitude",
         "The latitude of the location on the globe's surface. The value can range from "
         "-90 to 90, with negative values representing the southern hemisphere of the "
-        "globe. The default value is 0.0",
-        // @VISIBILITY(2.25)
+        "globe. The default value is 0.0.",
         openspace::properties::Property::Visibility::User
     };
 
@@ -59,8 +57,7 @@ namespace {
         "Longitude",
         "The longitude of the location on the globe's surface. The value can range from "
         "-180 to 180, with negative values representing the western hemisphere of the "
-        "globe. The default value is 0.0",
-        // @VISIBILITY(2.25)
+        "globe. The default value is 0.0.",
         openspace::properties::Property::Visibility::User
     };
 
@@ -69,8 +66,7 @@ namespace {
         "Altitude",
         "The altitude in meters. If the 'UseHeightmap' property is 'true', this is an "
         "offset from the actual surface of the globe. If not, this is an offset from the "
-        "reference ellipsoid. The default value is 0.0",
-        // @VISIBILITY(2.75)
+        "reference ellipsoid. The default value is 0.0.",
         openspace::properties::Property::Visibility::User
     };
 
@@ -79,24 +75,21 @@ namespace {
         "Use Heightmap",
         "If this value is 'true', the altitude specified in 'Altitude' will be treated "
         "as an offset from the heightmap. Otherwise, it will be an offset from the "
-        "globe's reference ellipsoid. The default value is 'false'",
-        // @VISIBILITY(2.5)
+        "globe's reference ellipsoid. The default value is 'false'.",
         openspace::properties::Property::Visibility::User
     };
 
     constexpr openspace::properties::Property::PropertyInfo UseCameraInfo = {
         "UseCamera",
         "Use Camera",
-        "If this value is 'true', the lat and lon are updated to match the camera",
-        // @VISIBILITY(?)
+        "If this value is 'true', the lat and lon are updated to match the camera.",
         openspace::properties::Property::Visibility::AdvancedUser
     };
 
     constexpr openspace::properties::Property::PropertyInfo UseCameraAltitudeInfo = {
         "UseCameraAltitude",
         "Use Camera Altitude",
-        "If this value is 'true', the altitude is updated to match the camera",
-        // @VISIBILITY(?)
+        "If this value is 'true', the altitude is updated to match the camera.",
         openspace::properties::Property::Visibility::AdvancedUser
     };
 
diff --git a/modules/globebrowsing/src/layer.cpp b/modules/globebrowsing/src/layer.cpp
index b1ef0eb2a7..d9d3d92494 100644
--- a/modules/globebrowsing/src/layer.cpp
+++ b/modules/globebrowsing/src/layer.cpp
@@ -48,7 +48,7 @@ namespace {
         "Type",
         "Type",
         "The type of this Layer. This value is a read-only property and thus cannot be "
-        "changed",
+        "changed.",
         openspace::properties::Property::Visibility::Developer
     };
 
@@ -56,7 +56,7 @@ namespace {
         "BlendMode",
         "Blend Mode",
         "This value specifies the blend mode that is applied to this layer. The blend "
-        "mode determines how this layer is added to the underlying layers beneath",
+        "mode determines how this layer is added to the underlying layers beneath.",
         openspace::properties::Property::Visibility::AdvancedUser
     };
 
@@ -65,8 +65,7 @@ namespace {
         "Enabled",
         "If this value is enabled, the layer will be used for the final composition of "
         "the planet. If this value is disabled, the layer will be ignored in the "
-        "composition",
-        // @VISIBILITY(1.17)
+        "composition.",
         openspace::properties::Property::Visibility::NoviceUser
     };
 
@@ -74,8 +73,7 @@ namespace {
         "Reset",
         "Reset",
         "If this value is triggered, this layer will be reset. This will delete the "
-        "local cache for this layer and will trigger a fresh load of all tiles",
-        // @VISIBILITY(2.5)
+        "local cache for this layer and will trigger a fresh load of all tiles.",
         openspace::properties::Property::Visibility::User
     };
 
@@ -83,8 +81,7 @@ namespace {
         "Remove",
         "Remove",
         "If this value is triggered, a script will be executed that will remove this "
-        "layer before the next frame",
-        // @VISIBILITY(2.75)
+        "layer before the next frame.",
         openspace::properties::Property::Visibility::User
     };
 
@@ -92,8 +89,7 @@ namespace {
         "Color",
         "Color",
         "If the 'Type' of this layer is a solid color, this value determines what this "
-        "solid color is",
-        // @VISIBILITY(2.5)
+        "solid color is.",
         openspace::properties::Property::Visibility::User
     };
 
@@ -101,7 +97,7 @@ namespace {
         "GuiDescription",
         "Gui Description",
         "This is the description for the scene graph node to be shown in the gui "
-        "example: Earth is a special place",
+        "example: Earth is a special place.",
         openspace::properties::Property::Visibility::Hidden
     };
 
diff --git a/modules/globebrowsing/src/layeradjustment.cpp b/modules/globebrowsing/src/layeradjustment.cpp
index 8ddf55e323..d46d0eb495 100644
--- a/modules/globebrowsing/src/layeradjustment.cpp
+++ b/modules/globebrowsing/src/layeradjustment.cpp
@@ -32,7 +32,7 @@ namespace {
     constexpr openspace::properties::Property::PropertyInfo ChromaKeyColorInfo = {
         "ChromaKeyColor",
         "Chroma Key Color",
-        "This color is used as the chroma key for the layer that is adjusted",
+        "This color is used as the chroma key for the layer that is adjusted.",
         openspace::properties::Property::Visibility::AdvancedUser
     };
 
@@ -40,14 +40,14 @@ namespace {
         "ChromaKeyTolerance",
         "Chroma Key Tolerance",
         "This value determines the tolerance that is used to determine whether a color "
-        "is matching the selected Chroma key",
+        "is matching the selected Chroma key.",
         openspace::properties::Property::Visibility::AdvancedUser
     };
 
     constexpr openspace::properties::Property::PropertyInfo TypeInfo = {
         "Type",
         "Type",
-        "The type of layer adjustment that is applied to the underlying layer",
+        "The type of layer adjustment that is applied to the underlying layer.",
         openspace::properties::Property::Visibility::AdvancedUser
     };
 
diff --git a/modules/globebrowsing/src/layergroup.cpp b/modules/globebrowsing/src/layergroup.cpp
index c18b78bad2..598c217d1b 100644
--- a/modules/globebrowsing/src/layergroup.cpp
+++ b/modules/globebrowsing/src/layergroup.cpp
@@ -40,8 +40,7 @@ namespace {
         "Blend between levels",
         "If this value is enabled, images between different levels are interpolated, "
         "rather than switching between levels abruptly. This makes transitions smoother "
-        "and more visually pleasing",
-        // @VISIBILITY(2.75)
+        "and more visually pleasing.",
         openspace::properties::Property::Visibility::User
     };
 } // namespace
diff --git a/modules/globebrowsing/src/layerrendersettings.cpp b/modules/globebrowsing/src/layerrendersettings.cpp
index 144289775a..5cdfb11116 100644
--- a/modules/globebrowsing/src/layerrendersettings.cpp
+++ b/modules/globebrowsing/src/layerrendersettings.cpp
@@ -29,16 +29,14 @@ namespace {
         "SetDefault",
         "Set Default",
         "If this value is triggered it will reset all of these values to their default "
-        "values",
-        // @VISIBILITY(1.67)
+        "values.",
         openspace::properties::Property::Visibility::User
     };
 
     constexpr openspace::properties::Property::PropertyInfo GammaInfo = {
         "Gamma",
         "Gamma",
-        "This value is used as an exponent to adjust the color for each tile",
-        // @VISIBILITY(2.67)
+        "This value is used as an exponent to adjust the color for each tile.",
         openspace::properties::Property::Visibility::User
     };
 
@@ -46,8 +44,7 @@ namespace {
         "Multiplier",
         "Multiplier",
         "This value is used as a multiplier to adjust the color applied after taking the "
-        "gamma value as an exponent",
-        // @VISIBILITY(2.67)
+        "gamma value as an exponent.",
         openspace::properties::Property::Visibility::User
     };
 
@@ -55,7 +52,7 @@ namespace {
         "Offset",
         "Offset",
         "This value is used as an additive modifier to adjust the color applied after "
-        "the gamma exponent and the multiplier has been performed",
+        "the gamma exponent and the multiplier has been performed.",
         openspace::properties::Property::Visibility::AdvancedUser
     };
 } // namespace
diff --git a/modules/globebrowsing/src/memoryawaretilecache.cpp b/modules/globebrowsing/src/memoryawaretilecache.cpp
index e9d0a5d5c0..41a43872ce 100644
--- a/modules/globebrowsing/src/memoryawaretilecache.cpp
+++ b/modules/globebrowsing/src/memoryawaretilecache.cpp
@@ -39,7 +39,7 @@ namespace {
         "CpuAllocatedTileData",
         "CPU allocated tile data (MB)",
         "This value denotes the amount of RAM memory (in MB) that this tile cache is "
-        "utilizing",
+        "utilizing.",
         openspace::properties::Property::Visibility::Developer
     };
 
@@ -47,7 +47,7 @@ namespace {
         "GpuAllocatedTileData",
         "GPU allocated tile data (MB)",
         "This value denotes the amount of GPU memory (in MB) that this tile cache is "
-        "utilizing",
+        "utilizing.",
         openspace::properties::Property::Visibility::Developer
     };
 
@@ -478,7 +478,7 @@ void MemoryAwareTileCache::createTileAndPut(ProviderTileKey key, RawTile rawTile
             );
             tex->setPixelData(rawTile.imageData.release(), Texture::TakeOwnership::Yes);
             rawTile.imageData = nullptr;
-            [[ maybe_unused ]] const size_t expectedSize = tex->expectedPixelDataSize();
+            [[maybe_unused]] const size_t expectedSize = tex->expectedPixelDataSize();
             const size_t numBytes = rawTile.textureInitData->totalNumBytes;
             ghoul_assert(expectedSize == numBytes, "Pixel data size is incorrect");
             _numTextureBytesAllocatedOnCPU += numBytes - previousExpectedDataSize;
diff --git a/modules/globebrowsing/src/rawtiledatareader.cpp b/modules/globebrowsing/src/rawtiledatareader.cpp
index 0b0ff30478..23b6d5ced4 100644
--- a/modules/globebrowsing/src/rawtiledatareader.cpp
+++ b/modules/globebrowsing/src/rawtiledatareader.cpp
@@ -220,7 +220,7 @@ PixelRegion highestResPixelRegion(const GeodeticPatch& geodeticPatch,
 }
 
 RawTile::ReadError postProcessErrorCheck(const RawTile& rawTile,
-                                         [[ maybe_unused ]] size_t nRasters,
+                                         [[maybe_unused]] size_t nRasters,
                                          float noDataValue)
 {
     ghoul_assert(nRasters == rawTile.tileMetaData.nValues, "Wrong numbers of max values");
diff --git a/modules/globebrowsing/src/renderableglobe.cpp b/modules/globebrowsing/src/renderableglobe.cpp
index 42127e1c38..2845affd15 100644
--- a/modules/globebrowsing/src/renderableglobe.cpp
+++ b/modules/globebrowsing/src/renderableglobe.cpp
@@ -112,7 +112,7 @@ namespace {
         "ShowChunkEdges",
         "Show chunk edges",
         "If this value is set to 'true', the borders between chunks are shown using a "
-        "red highlight",
+        "red highlight.",
         openspace::properties::Property::Visibility::Developer
     };
 
@@ -121,8 +121,7 @@ namespace {
         "Level by projected area (else distance)",
         "If this value is set to 'true', the tile level is determined by the area "
         "projected on screen. If it is 'false', the distance to the center of the tile "
-        "is used instead",
-        // @VISIBILITY(?)
+        "is used instead.",
         openspace::properties::Property::Visibility::Developer
     };
 
@@ -137,8 +136,7 @@ namespace {
         "ResetTileProviders",
         "Reset tile providers",
         "If this property is triggered, all tile provides for the globe are reset and "
-        "data is reloaded from scratch",
-        // @VISIBILITY(3.67)
+        "data is reloaded from scratch.",
         openspace::properties::Property::Visibility::AdvancedUser
     };
 
@@ -148,7 +146,7 @@ namespace {
         "This value determines the tile level that is used as the cut off between "
         "rendering tiles using the globe model rendering vs the flat in-game rendering "
         "method. This value is a tradeoff between not having precision errors in the "
-        "rendering and represting a tile as flat or curved",
+        "rendering and represting a tile as flat or curved.",
         openspace::properties::Property::Visibility::Developer
     };
 
@@ -158,7 +156,7 @@ namespace {
         "Data availability checks before LOD factor impact",
         "The number of checks that have to fail/succeed in a row before the dynamic "
         "level-of-detail adjusts the actual level-of-detail up or down during a session "
-        "recording",
+        "recording.",
         openspace::properties::Property::Visibility::Developer
     };
 
@@ -167,7 +165,7 @@ namespace {
         "Perform shading",
         "This value determines whether there should be lighting applied to the surface "
         "of the globe. Note that if there is an atmosphere attached to the planet, there "
-        "is a separate setting to control the shadowing induced by the atmosphere part",
+        "is a separate setting to control the shadowing induced by the atmosphere part.",
         openspace::properties::Property::Visibility::NoviceUser
     };
 
@@ -176,8 +174,7 @@ namespace {
         "Use Accurate Normals",
         "This value determines whether higher-accuracy normals should be used in the "
         "rendering. These normals are calculated based on the height field information "
-        "and are thus only available if the planet has a height map",
-        // @VISIBILITY(3.5)
+        "and are thus only available if the planet has a height map.",
         openspace::properties::Property::Visibility::AdvancedUser
     };
 
@@ -186,30 +183,28 @@ namespace {
         "Name of the light source",
         "This value is the name of a scene graph node that should be used as the source "
         "of illumination for the globe. If this value is not specified, the solar "
-        "system's Sun is used instead",
+        "system's Sun is used instead.",
         openspace::properties::Property::Visibility::AdvancedUser
     };
 
     constexpr openspace::properties::Property::PropertyInfo EclipseInfo = {
         "Eclipse",
         "Eclipse",
-        "Enables/Disable Eclipse shadows",
+        "Enables/Disable Eclipse shadows.",
         openspace::properties::Property::Visibility::AdvancedUser
     };
 
     constexpr openspace::properties::Property::PropertyInfo EclipseHardShadowsInfo = {
         "EclipseHardShadows",
         "Eclipse Hard Shadows",
-        "Enables the rendering of eclipse shadows using hard shadows",
-        // @VISIBILITY(2.67)
+        "Enables the rendering of eclipse shadows using hard shadows.",
         openspace::properties::Property::Visibility::User
     };
 
     constexpr openspace::properties::Property::PropertyInfo ShadowMappingInfo = {
         "ShadowMapping",
         "Shadow Mapping",
-        "Enables shadow mapping algorithm. Used by renderable rings too",
-        // @VISIBILITY(3.5)
+        "Enables shadow mapping algorithm. Used by renderable rings, too.",
         openspace::properties::Property::Visibility::AdvancedUser
     };
 
@@ -218,8 +213,7 @@ namespace {
         "Render at Distance",
         "Tells the rendering engine not to perform distance based performance culling "
         "for this globe. Turning this property on will let the globe to be seen at far "
-        "away distances when normally it would be hidden",
-        // @VISIBILITY(3.5)
+        "away distances when normally it would be hidden.",
         openspace::properties::Property::Visibility::AdvancedUser
     };
 
@@ -227,7 +221,7 @@ namespace {
         "ZFightingPercentage",
         "Z-Fighting Percentage",
         "The percentage of the correct distance to the surface being shadowed. Possible "
-        "values: [0.0, 1.0]",
+        "values: [0.0, 1.0].",
         openspace::properties::Property::Visibility::Developer
     };
 
@@ -235,7 +229,7 @@ namespace {
         "NumberShadowSamples",
         "Number of Shadow Samples",
         "The number of samples used during shadow mapping calculation (Percentage Closer "
-        "Filtering)",
+        "Filtering).",
         openspace::properties::Property::Visibility::Developer
     };
 
@@ -244,7 +238,7 @@ namespace {
         "Target Level of Detail Scale Factor",
         "Determines the targeted level-of-detail of the tiles for this globe. A higher "
         "value means that the tiles rendered are a higher resolution for the same "
-        "distance of the camera to the planet",
+        "distance of the camera to the planet.",
         openspace::properties::Property::Visibility::AdvancedUser
     };
 
@@ -252,21 +246,21 @@ namespace {
         "CurrentLodScaleFactor",
         "Current Level of Detail Scale Factor (Read Only)",
         "The currently used scale factor whose target value is deteremined by "
-        "'TargetLodScaleFactor'",
+        "'TargetLodScaleFactor'.",
         openspace::properties::Property::Visibility::AdvancedUser
     };
 
     constexpr openspace::properties::Property::PropertyInfo OrenNayarRoughnessInfo = {
         "OrenNayarRoughness",
         "orenNayarRoughness",
-        "The roughness factor that is used for the Oren-Nayar lighting mode",
+        "The roughness factor that is used for the Oren-Nayar lighting mode.",
         openspace::properties::Property::Visibility::Developer
     };
 
     constexpr openspace::properties::Property::PropertyInfo AmbientIntensityInfo = {
         "AmbientIntensity",
         "Ambient Intensity",
-        "The intensity factor for the ambient light used for light shading",
+        "The intensity factor for the ambient light used for light shading.",
         openspace::properties::Property::Visibility::User
     };
 
@@ -274,8 +268,7 @@ namespace {
         "NActiveLayers",
         "Number of active layers",
         "This is the number of currently active layers, if this value reaches the "
-        "maximum, bad things will happen",
-        // @VISIBILITY(2.5)
+        "maximum, bad things will happen.",
         openspace::properties::Property::Visibility::User
     };
 
diff --git a/modules/globebrowsing/src/ringscomponent.cpp b/modules/globebrowsing/src/ringscomponent.cpp
index 20bc7cd980..846f134121 100644
--- a/modules/globebrowsing/src/ringscomponent.cpp
+++ b/modules/globebrowsing/src/ringscomponent.cpp
@@ -74,8 +74,7 @@ namespace {
     constexpr openspace::properties::Property::PropertyInfo EnabledInfo = {
         "Enabled",
         "Enabled",
-        "Enable/Disable Rings",
-        // @VISIBILITY(?)
+        "Enable/Disable Rings.",
         openspace::properties::Property::Visibility::User
     };
 
@@ -83,7 +82,7 @@ namespace {
         "Texture",
         "Texture",
         "This value is the path to a texture on disk that contains a one-dimensional "
-        "texture which is used for these rings",
+        "texture which is used for these rings.",
         openspace::properties::Property::Visibility::AdvancedUser
     };
 
@@ -91,7 +90,7 @@ namespace {
         "TextureFwrd",
         "TextureFwrd",
         "This value is the path to a texture on disk that contains a one-dimensional "
-        "texture which is used for forward scattering light in these rings",
+        "texture which is used for forward scattering light in these rings.",
         openspace::properties::Property::Visibility::AdvancedUser
     };
 
@@ -99,7 +98,7 @@ namespace {
         "TextureBckwrd",
         "TextureBckwrd",
         "This value is the path to a texture on disk that contains a one-dimensional "
-        "texture which is used for backward scattering light in these rings",
+        "texture which is used for backward scattering light in these rings.",
         openspace::properties::Property::Visibility::AdvancedUser
     };
 
@@ -107,7 +106,7 @@ namespace {
         "TextureUnlit",
         "TextureUnlit",
         "This value is the path to a texture on disk that contains a one-dimensional "
-        "texture which is used for unlit part in these rings",
+        "texture which is used for unlit part in these rings.",
         openspace::properties::Property::Visibility::AdvancedUser
     };
 
@@ -115,7 +114,7 @@ namespace {
         "TextureColor",
         "TextureColor",
         "This value is the path to a texture on disk that contains a one-dimensional "
-        "texture color which is used for unlit part in these rings",
+        "texture color which is used for unlit part in these rings.",
         openspace::properties::Property::Visibility::AdvancedUser
     };
 
@@ -123,14 +122,14 @@ namespace {
         "TextureTransparency",
         "TextureTransparency",
         "This value is the path to a texture on disk that contains a one-dimensional "
-        "texture transparency which is used for unlit part in these rings",
+        "texture transparency which is used for unlit part in these rings.",
         openspace::properties::Property::Visibility::AdvancedUser
     };
 
     constexpr openspace::properties::Property::PropertyInfo SizeInfo = {
         "Size",
         "Size",
-        "This value specifies the radius of the rings in meter",
+        "This value specifies the radius of the rings in meters.",
         openspace::properties::Property::Visibility::AdvancedUser
     };
 
@@ -140,7 +139,7 @@ namespace {
         "This value is used to limit the width of the rings. Each of the two values is "
         "a value between 0 and 1, where 0 is the center of the ring and 1 is the "
         "maximum extent at the radius. For example, if the value is {0.5, 1.0}, the "
-        "ring is only shown between radius/2 and radius. It defaults to {0.0, 1.0}",
+        "ring is only shown between radius/2 and radius. It defaults to {0.0, 1.0}.",
         openspace::properties::Property::Visibility::AdvancedUser
     };
 
@@ -149,7 +148,7 @@ namespace {
         "Night Factor",
         "This value is a multiplicative factor that is applied to the side of the rings "
         "that is facing away from the Sun. If this value is equal to '1', no darkening "
-        "of the night side occurs",
+        "of the night side occurs.",
         openspace::properties::Property::Visibility::AdvancedUser
     };
 
@@ -157,7 +156,7 @@ namespace {
         "ColorFilter",
         "Color Filter",
         "This value affects the filtering out of part of the rings depending on the "
-        "color values of the texture. The higher value, the more rings are filtered out",
+        "color values of the texture. The higher value, the more rings are filtered out.",
         openspace::properties::Property::Visibility::AdvancedUser
     };
 
@@ -165,7 +164,7 @@ namespace {
         "ZFightingPercentage",
         "Z-Fighting Percentage",
         "The percentage of the correct distance to the surface being shadowed. "
-        "Possible values: [0.0, 1.0]",
+        "Possible values: [0.0, 1.0].",
         openspace::properties::Property::Visibility::Developer
     };
 
@@ -173,7 +172,7 @@ namespace {
         "NumberShadowSamples",
         "Number of Shadow Samples",
         "The number of samples used during shadow mapping calculation "
-        "(Percentage Closer Filtering)",
+        "(Percentage Closer Filtering).",
         openspace::properties::Property::Visibility::Developer
     };
 
diff --git a/modules/globebrowsing/src/shadowcomponent.cpp b/modules/globebrowsing/src/shadowcomponent.cpp
index 7d0034e24e..c43c4cc9f4 100644
--- a/modules/globebrowsing/src/shadowcomponent.cpp
+++ b/modules/globebrowsing/src/shadowcomponent.cpp
@@ -65,15 +65,14 @@ namespace {
     constexpr openspace::properties::Property::PropertyInfo EnabledInfo = {
         "Enabled",
         "Enabled",
-        "Enable/Disable Shadows",
+        "Enable/Disable Shadows.",
         openspace::properties::Property::Visibility::User
     };
 
     constexpr openspace::properties::Property::PropertyInfo SaveDepthTextureInfo = {
         "SaveDepthTextureInfo",
         "Save Depth Texture",
-        "Debug",
-        // @VISIBILITY(3.67)
+        "Debug.",
         openspace::properties::Property::Visibility::AdvancedUser
     };
 
@@ -81,16 +80,14 @@ namespace {
         "DistanceFraction",
         "Distance Fraction",
         "Distance fraction of original distance from light source to the globe to be "
-        "considered as the new light source distance",
-        // @VISIBILITY(3.67)
+        "considered as the new light source distance.",
         openspace::properties::Property::Visibility::AdvancedUser
     };
 
     constexpr openspace::properties::Property::PropertyInfo DepthMapSizeInfo = {
         "DepthMapSize",
         "Depth Map Size",
-        "The depth map size in pixels. You must entry the width and height values",
-        // @VISIBILITY(3.67)
+        "The depth map size in pixels. You must entry the width and height values.",
         openspace::properties::Property::Visibility::AdvancedUser
     };
 
diff --git a/modules/globebrowsing/src/tileprovider/defaulttileprovider.cpp b/modules/globebrowsing/src/tileprovider/defaulttileprovider.cpp
index b791c499f0..4dc51a7e41 100644
--- a/modules/globebrowsing/src/tileprovider/defaulttileprovider.cpp
+++ b/modules/globebrowsing/src/tileprovider/defaulttileprovider.cpp
@@ -36,7 +36,7 @@ namespace {
         "FilePath",
         "File Path",
         "The path of the GDAL file or the image file that is to be used in this tile "
-        "provider",
+        "provider.",
         openspace::properties::Property::Visibility::AdvancedUser
     };
 
@@ -46,15 +46,14 @@ namespace {
         "This value is the preferred size (in pixels) for each tile. Choosing the right "
         "value is a tradeoff between more efficiency (larger images) and better quality "
         "(smaller images). The tile pixel size has to be smaller than the size of the "
-        "complete image if a single image is used",
-        // @VISIBILITY(3.33)
+        "complete image if a single image is used.",
         openspace::properties::Property::Visibility::AdvancedUser
     };
 
     constexpr openspace::properties::Property::PropertyInfo CompressionInfo = {
         "Compression",
         "Compression Algorithm",
-        "The compression algorithm to use for MRF cached tiles",
+        "The compression algorithm to use for MRF cached tiles.",
         openspace::properties::Property::Visibility::AdvancedUser
     };
 
diff --git a/modules/globebrowsing/src/tileprovider/imagesequencetileprovider.cpp b/modules/globebrowsing/src/tileprovider/imagesequencetileprovider.cpp
index fd2bbc2574..6bb9f3e997 100644
--- a/modules/globebrowsing/src/tileprovider/imagesequencetileprovider.cpp
+++ b/modules/globebrowsing/src/tileprovider/imagesequencetileprovider.cpp
@@ -33,8 +33,7 @@ namespace {
         "Index",
         "Index",
         "The index into the list of images that is used to pick the currently displayed "
-        "image",
-        // @VISIBILITY(2.33)
+        "image.",
         openspace::properties::Property::Visibility::User
     };
 
@@ -42,16 +41,14 @@ namespace {
         "NumberImages",
         "Number of Images",
         "The number of images that can be shown. The 'Index' value must be between 0 and "
-        "this value - 1",
-        // @VISIBILITY(?)
+        "this value - 1.",
         openspace::properties::Property::Visibility::AdvancedUser
     };
 
     constexpr openspace::properties::Property::PropertyInfo CurrentImageInfo = {
         "CurrentImage",
         "Current Image",
-        "The read-only value of the currently selected image",
-        // @VISIBILITY(2.33)
+        "The read-only value of the currently selected image.",
         openspace::properties::Property::Visibility::User
     };
 
@@ -59,7 +56,7 @@ namespace {
         "FolderPath",
         "Folder Path",
         "The path that is used to look for images for this image provider. The path must "
-        "point to an existing folder that contains images",
+        "point to an existing folder that contains images.",
         openspace::properties::Property::Visibility::AdvancedUser
     };
 
diff --git a/modules/globebrowsing/src/tileprovider/singleimagetileprovider.cpp b/modules/globebrowsing/src/tileprovider/singleimagetileprovider.cpp
index 0ddfef9fd0..1341eb5da3 100644
--- a/modules/globebrowsing/src/tileprovider/singleimagetileprovider.cpp
+++ b/modules/globebrowsing/src/tileprovider/singleimagetileprovider.cpp
@@ -32,7 +32,7 @@ namespace {
         "FilePath",
         "File Path",
         "The file path that is used for this image provider. The file must point to an "
-        "image that is then loaded and used for all tiles",
+        "image that is then loaded and used for all tiles.",
         openspace::properties::Property::Visibility::User
     };
 
diff --git a/modules/globebrowsing/src/tileprovider/temporaltileprovider.cpp b/modules/globebrowsing/src/tileprovider/temporaltileprovider.cpp
index 1456f92ba4..82982310eb 100644
--- a/modules/globebrowsing/src/tileprovider/temporaltileprovider.cpp
+++ b/modules/globebrowsing/src/tileprovider/temporaltileprovider.cpp
@@ -51,7 +51,7 @@ namespace {
         "Use Fixed Time",
         "If this value is enabled, the time-varying timevarying dataset will always use "
         "the time that is specified in the 'FixedTime' property, rather than using the "
-        "actual time from OpenSpace",
+        "actual time from OpenSpace.",
         openspace::properties::Property::Visibility::AdvancedUser
     };
 
@@ -59,7 +59,7 @@ namespace {
         "FixedTime",
         "Fixed Time",
         "If the 'UseFixedTime' is enabled, this time will be used instead of the actual "
-        "time taken from OpenSpace for the displayed tiles",
+        "time taken from OpenSpace for the displayed tiles.",
         openspace::properties::Property::Visibility::AdvancedUser
     };
 
diff --git a/modules/globebrowsing/src/tileprovider/tileindextileprovider.cpp b/modules/globebrowsing/src/tileprovider/tileindextileprovider.cpp
index a0b186a5db..018a227375 100644
--- a/modules/globebrowsing/src/tileprovider/tileindextileprovider.cpp
+++ b/modules/globebrowsing/src/tileprovider/tileindextileprovider.cpp
@@ -30,7 +30,7 @@ namespace {
     constexpr openspace::properties::Property::PropertyInfo UniqueBackgroundColors = {
         "UniqueBackgroundColor",
         "Unique Background Color",
-        "If 'true' each index tile will have a unique background color assigned to it",
+        "If 'true' each index tile will have a unique background color assigned to it.",
         openspace::properties::Property::Visibility::Developer
     };
 
diff --git a/modules/globebrowsing/src/timequantizer.cpp b/modules/globebrowsing/src/timequantizer.cpp
index 22a9cc7840..2e02f941a3 100644
--- a/modules/globebrowsing/src/timequantizer.cpp
+++ b/modules/globebrowsing/src/timequantizer.cpp
@@ -204,24 +204,24 @@ void DateTime::incrementOnce(int value, char unit) {
             if (singleIncrement(_minute, value, 0, 59)) {
                 break;
             }
-            [[ fallthrough ]];
+            [[fallthrough]];
         case 'h':
             if (singleIncrement(_hour, value, 0, 23)) {
                 break;
             }
-            [[ fallthrough ]];
+            [[fallthrough]];
         case 'd':
             if (singleIncrement(_day, value, 1, monthSize(_month, _year))) {
                 break;
             }
-            [[ fallthrough ]];
+            [[fallthrough]];
         case 'M':
             inBounds = singleIncrement(_month, value, 1, 12);
             _day = std::clamp(_day, 1, monthSize(_month, _year));
             if (inBounds) {
                 break;
             }
-            [[ fallthrough ]];
+            [[fallthrough]];
         case 'y':
             _year += value;
             break;
@@ -251,26 +251,26 @@ void DateTime::decrementOnce(int value, char unit) {
             if (singleDecrement(_minute, value, 0, 59)) {
                 break;
             }
-            [[ fallthrough ]];
+            [[fallthrough]];
         case 'h':
             if (singleDecrement(_hour, value, 0, 23)) {
                 break;
             }
-            [[ fallthrough ]];
+            [[fallthrough]];
         case 'd':
             if (singleDecrement(_day, value, 1,
                 monthSize(_month == 1 ? 12 : _month - 1, _year)))
             {
                 break;
             }
-            [[ fallthrough ]];
+            [[fallthrough]];
         case 'M':
             inBounds = singleDecrement(_month, value, 1, 12);
             _day = std::clamp(_day, 1, monthSize(_month, _year));
             if (inBounds) {
                 break;
             }
-            [[ fallthrough ]];
+            [[fallthrough]];
         case 'y':
             _year -= value;
             break;
diff --git a/modules/imgui/imguimodule.cpp b/modules/imgui/imguimodule.cpp
index 2521998b77..10073bb2ed 100644
--- a/modules/imgui/imguimodule.cpp
+++ b/modules/imgui/imguimodule.cpp
@@ -55,14 +55,14 @@ namespace {
     constexpr openspace::properties::Property::PropertyInfo EnabledInfo = {
         "Enabled",
         "Enabled",
-        "This setting determines whether this object will be visible or not",
+        "This setting determines whether this object will be visible or not.",
         openspace::properties::Property::Visibility::Developer
     };
 
     constexpr openspace::properties::Property::PropertyInfo CollapsedInfo = {
         "Collapsed",
         "Is Collapsed",
-        "This setting determines whether this window is collapsed or not",
+        "This setting determines whether this window is collapsed or not.",
         openspace::properties::Property::Visibility::Developer
     };
 
@@ -70,14 +70,14 @@ namespace {
         "ShowHelpText",
         "Show tooltip help",
         "If this value is enabled these kinds of tooltips are shown for most properties "
-        "explaining what impact they have on the visuals",
+        "explaining what impact they have on the visuals.",
         openspace::properties::Property::Visibility::Developer
     };
 
     constexpr openspace::properties::Property::PropertyInfo HelpTextDelayInfo = {
         "HelpTextDelay",
         "Tooltip Delay (in s)",
-        "This value determines the delay in seconds after which the tooltip is shown",
+        "This value determines the delay in seconds after which the tooltip is shown.",
         openspace::properties::Property::Visibility::Developer
     };
 } // namespace
diff --git a/modules/imgui/src/guicomponent.cpp b/modules/imgui/src/guicomponent.cpp
index 8f915d23f0..4ad16a8ab0 100644
--- a/modules/imgui/src/guicomponent.cpp
+++ b/modules/imgui/src/guicomponent.cpp
@@ -28,16 +28,14 @@ namespace {
     constexpr openspace::properties::Property::PropertyInfo EnabledInfo = {
         "Enabled",
         "Enabled",
-        "This setting determines whether this object will be visible or not",
-        // @VISIBILITY(3.4)
+        "This setting determines whether this object will be visible or not.",
         openspace::properties::Property::Visibility::AdvancedUser
     };
 
     constexpr openspace::properties::Property::PropertyInfo CollapsedInfo = {
         "Collapsed",
         "Is Collapsed",
-        "This setting determines whether this window is collapsed or not",
-        // @VISIBILITY(3.4)
+        "This setting determines whether this window is collapsed or not.",
         openspace::properties::Property::Visibility::AdvancedUser
     };
 } // namespace
diff --git a/modules/imgui/src/guipropertycomponent.cpp b/modules/imgui/src/guipropertycomponent.cpp
index 6725f15668..b91884463d 100644
--- a/modules/imgui/src/guipropertycomponent.cpp
+++ b/modules/imgui/src/guipropertycomponent.cpp
@@ -42,8 +42,7 @@ namespace {
         "Use Tree Layout",
         "If this value is checked, this component will display the properties using a "
         "tree layout, rather than using a flat map. This value should only be set on "
-        "property windows that display SceneGraphNodes, or the application might crash",
-        // @VISIBILITY(3.67)
+        "property windows that display SceneGraphNodes, or the application might crash.",
         openspace::properties::Property::Visibility::AdvancedUser
     };
 
@@ -52,8 +51,7 @@ namespace {
         "Tree Ordering",
         "This list determines the order of the first tree layer if it is used. Elements "
         "present in this list will be shown first, with an alphabetical ordering for "
-        "elements not listed",
-        // @VISIBILITY(3.67)
+        "elements not listed.",
         openspace::properties::Property::Visibility::AdvancedUser
     };
 
diff --git a/modules/server/src/serverinterface.cpp b/modules/server/src/serverinterface.cpp
index c9bf5a08f5..f2f5272381 100644
--- a/modules/server/src/serverinterface.cpp
+++ b/modules/server/src/serverinterface.cpp
@@ -40,35 +40,35 @@ namespace {
     constexpr openspace::properties::Property::PropertyInfo EnabledInfo = {
         "Enabled",
         "Enabled",
-        "This setting determines whether this server interface is enabled or not",
+        "This setting determines whether this server interface is enabled or not.",
         openspace::properties::Property::Visibility::AdvancedUser
     };
 
     constexpr openspace::properties::Property::PropertyInfo TypeInfo = {
         "Type",
         "Type",
-        "Whether the interface is using a Socket or a WebSocket",
+        "Whether the interface is using a Socket or a WebSocket.",
         openspace::properties::Property::Visibility::AdvancedUser
     };
 
     constexpr openspace::properties::Property::PropertyInfo PortInfo = {
         "Port",
         "Port",
-        "The network port to use for this sevrer interface",
+        "The network port to use for this sevrer interface.",
         openspace::properties::Property::Visibility::AdvancedUser
     };
 
     constexpr openspace::properties::Property::PropertyInfo DefaultAccessInfo = {
         "DefaultAccess",
         "Default Access",
-        "Sets the default access policy: Allow, RequirePassword or Deny",
+        "Sets the default access policy: Allow, RequirePassword or Deny.",
         openspace::properties::Property::Visibility::AdvancedUser
     };
 
     constexpr openspace::properties::Property::PropertyInfo AllowAddressesInfo = {
         "AllowAddresses",
         "Allow Addresses",
-        "IP addresses or domains that should always be allowed access to this interface",
+        "IP addresses or domains that should always be allowed access to this interface.",
         openspace::properties::Property::Visibility::AdvancedUser
     };
 
@@ -77,21 +77,21 @@ namespace {
         "RequirePasswordAddresses",
         "Require Password Addresses",
         "IP addresses or domains that should be allowed access if they provide a "
-        "password",
+        "password.",
         openspace::properties::Property::Visibility::AdvancedUser
     };
 
     constexpr openspace::properties::Property::PropertyInfo DenyAddressesInfo = {
         "DenyAddresses",
         "Deny Addresses",
-        "IP addresses or domains that should never be allowed access to this interface",
+        "IP addresses or domains that should never be allowed access to this interface.",
         openspace::properties::Property::Visibility::AdvancedUser
     };
 
     constexpr openspace::properties::Property::PropertyInfo PasswordInfo = {
         "Password",
         "Password",
-        "Password for connecting to this interface",
+        "Password for connecting to this interface.",
         openspace::properties::Property::Visibility::AdvancedUser
     };
 } // namespace
diff --git a/modules/skybrowser/skybrowsermodule.cpp b/modules/skybrowser/skybrowsermodule.cpp
index 693d9566ea..c0105f12e6 100644
--- a/modules/skybrowser/skybrowsermodule.cpp
+++ b/modules/skybrowser/skybrowsermodule.cpp
@@ -42,8 +42,7 @@ namespace {
     constexpr openspace::properties::Property::PropertyInfo EnabledInfo = {
         "Enabled",
         "Enabled",
-        "Decides if the GUI for this module should be enabled",
-        // @VISIBILITY(2.5)
+        "Decides if the GUI for this module should be enabled.",
         openspace::properties::Property::Visibility::User
     };
 
@@ -51,7 +50,7 @@ namespace {
         "ShowTitleInGuiBrowser",
         "Show Title in Gui Browser",
         "If true, the name of the currently selected sky browser is shown in the WebGUI "
-        "browser",
+        "browser.",
         openspace::properties::Property::Visibility::AdvancedUser
     };
 
@@ -59,8 +58,7 @@ namespace {
         "AllowCameraRotation",
         "Allow Camera Rotation",
         "Toggles if the camera should rotate to look at the sky target if it is going "
-        "outside of the current field of view",
-        // @VISIBILITY(1.75)
+        "outside of the current field of view.",
         openspace::properties::Property::Visibility::NoviceUser
     };
 
@@ -68,21 +66,21 @@ namespace {
         "CameraRotationSpeed",
         "Camera Rotation Speed",
         "The speed of the rotation of the camera when the camera rotates to look at a "
-        "coordinate which is outside of the field of view",
+        "coordinate which is outside of the field of view.",
         openspace::properties::Property::Visibility::User
     };
 
     constexpr openspace::properties::Property::PropertyInfo TargetSpeedInfo = {
         "TargetAnimationSpeed",
         "Target Animation Speed",
-        "This determines the speed of the animation of the sky target",
+        "This determines the speed of the animation of the sky target.",
         openspace::properties::Property::Visibility::User
     };
 
     constexpr openspace::properties::Property::PropertyInfo BrowserSpeedInfo = {
         "BrowserAnimationSpeed",
         "Field of View Animation Speed",
-        "This determines the speed of the animation of the field of view in the browser",
+        "This determines the speed of the animation of the field of view in the browser.",
         openspace::properties::Property::Visibility::User
     };
 
@@ -90,8 +88,7 @@ namespace {
         "HideTargetsBrowsersWithGui",
         "Hide Targets and Browsers with GUI",
         "If checked, the targets and browsers will be disabled when the sky browser "
-        "panel is minimized",
-        // @VISIBILITY(2.25)
+        "panel is minimized.",
         openspace::properties::Property::Visibility::User
     };
 
@@ -99,7 +96,7 @@ namespace {
         "InverseZoomDirection",
         "Inverse Zoom Direction",
         "If checked, the zoom direction of the scroll over the AAS WWT browser will be "
-        "inversed",
+        "inversed.",
         openspace::properties::Property::Visibility::NoviceUser
     };
 
@@ -107,7 +104,6 @@ namespace {
         "SynchronizeAim",
         "Synchronize Aim",
         "If checked, the target and the browser will have synchronized aim.",
-        // @VISIBILITY(3.25)
         openspace::properties::Property::Visibility::AdvancedUser
     };
 
@@ -115,16 +111,14 @@ namespace {
         "SpaceCraftAnimationTime",
         "Space Craft Animation Time",
         "Sets the duration (in seconds) of the animation of the space craft when it is "
-        "pointed to where the target is aiming",
-        // @VISIBILITY(2.5)
+        "pointed to where the target is aiming.",
         openspace::properties::Property::Visibility::User
     };
 
     constexpr openspace::properties::Property::PropertyInfo ImageCollectionInfo = {
        "WwtImageCollectionUrl",
        "AAS WorldWide Telescope Image Collection Url",
-       "The url of the image collection which is loaded into AAS WorldWide Telescope",
-       // @VISIBILITY(3.75)
+       "The url of the image collection which is loaded into AAS WorldWide Telescope.",
        openspace::properties::Property::Visibility::AdvancedUser
     };
 
diff --git a/modules/skybrowser/src/browser.cpp b/modules/skybrowser/src/browser.cpp
index 333f840c50..7cd47925cc 100644
--- a/modules/skybrowser/src/browser.cpp
+++ b/modules/skybrowser/src/browser.cpp
@@ -39,23 +39,21 @@ namespace {
     constexpr openspace::properties::Property::PropertyInfo DimensionsInfo = {
         "Dimensions",
         "Browser Dimensions",
-        "Set the dimensions of the web browser window",
-        // @VISIBILITY(3.75)
+        "Set the dimensions of the web browser window.",
         openspace::properties::Property::Visibility::AdvancedUser
     };
 
     constexpr openspace::properties::Property::PropertyInfo UrlInfo = {
         "Url",
         "URL",
-        "The URL to load",
-        // @VISIBILITY(3.25)
+        "The URL to load.",
         openspace::properties::Property::Visibility::AdvancedUser
     };
 
     constexpr openspace::properties::Property::PropertyInfo ReloadInfo = {
         "Reload",
         "Reload",
-        "Reload the web browser",
+        "Reload the web browser.",
         openspace::properties::Property::Visibility::User
     };
 
diff --git a/modules/skybrowser/src/renderableskytarget.cpp b/modules/skybrowser/src/renderableskytarget.cpp
index 48d39e287e..d948ab1459 100644
--- a/modules/skybrowser/src/renderableskytarget.cpp
+++ b/modules/skybrowser/src/renderableskytarget.cpp
@@ -50,7 +50,7 @@ namespace {
     constexpr openspace::properties::Property::PropertyInfo crossHairSizeInfo = {
         "CrosshairSize",
         "Crosshair Size",
-        "Determines the size of the crosshair. The size is determined in fov (degrees)",
+        "Determines the size of the crosshair. The size is determined in fov (degrees).",
         openspace::properties::Property::Visibility::User
     };
 
@@ -58,16 +58,14 @@ namespace {
         "RectangleThreshold",
         "Rectangle Threshold",
         "When the field of view is larger than the rectangle threshold, a rectangle will "
-        "be rendered in the target",
-        // @VISIBILITY(2.33)
+        "be rendered in the target.",
         openspace::properties::Property::Visibility::User
     };
 
     constexpr openspace::properties::Property::PropertyInfo LineWidthInfo = {
         "LineWidth",
         "Line Width",
-        "The thickness of the line of the target. The larger number, the thicker line",
-        // @VISIBILITY(1.33)
+        "The thickness of the line of the target. The larger number, the thicker line.",
         openspace::properties::Property::Visibility::NoviceUser
     };
 
@@ -75,7 +73,6 @@ namespace {
         "VerticalFov",
         "Vertical Field Of View",
         "The vertical field of view of the target.",
-        // @VISIBILITY(2.33)
         openspace::properties::Property::Visibility::User
     };
 
@@ -83,7 +80,7 @@ namespace {
        "ApplyRoll",
        "Apply Roll",
        "Always rotate the target to have it's up direction aligned with the up direction "
-       "of the camera",
+       "of the camera.",
         openspace::properties::Property::Visibility::User
     };
 
diff --git a/modules/skybrowser/src/screenspaceskybrowser.cpp b/modules/skybrowser/src/screenspaceskybrowser.cpp
index ebe5db7eb8..2a5f7f1d88 100644
--- a/modules/skybrowser/src/screenspaceskybrowser.cpp
+++ b/modules/skybrowser/src/screenspaceskybrowser.cpp
@@ -43,7 +43,7 @@ namespace {
         "Quality of Texture",
         "A parameter to set the resolution of the texture. 1 is full resolution and "
         "slower frame rate. Lower value means lower resolution of texture and faster "
-        "frame rate",
+        "frame rate.",
         openspace::properties::Property::Visibility::AdvancedUser
     };
 
@@ -53,15 +53,14 @@ namespace {
         "Display a copy of this sky browser at an additional position. This copy will "
         "not be interactive. The position is in RAE (Radius, Azimuth, Elevation) "
         "coordinates or Cartesian, depending on if the browser uses RAE or Cartesian "
-        "coordinates",
-        // @VISIBILITY(2.67)
+        "coordinates.",
         openspace::properties::Property::Visibility::User
     };
 
     constexpr openspace::properties::Property::PropertyInfo DisplayCopyShowInfo = {
         "ShowDisplayCopy",
         "Show Display Copy",
-        "Show the display copy",
+        "Show the display copy.",
         openspace::properties::Property::Visibility::AdvancedUser
     };
 
@@ -69,7 +68,7 @@ namespace {
         "IsHidden",
         "Is Hidden",
         "If checked, the browser will be not be displayed. If it is not checked, it will "
-        "be",
+        "be.",
         openspace::properties::Property::Visibility::AdvancedUser
     };
 
@@ -78,7 +77,6 @@ namespace {
         "Point Spacecraft",
         "If checked, spacecrafts will point towards the coordinate of an image upon "
         "selection.",
-        // @VISIBILITY(?)
         openspace::properties::Property::Visibility::User
     };
 
diff --git a/modules/space/rendering/renderableconstellationbounds.cpp b/modules/space/rendering/renderableconstellationbounds.cpp
index a2e0f3444f..d4fc73dae2 100644
--- a/modules/space/rendering/renderableconstellationbounds.cpp
+++ b/modules/space/rendering/renderableconstellationbounds.cpp
@@ -48,7 +48,7 @@ namespace {
         "File",
         "Vertex File Path",
         "The file pointed to with this value contains the vertex locations of the "
-        "constellations",
+        "constellations.",
         openspace::properties::Property::Visibility::AdvancedUser
     };
 
@@ -56,7 +56,7 @@ namespace {
         "Color",
         "Color of constellation lines",
         "Specifies the color of the constellation lines. The lines are always drawn at "
-        "full opacity",
+        "full opacity.",
         openspace::properties::Property::Visibility::NoviceUser
     };
 
diff --git a/modules/space/rendering/renderableconstellationlines.cpp b/modules/space/rendering/renderableconstellationlines.cpp
index 727c9f7ba1..e0d2136eaa 100644
--- a/modules/space/rendering/renderableconstellationlines.cpp
+++ b/modules/space/rendering/renderableconstellationlines.cpp
@@ -50,21 +50,21 @@ namespace {
     constexpr openspace::properties::Property::PropertyInfo SpeckInfo = {
         "File",
         "Constellation Data File Path",
-        "The file that contains the data for the constellation lines",
+        "The file that contains the data for the constellation lines.",
         openspace::properties::Property::Visibility::AdvancedUser
     };
 
     constexpr openspace::properties::Property::PropertyInfo DrawElementsInfo = {
         "DrawElements",
         "Draw Elements",
-        "Enables/Disables the drawing of the constellations",
+        "Enables/Disables the drawing of the constellations.",
         openspace::properties::Property::Visibility::NoviceUser
     };
 
     constexpr openspace::properties::Property::PropertyInfo UnitInfo = {
         "Unit",
         "Unit",
-        "The distance unit used for the constellation lines data",
+        "The distance unit used for the constellation lines data.",
         openspace::properties::Property::Visibility::AdvancedUser
     };
 
diff --git a/modules/space/rendering/renderableconstellationsbase.cpp b/modules/space/rendering/renderableconstellationsbase.cpp
index 7de1232b4c..94e838c628 100644
--- a/modules/space/rendering/renderableconstellationsbase.cpp
+++ b/modules/space/rendering/renderableconstellationsbase.cpp
@@ -44,30 +44,28 @@ namespace {
         "Constellation Names File Path",
         "Specifies the file that contains the mapping between constellation "
         "abbreviations and full names of the constellations. If this value is empty, the "
-        "abbreviations are used as the full names",
+        "abbreviations are used as the full names.",
         openspace::properties::Property::Visibility::AdvancedUser
     };
 
     constexpr openspace::properties::Property::PropertyInfo LineWidthInfo = {
         "LineWidth",
         "Line Width",
-        "The line width of the constellation",
-        // @VISIBILITY(1.67)
+        "The line width of the constellation.",
         openspace::properties::Property::Visibility::NoviceUser
     };
 
     constexpr openspace::properties::Property::PropertyInfo SelectionInfo = {
         "ConstellationSelection",
         "Constellation Selection",
-        "The constellations that are selected are displayed on the celestial sphere",
-        // @VISIBILITY(1.33)
+        "The constellations that are selected are displayed on the celestial sphere.",
         openspace::properties::Property::Visibility::NoviceUser
     };
 
     const openspace::properties::PropertyOwner::PropertyOwnerInfo LabelsInfo = {
         "Labels",
         "Labels",
-        "The labels for the constellations"
+        "The labels for the constellations."
     };
 
     struct [[codegen::Dictionary(RenderableConstellationsBase)]] Parameters {
diff --git a/modules/space/rendering/renderableeclipsecone.cpp b/modules/space/rendering/renderableeclipsecone.cpp
index e32464c884..a19b70e742 100644
--- a/modules/space/rendering/renderableeclipsecone.cpp
+++ b/modules/space/rendering/renderableeclipsecone.cpp
@@ -50,7 +50,7 @@ namespace {
         "This value determines the number of control points that is used to construct "
         "the shadow geometry. The higher this number, the more detailed the shadow is, "
         "but it will have a negative impact on the performance. Also note that rendering "
-        "errors will occur if this value is even",
+        "errors will occur if this value is even.",
         openspace::properties::Property::Visibility::AdvancedUser
     };
 
@@ -59,14 +59,14 @@ namespace {
         "Shadow Length",
         "This value determines the length of the shadow that is cast by the target "
         "object. The total distance of the shadow is equal to the distance from the "
-        "target to the Sun multiplied with this value",
+        "target to the Sun multiplied with this value.",
         openspace::properties::Property::Visibility::AdvancedUser
     };
 
     constexpr openspace::properties::Property::PropertyInfo ShowUmbralShadowInfo = {
         "ShowUmbralShadow",
         "Show Umbral Shadow",
-        "If this is enabled, the umbral portioon of the shadow is shown",
+        "If this is enabled, the umbral portioon of the shadow is shown.",
         openspace::properties::Property::Visibility::User
     };
 
@@ -74,15 +74,14 @@ namespace {
         "UmbralShadowColor",
         "Umbral Shadow Color",
         "This value determines the color that is used for the shadow cylinder of the "
-        "umbral shadow",
-        // @VISIBILITY(2.5)
+        "umbral shadow.",
         openspace::properties::Property::Visibility::User
     };
 
     constexpr openspace::properties::Property::PropertyInfo ShowPenumbralShadowInfo = {
         "ShowPenumbralShadow",
         "Show Penumbral Shadow",
-        "If this is enabled, the penumbral portioon of the shadow is shown",
+        "If this is enabled, the penumbral portioon of the shadow is shown.",
         openspace::properties::Property::Visibility::User
     };
 
@@ -90,8 +89,7 @@ namespace {
         "PenumbralShadowColor",
         "Penumbral Shadow Color",
         "This value determines the color that is used for the shadow cylinder of the "
-        "penumbral shadow",
-        // @VISIBILITY(2.5)
+        "penumbral shadow.",
         openspace::properties::Property::Visibility::User
     };
 
@@ -99,7 +97,7 @@ namespace {
         "LightSource",
         "Light Source",
         "This value determines the SPICE name of the object that is used as the "
-        "illuminator for computing the shadow cylinder",
+        "illuminator for computing the shadow cylinder.",
         openspace::properties::Property::Visibility::AdvancedUser
     };
 
@@ -107,7 +105,7 @@ namespace {
         "LightSourceFrame",
         "Light Source Frame",
         "This value is the SPICE name of the body-fixed reference frame for the light "
-        "source",
+        "source.",
         openspace::properties::Property::Visibility::AdvancedUser
     };
 
@@ -115,14 +113,15 @@ namespace {
         "Shadower",
         "Shadower",
         "This value specifies the SPICE name of the object that is casting the shadow on "
-        "the shadowee",
+        "the shadowee.",
         openspace::properties::Property::Visibility::AdvancedUser
     };
 
     constexpr openspace::properties::Property::PropertyInfo ShadowerFrameInfo = {
         "ShadowerFrame",
         "Shadower Frame",
-        "This value is the SPICE name of the body-fixed reference frame for the shadower",
+        "This value is the SPICE name of the body-fixed reference frame for the "
+        "shadower.",
         openspace::properties::Property::Visibility::AdvancedUser
     };
 
@@ -130,7 +129,7 @@ namespace {
         "Shadowee",
         "Shadowee",
         "This value is the SPICE name of object that is receiving the shadow from the "
-        "shadower",
+        "shadower.",
         openspace::properties::Property::Visibility::AdvancedUser
     };
 
diff --git a/modules/space/rendering/renderablefluxnodes.cpp b/modules/space/rendering/renderablefluxnodes.cpp
index 2e7112a6fd..7d1fef1715 100644
--- a/modules/space/rendering/renderablefluxnodes.cpp
+++ b/modules/space/rendering/renderablefluxnodes.cpp
@@ -65,7 +65,7 @@ namespace {
         "GOES Energy",
         "Select which energy bin you want to show. GOES = Geostationary Operational "
         "Environmental Satellites. Emin01 is values > 10 MeV, Default is Emin03 where "
-        "values > 100 MeV",
+        "values > 100 MeV.",
         openspace::properties::Property::Visibility::AdvancedUser
     };
 
@@ -73,87 +73,84 @@ namespace {
         "ColorMode",
         "Color Mode",
         "Color lines uniformly or using color tables based on specific values on nodes, "
-        "for examples flux values",
-        // @VISIBILITY(2.5)
+        "for examples flux values.",
         openspace::properties::Property::Visibility::User
     };
 
     constexpr openspace::properties::Property::PropertyInfo ColorTablePathInfo = {
         "ColorTablePath",
         "Path to Color Table",
-        "Color Table/Transfer Function to use for 'By Flux Value' coloring",
+        "Color Table/Transfer Function to use for 'By Flux Value' coloring.",
         openspace::properties::Property::Visibility::AdvancedUser
     };
 
     constexpr openspace::properties::Property::PropertyInfo StreamColorInfo = {
         "Color",
         "Color",
-        "Color of particles",
-        // @VISIBILITY(1.5)
+        "Color of particles.",
         openspace::properties::Property::Visibility::NoviceUser
     };
 
     constexpr openspace::properties::Property::PropertyInfo NodeSizeInfo = {
        "NodeSize",
        "Size of nodes",
-       "Change the size of the rendered points of the nodes",
-       // @VISIBILITY(2.5)
+       "Change the size of the rendered points of the nodes.",
        openspace::properties::Property::Visibility::User
     };
 
     constexpr openspace::properties::Property::PropertyInfo ThresholdFluxInfo = {
        "ThresholdFlux",
        "Threshold flux value",
-       "This value specifies the threshold that will be changed with the flux value",
+       "This value specifies the threshold that will be changed with the flux value.",
         openspace::properties::Property::Visibility::AdvancedUser
     };
 
     constexpr openspace::properties::Property::PropertyInfo FilteringInfo = {
         "FilterLower",
         "Filtering Lower Value in AU",
-        "Use filtering to show nodes within a given range",
+        "Use filtering to show nodes within a given range.",
         openspace::properties::Property::Visibility::AdvancedUser
     };
 
     constexpr openspace::properties::Property::PropertyInfo FilteringUpperInfo = {
         "FilterUpper",
         "Filtering Upper Value in AU",
-        "Use filtering to show nodes within a given range",
+        "Use filtering to show nodes within a given range.",
         openspace::properties::Property::Visibility::AdvancedUser
     };
 
     constexpr openspace::properties::Property::PropertyInfo AmountofNodesInfo = {
         "AmountOfNodes",
         "Every nth node to render in",
-        "Show only every nth node",
+        "Show only every nth node.",
         openspace::properties::Property::Visibility::AdvancedUser
     };
 
     constexpr openspace::properties::Property::PropertyInfo DefaultNodeSkipInfo = {
         "NodeSkip",
         "Every nth node to render default",
-        "Show only every nth node outside of skippingmethod",
+        "Show only every nth node outside of skippingmethod.",
         openspace::properties::Property::Visibility::AdvancedUser
     };
 
     constexpr openspace::properties::Property::PropertyInfo EarthNodeSkipInfo = {
        "NodeSkipEarth",
        "Every nth node to render close to Earth",
-       "Show only every nth node outside of skippingmethod",
+       "Show only every nth node outside of skippingmethod.",
         openspace::properties::Property::Visibility::AdvancedUser
     };
 
     constexpr openspace::properties::Property::PropertyInfo ScalingmethodInfo = {
         "ScalingFlux",
         "Scale the flux value with color table",
-        "Use scaling to color nodes with a given method",
+        "Use scaling to color nodes with a given method.",
         openspace::properties::Property::Visibility::AdvancedUser
     };
 
     constexpr openspace::properties::Property::PropertyInfo NodeskipMethodInfo = {
         "SkippingNodes",
         "How to select nodes to skip",
-        "Methods to select nodes to skip",
+        "Methods to select nodes to skip.",
         openspace::properties::Property::Visibility::AdvancedUser
     };
 
@@ -161,28 +158,28 @@ namespace {
         "ColorTableRange",
         "Color Table Range",
         "Valid range for the color table as the exponent, with base 10, of flux values. "
-        "[Min, Max]",
+        "[Min, Max].",
         openspace::properties::Property::Visibility::AdvancedUser
     };
 
     constexpr openspace::properties::Property::PropertyInfo DomainZInfo = {
         "ZLimit",
         "Z-limits",
-        "Valid range along the Z-axis. [Min, Max]",
+        "Valid range along the Z-axis. [Min, Max].",
         openspace::properties::Property::Visibility::AdvancedUser
     };
 
     constexpr openspace::properties::Property::PropertyInfo FluxColorAlphaInfo = {
         "FluxColorAlpha",
         "Flux Color Alpha",
-        "The value of alpha for the flux color mode",
+        "The value of alpha for the flux color mode.",
         openspace::properties::Property::Visibility::AdvancedUser
     };
 
     constexpr openspace::properties::Property::PropertyInfo FluxNodeskipThresholdInfo = {
         "SkippingNodesByFlux",
         "Skipping Nodes By Flux",
-        "Select nodes to skip depending on flux value",
+        "Select nodes to skip depending on flux value.",
         openspace::properties::Property::Visibility::AdvancedUser
     };
 
@@ -190,28 +187,28 @@ namespace {
                                                            RadiusNodeSkipThresholdInfo = {
         "SkippingNodesByRadius",
         "Skipping Nodes By Radius",
-        "Select nodes to skip depending on Radius",
+        "Select nodes to skip depending on Radius.",
         openspace::properties::Property::Visibility::AdvancedUser
     };
 
     constexpr openspace::properties::Property::PropertyInfo DistanceThresholdInfo = {
         "DistancePlanetThreshold",
         "Threshold for distance between planet",
-        "Changes threshold distance for highlighting nodes close to earth",
+        "Changes threshold distance for highlighting nodes close to earth.",
         openspace::properties::Property::Visibility::AdvancedUser
     };
 
     constexpr openspace::properties::Property::PropertyInfo ProximityNodesSizeInfo = {
         "ProximityNodesSize",
         "Earths Proximity Nodes Size",
-        "Changes size of nodes only close to earth",
+        "Changes size of nodes only close to earth.",
         openspace::properties::Property::Visibility::AdvancedUser
     };
 
     constexpr openspace::properties::Property::PropertyInfo MaxNodeDistanceSizeInfo = {
         "MaxNodeDistanceSize",
         "Max Node Distance Size",
-        "The maximum size of the nodes at a certin distance",
+        "The maximum size of the nodes at a certin distance.",
         openspace::properties::Property::Visibility::AdvancedUser
     };
 
@@ -220,28 +217,28 @@ namespace {
         "CameraPerspectiveEnabled",
         "Use Camera perspective",
         "Camera perspective changes the size of the nodes dependent on the distance from "
-        "camera",
+        "camera.",
         openspace::properties::Property::Visibility::AdvancedUser
     };
 
     constexpr openspace::properties::Property::PropertyInfo DrawingCirclesInfo = {
         "RenderingCircles",
         "Render as circles",
-        "Using fragment shader to draw nodes as circles instead of squares",
+        "Using fragment shader to draw nodes as circles instead of squares.",
         openspace::properties::Property::Visibility::AdvancedUser
     };
 
     constexpr openspace::properties::Property::PropertyInfo DrawingHollowInfo = {
         "RenderingHollowCircles",
         "Render as hollow circles",
-        "Using fragment shader to draw nodes as hollow circles",
+        "Using fragment shader to draw nodes as hollow circles.",
         openspace::properties::Property::Visibility::AdvancedUser
     };
 
     constexpr openspace::properties::Property::PropertyInfo GaussiandAlphaFilterInfo = {
         "RenderingGaussianAlphaFilter",
         "Alpha by Gaussian",
-        "Using fragment shader to draw nodes with Gaussian filter for alpha value",
+        "Using fragment shader to draw nodes with Gaussian filter for alpha value.",
         openspace::properties::Property::Visibility::AdvancedUser
     };
 
@@ -250,30 +247,28 @@ namespace {
         "PerspectiveDistanceFactor",
         "Perspective Distance factor",
         "This value decides how far away the camera must be to start impacting the node "
-        "size",
+        "size.",
         openspace::properties::Property::Visibility::AdvancedUser
     };
 
     constexpr openspace::properties::Property::PropertyInfo MinMaxNodeSizeInfo = {
         "MinMaxNodeSize",
         "Min & Max node size",
-        "The minimum and maximum node size",
+        "The minimum and maximum node size.",
         openspace::properties::Property::Visibility::AdvancedUser
     };
 
     constexpr openspace::properties::Property::PropertyInfo pulseEnabledInfo = {
         "PulseEnabled",
         "Nodes close to Earth pulsate",
-        "Toggles the pulse for nodes close to Earth",
-        // @VISIBILITY(2.5)
+        "Toggles the pulse for nodes close to Earth.",
         openspace::properties::Property::Visibility::User
     };
 
     constexpr openspace::properties::Property::PropertyInfo gaussianPulseEnabledInfo = {
         "GaussianPulseEnabled",
         "Nodes close to Earth pulsate with alpha by gaussian",
-        "Toggles the pulse with alpha by gaussian for nodes close to Earth",
-        // @VISIBILITY(2.5)
+        "Toggles the pulse with alpha by gaussian for nodes close to Earth.",
         openspace::properties::Property::Visibility::User
     };
 
diff --git a/modules/space/rendering/renderablehabitablezone.cpp b/modules/space/rendering/renderablehabitablezone.cpp
index 276d8ea5a5..cc86a6cb19 100644
--- a/modules/space/rendering/renderablehabitablezone.cpp
+++ b/modules/space/rendering/renderablehabitablezone.cpp
@@ -49,8 +49,7 @@ namespace {
         "EffectiveTemperature",
         "Effective Temperature",
         "The effective temperature of the corresponding star, in Kelvin. "
-        "Used to compute the width and size of the disc",
-        // @VISIBILITY(2.5)
+        "Used to compute the width and size of the disc.",
         openspace::properties::Property::Visibility::User
     };
 
@@ -58,8 +57,7 @@ namespace {
         "Luminosity",
         "Luminosity",
         "The luminosity of the corresponding star, in units of solar luminosities. "
-        "Used to compute the width and size of the disc",
-        // @VISIBILITY(2.5)
+        "Used to compute the width and size of the disc.",
         openspace::properties::Property::Visibility::User
     };
 
@@ -67,8 +65,7 @@ namespace {
         "Optimistic",
         "Optimistic" ,
         "If true, the habitable zone disc is rendered with the optimistic boundaries "
-        "rather than the conservative ones",
-        // @VISIBILITY(2.5)
+        "rather than the conservative ones.",
         openspace::properties::Property::Visibility::User
     };
 
@@ -78,8 +75,7 @@ namespace {
         "The effective temperature interval for which Kopparapu's formula is used for "
         "the habitable zone computation. For stars with temperatures outside the range, "
         "a simpler method by Tom E. Harris is used. This method only uses the star "
-        "luminosity and does not include computation of the optimistic boundaries",
-        // @VISIBILITY(2.5)
+        "luminosity and does not include computation of the optimistic boundaries.",
         openspace::properties::Property::Visibility::User
     };
 
diff --git a/modules/space/rendering/renderableorbitalkepler.cpp b/modules/space/rendering/renderableorbitalkepler.cpp
index 2c67548be0..783eadbff7 100644
--- a/modules/space/rendering/renderableorbitalkepler.cpp
+++ b/modules/space/rendering/renderableorbitalkepler.cpp
@@ -56,7 +56,7 @@ namespace {
     constexpr openspace::properties::Property::PropertyInfo PathInfo = {
         "Path",
         "Path",
-        "The file path to the data file to read",
+        "The file path to the data file to read.",
         openspace::properties::Property::Visibility::AdvancedUser
     };
 
@@ -66,8 +66,7 @@ namespace {
         "A segment quality value for the orbital trail. A value from 1 (lowest) to "
         "10 (highest) that controls the number of line segments in the rendering of the "
         "orbital trail. This does not control the direct number of segments because "
-        "these automatically increase according to the eccentricity of the orbit",
-        // @VISIBILITY(2.5)
+        "these automatically increase according to the eccentricity of the orbit.",
         openspace::properties::Property::Visibility::User
     };
 
@@ -76,7 +75,7 @@ namespace {
         "Trail Width",
         "This value specifies the line width of the trail if the selected rendering "
         "method includes lines. If the rendering mode is set to Points, this value is "
-        "ignored",
+        "ignored.",
         openspace::properties::Property::Visibility::NoviceUser
     };
 
@@ -85,7 +84,6 @@ namespace {
         "Point Size Exponent",
         "This value is used as in exponential scaling to set the absolute size of the "
         "point.",
-        // @VISIBILITY(2.4)
         openspace::properties::Property::Visibility::User
     };
 
@@ -129,7 +127,6 @@ namespace {
         "TrailFade",
         "Trail Fade Factor",
         "This value determines how fast the trail fades and is an appearance property.",
-        // @VISIBILITY(2.5)
         openspace::properties::Property::Visibility::User
     };
 
@@ -161,14 +158,14 @@ namespace {
         "StartRenderIdx",
         "Contiguous Starting Index of Render",
         "Index of object in renderable group to start rendering (all prior objects will "
-        "be ignored)",
+        "be ignored).",
         openspace::properties::Property::Visibility::AdvancedUser
     };
 
     constexpr openspace::properties::Property::PropertyInfo RenderSizeInfo = {
         "RenderSize",
         "Contiguous Size of Render Block",
-        "Number of objects to render sequentially from StartRenderIdx",
+        "Number of objects to render sequentially from StartRenderIdx.",
         openspace::properties::Property::Visibility::AdvancedUser
     };
 
diff --git a/modules/space/rendering/renderablerings.cpp b/modules/space/rendering/renderablerings.cpp
index d7241129c0..82d15f88fd 100644
--- a/modules/space/rendering/renderablerings.cpp
+++ b/modules/space/rendering/renderablerings.cpp
@@ -48,14 +48,14 @@ namespace {
         "Texture",
         "Texture",
         "This value is the path to a texture on disk that contains a one-dimensional "
-        "texture which is used for these rings",
+        "texture which is used for these rings.",
         openspace::properties::Property::Visibility::AdvancedUser
     };
 
     constexpr openspace::properties::Property::PropertyInfo SizeInfo = {
         "Size",
         "Size",
-        "This value specifies the radius of the rings in meter",
+        "This value specifies the radius of the rings in meters.",
         openspace::properties::Property::Visibility::AdvancedUser
     };
 
@@ -65,7 +65,7 @@ namespace {
         "This value is used to limit the width of the rings. Each of the two values is "
         "a value between 0 and 1, where 0 is the center of the ring and 1 is the "
         "maximum extent at the radius. For example, if the value is {0.5, 1.0}, the "
-        "ring is only shown between radius/2 and radius. It defaults to {0.0, 1.0}",
+        "ring is only shown between radius/2 and radius. It defaults to {0.0, 1.0}.",
         openspace::properties::Property::Visibility::AdvancedUser
     };
 
@@ -74,7 +74,7 @@ namespace {
         "Night Factor",
         "This value is a multiplicative factor that is applied to the side of the rings "
         "that is facing away from the Sun. If this value is equal to '1', no darkening "
-        "of the night side occurs",
+        "of the night side occurs.",
         openspace::properties::Property::Visibility::AdvancedUser
     };
 
@@ -82,7 +82,7 @@ namespace {
         "ColorFilter",
         "Color Filter",
         "This value affects the filtering out of part of the rings depending on the "
-        "color values of the texture. The higher value, the more rings are filtered out",
+        "color values of the texture. The higher value, the more rings are filtered out.",
         openspace::properties::Property::Visibility::AdvancedUser
     };
 
diff --git a/modules/space/rendering/renderablestars.cpp b/modules/space/rendering/renderablestars.cpp
index 06ec9a135e..353aec081d 100644
--- a/modules/space/rendering/renderablestars.cpp
+++ b/modules/space/rendering/renderablestars.cpp
@@ -106,7 +106,7 @@ namespace {
     constexpr openspace::properties::Property::PropertyInfo SpeckFileInfo = {
         "SpeckFile",
         "Speck File",
-        "The speck file that is loaded to get the data for rendering these stars",
+        "The speck file that is loaded to get the data for rendering these stars.",
         openspace::properties::Property::Visibility::AdvancedUser
     };
 
@@ -114,7 +114,7 @@ namespace {
         "ColorMap",
         "ColorBV Texture",
         "The path to the texture that is used to convert from the B-V value of the star "
-        "to its color. The texture is used as a one dimensional lookup function",
+        "to its color. The texture is used as a one dimensional lookup function.",
         openspace::properties::Property::Visibility::AdvancedUser
     };
 
@@ -122,7 +122,7 @@ namespace {
         "MappingBV",
         "Mapping (bv-color)",
         "The name of the variable in the speck file that is used as the b-v color "
-        "variable",
+        "variable.",
         openspace::properties::Property::Visibility::AdvancedUser
     };
 
@@ -130,7 +130,7 @@ namespace {
         "MappingLuminance",
         "Mapping (luminance)",
         "The name of the variable in the speck file that is used as the luminance "
-        "variable",
+        "variable.",
         openspace::properties::Property::Visibility::AdvancedUser
     };
 
@@ -138,7 +138,7 @@ namespace {
         "MappingAbsMagnitude",
         "Mapping (absolute magnitude)",
         "The name of the variable in the speck file that is used as the absolute "
-        "magnitude variable",
+        "magnitude variable.",
         openspace::properties::Property::Visibility::AdvancedUser
     };
 
@@ -146,7 +146,7 @@ namespace {
         "MappingVx",
         "Mapping (vx)",
         "The name of the variable in the speck file that is used as the star velocity "
-        "along the x-axis",
+        "along the x-axis.",
         openspace::properties::Property::Visibility::AdvancedUser
     };
 
@@ -154,7 +154,7 @@ namespace {
         "MappingVy",
         "Mapping (vy)",
         "The name of the variable in the speck file that is used as the star velocity "
-        "along the y-axis",
+        "along the y-axis.",
         openspace::properties::Property::Visibility::AdvancedUser
     };
 
@@ -162,14 +162,14 @@ namespace {
         "MappingVz",
         "Mapping (vz)",
         "The name of the variable in the speck file that is used as the star velocity "
-        "along the z-axis",
+        "along the z-axis.",
         openspace::properties::Property::Visibility::AdvancedUser
     };
 
     constexpr openspace::properties::Property::PropertyInfo MappingSpeedInfo = {
         "MappingSpeed",
         "Mapping (speed)",
-        "The name of the variable in the speck file that is used as the speed",
+        "The name of the variable in the speck file that is used as the speed.",
         openspace::properties::Property::Visibility::AdvancedUser
     };
 
@@ -177,14 +177,14 @@ namespace {
         "ColorOption",
         "Color Option",
         "This value determines which quantity is used for determining the color of the "
-        "stars",
+        "stars.",
         openspace::properties::Property::Visibility::AdvancedUser
     };
 
     constexpr openspace::properties::Property::PropertyInfo OtherDataOptionInfo = {
         "OtherData",
         "Other Data Column",
-        "The index of the speck file data column that is used as the color input",
+        "The index of the speck file data column that is used as the color input.",
         openspace::properties::Property::Visibility::AdvancedUser
     };
 
@@ -192,21 +192,21 @@ namespace {
         "OtherDataValueRange",
         "Range of the other data values",
         "This value is the min/max value range that is used to normalize the other data "
-        "values so they can be used by the specified color map",
+        "values so they can be used by the specified color map.",
         openspace::properties::Property::Visibility::AdvancedUser
     };
 
     constexpr openspace::properties::Property::PropertyInfo FixedColorInfo = {
         "FixedColorValue",
         "Color used for fixed star colors",
-        "The color that should be used if the 'Fixed Color' value is used",
+        "The color that should be used if the 'Fixed Color' value is used.",
         openspace::properties::Property::Visibility::AdvancedUser
     };
 
     constexpr openspace::properties::Property::PropertyInfo OtherDataColorMapInfo = {
         "OtherDataColorMap",
         "Other Data Color Map",
-        "The color map that is used if the 'Other Data' rendering method is selected",
+        "The color map that is used if the 'Other Data' rendering method is selected.",
         openspace::properties::Property::Visibility::AdvancedUser
     };
 
@@ -214,26 +214,26 @@ namespace {
         "FilterOutOfRange",
         "Filter Out of Range",
         "Determines whether other data values outside the value range should be visible "
-        "or filtered away",
+        "or filtered away.",
         openspace::properties::Property::Visibility::AdvancedUser
     };
 
     const openspace::properties::PropertyOwner::PropertyOwnerInfo HaloOwnerInfo = {
         "Halo",
         "Halo",
-        "Settings for the halo portion of the star"
+        "Settings for the halo portion of the star."
     };
 
     const openspace::properties::PropertyOwner::PropertyOwnerInfo GlareOwnerInfo = {
         "Glare",
         "Glare",
-        "Settings for the central glare portion of the star"
+        "Settings for the central glare portion of the star."
     };
 
     constexpr openspace::properties::Property::PropertyInfo TextureInfo = {
         "Texture",
         "Texture Path",
-        "The path to the texture that should be used",
+        "The path to the texture that should be used.",
         openspace::properties::Property::Visibility::AdvancedUser
     };
 
@@ -243,7 +243,7 @@ namespace {
         "An individual multiplication factor for this texture component. Using the "
         "multiplier and gamma values for both components, it is possible to fine tune "
         "the look of the stars or disable the contributions altogether by setting it to "
-        "0",
+        "0.",
         openspace::properties::Property::Visibility::AdvancedUser
     };
 
@@ -260,8 +260,7 @@ namespace {
         "Magnitude Exponent",
         "Adjust star magnitude by 10^MagnitudeExponent. Stars closer than this distance "
         "are given full opacity. Farther away, stars dim proportionally to the "
-        "logarithm of their distance",
-        // @VISIBILITY(2.5)
+        "logarithm of their distance.",
         openspace::properties::Property::Visibility::User
     };
 
@@ -283,21 +282,21 @@ namespace {
     constexpr openspace::properties::Property::PropertyInfo SizeCompositionMethodInfo = {
         "Method",
         "Method",
-        "Method to determine the size for the stars",
+        "Method to determine the size for the stars.",
         openspace::properties::Property::Visibility::AdvancedUser
     };
 
     constexpr openspace::properties::Property::PropertyInfo LumPercentInfo = {
         "LumPercent",
         "Luminosity Contribution",
-        "Luminosity Contribution",
+        "Luminosity Contribution.",
         openspace::properties::Property::Visibility::AdvancedUser
     };
 
     constexpr openspace::properties::Property::PropertyInfo RadiusPercentInfo = {
         "RadiusPercent",
         "Radius Contribution",
-        "Radius Contribution",
+        "Radius Contribution.",
         openspace::properties::Property::Visibility::AdvancedUser
     };
 
@@ -306,14 +305,14 @@ namespace {
         "Fade-In Start and End Distances",
         "These values determine the initial and final distances from the center of "
         "our galaxy from which the astronomical object will start and end "
-        "fading-in",
+        "fading-in.",
         openspace::properties::Property::Visibility::AdvancedUser
     };
 
     constexpr openspace::properties::Property::PropertyInfo EnableFadeInInfo = {
         "EnableFadeIn",
         "Enable Fade-in effect",
-        "Enables/Disables the Fade-in effect",
+        "Enables/Disables the Fade-in effect.",
         openspace::properties::Property::Visibility::AdvancedUser
     };
 
diff --git a/modules/space/rendering/renderabletravelspeed.cpp b/modules/space/rendering/renderabletravelspeed.cpp
index 5b3ab4d252..14fd550176 100644
--- a/modules/space/rendering/renderabletravelspeed.cpp
+++ b/modules/space/rendering/renderabletravelspeed.cpp
@@ -42,38 +42,36 @@ namespace {
     constexpr openspace::properties::Property::PropertyInfo SpeedInfo = {
         "TravelSpeed",
         "Speed of travel",
-        "The speed of light is the default value",
-        // @VISIBILITY(1.25)
+        "The speed of light is the default value.",
         openspace::properties::Property::Visibility::NoviceUser
     };
 
     constexpr openspace::properties::Property::PropertyInfo TargetInfo = {
         "TargetNode",
         "Target object",
-        "This value sets which scene graph node to target with the light speed indicator",
+        "This value sets which scene graph node to target with the light speed "
+        "indicator.",
         openspace::properties::Property::Visibility::AdvancedUser
     };
 
     constexpr openspace::properties::Property::PropertyInfo LineColorInfo = {
         "Color",
         "Color",
-        "This value determines the RGB color for the line",
+        "This value determines the RGB color for the line.",
         openspace::properties::Property::Visibility::NoviceUser
     };
 
     constexpr openspace::properties::Property::PropertyInfo LineWidthInfo = {
         "LineWidth",
         "Line Width",
-        "This value specifies the line width",
-        // @VISIBILITY(1.33)
+        "This value specifies the line width.",
         openspace::properties::Property::Visibility::NoviceUser
     };
 
     constexpr openspace::properties::Property::PropertyInfo IndicatorLengthInfo = {
         "IndicatorLength",
         "Indicator Length",
-        "This value specifies the length of the light indicator set in light seconds",
-        // @VISIBILITY(2.33)
+        "This value specifies the length of the light indicator set in light seconds.",
         openspace::properties::Property::Visibility::User
     };
 
@@ -81,8 +79,7 @@ namespace {
         "FadeLength",
         "Fade Length",
         "This value specifies the length of the faded tail of the light indicator "
-        "set in light seconds",
-        // @VISIBILITY(2.33)
+        "set in light seconds.",
         openspace::properties::Property::Visibility::User
     };
 
diff --git a/modules/space/rotation/spicerotation.cpp b/modules/space/rotation/spicerotation.cpp
index 53d4d42cde..bdba3390dc 100644
--- a/modules/space/rotation/spicerotation.cpp
+++ b/modules/space/rotation/spicerotation.cpp
@@ -36,7 +36,7 @@ namespace {
         "SourceFrame",
         "Source",
         "This value specifies the source frame that is used as the basis for the "
-        "coordinate transformation. This has to be a valid SPICE name",
+        "coordinate transformation. This has to be a valid SPICE name.",
         openspace::properties::Property::Visibility::Developer
     };
 
@@ -44,14 +44,14 @@ namespace {
         "DestinationFrame",
         "Destination",
         "This value specifies the destination frame that is used for the coordinate "
-        "transformation. This has to be a valid SPICE name",
+        "transformation. This has to be a valid SPICE name.",
         openspace::properties::Property::Visibility::Developer
     };
 
     constexpr openspace::properties::Property::PropertyInfo TimeFrameInfo = {
         "TimeFrame",
         "Time Frame",
-        "The time frame in which the spice kernels are valid",
+        "The time frame in which the spice kernels are valid.",
         openspace::properties::Property::Visibility::AdvancedUser
     };
 
@@ -59,7 +59,7 @@ namespace {
         "FixedDate",
         "Fixed Date",
         "A time to lock the rotation to. Setting this to an empty string will "
-        "unlock the time and return to rotation based on current simulation time",
+        "unlock the time and return to rotation based on current simulation time.",
         openspace::properties::Property::Visibility::AdvancedUser
     };
 
diff --git a/modules/space/spacemodule.cpp b/modules/space/spacemodule.cpp
index 588fef8258..9c75829c99 100644
--- a/modules/space/spacemodule.cpp
+++ b/modules/space/spacemodule.cpp
@@ -56,7 +56,7 @@ namespace {
         "ShowExceptions",
         "Show Exceptions",
         "If enabled, errors from SPICE will be thrown and show up in the log. If "
-        "disabled, the errors will be ignored silently",
+        "disabled, the errors will be ignored silently.",
         openspace::properties::Property::Visibility::Developer
     };
 } // namespace
diff --git a/modules/space/translation/horizonstranslation.cpp b/modules/space/translation/horizonstranslation.cpp
index 7895a4e2ee..0c985807e1 100644
--- a/modules/space/translation/horizonstranslation.cpp
+++ b/modules/space/translation/horizonstranslation.cpp
@@ -47,8 +47,7 @@ namespace {
         "HorizonsTextFile",
         "Horizons Text File",
         "This value is the path to the file or files generated by Horizons with "
-        "either a Vector table or an Observer table with the correct settings (see wiki)",
-        // @VISIBILITY(3.5)
+        "either a Vector table or an Observer table with the correct settings.",
         openspace::properties::Property::Visibility::AdvancedUser
     };
 
diff --git a/modules/space/translation/keplertranslation.cpp b/modules/space/translation/keplertranslation.cpp
index 547a5b1efa..f87214e3fd 100644
--- a/modules/space/translation/keplertranslation.cpp
+++ b/modules/space/translation/keplertranslation.cpp
@@ -51,7 +51,7 @@ namespace {
         "Eccentricity",
         "This value determines the eccentricity, that is the deviation from a perfect "
         "sphere, for this orbit. Currently, hyperbolic orbits using Keplerian elements "
-        "are not supported",
+        "are not supported.",
         openspace::properties::Property::Visibility::AdvancedUser
     };
 
@@ -60,7 +60,7 @@ namespace {
         "Semi-major axis",
         "This value determines the semi-major axis, that is the distance of the object "
         "from the central body in kilometers (semi-major axis = average of periapsis and "
-        "apoapsis)",
+        "apoapsis).",
         openspace::properties::Property::Visibility::AdvancedUser
     };
 
@@ -69,7 +69,7 @@ namespace {
         "Inclination",
         "This value determines the degrees of inclination, or the angle of the orbital "
         "plane, relative to the reference plane, on which the object orbits around the "
-        "central body",
+        "central body.",
         openspace::properties::Property::Visibility::AdvancedUser
     };
 
@@ -78,7 +78,7 @@ namespace {
         "Right ascension of ascending Node",
         "This value determines the right ascension of the ascending node in degrees, "
         "that is the location of position along the orbit where the inclined plane and "
-        "the horizonal reference plane intersect",
+        "the horizonal reference plane intersect.",
         openspace::properties::Property::Visibility::AdvancedUser
     };
 
@@ -86,7 +86,7 @@ namespace {
         "ArgumentOfPeriapsis",
         "Argument of Periapsis",
         "This value determines the argument of periapsis in degrees, that is the "
-        "position on the orbit that is closest to the orbiting body",
+        "position on the orbit that is closest to the orbiting body.",
         openspace::properties::Property::Visibility::AdvancedUser
     };
 
@@ -94,7 +94,7 @@ namespace {
         "MeanAnomaly",
         "Mean anomaly at epoch",
         "This value determines the mean anomaly at the epoch in degrees, which "
-        "determines the initial location of the object along the orbit at epoch",
+        "determines the initial location of the object along the orbit at epoch.",
         openspace::properties::Property::Visibility::AdvancedUser
     };
 
@@ -102,14 +102,14 @@ namespace {
         "Epoch",
         "Epoch",
         "This value determines the epoch for which the initial location is defined in "
-        "the form of YYYY MM DD HH:mm:ss",
+        "the form of YYYY MM DD HH:mm:ss.",
         openspace::properties::Property::Visibility::AdvancedUser
     };
 
     constexpr openspace::properties::Property::PropertyInfo PeriodInfo = {
         "Period",
         "Orbit period",
-        "Specifies the orbital period (in seconds)",
+        "Specifies the orbital period (in seconds).",
         openspace::properties::Property::Visibility::AdvancedUser
     };
 
diff --git a/modules/space/translation/spicetranslation.cpp b/modules/space/translation/spicetranslation.cpp
index 5d1b7a4a84..e8bddcc75f 100644
--- a/modules/space/translation/spicetranslation.cpp
+++ b/modules/space/translation/spicetranslation.cpp
@@ -43,8 +43,7 @@ namespace {
         "Target",
         "This is the SPICE NAIF name for the body whose translation is to be computed by "
         "the SpiceTranslation. It can either be a fully qualified name (such as 'EARTH') "
-        "or a NAIF integer id code (such as '399')",
-        // @VISIBILITY(3.5)
+        "or a NAIF integer id code (such as '399').",
         openspace::properties::Property::Visibility::AdvancedUser
     };
 
@@ -53,8 +52,7 @@ namespace {
         "Observer",
         "This is the SPICE NAIF name for the parent of the body whose translation is to "
         "be computed by the SpiceTranslation. It can either be a fully qualified name "
-        "(such as 'SOLAR SYSTEM BARYCENTER') or a NAIF integer id code (such as '0')",
-        // @VISIBILITY(3.5)
+        "(such as 'SOLAR SYSTEM BARYCENTER') or a NAIF integer id code (such as '0').",
         openspace::properties::Property::Visibility::AdvancedUser
     };
 
@@ -62,8 +60,7 @@ namespace {
         "Frame",
         "Reference Frame",
         "This is the SPICE NAIF name for the reference frame in which the position "
-        "should be retrieved. The default value is GALACTIC",
-        // @VISIBILITY(3.33)
+        "should be retrieved. The default value is GALACTIC.",
         openspace::properties::Property::Visibility::AdvancedUser
     };
 
@@ -71,8 +68,7 @@ namespace {
         "FixedDate",
         "Fixed Date",
         "A time to lock the position to. Setting this to an empty string will "
-        "unlock the time and return to position based on current simulation time",
-        // @VISIBILITY(2.5)
+        "unlock the time and return to position based on current simulation time.",
         openspace::properties::Property::Visibility::User
     };
 
diff --git a/modules/spacecraftinstruments/dashboard/dashboarditeminstruments.cpp b/modules/spacecraftinstruments/dashboard/dashboarditeminstruments.cpp
index 66409cab5a..f602bcf3d4 100644
--- a/modules/spacecraftinstruments/dashboard/dashboarditeminstruments.cpp
+++ b/modules/spacecraftinstruments/dashboard/dashboarditeminstruments.cpp
@@ -44,8 +44,7 @@ namespace {
         "Active Color",
         "This value determines the color that the active instrument is rendered in. "
         "Shortly after activation, the used color is mixture of this and the flash "
-        "color. The default value is (0.6, 1.0, 0.0)",
-        // @VISIBILITY(2.5)
+        "color. The default value is (0.6, 1.0, 0.0).",
         openspace::properties::Property::Visibility::User
     };
 
@@ -53,8 +52,7 @@ namespace {
         "FlashColor",
         "Flash Color",
         "This value determines the color that is used shortly after an instrument "
-        "activation. The default value is (0.9, 1.0, 0.75)",
-        // @VISIBILITY(2.5)
+        "activation. The default value is (0.9, 1.0, 0.75).",
         openspace::properties::Property::Visibility::User
     };
 
diff --git a/modules/spacecraftinstruments/rendering/renderablefov.cpp b/modules/spacecraftinstruments/rendering/renderablefov.cpp
index 4af3d48cbb..2c3dd74c80 100644
--- a/modules/spacecraftinstruments/rendering/renderablefov.cpp
+++ b/modules/spacecraftinstruments/rendering/renderablefov.cpp
@@ -51,7 +51,7 @@ namespace {
         "LineWidth",
         "Line Width",
         "This value determines width of the lines connecting the instrument to the "
-        "corners of the field of view",
+        "corners of the field of view.",
         openspace::properties::Property::Visibility::User
     };
 
@@ -62,7 +62,7 @@ namespace {
         "distance of the plane to the focus object. If this value is '1', the field of "
         "view will be rendered exactly on the surface of, for example, a planet. With a "
         "value of smaller than 1, the field of view will hover of ther surface, thus "
-        "making it more visible",
+        "making it more visible.",
         openspace::properties::Property::Visibility::AdvancedUser
     };
 
@@ -70,8 +70,7 @@ namespace {
         "AlwaysDrawFov",
         "Always Draw FOV",
         "If this value is enabled, the field of view will always be drawn, regardless of "
-        "whether image information has been loaded or not",
-        // @VISIBILITY(2.5)
+        "whether image information has been loaded or not.",
         openspace::properties::Property::Visibility::User
     };
 
@@ -80,7 +79,7 @@ namespace {
         "Start of default color",
         "This value determines the color of the field of view frustum close to the "
         "instrument. The final colors are interpolated between this value and the end "
-        "color",
+        "color.",
         openspace::properties::Property::Visibility::AdvancedUser
     };
 
@@ -89,7 +88,7 @@ namespace {
         "End of default color",
         "This value determines the color of the field of view frustum close to the "
         "target. The final colors are interpolated between this value and the start "
-        "color",
+        "color.",
         openspace::properties::Property::Visibility::AdvancedUser
     };
 
@@ -97,7 +96,7 @@ namespace {
         "Colors.Active",
         "Active Color",
         "This value determines the color that is used when the instrument's field of "
-        "view is active",
+        "view is active.",
         openspace::properties::Property::Visibility::AdvancedUser
     };
 
@@ -105,7 +104,7 @@ namespace {
         "Colors.TargetInFieldOfView",
         "Target in field-of-view Color",
         "This value determines the color that is used if the target is inside the field "
-        "of view of the instrument but the instrument is not yet active",
+        "of view of the instrument but the instrument is not yet active.",
         openspace::properties::Property::Visibility::AdvancedUser
     };
 
@@ -114,7 +113,7 @@ namespace {
         "Start of the intersection",
         "This value determines the color that is used close to the instrument if one of "
         "the field of view corners is intersecting the target object. The final color is "
-        "retrieved by interpolating between this color and the intersection end color",
+        "retrieved by interpolating between this color and the intersection end color.",
         openspace::properties::Property::Visibility::AdvancedUser
     };
 
@@ -123,7 +122,7 @@ namespace {
         "End of the intersection",
         "This value determines the color that is used close to the target if one of the "
         "field of view corners is intersecting the target object. The final color is "
-        "retrieved by interpolating between this color and the intersection begin color",
+        "retrieved by interpolating between this color and the intersection begin color.",
         openspace::properties::Property::Visibility::AdvancedUser
     };
 
@@ -132,7 +131,7 @@ namespace {
         "Orthogonal Square",
         "This value determines the color that is used for the field of view square in "
         "the case that there is no intersection and that the instrument is not currently "
-        "active",
+        "active.",
         openspace::properties::Property::Visibility::AdvancedUser
     };
 
diff --git a/modules/spacecraftinstruments/rendering/renderablemodelprojection.cpp b/modules/spacecraftinstruments/rendering/renderablemodelprojection.cpp
index 028aeac567..26ec899e96 100644
--- a/modules/spacecraftinstruments/rendering/renderablemodelprojection.cpp
+++ b/modules/spacecraftinstruments/rendering/renderablemodelprojection.cpp
@@ -58,8 +58,7 @@ namespace {
         "Perform Shading",
         "If this value is enabled, the model will be shaded based on the relative "
         "location to the Sun. If this value is disabled, shading is disabled and the "
-        "entire model is rendered brightly",
-        // @VISIBILITY(1.5)
+        "entire model is rendered brightly.",
         openspace::properties::Property::Visibility::NoviceUser
     };
 
diff --git a/modules/spacecraftinstruments/rendering/renderableplanetprojection.cpp b/modules/spacecraftinstruments/rendering/renderableplanetprojection.cpp
index 5cd40e7710..4ad3070d35 100644
--- a/modules/spacecraftinstruments/rendering/renderableplanetprojection.cpp
+++ b/modules/spacecraftinstruments/rendering/renderableplanetprojection.cpp
@@ -58,7 +58,7 @@ namespace {
         "The texture path selected in this property is used as the base texture that is "
         "applied to the planet prior to any image projections. This menu always contains "
         "an empty option for not using a color map. If this value is specified in an "
-        "asset, the last texture is used",
+        "asset, the last texture is used.",
         openspace::properties::Property::Visibility::AdvancedUser
     };
 
@@ -66,7 +66,7 @@ namespace {
         "AddColorTexture",
         "Add Color Base Texture",
         "Adds a new base color texture to the list of selectable base maps used prior to "
-        "any image projection",
+        "any image projection.",
         openspace::properties::Property::Visibility::AdvancedUser
     };
 
@@ -75,14 +75,14 @@ namespace {
         "Heightmap Texture",
         "The texture path selected in this property is used as the height map on the "
         "planet. This menu always contains an empty option for not using a heightmap. If "
-        "this value is specified in an asset, the last texture is used",
+        "this value is specified in an asset, the last texture is used.",
         openspace::properties::Property::Visibility::AdvancedUser
     };
 
     constexpr openspace::properties::Property::PropertyInfo AddHeightTextureInfo = {
         "AddHeightTexture",
         "Add Heightmap Texture",
-        "Adds a new height map texture to the list of selectable height maps used",
+        "Adds a new height map texture to the list of selectable height maps used.",
         openspace::properties::Property::Visibility::AdvancedUser
     };
 
@@ -91,7 +91,7 @@ namespace {
         "Height Exaggeration",
         "This value determines the level of height exaggeration that is applied to a "
         "potential height field. A value of '0' inhibits the height field, whereas a "
-        "value of '1' uses the measured height field",
+        "value of '1' uses the measured height field.",
         openspace::properties::Property::Visibility::AdvancedUser
     };
 
@@ -101,50 +101,50 @@ namespace {
         "If this value is enabled, a shift of the meridian by 180 degrees is performed. "
         "This is a fix especially for Pluto height maps, where the definition of the "
         "meridian has changed through the New Horizons mission and this requires this "
-        "shift",
+        "shift.",
         openspace::properties::Property::Visibility::AdvancedUser
     };
 
     constexpr openspace::properties::Property::PropertyInfo AmbientBrightnessInfo = {
         "AmbientBrightness",
         "Ambient Brightness",
-        "This value determines the ambient brightness of the dark side of the planet",
+        "This value determines the ambient brightness of the dark side of the planet.",
         openspace::properties::Property::Visibility::User
     };
 
     constexpr openspace::properties::Property::PropertyInfo MaxProjectionsPerFrameInfo = {
         "MaxProjectionsPerFrame",
         "Max Projections Per Frame",
-        "The maximum number of image projections to perform per frame. "
-        "Useful to avoid freezing the system for large delta times",
+        "The maximum number of image projections to perform per frame. Useful to avoid "
+        "freezing the system for large delta times.",
         openspace::properties::Property::Visibility::AdvancedUser
     };
 
     constexpr openspace::properties::Property::PropertyInfo ProjectionsInBufferInfo = {
         "ProjectionsInBuffer",
         "Projections In Buffer",
-        "(Read only) The number of images that are currently waiting to be projected",
+        "(Read only) The number of images that are currently waiting to be projected.",
         openspace::properties::Property::Visibility::AdvancedUser
     };
 
     constexpr openspace::properties::Property::PropertyInfo ClearProjectionBufferInfo = {
         "ClearProjectionBuffer",
         "Clear Projection Buffer",
-        "Remove all pending projections from the buffer",
+        "Remove all pending projections from the buffer.",
         openspace::properties::Property::Visibility::AdvancedUser
     };
 
     constexpr openspace::properties::Property::PropertyInfo RadiusInfo = {
         "Radius",
         "Radius",
-        "This value specifies the radius of this sphere in meters",
+        "This value specifies the radius of this sphere in meters.",
         openspace::properties::Property::Visibility::AdvancedUser
     };
 
     constexpr openspace::properties::Property::PropertyInfo SegmentsInfo = {
         "Segments",
         "Segments",
-        "This value specifies the number of segments that this sphere is split into",
+        "This value specifies the number of segments that this sphere is split into.",
         openspace::properties::Property::Visibility::AdvancedUser
     };
 
diff --git a/modules/spacecraftinstruments/rendering/renderableshadowcylinder.cpp b/modules/spacecraftinstruments/rendering/renderableshadowcylinder.cpp
index f2d9bda2d8..9eefa880d6 100644
--- a/modules/spacecraftinstruments/rendering/renderableshadowcylinder.cpp
+++ b/modules/spacecraftinstruments/rendering/renderableshadowcylinder.cpp
@@ -43,7 +43,7 @@ namespace {
         "Points",
         "This value determines the number of control points that is used to construct "
         "the shadow geometry. The higher this number, the more detailed the shadow is, "
-        "but it will have a negative impact on the performance",
+        "but it will have a negative impact on the performance.",
         openspace::properties::Property::Visibility::AdvancedUser
     };
 
@@ -52,15 +52,14 @@ namespace {
         "Shadow Length",
         "This value determines the length of the shadow that is cast by the target "
         "object. The total distance of the shadow is equal to the distance from the "
-        "target to the Sun multiplied with this value",
+        "target to the Sun multiplied with this value.",
         openspace::properties::Property::Visibility::AdvancedUser
     };
 
     constexpr openspace::properties::Property::PropertyInfo ShadowColorInfo = {
         "ShadowColor",
         "Shadow Color",
-        "This value determines the color that is used for the shadow cylinder",
-        // @VISIBILITY(2.5)
+        "This value determines the color that is used for the shadow cylinder.",
         openspace::properties::Property::Visibility::User
     };
 
@@ -68,7 +67,7 @@ namespace {
         "TerminatorType",
         "Terminator Type",
         "This value determines the type of the terminator that is used to calculate the "
-        "shadow eclipse",
+        "shadow eclipse.",
         openspace::properties::Property::Visibility::AdvancedUser
     };
 
@@ -76,7 +75,7 @@ namespace {
         "LightSource",
         "Light Source",
         "This value determines the SPICE name of the object that is used as the "
-        "illuminator for computing the shadow cylinder",
+        "illuminator for computing the shadow cylinder.",
         openspace::properties::Property::Visibility::AdvancedUser
     };
 
@@ -84,7 +83,7 @@ namespace {
         "Observer",
         "Observer",
         "This value specifies the SPICE name of the object that is the observer of the "
-        "shadow cylinder",
+        "shadow cylinder.",
         openspace::properties::Property::Visibility::AdvancedUser
     };
 
@@ -92,7 +91,7 @@ namespace {
         "Body",
         "Target Body",
         "This value is the SPICE name of target body that is used as the shadow caster "
-        "for the shadow cylinder",
+        "for the shadow cylinder.",
         openspace::properties::Property::Visibility::AdvancedUser
     };
 
@@ -100,7 +99,7 @@ namespace {
         "BodyFrame",
         "Body Frame",
         "This value is the SPICE name of the reference frame in which the shadow "
-        "cylinder is expressed",
+        "cylinder is expressed.",
         openspace::properties::Property::Visibility::AdvancedUser
     };
 
@@ -108,8 +107,7 @@ namespace {
         "Aberration",
         "Aberration",
         "This value determines the aberration method that is used to compute the shadow "
-        "cylinder",
-        // @VISIBILITY(3.5)
+        "cylinder.",
         openspace::properties::Property::Visibility::AdvancedUser
     };
 
diff --git a/modules/spacecraftinstruments/util/projectioncomponent.cpp b/modules/spacecraftinstruments/util/projectioncomponent.cpp
index 8f76694284..8dc0af50ee 100644
--- a/modules/spacecraftinstruments/util/projectioncomponent.cpp
+++ b/modules/spacecraftinstruments/util/projectioncomponent.cpp
@@ -50,8 +50,7 @@ namespace {
         "PerformProjection",
         "Perform Projections",
         "If this value is enabled, this ProjectionComponent will perform projections. If "
-        "it is disabled, projections will be ignored",
-        // @VISIBILITY(2.5)
+        "it is disabled, projections will be ignored.",
         openspace::properties::Property::Visibility::User
     };
 
@@ -59,8 +58,7 @@ namespace {
         "ClearAllProjections",
         "Clear Projections",
         "If this property is triggered, it will remove all the projections that have "
-        "already been applied",
-        // @VISIBILITY(2.5)
+        "already been applied.",
         openspace::properties::Property::Visibility::User
     };
 
@@ -69,8 +67,7 @@ namespace {
         "Projection Fading",
         "This value fades the previously performed projections in or out. If this value "
         "is equal to '1', the projections are fully visible, if the value is equal to "
-        "'0', the performed projections are completely invisible",
-        // @VISIBILITY(2.5)
+        "'0', the performed projections are completely invisible.",
         openspace::properties::Property::Visibility::User
     };
 
@@ -80,7 +77,7 @@ namespace {
         "This value determines the size of the texture into which the images are "
         "projected and thus provides the limit to the resolution of projections that can "
         "be applied. Changing this value will not cause the texture to be automatically "
-        "updated, but triggering the 'ApplyTextureSize' property is required",
+        "updated, but triggering the 'ApplyTextureSize' property is required.",
         openspace::properties::Property::Visibility::AdvancedUser
     };
 
@@ -88,7 +85,7 @@ namespace {
         "ApplyTextureSize",
         "Apply Texture Size",
         "Triggering this property applies a new size to the underlying projection "
-        "texture. The old texture is resized and interpolated to fit the new size",
+        "texture. The old texture is resized and interpolated to fit the new size.",
         openspace::properties::Property::Visibility::AdvancedUser
     };
 
diff --git a/modules/spout/renderableplanespout.cpp b/modules/spout/renderableplanespout.cpp
index 4a71596eb2..9bd83ea101 100644
--- a/modules/spout/renderableplanespout.cpp
+++ b/modules/spout/renderableplanespout.cpp
@@ -38,7 +38,7 @@ namespace {
         "SpoutName",
         "Spout Sender Name",
         "This value explicitly sets the Spout receiver to use a specific name. If this "
-        "is not a valid name, an empty image is used",
+        "is not a valid name, an empty image is used.",
         openspace::properties::Property::Visibility::AdvancedUser
     };
 
@@ -47,14 +47,14 @@ namespace {
         "Spout Selection",
         "This property displays all available Spout sender on the system. If one them is "
         "selected, its value is stored in the 'SpoutName' property, overwriting its "
-        "previous value",
+        "previous value.",
         openspace::properties::Property::Visibility::AdvancedUser
     };
 
     constexpr openspace::properties::Property::PropertyInfo UpdateInfo = {
         "UpdateSelection",
         "Update Selection",
-        "If this property is trigged, the 'SpoutSelection' options will be refreshed",
+        "If this property is trigged, the 'SpoutSelection' options will be refreshed.",
         openspace::properties::Property::Visibility::AdvancedUser
     };
 
diff --git a/modules/spout/screenspacespout.cpp b/modules/spout/screenspacespout.cpp
index e72df828da..a587ef2fae 100644
--- a/modules/spout/screenspacespout.cpp
+++ b/modules/spout/screenspacespout.cpp
@@ -36,7 +36,7 @@ namespace {
         "SpoutName",
         "Spout Sender Name",
         "This value explicitly sets the Spout receiver to use a specific name. If this "
-        "is not a valid name, an empty image is used",
+        "is not a valid name, an empty image is used.",
         openspace::properties::Property::Visibility::AdvancedUser
     };
 
@@ -45,14 +45,14 @@ namespace {
         "Spout Selection",
         "This property displays all available Spout sender on the system. If one them is "
         "selected, its value is stored in the 'SpoutName' property, overwriting its "
-        "previous value",
+        "previous value.",
         openspace::properties::Property::Visibility::AdvancedUser
     };
 
     constexpr openspace::properties::Property::PropertyInfo UpdateInfo = {
         "UpdateSelection",
         "Update Selection",
-        "If this property is trigged, the 'SpoutSelection' options will be refreshed",
+        "If this property is trigged, the 'SpoutSelection' options will be refreshed.",
         openspace::properties::Property::Visibility::AdvancedUser
     };
 
diff --git a/modules/spout/spoutwrapper.cpp b/modules/spout/spoutwrapper.cpp
index cc225a01f3..35218c3224 100644
--- a/modules/spout/spoutwrapper.cpp
+++ b/modules/spout/spoutwrapper.cpp
@@ -37,7 +37,7 @@ namespace {
     constexpr openspace::properties::Property::PropertyInfo NameSenderInfo = {
         "SpoutName",
         "Spout Sender Name",
-        "This value sets the Spout sender to use a specific name",
+        "This value sets the Spout sender to use a specific name.",
         openspace::properties::Property::Visibility::AdvancedUser
     };
 
@@ -45,7 +45,7 @@ namespace {
         "SpoutName",
         "Spout Receiver Name",
         "This value explicitly sets the Spout receiver to use a specific name. If this "
-        "is not a valid name, an empty image is used",
+        "is not a valid name, an empty image is used.",
         openspace::properties::Property::Visibility::AdvancedUser
     };
 
@@ -54,14 +54,14 @@ namespace {
         "Spout Selection",
         "This property displays all available Spout sender on the system. If one them is "
         "selected, its value is stored in the 'SpoutName' property, overwriting its "
-        "previous value",
+        "previous value.",
         openspace::properties::Property::Visibility::AdvancedUser
     };
 
     constexpr openspace::properties::Property::PropertyInfo UpdateInfo = {
         "UpdateSelection",
         "Update Selection",
-        "If this property is trigged, the 'SpoutSelection' options will be refreshed",
+        "If this property is trigged, the 'SpoutSelection' options will be refreshed.",
         openspace::properties::Property::Visibility::AdvancedUser
     };
 } // namespace
diff --git a/modules/touch/src/touchinteraction.cpp b/modules/touch/src/touchinteraction.cpp
index a524919b17..23649c7b5e 100644
--- a/modules/touch/src/touchinteraction.cpp
+++ b/modules/touch/src/touchinteraction.cpp
@@ -67,7 +67,7 @@ namespace {
         "Take a unit test saving the LM data into file",
         "LM - least-squares minimization using Levenberg-Marquardt algorithm."
         "Used to find a new camera state from touch points when doing direct "
-        "manipulation",
+        "manipulation.",
         openspace::properties::Property::Visibility::Developer
     };
 
@@ -75,7 +75,6 @@ namespace {
         "DisableZoom",
         "Disable zoom navigation",
         "", // @TODO Missing documentation
-        // @VISIBILITY(2.5)
         openspace::properties::Property::Visibility::User
     };
 
@@ -83,7 +82,6 @@ namespace {
         "DisableRoll",
         "Disable roll navigation",
         "", // @TODO Missing documentation
-        // @VISIBILITY(2.5)
         openspace::properties::Property::Visibility::User
     };
 
@@ -105,7 +103,6 @@ namespace {
         "DeceleratesPerSecond",
         "Number of times velocity is decelerated per second",
         "", // @TODO Missing documentation
-        // @VISIBILITY(3.5)
         openspace::properties::Property::Visibility::AdvancedUser
     };
 
@@ -127,7 +124,7 @@ namespace {
         "PinchZoomFactor",
         "Scaling distance travelled on pinch",
         "This value is used to reduce the amount of pinching needed. A linear kind of "
-        "sensitivity that will alter the pinch-zoom speed",
+        "sensitivity that will alter the pinch-zoom speed.",
         openspace::properties::Property::Visibility::AdvancedUser
     };
 
@@ -142,7 +139,6 @@ namespace {
         "ZoomSensitivityExp",
         "Sensitivity of exponential zooming in relation to distance from focus node",
         "", // @TODO Missing documentation
-        // @VISIBILITY(3.5)
         openspace::properties::Property::Visibility::AdvancedUser
     };
 
@@ -150,7 +146,6 @@ namespace {
         "ZoomSensitivityProp",
         "Sensitivity of zooming proportional to distance from focus node",
         "", // @TODO Missing documentation
-        // @VISIBILITY(3.5)
         openspace::properties::Property::Visibility::AdvancedUser
     };
 
@@ -161,7 +156,6 @@ namespace {
         "Threshold of distance to target node for whether or not to use exponential "
         "zooming",
         "", // @TODO Missing documentation
-        // @VISIBILITY(3.5)
         openspace::properties::Property::Visibility::AdvancedUser
     };
 
@@ -170,9 +164,8 @@ namespace {
     {
         "ZoomInBoundarySphereMultiplier",
         "Multiplies a node's boundary sphere by this in order to limit zoom in & prevent "
-        "surface collision",
+        "surface collision.",
         "", // @TODO Missing documentation
-        // @VISIBILITY(3.5)
         openspace::properties::Property::Visibility::AdvancedUser
     };
 
@@ -187,14 +180,14 @@ namespace {
     constexpr openspace::properties::Property::PropertyInfo ConstantTimeDecaySecsInfo = {
         "ConstantTimeDecaySecs",
         "Time duration that a pitch/roll/zoom/pan should take to decay to zero (seconds)",
-        "",
+        "",  // @TODO Missing documentation
         openspace::properties::Property::Visibility::AdvancedUser
     };
 
     constexpr openspace::properties::Property::PropertyInfo InputSensitivityInfo = {
         "InputSensitivity",
         "Threshold for interpreting input as still",
-        "",
+        "",  // @TODO Missing documentation
         openspace::properties::Property::Visibility::AdvancedUser
     };
 
@@ -223,7 +216,6 @@ namespace {
         "Friction",
         "Friction for different interactions (orbit, zoom, roll, pan)",
         "", // @TODO Missing documentation
-        // @VISIBILITY(2.5)
         openspace::properties::Property::Visibility::User
     };
 
@@ -232,8 +224,7 @@ namespace {
         "Zoom Out Limit",
         "The maximum distance you are allowed to navigate away from the anchor. "
         "This should always be larger than the zoom in value if you want to be able "
-        "to zoom. Defaults to maximum allowed double",
-        // @VISIBILITY(2.5)
+        "to zoom. Defaults to maximum allowed double.",
         openspace::properties::Property::Visibility::User
     };
 
@@ -243,7 +234,6 @@ namespace {
         "The minimum distance from the anchor that you are allowed to navigate to. "
         "Its purpose is to limit zooming in on a node. If this value is not set it "
         "defaults to the surface of the current anchor.",
-        // @VISIBILITY(2.5)
         openspace::properties::Property::Visibility::User
     };
 
@@ -263,7 +253,7 @@ namespace {
         "Direct manipulation threshold",
         "This threshold affects the distance from the interaction sphere at which the "
         "direct manipulation interaction mode starts being active. The value is given "
-        "as a factor times the interaction sphere",
+        "as a factor times the interaction sphere.",
         openspace::properties::Property::Visibility::AdvancedUser
     };
 
diff --git a/modules/touch/touchmodule.cpp b/modules/touch/touchmodule.cpp
index 6330111fd7..5d8c043122 100644
--- a/modules/touch/touchmodule.cpp
+++ b/modules/touch/touchmodule.cpp
@@ -52,7 +52,7 @@ namespace {
     constexpr openspace::properties::Property::PropertyInfo EventsInfo = {
         "DetectedTouchEvent",
         "Detected Touch Event",
-        "True when there is an active touch event",
+        "True when there is an active touch event.",
         openspace::properties::Property::Visibility::Hidden
     };
 
diff --git a/modules/toyvolume/rendering/renderabletoyvolume.cpp b/modules/toyvolume/rendering/renderabletoyvolume.cpp
index f809341a63..f50f1d07c8 100644
--- a/modules/toyvolume/rendering/renderabletoyvolume.cpp
+++ b/modules/toyvolume/rendering/renderabletoyvolume.cpp
@@ -59,7 +59,6 @@ namespace {
         "Translation",
         "Translation",
         "", // @TODO Missing documentation
-        // @VISIBILITY(3.)
         openspace::properties::Property::Visibility::AdvancedUser
     };
 
@@ -67,7 +66,6 @@ namespace {
         "Rotation",
         "Euler rotation",
         "", // @TODO Missing documentation
-        // @VISIBILITY(3.)
         openspace::properties::Property::Visibility::AdvancedUser
     };
 
@@ -82,7 +80,7 @@ namespace {
     {
         "Downscale",
         "Downscale Factor Volume Rendering",
-        "This value set the downscaling factor when rendering the current volume",
+        "This value set the downscaling factor when rendering the current volume.",
         openspace::properties::Property::Visibility::AdvancedUser
     };
 } // namespace
diff --git a/modules/video/src/videoplayer.cpp b/modules/video/src/videoplayer.cpp
index 856a0a9850..54b5a5c6c5 100644
--- a/modules/video/src/videoplayer.cpp
+++ b/modules/video/src/videoplayer.cpp
@@ -50,13 +50,13 @@ namespace {
     constexpr openspace::properties::Property::PropertyInfo PlayInfo = {
         "Play",
         "Play",
-        "Play video"
+        "Play video."
     };
 
     constexpr openspace::properties::Property::PropertyInfo PauseInfo = {
         "Pause",
         "Pause",
-        "Pause video"
+        "Pause video."
     };
 
     constexpr openspace::properties::Property::PropertyInfo GoToStartInfo = {
@@ -75,7 +75,7 @@ namespace {
     constexpr openspace::properties::Property::PropertyInfo AudioInfo = {
         "PlayAudio",
         "Play Audio",
-        "Play audio"
+        "Play audio."
     };
 
     constexpr openspace::properties::Property::PropertyInfo StartTimeInfo = {
diff --git a/modules/video/videomodule.cpp b/modules/video/videomodule.cpp
index cb914478c2..13a5b97e2e 100644
--- a/modules/video/videomodule.cpp
+++ b/modules/video/videomodule.cpp
@@ -37,7 +37,7 @@ namespace {
     constexpr openspace::properties::Property::PropertyInfo EnabledInfo = {
         "Enabled",
         "Enabled",
-        "Decides if this module should be enabled"
+        "Decides if this module should be enabled."
     };
 
     struct [[codegen::Dictionary(VideoModule)]] Parameters {
diff --git a/modules/vislab/rendering/renderabledistancelabel.cpp b/modules/vislab/rendering/renderabledistancelabel.cpp
index 3e03e64851..1372f70bd5 100644
--- a/modules/vislab/rendering/renderabledistancelabel.cpp
+++ b/modules/vislab/rendering/renderabledistancelabel.cpp
@@ -41,7 +41,7 @@ namespace {
         "NodeLine",
         "Node Line",
         "Property to track a nodeline. When tracking the label text will be updating the "
-        "distance from the nodeline start and end",
+        "distance from the nodeline start and end.",
         openspace::properties::Property::Visibility::AdvancedUser
     };
 
@@ -49,8 +49,7 @@ namespace {
         "DistanceUnit",
         "Distance Unit",
         "Property to define the unit in which the distance should be displayed. "
-        "Defaults to 'km' if not specified",
-        // @VISIBILITY(2.5)
+        "Defaults to 'km' if not specified.",
         openspace::properties::Property::Visibility::User
     };
 
@@ -58,7 +57,7 @@ namespace {
         "CustomUnitDescriptor",
         "Custom Unit Descriptor",
         "Property to define a custom unit descriptor to use to describe the distance "
-        "value. Defaults to the units SI descriptor if not specified",
+        "value. Defaults to the units SI descriptor if not specified.",
         openspace::properties::Property::Visibility::AdvancedUser
     };
 
diff --git a/modules/volume/rendering/renderabletimevaryingvolume.cpp b/modules/volume/rendering/renderabletimevaryingvolume.cpp
index 22ca620a4b..c9e97c2d57 100644
--- a/modules/volume/rendering/renderabletimevaryingvolume.cpp
+++ b/modules/volume/rendering/renderabletimevaryingvolume.cpp
@@ -55,16 +55,15 @@ namespace {
     constexpr openspace::properties::Property::PropertyInfo StepSizeInfo = {
         "StepSize",
         "Step Size",
-        "Specifies how often to sample on the raycaster. Lower step -> higher resolution",
-        // @VISIBILITY(3.5)
+        "Specifies how often to sample on the raycaster. Lower step -> higher "
+        "resolution.",
         openspace::properties::Property::Visibility::AdvancedUser
     };
 
     constexpr openspace::properties::Property::PropertyInfo GridTypeInfo = {
         "GridType",
         "Grid Type",
-        "Spherical or Cartesian grid",
-        // @VISIBILITY(3.5)
+        "Spherical or Cartesian grid.",
         openspace::properties::Property::Visibility::AdvancedUser
     };
 
@@ -72,7 +71,7 @@ namespace {
         "SecondsBefore",
         "Seconds before",
         "Specifies the number of seconds to show the first timestep before its "
-        "actual time. The default value is 0",
+        "actual time. The default value is 0.",
         openspace::properties::Property::Visibility::AdvancedUser
     };
 
@@ -80,43 +79,42 @@ namespace {
         "SecondsAfter",
         "Seconds after",
         "Specifies the number of seconds to show the the last timestep after its "
-        "actual time",
+        "actual time.",
         openspace::properties::Property::Visibility::AdvancedUser
     };
 
     constexpr openspace::properties::Property::PropertyInfo SourceDirectoryInfo = {
         "SourceDirectory",
         "Source Directory",
-        "Specifies the path to load timesteps from",
+        "Specifies the path to load timesteps from.",
         openspace::properties::Property::Visibility::AdvancedUser
     };
 
     constexpr openspace::properties::Property::PropertyInfo TransferFunctionInfo = {
         "TransferFunctionPath",
         "Transfer Function Path",
-        "Specifies the transfer function file path",
+        "Specifies the transfer function file path.",
         openspace::properties::Property::Visibility::AdvancedUser
     };
 
     constexpr openspace::properties::Property::PropertyInfo TriggerTimeJumpInfo = {
         "TriggerTimeJump",
         "Jump",
-        "Sets the time to be the first time of the volume sequence",
+        "Sets the time to be the first time of the volume sequence.",
         openspace::properties::Property::Visibility::User
     };
 
     constexpr openspace::properties::Property::PropertyInfo JumpToTimestepInfo = {
         "JumpToTimestep",
         "Jump to timestep",
-        "Lets you scrub through the sequence's time steps",
+        "Lets you scrub through the sequence's time steps.",
         openspace::properties::Property::Visibility::User
     };
 
     constexpr openspace::properties::Property::PropertyInfo BrightnessInfo = {
         "Brightness",
         "Brightness",
-        "The volume renderer's general brightness",
-        // @VISIBILITY(2.5)
+        "The volume renderer's general brightness.",
         openspace::properties::Property::Visibility::User
     };
 
@@ -124,15 +122,13 @@ namespace {
         "RNormalization",
         "Radius normalization",
         "", // @TODO Missing documentation
-        // @VISIBILITY(3.5)
         openspace::properties::Property::Visibility::AdvancedUser
     };
 
     constexpr openspace::properties::Property::PropertyInfo rUpperBoundInfo = {
         "RUpperBound",
         "Radius upper bound",
-        "Limit the volume's radius",
-        // @VISIBILITY(3.5)
+        "Limit the volume's radius.",
         openspace::properties::Property::Visibility::AdvancedUser
     };
 
diff --git a/modules/volume/transferfunctionhandler.cpp b/modules/volume/transferfunctionhandler.cpp
index d8dec3f83d..c0a5329414 100644
--- a/modules/volume/transferfunctionhandler.cpp
+++ b/modules/volume/transferfunctionhandler.cpp
@@ -32,36 +32,35 @@ namespace {
     constexpr openspace::properties::Property::PropertyInfo TransferFunctionInfo = {
         "TransferFunction",
         "TransferFunction",
-        "All the envelopes used in the transfer function",
+        "All the envelopes used in the transfer function.",
         openspace::properties::Property::Visibility::AdvancedUser
     };
 
     constexpr openspace::properties::Property::PropertyInfo DataUnitInfo = {
         "DataUnit",
         "DataUnit",
-        "Unit of the data",
+        "Unit of the data.",
         openspace::properties::Property::Visibility::AdvancedUser
     };
 
     constexpr openspace::properties::Property::PropertyInfo MinValueInfo = {
         "MinValue",
         "MinValue",
-        "Minimum value in the data",
+        "Minimum value in the data.",
         openspace::properties::Property::Visibility::AdvancedUser
     };
 
     constexpr openspace::properties::Property::PropertyInfo MaxValueInfo = {
         "MaxValue",
         "MaxValue",
-        "Maximum value in the data",
+        "Maximum value in the data.",
         openspace::properties::Property::Visibility::AdvancedUser
     };
 
     constexpr openspace::properties::Property::PropertyInfo SaveTransferFunctionInfo = {
         "SaveTransferFunction",
         "Save Transfer Function",
-        "Save your transfer function",
-        // @VISIBILITY(3.5)
+        "Save your transfer function.",
         openspace::properties::Property::Visibility::AdvancedUser
     };
 } // namespace
diff --git a/modules/webbrowser/src/defaultbrowserlauncher.cpp b/modules/webbrowser/src/defaultbrowserlauncher.cpp
index c05f398b2d..7f5949662c 100644
--- a/modules/webbrowser/src/defaultbrowserlauncher.cpp
+++ b/modules/webbrowser/src/defaultbrowserlauncher.cpp
@@ -33,7 +33,7 @@
 namespace openspace {
 
 bool DefaultBrowserLauncher::OnBeforePopup(CefRefPtr<CefBrowser>, CefRefPtr<CefFrame>,
-                                           [[ maybe_unused ]] const CefString& targetUrl,
+                                           [[maybe_unused]] const CefString& targetUrl,
                                            const CefString&,
                                            CefLifeSpanHandler::WindowOpenDisposition,
                                            bool, const CefPopupFeatures&, CefWindowInfo&,
diff --git a/modules/webbrowser/src/screenspacebrowser.cpp b/modules/webbrowser/src/screenspacebrowser.cpp
index 5ca4bfbdb0..9bee28aa7f 100644
--- a/modules/webbrowser/src/screenspacebrowser.cpp
+++ b/modules/webbrowser/src/screenspacebrowser.cpp
@@ -41,22 +41,21 @@ namespace {
     constexpr openspace::properties::Property::PropertyInfo DimensionsInfo = {
         "Dimensions",
         "Browser Dimensions",
-        "Set the dimensions of the web browser windows",
-        // @VISIBILITY(2.33)
+        "Set the dimensions of the web browser windows.",
         openspace::properties::Property::Visibility::User
     };
 
     constexpr openspace::properties::Property::PropertyInfo UrlInfo = {
         "Url",
         "URL",
-        "The URL to load",
+        "The URL to load.",
         openspace::properties::Property::Visibility::NoviceUser
     };
 
     constexpr openspace::properties::Property::PropertyInfo ReloadInfo = {
         "Reload",
         "Reload",
-        "Reload the web browser",
+        "Reload the web browser.",
         openspace::properties::Property::Visibility::NoviceUser
     };
 
diff --git a/modules/webbrowser/webbrowsermodule.cpp b/modules/webbrowser/webbrowsermodule.cpp
index 61fd0e8360..1ce34570bb 100644
--- a/modules/webbrowser/webbrowsermodule.cpp
+++ b/modules/webbrowser/webbrowsermodule.cpp
@@ -58,7 +58,7 @@ namespace {
         "Update Browser Between Renderables",
         "Run the message loop of the browser between calls to render individual "
         "renderables. When disabled, the browser message loop only runs "
-        "once per frame",
+        "once per frame.",
         openspace::properties::Property::Visibility::Developer
     };
 
@@ -66,7 +66,7 @@ namespace {
         "BrowserUpdateInterval",
         "Browser Update Interval",
         "The time in microseconds between running the message loop of the browser. "
-        "Only used if UpdateBrowserBetweenRenderables is true",
+        "Only used if UpdateBrowserBetweenRenderables is true.",
         openspace::properties::Property::Visibility::Developer
     };
 
diff --git a/modules/webgui/webguimodule.cpp b/modules/webgui/webguimodule.cpp
index 1cf99bd700..94edb9e439 100644
--- a/modules/webgui/webguimodule.cpp
+++ b/modules/webgui/webguimodule.cpp
@@ -44,29 +44,28 @@ namespace {
     constexpr openspace::properties::Property::PropertyInfo ServerProcessEnabledInfo = {
         "ServerProcessEnabled",
         "Enable Server Process",
-        "Enable the node js based process used to serve the Web GUI",
-        // @VISIBILITY(3.5)
+        "Enable the node js based process used to serve the Web GUI.",
         openspace::properties::Property::Visibility::AdvancedUser
     };
 
     constexpr openspace::properties::Property::PropertyInfo AddressInfo = {
         "Address",
         "Address",
-        "The network address to use when connecting to OpenSpace from the Web GUI",
+        "The network address to use when connecting to OpenSpace from the Web GUI.",
         openspace::properties::Property::Visibility::AdvancedUser
     };
 
     constexpr openspace::properties::Property::PropertyInfo PortInfo = {
         "Port",
         "Port",
-        "The network port to use when serving the Web GUI over HTTP",
+        "The network port to use when serving the Web GUI over HTTP.",
         openspace::properties::Property::Visibility::AdvancedUser
     };
 
     constexpr openspace::properties::Property::PropertyInfo WebSocketInterfaceInfo = {
         "WebSocketInterface",
         "WebSocket Interface",
-        "The identifier of the websocket interface to use when communicating",
+        "The identifier of the websocket interface to use when communicating.",
         openspace::properties::Property::Visibility::AdvancedUser
     };
 
@@ -74,8 +73,7 @@ namespace {
     {
         "ServerProcessEntryPoint",
         "Server Process Entry Point",
-        "The node js command to invoke",
-        // @VISIBILITY(3.5)
+        "The node js command to invoke.",
         openspace::properties::Property::Visibility::AdvancedUser
     };
 
@@ -84,8 +82,7 @@ namespace {
         "Directories",
         "Directories from which to to serve static content, as a string list "
         "with entries expressed as pairs, where every odd is the endpoint name and every "
-        "even is the directory",
-        // @VISIBILITY(3.5)
+        "even is the directory.",
         openspace::properties::Property::Visibility::AdvancedUser
     };
 
@@ -93,8 +90,7 @@ namespace {
         "DefaultEndpoint",
         "Default Endpoint",
         "The 'default' endpoint. The server will redirect http requests from / to "
-        "/<DefaultEndpoint>",
-        // @VISIBILITY(3.5)
+        "/<DefaultEndpoint>.",
         openspace::properties::Property::Visibility::AdvancedUser
     };
 
@@ -104,7 +100,7 @@ namespace {
         "Directories that are currently served. This value is set by the server process, "
         "as a verification of the actually served directories. For example, an onChange "
         "callback can be registered to this, to reload browsers when the server is "
-        "ready. Manual changes to this property have no effect",
+        "ready. Manual changes to this property have no effect.",
         openspace::properties::Property::Visibility::AdvancedUser
     };
 
diff --git a/src/engine/moduleengine.cpp b/src/engine/moduleengine.cpp
index e098301e56..0621df1589 100644
--- a/src/engine/moduleengine.cpp
+++ b/src/engine/moduleengine.cpp
@@ -42,8 +42,7 @@ namespace {
         "AllModules",
         "All Modules",
         "The list of all modules that were compiled for this version of OpenSpace in the "
-        "same order in which they were initialized",
-        // @VISIBILITY(3.5)
+        "same order in which they were initialized.",
         openspace::properties::Property::Visibility::AdvancedUser
     };
 } // namespace
diff --git a/src/engine/openspaceengine.cpp b/src/engine/openspaceengine.cpp
index ec5161bff6..2e34ffdb05 100644
--- a/src/engine/openspaceengine.cpp
+++ b/src/engine/openspaceengine.cpp
@@ -120,7 +120,7 @@ namespace {
         "PrintEvents",
         "Print Events",
         "If this is enabled, all events that are propagated through the system are "
-        "printed to the log",
+        "printed to the log.",
         openspace::properties::Property::Visibility::AdvancedUser
     };
 
@@ -128,7 +128,7 @@ namespace {
         "PropertyVisibility",
         "Property Visibility",
         "Hides or displays different settings in the GUI depending on how advanced they "
-        "are",
+        "are.",
         openspace::properties::Property::Visibility::Always
     };
 
@@ -146,8 +146,7 @@ namespace {
         "DisableMouseInputs",
         "Disable All Mouse Inputs",
         "Disables all mouse inputs. Useful when using touch interaction, to prevent "
-        "double inputs on touch (from both touch input and inserted mouse inputs)",
-        // @VISIBILITY(2.67)
+        "double inputs on touch (from both touch input and inserted mouse inputs).",
         openspace::properties::Property::Visibility::User
     };
 
diff --git a/src/events/event.cpp b/src/events/event.cpp
index 8119c012bb..6e9a19bc22 100644
--- a/src/events/event.cpp
+++ b/src/events/event.cpp
@@ -67,7 +67,7 @@ void log(int i, const EventParallelConnection& e) {
     LINFO(std::format("[{}] ParallelConnection ({})", i, state));
 }
 
-void log(int i, [[ maybe_unused ]] const EventProfileLoadingFinished& e) {
+void log(int i, [[maybe_unused]] const EventProfileLoadingFinished& e) {
     ghoul_assert(e.type == EventProfileLoadingFinished::Type, "Wrong type");
     LINFO(std::format("[{}] ProfileLoadingFinished", i));
 }
@@ -126,7 +126,7 @@ void log(int i, const EventTimeOfInterestReached& e) {
     ));
 }
 
-void log(int i, [[ maybe_unused ]] const EventMissionEventReached& e) {
+void log(int i, [[maybe_unused]] const EventMissionEventReached& e) {
     ghoul_assert(e.type == EventMissionEventReached::Type, "Wrong type");
     LINFO(std::format("[{}] MissionEventReached", i));
 }
@@ -136,7 +136,7 @@ void log(int i, const EventPlanetEclipsed& e) {
     LINFO(std::format("[{}] PlanetEclipsed: {} -> {}", i, e.eclipsee, e.eclipser));
 }
 
-void log(int i, [[ maybe_unused ]] const EventInterpolationFinished& e) {
+void log(int i, [[maybe_unused]] const EventInterpolationFinished& e) {
     ghoul_assert(e.type == EventInterpolationFinished::Type, "Wrong type");
     LINFO(std::format("[{}] InterpolationFinished", i));
 }
diff --git a/src/interaction/interactionmonitor.cpp b/src/interaction/interactionmonitor.cpp
index fe83a4a684..49ea144fec 100644
--- a/src/interaction/interactionmonitor.cpp
+++ b/src/interaction/interactionmonitor.cpp
@@ -33,8 +33,7 @@ namespace {
         "IdleTime",
         "Idle Time",
         "Time in seconds that has passed from latest registered interaction until the "
-        "application goes idle",
-        // @VISIBILITY(3.5)
+        "application goes idle.",
         openspace::properties::Property::Visibility::AdvancedUser
     };
 
@@ -42,8 +41,7 @@ namespace {
         "IsInActiveState",
         "Is State Active",
         "Keeps track whether the interaction session is in active state or not. False if "
-        "application is in idle state, true if it is in active state",
-        // @VISIBILITY(3.5)
+        "application is in idle state, true if it is in active state.",
         openspace::properties::Property::Visibility::AdvancedUser
     };
 } // namespace
diff --git a/src/interaction/sessionrecording.cpp b/src/interaction/sessionrecording.cpp
index 68b8367427..4e355b548c 100644
--- a/src/interaction/sessionrecording.cpp
+++ b/src/interaction/sessionrecording.cpp
@@ -72,7 +72,7 @@ namespace {
         "RenderInfo",
         "Render Playback Information",
         "If enabled, information about a currently played back session recording is "
-        "rendering to screen",
+        "rendering to screen.",
         openspace::properties::Property::Visibility::AdvancedUser
     };
 
@@ -80,7 +80,7 @@ namespace {
         "IgnoreRecordedScale",
         "Ignore Recorded Scale",
         "If this value is enabled, the scale value from a recording is ignored and the "
-        "computed values are used instead",
+        "computed values are used instead.",
         openspace::properties::Property::Visibility::Hidden
     };
 
@@ -89,7 +89,7 @@ namespace {
         "Add Model Matrix in ASCII recording",
         "If this is 'true', the model matrix is written into the ASCII recording format "
         "in the line before each camera keyframe. The model matrix is the full matrix "
-        "that converts the position into a J2000+Galactic reference frame",
+        "that converts the position into a J2000+Galactic reference frame.",
         openspace::properties::Property::Visibility::Developer
     };
 } // namespace
diff --git a/src/navigation/navigationhandler.cpp b/src/navigation/navigationhandler.cpp
index c3e56d725e..bb7f994528 100644
--- a/src/navigation/navigationhandler.cpp
+++ b/src/navigation/navigationhandler.cpp
@@ -65,21 +65,21 @@ namespace {
         "DisableKeybindings",
         "Disable all Keybindings",
         "Disables all keybindings without removing them. Please note that this does not "
-        "apply to the key to open the console",
+        "apply to the key to open the console.",
         openspace::properties::Property::Visibility::AdvancedUser
     };
 
     constexpr openspace::properties::Property::PropertyInfo DisableMouseInputInfo = {
         "DisableMouseInputs",
         "Disable all mouse inputs",
-        "Disables all mouse inputs and prevents them from affecting the camera",
+        "Disables all mouse inputs and prevents them from affecting the camera.",
         openspace::properties::Property::Visibility::AdvancedUser
     };
 
     constexpr openspace::properties::Property::PropertyInfo DisableJoystickInputInfo = {
         "DisableJoystickInputs",
         "Disable all joystick inputs",
-        "Disables all joystick inputs and prevents them from affecting the camera",
+        "Disables all joystick inputs and prevents them from affecting the camera.",
         openspace::properties::Property::Visibility::User
     };
 
@@ -87,7 +87,7 @@ namespace {
         "UseKeyFrameInteraction",
         "Use keyframe interaction",
         "If this is set to 'true' the entire interaction is based off key frames rather "
-        "than using the mouse interaction",
+        "than using the mouse interaction.",
         openspace::properties::Property::Visibility::Developer
     };
 
@@ -96,7 +96,8 @@ namespace {
         "JumpTo Fade Duration",
         "The number of seconds the fading of the rendering should take per default when "
         "navigating through a 'jump' transition. This is when the rendering is first "
-        "faded to black, then the camera is moved, and then the rendering fades in again",
+        "faded to black, then the camera is moved, and then the rendering fades in "
+        "again.",
         openspace::properties::Property::Visibility::User
     };
 } // namespace
diff --git a/src/navigation/orbitalnavigator.cpp b/src/navigation/orbitalnavigator.cpp
index 8aabc7398b..fb729b8485 100644
--- a/src/navigation/orbitalnavigator.cpp
+++ b/src/navigation/orbitalnavigator.cpp
@@ -57,8 +57,7 @@ namespace {
         "Anchor",
         "The name of the scene graph node that is the origin of the camera interaction. "
         "The camera follows, orbits and dollies towards this node. Any scene graph node "
-        "can be the anchor node",
-        // @VISIBILITY(1.33)
+        "can be the anchor node.",
         openspace::properties::Property::Visibility::NoviceUser
     };
 
@@ -66,8 +65,7 @@ namespace {
         "Aim",
         "Aim",
         "The name of the scene graph node that is the aim of the camera. The camera "
-        "direction is relative to the vector from the camera position to this node",
-        // @VISIBILITY(1.67)
+        "direction is relative to the vector from the camera position to this node.",
         openspace::properties::Property::Visibility::NoviceUser
     };
 
@@ -75,8 +73,7 @@ namespace {
         "RetargetAnchor",
         "Retarget Anchor",
         "When triggered, this property starts an interpolation to reset the "
-        "camera direction to the anchor node",
-        // @VISIBILITY(1.33)
+        "camera direction to the anchor node.",
         openspace::properties::Property::Visibility::NoviceUser
     };
 
@@ -84,8 +81,7 @@ namespace {
         "RetargetAim",
         "Retarget Aim",
         "When triggered, this property starts an interpolation to reset the "
-        "camera direction to the aim node",
-        // @VISIBILITY(1.67)
+        "camera direction to the aim node.",
         openspace::properties::Property::Visibility::NoviceUser
     };
 
@@ -94,8 +90,7 @@ namespace {
         "Roll Friction",
         "If this is enabled, a small friction is applied to the rolling part of the "
         "camera motion, thus slowing it down within a small time period. If this value "
-        "is disabled, the camera will roll forever",
-        // @VISIBILITY(1.33)
+        "is disabled, the camera will roll forever.",
         openspace::properties::Property::Visibility::NoviceUser
     };
 
@@ -104,8 +99,7 @@ namespace {
         "Rotational Friction",
         "If this is enabled, a small friction is applied to the rotational part of the "
         "camera motion, thus slowing it down within a small time period. If this value "
-        "is disabled, the camera will rotate forever",
-        // @VISIBILITY(1.33)
+        "is disabled, the camera will rotate forever.",
         openspace::properties::Property::Visibility::NoviceUser
     };
 
@@ -114,8 +108,7 @@ namespace {
         "Zoom Friction",
         "If this is enabled, a small friction is applied to the zoom part of the camera "
         "motion, thus slowing it down within a small time period. If this value is "
-        "disabled, the camera will zoom in or out forever",
-        // @VISIBILITY(1.33)
+        "disabled, the camera will zoom in or out forever.",
         openspace::properties::Property::Visibility::NoviceUser
     };
 
@@ -123,7 +116,7 @@ namespace {
         "MouseSensitivity",
         "Mouse Sensitivity",
         "Determines the sensitivity of the camera motion thorugh the mouse. The lower "
-        "the sensitivity is the less impact a mouse motion will have",
+        "the sensitivity is the less impact a mouse motion will have.",
         openspace::properties::Property::Visibility::NoviceUser
     };
 
@@ -131,7 +124,7 @@ namespace {
         "JoystickSensitivity",
         "Joystick Sensitivity",
         "Determines the sensitivity of the camera motion thorugh a joystick. The lower "
-        "the sensitivity is the less impact a joystick motion will have",
+        "the sensitivity is the less impact a joystick motion will have.",
         openspace::properties::Property::Visibility::NoviceUser
     };
 
@@ -139,7 +132,7 @@ namespace {
         "WebsocketSensitivity",
         "Websocket Sensitivity",
         "Determines the sensitivity of the camera motion thorugh a websocket. The lower "
-        "the sensitivity is the less impact a webstick motion will have",
+        "the sensitivity is the less impact a webstick motion will have.",
         openspace::properties::Property::Visibility::NoviceUser
     };
 
@@ -148,7 +141,7 @@ namespace {
         "Friction Factor",
         "Determines the factor that is applied if the 'Roll Friction', 'Rotational "
         "Friction', and 'Zoom Friction' values are enabled. The lower this value is, the "
-        "faster the camera movements will stop",
+        "faster the camera movements will stop.",
         openspace::properties::Property::Visibility::User
     };
 
@@ -158,7 +151,7 @@ namespace {
         "If true, the camera will rotate with the current achor node if within a "
         "certain distance from it. When this happens, the object will appear fixed in "
         "relation to the camera. The distance at which the change happens is controlled "
-        "through another property",
+        "through another property.",
         openspace::properties::Property::Visibility::User
     };
 
@@ -168,7 +161,7 @@ namespace {
         "Follow Anchor Node Rotation Distance",
         "A factor used to determine the distance at which the camera starts rotating "
         "with the anchor node. The actual distance will be computed by multiplying "
-        "this factor with the approximate radius of the node",
+        "this factor with the approximate radius of the node.",
         openspace::properties::Property::Visibility::AdvancedUser
     };
 
@@ -177,7 +170,7 @@ namespace {
         "StereoInterpolationTime",
         "Stereo Interpolation Time",
         "The time to interpolate to a new stereoscopic depth when the anchor node is "
-        "changed, in seconds",
+        "changed, in seconds.",
         openspace::properties::Property::Visibility::AdvancedUser
     };
 
@@ -187,7 +180,7 @@ namespace {
         "RetargetAnchorInterpolationTime",
         "Retarget Interpolation Time",
         "The time to interpolate the camera rotation when the anchor or aim node is "
-        "changed, in seconds",
+        "changed, in seconds.",
         openspace::properties::Property::Visibility::AdvancedUser
     };
 
@@ -195,7 +188,7 @@ namespace {
     {
         "FollowRotationInterpolationTime",
         "Follow Rotation Interpolation Time",
-        "The interpolation time when toggling following focus node rotation",
+        "The interpolation time when toggling following focus node rotation.",
         openspace::properties::Property::Visibility::AdvancedUser
     };
 
@@ -204,8 +197,7 @@ namespace {
         "Invert Left and Right Mouse Buttons",
         "If this value is 'false', the left mouse button causes the camera to rotate "
         "around the object and the right mouse button causes the zooming motion. If this "
-        "value is 'true', these two functionalities are reversed",
-        // @VISIBILITY(1.33)
+        "value is 'true', these two functionalities are reversed.",
         openspace::properties::Property::Visibility::NoviceUser
     };
 
@@ -216,8 +208,8 @@ namespace {
         "Adaptive Steroscopic Depth",
         "Dynamically adjust the view scaling based on the distance to the surface of "
         "the anchor and aim nodes. If enabled, view scale will be set to "
-        "StereoscopicDepthOfFocusSurface / min(anchorDistance, aimDistance). "
-        "If disabled, view scale will be set to 10^StaticViewScaleExponent",
+        "StereoscopicDepthOfFocusSurface / min(anchorDistance, aimDistance). If "
+        "disabled, view scale will be set to 10^StaticViewScaleExponent.",
         openspace::properties::Property::Visibility::AdvancedUser
     };
 
@@ -226,7 +218,7 @@ namespace {
         "StaticViewScaleExponent",
         "Static View Scale Exponent",
         "Statically scale the world by 10^StaticViewScaleExponent. Only used if "
-        "UseAdaptiveStereoscopicDepthInfo is set to false",
+        "UseAdaptiveStereoscopicDepthInfo is set to false.",
         openspace::properties::Property::Visibility::AdvancedUser
     };
 
@@ -237,8 +229,7 @@ namespace {
         "Stereoscopic Depth of the Surface in Focus",
         "Set the stereoscopically perceived distance (in meters) to the closest point "
         "out of the surface of the anchor and the center of the aim node. Only used if "
-        "UseAdaptiveStereoscopicDepthInfo is set to true",
-        // @VISIBILITY(2.5)
+        "UseAdaptiveStereoscopicDepthInfo is set to true.",
         openspace::properties::Property::Visibility::User
     };
 
@@ -247,8 +238,7 @@ namespace {
         "Constant Velocity Flight",
         "If this value is enabled, the camera motion will not be affected by the "
         "distance of the camera to the surface of a planet. When enabling this setting "
-        "consider adjusting the mouse sensitivity to a lower value",
-        // @VISIBILITY(2.5)
+        "consider adjusting the mouse sensitivity to a lower value.",
         openspace::properties::Property::Visibility::User
     };
 
@@ -256,8 +246,7 @@ namespace {
         "ApplyIdleBehavior",
         "Apply Idle Behavior",
         "When set to true, the chosen idle behavior will be applied to the camera, "
-        "moving the camera accordingly",
-        // @VISIBILITY(2.5)
+        "moving the camera accordingly.",
         openspace::properties::Property::Visibility::User
     };
 
@@ -265,7 +254,7 @@ namespace {
         "IdleBehavior",
         "Idle Behavior",
         "The chosen camera behavior that will be triggered when the idle behavior is "
-        "applied. Each option represents a predefined camera behavior",
+        "applied. Each option represents a predefined camera behavior.",
         openspace::properties::Property::Visibility::AdvancedUser
     };
 
@@ -275,8 +264,7 @@ namespace {
         "ShouldTriggerWhenIdle",
         "Should Trigger When Idle",
         "If true, the chosen idle behavior will trigger automatically after a certain "
-        "time (see 'IdleWaitTime' property)",
-        // @VISIBILITY(?)
+        "time (see 'IdleWaitTime' property).",
         openspace::properties::Property::Visibility::User
     };
 
@@ -284,8 +272,7 @@ namespace {
         "IdleWaitTime",
         "Idle Wait Time",
         "The time (seconds) until idle behavior starts, if no camera interaction "
-        "has been performed. Note that friction counts as camera interaction",
-        // @VISIBILITY(?)
+        "has been performed. Note that friction counts as camera interaction.",
         openspace::properties::Property::Visibility::AdvancedUser
     };
 
@@ -294,7 +281,7 @@ namespace {
         "Speed Factor",
         "A factor that can be used to increase or slow down the speed of an applied "
         "idle behavior. A negative value will invert the direction. Note that a speed "
-        "of exactly 0 leads to no movement at all",
+        "of exactly 0 leads to no movement at all.",
         openspace::properties::Property::Visibility::AdvancedUser
     };
 
@@ -303,8 +290,7 @@ namespace {
         "Invert",
         "If true, the direction of the idle behavior motion will be inverted compared "
         "to the default. For example, the 'Orbit' option rotates to the right per "
-        "default, and will rotate to the left when inverted",
-        // @VISIBILITY(?)
+        "default, and will rotate to the left when inverted.",
         openspace::properties::Property::Visibility::AdvancedUser
     };
 
@@ -315,8 +301,7 @@ namespace {
         "If set to true, the idle behavior is aborted on camera interaction. If false, "
         "the behavior will be reapplied after the interaction. Examples of camera "
         "interaction are: changing the anchor node, starting a camera path or session "
-        "recording playback, or navigating manually using an input device",
-        // @VISIBILITY(2.5)
+        "recording playback, or navigating manually using an input device.",
         openspace::properties::Property::Visibility::User
     };
 
@@ -326,8 +311,7 @@ namespace {
         "DampenInterpolationTime",
         "Start/End Dampen Interpolation Time",
         "The time to interpolate to/from full speed when an idle behavior is triggered "
-        "or canceled, in seconds",
-        // @VISIBILITY(3.5)
+        "or canceled, in seconds.",
         openspace::properties::Property::Visibility::AdvancedUser
     };
 
@@ -335,7 +319,7 @@ namespace {
         "LimitZoom",
         "Limit Zoom",
         "Settings to limit the camera from going to close to or too far away from the "
-        "current focus"
+        "current focus."
     };
 
     constexpr openspace::properties::Property::PropertyInfo
@@ -344,7 +328,7 @@ namespace {
         "EnabledMinimumAllowedDistance",
         "Enable minimum allowed distance limit",
         "Enables or disables that the camera cannot go closer to an object than "
-        "the set minimum allowed distance",
+        "the set minimum allowed distance.",
         openspace::properties::Property::Visibility::User
     };
 
@@ -352,8 +336,7 @@ namespace {
         "MinimumAllowedDistance",
         "Minimum Allowed Distance",
         "The limit of how close the camera can get to an object. The distance is given "
-        "in meters above the surface",
-        // @VISIBILITY(2.5)
+        "in meters above the surface.",
         openspace::properties::Property::Visibility::User
     };
 
@@ -361,8 +344,7 @@ namespace {
         "EnableMaximumAllowedDistance",
         "Enable Maximum Allowed Distance limit",
         "Enables or disables that the camera cannot go further away from an object than "
-        "the set maximum allowed distance",
-        // @VISIBILITY(?)
+        "the set maximum allowed distance.",
         openspace::properties::Property::Visibility::AdvancedUser
     };
 
@@ -370,8 +352,7 @@ namespace {
         "MaximumAllowedDistance",
         "Maximum Allowed Distance",
         "The limit of how far away the camera can get from an object. The distance is "
-        "given in meters above the surface",
-        // @VISIBILITY(?)
+        "given in meters above the surface.",
         openspace::properties::Property::Visibility::AdvancedUser
     };
 
@@ -380,7 +361,7 @@ namespace {
         "Disable Zoom",
         "When set to true, disables all vertical navigation based on input. This means "
         "that the camera cannot be moved closer to or further away from the current "
-        "anchor node",
+        "anchor node.",
         openspace::properties::Property::Visibility::AdvancedUser
     };
 
@@ -389,7 +370,7 @@ namespace {
         "Disable Roll",
         "When set to true, disables all rolling camera motions based on input. This "
         "means that the camera cannot be rotated to change the perceived up-direction "
-        "of the current anchor node, or rotate the horizon on a planet, for example",
+        "of the current anchor node, or rotate the horizon on a planet, for example.",
         openspace::properties::Property::Visibility::AdvancedUser
     };
 
@@ -399,7 +380,7 @@ namespace {
         "When set to true, global rotation interactions in the X-direction will lead to "
         "a rotation around the specified up vector instead of just around the object. "
         "The up vector is the local coordinate axis, and can be set to either the X-, Y- "
-        "or Z-axis through the 'UpToUseForRotation' property",
+        "or Z-axis through the 'UpToUseForRotation' property.",
         openspace::properties::Property::Visibility::AdvancedUser
     };
 
@@ -408,7 +389,7 @@ namespace {
         "Up To Use For Rotation",
         "Specifies the local coordinate axis of the anchor node to use as up direction "
         "when the camera is set to orbit around up. In general, the Z-axis is a good "
-        "choice for globes, and the Y-axis is a good choice for models",
+        "choice for globes, and the Y-axis is a good choice for models.",
         openspace::properties::Property::Visibility::AdvancedUser
     };
 
diff --git a/src/navigation/pathnavigator.cpp b/src/navigation/pathnavigator.cpp
index 6d23a11721..7f9b400ae9 100644
--- a/src/navigation/pathnavigator.cpp
+++ b/src/navigation/pathnavigator.cpp
@@ -58,14 +58,14 @@ namespace {
         "Default Path Type",
         "The default path type chosen when generating a path or flying to a target. "
         "See wiki for alternatives. The shape of the generated path will be different "
-        "depending on the path type",
+        "depending on the path type.",
         openspace::properties::Property::Visibility::AdvancedUser
     };
 
     constexpr openspace::properties::Property::PropertyInfo IncludeRollInfo = {
         "IncludeRoll",
         "Include Roll",
-        "If disabled, roll is removed from the interpolation of camera orientation",
+        "If disabled, roll is removed from the interpolation of camera orientation.",
         openspace::properties::Property::Visibility::AdvancedUser
     };
 
@@ -74,7 +74,7 @@ namespace {
         "Speed Scale",
         "Scale factor that the speed will be multiplied with during path traversal. "
         "Can be used to speed up or slow down the camera motion, depending on if the "
-        "value is larger than or smaller than one",
+        "value is larger than or smaller than one.",
         openspace::properties::Property::Visibility::User
     };
 
@@ -82,7 +82,7 @@ namespace {
         "ApplyIdleBehaviorOnFinish",
         "Apply Idle Behavior on Finish",
         "If set to true, the chosen IdleBehavior of the OrbitalNavigator will be "
-        "triggered once the path has reached its target",
+        "triggered once the path has reached its target.",
         openspace::properties::Property::Visibility::User
     };
 
@@ -92,7 +92,7 @@ namespace {
         "A factor used to compute the default distance from a target scene graph node "
         "when creating a camera path. The factor will be multipled with the node's "
         "bounding sphere to compute the target height from the bounding sphere of the "
-        "object",
+        "object.",
         openspace::properties::Property::Visibility::AdvancedUser
     };
 
@@ -101,8 +101,7 @@ namespace {
         "Rotation Speed Factor (Linear Path)",
         "Affects how fast the camera rotates to the target rotation during a linear "
         "path. A value of 1 means that the camera will rotate 90 degrees in about 5 "
-        "seconds. A value of 2 means twice that time, i.e. 10 seconds, and so on",
-        // @VISIBILITY(2.5)
+        "seconds. A value of 2 means twice that time, i.e. 10 seconds, and so on.",
         openspace::properties::Property::Visibility::User
     };
 
@@ -111,7 +110,7 @@ namespace {
         "Minimal Valid Bounding Sphere",
         "The minimal allowed value for a bounding sphere, in meters. Used for "
         "computation of target positions and path generation, to avoid issues when "
-        "there is no bounding sphere",
+        "there is no bounding sphere.",
         openspace::properties::Property::Visibility::AdvancedUser
     };
 
@@ -119,8 +118,7 @@ namespace {
         "RelevantNodeTags",
         "Relevant Node Tags",
         "List of tags for the nodes that are relevant for path creation, for example "
-        "when avoiding collisions",
-        // @VISIBILITY(3.5)
+        "when avoiding collisions.",
         openspace::properties::Property::Visibility::AdvancedUser
     };
 } // namespace
diff --git a/src/network/parallelpeer.cpp b/src/network/parallelpeer.cpp
index 693e22efa2..bf7d1b6b93 100644
--- a/src/network/parallelpeer.cpp
+++ b/src/network/parallelpeer.cpp
@@ -50,7 +50,7 @@ namespace {
         "Password",
         "Password",
         "The general password that allows this OpenSpace instance access to the Wormhole "
-        "server",
+        "server.",
         openspace::properties::Property::Visibility::AdvancedUser
     };
 
@@ -58,7 +58,7 @@ namespace {
         "HostPassword",
         "Host Password",
         "The password that is required to take control of the joint session and thus "
-        "send all commands to connected clients",
+        "send all commands to connected clients.",
         openspace::properties::Property::Visibility::AdvancedUser
     };
 
@@ -66,14 +66,14 @@ namespace {
         "Port",
         "Port",
         "The port on which the Wormhole server is listening to connections from "
-        "OpenSpace",
+        "OpenSpace.",
         openspace::properties::Property::Visibility::AdvancedUser
     };
 
     constexpr openspace::properties::Property::PropertyInfo AddressInfo = {
         "Address",
         "Address",
-        "The address of the Wormhole server either as a DNS name or an IP address",
+        "The address of the Wormhole server either as a DNS name or an IP address.",
         openspace::properties::Property::Visibility::AdvancedUser
     };
 
@@ -81,7 +81,7 @@ namespace {
         "Name",
         "Connection Name",
         "The name of this OpenSpace instance that will be potentially broadcast to other "
-        "connected instances",
+        "connected instances.",
         openspace::properties::Property::Visibility::AdvancedUser
     };
 
@@ -91,8 +91,7 @@ namespace {
         "This is the number of seconds that received keyframes are buffered before they "
         "get applied to the rendering. A higher value leads to smoother rendering, "
         "particularly when the internet connection is unstable, but also leads to higher "
-        "delay",
-        // @VISIBILITY(3.5)
+        "delay.",
         openspace::properties::Property::Visibility::AdvancedUser
     };
 
@@ -101,8 +100,7 @@ namespace {
         "Time keyframe interval",
         "Determines how often the information about the simulation time is sent (in "
         "seconds). Lower values mean more accurate representation of the time, but also "
-        "require higher internet bandwidth",
-        // @VISIBILITY(3.5)
+        "require higher internet bandwidth.",
         openspace::properties::Property::Visibility::AdvancedUser
     };
 
@@ -111,8 +109,7 @@ namespace {
         "Camera Keyframe interval",
         "Determines how often the information about the camera position and orientation "
         "is sent (in seconds). Lower values mean more accurate representation of the "
-        "time, but also more internet traffic",
-        // @VISIBILITY(3.5)
+        "time, but also more internet traffic.",
         openspace::properties::Property::Visibility::AdvancedUser
     };
 } // namespace
diff --git a/src/rendering/colormappingcomponent.cpp b/src/rendering/colormappingcomponent.cpp
index 79d5398158..e3bc535ac2 100644
--- a/src/rendering/colormappingcomponent.cpp
+++ b/src/rendering/colormappingcomponent.cpp
@@ -37,14 +37,14 @@ namespace {
         "Color Map Enabled",
         "If this value is set to 'true', the provided color map is used (if one was "
         "provided in the configuration). If no color map was provided, changing this "
-        "setting does not do anything",
+        "setting does not do anything.",
         openspace::properties::Property::Visibility::NoviceUser
     };
 
     constexpr openspace::properties::Property::PropertyInfo FileInfo = {
         "File",
         "Color Map File",
-        "The path to the color map file to use for coloring the points",
+        "The path to the color map file to use for coloring the points.",
         openspace::properties::Property::Visibility::AdvancedUser
     };
 
@@ -55,14 +55,14 @@ namespace {
         "on the color map. The property is set based on predefined options specified in "
         "the asset file. When changing the parameter, the value range to used for the"
         "mapping will also be changed. Per default, it is set to the last parameter in "
-        "the list of options",
+        "the list of options.",
         openspace::properties::Property::Visibility::User
     };
 
     constexpr openspace::properties::Property::PropertyInfo RangeInfo = {
         "ValueRange",
         "Value Range",
-        "This value changes the range of values to be mapped with the current color map",
+        "This value changes the range of values to be mapped with the current color map.",
         openspace::properties::Property::Visibility::User
     };
 
@@ -70,7 +70,7 @@ namespace {
         "SetRangeFromData",
         "Set Data Range from Data",
         "Set the data range for the color mapping based on the available data for the "
-        "curently selected data column",
+        "curently selected data column.",
         openspace::properties::Property::Visibility::User
     };
 
@@ -78,7 +78,7 @@ namespace {
         "HideValuesOutsideRange",
         "Hide Values Outside Range",
         "If true, points with values outside the provided range for the coloring will be "
-        "hidden, i.e. not rendered at all",
+        "hidden, i.e. not rendered at all.",
         openspace::properties::Property::Visibility::AdvancedUser
     };
 
@@ -86,7 +86,7 @@ namespace {
         "ShowMissingData",
         "Show Missing Data",
         "If true, use a separate color (see NoDataColor) for items with values "
-        "corresponding to missing data values",
+        "corresponding to missing data values.",
         openspace::properties::Property::Visibility::User
     };
 
@@ -97,7 +97,7 @@ namespace {
         "if enabled. This color can also be read from the color map, but setting this "
         "value overrides any value in the color map. If a color value for the below "
         "range values is provided, the ShowMissingData property will automatically be "
-        "set to true",
+        "set to true.",
         openspace::properties::Property::Visibility::User
     };
 
@@ -107,7 +107,7 @@ namespace {
         "If true, use a separate color (see AboveRangeColor) for items with values "
         "larger than the one in the provided data range. Otherwise, the values will "
         "be clamped to use the color at the upper limit of the color map. If a color is "
-        "provided in the color map, this value will automatically be set to true",
+        "provided in the color map, this value will automatically be set to true.",
         openspace::properties::Property::Visibility::AdvancedUser
     };
 
@@ -118,7 +118,7 @@ namespace {
         "data range, if enabled. This color can also be read from the color map, but "
         "setting this value overrides any value in the color map. If a color value for "
         "the above range values is provided, the UseAboveRangeColor property will "
-        "automatically be set to true",
+        "automatically be set to true.",
         openspace::properties::Property::Visibility::AdvancedUser
     };
 
@@ -128,7 +128,7 @@ namespace {
         "If true, use a separate color (see BelowRangeColor) for items with values "
         "smaller than the one in the provided data range. Otherwise, the values will "
         "be clamped to use the color at the lower limit of the color map. If a color is "
-        "provided in the color map, this value will automatically be set to true",
+        "provided in the color map, this value will automatically be set to true.",
         openspace::properties::Property::Visibility::AdvancedUser
     };
 
@@ -139,14 +139,14 @@ namespace {
         "data range, if enabled. This color can also be read from the color map, but "
         "setting this value overrides any value in the color map. If a color value for "
         "the below range values is provided, the UseBelowRangeColor property will "
-        "automatically be set to true",
+        "automatically be set to true.",
         openspace::properties::Property::Visibility::AdvancedUser
     };
 
     constexpr openspace::properties::Property::PropertyInfo InvertColorMapInfo = {
         "Invert",
         "Invert Color Map",
-        "If true, the colors of the color map will be read in the inverse order",
+        "If true, the colors of the color map will be read in the inverse order.",
         openspace::properties::Property::Visibility::AdvancedUser
     };
 
diff --git a/src/rendering/dashboard.cpp b/src/rendering/dashboard.cpp
index 9e27eef04f..86c63e991a 100644
--- a/src/rendering/dashboard.cpp
+++ b/src/rendering/dashboard.cpp
@@ -38,7 +38,7 @@ namespace {
         "IsEnabled",
         "Enabled",
         "If this value is 'false', this dashboard will be invisible, regardless of the "
-        "state of the individual components",
+        "state of the individual components.",
         openspace::properties::Property::Visibility::NoviceUser
     };
 
@@ -46,8 +46,7 @@ namespace {
         "StartPositionOffset",
         "Start Position Offset",
         "A 2D vector controlling where the dashboard rendering starts. Adding an offset "
-        "in x and y-direction on screen",
-        // @VISIBILITY(2.75)
+        "in x and y-direction on screen.",
         openspace::properties::Property::Visibility::User
     };
 } // namespace
diff --git a/src/rendering/dashboarditem.cpp b/src/rendering/dashboarditem.cpp
index 2d73518b8b..dab1d12cb8 100644
--- a/src/rendering/dashboarditem.cpp
+++ b/src/rendering/dashboarditem.cpp
@@ -37,8 +37,7 @@ namespace {
     constexpr openspace::properties::Property::PropertyInfo EnabledInfo = {
         "Enabled",
         "Enabled",
-        "If this value is set to 'true' this dashboard item is shown in the dashboard",
-        // @VISIBILITY(1.75)
+        "If this value is set to 'true' this dashboard item is shown in the dashboard.",
         openspace::properties::Property::Visibility::AdvancedUser
     };
 
diff --git a/src/rendering/dashboardtextitem.cpp b/src/rendering/dashboardtextitem.cpp
index b9b0c12acb..0bd203e0e7 100644
--- a/src/rendering/dashboardtextitem.cpp
+++ b/src/rendering/dashboardtextitem.cpp
@@ -35,16 +35,14 @@ namespace {
         "FontName",
         "Font Name",
         "This value is the name of the font that is used. It can either refer to an "
-        "internal name registered previously, or it can refer to a path that is used",
-        // @VISIBILITY(2.33)
+        "internal name registered previously, or it can refer to a path that is used.",
         openspace::properties::Property::Visibility::User
     };
 
     constexpr openspace::properties::Property::PropertyInfo FontSizeInfo = {
         "FontSize",
         "Font Size",
-        "This value determines the size of the font that is used to render the distance",
-        // @VISIBILITY(2.33)
+        "This value determines the size of the font that is used to render the distance.",
         openspace::properties::Property::Visibility::User
     };
 
diff --git a/src/rendering/fadeable.cpp b/src/rendering/fadeable.cpp
index 9dd00f3242..9c66e4a388 100644
--- a/src/rendering/fadeable.cpp
+++ b/src/rendering/fadeable.cpp
@@ -33,7 +33,7 @@ namespace {
         "Opacity",
         "Opacity",
         "This value determines the opacity of this object. A value of 0 means "
-        "completely transparent",
+        "completely transparent.",
         openspace::properties::Property::Visibility::NoviceUser
     };
 
@@ -43,9 +43,7 @@ namespace {
         "This value is used by the system to be able to fade out objects "
         "independently from the Opacity value selected by the user. This value should "
         "not be directly manipulated through a user interface, but instead used by other "
-        "components of the system programmatically",
-        // The Developer mode should be used once the properties in the UI listen to this
-        // openspace::properties::Property::Visibility::Developer
+        "components of the system programmatically.",
         openspace::properties::Property::Visibility::Developer
     };
 } // namespace
diff --git a/src/rendering/labelscomponent.cpp b/src/rendering/labelscomponent.cpp
index 8222e4c663..3a1153ad32 100644
--- a/src/rendering/labelscomponent.cpp
+++ b/src/rendering/labelscomponent.cpp
@@ -43,44 +43,42 @@ namespace {
         "Enabled",
         "Enabled",
         "This setting determines whether the labels will be visible or not. They are "
-        "disabled per default",
-        // @VISIBILITY(?)
+        "disabled per default.",
         openspace::properties::Property::Visibility::AdvancedUser
     };
 
     constexpr openspace::properties::Property::PropertyInfo FileInfo = {
         "File",
         "File",
-        "The speck label file with the data for the labels",
+        "The speck label file with the data for the labels.",
         openspace::properties::Property::Visibility::AdvancedUser
     };
 
     constexpr openspace::properties::Property::PropertyInfo ColorInfo = {
         "Color",
         "Color",
-        "The color of the labels",
+        "The color of the labels.",
         openspace::properties::Property::Visibility::NoviceUser
     };
 
     constexpr openspace::properties::Property::PropertyInfo SizeInfo = {
         "Size",
         "Size",
-        "The size of the labels in pixels",
-        // @VISIBILITY(2.5)
+        "The size of the labels in pixels.",
         openspace::properties::Property::Visibility::User
     };
 
     constexpr openspace::properties::Property::PropertyInfo FontSizeInfo = {
         "FontSize",
         "Font Size",
-        "Font size for the labels. This is different from the text size",
+        "Font size for the labels. This is different from the text size.",
         openspace::properties::Property::Visibility::User
     };
 
     constexpr openspace::properties::Property::PropertyInfo MinMaxInfo = {
         "MinMaxSize",
         "Min/Max Size",
-        "The minimum and maximum size (in pixels) of the labels",
+        "The minimum and maximum size (in pixels) of the labels.",
         openspace::properties::Property::Visibility::AdvancedUser
     };
 
@@ -95,8 +93,7 @@ namespace {
     constexpr openspace::properties::Property::PropertyInfo TransformationMatrixInfo = {
         "TransformationMatrix",
         "Transformation Matrix",
-        "Transformation matrix to be applied to the labels",
-        // @VISIBILITY(?)
+        "Transformation matrix to be applied to the labels.",
         openspace::properties::Property::Visibility::Developer
     };
 
diff --git a/src/rendering/luaconsole.cpp b/src/rendering/luaconsole.cpp
index ac2a888ebe..decae4c8ef 100644
--- a/src/rendering/luaconsole.cpp
+++ b/src/rendering/luaconsole.cpp
@@ -73,7 +73,7 @@ namespace {
         "IsVisible",
         "Is Visible",
         "Determines whether the Lua console is shown on the screen or not. Toggling it "
-        "will fade the console in and out",
+        "will fade the console in and out.",
         openspace::properties::Property::Visibility::AdvancedUser
     };
 
@@ -82,7 +82,7 @@ namespace {
        "Should Be Synchronized",
        "Determines whether the entered commands will only be executed locally (if this "
        "is disabled), or whether they will be send to other connected nodes, for "
-       "example in a cluster environment",
+       "example in a cluster environment.",
        openspace::properties::Property::Visibility::AdvancedUser
     };
 
@@ -91,35 +91,35 @@ namespace {
         "Should Send To Remote",
         "Determines whether the entered commands will only be executed locally (if this "
         "is disabled), or whether they will be send to connected remote instances (other "
-        "peers through a parallel connection)",
+        "peers through a parallel connection).",
         openspace::properties::Property::Visibility::AdvancedUser
     };
 
     constexpr openspace::properties::Property::PropertyInfo BackgroundColorInfo = {
         "BackgroundColor",
         "Background Color",
-        "Sets the background color of the console",
+        "Sets the background color of the console.",
         openspace::properties::Property::Visibility::AdvancedUser
     };
 
     constexpr openspace::properties::Property::PropertyInfo EntryTextColorInfo = {
         "EntryTextColor",
         "Entry Text Color",
-        "Sets the text color of the entry area of the console",
+        "Sets the text color of the entry area of the console.",
         openspace::properties::Property::Visibility::AdvancedUser
     };
 
     constexpr openspace::properties::Property::PropertyInfo HistoryTextColorInfo = {
         "HistoryTextColor",
         "History Text Color",
-        "Sets the text color of the history area of the console",
+        "Sets the text color of the history area of the console.",
         openspace::properties::Property::Visibility::AdvancedUser
     };
 
     constexpr openspace::properties::Property::PropertyInfo HistoryLengthInfo = {
         "HistoryLength",
         "History Length",
-        "Determines the length of the history in number of lines",
+        "Determines the length of the history in number of lines.",
         openspace::properties::Property::Visibility::AdvancedUser
     };
 
diff --git a/src/rendering/renderable.cpp b/src/rendering/renderable.cpp
index 2f76630659..073a84aa3a 100644
--- a/src/rendering/renderable.cpp
+++ b/src/rendering/renderable.cpp
@@ -45,16 +45,14 @@ namespace {
     constexpr openspace::properties::Property::PropertyInfo EnabledInfo = {
         "Enabled",
         "Enabled",
-        "This setting determines whether this object will be visible or not",
-        // @VISIBILITY(0.33)
+        "This setting determines whether this object will be visible or not.",
         openspace::properties::Property::Visibility::AdvancedUser
     };
 
     constexpr openspace::properties::Property::PropertyInfo RenderableTypeInfo = {
         "Type",
         "Renderable Type",
-        "This tells the type of the renderable",
-        // @VISIBILITY(3.4)
+        "This tells the type of the renderable.",
         openspace::properties::Property::Visibility::AdvancedUser
     };
 
@@ -63,8 +61,7 @@ namespace {
         "RenderBinMode",
         "Render Bin Mode",
         "This value specifies if the renderable should be rendered in the Background,"
-        "Opaque, Pre/PostDeferredTransparency, or Overlay rendering step",
-        // @VISIBILITY(3.2)
+        "Opaque, Pre/PostDeferredTransparency, or Overlay rendering step.",
         openspace::properties::Property::Visibility::AdvancedUser
     };
 
@@ -72,7 +69,7 @@ namespace {
         "DimInAtmosphere",
         "Dim In Atmosphere",
         "Enables/Disables if the object should be dimmed when the camera is in the "
-        "sunny part of an atmosphere",
+        "sunny part of an atmosphere.",
         openspace::properties::Property::Visibility::AdvancedUser
     };
 
diff --git a/src/rendering/renderengine.cpp b/src/rendering/renderengine.cpp
index fe71de25d7..1dfe4f7e7e 100644
--- a/src/rendering/renderengine.cpp
+++ b/src/rendering/renderengine.cpp
@@ -83,7 +83,7 @@ namespace {
         "ShowOverlayOnClients",
         "Show Overlay Information on Clients",
         "If this value is enabled, the overlay information text is also automatically "
-        "rendered on client nodes. This values is disabled by default",
+        "rendered on client nodes. This values is disabled by default.",
         openspace::properties::Property::Visibility::AdvancedUser
     };
 
@@ -92,7 +92,7 @@ namespace {
         "Show the on-screen log",
         "This value determines whether the on-screen log will be shown or hidden. Even "
         "if it is shown, all 'Debug' and 'Trace' level messages are omitted from this "
-        "log",
+        "log.",
         openspace::properties::Property::Visibility::User
     };
 
@@ -100,8 +100,7 @@ namespace {
         "VerticalLogOffset",
         "Vertical Log Offset",
         "The vertical offset for the on-screen log in [0,1] coordinates, a factor that "
-        "is scaled with the vertical resolution",
-        // @VISIBILITY(3.5)
+        "is scaled with the vertical resolution.",
         openspace::properties::Property::Visibility::AdvancedUser
     };
 
@@ -109,7 +108,7 @@ namespace {
         "ShowVersion",
         "Shows the version on-screen information",
         "This value determines whether the Git version information (branch and commit) "
-        "hash are shown on the screen",
+        "hash are shown on the screen.",
         openspace::properties::Property::Visibility::AdvancedUser
     };
 
@@ -117,8 +116,7 @@ namespace {
         "ShowCamera",
         "Shows information about the current camera state, such as friction",
         "This value determines whether the information about the current camera state is "
-        "shown on the screen",
-        // @VISIBILITY(2.5)
+        "shown on the screen.",
         openspace::properties::Property::Visibility::User
     };
 
@@ -127,7 +125,7 @@ namespace {
         "Screenshow Window Ids",
         "The list of window identifiers whose screenshot will be taken the next time "
         "anyone triggers a screenshot. If this list is empty (the default), all windows "
-        "will have their screenshot taken. Id's that do not exist are silently ignored",
+        "will have their screenshot taken. Id's that do not exist are silently ignored.",
         openspace::properties::Property::Visibility::AdvancedUser
     };
 
@@ -137,15 +135,14 @@ namespace {
         "This value determines whether a warping should be applied before taking a "
         "screenshot. If it is enabled, all post processing is applied as well, which "
         "includes everything rendered on top of the rendering, such as the user "
-        "interface",
+        "interface.",
         openspace::properties::Property::Visibility::AdvancedUser
     };
 
     constexpr openspace::properties::Property::PropertyInfo ShowStatisticsInfo = {
         "ShowStatistics",
         "Show Statistics",
-        "Show updating, rendering, and network statistics on all rendering nodes",
-        // @VISIBILITY(3.5)
+        "Show updating, rendering, and network statistics on all rendering nodes.",
         openspace::properties::Property::Visibility::AdvancedUser
     };
 
@@ -153,7 +150,7 @@ namespace {
         "ScreenshotUseDate",
         "Screenshot Folder uses Date",
         "If this value is set to 'true', screenshots will be saved to a folder that "
-        "contains the time at which this value was enabled",
+        "contains the time at which this value was enabled.",
         openspace::properties::Property::Visibility::AdvancedUser
     };
 
@@ -161,7 +158,7 @@ namespace {
         "ShowFrameInformation",
         "Show Frame Information",
         "If this value is enabled, the current frame number and frame times are rendered "
-        "into the window",
+        "into the window.",
         openspace::properties::Property::Visibility::AdvancedUser
     };
 
@@ -172,7 +169,7 @@ namespace {
         "Every other aspect of the application will be unaffected by this and it will "
         "still respond to user input. This setting is reasonably only useful in the case "
         "of multi-pipeline environments, such as planetariums, where the output of the "
-        "master node is not required and performance can be gained by disabling it",
+        "master node is not required and performance can be gained by disabling it.",
         openspace::properties::Property::Visibility::AdvancedUser
     };
 
@@ -182,7 +179,7 @@ namespace {
         "Applies a global view rotation. Use this to rotate the position of the "
         "focus node away from the default location on the screen. This setting "
         "persists even when a new focus node is selected. Defined using pitch, yaw, "
-        "roll in radians",
+        "roll in radians.",
         openspace::properties::Property::Visibility::AdvancedUser
     };
 
@@ -190,7 +187,7 @@ namespace {
         "ScreenSpaceRotation",
         "Screen Space Rotation",
         "Applies a rotation to all screen space renderables. Defined using pitch, yaw, "
-        "roll in radians",
+        "roll in radians.",
         openspace::properties::Property::Visibility::AdvancedUser
     };
 
@@ -199,16 +196,16 @@ namespace {
         "Master Rotation",
         "Applies a view rotation for only the master node, defined using pitch, yaw, "
         "roll in radians.This can be used to compensate the master view direction for "
-        "tilted display systems in clustered immersive environments",
+        "tilted display systems in clustered immersive environments.",
         openspace::properties::Property::Visibility::AdvancedUser
     };
 
     constexpr openspace::properties::Property::PropertyInfo DisableHDRPipelineInfo = {
-       "DisableHDRPipeline",
-       "Disable HDR Rendering",
-       "If this value is enabled, the rendering will disable the HDR color handling and "
-       "the LDR color pipeline will be used. Be aware of possible over exposure in the "
-        "final colors",
+        "DisableHDRPipeline",
+        "Disable HDR Rendering",
+        "If this value is enabled, the rendering will disable the HDR color handling and "
+        "the LDR color pipeline will be used. Be aware of possible over exposure in the "
+        "final colors.",
         openspace::properties::Property::Visibility::Hidden
     };
 
@@ -216,8 +213,7 @@ namespace {
         "HDRExposure",
         "HDR Exposure",
         "This value determines the amount of light per unit area reaching the equivalent "
-        "of an electronic image sensor",
-        // @VISIBILITY(3.5)
+        "of an electronic image sensor.",
         openspace::properties::Property::Visibility::AdvancedUser
     };
 
@@ -232,21 +228,21 @@ namespace {
     constexpr openspace::properties::Property::PropertyInfo HueInfo = {
         "Hue",
         "Hue",
-        "Hue",
+        "Hue.",
         openspace::properties::Property::Visibility::User
     };
 
     constexpr openspace::properties::Property::PropertyInfo SaturationInfo = {
         "Saturation",
         "Saturation",
-        "Saturation",
+        "Saturation.",
         openspace::properties::Property::Visibility::User
     };
 
     constexpr openspace::properties::Property::PropertyInfo ValueInfo = {
         "Value",
         "Value",
-        "Value",
+        "Value.",
         openspace::properties::Property::Visibility::User
     };
 
@@ -254,8 +250,7 @@ namespace {
         "FramerateLimit",
         "Framerate Limit",
         "If set to a value bigger than 0, the framerate will be limited to that many "
-        "frames per second without using V-Sync",
-        // @VISIBILITY(2.5)
+        "frames per second without using V-Sync.",
         openspace::properties::Property::Visibility::User
     };
 
@@ -264,7 +259,7 @@ namespace {
         "Horizontal Field of View",
         "Adjusts the degrees of the horizontal field of view. The vertical field of "
         "view will be automatically adjusted to match, according to the current "
-        "aspect ratio",
+        "aspect ratio.",
         openspace::properties::Property::Visibility::User
     };
 
@@ -272,8 +267,7 @@ namespace {
         "BlackoutFactor",
         "Blackout Factor",
         "The blackout factor of the rendering. This can be used for fading in or out the "
-        "rendering window",
-        // @VISIBILITY(2.5)
+        "rendering window.",
         openspace::properties::Property::Visibility::User
     };
 
@@ -281,29 +275,28 @@ namespace {
         "ApplyBlackoutToMaster",
         "Apply Blackout to Master",
         "If this value is 'true', the blackout factor is applied to the master node. "
-        "Regardless of this value, the clients will always adhere to the factor",
+        "Regardless of this value, the clients will always adhere to the factor.",
         openspace::properties::Property::Visibility::AdvancedUser
     };
 
     constexpr openspace::properties::Property::PropertyInfo FXAAInfo = {
         "FXAA",
         "Enable FXAA",
-        "Enable FXAA",
-        // @VISIBILITY(3.5)
+        "Enable FXAA.",
         openspace::properties::Property::Visibility::AdvancedUser
     };
 
     constexpr openspace::properties::Property::PropertyInfo EnabledFontColorInfo = {
         "EnabledFontColor",
         "Enabled Font Color",
-        "The font color used for enabled options",
+        "The font color used for enabled options.",
         openspace::properties::Property::Visibility::AdvancedUser
     };
 
     constexpr openspace::properties::Property::PropertyInfo DisabledFontColorInfo = {
         "DisabledFontColor",
         "Disabled Font Color",
-        "The font color used for disabled options",
+        "The font color used for disabled options.",
         openspace::properties::Property::Visibility::AdvancedUser
     };
 } // namespace
diff --git a/src/rendering/screenspacerenderable.cpp b/src/rendering/screenspacerenderable.cpp
index af8f29ea08..40b27847f5 100644
--- a/src/rendering/screenspacerenderable.cpp
+++ b/src/rendering/screenspacerenderable.cpp
@@ -51,7 +51,7 @@ namespace {
     constexpr openspace::properties::Property::PropertyInfo EnabledInfo = {
         "Enabled",
         "Enabled",
-        "This setting determines whether this sceen space plane will be visible or not",
+        "This setting determines whether this sceen space plane will be visible or not.",
         openspace::properties::Property::Visibility::AdvancedUser
     };
 
@@ -61,7 +61,7 @@ namespace {
         "If this value is 'true', this screenspace renderable is going to ignore the "
         "global blackout factor from the Render Engine and will always render at full "
         "opacity. If it is 'false', it will adhere to the factor and fade out like the "
-        "rest of the 3D rendering",
+        "rest of the 3D rendering.",
         openspace::properties::Property::Visibility::User
     };
 
@@ -75,7 +75,7 @@ namespace {
         "using cartesian coordinates. By switching this value, the correct property will "
         "be shown or hidden. The Cartesian coordinate system is useful if a regular "
         "rendering is applied, whereas the radius azimuth elevation are most useful in a "
-        "planetarium environment",
+        "planetarium environment.",
         openspace::properties::Property::Visibility::NoviceUser
     };
 
@@ -83,8 +83,7 @@ namespace {
     {
         "UsePerspectiveProjection",
         "Use Perspective Projection",
-        "Determines whetether the z/radius values affects the size of the plane or not",
-        // @VISIBILITY(3.25)
+        "Determines whetether the z/radius values affects the size of the plane or not.",
         openspace::properties::Property::Visibility::AdvancedUser
     };
 
@@ -92,7 +91,7 @@ namespace {
         "CartesianPosition",
         "Cartesian Coordinates",
         "This value determines the position of this screen space plane in Cartesian "
-        "three-dimensional coordinates (meters)",
+        "three-dimensional coordinates (meters).",
         openspace::properties::Property::Visibility::NoviceUser
     };
 
@@ -101,7 +100,7 @@ namespace {
         "Radius Azimuth Elevation",
         "This value determines the position of this screen space plane in a "
         "coordinate system based on radius (meters), azimuth (radians) and elevation "
-        "(radians)",
+        "(radians).",
         openspace::properties::Property::Visibility::NoviceUser
     };
 
@@ -110,15 +109,14 @@ namespace {
         "Scale Value",
         "This value determines a scale factor for the plane. The default size of a plane "
         "is determined by the concrete instance and reflects, for example, the size of "
-        "the image being displayed",
-        // @VISIBILITY(1.6)
+        "the image being displayed.",
         openspace::properties::Property::Visibility::NoviceUser
     };
 
     constexpr openspace::properties::Property::PropertyInfo LocalRotationInfo = {
         "Rotation",
         "Local Rotation",
-        "An euler rotation (x, y, z) to apply to the plane",
+        "An euler rotation (x, y, z) to apply to the plane.",
         openspace::properties::Property::Visibility::User
     };
 
@@ -126,7 +124,7 @@ namespace {
         "MultiplyColor",
         "Multiply Color",
         "If set, the plane's texture is multiplied with this color. Useful for applying "
-        "a color grayscale images",
+        "a color grayscale images.",
         openspace::properties::Property::Visibility::User
     };
 
@@ -135,7 +133,7 @@ namespace {
         "Background Color",
         "The fixed color that is combined with the screen space renderable to create the "
         "final color. The actual color of the screen space renderable is alpha-blended "
-        "with the background color to produce the final result",
+        "with the background color to produce the final result.",
         openspace::properties::Property::Visibility::User
     };
 
@@ -143,8 +141,7 @@ namespace {
         "Delete",
         "Delete",
         "If this property is triggered, this screen space plane is removed from the "
-        "scene",
-        // @VISIBILITY(2.25)
+        "scene.",
         openspace::properties::Property::Visibility::User
     };
 
@@ -152,29 +149,28 @@ namespace {
         "FaceCamera",
         "Face Camera",
         "If enabled, the local rotation is applied after the plane is rotated to face "
-        "the camera",
-        // @VISIBILITY(1.25)
+        "the camera.",
         openspace::properties::Property::Visibility::NoviceUser
     };
 
     constexpr openspace::properties::Property::PropertyInfo GammaInfo = {
         "Gamma",
         "Gamma Correction",
-        "Sets the gamma correction of the texture",
+        "Sets the gamma correction of the texture.",
         openspace::properties::Property::Visibility::AdvancedUser
     };
 
     constexpr openspace::properties::Property::PropertyInfo BorderWidthInfo = {
         "BorderWidth",
         "Border Width",
-        "The width of the border",
+        "The width of the border.",
         openspace::properties::Property::Visibility::NoviceUser
     };
 
     constexpr openspace::properties::Property::PropertyInfo BorderColorInfo = {
         "BorderColor",
         "Border Color",
-        "Sets the color of the border",
+        "Sets the color of the border.",
         openspace::properties::Property::Visibility::NoviceUser
     };
 
diff --git a/src/scene/lightsource.cpp b/src/scene/lightsource.cpp
index eb6648a337..c16f227269 100644
--- a/src/scene/lightsource.cpp
+++ b/src/scene/lightsource.cpp
@@ -38,7 +38,7 @@ namespace {
     constexpr openspace::properties::Property::PropertyInfo EnabledInfo = {
         "Enabled",
         "Enabled",
-        "Whether the light source is enabled or not",
+        "Whether the light source is enabled or not.",
         openspace::properties::Property::Visibility::AdvancedUser
     };
 
diff --git a/src/scene/scenegraphnode.cpp b/src/scene/scenegraphnode.cpp
index a6ec5deab3..9c72936bb1 100644
--- a/src/scene/scenegraphnode.cpp
+++ b/src/scene/scenegraphnode.cpp
@@ -47,36 +47,35 @@ namespace {
         "ComputeScreenSpaceData",
         "Compute Screen Space Data",
         "If this value is set to 'true', the screenspace-based properties are calculated "
-        "at regular intervals. If these values are set to 'false', they are not updated",
+        "at regular intervals. If these values are set to 'false', they are not updated.",
         openspace::properties::Property::Visibility::Developer
     };
 
     constexpr openspace::properties::Property::PropertyInfo ScreenSpacePositionInfo = {
         "ScreenSpacePosition",
         "ScreenSpacePosition",
-        "The x,y position in screen space. Can be used for placing GUI elements",
+        "The x,y position in screen space. Can be used for placing GUI elements.",
         openspace::properties::Property::Visibility::Developer
     };
 
     constexpr openspace::properties::Property::PropertyInfo ScreenVisibilityInfo = {
         "ScreenVisibility",
         "ScreenVisibility",
-        "Determines if the node is currently visible on screen",
+        "Determines if the node is currently visible on screen.",
         openspace::properties::Property::Visibility::AdvancedUser
     };
 
     constexpr openspace::properties::Property::PropertyInfo DistanceFromCamToNodeInfo = {
         "DistanceFromCamToNode",
         "DistanceFromCamToNode",
-        "The distance from the camera to the node surface",
+        "The distance from the camera to the node surface.",
         openspace::properties::Property::Visibility::Developer
     };
 
     constexpr openspace::properties::Property::PropertyInfo ScreenSizeRadiusInfo = {
         "ScreenSizeRadius",
         "ScreenSizeRadius",
-        "The screen size of the radius of the node",
-        // @VISIBILITY(3.5)
+        "The screen size of the radius of the node.",
         openspace::properties::Property::Visibility::AdvancedUser
     };
 
@@ -84,7 +83,7 @@ namespace {
         "VisibilityDistance",
         "VisibilityDistance",
         "The distace in world coordinates between node and camera at which the "
-        "screenspace object will become visible",
+        "screenspace object will become visible.",
         openspace::properties::Property::Visibility::AdvancedUser
     };
 
@@ -95,7 +94,7 @@ namespace {
         "scene graph node renders must be contained within this sphere. This value is "
         "only used as an override to the bounding sphere calculated by the Renderable, "
         "if present. If this value is -1, the Renderable's computed bounding sphere is "
-        "used",
+        "used.",
         openspace::properties::Property::Visibility::AdvancedUser
     };
 
@@ -105,7 +104,7 @@ namespace {
         "The minimum radius that the camera is allowed to get close to this scene graph "
         "node. This value is only used as an override to the bounding sphere calculated "
         "by the Renderable, if present. If this value is -1, the Renderable's computed "
-        "interaction sphere is used",
+        "interaction sphere is used.",
         openspace::properties::Property::Visibility::AdvancedUser
     };
 
@@ -115,7 +114,7 @@ namespace {
         "This read-only property contains the evaluated value for the bounding sphere. "
         "This is the actual value that is used internally within the software. If the "
         "BoundingSphere property is set to -1, it is the computed value, otherwise it "
-        "matches the one set in the property",
+        "matches the one set in the property.",
         openspace::properties::Property::Visibility::AdvancedUser
     };
 
@@ -125,7 +124,7 @@ namespace {
         "This read-only property contains the evaluated value for the interaction "
         "sphere. This is the actual value that is used internally within the software. "
         "If the InteractionSphere property is set to -1, it is the computed value, "
-        "otherwise it matches the one set in the property",
+        "otherwise it matches the one set in the property.",
         openspace::properties::Property::Visibility::AdvancedUser
     };
 
@@ -133,8 +132,7 @@ namespace {
         "ApproachFactor",
         "Approach Factor",
         "This value is a multiplication factor for the interaction sphere that "
-        "determines when the camera is 'approaching' the scene graph node",
-        // @VISIBILITY(3.5)
+        "determines when the camera is 'approaching' the scene graph node.",
         openspace::properties::Property::Visibility::AdvancedUser
     };
 
@@ -142,8 +140,7 @@ namespace {
         "ReachFactor",
         "Reach Factor",
         "This value is a multiplication factor for the interaction sphere that "
-        "determines when the camera has 'reached' the scene graph node",
-        // @VISIBILITY(3.5)
+        "determines when the camera has 'reached' the scene graph node.",
         openspace::properties::Property::Visibility::AdvancedUser
     };
 
@@ -151,14 +148,14 @@ namespace {
         "GuiPath",
         "Gui Path",
         "This is the path for the scene graph node in the gui example: "
-        "/Solar System/Planets/Earth",
+        "/Solar System/Planets/Earth.",
         openspace::properties::Property::Visibility::Hidden
     };
 
     constexpr openspace::properties::Property::PropertyInfo GuiNameInfo = {
         "GuiName",
         "Gui Name",
-        "This is the name for the scene graph node in the gui. Example: Earth",
+        "This is the name for the scene graph node in the gui. Example: Earth.",
         openspace::properties::Property::Visibility::Hidden
     };
 
@@ -166,7 +163,7 @@ namespace {
         "GuiDescription",
         "Gui Description",
         "This is the description for the scene graph node to be shown in the gui. "
-        "Example: Earth is a special place",
+        "Example: Earth is a special place.",
         openspace::properties::Property::Visibility::Hidden
     };
 
@@ -174,7 +171,7 @@ namespace {
         "GuiHidden",
         "Gui Hidden",
         "This represents if the scene graph node should be shown in the gui. "
-        "Example: false",
+        "Example: false.",
         openspace::properties::Property::Visibility::Hidden
     };
 
@@ -185,7 +182,6 @@ namespace {
         "method. The interaction sphere is rendered in cyan and the bounding sphere in "
         "purple. If only one is visible, this may be because the spheres have equal "
         "size and are overlapping.",
-        // @VISIBILITY(3.67)
         openspace::properties::Property::Visibility::AdvancedUser
     };
 
diff --git a/src/scripting/scriptscheduler.cpp b/src/scripting/scriptscheduler.cpp
index 5024fd1ba1..7bf4fb1956 100644
--- a/src/scripting/scriptscheduler.cpp
+++ b/src/scripting/scriptscheduler.cpp
@@ -39,8 +39,7 @@ namespace {
         "Enabled",
         "This enables or disables the ScriptScheduler. If disabled, no scheduled scripts "
         "will be executed. If enabled, scheduled scripts will be executed at their given "
-        "time as normal",
-        // @VISIBILITY(2.5)
+        "time as normal.",
         openspace::properties::Property::Visibility::User
     };
 
@@ -49,7 +48,7 @@ namespace {
         "Should Run All Time Jump",
         "If 'true': In a time jump, all scheduled scripts between the old time and the "
         "new time is executed. If 'false': In a time jump, no scripts scheduled between "
-        "the new time and the old time is executed",
+        "the new time and the old time is executed.",
         openspace::properties::Property::Visibility::AdvancedUser
     };
 
diff --git a/src/util/timemanager.cpp b/src/util/timemanager.cpp
index 52884a9927..3a5347971b 100644
--- a/src/util/timemanager.cpp
+++ b/src/util/timemanager.cpp
@@ -48,30 +48,30 @@ namespace {
     DefaultTimeInterpolationDurationInfo = {
         "DefaultTimeInterpolationDuration",
         "Default Time Interpolation Duration",
-        "The default duration taken to interpolate between times"
+        "The default duration taken to interpolate between times."
     };
 
     constexpr openspace::properties::Property::PropertyInfo
     DefaultDeltaTimeInterpolationDurationInfo = {
         "DefaultDeltaTimeInterpolationDuration",
         "Default Delta Time Interpolation Duration",
-        "The default duration taken to interpolate between delta times"
+        "The default duration taken to interpolate between delta times."
     };
 
     constexpr openspace::properties::Property::PropertyInfo
         DefaultPauseInterpolationDurationInfo = {
         "DefaultPauseInterpolationDuration",
         "Default Pause Interpolation Duration",
-        "The default duration taken to transition to the paused state, "
-        "when interpolating"
+        "The default duration taken to transition to the paused state, when "
+        "interpolating."
     };
 
     constexpr openspace::properties::Property::PropertyInfo
         DefaultUnpauseInterpolationDurationInfo = {
         "DefaultUnpauseInterpolationDuration",
         "Default Unpause Interpolation Duration",
-        "The default duration taken to transition to the unpaused state, "
-        "when interpolating"
+        "The default duration taken to transition to the unpaused state, when "
+        "interpolating."
     };
 
     constexpr std::string_view DeltaTimeStepsGuiPath = "/Time/Simulation Speed/Steps";

From 1d91e48a6ce3812b8623e22baae6a74765b02252 Mon Sep 17 00:00:00 2001
From: Alexander Bock <alexander.bock@liu.se>
Date: Wed, 24 Apr 2024 13:54:13 +0200
Subject: [PATCH 414/701] Remove a missing key for an optional value as such
 instead of failing verification (closes #3214)

---
 src/documentation/documentation.cpp | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/src/documentation/documentation.cpp b/src/documentation/documentation.cpp
index a7820bc02f..c66e45de23 100644
--- a/src/documentation/documentation.cpp
+++ b/src/documentation/documentation.cpp
@@ -231,6 +231,14 @@ TestResult testSpecification(const Documentation& documentation,
                 // if the key exists, it has to be correct, however
                 continue;
             }
+            if (!p.optional && !dictionary.hasKey(p.key)) {
+                result.success = false;
+                result.offenses.emplace_back(
+                    p.key,
+                    TestResult::Offense::Reason::MissingKey
+                );
+                continue;
+            }
             applyVerifier(*(p.verifier), p.key);
         }
     }

From 0bc1af8951f8e1a9028edf298919e942450039f2 Mon Sep 17 00:00:00 2001
From: Alexander Bock <alexander.bock@liu.se>
Date: Wed, 24 Apr 2024 15:11:36 +0200
Subject: [PATCH 415/701] Correctly make RenderableDebugPlane derive from
 RenderablePlane (closes #3175)

---
 .../rendering/renderabledebugplane.cpp        | 195 +-----------------
 .../rendering/renderabledebugplane.h          |  41 +---
 2 files changed, 11 insertions(+), 225 deletions(-)

diff --git a/modules/debugging/rendering/renderabledebugplane.cpp b/modules/debugging/rendering/renderabledebugplane.cpp
index 2509db87a2..baf33241d2 100644
--- a/modules/debugging/rendering/renderabledebugplane.cpp
+++ b/modules/debugging/rendering/renderabledebugplane.cpp
@@ -22,32 +22,11 @@
  * OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                                         *
  ****************************************************************************************/
 
-// @TODO: Clean up this class and make it not copy much code from RenderablePlane ---abock
-
 #include <modules/debugging/rendering/renderabledebugplane.h>
 
-#include <modules/spacecraftinstruments/rendering/renderableplanetprojection.h>
 #include <openspace/documentation/documentation.h>
-#include <openspace/documentation/verifier.h>
-#include <openspace/engine/globals.h>
-#include <openspace/rendering/renderengine.h>
-#include <openspace/util/updatestructures.h>
-#include <ghoul/filesystem/filesystem.h>
-#include <ghoul/io/texture/texturereader.h>
-#include <ghoul/opengl/programobject.h>
-#include <ghoul/opengl/texture.h>
-#include <ghoul/opengl/textureunit.h>
-#include <optional>
 
 namespace {
-    enum Origin {
-        LowerLeft = 0,
-        LowerRight,
-        UpperLeft,
-        UpperRight,
-        Center
-    };
-
     constexpr openspace::properties::Property::PropertyInfo TextureInfo = {
         "Texture",
         "Texture",
@@ -55,48 +34,9 @@ namespace {
         openspace::properties::Property::Visibility::AdvancedUser
     };
 
-    constexpr openspace::properties::Property::PropertyInfo BillboardInfo = {
-        "Billboard",
-        "Billboard mode",
-        "This value specifies whether the plane is a billboard, which means that it is "
-        "always facing the camera. If this is false, it can be oriented using other "
-        "transformations.",
-        openspace::properties::Property::Visibility::AdvancedUser
-    };
-
-    constexpr openspace::properties::Property::PropertyInfo SizeInfo = {
-        "Size",
-        "Size (in meters)",
-        "This value specifies the size of the plane in meters.",
-        openspace::properties::Property::Visibility::AdvancedUser
-    };
-
-    constexpr openspace::properties::Property::PropertyInfo OriginInfo = {
-        "Origin",
-        "Texture Coordinate Origin",
-        "The origin of the texture coorinate system.",
-        openspace::properties::Property::Visibility::AdvancedUser
-    };
-
     struct [[codegen::Dictionary(RenderableDebugPlane)]] Parameters {
         // [[codegen::verbatim(TextureInfo.description)]]
         std::optional<int> texture;
-
-        // [[codegen::verbatim(BillboardInfo.description)]]
-        std::optional<bool> billboard;
-
-        // [[codegen::verbatim(SizeInfo.description)]]
-        std::optional<float> size;
-
-        enum class [[codegen::map(Origin)]] Origin {
-            LowerLeft,
-            LowerRight,
-            UpperLeft,
-            UpperRight,
-            Center
-        };
-        // [[codegen::verbatim(OriginInfo.description)]]
-        std::optional<Origin> origin;
     };
 #include "renderabledebugplane_codegen.cpp"
 } // namespace
@@ -104,149 +44,28 @@ namespace {
 namespace openspace {
 
 documentation::Documentation RenderableDebugPlane::Documentation() {
-    return codegen::doc<Parameters>("debugging_renderable_debugplane");
+    return codegen::doc<Parameters>(
+        "debugging_renderable_debugplane",
+        RenderablePlane::Documentation()
+    );
 }
 
 RenderableDebugPlane::RenderableDebugPlane(const ghoul::Dictionary& dictionary)
-    : Renderable(dictionary)
+    : RenderablePlane(dictionary)
     , _texture(TextureInfo, -1, -1, 512)
-    , _billboard(BillboardInfo, false)
-    , _size(SizeInfo, 10.f, 0.f, 1e25f)
-    , _origin(OriginInfo, properties::OptionProperty::DisplayType::Dropdown)
 {
     const Parameters p = codegen::bake<Parameters>(dictionary);
 
     _texture = p.texture.value_or(_texture);
     addProperty(_texture);
-
-    _size.setExponent(15.f);
-    _size.onChange([this](){ _planeIsDirty = true; });
-    _size = p.size.value_or(_size);
-    setBoundingSphere(_size);
-    addProperty(_size);
-
-    _billboard = p.billboard.value_or(_billboard);
-    addProperty(_billboard);
-
-    _origin.addOptions({
-        { LowerLeft, "LowerLeft" },
-        { LowerRight, "LowerRight" },
-        { UpperLeft, "UpperLeft" },
-        { UpperRight, "UpperRight" },
-        { Center, "Center" }
-    });
-    _origin.setValue(Center);
-
-    if (p.origin.has_value()) {
-        _origin = codegen::map<Origin>(*p.origin);
-    }
-    else {
-        _origin = Center;
-    }
 }
 
 bool RenderableDebugPlane::isReady() const {
-    bool ready = true;
-    if (!_shader) {
-        ready &= false;
-    }
-    return ready;
+    return _texture >= 0 && RenderablePlane::isReady();
 }
 
-void RenderableDebugPlane::initializeGL() {
-    glGenVertexArrays(1, &_quad); // generate array
-    glGenBuffers(1, &_vertexPositionBuffer); // generate buffer
-    createPlane();
-
-    if (!_shader) {
-        _shader = global::renderEngine->buildRenderProgram("PlaneProgram",
-            absPath("${MODULE_BASE}/shaders/plane_vs.glsl"),
-            absPath("${MODULE_BASE}/shaders/plane_fs.glsl")
-        );
-    }
-}
-
-void RenderableDebugPlane::deinitializeGL() {
-    glDeleteVertexArrays(1, &_quad);
-    _quad = 0;
-
-    glDeleteBuffers(1, &_vertexPositionBuffer);
-    _vertexPositionBuffer = 0;
-
-    if (_shader) {
-        global::renderEngine->removeRenderProgram(_shader.get());
-        _shader = nullptr;
-    }
-}
-
-void RenderableDebugPlane::render(const RenderData& data, RendererTasks&) {
-    glm::mat4 transform = glm::mat4(1.f);
-    if (_billboard) {
-        transform = glm::inverse(glm::mat4(data.camera.viewRotationMatrix()));
-    }
-
-    // Activate shader
-    _shader->activate();
-
-    _shader->setUniform("ViewProjection", data.camera.viewProjectionMatrix());
-    _shader->setUniform("ModelTransform", transform);
-
-    _shader->setUniform("campos", glm::vec4(data.camera.positionVec3(), 1.f));
-    _shader->setUniform("objpos", glm::vec4(data.modelTransform.translation, 0.f));
-    _shader->setUniform("camrot", glm::mat4(data.camera.viewRotationMatrix()));
-    _shader->setUniform("scaling", glm::vec2(1.f, 0.f));
-
-    ghoul::opengl::TextureUnit unit;
-    unit.activate();
+void RenderableDebugPlane::bindTexture() {
     glBindTexture(GL_TEXTURE_2D, _texture);
-    _shader->setUniform("texture1", unit);
-
-    glBindVertexArray(_quad);
-    glDrawArrays(GL_TRIANGLES, 0, 6);
-
-    _shader->deactivate();
-}
-
-void RenderableDebugPlane::update(const UpdateData&) {
-    if (_shader->isDirty()) {
-        _shader->rebuildFromFile();
-    }
-
-    if (_planeIsDirty) {
-        createPlane();
-    }
-}
-
-void RenderableDebugPlane::createPlane() {
-    // ============================
-    //         GEOMETRY (quad)
-    // ============================
-    const GLfloat size = _size;
-
-    const std::array<GLfloat, 36> vertexData = {
-        //  x      y    z    w    s    t
-        -size, -size, 0.f, 0.f, 0.f, 0.f,
-         size,  size, 0.f, 0.f, 1.f, 1.f,
-        -size,  size, 0.f, 0.f, 0.f, 1.f,
-        -size, -size, 0.f, 0.f, 0.f, 0.f,
-         size, -size, 0.f, 0.f, 1.f, 0.f,
-         size,  size, 0.f, 0.f, 1.f, 1.f,
-    };
-
-    glBindVertexArray(_quad); // bind array
-    glBindBuffer(GL_ARRAY_BUFFER, _vertexPositionBuffer); // bind buffer
-    glBufferData(GL_ARRAY_BUFFER, sizeof(vertexData), vertexData.data(), GL_STATIC_DRAW);
-    glEnableVertexAttribArray(0);
-    glVertexAttribPointer(0, 4, GL_FLOAT, GL_FALSE, sizeof(GLfloat) * 6, nullptr);
-    glEnableVertexAttribArray(1);
-    glVertexAttribPointer(
-        1,
-        2,
-        GL_FLOAT,
-        GL_FALSE,
-        sizeof(GLfloat) * 6,
-        reinterpret_cast<void*>(sizeof(GLfloat) * 4)
-    );
 }
 
 } // namespace openspace
diff --git a/modules/debugging/rendering/renderabledebugplane.h b/modules/debugging/rendering/renderabledebugplane.h
index 3d71f188b5..161908ae0c 100644
--- a/modules/debugging/rendering/renderabledebugplane.h
+++ b/modules/debugging/rendering/renderabledebugplane.h
@@ -25,55 +25,22 @@
 #ifndef __OPENSPACE_MODULE_DEBUGGING___RENDERABLEDEBUGPLANE___H__
 #define __OPENSPACE_MODULE_DEBUGGING___RENDERABLEDEBUGPLANE___H__
 
-#include <openspace/rendering/renderable.h>
-
-#include <openspace/properties/optionproperty.h>
-#include <openspace/properties/stringproperty.h>
-#include <openspace/properties/scalar/floatproperty.h>
-#include <ghoul/opengl/ghoul_gl.h>
-
-namespace ghoul::filesystem { class File; }
-namespace ghoul::opengl {
-    class ProgramObject;
-    class Texture;
-} // namespace ghoul::opengl
-
-namespace documentation { struct Documentation; }
+#include <modules/base/rendering/renderableplane.h>
 
 namespace openspace {
 
-struct LinePoint;
-struct UpdateStructure;
-
-class RenderableDebugPlane : public Renderable {
+class RenderableDebugPlane : public RenderablePlane {
 public:
     RenderableDebugPlane(const ghoul::Dictionary& dictionary);
-    ~RenderableDebugPlane() override = default;
 
-    void initializeGL() override;
-    void deinitializeGL() override;
-
-    bool isReady() const override;
-
-    void render(const RenderData& data, RendererTasks& rendererTask) override;
-    void update(const UpdateData& data) override;
+    bool isReady() const;
 
     static documentation::Documentation Documentation();
 
 private:
-    void createPlane();
+    virtual void bindTexture() override;
 
     properties::IntProperty _texture;
-    properties::BoolProperty _billboard;
-    properties::FloatProperty _size;
-    properties::OptionProperty _origin;
-
-    bool _planeIsDirty = true;
-
-    std::unique_ptr<ghoul::opengl::ProgramObject> _shader;
-
-    GLuint _quad = 0;
-    GLuint _vertexPositionBuffer = 0;
 };
 
 } // namespace openspace

From 5c4c5b1f107d2147212e9a1655496d88730e50cf Mon Sep 17 00:00:00 2001
From: Alexander Bock <mail@alexanderbock.eu>
Date: Wed, 24 Apr 2024 19:56:25 +0200
Subject: [PATCH 416/701] Correctly advance dashboarditem pen position before
 rendering instead of afterwards (closes #3067)

---
 modules/base/dashboard/dashboarditemangle.cpp |   4 +-
 modules/base/dashboard/dashboarditemdate.cpp  |   2 +-
 .../base/dashboard/dashboarditemdistance.cpp  |   2 +-
 .../dashboard/dashboarditemelapsedtime.cpp    |   4 +-
 .../base/dashboard/dashboarditemframerate.cpp |   6 +-
 .../dashboard/dashboarditeminputstate.cpp     |   2 +-
 .../base/dashboard/dashboarditemmission.cpp   |  10 +-
 .../dashboarditemparallelconnection.cpp       |   2 +-
 .../dashboard/dashboarditempropertyvalue.cpp  | 413 +++++++++---------
 .../dashboarditemsimulationincrement.cpp      |   2 +-
 modules/base/dashboard/dashboarditemtext.cpp  |   2 +-
 .../base/dashboard/dashboarditemvelocity.cpp  |   2 +-
 .../base/rendering/screenspacedashboard.cpp   |   2 +-
 .../src/dashboarditemglobelocation.cpp        |   2 +-
 .../dashboard/dashboarditeminstruments.cpp    |   6 +-
 src/rendering/dashboard.cpp                   |   4 +-
 16 files changed, 229 insertions(+), 236 deletions(-)

diff --git a/modules/base/dashboard/dashboarditemangle.cpp b/modules/base/dashboard/dashboarditemangle.cpp
index 511e261bff..f4644b183f 100644
--- a/modules/base/dashboard/dashboarditemangle.cpp
+++ b/modules/base/dashboard/dashboarditemangle.cpp
@@ -272,8 +272,8 @@ void DashboardItemAngle::render(glm::vec2& penPosition) {
             _buffer.data(),
             end - _buffer.data()
         );
-        RenderFont(*_font, penPosition, text);
         penPosition.y -= _font->height();
+        RenderFont(*_font, penPosition, text);
     }
     else {
         const double angle = glm::degrees(
@@ -288,8 +288,8 @@ void DashboardItemAngle::render(glm::vec2& penPosition) {
         const std::string_view text = std::string_view(
             _buffer.data(), end - _buffer.data()
         );
-        RenderFont(*_font, penPosition, text);
         penPosition.y -= _font->height();
+        RenderFont(*_font, penPosition, text);
     }
 }
 
diff --git a/modules/base/dashboard/dashboarditemdate.cpp b/modules/base/dashboard/dashboarditemdate.cpp
index 5660386e00..e7f5cdb62c 100644
--- a/modules/base/dashboard/dashboarditemdate.cpp
+++ b/modules/base/dashboard/dashboarditemdate.cpp
@@ -93,6 +93,7 @@ void DashboardItemDate::render(glm::vec2& penPosition) {
     );
 
     try {
+        penPosition.y -= _font->height();
         RenderFont(
             *_font,
             penPosition,
@@ -103,7 +104,6 @@ void DashboardItemDate::render(glm::vec2& penPosition) {
     catch (const std::format_error&) {
         LERRORC("DashboardItemDate", "Illegal format string");
     }
-    penPosition.y -= _font->height();
 }
 
 glm::vec2 DashboardItemDate::size() const {
diff --git a/modules/base/dashboard/dashboarditemdistance.cpp b/modules/base/dashboard/dashboarditemdistance.cpp
index d30a9ece34..da03286844 100644
--- a/modules/base/dashboard/dashboarditemdistance.cpp
+++ b/modules/base/dashboard/dashboarditemdistance.cpp
@@ -377,13 +377,13 @@ void DashboardItemDistance::render(glm::vec2& penPosition) {
             )
         );
 
+        penPosition.y -= _font->height();
         const std::string_view t = std::string_view(_buffer.data(), end - _buffer.data());
         RenderFont(*_font, penPosition, t);
     }
     catch (const std::format_error&) {
         LERRORC("DashboardItemDate", "Illegal format string");
     }
-    penPosition.y -= _font->height();
 }
 
 glm::vec2 DashboardItemDistance::size() const {
diff --git a/modules/base/dashboard/dashboarditemelapsedtime.cpp b/modules/base/dashboard/dashboarditemelapsedtime.cpp
index 0ad562dda0..c7470c2e3c 100644
--- a/modules/base/dashboard/dashboarditemelapsedtime.cpp
+++ b/modules/base/dashboard/dashboarditemelapsedtime.cpp
@@ -140,6 +140,8 @@ void DashboardItemElapsedTime::render(glm::vec2& penPosition) {
 
     const double delta = global::timeManager->time().j2000Seconds() - _referenceJ2000;
 
+    penPosition.y -= _font->height();
+
     if (_simplifyTime) {
         using namespace std::chrono;
 
@@ -176,8 +178,6 @@ void DashboardItemElapsedTime::render(glm::vec2& penPosition) {
             std::vformat(_formatString.value(), std::make_format_args(time))
         );
     }
-
-    penPosition.y -= _font->height();
 }
 
 glm::vec2 DashboardItemElapsedTime::size() const {
diff --git a/modules/base/dashboard/dashboarditemframerate.cpp b/modules/base/dashboard/dashboarditemframerate.cpp
index 139645c464..adf69e3a7e 100644
--- a/modules/base/dashboard/dashboarditemframerate.cpp
+++ b/modules/base/dashboard/dashboarditemframerate.cpp
@@ -237,12 +237,8 @@ void DashboardItemFramerate::render(glm::vec2& penPosition) {
         0 :
         static_cast<int>((std::count(text.begin(), text.end(), '\n') + 1));
 
-    ghoul::fontrendering::FontRenderer::defaultRenderer().render(
-        *_font,
-        penPosition,
-        text
-    );
     penPosition.y -= _font->height() * static_cast<float>(nLines);
+    RenderFont(*_font, penPosition, text);
 }
 
 glm::vec2 DashboardItemFramerate::size() const {
diff --git a/modules/base/dashboard/dashboarditeminputstate.cpp b/modules/base/dashboard/dashboarditeminputstate.cpp
index 7463251f5b..60a0c9b39f 100644
--- a/modules/base/dashboard/dashboarditeminputstate.cpp
+++ b/modules/base/dashboard/dashboarditeminputstate.cpp
@@ -167,9 +167,9 @@ void DashboardItemInputState::render(glm::vec2& penPosition) {
     }
 
     if (!text.empty()) {
+        penPosition.y -= _font->height();
         const std::string t = ghoul::join(std::move(text), "\n");
         RenderFont(*_font, penPosition, t);
-        penPosition.y -= _font->height();
     }
 }
 
diff --git a/modules/base/dashboard/dashboarditemmission.cpp b/modules/base/dashboard/dashboarditemmission.cpp
index bd6c589e5d..07cb2ffa93 100644
--- a/modules/base/dashboard/dashboarditemmission.cpp
+++ b/modules/base/dashboard/dashboarditemmission.cpp
@@ -84,13 +84,7 @@ void DashboardItemMission::render(glm::vec2& penPosition) {
     static constexpr glm::vec4 nonCurrentMissionColor = glm::vec4(0.3f, 0.3f, 0.3f, 1.f);
 
     // Add spacing
-    RenderFont(
-        *_font,
-        penPosition,
-        " ",
-        nonCurrentMissionColor,
-        ghoul::fontrendering::CrDirection::Down
-    );
+    penPosition.y -= _font->height();
 
     MissionPhase::Trace phaseTrace = mission.phaseTrace(currentTime);
     if (!phaseTrace.empty()) {
@@ -179,6 +173,8 @@ void DashboardItemMission::render(glm::vec2& penPosition) {
             }
         }
     }
+
+    penPosition.y += _font->height();
 }
 
 glm::vec2 DashboardItemMission::size() const {
diff --git a/modules/base/dashboard/dashboarditemparallelconnection.cpp b/modules/base/dashboard/dashboarditemparallelconnection.cpp
index 7e475b2e14..ed7b20aec2 100644
--- a/modules/base/dashboard/dashboarditemparallelconnection.cpp
+++ b/modules/base/dashboard/dashboarditemparallelconnection.cpp
@@ -100,8 +100,8 @@ void DashboardItemParallelConnection::render(glm::vec2& penPosition) {
     }
 
     if (!connectionInfo.empty()) {
-        RenderFont(*_font, penPosition, connectionInfo);
         penPosition.y -= _font->height() * nLines;
+        RenderFont(*_font, penPosition, connectionInfo);
     }
 }
 
diff --git a/modules/base/dashboard/dashboarditempropertyvalue.cpp b/modules/base/dashboard/dashboarditempropertyvalue.cpp
index 10e8980339..19fc39434b 100644
--- a/modules/base/dashboard/dashboarditempropertyvalue.cpp
+++ b/modules/base/dashboard/dashboarditempropertyvalue.cpp
@@ -115,214 +115,213 @@ void DashboardItemPropertyValue::render(glm::vec2& penPosition) {
         _propertyIsDirty = false;
     }
 
-    if (_property) {
-        const std::string_view type = _property->className();
-        if (type == "DoubleProperty") {
-            double value = static_cast<properties::DoubleProperty*>(_property)->value();
-            RenderFont(
-                *_font,
-                penPosition,
-                // @CPP26(abock): This can be replaced with std::runtime_format
-                std::vformat(_displayString.value(), std::make_format_args(value))
-            );
-        }
-        else if (type == "FloatProperty") {
-            float value = static_cast<properties::FloatProperty*>(_property)->value();
-            RenderFont(
-                *_font,
-                penPosition,
-                // @CPP26(abock): This can be replaced with std::runtime_format
-                std::vformat(_displayString.value(), std::make_format_args(value))
-            );
-        }
-        else if (type == "IntProperty") {
-            int value = static_cast<properties::IntProperty*>(_property)->value();
-            RenderFont(
-                *_font,
-                penPosition,
-                // @CPP26(abock): This can be replaced with std::runtime_format
-                std::vformat(_displayString.value(), std::make_format_args(value))
-            );
-        }
-        else if (type == "LongProperty") {
-            long value = static_cast<properties::LongProperty*>(_property)->value();
-            RenderFont(
-                *_font,
-                penPosition,
-                // @CPP26(abock): This can be replaced with std::runtime_format
-                std::vformat(_displayString.value(), std::make_format_args(value))
-            );
-        }
-        else if (type == "ShortProperty") {
-            short value = static_cast<properties::ShortProperty*>(_property)->value();
-            RenderFont(
-                *_font,
-                penPosition,
-                // @CPP26(abock): This can be replaced with std::runtime_format
-                std::vformat(_displayString.value(), std::make_format_args(value))
-            );
-        }
-        else if (type == "UIntProperty") {
-            unsigned int v = static_cast<properties::UIntProperty*>(_property)->value();
-            RenderFont(
-                *_font,
-                penPosition,
-                // @CPP26(abock): This can be replaced with std::runtime_format
-                std::vformat(_displayString.value(), std::make_format_args(v))
-            );
-        }
-        else if (type == "ULongProperty") {
-            unsigned long v = static_cast<properties::ULongProperty*>(_property)->value();
-            RenderFont(
-                *_font,
-                penPosition,
-                // @CPP26(abock): This can be replaced with std::runtime_format
-                std::vformat(_displayString.value(), std::make_format_args(v))
-            );
-        }
-        else if (type == "UShortProperty") {
-            unsigned short v =
-                static_cast<properties::UShortProperty*>(_property)->value();
-            RenderFont(
-                *_font,
-                penPosition,
-                // @CPP26(abock): This can be replaced with std::runtime_format
-                std::vformat(_displayString.value(), std::make_format_args(v))
-            );
-        }
-        else if (type == "DVec2Property") {
-            glm::dvec2 v = static_cast<properties::DVec2Property*>(_property)->value();
-            RenderFont(
-                *_font,
-                penPosition,
-                // @CPP26(abock): This can be replaced with std::runtime_format
-                std::vformat(_displayString.value(), std::make_format_args(v.x, v.y))
-            );
-        }
-        else if (type == "DVec3Property") {
-            glm::dvec3 v = static_cast<properties::DVec3Property*>(_property)->value();
-            RenderFont(
-                *_font,
-                penPosition,
-                // @CPP26(abock): This can be replaced with std::runtime_format
-                std::vformat(_displayString.value(), std::make_format_args(v.x, v.y, v.z))
-            );
-        }
-        else if (type == "DVec4Property") {
-            glm::dvec4 v = static_cast<properties::DVec4Property*>(_property)->value();
-            RenderFont(
-                *_font,
-                penPosition,
-                // @CPP26(abock): This can be replaced with std::runtime_format
-                std::vformat(
-                    _displayString.value(),
-                    std::make_format_args(v.x, v.y, v.z, v.w)
-                )
-            );
-        }
-        else if (type == "IVec2Property") {
-            glm::ivec2 v = static_cast<properties::IVec2Property*>(_property)->value();
-            RenderFont(
-                *_font,
-                penPosition,
-                // @CPP26(abock): This can be replaced with std::runtime_format
-                std::vformat(_displayString.value(), std::make_format_args(v.x, v.y))
-            );
-        }
-        else if (type == "IVec3Property") {
-            glm::ivec3 v = static_cast<properties::IVec3Property*>(_property)->value();
-            RenderFont(
-                *_font,
-                penPosition,
-                // @CPP26(abock): This can be replaced with std::runtime_format
-                std::vformat(_displayString.value(), std::make_format_args(v.x, v.y, v.z))
-            );
-        }
-        else if (type == "IVec4Property") {
-            glm::ivec4 v = static_cast<properties::IVec4Property*>(_property)->value();
-            RenderFont(
-                *_font,
-                penPosition,
-                // @CPP26(abock): This can be replaced with std::runtime_format
-                std::vformat(
-                    _displayString.value(),
-                    std::make_format_args(v.x, v.y, v.z, v.w)
-                )
-            );
-        }
-        else if (type == "UVec2Property") {
-            glm::uvec2 v = static_cast<properties::UVec2Property*>(_property)->value();
-            RenderFont(
-                *_font,
-                penPosition,
-                // @CPP26(abock): This can be replaced with std::runtime_format
-                std::vformat(_displayString.value(), std::make_format_args(v.x, v.y))
-            );
-        }
-        else if (type == "UVec3Property") {
-            glm::uvec3 v = static_cast<properties::UVec3Property*>(_property)->value();
-            RenderFont(
-                *_font,
-                penPosition,
-                // @CPP26(abock): This can be replaced with std::runtime_format
-                std::vformat(_displayString.value(), std::make_format_args(v.x, v.y, v.z))
-            );
-        }
-        else if (type == "UVec4Property") {
-            glm::uvec4 v = static_cast<properties::UVec4Property*>(_property)->value();
-            RenderFont(
-                *_font,
-                penPosition,
-                // @CPP26(abock): This can be replaced with std::runtime_format
-                std::vformat(
-                    _displayString.value(),
-                    std::make_format_args(v.x, v.y, v.z, v.w)
-                )
-            );
-        }
-        else if (type == "Vec2Property") {
-            glm::vec2 v = static_cast<properties::Vec2Property*>(_property)->value();
-            RenderFont(
-                *_font,
-                penPosition,
-                // @CPP26(abock): This can be replaced with std::runtime_format
-                std::vformat(_displayString.value(), std::make_format_args(v.x, v.y))
-            );
-        }
-        else if (type == "Vec3Property") {
-            glm::vec3 v = static_cast<properties::Vec3Property*>(_property)->value();
-            RenderFont(
-                *_font,
-                penPosition,
-                // @CPP26(abock): This can be replaced with std::runtime_format
-                std::vformat(_displayString.value(), std::make_format_args(v.x, v.y, v.z))
-            );
-        }
-        else if (type == "Vec4Property") {
-            glm::vec4 v = static_cast<properties::Vec4Property*>(_property)->value();
-            RenderFont(
-                *_font,
-                penPosition,
-                // @CPP26(abock): This can be replaced with std::runtime_format
-                std::vformat(
-                    _displayString.value(),
-                    std::make_format_args(v.x, v.y, v.z, v.w)
-                )
-            );
-        }
-        else {
-            // Fallback if we don't have a special case above
+    if (!_property) {
+        return;
+    }
+    const std::string_view type = _property->className();
+    penPosition.y -= _font->height();
+    if (type == "DoubleProperty") {
+        double value = static_cast<properties::DoubleProperty*>(_property)->value();
+        RenderFont(
+            *_font,
+            penPosition,
+            // @CPP26(abock): This can be replaced with std::runtime_format
+            std::vformat(_displayString.value(), std::make_format_args(value))
+        );
+    }
+    else if (type == "FloatProperty") {
+        float value = static_cast<properties::FloatProperty*>(_property)->value();
+        RenderFont(
+            *_font,
+            penPosition,
+            // @CPP26(abock): This can be replaced with std::runtime_format
+            std::vformat(_displayString.value(), std::make_format_args(value))
+        );
+    }
+    else if (type == "IntProperty") {
+        int value = static_cast<properties::IntProperty*>(_property)->value();
+        RenderFont(
+            *_font,
+            penPosition,
+            // @CPP26(abock): This can be replaced with std::runtime_format
+            std::vformat(_displayString.value(), std::make_format_args(value))
+        );
+    }
+    else if (type == "LongProperty") {
+        long value = static_cast<properties::LongProperty*>(_property)->value();
+        RenderFont(
+            *_font,
+            penPosition,
+            // @CPP26(abock): This can be replaced with std::runtime_format
+            std::vformat(_displayString.value(), std::make_format_args(value))
+        );
+    }
+    else if (type == "ShortProperty") {
+        short value = static_cast<properties::ShortProperty*>(_property)->value();
+        RenderFont(
+            *_font,
+            penPosition,
+            // @CPP26(abock): This can be replaced with std::runtime_format
+            std::vformat(_displayString.value(), std::make_format_args(value))
+        );
+    }
+    else if (type == "UIntProperty") {
+        unsigned int v = static_cast<properties::UIntProperty*>(_property)->value();
+        RenderFont(
+            *_font,
+            penPosition,
+            // @CPP26(abock): This can be replaced with std::runtime_format
+            std::vformat(_displayString.value(), std::make_format_args(v))
+        );
+    }
+    else if (type == "ULongProperty") {
+        unsigned long v = static_cast<properties::ULongProperty*>(_property)->value();
+        RenderFont(
+            *_font,
+            penPosition,
+            // @CPP26(abock): This can be replaced with std::runtime_format
+            std::vformat(_displayString.value(), std::make_format_args(v))
+        );
+    }
+    else if (type == "UShortProperty") {
+        unsigned short v = static_cast<properties::UShortProperty*>(_property)->value();
+        RenderFont(
+            *_font,
+            penPosition,
+            // @CPP26(abock): This can be replaced with std::runtime_format
+            std::vformat(_displayString.value(), std::make_format_args(v))
+        );
+    }
+    else if (type == "DVec2Property") {
+        glm::dvec2 v = static_cast<properties::DVec2Property*>(_property)->value();
+        RenderFont(
+            *_font,
+            penPosition,
+            // @CPP26(abock): This can be replaced with std::runtime_format
+            std::vformat(_displayString.value(), std::make_format_args(v.x, v.y))
+        );
+    }
+    else if (type == "DVec3Property") {
+        glm::dvec3 v = static_cast<properties::DVec3Property*>(_property)->value();
+        RenderFont(
+            *_font,
+            penPosition,
+            // @CPP26(abock): This can be replaced with std::runtime_format
+            std::vformat(_displayString.value(), std::make_format_args(v.x, v.y, v.z))
+        );
+    }
+    else if (type == "DVec4Property") {
+        glm::dvec4 v = static_cast<properties::DVec4Property*>(_property)->value();
+        RenderFont(
+            *_font,
+            penPosition,
+            // @CPP26(abock): This can be replaced with std::runtime_format
+            std::vformat(
+                _displayString.value(),
+                std::make_format_args(v.x, v.y, v.z, v.w)
+            )
+        );
+    }
+    else if (type == "IVec2Property") {
+        glm::ivec2 v = static_cast<properties::IVec2Property*>(_property)->value();
+        RenderFont(
+            *_font,
+            penPosition,
+            // @CPP26(abock): This can be replaced with std::runtime_format
+            std::vformat(_displayString.value(), std::make_format_args(v.x, v.y))
+        );
+    }
+    else if (type == "IVec3Property") {
+        glm::ivec3 v = static_cast<properties::IVec3Property*>(_property)->value();
+        RenderFont(
+            *_font,
+            penPosition,
+            // @CPP26(abock): This can be replaced with std::runtime_format
+            std::vformat(_displayString.value(), std::make_format_args(v.x, v.y, v.z))
+        );
+    }
+    else if (type == "IVec4Property") {
+        glm::ivec4 v = static_cast<properties::IVec4Property*>(_property)->value();
+        RenderFont(
+            *_font,
+            penPosition,
+            // @CPP26(abock): This can be replaced with std::runtime_format
+            std::vformat(
+                _displayString.value(),
+                std::make_format_args(v.x, v.y, v.z, v.w)
+            )
+        );
+    }
+    else if (type == "UVec2Property") {
+        glm::uvec2 v = static_cast<properties::UVec2Property*>(_property)->value();
+        RenderFont(
+            *_font,
+            penPosition,
+            // @CPP26(abock): This can be replaced with std::runtime_format
+            std::vformat(_displayString.value(), std::make_format_args(v.x, v.y))
+        );
+    }
+    else if (type == "UVec3Property") {
+        glm::uvec3 v = static_cast<properties::UVec3Property*>(_property)->value();
+        RenderFont(
+            *_font,
+            penPosition,
+            // @CPP26(abock): This can be replaced with std::runtime_format
+            std::vformat(_displayString.value(), std::make_format_args(v.x, v.y, v.z))
+        );
+    }
+    else if (type == "UVec4Property") {
+        glm::uvec4 v = static_cast<properties::UVec4Property*>(_property)->value();
+        RenderFont(
+            *_font,
+            penPosition,
+            // @CPP26(abock): This can be replaced with std::runtime_format
+            std::vformat(
+                _displayString.value(),
+                std::make_format_args(v.x, v.y, v.z, v.w)
+            )
+        );
+    }
+    else if (type == "Vec2Property") {
+        glm::vec2 v = static_cast<properties::Vec2Property*>(_property)->value();
+        RenderFont(
+            *_font,
+            penPosition,
+            // @CPP26(abock): This can be replaced with std::runtime_format
+            std::vformat(_displayString.value(), std::make_format_args(v.x, v.y))
+        );
+    }
+    else if (type == "Vec3Property") {
+        glm::vec3 v = static_cast<properties::Vec3Property*>(_property)->value();
+        RenderFont(
+            *_font,
+            penPosition,
+            // @CPP26(abock): This can be replaced with std::runtime_format
+            std::vformat(_displayString.value(), std::make_format_args(v.x, v.y, v.z))
+        );
+    }
+    else if (type == "Vec4Property") {
+        glm::vec4 v = static_cast<properties::Vec4Property*>(_property)->value();
+        RenderFont(
+            *_font,
+            penPosition,
+            // @CPP26(abock): This can be replaced with std::runtime_format
+            std::vformat(
+                _displayString.value(),
+                std::make_format_args(v.x, v.y, v.z, v.w)
+            )
+        );
+    }
+    else {
+        // Fallback if we don't have a special case above
 
-            std::string value = _property->stringValue();
-            RenderFont(
-                *_font,
-                penPosition,
-                // @CPP26(abock): This can be replaced with std::runtime_format
-                std::vformat(_displayString.value(), std::make_format_args(value))
-            );
-        }
-
-        penPosition.y -= _font->height();
+        std::string value = _property->stringValue();
+        RenderFont(
+            *_font,
+            penPosition,
+            // @CPP26(abock): This can be replaced with std::runtime_format
+            std::vformat(_displayString.value(), std::make_format_args(value))
+        );
     }
 }
 
diff --git a/modules/base/dashboard/dashboarditemsimulationincrement.cpp b/modules/base/dashboard/dashboarditemsimulationincrement.cpp
index 0d0c5353ba..ede6dc1369 100644
--- a/modules/base/dashboard/dashboarditemsimulationincrement.cpp
+++ b/modules/base/dashboard/dashboarditemsimulationincrement.cpp
@@ -188,6 +188,7 @@ void DashboardItemSimulationIncrement::render(glm::vec2& penPosition) {
     std::string pauseText = global::timeManager->isPaused() ? " (Paused)" : "";
 
     try {
+        penPosition.y -= _font->height();
         if (targetDt != currentDt && !global::timeManager->isPaused()) {
             // We are in the middle of a transition
             RenderFont(
@@ -223,7 +224,6 @@ void DashboardItemSimulationIncrement::render(glm::vec2& penPosition) {
     catch (const std::format_error&) {
         LERRORC("DashboardItemDate", "Illegal format string");
     }
-    penPosition.y -= _font->height();
 }
 
 glm::vec2 DashboardItemSimulationIncrement::size() const {
diff --git a/modules/base/dashboard/dashboarditemtext.cpp b/modules/base/dashboard/dashboarditemtext.cpp
index 149a478bd4..ddf52a4ed2 100644
--- a/modules/base/dashboard/dashboarditemtext.cpp
+++ b/modules/base/dashboard/dashboarditemtext.cpp
@@ -69,8 +69,8 @@ DashboardItemText::DashboardItemText(const ghoul::Dictionary& dictionary)
 void DashboardItemText::render(glm::vec2& penPosition) {
     ZoneScoped;
 
-    RenderFont(*_font, penPosition, _text.value());
     penPosition.y -= _font->height();
+    RenderFont(*_font, penPosition, _text.value());
 }
 
 glm::vec2 DashboardItemText::size() const {
diff --git a/modules/base/dashboard/dashboarditemvelocity.cpp b/modules/base/dashboard/dashboarditemvelocity.cpp
index 4fd8ac8d8c..3617b5e449 100644
--- a/modules/base/dashboard/dashboarditemvelocity.cpp
+++ b/modules/base/dashboard/dashboarditemvelocity.cpp
@@ -142,12 +142,12 @@ void DashboardItemVelocity::render(glm::vec2& penPosition) {
         dist = std::pair(convertedD, nameForDistanceUnit(unit, convertedD != 1.0));
     }
 
+    penPosition.y -= _font->height();
     RenderFont(
         *_font,
         penPosition,
         std::format("Camera velocity: {:.4f} {}/s", dist.first, dist.second)
     );
-    penPosition.y -= _font->height();
 
     _prevPosition = currentPos;
 }
diff --git a/modules/base/rendering/screenspacedashboard.cpp b/modules/base/rendering/screenspacedashboard.cpp
index 7d2904a788..6e578bd47d 100644
--- a/modules/base/rendering/screenspacedashboard.cpp
+++ b/modules/base/rendering/screenspacedashboard.cpp
@@ -92,7 +92,7 @@ bool ScreenSpaceDashboard::initializeGL() {
     ScreenSpaceFramebuffer::initializeGL();
 
     addRenderFunction([this]() {
-        glm::vec2 penPosition = glm::vec2(10.f, _size.value().w);
+        glm::vec2 penPosition = glm::vec2(0.f, _size.value().w);
 
         if (_useMainDashboard) {
             global::dashboard->render(penPosition);
diff --git a/modules/globebrowsing/src/dashboarditemglobelocation.cpp b/modules/globebrowsing/src/dashboarditemglobelocation.cpp
index 1a41a1deb6..99c4b5d116 100644
--- a/modules/globebrowsing/src/dashboarditemglobelocation.cpp
+++ b/modules/globebrowsing/src/dashboarditemglobelocation.cpp
@@ -201,9 +201,9 @@ void DashboardItemGlobeLocation::render(glm::vec2& penPosition) {
         }
     }
 
+    penPosition.y -= _font->height();
     const std::string_view text = std::string_view(_buffer.data(), end - _buffer.data());
     RenderFont(*_font, penPosition, text);
-    penPosition.y -= _font->height();
 }
 
 glm::vec2 DashboardItemGlobeLocation::size() const {
diff --git a/modules/spacecraftinstruments/dashboard/dashboarditeminstruments.cpp b/modules/spacecraftinstruments/dashboard/dashboarditeminstruments.cpp
index f602bcf3d4..59e2dc6278 100644
--- a/modules/spacecraftinstruments/dashboard/dashboarditeminstruments.cpp
+++ b/modules/spacecraftinstruments/dashboard/dashboarditeminstruments.cpp
@@ -127,7 +127,7 @@ void DashboardItemInstruments::render(glm::vec2& penPosition) {
     }
     ImageSequencer& sequencer = ImageSequencer::ref();
 
-    penPosition.y -= 25.f;
+    penPosition.y -= _font->height();
 
     constexpr glm::vec4 targetColor(0.f, 0.75f, 1.f, 1.f);
 
@@ -248,6 +248,10 @@ void DashboardItemInstruments::render(glm::vec2& penPosition) {
             );
         }
     }
+
+    // The last item added a CR but we want to undo it since it's the next item's
+    // responsibility to move down
+    penPosition.y += _font->height();
 }
 
 glm::vec2 DashboardItemInstruments::size() const {
diff --git a/src/rendering/dashboard.cpp b/src/rendering/dashboard.cpp
index 86c63e991a..c14511505c 100644
--- a/src/rendering/dashboard.cpp
+++ b/src/rendering/dashboard.cpp
@@ -56,9 +56,7 @@ namespace openspace {
 Dashboard::Dashboard()
     : properties::PropertyOwner({ "Dashboard" })
     , _isEnabled(EnabledInfo, true)
-    , _startPositionOffset(
-        properties::IVec2Property(StartPositionOffsetInfo, glm::ivec2(10, -25))
-    )
+    , _startPositionOffset(StartPositionOffsetInfo, glm::ivec2(10, -10))
 {
     addProperty(_isEnabled);
     addProperty(_startPositionOffset);

From e6a8207dfe9f390dc5f0ac6d5b1266cdb19c1647 Mon Sep 17 00:00:00 2001
From: Emma Broman <emma.broman@liu.se>
Date: Thu, 25 Apr 2024 16:14:59 +0200
Subject: [PATCH 417/701] Update MIlkyway speck data version  (closes #3196)

The cached data files may have to be removed for the change to take effect (at least until #3154 is fixed)
---
 data/assets/scene/digitaluniverse/milkyway.asset            | 2 +-
 data/assets/scene/digitaluniverse/milkyway_arm_labels.asset | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/data/assets/scene/digitaluniverse/milkyway.asset b/data/assets/scene/digitaluniverse/milkyway.asset
index ee0c393536..1cb7ea376f 100644
--- a/data/assets/scene/digitaluniverse/milkyway.asset
+++ b/data/assets/scene/digitaluniverse/milkyway.asset
@@ -9,7 +9,7 @@ local speck = asset.resource({
   Name = "Milky Way Plane Speck",
   Type = "HttpSynchronization",
   Identifier = "digitaluniverse_milkyway_speck",
-  Version = 2
+  Version = 3
 })
 
 
diff --git a/data/assets/scene/digitaluniverse/milkyway_arm_labels.asset b/data/assets/scene/digitaluniverse/milkyway_arm_labels.asset
index 84b08bf565..63634bd855 100644
--- a/data/assets/scene/digitaluniverse/milkyway_arm_labels.asset
+++ b/data/assets/scene/digitaluniverse/milkyway_arm_labels.asset
@@ -9,7 +9,7 @@ local speck = asset.resource({
   Name = "Milky Way Plane Speck",
   Type = "HttpSynchronization",
   Identifier = "digitaluniverse_milkyway_speck",
-  Version = 2
+  Version = 3
 })
 
 

From 7061675ab5282bf975945498ffbd5d764ddb0372 Mon Sep 17 00:00:00 2001
From: Malin E <malin.ejdbo@gmail.com>
Date: Mon, 29 Apr 2024 14:29:08 +0200
Subject: [PATCH 418/701] Add calculation of bounding sphere for model
 projection, closes #2319

---
 .../rendering/renderablemodelprojection.cpp                      | 1 +
 1 file changed, 1 insertion(+)

diff --git a/modules/spacecraftinstruments/rendering/renderablemodelprojection.cpp b/modules/spacecraftinstruments/rendering/renderablemodelprojection.cpp
index 26ec899e96..5b37ea0661 100644
--- a/modules/spacecraftinstruments/rendering/renderablemodelprojection.cpp
+++ b/modules/spacecraftinstruments/rendering/renderablemodelprojection.cpp
@@ -202,6 +202,7 @@ void RenderableModelProjection::initializeGL() {
     _projectionComponent.initializeGL();
 
     _geometry->initialize();
+    _geometry->calculateBoundingRadius();
     setBoundingSphere(_geometry->boundingRadius() * _modelScale);
 
     // Set Interaction sphere size to be 10% of the bounding sphere

From be3e30e6b4500a8623a61de982102078550ea670 Mon Sep 17 00:00:00 2001
From: Malin E <malin.ejdbo@gmail.com>
Date: Mon, 29 Apr 2024 14:57:00 +0200
Subject: [PATCH 419/701] Update Ghoul, closes #3154

* Update caching to take whole filepath into account and not just
  filemname when creating hash
---
 ext/ghoul | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ext/ghoul b/ext/ghoul
index 0fc36769cf..2feafb0496 160000
--- a/ext/ghoul
+++ b/ext/ghoul
@@ -1 +1 @@
-Subproject commit 0fc36769cf20cea6e9c1b1157ec2e6c8d10cd421
+Subproject commit 2feafb0496504336b71935135a90ea05ee77ea4e

From 203cff04cca36c956bf66b6150c56b9648fa00ac Mon Sep 17 00:00:00 2001
From: Alexander Bock <alexander.bock@liu.se>
Date: Tue, 30 Apr 2024 08:12:33 +0200
Subject: [PATCH 420/701] Make use of the new uniform cache method that uses
 the variable names as uniform names (#3217)

---
 ext/ghoul                                     |  2 +-
 .../rendering/screenspacerenderable.h         |  2 +-
 .../rendering/atmospheredeferredcaster.cpp    | 17 ++-----
 .../rendering/atmospheredeferredcaster.h      |  7 +--
 .../pointcloud/renderablepointcloud.cpp       | 20 ++------
 .../pointcloud/renderablepointcloud.h         |  4 +-
 modules/base/rendering/renderabledisc.cpp     |  4 +-
 modules/base/rendering/renderabledisc.h       |  3 +-
 modules/base/rendering/renderablemodel.cpp    | 33 ++-----------
 modules/base/rendering/renderableplane.cpp    |  9 +---
 modules/base/rendering/renderableprism.cpp    | 10 ++--
 modules/base/rendering/renderableprism.h      |  2 +-
 modules/base/rendering/renderablesphere.cpp   |  9 +---
 modules/base/rendering/renderabletrail.cpp    |  9 ++--
 modules/base/rendering/renderabletrail.h      | 13 ++---
 modules/base/shaders/prism_fs.glsl            |  4 +-
 .../rendering/renderabledumeshes.cpp          |  8 +---
 .../rendering/renderableorbitdisc.cpp         | 13 ++---
 .../rendering/renderableorbitdisc.h           |  2 +-
 modules/galaxy/rendering/renderablegalaxy.cpp | 26 ++--------
 modules/galaxy/rendering/renderablegalaxy.h   |  6 +--
 modules/globebrowsing/src/renderableglobe.cpp | 12 ++---
 modules/globebrowsing/src/ringscomponent.cpp  | 44 +++--------------
 modules/globebrowsing/src/ringscomponent.h    |  8 ++--
 modules/imgui/imguimodule.cpp                 |  6 +--
 .../rendering/renderablefov.cpp               | 19 ++++----
 .../rendering/renderablefov.h                 |  6 +--
 .../rendering/renderablemodelprojection.cpp   | 47 +++----------------
 .../rendering/renderablemodelprojection.h     |  1 +
 .../rendering/renderableplanetprojection.cpp  | 41 +++-------------
 .../rendering/renderableplanetprojection.h    |  8 ++--
 .../rendering/renderableshadowcylinder.cpp    |  8 +---
 modules/touch/src/touchmarker.cpp             |  6 +--
 src/rendering/framebufferrenderer.cpp         | 44 +++--------------
 src/rendering/helper.cpp                      |  6 +--
 src/rendering/screenspacerenderable.cpp       | 11 ++---
 36 files changed, 122 insertions(+), 348 deletions(-)

diff --git a/ext/ghoul b/ext/ghoul
index 2feafb0496..9c13aaa212 160000
--- a/ext/ghoul
+++ b/ext/ghoul
@@ -1 +1 @@
-Subproject commit 2feafb0496504336b71935135a90ea05ee77ea4e
+Subproject commit 9c13aaa212d75005fc0a2ae1d0b124485c120261
diff --git a/include/openspace/rendering/screenspacerenderable.h b/include/openspace/rendering/screenspacerenderable.h
index bdba579e20..ae6e4cd9f6 100644
--- a/include/openspace/rendering/screenspacerenderable.h
+++ b/include/openspace/rendering/screenspacerenderable.h
@@ -141,7 +141,7 @@ protected:
     properties::TriggerProperty _delete;
 
     glm::ivec2 _objectSize = glm::ivec2(0);
-    UniformCache(color, opacity, blackoutFactor, mvp, texture, backgroundColor, gamma,
+    UniformCache(color, opacity, blackoutFactor, mvpMatrix, tex, backgroundColor, gamma,
         borderColor, borderWidth) _uniformCache;
     std::unique_ptr<ghoul::opengl::ProgramObject> _shader;
 };
diff --git a/modules/atmosphere/rendering/atmospheredeferredcaster.cpp b/modules/atmosphere/rendering/atmospheredeferredcaster.cpp
index bae86d11ee..53eafdca18 100644
--- a/modules/atmosphere/rendering/atmospheredeferredcaster.cpp
+++ b/modules/atmosphere/rendering/atmospheredeferredcaster.cpp
@@ -70,16 +70,6 @@
 namespace {
     constexpr std::string_view _loggerCat = "AtmosphereDeferredcaster";
 
-    constexpr std::array<const char*, 29> UniformNames = {
-        "cullAtmosphere", "opacity", "Rg", "Rt", "groundRadianceEmission", "HR",
-        "betaRayleigh", "HM", "betaMieExtinction", "mieG", "sunRadiance",
-        "ozoneLayerEnabled", "HO", "betaOzoneExtinction", "SAMPLES_R", "SAMPLES_MU",
-        "SAMPLES_MU_S", "SAMPLES_NU", "inverseModelTransformMatrix",
-        "modelTransformMatrix", "projectionToModelTransformMatrix", "viewToWorldMatrix",
-        "camPosObj", "sunDirectionObj", "hardShadows", "transmittanceTexture",
-        "irradianceTexture", "inscatterTexture", "sunAngularSize"
-    };
-
     constexpr float ATM_EPS = 2000.f;
     constexpr float KM_TO_M = 1000.f;
 
@@ -376,7 +366,10 @@ void AtmosphereDeferredcaster::preRaycast(const RenderData& data, const Deferred
 
         const glm::dmat4 invWholePipeline = invModelMatrix * viewToWorld * dInvProj;
 
-        program.setUniform(_uniformCache.projectionToModelTransform, invWholePipeline);
+        program.setUniform(
+            _uniformCache.projectionToModelTransformMatrix,
+            invWholePipeline
+        );
 
         const glm::dvec4 camPosObjCoords =
             invModelMatrix * glm::dvec4(data.camera.eyePositionVec3(), 1.0);
@@ -555,7 +548,7 @@ std::filesystem::path AtmosphereDeferredcaster::helperPath() const {
 void AtmosphereDeferredcaster::initializeCachedVariables(
                                                     ghoul::opengl::ProgramObject& program)
 {
-    ghoul::opengl::updateUniformLocations(program, _uniformCache, UniformNames);
+    ghoul::opengl::updateUniformLocations(program, _uniformCache);
 }
 
 void AtmosphereDeferredcaster::setModelTransform(glm::dmat4 transform) {
diff --git a/modules/atmosphere/rendering/atmospheredeferredcaster.h b/modules/atmosphere/rendering/atmospheredeferredcaster.h
index 861a161c6b..3f34bbc967 100644
--- a/modules/atmosphere/rendering/atmospheredeferredcaster.h
+++ b/modules/atmosphere/rendering/atmospheredeferredcaster.h
@@ -117,9 +117,10 @@ private:
     UniformCache(cullAtmosphere, opacity, Rg, Rt, groundRadianceEmission, HR,
         betaRayleigh, HM, betaMieExtinction, mieG, sunRadiance, ozoneLayerEnabled, HO,
         betaOzoneExtinction, SAMPLES_R, SAMPLES_MU, SAMPLES_MU_S, SAMPLES_NU,
-        inverseModelTransformMatrix, modelTransformMatrix, projectionToModelTransform,
-        viewToWorldMatrix, camPosObj, sunDirectionObj, hardShadows, transmittanceTexture,
-        irradianceTexture, inscatterTexture, sunAngularSize) _uniformCache;
+        inverseModelTransformMatrix, modelTransformMatrix,
+        projectionToModelTransformMatrix, viewToWorldMatrix, camPosObj, sunDirectionObj,
+        hardShadows, transmittanceTexture, irradianceTexture, inscatterTexture,
+        sunAngularSize) _uniformCache;
 
     ghoul::opengl::TextureUnit _transmittanceTableTextureUnit;
     ghoul::opengl::TextureUnit _irradianceTableTextureUnit;
diff --git a/modules/base/rendering/pointcloud/renderablepointcloud.cpp b/modules/base/rendering/pointcloud/renderablepointcloud.cpp
index 3b31642379..d15a2486a5 100644
--- a/modules/base/rendering/pointcloud/renderablepointcloud.cpp
+++ b/modules/base/rendering/pointcloud/renderablepointcloud.cpp
@@ -58,18 +58,6 @@
 namespace {
     constexpr std::string_view _loggerCat = "RenderablePointCloud";
 
-    constexpr std::array<const char*, 37> UniformNames = {
-        "cameraViewMatrix", "projectionMatrix", "modelMatrix", "cameraPosition",
-        "cameraLookUp", "renderOption", "maxAngularSize", "color", "opacity",
-        "scaleExponent", "scaleFactor", "up", "right", "fadeInValue", "hasSpriteTexture",
-        "spriteTexture", "useColorMap", "colorMapTexture", "cmapRangeMin", "cmapRangeMax",
-        "nanColor", "useNanColor", "hideOutsideRange", "enableMaxSizeControl",
-        "aboveRangeColor", "useAboveRangeColor", "belowRangeColor", "useBelowRangeColor",
-        "hasDvarScaling", "dvarScaleFactor", "enableOutline", "outlineColor",
-        "outlineWeight", "outlineStyle", "useCmapOutline", "aspectRatioScale",
-        "useOrientationData"
-    };
-
     enum RenderOption {
         ViewDirection = 0,
         PositionNormal,
@@ -899,7 +887,7 @@ void RenderablePointCloud::initializeGL() {
 
     initializeShadersAndGlExtras();
 
-    ghoul::opengl::updateUniformLocations(*_program, _uniformCache, UniformNames);
+    ghoul::opengl::updateUniformLocations(*_program, _uniformCache);
 
     if (_hasSpriteTexture) {
         switch (_textureMode) {
@@ -1214,9 +1202,9 @@ void RenderablePointCloud::renderPoints(const RenderData& data,
 
     _program->activate();
 
-    _program->setUniform(_uniformCache.cameraPos, data.camera.positionVec3());
+    _program->setUniform(_uniformCache.cameraPosition, data.camera.positionVec3());
     _program->setUniform(
-        _uniformCache.cameraLookup,
+        _uniformCache.cameraLookUp,
         glm::vec3(data.camera.lookUpVectorWorldSpace())
     );
     _program->setUniform(_uniformCache.renderOption, _renderOption.value());
@@ -1269,7 +1257,7 @@ void RenderablePointCloud::renderPoints(const RenderData& data,
     bool useColorMap = hasColorData() && _colorSettings.colorMapping->enabled &&
         _colorSettings.colorMapping->texture();
 
-    _program->setUniform(_uniformCache.useColormap, useColorMap);
+    _program->setUniform(_uniformCache.useColorMap, useColorMap);
 
     ghoul::opengl::TextureUnit colorMapTextureUnit;
     _program->setUniform(_uniformCache.colorMapTexture, colorMapTextureUnit);
diff --git a/modules/base/rendering/pointcloud/renderablepointcloud.h b/modules/base/rendering/pointcloud/renderablepointcloud.h
index d0aed60b73..ed29d153cf 100644
--- a/modules/base/rendering/pointcloud/renderablepointcloud.h
+++ b/modules/base/rendering/pointcloud/renderablepointcloud.h
@@ -227,9 +227,9 @@ protected:
     ghoul::opengl::ProgramObject* _program = nullptr;
 
     UniformCache(
-        cameraViewMatrix, projectionMatrix, modelMatrix, cameraPos, cameraLookup,
+        cameraViewMatrix, projectionMatrix, modelMatrix, cameraPosition, cameraLookUp,
         renderOption, maxAngularSize, color, opacity, scaleExponent, scaleFactor, up,
-        right, fadeInValue, hasSpriteTexture, spriteTexture, useColormap, colorMapTexture,
+        right, fadeInValue, hasSpriteTexture, spriteTexture, useColorMap, colorMapTexture,
         cmapRangeMin, cmapRangeMax, nanColor, useNanColor, hideOutsideRange,
         enableMaxSizeControl, aboveRangeColor, useAboveRangeColor, belowRangeColor,
         useBelowRangeColor, hasDvarScaling, dvarScaleFactor, enableOutline, outlineColor,
diff --git a/modules/base/rendering/renderabledisc.cpp b/modules/base/rendering/renderabledisc.cpp
index dfbce826f2..92f72d6dd9 100644
--- a/modules/base/rendering/renderabledisc.cpp
+++ b/modules/base/rendering/renderabledisc.cpp
@@ -150,7 +150,7 @@ void RenderableDisc::render(const RenderData& data, RendererTasks&) {
         calcModelViewProjectionTransform(data);
 
     _shader->setUniform(
-        _uniformCache.modelViewProjection,
+        _uniformCache.modelViewProjectionTransform,
         glm::mat4(modelViewProjectionTransform)
     );
     _shader->setUniform(_uniformCache.width, _width);
@@ -159,7 +159,7 @@ void RenderableDisc::render(const RenderData& data, RendererTasks&) {
     ghoul::opengl::TextureUnit unit;
     unit.activate();
     _texture->bind();
-    _shader->setUniform(_uniformCache.texture, unit);
+    _shader->setUniform(_uniformCache.colorTexture, unit);
 
     glEnablei(GL_BLEND, 0);
     glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
diff --git a/modules/base/rendering/renderabledisc.h b/modules/base/rendering/renderabledisc.h
index 3c0d51b5e1..ef970ae4d5 100644
--- a/modules/base/rendering/renderabledisc.h
+++ b/modules/base/rendering/renderabledisc.h
@@ -71,7 +71,8 @@ protected:
     std::unique_ptr<TextureComponent> _texture;
 
 private:
-    UniformCache(modelViewProjection, opacity, width, texture) _uniformCache;
+    UniformCache(modelViewProjectionTransform, opacity, width,
+        colorTexture) _uniformCache;
 
     bool _planeIsDirty = false;
 };
diff --git a/modules/base/rendering/renderablemodel.cpp b/modules/base/rendering/renderablemodel.cpp
index 96a8d3452e..4c74a7edc5 100644
--- a/modules/base/rendering/renderablemodel.cpp
+++ b/modules/base/rendering/renderablemodel.cpp
@@ -69,20 +69,6 @@ namespace {
 
     constexpr glm::vec4 PosBufferClearVal = glm::vec4(1e32, 1e32, 1e32, 1.f);
 
-    constexpr std::array<const char*, 26> UniformNames = {
-        "modelViewTransform", "projectionTransform", "normalTransform", "meshTransform",
-        "meshNormalTransform", "ambientIntensity", "diffuseIntensity",
-        "specularIntensity", "performShading", "use_forced_color", "has_texture_diffuse",
-        "has_texture_normal", "has_texture_specular", "has_color_specular",
-        "texture_diffuse", "texture_normal", "texture_specular", "color_diffuse",
-        "color_specular", "opacity", "nLightSources", "lightDirectionsViewSpace",
-        "lightIntensities", "performManualDepthTest", "gBufferDepthTexture", "resolution"
-    };
-
-    constexpr std::array<const char*, 5> UniformOpacityNames = {
-        "opacity", "colorTexture", "depthTexture", "viewport", "resolution"
-    };
-
     constexpr openspace::properties::Property::PropertyInfo EnableAnimationInfo = {
         "EnableAnimation",
         "Enable Animation",
@@ -617,7 +603,7 @@ void RenderableModel::initializeGL() {
         ghoul::opengl::ProgramObject::IgnoreError::Yes
     );
 
-    ghoul::opengl::updateUniformLocations(*_program, _uniformCache, UniformNames);
+    ghoul::opengl::updateUniformLocations(*_program, _uniformCache);
 
     _quadProgram = BaseModule::ProgramObjectManager.request(
         "ModelOpacityProgram",
@@ -627,18 +613,13 @@ void RenderableModel::initializeGL() {
             const std::filesystem::path fs =
                 absPath("${MODULE_BASE}/shaders/modelOpacity_fs.glsl");
 
-            return global::renderEngine->buildRenderProgram(
-                "ModelOpacityProgram",
+            return global::renderEngine->buildRenderProgram("ModelOpacityProgram",
                 vs,
                 fs
             );
         }
     );
-    ghoul::opengl::updateUniformLocations(
-        *_quadProgram,
-        _uniformOpacityCache,
-        UniformOpacityNames
-    );
+    ghoul::opengl::updateUniformLocations(*_quadProgram, _uniformOpacityCache);
 
     // Screen quad VAO
     constexpr std::array<GLfloat, 24> QuadVtx = {
@@ -1016,16 +997,12 @@ void RenderableModel::render(const RenderData& data, RendererTasks&) {
 void RenderableModel::update(const UpdateData& data) {
     if (_program->isDirty()) {
         _program->rebuildFromFile();
-        ghoul::opengl::updateUniformLocations(*_program, _uniformCache, UniformNames);
+        ghoul::opengl::updateUniformLocations(*_program, _uniformCache);
     }
 
     if (_quadProgram->isDirty()) {
         _quadProgram->rebuildFromFile();
-        ghoul::opengl::updateUniformLocations(
-            *_quadProgram,
-            _uniformOpacityCache,
-            UniformOpacityNames
-        );
+        ghoul::opengl::updateUniformLocations(*_quadProgram, _uniformOpacityCache);
     }
 
     if (!hasOverrideRenderBin()) {
diff --git a/modules/base/rendering/renderableplane.cpp b/modules/base/rendering/renderableplane.cpp
index e11bc64a24..0903fdb943 100644
--- a/modules/base/rendering/renderableplane.cpp
+++ b/modules/base/rendering/renderableplane.cpp
@@ -41,11 +41,6 @@
 #include <variant>
 
 namespace {
-    constexpr std::array<const char*, 6> UniformNames = {
-        "modelViewProjection", "modelViewTransform", "colorTexture", "opacity",
-        "mirrorBackside", "multiplyColor"
-    };
-
     enum BlendMode {
         Normal = 0,
         Additive
@@ -214,7 +209,7 @@ void RenderablePlane::initializeGL() {
         }
     );
 
-    ghoul::opengl::updateUniformLocations(*_shader, _uniformCache, UniformNames);
+    ghoul::opengl::updateUniformLocations(*_shader, _uniformCache);
 }
 
 void RenderablePlane::deinitializeGL() {
@@ -310,7 +305,7 @@ void RenderablePlane::update(const UpdateData&) {
 
     if (_shader->isDirty()) {
         _shader->rebuildFromFile();
-        ghoul::opengl::updateUniformLocations(*_shader, _uniformCache, UniformNames);
+        ghoul::opengl::updateUniformLocations(*_shader, _uniformCache);
     }
 
     if (_planeIsDirty) {
diff --git a/modules/base/rendering/renderableprism.cpp b/modules/base/rendering/renderableprism.cpp
index a03209fcc0..c33a174030 100644
--- a/modules/base/rendering/renderableprism.cpp
+++ b/modules/base/rendering/renderableprism.cpp
@@ -37,10 +37,6 @@
 #include <optional>
 
 namespace {
-    constexpr std::array<const char*, 2> UniformNames = {
-        "modelViewProjectionTransform", "vs_color"
-    };
-
     constexpr openspace::properties::Property::PropertyInfo SegmentsInfo = {
         "Segments",
         "Segments",
@@ -183,7 +179,7 @@ void RenderablePrism::initializeGL() {
         absPath("${MODULE_BASE}/shaders/prism_vs.glsl"),
         absPath("${MODULE_BASE}/shaders/prism_fs.glsl")
     );
-    ghoul::opengl::updateUniformLocations(*_shader, _uniformCache, UniformNames);
+    ghoul::opengl::updateUniformLocations(*_shader, _uniformCache);
 
     glGenVertexArrays(1, &_vaoId);
     glGenBuffers(1, &_vboId);
@@ -326,7 +322,7 @@ void RenderablePrism::render(const RenderData& data, RendererTasks&) {
 
     // Uniforms
     _shader->setUniform(
-        _uniformCache.modelViewProjection,
+        _uniformCache.modelViewProjectionTransform,
         glm::mat4(modelViewProjectionTransform)
     );
     _shader->setUniform(_uniformCache.color, glm::vec4(_lineColor.value(), opacity()));
@@ -354,7 +350,7 @@ void RenderablePrism::render(const RenderData& data, RendererTasks&) {
 void RenderablePrism::update(const UpdateData& data) {
     if (_shader->isDirty()) {
         _shader->rebuildFromFile();
-        ghoul::opengl::updateUniformLocations(*_shader, _uniformCache, UniformNames);
+        ghoul::opengl::updateUniformLocations(*_shader, _uniformCache);
     }
     if (_prismIsDirty) {
         updateVertexData();
diff --git a/modules/base/rendering/renderableprism.h b/modules/base/rendering/renderableprism.h
index 79afeb5568..3e49f264ef 100644
--- a/modules/base/rendering/renderableprism.h
+++ b/modules/base/rendering/renderableprism.h
@@ -67,7 +67,7 @@ private:
     properties::FloatProperty _lineWidth;
     properties::Vec3Property _lineColor;
     properties::FloatProperty _length;
-    UniformCache(modelViewProjection, color) _uniformCache;
+    UniformCache(modelViewProjectionTransform, color) _uniformCache;
 
     std::unique_ptr<ghoul::opengl::ProgramObject> _shader;
     GLuint _vaoId = 0;
diff --git a/modules/base/rendering/renderablesphere.cpp b/modules/base/rendering/renderablesphere.cpp
index efd1678d9b..96dccbe7c7 100644
--- a/modules/base/rendering/renderablesphere.cpp
+++ b/modules/base/rendering/renderablesphere.cpp
@@ -40,11 +40,6 @@
 #include <optional>
 
 namespace {
-    constexpr std::array<const char*, 6> UniformNames = {
-        "opacity", "modelViewProjection", "modelViewTransform", "modelViewRotation",
-        "colorTexture", "mirrorTexture"
-    };
-
     constexpr openspace::properties::Property::PropertyInfo SizeInfo = {
         "Size",
         "Size (in meters)",
@@ -215,7 +210,7 @@ void RenderableSphere::initializeGL() {
         }
     );
 
-    ghoul::opengl::updateUniformLocations(*_shader, _uniformCache, UniformNames);
+    ghoul::opengl::updateUniformLocations(*_shader, _uniformCache);
 }
 
 void RenderableSphere::deinitializeGL() {
@@ -363,7 +358,7 @@ void RenderableSphere::render(const RenderData& data, RendererTasks&) {
 void RenderableSphere::update(const UpdateData&) {
     if (_shader->isDirty()) {
         _shader->rebuildFromFile();
-        ghoul::opengl::updateUniformLocations(*_shader, _uniformCache, UniformNames);
+        ghoul::opengl::updateUniformLocations(*_shader, _uniformCache);
     }
 
     if (_sphereIsDirty) {
diff --git a/modules/base/rendering/renderabletrail.cpp b/modules/base/rendering/renderabletrail.cpp
index 3d0fe8551e..e1a57ee6db 100644
--- a/modules/base/rendering/renderabletrail.cpp
+++ b/modules/base/rendering/renderabletrail.cpp
@@ -313,7 +313,7 @@ void RenderableTrail::internalRender(bool renderLines, bool renderPoints,
     // is necessary as they are usually far away from their reference
     const glm::dmat4 modelViewTransform = calcModelViewTransform(data, modelTransform);
     _programObject->setUniform(
-        _uniformCache.modelView,
+        _uniformCache.modelViewTransform,
         modelViewTransform * info._localTransform
     );
 
@@ -327,7 +327,7 @@ void RenderableTrail::internalRender(bool renderLines, bool renderPoints,
     }(info.sorting);
 
     // The vertex sorting method is used to tweak the fading along the trajectory
-    _programObject->setUniform(_uniformCache.vertexSorting, sorting);
+    _programObject->setUniform(_uniformCache.vertexSortingMethod, sorting);
 
     // This value is subtracted from the vertex id in the case of a potential ring
     // buffer (as used in RenderableTrailOrbit) to keep the first vertex at its
@@ -418,7 +418,10 @@ void RenderableTrail::render(const RenderData& data, RendererTasks&) {
 
     const glm::dmat4 modelTransform = calcModelTransform(data);
 
-    _programObject->setUniform(_uniformCache.projection, data.camera.projectionMatrix());
+    _programObject->setUniform(
+        _uniformCache.projectionTransform,
+        data.camera.projectionMatrix()
+    );
 
     _programObject->setUniform(_uniformCache.color, _appearance.lineColor);
     _programObject->setUniform(_uniformCache.useLineFade, _appearance.useLineFade);
diff --git a/modules/base/rendering/renderabletrail.h b/modules/base/rendering/renderabletrail.h
index ca9bbdba50..525e8d9cfb 100644
--- a/modules/base/rendering/renderabletrail.h
+++ b/modules/base/rendering/renderabletrail.h
@@ -193,14 +193,15 @@ private:
     /// Program object used to render the data stored in RenderInformation
     ghoul::opengl::ProgramObject* _programObject = nullptr;
 #ifdef __APPLE__
-    UniformCache(opacity, modelView, projection, color, useLineFade, lineLength,
-        lineFadeAmount, vertexSorting, idOffset, nVertices, stride, pointSize,
-        renderPhase, useSplitRenderMode, floatingOffset, numberOfUniqueVertices
+    UniformCache(opacity, modelViewTransform, projectionTransform, color, useLineFade,
+        lineLength, lineFadeAmount, vertexSortingMethod, idOffset, nVertices, stride,
+        pointSize, renderPhase, useSplitRenderMode, floatingOffset, numberOfUniqueVertices
     ) _uniformCache; 
 #else
-    UniformCache(opacity, modelView, projection, color, useLineFade, lineLength,
-        lineFadeAmount, vertexSorting, idOffset, nVertices, stride, pointSize, renderPhase, 
-        viewport, lineWidth, floatingOffset, useSplitRenderMode, numberOfUniqueVertices
+    UniformCache(opacity, modelViewTransform, projectionTransform, color, useLineFade,
+        lineLength, lineFadeAmount, vertexSortingMethod, idOffset, nVertices, stride,
+        pointSize, renderPhase, viewport, lineWidth, floatingOffset, useSplitRenderMode,
+        numberOfUniqueVertices
     ) _uniformCache;
 #endif
 };
diff --git a/modules/base/shaders/prism_fs.glsl b/modules/base/shaders/prism_fs.glsl
index 81445ccb3f..149a8e92fe 100644
--- a/modules/base/shaders/prism_fs.glsl
+++ b/modules/base/shaders/prism_fs.glsl
@@ -26,12 +26,12 @@
 
 in float vs_depth;
 
-uniform vec4 vs_color;
+uniform vec4 color;
 
 
 Fragment getFragment() {
   Fragment frag;
-  frag.color = vs_color;
+  frag.color = color;
   frag.depth = vs_depth;
   return frag;
 }
diff --git a/modules/digitaluniverse/rendering/renderabledumeshes.cpp b/modules/digitaluniverse/rendering/renderabledumeshes.cpp
index a933ccb66e..7be2a91f8b 100644
--- a/modules/digitaluniverse/rendering/renderabledumeshes.cpp
+++ b/modules/digitaluniverse/rendering/renderabledumeshes.cpp
@@ -52,10 +52,6 @@
 namespace {
     constexpr std::string_view _loggerCat = "RenderableDUMeshes";
 
-    constexpr std::array<const char*, 4> UniformNames = {
-        "modelViewTransform", "projectionTransform", "alphaValue", "color"
-    };
-
     constexpr int RenderOptionViewDirection = 0;
     constexpr int RenderOptionPositionNormal = 1;
 
@@ -283,7 +279,7 @@ void RenderableDUMeshes::initializeGL() {
         }
     );
 
-    ghoul::opengl::updateUniformLocations(*_program, _uniformCache, UniformNames);
+    ghoul::opengl::updateUniformLocations(*_program, _uniformCache);
 
     createMeshes();
 
@@ -440,7 +436,7 @@ void RenderableDUMeshes::render(const RenderData& data, RendererTasks&) {
 void RenderableDUMeshes::update(const UpdateData&) {
     if (_program->isDirty()) {
         _program->rebuildFromFile();
-        ghoul::opengl::updateUniformLocations(*_program, _uniformCache, UniformNames);
+        ghoul::opengl::updateUniformLocations(*_program, _uniformCache);
     }
 }
 
diff --git a/modules/exoplanets/rendering/renderableorbitdisc.cpp b/modules/exoplanets/rendering/renderableorbitdisc.cpp
index 5e81661183..a9002f0270 100644
--- a/modules/exoplanets/rendering/renderableorbitdisc.cpp
+++ b/modules/exoplanets/rendering/renderableorbitdisc.cpp
@@ -40,11 +40,6 @@
 #include <optional>
 
 namespace {
-    constexpr std::array<const char*, 7> UniformNames = {
-        "modelViewProjectionTransform", "offset", "opacity",
-        "discTexture", "eccentricity", "semiMajorAxis", "multiplyColor"
-    };
-
     constexpr openspace::properties::Property::PropertyInfo TextureInfo = {
         "Texture",
         "Texture",
@@ -164,7 +159,7 @@ void RenderableOrbitDisc::initializeGL() {
         absPath("${BASE}/modules/exoplanets/shaders/orbitdisc_fs.glsl")
     );
 
-    ghoul::opengl::updateUniformLocations(*_shader, _uniformCache, UniformNames);
+    ghoul::opengl::updateUniformLocations(*_shader, _uniformCache);
 
     _texture->loadFromFile(_texturePath.value());
     _texture->uploadToGpu();
@@ -185,7 +180,7 @@ void RenderableOrbitDisc::render(const RenderData& data, RendererTasks&) {
     _shader->activate();
 
     _shader->setUniform(
-        _uniformCache.modelViewProjection,
+        _uniformCache.modelViewProjectionTransform,
         glm::mat4(calcModelViewProjectionTransform(data))
     );
     _shader->setUniform(_uniformCache.offset, _offset);
@@ -197,7 +192,7 @@ void RenderableOrbitDisc::render(const RenderData& data, RendererTasks&) {
     ghoul::opengl::TextureUnit unit;
     unit.activate();
     _texture->bind();
-    _shader->setUniform(_uniformCache.texture, unit);
+    _shader->setUniform(_uniformCache.discTexture, unit);
 
     glEnablei(GL_BLEND, 0);
     glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
@@ -217,7 +212,7 @@ void RenderableOrbitDisc::render(const RenderData& data, RendererTasks&) {
 void RenderableOrbitDisc::update(const UpdateData&) {
     if (_shader->isDirty()) {
         _shader->rebuildFromFile();
-        ghoul::opengl::updateUniformLocations(*_shader, _uniformCache, UniformNames);
+        ghoul::opengl::updateUniformLocations(*_shader, _uniformCache);
     }
 
     if (_planeIsDirty) {
diff --git a/modules/exoplanets/rendering/renderableorbitdisc.h b/modules/exoplanets/rendering/renderableorbitdisc.h
index b615079bfa..796cb5f8a2 100644
--- a/modules/exoplanets/rendering/renderableorbitdisc.h
+++ b/modules/exoplanets/rendering/renderableorbitdisc.h
@@ -70,7 +70,7 @@ private:
     properties::Vec3Property _multiplyColor;
 
     std::unique_ptr<ghoul::opengl::ProgramObject> _shader = nullptr;
-    UniformCache(modelViewProjection, offset, opacity, texture,
+    UniformCache(modelViewProjectionTransform, offset, opacity, discTexture,
         eccentricity, semiMajorAxis, multiplyColor) _uniformCache;
 
     std::unique_ptr<PlaneGeometry> _plane;
diff --git a/modules/galaxy/rendering/renderablegalaxy.cpp b/modules/galaxy/rendering/renderablegalaxy.cpp
index 0e53203d10..13b8fd6e75 100644
--- a/modules/galaxy/rendering/renderablegalaxy.cpp
+++ b/modules/galaxy/rendering/renderablegalaxy.cpp
@@ -64,16 +64,6 @@ namespace {
         Billboards
     };
 
-    constexpr std::array<const char*, 4> UniformNamesPoints = {
-        "modelMatrix", "viewProjectionMatrix", "eyePosition",
-        "opacityCoefficient"
-    };
-
-    constexpr std::array<const char*, 5> UniformNamesBillboards = {
-        "modelMatrix", "viewProjectionMatrix",
-        "cameraUp", "eyePosition", "psfTexture"
-    };
-
     constexpr openspace::properties::Property::PropertyInfo VolumeRenderingEnabledInfo = {
         "VolumeRenderingEnabled",
         "Volume Rendering",
@@ -471,16 +461,8 @@ void RenderableGalaxy::initializeGL() {
         );
     }
 
-    ghoul::opengl::updateUniformLocations(
-        *_pointsProgram,
-        _uniformCachePoints,
-        UniformNamesPoints
-    );
-    ghoul::opengl::updateUniformLocations(
-        *_billboardsProgram,
-        _uniformCacheBillboards,
-        UniformNamesBillboards
-    );
+    ghoul::opengl::updateUniformLocations(*_pointsProgram, _uniformCachePoints);
+    ghoul::opengl::updateUniformLocations(*_billboardsProgram, _uniformCacheBillboards);
 
     glGenVertexArrays(1, &_pointsVao);
     glGenBuffers(1, &_positionVbo);
@@ -647,7 +629,7 @@ void RenderableGalaxy::renderPoints(const RenderData& data) {
 
     _pointsProgram->setUniform(_uniformCachePoints.modelMatrix, modelTransform);
     _pointsProgram->setUniform(
-        _uniformCachePoints.cameraViewProjectionMatrix,
+        _uniformCachePoints.viewProjectionMatrix,
         cameraViewProjectionMatrix
     );
 
@@ -698,7 +680,7 @@ void RenderableGalaxy::renderBillboards(const RenderData& data) {
 
     _billboardsProgram->setUniform(_uniformCacheBillboards.modelMatrix, modelTransform);
     _billboardsProgram->setUniform(
-        _uniformCacheBillboards.cameraViewProjectionMatrix,
+        _uniformCacheBillboards.viewProjectionMatrix,
         cameraViewProjectionMatrix
     );
 
diff --git a/modules/galaxy/rendering/renderablegalaxy.h b/modules/galaxy/rendering/renderablegalaxy.h
index 39639363b9..c1a9390a86 100644
--- a/modules/galaxy/rendering/renderablegalaxy.h
+++ b/modules/galaxy/rendering/renderablegalaxy.h
@@ -101,12 +101,10 @@ private:
     std::unique_ptr<ghoul::opengl::ProgramObject> _pointsProgram;
     std::unique_ptr<ghoul::opengl::ProgramObject> _billboardsProgram;
     UniformCache(
-        modelMatrix, cameraViewProjectionMatrix, eyePosition,
-        opacityCoefficient
+        modelMatrix, viewProjectionMatrix, eyePosition, opacityCoefficient
     ) _uniformCachePoints;
     UniformCache(
-        modelMatrix, cameraViewProjectionMatrix,
-        cameraUp, eyePosition, psfTexture
+        modelMatrix, viewProjectionMatrix, cameraUp, eyePosition, psfTexture
     ) _uniformCacheBillboards;
     std::vector<float> _pointsData;
     size_t _nPoints = 0;
diff --git a/modules/globebrowsing/src/renderableglobe.cpp b/modules/globebrowsing/src/renderableglobe.cpp
index 2845affd15..da6615d4d5 100644
--- a/modules/globebrowsing/src/renderableglobe.cpp
+++ b/modules/globebrowsing/src/renderableglobe.cpp
@@ -929,8 +929,7 @@ void RenderableGlobe::update(const UpdateData& data) {
 
         ghoul::opengl::updateUniformLocations(
             *_localRenderer.program,
-            _localRenderer.uniformCache,
-            { "skirtLength", "p01", "p11", "p00", "p10", "patchNormalCameraSpace" }
+            _localRenderer.uniformCache
         );
     }
 
@@ -947,8 +946,7 @@ void RenderableGlobe::update(const UpdateData& data) {
 
         ghoul::opengl::updateUniformLocations(
             *_globalRenderer.program,
-            _globalRenderer.uniformCache,
-            { "skirtLength", "minLatLon", "lonLatScalingFactor" }
+            _globalRenderer.uniformCache
         );
     }
 
@@ -1866,8 +1864,7 @@ void RenderableGlobe::recompileShaders() {
 
     ghoul::opengl::updateUniformLocations(
         *_localRenderer.program,
-        _localRenderer.uniformCache,
-        { "skirtLength", "p01", "p11", "p00", "p10", "patchNormalCameraSpace" }
+        _localRenderer.uniformCache
     );
 
 
@@ -1893,8 +1890,7 @@ void RenderableGlobe::recompileShaders() {
 
     ghoul::opengl::updateUniformLocations(
         *_globalRenderer.program,
-        _globalRenderer.uniformCache,
-        { "skirtLength", "minLatLon", "lonLatScalingFactor" }
+        _globalRenderer.uniformCache
     );
 
     _globalRenderer.updatedSinceLastCall = true;
diff --git a/modules/globebrowsing/src/ringscomponent.cpp b/modules/globebrowsing/src/ringscomponent.cpp
index 846f134121..c075f1dec0 100644
--- a/modules/globebrowsing/src/ringscomponent.cpp
+++ b/modules/globebrowsing/src/ringscomponent.cpp
@@ -53,24 +53,6 @@
 namespace {
     constexpr std::string_view _loggerCat = "RingsComponent";
 
-    constexpr std::array<const char*, 10> UniformNames = {
-        "modelViewProjectionMatrix", "textureOffset", "colorFilterValue", "nightFactor",
-        "sunPosition", "ringTexture", "shadowMatrix", "shadowMapTexture",
-        "zFightingPercentage", "opacity"
-    };
-
-    constexpr std::array<const char*, 16> UniformNamesAdvancedRings = {
-        "modelViewProjectionMatrix", "textureOffset", "colorFilterValue", "nightFactor",
-        "sunPosition", "sunPositionObj", "camPositionObj", "ringTextureFwrd",
-        "ringTextureBckwrd", "ringTextureUnlit", "ringTextureColor",
-        "ringTextureTransparency", "shadowMatrix", "shadowMapTexture",
-        "zFightingPercentage", "opacity"
-    };
-
-    constexpr std::array<const char*, 3> GeomUniformNames = {
-        "modelViewProjectionMatrix", "textureOffset", "ringTexture"
-    };
-
     constexpr openspace::properties::Property::PropertyInfo EnabledInfo = {
         "Enabled",
         "Enabled",
@@ -370,11 +352,7 @@ void RingsComponent::initializeGL() {
             absPath("${MODULE_GLOBEBROWSING}/shaders/rings_geom_fs.glsl")
         );
 
-        ghoul::opengl::updateUniformLocations(
-            *_geometryOnlyShader,
-            _geomUniformCache,
-            GeomUniformNames
-        );
+        ghoul::opengl::updateUniformLocations(*_geometryOnlyShader, _geomUniformCache);
     }
     catch (const ghoul::RuntimeError& e) {
         LERROR(e.message);
@@ -502,7 +480,7 @@ void RingsComponent::draw(const RenderData& data, RenderPass renderPass,
                 _uniformCacheAdvancedRings.ringTextureTransparency,
                 ringTextureTransparencyUnit
             );
-            _shader->setUniform(_uniformCacheAdvancedRings.opacityValue, opacity());
+            _shader->setUniform(_uniformCacheAdvancedRings.opacity, opacity());
 
             // Adding the model transformation to the final shadow matrix so we have a
             // complete transformation from the model coordinates to the clip space of
@@ -552,7 +530,7 @@ void RingsComponent::draw(const RenderData& data, RenderPass renderPass,
                 _uniformCache.modelViewProjectionMatrix,
                 modelViewProjectionTransform
             );
-            _shader->setUniform(_uniformCache.opacityValue, opacity());
+            _shader->setUniform(_uniformCache.opacity, opacity());
 
             ringTextureUnit.activate();
             _texture->bind();
@@ -620,11 +598,7 @@ void RingsComponent::update(const UpdateData& data) {
 
     if (_geometryOnlyShader->isDirty()) {
         _geometryOnlyShader->rebuildFromFile();
-        ghoul::opengl::updateUniformLocations(
-            *_geometryOnlyShader,
-            _geomUniformCache,
-            GeomUniformNames
-        );
+        ghoul::opengl::updateUniformLocations(*_geometryOnlyShader, _geomUniformCache);
     }
 
     if (_planeIsDirty) {
@@ -853,7 +827,7 @@ void RingsComponent::compileShadowShader() {
         //     dict
         // );
 
-        // ghoul::opengl::updateUniformLocations(*_shader, _uniformCache, UniformNames);
+        // ghoul::opengl::updateUniformLocations(*_shader, _uniformCache);
 
         // Uses multiple textures for the Rings
         // See https://bjj.mmedia.is/data/s_rings/index.html for theory behind it
@@ -865,11 +839,7 @@ void RingsComponent::compileShadowShader() {
                 dict
             );
 
-            ghoul::opengl::updateUniformLocations(
-                *_shader,
-                _uniformCacheAdvancedRings,
-                UniformNamesAdvancedRings
-            );
+            ghoul::opengl::updateUniformLocations(*_shader, _uniformCacheAdvancedRings);
         }
         else {
             // Uses simple texture for the Rings
@@ -880,7 +850,7 @@ void RingsComponent::compileShadowShader() {
                 dict
             );
 
-            ghoul::opengl::updateUniformLocations(*_shader, _uniformCache, UniformNames);
+            ghoul::opengl::updateUniformLocations(*_shader, _uniformCache);
         }
     }
     catch (const ghoul::RuntimeError& e) {
diff --git a/modules/globebrowsing/src/ringscomponent.h b/modules/globebrowsing/src/ringscomponent.h
index 79589aeb82..2ec5de4801 100644
--- a/modules/globebrowsing/src/ringscomponent.h
+++ b/modules/globebrowsing/src/ringscomponent.h
@@ -97,15 +97,15 @@ private:
     std::unique_ptr<ghoul::opengl::ProgramObject> _geometryOnlyShader;
     UniformCache(modelViewProjectionMatrix, textureOffset, colorFilterValue, nightFactor,
         sunPosition, ringTexture, shadowMatrix, shadowMapTexture, zFightingPercentage,
-        opacityValue
+        opacity
     ) _uniformCache;
     UniformCache(modelViewProjectionMatrix, textureOffset, colorFilterValue, nightFactor,
         sunPosition, sunPositionObj, camPositionObj, ringTextureFwrd, ringTextureBckwrd,
         ringTextureUnlit, ringTextureColor, ringTextureTransparency, shadowMatrix,
-        shadowMapTexture, zFightingPercentage, opacityValue
+        shadowMapTexture, zFightingPercentage, opacity
     ) _uniformCacheAdvancedRings;
-    UniformCache(modelViewProjectionMatrix, textureOffset, ringTexture
-    ) _geomUniformCache;
+    UniformCache(modelViewProjectionMatrix, textureOffset, ringTexture) _geomUniformCache;
+
     std::unique_ptr<ghoul::opengl::Texture> _texture;
     std::unique_ptr<ghoul::opengl::Texture> _textureForwards;
     std::unique_ptr<ghoul::opengl::Texture> _textureBackwards;
diff --git a/modules/imgui/imguimodule.cpp b/modules/imgui/imguimodule.cpp
index 10073bb2ed..8031e560cf 100644
--- a/modules/imgui/imguimodule.cpp
+++ b/modules/imgui/imguimodule.cpp
@@ -50,8 +50,6 @@ namespace {
 
     ImFont* captionFont = nullptr;
 
-    constexpr std::array<const char*, 2> UniformNames = { "tex", "ortho" };
-
     constexpr openspace::properties::Property::PropertyInfo EnabledInfo = {
         "Enabled",
         "Enabled",
@@ -390,7 +388,7 @@ void ImGUIModule::internalInitializeGL() {
         absPath("${MODULE_IMGUI}/shaders/gui_fs.glsl")
     );
 
-    ghoul::opengl::updateUniformLocations(*_program, _uniformCache, UniformNames);
+    ghoul::opengl::updateUniformLocations(*_program, _uniformCache);
 
     {
         unsigned char* texData = nullptr;
@@ -499,7 +497,7 @@ void ImGUIModule::renderFrame(float deltaTime, const glm::vec2& windowSize,
 
     if (_program->isDirty()) {
         _program->rebuildFromFile();
-        ghoul::opengl::updateUniformLocations(*_program, _uniformCache, UniformNames);
+        ghoul::opengl::updateUniformLocations(*_program, _uniformCache);
     }
 
    //
diff --git a/modules/spacecraftinstruments/rendering/renderablefov.cpp b/modules/spacecraftinstruments/rendering/renderablefov.cpp
index 2c3dd74c80..7adda960af 100644
--- a/modules/spacecraftinstruments/rendering/renderablefov.cpp
+++ b/modules/spacecraftinstruments/rendering/renderablefov.cpp
@@ -38,12 +38,6 @@
 #include <optional>
 
 namespace {
-    constexpr std::array<const char*, 9> UniformNames = {
-        "modelViewProjectionTransform", "colorStart", "colorEnd",
-        "activeColor", "targetInFieldOfViewColor", "intersectionStartColor",
-        "intersectionEndColor", "squareColor", "interpolation"
-    };
-
     constexpr int InterpolationSteps = 5;
     constexpr double Epsilon = 1e-4;
 
@@ -286,7 +280,7 @@ void RenderableFov::initializeGL() {
         }
     );
 
-    ghoul::opengl::updateUniformLocations(*_program, _uniformCache, UniformNames);
+    ghoul::opengl::updateUniformLocations(*_program, _uniformCache);
 
     // Fetch information about the specific instrument
     SpiceManager::FieldOfViewResult res = SpiceManager::ref().fieldOfView(
@@ -766,10 +760,13 @@ void RenderableFov::render(const RenderData& data, RendererTasks&) {
     const glm::mat4 modelViewProjectionTransform =
         calcModelViewProjectionTransform(data);
 
-    _program->setUniform(_uniformCache.modelViewProjection, modelViewProjectionTransform);
+    _program->setUniform(
+        _uniformCache.modelViewProjectionTransform,
+        modelViewProjectionTransform
+    );
 
-    _program->setUniform(_uniformCache.defaultColorStart, _colors.defaultStart);
-    _program->setUniform(_uniformCache.defaultColorEnd, _colors.defaultEnd);
+    _program->setUniform(_uniformCache.colorStart, _colors.defaultStart);
+    _program->setUniform(_uniformCache.colorEnd, _colors.defaultEnd);
     _program->setUniform(_uniformCache.activeColor, _colors.active);
     _program->setUniform(
         _uniformCache.targetInFieldOfViewColor,
@@ -824,7 +821,7 @@ void RenderableFov::update(const UpdateData& data) {
 
     if (_program->isDirty()) {
         _program->rebuildFromFile();
-        ghoul::opengl::updateUniformLocations(*_program, _uniformCache, UniformNames);
+        ghoul::opengl::updateUniformLocations(*_program, _uniformCache);
     }
 }
 
diff --git a/modules/spacecraftinstruments/rendering/renderablefov.h b/modules/spacecraftinstruments/rendering/renderablefov.h
index c085bc9cc1..cabf63f940 100644
--- a/modules/spacecraftinstruments/rendering/renderablefov.h
+++ b/modules/spacecraftinstruments/rendering/renderablefov.h
@@ -81,9 +81,9 @@ private:
     properties::DoubleProperty _standOffDistance;
     properties::BoolProperty _alwaysDrawFov;
     ghoul::opengl::ProgramObject* _program = nullptr;
-    UniformCache(modelViewProjection, defaultColorStart, defaultColorEnd, activeColor,
-        targetInFieldOfViewColor, intersectionStartColor, intersectionEndColor,
-        squareColor, interpolation) _uniformCache;
+    UniformCache(modelViewProjectionTransform, colorStart, colorEnd,
+        activeColor, targetInFieldOfViewColor, intersectionStartColor,
+        intersectionEndColor, squareColor, interpolation) _uniformCache;
 
     bool _simplifyBounds = false;
 
diff --git a/modules/spacecraftinstruments/rendering/renderablemodelprojection.cpp b/modules/spacecraftinstruments/rendering/renderablemodelprojection.cpp
index 5b37ea0661..163842bd2c 100644
--- a/modules/spacecraftinstruments/rendering/renderablemodelprojection.cpp
+++ b/modules/spacecraftinstruments/rendering/renderablemodelprojection.cpp
@@ -39,20 +39,6 @@
 #include <ghoul/opengl/textureunit.h>
 
 namespace {
-    constexpr std::array<const char*, 7> MainUniformNames = {
-        "performShading", "directionToSunViewSpace", "modelViewTransform",
-        "projectionTransform", "projectionFading", "baseTexture", "projectionTexture"
-    };
-
-    constexpr std::array<const char*, 6> FboUniformNames = {
-        "projectionTexture", "depthTexture", "needShadowMap", "ProjectorMatrix",
-        "ModelTransform", "boresight"
-    };
-
-    constexpr std::array<const char*, 2> DepthFboUniformNames = {
-        "ProjectorMatrix", "ModelTransform"
-    };
-
     constexpr openspace::properties::Property::PropertyInfo PerformShadingInfo = {
         "PerformShading",
         "Perform Shading",
@@ -165,11 +151,7 @@ void RenderableModelProjection::initializeGL() {
         absPath("${MODULE_SPACECRAFTINSTRUMENTS}/shaders/renderableModel_fs.glsl")
     );
 
-    ghoul::opengl::updateUniformLocations(
-        *_programObject,
-        _mainUniformCache,
-        MainUniformNames
-    );
+    ghoul::opengl::updateUniformLocations(*_programObject, _mainUniformCache);
 
     _fboProgramObject = ghoul::opengl::ProgramObject::Build(
         "ProjectionPass",
@@ -181,11 +163,7 @@ void RenderableModelProjection::initializeGL() {
         )
     );
 
-    ghoul::opengl::updateUniformLocations(
-        *_fboProgramObject,
-        _fboUniformCache,
-        FboUniformNames
-    );
+    ghoul::opengl::updateUniformLocations(*_fboProgramObject, _fboUniformCache);
 
     _depthFboProgramObject = ghoul::opengl::ProgramObject::Build(
         "DepthPass",
@@ -193,11 +171,7 @@ void RenderableModelProjection::initializeGL() {
         absPath("${MODULE_SPACECRAFTINSTRUMENTS}/shaders/renderableModelDepth_fs.glsl")
     );
 
-    ghoul::opengl::updateUniformLocations(
-        *_depthFboProgramObject,
-        _depthFboUniformCache,
-        DepthFboUniformNames
-    );
+    ghoul::opengl::updateUniformLocations(*_depthFboProgramObject, _depthFboUniformCache);
 
     _projectionComponent.initializeGL();
 
@@ -309,21 +283,13 @@ void RenderableModelProjection::update(const UpdateData& data) {
     if (_programObject->isDirty()) {
         _programObject->rebuildFromFile();
 
-        ghoul::opengl::updateUniformLocations(
-            *_programObject,
-            _mainUniformCache,
-            MainUniformNames
-        );
+        ghoul::opengl::updateUniformLocations(*_programObject, _mainUniformCache);
     }
 
     if (_fboProgramObject->isDirty()) {
         _fboProgramObject->rebuildFromFile();
 
-        ghoul::opengl::updateUniformLocations(
-            *_fboProgramObject,
-            _fboUniformCache,
-            FboUniformNames
-        );
+        ghoul::opengl::updateUniformLocations(*_fboProgramObject, _fboUniformCache);
     }
 
     _projectionComponent.update();
@@ -333,8 +299,7 @@ void RenderableModelProjection::update(const UpdateData& data) {
 
         ghoul::opengl::updateUniformLocations(
             *_depthFboProgramObject,
-            _depthFboUniformCache,
-            DepthFboUniformNames
+            _depthFboUniformCache
         );
     }
 
diff --git a/modules/spacecraftinstruments/rendering/renderablemodelprojection.h b/modules/spacecraftinstruments/rendering/renderablemodelprojection.h
index 05cfb5a8db..5ef866bb5b 100644
--- a/modules/spacecraftinstruments/rendering/renderablemodelprojection.h
+++ b/modules/spacecraftinstruments/rendering/renderablemodelprojection.h
@@ -80,6 +80,7 @@ private:
     std::unique_ptr<ghoul::opengl::ProgramObject> _fboProgramObject;
     UniformCache(projectionTexture, depthTexture, needShadowMap, ProjectorMatrix,
         ModelTransform, boresight) _fboUniformCache;
+
     std::unique_ptr<ghoul::opengl::ProgramObject> _depthFboProgramObject;
     UniformCache(ProjectorMatrix, ModelTransform) _depthFboUniformCache;
 
diff --git a/modules/spacecraftinstruments/rendering/renderableplanetprojection.cpp b/modules/spacecraftinstruments/rendering/renderableplanetprojection.cpp
index 4ad3070d35..36aacb019a 100644
--- a/modules/spacecraftinstruments/rendering/renderableplanetprojection.cpp
+++ b/modules/spacecraftinstruments/rendering/renderableplanetprojection.cpp
@@ -39,17 +39,6 @@
 #include <ghoul/opengl/textureunit.h>
 
 namespace {
-    constexpr std::array<const char*, 12> MainUniformNames = {
-        "sun_pos", "modelTransform", "modelViewProjectionTransform", "hasBaseMap",
-        "hasHeightMap", "heightExaggeration", "meridianShift", "ambientBrightness",
-        "projectionFading", "baseTexture", "projectionTexture", "heightTexture"
-    };
-
-    constexpr std::array<const char*, 6> FboUniformNames = {
-        "projectionTexture", "ProjectorMatrix", "ModelTransform",
-        "boresight", "radius", "segments"
-    };
-
     constexpr std::string_view NoImageText = "No Image";
 
     constexpr openspace::properties::Property::PropertyInfo ColorTexturePathsInfo = {
@@ -318,11 +307,7 @@ void RenderablePlanetProjection::initializeGL() {
         }
     );
 
-    ghoul::opengl::updateUniformLocations(
-        *_programObject,
-        _mainUniformCache,
-        MainUniformNames
-    );
+    ghoul::opengl::updateUniformLocations(*_programObject, _mainUniformCache);
 
     _fboProgramObject = SpacecraftInstrumentsModule::ProgramObjectManager.request(
         "FBOPassProgram",
@@ -341,11 +326,7 @@ void RenderablePlanetProjection::initializeGL() {
         }
     );
 
-    ghoul::opengl::updateUniformLocations(
-        *_fboProgramObject,
-        _fboUniformCache,
-        FboUniformNames
-    );
+    ghoul::opengl::updateUniformLocations(*_fboProgramObject, _fboUniformCache);
 
     loadColorTexture();
     loadHeightTexture();
@@ -412,8 +393,8 @@ void RenderablePlanetProjection::imageProjectGPU(
     projectionTexture.bind();
     _fboProgramObject->setUniform(_fboUniformCache.projectionTexture, unitFbo);
 
-    _fboProgramObject->setUniform(_fboUniformCache.projectorMatrix, projectorMatrix);
-    _fboProgramObject->setUniform(_fboUniformCache.modelTransform, _transform);
+    _fboProgramObject->setUniform(_fboUniformCache.ProjectorMatrix, projectorMatrix);
+    _fboProgramObject->setUniform(_fboUniformCache.ModelTransform, _transform);
     _fboProgramObject->setUniform(_fboUniformCache.boresight, _boresight);
     _fboProgramObject->setUniform(_fboUniformCache.radius, _radius);
     _fboProgramObject->setUniform(_fboUniformCache.segments, _segments);
@@ -519,7 +500,7 @@ void RenderablePlanetProjection::render(const RenderData& data, RendererTasks&)
 
     // Main renderpass
     _programObject->activate();
-    _programObject->setUniform(_mainUniformCache.sunPos, static_cast<glm::vec3>(sunPos));
+    _programObject->setUniform(_mainUniformCache.sun_pos, static_cast<glm::vec3>(sunPos));
 
     // Model transform and view transform needs to be in double precision
     const glm::dmat4 modelTransform = calcModelTransform(data);
@@ -573,21 +554,13 @@ void RenderablePlanetProjection::update(const UpdateData& data) {
     if (_programObject->isDirty()) {
         _programObject->rebuildFromFile();
 
-        ghoul::opengl::updateUniformLocations(
-            *_programObject,
-            _mainUniformCache,
-            MainUniformNames
-        );
+        ghoul::opengl::updateUniformLocations(*_programObject, _mainUniformCache);
     }
 
     if (_fboProgramObject->isDirty()) {
         _fboProgramObject->rebuildFromFile();
 
-        ghoul::opengl::updateUniformLocations(
-            *_fboProgramObject,
-            _fboUniformCache,
-            FboUniformNames
-        );
+        ghoul::opengl::updateUniformLocations(*_fboProgramObject, _fboUniformCache);
     }
 
     if (_colorTextureDirty) {
diff --git a/modules/spacecraftinstruments/rendering/renderableplanetprojection.h b/modules/spacecraftinstruments/rendering/renderableplanetprojection.h
index 2fe44e2ac4..12fdfc7d6f 100644
--- a/modules/spacecraftinstruments/rendering/renderableplanetprojection.h
+++ b/modules/spacecraftinstruments/rendering/renderableplanetprojection.h
@@ -79,12 +79,12 @@ private:
 
     ghoul::opengl::ProgramObject* _programObject = nullptr;
     ghoul::opengl::ProgramObject* _fboProgramObject = nullptr;
-    UniformCache(sunPos, modelTransform, modelViewProjectionTransform, hasBaseMap,
+    UniformCache(sun_pos, modelTransform, modelViewProjectionTransform, hasBaseMap,
         hasHeightMap, heightExaggeration, meridianShift, ambientBrightness,
-        projectionFading, baseTexture, projectionTexture, heightTexture)
-        _mainUniformCache;
+        projectionFading, baseTexture, projectionTexture,
+        heightTexture) _mainUniformCache;
 
-    UniformCache(projectionTexture, projectorMatrix, modelTransform, boresight,
+    UniformCache(projectionTexture, ProjectorMatrix, ModelTransform, boresight,
         radius, segments) _fboUniformCache;
 
     std::unique_ptr<ghoul::opengl::Texture> _baseTexture;
diff --git a/modules/spacecraftinstruments/rendering/renderableshadowcylinder.cpp b/modules/spacecraftinstruments/rendering/renderableshadowcylinder.cpp
index 9eefa880d6..6c07db10d3 100644
--- a/modules/spacecraftinstruments/rendering/renderableshadowcylinder.cpp
+++ b/modules/spacecraftinstruments/rendering/renderableshadowcylinder.cpp
@@ -34,10 +34,6 @@
 #include <ghoul/filesystem/filesystem.h>
 
 namespace {
-    constexpr std::array<const char*, 3> UniformNames = {
-        "modelViewProjectionTransform", "shadowColor", "opacity"
-    };
-
     constexpr openspace::properties::Property::PropertyInfo NumberPointsInfo = {
         "AmountOfPoints",
         "Points",
@@ -229,7 +225,7 @@ void RenderableShadowCylinder::initializeGL() {
         }
     );
 
-    ghoul::opengl::updateUniformLocations(*_shader, _uniformCache, UniformNames);
+    ghoul::opengl::updateUniformLocations(*_shader, _uniformCache);
 }
 
 void RenderableShadowCylinder::deinitializeGL() {
@@ -285,7 +281,7 @@ void RenderableShadowCylinder::update(const UpdateData& data) {
 
     if (_shader->isDirty()) {
         _shader->rebuildFromFile();
-        ghoul::opengl::updateUniformLocations(*_shader, _uniformCache, UniformNames);
+        ghoul::opengl::updateUniformLocations(*_shader, _uniformCache);
     }
     createCylinder(data.time.j2000Seconds());
 }
diff --git a/modules/touch/src/touchmarker.cpp b/modules/touch/src/touchmarker.cpp
index 7d7e2d7912..5863efed3f 100644
--- a/modules/touch/src/touchmarker.cpp
+++ b/modules/touch/src/touchmarker.cpp
@@ -31,10 +31,6 @@
 #include <ghoul/opengl/programobject.h>
 
 namespace {
-    constexpr std::array<const char*, 4> UniformNames = {
-        "radius", "opacity", "thickness", "color"
-    };
-
     constexpr openspace::properties::Property::PropertyInfo VisibilityInfo = {
         "Visibility",
         "Toggle visibility of markers",
@@ -101,7 +97,7 @@ void TouchMarker::initialize() {
         absPath("${MODULE_TOUCH}/shaders/marker_fs.glsl")
     );
 
-    ghoul::opengl::updateUniformLocations(*_shader, _uniformCache, UniformNames);
+    ghoul::opengl::updateUniformLocations(*_shader, _uniformCache);
 }
 
 void TouchMarker::deinitialize() {
diff --git a/src/rendering/framebufferrenderer.cpp b/src/rendering/framebufferrenderer.cpp
index be3f1d9db3..e519330916 100644
--- a/src/rendering/framebufferrenderer.cpp
+++ b/src/rendering/framebufferrenderer.cpp
@@ -53,20 +53,6 @@ namespace {
 
     constexpr glm::vec4 PosBufferClearVal = glm::vec4(1e32, 1e32, 1e32, 1.f);
 
-    constexpr std::array<const char*, 9> HDRUniformNames = {
-        "hdrFeedingTexture", "blackoutFactor", "hdrExposure", "gamma",
-        "Hue", "Saturation", "Value", "Viewport", "Resolution"
-    };
-
-    constexpr std::array<const char*, 4> FXAAUniformNames = {
-        "renderedTexture", "inverseScreenSize", "Viewport", "Resolution"
-    };
-
-    constexpr std::array<const char*, 4> DownscaledVolumeUniformNames = {
-        "downscaledRenderedVolume", "downscaledRenderedVolumeDepth", "viewport",
-        "resolution"
-    };
-
     constexpr std::string_view ExitFragmentShaderPath =
         "${SHADERS}/framebuffer/exitframebuffer.frag";
     constexpr std::string_view RaycastFragmentShaderPath =
@@ -355,20 +341,11 @@ void FramebufferRenderer::initialize() {
     // Sets back to default FBO
     glBindFramebuffer(GL_FRAMEBUFFER, _defaultFBO);
 
-    ghoul::opengl::updateUniformLocations(
-        *_hdrFilteringProgram,
-        _hdrUniformCache,
-        HDRUniformNames
-    );
-    ghoul::opengl::updateUniformLocations(
-        *_fxaaProgram,
-        _fxaaUniformCache,
-        FXAAUniformNames
-    );
+    ghoul::opengl::updateUniformLocations(*_hdrFilteringProgram, _hdrUniformCache);
+    ghoul::opengl::updateUniformLocations(*_fxaaProgram, _fxaaUniformCache);
     ghoul::opengl::updateUniformLocations(
         *_downscaledVolumeProgram,
-        _writeDownscaledVolumeUniformCache,
-        DownscaledVolumeUniformNames
+        _writeDownscaledVolumeUniformCache
     );
 
     global::raycasterManager->addListener(*this);
@@ -625,21 +602,13 @@ void FramebufferRenderer::update() {
     if (_hdrFilteringProgram->isDirty()) {
         _hdrFilteringProgram->rebuildFromFile();
 
-        ghoul::opengl::updateUniformLocations(
-            *_hdrFilteringProgram,
-            _hdrUniformCache,
-            HDRUniformNames
-        );
+        ghoul::opengl::updateUniformLocations(*_hdrFilteringProgram, _hdrUniformCache);
     }
 
     if (_fxaaProgram->isDirty()) {
         _fxaaProgram->rebuildFromFile();
 
-        ghoul::opengl::updateUniformLocations(
-            *_fxaaProgram,
-            _fxaaUniformCache,
-            FXAAUniformNames
-        );
+        ghoul::opengl::updateUniformLocations(*_fxaaProgram, _fxaaUniformCache);
     }
 
     if (_downscaledVolumeProgram->isDirty()) {
@@ -647,8 +616,7 @@ void FramebufferRenderer::update() {
 
         ghoul::opengl::updateUniformLocations(
             *_downscaledVolumeProgram,
-            _writeDownscaledVolumeUniformCache,
-            DownscaledVolumeUniformNames
+            _writeDownscaledVolumeUniformCache
         );
     }
 
diff --git a/src/rendering/helper.cpp b/src/rendering/helper.cpp
index 817fab517f..56e1cea0c4 100644
--- a/src/rendering/helper.cpp
+++ b/src/rendering/helper.cpp
@@ -176,8 +176,7 @@ void initialize() {
     );
     ghoul::opengl::updateUniformLocations(
         *shaders.xyuvrgba.program,
-        shaders.xyuvrgba.cache,
-        { "tex", "hasTexture", "shouldFlipTexture", "proj", "color" }
+        shaders.xyuvrgba.cache
     );
 
     //
@@ -206,8 +205,7 @@ void initialize() {
     );
     ghoul::opengl::updateUniformLocations(
         *shaders.screenfilling.program,
-        shaders.screenfilling.cache,
-        { "tex", "hasTexture", "shouldFlipTexture", "proj", "color" }
+        shaders.screenfilling.cache
     );
 
 
diff --git a/src/rendering/screenspacerenderable.cpp b/src/rendering/screenspacerenderable.cpp
index 40b27847f5..b3e973714a 100644
--- a/src/rendering/screenspacerenderable.cpp
+++ b/src/rendering/screenspacerenderable.cpp
@@ -43,11 +43,6 @@
 #include <variant>
 
 namespace {
-    constexpr std::array<const char*, 9> UniformNames = {
-        "color", "opacity", "blackoutFactor", "mvpMatrix", "tex", "backgroundColor",
-        "gamma", "borderColor", "borderWidth"
-    };
-
     constexpr openspace::properties::Property::PropertyInfo EnabledInfo = {
         "Enabled",
         "Enabled",
@@ -524,7 +519,7 @@ void ScreenSpaceRenderable::createShaders() {
         dict
     );
 
-    ghoul::opengl::updateUniformLocations(*_shader, _uniformCache, UniformNames);
+    ghoul::opengl::updateUniformLocations(*_shader, _uniformCache);
 }
 
 glm::mat4 ScreenSpaceRenderable::scaleMatrix() {
@@ -660,14 +655,14 @@ void ScreenSpaceRenderable::draw(const glm::mat4& modelTransform, float blackout
     _shader->setUniform(_uniformCache.borderWidth, borderUV);
     _shader->setUniform(_uniformCache.borderColor, _borderColor);
     _shader->setUniform(
-        _uniformCache.mvp,
+        _uniformCache.mvpMatrix,
         global::renderEngine->scene()->camera()->viewProjectionMatrix() * modelTransform
     );
 
     ghoul::opengl::TextureUnit unit;
     unit.activate();
     bindTexture();
-    _shader->setUniform(_uniformCache.texture, unit);
+    _shader->setUniform(_uniformCache.tex, unit);
 
     glBindVertexArray(rendering::helper::vertexObjects.square.vao);
     glDrawArrays(GL_TRIANGLES, 0, 6);

From f1bbdc16cdd5245eecf499dba9cd59724111e776 Mon Sep 17 00:00:00 2001
From: Alexander Bock <alexander.bock@liu.se>
Date: Tue, 30 Apr 2024 08:19:16 +0200
Subject: [PATCH 421/701] Adjust the existing examples to the new naming scheme

---
 .../scale/nonuniformstaticscale/nonuniformstatic.asset        | 4 ++--
 data/assets/examples/scale/staticscale/static.asset           | 4 ++--
 .../examples/scale/timedependentscale/timedependent.asset     | 4 ++--
 data/assets/examples/timeframe/union.asset                    | 4 ++--
 4 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/data/assets/examples/scale/nonuniformstaticscale/nonuniformstatic.asset b/data/assets/examples/scale/nonuniformstaticscale/nonuniformstatic.asset
index c1f43bab87..d52a130c2d 100644
--- a/data/assets/examples/scale/nonuniformstaticscale/nonuniformstatic.asset
+++ b/data/assets/examples/scale/nonuniformstaticscale/nonuniformstatic.asset
@@ -1,4 +1,4 @@
--- Minimal
+-- Basic
 -- This asset creates a SceneGraphNode that only displays coordinate axes. The coordinate
 -- axis normally have a length of 1 meter and are scaled in this example by different
 -- values for each axis. The x axis is scaled by a factor of 149597870700,  which means
@@ -18,7 +18,7 @@ local Node = {
     Type = "RenderableCartesianAxes"
   },
   GUI = {
-    Name = "Minimal",
+    Name = "Basic",
     Path = "/Examples/NonUniformStaticScale"
   }
 }
diff --git a/data/assets/examples/scale/staticscale/static.asset b/data/assets/examples/scale/staticscale/static.asset
index fd563e05a3..3015a78094 100644
--- a/data/assets/examples/scale/staticscale/static.asset
+++ b/data/assets/examples/scale/staticscale/static.asset
@@ -1,4 +1,4 @@
--- Minimal
+-- Basic
 -- This asset creates a SceneGraphNode that only displays coordinate axes. The coordinate
 -- axis normally have a length of 1 meter and are scaled in this example by a factor of
 -- 149597870700, which means they will be 149597870700 m (1 AU) long, thus reaching the
@@ -16,7 +16,7 @@ local Node = {
     Type = "RenderableCartesianAxes"
   },
   GUI = {
-    Name = "Minimal",
+    Name = "Basic",
     Path = "/Examples/StaticScale"
   }
 }
diff --git a/data/assets/examples/scale/timedependentscale/timedependent.asset b/data/assets/examples/scale/timedependentscale/timedependent.asset
index 7a97c50baf..8eebd09c82 100644
--- a/data/assets/examples/scale/timedependentscale/timedependent.asset
+++ b/data/assets/examples/scale/timedependentscale/timedependent.asset
@@ -1,4 +1,4 @@
--- Minimal
+-- Basic
 -- This asset creates a SceneGraphNode that only displays coordinate axes, which grow at
 -- a speed of 1 m/s starting on January 1st, 2000 00:00:00. This means that on
 -- that date, the coordinate axes will disappear and, for example, on January 1st, 2000
@@ -16,7 +16,7 @@ local Node = {
     Type = "RenderableCartesianAxes"
   },
   GUI = {
-    Name = "Minimal",
+    Name = "Basic",
     Path = "/Examples/TimeDependentScale"
   }
 }
diff --git a/data/assets/examples/timeframe/union.asset b/data/assets/examples/timeframe/union.asset
index 538f07da63..a07ace2322 100644
--- a/data/assets/examples/timeframe/union.asset
+++ b/data/assets/examples/timeframe/union.asset
@@ -1,4 +1,4 @@
--- Minimal
+-- Basic
 -- This example creates a union out of two simpler TimeFrameIntervals and uses it for a
 -- SceneGraphNode. The first TimeFrameInterval covers January 1st, 2000 and the second
 -- TimeFrameInterval covers March 1st, 2002. The resulting TimeFrameUnion will cover both
@@ -27,7 +27,7 @@ local Node = {
     Type = "RenderableCartesianAxes"
   },
   GUI = {
-    Name = "Minimal",
+    Name = "Basic",
     Path = "/Examples/TimeFrameUnion"
   }
 }

From 359cf9950e2d20b03eb4958d21658607e994ff5c Mon Sep 17 00:00:00 2001
From: Alexander Bock <alexander.bock@liu.se>
Date: Tue, 30 Apr 2024 08:20:40 +0200
Subject: [PATCH 422/701] Add documentation and example for the
 `TileProviderByIndex` (#3220)

---
 .../tileproviderbyindex/byindex.asset         | 59 +++++++++++++
 modules/globebrowsing/src/layer.cpp           |  4 -
 modules/globebrowsing/src/tileindex.cpp       | 24 ++++++
 modules/globebrowsing/src/tileindex.h         |  1 +
 .../src/tileprovider/tileproviderbyindex.cpp  | 86 ++++++++++++++-----
 .../src/tileprovider/tileproviderbylevel.cpp  | 10 ++-
 6 files changed, 154 insertions(+), 30 deletions(-)
 create mode 100644 data/assets/examples/tileprovider/tileproviderbyindex/byindex.asset

diff --git a/data/assets/examples/tileprovider/tileproviderbyindex/byindex.asset b/data/assets/examples/tileprovider/tileproviderbyindex/byindex.asset
new file mode 100644
index 0000000000..daf5ccd7ed
--- /dev/null
+++ b/data/assets/examples/tileprovider/tileproviderbyindex/byindex.asset
@@ -0,0 +1,59 @@
+-- Basic
+-- This example file adds a layer to a globe that has a base layer and then replaces one
+-- hemisphere of the planet with a single image. Recommended reading for this example is
+-- the documentation on the DefaultTileProvider.
+
+-- Download some example images that we can use
+local images = asset.resource({
+  Name = "Earth Textures",
+  Type = "HttpSynchronization",
+  Identifier = "earth_textures",
+  Version = 3
+})
+
+-- Define the TileProvider
+local TileProvider = {
+  Identifier = "Example",
+  Type = "TileProviderByIndex",
+  Enabled = true,
+  -- The default tile provider that is used for the whole globe
+  DefaultTileProvider = {
+    Identifier = "Blue_Marble",
+    FilePath = images .. "earth_bluemarble.jpg"
+  },
+  TileProviders = {
+    -- We only define one additional tile provider that overwrites the right
+    -- hemisphere of the globe
+    {
+      Index = { X = 0, Y = 0, Level = 2 },
+      TileProvider = {
+        Identifier = "Blue_Marble_Night",
+        FilePath = images .. "earth_night.png"
+      }
+    }
+  }
+}
+
+-- Define the scene graph node
+local Node = {
+  Identifier = "TileProviderByIndex_Example",
+  Renderable = {
+    Type = "RenderableGlobe",
+    Layers = {
+      -- The globe has exactly one layer, which is the one we defined above
+      ColorLayers = { TileProvider }
+    }
+  },
+  GUI = {
+    Name = "Basic",
+    Path = "/Examples/TileProviderByIndex"
+  }
+}
+
+asset.onInitialize(function()
+  openspace.addSceneGraphNode(Node)
+end)
+
+asset.onDeinitialize(function()
+  openspace.removeSceneGraphNode(Node)
+end)
diff --git a/modules/globebrowsing/src/layer.cpp b/modules/globebrowsing/src/layer.cpp
index d9d3d92494..762c89e8fd 100644
--- a/modules/globebrowsing/src/layer.cpp
+++ b/modules/globebrowsing/src/layer.cpp
@@ -174,10 +174,6 @@ namespace {
         // Sets the blend mode of this layer to determine how it interacts with other
         // layers on top of this
         std::optional<BlendMode> blendMode;
-
-        // If the primary layer creation fails, this layer is used as a fallback
-        std::optional<ghoul::Dictionary>
-            fallback [[codegen::reference("globebrowsing_layer")]];
     };
 #include "layer_codegen.cpp"
 } // namespace
diff --git a/modules/globebrowsing/src/tileindex.cpp b/modules/globebrowsing/src/tileindex.cpp
index 6bf83b9877..7378563131 100644
--- a/modules/globebrowsing/src/tileindex.cpp
+++ b/modules/globebrowsing/src/tileindex.cpp
@@ -36,6 +36,30 @@ TileIndex::TileIndex(uint32_t x_, uint32_t y_, uint8_t level_)
     , level(level_)
 {}
 
+TileIndex::TileIndex(TileHashKey hash) {
+    // Extract the level as the lowest 5 bits
+    uint64_t hlevel = hash & ((1 << 5) - 1);
+    ghoul_assert(hlevel < (1 << 5), "Error in hashing for level");
+    // And then shift the remainder down so that the next value is in the lowest bits
+    hash -= hlevel;
+    hash = hash >> 5;
+
+    // Extract the x as the lowest 30 bits
+    uint64_t hx = hash & ((1 << 30) - 1);
+    ghoul_assert(hx < (1 << 30), "Error in hashing for x");
+    // And then shift the remainder down so that the next value is in the lowest bits
+    hash -= hx;
+    hash = hash >> 30;
+
+    // The remainder in the hash must then be the y index
+    uint64_t hy = hash;
+    ghoul_assert(hy < (1 << 29), "Error in hashing for y");
+
+    level = static_cast<uint8_t>(hlevel);
+    x = static_cast<uint32_t>(hx);
+    y = static_cast<uint32_t>(hy);
+}
+
 TileIndex TileIndex::child(Quad q) const {
     return TileIndex(2 * x + q % 2, 2 * y + q / 2, level + 1);
 }
diff --git a/modules/globebrowsing/src/tileindex.h b/modules/globebrowsing/src/tileindex.h
index 3a0098a4ad..594fc867e3 100644
--- a/modules/globebrowsing/src/tileindex.h
+++ b/modules/globebrowsing/src/tileindex.h
@@ -35,6 +35,7 @@ struct TileIndex {
     using TileHashKey = uint64_t;
 
     TileIndex(uint32_t x_, uint32_t y_, uint8_t level_);
+    explicit TileIndex(TileHashKey hash);
 
     uint32_t x = 0;
     uint32_t y = 0;
diff --git a/modules/globebrowsing/src/tileprovider/tileproviderbyindex.cpp b/modules/globebrowsing/src/tileprovider/tileproviderbyindex.cpp
index a64fb1f2e1..50caabde7f 100644
--- a/modules/globebrowsing/src/tileprovider/tileproviderbyindex.cpp
+++ b/modules/globebrowsing/src/tileprovider/tileproviderbyindex.cpp
@@ -27,33 +27,50 @@
 #include <openspace/documentation/documentation.h>
 
 namespace {
+    // This TileProvider provides the ability to override the contents for tiles at
+    // specific indices. A default tile provider has to be specified that is used by
+    // default for the entire globe. If a tile provider is specified for a specific tile,
+    // then the default tile provide is used for all other indices and the specialized
+    // tile provider `P` is used for the specified index. Any number of specialized tile
+    // providers can be provided to overwrite specific locations on the globe.
+    //
+    // This tile provider can be used to, for example, show an inset image that is merged
+    // with a larger globe-spanning image.
     struct [[codegen::Dictionary(TileProviderByIndex)]] Parameters {
-        ghoul::Dictionary defaultProvider;
+        ghoul::Dictionary defaultTileProvider
+            [[codegen::reference("globebrowsing_layer")]];
 
+        // An IndexProvider is a tile provider that is only valid for a specific
+        // combination of x, y, and level. Whenever a globe tries to render a tile and
+        // this tile provider has an IndexProvider of that index, it will use the
+        // specialized tile provider instead.
         struct IndexProvider {
             struct Index {
                 // The x coordinate for this index. This specifies the horizontal
-                // direction (longitude) component
+                // direction (longitude) component. Acceptable values for this coordinate
+                // have to be smaller than $2 * 2^{level}$.
                 int x [[codegen::greaterequal(0)]];
 
                 // The y coordinate for this index. This specifies the vertical direction
-                // (latitude) component
+                // (latitude) component. Acceptable values for this coordinate have to be
+                // smaller than $2^{level}$.
                 int y [[codegen::greaterequal(0)]];
 
                 // The z-level which corresponds to the depth of the tile pyramid, which
-                // directly impacts the applied resolution of the tileprovider shown here
-                int level [[codegen::inrange(0, 255)]];
+                // directly impacts the applied resolution of the tileprovider shown here.
+                // Not that _in general_ the level would start at 2.
+                int level [[codegen::inrange(0, 23)]];
             };
-            // The index for which the provided tile provider is used
-            Index tileIndex;
+            // The index for which the provided tile provider is used.
+            Index index;
 
-            // The dictionary that described the tileprovider to be used by the provided
-            // index
-            ghoul::Dictionary tileProvider;
+            // The dictionary that describes the TileProvider to be used by the provided
+            // `index`.
+            ghoul::Dictionary tileProvider [[codegen::reference("globebrowsing_layer")]];
         };
 
-        // The list of all tileprovides and the indices at which they are used
-        std::vector<IndexProvider> indexTileProviders;
+        // The list of all TileProviders and the indices at which they are used.
+        std::vector<IndexProvider> tileProviders;
     };
 #include "tileproviderbyindex_codegen.cpp"
 } // namespace
@@ -67,21 +84,30 @@ documentation::Documentation TileProviderByIndex::Documentation() {
 TileProviderByIndex::TileProviderByIndex(const ghoul::Dictionary& dictionary) {
     ZoneScoped;
 
-    const Parameters p = codegen::bake<Parameters>(dictionary);
+    Parameters p = codegen::bake<Parameters>(dictionary);
+
+    // For now we need to inject the LayerGroupID this way. We don't want it to be part of
+    // the parameters struct as that would mean it would be visible to the end user, which
+    // we don't want since this value just comes from whoever creates it, not the user
+    ghoul_assert(dictionary.hasValue<int>("LayerGroupID"), "No Layer Group ID provided");
+    const layers::Group::ID group = static_cast<layers::Group::ID>(
+        dictionary.value<int>("LayerGroupID")
+    );
 
     layers::Layer::ID typeID = layers::Layer::ID::DefaultTileProvider;
-    if (p.defaultProvider.hasValue<std::string>("Type")) {
-        const std::string type = p.defaultProvider.value<std::string>("Type");
+    if (p.defaultTileProvider.hasValue<std::string>("Type")) {
+        const std::string type = p.defaultTileProvider.value<std::string>("Type");
         typeID = ghoul::from_string<layers::Layer::ID>(type);
     }
 
-    _defaultTileProvider = createFromDictionary(typeID, p.defaultProvider);
+    p.defaultTileProvider.setValue("LayerGroupID", static_cast<int>(group));
+    _defaultTileProvider = createFromDictionary(typeID, p.defaultTileProvider);
 
-    for (const Parameters::IndexProvider& ip : p.indexTileProviders) {
+    for (Parameters::IndexProvider& ip : p.tileProviders) {
         const TileIndex tileIndex = TileIndex(
-            ip.tileIndex.x,
-            ip.tileIndex.y,
-            static_cast<uint8_t>(ip.tileIndex.level)
+            ip.index.x,
+            ip.index.y,
+            static_cast<uint8_t>(ip.index.level)
         );
 
         layers::Layer::ID providerID = layers::Layer::ID::DefaultTileProvider;
@@ -90,6 +116,7 @@ TileProviderByIndex::TileProviderByIndex(const ghoul::Dictionary& dictionary) {
             providerID = ghoul::from_string<layers::Layer::ID>(type);
         }
 
+        ip.tileProvider.setValue("LayerGroupID", static_cast<int>(group));
         std::unique_ptr<TileProvider> stp = createFromDictionary(
             providerID,
             ip.tileProvider
@@ -103,13 +130,17 @@ Tile TileProviderByIndex::tile(const TileIndex& tileIndex) {
     ZoneScoped;
     const auto it = _providers.find(tileIndex.hashKey());
     const bool hasProvider = it != _providers.end();
-    return hasProvider ? it->second->tile(tileIndex) : Tile();
+    return hasProvider ?
+        it->second->tile(tileIndex) :
+        _defaultTileProvider->tile(tileIndex);
 }
 
 Tile::Status TileProviderByIndex::tileStatus(const TileIndex& index) {
     const auto it = _providers.find(index.hashKey());
     const bool hasProvider = it != _providers.end();
-    return hasProvider ? it->second->tileStatus(index) : Tile::Status::Unavailable;
+    return hasProvider ?
+        it->second->tileStatus(index) :
+        _defaultTileProvider->tileStatus(index);
 }
 
 TileDepthTransform TileProviderByIndex::depthTransform() {
@@ -139,7 +170,16 @@ int TileProviderByIndex::minLevel() {
 }
 
 int TileProviderByIndex::maxLevel() {
-    return _defaultTileProvider->maxLevel();
+    int result = _defaultTileProvider->maxLevel();
+
+    using K = TileIndex::TileHashKey;
+    using V = std::unique_ptr<TileProvider>;
+    for (std::pair<const K, V>& it : _providers) {
+        TileIndex index = TileIndex(it.first);
+        result = std::max(result, static_cast<int>(index.level));
+    }
+
+    return result;
 }
 
 float TileProviderByIndex::noDataValueAsFloat() {
diff --git a/modules/globebrowsing/src/tileprovider/tileproviderbylevel.cpp b/modules/globebrowsing/src/tileprovider/tileproviderbylevel.cpp
index 3413212e2d..95625a3655 100644
--- a/modules/globebrowsing/src/tileprovider/tileproviderbylevel.cpp
+++ b/modules/globebrowsing/src/tileprovider/tileproviderbylevel.cpp
@@ -28,8 +28,6 @@
 
 namespace {
     struct [[codegen::Dictionary(TileProviderByLevel)]] Parameters {
-        int layerGroupID;
-
         struct Provider {
             int maxLevel [[codegen::greaterequal(0)]];
             ghoul::Dictionary tileProvider;
@@ -50,7 +48,13 @@ TileProviderByLevel::TileProviderByLevel(const ghoul::Dictionary& dictionary) {
 
     const Parameters p = codegen::bake<Parameters>(dictionary);
 
-    const layers::Group::ID group = static_cast<layers::Group::ID>(p.layerGroupID);
+    // For now we need to inject the LayerGroupID this way. We don't want it to be part of
+    // the parameters struct as that would mean it would be visible to the end user, which
+    // we don't want since this value just comes from whoever creates it, not the user
+    ghoul_assert(dictionary.hasValue<int>("LayerGroupID"), "No Layer Group ID provided");
+    const layers::Group::ID group = static_cast<layers::Group::ID>(
+        dictionary.value<int>("LayerGroupID")
+    );
 
     for (Parameters::Provider provider : p.levelTileProviders) {
         ghoul::Dictionary& tileProviderDict = provider.tileProvider;

From 86d1b2d8a62db59a11629a84c8edd0feb65fd396 Mon Sep 17 00:00:00 2001
From: Emma Broman <emma.broman@liu.se>
Date: Tue, 30 Apr 2024 13:33:18 +0200
Subject: [PATCH 423/701] Update pointcloud examples to conform with new
 example structure (#3213)

* Update pointcloud examples to conform with new example structure and add some new ones

* Update name, GUI path and add title to top comment to match the decided format

* Rename base examples to Basic, as agreed

* Clarify TODO comment about broken label rotation

---------

Co-authored-by: Alexander Bock <alexander.bock@liu.se>
Co-authored-by: Ylva Selling <ylva.selling@gmail.com>
---
 .../pointclouds/interpolated_points.asset     |  96 -------
 .../pointclouds/multitextured_points.asset    | 107 --------
 data/assets/examples/pointclouds/points.asset | 245 ------------------
 .../pointclouds/points_units_labels.asset     |  98 -------
 .../examples/pointclouds/polygon_cloud.asset  |  45 ----
 .../data/interpolation_expand.csv             |   0
 .../data/interpolation_randomwalk.csv         |   0
 .../interpolatedpoints.asset                  |  30 +++
 .../interpolatedpoints_colormapped.asset      |  44 ++++
 .../interpolatedpoints_spline.asset           |  36 +++
 .../pointcloud_colormappingsettings.asset}    |  39 +--
 .../advanced/pointcloud_datamapping.asset}    |  42 +--
 .../advanced/pointcloud_fading.asset}         |  59 ++---
 .../advanced/pointcloud_labels.asset          |  84 ++++++
 .../advanced/pointcloud_multitextured.asset   |  95 +++++++
 .../renderablepointcloud}/data/dummydata.csv  |   0
 .../data/dummydata.label                      |   0
 .../multitextured_csv}/textured_points.csv    |   0
 .../data/multitextured_csv}/texturemap.tmap   |   0
 .../textures_points.speck                     |   0
 .../renderablepointcloud/pointcloud.asset     |  26 ++
 .../pointcloud_colormapped.asset              |  35 +++
 .../pointcloud_colormapped_moresettings.asset |  48 ++++
 .../pointcloud_maxsize.asset                  |  32 +++
 .../pointcloud_outline.asset                  |  30 +++
 .../pointcloud_scaled.asset                   |  33 +++
 .../pointcloud_scaledfromdata.asset           |  40 +++
 .../pointcloud_textured.asset                 |  36 +++
 .../pointcloud_units.asset                    |  24 ++
 .../renderablepolygoncloud/polygoncloud.asset |  29 +++
 30 files changed, 668 insertions(+), 685 deletions(-)
 delete mode 100644 data/assets/examples/pointclouds/interpolated_points.asset
 delete mode 100644 data/assets/examples/pointclouds/multitextured_points.asset
 delete mode 100644 data/assets/examples/pointclouds/points.asset
 delete mode 100644 data/assets/examples/pointclouds/points_units_labels.asset
 delete mode 100644 data/assets/examples/pointclouds/polygon_cloud.asset
 rename data/assets/examples/{pointclouds => renderable/renderableinterpolatedpoints}/data/interpolation_expand.csv (100%)
 rename data/assets/examples/{pointclouds => renderable/renderableinterpolatedpoints}/data/interpolation_randomwalk.csv (100%)
 create mode 100644 data/assets/examples/renderable/renderableinterpolatedpoints/interpolatedpoints.asset
 create mode 100644 data/assets/examples/renderable/renderableinterpolatedpoints/interpolatedpoints_colormapped.asset
 create mode 100644 data/assets/examples/renderable/renderableinterpolatedpoints/interpolatedpoints_spline.asset
 rename data/assets/examples/{pointclouds/points_colormappingsettings.asset => renderable/renderablepointcloud/advanced/pointcloud_colormappingsettings.asset} (73%)
 rename data/assets/examples/{pointclouds/points_datamapping.asset => renderable/renderablepointcloud/advanced/pointcloud_datamapping.asset} (57%)
 rename data/assets/examples/{pointclouds/points_fading.asset => renderable/renderablepointcloud/advanced/pointcloud_fading.asset} (51%)
 create mode 100644 data/assets/examples/renderable/renderablepointcloud/advanced/pointcloud_labels.asset
 create mode 100644 data/assets/examples/renderable/renderablepointcloud/advanced/pointcloud_multitextured.asset
 rename data/assets/examples/{pointclouds => renderable/renderablepointcloud}/data/dummydata.csv (100%)
 rename data/assets/examples/{pointclouds => renderable/renderablepointcloud}/data/dummydata.label (100%)
 rename data/assets/examples/{pointclouds/data/textured_csv => renderable/renderablepointcloud/data/multitextured_csv}/textured_points.csv (100%)
 rename data/assets/examples/{pointclouds/data/textured_csv => renderable/renderablepointcloud/data/multitextured_csv}/texturemap.tmap (100%)
 rename data/assets/examples/{pointclouds/data/textured_speck => renderable/renderablepointcloud/data/multitextured_speck}/textures_points.speck (100%)
 create mode 100644 data/assets/examples/renderable/renderablepointcloud/pointcloud.asset
 create mode 100644 data/assets/examples/renderable/renderablepointcloud/pointcloud_colormapped.asset
 create mode 100644 data/assets/examples/renderable/renderablepointcloud/pointcloud_colormapped_moresettings.asset
 create mode 100644 data/assets/examples/renderable/renderablepointcloud/pointcloud_maxsize.asset
 create mode 100644 data/assets/examples/renderable/renderablepointcloud/pointcloud_outline.asset
 create mode 100644 data/assets/examples/renderable/renderablepointcloud/pointcloud_scaled.asset
 create mode 100644 data/assets/examples/renderable/renderablepointcloud/pointcloud_scaledfromdata.asset
 create mode 100644 data/assets/examples/renderable/renderablepointcloud/pointcloud_textured.asset
 create mode 100644 data/assets/examples/renderable/renderablepointcloud/pointcloud_units.asset
 create mode 100644 data/assets/examples/renderable/renderablepolygoncloud/polygoncloud.asset

diff --git a/data/assets/examples/pointclouds/interpolated_points.asset b/data/assets/examples/pointclouds/interpolated_points.asset
deleted file mode 100644
index b938060750..0000000000
--- a/data/assets/examples/pointclouds/interpolated_points.asset
+++ /dev/null
@@ -1,96 +0,0 @@
-local colormaps = asset.require("util/default_colormaps")
-
-
-
-local Points = {
-  Identifier = "Example_InterpolatedPoints_ColorMapped",
-  Renderable = {
-    Type = "RenderableInterpolatedPoints",
-    -- The dataset here is just a linearly expanding dataset, where the points move in
-    -- a straight line
-    File = asset.resource("data/interpolation_expand.csv"),
-    -- Specify how many objects the rows in the dataset represent. Here, the dataset is
-    -- consists of 10 objects with positions at 6 different time steps. This information
-    -- is required
-    NumberOfObjects = 10,
-    -- Both the position and data values will be interpolated, so use a color map
-    Coloring = {
-      ColorMapping = {
-        File = colormaps.Uniform.Viridis
-      }
-    },
-    -- Reduce the scale of the points a bit compared to default, so we see them more clearly
-    SizeSettings = {
-      ScaleExponent = 3.5
-    }
-  },
-  GUI = {
-    Name = "Interpolating Points with Color Map",
-    Path = "/Example/Interpolated Point Clouds",
-    Description = [[Example of interpolating points with a color map. The data value
-      used for the coloring will also be inteprolated, leading to the points changing
-      color throughout the interpolation.]]
-  }
-}
-
-local Points_Smoothed = {
-  Identifier = "Example_InterpolatedPoints_Spline",
-  Renderable = {
-    Type = "RenderableInterpolatedPoints",
-    -- Using a random walk dataset, to get movement in some different directions
-    File = asset.resource("data/interpolation_randomwalk.csv"),
-    -- Same number of objects as above - 10 objects with positions at 6 different
-    -- time steps
-    NumberOfObjects = 10,
-    Interpolation = {
-      -- Smoothen transitions between two different sets of points, by
-      -- using a spline based interpolation of the points
-      UseSplineInterpolation = true
-    },
-    -- Just use a fixed coloring here, no color mapping
-    Coloring = {
-      FixedColor = { 0.0, 0.5, 0.0 }
-    },
-    -- Reduce the scale of the points a bit compared to default, so we see them more clearly
-    SizeSettings = {
-      ScaleExponent = 3.0
-    }
-  },
-  GUI = {
-    Name = "Interpolating Points (Spline)",
-    Path = "/Example/Interpolated Point Clouds",
-    Description = [[Example of interpolating points with spline-based interpolation
-      for the position. This leads to smoother transitions at the nodes of the
-      interpolation. Try disabling the spline interpolation in the GUI (under
-      Renderable->Interpolation) to see the difference.]]
-  }
-}
-
-
-asset.onInitialize(function()
-  openspace.addSceneGraphNode(Points)
-  openspace.addSceneGraphNode(Points_Smoothed)
-end)
-
-asset.onDeinitialize(function()
-  openspace.removeSceneGraphNode(Points_Smoothed)
-  openspace.removeSceneGraphNode(Points)
-end)
-
-asset.export(Points)
-asset.export(Points_Smoothed)
-
-
-
-asset.meta = {
-  Name = "Example - Interpolated Point Clouds",
-  Version = "1.0",
-  Description = [[Example of point clouds that support interpolation. One uses a linear
-    motion and color mapping. The other example uses a spline interpolation for the
-    approximation of the positions, to result in smoother transitions between the sets
-    of positions. The interpolation can be triggered using the properties under
-    Renderable->Interpolation in the Scene menu.]],
-  Author = "OpenSpace Team",
-  URL = "http://openspaceproject.com",
-  License = "MIT license"
-}
diff --git a/data/assets/examples/pointclouds/multitextured_points.asset b/data/assets/examples/pointclouds/multitextured_points.asset
deleted file mode 100644
index e236893562..0000000000
--- a/data/assets/examples/pointclouds/multitextured_points.asset
+++ /dev/null
@@ -1,107 +0,0 @@
--- CSV
-local Test = {
-  Identifier = "TexturedPointCloudExample_CSV",
-  Renderable = {
-    Type = "RenderablePointCloud",
-    File = asset.resource("data/textured_csv/textured_points.csv"),
-    DataMapping = {
-      -- The name of the column in the CSV file that corresponds to the texture (should
-      -- be an integer)
-      TextureColumn = "texture",
-      -- A Texture mapping file that provides information about which value/index
-      -- corresponds to which texture file
-      TextureMapFile = asset.resource("data/textured_csv/texturemap.tmap")
-    },
-    Texture = {
-      -- Where to find the texture files (in this case, in the OpenSpace data folder)
-      Folder = openspace.absPath("${DATA}")
-    },
-    UseAdditiveBlending = false
-  },
-  GUI = {
-    Name = "Multi-Textured Points",
-    Path = "/Example/Point Clouds/Multi-Textured"
-  }
-}
-
-
--- Interpolated
--- Multi-texturing works also for interpolated point clouds. Here we let the same
--- dataset as used above be interpreted as representing only two points, with a different
--- texture. Note that the textures will be set based on the first two data items and will
--- not be changed during interpolation
-local Test_Interpolated = {
-  Identifier = "TexturedPointCloudExample_Interpolated",
-  Renderable = {
-    Type = "RenderableInterpolatedPoints",
-    File = asset.resource("data/textured_csv/textured_points.csv"),
-    NumberOfObjects = 2,
-    DataMapping = {
-      TextureColumn = "texture",
-      TextureMapFile = asset.resource("data/textured_csv/texturemap.tmap")
-    },
-    Texture = {
-      Folder = openspace.absPath("${DATA}")
-    },
-    UseAdditiveBlending = false
-  },
-  GUI = {
-    Name = "Multi-Textured Points (Interpolation)",
-    Path = "/Example/Point Clouds/Multi-Textured"
-  }
-}
-
--- Speck file (allows storing all data in one single file, including the texture mapping)
--- Note that we disable this scene graph node per default here, as it shows the same
--- information as the CSV version
-local Test_Speck = {
-  Identifier = "TexturedPointCloudExample_Speck",
-  Renderable = {
-    Type = "RenderablePointCloud",
-    Enabled = false,
-    -- When loading multi-texture information from a speck file, we do not need a
-    -- DataMapping entry - all information is in the file
-    File = asset.resource("data/textured_speck/textures_points.speck"),
-    Texture = {
-      -- However, we do still need to specify where the textures are located
-      Folder = openspace.absPath("${DATA}")
-    },
-    UseAdditiveBlending = false
-  },
-  GUI = {
-    Name = "Multi-Textured Points (Speck file)",
-    Path = "/Example/Point Clouds/Multi-Textured"
-  }
-}
-
-
-asset.onInitialize(function()
-  openspace.addSceneGraphNode(Test)
-  openspace.addSceneGraphNode(Test_Interpolated)
-  openspace.addSceneGraphNode(Test_Speck)
-end)
-
-asset.onDeinitialize(function()
-  openspace.removeSceneGraphNode(Test_Speck)
-  openspace.removeSceneGraphNode(Test_Interpolated)
-  openspace.removeSceneGraphNode(Test)
-end)
-
-asset.export(Test)
-asset.export(Test_Interpolated)
-asset.export(Test_Speck)
-
-
-asset.meta = {
-  Name = "Multi-textured Points",
-  Version = "1.0",
-  Description = [[Example of point clouds where multiple textures are used for the points,
-    based on information in the dataset. The dataset may be either CSV or Speck format.
-    If CSV is used, additional information must be provided through the DataMapping: 1)
-    Which column in the dataset that corresponds to the texture, and a separate file that
-    maps that value to a texture file
-  ]],
-  Author = "OpenSpace Team",
-  URL = "http://openspaceproject.com",
-  License = "MIT license"
-}
diff --git a/data/assets/examples/pointclouds/points.asset b/data/assets/examples/pointclouds/points.asset
deleted file mode 100644
index 9129b14046..0000000000
--- a/data/assets/examples/pointclouds/points.asset
+++ /dev/null
@@ -1,245 +0,0 @@
-local earthAsset = asset.require("scene/solarsystem/planets/earth/earth")
-local colormaps = asset.require("util/default_colormaps")
-
-
-
--- Color mapped points close to Earth, with some different settings for color and
--- sizing, and a StaticRotation that makes them not overlap
-
--- Point cloud with fixed color and default size (fixed)
-local FixedColor_FixedSize = {
-  Identifier = "ExamplePoints_FixedSize",
-  Parent = earthAsset.Earth.Identifier,
-  Renderable = {
-    Type = "RenderablePointCloud",
-    File = asset.resource("data/dummydata.csv"),
-    Coloring = {
-      FixedColor = { 0.0, 0.5, 0.0 }
-    }
-  },
-  GUI = {
-    Name = "Fixed Color / Fixed Size",
-    Path = "/Example/Point Clouds",
-    Description = "Point cloud with a fixed color and fixed sizing"
-  }
-}
-
--- Point cloud with fixed color and size scaling that is limited by a certain size
-local FixedColor_MaxSize = {
-  Identifier = "ExamplePoints_MaxSize",
-  Parent = earthAsset.Earth.Identifier,
-  Transform = {
-    Rotation = {
-      Type = "StaticRotation",
-      Rotation = { 0, 0, 0.5 * math.pi }
-    }
-  },
-  Renderable = {
-    Type = "RenderablePointCloud",
-    File = asset.resource("data/dummydata.csv"),
-    Coloring = {
-      FixedColor = { 0.0, 1.0, 1.0 }
-    },
-    SizeSettings = {
-      MaxSize = 0.7,
-      EnableMaxSizeControl = true
-    }
-  },
-  GUI = {
-    Name = "Fixed Color / Max Size",
-    Path = "/Example/Point Clouds",
-    Description = "Point cloud with a fixed color and sizing with a given max size"
-  }
-}
-
--- Point cloud with color mapping and fixed point sizing
-local ColorMapped_FixedSize = {
-  Identifier = "ExamplePoints_ColorMapped",
-  Parent = earthAsset.Earth.Identifier,
-  Transform = {
-    Rotation = {
-      Type = "StaticRotation",
-      Rotation = { 0, 0, -0.5 * math.pi }
-    }
-  },
-  Renderable = {
-    Type = "RenderablePointCloud",
-    File = asset.resource("data/dummydata.csv"),
-    Coloring = {
-      ColorMapping = {
-        File = colormaps.Uniform.Viridis
-      }
-    },
-    SizeSettings = {
-      -- Here we set the exponent for the scale explicitly, to a value that
-      -- gives the points a suitable size based on their world-space coordinates
-      ScaleExponent = 6.5
-    }
-  },
-  GUI = {
-    Name = "Color Mapped",
-    Path = "/Example/Point Clouds",
-    Description = "Color mapped point cloud with fixed sizing"
-  }
-}
-
--- Point cloud with fixed color and size scaling from a selected data column
-local FixedColor_ScaleBasedOnData = {
-  Identifier = "ExamplePoints_ScaleFromData",
-  Parent = earthAsset.Earth.Identifier,
-  Transform = {
-    Rotation = {
-      Type = "StaticRotation",
-      Rotation = { 0, 0.5 * math.pi, 0 }
-    }
-  },
-  Renderable = {
-    Type = "RenderablePointCloud",
-    File = asset.resource("data/dummydata.csv"),
-    Coloring = {
-      FixedColor = { 0.5, 0.5, 0.0 }
-    },
-    SizeSettings = {
-      SizeMapping = {
-        -- The options for the columns that the points can be scaled by. The first
-        -- alternative in the list is chosen per default
-        ParameterOptions = { "a", "b" },
-        -- Specify which option we want to use for size mapping at start up. Here we
-        -- use the last of the provided options rather than the first one, which is
-        -- otherwise used by default
-        Parameter = "b"
-      },
-      -- Use a slightly smaller scale than above for the base size of the points
-      -- (will decide the size of the smallest point). That way, the points don't
-      -- become too big when scaled by the data parameter
-      ScaleExponent = 5.0
-    }
-  },
-  GUI = {
-    Name = "Fixed Color / Size From Data",
-    Path = "/Example/Point Clouds",
-    Description = [[Point cloud with a fixed color and sizing that can be set based on a
-      column in the dataset]]
-  }
-}
-
--- Point cloud with textures. Textured points can also be color mapped, but here it
--- is disabled per default
-local Textured = {
-  Identifier = "ExamplePoints_Textured",
-  Parent = earthAsset.Earth.Identifier,
-  Transform = {
-    Rotation = {
-      Type = "StaticRotation",
-      Rotation = { 0, math.pi, 0 }
-    }
-  },
-  Renderable = {
-    Type = "RenderablePointCloud",
-    File = asset.resource("data/dummydata.csv"),
-    Texture = {
-      -- The path to the texture file. Here we use openspace.absPath so that we can use
-      -- the ${DATA} token to get the path to a texture in the "OpenSpace/data" folder,
-      -- but for a file at a relative location it would also work to use asset.resource,
-      -- like for the data file above
-      File = openspace.absPath("${DATA}/test3.jpg"),
-    },
-    -- Disable additive blending, so that points will be rendered with their actual color
-    -- and overlapping points will be sorted by depth. This works best when the points
-    -- have an opacity of 1
-    UseAdditiveBlending = false,
-    Coloring = {
-      ColorMapping = {
-        -- Disable color map per default. When enabled, the texture color will be
-        -- multiplied with the color from the color map
-        Enabled = false,
-        File = colormaps.Uniform.Viridis
-      }
-    }
-  },
-  GUI = {
-    Name = "Textured",
-    Path = "/Example/Point Clouds",
-    Description = "Point cloud with a texture per point"
-  }
-}
-
--- Point cloud with more advanced color mapping and fixed point sizing.
--- Here we have predefined a couple of parameters to use for the color mapping.
--- Also, missing/NaN values are mapped to a specific color.
--- Finally, no additive blending is used for the color, meaning that the color of
--- overlapping points will not be mixed/added
-local ColorMappedAdvanced_NoBlend = {
-  Identifier = "ExamplePoints_ColorMappedNoBlend",
-  Parent = earthAsset.Earth.Identifier,
-  Transform = {
-    Rotation = {
-      Type = "StaticRotation",
-      Rotation = { 0, 0, math.pi }
-    }
-  },
-  Renderable = {
-    Type = "RenderablePointCloud",
-    File = asset.resource("data/dummydata.csv"),
-    UseAdditiveBlending = false, -- Disable additive blending
-    Coloring = {
-      ColorMapping = {
-        File = colormaps.Uniform.Viridis,
-        ParameterOptions = {
-          { Key = "number_withNan" }, -- no range => compute min and max
-          { Key = "normaldist_withMissing", Range = { -0.5, 0.5 } }
-        },
-        ShowMissingData = true,
-        NoDataColor = { 0.5, 0.5, 0.5, 1.0 }
-      }
-    },
-    SizeSettings = {
-      ScaleExponent = 6.5
-    }
-  },
-  GUI = {
-    Name = "Color Mapped (Advanced) - No blending",
-    Path = "/Example/Point Clouds",
-    Description = [[Color mapped point cloud without additive blending, with missing
-      values shown in grey, and a limited choice of parameter options to use for
-      the color mapping.]]
-  }
-}
-
-
-asset.onInitialize(function()
-  openspace.addSceneGraphNode(FixedColor_FixedSize)
-  openspace.addSceneGraphNode(FixedColor_MaxSize)
-  openspace.addSceneGraphNode(FixedColor_ScaleBasedOnData)
-  openspace.addSceneGraphNode(Textured)
-  openspace.addSceneGraphNode(ColorMapped_FixedSize)
-  openspace.addSceneGraphNode(ColorMappedAdvanced_NoBlend)
-end)
-
-asset.onDeinitialize(function()
-  openspace.removeSceneGraphNode(ColorMappedAdvanced_NoBlend)
-  openspace.removeSceneGraphNode(ColorMapped_FixedSize)
-  openspace.removeSceneGraphNode(Textured)
-  openspace.removeSceneGraphNode(FixedColor_ScaleBasedOnData)
-  openspace.removeSceneGraphNode(FixedColor_MaxSize)
-  openspace.removeSceneGraphNode(FixedColor_FixedSize)
-end)
-
-asset.export(FixedColor_FixedSize)
-asset.export(FixedColor_MaxSize)
-asset.export(FixedColor_ScaleBasedOnData)
-asset.export(Textured)
-asset.export(ColorMapped_FixedSize)
-asset.export(ColorMappedAdvanced_NoBlend)
-
-
-
-asset.meta = {
-  Name = "Example - Point Clouds",
-  Version = "1.0",
-  Description = [[Examples of point clouds with a few different settings for sizing and
-    coloring]],
-  Author = "OpenSpace Team",
-  URL = "http://openspaceproject.com",
-  License = "MIT license"
-}
diff --git a/data/assets/examples/pointclouds/points_units_labels.asset b/data/assets/examples/pointclouds/points_units_labels.asset
deleted file mode 100644
index e124879bcb..0000000000
--- a/data/assets/examples/pointclouds/points_units_labels.asset
+++ /dev/null
@@ -1,98 +0,0 @@
-local earthAsset = asset.require("scene/solarsystem/planets/earth/earth")
-
--- @TODO The labels are not correctly oriented towards the camera!
-
-local Example = {
-  Identifier = "ExamplePoints_UnitsAndLabels",
-  Parent = earthAsset.Earth.Identifier,
-  Renderable = {
-    Type = "RenderablePointCloud",
-    File = asset.resource("data/dummydata.csv"),
-    Coloring = {
-      FixedColor = { 0.3, 0.8, 0.3 }
-    },
-    DataMapping = {
-      -- When loading labels from a CSV file, we need to provide information about
-      -- which column corresponds to the name to be used for the labels (this is
-      -- not required for SPECK files)
-      Name = "number_withNan"
-    },
-    -- Add a unit to interpret the points to be in kilometers rather than meters
-    Unit = "Km",
-    -- Add some labels. We also need to enable them for them to be visible.
-    -- Since we do not specify a label file (see below), the positions and text of
-    -- of the labels will be set based on the information in the CSV file
-    Labels = {
-      Enabled = true,
-      Size = 7.5
-    }
-  },
-  GUI = {
-    Name = "Units & Labels",
-    Path = "/Example/Point Clouds",
-    Description = [[Example of a point cloud with labels created by specifying a 'Name'
-      column for the dataset. The positions of the labels will exactly match that of the
-      points]]
-  }
-}
-
-local Example_LabelFromFile = {
-  Identifier = "ExamplePoints_UnitsAndLabels_File",
-  Parent = earthAsset.Earth.Identifier,
-  -- Rotate to not overlap with the other dataset
-  Transform = {
-    Rotation = {
-      Type = "StaticRotation",
-      Rotation = { 0, 0, -0.5 * math.pi }
-    }
-  },
-  Renderable = {
-    Type = "RenderablePointCloud",
-    File = asset.resource("data/dummydata.csv"),
-    Coloring = {
-      FixedColor = { 0.0, 0.3, 1.0 }
-    },
-    -- Add a unit to interpret the points to be in kilometers rather than meters
-    Unit = "Km",
-    -- Also load a label file with the positions of the label (in this case they are the
-    -- same as in the CSV file, but that is not always the case)
-    Labels = {
-      Enabled = true,
-      File = asset.resource("data/dummydata.label"),
-      Size = 7.5,
-      -- When we add an explicit label file we also have to specify the unit, if it is
-      -- different than meters
-      Unit = "Km"
-    }
-  },
-  GUI = {
-    Name = "Units & Labels (Explicit Label file)",
-    Path = "/Example/Point Clouds",
-    Description = [[Example of a point cloud with labels, created from a label file]]
-  }
-}
-
-
-asset.onInitialize(function()
-  openspace.addSceneGraphNode(Example)
-  openspace.addSceneGraphNode(Example_LabelFromFile)
-end)
-
-asset.onDeinitialize(function()
-  openspace.removeSceneGraphNode(Example_LabelFromFile)
-  openspace.removeSceneGraphNode(Example)
-end)
-
-asset.export(Example)
-asset.export(Example_LabelFromFile)
-
-
-asset.meta = {
-  Name = "Example - Point Cloud with Unit and Labels",
-  Version = "1.0",
-  Description = [[Example of point clouds with labels, either set from the data file
-    itself or from a separate .label file]],
-  Author = "OpenSpace Team",
-  URL = "http://openspaceproject.com",
-  License = "MIT license"
-}
diff --git a/data/assets/examples/pointclouds/polygon_cloud.asset b/data/assets/examples/pointclouds/polygon_cloud.asset
deleted file mode 100644
index 6b2ba10677..0000000000
--- a/data/assets/examples/pointclouds/polygon_cloud.asset
+++ /dev/null
@@ -1,45 +0,0 @@
-local Example = {
-  Identifier = "ExamplePoints_Polygon",
-  Renderable = {
-    Type = "RenderablePolygonCloud",
-    File = asset.resource("data/dummydata.csv"),
-    Coloring = {
-      FixedColor = { 0.8, 0.0, 0.0 }
-    },
-    -- Specify the number of sides for the polygon. 3 = triangle, 4 = square,
-    -- 5 = pentagon, 6 = hexagon, and so on
-    PolygonSides = 6,
-    -- Scale up the dataset, so that it is interpreted in Kilometers instead of meters,
-    -- for increased visiblity
-    Unit = "Km"
-  },
-  GUI = {
-    Name = "Polygon Cloud",
-    Path = "/Example/Point Clouds",
-    Description = [[Example of a polygon cloud, which is a point cloud where a uniform
-      polygon is used for the shape of the points]]
-  }
-}
-
-
-asset.onInitialize(function()
-  openspace.addSceneGraphNode(Example)
-end)
-
-asset.onDeinitialize(function()
-  openspace.removeSceneGraphNode(Example)
-end)
-
-asset.export(Example)
-
-
-
-asset.meta = {
-  Name = "Example - Polygon Cloud",
-  Version = "1.0",
-  Description = [[Example of a polygon cloud, which is a point cloud where a uniform
-  polygon is used for the shape of the points]],
-  Author = "OpenSpace Team",
-  URL = "http://openspaceproject.com",
-  License = "MIT license"
-}
diff --git a/data/assets/examples/pointclouds/data/interpolation_expand.csv b/data/assets/examples/renderable/renderableinterpolatedpoints/data/interpolation_expand.csv
similarity index 100%
rename from data/assets/examples/pointclouds/data/interpolation_expand.csv
rename to data/assets/examples/renderable/renderableinterpolatedpoints/data/interpolation_expand.csv
diff --git a/data/assets/examples/pointclouds/data/interpolation_randomwalk.csv b/data/assets/examples/renderable/renderableinterpolatedpoints/data/interpolation_randomwalk.csv
similarity index 100%
rename from data/assets/examples/pointclouds/data/interpolation_randomwalk.csv
rename to data/assets/examples/renderable/renderableinterpolatedpoints/data/interpolation_randomwalk.csv
diff --git a/data/assets/examples/renderable/renderableinterpolatedpoints/interpolatedpoints.asset b/data/assets/examples/renderable/renderableinterpolatedpoints/interpolatedpoints.asset
new file mode 100644
index 0000000000..bdc5a2436a
--- /dev/null
+++ b/data/assets/examples/renderable/renderableinterpolatedpoints/interpolatedpoints.asset
@@ -0,0 +1,30 @@
+-- Basic
+-- This example creates a point cloud that supports interpolation. The dataset is split
+-- up into 10 objects, so that every tenth row represents a new position for an item at a
+-- step in the interpolation.
+
+local Node = {
+  Identifier = "RenderableInterpolatedPoints_Example",
+  Renderable = {
+    Type = "RenderableInterpolatedPoints",
+    -- The dataset here is just a linearly expanding dataset, where the points move in
+    -- a straight line
+    File = asset.resource("data/interpolation_expand.csv"),
+    -- Specify how many objects the rows in the dataset represent. Here, the dataset is
+    -- consists of 10 objects with positions at 6 different time steps. This information
+    -- is required
+    NumberOfObjects = 10
+  },
+  GUI = {
+    Name = "Basic",
+    Path = "/Examples/RenderableInterpolatedPoints"
+  }
+}
+
+asset.onInitialize(function()
+  openspace.addSceneGraphNode(Node)
+end)
+
+asset.onDeinitialize(function()
+  openspace.removeSceneGraphNode(Node)
+end)
diff --git a/data/assets/examples/renderable/renderableinterpolatedpoints/interpolatedpoints_colormapped.asset b/data/assets/examples/renderable/renderableinterpolatedpoints/interpolatedpoints_colormapped.asset
new file mode 100644
index 0000000000..50660353a1
--- /dev/null
+++ b/data/assets/examples/renderable/renderableinterpolatedpoints/interpolatedpoints_colormapped.asset
@@ -0,0 +1,44 @@
+-- Interpolated Points with Color Mapping
+-- Example of interpolating points with a color map. The data value used for the coloring
+-- will also be interpolated, leading to the points changing color throughout the
+-- interpolation.
+--
+-- Note that the color map is loaded from another asset. This is a utility asset that
+-- includes some common color maps for general usage.
+
+local colormaps = asset.require("util/default_colormaps")
+
+local Node = {
+  Identifier = "RenderableInterpolatedPoints_Example_ColorMapped",
+  Renderable = {
+    Type = "RenderableInterpolatedPoints",
+    -- The dataset here is just a linearly expanding dataset, where the points move in
+    -- a straight line
+    File = asset.resource("data/interpolation_expand.csv"),
+    -- Specify how many objects the rows in the dataset represent. Here, the dataset is
+    -- consists of 10 objects with positions at 6 different time steps
+    NumberOfObjects = 10,
+    Coloring = {
+      ColorMapping = {
+        -- For this example, we are using one of the example colormaps "Viridis"
+        File = colormaps.Uniform.Viridis
+      }
+    },
+    -- Reduce the scale of the points a bit compared to default, so we see them more clearly
+    SizeSettings = {
+      ScaleExponent = 3.5
+    }
+  },
+  GUI = {
+    Name = "Color Mapped",
+    Path = "/Examples/RenderableInterpolatedPoints"
+  }
+}
+
+asset.onInitialize(function()
+  openspace.addSceneGraphNode(Node)
+end)
+
+asset.onDeinitialize(function()
+  openspace.removeSceneGraphNode(Node)
+end)
diff --git a/data/assets/examples/renderable/renderableinterpolatedpoints/interpolatedpoints_spline.asset b/data/assets/examples/renderable/renderableinterpolatedpoints/interpolatedpoints_spline.asset
new file mode 100644
index 0000000000..e05ef60b82
--- /dev/null
+++ b/data/assets/examples/renderable/renderableinterpolatedpoints/interpolatedpoints_spline.asset
@@ -0,0 +1,36 @@
+-- Smoother Interpolation (Spline-based)
+-- Example of interpolating points with spline-based interpolation for the position. This
+-- leads to smoother transitions at the nodes of the interpolation.
+
+local Node = {
+  Identifier = "RenderableInterpolatedPoints_Example_Spline",
+  Renderable = {
+    Type = "RenderableInterpolatedPoints",
+    -- Using a random walk dataset, to get movement in some different directions
+    File = asset.resource("data/interpolation_randomwalk.csv"),
+    -- Specify how many objects the rows in the dataset represent. Here, the dataset is
+    -- consists of 10 objects with positions at 6 different time steps
+    NumberOfObjects = 10,
+    Interpolation = {
+      -- Smoothen transitions between two different sets of points, by
+      -- using a spline based interpolation of the points
+      UseSplineInterpolation = true
+    },
+    -- Reduce the scale of the points a bit compared to default, so we see them more clearly
+    SizeSettings = {
+      ScaleExponent = 3.0
+    }
+  },
+  GUI = {
+    Name = "Spline (Smoother)",
+    Path = "/Examples/RenderableInterpolatedPoints"
+  }
+}
+
+asset.onInitialize(function()
+  openspace.addSceneGraphNode(Node)
+end)
+
+asset.onDeinitialize(function()
+  openspace.removeSceneGraphNode(Node)
+end)
diff --git a/data/assets/examples/pointclouds/points_colormappingsettings.asset b/data/assets/examples/renderable/renderablepointcloud/advanced/pointcloud_colormappingsettings.asset
similarity index 73%
rename from data/assets/examples/pointclouds/points_colormappingsettings.asset
rename to data/assets/examples/renderable/renderablepointcloud/advanced/pointcloud_colormappingsettings.asset
index c8e59ec27b..1f4a8dbdd3 100644
--- a/data/assets/examples/pointclouds/points_colormappingsettings.asset
+++ b/data/assets/examples/renderable/renderablepointcloud/advanced/pointcloud_colormappingsettings.asset
@@ -1,14 +1,16 @@
-local earthAsset = asset.require("scene/solarsystem/planets/earth/earth")
+-- Advanced Color Mapping
+-- This example shows almost all the available settings for the color mapping used
+-- for point clouds. This includes handling missing data values, using
+-- separate colors for values outside the data range used for the color mapping, as well
+-- as setting the default parameter and range.
+
 local colormaps = asset.require("util/default_colormaps")
 
-
-
-local Example = {
-  Identifier = "ExamplePoints_ColorMapping",
-  Parent = earthAsset.Earth.Identifier,
+local Node = {
+  Identifier = "RenderablePointCloud_Example_AdvancedColorMapping",
   Renderable = {
     Type = "RenderablePointCloud",
-    File = asset.resource("data/dummydata.csv"),
+    File = asset.resource("../data/dummydata.csv"),
     Coloring = {
       ColorMapping = {
         -- Use white-to-black color map
@@ -50,8 +52,8 @@ local Example = {
     }
   },
   GUI = {
-    Name = "Advanced Color Mapping Settings",
-    Path = "/Example/Point Clouds",
+    Name = "Advanced Color Mapping",
+    Path = "/Examples/RenderablePointCloud/Advanced",
     Description = [[Example of a point cloud where the range is set explicitly and
       specific colors are used for values outside the range, as well as for missing
       data values.]]
@@ -60,24 +62,9 @@ local Example = {
 
 
 asset.onInitialize(function()
-  openspace.addSceneGraphNode(Example)
+  openspace.addSceneGraphNode(Node)
 end)
 
 asset.onDeinitialize(function()
-  openspace.removeSceneGraphNode(Example)
+  openspace.removeSceneGraphNode(Node)
 end)
-
-asset.export(Example)
-
-
-
-asset.meta = {
-  Name = "Example - Advanced Color Mapping Settings",
-  Version = "1.0",
-  Description = [[Example of a point cloud where the range is set explicitly and
-    specific colors are used for values outside the range, as well as for missing
-    data values]],
-  Author = "OpenSpace Team",
-  URL = "http://openspaceproject.com",
-  License = "MIT license"
-}
diff --git a/data/assets/examples/pointclouds/points_datamapping.asset b/data/assets/examples/renderable/renderablepointcloud/advanced/pointcloud_datamapping.asset
similarity index 57%
rename from data/assets/examples/pointclouds/points_datamapping.asset
rename to data/assets/examples/renderable/renderablepointcloud/advanced/pointcloud_datamapping.asset
index f7b5f3d765..30f93d6a03 100644
--- a/data/assets/examples/pointclouds/points_datamapping.asset
+++ b/data/assets/examples/renderable/renderablepointcloud/advanced/pointcloud_datamapping.asset
@@ -1,14 +1,15 @@
-local earthAsset = asset.require("scene/solarsystem/planets/earth/earth")
+-- Custom Data Mapping
+-- Example of a point cloud with a custom data mapping. The X, Y, and Z position are
+-- mapped to other columns in the dataset. The data mapping also includes some settings
+-- for missing data values and columns to exclude when loading the dataset.
+
 local colormaps = asset.require("util/default_colormaps")
 
-
-
-local Example = {
-  Identifier = "ExamplePoints_DataMapping",
-  Parent = earthAsset.Earth.Identifier,
+local Node = {
+  Identifier = "RenderablePointCloud_Example_DataMapping",
   Renderable = {
     Type = "RenderablePointCloud",
-    File = asset.resource("data/dummydata.csv"),
+    File = asset.resource("../data/dummydata.csv"),
     DataMapping = {
       -- Using the DataMapping, we can specify the X, Y and Z values of the point
       -- positions to be set by any value in the dataset, without changing the dataset
@@ -34,36 +35,19 @@ local Example = {
         ShowMissingData = true,
         NoDataColor = { 1.0, 0.0, 0.0, 1.0 }
       }
-    },
+    }
   },
   GUI = {
-    Name = "Data Mapping",
-    Path = "/Example/Point Clouds",
-    Description = [[Example of a point cloud where the X, Y and Z position are mapped to
-      other columns in the dataset.]]
+    Name = "Custom Data Mapping",
+    Path = "/Examples/RenderablePointCloud/Advanced"
   }
 }
 
 
 asset.onInitialize(function()
-  openspace.addSceneGraphNode(Example)
+  openspace.addSceneGraphNode(Node)
 end)
 
 asset.onDeinitialize(function()
-  openspace.removeSceneGraphNode(Example)
+  openspace.removeSceneGraphNode(Node)
 end)
-
-asset.export(Example)
-
-
-
-asset.meta = {
-  Name = "Example - Point Cloud with Custom Data Mapping",
-  Version = "1.0",
-  Description = [[Example of a point cloud where the X, Y and Z position are mapped to
-    other columns in the dataset. The data mapping also includes some settings for
-    missing data values and columns to exclude when loading the dataset]],
-  Author = "OpenSpace Team",
-  URL = "http://openspaceproject.com",
-  License = "MIT license"
-}
diff --git a/data/assets/examples/pointclouds/points_fading.asset b/data/assets/examples/renderable/renderablepointcloud/advanced/pointcloud_fading.asset
similarity index 51%
rename from data/assets/examples/pointclouds/points_fading.asset
rename to data/assets/examples/renderable/renderablepointcloud/advanced/pointcloud_fading.asset
index 2b9b5ea604..aed4d3e44c 100644
--- a/data/assets/examples/pointclouds/points_fading.asset
+++ b/data/assets/examples/renderable/renderablepointcloud/advanced/pointcloud_fading.asset
@@ -1,15 +1,11 @@
-local earthAsset = asset.require("scene/solarsystem/planets/earth/earth")
+-- Fading
+-- Example of a point cloud with distance-based fading.
 
-
-
-local EarthRadius = 6371000
-
-local Example = {
-  Identifier = "ExamplePoints_Fading",
-  Parent = earthAsset.Earth.Identifier,
+local Node = {
+  Identifier = "RenderablePointCloud_Example_Fading",
   Renderable = {
     Type = "RenderablePointCloud",
-    File = asset.resource("data/dummydata.csv"),
+    File = asset.resource("../data/dummydata.csv"),
     Coloring = {
       FixedColor = { 0.0, 0.3, 1.0 }
     },
@@ -18,30 +14,29 @@ local Example = {
       -- when the camera is closer than the first value, and fully visible when the
       -- camera is further away then the last value. In-between they will linearly
       -- fade in or out
-      FadeInDistances = { 15.0 * EarthRadius, 35.0 * EarthRadius }
+      FadeInDistances = { 150000000.0, 350000000.0 }
     }
   },
   GUI = {
-    Name = "PointCloud - Fading",
-    Path = "/Example/Point Clouds",
+    Name = "Fading",
+    Path = "/Examples/RenderablePointCloud/Advanced",
     Description = [[Example of a point cloud with distance-based fading (the points
       are visible when the camera reaches a certain distance away from the origin)]]
   }
 }
 
-local Example_Invert = {
-  Identifier = "ExamplePoints_FadingInverted",
-  Parent = earthAsset.Earth.Identifier,
-  -- Rotate so that the points don't overlap with the previous ones
+local Node_Invert = {
+  Identifier = "RenderablePointCloud_Example_FadingInverted",
+  -- Rotate to not overlap with the other dataset
   Transform = {
     Rotation = {
       Type = "StaticRotation",
-      Rotation = { 0, math.pi, 0 }
+      Rotation = { 0, 0, -0.5 * math.pi }
     }
   },
   Renderable = {
     Type = "RenderablePointCloud",
-    File = asset.resource("data/dummydata.csv"),
+    File = asset.resource("../data/dummydata.csv"),
     Coloring = {
       FixedColor = { 1.0, 0.3, 0.0 }
     },
@@ -49,13 +44,13 @@ local Example_Invert = {
       -- Use the same fade distances, but invert the fading so that the points are
       -- visible when the camera is closer to the origin that the first value, and
       -- invisible when further away than the last value
-      FadeInDistances = { 15.0 * EarthRadius, 35.0 * EarthRadius },
+      FadeInDistances = { 150000000.0, 350000000.0 },
       Invert = true
     }
   },
   GUI = {
-    Name = "PointCloud - Fading (Inverted)",
-    Path = "/Example/Point Clouds",
+    Name = "Fading (Inverted)",
+    Path = "/Examples/RenderablePointCloud/Advanced",
     Description = [[Example of a point cloud with inverted distance-based fading
       (the points are visible when the camera is close to the origin, and invisible
       when further away)]]
@@ -64,25 +59,11 @@ local Example_Invert = {
 
 
 asset.onInitialize(function()
-  openspace.addSceneGraphNode(Example)
-  openspace.addSceneGraphNode(Example_Invert)
+  openspace.addSceneGraphNode(Node)
+  openspace.addSceneGraphNode(Node_Invert)
 end)
 
 asset.onDeinitialize(function()
-  openspace.removeSceneGraphNode(Example_Invert)
-  openspace.removeSceneGraphNode(Example)
+  openspace.removeSceneGraphNode(Node_Invert)
+  openspace.removeSceneGraphNode(Node)
 end)
-
-asset.export(Example)
-asset.export(Example_Invert)
-
-
-
-asset.meta = {
-  Name = "Example - Point Cloud with Fading",
-  Version = "1.0",
-  Description = [[Example of a point cloud with distance-based fading]],
-  Author = "OpenSpace Team",
-  URL = "http://openspaceproject.com",
-  License = "MIT license"
-}
diff --git a/data/assets/examples/renderable/renderablepointcloud/advanced/pointcloud_labels.asset b/data/assets/examples/renderable/renderablepointcloud/advanced/pointcloud_labels.asset
new file mode 100644
index 0000000000..5706fd02e2
--- /dev/null
+++ b/data/assets/examples/renderable/renderablepointcloud/advanced/pointcloud_labels.asset
@@ -0,0 +1,84 @@
+-- Labels
+-- This example creates a point cloud with labels created from a column in the dataset
+-- or from a separate .labels file.
+
+local Node = {
+  Identifier = "RenderablePointCloud_Example_Labels",
+  Renderable = {
+    Type = "RenderablePointCloud",
+    File = asset.resource("../data/dummydata.csv"),
+    Coloring = {
+      FixedColor = { 0.0, 1.0, 0.3 }
+    },
+    DataMapping = {
+      -- When loading labels from a CSV file, we need to provide information about
+      -- which column corresponds to the name to be used for the labels (this is
+      -- not required for SPECK files)
+      Name = "number_withNan"
+    },
+    -- Add a unit to interpret the points to be in kilometers rather than meters
+    Unit = "Km",
+    -- Add some labels. We also need to enable them for them to be visible.
+    -- The positions and text of the labels will be set based on the information
+    -- in the CSV file
+    Labels = {
+      Enabled = true,
+      -- Give the labels a size that looks good
+      Size = 7.5
+    }
+  },
+  GUI = {
+    Name = "Labels",
+    Path = "/Examples/RenderablePointCloud/Advanced"
+  }
+}
+
+-- @TODO (2024-04-30, emmbr) These labels are not correctly oriented towards the camera.
+-- This is a known bug waiting to be fixed (related Github issues are #2493, #1605,
+-- and #1266).
+
+local Node_LabelsFile = {
+  Identifier = "RenderablePointCloud_Example_LabelsFile",
+  -- Rotate to not overlap with the other dataset
+  Transform = {
+    Rotation = {
+      Type = "StaticRotation",
+      Rotation = { 0, 0, -0.5 * math.pi }
+    }
+  },
+  Renderable = {
+    Type = "RenderablePointCloud",
+    File = asset.resource("../data/dummydata.csv"),
+    Coloring = {
+      FixedColor = { 0.0, 0.3, 1.0 }
+    },
+    -- Add a unit to interpret the points to be in kilometers rather than meters
+    Unit = "Km",
+    -- Also load a label file with the positions of the label (in this case they are the
+    -- same as in the CSV file, but that is not always the case)
+    Labels = {
+      Enabled = true,
+      File = asset.resource("../data/dummydata.label"),
+      Size = 7.5,
+      -- When we add an explicit label file we also have to specify the unit, if it is
+      -- different than meters
+      Unit = "Km"
+    }
+  },
+  GUI = {
+    Name = "Labels - Custom File",
+    Path = "/Examples/RenderablePointCloud/Advanced",
+    Description = [[Example of a point cloud with labels, created from a .label file]]
+  }
+}
+
+asset.onInitialize(function()
+  openspace.addSceneGraphNode(Node)
+  openspace.addSceneGraphNode(Node_LabelsFile)
+end)
+
+asset.onDeinitialize(function()
+  openspace.removeSceneGraphNode(Node)
+  openspace.removeSceneGraphNode(Node_LabelsFile)
+end)
+
diff --git a/data/assets/examples/renderable/renderablepointcloud/advanced/pointcloud_multitextured.asset b/data/assets/examples/renderable/renderablepointcloud/advanced/pointcloud_multitextured.asset
new file mode 100644
index 0000000000..128317d69a
--- /dev/null
+++ b/data/assets/examples/renderable/renderablepointcloud/advanced/pointcloud_multitextured.asset
@@ -0,0 +1,95 @@
+-- Multi-textured Points
+-- Example of point clouds where multiple textures are used for the points,
+-- based on information in the dataset. The dataset may be either CSV or Speck format.
+--
+-- Load data from a CSV file. This requires additional information to be provided through
+-- the DataMapping:
+-- 1) Which column in the dataset that corresponds to the texture, and
+-- 2) a separate file that maps that value to a texture file.
+
+local Node = {
+  Identifier = "RenderablePointCloud_Example_MultiTextured_CSV",
+  Renderable = {
+    Type = "RenderablePointCloud",
+    File = asset.resource("../data/multitextured_csv/textured_points.csv"),
+    DataMapping = {
+      -- The name of the column in the CSV file that corresponds to the texture (should
+      -- be an integer)
+      TextureColumn = "texture",
+      -- A Texture mapping file that provides information about which value/index
+      -- corresponds to which texture file
+      TextureMapFile = asset.resource("../data/multitextured_csv/texturemap.tmap")
+    },
+    Texture = {
+      -- Where to find the texture files (in this case, in the OpenSpace data folder)
+      Folder = openspace.absPath("${DATA}")
+    },
+    UseAdditiveBlending = false
+  },
+  GUI = {
+    Name = "Multi-Textured",
+    Path = "/Examples/RenderablePointCloud/Advanced"
+  }
+}
+
+
+-- Interpolated
+-- Multi-texturing works also for interpolated point clouds. Here, we let the same
+-- dataset as used above be interpreted as representing only two points, with a different
+-- texture. Note that the textures will be set based on the first two data items and will
+-- not be changed during interpolation
+local Node_Interpolated = {
+  Identifier = "RenderablePointCloud_Example_MultiTextured_Interpolated",
+  Renderable = {
+    Type = "RenderableInterpolatedPoints",
+    File = asset.resource("../data/multitextured_csv/textured_points.csv"),
+    NumberOfObjects = 2,
+    DataMapping = {
+      TextureColumn = "texture",
+      TextureMapFile = asset.resource("../data/multitextured_csv/texturemap.tmap")
+    },
+    Texture = {
+      Folder = openspace.absPath("${DATA}")
+    },
+    UseAdditiveBlending = false
+  },
+  GUI = {
+    Name = "Multi-Textured (with interpolation)",
+    Path = "/Examples/RenderablePointCloud/Advanced"
+  }
+}
+
+-- Load data from a Speck file. This allows storing all data in one single file, including
+-- the texture mapping) Note that we disable this scene graph node per default here, as it
+-- shows the same information as the CSV version
+local Node_Speck = {
+  Identifier = "RenderablePointCloud_Example_MultiTextured_Speck",
+  Renderable = {
+    Type = "RenderablePointCloud",
+    Enabled = false,
+    -- When loading multi-texture information from a speck file, we do not need a
+    -- DataMapping entry - all information is in the file
+    File = asset.resource("../data/multitextured_speck/textures_points.speck"),
+    Texture = {
+      -- However, we do still need to specify where the textures are located
+      Folder = openspace.absPath("${DATA}")
+    },
+    UseAdditiveBlending = false
+  },
+  GUI = {
+    Name = "Multi-Textured (Speck file)",
+    Path = "/Examples/RenderablePointCloud/Advanced"
+  }
+}
+
+asset.onInitialize(function()
+  openspace.addSceneGraphNode(Node)
+  openspace.addSceneGraphNode(Node_Interpolated)
+  openspace.addSceneGraphNode(Node_Speck)
+end)
+
+asset.onDeinitialize(function()
+  openspace.removeSceneGraphNode(Node_Speck)
+  openspace.removeSceneGraphNode(Node_Interpolated)
+  openspace.removeSceneGraphNode(Node)
+end)
diff --git a/data/assets/examples/pointclouds/data/dummydata.csv b/data/assets/examples/renderable/renderablepointcloud/data/dummydata.csv
similarity index 100%
rename from data/assets/examples/pointclouds/data/dummydata.csv
rename to data/assets/examples/renderable/renderablepointcloud/data/dummydata.csv
diff --git a/data/assets/examples/pointclouds/data/dummydata.label b/data/assets/examples/renderable/renderablepointcloud/data/dummydata.label
similarity index 100%
rename from data/assets/examples/pointclouds/data/dummydata.label
rename to data/assets/examples/renderable/renderablepointcloud/data/dummydata.label
diff --git a/data/assets/examples/pointclouds/data/textured_csv/textured_points.csv b/data/assets/examples/renderable/renderablepointcloud/data/multitextured_csv/textured_points.csv
similarity index 100%
rename from data/assets/examples/pointclouds/data/textured_csv/textured_points.csv
rename to data/assets/examples/renderable/renderablepointcloud/data/multitextured_csv/textured_points.csv
diff --git a/data/assets/examples/pointclouds/data/textured_csv/texturemap.tmap b/data/assets/examples/renderable/renderablepointcloud/data/multitextured_csv/texturemap.tmap
similarity index 100%
rename from data/assets/examples/pointclouds/data/textured_csv/texturemap.tmap
rename to data/assets/examples/renderable/renderablepointcloud/data/multitextured_csv/texturemap.tmap
diff --git a/data/assets/examples/pointclouds/data/textured_speck/textures_points.speck b/data/assets/examples/renderable/renderablepointcloud/data/multitextured_speck/textures_points.speck
similarity index 100%
rename from data/assets/examples/pointclouds/data/textured_speck/textures_points.speck
rename to data/assets/examples/renderable/renderablepointcloud/data/multitextured_speck/textures_points.speck
diff --git a/data/assets/examples/renderable/renderablepointcloud/pointcloud.asset b/data/assets/examples/renderable/renderablepointcloud/pointcloud.asset
new file mode 100644
index 0000000000..f0d77b97c1
--- /dev/null
+++ b/data/assets/examples/renderable/renderablepointcloud/pointcloud.asset
@@ -0,0 +1,26 @@
+-- Basic (Fixed Color and Size)
+-- This example creates a point cloud with a fixed color and default size.
+-- All the points will have the same size.
+
+local Node = {
+  Identifier = "RenderablePointCloud_Example",
+  Renderable = {
+    Type = "RenderablePointCloud",
+    File = asset.resource("data/dummydata.csv"),
+    Coloring = {
+      FixedColor = { 0.0, 0.5, 0.0 }
+    }
+  },
+  GUI = {
+    Name = "Fixed Color and Size",
+    Path = "/Examples/RenderablePointCloud"
+  }
+}
+
+asset.onInitialize(function()
+  openspace.addSceneGraphNode(Node)
+end)
+
+asset.onDeinitialize(function()
+  openspace.removeSceneGraphNode(Node)
+end)
diff --git a/data/assets/examples/renderable/renderablepointcloud/pointcloud_colormapped.asset b/data/assets/examples/renderable/renderablepointcloud/pointcloud_colormapped.asset
new file mode 100644
index 0000000000..eb79b9ff86
--- /dev/null
+++ b/data/assets/examples/renderable/renderablepointcloud/pointcloud_colormapped.asset
@@ -0,0 +1,35 @@
+-- Color Mapping
+-- This example creates a point cloud where the color is set from a color map. All the
+-- data column in the dataset will be exposed in the user interface and can be used for
+-- color mapping during runtime. The range for the color mapping is set based on the min
+-- and max values in the dataset, for each column respoectively.
+--
+-- Note that the color map is loaded from another asset. This is a utility asset that
+-- includes some common color maps for general usage.
+
+local colormaps = asset.require("util/default_colormaps")
+
+local Node = {
+  Identifier = "RenderablePointCloud_Example_ColorMapped",
+  Renderable = {
+    Type = "RenderablePointCloud",
+    File = asset.resource("data/dummydata.csv"),
+    Coloring = {
+      ColorMapping = {
+        File = colormaps.Uniform.Viridis
+      }
+    }
+  },
+  GUI = {
+    Name = "Color Mapped",
+    Path = "/Examples/RenderablePointCloud"
+  }
+}
+
+asset.onInitialize(function()
+  openspace.addSceneGraphNode(Node)
+end)
+
+asset.onDeinitialize(function()
+  openspace.removeSceneGraphNode(Node)
+end)
diff --git a/data/assets/examples/renderable/renderablepointcloud/pointcloud_colormapped_moresettings.asset b/data/assets/examples/renderable/renderablepointcloud/pointcloud_colormapped_moresettings.asset
new file mode 100644
index 0000000000..b23cc5be44
--- /dev/null
+++ b/data/assets/examples/renderable/renderablepointcloud/pointcloud_colormapped_moresettings.asset
@@ -0,0 +1,48 @@
+-- Color Mapping with Pre-set Options and Missing Values
+-- This example creates a point cloud where the color is set from a color map and the
+-- options for parameters to color by are pre-set to a limited number of options,
+-- including settings for which range to use. It also includes settings to render
+-- missing data values in gray.
+--
+-- Note that the color map is loaded from another asset. This is a utility asset that
+-- includes some common color maps for general usage.
+
+local colormaps = asset.require("util/default_colormaps")
+
+local Node = {
+  Identifier = "RenderablePointCloud_Example_ColorMapped_More",
+  Renderable = {
+    Type = "RenderablePointCloud",
+    File = asset.resource("data/dummydata.csv"),
+    Coloring = {
+      ColorMapping = {
+        File = colormaps.Uniform.Viridis,
+        -- Specify which parameters we want to show up in the user interface, as
+        -- well as what range we want the color mapping to be done based on. If not
+        -- included, all the columns in the data file would be exposed as options
+        ParameterOptions = {
+          { Key = "number_withNan" }, -- No range => compute min and max
+          { Key = "normaldist_withMissing", Range = { -0.5, 0.5 } }
+        },
+        -- Also show missing data values in a specific color
+        ShowMissingData = true,
+        NoDataColor = { 0.5, 0.5, 0.5, 1.0 }
+      }
+    },
+    SizeSettings = {
+      ScaleExponent = 6.5
+    }
+  },
+  GUI = {
+    Name = "Color Mapped with Settings",
+    Path = "/Examples/RenderablePointCloud"
+  }
+}
+
+asset.onInitialize(function()
+  openspace.addSceneGraphNode(Node)
+end)
+
+asset.onDeinitialize(function()
+  openspace.removeSceneGraphNode(Node)
+end)
diff --git a/data/assets/examples/renderable/renderablepointcloud/pointcloud_maxsize.asset b/data/assets/examples/renderable/renderablepointcloud/pointcloud_maxsize.asset
new file mode 100644
index 0000000000..214343b630
--- /dev/null
+++ b/data/assets/examples/renderable/renderablepointcloud/pointcloud_maxsize.asset
@@ -0,0 +1,32 @@
+-- Limit Max Size
+-- This example creates a point cloud where the size of the points is limited to a
+-- given max size. The color is set to a fixed value.
+
+local Node = {
+  Identifier = "RenderablePointCloud_Example_MaxSize",
+  Renderable = {
+    Type = "RenderablePointCloud",
+    File = asset.resource("data/dummydata.csv"),
+    Coloring = {
+      FixedColor = { 0.0, 0.8, 0.8 }
+    },
+    -- Set the max size of the points. The larger the "MaxSize" value, the larger the
+    -- points are allowed to get when moving the camera closer to them
+    SizeSettings = {
+      MaxSize = 0.7,
+      EnableMaxSizeControl = true
+    }
+  },
+  GUI = {
+    Name = "Max Size",
+    Path = "/Examples/RenderablePointCloud"
+  }
+}
+
+asset.onInitialize(function()
+  openspace.addSceneGraphNode(Node)
+end)
+
+asset.onDeinitialize(function()
+  openspace.removeSceneGraphNode(Node)
+end)
diff --git a/data/assets/examples/renderable/renderablepointcloud/pointcloud_outline.asset b/data/assets/examples/renderable/renderablepointcloud/pointcloud_outline.asset
new file mode 100644
index 0000000000..cb26def785
--- /dev/null
+++ b/data/assets/examples/renderable/renderablepointcloud/pointcloud_outline.asset
@@ -0,0 +1,30 @@
+-- Draw Point Outline
+-- This example creates a point cloud where the points have a colored outline with a
+-- given color and thickness (weight).
+
+local Node = {
+  Identifier = "RenderablePointCloud_Example_Outline",
+  Renderable = {
+    Type = "RenderablePointCloud",
+    File = asset.resource("data/dummydata.csv"),
+    Coloring = {
+      EnableOutline = true,
+      OutlineColor = { 0.2, 0.2, 1.0 },
+      OutlineWeight = 0.1
+    },
+    -- It might be desired to disable additive blending when using an outline
+    UseAdditiveBlending = false
+  },
+  GUI = {
+    Name = "Outlined",
+    Path = "/Examples/RenderablePointCloud"
+  }
+}
+
+asset.onInitialize(function()
+  openspace.addSceneGraphNode(Node)
+end)
+
+asset.onDeinitialize(function()
+  openspace.removeSceneGraphNode(Node)
+end)
diff --git a/data/assets/examples/renderable/renderablepointcloud/pointcloud_scaled.asset b/data/assets/examples/renderable/renderablepointcloud/pointcloud_scaled.asset
new file mode 100644
index 0000000000..25ecd8b969
--- /dev/null
+++ b/data/assets/examples/renderable/renderablepointcloud/pointcloud_scaled.asset
@@ -0,0 +1,33 @@
+-- Point Size / Scaling
+-- This example creates a point cloud where the size of the points is set by entering a
+-- a scale exponent. This makes it so that the points will be given a world-scale size of
+-- 10 to the power of the provided scale exponent.
+
+local Node = {
+  Identifier = "RenderablePointCloud_Example_Scaled",
+  Renderable = {
+    Type = "RenderablePointCloud",
+    File = asset.resource("data/dummydata.csv"),
+    Coloring = {
+      FixedColor = { 0.0, 0.0, 0.8 }
+    },
+    SizeSettings = {
+      -- We set the exponent for the scale explicitly, to a value that
+      -- gives the points a suitable size based on their world-space coordinates
+      ScaleExponent = 6.5
+    }
+  },
+  GUI = {
+    Name = "Point Size / Scaling",
+    Path = "/Examples/RenderablePointCloud",
+    Description = "Point cloud with configured point size"
+  }
+}
+
+asset.onInitialize(function()
+  openspace.addSceneGraphNode(Node)
+end)
+
+asset.onDeinitialize(function()
+  openspace.removeSceneGraphNode(Node)
+end)
diff --git a/data/assets/examples/renderable/renderablepointcloud/pointcloud_scaledfromdata.asset b/data/assets/examples/renderable/renderablepointcloud/pointcloud_scaledfromdata.asset
new file mode 100644
index 0000000000..c2d2e02fd1
--- /dev/null
+++ b/data/assets/examples/renderable/renderablepointcloud/pointcloud_scaledfromdata.asset
@@ -0,0 +1,40 @@
+-- Point Size from Data
+-- This example creates a point cloud where the size of the points is computed based on
+-- a column in the dataset
+
+local Node = {
+  Identifier = "RenderablePointCloud_Example_ScaledFromData",
+  Renderable = {
+    Type = "RenderablePointCloud",
+    File = asset.resource("data/dummydata.csv"),
+    Coloring = {
+      FixedColor = { 0.5, 0.5, 0.0 }
+    },
+    SizeSettings = {
+      SizeMapping = {
+        -- The options for the columns that the points can be scaled by. The first
+        -- alternative in the list is chosen per default
+        ParameterOptions = { "a", "b" },
+        -- Specify which option we want to use for size mapping at start up. Here we
+        -- use the last of the provided options rather than the first one, which is
+        -- otherwise used by default
+        Parameter = "b"
+      },
+      -- The size mapping can be used together with other scale parameters, such as a
+      -- scale exponent or scale factor
+      ScaleExponent = 4.8
+    }
+  },
+  GUI = {
+    Name = "Size from Data",
+    Path = "/Examples/RenderablePointCloud"
+  }
+}
+
+asset.onInitialize(function()
+  openspace.addSceneGraphNode(Node)
+end)
+
+asset.onDeinitialize(function()
+  openspace.removeSceneGraphNode(Node)
+end)
diff --git a/data/assets/examples/renderable/renderablepointcloud/pointcloud_textured.asset b/data/assets/examples/renderable/renderablepointcloud/pointcloud_textured.asset
new file mode 100644
index 0000000000..2d79fd3212
--- /dev/null
+++ b/data/assets/examples/renderable/renderablepointcloud/pointcloud_textured.asset
@@ -0,0 +1,36 @@
+-- Textured
+-- This example creates a point cloud using a texture to render each point.
+--
+-- Note that other color related settings, like color mapping, can still be applied.
+-- The color will then be multiplied with the texture color.
+
+local Node = {
+  Identifier = "RenderablePointCloud_Example_Textured",
+  Renderable = {
+    Type = "RenderablePointCloud",
+    File = asset.resource("data/dummydata.csv"),
+    Texture = {
+      -- The path to the texture file. Here we use openspace.absPath so that we can use
+      -- the ${DATA} token to get the path to a texture in the "OpenSpace/data" folder,
+      -- but for a file at a relative location it would also work to use asset.resource,
+      -- like for the data file above
+      File = openspace.absPath("${DATA}/test3.jpg"),
+    },
+    -- Disable additive blending, so that points will be rendered with their actual color
+    -- and overlapping points will be sorted by depth. This works best when the points
+    -- have an opacity of 1
+    UseAdditiveBlending = false
+  },
+  GUI = {
+    Name = "Textured",
+    Path = "/Examples/RenderablePointCloud"
+  }
+}
+
+asset.onInitialize(function()
+  openspace.addSceneGraphNode(Node)
+end)
+
+asset.onDeinitialize(function()
+  openspace.removeSceneGraphNode(Node)
+end)
diff --git a/data/assets/examples/renderable/renderablepointcloud/pointcloud_units.asset b/data/assets/examples/renderable/renderablepointcloud/pointcloud_units.asset
new file mode 100644
index 0000000000..7621fe649b
--- /dev/null
+++ b/data/assets/examples/renderable/renderablepointcloud/pointcloud_units.asset
@@ -0,0 +1,24 @@
+-- Units
+-- This example creates a point cloud where the positions are interpreted to be in
+-- another unit than meters (here kilometers).
+
+local Node = {
+  Identifier = "RenderablePointCloud_Example_Units",
+  Renderable = {
+    Type = "RenderablePointCloud",
+    File = asset.resource("data/dummydata.csv"),
+    Unit = "Km"
+  },
+  GUI = {
+    Name = "Units",
+    Path = "/Examples/RenderablePointCloud"
+  }
+}
+
+asset.onInitialize(function()
+  openspace.addSceneGraphNode(Node)
+end)
+
+asset.onDeinitialize(function()
+  openspace.removeSceneGraphNode(Node)
+end)
diff --git a/data/assets/examples/renderable/renderablepolygoncloud/polygoncloud.asset b/data/assets/examples/renderable/renderablepolygoncloud/polygoncloud.asset
new file mode 100644
index 0000000000..269c6e306f
--- /dev/null
+++ b/data/assets/examples/renderable/renderablepolygoncloud/polygoncloud.asset
@@ -0,0 +1,29 @@
+-- Basic
+-- Example of a polygon cloud, which is a point cloud where a uniform polygon is used
+-- for the shape of the points.
+
+local Node = {
+  Identifier = "RenderablePolygonCloud_Example",
+  Renderable = {
+    Type = "RenderablePolygonCloud",
+    File = asset.resource("../renderablepointcloud/data/dummydata.csv"),
+    Coloring = {
+      FixedColor = { 0.8, 0.0, 0.0 }
+    },
+    -- Specify the number of sides for the polygon. 3 = triangle, 4 = square,
+    -- 5 = pentagon, 6 = hexagon, and so on
+    PolygonSides = 6
+  },
+  GUI = {
+    Name = "Basic",
+    Path = "/Examples/RenderablePolygonCloud"
+  }
+}
+
+asset.onInitialize(function()
+  openspace.addSceneGraphNode(Node)
+end)
+
+asset.onDeinitialize(function()
+  openspace.removeSceneGraphNode(Node)
+end)

From 708143d06e6eff9f6717a38739293960ecba7764 Mon Sep 17 00:00:00 2001
From: Ylva Selling <ylva.selling@liu.se>
Date: Tue, 23 Apr 2024 10:54:30 +0200
Subject: [PATCH 424/701] Make json file printout a separate function

---
 .../documentation/documentationengine.h       |  3 ++-
 src/documentation/documentationengine.cpp     | 26 +++++++------------
 src/engine/openspaceengine.cpp                |  2 +-
 src/engine/openspaceengine_lua.inl            |  2 +-
 4 files changed, 13 insertions(+), 20 deletions(-)

diff --git a/include/openspace/documentation/documentationengine.h b/include/openspace/documentation/documentationengine.h
index 17a9bb0991..cf9dbeff45 100644
--- a/include/openspace/documentation/documentationengine.h
+++ b/include/openspace/documentation/documentationengine.h
@@ -87,7 +87,8 @@ public:
      */
     static DocumentationEngine& ref();
 
-    void writeDocumentation() const;
+    void writeJavascriptDocumentation() const;
+    void writeJsonDocumentation() const;
 
     nlohmann::json generateScriptEngineJson() const;
     nlohmann::json generateFactoryManagerJson() const;
diff --git a/src/documentation/documentationengine.cpp b/src/documentation/documentationengine.cpp
index 5c69c9ba3e..904582cfa6 100644
--- a/src/documentation/documentationengine.cpp
+++ b/src/documentation/documentationengine.cpp
@@ -552,12 +552,7 @@ nlohmann::json DocumentationEngine::generateFactoryManagerJson() const {
     json.push_back(leftovers);
     sortJson(json, NameKey);
 
-    // I did not check the output of this for correctness ---abock
-    nlohmann::json result;
-    result[NameKey] = FactoryTitle;
-    result[DataKey] = json;
-
-    return result;
+    return json;
 }
 
 nlohmann::json DocumentationEngine::generateKeybindingsJson() const {
@@ -606,7 +601,7 @@ nlohmann::json DocumentationEngine::generatePropertyOwnerJson(
     return result;
 }
 
-void DocumentationEngine::writeDocumentation() const {
+void DocumentationEngine::writeJavascriptDocumentation() const {
     ZoneScoped;
 
     // Write documentation to json files if config file supplies path for doc files
@@ -628,8 +623,6 @@ void DocumentationEngine::writeDocumentation() const {
         global::renderEngine->scene()
     );
 
-    nlohmann::json scripting = generateScriptEngineJson();
-    nlohmann::json factory = generateFactoryManagerJson();
     nlohmann::json keybindings = generateKeybindingsJson();
     nlohmann::json license = generateLicenseGroupsJson();
     nlohmann::json sceneProperties = settings.get();
@@ -640,12 +633,6 @@ void DocumentationEngine::writeDocumentation() const {
     sceneProperties[NameKey] = SettingsTitle;
     sceneGraph[NameKey] = SceneTitle;
 
-    // Add this here so that the generateJson function is the same as before to ensure
-    // backwards compatibility
-    nlohmann::json scriptingResult;
-    scriptingResult[NameKey] = ScriptingTitle;
-    scriptingResult[DataKey] = scripting;
-
     nlohmann::json documentation = {
         sceneGraph, sceneProperties, actions, events, keybindings, license
     };
@@ -657,16 +644,21 @@ void DocumentationEngine::writeDocumentation() const {
     std::ofstream out = std::ofstream(absPath("${DOCUMENTATION}/documentationData.js"));
     out << "var data = " << result.dump();
     out.close();
+}
+
+void DocumentationEngine::writeJsonDocumentation() const {
+    nlohmann::json factory = generateFactoryManagerJson();
+    nlohmann::json scripting = generateScriptEngineJson();
 
     // Write two json files for the static docs page - asset components and scripting api
-    out.open(absPath("${DOCUMENTATION}/assetComponents.json"));
+    std::ofstream out = std::ofstream(absPath("${DOCUMENTATION}/assetComponents.json"));
     if (out) {
         out << factory.dump();
     }
     out.close();
     out.open(absPath("${DOCUMENTATION}/scriptingApi.json"));
     if (out) {
-        out << scriptingResult.dump();
+        out << scripting.dump();
     }
     out.close();
 }
diff --git a/src/engine/openspaceengine.cpp b/src/engine/openspaceengine.cpp
index cf91a8cf1c..04a5021b09 100644
--- a/src/engine/openspaceengine.cpp
+++ b/src/engine/openspaceengine.cpp
@@ -806,7 +806,7 @@ void OpenSpaceEngine::loadAssets() {
     runGlobalCustomizationScripts();
 
     _writeDocumentationTask = std::async(
-        &documentation::DocumentationEngine::writeDocumentation,
+        &documentation::DocumentationEngine::writeJavascriptDocumentation,
         DocEng
     );
 
diff --git a/src/engine/openspaceengine_lua.inl b/src/engine/openspaceengine_lua.inl
index 031eaa5193..616e64446b 100644
--- a/src/engine/openspaceengine_lua.inl
+++ b/src/engine/openspaceengine_lua.inl
@@ -39,7 +39,7 @@ namespace {
  * Writes out documentation files
  */
 [[codegen::luawrap]] void writeDocumentation() {
-    DocEng.writeDocumentation();
+    DocEng.writeJavascriptDocumentation();
 }
 
 // Sets the folder used for storing screenshots or session recording frames

From c79de65486c995e552673b23905eb724b6421762 Mon Sep 17 00:00:00 2001
From: Ylva Selling <ylva.selling@gmail.com>
Date: Tue, 30 Apr 2024 16:10:33 +0200
Subject: [PATCH 425/701] Update
 data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_Narrow_Angle_Camera.asset

Co-authored-by: Alexander Bock <alexander.bock@liu.se>
---
 .../planets/earth/moon/nasa-treks/LRO_Narrow_Angle_Camera.asset | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_Narrow_Angle_Camera.asset b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_Narrow_Angle_Camera.asset
index 314df1893f..80d2838451 100644
--- a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_Narrow_Angle_Camera.asset
+++ b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_Narrow_Angle_Camera.asset
@@ -293,7 +293,7 @@ asset.export("NAC_DTM_APOLLO17_SLOPE", treks_NAC_DTM_APOLLO17_SLOPE)
 
 
 asset.meta = {
-  Name = [NASA Treks Layers for Moon LRO_Narrow_Angle_Camera],
+  Name = [[NASA Treks Layers for Moon LRO_Narrow_Angle_Camera]],
   Version = "1.0",
   Author = "NASA/Treks",
   URL = "https://trek.nasa.gov/moon",

From c09e6da4057798ae4d377c132994921d54fd0023 Mon Sep 17 00:00:00 2001
From: Anders Lundkvist <57524362+lundkvistarn@users.noreply.github.com>
Date: Tue, 30 Apr 2024 12:01:15 -0400
Subject: [PATCH 426/701] Add example for RenderableSphereSpout (#3208)

* Example asset for RenderableSphereSpout

* fixed path to example texture

* removed unnecessary variables

* Update example and improve the documentation handling for the spout classes

* Apply new naming scheme

* added PR review changes

* changed to correct submodules

* submodules updated to correct version

* reverted wrong submodule updates

---------

Co-authored-by: Arohdin <adam.rohdin@liu.se>
Co-authored-by: Alexander Bock <alexander.bock@liu.se>
---
 .../renderablespherespout/spherespout.asset   | 30 +++++++++++++
 modules/spout/renderablespherespout.cpp       | 42 ++++++++----------
 modules/spout/spoutwrapper.cpp                | 43 ++++++++++++-------
 modules/spout/spoutwrapper.h                  |  5 +++
 4 files changed, 80 insertions(+), 40 deletions(-)
 create mode 100644 data/assets/examples/renderable/renderablespherespout/spherespout.asset

diff --git a/data/assets/examples/renderable/renderablespherespout/spherespout.asset b/data/assets/examples/renderable/renderablespherespout/spherespout.asset
new file mode 100644
index 0000000000..5bd9bc4001
--- /dev/null
+++ b/data/assets/examples/renderable/renderablespherespout/spherespout.asset
@@ -0,0 +1,30 @@
+-- Basic
+-- This example renders a sphere with a texture that is provided by another application
+-- on the same computer using the SPOUT library. Note that this library is only available
+-- on Windows. A SPOUT-enabled application can share a texture using a user-defined
+-- name, which is used as the `SpoutName` here to receive that image. This allows the
+-- integration of any generated image.
+
+local Node = {
+  Identifier = "RenderableSphereSpout_Example",
+  Renderable = {
+    Type = "RenderableSphereSpout",
+    Size = 333,
+    Segments = 32,
+    -- The name under which the other application is sharing an image
+    SpoutName = "WV_SPOUT"
+  },
+  GUI = {
+    Name = "Basic",
+    Path = "/Examples/RenderableSphereSpout"
+  }
+}
+
+asset.onInitialize(function()
+  openspace.addSceneGraphNode(Node)
+end)
+
+
+asset.onDeinitialize(function()
+  openspace.removeSceneGraphNode(Node)
+end)
\ No newline at end of file
diff --git a/modules/spout/renderablespherespout.cpp b/modules/spout/renderablespherespout.cpp
index 384bacd254..002be2e603 100644
--- a/modules/spout/renderablespherespout.cpp
+++ b/modules/spout/renderablespherespout.cpp
@@ -31,40 +31,32 @@
 #include <openspace/util/sphere.h>
 #include <ghoul/opengl/texture.h>
 
+// The RenderableSphereSpout can be used to render a sphere with a texture that is
+// provided by another application on the same computer using the SPOUT library. Note that
+// this library is only available on Windows.
+
+namespace {
+    struct [[codegen::Dictionary(RenderableSphereSpout)]] Parameters {
+        // Specifies the GUI name of the RenderableSphereSpout
+        std::optional<std::string> name;
+    };
+#include "renderablespherespout_codegen.cpp"
+} // namespace
+
 namespace openspace {
 
 documentation::Documentation RenderableSphereSpout::Documentation() {
-    using namespace openspace::documentation;
-    return {
-        "Renderable Sphere Spout",
-        "spout_sphere_spout",
-        "",
-        {
-            {
-                "Name",
-                new StringVerifier,
-                Optional::Yes,
-                "Specifies the GUI name of the RenderableSphereSpout"
-            },
-            {
-                spout::SpoutReceiverPropertyProxy::NameInfoProperty().identifier,
-                new StringVerifier,
-                Optional::Yes,
-                spout::SpoutReceiverPropertyProxy::NameInfoProperty().description
-            }
-        }
-    };
+    return codegen::doc<Parameters>(
+        "spout_renderablespherespout",
+        spout::SpoutReceiverPropertyProxy::Documentation()
+    );
 }
 
 RenderableSphereSpout::RenderableSphereSpout(const ghoul::Dictionary& dictionary)
     : RenderableSphere(dictionary)
     , _spoutReceiver(*this, dictionary)
 {
-    documentation::testSpecificationAndThrow(
-        Documentation(),
-        dictionary,
-        "RenderableSphereSpout"
-    );
+    codegen::bake<Parameters>(dictionary);
 
     int iIdentifier = 0;
     if (_identifier.empty()) {
diff --git a/modules/spout/spoutwrapper.cpp b/modules/spout/spoutwrapper.cpp
index 35218c3224..2a7dec7016 100644
--- a/modules/spout/spoutwrapper.cpp
+++ b/modules/spout/spoutwrapper.cpp
@@ -45,7 +45,7 @@ namespace {
         "SpoutName",
         "Spout Receiver Name",
         "This value explicitly sets the Spout receiver to use a specific name. If this "
-        "is not a valid name, an empty image is used.",
+        "is not a valid name, the first Spout image is used instead",
         openspace::properties::Property::Visibility::AdvancedUser
     };
 
@@ -64,6 +64,18 @@ namespace {
         "If this property is trigged, the 'SpoutSelection' options will be refreshed.",
         openspace::properties::Property::Visibility::AdvancedUser
     };
+
+    struct [[codegen::Dictionary(SpoutReceiver)]] ReceiverParameters {
+        // [[codegen::verbatim(NameReceiverInfo.description)]]
+        std::optional<std::string> spoutName;
+    };
+
+    struct [[codegen::Dictionary(SpoutSender)]] SenderParameters {
+        // [[codegen::verbatim(NameSenderInfo.description)]]
+        std::string spoutName;
+    };
+
+#include "spoutwrapper_codegen.cpp"
 } // namespace
 
 namespace openspace::spout {
@@ -127,7 +139,7 @@ SpoutReceiver::SpoutReceiver() {}
 
 SpoutReceiver::~SpoutReceiver() {}
 
-const std::vector<std::string> &SpoutReceiver::spoutReceiverList() {
+const std::vector<std::string>& SpoutReceiver::spoutReceiverList() {
     if (!_spoutHandle) {
         return _receiverList;
     }
@@ -338,18 +350,20 @@ const properties::Property::PropertyInfo& SpoutReceiverPropertyProxy::UpdateInfo
     return UpdateInfo;
 }
 
+documentation::Documentation SpoutReceiverPropertyProxy::Documentation() {
+    return codegen::doc<ReceiverParameters>("spout_receiver");
+}
+
 SpoutReceiverPropertyProxy::SpoutReceiverPropertyProxy(properties::PropertyOwner& owner,
                                                       const ghoul::Dictionary& dictionary)
     : _spoutName(NameReceiverInfo)
     , _spoutSelection(SelectionInfo)
     , _updateSelection(UpdateInfo)
 {
-    if (dictionary.hasKey(NameReceiverInfo.identifier)) {
-        _spoutName = dictionary.value<std::string>(NameReceiverInfo.identifier);
-    }
-    else {
-        _isSelectAny = true;
-    }
+    const ReceiverParameters p = codegen::bake<ReceiverParameters>(dictionary);
+
+    _spoutName = p.spoutName.value_or(_spoutName);
+    _isSelectAny = !p.spoutName.has_value();
 
     _spoutName.onChange([this]() { _isSpoutDirty = true; });
     owner.addProperty(_spoutName);
@@ -407,7 +421,6 @@ void SpoutReceiverPropertyProxy::releaseReceiver() {
     SpoutReceiver::releaseReceiver();
 }
 
-
 SpoutSender::SpoutSender() {}
 
 SpoutSender::~SpoutSender() {}
@@ -580,17 +593,17 @@ const properties::Property::PropertyInfo& SpoutSenderPropertyProxy::NameInfoProp
     return NameSenderInfo;
 }
 
+documentation::Documentation SpoutSenderPropertyProxy::Documentation() {
+    return codegen::doc<SenderParameters>("spout_sender");
+}
+
 SpoutSenderPropertyProxy::SpoutSenderPropertyProxy(properties::PropertyOwner& owner,
                                                    const ghoul::Dictionary& dictionary)
     : _spoutName(NameSenderInfo)
 {
-    if (dictionary.hasKey(NameSenderInfo.identifier)) {
-        _spoutName = dictionary.value<std::string>(NameSenderInfo.identifier);
-    }
-    else {
-        LWARNING(std::format("Sender does not have a name"));
-    }
+    const SenderParameters p = codegen::bake<SenderParameters>(dictionary);
 
+    _spoutName = p.spoutName;
     _spoutName.onChange([this]() { _isSpoutDirty = true; });
     owner.addProperty(_spoutName);
 }
diff --git a/modules/spout/spoutwrapper.h b/modules/spout/spoutwrapper.h
index 8753a60ed4..598b521bb5 100644
--- a/modules/spout/spoutwrapper.h
+++ b/modules/spout/spoutwrapper.h
@@ -25,6 +25,7 @@
 #ifndef __OPENSPACE_MODULE_SPOUT___SPOUTWRAPPER___H__
 #define __OPENSPACE_MODULE_SPOUT___SPOUTWRAPPER___H__
 
+#include <openspace/documentation/documentation.h>
 #include <openspace/properties/optionproperty.h>
 #include <openspace/properties/propertyowner.h>
 #include <openspace/properties/stringproperty.h>
@@ -123,6 +124,8 @@ public:
     bool updateReceiver() override;
     void releaseReceiver() override;
 
+    static documentation::Documentation Documentation();
+
 private:
     properties::StringProperty _spoutName;
     properties::OptionProperty _spoutSelection;
@@ -179,6 +182,8 @@ public:
     bool updateSender(unsigned int texture, unsigned int textureType) override;
     void releaseSender() override;
 
+    static documentation::Documentation Documentation();
+
 private:
     properties::StringProperty _spoutName;
 

From 378c3f3b19f13c2e60e0678a48657f66a468c50b Mon Sep 17 00:00:00 2001
From: Emma Broman <emma.broman@liu.se>
Date: Thu, 2 May 2024 10:55:20 +0200
Subject: [PATCH 427/701] Add missing base class documentation for
 constellations renderables

---
 modules/space/rendering/renderableconstellationbounds.cpp | 5 ++++-
 modules/space/rendering/renderableconstellationlines.cpp  | 5 ++++-
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/modules/space/rendering/renderableconstellationbounds.cpp b/modules/space/rendering/renderableconstellationbounds.cpp
index d4fc73dae2..06c24c71de 100644
--- a/modules/space/rendering/renderableconstellationbounds.cpp
+++ b/modules/space/rendering/renderableconstellationbounds.cpp
@@ -73,7 +73,10 @@ namespace {
 namespace openspace {
 
 documentation::Documentation RenderableConstellationBounds::Documentation() {
-    return codegen::doc<Parameters>("space_renderable_constellationbounds");
+    return codegen::doc<Parameters>(
+        "space_renderable_constellationbounds",
+        RenderableConstellationsBase::Documentation()
+    );
 }
 
 RenderableConstellationBounds::RenderableConstellationBounds(
diff --git a/modules/space/rendering/renderableconstellationlines.cpp b/modules/space/rendering/renderableconstellationlines.cpp
index e0d2136eaa..269957e3ca 100644
--- a/modules/space/rendering/renderableconstellationlines.cpp
+++ b/modules/space/rendering/renderableconstellationlines.cpp
@@ -101,7 +101,10 @@ namespace {
 namespace openspace {
 
 documentation::Documentation RenderableConstellationLines::Documentation() {
-    return codegen::doc<Parameters>("space_renderable_constellationlines");
+    return codegen::doc<Parameters>(
+        "space_renderable_constellationlines",
+        RenderableConstellationsBase::Documentation()
+    );
 }
 
 RenderableConstellationLines::RenderableConstellationLines(

From 10929485184a8e4d30bf8bf6f24b353b921edcb2 Mon Sep 17 00:00:00 2001
From: Emma Broman <emma.broman@liu.se>
Date: Thu, 2 May 2024 11:08:59 +0200
Subject: [PATCH 428/701] Make `useCaching` for point cloud also affect color
 map

Makes it so that changes can be done to the color map file without having to delete the cache, and decreases confusion about that one file is cached when the other isn't
---
 include/openspace/rendering/colormappingcomponent.h |  3 ++-
 .../rendering/pointcloud/renderablepointcloud.cpp   | 13 +++++++------
 src/rendering/colormappingcomponent.cpp             | 11 +++++++++--
 3 files changed, 18 insertions(+), 9 deletions(-)

diff --git a/include/openspace/rendering/colormappingcomponent.h b/include/openspace/rendering/colormappingcomponent.h
index fb7881819e..f2e904cead 100644
--- a/include/openspace/rendering/colormappingcomponent.h
+++ b/include/openspace/rendering/colormappingcomponent.h
@@ -62,8 +62,9 @@ public:
      * Initialize the color map information (ranges, etc.) based on the input dataset.
      *
      * \param dataset The *loaded* input dataset
+     * \param useCaching Whether caching should be used when loading the color map file
      */
-    void initialize(const dataloader::Dataset& dataset);
+    void initialize(const dataloader::Dataset& dataset, bool useCaching = true);
 
     /**
      * Initialize a 1D texture based on the entries in the color map file.
diff --git a/modules/base/rendering/pointcloud/renderablepointcloud.cpp b/modules/base/rendering/pointcloud/renderablepointcloud.cpp
index d15a2486a5..2577fca49c 100644
--- a/modules/base/rendering/pointcloud/renderablepointcloud.cpp
+++ b/modules/base/rendering/pointcloud/renderablepointcloud.cpp
@@ -362,11 +362,12 @@ namespace {
         // rendered. Can be either a CSV or SPECK file
         std::optional<std::filesystem::path> file;
 
-        // If true (default), the loaded dataset will be cached so that it can be loaded
-        // faster at a later time. This does however mean that any updates to the values
-        // in the dataset will not lead to changes in the rendering without first removing
-        // the cached file. Set it to false to disable caching. This can be useful for
-        // example when working on importing a new dataset
+        // If true (default), the loaded dataset and color map will be cached so that they
+        // can be loaded faster at a later time. This does however mean that any updates
+        // to the values in the dataset will not lead to changes in the rendering without
+        // first removing the cached file. Set it to false to disable caching. This can be
+        // useful for example when working on importing a new dataset or when making
+        // changes to the color map.
         std::optional<bool> useCaching;
 
         // A dictionary specifying details on how to load the dataset. Updating the data
@@ -871,7 +872,7 @@ void RenderablePointCloud::initialize() {
     }
 
     if (_hasDataFile && _hasColorMapFile) {
-        _colorSettings.colorMapping->initialize(_dataset);
+        _colorSettings.colorMapping->initialize(_dataset, _useCaching);
     }
 
     if (_hasLabels) {
diff --git a/src/rendering/colormappingcomponent.cpp b/src/rendering/colormappingcomponent.cpp
index e3bc535ac2..7850452988 100644
--- a/src/rendering/colormappingcomponent.cpp
+++ b/src/rendering/colormappingcomponent.cpp
@@ -329,10 +329,17 @@ ghoul::opengl::Texture* ColorMappingComponent::texture() const {
     return _texture.get();
 }
 
-void ColorMappingComponent::initialize(const dataloader::Dataset& dataset) {
+void ColorMappingComponent::initialize(const dataloader::Dataset& dataset,
+                                       bool useCaching)
+{
     ZoneScoped;
 
-    _colorMap = dataloader::color::loadFileWithCache(colorMapFile.value());
+    if (useCaching) {
+        _colorMap = dataloader::color::loadFileWithCache(colorMapFile.value());
+    }
+    else {
+        _colorMap = dataloader::color::loadFile(colorMapFile.value());
+    }
 
     initializeParameterData(dataset);
 

From 436eb0d195c0b29a425eb7bfd761487ba72555d4 Mon Sep 17 00:00:00 2001
From: Emma Broman <emma.broman@liu.se>
Date: Thu, 2 May 2024 11:14:45 +0200
Subject: [PATCH 429/701] Update outdated renderable description

---
 .../rendering/pointcloud/renderablepointcloud.cpp     | 11 ++++-------
 1 file changed, 4 insertions(+), 7 deletions(-)

diff --git a/modules/base/rendering/pointcloud/renderablepointcloud.cpp b/modules/base/rendering/pointcloud/renderablepointcloud.cpp
index 2577fca49c..cb61b4c2ba 100644
--- a/modules/base/rendering/pointcloud/renderablepointcloud.cpp
+++ b/modules/base/rendering/pointcloud/renderablepointcloud.cpp
@@ -336,7 +336,7 @@ namespace {
     //
     // The points are rendered as planes whose size depends on a few different things:
     //
-    // - At the core, scaling is done based on an exponential value, the 'ScaleExponent'.
+    // - At the core, scaling is done based on an exponential value, the `ScaleExponent`.
     //   A relatively small change to this value will lead to a large change in size.
     //   When no exponent is set, one will be created based on the coordinates in the
     //   dataset. The points will be visible, but may be appeared as too large or small.
@@ -348,15 +348,12 @@ namespace {
     // - There is also an option to limit the size of the points based on a given max
     //   size value.
     //
-    // - And an option to scale the points based on a data value (see 'SizeMapping' in
-    //   'SizeSettings')
+    // - And an option to scale the points based on a data value (see `SizeMapping` in
+    //   `SizeSettings`)
     //
-    // - To easily change the visual size of the points, the multiplicative 'ScaleFactor'
+    // - To easily change the visual size of the points, the multiplicative `ScaleFactor`
     //   may be used. A value of 2 makes the points twice as large, visually, compared
     //   to 1.
-    //
-    // See example files in data/assets/examples/pointcloud for some concrete examples of
-    // point clouds with different settings.
     struct [[codegen::Dictionary(RenderablePointCloud)]] Parameters {
         // The path to the data file that contains information about the point to be
         // rendered. Can be either a CSV or SPECK file

From 075f6c8f6590df4b1d4075b18df59e05ac6afb4f Mon Sep 17 00:00:00 2001
From: Emma Broman <emma.broman@liu.se>
Date: Thu, 2 May 2024 13:56:48 +0200
Subject: [PATCH 430/701] Properly fix useCaching for point cloud colormaps

Forgot the update function in 10929485184a8e4d30bf8bf6f24b353b921edcb, oops
---
 include/openspace/rendering/colormappingcomponent.h        | 2 +-
 modules/base/rendering/pointcloud/renderablepointcloud.cpp | 2 +-
 src/rendering/colormappingcomponent.cpp                    | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/include/openspace/rendering/colormappingcomponent.h b/include/openspace/rendering/colormappingcomponent.h
index f2e904cead..a949ce41a3 100644
--- a/include/openspace/rendering/colormappingcomponent.h
+++ b/include/openspace/rendering/colormappingcomponent.h
@@ -71,7 +71,7 @@ public:
      */
     void initializeTexture();
 
-    void update(const dataloader::Dataset& dataset);
+    void update(const dataloader::Dataset& dataset, bool useCaching = true);
 
     static documentation::Documentation Documentation();
 
diff --git a/modules/base/rendering/pointcloud/renderablepointcloud.cpp b/modules/base/rendering/pointcloud/renderablepointcloud.cpp
index cb61b4c2ba..ff14dc0e88 100644
--- a/modules/base/rendering/pointcloud/renderablepointcloud.cpp
+++ b/modules/base/rendering/pointcloud/renderablepointcloud.cpp
@@ -1384,7 +1384,7 @@ void RenderablePointCloud::update(const UpdateData&) {
     preUpdate();
 
     if (_hasColorMapFile) {
-        _colorSettings.colorMapping->update(_dataset);
+        _colorSettings.colorMapping->update(_dataset, _useCaching);
     }
 
     if (_spriteTextureIsDirty) {
diff --git a/src/rendering/colormappingcomponent.cpp b/src/rendering/colormappingcomponent.cpp
index 7850452988..63a06b4f87 100644
--- a/src/rendering/colormappingcomponent.cpp
+++ b/src/rendering/colormappingcomponent.cpp
@@ -396,9 +396,9 @@ void ColorMappingComponent::initializeTexture() {
     _texture->uploadTexture();
 }
 
-void ColorMappingComponent::update(const dataloader::Dataset& dataset) {
+void ColorMappingComponent::update(const dataloader::Dataset& dataset, bool useCaching) {
     if (_colorMapFileIsDirty) {
-        initialize(dataset);
+        initialize(dataset, useCaching);
         _colorMapTextureIsDirty = true;
         _colorMapFileIsDirty = false;
     }

From da28216daf894ba6f79dd2612a01a86568eb81ee Mon Sep 17 00:00:00 2001
From: Emma Broman <emma.broman@liu.se>
Date: Thu, 2 May 2024 14:00:09 +0200
Subject: [PATCH 431/701] Add/update documentation and add example of
 `RenderableTravelSpeed` (#3224)

* Add/update documentation and add example of `RenderableTravelSpeed`

* Update description based on review comments

---------

Co-authored-by: Alexander Bock <alexander.bock@liu.se>
Co-authored-by: Ylva Selling <ylva.selling@gmail.com>
---
 .../renderabletravelspeed/travelspeed.asset   | 28 +++++++++
 .../space/rendering/renderabletravelspeed.cpp | 59 +++++++++++--------
 .../space/rendering/renderabletravelspeed.h   |  2 +-
 3 files changed, 65 insertions(+), 24 deletions(-)
 create mode 100644 data/assets/examples/renderable/renderabletravelspeed/travelspeed.asset

diff --git a/data/assets/examples/renderable/renderabletravelspeed/travelspeed.asset b/data/assets/examples/renderable/renderabletravelspeed/travelspeed.asset
new file mode 100644
index 0000000000..e129832695
--- /dev/null
+++ b/data/assets/examples/renderable/renderabletravelspeed/travelspeed.asset
@@ -0,0 +1,28 @@
+-- Light Speed Indicator
+-- This example creates a speed indicator; a line that travels with the speed of
+-- light from the parent node (Earth) to the target node (the Moon). By default, the
+-- length of the line is set to match the distance traveled over 1 second.
+
+local earthAsset = asset.require("scene/solarsystem/planets/earth/earth")
+local moonAsset = asset.require("scene/solarsystem/planets/earth/moon/moon")
+
+local Node = {
+  Identifier = "RenderableTravelSpeed_Example",
+  Parent = earthAsset.Earth.Identifier,
+  Renderable = {
+    Type = "RenderableTravelSpeed",
+    Target = moonAsset.Moon.Identifier
+  },
+   GUI = {
+     Name = "Light Speed Indicator",
+    Path = "/Examples/RenderableTravelSpeed"
+  }
+}
+
+asset.onInitialize(function()
+  openspace.addSceneGraphNode(Node)
+end)
+
+asset.onDeinitialize(function()
+  openspace.removeSceneGraphNode(Node)
+end)
diff --git a/modules/space/rendering/renderabletravelspeed.cpp b/modules/space/rendering/renderabletravelspeed.cpp
index bbac74ebec..b841bf3ea6 100644
--- a/modules/space/rendering/renderabletravelspeed.cpp
+++ b/modules/space/rendering/renderabletravelspeed.cpp
@@ -41,23 +41,24 @@ namespace {
 
     constexpr openspace::properties::Property::PropertyInfo SpeedInfo = {
         "TravelSpeed",
-        "Speed of travel",
-        "The speed of light is the default value.",
+        "Speed of Travel",
+        "A value for how fast the speed indicator should travel, in meters per second. "
+        "The default value is the speed of light.",
         openspace::properties::Property::Visibility::NoviceUser
     };
 
     constexpr openspace::properties::Property::PropertyInfo TargetInfo = {
         "TargetNode",
-        "Target object",
-        "This value sets which scene graph node to target with the light speed "
-        "indicator.",
+        "Target Object",
+        "The identifier of the scene graph node to target with the speed indicator. The "
+        "speed indicator will travel from the parent node to this scene graph node.",
         openspace::properties::Property::Visibility::AdvancedUser
     };
 
     constexpr openspace::properties::Property::PropertyInfo LineColorInfo = {
         "Color",
         "Color",
-        "This value determines the RGB color for the line.",
+        "An RGB color for the line.",
         openspace::properties::Property::Visibility::NoviceUser
     };
 
@@ -71,36 +72,50 @@ namespace {
     constexpr openspace::properties::Property::PropertyInfo IndicatorLengthInfo = {
         "IndicatorLength",
         "Indicator Length",
-        "This value specifies the length of the light indicator set in light seconds.",
+        "The length of the speed indicator line, given in seconds. The length will be "
+        "computed as the speed times this value. For example, a value of 1 will make it "
+        "as long as the distance it would travel over one second with the specified speed.",
         openspace::properties::Property::Visibility::User
     };
 
     constexpr openspace::properties::Property::PropertyInfo FadeLengthInfo = {
         "FadeLength",
         "Fade Length",
-        "This value specifies the length of the faded tail of the light indicator "
-        "set in light seconds.",
+        "The length of the faded tail of the speed indicator, given in seconds. The "
+        "length of the tail will be computed as the speed times this value. For example, "
+        "a value of 1 will make it as long as the distance it would travel over one "
+        "second. A linear fade will be applied over this distance to create the tail.",
         openspace::properties::Property::Visibility::User
     };
 
+    // This renderable can be used to visualize a certain travel speed using a line that
+    // moves at the provided speed from a start object to a target. The start position
+    // will be set from the `Parent` of this scene graph node, and the end position is
+    // set from the provided `Target` scene graph node. Per default, the speed is set to
+    // the speed of light.
+    //
+    // The length of the traveling line is set based on the travel speed and can be used
+    // to show more information related to the distance traveled. For example, a length
+    // of 1 shows how far an object would move over a duration of one second based on the
+    // selected speed.
     struct [[codegen::Dictionary(RenderableTravelSpeed)]] Parameters {
         // [[codegen::verbatim(TargetInfo.description)]]
-        std::string target;
+        std::string target [[codegen::identifier()]];;
 
         // [[codegen::verbatim(SpeedInfo.description)]]
-        std::optional<double> travelSpeed;
+        std::optional<double> travelSpeed [[codegen::greater(0.f)]];
 
         // [[codegen::verbatim(LineColorInfo.description)]]
-        std::optional<glm::vec3> color;
+        std::optional<glm::vec3> color [[codegen::color()]];
 
         // [[codegen::verbatim(LineWidthInfo.description)]]
-        std::optional<float> lineWidth;
+        std::optional<float> lineWidth [[codegen::greater(0.f)]];
 
         // [[codegen::verbatim(IndicatorLengthInfo.description)]]
-        std::optional<float> indicatorLength;
+        std::optional<float> indicatorLength [[codegen::greater(0.f)]];
 
         // [[codegen::verbatim(FadeLengthInfo.description)]]
-        std::optional<float> fadeLength;
+        std::optional<float> fadeLength [[codegen::greater(0.f)]];
     };
 #include "renderabletravelspeed_codegen.cpp"
 } // namespace
@@ -121,7 +136,7 @@ RenderableTravelSpeed::RenderableTravelSpeed(const ghoul::Dictionary& dictionary
         distanceconstants::LightSecond
       )
     , _indicatorLength(IndicatorLengthInfo, 1.f, 0.f, 360.f)
-    , _fadeLength(FadeLengthInfo, 1.f, 0.f, 360.f)
+    , _fadeLength(FadeLengthInfo, 0.f, 0.f, 360.f)
     , _lineWidth(LineWidthInfo, 2.f, 1.f, 20.f)
     , _lineColor(LineColorInfo, glm::vec3(1.f), glm::vec3(0.f), glm::vec3(1.f))
 {
@@ -134,7 +149,6 @@ RenderableTravelSpeed::RenderableTravelSpeed(const ghoul::Dictionary& dictionary
     _lineColor.setViewOption(properties::Property::ViewOptions::Color);
     addProperty(_lineColor);
 
-
     _lineWidth = p.lineWidth.value_or(_lineWidth);
     addProperty(_lineWidth);
 
@@ -150,8 +164,7 @@ RenderableTravelSpeed::RenderableTravelSpeed(const ghoul::Dictionary& dictionary
         if (SceneGraphNode* n = sceneGraphNode(_targetName);  n) {
             _targetNode = n;
             _targetPosition = _targetNode->worldPosition();
-            _lightTravelTime =
-                glm::distance(_targetPosition, _sourcePosition) / _travelSpeed;
+            _travelTime = glm::distance(_targetPosition, _sourcePosition) / _travelSpeed;
             calculateDirectionVector();
             reinitiateTravel();
         }
@@ -165,7 +178,7 @@ RenderableTravelSpeed::RenderableTravelSpeed(const ghoul::Dictionary& dictionary
 void RenderableTravelSpeed::initialize() {
     _targetNode = sceneGraphNode(_targetName);
     if (_targetNode == nullptr) {
-        throw ghoul::RuntimeError("Could not find targetNode");
+        throw ghoul::RuntimeError("Could not find Target Node");
     }
 }
 
@@ -243,7 +256,7 @@ void RenderableTravelSpeed::updateVertexData() {
 
 void RenderableTravelSpeed::reinitiateTravel() {
     _initiationTime = global::timeManager->time().j2000Seconds();
-    _arrivalTime = _initiationTime + _lightTravelTime;
+    _arrivalTime = _initiationTime + _travelTime;
 }
 
 bool RenderableTravelSpeed::isReady() const{
@@ -253,7 +266,7 @@ bool RenderableTravelSpeed::isReady() const{
 void RenderableTravelSpeed::update(const UpdateData& data) {
     if (_initiationTime == -1.0) {
         _initiationTime = data.time.j2000Seconds();
-        _arrivalTime = _initiationTime + _lightTravelTime;
+        _arrivalTime = _initiationTime + _travelTime;
     }
 
     _targetPosition = _targetNode->worldPosition();
@@ -261,7 +274,7 @@ void RenderableTravelSpeed::update(const UpdateData& data) {
     ghoul_assert(mySGNPointer, "Renderable have to be owned by scene graph node");
     _sourcePosition = mySGNPointer->worldPosition();
 
-    _lightTravelTime = glm::distance(_targetPosition, _sourcePosition) / _travelSpeed;
+    _travelTime = glm::distance(_targetPosition, _sourcePosition) / _travelSpeed;
 
     const double currentTime = data.time.j2000Seconds();
     // Unless we've reached the target
diff --git a/modules/space/rendering/renderabletravelspeed.h b/modules/space/rendering/renderabletravelspeed.h
index d6bc9148a2..f03d2606c5 100644
--- a/modules/space/rendering/renderabletravelspeed.h
+++ b/modules/space/rendering/renderabletravelspeed.h
@@ -76,7 +76,7 @@ private:
 
     glm::dvec3 _sourcePosition;
     glm::dvec3 _targetPosition;
-    double _lightTravelTime;
+    double _travelTime = 0.0;
     glm::dvec3 _directionVector;
     double _initiationTime = -1.0;
     double _arrivalTime;

From 8ba7f32125bc1e8cadd8a7ffbefa0d1fae165578 Mon Sep 17 00:00:00 2001
From: Emma Broman <emma.broman@liu.se>
Date: Fri, 3 May 2024 08:56:11 +0200
Subject: [PATCH 432/701] Add view option to renderable orbital kepler outline
 color (closes #3242)

---
 modules/space/rendering/renderableorbitalkepler.cpp | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/modules/space/rendering/renderableorbitalkepler.cpp b/modules/space/rendering/renderableorbitalkepler.cpp
index 783eadbff7..bebd7c6cf7 100644
--- a/modules/space/rendering/renderableorbitalkepler.cpp
+++ b/modules/space/rendering/renderableorbitalkepler.cpp
@@ -275,9 +275,9 @@ RenderableOrbitalKepler::Appearance::Appearance()
         { RenderingModePoint, "Points" },
         { RenderingModePointTrail , "Points+Trails" }
     });
+    addProperty(renderingModes);
 
     color.setViewOption(properties::Property::ViewOptions::Color);
-    addProperty(renderingModes);
     addProperty(color);
     addProperty(trailWidth);
     addProperty(trailFade);
@@ -285,6 +285,7 @@ RenderableOrbitalKepler::Appearance::Appearance()
     addProperty(enableMaxSize);
     addProperty(maxSize);
     addProperty(enableOutline);
+    outlineColor.setViewOption(properties::Property::ViewOptions::Color);
     addProperty(outlineColor);
     addProperty(outlineWeight);
 }
@@ -384,7 +385,7 @@ void RenderableOrbitalKepler::initializeGL() {
            );
        }
    );
-   
+
     // Program for point rendering
     _pointProgram = SpaceModule::ProgramObjectManager.request(
         "OrbitalKeplerPoints",

From cd02ff73d1d1835d8195918f789c78900c6593fe Mon Sep 17 00:00:00 2001
From: ElonOlsson <olssonelon@gmail.com>
Date: Tue, 7 May 2024 14:30:35 -0400
Subject: [PATCH 433/701] Update density_volume.asset to use correct
 transferfunction

---
 .../solarsystem/heliosphere/bastille_day/density_volume.asset   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/data/assets/scene/solarsystem/heliosphere/bastille_day/density_volume.asset b/data/assets/scene/solarsystem/heliosphere/bastille_day/density_volume.asset
index de8e1848e3..7df028b1b6 100644
--- a/data/assets/scene/solarsystem/heliosphere/bastille_day/density_volume.asset
+++ b/data/assets/scene/solarsystem/heliosphere/bastille_day/density_volume.asset
@@ -36,7 +36,7 @@ local DensityVolume = {
     Type = "RenderableTimeVaryingVolume",
     StepSize = 0.004,
     Brightness = 0.3,
-    TransferFunction = asset.resource("transferfunctions/mas-mhd-r-squared-old.txt"),
+    TransferFunction = asset.resource("transferfunctions/mas-mhd-r-squared.txt"),
     SourceDirectory = densityDirectory,
     GridType = "Spherical",
     SecondsBefore = 24 * 60 * 60,

From 09da94cf6be05b4af4a48f083fc2c7f525481244 Mon Sep 17 00:00:00 2001
From: Malin E <malin.ejdbo@gmail.com>
Date: Mon, 13 May 2024 15:28:27 +0200
Subject: [PATCH 434/701] Add documentation and example for
 `RenderableSphereImageOnline` (#3185)

* Add a simple online sphere image example

* Add documentation for RenderableSphereImageOnline

* Address pull request comments

---------

Co-authored-by: Alexander Bock <alexander.bock@liu.se>
---
 .../simplesphereimageonline.asset             | 27 +++++++++++++++++++
 .../rendering/renderablesphereimageonline.cpp |  3 +++
 .../rendering/renderablesphereimageonline.h   |  5 +++-
 3 files changed, 34 insertions(+), 1 deletion(-)
 create mode 100644 data/assets/examples/renderable/renderablesphereimageonline/simplesphereimageonline.asset

diff --git a/data/assets/examples/renderable/renderablesphereimageonline/simplesphereimageonline.asset b/data/assets/examples/renderable/renderablesphereimageonline/simplesphereimageonline.asset
new file mode 100644
index 0000000000..05e86ba48c
--- /dev/null
+++ b/data/assets/examples/renderable/renderablesphereimageonline/simplesphereimageonline.asset
@@ -0,0 +1,27 @@
+-- Basic
+-- This example will show a sphere that is covered with an image which is retrieved from
+-- an online URL. The image will be stretched over the entire sphere as an equirectangular
+-- projection
+
+local Node = {
+  Identifier = "RenderableSphereImageOnline_Example",
+  Renderable = {
+    Type = "RenderableSphereImageOnline",
+    URL = "http://data.openspaceproject.com/examples/renderableplaneimageonline.jpg",
+
+    -- Parameters from the parent class `RenderableSphere`
+    Segments = 16
+  },
+  GUI = {
+    Name = "Basic",
+    Path = "/Examples/RenderableSphereImageOnline"
+  }
+}
+
+asset.onInitialize(function()
+  openspace.addSceneGraphNode(Node)
+end)
+
+asset.onDeinitialize(function()
+  openspace.removeSceneGraphNode(Node)
+end)
diff --git a/modules/base/rendering/renderablesphereimageonline.cpp b/modules/base/rendering/renderablesphereimageonline.cpp
index febfa1efb8..6e082aaf1d 100644
--- a/modules/base/rendering/renderablesphereimageonline.cpp
+++ b/modules/base/rendering/renderablesphereimageonline.cpp
@@ -64,6 +64,9 @@ namespace {
         );
     }
 
+    // A RenderableSphereImageOnline can be used to show an image from an online source
+    // (as a URL) on a sphere in the OpenSpace scene. The image should be provided in an
+    // equirectangular projection, if it is a map that is draped over the sphere.
     struct [[codegen::Dictionary(RenderableSphereImageOnline)]] Parameters {
         // [[codegen::verbatim(TextureInfo.description)]]
         std::string url [[codegen::key("URL")]];
diff --git a/modules/base/rendering/renderablesphereimageonline.h b/modules/base/rendering/renderablesphereimageonline.h
index c98102e39b..0c464fea44 100644
--- a/modules/base/rendering/renderablesphereimageonline.h
+++ b/modules/base/rendering/renderablesphereimageonline.h
@@ -38,6 +38,9 @@ struct UpdateData;
 
 namespace documentation { struct Documentation; }
 
+/**
+ * This class describes a sphere renderable that displays an image from an online source
+ */
 class RenderableSphereImageOnline : public RenderableSphere {
 public:
     RenderableSphereImageOnline(const ghoul::Dictionary& dictionary);
@@ -56,7 +59,7 @@ private:
 
     std::future<DownloadManager::MemoryFile> _imageFuture;
     std::unique_ptr<ghoul::opengl::Texture> _texture;
-    bool _textureIsDirty = false;
+    bool _textureIsDirty = true;
 };
 
 } // namespace openspace

From c2ea21b43cf06ae5a5e44ca9c3c546f1114d57b4 Mon Sep 17 00:00:00 2001
From: Andreas Engberg <adde.engberg@gmail.com>
Date: Mon, 13 May 2024 15:55:02 +0200
Subject: [PATCH 435/701] add listener on file texture changes

---
 modules/base/rendering/renderablesphereimagelocal.cpp | 2 ++
 modules/base/rendering/renderablesphereimagelocal.h   | 1 +
 2 files changed, 3 insertions(+)

diff --git a/modules/base/rendering/renderablesphereimagelocal.cpp b/modules/base/rendering/renderablesphereimagelocal.cpp
index 5537a15780..46595cb861 100644
--- a/modules/base/rendering/renderablesphereimagelocal.cpp
+++ b/modules/base/rendering/renderablesphereimagelocal.cpp
@@ -71,10 +71,12 @@ RenderableSphereImageLocal::RenderableSphereImageLocal(
     const Parameters p = codegen::bake<Parameters>(dictionary);
 
     _texturePath = p.texture;
+    _textureFile = std::make_unique<ghoul::filesystem::File>(_texturePath.value());
     _texturePath.onChange([this]() {
         loadTexture();
     });
     addProperty(_texturePath);
+    _textureFile->setCallback([this]() { _textureIsDirty = true; });
 }
 
 bool RenderableSphereImageLocal::isReady() const {
diff --git a/modules/base/rendering/renderablesphereimagelocal.h b/modules/base/rendering/renderablesphereimagelocal.h
index 84c1286f77..52ecb6adcc 100644
--- a/modules/base/rendering/renderablesphereimagelocal.h
+++ b/modules/base/rendering/renderablesphereimagelocal.h
@@ -57,6 +57,7 @@ private:
 
     properties::StringProperty _texturePath;
 
+    std::unique_ptr<ghoul::filesystem::File> _textureFile;
     std::unique_ptr<ghoul::opengl::Texture> _texture;
     bool _isLoadingLazily = false;
     bool _textureIsDirty = false;

From a9567db7680d767d98353eee0b8a59aaeab50588 Mon Sep 17 00:00:00 2001
From: Emma Broman <emma.broman@liu.se>
Date: Mon, 13 May 2024 17:54:25 +0200
Subject: [PATCH 436/701] Fix non-updated property URIs for star rendering in
 light pollution actions (closes #3251)

---
 data/assets/nightsky/light_pollution.asset | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/data/assets/nightsky/light_pollution.asset b/data/assets/nightsky/light_pollution.asset
index 6bcaef20c5..2da8c7f5b1 100644
--- a/data/assets/nightsky/light_pollution.asset
+++ b/data/assets/nightsky/light_pollution.asset
@@ -65,7 +65,7 @@ local SetLightPollutionLevel1 = {
     openspace.setPropertyValueSingle("Scene.LightPollutionSphere.Renderable.Fade", 1.0)
     openspace.setPropertyValueSingle("Scene.MilkyWay.Renderable.Fade", 0.9, 0.3)
     openspace.setPropertyValueSingle("Scene.LightPollutionSphere.Renderable.Opacity", 0.01, 0.5)
-    openspace.setPropertyValueSingle("Scene.Stars.Renderable.ParametersOwner.MagnitudeExponent", 6.1, 0.3)
+    openspace.setPropertyValueSingle("Scene.Stars.Renderable.MagnitudeExponent", 6.1, 0.3)
   ]],
   Documentation = "Adds a light pollution sphere and lowers the level of the stars by 0.1",
   GuiPath = "/Night Sky/Light Pollution",
@@ -81,7 +81,7 @@ local SetLightPollutionLevel2 = {
     openspace.setPropertyValueSingle("Scene.LightPollutionSphere.Renderable.Fade", 1.0)
     openspace.setPropertyValueSingle("Scene.MilkyWay.Renderable.Fade", 0.8, 0.3)
     openspace.setPropertyValueSingle("Scene.LightPollutionSphere.Renderable.Opacity", 0.02, 0.5)
-    openspace.setPropertyValueSingle("Scene.Stars.Renderable.ParametersOwner.MagnitudeExponent", 6.0, 0.3)
+    openspace.setPropertyValueSingle("Scene.Stars.Renderable.MagnitudeExponent", 6.0, 0.3)
   ]],
   Documentation = "Adds a light pollution sphere and lowers the level of the stars by 0.2",
   GuiPath = "/Night Sky/Light Pollution",
@@ -97,7 +97,7 @@ local SetLightPollutionLevel3 = {
     openspace.setPropertyValueSingle("Scene.LightPollutionSphere.Renderable.Fade", 1.0)
     openspace.setPropertyValueSingle("Scene.MilkyWay.Renderable.Fade", 0.7, 0.3)
     openspace.setPropertyValueSingle("Scene.LightPollutionSphere.Renderable.Opacity", 0.03, 0.5)
-    openspace.setPropertyValueSingle("Scene.Stars.Renderable.ParametersOwner.MagnitudeExponent", 5.9, 0.3)
+    openspace.setPropertyValueSingle("Scene.Stars.Renderable.MagnitudeExponent", 5.9, 0.3)
   ]],
   Documentation = "Adds a light pollution sphere and lowers the level of the stars by 0.3",
   GuiPath = "/Night Sky/Light Pollution",
@@ -113,7 +113,7 @@ local SetLightPollutionLevel4 = {
     openspace.setPropertyValueSingle("Scene.LightPollutionSphere.Renderable.Fade", 1.0)
     openspace.setPropertyValueSingle("Scene.MilkyWay.Renderable.Fade", 0.6, 0.3)
     openspace.setPropertyValueSingle("Scene.LightPollutionSphere.Renderable.Opacity", 0.04, 0.5)
-    openspace.setPropertyValueSingle("Scene.Stars.Renderable.ParametersOwner.MagnitudeExponent", 5.8, 0.3)
+    openspace.setPropertyValueSingle("Scene.Stars.Renderable.MagnitudeExponent", 5.8, 0.3)
   ]],
   Documentation = "Adds a light pollution sphere and lowers the level of the stars by 0.4",
   GuiPath = "/Night Sky/Light Pollution",
@@ -129,7 +129,7 @@ local SetLightPollutionLevel5 = {
     openspace.setPropertyValueSingle("Scene.LightPollutionSphere.Renderable.Fade", 1.0)
     openspace.setPropertyValueSingle("Scene.MilkyWay.Renderable.Fade", 0.5, 0.3)
     openspace.setPropertyValueSingle("Scene.LightPollutionSphere.Renderable.Opacity", 0.05, 0.5)
-    openspace.setPropertyValueSingle("Scene.Stars.Renderable.ParametersOwner.MagnitudeExponent", 5.8, 0.4)
+    openspace.setPropertyValueSingle("Scene.Stars.Renderable.MagnitudeExponent", 5.8, 0.4)
   ]],
   Documentation = "Adds a light pollution sphere and lowers the level of the stars by 0.5",
   GuiPath = "/Night Sky/Light Pollution",
@@ -145,7 +145,7 @@ local SetLightPollutionLevel6 = {
     openspace.setPropertyValueSingle("Scene.LightPollutionSphere.Renderable.Fade", 1.0)
     openspace.setPropertyValueSingle("Scene.MilkyWay.Renderable.Fade", 0.4, 0.3)
     openspace.setPropertyValueSingle("Scene.LightPollutionSphere.Renderable.Opacity", 0.06, 0.5)
-    openspace.setPropertyValueSingle("Scene.Stars.Renderable.ParametersOwner.MagnitudeExponent", 5.7, 0.4)
+    openspace.setPropertyValueSingle("Scene.Stars.Renderable.MagnitudeExponent", 5.7, 0.4)
   ]],
   Documentation = "Adds a light pollution sphere and lowers the level of the stars by 0.6",
   GuiPath = "/Night Sky/Light Pollution",
@@ -161,7 +161,7 @@ local SetLightPollutionLevel7 = {
     openspace.setPropertyValueSingle("Scene.LightPollutionSphere.Renderable.Fade", 1.0)
     openspace.setPropertyValueSingle("Scene.MilkyWay.Renderable.Fade", 0.3, 0.3)
     openspace.setPropertyValueSingle("Scene.LightPollutionSphere.Renderable.Opacity", 0.07, 0.5)
-    openspace.setPropertyValueSingle("Scene.Stars.Renderable.ParametersOwner.MagnitudeExponent", 5.6, 0.4)
+    openspace.setPropertyValueSingle("Scene.Stars.Renderable.MagnitudeExponent", 5.6, 0.4)
   ]],
   Documentation = "Adds a light pollution sphere and lowers the level of the stars by 0.7",
   GuiPath = "/Night Sky/Light Pollution",
@@ -177,7 +177,7 @@ local SetLightPollutionLevel8 = {
     openspace.setPropertyValueSingle("Scene.LightPollutionSphere.Renderable.Fade", 1.0)
     openspace.setPropertyValueSingle("Scene.MilkyWay.Renderable.Fade", 0.2, 0.3)
     openspace.setPropertyValueSingle("Scene.LightPollutionSphere.Renderable.Opacity", 0.08, 0.5)
-    openspace.setPropertyValueSingle("Scene.Stars.Renderable.ParametersOwner.MagnitudeExponent", 5.5, 0.4)
+    openspace.setPropertyValueSingle("Scene.Stars.Renderable.MagnitudeExponent", 5.5, 0.4)
   ]],
   Documentation = "Adds a light pollution sphere and lowers the level of the stars by 0.8",
   GuiPath = "/Night Sky/Light Pollution",
@@ -193,7 +193,7 @@ local SetLightPollutionLevel9 = {
     openspace.setPropertyValueSingle("Scene.LightPollutionSphere.Renderable.Fade", 1.0)
     openspace.setPropertyValueSingle("Scene.LightPollutionSphere.Renderable.Opacity", 0.09, 0.5)
     openspace.setPropertyValueSingle("Scene.MilkyWay.Renderable.Fade", 0.1, 0.3)
-    openspace.setPropertyValueSingle("Scene.Stars.Renderable.ParametersOwner.MagnitudeExponent", 5.4, 0.4)
+    openspace.setPropertyValueSingle("Scene.Stars.Renderable.MagnitudeExponent", 5.4, 0.4)
   ]],
   Documentation = "Adds a light pollution sphere and lowers the level of the stars by 0.9",
   GuiPath = "/Night Sky/Light Pollution",
@@ -205,7 +205,7 @@ local UndoLightPollution = {
   Name = "Undo light pollution",
   Command = [[
     openspace.setPropertyValueSingle("Scene.LightPollutionSphere.Renderable.Fade", 0.0, 0.3)
-    openspace.setPropertyValueSingle("Scene.Stars.Renderable.ParametersOwner.MagnitudeExponent", 6.2, 0.3)
+    openspace.setPropertyValueSingle("Scene.Stars.Renderable.MagnitudeExponent", 6.2, 0.3)
     openspace.setPropertyValueSingle("Scene.MilkyWay.Renderable.Fade", 1.0, 0.3)
     ]],
   Documentation = "Hides the light pollution sphere and resets the stars",

From e745c40152aa62e88696cd410d74adbf36b69baa Mon Sep 17 00:00:00 2001
From: Emma Broman <emma.broman@liu.se>
Date: Tue, 14 May 2024 11:28:58 +0200
Subject: [PATCH 437/701] Update examples for `RenderableNodeArrow` and
 `RenderablePlaneImageOnline` (#3215)

* Update examples for `RenderableNodeArrow` and `RenderablePlaneImageOnline`


Co-authored-by: Ylva Selling <ylva.selling@gmail.com>
Co-authored-by: Alexander Bock <alexander.bock@liu.se>
---
 data/assets/examples/nodearrow.asset          | 77 -------------------
 .../renderablenodearrow/nodearrow.asset       | 39 ++++++++++
 .../nodearrow_appearance.asset                | 41 ++++++++++
 .../nodearrow_relativevalues.asset            | 42 ++++++++++
 .../planeimageonline.asset                    | 24 ++++++
 .../planeimageonline_billboarded.asset        | 26 +++++++
 .../examples/renderableplaneimageonline.asset | 41 ----------
 .../base/rendering/renderablenodearrow.cpp    | 14 +++-
 modules/base/rendering/renderableplane.cpp    | 39 +++++-----
 .../rendering/renderableplaneimagelocal.cpp   |  2 -
 .../rendering/renderableplaneimageonline.cpp  |  2 +
 11 files changed, 207 insertions(+), 140 deletions(-)
 delete mode 100644 data/assets/examples/nodearrow.asset
 create mode 100644 data/assets/examples/renderable/renderablenodearrow/nodearrow.asset
 create mode 100644 data/assets/examples/renderable/renderablenodearrow/nodearrow_appearance.asset
 create mode 100644 data/assets/examples/renderable/renderablenodearrow/nodearrow_relativevalues.asset
 create mode 100644 data/assets/examples/renderable/renderableplaneimageonline/planeimageonline.asset
 create mode 100644 data/assets/examples/renderable/renderableplaneimageonline/planeimageonline_billboarded.asset
 delete mode 100644 data/assets/examples/renderableplaneimageonline.asset

diff --git a/data/assets/examples/nodearrow.asset b/data/assets/examples/nodearrow.asset
deleted file mode 100644
index ef851baa48..0000000000
--- a/data/assets/examples/nodearrow.asset
+++ /dev/null
@@ -1,77 +0,0 @@
-local earth = asset.require("scene/solarsystem/planets/earth/earth")
-local moon = asset.require("scene/solarsystem/planets/earth/moon/moon")
-local mars = asset.require("scene/solarsystem/planets/mars/mars")
-
-
-
-local EarthRadius = 6371000.0
-
-local ArrowExample = {
-  Identifier = "RenderableNodeArrowExample",
-  Parent = earth.Earth.Identifier,
-  Renderable = {
-    Type = "RenderableNodeArrow",
-    StartNode = earth.Earth.Identifier,
-    EndNode = mars.Mars.Identifier,
-    Color = { 0.8, 1.0, 0.8 },
-    Offset = 2 * EarthRadius,
-    Length = 5 * EarthRadius,
-    Width = 900000.0
-  },
-  GUI = {
-    Name = "Node Arrow Example",
-    Path = "/Example",
-    Description = [[Example node direction arrow, using absolute sizes]]
-  }
-}
-
--- Relative values: Multiplied with bounding sphere
-local ArrowExample_RelativeUnits = {
-  Identifier = "RenderableNodeArrowExample_Relative",
-  Parent = earth.Earth.Identifier,
-  Renderable = {
-    Type = "RenderableNodeArrow",
-    StartNode = earth.Earth.Identifier,
-    EndNode = moon.Moon.Identifier,
-    Color = { 0.78, 0.0, 1.0 },
-    UseRelativeOffset = true,
-    UseRelativeLength = true,
-    Offset = 2.0,
-    Length = 5.0,
-    Width = 900000.0,
-    Invert = true -- Point to start node instead of end node
-  },
-  GUI = {
-    Name = "Node Arrow Example (relative units)",
-    Path = "/Example",
-    Description = [[Example node direction arrow, using relative sizes]]
-  }
-}
-
-
-asset.onInitialize(function()
-  openspace.addSceneGraphNode(ArrowExample)
-  openspace.addSceneGraphNode(ArrowExample_RelativeUnits)
-end)
-
-asset.onDeinitialize(function()
-  openspace.removeSceneGraphNode(ArrowExample_RelativeUnits)
-  openspace.removeSceneGraphNode(ArrowExample)
-end)
-
-asset.export(ArrowExample)
-asset.export(ArrowExample_RelativeUnits)
-
-
-
-asset.meta = {
-  Name = "RenderableNodeArrow Example asset",
-  Version = "1.0",
-  Description = [[Examples of the RenderableNodeArrow renderable, that can be used to draw
-    an arrow pointing from one scene graph node in the direction of another. Note that
-    the arrows are generated as objects in 3D space and need to have a size that is
-    suitable for their 3D context.]],
-  Author = "OpenSpace Team",
-  URL = "http://openspaceproject.com",
-  License = "MIT license"
-}
diff --git a/data/assets/examples/renderable/renderablenodearrow/nodearrow.asset b/data/assets/examples/renderable/renderablenodearrow/nodearrow.asset
new file mode 100644
index 0000000000..0e659ca4b7
--- /dev/null
+++ b/data/assets/examples/renderable/renderablenodearrow/nodearrow.asset
@@ -0,0 +1,39 @@
+-- Basic
+-- This example shows an arrow pointing from one scene graph node in the direction of
+-- another. Here, it points from Earth to Mars.
+--
+-- Note that the arrows are generated as objects in 3D space and need to have a size
+-- that is suitable for the scene graph nodes they refer to. Here it is set based on
+-- the size of the Earth.
+
+local earth = asset.require("scene/solarsystem/planets/earth/earth")
+local mars = asset.require("scene/solarsystem/planets/mars/mars")
+
+local Node = {
+  Identifier = "RenderableNodeArrow_Example",
+  -- Parent to the start node, so that when we focus on the arrow this is where we end up
+  Parent = earth.Earth.Identifier,
+  Renderable = {
+    Type = "RenderableNodeArrow",
+    StartNode = earth.Earth.Identifier,
+    EndNode = mars.Mars.Identifier,
+    -- How far away from the start node should the arrow start (meters)
+    Offset = 2 * 6371000.0,
+    -- How long should the arrow be (meters)
+    Length = 5 * 6371000.0,
+    -- How wide should the arrow be (meters)
+    Width = 900000.0
+  },
+  GUI = {
+    Name = "Basic",
+    Path = "/Examples/RenderableNodeArrow"
+  }
+}
+
+asset.onInitialize(function()
+  openspace.addSceneGraphNode(Node)
+end)
+
+asset.onDeinitialize(function()
+  openspace.removeSceneGraphNode(Node)
+end)
diff --git a/data/assets/examples/renderable/renderablenodearrow/nodearrow_appearance.asset b/data/assets/examples/renderable/renderablenodearrow/nodearrow_appearance.asset
new file mode 100644
index 0000000000..38e9f6238c
--- /dev/null
+++ b/data/assets/examples/renderable/renderablenodearrow/nodearrow_appearance.asset
@@ -0,0 +1,41 @@
+-- Custom Appearance (Colored & Inverted)
+-- This example shows an arrow pointing from one scene graph node in the direction of
+-- another. Here, it is created with the Solar System barycenter as start node and
+-- Earth as end node, but the arrow direction is inverted so that it points towards
+-- the Solar System barycenter. Some appearance related properties are also changed to
+-- customize the look of the arrow, but default values are used for its size.
+
+local earth = asset.require("scene/solarsystem/planets/earth/earth")
+local sunTransforms = asset.require("scene/solarsystem/sun/transforms")
+
+local Node = {
+  Identifier = "RenderableNodeArrow_Example_Appearance",
+  -- Parent to the start node, so that when we focus on the arrow this is where we end up
+  Parent = sunTransforms.SolarSystemBarycenter.Identifier,
+  Renderable = {
+    Type = "RenderableNodeArrow",
+    StartNode = sunTransforms.SolarSystemBarycenter.Identifier,
+    EndNode = earth.Earth.Identifier,
+    -- Point to start node instead of end node
+    Invert = true,
+    -- Give the arrow a custom color (here a dark red)
+    Color = { 0.5, 0.0, 0.0 },
+    -- Set the arrow head size so that it takes up a quarter (25%) of the full length of
+    -- the arrow
+    ArrowHeadSize = 0.25,
+    -- Set the arrow head width. A value of 1 makes it as wide as the body of the arrow
+    ArrowHeadWidthFactor = 1.0
+  },
+  GUI = {
+    Name = "Custom Appearance (Colored & Inverted)",
+    Path = "/Examples/RenderableNodeArrow"
+  }
+}
+
+asset.onInitialize(function()
+  openspace.addSceneGraphNode(Node)
+end)
+
+asset.onDeinitialize(function()
+  openspace.removeSceneGraphNode(Node)
+end)
diff --git a/data/assets/examples/renderable/renderablenodearrow/nodearrow_relativevalues.asset b/data/assets/examples/renderable/renderablenodearrow/nodearrow_relativevalues.asset
new file mode 100644
index 0000000000..1f1fb74c3a
--- /dev/null
+++ b/data/assets/examples/renderable/renderablenodearrow/nodearrow_relativevalues.asset
@@ -0,0 +1,42 @@
+-- Relative Units for Offset and Length
+-- This example shows an arrow pointing from one scene graph node in the direction of
+-- another, but where the size is specified using relative values (based on the bounding
+-- sphere of the start node). Here it points from Earth to the Moon.
+--
+-- Note that the arrows are generated as objects in 3D space and need to have a size
+-- that is suitable for the scene graph nodes they refer to. Here it is set based on
+-- the size of the start node, i.e. Earth.
+
+local earth = asset.require("scene/solarsystem/planets/earth/earth")
+local moon = asset.require("scene/solarsystem/planets/earth/moon/moon")
+
+local Node = {
+  Identifier = "RenderableNodeArrow_Example_Relative",
+  -- Parent to the start node, so that when we focus on the arrow this is where we end up
+  Parent = earth.Earth.Identifier,
+  Renderable = {
+    Type = "RenderableNodeArrow",
+    StartNode = earth.Earth.Identifier,
+    EndNode = moon.Moon.Identifier,
+    -- Use relative values for offset and length
+    UseRelativeOffset = true,
+    UseRelativeLength = true,
+    -- Specify relative values (times the size of Earth, in this case)
+    Offset = 2.0,
+    Length = 5.0,
+    -- Width is in meters
+    Width = 900000.0
+  },
+  GUI = {
+    Name = "Relative Units",
+    Path = "/Examples/RenderableNodeArrow",
+  }
+}
+
+asset.onInitialize(function()
+  openspace.addSceneGraphNode(Node)
+end)
+
+asset.onDeinitialize(function()
+  openspace.removeSceneGraphNode(Node)
+end)
diff --git a/data/assets/examples/renderable/renderableplaneimageonline/planeimageonline.asset b/data/assets/examples/renderable/renderableplaneimageonline/planeimageonline.asset
new file mode 100644
index 0000000000..40607a837c
--- /dev/null
+++ b/data/assets/examples/renderable/renderableplaneimageonline/planeimageonline.asset
@@ -0,0 +1,24 @@
+-- Basic
+-- This example shows how to create a textured plane in 3D space, where the texture is
+-- loaded from the internet though a web URL.
+
+local Node = {
+  Identifier = "RenderablePlaneImageOnline_Example",
+  Renderable = {
+    Type = "RenderablePlaneImageOnline",
+    Size = 3.0E11,
+    URL = "http://data.openspaceproject.com/examples/renderableplaneimageonline.jpg"
+  },
+  GUI = {
+    Name = "Basic",
+    Path = "/Examples/RenderablePlaneImageOnline"
+  }
+}
+
+asset.onInitialize(function()
+  openspace.addSceneGraphNode(Node)
+end)
+
+asset.onDeinitialize(function()
+  openspace.removeSceneGraphNode(Node)
+end)
diff --git a/data/assets/examples/renderable/renderableplaneimageonline/planeimageonline_billboarded.asset b/data/assets/examples/renderable/renderableplaneimageonline/planeimageonline_billboarded.asset
new file mode 100644
index 0000000000..67808307e6
--- /dev/null
+++ b/data/assets/examples/renderable/renderableplaneimageonline/planeimageonline_billboarded.asset
@@ -0,0 +1,26 @@
+-- Billboarded Image
+-- This example shows how to create a textured plane in 3D space, where the texture is
+-- loaded from the internet though a web URL and the plane is billboarded to always
+-- face the camera.
+
+local Node = {
+  Identifier = "RenderablePlaneImageOnline_Example_Billboarded",
+  Renderable = {
+    Type = "RenderablePlaneImageOnline",
+    Size = 3.0E11,
+    URL = "http://data.openspaceproject.com/examples/renderableplaneimageonline.jpg",
+    Billboarded = true
+  },
+  GUI = {
+    Name = "Billboarded",
+    Path = "/Examples/RenderablePlaneImageOnline"
+  }
+}
+
+asset.onInitialize(function()
+  openspace.addSceneGraphNode(Node)
+end)
+
+asset.onDeinitialize(function()
+  openspace.removeSceneGraphNode(Node)
+end)
diff --git a/data/assets/examples/renderableplaneimageonline.asset b/data/assets/examples/renderableplaneimageonline.asset
deleted file mode 100644
index 6e48992e23..0000000000
--- a/data/assets/examples/renderableplaneimageonline.asset
+++ /dev/null
@@ -1,41 +0,0 @@
-local transforms = asset.require("scene/solarsystem/sun/transforms")
-
-
-
-local RenderablePlaneImageOnline = {
-  Identifier = "RenderablePlaneImageOnline",
-  Parent = transforms.SolarSystemBarycenter.Identifier,
-  Renderable = {
-    Type = "RenderablePlaneImageOnline",
-    Size = 3.0E11,
-    Origin = "Center",
-    Billboard = true,
-    URL = "http://data.openspaceproject.com/examples/renderableplaneimageonline.jpg"
-  },
-  GUI = {
-    Description = "A plane that loads a texture from the internet.",
-    Path = "/Examples"
-  }
-}
-
-
-asset.onInitialize(function()
-  openspace.addSceneGraphNode(RenderablePlaneImageOnline)
-end)
-
-asset.onDeinitialize(function()
-  openspace.removeSceneGraphNode(RenderablePlaneImageOnline)
-end)
-
-asset.export(RenderablePlaneImageOnline)
-
-
-asset.meta = {
-  Name = "RenderablePlaneImageOnline Example",
-  Version = "1.0",
-  Description = [[Example of how to create a textured plane in 3D space, where the
-    texture is loaded from a web URL]],
-  Author = "OpenSpace Team",
-  URL = "http://openspaceproject.com",
-  License = "MIT license"
-}
diff --git a/modules/base/rendering/renderablenodearrow.cpp b/modules/base/rendering/renderablenodearrow.cpp
index fa8e432a43..805f77dfba 100644
--- a/modules/base/rendering/renderablenodearrow.cpp
+++ b/modules/base/rendering/renderablenodearrow.cpp
@@ -169,12 +169,20 @@ namespace {
         openspace::properties::Property::Visibility::User
     };
 
+    // A RenderableNodeArrow can be used to create a 3D arrow pointing in the direction
+    // of one scene graph node to another.
+    //
+    // The arrow will be placed at the `StartNode` at a distance of the provided
+    // `Offset` value. Per default, the `Length` and `Offset` of the arrow is specified
+    // in meters, but they may also be specified as a multiplier of the bounding sphere
+    // of the `StartNode`. The look of the arrow can be customized to change the width
+    // and length of both the arrow body and head.
     struct [[codegen::Dictionary(RenderableNodeArrow)]] Parameters {
         // [[codegen::verbatim(StartNodeInfo.description)]]
-        std::string startNode [[codegen::notempty]];
+        std::string startNode [[codegen::identifier()]];
 
         // [[codegen::verbatim(EndNodeInfo.description)]]
-        std::string endNode [[codegen::notempty]];
+        std::string endNode [[codegen::identifier()]];
 
         // [[codegen::verbatim(ColorInfo.description)]]
         std::optional<glm::vec3> color [[codegen::color()]];
@@ -454,6 +462,8 @@ void RenderableNodeArrow::updateShapeTransforms(const RenderData& data) {
     // Rotation to point at the end node
     const glm::quat rotQuat = glm::rotation(glm::dvec3(0.0, 0.0, 1.0), arrowDirection);
     _pointDirectionRotation = glm::dmat4(glm::toMat4(rotQuat));
+
+    setBoundingSphere(length + offset);
 }
 
 void RenderableNodeArrow::render(const RenderData& data, RendererTasks&) {
diff --git a/modules/base/rendering/renderableplane.cpp b/modules/base/rendering/renderableplane.cpp
index 0903fdb943..e698c9fe59 100644
--- a/modules/base/rendering/renderableplane.cpp
+++ b/modules/base/rendering/renderableplane.cpp
@@ -103,6 +103,9 @@ namespace {
         // [[codegen::verbatim(SizeInfo.description)]]
         std::variant<float, glm::vec2> size;
 
+        // [[codegen::verbatim(AutoScaleInfo.description)]]
+        std::optional<bool> autoScale;
+
         enum class [[codegen::map(BlendMode)]] BlendMode {
             Normal,
             Additive
@@ -133,6 +136,11 @@ RenderablePlane::RenderablePlane(const ghoul::Dictionary& dictionary)
 {
     Parameters p = codegen::bake<Parameters>(dictionary);
 
+    _opacity.onChange([this]() {
+        if (_blendMode == static_cast<int>(BlendMode::Normal)) {
+            setRenderBinFromOpacity();
+        }
+    });
     addProperty(Fadeable::_opacity);
 
     if (std::holds_alternative<float>(p.size)) {
@@ -141,9 +149,9 @@ RenderablePlane::RenderablePlane(const ghoul::Dictionary& dictionary)
     else {
         _size = std::get<glm::vec2>(p.size);
     }
-
-    _billboard = p.billboard.value_or(_billboard);
-    _mirrorBackside = p.mirrorBackside.value_or(_mirrorBackside);
+    _size.setExponent(15.f);
+    _size.onChange([this]() { _planeIsDirty = true; });
+    addProperty(_size);
 
     _blendMode.addOptions({
         { static_cast<int>(BlendMode::Normal), "Normal" },
@@ -161,27 +169,22 @@ RenderablePlane::RenderablePlane(const ghoul::Dictionary& dictionary)
         }
     });
 
-    _opacity.onChange([this]() {
-        if (_blendMode == static_cast<int>(BlendMode::Normal)) {
-            setRenderBinFromOpacity();
-        }
-    });
-
     if (p.blendMode.has_value()) {
         _blendMode = codegen::map<BlendMode>(*p.blendMode);
     }
+    addProperty(_blendMode);
+
+    _billboard = p.billboard.value_or(_billboard);
+    addProperty(_billboard);
+
+    _mirrorBackside = p.mirrorBackside.value_or(_mirrorBackside);
+    addProperty(_mirrorBackside);
+
+    _autoScale = p.autoScale.value_or(_autoScale);
+    addProperty(_autoScale);
 
     _multiplyColor = p.multiplyColor.value_or(_multiplyColor);
     _multiplyColor.setViewOption(properties::Property::ViewOptions::Color);
-
-    addProperty(_billboard);
-
-    _size.setExponent(15.f);
-    addProperty(_size);
-    _size.onChange([this](){ _planeIsDirty = true; });
-
-    addProperty(_autoScale);
-
     addProperty(_multiplyColor);
 
     setBoundingSphere(glm::compMax(_size.value()));
diff --git a/modules/base/rendering/renderableplaneimagelocal.cpp b/modules/base/rendering/renderableplaneimagelocal.cpp
index b0e49da674..93a4d7b435 100644
--- a/modules/base/rendering/renderableplaneimagelocal.cpp
+++ b/modules/base/rendering/renderableplaneimagelocal.cpp
@@ -73,8 +73,6 @@ RenderablePlaneImageLocal::RenderablePlaneImageLocal(const ghoul::Dictionary& di
 {
     const Parameters p = codegen::bake<Parameters>(dictionary);
 
-    addProperty(_blendMode);
-
     _texturePath = absPath(p.texture).string();
     _textureFile = std::make_unique<ghoul::filesystem::File>(_texturePath.value());
 
diff --git a/modules/base/rendering/renderableplaneimageonline.cpp b/modules/base/rendering/renderableplaneimageonline.cpp
index d9d0acb796..39fe94d583 100644
--- a/modules/base/rendering/renderableplaneimageonline.cpp
+++ b/modules/base/rendering/renderableplaneimageonline.cpp
@@ -43,6 +43,8 @@ namespace {
         openspace::properties::Property::Visibility::User
     };
 
+    // A RenderablePlaneImageOnline creates a textured 3D plane, where the texture image
+    // is loaded from the internet though a web URL.
     struct [[codegen::Dictionary(RenderablePlaneImageOnline)]] Parameters {
         // [[codegen::verbatim(TextureInfo.description)]]
         std::string url [[codegen::key("URL")]];

From 5ecdd67a10ed625c20454d54c3d3a011b6571a4d Mon Sep 17 00:00:00 2001
From: Emma Broman <emma.broman@liu.se>
Date: Tue, 14 May 2024 16:37:16 +0200
Subject: [PATCH 438/701] Update GUI hash (open GUI in browser button)

---
 data/assets/util/webgui.asset | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/data/assets/util/webgui.asset b/data/assets/util/webgui.asset
index 17bfa0f10d..dca42b421c 100644
--- a/data/assets/util/webgui.asset
+++ b/data/assets/util/webgui.asset
@@ -4,7 +4,7 @@ local guiCustomization = asset.require("customization/gui")
 
 
 -- Select which commit hashes to use for the frontend and backend
-local frontendHash = "44fbbc001baedfe7d1a39d94e4a01d3e217e1b8d"
+local frontendHash = "301964b972bf45f28eff0031e6ab7cdfdc7814b7"
 
 local frontend = asset.resource({
   Identifier = "WebGuiFrontend",

From ce765c6f72d325901d15753fd10832b7667169e4 Mon Sep 17 00:00:00 2001
From: Emma Broman <emma.broman@liu.se>
Date: Fri, 17 May 2024 10:36:23 +0200
Subject: [PATCH 439/701] Fix faulty computation of sun position in atmosphere
 (#3250)

---
 modules/atmosphere/rendering/atmospheredeferredcaster.cpp | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/modules/atmosphere/rendering/atmospheredeferredcaster.cpp b/modules/atmosphere/rendering/atmospheredeferredcaster.cpp
index 53eafdca18..8a4b1fc8d0 100644
--- a/modules/atmosphere/rendering/atmospheredeferredcaster.cpp
+++ b/modules/atmosphere/rendering/atmospheredeferredcaster.cpp
@@ -381,13 +381,11 @@ void AtmosphereDeferredcaster::preRaycast(const RenderData& data, const Deferred
         const glm::dvec3 sunPosWorld = node ? node->worldPosition() : glm::dvec3(0.0);
 
         glm::dvec3 sunPosObj;
-        // Sun following camera position
         if (_sunFollowingCameraEnabled) {
-            sunPosObj = invModelMatrix * glm::dvec4(data.camera.eyePositionVec3(), 1.0);
+            sunPosObj = camPosObjCoords;
         }
         else {
-            sunPosObj = invModelMatrix *
-                glm::dvec4((sunPosWorld - data.modelTransform.translation) * 1000.0, 1.0);
+            sunPosObj = invModelMatrix * glm::dvec4(sunPosWorld, 1.0);
         }
 
         // Sun Position in Object Space

From c3657921d2c2e85a6738057c08f9f2ce300a3c3a Mon Sep 17 00:00:00 2001
From: Emma Broman <emma.broman@liu.se>
Date: Fri, 17 May 2024 10:51:02 +0200
Subject: [PATCH 440/701] Prevent sampling outside bv color map for stars

Should adress #2404
---
 modules/space/shaders/star_fs.glsl | 1 +
 1 file changed, 1 insertion(+)

diff --git a/modules/space/shaders/star_fs.glsl b/modules/space/shaders/star_fs.glsl
index 1e2e3957e3..554f112621 100644
--- a/modules/space/shaders/star_fs.glsl
+++ b/modules/space/shaders/star_fs.glsl
@@ -61,6 +61,7 @@ const int ColorOptionFixedColor = 4;
 vec4 bv2rgb(float bv) {
   // BV is [-0.4,2.0]
   float t = (bv + 0.4) / (2.0 + 0.4);
+  t = clamp(t, 0.0, 1.0);
   return texture(colorTexture, t);
 }
 

From 542f35e4de8ee165e2c61a3cd41e74d75e961733 Mon Sep 17 00:00:00 2001
From: Emma Broman <emma.broman@liu.se>
Date: Fri, 17 May 2024 15:38:48 +0200
Subject: [PATCH 441/701] Update `ScreenSpaceRenderable` documentation (#3227)

* Update screen space documentation

* Fix inconsistent "screen space" phrasing

* Rephrase according to code review

---------

Co-authored-by: Ylva Selling <ylva.selling@gmail.com>
Co-authored-by: Malin E <malin.ejdbo@gmail.com>
Co-authored-by: Alexander Bock <alexander.bock@liu.se>
---
 .../base/rendering/screenspacedashboard.cpp   |  9 +-
 .../base/rendering/screenspaceimagelocal.cpp  | 10 +--
 .../base/rendering/screenspaceimageonline.cpp | 35 ++++----
 .../skybrowser/src/screenspaceskybrowser.cpp  |  7 ++
 .../webbrowser/include/screenspacebrowser.h   |  6 +-
 modules/webbrowser/src/screenspacebrowser.cpp | 23 ++++-
 modules/webbrowser/webbrowsermodule.cpp       |  7 ++
 modules/webbrowser/webbrowsermodule.h         |  2 +
 src/rendering/screenspacerenderable.cpp       | 84 ++++++++++---------
 9 files changed, 107 insertions(+), 76 deletions(-)

diff --git a/modules/base/rendering/screenspacedashboard.cpp b/modules/base/rendering/screenspacedashboard.cpp
index 6e578bd47d..3e613cbd82 100644
--- a/modules/base/rendering/screenspacedashboard.cpp
+++ b/modules/base/rendering/screenspacedashboard.cpp
@@ -40,15 +40,12 @@ namespace {
     constexpr openspace::properties::Property::PropertyInfo UseMainInfo = {
         "UseMainDashboard",
         "Use main dashboard",
-        "If this value is set to 'true', this ScreenSpaceDashboard will use the "
-        "main dashboard instead of creating an independent one.",
+        "If true, this ScreenSpaceDashboard will use the main dashboard instead of "
+        "creating an independent one.",
         openspace::properties::Property::Visibility::Developer
     };
 
     struct [[codegen::Dictionary(ScreenSpaceDashboard)]] Parameters {
-        // Specifies the GUI name of the ScreenSpaceDashboard
-        std::optional<std::string> name;
-
         // [[codegen::verbatim(UseMainInfo.description)]]
         std::optional<bool> useMainDashboard;
     };
@@ -69,8 +66,6 @@ ScreenSpaceDashboard::ScreenSpaceDashboard(const ghoul::Dictionary& dictionary)
 {
     const Parameters p = codegen::bake<Parameters>(dictionary);
 
-    // @TODO (abock, 2021-01-29) Should this be the name variable? The identifier wasn't
-    // declared in the documentation
     std::string identifier;
     if (dictionary.hasValue<std::string>(KeyIdentifier)) {
         identifier = dictionary.value<std::string>(KeyIdentifier);
diff --git a/modules/base/rendering/screenspaceimagelocal.cpp b/modules/base/rendering/screenspaceimagelocal.cpp
index b37666908c..984433c90d 100644
--- a/modules/base/rendering/screenspaceimagelocal.cpp
+++ b/modules/base/rendering/screenspaceimagelocal.cpp
@@ -46,10 +46,12 @@ namespace {
         openspace::properties::Property::Visibility::User
     };
 
+    // This `ScreenSpaceRenderable` can be used to display an image from a local file on
+    // disk.
+    //
+    // To load an image from a web URL, see
+    // [ScreenSpaceImageOnline](#base_screenspace_image_online).
     struct [[codegen::Dictionary(ScreenSpaceImageLocal)]] Parameters {
-        // Specifies the GUI name of the ScreenspaceImage
-        std::optional<std::string> name;
-
         // [[codegen::verbatim(TexturePathInfo.description)]]
         std::optional<std::string> texturePath;
     };
@@ -68,8 +70,6 @@ ScreenSpaceImageLocal::ScreenSpaceImageLocal(const ghoul::Dictionary& dictionary
 {
     const Parameters p = codegen::bake<Parameters>(dictionary);
 
-    // @TODO (abock, 2021-02-02) Should this be the name variable? The identifier wasn't
-    // declared in the documentation
     std::string identifier;
     if (dictionary.hasValue<std::string>(KeyIdentifier)) {
         identifier = dictionary.value<std::string>(KeyIdentifier);
diff --git a/modules/base/rendering/screenspaceimageonline.cpp b/modules/base/rendering/screenspaceimageonline.cpp
index 09c5261c0f..1c66b733e1 100644
--- a/modules/base/rendering/screenspaceimageonline.cpp
+++ b/modules/base/rendering/screenspaceimageonline.cpp
@@ -36,20 +36,22 @@
 #include <optional>
 
 namespace {
+    constexpr std::string_view _loggerCat = "ScreenSpaceImageOnline";
+
     constexpr openspace::properties::Property::PropertyInfo TextureInfo = {
         "URL",
         "Image URL",
-        "Sets the URL of the texture that is displayed on this screen space plane. If "
-        "this value is changed, the image at the new path will automatically be loaded "
-        "and displayed. The size of the image will also automatically set the default "
-        "size of this plane.",
+        "The URL of the texture to be displayed on this screen space plane. If changed, "
+        "the image at the new path will automatically be loaded and displayed. The "
+        "default size of the plane will be set based on the size of the image.",
         openspace::properties::Property::Visibility::User
     };
 
+    // This `ScreenSpaceRenderable` can be used to display an image from a web URL.
+    //
+    // To load an image from a local file on disk, see
+    // [`ScreenSpaceImageLocal`](#base_screenspace_image_local).
     struct [[codegen::Dictionary(ScreenSpaceImageOnline)]] Parameters {
-        // Specifies the GUI name of the ScreenspaceImage
-        std::optional<std::string> name;
-
         // [[codegen::verbatim(TextureInfo.description)]]
         std::optional<std::string> url [[codegen::key("URL")]];
     };
@@ -107,10 +109,9 @@ void ScreenSpaceImageOnline::update() {
             const DownloadManager::MemoryFile imageFile = _imageFuture.get();
 
             if (imageFile.corrupted) {
-                LERRORC(
-                    "ScreenSpaceImageOnline",
-                    std::format("Error loading image from URL '{}'", _texturePath.value())
-                );
+                LERROR(std::format(
+                    "Error loading image from URL '{}'", _texturePath.value()
+                ));
                 return;
             }
 
@@ -155,16 +156,12 @@ std::future<DownloadManager::MemoryFile> ScreenSpaceImageOnline::downloadImageTo
     return global::downloadManager->fetchFile(
         url,
         [url](const DownloadManager::MemoryFile&) {
-            LDEBUGC(
-                "ScreenSpaceImageOnline",
-                "Download to memory finished for screen space image"
-            );
+            LDEBUG("Download to memory finished for screen space image");
         },
         [url](const std::string& err) {
-            LDEBUGC(
-                "ScreenSpaceImageOnline",
-                "Download to memory failed for screen space image: " + err
-            );
+            LDEBUG(std::format(
+                "Download to memory failed for screen space image: {}", err
+            ));
         }
     );
 }
diff --git a/modules/skybrowser/src/screenspaceskybrowser.cpp b/modules/skybrowser/src/screenspaceskybrowser.cpp
index 2a5f7f1d88..3a1f7ea375 100644
--- a/modules/skybrowser/src/screenspaceskybrowser.cpp
+++ b/modules/skybrowser/src/screenspaceskybrowser.cpp
@@ -88,6 +88,13 @@ namespace {
         openspace::properties::Property::Visibility::User
     };
 
+    // This `ScreenSpaceRenderable` is used to display a screen space window showing the
+    // integrated World Wide Telescope view. The view will be dynamically updated when
+    // interacting with the view or with images in the SkyBrowser panel.
+    //
+    // A `ScreenSpaceSkyBrowser` should not be created from a `.asset` file, but is rather
+    // created from interacting with the SkyBrowser user interface panel. If created in
+    // an asset, it requires some extra scripting to work with the SkyBrowser feature.
     struct [[codegen::Dictionary(ScreenSpaceSkyBrowser)]] Parameters {
         // [[codegen::verbatim(TextureQualityInfo.description)]]
         std::optional<float> textureQuality;
diff --git a/modules/webbrowser/include/screenspacebrowser.h b/modules/webbrowser/include/screenspacebrowser.h
index f78b5fbc93..2bf402fc77 100644
--- a/modules/webbrowser/include/screenspacebrowser.h
+++ b/modules/webbrowser/include/screenspacebrowser.h
@@ -29,7 +29,7 @@
 
 #include <modules/webbrowser/include/webrenderhandler.h>
 #include <openspace/properties/stringproperty.h>
-#include <openspace/properties/vector/vec2property.h>
+#include <openspace/properties/vector/uvec2property.h>
 #include <openspace/properties/triggerproperty.h>
 
 #ifdef _MSC_VER
@@ -72,8 +72,10 @@ public:
     void update() override;
     bool isReady() const override;
 
+    static documentation::Documentation Documentation();
+
 protected:
-    properties::Vec2Property _dimensions;
+    properties::UVec2Property _dimensions;
     std::unique_ptr<BrowserInstance> _browserInstance;
     std::unique_ptr<ghoul::opengl::Texture> _texture;
 
diff --git a/modules/webbrowser/src/screenspacebrowser.cpp b/modules/webbrowser/src/screenspacebrowser.cpp
index 9bee28aa7f..c540667265 100644
--- a/modules/webbrowser/src/screenspacebrowser.cpp
+++ b/modules/webbrowser/src/screenspacebrowser.cpp
@@ -41,7 +41,7 @@ namespace {
     constexpr openspace::properties::Property::PropertyInfo DimensionsInfo = {
         "Dimensions",
         "Browser Dimensions",
-        "Set the dimensions of the web browser windows.",
+        "The dimensions of the web browser window in pixels.",
         openspace::properties::Property::Visibility::User
     };
 
@@ -59,10 +59,21 @@ namespace {
         openspace::properties::Property::Visibility::NoviceUser
     };
 
+    // This `ScreenSpaceRenderable` can be used to render a webpage in front of the
+    // camera. This can be used to show various dynamic content, for example using the
+    // scripting API.
+    //
+    // Note that mouse input will not be passed to the rendered view, so it will not be
+    // possible to interact with the web page.
     struct [[codegen::Dictionary(ScreenSpaceBrowser)]] Parameters {
-        std::optional<std::string> identifier;
+        // A unique identifier for this screen space browser.
+        std::optional<std::string> identifier [[codegen::identifier()]];
+
+        // [[codegen::verbatim(UrlInfo.description)]]
         std::optional<std::string> url;
-        std::optional<glm::vec2> dimensions;
+
+        // [[codegen::verbatim(DimensionsInfo.description)]]
+        std::optional<glm::vec2> dimensions [[codegen::greater({ 0, 0 })]];
     };
 #include "screenspacebrowser_codegen.cpp"
 
@@ -78,9 +89,13 @@ void ScreenSpaceBrowser::ScreenSpaceRenderHandler::setTexture(GLuint t) {
     _texture = t;
 }
 
+documentation::Documentation ScreenSpaceBrowser::Documentation() {
+    return codegen::doc<Parameters>("core_screenspace_browser");
+}
+
 ScreenSpaceBrowser::ScreenSpaceBrowser(const ghoul::Dictionary& dictionary)
     : ScreenSpaceRenderable(dictionary)
-    , _dimensions(DimensionsInfo, glm::vec2(0.f), glm::vec2(0.f), glm::vec2(3000.f))
+    , _dimensions(DimensionsInfo, glm::uvec2(0), glm::uvec2(0), glm::uvec2(3000))
     , _renderHandler(new ScreenSpaceRenderHandler)
     , _url(UrlInfo)
     , _reload(ReloadInfo)
diff --git a/modules/webbrowser/webbrowsermodule.cpp b/modules/webbrowser/webbrowsermodule.cpp
index 1ce34570bb..2e5cadddea 100644
--- a/modules/webbrowser/webbrowsermodule.cpp
+++ b/modules/webbrowser/webbrowsermodule.cpp
@@ -28,6 +28,7 @@
 #include <modules/webbrowser/include/cefhost.h>
 #include <modules/webbrowser/include/eventhandler.h>
 #include <modules/webbrowser/include/screenspacebrowser.h>
+#include <openspace/documentation/documentation.h>
 #include <openspace/engine/globals.h>
 #include <openspace/engine/globalscallbacks.h>
 #include <openspace/engine/windowdelegate.h>
@@ -224,6 +225,12 @@ bool WebBrowserModule::isEnabled() const {
     return _enabled;
 }
 
+std::vector<documentation::Documentation> WebBrowserModule::documentations() const {
+    return {
+        ScreenSpaceBrowser::Documentation()
+    };
+}
+
 /// Logic for the webbrowser performance hotfix, described in globalscallbacks.h
 namespace webbrowser {
 
diff --git a/modules/webbrowser/webbrowsermodule.h b/modules/webbrowser/webbrowsermodule.h
index 3ec9a233f4..a65a81a2f8 100644
--- a/modules/webbrowser/webbrowsermodule.h
+++ b/modules/webbrowser/webbrowsermodule.h
@@ -58,6 +58,8 @@ public:
     void detachEventHandler();
     bool isEnabled() const;
 
+    std::vector<documentation::Documentation> documentations() const override;
+
 protected:
     void internalInitialize(const ghoul::Dictionary& dictionary) override;
     void internalDeinitialize() override;
diff --git a/src/rendering/screenspacerenderable.cpp b/src/rendering/screenspacerenderable.cpp
index b3e973714a..152cc4b056 100644
--- a/src/rendering/screenspacerenderable.cpp
+++ b/src/rendering/screenspacerenderable.cpp
@@ -46,17 +46,17 @@ namespace {
     constexpr openspace::properties::Property::PropertyInfo EnabledInfo = {
         "Enabled",
         "Enabled",
-        "This setting determines whether this sceen space plane will be visible or not.",
+        "Determines whether this sceen space object will be rendered or not.",
         openspace::properties::Property::Visibility::AdvancedUser
     };
 
     constexpr openspace::properties::Property::PropertyInfo RenderDuringBlackoutInfo = {
         "RenderDuringBlackout",
         "Render during Blackout",
-        "If this value is 'true', this screenspace renderable is going to ignore the "
-        "global blackout factor from the Render Engine and will always render at full "
-        "opacity. If it is 'false', it will adhere to the factor and fade out like the "
-        "rest of the 3D rendering.",
+        "If true, this screen space renderable is going to ignore the global blackout "
+        "factor from the Render Engine and will always render at full opacity. If "
+        "false, it will adhere to the factor and fade out like the rest of the 3D "
+        "rendering.",
         openspace::properties::Property::Visibility::User
     };
 
@@ -65,12 +65,11 @@ namespace {
     {
         "UseRadiusAzimuthElevation",
         "Use Radius Azimuth and Elevation",
-        "This value determines whether the location of this screen space plane will be "
-        "specified using radius, azimuth and elevation (if this is set to 'true') or "
-        "using cartesian coordinates. By switching this value, the correct property will "
-        "be shown or hidden. The Cartesian coordinate system is useful if a regular "
-        "rendering is applied, whereas the radius azimuth elevation are most useful in a "
-        "planetarium environment.",
+        "Determines whether the location of this screen space plane will be specified "
+        "using radius, azimuth and elevation (if 'true') or using Cartesian coordinates. "
+        "The Cartesian coordinate system is useful if a regular rendering is applied, "
+        "whereas the radius azimuth elevation are most useful in a planetarium "
+        "environment.",
         openspace::properties::Property::Visibility::NoviceUser
     };
 
@@ -85,7 +84,7 @@ namespace {
     constexpr openspace::properties::Property::PropertyInfo CartesianPositionInfo = {
         "CartesianPosition",
         "Cartesian Coordinates",
-        "This value determines the position of this screen space plane in Cartesian "
+        "Determines the position of this screen space plane in Cartesian "
         "three-dimensional coordinates (meters).",
         openspace::properties::Property::Visibility::NoviceUser
     };
@@ -93,25 +92,24 @@ namespace {
     constexpr openspace::properties::Property::PropertyInfo RadiusAzimuthElevationInfo = {
         "RadiusAzimuthElevation",
         "Radius Azimuth Elevation",
-        "This value determines the position of this screen space plane in a "
-        "coordinate system based on radius (meters), azimuth (radians) and elevation "
-        "(radians).",
+        "Determines the position of this screen space plane in a coordinate system based "
+        "on radius (meters), azimuth (radians), and elevation (radians).",
         openspace::properties::Property::Visibility::NoviceUser
     };
 
     constexpr openspace::properties::Property::PropertyInfo ScaleInfo = {
         "Scale",
         "Scale Value",
-        "This value determines a scale factor for the plane. The default size of a plane "
-        "is determined by the concrete instance and reflects, for example, the size of "
-        "the image being displayed.",
+        "A scale factor for the plane that can be used to increase or decrease the visual "
+        "size. The default size is determined separately for each screen space renderable "
+        "type and may for example be affected by the size of an image being displayed.",
         openspace::properties::Property::Visibility::NoviceUser
     };
 
     constexpr openspace::properties::Property::PropertyInfo LocalRotationInfo = {
         "Rotation",
         "Local Rotation",
-        "An euler rotation (x, y, z) to apply to the plane.",
+        "An Euler rotation (x, y, z) to apply to the screen space object.",
         openspace::properties::Property::Visibility::User
     };
 
@@ -126,7 +124,7 @@ namespace {
     constexpr openspace::properties::Property::PropertyInfo BackgroundColorInfo = {
         "BackgroundColor",
         "Background Color",
-        "The fixed color that is combined with the screen space renderable to create the "
+        "A fixed color that is combined with the screen space renderable to create the "
         "final color. The actual color of the screen space renderable is alpha-blended "
         "with the background color to produce the final result.",
         openspace::properties::Property::Visibility::User
@@ -143,8 +141,8 @@ namespace {
     constexpr openspace::properties::Property::PropertyInfo FaceCameraInfo = {
         "FaceCamera",
         "Face Camera",
-        "If enabled, the local rotation is applied after the plane is rotated to face "
-        "the camera.",
+        "If enabled, the object will be rotated to face the camera position. Any local "
+        "rotation is then applied after this rotation.",
         openspace::properties::Property::Visibility::NoviceUser
     };
 
@@ -165,7 +163,7 @@ namespace {
     constexpr openspace::properties::Property::PropertyInfo BorderColorInfo = {
         "BorderColor",
         "Border Color",
-        "Sets the color of the border.",
+        "The color of the border.",
         openspace::properties::Property::Visibility::NoviceUser
     };
 
@@ -173,20 +171,29 @@ namespace {
         return glm::mod(value - min, max - min) + min;
     }
 
+    // This is the base class of all `ScreenSpaceRenderable` types, which are objects
+    // that are rendered in their own coordinate system on top of the other 3D rendering.
+    //
+    // The coordinate system of these renderables is a custom one that has its own depth,
+    // to control how the screen space objects are sorted. There are also two ways of
+    // specifying the position of the object: in Cartesian coordinates using XYZ, or
+    // spherical using radius, azimuth, and elevation. The latter might be more useful in
+    // a planetarium context.
+    //
+    // Most screen space renderables are instantiated as image planes in one way or
+    // another, and this base class includes some properties for setting things like
+    // gamma settings, border and background colors, et cetera.
     struct [[codegen::Dictionary(ScreenSpaceRenderable)]] Parameters {
-        // The type of the Screenspace renderable that is to be created. The available
-        // types of Screenspace renderable depend on the configuration of the application
-        // and can be written to disk on application startup into the FactoryDocumentation
+        // The type of the `ScreenSpaceRenderable` that is to be created.
         std::string type
-            [[codegen::annotation("Must name a valid Screenspace renderable")]];
+            [[codegen::annotation("Must name a valid ScreenSpaceRenderable")]];
 
-        // Specifies the name of this screenspace renderable. This does not have to be
-        // unique to the scene, but it is recommended to be
+        // The name of the `ScreenSpaceRenderable`, which will be shown in the GUI. This
+        // does not have to be unique to the scene, but it is recommended to be.
         std::optional<std::string> name;
 
-        // This is the unique identifier for this screenspace renderable. It has to be
-        // unique amongst all existing screenspace nodes that already have been added to
-        // the scene.
+        // The unique identifier for this screen space renderable. It has to be unique
+        // amongst all existing screen space nodes that have been added to the scene.
         std::optional<std::string> identifier [[codegen::identifier()]];
 
         // [[codegen::verbatim(EnabledInfo.description)]]
@@ -204,7 +211,7 @@ namespace {
         // [[codegen::verbatim(CartesianPositionInfo.description)]]
         std::optional<glm::vec3> cartesianPosition;
 
-        // [[codegen::verbatim(GammaInfo.description)]]
+        // [[codegen::verbatim(RadiusAzimuthElevationInfo.description)]]
         std::optional<glm::vec3> radiusAzimuthElevation;
 
         // [[codegen::verbatim(BorderWidthInfo.description)]]
@@ -216,7 +223,7 @@ namespace {
         // [[codegen::verbatim(ScaleInfo.description)]]
         std::optional<float> scale;
 
-        // [[codegen::verbatim(UseRadiusAzimuthElevationInfo.description)]]
+        // [[codegen::verbatim(GammaInfo.description)]]
         std::optional<float> gamma;
 
         // [[codegen::verbatim(UsePerspectiveProjectionInfo.description)]]
@@ -228,14 +235,13 @@ namespace {
         // [[codegen::verbatim(BackgroundColorInfo.description)]]
         std::optional<glm::vec4> backgroundColor [[codegen::color()]];
 
-        // This value determines the opacity of the screen space plane. If this value
-        // is 1, the plane is completely opaque, if this value is 0, the plane is
-        // completely transparent
+        // The opacity of the screen space object. If 1, the object is completely opaque.
+        // If 0, the object is completely transparent.
         std::optional<float> opacity [[codegen::inrange(0.f, 1.f)]];
 
         // Defines either a single or multiple tags that apply to this
-        // ScreenSpaceRenderable, thus making it possible to address multiple, separate
-        // Renderables with a single property change
+        // `ScreenSpaceRenderable`, thus making it possible to address multiple, separate
+        // Renderables with a single property change.
         std::optional<std::variant<std::string, std::vector<std::string>>> tag;
     };
 #include "screenspacerenderable_codegen.cpp"

From eb1cfec7bdc6d861aa6b29854727b6a0fe61a26f Mon Sep 17 00:00:00 2001
From: Emma Broman <emma.broman@liu.se>
Date: Mon, 20 May 2024 09:24:40 +0200
Subject: [PATCH 442/701] Renderable property info walkthrough/cleanup (#3226)

A passover of all the Parameters descriptions and PropertyInfo descriptions of the renderables in the code base to make then more consistently and concisely formatted. Also fixed some small issues and added or updated descriptions.

* Start rephrasing propertyinfos for more consistency

* Update eclipse cone propertyinfos

* Update `RenderableFov` property infos and group colors in UI

* `RenderableGalaxy` and `RenderableGlobe`

* Update more descriptions

* Moore descriptions

* Update docs for `RenderableShadowCylinder` and add properties

* `RenderableSkyTarget`, and spheres (`ImageOnline` and `ImageLocal`)

* `RnederableSphericalGrid`, and update line width info of other types, for consistency

* `RenderableStars` and `RenderableTimeVaryingSphere`

* Update more propertyinfos

* Fix inconsistent mentioning of true/false

* change some phrasings for increased consistency

* Update Renderbin description to include Sticker bin and remove extra property

* Rename `OutlineWeight` -> `OutlineWidth`

* Extend description about enable depth test for models

* Clarify what relative values mean for `RenderableNodeArrow`

* Elaborate on `RenderableLabel` size property

---------

Co-authored-by: Alexander Bock <alexander.bock@liu.se>
Co-authored-by: Ylva Selling <ylva.selling@gmail.com>
Co-authored-by: Malin E <malin.ejdbo@gmail.com>
---
 data/assets/scene/digitaluniverse/stars.asset |   1 -
 .../rendering/renderableatmosphere.cpp        |  51 +++---
 .../rendering/grids/renderableboxgrid.cpp     |   6 +-
 .../base/rendering/grids/renderablegrid.cpp   |  13 +-
 .../rendering/grids/renderableradialgrid.cpp  |   7 +-
 .../grids/renderablesphericalgrid.cpp         |   9 +-
 .../renderableinterpolatedpoints.cpp          |   6 +-
 .../pointcloud/renderablepointcloud.cpp       | 134 +++++++--------
 .../pointcloud/renderablepointcloud.h         |   2 +-
 .../pointcloud/renderablepolygoncloud.cpp     |   2 +-
 .../pointcloud/sizemappingcomponent.cpp       |   4 +-
 .../rendering/renderablecartesianaxes.cpp     |   6 +-
 modules/base/rendering/renderabledisc.cpp     |  15 +-
 modules/base/rendering/renderablelabel.cpp    |   3 +-
 modules/base/rendering/renderablemodel.cpp    |  65 ++++---
 .../base/rendering/renderablenodearrow.cpp    |  26 +--
 modules/base/rendering/renderablenodeline.cpp |   4 +-
 modules/base/rendering/renderableplane.cpp    |  28 +--
 .../rendering/renderableplaneimagelocal.cpp   |   7 +-
 .../renderableplanetimevaryingimage.cpp       |  32 +---
 modules/base/rendering/renderableprism.cpp    |   4 +-
 modules/base/rendering/renderablesphere.cpp   |  23 ++-
 .../rendering/renderablesphereimagelocal.cpp  |  15 +-
 .../rendering/renderablesphereimageonline.cpp |   5 +-
 .../rendering/renderabletimevaryingsphere.cpp |   9 +-
 modules/base/rendering/renderabletrail.cpp    |  41 +++--
 .../base/rendering/renderabletrailorbit.cpp   |  26 ---
 .../rendering/renderabletrailtrajectory.cpp   |   9 +-
 .../rendering/renderabledumeshes.cpp          |   3 +-
 .../rendering/renderableorbitdisc.cpp         |  18 +-
 modules/galaxy/rendering/renderablegalaxy.cpp |  20 +--
 modules/globebrowsing/src/renderableglobe.cpp |  69 ++++----
 .../skybrowser/src/renderableskytarget.cpp    |  14 +-
 .../renderableconstellationbounds.cpp         |   8 +-
 .../renderableconstellationlines.cpp          |  18 +-
 .../rendering/renderableconstellationlines.h  |   3 +-
 .../space/rendering/renderableeclipsecone.cpp |  42 ++---
 .../space/rendering/renderablefluxnodes.cpp   |   5 +-
 .../rendering/renderablehabitablezone.cpp     |   8 +-
 .../rendering/renderableorbitalkepler.cpp     | 149 +++++++++-------
 .../space/rendering/renderableorbitalkepler.h |   2 +-
 modules/space/rendering/renderablerings.cpp   |  15 +-
 modules/space/rendering/renderablestars.cpp   |  35 ++--
 .../rendering/renderablecrawlingline.cpp      |  16 +-
 .../rendering/renderablefov.cpp               | 159 ++++++++++--------
 .../rendering/renderablefov.h                 |   2 +
 .../rendering/renderablemodelprojection.cpp   |  20 +--
 .../rendering/renderableplaneprojection.cpp   |   9 +-
 .../rendering/renderableplanetprojection.cpp  |   2 +-
 .../rendering/renderableshadowcylinder.cpp    |  51 +++---
 modules/spout/renderableplanespout.cpp        |  20 +--
 .../rendering/renderabletoyvolume.cpp         |   2 +-
 modules/video/include/videoplayer.h           |   2 +-
 modules/video/src/videoplayer.cpp             |   6 +-
 .../rendering/renderabledistancelabel.cpp     |  12 +-
 .../rendering/renderabletimevaryingvolume.cpp |  32 ++--
 src/rendering/renderable.cpp                  |  12 +-
 57 files changed, 636 insertions(+), 671 deletions(-)

diff --git a/data/assets/scene/digitaluniverse/stars.asset b/data/assets/scene/digitaluniverse/stars.asset
index a353b64c8f..3a5584494e 100644
--- a/data/assets/scene/digitaluniverse/stars.asset
+++ b/data/assets/scene/digitaluniverse/stars.asset
@@ -92,7 +92,6 @@ local SunStar = {
     ColorMap = colormaps .. "colorbv.cmap",
     SizeComposition = "Distance Modulus",
     FadeInDistances = { 0.0075, 0.1 },
-    RenderableType = "PostDeferredTransparent",
     DataMapping = {
       Bv = "colorb_v",
       Luminance = "lum",
diff --git a/modules/atmosphere/rendering/renderableatmosphere.cpp b/modules/atmosphere/rendering/renderableatmosphere.cpp
index 418ee4811c..baa4300284 100644
--- a/modules/atmosphere/rendering/renderableatmosphere.cpp
+++ b/modules/atmosphere/rendering/renderableatmosphere.cpp
@@ -88,30 +88,30 @@ namespace {
 
     constexpr openspace::properties::Property::PropertyInfo OzoneHeightScaleInfo = {
         "OzoneLayerHeightScale",
-        "Ozone Scale Height (KM)",
-        "It is the vertical distance over which the density and pressure fall by a "
-        "constant factor.",
+        "Ozone Scale Height (km)",
+        "The vertical distance over which the density and pressure fall by a constant "
+        "factor, given in kilometers.",
         openspace::properties::Property::Visibility::AdvancedUser
     };
 
     constexpr openspace::properties::Property::PropertyInfo OzoneLayerCoeffInfo = {
         "OzoneLayerCoeff",
-        "Ozone Layer Extinction Coeff",
+        "Ozone Layer Extinction Coefficient",
         "Ozone scattering coefficients in meters.",
         openspace::properties::Property::Visibility::AdvancedUser
     };
 
     constexpr openspace::properties::Property::PropertyInfo MieHeightScaleInfo = {
         "MieHeightScale",
-        "Mie Scale Height (KM)",
-        "It is the vertical distance over which the density and pressure fall by a "
-        "constant factor.",
+        "Mie Scale Height (km)",
+        "The vertical distance over which the density and pressure fall by a constant "
+        "factor, given in kilometers.",
         openspace::properties::Property::Visibility::AdvancedUser
     };
 
     constexpr openspace::properties::Property::PropertyInfo MieScatteringCoeffInfo = {
         "MieScatteringCoeff",
-        "Mie Scattering Coeff",
+        "Mie Scattering Coefficient",
         "Mie sea-level scattering coefficients in meters.",
         openspace::properties::Property::Visibility::AdvancedUser
     };
@@ -135,7 +135,7 @@ namespace {
     constexpr openspace::properties::Property::PropertyInfo SunIntensityInfo = {
         "SunIntensity",
         "Sun Intensity",
-        "Unitless for now.",
+        "A unitless value that controls the intensity/brightness of the Sun.",
         openspace::properties::Property::Visibility::User
     };
 
@@ -149,9 +149,9 @@ namespace {
     };
 
     constexpr openspace::properties::Property::PropertyInfo EclipseHardShadowsInfo = {
-        "EclipseHardShadowsInfo",
+        "EclipseHardShadows",
         "Enable Hard Shadows for Eclipses",
-        "Enable/Disables hard shadows through the atmosphere",
+        "Enables/Disables hard shadows through the atmosphere.",
         openspace::properties::Property::Visibility::User
     };
 
@@ -173,50 +173,49 @@ namespace {
     constexpr openspace::properties::Property::PropertyInfo SunAngularSize = {
         "SunAngularSize",
         "Angular Size of the Sun",
-        "Specifies the angular size of the Sun in degrees.",
+        "The angular size of the Sun in degrees.",
         openspace::properties::Property::Visibility::AdvancedUser
     };
 
     constexpr openspace::properties::Property::PropertyInfo LightSourceNodeInfo = {
         "LightSourceNode",
-        "Name of the light source",
-        "This value is the name of a scene graph node that should be used as the source "
-        "of illumination for the atmosphere. If this value is not specified, the solar "
-        "system's Sun is used instead.",
+        "Light Source",
+        "The name of a scene graph node to be used as the source of illumination "
+        "for the atmosphere. If not specified, the solar system's Sun is used.",
         openspace::properties::Property::Visibility::AdvancedUser
     };
 
     struct [[codegen::Dictionary(RenderableAtmosphere)]] Parameters {
         struct ShadowGroup {
-            // Individual light sources
+            // Individual light sources.
             struct SourceElement {
-                // The scene graph node name of the source
+                // The scene graph node name of the source.
                 std::string name;
-                // The radius of the object in meters
+                // The radius of the object in meters.
                 double radius;
             };
-            // A list of light sources
+            // A list of light sources.
             std::vector<SourceElement> sources;
 
-            // Individual shadow casters
+            // Individual shadow casters.
             struct CasterElement {
-                // The scene graph node name of the source
+                // The scene graph node name of the source.
                 std::string name;
-                // The radius of the object in meters
+                // The radius of the object in meters.
                 double radius;
             };
 
-            // A list of objects that cast light on this atmosphere
+            // A list of objects that cast light on this atmosphere.
             std::vector<CasterElement> casters;
         };
         // Declares shadow groups, meaning which nodes are considered in shadow
-        // calculations
+        // calculations.
         std::optional<ShadowGroup> shadowGroup;
 
         // [[codegen::verbatim(AtmosphereHeightInfo.description)]]
         float atmosphereHeight;
 
-        // The radius of the planet in meters
+        // The radius of the planet in meters.
         float planetRadius;
 
         float planetAverageGroundReflectance;
diff --git a/modules/base/rendering/grids/renderableboxgrid.cpp b/modules/base/rendering/grids/renderableboxgrid.cpp
index 03028acddd..9a9b97e75b 100644
--- a/modules/base/rendering/grids/renderableboxgrid.cpp
+++ b/modules/base/rendering/grids/renderableboxgrid.cpp
@@ -39,21 +39,21 @@ namespace {
     constexpr openspace::properties::Property::PropertyInfo ColorInfo = {
         "Color",
         "Color",
-        "This value determines the color of the grid lines that are rendered.",
+        "The color used for the grid lines.",
         openspace::properties::Property::Visibility::NoviceUser
     };
 
     constexpr openspace::properties::Property::PropertyInfo LineWidthInfo = {
         "LineWidth",
         "Line Width",
-        "This value specifies the line width of the spherical grid.",
+        "The width of the grid lines. The larger number, the thicker the lines.",
         openspace::properties::Property::Visibility::User
     };
 
     constexpr openspace::properties::Property::PropertyInfo SizeInfo = {
         "Size",
         "Grid Size",
-        "This value species the size of each dimensions of the box.",
+        "The size of each dimension of the box, in meters.",
         openspace::properties::Property::Visibility::AdvancedUser
     };
 
diff --git a/modules/base/rendering/grids/renderablegrid.cpp b/modules/base/rendering/grids/renderablegrid.cpp
index b530c843c6..89f9f7af45 100644
--- a/modules/base/rendering/grids/renderablegrid.cpp
+++ b/modules/base/rendering/grids/renderablegrid.cpp
@@ -39,22 +39,21 @@ namespace {
     constexpr openspace::properties::Property::PropertyInfo ColorInfo = {
         "Color",
         "Color",
-        "This value determines the color of the grid lines that are rendered.",
+        "The color of the grid lines.",
         openspace::properties::Property::Visibility::NoviceUser
     };
 
     constexpr openspace::properties::Property::PropertyInfo HighlightColorInfo = {
         "HighlightColor",
         "Highlight Color",
-        "This value determines the color of the highlighted lines in the grid.",
+        "The color of the highlighted lines in the grid.",
         openspace::properties::Property::Visibility::NoviceUser
     };
 
     constexpr openspace::properties::Property::PropertyInfo SegmentsInfo = {
         "Segments",
         "Number of Segments",
-        "This value specifies the number of segments that are used to render the "
-        "grid in each direction.",
+        "The number of segments to split the grid into, in each direction (x and y).",
         openspace::properties::Property::Visibility::User
     };
 
@@ -70,21 +69,21 @@ namespace {
     constexpr openspace::properties::Property::PropertyInfo LineWidthInfo = {
         "LineWidth",
         "Line Width",
-        "This value specifies the line width of the grid.",
+        "The width of the grid lines. The larger number, the thicker the lines.",
         openspace::properties::Property::Visibility::NoviceUser
     };
 
     constexpr openspace::properties::Property::PropertyInfo HighlightLineWidthInfo = {
         "HighlightLineWidth",
         "Highlight Line Width",
-        "This value specifies the line width of the highlighted lines in the grid.",
+        "The width of the highlighted grid lines. The larger number, the thicker the lines.",
         openspace::properties::Property::Visibility::User
     };
 
     constexpr openspace::properties::Property::PropertyInfo SizeInfo = {
         "Size",
         "Grid Size",
-        "This value species the size of each dimensions of the grid.",
+        "The size of the grid (in the x and y direction), given in meters.",
         openspace::properties::Property::Visibility::User
     };
 
diff --git a/modules/base/rendering/grids/renderableradialgrid.cpp b/modules/base/rendering/grids/renderableradialgrid.cpp
index 4cc4dd3cdb..3beaadaf9c 100644
--- a/modules/base/rendering/grids/renderableradialgrid.cpp
+++ b/modules/base/rendering/grids/renderableradialgrid.cpp
@@ -40,7 +40,7 @@ namespace {
     constexpr openspace::properties::Property::PropertyInfo ColorInfo = {
         "Color",
         "Color",
-        "This value determines the color of the grid lines that are rendered.",
+        "The color used for the grid lines.",
         openspace::properties::Property::Visibility::NoviceUser
     };
 
@@ -55,15 +55,14 @@ namespace {
     constexpr openspace::properties::Property::PropertyInfo CircleSegmentsInfo = {
         "CircleSegments",
         "Number of Circle Segments",
-        "This value specifies the number of segments that is used to render each circle "
-        "in the grid.",
+        "The number of segments that is used to render each circle in the grid.",
         openspace::properties::Property::Visibility::User
     };
 
     constexpr openspace::properties::Property::PropertyInfo LineWidthInfo = {
         "LineWidth",
         "Line Width",
-        "This value specifies the line width of the spherical grid.",
+        "The width of the grid lines. The larger number, the thicker the lines.",
         openspace::properties::Property::Visibility::User
     };
 
diff --git a/modules/base/rendering/grids/renderablesphericalgrid.cpp b/modules/base/rendering/grids/renderablesphericalgrid.cpp
index f3d8aca5b2..fe7f00379e 100644
--- a/modules/base/rendering/grids/renderablesphericalgrid.cpp
+++ b/modules/base/rendering/grids/renderablesphericalgrid.cpp
@@ -39,22 +39,23 @@ namespace {
     constexpr openspace::properties::Property::PropertyInfo ColorInfo = {
         "Color",
         "Color",
-        "This value determines the color of the grid lines that are rendered.",
+        "The color of the grid lines.",
         openspace::properties::Property::Visibility::NoviceUser
     };
 
     constexpr openspace::properties::Property::PropertyInfo SegmentsInfo = {
         "Segments",
         "Number of Segments",
-        "This value specifies the number of segments that are used to render the "
-        "surrounding sphere.",
+        "The number of segments the sphere is split into. Determines the resolution "
+        "of the rendered sphere. Should be an even value (if an odd value is provided, "
+        "the value will be set to the new value minus one).",
         openspace::properties::Property::Visibility::User
     };
 
     constexpr openspace::properties::Property::PropertyInfo LineWidthInfo = {
         "LineWidth",
         "Line Width",
-        "This value specifies the line width of the spherical grid.",
+        "The width of the grid lines. The larger number, the thicker the lines.",
         openspace::properties::Property::Visibility::NoviceUser
     };
 
diff --git a/modules/base/rendering/pointcloud/renderableinterpolatedpoints.cpp b/modules/base/rendering/pointcloud/renderableinterpolatedpoints.cpp
index 5d04e0242a..9c16476f58 100644
--- a/modules/base/rendering/pointcloud/renderableinterpolatedpoints.cpp
+++ b/modules/base/rendering/pointcloud/renderableinterpolatedpoints.cpp
@@ -43,7 +43,7 @@ namespace {
     constexpr openspace::properties::Property::PropertyInfo InterpolationValueInfo = {
         "Value",
         "Value",
-        "The value to use for interpolation. The max value is set from the number of "
+        "The value used for interpolation. The max value is set from the number of "
         "steps in the dataset, so a step of one corresponds to one step in the dataset "
         "and values in-between will be determined using interpolation.",
         openspace::properties::Property::Visibility::NoviceUser
@@ -136,7 +136,7 @@ namespace {
     // the used texture will be decided based on the first N set of points.
     struct [[codegen::Dictionary(RenderableInterpolatedPoints)]] Parameters {
         // The number of objects to read from the dataset. Every N:th datapoint will
-        // be interpreted as the same point, but at a different step in the interpolation
+        // be interpreted as the same point, but at a different step in the interpolation.
         int numberOfObjects [[codegen::greaterequal(1)]];
 
         struct Interpolation {
@@ -149,7 +149,7 @@ namespace {
             // [[codegen::verbatim(UseSplineInfo.description)]]
             std::optional<bool> useSplineInterpolation;
         };
-        // Initial settings for the interpolation
+        // Initial settings for the interpolation.
         std::optional<Interpolation> interpolation;
     };
 
diff --git a/modules/base/rendering/pointcloud/renderablepointcloud.cpp b/modules/base/rendering/pointcloud/renderablepointcloud.cpp
index ff14dc0e88..21b462a132 100644
--- a/modules/base/rendering/pointcloud/renderablepointcloud.cpp
+++ b/modules/base/rendering/pointcloud/renderablepointcloud.cpp
@@ -104,9 +104,9 @@ namespace {
     constexpr openspace::properties::Property::PropertyInfo SpriteTextureInfo = {
         "File",
         "Point Sprite Texture File",
-        "The path to the texture that should be used as the point sprite. Note that if "
-        "multiple textures option is set in the asset, by providing a texture folder, "
-        "this value will be ignored.",
+        "The path to the texture of the point sprite. Note that if multiple textures "
+        "option is set in the asset, by providing a texture folder, this value will be "
+        "ignored.",
         openspace::properties::Property::Visibility::AdvancedUser
     };
 
@@ -125,8 +125,7 @@ namespace {
     constexpr openspace::properties::Property::PropertyInfo PointColorInfo = {
         "FixedColor",
         "Fixed Color",
-        "This value is used to define the color of the points when no color map is"
-        "used.",
+        "The color of the points, when no color map is used.",
         openspace::properties::Property::Visibility::NoviceUser
     };
 
@@ -149,13 +148,13 @@ namespace {
     constexpr openspace::properties::Property::PropertyInfo FadeInDistancesInfo = {
         "FadeInDistances",
         "Fade-In Start and End Distances",
-        "These values determine the initial and final distances from the origin of "
-        "the dataset at which the points will start and end fading-in. The distances "
-        "are specified in the same unit as the points, that is, the one provodied as the "
-        "Unit, or meters. With normal fading the points are fully visible once the "
-        "camera is outside this range and fully invisible when inside the range. With "
-        "inverted fading the situation is the opposite: the points are visible inside "
-        "hen closer than the min value of the range and invisible when further away.",
+        "Determines the initial and final distances from the origin of the dataset at "
+        "which the points will start and end fading-in. The distances are specified in "
+        "the same unit as the points, that is, the one provodied as the Unit, or meters. "
+        "With normal fading the points are fully visible once the camera is outside this "
+        "range and fully invisible when inside the range. With inverted fading the "
+        "case is the opposite: the points are visible inside when closer than the min "
+        "value of the range and invisible when further away.",
         openspace::properties::Property::Visibility::AdvancedUser
     };
 
@@ -170,9 +169,9 @@ namespace {
     constexpr openspace::properties::Property::PropertyInfo InvertFadeInfo = {
         "Invert",
         "Invert",
-        "This property can be used the invert the fading so that the points are "
-        "invisible when the camera is further away than the max fade distance "
-        "and fully visible when it is closer than the min distance.",
+        "If true, inverts the fading so that the points are invisible when the camera "
+        "is further away than the max fade distance and fully visible when it is closer "
+        "than the min distance.",
         openspace::properties::Property::Visibility::AdvancedUser
     };
 
@@ -190,9 +189,9 @@ namespace {
     constexpr openspace::properties::Property::PropertyInfo UseOrientationDataInfo = {
         "UseOrientationData",
         "Use Orientation Data",
-        "Include the orietation data in the dataset when rendering the points, if there "
-        "is any. To see the rotation, you also need to set the \"Orientation Render "
-        "Option\" to \"Fixed Rotation\".",
+        "If true, the orientation data in the dataset is included when rendering the points, "
+        "if there is any. To see the rotation, you also need to set the \"Orientation "
+        "Render Option\" to \"Fixed Rotation\".",
         openspace::properties::Property::Visibility::AdvancedUser
     };
 
@@ -213,8 +212,7 @@ namespace {
     constexpr openspace::properties::Property::PropertyInfo NumShownDataPointsInfo = {
         "NumberOfDataPoints",
         "Number of Shown Data Points",
-        "This read only property includes information about how many points are being "
-        "rendered.",
+        "Information about how many points are being rendered.",
         openspace::properties::Property::Visibility::User
     };
 
@@ -228,22 +226,22 @@ namespace {
     constexpr openspace::properties::Property::PropertyInfo ScaleExponentInfo = {
         "ScaleExponent",
         "Scale Exponent",
-        "This value is used as in exponential scaling to set the absolute size of the "
-        "point. In general, the larger distance the dataset covers, the larger this "
-        "value should be. If not included, it is computed based on the maximum "
-        "positional component of the data points. This is useful for showing the "
-        "dataset at all, but you will likely want to change it to something that looks "
-        "good. Note that a scale exponent of 0 leads to the points having a diameter of "
-        "1 meter, i.e. no exponential scaling.",
+        "An exponential scale value used to set the absolute size of the point. In "
+        "general, the larger distance the dataset covers, the larger this value should "
+        "be. If not included, it is computed based on the maximum positional component "
+        "of the data points. This is useful for showing the dataset at all, but you will "
+        "likely want to change it to something that looks good. Note that a scale "
+        "exponent of 0 leads to the points having a diameter of 1 meter, i.e. no "
+        "exponential scaling.",
         openspace::properties::Property::Visibility::User
     };
 
     constexpr openspace::properties::Property::PropertyInfo ScaleFactorInfo = {
         "ScaleFactor",
         "Scale Factor",
-        "This value is used as a multiplicative factor to adjust the size of the points, "
-        "after the exponential scaling and any max size control effects. Simply just "
-        "increases or decreases the visual size of the points.",
+        "A multiplicative factor used to adjust the size of the points, after the "
+        "exponential scaling and any max size control effects. Simply just increases "
+        "or decreases the visual size of the points.",
         openspace::properties::Property::Visibility::User
     };
 
@@ -259,64 +257,62 @@ namespace {
     constexpr openspace::properties::Property::PropertyInfo MaxSizeInfo = {
         "MaxSize",
         "Max Size",
-        "This value controls the maximum allowed size for the points, when the max size "
-        "control feature is enabled. This limits the visual size of the points based on "
-        "the distance to the camera. The larger the value, the larger the points are "
-        "allowed to become. In the background, the computations are made by limiting the "
-        "size to a certain angle based on the field of view of the camera. So a value of "
-        "1 limits the point size to take up a maximum of one degree of the view space.",
+        "Controls the maximum allowed size for the points, when the max size control "
+        "feature is enabled. This limits the visual size of the points based on the "
+        "distance to the camera. The larger the value, the larger the points may be. "
+        "In the background, the computations are made by limiting the size to a certain "
+        "angle based on the field of view of the camera. So a value of 1 limits the "
+        "point size to take up a maximum of one degree of the view space.",
         openspace::properties::Property::Visibility::AdvancedUser
     };
 
     constexpr openspace::properties::Property::PropertyInfo SizeMappingEnabledInfo = {
         "Enabled",
         "Size Mapping Enabled",
-        "If this value is set to 'true' and at least one column was loaded as an option "
-        "for size mapping, the chosen data column will be used to scale the size of the "
-        "points. The first option in the list is selected per default.",
+        "Decides whether size mapping should be enabled. If true and at least one column "
+        "was loaded as an option for size mapping, the chosen data column will be used "
+        "to scale the size of the points.",
         openspace::properties::Property::Visibility::NoviceUser
     };
 
     constexpr openspace::properties::Property::PropertyInfo SizeMappingOptionInfo = {
         "Parameter",
         "Parameter Option",
-        "This value determines which parameter is used for scaling of the point. The "
-        "parameter value will be used as a miltiplicative factor to scale the size of "
-        "the points. Note that they may however still be scaled by max size adjustment "
-        "effects.",
+        "The name of a data parameter used for scaling of the points. The parameter "
+        "value will be used as a multiplicative factor to scale the size of the points. "
+        "Note that they may still be scaled by max size adjustment effects.",
         openspace::properties::Property::Visibility::AdvancedUser
     };
 
     constexpr openspace::properties::Property::PropertyInfo EnableOutlineInfo = {
         "EnableOutline",
         "Enable Point Outline",
-        "This setting determines if each point should have an outline or not. An outline "
-        "is only applied when rendering as colored points (not when using textures).",
+        "Determines whether each point should have an outline or not.",
         openspace::properties::Property::Visibility::User
     };
 
     constexpr openspace::properties::Property::PropertyInfo OutlineColorInfo = {
         "OutlineColor",
         "Outline Color",
-        "This value defines the color of the outline. Darker colors will be "
-        "less visible if Additive Blending is enabled.",
+        "The color of the outline. Darker colors will be less visible if \"Additive "
+        "Blending\" is enabled.",
         openspace::properties::Property::Visibility::User
     };
 
-    constexpr openspace::properties::Property::PropertyInfo OutlineWeightInfo = {
-        "OutlineWeight",
-        "Outline Weight",
-        "This setting determines the thickness of the outline. A value of 0 will "
-        "not show any outline, while a value of 1 will cover the whole point.",
+    constexpr openspace::properties::Property::PropertyInfo OutlineWidthInfo = {
+        "OutlineWidth",
+        "Outline Width",
+        "The thickness of the outline, given as a value relative to the size of the "
+        "point. A value of 0 will not show any outline, while a value of 1 will cover "
+        "the whole point.",
         openspace::properties::Property::Visibility::AdvancedUser
     };
 
     constexpr openspace::properties::Property::PropertyInfo OutlineStyleInfo = {
         "OutlineStyle",
         "Outline Style",
-        "This setting decides the shape of points that have an outline (round, square, "
-        "or lust a line at the bottom). Note that anything but \"Round\" will lead to "
-        "the point being drawed as squares.",
+        "Decides the style of the outline (round, square, or a line at the bottom). "
+        "The style also affects the shape of the points.",
         openspace::properties::Property::Visibility::AdvancedUser
     };
 
@@ -356,7 +352,7 @@ namespace {
     //   to 1.
     struct [[codegen::Dictionary(RenderablePointCloud)]] Parameters {
         // The path to the data file that contains information about the point to be
-        // rendered. Can be either a CSV or SPECK file
+        // rendered. Can be either a CSV or SPECK file.
         std::optional<std::filesystem::path> file;
 
         // If true (default), the loaded dataset and color map will be cached so that they
@@ -368,7 +364,7 @@ namespace {
         std::optional<bool> useCaching;
 
         // A dictionary specifying details on how to load the dataset. Updating the data
-        // mapping will lead to a new cached version of the dataset
+        // mapping will lead to a new cached version of the dataset.
         std::optional<ghoul::Dictionary> dataMapping
             [[codegen::reference("dataloader_datamapping")]];
 
@@ -393,7 +389,7 @@ namespace {
             // [[codegen::verbatim(UseAlphaInfo.description)]]
             std::optional<bool> useAlphaChannel;
         };
-        // Settings related to the texturing of the points
+        // Settings related to the texturing of the points.
         std::optional<Texture> texture;
 
         // [[codegen::verbatim(DrawElementsInfo.description)]]
@@ -413,7 +409,7 @@ namespace {
         // [[codegen::verbatim(UseAdditiveBlendingInfo.description)]]
         std::optional<bool> useAdditiveBlending;
 
-        // If true, skip the first data point in the loaded dataset
+        // If true, skip the first data point in the loaded dataset.
         std::optional<bool> skipFirstDataPoint;
 
         enum class [[codegen::map(openspace::DistanceUnit)]] Unit {
@@ -426,7 +422,7 @@ namespace {
             Gigalightyear [[codegen::key("Gly")]]
         };
         // The unit used for all distances. Should match the unit of any
-        // distances/positions in the data files
+        // distances/positions in the data files.
         std::optional<Unit> unit;
 
         // [[codegen::verbatim(LabelsInfo.description)]]
@@ -434,7 +430,7 @@ namespace {
             [[codegen::reference("labelscomponent")]];
 
         struct SizeSettings {
-            // Settings related to scaling the points based on data
+            // Settings related to scaling the points based on data.
             std::optional<ghoul::Dictionary> sizeMapping
                 [[codegen::reference("base_sizemappingcomponent")]];
 
@@ -468,8 +464,8 @@ namespace {
             // [[codegen::verbatim(OutlineColorInfo.description)]]
             std::optional<glm::vec3> outlineColor;
 
-            // [[codegen::verbatim(OutlineColorInfo.description)]]
-            std::optional<float> outlineWeight;
+            // [[codegen::verbatim(OutlineWidthInfo.description)]]
+            std::optional<float> outlineWidth;
 
             enum class [[codegen::map(OutlineStyle)]] OutlineStyle {
                 Round,
@@ -498,10 +494,10 @@ namespace {
         };
         // Settings related to fading based on camera distance. Can be used to either
         // fade away or fade in the points when reaching a certain distance from the
-        // origin of the dataset
+        // origin of the dataset.
         std::optional<Fading> fading;
 
-        // Transformation matrix to be applied to the position of each object
+        // Transformation matrix to be applied to the position of each object.
         std::optional<glm::dmat4x4> transformationMatrix;
     };
 
@@ -550,7 +546,7 @@ RenderablePointCloud::ColorSettings::ColorSettings(const ghoul::Dictionary& dict
     , pointColor(PointColorInfo, glm::vec3(1.f), glm::vec3(0.f), glm::vec3(1.f))
     , enableOutline(EnableOutlineInfo, false)
     , outlineColor(OutlineColorInfo, glm::vec3(0.23f), glm::vec3(0.f), glm::vec3(1.f))
-    , outlineWeight(OutlineWeightInfo, 0.2f, 0.f, 1.f)
+    , outlineWidth(OutlineWidthInfo, 0.2f, 0.f, 1.f)
     , outlineStyle(OutlineStyleInfo)
     , applyCmapToOutline(ApplyColorMapToOutlineInfo, false)
 {
@@ -564,7 +560,7 @@ RenderablePointCloud::ColorSettings::ColorSettings(const ghoul::Dictionary& dict
     outlineColor.setViewOption(properties::Property::ViewOptions::Color);
     addProperty(outlineColor);
 
-    addProperty(outlineWeight);
+    addProperty(outlineWidth);
 
     outlineStyle.addOption(OutlineStyle::Round, "Round");
     outlineStyle.addOption(OutlineStyle::Square, "Square");
@@ -588,7 +584,7 @@ RenderablePointCloud::ColorSettings::ColorSettings(const ghoul::Dictionary& dict
 
         enableOutline = p.coloring->enableOutline.value_or(enableOutline);
         outlineColor = p.coloring->outlineColor.value_or(outlineColor);
-        outlineWeight = p.coloring->outlineWeight.value_or(outlineWeight);
+        outlineWidth = p.coloring->outlineWidth.value_or(outlineWidth);
 
         if (p.coloring->outlineStyle.has_value()) {
             outlineStyle = codegen::map<OutlineStyle>(*p.coloring->outlineStyle);
@@ -1248,7 +1244,7 @@ void RenderablePointCloud::renderPoints(const RenderData& data,
     _program->setUniform(_uniformCache.color, _colorSettings.pointColor);
     _program->setUniform(_uniformCache.enableOutline, _colorSettings.enableOutline);
     _program->setUniform(_uniformCache.outlineColor, _colorSettings.outlineColor);
-    _program->setUniform(_uniformCache.outlineWeight, _colorSettings.outlineWeight);
+    _program->setUniform(_uniformCache.outlineWeight, _colorSettings.outlineWidth);
     _program->setUniform(_uniformCache.outlineStyle, _colorSettings.outlineStyle);
     _program->setUniform(_uniformCache.useCmapOutline, _colorSettings.applyCmapToOutline);
 
diff --git a/modules/base/rendering/pointcloud/renderablepointcloud.h b/modules/base/rendering/pointcloud/renderablepointcloud.h
index ed29d153cf..b3e168a22f 100644
--- a/modules/base/rendering/pointcloud/renderablepointcloud.h
+++ b/modules/base/rendering/pointcloud/renderablepointcloud.h
@@ -189,7 +189,7 @@ protected:
         std::unique_ptr<ColorMappingComponent> colorMapping;
         properties::BoolProperty enableOutline;
         properties::Vec3Property outlineColor;
-        properties::FloatProperty outlineWeight;
+        properties::FloatProperty outlineWidth;
         properties::OptionProperty outlineStyle;
         properties::BoolProperty applyCmapToOutline;
     };
diff --git a/modules/base/rendering/pointcloud/renderablepolygoncloud.cpp b/modules/base/rendering/pointcloud/renderablepolygoncloud.cpp
index 8b165d9529..9417801acf 100644
--- a/modules/base/rendering/pointcloud/renderablepolygoncloud.cpp
+++ b/modules/base/rendering/pointcloud/renderablepolygoncloud.cpp
@@ -47,7 +47,7 @@ namespace {
     // point cloud rendering.
     struct [[codegen::Dictionary(RenderablePolygonCloud)]] Parameters {
         // The number of sides for the polygon used to represent each point. Default is
-        // 3, i.e. to use triangles
+        // 3, i.e. to use triangles.
         std::optional<int> polygonSides [[codegen::greaterequal(3)]];
     };
 
diff --git a/modules/base/rendering/pointcloud/sizemappingcomponent.cpp b/modules/base/rendering/pointcloud/sizemappingcomponent.cpp
index ae01cefdc9..4ed05e5ff5 100644
--- a/modules/base/rendering/pointcloud/sizemappingcomponent.cpp
+++ b/modules/base/rendering/pointcloud/sizemappingcomponent.cpp
@@ -71,7 +71,7 @@ namespace {
         std::optional<bool> enabled;
 
         // A list specifying all parameters that may be used for size mapping, i.e.
-        // scaling the points based on the provided data columns
+        // scaling the points based on the provided data columns.
         std::optional<std::vector<std::string>> parameterOptions;
 
         // [[codegen::verbatim(OptionInfo.description)]]
@@ -98,7 +98,7 @@ namespace {
             Gigalightyear
         };
 
-        // The scale to use for the size values in the dataset, given as either a string
+        // The scale used for the size values in the dataset, given as either a string
         // representing a specific unit or a value to multiply all the datapoints with
         // to convert the value to meter. The resulting value will be applied as a
         // multiplicative factor. For example, if the size data is given in is in
diff --git a/modules/base/rendering/renderablecartesianaxes.cpp b/modules/base/rendering/renderablecartesianaxes.cpp
index ebfa768ab4..3f57ea0b1a 100644
--- a/modules/base/rendering/renderablecartesianaxes.cpp
+++ b/modules/base/rendering/renderablecartesianaxes.cpp
@@ -40,21 +40,21 @@ namespace {
     constexpr openspace::properties::Property::PropertyInfo XColorInfo = {
         "XColor",
         "X Color",
-        "This value determines the color of the x axis.",
+        "The color of the x-axis.",
         openspace::properties::Property::Visibility::NoviceUser
     };
 
     constexpr openspace::properties::Property::PropertyInfo YColorInfo = {
         "YColor",
         "Y Color",
-        "This value determines the color of the y axis.",
+        "The color of the y-axis.",
         openspace::properties::Property::Visibility::NoviceUser
     };
 
     constexpr openspace::properties::Property::PropertyInfo ZColorInfo = {
         "ZColor",
         "Z Color",
-        "This value determines the color of the z axis.",
+        "The color of the z-axis.",
         openspace::properties::Property::Visibility::NoviceUser
     };
 
diff --git a/modules/base/rendering/renderabledisc.cpp b/modules/base/rendering/renderabledisc.cpp
index 92f72d6dd9..0130e2ed9f 100644
--- a/modules/base/rendering/renderabledisc.cpp
+++ b/modules/base/rendering/renderabledisc.cpp
@@ -46,24 +46,25 @@ namespace {
     constexpr openspace::properties::Property::PropertyInfo TextureInfo = {
         "Texture",
         "Texture",
-        "This value is the path to a texture on disk that contains a one-dimensional "
-        "texture to be used for the color.",
+        "The path to a file with a one-dimensional texture to be used for the disc "
+        "color. The leftmost color will be innermost color when rendering the disc, "
+        "and the rightmost color will be the outermost color.",
         openspace::properties::Property::Visibility::User
     };
 
     constexpr openspace::properties::Property::PropertyInfo SizeInfo = {
         "Size",
         "Size",
-        "This value specifies the outer radius of the disc in meters.",
+        "The outer radius of the disc, in meters.",
         openspace::properties::Property::Visibility::User
     };
 
     constexpr openspace::properties::Property::PropertyInfo WidthInfo = {
         "Width",
         "Width",
-        "This value is used to set the width of the disc. The actual width is set "
-        "based on the given size and this value should be set between 0 and 1. A value "
-        "of 1 results in a full circle and 0.5 a disc with an inner radius of 0.5*size.",
+        "The disc width, given as a ratio of the full disc radius. For example, a value "
+        "of 1 results in a full circle, while 0.5 results in a disc where the inner "
+        "radius is half of the full radius.",
         openspace::properties::Property::Visibility::AdvancedUser
     };
 
@@ -75,7 +76,7 @@ namespace {
         std::optional<float> size;
 
         // [[codegen::verbatim(WidthInfo.description)]]
-        std::optional<float> width;
+        std::optional<float> width [[codegen::inrange(0.0, 1.0)]];
     };
 #include "renderabledisc_codegen.cpp"
 } // namespace
diff --git a/modules/base/rendering/renderablelabel.cpp b/modules/base/rendering/renderablelabel.cpp
index 8ec38316bb..68210ac9f3 100644
--- a/modules/base/rendering/renderablelabel.cpp
+++ b/modules/base/rendering/renderablelabel.cpp
@@ -113,7 +113,8 @@ namespace {
     constexpr openspace::properties::Property::PropertyInfo SizeInfo = {
         "Size",
         "Size",
-        "This value affects the size scale of the label.",
+        "Scales the size of the label, exponentially. The value is used as the exponent "
+        "in a 10^x computation to scale the label size.",
         openspace::properties::Property::Visibility::User
     };
 
diff --git a/modules/base/rendering/renderablemodel.cpp b/modules/base/rendering/renderablemodel.cpp
index 4c74a7edc5..27abcaf182 100644
--- a/modules/base/rendering/renderablemodel.cpp
+++ b/modules/base/rendering/renderablemodel.cpp
@@ -100,8 +100,8 @@ namespace {
     constexpr openspace::properties::Property::PropertyInfo ShadingInfo = {
         "PerformShading",
         "Perform Shading",
-        "This value determines whether this model should be shaded by using the position "
-        "of the Sun.",
+        "Determines whether shading should be applied to this model, based on the "
+        "provided list of light sources. If false, the model will be fully illuminated.",
         openspace::properties::Property::Visibility::User
     };
 
@@ -115,8 +115,8 @@ namespace {
     constexpr openspace::properties::Property::PropertyInfo ModelTransformInfo = {
         "ModelTransform",
         "Model Transform",
-        "This value specifies the model transform that is applied to the model before "
-        "all other transformations are applied.",
+        "An extra model transform matrix that is applied to the model before all other "
+        "transformations are applied.",
         openspace::properties::Property::Visibility::Developer
     };
 
@@ -130,18 +130,16 @@ namespace {
     constexpr openspace::properties::Property::PropertyInfo ModelScaleInfo = {
         "ModelScale",
         "Model Scale",
-        "This value specifies the scale for the model. If a value for the ModelScale was "
-        "provided in the asset file, you can see and change it here. If instead a unit "
-        "name was provided in the asset, this is the value that that name represents. "
-        "For example 'Centimeter' becomes 0.01. For more information see "
-        "http://wiki.openspaceproject.com/docs/builders/models/model-scale.html.",
+        "The scale of the model. If a numeric value is provided in the asset file, the scale "
+        "will be that exact value. If instead a unit name is provided, this "
+        "is the value that that name represents. For example 'Centimeter' becomes 0.01.",
         openspace::properties::Property::Visibility::AdvancedUser
     };
 
     constexpr openspace::properties::Property::PropertyInfo RotationVecInfo = {
         "RotationVector",
         "Rotation Vector",
-        "Rotation Vector using degrees.",
+        "A rotation vector with Euler angles, specified in degrees.",
         openspace::properties::Property::Visibility::AdvancedUser
     };
 
@@ -155,14 +153,17 @@ namespace {
     constexpr openspace::properties::Property::PropertyInfo EnableDepthTestInfo = {
         "EnableDepthTest",
         "Enable Depth Test",
-        "Enable Depth Testing for the Model.",
+        "If true, depth testing is enabled for the model. This means that parts of the "
+        "model that are occluded by other parts will not be rendered. If disabled, the "
+        "depth of the model part will not be taken into account in rendering and some "
+        "parts that should be hidden behind a model might be rendered in front.",
         openspace::properties::Property::Visibility::AdvancedUser
     };
 
     constexpr openspace::properties::Property::PropertyInfo BlendingOptionInfo = {
         "BlendingOption",
         "Blending Options",
-        "Changes the blending function used to calculate the colors of the model with "
+        "Controls the blending function used to calculate the colors of the model with "
         "respect to the opacity.",
         openspace::properties::Property::Visibility::AdvancedUser
     };
@@ -190,19 +191,17 @@ namespace {
             Mile
         };
 
-        // The scale of the model. For example, if the model is in centimeters
-        // then <code>ModelScale = 'Centimeter'</code> or <code>ModelScale = 0.01</code>.
-        // The value that this needs to be in order for the model to be in the correct
-        // scale relative to the rest of OpenSpace can be tricky to find.
-        // Essentially it depends on the model software that the model was created
-        // with and the original intention of the modeler. For more information see
-        // our wiki page for this parameter:
-        // http://wiki.openspaceproject.com/docs/builders/models/model-scale.html
+        // The scale of the model. For example, if the model is in centimeters then
+        // `ModelScale = 'Centimeter'` or `ModelScale = 0.01`. The value that this needs
+        // to be in order for the model to be in the correct scale relative to the rest
+        // of OpenSpace can be tricky to find. Essentially, it depends on the model
+        // software that the model was created with and the original intention of the
+        // modeler.
         std::optional<std::variant<ScaleUnit, double>> modelScale;
 
-        // By default the given ModelScale is used to scale the model down,
-        // by setting this setting to true the model is instead scaled up with the
-        // given ModelScale
+        // By default the given `ModelScale` is used to scale down the model. By setting
+        // this setting to true the scaling is inverted to that the model is instead
+        // scaled up with the given `ModelScale`.
         std::optional<bool> invertModelScale;
 
         // Set if invisible parts (parts with no textures or materials) of the model
@@ -213,7 +212,7 @@ namespace {
         std::optional<bool> enableAnimation;
 
         // The date and time that the model animation should start.
-        // In format 'YYYY MM DD hh:mm:ss'.
+        // In format `'YYYY MM DD hh:mm:ss'`.
         std::optional<std::string> animationStartTime [[codegen::datetime()]];
 
         enum class [[codegen::map(openspace::TimeUnit)]] AnimationTimeUnit {
@@ -224,9 +223,9 @@ namespace {
             Minute
         };
 
-        // The time scale for the animation relative to seconds.
-        // Ex, if animation is in milliseconds then AnimationTimeScale = 0.001 or
-        // AnimationTimeScale = Millisecond, default is Second
+        // The time scale for the animation relative to seconds. For example, if the
+        // animation is in milliseconds then `AnimationTimeScale = 0.001` or
+        // `AnimationTimeScale = \"Millisecond\"`.
         std::optional<std::variant<AnimationTimeUnit, float>> animationTimeScale;
 
         enum class AnimationMode {
@@ -237,10 +236,8 @@ namespace {
             BounceInfinitely
         };
 
-        // The mode of how the animation should be played back.
-        // Default is animation is played back once at the start time.
-        // For a more detailed description see:
-        // http://wiki.openspaceproject.com/docs/builders/model-animation
+        // The mode of how the animation should be played back. Default is that the
+        // animation is played back once at the start time.
         std::optional<AnimationMode> animationMode;
 
         // [[codegen::verbatim(AmbientIntensityInfo.description)]]
@@ -277,12 +274,10 @@ namespace {
         // [[codegen::verbatim(BlendingOptionInfo.description)]]
         std::optional<std::string> blendingOption;
 
-        // The path to the vertex shader program that is used instead of the default
-        // shader.
+        // The path to a vertex shader program to use instead of the default shader.
         std::optional<std::filesystem::path> vertexShader;
 
-        // The path to the fragment shader program that is used instead of the default
-        // shader.
+        // The path to a fragment shader program to use instead of the default shader.
         std::optional<std::filesystem::path> fragmentShader;
     };
 #include "renderablemodel_codegen.cpp"
diff --git a/modules/base/rendering/renderablenodearrow.cpp b/modules/base/rendering/renderablenodearrow.cpp
index 805f77dfba..89942cbf9b 100644
--- a/modules/base/rendering/renderablenodearrow.cpp
+++ b/modules/base/rendering/renderablenodearrow.cpp
@@ -62,30 +62,30 @@ namespace {
     constexpr openspace::properties::Property::PropertyInfo ColorInfo = {
         "Color",
         "Color",
-        "This value determines the RGB color for the arrow.",
+        "The RGB color for the arrow.",
         openspace::properties::Property::Visibility::NoviceUser
     };
 
     constexpr openspace::properties::Property::PropertyInfo SegmentsInfo = {
         "Segments",
         "Number of Segments",
-        "This value specifies the number of segments that the shapes for the arrow are "
-        "separated in. A higher number leads to a higher resolution.",
+        "The number of segments that the shapes of the arrow are divided into. A higher "
+        "number leads to a higher resolution and smoother shape.",
         openspace::properties::Property::Visibility::AdvancedUser
     };
 
     constexpr openspace::properties::Property::PropertyInfo InvertInfo = {
         "Invert",
         "Invert Direction",
-        "If set to true, the arrow direction is inverted so that it points to the "
-        "start node instead of the end node",
+        "If true, the arrow direction is inverted so that it points to the start node "
+        "instead of the end node.",
         openspace::properties::Property::Visibility::NoviceUser
     };
 
     constexpr openspace::properties::Property::PropertyInfo ArrowHeadSizeInfo = {
         "ArrowHeadSize",
         "Arrow Head Size",
-        "This size of the arrow head, given in relative value of the entire length of "
+        "The length of the arrow head, given in relative value of the entire length of "
         "the arrow. For example, 0.1 makes the arrow head length be 10% of the full "
         "arrow length.",
         openspace::properties::Property::Visibility::AdvancedUser
@@ -112,8 +112,9 @@ namespace {
     constexpr openspace::properties::Property::PropertyInfo RelativeOffsetInfo = {
         "UseRelativeOffset",
         "Use Relative Offset Distance",
-        "Decide whether to use relative distances (in units of start node bounding "
-        "sphere) for the offset distance. If false, meters is used.",
+        "Decides whether to use relative distances for the offset distance. This means "
+        "that the offset distance will be computed as the provided 'Offset' value times "
+        "the bounding sphere of the start node. If false, meters is used.",
         openspace::properties::Property::Visibility::AdvancedUser
     };
 
@@ -129,15 +130,16 @@ namespace {
     constexpr openspace::properties::Property::PropertyInfo RelativeLengthInfo = {
         "UseRelativeLength",
         "Use Relative Length",
-        "Decide whether to use relative size (in units of start node bounding "
-        "sphere) for the length of the arrow. If false, meters is used.",
+        "Decides whether to use relative size for the length of the arrow. This means "
+        "that the arrow length will be computed as the provided 'Length' value times "
+        "the bounding sphere of the start node. If false, meters is used.",
         openspace::properties::Property::Visibility::AdvancedUser
     };
 
     constexpr openspace::properties::Property::PropertyInfo WidthInfo = {
         "Width",
         "Width",
-        "This value specifies the width of the arrow shape.",
+        "The width of the arrow, in meters.",
         openspace::properties::Property::Visibility::AdvancedUser
     };
 
@@ -165,7 +167,7 @@ namespace {
     constexpr openspace::properties::Property::PropertyInfo ShadingEnabledInfo = {
         "PerformShading",
         "Perform Shading",
-        "This value determines whether shading should be applied to the arrow model.",
+        "Determines whether shading should be applied to the arrow model.",
         openspace::properties::Property::Visibility::User
     };
 
diff --git a/modules/base/rendering/renderablenodeline.cpp b/modules/base/rendering/renderablenodeline.cpp
index 91cabf5766..c509728c2f 100644
--- a/modules/base/rendering/renderablenodeline.cpp
+++ b/modules/base/rendering/renderablenodeline.cpp
@@ -60,14 +60,14 @@ namespace {
     constexpr openspace::properties::Property::PropertyInfo LineColorInfo = {
         "Color",
         "Color",
-        "This value determines the RGB color for the line.",
+        "The RGB color for the line.",
         openspace::properties::Property::Visibility::NoviceUser
     };
 
     constexpr openspace::properties::Property::PropertyInfo LineWidthInfo = {
         "LineWidth",
         "Line Width",
-        "This value specifies the line width.",
+        "The width of the line. The larger number, the thicker the line.",
         openspace::properties::Property::Visibility::NoviceUser
     };
 
diff --git a/modules/base/rendering/renderableplane.cpp b/modules/base/rendering/renderableplane.cpp
index e698c9fe59..690f0d2658 100644
--- a/modules/base/rendering/renderableplane.cpp
+++ b/modules/base/rendering/renderableplane.cpp
@@ -48,48 +48,48 @@ namespace {
 
     constexpr openspace::properties::Property::PropertyInfo BillboardInfo = {
         "Billboard",
-        "Billboard mode",
-        "This value specifies whether the plane is a billboard, which means that it is "
-        "always facing the camera. If this is false, it can be oriented using other "
+        "Billboard Mode",
+        "Specifies whether the plane should be a billboard, which means that it is "
+        "always facing the camera. If it is not, it can be oriented using other "
         "transformations.",
         openspace::properties::Property::Visibility::AdvancedUser
     };
 
     constexpr openspace::properties::Property::PropertyInfo MirrorBacksideInfo = {
         "MirrorBackside",
-        "Mirror backside of image plane",
-        "If this value is set to false, the image plane will not be mirrored when "
-        "looking from the backside. This is usually desirable when the image shows "
-        "data at a specific location, but not if it is displaying text for example.",
+        "Mirror Backside of Image Plane",
+        "If false, the image plane will not be mirrored when viewed from the backside. "
+        "This is usually desirable when the image shows data at a specific location, but "
+        "not if it is displaying text for example.",
         openspace::properties::Property::Visibility::User
     };
 
     constexpr openspace::properties::Property::PropertyInfo SizeInfo = {
         "Size",
-        "Size (in meters)",
-        "This value specifies the size of the plane in meters.",
+        "Size",
+        "The size of the plane in meters.",
         openspace::properties::Property::Visibility::AdvancedUser
     };
 
     constexpr openspace::properties::Property::PropertyInfo AutoScaleInfo = {
         "AutoScale",
         "Auto Scale",
-        "When true, the plane will automatically adjust in size to match the aspect "
-        "ratio of the content. Otherwise it will remain in the given size."
+        "Decides whether the plane should automatically adjust in size to match the "
+        "aspect ratio of the content. Otherwise it will remain in the given size."
     };
 
     constexpr openspace::properties::Property::PropertyInfo BlendModeInfo = {
         "BlendMode",
         "Blending Mode",
-        "This determines the blending mode that is applied to this plane.",
+        "Determines the blending mode that is applied to this plane.",
         openspace::properties::Property::Visibility::AdvancedUser
     };
 
     constexpr openspace::properties::Property::PropertyInfo MultiplyColorInfo = {
         "MultiplyColor",
         "Multiply Color",
-        "If set, the plane's texture is multiplied with this color. Useful for applying "
-        "a color grayscale images.",
+        "An RGB color to multiply with the plane's texture. Useful for applying "
+        "a color to grayscale images.",
         openspace::properties::Property::Visibility::User
     };
 
diff --git a/modules/base/rendering/renderableplaneimagelocal.cpp b/modules/base/rendering/renderableplaneimagelocal.cpp
index 93a4d7b435..4292869ac7 100644
--- a/modules/base/rendering/renderableplaneimagelocal.cpp
+++ b/modules/base/rendering/renderableplaneimagelocal.cpp
@@ -41,8 +41,7 @@ namespace {
     constexpr openspace::properties::Property::PropertyInfo TextureInfo = {
         "Texture",
         "Texture",
-        "This value specifies an image that is loaded from disk and is used as a texture "
-        "that is applied to this plane. This image has to be square.",
+        "A path to an image file to use as a texture for the plane.",
         openspace::properties::Property::Visibility::User
     };
 
@@ -50,9 +49,9 @@ namespace {
         // [[codegen::verbatim(TextureInfo.description)]]
         std::string texture;
 
-        // If this value is set to 'true', the image for this plane will not be loaded at
+        // If this value is set to true, the image for this plane will not be loaded at
         // startup but rather when image is shown for the first time. Additionally, if the
-        // plane is hidden, the image will automatically be unloaded
+        // plane is hidden, the image will automatically be unloaded.
         std::optional<bool> lazyLoading;
     };
 #include "renderableplaneimagelocal_codegen.cpp"
diff --git a/modules/base/rendering/renderableplanetimevaryingimage.cpp b/modules/base/rendering/renderableplanetimevaryingimage.cpp
index 34303d828a..8c8c2f3eae 100644
--- a/modules/base/rendering/renderableplanetimevaryingimage.cpp
+++ b/modules/base/rendering/renderableplanetimevaryingimage.cpp
@@ -44,33 +44,14 @@ namespace {
     constexpr openspace::properties::Property::PropertyInfo SourceFolderInfo = {
         "SourceFolder",
         "Source Folder",
-        "This value specifies the image directory that is loaded from disk and "
-        "is used as a texture that is applied to this plane.",
-        openspace::properties::Property::Visibility::AdvancedUser
-    };
-
-    constexpr openspace::properties::Property::PropertyInfo RenderTypeInfo = {
-       "RenderType",
-       "Render Type",
-       "This value specifies if the plane should be rendered in the Background, "
-       "Opaque, Transparent, or Overlay rendering step.",
-        openspace::properties::Property::Visibility::AdvancedUser
+       "An image directory that is loaded from disk and contains the textures to use "
+       "for this plane.",
+       openspace::properties::Property::Visibility::AdvancedUser
     };
 
     struct [[codegen::Dictionary(RenderablePlaneTimeVaryingImage)]] Parameters {
         // [[codegen::verbatim(SourceFolderInfo.description)]]
         std::string sourceFolder;
-
-        enum class [[codegen::map(openspace::Renderable::RenderBin)]] RenderType {
-            Background,
-            Opaque,
-            PreDeferredTransparent [[codegen::key("PreDeferredTransparency")]],
-            PostDeferredTransparent [[codegen::key("PostDeferredTransparency")]],
-            Overlay
-        };
-
-        // [[codegen::verbatim(RenderTypeInfo.description)]]
-        std::optional<RenderType> renderType;
     };
 #include "renderableplanetimevaryingimage_codegen.cpp"
 } // namespace
@@ -104,13 +85,6 @@ RenderablePlaneTimeVaryingImage::RenderablePlaneTimeVaryingImage(
     addProperty(_sourceFolder);
     _sourceFolder.onChange([this]() { _texture = loadTexture(); });
 
-    if (p.renderType.has_value()) {
-        setRenderBin(codegen::map<Renderable::RenderBin>(*p.renderType));
-    }
-    else {
-        setRenderBin(Renderable::RenderBin::Opaque);
-    }
-
     if (dictionary.hasKey(KeyLazyLoading)) {
         _isLoadingLazily = dictionary.value<bool>(KeyLazyLoading);
 
diff --git a/modules/base/rendering/renderableprism.cpp b/modules/base/rendering/renderableprism.cpp
index c33a174030..a66544c658 100644
--- a/modules/base/rendering/renderableprism.cpp
+++ b/modules/base/rendering/renderableprism.cpp
@@ -70,14 +70,14 @@ namespace {
     constexpr openspace::properties::Property::PropertyInfo LineWidthInfo = {
         "LineWidth",
         "Line Width",
-        "This value specifies the line width.",
+        "The width of the lines. The larger number, the thicker the lines.",
         openspace::properties::Property::Visibility::User
     };
 
     constexpr openspace::properties::Property::PropertyInfo LineColorInfo = {
         "Color",
         "Color",
-        "This value determines the RGB color for the line.",
+        "The RGB color of the line.",
         openspace::properties::Property::Visibility::NoviceUser
     };
 
diff --git a/modules/base/rendering/renderablesphere.cpp b/modules/base/rendering/renderablesphere.cpp
index 96dccbe7c7..8d4e30f227 100644
--- a/modules/base/rendering/renderablesphere.cpp
+++ b/modules/base/rendering/renderablesphere.cpp
@@ -43,14 +43,14 @@ namespace {
     constexpr openspace::properties::Property::PropertyInfo SizeInfo = {
         "Size",
         "Size (in meters)",
-        "This value specifies the radius of the sphere in meters.",
+        "The radius of the sphere in meters.",
         openspace::properties::Property::Visibility::AdvancedUser
     };
 
     constexpr openspace::properties::Property::PropertyInfo SegmentsInfo = {
         "Segments",
         "Number of Segments",
-        "This value specifies the number of segments that the sphere is separated in.",
+        "The number of segments that the sphere is split into.",
         openspace::properties::Property::Visibility::AdvancedUser
     };
 
@@ -71,7 +71,7 @@ namespace {
     constexpr openspace::properties::Property::PropertyInfo MirrorTextureInfo = {
         "MirrorTexture",
         "Mirror Texture",
-        "Mirror the texture along the x-axis.",
+        "If true, mirror the texture along the x-axis.",
         openspace::properties::Property::Visibility::AdvancedUser
     };
 
@@ -85,19 +85,18 @@ namespace {
     constexpr openspace::properties::Property::PropertyInfo FadeInThresholdInfo = {
         "FadeInThreshold",
         "Fade-In Threshold",
-        "This value determines the distance from center of MilkyWay from where the "
-        "astronomical object starts to fade in, given as a percentage of the size of "
-        "the object. A negative or zero value means no fading in will happen. This is "
-        "also the default.",
+        "The distance from the center of the Milky Way at which the sphere should start "
+        "to fade in, given as a percentage of the size of the object. A value of zero "
+        "means that no fading in will happen.",
         openspace::properties::Property::Visibility::AdvancedUser
     };
 
     constexpr openspace::properties::Property::PropertyInfo FadeOutThresholdInfo = {
         "FadeOutThreshold",
         "Fade-Out Threshold",
-        "This value determines percentage of the sphere that is visible before starting "
-        "to fade it out. A negative or zero value means no fading out will happen. This "
-        "is also the default.",
+        "A threshold for when the sphere should start fading out, given as a percentage "
+        "of how much of the sphere that is visible before the fading should start. A "
+        "value of zero means that no fading out will happen.",
         openspace::properties::Property::Visibility::AdvancedUser
     };
 
@@ -145,8 +144,8 @@ RenderableSphere::RenderableSphere(const ghoul::Dictionary& dictionary)
     , _orientation(OrientationInfo, properties::OptionProperty::DisplayType::Dropdown)
     , _mirrorTexture(MirrorTextureInfo, false)
     , _disableFadeInDistance(DisableFadeInOutInfo, false)
-    , _fadeInThreshold(FadeInThresholdInfo, -1.f, -0.1f, 1.f, 0.001f)
-    , _fadeOutThreshold(FadeOutThresholdInfo, -1.f, -0.1f, 1.f, 0.001f)
+    , _fadeInThreshold(FadeInThresholdInfo, 0.f, 0.f, 1.f, 0.001f)
+    , _fadeOutThreshold(FadeOutThresholdInfo, 0.f, 0.f, 1.f, 0.001f)
 {
     const Parameters p = codegen::bake<Parameters>(dictionary);
 
diff --git a/modules/base/rendering/renderablesphereimagelocal.cpp b/modules/base/rendering/renderablesphereimagelocal.cpp
index 46595cb861..16bbbd4baa 100644
--- a/modules/base/rendering/renderablesphereimagelocal.cpp
+++ b/modules/base/rendering/renderablesphereimagelocal.cpp
@@ -36,19 +36,18 @@ namespace {
     constexpr openspace::properties::Property::PropertyInfo TextureInfo = {
         "Texture",
         "Texture",
-        "This value specifies an image that is loaded from disk and is used as a texture "
-        "that is applied to this sphere. This image is expected to be an equirectangular "
-        "projection.",
+        "The path to an image on disk to use as a texture for this sphere. The image is "
+        "expected to be an equirectangular projection.",
         openspace::properties::Property::Visibility::User
     };
 
     struct [[codegen::Dictionary(RenderableSphereImageLocal)]] Parameters {
         // [[codegen::verbatim(TextureInfo.description)]]
-        std::string texture;
+        std::filesystem::path texture;
 
-        // If this value is set to 'true', the image for this sphere will not be loaded at
-        // startup but rather when the image is shown for the first time. Additionally, if
-        // the sphere is disabled, the image will automatically be unloaded
+        // If true, the image for this sphere will not be loaded at startup but rather
+        // when the image is shown for the first time. Additionally, if the sphere is
+        // disabled, the image will automatically be unloaded.
         std::optional<bool> lazyLoading;
     };
 #include "renderablesphereimagelocal_codegen.cpp"
@@ -70,7 +69,7 @@ RenderableSphereImageLocal::RenderableSphereImageLocal(
 {
     const Parameters p = codegen::bake<Parameters>(dictionary);
 
-    _texturePath = p.texture;
+    _texturePath = p.texture.string();
     _textureFile = std::make_unique<ghoul::filesystem::File>(_texturePath.value());
     _texturePath.onChange([this]() {
         loadTexture();
diff --git a/modules/base/rendering/renderablesphereimageonline.cpp b/modules/base/rendering/renderablesphereimageonline.cpp
index 6e082aaf1d..6a45b81dbd 100644
--- a/modules/base/rendering/renderablesphereimageonline.cpp
+++ b/modules/base/rendering/renderablesphereimageonline.cpp
@@ -36,9 +36,8 @@ namespace {
     constexpr openspace::properties::Property::PropertyInfo TextureInfo = {
         "URL",
         "Image URL",
-        "Sets the URL of the texture that is displayed on this sphere. If "
-        "this value is changed, the image at the new path will automatically be loaded "
-        "and displayed. This image is expected to be an equirectangular projection.",
+        "A URL to an image to use as a texture for this sphere. The image is expected "
+        "to be an equirectangular projection.",
         openspace::properties::Property::Visibility::User
     };
 
diff --git a/modules/base/rendering/renderabletimevaryingsphere.cpp b/modules/base/rendering/renderabletimevaryingsphere.cpp
index d7747c7d95..7a5f9beddc 100644
--- a/modules/base/rendering/renderabletimevaryingsphere.cpp
+++ b/modules/base/rendering/renderabletimevaryingsphere.cpp
@@ -53,15 +53,14 @@ namespace {
     constexpr openspace::properties::Property::PropertyInfo TextureSourceInfo = {
         "TextureSource",
         "Texture Source",
-        "This value specifies a directory of images that are loaded from disk and is "
-        "used as a texture that is applied to this sphere. The images are expected to "
-        "be an equirectangular projection.",
+        "A directory containing images that are loaded from disk and used for texturing "
+        "the sphere. The images are expected to be equirectangular projections.",
         openspace::properties::Property::Visibility::AdvancedUser
     };
 
     struct [[codegen::Dictionary(RenderableTimeVaryingSphere)]] Parameters {
         // [[codegen::verbatim(TextureSourceInfo.description)]]
-        std::string textureSource;
+        std::filesystem::path textureSource [[codegen::directory()]];
     };
 #include "renderabletimevaryingsphere_codegen.cpp"
 } // namespace
@@ -79,7 +78,7 @@ RenderableTimeVaryingSphere::RenderableTimeVaryingSphere(
 {
     const Parameters p = codegen::bake<Parameters>(dictionary);
 
-    _textureSourcePath = p.textureSource;
+    _textureSourcePath = p.textureSource.string();
 }
 
 bool RenderableTimeVaryingSphere::isReady() const {
diff --git a/modules/base/rendering/renderabletrail.cpp b/modules/base/rendering/renderabletrail.cpp
index e1a57ee6db..207d026d9c 100644
--- a/modules/base/rendering/renderabletrail.cpp
+++ b/modules/base/rendering/renderabletrail.cpp
@@ -81,8 +81,8 @@ namespace {
         "EnableFade",
         "Enable line fading of old points",
         "Toggles whether the trail should fade older points out. If this value is "
-        "'true', the 'Fade' parameter determines the speed of fading. If this value is "
-        "'false', the entire trail is rendered at full opacity and color.",
+        "true, the 'Fade' parameter determines the speed of fading. If this value is "
+        "false, the entire trail is rendered at full opacity and color.",
         openspace::properties::Property::Visibility::NoviceUser
     };
 
@@ -91,7 +91,7 @@ namespace {
         "Line Length",
         "The extent of the rendered trail. A value of 0 will result in no trail and a "
         "value of 1 will result in a trail that covers the entire extent. The setting "
-        "only applies if 'EnableFade' is 'true'. If it is 'false', this setting has "
+        "only applies if 'EnableFade' is true. If it is false, this setting has "
         "no effect.",
         openspace::properties::Property::Visibility::User
     };
@@ -106,42 +106,39 @@ namespace {
         "will fade until completely transparent at the end of the trail. A value of 1 "
         "will result in a trail that starts fading immediately, becoming fully "
         "transparent by the end of the trail. This setting only applies if the "
-        "'EnableFade' value is 'true'. If it is 'false', this setting has no effect.",
+        "'EnableFade' value is true. If it is false, this setting has no effect.",
         openspace::properties::Property::Visibility::User
     };
 
     constexpr openspace::properties::Property::PropertyInfo LineWidthInfo = {
         "LineWidth",
         "Line Width",
-        "This value specifies the line width of the trail if the selected rendering "
-        "method includes lines. If the rendering mode is set to Points, this value is "
-        "ignored.",
+        "Specifies the line width of the trail lines, if the selected rendering method "
+        "includes lines. If the rendering mode is Points, this value is ignored.",
         openspace::properties::Property::Visibility::User
     };
 
     constexpr openspace::properties::Property::PropertyInfo PointSizeInfo = {
         "PointSize",
         "Point Size",
-        "This value specifies the base size of the points along the line if the selected "
-        "rendering method includes points. If the rendering mode is set the Lines, this "
-        "value is ignored. If a subsampling of the values is performed, the subsampled "
-        "values are half this size.",
+        "Specifies the base size of the points along the line, if the selected rendering "
+        "method includes points. If the rendering mode is Lines, this value is ignored. "
+        "If a subsampling of the values is performed, the subsampled values are half "
+        "this size.",
         openspace::properties::Property::Visibility::User
     };
 
     constexpr openspace::properties::Property::PropertyInfo RenderingModeInfo = {
         "Rendering",
         "Rendering Mode",
-        "Determines how the trail should be rendered. If 'Lines' is "
-        "selected, only the line part is visible, if 'Points' is selected, only the "
-        "corresponding points (and subpoints) are shown. 'Lines+Points' shows both "
-        "parts.",
+        "Determines how the trail should be rendered. If 'Lines' is selected, only the "
+        "line part is visible, if 'Points' is selected, only the corresponding points "
+        "(and subpoints) are shown. 'Lines+Points' shows both parts.",
         openspace::properties::Property::Visibility::AdvancedUser
     };
 
     struct [[codegen::Dictionary(RenderableTrail)]] Parameters {
-        // This object is used to compute locations along the path. Any Translation
-        // object can be used here
+        // A translation used to compute locations along the path.
         ghoul::Dictionary translation
             [[codegen::reference("core_transform_translation")]];
 
@@ -480,7 +477,7 @@ void RenderableTrail::render(const RenderData& data, RendererTasks&) {
     //    global::renderEngine->openglStateCache().resetDepthState();
     //    return;
     //}
-    
+
     if (_useSplitRenderMode) {
         // Splits the trail up into three parts for more accurate rendering
         // of renderableTrailTrajectory trails
@@ -496,7 +493,7 @@ void RenderableTrail::render(const RenderData& data, RendererTasks&) {
             _useSplitRenderMode,
             _numberOfUniqueVertices
         );
-        
+
         const int floatingOffset = std::max(0, _primaryRenderInformation.count - 1);
         internalRender(
             renderLines,
@@ -524,7 +521,7 @@ void RenderableTrail::render(const RenderData& data, RendererTasks&) {
             _numberOfUniqueVertices,
             offset
         );
-        
+
     }
     else {
         // Render the primary batch of vertices
@@ -553,9 +550,9 @@ void RenderableTrail::render(const RenderData& data, RendererTasks&) {
             );
         }
     }
-    
 
-    
+
+
 
     if (renderPoints) {
         glDisable(GL_PROGRAM_POINT_SIZE);
diff --git a/modules/base/rendering/renderabletrailorbit.cpp b/modules/base/rendering/renderabletrailorbit.cpp
index 96ac84ad33..89fb383fe1 100644
--- a/modules/base/rendering/renderabletrailorbit.cpp
+++ b/modules/base/rendering/renderabletrailorbit.cpp
@@ -107,31 +107,12 @@ namespace {
         openspace::properties::Property::Visibility::AdvancedUser
     };
 
-    constexpr openspace::properties::Property::PropertyInfo RenderableTypeInfo = {
-       "RenderableType",
-       "RenderableType",
-       "This value specifies if the orbit should be rendered in the Background,"
-       "Opaque, Transparent, or Overlay rendering step. Default is Transparent.",
-        openspace::properties::Property::Visibility::AdvancedUser
-    };
-
     struct [[codegen::Dictionary(RenderableTrailOrbit)]] Parameters {
         // [[codegen::verbatim(PeriodInfo.description)]]
         double period;
 
         // [[codegen::verbatim(ResolutionInfo.description)]]
         int resolution;
-
-        enum class [[codegen::map(openspace::Renderable::RenderBin)]] RenderableType {
-            Background,
-            Opaque,
-            PreDeferredTransparent,
-            PostDeferredTransparent,
-            Overlay
-        };
-
-        // [[codegen::verbatim(RenderableTypeInfo.description)]]
-        std::optional<RenderableType> renderableType;
     };
 #include "renderabletrailorbit_codegen.cpp"
 } // namespace
@@ -167,13 +148,6 @@ RenderableTrailOrbit::RenderableTrailOrbit(const ghoul::Dictionary& dictionary)
 
     // We store the vertices with (excluding the wrapping) decending temporal order
     _primaryRenderInformation.sorting = RenderInformation::VertexSorting::NewestFirst;
-
-    if (p.renderableType.has_value()) {
-        setRenderBin(codegen::map<Renderable::RenderBin>(*p.renderableType));
-    }
-    else {
-        setRenderBin(Renderable::RenderBin::Overlay);
-    }
 }
 
 void RenderableTrailOrbit::initializeGL() {
diff --git a/modules/base/rendering/renderabletrailtrajectory.cpp b/modules/base/rendering/renderabletrailtrajectory.cpp
index 15016254d9..64c8647ea1 100644
--- a/modules/base/rendering/renderabletrailtrajectory.cpp
+++ b/modules/base/rendering/renderabletrailtrajectory.cpp
@@ -83,9 +83,8 @@ namespace {
     constexpr openspace::properties::Property::PropertyInfo RenderFullPathInfo = {
         "ShowFullTrail",
         "Render Full Trail",
-        "If this value is set to 'true', the entire trail will be rendered; if it is "
-        "'false', only the trail until the current time in the application will be "
-        "shown.",
+        "If true, the entire trail will be rendered. If false, only the trail until "
+        "the current time in the application will be shown.",
         openspace::properties::Property::Visibility::NoviceUser
     };
 
@@ -207,7 +206,7 @@ RenderableTrailTrajectory::RenderableTrailTrajectory(const ghoul::Dictionary& di
     _primaryRenderInformation.sorting = RenderInformation::VertexSorting::OldestFirst;
     _secondaryRenderInformation.sorting = RenderInformation::VertexSorting::OldestFirst;
 
-    // Activate special render mode for renderableTrailTrajectory 
+    // Activate special render mode for renderableTrailTrajectory
     _useSplitRenderMode = true;
 }
 
@@ -366,7 +365,7 @@ void RenderableTrailTrajectory::update(const UpdateData& data) {
                 std::lower_bound(_timeVector.begin(), _timeVector.end(), j2k)
             )
         );
-        
+
         if (_renderFullTrail) {
             // Calculates number of vertices for the second segment (object to end point)
             _secondaryRenderInformation.first = _primaryRenderInformation.count;
diff --git a/modules/digitaluniverse/rendering/renderabledumeshes.cpp b/modules/digitaluniverse/rendering/renderabledumeshes.cpp
index 7be2a91f8b..3df83aa027 100644
--- a/modules/digitaluniverse/rendering/renderabledumeshes.cpp
+++ b/modules/digitaluniverse/rendering/renderabledumeshes.cpp
@@ -130,7 +130,7 @@ namespace {
 
     struct [[codegen::Dictionary(RenderableDUMeshes)]] Parameters {
         // The path to the SPECK file that contains information about the astronomical
-        // object being rendered
+        // object being rendered.
         std::string file;
 
         // [[codegen::verbatim(DrawLabelInfo.description)]]
@@ -145,6 +145,7 @@ namespace {
             Gigaparsec [[codegen::key("Gpc")]],
             Gigalightyear [[codegen::key("Gly")]]
         };
+        // The unit used when interpreting the positions in the dataset.
         std::optional<Unit> unit;
 
         // [[codegen::verbatim(TextColorInfo.description)]]
diff --git a/modules/exoplanets/rendering/renderableorbitdisc.cpp b/modules/exoplanets/rendering/renderableorbitdisc.cpp
index a9002f0270..1251ad61dd 100644
--- a/modules/exoplanets/rendering/renderableorbitdisc.cpp
+++ b/modules/exoplanets/rendering/renderableorbitdisc.cpp
@@ -43,33 +43,33 @@ namespace {
     constexpr openspace::properties::Property::PropertyInfo TextureInfo = {
         "Texture",
         "Texture",
-        "This value is the path to a texture on disk that contains a one-dimensional "
-        "texture which is used for the color.",
+        "The path to a file with a one-dimensional texture to be used for the disc "
+        "color. The leftmost color will be innermost color when rendering the disc, "
+        "and the rightmost color will be the outermost color.",
         openspace::properties::Property::Visibility::AdvancedUser
     };
 
     constexpr openspace::properties::Property::PropertyInfo SizeInfo = {
         "Size",
         "Size",
-        "This value specifies the semi-major axis of the orbit, in meters.",
+        "The size of the semi-major axis of the orbit in meters.",
         openspace::properties::Property::Visibility::AdvancedUser
     };
 
     constexpr openspace::properties::Property::PropertyInfo EccentricityInfo = {
         "Eccentricity",
         "Eccentricity",
-        "This value determines the eccentricity, that is the deviation from a perfect "
-        "sphere, for this orbit.",
+        "The eccentricity of the orbit, which is the deviation from a perfect circle.",
         openspace::properties::Property::Visibility::AdvancedUser
     };
 
     constexpr openspace::properties::Property::PropertyInfo OffsetInfo = {
         "Offset",
         "Offset",
-        "This property determines the width of the disc. The values specify the lower "
-        "and upper deviation from the semi major axis, respectively. The values are "
-        "relative to the size of the semi-major axis. That is, 0 means no deviation "
-        "from the semi-major axis and 1 is a whole semi-major axis's worth of deviation.",
+        "The width of the disc, given as two values that specify the lower and upper "
+        "deviation from the semi major axis, respectively. The values are relative "
+        "to the size of the semi-major axis. That is, 0 means no deviation from the "
+        "semi-major axis and 1 is a whole semi-major axis's worth of deviation.",
         openspace::properties::Property::Visibility::AdvancedUser
     };
 
diff --git a/modules/galaxy/rendering/renderablegalaxy.cpp b/modules/galaxy/rendering/renderablegalaxy.cpp
index 13b8fd6e75..e40b337dac 100644
--- a/modules/galaxy/rendering/renderablegalaxy.cpp
+++ b/modules/galaxy/rendering/renderablegalaxy.cpp
@@ -67,16 +67,17 @@ namespace {
     constexpr openspace::properties::Property::PropertyInfo VolumeRenderingEnabledInfo = {
         "VolumeRenderingEnabled",
         "Volume Rendering",
-        "If this value is enabled, the volume rendering component of the galaxy "
-        "rendering is turned on. Otherwise, the volume rendering is skipped.",
+        "Decides whether the volume rendering component of the galaxy rendering should "
+        "be enabled or not. If disabled, the volume rendering is skipped.",
         openspace::properties::Property::Visibility::User
     };
 
     constexpr openspace::properties::Property::PropertyInfo StarRenderingEnabledInfo = {
         "StarRenderingEnabled",
         "Star Rendering",
-        "If this value is enabled, the point-based star rendering component of the "
-        "galaxy rendering is turned on. Otherwise, the volume rendering is skipped.",
+        "Decides whether the point-based star rendering component of the galaxy "
+        "rendering should be enabled or not. If disabled, the point-based star rendering "
+        "is skipped.",
         openspace::properties::Property::Visibility::User
     };
 
@@ -116,8 +117,7 @@ namespace {
     constexpr openspace::properties::Property::PropertyInfo StarRenderingMethodInfo = {
         "StarRenderingMethod",
         "Star Rendering Method",
-        "This value determines which rendering method is used for visualization of the "
-        "stars.",
+        "The rendering method used for visualizing the stars.",
         openspace::properties::Property::Visibility::AdvancedUser
     };
 
@@ -135,7 +135,7 @@ namespace {
     {
         "Downscale",
         "Downscale Factor Volume Rendering",
-        "This value sets the downscaling factor when rendering the current volume.",
+        "The downscaling factor used when rendering the volume.",
         openspace::properties::Property::Visibility::User
     };
 
@@ -143,7 +143,7 @@ namespace {
     {
         "Steps",
         "Number of RayCasting Steps",
-        "This value set the number of integration steps during the raycasting procedure.",
+        "The number of integration steps used during the raycasting procedure.",
         openspace::properties::Property::Visibility::AdvancedUser
     };
 
@@ -163,8 +163,8 @@ namespace {
         // [[codegen::verbatim(EmissionMultiplyInfo.description)]]
         std::optional<float> emissionMultiply;
 
-        // If this value is specified, the default raycasting shader is overwritten and
-        // the shader found at the provided location is used instead
+        // If specified, the default raycasting shader is overwritten and the shader at
+        // this location is used instead.
         std::optional<std::filesystem::path> raycastingShader;
 
         enum class [[codegen::map(StarRenderingMethod)]] StarRenderingMethod {
diff --git a/modules/globebrowsing/src/renderableglobe.cpp b/modules/globebrowsing/src/renderableglobe.cpp
index da6615d4d5..abbb85f09a 100644
--- a/modules/globebrowsing/src/renderableglobe.cpp
+++ b/modules/globebrowsing/src/renderableglobe.cpp
@@ -111,42 +111,39 @@ namespace {
     constexpr openspace::properties::Property::PropertyInfo ShowChunkEdgeInfo = {
         "ShowChunkEdges",
         "Show chunk edges",
-        "If this value is set to 'true', the borders between chunks are shown using a "
-        "red highlight.",
+        "Shows the borders between chunks in a red highlight.",
         openspace::properties::Property::Visibility::Developer
     };
 
     constexpr openspace::properties::Property::PropertyInfo LevelProjectedAreaInfo = {
         "LevelByProjectedAreaElseDistance",
         "Level by projected area (else distance)",
-        "If this value is set to 'true', the tile level is determined by the area "
-        "projected on screen. If it is 'false', the distance to the center of the tile "
-        "is used instead.",
+        "If true, the tile level is determined by the area projected on screen. If "
+        "false, the distance to the center of the tile is used instead.",
         openspace::properties::Property::Visibility::Developer
     };
 
     constexpr openspace::properties::Property::PropertyInfo PerformFrustumCullingInfo = {
         "PerformFrustumCulling",
         "Perform frustum culling",
-        "If this value is set to 'true', frustum culling will be performed.",
+        "If this value is set to true, frustum culling will be performed.",
         openspace::properties::Property::Visibility::AdvancedUser
     };
 
     constexpr openspace::properties::Property::PropertyInfo ResetTileProviderInfo = {
         "ResetTileProviders",
         "Reset tile providers",
-        "If this property is triggered, all tile provides for the globe are reset and "
-        "data is reloaded from scratch.",
+        "Reset all tile provides for the globe and reload the data.",
         openspace::properties::Property::Visibility::AdvancedUser
     };
 
     constexpr openspace::properties::Property::PropertyInfo ModelSpaceRenderingInfo = {
         "ModelSpaceRenderingCutoffLevel",
         "Model Space Rendering Cutoff Level",
-        "This value determines the tile level that is used as the cut off between "
-        "rendering tiles using the globe model rendering vs the flat in-game rendering "
-        "method. This value is a tradeoff between not having precision errors in the "
-        "rendering and represting a tile as flat or curved.",
+        "The tile level that is used as the cut off between rendering tiles using the "
+        "globe model rendering vs the flat in-game rendering method. The value is a "
+        "trade-off between not having precision errors in the rendering and representing "
+        "a tile as flat or curved.",
         openspace::properties::Property::Visibility::Developer
     };
 
@@ -163,34 +160,34 @@ namespace {
     constexpr openspace::properties::Property::PropertyInfo PerformShadingInfo = {
         "PerformShading",
         "Perform shading",
-        "This value determines whether there should be lighting applied to the surface "
-        "of the globe. Note that if there is an atmosphere attached to the planet, there "
-        "is a separate setting to control the shadowing induced by the atmosphere part.",
+        "Specifies whether the planet should be shaded by the primary light source or "
+        "not. If disabled, all parts of the planet are illuminated. Note that if the "
+        "globe has a corresponding atmosphere, there is a separate setting to control "
+        "the shadowing induced by the atmosphere.",
         openspace::properties::Property::Visibility::NoviceUser
     };
 
     constexpr openspace::properties::Property::PropertyInfo AccurateNormalsInfo = {
         "UseAccurateNormals",
         "Use Accurate Normals",
-        "This value determines whether higher-accuracy normals should be used in the "
-        "rendering. These normals are calculated based on the height field information "
-        "and are thus only available if the planet has a height map.",
+        "Determines whether higher-accuracy normals should be used in the rendering. "
+        "These normals are calculated based on the height field information and are thus "
+        "only available if the planet has a height map layer.",
         openspace::properties::Property::Visibility::AdvancedUser
     };
 
     constexpr openspace::properties::Property::PropertyInfo LightSourceNodeInfo = {
         "LightSourceNode",
-        "Name of the light source",
-        "This value is the name of a scene graph node that should be used as the source "
-        "of illumination for the globe. If this value is not specified, the solar "
-        "system's Sun is used instead.",
+        "Light Source",
+        "The identifier of a scene graph node that should be used as the source of "
+        "illumination for the globe. If not specified, the solar system's Sun is used.",
         openspace::properties::Property::Visibility::AdvancedUser
     };
 
     constexpr openspace::properties::Property::PropertyInfo EclipseInfo = {
         "Eclipse",
         "Eclipse",
-        "Enables/Disable Eclipse shadows.",
+        "Enables/Disables Eclipse shadows on this globe.",
         openspace::properties::Property::Visibility::AdvancedUser
     };
 
@@ -220,8 +217,7 @@ namespace {
     constexpr openspace::properties::Property::PropertyInfo ZFightingPercentageInfo = {
         "ZFightingPercentage",
         "Z-Fighting Percentage",
-        "The percentage of the correct distance to the surface being shadowed. Possible "
-        "values: [0.0, 1.0].",
+        "The percentage of the correct distance to the surface being shadowed.",
         openspace::properties::Property::Visibility::Developer
     };
 
@@ -267,29 +263,28 @@ namespace {
     constexpr openspace::properties::Property::PropertyInfo NActiveLayersInfo = {
         "NActiveLayers",
         "Number of active layers",
-        "This is the number of currently active layers, if this value reaches the "
-        "maximum, bad things will happen.",
+        "The number of currently active layers. If this value reaches the maximum, "
+        "bad things will happen.",
         openspace::properties::Property::Visibility::User
     };
 
     struct [[codegen::Dictionary(RenderableGlobe)]] Parameters {
-        // Specifies the radii for this planet. If the Double version of this is used, all
-        // three radii are assumed to be equal
+        // The radii for this planet. If only one value is given, all three radii are
+        // set to that value.
         std::optional<std::variant<glm::dvec3, double>> radii;
 
-        // Specifies whether the planet should be shaded by the primary light source or
-        // not. If it is disabled, all parts of the planet are illuminated
+        // [[codegen::verbatim(PerformShadingInfo.description)]]
         std::optional<bool> performShading;
 
-        // Specifies if distance culling should be disabled.
+        // [[codegen::verbatim(RenderAtDistanceInfo.description)]]
         std::optional<bool> renderAtDistance;
 
-        // A list of all the layers that should be added
+        // A list of layers that should be added to the globe.
         std::map<std::string, ghoul::Dictionary> layers
             [[codegen::reference("globebrowsing_layermanager")]];
 
         // Specifies information about planetary labels that can be rendered on the
-        // object's surface
+        // object's surface.
         std::optional<ghoul::Dictionary> labels
             [[codegen::reference("globebrowsing_globelabelscomponent")]];
 
@@ -298,16 +293,22 @@ namespace {
                 std::string name;
                 double radius;
             };
+            // A list of objects (light sources) that may cause shadows from the provided
+            // list of shadow casting objects.
             std::vector<Source> sources;
 
             struct Caster {
                 std::string name;
                 double radius;
             };
+            // A list of potential shadow casters.
             std::vector<Caster> casters;
         };
+        // Information about any object that might cause shadows to appear on the
+        // globe.
         std::optional<ShadowGroup> shadowGroup;
 
+        // Details about the rings of the globe, if it has any.
         std::optional<ghoul::Dictionary> rings
             [[codegen::reference("globebrowsing_rings_component")]];
 
diff --git a/modules/skybrowser/src/renderableskytarget.cpp b/modules/skybrowser/src/renderableskytarget.cpp
index d948ab1459..0848bbef32 100644
--- a/modules/skybrowser/src/renderableskytarget.cpp
+++ b/modules/skybrowser/src/renderableskytarget.cpp
@@ -50,15 +50,17 @@ namespace {
     constexpr openspace::properties::Property::PropertyInfo crossHairSizeInfo = {
         "CrosshairSize",
         "Crosshair Size",
-        "Determines the size of the crosshair. The size is determined in fov (degrees).",
+        "The size of the crosshair given as a field of view (in degrees).",
         openspace::properties::Property::Visibility::User
     };
 
     constexpr openspace::properties::Property::PropertyInfo RectangleThresholdInfo = {
         "RectangleThreshold",
         "Rectangle Threshold",
-        "When the field of view is larger than the rectangle threshold, a rectangle will "
-        "be rendered in the target.",
+        "A threshold value for the vertical field of view, in degrees, that decides when "
+        "a rectangle will be used to visualize the target in addition to the crosshair. "
+        "When the field of view is smaller than this value, only the crosshair will be "
+        "shown.",
         openspace::properties::Property::Visibility::User
     };
 
@@ -79,9 +81,9 @@ namespace {
     constexpr openspace::properties::Property::PropertyInfo ApplyRollInfo = {
        "ApplyRoll",
        "Apply Roll",
-       "Always rotate the target to have it's up direction aligned with the up direction "
-       "of the camera.",
-        openspace::properties::Property::Visibility::User
+       "If true, always rotate the target to have its up direction aligned with the up "
+       "direction of the camera.",
+       openspace::properties::Property::Visibility::User
     };
 
     struct [[codegen::Dictionary(RenderableSkyTarget)]] Parameters {
diff --git a/modules/space/rendering/renderableconstellationbounds.cpp b/modules/space/rendering/renderableconstellationbounds.cpp
index 06c24c71de..7cb765cea2 100644
--- a/modules/space/rendering/renderableconstellationbounds.cpp
+++ b/modules/space/rendering/renderableconstellationbounds.cpp
@@ -47,16 +47,14 @@ namespace {
     constexpr openspace::properties::Property::PropertyInfo VertexInfo = {
         "File",
         "Vertex File Path",
-        "The file pointed to with this value contains the vertex locations of the "
-        "constellations.",
+        "A file that contains the vertex locations of the constellations bounds.",
         openspace::properties::Property::Visibility::AdvancedUser
     };
 
     constexpr openspace::properties::Property::PropertyInfo ColorInfo = {
         "Color",
-        "Color of constellation lines",
-        "Specifies the color of the constellation lines. The lines are always drawn at "
-        "full opacity.",
+        "Color",
+        "The color of the lines.",
         openspace::properties::Property::Visibility::NoviceUser
     };
 
diff --git a/modules/space/rendering/renderableconstellationlines.cpp b/modules/space/rendering/renderableconstellationlines.cpp
index 269957e3ca..dc327c3dc7 100644
--- a/modules/space/rendering/renderableconstellationlines.cpp
+++ b/modules/space/rendering/renderableconstellationlines.cpp
@@ -47,10 +47,10 @@ namespace {
         "modelViewTransform", "projectionTransform", "opacity", "color"
     };
 
-    constexpr openspace::properties::Property::PropertyInfo SpeckInfo = {
+    constexpr openspace::properties::Property::PropertyInfo FileInfo = {
         "File",
         "Constellation Data File Path",
-        "The file that contains the data for the constellation lines.",
+        "The path to a SPECK file that contains the data for the constellation lines.",
         openspace::properties::Property::Visibility::AdvancedUser
     };
 
@@ -71,15 +71,20 @@ namespace {
     constexpr openspace::properties::Property::PropertyInfo ColorsInfo = {
         "Colors",
         "Constellation Colors",
-        "The defined colors for the constellations to be rendered. There can be several "
-        "groups of constellaitons that can have distinct colors.",
+        "A list of colors to use for the constellations. A data file may include several "
+        "groups of constellations, where each group can have a distinct color. The index for "
+        "the color parameter for each constellation in the data file corresponds to the "
+        "order of the colors in this list.",
         openspace::properties::Property::Visibility::User
     };
 
     struct [[codegen::Dictionary(RenderableConstellationLines)]] Parameters {
-        // The path to the SPECK file that contains constellation lines data
+        // [[codegen::verbatim(FileInfo.description)]]
         std::filesystem::path file;
 
+        // [[codegen::verbatim(DrawElementsInfo.description)]]
+        std::optional<bool> drawElements;
+
         enum class [[codegen::map(openspace::DistanceUnit)]] Unit {
             Meter [[codegen::key("m")]],
             Kilometer [[codegen::key("Km")]],
@@ -110,8 +115,8 @@ documentation::Documentation RenderableConstellationLines::Documentation() {
 RenderableConstellationLines::RenderableConstellationLines(
                                                       const ghoul::Dictionary& dictionary)
     : RenderableConstellationsBase(dictionary)
+    , _speckFile(FileInfo)
     , _drawElements(DrawElementsInfo, true)
-    , _speckFile(SpeckInfo)
 {
     const Parameters p = codegen::bake<Parameters>(dictionary);
 
@@ -120,6 +125,7 @@ RenderableConstellationLines::RenderableConstellationLines(
     _speckFile.onChange([this]() { loadData(); });
     addProperty(_speckFile);
 
+    _drawElements = p.drawElements.value_or(_drawElements);
     addProperty(_drawElements);
 
     if (p.unit.has_value()) {
diff --git a/modules/space/rendering/renderableconstellationlines.h b/modules/space/rendering/renderableconstellationlines.h
index 8d316c7721..d75a2a9d22 100644
--- a/modules/space/rendering/renderableconstellationlines.h
+++ b/modules/space/rendering/renderableconstellationlines.h
@@ -81,14 +81,13 @@ private:
      */
     void selectionPropertyHasChanged() override;
 
+    properties::StringProperty _speckFile;
     properties::BoolProperty _drawElements;
 
     std::unique_ptr<ghoul::opengl::ProgramObject> _program = nullptr;
     UniformCache(modelViewTransform, projectionTransform, opacity,
         color) _uniformCache;
 
-    properties::StringProperty _speckFile;
-
     DistanceUnit _constellationUnit = DistanceUnit::Parsec;
 
     std::vector<float> _fullData;
diff --git a/modules/space/rendering/renderableeclipsecone.cpp b/modules/space/rendering/renderableeclipsecone.cpp
index a19b70e742..b8bf46eaac 100644
--- a/modules/space/rendering/renderableeclipsecone.cpp
+++ b/modules/space/rendering/renderableeclipsecone.cpp
@@ -45,91 +45,85 @@ namespace {
     };
 
     constexpr openspace::properties::Property::PropertyInfo NumberPointsInfo = {
-        "AmountOfPoints",
+        "NumberOfPoints",
         "Points",
-        "This value determines the number of control points that is used to construct "
-        "the shadow geometry. The higher this number, the more detailed the shadow is, "
-        "but it will have a negative impact on the performance. Also note that rendering "
-        "errors will occur if this value is even.",
+        "The number of control points used for constructing the shadow geometry. The "
+        "higher this number, the more detailed the shadow is. However, it will have a "
+        "negative impact on the performance. Also note that rendering errors will occur "
+        "if this value is an even number.",
         openspace::properties::Property::Visibility::AdvancedUser
     };
 
     constexpr openspace::properties::Property::PropertyInfo ShadowLengthInfo = {
         "ShadowLength",
         "Shadow Length",
-        "This value determines the length of the shadow that is cast by the target "
-        "object. The total distance of the shadow is equal to the distance from the "
-        "target to the Sun multiplied with this value.",
+        "A factor that controls the length of the rendered shadow cone. The total length "
+        "will be the distance from the shadower to the shadowee multiplied by this "
+        "value.",
         openspace::properties::Property::Visibility::AdvancedUser
     };
 
     constexpr openspace::properties::Property::PropertyInfo ShowUmbralShadowInfo = {
         "ShowUmbralShadow",
         "Show Umbral Shadow",
-        "If this is enabled, the umbral portioon of the shadow is shown.",
+        "Decides whether the umbral portion of the shadow should be shown.",
         openspace::properties::Property::Visibility::User
     };
 
     constexpr openspace::properties::Property::PropertyInfo UmbralShadowColorInfo = {
         "UmbralShadowColor",
         "Umbral Shadow Color",
-        "This value determines the color that is used for the shadow cylinder of the "
-        "umbral shadow.",
+        "The color for the shadow cylinder that represents the umbral shadow.",
         openspace::properties::Property::Visibility::User
     };
 
     constexpr openspace::properties::Property::PropertyInfo ShowPenumbralShadowInfo = {
         "ShowPenumbralShadow",
         "Show Penumbral Shadow",
-        "If this is enabled, the penumbral portioon of the shadow is shown.",
+        "Decides whether the penumbral portion of the shadow should be shown.",
         openspace::properties::Property::Visibility::User
     };
 
     constexpr openspace::properties::Property::PropertyInfo PenumbralShadowColorInfo = {
         "PenumbralShadowColor",
         "Penumbral Shadow Color",
-        "This value determines the color that is used for the shadow cylinder of the "
-        "penumbral shadow.",
+        "The color for the shadow cylinder that represents the penumbral shadow.",
         openspace::properties::Property::Visibility::User
     };
 
     constexpr openspace::properties::Property::PropertyInfo LightSourceInfo = {
         "LightSource",
         "Light Source",
-        "This value determines the SPICE name of the object that is used as the "
-        "illuminator for computing the shadow cylinder.",
+        "The SPICE name of the object that is used as the illuminator when computing the "
+        "shadow cylinder.",
         openspace::properties::Property::Visibility::AdvancedUser
     };
 
     constexpr openspace::properties::Property::PropertyInfo LightSourceFrameInfo = {
         "LightSourceFrame",
         "Light Source Frame",
-        "This value is the SPICE name of the body-fixed reference frame for the light "
-        "source.",
+        "The SPICE name of the body-fixed reference frame for the light source.",
         openspace::properties::Property::Visibility::AdvancedUser
     };
 
     constexpr openspace::properties::Property::PropertyInfo ShadowerInfo = {
         "Shadower",
         "Shadower",
-        "This value specifies the SPICE name of the object that is casting the shadow on "
-        "the shadowee.",
+        "The SPICE name of the object that is casting the shadow on the shadowee.",
         openspace::properties::Property::Visibility::AdvancedUser
     };
 
     constexpr openspace::properties::Property::PropertyInfo ShadowerFrameInfo = {
         "ShadowerFrame",
         "Shadower Frame",
-        "This value is the SPICE name of the body-fixed reference frame for the "
-        "shadower.",
+        "The SPICE name of the body-fixed reference frame for the shadower.",
         openspace::properties::Property::Visibility::AdvancedUser
     };
 
     constexpr openspace::properties::Property::PropertyInfo ShadoweeInfo = {
         "Shadowee",
         "Shadowee",
-        "This value is the SPICE name of object that is receiving the shadow from the "
-        "shadower.",
+        "The SPICE name of object that is receiving the shadow from the shadower.",
         openspace::properties::Property::Visibility::AdvancedUser
     };
 
diff --git a/modules/space/rendering/renderablefluxnodes.cpp b/modules/space/rendering/renderablefluxnodes.cpp
index 7d1fef1715..41df09d5a4 100644
--- a/modules/space/rendering/renderablefluxnodes.cpp
+++ b/modules/space/rendering/renderablefluxnodes.cpp
@@ -273,12 +273,15 @@ namespace {
     };
 
     struct [[codegen::Dictionary(RenderableFluxNodes)]] Parameters {
-        // path to source folder with the 3 binary files in it
+        // Path to a source folder with the three binary files in it.
         std::filesystem::path sourceFolder [[codegen::directory()]];
+
         // [[codegen::verbatim(ColorTablePathInfo.description)]]
         std::string colorTablePath;
+
         // [[codegen::verbatim(GoesEnergyBinsInfo.description)]]
         std::optional<int> energyBin;
+
         // [[codegen::verbatim(colorTableRangeInfo.description)]]
         std::optional<glm::vec2> colorTableRange;
     };
diff --git a/modules/space/rendering/renderablehabitablezone.cpp b/modules/space/rendering/renderablehabitablezone.cpp
index cc86a6cb19..262635f23d 100644
--- a/modules/space/rendering/renderablehabitablezone.cpp
+++ b/modules/space/rendering/renderablehabitablezone.cpp
@@ -48,16 +48,16 @@ namespace {
     constexpr openspace::properties::Property::PropertyInfo EffectiveTemperatureInfo = {
         "EffectiveTemperature",
         "Effective Temperature",
-        "The effective temperature of the corresponding star, in Kelvin. "
-        "Used to compute the width and size of the disc.",
+        "The effective temperature of the corresponding star, in Kelvin. Used to compute "
+        "the width and size of the disc.",
         openspace::properties::Property::Visibility::User
     };
 
     constexpr openspace::properties::Property::PropertyInfo LuminosityInfo = {
         "Luminosity",
         "Luminosity",
-        "The luminosity of the corresponding star, in units of solar luminosities. "
-        "Used to compute the width and size of the disc.",
+        "The luminosity of the corresponding star, in units of solar luminosities. Used "
+        "to compute the width and size of the disc.",
         openspace::properties::Property::Visibility::User
     };
 
diff --git a/modules/space/rendering/renderableorbitalkepler.cpp b/modules/space/rendering/renderableorbitalkepler.cpp
index bebd7c6cf7..a153ab88cb 100644
--- a/modules/space/rendering/renderableorbitalkepler.cpp
+++ b/modules/space/rendering/renderableorbitalkepler.cpp
@@ -73,17 +73,15 @@ namespace {
     constexpr openspace::properties::Property::PropertyInfo TrailWidthInfo = {
         "TrailWidth",
         "Trail Width",
-        "This value specifies the line width of the trail if the selected rendering "
-        "method includes lines. If the rendering mode is set to Points, this value is "
-        "ignored.",
+        "The line width used for the trail, if the selected rendering method includes "
+        "lines. If the rendering mode is set to Points, this value is ignored.",
         openspace::properties::Property::Visibility::NoviceUser
     };
 
     constexpr openspace::properties::Property::PropertyInfo PointSizeExponentInfo = {
         "PointSizeExponent",
         "Point Size Exponent",
-        "This value is used as in exponential scaling to set the absolute size of the "
-        "point.",
+        "An exponential scale value to set the absolute size of the point.",
         openspace::properties::Property::Visibility::User
     };
 
@@ -99,11 +97,11 @@ namespace {
     constexpr openspace::properties::Property::PropertyInfo MaxSizeInfo = {
         "MaxSize",
         "Max Size",
-        "This value controls the maximum allowed size for the points, when the max size "
-        "control feature is enabled. This limits the visual size of the points based on "
-        "the distance to the camera. The larger the value, the larger the points are "
-        "allowed to be. In the background, the computations are made to limit the size "
-        "of the angle between the CameraToPointMid and CameraToPointEdge vectors.",
+        "Controls the maximum allowed size for the points, when the max size control "
+        "feature is enabled. This limits the visual size of the points based on the "
+        "distance to the camera. The larger the value, the larger the points are allowed "
+        "to be. In the background, the computations are made to limit the size of the "
+        "angle between the CameraToPointMid and CameraToPointEdge vectors.",
         openspace::properties::Property::Visibility::AdvancedUser
     };
 
@@ -119,46 +117,45 @@ namespace {
     constexpr openspace::properties::Property::PropertyInfo ColorInfo = {
         "Color",
         "Color",
-        "This value determines the RGB main color for the trails and points.",
+        "The RGB main color for the trails and points.",
         openspace::properties::Property::Visibility::NoviceUser
     };
 
     constexpr openspace::properties::Property::PropertyInfo TrailFadeInfo = {
         "TrailFade",
         "Trail Fade Factor",
-        "This value determines how fast the trail fades and is an appearance property.",
+        "Determines how fast the trail fades out.",
         openspace::properties::Property::Visibility::User
     };
 
     constexpr openspace::properties::Property::PropertyInfo EnableOutlineInfo = {
         "EnableOutline",
         "Enable Point Outline",
-        "This setting determines if each point should have an outline or not. An outline "
-        "is only applied when rendering as colored points (not when using textures).",
+        "Determines if the points should be rendered with an outline or not.",
         openspace::properties::Property::Visibility::User
     };
 
     constexpr openspace::properties::Property::PropertyInfo OutlineColorInfo = {
         "OutlineColor",
         "Outline Color",
-        "This value defines the color of the outline. Darker colors will be "
-        "less visible if Additive Blending is enabled.",
+        "The color of the outline.",
         openspace::properties::Property::Visibility::User
     };
 
-    constexpr openspace::properties::Property::PropertyInfo OutlineWeightInfo = {
-        "OutlineWeight",
-        "Outline Weight",
-        "This setting determines the thickness of the outline. A value of 0 will "
-        "not show any outline, while a value of 1 will cover the whole point.",
+    constexpr openspace::properties::Property::PropertyInfo OutlineWidthInfo = {
+        "OutlineWidth",
+        "Outline Width",
+        "Determines the thickness of the outline. A value of 0 will not show any "
+        "outline, while a value of 1 will cover the whole point.",
         openspace::properties::Property::Visibility::AdvancedUser
     };
 
     constexpr openspace::properties::Property::PropertyInfo StartRenderIdxInfo = {
         "StartRenderIdx",
         "Contiguous Starting Index of Render",
-        "Index of object in renderable group to start rendering (all prior objects will "
-        "be ignored).",
+        "Index of the first object in the block to render (all prior objects will be "
+        "ignored). The block of objects to render will be determined by StartRenderIdx "
+        "and RenderSize.",
         openspace::properties::Property::Visibility::AdvancedUser
     };
 
@@ -172,8 +169,8 @@ namespace {
     constexpr openspace::properties::Property::PropertyInfo ContiguousModeInfo = {
         "ContiguousMode",
         "Contiguous Mode",
-        "If enabled, then the contiguous set of objects starting from StartRenderIdx "
-        "of size RenderSize will be rendered. If disabled, then the number of objects "
+        "If enabled, the contiguous set of objects starting from StartRenderIdx "
+        "of size RenderSize will be rendered. If disabled, the number of objects "
         "defined by UpperLimit will rendered from an evenly dispersed sample of the "
         "full length of the data file.",
         openspace::properties::Property::Visibility::User
@@ -184,14 +181,14 @@ namespace {
         std::filesystem::path path;
 
         enum class [[codegen::map(openspace::kepler::Format)]] Format {
-            // A NORAD-style Two-Line element
+            // A NORAD-style Two-Line element.
             TLE,
-            // Orbit Mean-Elements Message in the KVN notation
+            // Orbit Mean-Elements Message in the KVN notation.
             OMM,
-            // JPL's Small Bodies Database
+            // JPL's Small Bodies Database.
             SBDB
         };
-        // The file format that is contained in the file
+        // The file format that is contained in the file.
         Format format;
 
         // [[codegen::verbatim(SegmentQualityInfo.description)]]
@@ -238,8 +235,8 @@ namespace {
         // [[codegen::verbatim(OutlineColorInfo.description)]]
         std::optional<glm::vec3> outlineColor;
 
-        // [[codegen::verbatim(OutlineColorInfo.description)]]
-        std::optional<float> outlineWeight;
+        // [[codegen::verbatim(OutlineWidthInfo.description)]]
+        std::optional<float> outlineWidth;
     };
 #include "renderableorbitalkepler_codegen.cpp"
 } // namespace
@@ -268,7 +265,7 @@ RenderableOrbitalKepler::Appearance::Appearance()
     , maxSize(MaxSizeInfo, 1.f, 0.f, 45.f)
     , enableOutline(EnableOutlineInfo, true)
     , outlineColor(OutlineColorInfo, glm::vec3(0.f), glm::vec3(0.f), glm::vec3(1.f))
-    , outlineWeight(OutlineWeightInfo, 0.2f, 0.f, 1.f)
+    , outlineWidth(OutlineWidthInfo, 0.2f, 0.f, 1.f)
 {
     renderingModes.addOptions({
         { RenderingModeTrail, "Trails" },
@@ -287,7 +284,7 @@ RenderableOrbitalKepler::Appearance::Appearance()
     addProperty(enableOutline);
     outlineColor.setViewOption(properties::Property::ViewOptions::Color);
     addProperty(outlineColor);
-    addProperty(outlineWeight);
+    addProperty(outlineWidth);
 }
 
 RenderableOrbitalKepler::RenderableOrbitalKepler(const ghoul::Dictionary& dict)
@@ -313,7 +310,7 @@ RenderableOrbitalKepler::RenderableOrbitalKepler(const ghoul::Dictionary& dict)
     _appearance.maxSize = p.maxSize.value_or(_appearance.maxSize);
     _appearance.enableOutline = p.enableOutline.value_or(_appearance.enableOutline);
     _appearance.outlineColor = p.outlineColor.value_or(_appearance.outlineColor);
-    _appearance.outlineWeight = p.outlineWeight.value_or(_appearance.outlineWeight);
+    _appearance.outlineWidth = p.outlineWidth.value_or(_appearance.outlineWidth);
     _appearance.pointSizeExponent =
         p.pointSizeExponent.value_or(_appearance.pointSizeExponent);
 
@@ -484,28 +481,50 @@ void RenderableOrbitalKepler::render(const RenderData& data, RendererTasks&) {
 
     if (renderPoints) {
         _pointProgram->activate();
-        _pointProgram->setUniform(_uniformPointCache.modelTransform,
-            calcModelTransform(data));
-        _pointProgram->setUniform(_uniformPointCache.viewTransform,
-            data.camera.combinedViewMatrix());
-        _pointProgram->setUniform(_uniformPointCache.projectionTransform,
-            data.camera.projectionMatrix());
-        _pointProgram->setUniform(_uniformPointCache.cameraPositionWorld,
-            data.camera.positionVec3());
-        _pointProgram->setUniform(_uniformPointCache.cameraUpWorld,
-            data.camera.lookUpVectorWorldSpace());
-        _pointProgram->setUniform(_uniformPointCache.inGameTime,
-            data.time.j2000Seconds());
-        _pointProgram->setUniform(_uniformPointCache.pointSizeExponent,
-            _appearance.pointSizeExponent);
-        _pointProgram->setUniform(_uniformPointCache.enableMaxSize,
-            _appearance.enableMaxSize);
-        _pointProgram->setUniform(_uniformPointCache.enableOutline,
-            _appearance.enableOutline);
-        _pointProgram->setUniform(_uniformPointCache.outlineColor,
-            _appearance.outlineColor);
-        _pointProgram->setUniform(_uniformPointCache.outlineWeight,
-            _appearance.outlineWeight);
+        _pointProgram->setUniform(
+            _uniformPointCache.modelTransform,
+            calcModelTransform(data)
+        );
+        _pointProgram->setUniform(
+            _uniformPointCache.viewTransform,
+            data.camera.combinedViewMatrix()
+        );
+        _pointProgram->setUniform(
+            _uniformPointCache.projectionTransform,
+            data.camera.projectionMatrix()
+        );
+        _pointProgram->setUniform(
+            _uniformPointCache.cameraPositionWorld,
+            data.camera.positionVec3()
+        );
+        _pointProgram->setUniform(
+            _uniformPointCache.cameraUpWorld,
+            data.camera.lookUpVectorWorldSpace()
+        );
+        _pointProgram->setUniform(
+            _uniformPointCache.inGameTime,
+            data.time.j2000Seconds()
+        );
+        _pointProgram->setUniform(
+            _uniformPointCache.pointSizeExponent,
+            _appearance.pointSizeExponent
+        );
+        _pointProgram->setUniform(
+            _uniformPointCache.enableMaxSize,
+            _appearance.enableMaxSize
+        );
+        _pointProgram->setUniform(
+            _uniformPointCache.enableOutline,
+            _appearance.enableOutline
+        );
+        _pointProgram->setUniform(
+            _uniformPointCache.outlineColor,
+            _appearance.outlineColor
+        );
+        _pointProgram->setUniform(
+            _uniformPointCache.outlineWeight,
+            _appearance.outlineWidth
+        );
         _pointProgram->setUniform(_uniformPointCache.color, _appearance.color);
         _pointProgram->setUniform(_uniformPointCache.maxSize, _appearance.maxSize);
         _pointProgram->setUniform(_uniformPointCache.opacity, opacity());
@@ -526,12 +545,18 @@ void RenderableOrbitalKepler::render(const RenderData& data, RendererTasks&) {
         _trailProgram->activate();
         _trailProgram->setUniform(_uniformTrailCache.opacity, opacity());
         _trailProgram->setUniform(_uniformTrailCache.color, _appearance.color);
-        _trailProgram->setUniform(_uniformTrailCache.inGameTime,
-            data.time.j2000Seconds());
-        _trailProgram->setUniform(_uniformTrailCache.modelView,
-            calcModelViewTransform(data));
-        _trailProgram->setUniform(_uniformTrailCache.projection,
-            data.camera.projectionMatrix());
+        _trailProgram->setUniform(
+            _uniformTrailCache.inGameTime,
+            data.time.j2000Seconds()
+        );
+        _trailProgram->setUniform(
+            _uniformTrailCache.modelView,
+            calcModelViewTransform(data)
+        );
+        _trailProgram->setUniform(
+            _uniformTrailCache.projection,
+            data.camera.projectionMatrix()
+        );
 
         // Because we want the property to work similar to the planet trails
         const float fade = pow(
diff --git a/modules/space/rendering/renderableorbitalkepler.h b/modules/space/rendering/renderableorbitalkepler.h
index b7b39be55a..0220424489 100644
--- a/modules/space/rendering/renderableorbitalkepler.h
+++ b/modules/space/rendering/renderableorbitalkepler.h
@@ -75,7 +75,7 @@ private:
         /// Specifies the color of the point outline
         properties::Vec3Property outlineColor;
         /// Specifies how much if the point should be covered by the outline
-        properties::FloatProperty outlineWeight;
+        properties::FloatProperty outlineWidth;
     };
 
     void updateBuffers();
diff --git a/modules/space/rendering/renderablerings.cpp b/modules/space/rendering/renderablerings.cpp
index 82d15f88fd..924d374262 100644
--- a/modules/space/rendering/renderablerings.cpp
+++ b/modules/space/rendering/renderablerings.cpp
@@ -47,22 +47,22 @@ namespace {
     constexpr openspace::properties::Property::PropertyInfo TextureInfo = {
         "Texture",
         "Texture",
-        "This value is the path to a texture on disk that contains a one-dimensional "
-        "texture which is used for these rings.",
+        "The path to a texture on disk that contains a one-dimensional texture to use "
+        "for these rings.",
         openspace::properties::Property::Visibility::AdvancedUser
     };
 
     constexpr openspace::properties::Property::PropertyInfo SizeInfo = {
         "Size",
         "Size",
-        "This value specifies the radius of the rings in meters.",
+        "The radius of the rings in meters.",
         openspace::properties::Property::Visibility::AdvancedUser
     };
 
     constexpr openspace::properties::Property::PropertyInfo OffsetInfo = {
         "Offset",
         "Offset",
-        "This value is used to limit the width of the rings. Each of the two values is "
+        "A value that is used to limit the width of the rings. Each of the two values is "
         "a value between 0 and 1, where 0 is the center of the ring and 1 is the "
         "maximum extent at the radius. For example, if the value is {0.5, 1.0}, the "
         "ring is only shown between radius/2 and radius. It defaults to {0.0, 1.0}.",
@@ -72,16 +72,15 @@ namespace {
     constexpr openspace::properties::Property::PropertyInfo NightFactorInfo = {
         "NightFactor",
         "Night Factor",
-        "This value is a multiplicative factor that is applied to the side of the rings "
-        "that is facing away from the Sun. If this value is equal to '1', no darkening "
-        "of the night side occurs.",
+        "A multiplicative factor that is applied to the side of the rings that is facing "
+        "away from the Sun. If it is 1, no darkening of the night side occurs.",
         openspace::properties::Property::Visibility::AdvancedUser
     };
 
     constexpr openspace::properties::Property::PropertyInfo ColorFilterInfo = {
         "ColorFilter",
         "Color Filter",
-        "This value affects the filtering out of part of the rings depending on the "
+        "A value that affects the filtering out of part of the rings depending on the "
         "color values of the texture. The higher value, the more rings are filtered out.",
         openspace::properties::Property::Visibility::AdvancedUser
     };
diff --git a/modules/space/rendering/renderablestars.cpp b/modules/space/rendering/renderablestars.cpp
index 353aec081d..ca91528041 100644
--- a/modules/space/rendering/renderablestars.cpp
+++ b/modules/space/rendering/renderablestars.cpp
@@ -105,8 +105,8 @@ namespace {
 
     constexpr openspace::properties::Property::PropertyInfo SpeckFileInfo = {
         "SpeckFile",
-        "Speck File",
-        "The speck file that is loaded to get the data for rendering these stars.",
+        "SPECK File",
+        "The path to the SPECK file containing the data for rendering these stars.",
         openspace::properties::Property::Visibility::AdvancedUser
     };
 
@@ -121,7 +121,7 @@ namespace {
     constexpr openspace::properties::Property::PropertyInfo MappingBvInfo = {
         "MappingBV",
         "Mapping (bv-color)",
-        "The name of the variable in the speck file that is used as the b-v color "
+        "The name of the variable in the SPECK file that is used as the b-v color "
         "variable.",
         openspace::properties::Property::Visibility::AdvancedUser
     };
@@ -129,7 +129,7 @@ namespace {
     constexpr openspace::properties::Property::PropertyInfo MappingLuminanceInfo = {
         "MappingLuminance",
         "Mapping (luminance)",
-        "The name of the variable in the speck file that is used as the luminance "
+        "The name of the variable in the SPECK file that is used as the luminance "
         "variable.",
         openspace::properties::Property::Visibility::AdvancedUser
     };
@@ -137,7 +137,7 @@ namespace {
     constexpr openspace::properties::Property::PropertyInfo MappingAbsMagnitudeInfo = {
         "MappingAbsMagnitude",
         "Mapping (absolute magnitude)",
-        "The name of the variable in the speck file that is used as the absolute "
+        "The name of the variable in the SPECK file that is used as the absolute "
         "magnitude variable.",
         openspace::properties::Property::Visibility::AdvancedUser
     };
@@ -145,7 +145,7 @@ namespace {
     constexpr openspace::properties::Property::PropertyInfo MappingVxInfo = {
         "MappingVx",
         "Mapping (vx)",
-        "The name of the variable in the speck file that is used as the star velocity "
+        "The name of the variable in the SPECK file that is used as the star velocity "
         "along the x-axis.",
         openspace::properties::Property::Visibility::AdvancedUser
     };
@@ -153,7 +153,7 @@ namespace {
     constexpr openspace::properties::Property::PropertyInfo MappingVyInfo = {
         "MappingVy",
         "Mapping (vy)",
-        "The name of the variable in the speck file that is used as the star velocity "
+        "The name of the variable in the SPECK file that is used as the star velocity "
         "along the y-axis.",
         openspace::properties::Property::Visibility::AdvancedUser
     };
@@ -161,7 +161,7 @@ namespace {
     constexpr openspace::properties::Property::PropertyInfo MappingVzInfo = {
         "MappingVz",
         "Mapping (vz)",
-        "The name of the variable in the speck file that is used as the star velocity "
+        "The name of the variable in the SPECK file that is used as the star velocity "
         "along the z-axis.",
         openspace::properties::Property::Visibility::AdvancedUser
     };
@@ -169,7 +169,7 @@ namespace {
     constexpr openspace::properties::Property::PropertyInfo MappingSpeedInfo = {
         "MappingSpeed",
         "Mapping (speed)",
-        "The name of the variable in the speck file that is used as the speed.",
+        "The name of the variable in the SPECK file that is used as the speed.",
         openspace::properties::Property::Visibility::AdvancedUser
     };
 
@@ -184,7 +184,7 @@ namespace {
     constexpr openspace::properties::Property::PropertyInfo OtherDataOptionInfo = {
         "OtherData",
         "Other Data Column",
-        "The index of the speck file data column that is used as the color input.",
+        "The index of the SPECK file data column that is used as the color input.",
         openspace::properties::Property::Visibility::AdvancedUser
     };
 
@@ -317,8 +317,7 @@ namespace {
     };
 
     struct [[codegen::Dictionary(RenderableStars)]] Parameters {
-        // The path to the SPECK file containing information about the stars being
-        // rendered
+        // [[codegen::verbatim(SpeckFileInfo.description)]]
         std::filesystem::path speckFile [[codegen::key("File")]];
 
         // [[codegen::verbatim(ColorTextureInfo.description)]]
@@ -343,12 +342,12 @@ namespace {
         // [[codegen::verbatim(FilterOutOfRangeInfo.description)]]
         std::optional<bool> filterOutOfRange;
 
-        // This value specifies a value that is always filtered out of the value ranges on
-        // loading. This can be used to trim the dataset's automatic value range
+        // Specifies a value that is always filtered out of the value ranges on load.
+        // This can be used to trim the dataset's automatic value range.
         std::optional<float> staticFilter;
 
-        // This is the value that is used to replace statically filtered values. Setting
-        // this value only makes sense if 'StaticFilter' is 'true', as well
+        // A value that is used to replace statically filtered values. Setting this value
+        // only makes sense if `StaticFilter` is set as well.
         std::optional<float> staticFilterReplacement;
 
         struct Texture {
@@ -401,8 +400,8 @@ namespace {
             // [[codegen::verbatim(MappingSpeedInfo.description)]]
             std::optional<std::string> speed;
         };
-        // The mappings between data values and the variable names specified in the speck
-        // file
+        // The mappings between data values and the variable names specified in the SPECK
+        // file.
         DataMapping dataMapping;
 
         // [[codegen::verbatim(FadeInDistancesInfo.description)]]
diff --git a/modules/spacecraftinstruments/rendering/renderablecrawlingline.cpp b/modules/spacecraftinstruments/rendering/renderablecrawlingline.cpp
index 5654208eac..909ee0e9fd 100644
--- a/modules/spacecraftinstruments/rendering/renderablecrawlingline.cpp
+++ b/modules/spacecraftinstruments/rendering/renderablecrawlingline.cpp
@@ -41,26 +41,24 @@ namespace {
     };
 
     struct [[codegen::Dictionary(RenderableCrawlingLine)]] Parameters {
-        // Denotes the SPICE name of the source of the renderable crawling line, for
-        // example, the spacecraft
+        // The SPICE name of the source of the crawling line. For example, the spacecraft.
         std::string source;
 
-        // Denotes the SPICE name of the target of the crawling line
+        // The SPICE name of the target of the crawling line.
         std::string target;
 
-        // Denotes the SPICE name of the instrument that is used to render the crawling
-        // line
+        // The SPICE name of the instrument that is used to render the crawling line.
         std::string instrument;
 
         struct Color {
-            // The color at the start of the line
+            // The color at the start of the line.
             glm::vec4 start [[codegen::color()]];
 
-            // The color at the end of the line
+            // The color at the end of the line.
             glm::vec4 end [[codegen::color()]];
         };
-        // Specifies the colors that are used for the crawling line. One value determines
-        // the starting color of the line, the second value is the color at the end
+        // The colors used for the crawling line, given as one color at the start of
+        // the line and one at the end.
         Color color;
     };
 #include "renderablecrawlingline_codegen.cpp"
diff --git a/modules/spacecraftinstruments/rendering/renderablefov.cpp b/modules/spacecraftinstruments/rendering/renderablefov.cpp
index 7adda960af..4a9decccb9 100644
--- a/modules/spacecraftinstruments/rendering/renderablefov.cpp
+++ b/modules/spacecraftinstruments/rendering/renderablefov.cpp
@@ -44,88 +44,83 @@ namespace {
     constexpr openspace::properties::Property::PropertyInfo LineWidthInfo = {
         "LineWidth",
         "Line Width",
-        "This value determines width of the lines connecting the instrument to the "
-        "corners of the field of view.",
+        "The width of the lines that connect the instrument to the corners of the field "
+        "of view.",
         openspace::properties::Property::Visibility::User
     };
 
     constexpr openspace::properties::Property::PropertyInfo StandoffDistanceInfo = {
         "StandOffDistance",
         "Standoff Distance Factor",
-        "This value determines the standoff distance factor which influences the "
-        "distance of the plane to the focus object. If this value is '1', the field of "
-        "view will be rendered exactly on the surface of, for example, a planet. With a "
-        "value of smaller than 1, the field of view will hover of ther surface, thus "
-        "making it more visible.",
+        "A standoff distance factor which influences the distance of the plane to the "
+        "focus object. If the value is 1, the field of view will be rendered exactly on "
+        "the surface of, for example, a planet. With a value of smaller than 1, the "
+        "field of view will hover of the surface, thus making it more visible.",
         openspace::properties::Property::Visibility::AdvancedUser
     };
 
     constexpr openspace::properties::Property::PropertyInfo AlwaysDrawFovInfo = {
         "AlwaysDrawFov",
         "Always Draw FOV",
-        "If this value is enabled, the field of view will always be drawn, regardless of "
-        "whether image information has been loaded or not.",
+        "If enabled, the field of view will always be drawn, regardless of whether image "
+        "information is currently available or not.",
         openspace::properties::Property::Visibility::User
     };
 
     constexpr openspace::properties::Property::PropertyInfo DefaultStartColorInfo = {
-        "Colors.DefaultStart",
-        "Start of default color",
-        "This value determines the color of the field of view frustum close to the "
-        "instrument. The final colors are interpolated between this value and the end "
-        "color.",
+        "DefaultStart",
+        "Default Start",
+        "The color that is used for the field of view frustum close to the instrument. "
+        "The final colors are interpolated between this value and the end color.",
         openspace::properties::Property::Visibility::AdvancedUser
     };
 
-    constexpr openspace::properties::Property::PropertyInfo DefaultEndColorInfo = {
-        "Colors.DefaultEnd",
-        "End of default color",
-        "This value determines the color of the field of view frustum close to the "
-        "target. The final colors are interpolated between this value and the start "
-        "color.",
+    constexpr openspace::properties::Property::PropertyInfo ColorDefaultEndInfo = {
+        "DefaultEnd",
+        "Default End",
+        "The color that is used for the field of view frustum close to the target. The "
+        "final colors are interpolated between this value and the start color.",
         openspace::properties::Property::Visibility::AdvancedUser
     };
 
-    constexpr openspace::properties::Property::PropertyInfo ActiveColorInfo = {
-        "Colors.Active",
-        "Active Color",
-        "This value determines the color that is used when the instrument's field of "
-        "view is active.",
+    constexpr openspace::properties::Property::PropertyInfo ColorActiveInfo = {
+        "Active",
+        "Active",
+        "The color that is used when the instrument's field of view is active.",
         openspace::properties::Property::Visibility::AdvancedUser
     };
 
-    constexpr openspace::properties::Property::PropertyInfo TargetInFovInfo = {
-        "Colors.TargetInFieldOfView",
-        "Target in field-of-view Color",
-        "This value determines the color that is used if the target is inside the field "
-        "of view of the instrument but the instrument is not yet active.",
+    constexpr openspace::properties::Property::PropertyInfo ColorTargetInFovInfo = {
+        "TargetInFieldOfView",
+        "Target in Field of View",
+        "The color that is used if the target is inside the field of view of the "
+        "instrument but the instrument is not yet active.",
         openspace::properties::Property::Visibility::AdvancedUser
     };
 
-    constexpr openspace::properties::Property::PropertyInfo IntersectionStartInfo = {
-        "Colors.IntersectionStart",
-        "Start of the intersection",
-        "This value determines the color that is used close to the instrument if one of "
-        "the field of view corners is intersecting the target object. The final color is "
-        "retrieved by interpolating between this color and the intersection end color.",
+    constexpr openspace::properties::Property::PropertyInfo ColorIntersectionStartInfo = {
+        "IntersectionStart",
+        "Intersection Start",
+        "The color that is used close to the instrument if one of the field of view "
+        "corners are intersecting the target object. The final color is an "
+        "interpolation of this color and the intersection end color.",
         openspace::properties::Property::Visibility::AdvancedUser
     };
 
-    constexpr openspace::properties::Property::PropertyInfo IntersectionEndInfo = {
-        "Colors.IntersectionEnd",
-        "End of the intersection",
-        "This value determines the color that is used close to the target if one of the "
-        "field of view corners is intersecting the target object. The final color is "
-        "retrieved by interpolating between this color and the intersection begin color.",
+    constexpr openspace::properties::Property::PropertyInfo ColorIntersectionEndInfo = {
+        "IntersectionEnd",
+        "Intersection End",
+        "The color that is used close to the target if one of the field of view corners "
+        "is intersecting the target object. The final color is an interpolation of this "
+        "color and the intersection begin color.",
         openspace::properties::Property::Visibility::AdvancedUser
     };
 
     constexpr openspace::properties::Property::PropertyInfo SquareColorInfo = {
-        "Colors.Square",
+        "Square",
         "Orthogonal Square",
-        "This value determines the color that is used for the field of view square in "
-        "the case that there is no intersection and that the instrument is not currently "
-        "active.",
+        "The color that is used for the field of view square when there is no "
+        "intersection and that the instrument is not currently active.",
         openspace::properties::Property::Visibility::AdvancedUser
     };
 
@@ -150,34 +145,33 @@ namespace {
     // Needs support for std::map first for the frameConversions
     struct [[codegen::Dictionary(RenderableFov)]] Parameters {
         // The SPICE name of the source body for which the field of view should be
-        // rendered
+        // rendered.
         std::string body;
 
         // The SPICE name of the source body's frame in which the field of view should be
-        // rendered
+        // rendered.
         std::string frame;
 
         struct Instrument {
-            // The SPICE name of the instrument that is rendered
+            // The SPICE name of the instrument that is rendered.
             std::string name;
 
             // The aberration correction that is used for this field of view. The default
-            // is 'NONE'
+            // is 'NONE'.
             std::optional<std::string> aberration [[codegen::inlist("NONE",
                 "LT", "LT+S", "CN", "CN+S", "XLT", "XLT+S", "XCN", "XCN+S")]];
         };
-        // A table describing the instrument whose field of view should be rendered
+        // A table describing the instrument whose field of view should be rendered.
         Instrument instrument;
 
-        // If this value is set to 'true', the field of view specified here will always be
-        // rendered, regardless of whether image information is currently available or not
+        // [[codegen::verbatim(AlwaysDrawFovInfo.description)]]
         std::optional<bool> alwaysDrawFov;
 
         // A list of potential targets (specified as SPICE names) that the field of view
-        // should be tested against
+        // should be tested against.
         std::vector<std::string> potentialTargets;
 
-        // A list of frame conversions that should be registered with the SpiceManager
+        // A list of frame conversions that should be registered with the SpiceManager.
         std::optional<std::map<std::string, std::string>> frameConversions;
 
         // [[codegen::verbatim(LineWidthInfo.description)]]
@@ -186,10 +180,9 @@ namespace {
         // [[codegen::verbatim(StandoffDistanceInfo.description)]]
         std::optional<float> standOffDistance;
 
-        // If this value is set to 'true' the field-of-views bounds values will be
-        // simplified on load. Bound vectors will be removed if they are the strict linear
-        // interpolation between the two neighboring vectors. This value is disabled on
-        // default
+        // If true, the field of view's bounds values will be simplified on load. Bound
+        // vectors will be removed if they are the strict linear interpolation between the
+        // two neighboring vectors. This value is disabled by default.
         std::optional<bool> simplifyBounds;
     };
 #include "renderablefov_codegen.cpp"
@@ -207,18 +200,24 @@ RenderableFov::RenderableFov(const ghoul::Dictionary& dictionary)
     , _standOffDistance(StandoffDistanceInfo, 0.9999, 0.99, 1.0, 0.000001)
     , _alwaysDrawFov(AlwaysDrawFovInfo, false)
     , _colors({
+        properties::PropertyOwner({"Colors", "Colors"}),
         { DefaultStartColorInfo, glm::vec3(0.4f), glm::vec3(0.f), glm::vec3(1.f) },
-        { DefaultEndColorInfo, glm::vec3(0.85f), glm::vec3(0.f), glm::vec3(1.f) },
-        { ActiveColorInfo, glm::vec3(0.f, 1.f, 0.f), glm::vec3(0.f), glm::vec3(1.f) },
-        { TargetInFovInfo, glm::vec3(0.f, 0.5f, 0.7f), glm::vec3(0.f), glm::vec3(1.f) },
+        { ColorDefaultEndInfo, glm::vec3(0.85f), glm::vec3(0.f), glm::vec3(1.f) },
+        { ColorActiveInfo, glm::vec3(0.f, 1.f, 0.f), glm::vec3(0.f), glm::vec3(1.f) },
         {
-            IntersectionStartInfo,
+            ColorTargetInFovInfo,
+            glm::vec3(0.f, 0.5f, 0.7f),
+            glm::vec3(0.f),
+            glm::vec3(1.f)
+        },
+        {
+            ColorIntersectionStartInfo,
             glm::vec3(1.f, 0.89f, 0.f),
             glm::vec3(0.f),
             glm::vec3(1.f)
         },
         {
-            IntersectionEndInfo,
+            ColorIntersectionEndInfo,
             glm::vec3(1.f, 0.29f, 0.f),
             glm::vec3(0.f),
             glm::vec3(1.f)
@@ -259,13 +258,31 @@ RenderableFov::RenderableFov(const ghoul::Dictionary& dictionary)
 
     _simplifyBounds = p.simplifyBounds.value_or(_simplifyBounds);
 
-    addProperty(_colors.defaultStart);
-    addProperty(_colors.defaultEnd);
-    addProperty(_colors.active);
-    addProperty(_colors.targetInFieldOfView);
-    addProperty(_colors.intersectionStart);
-    addProperty(_colors.intersectionEnd);
-    addProperty(_colors.square);
+    _colors.defaultStart.setViewOption(properties::Property::ViewOptions::Color, true);
+    _colors.defaultEnd.setViewOption(properties::Property::ViewOptions::Color, true);
+    _colors.active.setViewOption(properties::Property::ViewOptions::Color, true);
+    _colors.targetInFieldOfView.setViewOption(
+        properties::Property::ViewOptions::Color,
+        true
+    );
+    _colors.intersectionStart.setViewOption(
+        properties::Property::ViewOptions::Color,
+        true
+    );
+    _colors.intersectionEnd.setViewOption(properties::Property::ViewOptions::Color, true);
+    _colors.square.setViewOption(
+        properties::Property::ViewOptions::Color,
+        true
+    );
+    _colors.container.addProperty(_colors.defaultStart);
+    _colors.container.addProperty(_colors.defaultEnd);
+    _colors.container.addProperty(_colors.active);
+    _colors.container.addProperty(_colors.targetInFieldOfView);
+    _colors.container.addProperty(_colors.intersectionStart);
+    _colors.container.addProperty(_colors.intersectionEnd);
+    _colors.container.addProperty(_colors.square);
+
+    addPropertySubOwner(_colors.container);
 }
 
 void RenderableFov::initializeGL() {
diff --git a/modules/spacecraftinstruments/rendering/renderablefov.h b/modules/spacecraftinstruments/rendering/renderablefov.h
index cabf63f940..46702e33a6 100644
--- a/modules/spacecraftinstruments/rendering/renderablefov.h
+++ b/modules/spacecraftinstruments/rendering/renderablefov.h
@@ -131,6 +131,8 @@ private:
     RenderInformation _fieldOfViewBounds;
 
     struct {
+        properties::PropertyOwner container;
+
         /// Start color for uninteresting times
         properties::Vec3Property defaultStart;
         /// End color for uninteresting times
diff --git a/modules/spacecraftinstruments/rendering/renderablemodelprojection.cpp b/modules/spacecraftinstruments/rendering/renderablemodelprojection.cpp
index 163842bd2c..d0b3657a5c 100644
--- a/modules/spacecraftinstruments/rendering/renderablemodelprojection.cpp
+++ b/modules/spacecraftinstruments/rendering/renderablemodelprojection.cpp
@@ -42,17 +42,15 @@ namespace {
     constexpr openspace::properties::Property::PropertyInfo PerformShadingInfo = {
         "PerformShading",
         "Perform Shading",
-        "If this value is enabled, the model will be shaded based on the relative "
-        "location to the Sun. If this value is disabled, shading is disabled and the "
-        "entire model is rendered brightly.",
+        "If true, the model will be shaded based on the location of the Sun. If false, "
+        "shading is disabled and the model is fully illuminated.",
         openspace::properties::Property::Visibility::NoviceUser
     };
 
     struct [[codegen::Dictionary(RenderableModelProjection)]] Parameters {
-        // The file or files that should be loaded in this RenderableModel. The file can
-        // contain filesystem tokens or can be specified relatively to the
-        // location of the .asset file.
-        // This specifies the model that is rendered by the Renderable.
+        // The file or files that should be loaded, that specifies the model to load. The
+        // file can contain filesystem tokens or can be specified relative to the
+        // location of the asset file.
         std::filesystem::path geometryFile;
 
         enum class [[codegen::map(openspace::DistanceUnit)]] ScaleUnit {
@@ -73,12 +71,12 @@ namespace {
         };
 
         // The scale of the model. For example if the model is in centimeters
-        // then ModelScale = Centimeter or ModelScale = 0.01
+        // then `ModelScale = \"Centimeter\"` or `ModelScale = 0.01`.
         std::optional<std::variant<ScaleUnit, double>> modelScale;
 
-        // By default the given ModelScale is used to scale the model down,
-        // by setting this setting to true the model is instead scaled up with the
-        // given ModelScale
+        // By default the given `ModelScale` is used to scale down the model. By setting
+        // this setting to true the scaling is inverted to that the model is instead
+        // scaled up with the given `ModelScale`.
         std::optional<bool> invertModelScale;
 
         // Contains information about projecting onto this planet.
diff --git a/modules/spacecraftinstruments/rendering/renderableplaneprojection.cpp b/modules/spacecraftinstruments/rendering/renderableplaneprojection.cpp
index 6017a83789..862d38db3b 100644
--- a/modules/spacecraftinstruments/rendering/renderableplaneprojection.cpp
+++ b/modules/spacecraftinstruments/rendering/renderableplaneprojection.cpp
@@ -45,18 +45,19 @@ namespace {
     constexpr std::string_view _loggerCat = "RenderablePlaneProjection";
 
     struct [[codegen::Dictionary(RenderablePlaneProjection)]] Parameters {
-        // The SPICE name of the spacecraft from which the projection is performed
+        // The SPICE name of the spacecraft from which the projection is performed.
         std::string spacecraft;
 
         // The SPICE name of the instrument that is used to project the image onto this
-        // RenderablePlaneProjection
+        // `RenderablePlaneProjection`.
         std::string instrument;
 
-        // The SPICE name of the default target that is imaged by this planet
+        // The SPICE name of the default target that is imaged by this instrument (used
+        // when no target is identified by the `ImageSequencer`).
         std::optional<std::string> defaultTarget;
 
         // The image that is used on this plane before any image is loaded from the
-        // ImageSequencerr
+        // `ImageSequencer`.
         std::optional<std::string> texture;
     };
 #include "renderableplaneprojection_codegen.cpp"
diff --git a/modules/spacecraftinstruments/rendering/renderableplanetprojection.cpp b/modules/spacecraftinstruments/rendering/renderableplanetprojection.cpp
index 36aacb019a..22b8e9f6bf 100644
--- a/modules/spacecraftinstruments/rendering/renderableplanetprojection.cpp
+++ b/modules/spacecraftinstruments/rendering/renderableplanetprojection.cpp
@@ -138,7 +138,7 @@ namespace {
     };
 
     struct [[codegen::Dictionary(RenderablePlanetProjection)]] Parameters {
-        // Contains information about projecting onto this planet
+        // Contains information about projecting onto this planet.
         ghoul::Dictionary projection
             [[codegen::reference("spacecraftinstruments_projectioncomponent")]];
 
diff --git a/modules/spacecraftinstruments/rendering/renderableshadowcylinder.cpp b/modules/spacecraftinstruments/rendering/renderableshadowcylinder.cpp
index 6c07db10d3..1a51c8abf7 100644
--- a/modules/spacecraftinstruments/rendering/renderableshadowcylinder.cpp
+++ b/modules/spacecraftinstruments/rendering/renderableshadowcylinder.cpp
@@ -35,75 +35,73 @@
 
 namespace {
     constexpr openspace::properties::Property::PropertyInfo NumberPointsInfo = {
-        "AmountOfPoints",
+        "NumberOfPoints",
         "Points",
-        "This value determines the number of control points that is used to construct "
-        "the shadow geometry. The higher this number, the more detailed the shadow is, "
-        "but it will have a negative impact on the performance.",
+        "The number of control points used for constructing the shadow geometry. The "
+        "higher this number, the more detailed the shadow is, but it will have a "
+        "negative impact on the performance.",
         openspace::properties::Property::Visibility::AdvancedUser
     };
 
     constexpr openspace::properties::Property::PropertyInfo ShadowLengthInfo = {
         "ShadowLength",
         "Shadow Length",
-        "This value determines the length of the shadow that is cast by the target "
-        "object. The total distance of the shadow is equal to the distance from the "
-        "target to the Sun multiplied with this value.",
+        "A factor that controls the length of the shadow that is cast by the target "
+        "object. The total length of the shadow is equal to the distance from the "
+        "target to the light source multiplied with this value.",
         openspace::properties::Property::Visibility::AdvancedUser
     };
 
     constexpr openspace::properties::Property::PropertyInfo ShadowColorInfo = {
         "ShadowColor",
         "Shadow Color",
-        "This value determines the color that is used for the shadow cylinder.",
+        "The color used for the shadow cylinder.",
         openspace::properties::Property::Visibility::User
     };
 
     constexpr openspace::properties::Property::PropertyInfo TerminatorTypeInfo = {
         "TerminatorType",
         "Terminator Type",
-        "This value determines the type of the terminator that is used to calculate the "
-        "shadow eclipse.",
+        "Determines the type of terminator to use for calculating the shadow eclipse.",
         openspace::properties::Property::Visibility::AdvancedUser
     };
 
     constexpr openspace::properties::Property::PropertyInfo LightSourceInfo = {
         "LightSource",
         "Light Source",
-        "This value determines the SPICE name of the object that is used as the "
-        "illuminator for computing the shadow cylinder.",
+        "The SPICE name of the object that is used as the illuminator for computing the "
+        "shadow cylinder.",
         openspace::properties::Property::Visibility::AdvancedUser
     };
 
     constexpr openspace::properties::Property::PropertyInfo ObserverInfo = {
         "Observer",
         "Observer",
-        "This value specifies the SPICE name of the object that is the observer of the "
-        "shadow cylinder.",
+        "The SPICE name of the object that is the observer.",
         openspace::properties::Property::Visibility::AdvancedUser
     };
 
     constexpr openspace::properties::Property::PropertyInfo BodyInfo = {
         "Body",
         "Target Body",
-        "This value is the SPICE name of target body that is used as the shadow caster "
-        "for the shadow cylinder.",
+        "The SPICE name of target body that is used as the shadow caster.",
         openspace::properties::Property::Visibility::AdvancedUser
     };
 
     constexpr openspace::properties::Property::PropertyInfo BodyFrameInfo = {
         "BodyFrame",
         "Body Frame",
-        "This value is the SPICE name of the reference frame in which the shadow "
-        "cylinder is expressed.",
+        "The SPICE name of the reference frame in which the shadow cylinder is "
+        "expressed.",
         openspace::properties::Property::Visibility::AdvancedUser
     };
 
     constexpr openspace::properties::Property::PropertyInfo AberrationInfo = {
         "Aberration",
         "Aberration",
-        "This value determines the aberration method that is used to compute the shadow "
-        "cylinder.",
+        "The aberration method that is used for computing the shadow cylinder. The "
+        "options are \"NONE\", \"LT\" (Light Time), \"LT + S\" (Light Time Stellar), "
+        "\"CN\" (Converged Newtonian), and \"CN + S\" (Converged Newtonian Stellar).",
         openspace::properties::Property::Visibility::AdvancedUser
     };
 
@@ -185,12 +183,20 @@ RenderableShadowCylinder::RenderableShadowCylinder(const ghoul::Dictionary& dict
         static_cast<int>(codegen::map<SpiceManager::TerminatorType>(p.terminatorType));
     addProperty(_terminatorType);
 
-
     _lightSource = p.lightSource;
     _observer = p.observer;
     _body = p.body;
     _bodyFrame = p.bodyFrame;
 
+    _lightSource.setReadOnly(true);
+    addProperty(_lightSource);
+    _observer.setReadOnly(true);
+    addProperty(_observer);
+    _body.setReadOnly(true);
+    addProperty(_body);
+    _bodyFrame.setReadOnly(true);
+    addProperty(_bodyFrame);
+
     using T = SpiceManager::AberrationCorrection::Type;
     _aberration.addOptions({
         { static_cast<int>(T::None), "None" },
@@ -198,12 +204,13 @@ RenderableShadowCylinder::RenderableShadowCylinder(const ghoul::Dictionary& dict
         { static_cast<int>(T::ConvergedNewtonianStellar), "Converged Newtonian Stellar" },
         { static_cast<int>(T::LightTime), "Light Time" },
         { static_cast<int>(T::LightTimeStellar), "Light Time Stellar" },
-
     });
     const SpiceManager::AberrationCorrection abbcorr = SpiceManager::AberrationCorrection(
         p.aberration
     );
     _aberration = static_cast<int>(abbcorr.type);
+    _aberration.setReadOnly(true);
+    addProperty(_aberration);
 }
 
 void RenderableShadowCylinder::initializeGL() {
diff --git a/modules/spout/renderableplanespout.cpp b/modules/spout/renderableplanespout.cpp
index 9bd83ea101..d70c555d09 100644
--- a/modules/spout/renderableplanespout.cpp
+++ b/modules/spout/renderableplanespout.cpp
@@ -32,32 +32,14 @@
 #include <optional>
 
 namespace {
-    constexpr std::string_view LoggerCat = "ScreenSpaceSpout";
-
     constexpr openspace::properties::Property::PropertyInfo NameInfo = {
         "SpoutName",
         "Spout Sender Name",
-        "This value explicitly sets the Spout receiver to use a specific name. If this "
+        "A value to explicitly set the Spout receiver to use a specific name. If this "
         "is not a valid name, an empty image is used.",
         openspace::properties::Property::Visibility::AdvancedUser
     };
 
-    constexpr openspace::properties::Property::PropertyInfo SelectionInfo = {
-        "SpoutSelection",
-        "Spout Selection",
-        "This property displays all available Spout sender on the system. If one them is "
-        "selected, its value is stored in the 'SpoutName' property, overwriting its "
-        "previous value.",
-        openspace::properties::Property::Visibility::AdvancedUser
-    };
-
-    constexpr openspace::properties::Property::PropertyInfo UpdateInfo = {
-        "UpdateSelection",
-        "Update Selection",
-        "If this property is trigged, the 'SpoutSelection' options will be refreshed.",
-        openspace::properties::Property::Visibility::AdvancedUser
-    };
-
     struct [[codegen::Dictionary(RenderablePlaneSpout)]] Parameters {
         // [[codegen::verbatim(NameInfo.description)]]
         std::optional<std::string> spoutName;
diff --git a/modules/toyvolume/rendering/renderabletoyvolume.cpp b/modules/toyvolume/rendering/renderabletoyvolume.cpp
index f50f1d07c8..b59cc5c6d0 100644
--- a/modules/toyvolume/rendering/renderabletoyvolume.cpp
+++ b/modules/toyvolume/rendering/renderabletoyvolume.cpp
@@ -80,7 +80,7 @@ namespace {
     {
         "Downscale",
         "Downscale Factor Volume Rendering",
-        "This value set the downscaling factor when rendering the current volume.",
+        "The downscaling factor used when rendering the current volume.",
         openspace::properties::Property::Visibility::AdvancedUser
     };
 } // namespace
diff --git a/modules/video/include/videoplayer.h b/modules/video/include/videoplayer.h
index cb9cf128d5..bc239f4d56 100644
--- a/modules/video/include/videoplayer.h
+++ b/modules/video/include/videoplayer.h
@@ -128,7 +128,7 @@ private:
     properties::BoolProperty _loopVideo;
 
     // Video properties. Try to read all these values from the video
-    std::string _videoFile;
+    std::filesystem::path _videoFile;
     double _currentVideoTime = 0.0;
     double _fps = 24.0; // If when we read it it is 0, use 24 fps
     double _videoDuration = 0.0;
diff --git a/modules/video/src/videoplayer.cpp b/modules/video/src/videoplayer.cpp
index 54b5a5c6c5..389fef2cfd 100644
--- a/modules/video/src/videoplayer.cpp
+++ b/modules/video/src/videoplayer.cpp
@@ -44,7 +44,7 @@ namespace {
     constexpr openspace::properties::Property::PropertyInfo VideoInfo = {
         "Video",
         "Video",
-        "This should point to the video file that should be played."
+        "The video file that is played."
     };
 
     constexpr openspace::properties::Property::PropertyInfo PlayInfo = {
@@ -101,7 +101,7 @@ namespace {
 
     struct [[codegen::Dictionary(VideoPlayer)]] Parameters {
         // [[codegen::verbatim(VideoInfo.description)]]
-        std::string video;
+        std::filesystem::path video;
 
         // [[codegen::verbatim(AudioInfo.description)]]
         std::optional<bool> playAudio;
@@ -446,7 +446,7 @@ void VideoPlayer::initializeMpv() {
     );
 
     // Load file
-    const std::string file = _videoFile;
+    const std::string file = _videoFile.string();
     const char* cmd[] = { "loadfile", file.c_str(), nullptr };
     result = mpv_command(_mpvHandle, cmd);
     if (!checkMpvError(result)) {
diff --git a/modules/vislab/rendering/renderabledistancelabel.cpp b/modules/vislab/rendering/renderabledistancelabel.cpp
index 1372f70bd5..f7f94dd592 100644
--- a/modules/vislab/rendering/renderabledistancelabel.cpp
+++ b/modules/vislab/rendering/renderabledistancelabel.cpp
@@ -40,16 +40,20 @@ namespace {
     constexpr openspace::properties::Property::PropertyInfo NodeLineInfo = {
         "NodeLine",
         "Node Line",
-        "Property to track a nodeline. When tracking the label text will be updating the "
-        "distance from the nodeline start and end.",
+        "The identifier of a scene graph node with a RenderableNodeLine that this label "
+        "should track. The label text will be updating based on the distance from the "
+        "node line's start and end.",
         openspace::properties::Property::Visibility::AdvancedUser
     };
 
+    // @TODO (2024-04-26, emmbr) The unit and custom unit descriptor are confusing and
+    // should be reimplemented. Why are we using an int value for the unit??
+
     constexpr openspace::properties::Property::PropertyInfo DistanceUnitInfo = {
         "DistanceUnit",
         "Distance Unit",
-        "Property to define the unit in which the distance should be displayed. "
-        "Defaults to 'km' if not specified.",
+        "The unit in which the distance value should be displayed. Defaults to 'km' if "
+        "not specified.",
         openspace::properties::Property::Visibility::User
     };
 
diff --git a/modules/volume/rendering/renderabletimevaryingvolume.cpp b/modules/volume/rendering/renderabletimevaryingvolume.cpp
index c9e97c2d57..e949f5a49d 100644
--- a/modules/volume/rendering/renderabletimevaryingvolume.cpp
+++ b/modules/volume/rendering/renderabletimevaryingvolume.cpp
@@ -55,45 +55,43 @@ namespace {
     constexpr openspace::properties::Property::PropertyInfo StepSizeInfo = {
         "StepSize",
         "Step Size",
-        "Specifies how often to sample on the raycaster. Lower step -> higher "
-        "resolution.",
+        "Specifies how often to sample during raycasting. Lower step size leads to "
+        "higher resolution.",
         openspace::properties::Property::Visibility::AdvancedUser
     };
 
     constexpr openspace::properties::Property::PropertyInfo GridTypeInfo = {
         "GridType",
         "Grid Type",
-        "Spherical or Cartesian grid.",
+        "The grid type to use for the volume.",
         openspace::properties::Property::Visibility::AdvancedUser
     };
 
     constexpr openspace::properties::Property::PropertyInfo SecondsBeforeInfo = {
         "SecondsBefore",
         "Seconds before",
-        "Specifies the number of seconds to show the first timestep before its "
-        "actual time. The default value is 0.",
+        "The number of seconds to show the first timestep before its actual time.",
         openspace::properties::Property::Visibility::AdvancedUser
     };
 
     constexpr openspace::properties::Property::PropertyInfo SecondsAfterInfo = {
         "SecondsAfter",
         "Seconds after",
-        "Specifies the number of seconds to show the the last timestep after its "
-        "actual time.",
+        "The number of seconds to show the the last timestep after its actual time.",
         openspace::properties::Property::Visibility::AdvancedUser
     };
 
     constexpr openspace::properties::Property::PropertyInfo SourceDirectoryInfo = {
         "SourceDirectory",
         "Source Directory",
-        "Specifies the path to load timesteps from.",
+        "A directory from where to load the data files for the different time steps.",
         openspace::properties::Property::Visibility::AdvancedUser
     };
 
     constexpr openspace::properties::Property::PropertyInfo TransferFunctionInfo = {
         "TransferFunctionPath",
         "Transfer Function Path",
-        "Specifies the transfer function file path.",
+        "The path to the transfer function file.",
         openspace::properties::Property::Visibility::AdvancedUser
     };
 
@@ -107,14 +105,14 @@ namespace {
     constexpr openspace::properties::Property::PropertyInfo JumpToTimestepInfo = {
         "JumpToTimestep",
         "Jump to timestep",
-        "Lets you scrub through the sequence's time steps.",
+        "Setting this value lets you scrub through the sequence's time steps.",
         openspace::properties::Property::Visibility::User
     };
 
     constexpr openspace::properties::Property::PropertyInfo BrightnessInfo = {
         "Brightness",
         "Brightness",
-        "The volume renderer's general brightness.",
+        "A value that affects the general brightness of the volume rendering.",
         openspace::properties::Property::Visibility::User
     };
 
@@ -134,10 +132,10 @@ namespace {
 
     struct [[codegen::Dictionary(RenderableTimeVaryingVolume)]] Parameters {
         // [[codegen::verbatim(SourceDirectoryInfo.description)]]
-        std::string sourceDirectory;
+        std::filesystem::path sourceDirectory [[codegen::directory()]];
 
         // [[codegen::verbatim(TransferFunctionInfo.description)]]
-        std::string transferFunction;
+        std::filesystem::path transferFunction;
 
         // [[codegen::verbatim(SecondsBeforeInfo.description)]]
         std::optional<float> secondsBefore;
@@ -145,7 +143,7 @@ namespace {
         // [[codegen::verbatim(SecondsAfterInfo.description)]]
         float secondsAfter;
 
-        // Specifies if you want to invert the volume data at it z-axis.
+        // If true, the volume data will be inverted at its z-axis.
         std::optional<bool> invertDataAtZ;
 
         // [[codegen::verbatim(BrightnessInfo.description)]]
@@ -155,7 +153,7 @@ namespace {
         std::optional<float> stepSize;
 
         // [[codegen::verbatim(GridTypeInfo.description)]]
-        std::optional<std::string> gridType;
+        std::optional<std::string> gridType [[codegen::inlist("Spherical", "Cartesian")]];
 
         // @TODO Missing documentation
         std::optional<ghoul::Dictionary> clipPlanes;
@@ -197,8 +195,8 @@ RenderableTimeVaryingVolume::RenderableTimeVaryingVolume(
     _invertDataAtZ = p.invertDataAtZ.value_or(_invertDataAtZ);
 
     _gridType.addOptions({
-        { static_cast<int>(volume::VolumeGridType::Cartesian), "Cartesian grid" },
-        { static_cast<int>(volume::VolumeGridType::Spherical), "Spherical grid" }
+        { static_cast<int>(volume::VolumeGridType::Cartesian), "Cartesian" },
+        { static_cast<int>(volume::VolumeGridType::Spherical), "Spherical" }
     });
     _gridType = static_cast<int>(volume::VolumeGridType::Cartesian);
 
diff --git a/src/rendering/renderable.cpp b/src/rendering/renderable.cpp
index 073a84aa3a..2fcd263d57 100644
--- a/src/rendering/renderable.cpp
+++ b/src/rendering/renderable.cpp
@@ -45,14 +45,14 @@ namespace {
     constexpr openspace::properties::Property::PropertyInfo EnabledInfo = {
         "Enabled",
         "Enabled",
-        "This setting determines whether this object will be visible or not.",
+        "Determines whether this object will be visible or not.",
         openspace::properties::Property::Visibility::AdvancedUser
     };
 
     constexpr openspace::properties::Property::PropertyInfo RenderableTypeInfo = {
         "Type",
         "Renderable Type",
-        "This tells the type of the renderable.",
+        "The type of the renderable.",
         openspace::properties::Property::Visibility::AdvancedUser
     };
 
@@ -60,16 +60,16 @@ namespace {
     {
         "RenderBinMode",
         "Render Bin Mode",
-        "This value specifies if the renderable should be rendered in the Background,"
-        "Opaque, Pre/PostDeferredTransparency, or Overlay rendering step.",
+        "A value that specifies if the renderable should be rendered in the Background, "
+        "Opaque, Pre-/PostDeferredTransparency, Overlay, or Sticker rendering step.",
         openspace::properties::Property::Visibility::AdvancedUser
     };
 
     constexpr openspace::properties::Property::PropertyInfo DimInAtmosphereInfo = {
         "DimInAtmosphere",
         "Dim In Atmosphere",
-        "Enables/Disables if the object should be dimmed when the camera is in the "
-        "sunny part of an atmosphere.",
+        "Decides if the object should be dimmed (i.e. faded out) when the camera is in "
+        "the sunny part of an atmosphere.",
         openspace::properties::Property::Visibility::AdvancedUser
     };
 

From d4a509ecce5b4cdc5a37a81c0db519f1af3d229d Mon Sep 17 00:00:00 2001
From: Alexander Bock <alexander.bock@liu.se>
Date: Thu, 9 May 2024 13:06:16 +0200
Subject: [PATCH 443/701] Add the ability to override the openspace.cfg file

---
 .gitignore                   | 1 +
 ext/ghoul                    | 2 +-
 src/engine/configuration.cpp | 6 ++++++
 3 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/.gitignore b/.gitignore
index bb70a3b337..46e1be12b5 100644
--- a/.gitignore
+++ b/.gitignore
@@ -43,3 +43,4 @@ COMMIT.md
 doc
 config/schema/sgct.schema.json
 settings.json
+openspace.cfg.override
diff --git a/ext/ghoul b/ext/ghoul
index 9c13aaa212..73a98890ff 160000
--- a/ext/ghoul
+++ b/ext/ghoul
@@ -1 +1 @@
-Subproject commit 9c13aaa212d75005fc0a2ae1d0b124485c120261
+Subproject commit 73a98890ff322496c39c820cc53b3f7b4b9f92ce
diff --git a/src/engine/configuration.cpp b/src/engine/configuration.cpp
index 4bde284f72..cd2d26d9e4 100644
--- a/src/engine/configuration.cpp
+++ b/src/engine/configuration.cpp
@@ -721,6 +721,12 @@ Configuration loadConfigurationFromFile(const std::filesystem::path& configurati
     // Load the configuration file into the state
     ghoul::lua::runScriptFile(result.state, configurationFile);
 
+    // If an override file exist, we want to run it straight after
+    const std::filesystem::path override = std::format("{}.override", configurationFile);
+    if (std::filesystem::exists(override)) {
+        ghoul::lua::runScriptFile(result.state, override);
+    }
+
     parseLuaState(result);
 
     if (std::filesystem::is_regular_file(settingsFile)) {

From 1d002a270b37ed2cbbebb51b6c75dbdca5a9cd2f Mon Sep 17 00:00:00 2001
From: Alexander Bock <mail@alexanderbock.eu>
Date: Mon, 20 May 2024 09:52:23 +0200
Subject: [PATCH 444/701] Clarify the comment after getting feedback from
 scnlib

---
 modules/space/kepler.cpp | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/modules/space/kepler.cpp b/modules/space/kepler.cpp
index 249b0473ef..8d0bf940a8 100644
--- a/modules/space/kepler.cpp
+++ b/modules/space/kepler.cpp
@@ -208,8 +208,7 @@ namespace {
         if (e.find('.') == std::string::npos) {
             e += ".0";
         }
-        // @TODO(abock) The 'd' suffix can be removed when
-        // https://github.com/eliaskosunen/scnlib/issues/104 is fixed
+        // @TODO(abock, 2024-05-20) 'd' suffix is needed until scnlib updates to v3
         auto res = scn::scan<int, double>(e, "{:2d}{}");
         if (!res) {
             throw ghoul::RuntimeError(std::format("Error parsing epoch '{}'", epoch));
@@ -337,8 +336,7 @@ namespace {
             // We have the first form
             int month = 0;
             int days = 0;
-            // @TODO(abock) The 'd' suffix can be removed when
-            // https://github.com/eliaskosunen/scnlib/issues/104 is fixed
+            // @TODO(abock, 2024-05-20) 'd' suffix is needed until scnlib updates to v3
             auto res = scn::scan<int, int, int, int, int, double>(
                 epoch, "{:4d}-{:2d}-{:2d}T{:2d}:{:2d}:{}"
             );
@@ -352,8 +350,7 @@ namespace {
         else if (pos == 8) {
             // We have the second form
 
-            // @TODO(abock) The 'd' suffix can be removed when
-            // https://github.com/eliaskosunen/scnlib/issues/104 is fixed
+            // @TODO(abock, 2024-05-20) 'd' suffix is needed until scnlib updates to v3
             auto res = scn::scan<int, int, int, int, double>(
                 epoch, "{:4d}-{:3d}T{:2d}:{:2d}:{}"
                 //date.year, date.nDays, date.hours, date.minutes, date.seconds

From 997d809ef75055a93f9fc4ab1ef56fde55ed0087 Mon Sep 17 00:00:00 2001
From: Malin E <malin.ejdbo@gmail.com>
Date: Mon, 20 May 2024 10:57:00 +0200
Subject: [PATCH 445/701] Update Voyager Model to not be in parts and remove
 extra box (#3035)

* Update Voyager model to not be in parts
* Add asset meta information for voyager spacecrafts
---
 .../missions/voyager/voyager1.asset           | 82 ++++++-------------
 .../missions/voyager/voyager2.asset           | 82 ++++++-------------
 2 files changed, 54 insertions(+), 110 deletions(-)

diff --git a/data/assets/scene/solarsystem/missions/voyager/voyager1.asset b/data/assets/scene/solarsystem/missions/voyager/voyager1.asset
index 0ed2011173..8270c17307 100644
--- a/data/assets/scene/solarsystem/missions/voyager/voyager1.asset
+++ b/data/assets/scene/solarsystem/missions/voyager/voyager1.asset
@@ -7,7 +7,7 @@ local models = asset.resource({
   Name = "Voyager Model",
   Type = "HttpSynchronization",
   Identifier = "voyager_model",
-  Version = 1
+  Version = 2
 })
 
 local kernels = asset.resource({
@@ -57,60 +57,26 @@ local Voyager1 = {
       }
     }
   },
+  Renderable = {
+    Type = "RenderableModel",
+    Enabled = asset.enabled,
+    GeometryFile = models .. "Voyager.glb",
+    ModelTransform = RotationMatrix,
+    LightSources = {
+      sunTransforms.LightSource,
+      {
+        Identifier = "Camera",
+        Type = "CameraLightSource",
+        Intensity = 0.5
+      }
+    }
+  },
   GUI = {
     Name = "Voyager 1",
     Path = "/Solar System/Missions/Voyager 1"
   }
 }
 
-local Voyager1Main = {
-  Identifier = "Voyager_1_Main",
-  Parent = Voyager1.Identifier,
-  Renderable = {
-    Type = "RenderableModel",
-    Enabled = asset.enabled,
-    GeometryFile = models .. "voyager-main.obj",
-    ModelTransform = RotationMatrix,
-    LightSources = {
-      sunTransforms.LightSource,
-      {
-        Identifier = "Camera",
-        Type = "CameraLightSource",
-        Intensity = 0.5
-      }
-    }
-  },
-  Tag = { "voyager1_part" },
-  GUI = {
-    Name = "Voyager 1 Main",
-    Path = "/Solar System/Missions/Voyager 1"
-  }
-}
-
-local Voyager1Antenna = {
-  Identifier = "Voyager_1_Antenna",
-  Parent = Voyager1.Identifier,
-  Renderable = {
-    Type = "RenderableModel",
-    Enabled = asset.enabled,
-    GeometryFile = models .. "voyager-antenna.obj",
-    ModelTransform = RotationMatrix,
-    LightSources = {
-      sunTransforms.LightSource,
-      {
-        Identifier = "Camera",
-        Type = "CameraLightSource",
-        Intensity = 0.5
-      }
-    }
-  },
-  Tag = { "voyager1_part" },
-  GUI = {
-    Name = "Voyager 1 Antenna",
-    Path = "/Solar System/Missions/Voyager 1"
-  }
-}
-
 -- The trails are organized as follows.  The cruise phases can be resolved in relatively
 -- low resolution since they are just straight lines
 -- The encounter phases should be much higher resolution or otherwise artifacts would
@@ -258,8 +224,6 @@ asset.onInitialize(function()
   openspace.spice.loadKernel(Kernels)
 
   openspace.addSceneGraphNode(Voyager1)
-  openspace.addSceneGraphNode(Voyager1Main)
-  openspace.addSceneGraphNode(Voyager1Antenna)
   openspace.addSceneGraphNode(VoyagerTrailCruiseEarthJupiter)
   openspace.addSceneGraphNode(VoyagerTrailEncounterJupiter)
   openspace.addSceneGraphNode(VoyagerTrailCruiseJupiterSaturn)
@@ -277,18 +241,26 @@ asset.onDeinitialize(function()
   openspace.removeSceneGraphNode(VoyagerTrailCruiseJupiterSaturn)
   openspace.removeSceneGraphNode(VoyagerTrailEncounterJupiter)
   openspace.removeSceneGraphNode(VoyagerTrailCruiseEarthJupiter)
-  openspace.removeSceneGraphNode(Voyager1Antenna)
-  openspace.removeSceneGraphNode(Voyager1Main)
   openspace.removeSceneGraphNode(Voyager1)
 
   openspace.spice.unloadKernel(Kernels)
 end)
 
 asset.export(Voyager1)
-asset.export(Voyager1Main)
-asset.export(Voyager1Antenna)
 asset.export(VoyagerTrailCruiseEarthJupiter)
 asset.export(VoyagerTrailEncounterJupiter)
 asset.export(VoyagerTrailCruiseJupiterSaturn)
 asset.export(VoyagerTrailEncounterSaturn)
 asset.export(VoyagerTrailCruiseSaturnInf)
+
+asset.meta = {
+  Name = "Voyager 1 Model and Trails",
+  Version = "2.0",
+  Description = [[
+    Voyager 1 model and trails from 1977 SEP 05 to 2100 JAN 01. Model credit:
+    NASA Visualization Technology Applications And Development (VTAD)
+  ]],
+  Author = "OpenSpace Team",
+  URL = "http://openspaceproject.com",
+  License = "MIT license"
+}
diff --git a/data/assets/scene/solarsystem/missions/voyager/voyager2.asset b/data/assets/scene/solarsystem/missions/voyager/voyager2.asset
index a521bbeb2d..b3949fa87d 100644
--- a/data/assets/scene/solarsystem/missions/voyager/voyager2.asset
+++ b/data/assets/scene/solarsystem/missions/voyager/voyager2.asset
@@ -7,7 +7,7 @@ local models = asset.resource({
   Name = "Voyager Model",
   Type = "HttpSynchronization",
   Identifier = "voyager_model",
-  Version = 1
+  Version = 2
 })
 
 local kernels = asset.resource({
@@ -60,60 +60,26 @@ local Voyager2 = {
       DestinationFrame = coreKernels.Frame.Galactic
     }
   },
+  Renderable = {
+    Type = "RenderableModel",
+    Enabled = asset.enabled,
+    GeometryFile = models .. "Voyager.glb",
+    ModelTransform = RotationMatrix,
+    LightSources = {
+      sunTransforms.LightSource,
+      {
+        Identifier = "Camera",
+        Type = "CameraLightSource",
+        Intensity = 0.5
+      }
+    }
+  },
   GUI = {
     Name = "Voyager 2",
     Path = "/Solar System/Missions/Voyager 2"
   }
 }
 
-local Voyager2Main = {
-  Identifier = "Voyager_2_Main",
-  Parent = Voyager2.Identifier,
-  Renderable = {
-    Type = "RenderableModel",
-    Enabled = asset.enabled,
-    GeometryFile = models .. "voyager-main.obj",
-    ModelTransform = RotationMatrix,
-    LightSources = {
-      sunTransforms.LightSource,
-      {
-        Identifier = "Camera",
-        Type = "CameraLightSource",
-        Intensity = 0.5
-      }
-    }
-  },
-  Tag = { "voyager2_part" },
-  GUI = {
-    Name = "Voyager 2 Main",
-    Path = "/Solar System/Missions/Voyager 2"
-  }
-}
-
-local Voyager2Antenna = {
-  Identifier = "Voyager_2_Antenna",
-  Parent = Voyager2.Identifier,
-  Renderable = {
-    Type = "RenderableModel",
-    Enabled = asset.enabled,
-    GeometryFile = models .. "voyager-antenna.obj",
-    ModelTransform = RotationMatrix,
-    LightSources = {
-      sunTransforms.LightSource,
-      {
-        Identifier = "Camera",
-        Type = "CameraLightSource",
-        Intensity = 0.5
-      }
-    }
-  },
-  Tag = { "voyager2_part" },
-  GUI = {
-    Name = "Voyager 2 Antenna",
-    Path = "/Solar System/Missions/Voyager 2"
-  }
-}
-
 -- The trails are organized as follows.  The cruise phases can be resolved in relatively
 -- low resolution since they are just straight lines
 -- The encounter phases should be much higher resolution or otherwise artifacts would
@@ -362,8 +328,6 @@ asset.onInitialize(function()
   openspace.action.registerAction(FocusVoyager2)
 
   openspace.addSceneGraphNode(Voyager2)
-  openspace.addSceneGraphNode(Voyager2Main)
-  openspace.addSceneGraphNode(Voyager2Antenna)
   openspace.addSceneGraphNode(VoyagerTrailCruiseEarthJupiter)
   openspace.addSceneGraphNode(VoyagerTrailEncounterJupiter)
   openspace.addSceneGraphNode(VoyagerTrailCruiseJupiterSaturn)
@@ -385,8 +349,6 @@ asset.onDeinitialize(function()
   openspace.removeSceneGraphNode(VoyagerTrailCruiseJupiterSaturn)
   openspace.removeSceneGraphNode(VoyagerTrailEncounterJupiter)
   openspace.removeSceneGraphNode(VoyagerTrailCruiseEarthJupiter)
-  openspace.removeSceneGraphNode(Voyager2Antenna)
-  openspace.removeSceneGraphNode(Voyager2Main)
   openspace.removeSceneGraphNode(Voyager2)
 
   openspace.action.removeAction(FocusVoyager2)
@@ -395,8 +357,6 @@ asset.onDeinitialize(function()
 end)
 
 asset.export(Voyager2)
-asset.export(Voyager2Main)
-asset.export(Voyager2Antenna)
 asset.export(VoyagerTrailCruiseEarthJupiter)
 asset.export(VoyagerTrailEncounterJupiter)
 asset.export(VoyagerTrailCruiseJupiterSaturn)
@@ -406,3 +366,15 @@ asset.export(VoyagerTrailEncounterUranus)
 asset.export(VoyagerTrailCruiseUranusNeptune)
 asset.export(VoyagerTrailEncounterNeptune)
 asset.export(VoyagerTrailCruiseNeptuneInf)
+
+asset.meta = {
+  Name = "Voyager 2 Model and Trails",
+  Version = "2.0",
+  Description = [[
+    Voyager 2 model and trails from 1977 AUG 20 16:07:06.535 to 2100 JAN 01. Model credit:
+    NASA Visualization Technology Applications And Development (VTAD)
+  ]],
+  Author = "OpenSpace Team",
+  URL = "http://openspaceproject.com",
+  License = "MIT license"
+}

From 944e345d2ec77d28fad63330428afa531c54610a Mon Sep 17 00:00:00 2001
From: Andreas Engberg <48772850+engbergandreas@users.noreply.github.com>
Date: Mon, 20 May 2024 15:43:06 +0200
Subject: [PATCH 446/701] Update post synchronization from range-based to
 index-based for loop closes #3163 (#3261)

* Update pre- & post synchronization from range-based to index-based for loop
---
 src/engine/syncengine.cpp | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/src/engine/syncengine.cpp b/src/engine/syncengine.cpp
index dce531c641..a622e58d97 100644
--- a/src/engine/syncengine.cpp
+++ b/src/engine/syncengine.cpp
@@ -61,16 +61,20 @@ void SyncEngine::decodeSyncables(std::vector<std::byte> data) {
 void SyncEngine::preSynchronization(IsMaster isMaster) {
     ZoneScoped;
 
-    for (Syncable* syncable : _syncables) {
-        syncable->preSync(isMaster);
+    // We use a raw for-loop because a syncable can add to the `_syncables` list which
+    // can invalidate the pointers of a range-based for-loop
+    for (size_t i = 0; i < _syncables.size(); i++) {
+        _syncables[i]->preSync(isMaster);
     }
 }
 
 void SyncEngine::postSynchronization(IsMaster isMaster) {
     ZoneScoped;
 
-    for (Syncable* syncable : _syncables) {
-        syncable->postSync(isMaster);
+    // We use a raw for-loop because a syncable can add to the `_syncables` list which
+    // can invalidate the pointers of a range-based for-loop
+    for (size_t i = 0; i < _syncables.size(); i++) {
+        _syncables[i]->postSync(isMaster);
     }
 }
 

From 666135d56ffa11e212f07704f5dfc2b89325c02c Mon Sep 17 00:00:00 2001
From: Andreas Engberg <48772850+engbergandreas@users.noreply.github.com>
Date: Mon, 20 May 2024 17:08:57 +0200
Subject: [PATCH 447/701] Automatically create bookmarks folder for user 
 (#3262)

* Automatically creates user bookmarks folder if it does not exist
---
 data/assets/global/localbookmarks.asset |  5 +++++
 src/scripting/scriptengine.cpp          |  1 +
 src/scripting/scriptengine_lua.inl      | 18 +++++++++++++++++-
 3 files changed, 23 insertions(+), 1 deletion(-)

diff --git a/data/assets/global/localbookmarks.asset b/data/assets/global/localbookmarks.asset
index 2aa5833768..f616ff2d76 100644
--- a/data/assets/global/localbookmarks.asset
+++ b/data/assets/global/localbookmarks.asset
@@ -5,6 +5,11 @@ local bookmarkHelper = asset.require("util/generate_bookmarks")
 asset.require("scene/solarsystem/planets/earth/earth")
 
 local localBookmarks = openspace.absPath("${USER}/bookmarks/localbookmarks.csv")
+local bookmarksDirectory = openspace.absPath("${USER}/bookmarks")
+
+if not openspace.directoryExists(bookmarksDirectory) then
+  openspace.createDirectory(bookmarksDirectory)
+end
 
 -- Create bookmarks file if it does not exist
 if not openspace.fileExists(localBookmarks) then
diff --git a/src/scripting/scriptengine.cpp b/src/scripting/scriptengine.cpp
index 773a4ec609..a7e2e84306 100644
--- a/src/scripting/scriptengine.cpp
+++ b/src/scripting/scriptengine.cpp
@@ -646,6 +646,7 @@ void ScriptEngine::addBaseLibrary() {
             codegen::lua::FileExists,
             codegen::lua::ReadFile,
             codegen::lua::DirectoryExists,
+            codegen::lua::CreateDirectory,
             codegen::lua::WalkDirectory,
             codegen::lua::WalkDirectoryFiles,
             codegen::lua::WalkDirectoryFolders,
diff --git a/src/scripting/scriptengine_lua.inl b/src/scripting/scriptengine_lua.inl
index 135a11ecb5..1d9ca9c630 100644
--- a/src/scripting/scriptengine_lua.inl
+++ b/src/scripting/scriptengine_lua.inl
@@ -103,12 +103,28 @@ namespace {
     return contents;
 }
 
-// Checks whether the provided file exists.
+// Checks whether the provided directory exists.
 [[codegen::luawrap]] bool directoryExists(std::filesystem::path file) {
     const bool e = std::filesystem::is_directory(absPath(std::move(file)));
     return e;
 }
 
+/**
+ * Creates a directory at the provided path, returns true if directory was newly created
+ * and false otherwise. If `recursive` flag is set to true, it will automatically create
+ * any missing parent folder as well
+ */
+[[codegen::luawrap]] bool createDirectory(std::filesystem::path path,
+    bool recursive = false)
+{
+    if (recursive) {
+        return std::filesystem::create_directories(std::move(path));
+    }
+    else {
+        return std::filesystem::create_directory(std::move(path));
+    }
+}
+
 std::vector<std::filesystem::path> walkCommon(const std::filesystem::path& path,
                                               bool recursive, bool sorted,
                                  std::function<bool(const std::filesystem::path&)> filter)

From dfbe0f45bb9747be999fb7d42ad0a4fdf7f9a530 Mon Sep 17 00:00:00 2001
From: Alexander Bock <alexander.bock@liu.se>
Date: Mon, 20 May 2024 18:58:10 +0200
Subject: [PATCH 448/701] Add all enabled module definitions to all modules to
 enable soft-dependencies (closes #3266)

---
 modules/imgui/src/guiglobebrowsingcomponent.cpp | 10 +++++-----
 support/cmake/module_definition.cmake           | 11 +++++++++++
 2 files changed, 16 insertions(+), 5 deletions(-)

diff --git a/modules/imgui/src/guiglobebrowsingcomponent.cpp b/modules/imgui/src/guiglobebrowsingcomponent.cpp
index 5492fdd6b0..3f37d802d6 100644
--- a/modules/imgui/src/guiglobebrowsingcomponent.cpp
+++ b/modules/imgui/src/guiglobebrowsingcomponent.cpp
@@ -24,10 +24,10 @@
 
 #include <modules/imgui/include/guiglobebrowsingcomponent.h>
 
-#ifdef OPENSPACE_MODULE_SPACE_ENABLED
+#ifdef OPENSPACE_MODULE_GLOBEBROWSING_ENABLED
 #include <modules/globebrowsing/globebrowsingmodule.h>
 #include <modules/globebrowsing/src/renderableglobe.h>
-#endif // OPENSPACE_MODULE_SPACE_ENABLED
+#endif // OPENSPACE_MODULE_GLOBEBROWSING_ENABLED
 #include <modules/imgui/include/imgui_include.h>
 #include <openspace/engine/globals.h>
 #include <openspace/engine/moduleengine.h>
@@ -52,7 +52,7 @@ GuiGlobeBrowsingComponent::GuiGlobeBrowsingComponent()
 {}
 
 void GuiGlobeBrowsingComponent::render() {
-#ifdef OPENSPACE_MODULE_SPACE_ENABLED
+#ifdef OPENSPACE_MODULE_GLOBEBROWSING_ENABLED
     GlobeBrowsingModule* module = global::moduleEngine->module<GlobeBrowsingModule>();
     using UrlInfo = GlobeBrowsingModule::UrlInfo;
     using Capabilities = GlobeBrowsingModule::Capabilities;
@@ -371,9 +371,9 @@ void GuiGlobeBrowsingComponent::render() {
         ImGui::PopID();
     }
     ImGui::Columns(1);
-#else // ^^^ OPENSPACE_MODULE_SPACE_ENABLED ||| !OPENSPACE_MODULE_SPACE_ENABLED vvv
+#else
     ImGui::Text("%s", "OpenSpace compiled without GlobeBrowsing support");
-#endif // OPENSPACE_MODULE_SPACE_ENABLED
+#endif // OPENSPACE_MODULE_GLOBEBROWSING_ENABLED
 }
 
 } // namespace openspace::gui
diff --git a/support/cmake/module_definition.cmake b/support/cmake/module_definition.cmake
index 19d2c726ae..30a2b412d4 100644
--- a/support/cmake/module_definition.cmake
+++ b/support/cmake/module_definition.cmake
@@ -62,6 +62,17 @@ function (create_new_module module_name output_library_name library_mode)
     )
   endif ()
 
+
+  # For all modules, we want to add the defines for all other enabled modules in order to
+  # provide them with the ability to do soft-dependencies by checking the existence of the
+  # `_ENABLED` macro define
+  foreach (inner_val RANGE ${enabled_module_count})
+    list(GET enabled_module_names ${inner_val} inner_name)
+    create_define_name(${inner_name} inner_define_name)
+    target_compile_definitions(${library_name} PRIVATE "${inner_define_name}")
+  endforeach ()
+
+
   # This is an ugly hack as we can't inject a variable into a scope two parents above
   # would love to: set(${module_class_name} "${module_name}Module" PARENT_PARENT_SCOPE)
   # instead

From 5aadbf12464d0c6086b0db48cd2c82f333b32403 Mon Sep 17 00:00:00 2001
From: Gene Payne <payne.gene@gmail.com>
Date: Mon, 20 May 2024 13:55:08 -0600
Subject: [PATCH 449/701] Add example for NavigationState (#3246)

* Add example for NavigationState
* Modify comment messages per code review feedback
* Corrected some details to match examples rules
---
 data/assets/examples/navigationstate.asset | 35 ++++++++++++++++++++++
 1 file changed, 35 insertions(+)
 create mode 100644 data/assets/examples/navigationstate.asset

diff --git a/data/assets/examples/navigationstate.asset b/data/assets/examples/navigationstate.asset
new file mode 100644
index 0000000000..da04d88241
--- /dev/null
+++ b/data/assets/examples/navigationstate.asset
@@ -0,0 +1,35 @@
+-- Basic
+-- Example of an action that uses getNavigationState and setNavigationState
+-- to manipulate the camera view
+
+local FlipUpsideDown = {
+  Identifier = "NavigationState_Example",
+  Name = "Flip View Upside-Down",
+  Command = [[
+    -- Get the current navigation state
+    local currentNavState = openspace.navigation.getNavigationState()
+    -- Create a new navigation state and populate with all original orientation
+    -- values, except for a new Up vector to flip the camera upside-down
+    local newNavState = {
+      Pitch = currentNavState["Pitch"],
+      Anchor = currentNavState["Anchor"],
+      Yaw = currentNavState["Yaw"],
+      Position = currentNavState["Position"],
+      Up = {0.0, 0.0, -1.0}
+    }
+    -- Set the navigation state with the new navigation state variable
+    openspace.navigation.setNavigationState(newNavState) 
+  ]],
+  GUI = {
+    Name = "Basic",
+    Path = "/Examples/NavigationState"
+  }
+}
+
+asset.onInitialize(function()
+  openspace.action.registerAction(FlipUpsideDown)
+end)
+
+asset.onDeinitialize(function()
+  openspace.action.removeAction(FlipUpsideDown)
+end)

From c0cdce87842765c7ee1c7d490f0b75906496d8dc Mon Sep 17 00:00:00 2001
From: Alexander Bock <mail@alexanderbock.eu>
Date: Mon, 20 May 2024 23:19:11 +0200
Subject: [PATCH 450/701] Create correct layer type (closes #3267)

---
 modules/imgui/src/guigibscomponent.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/imgui/src/guigibscomponent.cpp b/modules/imgui/src/guigibscomponent.cpp
index 22ff4ea0d0..7310bc5bf7 100644
--- a/modules/imgui/src/guigibscomponent.cpp
+++ b/modules/imgui/src/guigibscomponent.cpp
@@ -125,7 +125,7 @@ void GuiGIBSComponent::render() {
         std::string layerScript = std::format(
             "{{"
             "    Identifier = '{}',"
-            "    Type = 'TemporalTileLayer',"
+            "    Type = 'TemporalTileProvider',"
             "    Enabled = true,"
             "    Mode = 'Prototyped',"
             "    Prototyped = {{"

From 098bae18b2d0df18a86f82459a4168459b987693 Mon Sep 17 00:00:00 2001
From: Ylva Selling <ylva.selling@gmail.com>
Date: Tue, 21 May 2024 11:22:14 +0200
Subject: [PATCH 451/701] Create a tiny app for writing the documentation jsons
 (#3239)

* Add simple app for writing the documentation (only asset components and lua scripting)

* Update apps/DocsWriter/CMakeLists.txt

Co-authored-by: Emma Broman <emma.broman@liu.se>

* Update apps/DocsWriter/main.cpp

Co-authored-by: Emma Broman <emma.broman@liu.se>

* Update apps/DocsWriter/main.cpp

Co-authored-by: Emma Broman <emma.broman@liu.se>

* Update apps/DocsWriter/main.cpp

Co-authored-by: Emma Broman <emma.broman@liu.se>

* Update apps/DocsWriter/CMakeLists.txt

Co-authored-by: Alexander Bock <alexander.bock@liu.se>

* Update apps/DocsWriter/main.cpp

Co-authored-by: Alexander Bock <alexander.bock@liu.se>

* Update apps/DocsWriter/main.cpp

Co-authored-by: Alexander Bock <alexander.bock@liu.se>

* Update apps/DocsWriter/main.cpp

Co-authored-by: Alexander Bock <alexander.bock@liu.se>

---------

Co-authored-by: Ylva Selling <ylva.selling@liu.se>
Co-authored-by: Emma Broman <emma.broman@liu.se>
Co-authored-by: Alexander Bock <alexander.bock@liu.se>
---
 apps/DocsWriter/CMakeLists.txt                | 53 +++++++++++++
 apps/DocsWriter/include.cmake                 |  1 +
 apps/DocsWriter/main.cpp                      | 75 +++++++++++++++++++
 .../documentation/documentationengine.h       |  2 +-
 modules/webbrowser/DocsWriter.exe.manifest    | 20 +++++
 src/documentation/documentationengine.cpp     | 11 ++-
 6 files changed, 158 insertions(+), 4 deletions(-)
 create mode 100644 apps/DocsWriter/CMakeLists.txt
 create mode 100644 apps/DocsWriter/include.cmake
 create mode 100644 apps/DocsWriter/main.cpp
 create mode 100644 modules/webbrowser/DocsWriter.exe.manifest

diff --git a/apps/DocsWriter/CMakeLists.txt b/apps/DocsWriter/CMakeLists.txt
new file mode 100644
index 0000000000..71ccd08808
--- /dev/null
+++ b/apps/DocsWriter/CMakeLists.txt
@@ -0,0 +1,53 @@
+##########################################################################################
+#                                                                                        #
+# OpenSpace                                                                              #
+#                                                                                        #
+# Copyright (c) 2014-2024                                                                #
+#                                                                                        #
+# Permission is hereby granted, free of charge, to any person obtaining a copy of this   #
+# software and associated documentation files (the "Software"), to deal in the Software  #
+# without restriction, including without limitation the rights to use, copy, modify,     #
+# merge, publish, distribute, sublicense, and/or sell copies of the Software, and to     #
+# permit persons to whom the Software is furnished to do so, subject to the following    #
+# conditions:                                                                            #
+#                                                                                        #
+# The above copyright notice and this permission notice shall be included in all copies  #
+# or substantial portions of the Software.                                               #
+#                                                                                        #
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED,    #
+# INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A          #
+# PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT     #
+# HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF   #
+# CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE   #
+# OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                                          #
+##########################################################################################
+
+include(${PROJECT_SOURCE_DIR}/support/cmake/application_definition.cmake)
+
+create_new_application(DocsWriter
+    main.cpp
+)
+
+target_link_libraries(DocsWriter PRIVATE openspace-core openspace-module-collection)
+
+# Web Browser and Web gui
+# Why not put these in the module's path? Because they do not have access to the
+# target as of July 2017, which is needed.
+if (OPENSPACE_MODULE_WEBBROWSER AND CEF_ROOT)
+  # wanted by CEF
+  set(CMAKE_BUILD_TYPE Debug CACHE STRING "CMAKE_BUILD_TYPE")
+
+  if (WIN32)
+    set(RESOURCE_FILE openspace.rc)
+  endif ()
+
+  # Add the CEF binary distribution's cmake/ directory to the module path and
+  # find CEF to initialize it properly.
+  set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${WEBBROWSER_MODULE_PATH}/cmake")
+  include(webbrowser_helpers)
+
+  set_cef_targets("${CEF_ROOT}" DocsWriter)
+  run_cef_platform_config("${CEF_ROOT}" "${CEF_TARGET}" "${WEBBROWSER_MODULE_PATH}")
+elseif (OPENSPACE_MODULE_WEBBROWSER)
+  message(WARNING "Web configured to be included, but no CEF_ROOT was found, please try configuring CMake again.")
+endif ()
diff --git a/apps/DocsWriter/include.cmake b/apps/DocsWriter/include.cmake
new file mode 100644
index 0000000000..99cad555da
--- /dev/null
+++ b/apps/DocsWriter/include.cmake
@@ -0,0 +1 @@
+set(DEFAULT_APPLICATION OFF)
diff --git a/apps/DocsWriter/main.cpp b/apps/DocsWriter/main.cpp
new file mode 100644
index 0000000000..d285fd7140
--- /dev/null
+++ b/apps/DocsWriter/main.cpp
@@ -0,0 +1,75 @@
+/*****************************************************************************************
+ *                                                                                       *
+ * OpenSpace                                                                             *
+ *                                                                                       *
+ * Copyright (c) 2014-2024                                                               *
+ *                                                                                       *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
+ * software and associated documentation files (the "Software"), to deal in the Software *
+ * without restriction, including without limitation the rights to use, copy, modify,    *
+ * merge, publish, distribute, sublicense, and/or sell copies of the Software, and to    *
+ * permit persons to whom the Software is furnished to do so, subject to the following   *
+ * conditions:                                                                           *
+ *                                                                                       *
+ * The above copyright notice and this permission notice shall be included in all copies *
+ * or substantial portions of the Software.                                              *
+ *                                                                                       *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED,   *
+ * INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A         *
+ * PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT    *
+ * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF  *
+ * CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE  *
+ * OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                                         *
+ ****************************************************************************************/
+
+#include <openspace/documentation/documentationengine.h>
+#include <openspace/engine/configuration.h>
+#include <openspace/engine/globals.h>
+#include <openspace/engine/openspaceengine.h>
+#include <openspace/engine/settings.h>
+#include <ghoul/filesystem/filesystem.h>
+#include <ghoul/ghoul.h>
+#include <ghoul/logging/logmanager.h>
+
+int main(int argc, char** argv) {
+    using namespace openspace;
+
+    ghoul::logging::LogManager::initialize(
+        ghoul::logging::LogLevel::Debug,
+        ghoul::logging::LogManager::ImmediateFlush::Yes
+    );
+
+    ghoul::initialize();
+    global::create();
+
+    // In order to initialize the engine, we need to specify the tokens
+    // We start by registering the path of the executable,
+    // to make it possible to find other files in the same directory
+    FileSys.registerPathToken(
+        "${BIN}",
+        std::filesystem::path(argv[0]).parent_path(),
+        ghoul::filesystem::FileSystem::Override::Yes
+    );
+
+    std::filesystem::path configFile = findConfiguration();
+
+    // Register the base path as the directory where the configuration file lives
+    std::filesystem::path base = configFile.parent_path();
+    FileSys.registerPathToken("${BASE}", base);
+
+    *global::configuration = loadConfigurationFromFile(
+        configFile.string(),
+        "",
+        glm::ivec2(0)
+    );
+    openspace::global::openSpaceEngine->registerPathTokens();
+
+    // Now that we have the tokens we can initialize the engine
+    global::openSpaceEngine->initialize();
+
+    // Print out the documentation to the documentation folder
+    // @TODO (ylvse, 2024-05-02) change this directory when integrating with jenkins?
+    DocEng.writeJsonDocumentation();
+
+    return 0;
+};
diff --git a/include/openspace/documentation/documentationengine.h b/include/openspace/documentation/documentationengine.h
index cf9dbeff45..8d79e46985 100644
--- a/include/openspace/documentation/documentationengine.h
+++ b/include/openspace/documentation/documentationengine.h
@@ -88,7 +88,7 @@ public:
     static DocumentationEngine& ref();
 
     void writeJavascriptDocumentation() const;
-    void writeJsonDocumentation() const;
+    void writeJsonDocumentation(std::string folderName = "${DOCUMENTATION}") const;
 
     nlohmann::json generateScriptEngineJson() const;
     nlohmann::json generateFactoryManagerJson() const;
diff --git a/modules/webbrowser/DocsWriter.exe.manifest b/modules/webbrowser/DocsWriter.exe.manifest
new file mode 100644
index 0000000000..d36f084b65
--- /dev/null
+++ b/modules/webbrowser/DocsWriter.exe.manifest
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0">
+
+  <!--The compatibility section will be merged from build/win/compatibility.manifest -->
+
+  <dependency>
+    <dependentAssembly>
+      <assemblyIdentity type="Win32" name="Microsoft.Windows.Common-Controls" version="6.0.0.0" processorArchitecture="*" publicKeyToken="6595b64144ccf1df" language="*"></assemblyIdentity>
+    </dependentAssembly>
+  </dependency>
+
+  <trustInfo xmlns="urn:schemas-microsoft-com:asm.v3">
+    <security>
+      <requestedPrivileges>
+        <requestedExecutionLevel level="asInvoker" />
+      </requestedPrivileges>
+    </security>
+  </trustInfo>
+
+</assembly>
diff --git a/src/documentation/documentationengine.cpp b/src/documentation/documentationengine.cpp
index 904582cfa6..51c4bfcba5 100644
--- a/src/documentation/documentationengine.cpp
+++ b/src/documentation/documentationengine.cpp
@@ -646,17 +646,22 @@ void DocumentationEngine::writeJavascriptDocumentation() const {
     out.close();
 }
 
-void DocumentationEngine::writeJsonDocumentation() const {
+void DocumentationEngine::writeJsonDocumentation(std::string folderName) const {
     nlohmann::json factory = generateFactoryManagerJson();
     nlohmann::json scripting = generateScriptEngineJson();
 
     // Write two json files for the static docs page - asset components and scripting api
-    std::ofstream out = std::ofstream(absPath("${DOCUMENTATION}/assetComponents.json"));
+    std::ofstream out = std::ofstream(absPath(
+        std::format("{}/assetComponents.json", folderName)
+    ));
     if (out) {
         out << factory.dump();
     }
     out.close();
-    out.open(absPath("${DOCUMENTATION}/scriptingApi.json"));
+
+    out.open(absPath(
+        std::format("{}/scriptingApi.json", folderName)
+    ));
     if (out) {
         out << scripting.dump();
     }

From 462cbe9180d12d943745b7473c8584cb8e892c68 Mon Sep 17 00:00:00 2001
From: Ylva Selling <ylva.selling@gmail.com>
Date: Tue, 21 May 2024 11:23:04 +0200
Subject: [PATCH 452/701] Add example to `RenderableCartesianAxes`  (#3206)

* Add example to

* Update data/assets/examples/renderable/renderablecartesianaxes/cartesianaxes.asset

Co-authored-by: Alexander Bock <alexander.bock@liu.se>

* Update data/assets/examples/renderable/renderablecartesianaxes/cartesianaxes.asset

Co-authored-by: Alexander Bock <alexander.bock@liu.se>

* Update data/assets/examples/renderable/renderablecartesianaxes/cartesianaxes.asset

Co-authored-by: Alexander Bock <alexander.bock@liu.se>

* Update data/assets/examples/renderable/renderablecartesianaxes/cartesianaxes.asset

Co-authored-by: Alexander Bock <alexander.bock@liu.se>

* Update data/assets/examples/renderable/renderablecartesianaxes/cartesianaxes.asset

Co-authored-by: Alexander Bock <alexander.bock@liu.se>

* Update data/assets/examples/renderable/renderablecartesianaxes/cartesianaxes.asset

Co-authored-by: Alexander Bock <alexander.bock@liu.se>

* Update description to match new parent

* Update GUI name

---------

Co-authored-by: Ylva Selling <ylva.selling@liu.se>
Co-authored-by: Alexander Bock <alexander.bock@liu.se>
---
 .../cartesianaxes.asset                       | 28 +++++++++++++++++++
 1 file changed, 28 insertions(+)
 create mode 100644 data/assets/examples/renderable/renderablecartesianaxes/cartesianaxes.asset

diff --git a/data/assets/examples/renderable/renderablecartesianaxes/cartesianaxes.asset b/data/assets/examples/renderable/renderablecartesianaxes/cartesianaxes.asset
new file mode 100644
index 0000000000..c4207db65a
--- /dev/null
+++ b/data/assets/examples/renderable/renderablecartesianaxes/cartesianaxes.asset
@@ -0,0 +1,28 @@
+-- Basic
+-- This asset creates a SceneGraphNode that only displays coordinate axes. The 
+-- parent is not set which defaults to placing the axes at the center the Sun.
+
+local Node = {
+  Identifier = "RenderableCartesianAxes_Example",
+  Transform = {
+    Scale = {
+      Type = "StaticScale",
+      Scale = 30000000
+    }
+  },
+  Renderable = {
+    Type = "RenderableCartesianAxes"
+  },    
+  GUI = {
+    Name = "Cartesian Axes Basic",
+    Path = "/Examples"
+  }
+}
+
+asset.onInitialize(function()
+  openspace.addSceneGraphNode(Node)
+end)
+
+asset.onDeinitialize(function()
+  openspace.removeSceneGraphNode(Node)
+end)

From 79f5192a2ce9245fde425da0ea00440c5c3a1731 Mon Sep 17 00:00:00 2001
From: Ylva Selling <ylva.selling@gmail.com>
Date: Tue, 21 May 2024 11:23:26 +0200
Subject: [PATCH 453/701] Fix issue of sorting by placing arguments in array
 (#3238)

Co-authored-by: Ylva Selling <ylva.selling@liu.se>
---
 modules/gaia/scripts/filtering.lua            |  4 +--
 .../globebrowsing/scripts/layer_support.lua   | 16 +++++-----
 .../globebrowsing/scripts/node_support.lua    |  4 +--
 modules/space/scripts/spice.lua               |  2 +-
 scripts/core_scripts.lua                      | 32 +++++++++----------
 src/scripting/scriptengine.cpp                |  8 ++---
 6 files changed, 33 insertions(+), 33 deletions(-)

diff --git a/modules/gaia/scripts/filtering.lua b/modules/gaia/scripts/filtering.lua
index a1f7adea56..6179d3acd6 100644
--- a/modules/gaia/scripts/filtering.lua
+++ b/modules/gaia/scripts/filtering.lua
@@ -1,7 +1,7 @@
 openspace.gaia.documentation = {
     {
         Name = "addClippingBox",
-        Arguments = { name = "String", size = "vec3", position = "vec3" },
+        Arguments = {{ "name", "String" },{ "size", "vec3" }, { "position", "vec3" }},
         Documentation = "Creates a clipping box for the Gaia renderable in the first argument"
     },
     {
@@ -11,7 +11,7 @@ openspace.gaia.documentation = {
     },
     {
         Name = "addClippingSphere",
-        Arguments = { name = "String", radius = "Number" },
+        Arguments = {{ "name", "String" }, { "radius", "Number" }},
         Documentation = "Creates a clipping sphere for the Gaia renderable in the first argument"
     }
 }
diff --git a/modules/globebrowsing/scripts/layer_support.lua b/modules/globebrowsing/scripts/layer_support.lua
index 3622156feb..1e3eb45961 100644
--- a/modules/globebrowsing/scripts/layer_support.lua
+++ b/modules/globebrowsing/scripts/layer_support.lua
@@ -1,7 +1,7 @@
 openspace.globebrowsing.documentation = {
     {
         Name = "createTemporalGibsGdalXml",
-        Arguments = { layerName = "String", resolution = "String", format = "String" },
+        Arguments = {{ "layerName", "String" }, { "resolution", "String" }, { "format", "String" }},
         Documentation = [[
             Creates an XML configuration for a temporal GIBS dataset to be used in
             a TemporalTileprovider
@@ -9,7 +9,7 @@ openspace.globebrowsing.documentation = {
     },
     {
         Name = "createGibsGdalXml",
-        Arguments = { layerName = "String", date = "String", resolution = "String", format = "String" },
+        Arguments = {{ "layerName", "String" }, { "date", "String" }, { "resolution",  "String" }, { "format", "String" }},
         Documentation =
             "Creates an XML configuration for a GIBS dataset." ..
             "Arguments are: layerName, date, resolution, format." ..
@@ -32,7 +32,7 @@ openspace.globebrowsing.documentation = {
     },
     {
         Name = "addGibsLayer",
-        Arguments = { layer = "String", resolution = "String", format = "String", startDate = "String", endDate = "String" },
+        Arguments = {{ "layer", "String" }, { "resolution", "String" }, { "format", "String" }, { "startDate", "String" }, { "endDate", "String" }},
         Documentation = "Adds a new layer from NASA GIBS to the Earth globe. Arguments " ..
             "are: imagery layer name, imagery resolution, start date, end date, format. " ..
              "For all specifications, see " ..
@@ -42,7 +42,7 @@ openspace.globebrowsing.documentation = {
     },
     {
         Name = "parseInfoFile",
-        Arguments = { file = "String" },
+        Arguments = {{ "file", "String" }},
         Documentation =
             "Parses the passed info file and return the table with the information " ..
             "provided in the info file. The return table contains the optional keys: " ..
@@ -53,7 +53,7 @@ openspace.globebrowsing.documentation = {
     },
     {
         Name = "addBlendingLayersFromDirectory",
-        Arguments = { directory = "String", nodeName = "String" },
+        Arguments = {{ "directory", "String" }, { "nodeName", "String" }},
         Documentation =
             "Retrieves all info files recursively in the directory passed as the first " ..
             "argument to this function. The color and height tables retrieved from these " ..
@@ -63,7 +63,7 @@ openspace.globebrowsing.documentation = {
     },
     {
         Name = "addFocusNodesFromDirectory",
-        Arguments = { directory = "String", nodeName = "String" },
+        Arguments = {{ "directory", "String" }, { "nodeName", "String" }},
         Documentation =
             "Retrieves all info files recursively in the directory passed as the first " ..
             "argument to this function. The name and location retrieved from these info " ..
@@ -73,7 +73,7 @@ openspace.globebrowsing.documentation = {
     },
     {
         Name = "addFocusNodeFromLatLong",
-        Arguments = { name = "String", globeIdentifier = "String", latitude = "Number", longitude = "Number", altitude = "Number" },
+        Arguments = {{ "name", "String" }, { "globeIdentifier", "String" }, { "latitude", "Number" }, { "longitude", "Number" }, { "altitude", "Number" }},
         Documentation =
             "Creates a new SceneGraphNode that can be used as focus node. " ..
             "Usage: openspace.globebrowsing.addFocusNodeFromLatLong(" ..
@@ -81,7 +81,7 @@ openspace.globebrowsing.documentation = {
     },
     {
         Name = "loadWMSServersFromFile",
-        Arguments = { filePath = "String" },
+        Arguments = {{ "filePath", "String" }},
         Documentation =
             "Loads all WMS servers from the provided file and passes them to the " ..
             "'openspace.globebrowsing.loadWMSCapabilities' file."
diff --git a/modules/globebrowsing/scripts/node_support.lua b/modules/globebrowsing/scripts/node_support.lua
index 35f275b7f8..d0154a160f 100644
--- a/modules/globebrowsing/scripts/node_support.lua
+++ b/modules/globebrowsing/scripts/node_support.lua
@@ -1,7 +1,7 @@
 openspace.globebrowsing.documentation = {
   {
     Name = "setNodePosition",
-    Arguments = { nodeIdentifer = "String", globeIdentifier = "String", latitude = "Number", longitude = "Number", altitude = "Number" },
+    Arguments = {{ "nodeIdentifer", "String" }, { "globeIdentifier", "String" }, { "latitude", "Number" }, { "longitude", "Number" }, { "altitude", "Number" }},
     Documentation =
         "Sets the position of a SceneGraphNode that has GlobeTranslation/GlobeRotations. " ..
         "Usage: openspace.globebrowsing.setNodePosition(" ..
@@ -9,7 +9,7 @@ openspace.globebrowsing.documentation = {
   },
   {
     Name = "setNodePositionFromCamera",
-    Arguments = { nodeIdentifer = "String", useAltitude = "Boolean" },
+    Arguments = {{ "nodeIdentifer", "String" }, { "useAltitude", "Boolean" }},
     Documentation =
         "Sets the position of a SceneGraphNode that has GlobeTranslation/GlobeRotations" ..
         " to match the camera. Only uses camera position not rotation. If useAltitude" ..
diff --git a/modules/space/scripts/spice.lua b/modules/space/scripts/spice.lua
index 0c9dc9f851..d0d53e918f 100644
--- a/modules/space/scripts/spice.lua
+++ b/modules/space/scripts/spice.lua
@@ -1,7 +1,7 @@
 openspace.space.documentation = {
   {
     Name = "tleToSpiceTranslation",
-    Arguments = { tlePath = "String" },
+    Arguments = {{ "tlePath", "String" }},
     Return = "{ Translation, SpiceKernel }",
     Documentation = [[
         Takes the provided TLE file, converts it into a SPICE kernel and returns a
diff --git a/scripts/core_scripts.lua b/scripts/core_scripts.lua
index 602b50e5a5..91884ac3d0 100644
--- a/scripts/core_scripts.lua
+++ b/scripts/core_scripts.lua
@@ -1,20 +1,20 @@
 openspace.documentation = {
     {
         Name = "markInterestingNodes",
-        Arguments = { sceneGraphNodes = "String[]" },
+        Arguments = {{ "sceneGraphNodes", "String[]" }},
         Documentation = "This function marks the scene graph nodes identified by name " ..
         "as interesting, which will provide shortcut access to focus buttons and " ..
         "featured properties"
     },
     {
         Name = "markInterestingTimes",
-        Arguments = { times = "Table[]" },
+        Arguments = {{ "times", "Table[]" }},
         Documentation = "This function marks interesting times for the current scene, " ..
         "which will create shortcuts for a quick access"
     },
     {
         Name = "removeInterestingNodes",
-        Arguments = { sceneGraphNodes = "String[]" },
+        Arguments = {{ "sceneGraphNodes", "String[]" }},
         Documentation = "This function removes unmarks the scene graph nodes " ..
         "identified by name as interesting, thus removing the shortcuts from the " ..
         "features properties list"
@@ -36,36 +36,36 @@ openspace.documentation = {
     },
     {
         Name = "rebindKey",
-        Arguments = { oldKey = "String", newKey = "String" },
+        Arguments = {{ "oldKey", "String" }, { "newKey", "String" }},
         Documentation = "Rebinds all scripts from the old key (first argument) to the " ..
         "new key (second argument)"
     },
     {
         Name = "appendToListProperty",
-        Arguments = { identifier = "String", value = "any" },
+        Arguments = {{ "identifier","String" }, { "value", "any" }},
         Documentation = "Add a value to the list property with the given identifier. " ..
         "The value can be any type, as long as it is the correct type for the given " ..
         "property. Note that a number will be converted to a string automatically."
     },
     {
         Name = "addToPropertyValue",
-        Arguments = { identifier = "String", value = "String | Number" },
+        Arguments = {{ "identifier", "String" } , { "value", "String | Number" }},
         Documentation = "Add a value to the property with the given identifier. " ..
         "Works on both numerical and string properties, where adding to a string " ..
         "property means appending the given string value to the existing string value."
     },
     {
         Name = "invertBooleanProperty",
-        Arguments = { identifier = "String" },
+        Arguments = {{ "identifier", "String" }},
         Documentation = "Inverts the value of a boolean property with the given "..
         "identifier"
     },
     {
         Name = "fadeIn",
         Arguments = {
-            identifier = "String",
-            fadeTime = "Number?",
-            endScript = "String?"
+            { "identifier", "String" },
+            { "fadeTime", "Number?" },
+            { "endScript", "String?" }
         },
         Documentation = "Fades in the node(s) with the given identifier over the given " ..
         "time in seconds. The identifier can contain a tag and/or a wildcard to target " ..
@@ -77,9 +77,9 @@ openspace.documentation = {
     {
         Name = "fadeOut",
         Arguments = {
-            identifier = "String",
-            fadeTime = "Number?",
-            endScript = "String?"
+            { "identifier", "String" },
+            { "fadeTime", "Number?" },
+            { "endScript", "String?" }
         },
         Documentation = "Fades out the node(s) with the given identifier over the given " ..
         "time in seconds. The identifier can contain a tag and/or a wildcard to target " ..
@@ -91,9 +91,9 @@ openspace.documentation = {
     {
         Name = "toggleFade",
         Arguments = {
-            identifier = "String",
-            fadeTime = "Number?",
-            endScript = "String?"
+            { "identifier", "String" },
+            { "fadeTime", "Number?" },
+            { "endScript", "String?" }
         },
         Documentation = [[Toggles the fade state of the node(s) with the given identifier over the given
           time in seconds. The identifier can contain a tag and/or a wildcard to target
diff --git a/src/scripting/scriptengine.cpp b/src/scripting/scriptengine.cpp
index a7e2e84306..fa90a3eaa3 100644
--- a/src/scripting/scriptengine.cpp
+++ b/src/scripting/scriptengine.cpp
@@ -47,7 +47,7 @@ namespace {
 
     struct [[codegen::Dictionary(Documentation)]] Parameters {
         std::string name;
-        std::map<std::string, std::string> arguments;
+        std::vector<std::vector<std::string>> arguments;
         std::optional<std::string> returnValue [[codegen::key("Return")]];
         std::optional<std::string> documentation;
     };
@@ -347,11 +347,11 @@ void ScriptEngine::addLibraryFunctions(lua_State* state, LuaLibrary& library,
 
                 LuaLibrary::Function func;
                 func.name = p.name;
-                for (const std::pair<const std::string, std::string>& pair : p.arguments)
+                for (const std::vector<std::string>& pair : p.arguments)
                 {
                     LuaLibrary::Function::Argument arg;
-                    arg.name = pair.first;
-                    arg.type = pair.second;
+                    arg.name = pair[0];
+                    arg.type = pair[1];
                     func.arguments.push_back(arg);
                 }
                 func.returnType = p.returnValue.value_or(func.returnType);

From 2dd1b2f46fb664764c332a7c3924af93c5e3e561 Mon Sep 17 00:00:00 2001
From: Ylva Selling <ylva.selling@liu.se>
Date: Wed, 22 May 2024 09:46:57 +0200
Subject: [PATCH 454/701] Remove default argument for write documentation
 function in the DocumentationEngine

Should have been done in PR but was missed
---
 include/openspace/documentation/documentationengine.h |  2 +-
 src/documentation/documentationengine.cpp             | 10 +++-------
 2 files changed, 4 insertions(+), 8 deletions(-)

diff --git a/include/openspace/documentation/documentationengine.h b/include/openspace/documentation/documentationengine.h
index 8d79e46985..cf9dbeff45 100644
--- a/include/openspace/documentation/documentationengine.h
+++ b/include/openspace/documentation/documentationengine.h
@@ -88,7 +88,7 @@ public:
     static DocumentationEngine& ref();
 
     void writeJavascriptDocumentation() const;
-    void writeJsonDocumentation(std::string folderName = "${DOCUMENTATION}") const;
+    void writeJsonDocumentation() const;
 
     nlohmann::json generateScriptEngineJson() const;
     nlohmann::json generateFactoryManagerJson() const;
diff --git a/src/documentation/documentationengine.cpp b/src/documentation/documentationengine.cpp
index 51c4bfcba5..6cb205ed9e 100644
--- a/src/documentation/documentationengine.cpp
+++ b/src/documentation/documentationengine.cpp
@@ -646,22 +646,18 @@ void DocumentationEngine::writeJavascriptDocumentation() const {
     out.close();
 }
 
-void DocumentationEngine::writeJsonDocumentation(std::string folderName) const {
+void DocumentationEngine::writeJsonDocumentation() const {
     nlohmann::json factory = generateFactoryManagerJson();
     nlohmann::json scripting = generateScriptEngineJson();
 
     // Write two json files for the static docs page - asset components and scripting api
-    std::ofstream out = std::ofstream(absPath(
-        std::format("{}/assetComponents.json", folderName)
-    ));
+    std::ofstream out = std::ofstream(absPath("${DOCUMENTATION}/assetComponents.json"));
     if (out) {
         out << factory.dump();
     }
     out.close();
 
-    out.open(absPath(
-        std::format("{}/scriptingApi.json", folderName)
-    ));
+    out.open(absPath("${DOCUMENTATION}/scriptingApi.json"));
     if (out) {
         out << scripting.dump();
     }

From 9828b96930387e45fe766194420bb500d23e9132 Mon Sep 17 00:00:00 2001
From: Alexander Bock <alexander.bock@liu.se>
Date: Wed, 22 May 2024 17:00:46 +0200
Subject: [PATCH 455/701] Add additional tags to minor moons, trails, and
 labels of Jupiter and Saturn (closes #3272)

---
 .../planets/jupiter/minor/ananke_group.asset  | 180 +++++++-
 .../planets/jupiter/minor/carme_group.asset   | 252 +++++++++--
 .../planets/jupiter/minor/carpo_group.asset   |  34 +-
 .../planets/jupiter/minor/himalia_group.asset |  81 +++-
 .../planets/jupiter/minor/inner_group.asset   |  36 +-
 .../planets/jupiter/minor/other_groups.asset  |  27 +-
 .../jupiter/minor/pasiphae_group.asset        | 207 ++++++++-
 .../jupiter/minor/themisto_group.asset        |   9 +-
 .../planets/saturn/minor/gallic_group.asset   |  36 +-
 .../planets/saturn/minor/inuit_group.asset    |  72 ++-
 .../planets/saturn/minor/norse_group.asset    | 423 ++++++++++++++++--
 .../planets/saturn/minor/other_group.asset    |  81 +++-
 .../planets/saturn/minor/shepherd_group.asset |  63 ++-
 13 files changed, 1334 insertions(+), 167 deletions(-)

diff --git a/data/assets/scene/solarsystem/planets/jupiter/minor/ananke_group.asset b/data/assets/scene/solarsystem/planets/jupiter/minor/ananke_group.asset
index f010823a60..e99f1555b4 100644
--- a/data/assets/scene/solarsystem/planets/jupiter/minor/ananke_group.asset
+++ b/data/assets/scene/solarsystem/planets/jupiter/minor/ananke_group.asset
@@ -53,6 +53,7 @@ local S2010J2Trail = {
     "moonTrail_solarSystem",
     "moonTrail_giants",
     "moonTrail_jupiter",
+    "moonTrail_ananke",
     "moonTrail_minor",
     "moonTrail_minor_jupiter"
   },
@@ -79,7 +80,13 @@ local S2010J2Label = {
     FadeDistances = { 1.5, 90.0 },
     FadeWidths = { 0.5, 90.0 }
   },
-  Tag = { "solarsystem_labels", "moon_labels", "minor_moon_labels" },
+  Tag = {
+    "solarsystem_labels",
+    "moon_labels",
+    "minor_moon_labels",
+    "minor_moon_labels_jupiter",
+    "minor_moon_labels_ananke"
+  },
   GUI = {
     Name = "S/2010 J 2 Label",
     Path = "/Solar System/Planets/Jupiter/Minor Moons/Ananke Group/S2010J2",
@@ -135,6 +142,7 @@ local ThelxinoeTrail = {
     "moonTrail_solarSystem",
     "moonTrail_giants",
     "moonTrail_jupiter",
+    "moonTrail_ananke",
     "moonTrail_minor",
     "moonTrail_minor_jupiter"
   },
@@ -161,7 +169,13 @@ local ThelxinoeLabel = {
     FadeDistances = { 1.5, 90.0 },
     FadeWidths = { 0.5, 90.0 }
   },
-  Tag = { "solarsystem_labels", "moon_labels", "minor_moon_labels" },
+  Tag = {
+    "solarsystem_labels",
+    "moon_labels",
+    "minor_moon_labels",
+    "minor_moon_labels_jupiter",
+    "minor_moon_labels_ananke"
+  },
   GUI = {
     Name = "Thelxinoe Label",
     Path = "/Solar System/Planets/Jupiter/Minor Moons/Ananke Group/Thelxinoe",
@@ -217,6 +231,7 @@ local EuantheTrail = {
     "moonTrail_solarSystem",
     "moonTrail_giants",
     "moonTrail_jupiter",
+    "moonTrail_ananke",
     "moonTrail_minor",
     "moonTrail_minor_jupiter"
   },
@@ -243,7 +258,13 @@ local EuantheLabel = {
     FadeDistances = { 1.5, 90.0 },
     FadeWidths = { 0.5, 90.0 }
   },
-  Tag = { "solarsystem_labels", "moon_labels", "minor_moon_labels" },
+  Tag = {
+    "solarsystem_labels",
+    "moon_labels",
+    "minor_moon_labels",
+    "minor_moon_labels_jupiter",
+    "minor_moon_labels_ananke"
+  },
   GUI = {
     Name = "Euanthe Label",
     Path = "/Solar System/Planets/Jupiter/Minor Moons/Ananke Group/Euanthe",
@@ -299,6 +320,7 @@ local IocasteTrail = {
     "moonTrail_solarSystem",
     "moonTrail_giants",
     "moonTrail_jupiter",
+    "moonTrail_ananke",
     "moonTrail_minor",
     "moonTrail_minor_jupiter"
   },
@@ -325,7 +347,13 @@ local IocasteLabel = {
     FadeDistances = { 1.5, 90.0 },
     FadeWidths = { 0.5, 90.0 }
   },
-  Tag = { "solarsystem_labels", "moon_labels", "minor_moon_labels" },
+  Tag = {
+    "solarsystem_labels",
+    "moon_labels",
+    "minor_moon_labels",
+    "minor_moon_labels_jupiter",
+    "minor_moon_labels_ananke"
+  },
   GUI = {
     Name = "Iocaste Label",
     Path = "/Solar System/Planets/Jupiter/Minor Moons/Ananke Group/Iocaste",
@@ -381,6 +409,7 @@ local S2003J16Trail = {
     "moonTrail_solarSystem",
     "moonTrail_giants",
     "moonTrail_jupiter",
+    "moonTrail_ananke",
     "moonTrail_minor",
     "moonTrail_minor_jupiter"
   },
@@ -407,7 +436,13 @@ local S2003J16Label = {
     FadeDistances = { 1.5, 90.0 },
     FadeWidths = { 0.5, 90.0 }
   },
-  Tag = { "solarsystem_labels", "moon_labels", "minor_moon_labels" },
+  Tag = {
+    "solarsystem_labels",
+    "moon_labels",
+    "minor_moon_labels",
+    "minor_moon_labels_jupiter",
+    "minor_moon_labels_ananke"
+  },
   GUI = {
     Name = "S/2003 J 16 Label",
     Path = "/Solar System/Planets/Jupiter/Minor Moons/Ananke Group/S2003J16",
@@ -463,6 +498,7 @@ local PraxidikeTrail = {
     "moonTrail_solarSystem",
     "moonTrail_giants",
     "moonTrail_jupiter",
+    "moonTrail_ananke",
     "moonTrail_minor",
     "moonTrail_minor_jupiter"
   },
@@ -489,7 +525,13 @@ local PraxidikeLabel = {
     FadeDistances = { 1.5, 90.0 },
     FadeWidths = { 0.5, 90.0 }
   },
-  Tag = { "solarsystem_labels", "moon_labels", "minor_moon_labels" },
+  Tag = {
+    "solarsystem_labels",
+    "moon_labels",
+    "minor_moon_labels",
+    "minor_moon_labels_jupiter",
+    "minor_moon_labels_ananke"
+  },
   GUI = {
     Name = "Praxidike Label",
     Path = "/Solar System/Planets/Jupiter/Minor Moons/Ananke Group/Praxidike",
@@ -545,6 +587,7 @@ local HarpalykeTrail = {
     "moonTrail_solarSystem",
     "moonTrail_giants",
     "moonTrail_jupiter",
+    "moonTrail_ananke",
     "moonTrail_minor",
     "moonTrail_minor_jupiter"
   },
@@ -571,7 +614,13 @@ local HarpalykeLabel = {
     FadeDistances = { 1.5, 90.0 },
     FadeWidths = { 0.5, 90.0 }
   },
-  Tag = { "solarsystem_labels", "moon_labels", "minor_moon_labels" },
+  Tag = {
+    "solarsystem_labels",
+    "moon_labels",
+    "minor_moon_labels",
+    "minor_moon_labels_jupiter",
+    "minor_moon_labels_ananke"
+  },
   GUI = {
     Name = "Harpalyke Label",
     Path = "/Solar System/Planets/Jupiter/Minor Moons/Ananke Group/Harpalyke",
@@ -627,6 +676,7 @@ local MnemeTrail = {
     "moonTrail_solarSystem",
     "moonTrail_giants",
     "moonTrail_jupiter",
+    "moonTrail_ananke",
     "moonTrail_minor",
     "moonTrail_minor_jupiter"
   },
@@ -653,7 +703,13 @@ local MnemeLabel = {
     FadeDistances = { 1.5, 90.0 },
     FadeWidths = { 0.5, 90.0 }
   },
-  Tag = { "solarsystem_labels", "moon_labels", "minor_moon_labels" },
+  Tag = {
+    "solarsystem_labels",
+    "moon_labels",
+    "minor_moon_labels",
+    "minor_moon_labels_jupiter",
+    "minor_moon_labels_ananke"
+  },
   GUI = {
     Name = "Mneme Label",
     Path = "/Solar System/Planets/Jupiter/Minor Moons/Ananke Group/Mneme",
@@ -709,6 +765,7 @@ local HermippeTrail = {
     "moonTrail_solarSystem",
     "moonTrail_giants",
     "moonTrail_jupiter",
+    "moonTrail_ananke",
     "moonTrail_minor",
     "moonTrail_minor_jupiter"
   },
@@ -735,7 +792,13 @@ local HermippeLabel = {
     FadeDistances = { 1.5, 90.0 },
     FadeWidths = { 0.5, 90.0 }
   },
-  Tag = { "solarsystem_labels", "moon_labels", "minor_moon_labels" },
+  Tag = {
+    "solarsystem_labels",
+    "moon_labels",
+    "minor_moon_labels",
+    "minor_moon_labels_jupiter",
+    "minor_moon_labels_ananke"
+  },
   GUI = {
     Name = "Hermippe Label",
     Path = "/Solar System/Planets/Jupiter/Minor Moons/Ananke Group/Hermippe",
@@ -791,6 +854,7 @@ local ThyoneTrail = {
     "moonTrail_solarSystem",
     "moonTrail_giants",
     "moonTrail_jupiter",
+    "moonTrail_ananke",
     "moonTrail_minor",
     "moonTrail_minor_jupiter"
   },
@@ -817,7 +881,13 @@ local ThyoneLabel = {
     FadeDistances = { 1.5, 90.0 },
     FadeWidths = { 0.5, 90.0 }
   },
-  Tag = { "solarsystem_labels", "moon_labels", "minor_moon_labels" },
+  Tag = {
+    "solarsystem_labels",
+    "moon_labels",
+    "minor_moon_labels",
+    "minor_moon_labels_jupiter",
+    "minor_moon_labels_ananke"
+  },
   GUI = {
     Name = "Thyone Label",
     Path = "/Solar System/Planets/Jupiter/Minor Moons/Ananke Group/Thyone",
@@ -873,6 +943,7 @@ local AnankeTrail = {
     "moonTrail_solarSystem",
     "moonTrail_giants",
     "moonTrail_jupiter",
+    "moonTrail_ananke",
     "moonTrail_minor",
     "moonTrail_minor_jupiter"
   },
@@ -899,7 +970,13 @@ local AnankeLabel = {
     FadeDistances = { 1.5, 90.0 },
     FadeWidths = { 0.5, 90.0 }
   },
-  Tag = { "solarsystem_labels", "moon_labels", "minor_moon_labels" },
+  Tag = {
+    "solarsystem_labels",
+    "moon_labels",
+    "minor_moon_labels",
+    "minor_moon_labels_jupiter",
+    "minor_moon_labels_ananke"
+  },
   GUI = {
     Name = "Ananke Label",
     Path = "/Solar System/Planets/Jupiter/Minor Moons/Ananke Group/Ananke",
@@ -955,6 +1032,7 @@ local S2021J1Trail = {
     "moonTrail_solarSystem",
     "moonTrail_giants",
     "moonTrail_jupiter",
+    "moonTrail_ananke",
     "moonTrail_minor",
     "moonTrail_minor_jupiter"
   },
@@ -981,7 +1059,13 @@ local S2021J1Label = {
     FadeDistances = { 1.5, 90.0 },
     FadeWidths = { 0.5, 90.0 }
   },
-  Tag = { "solarsystem_labels", "moon_labels", "minor_moon_labels" },
+  Tag = {
+    "solarsystem_labels",
+    "moon_labels",
+    "minor_moon_labels",
+    "minor_moon_labels_jupiter",
+    "minor_moon_labels_ananke"
+  },
   GUI = {
     Name = "S/2021 J 1 Label",
     Path = "/Solar System/Planets/Jupiter/Minor Moons/Ananke Group/S2021J1",
@@ -1037,6 +1121,7 @@ local S2021J2Trail = {
     "moonTrail_solarSystem",
     "moonTrail_giants",
     "moonTrail_jupiter",
+    "moonTrail_ananke",
     "moonTrail_minor",
     "moonTrail_minor_jupiter"
   },
@@ -1063,7 +1148,13 @@ local S2021J2Label = {
     FadeDistances = { 1.5, 90.0 },
     FadeWidths = { 0.5, 90.0 }
   },
-  Tag = { "solarsystem_labels", "moon_labels", "minor_moon_labels" },
+  Tag = {
+    "solarsystem_labels",
+    "moon_labels",
+    "minor_moon_labels",
+    "minor_moon_labels_jupiter",
+    "minor_moon_labels_ananke"
+  },
   GUI = {
     Name = "S/2021 J 2 Label",
     Path = "/Solar System/Planets/Jupiter/Minor Moons/Ananke Group/S2021J2",
@@ -1119,6 +1210,7 @@ local S2021J3Trail = {
     "moonTrail_solarSystem",
     "moonTrail_giants",
     "moonTrail_jupiter",
+    "moonTrail_ananke",
     "moonTrail_minor",
     "moonTrail_minor_jupiter"
   },
@@ -1145,7 +1237,13 @@ local S2021J3Label = {
     FadeDistances = { 1.5, 90.0 },
     FadeWidths = { 0.5, 90.0 }
   },
-  Tag = { "solarsystem_labels", "moon_labels", "minor_moon_labels" },
+  Tag = {
+    "solarsystem_labels",
+    "moon_labels",
+    "minor_moon_labels",
+    "minor_moon_labels_jupiter",
+    "minor_moon_labels_ananke"
+  },
   GUI = {
     Name = "S/2021 J 3 Label",
     Path = "/Solar System/Planets/Jupiter/Minor Moons/Ananke Group/S2021J3",
@@ -1201,6 +1299,7 @@ local S2022J3Trail = {
     "moonTrail_solarSystem",
     "moonTrail_giants",
     "moonTrail_jupiter",
+    "moonTrail_ananke",
     "moonTrail_minor",
     "moonTrail_minor_jupiter"
   },
@@ -1227,7 +1326,13 @@ local S2022J3Label = {
     FadeDistances = { 1.5, 90.0 },
     FadeWidths = { 0.5, 90.0 }
   },
-  Tag = { "solarsystem_labels", "moon_labels", "minor_moon_labels" },
+  Tag = {
+    "solarsystem_labels",
+    "moon_labels",
+    "minor_moon_labels",
+    "minor_moon_labels_jupiter",
+    "minor_moon_labels_ananke"
+  },
   GUI = {
     Name = "S/2022 J 3 Label",
     Path = "/Solar System/Planets/Jupiter/Minor Moons/Ananke Group/S2022J3",
@@ -1283,6 +1388,7 @@ local S2017J3Trail = {
     "moonTrail_solarSystem",
     "moonTrail_giants",
     "moonTrail_jupiter",
+    "moonTrail_ananke",
     "moonTrail_minor",
     "moonTrail_minor_jupiter"
   },
@@ -1309,7 +1415,13 @@ local S2017J3Label = {
     FadeDistances = { 1.5, 90.0 },
     FadeWidths = { 0.5, 90.0 }
   },
-  Tag = { "solarsystem_labels", "moon_labels", "minor_moon_labels" },
+  Tag = {
+    "solarsystem_labels",
+    "moon_labels",
+    "minor_moon_labels",
+    "minor_moon_labels_jupiter",
+    "minor_moon_labels_ananke"
+  },
   GUI = {
     Name = "S/2017 J 3 Label",
     Path = "/Solar System/Planets/Jupiter/Minor Moons/Ananke Group/S2017J3",
@@ -1365,6 +1477,7 @@ local S2017J7Trail = {
     "moonTrail_solarSystem",
     "moonTrail_giants",
     "moonTrail_jupiter",
+    "moonTrail_ananke",
     "moonTrail_minor",
     "moonTrail_minor_jupiter"
   },
@@ -1391,7 +1504,13 @@ local S2017J7Label = {
     FadeDistances = { 1.5, 90.0 },
     FadeWidths = { 0.5, 90.0 }
   },
-  Tag = { "solarsystem_labels", "moon_labels", "minor_moon_labels" },
+  Tag = {
+    "solarsystem_labels",
+    "moon_labels",
+    "minor_moon_labels",
+    "minor_moon_labels_jupiter",
+    "minor_moon_labels_ananke"
+  },
   GUI = {
     Name = "S/2017 J 7 Label",
     Path = "/Solar System/Planets/Jupiter/Minor Moons/Ananke Group/S2017J7",
@@ -1447,6 +1566,7 @@ local S2017J9Trail = {
     "moonTrail_solarSystem",
     "moonTrail_giants",
     "moonTrail_jupiter",
+    "moonTrail_ananke",
     "moonTrail_minor",
     "moonTrail_minor_jupiter"
   },
@@ -1473,7 +1593,13 @@ local S2017J9Label = {
     FadeDistances = { 1.5, 90.0 },
     FadeWidths = { 0.5, 90.0 }
   },
-  Tag = { "solarsystem_labels", "moon_labels", "minor_moon_labels" },
+  Tag = {
+    "solarsystem_labels",
+    "moon_labels",
+    "minor_moon_labels",
+    "minor_moon_labels_jupiter",
+    "minor_moon_labels_ananke"
+  },
   GUI = {
     Name = "S/2017 J 9 Label",
     Path = "/Solar System/Planets/Jupiter/Minor Moons/Ananke Group/S2017J9",
@@ -1529,6 +1655,7 @@ local S2003J2Trail = {
     "moonTrail_solarSystem",
     "moonTrail_giants",
     "moonTrail_jupiter",
+    "moonTrail_ananke",
     "moonTrail_minor",
     "moonTrail_minor_jupiter"
   },
@@ -1555,7 +1682,13 @@ local S2003J2Label = {
     FadeDistances = { 1.5, 90.0 },
     FadeWidths = { 0.5, 90.0 }
   },
-  Tag = { "solarsystem_labels", "moon_labels", "minor_moon_labels" },
+  Tag = {
+    "solarsystem_labels",
+    "moon_labels",
+    "minor_moon_labels",
+    "minor_moon_labels_jupiter",
+    "minor_moon_labels_ananke"
+  },
   GUI = {
     Name = "S/2003 J 2 Label",
     Path = "/Solar System/Planets/Jupiter/Minor Moons/Ananke Group/S2003J2",
@@ -1611,6 +1744,7 @@ local S2003J12Trail = {
     "moonTrail_solarSystem",
     "moonTrail_giants",
     "moonTrail_jupiter",
+    "moonTrail_ananke",
     "moonTrail_minor",
     "moonTrail_minor_jupiter"
   },
@@ -1637,7 +1771,13 @@ local S2003J12Label = {
     FadeDistances = { 1.5, 90.0 },
     FadeWidths = { 0.5, 90.0 }
   },
-  Tag = { "solarsystem_labels", "moon_labels", "minor_moon_labels" },
+  Tag = {
+    "solarsystem_labels",
+    "moon_labels",
+    "minor_moon_labels",
+    "minor_moon_labels_jupiter",
+    "minor_moon_labels_ananke"
+  },
   GUI = {
     Name = "S/2003 J 12 Label",
     Path = "/Solar System/Planets/Jupiter/Minor Moons/Ananke Group/S2003J12",
diff --git a/data/assets/scene/solarsystem/planets/jupiter/minor/carme_group.asset b/data/assets/scene/solarsystem/planets/jupiter/minor/carme_group.asset
index eef55cec46..8228f13d82 100644
--- a/data/assets/scene/solarsystem/planets/jupiter/minor/carme_group.asset
+++ b/data/assets/scene/solarsystem/planets/jupiter/minor/carme_group.asset
@@ -53,6 +53,7 @@ local HerseTrail = {
     "moonTrail_solarSystem",
     "moonTrail_giants",
     "moonTrail_jupiter",
+    "moonTrail_carme",
     "moonTrail_minor",
     "moonTrail_minor_jupiter"
   },
@@ -79,7 +80,13 @@ local HerseLabel = {
     FadeDistances = { 2.0, 125.0 },
     FadeWidths = { 0.5, 50.0 }
   },
-  Tag = { "solarsystem_labels", "moon_labels", "minor_moon_labels" },
+  Tag = {
+    "solarsystem_labels",
+    "moon_labels",
+    "minor_moon_labels",
+    "minor_moon_labels_jupiter",
+    "minor_moon_labels_carme"
+  },
   GUI = {
     Name = "Herse Label",
     Path = "/Solar System/Planets/Jupiter/Minor Moons/Carme Group/Herse",
@@ -135,6 +142,7 @@ local AitneTrail = {
     "moonTrail_solarSystem",
     "moonTrail_giants",
     "moonTrail_jupiter",
+    "moonTrail_carme",
     "moonTrail_minor",
     "moonTrail_minor_jupiter"
   },
@@ -161,7 +169,13 @@ local AitneLabel = {
     FadeDistances = { 2.0, 125.0 },
     FadeWidths = { 0.5, 50.0 }
   },
-  Tag = { "solarsystem_labels", "moon_labels", "minor_moon_labels" },
+  Tag = {
+    "solarsystem_labels",
+    "moon_labels",
+    "minor_moon_labels",
+    "minor_moon_labels_jupiter",
+    "minor_moon_labels_carme"
+  },
   GUI = {
     Name = "Aitne Label",
     Path = "/Solar System/Planets/Jupiter/Minor Moons/Carme Group/Aitne",
@@ -217,6 +231,7 @@ local KaleTrail = {
     "moonTrail_solarSystem",
     "moonTrail_giants",
     "moonTrail_jupiter",
+    "moonTrail_carme",
     "moonTrail_minor",
     "moonTrail_minor_jupiter"
   },
@@ -243,7 +258,13 @@ local KaleLabel = {
     FadeDistances = { 2.0, 125.0 },
     FadeWidths = { 0.5, 50.0 }
   },
-  Tag = { "solarsystem_labels", "moon_labels", "minor_moon_labels" },
+  Tag = {
+    "solarsystem_labels",
+    "moon_labels",
+    "minor_moon_labels",
+    "minor_moon_labels_jupiter",
+    "minor_moon_labels_carme"
+  },
   GUI = {
     Name = "Kale Label",
     Path = "/Solar System/Planets/Jupiter/Minor Moons/Carme Group/Kale",
@@ -299,6 +320,7 @@ local TaygeteTrail = {
     "moonTrail_solarSystem",
     "moonTrail_giants",
     "moonTrail_jupiter",
+    "moonTrail_carme",
     "moonTrail_minor",
     "moonTrail_minor_jupiter"
   },
@@ -325,7 +347,13 @@ local TaygeteLabel = {
     FadeDistances = { 2.0, 125.0 },
     FadeWidths = { 0.5, 50.0 }
   },
-  Tag = { "solarsystem_labels", "moon_labels", "minor_moon_labels" },
+  Tag = {
+    "solarsystem_labels",
+    "moon_labels",
+    "minor_moon_labels",
+    "minor_moon_labels_jupiter",
+    "minor_moon_labels_carme"
+  },
   GUI = {
     Name = "Taygete Label",
     Path = "/Solar System/Planets/Jupiter/Minor Moons/Carme Group/Taygete",
@@ -381,6 +409,7 @@ local ChaldeneTrail = {
     "moonTrail_solarSystem",
     "moonTrail_giants",
     "moonTrail_jupiter",
+    "moonTrail_carme",
     "moonTrail_minor",
     "moonTrail_minor_jupiter"
   },
@@ -407,7 +436,13 @@ local ChaldeneLabel = {
     FadeDistances = { 2.0, 125.0 },
     FadeWidths = { 0.5, 50.0 }
   },
-  Tag = { "solarsystem_labels", "moon_labels", "minor_moon_labels" },
+  Tag = {
+    "solarsystem_labels",
+    "moon_labels",
+    "minor_moon_labels",
+    "minor_moon_labels_jupiter",
+    "minor_moon_labels_carme"
+  },
   GUI = {
     Name = "Chaldene Label",
     Path = "/Solar System/Planets/Jupiter/Minor Moons/Carme Group/Chaldene",
@@ -463,6 +498,7 @@ local ErinomeTrail = {
     "moonTrail_solarSystem",
     "moonTrail_giants",
     "moonTrail_jupiter",
+    "moonTrail_carme",
     "moonTrail_minor",
     "moonTrail_minor_jupiter"
   },
@@ -489,7 +525,13 @@ local ErinomeLabel = {
     FadeDistances = { 2.0, 125.0 },
     FadeWidths = { 0.5, 50.0 }
   },
-  Tag = { "solarsystem_labels", "moon_labels", "minor_moon_labels" },
+  Tag = {
+    "solarsystem_labels",
+    "moon_labels",
+    "minor_moon_labels",
+    "minor_moon_labels_jupiter",
+    "minor_moon_labels_carme"
+  },
   GUI = {
     Name = "Erinome Label",
     Path = "/Solar System/Planets/Jupiter/Minor Moons/Carme Group/Erinome",
@@ -545,6 +587,7 @@ local KallichoreTrail = {
     "moonTrail_solarSystem",
     "moonTrail_giants",
     "moonTrail_jupiter",
+    "moonTrail_carme",
     "moonTrail_minor",
     "moonTrail_minor_jupiter"
   },
@@ -571,7 +614,13 @@ local KallichoreLabel = {
     FadeDistances = { 2.0, 125.0 },
     FadeWidths = { 0.5, 50.0 }
   },
-  Tag = { "solarsystem_labels", "moon_labels", "minor_moon_labels" },
+  Tag = {
+    "solarsystem_labels",
+    "moon_labels",
+    "minor_moon_labels",
+    "minor_moon_labels_jupiter",
+    "minor_moon_labels_carme"
+  },
   GUI = {
     Name = "Kallichore Label",
     Path = "/Solar System/Planets/Jupiter/Minor Moons/Carme Group/Kallichore",
@@ -627,6 +676,7 @@ local KalykeTrail = {
     "moonTrail_solarSystem",
     "moonTrail_giants",
     "moonTrail_jupiter",
+    "moonTrail_carme",
     "moonTrail_minor",
     "moonTrail_minor_jupiter"
   },
@@ -653,7 +703,13 @@ local KalykeLabel = {
     FadeDistances = { 2.0, 125.0 },
     FadeWidths = { 0.5, 50.0 }
   },
-  Tag = { "solarsystem_labels", "moon_labels", "minor_moon_labels" },
+  Tag = {
+    "solarsystem_labels",
+    "moon_labels",
+    "minor_moon_labels",
+    "minor_moon_labels_jupiter",
+    "minor_moon_labels_carme"
+  },
   GUI = {
     Name = "Kalyke Label",
     Path = "/Solar System/Planets/Jupiter/Minor Moons/Carme Group/Kalyke",
@@ -709,6 +765,7 @@ local PasitheeTrail = {
     "moonTrail_solarSystem",
     "moonTrail_giants",
     "moonTrail_jupiter",
+    "moonTrail_carme",
     "moonTrail_minor",
     "moonTrail_minor_jupiter"
   },
@@ -735,7 +792,13 @@ local PasitheeLabel = {
     FadeDistances = { 2.0, 125.0 },
     FadeWidths = { 0.5, 50.0 }
   },
-  Tag = { "solarsystem_labels", "moon_labels", "minor_moon_labels" },
+  Tag = {
+    "solarsystem_labels",
+    "moon_labels",
+    "minor_moon_labels",
+    "minor_moon_labels_jupiter",
+    "minor_moon_labels_carme"
+  },
   GUI = {
     Name = "Pasithee Label",
     Path = "/Solar System/Planets/Jupiter/Minor Moons/Carme Group/Pasithee",
@@ -791,6 +854,7 @@ local S2010J1Trail = {
     "moonTrail_solarSystem",
     "moonTrail_giants",
     "moonTrail_jupiter",
+    "moonTrail_carme",
     "moonTrail_minor",
     "moonTrail_minor_jupiter"
   },
@@ -817,7 +881,13 @@ local S2010J1Label = {
     FadeDistances = { 2.0, 125.0 },
     FadeWidths = { 0.5, 50.0 }
   },
-  Tag = { "solarsystem_labels", "moon_labels", "minor_moon_labels" },
+  Tag = {
+    "solarsystem_labels",
+    "moon_labels",
+    "minor_moon_labels",
+    "minor_moon_labels_jupiter",
+    "minor_moon_labels_carme"
+  },
   GUI = {
     Name = "S/2010 J 1 Label",
     Path = "/Solar System/Planets/Jupiter/Minor Moons/Carme Group/S2010J1",
@@ -873,6 +943,7 @@ local EukeladeTrail = {
     "moonTrail_solarSystem",
     "moonTrail_giants",
     "moonTrail_jupiter",
+    "moonTrail_carme",
     "moonTrail_minor",
     "moonTrail_minor_jupiter"
   },
@@ -899,7 +970,13 @@ local EukeladeLabel = {
     FadeDistances = { 2.0, 125.0 },
     FadeWidths = { 0.5, 50.0 }
   },
-  Tag = { "solarsystem_labels", "moon_labels", "minor_moon_labels" },
+  Tag = {
+    "solarsystem_labels",
+    "moon_labels",
+    "minor_moon_labels",
+    "minor_moon_labels_jupiter",
+    "minor_moon_labels_carme"
+  },
   GUI = {
     Name = "Eukelade Label",
     Path = "/Solar System/Planets/Jupiter/Minor Moons/Carme Group/Eukelade",
@@ -955,6 +1032,7 @@ local ArcheTrail = {
     "moonTrail_solarSystem",
     "moonTrail_giants",
     "moonTrail_jupiter",
+    "moonTrail_carme",
     "moonTrail_minor",
     "moonTrail_minor_jupiter"
   },
@@ -981,7 +1059,13 @@ local ArcheLabel = {
     FadeDistances = { 2.0, 125.0 },
     FadeWidths = { 0.5, 50.0 }
   },
-  Tag = { "solarsystem_labels", "moon_labels", "minor_moon_labels" },
+  Tag = {
+    "solarsystem_labels",
+    "moon_labels",
+    "minor_moon_labels",
+    "minor_moon_labels_jupiter",
+    "minor_moon_labels_carme"
+  },
   GUI = {
     Name = "Arche Label",
     Path = "/Solar System/Planets/Jupiter/Minor Moons/Carme Group/Arche",
@@ -1037,6 +1121,7 @@ local IsonoeTrail = {
     "moonTrail_solarSystem",
     "moonTrail_giants",
     "moonTrail_jupiter",
+    "moonTrail_carme",
     "moonTrail_minor",
     "moonTrail_minor_jupiter"
   },
@@ -1063,7 +1148,13 @@ local IsonoeLabel = {
     FadeDistances = { 2.0, 125.0 },
     FadeWidths = { 0.5, 50.0 }
   },
-  Tag = { "solarsystem_labels", "moon_labels", "minor_moon_labels" },
+  Tag = {
+    "solarsystem_labels",
+    "moon_labels",
+    "minor_moon_labels",
+    "minor_moon_labels_jupiter",
+    "minor_moon_labels_carme"
+  },
   GUI = {
     Name = "Isonoe Label",
     Path = "/Solar System/Planets/Jupiter/Minor Moons/Carme Group/Isonoe",
@@ -1119,6 +1210,7 @@ local CarmeTrail = {
     "moonTrail_solarSystem",
     "moonTrail_giants",
     "moonTrail_jupiter",
+    "moonTrail_carme",
     "moonTrail_minor",
     "moonTrail_minor_jupiter"
   },
@@ -1145,7 +1237,13 @@ local CarmeLabel = {
     FadeDistances = { 2.0, 125.0 },
     FadeWidths = { 0.5, 50.0 }
   },
-  Tag = { "solarsystem_labels", "moon_labels", "minor_moon_labels" },
+  Tag = {
+    "solarsystem_labels",
+    "moon_labels",
+    "minor_moon_labels",
+    "minor_moon_labels_jupiter",
+    "minor_moon_labels_carme"
+  },
   GUI = {
     Name = "Carme Label",
     Path = "/Solar System/Planets/Jupiter/Minor Moons/Carme Group/Carme",
@@ -1201,6 +1299,7 @@ local S2003J5Trail = {
     "moonTrail_solarSystem",
     "moonTrail_giants",
     "moonTrail_jupiter",
+    "moonTrail_carme",
     "moonTrail_minor",
     "moonTrail_minor_jupiter"
   },
@@ -1227,7 +1326,13 @@ local S2003J5Label = {
     FadeDistances = { 2.0, 125.0 },
     FadeWidths = { 0.5, 50.0 }
   },
-  Tag = { "solarsystem_labels", "moon_labels", "minor_moon_labels" },
+  Tag = {
+    "solarsystem_labels",
+    "moon_labels",
+    "minor_moon_labels",
+    "minor_moon_labels_jupiter",
+    "minor_moon_labels_carme"
+  },
   GUI = {
     Name = "S/2003 J 5 Label",
     Path = "/Solar System/Planets/Jupiter/Minor Moons/Carme Group/S2003J5",
@@ -1283,6 +1388,7 @@ local S2018J3Trail = {
     "moonTrail_solarSystem",
     "moonTrail_giants",
     "moonTrail_jupiter",
+    "moonTrail_carme",
     "moonTrail_minor",
     "moonTrail_minor_jupiter"
   },
@@ -1309,7 +1415,13 @@ local S2018J3Label = {
     FadeDistances = { 2.0, 125.0 },
     FadeWidths = { 0.5, 50.0 }
   },
-  Tag = { "solarsystem_labels", "moon_labels", "minor_moon_labels" },
+  Tag = {
+    "solarsystem_labels",
+    "moon_labels",
+    "minor_moon_labels",
+    "minor_moon_labels_jupiter",
+    "minor_moon_labels_carme"
+  },
   GUI = {
     Name = "S/2018 J 3 Label",
     Path = "/Solar System/Planets/Jupiter/Minor Moons/Carme Group/S2018J3",
@@ -1365,6 +1477,7 @@ local S2021J4Trail = {
     "moonTrail_solarSystem",
     "moonTrail_giants",
     "moonTrail_jupiter",
+    "moonTrail_carme",
     "moonTrail_minor",
     "moonTrail_minor_jupiter"
   },
@@ -1391,7 +1504,13 @@ local S2021J4Label = {
     FadeDistances = { 2.0, 125.0 },
     FadeWidths = { 0.5, 50.0 }
   },
-  Tag = { "solarsystem_labels", "moon_labels", "minor_moon_labels" },
+  Tag = {
+    "solarsystem_labels",
+    "moon_labels",
+    "minor_moon_labels",
+    "minor_moon_labels_jupiter",
+    "minor_moon_labels_carme"
+  },
   GUI = {
     Name = "S/2021 J 4 Label",
     Path = "/Solar System/Planets/Jupiter/Minor Moons/Carme Group/S2021J4",
@@ -1447,6 +1566,7 @@ local S2021J5Trail = {
     "moonTrail_solarSystem",
     "moonTrail_giants",
     "moonTrail_jupiter",
+    "moonTrail_carme",
     "moonTrail_minor",
     "moonTrail_minor_jupiter"
   },
@@ -1473,7 +1593,13 @@ local S2021J5Label = {
     FadeDistances = { 2.0, 125.0 },
     FadeWidths = { 0.5, 50.0 }
   },
-  Tag = { "solarsystem_labels", "moon_labels", "minor_moon_labels" },
+  Tag = {
+    "solarsystem_labels",
+    "moon_labels",
+    "minor_moon_labels",
+    "minor_moon_labels_jupiter",
+    "minor_moon_labels_carme"
+  },
   GUI = {
     Name = "S/2021 J 5 Label",
     Path = "/Solar System/Planets/Jupiter/Minor Moons/Carme Group/S2021J5",
@@ -1529,6 +1655,7 @@ local S2021J6Trail = {
     "moonTrail_solarSystem",
     "moonTrail_giants",
     "moonTrail_jupiter",
+    "moonTrail_carme",
     "moonTrail_minor",
     "moonTrail_minor_jupiter"
   },
@@ -1555,7 +1682,13 @@ local S2021J6Label = {
     FadeDistances = { 2.0, 125.0 },
     FadeWidths = { 0.5, 50.0 }
   },
-  Tag = { "solarsystem_labels", "moon_labels", "minor_moon_labels" },
+  Tag = {
+    "solarsystem_labels",
+    "moon_labels",
+    "minor_moon_labels",
+    "minor_moon_labels_jupiter",
+    "minor_moon_labels_carme"
+  },
   GUI = {
     Name = "S/2021 J 6 Label",
     Path = "/Solar System/Planets/Jupiter/Minor Moons/Carme Group/S2021J6",
@@ -1611,6 +1744,7 @@ local S2016J3Trail = {
     "moonTrail_solarSystem",
     "moonTrail_giants",
     "moonTrail_jupiter",
+    "moonTrail_carme",
     "moonTrail_minor",
     "moonTrail_minor_jupiter"
   },
@@ -1637,7 +1771,13 @@ local S2016J3Label = {
     FadeDistances = { 2.0, 125.0 },
     FadeWidths = { 0.5, 50.0 }
   },
-  Tag = { "solarsystem_labels", "moon_labels", "minor_moon_labels" },
+  Tag = {
+    "solarsystem_labels",
+    "moon_labels",
+    "minor_moon_labels",
+    "minor_moon_labels_jupiter",
+    "minor_moon_labels_carme"
+  },
   GUI = {
     Name = "S/2016 J 3 Label",
     Path = "/Solar System/Planets/Jupiter/Minor Moons/Carme Group/S2016J3",
@@ -1693,6 +1833,7 @@ local S2022J1Trail = {
     "moonTrail_solarSystem",
     "moonTrail_giants",
     "moonTrail_jupiter",
+    "moonTrail_carme",
     "moonTrail_minor",
     "moonTrail_minor_jupiter"
   },
@@ -1719,7 +1860,13 @@ local S2022J1Label = {
     FadeDistances = { 2.0, 125.0 },
     FadeWidths = { 0.5, 50.0 }
   },
-  Tag = { "solarsystem_labels", "moon_labels", "minor_moon_labels" },
+  Tag = {
+    "solarsystem_labels",
+    "moon_labels",
+    "minor_moon_labels",
+    "minor_moon_labels_jupiter",
+    "minor_moon_labels_carme"
+  },
   GUI = {
     Name = "S/2022 J 1 Label",
     Path = "/Solar System/Planets/Jupiter/Minor Moons/Carme Group/S2022J1",
@@ -1775,6 +1922,7 @@ local S2022J2Trail = {
     "moonTrail_solarSystem",
     "moonTrail_giants",
     "moonTrail_jupiter",
+    "moonTrail_carme",
     "moonTrail_minor",
     "moonTrail_minor_jupiter"
   },
@@ -1801,7 +1949,13 @@ local S2022J2Label = {
     FadeDistances = { 2.0, 125.0 },
     FadeWidths = { 0.5, 50.0 }
   },
-  Tag = { "solarsystem_labels", "moon_labels", "minor_moon_labels" },
+  Tag = {
+    "solarsystem_labels",
+    "moon_labels",
+    "minor_moon_labels",
+    "minor_moon_labels_jupiter",
+    "minor_moon_labels_carme"
+  },
   GUI = {
     Name = "S/2022 J 2 Label",
     Path = "/Solar System/Planets/Jupiter/Minor Moons/Carme Group/S2022J2",
@@ -1857,6 +2011,7 @@ local S2017J2Trail = {
     "moonTrail_solarSystem",
     "moonTrail_giants",
     "moonTrail_jupiter",
+    "moonTrail_carme",
     "moonTrail_minor",
     "moonTrail_minor_jupiter"
   },
@@ -1883,7 +2038,13 @@ local S2017J2Label = {
     FadeDistances = { 2.0, 125.0 },
     FadeWidths = { 0.5, 50.0 }
   },
-  Tag = { "solarsystem_labels", "moon_labels", "minor_moon_labels" },
+  Tag = {
+    "solarsystem_labels",
+    "moon_labels",
+    "minor_moon_labels",
+    "minor_moon_labels_jupiter",
+    "minor_moon_labels_carme"
+  },
   GUI = {
     Name = "S/2017 J 2 Label",
     Path = "/Solar System/Planets/Jupiter/Minor Moons/Carme Group/S2017J2",
@@ -1939,6 +2100,7 @@ local S2017J5Trail = {
     "moonTrail_solarSystem",
     "moonTrail_giants",
     "moonTrail_jupiter",
+    "moonTrail_carme",
     "moonTrail_minor",
     "moonTrail_minor_jupiter"
   },
@@ -1965,7 +2127,13 @@ local S2017J5Label = {
     FadeDistances = { 2.0, 125.0 },
     FadeWidths = { 0.5, 50.0 }
   },
-  Tag = { "solarsystem_labels", "moon_labels", "minor_moon_labels" },
+  Tag = {
+    "solarsystem_labels",
+    "moon_labels",
+    "minor_moon_labels",
+    "minor_moon_labels_jupiter",
+    "minor_moon_labels_carme"
+  },
   GUI = {
     Name = "S/2017 J 5 Label",
     Path = "/Solar System/Planets/Jupiter/Minor Moons/Carme Group/S2017J5",
@@ -2021,6 +2189,7 @@ local S2017J8Trail = {
     "moonTrail_solarSystem",
     "moonTrail_giants",
     "moonTrail_jupiter",
+    "moonTrail_carme",
     "moonTrail_minor",
     "moonTrail_minor_jupiter"
   },
@@ -2047,7 +2216,13 @@ local S2017J8Label = {
     FadeDistances = { 2.0, 125.0 },
     FadeWidths = { 0.5, 50.0 }
   },
-  Tag = { "solarsystem_labels", "moon_labels", "minor_moon_labels" },
+  Tag = {
+    "solarsystem_labels",
+    "moon_labels",
+    "minor_moon_labels",
+    "minor_moon_labels_jupiter",
+    "minor_moon_labels_carme"
+  },
   GUI = {
     Name = "S/2017 J 8 Label",
     Path = "/Solar System/Planets/Jupiter/Minor Moons/Carme Group/S2017J8",
@@ -2103,6 +2278,7 @@ local S2011J1Trail = {
     "moonTrail_solarSystem",
     "moonTrail_giants",
     "moonTrail_jupiter",
+    "moonTrail_carme",
     "moonTrail_minor",
     "moonTrail_minor_jupiter"
   },
@@ -2129,7 +2305,13 @@ local S2011J1Label = {
     FadeDistances = { 2.0, 125.0 },
     FadeWidths = { 0.5, 50.0 }
   },
-  Tag = { "solarsystem_labels", "moon_labels", "minor_moon_labels" },
+  Tag = {
+    "solarsystem_labels",
+    "moon_labels",
+    "minor_moon_labels",
+    "minor_moon_labels_jupiter",
+    "minor_moon_labels_carme"
+  },
   GUI = {
     Name = "S/2011 J 1 Label",
     Path = "/Solar System/Planets/Jupiter/Minor Moons/Carme Group/S2011J1",
@@ -2185,6 +2367,7 @@ local S2003J9Trail = {
     "moonTrail_solarSystem",
     "moonTrail_giants",
     "moonTrail_jupiter",
+    "moonTrail_carme",
     "moonTrail_minor",
     "moonTrail_minor_jupiter"
   },
@@ -2211,7 +2394,13 @@ local S2003J9Label = {
     FadeDistances = { 2.0, 125.0 },
     FadeWidths = { 0.5, 50.0 }
   },
-  Tag = { "solarsystem_labels", "moon_labels", "minor_moon_labels" },
+  Tag = {
+    "solarsystem_labels",
+    "moon_labels",
+    "minor_moon_labels",
+    "minor_moon_labels_jupiter",
+    "minor_moon_labels_carme"
+  },
   GUI = {
     Name = "S/2003 J 9 Label",
     Path = "/Solar System/Planets/Jupiter/Minor Moons/Carme Group/S2003J9",
@@ -2267,6 +2456,7 @@ local S2003J10Trail = {
     "moonTrail_solarSystem",
     "moonTrail_giants",
     "moonTrail_jupiter",
+    "moonTrail_carme",
     "moonTrail_minor",
     "moonTrail_minor_jupiter"
   },
@@ -2293,7 +2483,13 @@ local S2003J10Label = {
     FadeDistances = { 2.0, 125.0 },
     FadeWidths = { 0.5, 50.0 }
   },
-  Tag = { "solarsystem_labels", "moon_labels", "minor_moon_labels" },
+  Tag = {
+    "solarsystem_labels",
+    "moon_labels",
+    "minor_moon_labels",
+    "minor_moon_labels_jupiter",
+    "minor_moon_labels_carme"
+  },
   GUI = {
     Name = "S/2003 J 10 Label",
     Path = "/Solar System/Planets/Jupiter/Minor Moons/Carme Group/S2003J10",
diff --git a/data/assets/scene/solarsystem/planets/jupiter/minor/carpo_group.asset b/data/assets/scene/solarsystem/planets/jupiter/minor/carpo_group.asset
index 8517d24a7d..1e1389393a 100644
--- a/data/assets/scene/solarsystem/planets/jupiter/minor/carpo_group.asset
+++ b/data/assets/scene/solarsystem/planets/jupiter/minor/carpo_group.asset
@@ -53,6 +53,7 @@ local CarpoTrail = {
     "moonTrail_solarSystem",
     "moonTrail_giants",
     "moonTrail_jupiter",
+    "moonTrail_carpo",
     "moonTrail_minor",
     "moonTrail_minor_jupiter"
   },
@@ -79,7 +80,13 @@ local CarpoLabel = {
     FadeDistances = { 1.0, 100.0 },
     FadeWidths = { 0.0, 100.0 }
   },
-  Tag = { "solarsystem_labels", "moon_labels", "minor_moon_labels" },
+  Tag = {
+    "solarsystem_labels",
+    "moon_labels",
+    "minor_moon_labels",
+    "minor_moon_labels_jupiter",
+    "minor_moon_labels_carpo"
+  },
   GUI = {
     Name = "Carpo Label",
     Path = "/Solar System/Planets/Jupiter/Minor Moons/Carpo Group/Carpo",
@@ -104,7 +111,13 @@ local CarpoLabelNear = {
     FadeDistances = { 0.2, 1.0 },
     FadeWidths = { 0.1, 0.0 }
   },
-  Tag = { "solarsystem_labels", "moon_labels", "minor_moon_labels" },
+  Tag = {
+    "solarsystem_labels",
+    "moon_labels",
+    "minor_moon_labels",
+    "minor_moon_labels_jupiter",
+    "minor_moon_labels_carpo"
+  },
   GUI = {
     Name = "Carpo Label (Near)",
     Path = "/Solar System/Planets/Jupiter/Minor Moons/Carpo Group/Carpo",
@@ -160,6 +173,7 @@ local S2018J4Trail = {
     "moonTrail_solarSystem",
     "moonTrail_giants",
     "moonTrail_jupiter",
+    "moonTrail_carpo",
     "moonTrail_minor",
     "moonTrail_minor_jupiter"
   },
@@ -186,7 +200,13 @@ local S2018J4Label = {
     FadeDistances = { 1.5, 90.0 },
     FadeWidths = { 0.5, 90.0 }
   },
-  Tag = { "solarsystem_labels", "moon_labels", "minor_moon_labels" },
+  Tag = {
+    "solarsystem_labels",
+    "moon_labels",
+    "minor_moon_labels",
+    "minor_moon_labels_jupiter",
+    "minor_moon_labels_carpo"
+  },
   GUI = {
     Name = "S/2018 J 4 Label",
     Path = "/Solar System/Planets/Jupiter/Minor Moons/Carpo Group/S2018J4",
@@ -211,7 +231,13 @@ local S2018J4LabelNear = {
     FadeDistances = { 0.2, 1.0 },
     FadeWidths = { 0.1, 0.0 }
   },
-  Tag = { "solarsystem_labels", "moon_labels", "minor_moon_labels" },
+  Tag = {
+    "solarsystem_labels",
+    "moon_labels",
+    "minor_moon_labels",
+    "minor_moon_labels_jupiter",
+    "minor_moon_labels_carpo"
+  },
   GUI = {
     Name = "S2018J4 Label (Near)",
     Path = "/Solar System/Planets/Jupiter/Minor Moons/Carpo Group/S2018J4",
diff --git a/data/assets/scene/solarsystem/planets/jupiter/minor/himalia_group.asset b/data/assets/scene/solarsystem/planets/jupiter/minor/himalia_group.asset
index 909b69dc87..7596027ebe 100644
--- a/data/assets/scene/solarsystem/planets/jupiter/minor/himalia_group.asset
+++ b/data/assets/scene/solarsystem/planets/jupiter/minor/himalia_group.asset
@@ -53,6 +53,7 @@ local LedaTrail = {
     "moonTrail_solarSystem",
     "moonTrail_giants",
     "moonTrail_jupiter",
+    "moonTrail_himalia",
     "moonTrail_minor",
     "moonTrail_minor_jupiter"
   },
@@ -79,7 +80,13 @@ local LedaLabel = {
     FadeDistances = { 1.0, 120.0 },
     FadeWidths = { 1.0, 120.0 }
   },
-  Tag = { "solarsystem_labels", "moon_labels", "minor_moon_labels" },
+  Tag = {
+    "solarsystem_labels",
+    "moon_labels",
+    "minor_moon_labels",
+    "minor_moon_labels_jupiter",
+    "minor_moon_labels_himalia"
+  },
   GUI = {
     Name = "Leda Label",
     Path = "/Solar System/Planets/Jupiter/Minor Moons/Himalia Group/Leda",
@@ -135,6 +142,7 @@ local HimaliaTrail = {
     "moonTrail_solarSystem",
     "moonTrail_giants",
     "moonTrail_jupiter",
+    "moonTrail_himalia",
     "moonTrail_minor",
     "moonTrail_minor_jupiter"
   },
@@ -161,7 +169,13 @@ local HimaliaLabel = {
     FadeDistances = { 1.0, 120.0 },
     FadeWidths = { 1.0, 120.0 }
   },
-  Tag = { "solarsystem_labels", "moon_labels", "minor_moon_labels" },
+  Tag = {
+    "solarsystem_labels",
+    "moon_labels",
+    "minor_moon_labels",
+    "minor_moon_labels_jupiter",
+    "minor_moon_labels_himalia"
+  },
   GUI = {
     Name = "Himalia Label",
     Path = "/Solar System/Planets/Jupiter/Minor Moons/Himalia Group/Himalia",
@@ -217,6 +231,7 @@ local LysitheaTrail = {
     "moonTrail_solarSystem",
     "moonTrail_giants",
     "moonTrail_jupiter",
+    "moonTrail_himalia",
     "moonTrail_minor",
     "moonTrail_minor_jupiter"
   },
@@ -243,7 +258,13 @@ local LysitheaLabel = {
     FadeDistances = { 1.0, 120.0 },
     FadeWidths = { 1.0, 120.0 }
   },
-  Tag = { "solarsystem_labels", "moon_labels", "minor_moon_labels" },
+  Tag = {
+    "solarsystem_labels",
+    "moon_labels",
+    "minor_moon_labels",
+    "minor_moon_labels_jupiter",
+    "minor_moon_labels_himalia"
+  },
   GUI = {
     Name = "Lysithea Label",
     Path = "/Solar System/Planets/Jupiter/Minor Moons/Himalia Group/Lysithea",
@@ -299,6 +320,7 @@ local ElaraTrail = {
     "moonTrail_solarSystem",
     "moonTrail_giants",
     "moonTrail_jupiter",
+    "moonTrail_himalia",
     "moonTrail_minor",
     "moonTrail_minor_jupiter"
   },
@@ -325,7 +347,13 @@ local ElaraLabel = {
     FadeDistances = { 1.0, 120.0 },
     FadeWidths = { 1.0, 120.0 }
   },
-  Tag = { "solarsystem_labels", "moon_labels", "minor_moon_labels" },
+  Tag = {
+    "solarsystem_labels",
+    "moon_labels",
+    "minor_moon_labels",
+    "minor_moon_labels_jupiter",
+    "minor_moon_labels_himalia"
+  },
   GUI = {
     Name = "Elara Label",
     Path = "/Solar System/Planets/Jupiter/Minor Moons/Himalia Group/Elara",
@@ -381,6 +409,7 @@ local DiaTrail = {
     "moonTrail_solarSystem",
     "moonTrail_giants",
     "moonTrail_jupiter",
+    "moonTrail_himalia",
     "moonTrail_minor",
     "moonTrail_minor_jupiter"
   },
@@ -407,7 +436,13 @@ local DiaLabel = {
     FadeDistances = { 1.0, 120.0 },
     FadeWidths = { 1.0, 120.0 }
   },
-  Tag = { "solarsystem_labels", "moon_labels", "minor_moon_labels" },
+  Tag = {
+    "solarsystem_labels",
+    "moon_labels",
+    "minor_moon_labels",
+    "minor_moon_labels_jupiter",
+    "minor_moon_labels_himalia"
+  },
   GUI = {
     Name = "Dia Label",
     Path = "/Solar System/Planets/Jupiter/Minor Moons/Himalia Group/Dia",
@@ -463,6 +498,7 @@ local S2011J3Trail = {
     "moonTrail_solarSystem",
     "moonTrail_giants",
     "moonTrail_jupiter",
+    "moonTrail_himalia",
     "moonTrail_minor",
     "moonTrail_minor_jupiter"
   },
@@ -489,7 +525,13 @@ local S2011J3Label = {
     FadeDistances = { 1.0, 120.0 },
     FadeWidths = { 1.0, 120.0 }
   },
-  Tag = { "solarsystem_labels", "moon_labels", "minor_moon_labels" },
+  Tag = {
+    "solarsystem_labels",
+    "moon_labels",
+    "minor_moon_labels",
+    "minor_moon_labels_jupiter",
+    "minor_moon_labels_himalia"
+  },
   GUI = {
     Name = "S/2011 J 3 Label",
     Path = "/Solar System/Planets/Jupiter/Minor Moons/Himalia Group/S2011J3",
@@ -545,6 +587,7 @@ local S2018J2Trail = {
     "moonTrail_solarSystem",
     "moonTrail_giants",
     "moonTrail_jupiter",
+    "moonTrail_himalia",
     "moonTrail_minor",
     "moonTrail_minor_jupiter"
   },
@@ -571,7 +614,13 @@ local S2018J2Label = {
     FadeDistances = { 1.0, 120.0 },
     FadeWidths = { 1.0, 120.0 }
   },
-  Tag = { "solarsystem_labels", "moon_labels", "minor_moon_labels" },
+  Tag = {
+    "solarsystem_labels",
+    "moon_labels",
+    "minor_moon_labels",
+    "minor_moon_labels_jupiter",
+    "minor_moon_labels_himalia"
+  },
   GUI = {
     Name = "S/2018 J 2 Label",
     Path = "/Solar System/Planets/Jupiter/Minor Moons/Himalia Group/S2018J2",
@@ -627,6 +676,7 @@ local PandiaTrail = {
     "moonTrail_solarSystem",
     "moonTrail_giants",
     "moonTrail_jupiter",
+    "moonTrail_himalia",
     "moonTrail_minor",
     "moonTrail_minor_jupiter"
   },
@@ -653,7 +703,13 @@ local PandiaLabel = {
     FadeDistances = { 1.0, 120.0 },
     FadeWidths = { 1.0, 120.0 }
   },
-  Tag = { "solarsystem_labels", "moon_labels", "minor_moon_labels" },
+  Tag = {
+    "solarsystem_labels",
+    "moon_labels",
+    "minor_moon_labels",
+    "minor_moon_labels_jupiter",
+    "minor_moon_labels_himalia"
+  },
   GUI = {
     Name = "Pandia Label",
     Path = "/Solar System/Planets/Jupiter/Minor Moons/Himalia Group/Pandia",
@@ -709,6 +765,7 @@ local ErsaTrail = {
     "moonTrail_solarSystem",
     "moonTrail_giants",
     "moonTrail_jupiter",
+    "moonTrail_himalia",
     "moonTrail_minor",
     "moonTrail_minor_jupiter"
   },
@@ -735,7 +792,13 @@ local ErsaLabel = {
     FadeDistances = { 1.0, 120.0 },
     FadeWidths = { 1.0, 120.0 }
   },
-  Tag = { "solarsystem_labels", "moon_labels", "minor_moon_labels" },
+  Tag = {
+    "solarsystem_labels",
+    "moon_labels",
+    "minor_moon_labels",
+    "minor_moon_labels_jupiter",
+    "minor_moon_labels_himalia"
+  },
   GUI = {
     Name = "Ersa Label",
     Path = "/Solar System/Planets/Jupiter/Minor Moons/Himalia Group/Ersa",
diff --git a/data/assets/scene/solarsystem/planets/jupiter/minor/inner_group.asset b/data/assets/scene/solarsystem/planets/jupiter/minor/inner_group.asset
index 6a4f892747..e2a9e81fb3 100644
--- a/data/assets/scene/solarsystem/planets/jupiter/minor/inner_group.asset
+++ b/data/assets/scene/solarsystem/planets/jupiter/minor/inner_group.asset
@@ -52,6 +52,7 @@ local MetisTrail = {
     "moonTrail_solarSystem",
     "moonTrail_giants",
     "moonTrail_jupiter",
+    "moonTrail_inner",
     "moonTrail_minor",
     "moonTrail_minor_jupiter"
   },
@@ -78,7 +79,13 @@ local MetisLabel = {
     FadeDistances = { 0.1, 3.0 },
     FadeWidths = { 0.1, 3.0 }
   },
-  Tag = { "solarsystem_labels", "moon_labels", "minor_moon_labels" },
+  Tag = {
+    "solarsystem_labels",
+    "moon_labels",
+    "minor_moon_labels",
+    "minor_moon_labels_jupiter",
+    "minor_moon_labels_inner"
+  },
   GUI = {
     Name = "Metis Label",
     Path = "/Solar System/Planets/Jupiter/Minor Moons/Inner Group/Metis",
@@ -134,6 +141,7 @@ local AdrasteaTrail = {
     "moonTrail_solarSystem",
     "moonTrail_giants",
     "moonTrail_jupiter",
+    "moonTrail_inner",
     "moonTrail_minor",
     "moonTrail_minor_jupiter"
   },
@@ -160,7 +168,13 @@ local AdrasteaLabel = {
     FadeDistances = { 0.1, 3.0 },
     FadeWidths = { 0.1, 3.0 }
   },
-  Tag = { "solarsystem_labels", "moon_labels", "minor_moon_labels" },
+  Tag = {
+    "solarsystem_labels",
+    "moon_labels",
+    "minor_moon_labels",
+    "minor_moon_labels_jupiter",
+    "minor_moon_labels_inner"
+  },
   GUI = {
     Name = "Adrastea Label",
     Path = "/Solar System/Planets/Jupiter/Minor Moons/Inner Group/Adrastea",
@@ -216,6 +230,7 @@ local AmaltheaTrail = {
     "moonTrail_solarSystem",
     "moonTrail_giants",
     "moonTrail_jupiter",
+    "moonTrail_inner",
     "moonTrail_minor",
     "moonTrail_minor_jupiter"
   },
@@ -242,7 +257,13 @@ local AmaltheaLabel = {
     FadeDistances = { 0.1, 3.0 },
     FadeWidths = { 0.1, 3.0 }
   },
-  Tag = { "solarsystem_labels", "moon_labels", "minor_moon_labels" },
+  Tag = {
+    "solarsystem_labels",
+    "moon_labels",
+    "minor_moon_labels",
+    "minor_moon_labels_jupiter",
+    "minor_moon_labels_inner"
+  },
   GUI = {
     Name = "Amalthea Label",
     Path = "/Solar System/Planets/Jupiter/Minor Moons/Inner Group/Amalthea",
@@ -298,6 +319,7 @@ local ThebeTrail = {
     "moonTrail_solarSystem",
     "moonTrail_giants",
     "moonTrail_jupiter",
+    "moonTrail_inner",
     "moonTrail_minor",
     "moonTrail_minor_jupiter"
   },
@@ -324,7 +346,13 @@ local ThebeLabel = {
     FadeDistances = { 0.1, 3.0 },
     FadeWidths = { 0.1, 3.0 }
   },
-  Tag = { "solarsystem_labels", "moon_labels", "minor_moon_labels" },
+  Tag = {
+    "solarsystem_labels",
+    "moon_labels",
+    "minor_moon_labels",
+    "minor_moon_labels_jupiter",
+    "minor_moon_labels_inner"
+  },
   GUI = {
     Name = "Thebe Label",
     Path = "/Solar System/Planets/Jupiter/Minor Moons/Inner Group/Thebe",
diff --git a/data/assets/scene/solarsystem/planets/jupiter/minor/other_groups.asset b/data/assets/scene/solarsystem/planets/jupiter/minor/other_groups.asset
index 1ff300f7f2..10580f355f 100644
--- a/data/assets/scene/solarsystem/planets/jupiter/minor/other_groups.asset
+++ b/data/assets/scene/solarsystem/planets/jupiter/minor/other_groups.asset
@@ -52,6 +52,7 @@ local EuphemeTrail = {
     "moonTrail_solarSystem",
     "moonTrail_giants",
     "moonTrail_jupiter",
+    "moonTrail_other",
     "moonTrail_minor",
     "moonTrail_minor_jupiter"
   },
@@ -78,7 +79,13 @@ local EuphemeLabel = {
     FadeDistances = { 1.0, 150.0 },
     FadeWidths = { 1.0, 50.0 }
   },
-  Tag = { "solarsystem_labels", "moon_labels", "minor_moon_labels" },
+  Tag = {
+    "solarsystem_labels",
+    "moon_labels",
+    "minor_moon_labels",
+    "minor_moon_labels_jupiter",
+    "minor_moon_labels_other"
+  },
   GUI = {
     Name = "Eupheme Label",
     Path = "/Solar System/Planets/Jupiter/Minor Moons/Other Group/Eupheme",
@@ -134,6 +141,7 @@ local S2003J19Trail = {
     "moonTrail_solarSystem",
     "moonTrail_giants",
     "moonTrail_jupiter",
+    "moonTrail_other",
     "moonTrail_minor",
     "moonTrail_minor_jupiter"
   },
@@ -160,7 +168,13 @@ local S2003J19Label = {
     FadeDistances = { 1.0, 150.0 },
     FadeWidths = { 1.0, 50.0 }
   },
-  Tag = { "solarsystem_labels", "moon_labels", "minor_moon_labels" },
+  Tag = {
+    "solarsystem_labels",
+    "moon_labels",
+    "minor_moon_labels",
+    "minor_moon_labels_jupiter",
+    "minor_moon_labels_other"
+  },
   GUI = {
     Name = "S/2003 J 19 Label",
     Path = "/Solar System/Planets/Jupiter/Minor Moons/Ananke Group/S2003J19",
@@ -216,6 +230,7 @@ local ValetudoTrail = {
     "moonTrail_solarSystem",
     "moonTrail_giants",
     "moonTrail_jupiter",
+    "moonTrail_other",
     "moonTrail_minor",
     "moonTrail_minor_jupiter"
   },
@@ -242,7 +257,13 @@ local ValetudoLabel = {
     FadeDistances = { 1.0, 150.0 },
     FadeWidths = { 1.0, 50.0 }
   },
-  Tag = { "solarsystem_labels", "moon_labels", "minor_moon_labels" },
+  Tag = {
+    "solarsystem_labels",
+    "moon_labels",
+    "minor_moon_labels",
+    "minor_moon_labels_jupiter",
+    "minor_moon_labels_other"
+  },
   GUI = {
     Name = "Valetudo Label",
     Path = "/Solar System/Planets/Jupiter/Minor Moons/Ananke Group/Valetudo",
diff --git a/data/assets/scene/solarsystem/planets/jupiter/minor/pasiphae_group.asset b/data/assets/scene/solarsystem/planets/jupiter/minor/pasiphae_group.asset
index d2a93c6345..bc2585fa3b 100644
--- a/data/assets/scene/solarsystem/planets/jupiter/minor/pasiphae_group.asset
+++ b/data/assets/scene/solarsystem/planets/jupiter/minor/pasiphae_group.asset
@@ -53,6 +53,7 @@ local EuporieTrail = {
     "moonTrail_solarSystem",
     "moonTrail_giants",
     "moonTrail_jupiter",
+    "moonTrail_pasiphae",
     "moonTrail_minor",
     "moonTrail_minor_jupiter"
   },
@@ -79,7 +80,13 @@ local EuporieLabel = {
     FadeDistances = { 1.5, 140.0 },
     FadeWidths = { 0.5, 50.0 }
   },
-  Tag = { "solarsystem_labels", "moon_labels", "minor_moon_labels" },
+  Tag = {
+    "solarsystem_labels",
+    "moon_labels",
+    "minor_moon_labels",
+    "minor_moon_labels_jupiter",
+    "minor_moon_labels_pasiphae"
+  },
   GUI = {
     Name = "Euporie Label",
     Path = "/Solar System/Planets/Jupiter/Minor Moons/Pasiphae Group/Euporie",
@@ -135,6 +142,7 @@ local S2003J18Trail = {
     "moonTrail_solarSystem",
     "moonTrail_giants",
     "moonTrail_jupiter",
+    "moonTrail_pasiphae",
     "moonTrail_minor",
     "moonTrail_minor_jupiter"
   },
@@ -161,7 +169,13 @@ local S2003J18Label = {
     FadeDistances = { 1.5, 140.0 },
     FadeWidths = { 0.5, 50.0 }
   },
-  Tag = { "solarsystem_labels", "moon_labels", "minor_moon_labels" },
+  Tag = {
+    "solarsystem_labels",
+    "moon_labels",
+    "minor_moon_labels",
+    "minor_moon_labels_jupiter",
+    "minor_moon_labels_pasiphae"
+  },
   GUI = {
     Name = "S/2003 J 18 Label",
     Path = "/Solar System/Planets/Jupiter/Minor Moons/Pasiphae Group/S2003J18",
@@ -217,6 +231,7 @@ local HelikeTrail = {
     "moonTrail_solarSystem",
     "moonTrail_giants",
     "moonTrail_jupiter",
+    "moonTrail_pasiphae",
     "moonTrail_minor",
     "moonTrail_minor_jupiter"
   },
@@ -243,7 +258,13 @@ local HelikeLabel = {
     FadeDistances = { 1.5, 140.0 },
     FadeWidths = { 0.5, 50.0 }
   },
-  Tag = { "solarsystem_labels", "moon_labels", "minor_moon_labels" },
+  Tag = {
+    "solarsystem_labels",
+    "moon_labels",
+    "minor_moon_labels",
+    "minor_moon_labels_jupiter",
+    "minor_moon_labels_pasiphae"
+  },
   GUI = {
     Name = "Helike Label",
     Path = "/Solar System/Planets/Jupiter/Minor Moons/Pasiphae Group/Helike",
@@ -299,6 +320,7 @@ local OrthosieTrail = {
     "moonTrail_solarSystem",
     "moonTrail_giants",
     "moonTrail_jupiter",
+    "moonTrail_pasiphae",
     "moonTrail_minor",
     "moonTrail_minor_jupiter"
   },
@@ -325,7 +347,13 @@ local OrthosieLabel = {
     FadeDistances = { 1.5, 140.0 },
     FadeWidths = { 0.5, 50.0 }
   },
-  Tag = { "solarsystem_labels", "moon_labels", "minor_moon_labels" },
+  Tag = {
+    "solarsystem_labels",
+    "moon_labels",
+    "minor_moon_labels",
+    "minor_moon_labels_jupiter",
+    "minor_moon_labels_pasiphae"
+  },
   GUI = {
     Name = "Orthosie Label",
     Path = "/Solar System/Planets/Jupiter/Minor Moons/Pasiphae Group/Orthosie",
@@ -381,6 +409,7 @@ local S2016J1Trail = {
     "moonTrail_solarSystem",
     "moonTrail_giants",
     "moonTrail_jupiter",
+    "moonTrail_pasiphae",
     "moonTrail_minor",
     "moonTrail_minor_jupiter"
   },
@@ -407,7 +436,13 @@ local S2016J1Label = {
     FadeDistances = { 1.5, 140.0 },
     FadeWidths = { 0.5, 50.0 }
   },
-  Tag = { "solarsystem_labels", "moon_labels", "minor_moon_labels" },
+  Tag = {
+    "solarsystem_labels",
+    "moon_labels",
+    "minor_moon_labels",
+    "minor_moon_labels_jupiter",
+    "minor_moon_labels_pasiphae"
+  },
   GUI = {
     Name = "S/2016 J 1 Label",
     Path = "/Solar System/Planets/Jupiter/Minor Moons/Pasiphae Group/S2016J1",
@@ -463,6 +498,7 @@ local S2003J15Trail = {
     "moonTrail_solarSystem",
     "moonTrail_giants",
     "moonTrail_jupiter",
+    "moonTrail_pasiphae",
     "moonTrail_minor",
     "moonTrail_minor_jupiter"
   },
@@ -489,7 +525,13 @@ local S2003J15Label = {
     FadeDistances = { 1.5, 140.0 },
     FadeWidths = { 0.5, 50.0 }
   },
-  Tag = { "solarsystem_labels", "moon_labels", "minor_moon_labels" },
+  Tag = {
+    "solarsystem_labels",
+    "moon_labels",
+    "minor_moon_labels",
+    "minor_moon_labels_jupiter",
+    "minor_moon_labels_pasiphae"
+  },
   GUI = {
     Name = "S/2003 J 15 Label",
     Path = "/Solar System/Planets/Jupiter/Minor Moons/Pasiphae Group/S2003J15",
@@ -545,6 +587,7 @@ local AoedeTrail = {
     "moonTrail_solarSystem",
     "moonTrail_giants",
     "moonTrail_jupiter",
+    "moonTrail_pasiphae",
     "moonTrail_minor",
     "moonTrail_minor_jupiter"
   },
@@ -571,7 +614,13 @@ local AoedeLabel = {
     FadeDistances = { 1.5, 140.0 },
     FadeWidths = { 0.5, 50.0 }
   },
-  Tag = { "solarsystem_labels", "moon_labels", "minor_moon_labels" },
+  Tag = {
+    "solarsystem_labels",
+    "moon_labels",
+    "minor_moon_labels",
+    "minor_moon_labels_jupiter",
+    "minor_moon_labels_pasiphae"
+  },
   GUI = {
     Name = "Aoede Label",
     Path = "/Solar System/Planets/Jupiter/Minor Moons/Pasiphae Group/Aoede",
@@ -627,6 +676,7 @@ local CallirrhoeTrail = {
     "moonTrail_solarSystem",
     "moonTrail_giants",
     "moonTrail_jupiter",
+    "moonTrail_pasiphae",
     "moonTrail_minor",
     "moonTrail_minor_jupiter"
   },
@@ -653,7 +703,13 @@ local CallirrhoeLabel = {
     FadeDistances = { 1.5, 140.0 },
     FadeWidths = { 0.5, 50.0 }
   },
-  Tag = { "solarsystem_labels", "moon_labels", "minor_moon_labels" },
+  Tag = {
+    "solarsystem_labels",
+    "moon_labels",
+    "minor_moon_labels",
+    "minor_moon_labels_jupiter",
+    "minor_moon_labels_pasiphae"
+  },
   GUI = {
     Name = "Callirrhoe Label",
     Path = "/Solar System/Planets/Jupiter/Minor Moons/Pasiphae Group/Callirrhoe",
@@ -709,6 +765,7 @@ local EurydomeTrail = {
     "moonTrail_solarSystem",
     "moonTrail_giants",
     "moonTrail_jupiter",
+    "moonTrail_pasiphae",
     "moonTrail_minor",
     "moonTrail_minor_jupiter"
   },
@@ -735,7 +792,13 @@ local EurydomeLabel = {
     FadeDistances = { 1.5, 140.0 },
     FadeWidths = { 0.5, 50.0 }
   },
-  Tag = { "solarsystem_labels", "moon_labels", "minor_moon_labels" },
+  Tag = {
+    "solarsystem_labels",
+    "moon_labels",
+    "minor_moon_labels",
+    "minor_moon_labels_jupiter",
+    "minor_moon_labels_pasiphae"
+  },
   GUI = {
     Name = "Eurydome Label",
     Path = "/Solar System/Planets/Jupiter/Minor Moons/Pasiphae Group/Eurydome",
@@ -791,6 +854,7 @@ local KoreTrail = {
     "moonTrail_solarSystem",
     "moonTrail_giants",
     "moonTrail_jupiter",
+    "moonTrail_pasiphae",
     "moonTrail_minor",
     "moonTrail_minor_jupiter"
   },
@@ -817,7 +881,13 @@ local KoreLabel = {
     FadeDistances = { 1.5, 140.0 },
     FadeWidths = { 0.5, 50.0 }
   },
-  Tag = { "solarsystem_labels", "moon_labels", "minor_moon_labels" },
+  Tag = {
+    "solarsystem_labels",
+    "moon_labels",
+    "minor_moon_labels",
+    "minor_moon_labels_jupiter",
+    "minor_moon_labels_pasiphae"
+  },
   GUI = {
     Name = "Kore Label",
     Path = "/Solar System/Planets/Jupiter/Minor Moons/Pasiphae Group/Kore",
@@ -873,6 +943,7 @@ local CylleneTrail = {
     "moonTrail_solarSystem",
     "moonTrail_giants",
     "moonTrail_jupiter",
+    "moonTrail_pasiphae",
     "moonTrail_minor",
     "moonTrail_minor_jupiter"
   },
@@ -899,7 +970,13 @@ local CylleneLabel = {
     FadeDistances = { 1.5, 140.0 },
     FadeWidths = { 0.5, 50.0 }
   },
-  Tag = { "solarsystem_labels", "moon_labels", "minor_moon_labels" },
+  Tag = {
+    "solarsystem_labels",
+    "moon_labels",
+    "minor_moon_labels",
+    "minor_moon_labels_jupiter",
+    "minor_moon_labels_pasiphae"
+  },
   GUI = {
     Name = "Cyllene Label",
     Path = "/Solar System/Planets/Jupiter/Minor Moons/Pasiphae Group/Cyllene",
@@ -955,6 +1032,7 @@ local S2011J2Trail = {
     "moonTrail_solarSystem",
     "moonTrail_giants",
     "moonTrail_jupiter",
+    "moonTrail_pasiphae",
     "moonTrail_minor",
     "moonTrail_minor_jupiter"
   },
@@ -981,7 +1059,13 @@ local S2011J2Label = {
     FadeDistances = { 1.5, 140.0 },
     FadeWidths = { 0.5, 50.0 }
   },
-  Tag = { "solarsystem_labels", "moon_labels", "minor_moon_labels" },
+  Tag = {
+    "solarsystem_labels",
+    "moon_labels",
+    "minor_moon_labels",
+    "minor_moon_labels_jupiter",
+    "minor_moon_labels_pasiphae"
+  },
   GUI = {
     Name = "S/2011 J 2 Label",
     Path = "/Solar System/Planets/Jupiter/Minor Moons/Pasiphae Group/S2011J2",
@@ -1037,6 +1121,7 @@ local S2017J1Trail = {
     "moonTrail_solarSystem",
     "moonTrail_giants",
     "moonTrail_jupiter",
+    "moonTrail_pasiphae",
     "moonTrail_minor",
     "moonTrail_minor_jupiter"
   },
@@ -1063,7 +1148,13 @@ local S2017J1Label = {
     FadeDistances = { 1.5, 140.0 },
     FadeWidths = { 0.5, 50.0 }
   },
-  Tag = { "solarsystem_labels", "moon_labels", "minor_moon_labels" },
+  Tag = {
+    "solarsystem_labels",
+    "moon_labels",
+    "minor_moon_labels",
+    "minor_moon_labels_jupiter",
+    "minor_moon_labels_pasiphae"
+  },
   GUI = {
     Name = "S/2017 J 1 Label",
     Path = "/Solar System/Planets/Jupiter/Minor Moons/Pasiphae Group/S2017J1",
@@ -1119,6 +1210,7 @@ local S2003J4Trail = {
     "moonTrail_solarSystem",
     "moonTrail_giants",
     "moonTrail_jupiter",
+    "moonTrail_pasiphae",
     "moonTrail_minor",
     "moonTrail_minor_jupiter"
   },
@@ -1145,7 +1237,13 @@ local S2003J4Label = {
     FadeDistances = { 1.5, 140.0 },
     FadeWidths = { 0.5, 50.0 }
   },
-  Tag = { "solarsystem_labels", "moon_labels", "minor_moon_labels" },
+  Tag = {
+    "solarsystem_labels",
+    "moon_labels",
+    "minor_moon_labels",
+    "minor_moon_labels_jupiter",
+    "minor_moon_labels_pasiphae"
+  },
   GUI = {
     Name = "S/2003 J 4 Label",
     Path = "/Solar System/Planets/Jupiter/Minor Moons/Pasiphae Group/S2003J4",
@@ -1201,6 +1299,7 @@ local PasiphaeTrail = {
     "moonTrail_solarSystem",
     "moonTrail_giants",
     "moonTrail_jupiter",
+    "moonTrail_pasiphae",
     "moonTrail_minor",
     "moonTrail_minor_jupiter"
   },
@@ -1227,7 +1326,13 @@ local PasiphaeLabel = {
     FadeDistances = { 1.5, 140.0 },
     FadeWidths = { 0.5, 50.0 }
   },
-  Tag = { "solarsystem_labels", "moon_labels", "minor_moon_labels" },
+  Tag = {
+    "solarsystem_labels",
+    "moon_labels",
+    "minor_moon_labels",
+    "minor_moon_labels_jupiter",
+    "minor_moon_labels_pasiphae"
+  },
   GUI = {
     Name = "Pasiphae Label",
     Path = "/Solar System/Planets/Jupiter/Minor Moons/Pasiphae Group/Pasiphae",
@@ -1283,6 +1388,7 @@ local HegemoneTrail = {
     "moonTrail_solarSystem",
     "moonTrail_giants",
     "moonTrail_jupiter",
+    "moonTrail_pasiphae",
     "moonTrail_minor",
     "moonTrail_minor_jupiter"
   },
@@ -1309,7 +1415,13 @@ local HegemoneLabel = {
     FadeDistances = { 1.5, 140.0 },
     FadeWidths = { 0.5, 50.0 }
   },
-  Tag = { "solarsystem_labels", "moon_labels", "minor_moon_labels" },
+  Tag = {
+    "solarsystem_labels",
+    "moon_labels",
+    "minor_moon_labels",
+    "minor_moon_labels_jupiter",
+    "minor_moon_labels_pasiphae"
+  },
   GUI = {
     Name = "Hegemone Label",
     Path = "/Solar System/Planets/Jupiter/Minor Moons/Pasiphae Group/Hegemone",
@@ -1365,6 +1477,7 @@ local SinopeTrail = {
     "moonTrail_solarSystem",
     "moonTrail_giants",
     "moonTrail_jupiter",
+    "moonTrail_pasiphae",
     "moonTrail_minor",
     "moonTrail_minor_jupiter"
   },
@@ -1391,7 +1504,13 @@ local SinopeLabel = {
     FadeDistances = { 1.5, 140.0 },
     FadeWidths = { 0.5, 50.0 }
   },
-  Tag = { "solarsystem_labels", "moon_labels", "minor_moon_labels" },
+  Tag = {
+    "solarsystem_labels",
+    "moon_labels",
+    "minor_moon_labels",
+    "minor_moon_labels_jupiter",
+    "minor_moon_labels_pasiphae"
+  },
   GUI = {
     Name = "Sinope Label",
     Path = "/Solar System/Planets/Jupiter/Minor Moons/Pasiphae Group/Sinope",
@@ -1447,6 +1566,7 @@ local SpondeTrail = {
     "moonTrail_solarSystem",
     "moonTrail_giants",
     "moonTrail_jupiter",
+    "moonTrail_pasiphae",
     "moonTrail_minor",
     "moonTrail_minor_jupiter"
   },
@@ -1473,7 +1593,13 @@ local SpondeLabel = {
     FadeDistances = { 1.5, 140.0 },
     FadeWidths = { 0.5, 50.0 }
   },
-  Tag = { "solarsystem_labels", "moon_labels", "minor_moon_labels" },
+  Tag = {
+    "solarsystem_labels",
+    "moon_labels",
+    "minor_moon_labels",
+    "minor_moon_labels_jupiter",
+    "minor_moon_labels_pasiphae"
+  },
   GUI = {
     Name = "Sponde Label",
     Path = "/Solar System/Planets/Jupiter/Minor Moons/Pasiphae Group/Sponde",
@@ -1529,6 +1655,7 @@ local AutonoeTrail = {
     "moonTrail_solarSystem",
     "moonTrail_giants",
     "moonTrail_jupiter",
+    "moonTrail_pasiphae",
     "moonTrail_minor",
     "moonTrail_minor_jupiter"
   },
@@ -1555,7 +1682,13 @@ local AutonoeLabel = {
     FadeDistances = { 1.5, 140.0 },
     FadeWidths = { 0.5, 50.0 }
   },
-  Tag = { "solarsystem_labels", "moon_labels", "minor_moon_labels" },
+  Tag = {
+    "solarsystem_labels",
+    "moon_labels",
+    "minor_moon_labels",
+    "minor_moon_labels_jupiter",
+    "minor_moon_labels_pasiphae"
+  },
   GUI = {
     Name = "Autonoe Label",
     Path = "/Solar System/Planets/Jupiter/Minor Moons/Pasiphae Group/Autonoe",
@@ -1611,6 +1744,7 @@ local MegacliteTrail = {
     "moonTrail_solarSystem",
     "moonTrail_giants",
     "moonTrail_jupiter",
+    "moonTrail_pasiphae",
     "moonTrail_minor",
     "moonTrail_minor_jupiter"
   },
@@ -1637,7 +1771,13 @@ local MegacliteLabel = {
     FadeDistances = { 1.5, 140.0 },
     FadeWidths = { 0.5, 50.0 }
   },
-  Tag = { "solarsystem_labels", "moon_labels", "minor_moon_labels" },
+  Tag = {
+    "solarsystem_labels",
+    "moon_labels",
+    "minor_moon_labels",
+    "minor_moon_labels_jupiter",
+    "minor_moon_labels_pasiphae"
+  },
   GUI = {
     Name = "Megaclite Label",
     Path = "/Solar System/Planets/Jupiter/Minor Moons/Pasiphae Group/Megaclite",
@@ -1693,6 +1833,7 @@ local S2016J4Trail = {
     "moonTrail_solarSystem",
     "moonTrail_giants",
     "moonTrail_jupiter",
+    "moonTrail_pasiphae",
     "moonTrail_minor",
     "moonTrail_minor_jupiter"
   },
@@ -1719,7 +1860,13 @@ local S2016J4Label = {
     FadeDistances = { 1.5, 140.0 },
     FadeWidths = { 0.5, 50.0 }
   },
-  Tag = { "solarsystem_labels", "moon_labels", "minor_moon_labels" },
+  Tag = {
+    "solarsystem_labels",
+    "moon_labels",
+    "minor_moon_labels",
+    "minor_moon_labels_jupiter",
+    "minor_moon_labels_pasiphae"
+  },
   GUI = {
     Name = "S/2016 J 4 Label",
     Path = "/Solar System/Planets/Jupiter/Minor Moons/Pasiphae Group/S2016J4",
@@ -1775,6 +1922,7 @@ local S2017J6Trail = {
     "moonTrail_solarSystem",
     "moonTrail_giants",
     "moonTrail_jupiter",
+    "moonTrail_pasiphae",
     "moonTrail_minor",
     "moonTrail_minor_jupiter"
   },
@@ -1801,7 +1949,13 @@ local S2017J6Label = {
     FadeDistances = { 1.5, 140.0 },
     FadeWidths = { 0.5, 50.0 }
   },
-  Tag = { "solarsystem_labels", "moon_labels", "minor_moon_labels" },
+  Tag = {
+    "solarsystem_labels",
+    "moon_labels",
+    "minor_moon_labels",
+    "minor_moon_labels_jupiter",
+    "minor_moon_labels_pasiphae"
+  },
   GUI = {
     Name = "S/2017 J 6 Label",
     Path = "/Solar System/Planets/Jupiter/Minor Moons/Pasiphae Group/S2017J6",
@@ -1857,6 +2011,7 @@ local S2003J23Trail = {
     "moonTrail_solarSystem",
     "moonTrail_giants",
     "moonTrail_jupiter",
+    "moonTrail_pasiphae",
     "moonTrail_minor",
     "moonTrail_minor_jupiter"
   },
@@ -1883,7 +2038,13 @@ local S2003J23Label = {
     FadeDistances = { 1.5, 140.0 },
     FadeWidths = { 0.5, 50.0 }
   },
-  Tag = { "solarsystem_labels", "moon_labels", "minor_moon_labels" },
+  Tag = {
+    "solarsystem_labels",
+    "moon_labels",
+    "minor_moon_labels",
+    "minor_moon_labels_jupiter",
+    "minor_moon_labels_pasiphae"
+  },
   GUI = {
     Name = "S/2003 J 23 Label",
     Path = "/Solar System/Planets/Jupiter/Minor Moons/Pasiphae Group/S2003J23",
diff --git a/data/assets/scene/solarsystem/planets/jupiter/minor/themisto_group.asset b/data/assets/scene/solarsystem/planets/jupiter/minor/themisto_group.asset
index 6f992cd43b..f917531e97 100644
--- a/data/assets/scene/solarsystem/planets/jupiter/minor/themisto_group.asset
+++ b/data/assets/scene/solarsystem/planets/jupiter/minor/themisto_group.asset
@@ -52,6 +52,7 @@ local ThemistoTrail = {
     "moonTrail_solarSystem",
     "moonTrail_giants",
     "moonTrail_jupiter",
+    "moonTrail_themisto",
     "moonTrail_minor",
     "moonTrail_minor_jupiter"
   },
@@ -78,7 +79,13 @@ local ThemistoLabel = {
     FadeDistances = { 1.5, 120.0 },
     FadeWidths = { 0.5, 50.0 }
   },
-  Tag = { "solarsystem_labels", "moon_labels", "minor_moon_labels" },
+  Tag = {
+    "solarsystem_labels",
+    "moon_labels",
+    "minor_moon_labels",
+    "minor_moon_labels_jupiter",
+    "minor_moon_labels_themisto"
+  },
   GUI = {
     Name = "Themisto Label",
     Path = "/Solar System/Planets/Jupiter/Minor Moons/Themisto Group/Themisto",
diff --git a/data/assets/scene/solarsystem/planets/saturn/minor/gallic_group.asset b/data/assets/scene/solarsystem/planets/saturn/minor/gallic_group.asset
index 9e3f76a20f..01f08094fc 100644
--- a/data/assets/scene/solarsystem/planets/saturn/minor/gallic_group.asset
+++ b/data/assets/scene/solarsystem/planets/saturn/minor/gallic_group.asset
@@ -52,6 +52,7 @@ local AlbiorixTrail = {
     "moonTrail_solarSystem",
     "moonTrail_giants",
     "moonTrail_saturn",
+    "moonTrail_gallic",
     "moonTrail_minor",
     "moonTrail_minor_saturn"
   },
@@ -78,7 +79,13 @@ local AlbiorixLabel = {
     FadeDistances = { 1.25, 90.0 },
     FadeWidths = { 0.25, 90.0 }
   },
-  Tag = { "solarsystem_labels", "moon_labels", "minor_moon_labels" },
+  Tag = {
+    "solarsystem_labels",
+    "moon_labels",
+    "minor_moon_labels",
+    "minor_moon_labels_saturn",
+    "minor_moon_labels_gallic"
+  },
   GUI = {
     Name = "Albiorix Label",
     Path = "/Solar System/Planets/Saturn/Minor Moons/Gallic Group/Albiorix",
@@ -134,6 +141,7 @@ local BebhionnTrail = {
     "moonTrail_solarSystem",
     "moonTrail_giants",
     "moonTrail_saturn",
+    "moonTrail_gallic",
     "moonTrail_minor",
     "moonTrail_minor_saturn"
   },
@@ -160,7 +168,13 @@ local BebhionnLabel = {
     FadeDistances = { 1.25, 90.0 },
     FadeWidths = { 0.25, 90.0 }
   },
-  Tag = { "solarsystem_labels", "moon_labels", "minor_moon_labels" },
+  Tag = {
+    "solarsystem_labels",
+    "moon_labels",
+    "minor_moon_labels",
+    "minor_moon_labels_saturn",
+    "minor_moon_labels_gallic"
+  },
   GUI = {
     Name = "Bebhionn Label",
     Path = "/Solar System/Planets/Saturn/Minor Moons/Gallic Group/Bebhionn",
@@ -216,6 +230,7 @@ local ErriapusTrail = {
     "moonTrail_solarSystem",
     "moonTrail_giants",
     "moonTrail_saturn",
+    "moonTrail_gallic",
     "moonTrail_minor",
     "moonTrail_minor_saturn"
   },
@@ -242,7 +257,13 @@ local ErriapusLabel = {
     FadeDistances = { 1.25, 90.0 },
     FadeWidths = { 0.25, 90.0 }
   },
-  Tag = { "solarsystem_labels", "moon_labels", "minor_moon_labels" },
+  Tag = {
+    "solarsystem_labels",
+    "moon_labels",
+    "minor_moon_labels",
+    "minor_moon_labels_saturn",
+    "minor_moon_labels_gallic"
+  },
   GUI = {
     Name = "Erriapus Label",
     Path = "/Solar System/Planets/Saturn/Minor Moons/Gallic Group/Erriapus",
@@ -298,6 +319,7 @@ local TarvosTrail = {
     "moonTrail_solarSystem",
     "moonTrail_giants",
     "moonTrail_saturn",
+    "moonTrail_gallic",
     "moonTrail_minor",
     "moonTrail_minor_saturn"
   },
@@ -324,7 +346,13 @@ local TarvosLabel = {
     FadeDistances = { 1.25, 90.0 },
     FadeWidths = { 0.25, 90.0 }
   },
-  Tag = { "solarsystem_labels", "moon_labels", "minor_moon_labels" },
+  Tag = {
+    "solarsystem_labels",
+    "moon_labels",
+    "minor_moon_labels",
+    "minor_moon_labels_saturn",
+    "minor_moon_labels_gallic"
+  },
   GUI = {
     Name = "Tarvos Label",
     Path = "/Solar System/Planets/Saturn/Minor Moons/Gallic Group/Tarvos",
diff --git a/data/assets/scene/solarsystem/planets/saturn/minor/inuit_group.asset b/data/assets/scene/solarsystem/planets/saturn/minor/inuit_group.asset
index 12664f2416..e4b12e8bfe 100644
--- a/data/assets/scene/solarsystem/planets/saturn/minor/inuit_group.asset
+++ b/data/assets/scene/solarsystem/planets/saturn/minor/inuit_group.asset
@@ -52,6 +52,7 @@ local KiviuqTrail = {
     "moonTrail_solarSystem",
     "moonTrail_giants",
     "moonTrail_saturn",
+    "moonTrail_inuit",
     "moonTrail_minor",
     "moonTrail_minor_saturn"
   },
@@ -78,7 +79,13 @@ local KiviuqLabel = {
     FadeDistances = { 1.25, 90.0 },
     FadeWidths = { 0.25, 90.0 }
   },
-  Tag = { "solarsystem_labels", "moon_labels", "minor_moon_labels" },
+  Tag = {
+    "solarsystem_labels",
+    "moon_labels",
+    "minor_moon_labels",
+    "minor_moon_labels_saturn",
+    "minor_moon_labels_inuit"
+  },
   GUI = {
     Name = "Kiviuq Label",
     Path = "/Solar System/Planets/Saturn/Minor Moons/Inuit Group/Kiviuq",
@@ -134,6 +141,7 @@ local IjiraqTrail = {
     "moonTrail_solarSystem",
     "moonTrail_giants",
     "moonTrail_saturn",
+    "moonTrail_inuit",
     "moonTrail_minor",
     "moonTrail_minor_saturn"
   },
@@ -160,7 +168,13 @@ local IjiraqLabel = {
     FadeDistances = { 1.25, 90.0 },
     FadeWidths = { 0.25, 90.0 }
   },
-  Tag = { "solarsystem_labels", "moon_labels", "minor_moon_labels" },
+  Tag = {
+    "solarsystem_labels",
+    "moon_labels",
+    "minor_moon_labels",
+    "minor_moon_labels_saturn",
+    "minor_moon_labels_inuit"
+  },
   GUI = {
     Name = "Ijiraq Label",
     Path = "/Solar System/Planets/Saturn/Minor Moons/Inuit Group/Ijiraq",
@@ -216,6 +230,7 @@ local PaaliaqTrail = {
     "moonTrail_solarSystem",
     "moonTrail_giants",
     "moonTrail_saturn",
+    "moonTrail_inuit",
     "moonTrail_minor",
     "moonTrail_minor_saturn"
   },
@@ -242,7 +257,13 @@ local PaaliaqLabel = {
     FadeDistances = { 1.25, 90.0 },
     FadeWidths = { 0.25, 90.0 }
   },
-  Tag = { "solarsystem_labels", "moon_labels", "minor_moon_labels" },
+  Tag = {
+    "solarsystem_labels",
+    "moon_labels",
+    "minor_moon_labels",
+    "minor_moon_labels_saturn",
+    "minor_moon_labels_inuit"
+  },
   GUI = {
     Name = "Paaliaq Label",
     Path = "/Solar System/Planets/Saturn/Minor Moons/Inuit Group/Paaliaq",
@@ -298,6 +319,7 @@ local SiarnaqTrail = {
     "moonTrail_solarSystem",
     "moonTrail_giants",
     "moonTrail_saturn",
+    "moonTrail_inuit",
     "moonTrail_minor",
     "moonTrail_minor_saturn"
   },
@@ -324,7 +346,13 @@ local SiarnaqLabel = {
     FadeDistances = { 1.25, 90.0 },
     FadeWidths = { 0.25, 90.0 }
   },
-  Tag = { "solarsystem_labels", "moon_labels", "minor_moon_labels" },
+  Tag = {
+    "solarsystem_labels",
+    "moon_labels",
+    "minor_moon_labels",
+    "minor_moon_labels_saturn",
+    "minor_moon_labels_inuit"
+  },
   GUI = {
     Name = "Siarnaq Label",
     Path = "/Solar System/Planets/Saturn/Minor Moons/Inuit Group/Siarnaq",
@@ -380,6 +408,7 @@ local TarqeqTrail = {
     "moonTrail_solarSystem",
     "moonTrail_giants",
     "moonTrail_saturn",
+    "moonTrail_inuit",
     "moonTrail_minor",
     "moonTrail_minor_saturn"
   },
@@ -406,7 +435,13 @@ local TarqeqLabel = {
     FadeDistances = { 1.25, 90.0 },
     FadeWidths = { 0.25, 90.0 }
   },
-  Tag = { "solarsystem_labels", "moon_labels", "minor_moon_labels" },
+  Tag = {
+    "solarsystem_labels",
+    "moon_labels",
+    "minor_moon_labels",
+    "minor_moon_labels_saturn",
+    "minor_moon_labels_inuit"
+  },
   GUI = {
     Name = "Tarqeq Label",
     Path = "/Solar System/Planets/Saturn/Minor Moons/Inuit Group/Tarqeq",
@@ -462,6 +497,7 @@ local S2004S29Trail = {
     "moonTrail_solarSystem",
     "moonTrail_giants",
     "moonTrail_saturn",
+    "moonTrail_inuit",
     "moonTrail_minor",
     "moonTrail_minor_saturn"
   },
@@ -488,7 +524,13 @@ local S2004S29Label = {
     FadeDistances = { 1.25, 90.0 },
     FadeWidths = { 0.25, 90.0 }
   },
-  Tag = { "solarsystem_labels", "moon_labels", "minor_moon_labels" },
+  Tag = {
+    "solarsystem_labels",
+    "moon_labels",
+    "minor_moon_labels",
+    "minor_moon_labels_saturn",
+    "minor_moon_labels_inuit"
+  },
   GUI = {
     Name = "S/2004 S 29 Label",
     Path = "/Solar System/Planets/Saturn/Minor Moons/Inuit Group/S2004S29",
@@ -544,6 +586,7 @@ local S2004S31Trail = {
     "moonTrail_solarSystem",
     "moonTrail_giants",
     "moonTrail_saturn",
+    "moonTrail_inuit",
     "moonTrail_minor",
     "moonTrail_minor_saturn"
   },
@@ -570,7 +613,13 @@ local S2004S31Label = {
     FadeDistances = { 1.25, 90.0 },
     FadeWidths = { 0.25, 90.0 }
   },
-  Tag = { "solarsystem_labels", "moon_labels", "minor_moon_labels" },
+  Tag = {
+    "solarsystem_labels",
+    "moon_labels",
+    "minor_moon_labels",
+    "minor_moon_labels_saturn",
+    "minor_moon_labels_inuit"
+  },
   GUI = {
     Name = "S/2004 S 31 Label",
     Path = "/Solar System/Planets/Saturn/Minor Moons/Inuit Group/S2004S31",
@@ -626,6 +675,7 @@ local S2019S01Trail = {
     "moonTrail_solarSystem",
     "moonTrail_giants",
     "moonTrail_saturn",
+    "moonTrail_inuit",
     "moonTrail_minor",
     "moonTrail_minor_saturn"
   },
@@ -652,7 +702,13 @@ local S2019S01Label = {
     FadeDistances = { 1.25, 90.0 },
     FadeWidths = { 0.25, 90.0 }
   },
-  Tag = { "solarsystem_labels", "moon_labels", "minor_moon_labels" },
+  Tag = {
+    "solarsystem_labels",
+    "moon_labels",
+    "minor_moon_labels",
+    "minor_moon_labels_saturn",
+    "minor_moon_labels_inuit"
+  },
   GUI = {
     Name = "S/2019 S 01 Label",
     Path = "/Solar System/Planets/Saturn/Minor Moons/Inuit Group/S2019S01",
diff --git a/data/assets/scene/solarsystem/planets/saturn/minor/norse_group.asset b/data/assets/scene/solarsystem/planets/saturn/minor/norse_group.asset
index 27996bedf8..4e7d3517cc 100644
--- a/data/assets/scene/solarsystem/planets/saturn/minor/norse_group.asset
+++ b/data/assets/scene/solarsystem/planets/saturn/minor/norse_group.asset
@@ -53,6 +53,7 @@ local PhoebeTrail = {
     "moonTrail_solarSystem",
     "moonTrail_giants",
     "moonTrail_saturn",
+    "moonTrail_norse",
     "moonTrail_minor",
     "moonTrail_minor_saturn"
   },
@@ -79,7 +80,13 @@ local PhoebeLabel = {
     FadeDistances = { 1.25, 90.0 },
     FadeWidths = { 0.25, 90.0 }
   },
-  Tag = { "solarsystem_labels", "moon_labels", "minor_moon_labels" },
+  Tag = {
+    "solarsystem_labels",
+    "moon_labels",
+    "minor_moon_labels",
+    "minor_moon_labels_saturn",
+    "minor_moon_labels_norse"
+  },
   GUI = {
     Name = "Phoebe Label",
     Path = "/Solar System/Planets/Saturn/Minor Moons/Norse Group/Phoebe",
@@ -135,6 +142,7 @@ local SkathiTrail = {
     "moonTrail_solarSystem",
     "moonTrail_giants",
     "moonTrail_saturn",
+    "moonTrail_norse",
     "moonTrail_minor",
     "moonTrail_minor_saturn"
   },
@@ -161,7 +169,13 @@ local SkathiLabel = {
     FadeDistances = { 1.25, 90.0 },
     FadeWidths = { 0.25, 90.0 }
   },
-  Tag = { "solarsystem_labels", "moon_labels", "minor_moon_labels" },
+  Tag = {
+    "solarsystem_labels",
+    "moon_labels",
+    "minor_moon_labels",
+    "minor_moon_labels_saturn",
+    "minor_moon_labels_norse"
+  },
   GUI = {
     Name = "Skathi Label",
     Path = "/Solar System/Planets/Saturn/Minor Moons/Norse Group/Skathi",
@@ -217,6 +231,7 @@ local S2007S2Trail = {
     "moonTrail_solarSystem",
     "moonTrail_giants",
     "moonTrail_saturn",
+    "moonTrail_norse",
     "moonTrail_minor",
     "moonTrail_minor_saturn"
   },
@@ -243,7 +258,13 @@ local S2007S2Label = {
     FadeDistances = { 1.25, 90.0 },
     FadeWidths = { 0.25, 90.0 }
   },
-  Tag = { "solarsystem_labels", "moon_labels", "minor_moon_labels" },
+  Tag = {
+    "solarsystem_labels",
+    "moon_labels",
+    "minor_moon_labels",
+    "minor_moon_labels_saturn",
+    "minor_moon_labels_norse"
+  },
   GUI = {
     Name = "S/2007 S 2 Label",
     Path = "/Solar System/Planets/Saturn/Minor Moons/Norse Group/S2007S2",
@@ -299,6 +320,7 @@ local SkollTrail = {
     "moonTrail_solarSystem",
     "moonTrail_giants",
     "moonTrail_saturn",
+    "moonTrail_norse",
     "moonTrail_minor",
     "moonTrail_minor_saturn"
   },
@@ -325,7 +347,13 @@ local SkollLabel = {
     FadeDistances = { 1.25, 90.0 },
     FadeWidths = { 0.25, 90.0 }
   },
-  Tag = { "solarsystem_labels", "moon_labels", "minor_moon_labels" },
+  Tag = {
+    "solarsystem_labels",
+    "moon_labels",
+    "minor_moon_labels",
+    "minor_moon_labels_saturn",
+    "minor_moon_labels_norse"
+  },
   GUI = {
     Name = "Skoll Label",
     Path = "/Solar System/Planets/Saturn/Minor Moons/Norse Group/Skoll",
@@ -381,6 +409,7 @@ local S2004S13Trail = {
     "moonTrail_solarSystem",
     "moonTrail_giants",
     "moonTrail_saturn",
+    "moonTrail_norse",
     "moonTrail_minor",
     "moonTrail_minor_saturn"
   },
@@ -407,7 +436,13 @@ local S2004S13Label = {
     FadeDistances = { 1.25, 90.0 },
     FadeWidths = { 0.25, 90.0 }
   },
-  Tag = { "solarsystem_labels", "moon_labels", "minor_moon_labels" },
+  Tag = {
+    "solarsystem_labels",
+    "moon_labels",
+    "minor_moon_labels",
+    "minor_moon_labels_saturn",
+    "minor_moon_labels_norse"
+  },
   GUI = {
     Name = "S/2004 S 13 Label",
     Path = "/Solar System/Planets/Saturn/Minor Moons/Norse Group/S2004S13",
@@ -463,6 +498,7 @@ local GreipTrail = {
     "moonTrail_solarSystem",
     "moonTrail_giants",
     "moonTrail_saturn",
+    "moonTrail_norse",
     "moonTrail_minor",
     "moonTrail_minor_saturn"
   },
@@ -489,7 +525,13 @@ local GreipLabel = {
     FadeDistances = { 1.25, 90.0 },
     FadeWidths = { 0.25, 90.0 }
   },
-  Tag = { "solarsystem_labels", "moon_labels", "minor_moon_labels" },
+  Tag = {
+    "solarsystem_labels",
+    "moon_labels",
+    "minor_moon_labels",
+    "minor_moon_labels_saturn",
+    "minor_moon_labels_norse"
+  },
   GUI = {
     Name = "Greip Label",
     Path = "/Solar System/Planets/Saturn/Minor Moons/Norse Group/Greip",
@@ -545,6 +587,7 @@ local HyrrokkinTrail = {
     "moonTrail_solarSystem",
     "moonTrail_giants",
     "moonTrail_saturn",
+    "moonTrail_norse",
     "moonTrail_minor",
     "moonTrail_minor_saturn"
   },
@@ -571,7 +614,13 @@ local HyrrokkinLabel = {
     FadeDistances = { 1.25, 90.0 },
     FadeWidths = { 0.25, 90.0 }
   },
-  Tag = { "solarsystem_labels", "moon_labels", "minor_moon_labels" },
+  Tag = {
+    "solarsystem_labels",
+    "moon_labels",
+    "minor_moon_labels",
+    "minor_moon_labels_saturn",
+    "minor_moon_labels_norse"
+  },
   GUI = {
     Name = "Hyrrokkin Label",
     Path = "/Solar System/Planets/Saturn/Minor Moons/Norse Group/Hyrrokkin",
@@ -627,6 +676,7 @@ local JarnsaxaTrail = {
     "moonTrail_solarSystem",
     "moonTrail_giants",
     "moonTrail_saturn",
+    "moonTrail_norse",
     "moonTrail_minor",
     "moonTrail_minor_saturn"
   },
@@ -653,7 +703,13 @@ local JarnsaxaLabel = {
     FadeDistances = { 1.25, 90.0 },
     FadeWidths = { 0.25, 90.0 }
   },
-  Tag = { "solarsystem_labels", "moon_labels", "minor_moon_labels" },
+  Tag = {
+    "solarsystem_labels",
+    "moon_labels",
+    "minor_moon_labels",
+    "minor_moon_labels_saturn",
+    "minor_moon_labels_norse"
+  },
   GUI = {
     Name = "Jarnsaxa Label",
     Path = "/Solar System/Planets/Saturn/Minor Moons/Norse Group/Jarnsaxa",
@@ -709,6 +765,7 @@ local MundilfariTrail = {
     "moonTrail_solarSystem",
     "moonTrail_giants",
     "moonTrail_saturn",
+    "moonTrail_norse",
     "moonTrail_minor",
     "moonTrail_minor_saturn"
   },
@@ -735,7 +792,13 @@ local MundilfariLabel = {
     FadeDistances = { 1.25, 90.0 },
     FadeWidths = { 0.25, 90.0 }
   },
-  Tag = { "solarsystem_labels", "moon_labels", "minor_moon_labels" },
+  Tag = {
+    "solarsystem_labels",
+    "moon_labels",
+    "minor_moon_labels",
+    "minor_moon_labels_saturn",
+    "minor_moon_labels_norse"
+  },
   GUI = {
     Name = "Mundilfari Label",
     Path = "/Solar System/Planets/Saturn/Minor Moons/Norse Group/Mundilfari",
@@ -791,6 +854,7 @@ local S2006S1Trail = {
     "moonTrail_solarSystem",
     "moonTrail_giants",
     "moonTrail_saturn",
+    "moonTrail_norse",
     "moonTrail_minor",
     "moonTrail_minor_saturn"
   },
@@ -817,7 +881,13 @@ local S2006S1Label = {
     FadeDistances = { 1.25, 90.0 },
     FadeWidths = { 0.25, 90.0 }
   },
-  Tag = { "solarsystem_labels", "moon_labels", "minor_moon_labels" },
+  Tag = {
+    "solarsystem_labels",
+    "moon_labels",
+    "minor_moon_labels",
+    "minor_moon_labels_saturn",
+    "minor_moon_labels_norse"
+  },
   GUI = {
     Name = "S/2006 S 1 Label",
     Path = "/Solar System/Planets/Saturn/Minor Moons/Norse Group/S2006S1",
@@ -873,6 +943,7 @@ local S2004S17Trail = {
     "moonTrail_solarSystem",
     "moonTrail_giants",
     "moonTrail_saturn",
+    "moonTrail_norse",
     "moonTrail_minor",
     "moonTrail_minor_saturn"
   },
@@ -899,7 +970,13 @@ local S2004S17Label = {
     FadeDistances = { 1.25, 90.0 },
     FadeWidths = { 0.25, 90.0 }
   },
-  Tag = { "solarsystem_labels", "moon_labels", "minor_moon_labels" },
+  Tag = {
+    "solarsystem_labels",
+    "moon_labels",
+    "minor_moon_labels",
+    "minor_moon_labels_saturn",
+    "minor_moon_labels_norse"
+  },
   GUI = {
     Name = "S/2004 S 17 Label",
     Path = "/Solar System/Planets/Saturn/Minor Moons/Norse Group/S2004S17",
@@ -955,6 +1032,7 @@ local BergelmirTrail = {
     "moonTrail_solarSystem",
     "moonTrail_giants",
     "moonTrail_saturn",
+    "moonTrail_norse",
     "moonTrail_minor",
     "moonTrail_minor_saturn"
   },
@@ -981,7 +1059,13 @@ local BergelmirLabel = {
     FadeDistances = { 1.25, 90.0 },
     FadeWidths = { 0.25, 90.0 }
   },
-  Tag = { "solarsystem_labels", "moon_labels", "minor_moon_labels" },
+  Tag = {
+    "solarsystem_labels",
+    "moon_labels",
+    "minor_moon_labels",
+    "minor_moon_labels_saturn",
+    "minor_moon_labels_norse"
+  },
   GUI = {
     Name = "Bergelmir Label",
     Path = "/Solar System/Planets/Saturn/Minor Moons/Norse Group/Bergelmir",
@@ -1037,6 +1121,7 @@ local NarviTrail = {
     "moonTrail_solarSystem",
     "moonTrail_giants",
     "moonTrail_saturn",
+    "moonTrail_norse",
     "moonTrail_minor",
     "moonTrail_minor_saturn"
   },
@@ -1063,7 +1148,13 @@ local NarviLabel = {
     FadeDistances = { 1.25, 90.0 },
     FadeWidths = { 0.25, 90.0 }
   },
-  Tag = { "solarsystem_labels", "moon_labels", "minor_moon_labels" },
+  Tag = {
+    "solarsystem_labels",
+    "moon_labels",
+    "minor_moon_labels",
+    "minor_moon_labels_saturn",
+    "minor_moon_labels_norse"
+  },
   GUI = {
     Name = "Narvi Label",
     Path = "/Solar System/Planets/Saturn/Minor Moons/Norse Group/Narvi",
@@ -1119,6 +1210,7 @@ local SuttungrTrail = {
     "moonTrail_solarSystem",
     "moonTrail_giants",
     "moonTrail_saturn",
+    "moonTrail_norse",
     "moonTrail_minor",
     "moonTrail_minor_saturn"
   },
@@ -1145,7 +1237,13 @@ local SuttungrLabel = {
     FadeDistances = { 1.25, 90.0 },
     FadeWidths = { 0.25, 90.0 }
   },
-  Tag = { "solarsystem_labels", "moon_labels", "minor_moon_labels" },
+  Tag = {
+    "solarsystem_labels",
+    "moon_labels",
+    "minor_moon_labels",
+    "minor_moon_labels_saturn",
+    "minor_moon_labels_norse"
+  },
   GUI = {
     Name = "Suttungr Label",
     Path = "/Solar System/Planets/Saturn/Minor Moons/Norse Group/Suttungr",
@@ -1201,6 +1299,7 @@ local HatiTrail = {
     "moonTrail_solarSystem",
     "moonTrail_giants",
     "moonTrail_saturn",
+    "moonTrail_norse",
     "moonTrail_minor",
     "moonTrail_minor_saturn"
   },
@@ -1227,7 +1326,13 @@ local HatiLabel = {
     FadeDistances = { 1.25, 90.0 },
     FadeWidths = { 0.25, 90.0 }
   },
-  Tag = { "solarsystem_labels", "moon_labels", "minor_moon_labels" },
+  Tag = {
+    "solarsystem_labels",
+    "moon_labels",
+    "minor_moon_labels",
+    "minor_moon_labels_saturn",
+    "minor_moon_labels_norse"
+  },
   GUI = {
     Name = "Hati Label",
     Path = "/Solar System/Planets/Saturn/Minor Moons/Norse Group/Hati",
@@ -1283,6 +1388,7 @@ local S2004S12Trail = {
     "moonTrail_solarSystem",
     "moonTrail_giants",
     "moonTrail_saturn",
+    "moonTrail_norse",
     "moonTrail_minor",
     "moonTrail_minor_saturn"
   },
@@ -1309,7 +1415,13 @@ local S2004S12Label = {
     FadeDistances = { 1.25, 90.0 },
     FadeWidths = { 0.25, 90.0 }
   },
-  Tag = { "solarsystem_labels", "moon_labels", "minor_moon_labels" },
+  Tag = {
+    "solarsystem_labels",
+    "moon_labels",
+    "minor_moon_labels",
+    "minor_moon_labels_saturn",
+    "minor_moon_labels_norse"
+  },
   GUI = {
     Name = "S/2004 S 12 Label",
     Path = "/Solar System/Planets/Saturn/Minor Moons/Norse Group/S2004S12",
@@ -1365,6 +1477,7 @@ local FarbautiTrail = {
     "moonTrail_solarSystem",
     "moonTrail_giants",
     "moonTrail_saturn",
+    "moonTrail_norse",
     "moonTrail_minor",
     "moonTrail_minor_saturn"
   },
@@ -1391,7 +1504,13 @@ local FarbautiLabel = {
     FadeDistances = { 1.25, 90.0 },
     FadeWidths = { 0.25, 90.0 }
   },
-  Tag = { "solarsystem_labels", "moon_labels", "minor_moon_labels" },
+  Tag = {
+    "solarsystem_labels",
+    "moon_labels",
+    "minor_moon_labels",
+    "minor_moon_labels_saturn",
+    "minor_moon_labels_norse"
+  },
   GUI = {
     Name = "Farbauti Label",
     Path = "/Solar System/Planets/Saturn/Minor Moons/Norse Group/Farbauti",
@@ -1447,6 +1566,7 @@ local ThrymrTrail = {
     "moonTrail_solarSystem",
     "moonTrail_giants",
     "moonTrail_saturn",
+    "moonTrail_norse",
     "moonTrail_minor",
     "moonTrail_minor_saturn"
   },
@@ -1473,7 +1593,13 @@ local ThrymrLabel = {
     FadeDistances = { 1.25, 90.0 },
     FadeWidths = { 0.25, 90.0 }
   },
-  Tag = { "solarsystem_labels", "moon_labels", "minor_moon_labels" },
+  Tag = {
+    "solarsystem_labels",
+    "moon_labels",
+    "minor_moon_labels",
+    "minor_moon_labels_saturn",
+    "minor_moon_labels_norse"
+  },
   GUI = {
     Name = "Thrymr Label",
     Path = "/Solar System/Planets/Saturn/Minor Moons/Norse Group/Thrymr",
@@ -1529,6 +1655,7 @@ local AegirTrail = {
     "moonTrail_solarSystem",
     "moonTrail_giants",
     "moonTrail_saturn",
+    "moonTrail_norse",
     "moonTrail_minor",
     "moonTrail_minor_saturn"
   },
@@ -1555,7 +1682,13 @@ local AegirLabel = {
     FadeDistances = { 1.25, 90.0 },
     FadeWidths = { 0.25, 90.0 }
   },
-  Tag = { "solarsystem_labels", "moon_labels", "minor_moon_labels" },
+  Tag = {
+    "solarsystem_labels",
+    "moon_labels",
+    "minor_moon_labels",
+    "minor_moon_labels_saturn",
+    "minor_moon_labels_norse"
+  },
   GUI = {
     Name = "Aegir Label",
     Path = "/Solar System/Planets/Saturn/Minor Moons/Norse Group/Aegir",
@@ -1611,6 +1744,7 @@ local S2007S3Trail = {
     "moonTrail_solarSystem",
     "moonTrail_giants",
     "moonTrail_saturn",
+    "moonTrail_norse",
     "moonTrail_minor",
     "moonTrail_minor_saturn"
   },
@@ -1637,7 +1771,13 @@ local S2007S3Label = {
     FadeDistances = { 1.25, 90.0 },
     FadeWidths = { 0.25, 90.0 }
   },
-  Tag = { "solarsystem_labels", "moon_labels", "minor_moon_labels" },
+  Tag = {
+    "solarsystem_labels",
+    "moon_labels",
+    "minor_moon_labels",
+    "minor_moon_labels_saturn",
+    "minor_moon_labels_norse"
+  },
   GUI = {
     Name = "S/2007 S 3 Label",
     Path = "/Solar System/Planets/Saturn/Minor Moons/Norse Group/S2007S3",
@@ -1693,6 +1833,7 @@ local BestlaTrail = {
     "moonTrail_solarSystem",
     "moonTrail_giants",
     "moonTrail_saturn",
+    "moonTrail_norse",
     "moonTrail_minor",
     "moonTrail_minor_saturn"
   },
@@ -1719,7 +1860,13 @@ local BestlaLabel = {
     FadeDistances = { 1.25, 90.0 },
     FadeWidths = { 0.25, 90.0 }
   },
-  Tag = { "solarsystem_labels", "moon_labels", "minor_moon_labels" },
+  Tag = {
+    "solarsystem_labels",
+    "moon_labels",
+    "minor_moon_labels",
+    "minor_moon_labels_saturn",
+    "minor_moon_labels_norse"
+  },
   GUI = {
     Name = "Bestla Label",
     Path = "/Solar System/Planets/Saturn/Minor Moons/Norse Group/Bestla",
@@ -1775,6 +1922,7 @@ local S2004S7Trail = {
     "moonTrail_solarSystem",
     "moonTrail_giants",
     "moonTrail_saturn",
+    "moonTrail_norse",
     "moonTrail_minor",
     "moonTrail_minor_saturn"
   },
@@ -1801,7 +1949,13 @@ local S2004S7Label = {
     FadeDistances = { 1.25, 90.0 },
     FadeWidths = { 0.25, 90.0 }
   },
-  Tag = { "solarsystem_labels", "moon_labels", "minor_moon_labels" },
+  Tag = {
+    "solarsystem_labels",
+    "moon_labels",
+    "minor_moon_labels",
+    "minor_moon_labels_saturn",
+    "minor_moon_labels_norse"
+  },
   GUI = {
     Name = "S/2004 S 7 Label",
     Path = "/Solar System/Planets/Saturn/Minor Moons/Norse Group/S2004S7",
@@ -1857,6 +2011,7 @@ local S2006S3Trail = {
     "moonTrail_solarSystem",
     "moonTrail_giants",
     "moonTrail_saturn",
+    "moonTrail_norse",
     "moonTrail_minor",
     "moonTrail_minor_saturn"
   },
@@ -1883,7 +2038,13 @@ local S2006S3Label = {
     FadeDistances = { 1.25, 90.0 },
     FadeWidths = { 0.25, 90.0 }
   },
-  Tag = { "solarsystem_labels", "moon_labels", "minor_moon_labels" },
+  Tag = {
+    "solarsystem_labels",
+    "moon_labels",
+    "minor_moon_labels",
+    "minor_moon_labels_saturn",
+    "minor_moon_labels_norse"
+  },
   GUI = {
     Name = "S/2006 S 3 Label",
     Path = "/Solar System/Planets/Saturn/Minor Moons/Norse Group/S2006S3",
@@ -1939,6 +2100,7 @@ local FenrirTrail = {
     "moonTrail_solarSystem",
     "moonTrail_giants",
     "moonTrail_saturn",
+    "moonTrail_norse",
     "moonTrail_minor",
     "moonTrail_minor_saturn"
   },
@@ -1965,7 +2127,13 @@ local FenrirLabel = {
     FadeDistances = { 1.25, 90.0 },
     FadeWidths = { 0.25, 90.0 }
   },
-  Tag = { "solarsystem_labels", "moon_labels", "minor_moon_labels" },
+  Tag = {
+    "solarsystem_labels",
+    "moon_labels",
+    "minor_moon_labels",
+    "minor_moon_labels_saturn",
+    "minor_moon_labels_norse"
+  },
   GUI = {
     Name = "Fenrir Label",
     Path = "/Solar System/Planets/Saturn/Minor Moons/Norse Group/Fenrir",
@@ -2021,6 +2189,7 @@ local SurturTrail = {
     "moonTrail_solarSystem",
     "moonTrail_giants",
     "moonTrail_saturn",
+    "moonTrail_norse",
     "moonTrail_minor",
     "moonTrail_minor_saturn"
   },
@@ -2047,7 +2216,13 @@ local SurturLabel = {
     FadeDistances = { 1.25, 90.0 },
     FadeWidths = { 0.25, 90.0 }
   },
-  Tag = { "solarsystem_labels", "moon_labels", "minor_moon_labels" },
+  Tag = {
+    "solarsystem_labels",
+    "moon_labels",
+    "minor_moon_labels",
+    "minor_moon_labels_saturn",
+    "minor_moon_labels_norse"
+  },
   GUI = {
     Name = "Surtur Label",
     Path = "/Solar System/Planets/Saturn/Minor Moons/Norse Group/Surtur",
@@ -2103,6 +2278,7 @@ local KariTrail = {
     "moonTrail_solarSystem",
     "moonTrail_giants",
     "moonTrail_saturn",
+    "moonTrail_norse",
     "moonTrail_minor",
     "moonTrail_minor_saturn"
   },
@@ -2129,7 +2305,13 @@ local KariLabel = {
     FadeDistances = { 1.25, 90.0 },
     FadeWidths = { 0.25, 90.0 }
   },
-  Tag = { "solarsystem_labels", "moon_labels", "minor_moon_labels" },
+  Tag = {
+    "solarsystem_labels",
+    "moon_labels",
+    "minor_moon_labels",
+    "minor_moon_labels_saturn",
+    "minor_moon_labels_norse"
+  },
   GUI = {
     Name = "Kari Label",
     Path = "/Solar System/Planets/Saturn/Minor Moons/Norse Group/Kari",
@@ -2185,6 +2367,7 @@ local YmirTrail = {
     "moonTrail_solarSystem",
     "moonTrail_giants",
     "moonTrail_saturn",
+    "moonTrail_norse",
     "moonTrail_minor",
     "moonTrail_minor_saturn"
   },
@@ -2211,7 +2394,13 @@ local YmirLabel = {
     FadeDistances = { 1.25, 90.0 },
     FadeWidths = { 0.25, 90.0 }
   },
-  Tag = { "solarsystem_labels", "moon_labels", "minor_moon_labels" },
+  Tag = {
+    "solarsystem_labels",
+    "moon_labels",
+    "minor_moon_labels",
+    "minor_moon_labels_saturn",
+    "minor_moon_labels_norse"
+  },
   GUI = {
     Name = "Ymir Label",
     Path = "/Solar System/Planets/Saturn/Minor Moons/Norse Group/Ymir",
@@ -2267,6 +2456,7 @@ local LogeTrail = {
     "moonTrail_solarSystem",
     "moonTrail_giants",
     "moonTrail_saturn",
+    "moonTrail_norse",
     "moonTrail_minor",
     "moonTrail_minor_saturn"
   },
@@ -2293,7 +2483,13 @@ local LogeLabel = {
     FadeDistances = { 1.25, 90.0 },
     FadeWidths = { 0.25, 90.0 }
   },
-  Tag = { "solarsystem_labels", "moon_labels", "minor_moon_labels" },
+  Tag = {
+    "solarsystem_labels",
+    "moon_labels",
+    "minor_moon_labels",
+    "minor_moon_labels_saturn",
+    "minor_moon_labels_norse"
+  },
   GUI = {
     Name = "Loge Label",
     Path = "/Solar System/Planets/Saturn/Minor Moons/Norse Group/Loge",
@@ -2349,6 +2545,7 @@ local FornjotTrail = {
     "moonTrail_solarSystem",
     "moonTrail_giants",
     "moonTrail_saturn",
+    "moonTrail_norse",
     "moonTrail_minor",
     "moonTrail_minor_saturn"
   },
@@ -2375,7 +2572,13 @@ local FornjotLabel = {
     FadeDistances = { 1.25, 90.0 },
     FadeWidths = { 0.25, 90.0 }
   },
-  Tag = { "solarsystem_labels", "moon_labels", "minor_moon_labels" },
+  Tag = {
+    "solarsystem_labels",
+    "moon_labels",
+    "minor_moon_labels",
+    "minor_moon_labels_saturn",
+    "minor_moon_labels_norse"
+  },
   GUI = {
     Name = "Fornjot Label",
     Path = "/Solar System/Planets/Saturn/Minor Moons/Norse Group/Fornjot",
@@ -2431,6 +2634,7 @@ local SkadiTrail = {
     "moonTrail_solarSystem",
     "moonTrail_giants",
     "moonTrail_saturn",
+    "moonTrail_norse",
     "moonTrail_minor",
     "moonTrail_minor_saturn"
   },
@@ -2457,7 +2661,13 @@ local SkadiLabel = {
     FadeDistances = { 1.25, 90.0 },
     FadeWidths = { 0.25, 90.0 }
   },
-  Tag = { "solarsystem_labels", "moon_labels", "minor_moon_labels" },
+  Tag = {
+    "solarsystem_labels",
+    "moon_labels",
+    "minor_moon_labels",
+    "minor_moon_labels_saturn",
+    "minor_moon_labels_norse"
+  },
   GUI = {
     Name = "Skadi Label",
     Path = "/Solar System/Planets/Saturn/Minor Moons/Norse Group/Skadi",
@@ -2513,6 +2723,7 @@ local GridrTrail = {
     "moonTrail_solarSystem",
     "moonTrail_giants",
     "moonTrail_saturn",
+    "moonTrail_norse",
     "moonTrail_minor",
     "moonTrail_minor_saturn"
   },
@@ -2539,7 +2750,13 @@ local GridrLabel = {
     FadeDistances = { 1.25, 90.0 },
     FadeWidths = { 0.25, 90.0 }
   },
-  Tag = { "solarsystem_labels", "moon_labels", "minor_moon_labels" },
+  Tag = {
+    "solarsystem_labels",
+    "moon_labels",
+    "minor_moon_labels",
+    "minor_moon_labels_saturn",
+    "minor_moon_labels_norse"
+  },
   GUI = {
     Name = "Gridr Label",
     Path = "/Solar System/Planets/Saturn/Minor Moons/Norse Group/Gridr",
@@ -2595,6 +2812,7 @@ local AngrbodaTrail = {
     "moonTrail_solarSystem",
     "moonTrail_giants",
     "moonTrail_saturn",
+    "moonTrail_norse",
     "moonTrail_minor",
     "moonTrail_minor_saturn"
   },
@@ -2621,7 +2839,13 @@ local AngrbodaLabel = {
     FadeDistances = { 1.25, 90.0 },
     FadeWidths = { 0.25, 90.0 }
   },
-  Tag = { "solarsystem_labels", "moon_labels", "minor_moon_labels" },
+  Tag = {
+    "solarsystem_labels",
+    "moon_labels",
+    "minor_moon_labels",
+    "minor_moon_labels_saturn",
+    "minor_moon_labels_norse"
+  },
   GUI = {
     Name = "Angrboda Label",
     Path = "/Solar System/Planets/Saturn/Minor Moons/Norse Group/Angrboda",
@@ -2677,6 +2901,7 @@ local SkrymirTrail = {
     "moonTrail_solarSystem",
     "moonTrail_giants",
     "moonTrail_saturn",
+    "moonTrail_norse",
     "moonTrail_minor",
     "moonTrail_minor_saturn"
   },
@@ -2703,7 +2928,13 @@ local SkrymirLabel = {
     FadeDistances = { 1.25, 90.0 },
     FadeWidths = { 0.25, 90.0 }
   },
-  Tag = { "solarsystem_labels", "moon_labels", "minor_moon_labels" },
+  Tag = {
+    "solarsystem_labels",
+    "moon_labels",
+    "minor_moon_labels",
+    "minor_moon_labels_saturn",
+    "minor_moon_labels_norse"
+  },
   GUI = {
     Name = "Skrymir Label",
     Path = "/Solar System/Planets/Saturn/Minor Moons/Norse Group/Skrymir",
@@ -2759,6 +2990,7 @@ local GerdTrail = {
     "moonTrail_solarSystem",
     "moonTrail_giants",
     "moonTrail_saturn",
+    "moonTrail_norse",
     "moonTrail_minor",
     "moonTrail_minor_saturn"
   },
@@ -2785,7 +3017,13 @@ local GerdLabel = {
     FadeDistances = { 1.25, 90.0 },
     FadeWidths = { 0.25, 90.0 }
   },
-  Tag = { "solarsystem_labels", "moon_labels", "minor_moon_labels" },
+  Tag = {
+    "solarsystem_labels",
+    "moon_labels",
+    "minor_moon_labels",
+    "minor_moon_labels_saturn",
+    "minor_moon_labels_norse"
+  },
   GUI = {
     Name = "Gerd Label",
     Path = "/Solar System/Planets/Saturn/Minor Moons/Norse Group/Gerd",
@@ -2841,6 +3079,7 @@ local S2004S26Trail = {
     "moonTrail_solarSystem",
     "moonTrail_giants",
     "moonTrail_saturn",
+    "moonTrail_norse",
     "moonTrail_minor",
     "moonTrail_minor_saturn"
   },
@@ -2867,7 +3106,13 @@ local S2004S26Label = {
     FadeDistances = { 1.25, 90.0 },
     FadeWidths = { 0.25, 90.0 }
   },
-  Tag = { "solarsystem_labels", "moon_labels", "minor_moon_labels" },
+  Tag = {
+    "solarsystem_labels",
+    "moon_labels",
+    "minor_moon_labels",
+    "minor_moon_labels_saturn",
+    "minor_moon_labels_norse"
+  },
   GUI = {
     Name = "S/2004 S 26 Label",
     Path = "/Solar System/Planets/Saturn/Minor Moons/Norse Group/S2004S26",
@@ -2923,6 +3168,7 @@ local EggtherTrail = {
     "moonTrail_solarSystem",
     "moonTrail_giants",
     "moonTrail_saturn",
+    "moonTrail_norse",
     "moonTrail_minor",
     "moonTrail_minor_saturn"
   },
@@ -2949,7 +3195,13 @@ local EggtherLabel = {
     FadeDistances = { 1.25, 90.0 },
     FadeWidths = { 0.25, 90.0 }
   },
-  Tag = { "solarsystem_labels", "moon_labels", "minor_moon_labels" },
+  Tag = {
+    "solarsystem_labels",
+    "moon_labels",
+    "minor_moon_labels",
+    "minor_moon_labels_saturn",
+    "minor_moon_labels_norse"
+  },
   GUI = {
     Name = "Eggther Label",
     Path = "/Solar System/Planets/Saturn/Minor Moons/Norse Group/Eggther",
@@ -3005,6 +3257,7 @@ local BeliTrail = {
     "moonTrail_solarSystem",
     "moonTrail_giants",
     "moonTrail_saturn",
+    "moonTrail_norse",
     "moonTrail_minor",
     "moonTrail_minor_saturn"
   },
@@ -3031,7 +3284,13 @@ local BeliLabel = {
     FadeDistances = { 1.25, 90.0 },
     FadeWidths = { 0.25, 90.0 }
   },
-  Tag = { "solarsystem_labels", "moon_labels", "minor_moon_labels" },
+  Tag = {
+    "solarsystem_labels",
+    "moon_labels",
+    "minor_moon_labels",
+    "minor_moon_labels_saturn",
+    "minor_moon_labels_norse"
+  },
   GUI = {
     Name = "Beli Label",
     Path = "/Solar System/Planets/Saturn/Minor Moons/Norse Group/Beli",
@@ -3087,6 +3346,7 @@ local GunnlodTrail = {
     "moonTrail_solarSystem",
     "moonTrail_giants",
     "moonTrail_saturn",
+    "moonTrail_norse",
     "moonTrail_minor",
     "moonTrail_minor_saturn"
   },
@@ -3113,7 +3373,13 @@ local GunnlodLabel = {
     FadeDistances = { 1.25, 90.0 },
     FadeWidths = { 0.25, 90.0 }
   },
-  Tag = { "solarsystem_labels", "moon_labels", "minor_moon_labels" },
+  Tag = {
+    "solarsystem_labels",
+    "moon_labels",
+    "minor_moon_labels",
+    "minor_moon_labels_saturn",
+    "minor_moon_labels_norse"
+  },
   GUI = {
     Name = "Gunnlod Label",
     Path = "/Solar System/Planets/Saturn/Minor Moons/Norse Group/Gunnlod",
@@ -3169,6 +3435,7 @@ local ThiazziTrail = {
     "moonTrail_solarSystem",
     "moonTrail_giants",
     "moonTrail_saturn",
+    "moonTrail_norse",
     "moonTrail_minor",
     "moonTrail_minor_saturn"
   },
@@ -3195,7 +3462,13 @@ local ThiazziLabel = {
     FadeDistances = { 1.25, 90.0 },
     FadeWidths = { 0.25, 90.0 }
   },
-  Tag = { "solarsystem_labels", "moon_labels", "minor_moon_labels" },
+  Tag = {
+    "solarsystem_labels",
+    "moon_labels",
+    "minor_moon_labels",
+    "minor_moon_labels_saturn",
+    "minor_moon_labels_norse"
+  },
   GUI = {
     Name = "Thiazzi Label",
     Path = "/Solar System/Planets/Saturn/Minor Moons/Norse Group/Thiazzi",
@@ -3251,6 +3524,7 @@ local S2004S34Trail = {
     "moonTrail_solarSystem",
     "moonTrail_giants",
     "moonTrail_saturn",
+    "moonTrail_norse",
     "moonTrail_minor",
     "moonTrail_minor_saturn"
   },
@@ -3277,7 +3551,13 @@ local S2004S34Label = {
     FadeDistances = { 1.25, 90.0 },
     FadeWidths = { 0.25, 90.0 }
   },
-  Tag = { "solarsystem_labels", "moon_labels", "minor_moon_labels" },
+  Tag = {
+    "solarsystem_labels",
+    "moon_labels",
+    "minor_moon_labels",
+    "minor_moon_labels_saturn",
+    "minor_moon_labels_norse"
+  },
   GUI = {
     Name = "S/2004 S 34 Label",
     Path = "/Solar System/Planets/Saturn/Minor Moons/Norse Group/S2004S34",
@@ -3333,6 +3613,7 @@ local AlvaldiTrail = {
     "moonTrail_solarSystem",
     "moonTrail_giants",
     "moonTrail_saturn",
+    "moonTrail_norse",
     "moonTrail_minor",
     "moonTrail_minor_saturn"
   },
@@ -3359,7 +3640,13 @@ local AlvaldiLabel = {
     FadeDistances = { 1.25, 90.0 },
     FadeWidths = { 0.25, 90.0 }
   },
-  Tag = { "solarsystem_labels", "moon_labels", "minor_moon_labels" },
+  Tag = {
+    "solarsystem_labels",
+    "moon_labels",
+    "minor_moon_labels",
+    "minor_moon_labels_saturn",
+    "minor_moon_labels_norse"
+  },
   GUI = {
     Name = "Alvaldi Label",
     Path = "/Solar System/Planets/Saturn/Minor Moons/Norse Group/Alvaldi",
@@ -3415,6 +3702,7 @@ local GeirrodTrail = {
     "moonTrail_solarSystem",
     "moonTrail_giants",
     "moonTrail_saturn",
+    "moonTrail_norse",
     "moonTrail_minor",
     "moonTrail_minor_saturn"
   },
@@ -3441,7 +3729,13 @@ local GeirrodLabel = {
     FadeDistances = { 1.25, 90.0 },
     FadeWidths = { 0.25, 90.0 }
   },
-  Tag = { "solarsystem_labels", "moon_labels", "minor_moon_labels" },
+  Tag = {
+    "solarsystem_labels",
+    "moon_labels",
+    "minor_moon_labels",
+    "minor_moon_labels_saturn",
+    "minor_moon_labels_norse"
+  },
   GUI = {
     Name = "Geirrod Label",
     Path = "/Solar System/Planets/Saturn/Minor Moons/Norse Group/Geirrod",
@@ -3497,6 +3791,7 @@ local S2004S28Trail = {
     "moonTrail_solarSystem",
     "moonTrail_giants",
     "moonTrail_saturn",
+    "moonTrail_norse",
     "moonTrail_minor",
     "moonTrail_minor_saturn"
   },
@@ -3523,7 +3818,13 @@ local S2004S28Label = {
     FadeDistances = { 1.25, 90.0 },
     FadeWidths = { 0.25, 90.0 }
   },
-  Tag = { "solarsystem_labels", "moon_labels", "minor_moon_labels" },
+  Tag = {
+    "solarsystem_labels",
+    "moon_labels",
+    "minor_moon_labels",
+    "minor_moon_labels_saturn",
+    "minor_moon_labels_norse"
+  },
   GUI = {
     Name = "S/2004 S 28 Label",
     Path = "/Solar System/Planets/Saturn/Minor Moons/Norse Group/S2004S28",
@@ -3579,6 +3880,7 @@ local S2004S21Trail = {
     "moonTrail_solarSystem",
     "moonTrail_giants",
     "moonTrail_saturn",
+    "moonTrail_norse",
     "moonTrail_minor",
     "moonTrail_minor_saturn"
   },
@@ -3605,7 +3907,13 @@ local S2004S21Label = {
     FadeDistances = { 1.25, 90.0 },
     FadeWidths = { 0.25, 90.0 }
   },
-  Tag = { "solarsystem_labels", "moon_labels", "minor_moon_labels" },
+  Tag = {
+    "solarsystem_labels",
+    "moon_labels",
+    "minor_moon_labels",
+    "minor_moon_labels_saturn",
+    "minor_moon_labels_norse"
+  },
   GUI = {
     Name = "S/2004 S 21 Label",
     Path = "/Solar System/Planets/Saturn/Minor Moons/Norse Group/S2004S21",
@@ -3661,6 +3969,7 @@ local S2004S36Trail = {
     "moonTrail_solarSystem",
     "moonTrail_giants",
     "moonTrail_saturn",
+    "moonTrail_norse",
     "moonTrail_minor",
     "moonTrail_minor_saturn"
   },
@@ -3687,7 +3996,13 @@ local S2004S36Label = {
     FadeDistances = { 1.25, 90.0 },
     FadeWidths = { 0.25, 90.0 }
   },
-  Tag = { "solarsystem_labels", "moon_labels", "minor_moon_labels" },
+  Tag = {
+    "solarsystem_labels",
+    "moon_labels",
+    "minor_moon_labels",
+    "minor_moon_labels_saturn",
+    "minor_moon_labels_norse"
+  },
   GUI = {
     Name = "S/2004 S 36 Label",
     Path = "/Solar System/Planets/Saturn/Minor Moons/Norse Group/S2004S36",
@@ -3743,6 +4058,7 @@ local S2004S37Trail = {
     "moonTrail_solarSystem",
     "moonTrail_giants",
     "moonTrail_saturn",
+    "moonTrail_norse",
     "moonTrail_minor",
     "moonTrail_minor_saturn"
   },
@@ -3769,7 +4085,13 @@ local S2004S37Label = {
     FadeDistances = { 1.25, 90.0 },
     FadeWidths = { 0.25, 90.0 }
   },
-  Tag = { "solarsystem_labels", "moon_labels", "minor_moon_labels" },
+  Tag = {
+    "solarsystem_labels",
+    "moon_labels",
+    "minor_moon_labels",
+    "minor_moon_labels_saturn",
+    "minor_moon_labels_norse"
+  },
   GUI = {
     Name = "S/2004 S 37 Label",
     Path = "/Solar System/Planets/Saturn/Minor Moons/Norse Group/S2004S37",
@@ -3825,6 +4147,7 @@ local S2004S39Trail = {
     "moonTrail_solarSystem",
     "moonTrail_giants",
     "moonTrail_saturn",
+    "moonTrail_norse",
     "moonTrail_minor",
     "moonTrail_minor_saturn"
   },
@@ -3851,7 +4174,13 @@ local S2004S39Label = {
     FadeDistances = { 1.25, 90.0 },
     FadeWidths = { 0.25, 90.0 }
   },
-  Tag = { "solarsystem_labels", "moon_labels", "minor_moon_labels" },
+  Tag = {
+    "solarsystem_labels",
+    "moon_labels",
+    "minor_moon_labels",
+    "minor_moon_labels_saturn",
+    "minor_moon_labels_norse"
+  },
   GUI = {
     Name = "S/2004 S 39 Label",
     Path = "/Solar System/Planets/Saturn/Minor Moons/Norse Group/S2004S39",
diff --git a/data/assets/scene/solarsystem/planets/saturn/minor/other_group.asset b/data/assets/scene/solarsystem/planets/saturn/minor/other_group.asset
index 623bd34efb..edbffe13e1 100644
--- a/data/assets/scene/solarsystem/planets/saturn/minor/other_group.asset
+++ b/data/assets/scene/solarsystem/planets/saturn/minor/other_group.asset
@@ -54,6 +54,7 @@ local AegaeonTrail = {
     "moonTrail_solarSystem",
     "moonTrail_giants",
     "moonTrail_saturn",
+    "moonTrail_other",
     "moonTrail_minor",
     "moonTrail_minor_saturn"
   },
@@ -80,7 +81,13 @@ local AegaeonLabel = {
     FadeDistances = { 250.0, 1500.0 },
     FadeWidths = { 100.0, 1500.0 }
   },
-  Tag = { "solarsystem_labels", "moon_labels", "minor_moon_labels" },
+  Tag = {
+    "solarsystem_labels",
+    "moon_labels",
+    "minor_moon_labels",
+    "minor_moon_labels_saturn",
+    "minor_moon_labels_other"
+  },
   GUI = {
     Name = "Aegaeon Label",
     Path = "/Solar System/Planets/Saturn/Minor Moons/Other Group/Aegaeon",
@@ -136,6 +143,7 @@ local MethoneTrail = {
     "moonTrail_solarSystem",
     "moonTrail_giants",
     "moonTrail_saturn",
+    "moonTrail_other",
     "moonTrail_minor",
     "moonTrail_minor_saturn"
   },
@@ -162,7 +170,13 @@ local MethoneLabel = {
     FadeDistances = { 250.0, 1500.0 },
     FadeWidths = { 100.0, 1500.0 }
   },
-  Tag = { "solarsystem_labels", "moon_labels", "minor_moon_labels" },
+  Tag = {
+    "solarsystem_labels",
+    "moon_labels",
+    "minor_moon_labels",
+    "minor_moon_labels_saturn",
+    "minor_moon_labels_other"
+  },
   GUI = {
     Name = "Methone Label",
     Path = "/Solar System/Planets/Saturn/Minor Moons/Other Group/Methone",
@@ -218,6 +232,7 @@ local AntheTrail = {
     "moonTrail_solarSystem",
     "moonTrail_giants",
     "moonTrail_saturn",
+    "moonTrail_other",
     "moonTrail_minor",
     "moonTrail_minor_saturn"
   },
@@ -244,7 +259,13 @@ local AntheLabel = {
     FadeDistances = { 250.0, 1500.0 },
     FadeWidths = { 100.0, 1500.0 }
   },
-  Tag = { "solarsystem_labels", "moon_labels", "minor_moon_labels" },
+  Tag = {
+    "solarsystem_labels",
+    "moon_labels",
+    "minor_moon_labels",
+    "minor_moon_labels_saturn",
+    "minor_moon_labels_other"
+  },
   GUI = {
     Name = "Anthe Label",
     Path = "/Solar System/Planets/Saturn/Minor Moons/Other Group/Anthe",
@@ -300,6 +321,7 @@ local PalleneTrail = {
     "moonTrail_solarSystem",
     "moonTrail_giants",
     "moonTrail_saturn",
+    "moonTrail_other",
     "moonTrail_minor",
     "moonTrail_minor_saturn"
   },
@@ -326,7 +348,13 @@ local PalleneLabel = {
     FadeDistances = { 250.0, 1500.0 },
     FadeWidths = { 100.0, 1500.0 }
   },
-  Tag = { "solarsystem_labels", "moon_labels", "minor_moon_labels" },
+  Tag = {
+    "solarsystem_labels",
+    "moon_labels",
+    "minor_moon_labels",
+    "minor_moon_labels_saturn",
+    "minor_moon_labels_other"
+  },
   GUI = {
     Name = "Pallene Label",
     Path = "/Solar System/Planets/Saturn/Minor Moons/Other Group/Pallene",
@@ -382,6 +410,7 @@ local TelestoTrail = {
     "moonTrail_solarSystem",
     "moonTrail_giants",
     "moonTrail_saturn",
+    "moonTrail_other",
     "moonTrail_minor",
     "moonTrail_minor_saturn"
   },
@@ -408,7 +437,13 @@ local TelestoLabel = {
     FadeDistances = { 250.0, 1500.0 },
     FadeWidths = { 100.0, 1500.0 }
   },
-  Tag = { "solarsystem_labels", "moon_labels", "minor_moon_labels" },
+  Tag = {
+    "solarsystem_labels",
+    "moon_labels",
+    "minor_moon_labels",
+    "minor_moon_labels_saturn",
+    "minor_moon_labels_other"
+  },
   GUI = {
     Name = "Telesto Label",
     Path = "/Solar System/Planets/Saturn/Minor Moons/Other Group/Telesto",
@@ -464,6 +499,7 @@ local CalypsoTrail = {
     "moonTrail_solarSystem",
     "moonTrail_giants",
     "moonTrail_saturn",
+    "moonTrail_other",
     "moonTrail_minor",
     "moonTrail_minor_saturn"
   },
@@ -490,7 +526,13 @@ local CalypsoLabel = {
     FadeDistances = { 250.0, 1500.0 },
     FadeWidths = { 100.0, 1500.0 }
   },
-  Tag = { "solarsystem_labels", "moon_labels", "minor_moon_labels" },
+  Tag = {
+    "solarsystem_labels",
+    "moon_labels",
+    "minor_moon_labels",
+    "minor_moon_labels_saturn",
+    "minor_moon_labels_other"
+  },
   GUI = {
     Name = "Calypso Label",
     Path = "/Solar System/Planets/Saturn/Minor Moons/Other Group/Calypso",
@@ -546,6 +588,7 @@ local HeleneTrail = {
     "moonTrail_solarSystem",
     "moonTrail_giants",
     "moonTrail_saturn",
+    "moonTrail_other",
     "moonTrail_minor",
     "moonTrail_minor_saturn"
   },
@@ -572,7 +615,13 @@ local HeleneLabel = {
     FadeDistances = { 250.0, 1500.0 },
     FadeWidths = { 100.0, 1500.0 }
   },
-  Tag = { "solarsystem_labels", "moon_labels", "minor_moon_labels" },
+  Tag = {
+    "solarsystem_labels",
+    "moon_labels",
+    "minor_moon_labels",
+    "minor_moon_labels_saturn",
+    "minor_moon_labels_other"
+  },
   GUI = {
     Name = "Helene Label",
     Path = "/Solar System/Planets/Saturn/Minor Moons/Other Group/Helene",
@@ -628,6 +677,7 @@ local PolydeucesTrail = {
     "moonTrail_solarSystem",
     "moonTrail_giants",
     "moonTrail_saturn",
+    "moonTrail_other",
     "moonTrail_minor",
     "moonTrail_minor_saturn"
   },
@@ -654,7 +704,13 @@ local PolydeucesLabel = {
     FadeDistances = { 250.0, 1500.0 },
     FadeWidths = { 100.0, 1500.0 }
   },
-  Tag = { "solarsystem_labels", "moon_labels", "minor_moon_labels" },
+  Tag = {
+    "solarsystem_labels",
+    "moon_labels",
+    "minor_moon_labels",
+    "minor_moon_labels_saturn",
+    "minor_moon_labels_other"
+  },
   GUI = {
     Name = "Polydeuces Label",
     Path = "/Solar System/Planets/Saturn/Minor Moons/Other Group/Polydeuces",
@@ -710,6 +766,7 @@ local S2004S24Trail = {
     "moonTrail_solarSystem",
     "moonTrail_giants",
     "moonTrail_saturn",
+    "moonTrail_other",
     "moonTrail_minor",
     "moonTrail_minor_saturn"
   },
@@ -736,7 +793,13 @@ local S2004S24Label = {
     FadeDistances = { 250.0, 1500.0 },
     FadeWidths = { 100.0, 1500.0 }
   },
-  Tag = { "solarsystem_labels", "moon_labels", "minor_moon_labels" },
+  Tag = {
+    "solarsystem_labels",
+    "moon_labels",
+    "minor_moon_labels",
+    "minor_moon_labels_saturn",
+    "minor_moon_labels_other"
+  },
   GUI = {
     Name = "S/2004 S 24 Label",
     Path = "/Solar System/Planets/Saturn/Minor Moons/Other Group/S2004S24",
diff --git a/data/assets/scene/solarsystem/planets/saturn/minor/shepherd_group.asset b/data/assets/scene/solarsystem/planets/saturn/minor/shepherd_group.asset
index 7f689ba830..c90e8de779 100644
--- a/data/assets/scene/solarsystem/planets/saturn/minor/shepherd_group.asset
+++ b/data/assets/scene/solarsystem/planets/saturn/minor/shepherd_group.asset
@@ -66,6 +66,7 @@ local PrometheusTrail = {
     "moonTrail_solarSystem",
     "moonTrail_giants",
     "moonTrail_saturn",
+    "moonTrail_shepherd",
     "moonTrail_minor",
     "moonTrail_minor_saturn"
   },
@@ -92,7 +93,13 @@ local PrometheusLabel = {
     FadeDistances = { 75.0, 1000.0 },
     FadeWidths = { 25.0, 800.0 }
   },
-  Tag = { "solarsystem_labels", "moon_labels", "minor_moon_labels" },
+  Tag = {
+    "solarsystem_labels",
+    "moon_labels",
+    "minor_moon_labels",
+    "minor_moon_labels_saturn",
+    "minor_moon_labels_shepherd"
+  },
   GUI = {
     Name = "Prometheus Label",
     Path = "/Solar System/Planets/Saturn/Minor Moons/Shepherd Moons/Prometheus",
@@ -148,6 +155,7 @@ local PandoraTrail = {
     "moonTrail_solarSystem",
     "moonTrail_giants",
     "moonTrail_saturn",
+    "moonTrail_shepherd",
     "moonTrail_minor",
     "moonTrail_minor_saturn"
   },
@@ -174,7 +182,13 @@ local PandoraLabel = {
     FadeDistances = { 75.0, 1000.0 },
     FadeWidths = { 25.0, 800.0 }
   },
-  Tag = { "solarsystem_labels", "moon_labels", "minor_moon_labels" },
+  Tag = {
+    "solarsystem_labels",
+    "moon_labels",
+    "minor_moon_labels",
+    "minor_moon_labels_saturn",
+    "minor_moon_labels_shepherd"
+  },
   GUI = {
     Name = "Pandora Label",
     Path = "/Solar System/Planets/Saturn/Minor Moons/Shepherd Moons/Pandora",
@@ -230,6 +244,7 @@ local AtlasTrail = {
     "moonTrail_solarSystem",
     "moonTrail_giants",
     "moonTrail_saturn",
+    "moonTrail_shepherd",
     "moonTrail_minor",
     "moonTrail_minor_saturn"
   },
@@ -256,7 +271,13 @@ local AtlasLabel = {
     FadeDistances = { 75.0, 1000.0 },
     FadeWidths = { 25.0, 800.0 }
   },
-  Tag = { "solarsystem_labels", "moon_labels", "minor_moon_labels" },
+  Tag = {
+    "solarsystem_labels",
+    "moon_labels",
+    "minor_moon_labels",
+    "minor_moon_labels_saturn",
+    "minor_moon_labels_shepherd"
+  },
   GUI = {
     Name = "Atlas Label",
     Path = "/Solar System/Planets/Saturn/Minor Moons/Shepherd Moons/Atlas",
@@ -312,6 +333,7 @@ local JanusTrail = {
     "moonTrail_solarSystem",
     "moonTrail_giants",
     "moonTrail_saturn",
+    "moonTrail_shepherd",
     "moonTrail_minor",
     "moonTrail_minor_saturn"
   },
@@ -338,7 +360,13 @@ local JanusLabel = {
     FadeDistances = { 75.0, 1000.0 },
     FadeWidths = { 25.0, 800.0 }
   },
-  Tag = { "solarsystem_labels", "moon_labels", "minor_moon_labels" },
+  Tag = {
+    "solarsystem_labels",
+    "moon_labels",
+    "minor_moon_labels",
+    "minor_moon_labels_saturn",
+    "minor_moon_labels_shepherd"
+  },
   GUI = {
     Name = "Janus Label",
     Path = "/Solar System/Planets/Saturn/Minor Moons/Shepherd Moons/Janus",
@@ -394,6 +422,7 @@ local EpimetheusTrail = {
     "moonTrail_solarSystem",
     "moonTrail_giants",
     "moonTrail_saturn",
+    "moonTrail_shepherd",
     "moonTrail_minor",
     "moonTrail_minor_saturn"
   },
@@ -420,7 +449,13 @@ local EpimetheusLabel = {
     FadeDistances = { 75.0, 1000.0 },
     FadeWidths = { 25.0, 800.0 }
   },
-  Tag = { "solarsystem_labels", "moon_labels", "minor_moon_labels" },
+  Tag = {
+    "solarsystem_labels",
+    "moon_labels",
+    "minor_moon_labels",
+    "minor_moon_labels_saturn",
+    "minor_moon_labels_shepherd"
+  },
   GUI = {
     Name = "Epimetheus Label",
     Path = "/Solar System/Planets/Saturn/Minor Moons/Shepherd Moons/Epimetheus",
@@ -476,6 +511,7 @@ local DaphnisTrail = {
     "moonTrail_solarSystem",
     "moonTrail_giants",
     "moonTrail_saturn",
+    "moonTrail_shepherd",
     "moonTrail_minor",
     "moonTrail_minor_saturn"
   },
@@ -502,7 +538,13 @@ local DaphnisLabel = {
     FadeDistances = { 75.0, 1000.0 },
     FadeWidths = { 25.0, 800.0 }
   },
-  Tag = { "solarsystem_labels", "moon_labels", "minor_moon_labels" },
+  Tag = {
+    "solarsystem_labels",
+    "moon_labels",
+    "minor_moon_labels",
+    "minor_moon_labels_saturn",
+    "minor_moon_labels_shepherd"
+  },
   GUI = {
     Name = "Daphnis Label",
     Path = "/Solar System/Planets/Saturn/Minor Moons/Shepherd Moons/Daphnis",
@@ -558,6 +600,7 @@ local PanTrail = {
     "moonTrail_solarSystem",
     "moonTrail_giants",
     "moonTrail_saturn",
+    "moonTrail_shepherd",
     "moonTrail_minor",
     "moonTrail_minor_saturn"
   },
@@ -584,7 +627,13 @@ local PanLabel = {
     FadeDistances = { 75.0, 1000.0 },
     FadeWidths = { 25.0, 800.0 }
   },
-  Tag = { "solarsystem_labels", "moon_labels", "minor_moon_labels" },
+  Tag = {
+    "solarsystem_labels",
+    "moon_labels",
+    "minor_moon_labels",
+    "minor_moon_labels_saturn",
+    "minor_moon_labels_shepherd"
+  },
   GUI = {
     Name = "Pan Label",
     Path = "/Solar System/Planets/Saturn/Minor Moons/Shepherd Moons/Pan",

From 7a2b8765416545580feb36351989d82655c6a700 Mon Sep 17 00:00:00 2001
From: Alexander Bock <alexander.bock@liu.se>
Date: Thu, 23 May 2024 13:09:01 +0200
Subject: [PATCH 456/701] Add profile information to the visual test files
 (#3270)

* Update test files
* Fix apollo test
* Cleanup test files
* Include information about the profile being loaded
* Add documentation about the visual tests
---
 src/engine/openspaceengine.cpp                |   1 +
 tests/visual/README.md                        |  76 +++++++++++++++
 tests/visual/VisualTesting.Jenkinsfile        |  88 ------------------
 tests/visual/apollo/11/landing.ostest         |  20 ++++
 tests/visual/apollo/11/landingsite.ostest     |  30 ++++++
 tests/visual/apollo/11/orbits.ostest          |  19 ++++
 tests/visual/apollo/11landing.ostest          |  16 ----
 tests/visual/apollo/11landingsite.ostest      |  18 ----
 tests/visual/apollo/11orbits.ostest           |  16 ----
 tests/visual/apollo/17/landingsite.ostest     |  29 ++++++
 tests/visual/apollo/17landingsite.ostest      |  18 ----
 tests/visual/apollo/8/pre-earthrise.ostest    |   8 ++
 tests/visual/apollo/preearthrise.ostest       |  10 --
 tests/visual/default/DefaultEarth.ostest      |  10 --
 .../visual/default/DefaultSolarSystem.ostest  |  10 --
 tests/visual/default/MarsHiRISE.ostest        |  32 -------
 tests/visual/default/MoonSurface.ostest       |  14 ---
 tests/visual/default/earth.ostest             |  12 +++
 tests/visual/default/hirise.ostest            |  74 +++++++++++++++
 tests/visual/default/moon-surface.ostest      |  18 ++++
 ...ultSolarSystem.osrec => solarsystem.osrec} | Bin
 tests/visual/default/solarsystem.ostest       |   9 ++
 tests/visual/eclipse/earth1966.ostest         |  28 +++---
 tests/visual/gaia/gaiadefaultstart.ostest     |  12 ---
 tests/visual/gaia/gaiamilkyway.ostest         |  14 ---
 .../visual/gaia/gaiatime10000000000000.ostest |  14 ---
 .../gaia/gaiatime100000000000000.ostest       |  14 ---
 tests/visual/gaia/gaiazoom.ostest             |  12 ---
 tests/visual/gaia/gaiazoombright.ostest       |  14 ---
 tests/visual/gaia/milkyway.ostest             |  25 +++++
 tests/visual/gaia/start.ostest                |  16 ++++
 tests/visual/gaia/time-10e13.ostest           |  25 +++++
 tests/visual/gaia/time-10e14.ostest           |  25 +++++
 tests/visual/gaia/zoom-bright.ostest          |  23 +++++
 tests/visual/gaia/zoom.ostest                 |  16 ++++
 tests/visual/juno/junomodel.ostest            |  12 ---
 tests/visual/juno/junotrailfull.ostest        |  16 ----
 tests/visual/juno/model.ostest                |  18 ++++
 tests/visual/juno/trail-full.ostest           |  32 +++++++
 tests/visual/jwst/earthorbit.ostest           |  30 +++---
 tests/visual/jwst/unfolded.ostest             |  30 +++---
 .../mars/insight/inside-atmosphere.ostest     |  18 ++++
 tests/visual/mars/insight/landed.ostest       |  26 ++++++
 .../mars/insight/outside-atmosphere.ostest    |  18 ++++
 tests/visual/mars/insight/parachute.ostest    |  26 ++++++
 .../mars/insightinsideatmosphere.ostest       |  12 ---
 tests/visual/mars/insightlanded.ostest        |  16 ----
 .../mars/insightousideatmosphere.ostest       |  12 ---
 tests/visual/mars/insightparachute.ostest     |  16 ----
 .../newhorizons/NewHorizonsModel.ostest       |  10 --
 .../NewHorizonsPlutoProjection.ostest         |  22 -----
 .../RecordingNewHorizionsModel.osrec          | Bin 114122 -> 0 bytes
 tests/visual/newhorizons/model.ostest         |  17 ++++
 .../newhorizons/pluto-projection.ostest       |  29 ++++++
 .../visual/nightsky/constellationlines.ostest |  27 +++---
 tests/visual/osirisrex/model.ostest           |  26 ++++++
 tests/visual/osirisrex/osirisrexmodel.ostest  |  16 ----
 .../osirisrex/osirisrexprojection.ostest      |  26 ------
 tests/visual/osirisrex/projection.ostest      |  37 ++++++++
 tests/visual/rosetta/model.ostest             |  26 ++++++
 tests/visual/rosetta/projection.ostest        |  29 ++++++
 tests/visual/rosetta/rosettamodel.ostest      |  16 ----
 tests/visual/rosetta/rosettaprojection.ostest |  22 -----
 tests/visual/voyager/1/model.ostest           |  26 ++++++
 tests/visual/voyager/voyager1model.ostest     |  16 ----
 tests/visual/voyager/voyagers-2020.ostest     |  19 ++++
 tests/visual/voyager/voyagers2020.ostest      |  14 ---
 67 files changed, 840 insertions(+), 586 deletions(-)
 create mode 100644 tests/visual/README.md
 delete mode 100644 tests/visual/VisualTesting.Jenkinsfile
 create mode 100644 tests/visual/apollo/11/landing.ostest
 create mode 100644 tests/visual/apollo/11/landingsite.ostest
 create mode 100644 tests/visual/apollo/11/orbits.ostest
 delete mode 100644 tests/visual/apollo/11landing.ostest
 delete mode 100644 tests/visual/apollo/11landingsite.ostest
 delete mode 100644 tests/visual/apollo/11orbits.ostest
 create mode 100644 tests/visual/apollo/17/landingsite.ostest
 delete mode 100644 tests/visual/apollo/17landingsite.ostest
 create mode 100644 tests/visual/apollo/8/pre-earthrise.ostest
 delete mode 100644 tests/visual/apollo/preearthrise.ostest
 delete mode 100644 tests/visual/default/DefaultEarth.ostest
 delete mode 100644 tests/visual/default/DefaultSolarSystem.ostest
 delete mode 100644 tests/visual/default/MarsHiRISE.ostest
 delete mode 100644 tests/visual/default/MoonSurface.ostest
 create mode 100644 tests/visual/default/earth.ostest
 create mode 100644 tests/visual/default/hirise.ostest
 create mode 100644 tests/visual/default/moon-surface.ostest
 rename tests/visual/default/{RecordingDefaultSolarSystem.osrec => solarsystem.osrec} (100%)
 create mode 100644 tests/visual/default/solarsystem.ostest
 delete mode 100644 tests/visual/gaia/gaiadefaultstart.ostest
 delete mode 100644 tests/visual/gaia/gaiamilkyway.ostest
 delete mode 100644 tests/visual/gaia/gaiatime10000000000000.ostest
 delete mode 100644 tests/visual/gaia/gaiatime100000000000000.ostest
 delete mode 100644 tests/visual/gaia/gaiazoom.ostest
 delete mode 100644 tests/visual/gaia/gaiazoombright.ostest
 create mode 100644 tests/visual/gaia/milkyway.ostest
 create mode 100644 tests/visual/gaia/start.ostest
 create mode 100644 tests/visual/gaia/time-10e13.ostest
 create mode 100644 tests/visual/gaia/time-10e14.ostest
 create mode 100644 tests/visual/gaia/zoom-bright.ostest
 create mode 100644 tests/visual/gaia/zoom.ostest
 delete mode 100644 tests/visual/juno/junomodel.ostest
 delete mode 100644 tests/visual/juno/junotrailfull.ostest
 create mode 100644 tests/visual/juno/model.ostest
 create mode 100644 tests/visual/juno/trail-full.ostest
 create mode 100644 tests/visual/mars/insight/inside-atmosphere.ostest
 create mode 100644 tests/visual/mars/insight/landed.ostest
 create mode 100644 tests/visual/mars/insight/outside-atmosphere.ostest
 create mode 100644 tests/visual/mars/insight/parachute.ostest
 delete mode 100644 tests/visual/mars/insightinsideatmosphere.ostest
 delete mode 100644 tests/visual/mars/insightlanded.ostest
 delete mode 100644 tests/visual/mars/insightousideatmosphere.ostest
 delete mode 100644 tests/visual/mars/insightparachute.ostest
 delete mode 100644 tests/visual/newhorizons/NewHorizonsModel.ostest
 delete mode 100644 tests/visual/newhorizons/NewHorizonsPlutoProjection.ostest
 delete mode 100644 tests/visual/newhorizons/RecordingNewHorizionsModel.osrec
 create mode 100644 tests/visual/newhorizons/model.ostest
 create mode 100644 tests/visual/newhorizons/pluto-projection.ostest
 create mode 100644 tests/visual/osirisrex/model.ostest
 delete mode 100644 tests/visual/osirisrex/osirisrexmodel.ostest
 delete mode 100644 tests/visual/osirisrex/osirisrexprojection.ostest
 create mode 100644 tests/visual/osirisrex/projection.ostest
 create mode 100644 tests/visual/rosetta/model.ostest
 create mode 100644 tests/visual/rosetta/projection.ostest
 delete mode 100644 tests/visual/rosetta/rosettamodel.ostest
 delete mode 100644 tests/visual/rosetta/rosettaprojection.ostest
 create mode 100644 tests/visual/voyager/1/model.ostest
 delete mode 100644 tests/visual/voyager/voyager1model.ostest
 create mode 100644 tests/visual/voyager/voyagers-2020.ostest
 delete mode 100644 tests/visual/voyager/voyagers2020.ostest

diff --git a/src/engine/openspaceengine.cpp b/src/engine/openspaceengine.cpp
index ec4bc07ee1..9d81224a76 100644
--- a/src/engine/openspaceengine.cpp
+++ b/src/engine/openspaceengine.cpp
@@ -422,6 +422,7 @@ void OpenSpaceEngine::initialize() {
     }
 
     // Load the profile
+    LINFO(std::format("Loading profile '{}'", profile));
     *global::profile = Profile(profile);
 
     // Set up asset loader
diff --git a/tests/visual/README.md b/tests/visual/README.md
new file mode 100644
index 0000000000..010a0e9f3f
--- /dev/null
+++ b/tests/visual/README.md
@@ -0,0 +1,76 @@
+# Visual Test Specification
+All `.ostest` files in this folders specify visual image tests that are automatically run to ensure that changes in OpenSpace do not negatively impact the rendered results. The tested results are available at https://regression.openspaceproject.com.
+
+The files are organized by folders, which are used as the "group" name for the test and filename of each test (without `.ostest` extension) is used as the name of the test. In general the first folder should name a profile that is being tested by the files within or a specific use-case, such as testing all renderables. Additional subfolders can be used as required within each top-level folder.
+
+## Test Structure
+Each test must have a `screenshot` instruction as the last entry, which causes an image to be created that is used as the end result of the test. Only exactly one `screenshot` instruction per test is currently supported. Each `.ostest` file is a JSON file with two top-level keys: `profile` provides the name of the profile that should be loaded before running these test instructions, and `commands` is a list of instructions that should be executed after the profile was loaded. All instructions must have a `type` key to determine which type of instruction it is and most have a `value` key that determines the parameters for that instruction.
+
+### Best practices
+  - By default, all tests always start paused, MRF caching is enabled, and the user interface and dashboard items are disabled
+  - All test should start with in instruction to set a specific time to improve reproducibility
+  - The few instructions there are per test, the better
+  - Adding `wait` instructions to ensure OpenSpace has time to load dynamic datasets increases reliability, but too many `wait`s will slow-down the over all testing
+  - Avoid `recording` and use `navigationstate` and `time` instead
+  - Avoid `script` if possible and use dedicated instructions when they exist. If we see the same `script` instruction used in many tests, they can be upgraded to a first-class instruction at later stage
+
+### Instructions
+  - `action`: Triggers an action that must already be defined in the profile or that was defined previously in this test. The provided value must be a string that is the identifier of the action that should be triggered.
+
+    Example: `{ "type": "action", "value": "os.FadeDownTrails" }`
+
+    Script Equivalent: `openspace.action.triggerAction`
+
+  - `deltatime`: Instantly changes the delta time in OpenSpace to the provided value. The provided value must be a number that is the delta time in seconds per realtime second that the engine should be set to.
+
+    Example: `{ "type": "deltatime", "value": 10 }`
+
+    Script Equivalent: `openspace.time.setDeltaTime`
+
+  - `navigationstate`: Sets the camera to the provided navigation state. The provided value must be an object that must contain at least a `anchor` and `position` and may optionally contain an `aim`, `referenceFrame`, `up`, `yaw`, `pitch`, and `timestamp`. All these values are then used to instantaneously set the position of the camera.
+
+    Example: `{ "type": "navigationstate", "value": { "anchor": "Juno", "pitch": -0.0165756, "position": [ -22.49081, 1.191533, 26.35740 ], "up": [ 0.0288083, 0.999373, -0.0205962 ], "yaw": 0.152454 } }`
+
+    Script Equivalent: `openspace.navigation.setNavigationState`
+
+  - `pause`: Determines whether the in-game clock should be paused or resumed. The provided value must be a boolean that is the clock state after the instruction
+
+    Example: `{ "type": "pause", "value": false }`
+
+    Script Equivalent: `openspace.time.setPause`
+
+  - `property`: Sets a specific property or group of properties to the specified value. This change is instantaneous. The provided value must contain a `property` key that is the identifier or regex for the property that should be set and a `value` key that is the new value for the property. The type of the `value` must be correct for the matched `property`.
+
+    Example: `{ "type": "property", "value": { "property": "Scene.Constellations.Renderable.Enabled", "value": true } }`
+
+    Script Equivalent: `openspace.setPropertyValue`
+
+  - `recording`: Triggers the playback of a session recording. The provided value is the name of the session recording file that should be played.
+
+    Example: `{ "type": "recording", "value": "solarsystem.osrec" }`
+
+    Script Equivalent: `openspace.sessionRecording.startPlayback`
+
+  - `screenshot`: Takes a screenshot of the application. At the moment, there can be only exactly one instruction of this type and it should be the last instruction in the test. This instruction also does not take any parameters
+
+    Example: `{ "type": "screenshot" }`
+
+    Script Equivalent: `openspace.takeScreenshot`
+
+  - `script`: Executes the script that is passed in as a value. That value must be a string that is the Lua script that is executed directly.
+
+    Example: `{ "type": "script", "value": "openspace.printError("Hello world") }`
+
+    Script Equivalent: `value`
+
+  - `time`: Sets the in-game time to the provided value. The value can be either a string, in which case it needs to be a valid date-time string, or a number, in which case it represents the number of seconds past the J2000 epoch.
+
+    Example: `{ "type": "time", "value": "2016-07-01T00:00:01.00" }`
+
+    Script Equivalent: `openspace.time.setTime`
+
+  - `wait`: Causes the test to wait for the specified number of seconds. Note that the OpenSpace testing instance is still running in the background and is, for example continuing to load dynamic content while the test is waiting.
+
+    Example: `{ "type": "wait", "value": 2 }`
+
+    Script Equivalent: none
diff --git a/tests/visual/VisualTesting.Jenkinsfile b/tests/visual/VisualTesting.Jenkinsfile
deleted file mode 100644
index 7dbdbe6056..0000000000
--- a/tests/visual/VisualTesting.Jenkinsfile
+++ /dev/null
@@ -1,88 +0,0 @@
-import groovy.io.FileType
-
-library('sharedSpace'); // jenkins-pipeline-lib
-
-def url = 'https://github.com/OpenSpace/OpenSpace';
-//def branch = env.BRANCH_NAME;
-def branch =  "feature/visual-testing-try2"
-
-@NonCPS
-def readDir() {
-  def dirsl = [];
-  new File("${workspace}").eachDir() {
-    dirs -> println dirs.getName() 
-    if (!dirs.getName().startsWith('.')) {
-      dirsl.add(dirs.getName());
-    }
-  }
-  return dirs;
-}
-
-def moduleCMakeFlags() {
-  def modules = [];
-  // using new File doesn't work as it is not allowed in the sandbox
-  
-  if (isUnix()) {
-     modules = sh(returnStdout: true, script: 'ls -d modules/*').trim().split('\n');
-  };
-  else {
-    modules = bat(returnStdout: true, script: '@dir modules /b /ad /on').trim().split('\r\n');
-  }
-
-  def flags = '';
-  for (module in modules) {
-      flags += "-DOPENSPACE_MODULE_${module.toUpperCase()}=ON "
-  }
-  return flags;
-}
-
-//
-// Pipeline start
-//
-//hi micah
-parallel linux_gcc_make: {
-  if (env.USE_BUILD_OS_LINUX == 'true') {
-    node('linux-visual' && 'gcc') {
-      stage('linux-gcc-make/scm') {
-        deleteDir();
-        gitHelper.checkoutGit(url, branch);
-      }
-      stage('linux-gcc-make/build') {
-          def cmakeCompileOptions = moduleCMakeFlags();
-          cmakeCompileOptions += ' -DMAKE_BUILD_TYPE=Release';
-          // Not sure why the linking of OpenSpaceTest takes so long
-          compileHelper.build(compileHelper.Make(), compileHelper.Gcc(), cmakeCompileOptions, 'OpenSpace', 'build-make');
-          compileHelper.recordCompileIssues(compileHelper.Gcc());
-      }
-      stage('linux-gcc-make/test') {
-        // testHelper.runUnitTests('build/OpenSpaceTest');
-        // testHelper.runUnitTests('bin/codegentest')
-      }
-      cleanWs()
-    } // node('linux')
-  }
-},
-windows_msvc: {
-  if (env.USE_BUILD_OS_WINDOWS == 'true') {
-    node('windows-visual') {
-      stage('windows-msvc/scm') {
-        deleteDir();
-        gitHelper.checkoutGit(url, branch);
-      }
-      stage('windows-msvc/build') {
-        compileHelper.build(compileHelper.VisualStudio(), compileHelper.VisualStudio(), moduleCMakeFlags(), '', 'build-msvc');
-        compileHelper.recordCompileIssues(compileHelper.VisualStudio());
-      }
-      stage('windows/visual-tests') {
-          dir('OpenSpace') {
-            testHelper.linkFolder(env.OPENSPACE_FILES + "\\sync_full", "sync", );
-            testHelper.linkFolder(env.OPENSPACE_FILES + "\\cache_gdal", "cache_gdal");
-          }
-          testHelper.startTestRunner();
-          testHelper.runUiTests()
-          //commit new test images
-          //copy test results to static dir
-      }
-    }
-  }
-}
diff --git a/tests/visual/apollo/11/landing.ostest b/tests/visual/apollo/11/landing.ostest
new file mode 100644
index 0000000000..dd88f0a523
--- /dev/null
+++ b/tests/visual/apollo/11/landing.ostest
@@ -0,0 +1,20 @@
+{
+  "profile": "apollo",
+  "commands": [
+    { "type": "action", "value": "os.apollo11.setup.LandingSite" },
+    { "type": "wait", "value": 10 },
+    { "type": "time", "value": "1969-07-20T20:15:50.00" },
+    {
+      "type": "navigationstate",
+      "value": {
+        "anchor": "Apollo11LemPosition",
+        "pitch": 0.979095E-1,
+        "position": [ -2.457687, 25.04798, 3.804939 ],
+        "up": [ -0.682505, 0.0438584, -0.729564 ],
+        "yaw": 0.0435056
+      }
+    },
+    { "type": "wait", "value": 45 },
+    { "type": "screenshot" }
+  ]
+}
diff --git a/tests/visual/apollo/11/landingsite.ostest b/tests/visual/apollo/11/landingsite.ostest
new file mode 100644
index 0000000000..78fe2dd8e9
--- /dev/null
+++ b/tests/visual/apollo/11/landingsite.ostest
@@ -0,0 +1,30 @@
+{
+  "profile": "apollo",
+  "commands": [
+    { "type": "action", "value": "os.apollo11.setup.LandingSite" },
+    { "type": "wait", "value": 10 },
+    {
+      "type": "navigationstate",
+      "value": {
+        "anchor": "Apollo11LemPosition",
+        "pitch": -0.275871E-1,
+        "position": [ -329.1966, 726.2499, -767.1269 ],
+        "referenceFrame": "Root",
+        "up": [ -0.833341, -0.532887, -0.146881 ],
+        "yaw": -0.000141130
+      }
+    },
+    { "type": "wait", "value": 10 },
+    {
+      "type": "navigationstate",
+      "value": {
+        "anchor": "Apollo11LemPosition",
+        "position": [ 6.249130, 25.76497, -14.35499 ],
+        "up": [ -0.860897, -0.0718231, -0.503684 ],
+        "yaw": -0.000141143
+      }
+    },
+    { "type": "wait", "value": 45 },
+    { "type": "screenshot" }
+  ]
+}
diff --git a/tests/visual/apollo/11/orbits.ostest b/tests/visual/apollo/11/orbits.ostest
new file mode 100644
index 0000000000..767d42c88a
--- /dev/null
+++ b/tests/visual/apollo/11/orbits.ostest
@@ -0,0 +1,19 @@
+{
+  "profile": "apollo",
+  "commands": [
+    { "type": "action", "value": "os.apollo11.setup.LandingSite" },
+    { "type": "wait", "value": 10 },
+    {
+      "type": "navigationstate",
+      "value": {
+        "anchor": "Apollo11LemPosition",
+        "pitch": 0.00776040,
+        "position": [ -711349.3, 2688364, 539334.1 ],
+        "up": [ -0.382741, 0.0833124, -0.920091 ],
+        "yaw": 0.00288877
+      }
+    },
+    { "type": "wait", "value": 30 },
+    { "type": "screenshot" }
+  ]
+}
diff --git a/tests/visual/apollo/11landing.ostest b/tests/visual/apollo/11landing.ostest
deleted file mode 100644
index e0c4f662bb..0000000000
--- a/tests/visual/apollo/11landing.ostest
+++ /dev/null
@@ -1,16 +0,0 @@
-[ 
-    { "type": "pause", 
-      "value": "true"},
-    { "type": "action", 
-      "value": "os.apollo11.setup.LandingSite"},
-    { "type": "wait", 
-      "value": "10"},
-    { "type": "time", 
-      "value": "1969-07-20T20:15:50.00"}, 
-    { "type": "navigationstate", 
-      "value": "{Anchor='Apollo11LemPosition',Pitch=0.979095E-1,Position={-2.457687E0,2.504798E1,3.804939E0},ReferenceFrame='Root',Up={-0.682505E0,0.438584E-1,-0.729564E0},Yaw=0.435056E-1}"},
-    { "type": "wait", 
-      "value": "45"}, 
-    { "type": "screenshot", 
-      "value": ""}
-]
diff --git a/tests/visual/apollo/11landingsite.ostest b/tests/visual/apollo/11landingsite.ostest
deleted file mode 100644
index 1198a2b22e..0000000000
--- a/tests/visual/apollo/11landingsite.ostest
+++ /dev/null
@@ -1,18 +0,0 @@
-[ 
-    { "type": "pause", 
-      "value": "true"},
-    { "type": "action", 
-      "value": "os.apollo11.setup.LandingSite"},
-    { "type": "wait", 
-      "value": "10"},
-    { "type": "navigationstate", 
-      "value": "{Anchor='Apollo11LemPosition',Pitch=-0.275871E-1,Position={-3.291966E2,7.262499E2,-7.671269E2},ReferenceFrame='Root',Up={-0.833341E0,-0.532887E0,-0.146881E0},Yaw=-0.141130E-3}"},
-    { "type": "wait", 
-      "value": "10"}, 
-    { "type": "navigationstate", 
-      "value": "{Anchor='Apollo11LemPosition',Pitch=-0.275880E-1,Position={6.249130E0,2.576497E1,-1.435499E1},ReferenceFrame='Root',Up={-0.860897E0,-0.718231E-1,-0.503684E0},Yaw=-0.141143E-3}"},
-    { "type": "wait", 
-      "value": "45"}, 
-    { "type": "screenshot", 
-      "value": "11landingsite"}
-] 
diff --git a/tests/visual/apollo/11orbits.ostest b/tests/visual/apollo/11orbits.ostest
deleted file mode 100644
index 8b5f7e28e6..0000000000
--- a/tests/visual/apollo/11orbits.ostest
+++ /dev/null
@@ -1,16 +0,0 @@
-[ 
-    { "type": "pause", 
-      "value": "true"},
-    { "type": "action", 
-      "value": "os.apollo11.setup.LandingSite"},
-    { "type": "wait", 
-      "value": "10"},
-    { "type": "navigationstate", 
-      "value": "{Anchor='Apollo11LemPosition',Pitch=0.776040E-2,Position={-7.113493E5,2.688364E6,5.393341E5},ReferenceFrame='Root',Up={-0.382741E0,0.833124E-1,-0.920091E0},Yaw=0.288877E-2}"},
-    { "type": "wait", 
-      "value": "30"}, 
-    { "type": "screenshot", 
-      "value": "11orbits"}
-] 
-
-
diff --git a/tests/visual/apollo/17/landingsite.ostest b/tests/visual/apollo/17/landingsite.ostest
new file mode 100644
index 0000000000..e85189f697
--- /dev/null
+++ b/tests/visual/apollo/17/landingsite.ostest
@@ -0,0 +1,29 @@
+{
+  "profile": "apollo",
+  "commands": [
+    { "type": "action", "value": "os.apollo17.setup.LandingSite" },
+    {
+      "type": "navigationstate",
+      "value": {
+        "anchor": "Moon",
+        "pitch": 0.191313,
+        "position": [ 1403983, 835896.1, 600562.5 ],
+        "up": [ -0.316846, -0.141630, 0.937843 ],
+        "yaw": -0.143901
+      }
+    },
+    { "type": "wait", "value": 10 },
+    {
+      "type": "navigationstate",
+      "value": {
+        "anchor": "Moon",
+        "pitch": 0.953555,
+        "position": [ 1399797, 833416.1, 598828.3 ],
+        "up": [ -0.381687, -0.0228442, 0.924009 ],
+        "yaw": -0.0789410
+      }
+    },
+    { "type": "wait", "value": 45 },
+    { "type": "screenshot" }
+  ]
+}
diff --git a/tests/visual/apollo/17landingsite.ostest b/tests/visual/apollo/17landingsite.ostest
deleted file mode 100644
index 3702f3ea34..0000000000
--- a/tests/visual/apollo/17landingsite.ostest
+++ /dev/null
@@ -1,18 +0,0 @@
-[ 
-    { "type": "pause", 
-      "value": "true"},
-    { "type": "action", 
-      "value": "os.apollo17.setup.LandingSite"},
-    { "type": "navigationstate", 
-      "value": "{Anchor='Moon',Pitch=0.191313E0,Position={1.403983E6,8.358961E5,6.005625E5},Up={-0.316846E0,-0.141630E0,0.937843E0},Yaw=-0.143901E0}"},
-    { "type": "wait", 
-      "value": "10"}, 
-    { "type": "navigationstate", 
-      "value": "{Anchor='Moon',Pitch=0.953555E0,Position={1.399797E6,8.334161E5,5.988283E5},Up={-0.381687E0,-0.228442E-1,0.924009E0},Yaw=-0.789410E-1}"},
-    { "type": "wait", 
-      "value": "45"}, 
-    { "type": "screenshot", 
-      "value": "17landingsite"}
-] 
-
-
diff --git a/tests/visual/apollo/8/pre-earthrise.ostest b/tests/visual/apollo/8/pre-earthrise.ostest
new file mode 100644
index 0000000000..e142e95ba3
--- /dev/null
+++ b/tests/visual/apollo/8/pre-earthrise.ostest
@@ -0,0 +1,8 @@
+{
+  "profile": "apollo",
+  "commands": [
+    { "type": "action", "value": "os.apollo8.SetupEarthrise" },
+    { "type": "wait", "value": 60 },
+    { "type": "screenshot" }
+  ]
+}
diff --git a/tests/visual/apollo/preearthrise.ostest b/tests/visual/apollo/preearthrise.ostest
deleted file mode 100644
index e52572e9de..0000000000
--- a/tests/visual/apollo/preearthrise.ostest
+++ /dev/null
@@ -1,10 +0,0 @@
-[ 
-    { "type": "pause", 
-      "value": "true"},
-    { "type": "action", 
-      "value": "os.apollo8.SetupEarthrise"},
-    { "type": "wait", 
-      "value": "60"}, 
-    { "type": "screenshot", 
-      "value": ""}
-]
diff --git a/tests/visual/default/DefaultEarth.ostest b/tests/visual/default/DefaultEarth.ostest
deleted file mode 100644
index 898da9a324..0000000000
--- a/tests/visual/default/DefaultEarth.ostest
+++ /dev/null
@@ -1,10 +0,0 @@
-[ 
-    { "type": "time", 
-      "value": "2019-01-01T05:00:00.00"},
-    { "type": "script",
-      "value": "openspace.setPropertyValueSingle('Scene.ISS_trail.Renderable.Enabled', false)"},
-    { "type": "wait", 
-      "value": "20"}, 
-    { "type": "screenshot", 
-      "value": "Earth"}
-] 
diff --git a/tests/visual/default/DefaultSolarSystem.ostest b/tests/visual/default/DefaultSolarSystem.ostest
deleted file mode 100644
index 6b187524ef..0000000000
--- a/tests/visual/default/DefaultSolarSystem.ostest
+++ /dev/null
@@ -1,10 +0,0 @@
-[ 
-    { "type": "time", 
-      "value": "2019-01-01T00:00:00.00"}, 
-    { "type": "recording", 
-      "value": "RecordingDefaultSolarSystem.osrec"}, 
-    { "type": "wait", 
-      "value": "2"}, 
-    { "type": "screenshot", 
-      "value": "SolarSystem"}
-] 
diff --git a/tests/visual/default/MarsHiRISE.ostest b/tests/visual/default/MarsHiRISE.ostest
deleted file mode 100644
index 93c0abcf0a..0000000000
--- a/tests/visual/default/MarsHiRISE.ostest
+++ /dev/null
@@ -1,32 +0,0 @@
-[ 
-    { "type": "pause", 
-      "value": "true"}, 
-    { "type": "time", 
-      "value": "2019-01-01T05:00:00.00"}, 
-    { "type": "action", 
-      "value": "os.FadeDownTrails"},
-    { "type": "navigationstate", 
-      "value": "{Anchor='Mars',Pitch=1.327145E0,Position={7.622104E5,-3.288462E6,-3.857782E5},Up={-0.485709E-1,-0.127474E0,0.990652E0},Yaw=0.224817E-1}"},
-    { "type": "script",
-      "value": "openspace.setPropertyValueSingle('Scene.Mars.Renderable.Layers.ColorLayers.MOC_WA_Color_Utah.Enabled', false)"},
-    { "type": "script",
-      "value": "openspace.setPropertyValueSingle('Scene.Mars.Renderable.Layers.ColorLayers.MOC_WA_Color_LiU.Enabled', false)"},
-    { "type": "script",
-      "value": "openspace.setPropertyValueSingle('Scene.Mars.Renderable.Layers.ColorLayers.MOC_WA_Color_NewYork.Enabled', false)"},
-    { "type": "script", 
-      "value": "openspace.setPropertyValueSingle('Scene.Mars.Renderable.Layers.HeightLayers.HiRISE-LS-DEM.Enabled', true)"},
-    { "type": "script", 
-      "value": "openspace.setPropertyValueSingle('Scene.Mars.Renderable.Layers.ColorLayers.HiRISE-PSP.Enabled', true)"},
-    { "type": "script", 
-      "value": "openspace.setPropertyValueSingle('Scene.Mars.Renderable.Layers.ColorLayers.CTX_blended.Enabled', true)"},
-    { "type": "wait", 
-      "value": "100"},
-    { "type": "navigationstate", 
-      "value": "{Anchor='Mars',Pitch=1.347758E0,Position={7.635264E5,-3.287992E6,-3.854482E5},Up={-0.470953E-1,-0.127084E0,0.990773E0},Yaw=0.463204E-1}"},
-    { "type": "wait", 
-      "value": "180"},
-    { "type": "screenshot", 
-      "value": "MarsHiRISE"}
-] 
-
-
diff --git a/tests/visual/default/MoonSurface.ostest b/tests/visual/default/MoonSurface.ostest
deleted file mode 100644
index 120c1d94ac..0000000000
--- a/tests/visual/default/MoonSurface.ostest
+++ /dev/null
@@ -1,14 +0,0 @@
-[ 
-    { "type": "pause", 
-      "value": "true"}, 
-    { "type": "time", 
-      "value": "2019-01-01T00:00:00.00"}, 
-    { "type": "navigationstate", 
-      "value": "{Anchor='Moon',Pitch=0.698796E0,Position={-1.440875E5,-1.669880E6,-7.359455E5},Up={0.664779E0,0.252496E0,-0.703075E0},Yaw=0.321787E-1}"},
-    { "type": "wait", 
-      "value": "120"},
-    { "type": "screenshot", 
-      "value": "MoonSurface"}
-] 
-
-
diff --git a/tests/visual/default/earth.ostest b/tests/visual/default/earth.ostest
new file mode 100644
index 0000000000..7467e75ee3
--- /dev/null
+++ b/tests/visual/default/earth.ostest
@@ -0,0 +1,12 @@
+{
+  "profile": "default",
+  "commands": [
+    { "type": "time", "value": "2019-01-01T05:00:00.00" },
+    {
+      "type": "property",
+      "value": { "property": "Scene.ISS_trail.Renderable.Enabled", "value": false }
+    },
+    { "type": "wait", "value": 30 },
+    { "type": "screenshot" }
+  ]
+}
diff --git a/tests/visual/default/hirise.ostest b/tests/visual/default/hirise.ostest
new file mode 100644
index 0000000000..ae69df15fe
--- /dev/null
+++ b/tests/visual/default/hirise.ostest
@@ -0,0 +1,74 @@
+{
+  "profile": "default",
+  "commands": [
+    { "type": "time", "value": "2019-01-01T05:00:00.00" },
+    { "type": "action", "value": "os.FadeDownTrails" },
+    {
+      "type": "navigationstate",
+      "value": {
+        "anchor": "Mars",
+        "pitch": 1.327145E0,
+        "position": [ 762210.4, -3288462, -385778.2 ],
+        "up": [ -0.0485709, -0.127474, 0.990652 ],
+        "yaw": 0.0224817
+      }
+    },
+    {
+      "type": "property",
+      "value": {
+        "property": "Scene.Mars.Renderable.Layers.ColorLayers.MOC_WA_Color_Utah.Enabled",
+        "value": false
+      }
+    },
+    {
+      "type": "property",
+      "value": {
+        "property": "Scene.Mars.Renderable.Layers.ColorLayers.MOC_WA_Color_LiU.Enabled",
+        "value": false
+      }
+    },
+    {
+      "type": "property",
+      "value": {
+        "property": "Scene.Mars.Renderable.Layers.ColorLayers.MOC_WA_Color_NewYork.Enabled",
+        "value": true
+      }
+    },
+    {
+      "type": "property",
+      "value": {
+        "property": "Scene.Mars.Renderable.Layers.HeightLayers.HiRISE-LS-DEM.Enabled",
+        "value": true
+      }
+    },
+    {
+      "type": "property",
+      "value": {
+        "property": "Scene.Mars.Renderable.Layers.ColorLayers.HiRISE-PSP.Enabled",
+        "value": true
+      }
+    },
+    {
+      "type": "property",
+      "value": {
+        "property": "Scene.Mars.Renderable.Layers.ColorLayers.CTX_blended.Enabled",
+        "value": true
+      }
+    },
+    { "type": "wait", "value": 100 },
+    {
+      "type": "navigationstate",
+      "value": {
+        "anchor": "Mars",
+        "pitch": 1.347758,
+        "position": [ 763526.4, -3287992, -385448.2 ],
+        "up": [ -0.0470953, -0.127084, 0.990773 ],
+        "yaw": 0.0463204
+      }
+    },
+    { "type": "wait", "value": 180 },
+    { "type": "screenshot" }
+  ]
+}
+
+
diff --git a/tests/visual/default/moon-surface.ostest b/tests/visual/default/moon-surface.ostest
new file mode 100644
index 0000000000..b80df2d1fa
--- /dev/null
+++ b/tests/visual/default/moon-surface.ostest
@@ -0,0 +1,18 @@
+{
+  "profile": "default",
+  "commands": [
+    { "type": "time", "value": "2019-01-01T00:00:00.00" },
+    {
+      "type": "navigationstate",
+      "value": {
+        "anchor": "Moon",
+        "pitch": 0.698796,
+        "position": [ -144087.5, -1669880, -735945.5 ],
+        "up": [ 0.664779, 0.252496, -0.703075 ],
+        "yaw": 0.0321787
+      }
+    },
+    { "type": "wait", "value": 120 },
+    { "type": "screenshot" }
+  ]
+}
diff --git a/tests/visual/default/RecordingDefaultSolarSystem.osrec b/tests/visual/default/solarsystem.osrec
similarity index 100%
rename from tests/visual/default/RecordingDefaultSolarSystem.osrec
rename to tests/visual/default/solarsystem.osrec
diff --git a/tests/visual/default/solarsystem.ostest b/tests/visual/default/solarsystem.ostest
new file mode 100644
index 0000000000..e8017b9f2c
--- /dev/null
+++ b/tests/visual/default/solarsystem.ostest
@@ -0,0 +1,9 @@
+{
+  "profile": "default",
+  "commands": [
+    { "type": "time", "value": "2019-01-01T00:00:00.00" },
+    { "type": "recording", "value": "solarsystem.osrec" },
+    { "type": "wait", "value": 2 },
+    { "type": "screenshot" }
+  ]
+}
diff --git a/tests/visual/eclipse/earth1966.ostest b/tests/visual/eclipse/earth1966.ostest
index deea44d657..66dbce1d47 100644
--- a/tests/visual/eclipse/earth1966.ostest
+++ b/tests/visual/eclipse/earth1966.ostest
@@ -1,12 +1,16 @@
-[ 
-    { "type": "pause", 
-      "value": "true"},
-    { "type": "time", 
-      "value": "1966-11-12T14:28:39.00"}, 
-    { "type": "navigationstate", 
-      "value": "{Anchor='Earth',Position={8117064.770626424,-15651002.199110571,-9165703.435119975},Up={-0.39241745239503034,-0.6078072727788707,0.6903469143937023}"},
-    { "type": "wait", 
-      "value": "30"}, 
-    { "type": "screenshot", 
-      "value": ""}
-] 
+{
+  "profile": "eclipse",
+  "commands": [
+    { "type": "time", "value": "1966-11-12T14:28:39.00" },
+    {
+      "type": "navigationstate",
+      "value": {
+        "anchor": "Earth",
+        "position": [ 8117064.770626424, -15651002.199110571, -9165703.435119975 ],
+        "up": [ -0.39241745239503034, -0.6078072727788707, 0.6903469143937023 ]
+      }
+    },
+    { "type": "wait", "value": 30 },
+    { "type": "screenshot" }
+  ]
+}
diff --git a/tests/visual/gaia/gaiadefaultstart.ostest b/tests/visual/gaia/gaiadefaultstart.ostest
deleted file mode 100644
index 5daed0b449..0000000000
--- a/tests/visual/gaia/gaiadefaultstart.ostest
+++ /dev/null
@@ -1,12 +0,0 @@
-[ 
-    { "type": "pause", 
-      "value": "true"},
-    { "type": "time", 
-      "value": "2000-01-01T12:00:00.00"},       
-    { "type": "navigationstate", 
-      "value": "{Anchor='Earth',Position={1.584558E11,1.679926E12,-3.908214E11},ReferenceFrame='Root',Up={-0.364428E0,0.243481E0,0.898838E0}}"},
-    { "type": "wait", 
-      "value": "2"}, 
-    { "type": "screenshot", 
-      "value": ""}
-] 
\ No newline at end of file
diff --git a/tests/visual/gaia/gaiamilkyway.ostest b/tests/visual/gaia/gaiamilkyway.ostest
deleted file mode 100644
index f876f37262..0000000000
--- a/tests/visual/gaia/gaiamilkyway.ostest
+++ /dev/null
@@ -1,14 +0,0 @@
-[ 
-    { "type": "pause", 
-      "value": "true"},
-    { "type": "time", 
-      "value": "2000-01-01T12:00:00.00"},       
-    { "type": "navigationstate", 
-      "value": "{Anchor='MilkyWayVolume',Pitch=-0.155824E0,Position={-6.225812E19,-5.819011E20,-3.598294E20},ReferenceFrame='Root',Up={0.140140E0,0.509858E0,-0.848767E0},Yaw=-0.304706E-1}"},
-    { "type": "script", 
-      "value": "openspace.setPropertyValueSingle('Scene.GaiaStars.Renderable.LuminosityMultiplier', 100.000000)"},
-    { "type": "wait", 
-      "value": "2"}, 
-    { "type": "screenshot", 
-      "value": ""}
-] 
diff --git a/tests/visual/gaia/gaiatime10000000000000.ostest b/tests/visual/gaia/gaiatime10000000000000.ostest
deleted file mode 100644
index 4adb7bd5b5..0000000000
--- a/tests/visual/gaia/gaiatime10000000000000.ostest
+++ /dev/null
@@ -1,14 +0,0 @@
-[ 
-    { "type": "pause", 
-      "value": "true"},
-    { "type": "script", 
-      "value": "openspace.time.setTime(10000000000000)"},       
-    { "type": "navigationstate", 
-      "value": "{Anchor='GaiaStars',Pitch=-0.205159E-1,Position={2.272225E19,-1.940065E19,1.124299E17},ReferenceFrame='Root',Up={0.261695E0,0.301186E0,-0.916953E0},Yaw=-0.104809E-1}"},
-    { "type": "script", 
-      "value": "openspace.setPropertyValueSingle('Scene.GaiaStars.Renderable.LuminosityMultiplier', 100.000000)"},
-    { "type": "wait", 
-      "value": "2"}, 
-    { "type": "screenshot", 
-      "value": ""}
-] 
diff --git a/tests/visual/gaia/gaiatime100000000000000.ostest b/tests/visual/gaia/gaiatime100000000000000.ostest
deleted file mode 100644
index ca23ecdff3..0000000000
--- a/tests/visual/gaia/gaiatime100000000000000.ostest
+++ /dev/null
@@ -1,14 +0,0 @@
-[ 
-    { "type": "pause", 
-      "value": "true"},
-    { "type": "script", 
-      "value": "openspace.time.setTime(100000000000000)"},       
-    { "type": "navigationstate", 
-      "value": "{Anchor='GaiaStars',Pitch=-0.205159E-1,Position={2.272225E19,-1.940065E19,1.124299E17},ReferenceFrame='Root',Up={0.261695E0,0.301186E0,-0.916953E0},Yaw=-0.104809E-1}"},
-    { "type": "script", 
-      "value": "openspace.setPropertyValueSingle('Scene.GaiaStars.Renderable.LuminosityMultiplier', 100.000000)"},
-    { "type": "wait", 
-      "value": "2"}, 
-    { "type": "screenshot", 
-      "value": ""}
-] 
diff --git a/tests/visual/gaia/gaiazoom.ostest b/tests/visual/gaia/gaiazoom.ostest
deleted file mode 100644
index 75a4ae2515..0000000000
--- a/tests/visual/gaia/gaiazoom.ostest
+++ /dev/null
@@ -1,12 +0,0 @@
-[ 
-    { "type": "pause", 
-      "value": "true"},
-    { "type": "time", 
-      "value": "2000-01-01T12:00:00.00"},       
-    { "type": "navigationstate", 
-      "value": "{Anchor='Earth',Position={8.104243E18,8.839172E18,-5.076751E18},ReferenceFrame='Root',Up={-0.201743E0,0.620307E0,0.757970E0}}"},
-    { "type": "wait", 
-      "value": "2"}, 
-    { "type": "screenshot", 
-      "value": ""}
-] 
diff --git a/tests/visual/gaia/gaiazoombright.ostest b/tests/visual/gaia/gaiazoombright.ostest
deleted file mode 100644
index 1eab6f8521..0000000000
--- a/tests/visual/gaia/gaiazoombright.ostest
+++ /dev/null
@@ -1,14 +0,0 @@
-[ 
-    { "type": "pause", 
-      "value": "true"},
-    { "type": "time", 
-      "value": "2000-01-01T12:00:00.00"},       
-    { "type": "navigationstate", 
-      "value": "{Anchor='Earth',Position={8.104243E18,8.839172E18,-5.076751E18},ReferenceFrame='Root',Up={-0.201743E0,0.620307E0,0.757970E0}}"},
-    { "type": "script", 
-      "value": "openspace.setPropertyValueSingle('Scene.GaiaStars.Renderable.LuminosityMultiplier', 100.000000)"},
-    { "type": "wait", 
-      "value": "2"}, 
-    { "type": "screenshot", 
-      "value": ""}
-] 
diff --git a/tests/visual/gaia/milkyway.ostest b/tests/visual/gaia/milkyway.ostest
new file mode 100644
index 0000000000..0ce50101da
--- /dev/null
+++ b/tests/visual/gaia/milkyway.ostest
@@ -0,0 +1,25 @@
+{
+  "profile": "apollo",
+  "commands": [
+    { "type": "time", "value": "2000-01-01T12:00:00.00" },
+    {
+      "type": "navigationstate",
+      "value": {
+        "anchor": "MilkyWayVolume",
+        "pitch": -0.155824,
+        "position": [ -6.225812E19, -5.819011E20, -3.598294E20 ],
+        "up": [ 0.140140, 0.509858, -0.848767 ],
+        "yaw": -0.0304706
+      }
+    },
+    {
+      "type": "property",
+      "value": {
+        "property": "Scene.GaiaStars.Renderable.LuminosityMultiplier",
+        "value": 100.0
+      }
+    },
+    { "type": "wait", "value": 2 },
+    { "type": "screenshot" }
+  ]
+}
diff --git a/tests/visual/gaia/start.ostest b/tests/visual/gaia/start.ostest
new file mode 100644
index 0000000000..9c7eff8057
--- /dev/null
+++ b/tests/visual/gaia/start.ostest
@@ -0,0 +1,16 @@
+{
+  "profile": "gaia",
+  "commands": [
+    { "type": "time", "value": "2000-01-01T12:00:00.00" },
+    {
+      "type": "navigationstate",
+      "value": {
+        "anchor": "Earth",
+        "position": [ 1.584558E11, 1.679926E12, -3.908214E11 ],
+        "up": [ -0.364428, 0.243481, 0.898838 ]
+      }
+    },
+    { "type": "wait", "value": 2 },
+    { "type": "screenshot" }
+  ]
+}
diff --git a/tests/visual/gaia/time-10e13.ostest b/tests/visual/gaia/time-10e13.ostest
new file mode 100644
index 0000000000..4fc82e2786
--- /dev/null
+++ b/tests/visual/gaia/time-10e13.ostest
@@ -0,0 +1,25 @@
+{
+  "profile": "gaia",
+  "commands": [
+    { "type": "time", "value": 10000000000000 },
+    {
+      "type": "navigationstate",
+      "value": {
+        "anchor": "GaiaStars",
+        "pitch": -0.0205159,
+        "position": [ 2.272225E19, -1.940065E19, 1.124299E17 ],
+        "up": [ 0.261695, 0.301186, -0.916953 ],
+        "yaw": 0.0104809
+      }
+    },
+    {
+      "type": "property",
+      "value": {
+        "property": "Scene.GaiaStars.Renderable.LuminosityMultiplier",
+        "value": 100.0
+      }
+    },
+    { "type": "wait", "value": 2 },
+    { "type": "screenshot" }
+  ]
+}
diff --git a/tests/visual/gaia/time-10e14.ostest b/tests/visual/gaia/time-10e14.ostest
new file mode 100644
index 0000000000..fc406b547e
--- /dev/null
+++ b/tests/visual/gaia/time-10e14.ostest
@@ -0,0 +1,25 @@
+{
+  "profile": "gaia",
+  "commands": [
+    { "type": "time", "value": 100000000000000 },
+    {
+      "type": "navigationstate",
+      "value": {
+        "anchor": "GaiaStars",
+        "pitch": -0.0205159,
+        "position": [ 2.272225E19, -1.940065E19, 1.124299E17 ],
+        "up": [ 0.261695, 0.301186, -0.916953 ],
+        "yaw": -0.0104809
+      }
+    },
+    {
+      "type": "property",
+      "value": {
+        "property": "Scene.GaiaStars.Renderable.LuminosityMultiplier",
+        "value": 100.0
+      }
+    },
+    { "type": "wait", "value": 2 },
+    { "type": "screenshot" }
+  ]
+}
diff --git a/tests/visual/gaia/zoom-bright.ostest b/tests/visual/gaia/zoom-bright.ostest
new file mode 100644
index 0000000000..2f1e9cc2d3
--- /dev/null
+++ b/tests/visual/gaia/zoom-bright.ostest
@@ -0,0 +1,23 @@
+{
+  "profile": "gaia",
+  "commands": [
+    { "type": "time", "value": "2000-01-01T12:00:00.00" },
+    {
+      "type": "navigationstate",
+      "value": {
+        "anchor": "Earth",
+        "position": [ 8.104243E18, 8.839172E18, -5.076751E18 ],
+        "up": [ -0.201743, 0.620307, 0.757970 ]
+      }
+    },
+    {
+      "type": "property",
+      "value": {
+        "property": "Scene.GaiaStars.Renderable.LuminosityMultiplier",
+        "value": 100.0
+      }
+    },
+    { "type": "wait", "value": 2 },
+    { "type": "screenshot" }
+  ]
+}
diff --git a/tests/visual/gaia/zoom.ostest b/tests/visual/gaia/zoom.ostest
new file mode 100644
index 0000000000..c95a184122
--- /dev/null
+++ b/tests/visual/gaia/zoom.ostest
@@ -0,0 +1,16 @@
+{
+  "profile": "gaia",
+  "commands": [
+    { "type": "time", "value": "2000-01-01T12:00:00.00" },
+    {
+      "type": "navigationstate",
+      "value": {
+        "anchor": "Earth",
+        "position": [ 8.104243E18, 8.839172E18, -5.076751E18 ],
+        "up": [ -0.201743, 0.620307, 0.757970 ]
+      }
+    },
+    { "type": "wait", "value": 2 },
+    { "type": "screenshot" }
+  ]
+}
diff --git a/tests/visual/juno/junomodel.ostest b/tests/visual/juno/junomodel.ostest
deleted file mode 100644
index dd2c23090f..0000000000
--- a/tests/visual/juno/junomodel.ostest
+++ /dev/null
@@ -1,12 +0,0 @@
-[ 
-    { "type": "pause", 
-      "value": "true"},
-    { "type": "time", 
-      "value": "2016-07-01T00:00:01.00"},
-    { "type": "navigationstate", 
-      "value": "{Anchor='Juno',Pitch=-0.165756E-1,Position={-2.249081E1,1.191533E0,2.635740E1},Up={0.288083E-1,0.999373E0,-0.205962E-1},Yaw=0.152454E0}"},
-    { "type": "wait", 
-      "value": "2"}, 
-    { "type": "screenshot", 
-      "value": ""}
-] 
diff --git a/tests/visual/juno/junotrailfull.ostest b/tests/visual/juno/junotrailfull.ostest
deleted file mode 100644
index 8f0cc26215..0000000000
--- a/tests/visual/juno/junotrailfull.ostest
+++ /dev/null
@@ -1,16 +0,0 @@
-[ 
-    { "type": "pause", 
-      "value": "true"},
-    { "type": "time", 
-      "value": "2016-07-01T00:00:01.00"},
-    { "type": "navigationstate", 
-      "value": "{Anchor='Jupiter',Pitch=-0.884063E-1,Position={-2.734747E8,7.875195E9,-4.723682E9},ReferenceFrame='Root',Up={-0.318598E-1,0.513306E0,0.857614E0},Yaw=-0.311906E0}"},
-    { "type": "script", 
-      "value": "openspace.setPropertyValueSingle('Scene.JunoTrail.Renderable.ShowFullTrail', true)"},
-    { "type": "script", 
-      "value": "openspace.setPropertyValueSingle('Scene.JunoTrail.Renderable.Appearance.EnableFade', false)"},
-    { "type": "wait", 
-      "value": "2"}, 
-    { "type": "screenshot", 
-      "value": ""}
-]
diff --git a/tests/visual/juno/model.ostest b/tests/visual/juno/model.ostest
new file mode 100644
index 0000000000..b4e28ce468
--- /dev/null
+++ b/tests/visual/juno/model.ostest
@@ -0,0 +1,18 @@
+{
+  "profile": "juno",
+  "commands": [
+    { "type": "time", "value": "2016-07-01T00:00:01.00" },
+    {
+      "type": "navigationstate",
+      "value": {
+        "anchor": "Juno",
+        "pitch": -0.0165756,
+        "position": [ -22.49081, 1.191533, 26.35740 ],
+        "up": [ 0.0288083, 0.999373, -0.0205962 ],
+        "yaw": 0.152454
+      }
+    },
+    { "type": "wait", "value": 2 },
+    { "type": "screenshot" }
+  ]
+}
diff --git a/tests/visual/juno/trail-full.ostest b/tests/visual/juno/trail-full.ostest
new file mode 100644
index 0000000000..3edddc8eab
--- /dev/null
+++ b/tests/visual/juno/trail-full.ostest
@@ -0,0 +1,32 @@
+{
+  "profile": "juno",
+  "commands": [
+    { "type": "time", "value": "2016-07-01T00:00:01.00" },
+    {
+      "type": "navigationstate",
+      "value": {
+        "anchor": "Jupiter",
+        "pitch": -0.0884063,
+        "position": [ -273474700, 7875195000, -4723682000 ],
+        "up": [ -0.0318598, 0.513306, 0.857614 ],
+        "yaw": -0.311906
+      }
+    },
+    {
+      "type": "property",
+      "value": {
+        "property": "Scene.JunoTrail.Renderable.ShowFullTrail",
+        "value": true
+      }
+    },
+    {
+      "type": "property",
+      "value": {
+        "property": "Scene.JunoTrail.Renderable.Appearance.EnableFade",
+        "value": false
+      }
+    },
+    { "type": "wait", "value": 2 },
+    { "type": "screenshot" }
+  ]
+}
diff --git a/tests/visual/jwst/earthorbit.ostest b/tests/visual/jwst/earthorbit.ostest
index c27fc78712..b35c83a53f 100644
--- a/tests/visual/jwst/earthorbit.ostest
+++ b/tests/visual/jwst/earthorbit.ostest
@@ -1,12 +1,18 @@
-[ 
-    { "type": "pause", 
-      "value": "true"},
-    { "type": "time",
-      "value": "2021-12-25T20:12:51.00"},
-    { "type": "navigationstate", 
-      "value": "{Anchor='JWSTModel',Pitch=-0.0016564658365626121,Position={29.160003662109375,-2.7035293579101562,-15.113174438476562},ReferenceFrame='Root',Up={0.2476631160089928,0.916590399238525,0.3138869557539424},Yaw=-0.005731161690830819}"},
-    { "type": "wait", 
-      "value": "45"}, 
-    { "type": "screenshot", 
-      "value": "earthorbit"}
-] 
+{
+  "profile": "jwst",
+  "commands": [
+    { "type": "time", "value": "2021-12-25T20:12:51.00" },
+    {
+      "type": "navigationstate",
+      "value": {
+        "anchor": "JWSTModel",
+        "pitch": -0.0016564658365626121,
+        "position": [ 29.160003662109375, -2.7035293579101562, -15.113174438476562 ],
+        "up": [ 0.2476631160089928, 0.916590399238525, 0.3138869557539424 ],
+        "yaw": -0.005731161690830819
+      }
+    },
+    { "type": "wait", "value": 45 },
+    { "type": "screenshot" }
+  ]
+}
diff --git a/tests/visual/jwst/unfolded.ostest b/tests/visual/jwst/unfolded.ostest
index 93759912c2..14afa61bfc 100644
--- a/tests/visual/jwst/unfolded.ostest
+++ b/tests/visual/jwst/unfolded.ostest
@@ -1,12 +1,18 @@
-[ 
-    { "type": "pause", 
-      "value": "true"},
-    { "type": "time",
-      "value": "2022-01-22T05:24:50.00"},
-    { "type": "navigationstate", 
-      "value": "{Anchor='JWSTModel',Pitch=-0.0016592552067427437,Position={-18.15692138671875,17.05841827392578,-21.566741943359375},ReferenceFrame='Root',Up={0.7974728925265553,0.5576779554782311,-0.2302873936170828},Yaw=-0.005725894528578101}"},
-    { "type": "wait", 
-      "value": "20"}, 
-    { "type": "screenshot", 
-      "value": "unfolded"}
-] 
+{
+  "profile": "jwst",
+  "commands": [
+    { "type": "time", "value": "2022-01-22T05:24:50.00" },
+    {
+      "type": "navigationstate",
+      "value": {
+        "anchor": "JWSTModel",
+        "pitch": -0.0016592552067427437,
+        "position": [ -18.15692138671875, 17.05841827392578, -21.566741943359375 ],
+        "up": [ 0.7974728925265553, 0.5576779554782311, -0.2302873936170828 ],
+        "yaw": -0.005725894528578101
+      }
+    },
+    { "type": "wait", "value": 20 },
+    { "type": "screenshot" }
+  ]
+}
diff --git a/tests/visual/mars/insight/inside-atmosphere.ostest b/tests/visual/mars/insight/inside-atmosphere.ostest
new file mode 100644
index 0000000000..0fc3722f37
--- /dev/null
+++ b/tests/visual/mars/insight/inside-atmosphere.ostest
@@ -0,0 +1,18 @@
+{
+  "profile": "mars",
+  "commands": [
+    { "type": "time", "value": "2018-11-26T19:41:00.00" },
+    {
+      "type": "navigationstate",
+      "value": {
+        "anchor": "Insight",
+        "pitch": 0.0000114752,
+        "position": [ 5.481552, -11.65030, 1.829742 ],
+        "up": [ 0.599736, 0.391764, 0.697738 ],
+        "yaw": -0.0000107029
+      }
+    },
+    { "type": "wait", "value": 30 },
+    { "type": "screenshot" }
+  ]
+}
diff --git a/tests/visual/mars/insight/landed.ostest b/tests/visual/mars/insight/landed.ostest
new file mode 100644
index 0000000000..25c944735a
--- /dev/null
+++ b/tests/visual/mars/insight/landed.ostest
@@ -0,0 +1,26 @@
+{
+  "profile": "mars",
+  "commands": [
+    { "type": "time", "value": "2018-11-26T19:46:00.00" },
+    {
+      "type": "navigationstate",
+      "value": {
+        "anchor": "Insight",
+        "pitch": -0.100135,
+        "position": [ 9.763474, -1.377502, 1.668823 ],
+        "up": [ -0.0910753, 0.437979, 0.894360 ],
+        "yaw": 0.0939157
+      }
+    },
+    { "type": "action", "value": "os.FadeDownTrails" },
+    {
+      "type": "property",
+      "value": {
+        "property": "Scene.InsightTrail.Renderable.Enabled",
+        "value": false
+      }
+    },
+    { "type": "wait", "value": 30 },
+    { "type": "screenshot" }
+  ]
+}
diff --git a/tests/visual/mars/insight/outside-atmosphere.ostest b/tests/visual/mars/insight/outside-atmosphere.ostest
new file mode 100644
index 0000000000..22fe03441f
--- /dev/null
+++ b/tests/visual/mars/insight/outside-atmosphere.ostest
@@ -0,0 +1,18 @@
+{
+  "profile": "mars",
+  "commands": [
+    { "type": "time", "value": "2018-11-26T19:40:00.00" },
+    {
+      "type": "navigationstate",
+      "value": {
+        "anchor": "Insight",
+        "pitch": 0.0000129072,
+        "position": [ 5.481552, -11.65030, 1.829742 ],
+        "up": [ 0.494653, 0.357174, 0.792304 ],
+        "yaw": -0.00000892388
+      }
+    },
+    { "type": "wait", "value": 30 },
+    { "type": "screenshot" }
+  ]
+}
diff --git a/tests/visual/mars/insight/parachute.ostest b/tests/visual/mars/insight/parachute.ostest
new file mode 100644
index 0000000000..a9c13d13cb
--- /dev/null
+++ b/tests/visual/mars/insight/parachute.ostest
@@ -0,0 +1,26 @@
+{
+  "profile": "mars",
+  "commands": [
+    { "type": "time", "value": "2018-11-26T19:44:00.00" },
+    {
+      "type": "navigationstate",
+      "value": {
+        "anchor": "Insight",
+        "pitch": -0.101682,
+        "position": [ -4.087723, -4.039124, -8.183899 ],
+        "up": [ 0.827895, 0.213243, -0.518765 ],
+        "yaw": -0.398734
+      }
+    },
+    { "type": "action", "value": "os.FadeDownTrails" },
+    {
+      "type": "property",
+      "value": {
+        "property": "Scene.InsightTrail.Renderable.Enabled",
+        "value": false
+      }
+    },
+    { "type": "wait", "value": 30 },
+    { "type": "screenshot" }
+  ]
+}
diff --git a/tests/visual/mars/insightinsideatmosphere.ostest b/tests/visual/mars/insightinsideatmosphere.ostest
deleted file mode 100644
index cd531442a8..0000000000
--- a/tests/visual/mars/insightinsideatmosphere.ostest
+++ /dev/null
@@ -1,12 +0,0 @@
-[ 
-    { "type": "pause", 
-      "value": "true"},
-    { "type": "time", 
-      "value": "2018-11-26T19:41:00.00"}, 
-    { "type": "navigationstate", 
-      "value": "{Anchor='Insight',Pitch=0.114752E-4,Position={5.481552E0,-1.165030E1,1.829742E0},ReferenceFrame='Root',Up={0.599736E0,0.391764E0,0.697738E0},Yaw=-0.107029E-4}"},
-    { "type": "wait", 
-      "value": "30"}, 
-    { "type": "screenshot", 
-      "value": ""}
-] 
\ No newline at end of file
diff --git a/tests/visual/mars/insightlanded.ostest b/tests/visual/mars/insightlanded.ostest
deleted file mode 100644
index 384382213f..0000000000
--- a/tests/visual/mars/insightlanded.ostest
+++ /dev/null
@@ -1,16 +0,0 @@
-[ 
-    { "type": "pause", 
-      "value": "true"},
-    { "type": "time", 
-      "value": "2018-11-26T19:46:00.00"},       
-    { "type": "navigationstate", 
-      "value": "{Anchor='Insight',Pitch=-0.100135E0,Position={9.763474E0,-1.377502E0,1.668823E0},ReferenceFrame='Root',Up={-0.910753E-1,0.437979E0,0.894360E0},Yaw=0.939157E-1}"},
-    { "type": "action", 
-      "value": "os.FadeDownTrails"},
-    { "type": "script", 
-      "value": "openspace.setPropertyValueSingle('Scene.InsightTrail.Renderable.Enabled', false)"},
-    { "type": "wait", 
-      "value": "30"}, 
-    { "type": "screenshot", 
-      "value": ""}
-] 
diff --git a/tests/visual/mars/insightousideatmosphere.ostest b/tests/visual/mars/insightousideatmosphere.ostest
deleted file mode 100644
index 94da72c058..0000000000
--- a/tests/visual/mars/insightousideatmosphere.ostest
+++ /dev/null
@@ -1,12 +0,0 @@
-[ 
-    { "type": "pause", 
-      "value": "true"},
-    { "type": "time", 
-      "value": "2018-11-26T19:40:00.00"}, 
-    { "type": "navigationstate", 
-      "value": "{Anchor='Insight',Pitch=0.129072E-4,Position={5.481552E0,-1.165030E1,1.829742E0},ReferenceFrame='Root',Up={0.494653E0,0.357174E0,0.792304E0},Yaw=-0.892388E-5}"},
-    { "type": "wait", 
-      "value": "30"}, 
-    { "type": "screenshot", 
-      "value": ""}
-] 
\ No newline at end of file
diff --git a/tests/visual/mars/insightparachute.ostest b/tests/visual/mars/insightparachute.ostest
deleted file mode 100644
index b55ac0cb59..0000000000
--- a/tests/visual/mars/insightparachute.ostest
+++ /dev/null
@@ -1,16 +0,0 @@
-[ 
-    { "type": "pause", 
-      "value": "true"},
-    { "type": "time", 
-      "value": "2018-11-26T19:44:00.00"},       
-    { "type": "navigationstate", 
-      "value": "{Anchor='Insight',Pitch=-0.101682E0,Position={-4.087723E0,-4.039124E0,-8.183899E0},ReferenceFrame='Root',Up={0.827895E0,0.213243E0,-0.518765E0},Yaw=-0.398734E0}"},
-    { "type": "action", 
-      "value": "os.FadeDownTrails"},
-    { "type": "script", 
-      "value": "openspace.setPropertyValueSingle('Scene.InsightTrail.Renderable.Enabled', false)"},
-    { "type": "wait", 
-      "value": "30"}, 
-    { "type": "screenshot", 
-      "value": ""}
-] 
diff --git a/tests/visual/newhorizons/NewHorizonsModel.ostest b/tests/visual/newhorizons/NewHorizonsModel.ostest
deleted file mode 100644
index 37e08e4006..0000000000
--- a/tests/visual/newhorizons/NewHorizonsModel.ostest
+++ /dev/null
@@ -1,10 +0,0 @@
-[ 
- 	{ "type": "pause", 
-      "value": "true"}, 
-    { "type": "navigationstate", 
-      "value": "{Anchor='NewHorizons',Pitch=0.444246E-1,Position={3.319494E1,-1.500620E0,-8.950034E0},Up={0.469986E-1,0.998872E0,0.683673E-2},Yaw=0.146484E0}"},
-    { "type": "wait", 
-      "value": "5"},        
-    { "type": "screenshot", 
-      "value": "NewHorizonsModel"}
-]
diff --git a/tests/visual/newhorizons/NewHorizonsPlutoProjection.ostest b/tests/visual/newhorizons/NewHorizonsPlutoProjection.ostest
deleted file mode 100644
index 2797d47c17..0000000000
--- a/tests/visual/newhorizons/NewHorizonsPlutoProjection.ostest
+++ /dev/null
@@ -1,22 +0,0 @@
-[ 
-    { "type": "pause", 
-      "value": "true"},
-    { "type": "time", 
-      "value": "2015-07-14T08:14:30.00"},       
-    { "type": "script", 
-      "value": "openspace.setPropertyValueSingle('Scene.PlutoProjection.Renderable.ColorTexturePaths', 1.000000)"},
-    { "type": "navigationstate", 
-      "value": "{Anchor='Pluto',Pitch=-0.566951E-1,Position={-2.300324E6,2.259246E6,3.521214E6},Up={0.862771E0,0.403378E0,0.304816E0},Yaw=-0.119485E0}"},
-    { "type": "script", 
-      "value": "openspace.time.interpolateDeltaTime(10)"},
-    { "type": "pause", 
-      "value": "false"},
-    { "type": "wait", 
-      "value": "120"}, 
-    { "type": "pause", 
-      "value": "true"},
-    { "type": "time", 
-      "value": "2015-07-14T08:31:00.00"},       
-    { "type": "screenshot", 
-      "value": ""}
-] 
\ No newline at end of file
diff --git a/tests/visual/newhorizons/RecordingNewHorizionsModel.osrec b/tests/visual/newhorizons/RecordingNewHorizionsModel.osrec
deleted file mode 100644
index 2fb1c85013fe7769831e57dadd4c4cd7b9c02fea..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 114122
zcmcKD`CpBD)Hm>*5=vBx1~iZ%A*7>1JB5g3NF-EC$WW;ag>03g3=x$nMaB%3v6Qw<
z8KR<)QZl7M15r_)b=}Xsp64%E=eP5V_xY^v`mSs3>%8ne%g4iOu8$jdEcNvOZ{KAj
zeb%@IxVyn>W8)Fy#!gazxFvt|GmDmpMIx(po$UQB4;|@~RAicE6)$_$^s((k>831O
zU)$dwvUeR9>2H==h!qdJ&Ko=GrR7JpSfj!o#o2z>Ve%oTQp*R+tzv7hRAtL3ibNuN
zkBzq8zMg^JUVbu<&rBo(zQr3SD;6V`aG|1$MkotL20UmfF<UNRx?hHsdG2Gu$be0Q
zbI0WgnE3t5vVk!y7#VQI^>XdV*NCO8d#3Ghj0GbD%ymA?#R{15@MAAr6In1a;CAlN
ztMYFU8y9fb>U|OmMh488vZtG$fHioO{S=>L!N`D7rN5w2z^c>?bH`j{!N`E?GlxxD
z^cJzMiFxV4S6DDIAicnE#}ffNSkZM=P$~;X2F#Z$?`&EkBul=&+UP0^Mg|POI`Z==
z0b91brRw7~7K{uy)>Y+}@;k(IGq;+=-eAGVfHS-E5Bdq1?X%5i^>49YWWcaNE2otT
zn9JyrfCuR;7#Z-?c2K^!6tU9G!h=q?SuipnFJr{41OfXL`ZKC1lLaFKc0X+Y+9F^T
zSB-!EcZUTd16szKkK9&<Snjy}JBLVFFfyPn@W_gK0ZYr7-P-jo3q}Ui|8j71dym+S
zj61cpJQx|^=Jan@wtyYktUd934ofmJV9iH|6rFO!Qljrfc-~{d$bc!IPugx1uw}9C
zw};$k!N`E%?+P2<3Rvm+(Y?!fFfw5B_?|x|R3PR)*+Tiu1D0fDz{X)C0%8U1;edd?
z3m>vzWPqvD^Y}&qv)P=!Lg^6;Mh1Mg4ojc$0kM<wh91AigOLHwM!_wK0=C;gPunY(
zB^eozl>RilOC@5u;%jDRk6AD>z{T!;p|gNR!P^(*JQx{p{d0%*WdWNMr{x~@ge4gn
za9U}OdB2Z{=~qePmpx^{$bkCwe*ZQK*o|AVL$#i<U}Qkl$Asp50c(j~qW+8rBLfr?
z*VhdCgjj8lt}>hQSdx(e(&>)^f&^@Vdvd?Q&si`sKsC^Kc$I+tm2M4f<H5*)2ygWt
z)}MtkCQnsPd%=>749Mu#XJ3qf4e~Ka8kWz3kpXKqL~N)Lus5Y~krEz^45%K`Eyel^
zV)OU)dGLk@BLiOkoL72Sz$_O*<A?&5GLix1i-N}03z%Kb?wO%H7#U#Hx8;Y;SH$9i
z<-3*eU}S*mpJ9Vy1T4tS++tWEOBu<4Q~Ni_GznPGmeAheJQx`;v*4D6T@_;K|2=Z3
z;K9fMNA04mCj{*7_KyclUb2*t3{cKebg2`tEd#XH1@mBJfcYFtJ?n3Xow+sB^bHS2
z22|D_zaJ}L_H!@3HG0KTMlzsT+3nyr0dw2veLjc>BLg}je1Dl$BetqhqWFRbBLm+2
zmW$jcU^Yv7B@8TLDI*zR?^rLc6R?ci?T*1b7#X0uGDgj^2C?1GlZL+H!N>r&)IQDo
z1T3%5AO(YBmNJq7ItH~{s|74FvhBb&9*hjQ;TN#atQIl-lJKPGJQx{J)7f=%uz)$O
z@rvs6nx%|nK(`qk7KH+~KCS!g6+9RjF!acXDLQqC9TH7gbd3ii1O7|=^v7GkPIdXA
z-1!Yl8OeYfBP>>D37Gz&X_7fS7#WZn)4#a)cf|U&8`UK9U}S(?(vhd00_LM|zM_K%
zBLj{_=-1s4u&#~9oo2jcIWscgT}`EO_j<&p&S^AA<iW^*49C>bZUQzaGkfYU9*hha
z3p0wY30UG|=jv%CEM+7E`mXv|Cf9)2&iuxv!#o%nu<drdwyS{E=v^{y=E2B-c=>~x
z=>n#(_T&ircPwQj1BMtYj_BQp*ufZ0>tr5`44685`@ls4cJ<~yvj!fF4Dejjax_`M
ziVEdZ#icA|Bm<UDy*#5uzzQ#Ay6xe?$bh&lpXDYrAtv|nhh`xUMg}|^=Dsdkz{VZ$
z2^&(zQbsc1z5eRqWdb&RSHL7+9*hi_rLw$c&=16JZ}b;s@?d0u-~HFV>jkXb@JqPD
zdzLbi0n>Mf`8*V`8%+myEaJh)fVy;*nSFmEwoq5sJ(UL|1A0hSmv{(R;Fo~<HXe)&
z@H9-haaF*IqV7DkEoV71GT>yY_)CX?_0X90Cz=N%16-sp8=aaF%N<lHU&n)y0Y4Vi
zo=QPXGSY2pseT1Z8OZ>Xy2P(Czc5+;&;>zuJQx|^C<<41L`>p(b-Ma`9*hj=_&je&
zypU|{nbi2hJQx{Z5q{I-myqn`FZZkmJQx{p(`crK?Qg{PKfV<6od+WW6ze9e-7jFb
zhYqsp^?{`u$$%4c6>>faSm(vNYsT|nWI&z8*STgbh#3_Gnylc#$bhSZU0Oo~tmo9R
z;k$V-GGK_Gd`$sjq9<z<Bv*MbGT?7UtM<@V#I7laYLxR}WWe9F%r6`M2iyI*y>lf?
zH<AH`Yl9cx6)>Guwr0b4FfyRjCD>G}4Y4G*+|y1x7#T2l!PMuTh)JfEUs$(|2O|Ui
zj(%ToT}XCq#s<IBJQx}9ce?M;&VK}KfmkPx3Hx6ICd|k_<A|7K-rFyWn|UxYV94t3
zyN?UWo~+#Cp!t!d^~r$dOQXL07Lpk&By63+gOLI6{{Ee9`xmiOsXMNE@nB@Y^ym|s
zv51M@{hi+@h6f`95_Mm{`zRy}yXU(plLsRMVxBK5H)+RY+qK5Fed58$fL~e47lQ?C
z)Pa2!il11zkqj`B?k#vCU^Alae~je8$N+7xV-`a?@XV}NIi6d>gOLI6?w44v7qC-@
z{Ec?-U}V4y?RSk*#6+c1f7xUnj10K{^r5TrKg2W+S7#LRU}S*l$dp6w0#-16Y0)1Z
zj10(np5=ZOG08!#FBStov$Q@LV71U;sYtX`EGb?(GGjUqMh0l6x2~BbU^zYItbBPe
zGT^^|vBOUYSi$JIdPjILGC=3c;`4O^HhGZg(z`qu8L+Nb@~}xVh<(p=NvPq$$N-xS
z8W;B?CR*SX?b_=LOE;1M1s7a;R|v`CcV0ha&V!Kwxf+(D5uGsEk?b=OZaf$nkli~X
zWeZ}GLld7>?&QJ90EOT$+n)-_Ec^rQQg|>jKw-|54O+4S=5pb|YbNY}4H)pTwEJqr
zB#)Asl|^4!x{(aXzSF}uL%<Fl*n4j<4@L&m&rQ#ll|yWJ*+<_QJQx`;-EP;+MTm*s
zy|Ej$i3cMCx*ZwYJy}R*E;^~4z=M$ix8=|O_$Oe|Hx`9H;laoNv(hmSXLd$xj$Y#0
zMjng|P#YK@6^EEeJh`~AcNI(PlL1pg<~cM9*jxY9(bhZ|8Q?O#e8*^c#Fo9;kOw>%
z8Q?Q5Ffu^EzB}1Cg!5ozfWfFaow5;=<l3buUf{vVfS=vwTXgDz$&AO1KKGOdBLl8!
zxK`K;Sd`_>wniR|3|Oh#?b9IvTXipTi~2W~)+YnJn@z8LKul71N#EUq2O|S!o~-;e
zyencZp)EVycrY?xUPj$lAH+ni%0V5$JQx|^rC7P_j)2vTYsoy%gOLHt0`A*)?}k{F
z_qWu19*hjwwej@iS%^v6zAqf!#DkFmTU)%x#tE4JNXyf`t65r~4DcN#pHm@}vEDAC
z#+(Nu1M+U@zZ#%`$&T%f^LOFF$bhPimm_=-6B&BHe-X@skpZ7(Ds@~HupuRTb|vv(
zWWW)f9Crmp#AL0jZolBc$bilPVIlJolic#2{;Zh?BLk{-^i@16Bs1KguB=hR()wh;
zfd@+_{}ix)hfFWo@L*)X!u_3=Oz4hftlYfQ%##Nr1FFuYObtRzbRm4{<y|}&8KBl$
zef^PuNv~}2xXgo*0j4MXZuC?_tf13fk3t@d4A}MJkIe$aByC!qFa6@d$bi`izm8lG
zuq7d#-sse_v_2V--Xpt7z6W9lGQP;#^I&AabyJbeVgZY?4>t<n!N>s5=PEr;3)m{H
zD3#+p7#UD>fAE$T0ZULnn){FkBLjXlg|%Au#MV!}I6b_U2O|UW%B-Ry5R>%PKUdhZ
zj-?yPfMDD2&g#mTY@<`he~vsD84&*am1HAglGe+O)5CZ$G9bLx#j-%a0?v;$yvl_A
zuK|N|_8AzdAT~{H*6|7+j0|Wi&7HIvG11k;nqghPvor`95VcpX%RK=L3hdUyhzBDB
zp0sIwRaZsqXo^~pBM(Lfw7yue)EzO&Xl;v(%{&+xP_*yQ#q$ED`$x|01P?|ADEuq>
z_g5(6?a{spk9jaMprO6w&a7UDjY#|H*~Ej90Rtz`u}BiITu0+`ed}3Tp9~mz;(+oG
z#3Xsa`KmTN7#Z-s|M&JuYMAWwq@ZqVcrY?x-}jzzQHV*l8tyATz=M$iAwzQ<zYEy!
zsVlGF<-y1R&*Rr4r>P@WE#vM`&x4TxCykX?WD3~5(_NOTHL!Fe8L)S|*KzgUh;^8q
zxM;|OkpWM%Ecg2e*i6@GPb(gb3|OtL?0g3?>H366@8<DfWWcozwsER`@SfS;bgc2@
z!N`D>r!<!@6R`E2o-7IC!N`C~4JB)DAtp(7%y5n7!N`CW$?qr1Y2cap+x(e#h6f`9
zZYq!8zeK=tk01D!$%Byr?y^4&FC!-La~9?2^I&8^>)k#Z{vsyUjCkz+i3cMCT;I3X
zPu9e49HU}=_ZJUF1{hSPzB!1Pc%Z7!W`#zU*+>Q)Ewps|ikQ@DZ*)H$9*hhqHy*D#
zUJJ3p(}mMacrY^Hp7+P<{Q?%b{%`g)9*hh~zwX{qfta}4)Y8z!JQx`;(O`4(SZ%y#
z)$aN!zC0KikX2&RxE(R^^!%v1J9scMAiZD1{(J%JmYD5%m<J;R3L*pd4eN{8zVZ4)
zQ+O~kAoS0W5P!r(Tiz%w&*8zyfSRA3mgOQQEt+q$<TVdQ251~{&eZ6K$@Ij|{xv)p
z88AT4@w7K$(vKhFM#wa=%tkVxMP&WuzL4zg!dF4Pc`z~{u64VIdVj=ZG?L;Cc`!2I
z)Z85NWr#^bM*N&Rkq09KURJF+d`ZAwyo^tF;K9g%JKa?>I}npRDV_Rr84pGVh`#T>
zI8z7DOuJ}#$|fF+3`iO2o_a;V!VQj%+RuZL0k7t)_H7q12e0>uNjw-CaO%O1+PS*e
zAhL=c;tU>)44C;wsn==5#Fu+^iFnR~kpXGn2L0ELn54@*rRYyQ7#VOiJ#5$vJuG7v
zTLXs{9*hjIXx!WNsDOQQT+yZb50*hp1{9e*TwIHoIDgP}7hN8V3>dOQC%{x6TmN%l
z<j2uG7#ZNzAeXuyG0Bah(9~%>7#Wb#`f+2qkgQAG_yLP~Ff!oq=_P$k2H=^=SZmw)
z@?c~@rt#X`5X3}JJ}>z%j0YnFGA5Wj`GA<D+xh&P$9XU^VB6cuoDl=@p0&;T+nmCK
zkpanf`&exdu+9;?igI``GN4=HxxmMWiOcTRoqElKkpb3@KeGB7V6qx7sedgGMh4Wq
zR_(tQF>%bS+})y|EVGde$eE;Cm5!Li&d@fy7Y{}TtZ{C%QyYZ$%(TIBfguk@29zr$
z4qt|tRJAPGVImJk23)K9Z&ZqqEH`@p?AbgR8Bm@#>XhtYA(@i$h~+#O8StO>BfFUb
zw$gQM+$J833|Km1K(B)WHrk{6^avh|3`m`?xu6^|@znZh+Q)e?GQg%i{NdOk*dVoW
zpKqk`U}Qj6+7sWsh>539`Sl@}2O|SkXV2BDK}@=S*BiwO9*hidQTkqHJrv8>)Hi$l
zFCL5xu>F3m<hXzhFKW2my_sbYlL3A$#l8O`CcWv@I(;AyMh0m9IOpnUhz;Uay!N;`
z4@L%z*<Bz$g_!j0-;L__JQx|!&mz3GMo8wq(nIXZgOLHYk$0WP4#Ngn`}fCDUmlDM
zxcG19s4xKwdwaSdj0YnFwhX^8FJHjg26{Ok=E2B-feY5%F)%_bslNQ$Wgd(Scr{7s
z+-d=HsGc%X%7c*s-!}YIxP_S5@utZ3B@adhnBN>4-DNnga-Lm!7=Go!$N=%u<J0XB
z6RmEn?$g49kpc5%`+kiPlKC7__^0rTWe}4AD_3QfmJ7+oUh^H_j|U?I=2{gk89V}K
zWBs?5z9V@sGC;>kd^$kD+^<Amw&uaefXJvZX7>dwYircp`8*gI@N@qOP#=kBrV%tO
zeiaW!2E5v<vS6uzIkZpJ-pYfK0e6}YB%DP|qTsZ0_&y$t3^?_u%&rMBX^5i5n?xRr
z49I&lTWO*(&c?lpak<xcFfzcQaz=h6Vxp0S^UZR3Ffu@Gw$=4~0jsEs_I=BPkpc5Z
zXPwp=g$-i-C2d3<4@L$kzP|ZuEn?Ee`x<jZzgY$`86bDOsrUwBqEfNwk17vF1_WN3
zU8^t}%h)QnKs1C0BLfC&jPB-ym^4Wzs*42=Mh5ggCS9E%BukKvah=J7kpVIedGneO
z6CbVHP~ygekpXiZT<=XBgJryON&A;S4@L&;ou#!Q3^7U2@F$gFJQx{}IJbLxF=FD7
z%V9r`@L*(svr=%$5ED$+*!R=sD?At(puJ{}kso5xM3V)|IXoB{5awL$@K{JT-Z<d!
zYaWaYI2tx=mBv_1X0`eG(i$F&3{dMcWyW&EM6NoHZ#sA|GNAjOjBTj`_I~{6(<&`2
zQ=bf&{lhj;))ZUcySQk;ARdei`1|=^uepecw4$vQ%y}>}VB*pZY6*x*R*iC-K9dI{
z1MX;s$2JR?f~!HYI}b(%ywRVUI_W<w<81dsjq7<ZGC)po%g6`;b2+A85YB^<0Sk8S
zTT&`ushhvL9OJ>rfO*LQzC*_$<|9{`c!dWe1J-<P>hC9D8|I3Xa(FN@AbL%w+0PM^
zW}Ae*eZzy10h79qe5zxHt)J}Db6gz{Mg~mP`*+0)F=?%vb)%@2Wj2xl`5GR68HkBq
zl=rRd#e<OnD+j7CRW(QKdS%zLp*$EFpkw#-k~d;f_cd9@Ry-IP5EF9#a1LS;N!z6w
zM;?p}@chzSOVt9OXJh9+e(K4CkpXL=_Pe`)ZAj}71@T~HfTORvRf>Qa|Jv!ep9doY
z6kog>(SewB@t(H)Bp!?mSeh9YJ8L{*X|@K#(s?j4pxcw1l32vV{dTW2c*=v30aZPg
zy!n8b$g$s|+hsf$8Su2_>qFxSSjN2A_6?0Z7#X1CyX4VU#KiqgwQtI`u?%7|piP?a
z>@H%Gw~trfQs=?Q0Ijo6zjU97m|MuNpdmaM8E|!G>i7AGNxRh5i!69BG9b8P_UxlV
zG7HT(%^5rx84%s1Bhx4(vy6${;l_iJ0hV<uKTWVitoqgBJN`Tv8DMmA(tz!ViO$%l
z?cKqHkpYL7e}DT2F|pN{Y>Olwj11^u^nTkSF*Zp2KnsIR9*hj|>Fi^kftcv`k@A->
zc`!0yv}f#NB`Zw!)$jbxDjtjs__1xwEhogJu>lTa{_tRAK*NjI<rfhX#qKfNs{Ds#
z5R(CJw`2ErnuOixxAXir10IYFXjQpcYcF7$OV)|ZcrY?xLUgw2VF6ne^y7dX4@L$!
zb?+1L88K;!%j2_4crY@cPsku06Klj=&6Q^Q@?c~@y}}sTU;&%&qWo|N4@L%z9=|@}
zIbxEtRjze$JQx`;<i)mmgKhAhdF%nLD?At(5Y**}(OSeLf!eF0q&yfIaG)lm^0t6&
zo7Xhq6%R%Rd{at0r#cz$nR-8;`fofK8SpiKNbg06NnhpVDg5QZ$N&YCR}IOCNsgb{
zWTpI<We}4AU!&3^+x{n6`>3h`JQx{}@%_bf@f1up?a=Q{V|g$#V8=E8m4^@$XFha2
zF`Wk^1B?!&jQW6>XwaQ2`xo<IWPsPldy7U+#WHR<VA6LT4@L$YRy_J605S1)7sH$o
z9*hi_Kj-?&XF@XL?><Z8crY>`X>ojXZ(BSwxlzNaFYsVwfZlt>EsGHo57<8?DU$~y
z141TOKRt_>^pD}haW8l<GQhFM#P_?9%;#19hYB8y4DdSfI?-gB(E8ic*EaEBWWZQ!
zjZZ;{iC12j)*;u<GKk55oFgm0<_O8`r2YP>^I&AaY0phzn$t0v+_ev9hVfuz!2Nxb
zGgcrb+TH$Yj3p0728`1D*LFon_I0VO&1@cw46te5vqHuWlhyVfe8PhVBLfCJIksa4
zV$uQ6E-c@~gOLG;HG)I-A|}48Gw{n!9*hi_*rR>ld&DG$Ws|-g<H5*)`Z-F8CNqQ&
z7T?3xrtx58z{0P6;{y>BuY38V_8t#L287n@pTCEgXp7_Sk;Ob18DQskU`h9xSjM%c
zRW4OL7#U!-CahpKV&Y_z)9I}|7#YxI(=*w4A=$B;rVqP!uuOe2V07N%D-DQAzINAM
zr^kbl0g1iW7mu~aGFq2cWQ^v)$bhoK*$^gRb9!jJpTdKY0ee*y|9gp;Wa1L}Ud}ui
z8E}2=Q8%qwn5^si3uUW$Ffw4?65H6dh>46-)srPW7#Xm&*UWGCg=B&6W46WcU}V4r
zaeg5<;F&!*|J&>i4@L$U|8c6nh?r<aoaXj?9*hh~X+KufX*ObA-d<??%!82uE-9&w
zvji-ybBb0g4@L&uJ$CZSF~r1A#YXG8|6`erWWd8+J@3>aCh5NAk-shvMh2udf3==C
z2a|P)oltDTgOLFaUk(QBM@%&G<+)SScrY?RVdqn)a>OLZH=AlN=E2B-im6qKW9DMA
z=;R4qeR(i4VCwkQSGFQ1y|}V}YA6pz2JD=0%jmg~to_`&{5T$r47hwq$xd$`o|*hV
z`M66w7#X0G^!Csi#H1%XWvr6&U}S)*zGuK)A(>9)@l!=S7#Z+q$Cc~qj+jhy^Odw}
z9*hhKedM9E5i!x79rmFzBJrUkeUgeyv#jD}ubMu#ohaRuW$SDE`$P7w<0AddQVX%-
zVb^(MN4>QCs1|Ef*rPbx?>bCA<Wy?;V7XOn?Ukx*8AXvuWbd)j*4x)J(A&#T=JA<{
zWWeLmc9RPcOBgi9uBJN=Mh5)a=Vh)xA7|sU`1)_Xc`!0S=49YSAH))r^hVv%<-y2+
zffenUHxLsQ?z9RV%7c*sw?{-i@9eZxT#+=|&t(h`Mh5gs3YlpyV6&{|tQpUPkpVuV
zMxWn{nB<RY?nWCPj116RYNGQ7v4oTbJI~DI!N`E?7uvH1Em$hn9T@Bu=){AO0mhfB
zKd(Sc60N`V#8MuN4EVWwgWN^LL~G)W2dw15$bbs%MFV~a$)*`Aby>%QkpaVkU2l$C
zh^?<$wkJJ+2O|TzZ4|rjKrG?%yKnX(JQx{J{JSP84>57Bou$)m9*hhKjn&Z6aTcCu
z<)L9QJQx`u)1W_U1!4(#h7Wh1;K9g%;>C-*oI^~!bJLzvXL&F(AVfp1pb@c(vROH$
zDLfb%FkE)1p3Nd0S7YiP4!X^QkpZH;ts4&@CfU=G(0HE*BLjRswHmw^utnY6Ry^my
z$N+Jmu9=|=V(O(2zP;wb$bgWS4=%1ptYSjA`GOBT7#UEcy(cIKF<o09zou#)j11T?
ze&j2a#dyzLt_?2x$%ByrZQt@d=OHHT9`SBuI}b(%$YlR9NkA;&l8x1Qc^Q^npA6V~
z)=TLdV!Bz0v+nog!N`D-&TWH+E?Fve?WM8(Q6C<R444w*_tF<Jag3#MyDkq#2Dq!r
zkGYDNRC8aaZbNx6GN4Vj(eR&u)i(SKAI*c20fu|WU7fZRu><eBzO~@N$bcxNyz)rI
zB-^}>_P61|$bc*38XZ0&=KAqRcK2C47#Wa%qxWVbS4?*Hl-%eAJQx|^teIu*g_yL(
zyVcW`2O|T#4XhsBM$C0{<1X!0JQx`u_j*gDtQ+o)mshB$`SD<6z|H=-=Vl`2nv|d6
zw1o#F0}S#%WgkRLw{Us9`3@e843KZPdsTv%*lWhH_B}ip8Q@mEwphm<pJ$p8-p6Bj
zFfzb6H+RMw#3V02n;RwYU}Qk<t|3X61x)_^ppEBvFfw58kq5ox0MATEqGfQE2O|R}
zUb_F%R>0P~Yh~T$!N>rul`@~g5R>M&>TSEngOLF#RtZ6Qh)HCN*3WsygOLGSHkQuT
zTZZE*Yf;&=VjhePI5kP`#tOtL^c>v}m-Ap`fc=6;RTmKxzrLAaS;d2q0k(S&cWOpV
z64UW>QX>yW1}y(=?PBhM$ujH=zqj&WWI)DElhhEzr1v3LL$(vku1^NMiP~V3i<qP;
z-Z)v22O|T9?%L?tXE{#&rmXyZ>O2@35OCk|+F}87*<rM>KMzI*e05BmcnUGsh~MiK
z2J>KKfOBa~_Zq~c3(lFy8S`LdfW)cg-k25GAX%?<was`iG9W$mdHDv!668)D4YK0F
z$N+84OC#?hR?*-cn>(EcBLgC)PVdrVC7#(G^+=e<gOLHsoeBpyAtvdm)Hi%F4@L%b
zZ(rbc8ZnV~?KAroJQx{J+QqA;Rlpwa=~=Ok2O|R>&rfNX;ECOM=Jie2Kpu<?sMnmL
z7><~$Vw6H?2oFXEZ1i{D{#3wRwDVMV^I&8^Y;~PmpH+zIMwIV8#DkFmPyT9bUyhh`
zdF_4Q6Fe9hP?VVa;5=fwT|YR#JIjNS0rgFplYR?j9JabOB9#Xt0}e#))V5xYWwd;+
zDu0^?BLf=N&U1@EOcLq*?E5_)j11Vedwu#h#9S8#<-dKwgOLH-cR$H9S%VW~asNf*
z-|}E&z&CNS(-r}%Hi;cx$%Byruxo$uW5g<2+x^OFcrY?RW#Ecls%tUXtkfQ#fAU~t
zz>{0oRxLzK`UP5EwDVwOfcSpqq$I>7jvlRsU1V8yeKNqJTutdGVing`+6+|T!N>qD
zon?c^dSMw;9QIDt<iW^*gF3yfgAo%+qvUGzc`!2IoZs`&`G`p-9sP68hzBDBCQa(2
zqUnugRKI@z{#YK23|Q+u`O6x_bZ-Z)vJ~@RWWZL_g~1sDcKk<e(=;B846u68|EI_Y
zC&>EK26yN1U}V7DyFqnx5v%x}G+TEu4@L&ePI~zDxRA^#@yOEUJQx`u_StpmD`JwO
zwmEU$JQx|^e0Qti*mc<YEuoE519&hpK(~3&7ztvMb;<JQgLyDAV1;%swHJuFni~(?
zv6}}Y1BNeL6>H>+_v}ZXePiQzFf!m<$&0E@h$R^2-p)?s!N`E^3+HIv7qIp|wFb#N
z7#R>|wX#OR4_^Uxyy_vk#)FXocZ)tGx*(RYqsx2KJ3JT}aQ>6R&+`K2K6Jo`M?4rA
zu%OR7aRXwKTO+eB<nv%;z>Vdy*CzSnnI)O&x0di=WI+B@*WXcyNgfsLx%-I+BLnI)
zZau9+%yrl&jm&x;j0_mkrWQA5Jtk9Klce6tgOLI0)~^b8AeLa`_}4{Nj%6bz11#T1
zxaT3}dT7WG`|dm#8Q_%G(O-Q7Vj8EmPf_Q=$bbQx-``)1SjDJg6BhO7!N`F5D?ezS
zL`?jqwe0gC9*hhauyA0^Hz8T0)AFK`JQx{ZURH2=%tqWn{JXmJG2_9=fZU|?$_<D~
zmdmsTS@B?GfOWq^+ogzAtoM19Hk}6}1EP(Ue|6b}Sa~7-WC0IG1~fi7`^FxzgkcYF
zY<1zm$bbn8m93)@(`|l@zbejykpXW{1Sh=_lI7}-zPXkMBLj+09vwC?05A0rEA=58
zc`z~{F}YujH)07^!JQK%JQx`et9Cy28e*=l^)X|2@nB>?!M$V0JA`CYJsdY2;K9fM
zn~gKJ*$3i#kQ<94eUI^AWWdIYA^$}q=IS!(K)2I87#ZMi*?C8~kSx=GQuJjWj0~80
zF;;WzX1vr+Ij<(C^I&9v$>rCdHX|lFm@{4{hX*4AKIl%jdw^KNH)X{cPkAshU`PDX
zR~lQejPc^JSw%b;8BjB6!BY>!Dh!LdyOi@_WI$BS)c-CbCb4`HF|>*YBLjvv_1X4a
zC}Xdup}q|~7#UFMxggVID=s|UN{q}~c`!2IsifC}ZHQHT8K1PLQ)iZ4pA5)(oVPJY
zNY***XrlrTMh46(zO1MkgtIaBY@bhRJQx}9=<&vc1p+4jFy%%+9*hi_&=RR~7%|-<
zyO;M3crY@++3e-Pa>S%9W5ypE!Gn<jPxUvd>u$qt9F*#C+LQ+)1Ky_weprE+xZ8k&
zcuO9P3^+SsOT{I`T!ZJOF0tjo$bfgFRkqa&WgPM&<bVSYMg|xb|4jc+f(>$DMaAKT
zJQx{ZXLM637_o}^X$wBN^I&9v{@IdMkA-BZdhIV(^I&A)cLC;HRNju5fv)*2e;$ks
z=zr_&^Vx`r3uL#JZsEbmfRkymo#TaMde)O5j0YnFrtQ2GT8mgh@z(#wMDbu`!1&TE
z*WtmqH#+W2w~yn&$bkNL8&v!d6E}V;mrLZq$biCeqh_TeCjI&&{MmUPj0{*JzJ2<i
zknF9=!q_w(j0_n0-mlZN5FEtOwhcMAc`!1-^jFZ2NW{bklU4NY^I&Aas@yKEuMv}$
zJjhAR<H5*)e&cS`>W1PDQV=~(TFiry0hPaef&ek;`5JH4avqEfxOY{&@B(5LlRrML
z`^tln0p^cN0-J<n*9_Vl8+b4>U}Nt^CI9Wf);~6~?szK?Mg}+~KYG7Sz{ceS#&?ou
z`Cvf?SPj3oL5f(y`q6=@3OpDY_}#Wm$9ja})PLAtyg`izBLmK9cKf^lF-fO}N!k5)
zFf!ofMcshIh*hkpd{AJ(gOTxnzdl_kW3Tepxg&V6|M~iKG$2O4KG7f?2XVrs^7;Sq
zU}V7ik-hh=6tKq!La$l!U}V5vt+Y*-1x!cz);e1rj0}iuIXSi-v5NP@=I?Ug!N`Ea
zZ8DclcjBei?e4y5ArD3d9MjK;lOQJ2Q%S$>&V!KwPA76N-b2jwR)x97Y95RX7^k*u
zpu#SkAoFI8`0B@lkpVirlj<E1bKO5HM!JOuBLh+_4;)VvlHF6AR~*KJkpcH_`8u^B
zCi*fUs%}3IMh4VH8g-r+f!meclBsZn2O|T%e;@g5J7VJGCxc5*@?d1ZsuhZ>pCTsB
zFq2ij$b*pqJ3bzNq8N!~oVcr5`x*~M28gyy|1}>m$;`g1w`cKSWPsbdn7^kGOE5cU
zqW_2oBLjcE=y*+ykSr}sT{oWxBLgO-w2d&|jSW(yzrE@$4@L%Dw7+%c0Aiw3#hZSA
z;=#y(AO1<<9}ufpy(s48cOHxk(2a=J9JL3}Ol9J$2Q54p8IYc!yeJT{gijT+-(|Y6
z?D}Ltf7hvr*@%e?Zas-n;K9g%DVy3(_uPwEv9?>R8V^PWm|L~BEI>^9^QZJ~KOT$>
z=&+oh6fY#pJ7~0V5D!KM%vnFyr$I=zar3zpV;+nQaBp4xWy(IpTJ5~IS@2+Fzy`6!
zti6bdOHFpIvEjkUfR(>S_A!aVOMT>NxWPgmj0^~wvAG}uv5Li}1%H7DBLlXCdiJeC
zOtiRt#2IfMj11^xW4pn8KQ_qBqE(FnJQx{pZu!=j1BgjZ2CQoi<-y2+V#z&^8pOm^
z<DGj(@nB?tXL-Ai)d8IP89VRhAK}5sfT6vNE8+xf^oz51PV-=7fN`*Y?Qg^+y%rlM
zr1D^7fd0#AnKsebjib5@Gr!G)kpVJ`^31{zOBlZCo##Csj0`YT+-(0!NH%)JI-@)u
zj0|Y%*gm1}LBx`~&oM0K!N`CblX*_d5UW@<clYpe9*hjIb`BeQMZnbK3d5^-FfyR0
z@P#Xf@B{pdLob_~crY^Hv*FDzc8KX3rft&s%Y%^tjn``5#UPfj8gzm>cV$^p$$$ZK
zhK80QR-y8H(A*w87#X0fB709a2FF$Xh)%bA^I&Aa^sd8<RwE`Y9zM9ME)PZq%>3xI
zAsI2<{~oVV8N!2+0cX$kKG}$vYh~i6Vq+eR47kuT3e01%jFpOA>&<vDGQfECj=mv?
zNyY?@mbd1?$bby3n_Hd>$p)s3^PRzikpa#RS1nSHLoCjqr@bQ&Mh56tzS4COFcr_t
zK}&crGT@KirNr}yRdiqXx_AW-Mg|1@{?Gq6VhNc~hwNX+gOLGMDPLY$9L8>}J~^>p
zAP+_c7_4_p-i4U1@8<4rLU=GT;F-Z|*F3~T;i;MSyLm7&V2hUC1A`-o^=p{CD3%8!
z1B~^b<gP(X(o5yGMFI~-2CN;iw$p9IbdUPhce=oXkpY>PZIYCZVi`}n8#-O%!N`Da
z(_;=TKrEq0%)IMaJQx{pGqda8M8sT|ebTRd$b*pq&CMRuS`gFS9r--DfCnQ3eh%?(
zusnumRy#W-p@at`1J>vr%-JVke;j@u`NV^f0gjuELJJVn9p^ImWi1az2AJk9GtfMa
zZwp>|*gtCK!N|bB13&ki3u3xI{=4{J2M<OD{JI~al_(@zGr8%3d^eU|p9~0TeH2=c
zSVj9&^Jrxrj0`w<ulMj#@z{;x(>A#pJQx|E6%;=$5HV@gv7#D19*hjo_;q^fbHpT3
zkuj@{crY?x`t8XNd!4{!rlG5}$MRrgz!Xm_Sb&)LS8KN`6L>H(;NPKLPmUwzy60ch
zqA5HW8F1GA_~Z8ic5*|}W_uot3~<`Mwzok7Vl7*|Cp+<AWI#X{gNW6LC1kGs(#w?x
zBLmv^-weBjn66UxrmLPj7#Z--^Zb3eL@c9Ho2i8#4@L$Y6@K6zv5JcHj*`th7#VQ+
zuhp|7h>4-Q;oluR7#YwqUUd5xVv;qlWCHi|U}S)UR>x4QlZf?+`taxo4@L&;dpJBR
z0x{PUJEpds;=#y(8&>=LUm_-!yFNzc5)VcOblbCkj@l`_)LtDwjIQ%wWWcg*3J2T~
z6J_-M`11}AMh3)<%2Bw4m_*d8%{rF{BLfZ}d{EFJl+krtNoGC|Mh28$cV2Irgx$Dn
zz|3`Tc`!1-e6wca7R00`fA5=C@?c~@mQU^BY{YawJC`4-=E2B-O4&UJyPw8n)7Fj|
z`;!MF1J*b68f%Z3Zs~Lz&%Znv84z@-Q`RBG#9Q?zId@iI+4aeQgt?JfWr#_v{+sLE
zg9jr6F62(G9C!xLta3;7#6CP28Q}G-^@$&1;zjZ@ef4-SGC(i1R4)s$gxQPBrWo>I
zWWdXiAMfPP;tn!(f^N_l9*hjQ`>+1z9K;eHJhPOUz=M$iefmXhO+d`mCx33*6dsHW
zXuLQgxkgB~`eYXk2Of+Jn65wA(BvGpe(%&TgBS8(WWe%8rLYw-vH602v)p+wGNAOb
z#)(|SMCU6*Z>;9Q$N-<yGc)?0$8oiJdyUx!9*hil_I3A}m57NRdHUVl#)FXo5r@C_
zNkvTBksbeFCl5vjB==F8)P`6^j`zpv{X7^MP}!lZG5rE2J70V1^HCm*42bP9!(%UE
zt_k*b-bp+d84&qfd-7YvD(=`#etL-qBLhwksQRs)j62Arf_S|fJQx{ZYP)SEASQlw
zJ+)^x4@L&eT9aOI4l!4!wl|rNcrY^H!ed{hI>e-%207T|^I&8^@h+R|V=rPEyDpi&
z@GTEU1~g{hsf<7@;b~H9$44HF40vF$!uvU5x?!n%eQJ3yGQjz_pR~^<JhNMNDMy-l
zFfu?pz#-WQv5JOwigE2c7#T2i`}`XTh`IhcwkBO(k!9B>1HJ~;`nCz!1($yfDm)k&
zkmNT|!Td5lJSQ#s@==oqBLmtOT+7*xm~Nd@ONl-YMh4tl*7h?Gu?i1OD>ow^j0_0g
z8}v=}3by|7_=0~XJQx|Ee9l(R6EVq)4~F+Fc`!1d@93b`tB8qIq6_q<@nB>?5q`h&
zAH;OeJ=fEm!-J6lvYFo;r=?(n%#>T2w}=NL12i>E_8mklA%E6R6AvDY47j)U@VinW
z*^V}~iC#Py88CL2{iPA9cxFG3+ilv!gOLF*PCWg-5i!?C;>`)$c`!0S$Ii+xOTb3`
z>NY!q2O|TX7B%%%Ov5t^8!VPT$b*pq<Ce)DbwNxr&#aSaJP$?&gf^}2oQRmHzul~R
zXLv9&p#7wie*<E=!|xiUrtn~7KwI9+0`sdl^><Gx{hQ8%kpW}tmZ*dxrt5zpZ{R&1
zj0`C8o%HFIkZg#yp=BNqMg};Z`li$W8YUYjb7FZh4@L%fTq^nCE?|NBWgYK%Ff!m&
zH=Eqch*ikgU)Ws5gOLGGE_R*&3o+^PO82#mJQx|!JLL2Li|hE2$#`q;E^Ry*8SumV
zM`#3M6;I8@KV-YJtlwn7)4oH-d=#+d`SRU*@?d0u^nqim;SC(bJ9a#i(cr<zfI*#<
zL>mwjtFAreuE&Fs0nw2U#di>^u#C@GWyph(0iwFT$z5(@8P~4r95;psBLmtFgmu^>
zCN(<Y8$6x|BLjA-n!njEB<tVve3=aoMh3*$?DZ)UFxNv@9cJ=iWWd;W4}&yr;UG3S
z7ntVAgOLFWF}s`H5tHs+I#*^X4@L&4ZGJ!ZJYpi_WBu}0@L*&>`he%z^@t_d>_2+M
zhX*4Al=Y6^wn)bYsrOOW3gp4a0K@4c+#?W^s>Xc%9>Rl>0badU_bft8Y%y}5%^n_%
z3>c%6YNeNfv+-)f>nAZh7#U#MsC8rwVy?}GpT{QfU}V5A>D9bTh>2@$7Py?_!N`Ef
zi~-HfLK*wpOmR!)!N`C*y-t(Gw{cu4s!U4G;K9g%iX-MVk%&o#>UPt;&x4Tx%@#qM
zKMKia98^(#!Gn<jrW2mFjLF0X@i)1x_m&4E1IB5o`R_tZqUJEL;3E%42BezD_I-m`
z!hmZgXX<z`GT>cPao~U~Z2ck0e^q|-U}V7aKO4V#BPO2uEb4?viDmsJ1AM!$wZ4Uz
zbdguj<Ze6|8St*I%ZDy^u#7vO<iz*l!N`EtJ2wqyA(n9QeoJ^?9*hjQx+wN(w2;jD
zmRer}9*hhaxqD)lGQ?cx#_zHo!Gn<j=YAXO=w{=k&Z!AMW6Fb(0jCSUyjX*nuKwBh
z@nRl~40vPm=4iT*Y~{<o#nX5&GT_!X_2IHo#N;Auy3Xan$bdjmn)Xb@q@~?8rnvB6
zWPrul8~L$_Ra{HFb<BeYBLl*Y4;=O$F>#Qq{7Nq#j0}*m7;<p*U7R4pUkz&B#DkFm
z-5Np*w+PttRZZiAc`!2IU)83`If%K|eRHUZ;K9fMi@aOsRC2IE{J-3KeUJwu18VP2
z&|HF;X!VZA9`QUF8TgmoMtGh=O!r6Zqn>AZFfzcmOXI_4#H6?Dwk=BK!N`EPlLHjR
z_i$Y4TFED6@L*)X&CMS1p@_NKZ1FO^$AggpyHABrDnU$SdAF%Lj|U?IWM_{%J@!7f
zeqFJx(_0>l4ESf4T^WLy>&zRi{Xg<xWPo_cr$dhslN8NfQdGl(kpY@14FP=~;B3sV
zEZ^VEgOLHxbWW^wMNIT4#WAIW2O|T#EAsj#Bj);Ur-gji9xS^)8Bq9b-tW#2ae{PN
zwcD*14@L&$lm$lH3)qe!D(n05U}V6iyiarYBPQ9hyno(69*hjwv2Cl)JH&MFY}qeA
zf(Ii5wn$`4`#r*LEE})C#FPgk1D-bw5A{S${54|mOG_S%3|LSVJ@q<bk~h;1+D+rZ
z$bgbd>vaDjCf(U7WzZZRj0|Y@o2ND>S9rs-$mp{R4@L&uYzrTM6fxI<&qgaO=fTK;
zuQFdcw+fiTo+bCz@nB?tX`WFZ@nhlL)$;Jufjk%)aKl|aKSIC;1|<Cr;laoNt+p!5
z0>q@swee4O^I&AaIEX&n`w8AN6SG(A5Ak4Rz|f_3+guP!NE;V9I-Un315D)p+&h7o
zXx?zWqi1+9GN964VO}+2((}Cs)Lr4h$bd2%^LZnm;so(jAG+rj4@L&apL5CeLrnbK
z?UMFg9*hi#s^2*-3o%J{b=tHiJQx|!cX#0drDxb6v-|&@_lgH21M*CtxjP`Hdv@-h
z%cVRR84w*YrR5l66*}=3tiJGIWWZ{rzwsXgEYN;?@pm4K3>dOe|I*MrY>+hVDQ|xB
zU}QktR+q~g1x(_yHcqA|%lb_Q9B*H<FB37{?Q8a#DDYrpz);`0y?Q*yL9A-g-9wEB
zBLkW*JZW-7OxH;Nk83|3j11V?xqRgj0o!^htKNVIBLm#0-ktdgF==}9LZgv97#VQi
zdTHXg7dWn_T+h2<#)FXo$7;r_?i4VqRo{}Vc`!1d&~W2I!+b2`;I#ZYCmxIp_`0*~
zUIb#U)m!`h0UnGD_`X<iUom3h$Z;Y5Yk4p-;7)S;MEwH9CI@e?-oS&A0fP$nj|mbm
z)h=qD!8{llp!m%4`Xj_D>>o}$9La-`0kwOU=k+PX){l(0KX!-*BLn_RI(=;^Vy^SH
zn;wqm!N`CM)h#QN5R>XxOGlpN!N>rU6Wirmg)&|f`QA(A!N`C;j}>~)e2G*4p8-tH
z<iW^*QRVZm#3Pn)_1x}F4|y;$V9=g-Y4wPSeJ8fZ<?~=<z_f<2J>plGtoXv5Yb87w
z8PM-kM#dh*bVup6F8suUkpYvtwl4iDV8wL_d+T{HGGNsG*aN0TSjM>ze)_laU}S*v
zv2$BP5OX#18MaGCnPo{O16uwY_xJ^3;xC?`X3FzmWPrb@M6FLTP7trK_#6cuj0|{x
z_mqJLVhN%8$)|eqU}V6)S0_K8M=a$^ujKk(JQx{}wlp=S6|oApzqhM3crY?Rx3@vf
zwAc8E$^B2Zp&t)M21MWAx-SZ`hATO?&iXtU8Sv$N%;isr>2{uNerzxgMh0|Ke^og8
z%~G+$&A~xIMm!i9u-Iex_brG;WoC}i9mRu@0ZPU#)9(t{3Qy7Uu{;<VAU$zrqQYD3
zMt28`W-}g)43K|#KxZLhx{p++f1JpJkpYj5nllm*a~NYLT5QdOkpUjkrp$W8l-H{2
z&a~yh$bhxOwd2f6ut6pqF07uxgOLI9KMRa@Af|h^bN{5-JQx|EJNe=HLd2xErq^wr
z&x4TxT4R>EYQ4j?Aa1DBZ)YBi3>fOZwbm0chh3Q(4NG}2GC=Ke=;w6AM7E>O*DvG2
z$N-gPs?Yu)mVdUpY7b8yj0{+i<`y!o6t}D0GU4CW@?d1Zo}b%u4k8wHrE|b>UmlDM
z2)vax@dIM6-&MwYY~;bnfZ57VI*lpAGg}?Lb^8_`j0~{y4}TLVU>6p@?U3+bWPr{x
z<tcX%OF37YI(7#SMh5)5r1VbZJz`Vt%6LccU}V744RsP{#C%?6Ep6S)gOLH9z0|9d
z5L2Eyq3J|44@L&8c^xL#f|#Ui?%{$s9*hj=AO2d!rW`-TyjkLP;5ZLP1}wS}_9+}O
zpJ%fVzewc4$bfBww5OCKmhwC<ZSq+jj0_0<apTeO3Vg(zaC|oWA`eCen63UT=Z~0!
z*5ZWyDLfb%@L1=!MW%qk0%i5<JQx|^KE`aF$_M=9c`RVr$_yTi4Dj{X)6G%9vNFFV
z-r>Q>0GZ$e#wQTV59{G<bB_lj15UI%)PF-PMf_`W!y_Jy4EXe1=gX){Y<<U%Y2MFx
zFfyQb`qvS`i0QVtS^5|7U}S(o@R#jR5pxZ<_wH8AgOLI5FE$&hf5dKdIn{Eiga;!7
z4$5pQ_CQP|S$^wsIS)n#44hK&^0I(EuHHNG6AwlP^ggg;c@tu~J73(`SjB^p0ds41
zi>H6W*Gbyf7dF@NU}V78gQm9+B4&JjmfZ0s9*hhKj;!=9MXaKK&siG3c`!1d>+J=y
zBR=D&m_EK?qyF+>WWcD^@)}zZ%h#M)pem!n^7fky$XwMi@Bv~H)x3mLop~@aAfvNt
zW{)p8u5#p6Cn)e>WWdAMo7J2V)BSiVuBitPMg~-;IryFxk{xPXpWBNEBLiL(47&3N
zv6PUxW0W*`Fft%Yy0m!8SA4_cU3ue9KOT$>*ywyDH4-u79=lg{*XO~=0G<5&h$6&N
zR{m%|KZpk-1O84mUf;J0@7b5?QyRl~Fft%#QP)Nf#47aHxTTEb!N`CBhsWPj5p(d`
zJi*6=2O|US464_c{e~X~3*T%DG2_9=fb?Z^!)y_ANb7s!?F1f-47k!H-yVxt%6><^
zf=N6W8BlxG{81xflGFR|ueIgD$bgn{n%l-y<HPe;z@%L>crY?x>yLz^TM&ziZ&uKr
z&4ZBv6{>bSA0j3_7+aL?$b*pq-z*EJDb-*%dbHIUIP+j+K+;{)qYDueZJ#4ovxEmD
z1IBnI?My<fVcPI_hk*wp1D@P0aj8bk_2d5jzgO^JWPr78^Tctrn5^1dT(pJ<BLhmm
zmrMypOfv7#o%QQ@Ff!oW>&Sp-h>1U(`lhjg2O|T1>i4;$S%=*ivtV>xAP+_c*dBd(
z#T_xRwyyn_Z9Etma8hH*rgMl@G(0MP6T*X$0WwkF?zSS9zkHi_-A*2i3<%HYsxj$1
zu5vwn3w-zRU}V6X$(MSDAtt_`VVAa_2O|T1&j06|kC>?Von%1_4@L%@HJzNGQIBOT
zFmrr&ga;!7VmJOOT_s=@Gj;!+;K9g%ZzpQ?ZXo91k>Y(di3cMCc3Sti`42Jii6?hw
zoae#FfY)Cd8>cp48DGiy<X_^!$bhh4*H6bGru$;@#dm2u7#R@d*Ga7mG3g1V{rWd~
zFfu?CI9`2NBVzKGlR9PcU}V4!;h~9`@)Zm7OHv+;4E))hVQ=ps=JO%;<HQF%7#VOW
zv{XyI2{+=@%N-}5@L*(s`MO#?K+HApl6S}p9*hi_Tju=z9AXU?2Tdzp@?d1Z%2B=E
z|3XZ>RdaOq8y<`dxZNl_M*IUCB-mj4yfPk)3^1FMuy+Sy4iPox7e4S{WPs(rRUw6l
zr8vig2Ylhd$bj&y+5S2|aS&T}im|QX!N`EdfcsOIA(r2HMBbr#9*hj=UXryX4>3uX
z`+bN0;=#y(*qAq<(~M=z_uf184-ZBL_<vu1cNt<Ld&d>W|M6gCKwRzATW1jy8+#Nz
zlT~GT)lLTN@%8-NidfXXt!L}I@?d0u<YB;F^I!Pzd>*{Ay*m#^2H1r^>KBHX&$}hV
zud481WI)KYQ$wF3*3h9<Biow?BLgPq7tdDvjcdW`xn40^JQx{pY{$ClrHDzS9lvMk
z@L*&>)_|3X7Z8g&xpKvy0X!HPkX<}Vy%w>QLfItMAv_ovu)!i?#(yoi5%-VKd}zdj
zkpb49;yi*7Yq;Ql;lEKl7#XnMO>X-=#FT@K+;)xS!N`EColidL*^0^T%Kw>Z&V!Kw
zzZN!#<{+jkU%PbOL>`O`kT#Ws#Umy?aOjSiH4jDx<o0>d@f9)g$JY}Irt)B9z=x0t
zPlvbR4w7_7Zo~{8j11`Hovj~?SjGIZEq=3kFfu^z(C+#9Lb6*|(&x|T!N`CbpLw0s
z{^0X${qPO@op~@a;GN8~8W6D1GfGiQc`!0S*{0U;3S!c;7yel<<H5*)1(h=U+7J`(
zma}SG$%Byr--oo%pYa#}&tUT{X>Ttcj0{*AfBah_V&a+7YHvRtj0{*jFuV6p#G)>~
z$vm)$2O|U4Ns~P%wc|Zod$MNZRvwHDa9yUja1UbAi^o0;3g*Gc0R2-6{fiN+h>IF^
zHH-%%1L7mM{_5X>-Kd*=OB~6AkpbdTwKb~{lNy?+w(R4<$bi#F?b5CwrmUB+e#Su_
zj0{+>k~pqSz=D34{EXwl$bje1^R%r0;hD|7*B*SF2O|Ue8E$QgKrE_j`X<py9*hh~
z)n1fegjl{_-2BUDcrY?xOvMFdRgtS$ckQI*(aAg*8F07zcfbD-tLQlU+%km+BLgfW
zQV%RaEa7sWvjeX4U}V6!{g+nkLQJ|RZc0!F4@L&uYdF6+Sva$81Ld>s@L*)XvTk-4
z3lI}WPb~?%$AggpZ~hLiZV}2Tb0)?smj@#Q4hAlIt0jZU(jB*4e8z*30hgi|j<iP1
zwNzvL%>o{b4EXXTvvdVw66=tv8O1yp8Q^{SPEI6Z2_~869+&W7WWd;nggz-k887{|
znODw(kpYh^vxmMGk}Z9{)ASP$Mh28wPrC9)NLD$*>`@gDMh5s7cIv0!$yF@AE^a(n
z$AggpO&@=su|-VuxpL(4CLW9oaC^VvuNPt!qbtjdfAe5ufX8jCj5x$xU-mn^@-GiY
z29%UI_+<%Y%#peMPt=R$?Kc@PC9YEM17Z?yvpwrO^I&8^?!!+Hy2|3zx7?<*N`VI>
z1IEigP#lSvctrT)(LH%EGQfRit9UkIqF%~A0lj!IGT@p1lhFY}GO6K(jT$@{8L*;h
zRBZxc30DWc_UgxjkpbhL%@f^2Oe*}cgdPt@1}yyD?b>(5DrOrL4j#;dkpVqtyg1TJ
z4$D~e;==u5JQx{pZiJ4rDPmHKX9xQl^I&AalslhVoe`6a4BC@o!h?|kXX>8mO9V_i
z^n#-q4@L$=MsGQkh?wr1O`^~VJQx}9+o6Ze1H=+`q!hMV@nB@YzN7Htn}EGpn6+;T
z4@L%5%I-PXy)(|nk71P`r}JQBfZB+iW+sS<ht_U?Gm8f!1Lpe`+;m1vQlMscZXORt
z2Au5g_E{p7(L$kp?Lr=m42aN^MxGI{xawT}B|I1z(0AVj^E~0qrjI+*;?9GS0V9Lb
z>gy0oFfyIma|I7Z2FT9bHdR#~CrFok@sZU$7#R?_>D%|wh>13+kGSH^gOLH>N|u-`
zLagH6-O`)>JQx`e(6`^pPyuV+HSc`@4@L$|wi-9*EMl(vzQ<Yw@nB?t+P2u#XNZZX
z6^DEc=E2B-AvHRKe;_7(`qAV@I1fe!9LaMqQ}2S^s3qFm63K&+0cUPT^f5zBvS`92
z|0o`e3~<_(d|@$S3A5*)kw3(PkpatOD&n>wCXW8H#^x{&Mg}ZZ`_JW!kgO^9b>Da%
zj115l=vrEUSVeVp>F!fJ7#Uz_pS*uySL{Y3hp>;AcrY>`s)x)~Tg0T}x~8s3<H5*)
z$IXYHu0gCq=k&em8$1{paBt1fk{HBv|MiM7%H+YwfMdBwcHBlx9B3(*Bjv%!fGz8K
ztS%F<m}_Yr_jxcfU`dxF)8)G1xSBIKspK&aMh485Tc<b_v5E%yY~SZR7#VQLQGJsg
zVy>F|=SmBCFfw5Ddh7Q-h>4UOHP^o8!N~BN`uSkXA;c1ThJbSE|Hp=j{_j8DJ|13v
zK5pPK!q3Cc&(qs$jt6-AF7xzSF~ZN^+vorN+mN9au<gU0h<M@8ipe>rU-tk1ta#b0
zrjKnWN;hTM`r7{fkiF};NPn}`Lacb$b>7%fFD*Z+#Tpg%D9-k~4wDZ#m0CVnZWUX5
dr7BxS5&s+PJvQ2U`+5d?d-=&cJ~NSw{{uq4>p}nk

diff --git a/tests/visual/newhorizons/model.ostest b/tests/visual/newhorizons/model.ostest
new file mode 100644
index 0000000000..540cb04e8d
--- /dev/null
+++ b/tests/visual/newhorizons/model.ostest
@@ -0,0 +1,17 @@
+{
+  "profile": "newhorizons",
+  "commands": [
+    {
+      "type": "navigationstate",
+      "value": {
+        "anchor": "NewHorizons",
+        "pitch": 0.0444246,
+        "position": [ 33.19494, -1.500620, -8.950034 ],
+        "up": [ 0.0469986, 0.998872, 0.00683673 ],
+        "yaw": 0.146484
+      }
+    },
+    { "type": "wait", "value": 5 },
+    { "type": "screenshot" }
+  ]
+}
diff --git a/tests/visual/newhorizons/pluto-projection.ostest b/tests/visual/newhorizons/pluto-projection.ostest
new file mode 100644
index 0000000000..498f212228
--- /dev/null
+++ b/tests/visual/newhorizons/pluto-projection.ostest
@@ -0,0 +1,29 @@
+{
+  "profile": "apollo",
+  "commands": [
+    { "type": "time", "value": "2015-07-14T08:14:30.00" },
+    {
+      "type": "property",
+      "value": {
+        "property": "Scene.PlutoProjection.Renderable.ColorTexturePaths",
+        "value": 1.0
+      }
+    },
+    {
+      "type": "navigationstate",
+      "value": {
+        "anchor": "Pluto",
+        "pitch": -0.0566951,
+        "position": [ -2300324, 2259246, 3521214 ],
+        "up": [ 0.862771, 0.403378, 0.304816 ],
+        "yaw": -0.119485
+      }
+    },
+    { "type": "deltatime", "value": 10 },
+    { "type": "pause", "value": false },
+    { "type": "wait", "value": 120 },
+    { "type": "pause", "value": true },
+    { "type": "time", "value": "2015-07-14T08:31:00.00" },
+    { "type": "screenshot" }
+  ]
+}
diff --git a/tests/visual/nightsky/constellationlines.ostest b/tests/visual/nightsky/constellationlines.ostest
index 77916b69cc..5c1ca4fae8 100644
--- a/tests/visual/nightsky/constellationlines.ostest
+++ b/tests/visual/nightsky/constellationlines.ostest
@@ -1,12 +1,15 @@
-[
-    { "type": "pause",
-      "value": "true"},
-    { "type": "time",
-      "value": "2023-03-03T20:00:00.00"},
-    { "type": "script",
-      "value": "openspace.fadeIn('Scene.Constellations.Renderable')"},
-    { "type": "wait",
-      "value": "30"},
-    { "type": "screenshot",
-      "value": "constellationlines"}
-]
+{
+  "profile": "nightsky",
+  "commands": [
+    { "type": "time", "value": "2023-03-03T20:00:00.00" },
+    {
+      "type": "property",
+      "value": {
+        "property": "Scene.Constellations.Renderable.Enabled",
+        "value": true
+      }
+    },
+    { "type": "wait", "value": 30 },
+    { "type": "screenshot" }
+  ]
+}
diff --git a/tests/visual/osirisrex/model.ostest b/tests/visual/osirisrex/model.ostest
new file mode 100644
index 0000000000..f6886c0073
--- /dev/null
+++ b/tests/visual/osirisrex/model.ostest
@@ -0,0 +1,26 @@
+{
+  "profile": "osirisrex",
+  "commands": [
+    { "type": "time", "value": "2018-10-30T23:00:00.00" },
+    {
+      "type": "navigationstate",
+      "value": {
+        "anchor": "OsirisRex",
+        "pitch": -0.00000274542,
+        "position": [ -3.894924, -9.051193, 5.720444 ],
+        "up": [ -0.911098, 0.149229, -0.384228 ],
+        "yaw": 0.0000270290
+      }
+    },
+    { "type": "action", "value": "os.FadeDownTrails" },
+    {
+      "type": "property",
+      "value": {
+        "property": "Scene.OsirisRexTrailBennu.Renderable.Enabled",
+        "value": false
+      }
+    },
+    { "type": "wait", "value": 2 },
+    { "type": "screenshot" }
+  ]
+}
diff --git a/tests/visual/osirisrex/osirisrexmodel.ostest b/tests/visual/osirisrex/osirisrexmodel.ostest
deleted file mode 100644
index 68811ad547..0000000000
--- a/tests/visual/osirisrex/osirisrexmodel.ostest
+++ /dev/null
@@ -1,16 +0,0 @@
-[ 
-    { "type": "pause", 
-      "value": "true"},
-    { "type": "time", 
-      "value": "2018-10-30T23:00:00.00"},       
-    { "type": "navigationstate", 
-      "value": "{Anchor='OsirisRex',Pitch=-0.274542E-5,Position={-3.894924E0,-9.051193E0,5.720444E0},ReferenceFrame='Root',Up={-0.911098E0,0.149229E0,-0.384228E0},Yaw=0.270290E-4}"},
-    { "type": "action", 
-      "value": "os.FadeDownTrails"}, 
-    { "type": "script", 
-      "value": "openspace.setPropertyValueSingle('Scene.OsirisRexTrailBennu.Renderable.Enabled', false)"}, 
-    { "type": "wait", 
-      "value": "2"}, 
-    { "type": "screenshot", 
-      "value": ""}
-]
diff --git a/tests/visual/osirisrex/osirisrexprojection.ostest b/tests/visual/osirisrex/osirisrexprojection.ostest
deleted file mode 100644
index ea9eceb153..0000000000
--- a/tests/visual/osirisrex/osirisrexprojection.ostest
+++ /dev/null
@@ -1,26 +0,0 @@
-[ 
-    { "type": "pause", 
-      "value": "true"},
-    { "type": "time", 
-      "value": "2019-01-13T19:18:20.00"},       
-    { "type": "navigationstate", 
-      "value": "{Anchor='BennuBarycenter',Pitch=-0.249726E-1,Position={6.343195E2,-7.381825E1,-2.105395E2},ReferenceFrame='Root',Up={0.260217E0,-0.340701E0,0.903444E0},Yaw=0.593456E-1}"},
-    { "type": "action", 
-      "value": "os.FadeDownTrails"},
-    { "type": "script", 
-      "value": "openspace.setPropertyValueSingle('Scene.POLYCAM FOV.Renderable.Enabled', false)"},
-    { "type": "script", 
-      "value": "openspace.setPropertyValueSingle('Scene.OsirisRexTrailBennu.Renderable.Enabled', false)"},
-    { "type": "pause", 
-      "value": "false"},
-    { "type": "wait", 
-      "value": "80"}, 
-    { "type": "pause", 
-      "value": "true"},
-    { "type": "time", 
-      "value": "2019-01-13T19:25:00.00"},       
-    { "type": "wait", 
-      "value": "2"}, 
-    { "type": "screenshot", 
-      "value": ""}
-]
diff --git a/tests/visual/osirisrex/projection.ostest b/tests/visual/osirisrex/projection.ostest
new file mode 100644
index 0000000000..ad3ed6daf1
--- /dev/null
+++ b/tests/visual/osirisrex/projection.ostest
@@ -0,0 +1,37 @@
+{
+  "profile": "osirisrex",
+  "commands": [
+    { "type": "time", "value": "2019-01-13T19:18:20.00" },
+    {
+      "type": "navigationstate",
+      "value": {
+        "anchor": "BennuBarycenter",
+        "pitch": -0.0249726,
+        "position": [ 634.3195, -73.81825, -210.5395 ],
+        "up": [ 0.260217, -0.340701, 0.903444 ],
+        "yaw": 0.0593456
+      }
+    },
+    { "type": "action", "value": "os.FadeDownTrails" },
+    {
+      "type": "property",
+      "value": {
+        "property": "Scene.POLYCAM FOV.Renderable.Enabled",
+        "value": false
+      }
+    },
+    {
+      "type": "property",
+      "value": {
+        "property": "Scene.OsirisRexTrailBennu.Renderable.Enabled",
+        "value": false
+      }
+    },
+    { "type": "pause", "value": false },
+    { "type": "wait", "value": 80 },
+    { "type": "pause", "value": true },
+    { "type": "time", "value": "2019-01-13T19:25:00.00" },
+    { "type": "wait", "value": 2 },
+    { "type": "screenshot" }
+  ]
+}
diff --git a/tests/visual/rosetta/model.ostest b/tests/visual/rosetta/model.ostest
new file mode 100644
index 0000000000..7dde8cc063
--- /dev/null
+++ b/tests/visual/rosetta/model.ostest
@@ -0,0 +1,26 @@
+{
+  "profile": "rosetta",
+  "commands": [
+    { "type": "time", "value": "2014-08-01T00:00:00.00" },
+    {
+      "type": "navigationstate",
+      "value": {
+        "anchor": "Rosetta",
+        "pitch": -0.0741904,
+        "position": [ -13.84875, -5.509888, 1.692047 ],
+        "up": [ 0.377490, -0.812217, 0.444752 ],
+        "yaw": -0.0388182
+      }
+    },
+    { "type": "action", "value": "os.FadeDownTrails" },
+    {
+      "type": "property",
+      "value": {
+        "property": "Scene.NAVCAM_FOV.Renderable.Enabled",
+        "value": false
+      }
+    },
+    { "type": "wait", "value": 2 },
+    { "type": "screenshot" }
+  ]
+}
diff --git a/tests/visual/rosetta/projection.ostest b/tests/visual/rosetta/projection.ostest
new file mode 100644
index 0000000000..c66915c0cd
--- /dev/null
+++ b/tests/visual/rosetta/projection.ostest
@@ -0,0 +1,29 @@
+{
+  "profile": "rosetta",
+  "commands": [
+    { "type": "time", "value": "2014-08-06T23:07:00.00" },
+    {
+      "type": "navigationstate",
+      "value": {
+        "anchor": "67P",
+        "pitch": -0.00608276,
+        "position": [ 103.5920, 10903.95, 6708.170 ],
+        "up": [ -0.972426, 0.182052, -0.145753 ],
+        "yaw": 0.00475854
+      }
+    },
+    { "type": "action", "value": "os.FadeDownTrails" },
+    {
+      "type": "property",
+      "value": {
+        "property": "Scene.NAVCAM_FOV.Renderable.Enabled",
+        "value": false
+      }
+    },
+    { "type": "pause", "value": false },
+    { "type": "wait", "value": 30 },
+    { "type": "pause", "value": true },
+    { "type": "time", "value": "2014-08-06T23:07:30.00" },
+    { "type": "screenshot" }
+  ]
+}
diff --git a/tests/visual/rosetta/rosettamodel.ostest b/tests/visual/rosetta/rosettamodel.ostest
deleted file mode 100644
index 3688861ba9..0000000000
--- a/tests/visual/rosetta/rosettamodel.ostest
+++ /dev/null
@@ -1,16 +0,0 @@
-[ 
-    { "type": "pause", 
-      "value": "true"},
-    { "type": "time", 
-      "value": "2014-08-01T00:00:00.00"},       
-    { "type": "navigationstate", 
-      "value": "{Anchor='Rosetta',Pitch=-0.741904E-1,Position={-1.384875E1,-5.509888E0,1.692047E0},ReferenceFrame='Root',Up={0.377490E0,-0.812217E0,0.444752E0},Yaw=-0.388182E-1}"},
-    { "type": "action", 
-      "value": "os.FadeDownTrails"}, 
-    { "type": "script", 
-      "value": "openspace.setPropertyValueSingle('Scene.NAVCAM_FOV.Renderable.Enabled', false)"}, 
-    { "type": "wait", 
-      "value": "2"}, 
-    { "type": "screenshot", 
-      "value": ""}
-]
diff --git a/tests/visual/rosetta/rosettaprojection.ostest b/tests/visual/rosetta/rosettaprojection.ostest
deleted file mode 100644
index 2fac8d6ce0..0000000000
--- a/tests/visual/rosetta/rosettaprojection.ostest
+++ /dev/null
@@ -1,22 +0,0 @@
-[ 
-    { "type": "pause", 
-      "value": "true"},
-    { "type": "time", 
-      "value": "2014-08-06T23:07:00.00"},
-    { "type": "navigationstate", 
-      "value": "{Anchor='67P',Pitch=-0.608276E-2,Position={1.035920E3,1.090395E4,6.708170E3},Up={-0.972426E0,0.182052E0,-0.145753E0},Yaw=0.475854E-2}"},
-    { "type": "action", 
-      "value": "os.FadeDownTrails"}, 
-    { "type": "script", 
-      "value": "openspace.setPropertyValueSingle('Scene.NAVCAM_FOV.Renderable.Enabled', false)"},
-    { "type": "pause", 
-      "value": "false"},      
-    { "type": "wait", 
-      "value": "30"}, 
-    { "type": "pause", 
-      "value": "true"},
-    { "type": "time", 
-      "value": "2014-08-06T23:07:30.00"},     
-    { "type": "screenshot", 
-      "value": ""}
-]
diff --git a/tests/visual/voyager/1/model.ostest b/tests/visual/voyager/1/model.ostest
new file mode 100644
index 0000000000..8515c758ff
--- /dev/null
+++ b/tests/visual/voyager/1/model.ostest
@@ -0,0 +1,26 @@
+{
+  "profile": "voyager",
+  "commands": [
+    { "type": "time", "value": "1977-09-10T12:00:00.00" },
+    {
+      "type": "navigationstate",
+      "value": {
+        "anchor": "Voyager_1",
+        "pitch": 0.0289491,
+        "position": [ 9.291557, 3.604126, 0.823166 ],
+        "up": [ 0.130390, -0.527836, 0.839278 ],
+        "yaw": -0.00997966
+      }
+    },
+    { "type": "action", "value": "os.FadeDownTrails" },
+    {
+      "type": "property",
+      "value": {
+        "property": "Scene.Voyager_1_Trail_*.Enabled",
+        "value": false
+      }
+    },
+    { "type": "wait", "value": 2 },
+    { "type": "screenshot" }
+  ]
+}
diff --git a/tests/visual/voyager/voyager1model.ostest b/tests/visual/voyager/voyager1model.ostest
deleted file mode 100644
index c305765205..0000000000
--- a/tests/visual/voyager/voyager1model.ostest
+++ /dev/null
@@ -1,16 +0,0 @@
-[
-    { "type": "pause", 
-      "value": "true"},
-    { "type": "time", 
-      "value": "1977-09-10T12:00:00.00"},       
-    { "type": "navigationstate", 
-      "value": "{Anchor='Voyager_1',Pitch=0.289491E-1,Position={9.291557E0,3.604126E0,0.823166E0},ReferenceFrame='Root',Up={0.130390E0,-0.527836E0,0.839278E0},Yaw=-0.997966E-2}"},
-    { "type": "action", 
-      "value": "os.FadeDownTrails"}, 
-    { "type": "script", 
-      "value": "openspace.setPropertyValue('Scene.Voyager_1_Trail_*.Enabled',false);"},
-    { "type": "wait", 
-      "value": "2"}, 
-    { "type": "screenshot", 
-      "value": ""}
-]
diff --git a/tests/visual/voyager/voyagers-2020.ostest b/tests/visual/voyager/voyagers-2020.ostest
new file mode 100644
index 0000000000..4d9176aafe
--- /dev/null
+++ b/tests/visual/voyager/voyagers-2020.ostest
@@ -0,0 +1,19 @@
+{
+  "profile": "voyager",
+  "commands": [
+    { "type": "time", "value": "2020-01-01T00:00:00.00" },
+    {
+      "type": "navigationstate",
+      "value": {
+        "anchor": "Sun",
+        "pitch": -0.296905E-2,
+        "position": [ -5.701493E12, 2.431929E13, -4.495678E13 ],
+        "up": [ -0.117936E0, 0.867082E0, 0.484003E0 ],
+        "yaw": -0.189846E-1
+      }
+    },
+    { "type": "action", "value": "os.FadeDownTrails" },
+    { "type": "wait", "value": 2 },
+    { "type": "screenshot" }
+  ]
+}
diff --git a/tests/visual/voyager/voyagers2020.ostest b/tests/visual/voyager/voyagers2020.ostest
deleted file mode 100644
index 858fff0a3e..0000000000
--- a/tests/visual/voyager/voyagers2020.ostest
+++ /dev/null
@@ -1,14 +0,0 @@
-[
-    { "type": "pause", 
-      "value": "true"},
-    { "type": "time", 
-      "value": "2020-01-01T00:00:00.00"},       
-    { "type": "navigationstate", 
-      "value": "{Anchor='Sun',Pitch=-0.296905E-2,Position={-5.701493E12,2.431929E13,-4.495678E13},ReferenceFrame='Root',Up={-0.117936E0,0.867082E0,0.484003E0},Yaw=-0.189846E-1}"},
-    { "type": "action", 
-      "value": "os.FadeDownTrails"}, 
-    { "type": "wait", 
-      "value": "2"}, 
-    { "type": "screenshot", 
-      "value": ""}
-]

From 4f647d5085d5d7a9a3171b097a79a116b57bb105 Mon Sep 17 00:00:00 2001
From: Alexander Bock <alexander.bock@liu.se>
Date: Thu, 23 May 2024 21:42:15 +0200
Subject: [PATCH 457/701] Move Spout-based layer for Earth to examples folder

---
 .../layers/colorlayers => examples}/terra_texture_spout.asset   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
 rename data/assets/{scene/solarsystem/planets/earth/layers/colorlayers => examples}/terra_texture_spout.asset (85%)

diff --git a/data/assets/scene/solarsystem/planets/earth/layers/colorlayers/terra_texture_spout.asset b/data/assets/examples/terra_texture_spout.asset
similarity index 85%
rename from data/assets/scene/solarsystem/planets/earth/layers/colorlayers/terra_texture_spout.asset
rename to data/assets/examples/terra_texture_spout.asset
index 1fa4595d02..74c0d97754 100644
--- a/data/assets/scene/solarsystem/planets/earth/layers/colorlayers/terra_texture_spout.asset
+++ b/data/assets/examples/terra_texture_spout.asset
@@ -1,4 +1,4 @@
-local globe = asset.require("../../earth")
+local globe = asset.require("scene/solarsystem/planets/earth/earth")
 
 
 

From be6c3f801ea2cb8ce62ad3e89ca4d837a1fba514 Mon Sep 17 00:00:00 2001
From: Alexander Bock <alexander.bock@liu.se>
Date: Fri, 24 May 2024 18:41:04 +0200
Subject: [PATCH 458/701] Rename Glare->Core and Halo->Glare in RenderableStars

---
 data/assets/scene/digitaluniverse/stars.asset |  22 ++--
 .../objects/orionnebula/cluster.asset         |   2 +-
 data/assets/scene/milkyway/stars/denver.asset |   2 +-
 modules/space/rendering/renderablestars.cpp   | 105 +++++++++---------
 modules/space/rendering/renderablestars.h     |   8 +-
 modules/space/shaders/star_fs.glsl            |  34 +++---
 6 files changed, 85 insertions(+), 88 deletions(-)

diff --git a/data/assets/scene/digitaluniverse/stars.asset b/data/assets/scene/digitaluniverse/stars.asset
index 3a5584494e..654c11d2eb 100644
--- a/data/assets/scene/digitaluniverse/stars.asset
+++ b/data/assets/scene/digitaluniverse/stars.asset
@@ -32,16 +32,16 @@ local Stars = {
   Renderable = {
     Type = "RenderableStars",
     File = speck .. "stars.speck",
-    Halo = {
-      Texture = textures .. "halo.png",
-      Multiplier = 0.65
-    },
-    Glare = {
+    Core = {
       Texture = textures .. "glare.png",
       Multiplier = 15.0,
       Gamma = 1.66,
       Scale = 0.18
     },
+    Glare = {
+      Texture = textures .. "halo.png",
+      Multiplier = 0.65
+    },
     MagnitudeExponent = 6.325,
     ColorMap = colormaps .. "colorbv.cmap",
     OtherDataColorMap = colormaps .. "viridis.cmap",
@@ -77,17 +77,17 @@ local SunStar = {
   Renderable = {
     Type = "RenderableStars",
     File = sunspeck .. "sunstar.speck",
-    Halo = {
+    Core = {
+      Texture = textures .. "glare.png",
+      Multiplier = 1.0,
+      Scale = 0.1
+    },
+    Glare = {
       Texture = textures .. "halo.png",
       Multiplier = 0.55,
       Gamma = 1.1,
       Size = 0.95
     },
-    Glare = {
-      Texture = textures .. "glare.png",
-      Multiplier = 1.0,
-      Scale = 0.1
-    },
     MagnitudeExponent = 6.25,
     ColorMap = colormaps .. "colorbv.cmap",
     SizeComposition = "Distance Modulus",
diff --git a/data/assets/scene/milkyway/objects/orionnebula/cluster.asset b/data/assets/scene/milkyway/objects/orionnebula/cluster.asset
index abd7e97d05..2bd67379a1 100644
--- a/data/assets/scene/milkyway/objects/orionnebula/cluster.asset
+++ b/data/assets/scene/milkyway/objects/orionnebula/cluster.asset
@@ -16,7 +16,7 @@ local OrionClusterStars = {
   Renderable = {
     Type = "RenderableStars",
     File = sync .. "oricluster.speck",
-    Halo = {
+    Glare = {
       Texture = sync .. "halo.png"
     },
     ColorMap = sync .. "colorbv.cmap",
diff --git a/data/assets/scene/milkyway/stars/denver.asset b/data/assets/scene/milkyway/stars/denver.asset
index 9e5804c1bd..6b125543ca 100644
--- a/data/assets/scene/milkyway/stars/denver.asset
+++ b/data/assets/scene/milkyway/stars/denver.asset
@@ -25,7 +25,7 @@ local Object = {
   Renderable = {
     Type = "RenderableStars",
     File = speck .. "denver_stars.speck",
-    Halo = {
+    Glare = {
       Texture = textures .. "halo.png"
     },
     ColorMap = colorLUT .. "denver_colorbv.cmap",
diff --git a/modules/space/rendering/renderablestars.cpp b/modules/space/rendering/renderablestars.cpp
index ca91528041..3d31c916d4 100644
--- a/modules/space/rendering/renderablestars.cpp
+++ b/modules/space/rendering/renderablestars.cpp
@@ -54,9 +54,8 @@ namespace {
         "modelMatrix", "cameraViewProjectionMatrix", "cameraUp", "eyePosition",
         "colorOption", "magnitudeExponent", "sizeComposition", "lumCent", "radiusCent",
         "colorTexture", "opacity", "otherDataTexture", "otherDataRange",
-        "filterOutOfRange", "fixedColor", "haloTexture", "haloMultiplier", "haloGamma",
-        "haloScale", "hasGlare", "glareTexture", "glareMultiplier", "glareGamma",
-        "glareScale"
+        "filterOutOfRange", "fixedColor", "glareTexture", "glareMultiplier", "glareGamma",
+        "glareScale", "hasCore", "coreTexture", "coreMultiplier", "coreGamma", "coreScale"
     };
 
     enum SizeComposition {
@@ -218,16 +217,16 @@ namespace {
         openspace::properties::Property::Visibility::AdvancedUser
     };
 
-    const openspace::properties::PropertyOwner::PropertyOwnerInfo HaloOwnerInfo = {
-        "Halo",
-        "Halo",
-        "Settings for the halo portion of the star."
+    const openspace::properties::PropertyOwner::PropertyOwnerInfo CoreOwnerInfo = {
+        "Core",
+        "Core",
+        "Settings for the central core portion of the star."
     };
 
     const openspace::properties::PropertyOwner::PropertyOwnerInfo GlareOwnerInfo = {
         "Glare",
         "Glare",
-        "Settings for the central glare portion of the star."
+        "Settings for the glare portion of the star."
     };
 
     constexpr openspace::properties::Property::PropertyInfo TextureInfo = {
@@ -364,11 +363,11 @@ namespace {
             std::optional<float> scale;
         };
 
-        // [[codegen::verbatim(HaloOwnerInfo.description)]]
-        Texture halo;
-
         // [[codegen::verbatim(GlareOwnerInfo.description)]]
-        std::optional<Texture> glare;
+        Texture glare;
+
+        // [[codegen::verbatim(CoreOwnerInfo.description)]]
+        std::optional<Texture> core;
 
         // [[codegen::verbatim(MagnitudeExponentInfo.description)]]
         std::optional<float> magnitudeExponent;
@@ -447,8 +446,8 @@ RenderableStars::RenderableStars(const ghoul::Dictionary& dictionary)
     )
     , _fixedColor(FixedColorInfo, glm::vec3(1.f), glm::vec3(0.f), glm::vec3(1.f))
     , _filterOutOfRange(FilterOutOfRangeInfo, false)
-    , _halo{
-        properties::PropertyOwner(HaloOwnerInfo),
+    , _core{
+        properties::PropertyOwner(CoreOwnerInfo),
         properties::StringProperty(TextureInfo),
         properties::FloatProperty(MultiplierInfo, 1.f, 0.f, 20.f),
         properties::FloatProperty(GammaInfo, 1.f, 0.f, 5.f),
@@ -589,36 +588,34 @@ RenderableStars::RenderableStars(const ghoul::Dictionary& dictionary)
 
     auto markTextureAsDirty = [this]() {_pointSpreadFunctionTextureIsDirty = true; };
 
-    _halo.texturePath = absPath(p.halo.texture).string();
-    _halo.texturePath.onChange(markTextureAsDirty);
-    _halo.file = std::make_unique<ghoul::filesystem::File>(_halo.texturePath.value());
-    _halo.file->setCallback(markTextureAsDirty);
-    _halo.container.addProperty(_halo.texturePath);
-    _halo.multiplier = p.halo.multiplier.value_or(_halo.multiplier);
-    _halo.container.addProperty(_halo.multiplier);
-    _halo.gamma = p.halo.gamma.value_or(_halo.gamma);
-    _halo.container.addProperty(_halo.gamma);
-    _halo.scale = p.halo.scale.value_or(_halo.scale);
-    _halo.container.addProperty(_halo.scale);
-    addPropertySubOwner(_halo.container);
-
-    if (p.glare.has_value()) {
-        _glare.texturePath = absPath(p.glare->texture).string();
-        _glare.file =
-            std::make_unique<ghoul::filesystem::File>(_glare.texturePath.value());
-        _glare.file->setCallback(markTextureAsDirty);
-        _glare.multiplier = p.glare->multiplier.value_or(_glare.multiplier);
-        _glare.gamma = p.glare->gamma.value_or(_glare.gamma);
-        _glare.scale = p.glare->scale.value_or(_glare.scale);
+    if (p.core.has_value()) {
+        _core.texturePath = absPath(p.core->texture).string();
+        _core.file = std::make_unique<ghoul::filesystem::File>(_core.texturePath.value());
+        _core.file->setCallback(markTextureAsDirty);
+        _core.multiplier = p.core->multiplier.value_or(_core.multiplier);
+        _core.gamma = p.core->gamma.value_or(_core.gamma);
+        _core.scale = p.core->scale.value_or(_core.scale);
     }
+    _core.texturePath.onChange(markTextureAsDirty);
+    _core.container.addProperty(_core.texturePath);
+    _core.container.addProperty(_core.multiplier);
+    _core.container.addProperty(_core.gamma);
+    _core.container.addProperty(_core.scale);
+    addPropertySubOwner(_core.container);
+
+    _glare.texturePath = absPath(p.glare.texture).string();
     _glare.texturePath.onChange(markTextureAsDirty);
+    _glare.file = std::make_unique<ghoul::filesystem::File>(_glare.texturePath.value());
+    _glare.file->setCallback(markTextureAsDirty);
     _glare.container.addProperty(_glare.texturePath);
+    _glare.multiplier = p.glare.multiplier.value_or(_glare.multiplier);
     _glare.container.addProperty(_glare.multiplier);
+    _glare.gamma = p.glare.gamma.value_or(_glare.gamma);
     _glare.container.addProperty(_glare.gamma);
+    _glare.scale = p.glare.scale.value_or(_glare.scale);
     _glare.container.addProperty(_glare.scale);
     addPropertySubOwner(_glare.container);
 
-
     _magnitudeExponent = p.magnitudeExponent.value_or(_magnitudeExponent);
     addProperty(_magnitudeExponent);
 
@@ -655,7 +652,7 @@ RenderableStars::RenderableStars(const ghoul::Dictionary& dictionary)
 }
 
 bool RenderableStars::isReady() const {
-    return _program && _halo.texture;
+    return _program && _glare.texture;
 }
 
 void RenderableStars::initializeGL() {
@@ -739,7 +736,7 @@ void RenderableStars::loadPSFTexture() {
         component.file->setCallback(markPsfTextureAsDirty);
     };
 
-    loadTexture(_halo);
+    loadTexture(_core);
     loadTexture(_glare);
 
     _pointSpreadFunctionTextureIsDirty = false;
@@ -798,24 +795,24 @@ void RenderableStars::render(const RenderData& data, RendererTasks&) {
         _program->setUniform(_uniformCache.opacity, opacity());
     }
 
-    ghoul::opengl::TextureUnit haloUnit;
-    haloUnit.activate();
-    _halo.texture->bind();
-    _program->setUniform(_uniformCache.haloTexture, haloUnit);
-    _program->setUniform(_uniformCache.haloMultiplier, _halo.multiplier);
-    _program->setUniform(_uniformCache.haloGamma, _halo.gamma);
-    _program->setUniform(_uniformCache.haloScale, _halo.scale);
-
     ghoul::opengl::TextureUnit glareUnit;
-    if (_glare.texture) {
-        glareUnit.activate();
-        _glare.texture->bind();
-        _program->setUniform(_uniformCache.glareTexture, glareUnit);
-        _program->setUniform(_uniformCache.glareMultiplier, _glare.multiplier);
-        _program->setUniform(_uniformCache.glareGamma, _glare.gamma);
-        _program->setUniform(_uniformCache.glareScale, _glare.scale);
+    glareUnit.activate();
+    _glare.texture->bind();
+    _program->setUniform(_uniformCache.glareTexture, glareUnit);
+    _program->setUniform(_uniformCache.glareMultiplier, _glare.multiplier);
+    _program->setUniform(_uniformCache.glareGamma, _glare.gamma);
+    _program->setUniform(_uniformCache.glareScale, _glare.scale);
+
+    ghoul::opengl::TextureUnit coreUnit;
+    if (_core.texture) {
+        coreUnit.activate();
+        _core.texture->bind();
+        _program->setUniform(_uniformCache.coreTexture, coreUnit);
+        _program->setUniform(_uniformCache.coreMultiplier, _core.multiplier);
+        _program->setUniform(_uniformCache.coreGamma, _core.gamma);
+        _program->setUniform(_uniformCache.coreScale, _core.scale);
     }
-    _program->setUniform(_uniformCache.hasGlare, _glare.texture != nullptr);
+    _program->setUniform(_uniformCache.hasCore, _core.texture != nullptr);
 
     ghoul::opengl::TextureUnit colorUnit;
     if (_colorTexture) {
diff --git a/modules/space/rendering/renderablestars.h b/modules/space/rendering/renderablestars.h
index f2716cb304..e35241a216 100644
--- a/modules/space/rendering/renderablestars.h
+++ b/modules/space/rendering/renderablestars.h
@@ -115,7 +115,7 @@ private:
         std::unique_ptr<ghoul::filesystem::File> file;
     };
 
-    TextureComponent _halo;
+    TextureComponent _core;
     TextureComponent _glare;
 
     struct {
@@ -133,9 +133,9 @@ private:
     UniformCache(
         modelMatrix, cameraViewProjectionMatrix, cameraUp, eyePosition, colorOption,
         magnitudeExponent, sizeComposition, lumCent, radiusCent, colorTexture, opacity,
-        otherDataTexture, otherDataRange, filterOutOfRange, fixedColor, haloTexture,
-        haloMultiplier, haloGamma, haloScale, hasGlare, glareTexture, glareMultiplier,
-        glareGamma, glareScale
+        otherDataTexture, otherDataRange, filterOutOfRange, fixedColor, glareTexture,
+        glareMultiplier, glareGamma, glareScale, hasCore, coreTexture, coreMultiplier,
+        coreGamma, coreScale
     ) _uniformCache;
 
     bool _speckFileIsDirty = true;
diff --git a/modules/space/shaders/star_fs.glsl b/modules/space/shaders/star_fs.glsl
index 554f112621..a9ace5d807 100644
--- a/modules/space/shaders/star_fs.glsl
+++ b/modules/space/shaders/star_fs.glsl
@@ -32,7 +32,7 @@ flat in float ge_speed;
 flat in float gs_screenSpaceDepth;
 
 uniform sampler1D colorTexture;
-uniform sampler2D haloTexture;
+uniform sampler2D glareTexture;
 uniform float opacity;
 uniform vec3 fixedColor;
 uniform int colorOption;
@@ -40,16 +40,16 @@ uniform sampler1D otherDataTexture;
 uniform vec2 otherDataRange;
 uniform bool filterOutOfRange;
 
-uniform float haloMultiplier;
-uniform float haloGamma;
-uniform float haloScale;
-
-uniform bool hasGlare;
-uniform sampler2D glareTexture;
 uniform float glareMultiplier;
 uniform float glareGamma;
 uniform float glareScale;
 
+uniform bool hasCore;
+uniform sampler2D coreTexture;
+uniform float coreMultiplier;
+uniform float coreGamma;
+uniform float coreScale;
+
 // keep in sync with renderablestars.h:ColorOption enum
 const int ColorOptionColor = 0;
 const int ColorOptionVelocity = 1;
@@ -106,16 +106,16 @@ Fragment getFragment() {
 
   vec2 shiftedCoords = (texCoords - 0.5) * 2;
 
-  vec2 scaledCoordsHalo = shiftedCoords / haloScale;
-  vec2 unshiftedCoordsHalo = (scaledCoordsHalo + 1.0) / 2.0;
-  float haloValue = texture(haloTexture, unshiftedCoordsHalo).a;
-  float alpha = pow(haloValue, haloGamma) * haloMultiplier;
-  if (hasGlare) {
-    vec2 scaledCoordsGlare = shiftedCoords / glareScale;
-    vec2 unshiftedCoordsGlare = (scaledCoordsGlare + 1.0) / 2.0;
-    float glareValue = texture(glareTexture, unshiftedCoordsGlare).a;
-    float glare = pow(glareValue, glareGamma) * glareMultiplier;
-    alpha += glare;
+  vec2 scaledCoordsGlare = shiftedCoords / glareScale;
+  vec2 unshiftedCoordsGlare = (scaledCoordsGlare + 1.0) / 2.0;
+  float glareValue = texture(glareTexture, unshiftedCoordsGlare).a;
+  float alpha = pow(glareValue, glareGamma) * glareMultiplier;
+  if (hasCore) {
+    vec2 scaledCoordsCore = shiftedCoords / coreScale;
+    vec2 unshiftedCoordsCore = (scaledCoordsCore + 1.0) / 2.0;
+    float coreValue = texture(coreTexture, unshiftedCoordsCore).a;
+    float core = pow(coreValue, coreGamma) * coreMultiplier;
+    alpha += core;
   }
 
   vec4 fullColor = vec4(color.rgb, alpha * opacity);

From ff9b72c5800ca998e0a67059ff8dae848a03221f Mon Sep 17 00:00:00 2001
From: Alexander Bock <mail@alexanderbock.eu>
Date: Mon, 27 May 2024 14:00:31 +0200
Subject: [PATCH 459/701] Prevent crash when accessing a layer name after it
 has been deleted (closes #3283)

---
 modules/globebrowsing/src/layergroup.cpp | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/modules/globebrowsing/src/layergroup.cpp b/modules/globebrowsing/src/layergroup.cpp
index 598c217d1b..3dee97cbfe 100644
--- a/modules/globebrowsing/src/layergroup.cpp
+++ b/modules/globebrowsing/src/layergroup.cpp
@@ -177,12 +177,15 @@ void LayerGroup::deleteLayer(const std::string& layerName) {
                 layerGroup->identifier(),
                 it->get()->identifier()
             );
+            // We need to keep the name of the layer since we only get it as a reference
+            // and the name needs to survive the deletion
+            const std::string lName = layerName;
             _layers.erase(it);
             update();
             if (_onChangeCallback) {
                 _onChangeCallback(nullptr);
             }
-            LINFO("Deleted layer " + layerName);
+            LINFO(std::format("Deleted layer {}", lName));
 
             if (_layers.empty()) {
                 _levelBlendingEnabled.setVisibility(

From 09d4ea6170517512d726d75b92ac6551b3681062 Mon Sep 17 00:00:00 2001
From: Alexander Bock <alexander.bock@liu.se>
Date: Mon, 27 May 2024 14:19:17 +0200
Subject: [PATCH 460/701] Update README.md

---
 README.md | 42 ++++++++++++++++++++++++++----------------
 1 file changed, 26 insertions(+), 16 deletions(-)

diff --git a/README.md b/README.md
index dcec2c1483..2426de74ae 100644
--- a/README.md
+++ b/README.md
@@ -1,5 +1,5 @@
 ![OpenSpace Logo](/data/openspace-horiz-logo-crop.png)
-[OpenSpace](http://openspaceproject.com) is an open source, non-commercial, and freely available interactive data visualization software designed to visualize the entire known universe and portray our ongoing efforts to investigate the cosmos.  Bringing the latest techniques from data visualization research to the general public, OpenSpace supports interactive presentation of dynamic data from observations, simulations, and space mission planning and operations.  The software works on multiple operating systems (Windows, Linux, MacOS) with an extensible architecture capable of powering both personal computers and also high resolution tiled displays and planetarium domes.  In addition, OpenSpace enables simultaneous connections across the globe creating opportunity for shared experiences among audiences worldwide.  The target audience of the software reaches from the general public who wishes to explore our universe, enthusiasts interested in hacking the underlying components in OpenSpace to create unique experiences, informal science institutions wishing to create a low-cost, yet powerful exhibition piece, but also scientists desiring to visualize their datasets in a contextualized, powerful software.
+[OpenSpace](http://openspaceproject.com) is an open source, non-commercial, and freely available interactive data visualization software designed to visualize the entire known universe and portray our ongoing efforts to investigate the cosmos. Bringing the latest techniques from data visualization research to the general public, OpenSpace supports interactive presentation of dynamic data from observations, simulations, and space mission planning and operations. The software works on multiple operating systems (Windows, Linux, MacOS) with an extensible architecture capable of powering both personal computers and also high resolution tiled displays and planetarium domes. In addition, OpenSpace enables simultaneous connections across the globe creating opportunity for shared experiences among audiences worldwide. The target audience of the software reaches from the general public who wishes to explore our universe, enthusiasts interested in hacking the underlying components in OpenSpace to create unique experiences, informal science institutions wishing to create a low-cost, yet powerful exhibition piece, but also scientists desiring to visualize their datasets in a contextualized, powerful software.
 
 [![License](https://img.shields.io/badge/License-MIT-purple.svg?style=flat-square)](LICENSE)
 [![Download](https://img.shields.io/github/v/tag/OpenSpace/OpenSpace?label=Version&color=maroon&style=flat-square)](https://www.openspaceproject.com/installation)
@@ -13,42 +13,52 @@
 
 ![Image](https://docs.openspaceproject.com/en/latest/_static/images/collection.jpg)
 
+
 # Background
-OpenSpace started as a collaboration between Sweden's [Linköping University](https://immvis.github.io) (LiU) and the [American Museum of Natural History](https://www.amnh.org) (AMNH).  Development of the software began several years ago through a close collaboration with NASA Goddard's [Community Coordinated Modeling Center](https://ccmc.gsfc.nasa.gov) (CCMC) to model space weather forecasting and continued with visualizations of NASA's New Horizons mission to Pluto and ESA's Rosetta mission to 67P/Churyumov-Gerasimenko.  This promising set of preliminary work provided a foundation for continued funding from NASA, the Swedish eScience Research Centre, and the Knut and Alice Wallenberg foundation, which has extended the collaboration to include the University of Utah's [Scientific Computing and Imaging](https://www.sci.utah.edu) (SCI) Institute, [New York University](https://www.nyu.edu)'s Tandon School of Engineering, multiple informal science institutions across the world, and multiple, international vendors.
+OpenSpace started as a collaboration between Sweden's [Linköping University](https://immvis.github.io) (LiU) and the [American Museum of Natural History](https://www.amnh.org) (AMNH). Development of the software began several years ago through a close collaboration with NASA Goddard's [Community Coordinated Modeling Center](https://ccmc.gsfc.nasa.gov) (CCMC) to model space weather forecasting and continued with visualizations of NASA's New Horizons mission to Pluto and ESA's Rosetta mission to 67P/Churyumov-Gerasimenko. This promising set of preliminary work provided a foundation for continued funding from NASA, the Swedish eScience Research Centre, and the Knut and Alice Wallenberg foundation, which has extended the collaboration to include the University of Utah's [Scientific Computing and Imaging](https://www.sci.utah.edu) (SCI) Institute, [New York University](https://www.nyu.edu)'s Tandon School of Engineering, multiple informal science institutions across the world, and multiple, international vendors.
 
 ![Image](https://docs.openspaceproject.com/en/latest/_static/images/presentation.jpg)
 
+
 # Features
 Some of the high-level features supported in OpenSpace are:
- - AMNH's Digital Universe catalog of extrasolar datasets (stars, galaxies, quasars, ...)
- - High-resolution planetary images for major objects in the solar system (Earth, Moon, Mars, Venus, ...)
- - Animated 3D models representing space missions (ISS, New Horizons, JWST, ...)
- - Support for custom profiles with arbitrary user-defined content
- - Ability to drive any type of display environment (flat screen, multi-projector, planetariums, ...)
- - Lua and JavaScript interface into the engine allowing highly customized controls
- - Native support to export an interactive sessions as individual frames for video export
- - much much more (see our [Changelog](http://wiki.openspaceproject.com/docs/general/releases))
+  - AMNH's Digital Universe catalog of extrasolar datasets (stars, galaxies, quasars, ...)
+  - High-resolution planetary images for major objects in the solar system (Earth, Moon, Mars, Venus, ...)
+  - Animated 3D models representing space missions (ISS, New Horizons, JWST, ...)
+  - Support for custom profiles with arbitrary user-defined content
+  - Ability to drive any type of display environment (flat screen, multi-projector, planetariums, ...)
+  - Lua and JavaScript interface into the engine allowing highly customized controls
+  - Native support to export an interactive sessions as individual frames for video export
+  - much much more (see our [Changelog](http://wiki.openspaceproject.com/docs/general/releases))
 
 OpenSpace requires at least support for [OpenGL](https://www.opengl.org/) version 3.3, some custom components require at least version 4.2.
 
 ![Image](https://docs.openspaceproject.com/en/latest/_static/images/display-systems.jpg)
 
+
 # Getting Started
-This repository contains the source code and example profiles for OpenSpace, but does not contain any data.  To build and install the application, please check out the [GitHub Wiki](https://github.com/OpenSpace/OpenSpace/wiki).  Here, you will find two pages, a [build instruction](https://github.com/OpenSpace/OpenSpace/wiki/Compiling) for all operating systems and then additional instructions for [Windows](https://github.com/OpenSpace/OpenSpace/wiki/Compiling-Windows), [Linux (Ubuntu)](https://github.com/OpenSpace/OpenSpace/wiki/Compiling-Ubuntu), and [MacOS](https://github.com/OpenSpace/OpenSpace/wiki/Compiling-MacOS). Please note that the Apple Silicon series of chips do not support OpenGL natively and Metal 2 does not support `double` precision accuracy (see [here](https://developer.apple.com/metal/Metal-Shading-Language-Specification.pdf) Section 2.1), therefore only the Intel processors for MacOS are supported and maintained.
+This repository contains the source code and example profiles for OpenSpace, but does not contain any data. To build and install the application, please check out the [Documentation](https://docs.openspaceproject.com). Here, you will find the build instructions for all operating systems. Please note that the Apple Silicon series of chips do not support OpenGL natively and Metal 2 does not support `double` precision accuracy (see [here](https://developer.apple.com/metal/Metal-Shading-Language-Specification.pdf) Section 2.1), therefore only the Intel processors for MacOS are supported and maintained.
 
 Requirements for compiling are:
- - CMake version 3.25 or above
- - C++ compiler supporting C++20/C++23 (MSVC 19.39, GCC13, Clang17, AppleClang 15.0.0)
- - [Boost](http://www.boost.org/)
- - [Qt](http://www.qt.io/download)
+  - CMake version 3.25 or above
+  - C++ compiler supporting C++20/C++23 (MSVC 19.39, GCC13, Clang17, AppleClang 15.0.0)
+  - [Boost](http://www.boost.org/)
+  - [Qt](http://www.qt.io/download)
 
-Feel free to create issues for missing features, bug reports, or compile problems or contact us via [email](mailto:openspace@amnh.org?subject=OpenSpace:).  Regarding any issues, you are very welcome on our [Slack support channel](https://openspacesupport.slack.com) to which you can freely [sign-up](https://join.slack.com/t/openspacesupport/shared_invite/zt-24uhn3wvo-gCGHgjg2m9tHzKUEb_FyMQ).
+
+## :bulb: Asking Questions
+Feel free to create issues for missing features, bug reports, or compile problems or contact us via [email](mailto:support@openspaceproject.com?subject=OpenSpace:). Regarding any issues, you are very welcome on our [Slack support channel](https://openspacesupport.slack.com) to which you can freely [sign-up](https://join.slack.com/t/openspacesupport/shared_invite/zt-24uhn3wvo-gCGHgjg2m9tHzKUEb_FyMQ).
+
+## :heart: Contributing
+Any contributions to the software are very welcome and can take a multitude of forms, from reporting a bug, fixing bugs, creating new content, writing new features, and even creating and sharing images and videos you have made with the software. Please feel free to share anything you want in the #sharespace channel on the Slack.
 
 ![Image](https://docs.openspaceproject.com/en/latest/_static/images/himalaya-nkpg-dome.jpg)
 
+
 # License
 The contents of this repository provided under an [MIT license](https://github.com/OpenSpace/OpenSpace/blob/master/LICENSE.md).
 
+
 # Support
 OpenSpace is supported by the following institutions:
 

From 099079d77c834393a4bbd8b9d2ea042ea15dba52 Mon Sep 17 00:00:00 2001
From: Alexander Bock <mail@alexanderbock.eu>
Date: Mon, 27 May 2024 14:20:00 +0200
Subject: [PATCH 461/701] Add some more clarifying information to the
 contributing file

---
 .github/CONTRIBUTING.md | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/.github/CONTRIBUTING.md b/.github/CONTRIBUTING.md
index a011b7cc45..bf5141c61e 100644
--- a/.github/CONTRIBUTING.md
+++ b/.github/CONTRIBUTING.md
@@ -1,4 +1,9 @@
 # How to contribute
+Contributions to OpenSpace are welcomed and highly encouraged! They can take many forms and all forms of contributions, for example reporting bugs, fixing bugs, creating and sharing new content, writing documentation, and many many other forms. Even creating interesting pictures and videos and sharing them helps.
+
+## :book: Code of Conduct
+Please review our [Code of Conduct](../CODE_OF_CONDUCT.md). It is in effect at all times and we expect it to be honored by everyone at all times.
+
 ## Code changes
 The easiest way to contribute is through a separate fork of the repository and submitting a Pull Request. One of the core developers will review the pull request and integrate it into the `master` branch. Preferably, for each Pull Request, there is an accompanying issue (created by you or not) which the Pull Request addresses. In this case, feel free to use the phrase "(closes #XXX)" in the text of the Pull Request, where `XXX` is the number of the issue that you have solved. The PR should be in its own separate branch following the naming `pr/feature`, where `feature` is a short, descripting name of the additional feature or bug contained in the PR.
 

From ad70b74c731caa477d5d30dc54f4848df5dbd396 Mon Sep 17 00:00:00 2001
From: Alexander Bock <mail@alexanderbock.eu>
Date: Mon, 27 May 2024 15:09:14 +0200
Subject: [PATCH 462/701] Update AssImp library to 5.4.1 (closes #3241)

---
 ext/ghoul | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ext/ghoul b/ext/ghoul
index 73a98890ff..89cd93b9e5 160000
--- a/ext/ghoul
+++ b/ext/ghoul
@@ -1 +1 @@
-Subproject commit 73a98890ff322496c39c820cc53b3f7b4b9f92ce
+Subproject commit 89cd93b9e5191e75e07395024f8b16ab20ae9f99

From bb032489521eee834c5bfa41b76a6e01ccafab6e Mon Sep 17 00:00:00 2001
From: Alexander Bock <mail@alexanderbock.eu>
Date: Mon, 27 May 2024 17:05:05 +0200
Subject: [PATCH 463/701] Harmonize naming of accessing the script log. Also
 scroll to the bottom of the list by default (closes #3268)

---
 .../include/profile/scriptlogdialog.h         |  4 ++--
 .../ext/launcher/src/profile/actiondialog.cpp |  6 ++---
 .../src/profile/additionalscriptsdialog.cpp   |  4 ++--
 .../launcher/src/profile/propertiesdialog.cpp |  4 ++--
 .../launcher/src/profile/scriptlogdialog.cpp  | 24 ++++++++++++-------
 5 files changed, 24 insertions(+), 18 deletions(-)

diff --git a/apps/OpenSpace/ext/launcher/include/profile/scriptlogdialog.h b/apps/OpenSpace/ext/launcher/include/profile/scriptlogdialog.h
index af982ae116..8c59dcf3b6 100644
--- a/apps/OpenSpace/ext/launcher/include/profile/scriptlogdialog.h
+++ b/apps/OpenSpace/ext/launcher/include/profile/scriptlogdialog.h
@@ -31,10 +31,10 @@ class QLineEdit;
 class QListWidget;
 class QPushButton;
 
-class ScriptlogDialog final : public QDialog {
+class ScriptLogDialog final : public QDialog {
 Q_OBJECT
 public:
-    ScriptlogDialog(QWidget* parent, std::string filter = "");
+    explicit ScriptLogDialog(QWidget* parent, std::string filter = "");
 
 signals:
     void scriptsSelected(std::vector<std::string> script);
diff --git a/apps/OpenSpace/ext/launcher/src/profile/actiondialog.cpp b/apps/OpenSpace/ext/launcher/src/profile/actiondialog.cpp
index ec7b0e4ec2..31257856b0 100644
--- a/apps/OpenSpace/ext/launcher/src/profile/actiondialog.cpp
+++ b/apps/OpenSpace/ext/launcher/src/profile/actiondialog.cpp
@@ -224,7 +224,7 @@ void ActionDialog::createActionWidgets(QGridLayout* layout) {
     _actionWidgets.isLocal->setEnabled(false);
     layout->addWidget(_actionWidgets.isLocal, 5, 2, 1, 2);
 
-    _actionWidgets.chooseScripts = new QPushButton("Choose Scripts");
+    _actionWidgets.chooseScripts = new QPushButton("Add from ScriptLog");
     _actionWidgets.chooseScripts->setToolTip(
         "Press this button to choose scripts for your action from the logs/scriptlog.txt"
     );
@@ -671,9 +671,9 @@ void ActionDialog::actionRejected() {
 }
 
 void ActionDialog::chooseScripts() {
-    ScriptlogDialog d(this);
+    ScriptLogDialog d(this);
     connect(
-        &d, &ScriptlogDialog::scriptsSelected,
+        &d, &ScriptLogDialog::scriptsSelected,
         this, &ActionDialog::appendScriptsToTextfield
     );
     d.exec();
diff --git a/apps/OpenSpace/ext/launcher/src/profile/additionalscriptsdialog.cpp b/apps/OpenSpace/ext/launcher/src/profile/additionalscriptsdialog.cpp
index 8c08187bc0..fe57e85aaf 100644
--- a/apps/OpenSpace/ext/launcher/src/profile/additionalscriptsdialog.cpp
+++ b/apps/OpenSpace/ext/launcher/src/profile/additionalscriptsdialog.cpp
@@ -103,9 +103,9 @@ void AdditionalScriptsDialog::parseScript() {
 }
 
 void AdditionalScriptsDialog::chooseScripts() {
-    ScriptlogDialog d(this);
+    ScriptLogDialog d = ScriptLogDialog(this);
     connect(
-        &d, &ScriptlogDialog::scriptsSelected,
+        &d, &ScriptLogDialog::scriptsSelected,
         this, &AdditionalScriptsDialog::appendScriptsToTextfield
     );
     d.exec();
diff --git a/apps/OpenSpace/ext/launcher/src/profile/propertiesdialog.cpp b/apps/OpenSpace/ext/launcher/src/profile/propertiesdialog.cpp
index 3df3f61585..9fe9e61d4d 100644
--- a/apps/OpenSpace/ext/launcher/src/profile/propertiesdialog.cpp
+++ b/apps/OpenSpace/ext/launcher/src/profile/propertiesdialog.cpp
@@ -376,9 +376,9 @@ void PropertiesDialog::keyPressEvent(QKeyEvent* evt) {
 }
 
 void PropertiesDialog::selectLineFromScriptLog() {
-    ScriptlogDialog d(this, "openspace.setPropertyValue");
+    ScriptLogDialog d = ScriptLogDialog(this, "openspace.setPropertyValue");
     connect(
-        &d, &ScriptlogDialog::scriptsSelected,
+        &d, &ScriptLogDialog::scriptsSelected,
         [this](const std::vector<std::string>& scripts) {
             for (const std::string& script : scripts) {
                 listItemAdded();
diff --git a/apps/OpenSpace/ext/launcher/src/profile/scriptlogdialog.cpp b/apps/OpenSpace/ext/launcher/src/profile/scriptlogdialog.cpp
index 97496890ed..5ac9a3693d 100644
--- a/apps/OpenSpace/ext/launcher/src/profile/scriptlogdialog.cpp
+++ b/apps/OpenSpace/ext/launcher/src/profile/scriptlogdialog.cpp
@@ -39,8 +39,9 @@
 #include <QFile>
 #include <QPushButton>
 #include <QTextStream>
+#include <QTimer>
 
-ScriptlogDialog::ScriptlogDialog(QWidget* parent, std::string filter)
+ScriptLogDialog::ScriptLogDialog(QWidget* parent, std::string filter)
     : QDialog(parent)
     , _scriptLogFile(openspace::global::configuration->scriptLog)
     , _fixedFilter(std::move(filter))
@@ -51,7 +52,7 @@ ScriptlogDialog::ScriptlogDialog(QWidget* parent, std::string filter)
     loadScriptFile();
 }
 
-void ScriptlogDialog::createWidgets() {
+void ScriptLogDialog::createWidgets() {
     //         Column 0              Column 1
     //  *-------------------------*------------*
     //  | Title                                |
@@ -95,12 +96,12 @@ void ScriptlogDialog::createWidgets() {
 
     _filter = new QLineEdit;
     _filter->setPlaceholderText("Filter the list of scripts");
-    connect(_filter, &QLineEdit::textEdited, this, &ScriptlogDialog::updateScriptList);
+    connect(_filter, &QLineEdit::textEdited, this, &ScriptLogDialog::updateScriptList);
     layout->addWidget(_filter, 1, 0);
 
     _reloadFile = new QPushButton("Reload");
     _reloadFile->setToolTip("Reload the script log file");
-    connect(_reloadFile, &QPushButton::clicked, this, &ScriptlogDialog::loadScriptFile);
+    connect(_reloadFile, &QPushButton::clicked, this, &ScriptLogDialog::loadScriptFile);
     layout->addWidget(_reloadFile, 1, 1);
 
     _scriptlogList = new QListWidget;
@@ -113,17 +114,17 @@ void ScriptlogDialog::createWidgets() {
         buttons->setStandardButtons(QDialogButtonBox::Save | QDialogButtonBox::Cancel);
         connect(
             buttons, &QDialogButtonBox::accepted,
-            this, &ScriptlogDialog::saveChosenScripts
+            this, &ScriptLogDialog::saveChosenScripts
         );
         connect(
             buttons, &QDialogButtonBox::rejected,
-            this, &ScriptlogDialog::reject
+            this, &ScriptLogDialog::reject
         );
         layout->addWidget(buttons, 3, 0, 1, 2);
     }
 }
 
-void ScriptlogDialog::loadScriptFile() {
+void ScriptLogDialog::loadScriptFile() {
     _scripts.clear();
 
     const std::filesystem::path log = absPath(_scriptLogFile);
@@ -140,9 +141,14 @@ void ScriptlogDialog::loadScriptFile() {
         }
     }
     updateScriptList();
+
+    // It's not possible to call the `scrollToBottom` function directly as it only will
+    // scroll to the middle of the list. By doing it this way, we correctly end up at the
+    // bottom of the list
+    QTimer::singleShot(0, _scriptlogList, &QListWidget::scrollToBottom);
 }
 
-void ScriptlogDialog::updateScriptList() {
+void ScriptLogDialog::updateScriptList() {
     const std::string filter = _filter->text().toStdString();
     QListWidgetItem* curr = _scriptlogList->currentItem();
     std::string selection;
@@ -164,7 +170,7 @@ void ScriptlogDialog::updateScriptList() {
     }
 }
 
-void ScriptlogDialog::saveChosenScripts() {
+void ScriptLogDialog::saveChosenScripts() {
     std::vector<std::string> chosenScripts;
     QList<QListWidgetItem*> itemList = _scriptlogList->selectedItems();
 

From aa0255bccbd13f7784d5e9a864a8557fe3e8283e Mon Sep 17 00:00:00 2001
From: Alexander Bock <alexander.bock@liu.se>
Date: Fri, 31 May 2024 22:26:24 +0200
Subject: [PATCH 464/701] Add example for the LuaScale class and fix it at the
 same time (#3271)

* Change the LuaScale to request a single table as a return value to be consistent with the other Lua transformation types
---
 .../examples/scale/luascale/example.lua       | 12 +++++++
 data/assets/examples/scale/luascale/lua.asset | 34 +++++++++++++++++++
 modules/base/scale/luascale.cpp               | 34 +++++++++----------
 modules/base/scale/luascale.h                 |  3 +-
 4 files changed, 64 insertions(+), 19 deletions(-)
 create mode 100644 data/assets/examples/scale/luascale/example.lua
 create mode 100644 data/assets/examples/scale/luascale/lua.asset

diff --git a/data/assets/examples/scale/luascale/example.lua b/data/assets/examples/scale/luascale/example.lua
new file mode 100644
index 0000000000..3410061570
--- /dev/null
+++ b/data/assets/examples/scale/luascale/example.lua
@@ -0,0 +1,12 @@
+-- The `scale` function takes exactly three arguments and returns the three scaling
+-- values (one for each axis) as a single table.
+-- The three parameters are all provided as the number of seconds past the J2000 epoch
+-- (2000-01-01 12:00:00), which can be both fractional numbers as well as negative numbers
+-- for dates earlier than the epoch.
+--  1. `simulationTime` is the value of the in-game clock for the current frame
+--  2. `prevSimulationTime` is the value of the in-game clock for the previous frame
+--  3. `wallTime` is the value of the computer clock as seconds past the epoch
+function scale(simulationTime, prevSimulationTime, wallTime)
+  -- Make the scaling along the x-axis oscillate between -3 and 3 once per second
+  return { 3 * math.sin(simulationTime), 1, 1 }
+end
diff --git a/data/assets/examples/scale/luascale/lua.asset b/data/assets/examples/scale/luascale/lua.asset
new file mode 100644
index 0000000000..df3558d1b3
--- /dev/null
+++ b/data/assets/examples/scale/luascale/lua.asset
@@ -0,0 +1,34 @@
+-- Basic
+-- This asset creates a SceneGraphNode that only displays coordinate axes. The sizes of
+-- coordinate axes are determined by executing a Lua file that returns the scaling
+-- parameters to be used as a table.
+--
+-- ```{literalinclude} example.lua
+-- :language: lua
+-- :caption: The script file that is used in this example
+-- ```
+
+local Node = {
+  Identifier = "LuaScale_Example",
+  Transform = {
+    Scale = {
+      Type = "LuaScale",
+      Script = asset.resource("example.lua")
+    }
+  },
+  Renderable = {
+    Type = "RenderableCartesianAxes"
+  },
+  GUI = {
+    Name = "Basic",
+    Path = "/Examples/LuaScale"
+  }
+}
+
+asset.onInitialize(function()
+  openspace.addSceneGraphNode(Node)
+end)
+
+asset.onDeinitialize(function()
+  openspace.removeSceneGraphNode(Node)
+end)
diff --git a/modules/base/scale/luascale.cpp b/modules/base/scale/luascale.cpp
index 23af817fd1..f5ee885472 100644
--- a/modules/base/scale/luascale.cpp
+++ b/modules/base/scale/luascale.cpp
@@ -41,14 +41,16 @@ namespace {
         "This value is the path to the Lua script that will be executed to compute the "
         "scaling factor for this transformation. The script needs to define a function "
         "'scale' that takes the current simulation time in seconds past the J2000 epoch "
-        "as the first argument, the current wall time as milliseconds past the J2000 "
-        "epoch the second argument and computes the three scaling factors.",
+        "as the first argument, the simulation time in seconds past the J2000 epoch of "
+        "the last frame as the second argument, and the current wall time as "
+        "milliseconds past the J2000 epoch the third argument and computes the three "
+        "scaling factors returned as a table.",
         openspace::properties::Property::Visibility::AdvancedUser
     };
 
     struct [[codegen::Dictionary(LuaScale)]] Parameters {
         // [[codegen::verbatim(ScriptInfo.description)]]
-        std::string script;
+        std::filesystem::path script;
     };
 #include "luascale_codegen.cpp"
 } // namespace
@@ -59,22 +61,23 @@ documentation::Documentation LuaScale::Documentation() {
     return codegen::doc<Parameters>("base_scale_lua");
 }
 
-LuaScale::LuaScale()
+LuaScale::LuaScale(const ghoul::Dictionary& dictionary)
     : _luaScriptFile(ScriptInfo)
-    , _state(ghoul::lua::LuaState::IncludeStandardLibrary::No)
+    , _state(
+        ghoul::lua::LuaState::IncludeStandardLibrary::Yes,
+        ghoul::lua::LuaState::StrictState::No
+    )
 {
-    addProperty(_luaScriptFile);
+    const Parameters p = codegen::bake<Parameters>(dictionary);
 
     _luaScriptFile.onChange([this]() {
         requireUpdate();
         _fileHandle = std::make_unique<ghoul::filesystem::File>(_luaScriptFile.value());
         _fileHandle->setCallback([this]() { requireUpdate(); });
     });
-}
+    addProperty(_luaScriptFile);
 
-LuaScale::LuaScale(const ghoul::Dictionary& dictionary) : LuaScale() {
-    const Parameters p = codegen::bake<Parameters>(dictionary);
-    _luaScriptFile = absPath(p.script).string();
+    _luaScriptFile = p.script.string();
 }
 
 glm::dvec3 LuaScale::scaleValue(const UpdateData& data) const {
@@ -99,13 +102,13 @@ glm::dvec3 LuaScale::scaleValue(const UpdateData& data) const {
     // Second argument is the number of seconds past the J2000 epoch of last frame
     ghoul::lua::push(_state, data.previousFrameTime.j2000Seconds());
 
-    // Second argument is the number of milliseconds past the J2000 epoch in wallclock
+    // Third argument is the number of milliseconds past the J2000 epoch in wallclock
     using namespace std::chrono;
     const auto now = std::chrono::high_resolution_clock::now();
     ghoul::lua::push(_state, duration_cast<milliseconds>(now.time_since_epoch()).count());
 
     // Execute the scaling function
-    const int success = lua_pcall(_state, 2, 1, 0);
+    const int success = lua_pcall(_state, 3, 1, 0);
     if (success != 0) {
         LERRORC(
             "LuaScale",
@@ -113,11 +116,8 @@ glm::dvec3 LuaScale::scaleValue(const UpdateData& data) const {
         );
     }
 
-    const double x = luaL_checknumber(_state, -1);
-    const double y = luaL_checknumber(_state, -2);
-    const double z = luaL_checknumber(_state, -3);
-    lua_settop(_state, 0);
-    return glm::dvec3(x, y, z);
+    const glm::dvec3 scale = ghoul::lua::value<glm::dvec3>(_state);
+    return scale;
 }
 
 } // namespace openspace
diff --git a/modules/base/scale/luascale.h b/modules/base/scale/luascale.h
index 5538bd73ca..9440ecaebd 100644
--- a/modules/base/scale/luascale.h
+++ b/modules/base/scale/luascale.h
@@ -38,8 +38,7 @@ namespace documentation { struct Documentation; }
 
 class LuaScale : public Scale {
 public:
-    LuaScale();
-    LuaScale(const ghoul::Dictionary& dictionary);
+    explicit LuaScale(const ghoul::Dictionary& dictionary);
 
     glm::dvec3 scaleValue(const UpdateData& data) const override;
 

From be5aeda19586f1461171a7a14db654e6fbe59d98 Mon Sep 17 00:00:00 2001
From: Alexander Bock <mail@alexanderbock.eu>
Date: Sat, 1 Jun 2024 16:57:01 +0200
Subject: [PATCH 465/701] Write out ascii-based session recording files in
 scientific notation instead. Also store position and rotation in higher
 precision (closes #3050)

---
 include/openspace/network/messagestructures.h | 17 +++++++----------
 src/navigation/keyframenavigator.cpp          |  2 +-
 2 files changed, 8 insertions(+), 11 deletions(-)

diff --git a/include/openspace/network/messagestructures.h b/include/openspace/network/messagestructures.h
index 2c342b6378..8fb79932bd 100644
--- a/include/openspace/network/messagestructures.h
+++ b/include/openspace/network/messagestructures.h
@@ -189,17 +189,14 @@ struct CameraKeyframe {
 
     void write(std::stringstream& out) const {
         // Add camera position
-        out << std::fixed << std::setprecision(7) << _position.x << ' '
-            << std::fixed << std::setprecision(7) << _position.y << ' '
-            << std::fixed << std::setprecision(7) << _position.z << ' ';
+        out << std::setprecision(std::numeric_limits<double>::max_digits10);
+        out << _position.x << ' ' << _position.y << ' ' << _position.z << ' ';
         // Add camera rotation
-        out << std::fixed << std::setprecision(7) << _rotation.x << ' '
-            << std::fixed << std::setprecision(7) << _rotation.y << ' '
-            << std::fixed << std::setprecision(7) << _rotation.z << ' '
-            << std::fixed << std::setprecision(7) << _rotation.w << ' ';
-        out << std::fixed
-            << std::setprecision(std::numeric_limits<double>::max_digits10)
-            << _scale << ' ';
+        out << _rotation.x << ' '
+            << _rotation.y << ' '
+            << _rotation.z << ' '
+            << _rotation.w << ' ';
+        out << std::scientific << _scale << ' ';
         if (_followNodeRotation) {
             out << "F ";
         }
diff --git a/src/navigation/keyframenavigator.cpp b/src/navigation/keyframenavigator.cpp
index 0c133d46c2..1e62597f17 100644
--- a/src/navigation/keyframenavigator.cpp
+++ b/src/navigation/keyframenavigator.cpp
@@ -155,7 +155,7 @@ bool KeyframeNavigator::updateCamera(Camera* camera, const CameraPose& prevPose,
         const float nextInvScaleExp = glm::log(1.f / nextPose.scale);
         const float interpolatedInvScaleExp = static_cast<float>(
             prevInvScaleExp * (1.0 - t) + nextInvScaleExp * t
-            );
+        );
         camera->setScaling(1.f / glm::exp(interpolatedInvScaleExp));
     }
 

From c172f5fd8f29c5527e08e038fc0db0a2a2052f8f Mon Sep 17 00:00:00 2001
From: Alexander Bock <mail@alexanderbock.eu>
Date: Sat, 1 Jun 2024 17:43:42 +0200
Subject: [PATCH 466/701] Make the missing SessionRecording property visible as
 AdvancedProperty

---
 src/interaction/sessionrecording.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/interaction/sessionrecording.cpp b/src/interaction/sessionrecording.cpp
index 4e355b548c..2237ade442 100644
--- a/src/interaction/sessionrecording.cpp
+++ b/src/interaction/sessionrecording.cpp
@@ -81,7 +81,7 @@ namespace {
         "Ignore Recorded Scale",
         "If this value is enabled, the scale value from a recording is ignored and the "
         "computed values are used instead.",
-        openspace::properties::Property::Visibility::Hidden
+        openspace::properties::Property::Visibility::AdvancedUser
     };
 
     constexpr openspace::properties::Property::PropertyInfo AddModelMatrixinAsciiInfo = {

From bbce6500cadf2af3219f77f74c66f799c1139db1 Mon Sep 17 00:00:00 2001
From: Alexander Bock <mail@alexanderbock.eu>
Date: Sat, 1 Jun 2024 18:11:24 +0200
Subject: [PATCH 467/701] Update Star position in bookmarks file (closes #3258)

---
 data/assets/global/openspacebookmarks.asset | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/data/assets/global/openspacebookmarks.asset b/data/assets/global/openspacebookmarks.asset
index 8c95d8af1b..d266a22610 100644
--- a/data/assets/global/openspacebookmarks.asset
+++ b/data/assets/global/openspacebookmarks.asset
@@ -1,6 +1,6 @@
 local bookmarkHelper = asset.require("util/generate_bookmarks")
 
-local dataProvider = "http://data.openspaceproject.com/files/bookmarks/v1/bookmarks.csv"
+local dataProvider = "http://data.openspaceproject.com/files/bookmarks/v2/bookmarks.csv"
 
 local bookmarksCSV = asset.resource({
   Identifier = "openspace_bookmarks",

From 2ab09b50e59e9cf99551415e77b4604c013b0d7c Mon Sep 17 00:00:00 2001
From: Alexander Bock <alexander.bock@liu.se>
Date: Mon, 3 Jun 2024 09:57:15 +0200
Subject: [PATCH 468/701] Add example for the LuaRotation class and fix it at
 the same time (#3285)

* Add example for LuaRotation class and make it work again
---
 .../examples/rotation/luarotation/example.lua | 16 +++++++++
 .../examples/rotation/luarotation/lua.asset   | 34 ++++++++++++++++++
 modules/base/rotation/luarotation.cpp         | 36 +++++++++----------
 modules/base/rotation/luarotation.h           |  3 +-
 4 files changed, 68 insertions(+), 21 deletions(-)
 create mode 100644 data/assets/examples/rotation/luarotation/example.lua
 create mode 100644 data/assets/examples/rotation/luarotation/lua.asset

diff --git a/data/assets/examples/rotation/luarotation/example.lua b/data/assets/examples/rotation/luarotation/example.lua
new file mode 100644
index 0000000000..d795b9514a
--- /dev/null
+++ b/data/assets/examples/rotation/luarotation/example.lua
@@ -0,0 +1,16 @@
+-- The `rotation` function takes exactly three arguments and returns the 9 values that
+-- make up the final rotation matrix as a table.
+-- The three parameters are all provided as the number of seconds past the J2000 epoch
+-- (2000-01-01 12:00:00), which can be both fractional numbers as well as negative numbers
+-- for dates earlier than the epoch.
+--  1. `simulationTime` is the value of the in-game clock for the current frame
+--  2. `prevSimulationTime` is the value of the in-game clock for the previous frame
+--  3. `wallTime` is the value of the computer clock as seconds past the epoch
+function rotation(simulationTime, prevSimulationTime, wallTime)
+  -- Create a rotation around the x axis
+  return {
+    1,                        0,                         0,
+    0, math.cos(simulationTime), -math.sin(simulationTime),
+    0, math.sin(simulationTime),  math.cos(simulationTime)
+  }
+end
diff --git a/data/assets/examples/rotation/luarotation/lua.asset b/data/assets/examples/rotation/luarotation/lua.asset
new file mode 100644
index 0000000000..88a3b7ee22
--- /dev/null
+++ b/data/assets/examples/rotation/luarotation/lua.asset
@@ -0,0 +1,34 @@
+-- Basic
+-- This asset creates a SceneGraphNode that only displays coordinate axes. The rotation of
+-- coordinate axes are determined by executing a Lua file that returns the rotation matrix
+-- to be used.
+--
+-- ```{literalinclude} example.lua
+-- :language: lua
+-- :caption: The script file that is used in this example
+-- ```
+
+local Node = {
+  Identifier = "LuaRotation_Example",
+  Transform = {
+    Rotation = {
+      Type = "LuaRotation",
+      Script = asset.resource("example.lua")
+    }
+  },
+  Renderable = {
+    Type = "RenderableCartesianAxes"
+  },
+  GUI = {
+    Name = "Basic",
+    Path = "/Examples/LuaRotation"
+  }
+}
+
+asset.onInitialize(function()
+  openspace.addSceneGraphNode(Node)
+end)
+
+asset.onDeinitialize(function()
+  openspace.removeSceneGraphNode(Node)
+end)
diff --git a/modules/base/rotation/luarotation.cpp b/modules/base/rotation/luarotation.cpp
index 7608fb7664..f432c3cb24 100644
--- a/modules/base/rotation/luarotation.cpp
+++ b/modules/base/rotation/luarotation.cpp
@@ -41,15 +41,17 @@ namespace {
         "This value is the path to the Lua script that will be executed to compute the "
         "rotation for this transformation. The script needs to define a function "
         "'rotation' that takes the current simulation time in seconds past the J2000 "
-        "epoch as the first argument, the current wall time as milliseconds past the "
-        "J2000 epoch as the second argument and computes the rotation returned as 9 "
-        "values.",
+        "epoch as the first argument, the simulation time in seconds past the J2000 "
+        "epoch of the last frame as the second argument, and the current wall time as "
+        "milliseconds past the J2000 epoch as the third argument. It computes the rotation "
+        "value factors returned as a table containing the 9 values that make up the "
+        "resulting rotation matrix.",
         openspace::properties::Property::Visibility::AdvancedUser
     };
 
     struct [[codegen::Dictionary(LuaRotation)]] Parameters {
         // [[codegen::verbatim(ScriptInfo.description)]]
-        std::string script;
+        std::filesystem::path script;
     };
 #include "luarotation_codegen.cpp"
 } // namespace
@@ -60,23 +62,24 @@ documentation::Documentation LuaRotation::Documentation() {
     return codegen::doc<Parameters>("base_transform_rotation_lua");
 }
 
-LuaRotation::LuaRotation()
+LuaRotation::LuaRotation(const ghoul::Dictionary& dictionary)
     : _luaScriptFile(ScriptInfo)
-    , _state(ghoul::lua::LuaState::IncludeStandardLibrary::No)
+    , _state(
+        ghoul::lua::LuaState::IncludeStandardLibrary::Yes,
+        ghoul::lua::LuaState::StrictState::No
+    )
 {
-    addProperty(_luaScriptFile);
+    const Parameters p = codegen::bake<Parameters>(dictionary);
 
     _luaScriptFile.onChange([this]() {
         requireUpdate();
         _fileHandle = std::make_unique<ghoul::filesystem::File>(_luaScriptFile.value());
         _fileHandle->setCallback([this]() { requireUpdate(); });
     });
-}
 
-LuaRotation::LuaRotation(const ghoul::Dictionary& dictionary) : LuaRotation() {
-    const Parameters p = codegen::bake<Parameters>(dictionary);
+    addProperty(_luaScriptFile);
 
-    _luaScriptFile = absPath(p.script).string();
+    _luaScriptFile = p.script.string();
 }
 
 glm::dmat3 LuaRotation::matrix(const UpdateData& data) const {
@@ -107,20 +110,15 @@ glm::dmat3 LuaRotation::matrix(const UpdateData& data) const {
     ghoul::lua::push(_state, duration_cast<milliseconds>(now.time_since_epoch()).count());
 
     // Execute the scaling function
-    const int success = lua_pcall(_state, 2, 9, 0);
+    const int success = lua_pcall(_state, 3, 1, 0);
     if (success != 0) {
         LERRORC(
             "LuaRotation",
             std::format("Error executing 'rotation': {}", lua_tostring(_state, -1))
         );
     }
-
-    std::array<double, 9> values;
-    for (int i = 0; i < 9; i++) {
-        values[i] = luaL_checknumber(_state, -1 - i);
-    }
-
-    return glm::make_mat3(values.data());
+    const glm::dmat3 rotation = ghoul::lua::value<glm::dmat3>(_state);
+    return rotation;
 }
 
 } // namespace openspace
diff --git a/modules/base/rotation/luarotation.h b/modules/base/rotation/luarotation.h
index da0e5ab17a..b9c127edf1 100644
--- a/modules/base/rotation/luarotation.h
+++ b/modules/base/rotation/luarotation.h
@@ -39,8 +39,7 @@ namespace documentation { struct Documentation; }
 
 class LuaRotation : public Rotation {
 public:
-    LuaRotation();
-    LuaRotation(const ghoul::Dictionary& dictionary);
+    explicit LuaRotation(const ghoul::Dictionary& dictionary);
 
     glm::dmat3 matrix(const UpdateData& data) const override;
 

From 62a01ea317978b9d99bad1003a7eb67c6a87ae27 Mon Sep 17 00:00:00 2001
From: Alexander Bock <alexander.bock@liu.se>
Date: Mon, 3 Jun 2024 09:57:26 +0200
Subject: [PATCH 469/701] Add example and fixes for the LuaTranslation (#3284)

---
 .../translation/luatranslation/example.lua    | 12 +++++
 .../translation/luatranslation/lua.asset      | 46 +++++++++++++++++++
 modules/base/translation/luatranslation.cpp   | 38 +++++++--------
 modules/base/translation/luatranslation.h     |  3 +-
 4 files changed, 78 insertions(+), 21 deletions(-)
 create mode 100644 data/assets/examples/translation/luatranslation/example.lua
 create mode 100644 data/assets/examples/translation/luatranslation/lua.asset

diff --git a/data/assets/examples/translation/luatranslation/example.lua b/data/assets/examples/translation/luatranslation/example.lua
new file mode 100644
index 0000000000..b4c69ae45b
--- /dev/null
+++ b/data/assets/examples/translation/luatranslation/example.lua
@@ -0,0 +1,12 @@
+-- The `translation` function takes exactly three arguments and returns the three
+-- translation values (one for each axis) as a single table.
+-- The three parameters are all provided as the number of seconds past the J2000 epoch
+-- (2000-01-01 12:00:00), which can be both fractional numbers as well as negative numbers
+-- for dates earlier than the epoch.
+--  1. `simulationTime` is the value of the in-game clock for the current frame
+--  2. `prevSimulationTime` is the value of the in-game clock for the previous frame
+--  3. `wallTime` is the value of the computer clock as seconds past the epoch
+function translation(simulationTime, prevSimulationTime, wallTime)
+  -- Make the object rotate around the z axis in a circular pattern
+  return { math.sin(simulationTime), math.cos(simulationTime), 0 }
+end
diff --git a/data/assets/examples/translation/luatranslation/lua.asset b/data/assets/examples/translation/luatranslation/lua.asset
new file mode 100644
index 0000000000..a35a7bace7
--- /dev/null
+++ b/data/assets/examples/translation/luatranslation/lua.asset
@@ -0,0 +1,46 @@
+-- Basic
+-- This asset creates a SceneGraphNode that only displays coordinate axes. The coordinate
+-- axes are translated by a value determined by executing a Lua file that returns the
+-- translation parameters to be used as a table. In order to see the translation, we need
+-- to also have a node that does not move so that we can see the relative movement.
+--
+-- ```{literalinclude} example.lua
+-- :language: lua
+-- :caption: The script file that is used in this example
+-- ```
+
+local NodeFocus = {
+  Identifier = "LuaTranslation_Example_Focus",
+  GUI = {
+    Name = "Basic (Focus)",
+    Path = "/Examples/LuaTranslation"
+  }
+}
+
+local Node = {
+  Identifier = "LuaTranslation_Example",
+  Parent = NodeFocus.Identifier,
+  Transform = {
+    Translation = {
+      Type = "LuaTranslation",
+      Script = asset.resource("example.lua")
+    }
+  },
+  Renderable = {
+    Type = "RenderableCartesianAxes"
+  },
+  GUI = {
+    Name = "Basic",
+    Path = "/Examples/LuaTranslation"
+  }
+}
+
+asset.onInitialize(function()
+  openspace.addSceneGraphNode(NodeFocus)
+  openspace.addSceneGraphNode(Node)
+end)
+
+asset.onDeinitialize(function()
+  openspace.removeSceneGraphNode(Node)
+  openspace.removeSceneGraphNode(NodeFocus)
+end)
diff --git a/modules/base/translation/luatranslation.cpp b/modules/base/translation/luatranslation.cpp
index b5643108d2..cd74c7c103 100644
--- a/modules/base/translation/luatranslation.cpp
+++ b/modules/base/translation/luatranslation.cpp
@@ -42,14 +42,16 @@ namespace {
         "This value is the path to the Lua script that will be executed to compute the "
         "translation for this transformation. The script needs to define a function "
         "'translation' that takes the current simulation time in seconds past the J2000 "
-        "epoch as the first argument, the current wall time as milliseconds past the "
-        "J2000 epoch as the second argument and computes the translation.",
+        "epoch as the first argument, the simulation time in seconds past the J2000 "
+        "epoch of the last frame as the second argument, and the current wall time as "
+        "milliseconds past the J2000 epoch the third argument and computes the three "
+        "translation values returned as a table.",
         openspace::properties::Property::Visibility::AdvancedUser
     };
 
     struct [[codegen::Dictionary(LuaTranslation)]] Parameters {
         // [[codegen::verbatim(ScriptInfo.description)]]
-        std::string script;
+        std::filesystem::path script;
     };
 #include "luatranslation_codegen.cpp"
 } // namespace
@@ -60,25 +62,26 @@ documentation::Documentation LuaTranslation::Documentation() {
     return codegen::doc<Parameters>("base_transform_translation_lua");
 }
 
-LuaTranslation::LuaTranslation()
+LuaTranslation::LuaTranslation(const ghoul::Dictionary& dictionary)
     : _luaScriptFile(ScriptInfo)
-    , _state(ghoul::lua::LuaState::IncludeStandardLibrary::No)
+    , _state(
+        ghoul::lua::LuaState::IncludeStandardLibrary::Yes,
+        ghoul::lua::LuaState::StrictState::No
+    )
 {
-    addProperty(_luaScriptFile);
+    const Parameters p = codegen::bake<Parameters>(dictionary);
 
     _luaScriptFile.onChange([this]() {
         requireUpdate();
         _fileHandle = std::make_unique<ghoul::filesystem::File>(_luaScriptFile.value());
         _fileHandle->setCallback([this]() {
-             requireUpdate();
-             notifyObservers();
-         });
+            requireUpdate();
+            notifyObservers();
+        });
     });
-}
+    addProperty(_luaScriptFile);
 
-LuaTranslation::LuaTranslation(const ghoul::Dictionary& dictionary) : LuaTranslation() {
-    const Parameters p = codegen::bake<Parameters>(dictionary);
-    _luaScriptFile = absPath(p.script).string();
+    _luaScriptFile = p.script.string();
 }
 
 glm::dvec3 LuaTranslation::position(const UpdateData& data) const {
@@ -110,7 +113,7 @@ glm::dvec3 LuaTranslation::position(const UpdateData& data) const {
     ghoul::lua::push(_state, duration_cast<milliseconds>(now.time_since_epoch()).count());
 
     // Execute the scaling function
-    const int success = lua_pcall(_state, 2, 3, 0);
+    const int success = lua_pcall(_state, 3, 1, 0);
     if (success != 0) {
         LERRORC(
             "LuaTranslation",
@@ -118,11 +121,8 @@ glm::dvec3 LuaTranslation::position(const UpdateData& data) const {
         );
     }
 
-    glm::vec3 values;
-    for (int i = 1; i <= 3; i++) {
-        values[i - 1] = ghoul::lua::value<double>(_state, i);
-    }
-    return values;
+    const glm::dvec3 translation = ghoul::lua::value<glm::dvec3>(_state);
+    return translation;
 }
 
 } // namespace openspace
diff --git a/modules/base/translation/luatranslation.h b/modules/base/translation/luatranslation.h
index 4a85691866..e80dec7501 100644
--- a/modules/base/translation/luatranslation.h
+++ b/modules/base/translation/luatranslation.h
@@ -39,8 +39,7 @@ namespace documentation { struct Documentation; }
 
 class LuaTranslation : public Translation {
 public:
-    LuaTranslation();
-    LuaTranslation(const ghoul::Dictionary& dictionary);
+    explicit LuaTranslation(const ghoul::Dictionary& dictionary);
 
     glm::dvec3 position(const UpdateData& data) const override;
 

From b6621f3ed8c16c034858e3ad3462c52344b43f79 Mon Sep 17 00:00:00 2001
From: Andreas Engberg <48772850+engbergandreas@users.noreply.github.com>
Date: Mon, 3 Jun 2024 11:49:46 +0200
Subject: [PATCH 470/701] Adds a join server lua function for parallelpeer
 (#3292)

* Adds a join server lua function for parallellpeer
---
 src/network/parallelpeer.cpp     |  3 ++-
 src/network/parallelpeer_lua.inl | 17 ++++++++++++++++-
 2 files changed, 18 insertions(+), 2 deletions(-)

diff --git a/src/network/parallelpeer.cpp b/src/network/parallelpeer.cpp
index bf7d1b6b93..6fbda61212 100644
--- a/src/network/parallelpeer.cpp
+++ b/src/network/parallelpeer.cpp
@@ -788,7 +788,8 @@ scripting::LuaLibrary ParallelPeer::luaLibrary() {
             codegen::lua::Connect,
             codegen::lua::Disconnect,
             codegen::lua::RequestHostship,
-            codegen::lua::ResignHostship
+            codegen::lua::ResignHostship,
+            codegen::lua::JoinServer
         }
     };
 }
diff --git a/src/network/parallelpeer_lua.inl b/src/network/parallelpeer_lua.inl
index 103758ecd7..00be96d35a 100644
--- a/src/network/parallelpeer_lua.inl
+++ b/src/network/parallelpeer_lua.inl
@@ -24,6 +24,21 @@
 
 namespace {
 
+[[codegen::luawrap]] void joinServer(std::string port, std::string address,
+                                     std::string password, std::string hostpassword = "",
+                                     std::string name = "Anonymous") {
+    using namespace openspace;
+    if (global::windowDelegate->isMaster()) {
+        ParallelPeer* peer = global::parallelPeer;
+        peer->setPort(std::move(port));
+        peer->setAddress(std::move(address));
+        peer->setPassword(std::move(password));
+        peer->setHostPassword(std::move(hostpassword));
+        peer->setName(std::move(name));
+        peer->connect();
+    }
+}
+
 // Connect to parallel.
 [[codegen::luawrap]] void connect() {
     using namespace openspace;
@@ -36,7 +51,7 @@ namespace {
 [[codegen::luawrap]] void disconnect() {
     using namespace openspace;
     if (global::windowDelegate->isMaster()) {
-        global::parallelPeer->connect();
+        global::parallelPeer->disconnect();
     }
 }
 

From b1eb9e3731d4a879ca027780e4b75db60bdd1cf7 Mon Sep 17 00:00:00 2001
From: Alexander Bock <mail@alexanderbock.eu>
Date: Mon, 3 Jun 2024 14:16:13 +0200
Subject: [PATCH 471/701] Force recompilation of the RenderableGlobe shader
 when moving layers (closes #3295)

---
 modules/globebrowsing/src/layergroup.cpp      | 12 ++++++++++++
 modules/globebrowsing/src/renderableglobe.cpp |  4 ++++
 modules/globebrowsing/src/renderableglobe.h   |  3 +++
 3 files changed, 19 insertions(+)

diff --git a/modules/globebrowsing/src/layergroup.cpp b/modules/globebrowsing/src/layergroup.cpp
index 3dee97cbfe..5af6d4d91c 100644
--- a/modules/globebrowsing/src/layergroup.cpp
+++ b/modules/globebrowsing/src/layergroup.cpp
@@ -25,6 +25,8 @@
 #include <modules/globebrowsing/src/layergroup.h>
 
 #include <modules/globebrowsing/src/layer.h>
+#include <modules/globebrowsing/src/layermanager.h>
+#include <modules/globebrowsing/src/renderableglobe.h>
 #include <openspace/documentation/documentation.h>
 #include <openspace/engine/globals.h>
 #include <openspace/events/event.h>
@@ -216,6 +218,16 @@ void LayerGroup::moveLayer(int oldPosition, int newPosition) {
     _subOwners.erase(oldPosOwner);
     auto newPosOwner = _subOwners.begin() + newPosition;
     _subOwners.insert(newPosOwner, owner);
+
+    // If we change the order of the layers, we need to inform the RenderableGlobe's
+    // shader as it might no longer be valid. This can happen if we change the order of
+    // two layers with different types and the uniforms between the two types are not
+    // compatible
+    LayerManager* manager = dynamic_cast<LayerManager*>(_owner);
+    ghoul_assert(manager, "Hierarchy error: Layer. Owner is not LayerManager");
+    RenderableGlobe* renderable = dynamic_cast<RenderableGlobe*>(manager->owner());
+    ghoul_assert(manager, "Hierarchy error: LayerManager. Owner is not RenderableGlobe");
+    renderable->invalidateShader();
 }
 
 std::vector<Layer*> LayerGroup::layers() const {
diff --git a/modules/globebrowsing/src/renderableglobe.cpp b/modules/globebrowsing/src/renderableglobe.cpp
index abbb85f09a..8893773738 100644
--- a/modules/globebrowsing/src/renderableglobe.cpp
+++ b/modules/globebrowsing/src/renderableglobe.cpp
@@ -1028,6 +1028,10 @@ const glm::dmat4& RenderableGlobe::modelTransform() const {
     return _cachedModelTransform;
 }
 
+void RenderableGlobe::invalidateShader() {
+    _shadersNeedRecompilation = true;
+}
+
 //////////////////////////////////////////////////////////////////////////////////////////
 //  Rendering code
 //////////////////////////////////////////////////////////////////////////////////////////
diff --git a/modules/globebrowsing/src/renderableglobe.h b/modules/globebrowsing/src/renderableglobe.h
index 3b5046e97d..e1f69b6045 100644
--- a/modules/globebrowsing/src/renderableglobe.h
+++ b/modules/globebrowsing/src/renderableglobe.h
@@ -122,6 +122,9 @@ public:
 
     const glm::dmat4& modelTransform() const;
 
+    // Will cause the shaders to be recompiled
+    void invalidateShader();
+
     static documentation::Documentation Documentation();
 
 private:

From 1ed5243929f859f4a54bd132f2e664ff3d362633 Mon Sep 17 00:00:00 2001
From: Emma Broman <emma.broman@liu.se>
Date: Mon, 3 Jun 2024 15:56:06 +0200
Subject: [PATCH 472/701] Fix jumpTo fade issue when duration is zero

Resulting in a black screen, i.e. the fading in did not happen...
---
 src/navigation/navigationhandler.cpp | 29 +++++++++++++++++-----------
 1 file changed, 18 insertions(+), 11 deletions(-)

diff --git a/src/navigation/navigationhandler.cpp b/src/navigation/navigationhandler.cpp
index bb7f994528..307199c3c3 100644
--- a/src/navigation/navigationhandler.cpp
+++ b/src/navigation/navigationhandler.cpp
@@ -199,17 +199,24 @@ void NavigationHandler::triggerFadeToTransition(const std::string& transitionScr
 {
     const float duration = fadeDuration.value_or(_jumpToFadeDuration);
 
-    const std::string onArrivalScript = std::format(
-        "{} "
-        "openspace.setPropertyValueSingle("
-        "'RenderEngine.BlackoutFactor', 1, {}, 'QuadraticEaseIn'"
-        ")", transitionScript, duration
-    );
-    const std::string script = std::format(
-        "openspace.setPropertyValueSingle("
-        "'RenderEngine.BlackoutFactor', 0, {}, 'QuadraticEaseOut', [[{}]]"
-        ")", duration, onArrivalScript
-    );
+    std::string script;
+    if (duration < std::numeric_limits<float>::epsilon()) {
+        script = transitionScript;
+    }
+    else {
+        const std::string onArrivalScript = std::format(
+            "{} "
+            "openspace.setPropertyValueSingle("
+            "'RenderEngine.BlackoutFactor', 1, {}, 'QuadraticEaseIn'"
+            ")", transitionScript, duration
+        );
+        script = std::format(
+            "openspace.setPropertyValueSingle("
+            "'RenderEngine.BlackoutFactor', 0, {}, 'QuadraticEaseOut', [[{}]]"
+            ")", duration, onArrivalScript
+        );
+    }
+
     // No syncing, as this was called from a script that should have been synced already
     global::scriptEngine->queueScript(
         std::move(script),

From 2f280ed582b1958824289110c3c585907d8f8d6c Mon Sep 17 00:00:00 2001
From: Gene Payne <payne.gene@gmail.com>
Date: Mon, 3 Jun 2024 09:29:06 -0600
Subject: [PATCH 473/701] Update sssb data (#3291)

---
 data/assets/scene/solarsystem/sssb/amor_asteroid.asset          | 2 +-
 data/assets/scene/solarsystem/sssb/apollo_asteroid.asset        | 2 +-
 data/assets/scene/solarsystem/sssb/aten_asteroid.asset          | 2 +-
 data/assets/scene/solarsystem/sssb/atira_asteroid.asset         | 2 +-
 data/assets/scene/solarsystem/sssb/centaur_asteroid.asset       | 2 +-
 data/assets/scene/solarsystem/sssb/chiron-type_comet.asset      | 2 +-
 data/assets/scene/solarsystem/sssb/encke-type_comet.asset       | 2 +-
 data/assets/scene/solarsystem/sssb/halley-type_comet.asset      | 2 +-
 .../scene/solarsystem/sssb/inner_main_belt_asteroid.asset       | 2 +-
 data/assets/scene/solarsystem/sssb/jupiter-family_comet.asset   | 2 +-
 .../assets/scene/solarsystem/sssb/jupiter_trojan_asteroid.asset | 2 +-
 data/assets/scene/solarsystem/sssb/main_belt_asteroid.asset     | 2 +-
 data/assets/scene/solarsystem/sssb/mars-crossing_asteroid.asset | 2 +-
 .../scene/solarsystem/sssb/outer_main_belt_asteroid.asset       | 2 +-
 data/assets/scene/solarsystem/sssb/pha.asset                    | 2 +-
 .../scene/solarsystem/sssb/transneptunian_object_asteroid.asset | 2 +-
 16 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/data/assets/scene/solarsystem/sssb/amor_asteroid.asset b/data/assets/scene/solarsystem/sssb/amor_asteroid.asset
index cd27425391..e98d5e3902 100644
--- a/data/assets/scene/solarsystem/sssb/amor_asteroid.asset
+++ b/data/assets/scene/solarsystem/sssb/amor_asteroid.asset
@@ -6,7 +6,7 @@ local sssb = asset.resource({
   Name = "Small SolarSystem Body Data (Amor Asteroid)",
   Type = "HttpSynchronization",
   Identifier = "sssb_data_amor_asteroid",
-  Version = 3
+  Version = 4
 })
 
 
diff --git a/data/assets/scene/solarsystem/sssb/apollo_asteroid.asset b/data/assets/scene/solarsystem/sssb/apollo_asteroid.asset
index fb03b4f963..946bd93397 100644
--- a/data/assets/scene/solarsystem/sssb/apollo_asteroid.asset
+++ b/data/assets/scene/solarsystem/sssb/apollo_asteroid.asset
@@ -6,7 +6,7 @@ local sssb = asset.resource({
   Name = "Small SolarSystem Body Data (Apollo Asteroid)",
   Type = "HttpSynchronization",
   Identifier = "sssb_data_apollo_asteroid",
-  Version = 3
+  Version = 4
 })
 
 
diff --git a/data/assets/scene/solarsystem/sssb/aten_asteroid.asset b/data/assets/scene/solarsystem/sssb/aten_asteroid.asset
index 3191d331ff..9468d737eb 100644
--- a/data/assets/scene/solarsystem/sssb/aten_asteroid.asset
+++ b/data/assets/scene/solarsystem/sssb/aten_asteroid.asset
@@ -6,7 +6,7 @@ local sssb = asset.resource({
   Name = "Small SolarSystem Body Data (Aten Asteroid)",
   Type = "HttpSynchronization",
   Identifier = "sssb_data_aten_asteroid",
-  Version = 3
+  Version = 4
 })
 
 
diff --git a/data/assets/scene/solarsystem/sssb/atira_asteroid.asset b/data/assets/scene/solarsystem/sssb/atira_asteroid.asset
index a702c08910..1179920996 100644
--- a/data/assets/scene/solarsystem/sssb/atira_asteroid.asset
+++ b/data/assets/scene/solarsystem/sssb/atira_asteroid.asset
@@ -6,7 +6,7 @@ local sssb = asset.resource({
   Name = "Small SolarSystem Body Data (Atira Asteroid)",
   Type = "HttpSynchronization",
   Identifier = "sssb_data_atira_asteroid",
-  Version = 3
+  Version = 4
 })
 
 
diff --git a/data/assets/scene/solarsystem/sssb/centaur_asteroid.asset b/data/assets/scene/solarsystem/sssb/centaur_asteroid.asset
index 1facef98d8..f8f3760648 100644
--- a/data/assets/scene/solarsystem/sssb/centaur_asteroid.asset
+++ b/data/assets/scene/solarsystem/sssb/centaur_asteroid.asset
@@ -6,7 +6,7 @@ local sssb = asset.resource({
   Name = "Small SolarSystem Body Data (Centaur Asteroid)",
   Type = "HttpSynchronization",
   Identifier = "sssb_data_centaur_asteroid",
-  Version = 3
+  Version = 4
 })
 
 
diff --git a/data/assets/scene/solarsystem/sssb/chiron-type_comet.asset b/data/assets/scene/solarsystem/sssb/chiron-type_comet.asset
index 02139ccb64..ceaca98323 100644
--- a/data/assets/scene/solarsystem/sssb/chiron-type_comet.asset
+++ b/data/assets/scene/solarsystem/sssb/chiron-type_comet.asset
@@ -6,7 +6,7 @@ local sssb = asset.resource({
   Name = "Small SolarSystem Body Data (Chiron-type Comet)",
   Type = "HttpSynchronization",
   Identifier = "sssb_data_chiron-type_comet",
-  Version = 3
+  Version = 4
 })
 
 
diff --git a/data/assets/scene/solarsystem/sssb/encke-type_comet.asset b/data/assets/scene/solarsystem/sssb/encke-type_comet.asset
index 88e73e1a1f..999334f6e1 100644
--- a/data/assets/scene/solarsystem/sssb/encke-type_comet.asset
+++ b/data/assets/scene/solarsystem/sssb/encke-type_comet.asset
@@ -6,7 +6,7 @@ local sssb = asset.resource({
   Name = "Small SolarSystem Body Data (Encke-type Comet)",
   Type = "HttpSynchronization",
   Identifier = "sssb_data_encke-type_comet",
-  Version = 3
+  Version = 4
 })
 
 
diff --git a/data/assets/scene/solarsystem/sssb/halley-type_comet.asset b/data/assets/scene/solarsystem/sssb/halley-type_comet.asset
index df48071738..d97f55773c 100644
--- a/data/assets/scene/solarsystem/sssb/halley-type_comet.asset
+++ b/data/assets/scene/solarsystem/sssb/halley-type_comet.asset
@@ -6,7 +6,7 @@ local sssb = asset.resource({
   Name = "Small SolarSystem Body Data (Halley-type Comet)",
   Type = "HttpSynchronization",
   Identifier = "sssb_data_halley-type_comet",
-  Version = 3
+  Version = 4
 })
 
 
diff --git a/data/assets/scene/solarsystem/sssb/inner_main_belt_asteroid.asset b/data/assets/scene/solarsystem/sssb/inner_main_belt_asteroid.asset
index fd8bf9e42c..85f76d01ad 100644
--- a/data/assets/scene/solarsystem/sssb/inner_main_belt_asteroid.asset
+++ b/data/assets/scene/solarsystem/sssb/inner_main_belt_asteroid.asset
@@ -6,7 +6,7 @@ local sssb = asset.resource({
   Name = "Small SolarSystem Body Data (Inner Main Belt Asteroid)",
   Type = "HttpSynchronization",
   Identifier = "sssb_data_inner_main_belt_asteroid",
-  Version = 3
+  Version = 4
 })
 
 
diff --git a/data/assets/scene/solarsystem/sssb/jupiter-family_comet.asset b/data/assets/scene/solarsystem/sssb/jupiter-family_comet.asset
index 0eb20c6323..cfd55eff33 100644
--- a/data/assets/scene/solarsystem/sssb/jupiter-family_comet.asset
+++ b/data/assets/scene/solarsystem/sssb/jupiter-family_comet.asset
@@ -6,7 +6,7 @@ local sssb = asset.resource({
   Name = "Small SolarSystem Body Data (Jupiter Family Comet)",
   Type = "HttpSynchronization",
   Identifier = "sssb_data_jupiter-family_comet",
-  Version = 3
+  Version = 4
 })
 
 
diff --git a/data/assets/scene/solarsystem/sssb/jupiter_trojan_asteroid.asset b/data/assets/scene/solarsystem/sssb/jupiter_trojan_asteroid.asset
index 51e76d53b5..9501df4db0 100644
--- a/data/assets/scene/solarsystem/sssb/jupiter_trojan_asteroid.asset
+++ b/data/assets/scene/solarsystem/sssb/jupiter_trojan_asteroid.asset
@@ -6,7 +6,7 @@ local sssb = asset.resource({
   Name = "Small SolarSystem Body Data (Jupiter Trojan Asteroid)",
   Type = "HttpSynchronization",
   Identifier = "sssb_data_jupiter_trojan_asteroid",
-  Version = 3
+  Version = 4
 })
 
 
diff --git a/data/assets/scene/solarsystem/sssb/main_belt_asteroid.asset b/data/assets/scene/solarsystem/sssb/main_belt_asteroid.asset
index e04acf6d37..f689394fbd 100644
--- a/data/assets/scene/solarsystem/sssb/main_belt_asteroid.asset
+++ b/data/assets/scene/solarsystem/sssb/main_belt_asteroid.asset
@@ -6,7 +6,7 @@ local sssb = asset.resource({
   Name = "Small SolarSystem Body Data (Main Belt Asteroid)",
   Type = "HttpSynchronization",
   Identifier = "sssb_data_main_belt_asteroid",
-  Version = 3
+  Version = 4
 })
 
 
diff --git a/data/assets/scene/solarsystem/sssb/mars-crossing_asteroid.asset b/data/assets/scene/solarsystem/sssb/mars-crossing_asteroid.asset
index a0e0564612..316e369f5c 100644
--- a/data/assets/scene/solarsystem/sssb/mars-crossing_asteroid.asset
+++ b/data/assets/scene/solarsystem/sssb/mars-crossing_asteroid.asset
@@ -6,7 +6,7 @@ local sssb = asset.resource({
   Name = "Small SolarSystem Body Data (Mars-Crossing Asteroid)",
   Type = "HttpSynchronization",
   Identifier = "sssb_data_mars-crossing_asteroid",
-  Version = 3
+  Version = 4
 })
 
 
diff --git a/data/assets/scene/solarsystem/sssb/outer_main_belt_asteroid.asset b/data/assets/scene/solarsystem/sssb/outer_main_belt_asteroid.asset
index 2ceab60fdf..237ce90ff5 100644
--- a/data/assets/scene/solarsystem/sssb/outer_main_belt_asteroid.asset
+++ b/data/assets/scene/solarsystem/sssb/outer_main_belt_asteroid.asset
@@ -6,7 +6,7 @@ local sssb = asset.resource({
   Name = "Small SolarSystem Body Data (Outer Main Belt Asteroid)",
   Type = "HttpSynchronization",
   Identifier = "sssb_data_outer_main_belt_asteroid",
-  Version = 3
+  Version = 4
 })
 
 
diff --git a/data/assets/scene/solarsystem/sssb/pha.asset b/data/assets/scene/solarsystem/sssb/pha.asset
index 7ae7d800f5..c828abba62 100644
--- a/data/assets/scene/solarsystem/sssb/pha.asset
+++ b/data/assets/scene/solarsystem/sssb/pha.asset
@@ -6,7 +6,7 @@ local sssb = asset.resource({
   Name = "Small SolarSystem Body Data (Potentially hazardous Asteroids)",
   Type = "HttpSynchronization",
   Identifier = "sssb_data_pha",
-  Version = 3
+  Version = 4
 })
 
 
diff --git a/data/assets/scene/solarsystem/sssb/transneptunian_object_asteroid.asset b/data/assets/scene/solarsystem/sssb/transneptunian_object_asteroid.asset
index cb1e5f7a4c..3666cdcf35 100644
--- a/data/assets/scene/solarsystem/sssb/transneptunian_object_asteroid.asset
+++ b/data/assets/scene/solarsystem/sssb/transneptunian_object_asteroid.asset
@@ -6,7 +6,7 @@ local sssb = asset.resource({
   Name = "Small SolarSystem Body Data (Trans-Neptunian Object Asteroid)",
   Type = "HttpSynchronization",
   Identifier = "sssb_data_transneptunian_object_asteroid",
-  Version = 3
+  Version = 4
 })
 
 

From 37dfaae45d35b48509b03dfec437a34641bd048e Mon Sep 17 00:00:00 2001
From: Micah Acinapura <micahnyc@gmail.com>
Date: Mon, 3 Jun 2024 13:56:54 -0400
Subject: [PATCH 474/701] Added extra file extensions for spice kernels (#3259)

* added extra file extensions for spice kernels

* added spacing

* Update src/util/spicemanager.cpp

Co-authored-by: Alexander Bock <alexander.bock@liu.se>

* Update src/util/spicemanager.cpp

Co-authored-by: Alexander Bock <alexander.bock@liu.se>

---------

Co-authored-by: Alexander Bock <alexander.bock@liu.se>
---
 src/util/spicemanager.cpp | 14 +++++++++++---
 1 file changed, 11 insertions(+), 3 deletions(-)

diff --git a/src/util/spicemanager.cpp b/src/util/spicemanager.cpp
index 1b3557c220..8bb87c8b3b 100644
--- a/src/util/spicemanager.cpp
+++ b/src/util/spicemanager.cpp
@@ -261,11 +261,19 @@ SpiceManager::KernelHandle SpiceManager::loadKernel(std::filesystem::path filePa
     }
 
     const std::filesystem::path fileExtension = filePath.extension();
-    if (fileExtension == ".bc" || fileExtension == ".BC") {
+    if (fileExtension == ".bc" ||
+        fileExtension == ".BC" ||
+        fileExtension == ".ck" ||
+        fileExtension == ".CK")
+    {
         findCkCoverage(filePath); // binary ck kernel
     }
-    else if (fileExtension == ".bsp" || fileExtension == ".BSP") {
-        findSpkCoverage(filePath); // binary spk kernel
+    else if (fileExtension == ".bsp" ||
+            fileExtension == ".BSP" ||
+            fileExtension == ".spk" ||
+            fileExtension == ".SPK")
+        {
+            findSpkCoverage(filePath); // spk kernel
     }
 
     const KernelHandle kernelId = ++_lastAssignedKernel;

From 0ff646a94c8505b2b285fdd51800cdebe0dda111 Mon Sep 17 00:00:00 2001
From: Emma Broman <emma.broman@liu.se>
Date: Tue, 4 Jun 2024 09:26:46 +0200
Subject: [PATCH 475/701] Update Lua script documentation for
 `openspace.navigation` and `openspace.pathnavigation` (#3188)

* Update some pathnavigator script documentation

* Update navigationhandler script docs

* Update returned information for joystick axis function

* Add another reference link to a navigation state

* Make punctuation consistent

* Consistent mentioning of navigation states

* Remove TODO comments - We will not get to fixing them as of now

* Use more explicit names for add navigation function arguments

Co-authored-by: Malin E <malin.ejdbo@gmail.com>
Co-authored-by: Andreas Engberg <48772850+engbergandreas@users.noreply.github.com>
---
 .../util/joysticks/joystick_helper.asset      |   8 +-
 src/navigation/navigationhandler_lua.inl      | 348 ++++++++++++------
 src/navigation/pathnavigator_lua.inl          |  78 ++--
 3 files changed, 301 insertions(+), 133 deletions(-)

diff --git a/data/assets/util/joysticks/joystick_helper.asset b/data/assets/util/joysticks/joystick_helper.asset
index c21ebe58b9..1bdf148243 100644
--- a/data/assets/util/joysticks/joystick_helper.asset
+++ b/data/assets/util/joysticks/joystick_helper.asset
@@ -9,7 +9,7 @@ local function bindLocalRoll(name, axis)
     -- We only want to store the current state in the first mode that is enabled, otherwise we will overwrite the backup
     if not Joystick.State.IsInRollMode then
       -- Save current axis state
-      Joystick.State.Axis.Type, Joystick.State.Axis.Inverted, Joystick.State.Axis.JoystickType, Joystick.State.Axis.Sticky, Joystick.State.Axis.Flip, Joystick.State.Axis.Sensitivity, Joystick.State.Axis.PropertyUri, Joystick.State.Axis.MinValue, Joystick.State.Axis.MaxValue, Joystick.State.Axis.IsRemote = openspace.navigation.joystickAxis("]] .. name .. "\", " .. axis .. [[)
+      Joystick.State.Axis = openspace.navigation.joystickAxis("]] .. name .. "\", " .. axis .. [[)
     end
 
     -- Set new axis state
@@ -23,7 +23,7 @@ local function bindGlobalRoll(name, axis)
     -- We only want to store the current state in the first mode that is enabled, otherwise we will overwrite the backup
     if not Joystick.State.IsInRollMode then
       -- Save current axis state
-      Joystick.State.Axis.Type, Joystick.State.Axis.Inverted, Joystick.State.Axis.JoystickType, Joystick.State.Axis.Sticky, Joystick.State.Axis.Flip, Joystick.State.Axis.Sensitivity, Joystick.State.Axis.PropertyUri, Joystick.State.Axis.MinValue, Joystick.State.Axis.MaxValue, Joystick.State.Axis.IsRemote = openspace.navigation.joystickAxis("]] .. name .. "\", " .. axis .. [[)
+      Joystick.State.Axis = openspace.navigation.joystickAxis("]] .. name .. "\", " .. axis .. [[)
     end
 
     -- Set new axis state
@@ -35,7 +35,7 @@ end
 local function permaBindLocalRoll(name, axis)
   return [[
     -- Save current axis state
-    Joystick.State.Axis.Type, Joystick.State.Axis.Inverted, Joystick.State.Axis.JoystickType, Joystick.State.Axis.Sticky, Joystick.State.Axis.Flip, Joystick.State.Axis.Sensitivity, Joystick.State.Axis.PropertyUri, Joystick.State.Axis.MinValue, Joystick.State.Axis.MaxValue, Joystick.State.Axis.IsRemote = openspace.navigation.joystickAxis("]] .. name .. "\", " .. axis .. [[)
+    Joystick.State.Axis = openspace.navigation.joystickAxis("]] .. name .. "\", " .. axis .. [[)
 
     -- Set new axis state
     openspace.navigation.bindJoystickAxis("]] .. name .. "\", " .. axis .. [[, "LocalRoll", Joystick.State.Axis.Inverted, Joystick.State.Axis.JoystickType, Joystick.State.Axis.Sticky, Joystick.State.Axis.Flip, Joystick.State.Axis.Sensitivity)
@@ -45,7 +45,7 @@ end
 local function permaBindGlobalRoll(name, axis)
   return [[
     -- Save current axis state
-    Joystick.State.Axis.Type, Joystick.State.Axis.Inverted, Joystick.State.Axis.JoystickType, Joystick.State.Axis.Sticky, Joystick.State.Axis.Flip, Joystick.State.Axis.Sensitivity, Joystick.State.Axis.PropertyUri, Joystick.State.Axis.MinValue, Joystick.State.Axis.MaxValue, Joystick.State.Axis.IsRemote = openspace.navigation.joystickAxis("]] .. name .. "\", " .. axis .. [[)
+    Joystick.State.Axis = openspace.navigation.joystickAxis("]] .. name .. "\", " .. axis .. [[)
 
     -- Set new axis state
     openspace.navigation.bindJoystickAxis("]] .. name .. "\", " .. axis .. [[, "GlobalRoll", Joystick.State.Axis.Inverted, Joystick.State.Axis.JoystickType, Joystick.State.Axis.Sticky, Joystick.State.Axis.Flip, Joystick.State.Axis.Sensitivity)
diff --git a/src/navigation/navigationhandler_lua.inl b/src/navigation/navigationhandler_lua.inl
index 7a805751e6..0a3be04c6a 100644
--- a/src/navigation/navigationhandler_lua.inl
+++ b/src/navigation/navigationhandler_lua.inl
@@ -25,30 +25,39 @@
 namespace {
 
 /**
- * Load a navigation state from file. The file should be a lua file returning the
- * navigation state as a table formatted as a Navigation State, such as the output files
- * of saveNavigationState. If usetimeStamp is set to true and the provided navigation
- * state has a timestamp, time will be set as well.
+ * Set the camera position by loading a [NavigationState](#core_navigation_state) from
+ * file. The file should be in json format, such as the output files of
+ * `saveNavigationState`.
+ *
+ * \param filePath the path to the file, including the file name (and extension, if it is
+ *                 anything other than `.navstate`)
+ * \param useTimeStamp if true, and the provided NavigationState includes a timestamp,
+ *                     the time will be set as well.
  */
-[[codegen::luawrap]] void loadNavigationState(std::string cameraStateFilePath,
+[[codegen::luawrap]] void loadNavigationState(std::string filePath,
                                               bool useTimeStamp = false)
 {
-    if (cameraStateFilePath.empty()) {
+    if (filePath.empty()) {
         throw ghoul::lua::LuaError("Filepath string is empty");
     }
 
     openspace::global::navigationHandler->loadNavigationState(
-        cameraStateFilePath,
+        filePath,
         useTimeStamp
     );
 }
 
 /**
- * Return the current navigation state as a Lua table. The optional argument is the scene
- * graph node to use as reference frame. By default, the reference frame will picked based
- * on whether the orbital navigator is currently following the anchor node rotation. If it
- * is, the anchor will be chosen as reference frame. If not, the reference frame will be
- * set to the scene graph root.
+ * Return the current [NavigationState](#core_navigation_state) as a Lua table.
+ *
+ * By default, the reference frame will be picked based on whether the orbital navigator is
+ * currently following the anchor node rotation. If it is, the anchor will be chosen as
+ * reference frame. If not, the reference frame will be set to the scene graph root.
+ *
+ * \param frame the identifier of an optional scene graph node to use as reference frame
+ *              for the NavigationState
+ *
+ * \return a Lua table representing the current NavigationState of the camera
  */
 [[codegen::luawrap]] ghoul::Dictionary getNavigationState(
                                                          std::optional<std::string> frame)
@@ -72,9 +81,13 @@ namespace {
     return state.dictionary();
 }
 
-// Set the navigation state. The first argument must be a valid Navigation State. If
-// useTimeStamp is set to true and the provided navigation state has a timestamp, time
-// will be set as well.
+/**
+ * Set the camera position from a provided [NavigationState](#core_navigation_state).
+ *
+ * \param navigationState a table describing the NavigationState to set
+ * \param useTimeStamp if true, and the provided NavigationState includes a timestamp,
+ *                     the time will be set as well
+ */
 [[codegen::luawrap]] void setNavigationState(ghoul::Dictionary navigationState,
                                              bool useTimeStamp = false)
 {
@@ -90,11 +103,17 @@ namespace {
 }
 
 /**
- * Save the current navigation state to a file with the path given by the first argument.
- * The optional second argument is the scene graph node to use as reference frame. By
- * default, the reference frame will picked based on whether the orbital navigator is
- * currently following the anchor node rotation. If it is, the anchor will be chosen as
+ * Save the current [NavigationState](#core_navigation_state) to a file with the path
+ * given by the first argument.
+ *
+ * By default, the reference frame will be picked based on whether the orbital navigator
+ * is currently following the anchor node rotation. If it is, the anchor will be chosen as
  * reference frame. If not, the reference frame will be set to the scene graph root.
+ *
+ * \param path the file path for where to save the NavigationState, including the file
+ *             name. If no extension is added, the file is saved as a `.navstate` file.
+ * \param frame the identifier of the scene graph node which coordinate system should be
+ *              used as a reference frame for the NavigationState.
  */
 [[codegen::luawrap]] void saveNavigationState(std::string path, std::string frame = "") {
     if (path.empty()) {
@@ -103,18 +122,25 @@ namespace {
     openspace::global::navigationHandler->saveNavigationState(path, frame);
 }
 
-// Reset the camera direction to point at the anchor node.
+/**
+ * Reset the camera direction to point at the anchor node.
+ */
 [[codegen::luawrap]] void retargetAnchor() {
     openspace::global::navigationHandler->orbitalNavigator().startRetargetAnchor();
 }
 
-// Reset the camera direction to point at the aim node.
+/**
+ * Reset the camera direction to point at the aim node.
+ */
 [[codegen::luawrap]] void retargetAim() {
     openspace::global::navigationHandler->orbitalNavigator().startRetargetAim();
 }
 
-// Picks the next node from the interesting nodes out of the profile and selects that. If
-// the current anchor is not an interesting node, the first will be selected
+/**
+ * Picks the next node from the interesting nodes out of the profile and selects that.
+ * If the current anchor is not an interesting node, the first node in the list will be
+ * selected.
+ */
 [[codegen::luawrap]] void targetNextInterestingAnchor() {
     using namespace openspace;
     if (global::profile->markNodes.empty()) {
@@ -143,8 +169,11 @@ namespace {
     global::navigationHandler->orbitalNavigator().startRetargetAnchor();
 }
 
-// Picks the previous node from the interesting nodes out of the profile and selects that.
-// If the current anchor is not an interesting node, the first will be selected
+/**
+ * Picks the previous node from the interesting nodes out of the profile and selects that.
+ * If the current anchor is not an interesting node, the first node in the list will be
+ * selected.
+ */
 [[codegen::luawrap]] void targetPreviousInterestingAnchor() {
     using namespace openspace;
     if (global::profile->markNodes.empty()) {
@@ -176,25 +205,20 @@ namespace {
 }
 
 /**
- * Finds the input joystick with the given 'name' and binds the axis identified by the
- * second argument to be used as the type identified by the third argument. If
- * 'isInverted' is 'true', the axis value is inverted. 'joystickType' is if the joystick
- * behaves more like a joystick or a trigger, where the first is the default. If
- * 'isSticky' is 'true', the value is calculated relative to the previous value. If
- * 'shouldFlip' is true, then the camera movement for the axis is reversed. If
- * 'sensitivity' is given then that value will affect the sensitivity of the axis together
- * with the global sensitivity.
+ * Bind an axis of a joystick to be used as a certain type, and optionally define
+ * detailed settings for the axis.
  *
  * \param joystickName the name for the joystick or game controller that should be bound
  * \param axis the axis of the joystick that should be bound
  * \param axisType the type of movement that the axis should be mapped to
- * \param shouldInvert if the joystick movement should be inverted or not
- * \param joystickType what type of joystick or axis this is. Either
- *                     <code>"JoystickLike"</code> or <code>"TriggerLike"</code>.
- * \param isSticky if true, the value is calculated relative to the previous value,
- *                 if false the the value is used as is.
+ * \param shouldInvert decides if the joystick axis movement should be inverted or not
+ * \param joystickType what type of joystick or axis this is. Decides if the joystick
+ *                     behaves more like a joystick or a trigger. Either `"JoystickLike"`
+ *                     or `"TriggerLike"`, where `"JoystickLike"` is default
+ * \param isSticky if true, the value is calculated relative to the previous value.
+ *                 If false, the value is used as is
  * \param shouldFlip reverses the movement of the camera that the joystick produces
- * \param sensitivity sensitivity for this axis
+ * \param sensitivity sensitivity for this axis, in addition to the global sensitivity
  */
 [[codegen::luawrap]] void bindJoystickAxis(std::string joystickName, int axis,
                                            std::string axisType,
@@ -219,21 +243,22 @@ namespace {
 }
 
 /**
- * Finds the input joystick with the given 'name' and binds the axis identified by the
- * second argument to be bound to the property identified by the third argument. 'min' and
- * 'max' is the minimum and the maximum allowed value for the given property and the axis
- * value is rescaled from [-1, 1] to [min, max], default is [0, 1]. If 'isInverted' is
- * 'true', the axis value is inverted. The last argument determines whether the property
- * change is going to be executed locally or remotely, where the latter is the default.
+ * Binds an axis of a joystick to a numerical property value in OpenSpace. This means that
+ * interacting with the joystick will change the property value, within a given min-max
+ * range.
+ *
+ * The axis value will be rescaled from [-1, 1] to the provided [min, max] range
+ * (default is [0, 1]).
  *
  * \param joystickName the name for the joystick or game controller that should be bound
  * \param axis the axis of the joystick that should be bound
- * \param propertyUri the property that this joystick axis should modify
+ * \param propertyUri the identifier (URI) of the property that this joystick axis should
+ *                    modify
  * \param min the minimum value that this axis can set for the property
  * \param max the maximum value that this axis can set for the property
  * \param shouldInvert if the joystick movement should be inverted or not
- * \param isRemote if true, the property change will also be executed on connected nodes
- *                 if false, the property change will only affect the master node
+ * \param isRemote if true, the property change will also be executed on connected nodes.
+ *                 If false, the property change will only affect the master node
  */
 [[codegen::luawrap]] void bindJoystickAxisProperty(std::string joystickName, int axis,
                                                    std::string propertyUri,
@@ -254,43 +279,90 @@ namespace {
     );
 }
 
+struct [[codegen::Dictionary(JoystickAxis)]] JoystickAxis {
+    // The current type of axis binding
+    std::string type;
+
+    // Whether the values are inverted
+    bool invert;
+
+    // The type of joystick that this axis represents on the controller - either
+    // `\"JoystickLike\"` or `\"TriggerLike\"`. A joystick is `\"TriggerLike\"` if it
+    // can only be pressed or pushed in one direction. A `\"JoystickLike\"` axis can
+    // be pushed in two directions; for example, left and right, or up and down.
+    std::string joystickType;
+
+    // Whether or not this axis is “sticky”. An axis is “sticky” if, when you let go of
+    // it, the values it represents in the software do not go back to the default.
+    bool isSticky;
+
+    // Whether the camera movement for the axis is reversed. In the case of a
+    // `\"JoystickLike\"` axis, this is the same as inverting the axis. However, in the
+    // case of a `\"TriggerLike\" axis, this can reverse the camera movement for the
+    // trigger.
+    bool flip;
+
+    // Sensitivity value for this axis
+    double sensitivity;
+
+    // The identifier (URI) of the property that is bound to this axes, if one is
+    std::optional<std::string> propertyUri;
+
+    // If a property is bound to this axis, this is the min value that can be set using
+    // the joystick input
+    std::optional<float> minValue;
+
+    // If a property is bound to this axis, this is the max value that can be set using
+    // the joystick input
+    std::optional<float> maxValue;
+
+    // If a property is bound to this axis, this says whether the property changes should
+    // be forwarded to other connected nodes or sessions (similarly to \"isLocal\" for
+    // actions)
+    std::optional<bool> isRemote;
+};
+
 /**
- * Finds the input joystick with the given 'name' and returns the joystick axis
- * information for the passed axis. The information that is returned is the current axis
- * binding as a string, whether the values are inverted as bool, the joystick type as a
- * string, whether the axis is sticky as bool, the sensitivity as number, the property uri
- * bound to the axis as string (empty is type is not Property), the min and max values for
- * the property as numbers and whether the property change will be executed remotly as
- * bool.
+ * Return all the information bound to a certain joystick axis.
+ *
+ * \param joystickName the name for the joystick or game controller with the axis for
+ *                     which to find the information
+ * \param axis the joystick axis for which to find the information
+ *
+ * \return an object with information about the joystick axis
  */
-[[codegen::luawrap]]
-std::tuple<
-    std::string, bool, std::string, bool, bool, double, std::string, float, float, bool
->
-joystickAxis(std::string joystickName, int axis)
-{
+[[codegen::luawrap]] ghoul::Dictionary joystickAxis(std::string joystickName, int axis) {
     using namespace openspace;
 
     interaction::JoystickCameraStates::AxisInformation info =
         global::navigationHandler->joystickAxisMapping(joystickName, axis);
 
-    return {
-        ghoul::to_string(info.type),
-        info.invert,
-        ghoul::to_string(info.joystickType),
-        info.isSticky,
-        info.flip,
-        info.sensitivity,
-        info.propertyUri,
-        info.minValue,
-        info.maxValue,
-        info.isRemote
-    };
+    ghoul::Dictionary dict;
+    dict.setValue("Type", ghoul::to_string(info.type));
+    dict.setValue("Inverted", static_cast<bool>(info.invert));
+    dict.setValue("JoystickType", ghoul::to_string(info.joystickType));
+    dict.setValue("Sticky", info.isSticky);
+    dict.setValue("Flip", static_cast<bool>(info.flip));
+    dict.setValue("Sensitivity", info.sensitivity);
+
+    bool isPropertyBound = !info.propertyUri.empty();
+    if (isPropertyBound) {
+        dict.setValue("PropertyUri", info.propertyUri);
+        dict.setValue("MinValue", static_cast<double>(info.minValue));
+        dict.setValue("MaxValue", static_cast<double>(info.maxValue));
+        dict.setValue("IsRemote", info.isRemote);
+    }
+
+    return dict;
 }
 
 /**
- * Finds the input joystick with the given 'name' and sets the deadzone for a particular
- * joystick axis, which means that any input less than this value is completely ignored.
+ * Set the deadzone value for a particular joystick axis, which means that any input less
+ * than this value is completely ignored.
+ *
+ * \param joystickName the name for the joystick or game controller
+ * \param axis the joystick axis for which to set the deadzone
+ * \param deadzone the new deadzone value
  */
 [[codegen::luawrap("setAxisDeadZone")]] void setJoystickAxisDeadZone(
                                                                  std::string joystickName,
@@ -303,6 +375,12 @@ joystickAxis(std::string joystickName, int axis)
 
 /**
  * Returns the deadzone for the desired axis of the provided joystick.
+ *
+ * \param joystickName the name for the joystick or game controller which information
+ *                     should be returned
+ * \param axis the joystick axis for which to get the deadzone value
+ *
+ * \return the deadzone value
  */
 [[codegen::luawrap("axisDeadzone")]] float joystickAxisDeadzone(std::string joystickName,
                                                                 int axis)
@@ -315,13 +393,20 @@ joystickAxis(std::string joystickName, int axis)
 }
 
 /**
- * Finds the input joystick with the given 'name' and binds a Lua script given by the
- * third argument to be executed when the joystick button identified by the second
- * argument is triggered. The fifth argument determines when the script should be
- * executed, this defaults to 'Press', which means that the script is run when the user
- * presses the button. The fourth arguemnt is the documentation of the script in the third
- * argument. The sixth argument determines whether the command is going to be executable
- * locally or remotely, where the latter is the default.
+ * Bind a Lua script to one of the buttons for a joystick.
+ *
+ * \param joystickName the name for the joystick or game controller
+ * \param button the button to which to bind the script
+ * \param command the script that should be executed on button trigger
+ * \param documentation the documentation for the provided script/command
+ * \param action the action for when the script should be executed. This defaults to
+ *               `"Press"`, which means that the script is run when the user presses the
+ *               button. Alternatives are `"Idle"` (if the button is unpressed and has
+ *               been unpressed since the last frame), `"Repeat"` (if the button has been
+ *               pressed since longer than the last frame), and `"Release"` (if the button was
+ *               released since the last frame)
+ * \param isRemote a value saying whether the command is going to be executable
+ *                 locally or remotely, where the latter is the default
  */
 [[codegen::luawrap]] void bindJoystickButton(std::string joystickName, int button,
                                              std::string command,
@@ -344,8 +429,11 @@ joystickAxis(std::string joystickName, int axis)
 }
 
 /**
- * Finds the input joystick with the given 'name' and removes all commands that are
- * currently bound to the button identified by the second argument.
+ * Remove all commands that are currently bound to a button of a joystick or game
+ * controller
+ *
+ * \param joystickName the name for the joystick or game controller
+ * \param button the button for which to clear the commands
  */
 [[codegen::luawrap]] void clearJoystickButton(std::string joystickName, int button) {
     openspace::global::navigationHandler->clearJoystickButtonCommand(
@@ -355,8 +443,13 @@ joystickAxis(std::string joystickName, int axis)
 }
 
 /**
- * Finds the input joystick with the given 'name' and returns the script that is currently
- * bound to be executed when the provided button is pressed.
+ * Get the Lua script that is currently bound to be executed when the provided button is
+ * pressed/triggered.
+ *
+ * \param joystickName the name for the joystick or game controller
+ * \param button the button for which to get the command
+ *
+ * \return the currently bound Lua script
  */
 [[codegen::luawrap]] std::string joystickButton(std::string joystickName, int button) {
     using namespace openspace;
@@ -374,43 +467,80 @@ joystickAxis(std::string joystickName, int axis)
     return cmd;
 }
 
-// Directly adds to the global rotation of the camera.
-[[codegen::luawrap]] void addGlobalRotation(double v1, double v2) {
+/**
+ * Directly add to the global rotation of the camera (around the focus node).
+ *
+ * \param xValue the value to add in the x-direction (a positive value rotates to the
+ *               right and a negative value to the left)
+ * \param yValue the value to add in the y-direction (a positive value rotates the focus
+ *               upwards and a negative value downwards)
+ */
+[[codegen::luawrap]] void addGlobalRotation(double xValue, double yValue) {
     using namespace openspace;
     global::navigationHandler->orbitalNavigator().scriptStates().addGlobalRotation(
-        glm::dvec2(v1, v2)
+        glm::dvec2(xValue, yValue)
     );
 }
 
-// Directly adds to the local rotation of the camera.
-[[codegen::luawrap]] void addLocalRotation(double v1, double v2) {
+/**
+ * Directly adds to the local rotation of the camera (around the camera's current
+ * position).
+ *
+ * \param xValue the value to add in the x-direction (a positive value rotates to the
+ *               left and a negative value to the right)
+ * \param yValue the value to add in the y-direction (a positive value rotates the camera
+ *               upwards and a negative value downwards)
+ */
+[[codegen::luawrap]] void addLocalRotation(double xValue, double yValue) {
     using namespace openspace;
     global::navigationHandler->orbitalNavigator().scriptStates().addLocalRotation(
-        glm::dvec2(v1, v2)
+        glm::dvec2(xValue, yValue)
     );
 }
 
-// Directly adds to the truck movement of the camera.
-[[codegen::luawrap]] void addTruckMovement(double v1, double v2) {
+
+/**
+ * Directly adds to the truck movement of the camera. This is the movement along the line
+ * from the camera to the focus node.
+ *
+ * A positive value moves the camera closer to the focus, and a negative value moves the
+ * camera further away.
+ *
+ * \param value the value to add
+ */
+[[codegen::luawrap]] void addTruckMovement(double value) {
     using namespace openspace;
+    // @TODO: Note that the x value isn't actually used and the code in the navigation
+    // handlers for these should be cleaned up. The same goes for the roll funcitons below
     global::navigationHandler->orbitalNavigator().scriptStates().addTruckMovement(
-        glm::dvec2(v1, v2)
+        glm::dvec2(0.0, value)
     );
 }
 
-// Directly adds to the local roll of the camera.
-[[codegen::luawrap]] void addLocalRoll(double v1, double v2) {
+/**
+ * Directly adds to the local roll of the camera. This is the rotation around the camera's
+ * forward/view direction.
+ *
+ * \param value the value to add
+ */
+[[codegen::luawrap]] void addLocalRoll(double value) {
     using namespace openspace;
     global::navigationHandler->orbitalNavigator().scriptStates().addLocalRoll(
-        glm::dvec2(v1, v2)
+        glm::dvec2(value, 0.0)
     );
 }
 
-// Directly adds to the global roll of the camera.
-[[codegen::luawrap]] void addGlobalRoll(double v1, double v2) {
+/**
+ * Directly adds to the global roll of the camera. This is a rotation around the line
+ * between the focus node and the camera (not always the same as the camera view
+ * direction)
+ *
+ * \param value the value to add
+ */
+[[codegen::luawrap]] void addGlobalRoll(double value) {
     using namespace openspace;
     global::navigationHandler->orbitalNavigator().scriptStates().addGlobalRoll(
-        glm::dvec2(v1, v2)
+        glm::dvec2(value, 0.0)
     );
 }
 
@@ -429,7 +559,9 @@ joystickAxis(std::string joystickName, int axis)
 }
 
 /**
- * Return the complete list of connected joysticks
+ * Return the complete list of connected joysticks.
+ *
+ * \return a list of joystick names
  */
 [[codegen::luawrap]] std::vector<std::string> listAllJoysticks() {
     using namespace openspace;
@@ -437,7 +569,9 @@ joystickAxis(std::string joystickName, int axis)
 }
 
 /**
- * Returns the distance in meters to the current focus node
+ * Return the distance to the current focus node.
+ *
+ * \return the distance, in meters
  */
 [[codegen::luawrap]] double distanceToFocus() {
     using namespace openspace;
@@ -449,7 +583,9 @@ joystickAxis(std::string joystickName, int axis)
 }
 
 /**
- * Returns the distance in meters to the current focus node's bounding sphere
+ * Return the distance to the current focus node's bounding sphere.
+ *
+ * \return the distance, in meters
  */
 [[codegen::luawrap]] double distanceToFocusBoundingSphere() {
     using namespace openspace;
@@ -463,7 +599,9 @@ joystickAxis(std::string joystickName, int axis)
 }
 
 /**
- * Returns the distance in meters to the current focus node's interaction sphere
+ * Return the distance to the current focus node's interaction sphere.
+ *
+ * \return the distance, in meters
  */
 [[codegen::luawrap]] double distanceToFocusInteractionSphere() {
     using namespace openspace;
diff --git a/src/navigation/pathnavigator_lua.inl b/src/navigation/pathnavigator_lua.inl
index b9b3e0e18b..72d2e25128 100644
--- a/src/navigation/pathnavigator_lua.inl
+++ b/src/navigation/pathnavigator_lua.inl
@@ -24,28 +24,40 @@
 
 namespace {
 
-// Returns true if a camera path is currently running, and false otherwise.
+/**
+ * Returns true if a camera path is currently running, and false otherwise.
+ *
+ * \return Whether a camera path is currently active, or not
+ */
 [[codegen::luawrap]] bool isFlying() {
     using namespace openspace;
     return global::openSpaceEngine->currentMode() == OpenSpaceEngine::Mode::CameraPath;
 }
 
-// Continue playing a paused camera path.
+/**
+ * Continue playing a paused camera path.
+ */
 [[codegen::luawrap]] void continuePath() {
     openspace::global::navigationHandler->pathNavigator().continuePath();
 }
 
-// Pause a playing camera path.
+/**
+ * Pause a playing camera path.
+ */
 [[codegen::luawrap]] void pausePath() {
     openspace::global::navigationHandler->pathNavigator().pausePath();
 }
 
-// Stops a path, if one is being played.
+/**
+ * Stops a path, if one is being played.
+ */
 [[codegen::luawrap]] void stopPath() {
     openspace::global::navigationHandler->pathNavigator().abortPath();
 }
 
-// Immediately skips to the end of the current camera path, if one is being played.
+/**
+ * Immediately skips to the end of the current camera path, if one is being played.
+ */
 [[codegen::luawrap]] void skipToEnd() {
     openspace::global::navigationHandler->pathNavigator().skipToEnd();
 }
@@ -156,9 +168,12 @@ namespace {
 }
 
 /**
- * Create a path to the navigation state described by the input table. The optional
- * double specifies the target duration of the motion, in seconds. Note that roll must be
- * included for the target up direction to be taken into account.
+ * Create a path to the navigation state described by the input table. Note that roll must be
+ * included for the target up direction in the navigation state to be taken into account.
+ *
+ * \param navigationState A [NavigationState](#core_navigation_state) to fly to
+ * \param duration An optional duration for the motion to take, in seconds. For example,
+ *                 a value of 5 means "fly to this position over a duration of 5 seconds"
  */
 [[codegen::luawrap]] void flyToNavigationState(ghoul::Dictionary navigationState,
                                                std::optional<double> duration)
@@ -196,8 +211,10 @@ namespace {
 }
 
 /**
- * Zoom linearly to the current focus node, using the default distance. The optional input
- * parameter specifies the duration for the motion, in seconds.
+ * Zoom linearly to the current focus node, using the default distance.
+ *
+ * \param duration An optional duration for the motion to take, in seconds. For example,
+ *                 a value of 5 means "zoom in over 5 seconds"
  */
 [[codegen::luawrap]] void zoomToFocus(std::optional<double> duration) {
     using namespace openspace;
@@ -227,9 +244,10 @@ namespace {
 }
 
 /**
- * Fly linearly to a specific distance in relation to the focus node. The distance is
- * given in meters above the bounding sphere of the current focus node. The optional input
- * parameter specifies the duration for the motion, in seconds.
+ * Fly linearly to a specific distance in relation to the focus node.
+ *
+ * \param distance The distance to fly to, in meters above the bounding sphere.
+ * \param duration An optional duration for the motion to take, in seconds.
  */
 [[codegen::luawrap]] void zoomToDistance(double distance, std::optional<double> duration)
 {
@@ -265,11 +283,14 @@ namespace {
 }
 
 /**
- * Fly linearly to a specific distance in relation to the focus node. The distance is
- * given as a multiple of the bounding sphere of the current focus node. That is, a value
- * of 1 will result in a position at a distance of one times the size of the bounding
- * sphere away from the object. The optional input parameter specifies the duration for
- * the motion, in seconds.
+ * Fly linearly to a specific distance in relation to the focus node, given as a relative
+ * value based on the size of the object rather than in meters.
+ *
+ * \param distance The distance to fly to, given as a multiple of the bounding sphere of
+ *                 the current focus node bounding sphere. A value of 1 will result in a
+ *                 position at a distance of one times the size of the bounding
+ *                 sphere away from the object.
+ * \param duration An optional duration for the motion, in seconds.
  */
 [[codegen::luawrap]] void zoomToDistanceRelative(double distance,
                                                  std::optional<double> duration)
@@ -292,7 +313,7 @@ namespace {
     insDict.setValue("Height", distance);
     insDict.setValue("PathType", std::string("Linear"));
 
-    if (duration.has_value()) {
+  if (duration.has_value()) {
         double d = *duration;
         if (d < 0.0) {
             throw ghoul::lua::LuaError("Duration must be a positive value");
@@ -311,7 +332,9 @@ namespace {
  * Fade rendering to black, jump to the specified node, and then fade in. This is done by
  * triggering another script that handles the logic.
  *
- * If no fade duration is specified, use the property from Navigation Handler
+ * \param navigationState A [NavigationState](#core_navigation_state) to jump to
+ * \param fadeDuration An optional duration for the fading. If not included, the
+ *                     property in Navigation Handler will be used
  */
 [[codegen::luawrap]] void jumpToNavigationState(ghoul::Dictionary navigationState,
                                                 std::optional<double> fadeDuration)
@@ -357,7 +380,9 @@ namespace {
  * Fade rendering to black, jump to the specified navigation state, and then fade in.
  * This is done by triggering another script that handles the logic.
  *
- * If no fade duration is specified, use the property from Navigation Handler
+ * \param nodeIdentifier The identifier of the scene graph node to jump to
+ * \param fadeDuration An optional duration for the fading. If not included, the
+ *                     property in Navigation Handler will be used
  */
 [[codegen::luawrap]] void jumpTo(std::string nodeIdentifier,
                                  std::optional<double> fadeDuration)
@@ -382,10 +407,15 @@ namespace {
     }
 }
 
-// Create a camera path as described by the lua table input argument.
-[[codegen::luawrap]] void createPath(ghoul::Dictionary path) {
+/**
+ * Create a camera path as described by the instruction in the input argument.
+ *
+ * \param pathInstruction A table representing a [PathInstruction](#core_path_instruction),
+ *                        that describes a camera path to be created
+ */
+[[codegen::luawrap]] void createPath(ghoul::Dictionary pathInstruction) {
     using namespace openspace;
-    global::navigationHandler->pathNavigator().createPath(path);
+    global::navigationHandler->pathNavigator().createPath(pathInstruction);
     if (global::navigationHandler->pathNavigator().hasCurrentPath()) {
         global::navigationHandler->pathNavigator().startPath();
     }

From aaab3fae46ca353af15f300035c51110a5bd11a5 Mon Sep 17 00:00:00 2001
From: Emma Broman <emma.broman@liu.se>
Date: Tue, 4 Jun 2024 16:07:54 +0200
Subject: [PATCH 476/701] Update exoplanet data version (#3301)

---
 data/assets/modules/exoplanets/exoplanets_data.asset | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/data/assets/modules/exoplanets/exoplanets_data.asset b/data/assets/modules/exoplanets/exoplanets_data.asset
index 839967411e..040fe81dd3 100644
--- a/data/assets/modules/exoplanets/exoplanets_data.asset
+++ b/data/assets/modules/exoplanets/exoplanets_data.asset
@@ -2,7 +2,7 @@ local dataPath = asset.resource({
   Name = "Exoplanet Data Files",
   Type = "HttpSynchronization",
   Identifier = "exoplanets_data",
-  Version = 5
+  Version = 6
 })
 
 local colormaps = asset.resource({
@@ -33,10 +33,10 @@ asset.export("DataPath", dataPath)
 
 asset.meta = {
   Name = "Exoplanet Data",
-  Version = "5.0",
+  Version = "6.0",
   Description = [[The data that is used for the exoplanet systems. The data has been
     derived from the 'Planetary Systems Composite Data' dataset from the NASA Exoplanet
-    Archive]],
+    Archive.]],
   Author = "OpenSpace Team",
   URL = "https://exoplanetarchive.ipac.caltech.edu/docs/data.html",
   License = "MIT license"

From 09a40f62dc1dc12eb6b33594b0a86f30d12bf4a8 Mon Sep 17 00:00:00 2001
From: Emma Broman <emma.broman@liu.se>
Date: Tue, 4 Jun 2024 16:18:03 +0200
Subject: [PATCH 477/701] Rename `goToGeo` -> `jumpToGeo` (#3296)

* Remove unused bool argument in globebrowsing functions
* Refactor some globe browsing functions
* Start updating goToGeo function to fade instead of just jump
* Add choice for whtehr to use default or arrival height when flying to a geo2
* Update / add docs for fly-to and go-to functions
* Rename function and add deprecated version of `goToGeo`
---
 include/openspace/navigation/pathnavigator.h  |   2 +
 modules/globebrowsing/globebrowsingmodule.cpp | 105 +++++-----
 modules/globebrowsing/globebrowsingmodule.h   |  16 +-
 .../globebrowsing/globebrowsingmodule_lua.inl | 183 +++++++++++++-----
 src/navigation/pathnavigator.cpp              |  11 ++
 src/navigation/waypoint.cpp                   |   2 +-
 6 files changed, 204 insertions(+), 115 deletions(-)

diff --git a/include/openspace/navigation/pathnavigator.h b/include/openspace/navigation/pathnavigator.h
index c2db18ff0e..713288299a 100644
--- a/include/openspace/navigation/pathnavigator.h
+++ b/include/openspace/navigation/pathnavigator.h
@@ -81,6 +81,8 @@ public:
     double minValidBoundingSphere() const;
     double findValidBoundingSphere(const SceneGraphNode* node) const;
 
+    double defaultArrivalHeight(const std::string& sgnIdentifier) const;
+
     const std::vector<SceneGraphNode*>& relevantNodes();
 
     /**
diff --git a/modules/globebrowsing/globebrowsingmodule.cpp b/modules/globebrowsing/globebrowsingmodule.cpp
index 027417c196..df02c5f4e1 100644
--- a/modules/globebrowsing/globebrowsingmodule.cpp
+++ b/modules/globebrowsing/globebrowsingmodule.cpp
@@ -356,8 +356,7 @@ void GlobeBrowsingModule::goToChunk(const globebrowsing::RenderableGlobe& globe,
     goToChunk(
         globe,
         globebrowsing::TileIndex(x, y, static_cast<uint8_t>(level)),
-        glm::vec2(0.5f, 0.5f),
-        true
+        glm::vec2(0.5f, 0.5f)
     );
 }
 
@@ -367,8 +366,7 @@ void GlobeBrowsingModule::goToGeo(const globebrowsing::RenderableGlobe& globe,
     using namespace globebrowsing;
     goToGeodetic2(
         globe,
-        Geodetic2{ glm::radians(latitude), glm::radians(longitude) },
-        true
+        Geodetic2{ glm::radians(latitude), glm::radians(longitude) }
     );
 }
 
@@ -381,20 +379,19 @@ void GlobeBrowsingModule::goToGeo(const globebrowsing::RenderableGlobe& globe,
         {
             Geodetic2{ glm::radians(latitude), glm::radians(longitude) },
             altitude
-        },
-        true
+        }
     );
 }
 
 glm::vec3 GlobeBrowsingModule::cartesianCoordinatesFromGeo(
                                               const globebrowsing::RenderableGlobe& globe,
-                                       double latitude, double longitude, double altitude)
+                                       double latitude, double longitude, std::optional<double> altitude)
 {
     using namespace globebrowsing;
 
     const Geodetic3 pos = {
         { .lat = glm::radians(latitude), .lon = glm::radians(longitude) },
-        altitude
+        altitude.value_or(altitudeFromCamera(globe))
     };
 
     return glm::vec3(globe.ellipsoid().cartesianPosition(pos));
@@ -440,9 +437,43 @@ glm::dvec3 GlobeBrowsingModule::geoPosition() const {
     return glm::dvec3(lat, lon, altitude);
 }
 
+double GlobeBrowsingModule::altitudeFromCamera(
+                                       const globebrowsing::RenderableGlobe& globe,
+                                       bool useHeightMap) const
+{
+    using namespace globebrowsing;
+
+    const glm::dvec3 cameraPosition = global::navigationHandler->camera()->positionVec3();
+    SceneGraphNode* sgn = dynamic_cast<SceneGraphNode*>(globe.owner());
+    if (!sgn) {
+        LERROR("Could not find scene graph node for globe");
+        return 0.0;
+    }
+
+    const glm::dmat4 inverseModelTransform = glm::inverse(sgn->modelTransform());
+
+    const glm::dvec3 cameraPositionModelSpace =
+        glm::dvec3(inverseModelTransform * glm::dvec4(cameraPosition, 1.0));
+
+    SurfacePositionHandle posHandle = globe.calculateSurfacePositionHandle(
+        cameraPositionModelSpace
+    );
+
+    if (useHeightMap) {
+        const glm::dvec3 centerToActualSurface = posHandle.centerToReferenceSurface +
+            posHandle.referenceSurfaceOutDirection * posHandle.heightToSurface;
+
+        return glm::length(cameraPositionModelSpace - centerToActualSurface);
+    }
+    else {
+        // Do not use height map => compute distance to reference surface
+        return glm::length(cameraPositionModelSpace - posHandle.centerToReferenceSurface);
+    }
+}
+
 void GlobeBrowsingModule::goToChunk(const globebrowsing::RenderableGlobe& globe,
                                     const globebrowsing::TileIndex& ti,
-                                    const glm::vec2& uv, bool doResetCameraDirection)
+                                    const glm::vec2& uv)
 {
     using namespace globebrowsing;
 
@@ -456,61 +487,23 @@ void GlobeBrowsingModule::goToChunk(const globebrowsing::RenderableGlobe& globe,
         .lon = corner.lon + positionOnPatch.lon
     };
 
-    // Compute altitude
-    const glm::dvec3 cameraPosition = global::navigationHandler->camera()->positionVec3();
-    SceneGraphNode* globeSceneGraphNode = dynamic_cast<SceneGraphNode*>(globe.owner());
-    if (!globeSceneGraphNode) {
-        LERROR("Cannot go to chunk. The renderable is not attached to scene graph node");
-        return;
-    }
-    const glm::dmat4 inverseModelTransform = glm::inverse(
-        globeSceneGraphNode->modelTransform()
-    );
-    const glm::dvec3 cameraPositionModelSpace =
-        glm::dvec3(inverseModelTransform * glm::dvec4(cameraPosition, 1.0));
-    const SurfacePositionHandle posHandle = globe.calculateSurfacePositionHandle(
-        cameraPositionModelSpace
-    );
+    const double altitude = altitudeFromCamera(globe);
 
-    const double altitude = glm::length(
-        cameraPositionModelSpace - posHandle.centerToReferenceSurface
-    );
-
-    goToGeodetic3(globe, { pointPosition, altitude }, doResetCameraDirection);
+    goToGeodetic3(globe, { pointPosition, altitude });
 }
 
 void GlobeBrowsingModule::goToGeodetic2(const globebrowsing::RenderableGlobe& globe,
-                                        globebrowsing::Geodetic2 geo2,
-                                        bool doResetCameraDirection)
+                                        globebrowsing::Geodetic2 geo2)
 {
     using namespace globebrowsing;
 
-    const glm::dvec3 cameraPosition = global::navigationHandler->camera()->positionVec3();
-    SceneGraphNode* globeSceneGraphNode = dynamic_cast<SceneGraphNode*>(globe.owner());
-    if (!globeSceneGraphNode) {
-        LERROR("Error when going to Geodetic2");
-        return;
-    }
+    const double altitude = altitudeFromCamera(globe);
 
-    const glm::dmat4 inverseModelTransform = glm::inverse(
-        globeSceneGraphNode->modelTransform()
-    );
-
-    const glm::dvec3 cameraPositionModelSpace =
-        glm::dvec3(inverseModelTransform * glm::dvec4(cameraPosition, 1.0));
-    const SurfacePositionHandle posHandle = globe.calculateSurfacePositionHandle(
-        cameraPositionModelSpace
-    );
-
-    const glm::dvec3 centerToActualSurface = posHandle.centerToReferenceSurface +
-                       posHandle.referenceSurfaceOutDirection * posHandle.heightToSurface;
-    const double altitude = glm::length(cameraPositionModelSpace - centerToActualSurface);
-
-    goToGeodetic3(globe, { geo2, altitude }, doResetCameraDirection);
+    goToGeodetic3(globe, { geo2, altitude });
 }
 
 void GlobeBrowsingModule::goToGeodetic3(const globebrowsing::RenderableGlobe& globe,
-                                        globebrowsing::Geodetic3 geo3, bool)
+                                        globebrowsing::Geodetic3 geo3)
 {
     using namespace globebrowsing;
     const glm::dvec3 positionModelSpace = globe.ellipsoid().cartesianPosition(geo3);
@@ -671,9 +664,9 @@ scripting::LuaLibrary GlobeBrowsingModule::luaLibrary() const {
             codegen::lua::LayersDeprecated,
             codegen::lua::MoveLayer,
             codegen::lua::GoToChunk,
-            codegen::lua::GoToGeo,
-            // @TODO (2021-06-23, emmbr) Combine with the above function when the camera
-            // paths work really well close to surfaces
+            codegen::lua::JumpToGeo,
+            codegen::lua::GoToGeoDeprecated,
+            codegen::lua::FlyToGeo2,
             codegen::lua::FlyToGeo,
             codegen::lua::LocalPositionFromGeo,
             codegen::lua::LocalPositionFromGeoDeprecated,
diff --git a/modules/globebrowsing/globebrowsingmodule.h b/modules/globebrowsing/globebrowsingmodule.h
index 429c09741f..c6d6cf279d 100644
--- a/modules/globebrowsing/globebrowsingmodule.h
+++ b/modules/globebrowsing/globebrowsingmodule.h
@@ -29,10 +29,10 @@
 #include <openspace/properties/scalar/boolproperty.h>
 #include <openspace/properties/scalar/uintproperty.h>
 #include <openspace/util/openspacemodule.h>
-
 #include <ghoul/glm.h>
-#include <memory>
 #include <future>
+#include <memory>
+#include <optional>
 
 namespace openspace::globebrowsing {
     class RenderableGlobe;
@@ -61,10 +61,13 @@ public:
         double latitude, double longitude, double altitude);
 
     glm::vec3 cartesianCoordinatesFromGeo(const globebrowsing::RenderableGlobe& globe,
-        double latitude, double longitude, double altitude);
+        double latitude, double longitude, std::optional<double> altitude = std::nullopt);
 
     glm::dvec3 geoPosition() const;
 
+    double altitudeFromCamera(const globebrowsing::RenderableGlobe& globe,
+        bool useHeightMap = false) const;
+
     globebrowsing::cache::MemoryAwareTileCache* tileCache();
     scripting::LuaLibrary luaLibrary() const override;
     std::vector<documentation::Documentation> documentations() const override;
@@ -103,14 +106,13 @@ protected:
 
 private:
     void goToChunk(const globebrowsing::RenderableGlobe& globe,
-        const globebrowsing::TileIndex& ti, const glm::vec2& uv,
-        bool doResetCameraDirection);
+        const globebrowsing::TileIndex& ti, const glm::vec2& uv);
 
     void goToGeodetic2(const globebrowsing::RenderableGlobe& globe,
-        globebrowsing::Geodetic2 geo2, bool doResetCameraDirection);
+        globebrowsing::Geodetic2 geo2);
 
     void goToGeodetic3(const globebrowsing::RenderableGlobe& globe,
-        globebrowsing::Geodetic3 geo3, bool doResetCameraDirection);
+        globebrowsing::Geodetic3 geo3);
 
     properties::UIntProperty _tileCacheSizeMB;
 
diff --git a/modules/globebrowsing/globebrowsingmodule_lua.inl b/modules/globebrowsing/globebrowsingmodule_lua.inl
index 470437ae95..8cdb4d64ed 100644
--- a/modules/globebrowsing/globebrowsingmodule_lua.inl
+++ b/modules/globebrowsing/globebrowsingmodule_lua.inl
@@ -278,72 +278,87 @@ namespace {
 }
 
 /**
- * Go to geographic coordinates of a globe. The first (optional) argument is the
- * identifier of a scene graph node that has a RenderableGlobe attached. If the name of
- * the globe is empty, the current anchor will be used. The second argument is latitude
- * and the third is longitude (degrees). North and East are expressed as positive angles,
- * while South and West are negative. The optional fourth argument is the altitude in
- * meters. If no altitude is provided, the altitude will be kept as the current distance
- * to the surface of the specified globe.
+ * Immediately move the camera to a geographic coordinate on a globe by first fading the
+ * rendering to black, jump to the specified coordinate, and then fade in.
+ *
+ * This is done by triggering another script that handles the logic.
+ *
+ * \param globe The identifier of a scene graph node that has a RenderableGlobe attached.
+ *              If an empty string is provided, the current anchor node is used
+ * \param latitude The latitude of the target coordinate, in degrees
+ * \param longitude The longitude of the target coordinate, in degrees
+ * \param altitude An optional altitude, given in meters over the reference surface of
+ *                 the globe. If no altitude is provided, the altitude will be kept as
+ *                 the current distance to the reference surface of the specified globe.
+ * \param fadeDuration An optional duration for the fading. If not included, the
+ *                     property in Navigation Handler will be used
  */
-[[codegen::luawrap]] void goToGeo(std::string globe, double latitude, double longitude,
-                                  std::optional<double> altitude)
+[[codegen::luawrap]] void jumpToGeo(std::string globe, double latitude, double longitude,
+                                    std::optional<double> altitude,
+                                    std::optional<double> fadeDuration)
 {
     using namespace openspace;
     using namespace globebrowsing;
 
-    const SceneGraphNode* n;
-    if (!globe.empty()) {
-        n = sceneGraphNode(globe);
-        if (!n) {
-            throw ghoul::lua::LuaError("Unknown globe name: " + globe);
-        }
-    }
-    else {
-        n = global::navigationHandler->orbitalNavigator().anchorNode();
-        if (!n) {
-            throw ghoul::lua::LuaError("No anchor node is set");
-        }
-    }
-
-    const RenderableGlobe* gl = dynamic_cast<const RenderableGlobe*>(n->renderable());
-    if (!gl) {
-        throw ghoul::lua::LuaError(
-            "Current anchor node is not a RenderableGlobe. Either change the anchor "
-            "to a globe, or specify a globe identifier as the first argument"
-        );
-    }
+    std::string script;
 
     if (altitude.has_value()) {
-        global::moduleEngine->module<GlobeBrowsingModule>()->goToGeo(
-            *gl,
-            latitude,
-            longitude,
-            *altitude
+        script = std::format(
+            "openspace.globebrowsing.flyToGeo('{}', {}, {}, {}, 0)",
+            globe, latitude, longitude, *altitude
         );
     }
     else {
-        global::moduleEngine->module<GlobeBrowsingModule>()->goToGeo(
-            *gl,
-            latitude,
-            longitude
+        script = std::format(
+            "openspace.globebrowsing.flyToGeo2('{}', {}, {}, true, 0)",
+            globe, latitude, longitude
         );
     }
+
+    if (fadeDuration.has_value()) {
+        global::navigationHandler->triggerFadeToTransition(
+            std::move(script),
+            static_cast<float>(*fadeDuration)
+        );
+    }
+    else {
+        global::navigationHandler->triggerFadeToTransition(script);
+    }
 }
 
 /**
- * Fly the camera to geographic coordinates of a globe, using the path navigation system.
- * The first (optional) argument is the identifier of a scene graph node with a
- * RenderableGlobe. If the globe name is empty, the current anchor will be used. The
- * second and third argument is latitude and longitude (degrees). The fourth argument is
- * the altitude, in meters. The last two optional arguments are: a bool specifying whether
- * the up vector at the target position should be set to the globe's North vector, and a
- * duration for the motion, in seconds. Either of the two can be left out.
+ * Immediately move the camera to a geographic coordinate on a globe.
+ *
+ * \param globe The identifier of a scene graph node that has a RenderableGlobe attached.
+ *              If an empty string is provided, the current anchor node is used
+ * \param latitude The latitude of the target coordinate, in degrees
+ * \param longitude The longitude of the target coordinate, in degrees
+ * \param altitude An optional altitude, given in meters over the reference surface of
+ *                 the globe. If no altitude is provided, the altitude will be kept as
+ *                 the current distance to the reference surface of the specified globe.
  */
-[[codegen::luawrap]] void flyToGeo(std::string globe, double latitude,
-                                   double longitude, double altitude,
-                                   std::optional<double> duration,
-                                   std::optional<bool> shouldUseUpVector)
+[[codegen::luawrap("goToGeo")]] void goToGeoDeprecated(std::string globe, double latitude,
+                                                       double longitude,
+                                                       std::optional<double> altitude)
+{
+    LWARNINGC(
+        "Deprecation",
+        "'goToGeo' function is deprecated and should be replaced with 'jumpToGeo'"
+    );
+
+    return jumpToGeo(
+        std::move(globe),
+        latitude,
+        longitude,
+        altitude,
+        0
+    );
+}
+
+void flyToGeoInternal(std::string globe, double latitude,
+                      double longitude, std::optional<double> altitude,
+                      std::optional<double> duration,
+                      std::optional<bool> shouldUseUpVector)
 {
     using namespace openspace;
     using namespace globebrowsing;
@@ -364,7 +379,7 @@ namespace {
 
     const RenderableGlobe* gl = dynamic_cast<const RenderableGlobe*>(n->renderable());
     if (!gl) {
-        throw ghoul::lua::LuaError("Current anchor node is not a RenderableGlobe");
+        throw ghoul::lua::LuaError("The targetted node is not a RenderableGlobe");
     }
 
     auto module = global::moduleEngine->module<GlobeBrowsingModule>();
@@ -407,6 +422,72 @@ namespace {
     global::navigationHandler->pathNavigator().startPath();
 }
 
+/**
+ * Fly the camera to a geographic coordinate (latitude and longitude) on a globe, using
+ * the path navigation system.
+ *
+ * The distance to fly to can either be set to be the current distance of the camera to
+ * the target object, or the default distance from the path navigation system.
+ *
+ * \param globe The identifier of a scene graph node that has a RenderableGlobe attached.
+ *              If an empty string is provided, the current anchor node is used
+ * \param latitude The latitude of the target coordinate, in degrees
+ * \param longitude The longitude of the target coordinate, in degrees
+ * \param useCurrentDistance If true, use the current distance of the camera to the
+ *                           target globe when going to the specified position. If false,
+ *                           or not specified, set the distance based on the bounding
+ *                           sphere and the distance factor setting in Path Navigator
+ * \param duration An optional duration for the motion to take, in seconds. For example,
+ *                 a value of 5 means "fly to this position over a duration of 5 seconds"
+ * \param shouldUseUpVector If true, try to use the up-direction when computing the
+ *                          target position for the camera. For globes, this means that
+ *                          North should be up, in relation to the camera's view
+ *                          direction. Note that for this to take effect, rolling motions
+ *                          must be enabled in the Path Navigator settings.
+ */
+[[codegen::luawrap]] void flyToGeo2(std::string globe, double latitude, double longitude,
+                                    std::optional<bool> useCurrentDistance,
+                                    std::optional<double> duration,
+                                    std::optional<bool> shouldUseUpVector)
+{
+    using namespace openspace;
+
+    std::optional<double> altitude;
+    if (useCurrentDistance.has_value() && *useCurrentDistance) {
+        altitude = std::nullopt;
+    }
+    else {
+        altitude = global::navigationHandler->pathNavigator().defaultArrivalHeight(globe);
+    }
+
+    flyToGeoInternal(globe, latitude, longitude, std::nullopt, duration, shouldUseUpVector);
+}
+
+ /**
+  * Fly the camera to a geographic coordinate (latitude, longitude and altitude) on a globe,
+  * using the path navigation system.
+  *
+  * \param globe The identifier of a scene graph node that has a RenderableGlobe attached.
+  *              If an empty string is provided, the current anchor node is used
+  * \param latitude The latitude of the target coordinate, in degrees
+  * \param longitude The longitude of the target coordinate, in degrees
+  * \param altitude The altitude of the target coordinate, in meters
+  * \param duration An optional duration for the motion to take, in seconds. For example,
+  *                 a value of 5 means "fly to this position over a duration of 5 seconds"
+  * \param shouldUseUpVector If true, try to use the up-direction when computing the
+  *                          target position for the camera. For globes, this means that
+  *                          North should be up, in relation to the camera's view
+  *                          direction. Note that for this to take effect, rolling motions
+  *                          must be enabled in the Path Navigator settings.
+  */
+[[codegen::luawrap]] void flyToGeo(std::string globe, double latitude,
+                                   double longitude, double altitude,
+                                   std::optional<double> duration,
+                                   std::optional<bool> shouldUseUpVector)
+{
+    flyToGeoInternal(globe, latitude, longitude, altitude, duration, shouldUseUpVector);
+}
+
 /**
  * Returns a position in the local Cartesian coordinate system of the globe identified by
  * the first argument, that corresponds to the given geographic coordinates: latitude,
diff --git a/src/navigation/pathnavigator.cpp b/src/navigation/pathnavigator.cpp
index 7f9b400ae9..39cf783f09 100644
--- a/src/navigation/pathnavigator.cpp
+++ b/src/navigation/pathnavigator.cpp
@@ -446,6 +446,17 @@ double PathNavigator::findValidBoundingSphere(const SceneGraphNode* node) const
     return result;
 }
 
+double PathNavigator::defaultArrivalHeight(const std::string& sgnIdentifier) const {
+    const SceneGraphNode* node = sceneGraphNode(sgnIdentifier);
+    if (!node) {
+        LERROR(std::format("Could not find scene graph node '{}'", sgnIdentifier));
+        return 0.0;
+    }
+
+    const double radius = findValidBoundingSphere(node);
+    return radius * arrivalDistanceFactor();
+}
+
 const std::vector<SceneGraphNode*>& PathNavigator::relevantNodes() {
     if (!_hasInitializedRelevantNodes) {
         findRelevantNodes();
diff --git a/src/navigation/waypoint.cpp b/src/navigation/waypoint.cpp
index bb8be8f1c5..2bc6d64a43 100644
--- a/src/navigation/waypoint.cpp
+++ b/src/navigation/waypoint.cpp
@@ -197,7 +197,7 @@ Waypoint computeWaypointFromNodeInfo(const NodeCameraStateSpec& spec,
         const PathNavigator& navigator = global::navigationHandler->pathNavigator();
 
         const double radius = navigator.findValidBoundingSphere(targetNode);
-        const double defaultHeight = radius * navigator.arrivalDistanceFactor();
+        const double defaultHeight = navigator.defaultArrivalHeight(spec.identifier);
         const double height = spec.height.value_or(defaultHeight);
         const double distanceFromNodeCenter = radius + height;
 

From 6edea5cae7b6d19db17a350f75ef14860bcef63b Mon Sep 17 00:00:00 2001
From: Alexander Bock <alexander.bock@liu.se>
Date: Tue, 4 Jun 2024 16:28:52 +0200
Subject: [PATCH 478/701] Apply the hue, value, saturation, and gamma values
 from the renderengine to screenspace renderables.  Change the screenspace's
 own gamma value into an offset (#3293)

* Apply the hue, value, saturation, and gamma values from the renderengine to screenspace renderables.  Change the screenspace's own gamma value into an offset

* Make it clearer that the gamma correction is now an offset
---
 .../rendering/screenspacerenderable.h         | 17 +++++++---
 .../base/rendering/screenspaceframebuffer.cpp |  4 +--
 .../base/rendering/screenspaceframebuffer.h   |  2 +-
 modules/base/shaders/screenspace_fs.glsl      | 15 +++++++-
 .../include/screenspaceskybrowser.h           |  2 +-
 .../skybrowser/src/screenspaceskybrowser.cpp  |  6 ++--
 modules/video/include/screenspacevideo.h      |  2 +-
 modules/video/src/screenspacevideo.cpp        |  4 +--
 .../webbrowser/include/screenspacebrowser.h   |  2 +-
 modules/webbrowser/src/screenspacebrowser.cpp |  4 +--
 src/rendering/renderengine.cpp                |  9 ++++-
 src/rendering/screenspacerenderable.cpp       | 34 +++++++++++--------
 12 files changed, 67 insertions(+), 34 deletions(-)

diff --git a/include/openspace/rendering/screenspacerenderable.h b/include/openspace/rendering/screenspacerenderable.h
index ae6e4cd9f6..ae37a25c30 100644
--- a/include/openspace/rendering/screenspacerenderable.h
+++ b/include/openspace/rendering/screenspacerenderable.h
@@ -61,7 +61,14 @@ public:
     ScreenSpaceRenderable(const ghoul::Dictionary& dictionary);
     virtual ~ScreenSpaceRenderable() override;
 
-    virtual void render(float blackoutFactor);
+    struct RenderData {
+        float blackoutFactor;
+        float hue;
+        float value;
+        float saturation;
+        float gamma;
+    };
+    virtual void render(const RenderData& renderData);
 
     virtual bool initialize();
     virtual bool initializeGL();
@@ -102,7 +109,7 @@ protected:
     glm::vec3 raeToCartesian(const glm::vec3& rae) const;
     glm::vec3 cartesianToRae(const glm::vec3& cartesian) const;
 
-    void draw(const glm::mat4& modelTransform, float blackoutFactor);
+    void draw(const glm::mat4& modelTransform, const RenderData& renderData);
 
     virtual void bindTexture() = 0;
     virtual void unbindTexture();
@@ -135,14 +142,14 @@ protected:
     properties::Vec3Property _borderColor;
 
     properties::FloatProperty _scale;
-    properties::FloatProperty _gamma;
+    properties::FloatProperty _gammaOffset;
     properties::Vec3Property _multiplyColor;
     properties::Vec4Property _backgroundColor;
     properties::TriggerProperty _delete;
 
     glm::ivec2 _objectSize = glm::ivec2(0);
-    UniformCache(color, opacity, blackoutFactor, mvpMatrix, tex, backgroundColor, gamma,
-        borderColor, borderWidth) _uniformCache;
+    UniformCache(color, opacity, blackoutFactor, hue, value, saturation, mvpMatrix, tex,
+        backgroundColor, gamma, borderColor, borderWidth) _uniformCache;
     std::unique_ptr<ghoul::opengl::ProgramObject> _shader;
 };
 
diff --git a/modules/base/rendering/screenspaceframebuffer.cpp b/modules/base/rendering/screenspaceframebuffer.cpp
index ff3e6017d5..cd92855cc7 100644
--- a/modules/base/rendering/screenspaceframebuffer.cpp
+++ b/modules/base/rendering/screenspaceframebuffer.cpp
@@ -104,7 +104,7 @@ bool ScreenSpaceFramebuffer::deinitializeGL() {
     return true;
 }
 
-void ScreenSpaceFramebuffer::render(float blackoutFactor) {
+void ScreenSpaceFramebuffer::render(const RenderData& renderData) {
     const glm::vec2& resolution = global::windowDelegate->currentDrawBufferResolution();
     const glm::vec4& size = _size.value();
 
@@ -144,7 +144,7 @@ void ScreenSpaceFramebuffer::render(float blackoutFactor) {
             glm::vec3((1.f / xratio), (1.f / yratio), 1.f)
         );
         const glm::mat4 modelTransform = globalRotation*translation*localRotation*scale;
-        draw(modelTransform, blackoutFactor);
+        draw(modelTransform, renderData);
     }
 }
 
diff --git a/modules/base/rendering/screenspaceframebuffer.h b/modules/base/rendering/screenspaceframebuffer.h
index b00300c9dc..0f274631fb 100644
--- a/modules/base/rendering/screenspaceframebuffer.h
+++ b/modules/base/rendering/screenspaceframebuffer.h
@@ -53,7 +53,7 @@ public:
 
     bool initializeGL() override;
     bool deinitializeGL() override;
-    void render(float blackoutFactor) override;
+    void render(const RenderData& renderData) override;
     bool isReady() const override;
 
     void setSize(glm::vec4 size);
diff --git a/modules/base/shaders/screenspace_fs.glsl b/modules/base/shaders/screenspace_fs.glsl
index b39f95c81a..cf4f9b721a 100644
--- a/modules/base/shaders/screenspace_fs.glsl
+++ b/modules/base/shaders/screenspace_fs.glsl
@@ -23,6 +23,7 @@
  ****************************************************************************************/
 
 #include "fragment.glsl"
+#include "hdr.glsl"
 #include "PowerScaling/powerScaling_fs.hglsl"
 
 in vec2 vs_st;
@@ -33,6 +34,9 @@ uniform vec3 color = vec3(1.0);
 uniform float opacity = 1.0;
 uniform float blackoutFactor = 1.0;
 uniform vec4 backgroundColor = vec4(0.0);
+uniform float hue;
+uniform float value;
+uniform float saturation;
 uniform float gamma = 1.0;
 uniform vec2 borderWidth = vec2(0.1);
 uniform vec3 borderColor = vec3(0.0);
@@ -57,6 +61,15 @@ Fragment getFragment() {
   }
 
   frag.depth = vs_depth;
-  frag.color.rgb = pow(frag.color.rgb, vec3(1.0/(gamma))) * blackoutFactor;
+
+  vec3 hsvColor = rgb2hsv(frag.color.rgb);
+  hsvColor.x = (hsvColor.x + hue);
+  if (hsvColor.x > 360.0) {
+    hsvColor -= 360.0;
+  }
+  hsvColor.y = clamp(hsvColor.y * saturation, 0.0, 1.0);
+  hsvColor.z = clamp(hsvColor.z * value, 0.0, 1.0);
+
+  frag.color.rgb = gammaCorrection(hsv2rgb(hsvColor), gamma) * blackoutFactor;
   return frag;
 }
diff --git a/modules/skybrowser/include/screenspaceskybrowser.h b/modules/skybrowser/include/screenspaceskybrowser.h
index 67ff217873..acfd47fbd4 100644
--- a/modules/skybrowser/include/screenspaceskybrowser.h
+++ b/modules/skybrowser/include/screenspaceskybrowser.h
@@ -43,7 +43,7 @@ public:
     bool initializeGL() override;
     bool deinitializeGL() override;
     glm::mat4 scaleMatrix() override;
-    void render(float blackoutFactor) override;
+    void render(const RenderData& renderData) override;
     void update() override;
 
     float opacity() const noexcept override;
diff --git a/modules/skybrowser/src/screenspaceskybrowser.cpp b/modules/skybrowser/src/screenspaceskybrowser.cpp
index 3a1f7ea375..388fe3fb6f 100644
--- a/modules/skybrowser/src/screenspaceskybrowser.cpp
+++ b/modules/skybrowser/src/screenspaceskybrowser.cpp
@@ -320,7 +320,7 @@ bool ScreenSpaceSkyBrowser::deinitializeGL() {
     return true;
 }
 
-void ScreenSpaceSkyBrowser::render(float blackoutFactor) {
+void ScreenSpaceSkyBrowser::render(const RenderData& renderData) {
     WwtCommunicator::render();
 
     if (!_isHidden) {
@@ -329,7 +329,7 @@ void ScreenSpaceSkyBrowser::render(float blackoutFactor) {
             translationMatrix() *
             localRotationMatrix() *
             scaleMatrix();
-        draw(mat, blackoutFactor);
+        draw(mat, renderData);
     }
 
     // Render the display copies
@@ -353,7 +353,7 @@ void ScreenSpaceSkyBrowser::render(float blackoutFactor) {
                 glm::translate(glm::mat4(1.f), coordinates) *
                 localRotation *
                 scaleMatrix();
-            draw(mat, blackoutFactor);
+            draw(mat, renderData);
         }
     }
 }
diff --git a/modules/video/include/screenspacevideo.h b/modules/video/include/screenspacevideo.h
index b373576e4a..a11fa0ef54 100644
--- a/modules/video/include/screenspacevideo.h
+++ b/modules/video/include/screenspacevideo.h
@@ -43,7 +43,7 @@ public:
     bool initializeGL() override;
     bool deinitializeGL() override;
     void update() override;
-    void render(float blackoutFactor) override;
+    void render(const RenderData& renderData) override;
 
     static documentation::Documentation Documentation();
 
diff --git a/modules/video/src/screenspacevideo.cpp b/modules/video/src/screenspacevideo.cpp
index fed1d4b58b..637a2600bc 100644
--- a/modules/video/src/screenspacevideo.cpp
+++ b/modules/video/src/screenspacevideo.cpp
@@ -76,9 +76,9 @@ void ScreenSpaceVideo::update() {
     }
 }
 
-void ScreenSpaceVideo::render(float blackoutFactor) {
+void ScreenSpaceVideo::render(const RenderData& renderData) {
     if (_videoPlayer.isInitialized()) {
-        ScreenSpaceRenderable::render(blackoutFactor);
+        ScreenSpaceRenderable::render(renderData);
     }
 }
 
diff --git a/modules/webbrowser/include/screenspacebrowser.h b/modules/webbrowser/include/screenspacebrowser.h
index 2bf402fc77..f08e371308 100644
--- a/modules/webbrowser/include/screenspacebrowser.h
+++ b/modules/webbrowser/include/screenspacebrowser.h
@@ -68,7 +68,7 @@ public:
     bool initializeGL() override;
     bool deinitializeGL() override;
 
-    void render(float blackoutFactor) override;
+    void render(const RenderData& renderData) override;
     void update() override;
     bool isReady() const override;
 
diff --git a/modules/webbrowser/src/screenspacebrowser.cpp b/modules/webbrowser/src/screenspacebrowser.cpp
index c540667265..6fbb0f303b 100644
--- a/modules/webbrowser/src/screenspacebrowser.cpp
+++ b/modules/webbrowser/src/screenspacebrowser.cpp
@@ -166,7 +166,7 @@ bool ScreenSpaceBrowser::deinitializeGL() {
     return ScreenSpaceRenderable::deinitializeGL();
 }
 
-void ScreenSpaceBrowser::render(float blackoutFactor) {
+void ScreenSpaceBrowser::render(const RenderData& renderData) {
     if (!_renderHandler->isTextureReady()) {
         return;
     }
@@ -177,7 +177,7 @@ void ScreenSpaceBrowser::render(float blackoutFactor) {
         translationMatrix() *
         localRotationMatrix() *
         scaleMatrix();
-    draw(mat, blackoutFactor);
+    draw(mat, renderData);
 }
 
 void ScreenSpaceBrowser::update() {
diff --git a/src/rendering/renderengine.cpp b/src/rendering/renderengine.cpp
index 1dfe4f7e7e..0a076d0635 100644
--- a/src/rendering/renderengine.cpp
+++ b/src/rendering/renderengine.cpp
@@ -759,8 +759,15 @@ void RenderEngine::render(const glm::mat4& sceneMatrix, const glm::mat4& viewMat
         glDisable(GL_DEPTH_TEST);
         glEnable(GL_BLEND);
         glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
+        ScreenSpaceRenderable::RenderData data = {
+            .blackoutFactor = combinedBlackoutFactor(),
+            .hue = _hue / 360.f,
+            .value = _value,
+            .saturation = _saturation,
+            .gamma = _gamma
+        };
         for (ScreenSpaceRenderable* ssr : ssrs) {
-            ssr->render(combinedBlackoutFactor());
+            ssr->render(data);
         }
         glDisable(GL_BLEND);
     }
diff --git a/src/rendering/screenspacerenderable.cpp b/src/rendering/screenspacerenderable.cpp
index 152cc4b056..f4b85bd084 100644
--- a/src/rendering/screenspacerenderable.cpp
+++ b/src/rendering/screenspacerenderable.cpp
@@ -146,10 +146,11 @@ namespace {
         openspace::properties::Property::Visibility::NoviceUser
     };
 
-    constexpr openspace::properties::Property::PropertyInfo GammaInfo = {
-        "Gamma",
-        "Gamma Correction",
-        "Sets the gamma correction of the texture.",
+    constexpr openspace::properties::Property::PropertyInfo GammaOffsetInfo = {
+        "GammaOffset",
+        "Gamma Correction Offset",
+        "Sets the gamma correction of the texture that is applied in addition to the "
+        "global gamma value.",
         openspace::properties::Property::Visibility::AdvancedUser
     };
 
@@ -223,8 +224,8 @@ namespace {
         // [[codegen::verbatim(ScaleInfo.description)]]
         std::optional<float> scale;
 
-        // [[codegen::verbatim(GammaInfo.description)]]
-        std::optional<float> gamma;
+        // [[codegen::verbatim(GammaOffsetInfo.description)]]
+        std::optional<float> gammaOffset;
 
         // [[codegen::verbatim(UsePerspectiveProjectionInfo.description)]]
         std::optional<bool> usePerspectiveProjection;
@@ -317,7 +318,7 @@ ScreenSpaceRenderable::ScreenSpaceRenderable(const ghoul::Dictionary& dictionary
     , _borderWidth(BorderWidthInfo, 0.f, 0.f, 1000.f)
     , _borderColor(BorderColorInfo, glm::vec3(0.f), glm::vec3(0.f), glm::vec3(1.f))
     , _scale(ScaleInfo, 0.25f, 0.f, 2.f)
-    , _gamma(GammaInfo, 1.f, 0.000001f, 10.f)
+    , _gammaOffset(GammaOffsetInfo, 0.f, -1.f, 10.f)
     , _multiplyColor(MultiplyColorInfo, glm::vec3(1.f), glm::vec3(0.f), glm::vec3(1.f))
     , _backgroundColor(
         BackgroundColorInfo,
@@ -345,7 +346,7 @@ ScreenSpaceRenderable::ScreenSpaceRenderable(const ghoul::Dictionary& dictionary
     addProperty(_faceCamera);
     addProperty(_cartesianPosition);
     addProperty(_raePosition);
-    addProperty(_gamma);
+    addProperty(_gammaOffset);
 
     // Setting spherical/euclidean onchange handler
     _useRadiusAzimuthElevation.onChange([this]() {
@@ -379,7 +380,7 @@ ScreenSpaceRenderable::ScreenSpaceRenderable(const ghoul::Dictionary& dictionary
     _backgroundColor.setViewOption(properties::Property::ViewOptions::Color);
 
     _enabled = p.enabled.value_or(_enabled);
-    _gamma = p.gamma.value_or(_gamma);
+    _gammaOffset = p.gammaOffset.value_or(_gammaOffset);
 
     _useRadiusAzimuthElevation =
         p.useRadiusAzimuthElevation.value_or(_useRadiusAzimuthElevation);
@@ -453,7 +454,7 @@ bool ScreenSpaceRenderable::deinitializeGL() {
     return true;
 }
 
-void ScreenSpaceRenderable::render(float blackoutFactor) {
+void ScreenSpaceRenderable::render(const RenderData& renderData) {
     ZoneScoped;
 
     const glm::mat4 mat =
@@ -461,7 +462,7 @@ void ScreenSpaceRenderable::render(float blackoutFactor) {
         translationMatrix() *
         localRotationMatrix() *
         scaleMatrix();
-    draw(mat, blackoutFactor);
+    draw(mat, renderData);
 }
 
 bool ScreenSpaceRenderable::isReady() const {
@@ -640,7 +641,9 @@ glm::mat4 ScreenSpaceRenderable::translationMatrix() {
     return glm::translate(glm::mat4(1.f), translation);
 }
 
-void ScreenSpaceRenderable::draw(const glm::mat4& modelTransform, float blackoutFactor) {
+void ScreenSpaceRenderable::draw(const glm::mat4& modelTransform,
+                                 const RenderData& renderData)
+{
     glDisable(GL_CULL_FACE);
 
     _shader->activate();
@@ -654,10 +657,13 @@ void ScreenSpaceRenderable::draw(const glm::mat4& modelTransform, float blackout
     _shader->setUniform(_uniformCache.opacity, opacity());
     _shader->setUniform(
         _uniformCache.blackoutFactor,
-        _renderDuringBlackout ? 1.f : blackoutFactor
+        _renderDuringBlackout ? 1.f : renderData.blackoutFactor
     );
+    _shader->setUniform(_uniformCache.hue, renderData.hue);
+    _shader->setUniform(_uniformCache.value, renderData.value);
+    _shader->setUniform(_uniformCache.saturation, renderData.saturation);
+    _shader->setUniform(_uniformCache.gamma, renderData.gamma + _gammaOffset);
     _shader->setUniform(_uniformCache.backgroundColor, _backgroundColor);
-    _shader->setUniform(_uniformCache.gamma, _gamma);
     _shader->setUniform(_uniformCache.borderWidth, borderUV);
     _shader->setUniform(_uniformCache.borderColor, _borderColor);
     _shader->setUniform(

From 32867630cc0510d5cd879f08a19b962033264bc9 Mon Sep 17 00:00:00 2001
From: Alexander Bock <alexander.bock@liu.se>
Date: Tue, 4 Jun 2024 16:29:33 +0200
Subject: [PATCH 479/701] Add an explicit layer order to globebrowsing layers
 rather than relying on insertion order (#3281)

* Add z-index feature for layers
* Give all default layers a z-index
* The given z-index makes the layers have the same order as in 0.19.0
* Giving z-indices to all non-overlay layers
* Remove the z-index adjustment for manual layers
* Added zIndex parsing for .info files (#3298)
* No need to explicitly check the zIndex against an empty string.  Make similar check for identifier work correctly

---------

Co-authored-by: Malin E <malin.ejdbo@gmail.com>
Co-authored-by: Micah Acinapura <micahnyc@gmail.com>
---
 .../ceres/layers/colorlayers/lamo.asset       |  1 +
 .../ceres/layers/colorlayers/lamo_local.asset |  1 +
 .../layers/colorlayers/greyscale_usgs.asset   |  1 +
 .../layers/colorlayers/greyscale_usgs.asset   |  1 +
 .../bastille_day/magnetogram_textures.asset   |  1 +
 .../solarsystem/planets/base_layers.asset     |  1 +
 .../planets/earth/eclipses/5000_years.asset   |  1 +
 ...om_w1_sea_ice_concentration_temporal.asset |  1 +
 .../colorlayers/aqua_modis_temporal.asset     |  1 +
 .../layers/colorlayers/blue_marble.asset      |  1 +
 .../layers/colorlayers/bmng_newyork.asset     |  1 +
 .../layers/colorlayers/bmng_sweden.asset      |  1 +
 .../earth/layers/colorlayers/bmng_utah.asset  |  1 +
 .../colorlayers/esri_noaa20_combo.asset       |  1 +
 .../layers/colorlayers/esri_viirs_combo.asset |  1 +
 .../colorlayers/esri_world_imagery.asset      |  1 +
 ...mur_sea_surface_temperature_temporal.asset |  1 +
 .../modis_terra_chlorophyll_a_temporal.asset  |  1 +
 .../colorlayers/terra_modis_temporal.asset    |  1 +
 .../colorlayers/viirs_noaa20_temporal.asset   |  1 +
 .../colorlayers/viirs_snpp_temporal.asset     |  1 +
 .../heightlayers/blue_marble_height.asset     |  1 +
 .../layers/heightlayers/terrain_tileset.asset |  1 +
 .../nightlayers/earth_at_night_2012.asset     |  1 +
 .../nightlayers/earth_at_night_temporal.asset |  1 +
 .../earth_at_night_temporal_blue_yellow.asset |  1 +
 .../nightlayers/earth_night_texture.asset     |  1 +
 .../layers/watermasks/gebco_newyork.asset     |  1 +
 .../layers/watermasks/gebco_sweden.asset      |  1 +
 .../earth/layers/watermasks/gebco_utah.asset  |  1 +
 .../layers/watermasks/modis_water_mask.asset  |  1 +
 .../apollo_15_metric_newyork.asset            |  1 +
 .../colorlayers/clemuvvis_newyork.asset       |  1 +
 .../layers/colorlayers/clemuvvis_sweden.asset |  1 +
 .../layers/colorlayers/clemuvvis_utah.asset   |  1 +
 .../layers/colorlayers/kaguya_newyork.asset   |  1 +
 .../layers/colorlayers/kaguya_sweden.asset    |  1 +
 .../moon/layers/colorlayers/kaguya_utah.asset |  1 +
 .../colorlayers/lo_mr_mosaic_newyork.asset    |  1 +
 .../colorlayers/lo_mr_mosaic_sweden.asset     |  1 +
 .../colorlayers/lola_clr_shade_newyork.asset  |  1 +
 .../colorlayers/lola_clr_shade_sweden.asset   |  1 +
 .../colorlayers/lola_clr_shade_utah.asset     |  1 +
 .../colorlayers/lola_shade_newyork.asset      |  1 +
 .../colorlayers/lola_shade_sweden.asset       |  1 +
 .../layers/colorlayers/lola_shade_utah.asset  |  1 +
 .../layers/colorlayers/moon_texture.asset     |  1 +
 .../colorlayers/uvvishybrid_newyork.asset     |  1 +
 .../colorlayers/uvvishybrid_sweden.asset      |  1 +
 .../layers/colorlayers/uvvishybrid_utah.asset |  1 +
 .../moon/layers/colorlayers/wac_newyork.asset |  1 +
 .../moon/layers/colorlayers/wac_sweden.asset  |  1 +
 .../moon/layers/colorlayers/wac_utah.asset    |  1 +
 .../layers/colorlayers/wac_v1_newyork.asset   |  1 +
 .../layers/colorlayers/wac_v1_sweden.asset    |  1 +
 .../moon/layers/colorlayers/wac_v1_utah.asset |  1 +
 .../layers/heightlayers/loladem_newyork.asset |  1 +
 .../layers/heightlayers/loladem_sweden.asset  |  1 +
 .../layers/heightlayers/loladem_utah.asset    |  1 +
 .../nasa-treks/Apollo_15_Metric_Cam_DEM.asset |  4 +
 .../nasa-treks/Apollo_15_Pan_Cam_DEM.asset    |  3 +
 .../Apollo_15_Pan_Cam_Image_Mosaic.asset      |  3 +
 .../nasa-treks/Apollo_16_Metric_Cam_DEM.asset |  3 +
 .../nasa-treks/Apollo_17_Metric_Cam_DEM.asset |  2 +
 .../nasa-treks/Apollo_Zone_Metric_Cam.asset   |  1 +
 .../Apollo_Zone_Metric_Cam_DEM.asset          |  1 +
 .../earth/moon/nasa-treks/Global.asset        | 19 ++++
 .../Kaguya_LGM2011_Freeair_Gravity.asset      |  2 +
 .../Kaguya_LGM2011_Surface_Gravity.asset      |  2 +
 .../nasa-treks/LOLA_Roughness_16ppd.asset     |  1 +
 .../moon/nasa-treks/LOLA_Slope_16ppd.asset    |  1 +
 .../LOLA_Slope_Northpole_120m.asset           |  1 +
 .../LOLA_Slope_Southpole_120m.asset           |  1 +
 .../LOLA_and_TC_Stereo_DEM_Merge_512ppd.asset |  1 +
 ..._of_Region_Inside_Schrodinger_Crater.asset |  1 +
 ...trolled_Mosaic_of_Schrodinger_Crater.asset |  1 +
 .../nasa-treks/LRO_Diviner_CF_Mosaic.asset    |  1 +
 .../LRO_Diviner_CF_Mosaic_128ppd.asset        |  1 +
 .../LRO_Diviner_Surface_Temp_Avg.asset        |  1 +
 .../LRO_Diviner_Surface_Temp_Normal_Avg.asset |  1 +
 ...er_Surface_Temperature_Mosaic_128ppd.asset |  1 +
 .../earth/moon/nasa-treks/LRO_LOLA_DEM.asset  |  7 ++
 .../LRO_LROC_Crater_Abundance.asset           | 23 +++++
 .../LRO_LROC_Crater_Abundance_Hazard.asset    | 23 +++++
 .../nasa-treks/LRO_LROC_Crater_Density.asset  | 23 +++++
 .../LRO_LROC_Crater_Density_Hazard.asset      | 23 +++++
 .../earth/moon/nasa-treks/LRO_LROC_DEM.asset  | 43 +++++++++
 .../nasa-treks/LRO_LROC_Image_Mosaic.asset    | 34 +++++++
 .../LRO_LROC_Image_Mosaic_26cm.asset          |  1 +
 .../LRO_LROC_Image_Mosaic_28cm.asset          |  1 +
 .../moon/nasa-treks/LRO_LROC_Mosaic.asset     |  1 +
 .../LRO_LROC_NAC_Image_Mosaic.asset           |  2 +
 .../nasa-treks/LRO_LROC_Rock_Abundance.asset  | 23 +++++
 .../LRO_LROC_Rock_Abundance_Hazard.asset      | 23 +++++
 .../nasa-treks/LRO_LROC_Rock_Density.asset    | 24 +++++
 .../LRO_LROC_Rock_Density_Hazard.asset        | 22 +++++
 .../moon/nasa-treks/LRO_Laser_Altimeter.asset |  1 +
 ..._Mini-RF_Circular_Polarization_Ratio.asset |  1 +
 .../nasa-treks/LRO_NAC_ColorHillshade.asset   |  1 +
 .../moon/nasa-treks/LRO_NAC_Mosaic.asset      |  1 +
 .../nasa-treks/LRO_NAC_Mosaic_0.5mpp.asset    |  1 +
 .../moon/nasa-treks/LRO_NAC_Mosaic_1mpp.asset |  1 +
 .../nasa-treks/LRO_NAC_PSR_Mosaic_20mpp.asset |  2 +
 .../LRO_NAC_and_CE-2_CCD_Mosaic_1mpp.asset    |  1 +
 .../nasa-treks/LRO_Narrow_Angle_Camera.asset  | 25 ++++++
 .../moon/nasa-treks/LRO_WAC-GLD100_DEM.asset  |  1 +
 .../moon/nasa-treks/LRO_WAC_GLD100_DEM.asset  |  2 +
 ..._Kaguya_Multi_Instruments_1895.21mpp.asset |  5 ++
 .../atmosphere/2000_carbon_monoxide.asset     |  1 +
 .../atmosphere/2004_ir_hurricane.asset        |  1 +
 .../atmosphere/2005_hurricane-grayir.asset    |  1 +
 .../atmosphere/2005_hurricane-wvsst.asset     |  1 +
 .../noaa-sos/atmosphere/2012_hurricane.asset  |  2 +
 .../atmosphere/aerosol_blackcarbon.asset      |  1 +
 .../aerosol_blackcarbon_and_sulfate.asset     |  1 +
 .../noaa-sos/atmosphere/aerosol_sulfate.asset |  1 +
 .../noaa-sos/atmosphere/airtraffic.asset      |  1 +
 .../earth/noaa-sos/atmosphere/all_sats.asset  |  1 +
 .../noaa-sos/atmosphere/aqua_swath.asset      |  1 +
 .../noaa-sos/atmosphere/carbonflux.asset      |  1 +
 .../carbontracker_2000_2100-fixed_scale.asset |  2 +
 ...arbontracker_2000_2100-sliding_scale.asset |  2 +
 .../noaa-sos/atmosphere/climate_niche.asset   |  5 ++
 .../earth/noaa-sos/atmosphere/co_gmd.asset    |  1 +
 .../earth/noaa-sos/atmosphere/fim_chem.asset  |  1 +
 .../noaa-sos/atmosphere/fossil_fuel.asset     |  1 +
 .../earth/noaa-sos/atmosphere/fukushima.asset |  1 +
 .../earth/noaa-sos/atmosphere/geo_sat.asset   |  1 +
 .../earth/noaa-sos/atmosphere/geo_scan.asset  |  1 +
 .../noaa-sos/atmosphere/giss_temp_anom.asset  |  1 +
 .../atmosphere/globe-insolation.asset         |  1 +
 .../noaa-sos/atmosphere/globe-rainfall.asset  |  1 +
 .../atmosphere/harvey-clouds_precip.asset     |  1 +
 .../atmosphere/hurricane_season_2017.asset    |  1 +
 .../hurricane_season_2017_wvsst.asset         |  1 +
 .../hurricane_tracks-cumulative.asset         |  1 +
 .../earth/noaa-sos/atmosphere/isaac.asset     |  2 +
 .../earth/noaa-sos/atmosphere/iss_track.asset |  1 +
 .../earth/noaa-sos/atmosphere/land_temp.asset |  1 +
 .../earth/noaa-sos/atmosphere/lightning.asset |  1 +
 .../noaa-sos/atmosphere/ltg_vaisala.asset     |  1 +
 .../earth/noaa-sos/atmosphere/nasa_sats.asset |  1 +
 .../atmosphere/nccs_models-carbon.asset       |  1 +
 .../atmosphere/nccs_models-chem.asset         |  1 +
 .../atmosphere/nccs_models-winds.asset        |  1 +
 .../earth/noaa-sos/atmosphere/no2_omsi.asset  |  1 +
 .../noaa-sos/atmosphere/noaa_sat-tracks.asset |  1 +
 .../earth/noaa-sos/atmosphere/pclim.asset     |  1 +
 .../earth/noaa-sos/atmosphere/poes_sat.asset  |  1 +
 .../atmosphere/reanalysis-antarctic.asset     |  1 +
 .../atmosphere/reanalysis-elnino.asset        |  1 +
 .../atmosphere/reanalysis-hurricane.asset     |  1 +
 .../earth/noaa-sos/atmosphere/sandy.asset     |  1 +
 .../noaa-sos/atmosphere/sunsync_sat.asset     |  1 +
 .../earth/noaa-sos/atmosphere/temp_anom.asset |  1 +
 .../atmosphere/tropical_widening.asset        |  1 +
 .../atmosphere/typhoon_haiyan-wvsst.asset     |  1 +
 .../noaa-sos/atmosphere/typhoon_haiyan.asset  |  1 +
 .../noaa-sos/atmosphere/volcano_ash.asset     |  1 +
 .../noaa-sos/land/agriculture-cropland.asset  |  2 +
 .../land/agriculture-pastureland.asset        |  2 +
 .../planets/earth/noaa-sos/land/birds.asset   |  2 +
 .../land/blue_marble-blue_marble.asset        |  1 +
 .../land/blue_marble-blue_marble_topo.asset   |  1 +
 .../blue_marble-blue_marble_topo_bathy.asset  |  1 +
 .../land/blue_marble-nightlights.asset        |  1 +
 .../blue_marble-seasonal_blue_marble.asset    |  1 +
 .../earth/noaa-sos/land/dams-global.asset     |  1 +
 .../noaa-sos/land/dams-mississippi.asset      |  1 +
 .../earth/noaa-sos/land/dams-yangtze.asset    |  1 +
 .../noaa-sos/land/day_night-06z_only.asset    |  1 +
 .../noaa-sos/land/day_night-full_year.asset   |  1 +
 .../noaa-sos/land/day_night-oneday.asset      |  1 +
 .../noaa-sos/land/earth_night-1992_2002.asset |  2 +
 .../noaa-sos/land/earth_night-1992_2008.asset |  1 +
 .../noaa-sos/land/earth_night-1992_2009.asset |  1 +
 .../noaa-sos/land/earth_night-2012.asset      |  1 +
 .../land/earth_night-color_nightlights.asset  |  1 +
 .../land/earth_night-nightlights.asset        |  1 +
 .../land/earthquake-1980_1995_quakes.asset    |  1 +
 .../noaa-sos/land/earthquake-2001_2015.asset  |  5 ++
 .../noaa-sos/land/earthquakes_1901_2000.asset |  5 ++
 .../land/earthquakes_and_eruptions.asset      |  1 +
 .../earths_magnetism_magnetic_lines.asset     |  1 +
 .../land/earths_magnetism_magnets.asset       |  1 +
 .../planets/earth/noaa-sos/land/etopo1.asset  |  1 +
 .../noaa-sos/land/etopo2-earth_bright.asset   |  1 +
 .../noaa-sos/land/etopo2-earth_color.asset    |  1 +
 .../noaa-sos/land/etopo2-earth_shaded.asset   |  1 +
 .../noaa-sos/land/etopo2-earth_topo.asset     |  1 +
 .../earth/noaa-sos/land/etopo2-landsat.asset  |  1 +
 .../planets/earth/noaa-sos/land/fire.asset    |  1 +
 .../earth/noaa-sos/land/fire_veg.asset        |  1 +
 .../land/flooding-displaced_250.asset         |  2 +
 .../earth/noaa-sos/land/flooding-fatal.asset  |  2 +
 .../noaa-sos/land/flooding-heavy_rain.asset   |  2 +
 .../noaa-sos/land/flooding-major_floods.asset |  2 +
 .../earth/noaa-sos/land/food_v_feed.asset     |  2 +
 .../planets/earth/noaa-sos/land/forests.asset |  5 ++
 .../noaa-sos/land/geomag_tracklines.asset     |  1 +
 .../noaa-sos/land/global_vegetation.asset     |  3 +
 .../earth/noaa-sos/land/gray_earth.asset      |  1 +
 .../earth/noaa-sos/land/hot_topo.asset        |  1 +
 .../noaa-sos/land/irsat_nightlights.asset     |  1 +
 .../earth/noaa-sos/land/japan_quake.asset     |  1 +
 .../koppen_climate-koppen_1901_2100.asset     |  1 +
 .../land/koppen_climate-koppen_2007.asset     |  1 +
 .../noaa-sos/land/land_cover-animation.asset  |  1 +
 .../noaa-sos/land/land_cover-ribbon.asset     |  1 +
 .../noaa-sos/land/land_cover-slideshow.asset  |  1 +
 .../land_production-cropland_current.asset    |  2 +
 .../land_production-cropland_potential.asset  |  2 +
 .../land/land_production-production_gap.asset |  2 +
 .../earth/noaa-sos/land/land_ratio.asset      |  1 +
 .../noaa-sos/land/latitude_longitude.asset    |  4 +
 .../noaa-sos/land/magnetic_declination.asset  |  1 +
 .../earth/noaa-sos/land/nightsky.asset        |  1 +
 .../noaa-sos/land/nuclear_earthquake.asset    |  5 ++
 .../earth/noaa-sos/land/paleo_map.asset       |  1 +
 .../earth/noaa-sos/land/paleo_overlays.asset  |  6 ++
 .../noaa-sos/land/pantropical_biomass.asset   |  1 +
 .../earth/noaa-sos/land/plate_movement.asset  |  1 +
 .../noaa-sos/land/river_discharge_2010.asset  |  1 +
 .../land/sea_floor_age-iso_lines_yellow.asset |  1 +
 .../land/sea_floor_age-shaded_veg.asset       |  4 +
 .../noaa-sos/land/sea_floor_age-topo.asset    |  3 +
 .../land/seismic_waves-1994northridge.asset   |  3 +
 .../land/species_richness-amphibians.asset    |  2 +
 ...ecies_richness-amphibians_threatened.asset |  2 +
 .../land/species_richness-birds.asset         |  2 +
 .../species_richness-birds_threatened.asset   |  2 +
 .../land/species_richness-mammals.asset       |  2 +
 .../species_richness-mammals_threatened.asset |  2 +
 .../noaa-sos/land/surface_temperature.asset   |  1 +
 .../earth/noaa-sos/land/top_quakes.asset      |  1 +
 .../noaa-sos/land/volcanoes-eruptions.asset   |  1 +
 .../land/volcanoes-global_volcanoes.asset     |  2 +
 .../noaa-sos/land/volcanoes-tsunami.asset     |  2 +
 .../earth/noaa-sos/models/bm10000.asset       |  1 +
 .../earth/noaa-sos/models/gfdl_seaice.asset   |  1 +
 .../noaa-sos/models/ipcc_temp-ccsm-a1b.asset  |  1 +
 .../noaa-sos/models/ipcc_temp-ccsm-b1.asset   |  1 +
 .../noaa-sos/models/ipcc_temp-compare.asset   |  5 +-
 .../noaa-sos/models/ipcc_temp-gfdl-a1b.asset  |  1 +
 .../noaa-sos/models/ipcc_temp-gfdl-b1.asset   |  1 +
 .../noaa-sos/models/ipcc_temp-had-a1b.asset   |  1 +
 .../noaa-sos/models/ipcc_temp-had-b1.asset    |  1 +
 .../earth/noaa-sos/models/rcp-ga26.asset      |  1 +
 .../earth/noaa-sos/models/rcp-ga45.asset      |  1 +
 .../earth/noaa-sos/models/rcp-ga60.asset      |  1 +
 .../earth/noaa-sos/models/rcp-ga85.asset      |  1 +
 .../earth/noaa-sos/models/ukmet-a1b.asset     |  1 +
 .../earth/noaa-sos/models/ukmet-e1.asset      |  1 +
 .../noaa-sos/oceans/2009_ice_animation.asset  |  1 +
 .../oceans/6m_sea_level_rise-black.asset      |  7 ++
 .../oceans/6m_sea_level_rise-red.asset        |  7 ++
 .../noaa-sos/oceans/animal_tracking.asset     |  1 +
 .../noaa-sos/oceans/argo_buoy_tracks.asset    |  1 +
 .../noaa-sos/oceans/argo_buoy_waterfall.asset |  1 +
 .../earth/noaa-sos/oceans/atl_turtle.asset    |  1 +
 .../noaa-sos/oceans/buoy_locations.asset      |  1 +
 .../earth/noaa-sos/oceans/catch_model.asset   |  1 +
 .../noaa-sos/oceans/chlorophyll_model.asset   |  1 +
 .../earth/noaa-sos/oceans/currents.asset      |  1 +
 .../earth/noaa-sos/oceans/dart_buoy.asset     |  1 +
 .../noaa-sos/oceans/ecco2_sst-gray_land.asset |  1 +
 .../noaa-sos/oceans/ecco2_sst-veg_land.asset  |  1 +
 .../earth/noaa-sos/oceans/elnino.asset        |  4 +
 .../oceans/gfdl_sst-black_background.asset    |  1 +
 .../oceans/gfdl_sst-land_background.asset     |  1 +
 .../noaa-sos/oceans/greenland_melt.asset      |  1 +
 .../earth/noaa-sos/oceans/japan_tsunami.asset |  1 +
 .../noaa-sos/oceans/japan_tsunami_waves.asset |  1 +
 .../oceans/loggerheadseaturtletracks.asset    |  1 +
 .../noaa-sos/oceans/marine_impacts.asset      |  1 +
 .../oceans/marine_life_tracking.asset         |  1 +
 .../oceans/mexico_turtles_947293.asset        |  1 +
 .../oceans/mexico_turtles_958002.asset        |  1 +
 .../earth/noaa-sos/oceans/modis_sst.asset     |  1 +
 .../earth/noaa-sos/oceans/nasa_speed.asset    |  1 +
 .../earth/noaa-sos/oceans/nasa_sst.asset      |  1 +
 .../noaa-sos/oceans/ocean_acid-co2_flux.asset |  1 +
 .../earth/noaa-sos/oceans/ocean_acid-ph.asset |  1 +
 .../oceans/ocean_acid-saturation.asset        |  1 +
 .../noaa-sos/oceans/ocean_depths_temp.asset   |  2 +
 .../noaa-sos/oceans/ocean_drain-gray.asset    |  1 +
 .../earth/noaa-sos/oceans/pac_turtle.asset    |  1 +
 .../earth/noaa-sos/oceans/phytoplankton.asset |  1 +
 .../earth/noaa-sos/oceans/pr_tsunami.asset    |  1 +
 .../earth/noaa-sos/oceans/reefs_risk.asset    |  3 +
 .../earth/noaa-sos/oceans/sea_level.asset     |  1 +
 .../noaa-sos/oceans/sea_level_trends.asset    |  1 +
 .../oceans/sea_surface_height_anomaly.asset   |  1 +
 .../noaa-sos/oceans/seaice_monthly.asset      |  1 +
 .../noaa-sos/oceans/seaice_radiation.asset    |  2 +
 .../oceans/seawifs-land_background.asset      |  1 +
 .../noaa-sos/oceans/seawifs-no_holes.asset    |  1 +
 .../noaa-sos/oceans/seawifs-polar_holes.asset |  1 +
 .../planets/earth/noaa-sos/oceans/shark.asset |  1 +
 .../noaa-sos/oceans/ship_tracks-mosaic.asset  |  1 +
 .../noaa-sos/oceans/ship_tracks-tracks.asset  |  1 +
 .../earth/noaa-sos/oceans/shipping.asset      |  1 +
 .../noaa-sos/oceans/species_richness.asset    |  1 +
 .../planets/earth/noaa-sos/oceans/sss.asset   |  1 +
 .../earth/noaa-sos/oceans/sst_1980_1999.asset |  1 +
 .../tsunami_historical_series-alaska.asset    |  4 +
 .../tsunami_historical_series-aleutians.asset |  4 +
 ...ami_historical_series-aleutians_1957.asset |  4 +
 .../tsunami_historical_series-cascadia.asset  |  4 +
 .../tsunami_historical_series-chile.asset     |  4 +
 .../tsunami_historical_series-japan.asset     |  4 +
 .../tsunami_historical_series-lisbon.asset    |  4 +
 .../tsunami_historical_series-samoa.asset     |  4 +
 .../tsunami_historical_series-sumatra.asset   |  4 +
 .../noaa-sos/oceans/tsunami_locations.asset   |  4 +
 .../earth/noaa-sos/oceans/vector_winds.asset  |  1 +
 .../oceans/vent_discoveries_animation.asset   |  1 +
 .../noaa-sos/oceans/vent_locations.asset      |  1 +
 .../earth/noaa-sos/oceans/vorticity.asset     |  1 +
 .../oceans/waves-wave_height_2012.asset       |  1 +
 .../oceans/waves-wave_height_katrina.asset    |  1 +
 .../oceans/waves-wave_height_sandy.asset      |  1 +
 .../oceans/waves-wave_power_2012.asset        |  1 +
 .../oceans/weeklyseaice-10day_seaice.asset    |  1 +
 .../oceans/weeklyseaice-sept_seaice.asset     |  1 +
 .../layers/colorlayers/callisto_texture.asset |  3 +-
 .../layers/colorlayers/europa_texture.asset   |  3 +-
 .../voyager_global_mosaic_local.asset         |  1 +
 .../voyager_global_mosaic_newyork.asset       |  1 +
 .../voyager_global_mosaic_sweden.asset        |  1 +
 .../layers/colorlayers/ganymede_texture.asset |  1 +
 .../io/layers/colorlayers/io_texture.asset    |  1 +
 .../layers/colorlayers/jupiter_texture.asset  |  1 +
 .../layers/colorlayers/jupiter_video.asset    |  1 +
 .../mars/layers/colorlayers/ctx_blended.asset |  1 +
 .../colorlayers/ctx_blended_beta01.asset      |  1 +
 .../colorlayers/ctx_mosaic_newyork.asset      |  1 +
 .../colorlayers/ctx_mosaic_sweden.asset       |  1 +
 .../layers/colorlayers/ctx_mosaic_utah.asset  |  1 +
 .../mars/layers/colorlayers/hirise.asset      |  1 +
 .../mars/layers/colorlayers/hirisels.asset    |  1 +
 .../layers/colorlayers/mars_texture.asset     |  1 +
 .../colorlayers/moc_wa_color_newyork.asset    |  1 +
 .../colorlayers/moc_wa_color_sweden.asset     |  1 +
 .../colorlayers/moc_wa_color_utah.asset       |  1 +
 .../colorlayers/mola_hrsc_newyork.asset       |  1 +
 .../layers/colorlayers/mola_hrsc_sweden.asset |  1 +
 .../layers/colorlayers/mola_hrsc_utah.asset   |  1 +
 .../mola_pseudo_color_newyork.asset           |  1 +
 .../mola_pseudo_color_sweden.asset            |  1 +
 .../colorlayers/mola_pseudo_color_utah.asset  |  1 +
 .../colorlayers/themis_ir_day_newyork.asset   |  1 +
 .../colorlayers/themis_ir_day_sweden.asset    |  1 +
 .../colorlayers/themis_ir_day_utah.asset      |  1 +
 .../colorlayers/themis_ir_night_newyork.asset |  1 +
 .../colorlayers/themis_ir_night_sweden.asset  |  1 +
 .../colorlayers/themis_ir_night_utah.asset    |  1 +
 .../colorlayers/viking_mdim_newyork.asset     |  1 +
 .../colorlayers/viking_mdim_sweden.asset      |  1 +
 .../layers/colorlayers/viking_mdim_utah.asset |  1 +
 .../mars/layers/heightlayers/hirisels.asset   |  1 +
 .../mars/layers/heightlayers/mdem200m.asset   |  1 +
 .../mars/layers/heightlayers/mola_amnh.asset  |  1 +
 .../layers/heightlayers/mola_sweden.asset     |  1 +
 .../mars/layers/heightlayers/mola_utah.asset  |  1 +
 .../mars/layers/nasa-treks/MEX_HRSC.asset     |  2 +
 .../layers/nasa-treks/MGS_MOC_Atlas.asset     |  1 +
 .../mars/layers/nasa-treks/MGS_MOLA.asset     |  3 +
 .../MGS_MOLA_and_Mars_Express_HRSC.asset      |  2 +
 .../mars/layers/nasa-treks/MGS_TES.asset      |  3 +
 .../layers/nasa-treks/MO_THEMIS-IR_Day.asset  |  1 +
 .../nasa-treks/MO_THEMIS-IR_Night.asset       |  1 +
 .../mars/layers/nasa-treks/MRO_CTX.asset      | 49 ++++++++++
 .../mars/layers/nasa-treks/MRO_HiRISE.asset   | 21 +++++
 .../planets/mars/layers/nasa-treks/MSL.asset  |  1 +
 .../layers/nasa-treks/Mars_Express_HRSC.asset |  7 ++
 .../Mars_Reconnaissance_Orbiter_CTX.asset     | 63 +++++++++++++
 .../layers/colorlayers/deimos_viking.asset    |  1 +
 .../layers/colorlayers/phobos_viking.asset    |  1 +
 .../layers/colorlayers/alsimap_02122015.asset |  1 +
 .../layers/colorlayers/casimap_02122015.asset |  1 +
 .../layers/colorlayers/fesimap_02122015.asset |  1 +
 .../layers/colorlayers/mercury_texture.asset  |  1 +
 .../colorlayers/messenger_bdr_newyork.asset   |  1 +
 .../colorlayers/messenger_bdr_sweden.asset    |  1 +
 .../colorlayers/messenger_bdr_utah.asset      |  1 +
 .../colorlayers/messenger_hie_newyork.asset   |  1 +
 .../colorlayers/messenger_hie_sweden.asset    |  1 +
 .../colorlayers/messenger_hie_utah.asset      |  1 +
 .../colorlayers/messenger_hiw_newyork.asset   |  1 +
 .../colorlayers/messenger_hiw_sweden.asset    |  1 +
 .../colorlayers/messenger_hiw_utah.asset      |  1 +
 .../colorlayers/messenger_loi_newyork.asset   |  1 +
 .../colorlayers/messenger_loi_sweden.asset    |  1 +
 .../colorlayers/messenger_loi_utah.asset      |  1 +
 .../colorlayers/messenger_mdis_newyork.asset  |  1 +
 .../colorlayers/messenger_mdis_sweden.asset   |  1 +
 .../colorlayers/messenger_mdis_utah.asset     |  1 +
 .../colorlayers/messenger_mdr_utah.asset      |  1 +
 .../messenger_mosaic2_newyork.asset           |  1 +
 .../messenger_mosaic2_sweden.asset            |  1 +
 .../colorlayers/messenger_mosaic2_utah.asset  |  1 +
 .../messenger_mosaic_newyork.asset            |  1 +
 .../colorlayers/messenger_mosaic_sweden.asset |  1 +
 .../colorlayers/messenger_mosaic_utah.asset   |  1 +
 .../colorlayers/messenger_mp3_utah.asset      |  1 +
 .../colorlayers/messenger_shade_newyork.asset |  1 +
 .../colorlayers/messenger_shade_sweden.asset  |  1 +
 .../colorlayers/messenger_shade_utah.asset    |  1 +
 .../layers/colorlayers/mgsimap_02122015.asset |  1 +
 .../layers/colorlayers/ssimap_02122015.asset  |  1 +
 .../heightlayers/messenger_dem_utah.asset     |  1 +
 .../mercury/layers/nasa-treks/MSGR_MDIS.asset |  3 +
 .../layers/nasa-treks/MSGR_MDIS_Mosaic.asset  | 10 +++
 .../layers/nasa-treks/MSGR_MDIS_Slope.asset   | 10 +++
 .../layers/colorlayers/neptune_texture.asset  |  1 +
 ...n_voyager2_clrmosaic_globalfill_600m.asset |  1 +
 .../layers/colorlayers/dione_texture.asset    |  1 +
 .../colorlayers/enceladus_texture.asset       |  1 +
 .../global_mosaic_100m_hpf_newyork.asset      |  1 +
 .../global_mosaic_100m_hpf_sweden.asset       |  1 +
 .../layers/colorlayers/iapetus_texture.asset  |  1 +
 .../layers/colorlayers/saturn_texture.asset   |  1 +
 .../layers/colorlayers/mimas_texture.asset    |  1 +
 .../layers/colorlayers/rhea_texture.asset     |  1 +
 .../layers/colorlayers/tethys_texture.asset   |  1 +
 .../cassini_iss_global_mosaic_4km_local.asset |  1 +
 ...assini_iss_global_mosaic_4km_newyork.asset |  1 +
 ...cassini_iss_global_mosaic_4km_sweden.asset |  1 +
 .../layers/colorlayers/uranus_texture.asset   |  1 +
 .../clouds_magellan_combo_newyork.asset       |  1 +
 .../clouds_magellan_combo_utah.asset          |  1 +
 .../colorlayers/magellan_mosaic_newyork.asset |  1 +
 .../colorlayers/magellan_mosaic_utah.asset    |  1 +
 .../layers/colorlayers/venus_texture.asset    |  2 +
 .../heightlayers/magellan_newyork.asset       |  1 +
 .../layers/heightlayers/magellan_utah.asset   |  1 +
 .../sun/layers/colorlayers/sun_texture.asset  |  1 +
 .../globebrowsing/scripts/layer_support.lua   | 11 ++-
 modules/globebrowsing/src/layer.cpp           | 50 +++++++++++
 modules/globebrowsing/src/layer.h             |  6 ++
 modules/globebrowsing/src/layergroup.cpp      | 89 +++++++++++++++++--
 442 files changed, 1179 insertions(+), 14 deletions(-)

diff --git a/data/assets/scene/solarsystem/dwarf_planets/ceres/layers/colorlayers/lamo.asset b/data/assets/scene/solarsystem/dwarf_planets/ceres/layers/colorlayers/lamo.asset
index 7511aa0966..7ddb152045 100644
--- a/data/assets/scene/solarsystem/dwarf_planets/ceres/layers/colorlayers/lamo.asset
+++ b/data/assets/scene/solarsystem/dwarf_planets/ceres/layers/colorlayers/lamo.asset
@@ -6,6 +6,7 @@ local Layer = {
   Identifier = "LAMO_Sweden",
   Name = "LAMO [Sweden]",
   Enabled = asset.enabled,
+  ZIndex = 10,
   FilePath = asset.resource("lamo.wms")
 }
 
diff --git a/data/assets/scene/solarsystem/dwarf_planets/ceres/layers/colorlayers/lamo_local.asset b/data/assets/scene/solarsystem/dwarf_planets/ceres/layers/colorlayers/lamo_local.asset
index 762b2f69af..a61d937273 100644
--- a/data/assets/scene/solarsystem/dwarf_planets/ceres/layers/colorlayers/lamo_local.asset
+++ b/data/assets/scene/solarsystem/dwarf_planets/ceres/layers/colorlayers/lamo_local.asset
@@ -14,6 +14,7 @@ local Layer = {
   Identifier = "LAMO_Local",
   Name = "LAMO [Local]",
   Enabled = asset.enabled,
+  ZIndex = 5,
   FilePath = textures .. "ceres_lamo_4096x2048.png",
   CacheSettings = { Enabled = false }
 }
diff --git a/data/assets/scene/solarsystem/dwarf_planets/pluto/charon/layers/colorlayers/greyscale_usgs.asset b/data/assets/scene/solarsystem/dwarf_planets/pluto/charon/layers/colorlayers/greyscale_usgs.asset
index 32022baf74..a13606eff1 100644
--- a/data/assets/scene/solarsystem/dwarf_planets/pluto/charon/layers/colorlayers/greyscale_usgs.asset
+++ b/data/assets/scene/solarsystem/dwarf_planets/pluto/charon/layers/colorlayers/greyscale_usgs.asset
@@ -6,6 +6,7 @@ local Layer = {
   Identifier = "Greyscale_USGS",
   Name = "Black & White [USGS]",
   Enabled = asset.enabled,
+  ZIndex = 10,
   FilePath = "WMS:https://planetarymaps.usgs.gov/cgi-bin/mapserv?map=/maps/pluto/charon_simp_cyl.map&SERVICE=WMS&VERSION=1.1.1&REQUEST=GetMap&LAYERS=NEWHORIZONS_CHARON_MOSAIC&SRS=EPSG:4326&BBOX=-180,-90.0003,359.972,90"
 }
 
diff --git a/data/assets/scene/solarsystem/dwarf_planets/pluto/layers/colorlayers/greyscale_usgs.asset b/data/assets/scene/solarsystem/dwarf_planets/pluto/layers/colorlayers/greyscale_usgs.asset
index fd91a7db6f..f0a89d5041 100644
--- a/data/assets/scene/solarsystem/dwarf_planets/pluto/layers/colorlayers/greyscale_usgs.asset
+++ b/data/assets/scene/solarsystem/dwarf_planets/pluto/layers/colorlayers/greyscale_usgs.asset
@@ -6,6 +6,7 @@ local Layer = {
   Identifier = "Greyscale_USGS",
   Name = "Black & White [USGS]",
   Enabled = asset.enabled,
+  ZIndex = 10,
   FilePath = "WMS:https://planetarymaps.usgs.gov/cgi-bin/mapserv?map=/maps/pluto/pluto_simp_cyl.map&SERVICE=WMS&VERSION=1.1.1&REQUEST=GetMap&LAYERS=NEWHORIZONS_PLUTO_MOSAIC&SRS=EPSG:4326&BBOX=-180,-90,360,90"
 }
 
diff --git a/data/assets/scene/solarsystem/heliosphere/bastille_day/magnetogram_textures.asset b/data/assets/scene/solarsystem/heliosphere/bastille_day/magnetogram_textures.asset
index cfbe2e771a..7265d59f4a 100644
--- a/data/assets/scene/solarsystem/heliosphere/bastille_day/magnetogram_textures.asset
+++ b/data/assets/scene/solarsystem/heliosphere/bastille_day/magnetogram_textures.asset
@@ -43,6 +43,7 @@ asset.onInitialize(function()
         Description = "",
         FilePath = imagename,
         Enabled = false,
+        ZIndex = 100,
         CacheSettings = { Enabled = false }
       }
     )
diff --git a/data/assets/scene/solarsystem/planets/base_layers.asset b/data/assets/scene/solarsystem/planets/base_layers.asset
index a925ac4ec2..5ed8a4f307 100644
--- a/data/assets/scene/solarsystem/planets/base_layers.asset
+++ b/data/assets/scene/solarsystem/planets/base_layers.asset
@@ -8,6 +8,7 @@ asset.require("./mars/layers/base_layers")
 
 asset.require("./jupiter/default_layers")
 asset.require("./jupiter/callisto/default_layers")
+asset.require("./jupiter/europa/layers/local_layers")
 asset.require("./jupiter/ganymede/default_layers")
 asset.require("./jupiter/io/default_layers")
 
diff --git a/data/assets/scene/solarsystem/planets/earth/eclipses/5000_years.asset b/data/assets/scene/solarsystem/planets/earth/eclipses/5000_years.asset
index ee82c5a4c8..408b30a97f 100644
--- a/data/assets/scene/solarsystem/planets/earth/eclipses/5000_years.asset
+++ b/data/assets/scene/solarsystem/planets/earth/eclipses/5000_years.asset
@@ -14,6 +14,7 @@ local Layer = {
   Identifier = "5000_Years_Eclipses",
   Name = "5000 Years of Total Solar Eclipses",
   Enabled = asset.enabled,
+  ZIndex = 100,
   FilePath = texturesPath .. "eclipse_freq_heatmap.tif",
   Description = [[
     This is a heatmap showing the density of solar eclipse paths over the Earth during the 5000-year period between 2000 BCE and 3000 CE. It uses the list of eclipses calculated by Fred Espenak and Jean Meeus and published in 2006 as the Five Millennium Canon of Solar Eclipses. The paths of the 3742 eclipses classified in the Canon as either "T" (total) or "H" (hybrid or total-annular) were drawn into a global map with a pixel resolution of 4 minutes (1/15 of a degree) of latitude and longitude. The pixels counted the eclipse paths as they were drawn, and each pixel location ended up experiencing anywhere from one to 35 eclipses.
diff --git a/data/assets/scene/solarsystem/planets/earth/layers/colorlayers/amsr2_gcom_w1_sea_ice_concentration_temporal.asset b/data/assets/scene/solarsystem/planets/earth/layers/colorlayers/amsr2_gcom_w1_sea_ice_concentration_temporal.asset
index 5a41542027..52e7d40a4e 100644
--- a/data/assets/scene/solarsystem/planets/earth/layers/colorlayers/amsr2_gcom_w1_sea_ice_concentration_temporal.asset
+++ b/data/assets/scene/solarsystem/planets/earth/layers/colorlayers/amsr2_gcom_w1_sea_ice_concentration_temporal.asset
@@ -6,6 +6,7 @@ local Layer = {
   Identifier = "AMSR2_GCOM_W1_Sea_Ice_Concentration_Temporal",
   Name = "AMSR2 GCOM W1 Sea Ice Concentration (Temporal)",
   Enabled = asset.enabled,
+  ZIndex = 100,
   Type = "TemporalTileProvider",
   Mode = "Prototyped",
   Prototyped = {
diff --git a/data/assets/scene/solarsystem/planets/earth/layers/colorlayers/aqua_modis_temporal.asset b/data/assets/scene/solarsystem/planets/earth/layers/colorlayers/aqua_modis_temporal.asset
index b175332afd..1982139ece 100644
--- a/data/assets/scene/solarsystem/planets/earth/layers/colorlayers/aqua_modis_temporal.asset
+++ b/data/assets/scene/solarsystem/planets/earth/layers/colorlayers/aqua_modis_temporal.asset
@@ -6,6 +6,7 @@ local Layer = {
   Identifier = "Aqua_Modis_Temporal",
   Name = "Aqua Modis (Temporal)",
   Enabled = asset.enabled,
+  ZIndex = 20,
   Type = "TemporalTileProvider",
   Mode = "Prototyped",
   Prototyped = {
diff --git a/data/assets/scene/solarsystem/planets/earth/layers/colorlayers/blue_marble.asset b/data/assets/scene/solarsystem/planets/earth/layers/colorlayers/blue_marble.asset
index 10ac031e8e..3f9981b738 100644
--- a/data/assets/scene/solarsystem/planets/earth/layers/colorlayers/blue_marble.asset
+++ b/data/assets/scene/solarsystem/planets/earth/layers/colorlayers/blue_marble.asset
@@ -14,6 +14,7 @@ local Layer = {
   Identifier = "Blue_Marble",
   Name = "Blue Marble",
   Enabled = asset.enabled,
+  ZIndex = 5,
   FilePath = texturesPath .. "earth_bluemarble.jpg",
   Description = "Earth image from Blue Marble Next Generation",
   CacheSettings = { Enabled = false }
diff --git a/data/assets/scene/solarsystem/planets/earth/layers/colorlayers/bmng_newyork.asset b/data/assets/scene/solarsystem/planets/earth/layers/colorlayers/bmng_newyork.asset
index d8b2b24aef..b328222bb0 100644
--- a/data/assets/scene/solarsystem/planets/earth/layers/colorlayers/bmng_newyork.asset
+++ b/data/assets/scene/solarsystem/planets/earth/layers/colorlayers/bmng_newyork.asset
@@ -6,6 +6,7 @@ local Layer = {
   Identifier = "BMNG_NewYork",
   Name = "BMNG [New York]",
   Enabled = asset.enabled,
+  ZIndex = 10,
   FilePath = asset.resource("bmng_newyork.wms"),
   Description = [[Web loaded full resolution map of Blue Marble Next Generation. This map
     is hosted on the OpenSpace servers in New York]]
diff --git a/data/assets/scene/solarsystem/planets/earth/layers/colorlayers/bmng_sweden.asset b/data/assets/scene/solarsystem/planets/earth/layers/colorlayers/bmng_sweden.asset
index 039798cad7..2699c146c6 100644
--- a/data/assets/scene/solarsystem/planets/earth/layers/colorlayers/bmng_sweden.asset
+++ b/data/assets/scene/solarsystem/planets/earth/layers/colorlayers/bmng_sweden.asset
@@ -6,6 +6,7 @@ local Layer = {
   Identifier = "BMNG_Sweden",
   Name = "BMNG [Sweden]",
   Enabled = asset.enabled,
+  ZIndex = 10,
   FilePath = asset.resource("bmng_sweden.wms"),
   Description = [[Web loaded full resolution map of Blue Marble Next Generation. This map
     is hosted on the OpenSpace servers in Sweden]]
diff --git a/data/assets/scene/solarsystem/planets/earth/layers/colorlayers/bmng_utah.asset b/data/assets/scene/solarsystem/planets/earth/layers/colorlayers/bmng_utah.asset
index 746beb4da7..6ed6c35b2e 100644
--- a/data/assets/scene/solarsystem/planets/earth/layers/colorlayers/bmng_utah.asset
+++ b/data/assets/scene/solarsystem/planets/earth/layers/colorlayers/bmng_utah.asset
@@ -6,6 +6,7 @@ local Layer = {
   Identifier = "BMNG_Utah",
   Name = "BMNG [Utah]",
   Enabled = asset.enabled,
+  ZIndex = 10,
   FilePath = asset.resource("bmng_utah.wms"),
   Description = [[Web loaded full resolution map of Blue Marble Next Generation. This map
     is hosted on the OpenSpace servers in Utah]]
diff --git a/data/assets/scene/solarsystem/planets/earth/layers/colorlayers/esri_noaa20_combo.asset b/data/assets/scene/solarsystem/planets/earth/layers/colorlayers/esri_noaa20_combo.asset
index ad00fcb6af..6fd01a77bb 100644
--- a/data/assets/scene/solarsystem/planets/earth/layers/colorlayers/esri_noaa20_combo.asset
+++ b/data/assets/scene/solarsystem/planets/earth/layers/colorlayers/esri_noaa20_combo.asset
@@ -6,6 +6,7 @@ local Layer = {
   Identifier = "ESRI_NOAA20_Combo",
   Name = "ESRI NOAA20 Combo",
   Enabled = asset.enabled,
+  ZIndex = 30,
   Type = "TileProviderByLevel",
   LevelTileProviders = {
     {
diff --git a/data/assets/scene/solarsystem/planets/earth/layers/colorlayers/esri_viirs_combo.asset b/data/assets/scene/solarsystem/planets/earth/layers/colorlayers/esri_viirs_combo.asset
index 9bf3296f8a..61075677f5 100644
--- a/data/assets/scene/solarsystem/planets/earth/layers/colorlayers/esri_viirs_combo.asset
+++ b/data/assets/scene/solarsystem/planets/earth/layers/colorlayers/esri_viirs_combo.asset
@@ -6,6 +6,7 @@ local Layer = {
   Identifier = "ESRI_VIIRS_Combo",
   Name = "ESRI VIIRS Combo",
   Enabled = asset.enabled,
+  ZIndex = 20,
   Type = "TileProviderByLevel",
   LevelTileProviders = {
     {
diff --git a/data/assets/scene/solarsystem/planets/earth/layers/colorlayers/esri_world_imagery.asset b/data/assets/scene/solarsystem/planets/earth/layers/colorlayers/esri_world_imagery.asset
index 510d022f1c..751a9078de 100644
--- a/data/assets/scene/solarsystem/planets/earth/layers/colorlayers/esri_world_imagery.asset
+++ b/data/assets/scene/solarsystem/planets/earth/layers/colorlayers/esri_world_imagery.asset
@@ -6,6 +6,7 @@ local Layer = {
   Identifier = "ESRI_World_Imagery",
   Name = "ESRI World Imagery",
   Enabled = asset.enabled,
+  ZIndex = 10,
   FilePath = asset.resource("esri_world_imagery.wms"),
   Description = [[World Imagery provides one meter or better satellite and aerial
     imagery in many parts of the world and lower resolution satellite imagery
diff --git a/data/assets/scene/solarsystem/planets/earth/layers/colorlayers/ghrsst_l4_mur_sea_surface_temperature_temporal.asset b/data/assets/scene/solarsystem/planets/earth/layers/colorlayers/ghrsst_l4_mur_sea_surface_temperature_temporal.asset
index 19212a0627..6e7bc04cc3 100644
--- a/data/assets/scene/solarsystem/planets/earth/layers/colorlayers/ghrsst_l4_mur_sea_surface_temperature_temporal.asset
+++ b/data/assets/scene/solarsystem/planets/earth/layers/colorlayers/ghrsst_l4_mur_sea_surface_temperature_temporal.asset
@@ -6,6 +6,7 @@ local Layer = {
   Identifier = "GHRSST_L4_MUR_Sea_Surface_Temperature_Temporal",
   Name = "GHRSST L4 MUR Sea Surface Temperature (Temporal)",
   Enabled = asset.enabled,
+  ZIndex = 100,
   Type = "TemporalTileProvider",
   Mode = "Prototyped",
   Prototyped = {
diff --git a/data/assets/scene/solarsystem/planets/earth/layers/colorlayers/modis_terra_chlorophyll_a_temporal.asset b/data/assets/scene/solarsystem/planets/earth/layers/colorlayers/modis_terra_chlorophyll_a_temporal.asset
index e6275f00ce..bb839daf6d 100644
--- a/data/assets/scene/solarsystem/planets/earth/layers/colorlayers/modis_terra_chlorophyll_a_temporal.asset
+++ b/data/assets/scene/solarsystem/planets/earth/layers/colorlayers/modis_terra_chlorophyll_a_temporal.asset
@@ -6,6 +6,7 @@ local Layer = {
   Identifier = "MODIS_Terra_Chlorophyll_A_Temporal",
   Name = "MODIS Terra Chlorophyll A (Temporal)",
   Enabled = asset.enabled,
+  ZIndex = 100,
   Type = "TemporalTileProvider",
   Mode = "Prototyped",
   Prototyped = {
diff --git a/data/assets/scene/solarsystem/planets/earth/layers/colorlayers/terra_modis_temporal.asset b/data/assets/scene/solarsystem/planets/earth/layers/colorlayers/terra_modis_temporal.asset
index 7d268390f8..da0fea050a 100644
--- a/data/assets/scene/solarsystem/planets/earth/layers/colorlayers/terra_modis_temporal.asset
+++ b/data/assets/scene/solarsystem/planets/earth/layers/colorlayers/terra_modis_temporal.asset
@@ -6,6 +6,7 @@ local Layer = {
   Identifier = "Terra_Modis_Temporal",
   Name = "Terra Modis (Temporal)",
   Enabled = asset.enabled,
+  ZIndex = 20,
   Type = "TemporalTileProvider",
   Mode = "Prototyped",
   Prototyped = {
diff --git a/data/assets/scene/solarsystem/planets/earth/layers/colorlayers/viirs_noaa20_temporal.asset b/data/assets/scene/solarsystem/planets/earth/layers/colorlayers/viirs_noaa20_temporal.asset
index 49f87efd0c..948862fbb4 100644
--- a/data/assets/scene/solarsystem/planets/earth/layers/colorlayers/viirs_noaa20_temporal.asset
+++ b/data/assets/scene/solarsystem/planets/earth/layers/colorlayers/viirs_noaa20_temporal.asset
@@ -6,6 +6,7 @@ local Layer = {
   Identifier = "VIIRS_NOAA20_Temporal",
   Name = "VIIRS NOAA20 (Temporal)",
   Enabled = asset.enabled,
+  ZIndex = 30,
   Type = "TemporalTileProvider",
   Mode = "Prototyped",
   Prototyped = {
diff --git a/data/assets/scene/solarsystem/planets/earth/layers/colorlayers/viirs_snpp_temporal.asset b/data/assets/scene/solarsystem/planets/earth/layers/colorlayers/viirs_snpp_temporal.asset
index d6aebe676d..49325042a5 100644
--- a/data/assets/scene/solarsystem/planets/earth/layers/colorlayers/viirs_snpp_temporal.asset
+++ b/data/assets/scene/solarsystem/planets/earth/layers/colorlayers/viirs_snpp_temporal.asset
@@ -6,6 +6,7 @@ local Layer = {
   Identifier = "VIIRS_SNPP_Temporal",
   Name = "VIIRS SNPP (Temporal)",
   Enabled = asset.enabled,
+  ZIndex = 30,
   Type = "TemporalTileProvider",
   Mode = "Prototyped",
   Prototyped = {
diff --git a/data/assets/scene/solarsystem/planets/earth/layers/heightlayers/blue_marble_height.asset b/data/assets/scene/solarsystem/planets/earth/layers/heightlayers/blue_marble_height.asset
index 99fd5da004..af11d3455b 100644
--- a/data/assets/scene/solarsystem/planets/earth/layers/heightlayers/blue_marble_height.asset
+++ b/data/assets/scene/solarsystem/planets/earth/layers/heightlayers/blue_marble_height.asset
@@ -14,6 +14,7 @@ local Layer = {
   Name = "Earth Bluemarble Height",
   Identifier = "Earth_Bluemarble_Height",
   Enabled = asset.enabled,
+  ZIndex = 5,
   FilePath = texturesPath .. "earth_bluemarble_height.jpg",
   Description = "Topographic layer from Blue Marble Next Generation",
   --note these values were just chosen to try to closly match the look of the ESRI Terrain layer
diff --git a/data/assets/scene/solarsystem/planets/earth/layers/heightlayers/terrain_tileset.asset b/data/assets/scene/solarsystem/planets/earth/layers/heightlayers/terrain_tileset.asset
index 725438b659..31d32a53ae 100644
--- a/data/assets/scene/solarsystem/planets/earth/layers/heightlayers/terrain_tileset.asset
+++ b/data/assets/scene/solarsystem/planets/earth/layers/heightlayers/terrain_tileset.asset
@@ -6,6 +6,7 @@ local Layer = {
   Identifier = "Terrain_tileset",
   Name = "Terrain tileset",
   Enabled = asset.enabled,
+  ZIndex = 10,
   FilePath = asset.resource("terrain_tileset.wms"),
   TilePixelSize = 129,
   Description = [[This globe layer presents elevation data at approximately 90m or 1km
diff --git a/data/assets/scene/solarsystem/planets/earth/layers/nightlayers/earth_at_night_2012.asset b/data/assets/scene/solarsystem/planets/earth/layers/nightlayers/earth_at_night_2012.asset
index bf5d210a4d..93a095311a 100644
--- a/data/assets/scene/solarsystem/planets/earth/layers/nightlayers/earth_at_night_2012.asset
+++ b/data/assets/scene/solarsystem/planets/earth/layers/nightlayers/earth_at_night_2012.asset
@@ -6,6 +6,7 @@ local Layer = {
   Identifier = "Earth_at_Night_2012",
   Name = "Earth at Night 2012",
   Enabled = asset.enabled,
+  ZIndex = 10,
   FilePath = asset.resource("earth_at_night_2012.wms"),
   Description = [[The lights of cities and villages trace the outlines of civilization
     in this global view]]
diff --git a/data/assets/scene/solarsystem/planets/earth/layers/nightlayers/earth_at_night_temporal.asset b/data/assets/scene/solarsystem/planets/earth/layers/nightlayers/earth_at_night_temporal.asset
index db35ca1dc2..a7cd536a59 100644
--- a/data/assets/scene/solarsystem/planets/earth/layers/nightlayers/earth_at_night_temporal.asset
+++ b/data/assets/scene/solarsystem/planets/earth/layers/nightlayers/earth_at_night_temporal.asset
@@ -6,6 +6,7 @@ local Layer = {
   Identifier = "Earth_at_Night_Temporal",
   Name = "Earth at Night (Temporal)",
   Enabled = asset.enabled,
+  ZIndex = 20,
   Type = "TemporalTileProvider",
   Mode = "Prototyped",
   Prototyped = {
diff --git a/data/assets/scene/solarsystem/planets/earth/layers/nightlayers/earth_at_night_temporal_blue_yellow.asset b/data/assets/scene/solarsystem/planets/earth/layers/nightlayers/earth_at_night_temporal_blue_yellow.asset
index d53e454119..c66e507915 100644
--- a/data/assets/scene/solarsystem/planets/earth/layers/nightlayers/earth_at_night_temporal_blue_yellow.asset
+++ b/data/assets/scene/solarsystem/planets/earth/layers/nightlayers/earth_at_night_temporal_blue_yellow.asset
@@ -6,6 +6,7 @@ local Layer = {
   Identifier = "Earth_at_Night_Temporal_Blue_Yellow",
   Name = "Earth at Night Blue Yellow (Temporal)",
   Enabled = asset.enabled,
+  ZIndex = 20,
   Type = "TemporalTileProvider",
   Mode = "Prototyped",
   Prototyped = {
diff --git a/data/assets/scene/solarsystem/planets/earth/layers/nightlayers/earth_night_texture.asset b/data/assets/scene/solarsystem/planets/earth/layers/nightlayers/earth_night_texture.asset
index 87d1650b61..d4aa37619a 100644
--- a/data/assets/scene/solarsystem/planets/earth/layers/nightlayers/earth_night_texture.asset
+++ b/data/assets/scene/solarsystem/planets/earth/layers/nightlayers/earth_night_texture.asset
@@ -14,6 +14,7 @@ local Layer = {
   Identifier = "Earth_Night_Texture",
   Name = "Earth Night Texture",
   Enabled = asset.enabled,
+  ZIndex = 5,
   FilePath = texturesPath .. "earth_night.png",
   Description = "Earth's city lights are clearly visible from space",
   CacheSettings = { Enabled = false }
diff --git a/data/assets/scene/solarsystem/planets/earth/layers/watermasks/gebco_newyork.asset b/data/assets/scene/solarsystem/planets/earth/layers/watermasks/gebco_newyork.asset
index 83d6cca607..2ad618c7a6 100644
--- a/data/assets/scene/solarsystem/planets/earth/layers/watermasks/gebco_newyork.asset
+++ b/data/assets/scene/solarsystem/planets/earth/layers/watermasks/gebco_newyork.asset
@@ -6,6 +6,7 @@ local Layer = {
   Name = "Gebco [New York]",
   Identifier = "Gebco_NewYork",
   Enabled = asset.enabled,
+  ZIndex = 10,
   FilePath = asset.resource("gebco_newyork.wms")
 }
 
diff --git a/data/assets/scene/solarsystem/planets/earth/layers/watermasks/gebco_sweden.asset b/data/assets/scene/solarsystem/planets/earth/layers/watermasks/gebco_sweden.asset
index 711be5ded2..4a6182eea6 100644
--- a/data/assets/scene/solarsystem/planets/earth/layers/watermasks/gebco_sweden.asset
+++ b/data/assets/scene/solarsystem/planets/earth/layers/watermasks/gebco_sweden.asset
@@ -6,6 +6,7 @@ local Layer = {
   Name = "Gebco [Sweden]",
   Identifier = "Gebco_Sweden",
   Enabled = asset.enabled,
+  ZIndex = 10,
   FilePath = asset.resource("gebco_sweden.wms")
 }
 
diff --git a/data/assets/scene/solarsystem/planets/earth/layers/watermasks/gebco_utah.asset b/data/assets/scene/solarsystem/planets/earth/layers/watermasks/gebco_utah.asset
index 245e08d926..1a0c6cdf00 100644
--- a/data/assets/scene/solarsystem/planets/earth/layers/watermasks/gebco_utah.asset
+++ b/data/assets/scene/solarsystem/planets/earth/layers/watermasks/gebco_utah.asset
@@ -6,6 +6,7 @@ local Layer = {
   Name = "Gebco [Utah]",
   Identifier = "Gebco_Utah",
   Enabled = asset.enabled,
+  ZIndex = 10,
   FilePath = asset.resource("gebco_utah.wms")
 }
 
diff --git a/data/assets/scene/solarsystem/planets/earth/layers/watermasks/modis_water_mask.asset b/data/assets/scene/solarsystem/planets/earth/layers/watermasks/modis_water_mask.asset
index 52b5b9ed9a..aba4552b51 100644
--- a/data/assets/scene/solarsystem/planets/earth/layers/watermasks/modis_water_mask.asset
+++ b/data/assets/scene/solarsystem/planets/earth/layers/watermasks/modis_water_mask.asset
@@ -6,6 +6,7 @@ local Layer = {
   Identifier = "MODIS_Water_Mask",
   Name = "MODIS Water Mask",
   Enabled = asset.enabled,
+  ZIndex = 20,
   FilePath = asset.resource("modis_water_mask.wms")
 }
 
diff --git a/data/assets/scene/solarsystem/planets/earth/moon/layers/colorlayers/apollo_15_metric_newyork.asset b/data/assets/scene/solarsystem/planets/earth/moon/layers/colorlayers/apollo_15_metric_newyork.asset
index 2dbb8b30d0..0af4f897bc 100644
--- a/data/assets/scene/solarsystem/planets/earth/moon/layers/colorlayers/apollo_15_metric_newyork.asset
+++ b/data/assets/scene/solarsystem/planets/earth/moon/layers/colorlayers/apollo_15_metric_newyork.asset
@@ -6,6 +6,7 @@ local Layer = {
   Identifier = "Apollo15Metric_NewYork",
   Name = "Apollo 15 Metric Cam [New York]",
   Enabled = asset.enabled,
+  ZIndex = 50,
   FilePath = asset.resource("apollo_15_metric_newyork.wms"),
   Description = [[
     The Apollo 15 Metric (Mapping) Camera obtained high-quality metric photographs, on
diff --git a/data/assets/scene/solarsystem/planets/earth/moon/layers/colorlayers/clemuvvis_newyork.asset b/data/assets/scene/solarsystem/planets/earth/moon/layers/colorlayers/clemuvvis_newyork.asset
index 2c5a74352f..6db4108c7a 100644
--- a/data/assets/scene/solarsystem/planets/earth/moon/layers/colorlayers/clemuvvis_newyork.asset
+++ b/data/assets/scene/solarsystem/planets/earth/moon/layers/colorlayers/clemuvvis_newyork.asset
@@ -6,6 +6,7 @@ local Layer = {
   Identifier = "ClemUvvis_NewYork",
   Name = "Clem Uvvis [New York]",
   Enabled = asset.enabled,
+  ZIndex = 20,
   FilePath = asset.resource("clemuvvis_newyork.wms"),
   Settings = {
     Gamma = 1.14,
diff --git a/data/assets/scene/solarsystem/planets/earth/moon/layers/colorlayers/clemuvvis_sweden.asset b/data/assets/scene/solarsystem/planets/earth/moon/layers/colorlayers/clemuvvis_sweden.asset
index b47dc00156..dd79dfa7d3 100644
--- a/data/assets/scene/solarsystem/planets/earth/moon/layers/colorlayers/clemuvvis_sweden.asset
+++ b/data/assets/scene/solarsystem/planets/earth/moon/layers/colorlayers/clemuvvis_sweden.asset
@@ -6,6 +6,7 @@ local Layer = {
   Identifier = "ClemUvvis_Sweden",
   Name = "Clem Uvvis [Sweden]",
   Enabled = asset.enabled,
+  ZIndex = 20,
   FilePath = asset.resource("clemuvvis_sweden.wms"),
   Settings = {
     Gamma = 1.14,
diff --git a/data/assets/scene/solarsystem/planets/earth/moon/layers/colorlayers/clemuvvis_utah.asset b/data/assets/scene/solarsystem/planets/earth/moon/layers/colorlayers/clemuvvis_utah.asset
index 9af2387895..c864f3f02f 100644
--- a/data/assets/scene/solarsystem/planets/earth/moon/layers/colorlayers/clemuvvis_utah.asset
+++ b/data/assets/scene/solarsystem/planets/earth/moon/layers/colorlayers/clemuvvis_utah.asset
@@ -6,6 +6,7 @@ local Layer = {
   Identifier = "ClemUvvis_Utah",
   Name = "Clem Uvvis [Utah]",
   Enabled = asset.enabled,
+  ZIndex = 20,
   FilePath = asset.resource("clemuvvis_utah.wms"),
   Settings = {
     Gamma = 1.14,
diff --git a/data/assets/scene/solarsystem/planets/earth/moon/layers/colorlayers/kaguya_newyork.asset b/data/assets/scene/solarsystem/planets/earth/moon/layers/colorlayers/kaguya_newyork.asset
index 5510619d20..b026df1212 100644
--- a/data/assets/scene/solarsystem/planets/earth/moon/layers/colorlayers/kaguya_newyork.asset
+++ b/data/assets/scene/solarsystem/planets/earth/moon/layers/colorlayers/kaguya_newyork.asset
@@ -6,6 +6,7 @@ local Layer = {
   Identifier = "Kaguya_NewYork",
   Name = "Kaguya [New York]",
   Enabled = asset.enabled,
+  ZIndex = 20,
   FilePath = asset.resource("kaguya_newyork.vrt"),
   Settings = {
     Gamma = 1.0,
diff --git a/data/assets/scene/solarsystem/planets/earth/moon/layers/colorlayers/kaguya_sweden.asset b/data/assets/scene/solarsystem/planets/earth/moon/layers/colorlayers/kaguya_sweden.asset
index bdcf860861..e54edc08a4 100644
--- a/data/assets/scene/solarsystem/planets/earth/moon/layers/colorlayers/kaguya_sweden.asset
+++ b/data/assets/scene/solarsystem/planets/earth/moon/layers/colorlayers/kaguya_sweden.asset
@@ -6,6 +6,7 @@ local Layer = {
   Identifier = "Kaguya_Sweden",
   Name = "Kaguya [Sweden]",
   Enabled = asset.enabled,
+  ZIndex = 20,
   FilePath = asset.resource("kaguya_sweden.vrt"),
   Settings = {
     Gamma = 1.0,
diff --git a/data/assets/scene/solarsystem/planets/earth/moon/layers/colorlayers/kaguya_utah.asset b/data/assets/scene/solarsystem/planets/earth/moon/layers/colorlayers/kaguya_utah.asset
index 039f491c67..a75fcc175e 100644
--- a/data/assets/scene/solarsystem/planets/earth/moon/layers/colorlayers/kaguya_utah.asset
+++ b/data/assets/scene/solarsystem/planets/earth/moon/layers/colorlayers/kaguya_utah.asset
@@ -6,6 +6,7 @@ local Layer = {
   Identifier = "Kaguya_Utah",
   Name = "Kaguya [Utah]",
   Enabled = asset.enabled,
+  ZIndex = 20,
   FilePath = asset.resource("kaguya_utah.vrt"),
   Settings = {
     Gamma = 1.0,
diff --git a/data/assets/scene/solarsystem/planets/earth/moon/layers/colorlayers/lo_mr_mosaic_newyork.asset b/data/assets/scene/solarsystem/planets/earth/moon/layers/colorlayers/lo_mr_mosaic_newyork.asset
index 32cf9e3350..15198e0596 100644
--- a/data/assets/scene/solarsystem/planets/earth/moon/layers/colorlayers/lo_mr_mosaic_newyork.asset
+++ b/data/assets/scene/solarsystem/planets/earth/moon/layers/colorlayers/lo_mr_mosaic_newyork.asset
@@ -6,6 +6,7 @@ local Layer = {
   Identifier = "LO_MR_Mosaic_NewYork",
   Name = "Moon Lunar Orbiter Digital Photographic Global Mosaic 59m v1 [New York]",
   Enabled = asset.enabled,
+  ZIndex = 20,
   FilePath = asset.resource("lo_mr_mosaic_newyork.wms"),
   Description = [[
     This Lunar Orbiter (LO) mosaic of the Moon was constructed using
diff --git a/data/assets/scene/solarsystem/planets/earth/moon/layers/colorlayers/lo_mr_mosaic_sweden.asset b/data/assets/scene/solarsystem/planets/earth/moon/layers/colorlayers/lo_mr_mosaic_sweden.asset
index d29dda3b1e..63294129c4 100644
--- a/data/assets/scene/solarsystem/planets/earth/moon/layers/colorlayers/lo_mr_mosaic_sweden.asset
+++ b/data/assets/scene/solarsystem/planets/earth/moon/layers/colorlayers/lo_mr_mosaic_sweden.asset
@@ -6,6 +6,7 @@ local Layer = {
   Identifier = "LO_MR_Mosaic_Sweden",
   Name = "Moon Lunar Orbiter Digital Photographic Global Mosaic 59m v1 [Sweden]",
   Enabled = asset.enabled,
+  ZIndex = 20,
   FilePath = asset.resource("lo_mr_mosaic_sweden.wms"),
   Description = [[
     This Lunar Orbiter (LO) mosaic of the Moon was constructed using photographs acquired
diff --git a/data/assets/scene/solarsystem/planets/earth/moon/layers/colorlayers/lola_clr_shade_newyork.asset b/data/assets/scene/solarsystem/planets/earth/moon/layers/colorlayers/lola_clr_shade_newyork.asset
index e8637aaf32..c67bfd3d81 100644
--- a/data/assets/scene/solarsystem/planets/earth/moon/layers/colorlayers/lola_clr_shade_newyork.asset
+++ b/data/assets/scene/solarsystem/planets/earth/moon/layers/colorlayers/lola_clr_shade_newyork.asset
@@ -6,6 +6,7 @@ local Layer = {
   Identifier = "Lola_Clr_Shade_NewYork",
   Name = "LRO LOLA Color Shaded Relief 388m v4 [New York]",
   Enabled = asset.enabled,
+  ZIndex = 100,
   FilePath = asset.resource("lola_clr_shade_newyork.wms"),
   Description = [[This is a colorized shaded-relief of a original polar digital elevation
     model (DEM) from the Lunar Orbiter Laser Altimeter (LOLA; Smith et al., 2010), an
diff --git a/data/assets/scene/solarsystem/planets/earth/moon/layers/colorlayers/lola_clr_shade_sweden.asset b/data/assets/scene/solarsystem/planets/earth/moon/layers/colorlayers/lola_clr_shade_sweden.asset
index 24982ee682..15f645682d 100644
--- a/data/assets/scene/solarsystem/planets/earth/moon/layers/colorlayers/lola_clr_shade_sweden.asset
+++ b/data/assets/scene/solarsystem/planets/earth/moon/layers/colorlayers/lola_clr_shade_sweden.asset
@@ -6,6 +6,7 @@ local Layer = {
   Identifier = "Lola_Clr_Shade_Sweden",
   Name = "LRO LOLA Color Shaded Relief 388m v4 [Sweden]",
   Enabled = asset.enabled,
+  ZIndex = 100,
   FilePath = asset.resource("lola_clr_shade_sweden.wms"),
   Description = [[This is a colorized shaded-relief of a original polar digital elevation
     model (DEM) from the Lunar Orbiter Laser Altimeter (LOLA; Smith et al., 2010), an
diff --git a/data/assets/scene/solarsystem/planets/earth/moon/layers/colorlayers/lola_clr_shade_utah.asset b/data/assets/scene/solarsystem/planets/earth/moon/layers/colorlayers/lola_clr_shade_utah.asset
index d482bfc423..d1e8132328 100644
--- a/data/assets/scene/solarsystem/planets/earth/moon/layers/colorlayers/lola_clr_shade_utah.asset
+++ b/data/assets/scene/solarsystem/planets/earth/moon/layers/colorlayers/lola_clr_shade_utah.asset
@@ -6,6 +6,7 @@ local Layer = {
   Identifier = "Lola_Clr_Shade_Utah",
   Name = "LRO LOLA Color Shaded Relief 388m v4 [Utah]",
   Enabled = asset.enabled,
+  ZIndex = 100,
   FilePath = asset.resource("lola_clr_shade_utah.wms"),
   Description = [[This is a colorized shaded-relief of a original polar digital elevation
     model (DEM) from the Lunar Orbiter Laser Altimeter (LOLA; Smith et al., 2010), an
diff --git a/data/assets/scene/solarsystem/planets/earth/moon/layers/colorlayers/lola_shade_newyork.asset b/data/assets/scene/solarsystem/planets/earth/moon/layers/colorlayers/lola_shade_newyork.asset
index f7d0abd6ac..18ef0f2300 100644
--- a/data/assets/scene/solarsystem/planets/earth/moon/layers/colorlayers/lola_shade_newyork.asset
+++ b/data/assets/scene/solarsystem/planets/earth/moon/layers/colorlayers/lola_shade_newyork.asset
@@ -6,6 +6,7 @@ local Layer = {
   Identifier = "Lola_Shade_NewYork",
   Name = "Lola Shade [New York]",
   Enabled = asset.enabled,
+  ZIndex = 100,
   FilePath = asset.resource("lola_shade_newyork.wms"),
   Description = [[This is a shaded-relief of a original polar digital elevation model
     (DEM) from the Lunar Orbiter Laser Altimeter (LOLA; Smith et al., 2010), an instrument
diff --git a/data/assets/scene/solarsystem/planets/earth/moon/layers/colorlayers/lola_shade_sweden.asset b/data/assets/scene/solarsystem/planets/earth/moon/layers/colorlayers/lola_shade_sweden.asset
index 494aa6558c..8b44ff7582 100644
--- a/data/assets/scene/solarsystem/planets/earth/moon/layers/colorlayers/lola_shade_sweden.asset
+++ b/data/assets/scene/solarsystem/planets/earth/moon/layers/colorlayers/lola_shade_sweden.asset
@@ -6,6 +6,7 @@ local Layer = {
   Identifier = "Lola_Shade_Sweden",
   Name = "Lola Shade [Sweden]",
   Enabled = asset.enabled,
+  ZIndex = 100,
   FilePath = asset.resource("lola_shade_sweden.wms"),
   Description = [[This is a shaded-relief of a original polar digital elevation model
     (DEM) from the Lunar Orbiter Laser Altimeter (LOLA; Smith et al., 2010), an instrument
diff --git a/data/assets/scene/solarsystem/planets/earth/moon/layers/colorlayers/lola_shade_utah.asset b/data/assets/scene/solarsystem/planets/earth/moon/layers/colorlayers/lola_shade_utah.asset
index eb6ea2fcbd..0de23c3506 100644
--- a/data/assets/scene/solarsystem/planets/earth/moon/layers/colorlayers/lola_shade_utah.asset
+++ b/data/assets/scene/solarsystem/planets/earth/moon/layers/colorlayers/lola_shade_utah.asset
@@ -6,6 +6,7 @@ local Layer = {
   Identifier = "Lola_Shade_Utah",
   Name = "Lola Shade [Utah]",
   Enabled = asset.enabled,
+  ZIndex = 100,
   FilePath = asset.resource("lola_shade_utah.wms"),
   Description = [[This is a shaded-relief of a original polar digital elevation model
     (DEM) from the Lunar Orbiter Laser Altimeter (LOLA; Smith et al., 2010), an instrument
diff --git a/data/assets/scene/solarsystem/planets/earth/moon/layers/colorlayers/moon_texture.asset b/data/assets/scene/solarsystem/planets/earth/moon/layers/colorlayers/moon_texture.asset
index 4d1126830a..cf3fe80b0e 100644
--- a/data/assets/scene/solarsystem/planets/earth/moon/layers/colorlayers/moon_texture.asset
+++ b/data/assets/scene/solarsystem/planets/earth/moon/layers/colorlayers/moon_texture.asset
@@ -14,6 +14,7 @@ local Layer = {
   Identifier = "Moon_Texture",
   Name = "Moon Texture",
   Enabled = asset.enabled,
+  ZIndex = 5,
   FilePath = texturesPath .. "WAC_GLOBAL_E000N0000_032P.png",
   Description = "Lower Resolution offline version of WAC layer",
   CacheSettings = { Enabled = false }
diff --git a/data/assets/scene/solarsystem/planets/earth/moon/layers/colorlayers/uvvishybrid_newyork.asset b/data/assets/scene/solarsystem/planets/earth/moon/layers/colorlayers/uvvishybrid_newyork.asset
index e115aa99cc..6aba0d4d0d 100644
--- a/data/assets/scene/solarsystem/planets/earth/moon/layers/colorlayers/uvvishybrid_newyork.asset
+++ b/data/assets/scene/solarsystem/planets/earth/moon/layers/colorlayers/uvvishybrid_newyork.asset
@@ -6,6 +6,7 @@ local Layer = {
   Identifier = "UvvisHybrid_NewYork",
   Name = "Uvvis Hybrid [New York]",
   Enabled = asset.enabled,
+  ZIndex = 10,
   FilePath = asset.resource("uvvishybrid_newyork.wms"),
   Settings = {
     Gamma = 0.52,
diff --git a/data/assets/scene/solarsystem/planets/earth/moon/layers/colorlayers/uvvishybrid_sweden.asset b/data/assets/scene/solarsystem/planets/earth/moon/layers/colorlayers/uvvishybrid_sweden.asset
index a614c22a97..478c16b495 100644
--- a/data/assets/scene/solarsystem/planets/earth/moon/layers/colorlayers/uvvishybrid_sweden.asset
+++ b/data/assets/scene/solarsystem/planets/earth/moon/layers/colorlayers/uvvishybrid_sweden.asset
@@ -6,6 +6,7 @@ local Layer = {
   Identifier = "UvvisHybrid_Sweden",
   Name = "Uvvis Hybrid [Sweden]",
   Enabled = asset.enabled,
+  ZIndex = 10,
   FilePath = asset.resource("uvvishybrid_sweden.wms"),
   Settings = {
     Gamma = 0.52,
diff --git a/data/assets/scene/solarsystem/planets/earth/moon/layers/colorlayers/uvvishybrid_utah.asset b/data/assets/scene/solarsystem/planets/earth/moon/layers/colorlayers/uvvishybrid_utah.asset
index 65178ebebf..2b1934e6f9 100644
--- a/data/assets/scene/solarsystem/planets/earth/moon/layers/colorlayers/uvvishybrid_utah.asset
+++ b/data/assets/scene/solarsystem/planets/earth/moon/layers/colorlayers/uvvishybrid_utah.asset
@@ -6,6 +6,7 @@ local Layer = {
   Identifier = "UvvisHybrid_Utah",
   Name = "Uvvis Hybrid [Utah]",
   Enabled = asset.enabled,
+  ZIndex = 10,
   FilePath = asset.resource("uvvishybrid_utah.wms"),
   Settings = {
     Gamma = 0.52,
diff --git a/data/assets/scene/solarsystem/planets/earth/moon/layers/colorlayers/wac_newyork.asset b/data/assets/scene/solarsystem/planets/earth/moon/layers/colorlayers/wac_newyork.asset
index 5c51f24967..3a741dafe5 100644
--- a/data/assets/scene/solarsystem/planets/earth/moon/layers/colorlayers/wac_newyork.asset
+++ b/data/assets/scene/solarsystem/planets/earth/moon/layers/colorlayers/wac_newyork.asset
@@ -6,6 +6,7 @@ local Layer = {
   Identifier = "WAC_NewYork",
   Name = "WAC [New York]",
   Enabled = asset.enabled,
+  ZIndex = 10,
   FilePath = asset.resource("wac_newyork.wms"),
   Settings = { Gamma = 0.84 },
   Description = [[Lunar Reconnaissance Orbiter Camera (LROC) Wide Angle Camera (WAC)
diff --git a/data/assets/scene/solarsystem/planets/earth/moon/layers/colorlayers/wac_sweden.asset b/data/assets/scene/solarsystem/planets/earth/moon/layers/colorlayers/wac_sweden.asset
index 11e95cdaa4..ec81ec121e 100644
--- a/data/assets/scene/solarsystem/planets/earth/moon/layers/colorlayers/wac_sweden.asset
+++ b/data/assets/scene/solarsystem/planets/earth/moon/layers/colorlayers/wac_sweden.asset
@@ -6,6 +6,7 @@ local Layer = {
   Identifier = "WAC_Sweden",
   Name = "WAC [Sweden]",
   Enabled = asset.enabled,
+  ZIndex = 10,
   FilePath = asset.resource("wac_sweden.wms"),
   Settings = { Gamma = 0.84 },
   Description = [[Lunar Reconnaissance Orbiter Camera (LROC) Wide Angle Camera (WAC)
diff --git a/data/assets/scene/solarsystem/planets/earth/moon/layers/colorlayers/wac_utah.asset b/data/assets/scene/solarsystem/planets/earth/moon/layers/colorlayers/wac_utah.asset
index 2a5e3c8b91..33dbfac018 100644
--- a/data/assets/scene/solarsystem/planets/earth/moon/layers/colorlayers/wac_utah.asset
+++ b/data/assets/scene/solarsystem/planets/earth/moon/layers/colorlayers/wac_utah.asset
@@ -6,6 +6,7 @@ local Layer = {
   Identifier = "WAC_Utah",
   Name = "WAC [Utah]",
   Enabled = asset.enabled,
+  ZIndex = 10,
   FilePath = asset.resource("wac_utah.wms"),
   Settings = { Gamma = 0.84 },
   Description = [[Lunar Reconnaissance Orbiter Camera (LROC) Wide Angle Camera (WAC)
diff --git a/data/assets/scene/solarsystem/planets/earth/moon/layers/colorlayers/wac_v1_newyork.asset b/data/assets/scene/solarsystem/planets/earth/moon/layers/colorlayers/wac_v1_newyork.asset
index fe3dff4f5e..71b1527ea6 100644
--- a/data/assets/scene/solarsystem/planets/earth/moon/layers/colorlayers/wac_v1_newyork.asset
+++ b/data/assets/scene/solarsystem/planets/earth/moon/layers/colorlayers/wac_v1_newyork.asset
@@ -6,6 +6,7 @@ local Layer = {
   Identifier = "WAC_V1_NewYork",
   Name = "WAC V1 [New York]",
   Enabled = asset.enabled,
+  ZIndex = 10,
   FilePath = asset.resource("wac_v1_newyork.wms"),
   Settings = { Gamma = 0.84 },
   Description = [[Lunar Reconnaissance Orbiter Camera (LROC) Wide Angle Camera (WAC)
diff --git a/data/assets/scene/solarsystem/planets/earth/moon/layers/colorlayers/wac_v1_sweden.asset b/data/assets/scene/solarsystem/planets/earth/moon/layers/colorlayers/wac_v1_sweden.asset
index 8f78d2c428..711ec7ae4b 100644
--- a/data/assets/scene/solarsystem/planets/earth/moon/layers/colorlayers/wac_v1_sweden.asset
+++ b/data/assets/scene/solarsystem/planets/earth/moon/layers/colorlayers/wac_v1_sweden.asset
@@ -6,6 +6,7 @@ local Layer = {
   Identifier = "WAC_V1_Sweden",
   Name = "WAC V1 [Sweden]",
   Enabled = asset.enabled,
+  ZIndex = 10,
   FilePath = asset.resource("wac_v1_sweden.wms"),
   Settings = { Gamma = 0.84 },
   Description = [[Lunar Reconnaissance Orbiter Camera (LROC) Wide Angle Camera (WAC)
diff --git a/data/assets/scene/solarsystem/planets/earth/moon/layers/colorlayers/wac_v1_utah.asset b/data/assets/scene/solarsystem/planets/earth/moon/layers/colorlayers/wac_v1_utah.asset
index 79e888a969..e9224a0c7b 100644
--- a/data/assets/scene/solarsystem/planets/earth/moon/layers/colorlayers/wac_v1_utah.asset
+++ b/data/assets/scene/solarsystem/planets/earth/moon/layers/colorlayers/wac_v1_utah.asset
@@ -6,6 +6,7 @@ local Layer = {
   Identifier = "WAC_V1_Utah",
   Name = "WAC V1 [Utah]",
   Enabled = asset.enabled,
+  ZIndex = 10,
   FilePath = asset.resource("wac_v1_utah.wms"),
   Settings = { Gamma = 0.84 },
   Description = [[Lunar Reconnaissance Orbiter Camera (LROC) Wide Angle Camera (WAC)
diff --git a/data/assets/scene/solarsystem/planets/earth/moon/layers/heightlayers/loladem_newyork.asset b/data/assets/scene/solarsystem/planets/earth/moon/layers/heightlayers/loladem_newyork.asset
index 636261ef0a..0c2e3847a1 100644
--- a/data/assets/scene/solarsystem/planets/earth/moon/layers/heightlayers/loladem_newyork.asset
+++ b/data/assets/scene/solarsystem/planets/earth/moon/layers/heightlayers/loladem_newyork.asset
@@ -6,6 +6,7 @@ local Layer = {
   Identifier = "LolaDem_NewYork",
   Name = "Lola DEM [New York]",
   Enabled = asset.enabled,
+  ZIndex = 10,
   FilePath = asset.resource("loladem_newyork.wms"),
   TilePixelSize = 360,
   Settings = { Multiplier = 0.5 },
diff --git a/data/assets/scene/solarsystem/planets/earth/moon/layers/heightlayers/loladem_sweden.asset b/data/assets/scene/solarsystem/planets/earth/moon/layers/heightlayers/loladem_sweden.asset
index 1077329238..10a61c2204 100644
--- a/data/assets/scene/solarsystem/planets/earth/moon/layers/heightlayers/loladem_sweden.asset
+++ b/data/assets/scene/solarsystem/planets/earth/moon/layers/heightlayers/loladem_sweden.asset
@@ -6,6 +6,7 @@ local Layer = {
   Identifier = "LolaDem_Sweden",
   Name = "Lola DEM [Sweden]",
   Enabled = asset.enabled,
+  ZIndex = 10,
   FilePath = asset.resource("loladem_sweden.wms"),
   TilePixelSize = 360,
   Settings = { Multiplier = 0.5 }
diff --git a/data/assets/scene/solarsystem/planets/earth/moon/layers/heightlayers/loladem_utah.asset b/data/assets/scene/solarsystem/planets/earth/moon/layers/heightlayers/loladem_utah.asset
index 126ba159e3..3f8f59fbae 100644
--- a/data/assets/scene/solarsystem/planets/earth/moon/layers/heightlayers/loladem_utah.asset
+++ b/data/assets/scene/solarsystem/planets/earth/moon/layers/heightlayers/loladem_utah.asset
@@ -6,6 +6,7 @@ local Layer = {
   Identifier = "LolaDem_Utah",
   Name = "Lola DEM [Utah]",
   Enabled = asset.enabled,
+  ZIndex = 10,
   FilePath = asset.resource("loladem_utah.wms"),
   TilePixelSize = 360,
   Settings = { Multiplier = 0.5 },
diff --git a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/Apollo_15_Metric_Cam_DEM.asset b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/Apollo_15_Metric_Cam_DEM.asset
index 035b0ddc0b..d80d3df96b 100644
--- a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/Apollo_15_Metric_Cam_DEM.asset
+++ b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/Apollo_15_Metric_Cam_DEM.asset
@@ -9,6 +9,7 @@ local globeIdentifier = asset.require("scene/solarsystem//planets/earth/moon/moo
 local treks_Apollo15_MetricCam_ClrShade_Global_1024ppd = {
   Identifier = "Apollo15_MetricCam_ClrShade_Global_1024ppd",
   Name = [[Apollo 15 Metric Cam DEM, ColorHillshade]],
+  ZIndex = 50,
   FilePath = asset.resource("Apollo_15_Metric_Cam_DEM/ColorHillshade.vrt"),
   Description = [[]]
 }
@@ -16,6 +17,7 @@ local treks_Apollo15_MetricCam_ClrShade_Global_1024ppd = {
 local treks_Apollo15_MetricCam_ClrConf_Global_1024ppd = {
   Identifier = "Apollo15_MetricCam_ClrConf_Global_1024ppd",
   Name = [[Apollo 15 Metric Cam DEM, Colorized Confidence]],
+  ZIndex = 50,
   FilePath = asset.resource("Apollo_15_Metric_Cam_DEM/Colorized_Confidence.vrt"),
   Description = [[]]
 }
@@ -23,6 +25,7 @@ local treks_Apollo15_MetricCam_ClrConf_Global_1024ppd = {
 local treks_Apollo15_MetricCam_Gray_Global_1024ppd = {
   Identifier = "Apollo15_MetricCam_Gray_Global_1024ppd",
   Name = [[Apollo 15 Metric Cam DEM, Grayscale]],
+  ZIndex = 50,
   FilePath = asset.resource("Apollo_15_Metric_Cam_DEM/Grayscale.vrt"),
   Description = [[]]
 }
@@ -30,6 +33,7 @@ local treks_Apollo15_MetricCam_Gray_Global_1024ppd = {
 local treks_Apollo15_MetricCam_Shade_Global_1024ppd = {
   Identifier = "Apollo15_MetricCam_Shade_Global_1024ppd",
   Name = [[Apollo 15 Metric Cam DEM, Hillshade]],
+  ZIndex = 50,
   FilePath = asset.resource("Apollo_15_Metric_Cam_DEM/Hillshade.vrt"),
   Description = [[]]
 }
diff --git a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/Apollo_15_Pan_Cam_DEM.asset b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/Apollo_15_Pan_Cam_DEM.asset
index 4a982bc9af..840be78479 100644
--- a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/Apollo_15_Pan_Cam_DEM.asset
+++ b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/Apollo_15_Pan_Cam_DEM.asset
@@ -9,6 +9,7 @@ local globeIdentifier = asset.require("scene/solarsystem//planets/earth/moon/moo
 local treks_Apollo15_PanCam_ClrShade_25N311E_5mp = {
   Identifier = "Apollo15_PanCam_ClrShade_25N311E_5mp",
   Name = [[Apollo 15 Pan Cam DEM, Aristarchus Plateau 1, ColorHillshade]],
+  ZIndex = 50,
   FilePath = asset.resource("Apollo_15_Pan_Cam_DEM/Aristarchus_Plateau_1.vrt"),
   Description = [[]]
 }
@@ -16,6 +17,7 @@ local treks_Apollo15_PanCam_ClrShade_25N311E_5mp = {
 local treks_Apollo15_PanCam_ClrShade_28N307E_3mp = {
   Identifier = "Apollo15_PanCam_ClrShade_28N307E_3mp",
   Name = [[Apollo 15 Pan Cam DEM, Aristarchus Plateau 2, ColorHillshade]],
+  ZIndex = 50,
   FilePath = asset.resource("Apollo_15_Pan_Cam_DEM/Aristarchus_Plateau_2.vrt"),
   Description = [[]]
 }
@@ -23,6 +25,7 @@ local treks_Apollo15_PanCam_ClrShade_28N307E_3mp = {
 local treks_Apollo15_PanCam_ClrShade_19S129E_5mp = {
   Identifier = "Apollo15_PanCam_ClrShade_19S129E_5mp",
   Name = [[Apollo 15 Pan Cam DEM, Tsiolkovskiy Crater, ColorHillshade]],
+  ZIndex = 50,
   FilePath = asset.resource("Apollo_15_Pan_Cam_DEM/Tsiolkovskiy_Crater.vrt"),
   Description = [[]]
 }
diff --git a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/Apollo_15_Pan_Cam_Image_Mosaic.asset b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/Apollo_15_Pan_Cam_Image_Mosaic.asset
index ce84cd9ef3..b3869761be 100644
--- a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/Apollo_15_Pan_Cam_Image_Mosaic.asset
+++ b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/Apollo_15_Pan_Cam_Image_Mosaic.asset
@@ -9,6 +9,7 @@ local globeIdentifier = asset.require("scene/solarsystem//planets/earth/moon/moo
 local treks_Apollo15_PanCam_Mosaic_25N311E_150cmp = {
   Identifier = "Apollo15_PanCam_Mosaic_25N311E_150cmp",
   Name = [[Apollo 15 Pan Cam Image Mosaic, Aristarchus Plateau 1]],
+  ZIndex = 50,
   FilePath = asset.resource("Apollo_15_Pan_Cam_Image_Mosaic/Aristarchus_Plateau_1.vrt"),
   Description = [[]]
 }
@@ -16,6 +17,7 @@ local treks_Apollo15_PanCam_Mosaic_25N311E_150cmp = {
 local treks_Apollo15_PanCam_Mosaic_28N307E_1mp = {
   Identifier = "Apollo15_PanCam_Mosaic_28N307E_1mp",
   Name = [[Apollo 15 Pan Cam Image Mosaic, Aristarchus Plateau 2]],
+  ZIndex = 50,
   FilePath = asset.resource("Apollo_15_Pan_Cam_Image_Mosaic/Aristarchus_Plateau_2.vrt"),
   Description = [[]]
 }
@@ -23,6 +25,7 @@ local treks_Apollo15_PanCam_Mosaic_28N307E_1mp = {
 local treks_Apollo15_PanCam_Mosaic_19S129E_2mp = {
   Identifier = "Apollo15_PanCam_Mosaic_19S129E_2mp",
   Name = [[Apollo 15 Pan Cam Image Mosaic, Tsiolkovskiy Crater]],
+  ZIndex = 50,
   FilePath = asset.resource("Apollo_15_Pan_Cam_Image_Mosaic/Tsiolkovskiy_Crater.vrt"),
   Description = [[]]
 }
diff --git a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/Apollo_16_Metric_Cam_DEM.asset b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/Apollo_16_Metric_Cam_DEM.asset
index 78188ee50a..73a7e05b50 100644
--- a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/Apollo_16_Metric_Cam_DEM.asset
+++ b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/Apollo_16_Metric_Cam_DEM.asset
@@ -9,6 +9,7 @@ local globeIdentifier = asset.require("scene/solarsystem//planets/earth/moon/moo
 local treks_Apollo16_MetricCam_ClrConf_Global_1024ppd = {
   Identifier = "Apollo16_MetricCam_ClrConf_Global_1024ppd",
   Name = [[Apollo 16 Metric Cam DEM, Colorized Confidence]],
+  ZIndex = 50,
   FilePath = asset.resource("Apollo_16_Metric_Cam_DEM/Colorized_Confidence.vrt"),
   Description = [[]]
 }
@@ -16,6 +17,7 @@ local treks_Apollo16_MetricCam_ClrConf_Global_1024ppd = {
 local treks_Apollo16_MetricCam_Gray_Global_1024ppd = {
   Identifier = "Apollo16_MetricCam_Gray_Global_1024ppd",
   Name = [[Apollo 16 Metric Cam DEM, Grayscale]],
+  ZIndex = 50,
   FilePath = asset.resource("Apollo_16_Metric_Cam_DEM/Grayscale.vrt"),
   Description = [[]]
 }
@@ -23,6 +25,7 @@ local treks_Apollo16_MetricCam_Gray_Global_1024ppd = {
 local treks_Apollo16_MetricCam_Shade_Global_1024ppd = {
   Identifier = "Apollo16_MetricCam_Shade_Global_1024ppd",
   Name = [[Apollo 16 Metric Cam DEM, Hillshade]],
+  ZIndex = 50,
   FilePath = asset.resource("Apollo_16_Metric_Cam_DEM/Hillshade.vrt"),
   Description = [[]]
 }
diff --git a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/Apollo_17_Metric_Cam_DEM.asset b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/Apollo_17_Metric_Cam_DEM.asset
index 0fb53f33c8..37a4522113 100644
--- a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/Apollo_17_Metric_Cam_DEM.asset
+++ b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/Apollo_17_Metric_Cam_DEM.asset
@@ -9,6 +9,7 @@ local globeIdentifier = asset.require("scene/solarsystem//planets/earth/moon/moo
 local treks_Apollo17_MetricCam_ClrShade_Global_1024ppd = {
   Identifier = "Apollo17_MetricCam_ClrShade_Global_1024ppd",
   Name = [[Apollo 17 Metric Cam DEM, ColorHillshade]],
+  ZIndex = 50,
   FilePath = asset.resource("Apollo_17_Metric_Cam_DEM/ColorHillshade.vrt"),
   Description = [[]]
 }
@@ -16,6 +17,7 @@ local treks_Apollo17_MetricCam_ClrShade_Global_1024ppd = {
 local treks_Apollo17_MetricCam_Gray_Global_1024ppd = {
   Identifier = "Apollo17_MetricCam_Gray_Global_1024ppd",
   Name = [[Apollo 17 Metric Cam DEM, Grayscale]],
+  ZIndex = 50,
   FilePath = asset.resource("Apollo_17_Metric_Cam_DEM/Grayscale.vrt"),
   Description = [[]]
 }
diff --git a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/Apollo_Zone_Metric_Cam.asset b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/Apollo_Zone_Metric_Cam.asset
index ae5681787f..590c2c561f 100644
--- a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/Apollo_Zone_Metric_Cam.asset
+++ b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/Apollo_Zone_Metric_Cam.asset
@@ -9,6 +9,7 @@ local globeIdentifier = asset.require("scene/solarsystem//planets/earth/moon/moo
 local treks_ApolloZone_MetricCam_Shade_Global_1024ppd = {
   Identifier = "ApolloZone_MetricCam_Shade_Global_1024ppd",
   Name = [[Apollo Zone Metric Cam, Hillshade]],
+  ZIndex = 50,
   FilePath = asset.resource("Apollo_Zone_Metric_Cam/Hillshade.vrt"),
   Description = [[]]
 }
diff --git a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/Apollo_Zone_Metric_Cam_DEM.asset b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/Apollo_Zone_Metric_Cam_DEM.asset
index b42db397d7..693c053f10 100644
--- a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/Apollo_Zone_Metric_Cam_DEM.asset
+++ b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/Apollo_Zone_Metric_Cam_DEM.asset
@@ -9,6 +9,7 @@ local globeIdentifier = asset.require("scene/solarsystem//planets/earth/moon/moo
 local treks_ApolloZone_MetricCam_ClrShade_Global_1024ppd = {
   Identifier = "ApolloZone_MetricCam_ClrShade_Global_1024ppd",
   Name = [[Apollo Zone Metric Cam DEM, ColorHillshade]],
+  ZIndex = 50,
   FilePath = asset.resource("Apollo_Zone_Metric_Cam_DEM/ColorHillshade.vrt"),
   Description = [[]]
 }
diff --git a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/Global.asset b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/Global.asset
index 81130e1b68..ffc28d4218 100644
--- a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/Global.asset
+++ b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/Global.asset
@@ -9,6 +9,7 @@ local globeIdentifier = asset.require("scene/solarsystem//planets/earth/moon/moo
 local treks_Apollo15_MetricCam_Mosaic_Global_4096ppd = {
   Identifier = "Apollo15_MetricCam_Mosaic_Global_4096ppd",
   Name = [[Apollo 15 Metric Cam Image Mosaic]],
+  ZIndex = 50,
   FilePath = asset.resource("Global/Apollo_15_Metric_Cam_Image_Mosaic.vrt"),
   Description = [[]]
 }
@@ -16,6 +17,7 @@ local treks_Apollo15_MetricCam_Mosaic_Global_4096ppd = {
 local treks_Apollo17_MetricCam_Mosaic_Global_3033ppd = {
   Identifier = "Apollo17_MetricCam_Mosaic_Global_3033ppd",
   Name = [[Apollo 17 Metric Cam Image Mosaic]],
+  ZIndex = 50,
   FilePath = asset.resource("Global/Apollo_17_Metric_Cam_Image_Mosaic.vrt"),
   Description = [[]]
 }
@@ -23,6 +25,7 @@ local treks_Apollo17_MetricCam_Mosaic_Global_3033ppd = {
 local treks_ApolloZone_MetricCam_Mosaic_Global_3033ppd = {
   Identifier = "ApolloZone_MetricCam_Mosaic_Global_3033ppd",
   Name = [[Apollo Zone Metric Cam Image Mosaic]],
+  ZIndex = 50,
   FilePath = asset.resource("Global/Apollo_Zone_Metric_Cam_Image_Mosaic.vrt"),
   Description = [[]]
 }
@@ -30,6 +33,7 @@ local treks_ApolloZone_MetricCam_Mosaic_Global_3033ppd = {
 local treks_Clem_UVVIS_FeO_Clr_Global_152ppd = {
   Identifier = "Clem_UVVIS_FeO_Clr_Global_152ppd",
   Name = [[Clementine UVVIS FeO Weight Percent]],
+  ZIndex = 50,
   FilePath = asset.resource("Global/Clementine_UVVIS_FeO_Weight_Percent.vrt"),
   Description = [[]]
 }
@@ -37,6 +41,7 @@ local treks_Clem_UVVIS_FeO_Clr_Global_152ppd = {
 local treks_Clem_UVVIS_OpticalMaturity_Gray_Global_152ppd = {
   Identifier = "Clem_UVVIS_OpticalMaturity_Gray_Global_152ppd",
   Name = [[Clementine UVVIS Optical Maturity]],
+  ZIndex = 50,
   FilePath = asset.resource("Global/Clementine_UVVIS_Optical_Maturity.vrt"),
   Description = [[]]
 }
@@ -44,6 +49,7 @@ local treks_Clem_UVVIS_OpticalMaturity_Gray_Global_152ppd = {
 local treks_Clem_UVVIS_TiO2_Clr_Global_152ppd = {
   Identifier = "Clem_UVVIS_TiO2_Clr_Global_152ppd",
   Name = [[Clementine UVVIS TiO2 Weight Percent]],
+  ZIndex = 50,
   FilePath = asset.resource("Global/Clementine_UVVIS_TiO2_Weight_Percent.vrt"),
   Description = [[]]
 }
@@ -51,6 +57,7 @@ local treks_Clem_UVVIS_TiO2_Clr_Global_152ppd = {
 local treks_Kaguya_TCortho_Mosaic_Global_4096ppd = {
   Identifier = "Kaguya_TCortho_Mosaic_Global_4096ppd",
   Name = [[Kaguya TC Ortho Mosaic]],
+  ZIndex = 50,
   FilePath = asset.resource("Global/Kaguya_TC_Ortho_Mosaic.vrt"),
   Description = [[]]
 }
@@ -58,6 +65,7 @@ local treks_Kaguya_TCortho_Mosaic_Global_4096ppd = {
 local treks_LP_NS_H_Clr_Global_2ppd = {
   Identifier = "LP_NS_H_Clr_Global_2ppd",
   Name = [[LP NS H Abundance]],
+  ZIndex = 50,
   FilePath = asset.resource("Global/LP_NS_H_Abundance.vrt"),
   Description = [[]]
 }
@@ -65,6 +73,7 @@ local treks_LP_NS_H_Clr_Global_2ppd = {
 local treks_LRO_Diviner_CF_NoFill_Global_8ppd = {
   Identifier = "LRO_Diviner_CF_NoFill_Global_8ppd",
   Name = [[LRO Diviner CF Mosaic]],
+  ZIndex = 50,
   FilePath = asset.resource("Global/LRO_Diviner_CF_Mosaic.vrt"),
   Description = [[]]
 }
@@ -72,6 +81,7 @@ local treks_LRO_Diviner_CF_NoFill_Global_8ppd = {
 local treks_LRO_WAC_Mosaic_Global_303ppd = {
   Identifier = "LRO_WAC_Mosaic_Global_303ppd",
   Name = [[LRO LROC WAC Image Mosaic]],
+  ZIndex = 50,
   FilePath = asset.resource("Global/LRO_LROC_WAC_Image_Mosaic.vrt"),
   Description = [[]]
 }
@@ -79,6 +89,7 @@ local treks_LRO_WAC_Mosaic_Global_303ppd = {
 local treks_LRO_MiniRF_S1_Gray_Global_128ppd = {
   Identifier = "LRO_MiniRF_S1_Gray_Global_128ppd",
   Name = [[LRO Mini-RF First Stokes Parameter]],
+  ZIndex = 50,
   FilePath = asset.resource("Global/LRO_Mini-RF_First_Stokes_Parameter.vrt"),
   Description = [[]]
 }
@@ -86,6 +97,7 @@ local treks_LRO_MiniRF_S1_Gray_Global_128ppd = {
 local treks_LRO_WAC_Mosaic_Global_303ppd_v02 = {
   Identifier = "LRO_WAC_Mosaic_Global_303ppd_v02",
   Name = [[LRO WAC Mosaic v2]],
+  ZIndex = 50,
   FilePath = asset.resource("Global/LRO_WAC_Mosaic_v2.vrt"),
   Description = [[]]
 }
@@ -93,6 +105,7 @@ local treks_LRO_WAC_Mosaic_Global_303ppd_v02 = {
 local treks_SchrodingerCraterMareUnit_50cmV10eq = {
   Identifier = "SchrodingerCraterMareUnit_50cmV10eq",
   Name = [[LROC NAC Uncontrolled Mosaic of Mare Unit in Schrodinger Crater]],
+  ZIndex = 50,
   FilePath = asset.resource("Global/LROC_NAC_Uncontrolled_Mosaic_of_Mare_Unit_in_Schrodinger_Crater.vrt"),
   Description = [[This is a 50cm/px uncontrolled visible image mosaic generated using Lunar Reconnaissance Orbiter Camera (LROC) Narrow Angle Camera (NAC) images from the Lunar Reconnaissance Orbiter mission. Each NAC image was registered horizontally to the LRO's Lunar Orbiter Laser Altimeter (LOLA) global DEM, and then mosaicked together and color balanced. ]]
 }
@@ -100,6 +113,7 @@ local treks_SchrodingerCraterMareUnit_50cmV10eq = {
 local treks_SchrodingerCraterMassif_50cmV10eq = {
   Identifier = "SchrodingerCraterMassif_50cmV10eq",
   Name = [[LROC NAC Uncontrolled Mosaic of Massif in Schrodinger Crater]],
+  ZIndex = 50,
   FilePath = asset.resource("Global/LROC_NAC_Uncontrolled_Mosaic_of_Massif_in_Schrodinger_Crater.vrt"),
   Description = [[This is a 50cm/px uncontrolled visible image mosaic generated using Lunar Reconnaissance Orbiter Camera (LROC) Narrow Angle Camera (NAC) images from the Lunar Reconnaissance Orbiter mission. Each NAC image was registered horizontally to the LRO's Lunar Orbiter Laser Altimeter (LOLA) global DEM, and then mosaicked together and color balanced. ]]
 }
@@ -107,6 +121,7 @@ local treks_SchrodingerCraterMassif_50cmV10eq = {
 local treks_LRO_LOLAKaguya_ClrHillshade_60N60S_512ppd = {
   Identifier = "LRO_LOLAKaguya_ClrHillshade_60N60S_512ppd",
   Name = [[LRO LOLA and Kaguya TC Color Hillshade 512ppd]],
+  ZIndex = 50,
   FilePath = asset.resource("Global/LRO_LOLA_and_Kaguya_TC_Color_Hillshade_512ppd.vrt"),
   Description = [[This is a colorized shaded-relief representation of the Lunar surface generated from the LOLA and Kaguya merged DEM product. The LOLA and Kaguya Teams have created an improved lunar digital elevation model (DEM) covering latitudes within &plusmn;60&deg;, at a horizontal resolution of 512 pixels per degree (&sim;59 m at the equator) and a typical vertical accuracy &sim;3 to 4 m. This DEM is constructed from &sim;4.5&times;109 geodetically-accurate topographic heights from the Lunar Orbiter Laser Altimeter (LOLA) onboard the Lunar Reconnaissance Orbiter, to which we co-registered 43,200 stereo-derived DEMs (each 1&times;1 degree) from the SELENE Terrain Camera (TC) (&sim;1010 pixels total). After co-registration, approximately 90&percnt; of the TC DEMs show root-mean-square vertical residuals with the LOLA data of &lt;5 m compared to &sim;50&percnt; prior to co-registration. We use the co-registered TC data to estimate and correct orbital and pointing geolocation errors from the LOLA altimetric profiles (typically amounting to &lt;10 m horizontally and &lt;1 m vertically). By combining both co-registered datasets, we obtain a near-global DEM with high geodetic accuracy, and without the need for surface interpolation. We evaluate the resulting LOLA + TC merged DEM (designated as &ldquo;SLDEM2015&rdquo;) with particular attention to quantifying seams and crossover errors. The legend coveys the mapping colors to elevation values (meters) and map values are referred to a radius of 1737400 m.]]
 }
@@ -114,6 +129,7 @@ local treks_LRO_LOLAKaguya_ClrHillshade_60N60S_512ppd = {
 local treks_LRO_LOLAKaguya_Hillshade_60N60S_512ppd = {
   Identifier = "LRO_LOLAKaguya_Hillshade_60N60S_512ppd",
   Name = [[LRO LOLA and Kaguya TC Hillshade 512ppd]],
+  ZIndex = 50,
   FilePath = asset.resource("Global/LRO_LOLA_and_Kaguya_TC_Hillshade_512ppd.vrt"),
   Description = [[This is a shaded-relief representation of the Lunar surface generated from the LOLA and Kaguya merged DEM product. The LOLA and Kaguya Teams have created an improved lunar digital elevation model (DEM) covering latitudes within &plusmn;60&deg;, at a horizontal resolution of 512 pixels per degree (&sim;59 m at the equator) and a typical vertical accuracy &sim;3 to 4 m. This DEM is constructed from &sim;4.5&times;109 geodetically-accurate topographic heights from the Lunar Orbiter Laser Altimeter (LOLA) onboard the Lunar Reconnaissance Orbiter, to which we co-registered 43,200 stereo-derived DEMs (each 1&times;1 degree) from the SELENE Terrain Camera (TC) (&sim;1010 pixels total). After co-registration, approximately 90&percnt; of the TC DEMs show root-mean-square vertical residuals with the LOLA data of &lt;5 m compared to &sim;50&percnt; prior to co-registration. We use the co-registered TC data to estimate and correct orbital and pointing geolocation errors from the LOLA altimetric profiles (typically amounting to &lt;10 m horizontally and &lt;1 m vertically). By combining both co-registered datasets, we obtain a near-global DEM with high geodetic accuracy, and without the need for surface interpolation. We evaluate the resulting LOLA + TC merged DEM (designated as &ldquo;SLDEM2015&rdquo;) with particular attention to quantifying seams and crossover errors. Elevation values are in meters and map values are referred to a radius of 1737400 m.]]
 }
@@ -121,6 +137,7 @@ local treks_LRO_LOLAKaguya_Hillshade_60N60S_512ppd = {
 local treks_Lunar_Clementine_UVVIS_Warp_ClrRatio_Global_200m = {
   Identifier = "Lunar_Clementine_UVVIS_Warp_ClrRatio_Global_200m",
   Name = [[Clementine UVVIS Warped Color Ratio]],
+  ZIndex = 50,
   FilePath = asset.resource("Global/Clementine_UVVIS_Warped_Color_Ratio.vrt"),
   Description = [[This base represents the Clementine Ultraviolet/Visible (UVVIS) warped color-ratio mineral map. This was generated from the UVVIS mosaics using three spectral filters (415, 750, and 1000 nm) and which were previously warped (spatially adjusted) to the ULCN2005 control network. The mosaic is a composite in which the ratio of the 750/415nm bands is used for the red-channel brightness, 415/750nm for the blue channel, and the 750/1000nm ratio controls the green channel. Resolution of this mosaic is 200 meters per pixel (m).
 
@@ -134,6 +151,7 @@ For more information on how the color ratio was derived, please see Lucy et al.,
 local treks_LRO_LOLA_Illumination_NPole65N_240m_EQ = {
   Identifier = "LRO_LOLA_Illumination_NPole65N_240m_EQ",
   Name = [[LOLA Permanently Shadowed Regions Northpole 240m]],
+  ZIndex = 50,
   FilePath = asset.resource("Global/LOLA_Permanently_Shadowed_Regions_Northpole_240m.vrt"),
   Description = [[This data product is a map of the permanently shadowed regions (PSRs) in the lunar North Pole. The map resolution is 240m/pix by 240m/pix, true at the pole in polar stereographic (spherical) projection. The calculations are based on the LOLA elevation map LDEM_75N_240M and are described in. The values are binary, indicating whether a pixel is in permanent shadow (1) or not (0, NoDATA).]]
 }
@@ -141,6 +159,7 @@ local treks_LRO_LOLA_Illumination_NPole65N_240m_EQ = {
 local treks_LRO_LOLA_Illumination_SPole65S_240m_EQ = {
   Identifier = "LRO_LOLA_Illumination_SPole65S_240m_EQ",
   Name = [[LOLA Permanently Shadowed Regions Southpole 240m]],
+  ZIndex = 50,
   FilePath = asset.resource("Global/LOLA_Permanently_Shadowed_Regions_Southpole_240m.vrt"),
   Description = [[This data product is a map of the permanently shadowed regions (PSRs) in the lunar South Pole. The map resolution is 240m/pix by 240m/pix, true at the pole in polar stereographic (spherical) projection. The calculations are based on the LOLA elevation map LDEM_75S_240M and are described in. The values are binary, indicating whether a pixel is in permanent shadow (1) or not (0, NoDATA).]]
 }
diff --git a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/Kaguya_LGM2011_Freeair_Gravity.asset b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/Kaguya_LGM2011_Freeair_Gravity.asset
index ecb16dc40f..c657df0965 100644
--- a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/Kaguya_LGM2011_Freeair_Gravity.asset
+++ b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/Kaguya_LGM2011_Freeair_Gravity.asset
@@ -9,6 +9,7 @@ local globeIdentifier = asset.require("scene/solarsystem//planets/earth/moon/moo
 local treks_Kaguya_LGM2011_FreeairGravity_Colorized_Global_mgal3m_20ppd = {
   Identifier = "Kaguya_LGM2011_FreeairGravity_Colorized_Global_mgal3m_20ppd",
   Name = [[Kaguya LGM2011 Freeair Gravity, Colorized]],
+  ZIndex = 50,
   FilePath = asset.resource("Kaguya_LGM2011_Freeair_Gravity/Colorized.vrt"),
   Description = [[]]
 }
@@ -16,6 +17,7 @@ local treks_Kaguya_LGM2011_FreeairGravity_Colorized_Global_mgal3m_20ppd = {
 local treks_Kaguya_LGM2011_FreeairGravity_Gray_Global_mgal3m_20ppd = {
   Identifier = "Kaguya_LGM2011_FreeairGravity_Gray_Global_mgal3m_20ppd",
   Name = [[Kaguya LGM2011 Freeair Gravity, Greyscale]],
+  ZIndex = 50,
   FilePath = asset.resource("Kaguya_LGM2011_Freeair_Gravity/Greyscale.vrt"),
   Description = [[]]
 }
diff --git a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/Kaguya_LGM2011_Surface_Gravity.asset b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/Kaguya_LGM2011_Surface_Gravity.asset
index 6f91fd6335..b595acc0c0 100644
--- a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/Kaguya_LGM2011_Surface_Gravity.asset
+++ b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/Kaguya_LGM2011_Surface_Gravity.asset
@@ -9,6 +9,7 @@ local globeIdentifier = asset.require("scene/solarsystem//planets/earth/moon/moo
 local treks_Kaguya_LGM2011_SurfaceGravity_Colorized_Global_mgal3m_20ppd = {
   Identifier = "Kaguya_LGM2011_SurfaceGravity_Colorized_Global_mgal3m_20ppd",
   Name = [[Kaguya LGM2011 Surface Gravity, Colorized]],
+  ZIndex = 50,
   FilePath = asset.resource("Kaguya_LGM2011_Surface_Gravity/Colorized.vrt"),
   Description = [[]]
 }
@@ -16,6 +17,7 @@ local treks_Kaguya_LGM2011_SurfaceGravity_Colorized_Global_mgal3m_20ppd = {
 local treks_Kaguya_LGM2011_SurfaceGravity_Gray_Global_mgal3m_20ppd = {
   Identifier = "Kaguya_LGM2011_SurfaceGravity_Gray_Global_mgal3m_20ppd",
   Name = [[Kaguya LGM2011 Surface Gravity, Greyscale]],
+  ZIndex = 50,
   FilePath = asset.resource("Kaguya_LGM2011_Surface_Gravity/Greyscale.vrt"),
   Description = [[]]
 }
diff --git a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LOLA_Roughness_16ppd.asset b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LOLA_Roughness_16ppd.asset
index 9bcb27c76e..3188e92ec7 100644
--- a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LOLA_Roughness_16ppd.asset
+++ b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LOLA_Roughness_16ppd.asset
@@ -9,6 +9,7 @@ local globeIdentifier = asset.require("scene/solarsystem//planets/earth/moon/moo
 local treks_LRO_LOLA_ClrRoughness_Global_16ppd = {
   Identifier = "LRO_LOLA_ClrRoughness_Global_16ppd",
   Name = [[LOLA Roughness 16ppd, Colorized]],
+  ZIndex = 50,
   FilePath = asset.resource("LOLA_Roughness_16ppd/Colorized.vrt"),
   Description = [[]]
 }
diff --git a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LOLA_Slope_16ppd.asset b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LOLA_Slope_16ppd.asset
index 911e56f518..921d3bb343 100644
--- a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LOLA_Slope_16ppd.asset
+++ b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LOLA_Slope_16ppd.asset
@@ -9,6 +9,7 @@ local globeIdentifier = asset.require("scene/solarsystem//planets/earth/moon/moo
 local treks_LRO_LOLA_ClrSlope_Global_16ppd = {
   Identifier = "LRO_LOLA_ClrSlope_Global_16ppd",
   Name = [[LOLA Slope 16ppd, Colorized]],
+  ZIndex = 50,
   FilePath = asset.resource("LOLA_Slope_16ppd/Colorized.vrt"),
   Description = [[]]
 }
diff --git a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LOLA_Slope_Northpole_120m.asset b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LOLA_Slope_Northpole_120m.asset
index 19dd265fbf..8038c82b4c 100644
--- a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LOLA_Slope_Northpole_120m.asset
+++ b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LOLA_Slope_Northpole_120m.asset
@@ -9,6 +9,7 @@ local globeIdentifier = asset.require("scene/solarsystem//planets/earth/moon/moo
 local treks_LRO_LOLA_ClrSlope_NPole75N_120m_EQ = {
   Identifier = "LRO_LOLA_ClrSlope_NPole75N_120m_EQ",
   Name = [[LOLA Slope Northpole 120m, Colorized]],
+  ZIndex = 50,
   FilePath = asset.resource("LOLA_Slope_Northpole_120m/Colorized.vrt"),
   Description = [[This is a colorized map of the original north polar surface slope of the Moon at a resolution of 16 m/pix by 16 m/pix, based on altimetry data acquired by the LOLA instrument. The LOLA Laser 1 and 2 data through mission phase LRO_SM_17 are the source for this data set. The bi-directional slope was calculated from a plane fit to three successive laser shots requiring n=5 to 15 profile returns. Depending on orbital velocity, probability of detection, and spacecraft altitude, the slope baseline may vary from 30 to 120 meters.]]
 }
diff --git a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LOLA_Slope_Southpole_120m.asset b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LOLA_Slope_Southpole_120m.asset
index 933ee335d4..89c3d68331 100644
--- a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LOLA_Slope_Southpole_120m.asset
+++ b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LOLA_Slope_Southpole_120m.asset
@@ -9,6 +9,7 @@ local globeIdentifier = asset.require("scene/solarsystem//planets/earth/moon/moo
 local treks_LRO_LOLA_ClrSlope_SPole75S_120m_EQ = {
   Identifier = "LRO_LOLA_ClrSlope_SPole75S_120m_EQ",
   Name = [[LOLA Slope Southpole 120m, Colorized]],
+  ZIndex = 50,
   FilePath = asset.resource("LOLA_Slope_Southpole_120m/Colorized.vrt"),
   Description = [[This is a colorized map of the original south polar surface slope of the Moon at a resolution of 16 m/pix by 16 m/pix, based on altimetry data acquired by the LOLA instrument. The LOLA Laser 1 and 2 data through mission phase LRO_SM_17 are the source for this data set. The bi-directional slope was calculated from a plane fit to three successive laser shots requiring n=5 to 15 profile returns. Depending on orbital velocity, probability of detection, and spacecraft altitude, the slope baseline may vary from 30 to 120 meters.]]
 }
diff --git a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LOLA_and_TC_Stereo_DEM_Merge_512ppd.asset b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LOLA_and_TC_Stereo_DEM_Merge_512ppd.asset
index 793771bf60..ec696baee9 100644
--- a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LOLA_and_TC_Stereo_DEM_Merge_512ppd.asset
+++ b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LOLA_and_TC_Stereo_DEM_Merge_512ppd.asset
@@ -9,6 +9,7 @@ local globeIdentifier = asset.require("scene/solarsystem//planets/earth/moon/moo
 local treks_LRO_LrocKaguya_Shade_60N60S_512ppd = {
   Identifier = "LRO_LrocKaguya_Shade_60N60S_512ppd",
   Name = [[LOLA and TC Stereo DEM Merge 512ppd, Shade]],
+  ZIndex = 50,
   FilePath = asset.resource("LOLA_and_TC_Stereo_DEM_Merge_512ppd/Shade.vrt"),
   Description = [[]]
 }
diff --git a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LROC_NAC_Uncontrolled_Mosaic_of_Region_Inside_Schrodinger_Crater.asset b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LROC_NAC_Uncontrolled_Mosaic_of_Region_Inside_Schrodinger_Crater.asset
index e4f335c548..28bdf64217 100644
--- a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LROC_NAC_Uncontrolled_Mosaic_of_Region_Inside_Schrodinger_Crater.asset
+++ b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LROC_NAC_Uncontrolled_Mosaic_of_Region_Inside_Schrodinger_Crater.asset
@@ -9,6 +9,7 @@ local globeIdentifier = asset.require("scene/solarsystem//planets/earth/moon/moo
 local treks_SchrodingerMareNortheq = {
   Identifier = "SchrodingerMareNortheq",
   Name = [[LROC NAC Uncontrolled Mosaic of Region Inside Schrodinger Crater, 50cm/px]],
+  ZIndex = 50,
   FilePath = asset.resource("LROC_NAC_Uncontrolled_Mosaic_of_Region_Inside_Schrodinger_Crater/50cmpx.vrt"),
   Description = [[This is a 50cm/px uncontrolled visible image mosaic generated using Lunar Reconnaissance Orbiter Camera (LROC) Narrow Angle Camera (NAC) images from the Lunar Reconnaissance Orbiter mission. Each NAC image was registered horizontally to the LRO's Lunar Orbiter Laser Altimeter (LOLA) global DEM, and then mosaicked together and color balanced.]]
 }
diff --git a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LROC_NAC_Uncontrolled_Mosaic_of_Schrodinger_Crater.asset b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LROC_NAC_Uncontrolled_Mosaic_of_Schrodinger_Crater.asset
index bb150794f5..88ca59fa02 100644
--- a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LROC_NAC_Uncontrolled_Mosaic_of_Schrodinger_Crater.asset
+++ b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LROC_NAC_Uncontrolled_Mosaic_of_Schrodinger_Crater.asset
@@ -9,6 +9,7 @@ local globeIdentifier = asset.require("scene/solarsystem//planets/earth/moon/moo
 local treks_allSchrodinger_10mV10eq = {
   Identifier = "allSchrodinger_10mV10eq",
   Name = [[LROC NAC Uncontrolled Mosaic of Schrodinger Crater, 10m/px]],
+  ZIndex = 50,
   FilePath = asset.resource("LROC_NAC_Uncontrolled_Mosaic_of_Schrodinger_Crater/10mpx.vrt"),
   Description = [[This is a 10m/px uncontrolled visible image mosaic generated using Lunar Reconnaissance Orbiter Camera (LROC) Narrow Angle Camera (NAC) images from the Lunar Reconnaissance Orbiter mission. Each NAC image was registered horizontally to the LRO's Lunar Orbiter Laser Altimeter (LOLA) global DEM, and then mosaicked together and color balanced.]]
 }
diff --git a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_Diviner_CF_Mosaic.asset b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_Diviner_CF_Mosaic.asset
index faeab9f096..8110780f9a 100644
--- a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_Diviner_CF_Mosaic.asset
+++ b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_Diviner_CF_Mosaic.asset
@@ -9,6 +9,7 @@ local globeIdentifier = asset.require("scene/solarsystem//planets/earth/moon/moo
 local treks_LRO_Diviner_CF_Filled_Global_8ppd = {
   Identifier = "LRO_Diviner_CF_Filled_Global_8ppd",
   Name = [[LRO Diviner CF Mosaic, Filled]],
+  ZIndex = 50,
   FilePath = asset.resource("LRO_Diviner_CF_Mosaic/Filled.vrt"),
   Description = [[]]
 }
diff --git a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_Diviner_CF_Mosaic_128ppd.asset b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_Diviner_CF_Mosaic_128ppd.asset
index 862059b9ab..8c2213868d 100644
--- a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_Diviner_CF_Mosaic_128ppd.asset
+++ b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_Diviner_CF_Mosaic_128ppd.asset
@@ -9,6 +9,7 @@ local globeIdentifier = asset.require("scene/solarsystem//planets/earth/moon/moo
 local treks_LRO_DIVINER_ClrCF_Global_128ppd = {
   Identifier = "LRO_DIVINER_ClrCF_Global_128ppd",
   Name = [[LRO Diviner CF Mosaic 128ppd, Colorized]],
+  ZIndex = 50,
   FilePath = asset.resource("LRO_Diviner_CF_Mosaic_128ppd/Colorized.vrt"),
   Description = [[]]
 }
diff --git a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_Diviner_Surface_Temp_Avg.asset b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_Diviner_Surface_Temp_Avg.asset
index 3da55102bb..f4f45fc940 100644
--- a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_Diviner_Surface_Temp_Avg.asset
+++ b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_Diviner_Surface_Temp_Avg.asset
@@ -9,6 +9,7 @@ local globeIdentifier = asset.require("scene/solarsystem//planets/earth/moon/moo
 local treks_LRO_Diviner_ST_Avg_Clr_Global_32ppd = {
   Identifier = "LRO_Diviner_ST_Avg_Clr_Global_32ppd",
   Name = [[LRO Diviner Surface Temp Avg, Color]],
+  ZIndex = 50,
   FilePath = asset.resource("LRO_Diviner_Surface_Temp_Avg/Color.vrt"),
   Description = [[]]
 }
diff --git a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_Diviner_Surface_Temp_Normal_Avg.asset b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_Diviner_Surface_Temp_Normal_Avg.asset
index 0533a6b9b9..bc4c9e4e89 100644
--- a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_Diviner_Surface_Temp_Normal_Avg.asset
+++ b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_Diviner_Surface_Temp_Normal_Avg.asset
@@ -9,6 +9,7 @@ local globeIdentifier = asset.require("scene/solarsystem//planets/earth/moon/moo
 local treks_LRO_Diviner_STN_Avg_Clr_Global_32ppd = {
   Identifier = "LRO_Diviner_STN_Avg_Clr_Global_32ppd",
   Name = [[LRO Diviner Surface Temp Normal Avg, Color]],
+  ZIndex = 50,
   FilePath = asset.resource("LRO_Diviner_Surface_Temp_Normal_Avg/Color.vrt"),
   Description = [[]]
 }
diff --git a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_Diviner_Surface_Temperature_Mosaic_128ppd.asset b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_Diviner_Surface_Temperature_Mosaic_128ppd.asset
index 67955e8b5d..b30c21be36 100644
--- a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_Diviner_Surface_Temperature_Mosaic_128ppd.asset
+++ b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_Diviner_Surface_Temperature_Mosaic_128ppd.asset
@@ -9,6 +9,7 @@ local globeIdentifier = asset.require("scene/solarsystem//planets/earth/moon/moo
 local treks_LRO_DIVINER_ClrRockFreeSurfaceTemp_Global_128ppd = {
   Identifier = "LRO_DIVINER_ClrRockFreeSurfaceTemp_Global_128ppd",
   Name = [[LRO Diviner Surface Temperature Mosaic 128ppd, Colorized]],
+  ZIndex = 50,
   FilePath = asset.resource("LRO_Diviner_Surface_Temperature_Mosaic_128ppd/Colorized.vrt"),
   Description = [[]]
 }
diff --git a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LOLA_DEM.asset b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LOLA_DEM.asset
index 6ed71a2476..ac75e550c2 100644
--- a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LOLA_DEM.asset
+++ b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LOLA_DEM.asset
@@ -9,6 +9,7 @@ local globeIdentifier = asset.require("scene/solarsystem//planets/earth/moon/moo
 local treks_LRO_LOLA_ClrShade_Global_128ppd_v04 = {
   Identifier = "LRO_LOLA_ClrShade_Global_128ppd_v04",
   Name = [[LRO LOLA DEM, ColorHillshade]],
+  ZIndex = 50,
   FilePath = asset.resource("LRO_LOLA_DEM/ColorHillshade.vrt"),
   Description = [[]]
 }
@@ -16,6 +17,7 @@ local treks_LRO_LOLA_ClrShade_Global_128ppd_v04 = {
 local treks_LRO_LOLA_ClrShade_Global_256ppd_v06 = {
   Identifier = "LRO_LOLA_ClrShade_Global_256ppd_v06",
   Name = [[LRO LOLA DEM, ColorHillshade v6]],
+  ZIndex = 50,
   FilePath = asset.resource("LRO_LOLA_DEM/ColorHillshade_v6.vrt"),
   Description = [[]]
 }
@@ -23,6 +25,7 @@ local treks_LRO_LOLA_ClrShade_Global_256ppd_v06 = {
 local treks_LRO_LOLA_Coverage_Global_128ppd_v04 = {
   Identifier = "LRO_LOLA_Coverage_Global_128ppd_v04",
   Name = [[LRO LOLA DEM, Coverage]],
+  ZIndex = 50,
   FilePath = asset.resource("LRO_LOLA_DEM/Coverage.vrt"),
   Description = [[]]
 }
@@ -30,6 +33,7 @@ local treks_LRO_LOLA_Coverage_Global_128ppd_v04 = {
 local treks_LRO_LOLA_Shade_Global_256ppd_v06 = {
   Identifier = "LRO_LOLA_Shade_Global_256ppd_v06",
   Name = [[LRO LOLA DEM, Hillshade]],
+  ZIndex = 50,
   FilePath = asset.resource("LRO_LOLA_DEM/Hillshade.vrt"),
   Description = [[]]
 }
@@ -37,6 +41,7 @@ local treks_LRO_LOLA_Shade_Global_256ppd_v06 = {
 local treks_LRO_LOLA_NoDataMask_Global_128ppd_v04 = {
   Identifier = "LRO_LOLA_NoDataMask_Global_128ppd_v04",
   Name = [[LRO LOLA DEM, No Data Mask]],
+  ZIndex = 50,
   FilePath = asset.resource("LRO_LOLA_DEM/No_Data_Mask.vrt"),
   Description = [[]]
 }
@@ -44,6 +49,7 @@ local treks_LRO_LOLA_NoDataMask_Global_128ppd_v04 = {
 local treks_LRO_LOLA_ClrShade_NPole875_5mp_v04_EQ = {
   Identifier = "LRO_LOLA_ClrShade_NPole875_5mp_v04_EQ",
   Name = [[LRO LOLA DEM, N Pole, 87.5 deg, ColorHillshade]],
+  ZIndex = 50,
   FilePath = asset.resource("LRO_LOLA_DEM/N_Pole.vrt"),
   Description = [[This is version 4 of the LRO LOLA North Pole 87.5 deg DEM, ColorHillshade. This is a colorized shaded-relief of a original polar LOLA Digital Elevation Model (DEM). The DEM is a shape map (radius) of the Moon at a resolution 100 meters per pixel, based on altimetry data acquired through Spetember 2011 by the LOLA instrument. The ground tracks were interpolated using the Generic Mapping Tools programs "surface" and "grdblend". Map values are referred to a radius of 1737400 m.]]
 }
@@ -51,6 +57,7 @@ local treks_LRO_LOLA_ClrShade_NPole875_5mp_v04_EQ = {
 local treks_LRO_LOLA_ClrShade_SPole875_5mp_v04_EQ = {
   Identifier = "LRO_LOLA_ClrShade_SPole875_5mp_v04_EQ",
   Name = [[LRO LOLA DEM, S Pole, 87.5 deg, ColorHillshade]],
+  ZIndex = 50,
   FilePath = asset.resource("LRO_LOLA_DEM/S_Pole.vrt"),
   Description = [[This is version 4 of the LRO LOLA South Pole 87.5 deg DEM, ColorHillshade. This is a colorized shaded-relief of a original polar LOLA Digital Elevation Model (DEM). The DEM is a shape map (radius) of the Moon at a resolution 100 meters per pixel, based on altimetry data acquired through Spetember 2011 by the LOLA instrument. The ground tracks were interpolated using the Generic Mapping Tools programs "surface" and "grdblend". Map values are referred to a radius of 1737400 m.]]
 }
diff --git a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Crater_Abundance.asset b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Crater_Abundance.asset
index 306ef4a4a7..21ac0858c3 100644
--- a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Crater_Abundance.asset
+++ b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Crater_Abundance.asset
@@ -9,6 +9,7 @@ local globeIdentifier = asset.require("scene/solarsystem//planets/earth/moon/moo
 local treks_LRO_NAC_CratAbnd_17S173E_150cmp = {
   Identifier = "LRO_NAC_CratAbnd_17S173E_150cmp",
   Name = [[LRO LROC Crater Abundance, Aitken Crater]],
+  ZIndex = 50,
   FilePath = asset.resource("LRO_LROC_Crater_Abundance/Aitken_Crater.vrt"),
   Description = [[]]
 }
@@ -16,6 +17,7 @@ local treks_LRO_NAC_CratAbnd_17S173E_150cmp = {
 local treks_LRO_NAC_CratAbnd_13S358E_2mp = {
   Identifier = "LRO_NAC_CratAbnd_13S358E_2mp",
   Name = [[LRO LROC Crater Abundance, Alphonsus Crater]],
+  ZIndex = 50,
   FilePath = asset.resource("LRO_LROC_Crater_Abundance/Alphonsus_Crater.vrt"),
   Description = [[]]
 }
@@ -23,6 +25,7 @@ local treks_LRO_NAC_CratAbnd_13S358E_2mp = {
 local treks_LRO_NAC_CratAbnd_73N350E_150cmp = {
   Identifier = "LRO_NAC_CratAbnd_73N350E_150cmp",
   Name = [[LRO LROC Crater Abundance, Anaxagoras Crater]],
+  ZIndex = 50,
   FilePath = asset.resource("LRO_LROC_Crater_Abundance/Anaxagoras_Crater.vrt"),
   Description = [[]]
 }
@@ -30,6 +33,7 @@ local treks_LRO_NAC_CratAbnd_73N350E_150cmp = {
 local treks_LRO_NAC_CratAbnd_26N004E_150cmp = {
   Identifier = "LRO_NAC_CratAbnd_26N004E_150cmp",
   Name = [[LRO LROC Crater Abundance, Apollo 15]],
+  ZIndex = 50,
   FilePath = asset.resource("LRO_LROC_Crater_Abundance/Apollo_15.vrt"),
   Description = [[]]
 }
@@ -37,6 +41,7 @@ local treks_LRO_NAC_CratAbnd_26N004E_150cmp = {
 local treks_LRO_NAC_CratAbnd_09S015E_150cmp = {
   Identifier = "LRO_NAC_CratAbnd_09S015E_150cmp",
   Name = [[LRO LROC Crater Abundance, Apollo 16]],
+  ZIndex = 50,
   FilePath = asset.resource("LRO_LROC_Crater_Abundance/Apollo_16.vrt"),
   Description = [[]]
 }
@@ -44,6 +49,7 @@ local treks_LRO_NAC_CratAbnd_09S015E_150cmp = {
 local treks_LRO_NAC_CratAbnd_37S206E_150cmp = {
   Identifier = "LRO_NAC_CratAbnd_37S206E_150cmp",
   Name = [[LRO LROC Crater Abundance, Apollo Basin]],
+  ZIndex = 50,
   FilePath = asset.resource("LRO_LROC_Crater_Abundance/Apollo_Basin.vrt"),
   Description = [[]]
 }
@@ -51,6 +57,7 @@ local treks_LRO_NAC_CratAbnd_37S206E_150cmp = {
 local treks_LRO_NAC_CratAbnd_25N311E_2mp = {
   Identifier = "LRO_NAC_CratAbnd_25N311E_2mp",
   Name = [[LRO LROC Crater Abundance, Aristarchus 1]],
+  ZIndex = 50,
   FilePath = asset.resource("LRO_LROC_Crater_Abundance/Aristarchus_1.vrt"),
   Description = [[]]
 }
@@ -58,6 +65,7 @@ local treks_LRO_NAC_CratAbnd_25N311E_2mp = {
 local treks_LRO_NAC_CratAbnd_28N307E_150cmp = {
   Identifier = "LRO_NAC_CratAbnd_28N307E_150cmp",
   Name = [[LRO LROC Crater Abundance, Aristarchus 2]],
+  ZIndex = 50,
   FilePath = asset.resource("LRO_LROC_Crater_Abundance/Aristarchus_2.vrt"),
   Description = [[]]
 }
@@ -65,6 +73,7 @@ local treks_LRO_NAC_CratAbnd_28N307E_150cmp = {
 local treks_LRO_NAC_CratAbnd_19S070E_150cmp = {
   Identifier = "LRO_NAC_CratAbnd_19S070E_150cmp",
   Name = [[LRO LROC Crater Abundance, Balmer Basin]],
+  ZIndex = 50,
   FilePath = asset.resource("LRO_LROC_Crater_Abundance/Balmer_Basin.vrt"),
   Description = [[]]
 }
@@ -72,6 +81,7 @@ local treks_LRO_NAC_CratAbnd_19S070E_150cmp = {
 local treks_LRO_NAC_CratAbnd_20S337E_400cmp = {
   Identifier = "LRO_NAC_CratAbnd_20S337E_400cmp",
   Name = [[LRO LROC Crater Abundance, Bullialdus Crater]],
+  ZIndex = 50,
   FilePath = asset.resource("LRO_LROC_Crater_Abundance/Bullialdus_Crater.vrt"),
   Description = [[]]
 }
@@ -79,6 +89,7 @@ local treks_LRO_NAC_CratAbnd_20S337E_400cmp = {
 local treks_LRO_NAC_CratAbnd_36N320E_2mp = {
   Identifier = "LRO_NAC_CratAbnd_36N320E_2mp",
   Name = [[LRO LROC Crater Abundance, Gruithuisen Domes]],
+  ZIndex = 50,
   FilePath = asset.resource("LRO_LROC_Crater_Abundance/Gruithuisen_Domes.vrt"),
   Description = [[]]
 }
@@ -86,6 +97,7 @@ local treks_LRO_NAC_CratAbnd_36N320E_2mp = {
 local treks_LRO_NAC_CratAbnd_00N234E_150cmp = {
   Identifier = "LRO_NAC_CratAbnd_00N234E_150cmp",
   Name = [[LRO LROC Crater Abundance, Hertzsprung]],
+  ZIndex = 50,
   FilePath = asset.resource("LRO_LROC_Crater_Abundance/Hertzsprung.vrt"),
   Description = [[]]
 }
@@ -93,6 +105,7 @@ local treks_LRO_NAC_CratAbnd_00N234E_150cmp = {
 local treks_LRO_NAC_CratAbnd_08N332E_2mp = {
   Identifier = "LRO_NAC_CratAbnd_08N332E_2mp",
   Name = [[LRO LROC Crater Abundance, Hortensius Domes]],
+  ZIndex = 50,
   FilePath = asset.resource("LRO_LROC_Crater_Abundance/Hortensius_Domes.vrt"),
   Description = [[]]
 }
@@ -100,6 +113,7 @@ local treks_LRO_NAC_CratAbnd_08N332E_2mp = {
 local treks_LRO_NAC_CratAbnd_06N120E_200cmp = {
   Identifier = "LRO_NAC_CratAbnd_06N120E_200cmp",
   Name = [[LRO LROC Crater Abundance, King Crater]],
+  ZIndex = 50,
   FilePath = asset.resource("LRO_LROC_Crater_Abundance/King_Crater.vrt"),
   Description = [[]]
 }
@@ -107,6 +121,7 @@ local treks_LRO_NAC_CratAbnd_06N120E_200cmp = {
 local treks_LRO_NAC_CratAbnd_32N292E_2mp = {
   Identifier = "LRO_NAC_CratAbnd_32N292E_2mp",
   Name = [[LRO LROC Crater Abundance, Lichtenberg Crater]],
+  ZIndex = 50,
   FilePath = asset.resource("LRO_LROC_Crater_Abundance/Lichtenberg_Crater.vrt"),
   Description = [[]]
 }
@@ -114,6 +129,7 @@ local treks_LRO_NAC_CratAbnd_32N292E_2mp = {
 local treks_LRO_NAC_CratAbnd_10N058E_150cmp = {
   Identifier = "LRO_NAC_CratAbnd_10N058E_150cmp",
   Name = [[LRO LROC Crater Abundance, Mare Crisium]],
+  ZIndex = 50,
   FilePath = asset.resource("LRO_LROC_Crater_Abundance/Mare_Crisium.vrt"),
   Description = [[]]
 }
@@ -121,6 +137,7 @@ local treks_LRO_NAC_CratAbnd_10N058E_150cmp = {
 local treks_LRO_NAC_CratAbnd_16S041E_150cmp = {
   Identifier = "LRO_NAC_CratAbnd_16S041E_150cmp",
   Name = [[LRO LROC Crater Abundance, Montes Pyrenaeus]],
+  ZIndex = 50,
   FilePath = asset.resource("LRO_LROC_Crater_Abundance/Montes_Pyrenaeus.vrt"),
   Description = [[]]
 }
@@ -128,6 +145,7 @@ local treks_LRO_NAC_CratAbnd_16S041E_150cmp = {
 local treks_LRO_NAC_CratAbnd_26S265E_200cmp = {
   Identifier = "LRO_NAC_CratAbnd_26S265E_200cmp",
   Name = [[LRO LROC Crater Abundance, Orientale 1]],
+  ZIndex = 50,
   FilePath = asset.resource("LRO_LROC_Crater_Abundance/Orientale_1.vrt"),
   Description = [[]]
 }
@@ -135,6 +153,7 @@ local treks_LRO_NAC_CratAbnd_26S265E_200cmp = {
 local treks_LRO_NAC_CratAbnd_53N354E_150cmp = {
   Identifier = "LRO_NAC_CratAbnd_53N354E_150cmp",
   Name = [[LRO LROC Crater Abundance, Plato Ejecta]],
+  ZIndex = 50,
   FilePath = asset.resource("LRO_LROC_Crater_Abundance/Plato_Ejecta.vrt"),
   Description = [[]]
 }
@@ -142,6 +161,7 @@ local treks_LRO_NAC_CratAbnd_53N354E_150cmp = {
 local treks_LRO_NAC_CratAbnd_60S200E_150cmp = {
   Identifier = "LRO_NAC_CratAbnd_60S200E_150cmp",
   Name = [[LRO LROC Crater Abundance, South Pole-Aitken Basin Interior]],
+  ZIndex = 50,
   FilePath = asset.resource("LRO_LROC_Crater_Abundance/South_Pole-Aitken_Basin_Interior.vrt"),
   Description = [[]]
 }
@@ -149,6 +169,7 @@ local treks_LRO_NAC_CratAbnd_60S200E_150cmp = {
 local treks_LRO_NAC_CratAbnd_02S167E_150cmp = {
   Identifier = "LRO_NAC_CratAbnd_02S167E_150cmp",
   Name = [[LRO LROC Crater Abundance, Stratton (Dewar) High Fe Anomaly]],
+  ZIndex = 50,
   FilePath = asset.resource("LRO_LROC_Crater_Abundance/Stratton_Dewar_High_Fe_Anomaly.vrt"),
   Description = [[]]
 }
@@ -156,6 +177,7 @@ local treks_LRO_NAC_CratAbnd_02S167E_150cmp = {
 local treks_LRO_NAC_CratAbnd_20N010E_2mp = {
   Identifier = "LRO_NAC_CratAbnd_20N010E_2mp",
   Name = [[LRO LROC Crater Abundance, Sulpicius Gallus]],
+  ZIndex = 50,
   FilePath = asset.resource("LRO_LROC_Crater_Abundance/Sulpicius_Gallus.vrt"),
   Description = [[]]
 }
@@ -163,6 +185,7 @@ local treks_LRO_NAC_CratAbnd_20N010E_2mp = {
 local treks_LRO_NAC_CratAbnd_43S349E_150cmp = {
   Identifier = "LRO_NAC_CratAbnd_43S349E_150cmp",
   Name = [[LRO LROC Crater Abundance, Tycho Crater]],
+  ZIndex = 50,
   FilePath = asset.resource("LRO_LROC_Crater_Abundance/Tycho_Crater.vrt"),
   Description = [[]]
 }
diff --git a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Crater_Abundance_Hazard.asset b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Crater_Abundance_Hazard.asset
index 6d409b350c..d60d26fa08 100644
--- a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Crater_Abundance_Hazard.asset
+++ b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Crater_Abundance_Hazard.asset
@@ -9,6 +9,7 @@ local globeIdentifier = asset.require("scene/solarsystem//planets/earth/moon/moo
 local treks_LRO_NAC_CratAbndHaz_17S173E_150cmp = {
   Identifier = "LRO_NAC_CratAbndHaz_17S173E_150cmp",
   Name = [[LRO LROC Crater Abundance Hazard, Aitken Crater]],
+  ZIndex = 50,
   FilePath = asset.resource("LRO_LROC_Crater_Abundance_Hazard/Aitken_Crater.vrt"),
   Description = [[]]
 }
@@ -16,6 +17,7 @@ local treks_LRO_NAC_CratAbndHaz_17S173E_150cmp = {
 local treks_LRO_NAC_CratAbndHaz_13S358E_2mp = {
   Identifier = "LRO_NAC_CratAbndHaz_13S358E_2mp",
   Name = [[LRO LROC Crater Abundance Hazard, Alphonsus Crater]],
+  ZIndex = 50,
   FilePath = asset.resource("LRO_LROC_Crater_Abundance_Hazard/Alphonsus_Crater.vrt"),
   Description = [[]]
 }
@@ -23,6 +25,7 @@ local treks_LRO_NAC_CratAbndHaz_13S358E_2mp = {
 local treks_LRO_NAC_CratAbndHaz_73N350E_150cmp = {
   Identifier = "LRO_NAC_CratAbndHaz_73N350E_150cmp",
   Name = [[LRO LROC Crater Abundance Hazard, Anaxagoras Crater]],
+  ZIndex = 50,
   FilePath = asset.resource("LRO_LROC_Crater_Abundance_Hazard/Anaxagoras_Crater.vrt"),
   Description = [[]]
 }
@@ -30,6 +33,7 @@ local treks_LRO_NAC_CratAbndHaz_73N350E_150cmp = {
 local treks_LRO_NAC_CratAbndHaz_26N004E_150cmp = {
   Identifier = "LRO_NAC_CratAbndHaz_26N004E_150cmp",
   Name = [[LRO LROC Crater Abundance Hazard, Apollo 15]],
+  ZIndex = 50,
   FilePath = asset.resource("LRO_LROC_Crater_Abundance_Hazard/Apollo_15.vrt"),
   Description = [[]]
 }
@@ -37,6 +41,7 @@ local treks_LRO_NAC_CratAbndHaz_26N004E_150cmp = {
 local treks_LRO_NAC_CratAbndHaz_09S015E_150cmp = {
   Identifier = "LRO_NAC_CratAbndHaz_09S015E_150cmp",
   Name = [[LRO LROC Crater Abundance Hazard, Apollo 16]],
+  ZIndex = 50,
   FilePath = asset.resource("LRO_LROC_Crater_Abundance_Hazard/Apollo_16.vrt"),
   Description = [[]]
 }
@@ -44,6 +49,7 @@ local treks_LRO_NAC_CratAbndHaz_09S015E_150cmp = {
 local treks_LRO_NAC_CratAbndHaz_37S206E_150cmp = {
   Identifier = "LRO_NAC_CratAbndHaz_37S206E_150cmp",
   Name = [[LRO LROC Crater Abundance Hazard, Apollo Basin]],
+  ZIndex = 50,
   FilePath = asset.resource("LRO_LROC_Crater_Abundance_Hazard/Apollo_Basin.vrt"),
   Description = [[]]
 }
@@ -51,6 +57,7 @@ local treks_LRO_NAC_CratAbndHaz_37S206E_150cmp = {
 local treks_LRO_NAC_CratAbndHaz_25N311E_2mp = {
   Identifier = "LRO_NAC_CratAbndHaz_25N311E_2mp",
   Name = [[LRO LROC Crater Abundance Hazard, Aristarchus 1]],
+  ZIndex = 50,
   FilePath = asset.resource("LRO_LROC_Crater_Abundance_Hazard/Aristarchus_1.vrt"),
   Description = [[]]
 }
@@ -58,6 +65,7 @@ local treks_LRO_NAC_CratAbndHaz_25N311E_2mp = {
 local treks_LRO_NAC_CratAbndHaz_28N307E_150cmp = {
   Identifier = "LRO_NAC_CratAbndHaz_28N307E_150cmp",
   Name = [[LRO LROC Crater Abundance Hazard, Aristarchus 2]],
+  ZIndex = 50,
   FilePath = asset.resource("LRO_LROC_Crater_Abundance_Hazard/Aristarchus_2.vrt"),
   Description = [[]]
 }
@@ -65,6 +73,7 @@ local treks_LRO_NAC_CratAbndHaz_28N307E_150cmp = {
 local treks_LRO_NAC_CratAbndHaz_19S070E_150cmp = {
   Identifier = "LRO_NAC_CratAbndHaz_19S070E_150cmp",
   Name = [[LRO LROC Crater Abundance Hazard, Balmer Basin]],
+  ZIndex = 50,
   FilePath = asset.resource("LRO_LROC_Crater_Abundance_Hazard/Balmer_Basin.vrt"),
   Description = [[]]
 }
@@ -72,6 +81,7 @@ local treks_LRO_NAC_CratAbndHaz_19S070E_150cmp = {
 local treks_LRO_NAC_CratAbndHaz_20S337E_400cmp = {
   Identifier = "LRO_NAC_CratAbndHaz_20S337E_400cmp",
   Name = [[LRO LROC Crater Abundance Hazard, Bullialdus Crater]],
+  ZIndex = 50,
   FilePath = asset.resource("LRO_LROC_Crater_Abundance_Hazard/Bullialdus_Crater.vrt"),
   Description = [[]]
 }
@@ -79,6 +89,7 @@ local treks_LRO_NAC_CratAbndHaz_20S337E_400cmp = {
 local treks_LRO_NAC_CratAbndHaz_36N320E_2mp = {
   Identifier = "LRO_NAC_CratAbndHaz_36N320E_2mp",
   Name = [[LRO LROC Crater Abundance Hazard, Gruithuisen Domes]],
+  ZIndex = 50,
   FilePath = asset.resource("LRO_LROC_Crater_Abundance_Hazard/Gruithuisen_Domes.vrt"),
   Description = [[]]
 }
@@ -86,6 +97,7 @@ local treks_LRO_NAC_CratAbndHaz_36N320E_2mp = {
 local treks_LRO_NAC_CratAbndHaz_00N234E_150cmp = {
   Identifier = "LRO_NAC_CratAbndHaz_00N234E_150cmp",
   Name = [[LRO LROC Crater Abundance Hazard, Hertzsprung]],
+  ZIndex = 50,
   FilePath = asset.resource("LRO_LROC_Crater_Abundance_Hazard/Hertzsprung.vrt"),
   Description = [[]]
 }
@@ -93,6 +105,7 @@ local treks_LRO_NAC_CratAbndHaz_00N234E_150cmp = {
 local treks_LRO_NAC_CratAbndHaz_08N332E_2mp = {
   Identifier = "LRO_NAC_CratAbndHaz_08N332E_2mp",
   Name = [[LRO LROC Crater Abundance Hazard, Hortensius Domes]],
+  ZIndex = 50,
   FilePath = asset.resource("LRO_LROC_Crater_Abundance_Hazard/Hortensius_Domes.vrt"),
   Description = [[]]
 }
@@ -100,6 +113,7 @@ local treks_LRO_NAC_CratAbndHaz_08N332E_2mp = {
 local treks_LRO_NAC_CratAbndHaz_06N120E_200cmp = {
   Identifier = "LRO_NAC_CratAbndHaz_06N120E_200cmp",
   Name = [[LRO LROC Crater Abundance Hazard, King Crater]],
+  ZIndex = 50,
   FilePath = asset.resource("LRO_LROC_Crater_Abundance_Hazard/King_Crater.vrt"),
   Description = [[]]
 }
@@ -107,6 +121,7 @@ local treks_LRO_NAC_CratAbndHaz_06N120E_200cmp = {
 local treks_LRO_NAC_CratAbndHaz_32N292E_2mp = {
   Identifier = "LRO_NAC_CratAbndHaz_32N292E_2mp",
   Name = [[LRO LROC Crater Abundance Hazard, Lichtenberg Crater]],
+  ZIndex = 50,
   FilePath = asset.resource("LRO_LROC_Crater_Abundance_Hazard/Lichtenberg_Crater.vrt"),
   Description = [[]]
 }
@@ -114,6 +129,7 @@ local treks_LRO_NAC_CratAbndHaz_32N292E_2mp = {
 local treks_LRO_NAC_CratAbndHaz_10N058E_150cmp = {
   Identifier = "LRO_NAC_CratAbndHaz_10N058E_150cmp",
   Name = [[LRO LROC Crater Abundance Hazard, Mare Crisium]],
+  ZIndex = 50,
   FilePath = asset.resource("LRO_LROC_Crater_Abundance_Hazard/Mare_Crisium.vrt"),
   Description = [[]]
 }
@@ -121,6 +137,7 @@ local treks_LRO_NAC_CratAbndHaz_10N058E_150cmp = {
 local treks_LRO_NAC_CratAbndHaz_16S041E_150cmp = {
   Identifier = "LRO_NAC_CratAbndHaz_16S041E_150cmp",
   Name = [[LRO LROC Crater Abundance Hazard, Montes Pyrenaeus]],
+  ZIndex = 50,
   FilePath = asset.resource("LRO_LROC_Crater_Abundance_Hazard/Montes_Pyrenaeus.vrt"),
   Description = [[]]
 }
@@ -128,6 +145,7 @@ local treks_LRO_NAC_CratAbndHaz_16S041E_150cmp = {
 local treks_LRO_NAC_CratAbndHaz_26S265E_200cmp = {
   Identifier = "LRO_NAC_CratAbndHaz_26S265E_200cmp",
   Name = [[LRO LROC Crater Abundance Hazard, Orientale 1]],
+  ZIndex = 50,
   FilePath = asset.resource("LRO_LROC_Crater_Abundance_Hazard/Orientale_1.vrt"),
   Description = [[]]
 }
@@ -135,6 +153,7 @@ local treks_LRO_NAC_CratAbndHaz_26S265E_200cmp = {
 local treks_LRO_NAC_CratAbndHaz_53N354E_150cmp = {
   Identifier = "LRO_NAC_CratAbndHaz_53N354E_150cmp",
   Name = [[LRO LROC Crater Abundance Hazard, Plato Ejecta]],
+  ZIndex = 50,
   FilePath = asset.resource("LRO_LROC_Crater_Abundance_Hazard/Plato_Ejecta.vrt"),
   Description = [[]]
 }
@@ -142,6 +161,7 @@ local treks_LRO_NAC_CratAbndHaz_53N354E_150cmp = {
 local treks_LRO_NAC_CratAbndHaz_60S200E_150cmp = {
   Identifier = "LRO_NAC_CratAbndHaz_60S200E_150cmp",
   Name = [[LRO LROC Crater Abundance Hazard, South Pole-Aitken Basin Interior]],
+  ZIndex = 50,
   FilePath = asset.resource("LRO_LROC_Crater_Abundance_Hazard/South_Pole-Aitken_Basin_Interior.vrt"),
   Description = [[]]
 }
@@ -149,6 +169,7 @@ local treks_LRO_NAC_CratAbndHaz_60S200E_150cmp = {
 local treks_LRO_NAC_CratAbndHaz_02S167E_150cmp = {
   Identifier = "LRO_NAC_CratAbndHaz_02S167E_150cmp",
   Name = [[LRO LROC Crater Abundance Hazard, Stratton (Dewar) High Fe Anomaly]],
+  ZIndex = 50,
   FilePath = asset.resource("LRO_LROC_Crater_Abundance_Hazard/Stratton_Dewar_High_Fe_Anomaly.vrt"),
   Description = [[]]
 }
@@ -156,6 +177,7 @@ local treks_LRO_NAC_CratAbndHaz_02S167E_150cmp = {
 local treks_LRO_NAC_CratAbndHaz_20N010E_2mp = {
   Identifier = "LRO_NAC_CratAbndHaz_20N010E_2mp",
   Name = [[LRO LROC Crater Abundance Hazard, Sulpicius Gallus]],
+  ZIndex = 50,
   FilePath = asset.resource("LRO_LROC_Crater_Abundance_Hazard/Sulpicius_Gallus.vrt"),
   Description = [[]]
 }
@@ -163,6 +185,7 @@ local treks_LRO_NAC_CratAbndHaz_20N010E_2mp = {
 local treks_LRO_NAC_CratAbndHaz_43S349E_150cmp = {
   Identifier = "LRO_NAC_CratAbndHaz_43S349E_150cmp",
   Name = [[LRO LROC Crater Abundance Hazard, Tycho Crater]],
+  ZIndex = 50,
   FilePath = asset.resource("LRO_LROC_Crater_Abundance_Hazard/Tycho_Crater.vrt"),
   Description = [[]]
 }
diff --git a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Crater_Density.asset b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Crater_Density.asset
index 17ed43885a..94a0c2c896 100644
--- a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Crater_Density.asset
+++ b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Crater_Density.asset
@@ -9,6 +9,7 @@ local globeIdentifier = asset.require("scene/solarsystem//planets/earth/moon/moo
 local treks_LRO_NAC_CratDen_17S173E_150cmp = {
   Identifier = "LRO_NAC_CratDen_17S173E_150cmp",
   Name = [[LRO LROC Crater Density, Aitken Crater]],
+  ZIndex = 50,
   FilePath = asset.resource("LRO_LROC_Crater_Density/Aitken_Crater.vrt"),
   Description = [[]]
 }
@@ -16,6 +17,7 @@ local treks_LRO_NAC_CratDen_17S173E_150cmp = {
 local treks_LRO_NAC_CratDen_13S358E_2mp = {
   Identifier = "LRO_NAC_CratDen_13S358E_2mp",
   Name = [[LRO LROC Crater Density, Alphonsus Crater]],
+  ZIndex = 50,
   FilePath = asset.resource("LRO_LROC_Crater_Density/Alphonsus_Crater.vrt"),
   Description = [[]]
 }
@@ -23,6 +25,7 @@ local treks_LRO_NAC_CratDen_13S358E_2mp = {
 local treks_LRO_NAC_CratDen_73N350E_150cmp = {
   Identifier = "LRO_NAC_CratDen_73N350E_150cmp",
   Name = [[LRO LROC Crater Density, Anaxagoras Crater]],
+  ZIndex = 50,
   FilePath = asset.resource("LRO_LROC_Crater_Density/Anaxagoras_Crater.vrt"),
   Description = [[]]
 }
@@ -30,6 +33,7 @@ local treks_LRO_NAC_CratDen_73N350E_150cmp = {
 local treks_LRO_NAC_CratDen_26N004E_150cmp = {
   Identifier = "LRO_NAC_CratDen_26N004E_150cmp",
   Name = [[LRO LROC Crater Density, Apollo 15]],
+  ZIndex = 50,
   FilePath = asset.resource("LRO_LROC_Crater_Density/Apollo_15.vrt"),
   Description = [[]]
 }
@@ -37,6 +41,7 @@ local treks_LRO_NAC_CratDen_26N004E_150cmp = {
 local treks_LRO_NAC_CratDen_09S015E_150cmp = {
   Identifier = "LRO_NAC_CratDen_09S015E_150cmp",
   Name = [[LRO LROC Crater Density, Apollo 16]],
+  ZIndex = 50,
   FilePath = asset.resource("LRO_LROC_Crater_Density/Apollo_16.vrt"),
   Description = [[]]
 }
@@ -44,6 +49,7 @@ local treks_LRO_NAC_CratDen_09S015E_150cmp = {
 local treks_LRO_NAC_CratDen_37S206E_150cmp = {
   Identifier = "LRO_NAC_CratDen_37S206E_150cmp",
   Name = [[LRO LROC Crater Density, Apollo Basin]],
+  ZIndex = 50,
   FilePath = asset.resource("LRO_LROC_Crater_Density/Apollo_Basin.vrt"),
   Description = [[]]
 }
@@ -51,6 +57,7 @@ local treks_LRO_NAC_CratDen_37S206E_150cmp = {
 local treks_LRO_NAC_CratDen_25N311E_2mp = {
   Identifier = "LRO_NAC_CratDen_25N311E_2mp",
   Name = [[LRO LROC Crater Density, Aristarchus 1]],
+  ZIndex = 50,
   FilePath = asset.resource("LRO_LROC_Crater_Density/Aristarchus_1.vrt"),
   Description = [[]]
 }
@@ -58,6 +65,7 @@ local treks_LRO_NAC_CratDen_25N311E_2mp = {
 local treks_LRO_NAC_CratDen_28N307E_150cmp = {
   Identifier = "LRO_NAC_CratDen_28N307E_150cmp",
   Name = [[LRO LROC Crater Density, Aristarchus 2]],
+  ZIndex = 50,
   FilePath = asset.resource("LRO_LROC_Crater_Density/Aristarchus_2.vrt"),
   Description = [[]]
 }
@@ -65,6 +73,7 @@ local treks_LRO_NAC_CratDen_28N307E_150cmp = {
 local treks_LRO_NAC_CratDen_19S070E_150cmp = {
   Identifier = "LRO_NAC_CratDen_19S070E_150cmp",
   Name = [[LRO LROC Crater Density, Balmer Basin]],
+  ZIndex = 50,
   FilePath = asset.resource("LRO_LROC_Crater_Density/Balmer_Basin.vrt"),
   Description = [[]]
 }
@@ -72,6 +81,7 @@ local treks_LRO_NAC_CratDen_19S070E_150cmp = {
 local treks_LRO_NAC_CratDen_20S337E_400cmp = {
   Identifier = "LRO_NAC_CratDen_20S337E_400cmp",
   Name = [[LRO LROC Crater Density, Bullialdus Crater]],
+  ZIndex = 50,
   FilePath = asset.resource("LRO_LROC_Crater_Density/Bullialdus_Crater.vrt"),
   Description = [[]]
 }
@@ -79,6 +89,7 @@ local treks_LRO_NAC_CratDen_20S337E_400cmp = {
 local treks_LRO_NAC_CratDen_36N320E_2mp = {
   Identifier = "LRO_NAC_CratDen_36N320E_2mp",
   Name = [[LRO LROC Crater Density, Gruithuisen Domes]],
+  ZIndex = 50,
   FilePath = asset.resource("LRO_LROC_Crater_Density/Gruithuisen_Domes.vrt"),
   Description = [[]]
 }
@@ -86,6 +97,7 @@ local treks_LRO_NAC_CratDen_36N320E_2mp = {
 local treks_LRO_NAC_CratDen_00N234E_150cmp = {
   Identifier = "LRO_NAC_CratDen_00N234E_150cmp",
   Name = [[LRO LROC Crater Density, Hertzsprung]],
+  ZIndex = 50,
   FilePath = asset.resource("LRO_LROC_Crater_Density/Hertzsprung.vrt"),
   Description = [[]]
 }
@@ -93,6 +105,7 @@ local treks_LRO_NAC_CratDen_00N234E_150cmp = {
 local treks_LRO_NAC_CratDen_08N332E_2mp = {
   Identifier = "LRO_NAC_CratDen_08N332E_2mp",
   Name = [[LRO LROC Crater Density, Hortensius Domes]],
+  ZIndex = 50,
   FilePath = asset.resource("LRO_LROC_Crater_Density/Hortensius_Domes.vrt"),
   Description = [[]]
 }
@@ -100,6 +113,7 @@ local treks_LRO_NAC_CratDen_08N332E_2mp = {
 local treks_LRO_NAC_CratDen_06N120E_200cmp = {
   Identifier = "LRO_NAC_CratDen_06N120E_200cmp",
   Name = [[LRO LROC Crater Density, King Crater]],
+  ZIndex = 50,
   FilePath = asset.resource("LRO_LROC_Crater_Density/King_Crater.vrt"),
   Description = [[]]
 }
@@ -107,6 +121,7 @@ local treks_LRO_NAC_CratDen_06N120E_200cmp = {
 local treks_LRO_NAC_CratDen_32N292E_2mp = {
   Identifier = "LRO_NAC_CratDen_32N292E_2mp",
   Name = [[LRO LROC Crater Density, Lichtenberg Crater]],
+  ZIndex = 50,
   FilePath = asset.resource("LRO_LROC_Crater_Density/Lichtenberg_Crater.vrt"),
   Description = [[]]
 }
@@ -114,6 +129,7 @@ local treks_LRO_NAC_CratDen_32N292E_2mp = {
 local treks_LRO_NAC_CratDen_10N058E_150cmp = {
   Identifier = "LRO_NAC_CratDen_10N058E_150cmp",
   Name = [[LRO LROC Crater Density, Mare Crisium]],
+  ZIndex = 50,
   FilePath = asset.resource("LRO_LROC_Crater_Density/Mare_Crisium.vrt"),
   Description = [[]]
 }
@@ -121,6 +137,7 @@ local treks_LRO_NAC_CratDen_10N058E_150cmp = {
 local treks_LRO_NAC_CratDen_16S041E_150cmp = {
   Identifier = "LRO_NAC_CratDen_16S041E_150cmp",
   Name = [[LRO LROC Crater Density, Montes Pyrenaeus]],
+  ZIndex = 50,
   FilePath = asset.resource("LRO_LROC_Crater_Density/Montes_Pyrenaeus.vrt"),
   Description = [[]]
 }
@@ -128,6 +145,7 @@ local treks_LRO_NAC_CratDen_16S041E_150cmp = {
 local treks_LRO_NAC_CratDen_26S265E_200cmp = {
   Identifier = "LRO_NAC_CratDen_26S265E_200cmp",
   Name = [[LRO LROC Crater Density, Orientale 1]],
+  ZIndex = 50,
   FilePath = asset.resource("LRO_LROC_Crater_Density/Orientale_1.vrt"),
   Description = [[]]
 }
@@ -135,6 +153,7 @@ local treks_LRO_NAC_CratDen_26S265E_200cmp = {
 local treks_LRO_NAC_CratDen_53N354E_150cmp = {
   Identifier = "LRO_NAC_CratDen_53N354E_150cmp",
   Name = [[LRO LROC Crater Density, Plato Ejecta]],
+  ZIndex = 50,
   FilePath = asset.resource("LRO_LROC_Crater_Density/Plato_Ejecta.vrt"),
   Description = [[]]
 }
@@ -142,6 +161,7 @@ local treks_LRO_NAC_CratDen_53N354E_150cmp = {
 local treks_LRO_NAC_CratDen_60S200E_150cmp = {
   Identifier = "LRO_NAC_CratDen_60S200E_150cmp",
   Name = [[LRO LROC Crater Density, South Pole-Aitken Basin Interior]],
+  ZIndex = 50,
   FilePath = asset.resource("LRO_LROC_Crater_Density/South_Pole-Aitken_Basin_Interior.vrt"),
   Description = [[]]
 }
@@ -149,6 +169,7 @@ local treks_LRO_NAC_CratDen_60S200E_150cmp = {
 local treks_LRO_NAC_CratDen_02S167E_150cmp = {
   Identifier = "LRO_NAC_CratDen_02S167E_150cmp",
   Name = [[LRO LROC Crater Density, Stratton (Dewar) High Fe Anomaly]],
+  ZIndex = 50,
   FilePath = asset.resource("LRO_LROC_Crater_Density/Stratton_Dewar_High_Fe_Anomaly.vrt"),
   Description = [[]]
 }
@@ -156,6 +177,7 @@ local treks_LRO_NAC_CratDen_02S167E_150cmp = {
 local treks_LRO_NAC_CratDen_20N010E_2mp = {
   Identifier = "LRO_NAC_CratDen_20N010E_2mp",
   Name = [[LRO LROC Crater Density, Sulpicius Gallus]],
+  ZIndex = 50,
   FilePath = asset.resource("LRO_LROC_Crater_Density/Sulpicius_Gallus.vrt"),
   Description = [[]]
 }
@@ -163,6 +185,7 @@ local treks_LRO_NAC_CratDen_20N010E_2mp = {
 local treks_LRO_NAC_CratDen_43S349E_150cmp = {
   Identifier = "LRO_NAC_CratDen_43S349E_150cmp",
   Name = [[LRO LROC Crater Density, Tycho Crater]],
+  ZIndex = 50,
   FilePath = asset.resource("LRO_LROC_Crater_Density/Tycho_Crater.vrt"),
   Description = [[]]
 }
diff --git a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Crater_Density_Hazard.asset b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Crater_Density_Hazard.asset
index f4ad36cb2c..43dde197e0 100644
--- a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Crater_Density_Hazard.asset
+++ b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Crater_Density_Hazard.asset
@@ -9,6 +9,7 @@ local globeIdentifier = asset.require("scene/solarsystem//planets/earth/moon/moo
 local treks_LRO_NAC_CratDenHaz_17S173E_150cmp = {
   Identifier = "LRO_NAC_CratDenHaz_17S173E_150cmp",
   Name = [[LRO LROC Crater Density Hazard, Aitken Crater]],
+  ZIndex = 50,
   FilePath = asset.resource("LRO_LROC_Crater_Density_Hazard/Aitken_Crater.vrt"),
   Description = [[]]
 }
@@ -16,6 +17,7 @@ local treks_LRO_NAC_CratDenHaz_17S173E_150cmp = {
 local treks_LRO_NAC_CratDenHaz_13S358E_2mp = {
   Identifier = "LRO_NAC_CratDenHaz_13S358E_2mp",
   Name = [[LRO LROC Crater Density Hazard, Alphonsus Crater]],
+  ZIndex = 50,
   FilePath = asset.resource("LRO_LROC_Crater_Density_Hazard/Alphonsus_Crater.vrt"),
   Description = [[]]
 }
@@ -23,6 +25,7 @@ local treks_LRO_NAC_CratDenHaz_13S358E_2mp = {
 local treks_LRO_NAC_CratDenHaz_73N350E_150cmp = {
   Identifier = "LRO_NAC_CratDenHaz_73N350E_150cmp",
   Name = [[LRO LROC Crater Density Hazard, Anaxagoras Crater]],
+  ZIndex = 50,
   FilePath = asset.resource("LRO_LROC_Crater_Density_Hazard/Anaxagoras_Crater.vrt"),
   Description = [[]]
 }
@@ -30,6 +33,7 @@ local treks_LRO_NAC_CratDenHaz_73N350E_150cmp = {
 local treks_LRO_NAC_CratDenHaz_26N004E_150cmp = {
   Identifier = "LRO_NAC_CratDenHaz_26N004E_150cmp",
   Name = [[LRO LROC Crater Density Hazard, Apollo 15]],
+  ZIndex = 50,
   FilePath = asset.resource("LRO_LROC_Crater_Density_Hazard/Apollo_15.vrt"),
   Description = [[]]
 }
@@ -37,6 +41,7 @@ local treks_LRO_NAC_CratDenHaz_26N004E_150cmp = {
 local treks_LRO_NAC_CratDenHaz_09S015E_150cmp = {
   Identifier = "LRO_NAC_CratDenHaz_09S015E_150cmp",
   Name = [[LRO LROC Crater Density Hazard, Apollo 16]],
+  ZIndex = 50,
   FilePath = asset.resource("LRO_LROC_Crater_Density_Hazard/Apollo_16.vrt"),
   Description = [[]]
 }
@@ -44,6 +49,7 @@ local treks_LRO_NAC_CratDenHaz_09S015E_150cmp = {
 local treks_LRO_NAC_CratDenHaz_37S206E_150cmp = {
   Identifier = "LRO_NAC_CratDenHaz_37S206E_150cmp",
   Name = [[LRO LROC Crater Density Hazard, Apollo Basin]],
+  ZIndex = 50,
   FilePath = asset.resource("LRO_LROC_Crater_Density_Hazard/Apollo_Basin.vrt"),
   Description = [[]]
 }
@@ -51,6 +57,7 @@ local treks_LRO_NAC_CratDenHaz_37S206E_150cmp = {
 local treks_LRO_NAC_CratDenHaz_25N311E_2mp = {
   Identifier = "LRO_NAC_CratDenHaz_25N311E_2mp",
   Name = [[LRO LROC Crater Density Hazard, Aristarchus 1]],
+  ZIndex = 50,
   FilePath = asset.resource("LRO_LROC_Crater_Density_Hazard/Aristarchus_1.vrt"),
   Description = [[]]
 }
@@ -58,6 +65,7 @@ local treks_LRO_NAC_CratDenHaz_25N311E_2mp = {
 local treks_LRO_NAC_CratDenHaz_28N307E_150cmp = {
   Identifier = "LRO_NAC_CratDenHaz_28N307E_150cmp",
   Name = [[LRO LROC Crater Density Hazard, Aristarchus 2]],
+  ZIndex = 50,
   FilePath = asset.resource("LRO_LROC_Crater_Density_Hazard/Aristarchus_2.vrt"),
   Description = [[]]
 }
@@ -65,6 +73,7 @@ local treks_LRO_NAC_CratDenHaz_28N307E_150cmp = {
 local treks_LRO_NAC_CratDenHaz_19S070E_150cmp = {
   Identifier = "LRO_NAC_CratDenHaz_19S070E_150cmp",
   Name = [[LRO LROC Crater Density Hazard, Balmer Basin]],
+  ZIndex = 50,
   FilePath = asset.resource("LRO_LROC_Crater_Density_Hazard/Balmer_Basin.vrt"),
   Description = [[]]
 }
@@ -72,6 +81,7 @@ local treks_LRO_NAC_CratDenHaz_19S070E_150cmp = {
 local treks_LRO_NAC_CratDenHaz_20S337E_400cmp = {
   Identifier = "LRO_NAC_CratDenHaz_20S337E_400cmp",
   Name = [[LRO LROC Crater Density Hazard, Bullialdus Crater]],
+  ZIndex = 50,
   FilePath = asset.resource("LRO_LROC_Crater_Density_Hazard/Bullialdus_Crater.vrt"),
   Description = [[]]
 }
@@ -79,6 +89,7 @@ local treks_LRO_NAC_CratDenHaz_20S337E_400cmp = {
 local treks_LRO_NAC_CratDenHaz_36N320E_2mp = {
   Identifier = "LRO_NAC_CratDenHaz_36N320E_2mp",
   Name = [[LRO LROC Crater Density Hazard, Gruithuisen Domes]],
+  ZIndex = 50,
   FilePath = asset.resource("LRO_LROC_Crater_Density_Hazard/Gruithuisen_Domes.vrt"),
   Description = [[]]
 }
@@ -86,6 +97,7 @@ local treks_LRO_NAC_CratDenHaz_36N320E_2mp = {
 local treks_LRO_NAC_CratDenHaz_00N234E_150cmp = {
   Identifier = "LRO_NAC_CratDenHaz_00N234E_150cmp",
   Name = [[LRO LROC Crater Density Hazard, Hertzsprung]],
+  ZIndex = 50,
   FilePath = asset.resource("LRO_LROC_Crater_Density_Hazard/Hertzsprung.vrt"),
   Description = [[]]
 }
@@ -93,6 +105,7 @@ local treks_LRO_NAC_CratDenHaz_00N234E_150cmp = {
 local treks_LRO_NAC_CratDenHaz_08N332E_2mp = {
   Identifier = "LRO_NAC_CratDenHaz_08N332E_2mp",
   Name = [[LRO LROC Crater Density Hazard, Hortensius Domes]],
+  ZIndex = 50,
   FilePath = asset.resource("LRO_LROC_Crater_Density_Hazard/Hortensius_Domes.vrt"),
   Description = [[]]
 }
@@ -100,6 +113,7 @@ local treks_LRO_NAC_CratDenHaz_08N332E_2mp = {
 local treks_LRO_NAC_CratDenHaz_06N120E_200cmp = {
   Identifier = "LRO_NAC_CratDenHaz_06N120E_200cmp",
   Name = [[LRO LROC Crater Density Hazard, King Crater]],
+  ZIndex = 50,
   FilePath = asset.resource("LRO_LROC_Crater_Density_Hazard/King_Crater.vrt"),
   Description = [[]]
 }
@@ -107,6 +121,7 @@ local treks_LRO_NAC_CratDenHaz_06N120E_200cmp = {
 local treks_LRO_NAC_CratDenHaz_32N292E_2mp = {
   Identifier = "LRO_NAC_CratDenHaz_32N292E_2mp",
   Name = [[LRO LROC Crater Density Hazard, Lichtenberg Crater]],
+  ZIndex = 50,
   FilePath = asset.resource("LRO_LROC_Crater_Density_Hazard/Lichtenberg_Crater.vrt"),
   Description = [[]]
 }
@@ -114,6 +129,7 @@ local treks_LRO_NAC_CratDenHaz_32N292E_2mp = {
 local treks_LRO_NAC_CratDenHaz_10N058E_150cmp = {
   Identifier = "LRO_NAC_CratDenHaz_10N058E_150cmp",
   Name = [[LRO LROC Crater Density Hazard, Mare Crisium]],
+  ZIndex = 50,
   FilePath = asset.resource("LRO_LROC_Crater_Density_Hazard/Mare_Crisium.vrt"),
   Description = [[]]
 }
@@ -121,6 +137,7 @@ local treks_LRO_NAC_CratDenHaz_10N058E_150cmp = {
 local treks_LRO_NAC_CratDenHaz_16S041E_150cmp = {
   Identifier = "LRO_NAC_CratDenHaz_16S041E_150cmp",
   Name = [[LRO LROC Crater Density Hazard, Montes Pyrenaeus]],
+  ZIndex = 50,
   FilePath = asset.resource("LRO_LROC_Crater_Density_Hazard/Montes_Pyrenaeus.vrt"),
   Description = [[]]
 }
@@ -128,6 +145,7 @@ local treks_LRO_NAC_CratDenHaz_16S041E_150cmp = {
 local treks_LRO_NAC_CratDenHaz_26S265E_200cmp = {
   Identifier = "LRO_NAC_CratDenHaz_26S265E_200cmp",
   Name = [[LRO LROC Crater Density Hazard, Orientale 1]],
+  ZIndex = 50,
   FilePath = asset.resource("LRO_LROC_Crater_Density_Hazard/Orientale_1.vrt"),
   Description = [[]]
 }
@@ -135,6 +153,7 @@ local treks_LRO_NAC_CratDenHaz_26S265E_200cmp = {
 local treks_LRO_NAC_CratDenHaz_53N354E_150cmp = {
   Identifier = "LRO_NAC_CratDenHaz_53N354E_150cmp",
   Name = [[LRO LROC Crater Density Hazard, Plato Ejecta]],
+  ZIndex = 50,
   FilePath = asset.resource("LRO_LROC_Crater_Density_Hazard/Plato_Ejecta.vrt"),
   Description = [[]]
 }
@@ -142,6 +161,7 @@ local treks_LRO_NAC_CratDenHaz_53N354E_150cmp = {
 local treks_LRO_NAC_CratDenHaz_60S200E_150cmp = {
   Identifier = "LRO_NAC_CratDenHaz_60S200E_150cmp",
   Name = [[LRO LROC Crater Density Hazard, South Pole-Aitken Basin Interior]],
+  ZIndex = 50,
   FilePath = asset.resource("LRO_LROC_Crater_Density_Hazard/South_Pole-Aitken_Basin_Interior.vrt"),
   Description = [[]]
 }
@@ -149,6 +169,7 @@ local treks_LRO_NAC_CratDenHaz_60S200E_150cmp = {
 local treks_LRO_NAC_CratDenHaz_02S167E_150cmp = {
   Identifier = "LRO_NAC_CratDenHaz_02S167E_150cmp",
   Name = [[LRO LROC Crater Density Hazard, Stratton (Dewar) High Fe Anomaly]],
+  ZIndex = 50,
   FilePath = asset.resource("LRO_LROC_Crater_Density_Hazard/Stratton_Dewar_High_Fe_Anomaly.vrt"),
   Description = [[]]
 }
@@ -156,6 +177,7 @@ local treks_LRO_NAC_CratDenHaz_02S167E_150cmp = {
 local treks_LRO_NAC_CratDenHaz_20N010E_2mp = {
   Identifier = "LRO_NAC_CratDenHaz_20N010E_2mp",
   Name = [[LRO LROC Crater Density Hazard, Sulpicius Gallus]],
+  ZIndex = 50,
   FilePath = asset.resource("LRO_LROC_Crater_Density_Hazard/Sulpicius_Gallus.vrt"),
   Description = [[]]
 }
@@ -163,6 +185,7 @@ local treks_LRO_NAC_CratDenHaz_20N010E_2mp = {
 local treks_LRO_NAC_CratDenHaz_43S349E_150cmp = {
   Identifier = "LRO_NAC_CratDenHaz_43S349E_150cmp",
   Name = [[LRO LROC Crater Density Hazard, Tycho Crater]],
+  ZIndex = 50,
   FilePath = asset.resource("LRO_LROC_Crater_Density_Hazard/Tycho_Crater.vrt"),
   Description = [[]]
 }
diff --git a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_DEM.asset b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_DEM.asset
index 2f0a72b7a6..a8644ba34f 100644
--- a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_DEM.asset
+++ b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_DEM.asset
@@ -9,6 +9,7 @@ local globeIdentifier = asset.require("scene/solarsystem//planets/earth/moon/moo
 local treks_LRO_NAC_ClrRoughness_15m_17S173E_150cmp = {
   Identifier = "LRO_NAC_ClrRoughness_15m_17S173E_150cmp",
   Name = [[LRO LROC DEM, Aitken Crater, 15m Color Roughness]],
+  ZIndex = 50,
   FilePath = asset.resource("LRO_LROC_DEM/Aitken_Crater.vrt"),
   Description = [[]]
 }
@@ -16,6 +17,7 @@ local treks_LRO_NAC_ClrRoughness_15m_17S173E_150cmp = {
 local treks_LRO_NAC_ClrRoughness_15m_13S358E_2mp = {
   Identifier = "LRO_NAC_ClrRoughness_15m_13S358E_2mp",
   Name = [[LRO LROC DEM, Alphonsus Crater, 15m Color Roughness]],
+  ZIndex = 50,
   FilePath = asset.resource("LRO_LROC_DEM/Alphonsus_Crater.vrt"),
   Description = [[]]
 }
@@ -23,6 +25,7 @@ local treks_LRO_NAC_ClrRoughness_15m_13S358E_2mp = {
 local treks_LRO_NAC_ClrShade_13S358E_200cmp = {
   Identifier = "LRO_NAC_ClrShade_13S358E_200cmp",
   Name = [[LRO LROC DEM, Alphonsus, ColorHillshade]],
+  ZIndex = 50,
   FilePath = asset.resource("LRO_LROC_DEM/Alphonsus.vrt"),
   Description = [[]]
 }
@@ -30,6 +33,7 @@ local treks_LRO_NAC_ClrShade_13S358E_200cmp = {
 local treks_LRO_NAC_ClrRoughness_15m_73N350E_150cmp = {
   Identifier = "LRO_NAC_ClrRoughness_15m_73N350E_150cmp",
   Name = [[LRO LROC DEM, Anaxagoras Crater, 15m Color Roughness]],
+  ZIndex = 50,
   FilePath = asset.resource("LRO_LROC_DEM/Anaxagoras_Crater.vrt"),
   Description = [[]]
 }
@@ -37,6 +41,7 @@ local treks_LRO_NAC_ClrRoughness_15m_73N350E_150cmp = {
 local treks_LRO_NAC_ClrRoughness_15m_26N004E_150cmp = {
   Identifier = "LRO_NAC_ClrRoughness_15m_26N004E_150cmp",
   Name = [[LRO LROC DEM, Apollo 15, 15m Color Roughness]],
+  ZIndex = 50,
   FilePath = asset.resource("LRO_LROC_DEM/Apollo_15.vrt"),
   Description = [[]]
 }
@@ -44,6 +49,7 @@ local treks_LRO_NAC_ClrRoughness_15m_26N004E_150cmp = {
 local treks_LRO_NAC_ClrRoughness_15m_09S015E_150cmp = {
   Identifier = "LRO_NAC_ClrRoughness_15m_09S015E_150cmp",
   Name = [[LRO LROC DEM, Apollo 16, 15m Color Roughness]],
+  ZIndex = 50,
   FilePath = asset.resource("LRO_LROC_DEM/Apollo_16.vrt"),
   Description = [[]]
 }
@@ -51,6 +57,7 @@ local treks_LRO_NAC_ClrRoughness_15m_09S015E_150cmp = {
 local treks_LRO_NAC_ClrRoughness_15m_37S206E_150cmp = {
   Identifier = "LRO_NAC_ClrRoughness_15m_37S206E_150cmp",
   Name = [[LRO LROC DEM, Apollo Basin, 15m Color Roughness]],
+  ZIndex = 50,
   FilePath = asset.resource("LRO_LROC_DEM/Apollo_Basin.vrt"),
   Description = [[]]
 }
@@ -58,6 +65,7 @@ local treks_LRO_NAC_ClrRoughness_15m_37S206E_150cmp = {
 local treks_LRO_NAC_ClrRoughness_15m_25N311E_2mp = {
   Identifier = "LRO_NAC_ClrRoughness_15m_25N311E_2mp",
   Name = [[LRO LROC DEM, Aristarchus 1, 15m Color Roughness]],
+  ZIndex = 50,
   FilePath = asset.resource("LRO_LROC_DEM/Aristarchus_1.vrt"),
   Description = [[]]
 }
@@ -65,6 +73,7 @@ local treks_LRO_NAC_ClrRoughness_15m_25N311E_2mp = {
 local treks_LRO_NAC_ClrRoughness_15m_28N307E_150cmp = {
   Identifier = "LRO_NAC_ClrRoughness_15m_28N307E_150cmp",
   Name = [[LRO LROC DEM, Aristarchus 2, 15m Color Roughness]],
+  ZIndex = 50,
   FilePath = asset.resource("LRO_LROC_DEM/Aristarchus_2.vrt"),
   Description = [[]]
 }
@@ -72,6 +81,7 @@ local treks_LRO_NAC_ClrRoughness_15m_28N307E_150cmp = {
 local treks_LRO_NAC_ClrRoughness_15m_19S070E_150cmp = {
   Identifier = "LRO_NAC_ClrRoughness_15m_19S070E_150cmp",
   Name = [[LRO LROC DEM, Balmer Basin, 15m Color Roughness]],
+  ZIndex = 50,
   FilePath = asset.resource("LRO_LROC_DEM/Balmer_Basin.vrt"),
   Description = [[]]
 }
@@ -79,6 +89,7 @@ local treks_LRO_NAC_ClrRoughness_15m_19S070E_150cmp = {
 local treks_LRO_NAC_ClrRoughness_15m_20S337E_400cmp = {
   Identifier = "LRO_NAC_ClrRoughness_15m_20S337E_400cmp",
   Name = [[LRO LROC DEM, Bullialdus Crater, 15m Color Roughness]],
+  ZIndex = 50,
   FilePath = asset.resource("LRO_LROC_DEM/Bullialdus_Crater.vrt"),
   Description = [[]]
 }
@@ -86,6 +97,7 @@ local treks_LRO_NAC_ClrRoughness_15m_20S337E_400cmp = {
 local treks_LRO_NAC_ClrShade_61N099E_150cmp = {
   Identifier = "LRO_NAC_ClrShade_61N099E_150cmp",
   Name = [[LRO LROC DEM, Compton Belkovich Th Anomaly, ColorHillshade]],
+  ZIndex = 50,
   FilePath = asset.resource("LRO_LROC_DEM/Compton_Belkovich_Th_Anomaly.vrt"),
   Description = [[]]
 }
@@ -93,6 +105,7 @@ local treks_LRO_NAC_ClrShade_61N099E_150cmp = {
 local treks_LRO_NAC_ClrRoughness_15m_26N178E_150cmp = {
   Identifier = "LRO_NAC_ClrRoughness_15m_26N178E_150cmp",
   Name = [[LRO LROC DEM, Dante Crater, 15m Color Roughness]],
+  ZIndex = 50,
   FilePath = asset.resource("LRO_LROC_DEM/Dante_Crater.vrt"),
   Description = [[]]
 }
@@ -100,6 +113,7 @@ local treks_LRO_NAC_ClrRoughness_15m_26N178E_150cmp = {
 local treks_LRO_NAC_ClrShade_02S317E_150cmp = {
   Identifier = "LRO_NAC_ClrShade_02S317E_150cmp",
   Name = [[LRO LROC DEM, Flamsteed Crater, ColorHillshade]],
+  ZIndex = 50,
   FilePath = asset.resource("LRO_LROC_DEM/Flamsteed_Crater.vrt"),
   Description = [[]]
 }
@@ -107,6 +121,7 @@ local treks_LRO_NAC_ClrShade_02S317E_150cmp = {
 local treks_LRO_NAC_ClrShade_03N280E_2m = {
   Identifier = "LRO_NAC_ClrShade_03N280E_2m",
   Name = [[LRO LROC DEM, Fresh Crater East of Lents, ColorHillshade]],
+  ZIndex = 50,
   FilePath = asset.resource("LRO_LROC_DEM/Fresh_Crater_East_of_Lents.vrt"),
   Description = [[]]
 }
@@ -114,6 +129,7 @@ local treks_LRO_NAC_ClrShade_03N280E_2m = {
 local treks_LRO_NAC_ClrRoughness_15m_36N320E_2mp = {
   Identifier = "LRO_NAC_ClrRoughness_15m_36N320E_2mp",
   Name = [[LRO LROC DEM, Gruithuisen Domes, 15m Color Roughness]],
+  ZIndex = 50,
   FilePath = asset.resource("LRO_LROC_DEM/Gruithuisen_Domes.vrt"),
   Description = [[]]
 }
@@ -121,6 +137,7 @@ local treks_LRO_NAC_ClrRoughness_15m_36N320E_2mp = {
 local treks_LRO_NAC_ClrRoughness_15m_00N234E_150cmp = {
   Identifier = "LRO_NAC_ClrRoughness_15m_00N234E_150cmp",
   Name = [[LRO LROC DEM, Hertzsprung, 15m Color Roughness]],
+  ZIndex = 50,
   FilePath = asset.resource("LRO_LROC_DEM/Hertzsprung.vrt"),
   Description = [[]]
 }
@@ -128,6 +145,7 @@ local treks_LRO_NAC_ClrRoughness_15m_00N234E_150cmp = {
 local treks_LRO_NAC_ClrRoughness_15m_08N332E_2mp = {
   Identifier = "LRO_NAC_ClrRoughness_15m_08N332E_2mp",
   Name = [[LRO LROC DEM, Hortensius Domes, 15m Color Roughness]],
+  ZIndex = 50,
   FilePath = asset.resource("LRO_LROC_DEM/Hortensius_Domes.vrt"),
   Description = [[]]
 }
@@ -135,6 +153,7 @@ local treks_LRO_NAC_ClrRoughness_15m_08N332E_2mp = {
 local treks_LRO_NAC_ClrShade_55N077E_200cmp = {
   Identifier = "LRO_NAC_ClrShade_55N077E_200cmp",
   Name = [[LRO LROC DEM, Humboldtianum Basin, ColorHillshade]],
+  ZIndex = 50,
   FilePath = asset.resource("LRO_LROC_DEM/Humboldtianum_Basin.vrt"),
   Description = [[]]
 }
@@ -142,6 +161,7 @@ local treks_LRO_NAC_ClrShade_55N077E_200cmp = {
 local treks_LRO_NAC_ClrShade_19N005E_2mp = {
   Identifier = "LRO_NAC_ClrShade_19N005E_2mp",
   Name = [[LRO LROC DEM, Ina (D-Caldera), ColorHillshade]],
+  ZIndex = 50,
   FilePath = asset.resource("LRO_LROC_DEM/Ina_D-Caldera.vrt"),
   Description = [[]]
 }
@@ -149,6 +169,7 @@ local treks_LRO_NAC_ClrShade_19N005E_2mp = {
 local treks_LRO_NAC_ClrRoughness_15m_06N120E_200cmp = {
   Identifier = "LRO_NAC_ClrRoughness_15m_06N120E_200cmp",
   Name = [[LRO LROC DEM, King Crater, 15m Color Roughness]],
+  ZIndex = 50,
   FilePath = asset.resource("LRO_LROC_DEM/King_Crater.vrt"),
   Description = [[]]
 }
@@ -156,6 +177,7 @@ local treks_LRO_NAC_ClrRoughness_15m_06N120E_200cmp = {
 local treks_LRO_NAC_ClrRoughness_15m_32N292E_2mp = {
   Identifier = "LRO_NAC_ClrRoughness_15m_32N292E_2mp",
   Name = [[LRO LROC DEM, Lichtenberg Crater, 15m Color Roughness]],
+  ZIndex = 50,
   FilePath = asset.resource("LRO_LROC_DEM/Lichtenberg_Crater.vrt"),
   Description = [[]]
 }
@@ -163,6 +185,7 @@ local treks_LRO_NAC_ClrRoughness_15m_32N292E_2mp = {
 local treks_LRO_NAC_ClrRoughness_15m_10N58E_150cmp = {
   Identifier = "LRO_NAC_ClrRoughness_15m_10N58E_150cmp",
   Name = [[LRO LROC DEM, Mare Crisium, 15m Color Roughness]],
+  ZIndex = 50,
   FilePath = asset.resource("LRO_LROC_DEM/Mare_Crisium.vrt"),
   Description = [[]]
 }
@@ -170,6 +193,7 @@ local treks_LRO_NAC_ClrRoughness_15m_10N58E_150cmp = {
 local treks_LRO_NAC_ClrShade_36S164E_2mp = {
   Identifier = "LRO_NAC_ClrShade_36S164E_2mp",
   Name = [[LRO LROC DEM, Mare Ingenii, ColorHillshade]],
+  ZIndex = 50,
   FilePath = asset.resource("LRO_LROC_DEM/Mare_Ingenii.vrt"),
   Description = [[]]
 }
@@ -177,6 +201,7 @@ local treks_LRO_NAC_ClrShade_36S164E_2mp = {
 local treks_LRO_NAC_ClrShade_26N150E_200cmp = {
   Identifier = "LRO_NAC_ClrShade_26N150E_200cmp",
   Name = [[LRO LROC DEM, Mare Moscoviense, ColorHillshade]],
+  ZIndex = 50,
   FilePath = asset.resource("LRO_LROC_DEM/Mare_Moscoviense.vrt"),
   Description = [[]]
 }
@@ -184,6 +209,7 @@ local treks_LRO_NAC_ClrShade_26N150E_200cmp = {
 local treks_LRO_NAC_ClrShade_02N085E_150cmp = {
   Identifier = "LRO_NAC_ClrShade_02N085E_150cmp",
   Name = [[LRO LROC DEM, Mare Smythii, ColorHillshade]],
+  ZIndex = 50,
   FilePath = asset.resource("LRO_LROC_DEM/Mare_Smythii.vrt"),
   Description = [[]]
 }
@@ -191,6 +217,7 @@ local treks_LRO_NAC_ClrShade_02N085E_150cmp = {
 local treks_LRO_NAC_ClrShade_07N022E_150cmp = {
   Identifier = "LRO_NAC_ClrShade_07N022E_150cmp",
   Name = [[LRO LROC DEM, Mare Tranquillitatis, ColorHillshade]],
+  ZIndex = 50,
   FilePath = asset.resource("LRO_LROC_DEM/Mare_Tranquillitatis.vrt"),
   Description = [[]]
 }
@@ -198,6 +225,7 @@ local treks_LRO_NAC_ClrShade_07N022E_150cmp = {
 local treks_LRO_NAC_ClrShade_14N304E_2mp = {
   Identifier = "LRO_NAC_ClrShade_14N304E_2mp",
   Name = [[LRO LROC DEM, Marius Hills, ColorHillshade]],
+  ZIndex = 50,
   FilePath = asset.resource("LRO_LROC_DEM/Marius_Hills.vrt"),
   Description = [[]]
 }
@@ -205,6 +233,7 @@ local treks_LRO_NAC_ClrShade_14N304E_2mp = {
 local treks_LRO_NAC_ClrRoughness_15m_16S041E_150cmp = {
   Identifier = "LRO_NAC_ClrRoughness_15m_16S041E_150cmp",
   Name = [[LRO LROC DEM, Montes Pyrenaeus, 15m Color Roughness]],
+  ZIndex = 50,
   FilePath = asset.resource("LRO_LROC_DEM/Montes_Pyrenaeus.vrt"),
   Description = [[]]
 }
@@ -212,6 +241,7 @@ local treks_LRO_NAC_ClrRoughness_15m_16S041E_150cmp = {
 local treks_LRO_NAC_ClrShade_05N000E_150cmp = {
   Identifier = "LRO_NAC_ClrShade_05N000E_150cmp",
   Name = [[LRO LROC DEM, Murchison Crater, ColorHillshade]],
+  ZIndex = 50,
   FilePath = asset.resource("LRO_LROC_DEM/Murchison_Crater.vrt"),
   Description = [[]]
 }
@@ -219,6 +249,7 @@ local treks_LRO_NAC_ClrShade_05N000E_150cmp = {
 local treks_LRO_NAC_ClrRoughness_15m_26S265E_200cmp = {
   Identifier = "LRO_NAC_ClrRoughness_15m_26S265E_200cmp",
   Name = [[LRO LROC DEM, Orientale 1, 15m Color Roughness]],
+  ZIndex = 50,
   FilePath = asset.resource("LRO_LROC_DEM/Orientale_1.vrt"),
   Description = [[]]
 }
@@ -226,6 +257,7 @@ local treks_LRO_NAC_ClrRoughness_15m_26S265E_200cmp = {
 local treks_LRO_NAC_ClrRoughness_15m_53N354E_150cmp = {
   Identifier = "LRO_NAC_ClrRoughness_15m_53N354E_150cmp",
   Name = [[LRO LROC DEM, Plato Ejecta, 15m Color Roughness]],
+  ZIndex = 50,
   FilePath = asset.resource("LRO_LROC_DEM/Plato_Ejecta.vrt"),
   Description = [[]]
 }
@@ -233,6 +265,7 @@ local treks_LRO_NAC_ClrRoughness_15m_53N354E_150cmp = {
 local treks_LRO_NAC_ClrShade_07N301E_2mp = {
   Identifier = "LRO_NAC_ClrShade_07N301E_2mp",
   Name = [[LRO LROC DEM, Reiner Gamma, ColorHillshade]],
+  ZIndex = 50,
   FilePath = asset.resource("LRO_LROC_DEM/Reiner_Gamma.vrt"),
   Description = [[]]
 }
@@ -240,6 +273,7 @@ local treks_LRO_NAC_ClrShade_07N301E_2mp = {
 local treks_LRO_NAC_ClrShade_03S286E_150cmp = {
   Identifier = "LRO_NAC_ClrShade_03S286E_150cmp",
   Name = [[LRO LROC DEM, Riccioli Crater, ColorHillshade]],
+  ZIndex = 50,
   FilePath = asset.resource("LRO_LROC_DEM/Riccioli_Crater.vrt"),
   Description = [[]]
 }
@@ -247,6 +281,7 @@ local treks_LRO_NAC_ClrShade_03S286E_150cmp = {
 local treks_LRO_NAC_ClrShade_13N356E_150cmp = {
   Identifier = "LRO_NAC_ClrShade_13N356E_150cmp",
   Name = [[LRO LROC DEM, Rima Bode, ColorHillshade]],
+  ZIndex = 50,
   FilePath = asset.resource("LRO_LROC_DEM/Rima_Bode.vrt"),
   Description = [[]]
 }
@@ -254,6 +289,7 @@ local treks_LRO_NAC_ClrShade_13N356E_150cmp = {
 local treks_LRO_NAC_ClrShade_27N318E_150cmp = {
   Identifier = "LRO_NAC_ClrShade_27N318E_150cmp",
   Name = [[LRO LROC DEM, Rimae Prinz, ColorHillshade]],
+  ZIndex = 50,
   FilePath = asset.resource("LRO_LROC_DEM/Rimae_Prinz.vrt"),
   Description = [[]]
 }
@@ -261,6 +297,7 @@ local treks_LRO_NAC_ClrShade_27N318E_150cmp = {
 local treks_LRO_NAC_ClrRoughness_15m_60S200E_150cmp = {
   Identifier = "LRO_NAC_ClrRoughness_15m_60S200E_150cmp",
   Name = [[LRO LROC DEM, South Pole-Aitken Basin Interior, 15m Color Roughness]],
+  ZIndex = 50,
   FilePath = asset.resource("LRO_LROC_DEM/South_Pole-Aitken_Basin_Interior.vrt"),
   Description = [[]]
 }
@@ -268,6 +305,7 @@ local treks_LRO_NAC_ClrRoughness_15m_60S200E_150cmp = {
 local treks_LRO_NAC_ClrShade_51S171E_2mp = {
   Identifier = "LRO_NAC_ClrShade_51S171E_2mp",
   Name = [[LRO LROC DEM, South Pole-Aitken Rim, ColorHillshade]],
+  ZIndex = 50,
   FilePath = asset.resource("LRO_LROC_DEM/South_Pole-Aitken_Rim.vrt"),
   Description = [[]]
 }
@@ -275,6 +313,7 @@ local treks_LRO_NAC_ClrShade_51S171E_2mp = {
 local treks_LRO_NAC_ClrRoughness_15m_02S167E_150cmp = {
   Identifier = "LRO_NAC_ClrRoughness_15m_02S167E_150cmp",
   Name = [[LRO LROC DEM, Stratton (Dewar) High Fe Anomaly, 15m Color Roughness]],
+  ZIndex = 50,
   FilePath = asset.resource("LRO_LROC_DEM/Stratton_Dewar_High_Fe_Anomaly.vrt"),
   Description = [[]]
 }
@@ -282,6 +321,7 @@ local treks_LRO_NAC_ClrRoughness_15m_02S167E_150cmp = {
 local treks_LRO_NAC_ClrShade_02S167E_150cmp = {
   Identifier = "LRO_NAC_ClrShade_02S167E_150cmp",
   Name = [[LRO LROC DEM, Stratton (Dewar), ColorHillshade]],
+  ZIndex = 50,
   FilePath = asset.resource("LRO_LROC_DEM/Stratton_Dewar.vrt"),
   Description = [[]]
 }
@@ -289,6 +329,7 @@ local treks_LRO_NAC_ClrShade_02S167E_150cmp = {
 local treks_LRO_NAC_ClrRoughness_15m_20N010E_2mp = {
   Identifier = "LRO_NAC_ClrRoughness_15m_20N010E_2mp",
   Name = [[LRO LROC DEM, Sulpicius Gallus, 15m Color Roughness]],
+  ZIndex = 50,
   FilePath = asset.resource("LRO_LROC_DEM/Sulpicius_Gallus.vrt"),
   Description = [[]]
 }
@@ -296,6 +337,7 @@ local treks_LRO_NAC_ClrRoughness_15m_20N010E_2mp = {
 local treks_LRO_NAC_ClrRoughness_15m_19S129E_150cmp = {
   Identifier = "LRO_NAC_ClrRoughness_15m_19S129E_150cmp",
   Name = [[LRO LROC DEM, Tsiolkovskiy Crater, 15m Color Roughness]],
+  ZIndex = 50,
   FilePath = asset.resource("LRO_LROC_DEM/Tsiolkovskiy_Crater.vrt"),
   Description = [[]]
 }
@@ -303,6 +345,7 @@ local treks_LRO_NAC_ClrRoughness_15m_19S129E_150cmp = {
 local treks_LRO_NAC_ClrRoughness_15m_43S349E_150cmp = {
   Identifier = "LRO_NAC_ClrRoughness_15m_43S349E_150cmp",
   Name = [[LRO LROC DEM, Tycho Crater, 15m Color Roughness]],
+  ZIndex = 50,
   FilePath = asset.resource("LRO_LROC_DEM/Tycho_Crater.vrt"),
   Description = [[]]
 }
diff --git a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Image_Mosaic.asset b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Image_Mosaic.asset
index 759197bb9b..81d51e4d7f 100644
--- a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Image_Mosaic.asset
+++ b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Image_Mosaic.asset
@@ -9,6 +9,7 @@ local globeIdentifier = asset.require("scene/solarsystem//planets/earth/moon/moo
 local treks_LRO_NAC_Mosaic_17S173E_50cmp = {
   Identifier = "LRO_NAC_Mosaic_17S173E_50cmp",
   Name = [[LRO LROC Image Mosaic, Aitken Crater]],
+  ZIndex = 50,
   FilePath = asset.resource("LRO_LROC_Image_Mosaic/Aitken_Crater.vrt"),
   Description = [[]]
 }
@@ -16,6 +17,7 @@ local treks_LRO_NAC_Mosaic_17S173E_50cmp = {
 local treks_LRO_NAC_Mosaic_13S358E_50cmp = {
   Identifier = "LRO_NAC_Mosaic_13S358E_50cmp",
   Name = [[LRO LROC Image Mosaic, Alphonsus]],
+  ZIndex = 50,
   FilePath = asset.resource("LRO_LROC_Image_Mosaic/Alphonsus.vrt"),
   Description = [[]]
 }
@@ -23,6 +25,7 @@ local treks_LRO_NAC_Mosaic_13S358E_50cmp = {
 local treks_LRO_NAC_Mosaic_26N004E_50cmp = {
   Identifier = "LRO_NAC_Mosaic_26N004E_50cmp",
   Name = [[LRO LROC Image Mosaic, Apollo 15]],
+  ZIndex = 50,
   FilePath = asset.resource("LRO_LROC_Image_Mosaic/Apollo_15.vrt"),
   Description = [[]]
 }
@@ -30,6 +33,7 @@ local treks_LRO_NAC_Mosaic_26N004E_50cmp = {
 local treks_LRO_NAC_Mosaic_09S015E_50cmp = {
   Identifier = "LRO_NAC_Mosaic_09S015E_50cmp",
   Name = [[LRO LROC Image Mosaic, Apollo 16]],
+  ZIndex = 50,
   FilePath = asset.resource("LRO_LROC_Image_Mosaic/Apollo_16.vrt"),
   Description = [[]]
 }
@@ -37,6 +41,7 @@ local treks_LRO_NAC_Mosaic_09S015E_50cmp = {
 local treks_LRO_NAC_Mosaic_25N311E_50cmp = {
   Identifier = "LRO_NAC_Mosaic_25N311E_50cmp",
   Name = [[LRO LROC Image Mosaic, Aristarchus 1]],
+  ZIndex = 50,
   FilePath = asset.resource("LRO_LROC_Image_Mosaic/Aristarchus_1.vrt"),
   Description = [[]]
 }
@@ -44,6 +49,7 @@ local treks_LRO_NAC_Mosaic_25N311E_50cmp = {
 local treks_LRO_NAC_Mosaic_28N307E_50cmp = {
   Identifier = "LRO_NAC_Mosaic_28N307E_50cmp",
   Name = [[LRO LROC Image Mosaic, Aristarchus 2]],
+  ZIndex = 50,
   FilePath = asset.resource("LRO_LROC_Image_Mosaic/Aristarchus_2.vrt"),
   Description = [[]]
 }
@@ -51,6 +57,7 @@ local treks_LRO_NAC_Mosaic_28N307E_50cmp = {
 local treks_LRO_NAC_Mosaic_19S070E_50cmp = {
   Identifier = "LRO_NAC_Mosaic_19S070E_50cmp",
   Name = [[LRO LROC Image Mosaic, Balmer Basin]],
+  ZIndex = 50,
   FilePath = asset.resource("LRO_LROC_Image_Mosaic/Balmer_Basin.vrt"),
   Description = [[]]
 }
@@ -58,6 +65,7 @@ local treks_LRO_NAC_Mosaic_19S070E_50cmp = {
 local treks_LRO_NAC_Mosaic_61N099E_50cmp = {
   Identifier = "LRO_NAC_Mosaic_61N099E_50cmp",
   Name = [[LRO LROC Image Mosaic, Compton Belkovich Th Anomaly]],
+  ZIndex = 50,
   FilePath = asset.resource("LRO_LROC_Image_Mosaic/Compton_Belkovich_Th_Anomaly.vrt"),
   Description = [[]]
 }
@@ -65,6 +73,7 @@ local treks_LRO_NAC_Mosaic_61N099E_50cmp = {
 local treks_LRO_NAC_Mosaic_02S317E_50cmp = {
   Identifier = "LRO_NAC_Mosaic_02S317E_50cmp",
   Name = [[LRO LROC Image Mosaic, Flamsteed Crater]],
+  ZIndex = 50,
   FilePath = asset.resource("LRO_LROC_Image_Mosaic/Flamsteed_Crater.vrt"),
   Description = [[]]
 }
@@ -72,6 +81,7 @@ local treks_LRO_NAC_Mosaic_02S317E_50cmp = {
 local treks_LRO_NAC_Mosaic_36N320E_50cmp = {
   Identifier = "LRO_NAC_Mosaic_36N320E_50cmp",
   Name = [[LRO LROC Image Mosaic, Gruithuisen Domes]],
+  ZIndex = 50,
   FilePath = asset.resource("LRO_LROC_Image_Mosaic/Gruithuisen_Domes.vrt"),
   Description = [[]]
 }
@@ -79,6 +89,7 @@ local treks_LRO_NAC_Mosaic_36N320E_50cmp = {
 local treks_LRO_NAC_Mosaic_00N234E_50cmp = {
   Identifier = "LRO_NAC_Mosaic_00N234E_50cmp",
   Name = [[LRO LROC Image Mosaic, Hertzsprung]],
+  ZIndex = 50,
   FilePath = asset.resource("LRO_LROC_Image_Mosaic/Hertzsprung.vrt"),
   Description = [[]]
 }
@@ -86,6 +97,7 @@ local treks_LRO_NAC_Mosaic_00N234E_50cmp = {
 local treks_LRO_NAC_Mosaic_08N332E_50cmp = {
   Identifier = "LRO_NAC_Mosaic_08N332E_50cmp",
   Name = [[LRO LROC Image Mosaic, Hortensius Domes]],
+  ZIndex = 50,
   FilePath = asset.resource("LRO_LROC_Image_Mosaic/Hortensius_Domes.vrt"),
   Description = [[]]
 }
@@ -93,6 +105,7 @@ local treks_LRO_NAC_Mosaic_08N332E_50cmp = {
 local treks_LRO_NAC_Mosaic_55N077E_50cmp = {
   Identifier = "LRO_NAC_Mosaic_55N077E_50cmp",
   Name = [[LRO LROC Image Mosaic, Humboldtianum Basin]],
+  ZIndex = 50,
   FilePath = asset.resource("LRO_LROC_Image_Mosaic/Humboldtianum_Basin.vrt"),
   Description = [[]]
 }
@@ -100,6 +113,7 @@ local treks_LRO_NAC_Mosaic_55N077E_50cmp = {
 local treks_LRO_NAC_Mosaic_19N005E_50cmp = {
   Identifier = "LRO_NAC_Mosaic_19N005E_50cmp",
   Name = [[LRO LROC Image Mosaic, Ina D-Caldera]],
+  ZIndex = 50,
   FilePath = asset.resource("LRO_LROC_Image_Mosaic/Ina_D-Caldera.vrt"),
   Description = [[]]
 }
@@ -107,6 +121,7 @@ local treks_LRO_NAC_Mosaic_19N005E_50cmp = {
 local treks_LRO_NAC_Mosaic_06N120E_50cmp = {
   Identifier = "LRO_NAC_Mosaic_06N120E_50cmp",
   Name = [[LRO LROC Image Mosaic, King Crater]],
+  ZIndex = 50,
   FilePath = asset.resource("LRO_LROC_Image_Mosaic/King_Crater.vrt"),
   Description = [[]]
 }
@@ -114,6 +129,7 @@ local treks_LRO_NAC_Mosaic_06N120E_50cmp = {
 local treks_LRO_NAC_Mosaic_32N292E_50cmp = {
   Identifier = "LRO_NAC_Mosaic_32N292E_50cmp",
   Name = [[LRO LROC Image Mosaic, Lichtenberg Crater]],
+  ZIndex = 50,
   FilePath = asset.resource("LRO_LROC_Image_Mosaic/Lichtenberg_Crater.vrt"),
   Description = [[]]
 }
@@ -121,6 +137,7 @@ local treks_LRO_NAC_Mosaic_32N292E_50cmp = {
 local treks_LRO_NAC_Mosaic_36S164E_70cmp = {
   Identifier = "LRO_NAC_Mosaic_36S164E_70cmp",
   Name = [[LRO LROC Image Mosaic, Mare Ingenii]],
+  ZIndex = 50,
   FilePath = asset.resource("LRO_LROC_Image_Mosaic/Mare_Ingenii.vrt"),
   Description = [[]]
 }
@@ -128,6 +145,7 @@ local treks_LRO_NAC_Mosaic_36S164E_70cmp = {
 local treks_LRO_NAC_Mosaic_26N150E_50cmp = {
   Identifier = "LRO_NAC_Mosaic_26N150E_50cmp",
   Name = [[LRO LROC Image Mosaic, Mare Moscoviense]],
+  ZIndex = 50,
   FilePath = asset.resource("LRO_LROC_Image_Mosaic/Mare_Moscoviense.vrt"),
   Description = [[]]
 }
@@ -135,6 +153,7 @@ local treks_LRO_NAC_Mosaic_26N150E_50cmp = {
 local treks_LRO_NAC_Mosaic_02N085E_50cmp = {
   Identifier = "LRO_NAC_Mosaic_02N085E_50cmp",
   Name = [[LRO LROC Image Mosaic, Mare Smythii]],
+  ZIndex = 50,
   FilePath = asset.resource("LRO_LROC_Image_Mosaic/Mare_Smythii.vrt"),
   Description = [[]]
 }
@@ -142,6 +161,7 @@ local treks_LRO_NAC_Mosaic_02N085E_50cmp = {
 local treks_LRO_NAC_Mosaic_07N022E_50cmp = {
   Identifier = "LRO_NAC_Mosaic_07N022E_50cmp",
   Name = [[LRO LROC Image Mosaic, Mare Tranquillitatis]],
+  ZIndex = 50,
   FilePath = asset.resource("LRO_LROC_Image_Mosaic/Mare_Tranquillitatis.vrt"),
   Description = [[]]
 }
@@ -149,6 +169,7 @@ local treks_LRO_NAC_Mosaic_07N022E_50cmp = {
 local treks_LRO_NAC_Mosaic_14N304E_50cmp = {
   Identifier = "LRO_NAC_Mosaic_14N304E_50cmp",
   Name = [[LRO LROC Image Mosaic, Marius Hills]],
+  ZIndex = 50,
   FilePath = asset.resource("LRO_LROC_Image_Mosaic/Marius_Hills.vrt"),
   Description = [[]]
 }
@@ -156,6 +177,7 @@ local treks_LRO_NAC_Mosaic_14N304E_50cmp = {
 local treks_LRO_NAC_Mosaic_16S041E_50cmp = {
   Identifier = "LRO_NAC_Mosaic_16S041E_50cmp",
   Name = [[LRO LROC Image Mosaic, Montes Pyrenaeus]],
+  ZIndex = 50,
   FilePath = asset.resource("LRO_LROC_Image_Mosaic/Montes_Pyrenaeus.vrt"),
   Description = [[]]
 }
@@ -163,6 +185,7 @@ local treks_LRO_NAC_Mosaic_16S041E_50cmp = {
 local treks_LRO_NAC_Mosaic_05N000E_50cmp = {
   Identifier = "LRO_NAC_Mosaic_05N000E_50cmp",
   Name = [[LRO LROC Image Mosaic, Murchison Crater]],
+  ZIndex = 50,
   FilePath = asset.resource("LRO_LROC_Image_Mosaic/Murchison_Crater.vrt"),
   Description = [[]]
 }
@@ -170,6 +193,7 @@ local treks_LRO_NAC_Mosaic_05N000E_50cmp = {
 local treks_LRO_NAC_Mosaic_26S265E_50cmp = {
   Identifier = "LRO_NAC_Mosaic_26S265E_50cmp",
   Name = [[LRO LROC Image Mosaic, Orientale 1]],
+  ZIndex = 50,
   FilePath = asset.resource("LRO_LROC_Image_Mosaic/Orientale_1.vrt"),
   Description = [[]]
 }
@@ -177,6 +201,7 @@ local treks_LRO_NAC_Mosaic_26S265E_50cmp = {
 local treks_LRO_NAC_Mosaic_07N301E_50cmp = {
   Identifier = "LRO_NAC_Mosaic_07N301E_50cmp",
   Name = [[LRO LROC Image Mosaic, Reiner Gamma]],
+  ZIndex = 50,
   FilePath = asset.resource("LRO_LROC_Image_Mosaic/Reiner_Gamma.vrt"),
   Description = [[]]
 }
@@ -184,6 +209,7 @@ local treks_LRO_NAC_Mosaic_07N301E_50cmp = {
 local treks_LRO_NAC_Mosaic_03S286E_50cmp = {
   Identifier = "LRO_NAC_Mosaic_03S286E_50cmp",
   Name = [[LRO LROC Image Mosaic, Riccioli Crater]],
+  ZIndex = 50,
   FilePath = asset.resource("LRO_LROC_Image_Mosaic/Riccioli_Crater.vrt"),
   Description = [[]]
 }
@@ -191,6 +217,7 @@ local treks_LRO_NAC_Mosaic_03S286E_50cmp = {
 local treks_LRO_NAC_Mosaic_13N356E_50cmp = {
   Identifier = "LRO_NAC_Mosaic_13N356E_50cmp",
   Name = [[LRO LROC Image Mosaic, Rima Bode]],
+  ZIndex = 50,
   FilePath = asset.resource("LRO_LROC_Image_Mosaic/Rima_Bode.vrt"),
   Description = [[]]
 }
@@ -198,6 +225,7 @@ local treks_LRO_NAC_Mosaic_13N356E_50cmp = {
 local treks_LRO_NAC_Mosaic_27N318E_50cmp = {
   Identifier = "LRO_NAC_Mosaic_27N318E_50cmp",
   Name = [[LRO LROC Image Mosaic, Rimae Prinz]],
+  ZIndex = 50,
   FilePath = asset.resource("LRO_LROC_Image_Mosaic/Rimae_Prinz.vrt"),
   Description = [[]]
 }
@@ -205,6 +233,7 @@ local treks_LRO_NAC_Mosaic_27N318E_50cmp = {
 local treks_LRO_NAC_Mosaic_60S200E_50cmp = {
   Identifier = "LRO_NAC_Mosaic_60S200E_50cmp",
   Name = [[LRO LROC Image Mosaic, South Pole-Aitken Basin Interior]],
+  ZIndex = 50,
   FilePath = asset.resource("LRO_LROC_Image_Mosaic/South_Pole-Aitken_Basin_Interior.vrt"),
   Description = [[]]
 }
@@ -212,6 +241,7 @@ local treks_LRO_NAC_Mosaic_60S200E_50cmp = {
 local treks_LRO_NAC_Mosaic_51S171E_60cmp = {
   Identifier = "LRO_NAC_Mosaic_51S171E_60cmp",
   Name = [[LRO LROC Image Mosaic, South Pole-Aitken Rim]],
+  ZIndex = 50,
   FilePath = asset.resource("LRO_LROC_Image_Mosaic/South_Pole-Aitken_Rim.vrt"),
   Description = [[]]
 }
@@ -219,6 +249,7 @@ local treks_LRO_NAC_Mosaic_51S171E_60cmp = {
 local treks_LRO_NAC_Mosaic_02S167E_50cmp = {
   Identifier = "LRO_NAC_Mosaic_02S167E_50cmp",
   Name = [[LRO LROC Image Mosaic, Stratton (Dewar)]],
+  ZIndex = 50,
   FilePath = asset.resource("LRO_LROC_Image_Mosaic/Stratton_Dewar.vrt"),
   Description = [[]]
 }
@@ -226,6 +257,7 @@ local treks_LRO_NAC_Mosaic_02S167E_50cmp = {
 local treks_LRO_NAC_Mosaic_20N010E_60cmp = {
   Identifier = "LRO_NAC_Mosaic_20N010E_60cmp",
   Name = [[LRO LROC Image Mosaic, Sulpicius Gallus]],
+  ZIndex = 50,
   FilePath = asset.resource("LRO_LROC_Image_Mosaic/Sulpicius_Gallus.vrt"),
   Description = [[]]
 }
@@ -233,6 +265,7 @@ local treks_LRO_NAC_Mosaic_20N010E_60cmp = {
 local treks_LRO_NAC_Mosaic_19S129E_50cmp = {
   Identifier = "LRO_NAC_Mosaic_19S129E_50cmp",
   Name = [[LRO LROC Image Mosaic, Tsiolkovskiy Crater]],
+  ZIndex = 50,
   FilePath = asset.resource("LRO_LROC_Image_Mosaic/Tsiolkovskiy_Crater.vrt"),
   Description = [[]]
 }
@@ -240,6 +273,7 @@ local treks_LRO_NAC_Mosaic_19S129E_50cmp = {
 local treks_LRO_NAC_Mosaic_43S349E_50cmp = {
   Identifier = "LRO_NAC_Mosaic_43S349E_50cmp",
   Name = [[LRO LROC Image Mosaic, Tycho Crater]],
+  ZIndex = 50,
   FilePath = asset.resource("LRO_LROC_Image_Mosaic/Tycho_Crater.vrt"),
   Description = [[]]
 }
diff --git a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Image_Mosaic_26cm.asset b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Image_Mosaic_26cm.asset
index 53f7ac725d..0ad55bc786 100644
--- a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Image_Mosaic_26cm.asset
+++ b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Image_Mosaic_26cm.asset
@@ -9,6 +9,7 @@ local globeIdentifier = asset.require("scene/solarsystem//planets/earth/moon/moo
 local treks_apollo11_26cm_mosaic_byte_geo_1_2_highContrast = {
   Identifier = "apollo11_26cm_mosaic_byte_geo_1_2_highContrast",
   Name = [[LRO LROC Image Mosaic 26cm, Apollo 11]],
+  ZIndex = 50,
   FilePath = asset.resource("LRO_LROC_Image_Mosaic_26cm/Apollo_11.vrt"),
   Description = [[]]
 }
diff --git a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Image_Mosaic_28cm.asset b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Image_Mosaic_28cm.asset
index f97b47c66e..dad3ad8b16 100644
--- a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Image_Mosaic_28cm.asset
+++ b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Image_Mosaic_28cm.asset
@@ -9,6 +9,7 @@ local globeIdentifier = asset.require("scene/solarsystem//planets/earth/moon/moo
 local treks_apollo14_28cm_mosaic_byte_geo_1_2_highContrast = {
   Identifier = "apollo14_28cm_mosaic_byte_geo_1_2_highContrast",
   Name = [[LRO LROC Image Mosaic 28cm, Apollo 14]],
+  ZIndex = 50,
   FilePath = asset.resource("LRO_LROC_Image_Mosaic_28cm/Apollo_14.vrt"),
   Description = [[]]
 }
diff --git a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Mosaic.asset b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Mosaic.asset
index d53822c253..b8019317dd 100644
--- a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Mosaic.asset
+++ b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Mosaic.asset
@@ -9,6 +9,7 @@ local globeIdentifier = asset.require("scene/solarsystem//planets/earth/moon/moo
 local treks_LRO_NAC_Mosaic_03N280E_70cm = {
   Identifier = "LRO_NAC_Mosaic_03N280E_70cm",
   Name = [[LRO LROC Mosaic, Fresh Crater East of Lents]],
+  ZIndex = 50,
   FilePath = asset.resource("LRO_LROC_Mosaic/Fresh_Crater_East_of_Lents.vrt"),
   Description = [[]]
 }
diff --git a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_NAC_Image_Mosaic.asset b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_NAC_Image_Mosaic.asset
index ad356b216c..6cf7bd59e5 100644
--- a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_NAC_Image_Mosaic.asset
+++ b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_NAC_Image_Mosaic.asset
@@ -9,6 +9,7 @@ local globeIdentifier = asset.require("scene/solarsystem//planets/earth/moon/moo
 local treks_LRO_NAC_AvgMosaic_NPole855_1mp_EQ = {
   Identifier = "LRO_NAC_AvgMosaic_NPole855_1mp_EQ",
   Name = [[LRO LROC NAC Image Mosaic, N Pole, Avg Merge]],
+  ZIndex = 50,
   FilePath = asset.resource("LRO_LROC_NAC_Image_Mosaic/N_Pole.vrt"),
   Description = [[This is a visible image mosaic generated using Lunar Reconnaissance Orbiter Camera (LROC) Narrow Angle Camera (NAC) images from the Lunar Reconnaissance Orbiter mission. The images were orthorectified using LRO's Lunar Orbiter Laser Altimeter (LOLA) polar 5 meter/pixel DEM. The mosaic is generated at half the resolution at which the individual LROC NAC images were gathered, which is approximately 0.5 meters/pixel. The mosaic was registered horizontally to the LOLA global DEM.]]
 }
@@ -16,6 +17,7 @@ local treks_LRO_NAC_AvgMosaic_NPole855_1mp_EQ = {
 local treks_LRO_NAC_AvgMosaic_SPole855_1mp_EQ = {
   Identifier = "LRO_NAC_AvgMosaic_SPole855_1mp_EQ",
   Name = [[LRO LROC NAC Image Mosaic, S Pole, Avg Merge]],
+  ZIndex = 50,
   FilePath = asset.resource("LRO_LROC_NAC_Image_Mosaic/S_Pole.vrt"),
   Description = [[This is a visible image mosaic generated using Lunar Reconnaissance Orbiter Camera (LROC) Narrow Angle Camera (NAC) images from the Lunar Reconnaissance Orbiter mission. The images were orthorectified using LRO's Lunar Orbiter Laser Altimeter (LOLA) polar 5 meter/pixel DEM. The mosaic is generated at half the resolution at which the individual LROC NAC images were gathered, which is approximately 0.5 meters/pixel. The mosaic was registered horizontally to the LOLA global DEM.]]
 }
diff --git a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Rock_Abundance.asset b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Rock_Abundance.asset
index f5335fc558..fc96293e35 100644
--- a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Rock_Abundance.asset
+++ b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Rock_Abundance.asset
@@ -9,6 +9,7 @@ local globeIdentifier = asset.require("scene/solarsystem//planets/earth/moon/moo
 local treks_LRO_NAC_RockAbnd_17S173E_150cmp = {
   Identifier = "LRO_NAC_RockAbnd_17S173E_150cmp",
   Name = [[LRO LROC Rock Abundance, Aitken Crater]],
+  ZIndex = 50,
   FilePath = asset.resource("LRO_LROC_Rock_Abundance/Aitken_Crater.vrt"),
   Description = [[]]
 }
@@ -16,6 +17,7 @@ local treks_LRO_NAC_RockAbnd_17S173E_150cmp = {
 local treks_LRO_NAC_RockAbnd_13S358E_2mp = {
   Identifier = "LRO_NAC_RockAbnd_13S358E_2mp",
   Name = [[LRO LROC Rock Abundance, Alphonsus Crater]],
+  ZIndex = 50,
   FilePath = asset.resource("LRO_LROC_Rock_Abundance/Alphonsus_Crater.vrt"),
   Description = [[]]
 }
@@ -23,6 +25,7 @@ local treks_LRO_NAC_RockAbnd_13S358E_2mp = {
 local treks_LRO_NAC_RockAbnd_73N350E_150cmp = {
   Identifier = "LRO_NAC_RockAbnd_73N350E_150cmp",
   Name = [[LRO LROC Rock Abundance, Anaxagoras Crater]],
+  ZIndex = 50,
   FilePath = asset.resource("LRO_LROC_Rock_Abundance/Anaxagoras_Crater.vrt"),
   Description = [[]]
 }
@@ -30,6 +33,7 @@ local treks_LRO_NAC_RockAbnd_73N350E_150cmp = {
 local treks_LRO_NAC_RockAbnd_26N004E_150cmp = {
   Identifier = "LRO_NAC_RockAbnd_26N004E_150cmp",
   Name = [[LRO LROC Rock Abundance, Apollo 15]],
+  ZIndex = 50,
   FilePath = asset.resource("LRO_LROC_Rock_Abundance/Apollo_15.vrt"),
   Description = [[]]
 }
@@ -37,6 +41,7 @@ local treks_LRO_NAC_RockAbnd_26N004E_150cmp = {
 local treks_LRO_NAC_RockAbnd_09S015E_150cmp = {
   Identifier = "LRO_NAC_RockAbnd_09S015E_150cmp",
   Name = [[LRO LROC Rock Abundance, Apollo 16]],
+  ZIndex = 50,
   FilePath = asset.resource("LRO_LROC_Rock_Abundance/Apollo_16.vrt"),
   Description = [[]]
 }
@@ -44,6 +49,7 @@ local treks_LRO_NAC_RockAbnd_09S015E_150cmp = {
 local treks_LRO_NAC_RockAbnd_37S206E_150cmp = {
   Identifier = "LRO_NAC_RockAbnd_37S206E_150cmp",
   Name = [[LRO LROC Rock Abundance, Apollo Basin]],
+  ZIndex = 50,
   FilePath = asset.resource("LRO_LROC_Rock_Abundance/Apollo_Basin.vrt"),
   Description = [[]]
 }
@@ -51,6 +57,7 @@ local treks_LRO_NAC_RockAbnd_37S206E_150cmp = {
 local treks_LRO_NAC_RockAbnd_25N311E_2mp = {
   Identifier = "LRO_NAC_RockAbnd_25N311E_2mp",
   Name = [[LRO LROC Rock Abundance, Aristarchus 1]],
+  ZIndex = 50,
   FilePath = asset.resource("LRO_LROC_Rock_Abundance/Aristarchus_1.vrt"),
   Description = [[]]
 }
@@ -58,6 +65,7 @@ local treks_LRO_NAC_RockAbnd_25N311E_2mp = {
 local treks_LRO_NAC_RockAbnd_28N307E_150cmp = {
   Identifier = "LRO_NAC_RockAbnd_28N307E_150cmp",
   Name = [[LRO LROC Rock Abundance, Aristarchus 2]],
+  ZIndex = 50,
   FilePath = asset.resource("LRO_LROC_Rock_Abundance/Aristarchus_2.vrt"),
   Description = [[]]
 }
@@ -65,6 +73,7 @@ local treks_LRO_NAC_RockAbnd_28N307E_150cmp = {
 local treks_LRO_NAC_RockAbnd_19S070E_150cmp = {
   Identifier = "LRO_NAC_RockAbnd_19S070E_150cmp",
   Name = [[LRO LROC Rock Abundance, Balmer Basin]],
+  ZIndex = 50,
   FilePath = asset.resource("LRO_LROC_Rock_Abundance/Balmer_Basin.vrt"),
   Description = [[]]
 }
@@ -72,6 +81,7 @@ local treks_LRO_NAC_RockAbnd_19S070E_150cmp = {
 local treks_LRO_NAC_RockAbnd_20S337E_400cmp = {
   Identifier = "LRO_NAC_RockAbnd_20S337E_400cmp",
   Name = [[LRO LROC Rock Abundance, Bullialdus Crater]],
+  ZIndex = 50,
   FilePath = asset.resource("LRO_LROC_Rock_Abundance/Bullialdus_Crater.vrt"),
   Description = [[]]
 }
@@ -79,6 +89,7 @@ local treks_LRO_NAC_RockAbnd_20S337E_400cmp = {
 local treks_LRO_NAC_RockAbnd_36N320E_2mp = {
   Identifier = "LRO_NAC_RockAbnd_36N320E_2mp",
   Name = [[LRO LROC Rock Abundance, Gruithuisen Domes]],
+  ZIndex = 50,
   FilePath = asset.resource("LRO_LROC_Rock_Abundance/Gruithuisen_Domes.vrt"),
   Description = [[]]
 }
@@ -86,6 +97,7 @@ local treks_LRO_NAC_RockAbnd_36N320E_2mp = {
 local treks_LRO_NAC_RockAbnd_00N234E_150cmp = {
   Identifier = "LRO_NAC_RockAbnd_00N234E_150cmp",
   Name = [[LRO LROC Rock Abundance, Hertzsprung]],
+  ZIndex = 50,
   FilePath = asset.resource("LRO_LROC_Rock_Abundance/Hertzsprung.vrt"),
   Description = [[]]
 }
@@ -93,6 +105,7 @@ local treks_LRO_NAC_RockAbnd_00N234E_150cmp = {
 local treks_LRO_NAC_RockAbnd_08N332E_2mp = {
   Identifier = "LRO_NAC_RockAbnd_08N332E_2mp",
   Name = [[LRO LROC Rock Abundance, Hortensius Domes]],
+  ZIndex = 50,
   FilePath = asset.resource("LRO_LROC_Rock_Abundance/Hortensius_Domes.vrt"),
   Description = [[]]
 }
@@ -100,6 +113,7 @@ local treks_LRO_NAC_RockAbnd_08N332E_2mp = {
 local treks_LRO_NAC_RockAbnd_06N120E_200cmp = {
   Identifier = "LRO_NAC_RockAbnd_06N120E_200cmp",
   Name = [[LRO LROC Rock Abundance, King Crater]],
+  ZIndex = 50,
   FilePath = asset.resource("LRO_LROC_Rock_Abundance/King_Crater.vrt"),
   Description = [[]]
 }
@@ -107,6 +121,7 @@ local treks_LRO_NAC_RockAbnd_06N120E_200cmp = {
 local treks_LRO_NAC_RockAbnd_32N292E_2mp = {
   Identifier = "LRO_NAC_RockAbnd_32N292E_2mp",
   Name = [[LRO LROC Rock Abundance, Lichtenberg Crater]],
+  ZIndex = 50,
   FilePath = asset.resource("LRO_LROC_Rock_Abundance/Lichtenberg_Crater.vrt"),
   Description = [[]]
 }
@@ -114,6 +129,7 @@ local treks_LRO_NAC_RockAbnd_32N292E_2mp = {
 local treks_LRO_NAC_RockAbnd_10N058E_150cmp = {
   Identifier = "LRO_NAC_RockAbnd_10N058E_150cmp",
   Name = [[LRO LROC Rock Abundance, Mare Crisium]],
+  ZIndex = 50,
   FilePath = asset.resource("LRO_LROC_Rock_Abundance/Mare_Crisium.vrt"),
   Description = [[]]
 }
@@ -121,6 +137,7 @@ local treks_LRO_NAC_RockAbnd_10N058E_150cmp = {
 local treks_LRO_NAC_RockAbnd_16S041E_150cmp = {
   Identifier = "LRO_NAC_RockAbnd_16S041E_150cmp",
   Name = [[LRO LROC Rock Abundance, Montes Pyrenaeus]],
+  ZIndex = 50,
   FilePath = asset.resource("LRO_LROC_Rock_Abundance/Montes_Pyrenaeus.vrt"),
   Description = [[]]
 }
@@ -128,6 +145,7 @@ local treks_LRO_NAC_RockAbnd_16S041E_150cmp = {
 local treks_LRO_NAC_RockAbnd_26S265E_200cmp = {
   Identifier = "LRO_NAC_RockAbnd_26S265E_200cmp",
   Name = [[LRO LROC Rock Abundance, Orientale 1]],
+  ZIndex = 50,
   FilePath = asset.resource("LRO_LROC_Rock_Abundance/Orientale_1.vrt"),
   Description = [[]]
 }
@@ -135,6 +153,7 @@ local treks_LRO_NAC_RockAbnd_26S265E_200cmp = {
 local treks_LRO_NAC_RockAbnd_53N354E_150cmp = {
   Identifier = "LRO_NAC_RockAbnd_53N354E_150cmp",
   Name = [[LRO LROC Rock Abundance, Plato Ejecta]],
+  ZIndex = 50,
   FilePath = asset.resource("LRO_LROC_Rock_Abundance/Plato_Ejecta.vrt"),
   Description = [[]]
 }
@@ -142,6 +161,7 @@ local treks_LRO_NAC_RockAbnd_53N354E_150cmp = {
 local treks_LRO_NAC_RockAbnd_60S200E_150cmp = {
   Identifier = "LRO_NAC_RockAbnd_60S200E_150cmp",
   Name = [[LRO LROC Rock Abundance, South Pole-Aitken Basin Interior]],
+  ZIndex = 50,
   FilePath = asset.resource("LRO_LROC_Rock_Abundance/South_Pole-Aitken_Basin_Interior.vrt"),
   Description = [[]]
 }
@@ -149,6 +169,7 @@ local treks_LRO_NAC_RockAbnd_60S200E_150cmp = {
 local treks_LRO_NAC_RockAbnd_02S167E_150cmp = {
   Identifier = "LRO_NAC_RockAbnd_02S167E_150cmp",
   Name = [[LRO LROC Rock Abundance, Stratton (Dewar) High Fe Anomaly]],
+  ZIndex = 50,
   FilePath = asset.resource("LRO_LROC_Rock_Abundance/Stratton_Dewar_High_Fe_Anomaly.vrt"),
   Description = [[]]
 }
@@ -156,6 +177,7 @@ local treks_LRO_NAC_RockAbnd_02S167E_150cmp = {
 local treks_LRO_NAC_RockAbnd_20N010E_2mp = {
   Identifier = "LRO_NAC_RockAbnd_20N010E_2mp",
   Name = [[LRO LROC Rock Abundance, Sulpicius Gallus]],
+  ZIndex = 50,
   FilePath = asset.resource("LRO_LROC_Rock_Abundance/Sulpicius_Gallus.vrt"),
   Description = [[]]
 }
@@ -163,6 +185,7 @@ local treks_LRO_NAC_RockAbnd_20N010E_2mp = {
 local treks_LRO_NAC_RockAbnd_43S349E_150cmp = {
   Identifier = "LRO_NAC_RockAbnd_43S349E_150cmp",
   Name = [[LRO LROC Rock Abundance, Tycho Crater]],
+  ZIndex = 50,
   FilePath = asset.resource("LRO_LROC_Rock_Abundance/Tycho_Crater.vrt"),
   Description = [[]]
 }
diff --git a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Rock_Abundance_Hazard.asset b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Rock_Abundance_Hazard.asset
index e038350169..9b4e740538 100644
--- a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Rock_Abundance_Hazard.asset
+++ b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Rock_Abundance_Hazard.asset
@@ -9,6 +9,7 @@ local globeIdentifier = asset.require("scene/solarsystem//planets/earth/moon/moo
 local treks_LRO_NAC_RockAbndHaz_17S173E_150cmp = {
   Identifier = "LRO_NAC_RockAbndHaz_17S173E_150cmp",
   Name = [[LRO LROC Rock Abundance Hazard, Aitken Crater]],
+  ZIndex = 50,
   FilePath = asset.resource("LRO_LROC_Rock_Abundance_Hazard/Aitken_Crater.vrt"),
   Description = [[]]
 }
@@ -16,6 +17,7 @@ local treks_LRO_NAC_RockAbndHaz_17S173E_150cmp = {
 local treks_LRO_NAC_RockAbndHaz_13S358E_2mp = {
   Identifier = "LRO_NAC_RockAbndHaz_13S358E_2mp",
   Name = [[LRO LROC Rock Abundance Hazard, Alphonsus Crater]],
+  ZIndex = 50,
   FilePath = asset.resource("LRO_LROC_Rock_Abundance_Hazard/Alphonsus_Crater.vrt"),
   Description = [[]]
 }
@@ -23,6 +25,7 @@ local treks_LRO_NAC_RockAbndHaz_13S358E_2mp = {
 local treks_LRO_NAC_RockAbndHaz_73N350E_150cmp = {
   Identifier = "LRO_NAC_RockAbndHaz_73N350E_150cmp",
   Name = [[LRO LROC Rock Abundance Hazard, Anaxagoras Crater]],
+  ZIndex = 50,
   FilePath = asset.resource("LRO_LROC_Rock_Abundance_Hazard/Anaxagoras_Crater.vrt"),
   Description = [[]]
 }
@@ -30,6 +33,7 @@ local treks_LRO_NAC_RockAbndHaz_73N350E_150cmp = {
 local treks_LRO_NAC_RockAbndHaz_26N004E_150cmp = {
   Identifier = "LRO_NAC_RockAbndHaz_26N004E_150cmp",
   Name = [[LRO LROC Rock Abundance Hazard, Apollo 15]],
+  ZIndex = 50,
   FilePath = asset.resource("LRO_LROC_Rock_Abundance_Hazard/Apollo_15.vrt"),
   Description = [[]]
 }
@@ -37,6 +41,7 @@ local treks_LRO_NAC_RockAbndHaz_26N004E_150cmp = {
 local treks_LRO_NAC_RockAbndHaz_09S015E_150cmp = {
   Identifier = "LRO_NAC_RockAbndHaz_09S015E_150cmp",
   Name = [[LRO LROC Rock Abundance Hazard, Apollo 16]],
+  ZIndex = 50,
   FilePath = asset.resource("LRO_LROC_Rock_Abundance_Hazard/Apollo_16.vrt"),
   Description = [[]]
 }
@@ -44,6 +49,7 @@ local treks_LRO_NAC_RockAbndHaz_09S015E_150cmp = {
 local treks_LRO_NAC_RockAbndHaz_37S206E_150cmp = {
   Identifier = "LRO_NAC_RockAbndHaz_37S206E_150cmp",
   Name = [[LRO LROC Rock Abundance Hazard, Apollo Basin]],
+  ZIndex = 50,
   FilePath = asset.resource("LRO_LROC_Rock_Abundance_Hazard/Apollo_Basin.vrt"),
   Description = [[]]
 }
@@ -51,6 +57,7 @@ local treks_LRO_NAC_RockAbndHaz_37S206E_150cmp = {
 local treks_LRO_NAC_RockAbndHaz_25N311E_2mp = {
   Identifier = "LRO_NAC_RockAbndHaz_25N311E_2mp",
   Name = [[LRO LROC Rock Abundance Hazard, Aristarchus 1]],
+  ZIndex = 50,
   FilePath = asset.resource("LRO_LROC_Rock_Abundance_Hazard/Aristarchus_1.vrt"),
   Description = [[]]
 }
@@ -58,6 +65,7 @@ local treks_LRO_NAC_RockAbndHaz_25N311E_2mp = {
 local treks_LRO_NAC_RockAbndHaz_28N307E_150cmp = {
   Identifier = "LRO_NAC_RockAbndHaz_28N307E_150cmp",
   Name = [[LRO LROC Rock Abundance Hazard, Aristarchus 2]],
+  ZIndex = 50,
   FilePath = asset.resource("LRO_LROC_Rock_Abundance_Hazard/Aristarchus_2.vrt"),
   Description = [[]]
 }
@@ -65,6 +73,7 @@ local treks_LRO_NAC_RockAbndHaz_28N307E_150cmp = {
 local treks_LRO_NAC_RockAbndHaz_19S070E_150cmp = {
   Identifier = "LRO_NAC_RockAbndHaz_19S070E_150cmp",
   Name = [[LRO LROC Rock Abundance Hazard, Balmer Basin]],
+  ZIndex = 50,
   FilePath = asset.resource("LRO_LROC_Rock_Abundance_Hazard/Balmer_Basin.vrt"),
   Description = [[]]
 }
@@ -72,6 +81,7 @@ local treks_LRO_NAC_RockAbndHaz_19S070E_150cmp = {
 local treks_LRO_NAC_RockAbndHaz_20S337E_400cmp = {
   Identifier = "LRO_NAC_RockAbndHaz_20S337E_400cmp",
   Name = [[LRO LROC Rock Abundance Hazard, Bullialdus Crater]],
+  ZIndex = 50,
   FilePath = asset.resource("LRO_LROC_Rock_Abundance_Hazard/Bullialdus_Crater.vrt"),
   Description = [[]]
 }
@@ -79,6 +89,7 @@ local treks_LRO_NAC_RockAbndHaz_20S337E_400cmp = {
 local treks_LRO_NAC_RockAbndHaz_36N320E_2mp = {
   Identifier = "LRO_NAC_RockAbndHaz_36N320E_2mp",
   Name = [[LRO LROC Rock Abundance Hazard, Gruithuisen Domes]],
+  ZIndex = 50,
   FilePath = asset.resource("LRO_LROC_Rock_Abundance_Hazard/Gruithuisen_Domes.vrt"),
   Description = [[]]
 }
@@ -86,6 +97,7 @@ local treks_LRO_NAC_RockAbndHaz_36N320E_2mp = {
 local treks_LRO_NAC_RockAbndHaz_00N234E_150cmp = {
   Identifier = "LRO_NAC_RockAbndHaz_00N234E_150cmp",
   Name = [[LRO LROC Rock Abundance Hazard, Hertzsprung]],
+  ZIndex = 50,
   FilePath = asset.resource("LRO_LROC_Rock_Abundance_Hazard/Hertzsprung.vrt"),
   Description = [[]]
 }
@@ -93,6 +105,7 @@ local treks_LRO_NAC_RockAbndHaz_00N234E_150cmp = {
 local treks_LRO_NAC_RockAbndHaz_08N332E_2mp = {
   Identifier = "LRO_NAC_RockAbndHaz_08N332E_2mp",
   Name = [[LRO LROC Rock Abundance Hazard, Hortensius Domes]],
+  ZIndex = 50,
   FilePath = asset.resource("LRO_LROC_Rock_Abundance_Hazard/Hortensius_Domes.vrt"),
   Description = [[]]
 }
@@ -100,6 +113,7 @@ local treks_LRO_NAC_RockAbndHaz_08N332E_2mp = {
 local treks_LRO_NAC_RockAbndHaz_06N120E_200cmp = {
   Identifier = "LRO_NAC_RockAbndHaz_06N120E_200cmp",
   Name = [[LRO LROC Rock Abundance Hazard, King Crater]],
+  ZIndex = 50,
   FilePath = asset.resource("LRO_LROC_Rock_Abundance_Hazard/King_Crater.vrt"),
   Description = [[]]
 }
@@ -107,6 +121,7 @@ local treks_LRO_NAC_RockAbndHaz_06N120E_200cmp = {
 local treks_LRO_NAC_RockAbndHaz_32N292E_2mp = {
   Identifier = "LRO_NAC_RockAbndHaz_32N292E_2mp",
   Name = [[LRO LROC Rock Abundance Hazard, Lichtenberg Crater]],
+  ZIndex = 50,
   FilePath = asset.resource("LRO_LROC_Rock_Abundance_Hazard/Lichtenberg_Crater.vrt"),
   Description = [[]]
 }
@@ -114,6 +129,7 @@ local treks_LRO_NAC_RockAbndHaz_32N292E_2mp = {
 local treks_LRO_NAC_RockAbndHaz_10N058E_150cmp = {
   Identifier = "LRO_NAC_RockAbndHaz_10N058E_150cmp",
   Name = [[LRO LROC Rock Abundance Hazard, Mare Crisium]],
+  ZIndex = 50,
   FilePath = asset.resource("LRO_LROC_Rock_Abundance_Hazard/Mare_Crisium.vrt"),
   Description = [[]]
 }
@@ -121,6 +137,7 @@ local treks_LRO_NAC_RockAbndHaz_10N058E_150cmp = {
 local treks_LRO_NAC_RockAbndHaz_16S041E_150cmp = {
   Identifier = "LRO_NAC_RockAbndHaz_16S041E_150cmp",
   Name = [[LRO LROC Rock Abundance Hazard, Montes Pyrenaeus]],
+  ZIndex = 50,
   FilePath = asset.resource("LRO_LROC_Rock_Abundance_Hazard/Montes_Pyrenaeus.vrt"),
   Description = [[]]
 }
@@ -128,6 +145,7 @@ local treks_LRO_NAC_RockAbndHaz_16S041E_150cmp = {
 local treks_LRO_NAC_RockAbndHaz_26S265E_200cmp = {
   Identifier = "LRO_NAC_RockAbndHaz_26S265E_200cmp",
   Name = [[LRO LROC Rock Abundance Hazard, Orientale 1]],
+  ZIndex = 50,
   FilePath = asset.resource("LRO_LROC_Rock_Abundance_Hazard/Orientale_1.vrt"),
   Description = [[]]
 }
@@ -135,6 +153,7 @@ local treks_LRO_NAC_RockAbndHaz_26S265E_200cmp = {
 local treks_LRO_NAC_RockAbndHaz_53N354E_150cmp = {
   Identifier = "LRO_NAC_RockAbndHaz_53N354E_150cmp",
   Name = [[LRO LROC Rock Abundance Hazard, Plato Ejecta]],
+  ZIndex = 50,
   FilePath = asset.resource("LRO_LROC_Rock_Abundance_Hazard/Plato_Ejecta.vrt"),
   Description = [[]]
 }
@@ -142,6 +161,7 @@ local treks_LRO_NAC_RockAbndHaz_53N354E_150cmp = {
 local treks_LRO_NAC_RockAbndHaz_60S200E_150cmp = {
   Identifier = "LRO_NAC_RockAbndHaz_60S200E_150cmp",
   Name = [[LRO LROC Rock Abundance Hazard, South Pole-Aitken Basin Interior]],
+  ZIndex = 50,
   FilePath = asset.resource("LRO_LROC_Rock_Abundance_Hazard/South_Pole-Aitken_Basin_Interior.vrt"),
   Description = [[]]
 }
@@ -149,6 +169,7 @@ local treks_LRO_NAC_RockAbndHaz_60S200E_150cmp = {
 local treks_LRO_NAC_RockAbndHaz_02S167E_150cmp = {
   Identifier = "LRO_NAC_RockAbndHaz_02S167E_150cmp",
   Name = [[LRO LROC Rock Abundance Hazard, Stratton (Dewar) High Fe Anomaly]],
+  ZIndex = 50,
   FilePath = asset.resource("LRO_LROC_Rock_Abundance_Hazard/Stratton_Dewar_High_Fe_Anomaly.vrt"),
   Description = [[]]
 }
@@ -156,6 +177,7 @@ local treks_LRO_NAC_RockAbndHaz_02S167E_150cmp = {
 local treks_LRO_NAC_RockAbndHaz_20N010E_2mp = {
   Identifier = "LRO_NAC_RockAbndHaz_20N010E_2mp",
   Name = [[LRO LROC Rock Abundance Hazard, Sulpicius Gallus]],
+  ZIndex = 50,
   FilePath = asset.resource("LRO_LROC_Rock_Abundance_Hazard/Sulpicius_Gallus.vrt"),
   Description = [[]]
 }
@@ -163,6 +185,7 @@ local treks_LRO_NAC_RockAbndHaz_20N010E_2mp = {
 local treks_LRO_NAC_RockAbndHaz_43S349E_150cmp = {
   Identifier = "LRO_NAC_RockAbndHaz_43S349E_150cmp",
   Name = [[LRO LROC Rock Abundance Hazard, Tycho Crater]],
+  ZIndex = 50,
   FilePath = asset.resource("LRO_LROC_Rock_Abundance_Hazard/Tycho_Crater.vrt"),
   Description = [[]]
 }
diff --git a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Rock_Density.asset b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Rock_Density.asset
index 75a5f16111..12d8d7f214 100644
--- a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Rock_Density.asset
+++ b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Rock_Density.asset
@@ -9,6 +9,7 @@ local globeIdentifier = asset.require("scene/solarsystem//planets/earth/moon/moo
 local treks_LRO_NAC_RockDen_17S173E_150cmp = {
   Identifier = "LRO_NAC_RockDen_17S173E_150cmp",
   Name = [[LRO LROC Rock Density, Aitken Crater]],
+  ZIndex = 50,
   FilePath = asset.resource("LRO_LROC_Rock_Density/Aitken_Crater.vrt"),
   Description = [[]]
 }
@@ -16,6 +17,7 @@ local treks_LRO_NAC_RockDen_17S173E_150cmp = {
 local treks_LRO_NAC_RockDen_13S358E_2mp = {
   Identifier = "LRO_NAC_RockDen_13S358E_2mp",
   Name = [[LRO LROC Rock Density, Alphonsus Crater]],
+  ZIndex = 50,
   FilePath = asset.resource("LRO_LROC_Rock_Density/Alphonsus_Crater.vrt"),
   Description = [[]]
 }
@@ -23,6 +25,7 @@ local treks_LRO_NAC_RockDen_13S358E_2mp = {
 local treks_LRO_NAC_RockDen_73N350E_150cmp = {
   Identifier = "LRO_NAC_RockDen_73N350E_150cmp",
   Name = [[LRO LROC Rock Density, Anaxagoras Crater]],
+  ZIndex = 50,
   FilePath = asset.resource("LRO_LROC_Rock_Density/Anaxagoras_Crater.vrt"),
   Description = [[]]
 }
@@ -30,6 +33,7 @@ local treks_LRO_NAC_RockDen_73N350E_150cmp = {
 local treks_LRO_NAC_RockDen_26N004E_150cmp = {
   Identifier = "LRO_NAC_RockDen_26N004E_150cmp",
   Name = [[LRO LROC Rock Density, Apollo 15]],
+  ZIndex = 50,
   FilePath = asset.resource("LRO_LROC_Rock_Density/Apollo_15.vrt"),
   Description = [[]]
 }
@@ -37,6 +41,7 @@ local treks_LRO_NAC_RockDen_26N004E_150cmp = {
 local treks_LRO_NAC_RockDen_09S015E_150cmp = {
   Identifier = "LRO_NAC_RockDen_09S015E_150cmp",
   Name = [[LRO LROC Rock Density, Apollo 16]],
+  ZIndex = 50,
   FilePath = asset.resource("LRO_LROC_Rock_Density/Apollo_16.vrt"),
   Description = [[]]
 }
@@ -44,6 +49,7 @@ local treks_LRO_NAC_RockDen_09S015E_150cmp = {
 local treks_LRO_NAC_RockDen_37S206E_150cmp = {
   Identifier = "LRO_NAC_RockDen_37S206E_150cmp",
   Name = [[LRO LROC Rock Density, Apollo Basin]],
+  ZIndex = 50,
   FilePath = asset.resource("LRO_LROC_Rock_Density/Apollo_Basin.vrt"),
   Description = [[]]
 }
@@ -51,6 +57,7 @@ local treks_LRO_NAC_RockDen_37S206E_150cmp = {
 local treks_LRO_NAC_RockDen_25N311E_2mp = {
   Identifier = "LRO_NAC_RockDen_25N311E_2mp",
   Name = [[LRO LROC Rock Density, Aristarchus 1]],
+  ZIndex = 50,
   FilePath = asset.resource("LRO_LROC_Rock_Density/Aristarchus_1.vrt"),
   Description = [[]]
 }
@@ -58,6 +65,7 @@ local treks_LRO_NAC_RockDen_25N311E_2mp = {
 local treks_LRO_NAC_RockDen_28N307E_150cmp = {
   Identifier = "LRO_NAC_RockDen_28N307E_150cmp",
   Name = [[LRO LROC Rock Density, Aristarchus 2]],
+  ZIndex = 50,
   FilePath = asset.resource("LRO_LROC_Rock_Density/Aristarchus_2.vrt"),
   Description = [[]]
 }
@@ -65,6 +73,7 @@ local treks_LRO_NAC_RockDen_28N307E_150cmp = {
 local treks_LRO_NAC_RockDen_19S070E_150cmp = {
   Identifier = "LRO_NAC_RockDen_19S070E_150cmp",
   Name = [[LRO LROC Rock Density, Balmer Basin]],
+  ZIndex = 50,
   FilePath = asset.resource("LRO_LROC_Rock_Density/Balmer_Basin.vrt"),
   Description = [[]]
 }
@@ -72,6 +81,7 @@ local treks_LRO_NAC_RockDen_19S070E_150cmp = {
 local treks_LRO_NAC_RockDen_20S337E_400cmp = {
   Identifier = "LRO_NAC_RockDen_20S337E_400cmp",
   Name = [[LRO LROC Rock Density, Bullialdus Crater]],
+  ZIndex = 50,
   FilePath = asset.resource("LRO_LROC_Rock_Density/Bullialdus_Crater.vrt"),
   Description = [[]]
 }
@@ -79,6 +89,7 @@ local treks_LRO_NAC_RockDen_20S337E_400cmp = {
 local treks_LRO_NAC_RockDen_36N320E_2mp = {
   Identifier = "LRO_NAC_RockDen_36N320E_2mp",
   Name = [[LRO LROC Rock Density, Gruithuisen Domes]],
+  ZIndex = 50,
   FilePath = asset.resource("LRO_LROC_Rock_Density/Gruithuisen_Domes.vrt"),
   Description = [[]]
 }
@@ -86,6 +97,7 @@ local treks_LRO_NAC_RockDen_36N320E_2mp = {
 local treks_LRO_NAC_RockDenHaz_17S173E_150cmp = {
   Identifier = "LRO_NAC_RockDenHaz_17S173E_150cmp",
   Name = [[LRO LROC Rock Density, Hazard Aitken Crater]],
+  ZIndex = 50,
   FilePath = asset.resource("LRO_LROC_Rock_Density/Hazard_Aitken_Crater.vrt"),
   Description = [[]]
 }
@@ -93,6 +105,7 @@ local treks_LRO_NAC_RockDenHaz_17S173E_150cmp = {
 local treks_LRO_NAC_RockDen_00N234E_150cmp = {
   Identifier = "LRO_NAC_RockDen_00N234E_150cmp",
   Name = [[LRO LROC Rock Density, Hertzsprung]],
+  ZIndex = 50,
   FilePath = asset.resource("LRO_LROC_Rock_Density/Hertzsprung.vrt"),
   Description = [[]]
 }
@@ -100,6 +113,7 @@ local treks_LRO_NAC_RockDen_00N234E_150cmp = {
 local treks_LRO_NAC_RockDen_08N332E_2mp = {
   Identifier = "LRO_NAC_RockDen_08N332E_2mp",
   Name = [[LRO LROC Rock Density, Hortensius Domes]],
+  ZIndex = 50,
   FilePath = asset.resource("LRO_LROC_Rock_Density/Hortensius_Domes.vrt"),
   Description = [[]]
 }
@@ -107,6 +121,7 @@ local treks_LRO_NAC_RockDen_08N332E_2mp = {
 local treks_LRO_NAC_RockDen_06N120E_200cmp = {
   Identifier = "LRO_NAC_RockDen_06N120E_200cmp",
   Name = [[LRO LROC Rock Density, King Crater]],
+  ZIndex = 50,
   FilePath = asset.resource("LRO_LROC_Rock_Density/King_Crater.vrt"),
   Description = [[]]
 }
@@ -114,6 +129,7 @@ local treks_LRO_NAC_RockDen_06N120E_200cmp = {
 local treks_LRO_NAC_RockDen_32N292E_2mp = {
   Identifier = "LRO_NAC_RockDen_32N292E_2mp",
   Name = [[LRO LROC Rock Density, Lichtenberg Crater]],
+  ZIndex = 50,
   FilePath = asset.resource("LRO_LROC_Rock_Density/Lichtenberg_Crater.vrt"),
   Description = [[]]
 }
@@ -121,6 +137,7 @@ local treks_LRO_NAC_RockDen_32N292E_2mp = {
 local treks_LRO_NAC_RockDen_10N058E_150cmp = {
   Identifier = "LRO_NAC_RockDen_10N058E_150cmp",
   Name = [[LRO LROC Rock Density, Mare Crisium]],
+  ZIndex = 50,
   FilePath = asset.resource("LRO_LROC_Rock_Density/Mare_Crisium.vrt"),
   Description = [[]]
 }
@@ -128,6 +145,7 @@ local treks_LRO_NAC_RockDen_10N058E_150cmp = {
 local treks_LRO_NAC_RockDen_16S041E_150cmp = {
   Identifier = "LRO_NAC_RockDen_16S041E_150cmp",
   Name = [[LRO LROC Rock Density, Montes Pyrenaeus]],
+  ZIndex = 50,
   FilePath = asset.resource("LRO_LROC_Rock_Density/Montes_Pyrenaeus.vrt"),
   Description = [[]]
 }
@@ -135,6 +153,7 @@ local treks_LRO_NAC_RockDen_16S041E_150cmp = {
 local treks_LRO_NAC_RockDen_26S265E_200cmp = {
   Identifier = "LRO_NAC_RockDen_26S265E_200cmp",
   Name = [[LRO LROC Rock Density, Orientale 1]],
+  ZIndex = 50,
   FilePath = asset.resource("LRO_LROC_Rock_Density/Orientale_1.vrt"),
   Description = [[]]
 }
@@ -142,6 +161,7 @@ local treks_LRO_NAC_RockDen_26S265E_200cmp = {
 local treks_LRO_NAC_RockDen_53N354E_150cmp = {
   Identifier = "LRO_NAC_RockDen_53N354E_150cmp",
   Name = [[LRO LROC Rock Density, Plato Ejecta]],
+  ZIndex = 50,
   FilePath = asset.resource("LRO_LROC_Rock_Density/Plato_Ejecta.vrt"),
   Description = [[]]
 }
@@ -149,6 +169,7 @@ local treks_LRO_NAC_RockDen_53N354E_150cmp = {
 local treks_LRO_NAC_RockDen_60S200E_150cmp = {
   Identifier = "LRO_NAC_RockDen_60S200E_150cmp",
   Name = [[LRO LROC Rock Density, South Pole-Aitken Basin Interior]],
+  ZIndex = 50,
   FilePath = asset.resource("LRO_LROC_Rock_Density/South_Pole-Aitken_Basin_Interior.vrt"),
   Description = [[]]
 }
@@ -156,6 +177,7 @@ local treks_LRO_NAC_RockDen_60S200E_150cmp = {
 local treks_LRO_NAC_RockDen_02S167E_150cmp = {
   Identifier = "LRO_NAC_RockDen_02S167E_150cmp",
   Name = [[LRO LROC Rock Density, Stratton (Dewar) High Fe Anomaly]],
+  ZIndex = 50,
   FilePath = asset.resource("LRO_LROC_Rock_Density/Stratton_Dewar_High_Fe_Anomaly.vrt"),
   Description = [[]]
 }
@@ -163,6 +185,7 @@ local treks_LRO_NAC_RockDen_02S167E_150cmp = {
 local treks_LRO_NAC_RockDen_20N010E_2mp = {
   Identifier = "LRO_NAC_RockDen_20N010E_2mp",
   Name = [[LRO LROC Rock Density, Sulpicius Gallus]],
+  ZIndex = 50,
   FilePath = asset.resource("LRO_LROC_Rock_Density/Sulpicius_Gallus.vrt"),
   Description = [[]]
 }
@@ -170,6 +193,7 @@ local treks_LRO_NAC_RockDen_20N010E_2mp = {
 local treks_LRO_NAC_RockDen_43S349E_150cmp = {
   Identifier = "LRO_NAC_RockDen_43S349E_150cmp",
   Name = [[LRO LROC Rock Density, Tycho Crater]],
+  ZIndex = 50,
   FilePath = asset.resource("LRO_LROC_Rock_Density/Tycho_Crater.vrt"),
   Description = [[]]
 }
diff --git a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Rock_Density_Hazard.asset b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Rock_Density_Hazard.asset
index 9a1c107cc8..f2f49ada9d 100644
--- a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Rock_Density_Hazard.asset
+++ b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Rock_Density_Hazard.asset
@@ -9,6 +9,7 @@ local globeIdentifier = asset.require("scene/solarsystem//planets/earth/moon/moo
 local treks_LRO_NAC_RockDenHaz_13S358E_2mp = {
   Identifier = "LRO_NAC_RockDenHaz_13S358E_2mp",
   Name = [[LRO LROC Rock Density Hazard, Alphonsus Crater]],
+  ZIndex = 50,
   FilePath = asset.resource("LRO_LROC_Rock_Density_Hazard/Alphonsus_Crater.vrt"),
   Description = [[]]
 }
@@ -16,6 +17,7 @@ local treks_LRO_NAC_RockDenHaz_13S358E_2mp = {
 local treks_LRO_NAC_RockDenHaz_73N350E_150cmp = {
   Identifier = "LRO_NAC_RockDenHaz_73N350E_150cmp",
   Name = [[LRO LROC Rock Density Hazard, Anaxagoras Crater]],
+  ZIndex = 50,
   FilePath = asset.resource("LRO_LROC_Rock_Density_Hazard/Anaxagoras_Crater.vrt"),
   Description = [[]]
 }
@@ -23,6 +25,7 @@ local treks_LRO_NAC_RockDenHaz_73N350E_150cmp = {
 local treks_LRO_NAC_RockDenHaz_26N004E_150cmp = {
   Identifier = "LRO_NAC_RockDenHaz_26N004E_150cmp",
   Name = [[LRO LROC Rock Density Hazard, Apollo 15]],
+  ZIndex = 50,
   FilePath = asset.resource("LRO_LROC_Rock_Density_Hazard/Apollo_15.vrt"),
   Description = [[]]
 }
@@ -30,6 +33,7 @@ local treks_LRO_NAC_RockDenHaz_26N004E_150cmp = {
 local treks_LRO_NAC_RockDenHaz_09S015E_150cmp = {
   Identifier = "LRO_NAC_RockDenHaz_09S015E_150cmp",
   Name = [[LRO LROC Rock Density Hazard, Apollo 16]],
+  ZIndex = 50,
   FilePath = asset.resource("LRO_LROC_Rock_Density_Hazard/Apollo_16.vrt"),
   Description = [[]]
 }
@@ -37,6 +41,7 @@ local treks_LRO_NAC_RockDenHaz_09S015E_150cmp = {
 local treks_LRO_NAC_RockDenHaz_37S206E_150cmp = {
   Identifier = "LRO_NAC_RockDenHaz_37S206E_150cmp",
   Name = [[LRO LROC Rock Density Hazard, Apollo Basin]],
+  ZIndex = 50,
   FilePath = asset.resource("LRO_LROC_Rock_Density_Hazard/Apollo_Basin.vrt"),
   Description = [[]]
 }
@@ -44,6 +49,7 @@ local treks_LRO_NAC_RockDenHaz_37S206E_150cmp = {
 local treks_LRO_NAC_RockDenHaz_25N311E_2mp = {
   Identifier = "LRO_NAC_RockDenHaz_25N311E_2mp",
   Name = [[LRO LROC Rock Density Hazard, Aristarchus 1]],
+  ZIndex = 50,
   FilePath = asset.resource("LRO_LROC_Rock_Density_Hazard/Aristarchus_1.vrt"),
   Description = [[]]
 }
@@ -51,6 +57,7 @@ local treks_LRO_NAC_RockDenHaz_25N311E_2mp = {
 local treks_LRO_NAC_RockDenHaz_28N307E_150cmp = {
   Identifier = "LRO_NAC_RockDenHaz_28N307E_150cmp",
   Name = [[LRO LROC Rock Density Hazard, Aristarchus 2]],
+  ZIndex = 50,
   FilePath = asset.resource("LRO_LROC_Rock_Density_Hazard/Aristarchus_2.vrt"),
   Description = [[]]
 }
@@ -58,6 +65,7 @@ local treks_LRO_NAC_RockDenHaz_28N307E_150cmp = {
 local treks_LRO_NAC_RockDenHaz_19S070E_150cmp = {
   Identifier = "LRO_NAC_RockDenHaz_19S070E_150cmp",
   Name = [[LRO LROC Rock Density Hazard, Balmer Basin]],
+  ZIndex = 50,
   FilePath = asset.resource("LRO_LROC_Rock_Density_Hazard/Balmer_Basin.vrt"),
   Description = [[]]
 }
@@ -65,6 +73,7 @@ local treks_LRO_NAC_RockDenHaz_19S070E_150cmp = {
 local treks_LRO_NAC_RockDenHaz_20S337E_400cmp = {
   Identifier = "LRO_NAC_RockDenHaz_20S337E_400cmp",
   Name = [[LRO LROC Rock Density Hazard, Bullialdus Crater]],
+  ZIndex = 50,
   FilePath = asset.resource("LRO_LROC_Rock_Density_Hazard/Bullialdus_Crater.vrt"),
   Description = [[]]
 }
@@ -72,6 +81,7 @@ local treks_LRO_NAC_RockDenHaz_20S337E_400cmp = {
 local treks_LRO_NAC_RockDenHaz_36N320E_2mp = {
   Identifier = "LRO_NAC_RockDenHaz_36N320E_2mp",
   Name = [[LRO LROC Rock Density Hazard, Gruithuisen Domes]],
+  ZIndex = 50,
   FilePath = asset.resource("LRO_LROC_Rock_Density_Hazard/Gruithuisen_Domes.vrt"),
   Description = [[]]
 }
@@ -79,6 +89,7 @@ local treks_LRO_NAC_RockDenHaz_36N320E_2mp = {
 local treks_LRO_NAC_RockDenHaz_00N234E_150cmp = {
   Identifier = "LRO_NAC_RockDenHaz_00N234E_150cmp",
   Name = [[LRO LROC Rock Density Hazard, Hertzsprung]],
+  ZIndex = 50,
   FilePath = asset.resource("LRO_LROC_Rock_Density_Hazard/Hertzsprung.vrt"),
   Description = [[]]
 }
@@ -86,6 +97,7 @@ local treks_LRO_NAC_RockDenHaz_00N234E_150cmp = {
 local treks_LRO_NAC_RockDenHaz_08N332E_2mp = {
   Identifier = "LRO_NAC_RockDenHaz_08N332E_2mp",
   Name = [[LRO LROC Rock Density Hazard, Hortensius Domes]],
+  ZIndex = 50,
   FilePath = asset.resource("LRO_LROC_Rock_Density_Hazard/Hortensius_Domes.vrt"),
   Description = [[]]
 }
@@ -93,6 +105,7 @@ local treks_LRO_NAC_RockDenHaz_08N332E_2mp = {
 local treks_LRO_NAC_RockDenHaz_06N120E_200cmp = {
   Identifier = "LRO_NAC_RockDenHaz_06N120E_200cmp",
   Name = [[LRO LROC Rock Density Hazard, King Crater]],
+  ZIndex = 50,
   FilePath = asset.resource("LRO_LROC_Rock_Density_Hazard/King_Crater.vrt"),
   Description = [[]]
 }
@@ -100,6 +113,7 @@ local treks_LRO_NAC_RockDenHaz_06N120E_200cmp = {
 local treks_LRO_NAC_RockDenHaz_32N292E_2mp = {
   Identifier = "LRO_NAC_RockDenHaz_32N292E_2mp",
   Name = [[LRO LROC Rock Density Hazard, Lichtenberg Crater]],
+  ZIndex = 50,
   FilePath = asset.resource("LRO_LROC_Rock_Density_Hazard/Lichtenberg_Crater.vrt"),
   Description = [[]]
 }
@@ -107,6 +121,7 @@ local treks_LRO_NAC_RockDenHaz_32N292E_2mp = {
 local treks_LRO_NAC_RockDenHaz_10N058E_150cmp = {
   Identifier = "LRO_NAC_RockDenHaz_10N058E_150cmp",
   Name = [[LRO LROC Rock Density Hazard, Mare Crisium]],
+  ZIndex = 50,
   FilePath = asset.resource("LRO_LROC_Rock_Density_Hazard/Mare_Crisium.vrt"),
   Description = [[]]
 }
@@ -114,6 +129,7 @@ local treks_LRO_NAC_RockDenHaz_10N058E_150cmp = {
 local treks_LRO_NAC_RockDenHaz_16S041E_150cmp = {
   Identifier = "LRO_NAC_RockDenHaz_16S041E_150cmp",
   Name = [[LRO LROC Rock Density Hazard, Montes Pyrenaeus]],
+  ZIndex = 50,
   FilePath = asset.resource("LRO_LROC_Rock_Density_Hazard/Montes_Pyrenaeus.vrt"),
   Description = [[]]
 }
@@ -121,6 +137,7 @@ local treks_LRO_NAC_RockDenHaz_16S041E_150cmp = {
 local treks_LRO_NAC_RockDenHaz_26S265E_200cmp = {
   Identifier = "LRO_NAC_RockDenHaz_26S265E_200cmp",
   Name = [[LRO LROC Rock Density Hazard, Orientale 1]],
+  ZIndex = 50,
   FilePath = asset.resource("LRO_LROC_Rock_Density_Hazard/Orientale_1.vrt"),
   Description = [[]]
 }
@@ -128,6 +145,7 @@ local treks_LRO_NAC_RockDenHaz_26S265E_200cmp = {
 local treks_LRO_NAC_RockDenHaz_53N354E_150cmp = {
   Identifier = "LRO_NAC_RockDenHaz_53N354E_150cmp",
   Name = [[LRO LROC Rock Density Hazard, Plato Ejecta]],
+  ZIndex = 50,
   FilePath = asset.resource("LRO_LROC_Rock_Density_Hazard/Plato_Ejecta.vrt"),
   Description = [[]]
 }
@@ -135,6 +153,7 @@ local treks_LRO_NAC_RockDenHaz_53N354E_150cmp = {
 local treks_LRO_NAC_RockDenHaz_60S200E_150cmp = {
   Identifier = "LRO_NAC_RockDenHaz_60S200E_150cmp",
   Name = [[LRO LROC Rock Density Hazard, South Pole-Aitken Basin Interior]],
+  ZIndex = 50,
   FilePath = asset.resource("LRO_LROC_Rock_Density_Hazard/South_Pole-Aitken_Basin_Interior.vrt"),
   Description = [[]]
 }
@@ -142,6 +161,7 @@ local treks_LRO_NAC_RockDenHaz_60S200E_150cmp = {
 local treks_LRO_NAC_RockDenHaz_02S167E_150cmp = {
   Identifier = "LRO_NAC_RockDenHaz_02S167E_150cmp",
   Name = [[LRO LROC Rock Density Hazard, Stratton (Dewar) High Fe Anomaly]],
+  ZIndex = 50,
   FilePath = asset.resource("LRO_LROC_Rock_Density_Hazard/Stratton_Dewar_High_Fe_Anomaly.vrt"),
   Description = [[]]
 }
@@ -149,6 +169,7 @@ local treks_LRO_NAC_RockDenHaz_02S167E_150cmp = {
 local treks_LRO_NAC_RockDenHaz_20N010E_2mp = {
   Identifier = "LRO_NAC_RockDenHaz_20N010E_2mp",
   Name = [[LRO LROC Rock Density Hazard, Sulpicius Gallus]],
+  ZIndex = 50,
   FilePath = asset.resource("LRO_LROC_Rock_Density_Hazard/Sulpicius_Gallus.vrt"),
   Description = [[]]
 }
@@ -156,6 +177,7 @@ local treks_LRO_NAC_RockDenHaz_20N010E_2mp = {
 local treks_LRO_NAC_RockDenHaz_43S349E_150cmp = {
   Identifier = "LRO_NAC_RockDenHaz_43S349E_150cmp",
   Name = [[LRO LROC Rock Density Hazard, Tycho Crater]],
+  ZIndex = 50,
   FilePath = asset.resource("LRO_LROC_Rock_Density_Hazard/Tycho_Crater.vrt"),
   Description = [[]]
 }
diff --git a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_Laser_Altimeter.asset b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_Laser_Altimeter.asset
index dc5205175f..b0102c873b 100644
--- a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_Laser_Altimeter.asset
+++ b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_Laser_Altimeter.asset
@@ -9,6 +9,7 @@ local globeIdentifier = asset.require("scene/solarsystem//planets/earth/moon/moo
 local treks_ldam_10 = {
   Identifier = "ldam_10",
   Name = [[LRO Laser Altimeter, Albedo Global]],
+  ZIndex = 50,
   FilePath = asset.resource("LRO_Laser_Altimeter/Albedo_Global.vrt"),
   Description = [[The Lunar Orbiter Laser Altimeter (LOLA) experiment on Lunar Reconnaissance Orbiter (LRO) is a laser altimeter that also measures the strength of the return pulse from the lunar surface. These data have been used to estimate the reflectance (albedo) of the lunar surface, including regions lacking direct solar illumination. A new calibration of these data was used to generate a 2016 albedo map that features lower uncertainties overall and more consistent results in the polar regions than the previous 2014 version. (Improved calibration of reflectance data from the LRO Lunar Orbiter Laser Altimeter (LOLA) and implications for space weathering; M. Lemelin, P.G. Lucey, G.A. Neumann, E.M. Mazarico, M.K. Barker, A. Kakazu, D. Trang, D.E. Smith, M.T. Zuber; Icarus, Volume 273, 15 July 2016, Pages 315-328)]]
 }
diff --git a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_Mini-RF_Circular_Polarization_Ratio.asset b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_Mini-RF_Circular_Polarization_Ratio.asset
index 4f2d601e87..1202ad8953 100644
--- a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_Mini-RF_Circular_Polarization_Ratio.asset
+++ b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_Mini-RF_Circular_Polarization_Ratio.asset
@@ -9,6 +9,7 @@ local globeIdentifier = asset.require("scene/solarsystem//planets/earth/moon/moo
 local treks_LRO_MiniRF_CPR_Gray_Global_128ppd = {
   Identifier = "LRO_MiniRF_CPR_Gray_Global_128ppd",
   Name = [[LRO Mini-RF Circular Polarization Ratio, Grayscale]],
+  ZIndex = 50,
   FilePath = asset.resource("LRO_Mini-RF_Circular_Polarization_Ratio/Grayscale.vrt"),
   Description = [[]]
 }
diff --git a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_NAC_ColorHillshade.asset b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_NAC_ColorHillshade.asset
index fe834d704b..ee7033a106 100644
--- a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_NAC_ColorHillshade.asset
+++ b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_NAC_ColorHillshade.asset
@@ -9,6 +9,7 @@ local globeIdentifier = asset.require("scene/solarsystem//planets/earth/moon/moo
 local treks_20191118demmoseqccolorhillshade = {
   Identifier = "20191118demmoseqccolorhillshade",
   Name = [[LRO NAC ColorHillshade, Lacus Mortis]],
+  ZIndex = 50,
   FilePath = asset.resource("LRO_NAC_ColorHillshade/Lacus_Mortis.vrt"),
   Description = [[TBD]]
 }
diff --git a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_NAC_Mosaic.asset b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_NAC_Mosaic.asset
index fd87dc86c8..159c08d330 100644
--- a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_NAC_Mosaic.asset
+++ b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_NAC_Mosaic.asset
@@ -9,6 +9,7 @@ local globeIdentifier = asset.require("scene/solarsystem//planets/earth/moon/moo
 local treks_20200415_lacusmortis_orthomos_filled_8bit_lzw = {
   Identifier = "20200415_lacusmortis_orthomos_filled_8bit_lzw",
   Name = [[LRO NAC Mosaic, Lacus Mortis, Extended Version]],
+  ZIndex = 50,
   FilePath = asset.resource("LRO_NAC_Mosaic/Lacus_Mortis.vrt"),
   Description = [[This is an orthoimage mosaic produced by combining LROC NAC images, for the southwestern area of Lacus Mortis, including Rimae Bürg and the Lacus Mortis Pit. The images are projected onto a DEM mosaic produced by stereo reconstructions in which each of the images is paired with another LROC NAC.]]
 }
diff --git a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_NAC_Mosaic_0.5mpp.asset b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_NAC_Mosaic_0.5mpp.asset
index 29881f42cb..ed612d9a28 100644
--- a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_NAC_Mosaic_0.5mpp.asset
+++ b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_NAC_Mosaic_0.5mpp.asset
@@ -9,6 +9,7 @@ local globeIdentifier = asset.require("scene/solarsystem//planets/earth/moon/moo
 local treks_LRO_NAC_Mosaic_50cmpp_VonKarman_v2 = {
   Identifier = "LRO_NAC_Mosaic_50cmpp_VonKarman_v2",
   Name = [[LRO NAC Mosaic 0.5mpp, Von Karman]],
+  ZIndex = 50,
   FilePath = asset.resource("LRO_NAC_Mosaic_0.5mpp/Von_Karman.vrt"),
   Description = [[This is an orthorectified NAC mosaic of the Von Karman Crater region for the south pole of the Moon. This mosaic includes a total of 370 orthorectified NAC images: 252 sampled at 0.5 m/px and 118 sampled at 1 m/px. NAC orthoimages have been constructed from EDRs downloaded from the Planetary Data System (PDS) and subsequent USGS-ISIS processing. This mosaic has been coaligned to Chang'e-2 20 m/px DEM which has been coaligned to the USGS 59 m/px LOLA-SELENE DEM using ENVI (v5.6.2) patented auto-coreg. Most of the area used stereo-photogrammetrically processing of LROC-NAC stereo-pairs with the UCL CASPGO 3D mapping system, CASP-GO is described in Tao, Y., Muller, J.-P. et al. (2018) Massive Stereo-based DTM Production for Mars on Cloud Computers. Planetary Space Science 154, 30-58 (2018). doi: 10.1016/j.pss.2018.02.012 and CASP-GO is now integrated into ASP (https://stereopipeline.readthedocs.io/en/latest/experimental.html?highlight=casp-go#the-casp-go-stereo-processing-system) as part of the NASA PDART program. Individual NAC orthoimages mosaicked together using ArcGIS Pro (v2.9.2). A color balancing algorithm has been applied to roughly correct for color differences at the seams of NAC images. This data has been made available by and should be credited to: Yu Tao and Jan-Peter Muller, Imaging Group, Mullard Space Science Laboratory, University College London.]]
 }
diff --git a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_NAC_Mosaic_1mpp.asset b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_NAC_Mosaic_1mpp.asset
index 6ae7ed873e..98aa0519a9 100644
--- a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_NAC_Mosaic_1mpp.asset
+++ b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_NAC_Mosaic_1mpp.asset
@@ -9,6 +9,7 @@ local globeIdentifier = asset.require("scene/solarsystem//planets/earth/moon/moo
 local treks_LRO_NAC_Mosaic_1mpp = {
   Identifier = "LRO_NAC_Mosaic_1mpp",
   Name = [[LRO NAC Mosaic 1mpp, Von Karman]],
+  ZIndex = 50,
   FilePath = asset.resource("LRO_NAC_Mosaic_1mpp/Von_Karman.vrt"),
   Description = [[This is an orthorectified NAC mosaic of the Von Karman Crater region for the south pole of the Moon. This mosaic includes 118 individual orthorectified NAC images sampled at 1 m/px. NAC orthoimages have been constructed from EDRs downloaded from the Planetary Data System (PDS) and subsequent USGS-ISIS processing. This mosaic has been coaligned to Chang&rsquo;e 2 20 m/px DEM which has been coaligned to the USGS 59 m/px LOLA-SELENE DEM using ENVI (v5.6.2) patented auto-coreg. Individual NAC orthoimages have been mosaicked together using ArcGIS Pro (v2.9.0). A color balancing algorithm has been applied to roughly correct for color differences at the seams of NAC images. This data has been made available by and should be credited to: Yu Tao and Jan-Peter Muller, Imaging Group, Mullard Space Science Laboratory, University College London.]]
 }
diff --git a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_NAC_PSR_Mosaic_20mpp.asset b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_NAC_PSR_Mosaic_20mpp.asset
index fa1a1071ae..09b0aee428 100644
--- a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_NAC_PSR_Mosaic_20mpp.asset
+++ b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_NAC_PSR_Mosaic_20mpp.asset
@@ -9,6 +9,7 @@ local globeIdentifier = asset.require("scene/solarsystem//planets/earth/moon/moo
 local treks_NAC_POLE_PSR_NORTH_STRETCH_EQ = {
   Identifier = "NAC_POLE_PSR_NORTH_STRETCH_EQ",
   Name = [[LRO NAC PSR Mosaic 20mpp, N Pole]],
+  ZIndex = 50,
   FilePath = asset.resource("LRO_NAC_PSR_Mosaic_20mpp/N_Pole.vrt"),
   Description = [[This is an uncontrolled mosaic generated from images taken by the Narrow Angle Camera (NAC) onboard the Lunar Reconnaissance Orbiter (LRO) for the North Pole region of the Moon. The NAC mosaics have been trimmed to the Permanently Shadowed Region (PSR) shapefile, providing visible NAC image coverage of the PSRs only. Acquisition of NAC PSR observations were optimized over several campaigns to maximize signal-to-noise ratio (SNR), resulting in a comprehensive dataset that is systematically reviewed and analyzed. Observations are acquired at a variety of pixel scales (2 to 20 m/px). The final PSR mosaics are assembled from re-sampled images to 20 m/px, and ordering of images is based on image quality and areal coverage of individual PSRs. A total of 550 NAC images were used to create a North Pole PSR mosaic at 20 m/px, 90&deg; to 80&deg; latitude, and -180&deg; to 180&deg; longitude. This mosaic has been merged with the existing LROC NAC North Pole RDR product to replace over-saturated illuminated polar areas.]]
 }
@@ -16,6 +17,7 @@ local treks_NAC_POLE_PSR_NORTH_STRETCH_EQ = {
 local treks_NAC_POLE_PSR_SOUTH_STRETCH_EQ = {
   Identifier = "NAC_POLE_PSR_SOUTH_STRETCH_EQ",
   Name = [[LRO NAC PSR Mosaic 20mpp, S Pole]],
+  ZIndex = 50,
   FilePath = asset.resource("LRO_NAC_PSR_Mosaic_20mpp/S_Pole.vrt"),
   Description = [[This is an uncontrolled mosaic generated from images taken by the Narrow Angle Camera (NAC) onboard the Lunar Reconnaissance Orbiter (LRO) for the South Pole region of the Moon. The NAC mosaics have been trimmed to the Permanently Shadowed Region (PSR) shapefile, providing visible NAC image coverage of the PSRs only. Acquisition of NAC PSR observations were optimized over several campaigns to maximize signal-to-noise ratio (SNR), resulting in a comprehensive dataset that is systematically reviewed and analyzed. Observations are acquired at a variety of pixel scales (2 to 20 m/px). The final PSR mosaics are assembled from re-sampled images to 20 m/px, and ordering of images is based on image quality and areal coverage of individual PSRs. A total of 550 NAC images were used to create a South Pole PSR mosaic at 20 m/px, 90&deg; to 80&deg; latitude, and -180&deg; to 180&deg; longitude. This mosaic has been merged with the existing LROC NAC South Pole RDR product to replace over-saturated illuminated polar areas.]]
 }
diff --git a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_NAC_and_CE-2_CCD_Mosaic_1mpp.asset b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_NAC_and_CE-2_CCD_Mosaic_1mpp.asset
index 5fd4fee268..5d6359bcaa 100644
--- a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_NAC_and_CE-2_CCD_Mosaic_1mpp.asset
+++ b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_NAC_and_CE-2_CCD_Mosaic_1mpp.asset
@@ -9,6 +9,7 @@ local globeIdentifier = asset.require("scene/solarsystem//planets/earth/moon/moo
 local treks_LRO_NAC_CE2_Mosaic_1mpp = {
   Identifier = "LRO_NAC_CE2_Mosaic_1mpp",
   Name = [[LRO NAC and CE-2 CCD Mosaic 1mpp, Von Karman]],
+  ZIndex = 50,
   FilePath = asset.resource("LRO_NAC_and_CE-2_CCD_Mosaic_1mpp/Von_Karman.vrt"),
   Description = [[This is an orthorectified NAC and Chang&rsquo;e-2 mosaic of the Von Karman Crater region for the south pole of the Moon. This mosaic includes 118 individual orthorectified NAC images sampled at 1 m/px and has been mosaicked on top of the respective Chang&rsquo;e 7 m/px orthomosaic. NAC orthoimages have been constructed from EDRs downloaded from the Planetary Data System (PDS) and subsequent USGS-ISIS processing. This mosaic has been coaligned to Chang&rsquo;e-2 20 m/px DEM which has been coaligned to the USGS 59 m/px LOLA-SELENE DEM using ENVI (v5.6.2) patented auto-coreg. Individual NAC orthoimages and the underlying Chang&rsquo;e ortho product have been mosaicked together using ArcGIS Pro (v2.9.0). A color balancing algorithm has been applied to roughly correct for color differences at the seams of NAC images. This data has been made available by and should be credited to: Yu Tao and Jan-Peter Muller, Imaging Group, Mullard Space Science Laboratory, University College London.]]
 }
diff --git a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_Narrow_Angle_Camera.asset b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_Narrow_Angle_Camera.asset
index 80d2838451..de0d845fd3 100644
--- a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_Narrow_Angle_Camera.asset
+++ b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_Narrow_Angle_Camera.asset
@@ -9,6 +9,7 @@ local globeIdentifier = asset.require("scene/solarsystem//planets/earth/moon/moo
 local treks_LRO_NAC_Apollo11_Mosaic_p = {
   Identifier = "LRO_NAC_Apollo11_Mosaic_p",
   Name = [[LRO Narrow Angle Camera, Apollo 11 Landing Site]],
+  ZIndex = 50,
   FilePath = asset.resource("LRO_Narrow_Angle_Camera/Apollo_11_Landing_Site.vrt"),
   Description = [[This is the site where American astronauts Neil Armstrong and Edwin “Buzz” Aldrin made the first human landing on the Moon on July 20, 1969. Armstrong and Aldrin landed here aboard the lunar module Eagle, while Michael Collins remained in orbit around the Moon in the command module Columbia. Armstrong and Aldrin conducted one EVA on the lunar surface lasting 2 hours, 31 minutes 40 seconds, remaining within 60 meters of the lunar module. They collected 21.55 kg of lunar sample material for return to the Earth.
 
@@ -21,6 +22,7 @@ The landing site, located at 0.67416 N, 23.47314 E, is in the southwest part of
 local treks_LRO_NAC_Apollo12_Mosaic_p = {
   Identifier = "LRO_NAC_Apollo12_Mosaic_p",
   Name = [[LRO Narrow Angle Camera, Apollo 12 Landing Site]],
+  ZIndex = 50,
   FilePath = asset.resource("LRO_Narrow_Angle_Camera/Apollo_12_Landing_Site.vrt"),
   Description = [[This is the site where American astronauts Charles “Pete” Conrad and Alan Bean made the second human landing on the Moon on November 19, 1969. Conrad and Bean landed here aboard the lunar module Intrepid, while Richard Gordon remained in orbit around the Moon in the command module Yankee Clipper. Apollo 12 demonstrated the key capability of a precision landing, with Intrepid touching down less than 200 meters from the site where the Surveyor 3 probe had landed on April 20, 1967. Conrad and Bean conducted 2 EVAs on the lunar surface. The first, lasting 3 hours, 56 minutes, extended to the northwest for deployment of the ALSEP instrument package, and the continued to the rim of a 350-meter diameter crater dubbed Middle Crescent. The second EVA, lasting 3 hours, 49 minutes, was a loop trip of 1.5 km around several craters to the south, including retrieval of a camera from Surveyor 3. They collected 34.35 kilograms of lunar sample material for return to the Earth.
 
@@ -33,6 +35,7 @@ The landing site, located at 3.0138 S N, 23.4219 W, is in the southern part of O
 local treks_LRO_NAC_Apollo14_Mosaic_p = {
   Identifier = "LRO_NAC_Apollo14_Mosaic_p",
   Name = [[LRO Narrow Angle Camera, Apollo 14 Landing Site]],
+  ZIndex = 50,
   FilePath = asset.resource("LRO_Narrow_Angle_Camera/Apollo_14_Landing_Site.vrt"),
   Description = [[This is the site where American astronauts Alan Shepard and Edgar Mitchell made the third human landing on the Moon on February 5, 1971. Shepard and Mitchell landed here aboard the lunar module Antares, while Stuart Roosa remained in orbit around the Moon in the command module Kitty Hawk. Shephard and Mitchell conducted 2 EVAs on the lunar surface. The first, lasting 4 hours, 47 minutes, 50 seconds, extended to the west for deployment of the ALSEP instrument package, included collection of a contingency sample, and covered a total distance of about 550 meters. The second EVA, lasting 4 hours, 34 minutes, 41 seconds, was intended to visit Cone Crater, 370 meters in diameter and located approximately 1.2 kilometers to the northeast. To help transport the load of equipment and retrieved samples on this EVA, the astronauts were equipped with a hand-pulled cart, the Modular Equipment Transporter (MET). The rough, hummocky terrain made navigation difficult during the second EVA, and the astronauts were not able to identify the rim of Cone Crater, though later imagery showed that they reached a point about 20 meters south of the crater rim. Shepard and Mitchell collected 42.80 kilograms of lunar sample material for return to the Earth.
 
@@ -44,6 +47,7 @@ The landing site, located at 3.64589 S, 17.47194 W, was selected largely with th
 local treks_LRO_NAC_Apollo15_Mosaic_p = {
   Identifier = "LRO_NAC_Apollo15_Mosaic_p",
   Name = [[LRO Narrow Angle Camera, Apollo 15 Landing Site]],
+  ZIndex = 50,
   FilePath = asset.resource("LRO_Narrow_Angle_Camera/Apollo_15_Landing_Site.vrt"),
   Description = [[This is the site where American astronauts David Scott and James Irwin made the fourth human landing on the Moon on July 30, 1971. Scott and Irwin landed here aboard the lunar module Falcon, while Alfred Worden remained in orbit around the Moon in the command module Endeavour. This was the first of the Apollo J missions. These featured a greater emphasis on conducting science on the Moon along with longer stays on the lunar surface. The J missions also included a lunar rover which allowed the astronauts to drive across the lunar surface, covering far greater areas, and carrying back more sample material. Scott first conducted a 33-minute stand-up EVA, surveying and imaging the local terrain through the upper hatch of the lunar module. Scott and Irwin then conducted 3 surface EVAs. The first, lasting 6 hours, 32 minutes, 42 seconds, involved deploying the Lunar Rover, and driving in it on a 10.3-km geological traverse. They drove southwest to the edge of Hadley Rille and then continued south along the edge of the rille. At the end of the first surface EVA, they deployed the Apollo Lunar Surface Experiments Package (ALSEP) approximately 110 meters north-northwest of the lunar module. The second surface EVA, lasting 7 hours, 12 minutes, 14 seconds, featured a 12.5-kilometer lunar rover traverse southeast across the mare and along the base of the Apennine Mountains. The third surface EVA, lasting 4 hours, 49 minutes, 50 seconds, had the astronauts making a 5.1-kilometer traverse west to Hadley Rille northwest along the edge of the rille, and east across the mare back to the lunar module. Scott and Irwin collected 77 kilograms of lunar sample material for return to the Earth.
 
@@ -56,6 +60,7 @@ The landing site, located at 26.13239 N, 3.63330 E, was selected to provide acce
 local treks_LRO_NAC_Apollo16_Mosaic_p = {
   Identifier = "LRO_NAC_Apollo16_Mosaic_p",
   Name = [[LRO Narrow Angle Camera, Apollo 16 Landing Site]],
+  ZIndex = 50,
   FilePath = asset.resource("LRO_Narrow_Angle_Camera/Apollo_16_Landing_Site.vrt"),
   Description = [[This is the site where American astronauts John Young and Charles Duke made the fifth human landing on the Moon on April 21, 1972. Young and Duke landed here aboard the lunar module Orion, while Ken Mattingly remained in orbit around the Moon in the command module Casper. Young and Duke conducted 3 surface EVAs. The first, lasting 7 hours, 11 minutes, 2 seconds, included deploying the Apollo Lunar Surface Experiments Package (ALSEP) approximately 95 meters southwest of the lunar module, and conducting a geologic traverse using the lunar rover to a couple of small craters within about 1,400 meters to the west of the landing site. The second surface EVA, lasting 7 hours, 23 minutes, 9 seconds, featured an 11.1-kilometer lunar rover drive south to the Cinco Crater area of Stone Mountain, making stops at 6 stations along the way. across the mare and along the base of the Apennine Mountains. The third surface EVA, lasting 5 hours, 40 minutes, 3 seconds, had the astronauts making a 11.4-kilometer traverse north to North Ray Crater. Young and Duke collected 95.71 kilograms of lunar sample material for return to the Earth.
 
@@ -68,6 +73,7 @@ With the previous Apollo landings having focused on the low, flat, basaltic terr
 local treks_NAC_DTM_APOLLO17_CLRSHADE = {
   Identifier = "NAC_DTM_APOLLO17_CLRSHADE",
   Name = [[LRO Narrow Angle Camera, ColorHillShade Apollo 17]],
+  ZIndex = 50,
   FilePath = asset.resource("LRO_Narrow_Angle_Camera/ColorHillShade_Apollo_17.vrt"),
   Description = [[Color-coded topography draped over the shaded relief from a 5m Digital Terrain Model (DTM) of the Apollo 17 landing site created with Narrow Angle Camera (NAC) stereo image pairs from the Lunar Reconnaissance Orbiter Camera (LROC) aboard the Lunar Reconnaissance Orbiter (LRO). The shaded relief image was generated with the sun azimuth of 315 degrees (northwest) and sun altitude of 45 degrees. ]]
 }
@@ -75,6 +81,7 @@ local treks_NAC_DTM_APOLLO17_CLRSHADE = {
 local treks_NAC_DTM_APOLLO17_SHADE = {
   Identifier = "NAC_DTM_APOLLO17_SHADE",
   Name = [[LRO Narrow Angle Camera, HillShade Apollo 17]],
+  ZIndex = 50,
   FilePath = asset.resource("LRO_Narrow_Angle_Camera/HillShade_Apollo_17.vrt"),
   Description = [[This is a  shaded-relief derived from a 5m Digital Terrain Model (DTM) of the Apollo 17 landing site created with Narrow Angle Camera (NAC) stereo image pairs from the Lunar Reconnaissance Orbiter Camera (LROC) aboard the Lunar Reconnaissance Orbiter (LRO). The shaded relief image was generated with the sun azimuth of 315 degrees (northwest) and sun altitude of 45 degrees. Image is a TIFF image, 8 bits/sample, 1 samples/pixel in single image plane configuration.]]
 }
@@ -82,6 +89,7 @@ local treks_NAC_DTM_APOLLO17_SHADE = {
 local treks_A11_60x60kmeq = {
   Identifier = "A11_60x60kmeq",
   Name = [[LRO Narrow Angle Camera, Mosaic Apollo 11]],
+  ZIndex = 50,
   FilePath = asset.resource("LRO_Narrow_Angle_Camera/Mosaic_Apollo_11.vrt"),
   Description = [[This is a Lunar Reconnaisance Orbiter (LRO) Narrow Angle Camera (NAC) mosaic centered at the Apollo 11 landing site with an extent of 60x60km. Each NAC image was processed in ISIS3 at a resolution of 50cm pixel, color balanced, and synthesized into a single output.]]
 }
@@ -89,6 +97,7 @@ local treks_A11_60x60kmeq = {
 local treks_A12_60x60km0_3eq = {
   Identifier = "A12_60x60km0_3eq",
   Name = [[LRO Narrow Angle Camera, Mosaic Apollo 12]],
+  ZIndex = 50,
   FilePath = asset.resource("LRO_Narrow_Angle_Camera/Mosaic_Apollo_12.vrt"),
   Description = [[This is a Lunar Reconnaissance Orbiter (LRO) Narrow Angle Camera (NAC) mosaic centered at the Apollo 12 landing site with an extent of 60x60km. Each NAC image was processed in ISIS3 at a resolution of 50cm pixel, color balanced, and synthesized into a single output. Apollo 12 was second crewed mission to land on the surface of the Moon. The mission launched on November 14th 1969, and landed five days later at the Ocean of Storms within walking distance of the Surveyor 3 spacecraft.]]
 }
@@ -96,6 +105,7 @@ local treks_A12_60x60km0_3eq = {
 local treks_A14_60x60km0_3eq = {
   Identifier = "A14_60x60km0_3eq",
   Name = [[LRO Narrow Angle Camera, Mosaic Apollo 14]],
+  ZIndex = 50,
   FilePath = asset.resource("LRO_Narrow_Angle_Camera/Mosaic_Apollo_14.vrt"),
   Description = [[This is a Lunar Reconnaissance Orbiter (LRO) Narrow Angle Camera (NAC) mosaic centered at the Apollo 14 landing site with an extent of 60x60km. Each NAC image was processed in ISIS3 at a resolution of 50cm pixel, color balanced, and synthesized into a single output. Apollo 14 landed on the Moon February 15th 1971.]]
 }
@@ -103,6 +113,7 @@ local treks_A14_60x60km0_3eq = {
 local treks_A15_60x60km0_2eq = {
   Identifier = "A15_60x60km0_2eq",
   Name = [[LRO Narrow Angle Camera, Mosaic Apollo 15]],
+  ZIndex = 50,
   FilePath = asset.resource("LRO_Narrow_Angle_Camera/Mosaic_Apollo_15.vrt"),
   Description = [[This is a Lunar Reconnaisance Orbiter (LRO) Narrow Angle Camera (NAC) mosaic centered at the Apollo 15 landing site with an extent of 60x60km. Each NAC image was processed in ISIS3 at a resolution of 50cm pixel, color balanced, and synthesized into a single output.]]
 }
@@ -110,6 +121,7 @@ local treks_A15_60x60km0_2eq = {
 local treks_A16_60x60kmeq = {
   Identifier = "A16_60x60kmeq",
   Name = [[LRO Narrow Angle Camera, Mosaic Apollo 16]],
+  ZIndex = 50,
   FilePath = asset.resource("LRO_Narrow_Angle_Camera/Mosaic_Apollo_16.vrt"),
   Description = [[This is a Lunar Reconnaisance Orbiter (LRO) Narrow Angle Camera (NAC) mosaic centered at the Apollo 16 landing site with an extent of 60x60km. Each NAC image was processed in ISIS3 at a resolution of 50cm pixel, color balanced, and synthesized into a single output.]]
 }
@@ -117,6 +129,7 @@ local treks_A16_60x60kmeq = {
 local treks_A17_60x60kmeq = {
   Identifier = "A17_60x60kmeq",
   Name = [[LRO Narrow Angle Camera, Mosaic Apollo 17]],
+  ZIndex = 50,
   FilePath = asset.resource("LRO_Narrow_Angle_Camera/Mosaic_Apollo_17.vrt"),
   Description = [[This is a Lunar Reconnaisance Orbiter (LRO) Narrow Angle Camera (NAC) mosaic centered at the Apollo 17 landing site with an extent of 60x60km. Each NAC image was processed in ISIS3 at a resolution of 50cm pixel, color balanced, and synthesized into a single output.]]
 }
@@ -124,6 +137,7 @@ local treks_A17_60x60kmeq = {
 local treks_M129086118ndgcs = {
   Identifier = "M129086118ndgcs",
   Name = [[LRO Narrow Angle Camera, Mosaic Apollo 17 Landing Site]],
+  ZIndex = 50,
   FilePath = asset.resource("LRO_Narrow_Angle_Camera/Mosaic_Apollo_17_Landing_Site.vrt"),
   Description = [[This is the site where American astronauts Eugene Cernan and Harrison Schmitt made the sixth and final human landing on the Moon of the Apollo program on December 11, 1972. Cernan and Schmitt landed here aboard the lunar module Challenger, while Ronald Evans remained in orbit around the Moon in the command module America. With a PhD in geology, Schmitt was the first and only professional scientist to have visited the Moon. Cernan and Schmitt conducted 3 surface EVAs. The first, lasting 7 hours, 11 minutes, 53 seconds, included deploying the Apollo Lunar Surface Experiments Package (ALSEP) approximately 185 meters west-northwest of the lunar module, and conducting a 3.5-kilometer geologic traverse using the lunar rover to the rim of Steno, a small impact crater south of the landing site. The second surface EVA, lasting 7 hours, 36 minutes, 56 seconds, featured a 20.4-kilometer geologic traverse south and west. Stops included a location at the base of South Massif where a landslide had brought ancient highland rocks from high on the mountain into reach, and at Shorty Crater, which was found to be impact rather than volcanic in origin, but which excavated an older volcanic deposit which yielded the famous , beads of volcanic glass erupted in a lunar fire fountain. The third surface EVA, lasting 7 hours, 15 minutes, 8 seconds, had the astronauts making a 20.4-kilometer geologic traverse north and east to North Massif. Stops on this traverse included taking samples of early lunar crust material from large boulders near the base of the massif that had rolled down from high up on the mountain. Cernan and Schmitt collected 110.52 kilograms of lunar sample material for return to the Earth.
 
@@ -135,6 +149,7 @@ The landing site, located at 20.1911 N, 30.7723 E, is in a narrow valley in the
 local treks_ingenii_skylight = {
   Identifier = "ingenii_skylight",
   Name = [[LRO Narrow Angle Camera, Mosaic Ingenii]],
+  ZIndex = 50,
   FilePath = asset.resource("LRO_Narrow_Angle_Camera/Mosaic_Ingenii.vrt"),
   Description = [[Mare Ingenii is notable for being one of the few examples of a mare on the far side of the Moon, and the site for notable lunar swirls, enigmatic bright albedo features. This was enough to qualify the area as a Constellation Region of Interest. However, the area became even more interesting with the discovery of a lunar pit in imagery obtained using the Kaguya Terrain Camera. It measures about 130 m in diameter, and researchers speculate that the pit could be a skylight resulting from the collapse of the roof of a lava tube. Whether this is actually the case, and if so, the accessibility and extent of the lava tube have yet to be determined. However, such lava tubes are of great interest as potential locations for lunar bases, offering protection from extreme swings in temperature, galactic and solar radiation, and meteoroid impacts. This data layer was obtained using the Narrow Angle Camera aboard the Lunar Reconnaissance Orbiter and is a is a mosaic of 2 NAC strips centered on the Mare Ingenii pit.]]
 }
@@ -142,6 +157,7 @@ local treks_ingenii_skylight = {
 local treks_marius_skylight = {
   Identifier = "marius_skylight",
   Name = [[LRO Narrow Angle Camera, Mosaic Marius]],
+  ZIndex = 50,
   FilePath = asset.resource("LRO_Narrow_Angle_Camera/Mosaic_Marius.vrt"),
   Description = [[The Marius Hills represents one of the most prominent collection of volcanic domes on the Moon. The area was a candidate landing site for the Apollo program and was also designated as a Constellation Region of Interest. It remains a site under consideration for possible future missions. In addition to volcanic domes, the area features basaltic flows, sinuous rilles, and one prominent lunar pit. The Marius Hills pit measures 58 x 49 m in diameter and 40 m deep. It was first noticed in an image taken with the Kaguya Terrain Camera on May 20, 2008, by a team led by Junichi Haruyama . The fact that the Marius Hills pit is located on the floor of a sinuous rille has encouraged speculation the pit could be a skylight resulting from the collapse of the roof of a lava tube. Whether this is actually the case, and if so, the accessibility and extent of the lava tube have yet to be determined. However, such lava tubes are of great interest as potential locations for lunar bases, offering protection from extreme swings in temperature, galactic and solar radiation, and meteoroid impacts. This data layer was obtained using the Narrow Angle Camera aboard the Lunar Reconnaissance Orbiter and is a is a mosaic of 2 NAC strips centered on the Marius Hills pit.]]
 }
@@ -149,6 +165,7 @@ local treks_marius_skylight = {
 local treks_LRO_NAC_Schrodinger = {
   Identifier = "LRO_NAC_Schrodinger",
   Name = [[LRO Narrow Angle Camera, Mosaic Schrodinger]],
+  ZIndex = 50,
   FilePath = asset.resource("LRO_Narrow_Angle_Camera/Mosaic_Schrodinger.vrt"),
   Description = [[This is a visible image mosaic generated using Lunar Reconnaissance Orbiter Camera (LROC) Narrow Angle Camera (NAC) images from the Lunar Reconnaissance Orbiter mission. The images were orthorectified using a digital elevation model (DEM) created from LROC NAC stereo images, when available, or LRO's Lunar Orbiter Laser Altimeter (LOLA) global DEM. The mosaic is generated at the same resolution at which the individual LROC NAC images were gathered, which is approximately 0.5 meters/pixel. The mosaic was registered horizontally to the LOLA global DEM.]]
 }
@@ -156,6 +173,7 @@ local treks_LRO_NAC_Schrodinger = {
 local treks_schrodingerextraswathseq = {
   Identifier = "schrodingerextraswathseq",
   Name = [[LRO Narrow Angle Camera, Mosaic Schrodinger Extra]],
+  ZIndex = 50,
   FilePath = asset.resource("LRO_Narrow_Angle_Camera/Mosaic_Schrodinger_Extra.vrt"),
   Description = [[TBD]]
 }
@@ -163,6 +181,7 @@ local treks_schrodingerextraswathseq = {
 local treks_LRO_NAC_SchrodingerLandingSite2 = {
   Identifier = "LRO_NAC_SchrodingerLandingSite2",
   Name = [[LRO Narrow Angle Camera, Mosaic Schrodinger Landing Site]],
+  ZIndex = 50,
   FilePath = asset.resource("LRO_Narrow_Angle_Camera/Mosaic_Schrodinger_Landing_Site.vrt"),
   Description = [[This is a visible image mosaic generated using Lunar Reconnaissance Orbiter Camera (LROC) Narrow Angle Camera (NAC) images from the Lunar Reconnaissance Orbiter mission. The images were orthorectified using a digital elevation model (DEM) created from LROC NAC stereo images, when available, or LRO's Lunar Orbiter Laser Altimeter (LOLA) global DEM. The mosaic is generated at the same resolution at which the individual LROC NAC images were gathered, which is approximately 0.5 meters/pixel. The mosaic was registered horizontally to the LOLA global DEM.]]
 }
@@ -170,6 +189,7 @@ local treks_LRO_NAC_SchrodingerLandingSite2 = {
 local treks_schrodingerneequirect = {
   Identifier = "schrodingerneequirect",
   Name = [[LRO Narrow Angle Camera, Mosaic Schrodinger NorthEast]],
+  ZIndex = 50,
   FilePath = asset.resource("LRO_Narrow_Angle_Camera/Mosaic_Schrodinger_NorthEast.vrt"),
   Description = [[This is a visible image mosaic generated using Lunar Reconnaissance Orbiter Camera (LROC) Narrow Angle Camera (NAC) images from the Lunar Reconnaissance Orbiter mission. Each NAC image was registered horizontally to the LRO's Lunar Orbiter Laser Altimeter (LOLA) global DEM, and then mosaicked together and color balanced. The mosaic is generated at the same resolution at which the individual LROC NAC images were gathered, which is approximately 1 meters/pixel.]]
 }
@@ -177,6 +197,7 @@ local treks_schrodingerneequirect = {
 local treks_schrodingerscequirect = {
   Identifier = "schrodingerscequirect",
   Name = [[LRO Narrow Angle Camera, Mosaic Schrodinger SouthCenter]],
+  ZIndex = 50,
   FilePath = asset.resource("LRO_Narrow_Angle_Camera/Mosaic_Schrodinger_SouthCenter.vrt"),
   Description = [[This is a visible image mosaic generated using Lunar Reconnaissance Orbiter Camera (LROC) Narrow Angle Camera (NAC) images from the Lunar Reconnaissance Orbiter mission. Each NAC image was registered horizontally to the LRO's Lunar Orbiter Laser Altimeter (LOLA) global DEM, and then mosaicked together and color balanced. The mosaic is generated at the same resolution at which the individual LROC NAC images were gathered, which is approximately 1 meters/pixel.]]
 }
@@ -184,6 +205,7 @@ local treks_schrodingerscequirect = {
 local treks_schrodingerseequirect = {
   Identifier = "schrodingerseequirect",
   Name = [[LRO Narrow Angle Camera, Mosaic Schrodinger SouthEast]],
+  ZIndex = 50,
   FilePath = asset.resource("LRO_Narrow_Angle_Camera/Mosaic_Schrodinger_SouthEast.vrt"),
   Description = [[This is a visible image mosaic generated using Lunar Reconnaissance Orbiter Camera (LROC) Narrow Angle Camera (NAC) images from the Lunar Reconnaissance Orbiter mission. Each NAC image was registered horizontally to the LRO's Lunar Orbiter Laser Altimeter (LOLA) global DEM, and then mosaicked together and color balanced. The mosaic is generated at the same resolution at which the individual LROC NAC images were gathered, which is approximately 1 meters/pixel.]]
 }
@@ -191,6 +213,7 @@ local treks_schrodingerseequirect = {
 local treks_small_tranq_skylight_1 = {
   Identifier = "small_tranq_skylight_1",
   Name = [[LRO Narrow Angle Camera, Mosaic Small Tranquilltatis 1]],
+  ZIndex = 50,
   FilePath = asset.resource("LRO_Narrow_Angle_Camera/Mosaic_Small_Tranquilltatis_1.vrt"),
   Description = [[The discovery of three lunar pits using imagery from imagery obtained using the Kaguya Terrain Camera led researchers to wonder how common such features might be. A very successful campaign was mounted to search Lunar Reconnaissance Orbiter Narrow Angle Camera (NAC) images to see if the higher resolution of NAC might reveal more lunar pits smaller than were detectable with the Kaguya Terrain Camera (R. V. Wagner and M. S. Robinson, 2015, UPDATE: THE SEARCH FOR LUNAR PITS, 2nd International Planetary Caves Conference). Researchers speculate that these lunar pits could be skylights resulting from roof collapse in lava tubes. Whether this is actually the case, and if so, the accessibility and extent of the lava tubes have yet to be determined. However, such lava tubes are of great interest as potential locations for lunar bases, offering protection from extreme swings in temperature, galactic and solar radiation, and meteoroid impacts. This data layer was obtained using the Narrow Angle Camera aboard the Lunar Reconnaissance Orbiter and is a is a mosaic of 2 NAC strips centered on a small pit in Mare Tranquillitatis.]]
 }
@@ -198,6 +221,7 @@ local treks_small_tranq_skylight_1 = {
 local treks_small_tranq_skylight_2 = {
   Identifier = "small_tranq_skylight_2",
   Name = [[LRO Narrow Angle Camera, Mosaic Small Tranquilltatis 2]],
+  ZIndex = 50,
   FilePath = asset.resource("LRO_Narrow_Angle_Camera/Mosaic_Small_Tranquilltatis_2.vrt"),
   Description = [[The discovery of three lunar pits using imagery from imagery obtained using the Kaguya Terrain Camera led researchers to wonder how common such features might be. A very successful campaign was mounted to search Lunar Reconnaissance Orbiter Narrow Angle Camera (NAC) images to see if the higher resolution of NAC might reveal more lunar pits smaller than were detectable with the Kaguya Terrain Camera (R. V. Wagner and M. S. Robinson, 2015, UPDATE: THE SEARCH FOR LUNAR PITS, 2nd International Planetary Caves Conference). Researchers speculate that these lunar pits could be skylights resulting from roof collapse in lava tubes. Whether this is actually the case, and if so, the accessibility and extent of the lava tubes have yet to be determined. However, such lava tubes are of great interest as potential locations for lunar bases, offering protection from extreme swings in temperature, galactic and solar radiation, and meteoroid impacts. This data layer was obtained using the Narrow Angle Camera aboard the Lunar Reconnaissance Orbiter and is a is a mosaic of 2 NAC strips centered on a small pit in Mare Tranquillitatis.]]
 }
@@ -205,6 +229,7 @@ local treks_small_tranq_skylight_2 = {
 local treks_NAC_DTM_APOLLO17_SLOPE = {
   Identifier = "NAC_DTM_APOLLO17_SLOPE",
   Name = [[LRO Narrow Angle Camera, Slope Apollo 17]],
+  ZIndex = 50,
   FilePath = asset.resource("LRO_Narrow_Angle_Camera/Slope_Apollo_17.vrt"),
   Description = [[This is a color slope map derived from a 5m Digital Terrain Model (DTM) of the Apollo 17 landing site created with Narrow Angle Camera (NAC) stereo image pairs from the Lunar Reconnaissance Orbiter Camera (LROC) aboard the Lunar Reconnaissance Orbiter (LRO). Image is 3-channel RGB TIFF, 8 bits/sample, 3 samples/pixel in single image plane configuration]]
 }
diff --git a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_WAC-GLD100_DEM.asset b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_WAC-GLD100_DEM.asset
index 46d3eba271..5b17b65f62 100644
--- a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_WAC-GLD100_DEM.asset
+++ b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_WAC-GLD100_DEM.asset
@@ -9,6 +9,7 @@ local globeIdentifier = asset.require("scene/solarsystem//planets/earth/moon/moo
 local treks_LRO_WACGLD100_Gray_79S79N_256ppd = {
   Identifier = "LRO_WACGLD100_Gray_79S79N_256ppd",
   Name = [[LRO WAC-GLD100 DEM, Grayscale]],
+  ZIndex = 50,
   FilePath = asset.resource("LRO_WAC-GLD100_DEM/Grayscale.vrt"),
   Description = [[]]
 }
diff --git a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_WAC_GLD100_DEM.asset b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_WAC_GLD100_DEM.asset
index 1f64a5cbce..bb16735ba3 100644
--- a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_WAC_GLD100_DEM.asset
+++ b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_WAC_GLD100_DEM.asset
@@ -9,6 +9,7 @@ local globeIdentifier = asset.require("scene/solarsystem//planets/earth/moon/moo
 local treks_LRO_WACGLD100_ClrShade_79S79N_256ppd = {
   Identifier = "LRO_WACGLD100_ClrShade_79S79N_256ppd",
   Name = [[LRO WAC GLD100 DEM, ColorHillShade]],
+  ZIndex = 50,
   FilePath = asset.resource("LRO_WAC_GLD100_DEM/ColorHillShade.vrt"),
   Description = [[]]
 }
@@ -16,6 +17,7 @@ local treks_LRO_WACGLD100_ClrShade_79S79N_256ppd = {
 local treks_LRO_WACGLD100_Shade_79S79N_256ppd = {
   Identifier = "LRO_WACGLD100_Shade_79S79N_256ppd",
   Name = [[LRO WAC GLD100 DEM, Hillshade]],
+  ZIndex = 50,
   FilePath = asset.resource("LRO_WAC_GLD100_DEM/Hillshade.vrt"),
   Description = [[]]
 }
diff --git a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_and_Kaguya_Multi_Instruments_1895.21mpp.asset b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_and_Kaguya_Multi_Instruments_1895.21mpp.asset
index 7a72733e9e..72c5d3bc52 100644
--- a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_and_Kaguya_Multi_Instruments_1895.21mpp.asset
+++ b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_and_Kaguya_Multi_Instruments_1895.21mpp.asset
@@ -9,6 +9,7 @@ local globeIdentifier = asset.require("scene/solarsystem//planets/earth/moon/moo
 local treks_3He_Dig_Here_Layer = {
   Identifier = "3He_Dig_Here_Layer",
   Name = [[LRO and Kaguya Multi Instruments 1895.21mpp, 3He Dig Here]],
+  ZIndex = 50,
   FilePath = asset.resource("LRO_and_Kaguya_Multi_Instruments_1895.21mpp/3He_Dig_Here.vrt"),
   Description = [[This data represents potential Helium-3 deposits and other solar wind implanted volatiles on the Moon. This data layer has been generated by querying specific criteria from the following datasets: Titanium Oxide (TiO2) abundance from Lunar Reconnaissance Orbiter&rsquo;s (LRO) Wide-Angle Camera (WAC), Optical Maturity Index (OMAT) from Kaguya Lunar Multiband Imager (MI), slope from LRO&rsquo;s Lunar Orbital Laser Altimeter (LOLA), and Rock Abundance from LRO&rsquo;s Lunar Radiometer Experiment (DIVINER). For this &ldquo;Dig Here&rdquo; layer, the following criteria has been applied: TiO2 &gt; 9.0&percnt;, OMAT &lt; 0.15, Slope &lt; 4&deg;, and rock abundance &lt; 0.02&percnt;. The research on Helium-3 as a potential use for fuel for a fusion cell and the data presented as a result of this research culminated as an outcome of a group project at the Colorado School of Mines. The research for this data should be credited to: Stewart Ray, Colleen Olson, Lisa Robibero, Steven Coutts, and Maxwell Sissman of the Planetary and Terrestrial Mining Sciences Symposium and Space Resources Roundtable, Colorado School of Mines.]]
 }
@@ -16,6 +17,7 @@ local treks_3He_Dig_Here_Layer = {
 local treks_3He_Likely_Layer = {
   Identifier = "3He_Likely_Layer",
   Name = [[LRO and Kaguya Multi Instruments 1895.21mpp, 3He Likely]],
+  ZIndex = 50,
   FilePath = asset.resource("LRO_and_Kaguya_Multi_Instruments_1895.21mpp/3He_Likely.vrt"),
   Description = [[This data represents potential Helium-3 deposits and other solar wind implanted volatiles on the Moon. This data layer has been generated by querying specific criteria from the following datasets: Titanium Oxide (TiO2) abundance from Lunar Reconnaissance Orbiter&rsquo;s (LRO) Wide-Angle Camera (WAC), Optical Maturity Index (OMAT) from Kaguya Lunar Multiband Imager (MI), slope from LRO&rsquo;s Lunar Orbital Laser Altimeter (LOLA), and Rock Abundance from LRO&rsquo;s Lunar Radiometer Experiment (DIVINER). For this &ldquo;Likely&rdquo; layer, the following criteria has been applied: TiO2 &gt; 3.0&percnt;, OMAT &lt; 0.25, Slope &lt; 20&deg;, and rock abundance &lt; 0.10&percnt;. The research on Helium-3 as a potential use for fuel for a fusion cell and the data presented as a result of this research culminated as an outcome of a group project at the Colorado School of Mines. The research for this data should be credited to: Stewart Ray, Colleen Olson, Lisa Robibero, Steven Coutts, and Maxwell Sissman of the Planetary and Terrestrial Mining Sciences Symposium and Space Resources Roundtable, Colorado School of Mines.]]
 }
@@ -23,6 +25,7 @@ local treks_3He_Likely_Layer = {
 local treks_3He_More_Likely_Layer = {
   Identifier = "3He_More_Likely_Layer",
   Name = [[LRO and Kaguya Multi Instruments 1895.21mpp, 3He More Likely]],
+  ZIndex = 50,
   FilePath = asset.resource("LRO_and_Kaguya_Multi_Instruments_1895.21mpp/3He_More_Likely.vrt"),
   Description = [[This data represents potential Helium-3 deposits and other solar wind implanted volatiles on the Moon. This data layer has been generated by querying specific criteria from the following datasets: Titanium Oxide (TiO2) abundance from Lunar Reconnaissance Orbiter&rsquo;s (LRO) Wide-Angle Camera (WAC), Optical Maturity Index (OMAT) from Kaguya Lunar Multiband Imager (MI), slope from LRO&rsquo;s Lunar Orbital Laser Altimeter (LOLA), and Rock Abundance from LRO&rsquo;s Lunar Radiometer Experiment (DIVINER). For this &ldquo;More Likely&rdquo; layer, the following criteria has been applied: TiO2 &gt; 4.5&percnt;, OMAT &lt; 0.225, Slope &lt; 16&deg;, and rock abundance &lt; 0.08&percnt;. The research on Helium-3 as a potential use for fuel for a fusion cell and the data presented as a result of this research culminated as an outcome of a group project at the Colorado School of Mines. The research for this data should be credited to: Stewart Ray, Colleen Olson, Lisa Robibero, Steven Coutts, and Maxwell Sissman of the Planetary and Terrestrial Mining Sciences Symposium and Space Resources Roundtable, Colorado School of Mines.]]
 }
@@ -30,6 +33,7 @@ local treks_3He_More_Likely_Layer = {
 local treks_3He_Most_Likely_Layer = {
   Identifier = "3He_Most_Likely_Layer",
   Name = [[LRO and Kaguya Multi Instruments 1895.21mpp, 3He Most Likely]],
+  ZIndex = 50,
   FilePath = asset.resource("LRO_and_Kaguya_Multi_Instruments_1895.21mpp/3He_Most_Likely.vrt"),
   Description = [[This data represents potential Helium-3 deposits and other solar wind implanted volatiles on the Moon. This data layer has been generated by querying specific criteria from the following datasets: Titanium Oxide (TiO2) abundance from Lunar Reconnaissance Orbiter&rsquo;s (LRO) Wide-Angle Camera (WAC), Optical Maturity Index (OMAT) from Kaguya Lunar Multiband Imager (MI), slope from LRO&rsquo;s Lunar Orbital Laser Altimeter (LOLA), and Rock Abundance from LRO&rsquo;s Lunar Radiometer Experiment (DIVINER). For this &ldquo;Most Likely&rdquo; layer, the following criteria has been applied: TiO2 &gt; 7.5&percnt;, OMAT &lt; 0.175, Slope &lt; 8&deg;, and rock abundance &lt; 0.04&percnt;. The research on Helium-3 as a potential use for fuel for a fusion cell and the data presented as a result of this research culminated as an outcome of a group project at the Colorado School of Mines. The research for this data should be credited to: Stewart Ray, Colleen Olson, Lisa Robibero, Steven Coutts, and Maxwell Sissman of the Planetary and Terrestrial Mining Sciences Symposium and Space Resources Roundtable, Colorado School of Mines.]]
 }
@@ -37,6 +41,7 @@ local treks_3He_Most_Likely_Layer = {
 local treks_3He_Very_Likely_Layer = {
   Identifier = "3He_Very_Likely_Layer",
   Name = [[LRO and Kaguya Multi Instruments 1895.21mpp, 3He Very Likely]],
+  ZIndex = 50,
   FilePath = asset.resource("LRO_and_Kaguya_Multi_Instruments_1895.21mpp/3He_Very_Likely.vrt"),
   Description = [[This data represents potential Helium-3 deposits and other solar wind implanted volatiles on the Moon. This data layer has been generated by querying specific criteria from the following datasets: Titanium Oxide (TiO2) abundance from Lunar Reconnaissance Orbiter&rsquo;s (LRO) Wide-Angle Camera (WAC), Optical Maturity Index (OMAT) from Kaguya Lunar Multiband Imager (MI), slope from LRO&rsquo;s Lunar Orbital Laser Altimeter (LOLA), and Rock Abundance from LRO&rsquo;s Lunar Radiometer Experiment (DIVINER). For this &ldquo;Very Likely&rdquo; layer, the following criteria has been applied: TiO2 &gt; 6.0&percnt;, OMAT &lt; 0.20, Slope &lt; 12&deg;, and rock abundance &lt; 0.06&percnt;. The research on Helium-3 as a potential use for fuel for a fusion cell and the data presented as a result of this research culminated as an outcome of a group project at the Colorado School of Mines. The research for this data should be credited to: Stewart Ray, Colleen Olson, Lisa Robibero, Steven Coutts, and Maxwell Sissman of the Planetary and Terrestrial Mining Sciences Symposium and Space Resources Roundtable, Colorado School of Mines.]]
 }
diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/2000_carbon_monoxide.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/2000_carbon_monoxide.asset
index f80b089ff5..fa12d8d80b 100644
--- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/2000_carbon_monoxide.asset
+++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/2000_carbon_monoxide.asset
@@ -29,6 +29,7 @@ local Layer = {
   Identifier = Identifier,
   Name = Name,
   Enabled = asset.enabled,
+  ZIndex = 100,
   Type = "ImageSequenceTileProvider",
   FolderPath = syncedDirectory .. "1024",
   Description = Description
diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/2004_ir_hurricane.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/2004_ir_hurricane.asset
index e3122e3be3..89c9e1156a 100644
--- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/2004_ir_hurricane.asset
+++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/2004_ir_hurricane.asset
@@ -29,6 +29,7 @@ local Layer = {
   Identifier = Identifier,
   Name = Name,
   Enabled = asset.enabled,
+  ZIndex = 100,
   Type = "TemporalTileProvider",
   Mode = "Folder",
   Folder = {
diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/2005_hurricane-grayir.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/2005_hurricane-grayir.asset
index 54dc62e0eb..f0b22bd66c 100644
--- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/2005_hurricane-grayir.asset
+++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/2005_hurricane-grayir.asset
@@ -26,6 +26,7 @@ local Layer = {
   Identifier = Identifier,
   Name = Name,
   Enabled = asset.enabled,
+  ZIndex = 100,
   Type = "TemporalTileProvider",
   Mode = "Folder",
   Folder = {
diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/2005_hurricane-wvsst.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/2005_hurricane-wvsst.asset
index c0ef080763..25ab407eeb 100644
--- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/2005_hurricane-wvsst.asset
+++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/2005_hurricane-wvsst.asset
@@ -25,6 +25,7 @@ local Layer = {
   Identifier = Identifier,
   Name = Name,
   Enabled = asset.enabled,
+  ZIndex = 100,
   Type = "TemporalTileProvider",
   Mode = "Folder",
   Folder = {
diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/2012_hurricane.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/2012_hurricane.asset
index 3f3e9068a4..705ca684b3 100644
--- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/2012_hurricane.asset
+++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/2012_hurricane.asset
@@ -34,6 +34,7 @@ local LayerNames = {
   Identifier = Identifier .. "-names",
   Name = Name .. " (Names)",
   Type = "ImageSequenceTileProvider",
+  ZIndex = 110,
   FolderPath = namesDestination,
   Description = Description
 }
@@ -42,6 +43,7 @@ local LayerSat = {
   Identifier = Identifier .. "-sat",
   Name = Name .. " (Satellites)",
   Type = "TemporalTileProvider",
+  ZIndex = 100,
   Mode = "Folder",
   Folder = {
     Folder = satDestination,
diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/aerosol_blackcarbon.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/aerosol_blackcarbon.asset
index 9f1f47fd8c..b0297ede98 100644
--- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/aerosol_blackcarbon.asset
+++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/aerosol_blackcarbon.asset
@@ -33,6 +33,7 @@ local Layer = {
   Identifier = Identifier,
   Name = Name,
   Enabled = asset.enabled,
+  ZIndex = 100,
   Type = "ImageSequenceTileProvider",
   FolderPath = syncedDirectory .. "2048_png",
   Description = Description
diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/aerosol_blackcarbon_and_sulfate.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/aerosol_blackcarbon_and_sulfate.asset
index 86bf016ffc..c688942ab6 100644
--- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/aerosol_blackcarbon_and_sulfate.asset
+++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/aerosol_blackcarbon_and_sulfate.asset
@@ -33,6 +33,7 @@ local Layer = {
   Identifier = Identifier,
   Name = Name,
   Enabled = asset.enabled,
+  ZIndex = 100,
   Type = "ImageSequenceTileProvider",
   FolderPath = syncedDirectory .. "2048_png",
   Description = Description
diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/aerosol_sulfate.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/aerosol_sulfate.asset
index 6a7ebd203e..2219c35d48 100644
--- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/aerosol_sulfate.asset
+++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/aerosol_sulfate.asset
@@ -33,6 +33,7 @@ local Layer = {
   Identifier = Identifier,
   Name = Name,
   Enabled = asset.enabled,
+  ZIndex = 100,
   Type = "ImageSequenceTileProvider",
   FolderPath = syncedDirectory .. "2048_png",
   Description = Description
diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/airtraffic.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/airtraffic.asset
index e4d6d301e7..98ee27269f 100644
--- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/airtraffic.asset
+++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/airtraffic.asset
@@ -29,6 +29,7 @@ local Layer = {
   Identifier = Identifier,
   Name = Name,
   Enabled = asset.enabled,
+  ZIndex = 100,
   Type = "ImageSequenceTileProvider",
   FolderPath = syncedDirectory .. "images",
   Description = Description
diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/all_sats.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/all_sats.asset
index 80b2539b4a..34a225c6d4 100644
--- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/all_sats.asset
+++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/all_sats.asset
@@ -33,6 +33,7 @@ local Layer = {
   Identifier = Identifier,
   Name = Name,
   Enabled = asset.enabled,
+  ZIndex = 100,
   Type = "ImageSequenceTileProvider",
   FolderPath = syncedDirectory .. "2048",
   Description = Description
diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/aqua_swath.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/aqua_swath.asset
index 5b7df40b5a..07503c1b82 100644
--- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/aqua_swath.asset
+++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/aqua_swath.asset
@@ -33,6 +33,7 @@ local Layer = {
   Identifier = Identifier,
   Name = Name,
   Enabled = asset.enabled,
+  ZIndex = 100,
   Type = "ImageSequenceTileProvider",
   FolderPath = syncedDirectory .. "images",
   Description = Description
diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/carbonflux.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/carbonflux.asset
index a1f6807fdf..aae85224e2 100644
--- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/carbonflux.asset
+++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/carbonflux.asset
@@ -31,6 +31,7 @@ local Layer = {
   Identifier = Identifier,
   Name = Name,
   Enabled = asset.enabled,
+  ZIndex = 100,
   Type = "ImageSequenceTileProvider",
   FolderPath = syncedDirectory .. "2160",
   Description = Description
diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/carbontracker_2000_2100-fixed_scale.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/carbontracker_2000_2100-fixed_scale.asset
index dd969db107..9396621ca4 100644
--- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/carbontracker_2000_2100-fixed_scale.asset
+++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/carbontracker_2000_2100-fixed_scale.asset
@@ -35,6 +35,7 @@ local LayerField = {
   Identifier = Identifier .. "-field",
   Name = Name .. " (Field)",
   Type = "TemporalTileProvider",
+  ZIndex = 100,
   Mode = "Folder",
   Folder = {
     Folder = fieldDestination,
@@ -49,6 +50,7 @@ local LayerObs = {
   Identifier = Identifier .. "-obs",
   Name = Name .. " (Observed)",
   Type = "TemporalTileProvider",
+  ZIndex = 100,
   Mode = "Folder",
   Folder = {
     Folder = obsDestination,
diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/carbontracker_2000_2100-sliding_scale.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/carbontracker_2000_2100-sliding_scale.asset
index cb1c676a70..866c8b44ad 100644
--- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/carbontracker_2000_2100-sliding_scale.asset
+++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/carbontracker_2000_2100-sliding_scale.asset
@@ -34,6 +34,7 @@ local LayerField = {
   Identifier = Identifier .. "-field",
   Name = Name .. " (Field)",
   Type = "TemporalTileProvider",
+  ZIndex = 100,
   Mode = "Folder",
   Folder = {
     Folder = fieldDestination,
@@ -48,6 +49,7 @@ local LayerObs = {
   Identifier = Identifier .. "-obs",
   Name = Name .. " (Observed)",
   Type = "TemporalTileProvider",
+  ZIndex = 100,
   Mode = "Folder",
   Folder = {
     Folder = obsDestination,
diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/climate_niche.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/climate_niche.asset
index d6fcfabaf8..1b37e5d790 100644
--- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/climate_niche.asset
+++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/climate_niche.asset
@@ -32,6 +32,7 @@ local syncedDirectory = asset.resource({
 local LayerPrecip2020 = {
   Identifier = Identifier .. "-2020",
   Name = Name .. " (2020)",
+  ZIndex = 100,
   FilePath = syncedDirectory .. "temp-precip-2020-current-4096.png",
   Description = Description
 }
@@ -39,6 +40,7 @@ local LayerPrecip2020 = {
 local LayerPrecip2070 = {
   Identifier = Identifier .. "-2070",
   Name = Name .. " (2070)",
+  ZIndex = 100,
   FilePath = syncedDirectory .. "temp-precip-2070-rcp85-4096.png",
   Description = Description
 }
@@ -46,6 +48,7 @@ local LayerPrecip2070 = {
 local LayerMat2020 = {
   Identifier = Identifier .. "-mat2020",
   Name = Name .. " (MAT 2020)",
+  ZIndex = 100,
   FilePath = syncedDirectory .. "MAT-29-2020-4096.png",
   Description = Description
 }
@@ -53,6 +56,7 @@ local LayerMat2020 = {
 local LayerMat2070 = {
   Identifier = Identifier .. "-mat2070",
   Name = Name .. " (MAT 2070)",
+  ZIndex = 100,
   FilePath = syncedDirectory .. "MAT-29-2070-4096.png",
   Description = Description
 }
@@ -61,6 +65,7 @@ local Colorbar = {
   Identifier = Identifier,
   Name = Name,
   Type = "ScreenSpaceImageLocal",
+  ZIndex = 100,
   TexturePath = syncedDirectory .. "niche-scale.png",
   FaceCamera = false,
   CartesianPosition = { 0.0, -0.5, -2.0 }
diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/co_gmd.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/co_gmd.asset
index 557670a013..92c6680de7 100644
--- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/co_gmd.asset
+++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/co_gmd.asset
@@ -33,6 +33,7 @@ local Layer = {
   Identifier = Identifier,
   Name = Name,
   Enabled = asset.enabled,
+  ZIndex = 100,
   Type = "TemporalTileProvider",
   Mode = "Folder",
   Folder = {
diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/fim_chem.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/fim_chem.asset
index 9799f9951c..a6929f82c4 100644
--- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/fim_chem.asset
+++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/fim_chem.asset
@@ -28,6 +28,7 @@ local Layer = {
   Identifier = Identifier,
   Name = Name,
   Enabled = asset.enabled,
+  ZIndex = 100,
   Type = "ImageSequenceTileProvider",
   FolderPath = syncedDirectory .. "composite",
   Description = Description
diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/fossil_fuel.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/fossil_fuel.asset
index fc43fc2b5a..4ad6a85624 100644
--- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/fossil_fuel.asset
+++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/fossil_fuel.asset
@@ -35,6 +35,7 @@ local Layer = {
   Identifier = Identifier,
   Name = Name,
   Enabled = asset.enabled,
+  ZIndex = 100,
   Type = "TemporalTileProvider",
   Mode = "Folder",
   Folder = {
diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/fukushima.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/fukushima.asset
index 6f7c10371b..0c391aec48 100644
--- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/fukushima.asset
+++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/fukushima.asset
@@ -27,6 +27,7 @@ local Layer = {
   Identifier = Identifier,
   Name = Name,
   Enabled = asset.enabled,
+  ZIndex = 100,
   Type = "ImageSequenceTileProvider",
   FolderPath = syncedDirectory .. "2054",
   Description = Description
diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/geo_sat.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/geo_sat.asset
index 6b907476bf..878e2a0be8 100644
--- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/geo_sat.asset
+++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/geo_sat.asset
@@ -31,6 +31,7 @@ local Layer = {
   Identifier = Identifier,
   Name = Name,
   Enabled = asset.enabled,
+  ZIndex = 100,
   Type = "ImageSequenceTileProvider",
   FolderPath = syncedDirectory .. "2048",
   Description = Description
diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/geo_scan.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/geo_scan.asset
index 673b40fff3..ac3ff65ba6 100644
--- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/geo_scan.asset
+++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/geo_scan.asset
@@ -31,6 +31,7 @@ local Layer = {
   Identifier = Identifier,
   Name = Name,
   Enabled = asset.enabled,
+  ZIndex = 100,
   Type = "ImageSequenceTileProvider",
   FolderPath = syncedDirectory .. "2048",
   Description = Description
diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/giss_temp_anom.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/giss_temp_anom.asset
index 3c46da965f..6346323e3b 100644
--- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/giss_temp_anom.asset
+++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/giss_temp_anom.asset
@@ -23,6 +23,7 @@ local Layer = {
   Identifier = Identifier,
   Name = Name,
   Enabled = asset.enabled,
+  ZIndex = 100,
   Type = "ImageSequenceTileProvider",
   FolderPath = syncedDirectory .. "2012",
   Description = Description
diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/globe-insolation.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/globe-insolation.asset
index 882d03bc59..8b447bbe6e 100644
--- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/globe-insolation.asset
+++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/globe-insolation.asset
@@ -27,6 +27,7 @@ local Layer = {
   Identifier = Identifier,
   Name = Name,
   Enabled = asset.enabled,
+  ZIndex = 100,
   Type = "TemporalTileProvider",
   Mode = "Folder",
   Folder = {
diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/globe-rainfall.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/globe-rainfall.asset
index 712af8bc9f..2ce54a037f 100644
--- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/globe-rainfall.asset
+++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/globe-rainfall.asset
@@ -27,6 +27,7 @@ local Layer = {
   Identifier = Identifier,
   Name = Name,
   Enabled = asset.enabled,
+  ZIndex = 100,
   Type = "TemporalTileProvider",
   Mode = "Folder",
   Folder = {
diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/harvey-clouds_precip.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/harvey-clouds_precip.asset
index a5cf15c25c..8fe514d1de 100644
--- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/harvey-clouds_precip.asset
+++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/harvey-clouds_precip.asset
@@ -27,6 +27,7 @@ local Layer = {
   Identifier = Identifier,
   Name = Name,
   Enabled = asset.enabled,
+  ZIndex = 100,
   Type = "TemporalTileProvider",
   Mode = "Folder",
   Folder = {
diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/hurricane_season_2017.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/hurricane_season_2017.asset
index abb12828da..ed8d13a13c 100644
--- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/hurricane_season_2017.asset
+++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/hurricane_season_2017.asset
@@ -31,6 +31,7 @@ local Layer = {
   Identifier = Identifier,
   Name = Name,
   Enabled = asset.enabled,
+  ZIndex = 100,
   Type = "TemporalTileProvider",
   Mode = "Folder",
   Folder = {
diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/hurricane_season_2017_wvsst.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/hurricane_season_2017_wvsst.asset
index 94c7b73a8b..9e6aedd6b8 100644
--- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/hurricane_season_2017_wvsst.asset
+++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/hurricane_season_2017_wvsst.asset
@@ -30,6 +30,7 @@ local Layer = {
   Identifier = Identifier,
   Name = Name,
   Enabled = asset.enabled,
+  ZIndex = 100,
   Type = "TemporalTileProvider",
   Mode = "Folder",
   Folder = {
diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/hurricane_tracks-cumulative.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/hurricane_tracks-cumulative.asset
index 26b8ec90e4..afd07d2d5e 100644
--- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/hurricane_tracks-cumulative.asset
+++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/hurricane_tracks-cumulative.asset
@@ -24,6 +24,7 @@ local Layer = {
   Identifier = Identifier,
   Name = Name,
   Enabled = asset.enabled,
+  ZIndex = 100,
   FilePath = syncedDirectory .. "4096.png",
   Description = Description
 }
diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/isaac.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/isaac.asset
index 05d3d2c136..0c42b6921d 100644
--- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/isaac.asset
+++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/isaac.asset
@@ -31,6 +31,7 @@ local LayerRadar = {
   Identifier = Identifier .. "-radar",
   Name = Name .. " (Radar)",
   Type = "TemporalTileProvider",
+  ZIndex = 100,
   Mode = "Folder",
   Folder = {
     Folder = radarDestination,
@@ -45,6 +46,7 @@ local LayerSat = {
   Identifier = Identifier .. "-sat",
   Name = Name .. " (Sat)",
   Type = "TemporalTileProvider",
+  ZIndex = 100,
   Mode = "Folder",
   Folder = {
     Folder = satDestination,
diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/iss_track.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/iss_track.asset
index 1885b12d30..f6ffe7ab34 100644
--- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/iss_track.asset
+++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/iss_track.asset
@@ -30,6 +30,7 @@ local Layer = {
   Identifier = Identifier,
   Name = Name,
   Enabled = asset.enabled,
+  ZIndex = 100,
   FilePath = syncedDirectory .. "4096.jpg",
   Description = Description
 }
diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/land_temp.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/land_temp.asset
index b7b37a9708..064c9755c0 100644
--- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/land_temp.asset
+++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/land_temp.asset
@@ -28,6 +28,7 @@ local Layer = {
   Name = Name,
   Enabled = asset.enabled,
   Type = "TemporalTileProvider",
+  ZIndex = 100,
   Mode = "Folder",
   Folder = {
     Folder = syncedDirectory .. "4096",
diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/lightning.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/lightning.asset
index 01371824a9..6315169c19 100644
--- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/lightning.asset
+++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/lightning.asset
@@ -27,6 +27,7 @@ local Layer = {
   Identifier = Identifier,
   Name = Name,
   Enabled = asset.enabled,
+  ZIndex = 100,
   FilePath = syncedDirectory .. "2048.jpg",
   Description = Description
 }
diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/ltg_vaisala.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/ltg_vaisala.asset
index 6ded0d0620..4344ae2fb0 100644
--- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/ltg_vaisala.asset
+++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/ltg_vaisala.asset
@@ -33,6 +33,7 @@ local Layer = {
   Name = Name,
   Enabled = asset.enabled,
   Type = "TemporalTileProvider",
+  ZIndex = 100,
   Mode = "Folder",
   Folder = {
     Folder = syncedDirectory .. "2160",
diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/nasa_sats.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/nasa_sats.asset
index 46cf73d447..6cb161b5d8 100644
--- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/nasa_sats.asset
+++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/nasa_sats.asset
@@ -30,6 +30,7 @@ local Layer = {
   Identifier = Identifier,
   Name = Name,
   Enabled = asset.enabled,
+  ZIndex = 100,
   Type = "ImageSequenceTileProvider",
   FolderPath = syncedDirectory .. "2048",
   Description = Description
diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/nccs_models-carbon.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/nccs_models-carbon.asset
index 199a26002f..ff3e3c4f6f 100644
--- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/nccs_models-carbon.asset
+++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/nccs_models-carbon.asset
@@ -27,6 +27,7 @@ local Layer = {
   Identifier = Identifier,
   Name = Name,
   Enabled = asset.enabled,
+  ZIndex = 100,
   Type = "ImageSequenceTileProvider",
   FolderPath = syncedDirectory .. "2048",
   Description = Description
diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/nccs_models-chem.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/nccs_models-chem.asset
index 0861878015..8f5ee2efcc 100644
--- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/nccs_models-chem.asset
+++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/nccs_models-chem.asset
@@ -28,6 +28,7 @@ local Layer = {
   Identifier = Identifier,
   Name = Name,
   Enabled = asset.enabled,
+  ZIndex = 100,
   Type = "TemporalTileProvider",
   Mode = "Folder",
   Folder = {
diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/nccs_models-winds.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/nccs_models-winds.asset
index e59570d7c1..811d2792d9 100644
--- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/nccs_models-winds.asset
+++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/nccs_models-winds.asset
@@ -28,6 +28,7 @@ local Layer = {
   Identifier = Identifier,
   Name = Name,
   Enabled = asset.enabled,
+  ZIndex = 100,
   Type = "TemporalTileProvider",
   Mode = "Folder",
   Folder = {
diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/no2_omsi.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/no2_omsi.asset
index 0b089d56d4..ee4e1b1818 100644
--- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/no2_omsi.asset
+++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/no2_omsi.asset
@@ -28,6 +28,7 @@ local Layer = {
   Identifier = Identifier,
   Name = Name,
   Enabled = asset.enabled,
+  ZIndex = 100,
   Type = "TemporalTileProvider",
   Mode = "Folder",
   Folder = {
diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/noaa_sat-tracks.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/noaa_sat-tracks.asset
index e4ccbcf3f8..0962295b20 100644
--- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/noaa_sat-tracks.asset
+++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/noaa_sat-tracks.asset
@@ -31,6 +31,7 @@ local Layer = {
   Identifier = Identifier,
   Name = Name,
   Enabled = asset.enabled,
+  ZIndex = 100,
   FilePath = syncedDirectory .. "4096.jpg",
   Description = Description
 }
diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/pclim.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/pclim.asset
index b10da7f4b6..87229c9ac4 100644
--- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/pclim.asset
+++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/pclim.asset
@@ -25,6 +25,7 @@ local Layer = {
   Identifier = Identifier,
   Name = Name,
   Enabled = asset.enabled,
+  ZIndex = 100,
   Type = "ImageSequenceTileProvider",
   FolderPath = syncedDirectory .. "raw",
   Description = Description
diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/poes_sat.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/poes_sat.asset
index 72166327b2..212630a9c7 100644
--- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/poes_sat.asset
+++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/poes_sat.asset
@@ -28,6 +28,7 @@ local Layer = {
   Identifier = Identifier,
   Name = Name,
   Enabled = asset.enabled,
+  ZIndex = 100,
   Type = "TemporalTileProvider",
   Mode = "Folder",
   Folder = {
diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/reanalysis-antarctic.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/reanalysis-antarctic.asset
index 3a31ab9c2c..08363c3e6f 100644
--- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/reanalysis-antarctic.asset
+++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/reanalysis-antarctic.asset
@@ -39,6 +39,7 @@ local Layer = {
   Identifier = Identifier,
   Name = Name,
   Enabled = asset.enabled,
+  ZIndex = 100,
   Type = "ImageSequenceTileProvider",
   FolderPath = syncedDirectory .. "2048",
   Description = Description
diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/reanalysis-elnino.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/reanalysis-elnino.asset
index 506e1eed80..f1e201e146 100644
--- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/reanalysis-elnino.asset
+++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/reanalysis-elnino.asset
@@ -39,6 +39,7 @@ local Layer = {
   Identifier = Identifier,
   Name = Name,
   Enabled = asset.enabled,
+  ZIndex = 100,
   Type = "ImageSequenceTileProvider",
   FolderPath = syncedDirectory .. "2048",
   Description = Description
diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/reanalysis-hurricane.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/reanalysis-hurricane.asset
index 5f075a0882..a5debb4d47 100644
--- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/reanalysis-hurricane.asset
+++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/reanalysis-hurricane.asset
@@ -39,6 +39,7 @@ local Layer = {
   Identifier = Identifier,
   Name = Name,
   Enabled = asset.enabled,
+  ZIndex = 100,
   Type = "ImageSequenceTileProvider",
   FolderPath = syncedDirectory .. "2048_png",
   Description = Description
diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/sandy.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/sandy.asset
index 993858da9d..11fed820a2 100644
--- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/sandy.asset
+++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/sandy.asset
@@ -23,6 +23,7 @@ local Layer = {
   Identifier = Identifier,
   Name = Name,
   Enabled = asset.enabled,
+  ZIndex = 100,
   Type = "TemporalTileProvider",
   Mode = "Folder",
   Folder = {
diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/sunsync_sat.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/sunsync_sat.asset
index 5642468f42..394ad79d7e 100644
--- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/sunsync_sat.asset
+++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/sunsync_sat.asset
@@ -28,6 +28,7 @@ local Layer = {
   Identifier = Identifier,
   Name = Name,
   Enabled = asset.enabled,
+  ZIndex = 100,
   Type = "TemporalTileProvider",
   Mode = "Folder",
   Folder = {
diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/temp_anom.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/temp_anom.asset
index 7371f9ffca..375f86f3c7 100644
--- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/temp_anom.asset
+++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/temp_anom.asset
@@ -31,6 +31,7 @@ local Layer = {
   Identifier = Identifier,
   Name = Name,
   Enabled = asset.enabled,
+  ZIndex = 100,
   Type = "TemporalTileProvider",
   Mode = "Folder",
   Folder = {
diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/tropical_widening.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/tropical_widening.asset
index b06c47520c..31dd772bfc 100644
--- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/tropical_widening.asset
+++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/tropical_widening.asset
@@ -21,6 +21,7 @@ local Layer = {
   Identifier = Identifier,
   Name = Name,
   Enabled = asset.enabled,
+  ZIndex = 100,
   FilePath = syncedDirectory .. "2048.png",
   Description = Description
 }
diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/typhoon_haiyan-wvsst.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/typhoon_haiyan-wvsst.asset
index 49387eaf9c..9aaaace55c 100644
--- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/typhoon_haiyan-wvsst.asset
+++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/typhoon_haiyan-wvsst.asset
@@ -25,6 +25,7 @@ local Layer = {
   Identifier = Identifier,
   Name = Name,
   Enabled = asset.enabled,
+  ZIndex = 100,
   Type = "ImageSequenceTileProvider",
   FolderPath = syncedDirectory .. "2048",
   Description = Description
diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/typhoon_haiyan.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/typhoon_haiyan.asset
index 1895f32d98..3b1984b040 100644
--- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/typhoon_haiyan.asset
+++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/typhoon_haiyan.asset
@@ -25,6 +25,7 @@ local Layer = {
   Identifier = Identifier,
   Name = Name,
   Enabled = asset.enabled,
+  ZIndex = 100,
   Type = "TemporalTileProvider",
   Mode = "Folder",
   Folder = {
diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/volcano_ash.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/volcano_ash.asset
index bcb98981e5..66cb0a84a1 100644
--- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/volcano_ash.asset
+++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/volcano_ash.asset
@@ -31,6 +31,7 @@ local Layer = {
   Identifier = Identifier,
   Name = Name,
   Enabled = asset.enabled,
+  ZIndex = 100,
   Type = "ImageSequenceTileProvider",
   FolderPath = syncedDirectory .. "2992",
   Description = Description
diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/agriculture-cropland.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/agriculture-cropland.asset
index d2dc1af89d..96eea703b8 100644
--- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/agriculture-cropland.asset
+++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/agriculture-cropland.asset
@@ -26,6 +26,7 @@ local Layer = {
   Identifier = Identifier,
   Name = Name,
   Enabled = asset.enabled,
+  ZIndex = 100,
   FilePath = syncedDirectory .. "4096.png",
   Description = Description
 }
@@ -34,6 +35,7 @@ local LayerCountries = {
   Identifier = Identifier .. "-countries",
   Name = Name .. " (w/ countries)",
   Enabled = asset.enabled,
+  ZIndex = 100,
   FilePath = syncedDirectory .. "4096_countries.png",
   Description = Description
 }
diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/agriculture-pastureland.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/agriculture-pastureland.asset
index 83900b4dab..5b8732bf5b 100644
--- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/agriculture-pastureland.asset
+++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/agriculture-pastureland.asset
@@ -26,6 +26,7 @@ local Layer = {
   Identifier = Identifier,
   Name = Name,
   Enabled = asset.enabled,
+  ZIndex = 100,
   FilePath = syncedDirectory .. "4096.png",
   Description = Description
 }
@@ -34,6 +35,7 @@ local LayerCountries = {
   Identifier = Identifier .. "-countries",
   Name = Name .. " (w/ countries)",
   Enabled = asset.enabled,
+  ZIndex = 100,
   FilePath = syncedDirectory .. "4096_countries.png",
   Description = Description
 }
diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/birds.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/birds.asset
index 8d39b8a6b7..f33a397bb1 100644
--- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/birds.asset
+++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/birds.asset
@@ -26,6 +26,7 @@ local Layer = {
   Identifier = Identifier,
   Name = Name,
   Enabled = asset.enabled,
+  ZIndex = 100,
   Type = "ImageSequenceTileProvider",
   FolderPath = syncedDirectory .. "birds",
   Description = Description
@@ -35,6 +36,7 @@ local Colorbar = {
   Identifier = Identifier,
   Name = Name,
   Enabled = asset.enabled,
+  ZIndex = 100,
   Type = "ScreenSpaceImageLocal",
   TexturePath = syncedDirectory .. "colorbar.png",
   FaceCamera = false,
diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/blue_marble-blue_marble.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/blue_marble-blue_marble.asset
index 58c755df20..3db367b798 100644
--- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/blue_marble-blue_marble.asset
+++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/blue_marble-blue_marble.asset
@@ -29,6 +29,7 @@ local Layer = {
   Identifier = Identifier,
   Name = Name,
   Enabled = asset.enabled,
+  ZIndex = 100,
   FilePath = syncedDirectory .. "4096.jpg",
   Description = Description,
   CacheSettings = { Enabled = false }
diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/blue_marble-blue_marble_topo.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/blue_marble-blue_marble_topo.asset
index 8d59f9a4e8..12fec7881d 100644
--- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/blue_marble-blue_marble_topo.asset
+++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/blue_marble-blue_marble_topo.asset
@@ -26,6 +26,7 @@ local Layer = {
   Identifier = Identifier,
   Name = Name,
   Enabled = asset.enabled,
+  ZIndex = 100,
   Type = "TemporalTileProvider",
   Mode = "Folder",
   Folder = {
diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/blue_marble-blue_marble_topo_bathy.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/blue_marble-blue_marble_topo_bathy.asset
index 99b4c8d412..4c53ccbdcd 100644
--- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/blue_marble-blue_marble_topo_bathy.asset
+++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/blue_marble-blue_marble_topo_bathy.asset
@@ -26,6 +26,7 @@ local Layer = {
   Identifier = Identifier,
   Name = Name,
   Enabled = asset.enabled,
+  ZIndex = 100,
   Type = "TemporalTileProvider",
   Mode = "Folder",
   Folder = {
diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/blue_marble-nightlights.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/blue_marble-nightlights.asset
index 37c2d7ef41..4472571e4c 100644
--- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/blue_marble-nightlights.asset
+++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/blue_marble-nightlights.asset
@@ -33,6 +33,7 @@ local Layer = {
   Identifier = Identifier,
   Name = Name,
   Enabled = asset.enabled,
+  ZIndex = 100,
   Type = "ImageSequenceTileProvider",
   FolderPath = syncedDirectory .. "images",
   Description = Description
diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/blue_marble-seasonal_blue_marble.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/blue_marble-seasonal_blue_marble.asset
index e5984b1c27..6138a385af 100644
--- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/blue_marble-seasonal_blue_marble.asset
+++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/blue_marble-seasonal_blue_marble.asset
@@ -27,6 +27,7 @@ local Layer = {
   Identifier = Identifier,
   Name = Name,
   Enabled = asset.enabled,
+  ZIndex = 100,
   Type = "TemporalTileProvider",
   Mode = "Folder",
   Folder = {
diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/dams-global.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/dams-global.asset
index b4175be9ed..92e3817647 100644
--- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/dams-global.asset
+++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/dams-global.asset
@@ -25,6 +25,7 @@ local Layer = {
   Identifier = Identifier,
   Name = Name,
   Type = "ImageSequenceTileProvider",
+  ZIndex = 100,
   FolderPath = syncedDirectory .. "4096",
   Description = Description
 }
diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/dams-mississippi.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/dams-mississippi.asset
index 4f56658289..a017dcb157 100644
--- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/dams-mississippi.asset
+++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/dams-mississippi.asset
@@ -25,6 +25,7 @@ local Layer = {
   Identifier = Identifier,
   Name = Name,
   Enabled = asset.enabled,
+  ZIndex = 100,
   Type = "ImageSequenceTileProvider",
   FolderPath = syncedDirectory .. "4096",
   Description = Description
diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/dams-yangtze.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/dams-yangtze.asset
index 83574adc63..dca2ad1923 100644
--- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/dams-yangtze.asset
+++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/dams-yangtze.asset
@@ -25,6 +25,7 @@ local Layer = {
   Identifier = Identifier,
   Name = Name,
   Enabled = asset.enabled,
+  ZIndex = 100,
   Type = "ImageSequenceTileProvider",
   FolderPath = syncedDirectory .. "4096",
   Description = Description
diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/day_night-06z_only.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/day_night-06z_only.asset
index 530348ea91..ba81ddaf0a 100644
--- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/day_night-06z_only.asset
+++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/day_night-06z_only.asset
@@ -27,6 +27,7 @@ local Layer = {
   Identifier = Identifier,
   Name = Name,
   Enabled = asset.enabled,
+  ZIndex = 100,
   Type = "TemporalTileProvider",
   Mode = "Folder",
   Folder = {
diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/day_night-full_year.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/day_night-full_year.asset
index 8fe830bb97..beef9f1bb0 100644
--- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/day_night-full_year.asset
+++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/day_night-full_year.asset
@@ -28,6 +28,7 @@ local Layer = {
   Identifier = Identifier,
   Name = Name,
   Enabled = asset.enabled,
+  ZIndex = 100,
   Type = "TemporalTileProvider",
   Mode = "Folder",
   Folder = {
diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/day_night-oneday.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/day_night-oneday.asset
index df43c5ec61..8d914aeed2 100644
--- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/day_night-oneday.asset
+++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/day_night-oneday.asset
@@ -26,6 +26,7 @@ local Layer = {
   Identifier = Identifier,
   Name = Name,
   Enabled = asset.enabled,
+  ZIndex = 100,
   Type = "ImageSequenceTileProvider",
   FolderPath = syncedDirectory .. "2048",
   Description = Description
diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/earth_night-1992_2002.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/earth_night-1992_2002.asset
index 003584eabf..026e31f028 100644
--- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/earth_night-1992_2002.asset
+++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/earth_night-1992_2002.asset
@@ -24,6 +24,7 @@ local syncedDirectory = asset.resource({
 local Layer1992 = {
   Identifier = Identifier .. "-1992",
   Name = Name .. " (1992)",
+  ZIndex = 100,
   FilePath = syncedDirectory .. "Nightlights_1992.jpg",
   Description = Description
 }
@@ -31,6 +32,7 @@ local Layer1992 = {
 local Layer2002 = {
   Identifier = Identifier .. "-2002",
   Name = Name .. " (2002)",
+  ZIndex = 100,
   FilePath = syncedDirectory .. "Nightlights_2002.jpg",
   Description = Description
 }
diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/earth_night-1992_2008.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/earth_night-1992_2008.asset
index 336b374623..cb162e7c12 100644
--- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/earth_night-1992_2008.asset
+++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/earth_night-1992_2008.asset
@@ -25,6 +25,7 @@ local Layer = {
   Identifier = Identifier,
   Name = Name,
   Enabled = asset.enabled,
+  ZIndex = 100,
   FilePath = syncedDirectory .. "8000.png",
   Description = Description
 }
diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/earth_night-1992_2009.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/earth_night-1992_2009.asset
index d5fbd4c977..5111e7a3f8 100644
--- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/earth_night-1992_2009.asset
+++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/earth_night-1992_2009.asset
@@ -25,6 +25,7 @@ local Layer = {
   Identifier = Identifier,
   Name = Name,
   Enabled = asset.enabled,
+  ZIndex = 100,
   FilePath = syncedDirectory .. "5000.png",
   Description = Description
 }
diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/earth_night-2012.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/earth_night-2012.asset
index 82a44ade54..afab4a153f 100644
--- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/earth_night-2012.asset
+++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/earth_night-2012.asset
@@ -23,6 +23,7 @@ local Layer = {
   Identifier = Identifier,
   Name = Name,
   Enabled = asset.enabled,
+  ZIndex = 100,
   FilePath = syncedDirectory .. "3600.jpg",
   Description = Description
 }
diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/earth_night-color_nightlights.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/earth_night-color_nightlights.asset
index 4b092c15ec..1fffb22dd7 100644
--- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/earth_night-color_nightlights.asset
+++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/earth_night-color_nightlights.asset
@@ -28,6 +28,7 @@ local Layer = {
   Identifier = Identifier,
   Name = Name,
   Enabled = asset.enabled,
+  ZIndex = 100,
   FilePath = syncedDirectory .. "4096.png",
   Description = Description
 }
diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/earth_night-nightlights.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/earth_night-nightlights.asset
index dec6df226a..eabe255505 100644
--- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/earth_night-nightlights.asset
+++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/earth_night-nightlights.asset
@@ -28,6 +28,7 @@ local Layer = {
   Identifier = Identifier,
   Name = Name,
   Enabled = asset.enabled,
+  ZIndex = 100,
   FilePath = syncedDirectory .. "4800.jpg",
   Description = Description
 }
diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/earthquake-1980_1995_quakes.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/earthquake-1980_1995_quakes.asset
index 3eb6fb3f2f..3dc52e5510 100644
--- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/earthquake-1980_1995_quakes.asset
+++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/earthquake-1980_1995_quakes.asset
@@ -34,6 +34,7 @@ local Layer = {
   Identifier = Identifier,
   Name = Name,
   Enabled = asset.enabled,
+  ZIndex = 100,
   Type = "ImageSequenceTileProvider",
   FolderPath = syncedDirectory .. "1024",
   Description = Description
diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/earthquake-2001_2015.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/earthquake-2001_2015.asset
index 5feb93ace6..f5eb527874 100644
--- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/earthquake-2001_2015.asset
+++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/earthquake-2001_2015.asset
@@ -29,6 +29,7 @@ local syncedDirectory = asset.resource({
 local LayerAllquakes = {
   Identifier = Identifier .. "-allquakes",
   Name = Name .. " (All Quakes)",
+  ZIndex = 100,
   FilePath = syncedDirectory .. "All_Quakes_2001-2015_4k.jpg",
   Description = Description
 }
@@ -36,6 +37,7 @@ local LayerAllquakes = {
 local LayerQuakeBasemap = {
   Identifier = Identifier .. "-quake-basemap",
   Name = Name .. " (Quake Basemap)",
+  ZIndex = 100,
   FilePath = syncedDirectory .. "quake_basemap_4k.jpg",
   Description = Description
 }
@@ -43,6 +45,7 @@ local LayerQuakeBasemap = {
 local LayerTsunamiBasemap = {
   Identifier = Identifier .. "-tsunami-basemap",
   Name = Name .. " (Tsunami Basemap)",
+  ZIndex = 100,
   FilePath = syncedDirectory .. "Tsunami_basemap_4k.jpg",
   Description = Description
 }
@@ -50,6 +53,7 @@ local LayerTsunamiBasemap = {
 local LayerQuakesGte6p5 = {
   Identifier = Identifier .. "-gte6_5",
   Name = Name .. " (GTE 6.5)",
+  ZIndex = 100,
   FilePath = syncedDirectory .. "Quakes_gte6.5_2001-2015_4k.jpg",
   Description = Description
 }
@@ -57,6 +61,7 @@ local LayerQuakesGte6p5 = {
 local LayerQuakesGte8 = {
   Identifier = Identifier .. "-gte8",
   Name = Name .. " (GTE 8.0)",
+  ZIndex = 100,
   FilePath = syncedDirectory .. "Quakes_gte8_2001-2015_4k.jpg",
   Description = Description
 }
diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/earthquakes_1901_2000.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/earthquakes_1901_2000.asset
index be3f75493d..d6b804c171 100644
--- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/earthquakes_1901_2000.asset
+++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/earthquakes_1901_2000.asset
@@ -30,6 +30,7 @@ local syncedDirectory = asset.resource({
 local LayerAllquakes = {
   Identifier = Identifier .. "-allquakes",
   Name = Name .. " (All Quakes)",
+  ZIndex = 100,
   FilePath = syncedDirectory .. "All_Quakes_1901-2000_4k.jpg",
   Description = Description
 }
@@ -37,6 +38,7 @@ local LayerAllquakes = {
 local LayerQuakeBasemap = {
   Identifier = Identifier .. "-quake-basemap",
   Name = Name .. " (Quake Basemap)",
+  ZIndex = 100,
   FilePath = syncedDirectory .. "quake_basemap_4k.jpg",
   Description = Description
 }
@@ -44,6 +46,7 @@ local LayerQuakeBasemap = {
 local LayerPlateBoundaries = {
   Identifier = Identifier .. "-plate_boundaries",
   Name = Name .. " (Plate Boundaries)",
+  ZIndex = 100,
   FilePath = syncedDirectory .. "Plate_Boundaries_4k.jpg",
   Description = Description
 }
@@ -51,6 +54,7 @@ local LayerPlateBoundaries = {
 local LayerQuakesGte6p5 = {
   Identifier = Identifier .. "-gte6_5",
   Name = Name .. " (GTE 6.5)",
+  ZIndex = 100,
   FilePath = syncedDirectory .. "Quakes_gte6.5_1901-2000_4k.jpg",
   Description = Description
 }
@@ -58,6 +62,7 @@ local LayerQuakesGte6p5 = {
 local LayerQuakesGte8 = {
   Identifier = Identifier .. "-gte8",
   Name = Name .. " (GTE 8.0)",
+  ZIndex = 100,
   FilePath = syncedDirectory .. "Quakes_gte8_1901-2000_4k.jpg",
   Description = Description
 }
diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/earthquakes_and_eruptions.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/earthquakes_and_eruptions.asset
index b16a81bb6b..5c9d3af6bc 100644
--- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/earthquakes_and_eruptions.asset
+++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/earthquakes_and_eruptions.asset
@@ -27,6 +27,7 @@ local Layer = {
   Identifier = Identifier,
   Name = Name,
   Enabled = asset.enabled,
+  ZIndex = 100,
   Type = "ImageSequenceTileProvider",
   FolderPath = syncedDirectory .. "4096",
   Description = Description
diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/earths_magnetism_magnetic_lines.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/earths_magnetism_magnetic_lines.asset
index 7200450a55..90353a8cd8 100644
--- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/earths_magnetism_magnetic_lines.asset
+++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/earths_magnetism_magnetic_lines.asset
@@ -32,6 +32,7 @@ local Layer = {
   Identifier = Identifier,
   Name = Name,
   Enabled = asset.enabled,
+  ZIndex = 100,
   Type = "TemporalTileProvider",
   Mode = "Folder",
   Folder = {
diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/earths_magnetism_magnets.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/earths_magnetism_magnets.asset
index 3a29cb1ed8..928e30e917 100644
--- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/earths_magnetism_magnets.asset
+++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/earths_magnetism_magnets.asset
@@ -32,6 +32,7 @@ local Layer = {
   Identifier = Identifier,
   Name = Name,
   Enabled = asset.enabled,
+  ZIndex = 100,
   Type = "TemporalTileProvider",
   Mode = "Folder",
   Folder = {
diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/etopo1.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/etopo1.asset
index 4c888bcca8..3e606c2d5b 100644
--- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/etopo1.asset
+++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/etopo1.asset
@@ -28,6 +28,7 @@ local Layer = {
   Identifier = Identifier,
   Name = Name,
   Enabled = asset.enabled,
+  ZIndex = 100,
   FilePath = syncedDirectory .. "4096.jpg",
   Description = Description
 }
diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/etopo2-earth_bright.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/etopo2-earth_bright.asset
index 9dfc2e090e..8f18838347 100644
--- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/etopo2-earth_bright.asset
+++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/etopo2-earth_bright.asset
@@ -26,6 +26,7 @@ local Layer = {
   Identifier = Identifier,
   Name = Name,
   Enabled = asset.enabled,
+  ZIndex = 100,
   FilePath = syncedDirectory .. "10800.jpg",
   Description = Description
 }
diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/etopo2-earth_color.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/etopo2-earth_color.asset
index 82cb62fbf4..08d43e4fc2 100644
--- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/etopo2-earth_color.asset
+++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/etopo2-earth_color.asset
@@ -26,6 +26,7 @@ local Layer = {
   Identifier = Identifier,
   Name = Name,
   Enabled = asset.enabled,
+  ZIndex = 100,
   FilePath = syncedDirectory .. "7200.jpg",
   Description = Description
 }
diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/etopo2-earth_shaded.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/etopo2-earth_shaded.asset
index 5676c1f385..c11905f171 100644
--- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/etopo2-earth_shaded.asset
+++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/etopo2-earth_shaded.asset
@@ -26,6 +26,7 @@ local Layer = {
   Identifier = Identifier,
   Name = Name,
   Enabled = asset.enabled,
+  ZIndex = 100,
   FilePath = syncedDirectory .. "5400.jpg",
   Description = Description
 }
diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/etopo2-earth_topo.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/etopo2-earth_topo.asset
index ce1530cc6f..d952be3de1 100644
--- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/etopo2-earth_topo.asset
+++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/etopo2-earth_topo.asset
@@ -29,6 +29,7 @@ local Layer = {
   Identifier = Identifier,
   Name = Name,
   Enabled = asset.enabled,
+  ZIndex = 100,
   FilePath = syncedDirectory .. "4096.jpg",
   Description = Description
 }
diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/etopo2-landsat.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/etopo2-landsat.asset
index 78a8f15a7f..b4837ee6a6 100644
--- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/etopo2-landsat.asset
+++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/etopo2-landsat.asset
@@ -25,6 +25,7 @@ local Layer = {
   Identifier = Identifier,
   Name = Name,
   Enabled = asset.enabled,
+  ZIndex = 100,
   FilePath = syncedDirectory .. "4096.jpg",
   Description = Description
 }
diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/fire.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/fire.asset
index d0ff98dec5..4305d6e40b 100644
--- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/fire.asset
+++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/fire.asset
@@ -30,6 +30,7 @@ local Layer = {
   Identifier = Identifier,
   Name = Name,
   Enabled = asset.enabled,
+  ZIndex = 100,
   Type = "TemporalTileProvider",
   Mode = "Folder",
   Folder = {
diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/fire_veg.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/fire_veg.asset
index f7a85b0659..7fb2a44f9e 100644
--- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/fire_veg.asset
+++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/fire_veg.asset
@@ -29,6 +29,7 @@ local Layer = {
   Identifier = Identifier,
   Name = Name,
   Enabled = asset.enabled,
+  ZIndex = 100,
   Type = "ImageSequenceTileProvider",
   FolderPath = syncedDirectory .. "2048",
   Description = Description
diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/flooding-displaced_250.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/flooding-displaced_250.asset
index 04666ec168..b793163179 100644
--- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/flooding-displaced_250.asset
+++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/flooding-displaced_250.asset
@@ -29,6 +29,7 @@ local Layer = {
   Identifier = Identifier,
   Name = Name,
   Enabled = asset.enabled,
+  ZIndex = 100,
   FilePath = syncedDirectory .. "3600.png",
   Description = Description
 }
@@ -37,6 +38,7 @@ local LayerNight = {
   Identifier = Identifier .. "-night",
   Name = Name .. " (Night)",
   Enabled = asset.enabled,
+  ZIndex = 100,
   FilePath = syncedDirectory .. "4096_night.jpg",
   Description = Description
 }
diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/flooding-fatal.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/flooding-fatal.asset
index f41a83c311..dc18e53407 100644
--- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/flooding-fatal.asset
+++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/flooding-fatal.asset
@@ -29,6 +29,7 @@ local Layer = {
   Identifier = Identifier,
   Name = Name,
   Enabled = asset.enabled,
+  ZIndex = 100,
   FilePath = syncedDirectory .. "3600.png",
   Description = Description
 }
@@ -37,6 +38,7 @@ local LayerNight = {
   Identifier = Identifier .. "-night",
   Name = Name .. " (Night)",
   Enabled = asset.enabled,
+  ZIndex = 100,
   FilePath = syncedDirectory .. "4096_night.jpg",
   Description = Description
 }
diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/flooding-heavy_rain.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/flooding-heavy_rain.asset
index 58c8536244..8d29cfae53 100644
--- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/flooding-heavy_rain.asset
+++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/flooding-heavy_rain.asset
@@ -29,6 +29,7 @@ local Layer = {
   Identifier = Identifier,
   Name = Name,
   Enabled = asset.enabled,
+  ZIndex = 100,
   FilePath = syncedDirectory .. "3600.png",
   Description = Description
 }
@@ -37,6 +38,7 @@ local LayerNight = {
   Identifier = Identifier .. "-night",
   Name = Name .. " (Night)",
   Enabled = asset.enabled,
+  ZIndex = 100,
   FilePath = syncedDirectory .. "4096_night.jpg",
   Description = Description
 }
diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/flooding-major_floods.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/flooding-major_floods.asset
index 5b24cf1dc2..d08e41b22c 100644
--- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/flooding-major_floods.asset
+++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/flooding-major_floods.asset
@@ -29,6 +29,7 @@ local Layer = {
   Identifier = Identifier,
   Name = Name,
   Enabled = asset.enabled,
+  ZIndex = 100,
   FilePath = syncedDirectory .. "4096.jpg",
   Description = Description
 }
@@ -37,6 +38,7 @@ local LayerFloods = {
   Identifier = Identifier .. "-floods",
   Name = Name .. " (Floods)",
   Enabled = asset.enabled,
+  ZIndex = 100,
   FilePath = syncedDirectory .. "flood_3600.png",
   Description = Description
 }
diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/food_v_feed.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/food_v_feed.asset
index 410c898ef2..0687a84aa8 100644
--- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/food_v_feed.asset
+++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/food_v_feed.asset
@@ -24,6 +24,7 @@ local Layer = {
   Identifier = Identifier,
   Name = Name,
   Enabled = asset.enabled,
+  ZIndex = 100,
   FilePath = syncedDirectory .. "4096.png",
   Description = Description
 }
@@ -32,6 +33,7 @@ local LayerCountries = {
   Identifier = Identifier .. "-countries",
   Name = Name .. " (w/ countries)",
   Enabled = asset.enabled,
+  ZIndex = 100,
   FilePath = syncedDirectory .. "4096_countries.png",
   Description = Description
 }
diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/forests.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/forests.asset
index 682e404b0e..247e24cc8a 100644
--- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/forests.asset
+++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/forests.asset
@@ -24,6 +24,7 @@ local syncedDirectory = asset.resource({
 local LayerCombined = {
   Identifier = Identifier,
   Name = Name,
+  ZIndex = 100,
   FilePath = syncedDirectory .. "combined.png",
   Description = Description
 }
@@ -31,6 +32,7 @@ local LayerCombined = {
 local LayerExtent = {
   Identifier = Identifier .. "-extent",
   Name = Name .. " (Extent)",
+  ZIndex = 100,
   FilePath = syncedDirectory .. "extent.png",
   Description = Description
 }
@@ -38,6 +40,7 @@ local LayerExtent = {
 local LayerGain = {
   Identifier = Identifier .. "-gain",
   Name = Name .. " (Gain)",
+  ZIndex = 100,
   FilePath = syncedDirectory .. "gain.png",
   Description = Description
 }
@@ -45,6 +48,7 @@ local LayerGain = {
 local LayerLoss = {
   Identifier = Identifier .. "-loss",
   Name = Name .. " (Loss)",
+  ZIndex = 100,
   FilePath = syncedDirectory .. "loss.png",
   Description = Description
 }
@@ -52,6 +56,7 @@ local LayerLoss = {
 local LayerMap = {
   Identifier = Identifier .. "-map",
   Name = Name .. " (Map)",
+  ZIndex = 100,
   FilePath = syncedDirectory .. "map.png",
   Description = Description
 }
diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/geomag_tracklines.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/geomag_tracklines.asset
index d9fb82ea75..09ee921105 100644
--- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/geomag_tracklines.asset
+++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/geomag_tracklines.asset
@@ -25,6 +25,7 @@ local Layer = {
   Identifier = Identifier,
   Name = Name,
   Enabled = asset.enabled,
+  ZIndex = 100,
   FilePath = syncedDirectory .. "4096.png",
   Description = Description
 }
diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/global_vegetation.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/global_vegetation.asset
index 93c92af7a6..dc5160079e 100644
--- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/global_vegetation.asset
+++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/global_vegetation.asset
@@ -29,6 +29,7 @@ local Background1Layer = {
   Identifier = Identifier .. "-background-14a",
   Name = Name .. " (Background Week 14a)",
   Enabled = asset.enabled,
+  ZIndex = 100,
   FilePath = syncedDirectory .. "2012_week14a.png",
   Description = Description
 }
@@ -37,6 +38,7 @@ local Background2Layer = {
   Identifier = Identifier .. "-background-14",
   Name = Name .. " (Background Week 14)",
   Enabled = asset.enabled,
+  ZIndex = 100,
   FilePath = syncedDirectory .. "2012week14.png",
   Description = Description
 }
@@ -45,6 +47,7 @@ local Layer = {
   Identifier = Identifier,
   Name = Name,
   Enabled = asset.enabled,
+  ZIndex = 100,
   Type = "TemporalTileProvider",
   Mode = "Folder",
   Folder = {
diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/gray_earth.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/gray_earth.asset
index 334b16fcd0..ac082c385b 100644
--- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/gray_earth.asset
+++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/gray_earth.asset
@@ -36,6 +36,7 @@ local Layer = {
   Identifier = Identifier,
   Name = Name,
   Enabled = asset.enabled,
+  ZIndex = 100,
   FilePath = syncedDirectory .. "4096.png",
   Description = Description
 }
diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/hot_topo.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/hot_topo.asset
index 74f0e33e84..39d1b0e9a7 100644
--- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/hot_topo.asset
+++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/hot_topo.asset
@@ -34,6 +34,7 @@ local Layer = {
   Identifier = Identifier,
   Name = Name,
   Enabled = asset.enabled,
+  ZIndex = 100,
   Type = "ImageSequenceTileProvider",
   FolderPath = syncedDirectory .. "images",
   Description = Description
diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/irsat_nightlights.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/irsat_nightlights.asset
index fd2d9bc973..6e0d823664 100644
--- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/irsat_nightlights.asset
+++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/irsat_nightlights.asset
@@ -27,6 +27,7 @@ local Layer = {
   Identifier = Identifier,
   Name = Name,
   Enabled = asset.enabled,
+  ZIndex = 100,
   Type = "ImageSequenceTileProvider",
   FolderPath = syncedDirectory .. "2048",
   Description = Description
diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/japan_quake.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/japan_quake.asset
index 0cbb716b0e..c5d7bfbaad 100644
--- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/japan_quake.asset
+++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/japan_quake.asset
@@ -27,6 +27,7 @@ local Layer = {
   Identifier = Identifier,
   Name = Name,
   Enabled = asset.enabled,
+  ZIndex = 100,
   Type = "ImageSequenceTileProvider",
   FolderPath = syncedDirectory .. "2048",
   Description = Description
diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/koppen_climate-koppen_1901_2100.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/koppen_climate-koppen_1901_2100.asset
index 3f6c43a626..cb5b63f4ab 100644
--- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/koppen_climate-koppen_1901_2100.asset
+++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/koppen_climate-koppen_1901_2100.asset
@@ -27,6 +27,7 @@ local Layer = {
   Identifier = Identifier,
   Name = Name,
   Enabled = asset.enabled,
+  ZIndex = 100,
   Type = "ImageSequenceTileProvider",
   FolderPath = syncedDirectory .. "4096",
   Description = Description
diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/koppen_climate-koppen_2007.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/koppen_climate-koppen_2007.asset
index 5a48702002..2ea8111b99 100644
--- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/koppen_climate-koppen_2007.asset
+++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/koppen_climate-koppen_2007.asset
@@ -26,6 +26,7 @@ local Layer = {
   Identifier = Identifier,
   Name = Name,
   Enabled = asset.enabled,
+  ZIndex = 100,
   FilePath = syncedDirectory .. "4096.jpg",
   Description = Description
 }
diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/land_cover-animation.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/land_cover-animation.asset
index 74312c68ec..cec63a922c 100644
--- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/land_cover-animation.asset
+++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/land_cover-animation.asset
@@ -32,6 +32,7 @@ local Layer = {
   Identifier = Identifier,
   Name = Name,
   Enabled = asset.enabled,
+  ZIndex = 100,
   Type = "ImageSequenceTileProvider",
   FolderPath = syncedDirectory .. "3600",
   Description = Description
diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/land_cover-ribbon.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/land_cover-ribbon.asset
index 4daf011126..8bf5373bb7 100644
--- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/land_cover-ribbon.asset
+++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/land_cover-ribbon.asset
@@ -31,6 +31,7 @@ local Layer = {
   Identifier = Identifier,
   Name = Name,
   Enabled = asset.enabled,
+  ZIndex = 100,
   FilePath = syncedDirectory .. "2048.jpg",
   Description = Description
 }
diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/land_cover-slideshow.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/land_cover-slideshow.asset
index 64f938d1ef..190b6b4cb9 100644
--- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/land_cover-slideshow.asset
+++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/land_cover-slideshow.asset
@@ -34,6 +34,7 @@ local Layer = {
   Identifier = Identifier,
   Name = Name,
   Enabled = asset.enabled,
+  ZIndex = 100,
   FilePath = syncedDirectory .. "2048.jpg",
   Description = Description
 }
diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/land_production-cropland_current.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/land_production-cropland_current.asset
index 139b6eda91..33872d98d3 100644
--- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/land_production-cropland_current.asset
+++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/land_production-cropland_current.asset
@@ -26,6 +26,7 @@ local Layer = {
   Identifier = Identifier,
   Name = Name,
   Enabled = asset.enabled,
+  ZIndex = 100,
   FilePath = syncedDirectory .. "4096.png",
   Description = Description
 }
@@ -34,6 +35,7 @@ local LayerCountries = {
   Identifier = Identifier .. "-countries",
   Name = Name .. " (w/ countries)",
   Enabled = asset.enabled,
+  ZIndex = 100,
   FilePath = syncedDirectory .. "4096_countries.png",
   Description = Description
 }
diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/land_production-cropland_potential.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/land_production-cropland_potential.asset
index cf1b64cd85..5383a34f72 100644
--- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/land_production-cropland_potential.asset
+++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/land_production-cropland_potential.asset
@@ -25,6 +25,7 @@ local Layer = {
   Identifier = Identifier,
   Name = Name,
   Enabled = asset.enabled,
+  ZIndex = 100,
   FilePath = syncedDirectory .. "4096.png",
   Description = Description
 }
@@ -33,6 +34,7 @@ local LayerCountries = {
   Identifier = Identifier .. "-countries",
   Name = Name .. " (w/ countries)",
   Enabled = asset.enabled,
+  ZIndex = 100,
   FilePath = syncedDirectory .. "4096_countries.png",
   Description = Description
 }
diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/land_production-production_gap.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/land_production-production_gap.asset
index d0eedf650c..3f72ff3dab 100644
--- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/land_production-production_gap.asset
+++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/land_production-production_gap.asset
@@ -25,6 +25,7 @@ local Layer = {
   Identifier = Identifier,
   Name = Name,
   Enabled = asset.enabled,
+  ZIndex = 100,
   FilePath = syncedDirectory .. "4096.png",
   Description = Description
 }
@@ -33,6 +34,7 @@ local LayerCountries = {
   Identifier = Identifier .. "-countries",
   Name = Name .. " (w/ countries)",
   Enabled = asset.enabled,
+  ZIndex = 100,
   FilePath = syncedDirectory .. "4096_countries.png",
   Description = Description
 }
diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/land_ratio.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/land_ratio.asset
index 86025ca6f9..5f1e9590dc 100644
--- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/land_ratio.asset
+++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/land_ratio.asset
@@ -22,6 +22,7 @@ local Layer = {
   Identifier = Identifier,
   Name = Name,
   Enabled = asset.enabled,
+  ZIndex = 100,
   Type = "ImageSequenceTileProvider",
   FolderPath = syncedDirectory .. "4096",
   Description = Description
diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/latitude_longitude.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/latitude_longitude.asset
index 7f02d6b4de..f9ae7b2e19 100644
--- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/latitude_longitude.asset
+++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/latitude_longitude.asset
@@ -21,6 +21,7 @@ local syncedDirectory = asset.resource({
 local LayerBase = {
   Identifier = Identifier,
   Name = Name,
+  ZIndex = 100,
   FilePath = syncedDirectory .. "2048-base.png",
   Description = Description
 }
@@ -28,6 +29,7 @@ local LayerBase = {
 local LayerCombined = {
   Identifier = Identifier .. "-combined",
   Name = Name .. " (Combined)",
+  ZIndex = 100,
   FilePath = syncedDirectory .. "2048-flat-combined.png",
   Description = Description
 }
@@ -35,6 +37,7 @@ local LayerCombined = {
 local LayerLatitude = {
   Identifier = Identifier .. "-latitude",
   Name = Name .. " (Latitude)",
+  ZIndex = 100,
   FilePath = syncedDirectory .. "2048-layer-latitude.png",
   Description = Description
 }
@@ -42,6 +45,7 @@ local LayerLatitude = {
 local LayerLongitude = {
   Identifier = Identifier .. "-longitude",
   Name = Name .. " (Longitude)",
+  ZIndex = 100,
   FilePath = syncedDirectory .. "2048-layer-longitude.png",
   Description = Description
 }
diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/magnetic_declination.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/magnetic_declination.asset
index aa6016c541..0bf85bb65a 100644
--- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/magnetic_declination.asset
+++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/magnetic_declination.asset
@@ -26,6 +26,7 @@ local Layer = {
   Identifier = Identifier,
   Name = Name,
   Enabled = asset.enabled,
+  ZIndex = 100,
   Type = "TemporalTileProvider",
   Mode = "Folder",
   Folder = {
diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/nightsky.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/nightsky.asset
index bad37b4666..d447b1cef8 100644
--- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/nightsky.asset
+++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/nightsky.asset
@@ -22,6 +22,7 @@ local Layer = {
   Identifier = Identifier,
   Name = Name,
   Enabled = asset.enabled,
+  ZIndex = 100,
   FilePath = syncedDirectory .. "4096.jpg",
   Description = Description
 }
diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/nuclear_earthquake.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/nuclear_earthquake.asset
index b6cb618048..8a26e82de4 100644
--- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/nuclear_earthquake.asset
+++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/nuclear_earthquake.asset
@@ -32,6 +32,7 @@ local imagesDestination = syncedDirectory .. "images"
 local LayerBase = {
   Identifier = Identifier .. "-base",
   Name = Name .. " (Base)",
+  ZIndex = 100,
   FilePath = syncedDirectory .. "2048.jpg",
   Description = Description
 }
@@ -39,6 +40,7 @@ local LayerBase = {
 local LayerAll = {
   Identifier = Identifier .. "-all",
   Name = Name .. " (All)",
+  ZIndex = 100,
   FilePath = syncedDirectory .. "all_earthquakes.png",
   Description = Description
 }
@@ -46,6 +48,7 @@ local LayerAll = {
 local LayerNew = {
   Identifier = Identifier .. "-new",
   Name = Name .. " (New)",
+  ZIndex = 100,
   FilePath = syncedDirectory .. "new.jpg",
   Description = Description
 }
@@ -53,6 +56,7 @@ local LayerNew = {
 local LayerNuclear = {
   Identifier = Identifier .. "-nuclear",
   Name = Name .. " (Nuclear)",
+  ZIndex = 100,
   FilePath = syncedDirectory .. "nuclear_plants.png",
   Description = Description
 }
@@ -61,6 +65,7 @@ local LayerImages = {
   Identifier = Identifier .. "-images",
   Name = Name .. " (Images)",
   Type = "ImageSequenceTileProvider",
+  ZIndex = 100,
   FolderPath = imagesDestination,
   Description = Description
 }
diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/paleo_map.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/paleo_map.asset
index 1ded519273..fab162bce6 100644
--- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/paleo_map.asset
+++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/paleo_map.asset
@@ -128,6 +128,7 @@ for i,v in ipairs(layers_names) do
     Identifier = Identifier .. "-" .. v,
     Name = Name .. " " .. v,
     Enabled = asset.enabled,
+    ZIndex = 100,
     FilePath = imagesDestination .. "/" .. v .. ".jpg",
     Description = Description
   }
diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/paleo_overlays.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/paleo_overlays.asset
index e3bc89c716..9bf8e8d6e8 100644
--- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/paleo_overlays.asset
+++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/paleo_overlays.asset
@@ -29,6 +29,7 @@ local syncedDirectory = asset.resource({
 local LayerBase = {
   Identifier = Identifier,
   Name = Name,
+  ZIndex = 100,
   FilePath = syncedDirectory .. "4096.png",
   Description = Description
 }
@@ -36,6 +37,7 @@ local LayerBase = {
 local LayerCorals = {
   Identifier = Identifier .. "-corals",
   Name = Name .. " (Corals)",
+  ZIndex = 100,
   FilePath = syncedDirectory .. "corals.png",
   Description = Description
 }
@@ -43,6 +45,7 @@ local LayerCorals = {
 local LayerIcerings = {
   Identifier = Identifier .. "-icerings",
   Name = Name .. " (Icerings)",
+  ZIndex = 100,
   FilePath = syncedDirectory .. "icerings.png",
   Description = Description
 }
@@ -50,6 +53,7 @@ local LayerIcerings = {
 local LayerOcean = {
   Identifier = Identifier .. "-ocean",
   Name = Name .. " (Ocean)",
+  ZIndex = 100,
   FilePath = syncedDirectory .. "ocean.png",
   Description = Description
 }
@@ -57,6 +61,7 @@ local LayerOcean = {
 local LayerSpeleothem = {
   Identifier = Identifier .. "-speleothem",
   Name = Name .. " (Speleothem)",
+  ZIndex = 100,
   FilePath = syncedDirectory .. "speleothem.png",
   Description = Description
 }
@@ -64,6 +69,7 @@ local LayerSpeleothem = {
 local LayerTreeRings = {
   Identifier = Identifier .. "-tree_rings",
   Name = Name .. " (Tree Rings)",
+  ZIndex = 100,
   FilePath = syncedDirectory .. "tree_rings.png",
   Description = Description
 }
diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/pantropical_biomass.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/pantropical_biomass.asset
index 04ac41cd55..e0e8d94343 100644
--- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/pantropical_biomass.asset
+++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/pantropical_biomass.asset
@@ -24,6 +24,7 @@ local Layer = {
   Identifier = Identifier,
   Name = Name,
   Enabled = asset.enabled,
+  ZIndex = 100,
   FilePath = syncedDirectory .. "4096.jpg",
   Description = Description
 }
diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/plate_movement.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/plate_movement.asset
index de764789fc..1690adf10d 100644
--- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/plate_movement.asset
+++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/plate_movement.asset
@@ -34,6 +34,7 @@ local Layer = {
   Identifier = Identifier,
   Name = Name,
   Enabled = asset.enabled,
+  ZIndex = 100,
   Type = "ImageSequenceTileProvider",
   FolderPath = syncedDirectory .. "4096",
   Description = Description
diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/river_discharge_2010.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/river_discharge_2010.asset
index c9ec00865d..dbf531544a 100644
--- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/river_discharge_2010.asset
+++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/river_discharge_2010.asset
@@ -25,6 +25,7 @@ local Layer = {
   Identifier = Identifier,
   Name = Name,
   Enabled = asset.enabled,
+  ZIndex = 100,
   Type = "ImageSequenceTileProvider",
   FolderPath = syncedDirectory .. "4096",
   Description = Description
diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/sea_floor_age-iso_lines_yellow.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/sea_floor_age-iso_lines_yellow.asset
index 7fd63a675c..af413d1972 100644
--- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/sea_floor_age-iso_lines_yellow.asset
+++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/sea_floor_age-iso_lines_yellow.asset
@@ -30,6 +30,7 @@ local Layer = {
   Identifier = Identifier,
   Name = Name,
   Enabled = asset.enabled,
+  ZIndex = 100,
   FilePath = syncedDirectory .. "4096.png",
   Description = Description
 }
diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/sea_floor_age-shaded_veg.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/sea_floor_age-shaded_veg.asset
index 187eb0090e..45f3eca8fc 100644
--- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/sea_floor_age-shaded_veg.asset
+++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/sea_floor_age-shaded_veg.asset
@@ -29,6 +29,7 @@ local syncedDirectory = asset.resource({
 local LayerBase = {
   Identifier = Identifier,
   Name = Name,
+  ZIndex = 100,
   FilePath = syncedDirectory .. "4096.png",
   Description = Description
 }
@@ -36,6 +37,7 @@ local LayerBase = {
 local LayerAol = {
   Identifier = Identifier .. "-aol",
   Name = Name .. " (AOL)",
+  ZIndex = 100,
   FilePath = syncedDirectory .. "4096_aol.png",
   Description = Description
 }
@@ -43,6 +45,7 @@ local LayerAol = {
 local LayerNoLabels = {
   Identifier = Identifier .. "-no_labels",
   Name = Name .. " (No Labels)",
+  ZIndex = 100,
   FilePath = syncedDirectory .. "4096_nolabels.jpg",
   Description = Description
 }
@@ -50,6 +53,7 @@ local LayerNoLabels = {
 local LayerTrans = {
   Identifier = Identifier .. "-trans",
   Name = Name .. " (Trans)",
+  ZIndex = 100,
   FilePath = syncedDirectory .. "4096_trans.png",
   Description = Description
 }
diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/sea_floor_age-topo.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/sea_floor_age-topo.asset
index 29862244b3..32e8f9f241 100644
--- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/sea_floor_age-topo.asset
+++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/sea_floor_age-topo.asset
@@ -29,6 +29,7 @@ local syncedDirectory = asset.resource({
 local LayerBase = {
   Identifier = Identifier,
   Name = Name,
+  ZIndex = 100,
   FilePath = syncedDirectory .. "4096.png",
   Description = Description
 }
@@ -36,6 +37,7 @@ local LayerBase = {
 local LayerAol = {
   Identifier = Identifier .. "-aol",
   Name = Name .. " (AOL)",
+  ZIndex = 100,
   FilePath = syncedDirectory .. "4096_aol.png",
   Description = Description
 }
@@ -43,6 +45,7 @@ local LayerAol = {
 local LayerOrig = {
   Identifier = Identifier .. "-orig",
   Name = Name .. " (Original)",
+  ZIndex = 100,
   FilePath = syncedDirectory .. "4096_orig.png",
   Description = Description
 }
diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/seismic_waves-1994northridge.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/seismic_waves-1994northridge.asset
index 200484ba65..e0ab953aef 100644
--- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/seismic_waves-1994northridge.asset
+++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/seismic_waves-1994northridge.asset
@@ -30,6 +30,7 @@ local pipsDestination = syncedDirectory .. "pips"
 local LayerBase = {
   Identifier = Identifier,
   Name = Name,
+  ZIndex = 100,
   FilePath = syncedDirectory .. "background.jpg",
   Description = Description
 }
@@ -37,6 +38,7 @@ local LayerBase = {
 local LayerStations = {
   Identifier = Identifier .. "-stations",
   Name = Name .. " (Stations)",
+  ZIndex = 100,
   FilePath = syncedDirectory .. "station_names.png",
   Description = Description
 }
@@ -45,6 +47,7 @@ local LayerImages = {
   Identifier = Identifier .. "-images",
   Name = Name .. " (Images)",
   Type = "ImageSequenceTileProvider",
+  ZIndex = 100,
   FolderPath = imagesDestination,
   Description = Description
 }
diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/species_richness-amphibians.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/species_richness-amphibians.asset
index 4bc5d9c98e..3b15ea072a 100644
--- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/species_richness-amphibians.asset
+++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/species_richness-amphibians.asset
@@ -26,6 +26,7 @@ local syncedDirectory = asset.resource({
 local Layer8192 = {
   Identifier = Identifier ,
   Name = Name,
+  ZIndex = 100,
   FilePath = syncedDirectory .. "8192.png",
   Description = Description
 }
@@ -33,6 +34,7 @@ local Layer8192 = {
 local LayerWithBackground = {
   Identifier = Identifier .. "-background",
   Name = Name .. " (Background)",
+  ZIndex = 100,
   FilePath = syncedDirectory .. "4096-background.png",
   Description = Description
 }
diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/species_richness-amphibians_threatened.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/species_richness-amphibians_threatened.asset
index a9384cfc87..a11783eb8d 100644
--- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/species_richness-amphibians_threatened.asset
+++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/species_richness-amphibians_threatened.asset
@@ -26,6 +26,7 @@ local syncedDirectory = asset.resource({
 local Layer4096 = {
   Identifier = Identifier,
   Name = Name,
+  ZIndex = 100,
   FilePath = syncedDirectory .. "4096.png",
   Description = Description
 }
@@ -33,6 +34,7 @@ local Layer4096 = {
 local LayerWithBackground = {
   Identifier = Identifier .. "-background",
   Name = Name,
+  ZIndex = 100,
   FilePath = syncedDirectory .. "4096-background.png",
   Description = Description
 }
diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/species_richness-birds.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/species_richness-birds.asset
index 63c58241be..60011ed489 100644
--- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/species_richness-birds.asset
+++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/species_richness-birds.asset
@@ -26,6 +26,7 @@ local syncedDirectory = asset.resource({
 local Layer8192 = {
   Identifier = Identifier,
   Name = Name,
+  ZIndex = 100,
   FilePath = syncedDirectory .. "8192.png",
   Description = Description
 }
@@ -33,6 +34,7 @@ local Layer8192 = {
 local LayerWithBackground = {
   Identifier = Identifier .. "-background",
   Name = Name .. " (w/ Background)",
+  ZIndex = 100,
   FilePath = syncedDirectory .. "4096-background.png",
   Description = Description
 }
diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/species_richness-birds_threatened.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/species_richness-birds_threatened.asset
index 7d74457996..53381d4d05 100644
--- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/species_richness-birds_threatened.asset
+++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/species_richness-birds_threatened.asset
@@ -26,6 +26,7 @@ local syncedDirectory = asset.resource({
 local Layer4096 = {
   Identifier = Identifier,
   Name = Name,
+  ZIndex = 100,
   FilePath = syncedDirectory .. "4096.png",
   Description = Description
 }
@@ -33,6 +34,7 @@ local Layer4096 = {
 local LayerWithBackground = {
   Identifier = Identifier .. "-background",
   Name = Name .. " (w/ Background)",
+  ZIndex = 100,
   FilePath = syncedDirectory .. "4096-background.png",
   Description = Description
 }
diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/species_richness-mammals.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/species_richness-mammals.asset
index 898368e9b4..a69b1bcd3d 100644
--- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/species_richness-mammals.asset
+++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/species_richness-mammals.asset
@@ -26,6 +26,7 @@ local syncedDirectory = asset.resource({
 local Layer8192 = {
   Identifier = Identifier,
   Name = Name,
+  ZIndex = 100,
   FilePath = syncedDirectory .. "8192.png",
   Description = Description
 }
@@ -33,6 +34,7 @@ local Layer8192 = {
 local LayerWithBackground = {
   Identifier = Identifier .. "-background",
   Name = Name .. " (w/ Background)",
+  ZIndex = 100,
   FilePath = syncedDirectory .. "4096-background.png",
   Description = Description
 }
diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/species_richness-mammals_threatened.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/species_richness-mammals_threatened.asset
index 26aaeb3d3e..3d192f65a3 100644
--- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/species_richness-mammals_threatened.asset
+++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/species_richness-mammals_threatened.asset
@@ -26,6 +26,7 @@ local syncedDirectory = asset.resource({
 local Layer4096 = {
   Identifier = Identifier,
   Name = Name,
+  ZIndex = 100,
   FilePath = syncedDirectory .. "4096.png",
   Description = Description
 }
@@ -33,6 +34,7 @@ local Layer4096 = {
 local LayerWithBackground = {
   Identifier = Identifier .. "-background",
   Name = Name .. " (w/ Background)",
+  ZIndex = 100,
   FilePath = syncedDirectory .. "4096-background.png",
   Description = Description
 }
diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/surface_temperature.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/surface_temperature.asset
index 03246628cb..38867b7f4c 100644
--- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/surface_temperature.asset
+++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/surface_temperature.asset
@@ -28,6 +28,7 @@ local Layer = {
   Identifier = Identifier,
   Name = Name,
   Enabled = asset.enabled,
+  ZIndex = 100,
   Type = "ImageSequenceTileProvider",
   FolderPath = syncedDirectory .. "4096",
   Description = Description
diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/top_quakes.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/top_quakes.asset
index 1923dfe436..09f435dd2f 100644
--- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/top_quakes.asset
+++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/top_quakes.asset
@@ -33,6 +33,7 @@ local Layer = {
   Identifier = Identifier,
   Name = Name,
   Enabled = asset.enabled,
+  ZIndex = 100,
   FilePath = syncedDirectory .. "sos_saras_big_quakes_20110316.png",
   Description = Description
 }
diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/volcanoes-eruptions.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/volcanoes-eruptions.asset
index fc9b6dbb89..dc6fe190ad 100644
--- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/volcanoes-eruptions.asset
+++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/volcanoes-eruptions.asset
@@ -31,6 +31,7 @@ local LayerBase = {
   Identifier = Identifier .. "-base",
   Name = Name .. " (Base)",
   Enabled = asset.enabled,
+  ZIndex = 100,
   FilePath = syncedDirectory .. "land.jpg",
   Description = Description
 }
diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/volcanoes-global_volcanoes.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/volcanoes-global_volcanoes.asset
index bd1d17724e..d61432d581 100644
--- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/volcanoes-global_volcanoes.asset
+++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/volcanoes-global_volcanoes.asset
@@ -31,6 +31,7 @@ local LayerBase = {
   Identifier = Identifier .. "-base",
   Name = Name .. " (Base)",
   Enabled = asset.enabled,
+  ZIndex = 100,
   FilePath = syncedDirectory .. "land.jpg",
   Description = Description
 }
@@ -39,6 +40,7 @@ local Layer = {
   Identifier = Identifier,
   Name = Name,
   Enabled = asset.enabled,
+  ZIndex = 110,
   FilePath = syncedDirectory .. "4096.png",
   Description = Description
 }
diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/volcanoes-tsunami.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/volcanoes-tsunami.asset
index cd92fa7082..8395c824f3 100644
--- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/volcanoes-tsunami.asset
+++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/volcanoes-tsunami.asset
@@ -31,6 +31,7 @@ local LayerBase = {
   Identifier = Identifier .. "-base",
   Name = Name .. " (Base)",
   Enabled = asset.enabled,
+  ZIndex = 100,
   FilePath = syncedDirectory .. "land.jpg",
   Description = Description
 }
@@ -39,6 +40,7 @@ local Layer = {
   Identifier = Identifier,
   Name = Name,
   Enabled = asset.enabled,
+  ZIndex = 110,
   FilePath = syncedDirectory .. "4096.png",
   Description = Description
 }
diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/models/bm10000.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/models/bm10000.asset
index f1500048de..261be125ae 100644
--- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/models/bm10000.asset
+++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/models/bm10000.asset
@@ -50,6 +50,7 @@ local Layer = {
   Identifier = Identifier,
   Name = Name,
   Enabled = asset.enabled,
+  ZIndex = 100,
   Type = "ImageSequenceTileProvider",
   FolderPath = syncedDirectory .. "4096",
   Description = Description
diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/models/gfdl_seaice.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/models/gfdl_seaice.asset
index a4522509af..514f49d82f 100644
--- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/models/gfdl_seaice.asset
+++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/models/gfdl_seaice.asset
@@ -34,6 +34,7 @@ local Layer = {
   Identifier = Identifier,
   Name = Name,
   Enabled = asset.enabled,
+  ZIndex = 100,
   Type = "ImageSequenceTileProvider",
   FolderPath = syncedDirectory .. "images",
   Description = Description
diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/models/ipcc_temp-ccsm-a1b.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/models/ipcc_temp-ccsm-a1b.asset
index fd2cf07bfa..6d4507eb74 100644
--- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/models/ipcc_temp-ccsm-a1b.asset
+++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/models/ipcc_temp-ccsm-a1b.asset
@@ -30,6 +30,7 @@ local Layer = {
   Identifier = Identifier,
   Name = Name,
   Enabled = asset.enabled,
+  ZIndex = 100,
   Type = "ImageSequenceTileProvider",
   FolderPath = syncedDirectory .. "4095",
   Description = Description
diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/models/ipcc_temp-ccsm-b1.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/models/ipcc_temp-ccsm-b1.asset
index 414ca53bbd..92120d03e7 100644
--- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/models/ipcc_temp-ccsm-b1.asset
+++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/models/ipcc_temp-ccsm-b1.asset
@@ -30,6 +30,7 @@ local Layer = {
   Identifier = Identifier,
   Name = Name,
   Enabled = asset.enabled,
+  ZIndex = 100,
   Type = "ImageSequenceTileProvider",
   FolderPath = syncedDirectory .. "4095",
   Description = Description
diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/models/ipcc_temp-compare.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/models/ipcc_temp-compare.asset
index 7b9ecc5cbb..ae7bcb0304 100644
--- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/models/ipcc_temp-compare.asset
+++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/models/ipcc_temp-compare.asset
@@ -41,8 +41,9 @@ for i,v in ipairs(layersNames) do
   local layer = {
     Identifier = Identifier .. v,
     Name = Name,
-  Enabled = asset.enabled,
-  FilePath = syncedDirectory .. v .. ".png",
+    Enabled = asset.enabled,
+    ZIndex = 100,
+    FilePath = syncedDirectory .. v .. ".png",
     Description = Description
   }
 
diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/models/ipcc_temp-gfdl-a1b.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/models/ipcc_temp-gfdl-a1b.asset
index c8e2503572..3695d2c735 100644
--- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/models/ipcc_temp-gfdl-a1b.asset
+++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/models/ipcc_temp-gfdl-a1b.asset
@@ -30,6 +30,7 @@ local Layer = {
   Identifier = Identifier,
   Name = Name,
   Enabled = asset.enabled,
+  ZIndex = 100,
   Type = "ImageSequenceTileProvider",
   FolderPath = syncedDirectory .. "4095",
   Description = Description
diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/models/ipcc_temp-gfdl-b1.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/models/ipcc_temp-gfdl-b1.asset
index 53cf3c1058..a0688dcff3 100644
--- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/models/ipcc_temp-gfdl-b1.asset
+++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/models/ipcc_temp-gfdl-b1.asset
@@ -30,6 +30,7 @@ local Layer = {
   Identifier = Identifier,
   Name = Name,
   Enabled = asset.enabled,
+  ZIndex = 100,
   Type = "ImageSequenceTileProvider",
   FolderPath = syncedDirectory .. "4095",
   Description = Description
diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/models/ipcc_temp-had-a1b.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/models/ipcc_temp-had-a1b.asset
index 84735005b0..08c4d13a1e 100644
--- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/models/ipcc_temp-had-a1b.asset
+++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/models/ipcc_temp-had-a1b.asset
@@ -30,6 +30,7 @@ local Layer = {
   Identifier = Identifier,
   Name = Name,
   Enabled = asset.enabled,
+  ZIndex = 100,
   Type = "ImageSequenceTileProvider",
   FolderPath = syncedDirectory .. "4095",
   Description = Description
diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/models/ipcc_temp-had-b1.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/models/ipcc_temp-had-b1.asset
index 37e4f72ff1..8e676efa6a 100644
--- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/models/ipcc_temp-had-b1.asset
+++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/models/ipcc_temp-had-b1.asset
@@ -30,6 +30,7 @@ local Layer = {
   Identifier = Identifier,
   Name = Name,
   Enabled = asset.enabled,
+  ZIndex = 100,
   Type = "ImageSequenceTileProvider",
   FolderPath = syncedDirectory .. "4095",
   Description = Description
diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/models/rcp-ga26.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/models/rcp-ga26.asset
index 90b1469ba8..8d3df42d77 100644
--- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/models/rcp-ga26.asset
+++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/models/rcp-ga26.asset
@@ -22,6 +22,7 @@ local Layer = {
   Identifier = Identifier,
   Name = Name,
   Enabled = asset.enabled,
+  ZIndex = 100,
   Type = "TemporalTileProvider",
   Mode = "Folder",
   Folder = {
diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/models/rcp-ga45.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/models/rcp-ga45.asset
index eecde1e968..b84d68b0b5 100644
--- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/models/rcp-ga45.asset
+++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/models/rcp-ga45.asset
@@ -22,6 +22,7 @@ local Layer = {
   Identifier = Identifier,
   Name = Name,
   Enabled = asset.enabled,
+  ZIndex = 100,
   Type = "TemporalTileProvider",
   Mode = "Folder",
   Folder = {
diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/models/rcp-ga60.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/models/rcp-ga60.asset
index f3d5a28fc4..13a9edeb60 100644
--- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/models/rcp-ga60.asset
+++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/models/rcp-ga60.asset
@@ -22,6 +22,7 @@ local Layer = {
   Identifier = Identifier,
   Name = Name,
   Enabled = asset.enabled,
+  ZIndex = 100,
   Type = "TemporalTileProvider",
   Mode = "Folder",
   Folder = {
diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/models/rcp-ga85.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/models/rcp-ga85.asset
index 6fb81cd80b..b14201d775 100644
--- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/models/rcp-ga85.asset
+++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/models/rcp-ga85.asset
@@ -22,6 +22,7 @@ local Layer = {
   Identifier = Identifier,
   Name = Name,
   Enabled = asset.enabled,
+  ZIndex = 100,
   Type = "TemporalTileProvider",
   Mode = "Folder",
   Folder = {
diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/models/ukmet-a1b.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/models/ukmet-a1b.asset
index ab5213b79d..957fee526b 100644
--- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/models/ukmet-a1b.asset
+++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/models/ukmet-a1b.asset
@@ -32,6 +32,7 @@ local Layer = {
   Identifier = Identifier,
   Name = Name,
   Enabled = asset.enabled,
+  ZIndex = 100,
   Type = "TemporalTileProvider",
   Mode = "Folder",
   Folder = {
diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/models/ukmet-e1.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/models/ukmet-e1.asset
index 5c28fbbce1..6964547d64 100644
--- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/models/ukmet-e1.asset
+++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/models/ukmet-e1.asset
@@ -31,6 +31,7 @@ local Layer = {
   Identifier = Identifier,
   Name = Name,
   Enabled = asset.enabled,
+  ZIndex = 100,
   Type = "TemporalTileProvider",
   Mode = "Folder",
   Folder = {
diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/2009_ice_animation.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/2009_ice_animation.asset
index ad3a0b706c..5b70e6680a 100644
--- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/2009_ice_animation.asset
+++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/2009_ice_animation.asset
@@ -31,6 +31,7 @@ local Layer = {
   Identifier = Identifier,
   Name = Name,
   Enabled = asset.enabled,
+  ZIndex = 100,
   Type = "ImageSequenceTileProvider",
   FolderPath = syncedDirectory .. "4096",
   Description = Description
diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/6m_sea_level_rise-black.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/6m_sea_level_rise-black.asset
index 4327700b34..880949557c 100644
--- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/6m_sea_level_rise-black.asset
+++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/6m_sea_level_rise-black.asset
@@ -32,6 +32,7 @@ local syncedDirectory = asset.resource({
 local Layer0m = {
   Identifier = Identifier .. "-0m",
   Name = Name .. " (0m)",
+  ZIndex = 100,
   FilePath = syncedDirectory .. "0m-new.png",
   Description = Description
 }
@@ -39,6 +40,7 @@ local Layer0m = {
 local Layer1m = {
   Identifier = Identifier .. "-1m",
   Name = Name .. " (1m)",
+  ZIndex = 100,
   FilePath = syncedDirectory .. "1m-new.png",
   Description = Description
 }
@@ -46,6 +48,7 @@ local Layer1m = {
 local Layer2m = {
   Identifier = Identifier .. "-2m",
   Name = Name .. " (2m)",
+  ZIndex = 100,
   FilePath = syncedDirectory .. "2m-new.png",
   Description = Description
 }
@@ -53,6 +56,7 @@ local Layer2m = {
 local Layer3m = {
   Identifier = Identifier .. "-3m",
   Name = Name .. " (3m)",
+  ZIndex = 100,
   FilePath = syncedDirectory .. "3m-new.png",
   Description = Description
 }
@@ -60,6 +64,7 @@ local Layer3m = {
 local Layer4m = {
   Identifier = Identifier .. "-4m",
   Name = Name .. " (4m)",
+  ZIndex = 100,
   FilePath = syncedDirectory .. "4m-new.png",
   Description = Description
 }
@@ -67,6 +72,7 @@ local Layer4m = {
 local Layer5m = {
   Identifier = Identifier .. "-5m",
   Name = Name .. " (5m)",
+  ZIndex = 100,
   FilePath = syncedDirectory .. "5m-new.png",
   Description = Description
 }
@@ -74,6 +80,7 @@ local Layer5m = {
 local Layer6m = {
   Identifier = Identifier .. "-6m",
   Name = Name .. " (6m)",
+  ZIndex = 100,
   FilePath = syncedDirectory .. "6m-new.png",
   Description = Description
 }
diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/6m_sea_level_rise-red.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/6m_sea_level_rise-red.asset
index aca7f7aed0..10ceb2d4ef 100644
--- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/6m_sea_level_rise-red.asset
+++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/6m_sea_level_rise-red.asset
@@ -32,6 +32,7 @@ local syncedDirectory = asset.resource({
 local Layer0m = {
   Identifier = Identifier .. "-0m",
   Name = Name .. " (0m)",
+  ZIndex = 100,
   FilePath = syncedDirectory .. "0m-new.png",
   Description = Description
 }
@@ -39,6 +40,7 @@ local Layer0m = {
 local Layer1m = {
   Identifier = Identifier .. "-1m",
   Name = Name .. " (1m)",
+  ZIndex = 100,
   FilePath = syncedDirectory .. "1m-new.png",
   Description = Description
 }
@@ -46,6 +48,7 @@ local Layer1m = {
 local Layer2m = {
   Identifier = Identifier .. "-2m",
   Name = Name .. " (2m)",
+  ZIndex = 100,
   FilePath = syncedDirectory .. "2m-new.png",
   Description = Description
 }
@@ -53,6 +56,7 @@ local Layer2m = {
 local Layer3m = {
   Identifier = Identifier .. "-3m",
   Name = Name .. " (3m)",
+  ZIndex = 100,
   FilePath = syncedDirectory .. "3m-new.png",
   Description = Description
 }
@@ -60,6 +64,7 @@ local Layer3m = {
 local Layer4m = {
   Identifier = Identifier .. "-4m",
   Name = Name .. " (4m)",
+  ZIndex = 100,
   FilePath = syncedDirectory .. "4m-new.png",
   Description = Description
 }
@@ -67,6 +72,7 @@ local Layer4m = {
 local Layer5m = {
   Identifier = Identifier .. "-5m",
   Name = Name .. " (5m)",
+  ZIndex = 100,
   FilePath = syncedDirectory .. "5m-new.png",
   Description = Description
 }
@@ -74,6 +80,7 @@ local Layer5m = {
 local Layer6m = {
   Identifier = Identifier .. "-6m",
   Name = Name .. " (6m)",
+  ZIndex = 100,
   FilePath = syncedDirectory .. "6m-new.png",
   Description = Description
 }
diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/animal_tracking.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/animal_tracking.asset
index a279e0bce7..238dbbb2d9 100644
--- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/animal_tracking.asset
+++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/animal_tracking.asset
@@ -28,6 +28,7 @@ local Layer = {
   Identifier = Identifier,
   Name = Name,
   Enabled = asset.enabled,
+  ZIndex = 100,
   Type = "TemporalTileProvider",
   Mode = "Folder",
   Folder = {
diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/argo_buoy_tracks.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/argo_buoy_tracks.asset
index 80c657cacc..df917f60fa 100644
--- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/argo_buoy_tracks.asset
+++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/argo_buoy_tracks.asset
@@ -30,6 +30,7 @@ local Layer = {
   Identifier = Identifier,
   Name = Name,
   Enabled = asset.enabled,
+  ZIndex = 100,
   Type = "ImageSequenceTileProvider",
   FolderPath = syncedDirectory .. "4096",
   Description = Description
diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/argo_buoy_waterfall.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/argo_buoy_waterfall.asset
index ef27752c47..2c64592771 100644
--- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/argo_buoy_waterfall.asset
+++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/argo_buoy_waterfall.asset
@@ -30,6 +30,7 @@ local Layer = {
   Identifier = Identifier,
   Name = Name,
   Enabled = asset.enabled,
+  ZIndex = 100,
   Type = "ImageSequenceTileProvider",
   FolderPath = syncedDirectory .. "4096",
   Description = Description
diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/atl_turtle.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/atl_turtle.asset
index 604610e609..c977b12d11 100644
--- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/atl_turtle.asset
+++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/atl_turtle.asset
@@ -30,6 +30,7 @@ local Layer = {
   Identifier = Identifier,
   Name = Name,
   Enabled = asset.enabled,
+  ZIndex = 100,
   Type = "TemporalTileProvider",
   Mode = "Folder",
   Folder = {
diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/buoy_locations.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/buoy_locations.asset
index c1406f0f01..096ff91a7a 100644
--- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/buoy_locations.asset
+++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/buoy_locations.asset
@@ -26,6 +26,7 @@ local Layer = {
   Identifier = Identifier,
   Name = Name,
   Enabled = asset.enabled,
+  ZIndex = 100,
   FilePath = syncedDirectory .. "4096.jpg",
   Description = Description
 }
diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/catch_model.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/catch_model.asset
index ab15fba4d1..3401ad81bd 100644
--- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/catch_model.asset
+++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/catch_model.asset
@@ -30,6 +30,7 @@ local Layer = {
   Identifier = Identifier,
   Name = Name,
   Enabled = asset.enabled,
+  ZIndex = 100,
   FilePath = syncedDirectory .. "4096.png",
   Description = Description
 }
diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/chlorophyll_model.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/chlorophyll_model.asset
index 6080951b6c..5b63c028a5 100644
--- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/chlorophyll_model.asset
+++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/chlorophyll_model.asset
@@ -30,6 +30,7 @@ local Layer = {
   Identifier = Identifier,
   Name = Name,
   Enabled = asset.enabled,
+  ZIndex = 100,
   Type = "ImageSequenceTileProvider",
   FolderPath = syncedDirectory .. "3232",
   Description = Description
diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/currents.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/currents.asset
index f20aaeba3e..c3c364b291 100644
--- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/currents.asset
+++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/currents.asset
@@ -33,6 +33,7 @@ local Layer = {
   Identifier = Identifier,
   Name = Name,
   Enabled = asset.enabled,
+  ZIndex = 100,
   FilePath = syncedDirectory .. "4096.jpg",
   Description = Description
 }
diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/dart_buoy.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/dart_buoy.asset
index ea86ca24c0..ce102dd17d 100644
--- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/dart_buoy.asset
+++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/dart_buoy.asset
@@ -28,6 +28,7 @@ local Layer = {
   Identifier = Identifier,
   Name = Name,
   Enabled = asset.enabled,
+  ZIndex = 100,
   FilePath = syncedDirectory .. "2000.jpg",
   Description = Description
 }
diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/ecco2_sst-gray_land.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/ecco2_sst-gray_land.asset
index 77f9c7d36e..f7ebdbf583 100644
--- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/ecco2_sst-gray_land.asset
+++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/ecco2_sst-gray_land.asset
@@ -33,6 +33,7 @@ local Layer = {
   Identifier = Identifier,
   Name = Name,
   Enabled = asset.enabled,
+  ZIndex = 100,
   Type = "ImageSequenceTileProvider",
   FolderPath = syncedDirectory .. "images",
   Description = Description
diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/ecco2_sst-veg_land.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/ecco2_sst-veg_land.asset
index 9d1020ab5e..79360abdc0 100644
--- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/ecco2_sst-veg_land.asset
+++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/ecco2_sst-veg_land.asset
@@ -33,6 +33,7 @@ local Layer = {
   Identifier = Identifier,
   Name = Name,
   Enabled = asset.enabled,
+  ZIndex = 100,
   Type = "ImageSequenceTileProvider",
   FolderPath = syncedDirectory .. "images",
   Description = Description
diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/elnino.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/elnino.asset
index 7734c78160..7277b813c5 100644
--- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/elnino.asset
+++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/elnino.asset
@@ -27,6 +27,7 @@ local syncedDirectory = asset.resource({
 local LayerElninoSummer = {
   Identifier = Identifier .. "-elnino_summer",
   Name = Name .. " (El Nino, summer)",
+  ZIndex = 100,
   FilePath = syncedDirectory .. "elnino-summer-no-map-transparent-shapes.png",
   Description = Description
 }
@@ -34,6 +35,7 @@ local LayerElninoSummer = {
 local LayerElninoWinter = {
   Identifier = Identifier .. "-elnino_winter",
   Name = Name .. " (El Nino, winter)",
+  ZIndex = 100,
   FilePath = syncedDirectory .. "elnino-winter-no-map-transparent-shapes.png",
   Description = Description
 }
@@ -41,6 +43,7 @@ local LayerElninoWinter = {
 local LayerLaninaSummer = {
   Identifier = Identifier .. "-lanina_summer",
   Name = Name .. " (La Nina, summer)",
+  ZIndex = 100,
   FilePath = syncedDirectory .. "lanina-summer-no-map-transparent-shapes.png",
   Description = Description
 }
@@ -48,6 +51,7 @@ local LayerLaninaSummer = {
 local LayerLaninaWinter = {
   Identifier = Identifier .. "-lanina_winter",
   Name = Name .. " (La Nina, winter)",
+  ZIndex = 100,
   FilePath = syncedDirectory .. "lanina-winter-no-map-transparent-shapes.png",
   Description = Description
 }
diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/gfdl_sst-black_background.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/gfdl_sst-black_background.asset
index 6007fb6e1e..c4d7032bad 100644
--- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/gfdl_sst-black_background.asset
+++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/gfdl_sst-black_background.asset
@@ -27,6 +27,7 @@ local Layer = {
   Identifier = Identifier,
   Name = Name,
   Enabled = asset.enabled,
+  ZIndex = 100,
   Type = "TemporalTileProvider",
   Mode = "Folder",
   Folder = {
diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/gfdl_sst-land_background.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/gfdl_sst-land_background.asset
index a2c534a529..8690e15dfe 100644
--- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/gfdl_sst-land_background.asset
+++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/gfdl_sst-land_background.asset
@@ -27,6 +27,7 @@ local Layer = {
   Identifier = Identifier,
   Name = Name,
   Enabled = asset.enabled,
+  ZIndex = 100,
   Type = "TemporalTileProvider",
   Mode = "Folder",
   Folder = {
diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/greenland_melt.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/greenland_melt.asset
index 67f471a1d0..dcc9ca0c44 100644
--- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/greenland_melt.asset
+++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/greenland_melt.asset
@@ -30,6 +30,7 @@ local Layer = {
   Identifier = Identifier,
   Name = Name,
   Enabled = asset.enabled,
+  ZIndex = 100,
   Type = "TemporalTileProvider",
   Mode = "Folder",
   Folder = {
diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/japan_tsunami.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/japan_tsunami.asset
index 0c7c8615ec..d3b235a96b 100644
--- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/japan_tsunami.asset
+++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/japan_tsunami.asset
@@ -26,6 +26,7 @@ local Layer = {
   Identifier = Identifier,
   Name = Name,
   Enabled = asset.enabled,
+  ZIndex = 100,
   FilePath = syncedDirectory .. "4096.png",
   Description = Description
 }
diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/japan_tsunami_waves.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/japan_tsunami_waves.asset
index e27ec10675..8c55e98efd 100644
--- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/japan_tsunami_waves.asset
+++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/japan_tsunami_waves.asset
@@ -33,6 +33,7 @@ local Layer = {
   Identifier = Identifier,
   Name = Name,
   Enabled = asset.enabled,
+  ZIndex = 100,
   Type = "ImageSequenceTileProvider",
   FolderPath = syncedDirectory .. "4096",
   Description = Description
diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/loggerheadseaturtletracks.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/loggerheadseaturtletracks.asset
index 2a81d52f9e..c4cd067b9c 100644
--- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/loggerheadseaturtletracks.asset
+++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/loggerheadseaturtletracks.asset
@@ -30,6 +30,7 @@ local Layer = {
   Identifier = Identifier,
   Name = Name,
   Enabled = asset.enabled,
+  ZIndex = 100,
   Type = "ImageSequenceTileProvider",
   FolderPath = syncedDirectory .. "4096",
   Description = Description
diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/marine_impacts.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/marine_impacts.asset
index 19e7fde4fd..72c8afe53b 100644
--- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/marine_impacts.asset
+++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/marine_impacts.asset
@@ -29,6 +29,7 @@ local Layer = {
   Identifier = Identifier,
   Name = Name,
   Enabled = asset.enabled,
+  ZIndex = 100,
   FilePath = syncedDirectory .. "5000.png",
   Description = Description
 }
diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/marine_life_tracking.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/marine_life_tracking.asset
index e1e727e216..49e9adf597 100644
--- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/marine_life_tracking.asset
+++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/marine_life_tracking.asset
@@ -26,6 +26,7 @@ local Layer = {
   Identifier = Identifier,
   Name = Name,
   Enabled = asset.enabled,
+  ZIndex = 100,
   FilePath = syncedDirectory .. "2048.png",
   Description = Description
 }
diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/mexico_turtles_947293.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/mexico_turtles_947293.asset
index 393bcc47da..ee9bf77e55 100644
--- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/mexico_turtles_947293.asset
+++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/mexico_turtles_947293.asset
@@ -29,6 +29,7 @@ local Layer = {
   Identifier = Identifier,
   Name = Name,
   Enabled = asset.enabled,
+  ZIndex = 100,
   Type = "TemporalTileProvider",
   Mode = "Folder",
   Folder = {
diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/mexico_turtles_958002.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/mexico_turtles_958002.asset
index 93fc0bc868..1de5ffb2fa 100644
--- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/mexico_turtles_958002.asset
+++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/mexico_turtles_958002.asset
@@ -29,6 +29,7 @@ local Layer = {
   Identifier = Identifier,
   Name = Name,
   Enabled = asset.enabled,
+  ZIndex = 100,
   Type = "TemporalTileProvider",
   Mode = "Folder",
   Folder = {
diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/modis_sst.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/modis_sst.asset
index 500cda2ca1..44277a47ef 100644
--- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/modis_sst.asset
+++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/modis_sst.asset
@@ -28,6 +28,7 @@ local Layer = {
   Identifier = Identifier,
   Name = Name,
   Enabled = asset.enabled,
+  ZIndex = 100,
   Type = "ImageSequenceTileProvider",
   FolderPath = syncedDirectory .. "2048",
   Description = Description
diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/nasa_speed.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/nasa_speed.asset
index e22a3b1774..e5b7f9fe57 100644
--- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/nasa_speed.asset
+++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/nasa_speed.asset
@@ -28,6 +28,7 @@ local Layer = {
   Identifier = Identifier,
   Name = Name,
   Enabled = asset.enabled,
+  ZIndex = 100,
   Type = "ImageSequenceTileProvider",
   FolderPath = syncedDirectory .. "4000",
   Description = Description
diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/nasa_sst.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/nasa_sst.asset
index f550750ea7..9c254f1ff4 100644
--- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/nasa_sst.asset
+++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/nasa_sst.asset
@@ -26,6 +26,7 @@ local Layer = {
   Identifier = Identifier,
   Name = Name,
   Enabled = asset.enabled,
+  ZIndex = 100,
   Type = "ImageSequenceTileProvider",
   FolderPath = syncedDirectory .. "4000",
   Description = Description
diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/ocean_acid-co2_flux.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/ocean_acid-co2_flux.asset
index c357a919df..f1749139f5 100644
--- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/ocean_acid-co2_flux.asset
+++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/ocean_acid-co2_flux.asset
@@ -25,6 +25,7 @@ local Layer = {
   Identifier = Identifier,
   Name = Name,
   Enabled = asset.enabled,
+  ZIndex = 100,
   Type = "TemporalTileProvider",
   Mode = "Folder",
   Folder = {
diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/ocean_acid-ph.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/ocean_acid-ph.asset
index fb85da36b3..64ca9c54a2 100644
--- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/ocean_acid-ph.asset
+++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/ocean_acid-ph.asset
@@ -28,6 +28,7 @@ local Layer = {
   Identifier = Identifier,
   Name = Name,
   Enabled = asset.enabled,
+  ZIndex = 100,
   Type = "TemporalTileProvider",
   Mode = "Folder",
   Folder = {
diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/ocean_acid-saturation.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/ocean_acid-saturation.asset
index b41f0377d7..a845758ee6 100644
--- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/ocean_acid-saturation.asset
+++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/ocean_acid-saturation.asset
@@ -33,6 +33,7 @@ local Layer = {
   Identifier = Identifier,
   Name = Name,
   Enabled = asset.enabled,
+  ZIndex = 100,
   Type = "TemporalTileProvider",
   Mode = "Folder",
   Folder = {
diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/ocean_depths_temp.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/ocean_depths_temp.asset
index 27c5016607..ae2fcc4b41 100644
--- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/ocean_depths_temp.asset
+++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/ocean_depths_temp.asset
@@ -31,6 +31,7 @@ local Layer = {
   Identifier = Identifier,
   Name = Name,
   Enabled = asset.enabled,
+  ZIndex = 100,
   Type = "ImageSequenceTileProvider",
   FolderPath = imagesDestination,
   Description = Description
@@ -40,6 +41,7 @@ local LayerByDepth = {
   Identifier = Identifier .. "-bydepth",
   Name = Name .. " (by Depth)",
   Enabled = asset.enabled,
+  ZIndex = 100,
   Type = "ImageSequenceTileProvider",
   FolderPath = imagesByDepthDestination,
   Description = Description
diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/ocean_drain-gray.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/ocean_drain-gray.asset
index 3a14bf4d87..d89a7467c9 100644
--- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/ocean_drain-gray.asset
+++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/ocean_drain-gray.asset
@@ -26,6 +26,7 @@ local Layer = {
   Identifier = Identifier,
   Name = Name,
   Enabled = asset.enabled,
+  ZIndex = 100,
   Type = "ImageSequenceTileProvider",
   FolderPath = syncedDirectory .. "4096",
   Description = Description
diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/pac_turtle.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/pac_turtle.asset
index 1a4151cdf0..80a958ef74 100644
--- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/pac_turtle.asset
+++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/pac_turtle.asset
@@ -28,6 +28,7 @@ local Layer = {
   Identifier = Identifier,
   Name = Name,
   Enabled = asset.enabled,
+  ZIndex = 100,
   Type = "TemporalTileProvider",
   Mode = "Folder",
   Folder = {
diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/phytoplankton.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/phytoplankton.asset
index dd262a0677..1d4c398009 100644
--- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/phytoplankton.asset
+++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/phytoplankton.asset
@@ -33,6 +33,7 @@ local Layer = {
   Identifier = Identifier,
   Name = Name,
   Enabled = asset.enabled,
+  ZIndex = 100,
   Type = "ImageSequenceTileProvider",
   FolderPath = syncedDirectory .. "images",
   Description = Description
diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/pr_tsunami.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/pr_tsunami.asset
index 78b14d4818..2493273bb2 100644
--- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/pr_tsunami.asset
+++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/pr_tsunami.asset
@@ -29,6 +29,7 @@ local Layer = {
   Identifier = Identifier,
   Name = Name,
   Enabled = asset.enabled,
+  ZIndex = 100,
   Type = "ImageSequenceTileProvider",
   FolderPath = syncedDirectory .. "2048",
   Description = Description
diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/reefs_risk.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/reefs_risk.asset
index 720127aecb..eb24d8a48e 100644
--- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/reefs_risk.asset
+++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/reefs_risk.asset
@@ -35,6 +35,7 @@ local syncedDirectory = asset.resource({
 local Layer2012 = {
   Identifier = Identifier .. "-2012",
   Name = Name .. " (2012)",
+  ZIndex = 100,
   FilePath = syncedDirectory .. "2012_2048.jpg",
   Description = Description
 }
@@ -42,6 +43,7 @@ local Layer2012 = {
 local Layer2030 = {
   Identifier = Identifier .. "-2030",
   Name = Name .. " (2030)",
+  ZIndex = 100,
   FilePath = syncedDirectory .. "2030_2048.jpg",
   Description = Description
 }
@@ -49,6 +51,7 @@ local Layer2030 = {
 local Layer2050 = {
   Identifier = Identifier .. "-2050",
   Name = Name .. " (2050)",
+  ZIndex = 100,
   FilePath = syncedDirectory .. "2050_2048.jpg",
   Description = Description
 }
diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/sea_level.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/sea_level.asset
index c5f092c2c3..ae542a92f3 100644
--- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/sea_level.asset
+++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/sea_level.asset
@@ -34,6 +34,7 @@ local Layer = {
   Identifier = Identifier,
   Name = Name,
   Enabled = asset.enabled,
+  ZIndex = 100,
   Type = "ImageSequenceTileProvider",
   FolderPath = syncedDirectory .. "4000",
   Description = Description
diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/sea_level_trends.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/sea_level_trends.asset
index 9757aa3491..657a9ddef1 100644
--- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/sea_level_trends.asset
+++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/sea_level_trends.asset
@@ -34,6 +34,7 @@ local Layer = {
   Identifier = Identifier,
   Name = Name,
   Enabled = asset.enabled,
+  ZIndex = 100,
   FilePath = syncedDirectory .. "4096.png",
   Description = Description
 }
diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/sea_surface_height_anomaly.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/sea_surface_height_anomaly.asset
index 71c12a4abc..2ae624f864 100644
--- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/sea_surface_height_anomaly.asset
+++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/sea_surface_height_anomaly.asset
@@ -30,6 +30,7 @@ local Layer = {
   Identifier = Identifier,
   Name = Name,
   Enabled = asset.enabled,
+  ZIndex = 100,
   Type = "ImageSequenceTileProvider",
   FolderPath = syncedDirectory .. "images",
   Description = Description
diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/seaice_monthly.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/seaice_monthly.asset
index 7ddcc88c9a..243aef7d89 100644
--- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/seaice_monthly.asset
+++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/seaice_monthly.asset
@@ -28,6 +28,7 @@ local Layer = {
   Identifier = Identifier,
   Name = Name,
   Enabled = asset.enabled,
+  ZIndex = 100,
   Type = "TemporalTileProvider",
   Mode = "Folder",
   Folder = {
diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/seaice_radiation.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/seaice_radiation.asset
index 52963b7232..d3f261f577 100644
--- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/seaice_radiation.asset
+++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/seaice_radiation.asset
@@ -24,6 +24,7 @@ local syncedDirectory = asset.resource({
 local LayerFraction = {
   Identifier = Identifier,
   Name = Name,
+  ZIndex = 100,
   FilePath = syncedDirectory .. "sea_ice_fraction.png",
   Description = Description
 }
@@ -31,6 +32,7 @@ local LayerFraction = {
 local LayerSolar = {
   Identifier = Identifier .. "-solar",
   Name = Name .. " (Solar)",
+  ZIndex = 100,
   FilePath = syncedDirectory .. "solar.png",
   Description = Description
 }
diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/seawifs-land_background.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/seawifs-land_background.asset
index b670d3816b..089e6046fd 100644
--- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/seawifs-land_background.asset
+++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/seawifs-land_background.asset
@@ -23,6 +23,7 @@ local Layer = {
   Identifier = Identifier,
   Name = Name,
   Enabled = asset.enabled,
+  ZIndex = 100,
   Type = "ImageSequenceTileProvider",
   FolderPath = syncedDirectory .. "4096",
   Description = Description
diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/seawifs-no_holes.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/seawifs-no_holes.asset
index 765a94802f..519f7c7b11 100644
--- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/seawifs-no_holes.asset
+++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/seawifs-no_holes.asset
@@ -24,6 +24,7 @@ local Layer = {
   Identifier = Identifier,
   Name = Name,
   Enabled = asset.enabled,
+  ZIndex = 100,
   Type = "ImageSequenceTileProvider",
   FolderPath = syncedDirectory .. "2048",
   Description = Description
diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/seawifs-polar_holes.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/seawifs-polar_holes.asset
index bc98e00dc9..21a8f989ea 100644
--- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/seawifs-polar_holes.asset
+++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/seawifs-polar_holes.asset
@@ -24,6 +24,7 @@ local Layer = {
   Identifier = Identifier,
   Name = Name,
   Enabled = asset.enabled,
+  ZIndex = 100,
   Type = "ImageSequenceTileProvider",
   FolderPath = syncedDirectory .. "4320_png",
   Description = Description
diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/shark.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/shark.asset
index 89d70e40ca..2007d19977 100644
--- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/shark.asset
+++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/shark.asset
@@ -29,6 +29,7 @@ local Layer = {
   Identifier = Identifier,
   Name = Name,
   Enabled = asset.enabled,
+  ZIndex = 100,
   Type = "TemporalTileProvider",
   Mode = "Folder",
   Folder = {
diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/ship_tracks-mosaic.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/ship_tracks-mosaic.asset
index 773ea2dba6..a312f5690c 100644
--- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/ship_tracks-mosaic.asset
+++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/ship_tracks-mosaic.asset
@@ -34,6 +34,7 @@ local Layer = {
   Identifier = Identifier,
   Name = Name,
   Enabled = asset.enabled,
+  ZIndex = 100,
   FilePath = syncedDirectory .. "4096.png",
   Description = Description
 }
diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/ship_tracks-tracks.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/ship_tracks-tracks.asset
index e9bd96ea0e..88c8818272 100644
--- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/ship_tracks-tracks.asset
+++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/ship_tracks-tracks.asset
@@ -34,6 +34,7 @@ local Layer = {
   Identifier = Identifier,
   Name = Name,
   Enabled = asset.enabled,
+  ZIndex = 100,
   FilePath = syncedDirectory .. "4096.png",
   Description = Description
 }
diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/shipping.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/shipping.asset
index 6b36871784..56fc4a706c 100644
--- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/shipping.asset
+++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/shipping.asset
@@ -29,6 +29,7 @@ local Layer = {
   Identifier = Identifier,
   Name = Name,
   Enabled = asset.enabled,
+  ZIndex = 100,
   FilePath = syncedDirectory .. "4096.jpg",
   Description = Description
 }
diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/species_richness.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/species_richness.asset
index 9ea1b64c46..e558ee8629 100644
--- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/species_richness.asset
+++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/species_richness.asset
@@ -32,6 +32,7 @@ local Layer = {
   Identifier = Identifier,
   Name = Name,
   Enabled = asset.enabled,
+  ZIndex = 100,
   FilePath = syncedDirectory .. "4096.png",
   Description = Description
 }
diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/sss.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/sss.asset
index f7fe11873c..3cfe2a4c62 100644
--- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/sss.asset
+++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/sss.asset
@@ -27,6 +27,7 @@ local Layer = {
   Identifier = Identifier,
   Name = Name,
   Enabled = asset.enabled,
+  ZIndex = 100,
   Type = "ImageSequenceTileProvider",
   FolderPath = syncedDirectory .. "4096",
   Description = Description
diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/sst_1980_1999.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/sst_1980_1999.asset
index 6206025b57..00bebcb565 100644
--- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/sst_1980_1999.asset
+++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/sst_1980_1999.asset
@@ -29,6 +29,7 @@ local Layer = {
   Identifier = Identifier,
   Name = Name,
   Enabled = asset.enabled,
+  ZIndex = 100,
   Type = "TemporalTileProvider",
   Mode = "Folder",
   Folder = {
diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/tsunami_historical_series-alaska.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/tsunami_historical_series-alaska.asset
index bbe1c9024b..6323f149d9 100644
--- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/tsunami_historical_series-alaska.asset
+++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/tsunami_historical_series-alaska.asset
@@ -37,6 +37,7 @@ local syncedDirectory = asset.resource({
 local LayerCoastal = {
   Identifier = Identifier .. "-coastal",
   Name = Name .. " (Coastal)",
+  ZIndex = 100,
   FilePath = syncedDirectory .. "Tsunami_Coastal_Map_Alaska_1964_4k.jpg",
   Description = Description
 }
@@ -44,6 +45,7 @@ local LayerCoastal = {
 local LayerEnergyCoastal = {
   Identifier = Identifier .. "-energy_coastal",
   Name = Name .. " (Energy Coastal)",
+  ZIndex = 100,
   FilePath = syncedDirectory .. "Tsunami_Energy+Coastal_Map_Alaska_1964_4k.jpg",
   Description = Description
 }
@@ -51,6 +53,7 @@ local LayerEnergyCoastal = {
 local LayerEnergy = {
   Identifier = Identifier .. "-energy",
   Name = Name .. " (Energy)",
+  ZIndex = 100,
   FilePath = syncedDirectory .. "Tsunami_Energy_Map_Alaska_1964_4k.jpg",
   Description = Description
 }
@@ -58,6 +61,7 @@ local LayerEnergy = {
 local LayerNull = {
   Identifier = Identifier .. "-null",
   Name = Name .. " (Null)",
+  ZIndex = 100,
   FilePath = syncedDirectory .. "Tsunami_Null_Coastal_Map_Alaska_1964_4k.jpg",
   Description = Description
 }
diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/tsunami_historical_series-aleutians.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/tsunami_historical_series-aleutians.asset
index 2c3a881556..6c9c152f3b 100644
--- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/tsunami_historical_series-aleutians.asset
+++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/tsunami_historical_series-aleutians.asset
@@ -34,6 +34,7 @@ local syncedDirectory = asset.resource({
 local LayerCoastal = {
   Identifier = Identifier .. "-coastal",
   Name = Name .. " (Coastal)",
+  ZIndex = 100,
   FilePath = syncedDirectory .. "Tsunami_Coastal_Map_Aleutians_1946_2k.jpg",
   Description = Description
 }
@@ -41,6 +42,7 @@ local LayerCoastal = {
 local LayerEnergyCoastal = {
   Identifier = Identifier .. "-energy_coastal",
   Name = Name .. " (Energy Coastal)",
+  ZIndex = 100,
   FilePath = syncedDirectory .. "Tsunami_Energy+Coastal_Map_Aleutians_1946_4k.jpg",
   Description = Description
 }
@@ -48,6 +50,7 @@ local LayerEnergyCoastal = {
 local LayerEnergy = {
   Identifier = Identifier .. "-energy",
   Name = Name .. " (Energy)",
+  ZIndex = 100,
   FilePath = syncedDirectory .. "Tsunami_Energy_Map_Aleutians_1946_4k.jpg",
   Description = Description
 }
@@ -55,6 +58,7 @@ local LayerEnergy = {
 local LayerNull = {
   Identifier = Identifier .. "-null",
   Name = Name .. " (Null)",
+  ZIndex = 100,
   FilePath = syncedDirectory .. "Tsunami_Null_Coastal_Map_Aleutians_1946_4k.jpg",
   Description = Description
 }
diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/tsunami_historical_series-aleutians_1957.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/tsunami_historical_series-aleutians_1957.asset
index 3c1bdbad9f..a3388ca4dd 100644
--- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/tsunami_historical_series-aleutians_1957.asset
+++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/tsunami_historical_series-aleutians_1957.asset
@@ -36,6 +36,7 @@ local syncedDirectory = asset.resource({
 local LayerCoastal = {
   Identifier = Identifier .. "-coastal",
   Name = Name .. " (Coastal)",
+  ZIndex = 100,
   FilePath = syncedDirectory .. "Tsunami_Coastal_Map_Aleutians_1957_2k.jpg",
   Description = Description
 }
@@ -43,6 +44,7 @@ local LayerCoastal = {
 local LayerEnergyCoastal = {
   Identifier = Identifier .. "-energy_coastal",
   Name = Name .. " (Energy Coastal)",
+  ZIndex = 100,
   FilePath = syncedDirectory .. "Tsunami_Energy+Coastal_Map_Aleutians_1957_2k.jpg",
   Description = Description
 }
@@ -50,6 +52,7 @@ local LayerEnergyCoastal = {
 local LayerEnergy = {
   Identifier = Identifier .. "-energy",
   Name = Name .. " (Energy)",
+  ZIndex = 100,
   FilePath = syncedDirectory .. "Tsunami_Energy_Map_Aleutians_1957_2k.jpg",
   Description = Description
 }
@@ -57,6 +60,7 @@ local LayerEnergy = {
 local LayerNull = {
   Identifier = Identifier .. "-null",
   Name = Name .. " (Null)",
+  ZIndex = 100,
   FilePath = syncedDirectory .. "Tsunami_Null_Coastal_Map_Aleutians_1957_2k.jpg",
   Description = Description
 }
diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/tsunami_historical_series-cascadia.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/tsunami_historical_series-cascadia.asset
index c6d07d7ef8..989083fc1d 100644
--- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/tsunami_historical_series-cascadia.asset
+++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/tsunami_historical_series-cascadia.asset
@@ -37,6 +37,7 @@ local syncedDirectory = asset.resource({
 local LayerCoastal = {
   Identifier = Identifier .. "-coastal",
   Name = Name .. " (Coastal)",
+  ZIndex = 100,
   FilePath = syncedDirectory .. "Tsunami_Coastal_Map_Cascadia_1700_4k.jpg",
   Description = Description
 }
@@ -44,6 +45,7 @@ local LayerCoastal = {
 local LayerEnergyCoastal = {
   Identifier = Identifier .. "-energy_coastal",
   Name = Name .. " (Energy Coastal)",
+  ZIndex = 100,
   FilePath = syncedDirectory .. "Tsunami_Energy+Coastal_Map_Cascadia_1700_4k.jpg",
   Description = Description
 }
@@ -51,6 +53,7 @@ local LayerEnergyCoastal = {
 local LayerEnergy = {
   Identifier = Identifier .. "-energy",
   Name = Name .. " (Energy)",
+  ZIndex = 100,
   FilePath = syncedDirectory .. "Tsunami_Energy_Map_Cascadia_1700_4k.jpg",
   Description = Description
 }
@@ -58,6 +61,7 @@ local LayerEnergy = {
 local LayerNull = {
   Identifier = Identifier .. "-null",
   Name = Name .. " (Null)",
+  ZIndex = 100,
   FilePath = syncedDirectory .. "Tsunami_Null_Coastal_Map_Cascadia_1700_4k.jpg",
   Description = Description
 }
diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/tsunami_historical_series-chile.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/tsunami_historical_series-chile.asset
index 89b087b975..26790390f0 100644
--- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/tsunami_historical_series-chile.asset
+++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/tsunami_historical_series-chile.asset
@@ -39,6 +39,7 @@ local syncedDirectory = asset.resource({
 local LayerCoastal = {
   Identifier = Identifier .. "-coastal",
   Name = Name .. " (Coastal)",
+  ZIndex = 100,
   FilePath = syncedDirectory .. "Tsunami_Coastal_Map_Chile_2010_2k.jpg",
   Description = Description
 }
@@ -46,6 +47,7 @@ local LayerCoastal = {
 local LayerEnergyCoastal = {
   Identifier = Identifier .. "-energy_coastal",
   Name = Name .. " (Energy Coastal)",
+  ZIndex = 100,
   FilePath = syncedDirectory .. "Tsunami_Energy+Coastal_Map_Chile_2010_4k.jpg",
   Description = Description
 }
@@ -53,6 +55,7 @@ local LayerEnergyCoastal = {
 local LayerEnergy = {
   Identifier = Identifier .. "-energy",
   Name = Name .. " (Energy)",
+  ZIndex = 100,
   FilePath = syncedDirectory .. "Tsunami_Energy_Map_Chile_2010_4k.jpg",
   Description = Description
 }
@@ -60,6 +63,7 @@ local LayerEnergy = {
 local LayerNull = {
   Identifier = Identifier .. "-null",
   Name = Name .. " (Null)",
+  ZIndex = 100,
   FilePath = syncedDirectory .. "Tsunami_Null_Coastal_Map_Chile_2010_4k.jpg",
   Description = Description
 }
diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/tsunami_historical_series-japan.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/tsunami_historical_series-japan.asset
index d3d26e05fc..2509dd1fba 100644
--- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/tsunami_historical_series-japan.asset
+++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/tsunami_historical_series-japan.asset
@@ -44,6 +44,7 @@ local syncedDirectory = asset.resource({
 local LayerCoastal = {
   Identifier = Identifier .. "-coastal",
   Name = Name .. " (Coastal)",
+  ZIndex = 100,
   FilePath = syncedDirectory .. "Tsunami_Coastal_Map_Japan_2011_4k.jpg",
   Description = Description
 }
@@ -51,6 +52,7 @@ local LayerCoastal = {
 local LayerEnergyCoastal = {
   Identifier = Identifier .. "-energy_coastal",
   Name = Name .. " (Energy Coastal)",
+  ZIndex = 100,
   FilePath = syncedDirectory .. "Tsunami_Energy+Coastal_Map_Japan_2011_4k.jpg",
   Description = Description
 }
@@ -58,6 +60,7 @@ local LayerEnergyCoastal = {
 local LayerEnergy = {
   Identifier = Identifier .. "-energy",
   Name = Name .. " (Energy)",
+  ZIndex = 100,
   FilePath = syncedDirectory .. "Tsunami_Energy_Map_Japan_2011_4k.jpg",
   Description = Description
 }
@@ -65,6 +68,7 @@ local LayerEnergy = {
 local LayerNull = {
   Identifier = Identifier .. "-null",
   Name = Name .. " (Null)",
+  ZIndex = 100,
   FilePath = syncedDirectory .. "Tsunami_Null_Coastal_Map_Japan_2011_4k.jpg",
   Description = Description
 }
diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/tsunami_historical_series-lisbon.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/tsunami_historical_series-lisbon.asset
index bbb689a831..b36cdcdabc 100644
--- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/tsunami_historical_series-lisbon.asset
+++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/tsunami_historical_series-lisbon.asset
@@ -27,6 +27,7 @@ local syncedDirectory = asset.resource({
 local LayerCoastal = {
   Identifier = Identifier .. "-coastal",
   Name = Name .. " (Coastal)",
+  ZIndex = 100,
   FilePath = syncedDirectory .. "Tsunami_Coastal_Map_Lisbon_1755_4k.jpg",
   Description = Description
 }
@@ -34,6 +35,7 @@ local LayerCoastal = {
 local LayerEnergyCoastal = {
   Identifier = Identifier .. "-energy_coastal",
   Name = Name .. " (Energy Coastal)",
+  ZIndex = 100,
   FilePath = syncedDirectory .. "Tsunami_Energy+Coastal_Map_Lisbon_1755_4k.jpg",
   Description = Description
 }
@@ -41,6 +43,7 @@ local LayerEnergyCoastal = {
 local LayerEnergy = {
   Identifier = Identifier .. "-energy",
   Name = Name .. " (Energy)",
+  ZIndex = 100,
   FilePath = syncedDirectory .. "Tsunami_Energy_Map_Lisbon_1755_4k.jpg",
   Description = Description
 }
@@ -48,6 +51,7 @@ local LayerEnergy = {
 local LayerNull = {
   Identifier = Identifier .. "-null",
   Name = Name .. " (Null)",
+  ZIndex = 100,
   FilePath = syncedDirectory .. "Tsunami_Null_Coastal_Map_Lisbon_1755_4k.jpg",
   Description = Description
 }
diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/tsunami_historical_series-samoa.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/tsunami_historical_series-samoa.asset
index 7b25322717..478112a407 100644
--- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/tsunami_historical_series-samoa.asset
+++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/tsunami_historical_series-samoa.asset
@@ -29,6 +29,7 @@ local syncedDirectory = asset.resource({
 local LayerCoastal = {
   Identifier = Identifier .. "-coastal",
   Name = Name .. " (Coastal)",
+  ZIndex = 100,
   FilePath = syncedDirectory .. "Tsunami_Coastal_Map_Samoa_2009_4k.jpg",
   Description = Description
 }
@@ -36,6 +37,7 @@ local LayerCoastal = {
 local LayerEnergyCoastal = {
   Identifier = Identifier .. "-energy_coastal",
   Name = Name .. " (Energy Coastal)",
+  ZIndex = 100,
   FilePath = syncedDirectory .. "Tsunami_Energy+Coastal_Map_Samoa_2009_4k.jpg",
   Description = Description
 }
@@ -43,6 +45,7 @@ local LayerEnergyCoastal = {
 local LayerEnergy = {
   Identifier = Identifier .. "-energy",
   Name = Name .. " (Energy)",
+  ZIndex = 100,
   FilePath = syncedDirectory .. "Tsunami_Energy_Map_Samoa_2009_4k.jpg",
   Description = Description
 }
@@ -50,6 +53,7 @@ local LayerEnergy = {
 local LayerNull = {
   Identifier = Identifier .. "-null",
   Name = Name .. " (Null)",
+  ZIndex = 100,
   FilePath = syncedDirectory .. "Tsunami_Null_Coastal_Map_Samoa_2009_4k.jpg",
   Description = Description
 }
diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/tsunami_historical_series-sumatra.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/tsunami_historical_series-sumatra.asset
index af71950876..a441848ab3 100644
--- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/tsunami_historical_series-sumatra.asset
+++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/tsunami_historical_series-sumatra.asset
@@ -23,6 +23,7 @@ local syncedDirectory = asset.resource({
 local LayerCoastal = {
   Identifier = Identifier .. "-coastal",
   Name = Name .. " (Coastal)",
+  ZIndex = 100,
   FilePath = syncedDirectory .. "Tsunami_Coastal_Map_Sumatra_2004_2k.jpg",
   Description = Description
 }
@@ -30,6 +31,7 @@ local LayerCoastal = {
 local LayerEnergyCoastal = {
   Identifier = Identifier .. "-energy_coastal",
   Name = Name .. " (Energy Coastal)",
+  ZIndex = 100,
   FilePath = syncedDirectory .. "Tsunami_Energy+Coastal_Map_Sumatra_2004_2k.jpg",
   Description = Description
 }
@@ -37,6 +39,7 @@ local LayerEnergyCoastal = {
 local LayerEnergy = {
   Identifier = Identifier .. "-energy",
   Name = Name .. " (Energy)",
+  ZIndex = 100,
   FilePath = syncedDirectory .. "Tsunami_Energy_Map_Sumatra_2004_2k.jpg",
   Description = Description
 }
@@ -44,6 +47,7 @@ local LayerEnergy = {
 local LayerNull = {
   Identifier = Identifier .. "-null",
   Name = Name .. " (Null)",
+  ZIndex = 100,
   FilePath = syncedDirectory .. "Tsunami_Null_Coastal_Map_Sumatra_2004_2k.jpg",
   Description = Description
 }
diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/tsunami_locations.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/tsunami_locations.asset
index 5e2e99ca81..4686defc81 100644
--- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/tsunami_locations.asset
+++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/tsunami_locations.asset
@@ -33,6 +33,7 @@ local syncedDirectory = asset.resource({
 local LayerBase = {
   Identifier = Identifier,
   Name = Name,
+  ZIndex = 100,
   FilePath = syncedDirectory .. "4096.jpg",
   Description = Description
 }
@@ -40,6 +41,7 @@ local LayerBase = {
 local LayerGray = {
   Identifier = Identifier .. "-gray",
   Name = Name .. " (Gray)",
+  ZIndex = 100,
   FilePath = syncedDirectory .. "gray_earth_with_countries_4096.png",
   Description = Description
 }
@@ -47,6 +49,7 @@ local LayerGray = {
 local LayerNeutral = {
   Identifier = Identifier .. "-neutral",
   Name = Name .. " (Neutral)",
+  ZIndex = 100,
   FilePath = syncedDirectory .. "natural_earth_with_countries_4096.png",
   Description = Description
 }
@@ -54,6 +57,7 @@ local LayerNeutral = {
 local LayerEvents = {
   Identifier = Identifier .. "-events",
   Name = Name .. " (Events)",
+  ZIndex = 100,
   FilePath = syncedDirectory .. "tsunami_events.png",
   Description = Description
 }
diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/vector_winds.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/vector_winds.asset
index 5fb452633a..0214937e25 100644
--- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/vector_winds.asset
+++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/vector_winds.asset
@@ -30,6 +30,7 @@ local Layer = {
   Identifier = Identifier,
   Name = Name,
   Enabled = asset.enabled,
+  ZIndex = 100,
   Type = "ImageSequenceTileProvider",
   FolderPath = syncedDirectory .. "images",
   Description = Description
diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/vent_discoveries_animation.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/vent_discoveries_animation.asset
index 3e5ef81dc7..c25615c846 100644
--- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/vent_discoveries_animation.asset
+++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/vent_discoveries_animation.asset
@@ -26,6 +26,7 @@ local Layer = {
   Identifier = Identifier,
   Name = Name,
   Enabled = asset.enabled,
+  ZIndex = 100,
   Type = "TemporalTileProvider",
   Mode = "Folder",
   Folder = {
diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/vent_locations.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/vent_locations.asset
index 30bd1411c8..df0aa90224 100644
--- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/vent_locations.asset
+++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/vent_locations.asset
@@ -25,6 +25,7 @@ local Layer = {
   Identifier = Identifier,
   Name = Name,
   Enabled = asset.enabled,
+  ZIndex = 100,
   FilePath = syncedDirectory .. "vents_2016.png",
   Description = Description
 }
diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/vorticity.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/vorticity.asset
index fd43cf69c1..bbaa0338a3 100644
--- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/vorticity.asset
+++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/vorticity.asset
@@ -27,6 +27,7 @@ local Layer = {
   Identifier = Identifier,
   Name = Name,
   Enabled = asset.enabled,
+  ZIndex = 100,
   Type = "ImageSequenceTileProvider",
   FolderPath = syncedDirectory .. "frames",
   Description = Description
diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/waves-wave_height_2012.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/waves-wave_height_2012.asset
index 2dd68ccffc..51b396b042 100644
--- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/waves-wave_height_2012.asset
+++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/waves-wave_height_2012.asset
@@ -24,6 +24,7 @@ local Layer = {
   Identifier = Identifier,
   Name = Name,
   Enabled = asset.enabled,
+  ZIndex = 100,
   Type = "ImageSequenceTileProvider",
   FolderPath = syncedDirectory .. "4096",
   Description = Description
diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/waves-wave_height_katrina.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/waves-wave_height_katrina.asset
index 52f41c1189..e5b2e3af7a 100644
--- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/waves-wave_height_katrina.asset
+++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/waves-wave_height_katrina.asset
@@ -26,6 +26,7 @@ local Layer = {
   Identifier = Identifier,
   Name = Name,
   Enabled = asset.enabled,
+  ZIndex = 100,
   Type = "ImageSequenceTileProvider",
   FolderPath = syncedDirectory .. "4096",
   Description = Description
diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/waves-wave_height_sandy.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/waves-wave_height_sandy.asset
index 44d1229ed5..f85d3b1abe 100644
--- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/waves-wave_height_sandy.asset
+++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/waves-wave_height_sandy.asset
@@ -26,6 +26,7 @@ local Layer = {
   Identifier = Identifier,
   Name = Name,
   Enabled = asset.enabled,
+  ZIndex = 100,
   Type = "ImageSequenceTileProvider",
   FolderPath = syncedDirectory .. "4096",
   Description = Description
diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/waves-wave_power_2012.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/waves-wave_power_2012.asset
index 18f19e88dc..2beef43b7e 100644
--- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/waves-wave_power_2012.asset
+++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/waves-wave_power_2012.asset
@@ -24,6 +24,7 @@ local Layer = {
   Identifier = Identifier,
   Name = Name,
   Enabled = asset.enabled,
+  ZIndex = 100,
   Type = "ImageSequenceTileProvider",
   FolderPath = syncedDirectory .. "4096",
   Description = Description
diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/weeklyseaice-10day_seaice.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/weeklyseaice-10day_seaice.asset
index 8c6b7ce635..e98ddf5e3f 100644
--- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/weeklyseaice-10day_seaice.asset
+++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/weeklyseaice-10day_seaice.asset
@@ -30,6 +30,7 @@ local Layer = {
   Identifier = Identifier,
   Name = Name,
   Enabled = asset.enabled,
+  ZIndex = 100,
   Type = "TemporalTileProvider",
   Mode = "Folder",
   Folder = {
diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/weeklyseaice-sept_seaice.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/weeklyseaice-sept_seaice.asset
index 47dcb5639e..26d21af5e5 100644
--- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/weeklyseaice-sept_seaice.asset
+++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/weeklyseaice-sept_seaice.asset
@@ -38,6 +38,7 @@ local Layer = {
   Identifier = Identifier,
   Name = Name,
   Enabled = asset.enabled,
+  ZIndex = 100,
   Type = "TemporalTileProvider",
   Mode = "Folder",
   Folder = {
diff --git a/data/assets/scene/solarsystem/planets/jupiter/callisto/layers/colorlayers/callisto_texture.asset b/data/assets/scene/solarsystem/planets/jupiter/callisto/layers/colorlayers/callisto_texture.asset
index 804a5838d9..bb9a531bb8 100644
--- a/data/assets/scene/solarsystem/planets/jupiter/callisto/layers/colorlayers/callisto_texture.asset
+++ b/data/assets/scene/solarsystem/planets/jupiter/callisto/layers/colorlayers/callisto_texture.asset
@@ -13,7 +13,8 @@ local texturesPath = asset.resource({
 local Layer = {
   Identifier = "Texture",
   FilePath = texturesPath .. "callisto_os.tif",
-  Enabled = asset.enabled
+  Enabled = asset.enabled,
+  ZIndex = 5
 }
 
 
diff --git a/data/assets/scene/solarsystem/planets/jupiter/europa/layers/colorlayers/europa_texture.asset b/data/assets/scene/solarsystem/planets/jupiter/europa/layers/colorlayers/europa_texture.asset
index e0f15f1f0b..a4997b77ca 100644
--- a/data/assets/scene/solarsystem/planets/jupiter/europa/layers/colorlayers/europa_texture.asset
+++ b/data/assets/scene/solarsystem/planets/jupiter/europa/layers/colorlayers/europa_texture.asset
@@ -13,7 +13,8 @@ local texturesPath = asset.resource({
 local Layer = {
   Identifier = "Texture",
   FilePath = texturesPath .. "europa_os.tif",
-  Enabled = asset.enabled
+  Enabled = asset.enabled,
+  ZIndex = 5
 }
 
 
diff --git a/data/assets/scene/solarsystem/planets/jupiter/europa/layers/colorlayers/voyager_global_mosaic_local.asset b/data/assets/scene/solarsystem/planets/jupiter/europa/layers/colorlayers/voyager_global_mosaic_local.asset
index 5ceec9e9b1..03e9a550b7 100644
--- a/data/assets/scene/solarsystem/planets/jupiter/europa/layers/colorlayers/voyager_global_mosaic_local.asset
+++ b/data/assets/scene/solarsystem/planets/jupiter/europa/layers/colorlayers/voyager_global_mosaic_local.asset
@@ -14,6 +14,7 @@ local Layer = {
   Identifier = "Voyager_Global_Mosaic_Local",
   Name = "Voyager Global Mosaic [Local]",
   Enabled = asset.enabled,
+  ZIndex = 10,
   FilePath = texturesPath .. "evgos.vrt",
   BlendMode = "Color"
 }
diff --git a/data/assets/scene/solarsystem/planets/jupiter/europa/layers/colorlayers/voyager_global_mosaic_newyork.asset b/data/assets/scene/solarsystem/planets/jupiter/europa/layers/colorlayers/voyager_global_mosaic_newyork.asset
index 9bdc27c2b4..00bf144cef 100644
--- a/data/assets/scene/solarsystem/planets/jupiter/europa/layers/colorlayers/voyager_global_mosaic_newyork.asset
+++ b/data/assets/scene/solarsystem/planets/jupiter/europa/layers/colorlayers/voyager_global_mosaic_newyork.asset
@@ -6,6 +6,7 @@ local Layer = {
   Identifier = "Voyager_Global_Mosaic_NewYork",
   Name = "Voyager Global Mosaic [New York]",
   Enabled = asset.enabled,
+  ZIndex = 10,
   FilePath = asset.resource("voyager_global_mosaic_newyork.wms"),
   BlendMode = "Color"
 }
diff --git a/data/assets/scene/solarsystem/planets/jupiter/europa/layers/colorlayers/voyager_global_mosaic_sweden.asset b/data/assets/scene/solarsystem/planets/jupiter/europa/layers/colorlayers/voyager_global_mosaic_sweden.asset
index 3687982f7d..9e578d873c 100644
--- a/data/assets/scene/solarsystem/planets/jupiter/europa/layers/colorlayers/voyager_global_mosaic_sweden.asset
+++ b/data/assets/scene/solarsystem/planets/jupiter/europa/layers/colorlayers/voyager_global_mosaic_sweden.asset
@@ -6,6 +6,7 @@ local Layer = {
   Identifier = "Voyager_Global_Mosaic_sweden",
   Name = "Voyager Global Mosaic [Sweden]",
   Enabled = asset.enabled,
+  ZIndex = 10,
   FilePath = asset.resource("voyager_global_mosaic_sweden.wms"),
   BlendMode = "Color"
 }
diff --git a/data/assets/scene/solarsystem/planets/jupiter/ganymede/layers/colorlayers/ganymede_texture.asset b/data/assets/scene/solarsystem/planets/jupiter/ganymede/layers/colorlayers/ganymede_texture.asset
index ab2bebba5e..d86342d558 100644
--- a/data/assets/scene/solarsystem/planets/jupiter/ganymede/layers/colorlayers/ganymede_texture.asset
+++ b/data/assets/scene/solarsystem/planets/jupiter/ganymede/layers/colorlayers/ganymede_texture.asset
@@ -14,6 +14,7 @@ local Layer = {
   Identifier = "Texture",
   FilePath = texturesPath .. "ganymede.jpg",
   Enabled = asset.enabled,
+  ZIndex = 5,
   CacheSettings = { Enabled = false }
 }
 
diff --git a/data/assets/scene/solarsystem/planets/jupiter/io/layers/colorlayers/io_texture.asset b/data/assets/scene/solarsystem/planets/jupiter/io/layers/colorlayers/io_texture.asset
index 406767562b..e3cb09a5e7 100644
--- a/data/assets/scene/solarsystem/planets/jupiter/io/layers/colorlayers/io_texture.asset
+++ b/data/assets/scene/solarsystem/planets/jupiter/io/layers/colorlayers/io_texture.asset
@@ -14,6 +14,7 @@ local Layer = {
   Identifier = "Texture",
   FilePath = texturesPath .. "io.jpg",
   Enabled = asset.enabled,
+  ZIndex = 5,
   CacheSettings = { Enabled = false }
 }
 
diff --git a/data/assets/scene/solarsystem/planets/jupiter/layers/colorlayers/jupiter_texture.asset b/data/assets/scene/solarsystem/planets/jupiter/layers/colorlayers/jupiter_texture.asset
index 2a88336998..639de8b996 100644
--- a/data/assets/scene/solarsystem/planets/jupiter/layers/colorlayers/jupiter_texture.asset
+++ b/data/assets/scene/solarsystem/planets/jupiter/layers/colorlayers/jupiter_texture.asset
@@ -14,6 +14,7 @@ local Layer = {
   Identifier = "Texture",
   FilePath = texturesPath .. "jupiter_os.tif",
   Enabled = asset.enabled,
+  ZIndex = 5,
   CacheSettings = { Enabled = false }
 }
 
diff --git a/data/assets/scene/solarsystem/planets/jupiter/layers/colorlayers/jupiter_video.asset b/data/assets/scene/solarsystem/planets/jupiter/layers/colorlayers/jupiter_video.asset
index bb189fbade..5b16e1d624 100644
--- a/data/assets/scene/solarsystem/planets/jupiter/layers/colorlayers/jupiter_video.asset
+++ b/data/assets/scene/solarsystem/planets/jupiter/layers/colorlayers/jupiter_video.asset
@@ -15,6 +15,7 @@ local Layer = {
   Identifier = "JupiterVideo",
   Name = "Jupiter Video",
   Enabled = true,
+  ZIndex = 10,
   Video = data .. "/jupiter_movie_3600.mp4"
 }
 
diff --git a/data/assets/scene/solarsystem/planets/mars/layers/colorlayers/ctx_blended.asset b/data/assets/scene/solarsystem/planets/mars/layers/colorlayers/ctx_blended.asset
index e9dd435845..12563bf9d6 100644
--- a/data/assets/scene/solarsystem/planets/mars/layers/colorlayers/ctx_blended.asset
+++ b/data/assets/scene/solarsystem/planets/mars/layers/colorlayers/ctx_blended.asset
@@ -6,6 +6,7 @@ local Layer = {
   Identifier = "CTX_blended",
   Name = "CTX Blended",
   Enabled = asset.enabled,
+  ZIndex = 60,
   FilePath = asset.resource("ctx_blended.vrt"),
   BlendMode = "Color",
   Description = [[The Bruce Murray Laboratory for Planetary Visualization has completed a
diff --git a/data/assets/scene/solarsystem/planets/mars/layers/colorlayers/ctx_blended_beta01.asset b/data/assets/scene/solarsystem/planets/mars/layers/colorlayers/ctx_blended_beta01.asset
index 9a71f5cd2e..6ad3eb70e8 100644
--- a/data/assets/scene/solarsystem/planets/mars/layers/colorlayers/ctx_blended_beta01.asset
+++ b/data/assets/scene/solarsystem/planets/mars/layers/colorlayers/ctx_blended_beta01.asset
@@ -6,6 +6,7 @@ local Layer = {
   Identifier = "CTX_blended_01",
   Name = "CTX Blended beta01",
   Enabled = asset.enabled,
+  ZIndex = 60,
   FilePath = asset.resource("ctx_blended_beta01.vrt"),
   BlendMode = "Color",
   Settings = {
diff --git a/data/assets/scene/solarsystem/planets/mars/layers/colorlayers/ctx_mosaic_newyork.asset b/data/assets/scene/solarsystem/planets/mars/layers/colorlayers/ctx_mosaic_newyork.asset
index cd89d5bc20..0c5d1b50b2 100644
--- a/data/assets/scene/solarsystem/planets/mars/layers/colorlayers/ctx_mosaic_newyork.asset
+++ b/data/assets/scene/solarsystem/planets/mars/layers/colorlayers/ctx_mosaic_newyork.asset
@@ -6,6 +6,7 @@ local Layer = {
   Identifier = "CTX_Mosaic_NewYork",
   Name = "CTX Mosaic [New York]",
   Enabled = asset.enabled,
+  ZIndex = 60,
   FilePath = asset.resource("ctx_mosaic_newyork.wms"),
   BlendMode = "Color"
 }
diff --git a/data/assets/scene/solarsystem/planets/mars/layers/colorlayers/ctx_mosaic_sweden.asset b/data/assets/scene/solarsystem/planets/mars/layers/colorlayers/ctx_mosaic_sweden.asset
index 20e912abf4..41d0f27594 100644
--- a/data/assets/scene/solarsystem/planets/mars/layers/colorlayers/ctx_mosaic_sweden.asset
+++ b/data/assets/scene/solarsystem/planets/mars/layers/colorlayers/ctx_mosaic_sweden.asset
@@ -6,6 +6,7 @@ local Layer = {
   Identifier = "CTX_Mosaic_Sweden",
   Name = "CTX Mosaic [Sweden]",
   Enabled = asset.enabled,
+  ZIndex = 60,
   FilePath = asset.resource("ctx_mosaic_sweden.wms"),
   BlendMode = "Color"
 }
diff --git a/data/assets/scene/solarsystem/planets/mars/layers/colorlayers/ctx_mosaic_utah.asset b/data/assets/scene/solarsystem/planets/mars/layers/colorlayers/ctx_mosaic_utah.asset
index 70820e690f..a675935f75 100644
--- a/data/assets/scene/solarsystem/planets/mars/layers/colorlayers/ctx_mosaic_utah.asset
+++ b/data/assets/scene/solarsystem/planets/mars/layers/colorlayers/ctx_mosaic_utah.asset
@@ -6,6 +6,7 @@ local Layer = {
   Identifier = "CTX_Mosaic_Utah",
   Name = "CTX Mosaic [Utah]",
   Enabled = asset.enabled,
+  ZIndex = 60,
   FilePath = asset.resource("ctx_mosaic_utah.wms"),
   BlendMode = "Color"
 }
diff --git a/data/assets/scene/solarsystem/planets/mars/layers/colorlayers/hirise.asset b/data/assets/scene/solarsystem/planets/mars/layers/colorlayers/hirise.asset
index 05660ad98e..ed8b26f754 100644
--- a/data/assets/scene/solarsystem/planets/mars/layers/colorlayers/hirise.asset
+++ b/data/assets/scene/solarsystem/planets/mars/layers/colorlayers/hirise.asset
@@ -6,6 +6,7 @@ local Layer = {
   Identifier = "HiRISE-PSP",
   Name = "HiRISE",
   Enabled = asset.enabled,
+  ZIndex = 70,
   FilePath = asset.resource("hirise.vrt"),
   BlendMode = "Color",
   Settings = {
diff --git a/data/assets/scene/solarsystem/planets/mars/layers/colorlayers/hirisels.asset b/data/assets/scene/solarsystem/planets/mars/layers/colorlayers/hirisels.asset
index 37b7be2a60..c388331487 100644
--- a/data/assets/scene/solarsystem/planets/mars/layers/colorlayers/hirisels.asset
+++ b/data/assets/scene/solarsystem/planets/mars/layers/colorlayers/hirisels.asset
@@ -6,6 +6,7 @@ local Layer = {
   Identifier = "HiRISE-LS",
   Name = "HiRISE Local Set",
   Enabled = asset.enabled,
+  ZIndex = 70,
   FilePath = asset.resource("hirisels.vrt"),
   BlendMode = "Color",
   Description = [[HiRISE (High Resolution Imaging Science Experiment) is the most
diff --git a/data/assets/scene/solarsystem/planets/mars/layers/colorlayers/mars_texture.asset b/data/assets/scene/solarsystem/planets/mars/layers/colorlayers/mars_texture.asset
index 00cf598ee1..c6c106b4ba 100644
--- a/data/assets/scene/solarsystem/planets/mars/layers/colorlayers/mars_texture.asset
+++ b/data/assets/scene/solarsystem/planets/mars/layers/colorlayers/mars_texture.asset
@@ -14,6 +14,7 @@ local Layer = {
   Identifier = "Mars_Texture",
   Name = "Mars Texture",
   Enabled = asset.enabled,
+  ZIndex = 5,
   FilePath = texturesPath .. "mars.png",
   Description = "Default jpg texture for Mars",
   CacheSettings = { Enabled = false }
diff --git a/data/assets/scene/solarsystem/planets/mars/layers/colorlayers/moc_wa_color_newyork.asset b/data/assets/scene/solarsystem/planets/mars/layers/colorlayers/moc_wa_color_newyork.asset
index 9e38603835..bac97523df 100644
--- a/data/assets/scene/solarsystem/planets/mars/layers/colorlayers/moc_wa_color_newyork.asset
+++ b/data/assets/scene/solarsystem/planets/mars/layers/colorlayers/moc_wa_color_newyork.asset
@@ -6,6 +6,7 @@ local Layer = {
   Identifier = "MOC_WA_Color_NewYork",
   Name = "MOC WA Color [New York]",
   Enabled = asset.enabled,
+  ZIndex = 10,
   FilePath = asset.resource("moc_wa_color_newyork.wms"),
   Settings = {
     Gamma = 1.6,
diff --git a/data/assets/scene/solarsystem/planets/mars/layers/colorlayers/moc_wa_color_sweden.asset b/data/assets/scene/solarsystem/planets/mars/layers/colorlayers/moc_wa_color_sweden.asset
index 0256b37974..bf7871e6c7 100644
--- a/data/assets/scene/solarsystem/planets/mars/layers/colorlayers/moc_wa_color_sweden.asset
+++ b/data/assets/scene/solarsystem/planets/mars/layers/colorlayers/moc_wa_color_sweden.asset
@@ -6,6 +6,7 @@ local Layer = {
   Identifier = "MOC_WA_Color_LiU",
   Name = "MOC WA Color [Sweden]",
   Enabled = asset.enabled,
+  ZIndex = 10,
   FilePath = asset.resource("moc_wa_color_sweden.wms"),
   Settings = {
     Gamma = 1.6,
diff --git a/data/assets/scene/solarsystem/planets/mars/layers/colorlayers/moc_wa_color_utah.asset b/data/assets/scene/solarsystem/planets/mars/layers/colorlayers/moc_wa_color_utah.asset
index b84870c532..5e45c129a4 100644
--- a/data/assets/scene/solarsystem/planets/mars/layers/colorlayers/moc_wa_color_utah.asset
+++ b/data/assets/scene/solarsystem/planets/mars/layers/colorlayers/moc_wa_color_utah.asset
@@ -6,6 +6,7 @@ local Layer = {
   Identifier = "MOC_WA_Color_Utah",
   Name = "MOC WA Color [Utah]",
   Enabled = asset.enabled,
+  ZIndex = 10,
   FilePath = asset.resource("moc_wa_color_utah.wms"),
   Settings = {
     Gamma = 1.6,
diff --git a/data/assets/scene/solarsystem/planets/mars/layers/colorlayers/mola_hrsc_newyork.asset b/data/assets/scene/solarsystem/planets/mars/layers/colorlayers/mola_hrsc_newyork.asset
index 96d96527c3..df6c098a8a 100644
--- a/data/assets/scene/solarsystem/planets/mars/layers/colorlayers/mola_hrsc_newyork.asset
+++ b/data/assets/scene/solarsystem/planets/mars/layers/colorlayers/mola_hrsc_newyork.asset
@@ -6,6 +6,7 @@ local Layer = {
   Identifier = "MOLA_HRSC_NewYork",
   Name = "MOLA HRSC [New York]",
   Enabled = asset.enabled,
+  ZIndex = 10,
   FilePath = asset.resource("mola_hrsc_newyork.wms"),
   Description = [[This map layer is colorzied based elevation data from MOLA and HRSC.
     Compared to MOLA Psuedo Color, this layer has no terrain shading, which is
diff --git a/data/assets/scene/solarsystem/planets/mars/layers/colorlayers/mola_hrsc_sweden.asset b/data/assets/scene/solarsystem/planets/mars/layers/colorlayers/mola_hrsc_sweden.asset
index 5360c598f5..8ca93525fc 100644
--- a/data/assets/scene/solarsystem/planets/mars/layers/colorlayers/mola_hrsc_sweden.asset
+++ b/data/assets/scene/solarsystem/planets/mars/layers/colorlayers/mola_hrsc_sweden.asset
@@ -6,6 +6,7 @@ local Layer = {
   Identifier = "MOLA_HRSC_Sweden",
   Name = "MOLA HRSC [Sweden]",
   Enabled = asset.enabled,
+  ZIndex = 10,
   FilePath = asset.resource("mola_hrsc_sweden.wms"),
   Description = [[This map layer is colorzied based elevation data from MOLA and HRSC.
     Compared to MOLA Psuedo Color, this layer has no terrain shading, which is
diff --git a/data/assets/scene/solarsystem/planets/mars/layers/colorlayers/mola_hrsc_utah.asset b/data/assets/scene/solarsystem/planets/mars/layers/colorlayers/mola_hrsc_utah.asset
index b1286cdd5b..c270ed2cdb 100644
--- a/data/assets/scene/solarsystem/planets/mars/layers/colorlayers/mola_hrsc_utah.asset
+++ b/data/assets/scene/solarsystem/planets/mars/layers/colorlayers/mola_hrsc_utah.asset
@@ -6,6 +6,7 @@ local Layer = {
   Identifier = "MOLA_HRSC_Utah",
   Name = "MOLA HRSC [Utah]",
   Enabled = asset.enabled,
+  ZIndex = 10,
   FilePath = asset.resource("mola_hrsc_utah.wms"),
   Description = [[This map layer is colorzied based elevation data from MOLA and HRSC.
     Compared to MOLA Psuedo Color, this layer has no terrain shading, which is
diff --git a/data/assets/scene/solarsystem/planets/mars/layers/colorlayers/mola_pseudo_color_newyork.asset b/data/assets/scene/solarsystem/planets/mars/layers/colorlayers/mola_pseudo_color_newyork.asset
index 1af1376a92..23c2afe8cb 100644
--- a/data/assets/scene/solarsystem/planets/mars/layers/colorlayers/mola_pseudo_color_newyork.asset
+++ b/data/assets/scene/solarsystem/planets/mars/layers/colorlayers/mola_pseudo_color_newyork.asset
@@ -6,6 +6,7 @@ local Layer = {
   Identifier = "MOLA_Pseudo_Color_NewYork",
   Name = "MOLA Pseudo Color [New York]",
   Enabled = asset.enabled,
+  ZIndex = 10,
   FilePath = asset.resource("mola_pseudo_color_newyork.wms"),
   Description = [[This map is based on data from the Mars Orbiter Laser Altimeter (MOLA)
     (Smith, et al., 2001), an instrument on NASA's Mars Global Surveyor (MGS)
diff --git a/data/assets/scene/solarsystem/planets/mars/layers/colorlayers/mola_pseudo_color_sweden.asset b/data/assets/scene/solarsystem/planets/mars/layers/colorlayers/mola_pseudo_color_sweden.asset
index df09e62929..6add7cc71b 100644
--- a/data/assets/scene/solarsystem/planets/mars/layers/colorlayers/mola_pseudo_color_sweden.asset
+++ b/data/assets/scene/solarsystem/planets/mars/layers/colorlayers/mola_pseudo_color_sweden.asset
@@ -6,6 +6,7 @@ local Layer = {
   Identifier = "MOLA_Pseudo_Color_Sweden",
   Name = "MOLA Pseudo Color [Sweden]",
   Enabled = asset.enabled,
+  ZIndex = 10,
   FilePath = asset.resource("mola_pseudo_color_sweden.wms"),
   Description = [[This map is based on data from the Mars Orbiter Laser Altimeter (MOLA)
     (Smith, et al., 2001), an instrument on NASA's Mars Global Surveyor (MGS)
diff --git a/data/assets/scene/solarsystem/planets/mars/layers/colorlayers/mola_pseudo_color_utah.asset b/data/assets/scene/solarsystem/planets/mars/layers/colorlayers/mola_pseudo_color_utah.asset
index b7e21a1bc6..50aab83f66 100644
--- a/data/assets/scene/solarsystem/planets/mars/layers/colorlayers/mola_pseudo_color_utah.asset
+++ b/data/assets/scene/solarsystem/planets/mars/layers/colorlayers/mola_pseudo_color_utah.asset
@@ -6,6 +6,7 @@ local Layer = {
   Identifier = "MOLA_Pseudo_Color_Utah",
   Name = "MOLA Pseudo Color [Utah]",
   Enabled = asset.enabled,
+  ZIndex = 10,
   FilePath = asset.resource("mola_pseudo_color_utah.wms"),
   Description = [[This map is based on data from the Mars Orbiter Laser Altimeter (MOLA)
     (Smith, et al., 2001), an instrument on NASA's Mars Global Surveyor (MGS)
diff --git a/data/assets/scene/solarsystem/planets/mars/layers/colorlayers/themis_ir_day_newyork.asset b/data/assets/scene/solarsystem/planets/mars/layers/colorlayers/themis_ir_day_newyork.asset
index e2b0de6b2c..e5466a365d 100644
--- a/data/assets/scene/solarsystem/planets/mars/layers/colorlayers/themis_ir_day_newyork.asset
+++ b/data/assets/scene/solarsystem/planets/mars/layers/colorlayers/themis_ir_day_newyork.asset
@@ -6,6 +6,7 @@ local Layer = {
   Identifier = "Themis_IR_Day_NewYork",
   Name = "Themis IR Day [New York]",
   Enabled = asset.enabled,
+  ZIndex = 50,
   FilePath = asset.resource("themis_ir_day_newyork.wms"),
   BlendMode = "Color",
   Description = [[This mosaic represents the Thermal Emission Imaging System (THEMIS)
diff --git a/data/assets/scene/solarsystem/planets/mars/layers/colorlayers/themis_ir_day_sweden.asset b/data/assets/scene/solarsystem/planets/mars/layers/colorlayers/themis_ir_day_sweden.asset
index efbc859e78..2243dfab24 100644
--- a/data/assets/scene/solarsystem/planets/mars/layers/colorlayers/themis_ir_day_sweden.asset
+++ b/data/assets/scene/solarsystem/planets/mars/layers/colorlayers/themis_ir_day_sweden.asset
@@ -6,6 +6,7 @@ local Layer = {
   Identifier = "Themis_IR_Day_Sweden",
   Name = "Themis IR Day [Sweden]",
   Enabled = asset.enabled,
+  ZIndex = 50,
   FilePath = asset.resource("themis_ir_day_sweden.wms"),
   BlendMode = "Color",
   Description = [[This mosaic represents the Thermal Emission Imaging System (THEMIS)
diff --git a/data/assets/scene/solarsystem/planets/mars/layers/colorlayers/themis_ir_day_utah.asset b/data/assets/scene/solarsystem/planets/mars/layers/colorlayers/themis_ir_day_utah.asset
index a1ff8ac6a1..436b863ebb 100644
--- a/data/assets/scene/solarsystem/planets/mars/layers/colorlayers/themis_ir_day_utah.asset
+++ b/data/assets/scene/solarsystem/planets/mars/layers/colorlayers/themis_ir_day_utah.asset
@@ -6,6 +6,7 @@ local Layer = {
   Identifier = "Themis_IR_Day_Utah",
   Name = "Themis IR Day [Utah]",
   Enabled = asset.enabled,
+  ZIndex = 50,
   FilePath = asset.resource("themis_ir_day_utah.wms"),
   BlendMode = "Color",
   Description = [[This mosaic represents the Thermal Emission Imaging System (THEMIS)
diff --git a/data/assets/scene/solarsystem/planets/mars/layers/colorlayers/themis_ir_night_newyork.asset b/data/assets/scene/solarsystem/planets/mars/layers/colorlayers/themis_ir_night_newyork.asset
index 1c6c2f6ae1..48c01d231e 100644
--- a/data/assets/scene/solarsystem/planets/mars/layers/colorlayers/themis_ir_night_newyork.asset
+++ b/data/assets/scene/solarsystem/planets/mars/layers/colorlayers/themis_ir_night_newyork.asset
@@ -6,6 +6,7 @@ local Layer = {
   Identifier = "Themis_IR_Night_NewYork",
   Name = "Themis IR Night [New York]",
   Enabled = asset.enabled,
+  ZIndex = 50,
   FilePath = asset.resource("themis_ir_night_newyork.vrt"),
   BlendMode = "Color",
   Description = [[This mosaic represents the Thermal Emission Imaging System (THEMIS)
diff --git a/data/assets/scene/solarsystem/planets/mars/layers/colorlayers/themis_ir_night_sweden.asset b/data/assets/scene/solarsystem/planets/mars/layers/colorlayers/themis_ir_night_sweden.asset
index 13f20e95c9..900c8e6a8e 100644
--- a/data/assets/scene/solarsystem/planets/mars/layers/colorlayers/themis_ir_night_sweden.asset
+++ b/data/assets/scene/solarsystem/planets/mars/layers/colorlayers/themis_ir_night_sweden.asset
@@ -6,6 +6,7 @@ local Layer = {
   Identifier = "Themis_IR_Night_Sweden",
   Name = "Themis IR Night [Sweden]",
   Enabled = asset.enabled,
+  ZIndex = 50,
   FilePath = asset.resource("themis_ir_night_sweden.vrt"),
   BlendMode = "Color",
   Description = [[This mosaic represents the Thermal Emission Imaging System (THEMIS)
diff --git a/data/assets/scene/solarsystem/planets/mars/layers/colorlayers/themis_ir_night_utah.asset b/data/assets/scene/solarsystem/planets/mars/layers/colorlayers/themis_ir_night_utah.asset
index 7b9e3004c9..5209bbd897 100644
--- a/data/assets/scene/solarsystem/planets/mars/layers/colorlayers/themis_ir_night_utah.asset
+++ b/data/assets/scene/solarsystem/planets/mars/layers/colorlayers/themis_ir_night_utah.asset
@@ -6,6 +6,7 @@ local Layer = {
   Identifier = "Themis_IR_Night_Utah",
   Name = "Themis IR Night [Utah]",
   Enabled = asset.enabled,
+  ZIndex = 50,
   FilePath = asset.resource("themis_ir_night_utah.vrt"),
   BlendMode = "Color",
   Description = [[This mosaic represents the Thermal Emission Imaging System (THEMIS)
diff --git a/data/assets/scene/solarsystem/planets/mars/layers/colorlayers/viking_mdim_newyork.asset b/data/assets/scene/solarsystem/planets/mars/layers/colorlayers/viking_mdim_newyork.asset
index b4e0ffb44f..6d5e68ea0b 100644
--- a/data/assets/scene/solarsystem/planets/mars/layers/colorlayers/viking_mdim_newyork.asset
+++ b/data/assets/scene/solarsystem/planets/mars/layers/colorlayers/viking_mdim_newyork.asset
@@ -6,6 +6,7 @@ local Layer = {
   Identifier = "Viking_MDIM_NewYork",
   Name = "Viking MDIM [New York]",
   Enabled = asset.enabled,
+  ZIndex = 10,
   FilePath = asset.resource("viking_mdim_newyork.wms"),
   Description = [[This global image map of Mars has a resolution of 256 pixels/degree
     (scale approximately 232 meters per pixel (m) at the equator). The colorized
diff --git a/data/assets/scene/solarsystem/planets/mars/layers/colorlayers/viking_mdim_sweden.asset b/data/assets/scene/solarsystem/planets/mars/layers/colorlayers/viking_mdim_sweden.asset
index d9c2ff518e..0c2504dc63 100644
--- a/data/assets/scene/solarsystem/planets/mars/layers/colorlayers/viking_mdim_sweden.asset
+++ b/data/assets/scene/solarsystem/planets/mars/layers/colorlayers/viking_mdim_sweden.asset
@@ -6,6 +6,7 @@ local Layer = {
   Identifier = "Viking_MDIM_Sweden",
   Name = "Viking MDIM [Sweden]",
   Enabled = asset.enabled,
+  ZIndex = 10,
   FilePath = asset.resource("viking_mdim_sweden.wms"),
   Description = [[This global image map of Mars has a resolution of 256 pixels/degree
     (scale approximately 232 meters per pixel (m) at the equator). The colorized
diff --git a/data/assets/scene/solarsystem/planets/mars/layers/colorlayers/viking_mdim_utah.asset b/data/assets/scene/solarsystem/planets/mars/layers/colorlayers/viking_mdim_utah.asset
index 6d958b52c6..1413fa125d 100644
--- a/data/assets/scene/solarsystem/planets/mars/layers/colorlayers/viking_mdim_utah.asset
+++ b/data/assets/scene/solarsystem/planets/mars/layers/colorlayers/viking_mdim_utah.asset
@@ -6,6 +6,7 @@ local Layer = {
   Identifier = "Viking_MDIM_Utah",
   Name = "Viking MDIM [Utah]",
   Enabled = asset.enabled,
+  ZIndex = 10,
   FilePath = asset.resource("viking_mdim_utah.wms"),
   Description = [[This global image map of Mars has a resolution of 256 pixels/degree
     (scale approximately 232 meters per pixel (m) at the equator). The colorized
diff --git a/data/assets/scene/solarsystem/planets/mars/layers/heightlayers/hirisels.asset b/data/assets/scene/solarsystem/planets/mars/layers/heightlayers/hirisels.asset
index 743d1b68f3..ce8ec05095 100644
--- a/data/assets/scene/solarsystem/planets/mars/layers/heightlayers/hirisels.asset
+++ b/data/assets/scene/solarsystem/planets/mars/layers/heightlayers/hirisels.asset
@@ -6,6 +6,7 @@ local Layer = {
   Identifier = "HiRISE-LS-DEM",
   Name = "HiRISE Local Set DEM",
   Enabled = asset.enabled,
+  ZIndex = 50,
   FilePath = asset.resource("hirisels.wms"),
   TilePixelSize = 129,
   Description = [[HiRISE (High Resolution Imaging Science Experiment) is the most
diff --git a/data/assets/scene/solarsystem/planets/mars/layers/heightlayers/mdem200m.asset b/data/assets/scene/solarsystem/planets/mars/layers/heightlayers/mdem200m.asset
index 1868b7f580..e52f548cbe 100644
--- a/data/assets/scene/solarsystem/planets/mars/layers/heightlayers/mdem200m.asset
+++ b/data/assets/scene/solarsystem/planets/mars/layers/heightlayers/mdem200m.asset
@@ -6,6 +6,7 @@ local Layer = {
   Identifier = "MDEM200M",
   Name = "HRSC MOLA Blended DEM Global 200m v2",
   Enabled = asset.enabled,
+  ZIndex = 20,
   FilePath = asset.resource("mdem200m.wms"),
   TilePixelSize = 129,
   Description = [[Blend of data derived from the Mars Orbiter Laser Altimeter
diff --git a/data/assets/scene/solarsystem/planets/mars/layers/heightlayers/mola_amnh.asset b/data/assets/scene/solarsystem/planets/mars/layers/heightlayers/mola_amnh.asset
index 6c006e38ff..bd79fbf4c9 100644
--- a/data/assets/scene/solarsystem/planets/mars/layers/heightlayers/mola_amnh.asset
+++ b/data/assets/scene/solarsystem/planets/mars/layers/heightlayers/mola_amnh.asset
@@ -6,6 +6,7 @@ local Layer = {
   Identifier = "Mola_AMNH",
   Name = "Mola Elevation [New York]",
   Enabled = asset.enabled,
+  ZIndex = 10,
   FilePath = asset.resource("mola_amnh.wms"),
   TilePixelSize = 360,
   Description = [[This digital elevation model (DEM) is based on data from the Mars
diff --git a/data/assets/scene/solarsystem/planets/mars/layers/heightlayers/mola_sweden.asset b/data/assets/scene/solarsystem/planets/mars/layers/heightlayers/mola_sweden.asset
index 6d39acc71d..5ff6340c4d 100644
--- a/data/assets/scene/solarsystem/planets/mars/layers/heightlayers/mola_sweden.asset
+++ b/data/assets/scene/solarsystem/planets/mars/layers/heightlayers/mola_sweden.asset
@@ -6,6 +6,7 @@ local Layer = {
   Identifier = "Mola_Europe",
   Name = "Mola Elevation [Sweden]",
   Enabled = asset.enabled,
+  ZIndex = 10,
   FilePath = asset.resource("mola_sweden.wms"),
   TilePixelSize = 360,
   Description = [[This digital elevation model (DEM) is based on data from the Mars
diff --git a/data/assets/scene/solarsystem/planets/mars/layers/heightlayers/mola_utah.asset b/data/assets/scene/solarsystem/planets/mars/layers/heightlayers/mola_utah.asset
index 4d1cb1c87c..31b6dd8004 100644
--- a/data/assets/scene/solarsystem/planets/mars/layers/heightlayers/mola_utah.asset
+++ b/data/assets/scene/solarsystem/planets/mars/layers/heightlayers/mola_utah.asset
@@ -6,6 +6,7 @@ local Layer = {
   Identifier = "Mola_Utah",
   Name = "Mola Elevation [Utah]",
   Enabled = asset.enabled,
+  ZIndex = 10,
   FilePath = asset.resource("mola_utah.wms"),
   TilePixelSize = 360,
   Description = [[This digital elevation model (DEM) is based on data from the Mars
diff --git a/data/assets/scene/solarsystem/planets/mars/layers/nasa-treks/MEX_HRSC.asset b/data/assets/scene/solarsystem/planets/mars/layers/nasa-treks/MEX_HRSC.asset
index 56d8c117dd..bf2580798e 100644
--- a/data/assets/scene/solarsystem/planets/mars/layers/nasa-treks/MEX_HRSC.asset
+++ b/data/assets/scene/solarsystem/planets/mars/layers/nasa-treks/MEX_HRSC.asset
@@ -9,6 +9,7 @@ local globeIdentifier = asset.require("scene/solarsystem//planets/mars/mars").Ma
 local treks_hrsc_dem_martian_east = {
   Identifier = "hrsc_dem_martian_east",
   Name = [[MEX HRSC, Martian Path Eastern Section DEM]],
+  ZIndex = 50,
   FilePath = asset.resource("MEX_HRSC/Martian_Path_Eastern_Section_DEM.vrt"),
   Description = [[This layer is a greyscale mosaic assembled using data from the High Resolution Stereo Camera aboard the European Space Agency's Mars Express orbiter. HRSC is being used to obtain color and stereo images that will map 100% of Mars' surface at resolution better than 30 m/pixel, and 50% of the surface at better than 15 m/pixel. Each of the nine CCD lines of HRSC, a linescan imager (pushbroom camera), contains 5184 pixels. The channels consist of red, green, blue, near-infrared, three stereo channels (backward, nadir, and forward) and two photometric channels. The digital elevation model used for this layer is a combination of data derived from the HRSC and the Mars Orbiter Laser Altimeter.]]
 }
@@ -16,6 +17,7 @@ local treks_hrsc_dem_martian_east = {
 local treks_MC11E11_HRDTMAR_DA5 = {
   Identifier = "MC11E11_HRDTMAR_DA5",
   Name = [[MEX HRSC, Martian Path MC11 Quad DEM]],
+  ZIndex = 50,
   FilePath = asset.resource("MEX_HRSC/Martian_Path_MC11_Quad_DEM.vrt"),
   Description = [[This layer is a greyscale mosaic assembled using data from the High Resolution Stereo Camera aboard the European Space Agency's Mars Express orbiter. HRSC is being used to obtain color and stereo images that will map 100% of Mars' surface at resolution better than 30 m/pixel, and 50% of the surface at better than 15 m/pixel. Each of the nine CCD lines of HRSC, a linescan imager (pushbroom camera), contains 5184 pixels. The channels consist of red, green, blue, near-infrared, three stereo channels (backward, nadir, and forward) and two photometric channels. The digital elevation model used for this layer is a combination of data derived from the HRSC and the Mars Orbiter Laser Altimeter.]]
 }
diff --git a/data/assets/scene/solarsystem/planets/mars/layers/nasa-treks/MGS_MOC_Atlas.asset b/data/assets/scene/solarsystem/planets/mars/layers/nasa-treks/MGS_MOC_Atlas.asset
index 0c3471dcc9..8d9cb7593b 100644
--- a/data/assets/scene/solarsystem/planets/mars/layers/nasa-treks/MGS_MOC_Atlas.asset
+++ b/data/assets/scene/solarsystem/planets/mars/layers/nasa-treks/MGS_MOC_Atlas.asset
@@ -9,6 +9,7 @@ local globeIdentifier = asset.require("scene/solarsystem//planets/mars/mars").Ma
 local treks_msss_atlas_simp_clon = {
   Identifier = "msss_atlas_simp_clon",
   Name = [[MGS MOC Atlas, Global Color Mosaic]],
+  ZIndex = 50,
   FilePath = asset.resource("MGS_MOC_Atlas/Global_Color_Mosaic.vrt"),
   Description = [[This data was acquired using the Mars Orbiter Camera instrument aboard NASA's Mars Global Surveyor spacecraft (MGS). MGS was launched on November 7, 1996 and arrived at Mars on September 11, 1997. It maintained a circular polar orbit, completing an orbital revolution every 117.65 minutes at an average altitude of 378 km (235 mi). Until November 2, 2006, MGS characterized and mapped Mars' surface features, properties, topography, composition, and processes, as well as studied Mars' weather and atmospheric structure.
 
diff --git a/data/assets/scene/solarsystem/planets/mars/layers/nasa-treks/MGS_MOLA.asset b/data/assets/scene/solarsystem/planets/mars/layers/nasa-treks/MGS_MOLA.asset
index 164cc565cf..61bac6cc19 100644
--- a/data/assets/scene/solarsystem/planets/mars/layers/nasa-treks/MGS_MOLA.asset
+++ b/data/assets/scene/solarsystem/planets/mars/layers/nasa-treks/MGS_MOLA.asset
@@ -9,6 +9,7 @@ local globeIdentifier = asset.require("scene/solarsystem//planets/mars/mars").Ma
 local treks_Mars_MGS_MOLA_ClrShade_merge_global_463m = {
   Identifier = "Mars_MGS_MOLA_ClrShade_merge_global_463m",
   Name = [[MGS MOLA, Global Color Hillshade]],
+  ZIndex = 50,
   FilePath = asset.resource("MGS_MOLA/Global_Color_Hillshade.vrt"),
   Description = [[This data was acquired using the Mars Orbiter Laser Altimeter instrument aboard NASA's Mars Global Surveyor spacecraft (MGS). MGS was launched on November 7, 1996 and arrived at Mars on September 11, 1997. It maintained a circular polar orbit, completing an orbital revolution every 117.65 minutes at an average altitude of 378 km (235 mi). Until November 2, 2006, MGS characterized and mapped Mars' surface features, properties, topography, composition, and processes, as well as studied Mars' weather and atmospheric structure.
 
@@ -18,6 +19,7 @@ The Mars Orbiter Laser Altimeter (MOLA) made precise measurements of the heights
 local treks_mola128_mola64_merge_90Nto90S_SimpleC_clon0 = {
   Identifier = "mola128_mola64_merge_90Nto90S_SimpleC_clon0",
   Name = [[MGS MOLA, Global DEM]],
+  ZIndex = 50,
   FilePath = asset.resource("MGS_MOLA/Global_DEM.vrt"),
   Description = [[This data was acquired using the Mars Orbiter Laser Altimeter instrument aboard NASA's Mars Global Surveyor spacecraft (MGS). MGS was launched on November 7, 1996 and arrived at Mars on September 11, 1997. It maintained a circular polar orbit, completing an orbital revolution every 117.65 minutes at an average altitude of 378 km (235 mi). Until November 2, 2006, MGS characterized and mapped Mars' surface features, properties, topography, composition, and processes, as well as studied Mars' weather and atmospheric structure.
 
@@ -29,6 +31,7 @@ The DEM represents more than 600 million measurements gathered between 1999 and
 local treks_mola_roughness = {
   Identifier = "mola_roughness",
   Name = [[MGS MOLA, Global Surface Roughness]],
+  ZIndex = 50,
   FilePath = asset.resource("MGS_MOLA/Global_Surface_Roughness.vrt"),
   Description = [[The Mars Orbiter Laser Altimeter (MOLA) aboard the Mars Global Surveyor (MGS) spacecraft, made precise altimetry measurements from orbit around Mars from September 1997 to June, 2001. The MOLA instrument transmitted infrared laser pulses towards Mars at a rate of 10 times per second, and measured the time of flight to determine the range (distance) of the MGS spacecraft to the Martian surface. The range measurements resulted in precise topographic maps of Mars. This kilometer-scale global roughness map is presented as an RGB composite image. The Blue, Green and Red channels contain roughness at 0.6 km, 2.4 km, and 9.2 km baselines. Brighter shades denote rougher surface. Thus, general brightness denotes general roughness, and color hue denotes the nature of the scale dependence of roughness. Map resolution/scale: 8 ppd/7.5km. Kreslavsky and Head, 2000, JGR, VOL. 105, NO. Ell, PAGES 26,695-26,711]]
 }
diff --git a/data/assets/scene/solarsystem/planets/mars/layers/nasa-treks/MGS_MOLA_and_Mars_Express_HRSC.asset b/data/assets/scene/solarsystem/planets/mars/layers/nasa-treks/MGS_MOLA_and_Mars_Express_HRSC.asset
index 7b333499b9..eaab292cc9 100644
--- a/data/assets/scene/solarsystem/planets/mars/layers/nasa-treks/MGS_MOLA_and_Mars_Express_HRSC.asset
+++ b/data/assets/scene/solarsystem/planets/mars/layers/nasa-treks/MGS_MOLA_and_Mars_Express_HRSC.asset
@@ -9,6 +9,7 @@ local globeIdentifier = asset.require("scene/solarsystem//planets/mars/mars").Ma
 local treks_Mars_MOLA_blend200ppx_HRSC_ClrShade_clon0dd_200mpp_lzw = {
   Identifier = "Mars_MOLA_blend200ppx_HRSC_ClrShade_clon0dd_200mpp_lzw",
   Name = [[MGS MOLA and Mars Express HRSC, Color Hillshade Blend]],
+  ZIndex = 50,
   FilePath = asset.resource("MGS_MOLA_and_Mars_Express_HRSC/Color_Hillshade_Blend.vrt"),
   Description = [[This data product is a blend of digital terrain model (DTM) data derived from the Mars Orbiter Laser Altimeter (MOLA) instrument aboard NASA's Mars Global Surveyor spacecraft (MGS), and the High-Resolution Stereo Camera (HRSC) aboard the European Space Agency's Mars Express spacecraft.
 
@@ -22,6 +23,7 @@ R. Jaumann, et al. (2007), The high-resolution stereo camera (HRSC) experiment o
 local treks_Mars_MOLA_blend200ppx_HRSC_Shade_clon0dd_200mpp_lzw = {
   Identifier = "Mars_MOLA_blend200ppx_HRSC_Shade_clon0dd_200mpp_lzw",
   Name = [[MGS MOLA and Mars Express HRSC, Hillshade Blend]],
+  ZIndex = 50,
   FilePath = asset.resource("MGS_MOLA_and_Mars_Express_HRSC/Hillshade_Blend.vrt"),
   Description = [[This data product is a blend of digital terrain model (DTM) data derived from the Mars Orbiter Laser Altimeter (MOLA) instrument aboard NASA's Mars Global Surveyor spacecraft (MGS), and the High-Resolution Stereo Camera (HRSC) aboard the European Space Agency's Mars Express spacecraft.
 
diff --git a/data/assets/scene/solarsystem/planets/mars/layers/nasa-treks/MGS_TES.asset b/data/assets/scene/solarsystem/planets/mars/layers/nasa-treks/MGS_TES.asset
index fa0d856950..ca06df8b7f 100644
--- a/data/assets/scene/solarsystem/planets/mars/layers/nasa-treks/MGS_TES.asset
+++ b/data/assets/scene/solarsystem/planets/mars/layers/nasa-treks/MGS_TES.asset
@@ -9,6 +9,7 @@ local globeIdentifier = asset.require("scene/solarsystem//planets/mars/mars").Ma
 local treks_TES_Dust = {
   Identifier = "TES_Dust",
   Name = [[MGS TES, Global Dust]],
+  ZIndex = 50,
   FilePath = asset.resource("MGS_TES/Global_Dust.vrt"),
   Description = [[The Thermal Emission Spectrometer (TES) is one of the instruments aboard the Mars Global Surveyor spacecraft. TES is designed to measure the thermal infrared energy (heat) emitted from Mars. This technique, called thermal emission spectroscopy, can tell us much about the geology and atmosphere of Mars. Dust is widespread and abundant across the surface of Mars. However, in the wind-blown environment of Mars, dust accumulates tickly in some areas and is blown clear of other areas. Thick accumulations of dust mask the underlying surface, making measurements of surface composition from orbit difficult or even impossible. Preferred landing site candidates will ideally be relatively dust free. An index of the relative abundance of spectrally obscuring dust across the Martian surface was developed using data from TES. While closely correlated with albedo, the TES dust cover index (DCI) is a more direct metric for the presence or absence of dust on a particular surface and is independent of albedo. This becomes important for the types of light-toned layered deposits and surfaces that likely will be among the candidates for future landing sites. Map resolution/scale: 16ppd/3.5km. Ruff and Christensen, 2002, JGR, VOL. 107, NO. E12, 5127]]
 }
@@ -16,6 +17,7 @@ local treks_TES_Dust = {
 local treks_tes_ruffdust = {
   Identifier = "tes_ruffdust",
   Name = [[MGS TES, Global Dust Index]],
+  ZIndex = 50,
   FilePath = asset.resource("MGS_TES/Global_Dust_Index.vrt"),
   Description = [[The Thermal Emission Spectrometer (TES) is one of the instruments aboard the Mars Global Surveyor spacecraft. TES is designed to measure the thermal infrared energy (heat) emitted from Mars. This technique, called thermal emission spectroscopy, can tell us much about the geology and atmosphere of Mars. Dust is widespread and abundant across the surface of Mars. However, in the wind-blown environment of Mars, dust accumulates tickly in some areas and is blown clear of other areas. Thick accumulations of dust mask the underlying surface, making measurements of surface composition from orbit difficult or even impossible. Preferred landing site candidates will ideally be relatively dust free. An index of the relative abundance of spectrally obscuring dust across the Martian surface was developed using data from TES. While closely correlated with albedo, the TES dust cover index (DCI) is a more direct metric for the presence or absence of dust on a particular surface and is independent of albedo. This becomes important for the types of light-toned layered deposits and surfaces that likely will be among the candidates for future landing sites. Map resolution/scale: 16ppd/3.5km. Ruff and Christensen, 2002, JGR, VOL. 107, NO. E12, 5127]]
 }
@@ -23,6 +25,7 @@ local treks_tes_ruffdust = {
 local treks_TES_Clinopyroxene = {
   Identifier = "TES_Clinopyroxene",
   Name = [[MGS TES, Global High-Ca Pyroxene Abundance]],
+  ZIndex = 50,
   FilePath = asset.resource("MGS_TES/Global_High-Ca_Pyroxene_Abundance.vrt"),
   Description = [[The Thermal Emission Spectrometer (TES) is one of the instruments aboard the Mars Global Surveyor spacecraft. TES is designed to measure the thermal infrared energy (heat) emitted from Mars. This technique, called thermal emission spectroscopy, can tell us much about the geology and atmosphere of Mars. A deconvolution method was used to remove atmospheric components and determine surface mineralogy from TES data at 1 pixel per degree (ppd). Minerals were grouped into categories on the basis of compositional and spectral similarity, and global concentration maps were produced. High-Ca pyroxenes are identified in concentrations of 0.10 - 0.20 in equatorial low albedo regions. The highest concentrations are present in Syrtis Major. High-latitude, low-albedo regions are characterized by concentrations of 0 - 0.10. Light regions have 0 - 0.05 high-Ca pyroxene concentrations. Only equatorial low-albedo regions have pyroxene concentrations above the detection limit. Map resolution/scale: 4 ppd/16km. Joshua L. Bandfield, 2002, JGR, VOL. 107, NO. E6, 5042]]
 }
diff --git a/data/assets/scene/solarsystem/planets/mars/layers/nasa-treks/MO_THEMIS-IR_Day.asset b/data/assets/scene/solarsystem/planets/mars/layers/nasa-treks/MO_THEMIS-IR_Day.asset
index 45238136bf..410cea67d9 100644
--- a/data/assets/scene/solarsystem/planets/mars/layers/nasa-treks/MO_THEMIS-IR_Day.asset
+++ b/data/assets/scene/solarsystem/planets/mars/layers/nasa-treks/MO_THEMIS-IR_Day.asset
@@ -9,6 +9,7 @@ local globeIdentifier = asset.require("scene/solarsystem//planets/mars/mars").Ma
 local treks_THEMIS_DayIR_ControlledMosaics_100m_v2_oct2018 = {
   Identifier = "THEMIS_DayIR_ControlledMosaics_100m_v2_oct2018",
   Name = [[MO THEMIS-IR Day, Global Mosaic]],
+  ZIndex = 50,
   FilePath = asset.resource("MO_THEMIS-IR_Day/Global_Mosaic.vrt"),
   Description = [[This data was acquired using the Thermal Emission Imaging System instrument aboard NASA's Mars Odyssey spacecraft. Odyssey was launched on April 7, 2001 and arrived at Mars on October 24, 2001. It maintains a polar orbit around Mars with an altitude of about 3,800 km or 2,400 miles. Odyssey's mission includes studying the mineralogy of Mars' surface (especially looking at minerals formed in the presence of water), detecting water and shallow buried ice, and studying the radiation environment. The Thermal Emission Imaging System (THEMIS) instrument is a camera system that gathers data in infrared and visible light. The infrared images sample nine different wavelengths allowing spectra to be constructed and compositions of imaged surfaces to be inferred. Daytime infrared Themis images typically emphasize topography, with warmer sunward slopes being brighter than cooler shaded slopes. Nighttime Themis images emphasize differences in thermal inertia between areas being observed, giving insights into the physical characteristics of the surfaces. This map is a THEMIS daytime infrared map. The 2017 release featured preliminary geodetically controlled mosaics tied to a known coordinate system (USGS Viking Orbiter MDIM 2.1), spatially adjusted to align feature boundaries, and orthoprojected at 100 m/pixel scale. Further adjustments have been processed for the 2018 release of this final mosaic.]]
 }
diff --git a/data/assets/scene/solarsystem/planets/mars/layers/nasa-treks/MO_THEMIS-IR_Night.asset b/data/assets/scene/solarsystem/planets/mars/layers/nasa-treks/MO_THEMIS-IR_Night.asset
index ea58be5f16..27568d1afc 100644
--- a/data/assets/scene/solarsystem/planets/mars/layers/nasa-treks/MO_THEMIS-IR_Night.asset
+++ b/data/assets/scene/solarsystem/planets/mars/layers/nasa-treks/MO_THEMIS-IR_Night.asset
@@ -9,6 +9,7 @@ local globeIdentifier = asset.require("scene/solarsystem//planets/mars/mars").Ma
 local treks_THEMIS_NightIR_ControlledMosaics_100m_v2_oct2018 = {
   Identifier = "THEMIS_NightIR_ControlledMosaics_100m_v2_oct2018",
   Name = [[MO THEMIS-IR Night, Global Mosaic]],
+  ZIndex = 50,
   FilePath = asset.resource("MO_THEMIS-IR_Night/Global_Mosaic.vrt"),
   Description = [[This data was acquired using the Thermal Emission Imaging System instrument aboard NASA's Mars Odyssey spacecraft. Odyssey was launched on April 7, 2001 and arrived at Mars on October 24, 2001. It maintains a polar orbit around Mars with an altitude of about 3,800 km or 2,400 miles. Odyssey's mission includes studying the mineralogy of Mars' surface (especially looking at minerals formed in the presence of water), detecting water and shallow buried ice, and studying the radiation environment. The Thermal Emission Imaging System (THEMIS) instrument is a camera system that gathers data in infrared and visible light. The infrared images sample nine different wavelengths allowing spectra to be constructed and compositions of imaged surfaces to be inferred. Daytime infrared Themis images typically emphasize topography, with warmer sunward slopes being brighter than cooler shaded slopes. Nighttime Themis images emphasize differences in thermal inertia between areas being observed, giving insights into the physical characteristics of the surfaces. This map is a THEMIS nighttime infrared map. The 2017 release featured preliminary geodetically controlled mosaics tied to a known coordinate system (USGS Viking Orbiter MDIM 2.1), spatially adjusted to align feature boundaries, and orthoprojected at 100 m/pixel scale. Further adjustments have been processed for the 2018 release of this final mosaic.]]
 }
diff --git a/data/assets/scene/solarsystem/planets/mars/layers/nasa-treks/MRO_CTX.asset b/data/assets/scene/solarsystem/planets/mars/layers/nasa-treks/MRO_CTX.asset
index d96569bee0..cdcca481be 100644
--- a/data/assets/scene/solarsystem/planets/mars/layers/nasa-treks/MRO_CTX.asset
+++ b/data/assets/scene/solarsystem/planets/mars/layers/nasa-treks/MRO_CTX.asset
@@ -9,6 +9,7 @@ local globeIdentifier = asset.require("scene/solarsystem//planets/mars/mars").Ma
 local treks_b21_017819_2025_xn_22n048w = {
   Identifier = "b21_017819_2025_xn_22n048w",
   Name = [[MRO CTX, 22n048w Mosaic]],
+  ZIndex = 50,
   FilePath = asset.resource("MRO_CTX/22n048w_Mosaic.vrt"),
   Description = [[This data was acquired using the Context Camera aboard NASA's Mars Reconnaissance Orbiter spacecraft (MRO). MRO was launched on August 12, 2005 and arrived at Mars on March 10, 2006. It maintains a nearly circular orbit, completing an orbital revolution about every 112 minutes at an altitude of approximately 250 to 316 km or 155 to 196 miles. MRO carries a sophisticated suite of instruments used to analyze and map the landforms, stratigraphy, minerals, and ice of Mars.
 
@@ -18,6 +19,7 @@ The Context Camera (CTX) provides black-and-white images with resolutions up to
 local treks_Acheron_Fossae_CTX_BlockAdj_dd = {
   Identifier = "Acheron_Fossae_CTX_BlockAdj_dd",
   Name = [[MRO CTX, Acheron Fossae Mosaic]],
+  ZIndex = 50,
   FilePath = asset.resource("MRO_CTX/Acheron_Fossae_Mosaic.vrt"),
   Description = [[This data was acquired using the Context Camera aboard NASA's Mars Reconnaissance Orbiter spacecraft (MRO). MRO was launched on August 12, 2005 and arrived at Mars on March 10, 2006. It maintains a nearly circular orbit, completing an orbital revolution about every 112 minutes at an altitude of approximately 250 to 316 km or 155 to 196 miles. MRO carries a sophisticated suite of instruments used to analyze and map the landforms, stratigraphy, minerals, and ice of Mars.
 
@@ -27,6 +29,7 @@ The Context Camera (CTX) provides black-and-white images with resolutions up to
 local treks_Acidalia_Plantia_CTX_BlockAdj_dd = {
   Identifier = "Acidalia_Plantia_CTX_BlockAdj_dd",
   Name = [[MRO CTX, Acidalia Plantia Mosaic]],
+  ZIndex = 50,
   FilePath = asset.resource("MRO_CTX/Acidalia_Plantia_Mosaic.vrt"),
   Description = [[This data was acquired using the Context Camera aboard NASA's Mars Reconnaissance Orbiter spacecraft (MRO). MRO was launched on August 12, 2005 and arrived at Mars on March 10, 2006. It maintains a nearly circular orbit, completing an orbital revolution about every 112 minutes at an altitude of approximately 250 to 316 km or 155 to 196 miles. MRO carries a sophisticated suite of instruments used to analyze and map the landforms, stratigraphy, minerals, and ice of Mars.
 
@@ -36,6 +39,7 @@ The Context Camera (CTX) provides black-and-white images with resolutions up to
 local treks_Arabia_Terra_CTX_BlockAdj_dd = {
   Identifier = "Arabia_Terra_CTX_BlockAdj_dd",
   Name = [[MRO CTX, Arabia Terra Mosaic]],
+  ZIndex = 50,
   FilePath = asset.resource("MRO_CTX/Arabia_Terra_Mosaic.vrt"),
   Description = [[This data was acquired using the Context Camera aboard NASA's Mars Reconnaissance Orbiter spacecraft (MRO). MRO was launched on August 12, 2005 and arrived at Mars on March 10, 2006. It maintains a nearly circular orbit, completing an orbital revolution about every 112 minutes at an altitude of approximately 250 to 316 km or 155 to 196 miles. MRO carries a sophisticated suite of instruments used to analyze and map the landforms, stratigraphy, minerals, and ice of Mars.
 
@@ -45,6 +49,7 @@ The Context Camera (CTX) provides black-and-white images with resolutions up to
 local treks_Aram_Chaos_CTX_BlockAdj_dd = {
   Identifier = "Aram_Chaos_CTX_BlockAdj_dd",
   Name = [[MRO CTX, Aram Chaos Mosaic]],
+  ZIndex = 50,
   FilePath = asset.resource("MRO_CTX/Aram_Chaos_Mosaic.vrt"),
   Description = [[This data was acquired using the Context Camera aboard NASA's Mars Reconnaissance Orbiter spacecraft (MRO). MRO was launched on August 12, 2005 and arrived at Mars on March 10, 2006. It maintains a nearly circular orbit, completing an orbital revolution about every 112 minutes at an altitude of approximately 250 to 316 km or 155 to 196 miles. MRO carries a sophisticated suite of instruments used to analyze and map the landforms, stratigraphy, minerals, and ice of Mars.
 
@@ -54,6 +59,7 @@ The Context Camera (CTX) provides black-and-white images with resolutions up to
 local treks_Arcadia_CTX_BlockAdj_dd = {
   Identifier = "Arcadia_CTX_BlockAdj_dd",
   Name = [[MRO CTX, Arcadia Mosaic]],
+  ZIndex = 50,
   FilePath = asset.resource("MRO_CTX/Arcadia_Mosaic.vrt"),
   Description = [[This data was acquired using the Context Camera aboard NASA's Mars Reconnaissance Orbiter spacecraft (MRO). MRO was launched on August 12, 2005 and arrived at Mars on March 10, 2006. It maintains a nearly circular orbit, completing an orbital revolution about every 112 minutes at an altitude of approximately 250 to 316 km or 155 to 196 miles. MRO carries a sophisticated suite of instruments used to analyze and map the landforms, stratigraphy, minerals, and ice of Mars.
 
@@ -63,6 +69,7 @@ The Context Camera (CTX) provides black-and-white images with resolutions up to
 local treks_Arcadia_Planitia_CTX_BlockAdj_dd = {
   Identifier = "Arcadia_Planitia_CTX_BlockAdj_dd",
   Name = [[MRO CTX, Arcadia Planitia Mosaic]],
+  ZIndex = 50,
   FilePath = asset.resource("MRO_CTX/Arcadia_Planitia_Mosaic.vrt"),
   Description = [[This data was acquired using the Context Camera aboard NASA's Mars Reconnaissance Orbiter spacecraft (MRO). MRO was launched on August 12, 2005 and arrived at Mars on March 10, 2006. It maintains a nearly circular orbit, completing an orbital revolution about every 112 minutes at an altitude of approximately 250 to 316 km or 155 to 196 miles. MRO carries a sophisticated suite of instruments used to analyze and map the landforms, stratigraphy, minerals, and ice of Mars.
 
@@ -72,6 +79,7 @@ The Context Camera (CTX) provides black-and-white images with resolutions up to
 local treks_Ausonia_CTX_BlockAdj_dd = {
   Identifier = "Ausonia_CTX_BlockAdj_dd",
   Name = [[MRO CTX, Ausonia Mosaic]],
+  ZIndex = 50,
   FilePath = asset.resource("MRO_CTX/Ausonia_Mosaic.vrt"),
   Description = [[This data was acquired using the Context Camera aboard NASA's Mars Reconnaissance Orbiter spacecraft (MRO). MRO was launched on August 12, 2005 and arrived at Mars on March 10, 2006. It maintains a nearly circular orbit, completing an orbital revolution about every 112 minutes at an altitude of approximately 250 to 316 km or 155 to 196 miles. MRO carries a sophisticated suite of instruments used to analyze and map the landforms, stratigraphy, minerals, and ice of Mars.
 
@@ -81,6 +89,7 @@ The Context Camera (CTX) provides black-and-white images with resolutions up to
 local treks_Cerberus_CTX_BlockAdj_dd = {
   Identifier = "Cerberus_CTX_BlockAdj_dd",
   Name = [[MRO CTX, Cerberus Mosaic]],
+  ZIndex = 50,
   FilePath = asset.resource("MRO_CTX/Cerberus_Mosaic.vrt"),
   Description = [[This data was acquired using the Context Camera aboard NASA's Mars Reconnaissance Orbiter spacecraft (MRO). MRO was launched on August 12, 2005 and arrived at Mars on March 10, 2006. It maintains a nearly circular orbit, completing an orbital revolution about every 112 minutes at an altitude of approximately 250 to 316 km or 155 to 196 miles. MRO carries a sophisticated suite of instruments used to analyze and map the landforms, stratigraphy, minerals, and ice of Mars.
 
@@ -90,6 +99,7 @@ The Context Camera (CTX) provides black-and-white images with resolutions up to
 local treks_DEM_1m_ColumbiaHills_fixed = {
   Identifier = "DEM_1m_ColumbiaHills_fixed",
   Name = [[MRO CTX, Columbia Hills DEM]],
+  ZIndex = 50,
   FilePath = asset.resource("MRO_CTX/Columbia_Hills_DEM.vrt"),
   Description = [[This data was acquired using the Context Camera aboard NASA's Mars Reconnaissance Orbiter spacecraft (MRO). MRO was launched on August 12, 2005 and arrived at Mars on March 10, 2006. It maintains a nearly circular orbit, completing an orbital revolution about every 112 minutes at an altitude of approximately 250 to 316 km or 155 to 196 miles. MRO carries a sophisticated suite of instruments used to analyze and map the landforms, stratigraphy, minerals, and ice of Mars.
 
@@ -99,6 +109,7 @@ The Context Camera (CTX) provides black-and-white images with resolutions up to
 local treks_Columbus_Crater_CTX_BlockAdj_dd = {
   Identifier = "Columbus_Crater_CTX_BlockAdj_dd",
   Name = [[MRO CTX, Columbus Crater Mosaic]],
+  ZIndex = 50,
   FilePath = asset.resource("MRO_CTX/Columbus_Crater_Mosaic.vrt"),
   Description = [[This data was acquired using the Context Camera aboard NASA's Mars Reconnaissance Orbiter spacecraft (MRO). MRO was launched on August 12, 2005 and arrived at Mars on March 10, 2006. It maintains a nearly circular orbit, completing an orbital revolution about every 112 minutes at an altitude of approximately 250 to 316 km or 155 to 196 miles. MRO carries a sophisticated suite of instruments used to analyze and map the landforms, stratigraphy, minerals, and ice of Mars.
 
@@ -108,6 +119,7 @@ The Context Camera (CTX) provides black-and-white images with resolutions up to
 local treks_Copernicus_Crater_CTX_BlockAdj_dd = {
   Identifier = "Copernicus_Crater_CTX_BlockAdj_dd",
   Name = [[MRO CTX, Copernicus Crater Mosaic]],
+  ZIndex = 50,
   FilePath = asset.resource("MRO_CTX/Copernicus_Crater_Mosaic.vrt"),
   Description = [[This data was acquired using the Context Camera aboard NASA's Mars Reconnaissance Orbiter spacecraft (MRO). MRO was launched on August 12, 2005 and arrived at Mars on March 10, 2006. It maintains a nearly circular orbit, completing an orbital revolution about every 112 minutes at an altitude of approximately 250 to 316 km or 155 to 196 miles. MRO carries a sophisticated suite of instruments used to analyze and map the landforms, stratigraphy, minerals, and ice of Mars.
 
@@ -117,6 +129,7 @@ The Context Camera (CTX) provides black-and-white images with resolutions up to
 local treks_Coprates_EMelas_Chasm_CTX_BlockAdj_dd = {
   Identifier = "Coprates_EMelas_Chasm_CTX_BlockAdj_dd",
   Name = [[MRO CTX, Coprates EMelas Chasm Mosaic]],
+  ZIndex = 50,
   FilePath = asset.resource("MRO_CTX/Coprates_EMelas_Chasm_Mosaic.vrt"),
   Description = [[This data was acquired using the Context Camera aboard NASA's Mars Reconnaissance Orbiter spacecraft (MRO). MRO was launched on August 12, 2005 and arrived at Mars on March 10, 2006. It maintains a nearly circular orbit, completing an orbital revolution about every 112 minutes at an altitude of approximately 250 to 316 km or 155 to 196 miles. MRO carries a sophisticated suite of instruments used to analyze and map the landforms, stratigraphy, minerals, and ice of Mars.
 
@@ -126,6 +139,7 @@ The Context Camera (CTX) provides black-and-white images with resolutions up to
 local treks_curiosity_ctx_mosaic = {
   Identifier = "curiosity_ctx_mosaic",
   Name = [[MRO CTX, Curiosity Roving Site Mosaic]],
+  ZIndex = 50,
   FilePath = asset.resource("MRO_CTX/Curiosity_Roving_Site_Mosaic.vrt"),
   Description = [[This data was acquired using the Context Camera aboard NASA's Mars Reconnaissance Orbiter spacecraft (MRO). MRO was launched on August 12, 2005 and arrived at Mars on March 10, 2006. It maintains a nearly circular orbit, completing an orbital revolution about every 112 minutes at an altitude of approximately 250 to 316 km or 155 to 196 miles. MRO carries a sophisticated suite of instruments used to analyze and map the landforms, stratigraphy, minerals, and ice of Mars.
 
@@ -135,6 +149,7 @@ The Context Camera (CTX) provides black-and-white images with resolutions up to
 local treks_Deuteronilus1_2_CTX_BlockAdj_dd = {
   Identifier = "Deuteronilus1_2_CTX_BlockAdj_dd",
   Name = [[MRO CTX, Deuteronilus Mensae Mosaic]],
+  ZIndex = 50,
   FilePath = asset.resource("MRO_CTX/Deuteronilus_Mensae_Mosaic.vrt"),
   Description = [[This data was acquired using the Context Camera aboard NASA's Mars Reconnaissance Orbiter spacecraft (MRO). MRO was launched on August 12, 2005 and arrived at Mars on March 10, 2006. It maintains a nearly circular orbit, completing an orbital revolution about every 112 minutes at an altitude of approximately 250 to 316 km or 155 to 196 miles. MRO carries a sophisticated suite of instruments used to analyze and map the landforms, stratigraphy, minerals, and ice of Mars.
 
@@ -144,6 +159,7 @@ The Context Camera (CTX) provides black-and-white images with resolutions up to
 local treks_CTX_DEM_East_Melas = {
   Identifier = "CTX_DEM_East_Melas",
   Name = [[MRO CTX, East Melas DEM]],
+  ZIndex = 50,
   FilePath = asset.resource("MRO_CTX/East_Melas_DEM.vrt"),
   Description = [[This is a digital elevation model (DEM) for the Eastern Melas Chasma region of Valles Marineris. It is one of the areas identified as a potential Exploration Zone (EZ) for human exploration of Mars. This DEM was generated by combining 9 stereographic pairs of CTX images. Each individual pair was taken of the same area but from different angles. The nine pairs were joined together to cover a broad area of the EZ. This data was acquired using the Context Camera aboard NASA's Mars Reconnaissance Orbiter spacecraft (MRO). MRO was launched on August 12, 2005 and arrived at Mars on March 10, 2006. It maintains a nearly circular orbit, completing an orbital revolution about every 112 minutes at an altitude of approximately 250 to 316 km or 155 to 196 miles. MRO carries a sophisticated suite of instruments used to analyze and map the landforms, stratigraphy, minerals, and ice of Mars. The Context Camera (CTX) provides black-and-white images with resolutions up to 6 meters/pixel. It provides broader context maps for the higher resolution but narrower fields of view of the HiRISE camera, as well as for other instruments aboard MRO, and is useful for producing mosaicked images of larger areas on Mars' surface.]]
 }
@@ -151,6 +167,7 @@ local treks_CTX_DEM_East_Melas = {
 local treks_CTX_Shade_East_Melas = {
   Identifier = "CTX_Shade_East_Melas",
   Name = [[MRO CTX, East Melas Hillshade]],
+  ZIndex = 50,
   FilePath = asset.resource("MRO_CTX/East_Melas_Hillshade.vrt"),
   Description = [[This is a hillshade rendition of the digital elevation model (DEM) for the Eastern Melas Chasma region of Valles Marineris. It is one of the areas identified as a potential Exploration Zone (EZ) for human exploration of Mars. The hillshade layer is a shaded relief view of the DEM, making it particularly easy to visualize surface topography. The DEM was generated by combining 9 stereographic pairs of CTX images. Each individual pair was taken of the same area but from different angles. The nine pairs were joined together to cover a broad area of the EZ. This data was acquired using the Context Camera aboard NASA's Mars Reconnaissance Orbiter spacecraft (MRO). MRO was launched on August 12, 2005 and arrived at Mars on March 10, 2006. It maintains a nearly circular orbit, completing an orbital revolution about every 112 minutes at an altitude of approximately 250 to 316 km or 155 to 196 miles. MRO carries a sophisticated suite of instruments used to analyze and map the landforms, stratigraphy, minerals, and ice of Mars. The Context Camera (CTX) provides black-and-white images with resolutions up to 6 meters/pixel. It provides broader context maps for the higher resolution but narrower fields of view of the HiRISE camera, as well as for other instruments aboard MRO, and is useful for producing mosaicked images of larger areas on Mars' surface.]]
 }
@@ -158,6 +175,7 @@ local treks_CTX_Shade_East_Melas = {
 local treks_NE_Marineris_Crater_CTX_BlockAdj_dd = {
   Identifier = "NE_Marineris_Crater_CTX_BlockAdj_dd",
   Name = [[MRO CTX, Eastern Valles Marineris Mosaic]],
+  ZIndex = 50,
   FilePath = asset.resource("MRO_CTX/Eastern_Valles_Marineris_Mosaic.vrt"),
   Description = [[This data was acquired using the Context Camera aboard NASA's Mars Reconnaissance Orbiter spacecraft (MRO). MRO was launched on August 12, 2005 and arrived at Mars on March 10, 2006. It maintains a nearly circular orbit, completing an orbital revolution about every 112 minutes at an altitude of approximately 250 to 316 km or 155 to 196 miles. MRO carries a sophisticated suite of instruments used to analyze and map the landforms, stratigraphy, minerals, and ice of Mars.
 
@@ -167,6 +185,7 @@ The Context Camera (CTX) provides black-and-white images with resolutions up to
 local treks_SE_Marineris_CTX_BlockAdj_dd = {
   Identifier = "SE_Marineris_CTX_BlockAdj_dd",
   Name = [[MRO CTX, Equatorial Valles Marineries Mosaic]],
+  ZIndex = 50,
   FilePath = asset.resource("MRO_CTX/Equatorial_Valles_Marineries_Mosaic.vrt"),
   Description = [[This data was acquired using the Context Camera aboard NASA's Mars Reconnaissance Orbiter spacecraft (MRO). MRO was launched on August 12, 2005 and arrived at Mars on March 10, 2006. It maintains a nearly circular orbit, completing an orbital revolution about every 112 minutes at an altitude of approximately 250 to 316 km or 155 to 196 miles. MRO carries a sophisticated suite of instruments used to analyze and map the landforms, stratigraphy, minerals, and ice of Mars.
 
@@ -176,6 +195,7 @@ The Context Camera (CTX) provides black-and-white images with resolutions up to
 local treks_Erebus_Montes_CTX_BlockAdj_dd = {
   Identifier = "Erebus_Montes_CTX_BlockAdj_dd",
   Name = [[MRO CTX, Erebus Montes Mosaic]],
+  ZIndex = 50,
   FilePath = asset.resource("MRO_CTX/Erebus_Montes_Mosaic.vrt"),
   Description = [[This data was acquired using the Context Camera aboard NASA's Mars Reconnaissance Orbiter spacecraft (MRO). MRO was launched on August 12, 2005 and arrived at Mars on March 10, 2006. It maintains a nearly circular orbit, completing an orbital revolution about every 112 minutes at an altitude of approximately 250 to 316 km or 155 to 196 miles. MRO carries a sophisticated suite of instruments used to analyze and map the landforms, stratigraphy, minerals, and ice of Mars.
 
@@ -185,6 +205,7 @@ The Context Camera (CTX) provides black-and-white images with resolutions up to
 local treks_Gale_CTX_BlockAdj_dd = {
   Identifier = "Gale_CTX_BlockAdj_dd",
   Name = [[MRO CTX, Gale Crater Mosaic]],
+  ZIndex = 50,
   FilePath = asset.resource("MRO_CTX/Gale_Crater_Mosaic.vrt"),
   Description = [[This data was acquired using the Context Camera aboard NASA's Mars Reconnaissance Orbiter spacecraft (MRO). MRO was launched on August 12, 2005 and arrived at Mars on March 10, 2006. It maintains a nearly circular orbit, completing an orbital revolution about every 112 minutes at an altitude of approximately 250 to 316 km or 155 to 196 miles. MRO carries a sophisticated suite of instruments used to analyze and map the landforms, stratigraphy, minerals, and ice of Mars.
 
@@ -194,6 +215,7 @@ The Context Camera (CTX) provides black-and-white images with resolutions up to
 local treks_Gusev_CTX_BlockAdj_dd = {
   Identifier = "Gusev_CTX_BlockAdj_dd",
   Name = [[MRO CTX, Gusev Crater Mosaic]],
+  ZIndex = 50,
   FilePath = asset.resource("MRO_CTX/Gusev_Crater_Mosaic.vrt"),
   Description = [[This data was acquired using the Context Camera aboard NASA's Mars Reconnaissance Orbiter spacecraft (MRO). MRO was launched on August 12, 2005 and arrived at Mars on March 10, 2006. It maintains a nearly circular orbit, completing an orbital revolution about every 112 minutes at an altitude of approximately 250 to 316 km or 155 to 196 miles. MRO carries a sophisticated suite of instruments used to analyze and map the landforms, stratigraphy, minerals, and ice of Mars.
 
@@ -203,6 +225,7 @@ The Context Camera (CTX) provides black-and-white images with resolutions up to
 local treks_Hadriacus_CTX_BlockAdj_dd = {
   Identifier = "Hadriacus_CTX_BlockAdj_dd",
   Name = [[MRO CTX, Hadriacus Mosaic]],
+  ZIndex = 50,
   FilePath = asset.resource("MRO_CTX/Hadriacus_Mosaic.vrt"),
   Description = [[This data was acquired using the Context Camera aboard NASA's Mars Reconnaissance Orbiter spacecraft (MRO). MRO was launched on August 12, 2005 and arrived at Mars on March 10, 2006. It maintains a nearly circular orbit, completing an orbital revolution about every 112 minutes at an altitude of approximately 250 to 316 km or 155 to 196 miles. MRO carries a sophisticated suite of instruments used to analyze and map the landforms, stratigraphy, minerals, and ice of Mars.
 
@@ -212,6 +235,7 @@ The Context Camera (CTX) provides black-and-white images with resolutions up to
 local treks_Hale_Crater_CTX_BlockAdj_dd = {
   Identifier = "Hale_Crater_CTX_BlockAdj_dd",
   Name = [[MRO CTX, Hale Crater Mosaic]],
+  ZIndex = 50,
   FilePath = asset.resource("MRO_CTX/Hale_Crater_Mosaic.vrt"),
   Description = [[This data was acquired using the Context Camera aboard NASA's Mars Reconnaissance Orbiter spacecraft (MRO). MRO was launched on August 12, 2005 and arrived at Mars on March 10, 2006. It maintains a nearly circular orbit, completing an orbital revolution about every 112 minutes at an altitude of approximately 250 to 316 km or 155 to 196 miles. MRO carries a sophisticated suite of instruments used to analyze and map the landforms, stratigraphy, minerals, and ice of Mars.
 
@@ -221,6 +245,7 @@ The Context Camera (CTX) provides black-and-white images with resolutions up to
 local treks_Hebrus_CTX_BlockAdj_dd = {
   Identifier = "Hebrus_CTX_BlockAdj_dd",
   Name = [[MRO CTX, Hebrus Valles Mosaic]],
+  ZIndex = 50,
   FilePath = asset.resource("MRO_CTX/Hebrus_Valles_Mosaic.vrt"),
   Description = [[This data was acquired using the Context Camera aboard NASA's Mars Reconnaissance Orbiter spacecraft (MRO). MRO was launched on August 12, 2005 and arrived at Mars on March 10, 2006. It maintains a nearly circular orbit, completing an orbital revolution about every 112 minutes at an altitude of approximately 250 to 316 km or 155 to 196 miles. MRO carries a sophisticated suite of instruments used to analyze and map the landforms, stratigraphy, minerals, and ice of Mars.
 
@@ -230,6 +255,7 @@ The Context Camera (CTX) provides black-and-white images with resolutions up to
 local treks_Hellas_Hellas2_CTX_BlockAdj_dd = {
   Identifier = "Hellas_Hellas2_CTX_BlockAdj_dd",
   Name = [[MRO CTX, Hellas Eastern Rim Mosaic]],
+  ZIndex = 50,
   FilePath = asset.resource("MRO_CTX/Hellas_Eastern_Rim_Mosaic.vrt"),
   Description = [[This data was acquired using the Context Camera aboard NASA's Mars Reconnaissance Orbiter spacecraft (MRO). MRO was launched on August 12, 2005 and arrived at Mars on March 10, 2006. It maintains a nearly circular orbit, completing an orbital revolution about every 112 minutes at an altitude of approximately 250 to 316 km or 155 to 196 miles. MRO carries a sophisticated suite of instruments used to analyze and map the landforms, stratigraphy, minerals, and ice of Mars.
 
@@ -239,6 +265,7 @@ The Context Camera (CTX) provides black-and-white images with resolutions up to
 local treks_Hellas3_CTX_BlockAdj_dd = {
   Identifier = "Hellas3_CTX_BlockAdj_dd",
   Name = [[MRO CTX, Hellas Mesopotamia Mosaic]],
+  ZIndex = 50,
   FilePath = asset.resource("MRO_CTX/Hellas_Mesopotamia_Mosaic.vrt"),
   Description = [[This data was acquired using the Context Camera aboard NASA's Mars Reconnaissance Orbiter spacecraft (MRO). MRO was launched on August 12, 2005 and arrived at Mars on March 10, 2006. It maintains a nearly circular orbit, completing an orbital revolution about every 112 minutes at an altitude of approximately 250 to 316 km or 155 to 196 miles. MRO carries a sophisticated suite of instruments used to analyze and map the landforms, stratigraphy, minerals, and ice of Mars.
 
@@ -248,6 +275,7 @@ The Context Camera (CTX) provides black-and-white images with resolutions up to
 local treks_Huygens_CTX_BlockAdj_dd = {
   Identifier = "Huygens_CTX_BlockAdj_dd",
   Name = [[MRO CTX, Huygens Crater Mosaic]],
+  ZIndex = 50,
   FilePath = asset.resource("MRO_CTX/Huygens_Crater_Mosaic.vrt"),
   Description = [[This data was acquired using the Context Camera aboard NASA's Mars Reconnaissance Orbiter spacecraft (MRO). MRO was launched on August 12, 2005 and arrived at Mars on March 10, 2006. It maintains a nearly circular orbit, completing an orbital revolution about every 112 minutes at an altitude of approximately 250 to 316 km or 155 to 196 miles. MRO carries a sophisticated suite of instruments used to analyze and map the landforms, stratigraphy, minerals, and ice of Mars.
 
@@ -257,6 +285,7 @@ The Context Camera (CTX) provides black-and-white images with resolutions up to
 local treks_Hypanis_Delta_CTX_BlockAdj_dd = {
   Identifier = "Hypanis_Delta_CTX_BlockAdj_dd",
   Name = [[MRO CTX, Hypanis Delta Mosaic]],
+  ZIndex = 50,
   FilePath = asset.resource("MRO_CTX/Hypanis_Delta_Mosaic.vrt"),
   Description = [[This data was acquired using the Context Camera aboard NASA's Mars Reconnaissance Orbiter spacecraft (MRO). MRO was launched on August 12, 2005 and arrived at Mars on March 10, 2006. It maintains a nearly circular orbit, completing an orbital revolution about every 112 minutes at an altitude of approximately 250 to 316 km or 155 to 196 miles. MRO carries a sophisticated suite of instruments used to analyze and map the landforms, stratigraphy, minerals, and ice of Mars.
 
@@ -266,6 +295,7 @@ The Context Camera (CTX) provides black-and-white images with resolutions up to
 local treks_Ismenius_Cavus_CTX_BlockAdj_dd = {
   Identifier = "Ismenius_Cavus_CTX_BlockAdj_dd",
   Name = [[MRO CTX, Ismenius Cavus Mosaic]],
+  ZIndex = 50,
   FilePath = asset.resource("MRO_CTX/Ismenius_Cavus_Mosaic.vrt"),
   Description = [[This data was acquired using the Context Camera aboard NASA's Mars Reconnaissance Orbiter spacecraft (MRO). MRO was launched on August 12, 2005 and arrived at Mars on March 10, 2006. It maintains a nearly circular orbit, completing an orbital revolution about every 112 minutes at an altitude of approximately 250 to 316 km or 155 to 196 miles. MRO carries a sophisticated suite of instruments used to analyze and map the landforms, stratigraphy, minerals, and ice of Mars.
 
@@ -275,6 +305,7 @@ The Context Camera (CTX) provides black-and-white images with resolutions up to
 local treks_Jezero_CTX_BlockAdj_dd = {
   Identifier = "Jezero_CTX_BlockAdj_dd",
   Name = [[MRO CTX, Jezero Mosaic, Preliminary]],
+  ZIndex = 50,
   FilePath = asset.resource("MRO_CTX/Jezero_Mosaic.vrt"),
   Description = [[This data was acquired using the Context Camera aboard NASA's Mars Reconnaissance Orbiter spacecraft (MRO). MRO was launched on August 12, 2005 and arrived at Mars on March 10, 2006. It maintains a nearly circular orbit, completing an orbital revolution about every 112 minutes at an altitude of approximately 250 to 316 km or 155 to 196 miles. MRO carries a sophisticated suite of instruments used to analyze and map the landforms, stratigraphy, minerals, and ice of Mars.
 
@@ -284,6 +315,7 @@ The Context Camera (CTX) provides black-and-white images with resolutions up to
 local treks_Kasei_Valles_CTX_BlockAdj_dd = {
   Identifier = "Kasei_Valles_CTX_BlockAdj_dd",
   Name = [[MRO CTX, Kasei Valles Mosaic]],
+  ZIndex = 50,
   FilePath = asset.resource("MRO_CTX/Kasei_Valles_Mosaic.vrt"),
   Description = [[This data was acquired using the Context Camera aboard NASA's Mars Reconnaissance Orbiter spacecraft (MRO). MRO was launched on August 12, 2005 and arrived at Mars on March 10, 2006. It maintains a nearly circular orbit, completing an orbital revolution about every 112 minutes at an altitude of approximately 250 to 316 km or 155 to 196 miles. MRO carries a sophisticated suite of instruments used to analyze and map the landforms, stratigraphy, minerals, and ice of Mars.
 
@@ -293,6 +325,7 @@ The Context Camera (CTX) provides black-and-white images with resolutions up to
 local treks_Mawrth_Valles_CTX_BlockAdj_dd = {
   Identifier = "Mawrth_Valles_CTX_BlockAdj_dd",
   Name = [[MRO CTX, Mawrth Vallis Mosaic]],
+  ZIndex = 50,
   FilePath = asset.resource("MRO_CTX/Mawrth_Vallis_Mosaic.vrt"),
   Description = [[This data was acquired using the Context Camera aboard NASA's Mars Reconnaissance Orbiter spacecraft (MRO). MRO was launched on August 12, 2005 and arrived at Mars on March 10, 2006. It maintains a nearly circular orbit, completing an orbital revolution about every 112 minutes at an altitude of approximately 250 to 316 km or 155 to 196 miles. MRO carries a sophisticated suite of instruments used to analyze and map the landforms, stratigraphy, minerals, and ice of Mars.
 
@@ -302,6 +335,7 @@ The Context Camera (CTX) provides black-and-white images with resolutions up to
 local treks_McLaughlin_Crater_CTX_BlockAdj_dd = {
   Identifier = "McLaughlin_Crater_CTX_BlockAdj_dd",
   Name = [[MRO CTX, McLaughlin Crater Mosaic]],
+  ZIndex = 50,
   FilePath = asset.resource("MRO_CTX/McLaughlin_Crater_Mosaic.vrt"),
   Description = [[This data was acquired using the Context Camera aboard NASA's Mars Reconnaissance Orbiter spacecraft (MRO). MRO was launched on August 12, 2005 and arrived at Mars on March 10, 2006. It maintains a nearly circular orbit, completing an orbital revolution about every 112 minutes at an altitude of approximately 250 to 316 km or 155 to 196 miles. MRO carries a sophisticated suite of instruments used to analyze and map the landforms, stratigraphy, minerals, and ice of Mars.
 
@@ -311,6 +345,7 @@ The Context Camera (CTX) provides black-and-white images with resolutions up to
 local treks_S_Meridiani_Sinus_Planium_CTX_BlockAdj_dd = {
   Identifier = "S_Meridiani_Sinus_Planium_CTX_BlockAdj_dd",
   Name = [[MRO CTX, Meridiani Planum - Sinus Meridiani Mosaic]],
+  ZIndex = 50,
   FilePath = asset.resource("MRO_CTX/Meridiani_Planum_-_Sinus_Meridiani_Mosaic.vrt"),
   Description = [[This data was acquired using the Context Camera aboard NASA's Mars Reconnaissance Orbiter spacecraft (MRO). MRO was launched on August 12, 2005 and arrived at Mars on March 10, 2006. It maintains a nearly circular orbit, completing an orbital revolution about every 112 minutes at an altitude of approximately 250 to 316 km or 155 to 196 miles. MRO carries a sophisticated suite of instruments used to analyze and map the landforms, stratigraphy, minerals, and ice of Mars.
 
@@ -320,6 +355,7 @@ The Context Camera (CTX) provides black-and-white images with resolutions up to
 local treks_CTX_beta01_uncontrolled_5m_Caltech = {
   Identifier = "CTX_beta01_uncontrolled_5m_Caltech",
   Name = [[MRO CTX, Mosaic Global Uncontrolled (Caltech)]],
+  ZIndex = 50,
   FilePath = asset.resource("MRO_CTX/Mosaic_Global_Uncontrolled_Caltech.vrt"),
   Description = [[This is a preliminary uncontrolled Context Camera (CTX) mosaic, called beta01, that the Murray Lab at Caltech has created to (1) generate a list of orbits that will be included in the final mosaic, (2) decipher challenges involved with generating a product of this unprecedented scale, and (3) solicit feedback from the Mars science community for how best to generate the mosaic in a way that helps as diverse a group of scientists as possible. The CTX camera, as managed by Malin Space Science Systems (MSSS), has attained near global coverage of Mars at the scale of ~5 m/pixel. All data used in the construction of this CTX global mosaic have been publicly released and are freely available via the NASA Planetary Data System. The Murray Lab/Caltech grants free use of the beta01 version of the mosaic for all purposes. When used, data credit should be: NASA/JPL/MSSS/The Caltech Murray Lab/Esri. This tiled web service, as hosted by Esri, is made available using lossy Jpeg compression at an 8 bit data range.
 
@@ -332,6 +368,7 @@ Credit: NASA/JPL/MSSS/The Caltech Murray Lab/Esri]]
 local treks_InSightCTXMosaic_112917 = {
   Identifier = "InSightCTXMosaic_112917",
   Name = [[MRO CTX, Mosaic InSight]],
+  ZIndex = 50,
   FilePath = asset.resource("MRO_CTX/Mosaic_InSight.vrt"),
   Description = [[This is a 5m/px CTX orthophoto mosaic of the InSight Landing Site.  After being transformed using a spline transformation, each image had the exterior 100m of pixels removed and was detrended by fitting a third order polynomial and subtracting it from each image. All of the detrended images were then mosaiced into a single image and color balanced using Distributed Gradient-Domain processing.]]
 }
@@ -339,6 +376,7 @@ local treks_InSightCTXMosaic_112917 = {
 local treks_olympus_monseq = {
   Identifier = "olympus_monseq",
   Name = [[MRO CTX, Mosaic Olympus Mons]],
+  ZIndex = 50,
   FilePath = asset.resource("MRO_CTX/Mosaic_Olympus_Mons.vrt"),
   Description = [[This is a beta section of a CTX global mosaic produced by Jay Dickson. It was created by map projecting CT
 X images with ISIS3, and color balancing/stitching the images with Adobe Photoshop. A footprint layer shows the seams
@@ -350,6 +388,7 @@ Dickson et al. 2018 LPSC programs with abstracts https://www.hou.usra.edu/meetin
 local treks_Newton_Crater_CTX_BlockAdj_dd = {
   Identifier = "Newton_Crater_CTX_BlockAdj_dd",
   Name = [[MRO CTX, Newton Crater Mosaic]],
+  ZIndex = 50,
   FilePath = asset.resource("MRO_CTX/Newton_Crater_Mosaic.vrt"),
   Description = [[This data was acquired using the Context Camera aboard NASA's Mars Reconnaissance Orbiter spacecraft (MRO). MRO was launched on August 12, 2005 and arrived at Mars on March 10, 2006. It maintains a nearly circular orbit, completing an orbital revolution about every 112 minutes at an altitude of approximately 250 to 316 km or 155 to 196 miles. MRO carries a sophisticated suite of instruments used to analyze and map the landforms, stratigraphy, minerals, and ice of Mars.
 
@@ -359,6 +398,7 @@ The Context Camera (CTX) provides black-and-white images with resolutions up to
 local treks_Noactis_Landing_CTX_BlockAdj_dd = {
   Identifier = "Noactis_Landing_CTX_BlockAdj_dd",
   Name = [[MRO CTX, Noctis Landing Mosaic]],
+  ZIndex = 50,
   FilePath = asset.resource("MRO_CTX/Noctis_Landing_Mosaic.vrt"),
   Description = [[This data was acquired using the Context Camera aboard NASA's Mars Reconnaissance Orbiter spacecraft (MRO). MRO was launched on August 12, 2005 and arrived at Mars on March 10, 2006. It maintains a nearly circular orbit, completing an orbital revolution about every 112 minutes at an altitude of approximately 250 to 316 km or 155 to 196 miles. MRO carries a sophisticated suite of instruments used to analyze and map the landforms, stratigraphy, minerals, and ice of Mars.
 
@@ -368,6 +408,7 @@ The Context Camera (CTX) provides black-and-white images with resolutions up to
 local treks_Protonilus_CTX_BlockAdj_dd = {
   Identifier = "Protonilus_CTX_BlockAdj_dd",
   Name = [[MRO CTX, Protonilus Mensae Mosaic]],
+  ZIndex = 50,
   FilePath = asset.resource("MRO_CTX/Protonilus_Mensae_Mosaic.vrt"),
   Description = [[This data was acquired using the Context Camera aboard NASA's Mars Reconnaissance Orbiter spacecraft (MRO). MRO was launched on August 12, 2005 and arrived at Mars on March 10, 2006. It maintains a nearly circular orbit, completing an orbital revolution about every 112 minutes at an altitude of approximately 250 to 316 km or 155 to 196 miles. MRO carries a sophisticated suite of instruments used to analyze and map the landforms, stratigraphy, minerals, and ice of Mars.
 
@@ -377,6 +418,7 @@ The Context Camera (CTX) provides black-and-white images with resolutions up to
 local treks_S_Nectaris_Fossae_CTX_BlockAdj_dd = {
   Identifier = "S_Nectaris_Fossae_CTX_BlockAdj_dd",
   Name = [[MRO CTX, Southern Nectaris Fossae Mosaic]],
+  ZIndex = 50,
   FilePath = asset.resource("MRO_CTX/Southern_Nectaris_Fossae_Mosaic.vrt"),
   Description = [[This data was acquired using the Context Camera aboard NASA's Mars Reconnaissance Orbiter spacecraft (MRO). MRO was launched on August 12, 2005 and arrived at Mars on March 10, 2006. It maintains a nearly circular orbit, completing an orbital revolution about every 112 minutes at an altitude of approximately 250 to 316 km or 155 to 196 miles. MRO carries a sophisticated suite of instruments used to analyze and map the landforms, stratigraphy, minerals, and ice of Mars.
 
@@ -386,6 +428,7 @@ The Context Camera (CTX) provides black-and-white images with resolutions up to
 local treks_DEM_1m_VictoriaCrater = {
   Identifier = "DEM_1m_VictoriaCrater",
   Name = [[MRO CTX, Victoria Crater DEM]],
+  ZIndex = 50,
   FilePath = asset.resource("MRO_CTX/Victoria_Crater_DEM.vrt"),
   Description = [[This data was acquired using the Context Camera aboard NASA's Mars Reconnaissance Orbiter spacecraft (MRO). MRO was launched on August 12, 2005 and arrived at Mars on March 10, 2006. It maintains a nearly circular orbit, completing an orbital revolution about every 112 minutes at an altitude of approximately 250 to 316 km or 155 to 196 miles. MRO carries a sophisticated suite of instruments used to analyze and map the landforms, stratigraphy, minerals, and ice of Mars.
 
@@ -395,6 +438,7 @@ The Context Camera (CTX) provides black-and-white images with resolutions up to
 local treks_Viking_CTX_BlockAdj_dd = {
   Identifier = "Viking_CTX_BlockAdj_dd",
   Name = [[MRO CTX, Viking 1 Landing Site Mosaic]],
+  ZIndex = 50,
   FilePath = asset.resource("MRO_CTX/Viking_1_Landing_Site_Mosaic.vrt"),
   Description = [[This data was acquired using the Context Camera aboard NASA's Mars Reconnaissance Orbiter spacecraft (MRO). MRO was launched on August 12, 2005 and arrived at Mars on March 10, 2006. It maintains a nearly circular orbit, completing an orbital revolution about every 112 minutes at an altitude of approximately 250 to 316 km or 155 to 196 miles. MRO carries a sophisticated suite of instruments used to analyze and map the landforms, stratigraphy, minerals, and ice of Mars.
 
@@ -404,6 +448,7 @@ The Context Camera (CTX) provides black-and-white images with resolutions up to
 local treks_b16_015887_2280_xn_48n225w = {
   Identifier = "b16_015887_2280_xn_48n225w",
   Name = [[MRO CTX, Viking 2 Landing Site Mosaic]],
+  ZIndex = 50,
   FilePath = asset.resource("MRO_CTX/Viking_2_Landing_Site_Mosaic.vrt"),
   Description = [[This data was acquired using the Context Camera aboard NASA's Mars Reconnaissance Orbiter spacecraft (MRO). MRO was launched on August 12, 2005 and arrived at Mars on March 10, 2006. It maintains a nearly circular orbit, completing an orbital revolution about every 112 minutes at an altitude of approximately 250 to 316 km or 155 to 196 miles. MRO carries a sophisticated suite of instruments used to analyze and map the landforms, stratigraphy, minerals, and ice of Mars.
 
@@ -413,6 +458,7 @@ The Context Camera (CTX) provides black-and-white images with resolutions up to
 local treks_West_Candor_Chasma_longlat = {
   Identifier = "West_Candor_Chasma_longlat",
   Name = [[MRO CTX, West Candor Chasma Mosaic]],
+  ZIndex = 50,
   FilePath = asset.resource("MRO_CTX/West_Candor_Chasma_Mosaic.vrt"),
   Description = [[This data was acquired using the Context Camera aboard NASA's Mars Reconnaissance Orbiter spacecraft (MRO). MRO was launched on August 12, 2005 and arrived at Mars on March 10, 2006. It maintains a nearly circular orbit, completing an orbital revolution about every 112 minutes at an altitude of approximately 250 to 316 km or 155 to 196 miles. MRO carries a sophisticated suite of instruments used to analyze and map the landforms, stratigraphy, minerals, and ice of Mars.
 
@@ -422,6 +468,7 @@ The Context Camera (CTX) provides black-and-white images with resolutions up to
 local treks_West_Candor_Chasma_DEM_longlat = {
   Identifier = "West_Candor_Chasma_DEM_longlat",
   Name = [[MRO CTX, West Candor DEM]],
+  ZIndex = 50,
   FilePath = asset.resource("MRO_CTX/West_Candor_DEM.vrt"),
   Description = [[This data was acquired using the Context Camera aboard NASA's Mars Reconnaissance Orbiter spacecraft (MRO). MRO was launched on August 12, 2005 and arrived at Mars on March 10, 2006. It maintains a nearly circular orbit, completing an orbital revolution about every 112 minutes at an altitude of approximately 250 to 316 km or 155 to 196 miles. MRO carries a sophisticated suite of instruments used to analyze and map the landforms, stratigraphy, minerals, and ice of Mars.
 
@@ -431,6 +478,7 @@ The Context Camera (CTX) provides black-and-white images with resolutions up to
 local treks_Noachis_CTX_BlockAdj_dd = {
   Identifier = "Noachis_CTX_BlockAdj_dd",
   Name = [[MRO CTX, Western Noachis Terra Mosaic]],
+  ZIndex = 50,
   FilePath = asset.resource("MRO_CTX/Western_Noachis_Terra_Mosaic.vrt"),
   Description = [[This data was acquired using the Context Camera aboard NASA's Mars Reconnaissance Orbiter spacecraft (MRO). MRO was launched on August 12, 2005 and arrived at Mars on March 10, 2006. It maintains a nearly circular orbit, completing an orbital revolution about every 112 minutes at an altitude of approximately 250 to 316 km or 155 to 196 miles. MRO carries a sophisticated suite of instruments used to analyze and map the landforms, stratigraphy, minerals, and ice of Mars.
 
@@ -440,6 +488,7 @@ The Context Camera (CTX) provides black-and-white images with resolutions up to
 local treks_Zephyria_CTX_BlockAdj_dd = {
   Identifier = "Zephyria_CTX_BlockAdj_dd",
   Name = [[MRO CTX, Zephyria Planum Mosaic]],
+  ZIndex = 50,
   FilePath = asset.resource("MRO_CTX/Zephyria_Planum_Mosaic.vrt"),
   Description = [[This data was acquired using the Context Camera aboard NASA's Mars Reconnaissance Orbiter spacecraft (MRO). MRO was launched on August 12, 2005 and arrived at Mars on March 10, 2006. It maintains a nearly circular orbit, completing an orbital revolution about every 112 minutes at an altitude of approximately 250 to 316 km or 155 to 196 miles. MRO carries a sophisticated suite of instruments used to analyze and map the landforms, stratigraphy, minerals, and ice of Mars.
 
diff --git a/data/assets/scene/solarsystem/planets/mars/layers/nasa-treks/MRO_HiRISE.asset b/data/assets/scene/solarsystem/planets/mars/layers/nasa-treks/MRO_HiRISE.asset
index 469d7d5e58..3c2629b1ac 100644
--- a/data/assets/scene/solarsystem/planets/mars/layers/nasa-treks/MRO_HiRISE.asset
+++ b/data/assets/scene/solarsystem/planets/mars/layers/nasa-treks/MRO_HiRISE.asset
@@ -9,6 +9,7 @@ local globeIdentifier = asset.require("scene/solarsystem//planets/mars/mars").Ma
 local treks_DTEEC_001918_1735_001984_1735_U01_longlat = {
   Identifier = "DTEEC_001918_1735_001984_1735_U01_longlat",
   Name = [[MRO HiRISE, 001918_1735_001984_1735 DEM]],
+  ZIndex = 50,
   FilePath = asset.resource("MRO_HiRISE/001918_1735_001984_1735_DEM.vrt"),
   Description = [[This data was acquired using the High Resolution Imaging Science Experiment camera aboard NASA's Mars Reconnaissance Orbiter spacecraft (MRO). MRO was launched on August 12, 2005 and arrived at Mars on March 10, 2006. It maintains a nearly circular orbit, completing an orbital revolution about every 112 minutes at an altitude of approximately 250 to 316 km or 155 to 196 miles. MRO carries a sophisticated suite of instruments used to analyze and map the landforms, stratigraphy, minerals, and ice of Mars.
 
@@ -18,6 +19,7 @@ The High Resolution Imaging Science Experiment (HiRISE) camera utilizes a 0.5-me
 local treks_DTEED_042014_1760_042647_1760_A01 = {
   Identifier = "DTEED_042014_1760_042647_1760_A01",
   Name = [[MRO HiRISE, 042014_1760_042647_1760 DEM]],
+  ZIndex = 50,
   FilePath = asset.resource("MRO_HiRISE/042014_1760_042647_1760_DEM.vrt"),
   Description = [[This data was acquired using the High Resolution Imaging Science Experiment camera aboard NASA's Mars Reconnaissance Orbiter spacecraft (MRO). MRO was launched on August 12, 2005 and arrived at Mars on March 10, 2006. It maintains a nearly circular orbit, completing an orbital revolution about every 112 minutes at an altitude of approximately 250 to 316 km or 155 to 196 miles. MRO carries a sophisticated suite of instruments used to analyze and map the landforms, stratigraphy, minerals, and ice of Mars.
 
@@ -27,6 +29,7 @@ The High Resolution Imaging Science Experiment (HiRISE) camera utilizes a 0.5-me
 local treks_DTEED_042753_1930_042252_1930_A01 = {
   Identifier = "DTEED_042753_1930_042252_1930_A01",
   Name = [[MRO HiRISE, 042753_1930_042252_1930 DEM]],
+  ZIndex = 50,
   FilePath = asset.resource("MRO_HiRISE/042753_1930_042252_1930_DEM.vrt"),
   Description = [[This data was acquired using the High Resolution Imaging Science Experiment camera aboard NASA's Mars Reconnaissance Orbiter spacecraft (MRO). MRO was launched on August 12, 2005 and arrived at Mars on March 10, 2006. It maintains a nearly circular orbit, completing an orbital revolution about every 112 minutes at an altitude of approximately 250 to 316 km or 155 to 196 miles. MRO carries a sophisticated suite of instruments used to analyze and map the landforms, stratigraphy, minerals, and ice of Mars.
 
@@ -36,6 +39,7 @@ The High Resolution Imaging Science Experiment (HiRISE) camera utilizes a 0.5-me
 local treks_h1183_0000_da4 = {
   Identifier = "h1183_0000_da4",
   Name = [[MRO HiRISE, 1183_0000 DEM]],
+  ZIndex = 50,
   FilePath = asset.resource("MRO_HiRISE/1183_0000_DEM.vrt"),
   Description = [[This data was acquired using the High Resolution Imaging Science Experiment camera aboard NASA's Mars Reconnaissance Orbiter spacecraft (MRO). MRO was launched on August 12, 2005 and arrived at Mars on March 10, 2006. It maintains a nearly circular orbit, completing an orbital revolution about every 112 minutes at an altitude of approximately 250 to 316 km or 155 to 196 miles. MRO carries a sophisticated suite of instruments used to analyze and map the landforms, stratigraphy, minerals, and ice of Mars.
 
@@ -45,6 +49,7 @@ The High Resolution Imaging Science Experiment (HiRISE) camera utilizes a 0.5-me
 local treks_HiRISE_ColumbiaHills = {
   Identifier = "HiRISE_ColumbiaHills",
   Name = [[MRO HiRISE, Columbia Hills Mosaic]],
+  ZIndex = 50,
   FilePath = asset.resource("MRO_HiRISE/Columbia_Hills_Mosaic.vrt"),
   Description = [[This data was acquired using the High Resolution Imaging Science Experiment camera aboard NASA's Mars Reconnaissance Orbiter spacecraft (MRO). MRO was launched on August 12, 2005 and arrived at Mars on March 10, 2006. It maintains a nearly circular orbit, completing an orbital revolution about every 112 minutes at an altitude of approximately 250 to 316 km or 155 to 196 miles. MRO carries a sophisticated suite of instruments used to analyze and map the landforms, stratigraphy, minerals, and ice of Mars.
 
@@ -54,6 +59,7 @@ The High Resolution Imaging Science Experiment (HiRISE) camera utilizes a 0.5-me
 local treks_curiosity_hirise_mosaic = {
   Identifier = "curiosity_hirise_mosaic",
   Name = [[MRO HiRISE, Curiosity Roving Site Mosaic]],
+  ZIndex = 50,
   FilePath = asset.resource("MRO_HiRISE/Curiosity_Roving_Site_Mosaic.vrt"),
   Description = [[This data was acquired using the High Resolution Imaging Science Experiment camera aboard NASA's Mars Reconnaissance Orbiter spacecraft (MRO). MRO was launched on August 12, 2005 and arrived at Mars on March 10, 2006. It maintains a nearly circular orbit, completing an orbital revolution about every 112 minutes at an altitude of approximately 250 to 316 km or 155 to 196 miles. MRO carries a sophisticated suite of instruments used to analyze and map the landforms, stratigraphy, minerals, and ice of Mars.
 
@@ -63,6 +69,7 @@ The High Resolution Imaging Science Experiment (HiRISE) camera utilizes a 0.5-me
 local treks_Gale_DEM_SMG_1m = {
   Identifier = "Gale_DEM_SMG_1m",
   Name = [[MRO HiRISE, Gale Crater DEM]],
+  ZIndex = 50,
   FilePath = asset.resource("MRO_HiRISE/Gale_Crater_DEM.vrt"),
   Description = [[This data was acquired using the High Resolution Imaging Science Experiment camera aboard NASA's Mars Reconnaissance Orbiter spacecraft (MRO). MRO was launched on August 12, 2005 and arrived at Mars on March 10, 2006. It maintains a nearly circular orbit, completing an orbital revolution about every 112 minutes at an altitude of approximately 250 to 316 km or 155 to 196 miles. MRO carries a sophisticated suite of instruments used to analyze and map the landforms, stratigraphy, minerals, and ice of Mars.
 
@@ -72,6 +79,7 @@ The High Resolution Imaging Science Experiment (HiRISE) camera utilizes a 0.5-me
 local treks_ESP_042252_1930_RED_B_01_ORTHO = {
   Identifier = "ESP_042252_1930_RED_B_01_ORTHO",
   Name = [[MRO HiRISE, Marth Crater West Rim Mosaic]],
+  ZIndex = 50,
   FilePath = asset.resource("MRO_HiRISE/Marth_Crater_West_Rim_Mosaic.vrt"),
   Description = [[This data was acquired using the High Resolution Imaging Science Experiment camera aboard NASA's Mars Reconnaissance Orbiter spacecraft (MRO). MRO was launched on August 12, 2005 and arrived at Mars on March 10, 2006. It maintains a nearly circular orbit, completing an orbital revolution about every 112 minutes at an altitude of approximately 250 to 316 km or 155 to 196 miles. MRO carries a sophisticated suite of instruments used to analyze and map the landforms, stratigraphy, minerals, and ice of Mars.
 
@@ -81,6 +89,7 @@ The High Resolution Imaging Science Experiment (HiRISE) camera utilizes a 0.5-me
 local treks_ESP_040776_2115_RED_A_01_ORTHO = {
   Identifier = "ESP_040776_2115_RED_A_01_ORTHO",
   Name = [[MRO HiRISE, Martian Ares 3 Landing Site Mosaic]],
+  ZIndex = 50,
   FilePath = asset.resource("MRO_HiRISE/Martian_Ares_3_Landing_Site_Mosaic.vrt"),
   Description = [[This data was acquired using the High Resolution Imaging Science Experiment camera aboard NASA's Mars Reconnaissance Orbiter spacecraft (MRO). MRO was launched on August 12, 2005 and arrived at Mars on March 10, 2006. It maintains a nearly circular orbit, completing an orbital revolution about every 112 minutes at an altitude of approximately 250 to 316 km or 155 to 196 miles. MRO carries a sophisticated suite of instruments used to analyze and map the landforms, stratigraphy, minerals, and ice of Mars.
 
@@ -90,6 +99,7 @@ The High Resolution Imaging Science Experiment (HiRISE) camera utilizes a 0.5-me
 local treks_ESP_042647_1760_RED_B_01_ORTHO = {
   Identifier = "ESP_042647_1760_RED_B_01_ORTHO",
   Name = [[MRO HiRISE, Martian Ares 4 Landing Site Mosaic]],
+  ZIndex = 50,
   FilePath = asset.resource("MRO_HiRISE/Martian_Ares_4_Landing_Site_Mosaic.vrt"),
   Description = [[This data was acquired using the High Resolution Imaging Science Experiment camera aboard NASA's Mars Reconnaissance Orbiter spacecraft (MRO). MRO was launched on August 12, 2005 and arrived at Mars on March 10, 2006. It maintains a nearly circular orbit, completing an orbital revolution about every 112 minutes at an altitude of approximately 250 to 316 km or 155 to 196 miles. MRO carries a sophisticated suite of instruments used to analyze and map the landforms, stratigraphy, minerals, and ice of Mars.
 
@@ -99,6 +109,7 @@ The High Resolution Imaging Science Experiment (HiRISE) camera utilizes a 0.5-me
 local treks_CLH_Visible_Mosaic_HiRISE_CTX_HRSC_GCS_MARS_07102018 = {
   Identifier = "CLH_Visible_Mosaic_HiRISE_CTX_HRSC_GCS_MARS_07102018",
   Name = [[MRO HiRISE, Mosaic Columbia Hills]],
+  ZIndex = 50,
   FilePath = asset.resource("MRO_HiRISE/Mosaic_Columbia_Hills.vrt"),
   Description = [[Preliminary visible orthoimage mosaic for Columbia Hills candidate landing site for the Mars 2020 rover.
 HRSC orthoimages and DEMs were downloaded from the Planetary Data System archives. HiRISE and CTX orthoimages and DEMs were created by the USGS Astrogeology and HiRISE teams,
@@ -121,6 +132,7 @@ When analyzing images, please ensure that the correct projection system is being
 local treks_ESP_058005_1845_RED_spline_rect = {
   Identifier = "ESP_058005_1845_RED_spline_rect",
   Name = [[MRO HiRISE, Mosaic Insight Landing Site]],
+  ZIndex = 50,
   FilePath = asset.resource("MRO_HiRISE/Mosaic_Insight_Landing_Site.vrt"),
   Description = [[This image (ESP_058005_1845) was acquired with the Mars HiRISE Camera aboard NASA's Mars Reconnaissance Orbiter. It shows the Mars InSight lander (4.5024°, 135.62345°), heat shield (4.50834°, 135.63481°), and backshell with parachute (4.49415°, 135.62778°). The image was acquired on December 11, 2018 at 14:02 local Mars time. The image is centered at 4.495° lat and 135.623° lon. The spacecraft altitude was 271.5 km. Original image scale range is 27.9 cm/pixel (with 1 x 1 binning) so objects about 84 cm across are resolved. The emission angle was 13.7°, phase angle was 51.0°, and solar incidence angle was 39°, with the Sun about 51° above the horizon. Solar longitude was 304.3°, Northern Winter.]]
 }
@@ -128,6 +140,7 @@ local treks_ESP_058005_1845_RED_spline_rect = {
 local treks_NES_JEZ_MID_Visible_Mosaic_HiRISE_CTX_HRSC_GCS_MARS_07102018 = {
   Identifier = "NES_JEZ_MID_Visible_Mosaic_HiRISE_CTX_HRSC_GCS_MARS_07102018",
   Name = [[MRO HiRISE, Mosaic Jezero NE Syrtis Midway]],
+  ZIndex = 50,
   FilePath = asset.resource("MRO_HiRISE/Mosaic_Jezero_NE_Syrtis_Midway.vrt"),
   Description = [[Preliminary visible orthoimage mosaic for Jezero Crater, NE Syrtis, and Midway candidate landing sites for the Mars 2020 rover.
 HRSC orthoimages and DEMs were downloaded from the Planetary Data System archives. HiRISE and CTX orthoimages and DEMs were created by the USGS Astrogeology and HiRISE teams,
@@ -150,6 +163,7 @@ When analyzing images, please ensure that the correct projection system is being
 local treks_HiRISE_Opportunity = {
   Identifier = "HiRISE_Opportunity",
   Name = [[MRO HiRISE, Mosaic Opportunity]],
+  ZIndex = 50,
   FilePath = asset.resource("MRO_HiRISE/Mosaic_Opportunity.vrt"),
   Description = [[This data was acquired using the High Resolution Imaging Science Experiment camera aboard NASA's Mars Reconnaissance Orbiter spacecraft (MRO). MRO was launched on August 12, 2005 and arrived at Mars on March 10, 2006. It maintains a nearly circular orbit, completing an orbital revolution about every 112 minutes at an altitude of approximately 250 to 316 km or 155 to 196 miles. MRO carries a sophisticated suite of instruments used to analyze and map the landforms, stratigraphy, minerals, and ice of Mars. The High Resolution Imaging Science Experiment (HiRISE) camera utilizes a 0.5-meter telescope to obtain very high resolution images of Martian landforms and terrains. From an altitude of 300 km, HiRISE has a resolution of 0.3 meters per pixel. In addition to being used for getting very detailed images of surface features, pairs of slightly offset HiRISE images are combined to produce precise digital elevation models of Martian topography.]]
 }
@@ -157,6 +171,7 @@ local treks_HiRISE_Opportunity = {
 local treks_opportunity_hirise_mosaic = {
   Identifier = "opportunity_hirise_mosaic",
   Name = [[MRO HiRISE, Opportunity Roving Site Mosaic]],
+  ZIndex = 50,
   FilePath = asset.resource("MRO_HiRISE/Opportunity_Roving_Site_Mosaic.vrt"),
   Description = [[This data was acquired using the High Resolution Imaging Science Experiment camera aboard NASA's Mars Reconnaissance Orbiter spacecraft (MRO). MRO was launched on August 12, 2005 and arrived at Mars on March 10, 2006. It maintains a nearly circular orbit, completing an orbital revolution about every 112 minutes at an altitude of approximately 250 to 316 km or 155 to 196 miles. MRO carries a sophisticated suite of instruments used to analyze and map the landforms, stratigraphy, minerals, and ice of Mars.
 
@@ -166,6 +181,7 @@ The High Resolution Imaging Science Experiment (HiRISE) camera utilizes a 0.5-me
 local treks_phoenix_hirise_mosaic = {
   Identifier = "phoenix_hirise_mosaic",
   Name = [[MRO HiRISE, Phoenix Landing Site Mosaic]],
+  ZIndex = 50,
   FilePath = asset.resource("MRO_HiRISE/Phoenix_Landing_Site_Mosaic.vrt"),
   Description = [[This data was acquired using the High Resolution Imaging Science Experiment camera aboard NASA's Mars Reconnaissance Orbiter spacecraft (MRO). MRO was launched on August 12, 2005 and arrived at Mars on March 10, 2006. It maintains a nearly circular orbit, completing an orbital revolution about every 112 minutes at an altitude of approximately 250 to 316 km or 155 to 196 miles. MRO carries a sophisticated suite of instruments used to analyze and map the landforms, stratigraphy, minerals, and ice of Mars.
 
@@ -175,6 +191,7 @@ The High Resolution Imaging Science Experiment (HiRISE) camera utilizes a 0.5-me
 local treks_sojourner_hirise_mosaic = {
   Identifier = "sojourner_hirise_mosaic",
   Name = [[MRO HiRISE, Sojourner Roving Site Mosaic]],
+  ZIndex = 50,
   FilePath = asset.resource("MRO_HiRISE/Sojourner_Roving_Site_Mosaic.vrt"),
   Description = [[This data was acquired using the High Resolution Imaging Science Experiment camera aboard NASA's Mars Reconnaissance Orbiter spacecraft (MRO). MRO was launched on August 12, 2005 and arrived at Mars on March 10, 2006. It maintains a nearly circular orbit, completing an orbital revolution about every 112 minutes at an altitude of approximately 250 to 316 km or 155 to 196 miles. MRO carries a sophisticated suite of instruments used to analyze and map the landforms, stratigraphy, minerals, and ice of Mars.
 
@@ -184,6 +201,7 @@ The High Resolution Imaging Science Experiment (HiRISE) camera utilizes a 0.5-me
 local treks_PSP_001918_1735_RED_A_01_ORTHO_longlat = {
   Identifier = "PSP_001918_1735_RED_A_01_ORTHO_longlat",
   Name = [[MRO HiRISE, Southwest Candor Chasma Mosaic]],
+  ZIndex = 50,
   FilePath = asset.resource("MRO_HiRISE/Southwest_Candor_Chasma_Mosaic.vrt"),
   Description = [[This data was acquired using the High Resolution Imaging Science Experiment camera aboard NASA's Mars Reconnaissance Orbiter spacecraft (MRO). MRO was launched on August 12, 2005 and arrived at Mars on March 10, 2006. It maintains a nearly circular orbit, completing an orbital revolution about every 112 minutes at an altitude of approximately 250 to 316 km or 155 to 196 miles. MRO carries a sophisticated suite of instruments used to analyze and map the landforms, stratigraphy, minerals, and ice of Mars. The High Resolution Imaging Science Experiment (HiRISE) camera utilizes a 0.5-meter telescope to obtain very high resolution images of Martian landforms and terrains. From an altitude of 300 km, HiRISE has a resolution of 0.3 meters per pixel. In addition to being used for getting very detailed images of surface features, pairs of slightly offset HiRISE images are combined to produce precise digital elevation models of Martian topography.]]
 }
@@ -191,6 +209,7 @@ local treks_PSP_001918_1735_RED_A_01_ORTHO_longlat = {
 local treks_spirit_hirise_mosaic = {
   Identifier = "spirit_hirise_mosaic",
   Name = [[MRO HiRISE, Spirit Roving Site Mosaic]],
+  ZIndex = 50,
   FilePath = asset.resource("MRO_HiRISE/Spirit_Roving_Site_Mosaic.vrt"),
   Description = [[This data was acquired using the High Resolution Imaging Science Experiment camera aboard NASA's Mars Reconnaissance Orbiter spacecraft (MRO). MRO was launched on August 12, 2005 and arrived at Mars on March 10, 2006. It maintains a nearly circular orbit, completing an orbital revolution about every 112 minutes at an altitude of approximately 250 to 316 km or 155 to 196 miles. MRO carries a sophisticated suite of instruments used to analyze and map the landforms, stratigraphy, minerals, and ice of Mars.
 
@@ -200,6 +219,7 @@ The High Resolution Imaging Science Experiment (HiRISE) camera utilizes a 0.5-me
 local treks_PSP_001521_2025_RED = {
   Identifier = "PSP_001521_2025_RED",
   Name = [[MRO HiRISE, Viking 1 Landing Site Mosaic]],
+  ZIndex = 50,
   FilePath = asset.resource("MRO_HiRISE/Viking_1_Landing_Site_Mosaic.vrt"),
   Description = [[This data was acquired using the High Resolution Imaging Science Experiment camera aboard NASA's Mars Reconnaissance Orbiter spacecraft (MRO). MRO was launched on August 12, 2005 and arrived at Mars on March 10, 2006. It maintains a nearly circular orbit, completing an orbital revolution about every 112 minutes at an altitude of approximately 250 to 316 km or 155 to 196 miles. MRO carries a sophisticated suite of instruments used to analyze and map the landforms, stratigraphy, minerals, and ice of Mars.
 
@@ -209,6 +229,7 @@ The High Resolution Imaging Science Experiment (HiRISE) camera utilizes a 0.5-me
 local treks_PSP_001501_2280_RED = {
   Identifier = "PSP_001501_2280_RED",
   Name = [[MRO HiRISE, Viking 2 Landing Site Mosaic]],
+  ZIndex = 50,
   FilePath = asset.resource("MRO_HiRISE/Viking_2_Landing_Site_Mosaic.vrt"),
   Description = [[This data was acquired using the High Resolution Imaging Science Experiment camera aboard NASA's Mars Reconnaissance Orbiter spacecraft (MRO). MRO was launched on August 12, 2005 and arrived at Mars on March 10, 2006. It maintains a nearly circular orbit, completing an orbital revolution about every 112 minutes at an altitude of approximately 250 to 316 km or 155 to 196 miles. MRO carries a sophisticated suite of instruments used to analyze and map the landforms, stratigraphy, minerals, and ice of Mars.
 
diff --git a/data/assets/scene/solarsystem/planets/mars/layers/nasa-treks/MSL.asset b/data/assets/scene/solarsystem/planets/mars/layers/nasa-treks/MSL.asset
index 076401270c..3792b2355e 100644
--- a/data/assets/scene/solarsystem/planets/mars/layers/nasa-treks/MSL.asset
+++ b/data/assets/scene/solarsystem/planets/mars/layers/nasa-treks/MSL.asset
@@ -9,6 +9,7 @@ local globeIdentifier = asset.require("scene/solarsystem//planets/mars/mars").Ma
 local treks_mars_pahrump_patch_8k_256m = {
   Identifier = "mars_pahrump_patch_8k_256m",
   Name = [[MSL, Pahrump Hills]],
+  ZIndex = 50,
   FilePath = asset.resource("MSL/Pahrump_Hills.vrt"),
   Description = [[This layer is a greyscale mosaic assembled using data from the High Resolution Stereo Camera aboard the European Space Agency's Mars Express orbiter. HRSC is being used to obtain color and stereo images that will map 100% of Mars' surface at resolution better than 30 m/pixel, and 50% of the surface at better than 15 m/pixel. Each of the nine CCD lines of HRSC, a linescan imager (pushbroom camera), contains 5184 pixels. The channels consist of red, green, blue, near-infrared, three stereo channels (backward, nadir, and forward) and two photometric channels. The digital elevation model used for this layer is a combination of data derived from the HRSC and the Mars Orbiter Laser Altimeter.]]
 }
diff --git a/data/assets/scene/solarsystem/planets/mars/layers/nasa-treks/Mars_Express_HRSC.asset b/data/assets/scene/solarsystem/planets/mars/layers/nasa-treks/Mars_Express_HRSC.asset
index 06f430aece..dd42bfc7cf 100644
--- a/data/assets/scene/solarsystem/planets/mars/layers/nasa-treks/Mars_Express_HRSC.asset
+++ b/data/assets/scene/solarsystem/planets/mars/layers/nasa-treks/Mars_Express_HRSC.asset
@@ -9,6 +9,7 @@ local globeIdentifier = asset.require("scene/solarsystem//planets/mars/mars").Ma
 local treks_HRSC_Martian_east = {
   Identifier = "HRSC_Martian_east",
   Name = [[Mars Express HRSC, Martian Path Eastern Section Color Mosaic]],
+  ZIndex = 50,
   FilePath = asset.resource("Mars_Express_HRSC/Martian_Path_Eastern_Section_Color_Mosaic.vrt"),
   Description = [[This layer is a greyscale mosaic assembled using data from the High Resolution Stereo Camera aboard the European Space Agency's Mars Express orbiter. HRSC is being used to obtain color and stereo images that will map 100% of Mars' surface at resolution better than 30 m/pixel, and 50% of the surface at better than 15 m/pixel. Each of the nine CCD lines of HRSC, a linescan imager (pushbroom camera), contains 5184 pixels. The channels consist of red, green, blue, near-infrared, three stereo channels (backward, nadir, and forward) and two photometric channels. The digital elevation model used for this layer is a combination of data derived from the HRSC and the Mars Orbiter Laser Altimeter.]]
 }
@@ -16,6 +17,7 @@ local treks_HRSC_Martian_east = {
 local treks_MC11E_HRMOSCO_COL = {
   Identifier = "MC11E_HRMOSCO_COL",
   Name = [[Mars Express HRSC, Martian Path MC11 Quad Color Mosaic]],
+  ZIndex = 50,
   FilePath = asset.resource("Mars_Express_HRSC/Martian_Path_MC11_Quad_Color_Mosaic.vrt"),
   Description = [[This layer is a combined color mosaic and 50 meter digital terrain model assembled using data from the High Resolution Stereo Camera (HRSC) aboard the European Space Agency's Mars Express orbiter. It covers the MC-11 quadrangle on Mars. For the purposes of mapping, the United States Geological Survey (USGS) has divided the surface of Mars into 30 quadrangles, labeled MC-1 through MC-30 (MC for Mars Chart). Each of the quadrangles also has a proper name derived from a prominent surface feature within the quadrangle. Much of the story of the Martian takes place within MC-11, also known as Oxia Palus. Fortunately, MC-11 happens to be the first complete quadrangle the European Space Agency produced as an HRSC 50m digital terrain model and image mosaic. HRSC is being used to obtain color and stereo images that will map 100% of Mars' surface at resolution better than 30 m/pixel, and 50% of the surface at better than 15 m/pixel. Each of the nine CCD lines of HRSC, a linescan imager (pushbroom camera), contains 5184 pixels. The channels consist of red, green, blue, near-infrared, three stereo channels (backward, nadir, and forward) and two photometric channels. This mosaic was produced by the Global Topography and Mosaic Generation Task Group of the HRSC-Team by joining nearly 100 contiguous HRSC stereo strips. HRSC data provided by ESA/DLR/FU Berlin and the Mars Express HRSC-Team.]]
 }
@@ -23,6 +25,7 @@ local treks_MC11E_HRMOSCO_COL = {
 local treks_MC11E_HRMOSND_ND5 = {
   Identifier = "MC11E_HRMOSND_ND5",
   Name = [[Mars Express HRSC, Martian Path MC11 Quad Mosaic]],
+  ZIndex = 50,
   FilePath = asset.resource("Mars_Express_HRSC/Martian_Path_MC11_Quad_Mosaic.vrt"),
   Description = [[This layer is a combined greyscale mosaic and 50 meter digital terrain model assembled using data from the High Resolution Stereo Camera (HRSC) aboard the European Space Agency's Mars Express orbiter. It covers the MC-11 quadrangle on Mars. For the purposes of mapping, the United States Geological Survey (USGS) has divided the surface of Mars into 30 quadrangles, labeled MC-1 through MC-30 (MC for Mars Chart). Each of the quadrangles also has a proper name derived from a prominent surface feature within the quadrangle. Much of the story of the Martian takes place within MC-11, also known as Oxia Palus. Fortunately, MC-11 happens to be the first complete quadrangle the European Space Agency produced as an HRSC 50m digital terrain model and image mosaic. HRSC is being used to obtain color and stereo images that will map 100% of Mars' surface at resolution better than 30 m/pixel, and 50% of the surface at better than 15 m/pixel. Each of the nine CCD lines of HRSC, a linescan imager (pushbroom camera), contains 5184 pixels. The channels consist of red, green, blue, near-infrared, three stereo channels (backward, nadir, and forward) and two photometric channels. While this mosaic lacks the color information shown in the color mosaic, it does show finer detail. This mosaic was produced by the Global Topography and Mosaic Generation Task Group of the HRSC-Team by joining nearly 100 contiguous HRSC stereo strips. HRSC data provided by ESA/DLR/FU Berlin and the Mars Express HRSC-Team.]]
 }
@@ -30,6 +33,7 @@ local treks_MC11E_HRMOSND_ND5 = {
 local treks_hrsc_mawrth_vallis_color = {
   Identifier = "hrsc_mawrth_vallis_color",
   Name = [[Mars Express HRSC, Mawrth Vallis Color Mosaic]],
+  ZIndex = 50,
   FilePath = asset.resource("Mars_Express_HRSC/Mawrth_Vallis_Color_Mosaic.vrt"),
   Description = [[This layer is a greyscale mosaic assembled using data from the High Resolution Stereo Camera aboard the European Space Agency's Mars Express orbiter. HRSC is being used to obtain color and stereo images that will map 100% of Mars' surface at resolution better than 30 m/pixel, and 50% of the surface at better than 15 m/pixel. Each of the nine CCD lines of HRSC, a linescan imager (pushbroom camera), contains 5184 pixels. The channels consist of red, green, blue, near-infrared, three stereo channels (backward, nadir, and forward) and two photometric channels. The digital elevation model used for this layer is a combination of data derived from the HRSC and the Mars Orbiter Laser Altimeter.]]
 }
@@ -37,6 +41,7 @@ local treks_hrsc_mawrth_vallis_color = {
 local treks_hrsc_mawrth_vallis = {
   Identifier = "hrsc_mawrth_vallis",
   Name = [[Mars Express HRSC, Mawrth Vallis Mosaic]],
+  ZIndex = 50,
   FilePath = asset.resource("Mars_Express_HRSC/Mawrth_Vallis_Mosaic.vrt"),
   Description = [[This layer is a greyscale mosaic assembled using data from the High Resolution Stereo Camera aboard the European Space Agency's Mars Express orbiter. HRSC is being used to obtain color and stereo images that will map 100% of Mars' surface at resolution better than 30 m/pixel, and 50% of the surface at better than 15 m/pixel. Each of the nine CCD lines of HRSC, a linescan imager (pushbroom camera), contains 5184 pixels. The channels consist of red, green, blue, near-infrared, three stereo channels (backward, nadir, and forward) and two photometric channels. The digital elevation model used for this layer is a combination of data derived from the HRSC and the Mars Orbiter Laser Altimeter.]]
 }
@@ -44,6 +49,7 @@ local treks_hrsc_mawrth_vallis = {
 local treks_h2942_0000_nd3 = {
   Identifier = "h2942_0000_nd3",
   Name = [[Mars Express HRSC, Viking 1 Landing Site Mosaic]],
+  ZIndex = 50,
   FilePath = asset.resource("Mars_Express_HRSC/Viking_1_Landing_Site_Mosaic.vrt"),
   Description = [[This layer is a greyscale mosaic assembled using data from the High Resolution Stereo Camera aboard the European Space Agency's Mars Express orbiter. HRSC is being used to obtain color and stereo images that will map 100% of Mars' surface at resolution better than 30 m/pixel, and 50% of the surface at better than 15 m/pixel. Each of the nine CCD lines of HRSC, a linescan imager (pushbroom camera), contains 5184 pixels. The channels consist of red, green, blue, near-infrared, three stereo channels (backward, nadir, and forward) and two photometric channels. The digital elevation model used for this layer is a combination of data derived from the HRSC and the Mars Orbiter Laser Altimeter.]]
 }
@@ -51,6 +57,7 @@ local treks_h2942_0000_nd3 = {
 local treks_h1394_0000_nd3 = {
   Identifier = "h1394_0000_nd3",
   Name = [[Mars Express HRSC, Viking 2 Landing Site Mosaic]],
+  ZIndex = 50,
   FilePath = asset.resource("Mars_Express_HRSC/Viking_2_Landing_Site_Mosaic.vrt"),
   Description = [[This layer is a greyscale mosaic assembled using data from the High Resolution Stereo Camera aboard the European Space Agency's Mars Express orbiter. HRSC is being used to obtain color and stereo images that will map 100% of Mars' surface at resolution better than 30 m/pixel, and 50% of the surface at better than 15 m/pixel. Each of the nine CCD lines of HRSC, a linescan imager (pushbroom camera), contains 5184 pixels. The channels consist of red, green, blue, near-infrared, three stereo channels (backward, nadir, and forward) and two photometric channels. The digital elevation model used for this layer is a combination of data derived from the HRSC and the Mars Orbiter Laser Altimeter.]]
 }
diff --git a/data/assets/scene/solarsystem/planets/mars/layers/nasa-treks/Mars_Reconnaissance_Orbiter_CTX.asset b/data/assets/scene/solarsystem/planets/mars/layers/nasa-treks/Mars_Reconnaissance_Orbiter_CTX.asset
index bcf434effe..a4dcfb900c 100644
--- a/data/assets/scene/solarsystem/planets/mars/layers/nasa-treks/Mars_Reconnaissance_Orbiter_CTX.asset
+++ b/data/assets/scene/solarsystem/planets/mars/layers/nasa-treks/Mars_Reconnaissance_Orbiter_CTX.asset
@@ -9,6 +9,7 @@ local globeIdentifier = asset.require("scene/solarsystem//planets/mars/mars").Ma
 local treks_CTX_ClrSlope_8bit_12S182E_24mp_P22_009609_1674_B02_010453_1675 = {
   Identifier = "CTX_ClrSlope_8bit_12S182E_24mp_P22_009609_1674_B02_010453_1675",
   Name = [[Mars Reconnaissance Orbiter CTX, Color Slope Apollinaris 12S182E]],
+  ZIndex = 50,
   FilePath = asset.resource("Mars_Reconnaissance_Orbiter_CTX/Color_Slope_Apollinaris_12S182E.vrt"),
   Description = [[This is a colorized version of the original 2x2 pixel slope in degrees (also called a 1 baseline slope). This was produced as part of an effort to characterize topography within candidate Human Exploration Zones for Mars. The DEM was constructed from a pair of CTX images using the stereo photogrammetry software AMES Stereo Pipeline (ASP). THe DEM has been tied to MOLA and can be considered resarch- and visualization-ready. Because it has not been manually edited using a full 3D editing environment, ASP DEMs cannot currently be considered true engineering-ready for performing landings.
 
@@ -23,6 +24,7 @@ Slopes were derived using the Python script called gdal_baseline_slope.py: https
 local treks_CTX_ClrSlope_8bit_13S182E_24mp_G15_024127_1673_G16_024483_1673 = {
   Identifier = "CTX_ClrSlope_8bit_13S182E_24mp_G15_024127_1673_G16_024483_1673",
   Name = [[Mars Reconnaissance Orbiter CTX, Color Slope Apollinaris 13S182E]],
+  ZIndex = 50,
   FilePath = asset.resource("Mars_Reconnaissance_Orbiter_CTX/Color_Slope_Apollinaris_13S182E.vrt"),
   Description = [[This is a colorized version of the original 2x2 pixel slope in degrees (also called a 1 baseline slope). This was produced as part of an effort to characterize topography within candidate Human Exploration Zones for Mars. The DEM was constructed from a pair of CTX images using the stereo photogrammetry software AMES Stereo Pipeline (ASP). THe DEM has been tied to MOLA and can be considered resarch- and visualization-ready. Because it has not been manually edited using a full 3D editing environment, ASP DEMs cannot currently be considered true engineering-ready for performing landings.
 
@@ -37,6 +39,7 @@ Slopes were derived using the Python script called gdal_baseline_slope.py: https
 local treks_CTX_ClrSlope_8bit_14S184E_24mp_B01_009886_1658_P21_009385_1658 = {
   Identifier = "CTX_ClrSlope_8bit_14S184E_24mp_B01_009886_1658_P21_009385_1658",
   Name = [[Mars Reconnaissance Orbiter CTX, Color Slope Apollinaris 14S184E]],
+  ZIndex = 50,
   FilePath = asset.resource("Mars_Reconnaissance_Orbiter_CTX/Color_Slope_Apollinaris_14S184E.vrt"),
   Description = [[This is a colorized version of the original 2x2 pixel slope in degrees (also called a 1 baseline slope). This was produced as part of an effort to characterize topography within candidate Human Exploration Zones for Mars. The DEM was constructed from a pair of CTX images using the stereo photogrammetry software AMES Stereo Pipeline (ASP). THe DEM has been tied to MOLA and can be considered resarch- and visualization-ready. Because it has not been manually edited using a full 3D editing environment, ASP DEMs cannot currently be considered true engineering-ready for performing landings.
 
@@ -51,6 +54,7 @@ Slopes were derived using the Python script called gdal_baseline_slope.py: https
 local treks_CTX_ClrSlope_8bit_10S291E_24mp_P22_009684_1699_B02_010396_1699 = {
   Identifier = "CTX_ClrSlope_8bit_10S291E_24mp_P22_009684_1699_B02_010396_1699",
   Name = [[Mars Reconnaissance Orbiter CTX, Color Slope Coprates 10S291E]],
+  ZIndex = 50,
   FilePath = asset.resource("Mars_Reconnaissance_Orbiter_CTX/Color_Slope_Coprates_10S291E.vrt"),
   Description = [[This is a colorized version of the original 2x2 pixel slope in degrees (also called a 1 baseline slope). This was produced as part of an effort to characterize topography within candidate Human Exploration Zones for Mars. The DEM was constructed from a pair of CTX images using the stereo photogrammetry software AMES Stereo Pipeline (ASP). THe DEM has been tied to MOLA and can be considered resarch- and visualization-ready. Because it has not been manually edited using a full 3D editing environment, ASP DEMs cannot currently be considered true engineering-ready for performing landings.
 
@@ -65,6 +69,7 @@ Slopes were derived using the Python script called gdal_baseline_slope.py: https
 local treks_CTX_ClrSlope_8bit_11S293E_24mp_B09_013231_1696_B11_013732_1690 = {
   Identifier = "CTX_ClrSlope_8bit_11S293E_24mp_B09_013231_1696_B11_013732_1690",
   Name = [[Mars Reconnaissance Orbiter CTX, Color Slope Coprates 11S293E]],
+  ZIndex = 50,
   FilePath = asset.resource("Mars_Reconnaissance_Orbiter_CTX/Color_Slope_Coprates_11S293E.vrt"),
   Description = [[This is a colorized version of the original 2x2 pixel slope in degrees (also called a 1 baseline slope). This was produced as part of an effort to characterize topography within candidate Human Exploration Zones for Mars. The DEM was constructed from a pair of CTX images using the stereo photogrammetry software AMES Stereo Pipeline (ASP). THe DEM has been tied to MOLA and can be considered resarch- and visualization-ready. Because it has not been manually edited using a full 3D editing environment, ASP DEMs cannot currently be considered true engineering-ready for performing landings.
 
@@ -79,6 +84,7 @@ Slopes were derived using the Python script called gdal_baseline_slope.py: https
 local treks_CTX_ClrSlope_8bit_13S293E_24mp_G07_020879_1669_G09_021657_1665 = {
   Identifier = "CTX_ClrSlope_8bit_13S293E_24mp_G07_020879_1669_G09_021657_1665",
   Name = [[Mars Reconnaissance Orbiter CTX, Color Slope Coprates 13S293E]],
+  ZIndex = 50,
   FilePath = asset.resource("Mars_Reconnaissance_Orbiter_CTX/Color_Slope_Coprates_13S293E.vrt"),
   Description = [[This is a colorized version of the original 2x2 pixel slope in degrees (also called a 1 baseline slope). This was produced as part of an effort to characterize topography within candidate Human Exploration Zones for Mars. The DEM was constructed from a pair of CTX images using the stereo photogrammetry software AMES Stereo Pipeline (ASP). THe DEM has been tied to MOLA and can be considered resarch- and visualization-ready. Because it has not been manually edited using a full 3D editing environment, ASP DEMs cannot currently be considered true engineering-ready for performing landings.
 
@@ -93,6 +99,7 @@ Slopes were derived using the Python script called gdal_baseline_slope.py: https
 local treks_CTX_ClrSlope_8bit_37N024E_24mp_G05_020203_2178_G22_026994_2170 = {
   Identifier = "CTX_ClrSlope_8bit_37N024E_24mp_G05_020203_2178_G22_026994_2170",
   Name = [[Mars Reconnaissance Orbiter CTX, Color Slope Deuteronius 37N024E]],
+  ZIndex = 50,
   FilePath = asset.resource("Mars_Reconnaissance_Orbiter_CTX/Color_Slope_Deuteronius_37N024E.vrt"),
   Description = [[This is a colorized version of the original 2x2 pixel slope in degrees (also called a 1 baseline slope). This was produced as part of an effort to characterize topography within candidate Human Exploration Zones for Mars. The DEM was constructed from a pair of CTX images using the stereo photogrammetry software AMES Stereo Pipeline (ASP). THe DEM has been tied to MOLA and can be considered resarch- and visualization-ready. Because it has not been manually edited using a full 3D editing environment, ASP DEMs cannot currently be considered true engineering-ready for performing landings.
 
@@ -107,6 +114,7 @@ Slopes were derived using the Python script called gdal_baseline_slope.py: https
 local treks_CTX_ClrSlope_8bit_38N024E_24mp_B17_016168_2181_G16_024594_2181 = {
   Identifier = "CTX_ClrSlope_8bit_38N024E_24mp_B17_016168_2181_G16_024594_2181",
   Name = [[Mars Reconnaissance Orbiter CTX, Color Slope Deuteronius 38N024E]],
+  ZIndex = 50,
   FilePath = asset.resource("Mars_Reconnaissance_Orbiter_CTX/Color_Slope_Deuteronius_38N024E.vrt"),
   Description = [[This is a colorized version of the original 2x2 pixel slope in degrees (also called a 1 baseline slope). This was produced as part of an effort to characterize topography within candidate Human Exploration Zones for Mars. The DEM was constructed from a pair of CTX images using the stereo photogrammetry software AMES Stereo Pipeline (ASP). THe DEM has been tied to MOLA and can be considered resarch- and visualization-ready. Because it has not been manually edited using a full 3D editing environment, ASP DEMs cannot currently be considered true engineering-ready for performing landings.
 
@@ -121,6 +129,7 @@ Slopes were derived using the Python script called gdal_baseline_slope.py: https
 local treks_CTX_ClrSlope_8bit_39N024E_24mp_D15_032875_2196_D15_033165_2196 = {
   Identifier = "CTX_ClrSlope_8bit_39N024E_24mp_D15_032875_2196_D15_033165_2196",
   Name = [[Mars Reconnaissance Orbiter CTX, Color Slope Deuteronius 39N024E]],
+  ZIndex = 50,
   FilePath = asset.resource("Mars_Reconnaissance_Orbiter_CTX/Color_Slope_Deuteronius_39N024E.vrt"),
   Description = [[This is a colorized version of the original 2x2 pixel slope in degrees (also called a 1 baseline slope). This was produced as part of an effort to characterize topography within candidate Human Exploration Zones for Mars. The DEM was constructed from a pair of CTX images using the stereo photogrammetry software AMES Stereo Pipeline (ASP). THe DEM has been tied to MOLA and can be considered resarch- and visualization-ready. Because it has not been manually edited using a full 3D editing environment, ASP DEMs cannot currently be considered true engineering-ready for performing landings.
 
@@ -135,6 +144,7 @@ Slopes were derived using the Python script called gdal_baseline_slope.py: https
 local treks_CTX_ClrSlope_8bit_40N022E_24mp_B18_016656_2206_B18_016801_2206 = {
   Identifier = "CTX_ClrSlope_8bit_40N022E_24mp_B18_016656_2206_B18_016801_2206",
   Name = [[Mars Reconnaissance Orbiter CTX, Color Slope Deuteronius 40N024E]],
+  ZIndex = 50,
   FilePath = asset.resource("Mars_Reconnaissance_Orbiter_CTX/Color_Slope_Deuteronius_40N024E.vrt"),
   Description = [[This is a colorized version of the original 2x2 pixel slope in degrees (also called a 1 baseline slope). This was produced as part of an effort to characterize topography within candidate Human Exploration Zones for Mars. The DEM was constructed from a pair of CTX images using the stereo photogrammetry software AMES Stereo Pipeline (ASP). THe DEM has been tied to MOLA and can be considered resarch- and visualization-ready. Because it has not been manually edited using a full 3D editing environment, ASP DEMs cannot currently be considered true engineering-ready for performing landings.
 
@@ -149,6 +159,7 @@ Slopes were derived using the Python script called gdal_baseline_slope.py: https
 local treks_CTX_ClrSlope_8bit_11S289E_24mp_F23_044971_1685_F21_043995_1685 = {
   Identifier = "CTX_ClrSlope_8bit_11S289E_24mp_F23_044971_1685_F21_043995_1685",
   Name = [[Mars Reconnaissance Orbiter CTX, Color Slope East Melas 11S289E]],
+  ZIndex = 50,
   FilePath = asset.resource("Mars_Reconnaissance_Orbiter_CTX/Color_Slope_East_Melas_11S289E.vrt"),
   Description = [[This is a colorized version of the original 2x2 pixel slope in degrees (also called a 1 baseline slope). This was produced as part of an effort to characterize topography within candidate Human Exploration Zones for Mars. The DEM was constructed from a pair of CTX images using the stereo photogrammetry software AMES Stereo Pipeline (ASP). THe DEM has been tied to MOLA and can be considered resarch- and visualization-ready. Because it has not been manually edited using a full 3D editing environment, ASP DEMs cannot currently be considered true engineering-ready for performing landings.
 
@@ -163,6 +174,7 @@ Slopes were derived using the Python script called gdal_baseline_slope.py: https
 local treks_CTX_ClrSlope_8bit_11S291E_24mp_B19_017187_1685_B19_016976_1685 = {
   Identifier = "CTX_ClrSlope_8bit_11S291E_24mp_B19_017187_1685_B19_016976_1685",
   Name = [[Mars Reconnaissance Orbiter CTX, Color Slope East Melas 11S291E]],
+  ZIndex = 50,
   FilePath = asset.resource("Mars_Reconnaissance_Orbiter_CTX/Color_Slope_East_Melas_11S291E.vrt"),
   Description = [[This is a colorized version of the original 2x2 pixel slope in degrees (also called a 1 baseline slope). This was produced as part of an effort to characterize topography within candidate Human Exploration Zones for Mars. The DEM was constructed from a pair of CTX images using the stereo photogrammetry software AMES Stereo Pipeline (ASP). THe DEM has been tied to MOLA and can be considered resarch- and visualization-ready. Because it has not been manually edited using a full 3D editing environment, ASP DEMs cannot currently be considered true engineering-ready for performing landings.
 
@@ -177,6 +189,7 @@ Slopes were derived using the Python script called gdal_baseline_slope.py: https
 local treks_CTX_ClrSlope_8bit_12S289E_24mp_D01_027446_1678_D01_027723_1677 = {
   Identifier = "CTX_ClrSlope_8bit_12S289E_24mp_D01_027446_1678_D01_027723_1677",
   Name = [[Mars Reconnaissance Orbiter CTX, Color Slope East Melas 12S289E_D01]],
+  ZIndex = 50,
   FilePath = asset.resource("Mars_Reconnaissance_Orbiter_CTX/Color_Slope_East_Melas_12S289E_D01.vrt"),
   Description = [[This is a colorized version of the original 2x2 pixel slope in degrees (also called a 1 baseline slope). This was produced as part of an effort to characterize topography within candidate Human Exploration Zones for Mars. The DEM was constructed from a pair of CTX images using the stereo photogrammetry software AMES Stereo Pipeline (ASP). THe DEM has been tied to MOLA and can be considered resarch- and visualization-ready. Because it has not been manually edited using a full 3D editing environment, ASP DEMs cannot currently be considered true engineering-ready for performing landings.
 
@@ -191,6 +204,7 @@ Slopes were derived using the Python script called gdal_baseline_slope.py: https
 local treks_CTX_ClrSlope_8bit_12S289E_24mp_F18_042927_1681_J02_045749_1694 = {
   Identifier = "CTX_ClrSlope_8bit_12S289E_24mp_F18_042927_1681_J02_045749_1694",
   Name = [[Mars Reconnaissance Orbiter CTX, Color Slope East Melas 12S289E_F18]],
+  ZIndex = 50,
   FilePath = asset.resource("Mars_Reconnaissance_Orbiter_CTX/Color_Slope_East_Melas_12S289E_F18.vrt"),
   Description = [[This is a colorized version of the original 2x2 pixel slope in degrees (also called a 1 baseline slope). This was produced as part of an effort to characterize topography within candidate Human Exploration Zones for Mars. The DEM was constructed from a pair of CTX images using the stereo photogrammetry software AMES Stereo Pipeline (ASP). THe DEM has been tied to MOLA and can be considered resarch- and visualization-ready. Because it has not been manually edited using a full 3D editing environment, ASP DEMs cannot currently be considered true engineering-ready for performing landings.
 
@@ -205,6 +219,7 @@ Slopes were derived using the Python script called gdal_baseline_slope.py: https
 local treks_CTX_ClrSlope_8bit_12S290E_24mp_D18_034250_1676_D21_035450_1674 = {
   Identifier = "CTX_ClrSlope_8bit_12S290E_24mp_D18_034250_1676_D21_035450_1674",
   Name = [[Mars Reconnaissance Orbiter CTX, Color Slope East Melas 12S290E]],
+  ZIndex = 50,
   FilePath = asset.resource("Mars_Reconnaissance_Orbiter_CTX/Color_Slope_East_Melas_12S290E.vrt"),
   Description = [[This is a colorized version of the original 2x2 pixel slope in degrees (also called a 1 baseline slope). This was produced as part of an effort to characterize topography within candidate Human Exploration Zones for Mars. The DEM was constructed from a pair of CTX images using the stereo photogrammetry software AMES Stereo Pipeline (ASP). THe DEM has been tied to MOLA and can be considered resarch- and visualization-ready. Because it has not been manually edited using a full 3D editing environment, ASP DEMs cannot currently be considered true engineering-ready for performing landings.
 
@@ -219,6 +234,7 @@ Slopes were derived using the Python script called gdal_baseline_slope.py: https
 local treks_CTX_ClrSlope_8bit_12S291E_24mp_F14_041292_1682_F16_041938_1682 = {
   Identifier = "CTX_ClrSlope_8bit_12S291E_24mp_F14_041292_1682_F16_041938_1682",
   Name = [[Mars Reconnaissance Orbiter CTX, Color Slope East Melas 12S291E_F14]],
+  ZIndex = 50,
   FilePath = asset.resource("Mars_Reconnaissance_Orbiter_CTX/Color_Slope_East_Melas_12S291E_F14.vrt"),
   Description = [[This is a colorized version of the original 2x2 pixel slope in degrees (also called a 1 baseline slope). This was produced as part of an effort to characterize topography within candidate Human Exploration Zones for Mars. The DEM was constructed from a pair of CTX images using the stereo photogrammetry software AMES Stereo Pipeline (ASP). THe DEM has been tied to MOLA and can be considered resarch- and visualization-ready. Because it has not been manually edited using a full 3D editing environment, ASP DEMs cannot currently be considered true engineering-ready for performing landings.
 
@@ -233,6 +249,7 @@ Slopes were derived using the Python script called gdal_baseline_slope.py: https
 local treks_CTX_ClrSlope_8bit_12S291E_24mp_F21_043850_1684_F21_043916_1685 = {
   Identifier = "CTX_ClrSlope_8bit_12S291E_24mp_F21_043850_1684_F21_043916_1685",
   Name = [[Mars Reconnaissance Orbiter CTX, Color Slope East Melas 12S291E_F21]],
+  ZIndex = 50,
   FilePath = asset.resource("Mars_Reconnaissance_Orbiter_CTX/Color_Slope_East_Melas_12S291E_F21.vrt"),
   Description = [[This is a colorized version of the original 2x2 pixel slope in degrees (also called a 1 baseline slope). This was produced as part of an effort to characterize topography within candidate Human Exploration Zones for Mars. The DEM was constructed from a pair of CTX images using the stereo photogrammetry software AMES Stereo Pipeline (ASP). THe DEM has been tied to MOLA and can be considered resarch- and visualization-ready. Because it has not been manually edited using a full 3D editing environment, ASP DEMs cannot currently be considered true engineering-ready for performing landings.
 
@@ -247,6 +264,7 @@ Slopes were derived using the Python script called gdal_baseline_slope.py: https
 local treks_CTX_ClrSlope_8bit_12S291E_24mp_J01_045116_1677_J03_046039_1676 = {
   Identifier = "CTX_ClrSlope_8bit_12S291E_24mp_J01_045116_1677_J03_046039_1676",
   Name = [[Mars Reconnaissance Orbiter CTX, Color Slope East Melas 12S291E_J01]],
+  ZIndex = 50,
   FilePath = asset.resource("Mars_Reconnaissance_Orbiter_CTX/Color_Slope_East_Melas_12S291E_J01.vrt"),
   Description = [[This is a colorized version of the original 2x2 pixel slope in degrees (also called a 1 baseline slope). This was produced as part of an effort to characterize topography within candidate Human Exploration Zones for Mars. The DEM was constructed from a pair of CTX images using the stereo photogrammetry software AMES Stereo Pipeline (ASP). THe DEM has been tied to MOLA and can be considered resarch- and visualization-ready. Because it has not been manually edited using a full 3D editing environment, ASP DEMs cannot currently be considered true engineering-ready for performing landings.
 
@@ -261,6 +279,7 @@ Slopes were derived using the Python script called gdal_baseline_slope.py: https
 local treks_CTX_ClrSlope_8bit_13S289E_24mp_D10_031125_1673_D12_031903_1669 = {
   Identifier = "CTX_ClrSlope_8bit_13S289E_24mp_D10_031125_1673_D12_031903_1669",
   Name = [[Mars Reconnaissance Orbiter CTX, Color Slope East Melas 13S289E]],
+  ZIndex = 50,
   FilePath = asset.resource("Mars_Reconnaissance_Orbiter_CTX/Color_Slope_East_Melas_13S289E.vrt"),
   Description = [[This is a colorized version of the original 2x2 pixel slope in degrees (also called a 1 baseline slope). This was produced as part of an effort to characterize topography within candidate Human Exploration Zones for Mars. The DEM was constructed from a pair of CTX images using the stereo photogrammetry software AMES Stereo Pipeline (ASP). THe DEM has been tied to MOLA and can be considered resarch- and visualization-ready. Because it has not been manually edited using a full 3D editing environment, ASP DEMs cannot currently be considered true engineering-ready for performing landings.
 
@@ -275,6 +294,7 @@ Slopes were derived using the Python script called gdal_baseline_slope.py: https
 local treks_CTX_ClrSlope_8bit_16S291E_24mp_D22_035951_1644_F01_036307_1644 = {
   Identifier = "CTX_ClrSlope_8bit_16S291E_24mp_D22_035951_1644_F01_036307_1644",
   Name = [[Mars Reconnaissance Orbiter CTX, Color Slope East Melas 16S291E_D22]],
+  ZIndex = 50,
   FilePath = asset.resource("Mars_Reconnaissance_Orbiter_CTX/Color_Slope_East_Melas_16S291E_D22.vrt"),
   Description = [[This is a colorized version of the original 2x2 pixel slope in degrees (also called a 1 baseline slope). This was produced as part of an effort to characterize topography within candidate Human Exploration Zones for Mars. The DEM was constructed from a pair of CTX images using the stereo photogrammetry software AMES Stereo Pipeline (ASP). THe DEM has been tied to MOLA and can be considered resarch- and visualization-ready. Because it has not been manually edited using a full 3D editing environment, ASP DEMs cannot currently be considered true engineering-ready for performing landings.
 
@@ -289,6 +309,7 @@ Slopes were derived using the Python script called gdal_baseline_slope.py: https
 local treks_CTX_Shade_12S182E_24mp_P22_009609_1674_B02_010453_1675 = {
   Identifier = "CTX_Shade_12S182E_24mp_P22_009609_1674_B02_010453_1675",
   Name = [[Mars Reconnaissance Orbiter CTX, HillShade Apollinaris 12S182E]],
+  ZIndex = 50,
   FilePath = asset.resource("Mars_Reconnaissance_Orbiter_CTX/HillShade_Apollinaris_12S182E.vrt"),
   Description = [[This is a grayscale shaded relief (hillshade) for the original digital elevation model (DEM/DTM) as produced as part of an effort to characterize topography within candidate Human Exploration Zones for Mars. The DEM was constructed from a pair of CTX images using the stereo photogrammetry software AMES Stereo Pipeline (ASP). THe DEM has been tied to MOLA and can be considered resarch- and visualization-ready. Because it has not been manually edited using a full 3D editing environment, ASP DEMs cannot currently be considered true engineering-ready for performing landings.
 
@@ -301,6 +322,7 @@ Mayer, D. P., E. S. Kite, 2016, An Integrated Workflow for Producing Digital Ter
 local treks_CTX_Shade_13S182E_24mp_G15_024127_1673_G16_024483_1673 = {
   Identifier = "CTX_Shade_13S182E_24mp_G15_024127_1673_G16_024483_1673",
   Name = [[Mars Reconnaissance Orbiter CTX, HillShade Apollinaris 13S182E]],
+  ZIndex = 50,
   FilePath = asset.resource("Mars_Reconnaissance_Orbiter_CTX/HillShade_Apollinaris_13S182E.vrt"),
   Description = [[This is a grayscale shaded relief (hillshade) for the original digital elevation model (DEM/DTM) as produced as part of an effort to characterize topography within candidate Human Exploration Zones for Mars. The DEM was constructed from a pair of CTX images using the stereo photogrammetry software AMES Stereo Pipeline (ASP). THe DEM has been tied to MOLA and can be considered resarch- and visualization-ready. Because it has not been manually edited using a full 3D editing environment, ASP DEMs cannot currently be considered true engineering-ready for performing landings.
 
@@ -313,6 +335,7 @@ Mayer, D. P., E. S. Kite, 2016, An Integrated Workflow for Producing Digital Ter
 local treks_CTX_Shade_14S184E_24mp_B01_009886_1658_P21_009385_1658 = {
   Identifier = "CTX_Shade_14S184E_24mp_B01_009886_1658_P21_009385_1658",
   Name = [[Mars Reconnaissance Orbiter CTX, HillShade Apollinaris 14S184E]],
+  ZIndex = 50,
   FilePath = asset.resource("Mars_Reconnaissance_Orbiter_CTX/HillShade_Apollinaris_14S184E.vrt"),
   Description = [[This is a grayscale shaded relief (hillshade) for the original digital elevation model (DEM/DTM) as produced as part of an effort to characterize topography within candidate Human Exploration Zones for Mars. The DEM was constructed from a pair of CTX images using the stereo photogrammetry software AMES Stereo Pipeline (ASP). THe DEM has been tied to MOLA and can be considered resarch- and visualization-ready. Because it has not been manually edited using a full 3D editing environment, ASP DEMs cannot currently be considered true engineering-ready for performing landings.
 
@@ -325,6 +348,7 @@ Mayer, D. P., E. S. Kite, 2016, An Integrated Workflow for Producing Digital Ter
 local treks_CTX_Shade_10S291E_24mp_P22_009684_1699_B02_010396_1699 = {
   Identifier = "CTX_Shade_10S291E_24mp_P22_009684_1699_B02_010396_1699",
   Name = [[Mars Reconnaissance Orbiter CTX, HillShade Coprates 10S291E]],
+  ZIndex = 50,
   FilePath = asset.resource("Mars_Reconnaissance_Orbiter_CTX/HillShade_Coprates_10S291E.vrt"),
   Description = [[This is a grayscale shaded relief (hillshade) for the original digital elevation model (DEM/DTM) as produced as part of an effort to characterize topography within candidate Human Exploration Zones for Mars. The DEM was constructed from a pair of CTX images using the stereo photogrammetry software AMES Stereo Pipeline (ASP). THe DEM has been tied to MOLA and can be considered resarch- and visualization-ready. Because it has not been manually edited using a full 3D editing environment, ASP DEMs cannot currently be considered true engineering-ready for performing landings.
 
@@ -337,6 +361,7 @@ Mayer, D. P., E. S. Kite, 2016, An Integrated Workflow for Producing Digital Ter
 local treks_CTX_Shade_11S293E_24mp_B09_013231_1696_B11_013732_1690 = {
   Identifier = "CTX_Shade_11S293E_24mp_B09_013231_1696_B11_013732_1690",
   Name = [[Mars Reconnaissance Orbiter CTX, HillShade Coprates 11S293E]],
+  ZIndex = 50,
   FilePath = asset.resource("Mars_Reconnaissance_Orbiter_CTX/HillShade_Coprates_11S293E.vrt"),
   Description = [[This is a grayscale shaded relief (hillshade) for the original digital elevation model (DEM/DTM) as produced as part of an effort to characterize topography within candidate Human Exploration Zones for Mars. The DEM was constructed from a pair of CTX images using the stereo photogrammetry software AMES Stereo Pipeline (ASP). THe DEM has been tied to MOLA and can be considered resarch- and visualization-ready. Because it has not been manually edited using a full 3D editing environment, ASP DEMs cannot currently be considered true engineering-ready for performing landings.
 
@@ -349,6 +374,7 @@ Mayer, D. P., E. S. Kite, 2016, An Integrated Workflow for Producing Digital Ter
 local treks_CTX_Shade_13S293E_24mp_G07_020879_1669_G09_021657_1665 = {
   Identifier = "CTX_Shade_13S293E_24mp_G07_020879_1669_G09_021657_1665",
   Name = [[Mars Reconnaissance Orbiter CTX, HillShade Coprates 13S293E]],
+  ZIndex = 50,
   FilePath = asset.resource("Mars_Reconnaissance_Orbiter_CTX/HillShade_Coprates_13S293E.vrt"),
   Description = [[This is a grayscale shaded relief (hillshade) for the original digital elevation model (DEM/DTM) as produced as part of an effort to characterize topography within candidate Human Exploration Zones for Mars. The DEM was constructed from a pair of CTX images using the stereo photogrammetry software AMES Stereo Pipeline (ASP). THe DEM has been tied to MOLA and can be considered resarch- and visualization-ready. Because it has not been manually edited using a full 3D editing environment, ASP DEMs cannot currently be considered true engineering-ready for performing landings.
 
@@ -361,6 +387,7 @@ Mayer, D. P., E. S. Kite, 2016, An Integrated Workflow for Producing Digital Ter
 local treks_CTX_Shade_37N024E_24mp_G05_020203_2178_G22_026994_2170 = {
   Identifier = "CTX_Shade_37N024E_24mp_G05_020203_2178_G22_026994_2170",
   Name = [[Mars Reconnaissance Orbiter CTX, HillShade Deuteronius 37N024E]],
+  ZIndex = 50,
   FilePath = asset.resource("Mars_Reconnaissance_Orbiter_CTX/HillShade_Deuteronius_37N024E.vrt"),
   Description = [[This is a grayscale shaded relief (hillshade) for the original digital elevation model (DEM/DTM) as produced as part of an effort to characterize topography within candidate Human Exploration Zones for Mars. The DEM was constructed from a pair of CTX images using the stereo photogrammetry software AMES Stereo Pipeline (ASP). THe DEM has been tied to MOLA and can be considered resarch- and visualization-ready. Because it has not been manually edited using a full 3D editing environment, ASP DEMs cannot currently be considered true engineering-ready for performing landings.
 
@@ -373,6 +400,7 @@ Mayer, D. P., E. S. Kite, 2016, An Integrated Workflow for Producing Digital Ter
 local treks_CTX_Shade_38N024E_24mp_B17_016168_2181_G16_024594_2181 = {
   Identifier = "CTX_Shade_38N024E_24mp_B17_016168_2181_G16_024594_2181",
   Name = [[Mars Reconnaissance Orbiter CTX, HillShade Deuteronius 38N024E]],
+  ZIndex = 50,
   FilePath = asset.resource("Mars_Reconnaissance_Orbiter_CTX/HillShade_Deuteronius_38N024E.vrt"),
   Description = [[This is a grayscale shaded relief (hillshade) for the original digital elevation model (DEM/DTM) as produced as part of an effort to characterize topography within candidate Human Exploration Zones for Mars. The DEM was constructed from a pair of CTX images using the stereo photogrammetry software AMES Stereo Pipeline (ASP). THe DEM has been tied to MOLA and can be considered resarch- and visualization-ready. Because it has not been manually edited using a full 3D editing environment, ASP DEMs cannot currently be considered true engineering-ready for performing landings.
 
@@ -385,6 +413,7 @@ Mayer, D. P., E. S. Kite, 2016, An Integrated Workflow for Producing Digital Ter
 local treks_CTX_Shade_39N024E_24mp_D15_032875_2196_D15_033165_2196 = {
   Identifier = "CTX_Shade_39N024E_24mp_D15_032875_2196_D15_033165_2196",
   Name = [[Mars Reconnaissance Orbiter CTX, HillShade Deuteronius 39N024E]],
+  ZIndex = 50,
   FilePath = asset.resource("Mars_Reconnaissance_Orbiter_CTX/HillShade_Deuteronius_39N024E.vrt"),
   Description = [[This is a grayscale shaded relief (hillshade) for the original digital elevation model (DEM/DTM) as produced as part of an effort to characterize topography within candidate Human Exploration Zones for Mars. The DEM was constructed from a pair of CTX images using the stereo photogrammetry software AMES Stereo Pipeline (ASP). THe DEM has been tied to MOLA and can be considered resarch- and visualization-ready. Because it has not been manually edited using a full 3D editing environment, ASP DEMs cannot currently be considered true engineering-ready for performing landings.
 
@@ -397,6 +426,7 @@ Mayer, D. P., E. S. Kite, 2016, An Integrated Workflow for Producing Digital Ter
 local treks_CTX_Shade_40N022E_24mp_B18_016656_2206_B18_016801_2206 = {
   Identifier = "CTX_Shade_40N022E_24mp_B18_016656_2206_B18_016801_2206",
   Name = [[Mars Reconnaissance Orbiter CTX, HillShade Deuteronius 40N024E]],
+  ZIndex = 50,
   FilePath = asset.resource("Mars_Reconnaissance_Orbiter_CTX/HillShade_Deuteronius_40N024E.vrt"),
   Description = [[This is a grayscale shaded relief (hillshade) for the original digital elevation model (DEM/DTM) as produced as part of an effort to characterize topography within candidate Human Exploration Zones for Mars. The DEM was constructed from a pair of CTX images using the stereo photogrammetry software AMES Stereo Pipeline (ASP). THe DEM has been tied to MOLA and can be considered resarch- and visualization-ready. Because it has not been manually edited using a full 3D editing environment, ASP DEMs cannot currently be considered true engineering-ready for performing landings.
 
@@ -409,6 +439,7 @@ Mayer, D. P., E. S. Kite, 2016, An Integrated Workflow for Producing Digital Ter
 local treks_CTX_Shade_11S289E_24mp_F23_044971_1685_F21_043995_1685 = {
   Identifier = "CTX_Shade_11S289E_24mp_F23_044971_1685_F21_043995_1685",
   Name = [[Mars Reconnaissance Orbiter CTX, HillShade East Melas 11S289E]],
+  ZIndex = 50,
   FilePath = asset.resource("Mars_Reconnaissance_Orbiter_CTX/HillShade_East_Melas_11S289E.vrt"),
   Description = [[This is a grayscale shaded relief (hillshade) for the original digital elevation model (DEM/DTM) as produced as part of an effort to characterize topography within candidate Human Exploration Zones for Mars. The DEM was constructed from a pair of CTX images using the stereo photogrammetry software AMES Stereo Pipeline (ASP). THe DEM has been tied to MOLA and can be considered resarch- and visualization-ready. Because it has not been manually edited using a full 3D editing environment, ASP DEMs cannot currently be considered true engineering-ready for performing landings.
 
@@ -421,6 +452,7 @@ Mayer, D. P., E. S. Kite, 2016, An Integrated Workflow for Producing Digital Ter
 local treks_CTX_Shade_11S291E_24mp_B19_017187_1685_B19_016976_1685 = {
   Identifier = "CTX_Shade_11S291E_24mp_B19_017187_1685_B19_016976_1685",
   Name = [[Mars Reconnaissance Orbiter CTX, HillShade East Melas 11S291E]],
+  ZIndex = 50,
   FilePath = asset.resource("Mars_Reconnaissance_Orbiter_CTX/HillShade_East_Melas_11S291E.vrt"),
   Description = [[This is a grayscale shaded relief (hillshade) for the original digital elevation model (DEM/DTM) as produced as part of an effort to characterize topography within candidate Human Exploration Zones for Mars. The DEM was constructed from a pair of CTX images using the stereo photogrammetry software AMES Stereo Pipeline (ASP). THe DEM has been tied to MOLA and can be considered resarch- and visualization-ready. Because it has not been manually edited using a full 3D editing environment, ASP DEMs cannot currently be considered true engineering-ready for performing landings.
 
@@ -433,6 +465,7 @@ Mayer, D. P., E. S. Kite, 2016, An Integrated Workflow for Producing Digital Ter
 local treks_CTX_Shade_12S289E_24mp_D01_027446_1678_D01_027723_1677 = {
   Identifier = "CTX_Shade_12S289E_24mp_D01_027446_1678_D01_027723_1677",
   Name = [[Mars Reconnaissance Orbiter CTX, HillShade East Melas 12S289E_D01]],
+  ZIndex = 50,
   FilePath = asset.resource("Mars_Reconnaissance_Orbiter_CTX/HillShade_East_Melas_12S289E_D01.vrt"),
   Description = [[This is a grayscale shaded relief (hillshade) for the original digital elevation model (DEM/DTM) as produced as part of an effort to characterize topography within candidate Human Exploration Zones for Mars. The DEM was constructed from a pair of CTX images using the stereo photogrammetry software AMES Stereo Pipeline (ASP). THe DEM has been tied to MOLA and can be considered resarch- and visualization-ready. Because it has not been manually edited using a full 3D editing environment, ASP DEMs cannot currently be considered true engineering-ready for performing landings.
 
@@ -445,6 +478,7 @@ Mayer, D. P., E. S. Kite, 2016, An Integrated Workflow for Producing Digital Ter
 local treks_CTX_Shade_12S289E_24mp_F18_042927_1681_J02_045749_1694 = {
   Identifier = "CTX_Shade_12S289E_24mp_F18_042927_1681_J02_045749_1694",
   Name = [[Mars Reconnaissance Orbiter CTX, HillShade East Melas 12S289E_F18]],
+  ZIndex = 50,
   FilePath = asset.resource("Mars_Reconnaissance_Orbiter_CTX/HillShade_East_Melas_12S289E_F18.vrt"),
   Description = [[This is a grayscale shaded relief (hillshade) for the original digital elevation model (DEM/DTM) as produced as part of an effort to characterize topography within candidate Human Exploration Zones for Mars. The DEM was constructed from a pair of CTX images using the stereo photogrammetry software AMES Stereo Pipeline (ASP). THe DEM has been tied to MOLA and can be considered resarch- and visualization-ready. Because it has not been manually edited using a full 3D editing environment, ASP DEMs cannot currently be considered true engineering-ready for performing landings.
 
@@ -457,6 +491,7 @@ Mayer, D. P., E. S. Kite, 2016, An Integrated Workflow for Producing Digital Ter
 local treks_CTX_Shade_12S290E_24mp_D18_034250_1676_D21_035450_1674 = {
   Identifier = "CTX_Shade_12S290E_24mp_D18_034250_1676_D21_035450_1674",
   Name = [[Mars Reconnaissance Orbiter CTX, HillShade East Melas 12S290E]],
+  ZIndex = 50,
   FilePath = asset.resource("Mars_Reconnaissance_Orbiter_CTX/HillShade_East_Melas_12S290E.vrt"),
   Description = [[This is a grayscale shaded relief (hillshade) for the original digital elevation model (DEM/DTM) as produced as part of an effort to characterize topography within candidate Human Exploration Zones for Mars. The DEM was constructed from a pair of CTX images using the stereo photogrammetry software AMES Stereo Pipeline (ASP). THe DEM has been tied to MOLA and can be considered resarch- and visualization-ready. Because it has not been manually edited using a full 3D editing environment, ASP DEMs cannot currently be considered true engineering-ready for performing landings.
 
@@ -469,6 +504,7 @@ Mayer, D. P., E. S. Kite, 2016, An Integrated Workflow for Producing Digital Ter
 local treks_CTX_Shade_12S291E_24mp_F14_041292_1682_F16_041938_1682 = {
   Identifier = "CTX_Shade_12S291E_24mp_F14_041292_1682_F16_041938_1682",
   Name = [[Mars Reconnaissance Orbiter CTX, HillShade East Melas 12S291E_F14]],
+  ZIndex = 50,
   FilePath = asset.resource("Mars_Reconnaissance_Orbiter_CTX/HillShade_East_Melas_12S291E_F14.vrt"),
   Description = [[This is a grayscale shaded relief (hillshade) for the original digital elevation model (DEM/DTM) as produced as part of an effort to characterize topography within candidate Human Exploration Zones for Mars. The DEM was constructed from a pair of CTX images using the stereo photogrammetry software AMES Stereo Pipeline (ASP). THe DEM has been tied to MOLA and can be considered resarch- and visualization-ready. Because it has not been manually edited using a full 3D editing environment, ASP DEMs cannot currently be considered true engineering-ready for performing landings.
 
@@ -481,6 +517,7 @@ Mayer, D. P., E. S. Kite, 2016, An Integrated Workflow for Producing Digital Ter
 local treks_CTX_Shade_12S291E_24mp_F21_043850_1684_F21_043916_1685 = {
   Identifier = "CTX_Shade_12S291E_24mp_F21_043850_1684_F21_043916_1685",
   Name = [[Mars Reconnaissance Orbiter CTX, HillShade East Melas 12S291E_F21]],
+  ZIndex = 50,
   FilePath = asset.resource("Mars_Reconnaissance_Orbiter_CTX/HillShade_East_Melas_12S291E_F21.vrt"),
   Description = [[This is a grayscale shaded relief (hillshade) for the original digital elevation model (DEM/DTM) as produced as part of an effort to characterize topography within candidate Human Exploration Zones for Mars. The DEM was constructed from a pair of CTX images using the stereo photogrammetry software AMES Stereo Pipeline (ASP). THe DEM has been tied to MOLA and can be considered resarch- and visualization-ready. Because it has not been manually edited using a full 3D editing environment, ASP DEMs cannot currently be considered true engineering-ready for performing landings.
 
@@ -493,6 +530,7 @@ Mayer, D. P., E. S. Kite, 2016, An Integrated Workflow for Producing Digital Ter
 local treks_CTX_Shade_12S291E_24mp_J01_045116_1677_J03_046039_1676 = {
   Identifier = "CTX_Shade_12S291E_24mp_J01_045116_1677_J03_046039_1676",
   Name = [[Mars Reconnaissance Orbiter CTX, HillShade East Melas 12S291E_J01]],
+  ZIndex = 50,
   FilePath = asset.resource("Mars_Reconnaissance_Orbiter_CTX/HillShade_East_Melas_12S291E_J01.vrt"),
   Description = [[This is a grayscale shaded relief (hillshade) for the original digital elevation model (DEM/DTM) as produced as part of an effort to characterize topography within candidate Human Exploration Zones for Mars. The DEM was constructed from a pair of CTX images using the stereo photogrammetry software AMES Stereo Pipeline (ASP). THe DEM has been tied to MOLA and can be considered resarch- and visualization-ready. Because it has not been manually edited using a full 3D editing environment, ASP DEMs cannot currently be considered true engineering-ready for performing landings.
 
@@ -505,6 +543,7 @@ Mayer, D. P., E. S. Kite, 2016, An Integrated Workflow for Producing Digital Ter
 local treks_CTX_Shade_13S289E_24mp_D10_031125_1673_D12_031903_1669 = {
   Identifier = "CTX_Shade_13S289E_24mp_D10_031125_1673_D12_031903_1669",
   Name = [[Mars Reconnaissance Orbiter CTX, HillShade East Melas 13S289E_D10]],
+  ZIndex = 50,
   FilePath = asset.resource("Mars_Reconnaissance_Orbiter_CTX/HillShade_East_Melas_13S289E_D10.vrt"),
   Description = [[This is a grayscale shaded relief (hillshade) for the original digital elevation model (DEM/DTM) as produced as part of an effort to characterize topography within candidate Human Exploration Zones for Mars. The DEM was constructed from a pair of CTX images using the stereo photogrammetry software AMES Stereo Pipeline (ASP). THe DEM has been tied to MOLA and can be considered resarch- and visualization-ready. Because it has not been manually edited using a full 3D editing environment, ASP DEMs cannot currently be considered true engineering-ready for performing landings.
 
@@ -517,6 +556,7 @@ Mayer, D. P., E. S. Kite, 2016, An Integrated Workflow for Producing Digital Ter
 local treks_CTX_Shade_16S291E_24mp_D22_035951_1644_F01_036307_1644 = {
   Identifier = "CTX_Shade_16S291E_24mp_D22_035951_1644_F01_036307_1644",
   Name = [[Mars Reconnaissance Orbiter CTX, HillShade East Melas 16S291E_D22]],
+  ZIndex = 50,
   FilePath = asset.resource("Mars_Reconnaissance_Orbiter_CTX/HillShade_East_Melas_16S291E_D22.vrt"),
   Description = [[This is a grayscale shaded relief (hillshade) for the original digital elevation model (DEM/DTM) as produced as part of an effort to characterize topography within candidate Human Exploration Zones for Mars. The DEM was constructed from a pair of CTX images using the stereo photogrammetry software AMES Stereo Pipeline (ASP). THe DEM has been tied to MOLA and can be considered resarch- and visualization-ready. Because it has not been manually edited using a full 3D editing environment, ASP DEMs cannot currently be considered true engineering-ready for performing landings.
 
@@ -529,6 +569,7 @@ Mayer, D. P., E. S. Kite, 2016, An Integrated Workflow for Producing Digital Ter
 local treks_Deuteronilus_CTX_Shade_v0_20171112 = {
   Identifier = "Deuteronilus_CTX_Shade_v0_20171112",
   Name = [[Mars Reconnaissance Orbiter CTX, Hilllshade Deuteronilus]],
+  ZIndex = 50,
   FilePath = asset.resource("Mars_Reconnaissance_Orbiter_CTX/Hilllshade_Deuteronilus.vrt"),
   Description = [[This is a grayscale shaded relief (hillshade) for the original digital elevation model (DEM/DTM) as produced as part of an effort to characterize topography within candidate Human Exploration Zones for Mars. The DEM was constructed from a pair of CTX images using the stereo photogrammetry software AMES Stereo Pipeline (ASP). THe DEM has been tied to MOLA and can be considered resarch- and visualization-ready. Because it has not been manually edited using a full 3D editing environment, ASP DEMs cannot currently be considered true engineering-ready for performing landings.
 
@@ -541,6 +582,7 @@ Mayer, D. P., E. S. Kite, 2016, An Integrated Workflow for Producing Digital Ter
 local treks_CTX_Ortho_12S182E_24mp_P22_009609_1674 = {
   Identifier = "CTX_Ortho_12S182E_24mp_P22_009609_1674",
   Name = [[Mars Reconnaissance Orbiter CTX, Mosaic Apollinaris 12S182E]],
+  ZIndex = 50,
   FilePath = asset.resource("Mars_Reconnaissance_Orbiter_CTX/Mosaic_Apollinaris_12S182E.vrt"),
   Description = [[This is a CTX orthorectified image, geometrically corrected using its own source digital elevation model (DEM/DTM), as produced as part of an effort to characterize candidate Human Exploration Zones for Mars. The original DEM was constructed from a pair of CTX images using the stereo photogrammetry software AMES Stereo Pipeline (ASP). The DEM, and thus orthoimage, has been tied to MOLA and can be considered resarch- and visualization-ready. Because it has not been manually edited using a full 3D editing environment, ASP DEMs cannot currently be considered true engineering-ready for performing landings.
 
@@ -553,6 +595,7 @@ Mayer, D. P., E. S. Kite, 2016, An Integrated Workflow for Producing Digital Ter
 local treks_CTX_Ortho_13S182E_24mp_G15_024127_1673 = {
   Identifier = "CTX_Ortho_13S182E_24mp_G15_024127_1673",
   Name = [[Mars Reconnaissance Orbiter CTX, Mosaic Apollinaris 13S182E]],
+  ZIndex = 50,
   FilePath = asset.resource("Mars_Reconnaissance_Orbiter_CTX/Mosaic_Apollinaris_13S182E.vrt"),
   Description = [[This is a CTX orthorectified image, geometrically corrected using its own source digital elevation model (DEM/DTM), as produced as part of an effort to characterize candidate Human Exploration Zones for Mars. The original DEM was constructed from a pair of CTX images using the stereo photogrammetry software AMES Stereo Pipeline (ASP). The DEM, and thus orthoimage, has been tied to MOLA and can be considered resarch- and visualization-ready. Because it has not been manually edited using a full 3D editing environment, ASP DEMs cannot currently be considered true engineering-ready for performing landings.
 
@@ -565,6 +608,7 @@ Mayer, D. P., E. S. Kite, 2016, An Integrated Workflow for Producing Digital Ter
 local treks_CTX_Ortho_14S184E_24mp_B01_009886_1658 = {
   Identifier = "CTX_Ortho_14S184E_24mp_B01_009886_1658",
   Name = [[Mars Reconnaissance Orbiter CTX, Mosaic Apollinaris 14S184E]],
+  ZIndex = 50,
   FilePath = asset.resource("Mars_Reconnaissance_Orbiter_CTX/Mosaic_Apollinaris_14S184E.vrt"),
   Description = [[This is a CTX orthorectified image, geometrically corrected using its own source digital elevation model (DEM/DTM), as produced as part of an effort to characterize candidate Human Exploration Zones for Mars. The original DEM was constructed from a pair of CTX images using the stereo photogrammetry software AMES Stereo Pipeline (ASP). The DEM, and thus orthoimage, has been tied to MOLA and can be considered resarch- and visualization-ready. Because it has not been manually edited using a full 3D editing environment, ASP DEMs cannot currently be considered true engineering-ready for performing landings.
 
@@ -577,6 +621,7 @@ Mayer, D. P., E. S. Kite, 2016, An Integrated Workflow for Producing Digital Ter
 local treks_CTX_Ortho_10S291E_24mp_P22_009684_1699 = {
   Identifier = "CTX_Ortho_10S291E_24mp_P22_009684_1699",
   Name = [[Mars Reconnaissance Orbiter CTX, Mosaic Coprates 10S291E]],
+  ZIndex = 50,
   FilePath = asset.resource("Mars_Reconnaissance_Orbiter_CTX/Mosaic_Coprates_10S291E.vrt"),
   Description = [[This is a CTX orthorectified image, geometrically corrected using its own source digital elevation model (DEM/DTM), as produced as part of an effort to characterize candidate Human Exploration Zones for Mars. The original DEM was constructed from a pair of CTX images using the stereo photogrammetry software AMES Stereo Pipeline (ASP). The DEM, and thus orthoimage, has been tied to MOLA and can be considered resarch- and visualization-ready. Because it has not been manually edited using a full 3D editing environment, ASP DEMs cannot currently be considered true engineering-ready for performing landings.
 
@@ -589,6 +634,7 @@ Mayer, D. P., E. S. Kite, 2016, An Integrated Workflow for Producing Digital Ter
 local treks_CTX_Ortho_11S293E_24mp_B09_013231_1696 = {
   Identifier = "CTX_Ortho_11S293E_24mp_B09_013231_1696",
   Name = [[Mars Reconnaissance Orbiter CTX, Mosaic Coprates 11S293E]],
+  ZIndex = 50,
   FilePath = asset.resource("Mars_Reconnaissance_Orbiter_CTX/Mosaic_Coprates_11S293E.vrt"),
   Description = [[This is a CTX orthorectified image, geometrically corrected using its own source digital elevation model (DEM/DTM), as produced as part of an effort to characterize candidate Human Exploration Zones for Mars. The original DEM was constructed from a pair of CTX images using the stereo photogrammetry software AMES Stereo Pipeline (ASP). The DEM, and thus orthoimage, has been tied to MOLA and can be considered resarch- and visualization-ready. Because it has not been manually edited using a full 3D editing environment, ASP DEMs cannot currently be considered true engineering-ready for performing landings.
 
@@ -601,6 +647,7 @@ Mayer, D. P., E. S. Kite, 2016, An Integrated Workflow for Producing Digital Ter
 local treks_CTX_Ortho_13S293E_24mp_G07_020879_1669 = {
   Identifier = "CTX_Ortho_13S293E_24mp_G07_020879_1669",
   Name = [[Mars Reconnaissance Orbiter CTX, Mosaic Coprates 13S293E]],
+  ZIndex = 50,
   FilePath = asset.resource("Mars_Reconnaissance_Orbiter_CTX/Mosaic_Coprates_13S293E.vrt"),
   Description = [[This is a CTX orthorectified image, geometrically corrected using its own source digital elevation model (DEM/DTM), as produced as part of an effort to characterize candidate Human Exploration Zones for Mars. The original DEM was constructed from a pair of CTX images using the stereo photogrammetry software AMES Stereo Pipeline (ASP). The DEM, and thus orthoimage, has been tied to MOLA and can be considered resarch- and visualization-ready. Because it has not been manually edited using a full 3D editing environment, ASP DEMs cannot currently be considered true engineering-ready for performing landings.
 
@@ -613,6 +660,7 @@ Mayer, D. P., E. S. Kite, 2016, An Integrated Workflow for Producing Digital Ter
 local treks_CTX_Ortho_38N024E_6mp_B17_016168_2181 = {
   Identifier = "CTX_Ortho_38N024E_6mp_B17_016168_2181",
   Name = [[Mars Reconnaissance Orbiter CTX, Mosaic Deuteronius 38N024E]],
+  ZIndex = 50,
   FilePath = asset.resource("Mars_Reconnaissance_Orbiter_CTX/Mosaic_Deuteronius_38N024E.vrt"),
   Description = [[This is a CTX orthorectified image, geometrically corrected using its own source digital elevation model (DEM/DTM), as produced as part of an effort to characterize candidate Human Exploration Zones for Mars. The original DEM was constructed from a pair of CTX images using the stereo photogrammetry software AMES Stereo Pipeline (ASP). The DEM, and thus orthoimage, has been tied to MOLA and can be considered resarch- and visualization-ready. Because it has not been manually edited using a full 3D editing environment, ASP DEMs cannot currently be considered true engineering-ready for performing landings.
 
@@ -625,6 +673,7 @@ Mayer, D. P., E. S. Kite, 2016, An Integrated Workflow for Producing Digital Ter
 local treks_CTX_Ortho_39N024E_6mp_D15_032875_2196 = {
   Identifier = "CTX_Ortho_39N024E_6mp_D15_032875_2196",
   Name = [[Mars Reconnaissance Orbiter CTX, Mosaic Deuteronius 39N024E]],
+  ZIndex = 50,
   FilePath = asset.resource("Mars_Reconnaissance_Orbiter_CTX/Mosaic_Deuteronius_39N024E.vrt"),
   Description = [[This is a CTX orthorectified image, geometrically corrected using its own source digital elevation model (DEM/DTM), as produced as part of an effort to characterize candidate Human Exploration Zones for Mars. The original DEM was constructed from a pair of CTX images using the stereo photogrammetry software AMES Stereo Pipeline (ASP). The DEM, and thus orthoimage, has been tied to MOLA and can be considered resarch- and visualization-ready. Because it has not been manually edited using a full 3D editing environment, ASP DEMs cannot currently be considered true engineering-ready for performing landings.
 
@@ -637,6 +686,7 @@ Mayer, D. P., E. S. Kite, 2016, An Integrated Workflow for Producing Digital Ter
 local treks_CTX_Ortho_40N022E_6mp_B18_016656_2206 = {
   Identifier = "CTX_Ortho_40N022E_6mp_B18_016656_2206",
   Name = [[Mars Reconnaissance Orbiter CTX, Mosaic Deuteronius 40N024E]],
+  ZIndex = 50,
   FilePath = asset.resource("Mars_Reconnaissance_Orbiter_CTX/Mosaic_Deuteronius_40N024E.vrt"),
   Description = [[This is a CTX orthorectified image, geometrically corrected using its own source digital elevation model (DEM/DTM), as produced as part of an effort to characterize candidate Human Exploration Zones for Mars. The original DEM was constructed from a pair of CTX images using the stereo photogrammetry software AMES Stereo Pipeline (ASP). The DEM, and thus orthoimage, has been tied to MOLA and can be considered resarch- and visualization-ready. Because it has not been manually edited using a full 3D editing environment, ASP DEMs cannot currently be considered true engineering-ready for performing landings.
 
@@ -649,6 +699,7 @@ Mayer, D. P., E. S. Kite, 2016, An Integrated Workflow for Producing Digital Ter
 local treks_CTX_Ortho_11S289E_6mp_F23_044971_1685 = {
   Identifier = "CTX_Ortho_11S289E_6mp_F23_044971_1685",
   Name = [[Mars Reconnaissance Orbiter CTX, Mosaic East Melas 11S289E]],
+  ZIndex = 50,
   FilePath = asset.resource("Mars_Reconnaissance_Orbiter_CTX/Mosaic_East_Melas_11S289E.vrt"),
   Description = [[This is a CTX orthorectified image, geometrically corrected using its own source digital elevation model (DEM/DTM), as produced as part of an effort to characterize candidate Human Exploration Zones for Mars. The original DEM was constructed from a pair of CTX images using the stereo photogrammetry software AMES Stereo Pipeline (ASP). The DEM, and thus orthoimage, has been tied to MOLA and can be considered resarch- and visualization-ready. Because it has not been manually edited using a full 3D editing environment, ASP DEMs cannot currently be considered true engineering-ready for performing landings.
 
@@ -661,6 +712,7 @@ Mayer, D. P., E. S. Kite, 2016, An Integrated Workflow for Producing Digital Ter
 local treks_CTX_Ortho_11S291E_6mp_B19_017187_1685 = {
   Identifier = "CTX_Ortho_11S291E_6mp_B19_017187_1685",
   Name = [[Mars Reconnaissance Orbiter CTX, Mosaic East Melas 11S291E]],
+  ZIndex = 50,
   FilePath = asset.resource("Mars_Reconnaissance_Orbiter_CTX/Mosaic_East_Melas_11S291E.vrt"),
   Description = [[This is a CTX orthorectified image, geometrically corrected using its own source digital elevation model (DEM/DTM), as produced as part of an effort to characterize candidate Human Exploration Zones for Mars. The original DEM was constructed from a pair of CTX images using the stereo photogrammetry software AMES Stereo Pipeline (ASP). The DEM, and thus orthoimage, has been tied to MOLA and can be considered resarch- and visualization-ready. Because it has not been manually edited using a full 3D editing environment, ASP DEMs cannot currently be considered true engineering-ready for performing landings.
 
@@ -673,6 +725,7 @@ Mayer, D. P., E. S. Kite, 2016, An Integrated Workflow for Producing Digital Ter
 local treks_CTX_Ortho_12S289E_6mp_D01_027446_1678 = {
   Identifier = "CTX_Ortho_12S289E_6mp_D01_027446_1678",
   Name = [[Mars Reconnaissance Orbiter CTX, Mosaic East Melas 12S289E_D01]],
+  ZIndex = 50,
   FilePath = asset.resource("Mars_Reconnaissance_Orbiter_CTX/Mosaic_East_Melas_12S289E_D01.vrt"),
   Description = [[This is a CTX orthorectified image, geometrically corrected using its own source digital elevation model (DEM/DTM), as produced as part of an effort to characterize candidate Human Exploration Zones for Mars. The original DEM was constructed from a pair of CTX images using the stereo photogrammetry software AMES Stereo Pipeline (ASP). The DEM, and thus orthoimage, has been tied to MOLA and can be considered resarch- and visualization-ready. Because it has not been manually edited using a full 3D editing environment, ASP DEMs cannot currently be considered true engineering-ready for performing landings.
 
@@ -685,6 +738,7 @@ Mayer, D. P., E. S. Kite, 2016, An Integrated Workflow for Producing Digital Ter
 local treks_CTX_Ortho_12S289E_6mp_F18_042927_1681 = {
   Identifier = "CTX_Ortho_12S289E_6mp_F18_042927_1681",
   Name = [[Mars Reconnaissance Orbiter CTX, Mosaic East Melas 12S289E_F18]],
+  ZIndex = 50,
   FilePath = asset.resource("Mars_Reconnaissance_Orbiter_CTX/Mosaic_East_Melas_12S289E_F18.vrt"),
   Description = [[This is a CTX orthorectified image, geometrically corrected using its own source digital elevation model (DEM/DTM), as produced as part of an effort to characterize candidate Human Exploration Zones for Mars. The original DEM was constructed from a pair of CTX images using the stereo photogrammetry software AMES Stereo Pipeline (ASP). The DEM, and thus orthoimage, has been tied to MOLA and can be considered resarch- and visualization-ready. Because it has not been manually edited using a full 3D editing environment, ASP DEMs cannot currently be considered true engineering-ready for performing landings.
 
@@ -697,6 +751,7 @@ Mayer, D. P., E. S. Kite, 2016, An Integrated Workflow for Producing Digital Ter
 local treks_CTX_Ortho_12S290E_6mp_D18_034250_1676 = {
   Identifier = "CTX_Ortho_12S290E_6mp_D18_034250_1676",
   Name = [[Mars Reconnaissance Orbiter CTX, Mosaic East Melas 12S290E]],
+  ZIndex = 50,
   FilePath = asset.resource("Mars_Reconnaissance_Orbiter_CTX/Mosaic_East_Melas_12S290E.vrt"),
   Description = [[This is a CTX orthorectified image, geometrically corrected using its own source digital elevation model (DEM/DTM), as produced as part of an effort to characterize candidate Human Exploration Zones for Mars. The original DEM was constructed from a pair of CTX images using the stereo photogrammetry software AMES Stereo Pipeline (ASP). The DEM, and thus orthoimage, has been tied to MOLA and can be considered resarch- and visualization-ready. Because it has not been manually edited using a full 3D editing environment, ASP DEMs cannot currently be considered true engineering-ready for performing landings.
 
@@ -709,6 +764,7 @@ Mayer, D. P., E. S. Kite, 2016, An Integrated Workflow for Producing Digital Ter
 local treks_F14_041292_1682_map_ba_align_6_fill500DRG = {
   Identifier = "F14_041292_1682_map_ba_align_6_fill500DRG",
   Name = [[Mars Reconnaissance Orbiter CTX, Mosaic East Melas 12S291E_F14]],
+  ZIndex = 50,
   FilePath = asset.resource("Mars_Reconnaissance_Orbiter_CTX/Mosaic_East_Melas_12S291E_F14.vrt"),
   Description = [[This is a CTX orthorectified image, geometrically corrected using its own source digital elevation model (DEM/DTM), as produced as part of an effort to characterize candidate Human Exploration Zones for Mars. The original DEM was constructed from a pair of CTX images using the stereo photogrammetry software AMES Stereo Pipeline (ASP). The DEM, and thus orthoimage, has been tied to MOLA and can be considered resarch- and visualization-ready. Because it has not been manually edited using a full 3D editing environment, ASP DEMs cannot currently be considered true engineering-ready for performing landings.
 
@@ -721,6 +777,7 @@ Mayer, D. P., E. S. Kite, 2016, An Integrated Workflow for Producing Digital Ter
 local treks_CTX_Ortho_12S291E_6mp_F21_043850_1684 = {
   Identifier = "CTX_Ortho_12S291E_6mp_F21_043850_1684",
   Name = [[Mars Reconnaissance Orbiter CTX, Mosaic East Melas 12S291E_F21]],
+  ZIndex = 50,
   FilePath = asset.resource("Mars_Reconnaissance_Orbiter_CTX/Mosaic_East_Melas_12S291E_F21.vrt"),
   Description = [[This is a CTX orthorectified image, geometrically corrected using its own source digital elevation model (DEM/DTM), as produced as part of an effort to characterize candidate Human Exploration Zones for Mars. The original DEM was constructed from a pair of CTX images using the stereo photogrammetry software AMES Stereo Pipeline (ASP). The DEM, and thus orthoimage, has been tied to MOLA and can be considered resarch- and visualization-ready. Because it has not been manually edited using a full 3D editing environment, ASP DEMs cannot currently be considered true engineering-ready for performing landings.
 
@@ -733,6 +790,7 @@ Mayer, D. P., E. S. Kite, 2016, An Integrated Workflow for Producing Digital Ter
 local treks_CTX_Ortho_12S291E_6mp_J01_045116_1677 = {
   Identifier = "CTX_Ortho_12S291E_6mp_J01_045116_1677",
   Name = [[Mars Reconnaissance Orbiter CTX, Mosaic East Melas 12S291E_J01]],
+  ZIndex = 50,
   FilePath = asset.resource("Mars_Reconnaissance_Orbiter_CTX/Mosaic_East_Melas_12S291E_J01.vrt"),
   Description = [[This is a CTX orthorectified image, geometrically corrected using its own source digital elevation model (DEM/DTM), as produced as part of an effort to characterize candidate Human Exploration Zones for Mars. The original DEM was constructed from a pair of CTX images using the stereo photogrammetry software AMES Stereo Pipeline (ASP). The DEM, and thus orthoimage, has been tied to MOLA and can be considered resarch- and visualization-ready. Because it has not been manually edited using a full 3D editing environment, ASP DEMs cannot currently be considered true engineering-ready for performing landings.
 
@@ -745,6 +803,7 @@ Mayer, D. P., E. S. Kite, 2016, An Integrated Workflow for Producing Digital Ter
 local treks_CTX_Ortho_13S289E_6mp_D10_031125_1673 = {
   Identifier = "CTX_Ortho_13S289E_6mp_D10_031125_1673",
   Name = [[Mars Reconnaissance Orbiter CTX, Mosaic East Melas 13S289E_D10]],
+  ZIndex = 50,
   FilePath = asset.resource("Mars_Reconnaissance_Orbiter_CTX/Mosaic_East_Melas_13S289E_D10.vrt"),
   Description = [[This is a CTX orthorectified image, geometrically corrected using its own source digital elevation model (DEM/DTM), as produced as part of an effort to characterize candidate Human Exploration Zones for Mars. The original DEM was constructed from a pair of CTX images using the stereo photogrammetry software AMES Stereo Pipeline (ASP). The DEM, and thus orthoimage, has been tied to MOLA and can be considered resarch- and visualization-ready. Because it has not been manually edited using a full 3D editing environment, ASP DEMs cannot currently be considered true engineering-ready for performing landings.
 
@@ -757,6 +816,7 @@ Mayer, D. P., E. S. Kite, 2016, An Integrated Workflow for Producing Digital Ter
 local treks_CTX_Ortho_16S291E_6mp_D22_035951_1644 = {
   Identifier = "CTX_Ortho_16S291E_6mp_D22_035951_1644",
   Name = [[Mars Reconnaissance Orbiter CTX, Mosaic East Melas 16S291E]],
+  ZIndex = 50,
   FilePath = asset.resource("Mars_Reconnaissance_Orbiter_CTX/Mosaic_East_Melas_16S291E.vrt"),
   Description = [[This is a CTX orthorectified image, geometrically corrected using its own source digital elevation model (DEM/DTM), as produced as part of an effort to characterize candidate Human Exploration Zones for Mars. The original DEM was constructed from a pair of CTX images using the stereo photogrammetry software AMES Stereo Pipeline (ASP). The DEM, and thus orthoimage, has been tied to MOLA and can be considered resarch- and visualization-ready. Because it has not been manually edited using a full 3D editing environment, ASP DEMs cannot currently be considered true engineering-ready for performing landings.
 
@@ -769,6 +829,7 @@ Mayer, D. P., E. S. Kite, 2016, An Integrated Workflow for Producing Digital Ter
 local treks_CTX_Slope_12S182E_24mp_P22_009609_1674_B02_010453_1675 = {
   Identifier = "CTX_Slope_12S182E_24mp_P22_009609_1674_B02_010453_1675",
   Name = [[Mars Reconnaissance Orbiter CTX, Slope Apollinaris 12S182E]],
+  ZIndex = 50,
   FilePath = asset.resource("Mars_Reconnaissance_Orbiter_CTX/Slope_Apollinaris_12S182E.vrt"),
   Description = [[This is a colorized version of the original 2x2 pixel slope in degrees (also called a 1 baseline slope). This was produced as part of an effort to characterize topography within candidate Human Exploration Zones for Mars. The DEM was constructed from a pair of CTX images using the stereo photogrammetry software AMES Stereo Pipeline (ASP). THe DEM has been tied to MOLA and can be considered resarch- and visualization-ready. Because it has not been manually edited using a full 3D editing environment, ASP DEMs cannot currently be considered true engineering-ready for performing landings.
 
@@ -783,6 +844,7 @@ Slopes were derived using the Python script called gdal_baseline_slope.py: https
 local treks_CTX_Slope_13S182E_24mp_G15_024127_1673_G16_024483_1673 = {
   Identifier = "CTX_Slope_13S182E_24mp_G15_024127_1673_G16_024483_1673",
   Name = [[Mars Reconnaissance Orbiter CTX, Slope Apollinaris 13S182E]],
+  ZIndex = 50,
   FilePath = asset.resource("Mars_Reconnaissance_Orbiter_CTX/Slope_Apollinaris_13S182E.vrt"),
   Description = [[This is a colorized version of the original 2x2 pixel slope in degrees (also called a 1 baseline slope). This was produced as part of an effort to characterize topography within candidate Human Exploration Zones for Mars. The DEM was constructed from a pair of CTX images using the stereo photogrammetry software AMES Stereo Pipeline (ASP). THe DEM has been tied to MOLA and can be considered resarch- and visualization-ready. Because it has not been manually edited using a full 3D editing environment, ASP DEMs cannot currently be considered true engineering-ready for performing landings.
 
@@ -797,6 +859,7 @@ Slopes were derived using the Python script called gdal_baseline_slope.py: https
 local treks_CTX_Slope_14S184E_24mp_B01_009886_1658_P21_009385_1658 = {
   Identifier = "CTX_Slope_14S184E_24mp_B01_009886_1658_P21_009385_1658",
   Name = [[Mars Reconnaissance Orbiter CTX, Slope Apollinaris 14S184E]],
+  ZIndex = 50,
   FilePath = asset.resource("Mars_Reconnaissance_Orbiter_CTX/Slope_Apollinaris_14S184E.vrt"),
   Description = [[This is a colorized version of the original 2x2 pixel slope in degrees (also called a 1 baseline slope). This was produced as part of an effort to characterize topography within candidate Human Exploration Zones for Mars. The DEM was constructed from a pair of CTX images using the stereo photogrammetry software AMES Stereo Pipeline (ASP). THe DEM has been tied to MOLA and can be considered resarch- and visualization-ready. Because it has not been manually edited using a full 3D editing environment, ASP DEMs cannot currently be considered true engineering-ready for performing landings.
 
diff --git a/data/assets/scene/solarsystem/planets/mars/moons/layers/colorlayers/deimos_viking.asset b/data/assets/scene/solarsystem/planets/mars/moons/layers/colorlayers/deimos_viking.asset
index 51998ab9a5..47dc7a1d0d 100644
--- a/data/assets/scene/solarsystem/planets/mars/moons/layers/colorlayers/deimos_viking.asset
+++ b/data/assets/scene/solarsystem/planets/mars/moons/layers/colorlayers/deimos_viking.asset
@@ -6,6 +6,7 @@ local Layer = {
   Identifier = "Deimos_Global_Mosaic_USGS",
   Name = "Deimos Global Mosaic [USGS]",
   Enabled = asset.enabled,
+  ZIndex = 10,
   FilePath = "WMS:https://wms.wr.usgs.gov/cgi-bin/mapserv?map=/maps/mars/deimos_simp_cyl.map&SERVICE=WMS&VERSION=1.1.1&REQUEST=GetMap&LAYERS=Deimos_Simple_Cylindrical_Rasters&SRS=EPSG:4326&BBOX=-180,-90,360,90",
   Description = [[This Viking-based cylindrical map of Deimos was created by Philip
     Stooke with the assistance of Chris Jongkind and Megan Arntz. Control is based on a
diff --git a/data/assets/scene/solarsystem/planets/mars/moons/layers/colorlayers/phobos_viking.asset b/data/assets/scene/solarsystem/planets/mars/moons/layers/colorlayers/phobos_viking.asset
index 7744845481..06debf3f5e 100644
--- a/data/assets/scene/solarsystem/planets/mars/moons/layers/colorlayers/phobos_viking.asset
+++ b/data/assets/scene/solarsystem/planets/mars/moons/layers/colorlayers/phobos_viking.asset
@@ -6,6 +6,7 @@ local Layer = {
   Identifier = "Phobos_Global_Shaded_Relief_USGS",
   Name = "Phobos Global Shaded Relief [USGS]",
   Enabled = asset.enabled,
+  ZIndex = 10,
   FilePath = "WMS:https://wms.wr.usgs.gov/cgi-bin/mapserv?map=/maps/mars/phobos_simp_cyl.map&SERVICE=WMS&VERSION=1.1.1&REQUEST=GetMap&LAYERS=Phobos_Simple_Cylindrical_Rasters&SRS=EPSG:4326&BBOX=-180,-90,360,90",
   Description = "Viking-base Phobos shaded relief created by USGS"
 }
diff --git a/data/assets/scene/solarsystem/planets/mercury/layers/colorlayers/alsimap_02122015.asset b/data/assets/scene/solarsystem/planets/mercury/layers/colorlayers/alsimap_02122015.asset
index 42e3405ce4..f6272a512d 100644
--- a/data/assets/scene/solarsystem/planets/mercury/layers/colorlayers/alsimap_02122015.asset
+++ b/data/assets/scene/solarsystem/planets/mercury/layers/colorlayers/alsimap_02122015.asset
@@ -14,6 +14,7 @@ local Layer = {
   Name = "Aluminium Abundance",
   Identifier = "alsimap_02122015",
   Enabled = asset.enabled,
+  ZIndex = 100,
   FilePath = texturesPath .. "alsimap_02122015.png",
   BlendMode = "Multiply",
   CacheSettings = { Enabled = false }
diff --git a/data/assets/scene/solarsystem/planets/mercury/layers/colorlayers/casimap_02122015.asset b/data/assets/scene/solarsystem/planets/mercury/layers/colorlayers/casimap_02122015.asset
index 8021eea9cf..c6c2d01f29 100644
--- a/data/assets/scene/solarsystem/planets/mercury/layers/colorlayers/casimap_02122015.asset
+++ b/data/assets/scene/solarsystem/planets/mercury/layers/colorlayers/casimap_02122015.asset
@@ -14,6 +14,7 @@ local Layer = {
   Name = "Calcium Abundance",
   Identifier = "casimap_02122015",
   Enabled = asset.enabled,
+  ZIndex = 100,
   FilePath = texturesPath .. "casimap_02122015.png",
   BlendMode = "Multiply",
   CacheSettings = { Enabled = false }
diff --git a/data/assets/scene/solarsystem/planets/mercury/layers/colorlayers/fesimap_02122015.asset b/data/assets/scene/solarsystem/planets/mercury/layers/colorlayers/fesimap_02122015.asset
index deb23dad40..3a05ad5fcc 100644
--- a/data/assets/scene/solarsystem/planets/mercury/layers/colorlayers/fesimap_02122015.asset
+++ b/data/assets/scene/solarsystem/planets/mercury/layers/colorlayers/fesimap_02122015.asset
@@ -14,6 +14,7 @@ local Layer = {
   Name = "Iron Abundance",
   Identifier = "fesimap_02122015",
   Enabled = asset.enabled,
+  ZIndex = 100,
   FilePath = texturesPath .. "fesimap_02122015.png",
   BlendMode = "Multiply",
   CacheSettings = { Enabled = false }
diff --git a/data/assets/scene/solarsystem/planets/mercury/layers/colorlayers/mercury_texture.asset b/data/assets/scene/solarsystem/planets/mercury/layers/colorlayers/mercury_texture.asset
index 499c73e013..51c5d34645 100644
--- a/data/assets/scene/solarsystem/planets/mercury/layers/colorlayers/mercury_texture.asset
+++ b/data/assets/scene/solarsystem/planets/mercury/layers/colorlayers/mercury_texture.asset
@@ -14,6 +14,7 @@ local Layer = {
   Identifier = "Texture",
   FilePath = texturesPath .. "Mercury_MESSENGER_MDIS_Basemap_BDR_Mosaic_Global_32ppd.jpg",
   Enabled = asset.enabled,
+  ZIndex = 5,
   Description = [[The Map Projected Basemap RDR (BDR) data set consists of a global
     monochrome map of reflectance at a resolution of 256 pixels per degree (~166 m/p).
     This is an offline version with lower resoution than the Messenger BDR layer.]],
diff --git a/data/assets/scene/solarsystem/planets/mercury/layers/colorlayers/messenger_bdr_newyork.asset b/data/assets/scene/solarsystem/planets/mercury/layers/colorlayers/messenger_bdr_newyork.asset
index 67263d4464..35d2efa546 100644
--- a/data/assets/scene/solarsystem/planets/mercury/layers/colorlayers/messenger_bdr_newyork.asset
+++ b/data/assets/scene/solarsystem/planets/mercury/layers/colorlayers/messenger_bdr_newyork.asset
@@ -6,6 +6,7 @@ local Layer = {
   Identifier = "Messenger_BDR_NewYork",
   Name = "Messenger BDR [New York]",
   Enabled = asset.enabled,
+  ZIndex = 10,
   FilePath = asset.resource("messenger_bdr_newyork.wms"),
   TilePixelSize = 360,
   Description = [[The Map Projected Basemap RDR (BDR) data set consists of a global
diff --git a/data/assets/scene/solarsystem/planets/mercury/layers/colorlayers/messenger_bdr_sweden.asset b/data/assets/scene/solarsystem/planets/mercury/layers/colorlayers/messenger_bdr_sweden.asset
index 521eddf06b..fbfbdbb3a7 100644
--- a/data/assets/scene/solarsystem/planets/mercury/layers/colorlayers/messenger_bdr_sweden.asset
+++ b/data/assets/scene/solarsystem/planets/mercury/layers/colorlayers/messenger_bdr_sweden.asset
@@ -6,6 +6,7 @@ local Layer = {
   Identifier = "Messenger_BDR_Sweden",
   Name = "Messenger BDR [Sweden]",
   Enabled = asset.enabled,
+  ZIndex = 10,
   FilePath = asset.resource("messenger_bdr_sweden.wms"),
   TilePixelSize = 360,
   Description = [[The Map Projected Basemap RDR (BDR) data set consists of a global
diff --git a/data/assets/scene/solarsystem/planets/mercury/layers/colorlayers/messenger_bdr_utah.asset b/data/assets/scene/solarsystem/planets/mercury/layers/colorlayers/messenger_bdr_utah.asset
index 5d31e934e2..a3668b695e 100644
--- a/data/assets/scene/solarsystem/planets/mercury/layers/colorlayers/messenger_bdr_utah.asset
+++ b/data/assets/scene/solarsystem/planets/mercury/layers/colorlayers/messenger_bdr_utah.asset
@@ -6,6 +6,7 @@ local Layer = {
   Identifier = "Messenger_BDR_Utah",
   Name = "Messenger BDR [Utah]",
   Enabled = asset.enabled,
+  ZIndex = 10,
   FilePath = asset.resource("messenger_bdr_utah.wms"),
   TilePixelSize = 360,
   Description = [[The Map Projected Basemap RDR (BDR) data set consists of a global
diff --git a/data/assets/scene/solarsystem/planets/mercury/layers/colorlayers/messenger_hie_newyork.asset b/data/assets/scene/solarsystem/planets/mercury/layers/colorlayers/messenger_hie_newyork.asset
index 5e2b5b9bc9..1ac437b866 100644
--- a/data/assets/scene/solarsystem/planets/mercury/layers/colorlayers/messenger_hie_newyork.asset
+++ b/data/assets/scene/solarsystem/planets/mercury/layers/colorlayers/messenger_hie_newyork.asset
@@ -6,6 +6,7 @@ local Layer = {
   Identifier = "Messenger_HIE_NewYork",
   Name = "Messenger HIE [New York]",
   Enabled = asset.enabled,
+  ZIndex = 10,
   FilePath = asset.resource("messenger_hie_newyork.wms")
 }
 
diff --git a/data/assets/scene/solarsystem/planets/mercury/layers/colorlayers/messenger_hie_sweden.asset b/data/assets/scene/solarsystem/planets/mercury/layers/colorlayers/messenger_hie_sweden.asset
index 4f78dd33ac..bee3ac6e78 100644
--- a/data/assets/scene/solarsystem/planets/mercury/layers/colorlayers/messenger_hie_sweden.asset
+++ b/data/assets/scene/solarsystem/planets/mercury/layers/colorlayers/messenger_hie_sweden.asset
@@ -6,6 +6,7 @@ local Layer = {
   Identifier = "Messenger_HIE_Sweden",
   Name = "Messenger HIE [Sweden]",
   Enabled = asset.enabled,
+  ZIndex = 10,
   FilePath = asset.resource("messenger_hie_sweden.wms")
 }
 
diff --git a/data/assets/scene/solarsystem/planets/mercury/layers/colorlayers/messenger_hie_utah.asset b/data/assets/scene/solarsystem/planets/mercury/layers/colorlayers/messenger_hie_utah.asset
index f7576fdbc8..4ecb33cb25 100644
--- a/data/assets/scene/solarsystem/planets/mercury/layers/colorlayers/messenger_hie_utah.asset
+++ b/data/assets/scene/solarsystem/planets/mercury/layers/colorlayers/messenger_hie_utah.asset
@@ -6,6 +6,7 @@ local Layer = {
   Identifier = "Messenger_HIE_Utah",
   Name = "Messenger HIE [Utah]",
   Enabled = asset.enabled,
+  ZIndex = 10,
   FilePath = asset.resource("messenger_hie_utah.wms")
 }
 
diff --git a/data/assets/scene/solarsystem/planets/mercury/layers/colorlayers/messenger_hiw_newyork.asset b/data/assets/scene/solarsystem/planets/mercury/layers/colorlayers/messenger_hiw_newyork.asset
index 2fcdaeda8f..3268bef874 100644
--- a/data/assets/scene/solarsystem/planets/mercury/layers/colorlayers/messenger_hiw_newyork.asset
+++ b/data/assets/scene/solarsystem/planets/mercury/layers/colorlayers/messenger_hiw_newyork.asset
@@ -6,6 +6,7 @@ local Layer = {
   Identifier = "Messenger_HIW_NewYork",
   Name = "Messenger HIW [New York]",
   Enabled = asset.enabled,
+  ZIndex = 10,
   FilePath = asset.resource("messenger_hiw_newyork.wms")
 }
 
diff --git a/data/assets/scene/solarsystem/planets/mercury/layers/colorlayers/messenger_hiw_sweden.asset b/data/assets/scene/solarsystem/planets/mercury/layers/colorlayers/messenger_hiw_sweden.asset
index 18ef239562..e8316aa00a 100644
--- a/data/assets/scene/solarsystem/planets/mercury/layers/colorlayers/messenger_hiw_sweden.asset
+++ b/data/assets/scene/solarsystem/planets/mercury/layers/colorlayers/messenger_hiw_sweden.asset
@@ -6,6 +6,7 @@ local Layer = {
   Identifier = "Messenger_HIW_Sweden",
   Name = "Messenger HIW [Sweden]",
   Enabled = asset.enabled,
+  ZIndex = 10,
   FilePath = asset.resource("messenger_hiw_sweden.wms")
 }
 
diff --git a/data/assets/scene/solarsystem/planets/mercury/layers/colorlayers/messenger_hiw_utah.asset b/data/assets/scene/solarsystem/planets/mercury/layers/colorlayers/messenger_hiw_utah.asset
index 1942be658b..bf02be9d1b 100644
--- a/data/assets/scene/solarsystem/planets/mercury/layers/colorlayers/messenger_hiw_utah.asset
+++ b/data/assets/scene/solarsystem/planets/mercury/layers/colorlayers/messenger_hiw_utah.asset
@@ -6,6 +6,7 @@ local Layer = {
   Identifier = "Messenger_HIW_Utah",
   Name = "Messenger HIW [Utah]",
   Enabled = asset.enabled,
+  ZIndex = 10,
   FilePath = asset.resource("messenger_hiw_utah.wms")
 }
 
diff --git a/data/assets/scene/solarsystem/planets/mercury/layers/colorlayers/messenger_loi_newyork.asset b/data/assets/scene/solarsystem/planets/mercury/layers/colorlayers/messenger_loi_newyork.asset
index d7cdc01fe0..108c6ec181 100644
--- a/data/assets/scene/solarsystem/planets/mercury/layers/colorlayers/messenger_loi_newyork.asset
+++ b/data/assets/scene/solarsystem/planets/mercury/layers/colorlayers/messenger_loi_newyork.asset
@@ -6,6 +6,7 @@ local Layer = {
   Identifier = "Messenger_LOI_NewYork",
   Name = "Messenger LOI [New York]",
   Enabled = asset.enabled,
+  ZIndex = 10,
   FilePath = asset.resource("messenger_loi_newyork.wms")
 }
 
diff --git a/data/assets/scene/solarsystem/planets/mercury/layers/colorlayers/messenger_loi_sweden.asset b/data/assets/scene/solarsystem/planets/mercury/layers/colorlayers/messenger_loi_sweden.asset
index 6bcb79dd88..9e3949589a 100644
--- a/data/assets/scene/solarsystem/planets/mercury/layers/colorlayers/messenger_loi_sweden.asset
+++ b/data/assets/scene/solarsystem/planets/mercury/layers/colorlayers/messenger_loi_sweden.asset
@@ -6,6 +6,7 @@ local Layer = {
   Identifier = "Messenger_LOI_Sweden",
   Name = "Messenger LOI [Sweden]",
   Enabled = asset.enabled,
+  ZIndex = 10,
   FilePath = asset.resource("messenger_loi_sweden.wms")
 }
 
diff --git a/data/assets/scene/solarsystem/planets/mercury/layers/colorlayers/messenger_loi_utah.asset b/data/assets/scene/solarsystem/planets/mercury/layers/colorlayers/messenger_loi_utah.asset
index befeeeb9c6..eeed898b2d 100644
--- a/data/assets/scene/solarsystem/planets/mercury/layers/colorlayers/messenger_loi_utah.asset
+++ b/data/assets/scene/solarsystem/planets/mercury/layers/colorlayers/messenger_loi_utah.asset
@@ -6,6 +6,7 @@ local Layer = {
   Identifier = "Messenger_LOI_Utah",
   Name = "Messenger LOI [Utah]",
   Enabled = asset.enabled,
+  ZIndex = 10,
   FilePath = asset.resource("messenger_loi_utah.wms")
 }
 
diff --git a/data/assets/scene/solarsystem/planets/mercury/layers/colorlayers/messenger_mdis_newyork.asset b/data/assets/scene/solarsystem/planets/mercury/layers/colorlayers/messenger_mdis_newyork.asset
index 7a92448daa..450a87c63f 100644
--- a/data/assets/scene/solarsystem/planets/mercury/layers/colorlayers/messenger_mdis_newyork.asset
+++ b/data/assets/scene/solarsystem/planets/mercury/layers/colorlayers/messenger_mdis_newyork.asset
@@ -6,6 +6,7 @@ local Layer = {
   Identifier = "Messenger_MDIS_NewYork",
   Name = "Messenger MDIS [New York]",
   Enabled = asset.enabled,
+  ZIndex = 10,
   FilePath = asset.resource("messenger_mdis_newyork.wms"),
   Description = [[This May 2013 basemap is a combination of the following mosaics; (1)
   The 2013-05-10 version of the monochrome global mosaic, made from Applied Coherent
diff --git a/data/assets/scene/solarsystem/planets/mercury/layers/colorlayers/messenger_mdis_sweden.asset b/data/assets/scene/solarsystem/planets/mercury/layers/colorlayers/messenger_mdis_sweden.asset
index d65e4b7471..46e38598db 100644
--- a/data/assets/scene/solarsystem/planets/mercury/layers/colorlayers/messenger_mdis_sweden.asset
+++ b/data/assets/scene/solarsystem/planets/mercury/layers/colorlayers/messenger_mdis_sweden.asset
@@ -6,6 +6,7 @@ local Layer = {
   Identifier = "Messenger_MDIS_Sweden",
   Name = "Messenger MDIS [Sweden]",
   Enabled = asset.enabled,
+  ZIndex = 10,
   FilePath = asset.resource("messenger_mdis_sweden.wms"),
   Description = [[This May 2013 basemap is a combination of the following mosaics; (1)
   The 2013-05-10 version of the monochrome global mosaic, made from Applied Coherent
diff --git a/data/assets/scene/solarsystem/planets/mercury/layers/colorlayers/messenger_mdis_utah.asset b/data/assets/scene/solarsystem/planets/mercury/layers/colorlayers/messenger_mdis_utah.asset
index db7bca90ec..bbdfdaea12 100644
--- a/data/assets/scene/solarsystem/planets/mercury/layers/colorlayers/messenger_mdis_utah.asset
+++ b/data/assets/scene/solarsystem/planets/mercury/layers/colorlayers/messenger_mdis_utah.asset
@@ -6,6 +6,7 @@ local Layer = {
   Identifier = "Messenger_MDIS_Utah",
   Name = "Messenger MDIS [Utah]",
   Enabled = asset.enabled,
+  ZIndex = 10,
   FilePath = asset.resource("messenger_mdis_utah.wms"),
   Description = [[This May 2013 basemap is a combination of the following mosaics; (1)
   The 2013-05-10 version of the monochrome global mosaic, made from Applied Coherent
diff --git a/data/assets/scene/solarsystem/planets/mercury/layers/colorlayers/messenger_mdr_utah.asset b/data/assets/scene/solarsystem/planets/mercury/layers/colorlayers/messenger_mdr_utah.asset
index 57e05220a3..bcb1e322e2 100644
--- a/data/assets/scene/solarsystem/planets/mercury/layers/colorlayers/messenger_mdr_utah.asset
+++ b/data/assets/scene/solarsystem/planets/mercury/layers/colorlayers/messenger_mdr_utah.asset
@@ -6,6 +6,7 @@ local Layer = {
   Identifier = "Messenger_MDR_Utah",
   Name = "Messenger MDR [Utah]",
   Enabled = asset.enabled,
+  ZIndex = 10,
   FilePath = asset.resource("messenger_mdr_utah.wms")
 }
 
diff --git a/data/assets/scene/solarsystem/planets/mercury/layers/colorlayers/messenger_mosaic2_newyork.asset b/data/assets/scene/solarsystem/planets/mercury/layers/colorlayers/messenger_mosaic2_newyork.asset
index b4e5dca288..ea55c6724b 100644
--- a/data/assets/scene/solarsystem/planets/mercury/layers/colorlayers/messenger_mosaic2_newyork.asset
+++ b/data/assets/scene/solarsystem/planets/mercury/layers/colorlayers/messenger_mosaic2_newyork.asset
@@ -6,6 +6,7 @@ local Layer = {
   Identifier = "Messenger_Mosaic2_NewYork",
   Name = "Messenger Mosaic2 [New York]",
   Enabled = asset.enabled,
+  ZIndex = 20,
   FilePath = asset.resource("messenger_mosaic2_newyork.wms")
 }
 
diff --git a/data/assets/scene/solarsystem/planets/mercury/layers/colorlayers/messenger_mosaic2_sweden.asset b/data/assets/scene/solarsystem/planets/mercury/layers/colorlayers/messenger_mosaic2_sweden.asset
index 600f13eb81..7e83b37055 100644
--- a/data/assets/scene/solarsystem/planets/mercury/layers/colorlayers/messenger_mosaic2_sweden.asset
+++ b/data/assets/scene/solarsystem/planets/mercury/layers/colorlayers/messenger_mosaic2_sweden.asset
@@ -6,6 +6,7 @@ local Layer = {
   Identifier = "Messenger_Mosaic2_Sweden",
   Name = "Messenger Mosaic2 [Sweden]",
   Enabled = asset.enabled,
+  ZIndex = 20,
   FilePath = asset.resource("messenger_mosaic2_sweden.wms")
 }
 
diff --git a/data/assets/scene/solarsystem/planets/mercury/layers/colorlayers/messenger_mosaic2_utah.asset b/data/assets/scene/solarsystem/planets/mercury/layers/colorlayers/messenger_mosaic2_utah.asset
index 19d6d6f797..9003b814bf 100644
--- a/data/assets/scene/solarsystem/planets/mercury/layers/colorlayers/messenger_mosaic2_utah.asset
+++ b/data/assets/scene/solarsystem/planets/mercury/layers/colorlayers/messenger_mosaic2_utah.asset
@@ -6,6 +6,7 @@ local Layer = {
   Identifier = "Messenger_Mosaic2_Utah",
   Name = "Messenger Mosaic2 [Utah]",
   Enabled = asset.enabled,
+  ZIndex = 20,
   FilePath = asset.resource("messenger_mosaic2_utah.wms")
 }
 
diff --git a/data/assets/scene/solarsystem/planets/mercury/layers/colorlayers/messenger_mosaic_newyork.asset b/data/assets/scene/solarsystem/planets/mercury/layers/colorlayers/messenger_mosaic_newyork.asset
index c48f3ede53..959c40d526 100644
--- a/data/assets/scene/solarsystem/planets/mercury/layers/colorlayers/messenger_mosaic_newyork.asset
+++ b/data/assets/scene/solarsystem/planets/mercury/layers/colorlayers/messenger_mosaic_newyork.asset
@@ -6,6 +6,7 @@ local Layer = {
   Identifier = "Messenger_Mosaic_NewYork",
   Name = "Messenger Mosaic [New York]",
   Enabled = asset.enabled,
+  ZIndex = 20,
   FilePath = asset.resource("messenger_mosaic_newyork.wms")
 }
 
diff --git a/data/assets/scene/solarsystem/planets/mercury/layers/colorlayers/messenger_mosaic_sweden.asset b/data/assets/scene/solarsystem/planets/mercury/layers/colorlayers/messenger_mosaic_sweden.asset
index a86565b630..c2b37e2d03 100644
--- a/data/assets/scene/solarsystem/planets/mercury/layers/colorlayers/messenger_mosaic_sweden.asset
+++ b/data/assets/scene/solarsystem/planets/mercury/layers/colorlayers/messenger_mosaic_sweden.asset
@@ -6,6 +6,7 @@ local Layer = {
   Identifier = "Messenger_Mosaic_Sweden",
   Name = "Messenger Mosaic [Sweden]",
   Enabled = asset.enabled,
+  ZIndex = 20,
   FilePath = asset.resource("messenger_mosaic_sweden.wms")
 }
 
diff --git a/data/assets/scene/solarsystem/planets/mercury/layers/colorlayers/messenger_mosaic_utah.asset b/data/assets/scene/solarsystem/planets/mercury/layers/colorlayers/messenger_mosaic_utah.asset
index 7c2ded983f..63ef62e9ba 100644
--- a/data/assets/scene/solarsystem/planets/mercury/layers/colorlayers/messenger_mosaic_utah.asset
+++ b/data/assets/scene/solarsystem/planets/mercury/layers/colorlayers/messenger_mosaic_utah.asset
@@ -6,6 +6,7 @@ local Layer = {
   Identifier = "Messenger_Mosaic_Utah",
   Name = "Messenger Mosaic [Utah]",
   Enabled = asset.enabled,
+  ZIndex = 20,
   FilePath = asset.resource("messenger_mosaic_utah.wms")
 }
 
diff --git a/data/assets/scene/solarsystem/planets/mercury/layers/colorlayers/messenger_mp3_utah.asset b/data/assets/scene/solarsystem/planets/mercury/layers/colorlayers/messenger_mp3_utah.asset
index 40d072c688..60b1223d21 100644
--- a/data/assets/scene/solarsystem/planets/mercury/layers/colorlayers/messenger_mp3_utah.asset
+++ b/data/assets/scene/solarsystem/planets/mercury/layers/colorlayers/messenger_mp3_utah.asset
@@ -6,6 +6,7 @@ local Layer = {
   Identifier = "Messenger_MP3_Utah",
   Name = "Messenger MP3 [Utah]",
   Enabled = asset.enabled,
+  ZIndex = 10,
   FilePath = asset.resource("messenger_mp3_utah.wms")
 }
 
diff --git a/data/assets/scene/solarsystem/planets/mercury/layers/colorlayers/messenger_shade_newyork.asset b/data/assets/scene/solarsystem/planets/mercury/layers/colorlayers/messenger_shade_newyork.asset
index 1ad76bca02..65d4e51651 100644
--- a/data/assets/scene/solarsystem/planets/mercury/layers/colorlayers/messenger_shade_newyork.asset
+++ b/data/assets/scene/solarsystem/planets/mercury/layers/colorlayers/messenger_shade_newyork.asset
@@ -6,6 +6,7 @@ local Layer = {
   Identifier = "Messenger_SHADE_NewYork",
   Name = "Messenger SHADE [New York]",
   Enabled = asset.enabled,
+  ZIndex = 10,
   FilePath = asset.resource("messenger_shade_newyork.wms"),
   Settings = {
     Gamma = 1.33,
diff --git a/data/assets/scene/solarsystem/planets/mercury/layers/colorlayers/messenger_shade_sweden.asset b/data/assets/scene/solarsystem/planets/mercury/layers/colorlayers/messenger_shade_sweden.asset
index e1bb4260f8..ae82fe3054 100644
--- a/data/assets/scene/solarsystem/planets/mercury/layers/colorlayers/messenger_shade_sweden.asset
+++ b/data/assets/scene/solarsystem/planets/mercury/layers/colorlayers/messenger_shade_sweden.asset
@@ -6,6 +6,7 @@ local Layer = {
   Identifier = "Messenger_SHADE_Sweden",
   Name = "Messenger SHADE [Sweden]",
   Enabled = asset.enabled,
+  ZIndex = 100,
   FilePath = asset.resource("messenger_shade_sweden.wms"),
   Settings = {
     Gamma = 1.33,
diff --git a/data/assets/scene/solarsystem/planets/mercury/layers/colorlayers/messenger_shade_utah.asset b/data/assets/scene/solarsystem/planets/mercury/layers/colorlayers/messenger_shade_utah.asset
index 01cc5a9d1a..c2d553d01f 100644
--- a/data/assets/scene/solarsystem/planets/mercury/layers/colorlayers/messenger_shade_utah.asset
+++ b/data/assets/scene/solarsystem/planets/mercury/layers/colorlayers/messenger_shade_utah.asset
@@ -6,6 +6,7 @@ local Layer = {
   Identifier = "Messenger_SHADE_Utah",
   Name = "Messenger SHADE [Utah]",
   Enabled = asset.enabled,
+  ZIndex = 100,
   FilePath = asset.resource("messenger_shade_utah.wms"),
   Settings = {
     Gamma = 1.33,
diff --git a/data/assets/scene/solarsystem/planets/mercury/layers/colorlayers/mgsimap_02122015.asset b/data/assets/scene/solarsystem/planets/mercury/layers/colorlayers/mgsimap_02122015.asset
index 35fff60e83..dea2f10456 100644
--- a/data/assets/scene/solarsystem/planets/mercury/layers/colorlayers/mgsimap_02122015.asset
+++ b/data/assets/scene/solarsystem/planets/mercury/layers/colorlayers/mgsimap_02122015.asset
@@ -14,6 +14,7 @@ local Layer = {
   Name = "Magnesium Abundance",
   Identifier = "mgsimap_02122015",
   Enabled = asset.enabled,
+  ZIndex = 100,
   FilePath = texturesPath .. "mgsimap_02122015.png",
   Settings = {
     Gamma = 1.33,
diff --git a/data/assets/scene/solarsystem/planets/mercury/layers/colorlayers/ssimap_02122015.asset b/data/assets/scene/solarsystem/planets/mercury/layers/colorlayers/ssimap_02122015.asset
index fb5cb61f04..18e5e871d6 100644
--- a/data/assets/scene/solarsystem/planets/mercury/layers/colorlayers/ssimap_02122015.asset
+++ b/data/assets/scene/solarsystem/planets/mercury/layers/colorlayers/ssimap_02122015.asset
@@ -14,6 +14,7 @@ local Layer = {
   Name = "Silicon Abundance",
   Identifier = "ssimap_02122015",
   Enabled = asset.enabled,
+  ZIndex = 100,
   FilePath = texturesPath .. "ssimap_02122015.png",
   BlendMode = "Multiply",
   CacheSettings = { Enabled = false }
diff --git a/data/assets/scene/solarsystem/planets/mercury/layers/heightlayers/messenger_dem_utah.asset b/data/assets/scene/solarsystem/planets/mercury/layers/heightlayers/messenger_dem_utah.asset
index 05e9d1276e..64d2d8bc98 100644
--- a/data/assets/scene/solarsystem/planets/mercury/layers/heightlayers/messenger_dem_utah.asset
+++ b/data/assets/scene/solarsystem/planets/mercury/layers/heightlayers/messenger_dem_utah.asset
@@ -4,6 +4,7 @@ local Layer = {
   Identifier = "Messenger_DEM_Utah",
   Name = "Messenger DEM [Utah]",
   Enabled = asset.enabled,
+  ZIndex = 10,
   FilePath = asset.resource("messenger_dem_utah.wms"),
   Settings = {
     Gamma = 1.59,
diff --git a/data/assets/scene/solarsystem/planets/mercury/layers/nasa-treks/MSGR_MDIS.asset b/data/assets/scene/solarsystem/planets/mercury/layers/nasa-treks/MSGR_MDIS.asset
index ab0423cc61..6ba3c98004 100644
--- a/data/assets/scene/solarsystem/planets/mercury/layers/nasa-treks/MSGR_MDIS.asset
+++ b/data/assets/scene/solarsystem/planets/mercury/layers/nasa-treks/MSGR_MDIS.asset
@@ -10,6 +10,7 @@ local treks_Mercury_Messenger_USGS_DEM_665m_v2_HillshadeColor = {
   Identifier = "Mercury_Messenger_USGS_DEM_665m_v2_HillshadeColor",
   Name = [[MSGR MDIS, ColorHillshade Global]],
   FilePath = asset.resource("MSGR_MDIS/ColorHillshade_Global.vrt"),
+  ZIndex = 50,
   Description = [[This is a colorized shaded-relief generated from the USGS Astrogeology Science Center's Mercury MESSENGER Global DEM 665m v2 data product providing global coverage of Mercury. This color hillshade was generated in ArcPro with the shaded-relief raster function. The resolution of the original DEM used to create this product is 64 pixels/degree (665 m/pixel). The control network used for registration contains tie points that are sample/line coordinates with geometric locations (derived from SPICE) that are automatically measured across the overlapping image areas. Elevation values are in meters and referred to a radius of 2439400m. The legend conveys the mapping colors to elevation values (meters).]]
 }
 
@@ -17,6 +18,7 @@ local treks_Mercury_Messenger_USGS_DEM_665m_v2_Hillshade = {
   Identifier = "Mercury_Messenger_USGS_DEM_665m_v2_Hillshade",
   Name = [[MSGR MDIS, Hillshade Global]],
   FilePath = asset.resource("MSGR_MDIS/Hillshade_Global.vrt"),
+  ZIndex = 50,
   Description = [[This is a shaded-relief generated from the USGS Astrogeology Science Center's Mercury MESSENGER Global DEM 665m v2 data product providing global coverage of Mercury. This shaded-relief data product was generated in ArcPro with the hillshade raster function. The resolution of the original DEM used to create this product is 64 pixels/degree (665 m/pixel). The control network used for registration contains tie points that are sample/line coordinates with geometric locations (derived from SPICE) that are automatically measured across the overlapping image areas. Elevation values are in meters and referred to a radius of 2439400m.]]
 }
 
@@ -24,6 +26,7 @@ local treks_Mercury_Messenger_USGS_DEM_665m_v2_SlopeColor = {
   Identifier = "Mercury_Messenger_USGS_DEM_665m_v2_SlopeColor",
   Name = [[MSGR MDIS, Slope Colorized Global]],
   FilePath = asset.resource("MSGR_MDIS/Slope_Colorized_Global.vrt"),
+  ZIndex = 50,
   Description = [[This is a colorized slope data product of the USGS Astrogeology Science Center's Mercury MESSENGER Global DEM 665m v2 data product providing global coverage of Mercury. This slope data product was generated in ArcMap with the slope spatial analysis tool. The resolution of this product is 64 pixels/degree (665 m/pixel). The control network used for registration contains tie points that are sample/line coordinates with geometric locations (derived from SPICE) that are automatically measured across the overlapping image areas. Slope values are in degrees and referred to a radius of 2439400m. Slope values range from a minimum value of 0 to a maximum value of 71.0409. The legend conveys the mapping colors to slope values (degrees).]]
 }
 
diff --git a/data/assets/scene/solarsystem/planets/mercury/layers/nasa-treks/MSGR_MDIS_Mosaic.asset b/data/assets/scene/solarsystem/planets/mercury/layers/nasa-treks/MSGR_MDIS_Mosaic.asset
index 2af7a78ceb..6c48adc079 100644
--- a/data/assets/scene/solarsystem/planets/mercury/layers/nasa-treks/MSGR_MDIS_Mosaic.asset
+++ b/data/assets/scene/solarsystem/planets/mercury/layers/nasa-treks/MSGR_MDIS_Mosaic.asset
@@ -10,6 +10,7 @@ local treks_MSGR_Aksakov_Crater_Peak_Ring_Ortho_29m = {
   Identifier = "MSGR_Aksakov_Crater_Peak_Ring_Ortho_29m",
   Name = [[MSGR MDIS Mosaic, Aksakov Crater Peak Ring]],
   FilePath = asset.resource("MSGR_MDIS_Mosaic/Aksakov_Crater_Peak_Ring.vrt"),
+  ZIndex = 50,
   Description = [[This is a visible orthoimage for the Aksakov Crater Peak Ring region on Mercury. This data product class of this data is observational and has been constructed to examine the visible and topographic settings of landforms around Mercury's hollows. Observations of topography, specifically the relationships of hollows to their surroundings, can be used to investigate hollow formation. The visible image has been orthorectified using a digital elevation model (DEM) created from Mercury Dual Imaging System (MDIS) stereo pair images. The DEM used to generate the orthoimage has been aligned and controlled to Mercury Laser Altimeter (MLA) individual elevation points. The orthoimage was then projected onto the DEM and exported. This ortho image has been generated at a resolution of 29m/pixel.]]
 }
 
@@ -17,6 +18,7 @@ local treks_MSGR_near_Dali_Crater_Ortho_20m = {
   Identifier = "MSGR_near_Dali_Crater_Ortho_20m",
   Name = [[MSGR MDIS Mosaic, Crater near Dali Crater]],
   FilePath = asset.resource("MSGR_MDIS_Mosaic/Crater_near_Dali_Crater.vrt"),
+  ZIndex = 50,
   Description = [[This is a visible orthoimage for the Crater Near Dali Crater region on Mercury. This data product class of this data is observational and has been constructed to examine the visible and topographic settings of landforms around Mercury's hollows. Observations of topography, specifically the relationships of hollows to their surroundings, can be used to investigate hollow formation. The visible image has been orthorectified using a digital elevation model (DEM) created from Mercury Dual Imaging System (MDIS) stereo pair images. The DEM used to generate the orthoimage has been aligned and controlled to Mercury Laser Altimeter (MLA) individual elevation points. The orthoimage was then projected onto the DEM and exported. This ortho image has been generated at a resolution of 20m/pixel.]]
 }
 
@@ -24,6 +26,7 @@ local treks_MSGR_near_Geddes_Crater_Ortho_33m = {
   Identifier = "MSGR_near_Geddes_Crater_Ortho_33m",
   Name = [[MSGR MDIS Mosaic, Crater near Geddes Crater]],
   FilePath = asset.resource("MSGR_MDIS_Mosaic/Crater_near_Geddes_Crater.vrt"),
+  ZIndex = 50,
   Description = [[This is a visible orthoimage for the Crater Near Geddes Crater region on Mercury. This data product class of this data is observational and has been constructed to examine the visible and topographic settings of landforms around Mercury's hollows. Observations of topography, specifically the relationships of hollows to their surroundings, can be used to investigate hollow formation. The visible image has been orthorectified using a digital elevation model (DEM) created from Mercury Dual Imaging System (MDIS) stereo pair images. The DEM used to generate the orthoimage has been aligned and controlled to Mercury Laser Altimeter (MLA) individual elevation points. The orthoimage was then projected onto the DEM and exported. This ortho image has been generated at a resolution of 33m/pixel.]]
 }
 
@@ -31,6 +34,7 @@ local treks_MSGR_Degas_Crater_Ortho_30m = {
   Identifier = "MSGR_Degas_Crater_Ortho_30m",
   Name = [[MSGR MDIS Mosaic, Degas Crater]],
   FilePath = asset.resource("MSGR_MDIS_Mosaic/Degas_Crater.vrt"),
+  ZIndex = 50,
   Description = [[This is a visible orthoimage for the Degas Crater region on Mercury. This data product class of this data is observational and has been constructed to examine the visible and topographic settings of landforms around Mercury's hollows. Observations of topography, specifically the relationships of hollows to their surroundings, can be used to investigate hollow formation. The visible image has been orthorectified using a digital elevation model (DEM) created from Mercury Dual Imaging System (MDIS) stereo pair images. The DEM used to generate the orthoimage has been aligned and controlled to Mercury Laser Altimeter (MLA) individual elevation points. The orthoimage was then projected onto the DEM and exported. This ortho image has been generated at a resolution of 30m/pixel.]]
 }
 
@@ -38,6 +42,7 @@ local treks_MSGR_Kertesz_Crater_Ortho_30m = {
   Identifier = "MSGR_Kertesz_Crater_Ortho_30m",
   Name = [[MSGR MDIS Mosaic, Kertesz Crater]],
   FilePath = asset.resource("MSGR_MDIS_Mosaic/Kertesz_Crater.vrt"),
+  ZIndex = 50,
   Description = [[This is a visible orthoimage for the KerteszCrater region on Mercury. This data product class of this data is observational and has been constructed to examine the visible and topographic settings of landforms around Mercury's hollows. Observations of topography, specifically the relationships of hollows to their surroundings, can be used to investigate hollow formation. The visible image has been orthorectified using a digital elevation model (DEM) created from Mercury Dual Imaging System (MDIS) stereo pair images. The DEM used to generate the orthoimage has been aligned and controlled to Mercury Laser Altimeter (MLA) individual elevation points. The orthoimage was then projected onto the DEM and exported. This ortho image has been generated at a resolution of 30m/pixel.]]
 }
 
@@ -45,6 +50,7 @@ local treks_MSGR_nw_Degas_Crater_Ortho_26m = {
   Identifier = "MSGR_nw_Degas_Crater_Ortho_26m",
   Name = [[MSGR MDIS Mosaic, North-West of Degas Crater]],
   FilePath = asset.resource("MSGR_MDIS_Mosaic/North-West_of_Degas_Crater.vrt"),
+  ZIndex = 50,
   Description = [[This is a visible orthoimage for the region northwest of Degas Crater on Mercury. This data product class of this data is observational and has been constructed to examine the visible and topographic settings of landforms around Mercury's hollows. Observations of topography, specifically the relationships of hollows to their surroundings, can be used to investigate hollow formation. The visible image has been orthorectified using a digital elevation model (DEM) created from Mercury Dual Imaging System (MDIS) stereo pair images. The DEM used to generate the orthoimage has been aligned and controlled to Mercury Laser Altimeter (MLA) individual elevation points. The orthoimage was then projected onto the DEM and exported. This ortho image has been generated at a resolution of 26m/pixel.]]
 }
 
@@ -52,6 +58,7 @@ local treks_MSGR_Praxiteles_Peak_Ring_Ortho_20m = {
   Identifier = "MSGR_Praxiteles_Peak_Ring_Ortho_20m",
   Name = [[MSGR MDIS Mosaic, Praxiteles Peak Ring]],
   FilePath = asset.resource("MSGR_MDIS_Mosaic/Praxiteles_Peak_Ring.vrt"),
+  ZIndex = 50,
   Description = [[This is a visible orthoimage for the Praxiteles Peak Ring region on Mercury. This data product class of this data is observational and has been constructed to examine the visible and topographic settings of landforms around Mercury's hollows. Observations of topography, specifically the relationships of hollows to their surroundings, can be used to investigate hollow formation. The visible image has been orthorectified using a digital elevation model (DEM) created from Mercury Dual Imaging System (MDIS) stereo pair images. The DEM used to generate the orthoimage has been aligned and controlled to Mercury Laser Altimeter (MLA) individual elevation points. The orthoimage was then projected onto the DEM and exported. This ortho image has been generated at a resolution of 20m/pixel.]]
 }
 
@@ -59,6 +66,7 @@ local treks_MSGR_Raditladi_Crater_Ortho_40m = {
   Identifier = "MSGR_Raditladi_Crater_Ortho_40m",
   Name = [[MSGR MDIS Mosaic, Raditladi Crater]],
   FilePath = asset.resource("MSGR_MDIS_Mosaic/Raditladi_Crater.vrt"),
+  ZIndex = 50,
   Description = [[This is a visible orthoimage for the Raditladi Crater region on Mercury. This data product class of this data is observational and has been constructed to examine the visible and topographic settings of landforms around Mercury's hollows. Observations of topography, specifically the relationships of hollows to their surroundings, can be used to investigate hollow formation. The visible image has been orthorectified using a digital elevation model (DEM) created from Mercury Dual Imaging System (MDIS) stereo pair images. The DEM used to generate the orthoimage has been aligned and controlled to Mercury Laser Altimeter (MLA) individual elevation points. The orthoimage was then projected onto the DEM and exported. This ortho image has been generated at a resolution of 40m/pixel.]]
 }
 
@@ -66,6 +74,7 @@ local treks_MSGR_Sander_Crater_Ortho_22m = {
   Identifier = "MSGR_Sander_Crater_Ortho_22m",
   Name = [[MSGR MDIS Mosaic, Sander Crater]],
   FilePath = asset.resource("MSGR_MDIS_Mosaic/Sander_Crater.vrt"),
+  ZIndex = 50,
   Description = [[This is a visible orthoimage for the Sander Crater region on Mercury. This data product class of this data is observational and has been constructed to examine the visible and topographic settings of landforms around Mercury's hollows. Observations of topography, specifically the relationships of hollows to their surroundings, can be used to investigate hollow formation. The visible image has been orthorectified using a digital elevation model (DEM) created from Mercury Dual Imaging System (MDIS) stereo pair images. The DEM used to generate the orthoimage has been aligned and controlled to Mercury Laser Altimeter (MLA) individual elevation points. The orthoimage was then projected onto the DEM and exported. This ortho image has been generated at a resolution of 22m/pixel.]]
 }
 
@@ -73,6 +82,7 @@ local treks_MSGR_Sholem_Aleichem_Crater_Wall_Ortho_8m = {
   Identifier = "MSGR_Sholem_Aleichem_Crater_Wall_Ortho_8m",
   Name = [[MSGR MDIS Mosaic, Sholem Aleichem Crater Wall]],
   FilePath = asset.resource("MSGR_MDIS_Mosaic/Sholem_Aleichem_Crater_Wall.vrt"),
+  ZIndex = 50,
   Description = [[This is a visible orthoimage for the Sholem Aleichem Crater Wall region on Mercury. This data product class of this data is observational and has been constructed to examine the visible and topographic settings of landforms around Mercury's hollows. Observations of topography, specifically the relationships of hollows to their surroundings, can be used to investigate hollow formation. The visible image has been orthorectified using a digital elevation model (DEM) created from Mercury Dual Imaging System (MDIS) stereo pair images. The DEM used to generate the orthoimage has been aligned and controlled to Mercury Laser Altimeter (MLA) individual elevation points. The orthoimage was then projected onto the DEM and exported. This ortho image has been generated at a resolution of 8m/pixel.]]
 }
 
diff --git a/data/assets/scene/solarsystem/planets/mercury/layers/nasa-treks/MSGR_MDIS_Slope.asset b/data/assets/scene/solarsystem/planets/mercury/layers/nasa-treks/MSGR_MDIS_Slope.asset
index 0149e2d412..17897a51ef 100644
--- a/data/assets/scene/solarsystem/planets/mercury/layers/nasa-treks/MSGR_MDIS_Slope.asset
+++ b/data/assets/scene/solarsystem/planets/mercury/layers/nasa-treks/MSGR_MDIS_Slope.asset
@@ -10,6 +10,7 @@ local treks_MSGR_Aksakov_Crater_Peak_Ring_Slope_100m = {
   Identifier = "MSGR_Aksakov_Crater_Peak_Ring_Slope_100m",
   Name = [[MSGR MDIS Slope, Aksakov Crater Peak Ring]],
   FilePath = asset.resource("MSGR_MDIS_Slope/Aksakov_Crater_Peak_Ring.vrt"),
+  ZIndex = 50,
   Description = [[This is a slope product of the digital elevation model (DEM) for the Aksakov Crater Peak Ring region on Mercury. This data product class of this data is observational and has been constructed to examine the topographic settings of landforms around Mercury's hollows. Observations of topography, specifically the relationships of hollows to their surroundings, can be used to investigate hollow formation. This DEM has been derived from Mercury Dual Imaging System (MDIS) data and has been generated at a resolution of 100m/pixel. The DEM has been aligned and controlled to Mercury Laser Altimeter (MLA) individual elevation points. Vertical offsets in this DEM have been roughly corrected relative to the USGS's 665m Global DEM of Mercury. DEM elevation values are in meters and referred to a radius of 2440000m. Slope values are in degrees with a minimum value of 0 and a maximum value of 41.818.]]
 }
 
@@ -17,6 +18,7 @@ local treks_MSGR_near_Dali_Crater_Slope_60m = {
   Identifier = "MSGR_near_Dali_Crater_Slope_60m",
   Name = [[MSGR MDIS Slope, Crater near Dali Crater]],
   FilePath = asset.resource("MSGR_MDIS_Slope/Crater_near_Dali_Crater.vrt"),
+  ZIndex = 50,
   Description = [[This is a slope product of the digital elevation model (DEM) for the Crater Near Dali Crater region on Mercury. This data product class of this data is observational and has been constructed to examine the topographic settings of landforms around Mercury's hollows. Observations of topography, specifically the relationships of hollows to their surroundings, can be used to investigate hollow formation. This DEM has been derived from Mercury Dual Imaging System (MDIS) data and has been generated at a resolution of 60m/pixel. The DEM has been aligned and controlled to Mercury Laser Altimeter (MLA) individual elevation points. Vertical offsets in this DEM have been roughly corrected relative to the USGS's 665m Global DEM of Mercury. DEM elevation values are in meters and referred to a radius of 2440000m. Slope values are in degrees with a minimum value of 0 and a maximum value of 50.112.]]
 }
 
@@ -24,6 +26,7 @@ local treks_MSGR_near_Geddes_Crater_Slope_100m = {
   Identifier = "MSGR_near_Geddes_Crater_Slope_100m",
   Name = [[MSGR MDIS Slope, Crater near Geddes Crater]],
   FilePath = asset.resource("MSGR_MDIS_Slope/Crater_near_Geddes_Crater.vrt"),
+  ZIndex = 50,
   Description = [[This is a slope product of the digital elevation model (DEM) for the Crater Near Geddes Crater region on Mercury. This data product class of this data is observational and has been constructed to examine the topographic settings of landforms around Mercury's hollows. Observations of topography, specifically the relationships of hollows to their surroundings, can be used to investigate hollow formation. This DEM has been derived from Mercury Dual Imaging System (MDIS) data and has been generated at a resolution of 100m/pixel. The DEM has been aligned and controlled to Mercury Laser Altimeter (MLA) individual elevation points. Vertical offsets in this DEM have been roughly corrected relative to the USGS's 665m Global DEM of Mercury. DEM elevation values are in meters and referred to a radius of 2440000m. Slope values are in degrees with a minimum value of 0 and a maximum value of 42.451.]]
 }
 
@@ -31,6 +34,7 @@ local treks_MSGR_Degas_Crater_Slope_90m = {
   Identifier = "MSGR_Degas_Crater_Slope_90m",
   Name = [[MSGR MDIS Slope, Degas Crater]],
   FilePath = asset.resource("MSGR_MDIS_Slope/Degas_Crater.vrt"),
+  ZIndex = 50,
   Description = [[This is a slope product of the digital elevation model (DEM) for the Degas Crater region on Mercury. This data product class of this data is observational and has been constructed to examine the topographic settings of landforms around Mercury's hollows. Observations of topography, specifically the relationships of hollows to their surroundings, can be used to investigate hollow formation. This DEM has been derived from Mercury Dual Imaging System (MDIS) data and has been generated at a resolution of 90m/pixel. The DEM has been aligned and controlled to Mercury Laser Altimeter (MLA) individual elevation points. Vertical offsets in this DEM have been roughly corrected relative to the USGS's 665m Global DEM of Mercury. DEM elevation values are in meters and referred to a radius of 2440000m. Slope values are in degrees with a minimum value of 0 and a maximum value of 53.812.]]
 }
 
@@ -38,6 +42,7 @@ local treks_MSGR_Kertesz_Crater_Slope_100m = {
   Identifier = "MSGR_Kertesz_Crater_Slope_100m",
   Name = [[MSGR MDIS Slope, Kertesz Crater]],
   FilePath = asset.resource("MSGR_MDIS_Slope/Kertesz_Crater.vrt"),
+  ZIndex = 50,
   Description = [[This is a slope product of the digital elevation model (DEM) for the Kertesz Crater region on Mercury. This data product class of this data is observational and has been constructed to examine the topographic settings of landforms around Mercury's hollows. Observations of topography, specifically the relationships of hollows to their surroundings, can be used to investigate hollow formation. This DEM has been derived from Mercury Dual Imaging System (MDIS) data and has been generated at a resolution of 100m/pixel. The DEM has been aligned and controlled to Mercury Laser Altimeter (MLA) individual elevation points. Vertical offsets in this DEM have been roughly corrected relative to the USGS's 665m Global DEM of Mercury. DEM elevation values are in meters and referred to a radius of 2440000m. Slope values are in degrees with a minimum value of 0 and a maximum value of 51.033.]]
 }
 
@@ -45,6 +50,7 @@ local treks_MSGR_nw_Degas_Crater_Slope_80m = {
   Identifier = "MSGR_nw_Degas_Crater_Slope_80m",
   Name = [[MSGR MDIS Slope, North-West of Degas Crater]],
   FilePath = asset.resource("MSGR_MDIS_Slope/North-West_of_Degas_Crater.vrt"),
+  ZIndex = 50,
   Description = [[This is a slope product of the digital elevation model (DEM) for the northwest region of Degas Crater on Mercury. This data product class of this data is observational and has been constructed to examine the topographic settings of landforms around Mercury's hollows. Observations of topography, specifically the relationships of hollows to their surroundings, can be used to investigate hollow formation. This DEM has been derived from Mercury Dual Imaging System (MDIS) data and has been generated at a resolution of 80m/pixel. The DEM has been aligned and controlled to Mercury Laser Altimeter (MLA) individual elevation points. Vertical offsets in this DEM have been roughly corrected relative to the USGS's 665m Global DEM of Mercury. DEM elevation values are in meters and referred to a radius of 2440000m. Slope values are in degrees with a minimum value of 0 and a maximum value of 42.616.]]
 }
 
@@ -52,6 +58,7 @@ local treks_MSGR_Praxiteles_Peak_Ring_Slope_60m = {
   Identifier = "MSGR_Praxiteles_Peak_Ring_Slope_60m",
   Name = [[MSGR MDIS Slope, Praxiteles Peak Ring]],
   FilePath = asset.resource("MSGR_MDIS_Slope/Praxiteles_Peak_Ring.vrt"),
+  ZIndex = 50,
   Description = [[This is a colorized slope product of the digital elevation model (DEM) for the Praxiteles Peak Ring region on Mercury. This data product class of this data is observational and has been constructed to examine the topographic settings of landforms around Mercury's hollows. Observations of topography, specifically the relationships of hollows to their surroundings, can be used to investigate hollow formation. This DEM has been derived from Mercury Dual Imaging System (MDIS) data and has been generated at a resolution of 60m/pixel. The DEM has been aligned and controlled to Mercury Laser Altimeter (MLA) individual elevation points. Vertical offsets in this DEM have been roughly corrected relative to the USGS's 665m Global DEM of Mercury. DEM elevation values are in meters and referred to a radius of 2440000m. Slope values are in degrees with a minimum value of 0 and a maximum value of 46.484.]]
 }
 
@@ -59,6 +66,7 @@ local treks_MSGR_Raditladi_Crater_Slope_120m = {
   Identifier = "MSGR_Raditladi_Crater_Slope_120m",
   Name = [[MSGR MDIS Slope, Raditladi Crater]],
   FilePath = asset.resource("MSGR_MDIS_Slope/Raditladi_Crater.vrt"),
+  ZIndex = 50,
   Description = [[This is a slope product of the digital elevation model (DEM) for the Raditladi Crater region on Mercury. This data product class of this data is observational and has been constructed to examine the topographic settings of landforms around Mercury's hollows. Observations of topography, specifically the relationships of hollows to their surroundings, can be used to investigate hollow formation. This DEM has been derived from Mercury Dual Imaging System (MDIS) data and has been generated at a resolution of 120m/pixel. The DEM has been aligned and controlled to Mercury Laser Altimeter (MLA) individual elevation points. Vertical offsets in this DEM have been roughly corrected relative to the USGS's 665m Global DEM of Mercury. DEM elevation values are in meters and referred to a radius of 2440000m. Slope values are in degrees with a minimum value of 0 and a maximum value of 39.538.]]
 }
 
@@ -66,6 +74,7 @@ local treks_MSGR_Sander_Crater_Slope_80m = {
   Identifier = "MSGR_Sander_Crater_Slope_80m",
   Name = [[MSGR MDIS Slope, Sander Crater]],
   FilePath = asset.resource("MSGR_MDIS_Slope/Sander_Crater.vrt"),
+  ZIndex = 50,
   Description = [[This is a slope product of the digital elevation model (DEM) for the Sander Crater region on Mercury. This data product class of this data is observational and has been constructed to examine the topographic settings of landforms around Mercury's hollows. Observations of topography, specifically the relationships of hollows to their surroundings, can be used to investigate hollow formation. This DEM has been derived from Mercury Dual Imaging System (MDIS) data and has been generated at a resolution of 80m/pixel. The DEM has been aligned and controlled to Mercury Laser Altimeter (MLA) individual elevation points. Vertical offsets in this DEM have been roughly corrected relative to the USGS's 665m Global DEM of Mercury. DEM elevation values are in meters and referred to a radius of 2440000m. Slope values are in degrees with a minimum value of 0 and a maximum value of 41.517.]]
 }
 
@@ -73,6 +82,7 @@ local treks_MSGR_Sholem_Aleichem_Crater_Wall_Slope_25m = {
   Identifier = "MSGR_Sholem_Aleichem_Crater_Wall_Slope_25m",
   Name = [[MSGR MDIS Slope, Sholem Aleichem Crater Wall]],
   FilePath = asset.resource("MSGR_MDIS_Slope/Sholem_Aleichem_Crater_Wall.vrt"),
+  ZIndex = 50,
   Description = [[This is a colorized slope product of the digital elevation model (DEM) for the Sholem Aleichem Crater Wall region on Mercury. This data product class of this data is observational and has been constructed to examine the topographic settings of landforms around Mercury's hollows. Observations of topography, specifically the relationships of hollows to their surroundings, can be used to investigate hollow formation. This DEM has been derived from Mercury Dual Imaging System (MDIS) data and has been generated at a resolution of 25m/pixel. The DEM has been aligned and controlled to Mercury Laser Altimeter (MLA) individual elevation points. Vertical offsets in this DEM have been roughly corrected relative to the USGS's 665m Global DEM of Mercury. DEM elevation values are in meters and referred to a radius of 2440000m. Slope values are in degrees with a minimum value of 0 and a maximum value of 40.746.]]
 }
 
diff --git a/data/assets/scene/solarsystem/planets/neptune/layers/colorlayers/neptune_texture.asset b/data/assets/scene/solarsystem/planets/neptune/layers/colorlayers/neptune_texture.asset
index 428d3bae4b..ada81de638 100644
--- a/data/assets/scene/solarsystem/planets/neptune/layers/colorlayers/neptune_texture.asset
+++ b/data/assets/scene/solarsystem/planets/neptune/layers/colorlayers/neptune_texture.asset
@@ -14,6 +14,7 @@ local Layer = {
   Identifier = "Texture",
   FilePath = texturesPath .. "neptune.jpg",
   Enabled = asset.enabled,
+  ZIndex = 5,
   CacheSettings = { Enabled = false }
 }
 
diff --git a/data/assets/scene/solarsystem/planets/neptune/triton/layers/colorlayers/triton_voyager2_clrmosaic_globalfill_600m.asset b/data/assets/scene/solarsystem/planets/neptune/triton/layers/colorlayers/triton_voyager2_clrmosaic_globalfill_600m.asset
index 34b6996f44..28bcb45a12 100644
--- a/data/assets/scene/solarsystem/planets/neptune/triton/layers/colorlayers/triton_voyager2_clrmosaic_globalfill_600m.asset
+++ b/data/assets/scene/solarsystem/planets/neptune/triton/layers/colorlayers/triton_voyager2_clrmosaic_globalfill_600m.asset
@@ -14,6 +14,7 @@ local Layer = {
   Identifier = "Triton_Voyager2_ClrMosaic_GlobalFill_600m",
   Name = "Triton Voyager2 Mosaic [local]",
   Enabled = asset.enabled,
+  ZIndex = 5,
   FilePath = texturesPath .. "Triton_Voyager2_ClrMosaic_GlobalFill_600m.png",
   Description = [[Voyager 2 data was used to construct the best-ever global color map of Triton.
     This map has a resolution of 1,970 feet (600 meters per pixel [m]). Color was synthesized by
diff --git a/data/assets/scene/solarsystem/planets/saturn/dione/layers/colorlayers/dione_texture.asset b/data/assets/scene/solarsystem/planets/saturn/dione/layers/colorlayers/dione_texture.asset
index 7d5fdb4020..a6740826bf 100644
--- a/data/assets/scene/solarsystem/planets/saturn/dione/layers/colorlayers/dione_texture.asset
+++ b/data/assets/scene/solarsystem/planets/saturn/dione/layers/colorlayers/dione_texture.asset
@@ -14,6 +14,7 @@ local Layer = {
   Identifier = "Texture",
   FilePath = texturesPath .. "dione.jpg",
   Enabled = asset.enabled,
+  ZIndex = 5,
   CacheSettings = { Enabled = false }
 }
 
diff --git a/data/assets/scene/solarsystem/planets/saturn/enceladus/layers/colorlayers/enceladus_texture.asset b/data/assets/scene/solarsystem/planets/saturn/enceladus/layers/colorlayers/enceladus_texture.asset
index e14e4cf7c4..73e5e3ecd8 100644
--- a/data/assets/scene/solarsystem/planets/saturn/enceladus/layers/colorlayers/enceladus_texture.asset
+++ b/data/assets/scene/solarsystem/planets/saturn/enceladus/layers/colorlayers/enceladus_texture.asset
@@ -14,6 +14,7 @@ local Layer = {
   Identifier = "Texture",
   FilePath = texturesPath .. "enceladus.jpg",
   Enabled = asset.enabled,
+  ZIndex = 5,
   CacheSettings = { Enabled = false }
 }
 
diff --git a/data/assets/scene/solarsystem/planets/saturn/enceladus/layers/colorlayers/global_mosaic_100m_hpf_newyork.asset b/data/assets/scene/solarsystem/planets/saturn/enceladus/layers/colorlayers/global_mosaic_100m_hpf_newyork.asset
index 2591573846..5e7cefdd0f 100644
--- a/data/assets/scene/solarsystem/planets/saturn/enceladus/layers/colorlayers/global_mosaic_100m_hpf_newyork.asset
+++ b/data/assets/scene/solarsystem/planets/saturn/enceladus/layers/colorlayers/global_mosaic_100m_hpf_newyork.asset
@@ -6,6 +6,7 @@ local Layer = {
   Identifier = "Global_Mosaic_100m_HPF_NewYork",
   Name = "Cassini Global Mosaic 100m HPF [New York]",
   Enabled = asset.enabled,
+  ZIndex = 10,
   FilePath = asset.resource("global_mosaic_100m_hpf_newyork.wms"),
   Description = [[This mosaic represents the completion of a global control network of
     Enceladus containing Cassini Imaging Science Subsystem (ISS) images. A total of
diff --git a/data/assets/scene/solarsystem/planets/saturn/enceladus/layers/colorlayers/global_mosaic_100m_hpf_sweden.asset b/data/assets/scene/solarsystem/planets/saturn/enceladus/layers/colorlayers/global_mosaic_100m_hpf_sweden.asset
index e3fc211cc3..1bb97f16cd 100644
--- a/data/assets/scene/solarsystem/planets/saturn/enceladus/layers/colorlayers/global_mosaic_100m_hpf_sweden.asset
+++ b/data/assets/scene/solarsystem/planets/saturn/enceladus/layers/colorlayers/global_mosaic_100m_hpf_sweden.asset
@@ -6,6 +6,7 @@ local Layer = {
   Identifier = "Global_Mosaic_100m_HPF_Sweden",
   Name = "Cassini Global Mosaic 100m HPF [Sweden]",
   Enabled = asset.enabled,
+  ZIndex = 10,
   FilePath = asset.resource("global_mosaic_100m_hpf_sweden.wms"),
   Description = [[This mosaic represents the completion of a global control network of
     Enceladus containing Cassini Imaging Science Subsystem (ISS) images. A total of
diff --git a/data/assets/scene/solarsystem/planets/saturn/iapetus/layers/colorlayers/iapetus_texture.asset b/data/assets/scene/solarsystem/planets/saturn/iapetus/layers/colorlayers/iapetus_texture.asset
index 9a228ca1c2..e6ca952336 100644
--- a/data/assets/scene/solarsystem/planets/saturn/iapetus/layers/colorlayers/iapetus_texture.asset
+++ b/data/assets/scene/solarsystem/planets/saturn/iapetus/layers/colorlayers/iapetus_texture.asset
@@ -14,6 +14,7 @@ local layer = {
   Identifier = "Texture",
   FilePath = texturesPath .. "iapetus.jpg",
   Enabled = asset.enabled,
+  ZIndex = 5,
   CacheSettings = { Enabled = false }
 }
 
diff --git a/data/assets/scene/solarsystem/planets/saturn/layers/colorlayers/saturn_texture.asset b/data/assets/scene/solarsystem/planets/saturn/layers/colorlayers/saturn_texture.asset
index fd266c5ff1..a66453d555 100644
--- a/data/assets/scene/solarsystem/planets/saturn/layers/colorlayers/saturn_texture.asset
+++ b/data/assets/scene/solarsystem/planets/saturn/layers/colorlayers/saturn_texture.asset
@@ -14,6 +14,7 @@ local Layer = {
   Identifier = "Texture",
   FilePath = texturesPath .. "saturn.jpg",
   Enabled = asset.enabled,
+  ZIndex = 5,
   CacheSettings = { Enabled = false }
 }
 
diff --git a/data/assets/scene/solarsystem/planets/saturn/mimas/layers/colorlayers/mimas_texture.asset b/data/assets/scene/solarsystem/planets/saturn/mimas/layers/colorlayers/mimas_texture.asset
index 5de7b88fe3..ee739c3d4b 100644
--- a/data/assets/scene/solarsystem/planets/saturn/mimas/layers/colorlayers/mimas_texture.asset
+++ b/data/assets/scene/solarsystem/planets/saturn/mimas/layers/colorlayers/mimas_texture.asset
@@ -14,6 +14,7 @@ local Layer = {
   Identifier = "Texture",
   FilePath = texturesPath .. "mimas.jpg",
   Enabled = asset.enabled,
+  ZIndex = 5,
   CacheSettings = { Enabled = false }
 }
 
diff --git a/data/assets/scene/solarsystem/planets/saturn/rhea/layers/colorlayers/rhea_texture.asset b/data/assets/scene/solarsystem/planets/saturn/rhea/layers/colorlayers/rhea_texture.asset
index 5c27a33a62..ee8dcd149c 100644
--- a/data/assets/scene/solarsystem/planets/saturn/rhea/layers/colorlayers/rhea_texture.asset
+++ b/data/assets/scene/solarsystem/planets/saturn/rhea/layers/colorlayers/rhea_texture.asset
@@ -14,6 +14,7 @@ local Layer = {
   Identifier = "Texture",
   FilePath = texturesPath .. "rhea.jpg",
   Enabled = asset.enabled,
+  ZIndex = 5,
   CacheSettings = { Enabled = false }
 }
 
diff --git a/data/assets/scene/solarsystem/planets/saturn/tethys/layers/colorlayers/tethys_texture.asset b/data/assets/scene/solarsystem/planets/saturn/tethys/layers/colorlayers/tethys_texture.asset
index ceecd82b78..d1b857cd2b 100644
--- a/data/assets/scene/solarsystem/planets/saturn/tethys/layers/colorlayers/tethys_texture.asset
+++ b/data/assets/scene/solarsystem/planets/saturn/tethys/layers/colorlayers/tethys_texture.asset
@@ -14,6 +14,7 @@ local Layer = {
   Identifier = "Texture",
   FilePath = texturesPath .. "tethys.jpg",
   Enabled = asset.enabled,
+  ZIndex = 5,
   CacheSettings = { Enabled = false }
 }
 
diff --git a/data/assets/scene/solarsystem/planets/saturn/titan/layers/colorlayers/cassini_iss_global_mosaic_4km_local.asset b/data/assets/scene/solarsystem/planets/saturn/titan/layers/colorlayers/cassini_iss_global_mosaic_4km_local.asset
index 06cbdfaccb..02d476be05 100644
--- a/data/assets/scene/solarsystem/planets/saturn/titan/layers/colorlayers/cassini_iss_global_mosaic_4km_local.asset
+++ b/data/assets/scene/solarsystem/planets/saturn/titan/layers/colorlayers/cassini_iss_global_mosaic_4km_local.asset
@@ -14,6 +14,7 @@ local Layer = {
   Identifier = "Cassini_ISS_Global_Mosaic_4km_Local",
   Name = "Cassini ISS Global Mosaic 4km",
   Enabled = asset.enabled,
+  ZIndex = 10,
   FilePath = texturesPath .. "Titan_ISS_P19658_Mosaic_Global_4km_os.tif",
   Description = [[This global digital map of Saturn's moon Titan was created using
     images taken by the Cassini spacecraft's Imaging Science Subsystem (ISS). The map
diff --git a/data/assets/scene/solarsystem/planets/saturn/titan/layers/colorlayers/cassini_iss_global_mosaic_4km_newyork.asset b/data/assets/scene/solarsystem/planets/saturn/titan/layers/colorlayers/cassini_iss_global_mosaic_4km_newyork.asset
index aba41f9d82..6d0d4e96b2 100644
--- a/data/assets/scene/solarsystem/planets/saturn/titan/layers/colorlayers/cassini_iss_global_mosaic_4km_newyork.asset
+++ b/data/assets/scene/solarsystem/planets/saturn/titan/layers/colorlayers/cassini_iss_global_mosaic_4km_newyork.asset
@@ -6,6 +6,7 @@ local Layer = {
   Identifier = "Cassini_ISS_Global_Mosaic_4km_NewYork",
   Name = "Cassini ISS Global Mosaic [New York]",
   Enabled = asset.enabled,
+  ZIndex = 10,
   FilePath = asset.resource("cassini_iss_global_mosaic_4km_newyork.wms"),
   Description = [[This global digital map of Saturn's moon Titan was created using
     images taken by the Cassini spacecraft's Imaging Science Subsystem (ISS). The map
diff --git a/data/assets/scene/solarsystem/planets/saturn/titan/layers/colorlayers/cassini_iss_global_mosaic_4km_sweden.asset b/data/assets/scene/solarsystem/planets/saturn/titan/layers/colorlayers/cassini_iss_global_mosaic_4km_sweden.asset
index 0e658e9e61..c3a4e19462 100644
--- a/data/assets/scene/solarsystem/planets/saturn/titan/layers/colorlayers/cassini_iss_global_mosaic_4km_sweden.asset
+++ b/data/assets/scene/solarsystem/planets/saturn/titan/layers/colorlayers/cassini_iss_global_mosaic_4km_sweden.asset
@@ -6,6 +6,7 @@ local Layer = {
   Identifier = "Cassini_ISS_Global_Mosaic_4km_LiU",
   Name = "Cassini ISS Global Mosaic [Sweden]",
   Enabled = asset.enabled,
+  ZIndex = 10,
   FilePath = asset.resource("cassini_iss_global_mosaic_4km_sweden.wms"),
   Description = [[This global digital map of Saturn's moon Titan was created using
     images taken by the Cassini spacecraft's Imaging Science Subsystem (ISS). The map
diff --git a/data/assets/scene/solarsystem/planets/uranus/layers/colorlayers/uranus_texture.asset b/data/assets/scene/solarsystem/planets/uranus/layers/colorlayers/uranus_texture.asset
index a351c817a9..5741f0ef82 100644
--- a/data/assets/scene/solarsystem/planets/uranus/layers/colorlayers/uranus_texture.asset
+++ b/data/assets/scene/solarsystem/planets/uranus/layers/colorlayers/uranus_texture.asset
@@ -14,6 +14,7 @@ local Layer = {
   Identifier = "Texture",
   FilePath = texturesPath .. "uranus.jpg",
   Enabled = asset.enabled,
+  ZIndex = 5,
   CacheSettings = { Enabled = false }
 }
 
diff --git a/data/assets/scene/solarsystem/planets/venus/layers/colorlayers/clouds_magellan_combo_newyork.asset b/data/assets/scene/solarsystem/planets/venus/layers/colorlayers/clouds_magellan_combo_newyork.asset
index 79c648a45d..09fee19707 100644
--- a/data/assets/scene/solarsystem/planets/venus/layers/colorlayers/clouds_magellan_combo_newyork.asset
+++ b/data/assets/scene/solarsystem/planets/venus/layers/colorlayers/clouds_magellan_combo_newyork.asset
@@ -14,6 +14,7 @@ local Layer = {
   Identifier = "Clouds_Magellan_Combo_NewYork",
   Name = "Clouds Magellan Combo [New York]",
   Enabled = asset.enabled,
+  ZIndex = 20,
   Type = "TileProviderByLevel",
   LevelTileProviders = {
     {
diff --git a/data/assets/scene/solarsystem/planets/venus/layers/colorlayers/clouds_magellan_combo_utah.asset b/data/assets/scene/solarsystem/planets/venus/layers/colorlayers/clouds_magellan_combo_utah.asset
index f2b4efdc1b..cf16f08f58 100644
--- a/data/assets/scene/solarsystem/planets/venus/layers/colorlayers/clouds_magellan_combo_utah.asset
+++ b/data/assets/scene/solarsystem/planets/venus/layers/colorlayers/clouds_magellan_combo_utah.asset
@@ -14,6 +14,7 @@ local Layer = {
   Identifier = "Clouds_Magellan_Combo_Utah",
   Name = "Clouds Magellan Combo [Utah]",
   Enabled = asset.enabled,
+  ZIndex = 20,
   Type = "TileProviderByLevel",
   LevelTileProviders = {
     {
diff --git a/data/assets/scene/solarsystem/planets/venus/layers/colorlayers/magellan_mosaic_newyork.asset b/data/assets/scene/solarsystem/planets/venus/layers/colorlayers/magellan_mosaic_newyork.asset
index 8c01b2e223..a146e802c1 100644
--- a/data/assets/scene/solarsystem/planets/venus/layers/colorlayers/magellan_mosaic_newyork.asset
+++ b/data/assets/scene/solarsystem/planets/venus/layers/colorlayers/magellan_mosaic_newyork.asset
@@ -6,6 +6,7 @@ local Layer = {
   Identifier = "Magellan_Mosaic_NewYork",
   Name = "Magellan Mosaic [New York]",
   Enabled = asset.enabled,
+  ZIndex = 10,
   FilePath = asset.resource("magellan_mosaic_newyork.vrt"),
   BlendMode = "Color",
   Settings = { Gamma = 2.0 },
diff --git a/data/assets/scene/solarsystem/planets/venus/layers/colorlayers/magellan_mosaic_utah.asset b/data/assets/scene/solarsystem/planets/venus/layers/colorlayers/magellan_mosaic_utah.asset
index bb0655c803..e9d5ec3a15 100644
--- a/data/assets/scene/solarsystem/planets/venus/layers/colorlayers/magellan_mosaic_utah.asset
+++ b/data/assets/scene/solarsystem/planets/venus/layers/colorlayers/magellan_mosaic_utah.asset
@@ -6,6 +6,7 @@ local Layer = {
   Identifier = "Magellan_Mosaic_Utah",
   Name = "Magellan Mosaic [Utah]",
   Enabled = asset.enabled,
+  ZIndex = 10,
   FilePath = asset.resource("magellan_mosaic_utah.vrt"),
   BlendMode = "Color",
   Settings = { Gamma = 2.0 },
diff --git a/data/assets/scene/solarsystem/planets/venus/layers/colorlayers/venus_texture.asset b/data/assets/scene/solarsystem/planets/venus/layers/colorlayers/venus_texture.asset
index 2343b4ca84..a4b924bfc8 100644
--- a/data/assets/scene/solarsystem/planets/venus/layers/colorlayers/venus_texture.asset
+++ b/data/assets/scene/solarsystem/planets/venus/layers/colorlayers/venus_texture.asset
@@ -14,6 +14,7 @@ local Clouds = {
   Identifier = "Clouds",
   FilePath = texturesPath .. "venus_clouds.jpg",
   Enabled = asset.enabled,
+  ZIndex = 20,
   CacheSettings = { Enabled = false }
 }
 
@@ -21,6 +22,7 @@ local Layer = {
   Identifier = "Texture",
   FilePath = texturesPath .. "venus.jpg",
   Enabled = asset.enabled,
+  ZIndex = 5,
   Settings = {
     Opacity = 0.48,
     Gamma = 0.48
diff --git a/data/assets/scene/solarsystem/planets/venus/layers/heightlayers/magellan_newyork.asset b/data/assets/scene/solarsystem/planets/venus/layers/heightlayers/magellan_newyork.asset
index a783800fbc..ad6b6f23e3 100644
--- a/data/assets/scene/solarsystem/planets/venus/layers/heightlayers/magellan_newyork.asset
+++ b/data/assets/scene/solarsystem/planets/venus/layers/heightlayers/magellan_newyork.asset
@@ -6,6 +6,7 @@ local Layer = {
   Identifier = "MagellanElevation_NewYork",
   Name = "Magellan Elevation [New York]",
   Enabled = asset.enabled,
+  ZIndex = 10,
   FilePath = asset.resource("magellan_newyork.wms"),
   TilePixelSize = 129,
   Settings = {
diff --git a/data/assets/scene/solarsystem/planets/venus/layers/heightlayers/magellan_utah.asset b/data/assets/scene/solarsystem/planets/venus/layers/heightlayers/magellan_utah.asset
index 54a22bf790..bcfccb5823 100644
--- a/data/assets/scene/solarsystem/planets/venus/layers/heightlayers/magellan_utah.asset
+++ b/data/assets/scene/solarsystem/planets/venus/layers/heightlayers/magellan_utah.asset
@@ -6,6 +6,7 @@ local Layer = {
   Identifier = "MagellanElevation_Utah",
   Name = "Magellan Elevation [Utah]",
   Enabled = asset.enabled,
+  ZIndex = 10,
   FilePath = asset.resource("magellan_utah.wms"),
   TilePixelSize = 129,
   Settings = {
diff --git a/data/assets/scene/solarsystem/sun/layers/colorlayers/sun_texture.asset b/data/assets/scene/solarsystem/sun/layers/colorlayers/sun_texture.asset
index c53274744c..c622e17b6f 100644
--- a/data/assets/scene/solarsystem/sun/layers/colorlayers/sun_texture.asset
+++ b/data/assets/scene/solarsystem/sun/layers/colorlayers/sun_texture.asset
@@ -14,6 +14,7 @@ local Layer = {
   Identifier = "Texture",
   FilePath = texturesPath .. "sun.jpg",
   Enabled = asset.enabled,
+  ZIndex = 5,
   CacheSettings = { Enabled = false }
 }
 
diff --git a/modules/globebrowsing/scripts/layer_support.lua b/modules/globebrowsing/scripts/layer_support.lua
index 1e3eb45961..8ab40ce6ee 100644
--- a/modules/globebrowsing/scripts/layer_support.lua
+++ b/modules/globebrowsing/scripts/layer_support.lua
@@ -200,6 +200,7 @@ openspace.globebrowsing.parseInfoFile = function (file)
     declare("ColorFile")
     declare("HeightFile")
     declare("Location")
+    declare("ZIndex")
 
     local dir = openspace.directoryForPath(file)
     local file_func, error = loadfile(file)
@@ -217,12 +218,14 @@ openspace.globebrowsing.parseInfoFile = function (file)
     local ColorFile = rawget(_G, "ColorFile")
     local HeightFile = rawget(_G, "HeightFile")
     local Location = rawget(_G, "Location")
+    local ZIndex = rawget(_G, "ZIndex")
 
     -- Now we can start
     local name = Name or Identifier
     local identifier = Identifier
+    local zIndex = ZIndex
 
-    if identifier == "" then
+    if identifier == nil then
         openspace.printError('Error loading file "' .. file .. '": No "Identifier" found')
         return nil
     end
@@ -234,7 +237,8 @@ openspace.globebrowsing.parseInfoFile = function (file)
             Name = name,
             Description = Description or "",
             FilePath = dir .. '/' .. ColorFile,
-            BlendMode = "Color"
+            BlendMode = "Color",
+            ZIndex = zIndex
         }
     end
 
@@ -245,7 +249,8 @@ openspace.globebrowsing.parseInfoFile = function (file)
             Name = name,
             Description = Description or "",
             FilePath = dir .. '/' .. HeightFile,
-            TilePixelSize = 65
+            TilePixelSize = 65,
+            ZIndex = zIndex
         }
     end
 
diff --git a/modules/globebrowsing/src/layer.cpp b/modules/globebrowsing/src/layer.cpp
index 762c89e8fd..cd73fa70e3 100644
--- a/modules/globebrowsing/src/layer.cpp
+++ b/modules/globebrowsing/src/layer.cpp
@@ -93,6 +93,15 @@ namespace {
         openspace::properties::Property::Visibility::User
     };
 
+    constexpr openspace::properties::Property::PropertyInfo ZIndexInfo = {
+        "ZIndex",
+        "Z-Index",
+        "Determines where the layer is placed in the list of available layers. Layers "
+        "are applied in the order of their Z indices, with higher indices obscuring "
+        "layers with lower values.",
+        openspace::properties::Property::Visibility::AdvancedUser
+    };
+
     constexpr openspace::properties::Property::PropertyInfo GuiDescriptionInfo = {
         "GuiDescription",
         "Gui Description",
@@ -128,6 +137,9 @@ namespace {
         // the layer is disabled
         std::optional<bool> enabled;
 
+        // [[codegen::verbatim(ZIndexInfo.description)]]
+        std::optional<int> zIndex [[codegen::greater(0)]];
+
         // The opacity value of the layer
         std::optional<float> opacity [[codegen::inrange(0.0, 1.0)]];
 
@@ -210,6 +222,32 @@ Layer::Layer(layers::Group::ID id, const ghoul::Dictionary& layerDict, LayerGrou
 
     _enabled = p.enabled.value_or(_enabled);
 
+    _hasManualZIndex = p.zIndex.has_value();
+    if (_hasManualZIndex) {
+        _zIndex = p.zIndex.value_or(_zIndex);
+    }
+    else {
+        const std::vector<Layer*> siblings = _parent.layers();
+        if (siblings.empty()) {
+            // If this layer is the first to be added, the index becomes 1
+            _zIndex = 1;
+        }
+        else {
+            // Find the previous layer in the layer group that this is part of
+            Layer* prevLayer = siblings.back();
+
+            if (!prevLayer->_hasManualZIndex) {
+                // If the layer before does not have a given z-index, then set this
+                // layer's value to the same index
+                _zIndex = prevLayer->_zIndex;
+            }
+            else {
+                // Take the previous layer's z index and add 1 to get this layer's value
+                _zIndex = prevLayer->_zIndex + 1;
+            }
+        }
+    }
+
     if (p.description.has_value()) {
         _guiDescription = description();
         addProperty(_guiDescription);
@@ -410,6 +448,14 @@ void Layer::setEnabled(bool enabled) {
     _enabled = enabled;
 }
 
+// @NOTE (malej, 2024-05-08): This function does not automatically re-sort any layer list
+// depending on the new z-index, it is up to the caller to make sure the re-sort happen
+// when it is needed
+void Layer::setZIndex(unsigned int value) {
+    _zIndex = value;
+    _hasManualZIndex = true;
+}
+
 bool Layer::enabled() const {
     return _enabled;
 }
@@ -434,6 +480,10 @@ const LayerAdjustment& Layer::layerAdjustment() const {
     return _layerAdjustment;
 }
 
+unsigned int Layer::zIndex() const {
+    return _zIndex;
+}
+
 void Layer::onChange(std::function<void(Layer*)> callback) {
     _onChangeCallback = std::move(callback);
 }
diff --git a/modules/globebrowsing/src/layer.h b/modules/globebrowsing/src/layer.h
index d17a1793e9..ebe1a0d382 100644
--- a/modules/globebrowsing/src/layer.h
+++ b/modules/globebrowsing/src/layer.h
@@ -64,6 +64,9 @@ public:
     const LayerRenderSettings& renderSettings() const;
     const LayerAdjustment& layerAdjustment() const;
 
+    void setZIndex(unsigned int value);
+    unsigned int zIndex() const;
+
     void onChange(std::function<void(Layer*)> callback);
 
     void update();
@@ -96,6 +99,9 @@ private:
 
     std::function<void(Layer*)> _onChangeCallback;
     bool _isInitialized = false;
+
+    unsigned int _zIndex = 0;
+    bool _hasManualZIndex = false;
   };
 
 } // namespace openspace::globebrowsing
diff --git a/modules/globebrowsing/src/layergroup.cpp b/modules/globebrowsing/src/layergroup.cpp
index 5af6d4d91c..09dc6b838d 100644
--- a/modules/globebrowsing/src/layergroup.cpp
+++ b/modules/globebrowsing/src/layergroup.cpp
@@ -125,11 +125,39 @@ Layer* LayerGroup::addLayer(const ghoul::Dictionary& layerDict) {
     layer->onChange(_onChangeCallback);
     Layer* ptr = layer.get();
     _layers.push_back(std::move(layer));
+
+    // Re-sort the layer list according to the z-index. Using the stable_sort here is
+    // important as we need to keep the same order as it already exists _within_ each
+    // z-index grouping
+    std::stable_sort(
+        _layers.begin(),
+        _layers.end(),
+        [](const std::unique_ptr<Layer>& a, const std::unique_ptr<Layer>& b) {
+            return a->zIndex() < b->zIndex();
+        }
+    );
+
     update();
     if (_onChangeCallback) {
         _onChangeCallback(ptr);
     }
     addPropertySubOwner(ptr);
+
+    // Re-sort the SubPropertyOwner list according to the z-index so the list in the GUI
+    // is sorted correctly. Using the stable_sort here is important as we need to keep the
+    // same order as it already exists _within_ each z-index grouping
+    // @TODO (malej, 2024-05-07): Add event so the GUI can be aware that it needs to
+    // reload all or parts of itself. Right now it is up the caller to reload it if needed
+    auto compareZIndexSubOwners = [](const PropertyOwner* a, const PropertyOwner* b) {
+        const Layer* aLayer = dynamic_cast<const Layer*>(a);
+        const Layer* bLayer = dynamic_cast<const Layer*>(b);
+        ghoul_assert(aLayer, "a is not a layer");
+        ghoul_assert(bLayer, "b is not a layer");
+
+        return aLayer->zIndex() < bLayer->zIndex();
+    };
+    std::stable_sort(_subOwners.begin(), _subOwners.end(), compareZIndexSubOwners);
+
     _levelBlendingEnabled.setVisibility(properties::Property::Visibility::User);
 
     properties::PropertyOwner* layerGroup = ptr->owner();
@@ -201,18 +229,65 @@ void LayerGroup::deleteLayer(const std::string& layerName) {
 }
 
 void LayerGroup::moveLayer(int oldPosition, int newPosition) {
+    if (_layers.size() == 1) {
+        ghoul_assert(
+            oldPosition == newPosition,
+            "There is only one item but different positions"
+        );
+
+        // If there is only one item in the list, there is no need to move anything, but
+        // we still want to fix the layer index
+        _layers[oldPosition]->setZIndex(1);
+        return;
+    }
+
     oldPosition = std::max(0, oldPosition);
     newPosition = std::min(newPosition, static_cast<int>(_layers.size() - 1));
 
-    // There are two synchronous vectors that we have to update here.  The _layers vector
-    // is used to determine the order while rendering, the _subowners is the order in
+    // There are two synchronous vectors that we have to update here. The _layers vector
+    // is used to determine the order while rendering, the _subOwners is the order in
     // which the layers are shown in the UI
-    auto oldPosLayers = _layers.begin() + oldPosition;
-    std::unique_ptr<Layer> v = std::move(*oldPosLayers);
-    _layers.erase(oldPosLayers);
-    auto newPosLayers = _layers.begin() + newPosition;
-    _layers.insert(newPosLayers, std::move(v));
 
+    // Layer list
+    auto oldLayerPos = _layers.begin() + oldPosition;
+    std::unique_ptr<Layer> layer = std::move(*oldLayerPos);
+    _layers.erase(oldLayerPos);
+    auto newLayerPos = _layers.begin() + newPosition;
+
+    // There is a separate check at the top of the function to ensure that there is more
+    // than one item
+    ghoul_assert(!_layers.empty(), "The list should not be empty at this point");
+    if (newLayerPos == _layers.begin()) {
+        // If the layer is moved to the first spot in the list
+        Layer* nextLayer = (_layers.begin() + 1)->get();
+        layer->setZIndex(nextLayer->zIndex());
+    }
+    else if (newLayerPos == _layers.end()) {
+        // If the layer is moved to the last spot in the list, we use the previously last
+        // layer's z-index
+        unsigned int zIndex = _layers.back()->zIndex();
+        layer->setZIndex(zIndex);
+    }
+    else {
+        // If the layer is moved to somewhere in the middle, we use the z-index of the
+        // layer that is currently in that location
+        unsigned int zIndex = (*newLayerPos)->zIndex();
+        layer->setZIndex(zIndex);
+    }
+
+    _layers.insert(newLayerPos, std::move(layer));
+    ghoul_assert(
+        std::is_sorted(
+            _layers.begin(),
+            _layers.end(),
+            [](const std::unique_ptr<Layer>& a, const std::unique_ptr<Layer>& b) {
+                return a->zIndex() < b->zIndex();
+            }
+        ),
+        "Layer list is not sorted after move"
+    );
+
+    // SubOwners list
     auto oldPosOwner = _subOwners.begin() + oldPosition;
     PropertyOwner* owner = *oldPosOwner;
     _subOwners.erase(oldPosOwner);

From 51359f93ba8554d45d39fe29193eb9fd2befcdf8 Mon Sep 17 00:00:00 2001
From: Alexander Bock <mail@alexanderbock.eu>
Date: Tue, 4 Jun 2024 16:52:10 +0200
Subject: [PATCH 480/701] Fix erroneous change in the layer_support

---
 modules/globebrowsing/scripts/layer_support.lua | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/modules/globebrowsing/scripts/layer_support.lua b/modules/globebrowsing/scripts/layer_support.lua
index 8ab40ce6ee..b285c8d773 100644
--- a/modules/globebrowsing/scripts/layer_support.lua
+++ b/modules/globebrowsing/scripts/layer_support.lua
@@ -224,8 +224,11 @@ openspace.globebrowsing.parseInfoFile = function (file)
     local name = Name or Identifier
     local identifier = Identifier
     local zIndex = ZIndex
+    if zIndex == "" then
+        zIndex = nil
+    end
 
-    if identifier == nil then
+    if identifier == "" then
         openspace.printError('Error loading file "' .. file .. '": No "Identifier" found')
         return nil
     end

From 1f30719470c0a17e7f6246155cc2aca010af5ab7 Mon Sep 17 00:00:00 2001
From: Alexander Bock <mail@alexanderbock.eu>
Date: Tue, 4 Jun 2024 16:55:05 +0200
Subject: [PATCH 481/701] Add new NOAA21 asset, add end time for VIIRS asset
 and make the NOAA20 the new default layer

---
 .../planets/earth/layers/base_layers.asset    |  6 +-
 .../colorlayers/esri_noaa21_combo.asset       | 71 +++++++++++++++++++
 .../layers/colorlayers/esri_viirs_combo.asset |  2 +-
 .../colorlayers/viirs_snpp_temporal.asset     |  2 +-
 4 files changed, 76 insertions(+), 5 deletions(-)
 create mode 100644 data/assets/scene/solarsystem/planets/earth/layers/colorlayers/esri_noaa21_combo.asset

diff --git a/data/assets/scene/solarsystem/planets/earth/layers/base_layers.asset b/data/assets/scene/solarsystem/planets/earth/layers/base_layers.asset
index 741f6d1d23..b49486c2c4 100644
--- a/data/assets/scene/solarsystem/planets/earth/layers/base_layers.asset
+++ b/data/assets/scene/solarsystem/planets/earth/layers/base_layers.asset
@@ -1,8 +1,8 @@
 asset.require("./colorlayers/blue_marble", false)
-asset.require("./colorlayers/esri_viirs_combo", asset.enabled)
-asset.require("./colorlayers/esri_noaa20_combo", false)
+asset.require("./colorlayers/esri_viirs_combo", false)
+asset.require("./colorlayers/esri_noaa20_combo", asset.enabled)
 asset.require("./colorlayers/esri_world_imagery", false)
-asset.require("./colorlayers/viirs_snpp_temporal", false)
+asset.require("./colorlayers/viirs_noaa20_temporal", false)
 asset.require("./colorlayers/aqua_modis_temporal", false)
 asset.require("./colorlayers/terra_modis_temporal", false)
 asset.require("./colorlayers/amsr2_gcom_w1_sea_ice_concentration_temporal", false)
diff --git a/data/assets/scene/solarsystem/planets/earth/layers/colorlayers/esri_noaa21_combo.asset b/data/assets/scene/solarsystem/planets/earth/layers/colorlayers/esri_noaa21_combo.asset
new file mode 100644
index 0000000000..7fd56b1fbb
--- /dev/null
+++ b/data/assets/scene/solarsystem/planets/earth/layers/colorlayers/esri_noaa21_combo.asset
@@ -0,0 +1,71 @@
+local globe = asset.require("../../earth")
+
+
+
+local Layer = {
+  Identifier = "ESRI_NOAA21_Combo",
+  Name = "ESRI NOAA21 Combo",
+  Enabled = asset.enabled,
+  ZIndex = 30,
+  Type = "TileProviderByLevel",
+  LevelTileProviders = {
+    {
+      MaxLevel = 4,
+      TileProvider = {
+        Identifier = "Temporal_VIIRS_NOAA21",
+        Name = "Temporal VIIRS NOAA21",
+        Type = "TemporalTileProvider",
+        Mode = "Prototyped",
+        Prototyped = {
+          Time = {
+            Start = "2024-04-19",
+            End = "Today"
+          },
+          TemporalResolution = "1d",
+          TimeFormat = "YYYY-MM-DD",
+          Prototype = openspace.globebrowsing.createTemporalGibsGdalXml(
+            "VIIRS_NOAA21_CorrectedReflectance_TrueColor",
+            "250m",
+            "jpg"
+          )
+        },
+        PadTiles = false
+      }
+    },
+    {
+      MaxLevel = 22,
+      TileProvider = {
+        Identifier = "ESRI_World_Imagery",
+        Name = "ESRI World Imagery",
+        FilePath = asset.resource("esri_world_imagery.wms"),
+        PadTiles = false
+      }
+    }
+  },
+  PadTiles = false,
+  Description = [[Level based layer combining "NOAA20 SNPP (Temporal)" and ESRI World
+    Imagery. "NOAA20 SNPP (Temporal)" is faded out at tile level 4]]
+}
+
+
+asset.onInitialize(function()
+  openspace.globebrowsing.addLayer(globe.Earth.Identifier, "ColorLayers", Layer)
+end)
+
+asset.onDeinitialize(function()
+  openspace.globebrowsing.deleteLayer(globe.Earth.Identifier, "ColorLayers", Layer)
+end)
+
+asset.export("layer", Layer)
+
+
+
+asset.meta = {
+  Name = "ESRI NOAA20 VIIRS Combo",
+  Version = "1.0",
+  Description = [[Level based layer combining "NOAA20 SNPP (Temporal)" and ESRI World
+  Imagery. "NOAA20 SNPP (Temporal)" is faded out at tile level 4]],
+  Author = "OpenSpace Tem",
+  URL = "http://www.openspaceproject.com",
+  License = "MIT License"
+}
diff --git a/data/assets/scene/solarsystem/planets/earth/layers/colorlayers/esri_viirs_combo.asset b/data/assets/scene/solarsystem/planets/earth/layers/colorlayers/esri_viirs_combo.asset
index 61075677f5..b2474ab17f 100644
--- a/data/assets/scene/solarsystem/planets/earth/layers/colorlayers/esri_viirs_combo.asset
+++ b/data/assets/scene/solarsystem/planets/earth/layers/colorlayers/esri_viirs_combo.asset
@@ -19,7 +19,7 @@ local Layer = {
         Prototyped = {
           Time = {
             Start = "2015-11-24",
-            End = "Today"
+            End = "2024-05-27"
           },
           TemporalResolution = "1d",
           TimeFormat = "YYYY-MM-DD",
diff --git a/data/assets/scene/solarsystem/planets/earth/layers/colorlayers/viirs_snpp_temporal.asset b/data/assets/scene/solarsystem/planets/earth/layers/colorlayers/viirs_snpp_temporal.asset
index 49325042a5..2cd80b0669 100644
--- a/data/assets/scene/solarsystem/planets/earth/layers/colorlayers/viirs_snpp_temporal.asset
+++ b/data/assets/scene/solarsystem/planets/earth/layers/colorlayers/viirs_snpp_temporal.asset
@@ -12,7 +12,7 @@ local Layer = {
   Prototyped = {
     Time = {
       Start = "2015-11-24",
-      End = "Yesterday"
+      End = "2024-05-27"
     },
     TemporalResolution = "1d",
     TimeFormat = "YYYY-MM-DD",

From 1cae99ebfcd1df556b343d6030aa1468b2c3019d Mon Sep 17 00:00:00 2001
From: Ylva Selling <ylva.selling@gmail.com>
Date: Tue, 4 Jun 2024 18:32:41 +0200
Subject: [PATCH 482/701] Issue/2000 automatically update gui (#3289)

* Make it possible to query a propertyowner by uri with the getpropertytopic

* Remove automatic reloading of ui from drag and drop script

* Add function for uri for propertyowners

* Add uri to the to_json for the propertyowner

* Add comment for the propertyOwner function and update the comment for the property function to clearer distinguish between uris and identifiers

* Go back to the old events but with uris instead as their member

* Apply feedback from PR

* Address PR comments

---------

Co-authored-by: Ylva Selling <ylva.selling@liu.se>
---
 include/openspace/events/event.h              | 44 ++++-------
 include/openspace/properties/propertyowner.h  | 35 +++++++--
 include/openspace/query/query.h               |  1 +
 modules/globebrowsing/src/layergroup.cpp      | 17 +----
 modules/server/src/jsonconverters.cpp         |  3 +-
 .../server/src/topics/getpropertytopic.cpp    |  4 +
 scripts/drag_drop_handler.lua                 | 10 +--
 src/events/event.cpp                          | 74 +++++++------------
 src/properties/property.cpp                   | 10 +--
 src/properties/propertyowner.cpp              | 35 +++++++++
 src/query/query.cpp                           |  5 ++
 11 files changed, 128 insertions(+), 110 deletions(-)

diff --git a/include/openspace/events/event.h b/include/openspace/events/event.h
index 5faac274b1..533da66758 100644
--- a/include/openspace/events/event.h
+++ b/include/openspace/events/event.h
@@ -123,12 +123,12 @@ struct EventSceneGraphNodeAdded : public Event {
     /**
      * Creates an instance of an EventSceneGraphNodeAdded event.
      *
-     * \param node_ The identifier of the node that was added
+     * \param node_ A pointer to the node that was added
      *
      * \pre node_ must not be nullptr
      */
     explicit EventSceneGraphNodeAdded(const SceneGraphNode* node_);
-    const tstring node;
+    const tstring uri;
 };
 
 /**
@@ -141,12 +141,12 @@ struct EventSceneGraphNodeRemoved : public Event {
     /**
      * Creates an instance of an EventSceneGraphNodeRemoved event.
      *
-     * \param node_ The identifier of the node that was removed
+     * \param node_ A pointer to the node that was removed
      *
      * \pre node_ must not be nullptr
      */
     explicit EventSceneGraphNodeRemoved(const SceneGraphNode* node_);
-    const tstring node;
+    const tstring uri;
 };
 
 /**
@@ -225,7 +225,7 @@ struct EventScreenSpaceRenderableAdded : public Event {
      * \pre renderable_ must not be nullptr
      */
     explicit EventScreenSpaceRenderableAdded(const ScreenSpaceRenderable* renderable_);
-    const tstring renderable;
+    const tstring uri;
 };
 
 /**
@@ -240,9 +240,11 @@ struct EventScreenSpaceRenderableRemoved : public Event {
      * Creates an instance of an EventScreenSpaceRenderableRemoved event.
      *
      * \param renderable_ The the new screenspace renderable that was removed
+     *
+     * \pre renderable_ must not be nullptr
      */
     explicit EventScreenSpaceRenderableRemoved(const ScreenSpaceRenderable* renderable_);
-    const tstring renderable;
+    const tstring uri;
 };
 
 /**
@@ -397,20 +399,13 @@ struct EventLayerAdded : public Event {
     /**
      * Creates an instance of an EventLayerAdded event.
      *
-     * \param node_ The identifier of the globe to which the layer is added
-     * \param layerGroup_ The identifier of the layer group to which the layer is added
-     * \param layer_ The identifier of the layer that was added
+     * \param uri_ A string with the uri of the layer that was added
      *
-     * \pre node_ must not be empty
-     * \pre layerGroup_ must not be empty
-     * \pre layer_ must not be empty
+     * \pre uri_ must be a valid uri
      */
-    explicit EventLayerAdded(std::string_view node_, std::string_view layerGroup_,
-        std::string_view layer_);
+    explicit EventLayerAdded(std::string_view uri_);
 
-    const tstring node;
-    const tstring layerGroup;
-    const tstring layer;
+    const tstring uri;
 };
 
 /**
@@ -422,20 +417,13 @@ struct EventLayerRemoved : public Event {
     /**
      * Creates an instance of an EventLayerRemoved event.
      *
-     * \param node_ The identifier of the globe to which the layer is removed
-     * \param layerGroup_ The identifier of the layer group to which the layer is removed
-     * \param layer_ The identifier of the layer that was removed
+     * \param uri_ The uri of the layer that was removed
      *
-     * \pre node_ must not be empty
-     * \pre layerGroup_ must not be empty
-     * \pre layer_ must not be empty
+     * \pre uri_ must be a valid uri
      */
-    explicit EventLayerRemoved(std::string_view node_, std::string_view layerGroup_,
-        std::string_view layer_);
+    explicit EventLayerRemoved(std::string_view uri_);
 
-    const tstring node;
-    const tstring layerGroup;
-    const tstring layer;
+    const tstring uri;
 };
 
 /**
diff --git a/include/openspace/properties/propertyowner.h b/include/openspace/properties/propertyowner.h
index a9d8c089d7..16ec2057b6 100644
--- a/include/openspace/properties/propertyowner.h
+++ b/include/openspace/properties/propertyowner.h
@@ -140,18 +140,41 @@ public:
 
     /**
      * Retrieves a Property identified by \p uri from this PropertyOwner. If \p uri does
-     * not contain a `.` the identifier must refer to a Property directly owned by this
-     * PropertyOwner. If the identifier contains one or more `.`, the first part of the
-     * name will be recursively extracted and used as a name for a sub-owner and only the
-     * last part of the identifier is referring to a Property owned by PropertyOwner named
-     * by the second-but-last name.
+     * not contain a `.`  it is an identifier and must refer to a Property directly owned
+     * by this PropertyOwner. If the identifier contains one or more `.`, the first part
+     * of the name will be recursively extracted and used as a name for a sub-owner and
+     * only the last part of the identifier is referring to a Property owned by a
+     * PropertyOwner named by the second-but-last name.
      *
-     * \param uri The identifier of the Property that should be extracted
+     * \param uri The uri or identifier of the Property that should be extracted
      * \return If the Property cannot be found, `nullptr` is returned, otherwise the
      *         pointer to the Property is returned
      */
     Property* property(const std::string& uri) const;
 
+    /**
+     * Retrieves a PropertyOwner identified by \p uri from this PropertyOwner. If \p uri 
+     * does not contain a `.` it is an identifier and must refer to a PropertyOwner
+     * directly owned by this PropertyOwner. If the uri contains one or more `.`, the
+     * first part of the name will be recursively extracted and used as a name for a sub-
+     * owner and only the last part of the uri is referring to a PropertyOwner owned by a 
+     * PropertyOwner named by the second-but-last name.
+     *
+     * \param uri The uri or identifier of the PropertyOwner that should be extracted
+     * \return If the PropertyOwner cannot be found, `nullptr` is returned, otherwise the
+     *         pointer to the PropertyOwner is returned
+     */
+    PropertyOwner* propertyOwner(const std::string& uri) const;
+
+    /**
+     * Returns a uri for this PropertyOwner. This is created by looking up all the owners
+     * of this PropertyOwner. The owner identifiers are separated by ".", which make up
+     * the uri of this PropertyOwner.
+     * 
+     * \return The uri of this PropertyOwner 
+     */
+    std::string uri() const;
+
     /**
      * This method checks if a Property with the provided \p uri exists in this
      * PropertyOwner (or any sub-owner). If the identifier contains one or more `.`, the
diff --git a/include/openspace/query/query.h b/include/openspace/query/query.h
index 357ef81eed..6bbe4fad4a 100644
--- a/include/openspace/query/query.h
+++ b/include/openspace/query/query.h
@@ -42,6 +42,7 @@ Scene* sceneGraph();
 SceneGraphNode* sceneGraphNode(const std::string& name);
 const Renderable* renderable(const std::string& name);
 properties::Property* property(const std::string& uri);
+properties::PropertyOwner* propertyOwner(const std::string& uri);
 std::vector<properties::Property*> allProperties();
 
 } // namespace openspace
diff --git a/modules/globebrowsing/src/layergroup.cpp b/modules/globebrowsing/src/layergroup.cpp
index 09dc6b838d..e85439fbc8 100644
--- a/modules/globebrowsing/src/layergroup.cpp
+++ b/modules/globebrowsing/src/layergroup.cpp
@@ -168,20 +168,11 @@ Layer* LayerGroup::addLayer(const ghoul::Dictionary& layerDict) {
     // initialize function. This means that the layerManager does not exists yet, and
     // we cannot find which SGN it belongs to... Want to avoid doing this check, so
     // this should be fixed (probably as part of a cleanup/rewite of the LayerManager)
-    if (!layerManager) {
-        global::eventEngine->publishEvent<events::EventLayerAdded>(
-            "", // we don't know this yet
-            layerGroup->identifier(),
-            ptr->identifier()
-        );
-    }
-    else {
+    if (layerManager) {
         properties::PropertyOwner* globe = layerManager->owner();
         properties::PropertyOwner* sceneGraphNode = globe->owner();
         global::eventEngine->publishEvent<events::EventLayerAdded>(
-            sceneGraphNode->identifier(),
-            layerGroup->identifier(),
-            ptr->identifier()
+            ptr->uri()
         );
     }
 
@@ -203,9 +194,7 @@ void LayerGroup::deleteLayer(const std::string& layerName) {
             properties::PropertyOwner* globe = layerManager->owner();
             properties::PropertyOwner* sceneGraphNode = globe->owner();
             global::eventEngine->publishEvent<events::EventLayerRemoved>(
-                sceneGraphNode->identifier(),
-                layerGroup->identifier(),
-                it->get()->identifier()
+                it->get()->uri()
             );
             // We need to keep the name of the layer since we only get it as a reference
             // and the name needs to survive the deletion
diff --git a/modules/server/src/jsonconverters.cpp b/modules/server/src/jsonconverters.cpp
index 18960ed5d4..37065ed7f8 100644
--- a/modules/server/src/jsonconverters.cpp
+++ b/modules/server/src/jsonconverters.cpp
@@ -58,7 +58,8 @@ void to_json(json& j, const PropertyOwner& p) {
         { "description", p.description() },
         { "properties", p.properties() },
         { "subowners", p.propertySubOwners() },
-        { "tag", p.tags() }
+        { "tag", p.tags() },
+        { "uri", p.uri() }
     };
 }
 
diff --git a/modules/server/src/topics/getpropertytopic.cpp b/modules/server/src/topics/getpropertytopic.cpp
index 9089704baf..1c19d8ffca 100644
--- a/modules/server/src/topics/getpropertytopic.cpp
+++ b/modules/server/src/topics/getpropertytopic.cpp
@@ -103,6 +103,10 @@ json GetPropertyTopic::propertyFromKey(const std::string& key) {
     if (prop) {
         return wrappedPayload(prop);
     }
+    properties::PropertyOwner* node = propertyOwner(key);
+    if (node) {
+        return wrappedPayload(node);
+    }
 
     return wrappedError(std::format("Property '{}' not found", key), 404);
 }
diff --git a/scripts/drag_drop_handler.lua b/scripts/drag_drop_handler.lua
index 37937394b5..7104ca0880 100644
--- a/scripts/drag_drop_handler.lua
+++ b/scripts/drag_drop_handler.lua
@@ -47,30 +47,28 @@ local is_geojson_file = function(extension)
   return extension == ".geojson"
 end
 
-local ReloadUIScript = [[ if openspace.hasProperty('Modules.CefWebGui.Reload') then openspace.setPropertyValue('Modules.CefWebGui.Reload', nil) end ]]
-
 if is_image_file(extension) then
   return [[
   openspace.addScreenSpaceRenderable({
     Identifier = openspace.makeIdentifier("]] .. basename_without_extension .. [["),
     Type = "ScreenSpaceImageLocal",
     TexturePath = "]] .. filename .. [["
-  });]] .. ReloadUIScript
+  });]] 
 elseif is_video_file(extension) then
   return [[
     openspace.addScreenSpaceRenderable({
       Identifier = openspace.makeIdentifier("]] .. basename_without_extension .. [["),
       Type = "ScreenSpaceVideo",
       Video = "]] .. filename .. [["
-    });]] .. ReloadUIScript
+    });]] 
 elseif is_asset_file(extension) then
   return [[
     if openspace.asset.isLoaded("]] .. filename .. [[") ~= true then
       openspace.printInfo("Adding asset: ']] .. filename .. [[' (drag-and-drop)");
     end
-    openspace.asset.add("]] .. filename .. '");' .. ReloadUIScript
+    openspace.asset.add("]] .. filename .. '");' 
 elseif is_recording_file(extension) then
   return 'openspace.sessionRecording.startPlayback("' .. filename .. '")'
 elseif is_geojson_file(extension) then
-  return 'openspace.globebrowsing.addGeoJsonFromFile("' .. filename .. '")'  .. ReloadUIScript
+  return 'openspace.globebrowsing.addGeoJsonFromFile("' .. filename .. '")'  
 end
diff --git a/src/events/event.cpp b/src/events/event.cpp
index 6e9a19bc22..50bb341596 100644
--- a/src/events/event.cpp
+++ b/src/events/event.cpp
@@ -45,12 +45,12 @@ namespace openspace::events {
 
 void log(int i, const EventSceneGraphNodeAdded& e) {
     ghoul_assert(e.type == EventSceneGraphNodeAdded::Type, "Wrong type");
-    LINFO(std::format("[{}] SceneGraphNodeAdded: {}", i, e.node));
+    LINFO(std::format("[{}] SceneGraphNodeAdded: {}", i, e.uri));
 }
 
 void log(int i, const EventSceneGraphNodeRemoved& e) {
     ghoul_assert(e.type == EventSceneGraphNodeRemoved::Type, "Wrong type");
-    LINFO(std::format("[{}] SceneGraphNodeRemoved: {}", i, e.node));
+    LINFO(std::format("[{}] SceneGraphNodeRemoved: {}", i, e.uri));
 }
 
 void log(int i, const EventParallelConnection& e) {
@@ -87,12 +87,12 @@ void log(int i, const EventApplicationShutdown& e) {
 
 void log(int i, const EventScreenSpaceRenderableAdded& e) {
     ghoul_assert(e.type == EventScreenSpaceRenderableAdded::Type, "Wrong type");
-    LINFO(std::format("[{}] ScreenSpaceRenderableAdded: {}", i, e.renderable));
+    LINFO(std::format("[{}] ScreenSpaceRenderableAdded: {}", i, e.uri));
 }
 
 void log(int i, const EventScreenSpaceRenderableRemoved& e) {
     ghoul_assert(e.type == EventScreenSpaceRenderableRemoved::Type, "Wrong type");
-    LINFO(std::format("[{}] ScreenSpaceRenderableRemoved: {}", i, e.renderable));
+    LINFO(std::format("[{}] ScreenSpaceRenderableRemoved: {}", i, e.uri));
 }
 
 void log(int i, const EventCameraFocusTransition& e) {
@@ -148,12 +148,12 @@ void log(int i, const EventFocusNodeChanged& e) {
 
 void log(int i, const EventLayerAdded& e) {
     ghoul_assert(e.type == EventLayerAdded::Type, "Wrong type");
-    LINFO(std::format("[{}] LayerAdded: {}", i, e.layer));
+    LINFO(std::format("[{}] LayerAdded: {}", i, e.uri));
 }
 
 void log(int i, const EventLayerRemoved& e) {
     ghoul_assert(e.type == EventLayerRemoved::Type, "Wrong type");
-    LINFO(std::format("[{}] LayerRemoved: {}", i, e.layer));
+    LINFO(std::format("[{}] LayerRemoved: {}", i, e.uri));
 }
 
 void log(int i, const EventSessionRecordingPlayback& e) {
@@ -335,14 +335,14 @@ ghoul::Dictionary toParameter(const Event& e) {
     switch (e.type) {
         case Event::Type::SceneGraphNodeAdded:
             d.setValue(
-                "Node",
-                std::string(static_cast<const EventSceneGraphNodeAdded&>(e).node)
+                "Uri",
+                std::string(static_cast<const EventSceneGraphNodeAdded&>(e).uri)
             );
             break;
         case Event::Type::SceneGraphNodeRemoved:
             d.setValue(
-                "Node",
-                std::string(static_cast<const EventSceneGraphNodeRemoved&>(e).node)
+                "Uri",
+                std::string(static_cast<const EventSceneGraphNodeRemoved&>(e).uri)
             );
             break;
         case Event::Type::ParallelConnection:
@@ -376,17 +376,17 @@ ghoul::Dictionary toParameter(const Event& e) {
             break;
         case Event::Type::ScreenSpaceRenderableAdded:
             d.setValue(
-                "Renderable",
+                "Uri",
                 std::string(
-                    static_cast<const EventScreenSpaceRenderableAdded&>(e).renderable
+                    static_cast<const EventScreenSpaceRenderableAdded&>(e).uri
                 )
             );
             break;
         case Event::Type::ScreenSpaceRenderableRemoved:
             d.setValue(
-                "Renderable",
+                "Uri",
                 std::string(
-                    static_cast<const EventScreenSpaceRenderableRemoved&>(e).renderable
+                    static_cast<const EventScreenSpaceRenderableRemoved&>(e).uri
                 )
             );
             break;
@@ -438,30 +438,14 @@ ghoul::Dictionary toParameter(const Event& e) {
             break;
         case Event::Type::LayerAdded:
             d.setValue(
-                "Globe",
-                std::string(static_cast<const EventLayerAdded&>(e).node)
-            );
-            d.setValue(
-                "Group",
-                std::string(static_cast<const EventLayerAdded&>(e).layerGroup)
-            );
-            d.setValue(
-                "Layer",
-                std::string(static_cast<const EventLayerAdded&>(e).layer)
+                "Uri",
+                std::string(static_cast<const EventLayerAdded&>(e).uri)
             );
             break;
         case Event::Type::LayerRemoved:
             d.setValue(
-                "Globe",
-                std::string(static_cast<const EventLayerRemoved&>(e).node)
-            );
-            d.setValue(
-                "Group",
-                std::string(static_cast<const EventLayerRemoved&>(e).layerGroup)
-            );
-            d.setValue(
-                "Layer",
-                std::string(static_cast<const EventLayerRemoved&>(e).layer)
+                "Uri",
+                std::string(static_cast<const EventLayerRemoved&>(e).uri)
             );
             break;
         case Event::Type::SessionRecordingPlayback:
@@ -624,12 +608,12 @@ void logAllEvents(const Event* e) {
 
 EventSceneGraphNodeAdded::EventSceneGraphNodeAdded(const SceneGraphNode* node_)
     : Event(Type)
-    , node(temporaryString(node_->identifier()))
+    , uri(temporaryString(node_->uri()))
 {}
 
 EventSceneGraphNodeRemoved::EventSceneGraphNodeRemoved(const SceneGraphNode* node_)
     : Event(Type)
-    , node(temporaryString(node_->identifier()))
+    , uri(temporaryString(node_->uri()))
 {}
 
 EventParallelConnection::EventParallelConnection(State state_)
@@ -649,13 +633,13 @@ EventApplicationShutdown::EventApplicationShutdown(State state_)
 EventScreenSpaceRenderableAdded::EventScreenSpaceRenderableAdded(
                                                  const ScreenSpaceRenderable* renderable_)
     : Event(Type)
-    , renderable(temporaryString(renderable_->identifier()))
+    , uri(temporaryString(renderable_->uri()))
 {}
 
 EventScreenSpaceRenderableRemoved::EventScreenSpaceRenderableRemoved(
                                                  const ScreenSpaceRenderable* renderable_)
     : Event(Type)
-    , renderable(temporaryString(renderable_->identifier()))
+    , uri(temporaryString(renderable_->uri()))
 {}
 
 EventCameraFocusTransition::EventCameraFocusTransition(const Camera* camera_,
@@ -700,20 +684,14 @@ EventFocusNodeChanged::EventFocusNodeChanged(const SceneGraphNode* oldNode_,
     ghoul_assert(newNode_, "There must be a new node");
 }
 
-EventLayerAdded::EventLayerAdded(std::string_view node_, std::string_view layerGroup_,
-                                 std::string_view layer_)
+EventLayerAdded::EventLayerAdded(std::string_view uri_)
     : Event(Type)
-    , node(temporaryString(node_))
-    , layerGroup(temporaryString(layerGroup_))
-    , layer(temporaryString(layer_))
+    , uri(temporaryString(uri_))
 {}
 
-EventLayerRemoved::EventLayerRemoved(std::string_view node_, std::string_view layerGroup_,
-                                     std::string_view layer_)
+EventLayerRemoved::EventLayerRemoved(std::string_view uri_)
     : Event(Type)
-    , node(temporaryString(node_))
-    , layerGroup(temporaryString(layerGroup_))
-    , layer(temporaryString(layer_))
+    , uri(temporaryString(uri_))
 {}
 
 EventSessionRecordingPlayback::EventSessionRecordingPlayback(State state_)
diff --git a/src/properties/property.cpp b/src/properties/property.cpp
index ef54ba8367..d48b505d73 100644
--- a/src/properties/property.cpp
+++ b/src/properties/property.cpp
@@ -78,13 +78,9 @@ const std::string& Property::identifier() const {
 
 std::string Property::fullyQualifiedIdentifier() const {
     std::string identifier = _identifier;
-    PropertyOwner* currentOwner = owner();
-    while (currentOwner) {
-        const std::string& ownerId = currentOwner->identifier();
-        if (!ownerId.empty()) {
-            identifier = std::format("{}.{}", ownerId, identifier);
-        }
-        currentOwner = currentOwner->owner();
+    const std::string& ownerUri = owner()->uri();
+    if (!ownerUri.empty()) {
+        identifier = std::format("{}.{}", ownerUri, identifier);
     }
     return identifier;
 }
diff --git a/src/properties/propertyowner.cpp b/src/properties/propertyowner.cpp
index 1585493e25..945eafad6d 100644
--- a/src/properties/propertyowner.cpp
+++ b/src/properties/propertyowner.cpp
@@ -111,6 +111,41 @@ Property* PropertyOwner::property(const std::string& uri) const {
     }
 }
 
+PropertyOwner* PropertyOwner::propertyOwner(const std::string& uri) const {
+    PropertyOwner* directChild = propertySubOwner(uri);
+    if (directChild) {
+        return directChild;
+    }
+
+    // If we do not own the searched PropertyOwner, it must consist of a concatenated
+    // name and we can delegate it to a subowner
+    const size_t ownerSeparator = uri.find(URISeparator);
+    if (ownerSeparator == std::string::npos) {
+        // if we do not own the PropertyOwner and there is no separator, it does not exist
+        return nullptr;
+    }
+    else {
+        const std::string parentName = uri.substr(0, ownerSeparator);
+        const std::string ownerName = uri.substr(ownerSeparator + 1);
+
+        PropertyOwner* owner = propertySubOwner(parentName);
+        return owner ? owner->propertyOwner(ownerName) : nullptr;
+    }
+}
+
+std::string PropertyOwner::uri() const {
+    std::string identifier = _identifier;
+    PropertyOwner* currentOwner = owner();
+    while (currentOwner) {
+        const std::string& ownerId = currentOwner->identifier();
+        if (!ownerId.empty()) {
+            identifier = std::format("{}.{}", ownerId, identifier);
+        }
+        currentOwner = currentOwner->owner();
+    }
+    return identifier;
+}
+
 bool PropertyOwner::hasProperty(const std::string& uri) const {
     return property(uri) != nullptr;
 }
diff --git a/src/query/query.cpp b/src/query/query.cpp
index 4bb2d64e87..60103fbdbf 100644
--- a/src/query/query.cpp
+++ b/src/query/query.cpp
@@ -55,6 +55,11 @@ properties::Property* property(const std::string& uri) {
     return property;
 }
 
+properties::PropertyOwner* propertyOwner(const std::string& uri) {
+    properties::PropertyOwner* property = global::rootPropertyOwner->propertyOwner(uri);
+    return property;
+}
+
 std::vector<properties::Property*> allProperties() {
     return global::rootPropertyOwner->propertiesRecursive();
 }

From 945a9a5ca8043b0aa03b4fd39cf1c6164cd43cfa Mon Sep 17 00:00:00 2001
From: Adam Rohdin <adam.rohdin@outlook.com>
Date: Tue, 4 Jun 2024 18:37:04 +0200
Subject: [PATCH 483/701] Optimization of point and trail rendering (#3287)

Better performance for `RenderableOrbitalKepler` when running `Trails`, `Points` or `Points+Trails`.
Trails optimized by culling non-visible line strips.
Points optimized by changing a lot of calculations from double to float.
---
 modules/space/CMakeLists.txt                  |   1 +
 .../rendering/renderableorbitalkepler.cpp     |  28 +++--
 .../space/rendering/renderableorbitalkepler.h |   4 +-
 modules/space/shaders/debrisVizPoints_fs.glsl |   5 -
 modules/space/shaders/debrisVizPoints_gs.glsl | 106 ++++++++----------
 modules/space/shaders/debrisVizPoints_vs.glsl |  15 ++-
 modules/space/shaders/debrisVizTrails_fs.glsl |  19 +---
 modules/space/shaders/debrisVizTrails_gs.glsl |  85 ++++++++++++++
 modules/space/shaders/debrisVizTrails_vs.glsl |  28 ++---
 9 files changed, 184 insertions(+), 107 deletions(-)
 create mode 100644 modules/space/shaders/debrisVizTrails_gs.glsl

diff --git a/modules/space/CMakeLists.txt b/modules/space/CMakeLists.txt
index cd891cdec9..dcd096bbb4 100644
--- a/modules/space/CMakeLists.txt
+++ b/modules/space/CMakeLists.txt
@@ -76,6 +76,7 @@ set(SHADER_FILES
   shaders/debrisVizPoints_gs.glsl
   shaders/debrisVizPoints_vs.glsl
   shaders/debrisVizTrails_fs.glsl
+  shaders/debrisVizTrails_gs.glsl
   shaders/debrisVizTrails_vs.glsl
   shaders/fluxnodes_fs.glsl
   shaders/fluxnodes_vs.glsl
diff --git a/modules/space/rendering/renderableorbitalkepler.cpp b/modules/space/rendering/renderableorbitalkepler.cpp
index a153ab88cb..f3362e1c0c 100644
--- a/modules/space/rendering/renderableorbitalkepler.cpp
+++ b/modules/space/rendering/renderableorbitalkepler.cpp
@@ -123,8 +123,9 @@ namespace {
 
     constexpr openspace::properties::Property::PropertyInfo TrailFadeInfo = {
         "TrailFade",
-        "Trail Fade Factor",
-        "Determines how fast the trail fades out.",
+        "Trail Fade",
+        "Determines how fast the trail fades out. A smaller number shows less of the "
+        "trail and a larger number shows more.",
         openspace::properties::Property::Visibility::User
     };
 
@@ -255,14 +256,14 @@ RenderableOrbitalKepler::Appearance::Appearance()
     })
     , color(ColorInfo, glm::vec3(1.f), glm::vec3(0.f), glm::vec3(1.f))
     , trailWidth(TrailWidthInfo, 2.f, 1.f, 20.f)
-    , pointSizeExponent(PointSizeExponentInfo, 1.0f, 0.f, 25.f)
+    , pointSizeExponent(PointSizeExponentInfo, 1.0f, 0.f, 11.f)
     , renderingModes(
         RenderingModeInfo,
         properties::OptionProperty::DisplayType::Dropdown
     )
     , trailFade(TrailFadeInfo, 20.f, 0.f, 30.f)
-    , enableMaxSize(EnableMaxSizeInfo, false)
-    , maxSize(MaxSizeInfo, 1.f, 0.f, 45.f)
+    , enableMaxSize(EnableMaxSizeInfo, true)
+    , maxSize(MaxSizeInfo, 5.f, 0.f, 45.f)
     , enableOutline(EnableOutlineInfo, true)
     , outlineColor(OutlineColorInfo, glm::vec3(0.f), glm::vec3(0.f), glm::vec3(1.f))
     , outlineWidth(OutlineWidthInfo, 0.2f, 0.f, 1.f)
@@ -378,7 +379,8 @@ void RenderableOrbitalKepler::initializeGL() {
            return global::renderEngine->buildRenderProgram(
                "OrbitalKeplerTrails",
                absPath("${MODULE_SPACE}/shaders/debrisVizTrails_vs.glsl"),
-               absPath("${MODULE_SPACE}/shaders/debrisVizTrails_fs.glsl")
+               absPath("${MODULE_SPACE}/shaders/debrisVizTrails_fs.glsl"),
+               absPath("${MODULE_SPACE}/shaders/debrisVizTrails_gs.glsl")
            );
        }
    );
@@ -401,7 +403,10 @@ void RenderableOrbitalKepler::initializeGL() {
         _trailProgram->uniformLocation("modelViewTransform");
     _uniformTrailCache.projection =
         _trailProgram->uniformLocation("projectionTransform");
-    _uniformTrailCache.trailFade = _trailProgram->uniformLocation("trailFade");
+    _uniformTrailCache.colorFadeCutoffValue =
+        _trailProgram->uniformLocation("colorFadeCutoffValue");
+    _uniformTrailCache.trailFadeExponent =
+        _trailProgram->uniformLocation("trailFadeExponent");
     _uniformTrailCache.inGameTime = _trailProgram->uniformLocation("inGameTime");
     _uniformTrailCache.color = _trailProgram->uniformLocation("color");
     _uniformTrailCache.opacity = _trailProgram->uniformLocation("opacity");
@@ -562,7 +567,14 @@ void RenderableOrbitalKepler::render(const RenderData& data, RendererTasks&) {
         const float fade = pow(
             _appearance.trailFade.maxValue() - _appearance.trailFade, 2.f
         );
-        _trailProgram->setUniform(_uniformTrailCache.trailFade, fade);
+        _trailProgram->setUniform(_uniformTrailCache.trailFadeExponent, fade);
+
+        // 0.05 is the "alpha value" for which the trail should no longer be rendered.
+        // The value that's compared to 0.05 is calculated in the shader and depends
+        // on the distance from the head of the trail to the part that's being rendered.
+        // Value is passed as uniform due to it being used in both geometry and fragment
+        // shader.
+        _trailProgram->setUniform(_uniformTrailCache.colorFadeCutoffValue, 0.05f);
 
         glLineWidth(_appearance.trailWidth);
 
diff --git a/modules/space/rendering/renderableorbitalkepler.h b/modules/space/rendering/renderableorbitalkepler.h
index 0220424489..d404806640 100644
--- a/modules/space/rendering/renderableorbitalkepler.h
+++ b/modules/space/rendering/renderableorbitalkepler.h
@@ -112,7 +112,8 @@ private:
     RenderableOrbitalKepler::Appearance _appearance;
 
     // Line cache
-    UniformCache(modelView, projection, trailFade, inGameTime, color, opacity)
+    UniformCache(modelView, projection, trailFadeExponent, colorFadeCutoffValue,
+        inGameTime, color, opacity)
         _uniformTrailCache;
     
     // Point cache
@@ -126,4 +127,3 @@ private:
 } // namespace openspace
 
 #endif // __OPENSPACE_MODULE_SPACE___RENDERABLEORBITALKEPLER___H__
-
diff --git a/modules/space/shaders/debrisVizPoints_fs.glsl b/modules/space/shaders/debrisVizPoints_fs.glsl
index 51e7f339fe..2ad062d058 100644
--- a/modules/space/shaders/debrisVizPoints_fs.glsl
+++ b/modules/space/shaders/debrisVizPoints_fs.glsl
@@ -27,7 +27,6 @@
 in float projectionViewDepth;
 in vec4 viewSpace;
 in vec2 texCoord;
-flat in int skip;
 
 uniform bool enableOutline;
 uniform vec3 outlineColor;
@@ -38,10 +37,6 @@ uniform float opacity;
 Fragment getFragment() {
   Fragment frag;
   
-  if (skip == 1) {
-    discard;
-  }
-
   // Only draw circle instead of entire quad
   vec2 st = (texCoord - vec2(0.5)) * 2.0;
   if (length(st) > 1.0) {
diff --git a/modules/space/shaders/debrisVizPoints_gs.glsl b/modules/space/shaders/debrisVizPoints_gs.glsl
index c477d3b349..fb50433753 100644
--- a/modules/space/shaders/debrisVizPoints_gs.glsl
+++ b/modules/space/shaders/debrisVizPoints_gs.glsl
@@ -27,8 +27,8 @@
 #include "PowerScaling/powerScalingMath.hglsl"
 
 layout(lines) in;
-flat in double currentRevolutionFraction[];
-flat in double vertexRevolutionFraction[];
+flat in float currentRevolutionFraction[];
+flat in float vertexRevolutionFraction[];
 
 uniform dmat4 modelTransform;
 uniform dmat4 viewTransform;
@@ -43,103 +43,95 @@ layout(triangle_strip, max_vertices = 4) out;
 out float projectionViewDepth;
 out vec4 viewSpace;
 out vec2 texCoord;
-flat out int skip;
-
-dvec4 dz_normalization(dvec4 dv_in) {
-  dvec4 dv_out = dv_in;
-  dv_out.z = 0;
-  return dv_out;
-}
 
 void main() {
-  skip = 0;
-  
-  double cFrac = currentRevolutionFraction[0];
-  double v0Frac = vertexRevolutionFraction[0];
-  double v1Frac = vertexRevolutionFraction[1];
+  // cFrac is how far along the trail orbit the head of the trail is.
+  // v0Frac and v1Frac are how far the two vertices that creates the current line strip
+  // are along the trail orbit. The variables span between 0 and 1, where 0 is the
+  // beginning of the trail and 1 is the end of the trail (a full orbit).
+  float cFrac = currentRevolutionFraction[0];
+  float v0Frac = vertexRevolutionFraction[0];
+  float v1Frac = vertexRevolutionFraction[1];
+
+  // Only create/emit vertices for segments where the head of the trail falls within
   if (cFrac >= v0Frac && cFrac <= v1Frac) {
 
-    // Interpolate position of point
-    double dFrac = abs(cFrac - v0Frac);
-    double vFrac = abs(v1Frac - v0Frac);
-    double percentage = dFrac / vFrac;
-
-    dvec4 v0Weighted = (1.0 - percentage) * gl_in[0].gl_Position;
-    dvec4 v1Weighted = (percentage) * gl_in[1].gl_Position;
-
-    dvec4 pos = v0Weighted + v1Weighted;
+    // Interpolate position of current position of the trail head
+    float dFrac = abs(cFrac - v0Frac);
+    float vFrac = abs(v1Frac - v0Frac);
+    float percentage = dFrac / vFrac;
+    
+    vec4 v0Weighted = (1.0 - percentage) * gl_in[0].gl_Position;
+    vec4 v1Weighted = (percentage) * gl_in[1].gl_Position;
+    vec4 pos = v0Weighted + v1Weighted;
     // ==========================
 
+    // Cast to float based data types
+    mat4 modelTrans = mat4(modelTransform);
+    mat4 viewTrans = mat4(viewTransform);
+    vec3 camPosWorld = vec3(cameraPositionWorld);
+
     // Calculate current vertex position to world space
-    dvec4 vertPosWorldSpace = modelTransform * pos;
+    vec4 vertPosWorldSpace = modelTrans * pos;
 
     // Calculate new axis for plane
-    dvec3 normal = normalize(cameraPositionWorld - vertPosWorldSpace.xyz);
-    dvec3 right = normalize(cross(cameraUpWorld, normal));
-    dvec3 up = normalize(cross(normal, right));
+    vec3 normal = vec3(normalize(camPosWorld - vertPosWorldSpace.xyz));
+    vec3 right = normalize(cross(vec3(cameraUpWorld), normal));
+    vec3 up = normalize(cross(normal, right));
 
     // Calculate size of points
-    double initialSize = pow(10.0, pointSizeExponent);
+    float initialSize = pow(10.0, pointSizeExponent);
     right *= initialSize;
     up *= initialSize;
 
-    double opp = length(right);
-    double adj = length(cameraPositionWorld.xyz - vertPosWorldSpace.xyz);
+    float opp = length(right);
+    float adj = length(camPosWorld - vertPosWorldSpace.xyz);
     float angle = atan(float(opp/adj));
     float maxAngle = radians(maxSize * 0.5);
 
     // Controls the point size
     if (enableMaxSize && (angle > maxAngle) && (adj > 0.0)) {
-      double correction = (adj * tan(maxAngle)) / opp;
+      float correction = (adj * tan(maxAngle)) / opp;
       right *= correction;
       up *= correction;
     }
 
-    // Calculate and set corners of the quad
-    dvec4 p0World = vertPosWorldSpace + (dvec4(up-right, 0.0));
-    dvec4 p1World = vertPosWorldSpace + (dvec4(-right-up,0.0));
-    dvec4 p2World = vertPosWorldSpace + (dvec4(right+up, 0.0));
-    dvec4 p3World = vertPosWorldSpace + (dvec4(right-up, 0.0));
+    // Calculate and set corners of the new quad
+    vec4 p0World = vertPosWorldSpace + vec4(up-right, 0.0);
+    vec4 p1World = vertPosWorldSpace + vec4(-right-up,0.0);
+    vec4 p2World = vertPosWorldSpace + vec4(right+up, 0.0);
+    vec4 p3World = vertPosWorldSpace + vec4(right-up, 0.0);
 
-    dmat4 ViewProjectionTransform = dmat4(projectionTransform) * viewTransform;
+    mat4 ViewProjectionTransform = projectionTransform * viewTrans;
 
     // Set some additional out parameters
-    viewSpace = z_normalization(
-      vec4(projectionTransform * viewTransform * modelTransform * pos)
-    );
+    viewSpace = z_normalization(projectionTransform * viewTrans * modelTrans * pos);
     projectionViewDepth = viewSpace.w;
 
-    //left-top
-    vec4 p0Screen = vec4(dz_normalization(ViewProjectionTransform * p0World));
+    // left-top
+    vec4 p0Screen = z_normalization(ViewProjectionTransform * p0World);
     gl_Position = p0Screen;
     texCoord = vec2(0.0, 0.0);
     EmitVertex();
 
-    //left-bot
-    vec4 p1Screen = vec4(dz_normalization(ViewProjectionTransform * p1World));
+    // left-bot
+    vec4 p1Screen = z_normalization(ViewProjectionTransform * p1World);
     gl_Position = p1Screen;
     texCoord = vec2(1.0, 0.0);
     EmitVertex();
 
-    //right-top
-    vec4 p2Screen = vec4(dz_normalization(ViewProjectionTransform * p2World));
+    // right-top
+    vec4 p2Screen = z_normalization(ViewProjectionTransform * p2World);
     gl_Position = p2Screen;
     texCoord = vec2(0.0, 1.0);
     EmitVertex();
 
-    //right-bot
-    vec4 p3Screen = vec4(dz_normalization(ViewProjectionTransform * p3World));
+    // right-bot
+    vec4 p3Screen = z_normalization(ViewProjectionTransform * p3World);
     gl_Position = p3Screen;
     texCoord = vec2(1.0, 1.0);
     EmitVertex();
-    
-    // Primitive
-    EndPrimitive();
-
   } 
-  else {
-    skip = 1;
-    EmitVertex();
-    EndPrimitive();
-  }
+
+  EndPrimitive();
 }
diff --git a/modules/space/shaders/debrisVizPoints_vs.glsl b/modules/space/shaders/debrisVizPoints_vs.glsl
index 4d0c23ac5b..97b0e8e6af 100644
--- a/modules/space/shaders/debrisVizPoints_vs.glsl
+++ b/modules/space/shaders/debrisVizPoints_vs.glsl
@@ -28,21 +28,24 @@ layout (location = 0) in vec4 vertexData; // 1: x, 2: y, 3: z, 4: timeOffset,
 layout (location = 1) in vec2 orbitData; // 1: epoch, 2: period
 
 uniform double inGameTime;
-uniform dmat4 modelTransform;
 
-flat out double currentRevolutionFraction;
-flat out double vertexRevolutionFraction;
+flat out float currentRevolutionFraction;
+flat out float vertexRevolutionFraction;
 
 void main() {
   float epoch = orbitData.x;
   float period = orbitData.y;
-  double numOfRevolutions = (inGameTime - epoch) / period;
 
-  vertexRevolutionFraction = vertexData.w / period;
-  currentRevolutionFraction = numOfRevolutions - double(int(numOfRevolutions));
+  // calculate nr of periods, get fractional part to know where the vertex closest to the
+  // debris part is right now
+  double numOfRevolutions = (inGameTime - epoch) / period;
+  currentRevolutionFraction = float(numOfRevolutions - double(int(numOfRevolutions)));
   if (currentRevolutionFraction < 0.0) {
     currentRevolutionFraction += 1.0;
   }
 
+  // Same procedure for the current vertex
+  vertexRevolutionFraction = vertexData.w / period;
+
   gl_Position = vec4(vertexData.xyz, 1.0);
 }
diff --git a/modules/space/shaders/debrisVizTrails_fs.glsl b/modules/space/shaders/debrisVizTrails_fs.glsl
index 39e7af9289..aa1a1377e6 100644
--- a/modules/space/shaders/debrisVizTrails_fs.glsl
+++ b/modules/space/shaders/debrisVizTrails_fs.glsl
@@ -31,18 +31,11 @@ in float offsetPeriods;
 
 uniform vec3 color;
 uniform float opacity = 1.0;
-uniform float trailFade;
-
-/// Different modes - sync with renderableorbitalkepler.cpp
-// RenderingModeLines = 0
-// RenderingModePoint = 1
+uniform float trailFadeExponent;
+uniform float colorFadeCutoffValue;
 
 Fragment getFragment() {
   Fragment frag;
-
-  float invert = 1.0;
-  float fade = 1.0;
-
   // float offsetPeriods = offset / period;
   // This is now done in the fragment shader instead to make smooth movement between
   // vertices. We want vertexDistance to be double up to this point, I think, (hence the
@@ -58,15 +51,15 @@ Fragment getFragment() {
     vertexDistance += 1.0;
   }
 
-  invert = pow((1.0 - vertexDistance), trailFade);  
-  fade = clamp(invert, 0.0, 1.0);
+  float invert = pow((1.0 - vertexDistance), trailFadeExponent);  
+  float fade = clamp(invert, 0.0, 1.0);
 
   // Currently even fully transparent lines can occlude other lines, thus we discard these
   // fragments since debris and satellites are rendered so close to each other
-  if (fade < 0.05) {
+  if (fade < colorFadeCutoffValue) {
     discard;
   }
-  
+
   // Use additive blending for some values to make the discarding less abrupt
   if (fade < 0.15) {
     frag.blend = BLEND_MODE_ADDITIVE;
diff --git a/modules/space/shaders/debrisVizTrails_gs.glsl b/modules/space/shaders/debrisVizTrails_gs.glsl
new file mode 100644
index 0000000000..f098d79d18
--- /dev/null
+++ b/modules/space/shaders/debrisVizTrails_gs.glsl
@@ -0,0 +1,85 @@
+/*****************************************************************************************
+ *                                                                                       *
+ * OpenSpace                                                                             *
+ *                                                                                       *
+ * Copyright (c) 2014-2024                                                               *
+ *                                                                                       *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
+ * software and associated documentation files (the "Software"), to deal in the Software *
+ * without restriction, including without limitation the rights to use, copy, modify,    *
+ * merge, publish, distribute, sublicense, and/or sell copies of the Software, and to    *
+ * permit persons to whom the Software is furnished to do so, subject to the following   *
+ * conditions:                                                                           *
+ *                                                                                       *
+ * The above copyright notice and this permission notice shall be included in all copies *
+ * or substantial portions of the Software.                                              *
+ *                                                                                       *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED,   *
+ * INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A         *
+ * PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT    *
+ * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF  *
+ * CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE  *
+ * OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                                         *
+ ****************************************************************************************/
+
+#version __CONTEXT__
+
+layout(lines) in;
+flat in float currentRevolutionFraction[];
+flat in float vertexRevolutionFraction[];
+flat in vec4 viewSpacePositions[];
+
+layout(line_strip, max_vertices = 2) out;
+out float viewSpaceDepth;
+out float periodFraction;
+out float offsetPeriods;
+out vec4 viewSpacePosition;
+
+uniform float trailFadeExponent;
+uniform float colorFadeCutoffValue;
+
+void main() {
+  // cFrac is how far along the trail orbit the head of the trail is.
+  // v0Frac and v1Frac are how far the two vertices that creates the current line strip
+  // are along the trail orbit. The variables span between 0 and 1, where 0 is the
+  // beginning of the trail and 1 is the end of the trail (a full orbit).
+  float cFrac = currentRevolutionFraction[0];
+  float v0Frac = vertexRevolutionFraction[0];
+  float v1Frac = vertexRevolutionFraction[1];
+
+  // Distance between current revolution fraction and revolution fraction for
+  // vertex0 and vertex1
+  float vd0 = cFrac - v0Frac;
+  if (vd0 < 0.0) {
+    vd0 += 1.0;
+  }
+
+  float vd1 = cFrac - v1Frac;
+  if (vd1 < 0.0) {
+    vd1 += 1.0;
+  }
+  // ==========================
+
+  // Calculates if vertex0 is close enough to NOT be discarded in fragment shader
+  float invert = pow(1.0 - vd1, trailFadeExponent);  
+  float fade = clamp(invert, 0.0, 1.0);
+
+  // Only emit vertices for line segments where both vertices should be rendered
+  if ((fade > colorFadeCutoffValue) || (vd0 < vd1)) {
+    gl_Position = gl_in[0].gl_Position;
+    viewSpaceDepth = gl_Position.w;
+    periodFraction = cFrac;
+    offsetPeriods = v0Frac;
+    viewSpacePosition = viewSpacePositions[0];
+    EmitVertex();
+
+    gl_Position = gl_in[1].gl_Position;
+    viewSpaceDepth = gl_Position.w;
+    periodFraction = cFrac;
+    offsetPeriods = v1Frac;
+    viewSpacePosition = viewSpacePositions[1];
+    EmitVertex();
+  }
+
+  EndPrimitive();
+}
diff --git a/modules/space/shaders/debrisVizTrails_vs.glsl b/modules/space/shaders/debrisVizTrails_vs.glsl
index 472be3ca12..3b0c7ce92a 100644
--- a/modules/space/shaders/debrisVizTrails_vs.glsl
+++ b/modules/space/shaders/debrisVizTrails_vs.glsl
@@ -29,10 +29,9 @@
 layout (location = 0) in vec4 vertexData; // 1: x, 2: y, 3: z, 4: timeOffset,
 layout (location = 1) in vec2 orbitData; // 1: epoch, 2: period
 
-out vec4 viewSpacePosition;
-out float viewSpaceDepth;
-out float periodFraction;
-out float offsetPeriods;
+flat out float currentRevolutionFraction;
+flat out float vertexRevolutionFraction;
+flat out vec4 viewSpacePositions;
 
 uniform dmat4 modelViewTransform;
 uniform mat4 projectionTransform;
@@ -54,18 +53,15 @@ void main() {
   // calculate nr of periods, get fractional part to know where the vertex closest to the
   // debris part is right now
   double nrOfRevolutions = (inGameTime - epoch) / period;
-  double frac = double(int(nrOfRevolutions));
-  double periodFractiond = nrOfRevolutions - frac;
-  if (periodFractiond < 0.0) {
-    periodFractiond += 1.0;
-  }
-  periodFraction = float(periodFractiond);
+  currentRevolutionFraction = float(nrOfRevolutions - double(int(nrOfRevolutions)));
+  if (currentRevolutionFraction < 0.0) {
+    currentRevolutionFraction += 1.0;
+  } 
 
-  // same procedure for the current vertex
-  offsetPeriods = vertexData.w / float(period);
-
-  viewSpacePosition = vec4(modelViewTransform * dvec4(vertexData.xyz, 1));
-  vec4 vs_position = z_normalization(projectionTransform * viewSpacePosition);
+  // Same procedure for the current vertex
+  vertexRevolutionFraction = vertexData.w / period;
+  
+  viewSpacePositions = vec4(modelViewTransform * dvec4(vertexData.xyz, 1));
+  vec4 vs_position = z_normalization(projectionTransform * viewSpacePositions);
   gl_Position = vs_position;
-  viewSpaceDepth = vs_position.w;
 }

From 5a88c4d56ccaeac22cfa94435ba3eaf07a547e56 Mon Sep 17 00:00:00 2001
From: Alexander Bock <mail@alexanderbock.eu>
Date: Tue, 4 Jun 2024 20:42:18 +0200
Subject: [PATCH 484/701] Update the website hash and the version string

---
 CMakeLists.txt                | 2 +-
 data/assets/util/webgui.asset | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index ae544a4837..36a177a3c0 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -30,7 +30,7 @@ project(OpenSpace)
 set(OPENSPACE_VERSION_MAJOR 0)
 set(OPENSPACE_VERSION_MINOR 20)
 set(OPENSPACE_VERSION_PATCH 0)
-set(OPENSPACE_VERSION_STRING "rc-1")
+set(OPENSPACE_VERSION_STRING "rc-2")
 
 include(${PROJECT_SOURCE_DIR}/support/cmake/module_common.cmake)
 include(${PROJECT_SOURCE_DIR}/ext/ghoul/support/cmake/message_macros.cmake)
diff --git a/data/assets/util/webgui.asset b/data/assets/util/webgui.asset
index dca42b421c..ea5a79caaf 100644
--- a/data/assets/util/webgui.asset
+++ b/data/assets/util/webgui.asset
@@ -4,7 +4,7 @@ local guiCustomization = asset.require("customization/gui")
 
 
 -- Select which commit hashes to use for the frontend and backend
-local frontendHash = "301964b972bf45f28eff0031e6ab7cdfdc7814b7"
+local frontendHash = "768c411e1430ad3ece3528a648ded7a862efb2d0"
 
 local frontend = asset.resource({
   Identifier = "WebGuiFrontend",

From 95b4decccad31f7f703bcb8141bd854ba78c7938 Mon Sep 17 00:00:00 2001
From: Emma Broman <emma.broman@liu.se>
Date: Thu, 6 Jun 2024 09:39:49 +0200
Subject: [PATCH 485/701] Fix the `goToGeo` call when the camera is set from a
 profile

---
 src/engine/openspaceengine.cpp | 15 +++++++++++----
 1 file changed, 11 insertions(+), 4 deletions(-)

diff --git a/src/engine/openspaceengine.cpp b/src/engine/openspaceengine.cpp
index 9d81224a76..b6dd15ca53 100644
--- a/src/engine/openspaceengine.cpp
+++ b/src/engine/openspaceengine.cpp
@@ -1605,12 +1605,19 @@ void setCameraFromProfile(const Profile& p) {
                 // dependency in this core code. Eventually, goToGeo will be incorporated
                 // in the OpenSpace core and this code will change.
                 checkNodeExists(geo.anchor);
-                std::string geoScript = std::format("openspace.globebrowsing.goToGeo"
-                    "([[{}]], {}, {}", geo.anchor, geo.latitude, geo.longitude);
+                std::string geoScript;
                 if (geo.altitude.has_value()) {
-                    geoScript += std::format(", {}", geo.altitude.value());
+                    geoScript = std::format(
+                        "openspace.globebrowsing.flyToGeo([[{}]], {}, {}, {}, 0)",
+                        geo.anchor, geo.latitude, geo.longitude, *geo.altitude
+                    );
+                }
+                else {
+                    geoScript = std::format(
+                        "openspace.globebrowsing.flyToGeo2([[{}]], {}, {}, 0)",
+                        geo.anchor, geo.latitude, geo.longitude
+                    );
                 }
-                geoScript += ")";
                 global::scriptEngine->queueScript(
                     geoScript,
                     scripting::ScriptEngine::ShouldBeSynchronized::Yes,

From cf5d00346b715cde77127a69d37839e9e7d74e1e Mon Sep 17 00:00:00 2001
From: ElonOlsson <olssonelon@gmail.com>
Date: Tue, 11 Jun 2024 15:35:53 -0400
Subject: [PATCH 486/701] Fix bug with flux nodes being all purple. Fixes #3247

---
 modules/space/rendering/renderablefluxnodes.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/space/rendering/renderablefluxnodes.cpp b/modules/space/rendering/renderablefluxnodes.cpp
index 41df09d5a4..17898a963c 100644
--- a/modules/space/rendering/renderablefluxnodes.cpp
+++ b/modules/space/rendering/renderablefluxnodes.cpp
@@ -450,7 +450,7 @@ void RenderableFluxNodes::loadNodeData(int energybinOption) {
         "{}/positions{}", _binarySourceFolderPath, energybin
     );
     const std::string file2 = std::format(
-        "{}/fluxes/{}", _binarySourceFolderPath, energybin
+        "{}/fluxes{}", _binarySourceFolderPath, energybin
     );
     const std::string file3 = std::format(
         "{}/radiuses{}", _binarySourceFolderPath, energybin

From 6a1a22b4853d2fb88816a48304ef9089eb97135b Mon Sep 17 00:00:00 2001
From: Alexander Bock <alexander.bock@liu.se>
Date: Tue, 11 Jun 2024 22:06:33 +0200
Subject: [PATCH 487/701] Improve documentation and add examples for the
 StaticRotation (#3309)

* Improve documentation and add examples for the StaticRotation

---------

Co-authored-by: Emma Broman <emma.broman@liu.se>
---
 .../rotation/staticrotation/euler.asset       | 29 ++++++++++++++++
 .../rotation/staticrotation/matrix.asset      | 33 +++++++++++++++++++
 .../rotation/staticrotation/quaternion.asset  | 29 ++++++++++++++++
 modules/base/rotation/staticrotation.cpp      | 15 ++++++++-
 4 files changed, 105 insertions(+), 1 deletion(-)
 create mode 100644 data/assets/examples/rotation/staticrotation/euler.asset
 create mode 100644 data/assets/examples/rotation/staticrotation/matrix.asset
 create mode 100644 data/assets/examples/rotation/staticrotation/quaternion.asset

diff --git a/data/assets/examples/rotation/staticrotation/euler.asset b/data/assets/examples/rotation/staticrotation/euler.asset
new file mode 100644
index 0000000000..3a8aa929a9
--- /dev/null
+++ b/data/assets/examples/rotation/staticrotation/euler.asset
@@ -0,0 +1,29 @@
+-- Euler Angles
+-- This asset creates a rotation provided by Euler angles and applies it to a
+-- SceneGraphNode that only displays coordinate axes. The rotation of the coordinate axes
+-- are determined by a constant and unchanging static rotation.
+
+local Node = {
+  Identifier = "StaticRotation_Example_Euler",
+  Transform = {
+    Rotation = {
+      Type = "StaticRotation",
+      Rotation = { math.pi / 2.0, 0.0, math.pi }
+    }
+  },
+  Renderable = {
+    Type = "RenderableCartesianAxes"
+  },
+  GUI = {
+    Name = "StaticRotation - Euler Angles",
+    Path = "/Examples"
+  }
+}
+
+asset.onInitialize(function()
+  openspace.addSceneGraphNode(Node)
+end)
+
+asset.onDeinitialize(function()
+  openspace.removeSceneGraphNode(Node)
+end)
diff --git a/data/assets/examples/rotation/staticrotation/matrix.asset b/data/assets/examples/rotation/staticrotation/matrix.asset
new file mode 100644
index 0000000000..60b530da7c
--- /dev/null
+++ b/data/assets/examples/rotation/staticrotation/matrix.asset
@@ -0,0 +1,33 @@
+-- Matrix
+-- This asset creates a SceneGraphNode that only displays coordinate axes. The rotation of
+-- the coordinate axes are determined by a constant and unchanging static rotation that is
+-- provided by a 3-by-3 rotation matrix in column-major order.
+
+local Node = {
+  Identifier = "StaticRotation_Example_Matrix",
+  Transform = {
+    Rotation = {
+      Type = "StaticRotation",
+      Rotation = {
+        -0.9999987, -0.0015927, 0.0000000,
+         0.0015927, -0.9999987, 0.0000000,
+         0.0000000,  0.0000000, 1.0000000
+      }
+    }
+  },
+  Renderable = {
+    Type = "RenderableCartesianAxes"
+  },
+  GUI = {
+    Name = "StaticRotation - Matrix",
+    Path = "/Examples"
+  }
+}
+
+asset.onInitialize(function()
+  openspace.addSceneGraphNode(Node)
+end)
+
+asset.onDeinitialize(function()
+  openspace.removeSceneGraphNode(Node)
+end)
diff --git a/data/assets/examples/rotation/staticrotation/quaternion.asset b/data/assets/examples/rotation/staticrotation/quaternion.asset
new file mode 100644
index 0000000000..ad1ea3929e
--- /dev/null
+++ b/data/assets/examples/rotation/staticrotation/quaternion.asset
@@ -0,0 +1,29 @@
+-- Quaternion
+-- This asset creates a SceneGraphNode that only displays coordinate axes. The rotation of
+-- the coordinate axes are determined by a constant and unchanging static rotation that is
+-- provided by a four-dimensional quaternion.
+
+local Node = {
+  Identifier = "StaticRotation_Example_Quaternion",
+  Transform = {
+    Rotation = {
+      Type = "StaticRotation",
+      Rotation = { 0.4873552, -0.4869268, -0.5127203, 0.5123526 }
+    }
+  },
+  Renderable = {
+    Type = "RenderableCartesianAxes"
+  },
+  GUI = {
+    Name = "StaticRotation - Quaternion",
+    Path = "/Examples"
+  }
+}
+
+asset.onInitialize(function()
+  openspace.addSceneGraphNode(Node)
+end)
+
+asset.onDeinitialize(function()
+  openspace.removeSceneGraphNode(Node)
+end)
diff --git a/modules/base/rotation/staticrotation.cpp b/modules/base/rotation/staticrotation.cpp
index 733456c96f..34d20416bf 100644
--- a/modules/base/rotation/staticrotation.cpp
+++ b/modules/base/rotation/staticrotation.cpp
@@ -57,9 +57,22 @@ namespace {
         return res;
     }
 
+    // A StaticRotation is using a fixed and constant rotation factor that does not change
+    // over time. The rotation value is provided as a property that can be changed at
+    // runtime, but it will not change automatically over time.
     struct [[codegen::Dictionary(StaticRotation)]] Parameters {
         // Stores the static rotation as a vector containing Euler angles, a quaternion
-        // or a rotation matrix
+        // representation, or a rotation matrix.
+        //
+        // For the Euler angles, the values have to be provided in radians. To convert
+        // degres to radians, you can use the `math.rad` function.
+        //
+        // For the Quaternion representation, the values have to be provided in the order
+        // (w, x, y, z).
+        //
+        // For the matrix form, the provided matrix will be converted into Euler angles,
+        // an operation which might fail if the matrix is not a true rotation matrix. The
+        // values are assumed to be in row-major order.
         std::variant<glm::dvec3, glm::dvec4, glm::dmat3x3> rotation;
     };
 #include "staticrotation_codegen.cpp"

From f82dc0371bc05a8fd61c502b6a1efdf6942a24ed Mon Sep 17 00:00:00 2001
From: Alexander Bock <alexander.bock@liu.se>
Date: Tue, 11 Jun 2024 22:16:16 +0200
Subject: [PATCH 488/701] Add example to TimelineRotation. Also fix bug where a
 non-interpolating timelinerotation would disappear before the first keyframe
 (#3310)

* Add example to TimelineRotation. Also fix bug where a non-interpolating timelinerotation would disappear before the first keyframe

---------

Co-authored-by: Emma Broman <emma.broman@liu.se>
---
 .../timelinerotation/no-interpolate.asset     | 52 +++++++++++++++++++
 .../rotation/timelinerotation/timeline.asset  | 47 +++++++++++++++++
 modules/base/rotation/timelinerotation.cpp    |  8 +--
 3 files changed, 100 insertions(+), 7 deletions(-)
 create mode 100644 data/assets/examples/rotation/timelinerotation/no-interpolate.asset
 create mode 100644 data/assets/examples/rotation/timelinerotation/timeline.asset

diff --git a/data/assets/examples/rotation/timelinerotation/no-interpolate.asset b/data/assets/examples/rotation/timelinerotation/no-interpolate.asset
new file mode 100644
index 0000000000..5980216e71
--- /dev/null
+++ b/data/assets/examples/rotation/timelinerotation/no-interpolate.asset
@@ -0,0 +1,52 @@
+-- No Interpolation
+-- This asset creates a SceneGraphNode that only displays coordinate axes. The rotation of
+-- the coordinate axes are determined by a timeline of individual rotations that are used
+-- without interpolating between the timeline entries. These rotations are keyframes that
+-- are used to change between different orientations. This example transitions between
+-- three rotations. In this example, the interpolation between entries is disabled, which
+-- will cause the coordinate axes to change their orientation abruptly when the rotation
+-- changes. If the interpolation were enabled, the orientation of the coordinate axes
+-- would transition seamlessly instead at the provided times. This example will only work
+-- if the in-game time is set to January 1st, 2000.
+
+local Node = {
+  Identifier = "TimelineRotation_Example_NoInterpolation",
+  Transform = {
+    Rotation = {
+      Type = "TimelineRotation",
+      Keyframes = {
+        -- The first timeline entry
+        ["2000 JAN 01 00:00:00"] = {
+          Type = "StaticRotation",
+          Rotation = { math.pi, 0.0, 0.0 }
+        },
+        -- The second timeline entry
+        ["2000 JAN 01 12:00:00"] = {
+          Type = "StaticRotation",
+          Rotation = { 0.0, 0.0, 0.0 }
+        },
+        -- The third timeline entry
+        ["2000 JAN 01 23:59:59"] = {
+          Type = "StaticRotation",
+          Rotation = { 0.0, 0.0, math.pi }
+        }
+      },
+      ShouldInterpolate = false
+    }
+  },
+  Renderable = {
+    Type = "RenderableCartesianAxes"
+  },
+  GUI = {
+    Name = "TimelineRotation - No Interpolation",
+    Path = "/Examples"
+  }
+}
+
+asset.onInitialize(function()
+  openspace.addSceneGraphNode(Node)
+end)
+
+asset.onDeinitialize(function()
+  openspace.removeSceneGraphNode(Node)
+end)
diff --git a/data/assets/examples/rotation/timelinerotation/timeline.asset b/data/assets/examples/rotation/timelinerotation/timeline.asset
new file mode 100644
index 0000000000..51db1d1361
--- /dev/null
+++ b/data/assets/examples/rotation/timelinerotation/timeline.asset
@@ -0,0 +1,47 @@
+-- Basic
+-- This asset creates a SceneGraphNode that only displays coordinate axes. The rotation of
+-- the coordinate axes are determined by a timeline of individual rotations. These rotations
+-- are keyframes that are used to seamlessly change between different orientations. This
+-- example transitions between three rotations over a long time span. This example will
+-- only work if the in-game time is set to January 1st, 2000.
+
+local Node = {
+  Identifier = "TimelineRotation_Example",
+  Transform = {
+    Rotation = {
+      Type = "TimelineRotation",
+      Keyframes = {
+        -- The first timeline entry
+        ["2000 JAN 01 00:00:00"] = {
+          Type = "StaticRotation",
+          Rotation = { math.pi, 0.0, 0.0 }
+        },
+        -- The second timeline entry
+        ["2000 JAN 01 12:00:00"] = {
+          Type = "StaticRotation",
+          Rotation = { 0.0, 0.0, 0.0 }
+        },
+        -- The third timeline entry
+        ["2000 JAN 01 23:59:59"] = {
+          Type = "StaticRotation",
+          Rotation = { 0.0, 0.0, math.pi }
+        }
+      }
+    }
+  },
+  Renderable = {
+    Type = "RenderableCartesianAxes"
+  },
+  GUI = {
+    Name = "TimelineRotation - Basic",
+    Path = "/Examples"
+  }
+}
+
+asset.onInitialize(function()
+  openspace.addSceneGraphNode(Node)
+end)
+
+asset.onDeinitialize(function()
+  openspace.removeSceneGraphNode(Node)
+end)
diff --git a/modules/base/rotation/timelinerotation.cpp b/modules/base/rotation/timelinerotation.cpp
index d8a628e17d..6827d42c9a 100644
--- a/modules/base/rotation/timelinerotation.cpp
+++ b/modules/base/rotation/timelinerotation.cpp
@@ -107,14 +107,8 @@ glm::dmat3 TimelineRotation::matrix(const UpdateData& data) const {
         return glm::dmat3(glm::slerp(prevRot, nextRot, t));
     }
     else {
-        if (prevTime <= now && now < nextTime) {
-            return prev->data->matrix(data);
-        }
-        else if (nextTime <= now) {
-            return next->data->matrix(data);
-        }
+        return now < nextTime ? prev->data->matrix(data) : next->data->matrix(data);
     }
-    return glm::dmat3(0.0);
 }
 
 } // namespace openspace

From 75d7f63e26cc8ebbd46bcf9ca4e3916a78769a4c Mon Sep 17 00:00:00 2001
From: Alexander Bock <alexander.bock@liu.se>
Date: Wed, 12 Jun 2024 14:06:39 +0200
Subject: [PATCH 489/701] Make only the ISS orientation depend on the new orbit
 propagation (#3131)

---
 .../planets/earth/satellites/misc/iss.asset      | 16 ++++++++++++----
 1 file changed, 12 insertions(+), 4 deletions(-)

diff --git a/data/assets/scene/solarsystem/planets/earth/satellites/misc/iss.asset b/data/assets/scene/solarsystem/planets/earth/satellites/misc/iss.asset
index b920308d81..cd226d83db 100644
--- a/data/assets/scene/solarsystem/planets/earth/satellites/misc/iss.asset
+++ b/data/assets/scene/solarsystem/planets/earth/satellites/misc/iss.asset
@@ -42,7 +42,12 @@ local IssPosition = {
   Parent = transforms.EarthInertial.Identifier,
   BoundingSphere = 54.5, -- half the width
   Transform = {
-    Translation = {}, -- This translation is provided in the onInitialize
+    Translation = {
+      Type = "GPTranslation",
+      Observer = transforms.EarthInertial.Identifier,
+      File = omm .. "ISS.txt",
+      Format = "OMM"
+    }
   },
   Tag = { "earth_satellite", "ISS" },
   GUI = {
@@ -83,7 +88,12 @@ local IssTrail = {
   Parent = transforms.EarthInertial.Identifier,
   Renderable = {
     Type = "RenderableTrailOrbit",
-    Translation = {}, -- This translation is provided in the onInitialize
+    Translation = {
+      Type = "GPTranslation",
+      Observer = transforms.EarthInertial.Identifier,
+      File = omm .. "ISS.txt",
+      Format = "OMM"
+    },
     RenderBinMode = "PostDeferredTransparent",
     Color = { 0.9, 0.6715, 0.0 },
     Fade = 1.5,
@@ -144,8 +154,6 @@ asset.onInitialize(function()
   local translation, kernel = openspace.space.tleToSpiceTranslation(tle .. "ISS.txt")
   kernelFile = kernel -- Store the path for the deinitialize function
   openspace.spice.loadKernel(kernelFile)
-  IssPosition.Transform.Translation = translation;
-  IssTrail.Renderable.Translation = translation;
 
   openspace.spice.loadKernel(kernels .. "iss.tf")
 

From 46fea0a047113bffb96dbac3f53500e23914e03e Mon Sep 17 00:00:00 2001
From: Alexander Bock <alexander.bock@liu.se>
Date: Wed, 12 Jun 2024 14:39:00 +0200
Subject: [PATCH 490/701] Correctly specify the size of the ESRI world imagery
 layer (closes #2968)

---
 .../planets/earth/layers/colorlayers/esri_world_imagery.wms     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/data/assets/scene/solarsystem/planets/earth/layers/colorlayers/esri_world_imagery.wms b/data/assets/scene/solarsystem/planets/earth/layers/colorlayers/esri_world_imagery.wms
index 34b474d295..5b2de30119 100644
--- a/data/assets/scene/solarsystem/planets/earth/layers/colorlayers/esri_world_imagery.wms
+++ b/data/assets/scene/solarsystem/planets/earth/layers/colorlayers/esri_world_imagery.wms
@@ -6,7 +6,7 @@
     <UpperLeftX>-180.0</UpperLeftX>
     <UpperLeftY>90</UpperLeftY>
     <LowerRightX>180</LowerRightX>
-    <LowerRightY>-89.999999</LowerRightY>
+    <LowerRightY>-90</LowerRightY>
     <TileLevel>19</TileLevel>
     <TileCountX>2</TileCountX>
     <TileCountY>1</TileCountY>

From 866aad218790f930791125877cb881ff004c62d4 Mon Sep 17 00:00:00 2001
From: Alexander Bock <alexander.bock@liu.se>
Date: Wed, 12 Jun 2024 14:51:25 +0200
Subject: [PATCH 491/701] Global pass over the coding style

---
 ext/ghoul                                     |  2 +-
 include/openspace/properties/propertyowner.h  |  8 ++---
 include/openspace/rendering/labelscomponent.h |  4 +--
 modules/audio/audiomodule.h                   |  6 ++--
 .../base/rendering/grids/renderablegrid.cpp   |  3 +-
 .../renderableinterpolatedpoints.cpp          | 26 +++++++-------
 .../pointcloud/renderablepointcloud.cpp       | 35 ++++++++++++-------
 modules/base/rendering/renderablemodel.cpp    |  6 ++--
 modules/base/rendering/renderabletrail.h      |  2 +-
 .../rendering/renderabletrailtrajectory.h     |  4 +--
 modules/base/rotation/luarotation.cpp         |  6 ++--
 modules/globebrowsing/globebrowsingmodule.cpp |  4 ++-
 .../globebrowsing/globebrowsingmodule_lua.inl |  9 ++++-
 .../renderableconstellationlines.cpp          |  6 ++--
 .../space/rendering/renderableorbitalkepler.h |  2 +-
 .../space/rendering/renderabletravelspeed.cpp |  3 +-
 .../util/projectioncomponent.cpp              |  2 --
 src/data/csvloader.cpp                        |  2 +-
 src/data/speckloader.cpp                      |  3 +-
 src/documentation/documentationengine.cpp     | 23 ++++++------
 src/navigation/navigationhandler_lua.inl      |  8 ++---
 src/navigation/pathnavigator_lua.inl          | 10 +++---
 src/rendering/screenspacerenderable.cpp       |  7 ++--
 23 files changed, 103 insertions(+), 78 deletions(-)

diff --git a/ext/ghoul b/ext/ghoul
index 89cd93b9e5..8c041d702c 160000
--- a/ext/ghoul
+++ b/ext/ghoul
@@ -1 +1 @@
-Subproject commit 89cd93b9e5191e75e07395024f8b16ab20ae9f99
+Subproject commit 8c041d702c2992d0a3e248baa2aed42292d8426e
diff --git a/include/openspace/properties/propertyowner.h b/include/openspace/properties/propertyowner.h
index 16ec2057b6..70428667c8 100644
--- a/include/openspace/properties/propertyowner.h
+++ b/include/openspace/properties/propertyowner.h
@@ -153,11 +153,11 @@ public:
     Property* property(const std::string& uri) const;
 
     /**
-     * Retrieves a PropertyOwner identified by \p uri from this PropertyOwner. If \p uri 
+     * Retrieves a PropertyOwner identified by \p uri from this PropertyOwner. If \p uri
      * does not contain a `.` it is an identifier and must refer to a PropertyOwner
      * directly owned by this PropertyOwner. If the uri contains one or more `.`, the
      * first part of the name will be recursively extracted and used as a name for a sub-
-     * owner and only the last part of the uri is referring to a PropertyOwner owned by a 
+     * owner and only the last part of the uri is referring to a PropertyOwner owned by a
      * PropertyOwner named by the second-but-last name.
      *
      * \param uri The uri or identifier of the PropertyOwner that should be extracted
@@ -170,8 +170,8 @@ public:
      * Returns a uri for this PropertyOwner. This is created by looking up all the owners
      * of this PropertyOwner. The owner identifiers are separated by ".", which make up
      * the uri of this PropertyOwner.
-     * 
-     * \return The uri of this PropertyOwner 
+     *
+     * \return The uri of this PropertyOwner
      */
     std::string uri() const;
 
diff --git a/include/openspace/rendering/labelscomponent.h b/include/openspace/rendering/labelscomponent.h
index c729670534..93cc016401 100644
--- a/include/openspace/rendering/labelscomponent.h
+++ b/include/openspace/rendering/labelscomponent.h
@@ -56,8 +56,8 @@ public:
     void initialize();
 
     /**
-     * Create the labels from an already loaded dataset. That dataset should have a comment
-     * per point to be used for the labels.
+     * Create the labels from an already loaded dataset. That dataset should have a
+     * comment per point to be used for the labels.
      *
      * This function should be called before the labels are initialized
      *
diff --git a/modules/audio/audiomodule.h b/modules/audio/audiomodule.h
index ee93f24424..7ff817124c 100644
--- a/modules/audio/audiomodule.h
+++ b/modules/audio/audiomodule.h
@@ -22,8 +22,8 @@
  * OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                                         *
  ****************************************************************************************/
 
-#ifndef __OPENSPACE_MODULE_SPACE___AUDIOMODULE___H__
-#define __OPENSPACE_MODULE_SPACE___AUDIOMODULE___H__
+#ifndef __OPENSPACE_MODULE_AUDIO___AUDIOMODULE___H__
+#define __OPENSPACE_MODULE_AUDIO___AUDIOMODULE___H__
 
 #include <openspace/util/openspacemodule.h>
 
@@ -312,4 +312,4 @@ private:
 
 } // namespace openspace
 
-#endif // __OPENSPACE_MODULE_SPACE___AUDIOMODULE___H__
+#endif // __OPENSPACE_MODULE_AUDIO___AUDIOMODULE___H__
diff --git a/modules/base/rendering/grids/renderablegrid.cpp b/modules/base/rendering/grids/renderablegrid.cpp
index 89f9f7af45..2353ef282c 100644
--- a/modules/base/rendering/grids/renderablegrid.cpp
+++ b/modules/base/rendering/grids/renderablegrid.cpp
@@ -76,7 +76,8 @@ namespace {
     constexpr openspace::properties::Property::PropertyInfo HighlightLineWidthInfo = {
         "HighlightLineWidth",
         "Highlight Line Width",
-        "The width of the highlighted grid lines. The larger number, the thicker the lines.",
+        "The width of the highlighted grid lines. The larger number, the thicker the "
+        "lines.",
         openspace::properties::Property::Visibility::User
     };
 
diff --git a/modules/base/rendering/pointcloud/renderableinterpolatedpoints.cpp b/modules/base/rendering/pointcloud/renderableinterpolatedpoints.cpp
index 9c16476f58..8cc051be28 100644
--- a/modules/base/rendering/pointcloud/renderableinterpolatedpoints.cpp
+++ b/modules/base/rendering/pointcloud/renderableinterpolatedpoints.cpp
@@ -492,8 +492,8 @@ void RenderableInterpolatedPoints::initializeBufferData() {
         LDEBUG(std::format("Generating Vertex Buffer Object id '{}'", _vbo));
     }
 
-    const int attibutesPerPoint = nAttributesPerPoint();
-    const unsigned int bufferSize = attibutesPerPoint * _nDataPoints * sizeof(float);
+    const int attibsPerPoint = nAttributesPerPoint();
+    const unsigned int bufferSize = attibsPerPoint * _nDataPoints * sizeof(float);
 
     // Allocate the memory for the buffer (we will want to upload the data quite often)
     glBindVertexArray(_vao);
@@ -502,31 +502,31 @@ void RenderableInterpolatedPoints::initializeBufferData() {
 
     int offset = 0;
 
-    offset = bufferVertexAttribute("in_position0", 3, attibutesPerPoint, offset);
-    offset = bufferVertexAttribute("in_position1", 3, attibutesPerPoint, offset);
+    offset = bufferVertexAttribute("in_position0", 3, attibsPerPoint, offset);
+    offset = bufferVertexAttribute("in_position1", 3, attibsPerPoint, offset);
 
     if (useSplineInterpolation()) {
-        offset = bufferVertexAttribute("in_position_before", 3, attibutesPerPoint, offset);
-        offset = bufferVertexAttribute("in_position_after", 3, attibutesPerPoint, offset);
+        offset = bufferVertexAttribute("in_position_before", 3, attibsPerPoint, offset);
+        offset = bufferVertexAttribute("in_position_after", 3, attibsPerPoint, offset);
     }
 
     if (hasColorData()) {
-        offset = bufferVertexAttribute("in_colorParameter0", 1, attibutesPerPoint, offset);
-        offset = bufferVertexAttribute("in_colorParameter1", 1, attibutesPerPoint, offset);
+        offset = bufferVertexAttribute("in_colorParameter0", 1, attibsPerPoint, offset);
+        offset = bufferVertexAttribute("in_colorParameter1", 1, attibsPerPoint, offset);
     }
 
     if (hasSizeData()) {
-        offset = bufferVertexAttribute("in_scalingParameter0", 1, attibutesPerPoint, offset);
-        offset = bufferVertexAttribute("in_scalingParameter1", 1, attibutesPerPoint, offset);
+        offset = bufferVertexAttribute("in_scalingParameter0", 1, attibsPerPoint, offset);
+        offset = bufferVertexAttribute("in_scalingParameter1", 1, attibsPerPoint, offset);
     }
 
     if (useOrientationData()) {
-        offset = bufferVertexAttribute("in_orientation0", 4, attibutesPerPoint, offset);
-        offset = bufferVertexAttribute("in_orientation1", 4, attibutesPerPoint, offset);
+        offset = bufferVertexAttribute("in_orientation0", 4, attibsPerPoint, offset);
+        offset = bufferVertexAttribute("in_orientation1", 4, attibsPerPoint, offset);
     }
 
     if (_hasSpriteTexture) {
-        offset = bufferVertexAttribute("in_textureLayer", 1, attibutesPerPoint, offset);
+        offset = bufferVertexAttribute("in_textureLayer", 1, attibsPerPoint, offset);
     }
 
     glBindVertexArray(0);
diff --git a/modules/base/rendering/pointcloud/renderablepointcloud.cpp b/modules/base/rendering/pointcloud/renderablepointcloud.cpp
index 21b462a132..4e3e7b5ea7 100644
--- a/modules/base/rendering/pointcloud/renderablepointcloud.cpp
+++ b/modules/base/rendering/pointcloud/renderablepointcloud.cpp
@@ -189,13 +189,14 @@ namespace {
     constexpr openspace::properties::Property::PropertyInfo UseOrientationDataInfo = {
         "UseOrientationData",
         "Use Orientation Data",
-        "If true, the orientation data in the dataset is included when rendering the points, "
-        "if there is any. To see the rotation, you also need to set the \"Orientation "
-        "Render Option\" to \"Fixed Rotation\".",
+        "If true, the orientation data in the dataset is included when rendering the "
+        "points, if there is any. To see the rotation, you also need to set the "
+        "\"Orientation Render Option\" to \"Fixed Rotation\".",
         openspace::properties::Property::Visibility::AdvancedUser
     };
 
-    constexpr openspace::properties::Property::PropertyInfo OrientationRenderOptionInfo = {
+    constexpr openspace::properties::Property::PropertyInfo OrientationRenderOptionInfo =
+    {
         "OrientationRenderOption",
         "Orientation Render Option",
         "Controls how the planes for the points will be oriented. \"Camera View "
@@ -1116,7 +1117,14 @@ void RenderablePointCloud::generateArrayTextures() {
         unsigned int layer = 0;
         for (const size_t& i : textureListIndices) {
             ghoul::opengl::Texture* texture = _textures[i].get();
-            fillAndUploadTextureLayer(arrayIndex, layer, i, res, useAlpha, texture->pixelData());
+            fillAndUploadTextureLayer(
+                arrayIndex,
+                layer,
+                i,
+                res,
+                useAlpha,
+                texture->pixelData()
+            );
             layer++;
 
             // At this point we don't need the keep the texture data around anymore. If
@@ -1451,7 +1459,7 @@ int RenderablePointCloud::nAttributesPerPoint() const {
 }
 
 int RenderablePointCloud::bufferVertexAttribute(const std::string& name, GLint nValues,
-                                                 int nAttributesPerPoint, int offset) const
+                                                int nAttributesPerPoint, int offset) const
 {
     GLint attrib = _program->attributeLocation(name);
     glEnableVertexAttribArray(attrib);
@@ -1493,25 +1501,25 @@ void RenderablePointCloud::updateBufferData() {
     glBindBuffer(GL_ARRAY_BUFFER, _vbo);
     glBufferData(GL_ARRAY_BUFFER, size * sizeof(float), slice.data(), GL_STATIC_DRAW);
 
-    const int attibutesPerPoint = nAttributesPerPoint();
+    const int attibsPerPoint = nAttributesPerPoint();
     int offset = 0;
 
-    offset = bufferVertexAttribute("in_position", 3, attibutesPerPoint, offset);
+    offset = bufferVertexAttribute("in_position", 3, attibsPerPoint, offset);
 
     if (hasColorData()) {
-        offset = bufferVertexAttribute("in_colorParameter", 1, attibutesPerPoint, offset);
+        offset = bufferVertexAttribute("in_colorParameter", 1, attibsPerPoint, offset);
     }
 
     if (hasSizeData()) {
-        offset = bufferVertexAttribute("in_scalingParameter", 1, attibutesPerPoint, offset);
+        offset = bufferVertexAttribute("in_scalingParameter", 1, attibsPerPoint, offset);
     }
 
     if (useOrientationData()) {
-        offset = bufferVertexAttribute("in_orientation", 4, attibutesPerPoint, offset);
+        offset = bufferVertexAttribute("in_orientation", 4, attibsPerPoint, offset);
     }
 
     if (_hasSpriteTexture) {
-        offset = bufferVertexAttribute("in_textureLayer", 1, attibutesPerPoint, offset);
+        offset = bufferVertexAttribute("in_textureLayer", 1, attibsPerPoint, offset);
     }
 
     glBindVertexArray(0);
@@ -1543,7 +1551,8 @@ void RenderablePointCloud::updateSpriteTexture() {
             initializeSingleTexture();
             // Note that these are usually set when the data slice initialized. However,
             // we want to avoid reinitializing the data, and here we know that all points
-            // will be rendered using the same texture array and hence the data can stay fixed
+            // will be rendered using the same texture array and hence the data can stay
+            // fixed
             _textureArrays.front().nPoints = _nDataPoints;
             _textureArrays.front().startOffset = 0;
             _dataIsDirty = false;
diff --git a/modules/base/rendering/renderablemodel.cpp b/modules/base/rendering/renderablemodel.cpp
index 27abcaf182..7881a8ddf5 100644
--- a/modules/base/rendering/renderablemodel.cpp
+++ b/modules/base/rendering/renderablemodel.cpp
@@ -130,9 +130,9 @@ namespace {
     constexpr openspace::properties::Property::PropertyInfo ModelScaleInfo = {
         "ModelScale",
         "Model Scale",
-        "The scale of the model. If a numeric value is provided in the asset file, the scale "
-        "will be that exact value. If instead a unit name is provided, this "
-        "is the value that that name represents. For example 'Centimeter' becomes 0.01.",
+        "The scale of the model. If a numeric value is provided in the asset file, the "
+        "scale will be that exact value. If instead a unit name is provided, this is the "
+        "value that that name represents. For example 'Centimeter' becomes 0.01.",
         openspace::properties::Property::Visibility::AdvancedUser
     };
 
diff --git a/modules/base/rendering/renderabletrail.h b/modules/base/rendering/renderabletrail.h
index 525e8d9cfb..9130523d40 100644
--- a/modules/base/rendering/renderabletrail.h
+++ b/modules/base/rendering/renderabletrail.h
@@ -196,7 +196,7 @@ private:
     UniformCache(opacity, modelViewTransform, projectionTransform, color, useLineFade,
         lineLength, lineFadeAmount, vertexSortingMethod, idOffset, nVertices, stride,
         pointSize, renderPhase, useSplitRenderMode, floatingOffset, numberOfUniqueVertices
-    ) _uniformCache; 
+    ) _uniformCache;
 #else
     UniformCache(opacity, modelViewTransform, projectionTransform, color, useLineFade,
         lineLength, lineFadeAmount, vertexSortingMethod, idOffset, nVertices, stride,
diff --git a/modules/base/rendering/renderabletrailtrajectory.h b/modules/base/rendering/renderabletrailtrajectory.h
index 9a4c69d3e4..baab782c9a 100644
--- a/modules/base/rendering/renderabletrailtrajectory.h
+++ b/modules/base/rendering/renderabletrailtrajectory.h
@@ -82,7 +82,7 @@ private:
     properties::IntProperty _timeStampSubsamplingFactor;
     /// Determines whether the full trail should be rendered or the future trail removed
     properties::BoolProperty _renderFullTrail;
-    /// Determines how many vertices around the object that will be 
+    /// Determines how many vertices around the object that will be
     /// replaced during full trail rendering
     properties::IntProperty _numberOfReplacementPoints;
 
@@ -114,7 +114,7 @@ private:
 
     /// Contains all timestamps corresponding to the positions in _vertexArray
     std::vector<double> _timeVector;
-    
+
     /// Keeps track of all double precision vertices of trails
     std::vector<TrailVBOLayout<double>> _dVertexArray;
 
diff --git a/modules/base/rotation/luarotation.cpp b/modules/base/rotation/luarotation.cpp
index f432c3cb24..2e6124db18 100644
--- a/modules/base/rotation/luarotation.cpp
+++ b/modules/base/rotation/luarotation.cpp
@@ -43,9 +43,9 @@ namespace {
         "'rotation' that takes the current simulation time in seconds past the J2000 "
         "epoch as the first argument, the simulation time in seconds past the J2000 "
         "epoch of the last frame as the second argument, and the current wall time as "
-        "milliseconds past the J2000 epoch as the third argument. It computes the rotation "
-        "value factors returned as a table containing the 9 values that make up the "
-        "resulting rotation matrix.",
+        "milliseconds past the J2000 epoch as the third argument. It computes the "
+        "rotation value factors returned as a table containing the 9 values that make up "
+        "the resulting rotation matrix.",
         openspace::properties::Property::Visibility::AdvancedUser
     };
 
diff --git a/modules/globebrowsing/globebrowsingmodule.cpp b/modules/globebrowsing/globebrowsingmodule.cpp
index df02c5f4e1..c6c4ffa7f4 100644
--- a/modules/globebrowsing/globebrowsingmodule.cpp
+++ b/modules/globebrowsing/globebrowsingmodule.cpp
@@ -385,7 +385,9 @@ void GlobeBrowsingModule::goToGeo(const globebrowsing::RenderableGlobe& globe,
 
 glm::vec3 GlobeBrowsingModule::cartesianCoordinatesFromGeo(
                                               const globebrowsing::RenderableGlobe& globe,
-                                       double latitude, double longitude, std::optional<double> altitude)
+                                                                          double latitude,
+                                                                         double longitude,
+                                                           std::optional<double> altitude)
 {
     using namespace globebrowsing;
 
diff --git a/modules/globebrowsing/globebrowsingmodule_lua.inl b/modules/globebrowsing/globebrowsingmodule_lua.inl
index 8cdb4d64ed..b7d2fbdf29 100644
--- a/modules/globebrowsing/globebrowsingmodule_lua.inl
+++ b/modules/globebrowsing/globebrowsingmodule_lua.inl
@@ -460,7 +460,14 @@ void flyToGeoInternal(std::string globe, double latitude,
         altitude = global::navigationHandler->pathNavigator().defaultArrivalHeight(globe);
     }
 
-    flyToGeoInternal(globe, latitude, longitude, std::nullopt, duration, shouldUseUpVector);
+    flyToGeoInternal(
+        globe,
+        latitude,
+        longitude,
+        std::nullopt,
+        duration,
+        shouldUseUpVector
+    );
 }
 
  /**
diff --git a/modules/space/rendering/renderableconstellationlines.cpp b/modules/space/rendering/renderableconstellationlines.cpp
index dc327c3dc7..192c954366 100644
--- a/modules/space/rendering/renderableconstellationlines.cpp
+++ b/modules/space/rendering/renderableconstellationlines.cpp
@@ -72,9 +72,9 @@ namespace {
         "Colors",
         "Constellation Colors",
         "A list of colors to use for the constellations. A data file may include several "
-        "groups of constellations, where each group can have a distinct color. The index for "
-        "the color parameter for each constellation in the data file corresponds to the "
-        "order of the colors in this list.",
+        "groups of constellations, where each group can have a distinct color. The index "
+        "for the color parameter for each constellation in the data file corresponds to "
+        "the order of the colors in this list.",
         openspace::properties::Property::Visibility::User
     };
 
diff --git a/modules/space/rendering/renderableorbitalkepler.h b/modules/space/rendering/renderableorbitalkepler.h
index d404806640..76560bc41d 100644
--- a/modules/space/rendering/renderableorbitalkepler.h
+++ b/modules/space/rendering/renderableorbitalkepler.h
@@ -115,7 +115,7 @@ private:
     UniformCache(modelView, projection, trailFadeExponent, colorFadeCutoffValue,
         inGameTime, color, opacity)
         _uniformTrailCache;
-    
+
     // Point cache
     UniformCache(modelTransform, viewTransform, projectionTransform,
         cameraPositionWorld, cameraUpWorld,  inGameTime, color,
diff --git a/modules/space/rendering/renderabletravelspeed.cpp b/modules/space/rendering/renderabletravelspeed.cpp
index b841bf3ea6..19eaa6fff6 100644
--- a/modules/space/rendering/renderabletravelspeed.cpp
+++ b/modules/space/rendering/renderabletravelspeed.cpp
@@ -74,7 +74,8 @@ namespace {
         "Indicator Length",
         "The length of the speed indicator line, given in seconds. The length will be "
         "computed as the speed times this value. For example, a value of 1 will make it "
-        "as long as the distance it would travel over one second with the specified speed.",
+        "as long as the distance it would travel over one second with the specified "
+        "speed.",
         openspace::properties::Property::Visibility::User
     };
 
diff --git a/modules/spacecraftinstruments/util/projectioncomponent.cpp b/modules/spacecraftinstruments/util/projectioncomponent.cpp
index 8dc0af50ee..78458622c7 100644
--- a/modules/spacecraftinstruments/util/projectioncomponent.cpp
+++ b/modules/spacecraftinstruments/util/projectioncomponent.cpp
@@ -212,8 +212,6 @@ void ProjectionComponent::initialize(const std::string& identifier,
         return;
     }
 
-    //std::variant<std::filesystem::path, std::vector<std::filesystem::path>> s = *p.sequence;
-
     std::vector<std::filesystem::path> sequenceSources;
     if (std::holds_alternative<std::filesystem::path>(*p.sequence)) {
         sequenceSources.push_back(absPath(std::get<std::filesystem::path>(*p.sequence)));
diff --git a/src/data/csvloader.cpp b/src/data/csvloader.cpp
index f29cdf061a..c68aa9ef27 100644
--- a/src/data/csvloader.cpp
+++ b/src/data/csvloader.cpp
@@ -262,7 +262,7 @@ std::vector<Dataset::Texture> loadTextureMapFile(std::filesystem::path path,
     std::vector<Dataset::Texture> res;
 
     std::string line;
-    while (std::getline(file, line)) {
+    while (ghoul::getline(file, line)) {
         ghoul::trimWhitespace(line);
         currentLineNumber++;
 
diff --git a/src/data/speckloader.cpp b/src/data/speckloader.cpp
index f47b2058a9..65a33fefac 100644
--- a/src/data/speckloader.cpp
+++ b/src/data/speckloader.cpp
@@ -185,7 +185,8 @@ Dataset loadSpeckFile(std::filesystem::path path, std::optional<DataMapping> spe
 
             if (nNonEmptyTokens > 4) {
                 throw ghoul::RuntimeError(std::format(
-                    "Error loading speck file {}: Too many arguments for texture on line {}",
+                    "Error loading speck file {}: Too many arguments for texture on line "
+                    "{}",
                     path, currentLineNumber
                 ));
             }
diff --git a/src/documentation/documentationengine.cpp b/src/documentation/documentationengine.cpp
index 6cb205ed9e..4e406eae29 100644
--- a/src/documentation/documentationengine.cpp
+++ b/src/documentation/documentationengine.cpp
@@ -196,7 +196,8 @@ namespace {
 
         using namespace openspace;
         nlohmann::json json;
-        json[NameKey] = !owner->guiName().empty() ? owner->guiName() : owner->identifier();
+        json[NameKey] =
+            !owner->guiName().empty() ? owner->guiName() : owner->identifier();
 
         json[DescriptionKey] = owner->description();
         json[PropertiesKeys] = nlohmann::json::array();
@@ -332,14 +333,16 @@ nlohmann::json DocumentationEngine::generateLicenseGroupsJson() const {
     nlohmann::json json;
 
     if (global::profile->meta.has_value()) {
+        Profile::Meta meta = *global::profile->meta;
+
         nlohmann::json metaJson;
         metaJson[NameKey] = ProfileName;
-        metaJson[ProfileNameKey] = global::profile->meta->name.value_or(NoDataName);
-        metaJson[VersionKey] = global::profile->meta->version.value_or(NoDataName);
-        metaJson[DescriptionKey] = global::profile->meta->description.value_or(NoDataName);
-        metaJson[AuthorKey] = global::profile->meta->author.value_or(NoDataName);
-        metaJson[UrlKey] = global::profile->meta->url.value_or(NoDataName);
-        metaJson[LicenseKey] = global::profile->meta->license.value_or(NoDataName);
+        metaJson[ProfileNameKey] = meta.name.value_or(NoDataName);
+        metaJson[VersionKey] = meta.version.value_or(NoDataName);
+        metaJson[DescriptionKey] = meta.description.value_or(NoDataName);
+        metaJson[AuthorKey] = meta.author.value_or(NoDataName);
+        metaJson[UrlKey] = meta.url.value_or(NoDataName);
+        metaJson[LicenseKey] = meta.license.value_or(NoDataName);
         json.push_back(std::move(metaJson));
     }
 
@@ -361,8 +364,8 @@ nlohmann::json DocumentationEngine::generateLicenseGroupsJson() const {
         assetJson[NameKey] = meta.has_value() ? meta->name : NoDataName;
         assetJson[VersionKey] = meta.has_value() ? meta->version : NoDataName;
         assetJson[DescriptionKey] = meta.has_value() ? meta->description : NoDataName;
-        assetJson[AuthorKey] = meta.has_value() ? meta->author : NoDataName; 
-        assetJson[UrlKey] = meta.has_value() ? meta->url : NoDataName; 
+        assetJson[AuthorKey] = meta.has_value() ? meta->author : NoDataName;
+        assetJson[UrlKey] = meta.has_value() ? meta->url : NoDataName;
         assetJson[LicenseKey] = licenseName;
         assetJson[PathKey] = asset->path().string();
         assetJson[IdKey] = asset->path().string();
@@ -483,7 +486,7 @@ nlohmann::json DocumentationEngine::generateEventJson() const {
     return result;
 }
 
-nlohmann::json DocumentationEngine::generateFactoryManagerJson() const {                 
+nlohmann::json DocumentationEngine::generateFactoryManagerJson() const {
     nlohmann::json json;
 
     std::vector<Documentation> docs = _documentations; // Copy the documentations
diff --git a/src/navigation/navigationhandler_lua.inl b/src/navigation/navigationhandler_lua.inl
index 0a3be04c6a..d2b6e126cf 100644
--- a/src/navigation/navigationhandler_lua.inl
+++ b/src/navigation/navigationhandler_lua.inl
@@ -50,8 +50,8 @@ namespace {
 /**
  * Return the current [NavigationState](#core_navigation_state) as a Lua table.
  *
- * By default, the reference frame will be picked based on whether the orbital navigator is
- * currently following the anchor node rotation. If it is, the anchor will be chosen as
+ * By default, the reference frame will be picked based on whether the orbital navigator
+ * is currently following the anchor node rotation. If it is, the anchor will be chosen as
  * reference frame. If not, the reference frame will be set to the scene graph root.
  *
  * \param frame the identifier of an optional scene graph node to use as reference frame
@@ -403,8 +403,8 @@ struct [[codegen::Dictionary(JoystickAxis)]] JoystickAxis {
  *               `"Press"`, which means that the script is run when the user presses the
  *               button. Alternatives are `"Idle"` (if the button is unpressed and has
  *               been unpressed since the last frame), `"Repeat"` (if the button has been
- *               pressed since longer than the last frame), and `"Release"` (if the button was
- *               released since the last frame)
+ *               pressed since longer than the last frame), and `"Release"` (if the button
+ *               was released since the last frame)
  * \param isRemote a value saying whether the command is going to be executable
  *                 locally or remotely, where the latter is the default
  */
diff --git a/src/navigation/pathnavigator_lua.inl b/src/navigation/pathnavigator_lua.inl
index 72d2e25128..9b7832ccb4 100644
--- a/src/navigation/pathnavigator_lua.inl
+++ b/src/navigation/pathnavigator_lua.inl
@@ -168,8 +168,9 @@ namespace {
 }
 
 /**
- * Create a path to the navigation state described by the input table. Note that roll must be
- * included for the target up direction in the navigation state to be taken into account.
+ * Create a path to the navigation state described by the input table. Note that roll must
+ * be included for the target up direction in the navigation state to be taken into
+ * account.
  *
  * \param navigationState A [NavigationState](#core_navigation_state) to fly to
  * \param duration An optional duration for the motion to take, in seconds. For example,
@@ -410,8 +411,9 @@ namespace {
 /**
  * Create a camera path as described by the instruction in the input argument.
  *
- * \param pathInstruction A table representing a [PathInstruction](#core_path_instruction),
- *                        that describes a camera path to be created
+ * \param pathInstruction A table representing a
+ *                        [PathInstruction](#core_path_instruction) that describes a
+ *                        camera path to be created
  */
 [[codegen::luawrap]] void createPath(ghoul::Dictionary pathInstruction) {
     using namespace openspace;
diff --git a/src/rendering/screenspacerenderable.cpp b/src/rendering/screenspacerenderable.cpp
index f4b85bd084..5e7e7ccb78 100644
--- a/src/rendering/screenspacerenderable.cpp
+++ b/src/rendering/screenspacerenderable.cpp
@@ -100,9 +100,10 @@ namespace {
     constexpr openspace::properties::Property::PropertyInfo ScaleInfo = {
         "Scale",
         "Scale Value",
-        "A scale factor for the plane that can be used to increase or decrease the visual "
-        "size. The default size is determined separately for each screen space renderable "
-        "type and may for example be affected by the size of an image being displayed.",
+        "A scale factor for the plane that can be used to increase or decrease the "
+        "visual size. The default size is determined separately for each screen space "
+        "renderable type and may for example be affected by the size of an image being "
+        "displayed.",
         openspace::properties::Property::Visibility::NoviceUser
     };
 

From 93da7f42bafd3308e902ec3d75e4beef3fac5025 Mon Sep 17 00:00:00 2001
From: Gene Payne <payne.gene@gmail.com>
Date: Wed, 12 Jun 2024 09:09:24 -0600
Subject: [PATCH 492/701] Removing all 'SSSB' elements in GUI path of the
 solarsystem/sssb assets (#3322)

A manual update of assets in solarsystem/sssb: tesla_roadster.asset, swifttuttle.asset, itokawa.asset, c2019y4atlas.asset
---
 data/assets/scene/solarsystem/sssb/c2019y4atlas.asset   | 4 ++--
 data/assets/scene/solarsystem/sssb/itokawa.asset        | 6 +++---
 data/assets/scene/solarsystem/sssb/swifttuttle.asset    | 4 ++--
 data/assets/scene/solarsystem/sssb/tesla_roadster.asset | 4 ++--
 4 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/data/assets/scene/solarsystem/sssb/c2019y4atlas.asset b/data/assets/scene/solarsystem/sssb/c2019y4atlas.asset
index dcf5dda490..8a9537bb90 100644
--- a/data/assets/scene/solarsystem/sssb/c2019y4atlas.asset
+++ b/data/assets/scene/solarsystem/sssb/c2019y4atlas.asset
@@ -33,7 +33,7 @@ local C2019Y4AtlasTrail = {
   },
   GUI = {
     Name = "C2019 Y4 Atlas Trail",
-    Path = "/Solar System/Comets"
+    Path = "/Solar System/Small Bodies"
   }
 }
 
@@ -48,7 +48,7 @@ local C2019Y4AtlasPosition = {
   },
   GUI = {
     Name = "C/2019 Y4 Atlas",
-    Path = "/Solar System/Comets",
+    Path = "/Solar System/Small Bodies",
     Description = "This is the position for C/2019 Y4 Atlas"
   }
 }
diff --git a/data/assets/scene/solarsystem/sssb/itokawa.asset b/data/assets/scene/solarsystem/sssb/itokawa.asset
index ce47b20119..d473d04d8d 100644
--- a/data/assets/scene/solarsystem/sssb/itokawa.asset
+++ b/data/assets/scene/solarsystem/sssb/itokawa.asset
@@ -37,7 +37,7 @@ local ItokawaTrail = {
   },
   GUI = {
     Name = "Itokawa Trail",
-    Path = "/Solar System/SSSB/Itokawa",
+    Path = "/Solar System/Small Bodies/Itokawa",
     Description = [[Trail of asteroid 25143 Itokawa from 1950 JAN 1 00:00:00
       to 2050 JAN 1 00:00:00. Data from JPL Horizons]]
   }
@@ -54,7 +54,7 @@ local ItokawaPosition = {
   },
   GUI = {
     Name = "Itokawa Position",
-    Path = "/Solar System/SSSB/Itokawa",
+    Path = "/Solar System/Small Bodies/Itokawa",
     Description = [[Position of asteroid 25143 Itokawa from 1950 JAN 1 00:00:00
       to 2050 JAN 1 00:00:00. Data from JPL Horizons]]
   }
@@ -74,7 +74,7 @@ local ItokawaModel = {
   },
   GUI = {
     Name = "Itokawa Model",
-    Path = "/Solar System/SSSB/Itokawa",
+    Path = "/Solar System/Small Bodies/Itokawa",
     Description = [[Model of asteroid 25143 Itokawa. 3D model from
       https://solarsystem.nasa.gov/resources/2377/asteroid-itokawa-3d-model]]
   }
diff --git a/data/assets/scene/solarsystem/sssb/swifttuttle.asset b/data/assets/scene/solarsystem/sssb/swifttuttle.asset
index c19c962dec..50acb133b0 100644
--- a/data/assets/scene/solarsystem/sssb/swifttuttle.asset
+++ b/data/assets/scene/solarsystem/sssb/swifttuttle.asset
@@ -30,7 +30,7 @@ local SwiftTuttleTrail = {
   },
   GUI = {
     Name = "Swift Tuttle Trail",
-    Path = "/Solar System/SSSB"
+    Path = "/Solar System/Small Bodies"
   }
 }
 
@@ -45,7 +45,7 @@ local SwiftTuttlePosition = {
   },
   GUI = {
     Name = "Swift Tuttle Position",
-    Path = "/Solar System/SSSB"
+    Path = "/Solar System/Small Bodies"
   }
 }
 
diff --git a/data/assets/scene/solarsystem/sssb/tesla_roadster.asset b/data/assets/scene/solarsystem/sssb/tesla_roadster.asset
index 0afdadd5ae..e9d45b687d 100644
--- a/data/assets/scene/solarsystem/sssb/tesla_roadster.asset
+++ b/data/assets/scene/solarsystem/sssb/tesla_roadster.asset
@@ -30,7 +30,7 @@ local TeslaRoadsterTrail = {
   },
   GUI = {
     Name = "Tesla Roadster Trail",
-    Path = "/Solar System/SSSB"
+    Path = "/Solar System/Small Bodies"
   }
 }
 
@@ -45,7 +45,7 @@ local TeslaPosition = {
   },
   GUI = {
     Name = "Tesla Roadster",
-    Path = "/Solar System/SSSB",
+    Path = "/Solar System/Small Bodies",
     Description = [[Position and Trail of Tesla Roadster from 2018 FEB 7 03:00:00
       to 2089 DEC 31 03:00:00. Data from JPL Horizons]]
   }

From c8606c60957716016c1151425ea1ca18da00bba5 Mon Sep 17 00:00:00 2001
From: Arohdin <adam.rohdin@outlook.com>
Date: Wed, 12 Jun 2024 17:19:12 +0200
Subject: [PATCH 493/701] Fix jittering issues for point rendered satellites

---
 .../rendering/renderableorbitalkepler.cpp     |  2 +-
 modules/space/shaders/debrisVizPoints_gs.glsl | 44 +++++++++----------
 2 files changed, 22 insertions(+), 24 deletions(-)

diff --git a/modules/space/rendering/renderableorbitalkepler.cpp b/modules/space/rendering/renderableorbitalkepler.cpp
index f3362e1c0c..7fa6033957 100644
--- a/modules/space/rendering/renderableorbitalkepler.cpp
+++ b/modules/space/rendering/renderableorbitalkepler.cpp
@@ -504,7 +504,7 @@ void RenderableOrbitalKepler::render(const RenderData& data, RendererTasks&) {
         );
         _pointProgram->setUniform(
             _uniformPointCache.cameraUpWorld,
-            data.camera.lookUpVectorWorldSpace()
+            static_cast<glm::vec3>(data.camera.lookUpVectorWorldSpace())
         );
         _pointProgram->setUniform(
             _uniformPointCache.inGameTime,
diff --git a/modules/space/shaders/debrisVizPoints_gs.glsl b/modules/space/shaders/debrisVizPoints_gs.glsl
index fb50433753..af1b784891 100644
--- a/modules/space/shaders/debrisVizPoints_gs.glsl
+++ b/modules/space/shaders/debrisVizPoints_gs.glsl
@@ -34,7 +34,7 @@ uniform dmat4 modelTransform;
 uniform dmat4 viewTransform;
 uniform mat4 projectionTransform;
 uniform dvec3 cameraPositionWorld;
-uniform dvec3 cameraUpWorld;
+uniform vec3 cameraUpWorld;
 uniform float pointSizeExponent;
 uniform bool enableMaxSize;
 uniform float maxSize;
@@ -66,17 +66,13 @@ void main() {
     vec4 pos = v0Weighted + v1Weighted;
     // ==========================
 
-    // Cast to float based data types
-    mat4 modelTrans = mat4(modelTransform);
-    mat4 viewTrans = mat4(viewTransform);
-    vec3 camPosWorld = vec3(cameraPositionWorld);
-
     // Calculate current vertex position to world space
-    vec4 vertPosWorldSpace = modelTrans * pos;
+    dvec4 vertPosWorldSpace = modelTransform * pos;
 
     // Calculate new axis for plane
-    vec3 normal = vec3(normalize(camPosWorld - vertPosWorldSpace.xyz));
-    vec3 right = normalize(cross(vec3(cameraUpWorld), normal));
+    vec3 camPosToVertPos = vec3(cameraPositionWorld - vertPosWorldSpace.xyz);
+    vec3 normal = normalize(camPosToVertPos);
+    vec3 right = normalize(cross(cameraUpWorld, normal));
     vec3 up = normalize(cross(normal, right));
 
     // Calculate size of points
@@ -85,8 +81,8 @@ void main() {
     up *= initialSize;
 
     float opp = length(right);
-    float adj = length(camPosWorld - vertPosWorldSpace.xyz);
-    float angle = atan(float(opp/adj));
+    float adj = length(camPosToVertPos);
+    float angle = atan(opp/adj);
     float maxAngle = radians(maxSize * 0.5);
 
     // Controls the point size
@@ -97,37 +93,39 @@ void main() {
     }
 
     // Calculate and set corners of the new quad
-    vec4 p0World = vertPosWorldSpace + vec4(up-right, 0.0);
-    vec4 p1World = vertPosWorldSpace + vec4(-right-up,0.0);
-    vec4 p2World = vertPosWorldSpace + vec4(right+up, 0.0);
-    vec4 p3World = vertPosWorldSpace + vec4(right-up, 0.0);
-
-    mat4 ViewProjectionTransform = projectionTransform * viewTrans;
+    dvec4 p0World = vertPosWorldSpace + vec4(up-right, 0.0);
+    dvec4 p1World = vertPosWorldSpace + vec4(-right-up,0.0);
+    dvec4 p2World = vertPosWorldSpace + vec4(right+up, 0.0);
+    dvec4 p3World = vertPosWorldSpace + vec4(right-up, 0.0);
 
     // Set some additional out parameters
-    viewSpace = z_normalization(projectionTransform * viewTrans * modelTrans * pos);
+    viewSpace = z_normalization(
+      vec4(projectionTransform * viewTransform * modelTransform * pos)
+    );
     projectionViewDepth = viewSpace.w;
-
+    
+    dmat4 ViewProjectionTransform = projectionTransform * viewTransform;
+    
     // left-top
-    vec4 p0Screen = z_normalization(ViewProjectionTransform * p0World);
+    vec4 p0Screen = z_normalization(vec4(ViewProjectionTransform * p0World));
     gl_Position = p0Screen;
     texCoord = vec2(0.0, 0.0);
     EmitVertex();
 
     // left-bot
-    vec4 p1Screen = z_normalization(ViewProjectionTransform * p1World);
+    vec4 p1Screen = z_normalization(vec4(ViewProjectionTransform * p1World));
     gl_Position = p1Screen;
     texCoord = vec2(1.0, 0.0);
     EmitVertex();
 
     // right-top
-    vec4 p2Screen = z_normalization(ViewProjectionTransform * p2World);
+    vec4 p2Screen = z_normalization(vec4(ViewProjectionTransform * p2World));
     gl_Position = p2Screen;
     texCoord = vec2(0.0, 1.0);
     EmitVertex();
 
     // right-bot
-    vec4 p3Screen = z_normalization(ViewProjectionTransform * p3World);
+    vec4 p3Screen = z_normalization(vec4(ViewProjectionTransform * p3World));
     gl_Position = p3Screen;
     texCoord = vec2(1.0, 1.0);
     EmitVertex();

From 7e62f9f4b0c4ac3d2347875e0616e7fc1e484927 Mon Sep 17 00:00:00 2001
From: Alexander Bock <mail@alexanderbock.eu>
Date: Wed, 12 Jun 2024 20:40:34 +0200
Subject: [PATCH 494/701] Add the ability to specify the BlendMode from .info
 files (closes #3311)

---
 modules/globebrowsing/scripts/layer_support.lua | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/modules/globebrowsing/scripts/layer_support.lua b/modules/globebrowsing/scripts/layer_support.lua
index b285c8d773..e779650232 100644
--- a/modules/globebrowsing/scripts/layer_support.lua
+++ b/modules/globebrowsing/scripts/layer_support.lua
@@ -201,6 +201,7 @@ openspace.globebrowsing.parseInfoFile = function (file)
     declare("HeightFile")
     declare("Location")
     declare("ZIndex")
+    declare("BlendMode")
 
     local dir = openspace.directoryForPath(file)
     local file_func, error = loadfile(file)
@@ -219,14 +220,20 @@ openspace.globebrowsing.parseInfoFile = function (file)
     local HeightFile = rawget(_G, "HeightFile")
     local Location = rawget(_G, "Location")
     local ZIndex = rawget(_G, "ZIndex")
+    local BlendMode = rawget(_G, "BlendMode")
 
     -- Now we can start
     local name = Name or Identifier
     local identifier = Identifier
     local zIndex = ZIndex
+    local blendMode = BlendMode
     if zIndex == "" then
         zIndex = nil
     end
+    if blendMode == "" then
+        -- Color blending is the default for .info files if nothing else is specified
+        blendMode = "Color"
+    end
 
     if identifier == "" then
         openspace.printError('Error loading file "' .. file .. '": No "Identifier" found')
@@ -240,7 +247,7 @@ openspace.globebrowsing.parseInfoFile = function (file)
             Name = name,
             Description = Description or "",
             FilePath = dir .. '/' .. ColorFile,
-            BlendMode = "Color",
+            BlendMode = blendMode,
             ZIndex = zIndex
         }
     end

From 8a42657deb16dcc66c7412414275206fbff7760a Mon Sep 17 00:00:00 2001
From: Emma Broman <emma.broman@liu.se>
Date: Thu, 13 Jun 2024 10:42:00 +0200
Subject: [PATCH 495/701] Feature/examples naming (#3305)

* Update name and path format of examples that follow the new structure
* Fix a broken (updated) property name in an example
* Make other examples' GUI paths more consistent
* Put them all in the Examples folder
---
 data/assets/examples/animation.asset          | 20 +++++++++----------
 data/assets/examples/approachevents.asset     |  4 ++--
 .../audio/audio_playback_advanced.asset       | 10 +++++-----
 data/assets/examples/globerotation.asset      | 10 ++++++----
 data/assets/examples/globetranslation.asset   |  6 ++++--
 .../examples/modelshader/modelshader.asset    |  4 ++--
 data/assets/examples/nodeline.asset           |  4 ++--
 .../cartesianaxes.asset                       |  6 +++---
 .../interpolatedpoints.asset                  |  4 ++--
 .../interpolatedpoints_colormapped.asset      |  4 ++--
 .../interpolatedpoints_spline.asset           |  4 ++--
 .../renderablenodearrow/nodearrow.asset       |  4 ++--
 .../nodearrow_appearance.asset                |  4 ++--
 .../nodearrow_relativevalues.asset            |  4 ++--
 .../planeimageonline.asset                    |  4 ++--
 .../planeimageonline_billboarded.asset        |  4 ++--
 .../pointcloud_colormappingsettings.asset     |  4 ++--
 .../advanced/pointcloud_datamapping.asset     |  4 ++--
 .../advanced/pointcloud_fading.asset          |  4 ++--
 .../advanced/pointcloud_labels.asset          |  4 ++--
 .../advanced/pointcloud_multitextured.asset   |  4 ++--
 .../renderablepointcloud/pointcloud.asset     |  4 ++--
 .../pointcloud_colormapped.asset              |  4 ++--
 .../pointcloud_colormapped_moresettings.asset |  4 ++--
 .../pointcloud_maxsize.asset                  |  4 ++--
 .../pointcloud_outline.asset                  |  6 +++---
 .../pointcloud_scaled.asset                   |  4 ++--
 .../pointcloud_scaledfromdata.asset           |  4 ++--
 .../pointcloud_textured.asset                 |  4 ++--
 .../pointcloud_units.asset                    |  4 ++--
 .../renderablepolygoncloud/polygoncloud.asset |  4 ++--
 .../simplesphereimageonline.asset             |  4 ++--
 .../renderablespherespout/spherespout.asset   |  4 ++--
 .../renderabletravelspeed/travelspeed.asset   |  4 ++--
 .../examples/rotation/luarotation/lua.asset   |  4 ++--
 data/assets/examples/scale/luascale/lua.asset |  4 ++--
 .../nonuniformstatic.asset                    |  4 ++--
 .../nonuniformstatic_ellipsoid.asset          |  4 ++--
 .../examples/scale/staticscale/static.asset   |  4 ++--
 .../timedependentscale/timedependent.asset    |  4 ++--
 .../timedependent_speed.asset                 |  4 ++--
 .../tileproviderbyindex/byindex.asset         |  4 ++--
 data/assets/examples/timeframe/union.asset    |  4 ++--
 .../translation/luatranslation/lua.asset      |  4 ++--
 44 files changed, 107 insertions(+), 103 deletions(-)

diff --git a/data/assets/examples/animation.asset b/data/assets/examples/animation.asset
index ed70f9b6bd..a420a70e79 100644
--- a/data/assets/examples/animation.asset
+++ b/data/assets/examples/animation.asset
@@ -34,8 +34,8 @@ local AnimationLoop = {
     }
   },
   GUI = {
-    Name = "Animated Model example (LoopFromStart)",
-    Path = "/Example",
+    Name = "Animated Model (LoopFromStart)",
+    Path = "/Examples",
     Description = "Simple animated box model with the animation mode 'LoopFromStart'"
   }
 }
@@ -61,8 +61,8 @@ local AnimationLoopInf = {
     }
   },
   GUI = {
-    Name = "Animated Model example (LoopInfinitely)",
-    Path = "/Example",
+    Name = "Animated Model (LoopInfinitely)",
+    Path = "/Examples",
     Description = "Simple animated box model with the animation mode 'LoopInfinitely'"
   }
 }
@@ -88,8 +88,8 @@ local AnimationOnce = {
     }
   },
   GUI = {
-    Name = "Animated Model example (Once)",
-    Path = "/Example",
+    Name = "Animated Model (Once)",
+    Path = "/Examples",
     Description = "Simple animated box model with the animation mode 'Once'"
   }
 }
@@ -115,8 +115,8 @@ local AnimationBounceInf = {
     }
   },
   GUI = {
-    Name = "Animated Model example (BounceInfinitely)",
-    Path = "/Example",
+    Name = "Animated Model (BounceInfinitely)",
+    Path = "/Examples",
     Description = "Simple animated box model with the animation mode 'BounceInfinitely'"
   }
 }
@@ -142,8 +142,8 @@ local AnimationBounce = {
     }
   },
   GUI = {
-    Name = "Animated Model example (BounceFromStart)",
-    Path = "/Example",
+    Name = "Animated Model (BounceFromStart)",
+    Path = "/Examples",
     Description = "Simple animated box model with the animation mode 'BounceFromStart'"
   }
 }
diff --git a/data/assets/examples/approachevents.asset b/data/assets/examples/approachevents.asset
index 6083ab4ccb..276f1a6cb6 100644
--- a/data/assets/examples/approachevents.asset
+++ b/data/assets/examples/approachevents.asset
@@ -48,8 +48,8 @@ local Model = {
   OnRecede = { "os.example.generic" },
   OnExit = { "os.example.generic" },
   GUI = {
-    Name = "Example Event Model",
-    Path = "/Example"
+    Name = "Event Model",
+    Path = "/Examples"
   }
 }
 
diff --git a/data/assets/examples/audio/audio_playback_advanced.asset b/data/assets/examples/audio/audio_playback_advanced.asset
index 7ba43bdb01..44a4b0d119 100644
--- a/data/assets/examples/audio/audio_playback_advanced.asset
+++ b/data/assets/examples/audio/audio_playback_advanced.asset
@@ -13,35 +13,35 @@ local panleft = {
   Identifier = "os.examples.PanLeft",
   Name = "Example Audio Pan Left",
   Command = [[openspace.audio.set3dSourcePosition("Advanced_Example_Sound_1", { -1, 0, 0 })]],
-  GuiPath = "/Example/Audio"
+  GuiPath = "/Examples/Audio"
 }
 
 local pancenter = {
   Identifier = "os.examples.PanCenter",
   Name = "Example Audio Pan Center",
   Command = [[openspace.audio.set3dSourcePosition("Advanced_Example_Sound_1", { 0, 0, 0 })]],
-  GuiPath = "/Example/Audio"
+  GuiPath = "/Examples/Audio"
 }
 
 local panright = {
   Identifier = "os.examples.PanRight",
   Name = "Example Audio Pan Right",
   Command = [[openspace.audio.set3dSourcePosition("Advanced_Example_Sound_1", { 1, 0, 0 })]],
-  GuiPath = "/Example/Audio"
+  GuiPath = "/Examples/Audio"
 }
 
 local lowvolume = {
   Identifier = "os.examples.LowVolume",
   Name = "Example Audio Volume Low",
   Command = [[openspace.audio.setVolume("Advanced_Example_Sound_1", 0.15)]],
-  GuiPath = "/Example/Audio"
+  GuiPath = "/Examples/Audio"
 }
 
 local fullvolume = {
   Identifier = "os.examples.FullVolume",
   Name = "Example Audio Volume Full",
   Command = [[openspace.audio.setVolume("Advanced_Example_Sound_1", 1.0)]],
-  GuiPath = "/Example/Audio"
+  GuiPath = "/Examples/Audio"
 }
 
 asset.onInitialize(function()
diff --git a/data/assets/examples/globerotation.asset b/data/assets/examples/globerotation.asset
index f3b903fc5f..7db682dd71 100644
--- a/data/assets/examples/globerotation.asset
+++ b/data/assets/examples/globerotation.asset
@@ -41,7 +41,8 @@ local ExampleGlobeRotation = {
     }
   },
   GUI = {
-    Path = "/Example"
+    Name = "GlobeRotation",
+    Path = "/Examples"
   }
 }
 
@@ -58,11 +59,12 @@ asset.export(ExampleGlobeRotation)
 
 
 asset.meta = {
-  Name = "Model Example",
+  Name = "GlobeRotation Example",
   Version = "1.0",
   Description = [[An example that demonstrates how to load a 3D model from a geometry
-    file, together with some basic functionality. The model is placed on the surface
-    of a planet using a GlobeRotation and GlobeTranslation.]],
+    file, placing it on a planetary surface and rotate it to align with the surface
+    normal using a "GlobeRotation" transform. Note that "GlobeTranslation" is needed to
+    put the model in the correct location.]],
   Author = "OpenSpace Team",
   URL = "http://openspaceproject.com",
   License = "MIT license"
diff --git a/data/assets/examples/globetranslation.asset b/data/assets/examples/globetranslation.asset
index e1006b2cd4..6f6e9a42f2 100644
--- a/data/assets/examples/globetranslation.asset
+++ b/data/assets/examples/globetranslation.asset
@@ -31,7 +31,8 @@ local ExampleFixedHeight = {
     }
   },
   GUI = {
-    Path = "/Example"
+    Name = "GlobeTranslation - Fixed Height",
+    Path = "/Examples"
   }
 }
 
@@ -55,7 +56,8 @@ local ExampleAdaptiveHeight = {
     }
   },
   GUI = {
-    Path = "/Example"
+    Name = "GlobeTranslation - Adaptive Height",
+    Path = "/Examples"
   }
 }
 
diff --git a/data/assets/examples/modelshader/modelshader.asset b/data/assets/examples/modelshader/modelshader.asset
index e086da7e98..6204ab3eb9 100644
--- a/data/assets/examples/modelshader/modelshader.asset
+++ b/data/assets/examples/modelshader/modelshader.asset
@@ -25,7 +25,7 @@ local Model = {
     GeometryFile = model .. "BoxAnimated.glb",
     ModelScale = 3E7,
     -- (malej 2023-MAY-22) Note that PerformShading should be false in this example,
-    -- these example shaders dont't contain any light calculations
+    -- since these example shaders dont't contain any light calculations
     PerformShading = false,
     VertexShader = asset.resource("model_vs.glsl"),
     FragmentShader = asset.resource("model_fs.glsl"),
@@ -36,7 +36,7 @@ local Model = {
   },
   GUI = {
     Name = "Model Shader",
-    Path = "/Example",
+    Path = "/Examples",
     Description = "Simple box model with a custom shader"
   }
 }
diff --git a/data/assets/examples/nodeline.asset b/data/assets/examples/nodeline.asset
index 7f0edb27cb..43bb436c77 100644
--- a/data/assets/examples/nodeline.asset
+++ b/data/assets/examples/nodeline.asset
@@ -13,8 +13,8 @@ local RenderableNodeLineExample = {
     LineWidth = 2
   },
   GUI = {
-    Name = "RenderableNodeLine Example",
-    Path = "/Example",
+    Name = "RenderableNodeLine - Basic",
+    Path = "/Examples",
     Description = [[Draws a line between two nodes in the scene.]]
   }
 }
diff --git a/data/assets/examples/renderable/renderablecartesianaxes/cartesianaxes.asset b/data/assets/examples/renderable/renderablecartesianaxes/cartesianaxes.asset
index c4207db65a..49c29d5b6e 100644
--- a/data/assets/examples/renderable/renderablecartesianaxes/cartesianaxes.asset
+++ b/data/assets/examples/renderable/renderablecartesianaxes/cartesianaxes.asset
@@ -1,5 +1,5 @@
 -- Basic
--- This asset creates a SceneGraphNode that only displays coordinate axes. The 
+-- This asset creates a SceneGraphNode that only displays coordinate axes. The
 -- parent is not set which defaults to placing the axes at the center the Sun.
 
 local Node = {
@@ -12,9 +12,9 @@ local Node = {
   },
   Renderable = {
     Type = "RenderableCartesianAxes"
-  },    
+  },
   GUI = {
-    Name = "Cartesian Axes Basic",
+    Name = "RenderableCartesianAxes - Basic",
     Path = "/Examples"
   }
 }
diff --git a/data/assets/examples/renderable/renderableinterpolatedpoints/interpolatedpoints.asset b/data/assets/examples/renderable/renderableinterpolatedpoints/interpolatedpoints.asset
index bdc5a2436a..2983bd4421 100644
--- a/data/assets/examples/renderable/renderableinterpolatedpoints/interpolatedpoints.asset
+++ b/data/assets/examples/renderable/renderableinterpolatedpoints/interpolatedpoints.asset
@@ -16,8 +16,8 @@ local Node = {
     NumberOfObjects = 10
   },
   GUI = {
-    Name = "Basic",
-    Path = "/Examples/RenderableInterpolatedPoints"
+    Name = "RenderableInterpolatedPoints - Basic",
+    Path = "/Examples"
   }
 }
 
diff --git a/data/assets/examples/renderable/renderableinterpolatedpoints/interpolatedpoints_colormapped.asset b/data/assets/examples/renderable/renderableinterpolatedpoints/interpolatedpoints_colormapped.asset
index 50660353a1..d12c15ade8 100644
--- a/data/assets/examples/renderable/renderableinterpolatedpoints/interpolatedpoints_colormapped.asset
+++ b/data/assets/examples/renderable/renderableinterpolatedpoints/interpolatedpoints_colormapped.asset
@@ -30,8 +30,8 @@ local Node = {
     }
   },
   GUI = {
-    Name = "Color Mapped",
-    Path = "/Examples/RenderableInterpolatedPoints"
+    Name = "RenderableInterpolatedPoints - Color Mapped",
+    Path = "/Examples"
   }
 }
 
diff --git a/data/assets/examples/renderable/renderableinterpolatedpoints/interpolatedpoints_spline.asset b/data/assets/examples/renderable/renderableinterpolatedpoints/interpolatedpoints_spline.asset
index e05ef60b82..8fc0c3ec27 100644
--- a/data/assets/examples/renderable/renderableinterpolatedpoints/interpolatedpoints_spline.asset
+++ b/data/assets/examples/renderable/renderableinterpolatedpoints/interpolatedpoints_spline.asset
@@ -22,8 +22,8 @@ local Node = {
     }
   },
   GUI = {
-    Name = "Spline (Smoother)",
-    Path = "/Examples/RenderableInterpolatedPoints"
+    Name = "RenderableInterpolatedPoints - Spline",
+    Path = "/Examples"
   }
 }
 
diff --git a/data/assets/examples/renderable/renderablenodearrow/nodearrow.asset b/data/assets/examples/renderable/renderablenodearrow/nodearrow.asset
index 0e659ca4b7..ffba54f962 100644
--- a/data/assets/examples/renderable/renderablenodearrow/nodearrow.asset
+++ b/data/assets/examples/renderable/renderablenodearrow/nodearrow.asset
@@ -25,8 +25,8 @@ local Node = {
     Width = 900000.0
   },
   GUI = {
-    Name = "Basic",
-    Path = "/Examples/RenderableNodeArrow"
+    Name = "RenderableNodeArrow - Basic",
+    Path = "/Examples"
   }
 }
 
diff --git a/data/assets/examples/renderable/renderablenodearrow/nodearrow_appearance.asset b/data/assets/examples/renderable/renderablenodearrow/nodearrow_appearance.asset
index 38e9f6238c..50eb794286 100644
--- a/data/assets/examples/renderable/renderablenodearrow/nodearrow_appearance.asset
+++ b/data/assets/examples/renderable/renderablenodearrow/nodearrow_appearance.asset
@@ -27,8 +27,8 @@ local Node = {
     ArrowHeadWidthFactor = 1.0
   },
   GUI = {
-    Name = "Custom Appearance (Colored & Inverted)",
-    Path = "/Examples/RenderableNodeArrow"
+    Name = "RenderableNodeArrow - Custom Appearance (Colored & Inverted)",
+    Path = "/Examples"
   }
 }
 
diff --git a/data/assets/examples/renderable/renderablenodearrow/nodearrow_relativevalues.asset b/data/assets/examples/renderable/renderablenodearrow/nodearrow_relativevalues.asset
index 1f1fb74c3a..9e8d90ec06 100644
--- a/data/assets/examples/renderable/renderablenodearrow/nodearrow_relativevalues.asset
+++ b/data/assets/examples/renderable/renderablenodearrow/nodearrow_relativevalues.asset
@@ -28,8 +28,8 @@ local Node = {
     Width = 900000.0
   },
   GUI = {
-    Name = "Relative Units",
-    Path = "/Examples/RenderableNodeArrow",
+    Name = "RenderableNodeArrow - Relative Units",
+    Path = "/Examples"
   }
 }
 
diff --git a/data/assets/examples/renderable/renderableplaneimageonline/planeimageonline.asset b/data/assets/examples/renderable/renderableplaneimageonline/planeimageonline.asset
index 40607a837c..125639ac4b 100644
--- a/data/assets/examples/renderable/renderableplaneimageonline/planeimageonline.asset
+++ b/data/assets/examples/renderable/renderableplaneimageonline/planeimageonline.asset
@@ -10,8 +10,8 @@ local Node = {
     URL = "http://data.openspaceproject.com/examples/renderableplaneimageonline.jpg"
   },
   GUI = {
-    Name = "Basic",
-    Path = "/Examples/RenderablePlaneImageOnline"
+    Name = "RenderablePlaneImageOnline - Basic",
+    Path = "/Examples"
   }
 }
 
diff --git a/data/assets/examples/renderable/renderableplaneimageonline/planeimageonline_billboarded.asset b/data/assets/examples/renderable/renderableplaneimageonline/planeimageonline_billboarded.asset
index 67808307e6..e89d8eaad9 100644
--- a/data/assets/examples/renderable/renderableplaneimageonline/planeimageonline_billboarded.asset
+++ b/data/assets/examples/renderable/renderableplaneimageonline/planeimageonline_billboarded.asset
@@ -12,8 +12,8 @@ local Node = {
     Billboarded = true
   },
   GUI = {
-    Name = "Billboarded",
-    Path = "/Examples/RenderablePlaneImageOnline"
+    Name = "RenderablePlaneImageOnline - Billboarded",
+    Path = "/Examples"
   }
 }
 
diff --git a/data/assets/examples/renderable/renderablepointcloud/advanced/pointcloud_colormappingsettings.asset b/data/assets/examples/renderable/renderablepointcloud/advanced/pointcloud_colormappingsettings.asset
index 1f4a8dbdd3..a2403cde01 100644
--- a/data/assets/examples/renderable/renderablepointcloud/advanced/pointcloud_colormappingsettings.asset
+++ b/data/assets/examples/renderable/renderablepointcloud/advanced/pointcloud_colormappingsettings.asset
@@ -52,8 +52,8 @@ local Node = {
     }
   },
   GUI = {
-    Name = "Advanced Color Mapping",
-    Path = "/Examples/RenderablePointCloud/Advanced",
+    Name = "RenderablePointCloud - Advanced Color Mapping",
+    Path = "/Examples/Advanced",
     Description = [[Example of a point cloud where the range is set explicitly and
       specific colors are used for values outside the range, as well as for missing
       data values.]]
diff --git a/data/assets/examples/renderable/renderablepointcloud/advanced/pointcloud_datamapping.asset b/data/assets/examples/renderable/renderablepointcloud/advanced/pointcloud_datamapping.asset
index 30f93d6a03..c2a5d8e213 100644
--- a/data/assets/examples/renderable/renderablepointcloud/advanced/pointcloud_datamapping.asset
+++ b/data/assets/examples/renderable/renderablepointcloud/advanced/pointcloud_datamapping.asset
@@ -38,8 +38,8 @@ local Node = {
     }
   },
   GUI = {
-    Name = "Custom Data Mapping",
-    Path = "/Examples/RenderablePointCloud/Advanced"
+    Name = "RenderablePointCloud - Custom Data Mapping",
+    Path = "/Examples/Advanced"
   }
 }
 
diff --git a/data/assets/examples/renderable/renderablepointcloud/advanced/pointcloud_fading.asset b/data/assets/examples/renderable/renderablepointcloud/advanced/pointcloud_fading.asset
index aed4d3e44c..82ac22be0d 100644
--- a/data/assets/examples/renderable/renderablepointcloud/advanced/pointcloud_fading.asset
+++ b/data/assets/examples/renderable/renderablepointcloud/advanced/pointcloud_fading.asset
@@ -18,8 +18,8 @@ local Node = {
     }
   },
   GUI = {
-    Name = "Fading",
-    Path = "/Examples/RenderablePointCloud/Advanced",
+    Name = "RenderablePointCloud - Fading",
+    Path = "/Examples/Advanced",
     Description = [[Example of a point cloud with distance-based fading (the points
       are visible when the camera reaches a certain distance away from the origin)]]
   }
diff --git a/data/assets/examples/renderable/renderablepointcloud/advanced/pointcloud_labels.asset b/data/assets/examples/renderable/renderablepointcloud/advanced/pointcloud_labels.asset
index 5706fd02e2..db3d4399a0 100644
--- a/data/assets/examples/renderable/renderablepointcloud/advanced/pointcloud_labels.asset
+++ b/data/assets/examples/renderable/renderablepointcloud/advanced/pointcloud_labels.asset
@@ -28,8 +28,8 @@ local Node = {
     }
   },
   GUI = {
-    Name = "Labels",
-    Path = "/Examples/RenderablePointCloud/Advanced"
+    Name = "RenderablePointCloud - Labels",
+    Path = "/Examples/Advanced"
   }
 }
 
diff --git a/data/assets/examples/renderable/renderablepointcloud/advanced/pointcloud_multitextured.asset b/data/assets/examples/renderable/renderablepointcloud/advanced/pointcloud_multitextured.asset
index 128317d69a..828ffb6770 100644
--- a/data/assets/examples/renderable/renderablepointcloud/advanced/pointcloud_multitextured.asset
+++ b/data/assets/examples/renderable/renderablepointcloud/advanced/pointcloud_multitextured.asset
@@ -27,8 +27,8 @@ local Node = {
     UseAdditiveBlending = false
   },
   GUI = {
-    Name = "Multi-Textured",
-    Path = "/Examples/RenderablePointCloud/Advanced"
+    Name = "RenderablePointCloud - Multi-Textured",
+    Path = "/Examples/Advanced"
   }
 }
 
diff --git a/data/assets/examples/renderable/renderablepointcloud/pointcloud.asset b/data/assets/examples/renderable/renderablepointcloud/pointcloud.asset
index f0d77b97c1..b9a5d25f16 100644
--- a/data/assets/examples/renderable/renderablepointcloud/pointcloud.asset
+++ b/data/assets/examples/renderable/renderablepointcloud/pointcloud.asset
@@ -12,8 +12,8 @@ local Node = {
     }
   },
   GUI = {
-    Name = "Fixed Color and Size",
-    Path = "/Examples/RenderablePointCloud"
+    Name = "RenderablePointCloud - Fixed Color and Size",
+    Path = "/Examples"
   }
 }
 
diff --git a/data/assets/examples/renderable/renderablepointcloud/pointcloud_colormapped.asset b/data/assets/examples/renderable/renderablepointcloud/pointcloud_colormapped.asset
index eb79b9ff86..bd157b7250 100644
--- a/data/assets/examples/renderable/renderablepointcloud/pointcloud_colormapped.asset
+++ b/data/assets/examples/renderable/renderablepointcloud/pointcloud_colormapped.asset
@@ -21,8 +21,8 @@ local Node = {
     }
   },
   GUI = {
-    Name = "Color Mapped",
-    Path = "/Examples/RenderablePointCloud"
+    Name = "RenderablePointCloud - Color Mapped",
+    Path = "/Examples"
   }
 }
 
diff --git a/data/assets/examples/renderable/renderablepointcloud/pointcloud_colormapped_moresettings.asset b/data/assets/examples/renderable/renderablepointcloud/pointcloud_colormapped_moresettings.asset
index b23cc5be44..77fb97d969 100644
--- a/data/assets/examples/renderable/renderablepointcloud/pointcloud_colormapped_moresettings.asset
+++ b/data/assets/examples/renderable/renderablepointcloud/pointcloud_colormapped_moresettings.asset
@@ -34,8 +34,8 @@ local Node = {
     }
   },
   GUI = {
-    Name = "Color Mapped with Settings",
-    Path = "/Examples/RenderablePointCloud"
+    Name = "RenderablePointCloud - Color Mapped with Settings",
+    Path = "/Examples"
   }
 }
 
diff --git a/data/assets/examples/renderable/renderablepointcloud/pointcloud_maxsize.asset b/data/assets/examples/renderable/renderablepointcloud/pointcloud_maxsize.asset
index 214343b630..42ae23d4fb 100644
--- a/data/assets/examples/renderable/renderablepointcloud/pointcloud_maxsize.asset
+++ b/data/assets/examples/renderable/renderablepointcloud/pointcloud_maxsize.asset
@@ -18,8 +18,8 @@ local Node = {
     }
   },
   GUI = {
-    Name = "Max Size",
-    Path = "/Examples/RenderablePointCloud"
+    Name = "RenderablePointCloud - Max Size",
+    Path = "/Examples"
   }
 }
 
diff --git a/data/assets/examples/renderable/renderablepointcloud/pointcloud_outline.asset b/data/assets/examples/renderable/renderablepointcloud/pointcloud_outline.asset
index cb26def785..84c4ab805d 100644
--- a/data/assets/examples/renderable/renderablepointcloud/pointcloud_outline.asset
+++ b/data/assets/examples/renderable/renderablepointcloud/pointcloud_outline.asset
@@ -10,14 +10,14 @@ local Node = {
     Coloring = {
       EnableOutline = true,
       OutlineColor = { 0.2, 0.2, 1.0 },
-      OutlineWeight = 0.1
+      OutlineWidth = 0.1
     },
     -- It might be desired to disable additive blending when using an outline
     UseAdditiveBlending = false
   },
   GUI = {
-    Name = "Outlined",
-    Path = "/Examples/RenderablePointCloud"
+    Name = "RenderablePointCloud - Outlined",
+    Path = "/Examples"
   }
 }
 
diff --git a/data/assets/examples/renderable/renderablepointcloud/pointcloud_scaled.asset b/data/assets/examples/renderable/renderablepointcloud/pointcloud_scaled.asset
index 25ecd8b969..374d994dcb 100644
--- a/data/assets/examples/renderable/renderablepointcloud/pointcloud_scaled.asset
+++ b/data/assets/examples/renderable/renderablepointcloud/pointcloud_scaled.asset
@@ -18,8 +18,8 @@ local Node = {
     }
   },
   GUI = {
-    Name = "Point Size / Scaling",
-    Path = "/Examples/RenderablePointCloud",
+    Name = "RenderablePointCloud - Point Size / Scaling",
+    Path = "/Examples",
     Description = "Point cloud with configured point size"
   }
 }
diff --git a/data/assets/examples/renderable/renderablepointcloud/pointcloud_scaledfromdata.asset b/data/assets/examples/renderable/renderablepointcloud/pointcloud_scaledfromdata.asset
index c2d2e02fd1..9abad6a3a7 100644
--- a/data/assets/examples/renderable/renderablepointcloud/pointcloud_scaledfromdata.asset
+++ b/data/assets/examples/renderable/renderablepointcloud/pointcloud_scaledfromdata.asset
@@ -26,8 +26,8 @@ local Node = {
     }
   },
   GUI = {
-    Name = "Size from Data",
-    Path = "/Examples/RenderablePointCloud"
+    Name = "RenderablePointCloud - Size from Data",
+    Path = "/Examples"
   }
 }
 
diff --git a/data/assets/examples/renderable/renderablepointcloud/pointcloud_textured.asset b/data/assets/examples/renderable/renderablepointcloud/pointcloud_textured.asset
index 2d79fd3212..9545cee6ba 100644
--- a/data/assets/examples/renderable/renderablepointcloud/pointcloud_textured.asset
+++ b/data/assets/examples/renderable/renderablepointcloud/pointcloud_textured.asset
@@ -22,8 +22,8 @@ local Node = {
     UseAdditiveBlending = false
   },
   GUI = {
-    Name = "Textured",
-    Path = "/Examples/RenderablePointCloud"
+    Name = "RenderablePointCloud - Textured",
+    Path = "/Examples"
   }
 }
 
diff --git a/data/assets/examples/renderable/renderablepointcloud/pointcloud_units.asset b/data/assets/examples/renderable/renderablepointcloud/pointcloud_units.asset
index 7621fe649b..2f6359df71 100644
--- a/data/assets/examples/renderable/renderablepointcloud/pointcloud_units.asset
+++ b/data/assets/examples/renderable/renderablepointcloud/pointcloud_units.asset
@@ -10,8 +10,8 @@ local Node = {
     Unit = "Km"
   },
   GUI = {
-    Name = "Units",
-    Path = "/Examples/RenderablePointCloud"
+    Name = "RenderablePointCloud - Units",
+    Path = "/Examples"
   }
 }
 
diff --git a/data/assets/examples/renderable/renderablepolygoncloud/polygoncloud.asset b/data/assets/examples/renderable/renderablepolygoncloud/polygoncloud.asset
index 269c6e306f..bb177c23a9 100644
--- a/data/assets/examples/renderable/renderablepolygoncloud/polygoncloud.asset
+++ b/data/assets/examples/renderable/renderablepolygoncloud/polygoncloud.asset
@@ -15,8 +15,8 @@ local Node = {
     PolygonSides = 6
   },
   GUI = {
-    Name = "Basic",
-    Path = "/Examples/RenderablePolygonCloud"
+    Name = "RenderablePolygonCloud - Basic",
+    Path = "/Examples"
   }
 }
 
diff --git a/data/assets/examples/renderable/renderablesphereimageonline/simplesphereimageonline.asset b/data/assets/examples/renderable/renderablesphereimageonline/simplesphereimageonline.asset
index 05e86ba48c..faf47abbee 100644
--- a/data/assets/examples/renderable/renderablesphereimageonline/simplesphereimageonline.asset
+++ b/data/assets/examples/renderable/renderablesphereimageonline/simplesphereimageonline.asset
@@ -13,8 +13,8 @@ local Node = {
     Segments = 16
   },
   GUI = {
-    Name = "Basic",
-    Path = "/Examples/RenderableSphereImageOnline"
+    Name = "RenderableSphereImageOnline - Basic",
+    Path = "/Examples"
   }
 }
 
diff --git a/data/assets/examples/renderable/renderablespherespout/spherespout.asset b/data/assets/examples/renderable/renderablespherespout/spherespout.asset
index 5bd9bc4001..1cfc570d3c 100644
--- a/data/assets/examples/renderable/renderablespherespout/spherespout.asset
+++ b/data/assets/examples/renderable/renderablespherespout/spherespout.asset
@@ -15,8 +15,8 @@ local Node = {
     SpoutName = "WV_SPOUT"
   },
   GUI = {
-    Name = "Basic",
-    Path = "/Examples/RenderableSphereSpout"
+    Name = "RenderableSphereSpout - Basic",
+    Path = "/Examples"
   }
 }
 
diff --git a/data/assets/examples/renderable/renderabletravelspeed/travelspeed.asset b/data/assets/examples/renderable/renderabletravelspeed/travelspeed.asset
index e129832695..cfdf5da6ea 100644
--- a/data/assets/examples/renderable/renderabletravelspeed/travelspeed.asset
+++ b/data/assets/examples/renderable/renderabletravelspeed/travelspeed.asset
@@ -14,8 +14,8 @@ local Node = {
     Target = moonAsset.Moon.Identifier
   },
    GUI = {
-     Name = "Light Speed Indicator",
-    Path = "/Examples/RenderableTravelSpeed"
+     Name = "RenderableTravelSpeed - Light Speed Indicator",
+    Path = "/Examples"
   }
 }
 
diff --git a/data/assets/examples/rotation/luarotation/lua.asset b/data/assets/examples/rotation/luarotation/lua.asset
index 88a3b7ee22..e20d46fbfb 100644
--- a/data/assets/examples/rotation/luarotation/lua.asset
+++ b/data/assets/examples/rotation/luarotation/lua.asset
@@ -20,8 +20,8 @@ local Node = {
     Type = "RenderableCartesianAxes"
   },
   GUI = {
-    Name = "Basic",
-    Path = "/Examples/LuaRotation"
+    Name = "LuaRotation - Basic",
+    Path = "/Examples"
   }
 }
 
diff --git a/data/assets/examples/scale/luascale/lua.asset b/data/assets/examples/scale/luascale/lua.asset
index df3558d1b3..b36911727b 100644
--- a/data/assets/examples/scale/luascale/lua.asset
+++ b/data/assets/examples/scale/luascale/lua.asset
@@ -20,8 +20,8 @@ local Node = {
     Type = "RenderableCartesianAxes"
   },
   GUI = {
-    Name = "Basic",
-    Path = "/Examples/LuaScale"
+    Name = "LuaScale - Basic",
+    Path = "/Examples"
   }
 }
 
diff --git a/data/assets/examples/scale/nonuniformstaticscale/nonuniformstatic.asset b/data/assets/examples/scale/nonuniformstaticscale/nonuniformstatic.asset
index d52a130c2d..a0bfdef597 100644
--- a/data/assets/examples/scale/nonuniformstaticscale/nonuniformstatic.asset
+++ b/data/assets/examples/scale/nonuniformstaticscale/nonuniformstatic.asset
@@ -18,8 +18,8 @@ local Node = {
     Type = "RenderableCartesianAxes"
   },
   GUI = {
-    Name = "Basic",
-    Path = "/Examples/NonUniformStaticScale"
+    Name = "NonUniformStaticScale - Basic",
+    Path = "/Examples"
   }
 }
 
diff --git a/data/assets/examples/scale/nonuniformstaticscale/nonuniformstatic_ellipsoid.asset b/data/assets/examples/scale/nonuniformstaticscale/nonuniformstatic_ellipsoid.asset
index ea18f1dbbd..4f6a1c8169 100644
--- a/data/assets/examples/scale/nonuniformstaticscale/nonuniformstatic_ellipsoid.asset
+++ b/data/assets/examples/scale/nonuniformstaticscale/nonuniformstatic_ellipsoid.asset
@@ -15,8 +15,8 @@ local Node = {
     Type = "RenderableSphericalGrid"
   },
   GUI = {
-    Name = "Ellipsoid",
-    Path = "/Examples/NonUniformStaticScale"
+    Name = "NonUniformStaticScale - Ellipsoid",
+    Path = "/Examples"
   }
 }
 
diff --git a/data/assets/examples/scale/staticscale/static.asset b/data/assets/examples/scale/staticscale/static.asset
index 3015a78094..bde46f25d0 100644
--- a/data/assets/examples/scale/staticscale/static.asset
+++ b/data/assets/examples/scale/staticscale/static.asset
@@ -16,8 +16,8 @@ local Node = {
     Type = "RenderableCartesianAxes"
   },
   GUI = {
-    Name = "Basic",
-    Path = "/Examples/StaticScale"
+    Name = "StaticScale - Basic",
+    Path = "/Examples"
   }
 }
 
diff --git a/data/assets/examples/scale/timedependentscale/timedependent.asset b/data/assets/examples/scale/timedependentscale/timedependent.asset
index 8eebd09c82..80db2ffbc7 100644
--- a/data/assets/examples/scale/timedependentscale/timedependent.asset
+++ b/data/assets/examples/scale/timedependentscale/timedependent.asset
@@ -16,8 +16,8 @@ local Node = {
     Type = "RenderableCartesianAxes"
   },
   GUI = {
-    Name = "Basic",
-    Path = "/Examples/TimeDependentScale"
+    Name = "TimeDependentScale - Basic",
+    Path = "/Examples"
   }
 }
 
diff --git a/data/assets/examples/scale/timedependentscale/timedependent_speed.asset b/data/assets/examples/scale/timedependentscale/timedependent_speed.asset
index 99c4093b4c..77e353d259 100644
--- a/data/assets/examples/scale/timedependentscale/timedependent_speed.asset
+++ b/data/assets/examples/scale/timedependentscale/timedependent_speed.asset
@@ -17,8 +17,8 @@ local Node = {
     Type = "RenderableCartesianAxes"
   },
   GUI = {
-    Name = "with Speed",
-    Path = "/Examples/TimeDependentScale"
+    Name = "TimeDependentScale - With Speed",
+    Path = "/Examples"
   }
 }
 
diff --git a/data/assets/examples/tileprovider/tileproviderbyindex/byindex.asset b/data/assets/examples/tileprovider/tileproviderbyindex/byindex.asset
index daf5ccd7ed..ecdab30a12 100644
--- a/data/assets/examples/tileprovider/tileproviderbyindex/byindex.asset
+++ b/data/assets/examples/tileprovider/tileproviderbyindex/byindex.asset
@@ -45,8 +45,8 @@ local Node = {
     }
   },
   GUI = {
-    Name = "Basic",
-    Path = "/Examples/TileProviderByIndex"
+    Name = "TileProviderByIndex - Basic",
+    Path = "/Examples"
   }
 }
 
diff --git a/data/assets/examples/timeframe/union.asset b/data/assets/examples/timeframe/union.asset
index a07ace2322..f1fa1bd62b 100644
--- a/data/assets/examples/timeframe/union.asset
+++ b/data/assets/examples/timeframe/union.asset
@@ -27,8 +27,8 @@ local Node = {
     Type = "RenderableCartesianAxes"
   },
   GUI = {
-    Name = "Basic",
-    Path = "/Examples/TimeFrameUnion"
+    Name = "TimeFrameUnion - Basic",
+    Path = "/Examples"
   }
 }
 
diff --git a/data/assets/examples/translation/luatranslation/lua.asset b/data/assets/examples/translation/luatranslation/lua.asset
index a35a7bace7..722b8f1830 100644
--- a/data/assets/examples/translation/luatranslation/lua.asset
+++ b/data/assets/examples/translation/luatranslation/lua.asset
@@ -30,8 +30,8 @@ local Node = {
     Type = "RenderableCartesianAxes"
   },
   GUI = {
-    Name = "Basic",
-    Path = "/Examples/LuaTranslation"
+    Name = "LuaTranslation - Basic",
+    Path = "/Examples"
   }
 }
 

From 62b2a8c8c1508bcd994724d9cf847c1f6b065e5c Mon Sep 17 00:00:00 2001
From: Emma Broman <emma.broman@liu.se>
Date: Thu, 13 Jun 2024 10:43:54 +0200
Subject: [PATCH 496/701] Fix renderable sphere example and add one for using
 local image (#3306)

* Fix renderable sphere example and add one for using local image
---
 .../sphereimagelocal.asset                    | 24 +++++++++++++++++++
 ...geonline.asset => sphereimageonline.asset} |  9 +++----
 modules/base/rendering/renderablesphere.cpp   | 10 ++++----
 3 files changed, 32 insertions(+), 11 deletions(-)
 create mode 100644 data/assets/examples/renderable/renderablesphereimagelocal/sphereimagelocal.asset
 rename data/assets/examples/renderable/renderablesphereimageonline/{simplesphereimageonline.asset => sphereimageonline.asset} (72%)

diff --git a/data/assets/examples/renderable/renderablesphereimagelocal/sphereimagelocal.asset b/data/assets/examples/renderable/renderablesphereimagelocal/sphereimagelocal.asset
new file mode 100644
index 0000000000..c3ecdc2d6b
--- /dev/null
+++ b/data/assets/examples/renderable/renderablesphereimagelocal/sphereimagelocal.asset
@@ -0,0 +1,24 @@
+-- Basic
+-- This example shows a sphere that is covered with an image which is retrieved from
+-- a local file path. The image will be stretched over the entire sphere as an
+-- equirectangular projection.
+
+local Node = {
+  Identifier = "RenderableSphereImageLocal_Example",
+  Renderable = {
+    Type = "RenderableSphereImageLocal",
+    Texture = openspace.absPath("${DATA}/test2.jpg")
+  },
+  GUI = {
+    Name = "RenderableSphereImageLocal - Basic",
+    Path = "/Examples"
+  }
+}
+
+asset.onInitialize(function()
+  openspace.addSceneGraphNode(Node)
+end)
+
+asset.onDeinitialize(function()
+  openspace.removeSceneGraphNode(Node)
+end)
diff --git a/data/assets/examples/renderable/renderablesphereimageonline/simplesphereimageonline.asset b/data/assets/examples/renderable/renderablesphereimageonline/sphereimageonline.asset
similarity index 72%
rename from data/assets/examples/renderable/renderablesphereimageonline/simplesphereimageonline.asset
rename to data/assets/examples/renderable/renderablesphereimageonline/sphereimageonline.asset
index faf47abbee..a8c4bb7153 100644
--- a/data/assets/examples/renderable/renderablesphereimageonline/simplesphereimageonline.asset
+++ b/data/assets/examples/renderable/renderablesphereimageonline/sphereimageonline.asset
@@ -1,16 +1,13 @@
 -- Basic
--- This example will show a sphere that is covered with an image which is retrieved from
+-- This example shows a sphere that is covered with an image which is retrieved from
 -- an online URL. The image will be stretched over the entire sphere as an equirectangular
--- projection
+-- projection.
 
 local Node = {
   Identifier = "RenderableSphereImageOnline_Example",
   Renderable = {
     Type = "RenderableSphereImageOnline",
-    URL = "http://data.openspaceproject.com/examples/renderableplaneimageonline.jpg",
-
-    -- Parameters from the parent class `RenderableSphere`
-    Segments = 16
+    URL = "http://data.openspaceproject.com/examples/renderableplaneimageonline.jpg"
   },
   GUI = {
     Name = "RenderableSphereImageOnline - Basic",
diff --git a/modules/base/rendering/renderablesphere.cpp b/modules/base/rendering/renderablesphere.cpp
index 8d4e30f227..0ef11b65b6 100644
--- a/modules/base/rendering/renderablesphere.cpp
+++ b/modules/base/rendering/renderablesphere.cpp
@@ -102,10 +102,10 @@ namespace {
 
     struct [[codegen::Dictionary(RenderableSphere)]] Parameters {
         // [[codegen::verbatim(SizeInfo.description)]]
-        float size;
+        std::optional<float> size [[codegen::greater(0.f)]];
 
         // [[codegen::verbatim(SegmentsInfo.description)]]
-        int segments;
+        std::optional<int> segments [[codegen::greaterequal(4)]];
 
         enum class [[codegen::map(Orientation)]] Orientation {
             Outside,
@@ -140,7 +140,7 @@ documentation::Documentation RenderableSphere::Documentation() {
 RenderableSphere::RenderableSphere(const ghoul::Dictionary& dictionary)
     : Renderable(dictionary)
     , _size(SizeInfo, 1.f, 0.f, 1e25f)
-    , _segments(SegmentsInfo, 8, 4, 1000)
+    , _segments(SegmentsInfo, 16, 4, 1000)
     , _orientation(OrientationInfo, properties::OptionProperty::DisplayType::Dropdown)
     , _mirrorTexture(MirrorTextureInfo, false)
     , _disableFadeInDistance(DisableFadeInOutInfo, false)
@@ -151,7 +151,7 @@ RenderableSphere::RenderableSphere(const ghoul::Dictionary& dictionary)
 
     addProperty(Fadeable::_opacity);
 
-    _size = p.size;
+    _size = p.size.value_or(_size);
     _size.setExponent(15.f);
     _size.onChange([this]() {
         setBoundingSphere(_size);
@@ -159,7 +159,7 @@ RenderableSphere::RenderableSphere(const ghoul::Dictionary& dictionary)
     });
     addProperty(_size);
 
-    _segments = p.segments;
+    _segments = p.segments.value_or(_segments);
     _segments.onChange([this]() {
         _sphereIsDirty = true;
     });

From d67fa4bc8dee24586def91f25325e28bd162be30 Mon Sep 17 00:00:00 2001
From: Emma Broman <emma.broman@liu.se>
Date: Thu, 13 Jun 2024 10:50:54 +0200
Subject: [PATCH 497/701] Clean up globebrowsing script function documentation
 and adapt to new format (#3307)

* Clean up globebrowsing script function documentation and adapt to new format
---
 .../globebrowsing/globebrowsingmodule_lua.inl | 218 +++++++++++-------
 1 file changed, 137 insertions(+), 81 deletions(-)

diff --git a/modules/globebrowsing/globebrowsingmodule_lua.inl b/modules/globebrowsing/globebrowsingmodule_lua.inl
index b7d2fbdf29..bcc23e1d48 100644
--- a/modules/globebrowsing/globebrowsingmodule_lua.inl
+++ b/modules/globebrowsing/globebrowsingmodule_lua.inl
@@ -28,37 +28,43 @@
 namespace {
 
 /**
- * Adds a layer to the specified globe. The first argument specifies the name of the scene
- * graph node of which to add the layer. The renderable of the specified scene graph node
- * needs to be a renderable globe. The second argument is the layer group which can be any
- * of the supported layer groups. The third argument is the dictionary defining the layer.
+ * Adds a layer to the specified globe. The second argument is the layer group which can
+ * be any of the supported layer groups. The third argument is the dictionary defining the
+ * layer.
+ *
+ * \param globeIdentifier The identifier of the scene graph node of which to add the
+ *                        layer. The renderable of the scene graph node must be a
+ *                        [RenderableGlobe](#globebrowsing_renderableglobe)
+ * \param layerGroup The identifier of the layer group in which to add the layer
+ * \param layer A dictionary defining the layer. See [this page](#globebrowsing_layer)
+ *              for details on what fields and settings the dictionary may contain
  */
-[[codegen::luawrap]] void addLayer(std::string globeName, std::string layerGroupName,
+[[codegen::luawrap]] void addLayer(std::string globeIdentifier, std::string layerGroup,
                                    ghoul::Dictionary layer)
 {
     using namespace openspace;
     using namespace globebrowsing;
 
     // Get the node and make sure it exists
-    SceneGraphNode* n = global::renderEngine->scene()->sceneGraphNode(globeName);
+    SceneGraphNode* n = global::renderEngine->scene()->sceneGraphNode(globeIdentifier);
     if (!n) {
-        throw ghoul::lua::LuaError("Unknown globe name: " + globeName);
+        throw ghoul::lua::LuaError("Unknown globe name: " + globeIdentifier);
     }
 
     // Get the renderable globe
     RenderableGlobe* globe = dynamic_cast<RenderableGlobe*>(n->renderable());
     if (!globe) {
-        throw ghoul::lua::LuaError("Renderable is not a globe: " + globeName);
+        throw ghoul::lua::LuaError("Renderable is not a globe: " + globeIdentifier);
     }
 
     // Get the layer group
-    layers::Group::ID groupID = ghoul::from_string<layers::Group::ID>(layerGroupName);
+    layers::Group::ID groupID = ghoul::from_string<layers::Group::ID>(layerGroup);
     if (groupID == layers::Group::ID::Unknown) {
         throw ghoul::lua::LuaError("Unknown layer group: " + layerGroupName);
     }
 
     // Add the name of the enclosing globe to layer dict, it is used to identify a cache
-    layer.setValue("GlobeName", globeName);
+    layer.setValue("GlobeName", globeIdentifier);
 
     // Get the dictionary defining the layer
     Layer* l = globe->layerManager().addLayer(groupID, layer);
@@ -68,32 +74,35 @@ namespace {
 }
 
 /**
- * Removes a layer from the specified globe. The first argument specifies the name of the
- * scene graph node of which to remove the layer. The renderable of the specified scene
- * graph node needs to be a renderable globe. The second argument is the layer group which
- * can be any of the supported layer groups. The third argument is either the identifier
- * for the layer or a dictionary with the 'Identifier' key that is used instead.
+ * Removes a layer from the specified globe.
+
+ * \param globeIdentifier The identifier of the scene graph node of which to remove the
+ *                        layer. The renderable of the scene graph node must be a
+ *                        [RenderableGlobe](#globebrowsing_renderableglobe)
+ * \param layerGroup The identifier of the layer group from which to remove the layer
+ * \param layerOrName Either the identifier for the layer or a dictionary with the
+ *                    `Identifier` key that is used instead
  */
-[[codegen::luawrap]] void deleteLayer(std::string globeName, std::string layerGroupName,
+[[codegen::luawrap]] void deleteLayer(std::string globeIdentifier, std::string layerGroup,
                                  std::variant<std::string, ghoul::Dictionary> layerOrName)
 {
     using namespace openspace;
     using namespace globebrowsing;
 
     // Get the node and make sure it exists
-    SceneGraphNode* n = global::renderEngine->scene()->sceneGraphNode(globeName);
+    SceneGraphNode* n = global::renderEngine->scene()->sceneGraphNode(globeIdentifier);
     if (!n) {
-        throw ghoul::lua::LuaError("Unknown globe name: " + globeName);
+        throw ghoul::lua::LuaError("Unknown globe name: " + globeIdentifier);
     }
 
     // Get the renderable globe
     RenderableGlobe* globe = dynamic_cast<RenderableGlobe*>(n->renderable());
     if (!globe) {
-        throw ghoul::lua::LuaError("Renderable is not a globe: " + globeName);
+        throw ghoul::lua::LuaError("Renderable is not a globe: " + globeIdentifier);
     }
 
     // Get the layer group
-    layers::Group::ID groupID = ghoul::from_string<layers::Group::ID>(layerGroupName);
+    layers::Group::ID groupID = ghoul::from_string<layers::Group::ID>(layerGroup);
     if (groupID == layers::Group::ID::Unknown) {
         throw ghoul::lua::LuaError("Unknown layer group: " + layerGroupName);
     }
@@ -116,11 +125,13 @@ namespace {
 }
 
 /**
- * Returns the list of layers for the scene graph node specified in the first parameter.
- * The second parameter specifies which layer type should be queried.
+ * Returns the list of layers for the specified globe, for a specific layer group.
+ *
+ * \param globeIdentifier The identifier of the scene graph node for the globe
+ * \param layerGroup The identifier of the layer group for which to list the layers
  */
 [[codegen::luawrap]] std::vector<std::string> layers(std::string globeIdentifier,
-                                                     std::string layer)
+                                                     std::string layerGroup)
 {
     using namespace openspace;
     using namespace globebrowsing;
@@ -135,9 +146,9 @@ namespace {
         throw ghoul::lua::LuaError("Identifier must be a RenderableGlobe");
     }
 
-    layers::Group::ID group = ghoul::from_string<layers::Group::ID>(layer);
+    layers::Group::ID group = ghoul::from_string<layers::Group::ID>(layerGroup);
     if (group == layers::Group::ID::Unknown) {
-        throw ghoul::lua::LuaError("Unknown layer groupd: " + layer);
+        throw ghoul::lua::LuaError("Unknown layer group: " + layerGroup);
     }
 
     const LayerGroup& lg = globe->layerManager().layerGroup(group);
@@ -151,32 +162,40 @@ namespace {
     return res;
 }
 
-/**
- * Returns the list of layers for the scene graph node specified in the first parameter.
- * The second parameter specifies which layer type should be queried. Deprecated in favor
- * of 'layers'.
- */
+ /**
+  * Returns the list of layers for the specified globe for a specific layer group.
+  *
+  * Deprecated in favor of `layers`.
+  *
+  * \param globeIdentifier The identifier of the scene graph node for the globe
+  * \param layerGroup The identifier of the layer group for which to list the layers
+  */
 [[codegen::luawrap("getLayers")]] std::vector<std::string> layersDeprecated(
                                                               std::string globeIdentifier,
-                                                                        std::string layer)
+                                                                   std::string layerGroup)
 {
     LWARNINGC(
         "Deprecation",
         "'getLayers' function is deprecated and should be replaced with 'layers'"
     );
 
-    return layers(std::move(globeIdentifier), std::move(layer));
+    return layers(std::move(globeIdentifier), std::move(layerGroup));
 }
 
 /**
- * Rearranges the order of a single layer on a globe. The first parameter is the
- * identifier of the globe, the second parameter specifies the name of the layer group,
- * the third parameter is the original position of the layer that should be moved and the
- * last parameter is the new position in the list. The third and fourth parameters can
- * also acccept names, in which case these refer to identifiers of the layer to be moved.
- * If the last parameter is a name, the source layer is moved below that destination
- * layer. The first position in the list has index 0, and the last position is given by
- * the number of layers minus one.
+ * Rearranges the order of a single layer on a globe. The first position in the list
+ * has index 0, and the last position is given by the number of layers minus one.
+ *
+ * The `source` and `destination` parameters can also be the identifiers of the layers to
+ * be moved. If `destination` is a name, the source layer is moved below that destination
+ * layer.
+ *
+ * \param globeIdentifier The identifier of the globe
+ * \param layerGroup The identifier of the layer group
+ * \param source The original position of the layer that should be moved, either as an
+ *               index in the list or the identifier of the layer to be moved
+ * \param destination The new position in the list, either as an index in the list or as
+ *                    the identifier of the layer after which to place the moved layer
  */
 [[codegen::luawrap]] void moveLayer(std::string globeIdentifier, std::string layerGroup,
                                     std::variant<int, std::string> source,
@@ -259,14 +278,19 @@ namespace {
 
 /**
  * Go to the chunk on a globe with given index x, y, level.
+ *
+ * \param globeIdentifier The identifier of the scene graph node for the globe
+ * \param x The x value of the tile index
+ * \param y The y value of the tile index
+ * \param level The level of the tile index
  */
-[[codegen::luawrap]] void goToChunk(std::string identifier, int x, int y, int level) {
+[[codegen::luawrap]] void goToChunk(std::string globeIdentifier, int x, int y, int level) {
     using namespace openspace;
     using namespace globebrowsing;
 
-    SceneGraphNode* n = sceneGraphNode(identifier);
+    SceneGraphNode* n = sceneGraphNode(globeIdentifier);
     if (!n) {
-        throw ghoul::lua::LuaError("Unknown globe name: " + identifier);
+        throw ghoul::lua::LuaError("Unknown globe name: " + globeIdentifier);
     }
 
     const RenderableGlobe* globe = dynamic_cast<const RenderableGlobe*>(n->renderable());
@@ -496,10 +520,14 @@ void flyToGeoInternal(std::string globe, double latitude,
 }
 
 /**
- * Returns a position in the local Cartesian coordinate system of the globe identified by
- * the first argument, that corresponds to the given geographic coordinates: latitude,
- * longitude and altitude (in degrees and meters). In the local coordinate system, the
- * position (0,0,0) corresponds to the globe's center.
+ * Returns the position in the local Cartesian coordinate system of the specified globe
+ * that corresponds to the given geographic coordinates. In the local coordinate system,
+ * the position (0,0,0) corresponds to the globe's center.
+ *
+ * \param globeIdentifier The identifier of the scene graph node for the globe
+ * \param latitude The latitude of the geograpic position, in degrees
+ * \param longitude The longitude of the geographic position, in degrees
+ * \param altitude The altitude, in meters
  */
 [[codegen::luawrap]]
 std::tuple<double, double, double>
@@ -524,12 +552,17 @@ localPositionFromGeo(std::string globeIdentifier, double latitude, double longit
 }
 
 /**
- * Returns a position in the local Cartesian coordinate system of the globe identified by
- * the first argument, that corresponds to the given geographic coordinates: latitude,
- * longitude and altitude (in degrees and meters). In the local coordinate system, the
- * position (0,0,0) corresponds to the globe's center. Deprecated in favor of
- * 'localPositionFromGeo'.
- */
+* Returns the position in the local Cartesian coordinate system of the specified globe
+* that corresponds to the given geographic coordinates. In the local coordinate system,
+* the position (0,0,0) corresponds to the globe's center.
+*
+* Deprecated in favor of `localPositionFromGeo`.
+*
+* \param globeIdentifier The identifier of the scene graph node for the globe
+* \param latitude The latitude of the geograpic position, in degrees
+* \param longitude The longitude of the geographic position, in degrees
+* \param altitude The altitude, in meters
+*/
 [[codegen::luawrap("getLocalPositionFromGeo")]]
 std::tuple<double, double, double>
 localPositionFromGeoDeprecated(std::string globeIdentifier, double latitude,
@@ -551,8 +584,10 @@ localPositionFromGeoDeprecated(std::string globeIdentifier, double latitude,
 
 /**
  * Get geographic coordinates of the camera position in latitude, longitude, and altitude
- * (degrees and meters). If the optional bool paramater is specified, the camera
- * eye postion will be used instead
+ * (degrees and meters).
+ *
+ * \param useEyePosition If true, use the view direction of the camera instead of the
+ *                       camera position
  */
 [[codegen::luawrap]] std::tuple<double, double, double> geoPositionForCamera(
                                                               bool useEyePosition = false)
@@ -608,11 +643,15 @@ localPositionFromGeoDeprecated(std::string globeIdentifier, double latitude,
     return { glm::degrees(geo2.lat), glm::degrees(geo2.lon), altitude };
 }
 
-/**
- * Get geographic coordinates of the camera position in latitude, longitude, and altitude
- * (degrees and meters). If the optional bool paramater is specified, the camera
- * eye postion will be used instead. Deprecated in favor of 'geoPositionForCamera'.
- */
+ /**
+  * Get geographic coordinates of the camera position in latitude, longitude, and altitude
+  * (degrees and meters).
+  *
+  * Deprecated in favor of `geoPositionForCamera`.
+  *
+  * \param useEyePosition If true, use the view direction of the camera instead of the
+  *                       camera position
+  */
 [[codegen::luawrap("getGeoPositionForCamera")]]
 std::tuple<double, double, double>
 geoPositionForCameraDeprecated(bool useEyePosition = false)
@@ -627,10 +666,12 @@ geoPositionForCameraDeprecated(bool useEyePosition = false)
 }
 
 /**
- * Loads and parses the WMS capabilities xml file from a remote server. The first argument
- * is the name of the capabilities that can be used to later refer to the set of
- * capabilities. The second argument is the globe for which this server is applicable. The
- * third argument is the URL at which the capabilities file can be found.
+ * Loads and parses the WMS capabilities XML file from a remote server.
+ *
+ * \param name The name of the capabilities that can be used to later refer to the set of
+ *             capabilities
+ * \param globe The identifier of the globe for which this server is applicable
+ * \param url The URL at which the capabilities file can be found
  */
 [[codegen::luawrap]] void loadWMSCapabilities(std::string name, std::string globe,
                                               std::string url)
@@ -645,9 +686,11 @@ geoPositionForCameraDeprecated(bool useEyePosition = false)
 }
 
 /**
- * Removes the WMS server identified by the first argument from the list of available
- * servers. The parameter corrsponds to the first argument in the loadWMSCapabilities call
- * that was used to load the WMS server.
+ * Removes the specified WMS server from the list of available servers. The name parameter
+ * corresponds to the first argument in the `loadWMSCapabilities` call that was used to
+ * load the WMS server.
+ *
+ * \param name The name of the WMS server to remove
  */
 [[codegen::luawrap]] void removeWMSServer(std::string name) {
     using namespace openspace;
@@ -657,9 +700,11 @@ geoPositionForCameraDeprecated(bool useEyePosition = false)
 
 /**
  * Returns an array of tables that describe the available layers that are supported by the
- * WMS server identified by the provided name. The 'URL' component of the returned table
- * can be used in the 'FilePath' argument for a call to the 'addLayer' function to add the
+ * WMS server identified by the provided name. The `URL` component of the returned table
+ * can be used in the `FilePath` argument for a call to the `addLayer` function to add the
  * value to a globe.
+ *
+ * \param name The name of the WMS server for which to get the information
  */
 [[codegen::luawrap]] std::vector<ghoul::Dictionary> capabilitiesWMS(std::string name) {
     using namespace openspace;
@@ -680,24 +725,28 @@ geoPositionForCameraDeprecated(bool useEyePosition = false)
 }
 
 /**
- * Add a GeoJson layer specified by the given table to the globe specified by the
- * 'globeName' argument
+ * Add a GeoJson layer specified by the given table to the specified globe.
+ *
+ * \param globeIdentifier The identifier of the scene graph node for the globe
+ * \param table A table with information about the GeoJson layer. See
+ *              [this page](#globebrowsing_geojsoncomponent) for details on what fields
+ *              and settings the table may contain
  */
-[[codegen::luawrap]] void addGeoJson(std::string globeName, ghoul::Dictionary table)
+[[codegen::luawrap]] void addGeoJson(std::string globeIdentifier, ghoul::Dictionary table)
 {
     using namespace openspace;
     using namespace globebrowsing;
 
     // Get the node and make sure it exists
-    SceneGraphNode* n = global::renderEngine->scene()->sceneGraphNode(globeName);
+    SceneGraphNode* n = global::renderEngine->scene()->sceneGraphNode(globeIdentifier);
     if (!n) {
-        throw ghoul::lua::LuaError("Unknown globe name: " + globeName);
+        throw ghoul::lua::LuaError("Unknown globe name: " + globeIdentifier);
     }
 
     // Get the renderable globe
     RenderableGlobe* globe = dynamic_cast<RenderableGlobe*>(n->renderable());
     if (!globe) {
-        throw ghoul::lua::LuaError("Renderable is not a globe: " + globeName);
+        throw ghoul::lua::LuaError("Renderable is not a globe: " + globeIdentifier);
     }
 
     // Get the dictionary defining the layer
@@ -706,24 +755,28 @@ geoPositionForCameraDeprecated(bool useEyePosition = false)
 
 /**
  * Remove the GeoJson layer specified by the given table or string identifier from the
- * globe specified by the 'globeName' argument
+ * specified globe.
+ *
+ * \param globeIdentifier The identifier of the scene graph node for the globe
+ * \param tableOrIdentifier Either an identifier for the GeoJson layer to be removed, or
+ *                          a table that includes the identifier
  */
-[[codegen::luawrap]] void deleteGeoJson(std::string globeName,
+[[codegen::luawrap]] void deleteGeoJson(std::string globeIdentifier,
                           std::variant<std::string, ghoul::Dictionary> tableOrIdentifier)
 {
     using namespace openspace;
     using namespace globebrowsing;
 
     // Get the node and make sure it exists
-    SceneGraphNode* n = global::renderEngine->scene()->sceneGraphNode(globeName);
+    SceneGraphNode* n = global::renderEngine->scene()->sceneGraphNode(globeIdentifier);
     if (!n) {
-        throw ghoul::lua::LuaError("Unknown globe name: " + globeName);
+        throw ghoul::lua::LuaError("Unknown globe name: " + globeIdentifier);
     }
 
     // Get the renderable globe
     RenderableGlobe* globe = dynamic_cast<RenderableGlobe*>(n->renderable());
     if (!globe) {
-        throw ghoul::lua::LuaError("Renderable is not a globe: " + globeName);
+        throw ghoul::lua::LuaError("Renderable is not a globe: " + globeIdentifier);
     }
 
     std::string identifier;
@@ -746,7 +799,10 @@ geoPositionForCameraDeprecated(bool useEyePosition = false)
 /**
  * Add a GeoJson layer from the given file name and add it to the current anchor node,
  * if it is a globe. Note that you might have to increase the height offset for the
- * added feature to be visible on the globe, if using a height map
+ * added feature to be visible on the globe, if using a height map.
+ *
+ * \param filename The path to the GeoJSON file
+ * \param name An optional name that the loaded feature will get in the user interface
  */
 [[codegen::luawrap]] void addGeoJsonFromFile(std::string filename,
                                              std::optional<std::string> name)

From b8c2701931b8af18d1d0392b841e1337f9e20edb Mon Sep 17 00:00:00 2001
From: Emma Broman <emma.broman@liu.se>
Date: Thu, 13 Jun 2024 11:18:52 +0200
Subject: [PATCH 498/701] Fix forgotten renamed variables

---
 modules/globebrowsing/globebrowsingmodule_lua.inl | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/modules/globebrowsing/globebrowsingmodule_lua.inl b/modules/globebrowsing/globebrowsingmodule_lua.inl
index bcc23e1d48..df5170a851 100644
--- a/modules/globebrowsing/globebrowsingmodule_lua.inl
+++ b/modules/globebrowsing/globebrowsingmodule_lua.inl
@@ -60,7 +60,7 @@ namespace {
     // Get the layer group
     layers::Group::ID groupID = ghoul::from_string<layers::Group::ID>(layerGroup);
     if (groupID == layers::Group::ID::Unknown) {
-        throw ghoul::lua::LuaError("Unknown layer group: " + layerGroupName);
+        throw ghoul::lua::LuaError("Unknown layer group: " + layerGroup);
     }
 
     // Add the name of the enclosing globe to layer dict, it is used to identify a cache
@@ -104,7 +104,7 @@ namespace {
     // Get the layer group
     layers::Group::ID groupID = ghoul::from_string<layers::Group::ID>(layerGroup);
     if (groupID == layers::Group::ID::Unknown) {
-        throw ghoul::lua::LuaError("Unknown layer group: " + layerGroupName);
+        throw ghoul::lua::LuaError("Unknown layer group: " + layerGroup);
     }
 
     std::string layerName;

From f8c677630d464975b4a8079c14d501f885e37bfb Mon Sep 17 00:00:00 2001
From: Alexander Bock <alexander.bock@liu.se>
Date: Thu, 13 Jun 2024 17:08:34 +0200
Subject: [PATCH 499/701] Fix issue that prevents reading empty comment lines
 in lua function documentation

---
 support/coding/codegen | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/support/coding/codegen b/support/coding/codegen
index 0db6463700..32f22c537e 160000
--- a/support/coding/codegen
+++ b/support/coding/codegen
@@ -1 +1 @@
-Subproject commit 0db6463700e41305a61df1512a450aeb412840f0
+Subproject commit 32f22c537eb855a36f72fd3c1c39d9318e116238

From 059ab702186e0cc4ee934c1caaf806a3664316c4 Mon Sep 17 00:00:00 2001
From: Ylva Selling <ylva.selling@gmail.com>
Date: Fri, 14 Jun 2024 20:48:13 +0200
Subject: [PATCH 500/701] Add events for adding and removing actions and
 publishing events when an action is added (#3325)

* Remove unused shortcut manager
* Add events for adding and removing actions
* Publish event when an action is added
* Add get_action event to shortcut topic which sends requested action to the topic
* Add better comments to events
* Publish event action removed when removing an action
* Rename actions to shortcuts in the json object
* Remove subscriptions and rename action to shortcut
---
 include/openspace/engine/globals.h            |  2 -
 include/openspace/events/event.h              | 38 +++++++++++++++
 modules/server/include/topics/shortcuttopic.h |  3 +-
 modules/server/src/topics/shortcuttopic.cpp   | 46 ++++++++++++++-----
 src/events/event.cpp                          | 46 +++++++++++++++++++
 src/interaction/actionmanager.cpp             |  8 ++++
 6 files changed, 129 insertions(+), 14 deletions(-)

diff --git a/include/openspace/engine/globals.h b/include/openspace/engine/globals.h
index add1a4f99c..e94c3caeab 100644
--- a/include/openspace/engine/globals.h
+++ b/include/openspace/engine/globals.h
@@ -59,7 +59,6 @@ namespace interaction {
     class KeybindingManager;
     class NavigationHandler;
     class SessionRecording;
-    class ShortcutManager;
 } // namespace interaction
 namespace properties { class PropertyOwner; }
 namespace scripting {
@@ -96,7 +95,6 @@ inline interaction::WebsocketInputStates* websocketInputStates;
 inline interaction::KeybindingManager* keybindingManager;
 inline interaction::NavigationHandler* navigationHandler;
 inline interaction::SessionRecording* sessionRecording;
-inline interaction::ShortcutManager* shortcutManager;
 inline properties::PropertyOwner* rootPropertyOwner;
 inline properties::PropertyOwner* screenSpaceRootPropertyOwner;
 inline properties::PropertyOwner* userPropertyOwner;
diff --git a/include/openspace/events/event.h b/include/openspace/events/event.h
index 533da66758..c1f685fa12 100644
--- a/include/openspace/events/event.h
+++ b/include/openspace/events/event.h
@@ -73,6 +73,8 @@ struct Event {
         FocusNodeChanged,
         LayerAdded,
         LayerRemoved,
+        ActionAdded,
+        ActionRemoved,
         SessionRecordingPlayback,
         PointSpacecraft,
         RenderableEnabled,
@@ -426,6 +428,42 @@ struct EventLayerRemoved : public Event {
     const tstring uri;
 };
 
+/**
+ * This event is created when an action is added.
+ */
+struct EventActionAdded : public Event {
+    static constexpr Type Type = Event::Type::ActionAdded;
+
+    /**
+     * Creates an instance of an EventActionAdded event.
+     *
+     * \param uri_ A string with the uri of the action that was added
+     *
+     * \pre uri_ must be a valid uri
+     */
+    explicit EventActionAdded(std::string_view uri_);
+
+    const tstring uri;
+};
+
+/**
+ * This event is created when an action is removed.
+ */
+struct EventActionRemoved : public Event {
+    static constexpr Type Type = Event::Type::ActionRemoved;
+
+    /**
+     * Creates an instance of an EventActionRemoved event.
+     *
+     * \param uri_ The uri of the action that was removed
+     *
+     * \pre uri_ must be a valid uri
+     */
+    explicit EventActionRemoved(std::string_view uri_);
+
+    const tstring uri;
+};
+
 /**
  * This event is created when something regarding a session recording playback changes.
  * The event contains information about the new state of the session recording subsystem.
diff --git a/modules/server/include/topics/shortcuttopic.h b/modules/server/include/topics/shortcuttopic.h
index e2c36ef115..4f621ec534 100644
--- a/modules/server/include/topics/shortcuttopic.h
+++ b/modules/server/include/topics/shortcuttopic.h
@@ -37,8 +37,9 @@ public:
     bool isDone() const override;
 
 private:
-    void sendData() const;
+    void sendData(nlohmann::json data) const;
     std::vector<nlohmann::json> shortcutsJson() const;
+    nlohmann::json shortcutJson(const std::string& identifier) const;
 };
 
 } // namespace openspace
diff --git a/modules/server/src/topics/shortcuttopic.cpp b/modules/server/src/topics/shortcuttopic.cpp
index 7f99ec4d3f..83bf4a47eb 100644
--- a/modules/server/src/topics/shortcuttopic.cpp
+++ b/modules/server/src/topics/shortcuttopic.cpp
@@ -101,23 +101,47 @@ std::vector<nlohmann::json> ShortcutTopic::shortcutsJson() const {
     return json;
 }
 
-void ShortcutTopic::sendData() const {
-    const nlohmann::json data = { {"shortcuts", shortcutsJson()} };
-    _connection->sendJson(wrappedPayload(data));
+nlohmann::json ShortcutTopic::shortcutJson(const std::string& identifier) const {
+    std::vector<nlohmann::json> json;
+    std::vector<interaction::Action> actions = global::actionManager->actions();
+
+    auto found = std::find_if(
+        actions.begin(),
+        actions.end(),
+        [&identifier](const interaction::Action& action) {
+            return action.identifier == identifier;
+        }
+    );
+
+    if (found == actions.end()) {
+        return {};
+    }
+    interaction::Action action = *found;
+
+    json.push_back({
+        { "identifier", action.identifier },
+        { "name", action.name },
+        { "script", action.command },
+        { "synchronization", static_cast<bool>(!action.isLocal) },
+        { "documentation", action.documentation },
+        { "guiPath", action.guiPath },
+    });
+    return json;
+}
+
+void ShortcutTopic::sendData(nlohmann::json data) const {
+    _connection->sendJson(wrappedPayload({ { "shortcuts", data } }));
 }
 
 void ShortcutTopic::handleJson(const nlohmann::json& input) {
     const std::string& event = input.at("event").get<std::string>();
-    if (event == "start_subscription") {
-        // TODO: Subscribe to shortcuts and keybindings
-        // shortcutManager.subscribe(); ...
+    if (event == "get_all_shortcuts") {
+        sendData(shortcutsJson());
     }
-    else if (event == "stop_subscription") {
-        // TODO: Unsubscribe to shortcuts and keybindings
-        // shortcutManager.unsubscribe(); ...
-        return;
+    else if (event == "get_shortcut") {
+        const std::string& identifier = input.at("identifier").get<std::string>();
+        sendData(shortcutJson(identifier));
     }
-    sendData();
 }
 
 } // namespace openspace
diff --git a/src/events/event.cpp b/src/events/event.cpp
index 50bb341596..d6d59fbb3c 100644
--- a/src/events/event.cpp
+++ b/src/events/event.cpp
@@ -156,6 +156,16 @@ void log(int i, const EventLayerRemoved& e) {
     LINFO(std::format("[{}] LayerRemoved: {}", i, e.uri));
 }
 
+void log(int i, const EventActionAdded& e) {
+    ghoul_assert(e.type == EventActionAdded::Type, "Wrong type");
+    LINFO(std::format("[{}] ActionAdded: {}", i, e.uri));
+}
+
+void log(int i, const EventActionRemoved& e) {
+    ghoul_assert(e.type == EventActionRemoved::Type, "Wrong type");
+    LINFO(std::format("[{}] ActionRemoved: {}", i, e.uri));
+}
+
 void log(int i, const EventSessionRecordingPlayback& e) {
     ghoul_assert(e.type == EventSessionRecordingPlayback::Type, "Wrong type");
 
@@ -239,6 +249,8 @@ std::string_view toString(Event::Type type) {
         case Event::Type::FocusNodeChanged: return "FocusNodeChanged";
         case Event::Type::LayerAdded: return "LayerAdded";
         case Event::Type::LayerRemoved: return "LayerRemoved";
+        case Event::Type::ActionAdded: return "ActionAdded";
+        case Event::Type::ActionRemoved: return "ActionRemoved";
         case Event::Type::SessionRecordingPlayback: return "SessionRecordingPlayback";
         case Event::Type::PointSpacecraft: return "PointSpacecraft";
         case Event::Type::RenderableEnabled: return "RenderableEnabled";
@@ -299,6 +311,12 @@ Event::Type fromString(std::string_view str) {
     else if (str == "LayerRemoved") {
         return Event::Type::LayerRemoved;
     }
+    else if (str == "ActionAdded") {
+        return Event::Type::ActionAdded;
+    }
+    else if (str == "ActionRemoved") {
+        return Event::Type::ActionRemoved;
+    }
     else if (str == "SessionRecordingPlayback") {
         return Event::Type::SessionRecordingPlayback;
     }
@@ -448,6 +466,18 @@ ghoul::Dictionary toParameter(const Event& e) {
                 std::string(static_cast<const EventLayerRemoved&>(e).uri)
             );
             break;
+        case Event::Type::ActionAdded:
+            d.setValue(
+                "Uri",
+                std::string(static_cast<const EventActionAdded&>(e).uri)
+            );
+            break;
+        case Event::Type::ActionRemoved:
+            d.setValue(
+                "Uri",
+                std::string(static_cast<const EventActionRemoved&>(e).uri)
+            );
+            break;
         case Event::Type::SessionRecordingPlayback:
             switch (static_cast<const EventSessionRecordingPlayback&>(e).state) {
                 case EventSessionRecordingPlayback::State::Started:
@@ -570,6 +600,12 @@ void logAllEvents(const Event* e) {
             case Event::Type::LayerRemoved:
                 log(i, *static_cast<const EventLayerRemoved*>(e));
                 break;
+            case Event::Type::ActionAdded:
+                log(i, *static_cast<const EventActionAdded*>(e));
+                break;
+            case Event::Type::ActionRemoved:
+                log(i, *static_cast<const EventActionRemoved*>(e));
+                break;
             case Event::Type::SessionRecordingPlayback:
                 log(i, *static_cast<const EventSessionRecordingPlayback*>(e));
                 break;
@@ -694,6 +730,16 @@ EventLayerRemoved::EventLayerRemoved(std::string_view uri_)
     , uri(temporaryString(uri_))
 {}
 
+EventActionAdded::EventActionAdded(std::string_view uri_)
+    : Event(Type)
+    , uri(temporaryString(uri_))
+{}
+
+EventActionRemoved::EventActionRemoved(std::string_view uri_)
+    : Event(Type)
+    , uri(temporaryString(uri_))
+{}
+
 EventSessionRecordingPlayback::EventSessionRecordingPlayback(State state_)
     : Event(Type)
     , state(state_)
diff --git a/src/interaction/actionmanager.cpp b/src/interaction/actionmanager.cpp
index 5f72d9cbc1..329a788017 100644
--- a/src/interaction/actionmanager.cpp
+++ b/src/interaction/actionmanager.cpp
@@ -24,6 +24,8 @@
 
 #include <openspace/interaction/actionmanager.h>
 
+#include <openspace/events/event.h>
+#include <openspace/events/eventengine.h>
 #include <openspace/engine/globals.h>
 #include <openspace/scripting/lualibrary.h>
 #include <openspace/scripting/scriptengine.h>
@@ -49,6 +51,9 @@ void ActionManager::registerAction(Action action) {
     ghoul_assert(!hasAction(action.identifier), "Identifier already existed");
 
     const unsigned int hash = ghoul::hashCRC32(action.identifier);
+    global::eventEngine->publishEvent<events::EventActionAdded>(
+        action.identifier
+    );
     _actions[hash] = std::move(action);
 }
 
@@ -58,6 +63,9 @@ void ActionManager::removeAction(const std::string& identifier) {
 
     const unsigned int hash = ghoul::hashCRC32(identifier);
     const auto it = _actions.find(hash);
+    global::eventEngine->publishEvent<events::EventActionRemoved>(
+        identifier
+    );
     _actions.erase(it);
 }
 

From 43645ce7a4443a4f8c45f938722810dc9796501b Mon Sep 17 00:00:00 2001
From: Alexander Bock <mail@alexanderbock.eu>
Date: Fri, 14 Jun 2024 23:55:55 +0200
Subject: [PATCH 501/701] Fix existing assets;  Make the goToGeo function
 without altitude in the profile work

---
 data/assets/scene/milkyway/gaia/apogee.asset                 | 2 +-
 data/assets/scene/milkyway/gaia/galah.asset                  | 2 +-
 .../scene/solarsystem/missions/bepicolombo/mission.asset     | 2 +-
 data/assets/util/webgui.asset                                | 2 +-
 data/profiles/artemis.profile                                | 5 -----
 data/profiles/jwst.profile                                   | 5 -----
 modules/base/rendering/renderableplanetimevaryingimage.cpp   | 2 --
 src/engine/openspaceengine.cpp                               | 2 +-
 8 files changed, 5 insertions(+), 17 deletions(-)

diff --git a/data/assets/scene/milkyway/gaia/apogee.asset b/data/assets/scene/milkyway/gaia/apogee.asset
index e4965bdb89..3b2429b10e 100644
--- a/data/assets/scene/milkyway/gaia/apogee.asset
+++ b/data/assets/scene/milkyway/gaia/apogee.asset
@@ -30,7 +30,7 @@ local GaiaAbundanceApogee = {
     OtherData = "FeH",
     MagnitudeExponent = 7.25,
     SizeComposition = "Distance Modulus",
-    Halo = {
+    Glare = {
       Texture = textures .. "halo.png"
     },
     ColorRange = { { -0.8, 0.6 } },
diff --git a/data/assets/scene/milkyway/gaia/galah.asset b/data/assets/scene/milkyway/gaia/galah.asset
index db21e477b3..2a66ac707a 100644
--- a/data/assets/scene/milkyway/gaia/galah.asset
+++ b/data/assets/scene/milkyway/gaia/galah.asset
@@ -26,7 +26,7 @@ local GaiaAbundanceGalah = {
     Type = "RenderableStars",
     Enabled = false,
     File = speck .. "GaiaAbundGalah.speck",
-    Halo = {
+    Glare = {
       Texture = textures .. "halo.png"
     },
     -- ShapeTexture = textures .. "disc.png",
diff --git a/data/assets/scene/solarsystem/missions/bepicolombo/mission.asset b/data/assets/scene/solarsystem/missions/bepicolombo/mission.asset
index 717e23b6c2..681febe171 100644
--- a/data/assets/scene/solarsystem/missions/bepicolombo/mission.asset
+++ b/data/assets/scene/solarsystem/missions/bepicolombo/mission.asset
@@ -1,7 +1,7 @@
 local Mission = {
   Name = "BepiColombo",
   Image = "https://scifleet.esa.int/downloads/bepi_mcs/bepicolombo.png",
-  Description = [[BepiColombo is Europe's first mission to Mercury. It will launch in October 2018 on a journey to the smallest and least explored terrestrial planet in our Solar System. Arriving at Mercury in December 2025, it will endure temperatures in excess of 350°C and gather data during a 1 year nominal mission. The mission comprises two spacecraft: 1. Mercury Planetary Orbiter (MPO), 2. Mercury Magnetospheric Orbiter (MMO). BepiColombo is a joint mission between ESA and the Japan Aerospace Exploration Agency (JAXA), executed under ESA leadership.]],
+  Description = [[BepiColombo is Europe's first mission to Mercury. It launched in October 2018 on a journey to the smallest and least explored terrestrial planet in our Solar System. Arriving at Mercury in December 2025, it will endure temperatures in excess of 350°C and gather data during a 1 year nominal mission. The mission comprises two spacecraft: 1. Mercury Planetary Orbiter (MPO), 2. Mercury Magnetospheric Orbiter (MMO). BepiColombo is a joint mission between ESA and the Japan Aerospace Exploration Agency (JAXA), executed under ESA leadership.]],
   TimeRange = {
     Start = "2018 OCT 20 01:45:00",
     End = "2028 MAY 01 12:00:00" -- Preliminary time
diff --git a/data/assets/util/webgui.asset b/data/assets/util/webgui.asset
index ea5a79caaf..ac66561409 100644
--- a/data/assets/util/webgui.asset
+++ b/data/assets/util/webgui.asset
@@ -4,7 +4,7 @@ local guiCustomization = asset.require("customization/gui")
 
 
 -- Select which commit hashes to use for the frontend and backend
-local frontendHash = "768c411e1430ad3ece3528a648ded7a862efb2d0"
+local frontendHash = "6d9cc89449e70603731ad08037e120cdfef70635"
 
 local frontend = asset.resource({
   Identifier = "WebGuiFrontend",
diff --git a/data/profiles/artemis.profile b/data/profiles/artemis.profile
index 550a7466f0..103fcab6ec 100644
--- a/data/profiles/artemis.profile
+++ b/data/profiles/artemis.profile
@@ -73,11 +73,6 @@
       "type": "setPropertyValueSingle",
       "value": "{0.5, 0.5, 0.5}"
     },
-    {
-      "name": "Scene.MoonTrail.Renderable.Appearance.Fade",
-      "type": "setPropertyValueSingle",
-      "value": "4.0"
-    },
     {
       "name": "Scene.Earth.Renderable.Layers.ColorLayers.ESRI_NOAA20_Combo.Enabled",
       "type": "setPropertyValueSingle",
diff --git a/data/profiles/jwst.profile b/data/profiles/jwst.profile
index 39111d2947..521fa3a859 100644
--- a/data/profiles/jwst.profile
+++ b/data/profiles/jwst.profile
@@ -134,11 +134,6 @@
       "type": "setPropertyValue",
       "value": "false"
     },
-    {
-      "name": "Scene.MoonTrail.Renderable.Appearance.Fade",
-      "type": "setPropertyValueSingle",
-      "value": "3.0"
-    },
     {
       "name": "Scene.JWSTTrailLaunch.Renderable.Appearance.EnableFade",
       "type": "setPropertyValueSingle",
diff --git a/modules/base/rendering/renderableplanetimevaryingimage.cpp b/modules/base/rendering/renderableplanetimevaryingimage.cpp
index 8c8c2f3eae..1d47dadc87 100644
--- a/modules/base/rendering/renderableplanetimevaryingimage.cpp
+++ b/modules/base/rendering/renderableplanetimevaryingimage.cpp
@@ -72,8 +72,6 @@ RenderablePlaneTimeVaryingImage::RenderablePlaneTimeVaryingImage(
 {
     const Parameters p = codegen::bake<Parameters>(dictionary);
 
-    addProperty(_blendMode);
-
     _sourceFolder = p.sourceFolder;
     if (!std::filesystem::is_directory(absPath(_sourceFolder))) {
         LERROR(std::format(
diff --git a/src/engine/openspaceengine.cpp b/src/engine/openspaceengine.cpp
index b6dd15ca53..acd97af002 100644
--- a/src/engine/openspaceengine.cpp
+++ b/src/engine/openspaceengine.cpp
@@ -1614,7 +1614,7 @@ void setCameraFromProfile(const Profile& p) {
                 }
                 else {
                     geoScript = std::format(
-                        "openspace.globebrowsing.flyToGeo2([[{}]], {}, {}, 0)",
+                        "openspace.globebrowsing.flyToGeo2([[{}]], {}, {}, false, 0)",
                         geo.anchor, geo.latitude, geo.longitude
                     );
                 }

From ba56433a78ffde357792ad8002fa39150065634a Mon Sep 17 00:00:00 2001
From: Alexander Bock <mail@alexanderbock.eu>
Date: Sat, 15 Jun 2024 00:47:31 +0200
Subject: [PATCH 502/701] Reeable SNPP VIIRS as the standard Earth layer

---
 .../scene/solarsystem/planets/earth/layers/base_layers.asset  | 4 ++--
 .../earth/layers/colorlayers/viirs_snpp_temporal.asset        | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/data/assets/scene/solarsystem/planets/earth/layers/base_layers.asset b/data/assets/scene/solarsystem/planets/earth/layers/base_layers.asset
index b49486c2c4..7f976aa0c8 100644
--- a/data/assets/scene/solarsystem/planets/earth/layers/base_layers.asset
+++ b/data/assets/scene/solarsystem/planets/earth/layers/base_layers.asset
@@ -1,6 +1,6 @@
 asset.require("./colorlayers/blue_marble", false)
-asset.require("./colorlayers/esri_viirs_combo", false)
-asset.require("./colorlayers/esri_noaa20_combo", asset.enabled)
+asset.require("./colorlayers/esri_viirs_combo", asset.enabled)
+asset.require("./colorlayers/esri_noaa20_combo", false)
 asset.require("./colorlayers/esri_world_imagery", false)
 asset.require("./colorlayers/viirs_noaa20_temporal", false)
 asset.require("./colorlayers/aqua_modis_temporal", false)
diff --git a/data/assets/scene/solarsystem/planets/earth/layers/colorlayers/viirs_snpp_temporal.asset b/data/assets/scene/solarsystem/planets/earth/layers/colorlayers/viirs_snpp_temporal.asset
index 2cd80b0669..441e5c73f9 100644
--- a/data/assets/scene/solarsystem/planets/earth/layers/colorlayers/viirs_snpp_temporal.asset
+++ b/data/assets/scene/solarsystem/planets/earth/layers/colorlayers/viirs_snpp_temporal.asset
@@ -12,7 +12,7 @@ local Layer = {
   Prototyped = {
     Time = {
       Start = "2015-11-24",
-      End = "2024-05-27"
+      End = "Today"
     },
     TemporalResolution = "1d",
     TimeFormat = "YYYY-MM-DD",

From f76215961c2a05cb75c2365dd8549b75b8690caa Mon Sep 17 00:00:00 2001
From: Alexander Bock <mail@alexanderbock.eu>
Date: Sat, 15 Jun 2024 00:48:12 +0200
Subject: [PATCH 503/701] Update the version number

---
 CMakeLists.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 36a177a3c0..e5b4a10d4b 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -30,7 +30,7 @@ project(OpenSpace)
 set(OPENSPACE_VERSION_MAJOR 0)
 set(OPENSPACE_VERSION_MINOR 20)
 set(OPENSPACE_VERSION_PATCH 0)
-set(OPENSPACE_VERSION_STRING "rc-2")
+set(OPENSPACE_VERSION_STRING "Beta-13")
 
 include(${PROJECT_SOURCE_DIR}/support/cmake/module_common.cmake)
 include(${PROJECT_SOURCE_DIR}/ext/ghoul/support/cmake/message_macros.cmake)

From 01fa2898dbd5856f4c232d5eb964d0fea0108c2e Mon Sep 17 00:00:00 2001
From: Alexander Bock <mail@alexanderbock.eu>
Date: Sat, 15 Jun 2024 18:07:39 +0200
Subject: [PATCH 504/701] FixedRotation rerequests a missing attached node or
 target node every frame to prevent incorrect initialization order

---
 .../solarsystem/missions/artemis/model.asset     |  2 +-
 .../solarsystem/telescopes/euclid/model.asset    |  2 +-
 modules/base/rotation/fixedrotation.cpp          | 16 ++++++++++++++++
 3 files changed, 18 insertions(+), 2 deletions(-)

diff --git a/data/assets/scene/solarsystem/missions/artemis/model.asset b/data/assets/scene/solarsystem/missions/artemis/model.asset
index 1d3cd6974b..b01d723acb 100644
--- a/data/assets/scene/solarsystem/missions/artemis/model.asset
+++ b/data/assets/scene/solarsystem/missions/artemis/model.asset
@@ -21,7 +21,7 @@ local ArtemisModel = {
       Attached = "ArtemisModel",
       XAxis = { 1.0, 0.0, 0.0 },
       XAxisOrthogonal = true,
-      YAxis = "Sun",
+      YAxis = sun.SunCenter.Identifier,
       YAxisInvert = true
     }
   },
diff --git a/data/assets/scene/solarsystem/telescopes/euclid/model.asset b/data/assets/scene/solarsystem/telescopes/euclid/model.asset
index 1b2f2976aa..d66a6d0dc9 100644
--- a/data/assets/scene/solarsystem/telescopes/euclid/model.asset
+++ b/data/assets/scene/solarsystem/telescopes/euclid/model.asset
@@ -30,7 +30,7 @@ local Euclid = {
     Rotation = {
       Type = "FixedRotation",
       Attached = "Euclid",
-      ZAxis = "Sun",
+      ZAxis = sun.SunCenter.Identifier,
       YAxis = { 0.0, 1.0, 0.0 },
       YAxisOrthogonal = true
     }
diff --git a/modules/base/rotation/fixedrotation.cpp b/modules/base/rotation/fixedrotation.cpp
index df1c24b4cb..41d0e3be7d 100644
--- a/modules/base/rotation/fixedrotation.cpp
+++ b/modules/base/rotation/fixedrotation.cpp
@@ -505,6 +505,22 @@ void FixedRotation::update(const UpdateData& data) {
         _zAxis.type == Axis::Type::Object
     );
 
+    // @TODO (2024-06-15, abock) None of the following four checks should be necessary
+    //       as the nodes are retrieved whenever the property value is changed, but we
+    //       had an initialization issue and this was the fastest way to fix the bug
+    if (!_attachedNode) {
+        _attachedNode = sceneGraphNode(_attachedObject);
+    }
+    if (_xAxis.type == Axis::Type::Object && !_xAxis.node) {
+        _xAxis.node = sceneGraphNode(_xAxis.object);
+    }
+    if (_yAxis.type == Axis::Type::Object && !_yAxis.node) {
+        _yAxis.node = sceneGraphNode(_yAxis.object);
+    }
+    if (_zAxis.type == Axis::Type::Object && !_zAxis.node) {
+        _zAxis.node = sceneGraphNode(_zAxis.object);
+    }
+
     if (_attachedNode || anyAxisIsObjectType) {
         requireUpdate();
     }

From 14cf12d23ebad2e3ea663149c7101be756e98fbd Mon Sep 17 00:00:00 2001
From: Alexander Bock <alexander.bock@liu.se>
Date: Mon, 17 Jun 2024 12:05:24 +0200
Subject: [PATCH 505/701] Update the UI hash

---
 data/assets/util/webgui.asset | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/data/assets/util/webgui.asset b/data/assets/util/webgui.asset
index ac66561409..879f3613ff 100644
--- a/data/assets/util/webgui.asset
+++ b/data/assets/util/webgui.asset
@@ -4,7 +4,7 @@ local guiCustomization = asset.require("customization/gui")
 
 
 -- Select which commit hashes to use for the frontend and backend
-local frontendHash = "6d9cc89449e70603731ad08037e120cdfef70635"
+local frontendHash = "67262b3edb3c33580d73e0bb5a61a0321a0b218e"
 
 local frontend = asset.resource({
   Identifier = "WebGuiFrontend",

From 6cb4a7efef5fedffb6782c0382450d0f7d35d3ff Mon Sep 17 00:00:00 2001
From: Emma Broman <emma.broman@liu.se>
Date: Tue, 18 Jun 2024 13:47:35 +0200
Subject: [PATCH 506/701] Fix issue with texture not updating on property
 change for RenderablePointCloud

Fix issue with texture not being rendered when the texture file path is set during runtime
---
 modules/base/rendering/pointcloud/renderablepointcloud.cpp | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/modules/base/rendering/pointcloud/renderablepointcloud.cpp b/modules/base/rendering/pointcloud/renderablepointcloud.cpp
index 4e3e7b5ea7..e8842b4a9b 100644
--- a/modules/base/rendering/pointcloud/renderablepointcloud.cpp
+++ b/modules/base/rendering/pointcloud/renderablepointcloud.cpp
@@ -731,9 +731,6 @@ RenderablePointCloud::RenderablePointCloud(const ghoul::Dictionary& dictionary)
             _textureMode = TextureInputMode::Single;
             _hasSpriteTexture = true;
             _texture.spriteTexturePath = absPath(*t.file).string();
-            _texture.spriteTexturePath.onChange(
-                [this]() { _spriteTextureIsDirty = true; }
-            );
         }
 
         _texture.enabled = t.enabled.value_or(_texture.enabled);
@@ -742,6 +739,10 @@ RenderablePointCloud::RenderablePointCloud(const ghoul::Dictionary& dictionary)
         _texture.useAlphaChannel = t.useAlphaChannel.value_or(_texture.useAlphaChannel);
     }
 
+    _texture.spriteTexturePath.onChange([this]() {
+        _spriteTextureIsDirty = true;
+        _hasSpriteTexture = !_texture.spriteTexturePath.value().empty();
+    });
     _texture.allowCompression.onChange([this]() { _spriteTextureIsDirty = true; });
     _texture.useAlphaChannel.onChange([this]() { _spriteTextureIsDirty = true; });
 

From 2cc5a53aaa053dc7adec8da71066cbbd043146e7 Mon Sep 17 00:00:00 2001
From: Alexander Bock <alexander.bock@liu.se>
Date: Wed, 19 Jun 2024 11:26:07 +0200
Subject: [PATCH 507/701] Remove version numbers from asset files

---
 .../actions/system/undo_event_fades.asset       |  1 -
 data/assets/actions/time.asset                  |  1 -
 .../actions/trails/on_off_all_minor_moons.asset |  1 -
 .../trails/toggle_all_dwarf_planet_trails.asset |  1 -
 .../trails/toggle_all_minor_moon_trails.asset   |  1 -
 data/assets/actions/trails/toggle_trail.asset   |  1 -
 data/assets/customization/globebrowsing.asset   |  1 -
 data/assets/customization/gui.asset             |  1 -
 data/assets/dashboard/date.asset                |  1 -
 data/assets/dashboard/default_dashboard.asset   |  1 -
 data/assets/dashboard/distance.asset            |  1 -
 data/assets/dashboard/framerate.asset           |  1 -
 data/assets/dashboard/globelocation.asset       |  1 -
 data/assets/dashboard/parallelconnection.asset  |  1 -
 data/assets/dashboard/simulationincrement.asset |  1 -
 data/assets/dashboard/velocity.asset            |  1 -
 data/assets/educational/epicycle.asset          |  1 -
 .../educational/scale/arc_de_triomphe.asset     |  1 -
 data/assets/educational/scale/big_ben.asset     |  1 -
 .../assets/educational/scale/burj_khalifa.asset |  1 -
 data/assets/educational/scale/eiffeltower.asset |  1 -
 .../scale/empire_state_building.asset           |  1 -
 .../assets/educational/scale/gateway_arch.asset |  1 -
 .../educational/scale/golden_gate_bridge.asset  |  1 -
 .../educational/scale/kuala_lumpur_tower.asset  |  1 -
 data/assets/educational/scale/rose_bowl.asset   |  1 -
 data/assets/educational/scale/school_bus.asset  |  1 -
 data/assets/educational/scale/scientist.asset   |  1 -
 .../educational/scale/statue_of_liberty.asset   |  1 -
 data/assets/events/toggle_sun.asset             |  1 -
 data/assets/examples/animation.asset            |  2 --
 data/assets/examples/dashboarditems.asset       |  1 -
 data/assets/examples/debugcoordinateaxes.asset  |  1 -
 data/assets/examples/discs.asset                |  1 -
 data/assets/examples/galaxyshader/volume.asset  |  1 -
 .../geojson_extruded_shaded_polygon.asset       |  1 -
 .../assets/examples/geojson/geojson_lines.asset |  1 -
 .../geojson/geojson_multiple_polygons.asset     |  1 -
 .../examples/geojson/geojson_points.asset       |  1 -
 .../geojson/geojson_points_outfacing.asset      |  1 -
 .../geojson/geojson_polygons_with_holes.asset   |  1 -
 .../examples/geojson/geojson_roverpath.asset    |  1 -
 .../geojson/geojson_toronto_neighborhoods.asset |  1 -
 data/assets/examples/globerotation.asset        |  1 -
 data/assets/examples/globetranslation.asset     |  1 -
 data/assets/examples/grids.asset                |  1 -
 data/assets/examples/joystickproperty.asset     |  1 -
 data/assets/examples/nodeline.asset             |  1 -
 data/assets/examples/primitives.asset           |  1 -
 data/assets/examples/screenspacebrowser.asset   |  1 -
 data/assets/examples/spheres.asset              |  1 -
 data/assets/examples/statemachine.asset         |  1 -
 .../examples/temperature_land_highres.asset     |  1 -
 data/assets/examples/urlsynchronization.asset   |  1 -
 data/assets/examples/video/videoglobe.asset     |  1 -
 data/assets/examples/video/videoplane.asset     |  1 -
 .../examples/video/videoscreenspace.asset       |  1 -
 data/assets/examples/video/videosphere.asset    |  1 -
 .../examples/video/videostretchedtotime.asset   |  1 -
 .../modules/exoplanets/default_settings.asset   |  1 -
 .../modules/exoplanets/exoplanets_data.asset    |  1 -
 .../exoplanets/exoplanets_textures.asset        |  1 -
 .../modules/skybrowser/default_settings.asset   |  1 -
 .../modules/skybrowser/hover_circle.asset       |  1 -
 .../assets/modules/touch/default_settings.asset |  1 -
 data/assets/nightsky/altaz.asset                |  1 -
 data/assets/nightsky/cardinal_directions.asset  |  1 -
 data/assets/nightsky/ecliptic_band.asset        |  1 -
 data/assets/nightsky/equatorial_band.asset      |  1 -
 data/assets/nightsky/galactic_band.asset        |  1 -
 data/assets/nightsky/light_pollution.asset      |  1 -
 data/assets/nightsky/meridian.asset             |  1 -
 data/assets/nightsky/nightsky.asset             |  1 -
 data/assets/nightsky/planets.asset              |  1 -
 data/assets/nightsky/zenith.asset               |  1 -
 data/assets/scene/digitaluniverse/2dF.asset     |  1 -
 data/assets/scene/digitaluniverse/2mass.asset   |  1 -
 data/assets/scene/digitaluniverse/6dF.asset     |  1 -
 data/assets/scene/digitaluniverse/abell.asset   |  1 -
 .../digitaluniverse/alternatestarlabels.asset   |  1 -
 .../digitaluniverse/backgroundradiation.asset   |  1 -
 .../backgroundradiation_multiverse.asset        |  1 -
 .../assets/scene/digitaluniverse/clusters.asset |  1 -
 .../digitaluniverse/constellationbounds.asset   |  1 -
 .../scene/digitaluniverse/constellations.asset  |  1 -
 data/assets/scene/digitaluniverse/deepsky.asset |  1 -
 .../scene/digitaluniverse/digitaluniverse.asset |  1 -
 data/assets/scene/digitaluniverse/dwarfs.asset  |  1 -
 .../scene/digitaluniverse/exoplanets.asset      |  1 -
 .../digitaluniverse/exoplanets_candidates.asset |  1 -
 .../digitaluniverse/globularclusters.asset      |  1 -
 data/assets/scene/digitaluniverse/grids.asset   |  1 -
 data/assets/scene/digitaluniverse/groups.asset  |  1 -
 .../scene/digitaluniverse/h2regions.asset       |  1 -
 data/assets/scene/digitaluniverse/hdf.asset     |  1 -
 .../scene/digitaluniverse/localdwarfs.asset     |  1 -
 .../assets/scene/digitaluniverse/milkyway.asset |  1 -
 .../digitaluniverse/milkyway_arm_labels.asset   |  1 -
 .../scene/digitaluniverse/milkyway_label.asset  |  1 -
 .../scene/digitaluniverse/milkyway_sphere.asset |  1 -
 .../scene/digitaluniverse/obassociations.asset  |  1 -
 .../scene/digitaluniverse/openclusters.asset    |  1 -
 .../digitaluniverse/planetarynebulae.asset      |  1 -
 data/assets/scene/digitaluniverse/pulsars.asset |  1 -
 data/assets/scene/digitaluniverse/quasars.asset |  1 -
 data/assets/scene/digitaluniverse/sdss.asset    |  1 -
 .../scene/digitaluniverse/starlabels.asset      |  1 -
 .../scene/digitaluniverse/starorbits.asset      |  1 -
 data/assets/scene/digitaluniverse/stars.asset   |  1 -
 .../scene/digitaluniverse/superclusters.asset   |  1 -
 .../digitaluniverse/supernovaremnants.asset     |  1 -
 data/assets/scene/digitaluniverse/tully.asset   |  1 -
 data/assets/scene/digitaluniverse/voids.asset   |  1 -
 .../milkyway/constellations/big_dipper.asset    |  1 -
 .../constellations/constellation_art.asset      |  1 -
 .../constellation_extrakeybinds.asset           |  1 -
 .../constellations/constellation_keybinds.asset |  1 -
 data/assets/scene/milkyway/gaia/apogee.asset    |  1 -
 .../milkyway/gaia/gaia_dr2_download_stars.asset |  1 -
 data/assets/scene/milkyway/gaia/gaiastars.asset |  1 -
 data/assets/scene/milkyway/gaia/galah.asset     |  1 -
 .../habitable_zone_textures.asset               |  1 -
 data/assets/scene/milkyway/milkyway/eso.asset   |  1 -
 .../assets/scene/milkyway/milkyway/volume.asset |  1 -
 .../milkyway/objects/orionnebula/cluster.asset  |  1 -
 .../milkyway/objects/orionnebula/nebula.asset   |  1 -
 .../objects/orionnebula/orionnebula.asset       |  1 -
 .../objects/orionnebula/transforms.asset        |  1 -
 data/assets/scene/milkyway/stars/denver.asset   |  1 -
 .../solarsystem/dwarf_planets/ceres/ceres.asset |  1 -
 .../dwarf_planets/ceres/default_layers.asset    |  1 -
 .../dwarf_planets/ceres/kernels.asset           |  1 -
 .../ceres/layers/colorlayers/lamo.asset         |  1 -
 .../ceres/layers/colorlayers/lamo_local.asset   |  1 -
 .../solarsystem/dwarf_planets/ceres/trail.asset |  1 -
 .../dwarf_planets/ceres/transforms.asset        |  1 -
 .../solarsystem/dwarf_planets/eris/eris.asset   |  1 -
 .../solarsystem/dwarf_planets/eris/label.asset  |  1 -
 .../solarsystem/dwarf_planets/eris/planet.asset |  1 -
 .../solarsystem/dwarf_planets/eris/trail.asset  |  1 -
 .../dwarf_planets/eris/transforms.asset         |  1 -
 .../dwarf_planets/gonggong/gonggong.asset       |  1 -
 .../dwarf_planets/gonggong/label.asset          |  1 -
 .../dwarf_planets/gonggong/planet.asset         |  1 -
 .../dwarf_planets/gonggong/trail.asset          |  1 -
 .../dwarf_planets/gonggong/transforms.asset     |  1 -
 .../dwarf_planets/haumea/haumea.asset           |  1 -
 .../dwarf_planets/haumea/label.asset            |  1 -
 .../dwarf_planets/haumea/planet.asset           |  1 -
 .../dwarf_planets/haumea/trail.asset            |  1 -
 .../dwarf_planets/haumea/transforms.asset       |  1 -
 .../dwarf_planets/makemake/label.asset          |  1 -
 .../dwarf_planets/makemake/makemake.asset       |  1 -
 .../dwarf_planets/makemake/planet.asset         |  1 -
 .../dwarf_planets/makemake/trail.asset          |  1 -
 .../dwarf_planets/makemake/transforms.asset     |  1 -
 .../solarsystem/dwarf_planets/orcus/label.asset |  1 -
 .../solarsystem/dwarf_planets/orcus/orcus.asset |  1 -
 .../dwarf_planets/orcus/planet.asset            |  1 -
 .../solarsystem/dwarf_planets/orcus/trail.asset |  1 -
 .../dwarf_planets/orcus/transforms.asset        |  1 -
 .../dwarf_planets/pluto/charon/charon.asset     |  1 -
 .../pluto/charon/charon_trail.asset             |  1 -
 .../pluto/charon/default_layers.asset           |  1 -
 .../layers/colorlayers/greyscale_usgs.asset     |  1 -
 .../dwarf_planets/pluto/default_layers.asset    |  1 -
 .../dwarf_planets/pluto/kernels.asset           |  1 -
 .../layers/colorlayers/greyscale_usgs.asset     |  1 -
 .../dwarf_planets/pluto/minor/hydra.asset       |  1 -
 .../dwarf_planets/pluto/minor/kerberos.asset    |  1 -
 .../dwarf_planets/pluto/minor/nix.asset         |  1 -
 .../dwarf_planets/pluto/minor/styx.asset        |  1 -
 .../solarsystem/dwarf_planets/pluto/pluto.asset |  1 -
 .../dwarf_planets/pluto/pluto_trail.asset       |  1 -
 .../pluto/pluto_trail_kepler.asset              |  1 -
 .../dwarf_planets/pluto/system.asset            |  1 -
 .../solarsystem/dwarf_planets/pluto/trail.asset |  1 -
 .../dwarf_planets/pluto/transforms.asset        |  1 -
 .../dwarf_planets/quaoar/label.asset            |  1 -
 .../dwarf_planets/quaoar/planet.asset           |  1 -
 .../dwarf_planets/quaoar/quaoar.asset           |  1 -
 .../dwarf_planets/quaoar/trail.asset            |  1 -
 .../dwarf_planets/quaoar/transforms.asset       |  1 -
 .../solarsystem/dwarf_planets/sedna/label.asset |  1 -
 .../dwarf_planets/sedna/planet.asset            |  1 -
 .../solarsystem/dwarf_planets/sedna/sedna.asset |  1 -
 .../solarsystem/dwarf_planets/sedna/trail.asset |  1 -
 .../dwarf_planets/sedna/transforms.asset        |  1 -
 .../solarsystem/dwarf_planets/vesta/label.asset |  1 -
 .../dwarf_planets/vesta/planet.asset            |  1 -
 .../solarsystem/dwarf_planets/vesta/trail.asset |  1 -
 .../dwarf_planets/vesta/transforms.asset        |  1 -
 .../solarsystem/dwarf_planets/vesta/vesta.asset |  1 -
 .../sun_earth_2012_fieldlines_batsrus.asset     |  1 -
 .../2012/sun_earth_2012_fieldlines_enlil.asset  |  1 -
 .../2012/sun_earth_2012_fieldlines_pfss.asset   |  1 -
 .../heliosphere/bastille_day/actions.asset      |  1 -
 .../carrington_to_heeq_rotation.asset           |  1 -
 .../bastille_day/density_volume.asset           |  1 -
 .../heliosphere/bastille_day/fieldlines.asset   |  1 -
 .../heliosphere/bastille_day/fluxnodes.asset    |  1 -
 .../bastille_day/fluxnodescutplane.asset        |  1 -
 .../bastille_day/fluxnodeslegend.asset          |  1 -
 .../bastille_day/lightindicator.asset           |  1 -
 .../heliosphere/bastille_day/magnetogram.asset  |  1 -
 .../bastille_day/magnetogram_textures.asset     |  1 -
 .../interstellar/c-2019_q4_borisov.asset        |  1 -
 .../solarsystem/interstellar/oumuamua.asset     |  1 -
 .../missions/apollo/11/actions.asset            |  1 -
 .../missions/apollo/17/actions.asset            |  1 -
 .../solarsystem/missions/apollo/8/actions.asset |  1 -
 .../solarsystem/missions/apollo/actions.asset   |  1 -
 .../solarsystem/missions/artemis/actions.asset  |  1 -
 .../solarsystem/missions/artemis/model.asset    |  1 -
 .../solarsystem/missions/artemis/trail.asset    |  1 -
 .../missions/artemis/transforms.asset           |  1 -
 .../missions/bepicolombo/bepicolombo.asset      |  1 -
 .../missions/bepicolombo/fov/bela.asset         |  1 -
 .../missions/bepicolombo/fov/hga.asset          |  1 -
 .../missions/bepicolombo/fov/mertis.asset       |  1 -
 .../missions/bepicolombo/fov/mgns.asset         |  1 -
 .../missions/bepicolombo/fov/mixs.asset         |  1 -
 .../missions/bepicolombo/fov/phebus.asset       |  1 -
 .../missions/bepicolombo/fov/serena.asset       |  1 -
 .../bepicolombo/fov/serena_anodes.asset         |  1 -
 .../missions/bepicolombo/fov/sibbiosys.asset    |  1 -
 .../missions/bepicolombo/fov/sixs.asset         |  1 -
 .../missions/bepicolombo/fov/startracker.asset  |  1 -
 .../missions/bepicolombo/kernels.asset          |  1 -
 .../missions/bepicolombo/mission.asset          |  1 -
 .../missions/bepicolombo/model.asset            |  1 -
 .../missions/bepicolombo/trails.asset           |  1 -
 .../scene/solarsystem/missions/dawn/dawn.asset  |  1 -
 .../scene/solarsystem/missions/dawn/vesta.asset |  1 -
 .../solarsystem/missions/insight/actions.asset  |  1 -
 .../solarsystem/missions/juice/fieldlines.asset |  1 -
 .../solarsystem/missions/juice/fov/gala.asset   |  1 -
 .../solarsystem/missions/juice/fov/janus.asset  |  1 -
 .../solarsystem/missions/juice/fov/jmc.asset    |  1 -
 .../solarsystem/missions/juice/fov/majis.asset  |  1 -
 .../solarsystem/missions/juice/fov/navcam.asset |  1 -
 .../solarsystem/missions/juice/fov/rime.asset   |  1 -
 .../missions/juice/fov/startracker.asset        |  1 -
 .../solarsystem/missions/juice/fov/swi.asset    |  1 -
 .../solarsystem/missions/juice/fov/uvs.asset    |  1 -
 .../solarsystem/missions/juice/kernels.asset    |  1 -
 .../solarsystem/missions/juice/model.asset      |  1 -
 .../solarsystem/missions/juice/plane.asset      |  1 -
 .../missions/juice/trails/earth.asset           |  1 -
 .../missions/juice/trails/ganymede.asset        |  1 -
 .../missions/juice/trails/jupiter.asset         |  1 -
 .../solarsystem/missions/juice/trails/ssb.asset |  1 -
 .../solarsystem/missions/juice/transforms.asset |  1 -
 .../missions/newhorizons/actions.asset          |  1 -
 .../missions/osirisrex/actions.asset            |  1 -
 .../missions/perseverance/actions.asset         |  1 -
 .../missions/pioneer/pioneer10.asset            |  1 -
 .../missions/pioneer/pioneer11.asset            |  1 -
 .../missions/pioneer/pioneermodel.asset         |  1 -
 .../solarsystem/missions/rosetta/actions.asset  |  1 -
 .../solarsystem/missions/voyager/actions.asset  |  1 -
 .../solarsystem/missions/voyager/voyager1.asset |  1 -
 .../solarsystem/missions/voyager/voyager2.asset |  1 -
 .../voyager1_2__pioneer10_11.asset              |  1 -
 .../scene/solarsystem/planets/base_layers.asset |  1 -
 .../solarsystem/planets/default_layers.asset    |  1 -
 .../solarsystem/planets/earth/atmosphere.asset  |  1 -
 .../planets/earth/default_layers.asset          |  1 -
 .../scene/solarsystem/planets/earth/earth.asset |  1 -
 .../planets/earth/eclipse_shadow.asset          |  1 -
 .../planets/earth/eclipses/5000_years.asset     |  1 -
 .../earth/eclipses/corona/corona20170821.asset  |  1 -
 .../grid/earth_ecliptic_radial_grid.asset       |  1 -
 .../earth/eclipses/grid/moon_radial_grid.asset  |  1 -
 .../eclipses/paths/annular/2003-05-31.asset     |  1 -
 .../eclipses/paths/annular/2005-10-03.asset     |  1 -
 .../eclipses/paths/annular/2006-09-22.asset     |  1 -
 .../eclipses/paths/annular/2008-02-07.asset     |  1 -
 .../eclipses/paths/annular/2009-01-26.asset     |  1 -
 .../eclipses/paths/annular/2010-01-15.asset     |  1 -
 .../eclipses/paths/annular/2012-05-20.asset     |  1 -
 .../eclipses/paths/annular/2013-05-10.asset     |  1 -
 .../eclipses/paths/annular/2014-04-29.asset     |  1 -
 .../eclipses/paths/annular/2016-09-01.asset     |  1 -
 .../eclipses/paths/annular/2017-02-26.asset     |  1 -
 .../eclipses/paths/annular/2019-12-26.asset     |  1 -
 .../eclipses/paths/annular/2020-06-21.asset     |  1 -
 .../eclipses/paths/annular/2021-06-10.asset     |  1 -
 .../eclipses/paths/annular/2023-10-14.asset     |  1 -
 .../eclipses/paths/annular/2024-10-02.asset     |  1 -
 .../eclipses/paths/annular/2026-02-17.asset     |  1 -
 .../eclipses/paths/annular/2027-02-06.asset     |  1 -
 .../eclipses/paths/annular/2028-01-26.asset     |  1 -
 .../eclipses/paths/annular/2030-06-01.asset     |  1 -
 .../eclipses/paths/hybrid/2005-04-08.asset      |  1 -
 .../eclipses/paths/hybrid/2013-11-03.asset      |  1 -
 .../eclipses/paths/hybrid/2023-04-20.asset      |  1 -
 .../eclipses/paths/hybrid/2031-11-14.asset      |  1 -
 .../earth/eclipses/paths/total/2003-11-23.asset |  1 -
 .../earth/eclipses/paths/total/2006-03-29.asset |  1 -
 .../earth/eclipses/paths/total/2008-08-01.asset |  1 -
 .../earth/eclipses/paths/total/2009-07-22.asset |  1 -
 .../earth/eclipses/paths/total/2010-07-11.asset |  1 -
 .../earth/eclipses/paths/total/2012-11-13.asset |  1 -
 .../earth/eclipses/paths/total/2015-03-20.asset |  1 -
 .../earth/eclipses/paths/total/2016-03-09.asset |  1 -
 .../earth/eclipses/paths/total/2017-08-21.asset |  1 -
 .../earth/eclipses/paths/total/2019-07-02.asset |  1 -
 .../earth/eclipses/paths/total/2020-12-14.asset |  1 -
 .../earth/eclipses/paths/total/2021-12-04.asset |  1 -
 .../earth/eclipses/paths/total/2024-04-08.asset |  1 -
 .../earth/eclipses/paths/total/2026-08-12.asset |  1 -
 .../earth/eclipses/paths/total/2027-08-02.asset |  1 -
 .../earth/eclipses/paths/total/2028-07-22.asset |  1 -
 .../earth/eclipses/paths/total/2030-11-25.asset |  1 -
 .../earth/eclipses/paths/total/2033-03-30.asset |  1 -
 .../earth/eclipses/paths/total/2034-03-20.asset |  1 -
 .../earth/eclipses/paths/total/2035-09-02.asset |  1 -
 .../earth/eclipses/paths/total/2037-07-13.asset |  1 -
 .../earth/eclipses/paths/total/2038-12-26.asset |  1 -
 .../earth/eclipses/paths/total/2039-12-15.asset |  1 -
 .../earth/eclipses/paths/total/2041-04-30.asset |  1 -
 .../earth/eclipses/paths/total/2042-04-20.asset |  1 -
 .../earth/eclipses/paths/total/2043-04-09.asset |  1 -
 .../planets/earth/eclipses/timeline.asset       |  1 -
 .../scene/solarsystem/planets/earth/grids.asset |  1 -
 .../planets/earth/lagrange_points/l1.asset      |  1 -
 .../planets/earth/lagrange_points/l2.asset      |  1 -
 .../planets/earth/lagrange_points/l4.asset      |  1 -
 .../planets/earth/lagrange_points/l5.asset      |  1 -
 .../earth/lagrange_points/lagrange_points.asset |  1 -
 .../planets/earth/layers/base_layers.asset      |  1 -
 ...gcom_w1_sea_ice_concentration_temporal.asset |  1 -
 .../colorlayers/aqua_modis_temporal.asset       |  1 -
 .../earth/layers/colorlayers/blue_marble.asset  |  1 -
 .../earth/layers/colorlayers/bmng_newyork.asset |  1 -
 .../earth/layers/colorlayers/bmng_sweden.asset  |  1 -
 .../earth/layers/colorlayers/bmng_utah.asset    |  1 -
 .../layers/colorlayers/esri_noaa20_combo.asset  |  1 -
 .../layers/colorlayers/esri_noaa21_combo.asset  |  1 -
 .../layers/colorlayers/esri_viirs_combo.asset   |  1 -
 .../layers/colorlayers/esri_world_imagery.asset |  1 -
 ...4_mur_sea_surface_temperature_temporal.asset |  1 -
 .../modis_terra_chlorophyll_a_temporal.asset    |  1 -
 .../colorlayers/terra_modis_temporal.asset      |  1 -
 .../colorlayers/viirs_noaa20_temporal.asset     |  1 -
 .../colorlayers/viirs_snpp_temporal.asset       |  1 -
 .../heightlayers/blue_marble_height.asset       |  1 -
 .../layers/heightlayers/terrain_tileset.asset   |  1 -
 .../planets/earth/layers/newyork_layers.asset   |  1 -
 .../nightlayers/earth_at_night_2012.asset       |  1 -
 .../nightlayers/earth_at_night_temporal.asset   |  1 -
 .../earth_at_night_temporal_blue_yellow.asset   |  1 -
 .../nightlayers/earth_night_texture.asset       |  1 -
 .../earth/layers/overlays/coastlines.asset      |  1 -
 .../layers/overlays/reference_features.asset    |  1 -
 .../layers/overlays/reference_labels.asset      |  1 -
 .../earth/layers/overlays/size_reference.asset  |  1 -
 .../earth/layers/overlays/tile_indices.asset    |  1 -
 .../planets/earth/layers/sweden_layers.asset    |  1 -
 .../planets/earth/layers/utah_layers.asset      |  1 -
 .../earth/layers/watermasks/gebco_newyork.asset |  1 -
 .../earth/layers/watermasks/gebco_sweden.asset  |  1 -
 .../earth/layers/watermasks/gebco_utah.asset    |  1 -
 .../layers/watermasks/modis_water_mask.asset    |  1 -
 .../earth/magnetosphere/magnetosphere.asset     |  1 -
 .../transforms_magnetosphere.asset              |  1 -
 .../solarsystem/planets/earth/markers.asset     |  1 -
 .../planets/earth/moon/default_layers.asset     |  1 -
 .../colorlayers/apollo_15_metric_newyork.asset  |  1 -
 .../layers/colorlayers/clemuvvis_newyork.asset  |  1 -
 .../layers/colorlayers/clemuvvis_sweden.asset   |  1 -
 .../layers/colorlayers/clemuvvis_utah.asset     |  1 -
 .../layers/colorlayers/kaguya_newyork.asset     |  1 -
 .../moon/layers/colorlayers/kaguya_sweden.asset |  1 -
 .../moon/layers/colorlayers/kaguya_utah.asset   |  1 -
 .../colorlayers/lo_mr_mosaic_newyork.asset      |  1 -
 .../colorlayers/lo_mr_mosaic_sweden.asset       |  1 -
 .../colorlayers/lola_clr_shade_newyork.asset    |  1 -
 .../colorlayers/lola_clr_shade_sweden.asset     |  1 -
 .../colorlayers/lola_clr_shade_utah.asset       |  1 -
 .../layers/colorlayers/lola_shade_newyork.asset |  1 -
 .../layers/colorlayers/lola_shade_sweden.asset  |  1 -
 .../layers/colorlayers/lola_shade_utah.asset    |  1 -
 .../moon/layers/colorlayers/moon_texture.asset  |  1 -
 .../colorlayers/uvvishybrid_newyork.asset       |  1 -
 .../layers/colorlayers/uvvishybrid_sweden.asset |  1 -
 .../layers/colorlayers/uvvishybrid_utah.asset   |  1 -
 .../moon/layers/colorlayers/wac_newyork.asset   |  1 -
 .../moon/layers/colorlayers/wac_sweden.asset    |  1 -
 .../moon/layers/colorlayers/wac_utah.asset      |  1 -
 .../layers/colorlayers/wac_v1_newyork.asset     |  1 -
 .../moon/layers/colorlayers/wac_v1_sweden.asset |  1 -
 .../moon/layers/colorlayers/wac_v1_utah.asset   |  1 -
 .../layers/heightlayers/loladem_newyork.asset   |  1 -
 .../layers/heightlayers/loladem_sweden.asset    |  1 -
 .../moon/layers/heightlayers/loladem_utah.asset |  1 -
 .../earth/moon/layers/newyork_layers.asset      |  1 -
 .../moon/layers/overlays/size_reference.asset   |  1 -
 .../moon/layers/overlays/tile_indices.asset     |  1 -
 .../earth/moon/layers/sweden_layers.asset       |  1 -
 .../planets/earth/moon/layers/utah_layers.asset |  1 -
 .../planets/earth/moon/markers.asset            |  1 -
 .../solarsystem/planets/earth/moon/moon.asset   |  1 -
 .../nasa-treks/Apollo_15_Metric_Cam_DEM.asset   |  3 +--
 .../moon/nasa-treks/Apollo_15_Pan_Cam_DEM.asset |  3 +--
 .../Apollo_15_Pan_Cam_Image_Mosaic.asset        |  3 +--
 .../nasa-treks/Apollo_16_Metric_Cam_DEM.asset   |  3 +--
 .../nasa-treks/Apollo_17_Metric_Cam_DEM.asset   |  1 -
 .../nasa-treks/Apollo_Zone_Metric_Cam.asset     |  3 +--
 .../nasa-treks/Apollo_Zone_Metric_Cam_DEM.asset |  3 +--
 .../planets/earth/moon/nasa-treks/Global.asset  |  3 +--
 .../Kaguya_LGM2011_Freeair_Gravity.asset        |  3 +--
 .../Kaguya_LGM2011_Surface_Gravity.asset        |  3 +--
 .../moon/nasa-treks/LOLA_Roughness_16ppd.asset  |  3 +--
 .../moon/nasa-treks/LOLA_Slope_16ppd.asset      |  3 +--
 .../nasa-treks/LOLA_Slope_Northpole_120m.asset  |  3 +--
 .../nasa-treks/LOLA_Slope_Southpole_120m.asset  |  3 +--
 .../LOLA_and_TC_Stereo_DEM_Merge_512ppd.asset   |  3 +--
 ...ic_of_Region_Inside_Schrodinger_Crater.asset |  3 +--
 ...ontrolled_Mosaic_of_Schrodinger_Crater.asset |  3 +--
 .../moon/nasa-treks/LRO_Diviner_CF_Mosaic.asset |  3 +--
 .../LRO_Diviner_CF_Mosaic_128ppd.asset          |  3 +--
 .../LRO_Diviner_Surface_Temp_Avg.asset          |  3 +--
 .../LRO_Diviner_Surface_Temp_Normal_Avg.asset   |  3 +--
 ...iner_Surface_Temperature_Mosaic_128ppd.asset |  3 +--
 .../earth/moon/nasa-treks/LRO_LOLA_DEM.asset    |  3 +--
 .../nasa-treks/LRO_LROC_Crater_Abundance.asset  |  3 +--
 .../LRO_LROC_Crater_Abundance_Hazard.asset      |  3 +--
 .../nasa-treks/LRO_LROC_Crater_Density.asset    |  3 +--
 .../LRO_LROC_Crater_Density_Hazard.asset        |  3 +--
 .../earth/moon/nasa-treks/LRO_LROC_DEM.asset    |  3 +--
 .../moon/nasa-treks/LRO_LROC_Image_Mosaic.asset |  3 +--
 .../nasa-treks/LRO_LROC_Image_Mosaic_26cm.asset |  3 +--
 .../nasa-treks/LRO_LROC_Image_Mosaic_28cm.asset |  3 +--
 .../earth/moon/nasa-treks/LRO_LROC_Mosaic.asset |  3 +--
 .../nasa-treks/LRO_LROC_NAC_Image_Mosaic.asset  |  3 +--
 .../nasa-treks/LRO_LROC_Rock_Abundance.asset    |  3 +--
 .../LRO_LROC_Rock_Abundance_Hazard.asset        |  3 +--
 .../moon/nasa-treks/LRO_LROC_Rock_Density.asset |  3 +--
 .../LRO_LROC_Rock_Density_Hazard.asset          |  3 +--
 .../moon/nasa-treks/LRO_Laser_Altimeter.asset   |  3 +--
 ...RO_Mini-RF_Circular_Polarization_Ratio.asset |  3 +--
 .../nasa-treks/LRO_NAC_ColorHillshade.asset     |  3 +--
 .../earth/moon/nasa-treks/LRO_NAC_Mosaic.asset  |  3 +--
 .../moon/nasa-treks/LRO_NAC_Mosaic_0.5mpp.asset |  3 +--
 .../moon/nasa-treks/LRO_NAC_Mosaic_1mpp.asset   |  3 +--
 .../nasa-treks/LRO_NAC_PSR_Mosaic_20mpp.asset   |  3 +--
 .../LRO_NAC_and_CE-2_CCD_Mosaic_1mpp.asset      |  3 +--
 .../nasa-treks/LRO_Narrow_Angle_Camera.asset    |  1 -
 .../moon/nasa-treks/LRO_WAC-GLD100_DEM.asset    |  3 +--
 .../moon/nasa-treks/LRO_WAC_GLD100_DEM.asset    |  3 +--
 ...nd_Kaguya_Multi_Instruments_1895.21mpp.asset |  3 +--
 .../solarsystem/planets/earth/moon/trail.asset  |  1 -
 .../atmosphere/2000_carbon_monoxide.asset       |  1 -
 .../noaa-sos/atmosphere/2004_ir_hurricane.asset |  1 -
 .../atmosphere/2005_hurricane-grayir.asset      |  1 -
 .../atmosphere/2005_hurricane-wvsst.asset       |  1 -
 .../noaa-sos/atmosphere/2012_hurricane.asset    |  1 -
 .../atmosphere/aerosol_blackcarbon.asset        |  1 -
 .../aerosol_blackcarbon_and_sulfate.asset       |  1 -
 .../noaa-sos/atmosphere/aerosol_sulfate.asset   |  1 -
 .../earth/noaa-sos/atmosphere/airtraffic.asset  |  1 -
 .../earth/noaa-sos/atmosphere/all_sats.asset    |  1 -
 .../earth/noaa-sos/atmosphere/aqua_swath.asset  |  1 -
 .../earth/noaa-sos/atmosphere/carbonflux.asset  |  1 -
 .../carbontracker_2000_2100-fixed_scale.asset   |  1 -
 .../carbontracker_2000_2100-sliding_scale.asset |  1 -
 .../noaa-sos/atmosphere/climate_niche.asset     |  1 -
 .../earth/noaa-sos/atmosphere/co_gmd.asset      |  1 -
 .../earth/noaa-sos/atmosphere/fim_chem.asset    |  1 -
 .../earth/noaa-sos/atmosphere/fossil_fuel.asset |  1 -
 .../earth/noaa-sos/atmosphere/fukushima.asset   |  1 -
 .../earth/noaa-sos/atmosphere/geo_sat.asset     |  1 -
 .../earth/noaa-sos/atmosphere/geo_scan.asset    |  1 -
 .../noaa-sos/atmosphere/giss_temp_anom.asset    |  1 -
 .../noaa-sos/atmosphere/globe-insolation.asset  |  1 -
 .../noaa-sos/atmosphere/globe-rainfall.asset    |  1 -
 .../atmosphere/harvey-clouds_precip.asset       |  1 -
 .../atmosphere/hurricane_season_2017.asset      |  1 -
 .../hurricane_season_2017_wvsst.asset           |  1 -
 .../hurricane_tracks-cumulative.asset           |  1 -
 .../earth/noaa-sos/atmosphere/isaac.asset       |  1 -
 .../earth/noaa-sos/atmosphere/iss_track.asset   |  1 -
 .../earth/noaa-sos/atmosphere/land_temp.asset   |  1 -
 .../earth/noaa-sos/atmosphere/lightning.asset   |  1 -
 .../earth/noaa-sos/atmosphere/ltg_vaisala.asset |  1 -
 .../earth/noaa-sos/atmosphere/nasa_sats.asset   |  1 -
 .../atmosphere/nccs_models-carbon.asset         |  1 -
 .../noaa-sos/atmosphere/nccs_models-chem.asset  |  1 -
 .../noaa-sos/atmosphere/nccs_models-winds.asset |  1 -
 .../earth/noaa-sos/atmosphere/no2_omsi.asset    |  1 -
 .../noaa-sos/atmosphere/noaa_sat-tracks.asset   |  1 -
 .../earth/noaa-sos/atmosphere/pclim.asset       |  1 -
 .../earth/noaa-sos/atmosphere/poes_sat.asset    |  1 -
 .../atmosphere/reanalysis-antarctic.asset       |  1 -
 .../noaa-sos/atmosphere/reanalysis-elnino.asset |  1 -
 .../atmosphere/reanalysis-hurricane.asset       |  1 -
 .../earth/noaa-sos/atmosphere/sandy.asset       |  1 -
 .../earth/noaa-sos/atmosphere/sunsync_sat.asset |  1 -
 .../earth/noaa-sos/atmosphere/temp_anom.asset   |  1 -
 .../noaa-sos/atmosphere/tropical_widening.asset |  1 -
 .../atmosphere/typhoon_haiyan-wvsst.asset       |  1 -
 .../noaa-sos/atmosphere/typhoon_haiyan.asset    |  1 -
 .../earth/noaa-sos/atmosphere/volcano_ash.asset |  1 -
 .../noaa-sos/land/agriculture-cropland.asset    |  1 -
 .../noaa-sos/land/agriculture-pastureland.asset |  1 -
 .../planets/earth/noaa-sos/land/birds.asset     |  1 -
 .../noaa-sos/land/blue_marble-blue_marble.asset |  1 -
 .../land/blue_marble-blue_marble_topo.asset     |  1 -
 .../blue_marble-blue_marble_topo_bathy.asset    |  1 -
 .../noaa-sos/land/blue_marble-nightlights.asset |  1 -
 .../land/blue_marble-seasonal_blue_marble.asset |  1 -
 .../earth/noaa-sos/land/dams-global.asset       |  1 -
 .../earth/noaa-sos/land/dams-mississippi.asset  |  1 -
 .../earth/noaa-sos/land/dams-yangtze.asset      |  1 -
 .../noaa-sos/land/day_night-06z_only.asset      |  1 -
 .../noaa-sos/land/day_night-full_year.asset     |  1 -
 .../earth/noaa-sos/land/day_night-oneday.asset  |  1 -
 .../noaa-sos/land/earth_night-1992_2002.asset   |  1 -
 .../noaa-sos/land/earth_night-1992_2008.asset   |  1 -
 .../noaa-sos/land/earth_night-1992_2009.asset   |  1 -
 .../earth/noaa-sos/land/earth_night-2012.asset  |  1 -
 .../land/earth_night-color_nightlights.asset    |  1 -
 .../noaa-sos/land/earth_night-nightlights.asset |  1 -
 .../land/earthquake-1980_1995_quakes.asset      |  1 -
 .../noaa-sos/land/earthquake-2001_2015.asset    |  1 -
 .../noaa-sos/land/earthquakes_1901_2000.asset   |  1 -
 .../land/earthquakes_and_eruptions.asset        |  1 -
 .../land/earths_magnetism_magnetic_lines.asset  |  1 -
 .../land/earths_magnetism_magnets.asset         |  1 -
 .../planets/earth/noaa-sos/land/etopo1.asset    |  1 -
 .../noaa-sos/land/etopo2-earth_bright.asset     |  1 -
 .../noaa-sos/land/etopo2-earth_color.asset      |  1 -
 .../noaa-sos/land/etopo2-earth_shaded.asset     |  1 -
 .../earth/noaa-sos/land/etopo2-earth_topo.asset |  1 -
 .../earth/noaa-sos/land/etopo2-landsat.asset    |  1 -
 .../planets/earth/noaa-sos/land/fire.asset      |  1 -
 .../planets/earth/noaa-sos/land/fire_veg.asset  |  1 -
 .../noaa-sos/land/flooding-displaced_250.asset  |  1 -
 .../earth/noaa-sos/land/flooding-fatal.asset    |  1 -
 .../noaa-sos/land/flooding-heavy_rain.asset     |  1 -
 .../noaa-sos/land/flooding-major_floods.asset   |  1 -
 .../earth/noaa-sos/land/food_v_feed.asset       |  1 -
 .../planets/earth/noaa-sos/land/forests.asset   |  1 -
 .../earth/noaa-sos/land/geomag_tracklines.asset |  1 -
 .../earth/noaa-sos/land/global_vegetation.asset |  1 -
 .../earth/noaa-sos/land/gray_earth.asset        |  1 -
 .../planets/earth/noaa-sos/land/hot_topo.asset  |  1 -
 .../earth/noaa-sos/land/irsat_nightlights.asset |  1 -
 .../earth/noaa-sos/land/japan_quake.asset       |  1 -
 .../land/koppen_climate-koppen_1901_2100.asset  |  1 -
 .../land/koppen_climate-koppen_2007.asset       |  1 -
 .../noaa-sos/land/land_cover-animation.asset    |  1 -
 .../earth/noaa-sos/land/land_cover-ribbon.asset |  1 -
 .../noaa-sos/land/land_cover-slideshow.asset    |  1 -
 .../land/land_production-cropland_current.asset |  1 -
 .../land_production-cropland_potential.asset    |  1 -
 .../land/land_production-production_gap.asset   |  1 -
 .../earth/noaa-sos/land/land_ratio.asset        |  1 -
 .../noaa-sos/land/latitude_longitude.asset      |  1 -
 .../noaa-sos/land/magnetic_declination.asset    |  1 -
 .../planets/earth/noaa-sos/land/nightsky.asset  |  1 -
 .../noaa-sos/land/nuclear_earthquake.asset      |  1 -
 .../planets/earth/noaa-sos/land/paleo_map.asset |  1 -
 .../earth/noaa-sos/land/paleo_overlays.asset    |  1 -
 .../noaa-sos/land/pantropical_biomass.asset     |  1 -
 .../earth/noaa-sos/land/plate_movement.asset    |  1 -
 .../noaa-sos/land/river_discharge_2010.asset    |  1 -
 .../land/sea_floor_age-iso_lines_yellow.asset   |  1 -
 .../land/sea_floor_age-shaded_veg.asset         |  1 -
 .../noaa-sos/land/sea_floor_age-topo.asset      |  1 -
 .../land/seismic_waves-1994northridge.asset     |  1 -
 .../land/species_richness-amphibians.asset      |  1 -
 ...species_richness-amphibians_threatened.asset |  1 -
 .../noaa-sos/land/species_richness-birds.asset  |  1 -
 .../species_richness-birds_threatened.asset     |  1 -
 .../land/species_richness-mammals.asset         |  1 -
 .../species_richness-mammals_threatened.asset   |  1 -
 .../noaa-sos/land/surface_temperature.asset     |  1 -
 .../earth/noaa-sos/land/top_quakes.asset        |  1 -
 .../noaa-sos/land/volcanoes-eruptions.asset     |  1 -
 .../land/volcanoes-global_volcanoes.asset       |  1 -
 .../earth/noaa-sos/land/volcanoes-tsunami.asset |  1 -
 .../planets/earth/noaa-sos/models/bm10000.asset |  1 -
 .../earth/noaa-sos/models/gfdl_seaice.asset     |  1 -
 .../noaa-sos/models/ipcc_temp-ccsm-a1b.asset    |  1 -
 .../noaa-sos/models/ipcc_temp-ccsm-b1.asset     |  1 -
 .../noaa-sos/models/ipcc_temp-compare.asset     |  1 -
 .../noaa-sos/models/ipcc_temp-gfdl-a1b.asset    |  1 -
 .../noaa-sos/models/ipcc_temp-gfdl-b1.asset     |  1 -
 .../noaa-sos/models/ipcc_temp-had-a1b.asset     |  1 -
 .../noaa-sos/models/ipcc_temp-had-b1.asset      |  1 -
 .../earth/noaa-sos/models/rcp-ga26.asset        |  1 -
 .../earth/noaa-sos/models/rcp-ga45.asset        |  1 -
 .../earth/noaa-sos/models/rcp-ga60.asset        |  1 -
 .../earth/noaa-sos/models/rcp-ga85.asset        |  1 -
 .../earth/noaa-sos/models/ukmet-a1b.asset       |  1 -
 .../earth/noaa-sos/models/ukmet-e1.asset        |  1 -
 .../noaa-sos/oceans/2009_ice_animation.asset    |  1 -
 .../oceans/6m_sea_level_rise-black.asset        |  1 -
 .../noaa-sos/oceans/6m_sea_level_rise-red.asset |  1 -
 .../earth/noaa-sos/oceans/animal_tracking.asset |  1 -
 .../noaa-sos/oceans/argo_buoy_tracks.asset      |  1 -
 .../noaa-sos/oceans/argo_buoy_waterfall.asset   |  1 -
 .../earth/noaa-sos/oceans/atl_turtle.asset      |  1 -
 .../earth/noaa-sos/oceans/buoy_locations.asset  |  1 -
 .../earth/noaa-sos/oceans/catch_model.asset     |  1 -
 .../noaa-sos/oceans/chlorophyll_model.asset     |  1 -
 .../earth/noaa-sos/oceans/currents.asset        |  1 -
 .../earth/noaa-sos/oceans/dart_buoy.asset       |  1 -
 .../noaa-sos/oceans/ecco2_sst-gray_land.asset   |  1 -
 .../noaa-sos/oceans/ecco2_sst-veg_land.asset    |  1 -
 .../planets/earth/noaa-sos/oceans/elnino.asset  |  1 -
 .../oceans/gfdl_sst-black_background.asset      |  1 -
 .../oceans/gfdl_sst-land_background.asset       |  1 -
 .../earth/noaa-sos/oceans/greenland_melt.asset  |  1 -
 .../earth/noaa-sos/oceans/japan_tsunami.asset   |  1 -
 .../noaa-sos/oceans/japan_tsunami_waves.asset   |  1 -
 .../oceans/loggerheadseaturtletracks.asset      |  1 -
 .../earth/noaa-sos/oceans/marine_impacts.asset  |  1 -
 .../noaa-sos/oceans/marine_life_tracking.asset  |  1 -
 .../noaa-sos/oceans/mexico_turtles_947293.asset |  1 -
 .../noaa-sos/oceans/mexico_turtles_958002.asset |  1 -
 .../earth/noaa-sos/oceans/modis_sst.asset       |  1 -
 .../earth/noaa-sos/oceans/nasa_speed.asset      |  1 -
 .../earth/noaa-sos/oceans/nasa_sst.asset        |  1 -
 .../noaa-sos/oceans/ocean_acid-co2_flux.asset   |  1 -
 .../earth/noaa-sos/oceans/ocean_acid-ph.asset   |  1 -
 .../noaa-sos/oceans/ocean_acid-saturation.asset |  1 -
 .../noaa-sos/oceans/ocean_depths_temp.asset     |  1 -
 .../noaa-sos/oceans/ocean_drain-gray.asset      |  1 -
 .../earth/noaa-sos/oceans/pac_turtle.asset      |  1 -
 .../earth/noaa-sos/oceans/phytoplankton.asset   |  1 -
 .../earth/noaa-sos/oceans/pr_tsunami.asset      |  1 -
 .../earth/noaa-sos/oceans/reefs_risk.asset      |  1 -
 .../earth/noaa-sos/oceans/sea_level.asset       |  1 -
 .../noaa-sos/oceans/sea_level_trends.asset      |  1 -
 .../oceans/sea_surface_height_anomaly.asset     |  1 -
 .../earth/noaa-sos/oceans/seaice_monthly.asset  |  1 -
 .../noaa-sos/oceans/seaice_radiation.asset      |  1 -
 .../oceans/seawifs-land_background.asset        |  1 -
 .../noaa-sos/oceans/seawifs-no_holes.asset      |  1 -
 .../noaa-sos/oceans/seawifs-polar_holes.asset   |  1 -
 .../planets/earth/noaa-sos/oceans/shark.asset   |  1 -
 .../noaa-sos/oceans/ship_tracks-mosaic.asset    |  1 -
 .../noaa-sos/oceans/ship_tracks-tracks.asset    |  1 -
 .../earth/noaa-sos/oceans/shipping.asset        |  1 -
 .../noaa-sos/oceans/species_richness.asset      |  1 -
 .../planets/earth/noaa-sos/oceans/sss.asset     |  1 -
 .../earth/noaa-sos/oceans/sst_1980_1999.asset   |  1 -
 .../tsunami_historical_series-alaska.asset      |  1 -
 .../tsunami_historical_series-aleutians.asset   |  1 -
 ...unami_historical_series-aleutians_1957.asset |  1 -
 .../tsunami_historical_series-cascadia.asset    |  1 -
 .../tsunami_historical_series-chile.asset       |  1 -
 .../tsunami_historical_series-japan.asset       |  1 -
 .../tsunami_historical_series-lisbon.asset      |  1 -
 .../tsunami_historical_series-samoa.asset       |  1 -
 .../tsunami_historical_series-sumatra.asset     |  1 -
 .../noaa-sos/oceans/tsunami_locations.asset     |  1 -
 .../earth/noaa-sos/oceans/vector_winds.asset    |  1 -
 .../oceans/vent_discoveries_animation.asset     |  1 -
 .../earth/noaa-sos/oceans/vent_locations.asset  |  1 -
 .../earth/noaa-sos/oceans/vorticity.asset       |  1 -
 .../oceans/waves-wave_height_2012.asset         |  1 -
 .../oceans/waves-wave_height_katrina.asset      |  1 -
 .../oceans/waves-wave_height_sandy.asset        |  1 -
 .../noaa-sos/oceans/waves-wave_power_2012.asset |  1 -
 .../oceans/weeklyseaice-10day_seaice.asset      |  1 -
 .../oceans/weeklyseaice-sept_seaice.asset       |  1 -
 .../earth/noaa-sos/overlays/cables.asset        |  1 -
 .../earth/noaa-sos/overlays/capitals.asset      |  1 -
 .../earth/noaa-sos/overlays/city_names.asset    |  1 -
 .../overlays/continent_borders-black.asset      |  1 -
 .../overlays/continent_borders-white.asset      |  1 -
 .../noaa-sos/overlays/continent_names.asset     |  1 -
 .../overlays/country_borders-black.asset        |  1 -
 .../overlays/country_borders-white.asset        |  1 -
 .../noaa-sos/overlays/country_pop_names.asset   |  1 -
 .../earth/noaa-sos/overlays/currents.asset      |  1 -
 .../noaa-sos/overlays/general_circulation.asset |  1 -
 .../noaa-sos/overlays/land_mask-black.asset     |  1 -
 .../earth/noaa-sos/overlays/land_mask-veg.asset |  1 -
 .../noaa-sos/overlays/latlon_grid-black.asset   |  1 -
 .../noaa-sos/overlays/latlon_grid-white.asset   |  1 -
 .../earth/noaa-sos/overlays/ocean_names.asset   |  1 -
 .../overlays/plate_boundary-color.asset         |  1 -
 .../overlays/plate_boundary-white.asset         |  1 -
 .../earth/noaa-sos/overlays/plate_names.asset   |  1 -
 .../earth/noaa-sos/overlays/railroad.asset      |  1 -
 .../earth/noaa-sos/overlays/rivers.asset        |  1 -
 .../earth/noaa-sos/overlays/roads-black.asset   |  1 -
 .../earth/noaa-sos/overlays/roads-white.asset   |  1 -
 .../noaa-sos/overlays/state_borders-black.asset |  1 -
 .../noaa-sos/overlays/state_borders-white.asset |  1 -
 .../earth/noaa-sos/overlays/timezones.asset     |  1 -
 .../satellites/communications/amateur.asset     |  1 -
 .../communications/experimental.asset           |  1 -
 .../communications/geostationary.asset          |  1 -
 .../satellites/communications/globalstar.asset  |  1 -
 .../satellites/communications/gorizont.asset    |  1 -
 .../satellites/communications/intelsat.asset    |  1 -
 .../satellites/communications/iridium.asset     |  1 -
 .../communications/iridium_next.asset           |  1 -
 .../satellites/communications/molniya.asset     |  1 -
 .../satellites/communications/orbcomm.asset     |  1 -
 .../satellites/communications/other_comm.asset  |  1 -
 .../satellites/communications/raduga.asset      |  1 -
 .../earth/satellites/communications/ses.asset   |  1 -
 .../satellites/communications/starlink.asset    |  1 -
 .../earth/satellites/debris/debris_asat.asset   |  1 -
 .../satellites/debris/debris_breezem.asset      |  1 -
 .../satellites/debris/debris_fengyun.asset      |  1 -
 .../satellites/debris/debris_iridium33.asset    |  1 -
 .../satellites/debris/debris_kosmos2251.asset   |  1 -
 .../debris/volume/cartesian_volume.asset        |  1 -
 .../debris/volume/spherical_volume.asset        |  1 -
 .../planets/earth/satellites/misc/active.asset  |  1 -
 .../earth/satellites/misc/brightest.asset       |  1 -
 .../earth/satellites/misc/cubesats.asset        |  1 -
 .../earth/satellites/misc/hubble_trail.asset    |  1 -
 .../planets/earth/satellites/misc/iss.asset     |  1 -
 .../earth/satellites/misc/military.asset        |  1 -
 .../planets/earth/satellites/misc/other.asset   |  1 -
 .../planets/earth/satellites/misc/radar.asset   |  1 -
 .../earth/satellites/misc/spacestations.asset   |  1 -
 .../earth/satellites/misc/tiangong.asset        |  1 -
 .../planets/earth/satellites/misc/tle-new.asset |  1 -
 .../earth/satellites/navigation/beidou.asset    |  1 -
 .../earth/satellites/navigation/galileo.asset   |  1 -
 .../earth/satellites/navigation/glosnass.asset  |  1 -
 .../earth/satellites/navigation/gps.asset       |  1 -
 .../earth/satellites/navigation/musson.asset    |  1 -
 .../earth/satellites/navigation/nnss.asset      |  1 -
 .../earth/satellites/navigation/sbas.asset      |  1 -
 .../planets/earth/satellites/satellites.asset   |  1 -
 .../earth/satellites/satellites_all.asset       |  1 -
 .../satellites/satellites_communications.asset  |  1 -
 .../earth/satellites/satellites_debris.asset    |  1 -
 .../satellites/satellites_interesting.asset     |  1 -
 .../earth/satellites/satellites_misc.asset      |  1 -
 .../satellites/satellites_navigation.asset      |  1 -
 .../earth/satellites/satellites_science.asset   |  1 -
 .../earth/satellites/satellites_weather.asset   |  1 -
 .../earth/satellites/science/education.asset    |  1 -
 .../earth/satellites/science/engineering.asset  |  1 -
 .../earth/satellites/science/geodetic.asset     |  1 -
 .../earth/satellites/science/spaceearth.asset   |  1 -
 .../planets/earth/satellites/weather/aqua.asset |  1 -
 .../earth/satellites/weather/argos.asset        |  1 -
 .../planets/earth/satellites/weather/dmc.asset  |  1 -
 .../satellites/weather/earth_resources.asset    |  1 -
 .../planets/earth/satellites/weather/goes.asset |  1 -
 .../planets/earth/satellites/weather/noaa.asset |  1 -
 .../earth/satellites/weather/planet.asset       |  1 -
 .../earth/satellites/weather/sarsat.asset       |  1 -
 .../planets/earth/satellites/weather/snpp.asset |  1 -
 .../earth/satellites/weather/spire.asset        |  1 -
 .../earth/satellites/weather/tdrss.asset        |  1 -
 .../earth/satellites/weather/terra.asset        |  1 -
 .../earth/satellites/weather/weather.asset      |  1 -
 .../scene/solarsystem/planets/earth/trail.asset |  1 -
 .../planets/earth/trail_barycenter.asset        |  1 -
 .../solarsystem/planets/earth/transforms.asset  |  1 -
 .../planets/jupiter/callisto/callisto.asset     |  1 -
 .../jupiter/callisto/default_layers.asset       |  1 -
 .../layers/colorlayers/callisto_texture.asset   |  1 -
 .../planets/jupiter/callisto/trail.asset        |  1 -
 .../planets/jupiter/default_layers.asset        |  1 -
 .../planets/jupiter/europa/default_layers.asset |  1 -
 .../planets/jupiter/europa/europa.asset         |  1 -
 .../jupiter/europa/layers/base_layers.asset     |  1 -
 .../layers/colorlayers/europa_texture.asset     |  1 -
 .../voyager_global_mosaic_local.asset           |  1 -
 .../voyager_global_mosaic_newyork.asset         |  1 -
 .../voyager_global_mosaic_sweden.asset          |  1 -
 .../jupiter/europa/layers/local_layers.asset    |  1 -
 .../jupiter/europa/layers/newyork_layers.asset  |  1 -
 .../jupiter/europa/layers/sweden_layers.asset   |  1 -
 .../planets/jupiter/europa/trail.asset          |  1 -
 .../jupiter/ganymede/default_layers.asset       |  1 -
 .../planets/jupiter/ganymede/ganymede.asset     |  1 -
 .../layers/colorlayers/ganymede_texture.asset   |  1 -
 .../planets/jupiter/ganymede/trail.asset        |  1 -
 .../planets/jupiter/io/default_layers.asset     |  1 -
 .../solarsystem/planets/jupiter/io/io.asset     |  1 -
 .../io/layers/colorlayers/io_texture.asset      |  1 -
 .../solarsystem/planets/jupiter/io/trail.asset  |  1 -
 .../solarsystem/planets/jupiter/jupiter.asset   |  1 -
 .../solarsystem/planets/jupiter/kernels.asset   |  1 -
 .../planets/jupiter/kernels344.asset            |  1 -
 .../planets/jupiter/kernels346.asset            |  1 -
 .../layers/colorlayers/jupiter_texture.asset    |  1 -
 .../layers/colorlayers/jupiter_video.asset      |  1 -
 .../planets/jupiter/major_moons.asset           |  1 -
 .../planets/jupiter/minor/ananke_group.asset    |  1 -
 .../planets/jupiter/minor/carme_group.asset     |  1 -
 .../planets/jupiter/minor/carpo_group.asset     |  1 -
 .../planets/jupiter/minor/himalia_group.asset   |  1 -
 .../planets/jupiter/minor/inner_group.asset     |  1 -
 .../planets/jupiter/minor/other_groups.asset    |  1 -
 .../planets/jupiter/minor/pasiphae_group.asset  | 17 ++++++++---------
 .../planets/jupiter/minor/themisto_group.asset  |  1 -
 .../planets/jupiter/minor_moons.asset           |  1 -
 .../solarsystem/planets/jupiter/trail.asset     |  1 -
 .../planets/jupiter/trail_barycenter.asset      |  1 -
 .../planets/jupiter/trail_earth.asset           |  1 -
 .../planets/jupiter/transforms.asset            |  1 -
 .../solarsystem/planets/mars/atmosphere.asset   |  1 -
 .../planets/mars/default_layers.asset           |  1 -
 .../planets/mars/layers/base_layers.asset       |  1 -
 .../mars/layers/colorlayers/ctx_blended.asset   |  1 -
 .../layers/colorlayers/ctx_blended_beta01.asset |  1 -
 .../layers/colorlayers/ctx_mosaic_newyork.asset |  1 -
 .../layers/colorlayers/ctx_mosaic_sweden.asset  |  1 -
 .../layers/colorlayers/ctx_mosaic_utah.asset    |  1 -
 .../mars/layers/colorlayers/hirise.asset        |  1 -
 .../mars/layers/colorlayers/hirisels.asset      |  1 -
 .../mars/layers/colorlayers/mars_texture.asset  |  1 -
 .../colorlayers/moc_wa_color_newyork.asset      |  1 -
 .../colorlayers/moc_wa_color_sweden.asset       |  1 -
 .../layers/colorlayers/moc_wa_color_utah.asset  |  1 -
 .../layers/colorlayers/mola_hrsc_newyork.asset  |  1 -
 .../layers/colorlayers/mola_hrsc_sweden.asset   |  1 -
 .../layers/colorlayers/mola_hrsc_utah.asset     |  1 -
 .../colorlayers/mola_pseudo_color_newyork.asset |  1 -
 .../colorlayers/mola_pseudo_color_sweden.asset  |  1 -
 .../colorlayers/mola_pseudo_color_utah.asset    |  1 -
 .../colorlayers/themis_ir_day_newyork.asset     |  1 -
 .../colorlayers/themis_ir_day_sweden.asset      |  1 -
 .../layers/colorlayers/themis_ir_day_utah.asset |  1 -
 .../colorlayers/themis_ir_night_newyork.asset   |  1 -
 .../colorlayers/themis_ir_night_sweden.asset    |  1 -
 .../colorlayers/themis_ir_night_utah.asset      |  1 -
 .../colorlayers/viking_mdim_newyork.asset       |  1 -
 .../layers/colorlayers/viking_mdim_sweden.asset |  1 -
 .../layers/colorlayers/viking_mdim_utah.asset   |  1 -
 .../mars/layers/heightlayers/hirisels.asset     |  1 -
 .../mars/layers/heightlayers/mdem200m.asset     |  1 -
 .../mars/layers/heightlayers/mola_amnh.asset    |  1 -
 .../mars/layers/heightlayers/mola_sweden.asset  |  1 -
 .../mars/layers/heightlayers/mola_utah.asset    |  1 -
 .../mars/layers/nasa-treks/MEX_HRSC.asset       |  3 +--
 .../mars/layers/nasa-treks/MGS_MOC_Atlas.asset  |  3 +--
 .../mars/layers/nasa-treks/MGS_MOLA.asset       |  3 +--
 .../MGS_MOLA_and_Mars_Express_HRSC.asset        |  3 +--
 .../mars/layers/nasa-treks/MGS_TES.asset        |  3 +--
 .../layers/nasa-treks/MO_THEMIS-IR_Day.asset    |  3 +--
 .../layers/nasa-treks/MO_THEMIS-IR_Night.asset  |  3 +--
 .../mars/layers/nasa-treks/MRO_CTX.asset        |  3 +--
 .../mars/layers/nasa-treks/MRO_HiRISE.asset     |  3 +--
 .../planets/mars/layers/nasa-treks/MSL.asset    |  3 +--
 .../layers/nasa-treks/Mars_Express_HRSC.asset   |  3 +--
 .../Mars_Reconnaissance_Orbiter_CTX.asset       |  3 +--
 .../planets/mars/layers/newyork_layers.asset    |  1 -
 .../planets/mars/layers/overlays/indices.asset  |  1 -
 .../mars/layers/overlays/size_reference.asset   |  1 -
 .../planets/mars/layers/sweden_layers.asset     |  1 -
 .../planets/mars/layers/utah_layers.asset       |  1 -
 .../scene/solarsystem/planets/mars/mars.asset   |  1 -
 .../solarsystem/planets/mars/moons/deimos.asset |  1 -
 .../planets/mars/moons/deimos_globe.asset       |  1 -
 .../layers/colorlayers/deimos_viking.asset      |  1 -
 .../layers/colorlayers/phobos_viking.asset      |  1 -
 .../solarsystem/planets/mars/moons/phobos.asset |  1 -
 .../planets/mars/moons/phobos_globe.asset       |  1 -
 .../scene/solarsystem/planets/mars/trail.asset  |  1 -
 .../planets/mars/trail_barycenter.asset         |  1 -
 .../solarsystem/planets/mars/trail_earth.asset  |  1 -
 .../solarsystem/planets/mars/transforms.asset   |  1 -
 .../planets/mercury/default_layers.asset        |  1 -
 .../planets/mercury/layers/base_layers.asset    |  1 -
 .../layers/colorlayers/alsimap_02122015.asset   |  1 -
 .../layers/colorlayers/casimap_02122015.asset   |  1 -
 .../layers/colorlayers/fesimap_02122015.asset   |  1 -
 .../layers/colorlayers/mercury_texture.asset    |  1 -
 .../colorlayers/messenger_bdr_newyork.asset     |  1 -
 .../colorlayers/messenger_bdr_sweden.asset      |  1 -
 .../layers/colorlayers/messenger_bdr_utah.asset |  1 -
 .../colorlayers/messenger_hie_newyork.asset     |  1 -
 .../colorlayers/messenger_hie_sweden.asset      |  1 -
 .../layers/colorlayers/messenger_hie_utah.asset |  1 -
 .../colorlayers/messenger_hiw_newyork.asset     |  1 -
 .../colorlayers/messenger_hiw_sweden.asset      |  1 -
 .../layers/colorlayers/messenger_hiw_utah.asset |  1 -
 .../colorlayers/messenger_loi_newyork.asset     |  1 -
 .../colorlayers/messenger_loi_sweden.asset      |  1 -
 .../layers/colorlayers/messenger_loi_utah.asset |  1 -
 .../colorlayers/messenger_mdis_newyork.asset    |  1 -
 .../colorlayers/messenger_mdis_sweden.asset     |  1 -
 .../colorlayers/messenger_mdis_utah.asset       |  1 -
 .../layers/colorlayers/messenger_mdr_utah.asset |  1 -
 .../colorlayers/messenger_mosaic2_newyork.asset |  1 -
 .../colorlayers/messenger_mosaic2_sweden.asset  |  1 -
 .../colorlayers/messenger_mosaic2_utah.asset    |  1 -
 .../colorlayers/messenger_mosaic_newyork.asset  |  1 -
 .../colorlayers/messenger_mosaic_sweden.asset   |  1 -
 .../colorlayers/messenger_mosaic_utah.asset     |  1 -
 .../layers/colorlayers/messenger_mp3_utah.asset |  1 -
 .../colorlayers/messenger_shade_newyork.asset   |  1 -
 .../colorlayers/messenger_shade_sweden.asset    |  1 -
 .../colorlayers/messenger_shade_utah.asset      |  1 -
 .../layers/colorlayers/mgsimap_02122015.asset   |  1 -
 .../layers/colorlayers/ssimap_02122015.asset    |  1 -
 .../mercury/layers/nasa-treks/MSGR_MDIS.asset   |  3 +--
 .../layers/nasa-treks/MSGR_MDIS_Mosaic.asset    |  3 +--
 .../layers/nasa-treks/MSGR_MDIS_Slope.asset     |  3 +--
 .../planets/mercury/layers/newyork_layers.asset |  1 -
 .../planets/mercury/layers/sweden_layers.asset  |  1 -
 .../planets/mercury/layers/utah_layers.asset    |  1 -
 .../solarsystem/planets/mercury/mercury.asset   |  1 -
 .../solarsystem/planets/mercury/trail.asset     |  1 -
 .../planets/mercury/trail_barycenter.asset      |  1 -
 .../planets/mercury/trail_earth.asset           |  1 -
 .../planets/mercury/transforms.asset            |  1 -
 .../planets/neptune/default_layers.asset        |  1 -
 .../planets/neptune/inner_moons.asset           |  1 -
 .../planets/neptune/irregular_moons.asset       |  1 -
 .../planets/neptune/kernels095.asset            |  1 -
 .../planets/neptune/kernels102.asset            |  1 -
 .../layers/colorlayers/neptune_texture.asset    |  1 -
 .../planets/neptune/major_moons.asset           |  1 -
 .../planets/neptune/minor_moons.asset           |  1 -
 .../solarsystem/planets/neptune/neptune.asset   |  1 -
 .../planets/neptune/nereid/nereid.asset         |  1 -
 .../solarsystem/planets/neptune/trail.asset     |  1 -
 .../planets/neptune/trail_barycenter.asset      |  1 -
 .../planets/neptune/trail_earth.asset           |  1 -
 .../planets/neptune/transforms.asset            |  1 -
 .../planets/neptune/triton/default_layers.asset |  1 -
 ...ton_voyager2_clrmosaic_globalfill_600m.asset |  1 -
 .../planets/neptune/triton/triton.asset         |  1 -
 .../solarsystem/planets/newyork_layers.asset    |  1 -
 .../scene/solarsystem/planets/planets.asset     |  1 -
 .../planets/saturn/default_layers.asset         |  1 -
 .../planets/saturn/dione/default_layers.asset   |  1 -
 .../planets/saturn/dione/dione.asset            |  1 -
 .../layers/colorlayers/dione_texture.asset      |  1 -
 .../planets/saturn/dione/trail.asset            |  1 -
 .../saturn/enceladus/default_layers.asset       |  1 -
 .../planets/saturn/enceladus/enceladus.asset    | 11 +++++------
 .../saturn/enceladus/layers/base_layers.asset   |  1 -
 .../layers/colorlayers/enceladus_texture.asset  |  1 -
 .../global_mosaic_100m_hpf_newyork.asset        |  1 -
 .../global_mosaic_100m_hpf_sweden.asset         |  1 -
 .../enceladus/layers/newyork_layers.asset       |  1 -
 .../saturn/enceladus/layers/sweden_layers.asset |  1 -
 .../planets/saturn/enceladus/trail.asset        |  1 -
 .../planets/saturn/hyperion/hyperion.asset      |  1 -
 .../planets/saturn/hyperion/trail.asset         |  1 -
 .../planets/saturn/iapetus/default_layers.asset |  1 -
 .../planets/saturn/iapetus/iapetus.asset        | 11 +++++------
 .../layers/colorlayers/iapetus_texture.asset    |  1 -
 .../planets/saturn/iapetus/trail.asset          |  1 -
 .../solarsystem/planets/saturn/kernels.asset    |  1 -
 .../solarsystem/planets/saturn/kernels415.asset |  1 -
 .../solarsystem/planets/saturn/kernels452.asset |  1 -
 .../layers/colorlayers/saturn_texture.asset     |  1 -
 .../planets/saturn/major_moons.asset            |  1 -
 .../planets/saturn/mimas/default_layers.asset   |  1 -
 .../layers/colorlayers/mimas_texture.asset      |  1 -
 .../planets/saturn/mimas/mimas.asset            |  1 -
 .../planets/saturn/mimas/trail.asset            |  1 -
 .../planets/saturn/minor/gallic_group.asset     |  1 -
 .../planets/saturn/minor/inuit_group.asset      |  1 -
 .../planets/saturn/minor/norse_group.asset      |  1 -
 .../planets/saturn/minor/other_group.asset      |  1 -
 .../planets/saturn/minor/shepherd_group.asset   |  1 -
 .../planets/saturn/minor_moons.asset            |  1 -
 .../planets/saturn/rhea/default_layers.asset    |  1 -
 .../rhea/layers/colorlayers/rhea_texture.asset  |  1 -
 .../solarsystem/planets/saturn/rhea/rhea.asset  |  1 -
 .../solarsystem/planets/saturn/rhea/trail.asset |  1 -
 .../solarsystem/planets/saturn/saturn.asset     |  1 -
 .../planets/saturn/tethys/default_layers.asset  |  1 -
 .../layers/colorlayers/tethys_texture.asset     |  1 -
 .../planets/saturn/tethys/tethys.asset          |  1 -
 .../planets/saturn/tethys/trail.asset           |  1 -
 .../planets/saturn/titan/atmosphere.asset       |  1 -
 .../planets/saturn/titan/default_layers.asset   |  1 -
 .../cassini_iss_global_mosaic_4km_local.asset   |  1 -
 .../cassini_iss_global_mosaic_4km_newyork.asset |  1 -
 .../cassini_iss_global_mosaic_4km_sweden.asset  |  1 -
 .../planets/saturn/titan/titan.asset            |  1 -
 .../planets/saturn/titan/trail.asset            |  1 -
 .../solarsystem/planets/saturn/trail.asset      |  1 -
 .../planets/saturn/trail_barycenter.asset       |  1 -
 .../planets/saturn/trail_earth.asset            |  1 -
 .../solarsystem/planets/saturn/transforms.asset |  1 -
 .../solarsystem/planets/sweden_layers.asset     |  1 -
 .../planets/uranus/default_layers.asset         |  1 -
 .../planets/uranus/inner_moons.asset            |  1 -
 .../uranus/irregular_prograde_moons.asset       |  1 -
 .../uranus/irregular_retrograde_moons.asset     |  1 -
 .../solarsystem/planets/uranus/kernels.asset    |  1 -
 .../solarsystem/planets/uranus/kernels115.asset |  1 -
 .../solarsystem/planets/uranus/kernels116.asset |  1 -
 .../layers/colorlayers/uranus_texture.asset     |  1 -
 .../planets/uranus/major_moons.asset            |  1 -
 .../planets/uranus/minor_moons.asset            |  1 -
 .../solarsystem/planets/uranus/trail.asset      |  1 -
 .../planets/uranus/trail_barycenter.asset       |  1 -
 .../planets/uranus/trail_earth.asset            |  1 -
 .../solarsystem/planets/uranus/transforms.asset |  1 -
 .../solarsystem/planets/uranus/uranus.asset     |  1 -
 .../scene/solarsystem/planets/utah_layers.asset |  1 -
 .../solarsystem/planets/venus/atmosphere.asset  |  1 -
 .../planets/venus/default_layers.asset          |  1 -
 .../planets/venus/layers/base_layers.asset      |  1 -
 .../colorlayers/magellan_mosaic_newyork.asset   |  1 -
 .../colorlayers/magellan_mosaic_utah.asset      |  1 -
 .../layers/colorlayers/venus_texture.asset      |  1 -
 .../layers/heightlayers/magellan_newyork.asset  |  1 -
 .../layers/heightlayers/magellan_utah.asset     |  1 -
 .../planets/venus/layers/newyork_layers.asset   |  1 -
 .../planets/venus/layers/utah_layers.asset      |  1 -
 .../scene/solarsystem/planets/venus/trail.asset |  1 -
 .../planets/venus/trail_barycenter.asset        |  1 -
 .../solarsystem/planets/venus/trail_earth.asset |  1 -
 .../solarsystem/planets/venus/transforms.asset  |  1 -
 .../scene/solarsystem/planets/venus/venus.asset | 11 +++++------
 .../scene/solarsystem/sssb/amor_asteroid.asset  |  1 -
 .../solarsystem/sssb/apollo_asteroid.asset      |  1 -
 .../assets/scene/solarsystem/sssb/astraea.asset |  1 -
 .../scene/solarsystem/sssb/aten_asteroid.asset  |  1 -
 .../scene/solarsystem/sssb/atira_asteroid.asset |  1 -
 .../scene/solarsystem/sssb/c2019y4atlas.asset   |  1 -
 .../solarsystem/sssb/centaur_asteroid.asset     |  1 -
 .../solarsystem/sssb/chiron-type_comet.asset    |  1 -
 .../solarsystem/sssb/encke-type_comet.asset     |  1 -
 .../solarsystem/sssb/halley-type_comet.asset    |  1 -
 .../sssb/inner_main_belt_asteroid.asset         |  1 -
 .../assets/scene/solarsystem/sssb/itokawa.asset |  1 -
 .../solarsystem/sssb/jupiter-family_comet.asset |  1 -
 .../sssb/jupiter_trojan_asteroid.asset          |  1 -
 .../solarsystem/sssb/main_belt_asteroid.asset   |  1 -
 .../sssb/mars-crossing_asteroid.asset           |  1 -
 .../sssb/outer_main_belt_asteroid.asset         |  1 -
 data/assets/scene/solarsystem/sssb/pha.asset    |  1 -
 .../scene/solarsystem/sssb/swifttuttle.asset    |  1 -
 .../scene/solarsystem/sssb/tesla_roadster.asset |  1 -
 .../sssb/transneptunian_object_asteroid.asset   |  1 -
 data/assets/scene/solarsystem/sun.asset         |  1 -
 .../scene/solarsystem/sun/EUV_layer.asset       |  1 -
 .../scene/solarsystem/sun/default_layers.asset  |  1 -
 data/assets/scene/solarsystem/sun/glare.asset   |  1 -
 .../scene/solarsystem/sun/habitablezone.asset   |  1 -
 .../sun/layers/colorlayers/sun_texture.asset    |  1 -
 data/assets/scene/solarsystem/sun/marker.asset  |  1 -
 data/assets/scene/solarsystem/sun/sun.asset     |  1 -
 .../scene/solarsystem/sun/transforms.asset      |  1 -
 .../sun/transforms_heliosphere.asset            |  1 -
 .../solarsystem/telescopes/euclid/euclid.asset  |  1 -
 .../solarsystem/telescopes/euclid/kernels.asset |  1 -
 .../solarsystem/telescopes/euclid/mission.asset |  1 -
 .../solarsystem/telescopes/euclid/model.asset   |  1 -
 .../solarsystem/telescopes/euclid/trails.asset  |  1 -
 .../solarsystem/telescopes/gaia/trail.asset     |  1 -
 .../telescopes/gaia/transforms.asset            |  1 -
 .../solarsystem/telescopes/jwst/actions.asset   |  1 -
 .../solarsystem/telescopes/jwst/jwst.asset      |  1 -
 .../telescopes/jwst/targets/crab.asset          |  1 -
 .../telescopes/jwst/targets/crab_image.asset    |  1 -
 .../telescopes/jwst/targets/hd84406.asset       |  1 -
 .../telescopes/jwst/targets/hd84406_image.asset |  1 -
 .../telescopes/jwst/targets/hh212.asset         |  1 -
 .../telescopes/jwst/targets/hh212_image.asset   |  1 -
 .../telescopes/jwst/targets/hudf.asset          |  1 -
 .../telescopes/jwst/targets/hudf_image.asset    |  1 -
 .../telescopes/jwst/targets/m51.asset           |  1 -
 .../telescopes/jwst/targets/m51_image.asset     |  1 -
 .../telescopes/jwst/targets/m82.asset           |  1 -
 .../telescopes/jwst/targets/m82_image.asset     |  1 -
 .../telescopes/jwst/targets/orion.asset         |  1 -
 .../telescopes/jwst/targets/orion_image.asset   |  1 -
 .../telescopes/jwst/targets/ring.asset          |  1 -
 .../telescopes/jwst/targets/ring_image.asset    |  1 -
 .../telescopes/jwst/targets/sn1987a.asset       |  1 -
 .../telescopes/jwst/targets/sn1987a_image.asset |  1 -
 .../telescopes/jwst/targets/trifid.asset        |  1 -
 .../telescopes/jwst/targets/trifid_image.asset  |  1 -
 .../solarsystem/telescopes/jwst/timelapse.asset |  1 -
 .../solarsystem/telescopes/jwst/trail.asset     |  1 -
 .../telescopes/jwst/transforms.asset            |  1 -
 data/assets/spice/core.asset                    |  1 -
 data/assets/util/default_colormaps.asset        |  1 -
 data/assets/util/dpiscaling.asset               |  1 -
 data/assets/util/joysticks/any-joystick.asset   |  1 -
 .../util/joysticks/microsoft-xbox-360-pad.asset |  1 -
 data/assets/util/joysticks/ps4.asset            |  1 -
 data/assets/util/joysticks/ps5.asset            |  1 -
 .../space-mouse-compact-wireless.asset          |  1 -
 .../util/joysticks/space-mouse-compact.asset    |  1 -
 .../space-mouse-enterprise-wireless.asset       |  1 -
 .../util/joysticks/space-mouse-enterprise.asset |  1 -
 data/assets/util/joysticks/xbox-wireless.asset  |  1 -
 data/assets/util/joysticks/xbox.asset           |  3 +--
 data/assets/util/webgui.asset                   |  1 -
 1099 files changed, 86 insertions(+), 1186 deletions(-)

diff --git a/data/assets/actions/system/undo_event_fades.asset b/data/assets/actions/system/undo_event_fades.asset
index 4ce4ca7dbe..560878696a 100644
--- a/data/assets/actions/system/undo_event_fades.asset
+++ b/data/assets/actions/system/undo_event_fades.asset
@@ -25,7 +25,6 @@ asset.export("UndoEventFade", UndoEventFade.Identifier)
 
 asset.meta = {
   Name = "Actions - Undo All Event Fading",
-  Version = "1.0",
   Description = "Asset providing debug ability to undo all event fading",
   Author = "OpenSpace Team",
   URL = "http://openspaceproject.com",
diff --git a/data/assets/actions/time.asset b/data/assets/actions/time.asset
index 89133c30e0..a33d22ca24 100644
--- a/data/assets/actions/time.asset
+++ b/data/assets/actions/time.asset
@@ -52,7 +52,6 @@ asset.export("SiderealDayDecrease", SiderealDayDecrease.Identifier)
 
 asset.meta = {
   Name = "Actions - Time",
-  Version = "1.0",
   Description = "Asset providing actions around time",
   Author = "OpenSpace Team",
   URL = "http://openspaceproject.com",
diff --git a/data/assets/actions/trails/on_off_all_minor_moons.asset b/data/assets/actions/trails/on_off_all_minor_moons.asset
index 6fa79297e3..5f680e6dae 100644
--- a/data/assets/actions/trails/on_off_all_minor_moons.asset
+++ b/data/assets/actions/trails/on_off_all_minor_moons.asset
@@ -76,7 +76,6 @@ asset.export("MinorMoonsOff", MinorMoonsOff.Identifier)
 
 asset.meta = {
   Name = "Actions - Turn ON/OFF all Minor Moons",
-  Version = "1.0",
   Description = "Asset providing actions to turn  ON/OFF all minor moons and their trails",
   Author = "OpenSpace Team",
   URL = "http://openspaceproject.com",
diff --git a/data/assets/actions/trails/toggle_all_dwarf_planet_trails.asset b/data/assets/actions/trails/toggle_all_dwarf_planet_trails.asset
index 7813bc2adb..529e552c86 100644
--- a/data/assets/actions/trails/toggle_all_dwarf_planet_trails.asset
+++ b/data/assets/actions/trails/toggle_all_dwarf_planet_trails.asset
@@ -27,7 +27,6 @@ asset.export("ToggleDwarfPlanetTrails", ToggleDwarfPlanetTrails.Identifier)
 
 asset.meta = {
   Name = "Actions - Toggle Dwarf Planet Trails",
-  Version = "1.0",
   Description = "Asset providing actions to toggle all dwarf planet trails on and off",
   Author = "OpenSpace Team",
   URL = "http://openspaceproject.com",
diff --git a/data/assets/actions/trails/toggle_all_minor_moon_trails.asset b/data/assets/actions/trails/toggle_all_minor_moon_trails.asset
index f587747417..0b442deed4 100644
--- a/data/assets/actions/trails/toggle_all_minor_moon_trails.asset
+++ b/data/assets/actions/trails/toggle_all_minor_moon_trails.asset
@@ -27,7 +27,6 @@ asset.export("ToggleMinorMoonTrails", ToggleMinorMoonTrails.Identifier)
 
 asset.meta = {
   Name = "Actions - Toggle Minor Moon Trails",
-  Version = "1.0",
   Description = "Asset providing actions to toggle all minor moon trails on and off",
   Author = "OpenSpace Team",
   URL = "http://openspaceproject.com",
diff --git a/data/assets/actions/trails/toggle_trail.asset b/data/assets/actions/trails/toggle_trail.asset
index 270520cac4..b768937a87 100644
--- a/data/assets/actions/trails/toggle_trail.asset
+++ b/data/assets/actions/trails/toggle_trail.asset
@@ -114,7 +114,6 @@ asset.export("ShowTrail", ShowTrail.Identifier)
 
 asset.meta = {
   Name = "Actions - Toggle current Trails",
-  Version = "1.0",
   Description = "Asset providing actions to toggle trails",
   Author = "OpenSpace Team",
   URL = "http://openspaceproject.com",
diff --git a/data/assets/customization/globebrowsing.asset b/data/assets/customization/globebrowsing.asset
index 4bcd72843a..ef6001e4d7 100644
--- a/data/assets/customization/globebrowsing.asset
+++ b/data/assets/customization/globebrowsing.asset
@@ -106,7 +106,6 @@ end)
 
 asset.meta = {
   Name = "Customization - GlobeBrowsing",
-  Version = "1.0",
   Description = [[This asset adds planetary images that can be downloaded separately
   and placed in the OpenSpaceData folder]],
   Author = "OpenSpace Team",
diff --git a/data/assets/customization/gui.asset b/data/assets/customization/gui.asset
index af95612cc4..7f49e78549 100644
--- a/data/assets/customization/gui.asset
+++ b/data/assets/customization/gui.asset
@@ -10,7 +10,6 @@ asset.export("webguiDevelopmentMode", false)
 
 asset.meta = {
   Name = "Customization - User Interface",
-  Version = "1.0",
   Description = "This asset is used by developers working on the GUI",
   Author = "OpenSpace Team",
   URL = "http://openspaceproject.com",
diff --git a/data/assets/dashboard/date.asset b/data/assets/dashboard/date.asset
index 422bf7343a..19722483a4 100644
--- a/data/assets/dashboard/date.asset
+++ b/data/assets/dashboard/date.asset
@@ -19,7 +19,6 @@ asset.export(Item)
 
 asset.meta = {
   Name = "Dashboard - Date",
-  Version = "1.0",
   Description = "This asset provides a Date dashboard item",
   Author = "OpenSpace Team",
   URL = "http://openspaceproject.com",
diff --git a/data/assets/dashboard/default_dashboard.asset b/data/assets/dashboard/default_dashboard.asset
index 3c1fefcaff..c43b47fcde 100644
--- a/data/assets/dashboard/default_dashboard.asset
+++ b/data/assets/dashboard/default_dashboard.asset
@@ -9,7 +9,6 @@ asset.require("./globelocation")
 
 asset.meta = {
   Name = "Dashboard - Default Items",
-  Version = "1.0",
   Description = "This asset provides the default items for the dashboard",
   Author = "OpenSpace Team",
   URL = "http://openspaceproject.com",
diff --git a/data/assets/dashboard/distance.asset b/data/assets/dashboard/distance.asset
index 0d73c554d4..6da0e66915 100644
--- a/data/assets/dashboard/distance.asset
+++ b/data/assets/dashboard/distance.asset
@@ -19,7 +19,6 @@ asset.export(Item)
 
 asset.meta = {
   Name = "Dashboard - Distance",
-  Version = "1.0",
   Description = "This asset provides a Distance dashboard item",
   Author = "OpenSpace Team",
   URL = "http://openspaceproject.com",
diff --git a/data/assets/dashboard/framerate.asset b/data/assets/dashboard/framerate.asset
index 50da0e8864..2fc6b2d68d 100644
--- a/data/assets/dashboard/framerate.asset
+++ b/data/assets/dashboard/framerate.asset
@@ -19,7 +19,6 @@ asset.export(Item)
 
 asset.meta = {
   Name = "Dashboard - Framerate",
-  Version = "1.0",
   Description = "This asset provides a Framerate dashboard item",
   Author = "OpenSpace Team",
   URL = "http://openspaceproject.com",
diff --git a/data/assets/dashboard/globelocation.asset b/data/assets/dashboard/globelocation.asset
index cb4fcda184..f57f76c0af 100644
--- a/data/assets/dashboard/globelocation.asset
+++ b/data/assets/dashboard/globelocation.asset
@@ -19,7 +19,6 @@ asset.export(Item)
 
 asset.meta = {
   Name = "Dashboard - GlobeLocation",
-  Version = "1.0",
   Description = "This asset provides a GlobeLocation dashboard item",
   Author = "OpenSpace Team",
   URL = "http://openspaceproject.com",
diff --git a/data/assets/dashboard/parallelconnection.asset b/data/assets/dashboard/parallelconnection.asset
index 13351db43e..0c11c22463 100644
--- a/data/assets/dashboard/parallelconnection.asset
+++ b/data/assets/dashboard/parallelconnection.asset
@@ -19,7 +19,6 @@ asset.export(Item)
 
 asset.meta = {
   Name = "Dashboard - ParallelConnection",
-  Version = "1.0",
   Description = "This asset provides a ParallelConnection dashboard item",
   Author = "OpenSpace Team",
   URL = "http://openspaceproject.com",
diff --git a/data/assets/dashboard/simulationincrement.asset b/data/assets/dashboard/simulationincrement.asset
index e837384d37..538e0e1e76 100644
--- a/data/assets/dashboard/simulationincrement.asset
+++ b/data/assets/dashboard/simulationincrement.asset
@@ -19,7 +19,6 @@ asset.export(Item)
 
 asset.meta = {
   Name = "Dashboard - Simulation Increment",
-  Version = "1.0",
   Description = [[This asset provides a dashboard item that shows the simulation
     increment, meaning how fast the in-game time progresses relative to the wall-clock]],
   Author = "OpenSpace Team",
diff --git a/data/assets/dashboard/velocity.asset b/data/assets/dashboard/velocity.asset
index b5368082b1..2db1b3a7a7 100644
--- a/data/assets/dashboard/velocity.asset
+++ b/data/assets/dashboard/velocity.asset
@@ -20,7 +20,6 @@ asset.export(Item)
 
 asset.meta = {
   Name = "Dashboard - Velocity",
-  Version = "1.0",
   Description = "This asset provides a dashboard item that shows the camera's velocity",
   Author = "OpenSpace Team",
   URL = "http://openspaceproject.com",
diff --git a/data/assets/educational/epicycle.asset b/data/assets/educational/epicycle.asset
index 9158fed7c4..4726c13d46 100644
--- a/data/assets/educational/epicycle.asset
+++ b/data/assets/educational/epicycle.asset
@@ -70,7 +70,6 @@ asset.export("FadeoutCyclesAction", FadeoutCyclesAction.Identifier)
 
 asset.meta = {
   Name = "Epicycle",
-  Version = "1.0",
   Description = [[This asset includes the trails of the planets from earth.
     In addition, it provides some actions for manipulating them.]],
   Author = "OpenSpace Team",
diff --git a/data/assets/educational/scale/arc_de_triomphe.asset b/data/assets/educational/scale/arc_de_triomphe.asset
index a3d0b5eb8d..7bc92f0c08 100644
--- a/data/assets/educational/scale/arc_de_triomphe.asset
+++ b/data/assets/educational/scale/arc_de_triomphe.asset
@@ -89,7 +89,6 @@ asset.export("ResetPositionAction", ResetPositionAction.Identifier)
 
 asset.meta = {
   Name = "Scale Model - Arc de Triomphe",
-  Version = "1.0",
   Description = [[A 1:1 scale model of the Arc de Triomphe. Per default it is placed at
     its actual position in Paris, France. But the asset also includes actions to move it
     to a position under the camera, or back to its original position.]],
diff --git a/data/assets/educational/scale/big_ben.asset b/data/assets/educational/scale/big_ben.asset
index 327711fd91..c02bba6d28 100644
--- a/data/assets/educational/scale/big_ben.asset
+++ b/data/assets/educational/scale/big_ben.asset
@@ -90,7 +90,6 @@ asset.export("ResetPositionAction", ResetPositionAction.Identifier)
 
 asset.meta = {
   Name = "Scale Model - Big Ben",
-  Version = "1.0",
   Description = [[A 1:1 scale model of the Big Ben. Per default it is placed at its
     actual position in London, England. But the asset also includes actions to move
     it to a position under the camera, or back to its original position.]],
diff --git a/data/assets/educational/scale/burj_khalifa.asset b/data/assets/educational/scale/burj_khalifa.asset
index 762af22a95..de8caf9ec4 100644
--- a/data/assets/educational/scale/burj_khalifa.asset
+++ b/data/assets/educational/scale/burj_khalifa.asset
@@ -90,7 +90,6 @@ asset.export("ResetPositionAction", ResetPositionAction.Identifier)
 
 asset.meta = {
   Name = "Scale Model - Burj Khalifa",
-  Version = "1.0",
   Description = [[A 1:1 scale model of the Burj Khalifa. Per default it is placed at its
     actual position in Dubai. But the asset also includes actions to move it to a
     position under the camera, or back to its original position.]],
diff --git a/data/assets/educational/scale/eiffeltower.asset b/data/assets/educational/scale/eiffeltower.asset
index 99c4aaae31..d139084983 100644
--- a/data/assets/educational/scale/eiffeltower.asset
+++ b/data/assets/educational/scale/eiffeltower.asset
@@ -94,7 +94,6 @@ asset.export("ResetPositionAction", ResetPositionAction.Identifier)
 
 asset.meta = {
   Name = "Scale Model - Eiffel Tower",
-  Version = "1.0",
   Description = [[A 1:1 scale model of the Eiffel Tower. Per default it is placed at
     its actual position in Paris, France. But the asset also includes actions to move it
     to a position under the camera, or back to its original position.]],
diff --git a/data/assets/educational/scale/empire_state_building.asset b/data/assets/educational/scale/empire_state_building.asset
index 21eb832497..34dd5f56ad 100644
--- a/data/assets/educational/scale/empire_state_building.asset
+++ b/data/assets/educational/scale/empire_state_building.asset
@@ -94,7 +94,6 @@ asset.export("ResetPositionAction", ResetPositionAction.Identifier)
 
 asset.meta = {
   Name = "Scale Model - Empire State Building",
-  Version = "1.0",
   Description = [[A 1:1 scale model of the Empire State Building. Per default it is
     placed at its actual position in New York City. But the asset also includes actions
     to move it to a position under the camera, or back to its original position.]],
diff --git a/data/assets/educational/scale/gateway_arch.asset b/data/assets/educational/scale/gateway_arch.asset
index 973d4ef50b..b65fb14b97 100644
--- a/data/assets/educational/scale/gateway_arch.asset
+++ b/data/assets/educational/scale/gateway_arch.asset
@@ -94,7 +94,6 @@ asset.export("ResetPositionAction", ResetPositionAction.Identifier)
 
 asset.meta = {
   Name = "Scale Model - Gateway Arch",
-  Version = "1.0",
   Description = [[A 1:1 scale model of the Gateway Arch. Per default it is placed at its
     actual position in Saint Louis, Missouri. But the asset also includes actions to move
     it to a position under the camera, or back to its original position.]],
diff --git a/data/assets/educational/scale/golden_gate_bridge.asset b/data/assets/educational/scale/golden_gate_bridge.asset
index 6c15a3e2e7..f9f4723ccb 100644
--- a/data/assets/educational/scale/golden_gate_bridge.asset
+++ b/data/assets/educational/scale/golden_gate_bridge.asset
@@ -94,7 +94,6 @@ asset.export("ResetPositionAction", ResetPositionAction.Identifier)
 
 asset.meta = {
   Name = "Scale Model - Golden Gate Bridge",
-  Version = "1.0",
   Description = [[A 1:1 scale model of the Golden Gate Bridge. Per default it is placed
     at its actual position in San Fransisco. But the asset also includes actions to move
     it to a position under the camera, or back to its original position.]],
diff --git a/data/assets/educational/scale/kuala_lumpur_tower.asset b/data/assets/educational/scale/kuala_lumpur_tower.asset
index f872ae5b45..c42a7ac38e 100644
--- a/data/assets/educational/scale/kuala_lumpur_tower.asset
+++ b/data/assets/educational/scale/kuala_lumpur_tower.asset
@@ -88,7 +88,6 @@ asset.export("ResetPositionAction", ResetPositionAction.Identifier)
 
 asset.meta = {
   Name = "Scale Model - Kuala Lumpur Tower",
-  Version = "1.0",
   Description = [[A 1:1 scale model of the Kuala Lumpur Tower. Per default it is placed
     at its actual position in Kuala Lumpur, Malaysia. But the asset also includes actions
     to move it to a position under the camera, or back to its original position.]],
diff --git a/data/assets/educational/scale/rose_bowl.asset b/data/assets/educational/scale/rose_bowl.asset
index ddf3019dc0..6683d55278 100644
--- a/data/assets/educational/scale/rose_bowl.asset
+++ b/data/assets/educational/scale/rose_bowl.asset
@@ -92,7 +92,6 @@ asset.export("ResetPositionAction", ResetPositionAction.Identifier)
 
 asset.meta = {
   Name = "Scale Model - Rose Bowl Stadium",
-  Version = "1.0",
   Description = [[A 1:1 scale model of the Rose Bowl Stadium. Per default it is placed
     at its actual position in Pasadena, California. But the asset also includes actions
     to move it to a position under the camera, or back to its original position.]],
diff --git a/data/assets/educational/scale/school_bus.asset b/data/assets/educational/scale/school_bus.asset
index 3e6c95f75a..6899a9ba72 100644
--- a/data/assets/educational/scale/school_bus.asset
+++ b/data/assets/educational/scale/school_bus.asset
@@ -89,7 +89,6 @@ asset.export("ResetPositionAction", ResetPositionAction.Identifier)
 
 asset.meta = {
   Name = "Scale Model - Eiffel Tower",
-  Version = "1.0",
   Description = [[A 1:1 scale model of a US school bus, with actions to move
     it to a position under the camera, or back to its start position.]],
   Author = "OpenSpace Team",
diff --git a/data/assets/educational/scale/scientist.asset b/data/assets/educational/scale/scientist.asset
index c67a7cc94a..99ceb4f95f 100644
--- a/data/assets/educational/scale/scientist.asset
+++ b/data/assets/educational/scale/scientist.asset
@@ -89,7 +89,6 @@ asset.export("ResetPositionAction", ResetPositionAction.Identifier)
 
 asset.meta = {
   Name = "Scale Model - Eiffel Tower",
-  Version = "1.0",
   Description = [[A 1:1 scale model of a human scientist, with actions to move
     it to a position under the camera, or back to its start position.]],
   Author = "OpenSpace Team",
diff --git a/data/assets/educational/scale/statue_of_liberty.asset b/data/assets/educational/scale/statue_of_liberty.asset
index 8688e777dd..d865b9ac81 100644
--- a/data/assets/educational/scale/statue_of_liberty.asset
+++ b/data/assets/educational/scale/statue_of_liberty.asset
@@ -90,7 +90,6 @@ asset.export("ResetPositionAction", ResetPositionAction.Identifier)
 
 asset.meta = {
   Name = "Scale Model - Statue of Liberty",
-  Version = "1.0",
   Description = [[A 1:1 scale model of the Statue of Liberty. Per default it is
     placed at its actual position on Liberty Island in New York City. But the asset
     also includes actions to move it to a position under the camera, or back to its
diff --git a/data/assets/events/toggle_sun.asset b/data/assets/events/toggle_sun.asset
index c772471f5c..5da2652bd7 100644
--- a/data/assets/events/toggle_sun.asset
+++ b/data/assets/events/toggle_sun.asset
@@ -61,7 +61,6 @@ asset.export("ToggleSun", ToggleSun.Identifier)
 
 asset.meta = {
   Name = "Actions - Toggle current Trails",
-  Version = "1.0",
   Description = "Asset providing actions to toggle trails",
   Author = "OpenSpace Team",
   URL = "http://openspaceproject.com",
diff --git a/data/assets/examples/animation.asset b/data/assets/examples/animation.asset
index a420a70e79..78a7d9dc35 100644
--- a/data/assets/examples/animation.asset
+++ b/data/assets/examples/animation.asset
@@ -176,7 +176,6 @@ asset.export(AnimationBounce)
 
 asset.meta = {
   Name = "Animation Example asset",
-  Version = "1.0",
   Description = "Simple animation example asset with an animated box model",
   Author = "OpenSpace Team",
   URL = "http://openspaceproject.com",
@@ -187,7 +186,6 @@ asset.meta = {
 -- @TODO: At the moment, this overwrites the previous meta description. Probably needs a way to specify multiple meta's per file?
 asset.meta = {
   Name = "Animated Box Model",
-  Version = "1.0",
   Description = "Simple animated box model",
   Author = "Cesium, https://cesium.com/",
   URL = "https://github.com/KhronosGroup/glTF-Sample-Models/tree/master/2.0/BoxAnimated",
diff --git a/data/assets/examples/dashboarditems.asset b/data/assets/examples/dashboarditems.asset
index 26654ef092..14009061c1 100644
--- a/data/assets/examples/dashboarditems.asset
+++ b/data/assets/examples/dashboarditems.asset
@@ -188,7 +188,6 @@ asset.export(InputState)
 
 asset.meta = {
   Name = "Dashboard Items Example",
-  Version = "1.0",
   Description = [[Examples of different types of dashboard items. These are dynamic
     information texts that will be shown over the rendering (per default in the top
     left corner, on flat screens).]],
diff --git a/data/assets/examples/debugcoordinateaxes.asset b/data/assets/examples/debugcoordinateaxes.asset
index 4f5050aa29..9300904891 100644
--- a/data/assets/examples/debugcoordinateaxes.asset
+++ b/data/assets/examples/debugcoordinateaxes.asset
@@ -123,7 +123,6 @@ asset.export(SolarSystemBarycenterAxes)
 
 asset.meta = {
   Name = "Debug Coordinates",
-  Version = "1.0",
   Description = [[A set of coordinate axes demonstrating different XYZ coordinate
     reference frames that are useful for debugging, such as the Earth or Solar
     System Barycenter.]],
diff --git a/data/assets/examples/discs.asset b/data/assets/examples/discs.asset
index b07e87af93..623312f3d0 100644
--- a/data/assets/examples/discs.asset
+++ b/data/assets/examples/discs.asset
@@ -55,7 +55,6 @@ asset.export(FullEllipticDisc)
 
 asset.meta = {
   Name = "Example Discs",
-  Version = "1.0",
   Description = [[Examples of different types of rendered discs.]],
   Author = "OpenSpace Team",
   URL = "http://openspaceproject.com",
diff --git a/data/assets/examples/galaxyshader/volume.asset b/data/assets/examples/galaxyshader/volume.asset
index 0636e4b21d..eb5ad12e82 100644
--- a/data/assets/examples/galaxyshader/volume.asset
+++ b/data/assets/examples/galaxyshader/volume.asset
@@ -67,7 +67,6 @@ asset.export(MilkyWayVolume)
 
 asset.meta = {
   Name = "Milky Way Volume",
-  Version = "1.1",
   Description = [[Volumetric rendering of Milky Way galaxy based on simulations from "
   "NAOJ with a custom shader]],
   Author = "OpenSpace Team",
diff --git a/data/assets/examples/geojson/geojson_extruded_shaded_polygon.asset b/data/assets/examples/geojson/geojson_extruded_shaded_polygon.asset
index 7efae986d7..8af1b20359 100644
--- a/data/assets/examples/geojson/geojson_extruded_shaded_polygon.asset
+++ b/data/assets/examples/geojson/geojson_extruded_shaded_polygon.asset
@@ -43,7 +43,6 @@ asset.export(ExamplePolygon)
 
 asset.meta = {
   Name = "GeoJson Example - Extruded and Shaded Polygon",
-  Version = "1.0",
   Description = [[GeoJson example asset demonstrating how to apply shading from light
     sources on polygons]],
   Author = "OpenSpace Team",
diff --git a/data/assets/examples/geojson/geojson_lines.asset b/data/assets/examples/geojson/geojson_lines.asset
index 684ff47cce..410712c0a5 100644
--- a/data/assets/examples/geojson/geojson_lines.asset
+++ b/data/assets/examples/geojson/geojson_lines.asset
@@ -35,7 +35,6 @@ asset.export(ExampleLines)
 
 asset.meta = {
   Name = "GeoJson Example - Lines",
-  Version = "1.0",
   Description = [[GeoJson example asset with lines]],
   Author = "OpenSpace Team",
   URL = "http://openspaceproject.com",
diff --git a/data/assets/examples/geojson/geojson_multiple_polygons.asset b/data/assets/examples/geojson/geojson_multiple_polygons.asset
index 1613446283..1858e7b0af 100644
--- a/data/assets/examples/geojson/geojson_multiple_polygons.asset
+++ b/data/assets/examples/geojson/geojson_multiple_polygons.asset
@@ -53,7 +53,6 @@ asset.export(ExamplePolygonDiffHeights)
 
 asset.meta = {
   Name = "GeoJson Example - Multiple Polygons",
-  Version = "1.0",
   Description = [[GeoJson example asset with multiple polygons]],
   Author = "OpenSpace Team",
   URL = "http://openspaceproject.com",
diff --git a/data/assets/examples/geojson/geojson_points.asset b/data/assets/examples/geojson/geojson_points.asset
index bcf0464845..a1ee6f1c4d 100644
--- a/data/assets/examples/geojson/geojson_points.asset
+++ b/data/assets/examples/geojson/geojson_points.asset
@@ -35,7 +35,6 @@ asset.export(ExamplePoints)
 
 asset.meta = {
   Name = "GeoJson Example - Points",
-  Version = "1.0",
   Description = [[GeoJson example asset with points that are facing the camera
     (default)]],
   Author = "OpenSpace Team",
diff --git a/data/assets/examples/geojson/geojson_points_outfacing.asset b/data/assets/examples/geojson/geojson_points_outfacing.asset
index 07ad634959..d11b0ff2af 100644
--- a/data/assets/examples/geojson/geojson_points_outfacing.asset
+++ b/data/assets/examples/geojson/geojson_points_outfacing.asset
@@ -36,7 +36,6 @@ asset.export(ExamplePoints)
 
 asset.meta = {
   Name = "GeoJson Example - Outfacing Points",
-  Version = "1.0",
   Description = [[GeoJson example asset with point that are aligned to "stick out" of
     the globe, i.e. face out of the planet]],
   Author = "OpenSpace Team",
diff --git a/data/assets/examples/geojson/geojson_polygons_with_holes.asset b/data/assets/examples/geojson/geojson_polygons_with_holes.asset
index eeadd26b76..627dbe4ae6 100644
--- a/data/assets/examples/geojson/geojson_polygons_with_holes.asset
+++ b/data/assets/examples/geojson/geojson_polygons_with_holes.asset
@@ -35,7 +35,6 @@ asset.export(ExampleHoles)
 
 asset.meta = {
   Name = "GeoJson Example - Polygon with holes",
-  Version = "1.0",
   Description = [[GeoJson example asset with polygon that has holes in it]],
   Author = "OpenSpace Team",
   URL = "http://openspaceproject.com",
diff --git a/data/assets/examples/geojson/geojson_roverpath.asset b/data/assets/examples/geojson/geojson_roverpath.asset
index 97e7056f78..80db59ccf8 100644
--- a/data/assets/examples/geojson/geojson_roverpath.asset
+++ b/data/assets/examples/geojson/geojson_roverpath.asset
@@ -36,7 +36,6 @@ asset.export(ExampleRoverPath)
 
 asset.meta = {
   Name = "GeoJson Example - Rover path",
-  Version = "1.0",
   Description = [[GeoJson example asset that renderes a snapshot of the path of the
     Perseverance Rover on Mars. Data from: https://mars.nasa.gov/mars2020/mission/where-is-the-rover/]],
   Author = "OpenSpace Team",
diff --git a/data/assets/examples/geojson/geojson_toronto_neighborhoods.asset b/data/assets/examples/geojson/geojson_toronto_neighborhoods.asset
index 7ac4341ae4..86a7b8d986 100644
--- a/data/assets/examples/geojson/geojson_toronto_neighborhoods.asset
+++ b/data/assets/examples/geojson/geojson_toronto_neighborhoods.asset
@@ -37,7 +37,6 @@ asset.export(ExampleToronto)
 
 asset.meta = {
   Name = "GeoJson Example - Toronto neighborhoods",
-  Version = "1.0",
   Description = [[GeoJson example asset that shows the neighborhoods of the city Toronto,
     Canada, as polygons. Data source: https://handsondataviz.org/geojsonio.html]],
   Author = "OpenSpace Team",
diff --git a/data/assets/examples/globerotation.asset b/data/assets/examples/globerotation.asset
index 7db682dd71..d3a09f2d7a 100644
--- a/data/assets/examples/globerotation.asset
+++ b/data/assets/examples/globerotation.asset
@@ -60,7 +60,6 @@ asset.export(ExampleGlobeRotation)
 
 asset.meta = {
   Name = "GlobeRotation Example",
-  Version = "1.0",
   Description = [[An example that demonstrates how to load a 3D model from a geometry
     file, placing it on a planetary surface and rotate it to align with the surface
     normal using a "GlobeRotation" transform. Note that "GlobeTranslation" is needed to
diff --git a/data/assets/examples/globetranslation.asset b/data/assets/examples/globetranslation.asset
index 6f6e9a42f2..781294a543 100644
--- a/data/assets/examples/globetranslation.asset
+++ b/data/assets/examples/globetranslation.asset
@@ -78,7 +78,6 @@ asset.export(ExampleAdaptiveHeight)
 
 asset.meta = {
   Name = "GlobeTranslation Example",
-  Version = "1.0",
   Description = [[An example that demonstrates how to place an object on a planet surface
     using the "GlobeTranslation" transform. For the altitude, a fixed height can be used,
     or the height can be queried from the height map]],
diff --git a/data/assets/examples/grids.asset b/data/assets/examples/grids.asset
index 738b68dd64..66d7a91941 100644
--- a/data/assets/examples/grids.asset
+++ b/data/assets/examples/grids.asset
@@ -115,7 +115,6 @@ asset.export(BoxGrid)
 
 asset.meta = {
   Name = "Example Grids",
-  Version = "1.0",
   Description = [[Examples of different types of rendered grids.]],
   Author = "OpenSpace Team",
   URL = "http://openspaceproject.com",
diff --git a/data/assets/examples/joystickproperty.asset b/data/assets/examples/joystickproperty.asset
index 8ed0a3a36d..1d4db7ae37 100644
--- a/data/assets/examples/joystickproperty.asset
+++ b/data/assets/examples/joystickproperty.asset
@@ -98,7 +98,6 @@ end)
 
 asset.meta = {
   Name = "Joystick example",
-  Version = "1.0",
   Description = [[Example asset that binds a joystick to use for input and navigation.
     More info on the OpenSpace wiki page.]],
   Author = "OpenSpace Team",
diff --git a/data/assets/examples/nodeline.asset b/data/assets/examples/nodeline.asset
index 43bb436c77..e1f5887291 100644
--- a/data/assets/examples/nodeline.asset
+++ b/data/assets/examples/nodeline.asset
@@ -34,7 +34,6 @@ asset.export(RenderableNodeLineExample)
 
 asset.meta = {
   Name = "RenderableNodeLine Example asset",
-  Version = "1.0",
   Description = [[Example of a RenderableNodeLine, that can be used to draw an line
     between two scene graph nodes.]],
   Author = "OpenSpace Team",
diff --git a/data/assets/examples/primitives.asset b/data/assets/examples/primitives.asset
index 98f4aebad6..fb2c77c00e 100644
--- a/data/assets/examples/primitives.asset
+++ b/data/assets/examples/primitives.asset
@@ -61,7 +61,6 @@ asset.export(Ellipse)
 
 asset.meta = {
   Name = "Primitives Example",
-  Version = "1.0",
   Description = [[Examples of different simple rendered primitives, such as circles
     and ellipses.]],
   Author = "OpenSpace Team",
diff --git a/data/assets/examples/screenspacebrowser.asset b/data/assets/examples/screenspacebrowser.asset
index 5a1ceec89d..c378622c86 100644
--- a/data/assets/examples/screenspacebrowser.asset
+++ b/data/assets/examples/screenspacebrowser.asset
@@ -19,7 +19,6 @@ asset.export(Browser)
 
 asset.meta = {
   Name = "ScreenSpaceBrowser Example",
-  Version = "1.0",
   Description = [[Example of how to load and show a webpage in the rendering. The loaded
     webpage is shown in screen space.]],
   Author = "OpenSpace Team",
diff --git a/data/assets/examples/spheres.asset b/data/assets/examples/spheres.asset
index f217370437..1231b6dcdd 100644
--- a/data/assets/examples/spheres.asset
+++ b/data/assets/examples/spheres.asset
@@ -53,7 +53,6 @@ end
 
 asset.meta = {
   Name = "Spheres Example",
-  Version = "1.0",
   Description = [[Example showing how to render textured spheres in 3D space. Some
     coding logic is used to generate 9 spheres with different size and position.]],
   Author = "OpenSpace Team",
diff --git a/data/assets/examples/statemachine.asset b/data/assets/examples/statemachine.asset
index 174d572311..9d42e605c8 100644
--- a/data/assets/examples/statemachine.asset
+++ b/data/assets/examples/statemachine.asset
@@ -75,7 +75,6 @@ end)
 
 asset.meta = {
   Name = "State Machine",
-  Version = "1.0",
   Description = [[Example of how to create a state machine in OpenSpace, where each
     state and transition between states may trigger different behaviors.]],
   Author = "OpenSpace Team",
diff --git a/data/assets/examples/temperature_land_highres.asset b/data/assets/examples/temperature_land_highres.asset
index 18de8d6409..9222804dcf 100644
--- a/data/assets/examples/temperature_land_highres.asset
+++ b/data/assets/examples/temperature_land_highres.asset
@@ -61,7 +61,6 @@ asset.export("Folder", LayerFolder)
 
 asset.meta = {
   Name = "Climate Earth Layers",
-  Version = "1.0",
   Description = "ERA5 data",
   Author = "OpenSpace Team",
   URL = "http://openspaceproject.com",
diff --git a/data/assets/examples/urlsynchronization.asset b/data/assets/examples/urlsynchronization.asset
index 98bf9554dd..b432dfed2a 100644
--- a/data/assets/examples/urlsynchronization.asset
+++ b/data/assets/examples/urlsynchronization.asset
@@ -69,7 +69,6 @@ asset.resource({
 
 asset.meta = {
   Name = "UrlSynchronization",
-  Version = "1.0",
   Description = [[Example showing how to load resources (any type of data file) from
     online sources, using the UrlSynchronization resource type. These can then be used
     in other assets. See more information on resources on the OpenSpace wiki page.
diff --git a/data/assets/examples/video/videoglobe.asset b/data/assets/examples/video/videoglobe.asset
index e886d5dbbf..312fd6fac9 100644
--- a/data/assets/examples/video/videoglobe.asset
+++ b/data/assets/examples/video/videoglobe.asset
@@ -28,7 +28,6 @@ asset.export("layer", Layer)
 
 asset.meta = {
   Name = "Video Player on Globe Example",
-  Version = "1.0",
   Description = "An example asset that shows how to include a video on Earth.",
   Author = "OpenSpace Team",
   URL = "https://openspaceproject.com",
diff --git a/data/assets/examples/video/videoplane.asset b/data/assets/examples/video/videoplane.asset
index f4b102dc43..34f136bbd1 100644
--- a/data/assets/examples/video/videoplane.asset
+++ b/data/assets/examples/video/videoplane.asset
@@ -41,7 +41,6 @@ asset.export(Plane)
 
 asset.meta = {
   Name = "Video Plane Example",
-  Version = "1.0",
   Description = "An example asset that shows how to include a video on a plane.",
   Author = "OpenSpace Team",
   URL = "https://openspaceproject.com",
diff --git a/data/assets/examples/video/videoscreenspace.asset b/data/assets/examples/video/videoscreenspace.asset
index c114f26251..6fc11ec55c 100644
--- a/data/assets/examples/video/videoscreenspace.asset
+++ b/data/assets/examples/video/videoscreenspace.asset
@@ -23,7 +23,6 @@ asset.export(ScreenSpace)
 
 asset.meta = {
   Name = "ScreenSpace Video Example",
-  Version = "1.0",
   Description = "An example asset that shows how to include a video in screen space.",
   Author = "OpenSpace Team",
   URL = "https://openspaceproject.com",
diff --git a/data/assets/examples/video/videosphere.asset b/data/assets/examples/video/videosphere.asset
index 5155cbb2a7..6278994676 100644
--- a/data/assets/examples/video/videosphere.asset
+++ b/data/assets/examples/video/videosphere.asset
@@ -31,7 +31,6 @@ asset.export(Sphere)
 
 asset.meta = {
   Name = "Video Player on Sphere Example",
-  Version = "1.0",
   Description = "An example asset that shows how to include a video on a sphere.",
   Author = "OpenSpace Team",
   URL = "https://openspaceproject.com",
diff --git a/data/assets/examples/video/videostretchedtotime.asset b/data/assets/examples/video/videostretchedtotime.asset
index 553733069a..0d7a792466 100644
--- a/data/assets/examples/video/videostretchedtotime.asset
+++ b/data/assets/examples/video/videostretchedtotime.asset
@@ -32,7 +32,6 @@ asset.export(Layer)
 
 asset.meta = {
   Name = "Stretched Video Example",
-  Version = "1.0",
   Description = "This is a video mapped to the simulation time in OpenSpace.",
   Author = "OpenSpace Team",
   URL = "https://openspaceproject.com",
diff --git a/data/assets/modules/exoplanets/default_settings.asset b/data/assets/modules/exoplanets/default_settings.asset
index a41dac688a..3684d9742c 100644
--- a/data/assets/modules/exoplanets/default_settings.asset
+++ b/data/assets/modules/exoplanets/default_settings.asset
@@ -10,7 +10,6 @@ end)
 
 asset.meta = {
   Name = "Exoplanet Default Settings",
-  Version = "1.0",
   Description = "Some default settings related to the exoplanet module",
   Author = "OpenSpace Team",
   URL = "http://openspaceproject.com",
diff --git a/data/assets/modules/exoplanets/exoplanets_data.asset b/data/assets/modules/exoplanets/exoplanets_data.asset
index 040fe81dd3..7bf8632d35 100644
--- a/data/assets/modules/exoplanets/exoplanets_data.asset
+++ b/data/assets/modules/exoplanets/exoplanets_data.asset
@@ -33,7 +33,6 @@ asset.export("DataPath", dataPath)
 
 asset.meta = {
   Name = "Exoplanet Data",
-  Version = "6.0",
   Description = [[The data that is used for the exoplanet systems. The data has been
     derived from the 'Planetary Systems Composite Data' dataset from the NASA Exoplanet
     Archive.]],
diff --git a/data/assets/modules/exoplanets/exoplanets_textures.asset b/data/assets/modules/exoplanets/exoplanets_textures.asset
index b8d4c63589..39ea9938cf 100644
--- a/data/assets/modules/exoplanets/exoplanets_textures.asset
+++ b/data/assets/modules/exoplanets/exoplanets_textures.asset
@@ -62,7 +62,6 @@ asset.export("TexturesPath", texturesPath)
 
 asset.meta = {
   Name = "Exoplanet Textures",
-  Version = "2.0",
   Description = [[Adds all textures that are required for the exoplanet system
     visualizations]],
   Author = "OpenSpace Team",
diff --git a/data/assets/modules/skybrowser/default_settings.asset b/data/assets/modules/skybrowser/default_settings.asset
index ed4ac403b5..ceb952e9ec 100644
--- a/data/assets/modules/skybrowser/default_settings.asset
+++ b/data/assets/modules/skybrowser/default_settings.asset
@@ -8,7 +8,6 @@ end)
 
 asset.meta = {
   Name = "SkyBrowser Module Default Settings",
-  Version = "1.0",
   Description = "Some default settings related to the SkyBrowser module",
   Author = "OpenSpace Team",
   URL = "http://openspaceproject.com",
diff --git a/data/assets/modules/skybrowser/hover_circle.asset b/data/assets/modules/skybrowser/hover_circle.asset
index 80f19603b8..2ee4e00790 100644
--- a/data/assets/modules/skybrowser/hover_circle.asset
+++ b/data/assets/modules/skybrowser/hover_circle.asset
@@ -44,7 +44,6 @@ asset.export(circle)
 
 asset.meta = {
   Name = "SkyBrowser Hover Circle",
-  Version = "1.0",
   Description = [[Includes a circular marker that shows the position on the night sky
     of the object hovered in the sky browser UI]],
   Author = "OpenSpace Team",
diff --git a/data/assets/modules/touch/default_settings.asset b/data/assets/modules/touch/default_settings.asset
index 57a74580b5..fed71f42d6 100644
--- a/data/assets/modules/touch/default_settings.asset
+++ b/data/assets/modules/touch/default_settings.asset
@@ -18,7 +18,6 @@ end)
 
 asset.meta = {
   Name = "Touch Module Default Settings",
-  Version = "1.0",
   Description = "Some default settings related to the touch module",
   Author = "OpenSpace Team",
   URL = "http://openspaceproject.com",
diff --git a/data/assets/nightsky/altaz.asset b/data/assets/nightsky/altaz.asset
index 9aea1c2449..6a2fd04120 100644
--- a/data/assets/nightsky/altaz.asset
+++ b/data/assets/nightsky/altaz.asset
@@ -128,7 +128,6 @@ asset.export("ToggleAltaz", ToggleAltaz.Identifier)
 
 asset.meta = {
   Name = "Altitude/Azimuth Grid",
-  Version = "1.0",
   Description = [[A local Altitude/Azimuth grid centered around your position on a
     planetary surface. The asset also includes some actions to toggle, hide or
     show the grid.]],
diff --git a/data/assets/nightsky/cardinal_directions.asset b/data/assets/nightsky/cardinal_directions.asset
index 6f342cd7a1..50d2487c15 100644
--- a/data/assets/nightsky/cardinal_directions.asset
+++ b/data/assets/nightsky/cardinal_directions.asset
@@ -160,7 +160,6 @@ asset.export("HideNesw", HideNesw.Identifier)
 
 asset.meta = {
   Name = "Cardinal Directions",
-  Version = "1.0",
   Description = [[Adds a sphere showing the cardinal directions, that follows the camera
     around when navigating on the planet surface. It also includes actions to change the
     texture of the sphere to different styles.
diff --git a/data/assets/nightsky/ecliptic_band.asset b/data/assets/nightsky/ecliptic_band.asset
index cfa8527cfe..1f0a7d93a5 100644
--- a/data/assets/nightsky/ecliptic_band.asset
+++ b/data/assets/nightsky/ecliptic_band.asset
@@ -164,7 +164,6 @@ asset.export("ToggleEclipticBand", ToggleEclipticBand.Identifier)
 
 asset.meta = {
   Name = "Ecliptic Band/Line",
-  Version = "1.0",
   Description = [[A line and band representation of the Ecliptic plane, including actions
     to toggle, hide and show each of them.]],
   Author = "OpenSpace Team",
diff --git a/data/assets/nightsky/equatorial_band.asset b/data/assets/nightsky/equatorial_band.asset
index 8a71079761..6b0084aad5 100644
--- a/data/assets/nightsky/equatorial_band.asset
+++ b/data/assets/nightsky/equatorial_band.asset
@@ -92,7 +92,6 @@ asset.export("ToggleEquatorialLine", ToggleEquatorialLine.Identifier)
 
 asset.meta = {
   Name = "Equatorial Line",
-  Version = "1.0",
   Description = [[A line representation of the Equatorial plane, including actions
     to toggle, hide and show it.]],
   Author = "OpenSpace Team",
diff --git a/data/assets/nightsky/galactic_band.asset b/data/assets/nightsky/galactic_band.asset
index fbe3615454..6d1838cc3d 100644
--- a/data/assets/nightsky/galactic_band.asset
+++ b/data/assets/nightsky/galactic_band.asset
@@ -78,7 +78,6 @@ asset.export("HideGalacticBand", HideGalacticBand.Identifier)
 
 asset.meta = {
   Name = "Galactic Line",
-  Version = "1.0",
   Description = [[A line representation of the Galactic Equator plane, including actions
     to toggle, hide and show it.]],
   Author = "OpenSpace Team",
diff --git a/data/assets/nightsky/light_pollution.asset b/data/assets/nightsky/light_pollution.asset
index 2da8c7f5b1..84b2e6a68d 100644
--- a/data/assets/nightsky/light_pollution.asset
+++ b/data/assets/nightsky/light_pollution.asset
@@ -257,7 +257,6 @@ asset.export("UndoLightPollution", UndoLightPollution.Identifier)
 
 asset.meta = {
   Name = "Light Pollution",
-  Version = "1.0",
   Description = [[Includes a sphere used to simulate the effect of light pollution on
     the night sky, and actions to set the desired level of pollution (with a scale
     from 1-9).]],
diff --git a/data/assets/nightsky/meridian.asset b/data/assets/nightsky/meridian.asset
index 0c3e3c31eb..79673acb00 100644
--- a/data/assets/nightsky/meridian.asset
+++ b/data/assets/nightsky/meridian.asset
@@ -123,7 +123,6 @@ asset.export("ToggleMeridian", ToggleMeridian.Identifier)
 
 asset.meta = {
   Name = "Meridian",
-  Version = "1.0",
   Description = [[A line representation of the Local Meridian, including actions
     to toggle, hide and show it.]],
   Author = "OpenSpace Team",
diff --git a/data/assets/nightsky/nightsky.asset b/data/assets/nightsky/nightsky.asset
index 2bca47efa6..7805b575d0 100644
--- a/data/assets/nightsky/nightsky.asset
+++ b/data/assets/nightsky/nightsky.asset
@@ -13,7 +13,6 @@ asset.require("actions/nightsky/daytime", false)
 
 asset.meta = {
   Name = "Night Sky Assets",
-  Version = "1.0",
   Description = [[A collection of assets useful for studying the night sky.]],
   Author = "OpenSpace Team",
   URL = "http://openspaceproject.com",
diff --git a/data/assets/nightsky/planets.asset b/data/assets/nightsky/planets.asset
index 658b0ae4d5..7830ac0d3d 100644
--- a/data/assets/nightsky/planets.asset
+++ b/data/assets/nightsky/planets.asset
@@ -210,7 +210,6 @@ asset.export("ToggleNightSkyPlanets", ToggleNightSkyPlanets.Identifier)
 
 asset.meta = {
   Name = "Night Sky Planets",
-  Version = "1.0",
   Description = [[A collection of night sky versions of the planets Mercury, Venus,
     Mars, Jupiter and Saturn, including actions to toggle, hide and show them.]],
   Author = "OpenSpace Team",
diff --git a/data/assets/nightsky/zenith.asset b/data/assets/nightsky/zenith.asset
index d510f249d5..4cdfd4acca 100644
--- a/data/assets/nightsky/zenith.asset
+++ b/data/assets/nightsky/zenith.asset
@@ -131,7 +131,6 @@ asset.export("ToggleZenith", ToggleZenith.Identifier)
 
 asset.meta = {
   Name = "Zenith",
-  Version = "1.0",
   Description = [[A dot representation of the Local Zenith (based on the current
     camera positon), including actions to toggle, hide and show it.]],
   Author = "OpenSpace Team",
diff --git a/data/assets/scene/digitaluniverse/2dF.asset b/data/assets/scene/digitaluniverse/2dF.asset
index ff2b40703c..34602de58f 100644
--- a/data/assets/scene/digitaluniverse/2dF.asset
+++ b/data/assets/scene/digitaluniverse/2dF.asset
@@ -73,7 +73,6 @@ asset.export(Object)
 
 asset.meta = {
   Name = "2dF Galaxies",
-  Version = "3.0",
   Description = "Digital Universe asset for the The Two-degree Field (2dF) Survey",
   Author = "Brian Abbott (AMNH), Eric Gawiser (Rutgers U)",
   URL = "https://www.amnh.org/research/hayden-planetarium/digital-universe",
diff --git a/data/assets/scene/digitaluniverse/2mass.asset b/data/assets/scene/digitaluniverse/2mass.asset
index 2dc58b4cfe..b8ec2ba045 100644
--- a/data/assets/scene/digitaluniverse/2mass.asset
+++ b/data/assets/scene/digitaluniverse/2mass.asset
@@ -68,7 +68,6 @@ asset.export(Object)
 
 asset.meta = {
   Name = "2MASS Galaxies",
-  Version = "2.0",
   Description = "Digital Universe asset for the Two Micron All-Sky Survey (2MASS) survey",
   Author = "Brian Abbott (AMNH)",
   URL = "https://www.amnh.org/research/hayden-planetarium/digital-universe",
diff --git a/data/assets/scene/digitaluniverse/6dF.asset b/data/assets/scene/digitaluniverse/6dF.asset
index 248971a60d..c1de5b1b9e 100644
--- a/data/assets/scene/digitaluniverse/6dF.asset
+++ b/data/assets/scene/digitaluniverse/6dF.asset
@@ -72,7 +72,6 @@ asset.export(Object)
 
 asset.meta = {
   Name = "6dF Galaxies",
-  Version = "3.0",
   Description = "Digital Universe asset for The Six-degree Field (6dF) Galaxy Survey",
   Author = "Brian Abbott (AMNH)",
   URL = "https://www.amnh.org/research/hayden-planetarium/digital-universe",
diff --git a/data/assets/scene/digitaluniverse/abell.asset b/data/assets/scene/digitaluniverse/abell.asset
index 793ff0fcb6..51d563b570 100644
--- a/data/assets/scene/digitaluniverse/abell.asset
+++ b/data/assets/scene/digitaluniverse/abell.asset
@@ -84,7 +84,6 @@ asset.export(Object)
 
 asset.meta = {
   Name = "Abell Galaxy Clusters",
-  Version = "3.0",
   Description = "Digital Universe asset for The Abell catalog",
   Author = "Stuart Levy (NCSA/UIUC), Brian Abbott (AMNH)",
   URL = "https://www.amnh.org/research/hayden-planetarium/digital-universe",
diff --git a/data/assets/scene/digitaluniverse/alternatestarlabels.asset b/data/assets/scene/digitaluniverse/alternatestarlabels.asset
index 6ae6004962..7d14086700 100644
--- a/data/assets/scene/digitaluniverse/alternatestarlabels.asset
+++ b/data/assets/scene/digitaluniverse/alternatestarlabels.asset
@@ -50,7 +50,6 @@ asset.export(Object)
 
 asset.meta = {
   Name = "Stars Labels - Alternate",
-  Version = "2.0",
   Description = "Digital Universe asset for alternate start labels",
   Author = "Brian Abbott (AMNH)",
   URL = "https://www.amnh.org/research/hayden-planetarium/digital-universe",
diff --git a/data/assets/scene/digitaluniverse/backgroundradiation.asset b/data/assets/scene/digitaluniverse/backgroundradiation.asset
index efd33fb458..c92e587606 100644
--- a/data/assets/scene/digitaluniverse/backgroundradiation.asset
+++ b/data/assets/scene/digitaluniverse/backgroundradiation.asset
@@ -139,7 +139,6 @@ asset.export(HAlpha)
 
 asset.meta = {
   Name = "Background Radiation",
-  Version = "2.1",
   Description = [[Various AllSky images for the Milky Way and observable Universe.
     Included: Wilkinson Microwave Anisotropy Probe (WMAP), Cosmic Background Explorer,
     Planck, and H Alpha <br><br> Data Reference: Planck/ESA and the Planck
diff --git a/data/assets/scene/digitaluniverse/backgroundradiation_multiverse.asset b/data/assets/scene/digitaluniverse/backgroundradiation_multiverse.asset
index 8c9e729340..7af1e3f312 100644
--- a/data/assets/scene/digitaluniverse/backgroundradiation_multiverse.asset
+++ b/data/assets/scene/digitaluniverse/backgroundradiation_multiverse.asset
@@ -146,7 +146,6 @@ asset.export(PlanckMultiverse4)
 
 asset.meta = {
   Name = "Multiverse Background Radiation",
-  Version = "2.1",
   Description = [[Non-physical representation of the location of hypothetical cosmic
     microwave background radiation images how they would be observed from other locations
     in the universe. <br> This is not a measured dataset]],
diff --git a/data/assets/scene/digitaluniverse/clusters.asset b/data/assets/scene/digitaluniverse/clusters.asset
index 96ff69dad6..7b8e34a08d 100644
--- a/data/assets/scene/digitaluniverse/clusters.asset
+++ b/data/assets/scene/digitaluniverse/clusters.asset
@@ -57,7 +57,6 @@ asset.export(Object)
 
 asset.meta = {
   Name = "Galaxy Clusters Labels",
-  Version = "2.0",
   Description = "Digital Universe asset for Galaxy Clusters",
   Author = "Brian Abbott (AMNH)",
   URL = "https://www.amnh.org/research/hayden-planetarium/digital-universe",
diff --git a/data/assets/scene/digitaluniverse/constellationbounds.asset b/data/assets/scene/digitaluniverse/constellationbounds.asset
index 39d9910e07..1858cdd07a 100644
--- a/data/assets/scene/digitaluniverse/constellationbounds.asset
+++ b/data/assets/scene/digitaluniverse/constellationbounds.asset
@@ -57,7 +57,6 @@ asset.export(Object)
 
 asset.meta = {
   Name = "Constellation Bounds",
-  Version = "1.2",
   Description = [[DU asset providing a Spherical mesh dividing the sky into regions that
     fit the constellations]],
   Author = "Brian Abbott (AMNH)",
diff --git a/data/assets/scene/digitaluniverse/constellations.asset b/data/assets/scene/digitaluniverse/constellations.asset
index a0806e714c..2258107161 100644
--- a/data/assets/scene/digitaluniverse/constellations.asset
+++ b/data/assets/scene/digitaluniverse/constellations.asset
@@ -164,7 +164,6 @@ asset.export("ShowZodiacs", ShowZodiacs.Identifier)
 
 asset.meta = {
   Name = "Constellations",
-  Version = "1.3",
   Description = "Digital Universe asset for constellation lines",
   Author = "Brian Abbott (AMNH)",
   URL = "https://www.amnh.org/research/hayden-planetarium/digital-universe",
diff --git a/data/assets/scene/digitaluniverse/deepsky.asset b/data/assets/scene/digitaluniverse/deepsky.asset
index cb4bcf2012..f7d75e7f3e 100644
--- a/data/assets/scene/digitaluniverse/deepsky.asset
+++ b/data/assets/scene/digitaluniverse/deepsky.asset
@@ -119,7 +119,6 @@ asset.export(DeepSkyObjectsImages)
 
 asset.meta = {
   Name = "Deep Sky Objects Images",
-  Version = "3.0",
   Description = "Digital Universe asset for Deep Sky Objects and their Images",
   Author = "Nate Greenstein, Matt Everhart, Brian Abbott (AMNH)",
   URL = "https://www.amnh.org/research/hayden-planetarium/digital-universe",
diff --git a/data/assets/scene/digitaluniverse/digitaluniverse.asset b/data/assets/scene/digitaluniverse/digitaluniverse.asset
index 8b929314bd..2c7c8ef4dc 100644
--- a/data/assets/scene/digitaluniverse/digitaluniverse.asset
+++ b/data/assets/scene/digitaluniverse/digitaluniverse.asset
@@ -39,7 +39,6 @@ asset.require("./voids")
 
 asset.meta = {
   Name = "Digital Universe",
-  Version = "1.0",
   Description = [[This asset is a meta asset, containing all the assets from the AMNH
     Digital Universe]],
   Author = "Brian Abbott (AMNH)",
diff --git a/data/assets/scene/digitaluniverse/dwarfs.asset b/data/assets/scene/digitaluniverse/dwarfs.asset
index b45473517d..4d7d93caf0 100644
--- a/data/assets/scene/digitaluniverse/dwarfs.asset
+++ b/data/assets/scene/digitaluniverse/dwarfs.asset
@@ -84,7 +84,6 @@ asset.export(Object)
 
 asset.meta = {
   Name = "Brown Dwarfs",
-  Version = "3.0",
   Description = "Digital Universe asset for Brown Dwarfs",
   Author = "Brian Abbott (AMNH)",
   URL = "https://www.amnh.org/research/hayden-planetarium/digital-universe",
diff --git a/data/assets/scene/digitaluniverse/exoplanets.asset b/data/assets/scene/digitaluniverse/exoplanets.asset
index 43e604ed61..933465dbdb 100644
--- a/data/assets/scene/digitaluniverse/exoplanets.asset
+++ b/data/assets/scene/digitaluniverse/exoplanets.asset
@@ -65,7 +65,6 @@ asset.export(Object)
 
 asset.meta = {
   Name = "Exoplanets",
-  Version = "2.0",
   Description = "Digital Universe asset for Exoplanets",
   Author = "Brian Abbott (AMNH)",
   URL = "https://www.amnh.org/research/hayden-planetarium/digital-universe",
diff --git a/data/assets/scene/digitaluniverse/exoplanets_candidates.asset b/data/assets/scene/digitaluniverse/exoplanets_candidates.asset
index 6c95b2e68d..abca6cf097 100644
--- a/data/assets/scene/digitaluniverse/exoplanets_candidates.asset
+++ b/data/assets/scene/digitaluniverse/exoplanets_candidates.asset
@@ -64,7 +64,6 @@ asset.export(Object)
 
 asset.meta = {
   Name = "Planetary Candidates",
-  Version = "3.0",
   Description = "Digital Universe asset for Planetary Candidates",
   Author = "Brian Abbott, Emily Rice, and Jason No (AMNH)",
   URL = "https://www.amnh.org/research/hayden-planetarium/digital-universe",
diff --git a/data/assets/scene/digitaluniverse/globularclusters.asset b/data/assets/scene/digitaluniverse/globularclusters.asset
index 2ce9c05cd5..ccc07cc910 100644
--- a/data/assets/scene/digitaluniverse/globularclusters.asset
+++ b/data/assets/scene/digitaluniverse/globularclusters.asset
@@ -72,7 +72,6 @@ asset.export(Object)
 
 asset.meta = {
   Name = "Globular Clusters",
-  Version = "3.0",
   Description = [[Census: 157 globular clusters. DU Version 2.6. Globular star clusters
     are gravitationally bound groups of 100,000 to 1 million stars. They are compact,
     spherical "balls" of stars with very high stellar densities in their centers (stars
diff --git a/data/assets/scene/digitaluniverse/grids.asset b/data/assets/scene/digitaluniverse/grids.asset
index 413694058f..56ae14703a 100644
--- a/data/assets/scene/digitaluniverse/grids.asset
+++ b/data/assets/scene/digitaluniverse/grids.asset
@@ -696,7 +696,6 @@ asset.export(Plane20Gly)
 
 asset.meta = {
   Name = "Grids",
-  Version = "3.0",
   Description = [[Various grids for showing size reference. Included: 10,000 light year
     grid, 10 light year grid, 20 billion light year grid, 10 million light year grid,
     100 light year grid, 100 million light year grid, Ecliptic Coordinate Sphere
diff --git a/data/assets/scene/digitaluniverse/groups.asset b/data/assets/scene/digitaluniverse/groups.asset
index a93d3608f4..6039b93fca 100644
--- a/data/assets/scene/digitaluniverse/groups.asset
+++ b/data/assets/scene/digitaluniverse/groups.asset
@@ -56,7 +56,6 @@ asset.export(Object)
 
 asset.meta = {
   Name = "Galaxy Group Labels",
-  Version = "2.0",
   Author = "Brian Abbott (AMNH)",
   Description = "Digital Universe asset for Galaxy Groups",
   URL = "https://www.amnh.org/research/hayden-planetarium/digital-universe",
diff --git a/data/assets/scene/digitaluniverse/h2regions.asset b/data/assets/scene/digitaluniverse/h2regions.asset
index f704d48757..000ca7c6f1 100644
--- a/data/assets/scene/digitaluniverse/h2regions.asset
+++ b/data/assets/scene/digitaluniverse/h2regions.asset
@@ -70,7 +70,6 @@ asset.export(Object)
 
 asset.meta = {
   Name = "HII Regions",
-  Version = "2.0",
   Description = "Digital Universe asset for HII Regions",
   Author = "Carter Emmart, Brian Abbott (AMNH)",
   URL = "https://www.amnh.org/research/hayden-planetarium/digital-universe",
diff --git a/data/assets/scene/digitaluniverse/hdf.asset b/data/assets/scene/digitaluniverse/hdf.asset
index 9598b46ba6..73df37d79d 100644
--- a/data/assets/scene/digitaluniverse/hdf.asset
+++ b/data/assets/scene/digitaluniverse/hdf.asset
@@ -69,7 +69,6 @@ asset.export(Object)
 
 asset.meta = {
   Name = "Hubble Ultra Deep Field",
-  Version = "2.0",
   Description = "Hubble Ultra Deep Field galaxy survey",
   Author = "Frank Summers (STScI), Brian Abbott (AMNH)",
   URL = "http://www.haydenplanetarium.org/universe",
diff --git a/data/assets/scene/digitaluniverse/localdwarfs.asset b/data/assets/scene/digitaluniverse/localdwarfs.asset
index a9a9022bd6..23ad7fadb8 100644
--- a/data/assets/scene/digitaluniverse/localdwarfs.asset
+++ b/data/assets/scene/digitaluniverse/localdwarfs.asset
@@ -76,7 +76,6 @@ asset.export(Object)
 
 asset.meta = {
   Name = "Local Group",
-  Version = "3.0",
   Description = "Digital Universe asset for the Local Goup",
   Author = "Brian Abbott (AMNH)",
   URL = "https://www.amnh.org/research/hayden-planetarium/digital-universe",
diff --git a/data/assets/scene/digitaluniverse/milkyway.asset b/data/assets/scene/digitaluniverse/milkyway.asset
index 1cb7ea376f..64ff019b9a 100644
--- a/data/assets/scene/digitaluniverse/milkyway.asset
+++ b/data/assets/scene/digitaluniverse/milkyway.asset
@@ -66,7 +66,6 @@ asset.export(Object)
 
 asset.meta = {
   Name = "MilkyWay Galaxy",
-  Version = "3.0",
   Description = [[Digital Universe asset containt 2D image of the MilkyWay. For
     extragalactic viewing]],
   Author = "Brian Abbott, Carter Emmart (AMNH)",
diff --git a/data/assets/scene/digitaluniverse/milkyway_arm_labels.asset b/data/assets/scene/digitaluniverse/milkyway_arm_labels.asset
index 63634bd855..d55bc511a7 100644
--- a/data/assets/scene/digitaluniverse/milkyway_arm_labels.asset
+++ b/data/assets/scene/digitaluniverse/milkyway_arm_labels.asset
@@ -64,7 +64,6 @@ asset.export(Object)
 
 asset.meta = {
   Name = "Milky Way Arms Labels",
-  Version = "2.0",
   Description = "Image with arm labels for the Milky Way galaxy",
   Author = "Brian Abbott (AMNH)",
   URL = "https://www.amnh.org/research/hayden-planetarium/digital-universe",
diff --git a/data/assets/scene/digitaluniverse/milkyway_label.asset b/data/assets/scene/digitaluniverse/milkyway_label.asset
index 19088fdd44..68b6b07559 100644
--- a/data/assets/scene/digitaluniverse/milkyway_label.asset
+++ b/data/assets/scene/digitaluniverse/milkyway_label.asset
@@ -50,7 +50,6 @@ asset.export(HomeLabel)
 
 asset.meta = {
   Name = "Home Label",
-  Version = "2.0",
   Description = "Label for the Milky Way titled 'Home', sided for the galactic level",
   Author = "OpenSpace Team",
   URL = "http://openspaceproject.com",
diff --git a/data/assets/scene/digitaluniverse/milkyway_sphere.asset b/data/assets/scene/digitaluniverse/milkyway_sphere.asset
index ff91649fc0..3bb9723354 100644
--- a/data/assets/scene/digitaluniverse/milkyway_sphere.asset
+++ b/data/assets/scene/digitaluniverse/milkyway_sphere.asset
@@ -50,7 +50,6 @@ asset.export(Sphere)
 
 asset.meta = {
   Name = "Milky Way Galaxy Sphere",
-  Version = "2.1",
   Description = "All sky image of the Milky Way",
   Author = "OpenSpace Team",
   URL = "http://openspaceproject.com",
diff --git a/data/assets/scene/digitaluniverse/obassociations.asset b/data/assets/scene/digitaluniverse/obassociations.asset
index 3c26a82179..c8ceffb51d 100644
--- a/data/assets/scene/digitaluniverse/obassociations.asset
+++ b/data/assets/scene/digitaluniverse/obassociations.asset
@@ -78,7 +78,6 @@ asset.export(Object)
 
 asset.meta = {
   Name = "OB Associations",
-  Version = "3.0",
   Description = "Digital Universe asset for OB Associations",
   Author = "Brian Abbott (AMNH)",
   URL = "https://www.amnh.org/research/hayden-planetarium/digital-universe",
diff --git a/data/assets/scene/digitaluniverse/openclusters.asset b/data/assets/scene/digitaluniverse/openclusters.asset
index d7a4e2a551..6069a90547 100644
--- a/data/assets/scene/digitaluniverse/openclusters.asset
+++ b/data/assets/scene/digitaluniverse/openclusters.asset
@@ -71,7 +71,6 @@ asset.export(Object)
 
 asset.meta = {
   Name = "Open Star Clusters",
-  Version = "3.0",
   Description = "Digital Universe asset for Open Star Clusters",
   Author = "Brian Abbott (AMNH)",
   URL = "https://www.amnh.org/research/hayden-planetarium/digital-universe",
diff --git a/data/assets/scene/digitaluniverse/planetarynebulae.asset b/data/assets/scene/digitaluniverse/planetarynebulae.asset
index f9638d1392..09b64c8215 100644
--- a/data/assets/scene/digitaluniverse/planetarynebulae.asset
+++ b/data/assets/scene/digitaluniverse/planetarynebulae.asset
@@ -67,7 +67,6 @@ asset.export(Object)
 
 asset.meta = {
   Name = "Planetary Nebulae",
-  Version = "3.0",
   Description = "Digital Universe asset for Planetary Nebulae",
   Author = "Brian Abbott (AMNH)",
   URL = "https://www.amnh.org/research/hayden-planetarium/digital-universe",
diff --git a/data/assets/scene/digitaluniverse/pulsars.asset b/data/assets/scene/digitaluniverse/pulsars.asset
index fd8a4edee1..6e40f56363 100644
--- a/data/assets/scene/digitaluniverse/pulsars.asset
+++ b/data/assets/scene/digitaluniverse/pulsars.asset
@@ -71,7 +71,6 @@ asset.export(Object)
 
 asset.meta = {
   Name = "Pulsars",
-  Version = "3.0",
   Description = "Digital Universe asset for Pulsars",
   Author = "Brian Abbott (AMNH)",
   URL = "https://www.amnh.org/research/hayden-planetarium/digital-universe",
diff --git a/data/assets/scene/digitaluniverse/quasars.asset b/data/assets/scene/digitaluniverse/quasars.asset
index 0594ad74c4..7815c2acdb 100644
--- a/data/assets/scene/digitaluniverse/quasars.asset
+++ b/data/assets/scene/digitaluniverse/quasars.asset
@@ -81,7 +81,6 @@ asset.export(Object)
 
 asset.meta = {
   Name = "Quasars",
-  Version = "3.0",
   Description = "Digital Universe asset for Quasars",
   Author = "Brian Abbott (AMNH)",
   URL = "https://www.amnh.org/research/hayden-planetarium/digital-universe",
diff --git a/data/assets/scene/digitaluniverse/sdss.asset b/data/assets/scene/digitaluniverse/sdss.asset
index cb3103e1d1..7bd45ca637 100644
--- a/data/assets/scene/digitaluniverse/sdss.asset
+++ b/data/assets/scene/digitaluniverse/sdss.asset
@@ -79,7 +79,6 @@ asset.export(Object)
 
 asset.meta = {
   Name = "Sloan Digital Sky Survey",
-  Version = "3.0",
   Description = "Digital Universe asset for The Sloan Digital Sky Survey (SDSS)",
   Author = "Brian Abbott (AMNH)",
   URL = "https://www.amnh.org/research/hayden-planetarium/digital-universe",
diff --git a/data/assets/scene/digitaluniverse/starlabels.asset b/data/assets/scene/digitaluniverse/starlabels.asset
index 1babd0160f..85c3d64c0e 100644
--- a/data/assets/scene/digitaluniverse/starlabels.asset
+++ b/data/assets/scene/digitaluniverse/starlabels.asset
@@ -44,7 +44,6 @@ asset.export(Object)
 
 asset.meta = {
   Name = "Star Labels",
-  Version = "3.0",
   Description = "Digital Universe asset for labels of the stars",
   Author = "Brian Abbott (AMNH)",
   URL = "https://www.amnh.org/research/hayden-planetarium/digital-universe",
diff --git a/data/assets/scene/digitaluniverse/starorbits.asset b/data/assets/scene/digitaluniverse/starorbits.asset
index a233d14146..ecf8a63b95 100644
--- a/data/assets/scene/digitaluniverse/starorbits.asset
+++ b/data/assets/scene/digitaluniverse/starorbits.asset
@@ -197,7 +197,6 @@ asset.export(PM_J13420Orbit)
 
 asset.meta = {
   Name = "Star Orbits",
-  Version = "1.1",
   Description = [[Select Star Orbital paths that delineate their trajectory around the
     Milky Way over 1 billion years into the future. Included: Sun, Barnards, Kapteyns,
     Lacaille 9352, LSR1826+3014, LSRJ0822+1700, PM_J13420-3415. <br><br> Data
diff --git a/data/assets/scene/digitaluniverse/stars.asset b/data/assets/scene/digitaluniverse/stars.asset
index 654c11d2eb..0d5ff15e04 100644
--- a/data/assets/scene/digitaluniverse/stars.asset
+++ b/data/assets/scene/digitaluniverse/stars.asset
@@ -130,7 +130,6 @@ asset.export(SunStar)
 
 asset.meta = {
   Name = "Stars",
-  Version = "3.0",
   Description = "Digital Universe asset for the stars",
   Author = "Brian Abbott (AMNH)",
   URL = "https://www.amnh.org/research/hayden-planetarium/digital-universe",
diff --git a/data/assets/scene/digitaluniverse/superclusters.asset b/data/assets/scene/digitaluniverse/superclusters.asset
index 4ec85bc0a0..7899d631bd 100644
--- a/data/assets/scene/digitaluniverse/superclusters.asset
+++ b/data/assets/scene/digitaluniverse/superclusters.asset
@@ -66,7 +66,6 @@ asset.export(Object)
 
 asset.meta = {
   Name = "Galaxy Superclusters",
-  Version = "3.0",
   Description = "Digital Universe asset for Galaxy Superclusters",
   Author = "Brian Abbott (AMNH)",
   URL = "https://www.amnh.org/research/hayden-planetarium/digital-universe",
diff --git a/data/assets/scene/digitaluniverse/supernovaremnants.asset b/data/assets/scene/digitaluniverse/supernovaremnants.asset
index 6a6c8816a8..b44c695f32 100644
--- a/data/assets/scene/digitaluniverse/supernovaremnants.asset
+++ b/data/assets/scene/digitaluniverse/supernovaremnants.asset
@@ -63,7 +63,6 @@ asset.export(Object)
 
 asset.meta = {
   Name = "Supernova Remnants",
-  Version = "3.0",
   Description = "Digital Universe asset for Supernova Remnants",
   Author = "Brian Abbott (AMNH)",
   URL = "https://www.amnh.org/research/hayden-planetarium/digital-universe",
diff --git a/data/assets/scene/digitaluniverse/tully.asset b/data/assets/scene/digitaluniverse/tully.asset
index 855f3bb862..f9fd6daa1d 100644
--- a/data/assets/scene/digitaluniverse/tully.asset
+++ b/data/assets/scene/digitaluniverse/tully.asset
@@ -143,7 +143,6 @@ asset.export(TullyGalaxiesImages)
 
 asset.meta = {
   Name = "Tully Galaxies",
-  Version = "5.0",
   Description = [[Digital Universe asset for Tully Galaxies, including point cloud and
     images]],
   Author = "Stuart Levy (NCSA/UIUC), Brian Abbott (AMNH)",
diff --git a/data/assets/scene/digitaluniverse/voids.asset b/data/assets/scene/digitaluniverse/voids.asset
index 40db6e91b0..6493e3a500 100644
--- a/data/assets/scene/digitaluniverse/voids.asset
+++ b/data/assets/scene/digitaluniverse/voids.asset
@@ -54,7 +54,6 @@ asset.export(Object)
 
 asset.meta = {
   Name = "Voids",
-  Version = "3.0",
   Author = "Brian Abbott (AMNH)",
   Description = "Digital Universe asset for Cosmic voids",
   URL = "https://www.amnh.org/research/hayden-planetarium/digital-universe",
diff --git a/data/assets/scene/milkyway/constellations/big_dipper.asset b/data/assets/scene/milkyway/constellations/big_dipper.asset
index a122190dcd..1df644491b 100644
--- a/data/assets/scene/milkyway/constellations/big_dipper.asset
+++ b/data/assets/scene/milkyway/constellations/big_dipper.asset
@@ -50,7 +50,6 @@ asset.export(BigDipper)
 
 asset.meta = {
   Name = "Big Dipper",
-  Version = "1.0",
   Description = "Constellation lines for the Big Dipper",
   Author = "OpenSpace Team",
   URL = "https://www.openspaceproject.com",
diff --git a/data/assets/scene/milkyway/constellations/constellation_art.asset b/data/assets/scene/milkyway/constellations/constellation_art.asset
index 10a7785267..937e5ebd7c 100644
--- a/data/assets/scene/milkyway/constellations/constellation_art.asset
+++ b/data/assets/scene/milkyway/constellations/constellation_art.asset
@@ -194,7 +194,6 @@ asset.export("HideZodiacArt", HideZodiacArt.Identifier)
 
 asset.meta = {
   Name = "Constellation Images",
-  Version = "1.2",
   Description = "Artistic images depicting the constellations",
   Author = "James Hedberg",
   URL = "http://jameshedberg.com",
diff --git a/data/assets/scene/milkyway/constellations/constellation_extrakeybinds.asset b/data/assets/scene/milkyway/constellations/constellation_extrakeybinds.asset
index 9ff4819b07..08030f13ca 100644
--- a/data/assets/scene/milkyway/constellations/constellation_extrakeybinds.asset
+++ b/data/assets/scene/milkyway/constellations/constellation_extrakeybinds.asset
@@ -16,7 +16,6 @@ end)
 
 asset.meta = {
   Name = "Constellation Image Extra Keybinds",
-  Version = "1.0",
   Description = "Artistic images depicting the constellations",
   Author = "James Hedberg",
   URL = "http://jameshedberg.com",
diff --git a/data/assets/scene/milkyway/constellations/constellation_keybinds.asset b/data/assets/scene/milkyway/constellations/constellation_keybinds.asset
index d586440b3d..95066317ce 100644
--- a/data/assets/scene/milkyway/constellations/constellation_keybinds.asset
+++ b/data/assets/scene/milkyway/constellations/constellation_keybinds.asset
@@ -18,7 +18,6 @@ end)
 
 asset.meta = {
   Name = "Constellation Image Keybinds",
-  Version = "1.0",
   Description = "Artistic images depicting the constellations",
   Author = "James Hedberg",
   URL = "http://jameshedberg.com",
diff --git a/data/assets/scene/milkyway/gaia/apogee.asset b/data/assets/scene/milkyway/gaia/apogee.asset
index 3b2429b10e..9aee4bcc6b 100644
--- a/data/assets/scene/milkyway/gaia/apogee.asset
+++ b/data/assets/scene/milkyway/gaia/apogee.asset
@@ -72,7 +72,6 @@ asset.export(GaiaAbundanceApogee)
 
 asset.meta = {
   Name = "Gaia Abundance Apogee",
-  Version = "1.0",
   Description = "This asset contains a RenderableStars dataset with metallicity data",
   Author = "OpenSpace Team",
   URL = "http://openspaceproject.com",
diff --git a/data/assets/scene/milkyway/gaia/gaia_dr2_download_stars.asset b/data/assets/scene/milkyway/gaia/gaia_dr2_download_stars.asset
index 0ea6813df0..071f065cf8 100644
--- a/data/assets/scene/milkyway/gaia/gaia_dr2_download_stars.asset
+++ b/data/assets/scene/milkyway/gaia/gaia_dr2_download_stars.asset
@@ -28,7 +28,6 @@ asset.export("GaiaFullDataset", gaiaFull)
 
 asset.meta = {
   Name = "GaiaDR2 Download Stars",
-  Version = "1.1",
   Description = [[This asset contains code to sync gaia subsets from the OpenSpace
   servers. Edit this file to choose which subsets to sync. WARNING can use 150GB]],
   Author = "ESA/Gaia/DPAC",
diff --git a/data/assets/scene/milkyway/gaia/gaiastars.asset b/data/assets/scene/milkyway/gaia/gaiastars.asset
index 3123918b81..4c2a2992f1 100644
--- a/data/assets/scene/milkyway/gaia/gaiastars.asset
+++ b/data/assets/scene/milkyway/gaia/gaiastars.asset
@@ -79,7 +79,6 @@ asset.export(GaiaStars)
 
 asset.meta = {
   Name = "Gaia Stars",
-  Version = "1.0",
   Description = [[This asset contains a subset of GaiaDR2. This subset contains 7.5M stars which have
   accurate values for a number of columns]],
   Author = "ESA/Gaia/DPAC",
diff --git a/data/assets/scene/milkyway/gaia/galah.asset b/data/assets/scene/milkyway/gaia/galah.asset
index 2a66ac707a..2c7c3069ea 100644
--- a/data/assets/scene/milkyway/gaia/galah.asset
+++ b/data/assets/scene/milkyway/gaia/galah.asset
@@ -72,7 +72,6 @@ asset.export(GaiaAbundanceGalah)
 
 asset.meta = {
   Name = "Gaia Abundance Galah",
-  Version = "1.0",
   Description = "This asset contains a RenderableStars dataset with metallicity data",
   Author = "OpenSpace Team",
   URL = "http://openspaceproject.com",
diff --git a/data/assets/scene/milkyway/habitable_zones/habitable_zone_textures.asset b/data/assets/scene/milkyway/habitable_zones/habitable_zone_textures.asset
index b51e5f9767..ad077a8efe 100644
--- a/data/assets/scene/milkyway/habitable_zones/habitable_zone_textures.asset
+++ b/data/assets/scene/milkyway/habitable_zones/habitable_zone_textures.asset
@@ -10,7 +10,6 @@ asset.export("TexturesPath", texturesPath)
 
 asset.meta = {
   Name = "Habitable Zone Textures",
-  Version = "1.0",
   Description = "Default textures that can be used for the habitable zone rendering",
   Author = "OpenSpace Team",
   URL = "http://openspaceproject.com",
diff --git a/data/assets/scene/milkyway/milkyway/eso.asset b/data/assets/scene/milkyway/milkyway/eso.asset
index 8d343964f0..41323b2229 100644
--- a/data/assets/scene/milkyway/milkyway/eso.asset
+++ b/data/assets/scene/milkyway/milkyway/eso.asset
@@ -47,7 +47,6 @@ asset.export(Object)
 
 asset.meta = {
   Name = "MilkyWay Galaxy (ESO)",
-  Version = "1.0",
   Description = [[This asset contains an alternate to the Digital Universe image for the
     Milky Way from ESO]],
   Author = "ESO/S. Brunier",
diff --git a/data/assets/scene/milkyway/milkyway/volume.asset b/data/assets/scene/milkyway/milkyway/volume.asset
index 115088893d..e6af7d4bea 100644
--- a/data/assets/scene/milkyway/milkyway/volume.asset
+++ b/data/assets/scene/milkyway/milkyway/volume.asset
@@ -66,7 +66,6 @@ asset.export(MilkyWayVolume)
 
 asset.meta = {
   Name = "Milky Way Volume",
-  Version = "1.1",
   Description = "Volumetric rendering of Milky Way galaxy based on simulations from NAOJ",
   Author = "OpenSpace Team",
   URL = "http://openspaceproject.com",
diff --git a/data/assets/scene/milkyway/objects/orionnebula/cluster.asset b/data/assets/scene/milkyway/objects/orionnebula/cluster.asset
index 2bd67379a1..1e231e6a8f 100644
--- a/data/assets/scene/milkyway/objects/orionnebula/cluster.asset
+++ b/data/assets/scene/milkyway/objects/orionnebula/cluster.asset
@@ -67,7 +67,6 @@ asset.export(OrionClusterStars)
 
 asset.meta = {
   Name = "Orion Nebula Star Cluster",
-  Version = "1.1",
   Description = [[Digital Universe asset for the Orion star cluster. To be used in
     conjunction with nebula model. Use orionnebula.asset to include both]],
   Author = "AMNH Digital Universe",
diff --git a/data/assets/scene/milkyway/objects/orionnebula/nebula.asset b/data/assets/scene/milkyway/objects/orionnebula/nebula.asset
index 5c6d4bbd20..924c1c189f 100644
--- a/data/assets/scene/milkyway/objects/orionnebula/nebula.asset
+++ b/data/assets/scene/milkyway/objects/orionnebula/nebula.asset
@@ -176,7 +176,6 @@ asset.export(OrionNebulaProplydsModel)
 
 asset.meta = {
   Name = "Orion Nebula Model",
-  Version = "1.1",
   Description = [[Digital Universe asset for the Orion nebula 3D model. This asset
     contains seperate models for the nebula, proplyds and shocks. To be used in
     conjunction with orion star cluster. Use orionnebula.asset to include both]],
diff --git a/data/assets/scene/milkyway/objects/orionnebula/orionnebula.asset b/data/assets/scene/milkyway/objects/orionnebula/orionnebula.asset
index 1ffb654593..05d56fb6bd 100644
--- a/data/assets/scene/milkyway/objects/orionnebula/orionnebula.asset
+++ b/data/assets/scene/milkyway/objects/orionnebula/orionnebula.asset
@@ -5,7 +5,6 @@ asset.require("./nebula")
 
 asset.meta = {
   Name = "Orion Nebula",
-  Version = "1.0",
   Description = [[This asset is a meta asset, containing all the assets for the Orion
     Nebula from the AMNH Digital Universe. This includes a 3D model and a star cluster]],
   Author = "Brian Abbott (AMNH)",
diff --git a/data/assets/scene/milkyway/objects/orionnebula/transforms.asset b/data/assets/scene/milkyway/objects/orionnebula/transforms.asset
index 4df9846534..980e37f4ee 100644
--- a/data/assets/scene/milkyway/objects/orionnebula/transforms.asset
+++ b/data/assets/scene/milkyway/objects/orionnebula/transforms.asset
@@ -39,7 +39,6 @@ asset.export(NebulaPosition)
 
 asset.meta = {
   Name = "Orion Nebula Transforms",
-  Version = "1.0",
   Description = [[This asset contains the position of the Orion Nebula. Generally you
     would not include this asset as other assets would include it]],
   Author = "Brian Abbott (AMNH)",
diff --git a/data/assets/scene/milkyway/stars/denver.asset b/data/assets/scene/milkyway/stars/denver.asset
index 6b125543ca..270ebda755 100644
--- a/data/assets/scene/milkyway/stars/denver.asset
+++ b/data/assets/scene/milkyway/stars/denver.asset
@@ -63,7 +63,6 @@ asset.export(Object)
 
 asset.meta = {
   Name = "Stars Denver",
-  Version = "1.0",
   Description = [[Alternative Milky Way Atlas: based on HIPPARCOS and Yale Bright
     Star catalogs]],
   Author = "Ka chun Yu",
diff --git a/data/assets/scene/solarsystem/dwarf_planets/ceres/ceres.asset b/data/assets/scene/solarsystem/dwarf_planets/ceres/ceres.asset
index 215555d0e5..56e2eddd21 100644
--- a/data/assets/scene/solarsystem/dwarf_planets/ceres/ceres.asset
+++ b/data/assets/scene/solarsystem/dwarf_planets/ceres/ceres.asset
@@ -56,7 +56,6 @@ asset.export(CeresLabel)
 
 asset.meta = {
   Name = "Ceres",
-  Version = "1.0",
   Description = "Ceres globe, and main label",
   Author = "OpenSpace Team",
   URL = "http://openspaceproject.com",
diff --git a/data/assets/scene/solarsystem/dwarf_planets/ceres/default_layers.asset b/data/assets/scene/solarsystem/dwarf_planets/ceres/default_layers.asset
index 7ceaef26a8..45e789fb8a 100644
--- a/data/assets/scene/solarsystem/dwarf_planets/ceres/default_layers.asset
+++ b/data/assets/scene/solarsystem/dwarf_planets/ceres/default_layers.asset
@@ -5,7 +5,6 @@ asset.require("./layers/colorlayers/lamo", true)
 
 asset.meta = {
   Name = "Default Ceres Layers",
-  Version = "1.0",
   Description = "Default Ceres layers are: LAMO",
   Author = "OpenSpace Team",
   URL = "http://openspaceproject.com",
diff --git a/data/assets/scene/solarsystem/dwarf_planets/ceres/kernels.asset b/data/assets/scene/solarsystem/dwarf_planets/ceres/kernels.asset
index 2a901039f9..7391de40a2 100644
--- a/data/assets/scene/solarsystem/dwarf_planets/ceres/kernels.asset
+++ b/data/assets/scene/solarsystem/dwarf_planets/ceres/kernels.asset
@@ -40,7 +40,6 @@ asset.export("Frame", Frame)
 
 asset.meta = {
   Name = "Ceres Spice Kernels",
-  Version = "1.0",
   Description = "SPICE kernels for Ceres",
   Author = "OpenSpace Team",
   URL = "http://openspaceproject.com",
diff --git a/data/assets/scene/solarsystem/dwarf_planets/ceres/layers/colorlayers/lamo.asset b/data/assets/scene/solarsystem/dwarf_planets/ceres/layers/colorlayers/lamo.asset
index 7ddb152045..af497bcfd3 100644
--- a/data/assets/scene/solarsystem/dwarf_planets/ceres/layers/colorlayers/lamo.asset
+++ b/data/assets/scene/solarsystem/dwarf_planets/ceres/layers/colorlayers/lamo.asset
@@ -24,7 +24,6 @@ asset.export("layer", Layer)
 
 asset.meta = {
   Name = "LAMO [Sweden]",
-  Version = "1.0",
   Description = [[]],
   Author = "",
   URL = "",
diff --git a/data/assets/scene/solarsystem/dwarf_planets/ceres/layers/colorlayers/lamo_local.asset b/data/assets/scene/solarsystem/dwarf_planets/ceres/layers/colorlayers/lamo_local.asset
index a61d937273..d018f530df 100644
--- a/data/assets/scene/solarsystem/dwarf_planets/ceres/layers/colorlayers/lamo_local.asset
+++ b/data/assets/scene/solarsystem/dwarf_planets/ceres/layers/colorlayers/lamo_local.asset
@@ -34,7 +34,6 @@ asset.export("layer", Layer)
 
 asset.meta = {
   Name = "LAMO [Local]",
-  Version = "1.0",
   Description = [[]],
   Author = "",
   URL = "",
diff --git a/data/assets/scene/solarsystem/dwarf_planets/ceres/trail.asset b/data/assets/scene/solarsystem/dwarf_planets/ceres/trail.asset
index 58d0a66228..9d5d66e6de 100644
--- a/data/assets/scene/solarsystem/dwarf_planets/ceres/trail.asset
+++ b/data/assets/scene/solarsystem/dwarf_planets/ceres/trail.asset
@@ -40,7 +40,6 @@ asset.export(CeresTrail)
 
 asset.meta = {
   Name = "Ceres Trail",
-  Version = "1.0",
   Description = "Trail of Ceres as observed by the Sun. Data from NASA Spice",
   Author = "OpenSpace Team",
   URL = "http://openspaceproject.com",
diff --git a/data/assets/scene/solarsystem/dwarf_planets/ceres/transforms.asset b/data/assets/scene/solarsystem/dwarf_planets/ceres/transforms.asset
index 5a778e8c13..0770c7e4fb 100644
--- a/data/assets/scene/solarsystem/dwarf_planets/ceres/transforms.asset
+++ b/data/assets/scene/solarsystem/dwarf_planets/ceres/transforms.asset
@@ -41,7 +41,6 @@ asset.export(CeresPosition)
 
 asset.meta = {
   Name = "Ceres Transforms",
-  Version = "1.0",
   Description = "Ceres transform",
   Author = "OpenSpace Team",
   URL = "http://openspaceproject.com",
diff --git a/data/assets/scene/solarsystem/dwarf_planets/eris/eris.asset b/data/assets/scene/solarsystem/dwarf_planets/eris/eris.asset
index 9b62dcfa14..e7d64f4ce4 100644
--- a/data/assets/scene/solarsystem/dwarf_planets/eris/eris.asset
+++ b/data/assets/scene/solarsystem/dwarf_planets/eris/eris.asset
@@ -6,7 +6,6 @@ asset.require("./label", false)
 
 asset.meta = {
   Name = "Eris meta asset",
-  Version = "1.0",
   Description = [[Trail, Model and Label of Eris.]],
   Author = "OpenSpace Team",
   URL = "https://www.openspaceproject.com",
diff --git a/data/assets/scene/solarsystem/dwarf_planets/eris/label.asset b/data/assets/scene/solarsystem/dwarf_planets/eris/label.asset
index 1df4710d62..f3022672b7 100644
--- a/data/assets/scene/solarsystem/dwarf_planets/eris/label.asset
+++ b/data/assets/scene/solarsystem/dwarf_planets/eris/label.asset
@@ -42,7 +42,6 @@ asset.export("Label", Label)
 
 asset.meta = {
   Name = "Eris Label",
-  Version = "1.0",
   Description = [[Label of Eris]],
   Author = "OpenSpace Team",
   URL = "https://www.openspaceproject.com",
diff --git a/data/assets/scene/solarsystem/dwarf_planets/eris/planet.asset b/data/assets/scene/solarsystem/dwarf_planets/eris/planet.asset
index 8d49133b3f..c84c9a4ad5 100644
--- a/data/assets/scene/solarsystem/dwarf_planets/eris/planet.asset
+++ b/data/assets/scene/solarsystem/dwarf_planets/eris/planet.asset
@@ -54,7 +54,6 @@ asset.export("Planet", Planet)
 
 asset.meta = {
   Name = "Eris Globe",
-  Version = "1.0",
   Description = [[Globe of Eris]],
   Author = "OpenSpace Team",
   URL = "https://solarsystem.nasa.gov/planets/dwarf-planets/haumea/in-depth/",
diff --git a/data/assets/scene/solarsystem/dwarf_planets/eris/trail.asset b/data/assets/scene/solarsystem/dwarf_planets/eris/trail.asset
index 6882b339b2..0f9b20b8ee 100644
--- a/data/assets/scene/solarsystem/dwarf_planets/eris/trail.asset
+++ b/data/assets/scene/solarsystem/dwarf_planets/eris/trail.asset
@@ -38,7 +38,6 @@ asset.export("Trail", Trail)
 
 asset.meta = {
   Name = "Eris Trail",
-  Version = "1.0",
   Description = [[Trail of Eris]],
   Author = "OpenSpace Team",
   URL = "https://www.openspaceproject.com",
diff --git a/data/assets/scene/solarsystem/dwarf_planets/eris/transforms.asset b/data/assets/scene/solarsystem/dwarf_planets/eris/transforms.asset
index 522436903d..6837a7d0ff 100644
--- a/data/assets/scene/solarsystem/dwarf_planets/eris/transforms.asset
+++ b/data/assets/scene/solarsystem/dwarf_planets/eris/transforms.asset
@@ -44,7 +44,6 @@ asset.export("Position", Position)
 
 asset.meta = {
   Name = "Eris Position (Keplerian)",
-  Version = "1.0",
   Description = [[Position of Eris. KeplerTranslation Version Data from
     JPL Horizons]],
   Author = "OpenSpace Team",
diff --git a/data/assets/scene/solarsystem/dwarf_planets/gonggong/gonggong.asset b/data/assets/scene/solarsystem/dwarf_planets/gonggong/gonggong.asset
index c62e2e9034..9a888609b5 100644
--- a/data/assets/scene/solarsystem/dwarf_planets/gonggong/gonggong.asset
+++ b/data/assets/scene/solarsystem/dwarf_planets/gonggong/gonggong.asset
@@ -6,7 +6,6 @@ asset.require("./label", false)
 
 asset.meta = {
   Name = "Gonggong meta asset",
-  Version = "1.0",
   Description = [[Trail, Model and Label of Gonggong.]],
   Author = "OpenSpace Team",
   URL = "https://www.openspaceproject.com",
diff --git a/data/assets/scene/solarsystem/dwarf_planets/gonggong/label.asset b/data/assets/scene/solarsystem/dwarf_planets/gonggong/label.asset
index bfb3ae9826..4f9849681c 100644
--- a/data/assets/scene/solarsystem/dwarf_planets/gonggong/label.asset
+++ b/data/assets/scene/solarsystem/dwarf_planets/gonggong/label.asset
@@ -42,7 +42,6 @@ asset.export("Label", Label)
 
 asset.meta = {
   Name = "Gonggong Label",
-  Version = "1.0",
   Description = [[Label of Gonggong]],
   Author = "OpenSpace Team",
   URL = "https://www.openspaceproject.com",
diff --git a/data/assets/scene/solarsystem/dwarf_planets/gonggong/planet.asset b/data/assets/scene/solarsystem/dwarf_planets/gonggong/planet.asset
index 4bcc0d6d2f..fddd7eb7d3 100644
--- a/data/assets/scene/solarsystem/dwarf_planets/gonggong/planet.asset
+++ b/data/assets/scene/solarsystem/dwarf_planets/gonggong/planet.asset
@@ -40,7 +40,6 @@ asset.export("Planet", Planet)
 
 asset.meta = {
   Name = "Gonggong Globe",
-  Version = "1.0",
   Description = [[Globe of Gonggong]],
   Author = "OpenSpace Team",
   URL = "https://www.openspaceproject.com",
diff --git a/data/assets/scene/solarsystem/dwarf_planets/gonggong/trail.asset b/data/assets/scene/solarsystem/dwarf_planets/gonggong/trail.asset
index 138406a737..5ad73424fb 100644
--- a/data/assets/scene/solarsystem/dwarf_planets/gonggong/trail.asset
+++ b/data/assets/scene/solarsystem/dwarf_planets/gonggong/trail.asset
@@ -38,7 +38,6 @@ asset.export("Trail", Trail)
 
 asset.meta = {
   Name = "Gonggong Trail",
-  Version = "1.0",
   Description = [[Trail of Gonggong]],
   Author = "OpenSpace Team",
   URL = "https://www.openspaceproject.com",
diff --git a/data/assets/scene/solarsystem/dwarf_planets/gonggong/transforms.asset b/data/assets/scene/solarsystem/dwarf_planets/gonggong/transforms.asset
index e9b5136158..32c3ecd36d 100644
--- a/data/assets/scene/solarsystem/dwarf_planets/gonggong/transforms.asset
+++ b/data/assets/scene/solarsystem/dwarf_planets/gonggong/transforms.asset
@@ -44,7 +44,6 @@ asset.export("Position", Position)
 
 asset.meta = {
   Name = "Gonggong Position (Keplerian)",
-  Version = "1.0",
   Description = [[Position of Gonggong. KeplerTranslation Version Data from
     JPL Horizons]],
   Author = "OpenSpace Team",
diff --git a/data/assets/scene/solarsystem/dwarf_planets/haumea/haumea.asset b/data/assets/scene/solarsystem/dwarf_planets/haumea/haumea.asset
index 58243b6c0f..ae943d4f72 100644
--- a/data/assets/scene/solarsystem/dwarf_planets/haumea/haumea.asset
+++ b/data/assets/scene/solarsystem/dwarf_planets/haumea/haumea.asset
@@ -6,7 +6,6 @@ asset.require("./label", false)
 
 asset.meta = {
   Name = "Haumea meta asset",
-  Version = "1.0",
   Description = [[Trail, Model and Label of Haumea.]],
   Author = "OpenSpace Team",
   URL = "https://www.openspaceproject.com",
diff --git a/data/assets/scene/solarsystem/dwarf_planets/haumea/label.asset b/data/assets/scene/solarsystem/dwarf_planets/haumea/label.asset
index 99c6f84507..931bc317c2 100644
--- a/data/assets/scene/solarsystem/dwarf_planets/haumea/label.asset
+++ b/data/assets/scene/solarsystem/dwarf_planets/haumea/label.asset
@@ -42,7 +42,6 @@ asset.export("Label", Label)
 
 asset.meta = {
   Name = "Haumea Label",
-  Version = "1.0",
   Description = [[Label of Haumea]],
   Author = "OpenSpace Team",
   URL = "https://www.openspaceproject.com",
diff --git a/data/assets/scene/solarsystem/dwarf_planets/haumea/planet.asset b/data/assets/scene/solarsystem/dwarf_planets/haumea/planet.asset
index 3737f5c710..487efce45a 100644
--- a/data/assets/scene/solarsystem/dwarf_planets/haumea/planet.asset
+++ b/data/assets/scene/solarsystem/dwarf_planets/haumea/planet.asset
@@ -54,7 +54,6 @@ asset.export("Planet", Planet)
 
 asset.meta = {
   Name = "Haumea Model",
-  Version = "1.0",
   Description = [[Model of Haumea]],
   Author = "OpenSpace Team",
   URL = "https://solarsystem.nasa.gov/planets/dwarf-planets/haumea/in-depth/",
diff --git a/data/assets/scene/solarsystem/dwarf_planets/haumea/trail.asset b/data/assets/scene/solarsystem/dwarf_planets/haumea/trail.asset
index 7c1ad3b861..4d06f318ab 100644
--- a/data/assets/scene/solarsystem/dwarf_planets/haumea/trail.asset
+++ b/data/assets/scene/solarsystem/dwarf_planets/haumea/trail.asset
@@ -38,7 +38,6 @@ asset.export("Trail", Trail)
 
 asset.meta = {
   Name = "Haumea Trail",
-  Version = "1.0",
   Description = [[Trail of Haumea]],
   Author = "OpenSpace Team",
   URL = "https://www.openspaceproject.com",
diff --git a/data/assets/scene/solarsystem/dwarf_planets/haumea/transforms.asset b/data/assets/scene/solarsystem/dwarf_planets/haumea/transforms.asset
index 315458f7c6..b2e7bbddbc 100644
--- a/data/assets/scene/solarsystem/dwarf_planets/haumea/transforms.asset
+++ b/data/assets/scene/solarsystem/dwarf_planets/haumea/transforms.asset
@@ -45,7 +45,6 @@ asset.export("Position", Position)
 
 asset.meta = {
   Name = "Haumea Position (Keplerian)",
-  Version = "1.0",
   Description = [[Position of Haumea. KeplerTranslation Version Data from
     JPL Horizons]],
   Author = "OpenSpace Team",
diff --git a/data/assets/scene/solarsystem/dwarf_planets/makemake/label.asset b/data/assets/scene/solarsystem/dwarf_planets/makemake/label.asset
index a85b62f8e2..e97d8eab3f 100644
--- a/data/assets/scene/solarsystem/dwarf_planets/makemake/label.asset
+++ b/data/assets/scene/solarsystem/dwarf_planets/makemake/label.asset
@@ -42,7 +42,6 @@ asset.export("Label", Label)
 
 asset.meta = {
   Name = "Makemake Label",
-  Version = "1.0",
   Description = [[Label of Makemake]],
   Author = "OpenSpace Team",
   URL = "https://www.openspaceproject.com",
diff --git a/data/assets/scene/solarsystem/dwarf_planets/makemake/makemake.asset b/data/assets/scene/solarsystem/dwarf_planets/makemake/makemake.asset
index 07e5287271..63d1e8dc14 100644
--- a/data/assets/scene/solarsystem/dwarf_planets/makemake/makemake.asset
+++ b/data/assets/scene/solarsystem/dwarf_planets/makemake/makemake.asset
@@ -6,7 +6,6 @@ asset.require("./label", false)
 
 asset.meta = {
   Name = "Makemake meta asset",
-  Version = "1.0",
   Description = [[Trail, Model and Label of Makemake.]],
   Author = "OpenSpace Team",
   URL = "https://www.openspaceproject.com",
diff --git a/data/assets/scene/solarsystem/dwarf_planets/makemake/planet.asset b/data/assets/scene/solarsystem/dwarf_planets/makemake/planet.asset
index c2072f119f..728f53f51b 100644
--- a/data/assets/scene/solarsystem/dwarf_planets/makemake/planet.asset
+++ b/data/assets/scene/solarsystem/dwarf_planets/makemake/planet.asset
@@ -54,7 +54,6 @@ asset.export("Planet", Planet)
 
 asset.meta = {
   Name = "Makemake Globe",
-  Version = "1.0",
   Description = [[Globe of Makemake]],
   Author = "OpenSpace Team",
   URL = "https://solarsystem.nasa.gov/planets/dwarf-planets/makemake/in-depth/",
diff --git a/data/assets/scene/solarsystem/dwarf_planets/makemake/trail.asset b/data/assets/scene/solarsystem/dwarf_planets/makemake/trail.asset
index 3bba06a15a..2f2fa27da4 100644
--- a/data/assets/scene/solarsystem/dwarf_planets/makemake/trail.asset
+++ b/data/assets/scene/solarsystem/dwarf_planets/makemake/trail.asset
@@ -38,7 +38,6 @@ asset.export("Trail", Trail)
 
 asset.meta = {
   Name = "Makemake Trail",
-  Version = "1.0",
   Description = [[Trail of Makemake]],
   Author = "OpenSpace Team",
   URL = "https://www.openspaceproject.com",
diff --git a/data/assets/scene/solarsystem/dwarf_planets/makemake/transforms.asset b/data/assets/scene/solarsystem/dwarf_planets/makemake/transforms.asset
index c0d8d94f03..54d44a56d2 100644
--- a/data/assets/scene/solarsystem/dwarf_planets/makemake/transforms.asset
+++ b/data/assets/scene/solarsystem/dwarf_planets/makemake/transforms.asset
@@ -45,7 +45,6 @@ asset.export("Position", Position)
 
 asset.meta = {
   Name = "Makemake Position (Keplerian)",
-  Version = "1.0",
   Description = [[Position of Makemake. KeplerTranslation Version Data from
     JPL Horizons]],
   Author = "OpenSpace Team",
diff --git a/data/assets/scene/solarsystem/dwarf_planets/orcus/label.asset b/data/assets/scene/solarsystem/dwarf_planets/orcus/label.asset
index ff57d1b905..d27fc95cd9 100644
--- a/data/assets/scene/solarsystem/dwarf_planets/orcus/label.asset
+++ b/data/assets/scene/solarsystem/dwarf_planets/orcus/label.asset
@@ -42,7 +42,6 @@ asset.export("Label", Label)
 
 asset.meta = {
   Name = "Orcus Label",
-  Version = "1.0",
   Description = [[Label of Orcus]],
   Author = "OpenSpace Team",
   URL = "https://www.openspaceproject.com",
diff --git a/data/assets/scene/solarsystem/dwarf_planets/orcus/orcus.asset b/data/assets/scene/solarsystem/dwarf_planets/orcus/orcus.asset
index e50a65947f..7239b5dcb4 100644
--- a/data/assets/scene/solarsystem/dwarf_planets/orcus/orcus.asset
+++ b/data/assets/scene/solarsystem/dwarf_planets/orcus/orcus.asset
@@ -6,7 +6,6 @@ asset.require("./label", false)
 
 asset.meta = {
   Name = "Orcus meta asset",
-  Version = "1.0",
   Description = [[Trail, Model and Label of Orcus.]],
   Author = "OpenSpace Team",
   URL = "https://www.openspaceproject.com",
diff --git a/data/assets/scene/solarsystem/dwarf_planets/orcus/planet.asset b/data/assets/scene/solarsystem/dwarf_planets/orcus/planet.asset
index 6805642f4f..624938e3a6 100644
--- a/data/assets/scene/solarsystem/dwarf_planets/orcus/planet.asset
+++ b/data/assets/scene/solarsystem/dwarf_planets/orcus/planet.asset
@@ -41,7 +41,6 @@ asset.export("Planet", Planet)
 
 asset.meta = {
   Name = "Orcus Globe",
-  Version = "1.0",
   Description = [[Globe of Orcus]],
   Author = "OpenSpace Team",
   URL = "https://www.openspaceproject.com",
diff --git a/data/assets/scene/solarsystem/dwarf_planets/orcus/trail.asset b/data/assets/scene/solarsystem/dwarf_planets/orcus/trail.asset
index 213f5c09d0..a2a57f1733 100644
--- a/data/assets/scene/solarsystem/dwarf_planets/orcus/trail.asset
+++ b/data/assets/scene/solarsystem/dwarf_planets/orcus/trail.asset
@@ -38,7 +38,6 @@ asset.export("Trail", Trail)
 
 asset.meta = {
   Name = "Orcus Trail",
-  Version = "1.0",
   Description = [[Trail of Orcus]],
   Author = "OpenSpace Team",
   URL = "https://www.openspaceproject.com",
diff --git a/data/assets/scene/solarsystem/dwarf_planets/orcus/transforms.asset b/data/assets/scene/solarsystem/dwarf_planets/orcus/transforms.asset
index 7eff3c0251..72c414270f 100644
--- a/data/assets/scene/solarsystem/dwarf_planets/orcus/transforms.asset
+++ b/data/assets/scene/solarsystem/dwarf_planets/orcus/transforms.asset
@@ -45,7 +45,6 @@ asset.export("Position", Position)
 
 asset.meta = {
   Name = "Orcus Position (Keplerian)",
-  Version = "1.0",
   Description = [[Position of Orcus. KeplerTranslation Version Data from
     JPL Horizons]],
   Author = "OpenSpace Team",
diff --git a/data/assets/scene/solarsystem/dwarf_planets/pluto/charon/charon.asset b/data/assets/scene/solarsystem/dwarf_planets/pluto/charon/charon.asset
index f08c0da15e..5cc4dc8c91 100644
--- a/data/assets/scene/solarsystem/dwarf_planets/pluto/charon/charon.asset
+++ b/data/assets/scene/solarsystem/dwarf_planets/pluto/charon/charon.asset
@@ -94,7 +94,6 @@ asset.export(CharonLabel)
 
 asset.meta = {
   Name = "Charon",
-  Version = "1.0",
   Description = "Charon globe with labels",
   Author = "OpenSpace Team",
   URL = "http://openspaceproject.com",
diff --git a/data/assets/scene/solarsystem/dwarf_planets/pluto/charon/charon_trail.asset b/data/assets/scene/solarsystem/dwarf_planets/pluto/charon/charon_trail.asset
index 471971a723..c700e2d00f 100644
--- a/data/assets/scene/solarsystem/dwarf_planets/pluto/charon/charon_trail.asset
+++ b/data/assets/scene/solarsystem/dwarf_planets/pluto/charon/charon_trail.asset
@@ -44,7 +44,6 @@ asset.export(CharonBarycentricTrail)
 
 asset.meta = {
   Name = "Charon Barycentric Trail",
-  Version = "1.0",
   Description = "Trail of Charon as observed by Pluto Barycenter",
   Author = "OpenSpace Team",
   URL = "http://openspaceproject.com",
diff --git a/data/assets/scene/solarsystem/dwarf_planets/pluto/charon/default_layers.asset b/data/assets/scene/solarsystem/dwarf_planets/pluto/charon/default_layers.asset
index 7f7bf324d0..51d37b76ca 100644
--- a/data/assets/scene/solarsystem/dwarf_planets/pluto/charon/default_layers.asset
+++ b/data/assets/scene/solarsystem/dwarf_planets/pluto/charon/default_layers.asset
@@ -4,7 +4,6 @@ asset.require("./layers/colorlayers/greyscale_usgs", true)
 
 asset.meta = {
   Name = "Default Charon Layers",
-  Version = "1.0",
   Description = "Default Charon layers are: Black & White USGS",
   Author = "OpenSpace Team",
   URL = "http://openspaceproject.com",
diff --git a/data/assets/scene/solarsystem/dwarf_planets/pluto/charon/layers/colorlayers/greyscale_usgs.asset b/data/assets/scene/solarsystem/dwarf_planets/pluto/charon/layers/colorlayers/greyscale_usgs.asset
index a13606eff1..5c7b345ef4 100644
--- a/data/assets/scene/solarsystem/dwarf_planets/pluto/charon/layers/colorlayers/greyscale_usgs.asset
+++ b/data/assets/scene/solarsystem/dwarf_planets/pluto/charon/layers/colorlayers/greyscale_usgs.asset
@@ -25,7 +25,6 @@ asset.export("layer", Layer)
 
 asset.meta = {
   Name = "Charon Black & White [USGS]",
-  Version = "1.0",
   Description = [[Charon New Horizons LORRI MVIC Global Mosaic 300m v1. This detailed,
     high-quality global mosaic of Pluto's largest moon, Charon, was assembled from nearly
     all of the highest-resolution images obtained by the Long-Range Reconnaissance Imager
diff --git a/data/assets/scene/solarsystem/dwarf_planets/pluto/default_layers.asset b/data/assets/scene/solarsystem/dwarf_planets/pluto/default_layers.asset
index 9b334acece..2e368fc852 100644
--- a/data/assets/scene/solarsystem/dwarf_planets/pluto/default_layers.asset
+++ b/data/assets/scene/solarsystem/dwarf_planets/pluto/default_layers.asset
@@ -4,7 +4,6 @@ asset.require("./layers/colorlayers/greyscale_usgs", true)
 
 asset.meta = {
   Name = "Default Pluto Layers",
-  Version = "1.0",
   Description = "Default Pluto layers are: Black & White USGS",
   Author = "OpenSpace Team",
   URL = "http://openspaceproject.com",
diff --git a/data/assets/scene/solarsystem/dwarf_planets/pluto/kernels.asset b/data/assets/scene/solarsystem/dwarf_planets/pluto/kernels.asset
index 4e2c7ae1b7..e5063f8687 100644
--- a/data/assets/scene/solarsystem/dwarf_planets/pluto/kernels.asset
+++ b/data/assets/scene/solarsystem/dwarf_planets/pluto/kernels.asset
@@ -51,7 +51,6 @@ asset.export("Frame", Frame)
 
 asset.meta = {
   Name = "Pluto Spice Kernels",
-  Version = "1.0",
   Description = "Generic SPICE kernels for Pluto",
   Author = "OpenSpace Team",
   URL = "https://naif.jpl.nasa.gov/pub/naif/pds/wgc/kernels/spk/",
diff --git a/data/assets/scene/solarsystem/dwarf_planets/pluto/layers/colorlayers/greyscale_usgs.asset b/data/assets/scene/solarsystem/dwarf_planets/pluto/layers/colorlayers/greyscale_usgs.asset
index f0a89d5041..e988a70e84 100644
--- a/data/assets/scene/solarsystem/dwarf_planets/pluto/layers/colorlayers/greyscale_usgs.asset
+++ b/data/assets/scene/solarsystem/dwarf_planets/pluto/layers/colorlayers/greyscale_usgs.asset
@@ -25,7 +25,6 @@ asset.export("layer", Layer)
 
 asset.meta = {
   Name = "Pluto Black & White [USGS]",
-  Version = "1.0",
   Description = [[This detailed, high-quality global mosaic of Pluto was assembled from
     nearly all of the highest-resolution images obtained by the Long-Range
     Reconnaissance Imager (LORRI) and the Multispectral Visible Imaging Camera (MVIC)
diff --git a/data/assets/scene/solarsystem/dwarf_planets/pluto/minor/hydra.asset b/data/assets/scene/solarsystem/dwarf_planets/pluto/minor/hydra.asset
index f41c15e100..6bfc38caa5 100644
--- a/data/assets/scene/solarsystem/dwarf_planets/pluto/minor/hydra.asset
+++ b/data/assets/scene/solarsystem/dwarf_planets/pluto/minor/hydra.asset
@@ -97,7 +97,6 @@ asset.export(HydraTrail)
 
 asset.meta = {
   Name = "Hydra",
-  Version = "1.0",
   Description = "Globe and trail for Pluto's moon Hydra",
   Author = "OpenSpace Team",
   URL = "http://openspaceproject.com",
diff --git a/data/assets/scene/solarsystem/dwarf_planets/pluto/minor/kerberos.asset b/data/assets/scene/solarsystem/dwarf_planets/pluto/minor/kerberos.asset
index 086060ddef..a04b8536ff 100644
--- a/data/assets/scene/solarsystem/dwarf_planets/pluto/minor/kerberos.asset
+++ b/data/assets/scene/solarsystem/dwarf_planets/pluto/minor/kerberos.asset
@@ -98,7 +98,6 @@ asset.export(KerberosLabel)
 
 asset.meta = {
   Name = "Kerberos",
-  Version = "1.0",
   Description = "Globe and trail for Pluto's moon Kerberos",
   Author = "OpenSpace Team",
   URL = "http://openspaceproject.com",
diff --git a/data/assets/scene/solarsystem/dwarf_planets/pluto/minor/nix.asset b/data/assets/scene/solarsystem/dwarf_planets/pluto/minor/nix.asset
index 9fe7fede30..8795a8b1ef 100644
--- a/data/assets/scene/solarsystem/dwarf_planets/pluto/minor/nix.asset
+++ b/data/assets/scene/solarsystem/dwarf_planets/pluto/minor/nix.asset
@@ -98,7 +98,6 @@ asset.export(NixLabel)
 
 asset.meta = {
   Name = "Nix",
-  Version = "1.0",
   Description = "Globe and trail for Pluto's moon Nix",
   Author = "OpenSpace Team",
   URL = "http://openspaceproject.com",
diff --git a/data/assets/scene/solarsystem/dwarf_planets/pluto/minor/styx.asset b/data/assets/scene/solarsystem/dwarf_planets/pluto/minor/styx.asset
index 65285bd6c7..77cc5bfd9d 100644
--- a/data/assets/scene/solarsystem/dwarf_planets/pluto/minor/styx.asset
+++ b/data/assets/scene/solarsystem/dwarf_planets/pluto/minor/styx.asset
@@ -98,7 +98,6 @@ asset.export(StyxLabel)
 
 asset.meta = {
   Name = "Styx",
-  Version = "1.0",
   Description = "Globe and trail for Pluto's moon Styx",
   Author = "OpenSpace Team",
   URL = "http://openspaceproject.com",
diff --git a/data/assets/scene/solarsystem/dwarf_planets/pluto/pluto.asset b/data/assets/scene/solarsystem/dwarf_planets/pluto/pluto.asset
index 6c720107f6..3a166f2cb8 100644
--- a/data/assets/scene/solarsystem/dwarf_planets/pluto/pluto.asset
+++ b/data/assets/scene/solarsystem/dwarf_planets/pluto/pluto.asset
@@ -94,7 +94,6 @@ asset.export(PlutoLabel)
 
 asset.meta = {
   Name = "Pluto",
-  Version = "1.0",
   Description = "Pluto globe, and main planet label",
   Author = "OpenSpace Team",
   URL = "http://openspaceproject.com",
diff --git a/data/assets/scene/solarsystem/dwarf_planets/pluto/pluto_trail.asset b/data/assets/scene/solarsystem/dwarf_planets/pluto/pluto_trail.asset
index da4367d2c5..c755a54906 100644
--- a/data/assets/scene/solarsystem/dwarf_planets/pluto/pluto_trail.asset
+++ b/data/assets/scene/solarsystem/dwarf_planets/pluto/pluto_trail.asset
@@ -40,7 +40,6 @@ asset.export(PlutoTrailBarycentric)
 
 asset.meta = {
   Name = "Pluto Barycentric Trail",
-  Version = "1.0",
   Description = "Trail of Pluto as observed by its Barycenter",
   Author = "OpenSpace Team",
   URL = "http://openspaceproject.com",
diff --git a/data/assets/scene/solarsystem/dwarf_planets/pluto/pluto_trail_kepler.asset b/data/assets/scene/solarsystem/dwarf_planets/pluto/pluto_trail_kepler.asset
index cffe0b9fac..f354e963c0 100644
--- a/data/assets/scene/solarsystem/dwarf_planets/pluto/pluto_trail_kepler.asset
+++ b/data/assets/scene/solarsystem/dwarf_planets/pluto/pluto_trail_kepler.asset
@@ -48,7 +48,6 @@ asset.export(PlutoKeplerianTrail)
 
 asset.meta = {
   Name = "Pluto Keplerian Trail",
-  Version = "1.0",
   Description = [[Full Keplerian trail of Pluto as observed by the Sun. Data from
     JPL Horizons]],
   Author = "OpenSpace Team",
diff --git a/data/assets/scene/solarsystem/dwarf_planets/pluto/system.asset b/data/assets/scene/solarsystem/dwarf_planets/pluto/system.asset
index d06826b9b3..bbf35ccd96 100644
--- a/data/assets/scene/solarsystem/dwarf_planets/pluto/system.asset
+++ b/data/assets/scene/solarsystem/dwarf_planets/pluto/system.asset
@@ -13,7 +13,6 @@ asset.require("./minor/styx")
 
 asset.meta = {
   Name = "Pluto System",
-  Version = "1.0",
   Description = [[Meta asset for the Pluto system, containing : Pluto, Pluto Trail,
     Charon, Charon Trail, Hydra, Kerberos, Nix, and Styx]],
   Author = "OpenSpace Team",
diff --git a/data/assets/scene/solarsystem/dwarf_planets/pluto/trail.asset b/data/assets/scene/solarsystem/dwarf_planets/pluto/trail.asset
index c468223b9f..18209e1341 100644
--- a/data/assets/scene/solarsystem/dwarf_planets/pluto/trail.asset
+++ b/data/assets/scene/solarsystem/dwarf_planets/pluto/trail.asset
@@ -41,7 +41,6 @@ asset.export(PlutoBarycenterTrail)
 
 asset.meta = {
   Name = "Pluto Barycenter Trail",
-  Version = "1.0",
   Description = "Trail of Pluto Barycenter as observed by the Sun",
   Author = "OpenSpace Team",
   URL = "http://openspaceproject.com",
diff --git a/data/assets/scene/solarsystem/dwarf_planets/pluto/transforms.asset b/data/assets/scene/solarsystem/dwarf_planets/pluto/transforms.asset
index ae5b779e88..0656a87319 100644
--- a/data/assets/scene/solarsystem/dwarf_planets/pluto/transforms.asset
+++ b/data/assets/scene/solarsystem/dwarf_planets/pluto/transforms.asset
@@ -34,7 +34,6 @@ asset.export(PlutoBarycenter)
 
 asset.meta = {
   Name = "Pluto Transforms",
-  Version = "1.0",
   Description = "Pluto Barycenter transform",
   Author = "OpenSpace Team",
   URL = "http://openspaceproject.com",
diff --git a/data/assets/scene/solarsystem/dwarf_planets/quaoar/label.asset b/data/assets/scene/solarsystem/dwarf_planets/quaoar/label.asset
index 3a0f3d26d2..42ed67349d 100644
--- a/data/assets/scene/solarsystem/dwarf_planets/quaoar/label.asset
+++ b/data/assets/scene/solarsystem/dwarf_planets/quaoar/label.asset
@@ -42,7 +42,6 @@ asset.export("Label", Label)
 
 asset.meta = {
   Name = "Quaoar Label",
-  Version = "1.0",
   Description = [[Label of Quaoar]],
   Author = "OpenSpace Team",
   URL = "https://www.openspaceproject.com",
diff --git a/data/assets/scene/solarsystem/dwarf_planets/quaoar/planet.asset b/data/assets/scene/solarsystem/dwarf_planets/quaoar/planet.asset
index 15e2a00d0f..178da07485 100644
--- a/data/assets/scene/solarsystem/dwarf_planets/quaoar/planet.asset
+++ b/data/assets/scene/solarsystem/dwarf_planets/quaoar/planet.asset
@@ -41,7 +41,6 @@ asset.export("Planet", Planet)
 
 asset.meta = {
   Name = "Quaoar Globe",
-  Version = "1.0",
   Description = [[Globe of Quaoar]],
   Author = "OpenSpace Team",
   URL = "https://www.openspaceproject.com",
diff --git a/data/assets/scene/solarsystem/dwarf_planets/quaoar/quaoar.asset b/data/assets/scene/solarsystem/dwarf_planets/quaoar/quaoar.asset
index 973be172e1..683e41e622 100644
--- a/data/assets/scene/solarsystem/dwarf_planets/quaoar/quaoar.asset
+++ b/data/assets/scene/solarsystem/dwarf_planets/quaoar/quaoar.asset
@@ -6,7 +6,6 @@ asset.require("./label", false)
 
 asset.meta = {
   Name = "Quaoar meta asset",
-  Version = "1.0",
   Description = [[Trail, Model and Label of Quaoar.]],
   Author = "OpenSpace Team",
   URL = "https://www.openspaceproject.com",
diff --git a/data/assets/scene/solarsystem/dwarf_planets/quaoar/trail.asset b/data/assets/scene/solarsystem/dwarf_planets/quaoar/trail.asset
index f08ac43126..8ee5bcc0fc 100644
--- a/data/assets/scene/solarsystem/dwarf_planets/quaoar/trail.asset
+++ b/data/assets/scene/solarsystem/dwarf_planets/quaoar/trail.asset
@@ -38,7 +38,6 @@ asset.export("Trail", Trail)
 
 asset.meta = {
   Name = "Quaoar Trail",
-  Version = "1.0",
   Description = [[Trail of Quaoar]],
   Author = "OpenSpace Team",
   URL = "https://www.openspaceproject.com",
diff --git a/data/assets/scene/solarsystem/dwarf_planets/quaoar/transforms.asset b/data/assets/scene/solarsystem/dwarf_planets/quaoar/transforms.asset
index a1b23e1939..a4ad4ec616 100644
--- a/data/assets/scene/solarsystem/dwarf_planets/quaoar/transforms.asset
+++ b/data/assets/scene/solarsystem/dwarf_planets/quaoar/transforms.asset
@@ -45,7 +45,6 @@ asset.export("Position", Position)
 
 asset.meta = {
   Name = "Quaoar Position (Keplerian)",
-  Version = "1.0",
   Description = [[Position of Quaoar. KeplerTranslation Version Data from
     JPL Horizons]],
   Author = "OpenSpace Team",
diff --git a/data/assets/scene/solarsystem/dwarf_planets/sedna/label.asset b/data/assets/scene/solarsystem/dwarf_planets/sedna/label.asset
index 09e93a7e6e..5e7f34382d 100644
--- a/data/assets/scene/solarsystem/dwarf_planets/sedna/label.asset
+++ b/data/assets/scene/solarsystem/dwarf_planets/sedna/label.asset
@@ -42,7 +42,6 @@ asset.export("Label", Label)
 
 asset.meta = {
   Name = "Sedna Label",
-  Version = "1.0",
   Description = [[Label of Sedna]],
   Author = "OpenSpace Team",
   URL = "https://www.openspaceproject.com",
diff --git a/data/assets/scene/solarsystem/dwarf_planets/sedna/planet.asset b/data/assets/scene/solarsystem/dwarf_planets/sedna/planet.asset
index 795c7fe36f..ff09725018 100644
--- a/data/assets/scene/solarsystem/dwarf_planets/sedna/planet.asset
+++ b/data/assets/scene/solarsystem/dwarf_planets/sedna/planet.asset
@@ -40,7 +40,6 @@ asset.export("Planet", Planet)
 
 asset.meta = {
   Name = "Sedna Globe",
-  Version = "1.0",
   Description = [[Globe of Sedna]],
   Author = "OpenSpace Team",
   URL = "https://www.openspaceproject.com",
diff --git a/data/assets/scene/solarsystem/dwarf_planets/sedna/sedna.asset b/data/assets/scene/solarsystem/dwarf_planets/sedna/sedna.asset
index f8581311c1..2fc2dcc559 100644
--- a/data/assets/scene/solarsystem/dwarf_planets/sedna/sedna.asset
+++ b/data/assets/scene/solarsystem/dwarf_planets/sedna/sedna.asset
@@ -6,7 +6,6 @@ asset.require("./label", false)
 
 asset.meta = {
   Name = "Sedna meta asset",
-  Version = "1.0",
   Description = [[Trail, Model and Label of Sedna.]],
   Author = "OpenSpace Team",
   URL = "https://www.openspaceproject.com",
diff --git a/data/assets/scene/solarsystem/dwarf_planets/sedna/trail.asset b/data/assets/scene/solarsystem/dwarf_planets/sedna/trail.asset
index ab66aca72d..bbaa6de828 100644
--- a/data/assets/scene/solarsystem/dwarf_planets/sedna/trail.asset
+++ b/data/assets/scene/solarsystem/dwarf_planets/sedna/trail.asset
@@ -38,7 +38,6 @@ asset.export("Trail", Trail)
 
 asset.meta = {
   Name = "Sedna Trail",
-  Version = "1.0",
   Description = [[Trail of Sedna]],
   Author = "OpenSpace Team",
   URL = "https://www.openspaceproject.com",
diff --git a/data/assets/scene/solarsystem/dwarf_planets/sedna/transforms.asset b/data/assets/scene/solarsystem/dwarf_planets/sedna/transforms.asset
index 85c691938a..ab99f667b7 100644
--- a/data/assets/scene/solarsystem/dwarf_planets/sedna/transforms.asset
+++ b/data/assets/scene/solarsystem/dwarf_planets/sedna/transforms.asset
@@ -45,7 +45,6 @@ asset.export("Position", Position)
 
 asset.meta = {
   Name = "Sedna Position (Keplerian)",
-  Version = "1.0",
   Description = [[Position of Sedna. KeplerTranslation Version Data from
     JPL Horizons]],
   Author = "OpenSpace Team",
diff --git a/data/assets/scene/solarsystem/dwarf_planets/vesta/label.asset b/data/assets/scene/solarsystem/dwarf_planets/vesta/label.asset
index 4ce5616c9d..400036ae5c 100644
--- a/data/assets/scene/solarsystem/dwarf_planets/vesta/label.asset
+++ b/data/assets/scene/solarsystem/dwarf_planets/vesta/label.asset
@@ -42,7 +42,6 @@ asset.export("Label", Label)
 
 asset.meta = {
   Name = "Vesta Label",
-  Version = "1.0",
   Description = [[Label of Vesta]],
   Author = "OpenSpace Team",
   URL = "https://www.openspaceproject.com",
diff --git a/data/assets/scene/solarsystem/dwarf_planets/vesta/planet.asset b/data/assets/scene/solarsystem/dwarf_planets/vesta/planet.asset
index ea5bda4d06..52a2c410d7 100644
--- a/data/assets/scene/solarsystem/dwarf_planets/vesta/planet.asset
+++ b/data/assets/scene/solarsystem/dwarf_planets/vesta/planet.asset
@@ -52,7 +52,6 @@ asset.export("Planet", VestaModel)
 
 asset.meta = {
   Name = "Vesta Model",
-  Version = "1.0",
   Description = [[Model of Vesta]],
   Author = "OpenSpace Team",
   URL = "https://www.openspaceproject.com",
diff --git a/data/assets/scene/solarsystem/dwarf_planets/vesta/trail.asset b/data/assets/scene/solarsystem/dwarf_planets/vesta/trail.asset
index 3f89412242..230c86c856 100644
--- a/data/assets/scene/solarsystem/dwarf_planets/vesta/trail.asset
+++ b/data/assets/scene/solarsystem/dwarf_planets/vesta/trail.asset
@@ -38,7 +38,6 @@ asset.export("Trail", Trail)
 
 asset.meta = {
   Name = "Vesta Trail",
-  Version = "1.0",
   Description = [[Trail of Vesta]],
   Author = "OpenSpace Team",
   URL = "https://www.openspaceproject.com",
diff --git a/data/assets/scene/solarsystem/dwarf_planets/vesta/transforms.asset b/data/assets/scene/solarsystem/dwarf_planets/vesta/transforms.asset
index 1380560818..9280fc674f 100644
--- a/data/assets/scene/solarsystem/dwarf_planets/vesta/transforms.asset
+++ b/data/assets/scene/solarsystem/dwarf_planets/vesta/transforms.asset
@@ -45,7 +45,6 @@ asset.export("Position", Position)
 
 asset.meta = {
   Name = "Vesta Position (Keplerian)",
-  Version = "1.0",
   Description = [[Position of Vesta. KeplerTranslation Version Data from
     JPL Horizons]],
   Author = "OpenSpace Team",
diff --git a/data/assets/scene/solarsystem/dwarf_planets/vesta/vesta.asset b/data/assets/scene/solarsystem/dwarf_planets/vesta/vesta.asset
index 69596c5abd..be9ae6b5a7 100644
--- a/data/assets/scene/solarsystem/dwarf_planets/vesta/vesta.asset
+++ b/data/assets/scene/solarsystem/dwarf_planets/vesta/vesta.asset
@@ -6,7 +6,6 @@ asset.require("./label", false)
 
 asset.meta = {
   Name = "Vesta meta asset",
-  Version = "1.0",
   Description = [[Trail, Model and Label of Vesta.]],
   Author = "OpenSpace Team",
   URL = "https://www.openspaceproject.com",
diff --git a/data/assets/scene/solarsystem/heliosphere/2012/sun_earth_2012_fieldlines_batsrus.asset b/data/assets/scene/solarsystem/heliosphere/2012/sun_earth_2012_fieldlines_batsrus.asset
index eef87d0315..b11b3d2658 100644
--- a/data/assets/scene/solarsystem/heliosphere/2012/sun_earth_2012_fieldlines_batsrus.asset
+++ b/data/assets/scene/solarsystem/heliosphere/2012/sun_earth_2012_fieldlines_batsrus.asset
@@ -165,7 +165,6 @@ asset.export(BatsrusAsherStaticSeedsFlowLines)
 
 asset.meta = {
   Name = "Fieldlines from Batsrus model of 2012 event",
-  Version = "1.0",
   Description = "Magnetic fieldlines from Batsrus model for a 2012 CME event",
   Author = "CCMC",
   URL = "",
diff --git a/data/assets/scene/solarsystem/heliosphere/2012/sun_earth_2012_fieldlines_enlil.asset b/data/assets/scene/solarsystem/heliosphere/2012/sun_earth_2012_fieldlines_enlil.asset
index 191aac9599..00e431c829 100644
--- a/data/assets/scene/solarsystem/heliosphere/2012/sun_earth_2012_fieldlines_enlil.asset
+++ b/data/assets/scene/solarsystem/heliosphere/2012/sun_earth_2012_fieldlines_enlil.asset
@@ -229,7 +229,6 @@ asset.export(ENLILStereoA)
 
 asset.meta = {
   Name = "Fieldlines from ENLIL model of 2012 event",
-  Version = "1.0",
   Description = "Magnetic fieldlines from ENLIL model for a 2012 CME event",
   Author = "CCMC",
   URL = "",
diff --git a/data/assets/scene/solarsystem/heliosphere/2012/sun_earth_2012_fieldlines_pfss.asset b/data/assets/scene/solarsystem/heliosphere/2012/sun_earth_2012_fieldlines_pfss.asset
index 3a6943fb56..844f5f0207 100644
--- a/data/assets/scene/solarsystem/heliosphere/2012/sun_earth_2012_fieldlines_pfss.asset
+++ b/data/assets/scene/solarsystem/heliosphere/2012/sun_earth_2012_fieldlines_pfss.asset
@@ -100,7 +100,6 @@ asset.export("DarkSun", DarkSun.Identifier)
 
 asset.meta = {
   Name = "Fieldlines from PFSS model of 2012 event",
-  Version = "1.0",
   Description = "Magnetic fieldlines from PFSS model for a 2012 CME event",
   Author = "CCMC",
   URL = "",
diff --git a/data/assets/scene/solarsystem/heliosphere/bastille_day/actions.asset b/data/assets/scene/solarsystem/heliosphere/bastille_day/actions.asset
index f23e0e6a6e..f10942b180 100644
--- a/data/assets/scene/solarsystem/heliosphere/bastille_day/actions.asset
+++ b/data/assets/scene/solarsystem/heliosphere/bastille_day/actions.asset
@@ -99,7 +99,6 @@ asset.export("LongLoop", LongLoop.Identifier)
 
 asset.meta = {
   Name = "Bastille day actions",
-  Version = "1.0",
   Description = "Asset with actions related to Bastille day",
   Author = "CCMC, OpenSpace Team",
   URL = "http://openspaceproject.com",
diff --git a/data/assets/scene/solarsystem/heliosphere/bastille_day/carrington_to_heeq_rotation.asset b/data/assets/scene/solarsystem/heliosphere/bastille_day/carrington_to_heeq_rotation.asset
index 2070e38baa..35c46b84a2 100644
--- a/data/assets/scene/solarsystem/heliosphere/bastille_day/carrington_to_heeq_rotation.asset
+++ b/data/assets/scene/solarsystem/heliosphere/bastille_day/carrington_to_heeq_rotation.asset
@@ -19,7 +19,6 @@ asset.export("CarringtonLongitudeToHEEQ180Rotation", CarringtonLongitudeToHEEQ18
 
 asset.meta = {
   Name = "Carrington Longitude To HEEQ180 Rotation",
-  Version = "1.0",
   Description = "Contains a rotation for HEEQ180 to be used by another file",
   Author = "OpenSpace Team",
   URL = "http://openspaceproject.com",
diff --git a/data/assets/scene/solarsystem/heliosphere/bastille_day/density_volume.asset b/data/assets/scene/solarsystem/heliosphere/bastille_day/density_volume.asset
index 7df028b1b6..919230b635 100644
--- a/data/assets/scene/solarsystem/heliosphere/bastille_day/density_volume.asset
+++ b/data/assets/scene/solarsystem/heliosphere/bastille_day/density_volume.asset
@@ -97,7 +97,6 @@ asset.export("ToggleVolume", ToggleVolume.Identifier)
 
 asset.meta = {
   Name = "Predictive Science Inc. Volume Rendering Bastille Day",
-  Version = "1.1",
   Description = "Volumetric rendering for the bastille day CME event",
   Author = "CCMC, OpenSpace team",
   URL = "https://dx.doi.org/10.3847/1538-4357/aab36d",
diff --git a/data/assets/scene/solarsystem/heliosphere/bastille_day/fieldlines.asset b/data/assets/scene/solarsystem/heliosphere/bastille_day/fieldlines.asset
index 104aa74034..a7933043c5 100644
--- a/data/assets/scene/solarsystem/heliosphere/bastille_day/fieldlines.asset
+++ b/data/assets/scene/solarsystem/heliosphere/bastille_day/fieldlines.asset
@@ -96,7 +96,6 @@ asset.export("ToggleFieldlines", ToggleFieldlines.Identifier)
 
 asset.meta = {
   Name = "Predictive Science Inc. Fieldlines Bastille Day",
-  Version = "1.1",
   Description = "Magnetic fieldlines for the bastille day CME event",
   Author = "CCMC, Jonathan Grangien, Matthias Berg",
   URL = "https://dx.doi.org/10.3847/1538-4357/aab36d",
diff --git a/data/assets/scene/solarsystem/heliosphere/bastille_day/fluxnodes.asset b/data/assets/scene/solarsystem/heliosphere/bastille_day/fluxnodes.asset
index fa63a907b4..06069e4f4d 100644
--- a/data/assets/scene/solarsystem/heliosphere/bastille_day/fluxnodes.asset
+++ b/data/assets/scene/solarsystem/heliosphere/bastille_day/fluxnodes.asset
@@ -81,7 +81,6 @@ asset.export("ToggleFluxnodes", ToggleFluxnodes.Identifier)
 
 asset.meta = {
   Name = "Predictive Science Inc. Flux nodes Bastille Day",
-  Version = "1.1",
   Description = "Flux nodes for the bastille day CME event",
   Author = "CCMC, Christian Adamsson, Emilie Ho",
   URL = "https://dx.doi.org/10.3847/1538-4357/aab36d",
diff --git a/data/assets/scene/solarsystem/heliosphere/bastille_day/fluxnodescutplane.asset b/data/assets/scene/solarsystem/heliosphere/bastille_day/fluxnodescutplane.asset
index 1952a84819..37893aad5a 100644
--- a/data/assets/scene/solarsystem/heliosphere/bastille_day/fluxnodescutplane.asset
+++ b/data/assets/scene/solarsystem/heliosphere/bastille_day/fluxnodescutplane.asset
@@ -151,7 +151,6 @@ asset.export(MeridialCutplane)
 
 asset.meta = {
   Name = "Predictive Science Inc. Cutplanes Bastille Days",
-  Version = "1.1",
   Description = "Cutplanes for the bastille day CME event",
   Author = "CCMC, Christian Adamsson, Emilie Ho",
   URL = "https://dx.doi.org/10.3847/1538-4357/aab36d",
diff --git a/data/assets/scene/solarsystem/heliosphere/bastille_day/fluxnodeslegend.asset b/data/assets/scene/solarsystem/heliosphere/bastille_day/fluxnodeslegend.asset
index 696976215e..43427b2bff 100644
--- a/data/assets/scene/solarsystem/heliosphere/bastille_day/fluxnodeslegend.asset
+++ b/data/assets/scene/solarsystem/heliosphere/bastille_day/fluxnodeslegend.asset
@@ -80,7 +80,6 @@ asset.export("HideLegend", HideLegend.Identifier)
 
 asset.meta = {
   Name = "Predictive Science Inc. Flux nodes legend for Bastille Days",
-  Version = "1.1",
   Description = [[Screen space renderable image legend of flux nodes for the bastille day
     CME event]],
   Author = "Christian Adamsson, Emilie Ho",
diff --git a/data/assets/scene/solarsystem/heliosphere/bastille_day/lightindicator.asset b/data/assets/scene/solarsystem/heliosphere/bastille_day/lightindicator.asset
index eeac33b452..ba36beaa06 100644
--- a/data/assets/scene/solarsystem/heliosphere/bastille_day/lightindicator.asset
+++ b/data/assets/scene/solarsystem/heliosphere/bastille_day/lightindicator.asset
@@ -47,7 +47,6 @@ asset.export(TravelSpeedIndicator)
 
 asset.meta = {
   Name = "Light travel from sun to earth",
-  Version = "1.0",
   Description = "Speed of light indicator from sun to earth",
   Author = "CCMC, Christian Adamsson, Emilie Ho",
   URL = "",
diff --git a/data/assets/scene/solarsystem/heliosphere/bastille_day/magnetogram.asset b/data/assets/scene/solarsystem/heliosphere/bastille_day/magnetogram.asset
index 2027018b5c..17b5bbdcff 100644
--- a/data/assets/scene/solarsystem/heliosphere/bastille_day/magnetogram.asset
+++ b/data/assets/scene/solarsystem/heliosphere/bastille_day/magnetogram.asset
@@ -15,7 +15,6 @@ asset.export("TexturesPath", TexturesPath)
 -- 856:75.
 asset.meta = {
   Name = "Predictive Science Inc. MAS Bastille Day Textures",
-  Version = "1.0",
   Description = [[Magnetograms of the sun as texture color layers]],
   Author = "Jonathan Grangien, Matthias Berg",
   URL = "https://dx.doi.org/10.3847/1538-4357/aab36d",
diff --git a/data/assets/scene/solarsystem/heliosphere/bastille_day/magnetogram_textures.asset b/data/assets/scene/solarsystem/heliosphere/bastille_day/magnetogram_textures.asset
index 7265d59f4a..9117ffe63b 100644
--- a/data/assets/scene/solarsystem/heliosphere/bastille_day/magnetogram_textures.asset
+++ b/data/assets/scene/solarsystem/heliosphere/bastille_day/magnetogram_textures.asset
@@ -65,7 +65,6 @@ asset.export("SwitchColorLayer", SwitchColorLayer.Identifier)
 
 asset.meta = {
   Name = "Bastille Day magnetogram textures",
-  Version = "1.1",
   Description = [[This asset adds multiple magnetogram textures to the Sun. In addition
   it provides an action to cycle through the textures. See magnetogram.asset for details
   of the textures]],
diff --git a/data/assets/scene/solarsystem/interstellar/c-2019_q4_borisov.asset b/data/assets/scene/solarsystem/interstellar/c-2019_q4_borisov.asset
index aa41c39912..ae18a90f26 100644
--- a/data/assets/scene/solarsystem/interstellar/c-2019_q4_borisov.asset
+++ b/data/assets/scene/solarsystem/interstellar/c-2019_q4_borisov.asset
@@ -72,7 +72,6 @@ asset.export(C2019Q4BorisovTrail)
 
 asset.meta = {
   Name = "C/2019 Q4 Borisov",
-  Version = "1.2",
   Description = [[This asset contains the trail and position of C-2019 Q4 Borisov from
     2015 JAN 01 00:00:00 to 2050 JAN 01 00:00:00. Data from JPL Horizons]],
   Author = "OpenSpace Team",
diff --git a/data/assets/scene/solarsystem/interstellar/oumuamua.asset b/data/assets/scene/solarsystem/interstellar/oumuamua.asset
index a94947803e..ecc79dd698 100644
--- a/data/assets/scene/solarsystem/interstellar/oumuamua.asset
+++ b/data/assets/scene/solarsystem/interstellar/oumuamua.asset
@@ -73,7 +73,6 @@ asset.export(OumuamuaTrail)
 
 asset.meta = {
   Name = "'Oumuamua",
-  Version = "1.2",
   Description = [[This asset contains the trail and position of 'Oumuamua from 2014
     JAN 01 00:00:00 to 2050 JAN 01 00:00:00. Data from JPL Horizons]],
   Author = "OpenSpace Team",
diff --git a/data/assets/scene/solarsystem/missions/apollo/11/actions.asset b/data/assets/scene/solarsystem/missions/apollo/11/actions.asset
index bf9a60ca08..80a488c681 100644
--- a/data/assets/scene/solarsystem/missions/apollo/11/actions.asset
+++ b/data/assets/scene/solarsystem/missions/apollo/11/actions.asset
@@ -35,7 +35,6 @@ asset.export("LandingSite", LandingSite.Identifier)
 
 asset.meta = {
   Name = "Apollo 11 Actions",
-  Version = "1.0",
   Description = "Asset with actions related to the Apollo 11 mission",
   Author = "OpenSpace Team",
   URL = "http://openspaceproject.com",
diff --git a/data/assets/scene/solarsystem/missions/apollo/17/actions.asset b/data/assets/scene/solarsystem/missions/apollo/17/actions.asset
index 44fc503a4f..e7c8f98123 100644
--- a/data/assets/scene/solarsystem/missions/apollo/17/actions.asset
+++ b/data/assets/scene/solarsystem/missions/apollo/17/actions.asset
@@ -37,7 +37,6 @@ end)
 
 asset.meta = {
   Name = "Apollo 17 Actions",
-  Version = "1.0",
   Description = "Asset with actions related to the Apollo 11 mission",
   Author = "OpenSpace Team",
   URL = "http://openspaceproject.com",
diff --git a/data/assets/scene/solarsystem/missions/apollo/8/actions.asset b/data/assets/scene/solarsystem/missions/apollo/8/actions.asset
index 6f309dc707..c565ff484c 100644
--- a/data/assets/scene/solarsystem/missions/apollo/8/actions.asset
+++ b/data/assets/scene/solarsystem/missions/apollo/8/actions.asset
@@ -48,7 +48,6 @@ asset.export("Launch", Launch.Identifier)
 
 asset.meta = {
   Name = "Apollo 8 Actions",
-  Version = "1.0",
   Description = "Asset with actions related to the Apollo 8 mission",
   Author = "OpenSpace Team",
   URL = "http://openspaceproject.com",
diff --git a/data/assets/scene/solarsystem/missions/apollo/actions.asset b/data/assets/scene/solarsystem/missions/apollo/actions.asset
index 99e3a6830d..68ab8c420e 100644
--- a/data/assets/scene/solarsystem/missions/apollo/actions.asset
+++ b/data/assets/scene/solarsystem/missions/apollo/actions.asset
@@ -55,7 +55,6 @@ end)
 
 asset.meta = {
   Name = "Actions - Apollo missions",
-  Version = "1.0",
   Description = "Actions related to the Apollo missions",
   Author = "OpenSpace Team",
   URL = "http://openspaceproject.com",
diff --git a/data/assets/scene/solarsystem/missions/artemis/actions.asset b/data/assets/scene/solarsystem/missions/artemis/actions.asset
index dbe4064d6f..ce058276ff 100644
--- a/data/assets/scene/solarsystem/missions/artemis/actions.asset
+++ b/data/assets/scene/solarsystem/missions/artemis/actions.asset
@@ -22,7 +22,6 @@ asset.export("SetupLaunch", SetupLaunch.Identifier)
 
 asset.meta = {
   Name = "Actions - Artemis",
-  Version = "1.0",
   Description = "Actions related to the Artemis mission",
   Author = "OpenSpace Team",
   URL = "http://openspaceproject.com",
diff --git a/data/assets/scene/solarsystem/missions/artemis/model.asset b/data/assets/scene/solarsystem/missions/artemis/model.asset
index b01d723acb..d90170526f 100644
--- a/data/assets/scene/solarsystem/missions/artemis/model.asset
+++ b/data/assets/scene/solarsystem/missions/artemis/model.asset
@@ -55,7 +55,6 @@ asset.export(ArtemisModel)
 
 asset.meta = {
   Name = "Artemis-1 Model",
-  Version = "1.0",
   Description = "Orion capsule model for the Artemis-1 mission",
   Author = "OpenSpace Team",
   URL = "http://openspaceproject.com",
diff --git a/data/assets/scene/solarsystem/missions/artemis/trail.asset b/data/assets/scene/solarsystem/missions/artemis/trail.asset
index 4b6dfa931a..d3a29f95da 100644
--- a/data/assets/scene/solarsystem/missions/artemis/trail.asset
+++ b/data/assets/scene/solarsystem/missions/artemis/trail.asset
@@ -71,7 +71,6 @@ asset.export(ArtemisMoonTrail)
 
 asset.meta = {
   Name = "Artemis-1 Trails",
-  Version = "1.0",
   Description = "Trail of Artemis-1 in respect to Earth and the Moon",
   Author = "OpenSpace Team",
   URL = "http://openspaceproject.com",
diff --git a/data/assets/scene/solarsystem/missions/artemis/transforms.asset b/data/assets/scene/solarsystem/missions/artemis/transforms.asset
index 83d4bc6166..8c32007207 100644
--- a/data/assets/scene/solarsystem/missions/artemis/transforms.asset
+++ b/data/assets/scene/solarsystem/missions/artemis/transforms.asset
@@ -37,7 +37,6 @@ asset.export(ArtemisPosition)
 
 asset.meta = {
   Name = "Artemis-1 Transforms",
-  Version = "1.0",
   Description = "Artemis-1 transforms, position relative to Earth",
   Author = "OpenSpace Team",
   URL = "http://openspaceproject.com",
diff --git a/data/assets/scene/solarsystem/missions/bepicolombo/bepicolombo.asset b/data/assets/scene/solarsystem/missions/bepicolombo/bepicolombo.asset
index 616728c08b..0c7155adc2 100644
--- a/data/assets/scene/solarsystem/missions/bepicolombo/bepicolombo.asset
+++ b/data/assets/scene/solarsystem/missions/bepicolombo/bepicolombo.asset
@@ -7,7 +7,6 @@ asset.require("./fov")
 
 asset.meta = {
   Name = "BepiColombo",
-  Version = "1.0",
   Description =
     "This asset includes all of the other assets for the BepiColombo mission.",
   Author = "OpenSpace Team",
diff --git a/data/assets/scene/solarsystem/missions/bepicolombo/fov/bela.asset b/data/assets/scene/solarsystem/missions/bepicolombo/fov/bela.asset
index e99a422999..d06d82348b 100644
--- a/data/assets/scene/solarsystem/missions/bepicolombo/fov/bela.asset
+++ b/data/assets/scene/solarsystem/missions/bepicolombo/fov/bela.asset
@@ -89,7 +89,6 @@ end)
 
 asset.meta = {
   Name = "BELA",
-  Version = "1.0",
   Description = [[
     BELA for the first time will return a digitized laser reflection signal (only in a
     dedicated instrument mode in order to keep the overall data volume moderate). This
diff --git a/data/assets/scene/solarsystem/missions/bepicolombo/fov/hga.asset b/data/assets/scene/solarsystem/missions/bepicolombo/fov/hga.asset
index e4e5e6c7e6..8b1f13b8a2 100644
--- a/data/assets/scene/solarsystem/missions/bepicolombo/fov/hga.asset
+++ b/data/assets/scene/solarsystem/missions/bepicolombo/fov/hga.asset
@@ -40,7 +40,6 @@ end)
 
 asset.meta = {
   Name = "HGA",
-  Version = "1.0",
   Description = "Shows the field-view for the High Gain Antenna of the MPO spacecraft.",
   Author = "OpenSpace Team",
   URL = "http://openspaceproject.com",
diff --git a/data/assets/scene/solarsystem/missions/bepicolombo/fov/mertis.asset b/data/assets/scene/solarsystem/missions/bepicolombo/fov/mertis.asset
index 2746bc7a0b..0f8fa5c52b 100644
--- a/data/assets/scene/solarsystem/missions/bepicolombo/fov/mertis.asset
+++ b/data/assets/scene/solarsystem/missions/bepicolombo/fov/mertis.asset
@@ -89,7 +89,6 @@ end)
 
 asset.meta = {
   Name = "MERTIS",
-  Version = "1.0",
   Description = [[
     The Mercury Radiometer and Thermal Infrared Spectrometer (MERTIS) is an innovative
     instrument for studying the surface composition and mineralogy of planet Mercury.
diff --git a/data/assets/scene/solarsystem/missions/bepicolombo/fov/mgns.asset b/data/assets/scene/solarsystem/missions/bepicolombo/fov/mgns.asset
index d54ce926c3..b825943c8a 100644
--- a/data/assets/scene/solarsystem/missions/bepicolombo/fov/mgns.asset
+++ b/data/assets/scene/solarsystem/missions/bepicolombo/fov/mgns.asset
@@ -40,7 +40,6 @@ end)
 
 asset.meta = {
   Name = "MGNS",
-  Version = "1.0",
   Description = [[
     The Mercury Gamma-ray and Neutron Spectrometer (MGNS) on board BepiColombo Mercury
     Planet Orbiter is designed to observe and study the gamma-ray and neutron emissions of
diff --git a/data/assets/scene/solarsystem/missions/bepicolombo/fov/mixs.asset b/data/assets/scene/solarsystem/missions/bepicolombo/fov/mixs.asset
index 5696e1fed2..660fbf0011 100644
--- a/data/assets/scene/solarsystem/missions/bepicolombo/fov/mixs.asset
+++ b/data/assets/scene/solarsystem/missions/bepicolombo/fov/mixs.asset
@@ -64,7 +64,6 @@ end)
 
 asset.meta = {
   Name = "MIXS",
-  Version = "1.0",
   Description = [[
     The MIXS instrument contains two parallel telescopes, designed to map the X-ray
     emission from Mercury at two angular resolutions. The narrow-field telescope (MIXS-T)
diff --git a/data/assets/scene/solarsystem/missions/bepicolombo/fov/phebus.asset b/data/assets/scene/solarsystem/missions/bepicolombo/fov/phebus.asset
index 86d52904ec..99774fd548 100644
--- a/data/assets/scene/solarsystem/missions/bepicolombo/fov/phebus.asset
+++ b/data/assets/scene/solarsystem/missions/bepicolombo/fov/phebus.asset
@@ -114,7 +114,6 @@ end)
 
 asset.meta = {
   Name = "Phebus",
-  Version = "1.0",
   Description = [[
     The PHEBUS instrument is a UV spectrometer covering the spectral range going from
     50 nm to 315 nm with two additional narrow bands in the visible around 404 nm (K line)
diff --git a/data/assets/scene/solarsystem/missions/bepicolombo/fov/serena.asset b/data/assets/scene/solarsystem/missions/bepicolombo/fov/serena.asset
index ce050aa3ec..b65a60d545 100644
--- a/data/assets/scene/solarsystem/missions/bepicolombo/fov/serena.asset
+++ b/data/assets/scene/solarsystem/missions/bepicolombo/fov/serena.asset
@@ -39,7 +39,6 @@ end)
 
 asset.meta = {
   Name = "Serena",
-  Version = "1.0",
   Description = [[
     The Search for Exospheric Refilling and Emitted Natural Abundances (SERENA) is a
     single instrument composed by 4 units devoted to the detection of neutral and ionized
diff --git a/data/assets/scene/solarsystem/missions/bepicolombo/fov/serena_anodes.asset b/data/assets/scene/solarsystem/missions/bepicolombo/fov/serena_anodes.asset
index 9476efd37f..37dc6226ec 100644
--- a/data/assets/scene/solarsystem/missions/bepicolombo/fov/serena_anodes.asset
+++ b/data/assets/scene/solarsystem/missions/bepicolombo/fov/serena_anodes.asset
@@ -815,7 +815,6 @@ end)
 
 asset.meta = {
   Name = "Serena Anodes",
-  Version = "1.0",
   Description = [[
     The Search for Exospheric Refilling and Emitted Natural Abundances (SERENA) is a
     single instrument composed by 4 units devoted to the detection of neutral and ionized
diff --git a/data/assets/scene/solarsystem/missions/bepicolombo/fov/sibbiosys.asset b/data/assets/scene/solarsystem/missions/bepicolombo/fov/sibbiosys.asset
index b5199d9b94..7227b9a4ad 100644
--- a/data/assets/scene/solarsystem/missions/bepicolombo/fov/sibbiosys.asset
+++ b/data/assets/scene/solarsystem/missions/bepicolombo/fov/sibbiosys.asset
@@ -364,7 +364,6 @@ end)
 
 asset.meta = {
   Name = "SYMBIO-SYS",
-  Version = "1.0",
   Description = [[
     SIMBIO-SYS has been conceived to be integrated on the BepiColombo MPO pointing in the
     nadir direction in order to perform the remote sensing of the Mercury surface during
diff --git a/data/assets/scene/solarsystem/missions/bepicolombo/fov/sixs.asset b/data/assets/scene/solarsystem/missions/bepicolombo/fov/sixs.asset
index a523a5c653..ab08db5aad 100644
--- a/data/assets/scene/solarsystem/missions/bepicolombo/fov/sixs.asset
+++ b/data/assets/scene/solarsystem/missions/bepicolombo/fov/sixs.asset
@@ -90,7 +90,6 @@ end)
 
 asset.meta = {
   Name = "Sixs",
-  Version = "1.0",
   Description = [[
     The scientific investigation performed by the Solar Intensity X-ray and particle
     Spectrometer (SIXS) is the determination of solar impact on the Hermean surface in the
diff --git a/data/assets/scene/solarsystem/missions/bepicolombo/fov/startracker.asset b/data/assets/scene/solarsystem/missions/bepicolombo/fov/startracker.asset
index 924aa134a2..9d2fec4234 100644
--- a/data/assets/scene/solarsystem/missions/bepicolombo/fov/startracker.asset
+++ b/data/assets/scene/solarsystem/missions/bepicolombo/fov/startracker.asset
@@ -90,7 +90,6 @@ end)
 
 asset.meta = {
   Name = "Star Tracker",
-  Version = "1.0",
   Description = [[
     From a functional point of view, the Autonomous Star Trackers can be seen as a video
     camera plus an image processing unit that, starting from an image of the sky, extracts
diff --git a/data/assets/scene/solarsystem/missions/bepicolombo/kernels.asset b/data/assets/scene/solarsystem/missions/bepicolombo/kernels.asset
index 7503619b7a..c473ebb013 100644
--- a/data/assets/scene/solarsystem/missions/bepicolombo/kernels.asset
+++ b/data/assets/scene/solarsystem/missions/bepicolombo/kernels.asset
@@ -295,7 +295,6 @@ asset.export("Frame", Frame)
 
 asset.meta = {
   Name = "BepiColombo Kernels",
-  Version = "1.0",
   Description = "This asset contains the SPICE kernels for the BepiColombo mission.",
   Author = "OpenSpace Team",
   URL = "http://openspaceproject.com",
diff --git a/data/assets/scene/solarsystem/missions/bepicolombo/mission.asset b/data/assets/scene/solarsystem/missions/bepicolombo/mission.asset
index 681febe171..e3c7ad03c7 100644
--- a/data/assets/scene/solarsystem/missions/bepicolombo/mission.asset
+++ b/data/assets/scene/solarsystem/missions/bepicolombo/mission.asset
@@ -80,7 +80,6 @@ end)
 
 asset.meta = {
   Name = "BepiColombo Mission",
-  Version = "1.0",
   Description = "This asset contains the mission profile information for the BepiColombo mission. The data in this file has been taken from https://www.esa.int/Science_Exploration/Space_Science/BepiColombo/BepiColombo_factsheet",
   Author = "OpenSpace Team",
   URL = "http://openspaceproject.com",
diff --git a/data/assets/scene/solarsystem/missions/bepicolombo/model.asset b/data/assets/scene/solarsystem/missions/bepicolombo/model.asset
index d0d4fd8db5..b8bad5c43a 100644
--- a/data/assets/scene/solarsystem/missions/bepicolombo/model.asset
+++ b/data/assets/scene/solarsystem/missions/bepicolombo/model.asset
@@ -76,7 +76,6 @@ asset.export(BepiColombo)
 
 asset.meta = {
   Name = "BepiColombo Model",
-  Version = "1.0",
   Description = "This asset contains the model of the BepiColombo spacecraft. The model is retrieved from https://s2e2.cosmos.esa.int/bitbucket/projects/SPICE_KERNELS/repos/bepicolombo",
   Author = "OpenSpace Team",
   URL = "http://openspaceproject.com",
diff --git a/data/assets/scene/solarsystem/missions/bepicolombo/trails.asset b/data/assets/scene/solarsystem/missions/bepicolombo/trails.asset
index b2220287c2..5dff82569c 100644
--- a/data/assets/scene/solarsystem/missions/bepicolombo/trails.asset
+++ b/data/assets/scene/solarsystem/missions/bepicolombo/trails.asset
@@ -65,7 +65,6 @@ asset.export(BepiColomboTrailMercury)
 
 asset.meta = {
   Name = "BepiColombo Trails",
-  Version = "1.0",
   Description = "This asset contains the trails for the BepiColombo spacecraft relative to the Sun and Mercury.",
   Author = "OpenSpace Team",
   URL = "http://openspaceproject.com",
diff --git a/data/assets/scene/solarsystem/missions/dawn/dawn.asset b/data/assets/scene/solarsystem/missions/dawn/dawn.asset
index 07984361d6..b5aa5aa3de 100644
--- a/data/assets/scene/solarsystem/missions/dawn/dawn.asset
+++ b/data/assets/scene/solarsystem/missions/dawn/dawn.asset
@@ -169,7 +169,6 @@ asset.export(DawnFramingCamera2)
 
 asset.meta = {
   Name = "Dawn",
-  Version = "2.0",
   Description = "Dawn spacecraft and trail",
   Author = "OpenSpace Team",
   URL = "http://openspaceproject.com",
diff --git a/data/assets/scene/solarsystem/missions/dawn/vesta.asset b/data/assets/scene/solarsystem/missions/dawn/vesta.asset
index fd50231e85..c8c28c8257 100644
--- a/data/assets/scene/solarsystem/missions/dawn/vesta.asset
+++ b/data/assets/scene/solarsystem/missions/dawn/vesta.asset
@@ -149,7 +149,6 @@ asset.export(VestaTrail)
 
 asset.meta = {
   Name = "Vesta",
-  Version = "1.1",
   Description = "Vesta model projection and trail",
   Author = "OpenSpace Team",
   URL = "http://openspaceproject.com",
diff --git a/data/assets/scene/solarsystem/missions/insight/actions.asset b/data/assets/scene/solarsystem/missions/insight/actions.asset
index ebb9df1798..beac8a68eb 100644
--- a/data/assets/scene/solarsystem/missions/insight/actions.asset
+++ b/data/assets/scene/solarsystem/missions/insight/actions.asset
@@ -52,7 +52,6 @@ end)
 
 asset.meta = {
   Name = "Insight Actions",
-  Version = "1.0",
   Description = "Actions related to the Insight mission",
   Author = "OpenSpace Team",
   URL = "http://openspaceproject.com",
diff --git a/data/assets/scene/solarsystem/missions/juice/fieldlines.asset b/data/assets/scene/solarsystem/missions/juice/fieldlines.asset
index c33e2af97a..37f8c3793a 100644
--- a/data/assets/scene/solarsystem/missions/juice/fieldlines.asset
+++ b/data/assets/scene/solarsystem/missions/juice/fieldlines.asset
@@ -48,7 +48,6 @@ end)
 
 asset.meta = {
   Name = "Static fieldline representation of Ganymede's magnetic field",
-  Version = "1.0",
   Description = [[
     Showing a single timestep of the magnetic fieldlines around Ganymede in the GPHIO
     coordinate system
diff --git a/data/assets/scene/solarsystem/missions/juice/fov/gala.asset b/data/assets/scene/solarsystem/missions/juice/fov/gala.asset
index 77d091a62e..2bdb877dad 100644
--- a/data/assets/scene/solarsystem/missions/juice/fov/gala.asset
+++ b/data/assets/scene/solarsystem/missions/juice/fov/gala.asset
@@ -49,7 +49,6 @@ asset.export(Gala)
 
 asset.meta = {
   Name = "GALA",
-  Version = "1.0",
   Description = [[
     Shows the field-view for the Ganymede Laser Altimeter (GALA) instrument onboard Juice,
     measuring a 2.5D heightfield of Ganymede and Europa. See
diff --git a/data/assets/scene/solarsystem/missions/juice/fov/janus.asset b/data/assets/scene/solarsystem/missions/juice/fov/janus.asset
index f06c8f91da..8b4d872e93 100644
--- a/data/assets/scene/solarsystem/missions/juice/fov/janus.asset
+++ b/data/assets/scene/solarsystem/missions/juice/fov/janus.asset
@@ -53,7 +53,6 @@ asset.export(Janus)
 
 asset.meta = {
   Name = "Janus",
-  Version = "1.0",
   Description = [[
     Shows the field-view for the Jovis Amorum ac Natorum Undique Scrutator (JANUS)
     instrument onboard Juice, which is the camera operating in visible wavelengths. See
diff --git a/data/assets/scene/solarsystem/missions/juice/fov/jmc.asset b/data/assets/scene/solarsystem/missions/juice/fov/jmc.asset
index e1b9379b7b..cd8a82ae90 100644
--- a/data/assets/scene/solarsystem/missions/juice/fov/jmc.asset
+++ b/data/assets/scene/solarsystem/missions/juice/fov/jmc.asset
@@ -79,7 +79,6 @@ asset.export(JMC2)
 
 asset.meta = {
   Name = "JMC",
-  Version = "1.0",
   Description = [[
     Shows the field-view for the Juice Monitoring Cameras (JMC) onboard Juice, which
     provide status information about the deployment of various Juice systems, like the
diff --git a/data/assets/scene/solarsystem/missions/juice/fov/majis.asset b/data/assets/scene/solarsystem/missions/juice/fov/majis.asset
index 03dacf43bf..772c537e71 100644
--- a/data/assets/scene/solarsystem/missions/juice/fov/majis.asset
+++ b/data/assets/scene/solarsystem/missions/juice/fov/majis.asset
@@ -245,7 +245,6 @@ asset.export(Majis)
 
 asset.meta = {
   Name = "Majis",
-  Version = "1.0",
   Description = [[
     Shows the field-view for the Moon and Jupiter Imaging Spectrometer (MAJIS) onboard
     Juice, which is going to take spectroscopic measurements of the Jovian moons and
diff --git a/data/assets/scene/solarsystem/missions/juice/fov/navcam.asset b/data/assets/scene/solarsystem/missions/juice/fov/navcam.asset
index 95cfd38267..f560ff49fc 100644
--- a/data/assets/scene/solarsystem/missions/juice/fov/navcam.asset
+++ b/data/assets/scene/solarsystem/missions/juice/fov/navcam.asset
@@ -47,7 +47,6 @@ asset.export(NavCam)
 
 asset.meta = {
   Name = "NavCam",
-  Version = "1.0",
   Description = [[
     Shows the field-view for the navigational camera (NavCam) onboard Juice, which is used
     to measure the location of Juice. See
diff --git a/data/assets/scene/solarsystem/missions/juice/fov/rime.asset b/data/assets/scene/solarsystem/missions/juice/fov/rime.asset
index 6e6bd3c276..0cf595d298 100644
--- a/data/assets/scene/solarsystem/missions/juice/fov/rime.asset
+++ b/data/assets/scene/solarsystem/missions/juice/fov/rime.asset
@@ -81,7 +81,6 @@ asset.export(RimeBase)
 
 asset.meta = {
   Name = "RIME",
-  Version = "1.0",
   Description = [[
     Shows the field-view for the Radar for Icy Moons Exploration (RIME) onboard Juice,
     which is a ground-penetrating radar meant to measure the subsurface structure of the
diff --git a/data/assets/scene/solarsystem/missions/juice/fov/startracker.asset b/data/assets/scene/solarsystem/missions/juice/fov/startracker.asset
index a0e5f55e06..0919a57cb3 100644
--- a/data/assets/scene/solarsystem/missions/juice/fov/startracker.asset
+++ b/data/assets/scene/solarsystem/missions/juice/fov/startracker.asset
@@ -111,7 +111,6 @@ asset.export(StarOh3)
 
 asset.meta = {
   Name = "Star Tracker",
-  Version = "1.0",
   Description = [[
     Shows the field-view for the three headed "Hydra" star trackers onboard Juice, which
     is measuring the location of stars and comparing them to their known locations in
diff --git a/data/assets/scene/solarsystem/missions/juice/fov/swi.asset b/data/assets/scene/solarsystem/missions/juice/fov/swi.asset
index 5bd2388bd7..a5e7f54196 100644
--- a/data/assets/scene/solarsystem/missions/juice/fov/swi.asset
+++ b/data/assets/scene/solarsystem/missions/juice/fov/swi.asset
@@ -131,7 +131,6 @@ asset.export(SwiFull)
 
 asset.meta = {
   Name = "SWI",
-  Version = "1.0",
   Description = [[
     Shows the field-view for the Submillimetre Wave Instrument (SWI), which is measuring
     the chemistry, meteorology, and structure of Jupiters middle atmosphere as well as the
diff --git a/data/assets/scene/solarsystem/missions/juice/fov/uvs.asset b/data/assets/scene/solarsystem/missions/juice/fov/uvs.asset
index 9753a7710e..0190a72bea 100644
--- a/data/assets/scene/solarsystem/missions/juice/fov/uvs.asset
+++ b/data/assets/scene/solarsystem/missions/juice/fov/uvs.asset
@@ -47,7 +47,6 @@ asset.export(UVS)
 
 asset.meta = {
   Name = "UVS",
-  Version = "1.0",
   Description = [[
     Shows the field-view for the Ultraviolet Spectograph (UVS), which is measuring the
     composition, chemistry, structure, and variability of Europa's atmopshere. See
diff --git a/data/assets/scene/solarsystem/missions/juice/kernels.asset b/data/assets/scene/solarsystem/missions/juice/kernels.asset
index f20ca7d17d..98e67d9096 100644
--- a/data/assets/scene/solarsystem/missions/juice/kernels.asset
+++ b/data/assets/scene/solarsystem/missions/juice/kernels.asset
@@ -103,7 +103,6 @@ asset.export("Frame", Frame)
 
 asset.meta = {
   Name = "Spice Kernels for the Juice Mission",
-  Version = "1.0",
   Description = [[
     Kernels were acquired from the official Juice mailing list and extended with the
     GPHIO kernel provided by Ronan Modolo for the fieldline and plane data visualization
diff --git a/data/assets/scene/solarsystem/missions/juice/model.asset b/data/assets/scene/solarsystem/missions/juice/model.asset
index bc1de316b6..1dbb7c4f4a 100644
--- a/data/assets/scene/solarsystem/missions/juice/model.asset
+++ b/data/assets/scene/solarsystem/missions/juice/model.asset
@@ -66,7 +66,6 @@ asset.export(JuiceModel)
 
 asset.meta = {
   Name = "Juice Model",
-  Version = "1.0",
   Description = [[
     The model of the JUICE spacecraft. The model file was taken from
     https://www.cosmos.esa.int/web/esac-cmso/scifleet.
diff --git a/data/assets/scene/solarsystem/missions/juice/plane.asset b/data/assets/scene/solarsystem/missions/juice/plane.asset
index 81fbaee0ec..39acf75d8b 100644
--- a/data/assets/scene/solarsystem/missions/juice/plane.asset
+++ b/data/assets/scene/solarsystem/missions/juice/plane.asset
@@ -348,7 +348,6 @@ asset.export(xz_uz)
 
 asset.meta = {
   Name = "Ganymede Cut Planes",
-  Version = "1.0",
   Description = [[
     Cutplane visualizations of Ganymede's magnetic field as prepared by Ronan Modolo.
   ]],
diff --git a/data/assets/scene/solarsystem/missions/juice/trails/earth.asset b/data/assets/scene/solarsystem/missions/juice/trails/earth.asset
index 40a2330f25..278ed32b85 100644
--- a/data/assets/scene/solarsystem/missions/juice/trails/earth.asset
+++ b/data/assets/scene/solarsystem/missions/juice/trails/earth.asset
@@ -41,7 +41,6 @@ asset.export(JuiceTrailEarth)
 
 asset.meta = {
   Name = "Juice trajectory relative to the Earth barycenter",
-  Version = "1.0",
   Description = [[
     The trajectory of the Juice spacecraft relative to the Earth barycenter
   ]],
diff --git a/data/assets/scene/solarsystem/missions/juice/trails/ganymede.asset b/data/assets/scene/solarsystem/missions/juice/trails/ganymede.asset
index 2213134616..6d466cda2d 100644
--- a/data/assets/scene/solarsystem/missions/juice/trails/ganymede.asset
+++ b/data/assets/scene/solarsystem/missions/juice/trails/ganymede.asset
@@ -41,7 +41,6 @@ asset.export(JuiceTrailGanymede)
 
 asset.meta = {
   Name = "Juice trajectory relative to Ganymede",
-  Version = "1.0",
   Description = [[
     The trajectory of the Juice spacecraft relative to Ganymede
   ]],
diff --git a/data/assets/scene/solarsystem/missions/juice/trails/jupiter.asset b/data/assets/scene/solarsystem/missions/juice/trails/jupiter.asset
index dd350e7ebf..e1e77f21ea 100644
--- a/data/assets/scene/solarsystem/missions/juice/trails/jupiter.asset
+++ b/data/assets/scene/solarsystem/missions/juice/trails/jupiter.asset
@@ -41,7 +41,6 @@ asset.export(JuiceTrailJupiter)
 
 asset.meta = {
   Name = "Juice trajectory relative to Jupiter",
-  Version = "1.0",
   Description = [[
     The trajectory of the Juice spacecraft relative to Jupiter
   ]],
diff --git a/data/assets/scene/solarsystem/missions/juice/trails/ssb.asset b/data/assets/scene/solarsystem/missions/juice/trails/ssb.asset
index 5007b7fb6f..aad27fb39a 100644
--- a/data/assets/scene/solarsystem/missions/juice/trails/ssb.asset
+++ b/data/assets/scene/solarsystem/missions/juice/trails/ssb.asset
@@ -41,7 +41,6 @@ asset.export(JuiceTrail)
 
 asset.meta = {
   Name = "Juice trajectory relative to the solar system's barycenter",
-  Version = "1.0",
   Description = [[
     The trajectory of the Juice spacecraft relative to the solar system's barycenter
   ]],
diff --git a/data/assets/scene/solarsystem/missions/juice/transforms.asset b/data/assets/scene/solarsystem/missions/juice/transforms.asset
index 466e163e0c..d5967031cd 100644
--- a/data/assets/scene/solarsystem/missions/juice/transforms.asset
+++ b/data/assets/scene/solarsystem/missions/juice/transforms.asset
@@ -90,7 +90,6 @@ asset.export(GPHIO)
 
 asset.meta = {
   Name = "Transformations for the JUICE mission profile",
-  Version = "1.0",
   Description = [[
     Contains all of the base transformations necessary for the JUICE mission in the Jovian
     system
diff --git a/data/assets/scene/solarsystem/missions/newhorizons/actions.asset b/data/assets/scene/solarsystem/missions/newhorizons/actions.asset
index 4b2caea883..0d632d4a92 100644
--- a/data/assets/scene/solarsystem/missions/newhorizons/actions.asset
+++ b/data/assets/scene/solarsystem/missions/newhorizons/actions.asset
@@ -300,7 +300,6 @@ asset.export("ToggleNewHorizonsTrail", ToggleNewHorizonsTrail.Identifier)
 
 asset.meta = {
   Name = "New Horizons actions",
-  Version = "1.0",
   Description = "Actions for the New Horizons mission",
   Author = "OpenSpace Team",
   URL = "http://openspaceproject.com",
diff --git a/data/assets/scene/solarsystem/missions/osirisrex/actions.asset b/data/assets/scene/solarsystem/missions/osirisrex/actions.asset
index 4f03d03e42..d11290c461 100644
--- a/data/assets/scene/solarsystem/missions/osirisrex/actions.asset
+++ b/data/assets/scene/solarsystem/missions/osirisrex/actions.asset
@@ -177,7 +177,6 @@ asset.export("LookImageCapture", LookImageCapture.Identifier)
 
 asset.meta = {
   Name = "OsirisRex Actions",
-  Version = "1.0",
   Description = "Actions related to the OsirisRex mission",
   Author = "OpenSpace Team",
   URL = "http://openspaceproject.com",
diff --git a/data/assets/scene/solarsystem/missions/perseverance/actions.asset b/data/assets/scene/solarsystem/missions/perseverance/actions.asset
index e0b4ec4398..62af6a1edc 100644
--- a/data/assets/scene/solarsystem/missions/perseverance/actions.asset
+++ b/data/assets/scene/solarsystem/missions/perseverance/actions.asset
@@ -38,7 +38,6 @@ asset.export("Setup", Setup.Identifier)
 
 asset.meta = {
   Name = "Perseverance Actions",
-  Version = "1.0",
   Description = "Actions related to the Perseverance mission",
   Author = "OpenSpace Team",
   URL = "http://openspaceproject.com",
diff --git a/data/assets/scene/solarsystem/missions/pioneer/pioneer10.asset b/data/assets/scene/solarsystem/missions/pioneer/pioneer10.asset
index 2842f40f52..4e1635593a 100644
--- a/data/assets/scene/solarsystem/missions/pioneer/pioneer10.asset
+++ b/data/assets/scene/solarsystem/missions/pioneer/pioneer10.asset
@@ -79,7 +79,6 @@ asset.export(Pioneer10Trail)
 
 asset.meta = {
   Name = "Pioneer 10",
-  Version = "1.0",
   Description = [[Pioneer 10 Model and Trail. Driven by SPICE data for high accuracy from
     March 3rd, 1972 to January 2nd, 1990]],
   Author = "OpenSpace Team",
diff --git a/data/assets/scene/solarsystem/missions/pioneer/pioneer11.asset b/data/assets/scene/solarsystem/missions/pioneer/pioneer11.asset
index 7aac80f72f..a96e530106 100644
--- a/data/assets/scene/solarsystem/missions/pioneer/pioneer11.asset
+++ b/data/assets/scene/solarsystem/missions/pioneer/pioneer11.asset
@@ -84,7 +84,6 @@ asset.export(Pioneer11Trail)
 
 asset.meta = {
   Name = "Pioneer 11",
-  Version = "1.0",
   Description = [[Pioneer 11 Model and Trail. Driven by SPICE data for high accuracy from
     April 6th, 1973 to January 2nd, 1990]],
   Author = "OpenSpace Team",
diff --git a/data/assets/scene/solarsystem/missions/pioneer/pioneermodel.asset b/data/assets/scene/solarsystem/missions/pioneer/pioneermodel.asset
index b1a7935e87..855ff414b8 100644
--- a/data/assets/scene/solarsystem/missions/pioneer/pioneermodel.asset
+++ b/data/assets/scene/solarsystem/missions/pioneer/pioneermodel.asset
@@ -29,7 +29,6 @@ asset.export("PioneerModel", ModelRenderable)
 
 asset.meta = {
   Name = "Pioneer Model",
-  Version = "1.0",
   Description = [[Pioneer model asset. Used by both pioneer 10 and pioneer 11 asset.
     Untextured version of model from NASA 3D resources]],
   Author = "NASA",
diff --git a/data/assets/scene/solarsystem/missions/rosetta/actions.asset b/data/assets/scene/solarsystem/missions/rosetta/actions.asset
index 62f788b009..81b11f4dfb 100644
--- a/data/assets/scene/solarsystem/missions/rosetta/actions.asset
+++ b/data/assets/scene/solarsystem/missions/rosetta/actions.asset
@@ -27,7 +27,6 @@ asset.export("ToggleOuterPlanetaryTrails", ToggleOuterPlanetaryTrails.Identifier
 
 asset.meta = {
   Name = "Rosetta actions",
-  Version = "1.0",
   Description = "Actions related to the Rosetta mission",
   Author = "OpenSpace Team",
   URL = "http://openspaceproject.com",
diff --git a/data/assets/scene/solarsystem/missions/voyager/actions.asset b/data/assets/scene/solarsystem/missions/voyager/actions.asset
index 7b5b73f8de..293e1d8abb 100644
--- a/data/assets/scene/solarsystem/missions/voyager/actions.asset
+++ b/data/assets/scene/solarsystem/missions/voyager/actions.asset
@@ -87,7 +87,6 @@ asset.export("ToggleMinorMoonTrails", ToggleMinorMoonTrails.Identifier)
 
 asset.meta = {
   Name = "Voyager Actions",
-  Version = "1.0",
   Description = "Actions related to the Voyager 1 and 2 missions",
   Author = "OpenSpace Team",
   URL = "http://openspaceproject.com",
diff --git a/data/assets/scene/solarsystem/missions/voyager/voyager1.asset b/data/assets/scene/solarsystem/missions/voyager/voyager1.asset
index 8270c17307..f8b4f2b701 100644
--- a/data/assets/scene/solarsystem/missions/voyager/voyager1.asset
+++ b/data/assets/scene/solarsystem/missions/voyager/voyager1.asset
@@ -255,7 +255,6 @@ asset.export(VoyagerTrailCruiseSaturnInf)
 
 asset.meta = {
   Name = "Voyager 1 Model and Trails",
-  Version = "2.0",
   Description = [[
     Voyager 1 model and trails from 1977 SEP 05 to 2100 JAN 01. Model credit:
     NASA Visualization Technology Applications And Development (VTAD)
diff --git a/data/assets/scene/solarsystem/missions/voyager/voyager2.asset b/data/assets/scene/solarsystem/missions/voyager/voyager2.asset
index b3949fa87d..6cf8f2587d 100644
--- a/data/assets/scene/solarsystem/missions/voyager/voyager2.asset
+++ b/data/assets/scene/solarsystem/missions/voyager/voyager2.asset
@@ -369,7 +369,6 @@ asset.export(VoyagerTrailCruiseNeptuneInf)
 
 asset.meta = {
   Name = "Voyager 2 Model and Trails",
-  Version = "2.0",
   Description = [[
     Voyager 2 model and trails from 1977 AUG 20 16:07:06.535 to 2100 JAN 01. Model credit:
     NASA Visualization Technology Applications And Development (VTAD)
diff --git a/data/assets/scene/solarsystem/missions/voyagerpioneer/voyager1_2__pioneer10_11.asset b/data/assets/scene/solarsystem/missions/voyagerpioneer/voyager1_2__pioneer10_11.asset
index fff6bbce10..4e3fcb065d 100644
--- a/data/assets/scene/solarsystem/missions/voyagerpioneer/voyager1_2__pioneer10_11.asset
+++ b/data/assets/scene/solarsystem/missions/voyagerpioneer/voyager1_2__pioneer10_11.asset
@@ -159,7 +159,6 @@ asset.export(Pioneer11)
 
 asset.meta = {
   Name = "Pioneer and Voyager Trails",
-  Version = "1.1",
   Description = [[Pioneer 10, Pioneer 11, Voyager 1 and Voyager 2 trails. Driven by JPL
     Horizons data for better performance then spice but lower resolution. Data is from
     shortly after mission launches until January 1st, 2030]],
diff --git a/data/assets/scene/solarsystem/planets/base_layers.asset b/data/assets/scene/solarsystem/planets/base_layers.asset
index 5ed8a4f307..878844ac6b 100644
--- a/data/assets/scene/solarsystem/planets/base_layers.asset
+++ b/data/assets/scene/solarsystem/planets/base_layers.asset
@@ -28,7 +28,6 @@ asset.require("./neptune/default_layers")
 
 asset.meta = {
   Name = "Base Solar System Layers",
-  Version = "1.0",
   Description = [[Adds base layers for all planets. Remove this asset and include
     individual layers for planets to customize planet layers.
     The base layers do not depend on any particular OpenSpace server but are still
diff --git a/data/assets/scene/solarsystem/planets/default_layers.asset b/data/assets/scene/solarsystem/planets/default_layers.asset
index 9420959e1d..13641ff86c 100644
--- a/data/assets/scene/solarsystem/planets/default_layers.asset
+++ b/data/assets/scene/solarsystem/planets/default_layers.asset
@@ -7,7 +7,6 @@ asset.require("./newyork_layers")
 
 asset.meta = {
   Name = "Default Solar System Layers",
-  Version = "1.1",
   Description = [[Adds default layers for all planets. Remove this asset and include
     individual layers for planets to customize planet layers
 
diff --git a/data/assets/scene/solarsystem/planets/earth/atmosphere.asset b/data/assets/scene/solarsystem/planets/earth/atmosphere.asset
index 43b940130b..b112638123 100644
--- a/data/assets/scene/solarsystem/planets/earth/atmosphere.asset
+++ b/data/assets/scene/solarsystem/planets/earth/atmosphere.asset
@@ -101,7 +101,6 @@ asset.export(Atmosphere)
 
 asset.meta = {
   Name = "Earth Atmosphere",
-  Version = "1.1",
   Description = "RenderableAtmosphere for Earth",
   Author = "OpenSpace Team",
   URL = "http://openspaceproject.com",
diff --git a/data/assets/scene/solarsystem/planets/earth/default_layers.asset b/data/assets/scene/solarsystem/planets/earth/default_layers.asset
index cd16ed15e3..cb687fb2f0 100644
--- a/data/assets/scene/solarsystem/planets/earth/default_layers.asset
+++ b/data/assets/scene/solarsystem/planets/earth/default_layers.asset
@@ -7,7 +7,6 @@ asset.require("./layers/newyork_layers", false)
 
 asset.meta = {
   Name = "Default Earth Layers",
-  Version = "1.1",
   Description = [[Default Earth layers are: Blue Marble,
     ESRI VIIRS Combo, ESRI NOAA20 Combo, ESRI World Imagery, VIIRS SNPP (Temporal),
     Aqua Modis (Temporal), Terra Modis (Temporal),
diff --git a/data/assets/scene/solarsystem/planets/earth/earth.asset b/data/assets/scene/solarsystem/planets/earth/earth.asset
index ba942a061f..299a4c6c36 100644
--- a/data/assets/scene/solarsystem/planets/earth/earth.asset
+++ b/data/assets/scene/solarsystem/planets/earth/earth.asset
@@ -127,7 +127,6 @@ asset.export(EarthLabel)
 
 asset.meta = {
   Name = "Earth",
-  Version = "1.1",
   Description = "Earth is a special planet with special needs",
   Author = "OpenSpace Team",
   URL = "http://openspaceproject.com",
diff --git a/data/assets/scene/solarsystem/planets/earth/eclipse_shadow.asset b/data/assets/scene/solarsystem/planets/earth/eclipse_shadow.asset
index f417d60f6c..bc4cde4de6 100644
--- a/data/assets/scene/solarsystem/planets/earth/eclipse_shadow.asset
+++ b/data/assets/scene/solarsystem/planets/earth/eclipse_shadow.asset
@@ -36,7 +36,6 @@ asset.export(EarthMoonShadow)
 
 asset.meta = {
   Name = "Eclipse Shadow",
-  Version = "1.0",
   Description = "The penumbral and umbral shadow eclipses for the Earth-Moon system",
   Author = "OpenSpace Team",
   URL = "http://openspaceproject.com",
diff --git a/data/assets/scene/solarsystem/planets/earth/eclipses/5000_years.asset b/data/assets/scene/solarsystem/planets/earth/eclipses/5000_years.asset
index 408b30a97f..4ffd138b61 100644
--- a/data/assets/scene/solarsystem/planets/earth/eclipses/5000_years.asset
+++ b/data/assets/scene/solarsystem/planets/earth/eclipses/5000_years.asset
@@ -42,7 +42,6 @@ asset.export("layer", Layer)
 
 asset.meta = {
   Name = "5000 Years of Total Solar Eclipses",
-  Version = "1.0",
   Description = Layer.Description,
   Author = "OpenSpace Team",
   URL = "https://svs.gsfc.nasa.gov/5222",
diff --git a/data/assets/scene/solarsystem/planets/earth/eclipses/corona/corona20170821.asset b/data/assets/scene/solarsystem/planets/earth/eclipses/corona/corona20170821.asset
index cfc13f6fe1..982abdda01 100644
--- a/data/assets/scene/solarsystem/planets/earth/eclipses/corona/corona20170821.asset
+++ b/data/assets/scene/solarsystem/planets/earth/eclipses/corona/corona20170821.asset
@@ -65,7 +65,6 @@ asset.export(Plane)
 
 asset.meta = {
   Name = "Corona 2017-08-21",
-  Version = "1.0",
   Description = "An SDO video of the Sun for the day 2017-08-21",
   Author = "OpenSpace Team",
   URL = "http://openspaceproject.com",
diff --git a/data/assets/scene/solarsystem/planets/earth/eclipses/grid/earth_ecliptic_radial_grid.asset b/data/assets/scene/solarsystem/planets/earth/eclipses/grid/earth_ecliptic_radial_grid.asset
index 7cec21c1a9..1b062f9d61 100644
--- a/data/assets/scene/solarsystem/planets/earth/eclipses/grid/earth_ecliptic_radial_grid.asset
+++ b/data/assets/scene/solarsystem/planets/earth/eclipses/grid/earth_ecliptic_radial_grid.asset
@@ -51,7 +51,6 @@ asset.export(eclipticGrid)
 
 asset.meta = {
   Name = "Earth Ecliptic Grid",
-  Version = "1.0",
   Description = "A grid that shows the ecliptic of the Earth a radial grid",
   Author = "OpenSpace Team",
   URL = "http://openspaceproject.com",
diff --git a/data/assets/scene/solarsystem/planets/earth/eclipses/grid/moon_radial_grid.asset b/data/assets/scene/solarsystem/planets/earth/eclipses/grid/moon_radial_grid.asset
index ecb3d6e613..e0d23ad425 100644
--- a/data/assets/scene/solarsystem/planets/earth/eclipses/grid/moon_radial_grid.asset
+++ b/data/assets/scene/solarsystem/planets/earth/eclipses/grid/moon_radial_grid.asset
@@ -41,7 +41,6 @@ asset.export(orbitalPlaneGrid)
 
 asset.meta = {
   Name = "Moon Orbital Plane",
-  Version = "1.0",
   Description = "A grid that shows the orbital plane of the Moon",
   Author = "OpenSpace Team",
   URL = "http://openspaceproject.com",
diff --git a/data/assets/scene/solarsystem/planets/earth/eclipses/paths/annular/2003-05-31.asset b/data/assets/scene/solarsystem/planets/earth/eclipses/paths/annular/2003-05-31.asset
index 2aa2cb23b8..cd2120ace3 100644
--- a/data/assets/scene/solarsystem/planets/earth/eclipses/paths/annular/2003-05-31.asset
+++ b/data/assets/scene/solarsystem/planets/earth/eclipses/paths/annular/2003-05-31.asset
@@ -27,7 +27,6 @@ end)
 
 asset.meta = {
   Name = "Annular 2003-05-31",
-  Version = "1.0",
   Description = "Annular eclipse map for 2003-05-31",
   Author = "OpenSpace Team",
   URL = "http://openspaceproject.com",
diff --git a/data/assets/scene/solarsystem/planets/earth/eclipses/paths/annular/2005-10-03.asset b/data/assets/scene/solarsystem/planets/earth/eclipses/paths/annular/2005-10-03.asset
index ca362137ba..8c067aebfe 100644
--- a/data/assets/scene/solarsystem/planets/earth/eclipses/paths/annular/2005-10-03.asset
+++ b/data/assets/scene/solarsystem/planets/earth/eclipses/paths/annular/2005-10-03.asset
@@ -27,7 +27,6 @@ end)
 
 asset.meta = {
   Name = "Annular 2005-10-03",
-  Version = "1.0",
   Description = "Annular eclipse map for 2005-10-03",
   Author = "OpenSpace Team",
   URL = "http://openspaceproject.com",
diff --git a/data/assets/scene/solarsystem/planets/earth/eclipses/paths/annular/2006-09-22.asset b/data/assets/scene/solarsystem/planets/earth/eclipses/paths/annular/2006-09-22.asset
index db868e1b91..fd880a3381 100644
--- a/data/assets/scene/solarsystem/planets/earth/eclipses/paths/annular/2006-09-22.asset
+++ b/data/assets/scene/solarsystem/planets/earth/eclipses/paths/annular/2006-09-22.asset
@@ -27,7 +27,6 @@ end)
 
 asset.meta = {
   Name = "Annular 2006-09-22",
-  Version = "1.0",
   Description = "Annular eclipse map for 2006-09-22",
   Author = "OpenSpace Team",
   URL = "http://openspaceproject.com",
diff --git a/data/assets/scene/solarsystem/planets/earth/eclipses/paths/annular/2008-02-07.asset b/data/assets/scene/solarsystem/planets/earth/eclipses/paths/annular/2008-02-07.asset
index 88f7dba82a..07a87ff0e3 100644
--- a/data/assets/scene/solarsystem/planets/earth/eclipses/paths/annular/2008-02-07.asset
+++ b/data/assets/scene/solarsystem/planets/earth/eclipses/paths/annular/2008-02-07.asset
@@ -27,7 +27,6 @@ end)
 
 asset.meta = {
   Name = "Annular 2008-02-07",
-  Version = "1.0",
   Description = "Annular eclipse map for 2008-02-07",
   Author = "OpenSpace Team",
   URL = "http://openspaceproject.com",
diff --git a/data/assets/scene/solarsystem/planets/earth/eclipses/paths/annular/2009-01-26.asset b/data/assets/scene/solarsystem/planets/earth/eclipses/paths/annular/2009-01-26.asset
index 5730d18679..8d5b5ba5b4 100644
--- a/data/assets/scene/solarsystem/planets/earth/eclipses/paths/annular/2009-01-26.asset
+++ b/data/assets/scene/solarsystem/planets/earth/eclipses/paths/annular/2009-01-26.asset
@@ -27,7 +27,6 @@ end)
 
 asset.meta = {
   Name = "Annular 2009-01-26",
-  Version = "1.0",
   Description = "Annular eclipse map for 2009-01-26",
   Author = "OpenSpace Team",
   URL = "http://openspaceproject.com",
diff --git a/data/assets/scene/solarsystem/planets/earth/eclipses/paths/annular/2010-01-15.asset b/data/assets/scene/solarsystem/planets/earth/eclipses/paths/annular/2010-01-15.asset
index 597df058ab..85b778302c 100644
--- a/data/assets/scene/solarsystem/planets/earth/eclipses/paths/annular/2010-01-15.asset
+++ b/data/assets/scene/solarsystem/planets/earth/eclipses/paths/annular/2010-01-15.asset
@@ -27,7 +27,6 @@ end)
 
 asset.meta = {
   Name = "Annular 2010-01-15",
-  Version = "1.0",
   Description = "Annular eclipse map for 2010-01-15",
   Author = "OpenSpace Team",
   URL = "http://openspaceproject.com",
diff --git a/data/assets/scene/solarsystem/planets/earth/eclipses/paths/annular/2012-05-20.asset b/data/assets/scene/solarsystem/planets/earth/eclipses/paths/annular/2012-05-20.asset
index c4e9007a92..6a6cbac1bc 100644
--- a/data/assets/scene/solarsystem/planets/earth/eclipses/paths/annular/2012-05-20.asset
+++ b/data/assets/scene/solarsystem/planets/earth/eclipses/paths/annular/2012-05-20.asset
@@ -27,7 +27,6 @@ end)
 
 asset.meta = {
   Name = "Annular 2012-05-20",
-  Version = "1.0",
   Description = "Annular eclipse map for 2012-05-20",
   Author = "OpenSpace Team",
   URL = "http://openspaceproject.com",
diff --git a/data/assets/scene/solarsystem/planets/earth/eclipses/paths/annular/2013-05-10.asset b/data/assets/scene/solarsystem/planets/earth/eclipses/paths/annular/2013-05-10.asset
index cd7c1c5965..3afe637ea7 100644
--- a/data/assets/scene/solarsystem/planets/earth/eclipses/paths/annular/2013-05-10.asset
+++ b/data/assets/scene/solarsystem/planets/earth/eclipses/paths/annular/2013-05-10.asset
@@ -27,7 +27,6 @@ end)
 
 asset.meta = {
   Name = "Annular 2013-05-10",
-  Version = "1.0",
   Description = "Annular eclipse map for 2013-05-10",
   Author = "OpenSpace Team",
   URL = "http://openspaceproject.com",
diff --git a/data/assets/scene/solarsystem/planets/earth/eclipses/paths/annular/2014-04-29.asset b/data/assets/scene/solarsystem/planets/earth/eclipses/paths/annular/2014-04-29.asset
index 0a9d108862..893e63c166 100644
--- a/data/assets/scene/solarsystem/planets/earth/eclipses/paths/annular/2014-04-29.asset
+++ b/data/assets/scene/solarsystem/planets/earth/eclipses/paths/annular/2014-04-29.asset
@@ -27,7 +27,6 @@ end)
 
 asset.meta = {
   Name = "Annular 2014-04-29",
-  Version = "1.0",
   Description = "Annular eclipse map for 2014-04-29",
   Author = "OpenSpace Team",
   URL = "http://openspaceproject.com",
diff --git a/data/assets/scene/solarsystem/planets/earth/eclipses/paths/annular/2016-09-01.asset b/data/assets/scene/solarsystem/planets/earth/eclipses/paths/annular/2016-09-01.asset
index f8cd52c01c..6595181954 100644
--- a/data/assets/scene/solarsystem/planets/earth/eclipses/paths/annular/2016-09-01.asset
+++ b/data/assets/scene/solarsystem/planets/earth/eclipses/paths/annular/2016-09-01.asset
@@ -27,7 +27,6 @@ end)
 
 asset.meta = {
   Name = "Annular 2016-09-01",
-  Version = "1.0",
   Description = "Annular eclipse map for 2016-09-01",
   Author = "OpenSpace Team",
   URL = "http://openspaceproject.com",
diff --git a/data/assets/scene/solarsystem/planets/earth/eclipses/paths/annular/2017-02-26.asset b/data/assets/scene/solarsystem/planets/earth/eclipses/paths/annular/2017-02-26.asset
index 8d53dbe89f..b0ddff5030 100644
--- a/data/assets/scene/solarsystem/planets/earth/eclipses/paths/annular/2017-02-26.asset
+++ b/data/assets/scene/solarsystem/planets/earth/eclipses/paths/annular/2017-02-26.asset
@@ -27,7 +27,6 @@ end)
 
 asset.meta = {
   Name = "Annular 2017-02-26",
-  Version = "1.0",
   Description = "Annular eclipse map for 2017-02-26",
   Author = "OpenSpace Team",
   URL = "http://openspaceproject.com",
diff --git a/data/assets/scene/solarsystem/planets/earth/eclipses/paths/annular/2019-12-26.asset b/data/assets/scene/solarsystem/planets/earth/eclipses/paths/annular/2019-12-26.asset
index 9afd763979..cdfdcbbc73 100644
--- a/data/assets/scene/solarsystem/planets/earth/eclipses/paths/annular/2019-12-26.asset
+++ b/data/assets/scene/solarsystem/planets/earth/eclipses/paths/annular/2019-12-26.asset
@@ -27,7 +27,6 @@ end)
 
 asset.meta = {
   Name = "Annular 2019-12-26",
-  Version = "1.0",
   Description = "Annular eclipse map for 2019-12-26",
   Author = "OpenSpace Team",
   URL = "http://openspaceproject.com",
diff --git a/data/assets/scene/solarsystem/planets/earth/eclipses/paths/annular/2020-06-21.asset b/data/assets/scene/solarsystem/planets/earth/eclipses/paths/annular/2020-06-21.asset
index a22da7250d..31c3f77c4f 100644
--- a/data/assets/scene/solarsystem/planets/earth/eclipses/paths/annular/2020-06-21.asset
+++ b/data/assets/scene/solarsystem/planets/earth/eclipses/paths/annular/2020-06-21.asset
@@ -27,7 +27,6 @@ end)
 
 asset.meta = {
   Name = "Annular 2020-06-21",
-  Version = "1.0",
   Description = "Annular eclipse map for 2020-06-21",
   Author = "OpenSpace Team",
   URL = "http://openspaceproject.com",
diff --git a/data/assets/scene/solarsystem/planets/earth/eclipses/paths/annular/2021-06-10.asset b/data/assets/scene/solarsystem/planets/earth/eclipses/paths/annular/2021-06-10.asset
index e738e2ade3..d680c04d89 100644
--- a/data/assets/scene/solarsystem/planets/earth/eclipses/paths/annular/2021-06-10.asset
+++ b/data/assets/scene/solarsystem/planets/earth/eclipses/paths/annular/2021-06-10.asset
@@ -28,7 +28,6 @@ end)
 
 asset.meta = {
   Name = "Annular 2021-06-10",
-  Version = "1.0",
   Description = "Annular eclipse map for 2021-06-10",
   Author = "OpenSpace Team",
   URL = "http://openspaceproject.com",
diff --git a/data/assets/scene/solarsystem/planets/earth/eclipses/paths/annular/2023-10-14.asset b/data/assets/scene/solarsystem/planets/earth/eclipses/paths/annular/2023-10-14.asset
index f6caf3f267..6fa8c35393 100644
--- a/data/assets/scene/solarsystem/planets/earth/eclipses/paths/annular/2023-10-14.asset
+++ b/data/assets/scene/solarsystem/planets/earth/eclipses/paths/annular/2023-10-14.asset
@@ -27,7 +27,6 @@ end)
 
 asset.meta = {
   Name = "Annular 2023-10-14",
-  Version = "1.0",
   Description = "Annular eclipse map for 2023-10-14",
   Author = "OpenSpace Team",
   URL = "http://openspaceproject.com",
diff --git a/data/assets/scene/solarsystem/planets/earth/eclipses/paths/annular/2024-10-02.asset b/data/assets/scene/solarsystem/planets/earth/eclipses/paths/annular/2024-10-02.asset
index 0c274acebd..be7c775d48 100644
--- a/data/assets/scene/solarsystem/planets/earth/eclipses/paths/annular/2024-10-02.asset
+++ b/data/assets/scene/solarsystem/planets/earth/eclipses/paths/annular/2024-10-02.asset
@@ -27,7 +27,6 @@ end)
 
 asset.meta = {
   Name = "Annular 2024-10-02",
-  Version = "1.0",
   Description = "Annular eclipse map for 2024-10-02",
   Author = "OpenSpace Team",
   URL = "http://openspaceproject.com",
diff --git a/data/assets/scene/solarsystem/planets/earth/eclipses/paths/annular/2026-02-17.asset b/data/assets/scene/solarsystem/planets/earth/eclipses/paths/annular/2026-02-17.asset
index ccef3360ba..ac4a8e7152 100644
--- a/data/assets/scene/solarsystem/planets/earth/eclipses/paths/annular/2026-02-17.asset
+++ b/data/assets/scene/solarsystem/planets/earth/eclipses/paths/annular/2026-02-17.asset
@@ -27,7 +27,6 @@ end)
 
 asset.meta = {
   Name = "Annular 2026-02-17",
-  Version = "1.0",
   Description = "Annular eclipse map for 2026-02-17",
   Author = "OpenSpace Team",
   URL = "http://openspaceproject.com",
diff --git a/data/assets/scene/solarsystem/planets/earth/eclipses/paths/annular/2027-02-06.asset b/data/assets/scene/solarsystem/planets/earth/eclipses/paths/annular/2027-02-06.asset
index ca51e864a0..3df7a73fa4 100644
--- a/data/assets/scene/solarsystem/planets/earth/eclipses/paths/annular/2027-02-06.asset
+++ b/data/assets/scene/solarsystem/planets/earth/eclipses/paths/annular/2027-02-06.asset
@@ -27,7 +27,6 @@ end)
 
 asset.meta = {
   Name = "Annular 2027-02-06",
-  Version = "1.0",
   Description = "Annular eclipse map for 2027-02-06",
   Author = "OpenSpace Team",
   URL = "http://openspaceproject.com",
diff --git a/data/assets/scene/solarsystem/planets/earth/eclipses/paths/annular/2028-01-26.asset b/data/assets/scene/solarsystem/planets/earth/eclipses/paths/annular/2028-01-26.asset
index 1e952643d2..74069fc105 100644
--- a/data/assets/scene/solarsystem/planets/earth/eclipses/paths/annular/2028-01-26.asset
+++ b/data/assets/scene/solarsystem/planets/earth/eclipses/paths/annular/2028-01-26.asset
@@ -27,7 +27,6 @@ end)
 
 asset.meta = {
   Name = "Annular 2028-01-26",
-  Version = "1.0",
   Description = "Annular eclipse map for 2028-01-26",
   Author = "OpenSpace Team",
   URL = "http://openspaceproject.com",
diff --git a/data/assets/scene/solarsystem/planets/earth/eclipses/paths/annular/2030-06-01.asset b/data/assets/scene/solarsystem/planets/earth/eclipses/paths/annular/2030-06-01.asset
index 8019f416bd..77e6fc68a6 100644
--- a/data/assets/scene/solarsystem/planets/earth/eclipses/paths/annular/2030-06-01.asset
+++ b/data/assets/scene/solarsystem/planets/earth/eclipses/paths/annular/2030-06-01.asset
@@ -27,7 +27,6 @@ end)
 
 asset.meta = {
   Name = "Annular 2030-06-01",
-  Version = "1.0",
   Description = "Annular eclipse map for 2030-06-01",
   Author = "OpenSpace Team",
   URL = "http://openspaceproject.com",
diff --git a/data/assets/scene/solarsystem/planets/earth/eclipses/paths/hybrid/2005-04-08.asset b/data/assets/scene/solarsystem/planets/earth/eclipses/paths/hybrid/2005-04-08.asset
index 2a1d4822be..2c8dcc13b8 100644
--- a/data/assets/scene/solarsystem/planets/earth/eclipses/paths/hybrid/2005-04-08.asset
+++ b/data/assets/scene/solarsystem/planets/earth/eclipses/paths/hybrid/2005-04-08.asset
@@ -27,7 +27,6 @@ end)
 
 asset.meta = {
   Name = "Hybrid 2005-04-08",
-  Version = "1.0",
   Description = "Hybrid eclipse map for 2005-04-08",
   Author = "OpenSpace Team",
   URL = "http://openspaceproject.com",
diff --git a/data/assets/scene/solarsystem/planets/earth/eclipses/paths/hybrid/2013-11-03.asset b/data/assets/scene/solarsystem/planets/earth/eclipses/paths/hybrid/2013-11-03.asset
index a965cc3720..324a4873a7 100644
--- a/data/assets/scene/solarsystem/planets/earth/eclipses/paths/hybrid/2013-11-03.asset
+++ b/data/assets/scene/solarsystem/planets/earth/eclipses/paths/hybrid/2013-11-03.asset
@@ -27,7 +27,6 @@ end)
 
 asset.meta = {
   Name = "Hybrid 2013-11-03",
-  Version = "1.0",
   Description = "Hybrid eclipse map for 2013-11-03",
   Author = "OpenSpace Team",
   URL = "http://openspaceproject.com",
diff --git a/data/assets/scene/solarsystem/planets/earth/eclipses/paths/hybrid/2023-04-20.asset b/data/assets/scene/solarsystem/planets/earth/eclipses/paths/hybrid/2023-04-20.asset
index 7d70a61da2..a73f860353 100644
--- a/data/assets/scene/solarsystem/planets/earth/eclipses/paths/hybrid/2023-04-20.asset
+++ b/data/assets/scene/solarsystem/planets/earth/eclipses/paths/hybrid/2023-04-20.asset
@@ -27,7 +27,6 @@ end)
 
 asset.meta = {
   Name = "Hybrid 2023-04-20",
-  Version = "1.0",
   Description = "Hybrid eclipse map for 2023-04-20",
   Author = "OpenSpace Team",
   URL = "http://openspaceproject.com",
diff --git a/data/assets/scene/solarsystem/planets/earth/eclipses/paths/hybrid/2031-11-14.asset b/data/assets/scene/solarsystem/planets/earth/eclipses/paths/hybrid/2031-11-14.asset
index 35419833de..833ae519a2 100644
--- a/data/assets/scene/solarsystem/planets/earth/eclipses/paths/hybrid/2031-11-14.asset
+++ b/data/assets/scene/solarsystem/planets/earth/eclipses/paths/hybrid/2031-11-14.asset
@@ -27,7 +27,6 @@ end)
 
 asset.meta = {
   Name = "Hybrid 2031-11-14",
-  Version = "1.0",
   Description = "Hybrid eclipse map for 2031-11-14",
   Author = "OpenSpace Team",
   URL = "http://openspaceproject.com",
diff --git a/data/assets/scene/solarsystem/planets/earth/eclipses/paths/total/2003-11-23.asset b/data/assets/scene/solarsystem/planets/earth/eclipses/paths/total/2003-11-23.asset
index 170334ffbe..e37b14ffd0 100644
--- a/data/assets/scene/solarsystem/planets/earth/eclipses/paths/total/2003-11-23.asset
+++ b/data/assets/scene/solarsystem/planets/earth/eclipses/paths/total/2003-11-23.asset
@@ -27,7 +27,6 @@ end)
 
 asset.meta = {
   Name = "Total 2003-11-23",
-  Version = "1.0",
   Description = "Total eclipse map for 2003-11-23",
   Author = "OpenSpace Team",
   URL = "http://openspaceproject.com",
diff --git a/data/assets/scene/solarsystem/planets/earth/eclipses/paths/total/2006-03-29.asset b/data/assets/scene/solarsystem/planets/earth/eclipses/paths/total/2006-03-29.asset
index e2e7cb5bd1..2e90cf30a0 100644
--- a/data/assets/scene/solarsystem/planets/earth/eclipses/paths/total/2006-03-29.asset
+++ b/data/assets/scene/solarsystem/planets/earth/eclipses/paths/total/2006-03-29.asset
@@ -27,7 +27,6 @@ end)
 
 asset.meta = {
   Name = "Total 2006-03-29",
-  Version = "1.0",
   Description = "Total eclipse map for 2006-03-29",
   Author = "OpenSpace Team",
   URL = "http://openspaceproject.com",
diff --git a/data/assets/scene/solarsystem/planets/earth/eclipses/paths/total/2008-08-01.asset b/data/assets/scene/solarsystem/planets/earth/eclipses/paths/total/2008-08-01.asset
index 7db288b54e..5954ae4231 100644
--- a/data/assets/scene/solarsystem/planets/earth/eclipses/paths/total/2008-08-01.asset
+++ b/data/assets/scene/solarsystem/planets/earth/eclipses/paths/total/2008-08-01.asset
@@ -27,7 +27,6 @@ end)
 
 asset.meta = {
   Name = "Total 2008-08-01",
-  Version = "1.0",
   Description = "Total eclipse map for 2008-08-01",
   Author = "OpenSpace Team",
   URL = "http://openspaceproject.com",
diff --git a/data/assets/scene/solarsystem/planets/earth/eclipses/paths/total/2009-07-22.asset b/data/assets/scene/solarsystem/planets/earth/eclipses/paths/total/2009-07-22.asset
index 733d556fde..08c268e486 100644
--- a/data/assets/scene/solarsystem/planets/earth/eclipses/paths/total/2009-07-22.asset
+++ b/data/assets/scene/solarsystem/planets/earth/eclipses/paths/total/2009-07-22.asset
@@ -27,7 +27,6 @@ end)
 
 asset.meta = {
   Name = "Total 2009-07-22",
-  Version = "1.0",
   Description = "Total eclipse map for 2009-07-22",
   Author = "OpenSpace Team",
   URL = "http://openspaceproject.com",
diff --git a/data/assets/scene/solarsystem/planets/earth/eclipses/paths/total/2010-07-11.asset b/data/assets/scene/solarsystem/planets/earth/eclipses/paths/total/2010-07-11.asset
index 2a2d486526..203feea490 100644
--- a/data/assets/scene/solarsystem/planets/earth/eclipses/paths/total/2010-07-11.asset
+++ b/data/assets/scene/solarsystem/planets/earth/eclipses/paths/total/2010-07-11.asset
@@ -27,7 +27,6 @@ end)
 
 asset.meta = {
   Name = "Total 2010-07-11",
-  Version = "1.0",
   Description = "Total eclipse map for 2010-07-11",
   Author = "OpenSpace Team",
   URL = "http://openspaceproject.com",
diff --git a/data/assets/scene/solarsystem/planets/earth/eclipses/paths/total/2012-11-13.asset b/data/assets/scene/solarsystem/planets/earth/eclipses/paths/total/2012-11-13.asset
index 32d7f607b6..9afec60525 100644
--- a/data/assets/scene/solarsystem/planets/earth/eclipses/paths/total/2012-11-13.asset
+++ b/data/assets/scene/solarsystem/planets/earth/eclipses/paths/total/2012-11-13.asset
@@ -27,7 +27,6 @@ end)
 
 asset.meta = {
   Name = "Total 2012-11-13",
-  Version = "1.0",
   Description = "Total eclipse map for 2012-11-13",
   Author = "OpenSpace Team",
   URL = "http://openspaceproject.com",
diff --git a/data/assets/scene/solarsystem/planets/earth/eclipses/paths/total/2015-03-20.asset b/data/assets/scene/solarsystem/planets/earth/eclipses/paths/total/2015-03-20.asset
index 5693f8b715..e733aa5b3a 100644
--- a/data/assets/scene/solarsystem/planets/earth/eclipses/paths/total/2015-03-20.asset
+++ b/data/assets/scene/solarsystem/planets/earth/eclipses/paths/total/2015-03-20.asset
@@ -27,7 +27,6 @@ end)
 
 asset.meta = {
   Name = "Total 2015-03-20",
-  Version = "1.0",
   Description = "Total eclipse map for 2015-03-20",
   Author = "OpenSpace Team",
   URL = "http://openspaceproject.com",
diff --git a/data/assets/scene/solarsystem/planets/earth/eclipses/paths/total/2016-03-09.asset b/data/assets/scene/solarsystem/planets/earth/eclipses/paths/total/2016-03-09.asset
index b708462ed8..aad772655f 100644
--- a/data/assets/scene/solarsystem/planets/earth/eclipses/paths/total/2016-03-09.asset
+++ b/data/assets/scene/solarsystem/planets/earth/eclipses/paths/total/2016-03-09.asset
@@ -27,7 +27,6 @@ end)
 
 asset.meta = {
   Name = "Total 2016-03-09",
-  Version = "1.0",
   Description = "Total eclipse map for 2016-03-09",
   Author = "OpenSpace Team",
   URL = "http://openspaceproject.com",
diff --git a/data/assets/scene/solarsystem/planets/earth/eclipses/paths/total/2017-08-21.asset b/data/assets/scene/solarsystem/planets/earth/eclipses/paths/total/2017-08-21.asset
index f193b3ec36..4d8b25b734 100644
--- a/data/assets/scene/solarsystem/planets/earth/eclipses/paths/total/2017-08-21.asset
+++ b/data/assets/scene/solarsystem/planets/earth/eclipses/paths/total/2017-08-21.asset
@@ -27,7 +27,6 @@ end)
 
 asset.meta = {
   Name = "Total 2017-08-21",
-  Version = "1.0",
   Description = "Total eclipse map for 2017-08-21",
   Author = "OpenSpace Team",
   URL = "http://openspaceproject.com",
diff --git a/data/assets/scene/solarsystem/planets/earth/eclipses/paths/total/2019-07-02.asset b/data/assets/scene/solarsystem/planets/earth/eclipses/paths/total/2019-07-02.asset
index 9d6b3decf8..463955f014 100644
--- a/data/assets/scene/solarsystem/planets/earth/eclipses/paths/total/2019-07-02.asset
+++ b/data/assets/scene/solarsystem/planets/earth/eclipses/paths/total/2019-07-02.asset
@@ -27,7 +27,6 @@ end)
 
 asset.meta = {
   Name = "Total 2019-07-02",
-  Version = "1.0",
   Description = "Total eclipse map for 2019-07-02",
   Author = "OpenSpace Team",
   URL = "http://openspaceproject.com",
diff --git a/data/assets/scene/solarsystem/planets/earth/eclipses/paths/total/2020-12-14.asset b/data/assets/scene/solarsystem/planets/earth/eclipses/paths/total/2020-12-14.asset
index a5d78dbfd5..d14ce27524 100644
--- a/data/assets/scene/solarsystem/planets/earth/eclipses/paths/total/2020-12-14.asset
+++ b/data/assets/scene/solarsystem/planets/earth/eclipses/paths/total/2020-12-14.asset
@@ -27,7 +27,6 @@ end)
 
 asset.meta = {
   Name = "Total 2020-12-14",
-  Version = "1.0",
   Description = "Total eclipse map for 2020-12-14",
   Author = "OpenSpace Team",
   URL = "http://openspaceproject.com",
diff --git a/data/assets/scene/solarsystem/planets/earth/eclipses/paths/total/2021-12-04.asset b/data/assets/scene/solarsystem/planets/earth/eclipses/paths/total/2021-12-04.asset
index e8350dc988..341a466735 100644
--- a/data/assets/scene/solarsystem/planets/earth/eclipses/paths/total/2021-12-04.asset
+++ b/data/assets/scene/solarsystem/planets/earth/eclipses/paths/total/2021-12-04.asset
@@ -27,7 +27,6 @@ end)
 
 asset.meta = {
   Name = "Total 2021-12-04",
-  Version = "1.0",
   Description = "Total eclipse map for 2021-12-04",
   Author = "OpenSpace Team",
   URL = "http://openspaceproject.com",
diff --git a/data/assets/scene/solarsystem/planets/earth/eclipses/paths/total/2024-04-08.asset b/data/assets/scene/solarsystem/planets/earth/eclipses/paths/total/2024-04-08.asset
index c1fe33eb8d..4d1bf0a6a2 100644
--- a/data/assets/scene/solarsystem/planets/earth/eclipses/paths/total/2024-04-08.asset
+++ b/data/assets/scene/solarsystem/planets/earth/eclipses/paths/total/2024-04-08.asset
@@ -27,7 +27,6 @@ end)
 
 asset.meta = {
   Name = "Total 2024-04-08",
-  Version = "1.0",
   Description = "Total eclipse map for 2024-04-08",
   Author = "OpenSpace Team",
   URL = "http://openspaceproject.com",
diff --git a/data/assets/scene/solarsystem/planets/earth/eclipses/paths/total/2026-08-12.asset b/data/assets/scene/solarsystem/planets/earth/eclipses/paths/total/2026-08-12.asset
index c53ae9ed10..dd3cc09e19 100644
--- a/data/assets/scene/solarsystem/planets/earth/eclipses/paths/total/2026-08-12.asset
+++ b/data/assets/scene/solarsystem/planets/earth/eclipses/paths/total/2026-08-12.asset
@@ -27,7 +27,6 @@ end)
 
 asset.meta = {
   Name = "Total 2026-08-12",
-  Version = "1.0",
   Description = "Total eclipse map for 2026-08-12",
   Author = "OpenSpace Team",
   URL = "http://openspaceproject.com",
diff --git a/data/assets/scene/solarsystem/planets/earth/eclipses/paths/total/2027-08-02.asset b/data/assets/scene/solarsystem/planets/earth/eclipses/paths/total/2027-08-02.asset
index b6c7d96f5e..f5c7bb3ac0 100644
--- a/data/assets/scene/solarsystem/planets/earth/eclipses/paths/total/2027-08-02.asset
+++ b/data/assets/scene/solarsystem/planets/earth/eclipses/paths/total/2027-08-02.asset
@@ -27,7 +27,6 @@ end)
 
 asset.meta = {
   Name = "Total 2027-08-02",
-  Version = "1.0",
   Description = "Total eclipse map for 2027-08-02",
   Author = "OpenSpace Team",
   URL = "http://openspaceproject.com",
diff --git a/data/assets/scene/solarsystem/planets/earth/eclipses/paths/total/2028-07-22.asset b/data/assets/scene/solarsystem/planets/earth/eclipses/paths/total/2028-07-22.asset
index 52ebc1eee9..b9438028df 100644
--- a/data/assets/scene/solarsystem/planets/earth/eclipses/paths/total/2028-07-22.asset
+++ b/data/assets/scene/solarsystem/planets/earth/eclipses/paths/total/2028-07-22.asset
@@ -29,7 +29,6 @@ end)
 
 asset.meta = {
   Name = "Total 2028-07-22",
-  Version = "1.0",
   Description = "Total eclipse map for 2028-07-22",
   Author = "OpenSpace Team",
   URL = "http://openspaceproject.com",
diff --git a/data/assets/scene/solarsystem/planets/earth/eclipses/paths/total/2030-11-25.asset b/data/assets/scene/solarsystem/planets/earth/eclipses/paths/total/2030-11-25.asset
index 1dbc700ac3..7b269d180f 100644
--- a/data/assets/scene/solarsystem/planets/earth/eclipses/paths/total/2030-11-25.asset
+++ b/data/assets/scene/solarsystem/planets/earth/eclipses/paths/total/2030-11-25.asset
@@ -27,7 +27,6 @@ end)
 
 asset.meta = {
   Name = "Total 2030-11-25",
-  Version = "1.0",
   Description = "Total eclipse map for 2030-11-25",
   Author = "OpenSpace Team",
   URL = "http://openspaceproject.com",
diff --git a/data/assets/scene/solarsystem/planets/earth/eclipses/paths/total/2033-03-30.asset b/data/assets/scene/solarsystem/planets/earth/eclipses/paths/total/2033-03-30.asset
index c60844b6cd..3e4b178908 100644
--- a/data/assets/scene/solarsystem/planets/earth/eclipses/paths/total/2033-03-30.asset
+++ b/data/assets/scene/solarsystem/planets/earth/eclipses/paths/total/2033-03-30.asset
@@ -29,7 +29,6 @@ end)
 
 asset.meta = {
   Name = "Total 2033-03-30",
-  Version = "1.0",
   Description = "Total eclipse map for 2033-03-30",
   Author = "OpenSpace Team",
   URL = "http://openspaceproject.com",
diff --git a/data/assets/scene/solarsystem/planets/earth/eclipses/paths/total/2034-03-20.asset b/data/assets/scene/solarsystem/planets/earth/eclipses/paths/total/2034-03-20.asset
index b9b834d796..7e92e6e610 100644
--- a/data/assets/scene/solarsystem/planets/earth/eclipses/paths/total/2034-03-20.asset
+++ b/data/assets/scene/solarsystem/planets/earth/eclipses/paths/total/2034-03-20.asset
@@ -29,7 +29,6 @@ end)
 
 asset.meta = {
   Name = "Total 2034-03-20",
-  Version = "1.0",
   Description = "Total eclipse map for 2034-03-20",
   Author = "OpenSpace Team",
   URL = "http://openspaceproject.com",
diff --git a/data/assets/scene/solarsystem/planets/earth/eclipses/paths/total/2035-09-02.asset b/data/assets/scene/solarsystem/planets/earth/eclipses/paths/total/2035-09-02.asset
index ea0113e141..cf7827acc5 100644
--- a/data/assets/scene/solarsystem/planets/earth/eclipses/paths/total/2035-09-02.asset
+++ b/data/assets/scene/solarsystem/planets/earth/eclipses/paths/total/2035-09-02.asset
@@ -27,7 +27,6 @@ end)
 
 asset.meta = {
   Name = "Total 2035-09-02",
-  Version = "1.0",
   Description = "Total eclipse map for 2035-09-02",
   Author = "OpenSpace Team",
   URL = "http://openspaceproject.com",
diff --git a/data/assets/scene/solarsystem/planets/earth/eclipses/paths/total/2037-07-13.asset b/data/assets/scene/solarsystem/planets/earth/eclipses/paths/total/2037-07-13.asset
index fcbdd873df..15fc082dab 100644
--- a/data/assets/scene/solarsystem/planets/earth/eclipses/paths/total/2037-07-13.asset
+++ b/data/assets/scene/solarsystem/planets/earth/eclipses/paths/total/2037-07-13.asset
@@ -27,7 +27,6 @@ end)
 
 asset.meta = {
   Name = "Total 2037-07-13",
-  Version = "1.0",
   Description = "Total eclipse map for 2037-07-13",
   Author = "OpenSpace Team",
   URL = "http://openspaceproject.com",
diff --git a/data/assets/scene/solarsystem/planets/earth/eclipses/paths/total/2038-12-26.asset b/data/assets/scene/solarsystem/planets/earth/eclipses/paths/total/2038-12-26.asset
index 2c64b21f7e..92c3bf1de0 100644
--- a/data/assets/scene/solarsystem/planets/earth/eclipses/paths/total/2038-12-26.asset
+++ b/data/assets/scene/solarsystem/planets/earth/eclipses/paths/total/2038-12-26.asset
@@ -27,7 +27,6 @@ end)
 
 asset.meta = {
   Name = "Total 2038-12-26",
-  Version = "1.0",
   Description = "Total eclipse map for 2038-12-26",
   Author = "OpenSpace Team",
   URL = "http://openspaceproject.com",
diff --git a/data/assets/scene/solarsystem/planets/earth/eclipses/paths/total/2039-12-15.asset b/data/assets/scene/solarsystem/planets/earth/eclipses/paths/total/2039-12-15.asset
index 269621d93c..53edd247ef 100644
--- a/data/assets/scene/solarsystem/planets/earth/eclipses/paths/total/2039-12-15.asset
+++ b/data/assets/scene/solarsystem/planets/earth/eclipses/paths/total/2039-12-15.asset
@@ -27,7 +27,6 @@ end)
 
 asset.meta = {
   Name = "Total 2039-12-15",
-  Version = "1.0",
   Description = "Total eclipse map for 2039-12-15",
   Author = "OpenSpace Team",
   URL = "http://openspaceproject.com",
diff --git a/data/assets/scene/solarsystem/planets/earth/eclipses/paths/total/2041-04-30.asset b/data/assets/scene/solarsystem/planets/earth/eclipses/paths/total/2041-04-30.asset
index 52274697e5..1d1a60b078 100644
--- a/data/assets/scene/solarsystem/planets/earth/eclipses/paths/total/2041-04-30.asset
+++ b/data/assets/scene/solarsystem/planets/earth/eclipses/paths/total/2041-04-30.asset
@@ -27,7 +27,6 @@ end)
 
 asset.meta = {
   Name = "Total 2041-04-30",
-  Version = "1.0",
   Description = "Total eclipse map for 2041-04-30",
   Author = "OpenSpace Team",
   URL = "http://openspaceproject.com",
diff --git a/data/assets/scene/solarsystem/planets/earth/eclipses/paths/total/2042-04-20.asset b/data/assets/scene/solarsystem/planets/earth/eclipses/paths/total/2042-04-20.asset
index 748002f7ca..1b222cd5b7 100644
--- a/data/assets/scene/solarsystem/planets/earth/eclipses/paths/total/2042-04-20.asset
+++ b/data/assets/scene/solarsystem/planets/earth/eclipses/paths/total/2042-04-20.asset
@@ -29,7 +29,6 @@ end)
 
 asset.meta = {
   Name = "Total 2042-04-20",
-  Version = "1.0",
   Description = "Total eclipse map for 2042-04-20",
   Author = "OpenSpace Team",
   URL = "http://openspaceproject.com",
diff --git a/data/assets/scene/solarsystem/planets/earth/eclipses/paths/total/2043-04-09.asset b/data/assets/scene/solarsystem/planets/earth/eclipses/paths/total/2043-04-09.asset
index 045d553789..aa48d081eb 100644
--- a/data/assets/scene/solarsystem/planets/earth/eclipses/paths/total/2043-04-09.asset
+++ b/data/assets/scene/solarsystem/planets/earth/eclipses/paths/total/2043-04-09.asset
@@ -27,7 +27,6 @@ end)
 
 asset.meta = {
   Name = "Total 2043-04-09",
-  Version = "1.0",
   Description = "Total eclipse map for 2043-04-09",
   Author = "OpenSpace Team",
   URL = "http://openspaceproject.com",
diff --git a/data/assets/scene/solarsystem/planets/earth/eclipses/timeline.asset b/data/assets/scene/solarsystem/planets/earth/eclipses/timeline.asset
index ad5d31540e..d263f2d1bd 100644
--- a/data/assets/scene/solarsystem/planets/earth/eclipses/timeline.asset
+++ b/data/assets/scene/solarsystem/planets/earth/eclipses/timeline.asset
@@ -2282,7 +2282,6 @@ end)
 
 asset.meta = {
   Name = "Eclipses Timeline",
-  Version = "1.0",
   Description = "A timeline that shows all of the eclipses in the past and next 100 years",
   Author = "OpenSpace Team",
   URL = "http://openspaceproject.com",
diff --git a/data/assets/scene/solarsystem/planets/earth/grids.asset b/data/assets/scene/solarsystem/planets/earth/grids.asset
index 18ba878fa2..64857f4652 100644
--- a/data/assets/scene/solarsystem/planets/earth/grids.asset
+++ b/data/assets/scene/solarsystem/planets/earth/grids.asset
@@ -86,7 +86,6 @@ asset.export(plane1lmin)
 
 asset.meta = {
   Name = "Earth Grid",
-  Version = "1.0",
   Description = [[Grids that are useful to show distances around Earth]],
   Author = "OpenSpace Team",
   License = "MIT license"
diff --git a/data/assets/scene/solarsystem/planets/earth/lagrange_points/l1.asset b/data/assets/scene/solarsystem/planets/earth/lagrange_points/l1.asset
index c70f723fb6..91cd974d50 100644
--- a/data/assets/scene/solarsystem/planets/earth/lagrange_points/l1.asset
+++ b/data/assets/scene/solarsystem/planets/earth/lagrange_points/l1.asset
@@ -104,7 +104,6 @@ asset.export(L1Label)
 
 asset.meta = {
   Name = "Lagrange point L1",
-  Version = "1.0",
   Description = "Lagrange point L1 node and label",
   Author = "OpenSpace Team",
   URL = "http://openspaceproject.com",
diff --git a/data/assets/scene/solarsystem/planets/earth/lagrange_points/l2.asset b/data/assets/scene/solarsystem/planets/earth/lagrange_points/l2.asset
index cf970ed160..1697b23bb4 100644
--- a/data/assets/scene/solarsystem/planets/earth/lagrange_points/l2.asset
+++ b/data/assets/scene/solarsystem/planets/earth/lagrange_points/l2.asset
@@ -199,7 +199,6 @@ asset.export(L2Label)
 
 asset.meta = {
   Name = "Lagrange point L2",
-  Version = "1.0",
   Description = [[Lagrange point L2 large and small nodes, sun line, and large and small
     labels]],
   Author = "OpenSpace Team",
diff --git a/data/assets/scene/solarsystem/planets/earth/lagrange_points/l4.asset b/data/assets/scene/solarsystem/planets/earth/lagrange_points/l4.asset
index 674ab5d5df..e528314041 100644
--- a/data/assets/scene/solarsystem/planets/earth/lagrange_points/l4.asset
+++ b/data/assets/scene/solarsystem/planets/earth/lagrange_points/l4.asset
@@ -105,7 +105,6 @@ asset.export(L4Label)
 
 asset.meta = {
   Name = "Lagrange point L4",
-  Version = "1.0",
   Description = "Lagrange point L4 node and label",
   Author = "OpenSpace Team",
   URL = "http://openspaceproject.com",
diff --git a/data/assets/scene/solarsystem/planets/earth/lagrange_points/l5.asset b/data/assets/scene/solarsystem/planets/earth/lagrange_points/l5.asset
index 6ccb055f41..7ea7f29b64 100644
--- a/data/assets/scene/solarsystem/planets/earth/lagrange_points/l5.asset
+++ b/data/assets/scene/solarsystem/planets/earth/lagrange_points/l5.asset
@@ -105,7 +105,6 @@ asset.export(L5Label)
 
 asset.meta = {
   Name = "Lagrange point L5",
-  Version = "1.0",
   Description = "Lagrange point L5 node and label",
   Author = "OpenSpace Team",
   URL = "http://openspaceproject.com",
diff --git a/data/assets/scene/solarsystem/planets/earth/lagrange_points/lagrange_points.asset b/data/assets/scene/solarsystem/planets/earth/lagrange_points/lagrange_points.asset
index d8c6614270..1d29b3d2f2 100644
--- a/data/assets/scene/solarsystem/planets/earth/lagrange_points/lagrange_points.asset
+++ b/data/assets/scene/solarsystem/planets/earth/lagrange_points/lagrange_points.asset
@@ -7,7 +7,6 @@ asset.require("./l5")
 
 asset.meta = {
   Name = "Earth Lagrange Points",
-  Version = "1.0",
   Description = [[Meta asset to include all the Earth Lagrange points. Includes L1, L2, L4
     and L5]],
   Author = "OpenSpace Team",
diff --git a/data/assets/scene/solarsystem/planets/earth/layers/base_layers.asset b/data/assets/scene/solarsystem/planets/earth/layers/base_layers.asset
index 7f976aa0c8..3f09579c0c 100644
--- a/data/assets/scene/solarsystem/planets/earth/layers/base_layers.asset
+++ b/data/assets/scene/solarsystem/planets/earth/layers/base_layers.asset
@@ -28,7 +28,6 @@ asset.require("./watermasks/modis_water_mask", asset.enabled)
 
 asset.meta = {
   Name = "Base Earth Layers",
-  Version = "1.0",
   Description = [[Base Earth layers are: Blue Marble, ESRI VIIRS Combo, ESRI NOAA20 Combo,
     ESRI World Imagery, VIIRS SNPP (Temporal), Aqua Modis (Temporal),
     Terra Modis (Temporal), AMSR2 GCOM W1 Sea Ice Concentration (Temporal),
diff --git a/data/assets/scene/solarsystem/planets/earth/layers/colorlayers/amsr2_gcom_w1_sea_ice_concentration_temporal.asset b/data/assets/scene/solarsystem/planets/earth/layers/colorlayers/amsr2_gcom_w1_sea_ice_concentration_temporal.asset
index 52e7d40a4e..e0d85ac696 100644
--- a/data/assets/scene/solarsystem/planets/earth/layers/colorlayers/amsr2_gcom_w1_sea_ice_concentration_temporal.asset
+++ b/data/assets/scene/solarsystem/planets/earth/layers/colorlayers/amsr2_gcom_w1_sea_ice_concentration_temporal.asset
@@ -45,7 +45,6 @@ asset.export("layer", Layer)
 
 asset.meta = {
   Name = "AMSR2 GCOM W1 Sea Ice Concentration (Temporal)",
-  Version = "1.1",
   Description = "GIBS hosted layer",
   Author = "NASA EOSDIS Global Imagery Browse Services",
   URL = "https://earthdata.nasa.gov/eosdis/science-system-description/eosdis-components/gibs",
diff --git a/data/assets/scene/solarsystem/planets/earth/layers/colorlayers/aqua_modis_temporal.asset b/data/assets/scene/solarsystem/planets/earth/layers/colorlayers/aqua_modis_temporal.asset
index 1982139ece..aecc50d2e0 100644
--- a/data/assets/scene/solarsystem/planets/earth/layers/colorlayers/aqua_modis_temporal.asset
+++ b/data/assets/scene/solarsystem/planets/earth/layers/colorlayers/aqua_modis_temporal.asset
@@ -50,7 +50,6 @@ asset.export("layer", Layer)
 
 asset.meta = {
   Name = "Aqua Modis (Temporal)",
-  Version = "1.1",
   Description = "GIBS hosted layer",
   Author = "NASA EOSDIS Global Imagery Browse Services",
   URL = "https://earthdata.nasa.gov/eosdis/science-system-description/eosdis-components/gibs",
diff --git a/data/assets/scene/solarsystem/planets/earth/layers/colorlayers/blue_marble.asset b/data/assets/scene/solarsystem/planets/earth/layers/colorlayers/blue_marble.asset
index 3f9981b738..6c0d330505 100644
--- a/data/assets/scene/solarsystem/planets/earth/layers/colorlayers/blue_marble.asset
+++ b/data/assets/scene/solarsystem/planets/earth/layers/colorlayers/blue_marble.asset
@@ -35,7 +35,6 @@ asset.export("layer", Layer)
 
 asset.meta = {
   Name = "Blue Marble",
-  Version = "1.1",
   Description = [[Fallback layer for earth image if no internet is available. Contains
     Blue Marble Next Generation]],
   Author = "OpenSpace Team",
diff --git a/data/assets/scene/solarsystem/planets/earth/layers/colorlayers/bmng_newyork.asset b/data/assets/scene/solarsystem/planets/earth/layers/colorlayers/bmng_newyork.asset
index b328222bb0..e8755e7cf6 100644
--- a/data/assets/scene/solarsystem/planets/earth/layers/colorlayers/bmng_newyork.asset
+++ b/data/assets/scene/solarsystem/planets/earth/layers/colorlayers/bmng_newyork.asset
@@ -27,7 +27,6 @@ asset.export("layer", Layer)
 
 asset.meta = {
   Name = "Blue Marble Next Generation (New York)",
-  Version = "1.1",
   Description = [[Web loaded full resolution map of Blue Marble Next Generation. This map
     is hosted on the OpenSpace servers in New York]],
   Author = "OpenSpace Team",
diff --git a/data/assets/scene/solarsystem/planets/earth/layers/colorlayers/bmng_sweden.asset b/data/assets/scene/solarsystem/planets/earth/layers/colorlayers/bmng_sweden.asset
index 2699c146c6..8bb5bd5a38 100644
--- a/data/assets/scene/solarsystem/planets/earth/layers/colorlayers/bmng_sweden.asset
+++ b/data/assets/scene/solarsystem/planets/earth/layers/colorlayers/bmng_sweden.asset
@@ -27,7 +27,6 @@ asset.export("layer", Layer)
 
 asset.meta = {
   Name = "Blue Marble Next Generation (Sweden)",
-  Version = "1.1",
   Description = [[Web loaded full resolution map of Blue Marble Next Generation. This map
     is hosted on the OpenSpace servers in Sweden]],
   Author = "OpenSpace Team",
diff --git a/data/assets/scene/solarsystem/planets/earth/layers/colorlayers/bmng_utah.asset b/data/assets/scene/solarsystem/planets/earth/layers/colorlayers/bmng_utah.asset
index 6ed6c35b2e..3d1d2bc5ea 100644
--- a/data/assets/scene/solarsystem/planets/earth/layers/colorlayers/bmng_utah.asset
+++ b/data/assets/scene/solarsystem/planets/earth/layers/colorlayers/bmng_utah.asset
@@ -27,7 +27,6 @@ asset.export("layer", Layer)
 
 asset.meta = {
   Name = "Blue Marble Next Generation (Utah)",
-  Version = "1.1",
   Description = [[Web loaded full resolution map of Blue Marble Next Generation. This map
     is hosted on the OpenSpace servers in Utah]],
   Author = "OpenSpace Team",
diff --git a/data/assets/scene/solarsystem/planets/earth/layers/colorlayers/esri_noaa20_combo.asset b/data/assets/scene/solarsystem/planets/earth/layers/colorlayers/esri_noaa20_combo.asset
index 6fd01a77bb..ae680ca127 100644
--- a/data/assets/scene/solarsystem/planets/earth/layers/colorlayers/esri_noaa20_combo.asset
+++ b/data/assets/scene/solarsystem/planets/earth/layers/colorlayers/esri_noaa20_combo.asset
@@ -62,7 +62,6 @@ asset.export("layer", Layer)
 
 asset.meta = {
   Name = "ESRI NOAA20 VIIRS Combo",
-  Version = "1.0",
   Description = [[Level based layer combining "NOAA20 SNPP (Temporal)" and ESRI World
   Imagery. "NOAA20 SNPP (Temporal)" is faded out at tile level 4]],
   Author = "OpenSpace Tem",
diff --git a/data/assets/scene/solarsystem/planets/earth/layers/colorlayers/esri_noaa21_combo.asset b/data/assets/scene/solarsystem/planets/earth/layers/colorlayers/esri_noaa21_combo.asset
index 7fd56b1fbb..504ca739eb 100644
--- a/data/assets/scene/solarsystem/planets/earth/layers/colorlayers/esri_noaa21_combo.asset
+++ b/data/assets/scene/solarsystem/planets/earth/layers/colorlayers/esri_noaa21_combo.asset
@@ -62,7 +62,6 @@ asset.export("layer", Layer)
 
 asset.meta = {
   Name = "ESRI NOAA20 VIIRS Combo",
-  Version = "1.0",
   Description = [[Level based layer combining "NOAA20 SNPP (Temporal)" and ESRI World
   Imagery. "NOAA20 SNPP (Temporal)" is faded out at tile level 4]],
   Author = "OpenSpace Tem",
diff --git a/data/assets/scene/solarsystem/planets/earth/layers/colorlayers/esri_viirs_combo.asset b/data/assets/scene/solarsystem/planets/earth/layers/colorlayers/esri_viirs_combo.asset
index b2474ab17f..a8a1ca1b74 100644
--- a/data/assets/scene/solarsystem/planets/earth/layers/colorlayers/esri_viirs_combo.asset
+++ b/data/assets/scene/solarsystem/planets/earth/layers/colorlayers/esri_viirs_combo.asset
@@ -62,7 +62,6 @@ asset.export("layer", Layer)
 
 asset.meta = {
   Name = "ESRI VIIRS Combo",
-  Version = "1.1",
   Description = [[Level based layer combining "VIIRS SNPP (Temporal)" and ESRI World
   Imagery. "VIIRS SNPP (Temporal)" is faded out at tile level 4]],
   Author = "OpenSpace Tem",
diff --git a/data/assets/scene/solarsystem/planets/earth/layers/colorlayers/esri_world_imagery.asset b/data/assets/scene/solarsystem/planets/earth/layers/colorlayers/esri_world_imagery.asset
index 751a9078de..4664f3d2c7 100644
--- a/data/assets/scene/solarsystem/planets/earth/layers/colorlayers/esri_world_imagery.asset
+++ b/data/assets/scene/solarsystem/planets/earth/layers/colorlayers/esri_world_imagery.asset
@@ -35,7 +35,6 @@ asset.export("layer", Layer)
 
 asset.meta = {
   Name = "ESRI World Imagery",
-  Version = "1.1",
   Description = "Main web loaded map layer for Earth. This layer is hosted by ESRI",
   Author = "ESRI",
   URL = "https://www.arcgis.com/home/item.html?id=10df2279f9684e4a9f6a7f08febac2a9",
diff --git a/data/assets/scene/solarsystem/planets/earth/layers/colorlayers/ghrsst_l4_mur_sea_surface_temperature_temporal.asset b/data/assets/scene/solarsystem/planets/earth/layers/colorlayers/ghrsst_l4_mur_sea_surface_temperature_temporal.asset
index 6e7bc04cc3..80a3536893 100644
--- a/data/assets/scene/solarsystem/planets/earth/layers/colorlayers/ghrsst_l4_mur_sea_surface_temperature_temporal.asset
+++ b/data/assets/scene/solarsystem/planets/earth/layers/colorlayers/ghrsst_l4_mur_sea_surface_temperature_temporal.asset
@@ -41,7 +41,6 @@ asset.export("layer", Layer)
 
 asset.meta = {
   Name = "GHRSST L4 MUR Sea Surface Temperature (Temporal)",
-  Version = "1.1",
   Description = "GIBS hosted layer",
   Author = "NASA EOSDIS Global Imagery Browse Services",
   URL = "https://earthdata.nasa.gov/eosdis/science-system-description/eosdis-components/gibs",
diff --git a/data/assets/scene/solarsystem/planets/earth/layers/colorlayers/modis_terra_chlorophyll_a_temporal.asset b/data/assets/scene/solarsystem/planets/earth/layers/colorlayers/modis_terra_chlorophyll_a_temporal.asset
index bb839daf6d..4c534d3d9a 100644
--- a/data/assets/scene/solarsystem/planets/earth/layers/colorlayers/modis_terra_chlorophyll_a_temporal.asset
+++ b/data/assets/scene/solarsystem/planets/earth/layers/colorlayers/modis_terra_chlorophyll_a_temporal.asset
@@ -41,7 +41,6 @@ asset.export("layer", Layer)
 
 asset.meta = {
   Name = "MODIS Terra Chlorophyll A (Temporal)",
-  Version = "1.1",
   Description = "GIBS hosted layer",
   Author = "NASA EOSDIS Global Imagery Browse Services",
   URL = "https://earthdata.nasa.gov/eosdis/science-system-description/eosdis-components/gibs",
diff --git a/data/assets/scene/solarsystem/planets/earth/layers/colorlayers/terra_modis_temporal.asset b/data/assets/scene/solarsystem/planets/earth/layers/colorlayers/terra_modis_temporal.asset
index da0fea050a..5e2ff5e695 100644
--- a/data/assets/scene/solarsystem/planets/earth/layers/colorlayers/terra_modis_temporal.asset
+++ b/data/assets/scene/solarsystem/planets/earth/layers/colorlayers/terra_modis_temporal.asset
@@ -41,7 +41,6 @@ asset.export("layer", Layer)
 
 asset.meta = {
   Name = "Terra Modis (Temporal)",
-  Version = "1.1",
   Description = "GIBS hosted layer",
   Author = "NASA EOSDIS Global Imagery Browse Services",
   URL = "https://earthdata.nasa.gov/eosdis/science-system-description/eosdis-components/gibs",
diff --git a/data/assets/scene/solarsystem/planets/earth/layers/colorlayers/viirs_noaa20_temporal.asset b/data/assets/scene/solarsystem/planets/earth/layers/colorlayers/viirs_noaa20_temporal.asset
index 948862fbb4..4f75667c4d 100644
--- a/data/assets/scene/solarsystem/planets/earth/layers/colorlayers/viirs_noaa20_temporal.asset
+++ b/data/assets/scene/solarsystem/planets/earth/layers/colorlayers/viirs_noaa20_temporal.asset
@@ -41,7 +41,6 @@ asset.export("layer", Layer)
 
 asset.meta = {
   Name = "VIIRS NOAA20 (Temporal)",
-  Version = "1.1",
   Description = "This layer has the best daily Earth Image",
   Author = "NASA EOSDIS Global Imagery Browse Services",
   URL =
diff --git a/data/assets/scene/solarsystem/planets/earth/layers/colorlayers/viirs_snpp_temporal.asset b/data/assets/scene/solarsystem/planets/earth/layers/colorlayers/viirs_snpp_temporal.asset
index 441e5c73f9..e9888466e6 100644
--- a/data/assets/scene/solarsystem/planets/earth/layers/colorlayers/viirs_snpp_temporal.asset
+++ b/data/assets/scene/solarsystem/planets/earth/layers/colorlayers/viirs_snpp_temporal.asset
@@ -41,7 +41,6 @@ asset.export("layer", Layer)
 
 asset.meta = {
   Name = "VIIRS SNPP (Temporal)",
-  Version = "1.1",
   Description = "This layer has the best daily Earth Image",
   Author = "NASA EOSDIS Global Imagery Browse Services",
   URL =
diff --git a/data/assets/scene/solarsystem/planets/earth/layers/heightlayers/blue_marble_height.asset b/data/assets/scene/solarsystem/planets/earth/layers/heightlayers/blue_marble_height.asset
index af11d3455b..9b8433f619 100644
--- a/data/assets/scene/solarsystem/planets/earth/layers/heightlayers/blue_marble_height.asset
+++ b/data/assets/scene/solarsystem/planets/earth/layers/heightlayers/blue_marble_height.asset
@@ -40,7 +40,6 @@ asset.export("layer", Layer)
 
 asset.meta = {
   Name = "Earth Bluemarble Height",
-  Version = "1.1",
   Description = [[Fallback layer for earth height if no internet is available. Contains
     Blue Marble Next Generation Topographic]],
   Author = "NASA",
diff --git a/data/assets/scene/solarsystem/planets/earth/layers/heightlayers/terrain_tileset.asset b/data/assets/scene/solarsystem/planets/earth/layers/heightlayers/terrain_tileset.asset
index 31d32a53ae..bb2d2e0a5f 100644
--- a/data/assets/scene/solarsystem/planets/earth/layers/heightlayers/terrain_tileset.asset
+++ b/data/assets/scene/solarsystem/planets/earth/layers/heightlayers/terrain_tileset.asset
@@ -31,7 +31,6 @@ asset.export("layer", Layer)
 
 asset.meta = {
   Name = "World Elevation (3D)",
-  Version = "1.1",
   Description = "Main web loaded height layer for Earth. This layer is hosted by ESRI",
   Author = "ESRI",
   URL = "https://www.arcgis.com/home/item.html?id=1b48cd3b6276416784fe90a68c580a89",
diff --git a/data/assets/scene/solarsystem/planets/earth/layers/newyork_layers.asset b/data/assets/scene/solarsystem/planets/earth/layers/newyork_layers.asset
index d691d33868..3e17640093 100644
--- a/data/assets/scene/solarsystem/planets/earth/layers/newyork_layers.asset
+++ b/data/assets/scene/solarsystem/planets/earth/layers/newyork_layers.asset
@@ -6,7 +6,6 @@ asset.require("./watermasks/gebco_newyork", false)
 
 asset.meta = {
   Name = "Default Earth Layers (New York)",
-  Version = "1.0",
   Description = [[Default Earth layers are: Blue Marble,
     ESRI VIIRS Combo, ESRI NOAA20 Combo, ESRI World Imagery, VIIRS SNPP (Temporal),
     Aqua Modis (Temporal), Terra Modis (Temporal),
diff --git a/data/assets/scene/solarsystem/planets/earth/layers/nightlayers/earth_at_night_2012.asset b/data/assets/scene/solarsystem/planets/earth/layers/nightlayers/earth_at_night_2012.asset
index 93a095311a..83cb95bd8c 100644
--- a/data/assets/scene/solarsystem/planets/earth/layers/nightlayers/earth_at_night_2012.asset
+++ b/data/assets/scene/solarsystem/planets/earth/layers/nightlayers/earth_at_night_2012.asset
@@ -27,7 +27,6 @@ asset.export("layer", Layer)
 
 asset.meta = {
   Name = "Earth at Night 2012",
-  Version = "1.1",
   Description = "Main web loaded night layer for Earth. This layer is hosted by GIBS",
   Author = "OpenSpace Team",
   URL = "https://visibleearth.nasa.gov/images/79765/night-lights-2012-map",
diff --git a/data/assets/scene/solarsystem/planets/earth/layers/nightlayers/earth_at_night_temporal.asset b/data/assets/scene/solarsystem/planets/earth/layers/nightlayers/earth_at_night_temporal.asset
index a7cd536a59..9335950d43 100644
--- a/data/assets/scene/solarsystem/planets/earth/layers/nightlayers/earth_at_night_temporal.asset
+++ b/data/assets/scene/solarsystem/planets/earth/layers/nightlayers/earth_at_night_temporal.asset
@@ -57,7 +57,6 @@ asset.export("layer", Layer)
 
 asset.meta = {
   Name = "Earth at Night (Temporal)",
-  Version = "1.1",
   Description = "Temporal layer for earth with daily night image",
   Author = "OpenSpace Team",
   URL = "https://worldview.earthdata.nasa.gov/?l=VIIRS_SNPP_DayNightBand_ENCC",
diff --git a/data/assets/scene/solarsystem/planets/earth/layers/nightlayers/earth_at_night_temporal_blue_yellow.asset b/data/assets/scene/solarsystem/planets/earth/layers/nightlayers/earth_at_night_temporal_blue_yellow.asset
index c66e507915..6faeb39b8a 100644
--- a/data/assets/scene/solarsystem/planets/earth/layers/nightlayers/earth_at_night_temporal_blue_yellow.asset
+++ b/data/assets/scene/solarsystem/planets/earth/layers/nightlayers/earth_at_night_temporal_blue_yellow.asset
@@ -57,7 +57,6 @@ asset.export("layer", Layer)
 
 asset.meta = {
   Name = "Earth at Night Blue Yellow(Temporal)",
-  Version = "1.1",
   Description = "Temporal layer for earth with daily night image",
   Author = "OpenSpace Team",
   URL = "https://worldview.earthdata.nasa.gov/?l=VIIRS_SNPP_DayNightBand_ENCC",
diff --git a/data/assets/scene/solarsystem/planets/earth/layers/nightlayers/earth_night_texture.asset b/data/assets/scene/solarsystem/planets/earth/layers/nightlayers/earth_night_texture.asset
index d4aa37619a..588f856b0d 100644
--- a/data/assets/scene/solarsystem/planets/earth/layers/nightlayers/earth_night_texture.asset
+++ b/data/assets/scene/solarsystem/planets/earth/layers/nightlayers/earth_night_texture.asset
@@ -35,7 +35,6 @@ asset.export("layer", Layer)
 
 asset.meta = {
   Name = "Blue Marble Night",
-  Version = "1.1",
   Description = "Fallback layer for earth night image if no internet is available",
   Author = "OpenSpace Team",
   URL = "https://visibleearth.nasa.gov/collection/1484/blue-marble",
diff --git a/data/assets/scene/solarsystem/planets/earth/layers/overlays/coastlines.asset b/data/assets/scene/solarsystem/planets/earth/layers/overlays/coastlines.asset
index 73bdf4dbb9..948bcc9d4d 100644
--- a/data/assets/scene/solarsystem/planets/earth/layers/overlays/coastlines.asset
+++ b/data/assets/scene/solarsystem/planets/earth/layers/overlays/coastlines.asset
@@ -23,7 +23,6 @@ asset.export("layer", Layer)
 
 asset.meta = {
   Name = "Earth Coastlines Layer",
-  Version = "1.0",
   Description = "Coastlines layer for Earth globe",
   Author = "OpenSpace Team",
   URL = "http://openspaceproject.com",
diff --git a/data/assets/scene/solarsystem/planets/earth/layers/overlays/reference_features.asset b/data/assets/scene/solarsystem/planets/earth/layers/overlays/reference_features.asset
index 732a417970..0a8a28081e 100644
--- a/data/assets/scene/solarsystem/planets/earth/layers/overlays/reference_features.asset
+++ b/data/assets/scene/solarsystem/planets/earth/layers/overlays/reference_features.asset
@@ -24,7 +24,6 @@ asset.export("layer", Layer)
 
 asset.meta = {
   Name = "Earth Reference Features",
-  Version = "1.0",
   Description = "Reference Features layer for Earth globe",
   Author = "OpenSpace Team",
   URL = "http://openspaceproject.com",
diff --git a/data/assets/scene/solarsystem/planets/earth/layers/overlays/reference_labels.asset b/data/assets/scene/solarsystem/planets/earth/layers/overlays/reference_labels.asset
index 44e0ba7299..0f8af74d3e 100644
--- a/data/assets/scene/solarsystem/planets/earth/layers/overlays/reference_labels.asset
+++ b/data/assets/scene/solarsystem/planets/earth/layers/overlays/reference_labels.asset
@@ -24,7 +24,6 @@ asset.export("layer", Layer)
 
 asset.meta = {
   Name = "Earth Reference Labels",
-  Version = "1.0",
   Description = "Reference Labels layer for Earth globe",
   Author = "OpenSpace Team",
   URL = "http://openspaceproject.com",
diff --git a/data/assets/scene/solarsystem/planets/earth/layers/overlays/size_reference.asset b/data/assets/scene/solarsystem/planets/earth/layers/overlays/size_reference.asset
index 4e3f0b46b8..00bdae7b5a 100644
--- a/data/assets/scene/solarsystem/planets/earth/layers/overlays/size_reference.asset
+++ b/data/assets/scene/solarsystem/planets/earth/layers/overlays/size_reference.asset
@@ -25,7 +25,6 @@ asset.export("layer", Layer)
 
 asset.meta = {
   Name = "Earth Size Reference",
-  Version = "1.0",
   Description = "Size reference layer for Earth globe",
   Author = "OpenSpace Team",
   URL = "http://openspaceproject.com",
diff --git a/data/assets/scene/solarsystem/planets/earth/layers/overlays/tile_indices.asset b/data/assets/scene/solarsystem/planets/earth/layers/overlays/tile_indices.asset
index b61a0713f2..45afa564ea 100644
--- a/data/assets/scene/solarsystem/planets/earth/layers/overlays/tile_indices.asset
+++ b/data/assets/scene/solarsystem/planets/earth/layers/overlays/tile_indices.asset
@@ -24,7 +24,6 @@ asset.export("layer", Layer)
 
 asset.meta = {
   Name = "Earth Tile Indices",
-  Version = "1.0",
   Description = "Tile index layer for Earth globe",
   Author = "OpenSpace Team",
   URL = "http://openspaceproject.com",
diff --git a/data/assets/scene/solarsystem/planets/earth/layers/sweden_layers.asset b/data/assets/scene/solarsystem/planets/earth/layers/sweden_layers.asset
index 87d858ee0c..490c5c35c5 100644
--- a/data/assets/scene/solarsystem/planets/earth/layers/sweden_layers.asset
+++ b/data/assets/scene/solarsystem/planets/earth/layers/sweden_layers.asset
@@ -6,7 +6,6 @@ asset.require("./watermasks/gebco_sweden", false)
 
 asset.meta = {
   Name = "Default Earth Layers (Sweden)",
-  Version = "1.0",
   Description = [[Default Earth layers are: Blue Marble,
     ESRI VIIRS Combo, ESRI NOAA20 Combo, ESRI World Imagery, VIIRS SNPP (Temporal),
     Aqua Modis (Temporal), Terra Modis (Temporal),
diff --git a/data/assets/scene/solarsystem/planets/earth/layers/utah_layers.asset b/data/assets/scene/solarsystem/planets/earth/layers/utah_layers.asset
index d496dd78df..e3116f6cf1 100644
--- a/data/assets/scene/solarsystem/planets/earth/layers/utah_layers.asset
+++ b/data/assets/scene/solarsystem/planets/earth/layers/utah_layers.asset
@@ -6,7 +6,6 @@ asset.require("./watermasks/gebco_utah", false)
 
 asset.meta = {
   Name = "Default Earth Layers (Utah)",
-  Version = "1.0",
   Description = [[Default Earth layers are: Blue Marble,
     ESRI VIIRS Combo, ESRI NOAA20 Combo, ESRI World Imagery, VIIRS SNPP (Temporal),
     Aqua Modis (Temporal), Terra Modis (Temporal),
diff --git a/data/assets/scene/solarsystem/planets/earth/layers/watermasks/gebco_newyork.asset b/data/assets/scene/solarsystem/planets/earth/layers/watermasks/gebco_newyork.asset
index 2ad618c7a6..60c3e1e078 100644
--- a/data/assets/scene/solarsystem/planets/earth/layers/watermasks/gebco_newyork.asset
+++ b/data/assets/scene/solarsystem/planets/earth/layers/watermasks/gebco_newyork.asset
@@ -25,7 +25,6 @@ asset.export("layer", Layer)
 
 asset.meta = {
   Name = "Gebco WaterMask Layer (New York)",
-  Version = "1.0",
   Description = "WaterMask layer for Earth globe",
   Author = "OpenSpace Team",
   URL = "http://openspaceproject.com",
diff --git a/data/assets/scene/solarsystem/planets/earth/layers/watermasks/gebco_sweden.asset b/data/assets/scene/solarsystem/planets/earth/layers/watermasks/gebco_sweden.asset
index 4a6182eea6..720d0d8910 100644
--- a/data/assets/scene/solarsystem/planets/earth/layers/watermasks/gebco_sweden.asset
+++ b/data/assets/scene/solarsystem/planets/earth/layers/watermasks/gebco_sweden.asset
@@ -25,7 +25,6 @@ asset.export("layer", Layer)
 
 asset.meta = {
   Name = "Gebco WaterMask Layer (Sweden)",
-  Version = "1.0",
   Description = "WaterMask layer for Earth globe",
   Author = "OpenSpace Team",
   URL = "http://openspaceproject.com",
diff --git a/data/assets/scene/solarsystem/planets/earth/layers/watermasks/gebco_utah.asset b/data/assets/scene/solarsystem/planets/earth/layers/watermasks/gebco_utah.asset
index 1a0c6cdf00..2cef03f883 100644
--- a/data/assets/scene/solarsystem/planets/earth/layers/watermasks/gebco_utah.asset
+++ b/data/assets/scene/solarsystem/planets/earth/layers/watermasks/gebco_utah.asset
@@ -25,7 +25,6 @@ asset.export("layer", Layer)
 
 asset.meta = {
   Name = "Gebco WaterMask Layer (Utah)",
-  Version = "1.0",
   Description = "WaterMask layer for Earth globe",
   Author = "OpenSpace Team",
   URL = "http://openspaceproject.com",
diff --git a/data/assets/scene/solarsystem/planets/earth/layers/watermasks/modis_water_mask.asset b/data/assets/scene/solarsystem/planets/earth/layers/watermasks/modis_water_mask.asset
index aba4552b51..49d1a2444a 100644
--- a/data/assets/scene/solarsystem/planets/earth/layers/watermasks/modis_water_mask.asset
+++ b/data/assets/scene/solarsystem/planets/earth/layers/watermasks/modis_water_mask.asset
@@ -25,7 +25,6 @@ asset.export("layer", Layer)
 
 asset.meta = {
   Name = "MODIS Water Mask",
-  Version = "1.0",
   Description = "MODIS Water Mask layer for Earth globe",
   Author = "NASA EOSDIS Global Imagery Browse Services",
   URL = "https://earthdata.nasa.gov/eosdis/science-system-description/"..
diff --git a/data/assets/scene/solarsystem/planets/earth/magnetosphere/magnetosphere.asset b/data/assets/scene/solarsystem/planets/earth/magnetosphere/magnetosphere.asset
index de8720ac4a..13bf2172bc 100644
--- a/data/assets/scene/solarsystem/planets/earth/magnetosphere/magnetosphere.asset
+++ b/data/assets/scene/solarsystem/planets/earth/magnetosphere/magnetosphere.asset
@@ -53,7 +53,6 @@ asset.export(EarthMagnetosphere)
 
 asset.meta = {
   Name = "Static generic magnetosphere of fieldlines",
-  Version = "1.1",
   Description = "Generic static magnetosphere fieldlines. Actual timestep 2012-07-14T00-00-00-000. Defaultly colored by speed; 50-300 km/s",
   Author = "CCMC",
   URL = "",
diff --git a/data/assets/scene/solarsystem/planets/earth/magnetosphere/transforms_magnetosphere.asset b/data/assets/scene/solarsystem/planets/earth/magnetosphere/transforms_magnetosphere.asset
index d9c1f670df..fb5be33d4f 100644
--- a/data/assets/scene/solarsystem/planets/earth/magnetosphere/transforms_magnetosphere.asset
+++ b/data/assets/scene/solarsystem/planets/earth/magnetosphere/transforms_magnetosphere.asset
@@ -46,7 +46,6 @@ asset.export(GSMReferenceFrame)
 
 asset.meta = {
   Name = "Earth magnetosphere transforms",
-  Version = "1.1",
   Description = "Earth transforms: GSMReferenceFrame. Geocentric Solar Magnetospheric",
   Author = "CCMC",
   URL = "http://openspaceproject.com",
diff --git a/data/assets/scene/solarsystem/planets/earth/markers.asset b/data/assets/scene/solarsystem/planets/earth/markers.asset
index fd9ff9cde9..84f22944c8 100644
--- a/data/assets/scene/solarsystem/planets/earth/markers.asset
+++ b/data/assets/scene/solarsystem/planets/earth/markers.asset
@@ -43,7 +43,6 @@ asset.export(EarthMarker)
 
 asset.meta = {
   Name = "Earth marker",
-  Version = "1.1",
   Description = "Earth marker with name, sized for Solar System view",
   Author = "OpenSpace Team",
   URL = "http://openspaceproject.com",
diff --git a/data/assets/scene/solarsystem/planets/earth/moon/default_layers.asset b/data/assets/scene/solarsystem/planets/earth/moon/default_layers.asset
index 23bcccc083..8ff0f20392 100644
--- a/data/assets/scene/solarsystem/planets/earth/moon/default_layers.asset
+++ b/data/assets/scene/solarsystem/planets/earth/moon/default_layers.asset
@@ -6,7 +6,6 @@ asset.require("./layers/newyork_layers", false)
 
 asset.meta = {
   Name = "Default Moon layers",
-  Version = "1.1",
   Description = [[Default Moon layers are: WAC, Clem Uvvis, Uvvis Hybrid, Kaguya,
     LRO LOLA Color Shaded Relief 388m v4, Lola Shade, and Lola DEM (3D).
 
diff --git a/data/assets/scene/solarsystem/planets/earth/moon/layers/colorlayers/apollo_15_metric_newyork.asset b/data/assets/scene/solarsystem/planets/earth/moon/layers/colorlayers/apollo_15_metric_newyork.asset
index 0af4f897bc..0c75620191 100644
--- a/data/assets/scene/solarsystem/planets/earth/moon/layers/colorlayers/apollo_15_metric_newyork.asset
+++ b/data/assets/scene/solarsystem/planets/earth/moon/layers/colorlayers/apollo_15_metric_newyork.asset
@@ -34,7 +34,6 @@ asset.export("layer", Layer)
 
 asset.meta = {
   Name = "Kaguya [New York]",
-  Version = "1.1",
   Description = [[Moon SELENE Kaguya TC Global Orthomosaic 474m v2 layer for Moon globe.
     This map is hosted on the OpenSpace server in New York]],
   Author = "USGS",
diff --git a/data/assets/scene/solarsystem/planets/earth/moon/layers/colorlayers/clemuvvis_newyork.asset b/data/assets/scene/solarsystem/planets/earth/moon/layers/colorlayers/clemuvvis_newyork.asset
index 6db4108c7a..1bf226b867 100644
--- a/data/assets/scene/solarsystem/planets/earth/moon/layers/colorlayers/clemuvvis_newyork.asset
+++ b/data/assets/scene/solarsystem/planets/earth/moon/layers/colorlayers/clemuvvis_newyork.asset
@@ -33,7 +33,6 @@ asset.export("layer", Layer)
 
 asset.meta = {
   Name = "Clem Uvvis [New York]",
-  Version = "1.1",
   Description = [[Moon Clementine UVVIS Global Mosaic 118m v2 map of the Moon. This map
     is hosted on the OpenSpace server in New York]],
   Author = "USGS",
diff --git a/data/assets/scene/solarsystem/planets/earth/moon/layers/colorlayers/clemuvvis_sweden.asset b/data/assets/scene/solarsystem/planets/earth/moon/layers/colorlayers/clemuvvis_sweden.asset
index dd79dfa7d3..a5b0822ad5 100644
--- a/data/assets/scene/solarsystem/planets/earth/moon/layers/colorlayers/clemuvvis_sweden.asset
+++ b/data/assets/scene/solarsystem/planets/earth/moon/layers/colorlayers/clemuvvis_sweden.asset
@@ -33,7 +33,6 @@ asset.export("layer", Layer)
 
 asset.meta = {
   Name = "Clem Uvvis [Sweden]",
-  Version = "1.1",
   Description = [[Moon Clementine UVVIS Global Mosaic 118m v2 map of the Moon. This map
     is hosted on the OpenSpace server in Sweden]],
   Author = "USGS",
diff --git a/data/assets/scene/solarsystem/planets/earth/moon/layers/colorlayers/clemuvvis_utah.asset b/data/assets/scene/solarsystem/planets/earth/moon/layers/colorlayers/clemuvvis_utah.asset
index c864f3f02f..3802c8a7b6 100644
--- a/data/assets/scene/solarsystem/planets/earth/moon/layers/colorlayers/clemuvvis_utah.asset
+++ b/data/assets/scene/solarsystem/planets/earth/moon/layers/colorlayers/clemuvvis_utah.asset
@@ -34,7 +34,6 @@ asset.export("layer", Layer)
 
 asset.meta = {
   Name = "Clem Uvvis [Utah]",
-  Version = "1.1",
   Description = [[Moon Clementine UVVIS Global Mosaic 118m v2 map of the Moon. This map
     is hosted on the OpenSpace server in Utah]],
   Author = "USGS",
diff --git a/data/assets/scene/solarsystem/planets/earth/moon/layers/colorlayers/kaguya_newyork.asset b/data/assets/scene/solarsystem/planets/earth/moon/layers/colorlayers/kaguya_newyork.asset
index b026df1212..34f5bae257 100644
--- a/data/assets/scene/solarsystem/planets/earth/moon/layers/colorlayers/kaguya_newyork.asset
+++ b/data/assets/scene/solarsystem/planets/earth/moon/layers/colorlayers/kaguya_newyork.asset
@@ -33,7 +33,6 @@ asset.export("layer", Layer)
 
 asset.meta = {
   Name = "Kaguya [New York]",
-  Version = "1.1",
   Description = [[Moon SELENE Kaguya TC Global Orthomosaic 474m v2 layer for Moon globe.
     This map is hosted on the OpenSpace server in New York]],
   Author = "USGS",
diff --git a/data/assets/scene/solarsystem/planets/earth/moon/layers/colorlayers/kaguya_sweden.asset b/data/assets/scene/solarsystem/planets/earth/moon/layers/colorlayers/kaguya_sweden.asset
index e54edc08a4..81780f4255 100644
--- a/data/assets/scene/solarsystem/planets/earth/moon/layers/colorlayers/kaguya_sweden.asset
+++ b/data/assets/scene/solarsystem/planets/earth/moon/layers/colorlayers/kaguya_sweden.asset
@@ -33,7 +33,6 @@ asset.export("layer", Layer)
 
 asset.meta = {
   Name = "Kaguya [Sweden]",
-  Version = "1.1",
   Description = [[Moon SELENE Kaguya TC Global Orthomosaic 474m v2 layer for Moon globe.
     This map is hosted on the OpenSpace server in Sweden]],
   Author = "USGS",
diff --git a/data/assets/scene/solarsystem/planets/earth/moon/layers/colorlayers/kaguya_utah.asset b/data/assets/scene/solarsystem/planets/earth/moon/layers/colorlayers/kaguya_utah.asset
index a75fcc175e..3588904c7a 100644
--- a/data/assets/scene/solarsystem/planets/earth/moon/layers/colorlayers/kaguya_utah.asset
+++ b/data/assets/scene/solarsystem/planets/earth/moon/layers/colorlayers/kaguya_utah.asset
@@ -33,7 +33,6 @@ asset.export("layer", Layer)
 
 asset.meta = {
   Name = "Kaguya [Utah]",
-  Version = "1.1",
   Description = [[Moon SELENE Kaguya TC Global Orthomosaic 474m v2 layer for Moon globe.
     This map is hosted on the OpenSpace server in Utah]],
   Author = "USGS",
diff --git a/data/assets/scene/solarsystem/planets/earth/moon/layers/colorlayers/lo_mr_mosaic_newyork.asset b/data/assets/scene/solarsystem/planets/earth/moon/layers/colorlayers/lo_mr_mosaic_newyork.asset
index 15198e0596..ecf4959a18 100644
--- a/data/assets/scene/solarsystem/planets/earth/moon/layers/colorlayers/lo_mr_mosaic_newyork.asset
+++ b/data/assets/scene/solarsystem/planets/earth/moon/layers/colorlayers/lo_mr_mosaic_newyork.asset
@@ -42,7 +42,6 @@ asset.export("layer", Layer)
 
 asset.meta = {
   Name = "Moon Lunar Orbiter Digital Photographic Global Mosaic [New York]",
-  Version = "1.0",
   Description = [[Moon Lunar Orbiter Digital Photographic Global Mosaic 59m v1. This
     map is hosted on the OpenSpace server in New York]],
   Author = "USGS",
diff --git a/data/assets/scene/solarsystem/planets/earth/moon/layers/colorlayers/lo_mr_mosaic_sweden.asset b/data/assets/scene/solarsystem/planets/earth/moon/layers/colorlayers/lo_mr_mosaic_sweden.asset
index 63294129c4..c98c0626bc 100644
--- a/data/assets/scene/solarsystem/planets/earth/moon/layers/colorlayers/lo_mr_mosaic_sweden.asset
+++ b/data/assets/scene/solarsystem/planets/earth/moon/layers/colorlayers/lo_mr_mosaic_sweden.asset
@@ -41,7 +41,6 @@ asset.export("layer", Layer)
 
 asset.meta = {
   Name = "Moon Lunar Orbiter Digital Photographic Global Mosaic [Sweden]",
-  Version = "1.0",
   Description = [[Moon Lunar Orbiter Digital Photographic Global Mosaic 59m v1. This
     map is hosted on the OpenSpace server in Sweden]],
   Author = "USGS",
diff --git a/data/assets/scene/solarsystem/planets/earth/moon/layers/colorlayers/lola_clr_shade_newyork.asset b/data/assets/scene/solarsystem/planets/earth/moon/layers/colorlayers/lola_clr_shade_newyork.asset
index c67bfd3d81..a08607a103 100644
--- a/data/assets/scene/solarsystem/planets/earth/moon/layers/colorlayers/lola_clr_shade_newyork.asset
+++ b/data/assets/scene/solarsystem/planets/earth/moon/layers/colorlayers/lola_clr_shade_newyork.asset
@@ -33,7 +33,6 @@ asset.export("layer", Layer)
 
 asset.meta = {
   Name = "Lola Color Shade [New York]",
-  Version = "1.1",
   Description = [[Moon LRO LOLA Color Shaded Relief 388m v4 layer for Moon globe. This
     map is hosted on the OpenSpace server in New York]],
   Author = "USGS",
diff --git a/data/assets/scene/solarsystem/planets/earth/moon/layers/colorlayers/lola_clr_shade_sweden.asset b/data/assets/scene/solarsystem/planets/earth/moon/layers/colorlayers/lola_clr_shade_sweden.asset
index 15f645682d..b2c60119c5 100644
--- a/data/assets/scene/solarsystem/planets/earth/moon/layers/colorlayers/lola_clr_shade_sweden.asset
+++ b/data/assets/scene/solarsystem/planets/earth/moon/layers/colorlayers/lola_clr_shade_sweden.asset
@@ -33,7 +33,6 @@ asset.export("layer", Layer)
 
 asset.meta = {
   Name = "Lola Color Shade [Sweden]",
-  Version = "1.1",
   Description = [[Moon LRO LOLA Color Shaded Relief 388m v4 layer for Moon globe. This
     map is hosted on the OpenSpace server in Sweden]],
   Author = "USGS",
diff --git a/data/assets/scene/solarsystem/planets/earth/moon/layers/colorlayers/lola_clr_shade_utah.asset b/data/assets/scene/solarsystem/planets/earth/moon/layers/colorlayers/lola_clr_shade_utah.asset
index d1e8132328..7b168d7d25 100644
--- a/data/assets/scene/solarsystem/planets/earth/moon/layers/colorlayers/lola_clr_shade_utah.asset
+++ b/data/assets/scene/solarsystem/planets/earth/moon/layers/colorlayers/lola_clr_shade_utah.asset
@@ -33,7 +33,6 @@ asset.export("layer", Layer)
 
 asset.meta = {
   Name = "Lola Color Shade [Utah]",
-  Version = "1.1",
   Description = [[Moon LRO LOLA Color Shaded Relief 388m v4 layer for Moon globe. This
     map is hosted on the OpenSpace server in Utah]],
   Author = "USGS",
diff --git a/data/assets/scene/solarsystem/planets/earth/moon/layers/colorlayers/lola_shade_newyork.asset b/data/assets/scene/solarsystem/planets/earth/moon/layers/colorlayers/lola_shade_newyork.asset
index 18ef0f2300..5a9d1cd611 100644
--- a/data/assets/scene/solarsystem/planets/earth/moon/layers/colorlayers/lola_shade_newyork.asset
+++ b/data/assets/scene/solarsystem/planets/earth/moon/layers/colorlayers/lola_shade_newyork.asset
@@ -33,7 +33,6 @@ asset.export("layer", Layer)
 
 asset.meta = {
   Name = "Lola Shade [New York]",
-  Version = "1.1",
   Description = [[Moon LRO LOLA Shaded Relief 237m v4 layer for Moon globe. This
     map is hosted on the OpenSpace server in New York]],
   Author = "USGS",
diff --git a/data/assets/scene/solarsystem/planets/earth/moon/layers/colorlayers/lola_shade_sweden.asset b/data/assets/scene/solarsystem/planets/earth/moon/layers/colorlayers/lola_shade_sweden.asset
index 8b44ff7582..12dc1938ff 100644
--- a/data/assets/scene/solarsystem/planets/earth/moon/layers/colorlayers/lola_shade_sweden.asset
+++ b/data/assets/scene/solarsystem/planets/earth/moon/layers/colorlayers/lola_shade_sweden.asset
@@ -33,7 +33,6 @@ asset.export("layer", Layer)
 
 asset.meta = {
   Name = "Lola Shade [Sweden]",
-  Version = "1.1",
   Description = [[Moon LRO LOLA Shaded Relief 237m v4 layer for Moon globe. This
     map is hosted on the OpenSpace server in Sweden]],
   Author = "USGS",
diff --git a/data/assets/scene/solarsystem/planets/earth/moon/layers/colorlayers/lola_shade_utah.asset b/data/assets/scene/solarsystem/planets/earth/moon/layers/colorlayers/lola_shade_utah.asset
index 0de23c3506..6589076128 100644
--- a/data/assets/scene/solarsystem/planets/earth/moon/layers/colorlayers/lola_shade_utah.asset
+++ b/data/assets/scene/solarsystem/planets/earth/moon/layers/colorlayers/lola_shade_utah.asset
@@ -33,7 +33,6 @@ asset.export("layer", Layer)
 
 asset.meta = {
   Name = "Lola Shade [Utah]",
-  Version = "1.1",
   Description = [[Moon LRO LOLA Shaded Relief 237m v4 layer for Moon globe. This
     map is hosted on the OpenSpace server in Utah]],
   Author = "USGS",
diff --git a/data/assets/scene/solarsystem/planets/earth/moon/layers/colorlayers/moon_texture.asset b/data/assets/scene/solarsystem/planets/earth/moon/layers/colorlayers/moon_texture.asset
index cf3fe80b0e..f2bfa53954 100644
--- a/data/assets/scene/solarsystem/planets/earth/moon/layers/colorlayers/moon_texture.asset
+++ b/data/assets/scene/solarsystem/planets/earth/moon/layers/colorlayers/moon_texture.asset
@@ -35,7 +35,6 @@ asset.export("Layer", Layer)
 
 asset.meta = {
   Name = "Moon Texture",
-  Version = "1.0",
   Description = "Offline lower resolution version of Moon WAC layer, available for offline use",
   Author = "OpenSpace Team",
   URL = "http://openspaceproject.com",
diff --git a/data/assets/scene/solarsystem/planets/earth/moon/layers/colorlayers/uvvishybrid_newyork.asset b/data/assets/scene/solarsystem/planets/earth/moon/layers/colorlayers/uvvishybrid_newyork.asset
index 6aba0d4d0d..34d898513f 100644
--- a/data/assets/scene/solarsystem/planets/earth/moon/layers/colorlayers/uvvishybrid_newyork.asset
+++ b/data/assets/scene/solarsystem/planets/earth/moon/layers/colorlayers/uvvishybrid_newyork.asset
@@ -37,7 +37,6 @@ asset.export("layer", Layer)
 
 asset.meta = {
   Name = "Uvvis Hybrid [New York]",
-  Version = "1.1",
   Description = [[Moon Lunar Orbiter - Clementine UVVISv2 Hybrid Mosaic 59m v1 map of the
     Moon. This map is hosted on the OpenSpace server in New York]],
   Author = "USGS",
diff --git a/data/assets/scene/solarsystem/planets/earth/moon/layers/colorlayers/uvvishybrid_sweden.asset b/data/assets/scene/solarsystem/planets/earth/moon/layers/colorlayers/uvvishybrid_sweden.asset
index 478c16b495..a984b0135f 100644
--- a/data/assets/scene/solarsystem/planets/earth/moon/layers/colorlayers/uvvishybrid_sweden.asset
+++ b/data/assets/scene/solarsystem/planets/earth/moon/layers/colorlayers/uvvishybrid_sweden.asset
@@ -37,7 +37,6 @@ asset.export("layer", Layer)
 
 asset.meta = {
   Name = "Uvvis Hybrid [Sweden]",
-  Version = "1.1",
   Description = [[Moon Lunar Orbiter - Clementine UVVISv2 Hybrid Mosaic 59m v1 map of the
     Moon. This map is hosted on the OpenSpace server in Sweden]],
   Author = "USGS",
diff --git a/data/assets/scene/solarsystem/planets/earth/moon/layers/colorlayers/uvvishybrid_utah.asset b/data/assets/scene/solarsystem/planets/earth/moon/layers/colorlayers/uvvishybrid_utah.asset
index 2b1934e6f9..ef03a86502 100644
--- a/data/assets/scene/solarsystem/planets/earth/moon/layers/colorlayers/uvvishybrid_utah.asset
+++ b/data/assets/scene/solarsystem/planets/earth/moon/layers/colorlayers/uvvishybrid_utah.asset
@@ -37,7 +37,6 @@ asset.export("layer", Layer)
 
 asset.meta = {
   Name = "Uvvis Hybrid [Utah]",
-  Version = "1.1",
   Description = [[Moon Lunar Orbiter - Clementine UVVISv2 Hybrid Mosaic 59m v1
     map of the Moon. This map is hosted on the OpenSpace server in Utah]],
   Author = "USGS",
diff --git a/data/assets/scene/solarsystem/planets/earth/moon/layers/colorlayers/wac_newyork.asset b/data/assets/scene/solarsystem/planets/earth/moon/layers/colorlayers/wac_newyork.asset
index 3a741dafe5..f0f91dd87f 100644
--- a/data/assets/scene/solarsystem/planets/earth/moon/layers/colorlayers/wac_newyork.asset
+++ b/data/assets/scene/solarsystem/planets/earth/moon/layers/colorlayers/wac_newyork.asset
@@ -46,7 +46,6 @@ asset.export("layer", Layer)
 
 asset.meta = {
   Name = "WAC [New York]",
-  Version = "2.0",
   Description = [[Wide Angle Color map of the Moon. This map is hosted on the OpenSpace
     server in New York]],
   Author = "USGS",
diff --git a/data/assets/scene/solarsystem/planets/earth/moon/layers/colorlayers/wac_sweden.asset b/data/assets/scene/solarsystem/planets/earth/moon/layers/colorlayers/wac_sweden.asset
index ec81ec121e..e95682f8ae 100644
--- a/data/assets/scene/solarsystem/planets/earth/moon/layers/colorlayers/wac_sweden.asset
+++ b/data/assets/scene/solarsystem/planets/earth/moon/layers/colorlayers/wac_sweden.asset
@@ -46,7 +46,6 @@ asset.export("layer", Layer)
 
 asset.meta = {
   Name = "WAC [Sweden]",
-  Version = "2.0",
   Description = [[Wide Angle Color map of the Moon. This map is hosted on the OpenSpace
     server in Sweden]],
   Author = "USGS",
diff --git a/data/assets/scene/solarsystem/planets/earth/moon/layers/colorlayers/wac_utah.asset b/data/assets/scene/solarsystem/planets/earth/moon/layers/colorlayers/wac_utah.asset
index 33dbfac018..5200a1b940 100644
--- a/data/assets/scene/solarsystem/planets/earth/moon/layers/colorlayers/wac_utah.asset
+++ b/data/assets/scene/solarsystem/planets/earth/moon/layers/colorlayers/wac_utah.asset
@@ -46,7 +46,6 @@ asset.export("layer", Layer)
 
 asset.meta = {
   Name = "WAC [Utah]",
-  Version = "2.0",
   Description = [[Wide Angle Color map of the Moon. This map is hosted on the OpenSpace
     server in Utah]],
   Author = "USGS",
diff --git a/data/assets/scene/solarsystem/planets/earth/moon/layers/colorlayers/wac_v1_newyork.asset b/data/assets/scene/solarsystem/planets/earth/moon/layers/colorlayers/wac_v1_newyork.asset
index 71b1527ea6..642c9db6bb 100644
--- a/data/assets/scene/solarsystem/planets/earth/moon/layers/colorlayers/wac_v1_newyork.asset
+++ b/data/assets/scene/solarsystem/planets/earth/moon/layers/colorlayers/wac_v1_newyork.asset
@@ -35,7 +35,6 @@ asset.export("layer", Layer)
 
 asset.meta = {
   Name = "WAC [New York]",
-  Version = "1.2",
   Description = [[Wide Angle Color map of the Moon. This map is hosted on the OpenSpace
     server in New York]],
   Author = "USGS",
diff --git a/data/assets/scene/solarsystem/planets/earth/moon/layers/colorlayers/wac_v1_sweden.asset b/data/assets/scene/solarsystem/planets/earth/moon/layers/colorlayers/wac_v1_sweden.asset
index 711ec7ae4b..64aeadff89 100644
--- a/data/assets/scene/solarsystem/planets/earth/moon/layers/colorlayers/wac_v1_sweden.asset
+++ b/data/assets/scene/solarsystem/planets/earth/moon/layers/colorlayers/wac_v1_sweden.asset
@@ -35,7 +35,6 @@ asset.export("layer", Layer)
 
 asset.meta = {
   Name = "WAC [Sweden]",
-  Version = "1.2",
   Description = [[Wide Angle Color map of the Moon. This map is hosted on the OpenSpace
     server in Sweden]],
   Author = "USGS",
diff --git a/data/assets/scene/solarsystem/planets/earth/moon/layers/colorlayers/wac_v1_utah.asset b/data/assets/scene/solarsystem/planets/earth/moon/layers/colorlayers/wac_v1_utah.asset
index e9224a0c7b..e37808bc10 100644
--- a/data/assets/scene/solarsystem/planets/earth/moon/layers/colorlayers/wac_v1_utah.asset
+++ b/data/assets/scene/solarsystem/planets/earth/moon/layers/colorlayers/wac_v1_utah.asset
@@ -35,7 +35,6 @@ asset.export("layer", Layer)
 
 asset.meta = {
   Name = "WAC v1 [Utah]",
-  Version = "1.2",
   Description = [[Wide Angle Color map of the Moon. This map is hosted on the OpenSpace
     server in Utah]],
   Author = "USGS",
diff --git a/data/assets/scene/solarsystem/planets/earth/moon/layers/heightlayers/loladem_newyork.asset b/data/assets/scene/solarsystem/planets/earth/moon/layers/heightlayers/loladem_newyork.asset
index 0c2e3847a1..ee17b7d42e 100644
--- a/data/assets/scene/solarsystem/planets/earth/moon/layers/heightlayers/loladem_newyork.asset
+++ b/data/assets/scene/solarsystem/planets/earth/moon/layers/heightlayers/loladem_newyork.asset
@@ -33,7 +33,6 @@ asset.export("layer", Layer)
 
 asset.meta = {
   Name = "Lola DEM [New York]",
-  Version = "1.1",
   Description = [[Moon LRO LOLA DEM 118m v1 layer for Moon globe. This map is hosted on
     the OpenSpace server in New York]],
   Author = "USGS",
diff --git a/data/assets/scene/solarsystem/planets/earth/moon/layers/heightlayers/loladem_sweden.asset b/data/assets/scene/solarsystem/planets/earth/moon/layers/heightlayers/loladem_sweden.asset
index 10a61c2204..1de2197085 100644
--- a/data/assets/scene/solarsystem/planets/earth/moon/layers/heightlayers/loladem_sweden.asset
+++ b/data/assets/scene/solarsystem/planets/earth/moon/layers/heightlayers/loladem_sweden.asset
@@ -27,7 +27,6 @@ asset.export("layer", Layer)
 
 asset.meta = {
   Name = "Lola DEM [Sweden]",
-  Version = "1.1",
   Description = [[Moon LRO LOLA DEM 118m v1 layer for Moon globe. This map is hosted on
     the OpenSpace server in Sweden]],
   Author = "USGS",
diff --git a/data/assets/scene/solarsystem/planets/earth/moon/layers/heightlayers/loladem_utah.asset b/data/assets/scene/solarsystem/planets/earth/moon/layers/heightlayers/loladem_utah.asset
index 3f8f59fbae..9cf24409d8 100644
--- a/data/assets/scene/solarsystem/planets/earth/moon/layers/heightlayers/loladem_utah.asset
+++ b/data/assets/scene/solarsystem/planets/earth/moon/layers/heightlayers/loladem_utah.asset
@@ -33,7 +33,6 @@ asset.export("layer", Layer)
 
 asset.meta = {
   Name = "Lola DEM [Utah]",
-  Version = "1.1",
   Description = [[Moon LRO LOLA DEM 118m v1 layer for Moon globe. This map is hosted on
     the OpenSpace server in Utah]],
   Author = "USGS",
diff --git a/data/assets/scene/solarsystem/planets/earth/moon/layers/newyork_layers.asset b/data/assets/scene/solarsystem/planets/earth/moon/layers/newyork_layers.asset
index fc56a47032..85ece9ff45 100644
--- a/data/assets/scene/solarsystem/planets/earth/moon/layers/newyork_layers.asset
+++ b/data/assets/scene/solarsystem/planets/earth/moon/layers/newyork_layers.asset
@@ -11,7 +11,6 @@ asset.require("./heightlayers/loladem_newyork", asset.enabled)
 
 asset.meta = {
   Name = "Default Moon layers (New York)",
-  Version = "1.0",
   Description = [[Default Moon layers are: WAC, Clem Uvvis, Uvvis Hybrid, Kaguya,
     LRO LOLA Color Shaded Relief 388m v4, Lola Shade, and Lola DEM (3D).
 
diff --git a/data/assets/scene/solarsystem/planets/earth/moon/layers/overlays/size_reference.asset b/data/assets/scene/solarsystem/planets/earth/moon/layers/overlays/size_reference.asset
index 71193ff4cb..7bde99ba2e 100644
--- a/data/assets/scene/solarsystem/planets/earth/moon/layers/overlays/size_reference.asset
+++ b/data/assets/scene/solarsystem/planets/earth/moon/layers/overlays/size_reference.asset
@@ -25,7 +25,6 @@ asset.export("layer", Layer)
 
 asset.meta = {
   Name = "Moon Size Reference",
-  Version = "1.0",
   Description = "Size reference layer for Moon globe",
   Author = "OpenSpace Team",
   URL = "http://openspaceproject.com",
diff --git a/data/assets/scene/solarsystem/planets/earth/moon/layers/overlays/tile_indices.asset b/data/assets/scene/solarsystem/planets/earth/moon/layers/overlays/tile_indices.asset
index ec88eb72fe..2218be8957 100644
--- a/data/assets/scene/solarsystem/planets/earth/moon/layers/overlays/tile_indices.asset
+++ b/data/assets/scene/solarsystem/planets/earth/moon/layers/overlays/tile_indices.asset
@@ -24,7 +24,6 @@ asset.export("layer", Layer)
 
 asset.meta = {
   Name = "Moon Tile Indices",
-  Version = "1.0",
   Description = "Tile index layer for Moon globe",
   Author = "OpenSpace Team",
   URL = "http://openspaceproject.com",
diff --git a/data/assets/scene/solarsystem/planets/earth/moon/layers/sweden_layers.asset b/data/assets/scene/solarsystem/planets/earth/moon/layers/sweden_layers.asset
index 5c63b86ff2..328f20b333 100644
--- a/data/assets/scene/solarsystem/planets/earth/moon/layers/sweden_layers.asset
+++ b/data/assets/scene/solarsystem/planets/earth/moon/layers/sweden_layers.asset
@@ -11,7 +11,6 @@ asset.require("./heightlayers/loladem_sweden", asset.enabled)
 
 asset.meta = {
   Name = "Default Moon layers (Sweden)",
-  Version = "1.0",
   Description = [[Default Moon layers are: WAC, Clem Uvvis, Uvvis Hybrid, Kaguya,
     LRO LOLA Color Shaded Relief 388m v4, Lola Shade, and Lola DEM (3D).
 
diff --git a/data/assets/scene/solarsystem/planets/earth/moon/layers/utah_layers.asset b/data/assets/scene/solarsystem/planets/earth/moon/layers/utah_layers.asset
index a3a4e4768f..54df0fdf5c 100644
--- a/data/assets/scene/solarsystem/planets/earth/moon/layers/utah_layers.asset
+++ b/data/assets/scene/solarsystem/planets/earth/moon/layers/utah_layers.asset
@@ -11,7 +11,6 @@ asset.require("./heightlayers/loladem_utah", asset.enabled)
 
 asset.meta = {
   Name = "Default Moon layers (Utah)",
-  Version = "1.0",
   Description = [[Default Moon layers are: WAC, Clem Uvvis, Uvvis Hybrid, Kaguya,
     LRO LOLA Color Shaded Relief 388m v4, Lola Shade, and Lola DEM (3D).
 
diff --git a/data/assets/scene/solarsystem/planets/earth/moon/markers.asset b/data/assets/scene/solarsystem/planets/earth/moon/markers.asset
index 6a0e63ed03..7516de40e7 100644
--- a/data/assets/scene/solarsystem/planets/earth/moon/markers.asset
+++ b/data/assets/scene/solarsystem/planets/earth/moon/markers.asset
@@ -43,7 +43,6 @@ asset.export(MoonMarker)
 
 asset.meta = {
   Name = "Moon marker",
-  Version = "1.0",
   Description = "Moon marker with name, sized for Earth view",
   Author = "OpenSpace Team",
   URL = "http://openspaceproject.com",
diff --git a/data/assets/scene/solarsystem/planets/earth/moon/moon.asset b/data/assets/scene/solarsystem/planets/earth/moon/moon.asset
index f3955832e8..21063ba6e1 100644
--- a/data/assets/scene/solarsystem/planets/earth/moon/moon.asset
+++ b/data/assets/scene/solarsystem/planets/earth/moon/moon.asset
@@ -137,7 +137,6 @@ asset.export("ToggleMoonShading", ToggleMoonShading.Identifier)
 
 asset.meta = {
   Name = "Moon",
-  Version = "1.2",
   Description = "Moon globe with labels and actions",
   Author = "OpenSpace Team",
   URL = "http://openspaceproject.com",
diff --git a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/Apollo_15_Metric_Cam_DEM.asset b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/Apollo_15_Metric_Cam_DEM.asset
index d80d3df96b..e145e3b6ec 100644
--- a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/Apollo_15_Metric_Cam_DEM.asset
+++ b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/Apollo_15_Metric_Cam_DEM.asset
@@ -59,8 +59,7 @@ asset.export("Apollo15_MetricCam_Shade_Global_1024ppd", treks_Apollo15_MetricCam
 
 
 asset.meta = {
-  Name = [[NASA Treks Layers for Moon Apollo_15_Metric_Cam_DEM],
-  Version = "1.0",
+  Name = [[NASA Treks Layers for Moon Apollo_15_Metric_Cam_DEM]],
   Author = "NASA/Treks",
   URL = "https://trek.nasa.gov/moon",
   License = "NASA/Treks",
diff --git a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/Apollo_15_Pan_Cam_DEM.asset b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/Apollo_15_Pan_Cam_DEM.asset
index 840be78479..be463708d6 100644
--- a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/Apollo_15_Pan_Cam_DEM.asset
+++ b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/Apollo_15_Pan_Cam_DEM.asset
@@ -48,8 +48,7 @@ asset.export("Apollo15_PanCam_ClrShade_19S129E_5mp", treks_Apollo15_PanCam_ClrSh
 
 
 asset.meta = {
-  Name = [[NASA Treks Layers for Moon Apollo_15_Pan_Cam_DEM],
-  Version = "1.0",
+  Name = [[NASA Treks Layers for Moon Apollo_15_Pan_Cam_DEM]],
   Author = "NASA/Treks",
   URL = "https://trek.nasa.gov/moon",
   License = "NASA/Treks",
diff --git a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/Apollo_15_Pan_Cam_Image_Mosaic.asset b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/Apollo_15_Pan_Cam_Image_Mosaic.asset
index b3869761be..b878c0589e 100644
--- a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/Apollo_15_Pan_Cam_Image_Mosaic.asset
+++ b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/Apollo_15_Pan_Cam_Image_Mosaic.asset
@@ -48,8 +48,7 @@ asset.export("Apollo15_PanCam_Mosaic_19S129E_2mp", treks_Apollo15_PanCam_Mosaic_
 
 
 asset.meta = {
-  Name = [[NASA Treks Layers for Moon Apollo_15_Pan_Cam_Image_Mosaic],
-  Version = "1.0",
+  Name = [[NASA Treks Layers for Moon Apollo_15_Pan_Cam_Image_Mosaic]],
   Author = "NASA/Treks",
   URL = "https://trek.nasa.gov/moon",
   License = "NASA/Treks",
diff --git a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/Apollo_16_Metric_Cam_DEM.asset b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/Apollo_16_Metric_Cam_DEM.asset
index 73a7e05b50..62f6f338ba 100644
--- a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/Apollo_16_Metric_Cam_DEM.asset
+++ b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/Apollo_16_Metric_Cam_DEM.asset
@@ -48,8 +48,7 @@ asset.export("Apollo16_MetricCam_Shade_Global_1024ppd", treks_Apollo16_MetricCam
 
 
 asset.meta = {
-  Name = [[NASA Treks Layers for Moon Apollo_16_Metric_Cam_DEM],
-  Version = "1.0",
+  Name = [[NASA Treks Layers for Moon Apollo_16_Metric_Cam_DEM]],
   Author = "NASA/Treks",
   URL = "https://trek.nasa.gov/moon",
   License = "NASA/Treks",
diff --git a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/Apollo_17_Metric_Cam_DEM.asset b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/Apollo_17_Metric_Cam_DEM.asset
index 37a4522113..8ad4eb1b59 100644
--- a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/Apollo_17_Metric_Cam_DEM.asset
+++ b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/Apollo_17_Metric_Cam_DEM.asset
@@ -38,7 +38,6 @@ asset.export("Apollo17_MetricCam_Gray_Global_1024ppd", treks_Apollo17_MetricCam_
 
 asset.meta = {
   Name = [[NASA Treks Layers for Moon Apollo_17_Metric_Cam_DEM],
-  Version = "1.0",
   Author = "NASA/Treks",
   URL = "https://trek.nasa.gov/moon",
   License = "NASA/Treks",
diff --git a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/Apollo_Zone_Metric_Cam.asset b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/Apollo_Zone_Metric_Cam.asset
index 590c2c561f..40887e2587 100644
--- a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/Apollo_Zone_Metric_Cam.asset
+++ b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/Apollo_Zone_Metric_Cam.asset
@@ -26,8 +26,7 @@ asset.export("ApolloZone_MetricCam_Shade_Global_1024ppd", treks_ApolloZone_Metri
 
 
 asset.meta = {
-  Name = [[NASA Treks Layers for Moon Apollo_Zone_Metric_Cam],
-  Version = "1.0",
+  Name = [[NASA Treks Layers for Moon Apollo_Zone_Metric_Cam]],
   Author = "NASA/Treks",
   URL = "https://trek.nasa.gov/moon",
   License = "NASA/Treks",
diff --git a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/Apollo_Zone_Metric_Cam_DEM.asset b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/Apollo_Zone_Metric_Cam_DEM.asset
index 693c053f10..59792e47d6 100644
--- a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/Apollo_Zone_Metric_Cam_DEM.asset
+++ b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/Apollo_Zone_Metric_Cam_DEM.asset
@@ -26,8 +26,7 @@ asset.export("ApolloZone_MetricCam_ClrShade_Global_1024ppd", treks_ApolloZone_Me
 
 
 asset.meta = {
-  Name = [[NASA Treks Layers for Moon Apollo_Zone_Metric_Cam_DEM],
-  Version = "1.0",
+  Name = [[NASA Treks Layers for Moon Apollo_Zone_Metric_Cam_DEM]],
   Author = "NASA/Treks",
   URL = "https://trek.nasa.gov/moon",
   License = "NASA/Treks",
diff --git a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/Global.asset b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/Global.asset
index ffc28d4218..746e644fa2 100644
--- a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/Global.asset
+++ b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/Global.asset
@@ -230,8 +230,7 @@ asset.export("LRO_LOLA_Illumination_SPole65S_240m_EQ", treks_LRO_LOLA_Illuminati
 
 
 asset.meta = {
-  Name = [[NASA Treks Layers for Moon Global],
-  Version = "1.0",
+  Name = [[NASA Treks Layers for Moon Global]],
   Author = "NASA/Treks",
   URL = "https://trek.nasa.gov/moon",
   License = "NASA/Treks",
diff --git a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/Kaguya_LGM2011_Freeair_Gravity.asset b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/Kaguya_LGM2011_Freeair_Gravity.asset
index c657df0965..e3575ecaac 100644
--- a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/Kaguya_LGM2011_Freeair_Gravity.asset
+++ b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/Kaguya_LGM2011_Freeair_Gravity.asset
@@ -37,8 +37,7 @@ asset.export("Kaguya_LGM2011_FreeairGravity_Gray_Global_mgal3m_20ppd", treks_Kag
 
 
 asset.meta = {
-  Name = [[NASA Treks Layers for Moon Kaguya_LGM2011_Freeair_Gravity],
-  Version = "1.0",
+  Name = [[NASA Treks Layers for Moon Kaguya_LGM2011_Freeair_Gravity]],
   Author = "NASA/Treks",
   URL = "https://trek.nasa.gov/moon",
   License = "NASA/Treks",
diff --git a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/Kaguya_LGM2011_Surface_Gravity.asset b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/Kaguya_LGM2011_Surface_Gravity.asset
index b595acc0c0..6cfc20277a 100644
--- a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/Kaguya_LGM2011_Surface_Gravity.asset
+++ b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/Kaguya_LGM2011_Surface_Gravity.asset
@@ -37,8 +37,7 @@ asset.export("Kaguya_LGM2011_SurfaceGravity_Gray_Global_mgal3m_20ppd", treks_Kag
 
 
 asset.meta = {
-  Name = [[NASA Treks Layers for Moon Kaguya_LGM2011_Surface_Gravity],
-  Version = "1.0",
+  Name = [[NASA Treks Layers for Moon Kaguya_LGM2011_Surface_Gravity]],
   Author = "NASA/Treks",
   URL = "https://trek.nasa.gov/moon",
   License = "NASA/Treks",
diff --git a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LOLA_Roughness_16ppd.asset b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LOLA_Roughness_16ppd.asset
index 3188e92ec7..7df2bc27e8 100644
--- a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LOLA_Roughness_16ppd.asset
+++ b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LOLA_Roughness_16ppd.asset
@@ -26,8 +26,7 @@ asset.export("LRO_LOLA_ClrRoughness_Global_16ppd", treks_LRO_LOLA_ClrRoughness_G
 
 
 asset.meta = {
-  Name = [[NASA Treks Layers for Moon LOLA_Roughness_16ppd],
-  Version = "1.0",
+  Name = [[NASA Treks Layers for Moon LOLA_Roughness_16ppd]],
   Author = "NASA/Treks",
   URL = "https://trek.nasa.gov/moon",
   License = "NASA/Treks",
diff --git a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LOLA_Slope_16ppd.asset b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LOLA_Slope_16ppd.asset
index 921d3bb343..fadff404ca 100644
--- a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LOLA_Slope_16ppd.asset
+++ b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LOLA_Slope_16ppd.asset
@@ -26,8 +26,7 @@ asset.export("LRO_LOLA_ClrSlope_Global_16ppd", treks_LRO_LOLA_ClrSlope_Global_16
 
 
 asset.meta = {
-  Name = [[NASA Treks Layers for Moon LOLA_Slope_16ppd],
-  Version = "1.0",
+  Name = [[NASA Treks Layers for Moon LOLA_Slope_16ppd]],
   Author = "NASA/Treks",
   URL = "https://trek.nasa.gov/moon",
   License = "NASA/Treks",
diff --git a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LOLA_Slope_Northpole_120m.asset b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LOLA_Slope_Northpole_120m.asset
index 8038c82b4c..6040f37c0e 100644
--- a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LOLA_Slope_Northpole_120m.asset
+++ b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LOLA_Slope_Northpole_120m.asset
@@ -26,8 +26,7 @@ asset.export("LRO_LOLA_ClrSlope_NPole75N_120m_EQ", treks_LRO_LOLA_ClrSlope_NPole
 
 
 asset.meta = {
-  Name = [[NASA Treks Layers for Moon LOLA_Slope_Northpole_120m],
-  Version = "1.0",
+  Name = [[NASA Treks Layers for Moon LOLA_Slope_Northpole_120m]],
   Author = "NASA/Treks",
   URL = "https://trek.nasa.gov/moon",
   License = "NASA/Treks",
diff --git a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LOLA_Slope_Southpole_120m.asset b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LOLA_Slope_Southpole_120m.asset
index 89c3d68331..94c4cc2340 100644
--- a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LOLA_Slope_Southpole_120m.asset
+++ b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LOLA_Slope_Southpole_120m.asset
@@ -26,8 +26,7 @@ asset.export("LRO_LOLA_ClrSlope_SPole75S_120m_EQ", treks_LRO_LOLA_ClrSlope_SPole
 
 
 asset.meta = {
-  Name = [[NASA Treks Layers for Moon LOLA_Slope_Southpole_120m],
-  Version = "1.0",
+  Name = [[NASA Treks Layers for Moon LOLA_Slope_Southpole_120m]],
   Author = "NASA/Treks",
   URL = "https://trek.nasa.gov/moon",
   License = "NASA/Treks",
diff --git a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LOLA_and_TC_Stereo_DEM_Merge_512ppd.asset b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LOLA_and_TC_Stereo_DEM_Merge_512ppd.asset
index ec696baee9..5b129cd0a5 100644
--- a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LOLA_and_TC_Stereo_DEM_Merge_512ppd.asset
+++ b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LOLA_and_TC_Stereo_DEM_Merge_512ppd.asset
@@ -26,8 +26,7 @@ asset.export("LRO_LrocKaguya_Shade_60N60S_512ppd", treks_LRO_LrocKaguya_Shade_60
 
 
 asset.meta = {
-  Name = [[NASA Treks Layers for Moon LOLA_and_TC_Stereo_DEM_Merge_512ppd],
-  Version = "1.0",
+  Name = [[NASA Treks Layers for Moon LOLA_and_TC_Stereo_DEM_Merge_512ppd]],
   Author = "NASA/Treks",
   URL = "https://trek.nasa.gov/moon",
   License = "NASA/Treks",
diff --git a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LROC_NAC_Uncontrolled_Mosaic_of_Region_Inside_Schrodinger_Crater.asset b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LROC_NAC_Uncontrolled_Mosaic_of_Region_Inside_Schrodinger_Crater.asset
index 28bdf64217..5c7d5e370b 100644
--- a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LROC_NAC_Uncontrolled_Mosaic_of_Region_Inside_Schrodinger_Crater.asset
+++ b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LROC_NAC_Uncontrolled_Mosaic_of_Region_Inside_Schrodinger_Crater.asset
@@ -26,8 +26,7 @@ asset.export("SchrodingerMareNortheq", treks_SchrodingerMareNortheq)
 
 
 asset.meta = {
-  Name = [[NASA Treks Layers for Moon LROC_NAC_Uncontrolled_Mosaic_of_Region_Inside_Schrodinger_Crater],
-  Version = "1.0",
+  Name = [[NASA Treks Layers for Moon LROC_NAC_Uncontrolled_Mosaic_of_Region_Inside_Schrodinger_Crater]],
   Author = "NASA/Treks",
   URL = "https://trek.nasa.gov/moon",
   License = "NASA/Treks",
diff --git a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LROC_NAC_Uncontrolled_Mosaic_of_Schrodinger_Crater.asset b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LROC_NAC_Uncontrolled_Mosaic_of_Schrodinger_Crater.asset
index 88ca59fa02..27488b71b4 100644
--- a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LROC_NAC_Uncontrolled_Mosaic_of_Schrodinger_Crater.asset
+++ b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LROC_NAC_Uncontrolled_Mosaic_of_Schrodinger_Crater.asset
@@ -26,8 +26,7 @@ asset.export("allSchrodinger_10mV10eq", treks_allSchrodinger_10mV10eq)
 
 
 asset.meta = {
-  Name = [[NASA Treks Layers for Moon LROC_NAC_Uncontrolled_Mosaic_of_Schrodinger_Crater],
-  Version = "1.0",
+  Name = [[NASA Treks Layers for Moon LROC_NAC_Uncontrolled_Mosaic_of_Schrodinger_Crater]],
   Author = "NASA/Treks",
   URL = "https://trek.nasa.gov/moon",
   License = "NASA/Treks",
diff --git a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_Diviner_CF_Mosaic.asset b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_Diviner_CF_Mosaic.asset
index 8110780f9a..6f9b0e1dee 100644
--- a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_Diviner_CF_Mosaic.asset
+++ b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_Diviner_CF_Mosaic.asset
@@ -26,8 +26,7 @@ asset.export("LRO_Diviner_CF_Filled_Global_8ppd", treks_LRO_Diviner_CF_Filled_Gl
 
 
 asset.meta = {
-  Name = [[NASA Treks Layers for Moon LRO_Diviner_CF_Mosaic],
-  Version = "1.0",
+  Name = [[NASA Treks Layers for Moon LRO_Diviner_CF_Mosaic]],
   Author = "NASA/Treks",
   URL = "https://trek.nasa.gov/moon",
   License = "NASA/Treks",
diff --git a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_Diviner_CF_Mosaic_128ppd.asset b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_Diviner_CF_Mosaic_128ppd.asset
index 8c2213868d..956e457f5b 100644
--- a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_Diviner_CF_Mosaic_128ppd.asset
+++ b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_Diviner_CF_Mosaic_128ppd.asset
@@ -26,8 +26,7 @@ asset.export("LRO_DIVINER_ClrCF_Global_128ppd", treks_LRO_DIVINER_ClrCF_Global_1
 
 
 asset.meta = {
-  Name = [[NASA Treks Layers for Moon LRO_Diviner_CF_Mosaic_128ppd],
-  Version = "1.0",
+  Name = [[NASA Treks Layers for Moon LRO_Diviner_CF_Mosaic_128ppd]],
   Author = "NASA/Treks",
   URL = "https://trek.nasa.gov/moon",
   License = "NASA/Treks",
diff --git a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_Diviner_Surface_Temp_Avg.asset b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_Diviner_Surface_Temp_Avg.asset
index f4f45fc940..2d8c2bcce9 100644
--- a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_Diviner_Surface_Temp_Avg.asset
+++ b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_Diviner_Surface_Temp_Avg.asset
@@ -26,8 +26,7 @@ asset.export("LRO_Diviner_ST_Avg_Clr_Global_32ppd", treks_LRO_Diviner_ST_Avg_Clr
 
 
 asset.meta = {
-  Name = [[NASA Treks Layers for Moon LRO_Diviner_Surface_Temp_Avg],
-  Version = "1.0",
+  Name = [[NASA Treks Layers for Moon LRO_Diviner_Surface_Temp_Avg]],
   Author = "NASA/Treks",
   URL = "https://trek.nasa.gov/moon",
   License = "NASA/Treks",
diff --git a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_Diviner_Surface_Temp_Normal_Avg.asset b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_Diviner_Surface_Temp_Normal_Avg.asset
index bc4c9e4e89..ee4d7da9af 100644
--- a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_Diviner_Surface_Temp_Normal_Avg.asset
+++ b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_Diviner_Surface_Temp_Normal_Avg.asset
@@ -26,8 +26,7 @@ asset.export("LRO_Diviner_STN_Avg_Clr_Global_32ppd", treks_LRO_Diviner_STN_Avg_C
 
 
 asset.meta = {
-  Name = [[NASA Treks Layers for Moon LRO_Diviner_Surface_Temp_Normal_Avg],
-  Version = "1.0",
+  Name = [[NASA Treks Layers for Moon LRO_Diviner_Surface_Temp_Normal_Avg]],
   Author = "NASA/Treks",
   URL = "https://trek.nasa.gov/moon",
   License = "NASA/Treks",
diff --git a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_Diviner_Surface_Temperature_Mosaic_128ppd.asset b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_Diviner_Surface_Temperature_Mosaic_128ppd.asset
index b30c21be36..e76af03887 100644
--- a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_Diviner_Surface_Temperature_Mosaic_128ppd.asset
+++ b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_Diviner_Surface_Temperature_Mosaic_128ppd.asset
@@ -26,8 +26,7 @@ asset.export("LRO_DIVINER_ClrRockFreeSurfaceTemp_Global_128ppd", treks_LRO_DIVIN
 
 
 asset.meta = {
-  Name = [[NASA Treks Layers for Moon LRO_Diviner_Surface_Temperature_Mosaic_128ppd],
-  Version = "1.0",
+  Name = [[NASA Treks Layers for Moon LRO_Diviner_Surface_Temperature_Mosaic_128ppd]],
   Author = "NASA/Treks",
   URL = "https://trek.nasa.gov/moon",
   License = "NASA/Treks",
diff --git a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LOLA_DEM.asset b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LOLA_DEM.asset
index ac75e550c2..4c5c65a4e1 100644
--- a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LOLA_DEM.asset
+++ b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LOLA_DEM.asset
@@ -92,8 +92,7 @@ asset.export("LRO_LOLA_ClrShade_SPole875_5mp_v04_EQ", treks_LRO_LOLA_ClrShade_SP
 
 
 asset.meta = {
-  Name = [[NASA Treks Layers for Moon LRO_LOLA_DEM],
-  Version = "1.0",
+  Name = [[NASA Treks Layers for Moon LRO_LOLA_DEM]],
   Author = "NASA/Treks",
   URL = "https://trek.nasa.gov/moon",
   License = "NASA/Treks",
diff --git a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Crater_Abundance.asset b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Crater_Abundance.asset
index 21ac0858c3..fb7bcc4ac6 100644
--- a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Crater_Abundance.asset
+++ b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Crater_Abundance.asset
@@ -268,8 +268,7 @@ asset.export("LRO_NAC_CratAbnd_43S349E_150cmp", treks_LRO_NAC_CratAbnd_43S349E_1
 
 
 asset.meta = {
-  Name = [[NASA Treks Layers for Moon LRO_LROC_Crater_Abundance],
-  Version = "1.0",
+  Name = [[NASA Treks Layers for Moon LRO_LROC_Crater_Abundance]],
   Author = "NASA/Treks",
   URL = "https://trek.nasa.gov/moon",
   License = "NASA/Treks",
diff --git a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Crater_Abundance_Hazard.asset b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Crater_Abundance_Hazard.asset
index d60d26fa08..283c649c11 100644
--- a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Crater_Abundance_Hazard.asset
+++ b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Crater_Abundance_Hazard.asset
@@ -268,8 +268,7 @@ asset.export("LRO_NAC_CratAbndHaz_43S349E_150cmp", treks_LRO_NAC_CratAbndHaz_43S
 
 
 asset.meta = {
-  Name = [[NASA Treks Layers for Moon LRO_LROC_Crater_Abundance_Hazard],
-  Version = "1.0",
+  Name = [[NASA Treks Layers for Moon LRO_LROC_Crater_Abundance_Hazard]],
   Author = "NASA/Treks",
   URL = "https://trek.nasa.gov/moon",
   License = "NASA/Treks",
diff --git a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Crater_Density.asset b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Crater_Density.asset
index 94a0c2c896..d4c7b7accd 100644
--- a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Crater_Density.asset
+++ b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Crater_Density.asset
@@ -268,8 +268,7 @@ asset.export("LRO_NAC_CratDen_43S349E_150cmp", treks_LRO_NAC_CratDen_43S349E_150
 
 
 asset.meta = {
-  Name = [[NASA Treks Layers for Moon LRO_LROC_Crater_Density],
-  Version = "1.0",
+  Name = [[NASA Treks Layers for Moon LRO_LROC_Crater_Density]],
   Author = "NASA/Treks",
   URL = "https://trek.nasa.gov/moon",
   License = "NASA/Treks",
diff --git a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Crater_Density_Hazard.asset b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Crater_Density_Hazard.asset
index 43dde197e0..43913b5d68 100644
--- a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Crater_Density_Hazard.asset
+++ b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Crater_Density_Hazard.asset
@@ -268,8 +268,7 @@ asset.export("LRO_NAC_CratDenHaz_43S349E_150cmp", treks_LRO_NAC_CratDenHaz_43S34
 
 
 asset.meta = {
-  Name = [[NASA Treks Layers for Moon LRO_LROC_Crater_Density_Hazard],
-  Version = "1.0",
+  Name = [[NASA Treks Layers for Moon LRO_LROC_Crater_Density_Hazard]],
   Author = "NASA/Treks",
   URL = "https://trek.nasa.gov/moon",
   License = "NASA/Treks",
diff --git a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_DEM.asset b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_DEM.asset
index a8644ba34f..7aff2c1b6a 100644
--- a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_DEM.asset
+++ b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_DEM.asset
@@ -488,8 +488,7 @@ asset.export("LRO_NAC_ClrRoughness_15m_43S349E_150cmp", treks_LRO_NAC_ClrRoughne
 
 
 asset.meta = {
-  Name = [[NASA Treks Layers for Moon LRO_LROC_DEM],
-  Version = "1.0",
+  Name = [[NASA Treks Layers for Moon LRO_LROC_DEM]],
   Author = "NASA/Treks",
   URL = "https://trek.nasa.gov/moon",
   License = "NASA/Treks",
diff --git a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Image_Mosaic.asset b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Image_Mosaic.asset
index 81d51e4d7f..3d7d93f52e 100644
--- a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Image_Mosaic.asset
+++ b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Image_Mosaic.asset
@@ -389,8 +389,7 @@ asset.export("LRO_NAC_Mosaic_43S349E_50cmp", treks_LRO_NAC_Mosaic_43S349E_50cmp)
 
 
 asset.meta = {
-  Name = [[NASA Treks Layers for Moon LRO_LROC_Image_Mosaic],
-  Version = "1.0",
+  Name = [[NASA Treks Layers for Moon LRO_LROC_Image_Mosaic]],
   Author = "NASA/Treks",
   URL = "https://trek.nasa.gov/moon",
   License = "NASA/Treks",
diff --git a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Image_Mosaic_26cm.asset b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Image_Mosaic_26cm.asset
index 0ad55bc786..416f353f03 100644
--- a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Image_Mosaic_26cm.asset
+++ b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Image_Mosaic_26cm.asset
@@ -26,8 +26,7 @@ asset.export("apollo11_26cm_mosaic_byte_geo_1_2_highContrast", treks_apollo11_26
 
 
 asset.meta = {
-  Name = [[NASA Treks Layers for Moon LRO_LROC_Image_Mosaic_26cm],
-  Version = "1.0",
+  Name = [[NASA Treks Layers for Moon LRO_LROC_Image_Mosaic_26cm]],
   Author = "NASA/Treks",
   URL = "https://trek.nasa.gov/moon",
   License = "NASA/Treks",
diff --git a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Image_Mosaic_28cm.asset b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Image_Mosaic_28cm.asset
index dad3ad8b16..c3f0910886 100644
--- a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Image_Mosaic_28cm.asset
+++ b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Image_Mosaic_28cm.asset
@@ -26,8 +26,7 @@ asset.export("apollo14_28cm_mosaic_byte_geo_1_2_highContrast", treks_apollo14_28
 
 
 asset.meta = {
-  Name = [[NASA Treks Layers for Moon LRO_LROC_Image_Mosaic_28cm],
-  Version = "1.0",
+  Name = [[NASA Treks Layers for Moon LRO_LROC_Image_Mosaic_28cm]],
   Author = "NASA/Treks",
   URL = "https://trek.nasa.gov/moon",
   License = "NASA/Treks",
diff --git a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Mosaic.asset b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Mosaic.asset
index b8019317dd..63d579dd7b 100644
--- a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Mosaic.asset
+++ b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Mosaic.asset
@@ -26,8 +26,7 @@ asset.export("LRO_NAC_Mosaic_03N280E_70cm", treks_LRO_NAC_Mosaic_03N280E_70cm)
 
 
 asset.meta = {
-  Name = [[NASA Treks Layers for Moon LRO_LROC_Mosaic],
-  Version = "1.0",
+  Name = [[NASA Treks Layers for Moon LRO_LROC_Mosaic]],
   Author = "NASA/Treks",
   URL = "https://trek.nasa.gov/moon",
   License = "NASA/Treks",
diff --git a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_NAC_Image_Mosaic.asset b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_NAC_Image_Mosaic.asset
index 6cf7bd59e5..6d47c51747 100644
--- a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_NAC_Image_Mosaic.asset
+++ b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_NAC_Image_Mosaic.asset
@@ -37,8 +37,7 @@ asset.export("LRO_NAC_AvgMosaic_SPole855_1mp_EQ", treks_LRO_NAC_AvgMosaic_SPole8
 
 
 asset.meta = {
-  Name = [[NASA Treks Layers for Moon LRO_LROC_NAC_Image_Mosaic],
-  Version = "1.0",
+  Name = [[NASA Treks Layers for Moon LRO_LROC_NAC_Image_Mosaic]],
   Author = "NASA/Treks",
   URL = "https://trek.nasa.gov/moon",
   License = "NASA/Treks",
diff --git a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Rock_Abundance.asset b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Rock_Abundance.asset
index fc96293e35..4240d25182 100644
--- a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Rock_Abundance.asset
+++ b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Rock_Abundance.asset
@@ -268,8 +268,7 @@ asset.export("LRO_NAC_RockAbnd_43S349E_150cmp", treks_LRO_NAC_RockAbnd_43S349E_1
 
 
 asset.meta = {
-  Name = [[NASA Treks Layers for Moon LRO_LROC_Rock_Abundance],
-  Version = "1.0",
+  Name = [[NASA Treks Layers for Moon LRO_LROC_Rock_Abundance]],
   Author = "NASA/Treks",
   URL = "https://trek.nasa.gov/moon",
   License = "NASA/Treks",
diff --git a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Rock_Abundance_Hazard.asset b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Rock_Abundance_Hazard.asset
index 9b4e740538..87b502da24 100644
--- a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Rock_Abundance_Hazard.asset
+++ b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Rock_Abundance_Hazard.asset
@@ -268,8 +268,7 @@ asset.export("LRO_NAC_RockAbndHaz_43S349E_150cmp", treks_LRO_NAC_RockAbndHaz_43S
 
 
 asset.meta = {
-  Name = [[NASA Treks Layers for Moon LRO_LROC_Rock_Abundance_Hazard],
-  Version = "1.0",
+  Name = [[NASA Treks Layers for Moon LRO_LROC_Rock_Abundance_Hazard]],
   Author = "NASA/Treks",
   URL = "https://trek.nasa.gov/moon",
   License = "NASA/Treks",
diff --git a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Rock_Density.asset b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Rock_Density.asset
index 12d8d7f214..7212a13050 100644
--- a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Rock_Density.asset
+++ b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Rock_Density.asset
@@ -279,8 +279,7 @@ asset.export("LRO_NAC_RockDen_43S349E_150cmp", treks_LRO_NAC_RockDen_43S349E_150
 
 
 asset.meta = {
-  Name = [[NASA Treks Layers for Moon LRO_LROC_Rock_Density],
-  Version = "1.0",
+  Name = [[NASA Treks Layers for Moon LRO_LROC_Rock_Density]],
   Author = "NASA/Treks",
   URL = "https://trek.nasa.gov/moon",
   License = "NASA/Treks",
diff --git a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Rock_Density_Hazard.asset b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Rock_Density_Hazard.asset
index f2f49ada9d..c1066b99b7 100644
--- a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Rock_Density_Hazard.asset
+++ b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Rock_Density_Hazard.asset
@@ -257,8 +257,7 @@ asset.export("LRO_NAC_RockDenHaz_43S349E_150cmp", treks_LRO_NAC_RockDenHaz_43S34
 
 
 asset.meta = {
-  Name = [[NASA Treks Layers for Moon LRO_LROC_Rock_Density_Hazard],
-  Version = "1.0",
+  Name = [[NASA Treks Layers for Moon LRO_LROC_Rock_Density_Hazard]],
   Author = "NASA/Treks",
   URL = "https://trek.nasa.gov/moon",
   License = "NASA/Treks",
diff --git a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_Laser_Altimeter.asset b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_Laser_Altimeter.asset
index b0102c873b..3e082882a9 100644
--- a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_Laser_Altimeter.asset
+++ b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_Laser_Altimeter.asset
@@ -26,8 +26,7 @@ asset.export("ldam_10", treks_ldam_10)
 
 
 asset.meta = {
-  Name = [[NASA Treks Layers for Moon LRO_Laser_Altimeter],
-  Version = "1.0",
+  Name = [[NASA Treks Layers for Moon LRO_Laser_Altimeter]],
   Author = "NASA/Treks",
   URL = "https://trek.nasa.gov/moon",
   License = "NASA/Treks",
diff --git a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_Mini-RF_Circular_Polarization_Ratio.asset b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_Mini-RF_Circular_Polarization_Ratio.asset
index 1202ad8953..ec79095ba5 100644
--- a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_Mini-RF_Circular_Polarization_Ratio.asset
+++ b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_Mini-RF_Circular_Polarization_Ratio.asset
@@ -26,8 +26,7 @@ asset.export("LRO_MiniRF_CPR_Gray_Global_128ppd", treks_LRO_MiniRF_CPR_Gray_Glob
 
 
 asset.meta = {
-  Name = [[NASA Treks Layers for Moon LRO_Mini-RF_Circular_Polarization_Ratio],
-  Version = "1.0",
+  Name = [[NASA Treks Layers for Moon LRO_Mini-RF_Circular_Polarization_Ratio]],
   Author = "NASA/Treks",
   URL = "https://trek.nasa.gov/moon",
   License = "NASA/Treks",
diff --git a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_NAC_ColorHillshade.asset b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_NAC_ColorHillshade.asset
index ee7033a106..662bec56db 100644
--- a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_NAC_ColorHillshade.asset
+++ b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_NAC_ColorHillshade.asset
@@ -26,8 +26,7 @@ asset.export("20191118demmoseqccolorhillshade", treks_20191118demmoseqccolorhill
 
 
 asset.meta = {
-  Name = [[NASA Treks Layers for Moon LRO_NAC_ColorHillshade],
-  Version = "1.0",
+  Name = [[NASA Treks Layers for Moon LRO_NAC_ColorHillshade]],
   Author = "NASA/Treks",
   URL = "https://trek.nasa.gov/moon",
   License = "NASA/Treks",
diff --git a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_NAC_Mosaic.asset b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_NAC_Mosaic.asset
index 159c08d330..ac616fac1d 100644
--- a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_NAC_Mosaic.asset
+++ b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_NAC_Mosaic.asset
@@ -26,8 +26,7 @@ asset.export("20200415_lacusmortis_orthomos_filled_8bit_lzw", treks_20200415_lac
 
 
 asset.meta = {
-  Name = [[NASA Treks Layers for Moon LRO_NAC_Mosaic],
-  Version = "1.0",
+  Name = [[NASA Treks Layers for Moon LRO_NAC_Mosaic]],
   Author = "NASA/Treks",
   URL = "https://trek.nasa.gov/moon",
   License = "NASA/Treks",
diff --git a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_NAC_Mosaic_0.5mpp.asset b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_NAC_Mosaic_0.5mpp.asset
index ed612d9a28..1d9dd3333b 100644
--- a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_NAC_Mosaic_0.5mpp.asset
+++ b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_NAC_Mosaic_0.5mpp.asset
@@ -26,8 +26,7 @@ asset.export("LRO_NAC_Mosaic_50cmpp_VonKarman_v2", treks_LRO_NAC_Mosaic_50cmpp_V
 
 
 asset.meta = {
-  Name = [[NASA Treks Layers for Moon LRO_NAC_Mosaic_0.5mpp],
-  Version = "1.0",
+  Name = [[NASA Treks Layers for Moon LRO_NAC_Mosaic_0.5mpp]],
   Author = "NASA/Treks",
   URL = "https://trek.nasa.gov/moon",
   License = "NASA/Treks",
diff --git a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_NAC_Mosaic_1mpp.asset b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_NAC_Mosaic_1mpp.asset
index 98aa0519a9..594e5d20be 100644
--- a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_NAC_Mosaic_1mpp.asset
+++ b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_NAC_Mosaic_1mpp.asset
@@ -26,8 +26,7 @@ asset.export("LRO_NAC_Mosaic_1mpp", treks_LRO_NAC_Mosaic_1mpp)
 
 
 asset.meta = {
-  Name = [[NASA Treks Layers for Moon LRO_NAC_Mosaic_1mpp],
-  Version = "1.0",
+  Name = [[NASA Treks Layers for Moon LRO_NAC_Mosaic_1mpp]],
   Author = "NASA/Treks",
   URL = "https://trek.nasa.gov/moon",
   License = "NASA/Treks",
diff --git a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_NAC_PSR_Mosaic_20mpp.asset b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_NAC_PSR_Mosaic_20mpp.asset
index 09b0aee428..e8468a7ade 100644
--- a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_NAC_PSR_Mosaic_20mpp.asset
+++ b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_NAC_PSR_Mosaic_20mpp.asset
@@ -37,8 +37,7 @@ asset.export("NAC_POLE_PSR_SOUTH_STRETCH_EQ", treks_NAC_POLE_PSR_SOUTH_STRETCH_E
 
 
 asset.meta = {
-  Name = [[NASA Treks Layers for Moon LRO_NAC_PSR_Mosaic_20mpp],
-  Version = "1.0",
+  Name = [[NASA Treks Layers for Moon LRO_NAC_PSR_Mosaic_20mpp]],
   Author = "NASA/Treks",
   URL = "https://trek.nasa.gov/moon",
   License = "NASA/Treks",
diff --git a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_NAC_and_CE-2_CCD_Mosaic_1mpp.asset b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_NAC_and_CE-2_CCD_Mosaic_1mpp.asset
index 5d6359bcaa..28a4a8af70 100644
--- a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_NAC_and_CE-2_CCD_Mosaic_1mpp.asset
+++ b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_NAC_and_CE-2_CCD_Mosaic_1mpp.asset
@@ -26,8 +26,7 @@ asset.export("LRO_NAC_CE2_Mosaic_1mpp", treks_LRO_NAC_CE2_Mosaic_1mpp)
 
 
 asset.meta = {
-  Name = [[NASA Treks Layers for Moon LRO_NAC_and_CE-2_CCD_Mosaic_1mpp],
-  Version = "1.0",
+  Name = [[NASA Treks Layers for Moon LRO_NAC_and_CE-2_CCD_Mosaic_1mpp]],
   Author = "NASA/Treks",
   URL = "https://trek.nasa.gov/moon",
   License = "NASA/Treks",
diff --git a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_Narrow_Angle_Camera.asset b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_Narrow_Angle_Camera.asset
index de0d845fd3..b935c34b4e 100644
--- a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_Narrow_Angle_Camera.asset
+++ b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_Narrow_Angle_Camera.asset
@@ -319,7 +319,6 @@ asset.export("NAC_DTM_APOLLO17_SLOPE", treks_NAC_DTM_APOLLO17_SLOPE)
 
 asset.meta = {
   Name = [[NASA Treks Layers for Moon LRO_Narrow_Angle_Camera]],
-  Version = "1.0",
   Author = "NASA/Treks",
   URL = "https://trek.nasa.gov/moon",
   License = "NASA/Treks",
diff --git a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_WAC-GLD100_DEM.asset b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_WAC-GLD100_DEM.asset
index 5b17b65f62..a9d8553a85 100644
--- a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_WAC-GLD100_DEM.asset
+++ b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_WAC-GLD100_DEM.asset
@@ -26,8 +26,7 @@ asset.export("LRO_WACGLD100_Gray_79S79N_256ppd", treks_LRO_WACGLD100_Gray_79S79N
 
 
 asset.meta = {
-  Name = [[NASA Treks Layers for Moon LRO_WAC-GLD100_DEM],
-  Version = "1.0",
+  Name = [[NASA Treks Layers for Moon LRO_WAC-GLD100_DEM]],
   Author = "NASA/Treks",
   URL = "https://trek.nasa.gov/moon",
   License = "NASA/Treks",
diff --git a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_WAC_GLD100_DEM.asset b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_WAC_GLD100_DEM.asset
index bb16735ba3..f75243f26a 100644
--- a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_WAC_GLD100_DEM.asset
+++ b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_WAC_GLD100_DEM.asset
@@ -37,8 +37,7 @@ asset.export("LRO_WACGLD100_Shade_79S79N_256ppd", treks_LRO_WACGLD100_Shade_79S7
 
 
 asset.meta = {
-  Name = [[NASA Treks Layers for Moon LRO_WAC_GLD100_DEM],
-  Version = "1.0",
+  Name = [[NASA Treks Layers for Moon LRO_WAC_GLD100_DEM]],
   Author = "NASA/Treks",
   URL = "https://trek.nasa.gov/moon",
   License = "NASA/Treks",
diff --git a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_and_Kaguya_Multi_Instruments_1895.21mpp.asset b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_and_Kaguya_Multi_Instruments_1895.21mpp.asset
index 72c5d3bc52..e63b500a19 100644
--- a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_and_Kaguya_Multi_Instruments_1895.21mpp.asset
+++ b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_and_Kaguya_Multi_Instruments_1895.21mpp.asset
@@ -70,8 +70,7 @@ asset.export("3He_Very_Likely_Layer", treks_3He_Very_Likely_Layer)
 
 
 asset.meta = {
-  Name = [[NASA Treks Layers for Moon LRO_and_Kaguya_Multi_Instruments_1895.21mpp],
-  Version = "1.0",
+  Name = [[NASA Treks Layers for Moon LRO_and_Kaguya_Multi_Instruments_1895.21mpp]],
   Author = "NASA/Treks",
   URL = "https://trek.nasa.gov/moon",
   License = "NASA/Treks",
diff --git a/data/assets/scene/solarsystem/planets/earth/moon/trail.asset b/data/assets/scene/solarsystem/planets/earth/moon/trail.asset
index 0291bc7a0a..a167a23b96 100644
--- a/data/assets/scene/solarsystem/planets/earth/moon/trail.asset
+++ b/data/assets/scene/solarsystem/planets/earth/moon/trail.asset
@@ -39,7 +39,6 @@ asset.export(MoonTrail)
 
 asset.meta = {
   Name = "Moon Trail",
-  Version = "1.1",
   Description = "Moon Trail - This asset contains the trail of the Moon",
   Author = "OpenSpace Team",
   URL = "http://openspaceproject.com",
diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/2000_carbon_monoxide.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/2000_carbon_monoxide.asset
index fa12d8d80b..a7f735aa97 100644
--- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/2000_carbon_monoxide.asset
+++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/2000_carbon_monoxide.asset
@@ -63,7 +63,6 @@ asset.export(Colorbar)
 
 asset.meta = {
   Name = Name,
-  Version = "1.0",
   Description = Description .. "Data provided by the National Oceanic and Atmospheric Administration",
   Author = "National Oceanic and Atmospheric Administration",
   URL = URL,
diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/2004_ir_hurricane.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/2004_ir_hurricane.asset
index 89c9e1156a..3ce2b97b23 100644
--- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/2004_ir_hurricane.asset
+++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/2004_ir_hurricane.asset
@@ -56,7 +56,6 @@ asset.export(Layer)
 
 asset.meta = {
   Name = Name,
-  Version = "1.0",
   Description = Description .. "Data provided by the National Oceanic and Atmospheric Administration",
   Author = "National Oceanic and Atmospheric Administration",
   URL = URL,
diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/2005_hurricane-grayir.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/2005_hurricane-grayir.asset
index f0b22bd66c..baec89c927 100644
--- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/2005_hurricane-grayir.asset
+++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/2005_hurricane-grayir.asset
@@ -53,7 +53,6 @@ asset.export(Layer)
 
 asset.meta = {
   Name = Name,
-  Version = "1.0",
   Description = Description .. "Data provided by the National Oceanic and Atmospheric Administration",
   Author = "National Oceanic and Atmospheric Administration",
   URL = URL,
diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/2005_hurricane-wvsst.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/2005_hurricane-wvsst.asset
index 25ab407eeb..b7ae4ec356 100644
--- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/2005_hurricane-wvsst.asset
+++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/2005_hurricane-wvsst.asset
@@ -52,7 +52,6 @@ asset.export(Layer)
 
 asset.meta = {
   Name = Name,
-  Version = "1.0",
   Description = Description .. "Data provided by the National Oceanic and Atmospheric Administration",
   Author = "National Oceanic and Atmospheric Administration",
   URL = URL,
diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/2012_hurricane.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/2012_hurricane.asset
index 705ca684b3..8cb44e1495 100644
--- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/2012_hurricane.asset
+++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/2012_hurricane.asset
@@ -85,7 +85,6 @@ asset.export(LayerSat)
 
 asset.meta = {
   Name = Name,
-  Version = "1.0",
   Description = Description .. "Data provided by the National Oceanic and Atmospheric Administration",
   Author = "National Oceanic and Atmospheric Administration",
   URL = URL,
diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/aerosol_blackcarbon.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/aerosol_blackcarbon.asset
index b0297ede98..e16f188072 100644
--- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/aerosol_blackcarbon.asset
+++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/aerosol_blackcarbon.asset
@@ -67,7 +67,6 @@ asset.export(Colorbar)
 
 asset.meta = {
   Name = Name,
-  Version = "1.0",
   Description = Description .. "Data provided by the National Oceanic and Atmospheric Administration",
   Author = "National Oceanic and Atmospheric Administration",
   URL = URL,
diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/aerosol_blackcarbon_and_sulfate.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/aerosol_blackcarbon_and_sulfate.asset
index c688942ab6..662a4d62d4 100644
--- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/aerosol_blackcarbon_and_sulfate.asset
+++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/aerosol_blackcarbon_and_sulfate.asset
@@ -67,7 +67,6 @@ asset.export(Colorbar)
 
 asset.meta = {
   Name = Name,
-  Version = "1.0",
   Description = Description .. "Data provided by the National Oceanic and Atmospheric Administration",
   Author = "National Oceanic and Atmospheric Administration",
   URL = URL,
diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/aerosol_sulfate.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/aerosol_sulfate.asset
index 2219c35d48..9d168b1a33 100644
--- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/aerosol_sulfate.asset
+++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/aerosol_sulfate.asset
@@ -67,7 +67,6 @@ asset.export(Colorbar)
 
 asset.meta = {
   Name = Name,
-  Version = "1.0",
   Description = Description .. "Data provided by the National Oceanic and Atmospheric Administration",
   Author = "National Oceanic and Atmospheric Administration",
   URL = URL,
diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/airtraffic.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/airtraffic.asset
index 98ee27269f..18d75dfdfb 100644
--- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/airtraffic.asset
+++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/airtraffic.asset
@@ -50,7 +50,6 @@ asset.export(Layer)
 
 asset.meta = {
   Name = Name,
-  Version = "1.0",
   Description = Description .. "Data provided by the National Oceanic and Atmospheric Administration",
   Author = "National Oceanic and Atmospheric Administration",
   URL = URL,
diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/all_sats.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/all_sats.asset
index 34a225c6d4..ad5c1582c6 100644
--- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/all_sats.asset
+++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/all_sats.asset
@@ -54,7 +54,6 @@ asset.export(Layer)
 
 asset.meta = {
   Name = Name,
-  Version = "1.0",
   Description = Description .. "Data provided by the National Oceanic and Atmospheric Administration",
   Author = "National Oceanic and Atmospheric Administration",
   URL = URL,
diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/aqua_swath.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/aqua_swath.asset
index 07503c1b82..95fc0bea56 100644
--- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/aqua_swath.asset
+++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/aqua_swath.asset
@@ -54,7 +54,6 @@ asset.export(Layer)
 
 asset.meta = {
   Name = Name,
-  Version = "1.0",
   Description = Description .. "Data provided by the National Oceanic and Atmospheric Administration",
   Author = "National Oceanic and Atmospheric Administration",
   URL = URL,
diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/carbonflux.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/carbonflux.asset
index aae85224e2..02d5d311f7 100644
--- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/carbonflux.asset
+++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/carbonflux.asset
@@ -52,7 +52,6 @@ asset.export(Layer)
 
 asset.meta = {
   Name = Name,
-  Version = "1.0",
   Description = Description .. "Data provided by the National Oceanic and Atmospheric Administration",
   Author = "National Oceanic and Atmospheric Administration",
   URL = URL,
diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/carbontracker_2000_2100-fixed_scale.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/carbontracker_2000_2100-fixed_scale.asset
index 9396621ca4..455189c6a5 100644
--- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/carbontracker_2000_2100-fixed_scale.asset
+++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/carbontracker_2000_2100-fixed_scale.asset
@@ -110,7 +110,6 @@ asset.export(Colorbar)
 
 asset.meta = {
   Name = Name,
-  Version = "1.0",
   Description = Description .. "Data provided by the National Oceanic and Atmospheric Administration",
   Author = "National Oceanic and Atmospheric Administration",
   URL = URL,
diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/carbontracker_2000_2100-sliding_scale.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/carbontracker_2000_2100-sliding_scale.asset
index 866c8b44ad..85f03e5f55 100644
--- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/carbontracker_2000_2100-sliding_scale.asset
+++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/carbontracker_2000_2100-sliding_scale.asset
@@ -111,7 +111,6 @@ asset.export(Colorbar)
 
 asset.meta = {
   Name = Name,
-  Version = "1.0",
   Description = Description .. "Data provided by the National Oceanic and Atmospheric Administration",
   Author = "National Oceanic and Atmospheric Administration",
   URL = URL,
diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/climate_niche.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/climate_niche.asset
index 1b37e5d790..104c840b16 100644
--- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/climate_niche.asset
+++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/climate_niche.asset
@@ -98,7 +98,6 @@ asset.export(Colorbar)
 
 asset.meta = {
   Name = Name,
-  Version = "1.0",
   Description = Description .. "Data provided by the National Oceanic and Atmospheric Administration",
   Author = "National Oceanic and Atmospheric Administration",
   URL = URL,
diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/co_gmd.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/co_gmd.asset
index 92c6680de7..903a536209 100644
--- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/co_gmd.asset
+++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/co_gmd.asset
@@ -74,7 +74,6 @@ asset.export(Colorbar)
 
 asset.meta = {
   Name = Name,
-  Version = "1.0",
   Description = Description .. "Data provided by the National Oceanic and Atmospheric Administration",
   Author = "National Oceanic and Atmospheric Administration",
   URL = URL,
diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/fim_chem.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/fim_chem.asset
index a6929f82c4..509b5b905f 100644
--- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/fim_chem.asset
+++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/fim_chem.asset
@@ -62,7 +62,6 @@ asset.export(Colorbar)
 
 asset.meta = {
   Name = Name,
-  Version = "1.0",
   Description = Description .. "Data provided by the National Oceanic and Atmospheric Administration",
   Author = "National Oceanic and Atmospheric Administration",
   URL = URL,
diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/fossil_fuel.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/fossil_fuel.asset
index 4ad6a85624..e1ef720845 100644
--- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/fossil_fuel.asset
+++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/fossil_fuel.asset
@@ -75,7 +75,6 @@ asset.export(Colorbar)
 
 asset.meta = {
   Name = Name,
-  Version = "1.0",
   Description = Description .. "Data provided by the National Oceanic and Atmospheric Administration",
   Author = "National Oceanic and Atmospheric Administration",
   URL = URL,
diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/fukushima.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/fukushima.asset
index 0c391aec48..f8e89874d3 100644
--- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/fukushima.asset
+++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/fukushima.asset
@@ -61,7 +61,6 @@ asset.export(Colorbar)
 
 asset.meta = {
   Name = Name,
-  Version = "1.0",
   Description = Description .. "Data provided by the National Oceanic and Atmospheric Administration",
   Author = "National Oceanic and Atmospheric Administration",
   URL = URL,
diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/geo_sat.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/geo_sat.asset
index 878e2a0be8..42d9e14823 100644
--- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/geo_sat.asset
+++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/geo_sat.asset
@@ -52,7 +52,6 @@ asset.export(Layer)
 
 asset.meta = {
   Name = Name,
-  Version = "1.0",
   Description = Description .. "Data provided by the National Oceanic and Atmospheric Administration",
   Author = "National Oceanic and Atmospheric Administration",
   URL = URL,
diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/geo_scan.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/geo_scan.asset
index ac3ff65ba6..3f3ae5f6be 100644
--- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/geo_scan.asset
+++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/geo_scan.asset
@@ -52,7 +52,6 @@ asset.export(Layer)
 
 asset.meta = {
   Name = Name,
-  Version = "1.0",
   Description = Description .. "Data provided by the National Oceanic and Atmospheric Administration",
   Author = "National Oceanic and Atmospheric Administration",
   URL = URL,
diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/giss_temp_anom.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/giss_temp_anom.asset
index 6346323e3b..e15363cc13 100644
--- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/giss_temp_anom.asset
+++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/giss_temp_anom.asset
@@ -57,7 +57,6 @@ asset.export(Colorbar)
 
 asset.meta = {
   Name = Name,
-  Version = "1.0",
   Description = Description .. "Data provided by the National Oceanic and Atmospheric Administration",
   Author = "National Oceanic and Atmospheric Administration",
   URL = URL,
diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/globe-insolation.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/globe-insolation.asset
index 8b447bbe6e..101203a0ae 100644
--- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/globe-insolation.asset
+++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/globe-insolation.asset
@@ -68,7 +68,6 @@ asset.export(Colorbar)
 
 asset.meta = {
   Name = Name,
-  Version = "1.0",
   Description = Description .. "Data provided by the National Oceanic and Atmospheric Administration",
   Author = "National Oceanic and Atmospheric Administration",
   URL = URL,
diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/globe-rainfall.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/globe-rainfall.asset
index 2ce54a037f..f517bcee4f 100644
--- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/globe-rainfall.asset
+++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/globe-rainfall.asset
@@ -68,7 +68,6 @@ asset.export(Colorbar)
 
 asset.meta = {
   Name = Name,
-  Version = "1.0",
   Description = Description .. "Data provided by the National Oceanic and Atmospheric Administration",
   Author = "National Oceanic and Atmospheric Administration",
   URL = URL,
diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/harvey-clouds_precip.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/harvey-clouds_precip.asset
index 8fe514d1de..615f331c16 100644
--- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/harvey-clouds_precip.asset
+++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/harvey-clouds_precip.asset
@@ -79,7 +79,6 @@ asset.export(ColorbarSnow)
 
 asset.meta = {
   Name = Name,
-  Version = "1.0",
   Description = Description .. "Data provided by the National Oceanic and Atmospheric Administration",
   Author = "National Oceanic and Atmospheric Administration",
   URL = URL,
diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/hurricane_season_2017.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/hurricane_season_2017.asset
index ed8d13a13c..5556823ce2 100644
--- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/hurricane_season_2017.asset
+++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/hurricane_season_2017.asset
@@ -58,7 +58,6 @@ asset.export(Layer)
 
 asset.meta = {
   Name = Name,
-  Version = "1.0",
   Description = Description .. "Data provided by the National Oceanic and Atmospheric Administration",
   Author = "National Oceanic and Atmospheric Administration",
   URL = URL,
diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/hurricane_season_2017_wvsst.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/hurricane_season_2017_wvsst.asset
index 9e6aedd6b8..a923020f71 100644
--- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/hurricane_season_2017_wvsst.asset
+++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/hurricane_season_2017_wvsst.asset
@@ -57,7 +57,6 @@ asset.export(Layer)
 
 asset.meta = {
   Name = Name,
-  Version = "1.0",
   Description = Description .. "Data provided by the National Oceanic and Atmospheric Administration",
   Author = "National Oceanic and Atmospheric Administration",
   URL = URL,
diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/hurricane_tracks-cumulative.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/hurricane_tracks-cumulative.asset
index afd07d2d5e..37849c1de3 100644
--- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/hurricane_tracks-cumulative.asset
+++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/hurricane_tracks-cumulative.asset
@@ -44,7 +44,6 @@ asset.export(Layer)
 
 asset.meta = {
   Name = Name,
-  Version = "1.0",
   Description = Description .. "Data provided by the National Oceanic and Atmospheric Administration",
   Author = "National Oceanic and Atmospheric Administration",
   URL = URL,
diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/isaac.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/isaac.asset
index 0c42b6921d..4aa5a8d697 100644
--- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/isaac.asset
+++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/isaac.asset
@@ -75,7 +75,6 @@ asset.export(LayerSat)
 
 asset.meta = {
   Name = Name,
-  Version = "1.0",
   Description = Description .. "Data provided by the National Oceanic and Atmospheric Administration",
   Author = "National Oceanic and Atmospheric Administration",
   URL = URL,
diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/iss_track.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/iss_track.asset
index f6ffe7ab34..ded8dd2d20 100644
--- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/iss_track.asset
+++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/iss_track.asset
@@ -50,7 +50,6 @@ asset.export(Layer)
 
 asset.meta = {
   Name = Name,
-  Version = "1.0",
   Description = Description .. "Data provided by the National Oceanic and Atmospheric Administration",
   Author = "National Oceanic and Atmospheric Administration",
   URL = URL,
diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/land_temp.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/land_temp.asset
index 064c9755c0..608ff0d014 100644
--- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/land_temp.asset
+++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/land_temp.asset
@@ -54,7 +54,6 @@ asset.export(Layer)
 
 asset.meta = {
   Name = Name,
-  Version = "1.0",
   Description = Description .. "Data provided by the National Oceanic and Atmospheric Administration",
   Author = "National Oceanic and Atmospheric Administration",
   URL = URL,
diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/lightning.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/lightning.asset
index 6315169c19..80660dc656 100644
--- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/lightning.asset
+++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/lightning.asset
@@ -61,7 +61,6 @@ asset.export(Colorbar)
 
 asset.meta = {
   Name = Name,
-  Version = "1.0",
   Description = Description .. "Data provided by the National Oceanic and Atmospheric Administration",
   Author = "National Oceanic and Atmospheric Administration",
   URL = URL,
diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/ltg_vaisala.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/ltg_vaisala.asset
index 4344ae2fb0..e5763a1339 100644
--- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/ltg_vaisala.asset
+++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/ltg_vaisala.asset
@@ -73,7 +73,6 @@ asset.export(Colorbar)
 
 asset.meta = {
   Name = Name,
-  Version = "1.0",
   Description = Description .. "Data provided by the National Oceanic and Atmospheric Administration",
   Author = "National Oceanic and Atmospheric Administration",
   URL = URL,
diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/nasa_sats.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/nasa_sats.asset
index 6cb161b5d8..6d4b5331c3 100644
--- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/nasa_sats.asset
+++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/nasa_sats.asset
@@ -51,7 +51,6 @@ asset.export(Layer)
 
 asset.meta = {
   Name = Name,
-  Version = "1.0",
   Description = Description .. "Data provided by the National Oceanic and Atmospheric Administration",
   Author = "National Oceanic and Atmospheric Administration",
   URL = URL,
diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/nccs_models-carbon.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/nccs_models-carbon.asset
index ff3e3c4f6f..8bd2220b8b 100644
--- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/nccs_models-carbon.asset
+++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/nccs_models-carbon.asset
@@ -62,7 +62,6 @@ asset.export(Colorbar)
 
 asset.meta = {
   Name = Name,
-  Version = "1.0",
   Description = Description .. "Data provided by the National Oceanic and Atmospheric Administration",
   Author = "National Oceanic and Atmospheric Administration",
   URL = URL,
diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/nccs_models-chem.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/nccs_models-chem.asset
index 8f5ee2efcc..70b0b34a7a 100644
--- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/nccs_models-chem.asset
+++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/nccs_models-chem.asset
@@ -68,7 +68,6 @@ asset.export(Legend)
 
 asset.meta = {
   Name = Name,
-  Version = "1.0",
   Description = Description .. "Data provided by the National Oceanic and Atmospheric Administration",
   Author = "National Oceanic and Atmospheric Administration",
   URL = URL,
diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/nccs_models-winds.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/nccs_models-winds.asset
index 811d2792d9..b722ddd75a 100644
--- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/nccs_models-winds.asset
+++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/nccs_models-winds.asset
@@ -55,7 +55,6 @@ asset.export(Layer)
 
 asset.meta = {
   Name = Name,
-  Version = "1.0",
   Description = Description .. "Data provided by the National Oceanic and Atmospheric Administration",
   Author = "National Oceanic and Atmospheric Administration",
   URL = URL,
diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/no2_omsi.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/no2_omsi.asset
index ee4e1b1818..77f17acd41 100644
--- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/no2_omsi.asset
+++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/no2_omsi.asset
@@ -69,7 +69,6 @@ asset.export(Colorbar)
 
 asset.meta = {
   Name = Name,
-  Version = "1.0",
   Description = Description .. "Data provided by the National Oceanic and Atmospheric Administration",
   Author = "National Oceanic and Atmospheric Administration",
   URL = URL,
diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/noaa_sat-tracks.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/noaa_sat-tracks.asset
index 0962295b20..3cd5236a65 100644
--- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/noaa_sat-tracks.asset
+++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/noaa_sat-tracks.asset
@@ -51,7 +51,6 @@ asset.export(Layer)
 
 asset.meta = {
   Name = Name,
-  Version = "1.0",
   Description = Description .. "Data provided by the National Oceanic and Atmospheric Administration",
   Author = "National Oceanic and Atmospheric Administration",
   URL = URL,
diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/pclim.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/pclim.asset
index 87229c9ac4..fb7c1c9e85 100644
--- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/pclim.asset
+++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/pclim.asset
@@ -59,7 +59,6 @@ asset.export(Colorbar)
 
 asset.meta = {
   Name = Name,
-  Version = "1.0",
   Description = Description .. "Data provided by the National Oceanic and Atmospheric Administration",
   Author = "National Oceanic and Atmospheric Administration",
   URL = URL,
diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/poes_sat.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/poes_sat.asset
index 212630a9c7..2fc59e7bb1 100644
--- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/poes_sat.asset
+++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/poes_sat.asset
@@ -55,7 +55,6 @@ asset.export(Layer)
 
 asset.meta = {
   Name = Name,
-  Version = "1.0",
   Description = Description .. "Data provided by the National Oceanic and Atmospheric Administration",
   Author = "National Oceanic and Atmospheric Administration",
   URL = URL,
diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/reanalysis-antarctic.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/reanalysis-antarctic.asset
index 08363c3e6f..d22fc6ff87 100644
--- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/reanalysis-antarctic.asset
+++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/reanalysis-antarctic.asset
@@ -74,7 +74,6 @@ asset.export(Colorbar)
 
 asset.meta = {
   Name = Name,
-  Version = "1.0",
   Description = Description .. "Data provided by the National Oceanic and Atmospheric Administration",
   Author = "National Oceanic and Atmospheric Administration",
   URL = URL,
diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/reanalysis-elnino.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/reanalysis-elnino.asset
index f1e201e146..6fee278c43 100644
--- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/reanalysis-elnino.asset
+++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/reanalysis-elnino.asset
@@ -74,7 +74,6 @@ asset.export(Colorbar)
 
 asset.meta = {
   Name = Name,
-  Version = "1.0",
   Description = Description .. "Data provided by the National Oceanic and Atmospheric Administration",
   Author = "National Oceanic and Atmospheric Administration",
   URL = URL,
diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/reanalysis-hurricane.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/reanalysis-hurricane.asset
index a5debb4d47..c0991de888 100644
--- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/reanalysis-hurricane.asset
+++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/reanalysis-hurricane.asset
@@ -74,7 +74,6 @@ asset.export(Colorbar)
 
 asset.meta = {
   Name = Name,
-  Version = "1.0",
   Description = Description .. "Data provided by the National Oceanic and Atmospheric Administration",
   Author = "National Oceanic and Atmospheric Administration",
   URL = URL,
diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/sandy.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/sandy.asset
index 11fed820a2..e7671d1ad8 100644
--- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/sandy.asset
+++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/sandy.asset
@@ -50,7 +50,6 @@ asset.export(Layer)
 
 asset.meta = {
   Name = Name,
-  Version = "1.0",
   Description = Description .. "Data provided by the National Oceanic and Atmospheric Administration",
   Author = "National Oceanic and Atmospheric Administration",
   URL = URL,
diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/sunsync_sat.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/sunsync_sat.asset
index 394ad79d7e..97f9bce154 100644
--- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/sunsync_sat.asset
+++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/sunsync_sat.asset
@@ -55,7 +55,6 @@ asset.export(Layer)
 
 asset.meta = {
   Name = Name,
-  Version = "1.0",
   Description = Description .. "Data provided by the National Oceanic and Atmospheric Administration",
   Author = "National Oceanic and Atmospheric Administration",
   URL = URL,
diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/temp_anom.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/temp_anom.asset
index 375f86f3c7..2413f8248f 100644
--- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/temp_anom.asset
+++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/temp_anom.asset
@@ -72,7 +72,6 @@ asset.export(Colorbar)
 
 asset.meta = {
   Name = Name,
-  Version = "1.0",
   Description = Description .. "Data provided by the National Oceanic and Atmospheric Administration",
   Author = "National Oceanic and Atmospheric Administration",
   URL = URL,
diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/tropical_widening.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/tropical_widening.asset
index 31dd772bfc..0a38fc6860 100644
--- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/tropical_widening.asset
+++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/tropical_widening.asset
@@ -55,7 +55,6 @@ asset.export(Colorbar)
 
 asset.meta = {
   Name = Name,
-  Version = "1.0",
   Description = Description .. "Data provided by the National Oceanic and Atmospheric Administration",
   Author = "National Oceanic and Atmospheric Administration",
   URL = URL,
diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/typhoon_haiyan-wvsst.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/typhoon_haiyan-wvsst.asset
index 9aaaace55c..ae1ca4e39d 100644
--- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/typhoon_haiyan-wvsst.asset
+++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/typhoon_haiyan-wvsst.asset
@@ -57,7 +57,6 @@ asset.export(Track)
 
 asset.meta = {
   Name = Name,
-  Version = "1.0",
   Description = Description .. "Data provided by the National Oceanic and Atmospheric Administration",
   Author = "National Oceanic and Atmospheric Administration",
   URL = URL,
diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/typhoon_haiyan.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/typhoon_haiyan.asset
index 3b1984b040..ada1edfc98 100644
--- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/typhoon_haiyan.asset
+++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/typhoon_haiyan.asset
@@ -63,7 +63,6 @@ asset.export(Track)
 
 asset.meta = {
   Name = Name,
-  Version = "1.0",
   Description = Description .. "Data provided by the National Oceanic and Atmospheric Administration",
   Author = "National Oceanic and Atmospheric Administration",
   URL = URL,
diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/volcano_ash.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/volcano_ash.asset
index 66cb0a84a1..13bb8d1589 100644
--- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/volcano_ash.asset
+++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/volcano_ash.asset
@@ -52,7 +52,6 @@ asset.export(Layer)
 
 asset.meta = {
   Name = Name,
-  Version = "1.0",
   Description = Description .. "Data provided by the National Oceanic and Atmospheric Administration",
   Author = "National Oceanic and Atmospheric Administration",
   URL = URL,
diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/agriculture-cropland.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/agriculture-cropland.asset
index 96eea703b8..c8e2c1794a 100644
--- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/agriculture-cropland.asset
+++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/agriculture-cropland.asset
@@ -71,7 +71,6 @@ asset.export(Legend)
 
 asset.meta = {
   Name = Name,
-  Version = "1.0",
   Description = Description .. "Data provided by the National Oceanic and Atmospheric Administration",
   Author = "National Oceanic and Atmospheric Administration",
   URL = URL,
diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/agriculture-pastureland.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/agriculture-pastureland.asset
index 5b8732bf5b..478c1c95f4 100644
--- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/agriculture-pastureland.asset
+++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/agriculture-pastureland.asset
@@ -71,7 +71,6 @@ asset.export(Legend)
 
 asset.meta = {
   Name = Name,
-  Version = "1.0",
   Description = Description .. "Data provided by the National Oceanic and Atmospheric Administration",
   Author = "National Oceanic and Atmospheric Administration",
   URL = URL,
diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/birds.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/birds.asset
index f33a397bb1..aaa306cd46 100644
--- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/birds.asset
+++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/birds.asset
@@ -61,7 +61,6 @@ asset.export(Colorbar)
 
 asset.meta = {
   Name = Name,
-  Version = "1.0",
   Description = Description .. "Data provided by the National Oceanic and Atmospheric Administration",
   Author = "National Oceanic and Atmospheric Administration",
   URL = URL,
diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/blue_marble-blue_marble.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/blue_marble-blue_marble.asset
index 3db367b798..e7a4b7c439 100644
--- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/blue_marble-blue_marble.asset
+++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/blue_marble-blue_marble.asset
@@ -50,7 +50,6 @@ asset.export(Layer)
 
 asset.meta = {
   Name = Name,
-  Version = "1.0",
   Description = Description .. "Data provided by the National Oceanic and Atmospheric Administration",
   Author = "National Oceanic and Atmospheric Administration",
   URL = URL,
diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/blue_marble-blue_marble_topo.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/blue_marble-blue_marble_topo.asset
index 12fec7881d..b9067dc5c0 100644
--- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/blue_marble-blue_marble_topo.asset
+++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/blue_marble-blue_marble_topo.asset
@@ -53,7 +53,6 @@ asset.export(Layer)
 
 asset.meta = {
   Name = Name,
-  Version = "1.0",
   Description = Description .. "Data provided by the National Oceanic and Atmospheric Administration",
   Author = "National Oceanic and Atmospheric Administration",
   URL = URL,
diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/blue_marble-blue_marble_topo_bathy.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/blue_marble-blue_marble_topo_bathy.asset
index 4c53ccbdcd..f7840349d4 100644
--- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/blue_marble-blue_marble_topo_bathy.asset
+++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/blue_marble-blue_marble_topo_bathy.asset
@@ -53,7 +53,6 @@ asset.export(Layer)
 
 asset.meta = {
   Name = Name,
-  Version = "1.0",
   Description = Description .. "Data provided by the National Oceanic and Atmospheric Administration",
   Author = "National Oceanic and Atmospheric Administration",
   URL = URL,
diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/blue_marble-nightlights.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/blue_marble-nightlights.asset
index 4472571e4c..b4a3388847 100644
--- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/blue_marble-nightlights.asset
+++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/blue_marble-nightlights.asset
@@ -54,7 +54,6 @@ asset.export(Layer)
 
 asset.meta = {
   Name = Name,
-  Version = "1.0",
   Description = Description .. "Data provided by the National Oceanic and Atmospheric Administration",
   Author = "National Oceanic and Atmospheric Administration",
   URL = URL,
diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/blue_marble-seasonal_blue_marble.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/blue_marble-seasonal_blue_marble.asset
index 6138a385af..aaf2257ef8 100644
--- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/blue_marble-seasonal_blue_marble.asset
+++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/blue_marble-seasonal_blue_marble.asset
@@ -54,7 +54,6 @@ asset.export(Layer)
 
 asset.meta = {
   Name = Name,
-  Version = "1.0",
   Description = Description .. "Data provided by the National Oceanic and Atmospheric Administration",
   Author = "National Oceanic and Atmospheric Administration",
   URL = URL,
diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/dams-global.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/dams-global.asset
index 92e3817647..78c0e51a01 100644
--- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/dams-global.asset
+++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/dams-global.asset
@@ -45,7 +45,6 @@ asset.export(Layer)
 
 asset.meta = {
   Name = Name,
-  Version = "1.0",
   Description = Description .. "Data provided by the National Oceanic and Atmospheric Administration",
   Author = "National Oceanic and Atmospheric Administration",
   URL = URL,
diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/dams-mississippi.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/dams-mississippi.asset
index a017dcb157..94efe2ee18 100644
--- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/dams-mississippi.asset
+++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/dams-mississippi.asset
@@ -46,7 +46,6 @@ asset.export(Layer)
 
 asset.meta = {
   Name = Name,
-  Version = "1.0",
   Description = Description .. "Data provided by the National Oceanic and Atmospheric Administration",
   Author = "National Oceanic and Atmospheric Administration",
   URL = URL,
diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/dams-yangtze.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/dams-yangtze.asset
index dca2ad1923..c9e9e7cba3 100644
--- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/dams-yangtze.asset
+++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/dams-yangtze.asset
@@ -46,7 +46,6 @@ asset.export(Layer)
 
 asset.meta = {
   Name = Name,
-  Version = "1.0",
   Description = Description .. "Data provided by the National Oceanic and Atmospheric Administration",
   Author = "National Oceanic and Atmospheric Administration",
   URL = URL,
diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/day_night-06z_only.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/day_night-06z_only.asset
index ba81ddaf0a..b2166992e7 100644
--- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/day_night-06z_only.asset
+++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/day_night-06z_only.asset
@@ -54,7 +54,6 @@ asset.export(Layer)
 
 asset.meta = {
   Name = Name,
-  Version = "1.0",
   Description = Description .. "Data provided by the National Oceanic and Atmospheric Administration",
   Author = "National Oceanic and Atmospheric Administration",
   URL = URL,
diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/day_night-full_year.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/day_night-full_year.asset
index beef9f1bb0..a0f654223e 100644
--- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/day_night-full_year.asset
+++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/day_night-full_year.asset
@@ -55,7 +55,6 @@ asset.export(Layer)
 
 asset.meta = {
   Name = Name,
-  Version = "1.0",
   Description = Description .. "Data provided by the National Oceanic and Atmospheric Administration",
   Author = "National Oceanic and Atmospheric Administration",
   URL = URL,
diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/day_night-oneday.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/day_night-oneday.asset
index 8d914aeed2..e7834bd81d 100644
--- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/day_night-oneday.asset
+++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/day_night-oneday.asset
@@ -47,7 +47,6 @@ asset.export(Layer)
 
 asset.meta = {
   Name = Name,
-  Version = "1.0",
   Description = Description .. "Data provided by the National Oceanic and Atmospheric Administration",
   Author = "National Oceanic and Atmospheric Administration",
   URL = URL,
diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/earth_night-1992_2002.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/earth_night-1992_2002.asset
index 026e31f028..6364ac3b06 100644
--- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/earth_night-1992_2002.asset
+++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/earth_night-1992_2002.asset
@@ -55,7 +55,6 @@ asset.export(Layer2002)
 
 asset.meta = {
   Name = Name,
-  Version = "1.0",
   Description = Description .. "Data provided by the National Oceanic and Atmospheric Administration",
   Author = "National Oceanic and Atmospheric Administration",
   URL = URL,
diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/earth_night-1992_2008.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/earth_night-1992_2008.asset
index cb162e7c12..6146c0f910 100644
--- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/earth_night-1992_2008.asset
+++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/earth_night-1992_2008.asset
@@ -45,7 +45,6 @@ asset.export(Layer)
 
 asset.meta = {
   Name = Name,
-  Version = "1.0",
   Description = Description .. "Data provided by the National Oceanic and Atmospheric Administration",
   Author = "National Oceanic and Atmospheric Administration",
   URL = URL,
diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/earth_night-1992_2009.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/earth_night-1992_2009.asset
index 5111e7a3f8..cd99a077ee 100644
--- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/earth_night-1992_2009.asset
+++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/earth_night-1992_2009.asset
@@ -58,7 +58,6 @@ asset.export(Colorbar)
 
 asset.meta = {
   Name = Name,
-  Version = "1.0",
   Description = Description .. "Data provided by the National Oceanic and Atmospheric Administration",
   Author = "National Oceanic and Atmospheric Administration",
   URL = URL,
diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/earth_night-2012.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/earth_night-2012.asset
index afab4a153f..90aec3f4fe 100644
--- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/earth_night-2012.asset
+++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/earth_night-2012.asset
@@ -43,7 +43,6 @@ asset.export(Layer)
 
 asset.meta = {
   Name = Name,
-  Version = "1.0",
   Description = Description .. "Data provided by the National Oceanic and Atmospheric Administration",
   Author = "National Oceanic and Atmospheric Administration",
   URL = URL,
diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/earth_night-color_nightlights.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/earth_night-color_nightlights.asset
index 1fffb22dd7..130d2139b8 100644
--- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/earth_night-color_nightlights.asset
+++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/earth_night-color_nightlights.asset
@@ -48,7 +48,6 @@ asset.export(Layer)
 
 asset.meta = {
   Name = Name,
-  Version = "1.0",
   Description = Description .. "Data provided by the National Oceanic and Atmospheric Administration",
   Author = "National Oceanic and Atmospheric Administration",
   URL = URL,
diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/earth_night-nightlights.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/earth_night-nightlights.asset
index eabe255505..0179b0b6e8 100644
--- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/earth_night-nightlights.asset
+++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/earth_night-nightlights.asset
@@ -48,7 +48,6 @@ asset.export(Layer)
 
 asset.meta = {
   Name = Name,
-  Version = "1.0",
   Description = Description .. "Data provided by the National Oceanic and Atmospheric Administration",
   Author = "National Oceanic and Atmospheric Administration",
   URL = URL,
diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/earthquake-1980_1995_quakes.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/earthquake-1980_1995_quakes.asset
index 3dc52e5510..dcae6cbc02 100644
--- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/earthquake-1980_1995_quakes.asset
+++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/earthquake-1980_1995_quakes.asset
@@ -96,7 +96,6 @@ asset.export(QuakebarCombined)
 
 asset.meta = {
   Name = Name,
-  Version = "1.0",
   Description = Description .. "Data provided by the National Oceanic and Atmospheric Administration",
   Author = "National Oceanic and Atmospheric Administration",
   URL = URL,
diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/earthquake-2001_2015.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/earthquake-2001_2015.asset
index f5eb527874..fe2e4c9daf 100644
--- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/earthquake-2001_2015.asset
+++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/earthquake-2001_2015.asset
@@ -104,7 +104,6 @@ asset.export(LayerQuakesGte8)
 
 asset.meta = {
   Name = Name,
-  Version = "1.0",
   Description = Description .. "Data provided by the National Oceanic and Atmospheric Administration",
   Author = "National Oceanic and Atmospheric Administration",
   URL = URL,
diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/earthquakes_1901_2000.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/earthquakes_1901_2000.asset
index d6b804c171..9cfa6db25a 100644
--- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/earthquakes_1901_2000.asset
+++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/earthquakes_1901_2000.asset
@@ -105,7 +105,6 @@ asset.export(LayerQuakesGte8)
 
 asset.meta = {
   Name = Name,
-  Version = "1.0",
   Description = Description .. "Data provided by the National Oceanic and Atmospheric Administration",
   Author = "National Oceanic and Atmospheric Administration",
   URL = URL,
diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/earthquakes_and_eruptions.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/earthquakes_and_eruptions.asset
index 5c9d3af6bc..efbc1183dc 100644
--- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/earthquakes_and_eruptions.asset
+++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/earthquakes_and_eruptions.asset
@@ -61,7 +61,6 @@ asset.export(Legend)
 
 asset.meta = {
   Name = Name,
-  Version = "1.0",
   Description = Description .. "Data provided by the National Oceanic and Atmospheric Administration",
   Author = "National Oceanic and Atmospheric Administration",
   URL = URL,
diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/earths_magnetism_magnetic_lines.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/earths_magnetism_magnetic_lines.asset
index 90353a8cd8..05a33d5b59 100644
--- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/earths_magnetism_magnetic_lines.asset
+++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/earths_magnetism_magnetic_lines.asset
@@ -59,7 +59,6 @@ asset.export(Layer)
 
 asset.meta = {
   Name = Name,
-  Version = "1.0",
   Description = Description .. "Data provided by the National Oceanic and Atmospheric Administration",
   Author = "National Oceanic and Atmospheric Administration",
   URL = URL,
diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/earths_magnetism_magnets.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/earths_magnetism_magnets.asset
index 928e30e917..692791d73e 100644
--- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/earths_magnetism_magnets.asset
+++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/earths_magnetism_magnets.asset
@@ -59,7 +59,6 @@ asset.export(Layer)
 
 asset.meta = {
   Name = Name,
-  Version = "1.0",
   Description = Description .. "Data provided by the National Oceanic and Atmospheric Administration",
   Author = "National Oceanic and Atmospheric Administration",
   URL = URL,
diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/etopo1.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/etopo1.asset
index 3e606c2d5b..b3c32213b6 100644
--- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/etopo1.asset
+++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/etopo1.asset
@@ -62,7 +62,6 @@ asset.export(Colorbar)
 
 asset.meta = {
   Name = Name,
-  Version = "1.0",
   Description = Description .. "Data provided by the National Oceanic and Atmospheric Administration",
   Author = "National Oceanic and Atmospheric Administration",
   URL = URL,
diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/etopo2-earth_bright.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/etopo2-earth_bright.asset
index 8f18838347..81d437a6bd 100644
--- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/etopo2-earth_bright.asset
+++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/etopo2-earth_bright.asset
@@ -46,7 +46,6 @@ asset.export(Layer)
 
 asset.meta = {
   Name = Name,
-  Version = "1.0",
   Description = Description .. "Data provided by the National Oceanic and Atmospheric Administration",
   Author = "National Oceanic and Atmospheric Administration",
   URL = URL,
diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/etopo2-earth_color.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/etopo2-earth_color.asset
index 08d43e4fc2..186aedc161 100644
--- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/etopo2-earth_color.asset
+++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/etopo2-earth_color.asset
@@ -46,7 +46,6 @@ asset.export(Layer)
 
 asset.meta = {
   Name = Name,
-  Version = "1.0",
   Description = Description .. "Data provided by the National Oceanic and Atmospheric Administration",
   Author = "National Oceanic and Atmospheric Administration",
   URL = URL,
diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/etopo2-earth_shaded.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/etopo2-earth_shaded.asset
index c11905f171..aebe1350a6 100644
--- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/etopo2-earth_shaded.asset
+++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/etopo2-earth_shaded.asset
@@ -46,7 +46,6 @@ asset.export(Layer)
 
 asset.meta = {
   Name = Name,
-  Version = "1.0",
   Description = Description .. "Data provided by the National Oceanic and Atmospheric Administration",
   Author = "National Oceanic and Atmospheric Administration",
   URL = URL,
diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/etopo2-earth_topo.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/etopo2-earth_topo.asset
index d952be3de1..bf6d9d067a 100644
--- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/etopo2-earth_topo.asset
+++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/etopo2-earth_topo.asset
@@ -49,7 +49,6 @@ asset.export(Layer)
 
 asset.meta = {
   Name = Name,
-  Version = "1.0",
   Description = Description .. "Data provided by the National Oceanic and Atmospheric Administration",
   Author = "National Oceanic and Atmospheric Administration",
   URL = URL,
diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/etopo2-landsat.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/etopo2-landsat.asset
index b4837ee6a6..41098aa6c5 100644
--- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/etopo2-landsat.asset
+++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/etopo2-landsat.asset
@@ -45,7 +45,6 @@ asset.export(Layer)
 
 asset.meta = {
   Name = Name,
-  Version = "1.0",
   Description = Description .. "Data provided by the National Oceanic and Atmospheric Administration",
   Author = "National Oceanic and Atmospheric Administration",
   URL = URL,
diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/fire.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/fire.asset
index 4305d6e40b..9d52f83bc0 100644
--- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/fire.asset
+++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/fire.asset
@@ -57,7 +57,6 @@ asset.export(Layer)
 
 asset.meta = {
   Name = Name,
-  Version = "1.0",
   Description = Description .. "Data provided by the National Oceanic and Atmospheric Administration",
   Author = "National Oceanic and Atmospheric Administration",
   URL = URL,
diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/fire_veg.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/fire_veg.asset
index 7fb2a44f9e..ade8425057 100644
--- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/fire_veg.asset
+++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/fire_veg.asset
@@ -76,7 +76,6 @@ asset.export(ColorbarVeg)
 
 asset.meta = {
   Name = Name,
-  Version = "1.0",
   Description = Description .. "Data provided by the National Oceanic and Atmospheric Administration",
   Author = "National Oceanic and Atmospheric Administration",
   URL = URL,
diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/flooding-displaced_250.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/flooding-displaced_250.asset
index b793163179..221d3cde96 100644
--- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/flooding-displaced_250.asset
+++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/flooding-displaced_250.asset
@@ -61,7 +61,6 @@ asset.export(LayerNight)
 
 asset.meta = {
   Name = Name,
-  Version = "1.0",
   Description = Description .. "Data provided by the National Oceanic and Atmospheric Administration",
   Author = "National Oceanic and Atmospheric Administration",
   URL = URL,
diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/flooding-fatal.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/flooding-fatal.asset
index dc18e53407..769680546a 100644
--- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/flooding-fatal.asset
+++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/flooding-fatal.asset
@@ -61,7 +61,6 @@ asset.export(LayerNight)
 
 asset.meta = {
   Name = Name,
-  Version = "1.0",
   Description = Description .. "Data provided by the National Oceanic and Atmospheric Administration",
   Author = "National Oceanic and Atmospheric Administration",
   URL = URL,
diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/flooding-heavy_rain.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/flooding-heavy_rain.asset
index 8d29cfae53..e8a57f5e01 100644
--- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/flooding-heavy_rain.asset
+++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/flooding-heavy_rain.asset
@@ -61,7 +61,6 @@ asset.export(LayerNight)
 
 asset.meta = {
   Name = Name,
-  Version = "1.0",
   Description = Description .. "Data provided by the National Oceanic and Atmospheric Administration",
   Author = "National Oceanic and Atmospheric Administration",
   URL = URL,
diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/flooding-major_floods.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/flooding-major_floods.asset
index d08e41b22c..8f0d835221 100644
--- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/flooding-major_floods.asset
+++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/flooding-major_floods.asset
@@ -61,7 +61,6 @@ asset.export(LayerFloods)
 
 asset.meta = {
   Name = Name,
-  Version = "1.0",
   Description = Description .. "Data provided by the National Oceanic and Atmospheric Administration",
   Author = "National Oceanic and Atmospheric Administration",
   URL = URL,
diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/food_v_feed.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/food_v_feed.asset
index 0687a84aa8..34e55cb888 100644
--- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/food_v_feed.asset
+++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/food_v_feed.asset
@@ -69,7 +69,6 @@ asset.export(Label)
 
 asset.meta = {
   Name = Name,
-  Version = "1.0",
   Description = Description .. "Data provided by the National Oceanic and Atmospheric Administration",
   Author = "National Oceanic and Atmospheric Administration",
   URL = URL,
diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/forests.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/forests.asset
index 247e24cc8a..e1961f649a 100644
--- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/forests.asset
+++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/forests.asset
@@ -115,7 +115,6 @@ asset.export(Label1)
 
 asset.meta = {
   Name = Name,
-  Version = "1.0",
   Description = Description .. "Data provided by the National Oceanic and Atmospheric Administration",
   Author = "National Oceanic and Atmospheric Administration",
   URL = URL,
diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/geomag_tracklines.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/geomag_tracklines.asset
index 09ee921105..baf9fad4b8 100644
--- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/geomag_tracklines.asset
+++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/geomag_tracklines.asset
@@ -59,7 +59,6 @@ asset.export(Legend)
 
 asset.meta = {
   Name = Name,
-  Version = "1.0",
   Description = Description .. "Data provided by the National Oceanic and Atmospheric Administration",
   Author = "National Oceanic and Atmospheric Administration",
   URL = URL,
diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/global_vegetation.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/global_vegetation.asset
index dc5160079e..47a96ca740 100644
--- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/global_vegetation.asset
+++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/global_vegetation.asset
@@ -94,7 +94,6 @@ asset.export(Colorbar)
 
 asset.meta = {
   Name = Name,
-  Version = "1.0",
   Description = Description .. "Data provided by the National Oceanic and Atmospheric Administration",
   Author = "National Oceanic and Atmospheric Administration",
   URL = URL,
diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/gray_earth.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/gray_earth.asset
index ac082c385b..0e9f2eeef1 100644
--- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/gray_earth.asset
+++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/gray_earth.asset
@@ -56,7 +56,6 @@ asset.export(Layer)
 
 asset.meta = {
   Name = Name,
-  Version = "1.0",
   Description = Description .. "Data provided by the National Oceanic and Atmospheric Administration",
   Author = "National Oceanic and Atmospheric Administration",
   URL = URL,
diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/hot_topo.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/hot_topo.asset
index 39d1b0e9a7..1f9685a594 100644
--- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/hot_topo.asset
+++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/hot_topo.asset
@@ -55,7 +55,6 @@ asset.export(Layer)
 
 asset.meta = {
   Name = Name,
-  Version = "1.0",
   Description = Description .. "Data provided by the National Oceanic and Atmospheric Administration",
   Author = "National Oceanic and Atmospheric Administration",
   URL = URL,
diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/irsat_nightlights.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/irsat_nightlights.asset
index 6e0d823664..fab72dab51 100644
--- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/irsat_nightlights.asset
+++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/irsat_nightlights.asset
@@ -48,7 +48,6 @@ asset.export(Layer)
 
 asset.meta = {
   Name = Name,
-  Version = "1.0",
   Description = Description .. "Data provided by the National Oceanic and Atmospheric Administration",
   Author = "National Oceanic and Atmospheric Administration",
   URL = URL,
diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/japan_quake.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/japan_quake.asset
index c5d7bfbaad..24f4c6eada 100644
--- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/japan_quake.asset
+++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/japan_quake.asset
@@ -61,7 +61,6 @@ asset.export(Legend)
 
 asset.meta = {
   Name = Name,
-  Version = "1.0",
   Description = Description .. "Data provided by the National Oceanic and Atmospheric Administration",
   Author = "National Oceanic and Atmospheric Administration",
   URL = URL,
diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/koppen_climate-koppen_1901_2100.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/koppen_climate-koppen_1901_2100.asset
index cb5b63f4ab..137503a07d 100644
--- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/koppen_climate-koppen_1901_2100.asset
+++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/koppen_climate-koppen_1901_2100.asset
@@ -75,7 +75,6 @@ asset.export(Legend1)
 
 asset.meta = {
   Name = Name,
-  Version = "1.0",
   Description = Description .. "Data provided by the National Oceanic and Atmospheric Administration",
   Author = "National Oceanic and Atmospheric Administration",
   URL = URL,
diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/koppen_climate-koppen_2007.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/koppen_climate-koppen_2007.asset
index 2ea8111b99..e153e36a98 100644
--- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/koppen_climate-koppen_2007.asset
+++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/koppen_climate-koppen_2007.asset
@@ -73,7 +73,6 @@ asset.export(Legend1)
 
 asset.meta = {
   Name = Name,
-  Version = "1.0",
   Description = Description .. "Data provided by the National Oceanic and Atmospheric Administration",
   Author = "National Oceanic and Atmospheric Administration",
   URL = URL,
diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/land_cover-animation.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/land_cover-animation.asset
index cec63a922c..95e806ef55 100644
--- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/land_cover-animation.asset
+++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/land_cover-animation.asset
@@ -67,7 +67,6 @@ asset.export(Label)
 
 asset.meta = {
   Name = Name,
-  Version = "1.0",
   Description = Description .. "Data provided by the National Oceanic and Atmospheric Administration",
   Author = "National Oceanic and Atmospheric Administration",
   URL = URL,
diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/land_cover-ribbon.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/land_cover-ribbon.asset
index 8bf5373bb7..8f398f416d 100644
--- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/land_cover-ribbon.asset
+++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/land_cover-ribbon.asset
@@ -65,7 +65,6 @@ asset.export(Label)
 
 asset.meta = {
   Name = Name,
-  Version = "1.0",
   Description = Description .. "Data provided by the National Oceanic and Atmospheric Administration",
   Author = "National Oceanic and Atmospheric Administration",
   URL = URL,
diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/land_cover-slideshow.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/land_cover-slideshow.asset
index 190b6b4cb9..d2d87723c1 100644
--- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/land_cover-slideshow.asset
+++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/land_cover-slideshow.asset
@@ -95,7 +95,6 @@ end
 
 asset.meta = {
   Name = Name,
-  Version = "1.0",
   Description = Description .. "Data provided by the National Oceanic and Atmospheric Administration",
   Author = "National Oceanic and Atmospheric Administration",
   URL = URL,
diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/land_production-cropland_current.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/land_production-cropland_current.asset
index 33872d98d3..900da7410b 100644
--- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/land_production-cropland_current.asset
+++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/land_production-cropland_current.asset
@@ -71,7 +71,6 @@ asset.export(Legend)
 
 asset.meta = {
   Name = Name,
-  Version = "1.0",
   Description = Description .. "Data provided by the National Oceanic and Atmospheric Administration",
   Author = "National Oceanic and Atmospheric Administration",
   URL = URL,
diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/land_production-cropland_potential.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/land_production-cropland_potential.asset
index 5383a34f72..fcce8b086b 100644
--- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/land_production-cropland_potential.asset
+++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/land_production-cropland_potential.asset
@@ -70,7 +70,6 @@ asset.export(Legend)
 
 asset.meta = {
   Name = Name,
-  Version = "1.0",
   Description = Description .. "Data provided by the National Oceanic and Atmospheric Administration",
   Author = "National Oceanic and Atmospheric Administration",
   URL = URL,
diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/land_production-production_gap.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/land_production-production_gap.asset
index 3f72ff3dab..e4e1c5fbaa 100644
--- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/land_production-production_gap.asset
+++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/land_production-production_gap.asset
@@ -70,7 +70,6 @@ asset.export(Legend)
 
 asset.meta = {
   Name = Name,
-  Version = "1.0",
   Description = Description .. "Data provided by the National Oceanic and Atmospheric Administration",
   Author = "National Oceanic and Atmospheric Administration",
   URL = URL,
diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/land_ratio.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/land_ratio.asset
index 5f1e9590dc..3c7760e311 100644
--- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/land_ratio.asset
+++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/land_ratio.asset
@@ -43,7 +43,6 @@ asset.export(Layer)
 
 asset.meta = {
   Name = Name,
-  Version = "1.0",
   Description = Description .. "Data provided by the National Oceanic and Atmospheric Administration",
   Author = "National Oceanic and Atmospheric Administration",
   URL = URL,
diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/latitude_longitude.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/latitude_longitude.asset
index f9ae7b2e19..d342194268 100644
--- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/latitude_longitude.asset
+++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/latitude_longitude.asset
@@ -74,7 +74,6 @@ asset.export(LayerLongitude)
 
 asset.meta = {
   Name = Name,
-  Version = "1.0",
   Description = Description .. "Data provided by the National Oceanic and Atmospheric Administration",
   Author = "National Oceanic and Atmospheric Administration",
   URL = URL,
diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/magnetic_declination.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/magnetic_declination.asset
index 0bf85bb65a..71c91aa74d 100644
--- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/magnetic_declination.asset
+++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/magnetic_declination.asset
@@ -61,7 +61,6 @@ asset.export(Layer)
 
 asset.meta = {
   Name = Name,
-  Version = "1.0",
   Description = Description .. "Data provided by the National Oceanic and Atmospheric Administration",
   Author = "National Oceanic and Atmospheric Administration",
   URL = URL,
diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/nightsky.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/nightsky.asset
index d447b1cef8..c48eb6529d 100644
--- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/nightsky.asset
+++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/nightsky.asset
@@ -55,7 +55,6 @@ asset.export(Legend)
 
 asset.meta = {
   Name = Name,
-  Version = "1.0",
   Description = Description .. "Data provided by the National Oceanic and Atmospheric Administration",
   Author = "National Oceanic and Atmospheric Administration",
   URL = URL,
diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/nuclear_earthquake.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/nuclear_earthquake.asset
index 8a26e82de4..60930020eb 100644
--- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/nuclear_earthquake.asset
+++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/nuclear_earthquake.asset
@@ -107,7 +107,6 @@ asset.export(Legend)
 
 asset.meta = {
   Name = Name,
-  Version = "1.0",
   Description = Description .. "Data provided by the National Oceanic and Atmospheric Administration",
   Author = "National Oceanic and Atmospheric Administration",
   URL = URL,
diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/paleo_map.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/paleo_map.asset
index fab162bce6..24074a5ab5 100644
--- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/paleo_map.asset
+++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/paleo_map.asset
@@ -172,7 +172,6 @@ end
 
 asset.meta = {
   Name = Name,
-  Version = "1.0",
   Description = Description .. "Data provided by the National Oceanic and Atmospheric Administration",
   Author = "National Oceanic and Atmospheric Administration",
   URL = URL,
diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/paleo_overlays.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/paleo_overlays.asset
index 9bf8e8d6e8..a689b7057d 100644
--- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/paleo_overlays.asset
+++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/paleo_overlays.asset
@@ -117,7 +117,6 @@ asset.export(Legend)
 
 asset.meta = {
   Name = Name,
-  Version = "1.0",
   Description = Description .. "Data provided by the National Oceanic and Atmospheric Administration",
   Author = "National Oceanic and Atmospheric Administration",
   URL = URL,
diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/pantropical_biomass.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/pantropical_biomass.asset
index e0e8d94343..d5c82ca4d2 100644
--- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/pantropical_biomass.asset
+++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/pantropical_biomass.asset
@@ -57,7 +57,6 @@ asset.export(Legend)
 
 asset.meta = {
   Name = Name,
-  Version = "1.0",
   Description = Description .. "Data provided by the National Oceanic and Atmospheric Administration",
   Author = "National Oceanic and Atmospheric Administration",
   URL = URL,
diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/plate_movement.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/plate_movement.asset
index 1690adf10d..7ceb9e57fc 100644
--- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/plate_movement.asset
+++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/plate_movement.asset
@@ -69,7 +69,6 @@ asset.export(AgeScale)
 
 asset.meta = {
   Name = Name,
-  Version = "1.0",
   Description = Description .. "Data provided by the National Oceanic and Atmospheric Administration",
   Author = "National Oceanic and Atmospheric Administration",
   URL = URL,
diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/river_discharge_2010.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/river_discharge_2010.asset
index dbf531544a..c60482ea0b 100644
--- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/river_discharge_2010.asset
+++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/river_discharge_2010.asset
@@ -59,7 +59,6 @@ asset.export(Colorbar)
 
 asset.meta = {
   Name = Name,
-  Version = "1.0",
   Description = Description .. "Data provided by the National Oceanic and Atmospheric Administration",
   Author = "National Oceanic and Atmospheric Administration",
   URL = URL,
diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/sea_floor_age-iso_lines_yellow.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/sea_floor_age-iso_lines_yellow.asset
index af413d1972..9ddb359b25 100644
--- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/sea_floor_age-iso_lines_yellow.asset
+++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/sea_floor_age-iso_lines_yellow.asset
@@ -64,7 +64,6 @@ asset.export(Colorbar)
 
 asset.meta = {
   Name = Name,
-  Version = "1.0",
   Description = Description .. "Data provided by the National Oceanic and Atmospheric Administration",
   Author = "National Oceanic and Atmospheric Administration",
   URL = URL,
diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/sea_floor_age-shaded_veg.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/sea_floor_age-shaded_veg.asset
index 45f3eca8fc..12fe0a166e 100644
--- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/sea_floor_age-shaded_veg.asset
+++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/sea_floor_age-shaded_veg.asset
@@ -95,7 +95,6 @@ asset.export(Colorbar)
 
 asset.meta = {
   Name = Name,
-  Version = "1.0",
   Description = Description .. "Data provided by the National Oceanic and Atmospheric Administration",
   Author = "National Oceanic and Atmospheric Administration",
   URL = URL,
diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/sea_floor_age-topo.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/sea_floor_age-topo.asset
index 32e8f9f241..895de97d27 100644
--- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/sea_floor_age-topo.asset
+++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/sea_floor_age-topo.asset
@@ -84,7 +84,6 @@ asset.export(Colorbar)
 
 asset.meta = {
   Name = Name,
-  Version = "1.0",
   Description = Description .. "Data provided by the National Oceanic and Atmospheric Administration",
   Author = "National Oceanic and Atmospheric Administration",
   URL = URL,
diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/seismic_waves-1994northridge.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/seismic_waves-1994northridge.asset
index e0ab953aef..e261cfbcd2 100644
--- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/seismic_waves-1994northridge.asset
+++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/seismic_waves-1994northridge.asset
@@ -87,7 +87,6 @@ asset.export(Pips)
 
 asset.meta = {
   Name = Name,
-  Version = "1.0",
   Description = Description .. "Data provided by the National Oceanic and Atmospheric Administration",
   Author = "National Oceanic and Atmospheric Administration",
   URL = URL,
diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/species_richness-amphibians.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/species_richness-amphibians.asset
index 3b15ea072a..6d4584dd6b 100644
--- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/species_richness-amphibians.asset
+++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/species_richness-amphibians.asset
@@ -69,7 +69,6 @@ asset.export(Labels)
 
 asset.meta = {
   Name = Name,
-  Version = "1.0",
   Description = Description .. "Data provided by the National Oceanic and Atmospheric Administration",
   Author = "National Oceanic and Atmospheric Administration",
   URL = URL,
diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/species_richness-amphibians_threatened.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/species_richness-amphibians_threatened.asset
index a11783eb8d..ec2a284f7f 100644
--- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/species_richness-amphibians_threatened.asset
+++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/species_richness-amphibians_threatened.asset
@@ -69,7 +69,6 @@ asset.export(Labels)
 
 asset.meta = {
   Name = Name,
-  Version = "1.0",
   Description = Description .. "Data provided by the National Oceanic and Atmospheric Administration",
   Author = "National Oceanic and Atmospheric Administration",
   URL = URL,
diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/species_richness-birds.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/species_richness-birds.asset
index 60011ed489..2bb1e8e382 100644
--- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/species_richness-birds.asset
+++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/species_richness-birds.asset
@@ -69,7 +69,6 @@ asset.export(Labels)
 
 asset.meta = {
   Name = Name,
-  Version = "1.0",
   Description = Description .. "Data provided by the National Oceanic and Atmospheric Administration",
   Author = "National Oceanic and Atmospheric Administration",
   URL = URL,
diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/species_richness-birds_threatened.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/species_richness-birds_threatened.asset
index 53381d4d05..4e72175a83 100644
--- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/species_richness-birds_threatened.asset
+++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/species_richness-birds_threatened.asset
@@ -69,7 +69,6 @@ asset.export(Labels)
 
 asset.meta = {
   Name = Name,
-  Version = "1.0",
   Description = Description .. "Data provided by the National Oceanic and Atmospheric Administration",
   Author = "National Oceanic and Atmospheric Administration",
   URL = URL,
diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/species_richness-mammals.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/species_richness-mammals.asset
index a69b1bcd3d..bf05374ef3 100644
--- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/species_richness-mammals.asset
+++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/species_richness-mammals.asset
@@ -69,7 +69,6 @@ asset.export(Labels)
 
 asset.meta = {
   Name = Name,
-  Version = "1.0",
   Description = Description .. "Data provided by the National Oceanic and Atmospheric Administration",
   Author = "National Oceanic and Atmospheric Administration",
   URL = URL,
diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/species_richness-mammals_threatened.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/species_richness-mammals_threatened.asset
index 3d192f65a3..1569b5dd83 100644
--- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/species_richness-mammals_threatened.asset
+++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/species_richness-mammals_threatened.asset
@@ -69,7 +69,6 @@ asset.export(Labels)
 
 asset.meta = {
   Name = Name,
-  Version = "1.0",
   Description = Description .. "Data provided by the National Oceanic and Atmospheric Administration",
   Author = "National Oceanic and Atmospheric Administration",
   URL = URL,
diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/surface_temperature.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/surface_temperature.asset
index 38867b7f4c..803654fdf2 100644
--- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/surface_temperature.asset
+++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/surface_temperature.asset
@@ -76,7 +76,6 @@ asset.export(Colorbar2)
 
 asset.meta = {
   Name = Name,
-  Version = "1.0",
   Description = Description .. "Data provided by the National Oceanic and Atmospheric Administration",
   Author = "National Oceanic and Atmospheric Administration",
   URL = URL,
diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/top_quakes.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/top_quakes.asset
index 09f435dd2f..ab9421958a 100644
--- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/top_quakes.asset
+++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/top_quakes.asset
@@ -53,7 +53,6 @@ asset.export(Layer)
 
 asset.meta = {
   Name = Name,
-  Version = "1.0",
   Description = Description .. "Data provided by the National Oceanic and Atmospheric Administration",
   Author = "National Oceanic and Atmospheric Administration",
   URL = URL,
diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/volcanoes-eruptions.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/volcanoes-eruptions.asset
index dc6fe190ad..1227f37c14 100644
--- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/volcanoes-eruptions.asset
+++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/volcanoes-eruptions.asset
@@ -62,7 +62,6 @@ asset.export(Layer)
 
 asset.meta = {
   Name = Name,
-  Version = "1.0",
   Description = Description .. "Data provided by the National Oceanic and Atmospheric Administration",
   Author = "National Oceanic and Atmospheric Administration",
   URL = URL,
diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/volcanoes-global_volcanoes.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/volcanoes-global_volcanoes.asset
index d61432d581..77685f5ce7 100644
--- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/volcanoes-global_volcanoes.asset
+++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/volcanoes-global_volcanoes.asset
@@ -63,7 +63,6 @@ asset.export(Layer)
 
 asset.meta = {
   Name = Name,
-  Version = "1.0",
   Description = Description .. "Data provided by the National Oceanic and Atmospheric Administration",
   Author = "National Oceanic and Atmospheric Administration",
   URL = URL,
diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/volcanoes-tsunami.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/volcanoes-tsunami.asset
index 8395c824f3..92b5f7dcbb 100644
--- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/volcanoes-tsunami.asset
+++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/volcanoes-tsunami.asset
@@ -63,7 +63,6 @@ asset.export(Layer)
 
 asset.meta = {
   Name = Name,
-  Version = "1.0",
   Description = Description .. "Data provided by the National Oceanic and Atmospheric Administration",
   Author = "National Oceanic and Atmospheric Administration",
   URL = URL,
diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/models/bm10000.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/models/bm10000.asset
index 261be125ae..ae7f351eb6 100644
--- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/models/bm10000.asset
+++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/models/bm10000.asset
@@ -70,7 +70,6 @@ asset.export(Layer)
 
 asset.meta = {
   Name = Name,
-  Version = "1.0",
   Description = Description .. "Data provided by the National Oceanic and Atmospheric Administration",
   Author = "National Oceanic and Atmospheric Administration",
   URL = URL,
diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/models/gfdl_seaice.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/models/gfdl_seaice.asset
index 514f49d82f..94f329b6c6 100644
--- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/models/gfdl_seaice.asset
+++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/models/gfdl_seaice.asset
@@ -68,7 +68,6 @@ asset.export(Colorbar)
 
 asset.meta = {
   Name = Name,
-  Version = "1.0",
   Description = Description .. "Data provided by the National Oceanic and Atmospheric Administration",
   Author = "National Oceanic and Atmospheric Administration",
   URL = URL,
diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/models/ipcc_temp-ccsm-a1b.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/models/ipcc_temp-ccsm-a1b.asset
index 6d4507eb74..a1a08c1eee 100644
--- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/models/ipcc_temp-ccsm-a1b.asset
+++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/models/ipcc_temp-ccsm-a1b.asset
@@ -66,7 +66,6 @@ asset.export(Colorbar)
 
 asset.meta = {
   Name = Name,
-  Version = "1.0",
   Description = Description .. "Data provided by the National Oceanic and Atmospheric Administration",
   Author = "National Oceanic and Atmospheric Administration",
   URL = URL,
diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/models/ipcc_temp-ccsm-b1.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/models/ipcc_temp-ccsm-b1.asset
index 92120d03e7..9188d61390 100644
--- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/models/ipcc_temp-ccsm-b1.asset
+++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/models/ipcc_temp-ccsm-b1.asset
@@ -66,7 +66,6 @@ asset.export(Colorbar)
 
 asset.meta = {
   Name = Name,
-  Version = "1.0",
   Description = Description .. "Data provided by the National Oceanic and Atmospheric Administration",
   Author = "National Oceanic and Atmospheric Administration",
   URL = URL,
diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/models/ipcc_temp-compare.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/models/ipcc_temp-compare.asset
index ae7bcb0304..4f298a6ad6 100644
--- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/models/ipcc_temp-compare.asset
+++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/models/ipcc_temp-compare.asset
@@ -86,7 +86,6 @@ asset.export(Colorbar)
 
 asset.meta = {
   Name = Name,
-  Version = "1.0",
   Description = Description .. "Data provided by the National Oceanic and Atmospheric Administration",
   Author = "National Oceanic and Atmospheric Administration",
   URL = URL,
diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/models/ipcc_temp-gfdl-a1b.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/models/ipcc_temp-gfdl-a1b.asset
index 3695d2c735..050c1ae37c 100644
--- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/models/ipcc_temp-gfdl-a1b.asset
+++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/models/ipcc_temp-gfdl-a1b.asset
@@ -66,7 +66,6 @@ asset.export(Colorbar)
 
 asset.meta = {
   Name = Name,
-  Version = "1.0",
   Description = Description .. "Data provided by the National Oceanic and Atmospheric Administration",
   Author = "National Oceanic and Atmospheric Administration",
   URL = URL,
diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/models/ipcc_temp-gfdl-b1.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/models/ipcc_temp-gfdl-b1.asset
index a0688dcff3..96ac76878c 100644
--- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/models/ipcc_temp-gfdl-b1.asset
+++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/models/ipcc_temp-gfdl-b1.asset
@@ -66,7 +66,6 @@ asset.export(Colorbar)
 
 asset.meta = {
   Name = Name,
-  Version = "1.0",
   Description = Description .. "Data provided by the National Oceanic and Atmospheric Administration",
   Author = "National Oceanic and Atmospheric Administration",
   URL = URL,
diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/models/ipcc_temp-had-a1b.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/models/ipcc_temp-had-a1b.asset
index 08c4d13a1e..2e507b05ec 100644
--- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/models/ipcc_temp-had-a1b.asset
+++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/models/ipcc_temp-had-a1b.asset
@@ -66,7 +66,6 @@ asset.export(Colorbar)
 
 asset.meta = {
   Name = Name,
-  Version = "1.0",
   Description = Description .. "Data provided by the National Oceanic and Atmospheric Administration",
   Author = "National Oceanic and Atmospheric Administration",
   URL = URL,
diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/models/ipcc_temp-had-b1.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/models/ipcc_temp-had-b1.asset
index 8e676efa6a..2aeabf4af2 100644
--- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/models/ipcc_temp-had-b1.asset
+++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/models/ipcc_temp-had-b1.asset
@@ -66,7 +66,6 @@ asset.export(Colorbar)
 
 asset.meta = {
   Name = Name,
-  Version = "1.0",
   Description = Description .. "Data provided by the National Oceanic and Atmospheric Administration",
   Author = "National Oceanic and Atmospheric Administration",
   URL = URL,
diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/models/rcp-ga26.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/models/rcp-ga26.asset
index 8d3df42d77..82fac47aba 100644
--- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/models/rcp-ga26.asset
+++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/models/rcp-ga26.asset
@@ -63,7 +63,6 @@ asset.export(Colorbar)
 
 asset.meta = {
   Name = Name,
-  Version = "1.0",
   Description = Description .. "Data provided by the National Oceanic and Atmospheric Administration",
   Author = "National Oceanic and Atmospheric Administration",
   URL = URL,
diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/models/rcp-ga45.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/models/rcp-ga45.asset
index b84d68b0b5..9fa05cd688 100644
--- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/models/rcp-ga45.asset
+++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/models/rcp-ga45.asset
@@ -63,7 +63,6 @@ asset.export(Colorbar)
 
 asset.meta = {
   Name = Name,
-  Version = "1.0",
   Description = Description .. "Data provided by the National Oceanic and Atmospheric Administration",
   Author = "National Oceanic and Atmospheric Administration",
   URL = URL,
diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/models/rcp-ga60.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/models/rcp-ga60.asset
index 13a9edeb60..479883ee48 100644
--- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/models/rcp-ga60.asset
+++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/models/rcp-ga60.asset
@@ -63,7 +63,6 @@ asset.export(Colorbar)
 
 asset.meta = {
   Name = Name,
-  Version = "1.0",
   Description = Description .. "Data provided by the National Oceanic and Atmospheric Administration",
   Author = "National Oceanic and Atmospheric Administration",
   URL = URL,
diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/models/rcp-ga85.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/models/rcp-ga85.asset
index b14201d775..92d10a17be 100644
--- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/models/rcp-ga85.asset
+++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/models/rcp-ga85.asset
@@ -63,7 +63,6 @@ asset.export(Colorbar)
 
 asset.meta = {
   Name = Name,
-  Version = "1.0",
   Description = Description .. "Data provided by the National Oceanic and Atmospheric Administration",
   Author = "National Oceanic and Atmospheric Administration",
   URL = URL,
diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/models/ukmet-a1b.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/models/ukmet-a1b.asset
index 957fee526b..4ba8001155 100644
--- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/models/ukmet-a1b.asset
+++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/models/ukmet-a1b.asset
@@ -72,7 +72,6 @@ asset.export(Colorbar)
 
 asset.meta = {
   Name = Name,
-  Version = "1.0",
   Description = Description .. "Data provided by the National Oceanic and Atmospheric Administration",
   Author = "National Oceanic and Atmospheric Administration",
   URL = URL,
diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/models/ukmet-e1.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/models/ukmet-e1.asset
index 6964547d64..6eb54e5f03 100644
--- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/models/ukmet-e1.asset
+++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/models/ukmet-e1.asset
@@ -71,7 +71,6 @@ asset.export(Colorbar)
 
 asset.meta = {
   Name = Name,
-  Version = "1.0",
   Description = Description .. "Data provided by the National Oceanic and Atmospheric Administration",
   Author = "National Oceanic and Atmospheric Administration",
   URL = URL,
diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/2009_ice_animation.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/2009_ice_animation.asset
index 5b70e6680a..945f38a306 100644
--- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/2009_ice_animation.asset
+++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/2009_ice_animation.asset
@@ -91,7 +91,6 @@ asset.export(Colorbar2009IceConcentration)
 
 asset.meta = {
   Name = Name,
-  Version = "1.0",
   Description = Description .. "Data provided by the National Oceanic and Atmospheric Administration",
   Author = "National Oceanic and Atmospheric Administration",
   URL = URL,
diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/6m_sea_level_rise-black.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/6m_sea_level_rise-black.asset
index 880949557c..93731c3792 100644
--- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/6m_sea_level_rise-black.asset
+++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/6m_sea_level_rise-black.asset
@@ -118,7 +118,6 @@ asset.export(Layer6m)
 
 asset.meta = {
   Name = Name,
-  Version = "1.0",
   Description = Description .. "Data provided by the National Oceanic and Atmospheric Administration",
   Author = "National Oceanic and Atmospheric Administration",
   URL = URL,
diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/6m_sea_level_rise-red.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/6m_sea_level_rise-red.asset
index 10ceb2d4ef..5ba6beb8f1 100644
--- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/6m_sea_level_rise-red.asset
+++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/6m_sea_level_rise-red.asset
@@ -118,7 +118,6 @@ asset.export(Layer6m)
 
 asset.meta = {
   Name = Name,
-  Version = "1.0",
   Description = Description .. "Data provided by the National Oceanic and Atmospheric Administration",
   Author = "National Oceanic and Atmospheric Administration",
   URL = URL,
diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/animal_tracking.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/animal_tracking.asset
index 238dbbb2d9..f3b485e285 100644
--- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/animal_tracking.asset
+++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/animal_tracking.asset
@@ -68,7 +68,6 @@ asset.export(Colorbar)
 
 asset.meta = {
   Name = Name,
-  Version = "1.0",
   Description = Description .. "Data provided by the National Oceanic and Atmospheric Administration",
   Author = "National Oceanic and Atmospheric Administration",
   URL = URL,
diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/argo_buoy_tracks.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/argo_buoy_tracks.asset
index df917f60fa..19d720c621 100644
--- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/argo_buoy_tracks.asset
+++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/argo_buoy_tracks.asset
@@ -64,7 +64,6 @@ asset.export(Buoy)
 
 asset.meta = {
   Name = Name,
-  Version = "1.0",
   Description = Description .. "Data provided by the National Oceanic and Atmospheric Administration",
   Author = "National Oceanic and Atmospheric Administration",
   URL = URL,
diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/argo_buoy_waterfall.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/argo_buoy_waterfall.asset
index 2c64592771..de1ae9af94 100644
--- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/argo_buoy_waterfall.asset
+++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/argo_buoy_waterfall.asset
@@ -51,7 +51,6 @@ asset.export(Layer)
 
 asset.meta = {
   Name = Name,
-  Version = "1.0",
   Description = Description .. "Data provided by the National Oceanic and Atmospheric Administration",
   Author = "National Oceanic and Atmospheric Administration",
   URL = URL,
diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/atl_turtle.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/atl_turtle.asset
index c977b12d11..ed3e4dd0e2 100644
--- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/atl_turtle.asset
+++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/atl_turtle.asset
@@ -57,7 +57,6 @@ asset.export(Layer)
 
 asset.meta = {
   Name = Name,
-  Version = "1.0",
   Description = Description .. "Data provided by the National Oceanic and Atmospheric Administration",
   Author = "National Oceanic and Atmospheric Administration",
   URL = URL,
diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/buoy_locations.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/buoy_locations.asset
index 096ff91a7a..d1214ef112 100644
--- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/buoy_locations.asset
+++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/buoy_locations.asset
@@ -59,7 +59,6 @@ asset.export(Colorbar)
 
 asset.meta = {
   Name = Name,
-  Version = "1.0",
   Description = Description .. "Data provided by the National Oceanic and Atmospheric Administration",
   Author = "National Oceanic and Atmospheric Administration",
   URL = URL,
diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/catch_model.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/catch_model.asset
index 3401ad81bd..7fd9dbc737 100644
--- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/catch_model.asset
+++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/catch_model.asset
@@ -63,7 +63,6 @@ asset.export(Colorbar)
 
 asset.meta = {
   Name = Name,
-  Version = "1.0",
   Description = Description .. "Data provided by the National Oceanic and Atmospheric Administration",
   Author = "National Oceanic and Atmospheric Administration",
   URL = URL,
diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/chlorophyll_model.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/chlorophyll_model.asset
index 5b63c028a5..c238c1e187 100644
--- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/chlorophyll_model.asset
+++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/chlorophyll_model.asset
@@ -66,7 +66,6 @@ asset.export(Colorbar)
 
 asset.meta = {
   Name = Name,
-  Version = "1.0",
   Description = Description .. "Data provided by the National Oceanic and Atmospheric Administration",
   Author = "National Oceanic and Atmospheric Administration",
   URL = URL,
diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/currents.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/currents.asset
index c3c364b291..a85b18b6fc 100644
--- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/currents.asset
+++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/currents.asset
@@ -66,7 +66,6 @@ asset.export(Legend)
 
 asset.meta = {
   Name = Name,
-  Version = "1.0",
   Description = Description .. "Data provided by the National Oceanic and Atmospheric Administration",
   Author = "National Oceanic and Atmospheric Administration",
   URL = URL,
diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/dart_buoy.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/dart_buoy.asset
index ce102dd17d..b246e3bffd 100644
--- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/dart_buoy.asset
+++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/dart_buoy.asset
@@ -48,7 +48,6 @@ asset.export(Layer)
 
 asset.meta = {
   Name = Name,
-  Version = "1.0",
   Description = Description .. "Data provided by the National Oceanic and Atmospheric Administration",
   Author = "National Oceanic and Atmospheric Administration",
   URL = URL,
diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/ecco2_sst-gray_land.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/ecco2_sst-gray_land.asset
index f7ebdbf583..21997b7a06 100644
--- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/ecco2_sst-gray_land.asset
+++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/ecco2_sst-gray_land.asset
@@ -67,7 +67,6 @@ asset.export(Colorbar)
 
 asset.meta = {
   Name = Name,
-  Version = "1.0",
   Description = Description .. "Data provided by the National Oceanic and Atmospheric Administration",
   Author = "National Oceanic and Atmospheric Administration",
   URL = URL,
diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/ecco2_sst-veg_land.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/ecco2_sst-veg_land.asset
index 79360abdc0..8eae383ca6 100644
--- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/ecco2_sst-veg_land.asset
+++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/ecco2_sst-veg_land.asset
@@ -67,7 +67,6 @@ asset.export(Colorbar)
 
 asset.meta = {
   Name = Name,
-  Version = "1.0",
   Description = Description .. "Data provided by the National Oceanic and Atmospheric Administration",
   Author = "National Oceanic and Atmospheric Administration",
   URL = URL,
diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/elnino.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/elnino.asset
index 7277b813c5..6af66beb95 100644
--- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/elnino.asset
+++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/elnino.asset
@@ -80,7 +80,6 @@ asset.export(LayerLaninaWinter)
 
 asset.meta = {
   Name = Name,
-  Version = "1.0",
   Description = Description .. "Data provided by the National Oceanic and Atmospheric Administration",
   Author = "National Oceanic and Atmospheric Administration",
   URL = URL,
diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/gfdl_sst-black_background.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/gfdl_sst-black_background.asset
index c4d7032bad..aa096e2ce0 100644
--- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/gfdl_sst-black_background.asset
+++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/gfdl_sst-black_background.asset
@@ -68,7 +68,6 @@ asset.export(Colorbar)
 
 asset.meta = {
   Name = Name,
-  Version = "1.0",
   Description = Description .. "Data provided by the National Oceanic and Atmospheric Administration",
   Author = "National Oceanic and Atmospheric Administration",
   URL = URL,
diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/gfdl_sst-land_background.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/gfdl_sst-land_background.asset
index 8690e15dfe..c15a4c2652 100644
--- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/gfdl_sst-land_background.asset
+++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/gfdl_sst-land_background.asset
@@ -68,7 +68,6 @@ asset.export(Colorbar)
 
 asset.meta = {
   Name = Name,
-  Version = "1.0",
   Description = Description .. "Data provided by the National Oceanic and Atmospheric Administration",
   Author = "National Oceanic and Atmospheric Administration",
   URL = URL,
diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/greenland_melt.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/greenland_melt.asset
index dcc9ca0c44..dc3a3003f1 100644
--- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/greenland_melt.asset
+++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/greenland_melt.asset
@@ -57,7 +57,6 @@ asset.export(Layer)
 
 asset.meta = {
   Name = Name,
-  Version = "1.0",
   Description = Description .. "Data provided by the National Oceanic and Atmospheric Administration",
   Author = "National Oceanic and Atmospheric Administration",
   URL = URL,
diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/japan_tsunami.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/japan_tsunami.asset
index d3b235a96b..0b4e99bf21 100644
--- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/japan_tsunami.asset
+++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/japan_tsunami.asset
@@ -46,7 +46,6 @@ asset.export(Layer)
 
 asset.meta = {
   Name = Name,
-  Version = "1.0",
   Description = Description .. "Data provided by the National Oceanic and Atmospheric Administration",
   Author = "National Oceanic and Atmospheric Administration",
   URL = URL,
diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/japan_tsunami_waves.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/japan_tsunami_waves.asset
index 8c55e98efd..b6024b7b58 100644
--- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/japan_tsunami_waves.asset
+++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/japan_tsunami_waves.asset
@@ -54,7 +54,6 @@ asset.export(Layer)
 
 asset.meta = {
   Name = Name,
-  Version = "1.0",
   Description = Description .. "Data provided by the National Oceanic and Atmospheric Administration",
   Author = "National Oceanic and Atmospheric Administration",
   URL = URL,
diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/loggerheadseaturtletracks.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/loggerheadseaturtletracks.asset
index c4cd067b9c..0bbf8a474a 100644
--- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/loggerheadseaturtletracks.asset
+++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/loggerheadseaturtletracks.asset
@@ -51,7 +51,6 @@ asset.export(Layer)
 
 asset.meta = {
   Name = Name,
-  Version = "1.0",
   Description = Description .. "Data provided by the National Oceanic and Atmospheric Administration",
   Author = "National Oceanic and Atmospheric Administration",
   URL = URL,
diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/marine_impacts.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/marine_impacts.asset
index 72c8afe53b..d2e527bcdc 100644
--- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/marine_impacts.asset
+++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/marine_impacts.asset
@@ -75,7 +75,6 @@ asset.export(ColorbarHumanImpact)
 
 asset.meta = {
   Name = Name,
-  Version = "1.0",
   Description = Description .. "Data provided by the National Oceanic and Atmospheric Administration",
   Author = "National Oceanic and Atmospheric Administration",
   URL = URL,
diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/marine_life_tracking.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/marine_life_tracking.asset
index 49e9adf597..d5f0c7320f 100644
--- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/marine_life_tracking.asset
+++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/marine_life_tracking.asset
@@ -59,7 +59,6 @@ asset.export(Legend)
 
 asset.meta = {
   Name = Name,
-  Version = "1.0",
   Description = Description .. "Data provided by the National Oceanic and Atmospheric Administration",
   Author = "National Oceanic and Atmospheric Administration",
   URL = URL,
diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/mexico_turtles_947293.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/mexico_turtles_947293.asset
index ee9bf77e55..c5449eb11b 100644
--- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/mexico_turtles_947293.asset
+++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/mexico_turtles_947293.asset
@@ -56,7 +56,6 @@ asset.export(Layer)
 
 asset.meta = {
   Name = Name,
-  Version = "1.0",
   Description = Description .. "Data provided by the National Oceanic and Atmospheric Administration",
   Author = "National Oceanic and Atmospheric Administration",
   URL = URL,
diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/mexico_turtles_958002.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/mexico_turtles_958002.asset
index 1de5ffb2fa..e0c4bfd902 100644
--- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/mexico_turtles_958002.asset
+++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/mexico_turtles_958002.asset
@@ -56,7 +56,6 @@ asset.export(Layer)
 
 asset.meta = {
   Name = Name,
-  Version = "1.0",
   Description = Description .. "Data provided by the National Oceanic and Atmospheric Administration",
   Author = "National Oceanic and Atmospheric Administration",
   URL = URL,
diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/modis_sst.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/modis_sst.asset
index 44277a47ef..e4b6c46758 100644
--- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/modis_sst.asset
+++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/modis_sst.asset
@@ -49,7 +49,6 @@ asset.export(Layer)
 
 asset.meta = {
   Name = Name,
-  Version = "1.0",
   Description = Description .. "Data provided by the National Oceanic and Atmospheric Administration",
   Author = "National Oceanic and Atmospheric Administration",
   URL = URL,
diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/nasa_speed.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/nasa_speed.asset
index e5b7f9fe57..b15af33475 100644
--- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/nasa_speed.asset
+++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/nasa_speed.asset
@@ -49,7 +49,6 @@ asset.export(Layer)
 
 asset.meta = {
   Name = Name,
-  Version = "1.0",
   Description = Description .. "Data provided by the National Oceanic and Atmospheric Administration",
   Author = "National Oceanic and Atmospheric Administration",
   URL = URL,
diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/nasa_sst.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/nasa_sst.asset
index 9c254f1ff4..47604c08cd 100644
--- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/nasa_sst.asset
+++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/nasa_sst.asset
@@ -47,7 +47,6 @@ asset.export(Layer)
 
 asset.meta = {
   Name = Name,
-  Version = "1.0",
   Description = Description .. "Data provided by the National Oceanic and Atmospheric Administration",
   Author = "National Oceanic and Atmospheric Administration",
   URL = URL,
diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/ocean_acid-co2_flux.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/ocean_acid-co2_flux.asset
index f1749139f5..e91c932a63 100644
--- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/ocean_acid-co2_flux.asset
+++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/ocean_acid-co2_flux.asset
@@ -65,7 +65,6 @@ asset.export(Colorbar)
 
 asset.meta = {
   Name = Name,
-  Version = "1.0",
   Description = Description .. "Data provided by the National Oceanic and Atmospheric Administration",
   Author = "National Oceanic and Atmospheric Administration",
   URL = URL,
diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/ocean_acid-ph.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/ocean_acid-ph.asset
index 64ca9c54a2..a51bf0fbc2 100644
--- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/ocean_acid-ph.asset
+++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/ocean_acid-ph.asset
@@ -68,7 +68,6 @@ asset.export(Colorbar)
 
 asset.meta = {
   Name = Name,
-  Version = "1.0",
   Description = Description .. "Data provided by the National Oceanic and Atmospheric Administration",
   Author = "National Oceanic and Atmospheric Administration",
   URL = URL,
diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/ocean_acid-saturation.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/ocean_acid-saturation.asset
index a845758ee6..13a305e2d1 100644
--- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/ocean_acid-saturation.asset
+++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/ocean_acid-saturation.asset
@@ -84,7 +84,6 @@ asset.export(Colorbar)
 
 asset.meta = {
   Name = Name,
-  Version = "1.0",
   Description = Description .. "Data provided by the National Oceanic and Atmospheric Administration",
   Author = "National Oceanic and Atmospheric Administration",
   URL = URL,
diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/ocean_depths_temp.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/ocean_depths_temp.asset
index ae2fcc4b41..be2cbaf546 100644
--- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/ocean_depths_temp.asset
+++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/ocean_depths_temp.asset
@@ -78,7 +78,6 @@ asset.export(Colorbar)
 
 asset.meta = {
   Name = Name,
-  Version = "1.0",
   Description = Description .. "Data provided by the National Oceanic and Atmospheric Administration",
   Author = "National Oceanic and Atmospheric Administration",
   URL = URL,
diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/ocean_drain-gray.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/ocean_drain-gray.asset
index d89a7467c9..3c516966fa 100644
--- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/ocean_drain-gray.asset
+++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/ocean_drain-gray.asset
@@ -47,7 +47,6 @@ asset.export(Layer)
 
 asset.meta = {
   Name = Name,
-  Version = "1.0",
   Description = Description .. "Data provided by the National Oceanic and Atmospheric Administration",
   Author = "National Oceanic and Atmospheric Administration",
   URL = URL,
diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/pac_turtle.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/pac_turtle.asset
index 80a958ef74..ea88c6e26d 100644
--- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/pac_turtle.asset
+++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/pac_turtle.asset
@@ -54,7 +54,6 @@ asset.export(Layer)
 
 asset.meta = {
   Name = Name,
-  Version = "1.0",
   Description = Description .. "Data provided by the National Oceanic and Atmospheric Administration",
   Author = "National Oceanic and Atmospheric Administration",
   URL = URL,
diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/phytoplankton.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/phytoplankton.asset
index 1d4c398009..5a91e64ad1 100644
--- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/phytoplankton.asset
+++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/phytoplankton.asset
@@ -67,7 +67,6 @@ asset.export(Colorbar)
 
 asset.meta = {
   Name = Name,
-  Version = "1.0",
   Description = Description .. "Data provided by the National Oceanic and Atmospheric Administration",
   Author = "National Oceanic and Atmospheric Administration",
   URL = URL,
diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/pr_tsunami.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/pr_tsunami.asset
index 2493273bb2..5f97237cee 100644
--- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/pr_tsunami.asset
+++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/pr_tsunami.asset
@@ -50,7 +50,6 @@ asset.export(Layer)
 
 asset.meta = {
   Name = Name,
-  Version = "1.0",
   Description = Description .. "Data provided by the National Oceanic and Atmospheric Administration",
   Author = "National Oceanic and Atmospheric Administration",
   URL = URL,
diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/reefs_risk.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/reefs_risk.asset
index eb24d8a48e..a3d0d78689 100644
--- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/reefs_risk.asset
+++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/reefs_risk.asset
@@ -90,7 +90,6 @@ asset.export(Legend)
 
 asset.meta = {
   Name = Name,
-  Version = "1.0",
   Description = Description .. "Data provided by the National Oceanic and Atmospheric Administration",
   Author = "National Oceanic and Atmospheric Administration",
   URL = URL,
diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/sea_level.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/sea_level.asset
index ae542a92f3..b1ab3bef08 100644
--- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/sea_level.asset
+++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/sea_level.asset
@@ -55,7 +55,6 @@ asset.export(Layer)
 
 asset.meta = {
   Name = Name,
-  Version = "1.0",
   Description = Description .. "Data provided by the National Oceanic and Atmospheric Administration",
   Author = "National Oceanic and Atmospheric Administration",
   URL = URL,
diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/sea_level_trends.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/sea_level_trends.asset
index 657a9ddef1..187bb039c5 100644
--- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/sea_level_trends.asset
+++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/sea_level_trends.asset
@@ -68,7 +68,6 @@ asset.export(Colorbar)
 
 asset.meta = {
   Name = Name,
-  Version = "1.0",
   Description = Description .. "Data provided by the National Oceanic and Atmospheric Administration",
   Author = "National Oceanic and Atmospheric Administration",
   URL = URL,
diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/sea_surface_height_anomaly.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/sea_surface_height_anomaly.asset
index 2ae624f864..4822fd8bdc 100644
--- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/sea_surface_height_anomaly.asset
+++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/sea_surface_height_anomaly.asset
@@ -65,7 +65,6 @@ asset.export(Colorbar)
 
 asset.meta = {
   Name = Name,
-  Version = "1.0",
   Description = Description .. "Data provided by the National Oceanic and Atmospheric Administration",
   Author = "National Oceanic and Atmospheric Administration",
   URL = URL,
diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/seaice_monthly.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/seaice_monthly.asset
index 243aef7d89..3d7c79674b 100644
--- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/seaice_monthly.asset
+++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/seaice_monthly.asset
@@ -55,7 +55,6 @@ asset.export(Layer)
 
 asset.meta = {
   Name = Name,
-  Version = "1.0",
   Description = Description .. "Data provided by the National Oceanic and Atmospheric Administration",
   Author = "National Oceanic and Atmospheric Administration",
   URL = URL,
diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/seaice_radiation.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/seaice_radiation.asset
index d3f261f577..2f0d961e3f 100644
--- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/seaice_radiation.asset
+++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/seaice_radiation.asset
@@ -55,7 +55,6 @@ asset.export(LayerSolar)
 
 asset.meta = {
   Name = Name,
-  Version = "1.0",
   Description = Description .. "Data provided by the National Oceanic and Atmospheric Administration",
   Author = "National Oceanic and Atmospheric Administration",
   URL = URL,
diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/seawifs-land_background.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/seawifs-land_background.asset
index 089e6046fd..a74314bd58 100644
--- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/seawifs-land_background.asset
+++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/seawifs-land_background.asset
@@ -57,7 +57,6 @@ asset.export(Colorbar)
 
 asset.meta = {
   Name = Name,
-  Version = "1.0",
   Description = Description .. "Data provided by the National Oceanic and Atmospheric Administration",
   Author = "National Oceanic and Atmospheric Administration",
   URL = URL,
diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/seawifs-no_holes.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/seawifs-no_holes.asset
index 519f7c7b11..62aa8f48e7 100644
--- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/seawifs-no_holes.asset
+++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/seawifs-no_holes.asset
@@ -58,7 +58,6 @@ asset.export(Colorbar)
 
 asset.meta = {
   Name = Name,
-  Version = "1.0",
   Description = Description .. "Data provided by the National Oceanic and Atmospheric Administration",
   Author = "National Oceanic and Atmospheric Administration",
   URL = URL,
diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/seawifs-polar_holes.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/seawifs-polar_holes.asset
index 21a8f989ea..3332d03a20 100644
--- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/seawifs-polar_holes.asset
+++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/seawifs-polar_holes.asset
@@ -58,7 +58,6 @@ asset.export(Colorbar)
 
 asset.meta = {
   Name = Name,
-  Version = "1.0",
   Description = Description .. "Data provided by the National Oceanic and Atmospheric Administration",
   Author = "National Oceanic and Atmospheric Administration",
   URL = URL,
diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/shark.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/shark.asset
index 2007d19977..07b23f4751 100644
--- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/shark.asset
+++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/shark.asset
@@ -56,7 +56,6 @@ asset.export(Layer)
 
 asset.meta = {
   Name = Name,
-  Version = "1.0",
   Description = Description .. "Data provided by the National Oceanic and Atmospheric Administration",
   Author = "National Oceanic and Atmospheric Administration",
   URL = URL,
diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/ship_tracks-mosaic.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/ship_tracks-mosaic.asset
index a312f5690c..f66f972402 100644
--- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/ship_tracks-mosaic.asset
+++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/ship_tracks-mosaic.asset
@@ -67,7 +67,6 @@ asset.export(Legend)
 
 asset.meta = {
   Name = Name,
-  Version = "1.0",
   Description = Description .. "Data provided by the National Oceanic and Atmospheric Administration",
   Author = "National Oceanic and Atmospheric Administration",
   URL = URL,
diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/ship_tracks-tracks.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/ship_tracks-tracks.asset
index 88c8818272..baa2b80627 100644
--- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/ship_tracks-tracks.asset
+++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/ship_tracks-tracks.asset
@@ -67,7 +67,6 @@ asset.export(Legend)
 
 asset.meta = {
   Name = Name,
-  Version = "1.0",
   Description = Description .. "Data provided by the National Oceanic and Atmospheric Administration",
   Author = "National Oceanic and Atmospheric Administration",
   URL = URL,
diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/shipping.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/shipping.asset
index 56fc4a706c..cb60ece7c5 100644
--- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/shipping.asset
+++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/shipping.asset
@@ -49,7 +49,6 @@ asset.export(Layer)
 
 asset.meta = {
   Name = Name,
-  Version = "1.0",
   Description = Description .. "Data provided by the National Oceanic and Atmospheric Administration",
   Author = "National Oceanic and Atmospheric Administration",
   URL = URL,
diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/species_richness.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/species_richness.asset
index e558ee8629..8c825281c3 100644
--- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/species_richness.asset
+++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/species_richness.asset
@@ -66,7 +66,6 @@ asset.export(Colorbar)
 
 asset.meta = {
   Name = Name,
-  Version = "1.0",
   Description = Description .. "Data provided by the National Oceanic and Atmospheric Administration",
   Author = "National Oceanic and Atmospheric Administration",
   URL = URL,
diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/sss.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/sss.asset
index 3cfe2a4c62..724611e7f4 100644
--- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/sss.asset
+++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/sss.asset
@@ -61,7 +61,6 @@ asset.export(Colorbar)
 
 asset.meta = {
   Name = Name,
-  Version = "1.0",
   Description = Description .. "Data provided by the National Oceanic and Atmospheric Administration",
   Author = "National Oceanic and Atmospheric Administration",
   URL = URL,
diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/sst_1980_1999.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/sst_1980_1999.asset
index 00bebcb565..a158334237 100644
--- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/sst_1980_1999.asset
+++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/sst_1980_1999.asset
@@ -56,7 +56,6 @@ asset.export(Layer)
 
 asset.meta = {
   Name = Name,
-  Version = "1.0",
   Description = Description .. "Data provided by the National Oceanic and Atmospheric Administration",
   Author = "National Oceanic and Atmospheric Administration",
   URL = URL,
diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/tsunami_historical_series-alaska.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/tsunami_historical_series-alaska.asset
index 6323f149d9..a7f2ed63d4 100644
--- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/tsunami_historical_series-alaska.asset
+++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/tsunami_historical_series-alaska.asset
@@ -90,7 +90,6 @@ asset.export(LayerNull)
 
 asset.meta = {
   Name = Name,
-  Version = "1.0",
   Description = Description .. "Data provided by the National Oceanic and Atmospheric Administration",
   Author = "National Oceanic and Atmospheric Administration",
   URL = URL,
diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/tsunami_historical_series-aleutians.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/tsunami_historical_series-aleutians.asset
index 6c9c152f3b..9e2b8271e3 100644
--- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/tsunami_historical_series-aleutians.asset
+++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/tsunami_historical_series-aleutians.asset
@@ -88,7 +88,6 @@ asset.export(LayerNull)
 
 asset.meta = {
   Name = Name,
-  Version = "1.0",
   Description = Description .. "Data provided by the National Oceanic and Atmospheric Administration",
   Author = "National Oceanic and Atmospheric Administration",
   URL = URL,
diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/tsunami_historical_series-aleutians_1957.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/tsunami_historical_series-aleutians_1957.asset
index a3388ca4dd..819617d411 100644
--- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/tsunami_historical_series-aleutians_1957.asset
+++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/tsunami_historical_series-aleutians_1957.asset
@@ -89,7 +89,6 @@ asset.export(LayerNull)
 
 asset.meta = {
   Name = Name,
-  Version = "1.0",
   Description = Description .. "Data provided by the National Oceanic and Atmospheric Administration",
   Author = "National Oceanic and Atmospheric Administration",
   URL = URL,
diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/tsunami_historical_series-cascadia.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/tsunami_historical_series-cascadia.asset
index 989083fc1d..29e51475bb 100644
--- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/tsunami_historical_series-cascadia.asset
+++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/tsunami_historical_series-cascadia.asset
@@ -90,7 +90,6 @@ asset.export(LayerNull)
 
 asset.meta = {
   Name = Name,
-  Version = "1.0",
   Description = Description .. "Data provided by the National Oceanic and Atmospheric Administration",
   Author = "National Oceanic and Atmospheric Administration",
   URL = URL,
diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/tsunami_historical_series-chile.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/tsunami_historical_series-chile.asset
index 26790390f0..66cc8c5734 100644
--- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/tsunami_historical_series-chile.asset
+++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/tsunami_historical_series-chile.asset
@@ -92,7 +92,6 @@ asset.export(LayerNull)
 
 asset.meta = {
   Name = Name,
-  Version = "1.0",
   Description = Description .. "Data provided by the National Oceanic and Atmospheric Administration",
   Author = "National Oceanic and Atmospheric Administration",
   URL = URL,
diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/tsunami_historical_series-japan.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/tsunami_historical_series-japan.asset
index 2509dd1fba..871a9f439e 100644
--- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/tsunami_historical_series-japan.asset
+++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/tsunami_historical_series-japan.asset
@@ -97,7 +97,6 @@ asset.export(LayerNull)
 
 asset.meta = {
   Name = Name,
-  Version = "1.0",
   Description = Description .. "Data provided by the National Oceanic and Atmospheric Administration",
   Author = "National Oceanic and Atmospheric Administration",
   URL = URL,
diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/tsunami_historical_series-lisbon.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/tsunami_historical_series-lisbon.asset
index b36cdcdabc..837f3be6e2 100644
--- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/tsunami_historical_series-lisbon.asset
+++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/tsunami_historical_series-lisbon.asset
@@ -80,7 +80,6 @@ asset.export(LayerNull)
 
 asset.meta = {
   Name = Name,
-  Version = "1.0",
   Description = Description .. "Data provided by the National Oceanic and Atmospheric Administration",
   Author = "National Oceanic and Atmospheric Administration",
   URL = URL,
diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/tsunami_historical_series-samoa.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/tsunami_historical_series-samoa.asset
index 478112a407..a1bdf01063 100644
--- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/tsunami_historical_series-samoa.asset
+++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/tsunami_historical_series-samoa.asset
@@ -82,7 +82,6 @@ asset.export(LayerNull)
 
 asset.meta = {
   Name = Name,
-  Version = "1.0",
   Description = Description .. "Data provided by the National Oceanic and Atmospheric Administration",
   Author = "National Oceanic and Atmospheric Administration",
   URL = URL,
diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/tsunami_historical_series-sumatra.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/tsunami_historical_series-sumatra.asset
index a441848ab3..9141bdf89f 100644
--- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/tsunami_historical_series-sumatra.asset
+++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/tsunami_historical_series-sumatra.asset
@@ -76,7 +76,6 @@ asset.export(LayerNull)
 
 asset.meta = {
   Name = Name,
-  Version = "1.0",
   Description = Description .. "Data provided by the National Oceanic and Atmospheric Administration",
   Author = "National Oceanic and Atmospheric Administration",
   URL = URL,
diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/tsunami_locations.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/tsunami_locations.asset
index 4686defc81..e4e184bebf 100644
--- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/tsunami_locations.asset
+++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/tsunami_locations.asset
@@ -98,7 +98,6 @@ asset.export(Legend)
 
 asset.meta = {
   Name = Name,
-  Version = "1.0",
   Description = Description .. "Data provided by the National Oceanic and Atmospheric Administration",
   Author = "National Oceanic and Atmospheric Administration",
   URL = URL,
diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/vector_winds.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/vector_winds.asset
index 0214937e25..dae65390b2 100644
--- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/vector_winds.asset
+++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/vector_winds.asset
@@ -64,7 +64,6 @@ asset.export(Colorbar)
 
 asset.meta = {
   Name = Name,
-  Version = "1.0",
   Description = Description .. "Data provided by the National Oceanic and Atmospheric Administration",
   Author = "National Oceanic and Atmospheric Administration",
   URL = URL,
diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/vent_discoveries_animation.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/vent_discoveries_animation.asset
index c25615c846..568cf4edda 100644
--- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/vent_discoveries_animation.asset
+++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/vent_discoveries_animation.asset
@@ -53,7 +53,6 @@ asset.export(Layer)
 
 asset.meta = {
   Name = Name,
-  Version = "1.0",
   Description = Description .. "Data provided by the National Oceanic and Atmospheric Administration",
   Author = "National Oceanic and Atmospheric Administration",
   URL = URL,
diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/vent_locations.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/vent_locations.asset
index df0aa90224..6cca645244 100644
--- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/vent_locations.asset
+++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/vent_locations.asset
@@ -45,7 +45,6 @@ asset.export(Layer)
 
 asset.meta = {
   Name = Name,
-  Version = "1.0",
   Description = Description .. "Data provided by the National Oceanic and Atmospheric Administration",
   Author = "National Oceanic and Atmospheric Administration",
   URL = URL,
diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/vorticity.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/vorticity.asset
index bbaa0338a3..e3ef6f2386 100644
--- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/vorticity.asset
+++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/vorticity.asset
@@ -61,7 +61,6 @@ asset.export(Colorbar)
 
 asset.meta = {
   Name = Name,
-  Version = "1.0",
   Description = Description .. "Data provided by the National Oceanic and Atmospheric Administration",
   Author = "National Oceanic and Atmospheric Administration",
   URL = URL,
diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/waves-wave_height_2012.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/waves-wave_height_2012.asset
index 51b396b042..22cf608702 100644
--- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/waves-wave_height_2012.asset
+++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/waves-wave_height_2012.asset
@@ -58,7 +58,6 @@ asset.export(Colorbar)
 
 asset.meta = {
   Name = Name,
-  Version = "1.0",
   Description = Description .. "Data provided by the National Oceanic and Atmospheric Administration",
   Author = "National Oceanic and Atmospheric Administration",
   URL = URL,
diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/waves-wave_height_katrina.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/waves-wave_height_katrina.asset
index e5b2e3af7a..2357c4b14a 100644
--- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/waves-wave_height_katrina.asset
+++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/waves-wave_height_katrina.asset
@@ -60,7 +60,6 @@ asset.export(Colorbar)
 
 asset.meta = {
   Name = Name,
-  Version = "1.0",
   Description = Description .. "Data provided by the National Oceanic and Atmospheric Administration",
   Author = "National Oceanic and Atmospheric Administration",
   URL = URL,
diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/waves-wave_height_sandy.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/waves-wave_height_sandy.asset
index f85d3b1abe..9e5de18b72 100644
--- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/waves-wave_height_sandy.asset
+++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/waves-wave_height_sandy.asset
@@ -60,7 +60,6 @@ asset.export(Colorbar)
 
 asset.meta = {
   Name = Name,
-  Version = "1.0",
   Description = Description .. "Data provided by the National Oceanic and Atmospheric Administration",
   Author = "National Oceanic and Atmospheric Administration",
   URL = URL,
diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/waves-wave_power_2012.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/waves-wave_power_2012.asset
index 2beef43b7e..9a47e930d8 100644
--- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/waves-wave_power_2012.asset
+++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/waves-wave_power_2012.asset
@@ -58,7 +58,6 @@ asset.export(Colorbar)
 
 asset.meta = {
   Name = Name,
-  Version = "1.0",
   Description = Description .. "Data provided by the National Oceanic and Atmospheric Administration",
   Author = "National Oceanic and Atmospheric Administration",
   URL = URL,
diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/weeklyseaice-10day_seaice.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/weeklyseaice-10day_seaice.asset
index e98ddf5e3f..a524d9c7f3 100644
--- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/weeklyseaice-10day_seaice.asset
+++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/weeklyseaice-10day_seaice.asset
@@ -57,7 +57,6 @@ asset.export(Layer)
 
 asset.meta = {
   Name = Name,
-  Version = "1.0",
   Description = Description .. "Data provided by the National Oceanic and Atmospheric Administration",
   Author = "National Oceanic and Atmospheric Administration",
   URL = URL,
diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/weeklyseaice-sept_seaice.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/weeklyseaice-sept_seaice.asset
index 26d21af5e5..0420ea6440 100644
--- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/weeklyseaice-sept_seaice.asset
+++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/weeklyseaice-sept_seaice.asset
@@ -65,7 +65,6 @@ asset.export(Layer)
 
 asset.meta = {
   Name = Name,
-  Version = "1.0",
   Description = Description .. "Data provided by the National Oceanic and Atmospheric Administration",
   Author = "National Oceanic and Atmospheric Administration",
   URL = URL,
diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/overlays/cables.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/overlays/cables.asset
index b322a4e284..798322dff8 100644
--- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/overlays/cables.asset
+++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/overlays/cables.asset
@@ -42,7 +42,6 @@ asset.export(Layer)
 
 asset.meta = {
   Name = Name,
-  Version = "1.0",
   Description = Description .. "Data provided by the National Oceanic and Atmospheric Administration",
   Author = "National Oceanic and Atmospheric Administration",
   URL = URL,
diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/overlays/capitals.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/overlays/capitals.asset
index ad77528a18..8774e12708 100644
--- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/overlays/capitals.asset
+++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/overlays/capitals.asset
@@ -41,7 +41,6 @@ asset.export(Layer)
 
 asset.meta = {
   Name = Name,
-  Version = "1.0",
   Description = Description .. "Data provided by the National Oceanic and Atmospheric Administration",
   Author = "National Oceanic and Atmospheric Administration",
   URL = URL,
diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/overlays/city_names.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/overlays/city_names.asset
index 606da418d8..d3aae95337 100644
--- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/overlays/city_names.asset
+++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/overlays/city_names.asset
@@ -42,7 +42,6 @@ asset.export(Layer)
 
 asset.meta = {
   Name = Name,
-  Version = "1.0",
   Description = Description .. "Data provided by the National Oceanic and Atmospheric Administration",
   Author = "National Oceanic and Atmospheric Administration",
   URL = URL,
diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/overlays/continent_borders-black.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/overlays/continent_borders-black.asset
index 6766fb74d3..25ef67ec5b 100644
--- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/overlays/continent_borders-black.asset
+++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/overlays/continent_borders-black.asset
@@ -41,7 +41,6 @@ asset.export(Layer)
 
 asset.meta = {
   Name = Name,
-  Version = "1.0",
   Description = Description .. "Data provided by the National Oceanic and Atmospheric Administration",
   Author = "National Oceanic and Atmospheric Administration",
   URL = URL,
diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/overlays/continent_borders-white.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/overlays/continent_borders-white.asset
index 68b85bc6d9..9a28a38de2 100644
--- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/overlays/continent_borders-white.asset
+++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/overlays/continent_borders-white.asset
@@ -41,7 +41,6 @@ asset.export(Layer)
 
 asset.meta = {
   Name = Name,
-  Version = "1.0",
   Description = Description .. "Data provided by the National Oceanic and Atmospheric Administration",
   Author = "National Oceanic and Atmospheric Administration",
   URL = URL,
diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/overlays/continent_names.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/overlays/continent_names.asset
index 3cd2185ac8..c11184fe0d 100644
--- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/overlays/continent_names.asset
+++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/overlays/continent_names.asset
@@ -41,7 +41,6 @@ asset.export(Layer)
 
 asset.meta = {
   Name = Name,
-  Version = "1.0",
   Description = Description .. "Data provided by the National Oceanic and Atmospheric Administration",
   Author = "National Oceanic and Atmospheric Administration",
   URL = URL,
diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/overlays/country_borders-black.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/overlays/country_borders-black.asset
index d16306a91e..9a52cfc9ef 100644
--- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/overlays/country_borders-black.asset
+++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/overlays/country_borders-black.asset
@@ -41,7 +41,6 @@ asset.export(Layer)
 
 asset.meta = {
   Name = Name,
-  Version = "1.0",
   Description = Description .. "Data provided by the National Oceanic and Atmospheric Administration",
   Author = "National Oceanic and Atmospheric Administration",
   URL = URL,
diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/overlays/country_borders-white.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/overlays/country_borders-white.asset
index 57907d639b..c0c96d5b1c 100644
--- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/overlays/country_borders-white.asset
+++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/overlays/country_borders-white.asset
@@ -41,7 +41,6 @@ asset.export(Layer)
 
 asset.meta = {
   Name = Name,
-  Version = "1.0",
   Description = Description .. "Data provided by the National Oceanic and Atmospheric Administration",
   Author = "National Oceanic and Atmospheric Administration",
   URL = URL,
diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/overlays/country_pop_names.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/overlays/country_pop_names.asset
index 68ac357cfd..04ee8c83ef 100644
--- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/overlays/country_pop_names.asset
+++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/overlays/country_pop_names.asset
@@ -42,7 +42,6 @@ asset.export(Layer)
 
 asset.meta = {
   Name = Name,
-  Version = "1.0",
   Description = Description .. "Data provided by the National Oceanic and Atmospheric Administration",
   Author = "National Oceanic and Atmospheric Administration",
   URL = URL,
diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/overlays/currents.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/overlays/currents.asset
index 6cc7217b16..e176a625af 100644
--- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/overlays/currents.asset
+++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/overlays/currents.asset
@@ -60,7 +60,6 @@ asset.export(LayerLabels)
 
 asset.meta = {
   Name = Name,
-  Version = "1.0",
   Description = Description .. "Data provided by the National Oceanic and Atmospheric Administration",
   Author = "National Oceanic and Atmospheric Administration",
   URL = URL,
diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/overlays/general_circulation.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/overlays/general_circulation.asset
index 48bd3641d2..c404c0c43b 100644
--- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/overlays/general_circulation.asset
+++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/overlays/general_circulation.asset
@@ -43,7 +43,6 @@ asset.export(Layer)
 
 asset.meta = {
   Name = Name,
-  Version = "1.0",
   Description = Description .. "Data provided by the National Oceanic and Atmospheric Administration",
   Author = "National Oceanic and Atmospheric Administration",
   URL = URL,
diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/overlays/land_mask-black.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/overlays/land_mask-black.asset
index eda460e77e..b997764ee2 100644
--- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/overlays/land_mask-black.asset
+++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/overlays/land_mask-black.asset
@@ -41,7 +41,6 @@ asset.export(Layer)
 
 asset.meta = {
   Name = Name,
-  Version = "1.0",
   Description = Description .. "Data provided by the National Oceanic and Atmospheric Administration",
   Author = "National Oceanic and Atmospheric Administration",
   URL = URL,
diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/overlays/land_mask-veg.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/overlays/land_mask-veg.asset
index 0e86d919fc..a6680adec2 100644
--- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/overlays/land_mask-veg.asset
+++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/overlays/land_mask-veg.asset
@@ -42,7 +42,6 @@ asset.export(Layer)
 
 asset.meta = {
   Name = Name,
-  Version = "1.0",
   Description = Description .. "Data provided by the National Oceanic and Atmospheric Administration",
   Author = "National Oceanic and Atmospheric Administration",
   URL = URL,
diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/overlays/latlon_grid-black.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/overlays/latlon_grid-black.asset
index 630c38028e..01ac62e6ae 100644
--- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/overlays/latlon_grid-black.asset
+++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/overlays/latlon_grid-black.asset
@@ -41,7 +41,6 @@ asset.export(Layer)
 
 asset.meta = {
   Name = Name,
-  Version = "1.0",
   Description = Description .. "Data provided by the National Oceanic and Atmospheric Administration",
   Author = "National Oceanic and Atmospheric Administration",
   URL = URL,
diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/overlays/latlon_grid-white.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/overlays/latlon_grid-white.asset
index 88e05c2f12..aef7d9121c 100644
--- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/overlays/latlon_grid-white.asset
+++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/overlays/latlon_grid-white.asset
@@ -41,7 +41,6 @@ asset.export(Layer)
 
 asset.meta = {
   Name = Name,
-  Version = "1.0",
   Description = Description .. "Data provided by the National Oceanic and Atmospheric Administration",
   Author = "National Oceanic and Atmospheric Administration",
   URL = URL,
diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/overlays/ocean_names.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/overlays/ocean_names.asset
index 25ea1e94e2..87dce97eee 100644
--- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/overlays/ocean_names.asset
+++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/overlays/ocean_names.asset
@@ -41,7 +41,6 @@ asset.export(Layer)
 
 asset.meta = {
   Name = Name,
-  Version = "1.0",
   Description = Description .. "Data provided by the National Oceanic and Atmospheric Administration",
   Author = "National Oceanic and Atmospheric Administration",
   URL = URL,
diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/overlays/plate_boundary-color.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/overlays/plate_boundary-color.asset
index d06a4b533b..fed2944b9a 100644
--- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/overlays/plate_boundary-color.asset
+++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/overlays/plate_boundary-color.asset
@@ -42,7 +42,6 @@ asset.export(Layer)
 
 asset.meta = {
   Name = Name,
-  Version = "1.0",
   Description = Description .. "Data provided by the National Oceanic and Atmospheric Administration",
   Author = "National Oceanic and Atmospheric Administration",
   URL = URL,
diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/overlays/plate_boundary-white.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/overlays/plate_boundary-white.asset
index 00e2d4dd0d..438316dd9e 100644
--- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/overlays/plate_boundary-white.asset
+++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/overlays/plate_boundary-white.asset
@@ -41,7 +41,6 @@ asset.export(Layer)
 
 asset.meta = {
   Name = Name,
-  Version = "1.0",
   Description = Description .. "Data provided by the National Oceanic and Atmospheric Administration",
   Author = "National Oceanic and Atmospheric Administration",
   URL = URL,
diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/overlays/plate_names.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/overlays/plate_names.asset
index 57b509e1ec..9c0213bc1e 100644
--- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/overlays/plate_names.asset
+++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/overlays/plate_names.asset
@@ -41,7 +41,6 @@ asset.export(Layer)
 
 asset.meta = {
   Name = Name,
-  Version = "1.0",
   Description = Description .. "Data provided by the National Oceanic and Atmospheric Administration",
   Author = "National Oceanic and Atmospheric Administration",
   URL = URL,
diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/overlays/railroad.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/overlays/railroad.asset
index 9301f1f4b5..a1e4569773 100644
--- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/overlays/railroad.asset
+++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/overlays/railroad.asset
@@ -42,7 +42,6 @@ asset.export(Layer)
 
 asset.meta = {
   Name = Name,
-  Version = "1.0",
   Description = Description .. "Data provided by the National Oceanic and Atmospheric Administration",
   Author = "National Oceanic and Atmospheric Administration",
   URL = URL,
diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/overlays/rivers.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/overlays/rivers.asset
index bef5758229..c5df3ce42e 100644
--- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/overlays/rivers.asset
+++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/overlays/rivers.asset
@@ -42,7 +42,6 @@ asset.export(Layer)
 
 asset.meta = {
   Name = Name,
-  Version = "1.0",
   Description = Description .. "Data provided by the National Oceanic and Atmospheric Administration",
   Author = "National Oceanic and Atmospheric Administration",
   URL = URL,
diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/overlays/roads-black.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/overlays/roads-black.asset
index c0085795cf..9b1d3a200a 100644
--- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/overlays/roads-black.asset
+++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/overlays/roads-black.asset
@@ -42,7 +42,6 @@ asset.export(Layer)
 
 asset.meta = {
   Name = Name,
-  Version = "1.0",
   Description = Description .. "Data provided by the National Oceanic and Atmospheric Administration",
   Author = "National Oceanic and Atmospheric Administration",
   URL = URL,
diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/overlays/roads-white.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/overlays/roads-white.asset
index a97330d44e..8c23993226 100644
--- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/overlays/roads-white.asset
+++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/overlays/roads-white.asset
@@ -42,7 +42,6 @@ asset.export(Layer)
 
 asset.meta = {
   Name = Name,
-  Version = "1.0",
   Description = Description .. "Data provided by the National Oceanic and Atmospheric Administration",
   Author = "National Oceanic and Atmospheric Administration",
   URL = URL,
diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/overlays/state_borders-black.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/overlays/state_borders-black.asset
index 08359476c0..2e561680d8 100644
--- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/overlays/state_borders-black.asset
+++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/overlays/state_borders-black.asset
@@ -41,7 +41,6 @@ asset.export(Layer)
 
 asset.meta = {
   Name = Name,
-  Version = "1.0",
   Description = Description .. "Data provided by the National Oceanic and Atmospheric Administration",
   Author = "National Oceanic and Atmospheric Administration",
   URL = URL,
diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/overlays/state_borders-white.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/overlays/state_borders-white.asset
index 42a19b0e29..b53b928133 100644
--- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/overlays/state_borders-white.asset
+++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/overlays/state_borders-white.asset
@@ -41,7 +41,6 @@ asset.export(Layer)
 
 asset.meta = {
   Name = Name,
-  Version = "1.0",
   Description = Description .. "Data provided by the National Oceanic and Atmospheric Administration",
   Author = "National Oceanic and Atmospheric Administration",
   URL = URL,
diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/overlays/timezones.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/overlays/timezones.asset
index 69518b1167..e88af01c16 100644
--- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/overlays/timezones.asset
+++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/overlays/timezones.asset
@@ -41,7 +41,6 @@ asset.export(Layer)
 
 asset.meta = {
   Name = Name,
-  Version = "1.0",
   Description = Description .. "Data provided by the National Oceanic and Atmospheric Administration",
   Author = "National Oceanic and Atmospheric Administration",
   URL = URL,
diff --git a/data/assets/scene/solarsystem/planets/earth/satellites/communications/amateur.asset b/data/assets/scene/solarsystem/planets/earth/satellites/communications/amateur.asset
index fd1f9471cb..d4e4d7b6d6 100644
--- a/data/assets/scene/solarsystem/planets/earth/satellites/communications/amateur.asset
+++ b/data/assets/scene/solarsystem/planets/earth/satellites/communications/amateur.asset
@@ -47,7 +47,6 @@ asset.export(AmateurSatellites)
 
 asset.meta = {
   Name = "Satellites Communications - Amateur Radio",
-  Version = "1.0",
   Description = [[Satellites asset for Communications - Amateur Radio. Data from
     Celestrak]],
   Author = "OpenSpace Team",
diff --git a/data/assets/scene/solarsystem/planets/earth/satellites/communications/experimental.asset b/data/assets/scene/solarsystem/planets/earth/satellites/communications/experimental.asset
index f3046c1599..9d58a8c7ca 100644
--- a/data/assets/scene/solarsystem/planets/earth/satellites/communications/experimental.asset
+++ b/data/assets/scene/solarsystem/planets/earth/satellites/communications/experimental.asset
@@ -47,7 +47,6 @@ asset.export(ExperimentalSatellites)
 
 asset.meta = {
   Name = "Satellites Communications - Experimental",
-  Version = "1.0",
   Description = "Satellites asset for Communications - Experimental. Data from Celestrak",
   Author = "OpenSpace Team",
   URL = "https://celestrak.com/NORAD/elements/",
diff --git a/data/assets/scene/solarsystem/planets/earth/satellites/communications/geostationary.asset b/data/assets/scene/solarsystem/planets/earth/satellites/communications/geostationary.asset
index 8127e6f042..7a1b6be672 100644
--- a/data/assets/scene/solarsystem/planets/earth/satellites/communications/geostationary.asset
+++ b/data/assets/scene/solarsystem/planets/earth/satellites/communications/geostationary.asset
@@ -49,7 +49,6 @@ asset.export(GeoStationarySatellites)
 
 asset.meta = {
   Name = "Satellites Communications - Geostationary",
-  Version = "1.0",
   Description = [[Satellites asset for Communications - Geostationary. Data from
     Celestrak]],
   Author = "OpenSpace Team",
diff --git a/data/assets/scene/solarsystem/planets/earth/satellites/communications/globalstar.asset b/data/assets/scene/solarsystem/planets/earth/satellites/communications/globalstar.asset
index 47c7f7a0da..bb93c189ca 100644
--- a/data/assets/scene/solarsystem/planets/earth/satellites/communications/globalstar.asset
+++ b/data/assets/scene/solarsystem/planets/earth/satellites/communications/globalstar.asset
@@ -47,7 +47,6 @@ asset.export(GlobalStarSatellites)
 
 asset.meta = {
   Name = "Satellites Communications - GlobalStar",
-  Version = "1.0",
   Description = "Satellites asset for Communications - GlobalStar. Data from Celestrak",
   Author = "OpenSpace Team",
   URL = "https://celestrak.com/NORAD/elements/",
diff --git a/data/assets/scene/solarsystem/planets/earth/satellites/communications/gorizont.asset b/data/assets/scene/solarsystem/planets/earth/satellites/communications/gorizont.asset
index b1e5cc98b3..42e204acf6 100644
--- a/data/assets/scene/solarsystem/planets/earth/satellites/communications/gorizont.asset
+++ b/data/assets/scene/solarsystem/planets/earth/satellites/communications/gorizont.asset
@@ -47,7 +47,6 @@ asset.export(GorizontSatellites)
 
 asset.meta = {
   Name = "Satellites Communications - Gorizont",
-  Version = "1.0",
   Description = "Satellites asset for Communications - Gorizont. Data from Celestrak",
   Author = "OpenSpace Team",
   URL = "https://celestrak.com/NORAD/elements/",
diff --git a/data/assets/scene/solarsystem/planets/earth/satellites/communications/intelsat.asset b/data/assets/scene/solarsystem/planets/earth/satellites/communications/intelsat.asset
index a3761f43e7..2c4816984c 100644
--- a/data/assets/scene/solarsystem/planets/earth/satellites/communications/intelsat.asset
+++ b/data/assets/scene/solarsystem/planets/earth/satellites/communications/intelsat.asset
@@ -47,7 +47,6 @@ asset.export(IntelsatSatellites)
 
 asset.meta = {
   Name = "Satellites Communications - Intelsat",
-  Version = "1.0",
   Description = "Satellites asset for Communications - Intelsat. Data from Celestrak",
   Author = "OpenSpace Team",
   URL = "https://celestrak.com/NORAD/elements/",
diff --git a/data/assets/scene/solarsystem/planets/earth/satellites/communications/iridium.asset b/data/assets/scene/solarsystem/planets/earth/satellites/communications/iridium.asset
index 1d809a0fc9..01299f9c3c 100644
--- a/data/assets/scene/solarsystem/planets/earth/satellites/communications/iridium.asset
+++ b/data/assets/scene/solarsystem/planets/earth/satellites/communications/iridium.asset
@@ -47,7 +47,6 @@ asset.export(IridiumSatellites)
 
 asset.meta = {
   Name = "Satellites Communications - Iridium",
-  Version = "1.0",
   Description = "Satellites asset for Communications - Iridium. Data from Celestrak",
   Author = "OpenSpace Team",
   URL = "https://celestrak.com/NORAD/elements/",
diff --git a/data/assets/scene/solarsystem/planets/earth/satellites/communications/iridium_next.asset b/data/assets/scene/solarsystem/planets/earth/satellites/communications/iridium_next.asset
index f4cb86fd75..8b09625174 100644
--- a/data/assets/scene/solarsystem/planets/earth/satellites/communications/iridium_next.asset
+++ b/data/assets/scene/solarsystem/planets/earth/satellites/communications/iridium_next.asset
@@ -47,7 +47,6 @@ asset.export(IridiumNextSatellites)
 
 asset.meta = {
   Name = "Satellites Communications - Iridium NEXT",
-  Version = "1.0",
   Description = "Satellites asset for Communications - Iridium NEXT. Data from Celestrak",
   Author = "OpenSpace Team",
   URL = "https://celestrak.com/NORAD/elements/",
diff --git a/data/assets/scene/solarsystem/planets/earth/satellites/communications/molniya.asset b/data/assets/scene/solarsystem/planets/earth/satellites/communications/molniya.asset
index fb14536030..f2e60e19f0 100644
--- a/data/assets/scene/solarsystem/planets/earth/satellites/communications/molniya.asset
+++ b/data/assets/scene/solarsystem/planets/earth/satellites/communications/molniya.asset
@@ -47,7 +47,6 @@ asset.export(MolniyaSatellites)
 
 asset.meta = {
   Name = "Satellites Communications - Molniya",
-  Version = "1.0",
   Description = "Satellites asset for Communications - Molniya. Data from Celestrak",
   Author = "OpenSpace Team",
   URL = "https://celestrak.com/NORAD/elements/",
diff --git a/data/assets/scene/solarsystem/planets/earth/satellites/communications/orbcomm.asset b/data/assets/scene/solarsystem/planets/earth/satellites/communications/orbcomm.asset
index be8fd83daa..d3c7c5eb14 100644
--- a/data/assets/scene/solarsystem/planets/earth/satellites/communications/orbcomm.asset
+++ b/data/assets/scene/solarsystem/planets/earth/satellites/communications/orbcomm.asset
@@ -47,7 +47,6 @@ asset.export(OrbcommSatellites)
 
 asset.meta = {
   Name = "Satellites Communications - Orbcomm",
-  Version = "1.0",
   Description = "Satellites asset for Communications - Orbcomm. Data from Celestrak",
   Author = "OpenSpace Team",
   URL = "https://celestrak.com/NORAD/elements/",
diff --git a/data/assets/scene/solarsystem/planets/earth/satellites/communications/other_comm.asset b/data/assets/scene/solarsystem/planets/earth/satellites/communications/other_comm.asset
index eec371989a..8e18913e25 100644
--- a/data/assets/scene/solarsystem/planets/earth/satellites/communications/other_comm.asset
+++ b/data/assets/scene/solarsystem/planets/earth/satellites/communications/other_comm.asset
@@ -46,7 +46,6 @@ asset.export(OtherCommunicationSatellites)
 
 asset.meta = {
   Name = "Satellites Communications - Other comm",
-  Version = "1.0",
   Description = "Satellites asset for Communications - Other comm. Data from Celestrak",
   Author = "OpenSpace Team",
   URL = "https://celestrak.com/NORAD/elements/",
diff --git a/data/assets/scene/solarsystem/planets/earth/satellites/communications/raduga.asset b/data/assets/scene/solarsystem/planets/earth/satellites/communications/raduga.asset
index ba141dacc7..2212d24c84 100644
--- a/data/assets/scene/solarsystem/planets/earth/satellites/communications/raduga.asset
+++ b/data/assets/scene/solarsystem/planets/earth/satellites/communications/raduga.asset
@@ -47,7 +47,6 @@ asset.export(RadugaSatellites)
 
 asset.meta = {
   Name = "Satellites Communications - Raduga",
-  Version = "1.0",
   Description = "Satellites asset for Communications - Raduga. Data from Celestrak",
   Author = "OpenSpace Team",
   URL = "https://celestrak.com/NORAD/elements/",
diff --git a/data/assets/scene/solarsystem/planets/earth/satellites/communications/ses.asset b/data/assets/scene/solarsystem/planets/earth/satellites/communications/ses.asset
index cda1deecb2..3997ca2050 100644
--- a/data/assets/scene/solarsystem/planets/earth/satellites/communications/ses.asset
+++ b/data/assets/scene/solarsystem/planets/earth/satellites/communications/ses.asset
@@ -47,7 +47,6 @@ asset.export(SesSatellites)
 
 asset.meta = {
   Name = "Satellites Communications - SES",
-  Version = "1.0",
   Description = "Satellites asset for Communications - SES. Data from Celestrak",
   Author = "OpenSpace Team",
   URL = "https://celestrak.com/NORAD/elements/",
diff --git a/data/assets/scene/solarsystem/planets/earth/satellites/communications/starlink.asset b/data/assets/scene/solarsystem/planets/earth/satellites/communications/starlink.asset
index eaa376b2bf..1896b47717 100644
--- a/data/assets/scene/solarsystem/planets/earth/satellites/communications/starlink.asset
+++ b/data/assets/scene/solarsystem/planets/earth/satellites/communications/starlink.asset
@@ -49,7 +49,6 @@ asset.export(StarlinkSatellites)
 
 asset.meta = {
   Name = "Satellites Communications - Starlink",
-  Version = "1.0",
   Description = "Satellites asset for Communications - Starlink. Data from Celestrak",
   Author = "OpenSpace Team",
   URL = "https://celestrak.com/NORAD/elements/",
diff --git a/data/assets/scene/solarsystem/planets/earth/satellites/debris/debris_asat.asset b/data/assets/scene/solarsystem/planets/earth/satellites/debris/debris_asat.asset
index f8e6cac01d..7e8c010368 100644
--- a/data/assets/scene/solarsystem/planets/earth/satellites/debris/debris_asat.asset
+++ b/data/assets/scene/solarsystem/planets/earth/satellites/debris/debris_asat.asset
@@ -47,7 +47,6 @@ asset.export(DebrisAsat)
 
 asset.meta = {
   Name = "Satellites Debris - Indian ASAT test Debris",
-  Version = "1.0",
   Description = [[Satellites asset for Debris - Indian ASAT test Debris. Data from
     Celestrak]],
   Author = "OpenSpace Team",
diff --git a/data/assets/scene/solarsystem/planets/earth/satellites/debris/debris_breezem.asset b/data/assets/scene/solarsystem/planets/earth/satellites/debris/debris_breezem.asset
index 964dfe81e4..2c1ddc4212 100644
--- a/data/assets/scene/solarsystem/planets/earth/satellites/debris/debris_breezem.asset
+++ b/data/assets/scene/solarsystem/planets/earth/satellites/debris/debris_breezem.asset
@@ -47,7 +47,6 @@ asset.export(DebrisBreezem)
 
 asset.meta = {
   Name = "Satellites Debris - Breeze-M Breakup",
-  Version = "1.0",
   Description = "Satellites asset for Debris - Breeze-M Breakup. Data from Celestrak",
   Author = "OpenSpace Team",
   URL = "https://celestrak.com/events/38746-Breakup/",
diff --git a/data/assets/scene/solarsystem/planets/earth/satellites/debris/debris_fengyun.asset b/data/assets/scene/solarsystem/planets/earth/satellites/debris/debris_fengyun.asset
index a166d85a94..4bee1421bc 100644
--- a/data/assets/scene/solarsystem/planets/earth/satellites/debris/debris_fengyun.asset
+++ b/data/assets/scene/solarsystem/planets/earth/satellites/debris/debris_fengyun.asset
@@ -47,7 +47,6 @@ asset.export(DebrisFengyun)
 
 asset.meta = {
   Name = "Satellites Debris - Fengyun Debris",
-  Version = "1.0",
   Description = "Satellites asset for Debris - Fengyun Debris. Data from Celestrak",
   Author = "OpenSpace Team",
   URL = "https://celestrak.com/NORAD/elements/",
diff --git a/data/assets/scene/solarsystem/planets/earth/satellites/debris/debris_iridium33.asset b/data/assets/scene/solarsystem/planets/earth/satellites/debris/debris_iridium33.asset
index 71b4c49136..008f12c0cb 100644
--- a/data/assets/scene/solarsystem/planets/earth/satellites/debris/debris_iridium33.asset
+++ b/data/assets/scene/solarsystem/planets/earth/satellites/debris/debris_iridium33.asset
@@ -47,7 +47,6 @@ asset.export(DebrisIridium)
 
 asset.meta = {
   Name = "Satellites Debris - Iridium 33 Debris",
-  Version = "1.0",
   Description = "Satellites asset for Debris - Iridium 33 Debris. Data from Celestrak",
   Author = "OpenSpace Team",
   URL = "https://celestrak.com/NORAD/elements/",
diff --git a/data/assets/scene/solarsystem/planets/earth/satellites/debris/debris_kosmos2251.asset b/data/assets/scene/solarsystem/planets/earth/satellites/debris/debris_kosmos2251.asset
index 9b9245e188..60df8431ab 100644
--- a/data/assets/scene/solarsystem/planets/earth/satellites/debris/debris_kosmos2251.asset
+++ b/data/assets/scene/solarsystem/planets/earth/satellites/debris/debris_kosmos2251.asset
@@ -46,7 +46,6 @@ asset.export(DebrisCosmos)
 
 asset.meta = {
   Name = "Satellites Debris - Kosmos 2251 Debris",
-  Version = "1.0",
   Description = "Satellites asset for Debris - Kosmos 2251 Debris. Data from Celestrak",
   Author = "OpenSpace Team",
   URL = "https://celestrak.com/NORAD/elements/",
diff --git a/data/assets/scene/solarsystem/planets/earth/satellites/debris/volume/cartesian_volume.asset b/data/assets/scene/solarsystem/planets/earth/satellites/debris/volume/cartesian_volume.asset
index 9fd06ffed6..221d6f6842 100644
--- a/data/assets/scene/solarsystem/planets/earth/satellites/debris/volume/cartesian_volume.asset
+++ b/data/assets/scene/solarsystem/planets/earth/satellites/debris/volume/cartesian_volume.asset
@@ -48,7 +48,6 @@ asset.export(DebrisVolumeCartesian)
 
 asset.meta = {
   Name = "Satellites Debris - Volume Cartesian",
-  Version = "1.0",
   Description = "Satellites asset for Debris - Volume Cartesian. Example asset",
   Author = "OpenSpace Team",
   URL = "",
diff --git a/data/assets/scene/solarsystem/planets/earth/satellites/debris/volume/spherical_volume.asset b/data/assets/scene/solarsystem/planets/earth/satellites/debris/volume/spherical_volume.asset
index 7b007b20a2..bd6fbebc7b 100644
--- a/data/assets/scene/solarsystem/planets/earth/satellites/debris/volume/spherical_volume.asset
+++ b/data/assets/scene/solarsystem/planets/earth/satellites/debris/volume/spherical_volume.asset
@@ -48,7 +48,6 @@ asset.export(DebrisVolumeSpherical)
 
 asset.meta = {
   Name = "Satellites Debris - Volume Spherical",
-  Version = "1.0",
   Description = "Satellites asset for Debris - Volume Spherical. Example asset",
   Author = "OpenSpace Team",
   URL = "",
diff --git a/data/assets/scene/solarsystem/planets/earth/satellites/misc/active.asset b/data/assets/scene/solarsystem/planets/earth/satellites/misc/active.asset
index f08555e840..4931acb8ab 100644
--- a/data/assets/scene/solarsystem/planets/earth/satellites/misc/active.asset
+++ b/data/assets/scene/solarsystem/planets/earth/satellites/misc/active.asset
@@ -48,7 +48,6 @@ asset.export(ActiveSatellites)
 
 asset.meta = {
   Name = "Satellites Active",
-  Version = "1.0",
   Description = "Satellites that employ active communication. Data from Celestrak",
   Author = "OpenSpace Team",
   URL = "https://celestrak.com/NORAD/elements/",
diff --git a/data/assets/scene/solarsystem/planets/earth/satellites/misc/brightest.asset b/data/assets/scene/solarsystem/planets/earth/satellites/misc/brightest.asset
index 0a7278e746..6d730202e6 100644
--- a/data/assets/scene/solarsystem/planets/earth/satellites/misc/brightest.asset
+++ b/data/assets/scene/solarsystem/planets/earth/satellites/misc/brightest.asset
@@ -49,7 +49,6 @@ asset.export(BrightestSatellites)
 
 asset.meta = {
   Name = "Satellites 100 Brightest",
-  Version = "1.0",
   Description = "Satellites asset for 100 Brightest. Data from Celestrak",
   Author = "OpenSpace Team",
   URL = "https://celestrak.com/NORAD/elements/",
diff --git a/data/assets/scene/solarsystem/planets/earth/satellites/misc/cubesats.asset b/data/assets/scene/solarsystem/planets/earth/satellites/misc/cubesats.asset
index 8f4c6b0a07..d5e4be6491 100644
--- a/data/assets/scene/solarsystem/planets/earth/satellites/misc/cubesats.asset
+++ b/data/assets/scene/solarsystem/planets/earth/satellites/misc/cubesats.asset
@@ -47,7 +47,6 @@ asset.export(Cubesats)
 
 asset.meta = {
   Name = "Satellites CubeSat",
-  Version = "1.0",
   Description = "Satellites asset for CubeSat. Data from Celestrak",
   Author = "OpenSpace Team",
   URL = "https://celestrak.com/NORAD/elements/",
diff --git a/data/assets/scene/solarsystem/planets/earth/satellites/misc/hubble_trail.asset b/data/assets/scene/solarsystem/planets/earth/satellites/misc/hubble_trail.asset
index c4e7f9870c..e76db0267e 100644
--- a/data/assets/scene/solarsystem/planets/earth/satellites/misc/hubble_trail.asset
+++ b/data/assets/scene/solarsystem/planets/earth/satellites/misc/hubble_trail.asset
@@ -81,7 +81,6 @@ asset.export(HubbleTrail)
 
 asset.meta = {
   Name = "Hubble Space Telescope Trail",
-  Version = "1.0",
   Description = "Position and Trail for Hubble Space Telescope, trail from Celestrak",
   Author = "Dan Tell",
   URL = "www.calacademy.org",
diff --git a/data/assets/scene/solarsystem/planets/earth/satellites/misc/iss.asset b/data/assets/scene/solarsystem/planets/earth/satellites/misc/iss.asset
index cd226d83db..80fdcca2c4 100644
--- a/data/assets/scene/solarsystem/planets/earth/satellites/misc/iss.asset
+++ b/data/assets/scene/solarsystem/planets/earth/satellites/misc/iss.asset
@@ -187,7 +187,6 @@ asset.export(IssPosition)
 
 asset.meta = {
   Name = "ISS",
-  Version = "3.0",
   Description = [[Model and Trail for ISS. Model from NASA 3D models, trail from
     Celestrak.]],
   Author = "OpenSpace Team",
diff --git a/data/assets/scene/solarsystem/planets/earth/satellites/misc/military.asset b/data/assets/scene/solarsystem/planets/earth/satellites/misc/military.asset
index 553271ae12..35c2cf0fce 100644
--- a/data/assets/scene/solarsystem/planets/earth/satellites/misc/military.asset
+++ b/data/assets/scene/solarsystem/planets/earth/satellites/misc/military.asset
@@ -47,7 +47,6 @@ asset.export(MilitarySatellites)
 
 asset.meta = {
   Name = "Satellites Military",
-  Version = "1.0",
   Description = "Satellites asset for Military. Data from Celestrak",
   Author = "OpenSpace Team",
   URL = "https://celestrak.com/NORAD/elements/",
diff --git a/data/assets/scene/solarsystem/planets/earth/satellites/misc/other.asset b/data/assets/scene/solarsystem/planets/earth/satellites/misc/other.asset
index 972338a564..a7188dd62f 100644
--- a/data/assets/scene/solarsystem/planets/earth/satellites/misc/other.asset
+++ b/data/assets/scene/solarsystem/planets/earth/satellites/misc/other.asset
@@ -47,7 +47,6 @@ asset.export(OtherSatellites)
 
 asset.meta = {
   Name = "Satellites Other",
-  Version = "1.0",
   Description = "Satellites asset for Other. Data from Celestrak",
   Author = "OpenSpace Team",
   URL = "https://celestrak.com/NORAD/elements/",
diff --git a/data/assets/scene/solarsystem/planets/earth/satellites/misc/radar.asset b/data/assets/scene/solarsystem/planets/earth/satellites/misc/radar.asset
index b5c6e7148a..5c3f925612 100644
--- a/data/assets/scene/solarsystem/planets/earth/satellites/misc/radar.asset
+++ b/data/assets/scene/solarsystem/planets/earth/satellites/misc/radar.asset
@@ -47,7 +47,6 @@ asset.export(RadarSatellites)
 
 asset.meta = {
   Name = "Satellites Radar Calibration",
-  Version = "1.0",
   Description = "Satellites asset for Radar Calibration. Data from Celestrak",
   Author = "OpenSpace Team",
   URL = "https://celestrak.com/NORAD/elements/",
diff --git a/data/assets/scene/solarsystem/planets/earth/satellites/misc/spacestations.asset b/data/assets/scene/solarsystem/planets/earth/satellites/misc/spacestations.asset
index 154f92113b..94ac750ee0 100644
--- a/data/assets/scene/solarsystem/planets/earth/satellites/misc/spacestations.asset
+++ b/data/assets/scene/solarsystem/planets/earth/satellites/misc/spacestations.asset
@@ -50,7 +50,6 @@ asset.export(SpaceStations)
 
 asset.meta = {
   Name = "Satellites SpaceStations",
-  Version = "1.0",
   Description = "Satellites asset for SpaceStations. Data from Celestrak",
   Author = "OpenSpace Team",
   URL = "https://celestrak.com/NORAD/elements/",
diff --git a/data/assets/scene/solarsystem/planets/earth/satellites/misc/tiangong.asset b/data/assets/scene/solarsystem/planets/earth/satellites/misc/tiangong.asset
index 620f7b2ce9..b58a428eb1 100644
--- a/data/assets/scene/solarsystem/planets/earth/satellites/misc/tiangong.asset
+++ b/data/assets/scene/solarsystem/planets/earth/satellites/misc/tiangong.asset
@@ -145,7 +145,6 @@ asset.export(TiangongPosition)
 
 asset.meta = {
   Name = "Tiangong",
-  Version = "2.0",
   Description = [[Model and Trail for Tiangong. Model from Turbosquid, trail from
     Celestrak.]],
   Author = "OpenSpace Team",
diff --git a/data/assets/scene/solarsystem/planets/earth/satellites/misc/tle-new.asset b/data/assets/scene/solarsystem/planets/earth/satellites/misc/tle-new.asset
index 9e98e495c6..e7716f1b04 100644
--- a/data/assets/scene/solarsystem/planets/earth/satellites/misc/tle-new.asset
+++ b/data/assets/scene/solarsystem/planets/earth/satellites/misc/tle-new.asset
@@ -48,7 +48,6 @@ asset.export(Last30DaysSatellites)
 
 asset.meta = {
   Name = "Satellites Last 30 Days",
-  Version = "1.0",
   Description = "Satellites asset for Last 30 Days. Data from Celestrak",
   Author = "OpenSpace Team",
   URL = "https://celestrak.com/NORAD/elements/",
diff --git a/data/assets/scene/solarsystem/planets/earth/satellites/navigation/beidou.asset b/data/assets/scene/solarsystem/planets/earth/satellites/navigation/beidou.asset
index 90899d50ac..e8161cb938 100644
--- a/data/assets/scene/solarsystem/planets/earth/satellites/navigation/beidou.asset
+++ b/data/assets/scene/solarsystem/planets/earth/satellites/navigation/beidou.asset
@@ -47,7 +47,6 @@ asset.export(BeidouSatellites)
 
 asset.meta = {
   Name = "Satellites Navigation Beidou",
-  Version = "1.0",
   Description = "Satellites asset for Navigation Beidou. Data from Celestrak",
   Author = "OpenSpace Team",
   URL = "https://celestrak.com/NORAD/elements/",
diff --git a/data/assets/scene/solarsystem/planets/earth/satellites/navigation/galileo.asset b/data/assets/scene/solarsystem/planets/earth/satellites/navigation/galileo.asset
index c42e571319..b371767419 100644
--- a/data/assets/scene/solarsystem/planets/earth/satellites/navigation/galileo.asset
+++ b/data/assets/scene/solarsystem/planets/earth/satellites/navigation/galileo.asset
@@ -47,7 +47,6 @@ asset.export(GalileoSatellites)
 
 asset.meta = {
   Name = "Satellites Navigation Galileo",
-  Version = "1.0",
   Description = "Satellites asset for Navigation Galileo. Data from Celestrak",
   Author = "OpenSpace Team",
   URL = "https://celestrak.com/NORAD/elements/",
diff --git a/data/assets/scene/solarsystem/planets/earth/satellites/navigation/glosnass.asset b/data/assets/scene/solarsystem/planets/earth/satellites/navigation/glosnass.asset
index e850de00d2..3348aadfba 100644
--- a/data/assets/scene/solarsystem/planets/earth/satellites/navigation/glosnass.asset
+++ b/data/assets/scene/solarsystem/planets/earth/satellites/navigation/glosnass.asset
@@ -47,7 +47,6 @@ asset.export(GlosnassSatellites)
 
 asset.meta = {
   Name = "Satellites Navigation Glosnass",
-  Version = "1.0",
   Description = "Satellites asset for Navigation Glosnass. Data from Celestrak",
   Author = "OpenSpace Team",
   URL = "https://celestrak.com/NORAD/elements/",
diff --git a/data/assets/scene/solarsystem/planets/earth/satellites/navigation/gps.asset b/data/assets/scene/solarsystem/planets/earth/satellites/navigation/gps.asset
index f29bf4fb67..a6a7f9f1cb 100644
--- a/data/assets/scene/solarsystem/planets/earth/satellites/navigation/gps.asset
+++ b/data/assets/scene/solarsystem/planets/earth/satellites/navigation/gps.asset
@@ -48,7 +48,6 @@ asset.export(GpsSatellites)
 
 asset.meta = {
   Name = "Satellites Navigation GPS",
-  Version = "1.0",
   Description = "Satellites asset for Navigation GPS. Data from Celestrak",
   Author = "OpenSpace Team",
   URL = "https://celestrak.com/NORAD/elements/",
diff --git a/data/assets/scene/solarsystem/planets/earth/satellites/navigation/musson.asset b/data/assets/scene/solarsystem/planets/earth/satellites/navigation/musson.asset
index 0b92789c24..53fd23ec0b 100644
--- a/data/assets/scene/solarsystem/planets/earth/satellites/navigation/musson.asset
+++ b/data/assets/scene/solarsystem/planets/earth/satellites/navigation/musson.asset
@@ -47,7 +47,6 @@ asset.export(MussonSatellites)
 
 asset.meta = {
   Name = "Satellites Navigation Russian LEO Navigation",
-  Version = "1.0",
   Description = [[Satellites asset for Navigation Russian LEO Navigation. Data from
     Celestrak]],
   Author = "OpenSpace Team",
diff --git a/data/assets/scene/solarsystem/planets/earth/satellites/navigation/nnss.asset b/data/assets/scene/solarsystem/planets/earth/satellites/navigation/nnss.asset
index c33704cdee..cf083e6a39 100644
--- a/data/assets/scene/solarsystem/planets/earth/satellites/navigation/nnss.asset
+++ b/data/assets/scene/solarsystem/planets/earth/satellites/navigation/nnss.asset
@@ -48,7 +48,6 @@ asset.export(NavyNavigationSatellites)
 
 asset.meta = {
   Name = "Satellites Navigation Navy Navigation Satellite System",
-  Version = "1.0",
   Description = [[Satellites asset for Navigation Navy Navigation Satellite System. Data
     from Celestrak]],
   Author = "OpenSpace Team",
diff --git a/data/assets/scene/solarsystem/planets/earth/satellites/navigation/sbas.asset b/data/assets/scene/solarsystem/planets/earth/satellites/navigation/sbas.asset
index 9a23bff086..55401243bb 100644
--- a/data/assets/scene/solarsystem/planets/earth/satellites/navigation/sbas.asset
+++ b/data/assets/scene/solarsystem/planets/earth/satellites/navigation/sbas.asset
@@ -47,7 +47,6 @@ asset.export(SatelliteBasedAugmentationSatellites)
 
 asset.meta = {
   Name = "Satellites Navigation Satellite Based Augmentation System",
-  Version = "1.0",
   Description = [[Satellites asset for Navigation Satellite Based Augmentation System.
     Data from Celestrak]],
   Author = "OpenSpace Team",
diff --git a/data/assets/scene/solarsystem/planets/earth/satellites/satellites.asset b/data/assets/scene/solarsystem/planets/earth/satellites/satellites.asset
index 80936a7dc3..dfe6da513e 100644
--- a/data/assets/scene/solarsystem/planets/earth/satellites/satellites.asset
+++ b/data/assets/scene/solarsystem/planets/earth/satellites/satellites.asset
@@ -4,7 +4,6 @@ asset.require("./satellites_interesting")
 
 asset.meta = {
   Name = "Satellites",
-  Version = "1.0",
   Description = "Default Earth Satellites. This file is loads satellites_interesting",
   Author = "OpenSpace Team",
   URL = "http://openspaceproject.com",
diff --git a/data/assets/scene/solarsystem/planets/earth/satellites/satellites_all.asset b/data/assets/scene/solarsystem/planets/earth/satellites/satellites_all.asset
index 14f95c7e07..e74b84d826 100644
--- a/data/assets/scene/solarsystem/planets/earth/satellites/satellites_all.asset
+++ b/data/assets/scene/solarsystem/planets/earth/satellites/satellites_all.asset
@@ -11,7 +11,6 @@ asset.require("./satellites_weather")
 
 asset.meta = {
   Name = "Satellites All",
-  Version = "1.0",
   Description = "Meta asset for all satellites of Earth. Containing other meta assets",
   Author = "OpenSpace Team",
   URL = "http://openspaceproject.com",
diff --git a/data/assets/scene/solarsystem/planets/earth/satellites/satellites_communications.asset b/data/assets/scene/solarsystem/planets/earth/satellites/satellites_communications.asset
index 29b0bbb422..fdb4badd02 100644
--- a/data/assets/scene/solarsystem/planets/earth/satellites/satellites_communications.asset
+++ b/data/assets/scene/solarsystem/planets/earth/satellites/satellites_communications.asset
@@ -17,7 +17,6 @@ asset.require("./communications/starlink")
 
 asset.meta = {
   Name = "Satellites Communications",
-  Version = "1.0",
   Description = [[Meta asset for communications satellites of Earth. Containing groups:
     geostationary, intelsat, ses, iridium, iridium_next, orbcomm, globalstar, amateur,
     experimental, other_comm, gorizont, raduga and molniya]],
diff --git a/data/assets/scene/solarsystem/planets/earth/satellites/satellites_debris.asset b/data/assets/scene/solarsystem/planets/earth/satellites/satellites_debris.asset
index cda85b9fb8..99881182f7 100644
--- a/data/assets/scene/solarsystem/planets/earth/satellites/satellites_debris.asset
+++ b/data/assets/scene/solarsystem/planets/earth/satellites/satellites_debris.asset
@@ -8,7 +8,6 @@ asset.require("./debris/debris_kosmos2251")
 
 asset.meta = {
   Name = "Satellites Debris",
-  Version = "1.0",
   Description = [[Meta asset for space debris of Earth. Containing groups: debris_asat,
     debris_breezem, debris_fengyun, debris_iridium33, and debris_kosmos2251]],
   Author = "OpenSpace Team",
diff --git a/data/assets/scene/solarsystem/planets/earth/satellites/satellites_interesting.asset b/data/assets/scene/solarsystem/planets/earth/satellites/satellites_interesting.asset
index 8bef2d22ef..acf9a0133d 100644
--- a/data/assets/scene/solarsystem/planets/earth/satellites/satellites_interesting.asset
+++ b/data/assets/scene/solarsystem/planets/earth/satellites/satellites_interesting.asset
@@ -10,7 +10,6 @@ asset.require("./misc/tle-new")
 
 asset.meta = {
   Name = "Satellites Interesting",
-  Version = "1.0",
   Description = [[Meta asset for interesting satellites of Earth. Containing groups:
     brightest, geostationary, gps, spacestations, iss, and tle-new]],
   Author = "OpenSpace Team",
diff --git a/data/assets/scene/solarsystem/planets/earth/satellites/satellites_misc.asset b/data/assets/scene/solarsystem/planets/earth/satellites/satellites_misc.asset
index 6c5c67dc35..23a868b0c6 100644
--- a/data/assets/scene/solarsystem/planets/earth/satellites/satellites_misc.asset
+++ b/data/assets/scene/solarsystem/planets/earth/satellites/satellites_misc.asset
@@ -8,7 +8,6 @@ asset.require("./misc/active")
 
 asset.meta = {
   Name = "Satellites Misc",
-  Version = "1.0",
   Description = [[Meta asset for misc satellites of Earth. Containing groups:
     military, radar, cubesats, and other]],
   Author = "OpenSpace Team",
diff --git a/data/assets/scene/solarsystem/planets/earth/satellites/satellites_navigation.asset b/data/assets/scene/solarsystem/planets/earth/satellites/satellites_navigation.asset
index 10fd2645d8..303b19693f 100644
--- a/data/assets/scene/solarsystem/planets/earth/satellites/satellites_navigation.asset
+++ b/data/assets/scene/solarsystem/planets/earth/satellites/satellites_navigation.asset
@@ -10,7 +10,6 @@ asset.require("./navigation/sbas")
 
 asset.meta = {
   Name = "Satellites Navigation",
-  Version = "1.0",
   Description = [[Meta asset for navigation satellites of Earth. Containing groups:
     beidou, galileo, glosnass, gps, musson, nnss, and sbas]],
   Author = "OpenSpace Team",
diff --git a/data/assets/scene/solarsystem/planets/earth/satellites/satellites_science.asset b/data/assets/scene/solarsystem/planets/earth/satellites/satellites_science.asset
index f23b15e9e5..ff0979e95c 100644
--- a/data/assets/scene/solarsystem/planets/earth/satellites/satellites_science.asset
+++ b/data/assets/scene/solarsystem/planets/earth/satellites/satellites_science.asset
@@ -7,7 +7,6 @@ asset.require("./science/education")
 
 asset.meta = {
   Name = "Satellites Science",
-  Version = "1.0",
   Description = [[Meta asset for science satellites of Earth. Containing groups:
     spaceearth, geodetic, engineering, and education]],
   Author = "OpenSpace Team",
diff --git a/data/assets/scene/solarsystem/planets/earth/satellites/satellites_weather.asset b/data/assets/scene/solarsystem/planets/earth/satellites/satellites_weather.asset
index c659024bc2..c4c6f1a1b0 100644
--- a/data/assets/scene/solarsystem/planets/earth/satellites/satellites_weather.asset
+++ b/data/assets/scene/solarsystem/planets/earth/satellites/satellites_weather.asset
@@ -13,7 +13,6 @@ asset.require("./weather/weather")
 
 asset.meta = {
   Name = "Satellites Weather",
-  Version = "1.0",
   Description = [[Meta asset for weather satellites of Earth. Containing groups: argos,
     dmc, earth_resources, geos, noaa, planet, sarsat, spire, tdrss, and weather]],
   Author = "OpenSpace Team",
diff --git a/data/assets/scene/solarsystem/planets/earth/satellites/science/education.asset b/data/assets/scene/solarsystem/planets/earth/satellites/science/education.asset
index 7818ebe0d1..408e8b7fd5 100644
--- a/data/assets/scene/solarsystem/planets/earth/satellites/science/education.asset
+++ b/data/assets/scene/solarsystem/planets/earth/satellites/science/education.asset
@@ -47,7 +47,6 @@ asset.export(EducationSatellites)
 
 asset.meta = {
   Name = "Satellites Science Education",
-  Version = "1.0",
   Description = "Satellites asset for Science Education. Data from Celestrak",
   Author = "OpenSpace Team",
   URL = "https://celestrak.com/NORAD/elements/",
diff --git a/data/assets/scene/solarsystem/planets/earth/satellites/science/engineering.asset b/data/assets/scene/solarsystem/planets/earth/satellites/science/engineering.asset
index ab7d807f47..7d14321be1 100644
--- a/data/assets/scene/solarsystem/planets/earth/satellites/science/engineering.asset
+++ b/data/assets/scene/solarsystem/planets/earth/satellites/science/engineering.asset
@@ -47,7 +47,6 @@ asset.export(EngineeringSatellites)
 
 asset.meta = {
   Name = "Satellites Science Engineering",
-  Version = "1.0",
   Description = "Satellites asset for Science Engineering. Data from Celestrak",
   Author = "OpenSpace Team",
   URL = "https://celestrak.com/NORAD/elements/",
diff --git a/data/assets/scene/solarsystem/planets/earth/satellites/science/geodetic.asset b/data/assets/scene/solarsystem/planets/earth/satellites/science/geodetic.asset
index 31edb287a1..348418d008 100644
--- a/data/assets/scene/solarsystem/planets/earth/satellites/science/geodetic.asset
+++ b/data/assets/scene/solarsystem/planets/earth/satellites/science/geodetic.asset
@@ -47,7 +47,6 @@ asset.export(GeodeticSatellites)
 
 asset.meta = {
   Name = "Satellites Science Geodect",
-  Version = "1.0",
   Description = "Satellites asset for Science Geodect. Data from Celestrak",
   Author = "OpenSpace Team",
   URL = "https://celestrak.com/NORAD/elements/",
diff --git a/data/assets/scene/solarsystem/planets/earth/satellites/science/spaceearth.asset b/data/assets/scene/solarsystem/planets/earth/satellites/science/spaceearth.asset
index b8425c65d2..42d4b5c09c 100644
--- a/data/assets/scene/solarsystem/planets/earth/satellites/science/spaceearth.asset
+++ b/data/assets/scene/solarsystem/planets/earth/satellites/science/spaceearth.asset
@@ -47,7 +47,6 @@ asset.export(ScienceSatellites)
 
 asset.meta = {
   Name = "Satellites Science Space & Earth Science",
-  Version = "1.0",
   Description = "Satellites asset for Science Space & Earth Science. Data from Celestrak",
   Author = "OpenSpace Team",
   URL = "https://celestrak.com/NORAD/elements/",
diff --git a/data/assets/scene/solarsystem/planets/earth/satellites/weather/aqua.asset b/data/assets/scene/solarsystem/planets/earth/satellites/weather/aqua.asset
index 4f83510772..0d9664f73c 100644
--- a/data/assets/scene/solarsystem/planets/earth/satellites/weather/aqua.asset
+++ b/data/assets/scene/solarsystem/planets/earth/satellites/weather/aqua.asset
@@ -110,7 +110,6 @@ asset.export(AquaLabel)
 
 asset.meta = {
   Name = "Aqua",
-  Version = "1.0",
   Description = [[Trail for Aqua. trail from Celestrak. Can be used in conjuntion with
     Aqua Modis (Temporal) layer for Earth]],
   Author = "OpenSpace Team",
diff --git a/data/assets/scene/solarsystem/planets/earth/satellites/weather/argos.asset b/data/assets/scene/solarsystem/planets/earth/satellites/weather/argos.asset
index 8db1cb122f..7be059f832 100644
--- a/data/assets/scene/solarsystem/planets/earth/satellites/weather/argos.asset
+++ b/data/assets/scene/solarsystem/planets/earth/satellites/weather/argos.asset
@@ -47,7 +47,6 @@ asset.export(Argos)
 
 asset.meta = {
   Name = "Satellites Weather - ARGOS",
-  Version = "1.0",
   Description = "Satellites asset for Weather - ARGOS. Data from Celestrak",
   Author = "OpenSpace Team",
   URL = "https://celestrak.com/NORAD/elements/",
diff --git a/data/assets/scene/solarsystem/planets/earth/satellites/weather/dmc.asset b/data/assets/scene/solarsystem/planets/earth/satellites/weather/dmc.asset
index 82f874ae58..05588ee42c 100644
--- a/data/assets/scene/solarsystem/planets/earth/satellites/weather/dmc.asset
+++ b/data/assets/scene/solarsystem/planets/earth/satellites/weather/dmc.asset
@@ -47,7 +47,6 @@ asset.export(DisasterMonitoringConstellation)
 
 asset.meta = {
   Name = "Satellites Weather - Disaster Monitoring",
-  Version = "1.0",
   Description = "Satellites asset for Weather - Disaster Monitoring. Data from Celestrak",
   Author = "OpenSpace Team",
   URL = "https://celestrak.com/NORAD/elements/",
diff --git a/data/assets/scene/solarsystem/planets/earth/satellites/weather/earth_resources.asset b/data/assets/scene/solarsystem/planets/earth/satellites/weather/earth_resources.asset
index 631373fbcb..4848a12932 100644
--- a/data/assets/scene/solarsystem/planets/earth/satellites/weather/earth_resources.asset
+++ b/data/assets/scene/solarsystem/planets/earth/satellites/weather/earth_resources.asset
@@ -47,7 +47,6 @@ asset.export(ResourceSatellites)
 
 asset.meta = {
   Name = "Satellites Weather - Earth Resources",
-  Version = "1.0",
   Description = "Satellites asset for Weather - Earth Resources. Data from Celestrak",
   Author = "OpenSpace Team",
   URL = "https://celestrak.com/NORAD/elements/",
diff --git a/data/assets/scene/solarsystem/planets/earth/satellites/weather/goes.asset b/data/assets/scene/solarsystem/planets/earth/satellites/weather/goes.asset
index 419b87dd36..a694780a81 100644
--- a/data/assets/scene/solarsystem/planets/earth/satellites/weather/goes.asset
+++ b/data/assets/scene/solarsystem/planets/earth/satellites/weather/goes.asset
@@ -47,7 +47,6 @@ asset.export(GoesSatellites)
 
 asset.meta = {
   Name = "Satellites Weather - GOES",
-  Version = "1.0",
   Description = "Satellites asset for Weather - GOES. Data from Celestrak",
   Author = "OpenSpace Team",
   URL = "https://celestrak.com/NORAD/elements/",
diff --git a/data/assets/scene/solarsystem/planets/earth/satellites/weather/noaa.asset b/data/assets/scene/solarsystem/planets/earth/satellites/weather/noaa.asset
index 04aa30771e..7ff751cda9 100644
--- a/data/assets/scene/solarsystem/planets/earth/satellites/weather/noaa.asset
+++ b/data/assets/scene/solarsystem/planets/earth/satellites/weather/noaa.asset
@@ -47,7 +47,6 @@ asset.export(NoaaSatellites)
 
 asset.meta = {
   Name = "Satellites Weather - NOAA",
-  Version = "1.0",
   Description = "Satellites asset for Weather - NOAA. Data from Celestrak",
   Author = "OpenSpace Team",
   URL = "https://celestrak.com/NORAD/elements/",
diff --git a/data/assets/scene/solarsystem/planets/earth/satellites/weather/planet.asset b/data/assets/scene/solarsystem/planets/earth/satellites/weather/planet.asset
index 1e53d59d24..dab42495da 100644
--- a/data/assets/scene/solarsystem/planets/earth/satellites/weather/planet.asset
+++ b/data/assets/scene/solarsystem/planets/earth/satellites/weather/planet.asset
@@ -46,7 +46,6 @@ asset.export(PlanetSatellites)
 
 asset.meta = {
   Name = "Satellites Weather - Planet",
-  Version = "1.0",
   Description = "Satellites asset for Weather - Planet. Data from Celestrak",
   Author = "OpenSpace Team",
   URL = "https://celestrak.com/NORAD/elements/",
diff --git a/data/assets/scene/solarsystem/planets/earth/satellites/weather/sarsat.asset b/data/assets/scene/solarsystem/planets/earth/satellites/weather/sarsat.asset
index a945b6daec..b988cfe526 100644
--- a/data/assets/scene/solarsystem/planets/earth/satellites/weather/sarsat.asset
+++ b/data/assets/scene/solarsystem/planets/earth/satellites/weather/sarsat.asset
@@ -47,7 +47,6 @@ asset.export(SarSatellites)
 
 asset.meta = {
   Name = "Satellites Weather - Search & Rescue (SARSAT)",
-  Version = "1.0",
   Description = [[Satellites asset for Weather - Search & Rescue (SARSAT). Data from
     Celestrak]],
   Author = "OpenSpace Team",
diff --git a/data/assets/scene/solarsystem/planets/earth/satellites/weather/snpp.asset b/data/assets/scene/solarsystem/planets/earth/satellites/weather/snpp.asset
index db49be9f8c..cc6957477c 100644
--- a/data/assets/scene/solarsystem/planets/earth/satellites/weather/snpp.asset
+++ b/data/assets/scene/solarsystem/planets/earth/satellites/weather/snpp.asset
@@ -108,7 +108,6 @@ asset.export(SNPPLabel)
 
 asset.meta = {
   Name = "SNPP",
-  Version = "1.0",
   Description = [[Trail for SNPP. trail from Celestrak. Can be used in conjunction with
     VIIRS SNPP (Temporal) layer for Earth]],
   Author = "OpenSpace Team",
diff --git a/data/assets/scene/solarsystem/planets/earth/satellites/weather/spire.asset b/data/assets/scene/solarsystem/planets/earth/satellites/weather/spire.asset
index 9b12c8f373..c1c545f937 100644
--- a/data/assets/scene/solarsystem/planets/earth/satellites/weather/spire.asset
+++ b/data/assets/scene/solarsystem/planets/earth/satellites/weather/spire.asset
@@ -47,7 +47,6 @@ asset.export(SpireSatellites)
 
 asset.meta = {
   Name = "Satellites Weather - Spire",
-  Version = "1.0",
   Description = [[Satellites asset for the Spire constellation. Data from Celestrak]],
   Author = "OpenSpace Team",
   URL = "https://celestrak.com/NORAD/elements/",
diff --git a/data/assets/scene/solarsystem/planets/earth/satellites/weather/tdrss.asset b/data/assets/scene/solarsystem/planets/earth/satellites/weather/tdrss.asset
index 3e82754028..48ae177086 100644
--- a/data/assets/scene/solarsystem/planets/earth/satellites/weather/tdrss.asset
+++ b/data/assets/scene/solarsystem/planets/earth/satellites/weather/tdrss.asset
@@ -47,7 +47,6 @@ asset.export(TrackingDataRelaySatellites)
 
 asset.meta = {
   Name = "Satellites Weather - Tracking and Data Relay Satellite System (TDRSS)",
-  Version = "1.0",
   Description = [[Satellites asset for Weather - Tracking and Data Relay Satellite
     System (TDRSS). Data from Celestrak]],
   Author = "OpenSpace Team",
diff --git a/data/assets/scene/solarsystem/planets/earth/satellites/weather/terra.asset b/data/assets/scene/solarsystem/planets/earth/satellites/weather/terra.asset
index ce5b6c02cf..d19b20f30c 100644
--- a/data/assets/scene/solarsystem/planets/earth/satellites/weather/terra.asset
+++ b/data/assets/scene/solarsystem/planets/earth/satellites/weather/terra.asset
@@ -110,7 +110,6 @@ asset.export(TerraLabel)
 
 asset.meta = {
   Name = "Terra",
-  Version = "1.0",
   Description = [[Trail for Terra. trail from Celestrak. Can be used in conjuntion with
     Terra Modis (Temporal) layer for Earth]],
   Author = "OpenSpace Team",
diff --git a/data/assets/scene/solarsystem/planets/earth/satellites/weather/weather.asset b/data/assets/scene/solarsystem/planets/earth/satellites/weather/weather.asset
index ffeec49d3b..479eeee5d6 100644
--- a/data/assets/scene/solarsystem/planets/earth/satellites/weather/weather.asset
+++ b/data/assets/scene/solarsystem/planets/earth/satellites/weather/weather.asset
@@ -47,7 +47,6 @@ asset.export(WeatherSatellites)
 
 asset.meta = {
   Name = "Satellites Weather - Weather",
-  Version = "1.0",
   Description = "Satellites asset for Weather - Weather. Data from Celestrak",
   Author = "OpenSpace Team",
   URL = "https://celestrak.com/NORAD/elements/",
diff --git a/data/assets/scene/solarsystem/planets/earth/trail.asset b/data/assets/scene/solarsystem/planets/earth/trail.asset
index 8d024b1124..a127de8615 100644
--- a/data/assets/scene/solarsystem/planets/earth/trail.asset
+++ b/data/assets/scene/solarsystem/planets/earth/trail.asset
@@ -39,7 +39,6 @@ asset.export(EarthTrail)
 
 asset.meta = {
   Name = "Earth Trail",
-  Version = "1.1",
   Description = "Trail of Earth as observed by the Sun",
   Author = "OpenSpace Team",
   URL = "http://openspaceproject.com",
diff --git a/data/assets/scene/solarsystem/planets/earth/trail_barycenter.asset b/data/assets/scene/solarsystem/planets/earth/trail_barycenter.asset
index 04377f7598..5687a9ff23 100644
--- a/data/assets/scene/solarsystem/planets/earth/trail_barycenter.asset
+++ b/data/assets/scene/solarsystem/planets/earth/trail_barycenter.asset
@@ -40,7 +40,6 @@ asset.export(EarthBarycenterTrail)
 
 asset.meta = {
   Name = "Earth Trail",
-  Version = "1.1",
   Description = "Trail of Earth's Barycenter as observed by the Sun",
   Author = "OpenSpace Team",
   URL = "http://openspaceproject.com",
diff --git a/data/assets/scene/solarsystem/planets/earth/transforms.asset b/data/assets/scene/solarsystem/planets/earth/transforms.asset
index 364bf7ffe9..d3bbfae3da 100644
--- a/data/assets/scene/solarsystem/planets/earth/transforms.asset
+++ b/data/assets/scene/solarsystem/planets/earth/transforms.asset
@@ -96,7 +96,6 @@ asset.export(EarthIAU)
 
 asset.meta = {
   Name = "Earth Transforms",
-  Version = "1.1",
   Description = [[Earth transforms: Earth Barycenter, Earth Center, Earth Inertial, Earth
     IAU. A scene graph node is created for each transform]],
   Author = "OpenSpace Team",
diff --git a/data/assets/scene/solarsystem/planets/jupiter/callisto/callisto.asset b/data/assets/scene/solarsystem/planets/jupiter/callisto/callisto.asset
index a355ce50a9..e7334ab501 100644
--- a/data/assets/scene/solarsystem/planets/jupiter/callisto/callisto.asset
+++ b/data/assets/scene/solarsystem/planets/jupiter/callisto/callisto.asset
@@ -96,7 +96,6 @@ asset.export(CallistoLabel)
 
 asset.meta = {
   Name = "Callisto",
-  Version = "1.1",
   Description = "Callisto globe with labels",
   Author = "OpenSpace Team",
   URL = "http://openspaceproject.com",
diff --git a/data/assets/scene/solarsystem/planets/jupiter/callisto/default_layers.asset b/data/assets/scene/solarsystem/planets/jupiter/callisto/default_layers.asset
index 22ff575a12..6206a88aad 100644
--- a/data/assets/scene/solarsystem/planets/jupiter/callisto/default_layers.asset
+++ b/data/assets/scene/solarsystem/planets/jupiter/callisto/default_layers.asset
@@ -4,7 +4,6 @@ asset.require("./layers/colorlayers/callisto_texture", true)
 
 asset.meta = {
   Name = "Default Callisto Layers",
-  Version = "1.0",
   Description = "Default Callisto layers are: Callisto Texture",
   Author = "OpenSpace Team",
   URL = "http://openspaceproject.com",
diff --git a/data/assets/scene/solarsystem/planets/jupiter/callisto/layers/colorlayers/callisto_texture.asset b/data/assets/scene/solarsystem/planets/jupiter/callisto/layers/colorlayers/callisto_texture.asset
index bb9a531bb8..1ba88c257d 100644
--- a/data/assets/scene/solarsystem/planets/jupiter/callisto/layers/colorlayers/callisto_texture.asset
+++ b/data/assets/scene/solarsystem/planets/jupiter/callisto/layers/colorlayers/callisto_texture.asset
@@ -32,7 +32,6 @@ asset.export("layer", Layer)
 
 asset.meta = {
   Name = "Callisto Texutre",
-  Version = "2.0",
   Description = "Default texture for Callisto",
   Author = "OpenSpace Team",
   URL = "http://openspaceproject.com",
diff --git a/data/assets/scene/solarsystem/planets/jupiter/callisto/trail.asset b/data/assets/scene/solarsystem/planets/jupiter/callisto/trail.asset
index fe613e3c0d..a7a46d6c9a 100644
--- a/data/assets/scene/solarsystem/planets/jupiter/callisto/trail.asset
+++ b/data/assets/scene/solarsystem/planets/jupiter/callisto/trail.asset
@@ -40,7 +40,6 @@ asset.export(CallistoTrail)
 
 asset.meta = {
   Name = "Callisto Trail",
-  Version = "1.1",
   Description = "Trail of Callisto as observed by the Jupiter",
   Author = "OpenSpace Team",
   URL = "http://openspaceproject.com",
diff --git a/data/assets/scene/solarsystem/planets/jupiter/default_layers.asset b/data/assets/scene/solarsystem/planets/jupiter/default_layers.asset
index e22ad9dd6e..31ad1ab6eb 100644
--- a/data/assets/scene/solarsystem/planets/jupiter/default_layers.asset
+++ b/data/assets/scene/solarsystem/planets/jupiter/default_layers.asset
@@ -3,7 +3,6 @@ asset.require("./layers/colorlayers/jupiter_texture", true)
 
 asset.meta = {
   Name = "Default Jupiter Layers",
-  Version = "1.0",
   Description = "Default Jupiter layers are: Jupiter Texture",
   Author = "OpenSpace Team",
   URL = "http://openspaceproject.com",
diff --git a/data/assets/scene/solarsystem/planets/jupiter/europa/default_layers.asset b/data/assets/scene/solarsystem/planets/jupiter/europa/default_layers.asset
index 2913c56a2b..a99800dbd1 100644
--- a/data/assets/scene/solarsystem/planets/jupiter/europa/default_layers.asset
+++ b/data/assets/scene/solarsystem/planets/jupiter/europa/default_layers.asset
@@ -7,7 +7,6 @@ asset.require("./layers/newyork_layers", false)
 
 asset.meta = {
   Name = "Default Europa Layers",
-  Version = "1.2",
   Description = [[Default Europa layers are: Europa Texture & Voyager Global Mosaic.
 
 
diff --git a/data/assets/scene/solarsystem/planets/jupiter/europa/europa.asset b/data/assets/scene/solarsystem/planets/jupiter/europa/europa.asset
index 308d81031f..2acb195582 100644
--- a/data/assets/scene/solarsystem/planets/jupiter/europa/europa.asset
+++ b/data/assets/scene/solarsystem/planets/jupiter/europa/europa.asset
@@ -95,7 +95,6 @@ asset.export(EuropaLabel)
 
 asset.meta = {
   Name = "Europa",
-  Version = "1.1",
   Description = "Europa globe with labels",
   Author = "OpenSpace Team",
   URL = "http://openspaceproject.com",
diff --git a/data/assets/scene/solarsystem/planets/jupiter/europa/layers/base_layers.asset b/data/assets/scene/solarsystem/planets/jupiter/europa/layers/base_layers.asset
index bfc02aca0a..474706e26e 100644
--- a/data/assets/scene/solarsystem/planets/jupiter/europa/layers/base_layers.asset
+++ b/data/assets/scene/solarsystem/planets/jupiter/europa/layers/base_layers.asset
@@ -4,7 +4,6 @@ asset.require("./colorlayers/europa_texture", false)
 
 asset.meta = {
   Name = "Base Europa Layers",
-  Version = "1.0",
   Description = "Base Europa layers are: Europa Texture",
   Author = "OpenSpace Team",
   URL = "http://openspaceproject.com",
diff --git a/data/assets/scene/solarsystem/planets/jupiter/europa/layers/colorlayers/europa_texture.asset b/data/assets/scene/solarsystem/planets/jupiter/europa/layers/colorlayers/europa_texture.asset
index a4997b77ca..b2cd16f4c8 100644
--- a/data/assets/scene/solarsystem/planets/jupiter/europa/layers/colorlayers/europa_texture.asset
+++ b/data/assets/scene/solarsystem/planets/jupiter/europa/layers/colorlayers/europa_texture.asset
@@ -32,7 +32,6 @@ asset.export("layer", Layer)
 
 asset.meta = {
   Name = "Europa Texutre",
-  Version = "2.0",
   Description = "Default texture for Europa",
   Author = "OpenSpace Team",
   URL = "http://openspaceproject.com",
diff --git a/data/assets/scene/solarsystem/planets/jupiter/europa/layers/colorlayers/voyager_global_mosaic_local.asset b/data/assets/scene/solarsystem/planets/jupiter/europa/layers/colorlayers/voyager_global_mosaic_local.asset
index 03e9a550b7..c4f4c5244e 100644
--- a/data/assets/scene/solarsystem/planets/jupiter/europa/layers/colorlayers/voyager_global_mosaic_local.asset
+++ b/data/assets/scene/solarsystem/planets/jupiter/europa/layers/colorlayers/voyager_global_mosaic_local.asset
@@ -33,7 +33,6 @@ asset.export("layer", Layer)
 
 asset.meta = {
   Name = "Voyager Global Mosaic",
-  Version = "1.1",
   Description = [[Europa Voyager - Galileo SSI Global Mosaic 500m v2. This global map
     base of Europa utilizes the best image quality and moderate resolution coverage
     supplied by the Galileo SSI (Solid-State Imaging) instrument and Voyager 1 and 2.
diff --git a/data/assets/scene/solarsystem/planets/jupiter/europa/layers/colorlayers/voyager_global_mosaic_newyork.asset b/data/assets/scene/solarsystem/planets/jupiter/europa/layers/colorlayers/voyager_global_mosaic_newyork.asset
index 00bf144cef..e836a404d6 100644
--- a/data/assets/scene/solarsystem/planets/jupiter/europa/layers/colorlayers/voyager_global_mosaic_newyork.asset
+++ b/data/assets/scene/solarsystem/planets/jupiter/europa/layers/colorlayers/voyager_global_mosaic_newyork.asset
@@ -26,7 +26,6 @@ asset.export("layer", Layer)
 
 asset.meta = {
   Name = "Voyager Global Mosaic [New York]",
-  Version = "1.1",
   Description = [[Europa Voyager - Galileo SSI Global Mosaic 500m v2. This global map
     base of Europa utilizes the best image quality and moderate resolution coverage
     supplied by the Galileo SSI (Solid-State Imaging) instrument and Voyager 1 and 2.
diff --git a/data/assets/scene/solarsystem/planets/jupiter/europa/layers/colorlayers/voyager_global_mosaic_sweden.asset b/data/assets/scene/solarsystem/planets/jupiter/europa/layers/colorlayers/voyager_global_mosaic_sweden.asset
index 9e578d873c..5022037a75 100644
--- a/data/assets/scene/solarsystem/planets/jupiter/europa/layers/colorlayers/voyager_global_mosaic_sweden.asset
+++ b/data/assets/scene/solarsystem/planets/jupiter/europa/layers/colorlayers/voyager_global_mosaic_sweden.asset
@@ -26,7 +26,6 @@ asset.export("layer", Layer)
 
 asset.meta = {
   Name = "Voyager Global Mosaic [Sweden]",
-  Version = "1.1",
   Description = [[Europa Voyager - Galileo SSI Global Mosaic 500m v2. This global map
     base of Europa utilizes the best image quality and moderate resolution coverage
     supplied by the Galileo SSI (Solid-State Imaging) instrument and Voyager 1 and 2.
diff --git a/data/assets/scene/solarsystem/planets/jupiter/europa/layers/local_layers.asset b/data/assets/scene/solarsystem/planets/jupiter/europa/layers/local_layers.asset
index 906e0f74fd..4a2fe473f1 100644
--- a/data/assets/scene/solarsystem/planets/jupiter/europa/layers/local_layers.asset
+++ b/data/assets/scene/solarsystem/planets/jupiter/europa/layers/local_layers.asset
@@ -5,7 +5,6 @@ asset.require("./colorlayers/voyager_global_mosaic_local", asset.enabled)
 
 asset.meta = {
   Name = "Default Europa Layers (Local)",
-  Version = "1.0",
   Description = [[Default Europa layers are: Europa Texture & Voyager Global Mosaic.
 
 
diff --git a/data/assets/scene/solarsystem/planets/jupiter/europa/layers/newyork_layers.asset b/data/assets/scene/solarsystem/planets/jupiter/europa/layers/newyork_layers.asset
index 091189c520..bdba5d78d2 100644
--- a/data/assets/scene/solarsystem/planets/jupiter/europa/layers/newyork_layers.asset
+++ b/data/assets/scene/solarsystem/planets/jupiter/europa/layers/newyork_layers.asset
@@ -5,7 +5,6 @@ asset.require("./colorlayers/voyager_global_mosaic_newyork", asset.enabled)
 
 asset.meta = {
   Name = "Default Europa Layers (New York)",
-  Version = "1.0",
   Description = [[Default Europa layers are: Europa Texture & Voyager Global Mosaic.
 
 
diff --git a/data/assets/scene/solarsystem/planets/jupiter/europa/layers/sweden_layers.asset b/data/assets/scene/solarsystem/planets/jupiter/europa/layers/sweden_layers.asset
index 1a7a661a93..29809a8bb3 100644
--- a/data/assets/scene/solarsystem/planets/jupiter/europa/layers/sweden_layers.asset
+++ b/data/assets/scene/solarsystem/planets/jupiter/europa/layers/sweden_layers.asset
@@ -5,7 +5,6 @@ asset.require("./colorlayers/voyager_global_mosaic_sweden", asset.enabled)
 
 asset.meta = {
   Name = "Default Europa Layers (Sweden)",
-  Version = "1.0",
   Description = [[Default Europa layers are: Europa Texture & Voyager Global Mosaic.
 
 
diff --git a/data/assets/scene/solarsystem/planets/jupiter/europa/trail.asset b/data/assets/scene/solarsystem/planets/jupiter/europa/trail.asset
index f6e9e6033e..d0f6334f54 100644
--- a/data/assets/scene/solarsystem/planets/jupiter/europa/trail.asset
+++ b/data/assets/scene/solarsystem/planets/jupiter/europa/trail.asset
@@ -40,7 +40,6 @@ asset.export(EuropaTrail)
 
 asset.meta = {
   Name = "Europa Trail",
-  Version = "1.1",
   Description = "Trail of Europa as observed by the Jupiter",
   Author = "OpenSpace Team",
   URL = "http://openspaceproject.com",
diff --git a/data/assets/scene/solarsystem/planets/jupiter/ganymede/default_layers.asset b/data/assets/scene/solarsystem/planets/jupiter/ganymede/default_layers.asset
index 4ca63cd78b..75142f4fcb 100644
--- a/data/assets/scene/solarsystem/planets/jupiter/ganymede/default_layers.asset
+++ b/data/assets/scene/solarsystem/planets/jupiter/ganymede/default_layers.asset
@@ -4,7 +4,6 @@ asset.require("./layers/colorlayers/ganymede_texture", true)
 
 asset.meta = {
   Name = "Default Ganymede Layers",
-  Version = "1.0",
   Description = "Default Ganymede layers are: Ganymede Texture",
   Author = "OpenSpace Team",
   URL = "http://openspaceproject.com",
diff --git a/data/assets/scene/solarsystem/planets/jupiter/ganymede/ganymede.asset b/data/assets/scene/solarsystem/planets/jupiter/ganymede/ganymede.asset
index 1affabb3aa..9b4989db77 100644
--- a/data/assets/scene/solarsystem/planets/jupiter/ganymede/ganymede.asset
+++ b/data/assets/scene/solarsystem/planets/jupiter/ganymede/ganymede.asset
@@ -95,7 +95,6 @@ asset.export(GanymedeLabel)
 
 asset.meta = {
   Name = "Ganymede",
-  Version = "1.1",
   Description = "Ganymede globe with labels",
   Author = "OpenSpace Team",
   URL = "http://openspaceproject.com",
diff --git a/data/assets/scene/solarsystem/planets/jupiter/ganymede/layers/colorlayers/ganymede_texture.asset b/data/assets/scene/solarsystem/planets/jupiter/ganymede/layers/colorlayers/ganymede_texture.asset
index d86342d558..13708b7291 100644
--- a/data/assets/scene/solarsystem/planets/jupiter/ganymede/layers/colorlayers/ganymede_texture.asset
+++ b/data/assets/scene/solarsystem/planets/jupiter/ganymede/layers/colorlayers/ganymede_texture.asset
@@ -33,7 +33,6 @@ asset.export("layer", Layer)
 
 asset.meta = {
   Name = "Ganymede Texutre",
-  Version = "1.0",
   Description = "Default jpg texture for Ganymede",
   Author = "OpenSpace Team",
   URL = "http://openspaceproject.com",
diff --git a/data/assets/scene/solarsystem/planets/jupiter/ganymede/trail.asset b/data/assets/scene/solarsystem/planets/jupiter/ganymede/trail.asset
index 42e92748c1..7d9a810209 100644
--- a/data/assets/scene/solarsystem/planets/jupiter/ganymede/trail.asset
+++ b/data/assets/scene/solarsystem/planets/jupiter/ganymede/trail.asset
@@ -40,7 +40,6 @@ asset.export(GanymedeTrail)
 
 asset.meta = {
   Name = "Ganymede Trail",
-  Version = "1.1",
   Description = "Trail of Ganymede as observed by the Jupiter",
   Author = "OpenSpace Team",
   URL = "http://openspaceproject.com",
diff --git a/data/assets/scene/solarsystem/planets/jupiter/io/default_layers.asset b/data/assets/scene/solarsystem/planets/jupiter/io/default_layers.asset
index a13b793992..f293aaf828 100644
--- a/data/assets/scene/solarsystem/planets/jupiter/io/default_layers.asset
+++ b/data/assets/scene/solarsystem/planets/jupiter/io/default_layers.asset
@@ -4,7 +4,6 @@ asset.require("./layers/colorlayers/io_texture", true)
 
 asset.meta = {
   Name = "Default Io Layers",
-  Version = "1.0",
   Description = "Default Io layers are: Io Texture",
   Author = "OpenSpace Team",
   URL = "http://openspaceproject.com",
diff --git a/data/assets/scene/solarsystem/planets/jupiter/io/io.asset b/data/assets/scene/solarsystem/planets/jupiter/io/io.asset
index a30db8cfe7..a61401b40b 100644
--- a/data/assets/scene/solarsystem/planets/jupiter/io/io.asset
+++ b/data/assets/scene/solarsystem/planets/jupiter/io/io.asset
@@ -95,7 +95,6 @@ asset.export(IoLabel)
 
 asset.meta = {
   Name = "Io",
-  Version = "1.1",
   Description = "Io globe with labels",
   Author = "OpenSpace Team",
   URL = "http://openspaceproject.com",
diff --git a/data/assets/scene/solarsystem/planets/jupiter/io/layers/colorlayers/io_texture.asset b/data/assets/scene/solarsystem/planets/jupiter/io/layers/colorlayers/io_texture.asset
index e3cb09a5e7..91fcc1f4c3 100644
--- a/data/assets/scene/solarsystem/planets/jupiter/io/layers/colorlayers/io_texture.asset
+++ b/data/assets/scene/solarsystem/planets/jupiter/io/layers/colorlayers/io_texture.asset
@@ -33,7 +33,6 @@ asset.export("layer", Layer)
 
 asset.meta = {
   Name = "Io Texutre",
-  Version = "1.0",
   Description = "Default jpg texture for Io",
   Author = "OpenSpace Team",
   URL = "http://openspaceproject.com",
diff --git a/data/assets/scene/solarsystem/planets/jupiter/io/trail.asset b/data/assets/scene/solarsystem/planets/jupiter/io/trail.asset
index c145f47407..cc58f52492 100644
--- a/data/assets/scene/solarsystem/planets/jupiter/io/trail.asset
+++ b/data/assets/scene/solarsystem/planets/jupiter/io/trail.asset
@@ -40,7 +40,6 @@ asset.export(IoTrail)
 
 asset.meta = {
   Name = "Io Trail",
-  Version = "1.1",
   Description = "Trail of Io as observed by the Jupiter",
   Author = "OpenSpace Team",
   URL = "http://openspaceproject.com",
diff --git a/data/assets/scene/solarsystem/planets/jupiter/jupiter.asset b/data/assets/scene/solarsystem/planets/jupiter/jupiter.asset
index 561332d4bd..7b5f3c2f17 100644
--- a/data/assets/scene/solarsystem/planets/jupiter/jupiter.asset
+++ b/data/assets/scene/solarsystem/planets/jupiter/jupiter.asset
@@ -84,7 +84,6 @@ asset.export(JupiterLabel)
 
 asset.meta = {
   Name = "Jupiter",
-  Version = "1.1",
   Description = "Jupiter globe, and main planet label",
   Author = "OpenSpace Team",
   URL = "http://openspaceproject.com",
diff --git a/data/assets/scene/solarsystem/planets/jupiter/kernels.asset b/data/assets/scene/solarsystem/planets/jupiter/kernels.asset
index 075a9afbd5..11df00395a 100644
--- a/data/assets/scene/solarsystem/planets/jupiter/kernels.asset
+++ b/data/assets/scene/solarsystem/planets/jupiter/kernels.asset
@@ -38,7 +38,6 @@ asset.export("Frame", Frame)
 
 asset.meta = {
   Name = "Jupiter Spice Kernels",
-  Version = "1.0",
   Description = "Generic SPICE kernels for Jupiter",
   Author = "OpenSpace Team",
   URL = "https://naif.jpl.nasa.gov/pub/naif/pds/wgc/kernels/spk/",
diff --git a/data/assets/scene/solarsystem/planets/jupiter/kernels344.asset b/data/assets/scene/solarsystem/planets/jupiter/kernels344.asset
index 6d58a7a524..ffa8caf68a 100644
--- a/data/assets/scene/solarsystem/planets/jupiter/kernels344.asset
+++ b/data/assets/scene/solarsystem/planets/jupiter/kernels344.asset
@@ -129,7 +129,6 @@ asset.export("Frame", Frame)
 
 asset.meta = {
   Name = "Jupiter Spice Kernels",
-  Version = "1.0",
   Description = "Generic SPICE kernels for Jupiter",
   Author = "OpenSpace Team",
   URL = "https://naif.jpl.nasa.gov/pub/naif/pds/wgc/kernels/spk/",
diff --git a/data/assets/scene/solarsystem/planets/jupiter/kernels346.asset b/data/assets/scene/solarsystem/planets/jupiter/kernels346.asset
index 4eb996ae53..cb67010bdc 100644
--- a/data/assets/scene/solarsystem/planets/jupiter/kernels346.asset
+++ b/data/assets/scene/solarsystem/planets/jupiter/kernels346.asset
@@ -39,7 +39,6 @@ asset.export("ID", ID)
 
 asset.meta = {
   Name = "Jupiter Spice Kernels",
-  Version = "1.0",
   Description = "Generic SPICE kernels for Jupiter",
   Author = "OpenSpace Team",
   URL = "https://naif.jpl.nasa.gov/pub/naif/pds/wgc/kernels/spk/",
diff --git a/data/assets/scene/solarsystem/planets/jupiter/layers/colorlayers/jupiter_texture.asset b/data/assets/scene/solarsystem/planets/jupiter/layers/colorlayers/jupiter_texture.asset
index 639de8b996..c58c859891 100644
--- a/data/assets/scene/solarsystem/planets/jupiter/layers/colorlayers/jupiter_texture.asset
+++ b/data/assets/scene/solarsystem/planets/jupiter/layers/colorlayers/jupiter_texture.asset
@@ -33,7 +33,6 @@ asset.export("layer", Layer)
 
 asset.meta = {
   Name = "Jupiter Texutre",
-  Version = "2.0",
   Description = "Default texture for Jupiter",
   Author = "OpenSpace Team",
   URL = "http://openspaceproject.com",
diff --git a/data/assets/scene/solarsystem/planets/jupiter/layers/colorlayers/jupiter_video.asset b/data/assets/scene/solarsystem/planets/jupiter/layers/colorlayers/jupiter_video.asset
index 5b16e1d624..3eca6da85e 100644
--- a/data/assets/scene/solarsystem/planets/jupiter/layers/colorlayers/jupiter_video.asset
+++ b/data/assets/scene/solarsystem/planets/jupiter/layers/colorlayers/jupiter_video.asset
@@ -34,7 +34,6 @@ asset.export("layer", Layer)
 
 asset.meta = {
   Name = "Jupiter Video",
-  Version = "1.0",
   Description = "An video showing Jupiter.",
   Author = "NOAA",
   URL = "https://sos.noaa.gov/copyright/",
diff --git a/data/assets/scene/solarsystem/planets/jupiter/major_moons.asset b/data/assets/scene/solarsystem/planets/jupiter/major_moons.asset
index 98dccf15d3..f11db28e35 100644
--- a/data/assets/scene/solarsystem/planets/jupiter/major_moons.asset
+++ b/data/assets/scene/solarsystem/planets/jupiter/major_moons.asset
@@ -83,7 +83,6 @@ asset.export("JupiterMajorMoonsOff", JupiterMajorMoonsOff.Identifier)
 
 asset.meta = {
   Name = "Jupiter Major Moons",
-  Version = "1.1",
   Description = [[Meta asset containing Jupiters major moons: Callisto, Europa,
     Ganymede, and Io]],
   Author = "OpenSpace Team",
diff --git a/data/assets/scene/solarsystem/planets/jupiter/minor/ananke_group.asset b/data/assets/scene/solarsystem/planets/jupiter/minor/ananke_group.asset
index e99f1555b4..b35dfa8936 100644
--- a/data/assets/scene/solarsystem/planets/jupiter/minor/ananke_group.asset
+++ b/data/assets/scene/solarsystem/planets/jupiter/minor/ananke_group.asset
@@ -2033,7 +2033,6 @@ asset.export(S2003J12Label)
 
 asset.meta = {
   Name = "Jupiter Ananke Group Moons",
-  Version = "1.0",
   Description = [[Asset containing Jupiter's Ananke Group moons. Blank globes, SPICE
     trails, and labels are generated for each moon]],
   Author = "OpenSpace Team",
diff --git a/data/assets/scene/solarsystem/planets/jupiter/minor/carme_group.asset b/data/assets/scene/solarsystem/planets/jupiter/minor/carme_group.asset
index 8228f13d82..5912b53308 100644
--- a/data/assets/scene/solarsystem/planets/jupiter/minor/carme_group.asset
+++ b/data/assets/scene/solarsystem/planets/jupiter/minor/carme_group.asset
@@ -2842,7 +2842,6 @@ asset.export(S2003J10Label)
 
 asset.meta = {
   Name = "Jupiter Carme Group Moons",
-  Version = "1.0",
   Description = [[Asset containing Jupiter's Carme Group moons. Blank globes, SPICE
   trails, and labels are generated for each moon]],
   Author = "OpenSpace Team",
diff --git a/data/assets/scene/solarsystem/planets/jupiter/minor/carpo_group.asset b/data/assets/scene/solarsystem/planets/jupiter/minor/carpo_group.asset
index 1e1389393a..b45d7826da 100644
--- a/data/assets/scene/solarsystem/planets/jupiter/minor/carpo_group.asset
+++ b/data/assets/scene/solarsystem/planets/jupiter/minor/carpo_group.asset
@@ -278,7 +278,6 @@ asset.export(S2018J4Label)
 
 asset.meta = {
   Name = "Jupiter Carpo Group Moons",
-  Version = "1.0",
   Description = [[Procedural Globe asset containing Jupiter's Carpo Group moons: Carpo.
     Blank globes and SPICE trails are generated for each moon]],
   Author = "OpenSpace Team",
diff --git a/data/assets/scene/solarsystem/planets/jupiter/minor/himalia_group.asset b/data/assets/scene/solarsystem/planets/jupiter/minor/himalia_group.asset
index 7596027ebe..cc1edebcef 100644
--- a/data/assets/scene/solarsystem/planets/jupiter/minor/himalia_group.asset
+++ b/data/assets/scene/solarsystem/planets/jupiter/minor/himalia_group.asset
@@ -923,7 +923,6 @@ asset.export(ErsaLabel)
 
 asset.meta = {
   Name = "Jupiter Himalia Group Moons",
-  Version = "1.0",
   Description = [[Procedural Globe asset containing Jupiter's Himalia Group moons: Leda,
     Himalia, Lysithea, Elara and Dia. Blank globes and SPICE trails are generated for each
     moon]],
diff --git a/data/assets/scene/solarsystem/planets/jupiter/minor/inner_group.asset b/data/assets/scene/solarsystem/planets/jupiter/minor/inner_group.asset
index e2a9e81fb3..6e3e57cd26 100644
--- a/data/assets/scene/solarsystem/planets/jupiter/minor/inner_group.asset
+++ b/data/assets/scene/solarsystem/planets/jupiter/minor/inner_group.asset
@@ -419,7 +419,6 @@ asset.export(ThebeLabel)
 
 asset.meta = {
   Name = "Jupiter Inner Group Moons",
-  Version = "1.0",
   Description = [[Procedural Globe asset containing Jupiter's Inner Group moons: Metis,
     Adrastea, Amalthea, and Thebe. Blank globes and SPICE trails are generated for each
     moon]],
diff --git a/data/assets/scene/solarsystem/planets/jupiter/minor/other_groups.asset b/data/assets/scene/solarsystem/planets/jupiter/minor/other_groups.asset
index 10580f355f..3d9f44189d 100644
--- a/data/assets/scene/solarsystem/planets/jupiter/minor/other_groups.asset
+++ b/data/assets/scene/solarsystem/planets/jupiter/minor/other_groups.asset
@@ -316,7 +316,6 @@ asset.export(ValetudoLabel)
 
 asset.meta = {
   Name = "Jupiter Pasiphae Other Moons",
-  Version = "1.0",
   Description = [[Procedural Globe asset containing Jupiter's Other Group moons: S2003J12,
     S/2003J3, S2011J1, S2003J19, S2003J10, S2003J9, and S2003J2. Blank globes
     and SPICE trails are generated for each moon]],
diff --git a/data/assets/scene/solarsystem/planets/jupiter/minor/pasiphae_group.asset b/data/assets/scene/solarsystem/planets/jupiter/minor/pasiphae_group.asset
index bc2585fa3b..358e09c8ef 100644
--- a/data/assets/scene/solarsystem/planets/jupiter/minor/pasiphae_group.asset
+++ b/data/assets/scene/solarsystem/planets/jupiter/minor/pasiphae_group.asset
@@ -2335,13 +2335,12 @@ asset.export(S2003J23Label)
 
 
 asset.meta = {
-    Name = "Jupiter Pasiphae Group Moons",
-    Version = "1.0",
-    Description = [[Procedural Globe asset containing Jupiter's Pasiphae Group moons:
-      Euporie, S2003J18, Helike, Orthosie, S2016J1, S2003J15, Aoede, Callirrhoe, Eurydome,
-      Kore, Cyllene, S2011J2, S2017J1, S2003J4, Pasiphae, Hegemone, Sinope, Sponde,
-      Autonoe and Megaclite. Blank globes and SPICE trails are generated for each moon]],
-    Author = "OpenSpace Team",
-    URL = "http://openspaceproject.com",
-    License = "MIT license"
+  Name = "Jupiter Pasiphae Group Moons",
+  Description = [[Procedural Globe asset containing Jupiter's Pasiphae Group moons:
+    Euporie, S2003J18, Helike, Orthosie, S2016J1, S2003J15, Aoede, Callirrhoe, Eurydome,
+    Kore, Cyllene, S2011J2, S2017J1, S2003J4, Pasiphae, Hegemone, Sinope, Sponde,
+    Autonoe and Megaclite. Blank globes and SPICE trails are generated for each moon]],
+  Author = "OpenSpace Team",
+  URL = "http://openspaceproject.com",
+  License = "MIT license"
 }
diff --git a/data/assets/scene/solarsystem/planets/jupiter/minor/themisto_group.asset b/data/assets/scene/solarsystem/planets/jupiter/minor/themisto_group.asset
index f917531e97..92820768db 100644
--- a/data/assets/scene/solarsystem/planets/jupiter/minor/themisto_group.asset
+++ b/data/assets/scene/solarsystem/planets/jupiter/minor/themisto_group.asset
@@ -114,7 +114,6 @@ asset.export(ThemistoLabel)
 
 asset.meta = {
   Name = "Jupiter Themisto Group Moons",
-  Version = "1.0",
   Description = [[Procedural Globe asset containing Jupiter's Themisto Group moons:
     Themisto. Blank globes and SPICE trails are generated for each moon]],
   Author = "OpenSpace Team",
diff --git a/data/assets/scene/solarsystem/planets/jupiter/minor_moons.asset b/data/assets/scene/solarsystem/planets/jupiter/minor_moons.asset
index c071959616..83641da904 100644
--- a/data/assets/scene/solarsystem/planets/jupiter/minor_moons.asset
+++ b/data/assets/scene/solarsystem/planets/jupiter/minor_moons.asset
@@ -87,7 +87,6 @@ asset.export("JupiterMinorMoonsOff", JupiterMinorMoonsOff.Identifier)
 
 asset.meta = {
   Name = "Jupiter Minor Moons",
-  Version = "1.1",
   Description = [[Meta asset containing eight moon groups: Ananke, Carme, Carpo, Himalia,
     Pasiphae, Themisto, Inner, and Other]],
   Author = "OpenSpace Team",
diff --git a/data/assets/scene/solarsystem/planets/jupiter/trail.asset b/data/assets/scene/solarsystem/planets/jupiter/trail.asset
index 983a630479..45c8633c63 100644
--- a/data/assets/scene/solarsystem/planets/jupiter/trail.asset
+++ b/data/assets/scene/solarsystem/planets/jupiter/trail.asset
@@ -39,7 +39,6 @@ asset.export(JupiterTrail)
 
 asset.meta = {
   Name = "Jupiter Trail",
-  Version = "1.1",
   Description = "Trail of Jupiter as observed by the Sun",
   Author = "OpenSpace Team",
   URL = "http://openspaceproject.com",
diff --git a/data/assets/scene/solarsystem/planets/jupiter/trail_barycenter.asset b/data/assets/scene/solarsystem/planets/jupiter/trail_barycenter.asset
index fd819f7f82..c5a96ed6bb 100644
--- a/data/assets/scene/solarsystem/planets/jupiter/trail_barycenter.asset
+++ b/data/assets/scene/solarsystem/planets/jupiter/trail_barycenter.asset
@@ -40,7 +40,6 @@ asset.export(JupiterBarycenterTrail)
 
 asset.meta = {
   Name = "Jupiter Trail",
-  Version = "1.1",
   Description = "Trail of Jupiter's Barycenter as observed by the Sun",
   Author = "OpenSpace Team",
   URL = "http://openspaceproject.com",
diff --git a/data/assets/scene/solarsystem/planets/jupiter/trail_earth.asset b/data/assets/scene/solarsystem/planets/jupiter/trail_earth.asset
index 98491fc4b8..ece03e2ec5 100644
--- a/data/assets/scene/solarsystem/planets/jupiter/trail_earth.asset
+++ b/data/assets/scene/solarsystem/planets/jupiter/trail_earth.asset
@@ -41,7 +41,6 @@ asset.export(JupiterTrailEarth)
 
 asset.meta = {
   Name = "Jupiter Trail from Earth",
-  Version = "1.1",
   Description = "Trail of Jupiter as observed by the Earth",
   Author = "OpenSpace Team",
   URL = "http://openspaceproject.com",
diff --git a/data/assets/scene/solarsystem/planets/jupiter/transforms.asset b/data/assets/scene/solarsystem/planets/jupiter/transforms.asset
index 0292ae1395..77636066a9 100644
--- a/data/assets/scene/solarsystem/planets/jupiter/transforms.asset
+++ b/data/assets/scene/solarsystem/planets/jupiter/transforms.asset
@@ -35,7 +35,6 @@ asset.export(JupiterBarycenter)
 
 asset.meta = {
   Name = "Jupiter Transforms",
-  Version = "1.1",
   Description = "Jupiter Barycenter transform",
   Author = "OpenSpace Team",
   URL = "http://openspaceproject.com",
diff --git a/data/assets/scene/solarsystem/planets/mars/atmosphere.asset b/data/assets/scene/solarsystem/planets/mars/atmosphere.asset
index 90a2ee01b2..d66b766f24 100644
--- a/data/assets/scene/solarsystem/planets/mars/atmosphere.asset
+++ b/data/assets/scene/solarsystem/planets/mars/atmosphere.asset
@@ -67,7 +67,6 @@ asset.export(Atmosphere)
 
 asset.meta = {
   Name = "Mars Atmosphere",
-  Version = "1.1",
   Description = "RenderableAtmosphere for Mars",
   Author = "OpenSpace Team",
   URL = "http://openspaceproject.com",
diff --git a/data/assets/scene/solarsystem/planets/mars/default_layers.asset b/data/assets/scene/solarsystem/planets/mars/default_layers.asset
index 96c0b8b135..48affce173 100644
--- a/data/assets/scene/solarsystem/planets/mars/default_layers.asset
+++ b/data/assets/scene/solarsystem/planets/mars/default_layers.asset
@@ -7,7 +7,6 @@ asset.require("./layers/newyork_layers", false)
 
 asset.meta = {
   Name = "Default Mars Layers",
-  Version = "1.2",
   Description = [[Default Mars layers are: Mars texture, CTX Blended, HiRISE,
     HiRISE Local Set, MOC WA Color, Viking MDIM, MOLA Pseudo Color, MOLA HRSC,
     Themis IR Day, Themis IR Night, CTX Mosaic, MDEM200M (3D), HiRISE Local Set DEM (3D),
diff --git a/data/assets/scene/solarsystem/planets/mars/layers/base_layers.asset b/data/assets/scene/solarsystem/planets/mars/layers/base_layers.asset
index 6b017c3997..4eca8539dd 100644
--- a/data/assets/scene/solarsystem/planets/mars/layers/base_layers.asset
+++ b/data/assets/scene/solarsystem/planets/mars/layers/base_layers.asset
@@ -13,7 +13,6 @@ asset.require("./overlays/size_reference", false)
 
 asset.meta = {
   Name = "Base Mars Layers",
-  Version = "1.0",
   Description = [[Base Mars layers are: Mars texture, CTX Blended, HiRISE,
     HiRISE Local Set, MDEM200M (3D), HiRISE Local Set DEM (3D), Tile Indicies,
     and Size Reference.
diff --git a/data/assets/scene/solarsystem/planets/mars/layers/colorlayers/ctx_blended.asset b/data/assets/scene/solarsystem/planets/mars/layers/colorlayers/ctx_blended.asset
index 12563bf9d6..81447549d6 100644
--- a/data/assets/scene/solarsystem/planets/mars/layers/colorlayers/ctx_blended.asset
+++ b/data/assets/scene/solarsystem/planets/mars/layers/colorlayers/ctx_blended.asset
@@ -38,7 +38,6 @@ asset.export("layer", Layer)
 
 asset.meta = {
   Name = "CTX Blended",
-  Version = "1.0",
   Description = [[New blended CTX map for Mars from CalTech Murray lab. This map is
     hosted by ESRI]],
   Author = "Caltech Murray Lab",
diff --git a/data/assets/scene/solarsystem/planets/mars/layers/colorlayers/ctx_blended_beta01.asset b/data/assets/scene/solarsystem/planets/mars/layers/colorlayers/ctx_blended_beta01.asset
index 6ad3eb70e8..ed4ef25a63 100644
--- a/data/assets/scene/solarsystem/planets/mars/layers/colorlayers/ctx_blended_beta01.asset
+++ b/data/assets/scene/solarsystem/planets/mars/layers/colorlayers/ctx_blended_beta01.asset
@@ -45,7 +45,6 @@ asset.export("layer", Layer)
 
 asset.meta = {
   Name = "CTX Blended beta01",
-  Version = "1.1",
   Description = [[New blended CTX map for Mars from CalTech Murray lab. This map is
     hosted by ESRI]],
   Author = "Caltech Murray Lab",
diff --git a/data/assets/scene/solarsystem/planets/mars/layers/colorlayers/ctx_mosaic_newyork.asset b/data/assets/scene/solarsystem/planets/mars/layers/colorlayers/ctx_mosaic_newyork.asset
index 0c5d1b50b2..f6645e9ff4 100644
--- a/data/assets/scene/solarsystem/planets/mars/layers/colorlayers/ctx_mosaic_newyork.asset
+++ b/data/assets/scene/solarsystem/planets/mars/layers/colorlayers/ctx_mosaic_newyork.asset
@@ -26,7 +26,6 @@ asset.export("layer", Layer)
 
 asset.meta = {
   Name = "CTX Mosaic [New York]",
-  Version = "1.0",
   Description = [[CTX Mosaic layer for Mars globe. This layer is served from the
     OpenSpace servers in New York]],
   Author = "OpenSpace Team",
diff --git a/data/assets/scene/solarsystem/planets/mars/layers/colorlayers/ctx_mosaic_sweden.asset b/data/assets/scene/solarsystem/planets/mars/layers/colorlayers/ctx_mosaic_sweden.asset
index 41d0f27594..c36cf2170f 100644
--- a/data/assets/scene/solarsystem/planets/mars/layers/colorlayers/ctx_mosaic_sweden.asset
+++ b/data/assets/scene/solarsystem/planets/mars/layers/colorlayers/ctx_mosaic_sweden.asset
@@ -26,7 +26,6 @@ asset.export("layer", Layer)
 
 asset.meta = {
   Name = "CTX Mosaic [Sweden]",
-  Version = "1.0",
   Description = [[CTX Mosaic layer for Mars globe. This layer is served from the
     OpenSpace servers in Sweden]],
   Author = "OpenSpace Team",
diff --git a/data/assets/scene/solarsystem/planets/mars/layers/colorlayers/ctx_mosaic_utah.asset b/data/assets/scene/solarsystem/planets/mars/layers/colorlayers/ctx_mosaic_utah.asset
index a675935f75..923001580e 100644
--- a/data/assets/scene/solarsystem/planets/mars/layers/colorlayers/ctx_mosaic_utah.asset
+++ b/data/assets/scene/solarsystem/planets/mars/layers/colorlayers/ctx_mosaic_utah.asset
@@ -26,7 +26,6 @@ asset.export("layer", Layer)
 
 asset.meta = {
   Name = "CTX Mosaic [Utah]",
-  Version = "1.0",
   Description = [[CTX Mosaic layer for Mars globe. This layer is served from the
     OpenSpace servers in Utah]],
   Author = "OpenSpace Team",
diff --git a/data/assets/scene/solarsystem/planets/mars/layers/colorlayers/hirise.asset b/data/assets/scene/solarsystem/planets/mars/layers/colorlayers/hirise.asset
index ed8b26f754..bca2d540f9 100644
--- a/data/assets/scene/solarsystem/planets/mars/layers/colorlayers/hirise.asset
+++ b/data/assets/scene/solarsystem/planets/mars/layers/colorlayers/hirise.asset
@@ -41,7 +41,6 @@ asset.export("layer", Layer)
 
 asset.meta = {
   Name = "HiRISE",
-  Version = "1.1",
   Description = [[Updated HiRISE layer for Mars with raw unselected imagery. This map is
     hosted by ESRI]],
   Author = "esri_astro",
diff --git a/data/assets/scene/solarsystem/planets/mars/layers/colorlayers/hirisels.asset b/data/assets/scene/solarsystem/planets/mars/layers/colorlayers/hirisels.asset
index c388331487..1e75ff7064 100644
--- a/data/assets/scene/solarsystem/planets/mars/layers/colorlayers/hirisels.asset
+++ b/data/assets/scene/solarsystem/planets/mars/layers/colorlayers/hirisels.asset
@@ -38,7 +38,6 @@ asset.export("layer", Layer)
 
 asset.meta = {
   Name = "HiRISE Local Set",
-  Version = "1.1",
   Description = [[HiRISE layer for images with corresponding DEMs. This map is hosted by
     ESRI]],
   Author = "USGS",
diff --git a/data/assets/scene/solarsystem/planets/mars/layers/colorlayers/mars_texture.asset b/data/assets/scene/solarsystem/planets/mars/layers/colorlayers/mars_texture.asset
index c6c106b4ba..70c4d29acf 100644
--- a/data/assets/scene/solarsystem/planets/mars/layers/colorlayers/mars_texture.asset
+++ b/data/assets/scene/solarsystem/planets/mars/layers/colorlayers/mars_texture.asset
@@ -35,7 +35,6 @@ asset.export("layer", Layer)
 
 asset.meta = {
   Name = "Mars Texutre",
-  Version = "1.0",
   Description = "Jpg texture for Mars, available for offline use",
   Author = "OpenSpace Team",
   URL = "http://openspaceproject.com",
diff --git a/data/assets/scene/solarsystem/planets/mars/layers/colorlayers/moc_wa_color_newyork.asset b/data/assets/scene/solarsystem/planets/mars/layers/colorlayers/moc_wa_color_newyork.asset
index bac97523df..b5354c64da 100644
--- a/data/assets/scene/solarsystem/planets/mars/layers/colorlayers/moc_wa_color_newyork.asset
+++ b/data/assets/scene/solarsystem/planets/mars/layers/colorlayers/moc_wa_color_newyork.asset
@@ -33,7 +33,6 @@ asset.export("layer", Layer)
 
 asset.meta = {
   Name = "MOC WA Color [New York]",
-  Version = "1.1",
   Description = [[Main color map layer for Mars. This map is hosted
     on the OpenSpace server in New York]],
   Author = "OpenSpace Team",
diff --git a/data/assets/scene/solarsystem/planets/mars/layers/colorlayers/moc_wa_color_sweden.asset b/data/assets/scene/solarsystem/planets/mars/layers/colorlayers/moc_wa_color_sweden.asset
index bf7871e6c7..ec2c0fa09b 100644
--- a/data/assets/scene/solarsystem/planets/mars/layers/colorlayers/moc_wa_color_sweden.asset
+++ b/data/assets/scene/solarsystem/planets/mars/layers/colorlayers/moc_wa_color_sweden.asset
@@ -33,7 +33,6 @@ asset.export("layer", Layer)
 
 asset.meta = {
   Name = "MOC WA Color [Sweden]",
-  Version = "1.1",
   Description = [[Main color map layer for Mars. This map is hosted
     on the OpenSpace server in Sweden]],
   Author = "OpenSpace Team",
diff --git a/data/assets/scene/solarsystem/planets/mars/layers/colorlayers/moc_wa_color_utah.asset b/data/assets/scene/solarsystem/planets/mars/layers/colorlayers/moc_wa_color_utah.asset
index 5e45c129a4..2e37262615 100644
--- a/data/assets/scene/solarsystem/planets/mars/layers/colorlayers/moc_wa_color_utah.asset
+++ b/data/assets/scene/solarsystem/planets/mars/layers/colorlayers/moc_wa_color_utah.asset
@@ -33,7 +33,6 @@ asset.export("layer", Layer)
 
 asset.meta = {
   Name = "MOC WA Color [Utah]",
-  Version = "1.1",
   Description = [[Main color map layer for Mars. This map is hosted on the OpenSpace
     server in Utah]],
   Author = "OpenSpace Team",
diff --git a/data/assets/scene/solarsystem/planets/mars/layers/colorlayers/mola_hrsc_newyork.asset b/data/assets/scene/solarsystem/planets/mars/layers/colorlayers/mola_hrsc_newyork.asset
index df6c098a8a..e45581d2e3 100644
--- a/data/assets/scene/solarsystem/planets/mars/layers/colorlayers/mola_hrsc_newyork.asset
+++ b/data/assets/scene/solarsystem/planets/mars/layers/colorlayers/mola_hrsc_newyork.asset
@@ -29,7 +29,6 @@ asset.export("layer", Layer)
 
 asset.meta = {
   Name = "MOLA HRSC [New York]",
-  Version = "1.1",
   Description = [[Colorzied elevation data for Mars. This map is hosted on the OpenSpace
     server in New York]],
   Author = "OpenSpace Team",
diff --git a/data/assets/scene/solarsystem/planets/mars/layers/colorlayers/mola_hrsc_sweden.asset b/data/assets/scene/solarsystem/planets/mars/layers/colorlayers/mola_hrsc_sweden.asset
index 8ca93525fc..43d4056b6a 100644
--- a/data/assets/scene/solarsystem/planets/mars/layers/colorlayers/mola_hrsc_sweden.asset
+++ b/data/assets/scene/solarsystem/planets/mars/layers/colorlayers/mola_hrsc_sweden.asset
@@ -29,7 +29,6 @@ asset.export("layer", Layer)
 
 asset.meta = {
   Name = "MOLA HRSC [Sweden]",
-  Version = "1.1",
   Description = [[Colorzied elevation data for Mars. This map is hosted on the OpenSpace
     server in Sweden]],
   Author = "OpenSpace Team",
diff --git a/data/assets/scene/solarsystem/planets/mars/layers/colorlayers/mola_hrsc_utah.asset b/data/assets/scene/solarsystem/planets/mars/layers/colorlayers/mola_hrsc_utah.asset
index c270ed2cdb..e51a2271af 100644
--- a/data/assets/scene/solarsystem/planets/mars/layers/colorlayers/mola_hrsc_utah.asset
+++ b/data/assets/scene/solarsystem/planets/mars/layers/colorlayers/mola_hrsc_utah.asset
@@ -29,7 +29,6 @@ asset.export("layer", Layer)
 
 asset.meta = {
   Name = "MOLA HRSC [Utah]",
-  Version = "1.1",
   Description = [[Colorzied elevation data for Mars. This map is hosted on the OpenSpace
     server in Sweden]],
   Author = "OpenSpace Team",
diff --git a/data/assets/scene/solarsystem/planets/mars/layers/colorlayers/mola_pseudo_color_newyork.asset b/data/assets/scene/solarsystem/planets/mars/layers/colorlayers/mola_pseudo_color_newyork.asset
index 23c2afe8cb..0d3549f3d9 100644
--- a/data/assets/scene/solarsystem/planets/mars/layers/colorlayers/mola_pseudo_color_newyork.asset
+++ b/data/assets/scene/solarsystem/planets/mars/layers/colorlayers/mola_pseudo_color_newyork.asset
@@ -39,7 +39,6 @@ asset.export("layer", Layer)
 
 asset.meta = {
   Name = "MOLA Pseudo Color [New York]",
-  Version = "1.1",
   Description = [[Colorzied elevation data for Mars (with shading). This map is hosted
     on the OpenSpace server in New York]],
   Author = "USGS",
diff --git a/data/assets/scene/solarsystem/planets/mars/layers/colorlayers/mola_pseudo_color_sweden.asset b/data/assets/scene/solarsystem/planets/mars/layers/colorlayers/mola_pseudo_color_sweden.asset
index 6add7cc71b..1c0ecb3318 100644
--- a/data/assets/scene/solarsystem/planets/mars/layers/colorlayers/mola_pseudo_color_sweden.asset
+++ b/data/assets/scene/solarsystem/planets/mars/layers/colorlayers/mola_pseudo_color_sweden.asset
@@ -39,7 +39,6 @@ asset.export("layer", Layer)
 
 asset.meta = {
   Name = "MOLA Pseudo Color [Sweden]",
-  Version = "1.1",
   Description = [[Colorzied elevation data for Mars (with shading). This map is hosted
     on the OpenSpace server in Sweden]],
   Author = "USGS",
diff --git a/data/assets/scene/solarsystem/planets/mars/layers/colorlayers/mola_pseudo_color_utah.asset b/data/assets/scene/solarsystem/planets/mars/layers/colorlayers/mola_pseudo_color_utah.asset
index 50aab83f66..e9d4c7ed37 100644
--- a/data/assets/scene/solarsystem/planets/mars/layers/colorlayers/mola_pseudo_color_utah.asset
+++ b/data/assets/scene/solarsystem/planets/mars/layers/colorlayers/mola_pseudo_color_utah.asset
@@ -39,7 +39,6 @@ asset.export("layer", Layer)
 
 asset.meta = {
   Name = "MOLA Pseudo Color [Utah]",
-  Version = "1.1",
   Description = [[Colorzied elevation data for Mars (with shading). This map is hosted
     on the OpenSpace server in Utah]],
   Author = "USGS",
diff --git a/data/assets/scene/solarsystem/planets/mars/layers/colorlayers/themis_ir_day_newyork.asset b/data/assets/scene/solarsystem/planets/mars/layers/colorlayers/themis_ir_day_newyork.asset
index e5466a365d..d7ef41b728 100644
--- a/data/assets/scene/solarsystem/planets/mars/layers/colorlayers/themis_ir_day_newyork.asset
+++ b/data/assets/scene/solarsystem/planets/mars/layers/colorlayers/themis_ir_day_newyork.asset
@@ -36,7 +36,6 @@ asset.export("layer", Layer)
 
 asset.meta = {
   Name = "Themis IR Day [New York]",
-  Version = "1.1",
   Description = [[Themis Day layer for Mars. This map is hosted on the OpenSpace server
     in New York]],
   Author = "USGS",
diff --git a/data/assets/scene/solarsystem/planets/mars/layers/colorlayers/themis_ir_day_sweden.asset b/data/assets/scene/solarsystem/planets/mars/layers/colorlayers/themis_ir_day_sweden.asset
index 2243dfab24..dfaba489ae 100644
--- a/data/assets/scene/solarsystem/planets/mars/layers/colorlayers/themis_ir_day_sweden.asset
+++ b/data/assets/scene/solarsystem/planets/mars/layers/colorlayers/themis_ir_day_sweden.asset
@@ -36,7 +36,6 @@ asset.export("layer", Layer)
 
 asset.meta = {
   Name = "Themis IR Day [Sweden]",
-  Version = "1.1",
   Description = [[Themis Day layer for Mars. This map is hosted on the OpenSpace server
     in Sweden]],
   Author = "USGS",
diff --git a/data/assets/scene/solarsystem/planets/mars/layers/colorlayers/themis_ir_day_utah.asset b/data/assets/scene/solarsystem/planets/mars/layers/colorlayers/themis_ir_day_utah.asset
index 436b863ebb..ef646296fe 100644
--- a/data/assets/scene/solarsystem/planets/mars/layers/colorlayers/themis_ir_day_utah.asset
+++ b/data/assets/scene/solarsystem/planets/mars/layers/colorlayers/themis_ir_day_utah.asset
@@ -36,7 +36,6 @@ asset.export("layer", Layer)
 
 asset.meta = {
   Name = "Themis IR Day [Utah]",
-  Version = "1.1",
   Description = [[Themis Day layer for Mars. This map is hosted on the OpenSpace server
     in Utah]],
   Author = "USGS",
diff --git a/data/assets/scene/solarsystem/planets/mars/layers/colorlayers/themis_ir_night_newyork.asset b/data/assets/scene/solarsystem/planets/mars/layers/colorlayers/themis_ir_night_newyork.asset
index 48c01d231e..edb867bf70 100644
--- a/data/assets/scene/solarsystem/planets/mars/layers/colorlayers/themis_ir_night_newyork.asset
+++ b/data/assets/scene/solarsystem/planets/mars/layers/colorlayers/themis_ir_night_newyork.asset
@@ -37,7 +37,6 @@ asset.export("layer", Layer)
 
 asset.meta = {
   Name = "Themis IR Night [New York]",
-  Version = "1.1",
   Description = [[Themis Night layer for Mars. This map is hosted on the OpenSpace
     server in New York]],
   Author = "USGS",
diff --git a/data/assets/scene/solarsystem/planets/mars/layers/colorlayers/themis_ir_night_sweden.asset b/data/assets/scene/solarsystem/planets/mars/layers/colorlayers/themis_ir_night_sweden.asset
index 900c8e6a8e..50da4314c8 100644
--- a/data/assets/scene/solarsystem/planets/mars/layers/colorlayers/themis_ir_night_sweden.asset
+++ b/data/assets/scene/solarsystem/planets/mars/layers/colorlayers/themis_ir_night_sweden.asset
@@ -37,7 +37,6 @@ asset.export("layer", Layer)
 
 asset.meta = {
   Name = "Themis IR Night [Sweden]",
-  Version = "1.1",
   Description = [[Themis Night layer for Mars. This map is hosted on the OpenSpace
     server in Sweden]],
   Author = "USGS",
diff --git a/data/assets/scene/solarsystem/planets/mars/layers/colorlayers/themis_ir_night_utah.asset b/data/assets/scene/solarsystem/planets/mars/layers/colorlayers/themis_ir_night_utah.asset
index 5209bbd897..f7b151f02d 100644
--- a/data/assets/scene/solarsystem/planets/mars/layers/colorlayers/themis_ir_night_utah.asset
+++ b/data/assets/scene/solarsystem/planets/mars/layers/colorlayers/themis_ir_night_utah.asset
@@ -37,7 +37,6 @@ asset.export("layer", Layer)
 
 asset.meta = {
   Name = "Themis IR Night [Utah]",
-  Version = "1.1",
   Description = [[Themis Night layer for Mars. This map is hosted on the OpenSpace
     server in Utah]],
   Author = "USGS",
diff --git a/data/assets/scene/solarsystem/planets/mars/layers/colorlayers/viking_mdim_newyork.asset b/data/assets/scene/solarsystem/planets/mars/layers/colorlayers/viking_mdim_newyork.asset
index 6d5e68ea0b..93f17c4e1b 100644
--- a/data/assets/scene/solarsystem/planets/mars/layers/colorlayers/viking_mdim_newyork.asset
+++ b/data/assets/scene/solarsystem/planets/mars/layers/colorlayers/viking_mdim_newyork.asset
@@ -44,7 +44,6 @@ asset.export("layer", Layer)
 
 asset.meta = {
   Name = "Viking MDIM [New York]",
-  Version = "1.1",
   Description = [[Alternate image layer for Mars. This map is hosted on the OpenSpace
     server in New York]],
   Author = "USGS",
diff --git a/data/assets/scene/solarsystem/planets/mars/layers/colorlayers/viking_mdim_sweden.asset b/data/assets/scene/solarsystem/planets/mars/layers/colorlayers/viking_mdim_sweden.asset
index 0c2504dc63..135d9608a3 100644
--- a/data/assets/scene/solarsystem/planets/mars/layers/colorlayers/viking_mdim_sweden.asset
+++ b/data/assets/scene/solarsystem/planets/mars/layers/colorlayers/viking_mdim_sweden.asset
@@ -44,7 +44,6 @@ asset.export("layer", Layer)
 
 asset.meta = {
   Name = "Viking MDIM [Sweden]",
-  Version = "1.1",
   Description = [[Alternate image layer for Mars. This map is hosted on the OpenSpace
     server in Sweden]],
   Author = "USGS",
diff --git a/data/assets/scene/solarsystem/planets/mars/layers/colorlayers/viking_mdim_utah.asset b/data/assets/scene/solarsystem/planets/mars/layers/colorlayers/viking_mdim_utah.asset
index 1413fa125d..c225d84f34 100644
--- a/data/assets/scene/solarsystem/planets/mars/layers/colorlayers/viking_mdim_utah.asset
+++ b/data/assets/scene/solarsystem/planets/mars/layers/colorlayers/viking_mdim_utah.asset
@@ -44,7 +44,6 @@ asset.export("layer", Layer)
 
 asset.meta = {
   Name = "Viking MDIM [Utah]",
-  Version = "1.1",
   Description = [[Alternate image layer for Mars. This map is hosted on the OpenSpace
     server in Utah]],
   Author = "USGS",
diff --git a/data/assets/scene/solarsystem/planets/mars/layers/heightlayers/hirisels.asset b/data/assets/scene/solarsystem/planets/mars/layers/heightlayers/hirisels.asset
index ce8ec05095..03815adfad 100644
--- a/data/assets/scene/solarsystem/planets/mars/layers/heightlayers/hirisels.asset
+++ b/data/assets/scene/solarsystem/planets/mars/layers/heightlayers/hirisels.asset
@@ -37,7 +37,6 @@ asset.export("layer", Layer)
 
 asset.meta = {
   Name = "HiRISE Local Set DEM",
-  Version = "1.1",
   Description = [[HiRISE DEM layer for corresponding Local Set imager. This map is hosted
     by ESRI]],
   Author = "USGS",
diff --git a/data/assets/scene/solarsystem/planets/mars/layers/heightlayers/mdem200m.asset b/data/assets/scene/solarsystem/planets/mars/layers/heightlayers/mdem200m.asset
index e52f548cbe..88476263f0 100644
--- a/data/assets/scene/solarsystem/planets/mars/layers/heightlayers/mdem200m.asset
+++ b/data/assets/scene/solarsystem/planets/mars/layers/heightlayers/mdem200m.asset
@@ -33,7 +33,6 @@ asset.export("layer", Layer)
 
 asset.meta = {
   Name = "Mars HRSC MOLA Blended DEM Global 200m v2",
-  Version = "1.1",
   Description = "ESRI Hosted ars HRSC MOLA Blended DEM",
   Author = "esri_astro",
   URL = "https://www.arcgis.com/home/item.html?id=225adad86379474ebc3d51a74573c99b",
diff --git a/data/assets/scene/solarsystem/planets/mars/layers/heightlayers/mola_amnh.asset b/data/assets/scene/solarsystem/planets/mars/layers/heightlayers/mola_amnh.asset
index bd79fbf4c9..eaff920afb 100644
--- a/data/assets/scene/solarsystem/planets/mars/layers/heightlayers/mola_amnh.asset
+++ b/data/assets/scene/solarsystem/planets/mars/layers/heightlayers/mola_amnh.asset
@@ -40,7 +40,6 @@ asset.export("layer", Layer)
 
 asset.meta = {
   Name = "Mola Elevation [New York]",
-  Version = "1.1",
   Description = [[Global elevation layer for Mars. This layer is hosted on the OpenSpace
     server in New York]],
   Author = "USGS",
diff --git a/data/assets/scene/solarsystem/planets/mars/layers/heightlayers/mola_sweden.asset b/data/assets/scene/solarsystem/planets/mars/layers/heightlayers/mola_sweden.asset
index 5ff6340c4d..f70995f01b 100644
--- a/data/assets/scene/solarsystem/planets/mars/layers/heightlayers/mola_sweden.asset
+++ b/data/assets/scene/solarsystem/planets/mars/layers/heightlayers/mola_sweden.asset
@@ -40,7 +40,6 @@ asset.export("layer", Layer)
 
 asset.meta = {
   Name = "Mola Elevation [Sweden]",
-  Version = "1.1",
   Author = "USGS",
   Description = [[Global elevation layer for Mars. This layer is hosted on the OpenSpace
     server in Sweden]],
diff --git a/data/assets/scene/solarsystem/planets/mars/layers/heightlayers/mola_utah.asset b/data/assets/scene/solarsystem/planets/mars/layers/heightlayers/mola_utah.asset
index 31b6dd8004..afb72087e7 100644
--- a/data/assets/scene/solarsystem/planets/mars/layers/heightlayers/mola_utah.asset
+++ b/data/assets/scene/solarsystem/planets/mars/layers/heightlayers/mola_utah.asset
@@ -40,7 +40,6 @@ asset.export("layer", Layer)
 
 asset.meta = {
   Name = "Mola Elevation [Utah]",
-  Version = "1.1",
   Description = [[Global elevation layer for Mars. This layer is hosted on the OpenSpace
     server in Utah]],
   Author = "USGS",
diff --git a/data/assets/scene/solarsystem/planets/mars/layers/nasa-treks/MEX_HRSC.asset b/data/assets/scene/solarsystem/planets/mars/layers/nasa-treks/MEX_HRSC.asset
index bf2580798e..361de68b0e 100644
--- a/data/assets/scene/solarsystem/planets/mars/layers/nasa-treks/MEX_HRSC.asset
+++ b/data/assets/scene/solarsystem/planets/mars/layers/nasa-treks/MEX_HRSC.asset
@@ -37,8 +37,7 @@ asset.export("MC11E11_HRDTMAR_DA5", treks_MC11E11_HRDTMAR_DA5)
 
 
 asset.meta = {
-  Name = [[NASA Treks Layers for Mars MEX_HRSC],
-  Version = "1.0",
+  Name = [[NASA Treks Layers for Mars MEX_HRSC]],
   Author = "NASA/Treks",
   URL = "https://trek.nasa.gov/mars",
   License = "NASA/Treks",
diff --git a/data/assets/scene/solarsystem/planets/mars/layers/nasa-treks/MGS_MOC_Atlas.asset b/data/assets/scene/solarsystem/planets/mars/layers/nasa-treks/MGS_MOC_Atlas.asset
index 8d9cb7593b..916faaca68 100644
--- a/data/assets/scene/solarsystem/planets/mars/layers/nasa-treks/MGS_MOC_Atlas.asset
+++ b/data/assets/scene/solarsystem/planets/mars/layers/nasa-treks/MGS_MOC_Atlas.asset
@@ -28,8 +28,7 @@ asset.export("msss_atlas_simp_clon", treks_msss_atlas_simp_clon)
 
 
 asset.meta = {
-  Name = [[NASA Treks Layers for Mars MGS_MOC_Atlas],
-  Version = "1.0",
+  Name = [[NASA Treks Layers for Mars MGS_MOC_Atlas]],
   Author = "NASA/Treks",
   URL = "https://trek.nasa.gov/mars",
   License = "NASA/Treks",
diff --git a/data/assets/scene/solarsystem/planets/mars/layers/nasa-treks/MGS_MOLA.asset b/data/assets/scene/solarsystem/planets/mars/layers/nasa-treks/MGS_MOLA.asset
index 61bac6cc19..fa2732925a 100644
--- a/data/assets/scene/solarsystem/planets/mars/layers/nasa-treks/MGS_MOLA.asset
+++ b/data/assets/scene/solarsystem/planets/mars/layers/nasa-treks/MGS_MOLA.asset
@@ -54,8 +54,7 @@ asset.export("mola_roughness", treks_mola_roughness)
 
 
 asset.meta = {
-  Name = [[NASA Treks Layers for Mars MGS_MOLA],
-  Version = "1.0",
+  Name = [[NASA Treks Layers for Mars MGS_MOLA]],
   Author = "NASA/Treks",
   URL = "https://trek.nasa.gov/mars",
   License = "NASA/Treks",
diff --git a/data/assets/scene/solarsystem/planets/mars/layers/nasa-treks/MGS_MOLA_and_Mars_Express_HRSC.asset b/data/assets/scene/solarsystem/planets/mars/layers/nasa-treks/MGS_MOLA_and_Mars_Express_HRSC.asset
index eaab292cc9..aa7cbe10e0 100644
--- a/data/assets/scene/solarsystem/planets/mars/layers/nasa-treks/MGS_MOLA_and_Mars_Express_HRSC.asset
+++ b/data/assets/scene/solarsystem/planets/mars/layers/nasa-treks/MGS_MOLA_and_Mars_Express_HRSC.asset
@@ -49,8 +49,7 @@ asset.export("Mars_MOLA_blend200ppx_HRSC_Shade_clon0dd_200mpp_lzw", treks_Mars_M
 
 
 asset.meta = {
-  Name = [[NASA Treks Layers for Mars MGS_MOLA_and_Mars_Express_HRSC],
-  Version = "1.0",
+  Name = [[NASA Treks Layers for Mars MGS_MOLA_and_Mars_Express_HRSC]],
   Author = "NASA/Treks",
   URL = "https://trek.nasa.gov/mars",
   License = "NASA/Treks",
diff --git a/data/assets/scene/solarsystem/planets/mars/layers/nasa-treks/MGS_TES.asset b/data/assets/scene/solarsystem/planets/mars/layers/nasa-treks/MGS_TES.asset
index ca06df8b7f..6acec704b7 100644
--- a/data/assets/scene/solarsystem/planets/mars/layers/nasa-treks/MGS_TES.asset
+++ b/data/assets/scene/solarsystem/planets/mars/layers/nasa-treks/MGS_TES.asset
@@ -78,8 +78,7 @@ asset.export("TES_Thermal_Inertia", treks_TES_Thermal_Inertia)
 
 
 asset.meta = {
-  Name = [[NASA Treks Layers for Mars MGS_TES],
-  Version = "1.0",
+  Name = [[NASA Treks Layers for Mars MGS_TES]],
   Author = "NASA/Treks",
   URL = "https://trek.nasa.gov/mars",
   License = "NASA/Treks",
diff --git a/data/assets/scene/solarsystem/planets/mars/layers/nasa-treks/MO_THEMIS-IR_Day.asset b/data/assets/scene/solarsystem/planets/mars/layers/nasa-treks/MO_THEMIS-IR_Day.asset
index 410cea67d9..6fe34d09d3 100644
--- a/data/assets/scene/solarsystem/planets/mars/layers/nasa-treks/MO_THEMIS-IR_Day.asset
+++ b/data/assets/scene/solarsystem/planets/mars/layers/nasa-treks/MO_THEMIS-IR_Day.asset
@@ -26,8 +26,7 @@ asset.export("THEMIS_DayIR_ControlledMosaics_100m_v2_oct2018", treks_THEMIS_DayI
 
 
 asset.meta = {
-  Name = [[NASA Treks Layers for Mars MO_THEMIS-IR_Day],
-  Version = "1.0",
+  Name = [[NASA Treks Layers for Mars MO_THEMIS-IR_Day]],
   Author = "NASA/Treks",
   URL = "https://trek.nasa.gov/mars",
   License = "NASA/Treks",
diff --git a/data/assets/scene/solarsystem/planets/mars/layers/nasa-treks/MO_THEMIS-IR_Night.asset b/data/assets/scene/solarsystem/planets/mars/layers/nasa-treks/MO_THEMIS-IR_Night.asset
index 27568d1afc..803d9898f5 100644
--- a/data/assets/scene/solarsystem/planets/mars/layers/nasa-treks/MO_THEMIS-IR_Night.asset
+++ b/data/assets/scene/solarsystem/planets/mars/layers/nasa-treks/MO_THEMIS-IR_Night.asset
@@ -26,8 +26,7 @@ asset.export("THEMIS_NightIR_ControlledMosaics_100m_v2_oct2018", treks_THEMIS_Ni
 
 
 asset.meta = {
-  Name = [[NASA Treks Layers for Mars MO_THEMIS-IR_Night],
-  Version = "1.0",
+  Name = [[NASA Treks Layers for Mars MO_THEMIS-IR_Night]],
   Author = "NASA/Treks",
   URL = "https://trek.nasa.gov/mars",
   License = "NASA/Treks",
diff --git a/data/assets/scene/solarsystem/planets/mars/layers/nasa-treks/MRO_CTX.asset b/data/assets/scene/solarsystem/planets/mars/layers/nasa-treks/MRO_CTX.asset
index cdcca481be..0d3d4f13a0 100644
--- a/data/assets/scene/solarsystem/planets/mars/layers/nasa-treks/MRO_CTX.asset
+++ b/data/assets/scene/solarsystem/planets/mars/layers/nasa-treks/MRO_CTX.asset
@@ -651,8 +651,7 @@ asset.export("Zephyria_CTX_BlockAdj_dd", treks_Zephyria_CTX_BlockAdj_dd)
 
 
 asset.meta = {
-  Name = [[NASA Treks Layers for Mars MRO_CTX],
-  Version = "1.0",
+  Name = [[NASA Treks Layers for Mars MRO_CTX]],
   Author = "NASA/Treks",
   URL = "https://trek.nasa.gov/mars",
   License = "NASA/Treks",
diff --git a/data/assets/scene/solarsystem/planets/mars/layers/nasa-treks/MRO_HiRISE.asset b/data/assets/scene/solarsystem/planets/mars/layers/nasa-treks/MRO_HiRISE.asset
index 3c2629b1ac..e61d671e02 100644
--- a/data/assets/scene/solarsystem/planets/mars/layers/nasa-treks/MRO_HiRISE.asset
+++ b/data/assets/scene/solarsystem/planets/mars/layers/nasa-treks/MRO_HiRISE.asset
@@ -308,8 +308,7 @@ asset.export("PSP_001501_2280_RED", treks_PSP_001501_2280_RED)
 
 
 asset.meta = {
-  Name = [[NASA Treks Layers for Mars MRO_HiRISE],
-  Version = "1.0",
+  Name = [[NASA Treks Layers for Mars MRO_HiRISE]],
   Author = "NASA/Treks",
   URL = "https://trek.nasa.gov/mars",
   License = "NASA/Treks",
diff --git a/data/assets/scene/solarsystem/planets/mars/layers/nasa-treks/MSL.asset b/data/assets/scene/solarsystem/planets/mars/layers/nasa-treks/MSL.asset
index 3792b2355e..e8270d4d82 100644
--- a/data/assets/scene/solarsystem/planets/mars/layers/nasa-treks/MSL.asset
+++ b/data/assets/scene/solarsystem/planets/mars/layers/nasa-treks/MSL.asset
@@ -26,8 +26,7 @@ asset.export("mars_pahrump_patch_8k_256m", treks_mars_pahrump_patch_8k_256m)
 
 
 asset.meta = {
-  Name = [[NASA Treks Layers for Mars MSL],
-  Version = "1.0",
+  Name = [[NASA Treks Layers for Mars MSL]],
   Author = "NASA/Treks",
   URL = "https://trek.nasa.gov/mars",
   License = "NASA/Treks",
diff --git a/data/assets/scene/solarsystem/planets/mars/layers/nasa-treks/Mars_Express_HRSC.asset b/data/assets/scene/solarsystem/planets/mars/layers/nasa-treks/Mars_Express_HRSC.asset
index dd42bfc7cf..1ab311dfe0 100644
--- a/data/assets/scene/solarsystem/planets/mars/layers/nasa-treks/Mars_Express_HRSC.asset
+++ b/data/assets/scene/solarsystem/planets/mars/layers/nasa-treks/Mars_Express_HRSC.asset
@@ -92,8 +92,7 @@ asset.export("h1394_0000_nd3", treks_h1394_0000_nd3)
 
 
 asset.meta = {
-  Name = [[NASA Treks Layers for Mars Mars_Express_HRSC],
-  Version = "1.0",
+  Name = [[NASA Treks Layers for Mars Mars_Express_HRSC]],
   Author = "NASA/Treks",
   URL = "https://trek.nasa.gov/mars",
   License = "NASA/Treks",
diff --git a/data/assets/scene/solarsystem/planets/mars/layers/nasa-treks/Mars_Reconnaissance_Orbiter_CTX.asset b/data/assets/scene/solarsystem/planets/mars/layers/nasa-treks/Mars_Reconnaissance_Orbiter_CTX.asset
index a4dcfb900c..c8aa9d488b 100644
--- a/data/assets/scene/solarsystem/planets/mars/layers/nasa-treks/Mars_Reconnaissance_Orbiter_CTX.asset
+++ b/data/assets/scene/solarsystem/planets/mars/layers/nasa-treks/Mars_Reconnaissance_Orbiter_CTX.asset
@@ -1069,8 +1069,7 @@ asset.export("CTX_Slope_14S184E_24mp_B01_009886_1658_P21_009385_1658", treks_CTX
 
 
 asset.meta = {
-  Name = [[NASA Treks Layers for Mars Mars_Reconnaissance_Orbiter_CTX],
-  Version = "1.0",
+  Name = [[NASA Treks Layers for Mars Mars_Reconnaissance_Orbiter_CTX]],
   Author = "NASA/Treks",
   URL = "https://trek.nasa.gov/mars",
   License = "NASA/Treks",
diff --git a/data/assets/scene/solarsystem/planets/mars/layers/newyork_layers.asset b/data/assets/scene/solarsystem/planets/mars/layers/newyork_layers.asset
index 4f2f01d580..6ef0ec008c 100644
--- a/data/assets/scene/solarsystem/planets/mars/layers/newyork_layers.asset
+++ b/data/assets/scene/solarsystem/planets/mars/layers/newyork_layers.asset
@@ -14,7 +14,6 @@ asset.require("./heightlayers/mola_utah", false)
 
 asset.meta = {
   Name = "Default Mars Layers (New York)",
-  Version = "1.0",
   Description = [[Default Mars layers are: Mars texture, CTX Blended, HiRISE,
     HiRISE Local Set, MOC WA Color, Viking MDIM, MOLA Pseudo Color, MOLA HRSC,
     Themis IR Day, Themis IR Night, CTX Mosaic, MDEM200M (3D), HiRISE Local Set DEM (3D),
diff --git a/data/assets/scene/solarsystem/planets/mars/layers/overlays/indices.asset b/data/assets/scene/solarsystem/planets/mars/layers/overlays/indices.asset
index 9b0e288b66..cc4f373ad8 100644
--- a/data/assets/scene/solarsystem/planets/mars/layers/overlays/indices.asset
+++ b/data/assets/scene/solarsystem/planets/mars/layers/overlays/indices.asset
@@ -23,7 +23,6 @@ asset.export("layer", Layer)
 
 asset.meta = {
   Name = "Mars Indices",
-  Version = "1.0",
   Description = "This asset supplies a tile index layer for the Mars globe",
   Author = "OpenSpace Team",
   URL = "http://openspaceproject.com",
diff --git a/data/assets/scene/solarsystem/planets/mars/layers/overlays/size_reference.asset b/data/assets/scene/solarsystem/planets/mars/layers/overlays/size_reference.asset
index ae7e657a10..87bbf32013 100644
--- a/data/assets/scene/solarsystem/planets/mars/layers/overlays/size_reference.asset
+++ b/data/assets/scene/solarsystem/planets/mars/layers/overlays/size_reference.asset
@@ -25,7 +25,6 @@ asset.export("layer", Layer)
 
 asset.meta = {
   Name = "Mars Size Reference",
-  Version = "1.0",
   Description = "This asset supplies a size reference layer for the Mars globe",
   Author = "OpenSpace Team",
   URL = "http://openspaceproject.com",
diff --git a/data/assets/scene/solarsystem/planets/mars/layers/sweden_layers.asset b/data/assets/scene/solarsystem/planets/mars/layers/sweden_layers.asset
index b6c49e0d44..70cfbc254b 100644
--- a/data/assets/scene/solarsystem/planets/mars/layers/sweden_layers.asset
+++ b/data/assets/scene/solarsystem/planets/mars/layers/sweden_layers.asset
@@ -13,7 +13,6 @@ asset.require("./heightlayers/mola_sweden", false)
 
 asset.meta = {
   Name = "Default Mars Layers (Sweden)",
-  Version = "1.0",
   Description = [[Default Mars layers are: Mars texture, CTX Blended, HiRISE,
     HiRISE Local Set, MOC WA Color, Viking MDIM, MOLA Pseudo Color, MOLA HRSC,
     Themis IR Day, Themis IR Night, CTX Mosaic, MDEM200M (3D), HiRISE Local Set DEM (3D),
diff --git a/data/assets/scene/solarsystem/planets/mars/layers/utah_layers.asset b/data/assets/scene/solarsystem/planets/mars/layers/utah_layers.asset
index 2edd601b81..6efcd06a09 100644
--- a/data/assets/scene/solarsystem/planets/mars/layers/utah_layers.asset
+++ b/data/assets/scene/solarsystem/planets/mars/layers/utah_layers.asset
@@ -13,7 +13,6 @@ asset.require("./heightlayers/mola_utah", false)
 
 asset.meta = {
   Name = "Default Mars Layers (Utah)",
-  Version = "1.0",
   Description = [[Default Mars layers are: Mars texture, CTX Blended, HiRISE,
     HiRISE Local Set, MOC WA Color, Viking MDIM, MOLA Pseudo Color, MOLA HRSC,
     Themis IR Day, Themis IR Night, CTX Mosaic, MDEM200M (3D), HiRISE Local Set DEM (3D),
diff --git a/data/assets/scene/solarsystem/planets/mars/mars.asset b/data/assets/scene/solarsystem/planets/mars/mars.asset
index 5e30ec3758..7be590b8b4 100644
--- a/data/assets/scene/solarsystem/planets/mars/mars.asset
+++ b/data/assets/scene/solarsystem/planets/mars/mars.asset
@@ -105,7 +105,6 @@ asset.export(MarsLabel)
 
 asset.meta = {
   Name = "Mars",
-  Version = "1.1",
   Description = "Mars globe, and main globe label",
   Author = "OpenSpace Team",
   URL = "http://openspaceproject.com",
diff --git a/data/assets/scene/solarsystem/planets/mars/moons/deimos.asset b/data/assets/scene/solarsystem/planets/mars/moons/deimos.asset
index f8fa99883e..e35ac1c93d 100644
--- a/data/assets/scene/solarsystem/planets/mars/moons/deimos.asset
+++ b/data/assets/scene/solarsystem/planets/mars/moons/deimos.asset
@@ -117,7 +117,6 @@ asset.export(DeimosTrail)
 
 asset.meta = {
   Name = "Deimos",
-  Version = "1.0",
   Description = "RenderableModel and Trail for Deimos",
   Author = "OpenSpace Team",
   URL = "http://openspaceproject.com",
diff --git a/data/assets/scene/solarsystem/planets/mars/moons/deimos_globe.asset b/data/assets/scene/solarsystem/planets/mars/moons/deimos_globe.asset
index 66f0e13563..cb0136adc8 100644
--- a/data/assets/scene/solarsystem/planets/mars/moons/deimos_globe.asset
+++ b/data/assets/scene/solarsystem/planets/mars/moons/deimos_globe.asset
@@ -50,7 +50,6 @@ asset.export(DeimosGlobe)
 
 asset.meta = {
   Name = "Deimos Globe",
-  Version = "1.0",
   Description = "RenderableGlobe for Deimos",
   Author = "OpenSpace Team",
   URL = "http://openspaceproject.com",
diff --git a/data/assets/scene/solarsystem/planets/mars/moons/layers/colorlayers/deimos_viking.asset b/data/assets/scene/solarsystem/planets/mars/moons/layers/colorlayers/deimos_viking.asset
index 47dc7a1d0d..71acfd51f7 100644
--- a/data/assets/scene/solarsystem/planets/mars/moons/layers/colorlayers/deimos_viking.asset
+++ b/data/assets/scene/solarsystem/planets/mars/moons/layers/colorlayers/deimos_viking.asset
@@ -29,7 +29,6 @@ asset.export("layer", Layer)
 
 asset.meta = {
   Name = "Deimos Global Mosaic [USGS]",
-  Version = "1.1",
   Author = "Philip Stooke/NASA",
   URL = "https://astrowebmaps.wr.usgs.gov/webmapatlas/Layers/maps.html",
   License = "NASA/PDS"
diff --git a/data/assets/scene/solarsystem/planets/mars/moons/layers/colorlayers/phobos_viking.asset b/data/assets/scene/solarsystem/planets/mars/moons/layers/colorlayers/phobos_viking.asset
index 06debf3f5e..8f7c8f1408 100644
--- a/data/assets/scene/solarsystem/planets/mars/moons/layers/colorlayers/phobos_viking.asset
+++ b/data/assets/scene/solarsystem/planets/mars/moons/layers/colorlayers/phobos_viking.asset
@@ -26,7 +26,6 @@ asset.export("layer", Layer)
 
 asset.meta = {
   Name = "Phobos Global Shaded Relief [USGS]",
-  Version = "1.1",
   Author = "USGS/NASA",
   URL = "https://astrowebmaps.wr.usgs.gov/webmapatlas/Layers/maps.html",
   License = "NASA/PDS"
diff --git a/data/assets/scene/solarsystem/planets/mars/moons/phobos.asset b/data/assets/scene/solarsystem/planets/mars/moons/phobos.asset
index f40f8e6bce..8babafe4ea 100644
--- a/data/assets/scene/solarsystem/planets/mars/moons/phobos.asset
+++ b/data/assets/scene/solarsystem/planets/mars/moons/phobos.asset
@@ -117,7 +117,6 @@ asset.export(PhobosTrail)
 
 asset.meta = {
   Name = "Phobos",
-  Version = "1.0",
   Description = "RenderableModel and Trail for Phobos",
   Author = "OpenSpace Team",
   URL = "http://openspaceproject.com",
diff --git a/data/assets/scene/solarsystem/planets/mars/moons/phobos_globe.asset b/data/assets/scene/solarsystem/planets/mars/moons/phobos_globe.asset
index ec0eab634c..57bfb5acb0 100644
--- a/data/assets/scene/solarsystem/planets/mars/moons/phobos_globe.asset
+++ b/data/assets/scene/solarsystem/planets/mars/moons/phobos_globe.asset
@@ -50,7 +50,6 @@ asset.export(PhobosGlobe)
 
 asset.meta = {
   Name = "Phobos Globe",
-  Version = "1.0",
   Description = "RenderableGlobe for Phobos",
   Author = "OpenSpace Team",
   URL = "http://openspaceproject.com",
diff --git a/data/assets/scene/solarsystem/planets/mars/trail.asset b/data/assets/scene/solarsystem/planets/mars/trail.asset
index c432c5cb0d..1a602c1dcb 100644
--- a/data/assets/scene/solarsystem/planets/mars/trail.asset
+++ b/data/assets/scene/solarsystem/planets/mars/trail.asset
@@ -40,7 +40,6 @@ asset.export(MarsTrail)
 
 asset.meta = {
   Name = "Mars Trail",
-  Version = "1.1",
   Description = "Main Mars trail from SPICE",
   Author = "OpenSpace Team",
   URL = "http://openspaceproject.com",
diff --git a/data/assets/scene/solarsystem/planets/mars/trail_barycenter.asset b/data/assets/scene/solarsystem/planets/mars/trail_barycenter.asset
index 775a83d4b6..c997945b12 100644
--- a/data/assets/scene/solarsystem/planets/mars/trail_barycenter.asset
+++ b/data/assets/scene/solarsystem/planets/mars/trail_barycenter.asset
@@ -41,7 +41,6 @@ asset.export(MarsBarycenterTrail)
 
 asset.meta = {
   Name = "Mars Trail",
-  Version = "1.1",
   Description = "Barycenter Mars trail from SPICE",
   Author = "OpenSpace Team",
   URL = "http://openspaceproject.com",
diff --git a/data/assets/scene/solarsystem/planets/mars/trail_earth.asset b/data/assets/scene/solarsystem/planets/mars/trail_earth.asset
index 90965cc77b..be2f3923e3 100644
--- a/data/assets/scene/solarsystem/planets/mars/trail_earth.asset
+++ b/data/assets/scene/solarsystem/planets/mars/trail_earth.asset
@@ -41,7 +41,6 @@ asset.export(MarsTrailEarth)
 
 asset.meta = {
   Name = "Mars Trail from Earth",
-  Version = "1.1",
   Description = "Trail of Mars, parented to Earth with Earth as the SPICE observer",
   Author = "OpenSpace Team",
   URL = "http://openspaceproject.com",
diff --git a/data/assets/scene/solarsystem/planets/mars/transforms.asset b/data/assets/scene/solarsystem/planets/mars/transforms.asset
index 8a7a90041a..8af3239f34 100644
--- a/data/assets/scene/solarsystem/planets/mars/transforms.asset
+++ b/data/assets/scene/solarsystem/planets/mars/transforms.asset
@@ -35,7 +35,6 @@ asset.export(MarsBarycenter)
 
 asset.meta = {
   Name = "Mars Transforms",
-  Version = "1.1",
   Description = "Transform with position for Mars",
   Author = "OpenSpace Team",
   URL = "http://openspaceproject.com",
diff --git a/data/assets/scene/solarsystem/planets/mercury/default_layers.asset b/data/assets/scene/solarsystem/planets/mercury/default_layers.asset
index e50d077b08..d4b85a8fb1 100644
--- a/data/assets/scene/solarsystem/planets/mercury/default_layers.asset
+++ b/data/assets/scene/solarsystem/planets/mercury/default_layers.asset
@@ -7,7 +7,6 @@ asset.require("./layers/newyork_layers", false)
 
 asset.meta = {
   Name = "Default Mercury Layers",
-  Version = "1.1",
   Description = [[Default Mercury layers are: Aluminium Abundance, Calcium Abundance,
     Iron Abundance, Magnesium Abundance, Silicon Abundance, Messenger MDIS,
     Messenger Mosaic, Messenger Mosaic2, Messenger BDR, Messenger HIE, Messenger HIW,
diff --git a/data/assets/scene/solarsystem/planets/mercury/layers/base_layers.asset b/data/assets/scene/solarsystem/planets/mercury/layers/base_layers.asset
index 4842464e01..0310e5ce5c 100644
--- a/data/assets/scene/solarsystem/planets/mercury/layers/base_layers.asset
+++ b/data/assets/scene/solarsystem/planets/mercury/layers/base_layers.asset
@@ -11,7 +11,6 @@ asset.require("./heightlayers/messenger_dem_utah", asset.enabled)
 
 asset.meta = {
   Name = "Base Mercury Layers",
-  Version = "1.0",
   Description = [[Base Mercury layers are: Aluminium Abundance, Calcium Abundance,
     Iron Abundance, Magnesium Abundance, Silicon Abundance, and Messenger DEM (3D).
   ]],
diff --git a/data/assets/scene/solarsystem/planets/mercury/layers/colorlayers/alsimap_02122015.asset b/data/assets/scene/solarsystem/planets/mercury/layers/colorlayers/alsimap_02122015.asset
index f6272a512d..67c9e0c788 100644
--- a/data/assets/scene/solarsystem/planets/mercury/layers/colorlayers/alsimap_02122015.asset
+++ b/data/assets/scene/solarsystem/planets/mercury/layers/colorlayers/alsimap_02122015.asset
@@ -35,7 +35,6 @@ asset.export("layer", Layer)
 
 asset.meta = {
   Name = "Mercury Aluminium Abundance",
-  Version = "1.0",
   Description = "Aluminium Abundance layer for Mercury globe",
   Author = "OpenSpace Team",
   URL = "http://openspaceproject.com",
diff --git a/data/assets/scene/solarsystem/planets/mercury/layers/colorlayers/casimap_02122015.asset b/data/assets/scene/solarsystem/planets/mercury/layers/colorlayers/casimap_02122015.asset
index c6c2d01f29..89ffa9f6e1 100644
--- a/data/assets/scene/solarsystem/planets/mercury/layers/colorlayers/casimap_02122015.asset
+++ b/data/assets/scene/solarsystem/planets/mercury/layers/colorlayers/casimap_02122015.asset
@@ -35,7 +35,6 @@ asset.export("layer", Layer)
 
 asset.meta = {
   Name = "Mercury Calcium Abundance",
-  Version = "1.0",
   Description = "Calcium Abundance layer for Mercury globe",
   Author = "OpenSpace Team",
   URL = "http://openspaceproject.com",
diff --git a/data/assets/scene/solarsystem/planets/mercury/layers/colorlayers/fesimap_02122015.asset b/data/assets/scene/solarsystem/planets/mercury/layers/colorlayers/fesimap_02122015.asset
index 3a05ad5fcc..5dff0edc23 100644
--- a/data/assets/scene/solarsystem/planets/mercury/layers/colorlayers/fesimap_02122015.asset
+++ b/data/assets/scene/solarsystem/planets/mercury/layers/colorlayers/fesimap_02122015.asset
@@ -35,7 +35,6 @@ asset.export("layer", Layer)
 
 asset.meta = {
   Name = "Mercury Iron Abundance",
-  Version = "1.0",
   Description = "Iron Abundance layer for Mercury globe",
   Author = "OpenSpace Team",
   URL = "http://openspaceproject.com",
diff --git a/data/assets/scene/solarsystem/planets/mercury/layers/colorlayers/mercury_texture.asset b/data/assets/scene/solarsystem/planets/mercury/layers/colorlayers/mercury_texture.asset
index 51c5d34645..0137fea10d 100644
--- a/data/assets/scene/solarsystem/planets/mercury/layers/colorlayers/mercury_texture.asset
+++ b/data/assets/scene/solarsystem/planets/mercury/layers/colorlayers/mercury_texture.asset
@@ -36,7 +36,6 @@ asset.export("Layer", Layer)
 
 asset.meta = {
   Name = "Mercury Texture",
-  Version = "1.0",
   Description = "Default texture for Mercury",
   Author = "OpenSpace Team",
   URL = "http://openspaceproject.com",
diff --git a/data/assets/scene/solarsystem/planets/mercury/layers/colorlayers/messenger_bdr_newyork.asset b/data/assets/scene/solarsystem/planets/mercury/layers/colorlayers/messenger_bdr_newyork.asset
index 35d2efa546..1b4244012b 100644
--- a/data/assets/scene/solarsystem/planets/mercury/layers/colorlayers/messenger_bdr_newyork.asset
+++ b/data/assets/scene/solarsystem/planets/mercury/layers/colorlayers/messenger_bdr_newyork.asset
@@ -34,7 +34,6 @@ asset.export("layer", Layer)
 
 asset.meta = {
   Name = "Messenger BDR [New York]",
-  Version = "1.0",
   Description = [[Mercury MESSENGER MDIS Global Basemap BDR 166m layer for Mercury globe.
     This map is hosted on the OpenSpace server in New York]],
   Author = "USGS",
diff --git a/data/assets/scene/solarsystem/planets/mercury/layers/colorlayers/messenger_bdr_sweden.asset b/data/assets/scene/solarsystem/planets/mercury/layers/colorlayers/messenger_bdr_sweden.asset
index fbfbdbb3a7..9712f672e0 100644
--- a/data/assets/scene/solarsystem/planets/mercury/layers/colorlayers/messenger_bdr_sweden.asset
+++ b/data/assets/scene/solarsystem/planets/mercury/layers/colorlayers/messenger_bdr_sweden.asset
@@ -34,7 +34,6 @@ asset.export("layer", Layer)
 
 asset.meta = {
   Name = "Messenger BDR [Sweden]",
-  Version = "1.0",
   Description = [[Mercury MESSENGER MDIS Global Basemap BDR 166m layer for Mercury globe.
     This map is hosted on the OpenSpace server in Sweden]],
   Author = "USGS",
diff --git a/data/assets/scene/solarsystem/planets/mercury/layers/colorlayers/messenger_bdr_utah.asset b/data/assets/scene/solarsystem/planets/mercury/layers/colorlayers/messenger_bdr_utah.asset
index a3668b695e..7554ef87e1 100644
--- a/data/assets/scene/solarsystem/planets/mercury/layers/colorlayers/messenger_bdr_utah.asset
+++ b/data/assets/scene/solarsystem/planets/mercury/layers/colorlayers/messenger_bdr_utah.asset
@@ -34,7 +34,6 @@ asset.export("layer", Layer)
 
 asset.meta = {
   Name = "Messenger BDR [Utah]",
-  Version = "1.0",
   Description = [[Mercury MESSENGER MDIS Global Basemap BDR 166m layer for Mercury globe.
     This map is hosted on the OpenSpace server in Utah]],
   Author = "USGS",
diff --git a/data/assets/scene/solarsystem/planets/mercury/layers/colorlayers/messenger_hie_newyork.asset b/data/assets/scene/solarsystem/planets/mercury/layers/colorlayers/messenger_hie_newyork.asset
index 1ac437b866..7070e88206 100644
--- a/data/assets/scene/solarsystem/planets/mercury/layers/colorlayers/messenger_hie_newyork.asset
+++ b/data/assets/scene/solarsystem/planets/mercury/layers/colorlayers/messenger_hie_newyork.asset
@@ -25,7 +25,6 @@ asset.export("layer", Layer)
 
 asset.meta = {
   Name = "Messenger HIE [New York]",
-  Version = "1.0",
   Description = [[Mercury HIE layer for Mercury globe. This map is hosted on the OpenSpace
     server in New York]],
   Author = "USGS",
diff --git a/data/assets/scene/solarsystem/planets/mercury/layers/colorlayers/messenger_hie_sweden.asset b/data/assets/scene/solarsystem/planets/mercury/layers/colorlayers/messenger_hie_sweden.asset
index bee3ac6e78..3de4ed5fa7 100644
--- a/data/assets/scene/solarsystem/planets/mercury/layers/colorlayers/messenger_hie_sweden.asset
+++ b/data/assets/scene/solarsystem/planets/mercury/layers/colorlayers/messenger_hie_sweden.asset
@@ -25,7 +25,6 @@ asset.export("layer", Layer)
 
 asset.meta = {
   Name = "Messenger HIE [Sweden]",
-  Version = "1.0",
   Description = [[Mercury HIE layer for Mercury globe. This map is hosted on the OpenSpace
     server in Sweden]],
   Author = "USGS",
diff --git a/data/assets/scene/solarsystem/planets/mercury/layers/colorlayers/messenger_hie_utah.asset b/data/assets/scene/solarsystem/planets/mercury/layers/colorlayers/messenger_hie_utah.asset
index 4ecb33cb25..3b62ac07a1 100644
--- a/data/assets/scene/solarsystem/planets/mercury/layers/colorlayers/messenger_hie_utah.asset
+++ b/data/assets/scene/solarsystem/planets/mercury/layers/colorlayers/messenger_hie_utah.asset
@@ -25,7 +25,6 @@ asset.export("layer", Layer)
 
 asset.meta = {
   Name = "Messenger HIE [Utah]",
-  Version = "1.0",
   Description = [[Mercury HIE layer for Mercury globe. This map is hosted on the OpenSpace
     server in Utah]],
   Author = "USGS",
diff --git a/data/assets/scene/solarsystem/planets/mercury/layers/colorlayers/messenger_hiw_newyork.asset b/data/assets/scene/solarsystem/planets/mercury/layers/colorlayers/messenger_hiw_newyork.asset
index 3268bef874..bc55238484 100644
--- a/data/assets/scene/solarsystem/planets/mercury/layers/colorlayers/messenger_hiw_newyork.asset
+++ b/data/assets/scene/solarsystem/planets/mercury/layers/colorlayers/messenger_hiw_newyork.asset
@@ -25,7 +25,6 @@ asset.export("layer", Layer)
 
 asset.meta = {
   Name = "Messenger HIW [New York]",
-  Version = "1.0",
   Description = [[Messenger HIW layer for Mercury globe. This map is hosted on the
     OpenSpace server in New York]],
   Author = "USGS",
diff --git a/data/assets/scene/solarsystem/planets/mercury/layers/colorlayers/messenger_hiw_sweden.asset b/data/assets/scene/solarsystem/planets/mercury/layers/colorlayers/messenger_hiw_sweden.asset
index e8316aa00a..273d3920dc 100644
--- a/data/assets/scene/solarsystem/planets/mercury/layers/colorlayers/messenger_hiw_sweden.asset
+++ b/data/assets/scene/solarsystem/planets/mercury/layers/colorlayers/messenger_hiw_sweden.asset
@@ -25,7 +25,6 @@ asset.export("layer", Layer)
 
 asset.meta = {
   Name = "Messenger HIW [Sweden]",
-  Version = "1.0",
   Description = [[Messenger HIW layer for Mercury globe. This map is hosted on the
     OpenSpace server in Sweden]],
   Author = "USGS",
diff --git a/data/assets/scene/solarsystem/planets/mercury/layers/colorlayers/messenger_hiw_utah.asset b/data/assets/scene/solarsystem/planets/mercury/layers/colorlayers/messenger_hiw_utah.asset
index bf02be9d1b..5e06c458be 100644
--- a/data/assets/scene/solarsystem/planets/mercury/layers/colorlayers/messenger_hiw_utah.asset
+++ b/data/assets/scene/solarsystem/planets/mercury/layers/colorlayers/messenger_hiw_utah.asset
@@ -25,7 +25,6 @@ asset.export("layer", Layer)
 
 asset.meta = {
   Name = "Messenger HIW [Utah]",
-  Version = "1.0",
   Description = [[Messenger HIW layer for Mercury globe. This map is hosted on the
     OpenSpace server in Utah]],
   Author = "USGS",
diff --git a/data/assets/scene/solarsystem/planets/mercury/layers/colorlayers/messenger_loi_newyork.asset b/data/assets/scene/solarsystem/planets/mercury/layers/colorlayers/messenger_loi_newyork.asset
index 108c6ec181..812e82d2e7 100644
--- a/data/assets/scene/solarsystem/planets/mercury/layers/colorlayers/messenger_loi_newyork.asset
+++ b/data/assets/scene/solarsystem/planets/mercury/layers/colorlayers/messenger_loi_newyork.asset
@@ -25,7 +25,6 @@ asset.export("layer", Layer)
 
 asset.meta = {
   Name = "Messenger LOI [New York]",
-  Version = "1.0",
   Description = [[Mercury LOI layer for Mercury globe. This map is hosted on the OpenSpace
     server in New York]],
   Author = "USGS",
diff --git a/data/assets/scene/solarsystem/planets/mercury/layers/colorlayers/messenger_loi_sweden.asset b/data/assets/scene/solarsystem/planets/mercury/layers/colorlayers/messenger_loi_sweden.asset
index 9e3949589a..1d28184d6b 100644
--- a/data/assets/scene/solarsystem/planets/mercury/layers/colorlayers/messenger_loi_sweden.asset
+++ b/data/assets/scene/solarsystem/planets/mercury/layers/colorlayers/messenger_loi_sweden.asset
@@ -25,7 +25,6 @@ asset.export("layer", Layer)
 
 asset.meta = {
   Name = "Messenger LOI [Sweden]",
-  Version = "1.0",
   Description = [[Mercury LOI layer for Mercury globe. This map is hosted on the OpenSpace
     server in Sweden]],
   Author = "USGS",
diff --git a/data/assets/scene/solarsystem/planets/mercury/layers/colorlayers/messenger_loi_utah.asset b/data/assets/scene/solarsystem/planets/mercury/layers/colorlayers/messenger_loi_utah.asset
index eeed898b2d..f68d57b050 100644
--- a/data/assets/scene/solarsystem/planets/mercury/layers/colorlayers/messenger_loi_utah.asset
+++ b/data/assets/scene/solarsystem/planets/mercury/layers/colorlayers/messenger_loi_utah.asset
@@ -25,7 +25,6 @@ asset.export("layer", Layer)
 
 asset.meta = {
   Name = "Messenger LOI [Utah]",
-  Version = "1.0",
   Description = [[Mercury LOI layer for Mercury globe. This map is hosted on the OpenSpace
     server in Utah]],
   Author = "USGS",
diff --git a/data/assets/scene/solarsystem/planets/mercury/layers/colorlayers/messenger_mdis_newyork.asset b/data/assets/scene/solarsystem/planets/mercury/layers/colorlayers/messenger_mdis_newyork.asset
index 450a87c63f..9639abbdad 100644
--- a/data/assets/scene/solarsystem/planets/mercury/layers/colorlayers/messenger_mdis_newyork.asset
+++ b/data/assets/scene/solarsystem/planets/mercury/layers/colorlayers/messenger_mdis_newyork.asset
@@ -35,7 +35,6 @@ asset.export("layer", Layer)
 
 asset.meta = {
   Name = "Messenger MDIS [New York]",
-  Version = "1.0",
   Description = [[Messenger MDIS layer for Mercury globe. This map is hosted on the
     OpenSpace server in New York]],
   Author = "USGS",
diff --git a/data/assets/scene/solarsystem/planets/mercury/layers/colorlayers/messenger_mdis_sweden.asset b/data/assets/scene/solarsystem/planets/mercury/layers/colorlayers/messenger_mdis_sweden.asset
index 46e38598db..a64ab37aaa 100644
--- a/data/assets/scene/solarsystem/planets/mercury/layers/colorlayers/messenger_mdis_sweden.asset
+++ b/data/assets/scene/solarsystem/planets/mercury/layers/colorlayers/messenger_mdis_sweden.asset
@@ -35,7 +35,6 @@ asset.export("layer", Layer)
 
 asset.meta = {
   Name = "Messenger MDIS [Sweden]",
-  Version = "1.0",
   Description = [[Messenger MDIS layer for Mercury globe. This map is hosted on the
     OpenSpace server in Sweden]],
   Author = "USGS",
diff --git a/data/assets/scene/solarsystem/planets/mercury/layers/colorlayers/messenger_mdis_utah.asset b/data/assets/scene/solarsystem/planets/mercury/layers/colorlayers/messenger_mdis_utah.asset
index bbdfdaea12..15edb70baf 100644
--- a/data/assets/scene/solarsystem/planets/mercury/layers/colorlayers/messenger_mdis_utah.asset
+++ b/data/assets/scene/solarsystem/planets/mercury/layers/colorlayers/messenger_mdis_utah.asset
@@ -35,7 +35,6 @@ asset.export("layer", Layer)
 
 asset.meta = {
   Name = "Messenger MDIS [Utah]",
-  Version = "1.0",
   Description = [[Messenger MDIS layer for Mercury globe. This map is hosted on the
     OpenSpace server in Utah]],
   Author = "USGS",
diff --git a/data/assets/scene/solarsystem/planets/mercury/layers/colorlayers/messenger_mdr_utah.asset b/data/assets/scene/solarsystem/planets/mercury/layers/colorlayers/messenger_mdr_utah.asset
index bcb1e322e2..68d6d4dd7a 100644
--- a/data/assets/scene/solarsystem/planets/mercury/layers/colorlayers/messenger_mdr_utah.asset
+++ b/data/assets/scene/solarsystem/planets/mercury/layers/colorlayers/messenger_mdr_utah.asset
@@ -25,7 +25,6 @@ asset.export("layer", Layer)
 
 asset.meta = {
   Name = "Messenger MDR [Utah]",
-  Version = "1.0",
   Description = [[Mercury MDR layer for Mercury globe. This map is hosted on the OpenSpace
     server in Utah]],
   Author = "USGS",
diff --git a/data/assets/scene/solarsystem/planets/mercury/layers/colorlayers/messenger_mosaic2_newyork.asset b/data/assets/scene/solarsystem/planets/mercury/layers/colorlayers/messenger_mosaic2_newyork.asset
index ea55c6724b..7d0778d763 100644
--- a/data/assets/scene/solarsystem/planets/mercury/layers/colorlayers/messenger_mosaic2_newyork.asset
+++ b/data/assets/scene/solarsystem/planets/mercury/layers/colorlayers/messenger_mosaic2_newyork.asset
@@ -25,7 +25,6 @@ asset.export("layer", Layer)
 
 asset.meta = {
   Name = "Messenger Mosaic2 [New York]",
-  Version = "1.0",
   Description = [[Mercury Messenger Mosaic2 layer for Mercury globe. This map is hosted on
     the OpenSpace server in New York]],
   Author = "USGS",
diff --git a/data/assets/scene/solarsystem/planets/mercury/layers/colorlayers/messenger_mosaic2_sweden.asset b/data/assets/scene/solarsystem/planets/mercury/layers/colorlayers/messenger_mosaic2_sweden.asset
index 7e83b37055..03fb9d10e4 100644
--- a/data/assets/scene/solarsystem/planets/mercury/layers/colorlayers/messenger_mosaic2_sweden.asset
+++ b/data/assets/scene/solarsystem/planets/mercury/layers/colorlayers/messenger_mosaic2_sweden.asset
@@ -25,7 +25,6 @@ asset.export("layer", Layer)
 
 asset.meta = {
   Name = "Messenger Mosaic2 [Sweden]",
-  Version = "1.0",
   Description = [[Mercury Messenger Mosaic2 layer for Mercury globe. This map is hosted on
     the OpenSpace server in Sweden]],
   Author = "USGS",
diff --git a/data/assets/scene/solarsystem/planets/mercury/layers/colorlayers/messenger_mosaic2_utah.asset b/data/assets/scene/solarsystem/planets/mercury/layers/colorlayers/messenger_mosaic2_utah.asset
index 9003b814bf..2bea5beefb 100644
--- a/data/assets/scene/solarsystem/planets/mercury/layers/colorlayers/messenger_mosaic2_utah.asset
+++ b/data/assets/scene/solarsystem/planets/mercury/layers/colorlayers/messenger_mosaic2_utah.asset
@@ -25,7 +25,6 @@ asset.export("layer", Layer)
 
 asset.meta = {
   Name = "Messenger Mosaic2 [Utah]",
-  Version = "1.0",
   Description = [[Mercury Messenger Mosaic2 layer for Mercury globe. This map is hosted on
     the OpenSpace server in Utah]],
   Author = "USGS",
diff --git a/data/assets/scene/solarsystem/planets/mercury/layers/colorlayers/messenger_mosaic_newyork.asset b/data/assets/scene/solarsystem/planets/mercury/layers/colorlayers/messenger_mosaic_newyork.asset
index 959c40d526..141e3c691c 100644
--- a/data/assets/scene/solarsystem/planets/mercury/layers/colorlayers/messenger_mosaic_newyork.asset
+++ b/data/assets/scene/solarsystem/planets/mercury/layers/colorlayers/messenger_mosaic_newyork.asset
@@ -25,7 +25,6 @@ asset.export("layer", Layer)
 
 asset.meta = {
   Name = "Messenger Mosaic [New York]",
-  Version = "1.0",
   Description = [[Mercury Messenger Mosaic layer for Mercury globe. This map is hosted on
     the OpenSpace server in New York]],
   Author = "USGS",
diff --git a/data/assets/scene/solarsystem/planets/mercury/layers/colorlayers/messenger_mosaic_sweden.asset b/data/assets/scene/solarsystem/planets/mercury/layers/colorlayers/messenger_mosaic_sweden.asset
index c2b37e2d03..981b2ad42a 100644
--- a/data/assets/scene/solarsystem/planets/mercury/layers/colorlayers/messenger_mosaic_sweden.asset
+++ b/data/assets/scene/solarsystem/planets/mercury/layers/colorlayers/messenger_mosaic_sweden.asset
@@ -25,7 +25,6 @@ asset.export("layer", Layer)
 
 asset.meta = {
   Name = "Messenger Mosaic [Sweden]",
-  Version = "1.0",
   Description = [[Mercury Messenger Mosaic layer for Mercury globe. This map is hosted on
     the OpenSpace server in Sweden]],
   Author = "USGS",
diff --git a/data/assets/scene/solarsystem/planets/mercury/layers/colorlayers/messenger_mosaic_utah.asset b/data/assets/scene/solarsystem/planets/mercury/layers/colorlayers/messenger_mosaic_utah.asset
index 63ef62e9ba..56f7c78d1c 100644
--- a/data/assets/scene/solarsystem/planets/mercury/layers/colorlayers/messenger_mosaic_utah.asset
+++ b/data/assets/scene/solarsystem/planets/mercury/layers/colorlayers/messenger_mosaic_utah.asset
@@ -25,7 +25,6 @@ asset.export("layer", Layer)
 
 asset.meta = {
   Name = "Messenger Mosaic [Utah]",
-  Version = "1.0",
   Description = [[Mercury Messenger Mosaic layer for Mercury globe. This map is hosted on
     the OpenSpace server in Utah]],
   Author = "USGS",
diff --git a/data/assets/scene/solarsystem/planets/mercury/layers/colorlayers/messenger_mp3_utah.asset b/data/assets/scene/solarsystem/planets/mercury/layers/colorlayers/messenger_mp3_utah.asset
index 60b1223d21..7a2099afa4 100644
--- a/data/assets/scene/solarsystem/planets/mercury/layers/colorlayers/messenger_mp3_utah.asset
+++ b/data/assets/scene/solarsystem/planets/mercury/layers/colorlayers/messenger_mp3_utah.asset
@@ -25,7 +25,6 @@ asset.export("layer", Layer)
 
 asset.meta = {
   Name = "Messenger MP3 [Utah]",
-  Version = "1.0",
   Description = [[Mercury Messenger MP3 layer for Mercury globe. This map is hosted on the
     OpenSpace server in Utah]],
   Author = "USGS",
diff --git a/data/assets/scene/solarsystem/planets/mercury/layers/colorlayers/messenger_shade_newyork.asset b/data/assets/scene/solarsystem/planets/mercury/layers/colorlayers/messenger_shade_newyork.asset
index 65d4e51651..6903160c4c 100644
--- a/data/assets/scene/solarsystem/planets/mercury/layers/colorlayers/messenger_shade_newyork.asset
+++ b/data/assets/scene/solarsystem/planets/mercury/layers/colorlayers/messenger_shade_newyork.asset
@@ -30,7 +30,6 @@ asset.export("layer", Layer)
 
 asset.meta = {
   Name = "Messenger SHADE [New York]",
-  Version = "1.0",
   Description = [[Mercury SHADE layer for Mercury globe. This map is hosted on the
     OpenSpace server in New York]],
   Author = "USGS",
diff --git a/data/assets/scene/solarsystem/planets/mercury/layers/colorlayers/messenger_shade_sweden.asset b/data/assets/scene/solarsystem/planets/mercury/layers/colorlayers/messenger_shade_sweden.asset
index ae82fe3054..ba51c9e0c8 100644
--- a/data/assets/scene/solarsystem/planets/mercury/layers/colorlayers/messenger_shade_sweden.asset
+++ b/data/assets/scene/solarsystem/planets/mercury/layers/colorlayers/messenger_shade_sweden.asset
@@ -30,7 +30,6 @@ asset.export("layer", Layer)
 
 asset.meta = {
   Name = "Messenger SHADE [Sweden]",
-  Version = "1.0",
   Description = [[Mercury SHADE layer for Mercury globe. This map is hosted on the
     OpenSpace server in Sweden]],
   Author = "USGS",
diff --git a/data/assets/scene/solarsystem/planets/mercury/layers/colorlayers/messenger_shade_utah.asset b/data/assets/scene/solarsystem/planets/mercury/layers/colorlayers/messenger_shade_utah.asset
index c2d553d01f..9b9c6914d4 100644
--- a/data/assets/scene/solarsystem/planets/mercury/layers/colorlayers/messenger_shade_utah.asset
+++ b/data/assets/scene/solarsystem/planets/mercury/layers/colorlayers/messenger_shade_utah.asset
@@ -30,7 +30,6 @@ asset.export("layer", Layer)
 
 asset.meta = {
   Name = "Messenger SHADE [Utah]",
-  Version = "1.0",
   Description = [[Mercury Messenger SHADE layer for Mercury globe. This map is hosted on
     the OpenSpace server in Utah]],
   Author = "USGS",
diff --git a/data/assets/scene/solarsystem/planets/mercury/layers/colorlayers/mgsimap_02122015.asset b/data/assets/scene/solarsystem/planets/mercury/layers/colorlayers/mgsimap_02122015.asset
index dea2f10456..8bc88276ed 100644
--- a/data/assets/scene/solarsystem/planets/mercury/layers/colorlayers/mgsimap_02122015.asset
+++ b/data/assets/scene/solarsystem/planets/mercury/layers/colorlayers/mgsimap_02122015.asset
@@ -39,7 +39,6 @@ asset.export("layer", Layer)
 
 asset.meta = {
   Name = "Mercury Magnesium Abundance",
-  Version = "1.0",
   Description = "Magnesium Abundance layer for Mercury globe",
   Author = "OpenSpace Team",
   URL = "http://openspaceproject.com",
diff --git a/data/assets/scene/solarsystem/planets/mercury/layers/colorlayers/ssimap_02122015.asset b/data/assets/scene/solarsystem/planets/mercury/layers/colorlayers/ssimap_02122015.asset
index 18e5e871d6..6973d2e05b 100644
--- a/data/assets/scene/solarsystem/planets/mercury/layers/colorlayers/ssimap_02122015.asset
+++ b/data/assets/scene/solarsystem/planets/mercury/layers/colorlayers/ssimap_02122015.asset
@@ -35,7 +35,6 @@ asset.export("layer", Layer)
 
 asset.meta = {
   Name = "Mercury Silicon Abundance",
-  Version = "1.0",
   Description = "Silicon Abundance layer for Mercury globe",
   Author = "OpenSpace Team",
   URL = "http://openspaceproject.com",
diff --git a/data/assets/scene/solarsystem/planets/mercury/layers/nasa-treks/MSGR_MDIS.asset b/data/assets/scene/solarsystem/planets/mercury/layers/nasa-treks/MSGR_MDIS.asset
index 6ba3c98004..e812df5031 100644
--- a/data/assets/scene/solarsystem/planets/mercury/layers/nasa-treks/MSGR_MDIS.asset
+++ b/data/assets/scene/solarsystem/planets/mercury/layers/nasa-treks/MSGR_MDIS.asset
@@ -48,8 +48,7 @@ asset.export("Mercury_Messenger_USGS_DEM_665m_v2_SlopeColor", treks_Mercury_Mess
 
 
 asset.meta = {
-  Name = [[NASA Treks Layers for Mercury MSGR_MDIS],
-  Version = "1.0",
+  Name = [[NASA Treks Layers for Mercury MSGR_MDIS]],
   Author = "NASA/Treks",
   URL = "https://trek.nasa.gov/mercury",
   License = "NASA/Treks",
diff --git a/data/assets/scene/solarsystem/planets/mercury/layers/nasa-treks/MSGR_MDIS_Mosaic.asset b/data/assets/scene/solarsystem/planets/mercury/layers/nasa-treks/MSGR_MDIS_Mosaic.asset
index 6c48adc079..d736a30685 100644
--- a/data/assets/scene/solarsystem/planets/mercury/layers/nasa-treks/MSGR_MDIS_Mosaic.asset
+++ b/data/assets/scene/solarsystem/planets/mercury/layers/nasa-treks/MSGR_MDIS_Mosaic.asset
@@ -125,8 +125,7 @@ asset.export("MSGR_Sholem_Aleichem_Crater_Wall_Ortho_8m", treks_MSGR_Sholem_Alei
 
 
 asset.meta = {
-  Name = [[NASA Treks Layers for Mercury MSGR_MDIS_Mosaic],
-  Version = "1.0",
+  Name = [[NASA Treks Layers for Mercury MSGR_MDIS_Mosaic]],
   Author = "NASA/Treks",
   URL = "https://trek.nasa.gov/mercury",
   License = "NASA/Treks",
diff --git a/data/assets/scene/solarsystem/planets/mercury/layers/nasa-treks/MSGR_MDIS_Slope.asset b/data/assets/scene/solarsystem/planets/mercury/layers/nasa-treks/MSGR_MDIS_Slope.asset
index 17897a51ef..8b6e226f65 100644
--- a/data/assets/scene/solarsystem/planets/mercury/layers/nasa-treks/MSGR_MDIS_Slope.asset
+++ b/data/assets/scene/solarsystem/planets/mercury/layers/nasa-treks/MSGR_MDIS_Slope.asset
@@ -125,8 +125,7 @@ asset.export("MSGR_Sholem_Aleichem_Crater_Wall_Slope_25m", treks_MSGR_Sholem_Ale
 
 
 asset.meta = {
-  Name = [[NASA Treks Layers for Mercury MSGR_MDIS_Slope],
-  Version = "1.0",
+  Name = [[NASA Treks Layers for Mercury MSGR_MDIS_Slope]],
   Author = "NASA/Treks",
   URL = "https://trek.nasa.gov/mercury",
   License = "NASA/Treks",
diff --git a/data/assets/scene/solarsystem/planets/mercury/layers/newyork_layers.asset b/data/assets/scene/solarsystem/planets/mercury/layers/newyork_layers.asset
index e309463063..8b6e5cf72c 100644
--- a/data/assets/scene/solarsystem/planets/mercury/layers/newyork_layers.asset
+++ b/data/assets/scene/solarsystem/planets/mercury/layers/newyork_layers.asset
@@ -16,7 +16,6 @@ asset.require("./colorlayers/messenger_mp3_utah", false)
 
 asset.meta = {
   Name = "Default Mercury Layers (New York)",
-  Version = "1.0",
   Description = [[Default Mercury layers are: Aluminium Abundance, Calcium Abundance,
     Iron Abundance, Magnesium Abundance, Silicon Abundance, Messenger MDIS,
     Messenger Mosaic, Messenger Mosaic2, Messenger BDR, Messenger HIE, Messenger HIW,
diff --git a/data/assets/scene/solarsystem/planets/mercury/layers/sweden_layers.asset b/data/assets/scene/solarsystem/planets/mercury/layers/sweden_layers.asset
index bcf87bde48..6f05c9dde1 100644
--- a/data/assets/scene/solarsystem/planets/mercury/layers/sweden_layers.asset
+++ b/data/assets/scene/solarsystem/planets/mercury/layers/sweden_layers.asset
@@ -16,7 +16,6 @@ asset.require("./colorlayers/messenger_mp3_utah", false)
 
 asset.meta = {
   Name = "Default Mercury Layers (Sweden)",
-  Version = "1.0",
   Description = [[Default Mercury layers are: Aluminium Abundance, Calcium Abundance,
     Iron Abundance, Magnesium Abundance, Silicon Abundance, Messenger MDIS,
     Messenger Mosaic, Messenger Mosaic2, Messenger BDR, Messenger HIE, Messenger HIW,
diff --git a/data/assets/scene/solarsystem/planets/mercury/layers/utah_layers.asset b/data/assets/scene/solarsystem/planets/mercury/layers/utah_layers.asset
index ff2e5738bb..738ea253a4 100644
--- a/data/assets/scene/solarsystem/planets/mercury/layers/utah_layers.asset
+++ b/data/assets/scene/solarsystem/planets/mercury/layers/utah_layers.asset
@@ -14,7 +14,6 @@ asset.require("./colorlayers/messenger_mp3_utah", false)
 
 asset.meta = {
   Name = "Default Mercury Layers (Utah)",
-  Version = "1.0",
   Description = [[Default Mercury layers are: Aluminium Abundance, Calcium Abundance,
     Iron Abundance, Magnesium Abundance, Silicon Abundance, Messenger MDIS,
     Messenger Mosaic, Messenger Mosaic2, Messenger BDR, Messenger HIE, Messenger HIW,
diff --git a/data/assets/scene/solarsystem/planets/mercury/mercury.asset b/data/assets/scene/solarsystem/planets/mercury/mercury.asset
index 4fc7a2b520..38bcd21434 100644
--- a/data/assets/scene/solarsystem/planets/mercury/mercury.asset
+++ b/data/assets/scene/solarsystem/planets/mercury/mercury.asset
@@ -94,7 +94,6 @@ asset.export(MercuryLabel)
 
 asset.meta = {
   Name = "Mercury",
-  Version = "1.1",
   Description = "Mercury globe with labels, and main planet label",
   Author = "OpenSpace Team",
   URL = "http://openspaceproject.com",
diff --git a/data/assets/scene/solarsystem/planets/mercury/trail.asset b/data/assets/scene/solarsystem/planets/mercury/trail.asset
index e87c904aba..6f24cac77f 100644
--- a/data/assets/scene/solarsystem/planets/mercury/trail.asset
+++ b/data/assets/scene/solarsystem/planets/mercury/trail.asset
@@ -40,7 +40,6 @@ asset.export(MercuryTrail)
 
 asset.meta = {
   Name = "Mercury Trail",
-  Version = "1.1",
   Description = "Main trail for Mercury",
   Author = "OpenSpace Team",
   URL = "http://openspaceproject.com",
diff --git a/data/assets/scene/solarsystem/planets/mercury/trail_barycenter.asset b/data/assets/scene/solarsystem/planets/mercury/trail_barycenter.asset
index 215c9a0611..b7001285b4 100644
--- a/data/assets/scene/solarsystem/planets/mercury/trail_barycenter.asset
+++ b/data/assets/scene/solarsystem/planets/mercury/trail_barycenter.asset
@@ -41,7 +41,6 @@ asset.export(MercuryBarycenterTrail)
 
 asset.meta = {
   Name = "Mercury Trail",
-  Version = "1.1",
   Description = "Trail for Mercury's Barycenter",
   Author = "OpenSpace Team",
   URL = "http://openspaceproject.com",
diff --git a/data/assets/scene/solarsystem/planets/mercury/trail_earth.asset b/data/assets/scene/solarsystem/planets/mercury/trail_earth.asset
index 8587b5cdc7..97ed2e70d5 100644
--- a/data/assets/scene/solarsystem/planets/mercury/trail_earth.asset
+++ b/data/assets/scene/solarsystem/planets/mercury/trail_earth.asset
@@ -42,7 +42,6 @@ asset.export(MercuryTrailEarth)
 
 asset.meta = {
   Name = "Mercury Trail from Earth",
-  Version = "1.1",
   Description = [[Alternate trail of Mercury, as observed by the Earth rather then the
     Sun]],
   Author = "OpenSpace Team",
diff --git a/data/assets/scene/solarsystem/planets/mercury/transforms.asset b/data/assets/scene/solarsystem/planets/mercury/transforms.asset
index 9d34b9c070..30116f18e3 100644
--- a/data/assets/scene/solarsystem/planets/mercury/transforms.asset
+++ b/data/assets/scene/solarsystem/planets/mercury/transforms.asset
@@ -35,7 +35,6 @@ asset.export(MercuryBarycenter)
 
 asset.meta = {
   Name = "Mercury Transforms",
-  Version = "1.1",
   Description = "Mercury Barycenter transform",
   Author = "OpenSpace Team",
   URL = "http://openspaceproject.com",
diff --git a/data/assets/scene/solarsystem/planets/neptune/default_layers.asset b/data/assets/scene/solarsystem/planets/neptune/default_layers.asset
index 8478b3268e..52305bbe47 100644
--- a/data/assets/scene/solarsystem/planets/neptune/default_layers.asset
+++ b/data/assets/scene/solarsystem/planets/neptune/default_layers.asset
@@ -4,7 +4,6 @@ asset.require("./layers/colorlayers/neptune_texture", true)
 
 asset.meta = {
   Name = "Default Neptune Layers",
-  Version = "1.0",
   Description = "Default Neptune layers are: Neptune Texture",
   Author = "OpenSpace Team",
   URL = "http://openspaceproject.com",
diff --git a/data/assets/scene/solarsystem/planets/neptune/inner_moons.asset b/data/assets/scene/solarsystem/planets/neptune/inner_moons.asset
index 10070b7d01..163298690b 100644
--- a/data/assets/scene/solarsystem/planets/neptune/inner_moons.asset
+++ b/data/assets/scene/solarsystem/planets/neptune/inner_moons.asset
@@ -671,7 +671,6 @@ asset.export(ProteusLabel)
 
 asset.meta = {
   Name = "Neptune Inner Moons",
-  Version = "1.0",
   Description = [[Procedural Globe asset containing Neptune' inner prograde moons:
     Naiad, Thalassa, Despina, Galatea, Larissa, S2004N1, and Proteus. Blank globes and
     SPICE trails are generated for each moon]],
diff --git a/data/assets/scene/solarsystem/planets/neptune/irregular_moons.asset b/data/assets/scene/solarsystem/planets/neptune/irregular_moons.asset
index fbd440905a..6443878dba 100644
--- a/data/assets/scene/solarsystem/planets/neptune/irregular_moons.asset
+++ b/data/assets/scene/solarsystem/planets/neptune/irregular_moons.asset
@@ -483,7 +483,6 @@ asset.export(NesoLabel)
 
 asset.meta = {
   Name = "Neptune Irregular Prograde Moons",
-  Version = "1.0",
   Description = [[Procedural Globe asset containing Neptune' irregular prograde
     moons: Halimede, Psamathe and Neso. Blank globes and SPICE trails are generated for
     each moon]],
diff --git a/data/assets/scene/solarsystem/planets/neptune/kernels095.asset b/data/assets/scene/solarsystem/planets/neptune/kernels095.asset
index f216a1f0a6..012cf38618 100644
--- a/data/assets/scene/solarsystem/planets/neptune/kernels095.asset
+++ b/data/assets/scene/solarsystem/planets/neptune/kernels095.asset
@@ -45,7 +45,6 @@ asset.export("Frame", Frame)
 
 asset.meta = {
   Name = "Neptune Spice Kernels",
-  Version = "1.0",
   Description = "Generic SPICE kernels for Neptune",
   Author = "OpenSpace Team",
   URL = "https://naif.jpl.nasa.gov/pub/naif/pds/wgc/kernels/spk/",
diff --git a/data/assets/scene/solarsystem/planets/neptune/kernels102.asset b/data/assets/scene/solarsystem/planets/neptune/kernels102.asset
index 06ca2973ed..ead40f8ffd 100644
--- a/data/assets/scene/solarsystem/planets/neptune/kernels102.asset
+++ b/data/assets/scene/solarsystem/planets/neptune/kernels102.asset
@@ -29,7 +29,6 @@ asset.export("ID", ID)
 
 asset.meta = {
   Name = "Neptune Spice Kernels",
-  Version = "1.0",
   Description = "Generic SPICE kernels for Neptune",
   Author = "OpenSpace Team",
   URL = "https://naif.jpl.nasa.gov/pub/naif/pds/wgc/kernels/spk/",
diff --git a/data/assets/scene/solarsystem/planets/neptune/layers/colorlayers/neptune_texture.asset b/data/assets/scene/solarsystem/planets/neptune/layers/colorlayers/neptune_texture.asset
index ada81de638..f94543ed00 100644
--- a/data/assets/scene/solarsystem/planets/neptune/layers/colorlayers/neptune_texture.asset
+++ b/data/assets/scene/solarsystem/planets/neptune/layers/colorlayers/neptune_texture.asset
@@ -33,7 +33,6 @@ asset.export("layer", Layer)
 
 asset.meta = {
   Name = "Neptune Texutre",
-  Version = "1.0",
   Description = "Default jpg texture for Neptune",
   Author = "OpenSpace Team",
   URL = "http://openspaceproject.com",
diff --git a/data/assets/scene/solarsystem/planets/neptune/major_moons.asset b/data/assets/scene/solarsystem/planets/neptune/major_moons.asset
index 190dd64267..e3f11d21b5 100644
--- a/data/assets/scene/solarsystem/planets/neptune/major_moons.asset
+++ b/data/assets/scene/solarsystem/planets/neptune/major_moons.asset
@@ -82,7 +82,6 @@ asset.export("NeptuneMajorMoonsOff", NeptuneMajorMoonsOff.Identifier)
 
 asset.meta = {
   Name = "Neptune Major Moons",
-  Version = "1.0",
   Description = "Meta asset containing Neptune's major moons Triton and Nereid",
   Author = "OpenSpace Team",
   URL = "http://openspaceproject.com",
diff --git a/data/assets/scene/solarsystem/planets/neptune/minor_moons.asset b/data/assets/scene/solarsystem/planets/neptune/minor_moons.asset
index c4c1511261..a7138216b8 100644
--- a/data/assets/scene/solarsystem/planets/neptune/minor_moons.asset
+++ b/data/assets/scene/solarsystem/planets/neptune/minor_moons.asset
@@ -81,7 +81,6 @@ asset.export("NeptuneMinorMoonsOff", NeptuneMinorMoonsOff.Identifier)
 
 asset.meta = {
   Name = "Neptune Minor Moons",
-  Version = "1.1",
   Description = [[Meta asset containing two moon groups: inner_moons and
     irregular_moons]],
   Author = "OpenSpace Team",
diff --git a/data/assets/scene/solarsystem/planets/neptune/neptune.asset b/data/assets/scene/solarsystem/planets/neptune/neptune.asset
index 5d2ba64570..000cc0307a 100644
--- a/data/assets/scene/solarsystem/planets/neptune/neptune.asset
+++ b/data/assets/scene/solarsystem/planets/neptune/neptune.asset
@@ -76,7 +76,6 @@ asset.export(NeptuneLabel)
 
 asset.meta = {
   Name = "Neptune",
-  Version = "1.1",
   Description = "Neptune globe, and main planet label",
   Author = "OpenSpace Team",
   URL = "http://openspaceproject.com",
diff --git a/data/assets/scene/solarsystem/planets/neptune/nereid/nereid.asset b/data/assets/scene/solarsystem/planets/neptune/nereid/nereid.asset
index c09dd887c0..f2d49a0156 100644
--- a/data/assets/scene/solarsystem/planets/neptune/nereid/nereid.asset
+++ b/data/assets/scene/solarsystem/planets/neptune/nereid/nereid.asset
@@ -105,7 +105,6 @@ asset.export(NereidLabel)
 
 asset.meta = {
   Name = "Nereid",
-  Version = "1.1",
   Description = [[Procedural Globe asset containing Neptune's moon: Nereid. A blank globe
     and SPICE trail are generated for the moon]],
   Author = "OpenSpace Team",
diff --git a/data/assets/scene/solarsystem/planets/neptune/trail.asset b/data/assets/scene/solarsystem/planets/neptune/trail.asset
index e8f0ca1647..37596384bb 100644
--- a/data/assets/scene/solarsystem/planets/neptune/trail.asset
+++ b/data/assets/scene/solarsystem/planets/neptune/trail.asset
@@ -51,7 +51,6 @@ asset.export(NeptuneTrail)
 
 asset.meta = {
   Name = "Neptune Trail",
-  Version = "1.1",
   Description = "Main trail of Neptune",
   Author = "OpenSpace Team",
   URL = "http://openspaceproject.com",
diff --git a/data/assets/scene/solarsystem/planets/neptune/trail_barycenter.asset b/data/assets/scene/solarsystem/planets/neptune/trail_barycenter.asset
index d3ba82200b..1627018a52 100644
--- a/data/assets/scene/solarsystem/planets/neptune/trail_barycenter.asset
+++ b/data/assets/scene/solarsystem/planets/neptune/trail_barycenter.asset
@@ -41,7 +41,6 @@ asset.export(NeptuneBarycenterTrail)
 
 asset.meta = {
   Name = "Neptune Trail",
-  Version = "1.1",
   Description = "Trail of Neptune's Barycenter",
   Author = "OpenSpace Team",
   URL = "http://openspaceproject.com",
diff --git a/data/assets/scene/solarsystem/planets/neptune/trail_earth.asset b/data/assets/scene/solarsystem/planets/neptune/trail_earth.asset
index 5f90adafe2..7f22e97c3f 100644
--- a/data/assets/scene/solarsystem/planets/neptune/trail_earth.asset
+++ b/data/assets/scene/solarsystem/planets/neptune/trail_earth.asset
@@ -42,7 +42,6 @@ asset.export(NeptuneTrailEarth)
 
 asset.meta = {
   Name = "Neptune Trail from Earth",
-  Version = "1.1",
   Description = [[Alternate trail of Neptune, as observed by the Earth rather then the
     Sun]],
   Author = "OpenSpace Team",
diff --git a/data/assets/scene/solarsystem/planets/neptune/transforms.asset b/data/assets/scene/solarsystem/planets/neptune/transforms.asset
index a2dd5f261b..9022f1a8e1 100644
--- a/data/assets/scene/solarsystem/planets/neptune/transforms.asset
+++ b/data/assets/scene/solarsystem/planets/neptune/transforms.asset
@@ -35,7 +35,6 @@ asset.export(NeptuneBarycenter)
 
 asset.meta = {
   Name = "Neptune Transforms",
-  Version = "1.1",
   Description = "Neptune Barycenter transform",
   Author = "OpenSpace Team",
   URL = "http://openspaceproject.com",
diff --git a/data/assets/scene/solarsystem/planets/neptune/triton/default_layers.asset b/data/assets/scene/solarsystem/planets/neptune/triton/default_layers.asset
index 02ea5f5207..559f1969d2 100644
--- a/data/assets/scene/solarsystem/planets/neptune/triton/default_layers.asset
+++ b/data/assets/scene/solarsystem/planets/neptune/triton/default_layers.asset
@@ -3,7 +3,6 @@ asset.require("./layers/colorlayers/triton_voyager2_clrmosaic_globalfill_600m",
 
 asset.meta = {
   Name = "Default Triton Layers",
-  Version = "1.0",
   Description = "Default Triton layers are: Voyager2 Mosaic",
   Author = "OpenSpace Team",
   URL = "http://openspaceproject.com",
diff --git a/data/assets/scene/solarsystem/planets/neptune/triton/layers/colorlayers/triton_voyager2_clrmosaic_globalfill_600m.asset b/data/assets/scene/solarsystem/planets/neptune/triton/layers/colorlayers/triton_voyager2_clrmosaic_globalfill_600m.asset
index 28bcb45a12..f5c302c199 100644
--- a/data/assets/scene/solarsystem/planets/neptune/triton/layers/colorlayers/triton_voyager2_clrmosaic_globalfill_600m.asset
+++ b/data/assets/scene/solarsystem/planets/neptune/triton/layers/colorlayers/triton_voyager2_clrmosaic_globalfill_600m.asset
@@ -39,7 +39,6 @@ asset.export("Layer", Layer)
 
 asset.meta = {
   Name = "Triton Voyager2 Mosaic",
-  Version = "1.0",
   Description = [[Voyager2 mosaic of Triton. This layer is local in the sync folder.]],
   Author = "USGS",
   URL = "https://astrogeology.usgs.gov/search/map/Triton/Mosaic/" ..
diff --git a/data/assets/scene/solarsystem/planets/neptune/triton/triton.asset b/data/assets/scene/solarsystem/planets/neptune/triton/triton.asset
index 4cba8e5a83..51867c1b82 100644
--- a/data/assets/scene/solarsystem/planets/neptune/triton/triton.asset
+++ b/data/assets/scene/solarsystem/planets/neptune/triton/triton.asset
@@ -110,7 +110,6 @@ asset.export(TritonLabel)
 
 asset.meta = {
   Name = "Triton",
-  Version = "1.1",
   Description = [[Globe asset containing Neptune's moon Triton]],
   Author = "OpenSpace Team",
   URL = "http://openspaceproject.com",
diff --git a/data/assets/scene/solarsystem/planets/newyork_layers.asset b/data/assets/scene/solarsystem/planets/newyork_layers.asset
index 66f41604be..6e1ac2db8b 100644
--- a/data/assets/scene/solarsystem/planets/newyork_layers.asset
+++ b/data/assets/scene/solarsystem/planets/newyork_layers.asset
@@ -12,7 +12,6 @@ asset.require("./venus/layers/newyork_layers")
 
 asset.meta = {
   Name = "Default Solar System Layers (New York)",
-  Version = "1.0",
   Description = [[Adds default layers for all planets. Remove this asset and include
     individual layers for planets to customize planet layers
 
diff --git a/data/assets/scene/solarsystem/planets/planets.asset b/data/assets/scene/solarsystem/planets/planets.asset
index 4bae909da5..2263756812 100644
--- a/data/assets/scene/solarsystem/planets/planets.asset
+++ b/data/assets/scene/solarsystem/planets/planets.asset
@@ -33,7 +33,6 @@ asset.require("./neptune/major_moons")
 
 asset.meta = {
   Name = "Planets",
-  Version = "1.0",
   Description = "Collection of planets in the solar system",
   Author = "OpenSpace Team",
   URL = "http://openspaceproject.com",
diff --git a/data/assets/scene/solarsystem/planets/saturn/default_layers.asset b/data/assets/scene/solarsystem/planets/saturn/default_layers.asset
index 4027958912..3ffd4fd680 100644
--- a/data/assets/scene/solarsystem/planets/saturn/default_layers.asset
+++ b/data/assets/scene/solarsystem/planets/saturn/default_layers.asset
@@ -4,7 +4,6 @@ asset.require("./layers/colorlayers/saturn_texture", true)
 
 asset.meta = {
   Name = "Default Saturn Layers",
-  Version = "1.0",
   Description = "Default Saturn layers are: Saturn texture",
   Author = "OpenSpace Team",
   URL = "http://openspaceproject.com",
diff --git a/data/assets/scene/solarsystem/planets/saturn/dione/default_layers.asset b/data/assets/scene/solarsystem/planets/saturn/dione/default_layers.asset
index 7365151bfb..ed9ee8b0f8 100644
--- a/data/assets/scene/solarsystem/planets/saturn/dione/default_layers.asset
+++ b/data/assets/scene/solarsystem/planets/saturn/dione/default_layers.asset
@@ -4,7 +4,6 @@ asset.require("./layers/colorlayers/dione_texture", true)
 
 asset.meta = {
   Name = "Default Dione Layers",
-  Version = "1.0",
   Description = "Default Dione layers are: Dione Texture",
   Author = "OpenSpace Team",
   URL = "http://openspaceproject.com",
diff --git a/data/assets/scene/solarsystem/planets/saturn/dione/dione.asset b/data/assets/scene/solarsystem/planets/saturn/dione/dione.asset
index 2d198d2bfa..14314a5c49 100644
--- a/data/assets/scene/solarsystem/planets/saturn/dione/dione.asset
+++ b/data/assets/scene/solarsystem/planets/saturn/dione/dione.asset
@@ -96,7 +96,6 @@ asset.export(DioneLabel)
 
 asset.meta = {
   Name = "Dione",
-  Version = "1.0",
   Description = "Dione globe with labels",
   Author = "OpenSpace Team",
   URL = "http://openspaceproject.com",
diff --git a/data/assets/scene/solarsystem/planets/saturn/dione/layers/colorlayers/dione_texture.asset b/data/assets/scene/solarsystem/planets/saturn/dione/layers/colorlayers/dione_texture.asset
index a6740826bf..eeb6e3a222 100644
--- a/data/assets/scene/solarsystem/planets/saturn/dione/layers/colorlayers/dione_texture.asset
+++ b/data/assets/scene/solarsystem/planets/saturn/dione/layers/colorlayers/dione_texture.asset
@@ -33,7 +33,6 @@ asset.export("layer", Layer)
 
 asset.meta = {
   Name = "Dione Texutre",
-  Version = "1.0",
   Description = "Default jpg texture for Dione",
   Author = "OpenSpace Team",
   URL = "http://openspaceproject.com",
diff --git a/data/assets/scene/solarsystem/planets/saturn/dione/trail.asset b/data/assets/scene/solarsystem/planets/saturn/dione/trail.asset
index 000ef6aaf2..8e5fda0d3e 100644
--- a/data/assets/scene/solarsystem/planets/saturn/dione/trail.asset
+++ b/data/assets/scene/solarsystem/planets/saturn/dione/trail.asset
@@ -41,7 +41,6 @@ asset.export(DioneTrail)
 
 asset.meta = {
   Name = "Dione Trail",
-  Version = "1.0",
   Description = "Trail for Dione",
   Author = "OpenSpace Team",
   URL = "http://openspaceproject.com",
diff --git a/data/assets/scene/solarsystem/planets/saturn/enceladus/default_layers.asset b/data/assets/scene/solarsystem/planets/saturn/enceladus/default_layers.asset
index fe7fbadcc1..8c48efa562 100644
--- a/data/assets/scene/solarsystem/planets/saturn/enceladus/default_layers.asset
+++ b/data/assets/scene/solarsystem/planets/saturn/enceladus/default_layers.asset
@@ -6,7 +6,6 @@ asset.require("./layers/newyork_layers", true)
 
 asset.meta = {
   Name = "Default Enceladus Layers",
-  Version = "1.1",
   Description = [[Default Enceladus layers are: Enceladus Texture,
     and Cassini Global Mosaic 100m HPF.
 
diff --git a/data/assets/scene/solarsystem/planets/saturn/enceladus/enceladus.asset b/data/assets/scene/solarsystem/planets/saturn/enceladus/enceladus.asset
index 844c4c80cf..61e7f70cfe 100644
--- a/data/assets/scene/solarsystem/planets/saturn/enceladus/enceladus.asset
+++ b/data/assets/scene/solarsystem/planets/saturn/enceladus/enceladus.asset
@@ -96,10 +96,9 @@ asset.export(EnceladusLabel)
 
 
 asset.meta = {
-    Name = "Enceladus",
-    Version = "1.1",
-    Description = "Enceladus globe with labels and map layers",
-    Author = "OpenSpace Team",
-    URL = "http://openspaceproject.com",
-    License = "MIT license"
+  Name = "Enceladus",
+  Description = "Enceladus globe with labels and map layers",
+  Author = "OpenSpace Team",
+  URL = "http://openspaceproject.com",
+  License = "MIT license"
 }
diff --git a/data/assets/scene/solarsystem/planets/saturn/enceladus/layers/base_layers.asset b/data/assets/scene/solarsystem/planets/saturn/enceladus/layers/base_layers.asset
index 0385f2b6c3..724b343c6a 100644
--- a/data/assets/scene/solarsystem/planets/saturn/enceladus/layers/base_layers.asset
+++ b/data/assets/scene/solarsystem/planets/saturn/enceladus/layers/base_layers.asset
@@ -4,7 +4,6 @@ asset.require("./colorlayers/enceladus_texture", false)
 
 asset.meta = {
   Name = "Base Enceladus Layers",
-  Version = "1.0",
   Description = "Base Enceladus layers are: Enceladus Texture",
   Author = "OpenSpace Team",
   URL = "http://openspaceproject.com",
diff --git a/data/assets/scene/solarsystem/planets/saturn/enceladus/layers/colorlayers/enceladus_texture.asset b/data/assets/scene/solarsystem/planets/saturn/enceladus/layers/colorlayers/enceladus_texture.asset
index 73e5e3ecd8..6455680049 100644
--- a/data/assets/scene/solarsystem/planets/saturn/enceladus/layers/colorlayers/enceladus_texture.asset
+++ b/data/assets/scene/solarsystem/planets/saturn/enceladus/layers/colorlayers/enceladus_texture.asset
@@ -33,7 +33,6 @@ asset.export("layer", Layer)
 
 asset.meta = {
   Name = "Enceladus Texture",
-  Version = "1.0",
   Description = "Default jpg texture for Enceladus",
   Author = "OpenSpace Team",
   URL = "http://openspaceproject.com",
diff --git a/data/assets/scene/solarsystem/planets/saturn/enceladus/layers/colorlayers/global_mosaic_100m_hpf_newyork.asset b/data/assets/scene/solarsystem/planets/saturn/enceladus/layers/colorlayers/global_mosaic_100m_hpf_newyork.asset
index 5e7cefdd0f..cf02e17ed4 100644
--- a/data/assets/scene/solarsystem/planets/saturn/enceladus/layers/colorlayers/global_mosaic_100m_hpf_newyork.asset
+++ b/data/assets/scene/solarsystem/planets/saturn/enceladus/layers/colorlayers/global_mosaic_100m_hpf_newyork.asset
@@ -31,7 +31,6 @@ asset.export("layer", Layer)
 
 asset.meta = {
   Name = "Cassini Global Mosaic 100m HPF [New York]",
-  Version = "1.0",
   Description = [[Cassini Global mosaic for Enceladus. This map is hosted on the OpenSpace
     server in New York]],
   Author = "USGS",
diff --git a/data/assets/scene/solarsystem/planets/saturn/enceladus/layers/colorlayers/global_mosaic_100m_hpf_sweden.asset b/data/assets/scene/solarsystem/planets/saturn/enceladus/layers/colorlayers/global_mosaic_100m_hpf_sweden.asset
index 1bb97f16cd..cc30aea493 100644
--- a/data/assets/scene/solarsystem/planets/saturn/enceladus/layers/colorlayers/global_mosaic_100m_hpf_sweden.asset
+++ b/data/assets/scene/solarsystem/planets/saturn/enceladus/layers/colorlayers/global_mosaic_100m_hpf_sweden.asset
@@ -31,7 +31,6 @@ asset.export("layer", Layer)
 
 asset.meta = {
   Name = "Cassini Global Mosaic 100m HPF [Sweden]",
-  Version = "1.0",
   Description = [[Cassini Global mosaic for Enceladus. This map is hosted on the OpenSpace
     server in Sweden]],
   Author = "USGS",
diff --git a/data/assets/scene/solarsystem/planets/saturn/enceladus/layers/newyork_layers.asset b/data/assets/scene/solarsystem/planets/saturn/enceladus/layers/newyork_layers.asset
index 11baca14c5..50ddc4cb29 100644
--- a/data/assets/scene/solarsystem/planets/saturn/enceladus/layers/newyork_layers.asset
+++ b/data/assets/scene/solarsystem/planets/saturn/enceladus/layers/newyork_layers.asset
@@ -5,7 +5,6 @@ asset.require("./colorlayers/global_mosaic_100m_hpf_newyork", asset.enabled)
 
 asset.meta = {
   Name = "Default Enceladus Layers (New York)",
-  Version = "1.0",
   Description = [[Default Enceladus layers are: Enceladus Texture,
     and Cassini Global Mosaic 100m HPF.
 
diff --git a/data/assets/scene/solarsystem/planets/saturn/enceladus/layers/sweden_layers.asset b/data/assets/scene/solarsystem/planets/saturn/enceladus/layers/sweden_layers.asset
index 3908e58697..d830102319 100644
--- a/data/assets/scene/solarsystem/planets/saturn/enceladus/layers/sweden_layers.asset
+++ b/data/assets/scene/solarsystem/planets/saturn/enceladus/layers/sweden_layers.asset
@@ -5,7 +5,6 @@ asset.require("./colorlayers/global_mosaic_100m_hpf_sweden", asset.enabled)
 
 asset.meta = {
   Name = "Default Enceladus Layers (Sweden)",
-  Version = "1.0",
   Description = [[Default Enceladus layers are: Enceladus Texture,
     and Cassini Global Mosaic 100m HPF.
 
diff --git a/data/assets/scene/solarsystem/planets/saturn/enceladus/trail.asset b/data/assets/scene/solarsystem/planets/saturn/enceladus/trail.asset
index feeeaf909e..9cfd1ceca5 100644
--- a/data/assets/scene/solarsystem/planets/saturn/enceladus/trail.asset
+++ b/data/assets/scene/solarsystem/planets/saturn/enceladus/trail.asset
@@ -41,7 +41,6 @@ asset.export(EnceladusTrail)
 
 asset.meta = {
   Name = "Enceladus Trail",
-  Version = "1.1",
   Description = "Trail for Enceladus",
   Author = "OpenSpace Team",
   URL = "http://openspaceproject.com",
diff --git a/data/assets/scene/solarsystem/planets/saturn/hyperion/hyperion.asset b/data/assets/scene/solarsystem/planets/saturn/hyperion/hyperion.asset
index 9ea90bfa22..dabf012d5e 100644
--- a/data/assets/scene/solarsystem/planets/saturn/hyperion/hyperion.asset
+++ b/data/assets/scene/solarsystem/planets/saturn/hyperion/hyperion.asset
@@ -93,7 +93,6 @@ asset.export(HyperionLabel)
 
 asset.meta = {
   Name = "Hyperion",
-  Version = "1.1",
   Description = "Hyperion globe with labels",
   Author = "OpenSpace Team",
   URL = "http://openspaceproject.com",
diff --git a/data/assets/scene/solarsystem/planets/saturn/hyperion/trail.asset b/data/assets/scene/solarsystem/planets/saturn/hyperion/trail.asset
index 3b4bbdc3b5..976ba140ac 100644
--- a/data/assets/scene/solarsystem/planets/saturn/hyperion/trail.asset
+++ b/data/assets/scene/solarsystem/planets/saturn/hyperion/trail.asset
@@ -40,7 +40,6 @@ asset.export(HyperionTrail)
 
 asset.meta = {
   Name = "Hyperion Trail",
-  Version = "1.1",
   Description = "Trail of Saturn's moon Hyperion as observed by Saturn",
   Author = "OpenSpace Team",
   URL = "http://openspaceproject.com",
diff --git a/data/assets/scene/solarsystem/planets/saturn/iapetus/default_layers.asset b/data/assets/scene/solarsystem/planets/saturn/iapetus/default_layers.asset
index 1085f92655..bcfecdf163 100644
--- a/data/assets/scene/solarsystem/planets/saturn/iapetus/default_layers.asset
+++ b/data/assets/scene/solarsystem/planets/saturn/iapetus/default_layers.asset
@@ -4,7 +4,6 @@ asset.require("./layers/colorlayers/iapetus_texture", true)
 
 asset.meta = {
   Name = "Default Iapetus Layers",
-  Version = "1.0",
   Description = "Default Iapetus layers are: Iapetus Texture",
   Author = "OpenSpace Team",
   URL = "http://openspaceproject.com",
diff --git a/data/assets/scene/solarsystem/planets/saturn/iapetus/iapetus.asset b/data/assets/scene/solarsystem/planets/saturn/iapetus/iapetus.asset
index c7a5c2dcb5..abf9c15200 100644
--- a/data/assets/scene/solarsystem/planets/saturn/iapetus/iapetus.asset
+++ b/data/assets/scene/solarsystem/planets/saturn/iapetus/iapetus.asset
@@ -96,10 +96,9 @@ asset.export(IapetusLabel)
 
 
 asset.meta = {
-    Name = "Iapetus",
-    Version = "1.0",
-    Description = "Iapetus globe with labels",
-    Author = "OpenSpace Team",
-    URL = "http://openspaceproject.com",
-    License = "MIT license"
+  Name = "Iapetus",
+  Description = "Iapetus globe with labels",
+  Author = "OpenSpace Team",
+  URL = "http://openspaceproject.com",
+  License = "MIT license"
 }
diff --git a/data/assets/scene/solarsystem/planets/saturn/iapetus/layers/colorlayers/iapetus_texture.asset b/data/assets/scene/solarsystem/planets/saturn/iapetus/layers/colorlayers/iapetus_texture.asset
index e6ca952336..c553c60b49 100644
--- a/data/assets/scene/solarsystem/planets/saturn/iapetus/layers/colorlayers/iapetus_texture.asset
+++ b/data/assets/scene/solarsystem/planets/saturn/iapetus/layers/colorlayers/iapetus_texture.asset
@@ -33,7 +33,6 @@ asset.export("layer", layer)
 
 asset.meta = {
   Name = "Iapetus Texutre",
-  Version = "1.0",
   Description = "Default jpg texture for Iapetus",
   Author = "OpenSpace Team",
   URL = "http://openspaceproject.com",
diff --git a/data/assets/scene/solarsystem/planets/saturn/iapetus/trail.asset b/data/assets/scene/solarsystem/planets/saturn/iapetus/trail.asset
index 7e8b0dd695..1ced8f0d38 100644
--- a/data/assets/scene/solarsystem/planets/saturn/iapetus/trail.asset
+++ b/data/assets/scene/solarsystem/planets/saturn/iapetus/trail.asset
@@ -41,7 +41,6 @@ asset.export(IapetusTrail)
 
 asset.meta = {
   Name = "Iapetus Trail",
-  Version = "1.1",
   Description = "Main trail for Iapetus",
   Author = "OpenSpace Team",
   URL = "http://openspaceproject.com",
diff --git a/data/assets/scene/solarsystem/planets/saturn/kernels.asset b/data/assets/scene/solarsystem/planets/saturn/kernels.asset
index b2f61017f1..3185fe6eb1 100644
--- a/data/assets/scene/solarsystem/planets/saturn/kernels.asset
+++ b/data/assets/scene/solarsystem/planets/saturn/kernels.asset
@@ -51,7 +51,6 @@ asset.export("Frame", Frame)
 
 asset.meta = {
   Name = "Saturn Spice Kernels",
-  Version = "1.0",
   Description = "Generic SPICE kernels for Saturn",
   Author = "OpenSpace Team",
   URL = "https://naif.jpl.nasa.gov/pub/naif/pds/wgc/kernels/spk/",
diff --git a/data/assets/scene/solarsystem/planets/saturn/kernels415.asset b/data/assets/scene/solarsystem/planets/saturn/kernels415.asset
index dc95ea5834..8bdf08b953 100644
--- a/data/assets/scene/solarsystem/planets/saturn/kernels415.asset
+++ b/data/assets/scene/solarsystem/planets/saturn/kernels415.asset
@@ -50,7 +50,6 @@ asset.export("Frame", Frame)
 
 asset.meta = {
   Name = "Saturn Spice Kernels",
-  Version = "1.0",
   Description = "Generic SPICE kernels for Saturn",
   Author = "OpenSpace Team",
   URL = "https://naif.jpl.nasa.gov/pub/naif/pds/wgc/kernels/spk/",
diff --git a/data/assets/scene/solarsystem/planets/saturn/kernels452.asset b/data/assets/scene/solarsystem/planets/saturn/kernels452.asset
index 769e43e57e..21a670287c 100644
--- a/data/assets/scene/solarsystem/planets/saturn/kernels452.asset
+++ b/data/assets/scene/solarsystem/planets/saturn/kernels452.asset
@@ -83,7 +83,6 @@ asset.export("ID", ID)
 
 asset.meta = {
   Name = "Saturn Spice Kernels",
-  Version = "1.0",
   Description = "Generic SPICE kernels for Saturn",
   Author = "OpenSpace Team",
   URL = "https://naif.jpl.nasa.gov/pub/naif/pds/wgc/kernels/spk/",
diff --git a/data/assets/scene/solarsystem/planets/saturn/layers/colorlayers/saturn_texture.asset b/data/assets/scene/solarsystem/planets/saturn/layers/colorlayers/saturn_texture.asset
index a66453d555..0bbcb2835b 100644
--- a/data/assets/scene/solarsystem/planets/saturn/layers/colorlayers/saturn_texture.asset
+++ b/data/assets/scene/solarsystem/planets/saturn/layers/colorlayers/saturn_texture.asset
@@ -33,7 +33,6 @@ asset.export("layer", Layer)
 
 asset.meta = {
   Name = "Saturn Texutre",
-  Version = "1.0",
   Description = "Default jpg texture for Saturn",
   Author = "OpenSpace Team",
   URL = "http://openspaceproject.com",
diff --git a/data/assets/scene/solarsystem/planets/saturn/major_moons.asset b/data/assets/scene/solarsystem/planets/saturn/major_moons.asset
index 5f7e9524ab..5f2058fde1 100644
--- a/data/assets/scene/solarsystem/planets/saturn/major_moons.asset
+++ b/data/assets/scene/solarsystem/planets/saturn/major_moons.asset
@@ -88,7 +88,6 @@ asset.export("SaturnMajorMoonsOff", SaturnMajorMoonsOff.Identifier)
 
 asset.meta = {
   Name = "Saturn Major Moons",
-  Version = "1.1",
   Description = [[Meta asset containing Saturn's major moons: Dione, Enceladus, Hyperion,
     Iapetus, Mimas, Rhea, Tethys, and Titan]],
   Author = "OpenSpace Team",
diff --git a/data/assets/scene/solarsystem/planets/saturn/mimas/default_layers.asset b/data/assets/scene/solarsystem/planets/saturn/mimas/default_layers.asset
index 28f7f3af64..af6b72fbe1 100644
--- a/data/assets/scene/solarsystem/planets/saturn/mimas/default_layers.asset
+++ b/data/assets/scene/solarsystem/planets/saturn/mimas/default_layers.asset
@@ -4,7 +4,6 @@ asset.require("./layers/colorlayers/mimas_texture", true)
 
 asset.meta = {
   Name = "Default Mimas Layers",
-  Version = "1.0",
   Description = "Default Mimas layers are: Mimas Texture",
   Author = "OpenSpace Team",
   URL = "http://openspaceproject.com",
diff --git a/data/assets/scene/solarsystem/planets/saturn/mimas/layers/colorlayers/mimas_texture.asset b/data/assets/scene/solarsystem/planets/saturn/mimas/layers/colorlayers/mimas_texture.asset
index ee739c3d4b..1ee305fe18 100644
--- a/data/assets/scene/solarsystem/planets/saturn/mimas/layers/colorlayers/mimas_texture.asset
+++ b/data/assets/scene/solarsystem/planets/saturn/mimas/layers/colorlayers/mimas_texture.asset
@@ -33,7 +33,6 @@ asset.export("layer", Layer)
 
 asset.meta = {
   Name = "Mimas Texutre",
-  Version = "1.0",
   Description = "Default jpg texture for Mimas",
   Author = "OpenSpace Team",
   URL = "http://openspaceproject.com",
diff --git a/data/assets/scene/solarsystem/planets/saturn/mimas/mimas.asset b/data/assets/scene/solarsystem/planets/saturn/mimas/mimas.asset
index 1acffc38f2..76726c849d 100644
--- a/data/assets/scene/solarsystem/planets/saturn/mimas/mimas.asset
+++ b/data/assets/scene/solarsystem/planets/saturn/mimas/mimas.asset
@@ -97,7 +97,6 @@ asset.export(MimasLabel)
 
 asset.meta = {
   Name = "Mimas",
-  Version = "1.1",
   Description = "Mimas globe with labels",
   Author = "OpenSpace Team",
   URL = "http://openspaceproject.com",
diff --git a/data/assets/scene/solarsystem/planets/saturn/mimas/trail.asset b/data/assets/scene/solarsystem/planets/saturn/mimas/trail.asset
index 077cd6f20a..bc58f63adf 100644
--- a/data/assets/scene/solarsystem/planets/saturn/mimas/trail.asset
+++ b/data/assets/scene/solarsystem/planets/saturn/mimas/trail.asset
@@ -41,7 +41,6 @@ asset.export(MimasTrail)
 
 asset.meta = {
   Name = "Mimas Trail",
-  Version = "1.1",
   Description = "Main trail for Mimas",
   Author = "OpenSpace Team",
   URL = "http://openspaceproject.com",
diff --git a/data/assets/scene/solarsystem/planets/saturn/minor/gallic_group.asset b/data/assets/scene/solarsystem/planets/saturn/minor/gallic_group.asset
index 01f08094fc..f98cebdc0e 100644
--- a/data/assets/scene/solarsystem/planets/saturn/minor/gallic_group.asset
+++ b/data/assets/scene/solarsystem/planets/saturn/minor/gallic_group.asset
@@ -417,7 +417,6 @@ asset.export(TarvosLabel)
 
 asset.meta = {
   Name = "Saturn Gallic Group Moons",
-  Version = "1.0",
   Description = [[Procedural Globe asset containing Saturn's Gallic Group moons: Albiorix,
     Bebhionn, Erriapus, and Tarvos. Blank globes and SPICE trails are generated for each
     moon]],
diff --git a/data/assets/scene/solarsystem/planets/saturn/minor/inuit_group.asset b/data/assets/scene/solarsystem/planets/saturn/minor/inuit_group.asset
index e4b12e8bfe..c310ef0036 100644
--- a/data/assets/scene/solarsystem/planets/saturn/minor/inuit_group.asset
+++ b/data/assets/scene/solarsystem/planets/saturn/minor/inuit_group.asset
@@ -821,7 +821,6 @@ asset.export(S2019S01Label)
 
 asset.meta = {
   Name = "Saturn Inuit Group Moons",
-  Version = "1.0",
   Description = [[Procedural Globe asset containing Saturn's Inuit Group moons: Kiviuq,
     Ijiraq, Paaliaq, Siarnaq and Tarqeq. Blank globes and SPICE trails are generated for
     each moon]],
diff --git a/data/assets/scene/solarsystem/planets/saturn/minor/norse_group.asset b/data/assets/scene/solarsystem/planets/saturn/minor/norse_group.asset
index 4e7d3517cc..075e8ea78a 100644
--- a/data/assets/scene/solarsystem/planets/saturn/minor/norse_group.asset
+++ b/data/assets/scene/solarsystem/planets/saturn/minor/norse_group.asset
@@ -4761,7 +4761,6 @@ asset.export(S2004S39Label)
 
 asset.meta = {
   Name = "Saturn Norse Group Moons",
-  Version = "1.0",
   Description = [[Procedural Globe asset containing Saturn's Norse Group moons: Phoebe,
     Skathi, S2007S2, Skoll, S2004S13, Greip, Hyrrokkin, Jarnsaxa, Mundilfari, S2006S1,
     S2004S17, Bergelmir, Narvi, Suttungr, Hati, S2004S12, Farbauti, Thrymr, Aegir,
diff --git a/data/assets/scene/solarsystem/planets/saturn/minor/other_group.asset b/data/assets/scene/solarsystem/planets/saturn/minor/other_group.asset
index edbffe13e1..f1dbdeef23 100644
--- a/data/assets/scene/solarsystem/planets/saturn/minor/other_group.asset
+++ b/data/assets/scene/solarsystem/planets/saturn/minor/other_group.asset
@@ -924,7 +924,6 @@ asset.export(S2004S24Label)
 
 asset.meta = {
   Name = "Saturn Other Group Moons",
-  Version = "1.0",
   Description = [[Procedural Globe asset containing Saturn's Other Group moons: Aegaeon,
     Methone, Anthe, Pallene, Telesto, Calypso, Helene, Polydeuces. Blank globes and SPICE
     trails are generated for each moon]],
diff --git a/data/assets/scene/solarsystem/planets/saturn/minor/shepherd_group.asset b/data/assets/scene/solarsystem/planets/saturn/minor/shepherd_group.asset
index c90e8de779..d303ee46b7 100644
--- a/data/assets/scene/solarsystem/planets/saturn/minor/shepherd_group.asset
+++ b/data/assets/scene/solarsystem/planets/saturn/minor/shepherd_group.asset
@@ -741,7 +741,6 @@ asset.export(PanLabel)
 
 asset.meta = {
   Name = "Saturn Shepherd Moons",
-  Version = "1.0",
   Description = [[Procedural Globe asset containing Saturn's Shepherd moons: Prometheus,
     Pandora, Atlas, Janus, Epimetheus, Daphnis and Pan. Blank globes and SPICE trails are
     generated for each moon]],
diff --git a/data/assets/scene/solarsystem/planets/saturn/minor_moons.asset b/data/assets/scene/solarsystem/planets/saturn/minor_moons.asset
index b1ba22ded4..8519f81f1a 100644
--- a/data/assets/scene/solarsystem/planets/saturn/minor_moons.asset
+++ b/data/assets/scene/solarsystem/planets/saturn/minor_moons.asset
@@ -84,7 +84,6 @@ asset.export("SaturnMinorMoonsOff", SaturnMinorMoonsOff.Identifier)
 
 asset.meta = {
   Name = "Saturn Minor Moons",
-  Version = "1.1",
   Description = [[Meta asset containing five moon groups: Gallic, Inuit, Norse, Shepherd
     moons and Other]],
   Author = "OpenSpace Team",
diff --git a/data/assets/scene/solarsystem/planets/saturn/rhea/default_layers.asset b/data/assets/scene/solarsystem/planets/saturn/rhea/default_layers.asset
index 487ded6ad8..70e5a056cf 100644
--- a/data/assets/scene/solarsystem/planets/saturn/rhea/default_layers.asset
+++ b/data/assets/scene/solarsystem/planets/saturn/rhea/default_layers.asset
@@ -4,7 +4,6 @@ asset.require("./layers/colorlayers/rhea_texture", true)
 
 asset.meta = {
   Name = "Default Rhea Layers",
-  Version = "1.0",
   Description = "Default Rhea layers are: Rhea Texture",
   Author = "OpenSpace Team",
   URL = "http://openspaceproject.com",
diff --git a/data/assets/scene/solarsystem/planets/saturn/rhea/layers/colorlayers/rhea_texture.asset b/data/assets/scene/solarsystem/planets/saturn/rhea/layers/colorlayers/rhea_texture.asset
index ee8dcd149c..a7e3702dfb 100644
--- a/data/assets/scene/solarsystem/planets/saturn/rhea/layers/colorlayers/rhea_texture.asset
+++ b/data/assets/scene/solarsystem/planets/saturn/rhea/layers/colorlayers/rhea_texture.asset
@@ -33,7 +33,6 @@ asset.export("layer", Layer)
 
 asset.meta = {
   Name = "Rhea Texutre",
-  Version = "1.0",
   Description = "Default jpg texture for Rhea",
   Author = "OpenSpace Team",
   URL = "http://openspaceproject.com",
diff --git a/data/assets/scene/solarsystem/planets/saturn/rhea/rhea.asset b/data/assets/scene/solarsystem/planets/saturn/rhea/rhea.asset
index 4141b94b55..82419918e4 100644
--- a/data/assets/scene/solarsystem/planets/saturn/rhea/rhea.asset
+++ b/data/assets/scene/solarsystem/planets/saturn/rhea/rhea.asset
@@ -97,7 +97,6 @@ asset.export(RheaLabel)
 
 asset.meta = {
   Name = "Rhea",
-  Version = "1.0",
   Description = "Rhea globe with labels",
   Author = "OpenSpace Team",
   URL = "http://openspaceproject.com",
diff --git a/data/assets/scene/solarsystem/planets/saturn/rhea/trail.asset b/data/assets/scene/solarsystem/planets/saturn/rhea/trail.asset
index 1288cb2133..fa62a7f6a9 100644
--- a/data/assets/scene/solarsystem/planets/saturn/rhea/trail.asset
+++ b/data/assets/scene/solarsystem/planets/saturn/rhea/trail.asset
@@ -41,7 +41,6 @@ asset.export(RheaTrail)
 
 asset.meta = {
   Name = "Rhea Trail",
-  Version = "1.0",
   Description = "Main trail for Rhea",
   Author = "OpenSpace Team",
   URL = "http://openspaceproject.com",
diff --git a/data/assets/scene/solarsystem/planets/saturn/saturn.asset b/data/assets/scene/solarsystem/planets/saturn/saturn.asset
index 25ab1bcf88..93cd1f14b8 100644
--- a/data/assets/scene/solarsystem/planets/saturn/saturn.asset
+++ b/data/assets/scene/solarsystem/planets/saturn/saturn.asset
@@ -105,7 +105,6 @@ asset.export(SaturnLabel)
 
 asset.meta = {
   Name = "Saturn",
-  Version = "1.1",
   Description = "Saturn globe, and main planet label",
   Author = "OpenSpace Team",
   URL = "http://openspaceproject.com",
diff --git a/data/assets/scene/solarsystem/planets/saturn/tethys/default_layers.asset b/data/assets/scene/solarsystem/planets/saturn/tethys/default_layers.asset
index 6b0fa39d55..e71387b316 100644
--- a/data/assets/scene/solarsystem/planets/saturn/tethys/default_layers.asset
+++ b/data/assets/scene/solarsystem/planets/saturn/tethys/default_layers.asset
@@ -4,7 +4,6 @@ asset.require("./layers/colorlayers/tethys_texture", true)
 
 asset.meta = {
   Name = "Default Tethys Layers",
-  Version = "1.0",
   Description = "Default Tethys layers are: Tethys Texture",
   Author = "OpenSpace Team",
   URL = "http://openspaceproject.com",
diff --git a/data/assets/scene/solarsystem/planets/saturn/tethys/layers/colorlayers/tethys_texture.asset b/data/assets/scene/solarsystem/planets/saturn/tethys/layers/colorlayers/tethys_texture.asset
index d1b857cd2b..72b6215402 100644
--- a/data/assets/scene/solarsystem/planets/saturn/tethys/layers/colorlayers/tethys_texture.asset
+++ b/data/assets/scene/solarsystem/planets/saturn/tethys/layers/colorlayers/tethys_texture.asset
@@ -33,7 +33,6 @@ asset.export("layer", Layer)
 
 asset.meta = {
   Name = "Tethys Texutre",
-  Version = "1.0",
   Description = "Default jpg texture for Tethys",
   Author = "OpenSpace Team",
   URL = "http://openspaceproject.com",
diff --git a/data/assets/scene/solarsystem/planets/saturn/tethys/tethys.asset b/data/assets/scene/solarsystem/planets/saturn/tethys/tethys.asset
index 7212447486..0eccadfea9 100644
--- a/data/assets/scene/solarsystem/planets/saturn/tethys/tethys.asset
+++ b/data/assets/scene/solarsystem/planets/saturn/tethys/tethys.asset
@@ -95,7 +95,6 @@ asset.export(TethysLabel)
 
 asset.meta = {
   Name = "Tethys",
-  Version = "1.0",
   Description = "Tethys globe with labels",
   Author = "OpenSpace Team",
   URL = "http://openspaceproject.com",
diff --git a/data/assets/scene/solarsystem/planets/saturn/tethys/trail.asset b/data/assets/scene/solarsystem/planets/saturn/tethys/trail.asset
index 5b8009b6c6..911399eef1 100644
--- a/data/assets/scene/solarsystem/planets/saturn/tethys/trail.asset
+++ b/data/assets/scene/solarsystem/planets/saturn/tethys/trail.asset
@@ -41,7 +41,6 @@ asset.export(TethysTrail)
 
 asset.meta = {
   Name = "Tethys Trail",
-  Version = "1.0",
   Description = "Main trail for Tethys",
   Author = "OpenSpace Team",
   URL = "http://openspaceproject.com",
diff --git a/data/assets/scene/solarsystem/planets/saturn/titan/atmosphere.asset b/data/assets/scene/solarsystem/planets/saturn/titan/atmosphere.asset
index 719c8807f4..ef2e18ab3f 100644
--- a/data/assets/scene/solarsystem/planets/saturn/titan/atmosphere.asset
+++ b/data/assets/scene/solarsystem/planets/saturn/titan/atmosphere.asset
@@ -62,7 +62,6 @@ asset.export(Atmosphere)
 
 asset.meta = {
   Name = "Titan Atmosphere",
-  Version = "1.1",
   Description = "RenderableAtmosphere for Titan",
   Author = "OpenSpace Team",
   URL = "http://openspaceproject.com",
diff --git a/data/assets/scene/solarsystem/planets/saturn/titan/default_layers.asset b/data/assets/scene/solarsystem/planets/saturn/titan/default_layers.asset
index b9b1027544..cd992f6782 100644
--- a/data/assets/scene/solarsystem/planets/saturn/titan/default_layers.asset
+++ b/data/assets/scene/solarsystem/planets/saturn/titan/default_layers.asset
@@ -4,7 +4,6 @@ asset.require("./layers/colorlayers/cassini_iss_global_mosaic_4km_local", true)
 
 asset.meta = {
   Name = "Default Titan Layers",
-  Version = "1.0",
   Description = "Default Titan layers are: Cassini ISS Global Mosaic",
   Author = "OpenSpace Team",
   URL = "http://openspaceproject.com",
diff --git a/data/assets/scene/solarsystem/planets/saturn/titan/layers/colorlayers/cassini_iss_global_mosaic_4km_local.asset b/data/assets/scene/solarsystem/planets/saturn/titan/layers/colorlayers/cassini_iss_global_mosaic_4km_local.asset
index 02d476be05..08550b96de 100644
--- a/data/assets/scene/solarsystem/planets/saturn/titan/layers/colorlayers/cassini_iss_global_mosaic_4km_local.asset
+++ b/data/assets/scene/solarsystem/planets/saturn/titan/layers/colorlayers/cassini_iss_global_mosaic_4km_local.asset
@@ -41,7 +41,6 @@ asset.export("layer", Layer)
 
 asset.meta = {
   Name = "Cassini ISS Global Mosaic",
-  Version = "1.1",
   Description = "Cassini global image layer for Titan",
   Author = "USGS",
   URL = "https://astrogeology.usgs.gov/search/map/Titan/Cassini/Global-Mosaic/" ..
diff --git a/data/assets/scene/solarsystem/planets/saturn/titan/layers/colorlayers/cassini_iss_global_mosaic_4km_newyork.asset b/data/assets/scene/solarsystem/planets/saturn/titan/layers/colorlayers/cassini_iss_global_mosaic_4km_newyork.asset
index 6d0d4e96b2..4f9ddaad2c 100644
--- a/data/assets/scene/solarsystem/planets/saturn/titan/layers/colorlayers/cassini_iss_global_mosaic_4km_newyork.asset
+++ b/data/assets/scene/solarsystem/planets/saturn/titan/layers/colorlayers/cassini_iss_global_mosaic_4km_newyork.asset
@@ -33,7 +33,6 @@ asset.export("layer", Layer)
 
 asset.meta = {
   Name = "Cassini ISS Global Mosaic [New York]",
-  Version = "1.1",
   Description = [[Cassini global image layer for Titan. This layer is hosted on the
     OpenSpace server in New York]],
   Author = "USGS",
diff --git a/data/assets/scene/solarsystem/planets/saturn/titan/layers/colorlayers/cassini_iss_global_mosaic_4km_sweden.asset b/data/assets/scene/solarsystem/planets/saturn/titan/layers/colorlayers/cassini_iss_global_mosaic_4km_sweden.asset
index c3a4e19462..59a79a5415 100644
--- a/data/assets/scene/solarsystem/planets/saturn/titan/layers/colorlayers/cassini_iss_global_mosaic_4km_sweden.asset
+++ b/data/assets/scene/solarsystem/planets/saturn/titan/layers/colorlayers/cassini_iss_global_mosaic_4km_sweden.asset
@@ -33,7 +33,6 @@ asset.export("layer", Layer)
 
 asset.meta = {
   Name = "Cassini ISS Global Mosaic",
-  Version = "1.1",
   Description = [[Cassini global image layer for Titan. This layer is hosted on the
     OpenSpace server in Sweden]],
   Author = "USGS",
diff --git a/data/assets/scene/solarsystem/planets/saturn/titan/titan.asset b/data/assets/scene/solarsystem/planets/saturn/titan/titan.asset
index 856893dbbd..3731e036f4 100644
--- a/data/assets/scene/solarsystem/planets/saturn/titan/titan.asset
+++ b/data/assets/scene/solarsystem/planets/saturn/titan/titan.asset
@@ -97,7 +97,6 @@ asset.export(TitanLabel)
 
 asset.meta = {
   Name = "Titan",
-  Version = "1.2",
   Description = "Titan globe with labels",
   Author = "OpenSpace Team",
   URL = "http://openspaceproject.com",
diff --git a/data/assets/scene/solarsystem/planets/saturn/titan/trail.asset b/data/assets/scene/solarsystem/planets/saturn/titan/trail.asset
index 2cf180023f..ad5bf68132 100644
--- a/data/assets/scene/solarsystem/planets/saturn/titan/trail.asset
+++ b/data/assets/scene/solarsystem/planets/saturn/titan/trail.asset
@@ -41,7 +41,6 @@ asset.export(TitanTrail)
 
 asset.meta = {
   Name = "Titan Trail",
-  Version = "1.2",
   Description = "Main trail for Titan",
   Author = "OpenSpace Team",
   URL = "http://openspaceproject.com",
diff --git a/data/assets/scene/solarsystem/planets/saturn/trail.asset b/data/assets/scene/solarsystem/planets/saturn/trail.asset
index a68a4bd96c..44617c9697 100644
--- a/data/assets/scene/solarsystem/planets/saturn/trail.asset
+++ b/data/assets/scene/solarsystem/planets/saturn/trail.asset
@@ -40,7 +40,6 @@ asset.export(SaturnTrail)
 
 asset.meta = {
   Name = "Saturn Trail",
-  Version = "1.1",
   Description = "Main trail of Saturn",
   Author = "OpenSpace Team",
   URL = "http://openspaceproject.com",
diff --git a/data/assets/scene/solarsystem/planets/saturn/trail_barycenter.asset b/data/assets/scene/solarsystem/planets/saturn/trail_barycenter.asset
index 792de0b42b..383bb510bc 100644
--- a/data/assets/scene/solarsystem/planets/saturn/trail_barycenter.asset
+++ b/data/assets/scene/solarsystem/planets/saturn/trail_barycenter.asset
@@ -41,7 +41,6 @@ asset.export(SaturnBarycenterTrail)
 
 asset.meta = {
   Name = "Saturn Trail",
-  Version = "1.1",
   Description = "Trail of Saturn's Barycenter",
   Author = "OpenSpace Team",
   URL = "http://openspaceproject.com",
diff --git a/data/assets/scene/solarsystem/planets/saturn/trail_earth.asset b/data/assets/scene/solarsystem/planets/saturn/trail_earth.asset
index bf6d94f13a..e35bd3acd5 100644
--- a/data/assets/scene/solarsystem/planets/saturn/trail_earth.asset
+++ b/data/assets/scene/solarsystem/planets/saturn/trail_earth.asset
@@ -41,7 +41,6 @@ asset.export(SaturnTrailEarth)
 
 asset.meta = {
   Name = "Saturn Trail from Earth",
-  Version = "1.1",
   Description = "Alternate trail of Saturn",
   Author = "OpenSpace Team",
   URL = "http://openspaceproject.com",
diff --git a/data/assets/scene/solarsystem/planets/saturn/transforms.asset b/data/assets/scene/solarsystem/planets/saturn/transforms.asset
index 44f74f849c..0d06778328 100644
--- a/data/assets/scene/solarsystem/planets/saturn/transforms.asset
+++ b/data/assets/scene/solarsystem/planets/saturn/transforms.asset
@@ -35,7 +35,6 @@ asset.export(SaturnBarycenter)
 
 asset.meta = {
   Name = "Saturn Transforms",
-  Version = "1.1",
   Description = "Saturn Barycenter transform",
   Author = "OpenSpace Team",
   URL = "http://openspaceproject.com",
diff --git a/data/assets/scene/solarsystem/planets/sweden_layers.asset b/data/assets/scene/solarsystem/planets/sweden_layers.asset
index bc8f51ad6a..b7a584bab2 100644
--- a/data/assets/scene/solarsystem/planets/sweden_layers.asset
+++ b/data/assets/scene/solarsystem/planets/sweden_layers.asset
@@ -14,7 +14,6 @@ asset.require("./venus/layers/newyork_layers")
 
 asset.meta = {
   Name = "Default Solar System Layers (Sweden)",
-  Version = "1.0",
   Description = [[Adds default layers for all planets. Remove this asset and include
     individual layers for planets to customize planet layers
 
diff --git a/data/assets/scene/solarsystem/planets/uranus/default_layers.asset b/data/assets/scene/solarsystem/planets/uranus/default_layers.asset
index bc536ba50e..6ce06eab58 100644
--- a/data/assets/scene/solarsystem/planets/uranus/default_layers.asset
+++ b/data/assets/scene/solarsystem/planets/uranus/default_layers.asset
@@ -4,7 +4,6 @@ asset.require("./layers/colorlayers/uranus_texture", true)
 
 asset.meta = {
   Name = "Default Uranus Layers",
-  Version = "1.0",
   Description = "Default Uranus layers are: Uranus texture",
   Author = "OpenSpace Team",
   URL = "http://openspaceproject.com",
diff --git a/data/assets/scene/solarsystem/planets/uranus/inner_moons.asset b/data/assets/scene/solarsystem/planets/uranus/inner_moons.asset
index ddad1b483a..cfbb9bdd74 100644
--- a/data/assets/scene/solarsystem/planets/uranus/inner_moons.asset
+++ b/data/assets/scene/solarsystem/planets/uranus/inner_moons.asset
@@ -1222,7 +1222,6 @@ asset.export(MabLabel)
 
 asset.meta = {
   Name = "Uranus Irregular Retrograde Moons",
-  Version = "1.0",
   Description = [[Procedural Globe asset containing Uranus' irregular retrograde moons:
     Cordelia, Ophelia, Bianca, Cressida, Desdemona, Juliet, Portia, Rosalind, Cupid,
     Belinda, Perdita, Puck and Mab. Blank globes and SPICE trails are generated for each
diff --git a/data/assets/scene/solarsystem/planets/uranus/irregular_prograde_moons.asset b/data/assets/scene/solarsystem/planets/uranus/irregular_prograde_moons.asset
index 3a4ceb9481..befda39237 100644
--- a/data/assets/scene/solarsystem/planets/uranus/irregular_prograde_moons.asset
+++ b/data/assets/scene/solarsystem/planets/uranus/irregular_prograde_moons.asset
@@ -107,7 +107,6 @@ asset.export(MargaretLabel)
 
 asset.meta = {
   Name = "Uranus Irregular Prograde Moons",
-  Version = "1.0",
   Description = [[Procedural Globe asset containing Uranus' irregular prograde moon:
     Margaret. A blank globe and SPICE trail are generated for the moon]],
   Author = "OpenSpace Team",
diff --git a/data/assets/scene/solarsystem/planets/uranus/irregular_retrograde_moons.asset b/data/assets/scene/solarsystem/planets/uranus/irregular_retrograde_moons.asset
index 8572b9fec4..352663a653 100644
--- a/data/assets/scene/solarsystem/planets/uranus/irregular_retrograde_moons.asset
+++ b/data/assets/scene/solarsystem/planets/uranus/irregular_retrograde_moons.asset
@@ -764,7 +764,6 @@ asset.export(FerdinandLabel)
 
 asset.meta = {
   Name = "Uranus Irregular Retrograde Moons",
-  Version = "1.0",
   Description = [[Procedural Globe asset containing Uranus' irregular retrograde moons:
     Francisco, Caliban, Stephano, Trinculo, Sycorax, Prospero, Setebos and Ferdinand.
     Blank globes and SPICE trails are generated for each moon]],
diff --git a/data/assets/scene/solarsystem/planets/uranus/kernels.asset b/data/assets/scene/solarsystem/planets/uranus/kernels.asset
index 828d2e1a26..2ce3e6350f 100644
--- a/data/assets/scene/solarsystem/planets/uranus/kernels.asset
+++ b/data/assets/scene/solarsystem/planets/uranus/kernels.asset
@@ -41,7 +41,6 @@ asset.export("Frame", Frame)
 
 asset.meta = {
   Name = "Uranus Spice Kernels",
-  Version = "1.0",
   Description = "Generic SPICE kernels for Uranus",
   Author = "OpenSpace Team",
   URL = "https://naif.jpl.nasa.gov/pub/naif/pds/wgc/kernels/spk/",
diff --git a/data/assets/scene/solarsystem/planets/uranus/kernels115.asset b/data/assets/scene/solarsystem/planets/uranus/kernels115.asset
index 813b364797..cf1b035d35 100644
--- a/data/assets/scene/solarsystem/planets/uranus/kernels115.asset
+++ b/data/assets/scene/solarsystem/planets/uranus/kernels115.asset
@@ -54,7 +54,6 @@ asset.export("Frame", Frame)
 
 asset.meta = {
   Name = "Uranus Spice Kernels",
-  Version = "1.0",
   Description = "Generic SPICE kernels for Uranus",
   Author = "OpenSpace Team",
   URL = "https://naif.jpl.nasa.gov/pub/naif/pds/wgc/kernels/spk/",
diff --git a/data/assets/scene/solarsystem/planets/uranus/kernels116.asset b/data/assets/scene/solarsystem/planets/uranus/kernels116.asset
index 8ddd406153..bd1c197f56 100644
--- a/data/assets/scene/solarsystem/planets/uranus/kernels116.asset
+++ b/data/assets/scene/solarsystem/planets/uranus/kernels116.asset
@@ -33,7 +33,6 @@ asset.export("ID", ID)
 
 asset.meta = {
   Name = "Uranus Spice Kernels",
-  Version = "1.0",
   Description = "Generic SPICE kernels for Uranus",
   Author = "OpenSpace Team",
   URL = "https://naif.jpl.nasa.gov/pub/naif/pds/wgc/kernels/spk/",
diff --git a/data/assets/scene/solarsystem/planets/uranus/layers/colorlayers/uranus_texture.asset b/data/assets/scene/solarsystem/planets/uranus/layers/colorlayers/uranus_texture.asset
index 5741f0ef82..ac086829a9 100644
--- a/data/assets/scene/solarsystem/planets/uranus/layers/colorlayers/uranus_texture.asset
+++ b/data/assets/scene/solarsystem/planets/uranus/layers/colorlayers/uranus_texture.asset
@@ -33,7 +33,6 @@ asset.export("layer", Layer)
 
 asset.meta = {
   Name = "Uranus texture",
-  Version = "1.0",
   Description = "Uranus image texture",
   Author = "OpenSpace Team",
   URL = "http://openspaceproject.com",
diff --git a/data/assets/scene/solarsystem/planets/uranus/major_moons.asset b/data/assets/scene/solarsystem/planets/uranus/major_moons.asset
index 9243080e63..aeb951759e 100644
--- a/data/assets/scene/solarsystem/planets/uranus/major_moons.asset
+++ b/data/assets/scene/solarsystem/planets/uranus/major_moons.asset
@@ -482,7 +482,6 @@ asset.export("UranusMajorMoonsOff", UranusMajorMoonsOff.Identifier)
 
 asset.meta = {
   Name = "Uranus Marjor Moons",
-  Version = "1.0",
   Description = [[Procedural Globe asset containing Uranus' major moons: Miranda, Ariel,
     Umbriel, Titania, and Oberon. Blank globes and SPICE trails are generated for each
     moon]],
diff --git a/data/assets/scene/solarsystem/planets/uranus/minor_moons.asset b/data/assets/scene/solarsystem/planets/uranus/minor_moons.asset
index ec8b985f20..b78a6a7aae 100644
--- a/data/assets/scene/solarsystem/planets/uranus/minor_moons.asset
+++ b/data/assets/scene/solarsystem/planets/uranus/minor_moons.asset
@@ -82,7 +82,6 @@ asset.export("UranusMinorMoonsOff", UranusMinorMoonsOff.Identifier)
 
 asset.meta = {
   Name = "Uranus Minor Moons",
-  Version = "1.1",
   Description = [[Meta asset containing three moon groups: Inner Moons, Irregular Prograde
     Moons and Irregular Retrograde Moons]],
   Author = "OpenSpace Team",
diff --git a/data/assets/scene/solarsystem/planets/uranus/trail.asset b/data/assets/scene/solarsystem/planets/uranus/trail.asset
index 0ab61784b2..f48433f149 100644
--- a/data/assets/scene/solarsystem/planets/uranus/trail.asset
+++ b/data/assets/scene/solarsystem/planets/uranus/trail.asset
@@ -40,7 +40,6 @@ asset.export(UranusTrail)
 
 asset.meta = {
   Name = "Uranus Trail",
-  Version = "1.1",
   Description = "Main trail of Uranus",
   Author = "OpenSpace Team",
   URL = "http://openspaceproject.com",
diff --git a/data/assets/scene/solarsystem/planets/uranus/trail_barycenter.asset b/data/assets/scene/solarsystem/planets/uranus/trail_barycenter.asset
index 0c24192994..cdd4fd6513 100644
--- a/data/assets/scene/solarsystem/planets/uranus/trail_barycenter.asset
+++ b/data/assets/scene/solarsystem/planets/uranus/trail_barycenter.asset
@@ -41,7 +41,6 @@ asset.export(UranusBarycenterTrail)
 
 asset.meta = {
   Name = "Uranus Trail",
-  Version = "1.1",
   Description = "Trail of Uranus' Barycenter",
   Author = "OpenSpace Team",
   URL = "http://openspaceproject.com",
diff --git a/data/assets/scene/solarsystem/planets/uranus/trail_earth.asset b/data/assets/scene/solarsystem/planets/uranus/trail_earth.asset
index 6f10b3d6d2..be915740bc 100644
--- a/data/assets/scene/solarsystem/planets/uranus/trail_earth.asset
+++ b/data/assets/scene/solarsystem/planets/uranus/trail_earth.asset
@@ -41,7 +41,6 @@ asset.export(UranusTrailEarth)
 
 asset.meta = {
   Name = "Uranus Trail from Earth",
-  Version = "1.1",
   Description = "Alternate trail of Uranus, as observed by the Earth rather then the Sun",
   Author = "OpenSpace Team",
   URL = "http://openspaceproject.com",
diff --git a/data/assets/scene/solarsystem/planets/uranus/transforms.asset b/data/assets/scene/solarsystem/planets/uranus/transforms.asset
index 7973e8edb2..6e05e5c0e7 100644
--- a/data/assets/scene/solarsystem/planets/uranus/transforms.asset
+++ b/data/assets/scene/solarsystem/planets/uranus/transforms.asset
@@ -35,7 +35,6 @@ asset.export(UranusBarycenter)
 
 asset.meta = {
   Name = "Uranus Transforms",
-  Version = "1.1",
   Description = "Uranus Barycenter transform",
   Author = "OpenSpace Team",
   URL = "http://openspaceproject.com",
diff --git a/data/assets/scene/solarsystem/planets/uranus/uranus.asset b/data/assets/scene/solarsystem/planets/uranus/uranus.asset
index ed3137f11f..305994ba31 100644
--- a/data/assets/scene/solarsystem/planets/uranus/uranus.asset
+++ b/data/assets/scene/solarsystem/planets/uranus/uranus.asset
@@ -76,7 +76,6 @@ asset.export(UranusLabel)
 
 asset.meta = {
   Name = "Uranus",
-  Version = "1.1",
   Description = "Uranus globe, and main planet label",
   Author = "OpenSpace Team",
   URL = "http://openspaceproject.com",
diff --git a/data/assets/scene/solarsystem/planets/utah_layers.asset b/data/assets/scene/solarsystem/planets/utah_layers.asset
index 95b51f16e3..573c491653 100644
--- a/data/assets/scene/solarsystem/planets/utah_layers.asset
+++ b/data/assets/scene/solarsystem/planets/utah_layers.asset
@@ -14,7 +14,6 @@ asset.require("./saturn/enceladus/layers/newyork_layers")
 
 asset.meta = {
   Name = "Default Solar System Layers (Utah)",
-  Version = "1.0",
   Description = [[Adds default layers for all planets. Remove this asset and include
     individual layers for planets to customize planet layers
 
diff --git a/data/assets/scene/solarsystem/planets/venus/atmosphere.asset b/data/assets/scene/solarsystem/planets/venus/atmosphere.asset
index b2461330f8..66604edb9e 100644
--- a/data/assets/scene/solarsystem/planets/venus/atmosphere.asset
+++ b/data/assets/scene/solarsystem/planets/venus/atmosphere.asset
@@ -67,7 +67,6 @@ asset.export(Atmosphere)
 
 asset.meta = {
   Name = "Venus Atmosphere",
-  Version = "1.1",
   Description = "Atmosphere of Venus",
   Author = "OpenSpace Team",
   URL = "http://openspaceproject.com",
diff --git a/data/assets/scene/solarsystem/planets/venus/default_layers.asset b/data/assets/scene/solarsystem/planets/venus/default_layers.asset
index 4347bbf910..321479015f 100644
--- a/data/assets/scene/solarsystem/planets/venus/default_layers.asset
+++ b/data/assets/scene/solarsystem/planets/venus/default_layers.asset
@@ -6,7 +6,6 @@ asset.require("./layers/utah_layers", true)
 
 asset.meta = {
   Name = "Default Venus Layers",
-  Version = "1.2",
   Description = [[Default Venus layers are: Venus Texture, Magellan Mosaic,
     Clouds Magellan Combo, and Magellan Elevation (3D).
 
diff --git a/data/assets/scene/solarsystem/planets/venus/layers/base_layers.asset b/data/assets/scene/solarsystem/planets/venus/layers/base_layers.asset
index 312ac584d8..d51f4a2e7a 100644
--- a/data/assets/scene/solarsystem/planets/venus/layers/base_layers.asset
+++ b/data/assets/scene/solarsystem/planets/venus/layers/base_layers.asset
@@ -4,7 +4,6 @@ asset.require("./colorlayers/venus_texture", false)
 
 asset.meta = {
   Name = "Base Venus Layers",
-  Version = "1.0",
   Description = "Base Venus layers are: Venus Texture",
   Author = "OpenSpace Team",
   URL = "http://openspaceproject.com",
diff --git a/data/assets/scene/solarsystem/planets/venus/layers/colorlayers/magellan_mosaic_newyork.asset b/data/assets/scene/solarsystem/planets/venus/layers/colorlayers/magellan_mosaic_newyork.asset
index a146e802c1..0b0a7c139c 100644
--- a/data/assets/scene/solarsystem/planets/venus/layers/colorlayers/magellan_mosaic_newyork.asset
+++ b/data/assets/scene/solarsystem/planets/venus/layers/colorlayers/magellan_mosaic_newyork.asset
@@ -43,7 +43,6 @@ asset.export("layer", Layer)
 
 asset.meta = {
   Name = "Venus Magellan Mosaic",
-  Version = "1.0",
   Description = [[Map layer for Venus containting Venus Magellan Mosaic from the USGS.
     Hosted on the OpenSpace servers in New York]],
   Author = "USGS",
diff --git a/data/assets/scene/solarsystem/planets/venus/layers/colorlayers/magellan_mosaic_utah.asset b/data/assets/scene/solarsystem/planets/venus/layers/colorlayers/magellan_mosaic_utah.asset
index e9d5ec3a15..b7bdc13596 100644
--- a/data/assets/scene/solarsystem/planets/venus/layers/colorlayers/magellan_mosaic_utah.asset
+++ b/data/assets/scene/solarsystem/planets/venus/layers/colorlayers/magellan_mosaic_utah.asset
@@ -43,7 +43,6 @@ asset.export("layer", Layer)
 
 asset.meta = {
   Name = "Venus Magellan Mosaic",
-  Version = "1.0",
   Description = [[Map layer for Venus containting Venus Magellan Mosaic from the USGS.
     Hosted on the OpenSpace servers in Utah]],
   Author = "USGS",
diff --git a/data/assets/scene/solarsystem/planets/venus/layers/colorlayers/venus_texture.asset b/data/assets/scene/solarsystem/planets/venus/layers/colorlayers/venus_texture.asset
index a4b924bfc8..e99aa4cad5 100644
--- a/data/assets/scene/solarsystem/planets/venus/layers/colorlayers/venus_texture.asset
+++ b/data/assets/scene/solarsystem/planets/venus/layers/colorlayers/venus_texture.asset
@@ -48,7 +48,6 @@ asset.export(Clouds)
 
 asset.meta = {
   Name = "Venus Texture",
-  Version = "2.0",
   Description = "This asset supplies a default texture for Venus",
   Author = "OpenSpace Team",
   URL = "http://openspaceproject.com",
diff --git a/data/assets/scene/solarsystem/planets/venus/layers/heightlayers/magellan_newyork.asset b/data/assets/scene/solarsystem/planets/venus/layers/heightlayers/magellan_newyork.asset
index ad6b6f23e3..173a853113 100644
--- a/data/assets/scene/solarsystem/planets/venus/layers/heightlayers/magellan_newyork.asset
+++ b/data/assets/scene/solarsystem/planets/venus/layers/heightlayers/magellan_newyork.asset
@@ -40,7 +40,6 @@ asset.export("layer", Layer)
 
 asset.meta = {
   Name = "Venus Magellan DEM",
-  Version = "1.0",
   Description = [[Map layer for Venus containting Venus Magellan DEM from the USGS.
     Hosted on the OpenSpace servers in New York]],
   Author = "USGS",
diff --git a/data/assets/scene/solarsystem/planets/venus/layers/heightlayers/magellan_utah.asset b/data/assets/scene/solarsystem/planets/venus/layers/heightlayers/magellan_utah.asset
index bcfccb5823..7416d061a8 100644
--- a/data/assets/scene/solarsystem/planets/venus/layers/heightlayers/magellan_utah.asset
+++ b/data/assets/scene/solarsystem/planets/venus/layers/heightlayers/magellan_utah.asset
@@ -39,7 +39,6 @@ asset.export("layer", Layer)
 
 asset.meta = {
   Name = "Venus Magellan DEM",
-  Version = "1.0",
   Description = [[Map layer for Venus containting Venus Magellan DEM from the USGS.
     Hosted on the OpenSpace servers in Utah]],
   Author = "USGS",
diff --git a/data/assets/scene/solarsystem/planets/venus/layers/newyork_layers.asset b/data/assets/scene/solarsystem/planets/venus/layers/newyork_layers.asset
index fb3daf02c0..cf107b8e8b 100644
--- a/data/assets/scene/solarsystem/planets/venus/layers/newyork_layers.asset
+++ b/data/assets/scene/solarsystem/planets/venus/layers/newyork_layers.asset
@@ -8,7 +8,6 @@ asset.require("./heightlayers/magellan_newyork", asset.enabled)
 
 asset.meta = {
   Name = "Default Venus Layers (New York)",
-  Version = "1.0",
   Description = [[Default Venus layers are: Venus Texture, Magellan Mosaic,
     Clouds Magellan Combo, and Magellan Elevation (3D).
 
diff --git a/data/assets/scene/solarsystem/planets/venus/layers/utah_layers.asset b/data/assets/scene/solarsystem/planets/venus/layers/utah_layers.asset
index 26174639b3..3bf8b4aa95 100644
--- a/data/assets/scene/solarsystem/planets/venus/layers/utah_layers.asset
+++ b/data/assets/scene/solarsystem/planets/venus/layers/utah_layers.asset
@@ -8,7 +8,6 @@ asset.require("./heightlayers/magellan_utah", asset.enabled)
 
 asset.meta = {
   Name = "Default Venus Layers (Utah)",
-  Version = "1.0",
   Description = [[Default Venus layers are: Venus Texture, Magellan Mosaic,
     Clouds Magellan Combo, and Magellan Elevation (3D).
 
diff --git a/data/assets/scene/solarsystem/planets/venus/trail.asset b/data/assets/scene/solarsystem/planets/venus/trail.asset
index 6f57cec2e6..ebc7385bb1 100644
--- a/data/assets/scene/solarsystem/planets/venus/trail.asset
+++ b/data/assets/scene/solarsystem/planets/venus/trail.asset
@@ -40,7 +40,6 @@ asset.export(VenusTrail)
 
 asset.meta = {
   Name = "Venus Trail",
-  Version = "1.1",
   Description = "Trail of Venus as observed by the Sun",
   Author = "OpenSpace Team",
   URL = "http://openspaceproject.com",
diff --git a/data/assets/scene/solarsystem/planets/venus/trail_barycenter.asset b/data/assets/scene/solarsystem/planets/venus/trail_barycenter.asset
index 4d681f0ebf..e79a48e0d8 100644
--- a/data/assets/scene/solarsystem/planets/venus/trail_barycenter.asset
+++ b/data/assets/scene/solarsystem/planets/venus/trail_barycenter.asset
@@ -41,7 +41,6 @@ asset.export(VenusBarycenterTrail)
 
 asset.meta = {
   Name = "Venus Trail",
-  Version = "1.1",
   Description = "Barycenter Trail of Venus as observed by the Sun",
   Author = "OpenSpace Team",
   URL = "http://openspaceproject.com",
diff --git a/data/assets/scene/solarsystem/planets/venus/trail_earth.asset b/data/assets/scene/solarsystem/planets/venus/trail_earth.asset
index a44de7188f..bbe796393e 100644
--- a/data/assets/scene/solarsystem/planets/venus/trail_earth.asset
+++ b/data/assets/scene/solarsystem/planets/venus/trail_earth.asset
@@ -42,7 +42,6 @@ asset.export(VenusTrailEarth)
 
 asset.meta = {
   Name = "Venus Trail from Earth",
-  Version = "1.1",
   Description = "Trail of Venus as observed by the Earth",
   Author = "OpenSpace Team",
   URL = "http://openspaceproject.com",
diff --git a/data/assets/scene/solarsystem/planets/venus/transforms.asset b/data/assets/scene/solarsystem/planets/venus/transforms.asset
index 58cf0829d1..bee0e82620 100644
--- a/data/assets/scene/solarsystem/planets/venus/transforms.asset
+++ b/data/assets/scene/solarsystem/planets/venus/transforms.asset
@@ -35,7 +35,6 @@ asset.export(VenusBarycenter)
 
 asset.meta = {
   Name = "Venus Transforms",
-  Version = "1.1",
   Description = "Spice translation for Venus Barycenter",
   Author = "OpenSpace Team",
   URL = "http://openspaceproject.com",
diff --git a/data/assets/scene/solarsystem/planets/venus/venus.asset b/data/assets/scene/solarsystem/planets/venus/venus.asset
index 5e517f623e..5f9bafcccd 100644
--- a/data/assets/scene/solarsystem/planets/venus/venus.asset
+++ b/data/assets/scene/solarsystem/planets/venus/venus.asset
@@ -96,10 +96,9 @@ asset.export(VenusLabel)
 
 
 asset.meta = {
-    Name = "Venus",
-    Version = "1.1",
-    Description = "Venus globe with labels, and main planet label",
-    Author = "OpenSpace Team",
-    URL = "http://openspaceproject.com",
-    License = "MIT license"
+  Name = "Venus",
+  Description = "Venus globe with labels, and main planet label",
+  Author = "OpenSpace Team",
+  URL = "http://openspaceproject.com",
+  License = "MIT license"
 }
diff --git a/data/assets/scene/solarsystem/sssb/amor_asteroid.asset b/data/assets/scene/solarsystem/sssb/amor_asteroid.asset
index e98d5e3902..b89b521494 100644
--- a/data/assets/scene/solarsystem/sssb/amor_asteroid.asset
+++ b/data/assets/scene/solarsystem/sssb/amor_asteroid.asset
@@ -46,7 +46,6 @@ asset.export(Object)
 
 asset.meta = {
   Name = "Amor Asteroids",
-  Version = "1.1",
   Description = [[RenderableSmallBody asset with data from from JPL Horizons containing
     the Amor group]],
   Author = "JPL Small-Body Database hosted by California Institute of Technology",
diff --git a/data/assets/scene/solarsystem/sssb/apollo_asteroid.asset b/data/assets/scene/solarsystem/sssb/apollo_asteroid.asset
index 946bd93397..8f2b1ea3d1 100644
--- a/data/assets/scene/solarsystem/sssb/apollo_asteroid.asset
+++ b/data/assets/scene/solarsystem/sssb/apollo_asteroid.asset
@@ -46,7 +46,6 @@ asset.export(Object)
 
 asset.meta = {
   Name = "Apollo Asteroids",
-  Version = "1.1",
   Description = [[RenderableSmallBody asset with data from from JPL Horizons containing
     the Apollo group]],
   Author = "JPL Small-Body Database hosted by California Institute of Technology",
diff --git a/data/assets/scene/solarsystem/sssb/astraea.asset b/data/assets/scene/solarsystem/sssb/astraea.asset
index b46aaa56c3..8679e1ec84 100644
--- a/data/assets/scene/solarsystem/sssb/astraea.asset
+++ b/data/assets/scene/solarsystem/sssb/astraea.asset
@@ -67,7 +67,6 @@ asset.export(AstraeaTrail)
 
 asset.meta = {
   Name = "5 Astraea",
-  Version = "1.2",
   Description = [[This asset contains the trail and position of 5 Astraea from
     2014 JAN 01 00:00:00 to 2050 JAN 01 00:00:00. Data from JPL Horizons]],
   Author = "Zach Shaffer",
diff --git a/data/assets/scene/solarsystem/sssb/aten_asteroid.asset b/data/assets/scene/solarsystem/sssb/aten_asteroid.asset
index 9468d737eb..1c7c7b97ae 100644
--- a/data/assets/scene/solarsystem/sssb/aten_asteroid.asset
+++ b/data/assets/scene/solarsystem/sssb/aten_asteroid.asset
@@ -46,7 +46,6 @@ asset.export(Object)
 
 asset.meta = {
   Name = "Aten Asteroids",
-  Version = "1.1",
   Description = [[RenderableSmallBody asset with data from from JPL Horizons containing
     the Aten group]],
   Author = "JPL Small-Body Database hosted by California Institute of Technology",
diff --git a/data/assets/scene/solarsystem/sssb/atira_asteroid.asset b/data/assets/scene/solarsystem/sssb/atira_asteroid.asset
index 1179920996..000904556b 100644
--- a/data/assets/scene/solarsystem/sssb/atira_asteroid.asset
+++ b/data/assets/scene/solarsystem/sssb/atira_asteroid.asset
@@ -46,7 +46,6 @@ asset.export(Object)
 
 asset.meta = {
   Name = "Atira Asteroids",
-  Version = "1.1",
   Description = [[RenderableSmallBody asset with data from from JPL Horizons containing
     the Atira group]],
   Author = "JPL Small-Body Database hosted by California Institute of Technology",
diff --git a/data/assets/scene/solarsystem/sssb/c2019y4atlas.asset b/data/assets/scene/solarsystem/sssb/c2019y4atlas.asset
index 8a9537bb90..a9c113c9b8 100644
--- a/data/assets/scene/solarsystem/sssb/c2019y4atlas.asset
+++ b/data/assets/scene/solarsystem/sssb/c2019y4atlas.asset
@@ -71,7 +71,6 @@ asset.export(C2019Y4AtlasTrail)
 
 asset.meta = {
   Name = "C/2019 Y4 Atlas",
-  Version = "1.2",
   Description = [[This asset contains the trail and position of C/2019 Y4 Atlas from
     1950 JAN 01 00:00:00 to 2100 JAN 01 00:00:00. Data from JPL Horizons]],
   Author = "OpenSpace Team",
diff --git a/data/assets/scene/solarsystem/sssb/centaur_asteroid.asset b/data/assets/scene/solarsystem/sssb/centaur_asteroid.asset
index f8f3760648..688e139197 100644
--- a/data/assets/scene/solarsystem/sssb/centaur_asteroid.asset
+++ b/data/assets/scene/solarsystem/sssb/centaur_asteroid.asset
@@ -46,7 +46,6 @@ asset.export(Object)
 
 asset.meta = {
   Name = "Centaur Asteroids",
-  Version = "1.1",
   Description = [[RenderableSmallBody asset with data from from JPL Horizons containing
     the Centaur group]],
   Author = "JPL Small-Body Database hosted by California Institute of Technology",
diff --git a/data/assets/scene/solarsystem/sssb/chiron-type_comet.asset b/data/assets/scene/solarsystem/sssb/chiron-type_comet.asset
index ceaca98323..13ac881cd8 100644
--- a/data/assets/scene/solarsystem/sssb/chiron-type_comet.asset
+++ b/data/assets/scene/solarsystem/sssb/chiron-type_comet.asset
@@ -46,7 +46,6 @@ asset.export(Object)
 
 asset.meta = {
   Name = "Chiron-Type Comets",
-  Version = "1.1",
   Description = [[RenderableSmallBody asset with data from from JPL Horizons containing
     the Chiron-Type group]],
   Author = "JPL Small-Body Database hosted by California Institute of Technology",
diff --git a/data/assets/scene/solarsystem/sssb/encke-type_comet.asset b/data/assets/scene/solarsystem/sssb/encke-type_comet.asset
index 999334f6e1..3ce380a567 100644
--- a/data/assets/scene/solarsystem/sssb/encke-type_comet.asset
+++ b/data/assets/scene/solarsystem/sssb/encke-type_comet.asset
@@ -46,7 +46,6 @@ asset.export(Object)
 
 asset.meta = {
   Name = "Encke-Type Comets",
-  Version = "1.1",
   Description = [[RenderableSmallBody asset with data from from JPL Horizons containing
     the Encke-Type group]],
   Author = "JPL Small-Body Database hosted by California Institute of Technology",
diff --git a/data/assets/scene/solarsystem/sssb/halley-type_comet.asset b/data/assets/scene/solarsystem/sssb/halley-type_comet.asset
index d97f55773c..d135cfbbba 100644
--- a/data/assets/scene/solarsystem/sssb/halley-type_comet.asset
+++ b/data/assets/scene/solarsystem/sssb/halley-type_comet.asset
@@ -45,7 +45,6 @@ asset.export(Object)
 
 asset.meta = {
   Name = "Halley-Type Comets",
-  Version = "1.1",
   Description = [[RenderableSmallBody asset with data from from JPL Horizons containing
     the Halley-Type group]],
   Author = "JPL Small-Body Database hosted by California Institute of Technology",
diff --git a/data/assets/scene/solarsystem/sssb/inner_main_belt_asteroid.asset b/data/assets/scene/solarsystem/sssb/inner_main_belt_asteroid.asset
index 85f76d01ad..2b843dd9b3 100644
--- a/data/assets/scene/solarsystem/sssb/inner_main_belt_asteroid.asset
+++ b/data/assets/scene/solarsystem/sssb/inner_main_belt_asteroid.asset
@@ -46,7 +46,6 @@ asset.export(Object)
 
 asset.meta = {
   Name = "Inner Main Asteroid Belt",
-  Version = "1.1",
   Description = [[RenderableSmallBody asset with data from from JPL Horizons containing
     the Inner Main Asteroid Belt group]],
   Author = "JPL Small-Body Database hosted by California Institute of Technology",
diff --git a/data/assets/scene/solarsystem/sssb/itokawa.asset b/data/assets/scene/solarsystem/sssb/itokawa.asset
index d473d04d8d..a7de3618cf 100644
--- a/data/assets/scene/solarsystem/sssb/itokawa.asset
+++ b/data/assets/scene/solarsystem/sssb/itokawa.asset
@@ -101,7 +101,6 @@ asset.export(ItokawaModel)
 
 asset.meta = {
   Name = "Itokawa Asteroid",
-  Version = "1.0",
   Description = [[Position, trail and model of asteroid 25143 Itokawa from
     1950 JAN 1 00:00:00 to 2050 JAN 1 00:00:00. Data from JPL Horizons]],
   Author = "OpenSpace Team",
diff --git a/data/assets/scene/solarsystem/sssb/jupiter-family_comet.asset b/data/assets/scene/solarsystem/sssb/jupiter-family_comet.asset
index cfd55eff33..d38b10968c 100644
--- a/data/assets/scene/solarsystem/sssb/jupiter-family_comet.asset
+++ b/data/assets/scene/solarsystem/sssb/jupiter-family_comet.asset
@@ -46,7 +46,6 @@ asset.export(Object)
 
 asset.meta = {
   Name = "Jupiter Family Comets",
-  Version = "1.1",
   Description = [[RenderableSmallBody asset with data from from JPL Horizons containing
     Jupiter-family group]],
   Author = "JPL Small-Body Database hosted by California Institute of Technology",
diff --git a/data/assets/scene/solarsystem/sssb/jupiter_trojan_asteroid.asset b/data/assets/scene/solarsystem/sssb/jupiter_trojan_asteroid.asset
index 9501df4db0..ea06683651 100644
--- a/data/assets/scene/solarsystem/sssb/jupiter_trojan_asteroid.asset
+++ b/data/assets/scene/solarsystem/sssb/jupiter_trojan_asteroid.asset
@@ -46,7 +46,6 @@ asset.export(Object)
 
 asset.meta = {
   Name = "Jupiter Trojan Asteroids",
-  Version = "1.1",
   Description = [[RenderableSmallBody asset with data from from JPL Horizons containing
     Jupiter Trojan group]],
   Author = "JPL Small-Body Database hosted by California Institute of Technology",
diff --git a/data/assets/scene/solarsystem/sssb/main_belt_asteroid.asset b/data/assets/scene/solarsystem/sssb/main_belt_asteroid.asset
index f689394fbd..76978d5826 100644
--- a/data/assets/scene/solarsystem/sssb/main_belt_asteroid.asset
+++ b/data/assets/scene/solarsystem/sssb/main_belt_asteroid.asset
@@ -47,7 +47,6 @@ asset.export(Object)
 
 asset.meta = {
   Name = "Main Asteroid Belt",
-  Version = "1.1",
   Description = [[RenderableSmallBody asset with data from from JPL Horizons containing
     Main Asteroid Belt group]],
   Author = "JPL Small-Body Database hosted by California Institute of Technology",
diff --git a/data/assets/scene/solarsystem/sssb/mars-crossing_asteroid.asset b/data/assets/scene/solarsystem/sssb/mars-crossing_asteroid.asset
index 316e369f5c..2e173fa8cb 100644
--- a/data/assets/scene/solarsystem/sssb/mars-crossing_asteroid.asset
+++ b/data/assets/scene/solarsystem/sssb/mars-crossing_asteroid.asset
@@ -46,7 +46,6 @@ asset.export(Object)
 
 asset.meta = {
   Name = "Mars-Crossing Asteroids",
-  Version = "1.1",
   Description = [[RenderableSmallBody asset with data from from JPL Horizons containing
     Mars-Crossing group]],
   Author = "JPL Small-Body Database hosted by California Institute of Technology",
diff --git a/data/assets/scene/solarsystem/sssb/outer_main_belt_asteroid.asset b/data/assets/scene/solarsystem/sssb/outer_main_belt_asteroid.asset
index 237ce90ff5..be738fa2a0 100644
--- a/data/assets/scene/solarsystem/sssb/outer_main_belt_asteroid.asset
+++ b/data/assets/scene/solarsystem/sssb/outer_main_belt_asteroid.asset
@@ -45,7 +45,6 @@ asset.export(Object)
 
 asset.meta = {
   Name = "Outer Main Asteroid Belt",
-  Version = "1.1",
     Description = [[RenderableSmallBody asset with data from from JPL Horizons containing
       Outer Main Asteroid Belt group]],
   Author = "JPL Small-Body Database hosted by California Institute of Technology",
diff --git a/data/assets/scene/solarsystem/sssb/pha.asset b/data/assets/scene/solarsystem/sssb/pha.asset
index c828abba62..35465484a8 100644
--- a/data/assets/scene/solarsystem/sssb/pha.asset
+++ b/data/assets/scene/solarsystem/sssb/pha.asset
@@ -48,7 +48,6 @@ asset.export(Object)
 
 asset.meta = {
   Name = "Potentially-Hazardous Asteroids",
-  Version = "1.1",
   Description = [[RenderableSmallBody asset with data from from JPL Horizons containing
     Potentially Hazardous group. ]],
   Author = [[JPL Small-Body Database hosted by California Institute of
diff --git a/data/assets/scene/solarsystem/sssb/swifttuttle.asset b/data/assets/scene/solarsystem/sssb/swifttuttle.asset
index 50acb133b0..f4d5c82348 100644
--- a/data/assets/scene/solarsystem/sssb/swifttuttle.asset
+++ b/data/assets/scene/solarsystem/sssb/swifttuttle.asset
@@ -67,7 +67,6 @@ asset.export(SwiftTuttleTrail)
 
 asset.meta = {
   Name = "Swift Tuttle",
-  Version = "1.2",
   Description = [[Position and Trail of Swift Tuttle from 1879 JUN 27 to 2050 JAN 01. Data
     from JPL Horizons]],
   Author = "OpenSpace Team",
diff --git a/data/assets/scene/solarsystem/sssb/tesla_roadster.asset b/data/assets/scene/solarsystem/sssb/tesla_roadster.asset
index e9d45b687d..d17437a097 100644
--- a/data/assets/scene/solarsystem/sssb/tesla_roadster.asset
+++ b/data/assets/scene/solarsystem/sssb/tesla_roadster.asset
@@ -69,7 +69,6 @@ asset.export(TeslaRoadsterTrail)
 
 asset.meta = {
   Name = "Tesla Roadster",
-  Version = "1.2",
   Description = [[Position and Trail of Tesla Roadster from 2018 FEB 7 03:00:00 to
     2089 DEC 31 03:00:00. Data from JPL Horizons]],
   Author = "OpenSpace Team",
diff --git a/data/assets/scene/solarsystem/sssb/transneptunian_object_asteroid.asset b/data/assets/scene/solarsystem/sssb/transneptunian_object_asteroid.asset
index 3666cdcf35..fab0c4d349 100644
--- a/data/assets/scene/solarsystem/sssb/transneptunian_object_asteroid.asset
+++ b/data/assets/scene/solarsystem/sssb/transneptunian_object_asteroid.asset
@@ -46,7 +46,6 @@ asset.export(Object)
 
 asset.meta = {
   Name = "Trans-Neptunian Asteroids",
-  Version = "1.1",
   Description = [[RenderableSmallBody asset with data from from JPL Horizons containing
     the Trans-Neptunian group]],
   Author = [[JPL Small-Body Database hosted by California Institute of
diff --git a/data/assets/scene/solarsystem/sun.asset b/data/assets/scene/solarsystem/sun.asset
index b7292fb709..76e2c5b597 100644
--- a/data/assets/scene/solarsystem/sun.asset
+++ b/data/assets/scene/solarsystem/sun.asset
@@ -5,7 +5,6 @@ asset.require("./sun/glare")
 
 asset.meta = {
   Name = "Sun",
-  Version = "1.0",
   Description = [[Meta asset for the Sun in our solar system. Contains the Sun globe and
   Sun glare texture]],
   Author = "OpenSpace Team",
diff --git a/data/assets/scene/solarsystem/sun/EUV_layer.asset b/data/assets/scene/solarsystem/sun/EUV_layer.asset
index 768412bd6b..6fd0757944 100644
--- a/data/assets/scene/solarsystem/sun/EUV_layer.asset
+++ b/data/assets/scene/solarsystem/sun/EUV_layer.asset
@@ -78,7 +78,6 @@ asset.export(EUVLayer)
 
 asset.meta = {
   Name = "Predictive Science Inc. EUV texture sequence Bastille Days",
-  Version = "1.2",
   Description = [[Texture sequence of an extreme ultraviolet (EUV) simulation during the CME]],
   Author = "CCMC, OpenSpace team",
   URL = "https://dx.doi.org/10.3847/1538-4357/aab36d",
diff --git a/data/assets/scene/solarsystem/sun/default_layers.asset b/data/assets/scene/solarsystem/sun/default_layers.asset
index 9917c6a852..edd5c0abda 100644
--- a/data/assets/scene/solarsystem/sun/default_layers.asset
+++ b/data/assets/scene/solarsystem/sun/default_layers.asset
@@ -4,7 +4,6 @@ asset.require("./layers/colorlayers/sun_texture", true)
 
 asset.meta = {
   Name = "Default Sun layers",
-  Version = "1.0",
   Description = "Default Sun layers renderable globe",
   Author = "OpenSpace Team",
   URL = "http://openspaceproject.com",
diff --git a/data/assets/scene/solarsystem/sun/glare.asset b/data/assets/scene/solarsystem/sun/glare.asset
index eccb8b60ed..98013f63bc 100644
--- a/data/assets/scene/solarsystem/sun/glare.asset
+++ b/data/assets/scene/solarsystem/sun/glare.asset
@@ -44,7 +44,6 @@ asset.export(SunGlare)
 
 asset.meta = {
   Name = "Sun Glare",
-  Version = "1.1",
   Description = "Image plane with sun glare effect",
   Author = "OpenSpace Team",
   URL = "http://openspaceproject.com",
diff --git a/data/assets/scene/solarsystem/sun/habitablezone.asset b/data/assets/scene/solarsystem/sun/habitablezone.asset
index 9bd5f09e82..4a86d2fcd5 100644
--- a/data/assets/scene/solarsystem/sun/habitablezone.asset
+++ b/data/assets/scene/solarsystem/sun/habitablezone.asset
@@ -37,7 +37,6 @@ asset.export(HabitableZone)
 
 asset.meta = {
   Name = "Sun Habitable Zone",
-  Version = "1.1",
   Description = [[The habitable zone around our sun, computed using formula and
     coefficients by Kopparapu et al. (2015) https://arxiv.org/abs/1404.5292]],
   Author = "OpenSpace Team",
diff --git a/data/assets/scene/solarsystem/sun/layers/colorlayers/sun_texture.asset b/data/assets/scene/solarsystem/sun/layers/colorlayers/sun_texture.asset
index c622e17b6f..bb0793ad1f 100644
--- a/data/assets/scene/solarsystem/sun/layers/colorlayers/sun_texture.asset
+++ b/data/assets/scene/solarsystem/sun/layers/colorlayers/sun_texture.asset
@@ -33,7 +33,6 @@ asset.export("layer", Layer)
 
 asset.meta = {
   Name = "Sun Texture",
-  Version = "1.0",
   Description = "Default Sun texture for renderable globe",
   Author = "OpenSpace Team",
   URL = "http://openspaceproject.com",
diff --git a/data/assets/scene/solarsystem/sun/marker.asset b/data/assets/scene/solarsystem/sun/marker.asset
index 768ad646a2..cd2277fb80 100644
--- a/data/assets/scene/solarsystem/sun/marker.asset
+++ b/data/assets/scene/solarsystem/sun/marker.asset
@@ -44,7 +44,6 @@ asset.export(SunMarker)
 
 asset.meta = {
   Name = "Sun marker",
-  Version = "1.1",
   Description = "Marker for the Sun, with a stick and label",
   Author = "OpenSpace Team",
   URL = "http://openspaceproject.com",
diff --git a/data/assets/scene/solarsystem/sun/sun.asset b/data/assets/scene/solarsystem/sun/sun.asset
index 5188eb0748..646d457512 100644
--- a/data/assets/scene/solarsystem/sun/sun.asset
+++ b/data/assets/scene/solarsystem/sun/sun.asset
@@ -69,7 +69,6 @@ asset.export(SunLabel)
 
 asset.meta = {
   Name = "Sun",
-  Version = "1.1",
   Description = "The Sun and label",
   Author = "OpenSpace Team",
   URL = "http://openspaceproject.com",
diff --git a/data/assets/scene/solarsystem/sun/transforms.asset b/data/assets/scene/solarsystem/sun/transforms.asset
index 173973ad9b..82d7b9a60e 100644
--- a/data/assets/scene/solarsystem/sun/transforms.asset
+++ b/data/assets/scene/solarsystem/sun/transforms.asset
@@ -113,7 +113,6 @@ asset.export("LightSource", LightSource)
 
 asset.meta = {
   Name = "Sun Transforms",
-  Version = "1.1",
   Description = "Sun transforms: Solar System Barycenter, SUN IAU and SUN J2000",
   Author = "OpenSpace Team",
   URL = "http://openspaceproject.com",
diff --git a/data/assets/scene/solarsystem/sun/transforms_heliosphere.asset b/data/assets/scene/solarsystem/sun/transforms_heliosphere.asset
index ad293dc48b..56c750dd8c 100644
--- a/data/assets/scene/solarsystem/sun/transforms_heliosphere.asset
+++ b/data/assets/scene/solarsystem/sun/transforms_heliosphere.asset
@@ -46,7 +46,6 @@ asset.export(HEEQ180ReferenceFrame)
 
 asset.meta = {
   Name = "Sun Transform, HEEQ180",
-  Version = "1.1",
   Description = "Sun transform: HEEQ180",
   Author = "CCMC",
   URL = "http://openspaceproject.com",
diff --git a/data/assets/scene/solarsystem/telescopes/euclid/euclid.asset b/data/assets/scene/solarsystem/telescopes/euclid/euclid.asset
index 5fced2cf7c..8ee29d76b2 100644
--- a/data/assets/scene/solarsystem/telescopes/euclid/euclid.asset
+++ b/data/assets/scene/solarsystem/telescopes/euclid/euclid.asset
@@ -6,7 +6,6 @@ asset.require("./mission")
 
 asset.meta = {
   Name = "Euclid",
-  Version = "1.0",
   Description = "This asset includes all of the other assets for the Euclid mission.",
   Author = "OpenSpace Team",
   URL = "http://openspaceproject.com",
diff --git a/data/assets/scene/solarsystem/telescopes/euclid/kernels.asset b/data/assets/scene/solarsystem/telescopes/euclid/kernels.asset
index c2ff6c3129..9d407d81c9 100644
--- a/data/assets/scene/solarsystem/telescopes/euclid/kernels.asset
+++ b/data/assets/scene/solarsystem/telescopes/euclid/kernels.asset
@@ -30,7 +30,6 @@ asset.export("ID", ID)
 
 asset.meta = {
   Name = "Euclid Kernels",
-  Version = "1.0",
   Description = "This asset contains the SPICE kernels for ESA's Euclid mission.",
   Author = "OpenSpace Team",
   URL = "http://openspaceproject.com",
diff --git a/data/assets/scene/solarsystem/telescopes/euclid/mission.asset b/data/assets/scene/solarsystem/telescopes/euclid/mission.asset
index 240e909f94..a9b2ba0c43 100644
--- a/data/assets/scene/solarsystem/telescopes/euclid/mission.asset
+++ b/data/assets/scene/solarsystem/telescopes/euclid/mission.asset
@@ -81,7 +81,6 @@ end)
 
 asset.meta = {
   Name = "Euclid Mission",
-  Version = "1.0",
   Description = "This asset contains the mission profile information for ESA's Euclid mission. The data in this file has been combined from multiple sources, including https://sci.esa.int/web/euclid, https://www.esa.int/Science_Exploration/Space_Science/Euclid_overview, https://www.euclid-ec.org/, https://sci.esa.int/web/euclid, https://indico.in2p3.fr/event/14206/contributions/17189/attachments/14299/17526/Euclid-MSauvage-LSSTFrance-MAR2017.pdf, and https://euclid.caltech.edu/page/data-release-timeline",
   Author = "OpenSpace Team",
   URL = "http://openspaceproject.com",
diff --git a/data/assets/scene/solarsystem/telescopes/euclid/model.asset b/data/assets/scene/solarsystem/telescopes/euclid/model.asset
index d66a6d0dc9..c358df4319 100644
--- a/data/assets/scene/solarsystem/telescopes/euclid/model.asset
+++ b/data/assets/scene/solarsystem/telescopes/euclid/model.asset
@@ -66,7 +66,6 @@ asset.export(Euclid)
 
 asset.meta = {
   Name = "Euclid Model",
-  Version = "1.0",
   Description = "This asset contains the model of ESA's Euclid spacecraft. The model is retrieved from https://scifleet.esa.int",
   Author = "OpenSpace Team",
   URL = "http://openspaceproject.com",
diff --git a/data/assets/scene/solarsystem/telescopes/euclid/trails.asset b/data/assets/scene/solarsystem/telescopes/euclid/trails.asset
index 659d243239..5436746b4c 100644
--- a/data/assets/scene/solarsystem/telescopes/euclid/trails.asset
+++ b/data/assets/scene/solarsystem/telescopes/euclid/trails.asset
@@ -128,7 +128,6 @@ asset.export(EuclidTrailCoRevOrbit)
 
 asset.meta = {
   Name = "Euclid Trails",
-  Version = "1.0",
   Description = "This asset contains the trails for the Euclid spacecraft relative to the Earth and the Sun.",
   Author = "OpenSpace Team",
   URL = "http://openspaceproject.com",
diff --git a/data/assets/scene/solarsystem/telescopes/gaia/trail.asset b/data/assets/scene/solarsystem/telescopes/gaia/trail.asset
index 8f0173dbe1..cc159ca913 100644
--- a/data/assets/scene/solarsystem/telescopes/gaia/trail.asset
+++ b/data/assets/scene/solarsystem/telescopes/gaia/trail.asset
@@ -83,7 +83,6 @@ asset.export(GaiaTrailEclip)
 
 asset.meta = {
   Name = "Gaia Trail",
-  Version = "1.0",
   Description = [[This asset contains the trail of Gaia around both Earth and the Sun.
     Data from JPL Horizons from 2013 DEC 19 09:55:27 to 2026 SEP 14 21:15:27]],
   Author = "OpenSpace Team",
diff --git a/data/assets/scene/solarsystem/telescopes/gaia/transforms.asset b/data/assets/scene/solarsystem/telescopes/gaia/transforms.asset
index 920d928b04..702bded85b 100644
--- a/data/assets/scene/solarsystem/telescopes/gaia/transforms.asset
+++ b/data/assets/scene/solarsystem/telescopes/gaia/transforms.asset
@@ -48,7 +48,6 @@ asset.export(GaiaPosition)
 
 asset.meta = {
   Name = "Gaia Transform",
-  Version = "1.0",
   Description = [[This asset contains the position of Gaia from 2013 DEC 19 09:55:27 to
     2026 SEP 14 21:15:27. Data from JPL Horizons]],
   Author = "OpenSpace Team",
diff --git a/data/assets/scene/solarsystem/telescopes/jwst/actions.asset b/data/assets/scene/solarsystem/telescopes/jwst/actions.asset
index 5cbec1b0c3..ed9854d6f8 100644
--- a/data/assets/scene/solarsystem/telescopes/jwst/actions.asset
+++ b/data/assets/scene/solarsystem/telescopes/jwst/actions.asset
@@ -166,7 +166,6 @@ asset.export("ToggleTrailsExceptMoon", ToggleJwstTrails.Identifier)
 
 asset.meta = {
   Name = "Actions - JWST",
-  Version = "1.0",
   Description = "Actions related to the JWST mission",
   Author = "OpenSpace Team",
   URL = "http://openspaceproject.com",
diff --git a/data/assets/scene/solarsystem/telescopes/jwst/jwst.asset b/data/assets/scene/solarsystem/telescopes/jwst/jwst.asset
index e6a242a38b..ceaf3717e7 100644
--- a/data/assets/scene/solarsystem/telescopes/jwst/jwst.asset
+++ b/data/assets/scene/solarsystem/telescopes/jwst/jwst.asset
@@ -169,7 +169,6 @@ asset.export(JWSTLabel)
 
 asset.meta = {
   Name = "James Webb Space Telescope",
-  Version = "1.1",
   Description = [[
     James Webb Space Telescope animated model, safe viewing band, field of view and label.
   ]],
diff --git a/data/assets/scene/solarsystem/telescopes/jwst/targets/crab.asset b/data/assets/scene/solarsystem/telescopes/jwst/targets/crab.asset
index d9df8bce0f..b1b31eac5c 100644
--- a/data/assets/scene/solarsystem/telescopes/jwst/targets/crab.asset
+++ b/data/assets/scene/solarsystem/telescopes/jwst/targets/crab.asset
@@ -33,7 +33,6 @@ asset.export(CrabImage)
 
 asset.meta = {
   Name = "Crab Nebula Image",
-  Version = "1.0",
   Description = "Screenspace image of the Crab Nebula",
   Author = "OpenSpace Team",
   URL = "http://openspaceproject.com",
diff --git a/data/assets/scene/solarsystem/telescopes/jwst/targets/crab_image.asset b/data/assets/scene/solarsystem/telescopes/jwst/targets/crab_image.asset
index ebde46633a..bb61696508 100644
--- a/data/assets/scene/solarsystem/telescopes/jwst/targets/crab_image.asset
+++ b/data/assets/scene/solarsystem/telescopes/jwst/targets/crab_image.asset
@@ -12,7 +12,6 @@ asset.export("image", image)
 
 asset.meta = {
   Name = "Crab Nebula",
-  Version = "1.0",
   Description = "Crab Nebula Image",
   Author = [[
     NASA, ESA and Allison Loll/Jeff Hester (Arizona State University).
diff --git a/data/assets/scene/solarsystem/telescopes/jwst/targets/hd84406.asset b/data/assets/scene/solarsystem/telescopes/jwst/targets/hd84406.asset
index fdc89b55aa..ac6bcea77d 100644
--- a/data/assets/scene/solarsystem/telescopes/jwst/targets/hd84406.asset
+++ b/data/assets/scene/solarsystem/telescopes/jwst/targets/hd84406.asset
@@ -33,7 +33,6 @@ asset.export(HD84406Image)
 
 asset.meta = {
   Name = "HD 84406 Star Image",
-  Version = "1.0",
   Description = "Screenspace image of the HD 84406 Star",
   Author = "OpenSpace Team",
   URL = "http://openspaceproject.com",
diff --git a/data/assets/scene/solarsystem/telescopes/jwst/targets/hd84406_image.asset b/data/assets/scene/solarsystem/telescopes/jwst/targets/hd84406_image.asset
index a126e76547..576a2b415d 100644
--- a/data/assets/scene/solarsystem/telescopes/jwst/targets/hd84406_image.asset
+++ b/data/assets/scene/solarsystem/telescopes/jwst/targets/hd84406_image.asset
@@ -12,7 +12,6 @@ asset.export("image", image)
 
 asset.meta = {
   Name = "HD 84406 Star",
-  Version = "1.0",
   Description = "JWST alignment image of star HD 84406",
   Author = "NASA/STScI",
   URL = "https://www.nasa.gov/press-release/nasa-s-webb-reaches-alignment-milestone-optics-working-successfully",
diff --git a/data/assets/scene/solarsystem/telescopes/jwst/targets/hh212.asset b/data/assets/scene/solarsystem/telescopes/jwst/targets/hh212.asset
index 5badac01d0..744dc4755f 100644
--- a/data/assets/scene/solarsystem/telescopes/jwst/targets/hh212.asset
+++ b/data/assets/scene/solarsystem/telescopes/jwst/targets/hh212.asset
@@ -33,7 +33,6 @@ asset.export(HH212Image)
 
 asset.meta = {
   Name = "HH 212 Image",
-  Version = "1.0",
   Description = "Screenspace image of HH 212",
   Author = "OpenSpace Team",
   URL = "http://openspaceproject.com",
diff --git a/data/assets/scene/solarsystem/telescopes/jwst/targets/hh212_image.asset b/data/assets/scene/solarsystem/telescopes/jwst/targets/hh212_image.asset
index 0f9cb45f3e..5de6824dfb 100644
--- a/data/assets/scene/solarsystem/telescopes/jwst/targets/hh212_image.asset
+++ b/data/assets/scene/solarsystem/telescopes/jwst/targets/hh212_image.asset
@@ -12,7 +12,6 @@ asset.export("image", image)
 
 asset.meta = {
   Name = "HH 212",
-  Version = "1.0",
   Description = "HH 212 Image",
   Author = "ESO/M. McCaughrean",
   URL = "https://www.eso.org/public/images/potw1541a/",
diff --git a/data/assets/scene/solarsystem/telescopes/jwst/targets/hudf.asset b/data/assets/scene/solarsystem/telescopes/jwst/targets/hudf.asset
index 3c1a19312f..f3e60a457c 100644
--- a/data/assets/scene/solarsystem/telescopes/jwst/targets/hudf.asset
+++ b/data/assets/scene/solarsystem/telescopes/jwst/targets/hudf.asset
@@ -96,7 +96,6 @@ asset.export(HUDFPosition)
 
 asset.meta = {
   Name = "Hubble Ultra Deep Field Image and Line",
-  Version = "1.0",
   Description = [[
     Screenspace image of the Hubble Ultra Deep Field and a line from the
     James Webb Space Telescope to the Hubble Ultra Deep Field position.
diff --git a/data/assets/scene/solarsystem/telescopes/jwst/targets/hudf_image.asset b/data/assets/scene/solarsystem/telescopes/jwst/targets/hudf_image.asset
index a3c4f9c2f1..5d81a6df9f 100644
--- a/data/assets/scene/solarsystem/telescopes/jwst/targets/hudf_image.asset
+++ b/data/assets/scene/solarsystem/telescopes/jwst/targets/hudf_image.asset
@@ -12,7 +12,6 @@ asset.export("image", image)
 
 asset.meta = {
   Name = "Hubble Ultra Deep Field",
-  Version = "1.0",
   Description = "Hubble Ultra Deep Field Image",
   Author = "NASA, ESA, and S. Beckwith (STScI) and the HUDF Team",
   URL = "https://esahubble.org/images/heic0611b/",
diff --git a/data/assets/scene/solarsystem/telescopes/jwst/targets/m51.asset b/data/assets/scene/solarsystem/telescopes/jwst/targets/m51.asset
index cf16be6271..8154c52db2 100644
--- a/data/assets/scene/solarsystem/telescopes/jwst/targets/m51.asset
+++ b/data/assets/scene/solarsystem/telescopes/jwst/targets/m51.asset
@@ -34,7 +34,6 @@ asset.export(M51Image)
 
 asset.meta = {
   Name = "M51 Galaxy Image",
-  Version = "1.0",
   Description = "Screenspace image of the M51 Galaxy",
   Author = "OpenSpace Team",
   URL = "http://openspaceproject.com",
diff --git a/data/assets/scene/solarsystem/telescopes/jwst/targets/m51_image.asset b/data/assets/scene/solarsystem/telescopes/jwst/targets/m51_image.asset
index e0b91f84f9..73dac4006c 100644
--- a/data/assets/scene/solarsystem/telescopes/jwst/targets/m51_image.asset
+++ b/data/assets/scene/solarsystem/telescopes/jwst/targets/m51_image.asset
@@ -12,7 +12,6 @@ asset.export("image", image)
 
 asset.meta = {
   Name = "M51 Galaxy",
-  Version = "1.0",
   Description = "M51 Galaxy Image",
   Author = [[
     NASA, ESA, S. Beckwith (STScI), and The Hubble Heritage Team (STScI/AURA)
diff --git a/data/assets/scene/solarsystem/telescopes/jwst/targets/m82.asset b/data/assets/scene/solarsystem/telescopes/jwst/targets/m82.asset
index 13a5362763..fda28b52b0 100644
--- a/data/assets/scene/solarsystem/telescopes/jwst/targets/m82.asset
+++ b/data/assets/scene/solarsystem/telescopes/jwst/targets/m82.asset
@@ -33,7 +33,6 @@ asset.export(M82Image)
 
 asset.meta = {
   Name = "M82 Galaxy Image",
-  Version = "1.0",
   Description = "Screenspace image of the M82 Galaxy",
   Author = "OpenSpace Team",
   URL = "http://openspaceproject.com",
diff --git a/data/assets/scene/solarsystem/telescopes/jwst/targets/m82_image.asset b/data/assets/scene/solarsystem/telescopes/jwst/targets/m82_image.asset
index 306d7cbae2..d342cec01f 100644
--- a/data/assets/scene/solarsystem/telescopes/jwst/targets/m82_image.asset
+++ b/data/assets/scene/solarsystem/telescopes/jwst/targets/m82_image.asset
@@ -12,7 +12,6 @@ asset.export("image", image)
 
 asset.meta = {
   Name = "M82 Galaxy",
-  Version = "1.0",
   Description = "M82 Galaxy Image",
   Author = [[
     NASA, ESA and the Hubble Heritage Team (STScI/AURA). Acknowledgment:
diff --git a/data/assets/scene/solarsystem/telescopes/jwst/targets/orion.asset b/data/assets/scene/solarsystem/telescopes/jwst/targets/orion.asset
index 7b99cfe617..3c5eab468e 100644
--- a/data/assets/scene/solarsystem/telescopes/jwst/targets/orion.asset
+++ b/data/assets/scene/solarsystem/telescopes/jwst/targets/orion.asset
@@ -33,7 +33,6 @@ asset.export(OrionImage)
 
 asset.meta = {
   Name = "Orion Nebula Image",
-  Version = "1.0",
   Description = "Screenspace image of the Orion Nebula",
   Author = "OpenSpace Team",
   URL = "http://openspaceproject.com",
diff --git a/data/assets/scene/solarsystem/telescopes/jwst/targets/orion_image.asset b/data/assets/scene/solarsystem/telescopes/jwst/targets/orion_image.asset
index 0aa94d7e76..79ee6c2f8e 100644
--- a/data/assets/scene/solarsystem/telescopes/jwst/targets/orion_image.asset
+++ b/data/assets/scene/solarsystem/telescopes/jwst/targets/orion_image.asset
@@ -12,7 +12,6 @@ asset.export("image", image)
 
 asset.meta = {
   Name = "Orion Nebula",
-  Version = "1.0",
   Description = "Orion Nebula Image",
   Author = "Bill Schoening/NOIRLab/NSF/AURA",
   URL = "https://noirlab.edu/public/images/noao-02677/",
diff --git a/data/assets/scene/solarsystem/telescopes/jwst/targets/ring.asset b/data/assets/scene/solarsystem/telescopes/jwst/targets/ring.asset
index 73049b9427..ee7cd5837f 100644
--- a/data/assets/scene/solarsystem/telescopes/jwst/targets/ring.asset
+++ b/data/assets/scene/solarsystem/telescopes/jwst/targets/ring.asset
@@ -34,7 +34,6 @@ asset.export(RingImage)
 
 asset.meta = {
   Name = "Ring Nebula Image",
-  Version = "1.0",
   Description = "Screenspace image of the Ring Nebula",
   Author = "OpenSpace Team",
   URL = "http://openspaceproject.com",
diff --git a/data/assets/scene/solarsystem/telescopes/jwst/targets/ring_image.asset b/data/assets/scene/solarsystem/telescopes/jwst/targets/ring_image.asset
index 9efc570156..4aece4b47f 100644
--- a/data/assets/scene/solarsystem/telescopes/jwst/targets/ring_image.asset
+++ b/data/assets/scene/solarsystem/telescopes/jwst/targets/ring_image.asset
@@ -12,7 +12,6 @@ asset.export("image", image)
 
 asset.meta = {
   Name = "Ring Nebula",
-  Version = "1.0",
   Description = "Ring Nebula Image",
   Author = [[
     NASA, ESA, C.R. O'Dell (Vanderbilt University), and
diff --git a/data/assets/scene/solarsystem/telescopes/jwst/targets/sn1987a.asset b/data/assets/scene/solarsystem/telescopes/jwst/targets/sn1987a.asset
index cb7381c607..8228907228 100644
--- a/data/assets/scene/solarsystem/telescopes/jwst/targets/sn1987a.asset
+++ b/data/assets/scene/solarsystem/telescopes/jwst/targets/sn1987a.asset
@@ -34,7 +34,6 @@ asset.export(SN1987aImage)
 
 asset.meta = {
   Name = "Supernova SN 1987a Image",
-  Version = "1.0",
   Description = "Screenspace image of the Supernova SN 1987a",
   Author = "OpenSpace Team",
   URL = "http://openspaceproject.com",
diff --git a/data/assets/scene/solarsystem/telescopes/jwst/targets/sn1987a_image.asset b/data/assets/scene/solarsystem/telescopes/jwst/targets/sn1987a_image.asset
index 49fa958ce1..2dc660828a 100644
--- a/data/assets/scene/solarsystem/telescopes/jwst/targets/sn1987a_image.asset
+++ b/data/assets/scene/solarsystem/telescopes/jwst/targets/sn1987a_image.asset
@@ -12,7 +12,6 @@ asset.export("image", image)
 
 asset.meta = {
   Name = "Supernova SN 1987a",
-  Version = "1.0",
   Description = "Supernova SN 1987a Image",
   Author = [[
     X-ray: NASA/CXC/PSU/S.Park & D.Burrows.
diff --git a/data/assets/scene/solarsystem/telescopes/jwst/targets/trifid.asset b/data/assets/scene/solarsystem/telescopes/jwst/targets/trifid.asset
index 397e50fa07..8bf2080be9 100644
--- a/data/assets/scene/solarsystem/telescopes/jwst/targets/trifid.asset
+++ b/data/assets/scene/solarsystem/telescopes/jwst/targets/trifid.asset
@@ -33,7 +33,6 @@ asset.export(TrifidImage)
 
 asset.meta = {
   Name = "Trifid Nebula Image",
-  Version = "1.0",
   Description = "Screenspace image of the Trifid Nebula",
   Author = "OpenSpace Team",
   URL = "http://openspaceproject.com",
diff --git a/data/assets/scene/solarsystem/telescopes/jwst/targets/trifid_image.asset b/data/assets/scene/solarsystem/telescopes/jwst/targets/trifid_image.asset
index 2150250c01..f3f9e5462e 100644
--- a/data/assets/scene/solarsystem/telescopes/jwst/targets/trifid_image.asset
+++ b/data/assets/scene/solarsystem/telescopes/jwst/targets/trifid_image.asset
@@ -12,7 +12,6 @@ asset.export("image", image)
 
 asset.meta = {
   Name = "Trifid Nebula",
-  Version = "1.0",
   Description = "Trifid Nebula Image",
   Author = "ESO/Gábor Tóth",
   URL = "https://www.eso.org/public/images/eso1504g/",
diff --git a/data/assets/scene/solarsystem/telescopes/jwst/timelapse.asset b/data/assets/scene/solarsystem/telescopes/jwst/timelapse.asset
index 9a47d0f50f..1aa47abf68 100644
--- a/data/assets/scene/solarsystem/telescopes/jwst/timelapse.asset
+++ b/data/assets/scene/solarsystem/telescopes/jwst/timelapse.asset
@@ -646,7 +646,6 @@ end)
 
 asset.meta = {
   Name = "James Webb Space Telescope Timelapse",
-  Version = "1.1",
   Description = [[
     Scripts that are scheduled to alter the speed of the simulation time so the deployment
     of the James Webb Space Telescope looks smoother.
diff --git a/data/assets/scene/solarsystem/telescopes/jwst/trail.asset b/data/assets/scene/solarsystem/telescopes/jwst/trail.asset
index 823714fe8d..478477024d 100644
--- a/data/assets/scene/solarsystem/telescopes/jwst/trail.asset
+++ b/data/assets/scene/solarsystem/telescopes/jwst/trail.asset
@@ -193,7 +193,6 @@ asset.export(JWSTSunTrail)
 
 asset.meta = {
   Name = "James Webb Space Telescope Trails",
-  Version = "1.0",
   Description = [[
     Trail of James Webb Space Telescope in respect to Earth, L2 and the Sun
   ]],
diff --git a/data/assets/scene/solarsystem/telescopes/jwst/transforms.asset b/data/assets/scene/solarsystem/telescopes/jwst/transforms.asset
index 88a48e7a72..9baa639981 100644
--- a/data/assets/scene/solarsystem/telescopes/jwst/transforms.asset
+++ b/data/assets/scene/solarsystem/telescopes/jwst/transforms.asset
@@ -112,7 +112,6 @@ asset.export(JWSTRotation)
 
 asset.meta = {
   Name = "James Webb Space Telescope Transforms",
-  Version = "1.0",
   Description = [[
     JWST transforms: JWST position relative to Earth and JWST rotation,
     a fixed rotation so sunshield always points toward the Sun.
diff --git a/data/assets/spice/core.asset b/data/assets/spice/core.asset
index ae6781f675..e40cd083ac 100644
--- a/data/assets/spice/core.asset
+++ b/data/assets/spice/core.asset
@@ -182,7 +182,6 @@ asset.export("Frame", Frame)
 
 asset.meta = {
   Name = "SPICE Base",
-  Version = "1.1",
   Description = [[This asset contains the spice base kernels necessary for any space
     application. Includes positions for Solar System bodies from 1850 to 2150]],
   Author = "OpenSpace Team",
diff --git a/data/assets/util/default_colormaps.asset b/data/assets/util/default_colormaps.asset
index 175e65846f..50057832c8 100644
--- a/data/assets/util/default_colormaps.asset
+++ b/data/assets/util/default_colormaps.asset
@@ -189,7 +189,6 @@ asset.export("Misc", Misc)
 
 asset.meta = {
   Name = "Default Color Maps",
-  Version = "1.0",
   Description = [[Load a set of default color maps that can be used in other assets. The
     color maps are created and categorized based on the ones in Matplotlib.
     https://matplotlib.org/stable/users/explain/colors/colormaps.html]],
diff --git a/data/assets/util/dpiscaling.asset b/data/assets/util/dpiscaling.asset
index 647f22b7ad..ee64420fed 100644
--- a/data/assets/util/dpiscaling.asset
+++ b/data/assets/util/dpiscaling.asset
@@ -29,7 +29,6 @@ end)
 
 asset.meta = {
   Name = "DPI Scaling",
-  Version = "1.0",
   Description = [[Retrieves the DPI scaling from the operating system and applies it to a
     few selected places to make them scale better on "large resolution but small size"
     monitors]],
diff --git a/data/assets/util/joysticks/any-joystick.asset b/data/assets/util/joysticks/any-joystick.asset
index db699dd070..b25838aeeb 100644
--- a/data/assets/util/joysticks/any-joystick.asset
+++ b/data/assets/util/joysticks/any-joystick.asset
@@ -79,7 +79,6 @@ end)
 
 asset.meta = {
   Name = "Joystick controller: Any",
-  Version = "1.0",
   Description = [[
     Checks the name on the connected controllers and adds the cooresponding joystick asset
   ]],
diff --git a/data/assets/util/joysticks/microsoft-xbox-360-pad.asset b/data/assets/util/joysticks/microsoft-xbox-360-pad.asset
index c548de7c7f..07d2af220d 100644
--- a/data/assets/util/joysticks/microsoft-xbox-360-pad.asset
+++ b/data/assets/util/joysticks/microsoft-xbox-360-pad.asset
@@ -209,7 +209,6 @@ end)
 
 asset.meta = {
   Name = "Joystick controller: Microsoft X-Box 360 pad",
-  Version = "1.0",
   Description = "Joystick controller configuration for Microsoft X-Box 360 pad",
   Author = [[
     OpenSpace Team & Winston
diff --git a/data/assets/util/joysticks/ps4.asset b/data/assets/util/joysticks/ps4.asset
index 17efac0dfd..599e0de9da 100644
--- a/data/assets/util/joysticks/ps4.asset
+++ b/data/assets/util/joysticks/ps4.asset
@@ -231,7 +231,6 @@ end)
 
 asset.meta = {
   Name = "Joystick controller: PS4",
-  Version = "1.0",
   Description = "Joystick controller configuration for PS4",
   Author = "OpenSpace Team",
   URL = "http://openspaceproject.com",
diff --git a/data/assets/util/joysticks/ps5.asset b/data/assets/util/joysticks/ps5.asset
index 2320c53bd3..e4398c7767 100644
--- a/data/assets/util/joysticks/ps5.asset
+++ b/data/assets/util/joysticks/ps5.asset
@@ -244,7 +244,6 @@ end)
 
 asset.meta = {
   Name = "Joystick controller: PS5",
-  Version = "1.0",
   Description = "Joystick controller configuration for PS5",
   Author = "OpenSpace Team",
   URL = "http://openspaceproject.com",
diff --git a/data/assets/util/joysticks/space-mouse-compact-wireless.asset b/data/assets/util/joysticks/space-mouse-compact-wireless.asset
index 3e21752519..b17426cec4 100644
--- a/data/assets/util/joysticks/space-mouse-compact-wireless.asset
+++ b/data/assets/util/joysticks/space-mouse-compact-wireless.asset
@@ -72,7 +72,6 @@ end)
 
 asset.meta = {
   Name = "Joystick controller: SpaceMouse compact wireless",
-  Version = "1.0",
   Description = "Joystick controller configuration for SpaceMouse compact wireless",
   Author = "OpenSpace Team",
   URL = "http://openspaceproject.com",
diff --git a/data/assets/util/joysticks/space-mouse-compact.asset b/data/assets/util/joysticks/space-mouse-compact.asset
index 14246bf476..4a79cf9881 100644
--- a/data/assets/util/joysticks/space-mouse-compact.asset
+++ b/data/assets/util/joysticks/space-mouse-compact.asset
@@ -72,7 +72,6 @@ end)
 
 asset.meta = {
   Name = "Joystick controller: SpaceMouse compact (wired)",
-  Version = "1.0",
   Description = "Joystick controller configuration for SpaceMouse compact (wired)",
   Author = "OpenSpace Team",
   URL = "http://openspaceproject.com",
diff --git a/data/assets/util/joysticks/space-mouse-enterprise-wireless.asset b/data/assets/util/joysticks/space-mouse-enterprise-wireless.asset
index 4e5695a797..4687d42fa0 100644
--- a/data/assets/util/joysticks/space-mouse-enterprise-wireless.asset
+++ b/data/assets/util/joysticks/space-mouse-enterprise-wireless.asset
@@ -66,7 +66,6 @@ end)
 
 asset.meta = {
   Name = "Joystick controller: SpaceMouse enterprise wireless",
-  Version = "1.0",
   Description = "Joystick controller configuration for SpaceMouse enterprise wireless",
   Author = "OpenSpace Team",
   URL = "http://openspaceproject.com",
diff --git a/data/assets/util/joysticks/space-mouse-enterprise.asset b/data/assets/util/joysticks/space-mouse-enterprise.asset
index d458f23417..74731d2e33 100644
--- a/data/assets/util/joysticks/space-mouse-enterprise.asset
+++ b/data/assets/util/joysticks/space-mouse-enterprise.asset
@@ -66,7 +66,6 @@ end)
 
 asset.meta = {
   Name = "Joystick controller: SpaceMouse enterprise (wired)",
-  Version = "1.0",
   Description = "Joystick controller configuration for SpaceMouse enterprise (wired)",
   Author = "OpenSpace Team",
   URL = "http://openspaceproject.com",
diff --git a/data/assets/util/joysticks/xbox-wireless.asset b/data/assets/util/joysticks/xbox-wireless.asset
index 754464d484..f5c8cafc78 100644
--- a/data/assets/util/joysticks/xbox-wireless.asset
+++ b/data/assets/util/joysticks/xbox-wireless.asset
@@ -209,7 +209,6 @@ end)
 
 asset.meta = {
   Name = "Joystick controller: Xbox wireless",
-  Version = "1.0",
   Description = "Joystick controller configuration for Xbox wireless",
   Author = "OpenSpace Team",
   URL = "http://openspaceproject.com",
diff --git a/data/assets/util/joysticks/xbox.asset b/data/assets/util/joysticks/xbox.asset
index 5041a6a321..40efb93d89 100644
--- a/data/assets/util/joysticks/xbox.asset
+++ b/data/assets/util/joysticks/xbox.asset
@@ -209,9 +209,8 @@ end)
 
 asset.meta = {
   Name = "Joystick controller: Xbox (wired)",
-  Version = "1.0",
   Description = "Joystick controller configuration for Xbox (wired)",
   Author = "OpenSpace Team",
   URL = "http://openspaceproject.com",
   License = "MIT license"
-}
\ No newline at end of file
+}
diff --git a/data/assets/util/webgui.asset b/data/assets/util/webgui.asset
index 879f3613ff..3ee09e3a7c 100644
--- a/data/assets/util/webgui.asset
+++ b/data/assets/util/webgui.asset
@@ -94,7 +94,6 @@ asset.export("setCefRoute", setCefRoute)
 
 asset.meta = {
   Name = "WebGUI",
-  Version = "1.0",
   Author = "OpenSpace Team",
   URL = "http://openspaceproject.com",
   License = "MIT license"

From df6740c5e2460ddaeab1507b13d139da2c4274a5 Mon Sep 17 00:00:00 2001
From: Alexander Bock <alexander.bock@liu.se>
Date: Thu, 20 Jun 2024 11:45:05 +0200
Subject: [PATCH 508/701] Use the correct way to scale the eiffel tower
 educational asset

---
 data/assets/educational/scale/eiffeltower.asset | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/data/assets/educational/scale/eiffeltower.asset b/data/assets/educational/scale/eiffeltower.asset
index d139084983..1bcef38700 100644
--- a/data/assets/educational/scale/eiffeltower.asset
+++ b/data/assets/educational/scale/eiffeltower.asset
@@ -31,10 +31,6 @@ local ScaleModel = {
       Globe = earthAsset.Earth.Identifier,
       Latitude = Location[1],
       Longitude = Location[2]
-    },
-    Scale = {
-      Type = "StaticScale",
-      Scale = 4.38
     }
   },
   Renderable = {
@@ -42,7 +38,7 @@ local ScaleModel = {
     GeometryFile = modelFolder .. "eiffeltower.osmodel",
     RotationVector = { 0.0, 45.0, 0.0 },
     LightSources = { sunAsset.LightSource },
-    ModelScale = "Centimeter"
+    ModelScale = 0.0438
   },
   GUI = {
     Name = "Eiffel Tower",

From 27a2d56221e102f71719071ddb6f9658e6fb3324 Mon Sep 17 00:00:00 2001
From: Alexander Bock <alexander.bock@liu.se>
Date: Thu, 20 Jun 2024 11:45:22 +0200
Subject: [PATCH 509/701] Mutex-protect the sync file generation to prevent a
 multi-threaded SPICE access crash on startup

---
 modules/sync/syncs/urlsynchronization.cpp | 3 +++
 modules/sync/syncs/urlsynchronization.h   | 2 +-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/modules/sync/syncs/urlsynchronization.cpp b/modules/sync/syncs/urlsynchronization.cpp
index 7f2ad2ee96..071f54ba8c 100644
--- a/modules/sync/syncs/urlsynchronization.cpp
+++ b/modules/sync/syncs/urlsynchronization.cpp
@@ -264,6 +264,9 @@ bool UrlSynchronization::isEachFileValid() {
 }
 
 void UrlSynchronization::createSyncFile(bool) const {
+    // We need to mutex-protect the access to the time conversion for now
+    std::lock_guard guard(_mutex);
+
     std::filesystem::path dir = directory();
     std::filesystem::create_directories(dir);
 
diff --git a/modules/sync/syncs/urlsynchronization.h b/modules/sync/syncs/urlsynchronization.h
index b569de3595..97169ce8c9 100644
--- a/modules/sync/syncs/urlsynchronization.h
+++ b/modules/sync/syncs/urlsynchronization.h
@@ -123,7 +123,7 @@ private:
     /// Determines how long the file is valid before it should be downloaded again
     double _secondsUntilResync = MaxDateAsJ2000;
 
-    std::mutex _mutex;
+    mutable std::mutex _mutex;
 };
 
 } // namespace openspace

From 807699a8902fcb9368a495650b99d537fea8dd0e Mon Sep 17 00:00:00 2001
From: Alexander Bock <alexander.bock@liu.se>
Date: Thu, 20 Jun 2024 11:49:46 +0200
Subject: [PATCH 510/701] Remove the large data files from the
 URLSynchronization example to make the file loadable

---
 data/assets/examples/urlsynchronization.asset | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/data/assets/examples/urlsynchronization.asset b/data/assets/examples/urlsynchronization.asset
index b432dfed2a..cddb53ee19 100644
--- a/data/assets/examples/urlsynchronization.asset
+++ b/data/assets/examples/urlsynchronization.asset
@@ -20,18 +20,12 @@ asset.resource({
   Type = "UrlSynchronization",
   Identifier = "example_large",
   Url = {
-    "http://speedtest.tele2.net/1000GB.zip",
-    "https://speedtest.tele2.net/100GB.zip",
-    "https://speedtest.tele2.net/50GB.zip",
-    "http://speedtest.tele2.net/10GB.zip",
     "http://speedtest.tele2.net/1GB.zip",
     "http://speedtest.tele2.net/100MB.zip",
 
-    "https://proof.ovh.net/files/10Gb.dat",
     "https://proof.ovh.net/files/1Gb.dat",
     "https://proof.ovh.net/files/100Mb.dat",
 
-    "https://speed.hetzner.de/10GB.bin",
     "https://speed.hetzner.de/1GB.bin",
     "https://speed.hetzner.de/100MB.bin",
 

From c53a747ed5ca021f71c5731128cb8b92b0b3e1e3 Mon Sep 17 00:00:00 2001
From: Emma Broman <emma.broman@liu.se>
Date: Thu, 20 Jun 2024 16:11:43 +0200
Subject: [PATCH 511/701] Fix a faulty example GIU path

---
 .../advanced/pointcloud_multitextured.asset                     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/data/assets/examples/renderable/renderablepointcloud/advanced/pointcloud_multitextured.asset b/data/assets/examples/renderable/renderablepointcloud/advanced/pointcloud_multitextured.asset
index 828ffb6770..296a1d366c 100644
--- a/data/assets/examples/renderable/renderablepointcloud/advanced/pointcloud_multitextured.asset
+++ b/data/assets/examples/renderable/renderablepointcloud/advanced/pointcloud_multitextured.asset
@@ -28,7 +28,7 @@ local Node = {
   },
   GUI = {
     Name = "RenderablePointCloud - Multi-Textured",
-    Path = "/Examples/Advanced"
+    Path = "/Examples/RenderablePointCloud/Advanced"
   }
 }
 

From 15c697218c6ea6e6143046784c6128b09d6bde2a Mon Sep 17 00:00:00 2001
From: Alexander Bock <mail@alexanderbock.eu>
Date: Fri, 21 Jun 2024 10:44:41 +0200
Subject: [PATCH 512/701] Prevent crash when starting without any enabled audio
 devices (closes #3329)

---
 modules/audio/audiomodule.cpp | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/modules/audio/audiomodule.cpp b/modules/audio/audiomodule.cpp
index 13a3ec3fea..6a5cb8e7d5 100644
--- a/modules/audio/audiomodule.cpp
+++ b/modules/audio/audiomodule.cpp
@@ -70,8 +70,14 @@ void AudioModule::internalInitialize(const ghoul::Dictionary& dictionary) {
         }
     });
 
-    LDEBUG(std::format("Audio backend: {}", _engine->getBackendString()));
-    LDEBUG(std::format("Number of channels: {}", _engine->getBackendChannels()));
+    const char* backend = _engine->getBackendString();
+    if (backend) {
+        LDEBUG(std::format("Audio backend: {}", backend));
+        LDEBUG(std::format("Number of channels: {}", _engine->getBackendChannels()));
+    }
+    else {
+        LINFO(std::format("Audio subsystem disabled as no backend was detected"));
+    }
 }
 
 void AudioModule::internalDeinitializeGL() {

From 22914a20c7bd53e9975e00482eacfa9acacb4518 Mon Sep 17 00:00:00 2001
From: Alexander Bock <mail@alexanderbock.eu>
Date: Fri, 21 Jun 2024 11:07:29 +0200
Subject: [PATCH 513/701] Update Ghoul to get more information on when WMI
 queries fail (#3330)

---
 ext/ghoul | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ext/ghoul b/ext/ghoul
index 8c041d702c..07e37f0029 160000
--- a/ext/ghoul
+++ b/ext/ghoul
@@ -1 +1 @@
-Subproject commit 8c041d702c2992d0a3e248baa2aed42292d8426e
+Subproject commit 07e37f0029bf68f4178fe091445eff7339c9ff17

From 02cc28f1927614961994dc403aad1eb9203d68f3 Mon Sep 17 00:00:00 2001
From: Alexander Bock <mail@alexanderbock.eu>
Date: Sat, 22 Jun 2024 09:13:13 +0200
Subject: [PATCH 514/701] Generate the framebuffer for screenspace rendering
 without mipmapping as it handles transparency poorly

---
 modules/base/rendering/screenspacedashboard.cpp   | 6 +-----
 modules/base/rendering/screenspaceframebuffer.cpp | 2 +-
 src/rendering/renderengine.cpp                    | 3 ++-
 3 files changed, 4 insertions(+), 7 deletions(-)

diff --git a/modules/base/rendering/screenspacedashboard.cpp b/modules/base/rendering/screenspacedashboard.cpp
index 3e613cbd82..590e85b7b4 100644
--- a/modules/base/rendering/screenspacedashboard.cpp
+++ b/modules/base/rendering/screenspacedashboard.cpp
@@ -101,15 +101,11 @@ bool ScreenSpaceDashboard::initializeGL() {
 }
 
 bool ScreenSpaceDashboard::deinitializeGL() {
-    //_fontRenderer = nullptr;
     return ScreenSpaceFramebuffer::deinitializeGL();
 }
 
 bool ScreenSpaceDashboard::isReady() const {
-    return /*(_fontRenderer != nullptr) &&
-           (_fontDate != nullptr) &&
-           (_fontInfo != nullptr) &&*/
-           ScreenSpaceFramebuffer::isReady();
+    return ScreenSpaceFramebuffer::isReady();
 }
 
 void ScreenSpaceDashboard::update() {
diff --git a/modules/base/rendering/screenspaceframebuffer.cpp b/modules/base/rendering/screenspaceframebuffer.cpp
index cd92855cc7..02071eb730 100644
--- a/modules/base/rendering/screenspaceframebuffer.cpp
+++ b/modules/base/rendering/screenspaceframebuffer.cpp
@@ -183,7 +183,7 @@ void ScreenSpaceFramebuffer::createFramebuffer() {
     _objectSize = glm::ivec2(resolution);
 
     _texture->uploadTexture();
-    _texture->setFilter(ghoul::opengl::Texture::FilterMode::LinearMipMap);
+    _texture->setFilter(ghoul::opengl::Texture::FilterMode::Linear);
     _texture->purgeFromRAM();
     _framebuffer->attachTexture(_texture.get(), GL_COLOR_ATTACHMENT0);
     ghoul::opengl::FramebufferObject::deactivate();
diff --git a/src/rendering/renderengine.cpp b/src/rendering/renderengine.cpp
index 0a076d0635..7878152704 100644
--- a/src/rendering/renderengine.cpp
+++ b/src/rendering/renderengine.cpp
@@ -734,7 +734,8 @@ void RenderEngine::render(const glm::mat4& sceneMatrix, const glm::mat4& viewMat
     }
 
     if (renderingEnabled && !delegate.isGuiWindow()) {
-        ZoneScopedN("Render Screenspace Renderable");
+        ZoneScopedN("Render ScreenSpace Renderable");
+        const ghoul::GLDebugGroup group("ScreenSpace Renderable");
 
         std::vector<ScreenSpaceRenderable*> ssrs;
         ssrs.reserve(global::screenSpaceRenderables->size());

From 95c841786aeb54ddf3077db9bf59870cd9d1d779 Mon Sep 17 00:00:00 2001
From: Alexander Bock <mail@alexanderbock.eu>
Date: Sat, 22 Jun 2024 09:16:42 +0200
Subject: [PATCH 515/701] Fix spelling mistake in Haumea model

---
 data/assets/scene/solarsystem/dwarf_planets/haumea/planet.asset | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/data/assets/scene/solarsystem/dwarf_planets/haumea/planet.asset b/data/assets/scene/solarsystem/dwarf_planets/haumea/planet.asset
index 487efce45a..338afdf186 100644
--- a/data/assets/scene/solarsystem/dwarf_planets/haumea/planet.asset
+++ b/data/assets/scene/solarsystem/dwarf_planets/haumea/planet.asset
@@ -12,7 +12,7 @@ local modelFolder = asset.resource({
 
 
 local Planet = {
-  Identifier = "HamueaModel",
+  Identifier = "HaumeaModel",
   Parent = transforms.Position.Identifier,
   Transform = {
     Rotation = {

From f04c088a4b6f81570f28b167794c4f2cfcbd6890 Mon Sep 17 00:00:00 2001
From: Alexander Bock <mail@alexanderbock.eu>
Date: Sat, 22 Jun 2024 13:05:33 +0200
Subject: [PATCH 516/701] Add the ability to specify dashboarditems for
 ScreenSpaceDashboard at construction time. Improve error messages and export
 DashboardItem documentation

---
 .../base/rendering/screenspacedashboard.cpp    | 18 ++++++++++++++++++
 src/documentation/core_registration.cpp        |  3 +++
 src/scripting/scriptengine.cpp                 |  9 +++++++++
 3 files changed, 30 insertions(+)

diff --git a/modules/base/rendering/screenspacedashboard.cpp b/modules/base/rendering/screenspacedashboard.cpp
index 590e85b7b4..1e32157e71 100644
--- a/modules/base/rendering/screenspacedashboard.cpp
+++ b/modules/base/rendering/screenspacedashboard.cpp
@@ -48,6 +48,12 @@ namespace {
     struct [[codegen::Dictionary(ScreenSpaceDashboard)]] Parameters {
         // [[codegen::verbatim(UseMainInfo.description)]]
         std::optional<bool> useMainDashboard;
+
+        // A list of DashboardItems that are added automatically upon construction of the
+        // ScreenSpaceDashboard. This value must not be specified if `UseMainDashboard` is
+        // specified.
+        std::optional<std::vector<ghoul::Dictionary>>
+            items [[codegen::reference("dashboarditem")]];
     };
 #include "screenspacedashboard_codegen.cpp"
 } // namespace
@@ -81,6 +87,18 @@ ScreenSpaceDashboard::ScreenSpaceDashboard(const ghoul::Dictionary& dictionary)
 
     _scale = 1.f;
     _scale.setMaxValue(15.f);
+
+    if (_useMainDashboard && p.items.has_value()) {
+        throw ghoul::RuntimeError("Cannot specify items when using the main dashboard");
+    }
+
+    if (p.items.has_value()) {
+        ghoul_assert(_useMainDashboard, "Cannot add items to the main dashboard");
+        for (const ghoul::Dictionary& item : *p.items) {
+            std::unique_ptr<DashboardItem> i = DashboardItem::createFromDictionary(item);
+            _dashboard.addDashboardItem(std::move(i));
+        }
+    }
 }
 
 bool ScreenSpaceDashboard::initializeGL() {
diff --git a/src/documentation/core_registration.cpp b/src/documentation/core_registration.cpp
index c06b267191..3c0138453c 100644
--- a/src/documentation/core_registration.cpp
+++ b/src/documentation/core_registration.cpp
@@ -41,6 +41,7 @@
 #include <openspace/network/parallelpeer.h>
 #include <openspace/rendering/colormappingcomponent.h>
 #include <openspace/rendering/dashboard.h>
+#include <openspace/rendering/dashboarditem.h>
 #include <openspace/rendering/labelscomponent.h>
 #include <openspace/rendering/renderable.h>
 #include <openspace/rendering/renderengine.h>
@@ -66,6 +67,8 @@ namespace openspace {
 void registerCoreClasses(documentation::DocumentationEngine& engine) {
     engine.addDocumentation(LogFactoryDocumentation());
 
+    engine.addDocumentation(DashboardItem::Documentation());
+
     engine.addDocumentation(ColorMappingComponent::Documentation());
     engine.addDocumentation(LabelsComponent::Documentation());
     engine.addDocumentation(LightSource::Documentation());
diff --git a/src/scripting/scriptengine.cpp b/src/scripting/scriptengine.cpp
index fa90a3eaa3..1c44e9e149 100644
--- a/src/scripting/scriptengine.cpp
+++ b/src/scripting/scriptengine.cpp
@@ -30,6 +30,7 @@
 #include <openspace/interaction/sessionrecording.h>
 #include <openspace/network/parallelpeer.h>
 #include <openspace/util/syncbuffer.h>
+#include <openspace/documentation/documentation.h>
 #include <ghoul/filesystem/file.h>
 #include <ghoul/filesystem/filesystem.h>
 #include <ghoul/logging/logmanager.h>
@@ -198,6 +199,14 @@ bool ScriptEngine::runScript(const std::string& script, const ScriptCallback& ca
         }
         return false;
     }
+    catch (const documentation::SpecificationError& e) {
+        LERRORC(e.component, e.message);
+        documentation::logError(e, e.component);
+        if (callback) {
+            callback(ghoul::Dictionary());
+        }
+        return false;
+    }
     catch (const ghoul::RuntimeError& e) {
         LERRORC(e.component, e.message);
         if (callback) {

From 24e83d154ee437e9ad6e3bd3092a6673f27a672b Mon Sep 17 00:00:00 2001
From: Alexander Bock <mail@alexanderbock.eu>
Date: Sat, 22 Jun 2024 13:41:27 +0200
Subject: [PATCH 517/701] Make the 'Layer's specification in RenderableGlobe
 optional.  Clean RenderableGlobe assets

---
 .../dwarf_planets/ceres/ceres.asset           |   4 +-
 .../dwarf_planets/gonggong/planet.asset       |   4 +-
 .../dwarf_planets/orcus/planet.asset          |   4 +-
 .../dwarf_planets/pluto/charon/charon.asset   |   2 -
 .../dwarf_planets/pluto/minor/hydra.asset     |   4 +-
 .../dwarf_planets/pluto/minor/kerberos.asset  |   4 +-
 .../dwarf_planets/pluto/minor/nix.asset       |   4 +-
 .../dwarf_planets/pluto/minor/styx.asset      |   4 +-
 .../dwarf_planets/pluto/pluto.asset           |   2 -
 .../dwarf_planets/quaoar/planet.asset         |   4 +-
 .../dwarf_planets/sedna/planet.asset          |   4 +-
 .../solarsystem/planets/earth/earth.asset     |   2 -
 .../solarsystem/planets/earth/moon/moon.asset |   2 -
 .../planets/jupiter/callisto/callisto.asset   |   2 -
 .../planets/jupiter/europa/europa.asset       |   2 -
 .../planets/jupiter/ganymede/ganymede.asset   |   2 -
 .../solarsystem/planets/jupiter/io/io.asset   |   2 -
 .../solarsystem/planets/jupiter/jupiter.asset |   2 -
 .../planets/jupiter/minor/ananke_group.asset  |  80 ++------
 .../planets/jupiter/minor/carme_group.asset   | 112 +++--------
 .../planets/jupiter/minor/carpo_group.asset   |   8 +-
 .../planets/jupiter/minor/himalia_group.asset |  36 +---
 .../planets/jupiter/minor/inner_group.asset   |  16 +-
 .../planets/jupiter/minor/other_groups.asset  |  12 +-
 .../jupiter/minor/pasiphae_group.asset        |  92 +++------
 .../jupiter/minor/themisto_group.asset        |   4 +-
 .../scene/solarsystem/planets/mars/mars.asset |   2 -
 .../planets/mars/moons/deimos_globe.asset     |   8 +-
 .../planets/mars/moons/phobos_globe.asset     |   8 +-
 .../solarsystem/planets/mercury/mercury.asset |   2 -
 .../planets/neptune/inner_moons.asset         |  28 +--
 .../planets/neptune/irregular_moons.asset     |  20 +-
 .../solarsystem/planets/neptune/neptune.asset |   4 +-
 .../planets/neptune/nereid/nereid.asset       |   4 +-
 .../planets/neptune/triton/triton.asset       |   4 +-
 .../planets/saturn/dione/dione.asset          |   2 -
 .../planets/saturn/enceladus/enceladus.asset  |   2 -
 .../planets/saturn/hyperion/hyperion.asset    |   2 -
 .../planets/saturn/iapetus/iapetus.asset      |   2 -
 .../planets/saturn/mimas/mimas.asset          |   2 -
 .../planets/saturn/minor/gallic_group.asset   |  16 +-
 .../planets/saturn/minor/inuit_group.asset    |  32 +--
 .../planets/saturn/minor/norse_group.asset    | 188 +++++-------------
 .../planets/saturn/minor/other_group.asset    |  36 +---
 .../planets/saturn/minor/shepherd_group.asset |  28 +--
 .../planets/saturn/rhea/rhea.asset            |   2 -
 .../solarsystem/planets/saturn/saturn.asset   |   2 -
 .../planets/saturn/tethys/tethys.asset        |   2 -
 .../planets/saturn/titan/titan.asset          |   2 -
 .../planets/uranus/inner_moons.asset          |  52 ++---
 .../uranus/irregular_prograde_moons.asset     |   4 +-
 .../uranus/irregular_retrograde_moons.asset   |  32 +--
 .../planets/uranus/major_moons.asset          |  20 +-
 .../solarsystem/planets/uranus/uranus.asset   |   4 +-
 .../solarsystem/planets/venus/venus.asset     |   2 -
 data/assets/scene/solarsystem/sun/sun.asset   |   2 -
 modules/exoplanets/exoplanetsmodule_lua.inl   |   2 -
 modules/globebrowsing/src/renderableglobe.cpp |  11 +-
 58 files changed, 231 insertions(+), 710 deletions(-)

diff --git a/data/assets/scene/solarsystem/dwarf_planets/ceres/ceres.asset b/data/assets/scene/solarsystem/dwarf_planets/ceres/ceres.asset
index 56e2eddd21..66a6ab71ae 100644
--- a/data/assets/scene/solarsystem/dwarf_planets/ceres/ceres.asset
+++ b/data/assets/scene/solarsystem/dwarf_planets/ceres/ceres.asset
@@ -7,9 +7,7 @@ local Ceres = {
   Parent = transforms.CeresPosition.Identifier,
   Renderable = {
     Type = "RenderableGlobe",
-    Radii = { 487300, 487300, 454700 },
-    SegmentsPerPatch = 64,
-    Layers = {}
+    Radii = { 487300, 487300, 454700 }
   },
   Tag = { "planet_solarSystem", "planet_terrestrial", "dwarf_planet" },
   GUI = {
diff --git a/data/assets/scene/solarsystem/dwarf_planets/gonggong/planet.asset b/data/assets/scene/solarsystem/dwarf_planets/gonggong/planet.asset
index fddd7eb7d3..b7fd1f842c 100644
--- a/data/assets/scene/solarsystem/dwarf_planets/gonggong/planet.asset
+++ b/data/assets/scene/solarsystem/dwarf_planets/gonggong/planet.asset
@@ -14,9 +14,7 @@ local Planet = {
   },
   Renderable = {
     Type = "RenderableGlobe",
-    Radii = { 615000, 615000, 615000 },
-    SegmentsPerPatch = 64,
-    Layers = {}
+    Radii = { 615000, 615000, 615000 }
   },
   GUI = {
     Name = "Gonggong",
diff --git a/data/assets/scene/solarsystem/dwarf_planets/orcus/planet.asset b/data/assets/scene/solarsystem/dwarf_planets/orcus/planet.asset
index 624938e3a6..5b88e83636 100644
--- a/data/assets/scene/solarsystem/dwarf_planets/orcus/planet.asset
+++ b/data/assets/scene/solarsystem/dwarf_planets/orcus/planet.asset
@@ -15,9 +15,7 @@ local Planet = {
   },
   Renderable = {
     Type = "RenderableGlobe",
-    Radii = { 910000, 910000, 917000 },
-    SegmentsPerPatch = 64,
-    Layers = {}
+    Radii = { 910000, 910000, 917000 }
   },
   GUI = {
     Name = "Orcus",
diff --git a/data/assets/scene/solarsystem/dwarf_planets/pluto/charon/charon.asset b/data/assets/scene/solarsystem/dwarf_planets/pluto/charon/charon.asset
index 5cc4dc8c91..6c7c0079c5 100644
--- a/data/assets/scene/solarsystem/dwarf_planets/pluto/charon/charon.asset
+++ b/data/assets/scene/solarsystem/dwarf_planets/pluto/charon/charon.asset
@@ -30,8 +30,6 @@ local Charon = {
   Renderable = {
     Type = "RenderableGlobe",
     Radii = { 6.035E5, 6.035E5, 6.035E5 },
-    SegmentsPerPatch = 64,
-    Layers = {},
     Labels = {
       Enabled = false,
       FileName = labelsPath .. "charon.labels",
diff --git a/data/assets/scene/solarsystem/dwarf_planets/pluto/minor/hydra.asset b/data/assets/scene/solarsystem/dwarf_planets/pluto/minor/hydra.asset
index 6bfc38caa5..afd8d52428 100644
--- a/data/assets/scene/solarsystem/dwarf_planets/pluto/minor/hydra.asset
+++ b/data/assets/scene/solarsystem/dwarf_planets/pluto/minor/hydra.asset
@@ -15,9 +15,7 @@ local Hydra = {
   },
   Renderable = {
     Type = "RenderableGlobe",
-    Radii = { 53000, 53000, 53000 },
-    SegmentsPerPatch = 64,
-    Layers = {}
+    Radii = { 53000, 53000, 53000 }
   },
   Tag = { "moon_solarSystem", "moon_dwarf", "moon_pluto", "moon_minor", "moon_minor_pluto" },
   GUI = {
diff --git a/data/assets/scene/solarsystem/dwarf_planets/pluto/minor/kerberos.asset b/data/assets/scene/solarsystem/dwarf_planets/pluto/minor/kerberos.asset
index a04b8536ff..cfea0f7392 100644
--- a/data/assets/scene/solarsystem/dwarf_planets/pluto/minor/kerberos.asset
+++ b/data/assets/scene/solarsystem/dwarf_planets/pluto/minor/kerberos.asset
@@ -15,9 +15,7 @@ local Kerberos = {
   },
   Renderable = {
     Type = "RenderableGlobe",
-    Radii = { 10000, 10000, 10000 },
-    SegmentsPerPatch = 64,
-    Layers = {}
+    Radii = { 10000, 10000, 10000 }
   },
   Tag = { "moon_solarSystem", "moon_dwarf", "moon_pluto", "moon_minor", "moon_minor_pluto" },
   GUI = {
diff --git a/data/assets/scene/solarsystem/dwarf_planets/pluto/minor/nix.asset b/data/assets/scene/solarsystem/dwarf_planets/pluto/minor/nix.asset
index 8795a8b1ef..4ca7c37417 100644
--- a/data/assets/scene/solarsystem/dwarf_planets/pluto/minor/nix.asset
+++ b/data/assets/scene/solarsystem/dwarf_planets/pluto/minor/nix.asset
@@ -15,9 +15,7 @@ local Nix = {
   },
   Renderable = {
     Type = "RenderableGlobe",
-    Radii = { 45000, 45000, 45000 },
-    SegmentsPerPatch = 64,
-    Layers = {}
+    Radii = { 45000, 45000, 45000 }
   },
   Tag = { "moon_solarSystem", "moon_dwarf", "moon_pluto", "moon_minor", "moon_minor_pluto" },
   GUI = {
diff --git a/data/assets/scene/solarsystem/dwarf_planets/pluto/minor/styx.asset b/data/assets/scene/solarsystem/dwarf_planets/pluto/minor/styx.asset
index 77cc5bfd9d..ecb06af177 100644
--- a/data/assets/scene/solarsystem/dwarf_planets/pluto/minor/styx.asset
+++ b/data/assets/scene/solarsystem/dwarf_planets/pluto/minor/styx.asset
@@ -15,9 +15,7 @@ local Styx = {
   },
   Renderable = {
     Type = "RenderableGlobe",
-    Radii = { 45000, 45000, 45000 },
-    SegmentsPerPatch = 64,
-    Layers = {}
+    Radii = { 45000, 45000, 45000 }
   },
   Tag = { "moon_solarSystem", "moon_dwarf", "moon_pluto", "moon_minor", "moon_minor_pluto" },
   GUI = {
diff --git a/data/assets/scene/solarsystem/dwarf_planets/pluto/pluto.asset b/data/assets/scene/solarsystem/dwarf_planets/pluto/pluto.asset
index 3a166f2cb8..33cb68425d 100644
--- a/data/assets/scene/solarsystem/dwarf_planets/pluto/pluto.asset
+++ b/data/assets/scene/solarsystem/dwarf_planets/pluto/pluto.asset
@@ -30,8 +30,6 @@ local Pluto = {
   Renderable = {
     Type = "RenderableGlobe",
     Radii = { 1173000, 1173000, 1173000 },
-    SegmentsPerPatch = 64,
-    Layers = {},
     Labels = {
       Enabled = false,
       FileName = labelsPath .. "pluto.labels",
diff --git a/data/assets/scene/solarsystem/dwarf_planets/quaoar/planet.asset b/data/assets/scene/solarsystem/dwarf_planets/quaoar/planet.asset
index 178da07485..a9628d9e3b 100644
--- a/data/assets/scene/solarsystem/dwarf_planets/quaoar/planet.asset
+++ b/data/assets/scene/solarsystem/dwarf_planets/quaoar/planet.asset
@@ -15,9 +15,7 @@ local Planet = {
   },
   Renderable = {
     Type = "RenderableGlobe",
-    Radii = { 1138000, 1138000, 1036000 },
-    SegmentsPerPatch = 64,
-    Layers = {}
+    Radii = { 1138000, 1138000, 1036000 }
   },
   GUI = {
     Name = "Quaoar",
diff --git a/data/assets/scene/solarsystem/dwarf_planets/sedna/planet.asset b/data/assets/scene/solarsystem/dwarf_planets/sedna/planet.asset
index ff09725018..e0f2c89cdb 100644
--- a/data/assets/scene/solarsystem/dwarf_planets/sedna/planet.asset
+++ b/data/assets/scene/solarsystem/dwarf_planets/sedna/planet.asset
@@ -14,9 +14,7 @@ local Planet = {
   },
   Renderable = {
     Type = "RenderableGlobe",
-    Radii = { 995000, 1060000, 1025000 },
-    SegmentsPerPatch = 64,
-    Layers = {}
+    Radii = { 995000, 1060000, 1025000 }
   },
   GUI = {
     Name = "Sedna",
diff --git a/data/assets/scene/solarsystem/planets/earth/earth.asset b/data/assets/scene/solarsystem/planets/earth/earth.asset
index 299a4c6c36..e8917f7928 100644
--- a/data/assets/scene/solarsystem/planets/earth/earth.asset
+++ b/data/assets/scene/solarsystem/planets/earth/earth.asset
@@ -19,9 +19,7 @@ local Earth = {
   Renderable = {
     Type = "RenderableGlobe",
     Radii = EarthEllipsoid,
-    SegmentsPerPatch = 64,
     PerformShading = false,
-    Layers = {},
     ShadowGroup = {
       Sources = {
         { Name = "Sun", Radius = 696300000 },
diff --git a/data/assets/scene/solarsystem/planets/earth/moon/moon.asset b/data/assets/scene/solarsystem/planets/earth/moon/moon.asset
index 21063ba6e1..ec6b2f0c33 100644
--- a/data/assets/scene/solarsystem/planets/earth/moon/moon.asset
+++ b/data/assets/scene/solarsystem/planets/earth/moon/moon.asset
@@ -31,8 +31,6 @@ local Moon = {
   Renderable = {
     Type = "RenderableGlobe",
     Radii = 1738140,
-    SegmentsPerPatch = 64,
-    Layers = {},
     ShadowGroup = {
       Sources = {
         { Name = sunAsset.Sun.Identifier, Radius = 696300000 },
diff --git a/data/assets/scene/solarsystem/planets/jupiter/callisto/callisto.asset b/data/assets/scene/solarsystem/planets/jupiter/callisto/callisto.asset
index e7334ab501..0fa2242dfe 100644
--- a/data/assets/scene/solarsystem/planets/jupiter/callisto/callisto.asset
+++ b/data/assets/scene/solarsystem/planets/jupiter/callisto/callisto.asset
@@ -31,8 +31,6 @@ local Callisto = {
   Renderable = {
     Type = "RenderableGlobe",
     Radii = 2410000,
-    SegmentsPerPatch = 64,
-    Layers = {},
     Labels = {
       Enabled = false,
       FileName = labelsPath .. "callisto.labels",
diff --git a/data/assets/scene/solarsystem/planets/jupiter/europa/europa.asset b/data/assets/scene/solarsystem/planets/jupiter/europa/europa.asset
index 2acb195582..18460b39e2 100644
--- a/data/assets/scene/solarsystem/planets/jupiter/europa/europa.asset
+++ b/data/assets/scene/solarsystem/planets/jupiter/europa/europa.asset
@@ -31,8 +31,6 @@ local Europa = {
   Renderable = {
     Type = "RenderableGlobe",
     Radii = 1560800,
-    SegmentsPerPatch = 64,
-    Layers = {},
     Labels = {
       Enabled = false,
       FileName = labelsPath .. "europa.labels",
diff --git a/data/assets/scene/solarsystem/planets/jupiter/ganymede/ganymede.asset b/data/assets/scene/solarsystem/planets/jupiter/ganymede/ganymede.asset
index 9b4989db77..b3466d7e05 100644
--- a/data/assets/scene/solarsystem/planets/jupiter/ganymede/ganymede.asset
+++ b/data/assets/scene/solarsystem/planets/jupiter/ganymede/ganymede.asset
@@ -31,8 +31,6 @@ local Ganymede = {
   Renderable = {
     Type = "RenderableGlobe",
     Radii = 2631000,
-    SegmentsPerPatch = 64,
-    Layers = {},
     Labels = {
       Enabled = false,
       FileName = labelsPath .. "ganymede.labels",
diff --git a/data/assets/scene/solarsystem/planets/jupiter/io/io.asset b/data/assets/scene/solarsystem/planets/jupiter/io/io.asset
index a61401b40b..9fac665977 100644
--- a/data/assets/scene/solarsystem/planets/jupiter/io/io.asset
+++ b/data/assets/scene/solarsystem/planets/jupiter/io/io.asset
@@ -31,8 +31,6 @@ local Io = {
   Renderable = {
     Type = "RenderableGlobe",
     Radii = 1821600,
-    SegmentsPerPatch = 64,
-    Layers = {},
     Labels = {
       Enabled = false,
       FileName = labelsPath .. "io.labels",
diff --git a/data/assets/scene/solarsystem/planets/jupiter/jupiter.asset b/data/assets/scene/solarsystem/planets/jupiter/jupiter.asset
index 7b5f3c2f17..5231ed1d1c 100644
--- a/data/assets/scene/solarsystem/planets/jupiter/jupiter.asset
+++ b/data/assets/scene/solarsystem/planets/jupiter/jupiter.asset
@@ -22,8 +22,6 @@ local Jupiter = {
   Renderable = {
     Type = "RenderableGlobe",
     Radii = { 71492000.0, 71492000.0, 66854000.0 },
-    SegmentsPerPatch = 64,
-    Layers = {},
     ShadowGroup = {
       Sources = {
         { Name = "Sun", Radius = 696300000 },
diff --git a/data/assets/scene/solarsystem/planets/jupiter/minor/ananke_group.asset b/data/assets/scene/solarsystem/planets/jupiter/minor/ananke_group.asset
index b35dfa8936..af343c41f8 100644
--- a/data/assets/scene/solarsystem/planets/jupiter/minor/ananke_group.asset
+++ b/data/assets/scene/solarsystem/planets/jupiter/minor/ananke_group.asset
@@ -17,9 +17,7 @@ local S2010J2 = {
   },
   Renderable = {
     Type = "RenderableGlobe",
-    Radii = { 1000, 1000, 1000 },
-    SegmentsPerPatch = 64,
-    Layers = {}
+    Radii = { 1000, 1000, 1000 }
   },
   Tag = {
     "moon_solarSystem",
@@ -106,9 +104,7 @@ local Thelxinoe = {
   },
   Renderable = {
     Type = "RenderableGlobe",
-    Radii = { 2000, 2000, 2000 },
-    SegmentsPerPatch = 64,
-    Layers = {}
+    Radii = { 2000, 2000, 2000 }
   },
   Tag = {
     "moon_solarSystem",
@@ -195,9 +191,7 @@ local Euanthe = {
   },
   Renderable = {
     Type = "RenderableGlobe",
-    Radii = { 3000, 3000, 3000 },
-    SegmentsPerPatch = 64,
-    Layers = {}
+    Radii = { 3000, 3000, 3000 }
   },
   Tag = {
     "moon_solarSystem",
@@ -284,9 +278,7 @@ local Iocaste = {
   },
   Renderable = {
     Type = "RenderableGlobe",
-    Radii = { 5000, 5000, 5000 },
-    SegmentsPerPatch = 64,
-    Layers = {}
+    Radii = { 5000, 5000, 5000 }
   },
   Tag = {
     "moon_solarSystem",
@@ -373,9 +365,7 @@ local S2003J16 = {
   },
   Renderable = {
     Type = "RenderableGlobe",
-    Radii = { 2000, 2000, 2000 },
-    SegmentsPerPatch = 64,
-    Layers = {}
+    Radii = { 2000, 2000, 2000 }
   },
   Tag = {
     "moon_solarSystem",
@@ -462,9 +452,7 @@ local Praxidike = {
   },
   Renderable = {
     Type = "RenderableGlobe",
-    Radii = { 7000, 7000, 7000 },
-    SegmentsPerPatch = 64,
-    Layers = {}
+    Radii = { 7000, 7000, 7000 }
   },
   Tag = {
     "moon_solarSystem",
@@ -551,9 +539,7 @@ local Harpalyke = {
   },
   Renderable = {
     Type = "RenderableGlobe",
-    Radii = { 4000, 4000, 4000 },
-    SegmentsPerPatch = 64,
-    Layers = {}
+    Radii = { 4000, 4000, 4000 }
   },
   Tag = {
     "moon_solarSystem",
@@ -640,9 +626,7 @@ local Mneme = {
   },
   Renderable = {
     Type = "RenderableGlobe",
-    Radii = { 2000, 2000, 2000 },
-    SegmentsPerPatch = 64,
-    Layers = {}
+    Radii = { 2000, 2000, 2000 }
   },
   Tag = {
     "moon_solarSystem",
@@ -729,9 +713,7 @@ local Hermippe = {
   },
   Renderable = {
     Type = "RenderableGlobe",
-    Radii = { 4000, 4000, 4000 },
-    SegmentsPerPatch = 64,
-    Layers = {}
+    Radii = { 4000, 4000, 4000 }
   },
   Tag = {
     "moon_solarSystem",
@@ -818,9 +800,7 @@ local Thyone = {
   },
   Renderable = {
     Type = "RenderableGlobe",
-    Radii = { 4000, 4000, 4000 },
-    SegmentsPerPatch = 64,
-    Layers = {}
+    Radii = { 4000, 4000, 4000 }
   },
   Tag = {
     "moon_solarSystem",
@@ -907,9 +887,7 @@ local Ananke = {
   },
   Renderable = {
     Type = "RenderableGlobe",
-    Radii = { 28000, 28000, 28000 },
-    SegmentsPerPatch = 64,
-    Layers = {}
+    Radii = { 28000, 28000, 28000 }
   },
   Tag = {
     "moon_solarSystem",
@@ -996,9 +974,7 @@ local S2021J1 = {
   },
   Renderable = {
     Type = "RenderableGlobe",
-    Radii = { 1000, 1000, 1000 },
-    SegmentsPerPatch = 64,
-    Layers = {}
+    Radii = { 1000, 1000, 1000 }
   },
   Tag = {
     "moon_solarSystem",
@@ -1085,9 +1061,7 @@ local S2021J2 = {
   },
   Renderable = {
     Type = "RenderableGlobe",
-    Radii = { 1000, 1000, 1000 },
-    SegmentsPerPatch = 64,
-    Layers = {}
+    Radii = { 1000, 1000, 1000 }
   },
   Tag = {
     "moon_solarSystem",
@@ -1174,9 +1148,7 @@ local S2021J3 = {
   },
   Renderable = {
     Type = "RenderableGlobe",
-    Radii = { 2000, 2000, 2000 },
-    SegmentsPerPatch = 64,
-    Layers = {}
+    Radii = { 2000, 2000, 2000 }
   },
   Tag = {
     "moon_solarSystem",
@@ -1263,9 +1235,7 @@ local S2022J3 = {
   },
   Renderable = {
     Type = "RenderableGlobe",
-    Radii = { 1000, 1000, 1000 },
-    SegmentsPerPatch = 64,
-    Layers = {}
+    Radii = { 1000, 1000, 1000 }
   },
   Tag = {
     "moon_solarSystem",
@@ -1352,9 +1322,7 @@ local S2017J3 = {
   },
   Renderable = {
     Type = "RenderableGlobe",
-    Radii = { 2000, 2000, 2000 },
-    SegmentsPerPatch = 64,
-    Layers = {}
+    Radii = { 2000, 2000, 2000 }
   },
   Tag = {
     "moon_solarSystem",
@@ -1441,9 +1409,7 @@ local S2017J7 = {
   },
   Renderable = {
     Type = "RenderableGlobe",
-    Radii = { 2000, 2000, 2000 },
-    SegmentsPerPatch = 64,
-    Layers = {}
+    Radii = { 2000, 2000, 2000 }
   },
   Tag = {
     "moon_solarSystem",
@@ -1530,9 +1496,7 @@ local S2017J9 = {
   },
   Renderable = {
     Type = "RenderableGlobe",
-    Radii = { 3000, 3000, 3000 },
-    SegmentsPerPatch = 64,
-    Layers = {}
+    Radii = { 3000, 3000, 3000 }
   },
   Tag = {
     "moon_solarSystem",
@@ -1619,9 +1583,7 @@ local S2003J2 = {
   },
   Renderable = {
     Type = "RenderableGlobe",
-    Radii = { 2000, 2000, 2000 },
-    SegmentsPerPatch = 64,
-    Layers = {}
+    Radii = { 2000, 2000, 2000 }
   },
   Tag = {
     "moon_solarSystem",
@@ -1708,9 +1670,7 @@ local S2003J12 = {
   },
   Renderable = {
     Type = "RenderableGlobe",
-    Radii = { 1000, 1000, 1000 },
-    SegmentsPerPatch = 64,
-    Layers = {}
+    Radii = { 1000, 1000, 1000 }
   },
   Tag = {
     "moon_solarSystem",
diff --git a/data/assets/scene/solarsystem/planets/jupiter/minor/carme_group.asset b/data/assets/scene/solarsystem/planets/jupiter/minor/carme_group.asset
index 5912b53308..a4d05d4632 100644
--- a/data/assets/scene/solarsystem/planets/jupiter/minor/carme_group.asset
+++ b/data/assets/scene/solarsystem/planets/jupiter/minor/carme_group.asset
@@ -17,9 +17,7 @@ local Herse = {
   },
   Renderable = {
     Type = "RenderableGlobe",
-    Radii = { 2000, 2000, 2000 },
-    SegmentsPerPatch = 64,
-    Layers = {}
+    Radii = { 2000, 2000, 2000 }
   },
   Tag = {
     "moon_solarSystem",
@@ -106,9 +104,7 @@ local Aitne = {
   },
   Renderable = {
     Type = "RenderableGlobe",
-    Radii = { 3000, 3000, 3000 },
-    SegmentsPerPatch = 64,
-    Layers = {}
+    Radii = { 3000, 3000, 3000 }
   },
   Tag = {
     "moon_solarSystem",
@@ -195,9 +191,7 @@ local Kale = {
   },
   Renderable = {
     Type = "RenderableGlobe",
-    Radii = { 2000, 2000, 2000 },
-    SegmentsPerPatch = 64,
-    Layers = {}
+    Radii = { 2000, 2000, 2000 }
   },
   Tag = {
     "moon_solarSystem",
@@ -284,9 +278,7 @@ local Taygete = {
   },
   Renderable = {
     Type = "RenderableGlobe",
-    Radii = { 5000, 5000, 5000 },
-    SegmentsPerPatch = 64,
-    Layers = {}
+    Radii = { 5000, 5000, 5000 }
   },
   Tag = {
     "moon_solarSystem",
@@ -373,9 +365,7 @@ local Chaldene = {
   },
   Renderable = {
     Type = "RenderableGlobe",
-    Radii = { 4000, 4000, 4000 },
-    SegmentsPerPatch = 64,
-    Layers = {}
+    Radii = { 4000, 4000, 4000 }
   },
   Tag = {
     "moon_solarSystem",
@@ -462,9 +452,7 @@ local Erinome = {
   },
   Renderable = {
     Type = "RenderableGlobe",
-    Radii = { 3000, 3000, 3000 },
-    SegmentsPerPatch = 64,
-    Layers = {}
+    Radii = { 3000, 3000, 3000 }
   },
   Tag = {
     "moon_solarSystem",
@@ -551,9 +539,7 @@ local Kallichore = {
   },
   Renderable = {
     Type = "RenderableGlobe",
-    Radii = { 2000, 2000, 2000 },
-    SegmentsPerPatch = 64,
-    Layers = {}
+    Radii = { 2000, 2000, 2000 }
   },
   Tag = {
     "moon_solarSystem",
@@ -640,9 +626,7 @@ local Kalyke = {
   },
   Renderable = {
     Type = "RenderableGlobe",
-    Radii = { 5000, 5000, 5000 },
-    SegmentsPerPatch = 64,
-    Layers = {}
+    Radii = { 5000, 5000, 5000 }
   },
   Tag = {
     "moon_solarSystem",
@@ -729,9 +713,7 @@ local Pasithee = {
   },
   Renderable = {
     Type = "RenderableGlobe",
-    Radii = { 2000, 2000, 2000 },
-    SegmentsPerPatch = 64,
-    Layers = {}
+    Radii = { 2000, 2000, 2000 }
   },
   Tag = {
     "moon_solarSystem",
@@ -818,9 +800,7 @@ local S2010J1 = {
   },
   Renderable = {
     Type = "RenderableGlobe",
-    Radii = { 2000, 2000, 2000 },
-    SegmentsPerPatch = 64,
-    Layers = {}
+    Radii = { 2000, 2000, 2000 }
   },
   Tag = {
     "moon_solarSystem",
@@ -907,9 +887,7 @@ local Eukelade = {
   },
   Renderable = {
     Type = "RenderableGlobe",
-    Radii = { 4000, 4000, 4000 },
-    SegmentsPerPatch = 64,
-    Layers = {}
+    Radii = { 4000, 4000, 4000 }
   },
   Tag = {
     "moon_solarSystem",
@@ -996,9 +974,7 @@ local Arche = {
   },
   Renderable = {
     Type = "RenderableGlobe",
-    Radii = { 3000, 3000, 3000 },
-    SegmentsPerPatch = 64,
-    Layers = {}
+    Radii = { 3000, 3000, 3000 }
   },
   Tag = {
     "moon_solarSystem",
@@ -1085,9 +1061,7 @@ local Isonoe = {
   },
   Renderable = {
     Type = "RenderableGlobe",
-    Radii = { 4000, 4000, 4000 },
-    SegmentsPerPatch = 64,
-    Layers = {}
+    Radii = { 4000, 4000, 4000 }
   },
   Tag = {
     "moon_solarSystem",
@@ -1174,9 +1148,7 @@ local Carme = {
   },
   Renderable = {
     Type = "RenderableGlobe",
-    Radii = { 46000, 46000, 46000 },
-    SegmentsPerPatch = 64,
-    Layers = {}
+    Radii = { 46000, 46000, 46000 }
   },
   Tag = {
     "moon_solarSystem",
@@ -1263,9 +1235,7 @@ local S2003J5 = {
   },
   Renderable = {
     Type = "RenderableGlobe",
-    Radii = { 4000, 4000, 4000 },
-    SegmentsPerPatch = 64,
-    Layers = {}
+    Radii = { 4000, 4000, 4000 }
   },
   Tag = {
     "moon_solarSystem",
@@ -1352,9 +1322,7 @@ local S2018J3 = {
   },
   Renderable = {
     Type = "RenderableGlobe",
-    Radii = { 1000, 1000, 1000 },
-    SegmentsPerPatch = 64,
-    Layers = {}
+    Radii = { 1000, 1000, 1000 }
   },
   Tag = {
     "moon_solarSystem",
@@ -1441,9 +1409,7 @@ local S2021J4 = {
   },
   Renderable = {
     Type = "RenderableGlobe",
-    Radii = { 1000, 1000, 1000 },
-    SegmentsPerPatch = 64,
-    Layers = {}
+    Radii = { 1000, 1000, 1000 }
   },
   Tag = {
     "moon_solarSystem",
@@ -1530,9 +1496,7 @@ local S2021J5 = {
   },
   Renderable = {
     Type = "RenderableGlobe",
-    Radii = { 2000, 2000, 2000 },
-    SegmentsPerPatch = 64,
-    Layers = {}
+    Radii = { 2000, 2000, 2000 }
   },
   Tag = {
     "moon_solarSystem",
@@ -1619,9 +1583,7 @@ local S2021J6 = {
   },
   Renderable = {
     Type = "RenderableGlobe",
-    Radii = { 2000, 2000, 2000 },
-    SegmentsPerPatch = 64,
-    Layers = {}
+    Radii = { 2000, 2000, 2000 }
   },
   Tag = {
     "moon_solarSystem",
@@ -1708,9 +1670,7 @@ local S2016J3 = {
   },
   Renderable = {
     Type = "RenderableGlobe",
-    Radii = { 2000, 2000, 2000 },
-    SegmentsPerPatch = 64,
-    Layers = {}
+    Radii = { 2000, 2000, 2000 }
   },
   Tag = {
     "moon_solarSystem",
@@ -1797,9 +1757,7 @@ local S2022J1 = {
   },
   Renderable = {
     Type = "RenderableGlobe",
-    Radii = { 2000, 2000, 2000 },
-    SegmentsPerPatch = 64,
-    Layers = {}
+    Radii = { 2000, 2000, 2000 }
   },
   Tag = {
     "moon_solarSystem",
@@ -1886,9 +1844,7 @@ local S2022J2 = {
   },
   Renderable = {
     Type = "RenderableGlobe",
-    Radii = { 1000, 1000, 1000 },
-    SegmentsPerPatch = 64,
-    Layers = {}
+    Radii = { 1000, 1000, 1000 }
   },
   Tag = {
     "moon_solarSystem",
@@ -1975,9 +1931,7 @@ local S2017J2 = {
   },
   Renderable = {
     Type = "RenderableGlobe",
-    Radii = { 1000, 1000, 1000 },
-    SegmentsPerPatch = 64,
-    Layers = {}
+    Radii = { 1000, 1000, 1000 }
   },
   Tag = {
     "moon_solarSystem",
@@ -2064,9 +2018,7 @@ local S2017J5 = {
   },
   Renderable = {
     Type = "RenderableGlobe",
-    Radii = { 2000, 2000, 2000 },
-    SegmentsPerPatch = 64,
-    Layers = {}
+    Radii = { 2000, 2000, 2000 }
   },
   Tag = {
     "moon_solarSystem",
@@ -2153,9 +2105,7 @@ local S2017J8 = {
   },
   Renderable = {
     Type = "RenderableGlobe",
-    Radii = { 1000, 1000, 1000 },
-    SegmentsPerPatch = 64,
-    Layers = {}
+    Radii = { 1000, 1000, 1000 }
   },
   Tag = {
     "moon_solarSystem",
@@ -2242,9 +2192,7 @@ local S2011J1 = {
   },
   Renderable = {
     Type = "RenderableGlobe",
-    Radii = { 1000, 1000, 1000 },
-    SegmentsPerPatch = 64,
-    Layers = {}
+    Radii = { 1000, 1000, 1000 }
   },
   Tag = {
     "moon_solarSystem",
@@ -2331,9 +2279,7 @@ local S2003J9 = {
   },
   Renderable = {
     Type = "RenderableGlobe",
-    Radii = { 1000, 1000, 1000 },
-    SegmentsPerPatch = 64,
-    Layers = {}
+    Radii = { 1000, 1000, 1000 }
   },
   Tag = {
     "moon_solarSystem",
@@ -2420,9 +2366,7 @@ local S2003J10 = {
   },
   Renderable = {
     Type = "RenderableGlobe",
-    Radii = { 2000, 2000, 2000 },
-    SegmentsPerPatch = 64,
-    Layers = {}
+    Radii = { 2000, 2000, 2000 }
   },
   Tag = {
     "moon_solarSystem",
diff --git a/data/assets/scene/solarsystem/planets/jupiter/minor/carpo_group.asset b/data/assets/scene/solarsystem/planets/jupiter/minor/carpo_group.asset
index b45d7826da..78b8c10e45 100644
--- a/data/assets/scene/solarsystem/planets/jupiter/minor/carpo_group.asset
+++ b/data/assets/scene/solarsystem/planets/jupiter/minor/carpo_group.asset
@@ -17,9 +17,7 @@ local Carpo = {
   },
   Renderable = {
     Type = "RenderableGlobe",
-    Radii = { 3000, 3000, 3000 },
-    SegmentsPerPatch = 64,
-    Layers = {}
+    Radii = { 3000, 3000, 3000 }
   },
   Tag = {
     "moon_solarSystem",
@@ -137,9 +135,7 @@ local S2018J4 = {
   },
   Renderable = {
     Type = "RenderableGlobe",
-    Radii = { 2000, 2000, 2000 },
-    SegmentsPerPatch = 64,
-    Layers = {}
+    Radii = { 2000, 2000, 2000 }
   },
   Tag = {
     "moon_solarSystem",
diff --git a/data/assets/scene/solarsystem/planets/jupiter/minor/himalia_group.asset b/data/assets/scene/solarsystem/planets/jupiter/minor/himalia_group.asset
index cc1edebcef..cdbb1c3fb9 100644
--- a/data/assets/scene/solarsystem/planets/jupiter/minor/himalia_group.asset
+++ b/data/assets/scene/solarsystem/planets/jupiter/minor/himalia_group.asset
@@ -17,9 +17,7 @@ local Leda = {
   },
   Renderable = {
     Type = "RenderableGlobe",
-    Radii = { 16000, 16000, 16000 },
-    SegmentsPerPatch = 64,
-    Layers = {}
+    Radii = { 16000, 16000, 16000 }
   },
   Tag = {
     "moon_solarSystem",
@@ -106,9 +104,7 @@ local Himalia = {
   },
   Renderable = {
     Type = "RenderableGlobe",
-    Radii = { 170000, 170000, 170000 },
-    SegmentsPerPatch = 64,
-    Layers = {}
+    Radii = { 170000, 170000, 170000 }
   },
   Tag = {
     "moon_solarSystem",
@@ -195,9 +191,7 @@ local Lysithea = {
   },
   Renderable = {
     Type = "RenderableGlobe",
-    Radii = { 36000, 36000, 36000 },
-    SegmentsPerPatch = 64,
-    Layers = {}
+    Radii = { 36000, 36000, 36000 }
   },
   Tag = {
     "moon_solarSystem",
@@ -284,9 +278,7 @@ local Elara = {
   },
   Renderable = {
     Type = "RenderableGlobe",
-    Radii = { 86000, 86000, 86000 },
-    SegmentsPerPatch = 64,
-    Layers = {}
+    Radii = { 86000, 86000, 86000 }
   },
   Tag = {
     "moon_solarSystem",
@@ -373,9 +365,7 @@ local Dia = {
   },
   Renderable = {
     Type = "RenderableGlobe",
-    Radii = { 4000, 4000, 4000 },
-    SegmentsPerPatch = 64,
-    Layers = {}
+    Radii = { 4000, 4000, 4000 }
   },
   Tag = {
     "moon_solarSystem",
@@ -462,9 +452,7 @@ local S2011J3 = {
   },
   Renderable = {
     Type = "RenderableGlobe",
-    Radii = { 3000, 3000, 3000 },
-    SegmentsPerPatch = 64,
-    Layers = {}
+    Radii = { 3000, 3000, 3000 }
   },
   Tag = {
     "moon_solarSystem",
@@ -551,9 +539,7 @@ local S2018J2 = {
   },
   Renderable = {
     Type = "RenderableGlobe",
-    Radii = { 3000, 3000, 3000 },
-    SegmentsPerPatch = 64,
-    Layers = {}
+    Radii = { 3000, 3000, 3000 }
   },
   Tag = {
     "moon_solarSystem",
@@ -640,9 +626,7 @@ local Pandia = {
   },
   Renderable = {
     Type = "RenderableGlobe",
-    Radii = { 3000, 3000, 3000 },
-    SegmentsPerPatch = 64,
-    Layers = {}
+    Radii = { 3000, 3000, 3000 }
   },
   Tag = {
     "moon_solarSystem",
@@ -729,9 +713,7 @@ local Ersa = {
   },
   Renderable = {
     Type = "RenderableGlobe",
-    Radii = { 3000, 3000, 3000 },
-    SegmentsPerPatch = 64,
-    Layers = {}
+    Radii = { 3000, 3000, 3000 }
   },
   Tag = {
     "moon_solarSystem",
diff --git a/data/assets/scene/solarsystem/planets/jupiter/minor/inner_group.asset b/data/assets/scene/solarsystem/planets/jupiter/minor/inner_group.asset
index 6e3e57cd26..a582070c4f 100644
--- a/data/assets/scene/solarsystem/planets/jupiter/minor/inner_group.asset
+++ b/data/assets/scene/solarsystem/planets/jupiter/minor/inner_group.asset
@@ -16,9 +16,7 @@ local Metis = {
   },
   Renderable = {
     Type = "RenderableGlobe",
-    Radii = { 60000, 40000, 34000 },
-    SegmentsPerPatch = 64,
-    Layers = {}
+    Radii = { 60000, 40000, 34000 }
   },
   Tag = {
     "moon_solarSystem",
@@ -105,9 +103,7 @@ local Adrastea = {
   },
   Renderable = {
     Type = "RenderableGlobe",
-    Radii = { 20000, 16000, 14000 },
-    SegmentsPerPatch = 64,
-    Layers = {}
+    Radii = { 20000, 16000, 14000 }
   },
   Tag = {
     "moon_solarSystem",
@@ -194,9 +190,7 @@ local Amalthea = {
   },
   Renderable = {
     Type = "RenderableGlobe",
-    Radii = { 250000, 146000, 128000 },
-    SegmentsPerPatch = 64,
-    Layers = {}
+    Radii = { 250000, 146000, 128000 }
   },
   Tag = {
     "moon_solarSystem",
@@ -283,9 +277,7 @@ local Thebe = {
   },
   Renderable = {
     Type = "RenderableGlobe",
-    Radii = { 116000, 98000, 84000 },
-    SegmentsPerPatch = 64,
-    Layers = {}
+    Radii = { 116000, 98000, 84000 }
   },
   Tag = {
     "moon_solarSystem",
diff --git a/data/assets/scene/solarsystem/planets/jupiter/minor/other_groups.asset b/data/assets/scene/solarsystem/planets/jupiter/minor/other_groups.asset
index 3d9f44189d..f2d49dc414 100644
--- a/data/assets/scene/solarsystem/planets/jupiter/minor/other_groups.asset
+++ b/data/assets/scene/solarsystem/planets/jupiter/minor/other_groups.asset
@@ -16,9 +16,7 @@ local Eupheme = {
   },
   Renderable = {
     Type = "RenderableGlobe",
-    Radii = { 2000, 2000, 2000 },
-    SegmentsPerPatch = 64,
-    Layers = {}
+    Radii = { 2000, 2000, 2000 }
   },
   Tag = {
     "moon_solarSystem",
@@ -105,9 +103,7 @@ local S2003J19 = {
   },
   Renderable = {
     Type = "RenderableGlobe",
-    Radii = { 2000, 2000, 2000 },
-    SegmentsPerPatch = 64,
-    Layers = {}
+    Radii = { 2000, 2000, 2000 }
   },
   Tag = {
     "moon_solarSystem",
@@ -194,9 +190,7 @@ local Valetudo = {
   },
   Renderable = {
     Type = "RenderableGlobe",
-    Radii = { 1000, 1000, 1000 },
-    SegmentsPerPatch = 64,
-    Layers = {}
+    Radii = { 1000, 1000, 1000 }
   },
   Tag = {
     "moon_solarSystem",
diff --git a/data/assets/scene/solarsystem/planets/jupiter/minor/pasiphae_group.asset b/data/assets/scene/solarsystem/planets/jupiter/minor/pasiphae_group.asset
index 358e09c8ef..3737f36155 100644
--- a/data/assets/scene/solarsystem/planets/jupiter/minor/pasiphae_group.asset
+++ b/data/assets/scene/solarsystem/planets/jupiter/minor/pasiphae_group.asset
@@ -17,9 +17,7 @@ local Euporie = {
   },
   Renderable = {
     Type = "RenderableGlobe",
-    Radii = { 2000, 2000, 2000 },
-    SegmentsPerPatch = 64,
-    Layers = {}
+    Radii = { 2000, 2000, 2000 }
   },
   Tag = {
     "moon_solarSystem",
@@ -106,9 +104,7 @@ local S2003J18 = {
   },
   Renderable = {
     Type = "RenderableGlobe",
-    Radii = { 2000, 2000, 2000 },
-    SegmentsPerPatch = 64,
-    Layers = {}
+    Radii = { 2000, 2000, 2000 }
   },
   Tag = {
     "moon_solarSystem",
@@ -195,9 +191,7 @@ local Helike = {
   },
   Renderable = {
     Type = "RenderableGlobe",
-    Radii = { 4000, 4000, 4000 },
-    SegmentsPerPatch = 64,
-    Layers = {}
+    Radii = { 4000, 4000, 4000 }
   },
   Tag = {
     "moon_solarSystem",
@@ -284,9 +278,7 @@ local Orthosie = {
   },
   Renderable = {
     Type = "RenderableGlobe",
-    Radii = { 2000, 2000, 2000 },
-    SegmentsPerPatch = 64,
-    Layers = {}
+    Radii = { 2000, 2000, 2000 }
   },
   Tag = {
     "moon_solarSystem",
@@ -373,9 +365,7 @@ local S2016J1 = {
   },
   Renderable = {
     Type = "RenderableGlobe",
-    Radii = { 3000, 3000, 3000 },
-    SegmentsPerPatch = 64,
-    Layers = {}
+    Radii = { 3000, 3000, 3000 }
   },
   Tag = {
     "moon_solarSystem",
@@ -462,9 +452,7 @@ local S2003J15 = {
   },
   Renderable = {
     Type = "RenderableGlobe",
-    Radii = { 2000, 2000, 2000 },
-    SegmentsPerPatch = 64,
-    Layers = {}
+    Radii = { 2000, 2000, 2000 }
   },
   Tag = {
     "moon_solarSystem",
@@ -551,9 +539,7 @@ local Aoede = {
   },
   Renderable = {
     Type = "RenderableGlobe",
-    Radii = { 4000, 4000, 4000 },
-    SegmentsPerPatch = 64,
-    Layers = {}
+    Radii = { 4000, 4000, 4000 }
   },
   Tag = {
     "moon_solarSystem",
@@ -640,9 +626,7 @@ local Callirrhoe = {
   },
   Renderable = {
     Type = "RenderableGlobe",
-    Radii = { 9000, 9000, 9000 },
-    SegmentsPerPatch = 64,
-    Layers = {}
+    Radii = { 9000, 9000, 9000 }
   },
   Tag = {
     "moon_solarSystem",
@@ -729,9 +713,7 @@ local Eurydome = {
   },
   Renderable = {
     Type = "RenderableGlobe",
-    Radii = { 3000, 3000, 3000 },
-    SegmentsPerPatch = 64,
-    Layers = {}
+    Radii = { 3000, 3000, 3000 }
   },
   Tag = {
     "moon_solarSystem",
@@ -818,9 +800,7 @@ local Kore = {
   },
   Renderable = {
     Type = "RenderableGlobe",
-    Radii = { 2000, 2000, 2000 },
-    SegmentsPerPatch = 64,
-    Layers = {}
+    Radii = { 2000, 2000, 2000 }
   },
   Tag = {
     "moon_solarSystem",
@@ -907,9 +887,7 @@ local Cyllene = {
   },
   Renderable = {
     Type = "RenderableGlobe",
-    Radii = { 2000, 2000, 2000 },
-    SegmentsPerPatch = 64,
-    Layers = {}
+    Radii = { 2000, 2000, 2000 }
   },
   Tag = {
     "moon_solarSystem",
@@ -996,9 +974,7 @@ local S2011J2 = {
   },
   Renderable = {
     Type = "RenderableGlobe",
-    Radii = { 1000, 1000, 1000 },
-    SegmentsPerPatch = 64,
-    Layers = {}
+    Radii = { 1000, 1000, 1000 }
   },
   Tag = {
     "moon_solarSystem",
@@ -1085,9 +1061,7 @@ local S2017J1 = {
   },
   Renderable = {
     Type = "RenderableGlobe",
-    Radii = { 2000, 2000, 2000 },
-    SegmentsPerPatch = 64,
-    Layers = {}
+    Radii = { 2000, 2000, 2000 }
   },
   Tag = {
     "moon_solarSystem",
@@ -1174,9 +1148,7 @@ local S2003J4 = {
   },
   Renderable = {
     Type = "RenderableGlobe",
-    Radii = { 2000, 2000, 2000 },
-    SegmentsPerPatch = 64,
-    Layers = {}
+    Radii = { 2000, 2000, 2000 }
   },
   Tag = {
     "moon_solarSystem",
@@ -1263,9 +1235,7 @@ local Pasiphae = {
   },
   Renderable = {
     Type = "RenderableGlobe",
-    Radii = { 60000, 60000, 60000 },
-    SegmentsPerPatch = 64,
-    Layers = {}
+    Radii = { 60000, 60000, 60000 }
   },
   Tag = {
     "moon_solarSystem",
@@ -1352,9 +1322,7 @@ local Hegemone = {
   },
   Renderable = {
     Type = "RenderableGlobe",
-    Radii = { 3000, 3000, 3000 },
-    SegmentsPerPatch = 64,
-    Layers = {}
+    Radii = { 3000, 3000, 3000 }
   },
   Tag = {
     "moon_solarSystem",
@@ -1441,9 +1409,7 @@ local Sinope = {
   },
   Renderable = {
     Type = "RenderableGlobe",
-    Radii = { 38000, 38000, 38000 },
-    SegmentsPerPatch = 64,
-    Layers = {}
+    Radii = { 38000, 38000, 38000 }
   },
   Tag = {
     "moon_solarSystem",
@@ -1530,9 +1496,7 @@ local Sponde = {
   },
   Renderable = {
     Type = "RenderableGlobe",
-    Radii = { 2000, 2000, 2000 },
-    SegmentsPerPatch = 64,
-    Layers = {}
+    Radii = { 2000, 2000, 2000 }
   },
   Tag = {
     "moon_solarSystem",
@@ -1619,9 +1583,7 @@ local Autonoe = {
   },
   Renderable = {
     Type = "RenderableGlobe",
-    Radii = { 4000, 4000, 4000 },
-    SegmentsPerPatch = 64,
-    Layers = {}
+    Radii = { 4000, 4000, 4000 }
   },
   Tag = {
     "moon_solarSystem",
@@ -1708,9 +1670,7 @@ local Megaclite = {
   },
   Renderable = {
     Type = "RenderableGlobe",
-    Radii = { 5000, 5000, 5000 },
-    SegmentsPerPatch = 64,
-    Layers = {}
+    Radii = { 5000, 5000, 5000 }
   },
   Tag = {
     "moon_solarSystem",
@@ -1797,9 +1757,7 @@ local S2016J4 = {
   },
   Renderable = {
     Type = "RenderableGlobe",
-    Radii = { 1000, 1000, 1000 },
-    SegmentsPerPatch = 64,
-    Layers = {}
+    Radii = { 1000, 1000, 1000 }
   },
   Tag = {
     "moon_solarSystem",
@@ -1886,9 +1844,7 @@ local S2017J6 = {
   },
   Renderable = {
     Type = "RenderableGlobe",
-    Radii = { 2000, 2000, 2000 },
-    SegmentsPerPatch = 64,
-    Layers = {}
+    Radii = { 2000, 2000, 2000 }
   },
   Tag = {
     "moon_solarSystem",
@@ -1975,9 +1931,7 @@ local S2003J23 = {
   },
   Renderable = {
     Type = "RenderableGlobe",
-    Radii = { 2000, 2000, 2000 },
-    SegmentsPerPatch = 64,
-    Layers = {}
+    Radii = { 2000, 2000, 2000 }
   },
   Tag = {
     "moon_solarSystem",
diff --git a/data/assets/scene/solarsystem/planets/jupiter/minor/themisto_group.asset b/data/assets/scene/solarsystem/planets/jupiter/minor/themisto_group.asset
index 92820768db..d353185aee 100644
--- a/data/assets/scene/solarsystem/planets/jupiter/minor/themisto_group.asset
+++ b/data/assets/scene/solarsystem/planets/jupiter/minor/themisto_group.asset
@@ -16,9 +16,7 @@ local Themisto = {
   },
   Renderable = {
     Type = "RenderableGlobe",
-    Radii = { 8000, 8000, 8000 },
-    SegmentsPerPatch = 64,
-    Layers = {}
+    Radii = { 8000, 8000, 8000 }
   },
   Tag = {
     "moon_solarSystem",
diff --git a/data/assets/scene/solarsystem/planets/mars/mars.asset b/data/assets/scene/solarsystem/planets/mars/mars.asset
index 7be590b8b4..f6b0ecf0e9 100644
--- a/data/assets/scene/solarsystem/planets/mars/mars.asset
+++ b/data/assets/scene/solarsystem/planets/mars/mars.asset
@@ -33,8 +33,6 @@ local Mars = {
   Renderable = {
     Type = "RenderableGlobe",
     Radii = MarsRadii,
-    SegmentsPerPatch = 90,
-    Layers = {},
     Labels = {
       Enabled = false,
       FileName = labelsPath .. "mars.labels",
diff --git a/data/assets/scene/solarsystem/planets/mars/moons/deimos_globe.asset b/data/assets/scene/solarsystem/planets/mars/moons/deimos_globe.asset
index cb0136adc8..0845c8547b 100644
--- a/data/assets/scene/solarsystem/planets/mars/moons/deimos_globe.asset
+++ b/data/assets/scene/solarsystem/planets/mars/moons/deimos_globe.asset
@@ -21,11 +21,9 @@ local DeimosGlobe = {
   },
   Renderable = {
     Type = "RenderableGlobe",
-    Radii = { 7500, 6100, 5200 },
---Radius source
---https://sci.esa.int/documents/35171/36506/1567259108230-5-ESLAB46-Day2-Rosenblatt.pdf
-    SegmentsPerPatch = 90,
-    Layers = {}
+    -- Radius source
+    -- https://sci.esa.int/documents/35171/36506/1567259108230-5-ESLAB46-Day2-Rosenblatt.pdf
+    Radii = { 7500, 6100, 5200 }
   },
   Tag = { "moon_solarSystem", "moon_terrestrial", "moon_mars" },
   GUI = {
diff --git a/data/assets/scene/solarsystem/planets/mars/moons/phobos_globe.asset b/data/assets/scene/solarsystem/planets/mars/moons/phobos_globe.asset
index 57bfb5acb0..3b32e1eb5b 100644
--- a/data/assets/scene/solarsystem/planets/mars/moons/phobos_globe.asset
+++ b/data/assets/scene/solarsystem/planets/mars/moons/phobos_globe.asset
@@ -21,11 +21,9 @@ local PhobosGlobe = {
   },
   Renderable = {
     Type = "RenderableGlobe",
-    Radii = { 13030, 11400, 9140 },
---Radius source
---https://naif.jpl.nasa.gov/pub/naif/generic_kernels/dsk/satellites/willner_etal_phobos.pdf
-    SegmentsPerPatch = 90,
-    Layers = {}
+    -- Radius source
+    -- https://naif.jpl.nasa.gov/pub/naif/generic_kernels/dsk/satellites/willner_etal_phobos.pdf
+    Radii = { 13030, 11400, 9140 }
   },
   Tag = { "moon_solarSystem", "moon_terrestrial", "moon_mars" },
   GUI = {
diff --git a/data/assets/scene/solarsystem/planets/mercury/mercury.asset b/data/assets/scene/solarsystem/planets/mercury/mercury.asset
index 38bcd21434..871df88f60 100644
--- a/data/assets/scene/solarsystem/planets/mercury/mercury.asset
+++ b/data/assets/scene/solarsystem/planets/mercury/mercury.asset
@@ -31,8 +31,6 @@ local Mercury = {
     Type = "RenderableGlobe",
     Radii = 2439700,
     CameraMinHeight = 300,
-    SegmentsPerPatch = 64,
-    Layers = {},
     Labels = {
       Enabled = false,
       FileName = labelsPath .. "Mercury.labels",
diff --git a/data/assets/scene/solarsystem/planets/neptune/inner_moons.asset b/data/assets/scene/solarsystem/planets/neptune/inner_moons.asset
index 163298690b..6ce4c2c2df 100644
--- a/data/assets/scene/solarsystem/planets/neptune/inner_moons.asset
+++ b/data/assets/scene/solarsystem/planets/neptune/inner_moons.asset
@@ -16,9 +16,7 @@ local Naiad = {
   },
   Renderable = {
     Type = "RenderableGlobe",
-    Radii = { 96000, 60000, 52000 },
-    SegmentsPerPatch = 64,
-    Layers = {}
+    Radii = { 96000, 60000, 52000 }
   },
   Tag = {
     "moon_solarSystem",
@@ -98,9 +96,7 @@ local Thalassa = {
   },
   Renderable = {
     Type = "RenderableGlobe",
-    Radii = { 108000, 100000, 52000 },
-    SegmentsPerPatch = 64,
-    Layers = {}
+    Radii = { 108000, 100000, 52000 }
   },
   Tag = {
     "moon_solarSystem",
@@ -180,9 +176,7 @@ local Despina = {
   },
   Renderable = {
     Type = "RenderableGlobe",
-    Radii = { 180000, 148000, 128000 },
-    SegmentsPerPatch = 64,
-    Layers = {}
+    Radii = { 180000, 148000, 128000 }
   },
   Tag = {
     "moon_solarSystem",
@@ -262,9 +256,7 @@ local Galatea = {
   },
   Renderable = {
     Type = "RenderableGlobe",
-    Radii = { 204000, 184000, 144000 },
-    SegmentsPerPatch = 64,
-    Layers = {}
+    Radii = { 204000, 184000, 144000 }
   },
   Tag = {
     "moon_solarSystem",
@@ -344,9 +336,7 @@ local Larissa = {
   },
   Renderable = {
     Type = "RenderableGlobe",
-    Radii = { 216000, 204000, 168000 },
-    SegmentsPerPatch = 64,
-    Layers = {}
+    Radii = { 216000, 204000, 168000 }
   },
   Tag = {
     "moon_solarSystem",
@@ -426,9 +416,7 @@ local Hippocamp = {
   },
   Renderable = {
     Type = "RenderableGlobe",
-    Radii = { 16000, 16000, 16000 },
-    SegmentsPerPatch = 64,
-    Layers = {}
+    Radii = { 16000, 16000, 16000 }
   },
   Tag = {
     "moon_solarSystem",
@@ -508,9 +496,7 @@ local Proteus = {
   },
   Renderable = {
     Type = "RenderableGlobe",
-    Radii = { 436000, 416000, 402000 },
-    SegmentsPerPatch = 64,
-    Layers = {}
+    Radii = { 436000, 416000, 402000 }
   },
   Tag = {
     "moon_solarSystem",
diff --git a/data/assets/scene/solarsystem/planets/neptune/irregular_moons.asset b/data/assets/scene/solarsystem/planets/neptune/irregular_moons.asset
index 6443878dba..0f17f84ff2 100644
--- a/data/assets/scene/solarsystem/planets/neptune/irregular_moons.asset
+++ b/data/assets/scene/solarsystem/planets/neptune/irregular_moons.asset
@@ -16,9 +16,7 @@ local Halimede = {
   },
   Renderable = {
     Type = "RenderableGlobe",
-    Radii = { 62000, 62000, 62000 },
-    SegmentsPerPatch = 64,
-    Layers = {}
+    Radii = { 62000, 62000, 62000 }
   },
   Tag = {
     "moon_solarSystem",
@@ -98,9 +96,7 @@ local Psamathe = {
   },
   Renderable = {
     Type = "RenderableGlobe",
-    Radii = { 40000, 40000, 40000 },
-    SegmentsPerPatch = 64,
-    Layers = {}
+    Radii = { 40000, 40000, 40000 }
   },
   Tag = {
     "moon_solarSystem",
@@ -180,9 +176,7 @@ local Sao = {
   },
   Renderable = {
     Type = "RenderableGlobe",
-    Radii = { 44000, 44000, 44000 },
-    SegmentsPerPatch = 64,
-    Layers = {}
+    Radii = { 44000, 44000, 44000 }
   },
   Tag = {
     "moon_solarSystem",
@@ -262,9 +256,7 @@ local Laomedeia = {
   },
   Renderable = {
     Type = "RenderableGlobe",
-    Radii = { 42000, 42000, 42000 },
-    SegmentsPerPatch = 64,
-    Layers = {}
+    Radii = { 42000, 42000, 42000 }
   },
   Tag = {
     "moon_solarSystem",
@@ -344,9 +336,7 @@ local Neso = {
   },
   Renderable = {
     Type = "RenderableGlobe",
-    Radii = { 60000, 60000, 60000 },
-    SegmentsPerPatch = 64,
-    Layers = {}
+    Radii = { 60000, 60000, 60000 }
   },
   Tag = {
     "moon_solarSystem",
diff --git a/data/assets/scene/solarsystem/planets/neptune/neptune.asset b/data/assets/scene/solarsystem/planets/neptune/neptune.asset
index 000cc0307a..1f25a9770c 100644
--- a/data/assets/scene/solarsystem/planets/neptune/neptune.asset
+++ b/data/assets/scene/solarsystem/planets/neptune/neptune.asset
@@ -21,9 +21,7 @@ local Neptune = {
   },
   Renderable = {
     Type = "RenderableGlobe",
-    Radii = { 24764000.0, 24764000.0, 24314000.0 },
-    SegmentsPerPatch = 64,
-    Layers = {}
+    Radii = { 24764000.0, 24764000.0, 24314000.0 }
   },
   Tag = { "planet_solarSystem", "planet_giants" },
   GUI = {
diff --git a/data/assets/scene/solarsystem/planets/neptune/nereid/nereid.asset b/data/assets/scene/solarsystem/planets/neptune/nereid/nereid.asset
index f2d49a0156..a68f4cf9e2 100644
--- a/data/assets/scene/solarsystem/planets/neptune/nereid/nereid.asset
+++ b/data/assets/scene/solarsystem/planets/neptune/nereid/nereid.asset
@@ -23,9 +23,7 @@ local Nereid = {
   },
   Renderable = {
     Type = "RenderableGlobe",
-    Radii = { 357000, 340000, 340000 },
-    SegmentsPerPatch = 64,
-    Layers = {}
+    Radii = { 357000, 340000, 340000 }
   },
   Tag = { "moon_solarSystem", "moon_giants", "moon_neptune", "moon_major_neptune" },
   GUI = {
diff --git a/data/assets/scene/solarsystem/planets/neptune/triton/triton.asset b/data/assets/scene/solarsystem/planets/neptune/triton/triton.asset
index 51867c1b82..426d7e65f9 100644
--- a/data/assets/scene/solarsystem/planets/neptune/triton/triton.asset
+++ b/data/assets/scene/solarsystem/planets/neptune/triton/triton.asset
@@ -28,9 +28,7 @@ local Triton = {
   },
   Renderable = {
     Type = "RenderableGlobe",
-    Radii = { 2709000, 2706000, 2705000 },
-    SegmentsPerPatch = 64,
-    Layers = {}
+    Radii = { 2709000, 2706000, 2705000 }
   },
   Tag = { "moon_solarSystem", "moon_giants", "moon_neptune", "moon_major_neptune" },
   GUI = {
diff --git a/data/assets/scene/solarsystem/planets/saturn/dione/dione.asset b/data/assets/scene/solarsystem/planets/saturn/dione/dione.asset
index 14314a5c49..7bfa019f5a 100644
--- a/data/assets/scene/solarsystem/planets/saturn/dione/dione.asset
+++ b/data/assets/scene/solarsystem/planets/saturn/dione/dione.asset
@@ -31,8 +31,6 @@ local Dione = {
   Renderable = {
     Type = "RenderableGlobe",
     Radii = 561400,
-    SegmentsPerPatch = 64,
-    Layers = {},
     Labels = {
       Enabled = false,
       FileName = labelsPath .. "dione.labels",
diff --git a/data/assets/scene/solarsystem/planets/saturn/enceladus/enceladus.asset b/data/assets/scene/solarsystem/planets/saturn/enceladus/enceladus.asset
index 61e7f70cfe..ae7c0b62e4 100644
--- a/data/assets/scene/solarsystem/planets/saturn/enceladus/enceladus.asset
+++ b/data/assets/scene/solarsystem/planets/saturn/enceladus/enceladus.asset
@@ -31,8 +31,6 @@ local Enceladus = {
   Renderable = {
     Type = "RenderableGlobe",
     Radii = 252000,
-    SegmentsPerPatch = 64,
-    Layers = {},
     Labels = {
       Enabled = false,
       FileName = labelsPath .. "enceladus.labels",
diff --git a/data/assets/scene/solarsystem/planets/saturn/hyperion/hyperion.asset b/data/assets/scene/solarsystem/planets/saturn/hyperion/hyperion.asset
index dabf012d5e..e2915d5ea4 100644
--- a/data/assets/scene/solarsystem/planets/saturn/hyperion/hyperion.asset
+++ b/data/assets/scene/solarsystem/planets/saturn/hyperion/hyperion.asset
@@ -28,8 +28,6 @@ local Hyperion = {
   Renderable = {
     Type = "RenderableGlobe",
     Radii = { 360200, 266000, 205400 },
-    SegmentsPerPatch = 64,
-    Layers = {},
     Labels = {
       -- @TODO (2021-05-21, emmbr26) These labels do not seem to be visible
       Enabled = false,
diff --git a/data/assets/scene/solarsystem/planets/saturn/iapetus/iapetus.asset b/data/assets/scene/solarsystem/planets/saturn/iapetus/iapetus.asset
index abf9c15200..f1fbb1efc0 100644
--- a/data/assets/scene/solarsystem/planets/saturn/iapetus/iapetus.asset
+++ b/data/assets/scene/solarsystem/planets/saturn/iapetus/iapetus.asset
@@ -31,8 +31,6 @@ local Iapetus = {
   Renderable = {
     Type = "RenderableGlobe",
     Radii = 734000,
-    SegmentsPerPatch = 64,
-    Layers = {},
     Labels = {
       Enabled = false,
       FileName = labelsPath .. "iapetus.labels",
diff --git a/data/assets/scene/solarsystem/planets/saturn/mimas/mimas.asset b/data/assets/scene/solarsystem/planets/saturn/mimas/mimas.asset
index 76726c849d..2f6c3ade12 100644
--- a/data/assets/scene/solarsystem/planets/saturn/mimas/mimas.asset
+++ b/data/assets/scene/solarsystem/planets/saturn/mimas/mimas.asset
@@ -31,8 +31,6 @@ local Mimas = {
   Renderable = {
     Type = "RenderableGlobe",
     Radii = { 207000, 197000, 191000 },
-    SegmentsPerPatch = 64,
-    Layers = {},
     Labels = {
       Enabled = false,
       FileName = labelsPath .. "mimas.labels",
diff --git a/data/assets/scene/solarsystem/planets/saturn/minor/gallic_group.asset b/data/assets/scene/solarsystem/planets/saturn/minor/gallic_group.asset
index f98cebdc0e..48485914da 100644
--- a/data/assets/scene/solarsystem/planets/saturn/minor/gallic_group.asset
+++ b/data/assets/scene/solarsystem/planets/saturn/minor/gallic_group.asset
@@ -16,9 +16,7 @@ local Albiorix = {
   },
   Renderable = {
     Type = "RenderableGlobe",
-    Radii = { 32000, 32000, 32000 },
-    SegmentsPerPatch = 64,
-    Layers = {}
+    Radii = { 32000, 32000, 32000 }
   },
   Tag = {
     "moon_solarSystem",
@@ -105,9 +103,7 @@ local Bebhionn = {
   },
   Renderable = {
     Type = "RenderableGlobe",
-    Radii = { 6000, 6000, 6000 },
-    SegmentsPerPatch = 64,
-    Layers = {}
+    Radii = { 6000, 6000, 6000 }
   },
   Tag = {
     "moon_solarSystem",
@@ -194,9 +190,7 @@ local Erriapus = {
   },
   Renderable = {
     Type = "RenderableGlobe",
-    Radii = { 10000, 10000, 10000 },
-    SegmentsPerPatch = 64,
-    Layers = {}
+    Radii = { 10000, 10000, 10000 }
   },
   Tag = {
     "moon_solarSystem",
@@ -283,9 +277,7 @@ local Tarvos = {
   },
   Renderable = {
     Type = "RenderableGlobe",
-    Radii = { 15000, 15000, 15000 },
-    SegmentsPerPatch = 64,
-    Layers = {}
+    Radii = { 15000, 15000, 15000 }
   },
   Tag = {
     "moon_solarSystem",
diff --git a/data/assets/scene/solarsystem/planets/saturn/minor/inuit_group.asset b/data/assets/scene/solarsystem/planets/saturn/minor/inuit_group.asset
index c310ef0036..dd8ca6a549 100644
--- a/data/assets/scene/solarsystem/planets/saturn/minor/inuit_group.asset
+++ b/data/assets/scene/solarsystem/planets/saturn/minor/inuit_group.asset
@@ -16,9 +16,7 @@ local Kiviuq = {
   },
   Renderable = {
     Type = "RenderableGlobe",
-    Radii = { 16000, 16000, 16000 },
-    SegmentsPerPatch = 64,
-    Layers = {}
+    Radii = { 16000, 16000, 16000 }
   },
   Tag = {
     "moon_solarSystem",
@@ -105,9 +103,7 @@ local Ijiraq = {
   },
   Renderable = {
     Type = "RenderableGlobe",
-    Radii = { 12000, 12000, 12000 },
-    SegmentsPerPatch = 64,
-    Layers = {}
+    Radii = { 12000, 12000, 12000 }
   },
   Tag = {
     "moon_solarSystem",
@@ -194,9 +190,7 @@ local Paaliaq = {
   },
   Renderable = {
     Type = "RenderableGlobe",
-    Radii = { 22000, 22000, 22000 },
-    SegmentsPerPatch = 64,
-    Layers = {}
+    Radii = { 22000, 22000, 22000 }
   },
   Tag = {
     "moon_solarSystem",
@@ -283,9 +277,7 @@ local Siarnaq = {
   },
   Renderable = {
     Type = "RenderableGlobe",
-    Radii = { 40000, 40000, 40000 },
-    SegmentsPerPatch = 64,
-    Layers = {}
+    Radii = { 40000, 40000, 40000 }
   },
   Tag = {
     "moon_solarSystem",
@@ -372,9 +364,7 @@ local Tarqeq = {
   },
   Renderable = {
     Type = "RenderableGlobe",
-    Radii = { 7000, 7000, 7000 },
-    SegmentsPerPatch = 64,
-    Layers = {}
+    Radii = { 7000, 7000, 7000 }
   },
   Tag = {
     "moon_solarSystem",
@@ -461,9 +451,7 @@ local S2004S29 = {
   },
   Renderable = {
     Type = "RenderableGlobe",
-    Radii = { 4000, 4000, 4000 },
-    SegmentsPerPatch = 64,
-    Layers = {}
+    Radii = { 4000, 4000, 4000 }
   },
   Tag = {
     "moon_solarSystem",
@@ -550,9 +538,7 @@ local S2004S31 = {
   },
   Renderable = {
     Type = "RenderableGlobe",
-    Radii = { 4000, 4000, 4000 },
-    SegmentsPerPatch = 64,
-    Layers = {}
+    Radii = { 4000, 4000, 4000 }
   },
   Tag = {
     "moon_solarSystem",
@@ -639,9 +625,7 @@ local S2019S01 = {
   },
   Renderable = {
     Type = "RenderableGlobe",
-    Radii = { 5000, 5000, 5000 },
-    SegmentsPerPatch = 64,
-    Layers = {}
+    Radii = { 5000, 5000, 5000 }
   },
   Tag = {
     "moon_solarSystem",
diff --git a/data/assets/scene/solarsystem/planets/saturn/minor/norse_group.asset b/data/assets/scene/solarsystem/planets/saturn/minor/norse_group.asset
index 075e8ea78a..6c30ed7f07 100644
--- a/data/assets/scene/solarsystem/planets/saturn/minor/norse_group.asset
+++ b/data/assets/scene/solarsystem/planets/saturn/minor/norse_group.asset
@@ -17,9 +17,7 @@ local Phoebe = {
   },
   Renderable = {
     Type = "RenderableGlobe",
-    Radii = { 218800, 217000, 203600 },
-    SegmentsPerPatch = 64,
-    Layers = {}
+    Radii = { 218800, 217000, 203600 }
   },
   Tag = {
     "moon_solarSystem",
@@ -106,9 +104,7 @@ local Skathi = {
   },
   Renderable = {
     Type = "RenderableGlobe",
-    Radii = { 8000, 8000, 8000 },
-    SegmentsPerPatch = 64,
-    Layers = {}
+    Radii = { 8000, 8000, 8000 }
   },
   Tag = {
     "moon_solarSystem",
@@ -195,9 +191,7 @@ local S2007S2 = {
   },
   Renderable = {
     Type = "RenderableGlobe",
-    Radii = { 6000, 6000, 6000 },
-    SegmentsPerPatch = 64,
-    Layers = {}
+    Radii = { 6000, 6000, 6000 }
   },
   Tag = {
     "moon_solarSystem",
@@ -284,9 +278,7 @@ local Skoll = {
   },
   Renderable = {
     Type = "RenderableGlobe",
-    Radii = { 6000, 6000, 6000 },
-    SegmentsPerPatch = 64,
-    Layers = {}
+    Radii = { 6000, 6000, 6000 }
   },
   Tag = {
     "moon_solarSystem",
@@ -373,9 +365,7 @@ local S2004S13 = {
   },
   Renderable = {
     Type = "RenderableGlobe",
-    Radii = { 2000, 2000, 2000 },
-    SegmentsPerPatch = 64,
-    Layers = {}
+    Radii = { 2000, 2000, 2000 }
   },
   Tag = {
     "moon_solarSystem",
@@ -462,9 +452,7 @@ local Greip = {
   },
   Renderable = {
     Type = "RenderableGlobe",
-    Radii = { 6000, 6000, 6000 },
-    SegmentsPerPatch = 64,
-    Layers = {}
+    Radii = { 6000, 6000, 6000 }
   },
   Tag = {
     "moon_solarSystem",
@@ -551,9 +539,7 @@ local Hyrrokkin = {
   },
   Renderable = {
     Type = "RenderableGlobe",
-    Radii = { 8000, 8000, 8000 },
-    SegmentsPerPatch = 64,
-    Layers = {}
+    Radii = { 8000, 8000, 8000 }
   },
   Tag = {
     "moon_solarSystem",
@@ -640,9 +626,7 @@ local Jarnsaxa = {
   },
   Renderable = {
     Type = "RenderableGlobe",
-    Radii = { 6000, 6000, 6000 },
-    SegmentsPerPatch = 64,
-    Layers = {}
+    Radii = { 6000, 6000, 6000 }
   },
   Tag = {
     "moon_solarSystem",
@@ -729,9 +713,7 @@ local Mundilfari = {
   },
   Renderable = {
     Type = "RenderableGlobe",
-    Radii = { 7000, 7000, 7000 },
-    SegmentsPerPatch = 64,
-    Layers = {}
+    Radii = { 7000, 7000, 7000 }
   },
   Tag = {
     "moon_solarSystem",
@@ -818,9 +800,7 @@ local S2006S1 = {
   },
   Renderable = {
     Type = "RenderableGlobe",
-    Radii = { 6000, 6000, 6000 },
-    SegmentsPerPatch = 64,
-    Layers = {}
+    Radii = { 6000, 6000, 6000 }
   },
   Tag = {
     "moon_solarSystem",
@@ -907,9 +887,7 @@ local S2004S17 = {
   },
   Renderable = {
     Type = "RenderableGlobe",
-    Radii = { 4000, 4000, 4000 },
-    SegmentsPerPatch = 64,
-    Layers = {}
+    Radii = { 4000, 4000, 4000 }
   },
   Tag = {
     "moon_solarSystem",
@@ -996,9 +974,7 @@ local Bergelmir = {
   },
   Renderable = {
     Type = "RenderableGlobe",
-    Radii = { 6000, 6000, 6000 },
-    SegmentsPerPatch = 64,
-    Layers = {}
+    Radii = { 6000, 6000, 6000 }
   },
   Tag = {
     "moon_solarSystem",
@@ -1085,9 +1061,7 @@ local Narvi = {
   },
   Renderable = {
     Type = "RenderableGlobe",
-    Radii = { 7000, 7000, 7000 },
-    SegmentsPerPatch = 64,
-    Layers = {}
+    Radii = { 7000, 7000, 7000 }
   },
   Tag = {
     "moon_solarSystem",
@@ -1174,9 +1148,7 @@ local Suttungr = {
   },
   Renderable = {
     Type = "RenderableGlobe",
-    Radii = { 7000, 7000, 7000 },
-    SegmentsPerPatch = 64,
-    Layers = {}
+    Radii = { 7000, 7000, 7000 }
   },
   Tag = {
     "moon_solarSystem",
@@ -1263,9 +1235,7 @@ local Hati = {
   },
   Renderable = {
     Type = "RenderableGlobe",
-    Radii = { 6000, 6000, 6000 },
-    SegmentsPerPatch = 64,
-    Layers = {}
+    Radii = { 6000, 6000, 6000 }
   },
   Tag = {
     "moon_solarSystem",
@@ -1352,9 +1322,7 @@ local S2004S12 = {
   },
   Renderable = {
     Type = "RenderableGlobe",
-    Radii = { 5000, 5000, 5000 },
-    SegmentsPerPatch = 64,
-    Layers = {}
+    Radii = { 5000, 5000, 5000 }
   },
   Tag = {
     "moon_solarSystem",
@@ -1441,9 +1409,7 @@ local Farbauti = {
   },
   Renderable = {
     Type = "RenderableGlobe",
-    Radii = { 5000, 5000, 5000 },
-    SegmentsPerPatch = 64,
-    Layers = {}
+    Radii = { 5000, 5000, 5000 }
   },
   Tag = {
     "moon_solarSystem",
@@ -1530,9 +1496,7 @@ local Thrymr = {
   },
   Renderable = {
     Type = "RenderableGlobe",
-    Radii = { 7000, 7000, 7000 },
-    SegmentsPerPatch = 64,
-    Layers = {}
+    Radii = { 7000, 7000, 7000 }
   },
   Tag = {
     "moon_solarSystem",
@@ -1619,9 +1583,7 @@ local Aegir = {
   },
   Renderable = {
     Type = "RenderableGlobe",
-    Radii = { 6000, 6000, 6000 },
-    SegmentsPerPatch = 64,
-    Layers = {}
+    Radii = { 6000, 6000, 6000 }
   },
   Tag = {
     "moon_solarSystem",
@@ -1708,9 +1670,7 @@ local S2007S3 = {
   },
   Renderable = {
     Type = "RenderableGlobe",
-    Radii = { 5000, 5000, 5000 },
-    SegmentsPerPatch = 64,
-    Layers = {}
+    Radii = { 5000, 5000, 5000 }
   },
   Tag = {
     "moon_solarSystem",
@@ -1797,9 +1757,7 @@ local Bestla = {
   },
   Renderable = {
     Type = "RenderableGlobe",
-    Radii = { 7000, 7000, 7000 },
-    SegmentsPerPatch = 64,
-    Layers = {}
+    Radii = { 7000, 7000, 7000 }
   },
   Tag = {
     "moon_solarSystem",
@@ -1886,9 +1844,7 @@ local S2004S7 = {
   },
   Renderable = {
     Type = "RenderableGlobe",
-    Radii = { 6000, 6000, 6000 },
-    SegmentsPerPatch = 64,
-    Layers = {}
+    Radii = { 6000, 6000, 6000 }
   },
   Tag = {
     "moon_solarSystem",
@@ -1975,9 +1931,7 @@ local S2006S3 = {
   },
   Renderable = {
     Type = "RenderableGlobe",
-    Radii = { 6000, 6000, 6000 },
-    SegmentsPerPatch = 64,
-    Layers = {}
+    Radii = { 6000, 6000, 6000 }
   },
   Tag = {
     "moon_solarSystem",
@@ -2064,9 +2018,7 @@ local Fenrir = {
   },
   Renderable = {
     Type = "RenderableGlobe",
-    Radii = { 4000, 4000, 4000 },
-    SegmentsPerPatch = 64,
-    Layers = {}
+    Radii = { 4000, 4000, 4000 }
   },
   Tag = {
     "moon_solarSystem",
@@ -2153,9 +2105,7 @@ local Surtur = {
   },
   Renderable = {
     Type = "RenderableGlobe",
-    Radii = { 6000, 6000, 6000 },
-    SegmentsPerPatch = 64,
-    Layers = {}
+    Radii = { 6000, 6000, 6000 }
   },
   Tag = {
     "moon_solarSystem",
@@ -2242,9 +2192,7 @@ local Kari = {
   },
   Renderable = {
     Type = "RenderableGlobe",
-    Radii = { 7000, 7000, 7000 },
-    SegmentsPerPatch = 64,
-    Layers = {}
+    Radii = { 7000, 7000, 7000 }
   },
   Tag = {
     "moon_solarSystem",
@@ -2331,9 +2279,7 @@ local Ymir = {
   },
   Renderable = {
     Type = "RenderableGlobe",
-    Radii = { 18000, 18000, 18000 },
-    SegmentsPerPatch = 64,
-    Layers = {}
+    Radii = { 18000, 18000, 18000 }
   },
   Tag = {
     "moon_solarSystem",
@@ -2420,9 +2366,7 @@ local Loge = {
   },
   Renderable = {
     Type = "RenderableGlobe",
-    Radii = { 6000, 6000, 6000 },
-    SegmentsPerPatch = 64,
-    Layers = {}
+    Radii = { 6000, 6000, 6000 }
   },
   Tag = {
     "moon_solarSystem",
@@ -2509,9 +2453,7 @@ local Fornjot = {
   },
   Renderable = {
     Type = "RenderableGlobe",
-    Radii = { 6000, 6000, 6000 },
-    SegmentsPerPatch = 64,
-    Layers = {}
+    Radii = { 6000, 6000, 6000 }
   },
   Tag = {
     "moon_solarSystem",
@@ -2598,9 +2540,7 @@ local Skadi = {
   },
   Renderable = {
     Type = "RenderableGlobe",
-    Radii = { 8000, 8000, 8000 },
-    SegmentsPerPatch = 64,
-    Layers = {}
+    Radii = { 8000, 8000, 8000 }
   },
   Tag = {
     "moon_solarSystem",
@@ -2687,9 +2627,7 @@ local Gridr = {
   },
   Renderable = {
     Type = "RenderableGlobe",
-    Radii = { 4000, 4000, 4000 },
-    SegmentsPerPatch = 64,
-    Layers = {}
+    Radii = { 4000, 4000, 4000 }
   },
   Tag = {
     "moon_solarSystem",
@@ -2776,9 +2714,7 @@ local Angrboda = {
   },
   Renderable = {
     Type = "RenderableGlobe",
-    Radii = { 3000, 3000, 3000 },
-    SegmentsPerPatch = 64,
-    Layers = {}
+    Radii = { 3000, 3000, 3000 }
   },
   Tag = {
     "moon_solarSystem",
@@ -2865,9 +2801,7 @@ local Skrymir = {
   },
   Renderable = {
     Type = "RenderableGlobe",
-    Radii = { 4000, 4000, 4000 },
-    SegmentsPerPatch = 64,
-    Layers = {}
+    Radii = { 4000, 4000, 4000 }
   },
   Tag = {
     "moon_solarSystem",
@@ -2954,9 +2888,7 @@ local Gerd = {
   },
   Renderable = {
     Type = "RenderableGlobe",
-    Radii = { 4000, 4000, 4000 },
-    SegmentsPerPatch = 64,
-    Layers = {}
+    Radii = { 4000, 4000, 4000 }
   },
   Tag = {
     "moon_solarSystem",
@@ -3043,9 +2975,7 @@ local S2004S26 = {
   },
   Renderable = {
     Type = "RenderableGlobe",
-    Radii = { 4000, 4000, 4000 },
-    SegmentsPerPatch = 64,
-    Layers = {}
+    Radii = { 4000, 4000, 4000 }
   },
   Tag = {
     "moon_solarSystem",
@@ -3132,9 +3062,7 @@ local Eggther = {
   },
   Renderable = {
     Type = "RenderableGlobe",
-    Radii = { 6000, 6000, 6000 },
-    SegmentsPerPatch = 64,
-    Layers = {}
+    Radii = { 6000, 6000, 6000 }
   },
   Tag = {
     "moon_solarSystem",
@@ -3221,9 +3149,7 @@ local Beli = {
   },
   Renderable = {
     Type = "RenderableGlobe",
-    Radii = { 4000, 4000, 4000 },
-    SegmentsPerPatch = 64,
-    Layers = {}
+    Radii = { 4000, 4000, 4000 }
   },
   Tag = {
     "moon_solarSystem",
@@ -3310,9 +3236,7 @@ local Gunnlod = {
   },
   Renderable = {
     Type = "RenderableGlobe",
-    Radii = { 4000, 4000, 4000 },
-    SegmentsPerPatch = 64,
-    Layers = {}
+    Radii = { 4000, 4000, 4000 }
   },
   Tag = {
     "moon_solarSystem",
@@ -3399,9 +3323,7 @@ local Thiazzi = {
   },
   Renderable = {
     Type = "RenderableGlobe",
-    Radii = { 4000, 4000, 4000 },
-    SegmentsPerPatch = 64,
-    Layers = {}
+    Radii = { 4000, 4000, 4000 }
   },
   Tag = {
     "moon_solarSystem",
@@ -3488,9 +3410,7 @@ local S2004S34 = {
   },
   Renderable = {
     Type = "RenderableGlobe",
-    Radii = { 3000, 3000, 3000 },
-    SegmentsPerPatch = 64,
-    Layers = {}
+    Radii = { 3000, 3000, 3000 }
   },
   Tag = {
     "moon_solarSystem",
@@ -3577,9 +3497,7 @@ local Alvaldi = {
   },
   Renderable = {
     Type = "RenderableGlobe",
-    Radii = { 5000, 5000, 5000 },
-    SegmentsPerPatch = 64,
-    Layers = {}
+    Radii = { 5000, 5000, 5000 }
   },
   Tag = {
     "moon_solarSystem",
@@ -3666,9 +3584,7 @@ local Geirrod = {
   },
   Renderable = {
     Type = "RenderableGlobe",
-    Radii = { 4000, 4000, 4000 },
-    SegmentsPerPatch = 64,
-    Layers = {}
+    Radii = { 4000, 4000, 4000 }
   },
   Tag = {
     "moon_solarSystem",
@@ -3755,9 +3671,7 @@ local S2004S28 = {
   },
   Renderable = {
     Type = "RenderableGlobe",
-    Radii = { 4000, 4000, 4000 },
-    SegmentsPerPatch = 64,
-    Layers = {}
+    Radii = { 4000, 4000, 4000 }
   },
   Tag = {
     "moon_solarSystem",
@@ -3844,9 +3758,7 @@ local S2004S21 = {
   },
   Renderable = {
     Type = "RenderableGlobe",
-    Radii = { 3000, 3000, 3000 },
-    SegmentsPerPatch = 64,
-    Layers = {}
+    Radii = { 3000, 3000, 3000 }
   },
   Tag = {
     "moon_solarSystem",
@@ -3933,9 +3845,7 @@ local S2004S36 = {
   },
   Renderable = {
     Type = "RenderableGlobe",
-    Radii = { 3000, 3000, 3000 },
-    SegmentsPerPatch = 64,
-    Layers = {}
+    Radii = { 3000, 3000, 3000 }
   },
   Tag = {
     "moon_solarSystem",
@@ -4022,9 +3932,7 @@ local S2004S37 = {
   },
   Renderable = {
     Type = "RenderableGlobe",
-    Radii = { 4000, 4000, 4000 },
-    SegmentsPerPatch = 64,
-    Layers = {}
+    Radii = { 4000, 4000, 4000 }
   },
   Tag = {
     "moon_solarSystem",
@@ -4111,9 +4019,7 @@ local S2004S39 = {
   },
   Renderable = {
     Type = "RenderableGlobe",
-    Radii = { 3000, 3000, 3000 },
-    SegmentsPerPatch = 64,
-    Layers = {}
+    Radii = { 3000, 3000, 3000 }
   },
   Tag = {
     "moon_solarSystem",
diff --git a/data/assets/scene/solarsystem/planets/saturn/minor/other_group.asset b/data/assets/scene/solarsystem/planets/saturn/minor/other_group.asset
index f1dbdeef23..710f33ada2 100644
--- a/data/assets/scene/solarsystem/planets/saturn/minor/other_group.asset
+++ b/data/assets/scene/solarsystem/planets/saturn/minor/other_group.asset
@@ -18,9 +18,7 @@ local Aegaeon = {
   },
   Renderable = {
     Type = "RenderableGlobe",
-    Radii = { 500, 500, 500 },
-    SegmentsPerPatch = 64,
-    Layers = {}
+    Radii = { 500, 500, 500 }
   },
   Tag = {
     "moon_solarSystem",
@@ -107,9 +105,7 @@ local Methone = {
   },
   Renderable = {
     Type = "RenderableGlobe",
-    Radii = { 3200, 3200, 3200 },
-    SegmentsPerPatch = 64,
-    Layers = {}
+    Radii = { 3200, 3200, 3200 }
   },
   Tag = {
     "moon_solarSystem",
@@ -196,9 +192,7 @@ local Anthe = {
   },
   Renderable = {
     Type = "RenderableGlobe",
-    Radii = { 1800, 1800, 1800 },
-    SegmentsPerPatch = 64,
-    Layers = {}
+    Radii = { 1800, 1800, 1800 }
   },
   Tag = {
     "moon_solarSystem",
@@ -285,9 +279,7 @@ local Pallene = {
   },
   Renderable = {
     Type = "RenderableGlobe",
-    Radii = { 6000, 6000, 4000 },
-    SegmentsPerPatch = 64,
-    Layers = {}
+    Radii = { 6000, 6000, 4000 }
   },
   Tag = {
     "moon_solarSystem",
@@ -374,9 +366,7 @@ local Telesto = {
   },
   Renderable = {
     Type = "RenderableGlobe",
-    Radii = { 33000, 24000, 20000 },
-    SegmentsPerPatch = 64,
-    Layers = {}
+    Radii = { 33000, 24000, 20000 }
   },
   Tag = {
     "moon_solarSystem",
@@ -463,9 +453,7 @@ local Calypso = {
   },
   Renderable = {
     Type = "RenderableGlobe",
-    Radii = { 30000, 23000, 14000 },
-    SegmentsPerPatch = 64,
-    Layers = {}
+    Radii = { 30000, 23000, 14000 }
   },
   Tag = {
     "moon_solarSystem",
@@ -552,9 +540,7 @@ local Helene = {
   },
   Renderable = {
     Type = "RenderableGlobe",
-    Radii = { 43000, 38000, 26000 },
-    SegmentsPerPatch = 64,
-    Layers = {}
+    Radii = { 43000, 38000, 26000 }
   },
   Tag = {
     "moon_solarSystem",
@@ -641,9 +627,7 @@ local Polydeuces = {
   },
   Renderable = {
     Type = "RenderableGlobe",
-    Radii = { 3000, 2000, 1000 },
-    SegmentsPerPatch = 64,
-    Layers = {}
+    Radii = { 3000, 2000, 1000 }
   },
   Tag = {
     "moon_solarSystem",
@@ -730,9 +714,7 @@ local S2004S24 = {
   },
   Renderable = {
     Type = "RenderableGlobe",
-    Radii = { 3000, 3000, 3000 },
-    SegmentsPerPatch = 64,
-    Layers = {}
+    Radii = { 3000, 3000, 3000 }
   },
   Tag = {
     "moon_solarSystem",
diff --git a/data/assets/scene/solarsystem/planets/saturn/minor/shepherd_group.asset b/data/assets/scene/solarsystem/planets/saturn/minor/shepherd_group.asset
index d303ee46b7..410c15c741 100644
--- a/data/assets/scene/solarsystem/planets/saturn/minor/shepherd_group.asset
+++ b/data/assets/scene/solarsystem/planets/saturn/minor/shepherd_group.asset
@@ -30,9 +30,7 @@ local Prometheus = {
   },
   Renderable = {
     Type = "RenderableGlobe",
-    Radii = { 135600, 79400, 59400 },
-    SegmentsPerPatch = 64,
-    Layers = {}
+    Radii = { 135600, 79400, 59400 }
   },
   Tag = {
     "moon_solarSystem",
@@ -119,9 +117,7 @@ local Pandora = {
   },
   Renderable = {
     Type = "RenderableGlobe",
-    Radii = { 104000, 81000, 64000 },
-    SegmentsPerPatch = 64,
-    Layers = {}
+    Radii = { 104000, 81000, 64000 }
   },
   Tag = {
     "moon_solarSystem",
@@ -208,9 +204,7 @@ local Atlas = {
   },
   Renderable = {
     Type = "RenderableGlobe",
-    Radii = { 40800, 35400, 18800 },
-    SegmentsPerPatch = 64,
-    Layers = {}
+    Radii = { 40800, 35400, 18800 }
   },
   Tag = {
     "moon_solarSystem",
@@ -297,9 +291,7 @@ local Janus = {
   },
   Renderable = {
     Type = "RenderableGlobe",
-    Radii = { 203000, 185000, 152600 },
-    SegmentsPerPatch = 64,
-    Layers = {}
+    Radii = { 203000, 185000, 152600 }
   },
   Tag = {
     "moon_solarSystem",
@@ -386,9 +378,7 @@ local Epimetheus = {
   },
   Renderable = {
     Type = "RenderableGlobe",
-    Radii = { 129800, 114000, 106200 },
-    SegmentsPerPatch = 64,
-    Layers = {}
+    Radii = { 129800, 114000, 106200 }
   },
   Tag = {
     "moon_solarSystem",
@@ -475,9 +465,7 @@ local Daphnis = {
   },
   Renderable = {
     Type = "RenderableGlobe",
-    Radii = { 8600, 8200, 6400 },
-    SegmentsPerPatch = 64,
-    Layers = {}
+    Radii = { 8600, 8200, 6400 }
   },
   Tag = {
     "moon_solarSystem",
@@ -564,9 +552,7 @@ local Pan = {
   },
   Renderable = {
     Type = "RenderableGlobe",
-    Radii = { 34400, 31400, 20800 },
-    SegmentsPerPatch = 64,
-    Layers = {}
+    Radii = { 34400, 31400, 20800 }
   },
   Tag = {
     "moon_solarSystem",
diff --git a/data/assets/scene/solarsystem/planets/saturn/rhea/rhea.asset b/data/assets/scene/solarsystem/planets/saturn/rhea/rhea.asset
index 82419918e4..67d9563193 100644
--- a/data/assets/scene/solarsystem/planets/saturn/rhea/rhea.asset
+++ b/data/assets/scene/solarsystem/planets/saturn/rhea/rhea.asset
@@ -31,8 +31,6 @@ local Rhea = {
   Renderable = {
     Type = "RenderableGlobe",
     Radii = 765000,
-    SegmentsPerPatch = 64,
-    Layers = {},
     Labels = {
       Enabled = false,
       FileName = labelsPath .. "rhea.labels",
diff --git a/data/assets/scene/solarsystem/planets/saturn/saturn.asset b/data/assets/scene/solarsystem/planets/saturn/saturn.asset
index 93cd1f14b8..f85abdd7b8 100644
--- a/data/assets/scene/solarsystem/planets/saturn/saturn.asset
+++ b/data/assets/scene/solarsystem/planets/saturn/saturn.asset
@@ -30,8 +30,6 @@ local Saturn = {
   Renderable = {
     Type = "RenderableGlobe",
     Radii = { 60268000, 60268000, 54364000 },
-    SegmentsPerPatch = 64,
-    Layers = {},
     Rings = {
       -- Single Texture Values:
       --Texture = texturesPath .. "/saturn_rings.png",
diff --git a/data/assets/scene/solarsystem/planets/saturn/tethys/tethys.asset b/data/assets/scene/solarsystem/planets/saturn/tethys/tethys.asset
index 0eccadfea9..8ad3a467a5 100644
--- a/data/assets/scene/solarsystem/planets/saturn/tethys/tethys.asset
+++ b/data/assets/scene/solarsystem/planets/saturn/tethys/tethys.asset
@@ -31,8 +31,6 @@ local Tethys = {
   Renderable = {
     Type = "RenderableGlobe",
     Radii = 531100,
-    SegmentsPerPatch = 64,
-    Layers = {},
     Labels = {
       Enabled = false,
       FileName = labelsPath .. "tethys.labels",
diff --git a/data/assets/scene/solarsystem/planets/saturn/titan/titan.asset b/data/assets/scene/solarsystem/planets/saturn/titan/titan.asset
index 3731e036f4..cabd4f2813 100644
--- a/data/assets/scene/solarsystem/planets/saturn/titan/titan.asset
+++ b/data/assets/scene/solarsystem/planets/saturn/titan/titan.asset
@@ -31,8 +31,6 @@ local Titan = {
   Renderable = {
     Type = "RenderableGlobe",
     Radii = 2576000,
-    SegmentsPerPatch = 64,
-    Layers = {},
     Labels = {
       Enabled = false,
       FileName = labelsPath .. "titan.labels",
diff --git a/data/assets/scene/solarsystem/planets/uranus/inner_moons.asset b/data/assets/scene/solarsystem/planets/uranus/inner_moons.asset
index cfbb9bdd74..a04d610317 100644
--- a/data/assets/scene/solarsystem/planets/uranus/inner_moons.asset
+++ b/data/assets/scene/solarsystem/planets/uranus/inner_moons.asset
@@ -16,9 +16,7 @@ local Cordelia = {
   },
   Renderable = {
     Type = "RenderableGlobe",
-    Radii = { 40000, 40000, 40000 },
-    SegmentsPerPatch = 64,
-    Layers = {}
+    Radii = { 40000, 40000, 40000 }
   },
   Tag = {
     "moon_solarSystem",
@@ -98,9 +96,7 @@ local Ophelia = {
   },
   Renderable = {
     Type = "RenderableGlobe",
-    Radii = { 43000, 43000, 43000 },
-    SegmentsPerPatch = 64,
-    Layers = {}
+    Radii = { 43000, 43000, 43000 }
   },
   Tag = {
     "moon_solarSystem",
@@ -180,9 +176,7 @@ local Bianca = {
   },
   Renderable = {
     Type = "RenderableGlobe",
-    Radii = { 64000, 46000, 46000 },
-    SegmentsPerPatch = 64,
-    Layers = {}
+    Radii = { 64000, 46000, 46000 }
   },
   Tag = {
     "moon_solarSystem",
@@ -262,9 +256,7 @@ local Cressida = {
   },
   Renderable = {
     Type = "RenderableGlobe",
-    Radii = { 80000, 80000, 80000 },
-    SegmentsPerPatch = 64,
-    Layers = {}
+    Radii = { 80000, 80000, 80000 }
   },
   Tag = {
     "moon_solarSystem",
@@ -344,9 +336,7 @@ local Desdemona = {
   },
   Renderable = {
     Type = "RenderableGlobe",
-    Radii = { 64000, 64000, 64000 },
-    SegmentsPerPatch = 64,
-    Layers = {}
+    Radii = { 64000, 64000, 64000 }
   },
   Tag = {
     "moon_solarSystem",
@@ -426,9 +416,7 @@ local Juliet = {
   },
   Renderable = {
     Type = "RenderableGlobe",
-    Radii = { 94000, 94000, 94000 },
-    SegmentsPerPatch = 64,
-    Layers = {}
+    Radii = { 94000, 94000, 94000 }
   },
   Tag = {
     "moon_solarSystem",
@@ -508,9 +496,7 @@ local Portia = {
   },
   Renderable = {
     Type = "RenderableGlobe",
-    Radii = { 135000, 135000, 135000 },
-    SegmentsPerPatch = 64,
-    Layers = {}
+    Radii = { 135000, 135000, 135000 }
   },
   Tag = {
     "moon_solarSystem",
@@ -590,9 +576,7 @@ local Rosalind = {
   },
   Renderable = {
     Type = "RenderableGlobe",
-    Radii = { 72000, 72000, 72000 },
-    SegmentsPerPatch = 64,
-    Layers = {}
+    Radii = { 72000, 72000, 72000 }
   },
   Tag = {
     "moon_solarSystem",
@@ -672,9 +656,7 @@ local Cupid = {
   },
   Renderable = {
     Type = "RenderableGlobe",
-    Radii = { 18000, 18000, 18000 },
-    SegmentsPerPatch = 64,
-    Layers = {}
+    Radii = { 18000, 18000, 18000 }
   },
   Tag = {
     "moon_solarSystem",
@@ -754,9 +736,7 @@ local Belinda = {
   },
   Renderable = {
     Type = "RenderableGlobe",
-    Radii = { 90000, 90000, 90000 },
-    SegmentsPerPatch = 64,
-    Layers = {}
+    Radii = { 90000, 90000, 90000 }
   },
   Tag = {
     "moon_solarSystem",
@@ -836,9 +816,7 @@ local Perdita = {
   },
   Renderable = {
     Type = "RenderableGlobe",
-    Radii = { 30000, 30000, 30000 },
-    SegmentsPerPatch = 64,
-    Layers = {}
+    Radii = { 30000, 30000, 30000 }
   },
   Tag = {
     "moon_solarSystem",
@@ -918,9 +896,7 @@ local Puck = {
   },
   Renderable = {
     Type = "RenderableGlobe",
-    Radii = { 162000, 162000, 162000 },
-    SegmentsPerPatch = 64,
-    Layers = {}
+    Radii = { 162000, 162000, 162000 }
   },
   Tag = {
     "moon_solarSystem",
@@ -1000,9 +976,7 @@ local Mab = {
   },
   Renderable = {
     Type = "RenderableGlobe",
-    Radii = { 25000, 25000, 25000 },
-    SegmentsPerPatch = 64,
-    Layers = {}
+    Radii = { 25000, 25000, 25000 }
   },
   Tag = {
     "moon_solarSystem",
diff --git a/data/assets/scene/solarsystem/planets/uranus/irregular_prograde_moons.asset b/data/assets/scene/solarsystem/planets/uranus/irregular_prograde_moons.asset
index befda39237..dd68a69582 100644
--- a/data/assets/scene/solarsystem/planets/uranus/irregular_prograde_moons.asset
+++ b/data/assets/scene/solarsystem/planets/uranus/irregular_prograde_moons.asset
@@ -16,9 +16,7 @@ local Margaret = {
   },
   Renderable = {
     Type = "RenderableGlobe",
-    Radii = { 20000, 20000, 20000 },
-    SegmentsPerPatch = 64,
-    Layers = {}
+    Radii = { 20000, 20000, 20000 }
   },
   Tag = {
     "moon_solarSystem",
diff --git a/data/assets/scene/solarsystem/planets/uranus/irregular_retrograde_moons.asset b/data/assets/scene/solarsystem/planets/uranus/irregular_retrograde_moons.asset
index 352663a653..f60afa381f 100644
--- a/data/assets/scene/solarsystem/planets/uranus/irregular_retrograde_moons.asset
+++ b/data/assets/scene/solarsystem/planets/uranus/irregular_retrograde_moons.asset
@@ -16,9 +16,7 @@ local Francisco = {
   },
   Renderable = {
     Type = "RenderableGlobe",
-    Radii = { 22000, 22000, 22000 },
-    SegmentsPerPatch = 64,
-    Layers = {}
+    Radii = { 22000, 22000, 22000 }
   },
   Tag = {
     "moon_solarSystem",
@@ -98,9 +96,7 @@ local Caliban = {
   },
   Renderable = {
     Type = "RenderableGlobe",
-    Radii = { 72000, 72000, 72000 },
-    SegmentsPerPatch = 64,
-    Layers = {}
+    Radii = { 72000, 72000, 72000 }
   },
   Tag = {
     "moon_solarSystem",
@@ -180,9 +176,7 @@ local Stephano = {
   },
   Renderable = {
     Type = "RenderableGlobe",
-    Radii = { 32000, 32000, 32000 },
-    SegmentsPerPatch = 64,
-    Layers = {}
+    Radii = { 32000, 32000, 32000 }
   },
   Tag = {
     "moon_solarSystem",
@@ -262,9 +256,7 @@ local Trinculo = {
   },
   Renderable = {
     Type = "RenderableGlobe",
-    Radii = { 18000, 18000, 18000 },
-    SegmentsPerPatch = 64,
-    Layers = {}
+    Radii = { 18000, 18000, 18000 }
   },
   Tag = {
     "moon_solarSystem",
@@ -344,9 +336,7 @@ local Sycorax = {
   },
   Renderable = {
     Type = "RenderableGlobe",
-    Radii = { 165000, 165000, 165000 },
-    SegmentsPerPatch = 64,
-    Layers = {}
+    Radii = { 165000, 165000, 165000 }
   },
   Tag = {
     "moon_solarSystem",
@@ -426,9 +416,7 @@ local Prospero = {
   },
   Renderable = {
     Type = "RenderableGlobe",
-    Radii = { 50000, 50000, 50000 },
-    SegmentsPerPatch = 64,
-    Layers = {}
+    Radii = { 50000, 50000, 50000 }
   },
   Tag = {
     "moon_solarSystem",
@@ -508,9 +496,7 @@ local Setebos = {
   },
   Renderable = {
     Type = "RenderableGlobe",
-    Radii = { 48000, 48000, 48000 },
-    SegmentsPerPatch = 64,
-    Layers = {}
+    Radii = { 48000, 48000, 48000 }
   },
   Tag = {
     "moon_solarSystem",
@@ -590,9 +576,7 @@ local Ferdinand = {
   },
   Renderable = {
     Type = "RenderableGlobe",
-    Radii = { 20000, 20000, 20000 },
-    SegmentsPerPatch = 64,
-    Layers = {}
+    Radii = { 20000, 20000, 20000 }
   },
   Tag = {
     "moon_solarSystem",
diff --git a/data/assets/scene/solarsystem/planets/uranus/major_moons.asset b/data/assets/scene/solarsystem/planets/uranus/major_moons.asset
index aeb951759e..4764b2d179 100644
--- a/data/assets/scene/solarsystem/planets/uranus/major_moons.asset
+++ b/data/assets/scene/solarsystem/planets/uranus/major_moons.asset
@@ -16,9 +16,7 @@ local Miranda = {
   },
   Renderable = {
     Type = "RenderableGlobe",
-    Radii = { 471600, 468000, 466000 },
-    SegmentsPerPatch = 64,
-    Layers = {}
+    Radii = { 471600, 468000, 466000 }
   },
   Tag = { "moon_solarSystem", "moon_giants", "moon_uranus", "moon_major", "moon_major_uranus" },
   GUI = {
@@ -85,9 +83,7 @@ local Ariel = {
   },
   Renderable = {
     Type = "RenderableGlobe",
-    Radii = { 1162000, 1156000, 1155000 },
-    SegmentsPerPatch = 64,
-    Layers = {}
+    Radii = { 1162000, 1156000, 1155000 }
   },
   Tag = { "moon_solarSystem", "moon_giants", "moon_uranus", "moon_major", "moon_major_uranus" },
   GUI = {
@@ -154,9 +150,7 @@ local Umbriel = {
   },
   Renderable = {
     Type = "RenderableGlobe",
-    Radii = { 1169400, 1169400, 1169400 },
-    SegmentsPerPatch = 64,
-    Layers = {}
+    Radii = { 1169400, 1169400, 1169400 }
   },
   Tag = { "moon_solarSystem", "moon_giants", "moon_uranus", "moon_major", "moon_major_uranus" },
   GUI = {
@@ -223,9 +217,7 @@ local Titania = {
   },
   Renderable = {
     Type = "RenderableGlobe",
-    Radii = { 1576800, 1576800, 1576800 },
-    SegmentsPerPatch = 64,
-    Layers = {}
+    Radii = { 1576800, 1576800, 1576800 }
   },
   Tag = { "moon_solarSystem", "moon_giants", "moon_uranus", "moon_major", "moon_major_uranus" },
   GUI = {
@@ -292,9 +284,7 @@ local Oberon = {
   },
   Renderable = {
     Type = "RenderableGlobe",
-    Radii = { 1522800, 1522800, 1522800 },
-    SegmentsPerPatch = 64,
-    Layers = {}
+    Radii = { 1522800, 1522800, 1522800 }
   },
   Tag = { "moon_solarSystem", "moon_giants", "moon_uranus", "moon_major", "moon_major_uranus" },
   GUI = {
diff --git a/data/assets/scene/solarsystem/planets/uranus/uranus.asset b/data/assets/scene/solarsystem/planets/uranus/uranus.asset
index 305994ba31..4b0fa6fc17 100644
--- a/data/assets/scene/solarsystem/planets/uranus/uranus.asset
+++ b/data/assets/scene/solarsystem/planets/uranus/uranus.asset
@@ -21,9 +21,7 @@ local Uranus = {
   },
   Renderable = {
     Type = "RenderableGlobe",
-    Radii = { 25559000, 25559000, 24973000 },
-    SegmentsPerPatch = 64,
-    Layers = {}
+    Radii = { 25559000, 25559000, 24973000 }
   },
   Tag = { "planet_solarSystem", "planet_giants" },
   GUI = {
diff --git a/data/assets/scene/solarsystem/planets/venus/venus.asset b/data/assets/scene/solarsystem/planets/venus/venus.asset
index 5f9bafcccd..8f5ad01181 100644
--- a/data/assets/scene/solarsystem/planets/venus/venus.asset
+++ b/data/assets/scene/solarsystem/planets/venus/venus.asset
@@ -31,8 +31,6 @@ local Venus = {
     Type = "RenderableGlobe",
     --Radii = { 6051900.0, 6051900.0, 6051800.0 },
     Radii = { 6051900.0, 6051900.0, 6051900.0 },
-    SegmentsPerPatch = 64,
-    Layers = {},
     Labels = {
       Enabled = false,
       FileName = labelsPath .. "venus.labels",
diff --git a/data/assets/scene/solarsystem/sun/sun.asset b/data/assets/scene/solarsystem/sun/sun.asset
index 646d457512..1d09d395e3 100644
--- a/data/assets/scene/solarsystem/sun/sun.asset
+++ b/data/assets/scene/solarsystem/sun/sun.asset
@@ -9,8 +9,6 @@ local Sun = {
     Type = "RenderableGlobe",
     Enabled = false,
     Radii = { 695700000, 695700000, 695700000 },
-    SegmentsPerPatch = 64,
-    Layers = {},
     LightSource = {
       Identifier = "Camera",
       Type = "CameraLightSource",
diff --git a/modules/exoplanets/exoplanetsmodule_lua.inl b/modules/exoplanets/exoplanetsmodule_lua.inl
index 2a12c3ddb5..18c123f164 100644
--- a/modules/exoplanets/exoplanetsmodule_lua.inl
+++ b/modules/exoplanets/exoplanetsmodule_lua.inl
@@ -184,7 +184,6 @@ void createExoplanetSystem(const std::string& starName,
     const std::string starGlobeRenderableString = "Renderable = {"
         "Type = 'RenderableGlobe',"
         "Radii = " + std::to_string(radiusInMeter) + ","
-        "SegmentsPerPatch = 64,"
         "PerformShading = false,"
         "Layers = {"
             "ColorLayers = { " + colorLayers + "}"
@@ -294,7 +293,6 @@ void createExoplanetSystem(const std::string& starName,
                 "Type = 'RenderableGlobe',"
                 "Enabled = " + enabled + ","
                 "Radii = " + std::to_string(planetRadius) + "," // in meters
-                "SegmentsPerPatch = 64,"
                 "PerformShading = true,"
                 "Layers = {},"
                 "LightSourceNode = '" + starIdentifier + "'"
diff --git a/modules/globebrowsing/src/renderableglobe.cpp b/modules/globebrowsing/src/renderableglobe.cpp
index 8893773738..e223a9da50 100644
--- a/modules/globebrowsing/src/renderableglobe.cpp
+++ b/modules/globebrowsing/src/renderableglobe.cpp
@@ -280,7 +280,7 @@ namespace {
         std::optional<bool> renderAtDistance;
 
         // A list of layers that should be added to the globe.
-        std::map<std::string, ghoul::Dictionary> layers
+        std::optional<std::map<std::string, ghoul::Dictionary>> layers
             [[codegen::reference("globebrowsing_layermanager")]];
 
         // Specifies information about planetary labels that can be rendered on the
@@ -633,8 +633,13 @@ RenderableGlobe::RenderableGlobe(const ghoul::Dictionary& dictionary)
     // @TODO (abock, 2021-03-25) The layermanager should be changed to take a
     // std::map<std::string, ghoul::Dictionary> instead and then we don't need to get it
     // as a bare dictionary anymore and can use the value from the struct directly
-    const ghoul::Dictionary layersDict = dictionary.value<ghoul::Dictionary>("Layers");
-    _layerManager.initialize(layersDict);
+    if (dictionary.hasValue<ghoul::Dictionary>("Layers")) {
+        const ghoul::Dictionary dict = dictionary.value<ghoul::Dictionary>("Layers");
+        _layerManager.initialize(dict);
+    }
+    else {
+        _layerManager.initialize(ghoul::Dictionary());
+    }
 
     addProperty(Fadeable::_opacity);
     addProperty(_generalProperties.performShading);

From a8ab74c9b7b231cde96b7654dd0c2b4f09c573c8 Mon Sep 17 00:00:00 2001
From: Alexander Bock <mail@alexanderbock.eu>
Date: Sat, 22 Jun 2024 17:34:36 +0200
Subject: [PATCH 518/701] Update SGCT to get reduced number of capture threads

---
 apps/OpenSpace/ext/sgct | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/apps/OpenSpace/ext/sgct b/apps/OpenSpace/ext/sgct
index 206307c1e3..56fd7b639e 160000
--- a/apps/OpenSpace/ext/sgct
+++ b/apps/OpenSpace/ext/sgct
@@ -1 +1 @@
-Subproject commit 206307c1e3282a2e09e01cd763af74d36311d23b
+Subproject commit 56fd7b639e62a96283b40d29ff745a131c46aab0

From d020f9ef4ec577431b5a3272ecdee4594bcb5e53 Mon Sep 17 00:00:00 2001
From: Alexander Bock <mail@alexanderbock.eu>
Date: Sun, 23 Jun 2024 14:30:28 -0400
Subject: [PATCH 519/701] Update SGCT repository to fix compile issue

---
 apps/OpenSpace/ext/sgct | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/apps/OpenSpace/ext/sgct b/apps/OpenSpace/ext/sgct
index 56fd7b639e..e8392b5d27 160000
--- a/apps/OpenSpace/ext/sgct
+++ b/apps/OpenSpace/ext/sgct
@@ -1 +1 @@
-Subproject commit 56fd7b639e62a96283b40d29ff745a131c46aab0
+Subproject commit e8392b5d271624ef421b46e000c13f5008299e4e

From 5f43b7c60014ebb5425a45bfe197b374d7cf9eef Mon Sep 17 00:00:00 2001
From: Mathis Brossier <mathis.brossier@gmail.com>
Date: Mon, 24 Jun 2024 19:31:15 +0200
Subject: [PATCH 520/701] Fix parsing TLE files with CRLF line endings on unix
 (#3326)

Co-authored-by: Mathis Brossier <matbr31@liu.se>
---
 src/util/spicemanager_lua.inl | 21 ++++++++++++++-------
 1 file changed, 14 insertions(+), 7 deletions(-)

diff --git a/src/util/spicemanager_lua.inl b/src/util/spicemanager_lua.inl
index c7af06d963..06d104bf12 100644
--- a/src/util/spicemanager_lua.inl
+++ b/src/util/spicemanager_lua.inl
@@ -23,6 +23,7 @@
  ****************************************************************************************/
 
 #include <ghoul/misc/stringhelper.h>
+#include <ios>
 
 namespace {
 
@@ -180,7 +181,7 @@ namespace {
     //
     // Load the TLE file
     //
-    std::ifstream f = std::ifstream(tle);
+    std::ifstream f = std::ifstream(tle, std::ios::binary);
     std::string contents = std::string(
         std::istreambuf_iterator<char>(f),
         std::istreambuf_iterator<char>()
@@ -188,8 +189,15 @@ namespace {
 
     // The TLE files returned by Celestrak are of the 3-line variant where the first line
     // contains a human-readable name for the spacecraft
+    // files are encoded with Windows line endings (CRLF)
 
     std::vector<std::string> lines = ghoul::tokenizeString(contents, '\n');
+
+    // erase carriage return characters
+    for (std::string& line : lines) {
+        line.erase(std::remove(begin(line), end(line), '\r'), end(line));
+    }
+
     const size_t nElements = lines.size() / 3;
     if (elementToExtract > nElements) {
         throw ghoul::RuntimeError(std::format(
@@ -198,18 +206,17 @@ namespace {
         ));
     }
 
-    constexpr int TLEColumnWidth = 70;
+    constexpr int TLEColumnWidth = 69;
 
-    // It should be 70, but we're removing the \n character at the end in the tokenization
     std::string line1 = lines[3 * elementToExtract + 1];
-    if (line1.size() != TLEColumnWidth - 1) {
+    if (line1.size() != TLEColumnWidth) {
         throw ghoul::RuntimeError(std::format(
             "Illformed TLE file {}, expected {} characters per line, got {}",
             tle, TLEColumnWidth, line1.size()
         ));
     }
     std::string line2 = lines[3 * elementToExtract + 2];
-    if (line2.size() != TLEColumnWidth - 1) {
+    if (line2.size() != TLEColumnWidth) {
         throw ghoul::RuntimeError(std::format(
             "Illformed TLE file {}, expected {} characters per line, got {}",
             tle, TLEColumnWidth, line2.size()
@@ -217,7 +224,7 @@ namespace {
     }
 
     // Copy the lines into a format that SPICE understands
-    SpiceChar spiceLines[2][TLEColumnWidth];
+    SpiceChar spiceLines[2][TLEColumnWidth + 1];
     std::strcpy(spiceLines[0], line1.c_str());
     std::strcpy(spiceLines[1], line2.c_str());
 
@@ -225,7 +232,7 @@ namespace {
     // Convert the Two Line Elements lines to the element sets
     SpiceDouble epoch;
     std::array<SpiceDouble, 10> elems;
-    getelm_c(1950, TLEColumnWidth, spiceLines, &epoch, elems.data());
+    getelm_c(1950, TLEColumnWidth + 1, spiceLines, &epoch, elems.data());
 
     // The size of a type SPK10 spice kernel is not affected by the time validity, so we
     // just pick the greatest one

From 55e196e351b443007cc15aad7203686e85b7ff0e Mon Sep 17 00:00:00 2001
From: Alexander Bock <mail@alexanderbock.eu>
Date: Mon, 24 Jun 2024 14:06:57 -0400
Subject: [PATCH 521/701] Correctly consume char-based keyboard callbacks in
 the CEF module (closes #3290)

---
 modules/cefwebgui/src/guikeyboardhandler.cpp | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/modules/cefwebgui/src/guikeyboardhandler.cpp b/modules/cefwebgui/src/guikeyboardhandler.cpp
index 5def130e58..041caab579 100644
--- a/modules/cefwebgui/src/guikeyboardhandler.cpp
+++ b/modules/cefwebgui/src/guikeyboardhandler.cpp
@@ -38,6 +38,13 @@ GUIKeyboardHandler::GUIKeyboardHandler() {
             return isGuiWindow ? previous : false;
         }
     );
+    global::callback::character->emplace_back(
+        [this](unsigned int, KeyModifier, IsGuiWindow isGuiWindow) -> bool {
+            const bool previous = _keyConsumed;
+            _keyConsumed = false;
+            return isGuiWindow ? previous : false;
+        }
+    );
 }
 
 } // namespace openspace

From fcba068aca0311b4a637260b4017768f01e535ef Mon Sep 17 00:00:00 2001
From: Emma Broman <emma.broman@liu.se>
Date: Wed, 26 Jun 2024 10:44:09 +0200
Subject: [PATCH 522/701] Add a point cloud example that changes the point
 orientation (#3327)

* Add a point cloud example that changes the point orientation

Note that it is really difficult to see what is going on without a texture, so added a texture to this exmaple as well.

* Apply suggestions from code review

Co-authored-by: Alexander Bock <alexander.bock@liu.se>

* Update example identifier to be unique

---------

Co-authored-by: Alexander Bock <alexander.bock@liu.se>
---
 .../pointcloud_textured.asset                 |  2 +-
 ...intcloud_textured_facecameraposition.asset | 37 +++++++++++++++++++
 2 files changed, 38 insertions(+), 1 deletion(-)
 create mode 100644 data/assets/examples/renderable/renderablepointcloud/pointcloud_textured_facecameraposition.asset

diff --git a/data/assets/examples/renderable/renderablepointcloud/pointcloud_textured.asset b/data/assets/examples/renderable/renderablepointcloud/pointcloud_textured.asset
index 9545cee6ba..bcd41043bb 100644
--- a/data/assets/examples/renderable/renderablepointcloud/pointcloud_textured.asset
+++ b/data/assets/examples/renderable/renderablepointcloud/pointcloud_textured.asset
@@ -14,7 +14,7 @@ local Node = {
       -- the ${DATA} token to get the path to a texture in the "OpenSpace/data" folder,
       -- but for a file at a relative location it would also work to use asset.resource,
       -- like for the data file above
-      File = openspace.absPath("${DATA}/test3.jpg"),
+      File = openspace.absPath("${DATA}/test3.jpg")
     },
     -- Disable additive blending, so that points will be rendered with their actual color
     -- and overlapping points will be sorted by depth. This works best when the points
diff --git a/data/assets/examples/renderable/renderablepointcloud/pointcloud_textured_facecameraposition.asset b/data/assets/examples/renderable/renderablepointcloud/pointcloud_textured_facecameraposition.asset
new file mode 100644
index 0000000000..9d950ecfa3
--- /dev/null
+++ b/data/assets/examples/renderable/renderablepointcloud/pointcloud_textured_facecameraposition.asset
@@ -0,0 +1,37 @@
+-- Orientation - Face Camera Position
+-- This example creates a point cloud where the planes that make up the points are
+-- oriented to face the camera position, rather than the view direction (which is
+-- default). This means that the point will be layed out in a spherical way around the
+-- camera, which works better for spherical displays compared to the default
+-- orientation.
+--
+-- A texture is added so that we can more easily see how the orientation is altered.
+-- See Textured example for more details.
+
+local Node = {
+  Identifier = "RenderablePointCloud_Example_FaceCameraPosition",
+  Renderable = {
+    Type = "RenderablePointCloud",
+    File = asset.resource("data/dummydata.csv"),
+    -- Change the orientation render option to face the camera position instead
+    -- of its view direction
+    OrientationRenderOption = "Camera Position Normal",
+    -- Add a texture so we can more easily see how the orientation is changed
+    Texture = {
+      File = openspace.absPath("${DATA}/test3.jpg")
+    },
+    UseAdditiveBlending = false
+  },
+  GUI = {
+    Name = "RenderablePointCloud - Face Camera Position",
+    Path = "/Examples"
+  }
+}
+
+asset.onInitialize(function()
+  openspace.addSceneGraphNode(Node)
+end)
+
+asset.onDeinitialize(function()
+  openspace.removeSceneGraphNode(Node)
+end)

From 78e7c7e321617ba124b5152a05e862e587332b91 Mon Sep 17 00:00:00 2001
From: Alexander Bock <mail@alexanderbock.eu>
Date: Wed, 26 Jun 2024 21:12:09 -0400
Subject: [PATCH 523/701] Add the ability to scale th statistics graphs

---
 apps/OpenSpace/ext/sgct                    |  2 +-
 apps/OpenSpace/main.cpp                    |  3 +++
 include/openspace/engine/windowdelegate.h  |  2 ++
 include/openspace/rendering/renderengine.h |  1 +
 src/rendering/renderengine.cpp             | 18 ++++++++++++++++++
 5 files changed, 25 insertions(+), 1 deletion(-)

diff --git a/apps/OpenSpace/ext/sgct b/apps/OpenSpace/ext/sgct
index e8392b5d27..c68e7cf398 160000
--- a/apps/OpenSpace/ext/sgct
+++ b/apps/OpenSpace/ext/sgct
@@ -1 +1 @@
-Subproject commit e8392b5d271624ef421b46e000c13f5008299e4e
+Subproject commit c68e7cf398dbdeb181724f39787887623a9e5946
diff --git a/apps/OpenSpace/main.cpp b/apps/OpenSpace/main.cpp
index fdba7c8016..1528a1c0c8 100644
--- a/apps/OpenSpace/main.cpp
+++ b/apps/OpenSpace/main.cpp
@@ -992,6 +992,9 @@ void setSgctDelegateFunctions() {
 
         return mousePosition;
     };
+    sgctDelegate.setStatisticsGraphScale = [](float scale) {
+        sgct::Engine::instance().setStatsGraphScale(scale);
+    };
 }
 
 std::string setWindowConfigPresetForGui(const std::string& labelFromCfgFile,
diff --git a/include/openspace/engine/windowdelegate.h b/include/openspace/engine/windowdelegate.h
index 7bfda13217..f81be481cd 100644
--- a/include/openspace/engine/windowdelegate.h
+++ b/include/openspace/engine/windowdelegate.h
@@ -124,6 +124,8 @@ struct WindowDelegate {
 
     glm::vec2 (*mousePositionViewportRelative)(const glm::vec2& mousePosition) =
         [](const glm::vec2&) { return glm::vec2(0); };
+
+    void (*setStatisticsGraphScale)(float scale) = [](float) {};
 };
 
 } // namespace openspace
diff --git a/include/openspace/rendering/renderengine.h b/include/openspace/rendering/renderengine.h
index f4806efd97..032efebf69 100644
--- a/include/openspace/rendering/renderengine.h
+++ b/include/openspace/rendering/renderengine.h
@@ -187,6 +187,7 @@ private:
     properties::IntListProperty _screenshotWindowIds;
     properties::BoolProperty _applyWarping;
     properties::BoolProperty _showStatistics;
+    properties::FloatProperty _statisticsScale;
     properties::BoolProperty _screenshotUseDate;
     properties::BoolProperty _showFrameInformation;
     properties::BoolProperty _disableMasterRendering;
diff --git a/src/rendering/renderengine.cpp b/src/rendering/renderengine.cpp
index 7878152704..db8bf2ea75 100644
--- a/src/rendering/renderengine.cpp
+++ b/src/rendering/renderengine.cpp
@@ -146,6 +146,15 @@ namespace {
         openspace::properties::Property::Visibility::AdvancedUser
     };
 
+    constexpr openspace::properties::Property::PropertyInfo StatisticsScaleInfo = {
+        "StatisticsScale",
+        "Statistics Scale",
+        "This value is scaling the statatistics window by the provided amount. For flat "
+        "projections this is rarely necessary, but it is important when using a setup "
+        "where the cornders of the image are masked out.",
+        openspace::properties::Property::Visibility::AdvancedUser
+    };
+
     constexpr openspace::properties::Property::PropertyInfo ScreenshotUseDateInfo = {
         "ScreenshotUseDate",
         "Screenshot Folder uses Date",
@@ -313,6 +322,7 @@ RenderEngine::RenderEngine()
     , _screenshotWindowIds(ScreenshotWindowIdsInfo)
     , _applyWarping(ApplyWarpingInfo, false)
     , _showStatistics(ShowStatisticsInfo, false)
+    , _statisticsScale(StatisticsScaleInfo, 1.f, 0.f, 1.f)
     , _screenshotUseDate(ScreenshotUseDateInfo, false)
     , _showFrameInformation(ShowFrameNumberInfo, false)
     , _disableMasterRendering(DisableMasterInfo, false)
@@ -387,9 +397,17 @@ RenderEngine::RenderEngine()
 
     _showStatistics.onChange([this]() {
         global::windowDelegate->showStatistics(_showStatistics);
+        // We need to reset the scale as it is not updated when the statistics window is
+        // not currently shown
+        global::windowDelegate->setStatisticsGraphScale(_statisticsScale);
     });
     addProperty(_showStatistics);
 
+    _statisticsScale.onChange([this]() {
+        global::windowDelegate->setStatisticsGraphScale(_statisticsScale);
+    });
+    addProperty(_statisticsScale);
+
     _screenshotUseDate.onChange([this]() {
         // If there is no screenshot folder, don't bother with handling the change
         if (!FileSys.hasRegisteredToken("${STARTUP_SCREENSHOT}")) {

From 0707829c7bcec2da07ae0863248f26db3d313b17 Mon Sep 17 00:00:00 2001
From: Alexander Bock <alexander.bock@liu.se>
Date: Fri, 28 Jun 2024 14:16:06 +0200
Subject: [PATCH 524/701] Reducing compiler warnings (#3341)

---
 include/openspace/properties/propertyowner.h  |  6 +++---
 .../pointcloud/renderablepointcloud.cpp       | 20 +------------------
 modules/base/rendering/renderabletrail.cpp    |  4 ++--
 .../rendering/renderabletrailtrajectory.cpp   |  6 +++---
 .../rendering/renderabletrailtrajectory.h     |  2 --
 .../base/rendering/screenspaceframebuffer.cpp |  1 +
 .../rendering/renderabledebugplane.h          |  2 +-
 .../src/geojson/geojsoncomponent.h            |  1 -
 .../src/geojson/geojsonmanager.cpp            |  1 +
 .../src/geojson/geojsonproperties.cpp         |  2 +-
 .../src/tileprovider/defaulttileprovider.cpp  |  9 +--------
 .../rendering/renderableorbitalkepler.cpp     |  4 ++--
 modules/space/rendering/renderablestars.cpp   |  6 +++---
 .../space/rendering/renderabletravelspeed.cpp |  2 +-
 src/documentation/documentationengine.cpp     | 20 ++++++++-----------
 .../tasks/convertrecformattask.cpp            | 11 ----------
 src/util/boxgeometry.cpp                      |  4 ----
 17 files changed, 28 insertions(+), 73 deletions(-)

diff --git a/include/openspace/properties/propertyowner.h b/include/openspace/properties/propertyowner.h
index 70428667c8..80009b2392 100644
--- a/include/openspace/properties/propertyowner.h
+++ b/include/openspace/properties/propertyowner.h
@@ -52,9 +52,9 @@ public:
     static constexpr char URISeparator = '.';
 
     struct PropertyOwnerInfo {
-        std::string identifier;
-        std::string guiName;
-        std::string description;
+        std::string identifier = "";
+        std::string guiName = "";
+        std::string description = "";
     };
 
     /**
diff --git a/modules/base/rendering/pointcloud/renderablepointcloud.cpp b/modules/base/rendering/pointcloud/renderablepointcloud.cpp
index e8842b4a9b..4f144c7dd4 100644
--- a/modules/base/rendering/pointcloud/renderablepointcloud.cpp
+++ b/modules/base/rendering/pointcloud/renderablepointcloud.cpp
@@ -267,24 +267,6 @@ namespace {
         openspace::properties::Property::Visibility::AdvancedUser
     };
 
-    constexpr openspace::properties::Property::PropertyInfo SizeMappingEnabledInfo = {
-        "Enabled",
-        "Size Mapping Enabled",
-        "Decides whether size mapping should be enabled. If true and at least one column "
-        "was loaded as an option for size mapping, the chosen data column will be used "
-        "to scale the size of the points.",
-        openspace::properties::Property::Visibility::NoviceUser
-    };
-
-    constexpr openspace::properties::Property::PropertyInfo SizeMappingOptionInfo = {
-        "Parameter",
-        "Parameter Option",
-        "The name of a data parameter used for scaling of the points. The parameter "
-        "value will be used as a multiplicative factor to scale the size of the points. "
-        "Note that they may still be scaled by max size adjustment effects.",
-        openspace::properties::Property::Visibility::AdvancedUser
-    };
-
     constexpr openspace::properties::Property::PropertyInfo EnableOutlineInfo = {
         "EnableOutline",
         "Enable Point Outline",
@@ -653,8 +635,8 @@ RenderablePointCloud::RenderablePointCloud(const ghoul::Dictionary& dictionary)
     , _colorSettings(dictionary)
     , _fading(dictionary)
     , _useAdditiveBlending(UseAdditiveBlendingInfo, true)
-    , _drawElements(DrawElementsInfo, true)
     , _useRotation(UseOrientationDataInfo, false)
+    , _drawElements(DrawElementsInfo, true)
     , _renderOption(
         OrientationRenderOptionInfo,
         properties::OptionProperty::DisplayType::Dropdown
diff --git a/modules/base/rendering/renderabletrail.cpp b/modules/base/rendering/renderabletrail.cpp
index 207d026d9c..9cf7518ecd 100644
--- a/modules/base/rendering/renderabletrail.cpp
+++ b/modules/base/rendering/renderabletrail.cpp
@@ -186,14 +186,14 @@ RenderableTrail::Appearance::Appearance()
     })
     , lineColor(LineColorInfo, glm::vec3(1.f), glm::vec3(0.f), glm::vec3(1.f))
     , useLineFade(EnableFadeInfo, true)
-    , lineLength(LineLengthInfo, 1.f, 0.f, 1.f)
-    , lineFadeAmount(LineFadeAmountInfo, 1.f, 0.f, 1.f)
     , lineWidth(LineWidthInfo, 10.f, 1.f, 20.f)
     , pointSize(PointSizeInfo, 1, 1, 64)
     , renderingModes(
           RenderingModeInfo,
           properties::OptionProperty::DisplayType::Dropdown
     )
+    , lineLength(LineLengthInfo, 1.f, 0.f, 1.f)
+    , lineFadeAmount(LineFadeAmountInfo, 1.f, 0.f, 1.f)
 {
     renderingModes.addOptions({
         { RenderingModeLines, "Lines" },
diff --git a/modules/base/rendering/renderabletrailtrajectory.cpp b/modules/base/rendering/renderabletrailtrajectory.cpp
index 64c8647ea1..f664d8dbc2 100644
--- a/modules/base/rendering/renderabletrailtrajectory.cpp
+++ b/modules/base/rendering/renderabletrailtrajectory.cpp
@@ -156,16 +156,16 @@ documentation::Documentation RenderableTrailTrajectory::Documentation() {
 
 RenderableTrailTrajectory::RenderableTrailTrajectory(const ghoul::Dictionary& dictionary)
     : RenderableTrail(dictionary)
+    , _sweepChunkSize(SweepChunkSizeInfo, 200, 50, 5000)
+    , _enableSweepChunking(EnableSweepChunkingInfo, false)
     , _startTime(StartTimeInfo)
     , _endTime(EndTimeInfo)
     , _sampleInterval(SampleIntervalInfo, 2.0, 2.0, 1e6)
     , _timeStampSubsamplingFactor(TimeSubSampleInfo, 1, 1, 1000000000)
     , _renderFullTrail(RenderFullPathInfo, false)
+    , _numberOfReplacementPoints(AccurateTrailPositionsInfo, 100, 0, 1000)
     , _maxVertex(glm::vec3(-std::numeric_limits<float>::max()))
     , _minVertex(glm::vec3(std::numeric_limits<float>::max()))
-    , _sweepChunkSize(SweepChunkSizeInfo, 200, 50, 5000)
-    , _enableSweepChunking(EnableSweepChunkingInfo, false)
-    , _numberOfReplacementPoints(AccurateTrailPositionsInfo, 100, 0, 1000)
 {
     const Parameters p = codegen::bake<Parameters>(dictionary);
 
diff --git a/modules/base/rendering/renderabletrailtrajectory.h b/modules/base/rendering/renderabletrailtrajectory.h
index baab782c9a..86e7beed27 100644
--- a/modules/base/rendering/renderabletrailtrajectory.h
+++ b/modules/base/rendering/renderabletrailtrajectory.h
@@ -92,8 +92,6 @@ private:
     /// Dirty flag to determine whether the stride information needs to be changed
     bool _subsamplingIsDirty = true;
 
-    std::array<TrailVBOLayout<float>, 2> _auxiliaryVboData = {};
-
     /// The conversion of the _startTime into the internal time format
     double _start = 0.0;
     /// The conversion of the _endTime into the internal time format
diff --git a/modules/base/rendering/screenspaceframebuffer.cpp b/modules/base/rendering/screenspaceframebuffer.cpp
index 02071eb730..8437077e6b 100644
--- a/modules/base/rendering/screenspaceframebuffer.cpp
+++ b/modules/base/rendering/screenspaceframebuffer.cpp
@@ -48,6 +48,7 @@ documentation::Documentation ScreenSpaceFramebuffer::Documentation() {
     return {
         "ScreenSpaceFramebuffer",
         "base_screenspace_framebuffer",
+        "",
         {}
     };
 }
diff --git a/modules/debugging/rendering/renderabledebugplane.h b/modules/debugging/rendering/renderabledebugplane.h
index 161908ae0c..9ff16d651e 100644
--- a/modules/debugging/rendering/renderabledebugplane.h
+++ b/modules/debugging/rendering/renderabledebugplane.h
@@ -33,7 +33,7 @@ class RenderableDebugPlane : public RenderablePlane {
 public:
     RenderableDebugPlane(const ghoul::Dictionary& dictionary);
 
-    bool isReady() const;
+    bool isReady() const override;
 
     static documentation::Documentation Documentation();
 
diff --git a/modules/globebrowsing/src/geojson/geojsoncomponent.h b/modules/globebrowsing/src/geojson/geojsoncomponent.h
index c33107855c..81c53c1d9c 100644
--- a/modules/globebrowsing/src/geojson/geojsoncomponent.h
+++ b/modules/globebrowsing/src/geojson/geojsoncomponent.h
@@ -141,7 +141,6 @@ private:
 
     bool _dataIsDirty = true;
     bool _heightOffsetIsDirty = false;
-    bool _dataIsInitialized = false;
     bool _textureIsDirty = false;
 
     properties::Vec2Property _centerLatLong;
diff --git a/modules/globebrowsing/src/geojson/geojsonmanager.cpp b/modules/globebrowsing/src/geojson/geojsonmanager.cpp
index 3a6dc63545..c0a4c61f2a 100644
--- a/modules/globebrowsing/src/geojson/geojsonmanager.cpp
+++ b/modules/globebrowsing/src/geojson/geojsonmanager.cpp
@@ -41,6 +41,7 @@ documentation::Documentation GeoJsonManager::Documentation() {
     return {
         "GeoJsonManager",
         "globebrowsing_geojsonmanager",
+        "",
         {}
     };
 }
diff --git a/modules/globebrowsing/src/geojson/geojsonproperties.cpp b/modules/globebrowsing/src/geojson/geojsonproperties.cpp
index b4f358fee1..98fdd97c1c 100644
--- a/modules/globebrowsing/src/geojson/geojsonproperties.cpp
+++ b/modules/globebrowsing/src/geojson/geojsonproperties.cpp
@@ -61,7 +61,7 @@ namespace geojson::propertykeys {
     constexpr std::string_view TessellationMaxDistance = "tessellationDistance";
 
     constexpr std::string_view AltitudeMode = "altitudeMode";
-    constexpr std::string_view AltitudeModeClamp = "clampToGround";
+    //constexpr std::string_view AltitudeModeClamp = "clampToGround";
     constexpr std::string_view AltitudeModeAbsolute = "absolute";
     constexpr std::string_view AltitudeModeRelative = "relativeToGround";
 
diff --git a/modules/globebrowsing/src/tileprovider/defaulttileprovider.cpp b/modules/globebrowsing/src/tileprovider/defaulttileprovider.cpp
index 4dc51a7e41..ab1ee7b025 100644
--- a/modules/globebrowsing/src/tileprovider/defaulttileprovider.cpp
+++ b/modules/globebrowsing/src/tileprovider/defaulttileprovider.cpp
@@ -50,13 +50,6 @@ namespace {
         openspace::properties::Property::Visibility::AdvancedUser
     };
 
-    constexpr openspace::properties::Property::PropertyInfo CompressionInfo = {
-        "Compression",
-        "Compression Algorithm",
-        "The compression algorithm to use for MRF cached tiles.",
-        openspace::properties::Property::Visibility::AdvancedUser
-    };
-
     enum class [[codegen::stringify()]] Compression {
         PNG = 0,
         JPEG,
@@ -88,7 +81,7 @@ namespace {
             // Specifies whether to use caching or not
             std::optional<bool> enabled;
 
-            // [[codegen::verbatim(CompressionInfo.description)]]
+            // The compression algorithm to use for MRF cached tiles
             enum class [[codegen::map(Compression)]] Compression {
                 PNG = 0,
                 JPEG,
diff --git a/modules/space/rendering/renderableorbitalkepler.cpp b/modules/space/rendering/renderableorbitalkepler.cpp
index 7fa6033957..4ab04176e8 100644
--- a/modules/space/rendering/renderableorbitalkepler.cpp
+++ b/modules/space/rendering/renderableorbitalkepler.cpp
@@ -257,13 +257,13 @@ RenderableOrbitalKepler::Appearance::Appearance()
     , color(ColorInfo, glm::vec3(1.f), glm::vec3(0.f), glm::vec3(1.f))
     , trailWidth(TrailWidthInfo, 2.f, 1.f, 20.f)
     , pointSizeExponent(PointSizeExponentInfo, 1.0f, 0.f, 11.f)
+    , enableMaxSize(EnableMaxSizeInfo, true)
+    , maxSize(MaxSizeInfo, 5.f, 0.f, 45.f)
     , renderingModes(
         RenderingModeInfo,
         properties::OptionProperty::DisplayType::Dropdown
     )
     , trailFade(TrailFadeInfo, 20.f, 0.f, 30.f)
-    , enableMaxSize(EnableMaxSizeInfo, true)
-    , maxSize(MaxSizeInfo, 5.f, 0.f, 45.f)
     , enableOutline(EnableOutlineInfo, true)
     , outlineColor(OutlineColorInfo, glm::vec3(0.f), glm::vec3(0.f), glm::vec3(1.f))
     , outlineWidth(OutlineWidthInfo, 0.2f, 0.f, 1.f)
diff --git a/modules/space/rendering/renderablestars.cpp b/modules/space/rendering/renderablestars.cpp
index 3d31c916d4..bae9fe64c5 100644
--- a/modules/space/rendering/renderablestars.cpp
+++ b/modules/space/rendering/renderablestars.cpp
@@ -446,21 +446,21 @@ RenderableStars::RenderableStars(const ghoul::Dictionary& dictionary)
     )
     , _fixedColor(FixedColorInfo, glm::vec3(1.f), glm::vec3(0.f), glm::vec3(1.f))
     , _filterOutOfRange(FilterOutOfRangeInfo, false)
-    , _core{
+    , _core {
         properties::PropertyOwner(CoreOwnerInfo),
         properties::StringProperty(TextureInfo),
         properties::FloatProperty(MultiplierInfo, 1.f, 0.f, 20.f),
         properties::FloatProperty(GammaInfo, 1.f, 0.f, 5.f),
         properties::FloatProperty(ScaleInfo, 1.f, 0.f, 1.f)
     }
-    , _glare{
+    , _glare {
         properties::PropertyOwner(GlareOwnerInfo),
         properties::StringProperty(TextureInfo),
         properties::FloatProperty(MultiplierInfo, 1.f, 0.f, 20.f),
         properties::FloatProperty(GammaInfo, 1.f, 0.f, 5.f),
         properties::FloatProperty(ScaleInfo, 1.f, 0.f, 1.f)
     }
-    , _parameters{
+    , _parameters {
         properties::PropertyOwner(SizeCompositionInfo),
         properties::OptionProperty(
             SizeCompositionMethodInfo,
diff --git a/modules/space/rendering/renderabletravelspeed.cpp b/modules/space/rendering/renderabletravelspeed.cpp
index 19eaa6fff6..d143d8d264 100644
--- a/modules/space/rendering/renderabletravelspeed.cpp
+++ b/modules/space/rendering/renderabletravelspeed.cpp
@@ -101,7 +101,7 @@ namespace {
     // selected speed.
     struct [[codegen::Dictionary(RenderableTravelSpeed)]] Parameters {
         // [[codegen::verbatim(TargetInfo.description)]]
-        std::string target [[codegen::identifier()]];;
+        std::string target [[codegen::identifier()]];
 
         // [[codegen::verbatim(SpeedInfo.description)]]
         std::optional<double> travelSpeed [[codegen::greater(0.f)]];
diff --git a/src/documentation/documentationengine.cpp b/src/documentation/documentationengine.cpp
index 4e406eae29..044ab77bb8 100644
--- a/src/documentation/documentationengine.cpp
+++ b/src/documentation/documentationengine.cpp
@@ -50,8 +50,6 @@
 #include <future>
 
 namespace {
-    constexpr std::string_view _loggerCat = "DocumentationEngine";
-
     // General keys
     constexpr const char* NameKey = "name";
     constexpr const char* IdentifierKey = "identifier";
@@ -68,12 +66,10 @@ namespace {
     constexpr const char* CommandKey = "command";
 
     // Factory
-    constexpr const char* FactoryTitle = "Asset Components";
     constexpr const char* MembersKey = "members";
     constexpr const char* OptionalKey = "optional";
     constexpr const char* ReferenceKey = "reference";
     constexpr const char* FoundKey = "found";
-    constexpr const char* RestrictionsKey = "restrictions";
     constexpr const char* ClassesKey = "classes";
 
     constexpr const char* OtherName = "Other";
@@ -90,7 +86,6 @@ namespace {
     constexpr const char* UriKey = "uri";
 
     // Scripting
-    constexpr const char* ScriptingTitle = "Scripting API";
     constexpr const char* DefaultValueKey = "defaultValue";
     constexpr const char* ArgumentsKey = "arguments";
     constexpr const char* ReturnTypeKey = "returnType";
@@ -116,7 +111,6 @@ namespace {
     constexpr const char* AuthorKey = "author";
     constexpr const char* UrlKey = "url";
     constexpr const char* LicenseKey = "license";
-    constexpr const char* NoLicenseKey = "noLicense";
     constexpr const char* IdentifiersKey = "identifiers";
     constexpr const char* PathKey = "path";
     constexpr const char* AssetKey = "assets";
@@ -131,17 +125,19 @@ namespace {
     constexpr const char* FiltersKey = "filters";
     constexpr const char* ActionsKey = "actions";
 
-    nlohmann::json documentationToJson(const openspace::documentation::Documentation& d) {
+    nlohmann::json documentationToJson(
+                             const openspace::documentation::Documentation& documentation)
+    {
         using namespace openspace::documentation;
 
         nlohmann::json json;
 
-        json[NameKey] = d.name;
-        json[IdentifierKey] = d.id;
-        json[DescriptionKey] = d.description;
+        json[NameKey] = documentation.name;
+        json[IdentifierKey] = documentation.id;
+        json[DescriptionKey] = documentation.description;
         json[MembersKey] = nlohmann::json::array();
 
-        for (const DocumentationEntry& p : d.entries) {
+        for (const DocumentationEntry& p : documentation.entries) {
             nlohmann::json entry;
             entry[NameKey] = p.key;
             entry[OptionalKey] = p.optional.value;
@@ -156,7 +152,7 @@ namespace {
                 auto it = std::find_if(
                     doc.begin(),
                     doc.end(),
-                    [rv](const Documentation& doc) { return doc.id == rv->identifier; }
+                    [rv](const Documentation& d) { return d.id == rv->identifier; }
                 );
 
                 if (it == doc.end()) {
diff --git a/src/interaction/tasks/convertrecformattask.cpp b/src/interaction/tasks/convertrecformattask.cpp
index 5730487bfa..52c7e47def 100644
--- a/src/interaction/tasks/convertrecformattask.cpp
+++ b/src/interaction/tasks/convertrecformattask.cpp
@@ -39,17 +39,6 @@ namespace {
 
     constexpr std::string_view KeyInFilePath = "InputFilePath";
     constexpr std::string_view KeyOutFilePath = "OutputFilePath";
-
-    std::string addFileSuffix(const std::string& filePath, const std::string& suffix) {
-        const size_t lastdot = filePath.find_last_of('.');
-        const std::string extension = filePath.substr(0, lastdot);
-        if (lastdot == std::string::npos) {
-            return filePath + suffix;
-        }
-        else {
-            return filePath.substr(0, lastdot) + suffix + extension;
-        }
-    }
 } // namespace
 
 namespace openspace::interaction {
diff --git a/src/util/boxgeometry.cpp b/src/util/boxgeometry.cpp
index 335eefb264..f9c87ec804 100644
--- a/src/util/boxgeometry.cpp
+++ b/src/util/boxgeometry.cpp
@@ -28,10 +28,6 @@
 #include <ghoul/opengl/ghoul_gl.h>
 #include <string>
 
-namespace {
-    constexpr std::string_view _loggerCat = "BoxGeometry";
-} // namespace
-
 namespace openspace {
 
 BoxGeometry::BoxGeometry(glm::vec3 size) : _size(std::move(size)) {}

From f04a383921bd3dc3360d5c1a827630acb754a63d Mon Sep 17 00:00:00 2001
From: Andreas Engberg <adde.engberg@gmail.com>
Date: Wed, 3 Jul 2024 11:28:28 +0200
Subject: [PATCH 525/701] Specifies which filepath or directory path is faulty
 on asset verification

---
 src/documentation/verifier.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/documentation/verifier.cpp b/src/documentation/verifier.cpp
index 41a0b294dc..7c85cecbdc 100644
--- a/src/documentation/verifier.cpp
+++ b/src/documentation/verifier.cpp
@@ -267,7 +267,7 @@ TestResult FileVerifier::operator()(const ghoul::Dictionary& dict,
         TestResult::Offense o = {
             .offender = key,
             .reason = TestResult::Offense::Reason::Verification,
-            .explanation = "File did not exist"
+            .explanation = std::format("File '{}' did not exist", file)
         };
         res.offenses.push_back(std::move(o));
     }
@@ -294,7 +294,7 @@ TestResult DirectoryVerifier::operator()(const ghoul::Dictionary& dict,
         TestResult::Offense o = {
             .offender = key,
             .reason = TestResult::Offense::Reason::Verification,
-            .explanation = "Directory did not exist"
+            .explanation = std::format("Directory '{}' did not exist", dir)
         };
         res.offenses.push_back(std::move(o));
     }

From 0e267895616190e24dd0aaff082426009f96f6fd Mon Sep 17 00:00:00 2001
From: Malin E <malin.ejdbo@gmail.com>
Date: Mon, 8 Jul 2024 08:45:53 -0400
Subject: [PATCH 526/701] Fix url sync  (#3345)

* Make URL sync more thread-safe with working mutex

* Address PR comments

---------

Co-authored-by: Alexander Bock <alexander.bock@liu.se>
---
 modules/sync/syncs/urlsynchronization.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/sync/syncs/urlsynchronization.h b/modules/sync/syncs/urlsynchronization.h
index 97169ce8c9..0128af6933 100644
--- a/modules/sync/syncs/urlsynchronization.h
+++ b/modules/sync/syncs/urlsynchronization.h
@@ -123,7 +123,7 @@ private:
     /// Determines how long the file is valid before it should be downloaded again
     double _secondsUntilResync = MaxDateAsJ2000;
 
-    mutable std::mutex _mutex;
+    inline static std::mutex _mutex;
 };
 
 } // namespace openspace

From e7b6cbb4d61600765546d27c3c55b54f21fb332d Mon Sep 17 00:00:00 2001
From: Andreas Engberg <48772850+engbergandreas@users.noreply.github.com>
Date: Tue, 9 Jul 2024 09:58:39 +0200
Subject: [PATCH 527/701] Generate raw volume & metadata from csv file - task
 (#3344)

Adds a task to generate a raw volume (used in e.g., RenderableTimeVaryingVolume) from a CSV file.
---
 modules/volume/CMakeLists.txt                 |   2 +
 .../tasks/generaterawvolumefromfiletask.cpp   | 204 ++++++++++++++++++
 .../tasks/generaterawvolumefromfiletask.h     |  57 +++++
 modules/volume/volumemodule.cpp               |   2 +
 4 files changed, 265 insertions(+)
 create mode 100644 modules/volume/tasks/generaterawvolumefromfiletask.cpp
 create mode 100644 modules/volume/tasks/generaterawvolumefromfiletask.h

diff --git a/modules/volume/CMakeLists.txt b/modules/volume/CMakeLists.txt
index 782f19a0a5..f997e0a719 100644
--- a/modules/volume/CMakeLists.txt
+++ b/modules/volume/CMakeLists.txt
@@ -49,6 +49,7 @@ set(HEADER_FILES
   rendering/volumeclipplane.h
   rendering/volumeclipplanes.h
   tasks/generaterawvolumetask.h
+  tasks/generaterawvolumefromfiletask.h
 )
 source_group("Header Files" FILES ${HEADER_FILES})
 
@@ -70,6 +71,7 @@ set(SOURCE_FILES
   rendering/volumeclipplane.cpp
   rendering/volumeclipplanes.cpp
   tasks/generaterawvolumetask.cpp
+  tasks/generaterawvolumefromfiletask.cpp
 )
 
 source_group("Source Files" FILES ${SOURCE_FILES})
diff --git a/modules/volume/tasks/generaterawvolumefromfiletask.cpp b/modules/volume/tasks/generaterawvolumefromfiletask.cpp
new file mode 100644
index 0000000000..5eb19ebbf8
--- /dev/null
+++ b/modules/volume/tasks/generaterawvolumefromfiletask.cpp
@@ -0,0 +1,204 @@
+/*****************************************************************************************
+ *                                                                                       *
+ * OpenSpace                                                                             *
+ *                                                                                       *
+ * Copyright (c) 2014-2024                                                               *
+ *                                                                                       *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
+ * software and associated documentation files (the "Software"), to deal in the Software *
+ * without restriction, including without limitation the rights to use, copy, modify,    *
+ * merge, publish, distribute, sublicense, and/or sell copies of the Software, and to    *
+ * permit persons to whom the Software is furnished to do so, subject to the following   *
+ * conditions:                                                                           *
+ *                                                                                       *
+ * The above copyright notice and this permission notice shall be included in all copies *
+ * or substantial portions of the Software.                                              *
+ *                                                                                       *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED,   *
+ * INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A         *
+ * PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT    *
+ * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF  *
+ * CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE  *
+ * OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                                         *
+ ****************************************************************************************/
+
+#include <modules/volume/tasks/generaterawvolumefromfiletask.h>
+
+#include <modules/volume/rawvolume.h>
+#include <modules/volume/rawvolumemetadata.h>
+#include <modules/volume/rawvolumewriter.h>
+#include <openspace/data/csvloader.h>
+#include <openspace/documentation/verifier.h>
+#include <openspace/util/time.h>
+#include <openspace/util/spicemanager.h>
+#include <ghoul/filesystem/filesystem.h>
+#include <ghoul/filesystem/file.h>
+#include <ghoul/format.h>
+#include <ghoul/logging/logmanager.h>
+#include <ghoul/misc/dictionaryluaformatter.h>
+#include <filesystem>
+#include <fstream>
+
+namespace {
+    constexpr std::string_view _loggerCat = "GenerateRawVolumeFromFileTask";
+
+    struct [[codegen::Dictionary(GenerateRawVolumeFromFileTask)]] Parameters {
+        // The volume file to import data from in csv format
+        std::string dataInputPath;
+
+        // The raw volume file to export data to
+        std::string rawVolumeOutput;
+
+        // The lua dictionary file to export metadata to
+        std::string dictionaryOutput;
+
+        // The data column value to use for the volume transfer function, must be one
+        // of the names in the CSV header
+        std::string dataValue [[codegen::notempty()]];
+
+        // The timestamp that is written to the metadata of this volume
+        std::string time [[codegen::notempty()]];
+
+        // A vector representing the number of cells in each dimension
+        glm::ivec3 dimensions;
+    };
+#include "generaterawvolumefromfiletask_codegen.cpp"
+} // namespace
+
+namespace openspace::volume {
+
+documentation::Documentation GenerateRawVolumeFromFileTask::Documentation() {
+    return codegen::doc<Parameters>("generate_raw_volume_task");
+}
+
+GenerateRawVolumeFromFileTask::GenerateRawVolumeFromFileTask(const ghoul::Dictionary& dictionary) {
+    const Parameters p = codegen::bake<Parameters>(dictionary);
+
+    _inputFilePath = absPath(p.dataInputPath);
+    _rawVolumeOutputPath = absPath(p.rawVolumeOutput);
+    _dictionaryOutputPath = absPath(p.dictionaryOutput);
+    _dataValue = p.dataValue;
+    _dimensions = p.dimensions;
+    _time = p.time;
+    _lowerDomainBound = glm::vec3(std::numeric_limits<float>::max());
+    _upperDomainBound = glm::vec3(std::numeric_limits<float>::lowest());
+}
+
+std::string GenerateRawVolumeFromFileTask::description() {
+    return std::format(
+        "Generate a raw volume with dimensions: ({}, {}, {}). "
+        "Write raw volume data into '{}' and dictionary with metadata to '{}'",
+        _dimensions.x, _dimensions.y, _dimensions.z,
+        _rawVolumeOutputPath, _dictionaryOutputPath
+    );
+}
+
+void GenerateRawVolumeFromFileTask::perform(const Task::ProgressCallback& progressCallback) {
+
+    dataloader::Dataset data = dataloader::csv::loadCsvFile(_inputFilePath);
+    progressCallback(0.3f);
+
+    if (data.isEmpty()) {
+        LERROR(std::format(
+            "Error loading CSV data in file '{}'", _inputFilePath.string()
+        ));
+        return;
+    }
+
+    // Get min/max x, y, z position - ie. domain bounds of the volume
+    for (const dataloader::Dataset::Entry& p : data.entries)
+    {
+        _lowerDomainBound = glm::vec3(
+            std::min(_lowerDomainBound.x, p.position.x),
+            std::min(_lowerDomainBound.y, p.position.y),
+            std::min(_lowerDomainBound.z, p.position.z)
+        );
+        _upperDomainBound = glm::vec3(
+            std::max(_upperDomainBound.x, p.position.x),
+            std::max(_upperDomainBound.y, p.position.y),
+            std::max(_upperDomainBound.z, p.position.z)
+        );
+    }
+    progressCallback(0.4f);
+
+    volume::RawVolume<float> rawVolume(_dimensions);
+
+    float minVal = std::numeric_limits<float>::max();
+    float maxVal = std::numeric_limits<float>::lowest();
+
+    auto dataIndex = std::find_if(
+        data.variables.begin(),
+        data.variables.end(),
+        [this](const dataloader::Dataset::Variable& var) {
+            return var.name == _dataValue;
+        }
+    );
+
+    if (dataIndex == data.variables.end()) {
+        LERROR(std::format(
+            "Could not find specified variable '{}' in dataset", _dataValue
+        ));
+        return;
+    }
+    progressCallback(0.5f);
+
+    // Write data into volume data structure
+    int k = 0;
+    for (auto& entry : data.entries) {
+        // Get the closest i, j , k voxel that should contain this data
+        glm::vec3 normalizedPos{ (entry.position - _lowerDomainBound) /
+            (_upperDomainBound - _lowerDomainBound) };
+
+        glm::uvec3 cell{
+            glm::min(
+                static_cast<glm::uvec3>(glm::floor(
+                    normalizedPos * static_cast<glm::vec3>(_dimensions)
+                )),
+                _dimensions - 1u
+            )
+        };
+
+        const float value = entry.data[dataIndex->index];
+        minVal = std::min(minVal, value);
+        maxVal = std::max(maxVal, value);
+
+        size_t index = rawVolume.coordsToIndex(cell);
+        rawVolume.set(index, value);
+        k++;
+    }
+    progressCallback(0.75f);
+
+    const std::filesystem::path directory = _rawVolumeOutputPath.parent_path();
+    if (!std::filesystem::is_directory(directory)) {
+        std::filesystem::create_directories(directory);
+    }
+
+    volume::RawVolumeWriter<float> writer(_rawVolumeOutputPath);
+    writer.write(rawVolume);
+    progressCallback(0.9f);
+
+    RawVolumeMetadata metadata;
+    metadata.time = Time::convertTime(_time);
+    metadata.dimensions = _dimensions;
+    metadata.hasDomainUnit = true;
+    metadata.domainUnit = "m";
+    metadata.hasValueUnit = true;
+    metadata.valueUnit = "K";
+    metadata.gridType = VolumeGridType::Cartesian;
+    metadata.hasDomainBounds = true;
+    metadata.lowerDomainBound = _lowerDomainBound;
+    metadata.upperDomainBound = _upperDomainBound;
+    metadata.hasValueRange = true;
+    metadata.minValue = minVal;
+    metadata.maxValue = maxVal;
+
+    const ghoul::Dictionary outputDictionary = metadata.dictionary();
+    const std::string metadataString = ghoul::formatLua(outputDictionary);
+
+    std::fstream f = std::fstream(_dictionaryOutputPath, std::ios::out);
+    f << "return " << metadataString;
+
+    progressCallback(1.f);
+}
+
+} // namespace openspace::volume
diff --git a/modules/volume/tasks/generaterawvolumefromfiletask.h b/modules/volume/tasks/generaterawvolumefromfiletask.h
new file mode 100644
index 0000000000..26b5b3e7a9
--- /dev/null
+++ b/modules/volume/tasks/generaterawvolumefromfiletask.h
@@ -0,0 +1,57 @@
+/*****************************************************************************************
+ *                                                                                       *
+ * OpenSpace                                                                             *
+ *                                                                                       *
+ * Copyright (c) 2014-2024                                                               *
+ *                                                                                       *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
+ * software and associated documentation files (the "Software"), to deal in the Software *
+ * without restriction, including without limitation the rights to use, copy, modify,    *
+ * merge, publish, distribute, sublicense, and/or sell copies of the Software, and to    *
+ * permit persons to whom the Software is furnished to do so, subject to the following   *
+ * conditions:                                                                           *
+ *                                                                                       *
+ * The above copyright notice and this permission notice shall be included in all copies *
+ * or substantial portions of the Software.                                              *
+ *                                                                                       *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED,   *
+ * INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A         *
+ * PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT    *
+ * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF  *
+ * CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE  *
+ * OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                                         *
+ ****************************************************************************************/
+
+#ifndef __OPENSPACE_MODULE_VOLUME___GENERATERAWVOLUMEFROMFILETASK___H__
+#define __OPENSPACE_MODULE_VOLUME___GENERATERAWVOLUMEFROMFILETASK___H__
+
+#include <openspace/util/task.h>
+
+#include <ghoul/glm.h>
+#include <filesystem>
+#include <string>
+
+namespace openspace::volume {
+
+class GenerateRawVolumeFromFileTask : public Task {
+public:
+    GenerateRawVolumeFromFileTask(const ghoul::Dictionary& dictionary);
+    std::string description() override;
+    void perform(const Task::ProgressCallback& progressCallback) override;
+    static documentation::Documentation Documentation();
+
+private:
+    std::filesystem::path _inputFilePath;
+    std::filesystem::path _rawVolumeOutputPath;
+    std::filesystem::path _dictionaryOutputPath;
+    std::string _time;
+    std::string _dataValue;
+
+    glm::uvec3 _dimensions = glm::uvec3(0);
+    glm::vec3 _lowerDomainBound = glm::vec3(0.f);
+    glm::vec3 _upperDomainBound = glm::vec3(0.f);
+};
+
+} // namespace openspace::volume
+
+#endif // __OPENSPACE_MODULE_VOLUME___GENERATERAWVOLUMEFROMFILETASK___H__
diff --git a/modules/volume/volumemodule.cpp b/modules/volume/volumemodule.cpp
index 0e70a298c0..6818fdfcb7 100644
--- a/modules/volume/volumemodule.cpp
+++ b/modules/volume/volumemodule.cpp
@@ -26,6 +26,7 @@
 
 #include <modules/volume/rendering/renderabletimevaryingvolume.h>
 #include <modules/volume/tasks/generaterawvolumetask.h>
+#include <modules/volume/tasks/generaterawvolumefromfiletask.h>
 #include <openspace/documentation/documentation.h>
 #include <openspace/rendering/renderable.h>
 #include <openspace/util/task.h>
@@ -48,6 +49,7 @@ void VolumeModule::internalInitialize(const ghoul::Dictionary&) {
     ghoul::TemplateFactory<Task>* tFactory = FactoryManager::ref().factory<Task>();
     ghoul_assert(tFactory, "No task factory existed");
     tFactory->registerClass<GenerateRawVolumeTask>("GenerateRawVolumeTask");
+    tFactory->registerClass<GenerateRawVolumeFromFileTask>("GenerateRawVolumeFromFileTask");
 }
 
 std::vector<documentation::Documentation> VolumeModule::documentations() const {

From b8e9193bc755f5b97e7aa637985e2e246f7e5c32 Mon Sep 17 00:00:00 2001
From: Alexander Bock <alexander.bock@liu.se>
Date: Thu, 11 Jul 2024 10:34:06 +0200
Subject: [PATCH 528/701] Add Lua function to calculate the number of seconds
 between dates and use it in assets (#3332)

---
 .../examples/volume/generated/cartesian.asset |  4 +--
 .../volume/generated/cartesiansequence.asset  |  4 +--
 .../examples/volume/generated/spherical.asset |  4 +--
 .../bastille_day/density_volume.asset         |  4 +--
 .../interstellar/c-2019_q4_borisov.asset      |  2 +-
 .../solarsystem/interstellar/oumuamua.asset   |  3 +-
 .../messenger/mercurymagnetosphere.asset      |  4 +--
 .../missions/pioneer/pioneer10.asset          | 12 ++++---
 .../missions/pioneer/pioneer11.asset          | 12 ++++---
 .../missions/voyager/voyager1.asset           | 16 ++++++----
 .../missions/voyager/voyager2.asset           | 25 +++++++++------
 .../voyager1_2__pioneer10_11.asset            | 14 +++-----
 .../satellites/communications/amateur.asset   |  2 +-
 .../communications/experimental.asset         |  2 +-
 .../communications/geostationary.asset        |  2 +-
 .../communications/globalstar.asset           |  2 +-
 .../satellites/communications/gorizont.asset  |  2 +-
 .../satellites/communications/intelsat.asset  |  2 +-
 .../satellites/communications/iridium.asset   |  2 +-
 .../communications/iridium_next.asset         |  2 +-
 .../satellites/communications/molniya.asset   |  2 +-
 .../satellites/communications/orbcomm.asset   |  2 +-
 .../communications/other_comm.asset           |  2 +-
 .../satellites/communications/raduga.asset    |  2 +-
 .../earth/satellites/communications/ses.asset |  2 +-
 .../satellites/communications/starlink.asset  |  2 +-
 .../earth/satellites/debris/debris_asat.asset |  2 +-
 .../satellites/debris/debris_breezem.asset    |  2 +-
 .../satellites/debris/debris_fengyun.asset    |  2 +-
 .../satellites/debris/debris_iridium33.asset  |  2 +-
 .../satellites/debris/debris_kosmos2251.asset |  2 +-
 .../debris/volume/cartesian_volume.asset      |  4 +--
 .../debris/volume/spherical_volume.asset      |  4 +--
 .../earth/satellites/misc/active.asset        |  2 +-
 .../earth/satellites/misc/brightest.asset     |  2 +-
 .../earth/satellites/misc/cubesats.asset      |  2 +-
 .../earth/satellites/misc/hubble_trail.asset  |  2 +-
 .../planets/earth/satellites/misc/iss.asset   |  4 +--
 .../earth/satellites/misc/military.asset      |  2 +-
 .../planets/earth/satellites/misc/other.asset |  2 +-
 .../planets/earth/satellites/misc/radar.asset |  2 +-
 .../earth/satellites/misc/spacestations.asset |  2 +-
 .../earth/satellites/misc/tiangong.asset      |  2 +-
 .../earth/satellites/misc/tle-new.asset       |  2 +-
 .../earth/satellites/navigation/beidou.asset  |  2 +-
 .../earth/satellites/navigation/galileo.asset |  2 +-
 .../satellites/navigation/glosnass.asset      |  2 +-
 .../earth/satellites/navigation/gps.asset     |  2 +-
 .../earth/satellites/navigation/musson.asset  |  2 +-
 .../earth/satellites/navigation/nnss.asset    |  2 +-
 .../earth/satellites/navigation/sbas.asset    |  2 +-
 .../earth/satellites/science/education.asset  |  2 +-
 .../satellites/science/engineering.asset      |  2 +-
 .../earth/satellites/science/geodetic.asset   |  2 +-
 .../earth/satellites/science/spaceearth.asset |  2 +-
 .../earth/satellites/weather/aqua.asset       |  2 +-
 .../earth/satellites/weather/argos.asset      |  2 +-
 .../earth/satellites/weather/dmc.asset        |  2 +-
 .../satellites/weather/earth_resources.asset  |  2 +-
 .../earth/satellites/weather/goes.asset       |  2 +-
 .../earth/satellites/weather/noaa.asset       |  2 +-
 .../earth/satellites/weather/planet.asset     |  2 +-
 .../earth/satellites/weather/sarsat.asset     |  2 +-
 .../earth/satellites/weather/snpp.asset       |  2 +-
 .../earth/satellites/weather/spire.asset      |  2 +-
 .../earth/satellites/weather/tdrss.asset      |  2 +-
 .../earth/satellites/weather/terra.asset      |  2 +-
 .../earth/satellites/weather/weather.asset    |  2 +-
 .../scene/solarsystem/sssb/c2019y4atlas.asset | 10 +++---
 src/util/time.cpp                             |  3 ++
 src/util/time_lua.inl                         | 32 +++++++++++++++++++
 71 files changed, 157 insertions(+), 110 deletions(-)

diff --git a/data/assets/examples/volume/generated/cartesian.asset b/data/assets/examples/volume/generated/cartesian.asset
index f9c84e35f1..07a4797a1b 100644
--- a/data/assets/examples/volume/generated/cartesian.asset
+++ b/data/assets/examples/volume/generated/cartesian.asset
@@ -25,8 +25,8 @@ local Volume = {
     MinValue = 0,
     MaxValue = 1,
     GridType = "Cartesian",
-    SecondsBefore = 50 * 365 * 24 * 60 * 60, -- 50 years before
-    SecondsAfter = 50 * 365 * 24 * 60 * 60 -- 50 years after
+    SecondsBefore = 50 * openspace.time.secondsPerYear(), -- 50 years before
+    SecondsAfter = 50 * openspace.time.secondsPerYear() -- 50 years after
   },
   GUI = {
     Path = "/Examples"
diff --git a/data/assets/examples/volume/generated/cartesiansequence.asset b/data/assets/examples/volume/generated/cartesiansequence.asset
index 24d0877da5..b45e1cc17f 100644
--- a/data/assets/examples/volume/generated/cartesiansequence.asset
+++ b/data/assets/examples/volume/generated/cartesiansequence.asset
@@ -19,8 +19,8 @@ local Volume = {
     MinValue = 0,
     MaxValue = 1,
     GridType = "Cartesian",
-    SecondsBefore = 50 * 365 * 24 * 60 * 60, -- 50 years before
-    SecondsAfter = 50 * 365 * 24 * 60 * 60 -- 50 years after
+    SecondsBefore = 50 * openspace.time.secondsPerYear(), -- 50 years before
+    SecondsAfter = 50 * openspace.time.secondsPerYear() -- 50 years after
   },
   GUI = {
     Path = "/Examples"
diff --git a/data/assets/examples/volume/generated/spherical.asset b/data/assets/examples/volume/generated/spherical.asset
index 82c61fede8..04f41e286f 100644
--- a/data/assets/examples/volume/generated/spherical.asset
+++ b/data/assets/examples/volume/generated/spherical.asset
@@ -25,8 +25,8 @@ local Volume = {
     MinValue = 0,
     MaxValue = 1,
     GridType = "Spherical",
-    SecondsBefore = 50 * 365 * 24 * 60 * 60, -- 50 years before
-    SecondsAfter = 50 * 365 * 24 * 60 * 60 -- 50 years after
+    SecondsBefore = 50 * openspace.time.secondsPerYear(), -- 50 years before
+    SecondsAfter = 50 * openspace.time.secondsPerYear() -- 50 years after
   },
   GUI = {
     Path = "/Examples"
diff --git a/data/assets/scene/solarsystem/heliosphere/bastille_day/density_volume.asset b/data/assets/scene/solarsystem/heliosphere/bastille_day/density_volume.asset
index 919230b635..1f7dbef0e1 100644
--- a/data/assets/scene/solarsystem/heliosphere/bastille_day/density_volume.asset
+++ b/data/assets/scene/solarsystem/heliosphere/bastille_day/density_volume.asset
@@ -39,8 +39,8 @@ local DensityVolume = {
     TransferFunction = asset.resource("transferfunctions/mas-mhd-r-squared.txt"),
     SourceDirectory = densityDirectory,
     GridType = "Spherical",
-    SecondsBefore = 24 * 60 * 60,
-    SecondsAfter = 24 * 60 * 60,
+    SecondsBefore = openspace.time.secondsPerDay(),
+    SecondsAfter = openspace.time.secondsPerDay(),
     Dimensions = { 100, 100, 128 },
     InvertDataAtZ = true
   },
diff --git a/data/assets/scene/solarsystem/interstellar/c-2019_q4_borisov.asset b/data/assets/scene/solarsystem/interstellar/c-2019_q4_borisov.asset
index ae18a90f26..63179278e5 100644
--- a/data/assets/scene/solarsystem/interstellar/c-2019_q4_borisov.asset
+++ b/data/assets/scene/solarsystem/interstellar/c-2019_q4_borisov.asset
@@ -27,7 +27,7 @@ local C2019Q4BorisovTrail = {
     Color = { 0.9, 0.9, 0.0 },
     StartTime = "2015 JAN 01 00:00:00",
     EndTime = "2050 JAN 01 00:00:00",
-    SampleInterval = 60 * 60 * 24 -- = 86 400 seconds in 1 day
+    SampleInterval = openspace.time.secondsPerDay()
   },
   GUI = {
     Name = "C/2019 Q4 Borisov Trail",
diff --git a/data/assets/scene/solarsystem/interstellar/oumuamua.asset b/data/assets/scene/solarsystem/interstellar/oumuamua.asset
index ecc79dd698..28ba280136 100644
--- a/data/assets/scene/solarsystem/interstellar/oumuamua.asset
+++ b/data/assets/scene/solarsystem/interstellar/oumuamua.asset
@@ -27,8 +27,7 @@ local OumuamuaTrail = {
     Color = { 0.9, 0.9, 0.0 },
     StartTime = "2014 JAN 01 00:00:00",
     EndTime = "2050 JAN 01 00:00:00",
-    SampleInterval = 86400,
-    TimeStampSubsampleFactor = 1
+    SampleInterval = openspace.time.secondsPerDay()
   },
   GUI = {
     Name = "'Oumuamua Trail",
diff --git a/data/assets/scene/solarsystem/missions/messenger/mercurymagnetosphere.asset b/data/assets/scene/solarsystem/missions/messenger/mercurymagnetosphere.asset
index 0d20153a15..7d5be5882e 100644
--- a/data/assets/scene/solarsystem/missions/messenger/mercurymagnetosphere.asset
+++ b/data/assets/scene/solarsystem/missions/messenger/mercurymagnetosphere.asset
@@ -42,8 +42,8 @@ local Magnetosphere = {
     StepSize = 0.003,
     Dimensions = { 64, 64, 64 },
     GridType = "Cartesian",
-    SecondsBefore = 24 * 60 * 60 * 365 * 100,
-    SecondsAfter = 24 * 60 * 60 * 365 * 100
+    SecondsBefore = 100 * openspace.time.secondsPerYear(),
+    SecondsAfter = 100 * openspace.time.secondsPerYear()
   },
   GUI = {
     Name = "Mercury Magnetosphere",
diff --git a/data/assets/scene/solarsystem/missions/pioneer/pioneer10.asset b/data/assets/scene/solarsystem/missions/pioneer/pioneer10.asset
index 4e1635593a..f1d9fabd52 100644
--- a/data/assets/scene/solarsystem/missions/pioneer/pioneer10.asset
+++ b/data/assets/scene/solarsystem/missions/pioneer/pioneer10.asset
@@ -32,6 +32,9 @@ local Pioneer10 = {
   }
 }
 
+local StartTime = "1972 MAR 03 02:04:00"
+local EndTime = "1990 JAN 02 00:00:00"
+
 local Pioneer10Trail = {
   Identifier = "Pioneer_10Trail",
   Parent = sunTransforms.SolarSystemBarycenter.Identifier,
@@ -43,11 +46,12 @@ local Pioneer10Trail = {
       Observer = coreKernels.ID.SolarSystemBarycenter
     },
     Color = { 0.70, 0.50, 0.20 },
-    StartTime = "1972 MAR 03 02:04:00",
-    EndTime = "1990 JAN 02 00:00:00",
+    StartTime = StartTime,
+    EndTime = EndTime,
     EnableFade = false,
-    SampleInterval = 6545 * 2
-    -- 6545 is the number of days between the Start and End time (aka sample every 2d)
+    -- 1 sample every 2d
+    SampleInterval =
+      openspace.time.duration(StartTime, EndTime) / openspace.time.secondsPerYear() * 2
   },
   GUI = {
     Name = "Pioneer 10 Trail (SPICE)",
diff --git a/data/assets/scene/solarsystem/missions/pioneer/pioneer11.asset b/data/assets/scene/solarsystem/missions/pioneer/pioneer11.asset
index a96e530106..5d841c3873 100644
--- a/data/assets/scene/solarsystem/missions/pioneer/pioneer11.asset
+++ b/data/assets/scene/solarsystem/missions/pioneer/pioneer11.asset
@@ -37,6 +37,9 @@ local Pioneer11 = {
   }
 }
 
+local StartTime = "1973 APR 06 02:25:00.000"
+local EndTime = "1990 JAN 02 00:00:00.000"
+
 local Pioneer11Trail = {
   Identifier = "Pioneer_11Trail",
   Parent = sunTransforms.SolarSystemBarycenter.Identifier,
@@ -48,11 +51,12 @@ local Pioneer11Trail = {
       Observer = coreKernels.ID.SolarSystemBarycenter
     },
     Color = { 0.70, 0.50, 0.20 },
-    StartTime = "1973 APR 06 02:25:00.000",
-    EndTime = "1990 JAN 02 00:00:00.000",
+    StartTime = StartTime,
+    EndTime = EndTime,
     EnableFade = false,
-    -- 6087 is the number of days between the Start and End time (so sample every 2d)
-    SampleInterval = 6087 * 2
+    -- 1 sample every 2d
+    SampleInterval =
+      openspace.time.duration(StartTime, EndTime) / openspace.time.secondsPerYear() * 2
   },
   GUI = {
     Name = "Pioneer 11 Trail (SPICE)",
diff --git a/data/assets/scene/solarsystem/missions/voyager/voyager1.asset b/data/assets/scene/solarsystem/missions/voyager/voyager1.asset
index f8b4f2b701..0d7660639b 100644
--- a/data/assets/scene/solarsystem/missions/voyager/voyager1.asset
+++ b/data/assets/scene/solarsystem/missions/voyager/voyager1.asset
@@ -95,8 +95,9 @@ local VoyagerTrailCruiseEarthJupiter = {
     Color = { 0.70, 0.50, 0.20 },
     StartTime = "1977 SEP 05",
     EndTime = "1979 MAR 04",
-    -- 545 is the number of days between the Start and End time
-    SampleInterval = 545 * 2
+    -- 1 sample every 2d
+    SampleInterval = openspace.time.duration("1977 SEP 05", "1979 MAR 04") /
+                     openspace.time.secondsPerYear() * 2
   },
   Tag = { "voyager1_trail" },
   GUI = {
@@ -145,8 +146,9 @@ local VoyagerTrailCruiseJupiterSaturn = {
     Color = { 0.70, 0.50, 0.20 },
     StartTime = "1979 MAR 09",
     EndTime = "1980 NOV 11",
-    -- 618 is the number of days between the Start and End time
-    SampleInterval = 618 * 2
+    -- 1 sample every 2d
+    SampleInterval = openspace.time.duration("1979 MAR 09", "1980 NOV 11") /
+                     openspace.time.secondsPerYear() * 2
   },
   Tag = { "voyager1_trail" },
   GUI = {
@@ -195,8 +197,10 @@ local VoyagerTrailCruiseSaturnInf = {
     Color = { 0.70, 0.50, 0.20 },
     StartTime = "1980 NOV 16",
     EndTime = "2100 JAN 01",
-    -- 43511 is the number of days between the Start and End time
-    SampleInterval = 43511 * 2
+    -- 1 sample every 2d
+    SampleInterval = openspace.time.duration("1980 NOV 16", "2100 JAN 01") /
+                     openspace.time.secondsPerYear() * 2
+
   },
   Tag = { "voyager1_trail" },
   GUI = {
diff --git a/data/assets/scene/solarsystem/missions/voyager/voyager2.asset b/data/assets/scene/solarsystem/missions/voyager/voyager2.asset
index 6cf8f2587d..884865df88 100644
--- a/data/assets/scene/solarsystem/missions/voyager/voyager2.asset
+++ b/data/assets/scene/solarsystem/missions/voyager/voyager2.asset
@@ -98,8 +98,9 @@ local VoyagerTrailCruiseEarthJupiter = {
     Color = { 0.70, 0.50, 0.20 },
     StartTime = "1977-AUG-20 16:07:06.535",
     EndTime = "1979 JUL 06",
-    -- 669 is the number of days between the Start and End time
-    SampleInterval = 669 * 2
+    -- 1 sample every 2d
+    SampleInterval = openspace.time.duration("1977-AUG-20 16:07:06.535", "1979 JUL 06") /
+                     openspace.time.secondsPerYear() * 2
   },
   Tag = { "voyager2_trail" },
   GUI = {
@@ -148,8 +149,9 @@ local VoyagerTrailCruiseJupiterSaturn = {
     Color = { 0.70, 0.50, 0.20 },
     StartTime = "1979 JUL 15",
     EndTime = "1981 AUG 23",
-    -- 770 is the number of days between the Start and End time
-    SampleInterval = 770 * 2
+    -- 1 sample every 2d
+    SampleInterval = openspace.time.duration("1979 JUL 15", "1981 AUG 23") /
+                     openspace.time.secondsPerYear() * 2
   },
   Tag = { "voyager2_trail" },
   GUI = {
@@ -198,8 +200,9 @@ local VoyagerTrailCruiseSaturnUranus = {
     Color = { 0.70, 0.50, 0.20 },
     StartTime = "1981 AUG 30",
     EndTime = "1986 JAN 22",
-    -- 1971 is the number of days between the Start and End time
-    SampleInterval = 1971 * 2
+    -- 1 sample every 2d
+    SampleInterval = openspace.time.duration("1981 AUG 30", "1986 JAN 22") /
+                     openspace.time.secondsPerYear() * 2
   },
   Tag = { "voyager2_trail" },
   GUI = {
@@ -248,8 +251,9 @@ local VoyagerTrailCruiseUranusNeptune = {
     Color = { 0.70, 0.50, 0.20 },
     StartTime = "1986 JAN 27",
     EndTime = "1989 AUG 24",
-    -- 1305 is the number of days between the Start and End time
-    SampleInterval = 1305 * 2
+    -- 1 sample every 2d
+    SampleInterval = openspace.time.duration("1986 JAN 27", "1989 AUG 24") /
+                     openspace.time.secondsPerYear() * 2
   },
   Tag = { "voyager2_trail" },
   GUI = {
@@ -298,8 +302,9 @@ local VoyagerTrailCruiseNeptuneInf = {
     Color = { 0.70, 0.50, 0.20 },
     StartTime = "1989 AUG 26",
     EndTime = "2100 JAN 01",
-    -- 40306 is the number of days between the Start and End time
-    SampleInterval = 40306 * 2
+    -- 1 sample every 2d
+    SampleInterval = openspace.time.duration("1989 AUG 26", "2100 JAN 01") /
+                     openspace.time.secondsPerYear() * 2
   },
   Tag = { "voyager2_trail" },
   GUI = {
diff --git a/data/assets/scene/solarsystem/missions/voyagerpioneer/voyager1_2__pioneer10_11.asset b/data/assets/scene/solarsystem/missions/voyagerpioneer/voyager1_2__pioneer10_11.asset
index 4e3fcb065d..d8fa9d58ac 100644
--- a/data/assets/scene/solarsystem/missions/voyagerpioneer/voyager1_2__pioneer10_11.asset
+++ b/data/assets/scene/solarsystem/missions/voyagerpioneer/voyager1_2__pioneer10_11.asset
@@ -13,8 +13,6 @@ local pioneer_horizons = asset.resource({
 })
 
 
-local SampleInterval = 24 * 60 * 60
-
 local Voyager1 = {
   Identifier = "Voyager1",
   Parent = "SolarSystemBarycenter",
@@ -34,8 +32,7 @@ local Voyager1 = {
     Fade = 5.0,
     StartTime = "1977 SEP 06 00:00:00",
     EndTime = "2030 JAN 01 00:00:00",
-    SampleInterval = SampleInterval,
-    TimeStampSubsampleFactor = 1
+    SampleInterval = openspace.time.secondsPerDay()
   },
   GUI = {
     Name = "Voyager 1 Trail",
@@ -64,8 +61,7 @@ local Voyager2 = {
     Fade = 5.0,
     StartTime = "1977 AUG 21 00:00:00",
     EndTime = "2030 JAN 01 00:00:00",
-    SampleInterval = SampleInterval,
-    TimeStampSubsampleFactor = 1
+    SampleInterval = openspace.time.secondsPerDay()
   },
   GUI = {
     Name = "Voyager 2 Trail",
@@ -94,8 +90,7 @@ local Pioneer10 = {
     Fade = 5.0,
     StartTime = "1972 MAR 04 00:00:00",
     EndTime = "2030 JAN 01 00:00:00",
-    SampleInterval = SampleInterval,
-    TimeStampSubsampleFactor = 1
+    SampleInterval = openspace.time.secondsPerDay()
   },
   GUI = {
     Name = "Pioneer 10 Trail",
@@ -124,8 +119,7 @@ local Pioneer11 ={
     Fade = 5.0,
     StartTime = "1973 APR 07 00:00:00",
     EndTime = "2030 JAN 01 00:00:00",
-    SampleInterval = SampleInterval,
-    TimeStampSubsampleFactor = 1
+    SampleInterval = openspace.time.secondsPerDay()
   },
   GUI = {
     Name = "Pioneer 11 Trail",
diff --git a/data/assets/scene/solarsystem/planets/earth/satellites/communications/amateur.asset b/data/assets/scene/solarsystem/planets/earth/satellites/communications/amateur.asset
index d4e4d7b6d6..ed48d2e0a3 100644
--- a/data/assets/scene/solarsystem/planets/earth/satellites/communications/amateur.asset
+++ b/data/assets/scene/solarsystem/planets/earth/satellites/communications/amateur.asset
@@ -8,7 +8,7 @@ local omm = asset.resource({
   Identifier = "satellite_omm_data_amateur_radio",
   Url = "https://www.celestrak.com/NORAD/elements/gp.php?GROUP=amateur&FORMAT=kvn",
   Filename = "amateur.txt",
-  SecondsUntilResync = 24 * 60 * 60
+  SecondsUntilResync = openspace.time.secondsPerDay()
 })
 
 
diff --git a/data/assets/scene/solarsystem/planets/earth/satellites/communications/experimental.asset b/data/assets/scene/solarsystem/planets/earth/satellites/communications/experimental.asset
index 9d58a8c7ca..fc9655828f 100644
--- a/data/assets/scene/solarsystem/planets/earth/satellites/communications/experimental.asset
+++ b/data/assets/scene/solarsystem/planets/earth/satellites/communications/experimental.asset
@@ -8,7 +8,7 @@ local omm = asset.resource({
   Identifier = "satellite_omm_data_x-comm",
   Url = "https://www.celestrak.com/NORAD/elements/gp.php?GROUP=x-comm&FORMAT=kvn",
   Filename = "x-comm.txt",
-  SecondsUntilResync = 24 * 60 * 60
+  SecondsUntilResync = openspace.time.secondsPerDay()
 })
 
 
diff --git a/data/assets/scene/solarsystem/planets/earth/satellites/communications/geostationary.asset b/data/assets/scene/solarsystem/planets/earth/satellites/communications/geostationary.asset
index 7a1b6be672..c8ff854b88 100644
--- a/data/assets/scene/solarsystem/planets/earth/satellites/communications/geostationary.asset
+++ b/data/assets/scene/solarsystem/planets/earth/satellites/communications/geostationary.asset
@@ -8,7 +8,7 @@ local omm = asset.resource({
   Identifier = "satellite_omm_data_geo",
   Url = "https://www.celestrak.com/NORAD/elements/gp.php?GROUP=geo&FORMAT=kvn",
   Filename = "geo.txt",
-  SecondsUntilResync = 24 * 60 * 60
+  SecondsUntilResync = openspace.time.secondsPerDay()
 })
 
 
diff --git a/data/assets/scene/solarsystem/planets/earth/satellites/communications/globalstar.asset b/data/assets/scene/solarsystem/planets/earth/satellites/communications/globalstar.asset
index bb93c189ca..a76d042f90 100644
--- a/data/assets/scene/solarsystem/planets/earth/satellites/communications/globalstar.asset
+++ b/data/assets/scene/solarsystem/planets/earth/satellites/communications/globalstar.asset
@@ -8,7 +8,7 @@ local omm = asset.resource({
   Identifier = "satellite_omm_data_globalstar",
   Url = "https://www.celestrak.com/NORAD/elements/gp.php?GROUP=globalstar&FORMAT=kvn",
   Filename = "globalstar.txt",
-  SecondsUntilResync = 24 * 60 * 60
+  SecondsUntilResync = openspace.time.secondsPerDay()
 })
 
 
diff --git a/data/assets/scene/solarsystem/planets/earth/satellites/communications/gorizont.asset b/data/assets/scene/solarsystem/planets/earth/satellites/communications/gorizont.asset
index 42e204acf6..bb74c08ce4 100644
--- a/data/assets/scene/solarsystem/planets/earth/satellites/communications/gorizont.asset
+++ b/data/assets/scene/solarsystem/planets/earth/satellites/communications/gorizont.asset
@@ -8,7 +8,7 @@ local omm = asset.resource({
   Identifier = "satellite_omm_data_gorizont",
   Url = "https://www.celestrak.com/NORAD/elements/gp.php?GROUP=gorizont&FORMAT=kvn",
   Filename = "gorizont.txt",
-  SecondsUntilResync = 24 * 60 * 60
+  SecondsUntilResync = openspace.time.secondsPerDay()
 })
 
 
diff --git a/data/assets/scene/solarsystem/planets/earth/satellites/communications/intelsat.asset b/data/assets/scene/solarsystem/planets/earth/satellites/communications/intelsat.asset
index 2c4816984c..4601e65efe 100644
--- a/data/assets/scene/solarsystem/planets/earth/satellites/communications/intelsat.asset
+++ b/data/assets/scene/solarsystem/planets/earth/satellites/communications/intelsat.asset
@@ -8,7 +8,7 @@ local omm = asset.resource({
   Identifier = "satellite_omm_data_intelsat",
   Url = "https://www.celestrak.com/NORAD/elements/gp.php?GROUP=intelsat&FORMAT=kvn",
   Filename = "intelsat.txt",
-  SecondsUntilResync = 24 * 60 * 60
+  SecondsUntilResync = openspace.time.secondsPerDay()
 })
 
 
diff --git a/data/assets/scene/solarsystem/planets/earth/satellites/communications/iridium.asset b/data/assets/scene/solarsystem/planets/earth/satellites/communications/iridium.asset
index 01299f9c3c..12c4a6e28e 100644
--- a/data/assets/scene/solarsystem/planets/earth/satellites/communications/iridium.asset
+++ b/data/assets/scene/solarsystem/planets/earth/satellites/communications/iridium.asset
@@ -8,7 +8,7 @@ local omm = asset.resource({
   Identifier = "satellite_omm_data_iridium",
   Url = "https://www.celestrak.com/NORAD/elements/gp.php?GROUP=iridium&FORMAT=kvn",
   Filename = "iridium.txt",
-  SecondsUntilResync = 24 * 60 * 60
+  SecondsUntilResync = openspace.time.secondsPerDay()
 })
 
 
diff --git a/data/assets/scene/solarsystem/planets/earth/satellites/communications/iridium_next.asset b/data/assets/scene/solarsystem/planets/earth/satellites/communications/iridium_next.asset
index 8b09625174..759e31cafd 100644
--- a/data/assets/scene/solarsystem/planets/earth/satellites/communications/iridium_next.asset
+++ b/data/assets/scene/solarsystem/planets/earth/satellites/communications/iridium_next.asset
@@ -8,7 +8,7 @@ local omm = asset.resource({
   Identifier = "satellite_omm_data_iridium-NEXT",
   Url = "https://www.celestrak.com/NORAD/elements/gp.php?GROUP=iridium-NEXT&FORMAT=kvn",
   Filename = "iridium-NEXT.txt",
-  SecondsUntilResync = 24 * 60 * 60
+  SecondsUntilResync = openspace.time.secondsPerDay()
 })
 
 
diff --git a/data/assets/scene/solarsystem/planets/earth/satellites/communications/molniya.asset b/data/assets/scene/solarsystem/planets/earth/satellites/communications/molniya.asset
index f2e60e19f0..58586625e0 100644
--- a/data/assets/scene/solarsystem/planets/earth/satellites/communications/molniya.asset
+++ b/data/assets/scene/solarsystem/planets/earth/satellites/communications/molniya.asset
@@ -8,7 +8,7 @@ local omm = asset.resource({
   Identifier = "satellite_omm_data_molniya",
   Url = "https://www.celestrak.com/NORAD/elements/gp.php?GROUP=molniya&FORMAT=kvn",
   Filename = "molniya.txt",
-  SecondsUntilResync = 24 * 60 * 60
+  SecondsUntilResync = openspace.time.secondsPerDay()
 })
 
 
diff --git a/data/assets/scene/solarsystem/planets/earth/satellites/communications/orbcomm.asset b/data/assets/scene/solarsystem/planets/earth/satellites/communications/orbcomm.asset
index d3c7c5eb14..107171335d 100644
--- a/data/assets/scene/solarsystem/planets/earth/satellites/communications/orbcomm.asset
+++ b/data/assets/scene/solarsystem/planets/earth/satellites/communications/orbcomm.asset
@@ -8,7 +8,7 @@ local omm = asset.resource({
   Identifier = "satellite_omm_data_orbcomm",
   Url = "https://www.celestrak.com/NORAD/elements/gp.php?GROUP=orbcomm&FORMAT=kvn",
   Filename = "orbcomm.txt",
-  SecondsUntilResync = 24 * 60 * 60
+  SecondsUntilResync = openspace.time.secondsPerDay()
 })
 
 
diff --git a/data/assets/scene/solarsystem/planets/earth/satellites/communications/other_comm.asset b/data/assets/scene/solarsystem/planets/earth/satellites/communications/other_comm.asset
index 8e18913e25..dd9d8a7180 100644
--- a/data/assets/scene/solarsystem/planets/earth/satellites/communications/other_comm.asset
+++ b/data/assets/scene/solarsystem/planets/earth/satellites/communications/other_comm.asset
@@ -8,7 +8,7 @@ local omm = asset.resource({
   Identifier = "satellite_omm_data_other-comm",
   Url = "https://www.celestrak.com/NORAD/elements/gp.php?GROUP=other-comm&FORMAT=kvn",
   Filename = "other-comm.txt",
-  SecondsUntilResync = 24 * 60 * 60
+  SecondsUntilResync = openspace.time.secondsPerDay()
 })
 
 
diff --git a/data/assets/scene/solarsystem/planets/earth/satellites/communications/raduga.asset b/data/assets/scene/solarsystem/planets/earth/satellites/communications/raduga.asset
index 2212d24c84..ba24bec98c 100644
--- a/data/assets/scene/solarsystem/planets/earth/satellites/communications/raduga.asset
+++ b/data/assets/scene/solarsystem/planets/earth/satellites/communications/raduga.asset
@@ -8,7 +8,7 @@ local omm = asset.resource({
   Identifier = "satellite_omm_data_raduga",
   Url = "https://www.celestrak.com/NORAD/elements/gp.php?GROUP=raduga&FORMAT=kvn",
   Filename = "raduga.txt",
-  SecondsUntilResync = 24 * 60 * 60
+  SecondsUntilResync = openspace.time.secondsPerDay()
 })
 
 
diff --git a/data/assets/scene/solarsystem/planets/earth/satellites/communications/ses.asset b/data/assets/scene/solarsystem/planets/earth/satellites/communications/ses.asset
index 3997ca2050..8a2ae6cfe1 100644
--- a/data/assets/scene/solarsystem/planets/earth/satellites/communications/ses.asset
+++ b/data/assets/scene/solarsystem/planets/earth/satellites/communications/ses.asset
@@ -8,7 +8,7 @@ local omm = asset.resource({
   Identifier = "satellite_omm_data_ses",
   Url = "https://www.celestrak.com/NORAD/elements/gp.php?GROUP=ses&FORMAT=kvn",
   Filename = "ses.txt",
-  SecondsUntilResync = 24 * 60 * 60
+  SecondsUntilResync = openspace.time.secondsPerDay()
 })
 
 
diff --git a/data/assets/scene/solarsystem/planets/earth/satellites/communications/starlink.asset b/data/assets/scene/solarsystem/planets/earth/satellites/communications/starlink.asset
index 1896b47717..323cdd446b 100644
--- a/data/assets/scene/solarsystem/planets/earth/satellites/communications/starlink.asset
+++ b/data/assets/scene/solarsystem/planets/earth/satellites/communications/starlink.asset
@@ -8,7 +8,7 @@ local omm = asset.resource({
   Identifier = "satellite_omm_data_starlink",
   Url = "https://www.celestrak.com/NORAD/elements/gp.php?GROUP=starlink&FORMAT=kvn",
   Filename = "starlink.txt",
-  SecondsUntilResync = 24 * 60 * 60
+  SecondsUntilResync = openspace.time.secondsPerDay()
 })
 
 
diff --git a/data/assets/scene/solarsystem/planets/earth/satellites/debris/debris_asat.asset b/data/assets/scene/solarsystem/planets/earth/satellites/debris/debris_asat.asset
index 7e8c010368..320860f245 100644
--- a/data/assets/scene/solarsystem/planets/earth/satellites/debris/debris_asat.asset
+++ b/data/assets/scene/solarsystem/planets/earth/satellites/debris/debris_asat.asset
@@ -8,7 +8,7 @@ local omm = asset.resource({
   Identifier = "satellite_omm_data_2019-006",
   Url = "https://www.celestrak.com/NORAD/elements/gp.php?INTDES=2019-006&FORMAT=kvn",
   Filename = "2019-006.txt",
-  SecondsUntilResync = 24 * 60 * 60
+  SecondsUntilResync = openspace.time.secondsPerDay()
 })
 
 
diff --git a/data/assets/scene/solarsystem/planets/earth/satellites/debris/debris_breezem.asset b/data/assets/scene/solarsystem/planets/earth/satellites/debris/debris_breezem.asset
index 2c1ddc4212..085e280b89 100644
--- a/data/assets/scene/solarsystem/planets/earth/satellites/debris/debris_breezem.asset
+++ b/data/assets/scene/solarsystem/planets/earth/satellites/debris/debris_breezem.asset
@@ -8,7 +8,7 @@ local omm = asset.resource({
   Identifier = "satellite_omm_data_2012-044",
   Url = "https://www.celestrak.com/NORAD/elements/gp.php?INTDES=2012-044&FORMAT=kvn",
   Filename = "2012-044.txt",
-  SecondsUntilResync = 24 * 60 * 60
+  SecondsUntilResync = openspace.time.secondsPerDay()
 })
 
 
diff --git a/data/assets/scene/solarsystem/planets/earth/satellites/debris/debris_fengyun.asset b/data/assets/scene/solarsystem/planets/earth/satellites/debris/debris_fengyun.asset
index 4bee1421bc..a52a8393ff 100644
--- a/data/assets/scene/solarsystem/planets/earth/satellites/debris/debris_fengyun.asset
+++ b/data/assets/scene/solarsystem/planets/earth/satellites/debris/debris_fengyun.asset
@@ -8,7 +8,7 @@ local omm = asset.resource({
   Identifier = "satellite_omm_data_1999-025",
   Url = "https://www.celestrak.com/NORAD/elements/gp.php?INTDES=1999-025&FORMAT=kvn",
   Filename = "1999-025.txt",
-  SecondsUntilResync = 24 * 60 * 60
+  SecondsUntilResync = openspace.time.secondsPerDay()
 })
 
 
diff --git a/data/assets/scene/solarsystem/planets/earth/satellites/debris/debris_iridium33.asset b/data/assets/scene/solarsystem/planets/earth/satellites/debris/debris_iridium33.asset
index 008f12c0cb..bc251261fe 100644
--- a/data/assets/scene/solarsystem/planets/earth/satellites/debris/debris_iridium33.asset
+++ b/data/assets/scene/solarsystem/planets/earth/satellites/debris/debris_iridium33.asset
@@ -8,7 +8,7 @@ local omm = asset.resource({
   Identifier = "satellite_omm_data_iridium-33-debris",
   Url = "https://www.celestrak.com/NORAD/elements/gp.php?GROUP=iridium-33-debris&FORMAT=kvn",
   Filename = "iridium-33-debris.txt",
-  SecondsUntilResync = 24 * 60 * 60
+  SecondsUntilResync = openspace.time.secondsPerDay()
 })
 
 
diff --git a/data/assets/scene/solarsystem/planets/earth/satellites/debris/debris_kosmos2251.asset b/data/assets/scene/solarsystem/planets/earth/satellites/debris/debris_kosmos2251.asset
index 60df8431ab..bcad916d9f 100644
--- a/data/assets/scene/solarsystem/planets/earth/satellites/debris/debris_kosmos2251.asset
+++ b/data/assets/scene/solarsystem/planets/earth/satellites/debris/debris_kosmos2251.asset
@@ -8,7 +8,7 @@ local omm = asset.resource({
   Identifier = "satellite_omm_data_cosmos-2251-debris",
   Url = "https://www.celestrak.com/NORAD/elements/gp.php?GROUP=cosmos-2251-debris&FORMAT=kvn",
   Filename = "cosmos-2251-debris.txt",
-  SecondsUntilResync = 24 * 60 * 60
+  SecondsUntilResync = openspace.time.secondsPerDay()
 })
 
 
diff --git a/data/assets/scene/solarsystem/planets/earth/satellites/debris/volume/cartesian_volume.asset b/data/assets/scene/solarsystem/planets/earth/satellites/debris/volume/cartesian_volume.asset
index 221d6f6842..a3cbf648f6 100644
--- a/data/assets/scene/solarsystem/planets/earth/satellites/debris/volume/cartesian_volume.asset
+++ b/data/assets/scene/solarsystem/planets/earth/satellites/debris/volume/cartesian_volume.asset
@@ -24,8 +24,8 @@ local DebrisVolumeCartesian = {
     MinValue = 0,
     MaxValue = 1,
     GridType = "Cartesian",
-    SecondsBefore = 50 * 365 * 24 * 60 * 60,
-    SecondsAfter = 50 * 365 * 24 * 60 * 60
+    SecondsBefore = 50 * openspace.time.secondsPerYear(),
+    SecondsAfter = 50 * openspace.time.secondsPerYear()
   },
   GUI = {
     Name = "Debris Volume - Cartesian",
diff --git a/data/assets/scene/solarsystem/planets/earth/satellites/debris/volume/spherical_volume.asset b/data/assets/scene/solarsystem/planets/earth/satellites/debris/volume/spherical_volume.asset
index bd6fbebc7b..64b6ddfb18 100644
--- a/data/assets/scene/solarsystem/planets/earth/satellites/debris/volume/spherical_volume.asset
+++ b/data/assets/scene/solarsystem/planets/earth/satellites/debris/volume/spherical_volume.asset
@@ -24,8 +24,8 @@ local DebrisVolumeSpherical = {
     MinValue = 0,
     MaxValue = 1,
     GridType = "Spherical",
-    SecondsBefore = 50 * 365 * 24 * 60 * 60,
-    SecondsAfter = 50 * 365 * 24 * 60 * 60
+    SecondsBefore = 50 * openspace.time.secondsPerYear(),
+    SecondsAfter = 50 * openspace.time.secondsPerYear()
   },
   GUI = {
     Name = "DebrisVolume - Spherical",
diff --git a/data/assets/scene/solarsystem/planets/earth/satellites/misc/active.asset b/data/assets/scene/solarsystem/planets/earth/satellites/misc/active.asset
index 4931acb8ab..e13d13d328 100644
--- a/data/assets/scene/solarsystem/planets/earth/satellites/misc/active.asset
+++ b/data/assets/scene/solarsystem/planets/earth/satellites/misc/active.asset
@@ -8,7 +8,7 @@ local omm = asset.resource({
   Identifier = "satellite_omm_data_active",
   Url = "https://www.celestrak.com/NORAD/elements/gp.php?GROUP=active&FORMAT=kvn",
   Filename = "active.txt",
-  SecondsUntilResync = 24 * 60 * 60
+  SecondsUntilResync = openspace.time.secondsPerDay()
 })
 
 
diff --git a/data/assets/scene/solarsystem/planets/earth/satellites/misc/brightest.asset b/data/assets/scene/solarsystem/planets/earth/satellites/misc/brightest.asset
index 6d730202e6..c02b1d4735 100644
--- a/data/assets/scene/solarsystem/planets/earth/satellites/misc/brightest.asset
+++ b/data/assets/scene/solarsystem/planets/earth/satellites/misc/brightest.asset
@@ -8,7 +8,7 @@ local omm = asset.resource({
   Identifier = "satellite_omm_data_visual",
   Url = "https://www.celestrak.com/NORAD/elements/gp.php?GROUP=visual&FORMAT=kvn",
   Filename = "visual.txt",
-  SecondsUntilResync = 24 * 60 * 60
+  SecondsUntilResync = openspace.time.secondsPerDay()
 })
 
 
diff --git a/data/assets/scene/solarsystem/planets/earth/satellites/misc/cubesats.asset b/data/assets/scene/solarsystem/planets/earth/satellites/misc/cubesats.asset
index d5e4be6491..7188ae6c79 100644
--- a/data/assets/scene/solarsystem/planets/earth/satellites/misc/cubesats.asset
+++ b/data/assets/scene/solarsystem/planets/earth/satellites/misc/cubesats.asset
@@ -8,7 +8,7 @@ local omm = asset.resource({
   Identifier = "satellite_omm_data_cubesat",
   Url = "https://www.celestrak.com/NORAD/elements/gp.php?GROUP=cubesat&FORMAT=kvn",
   Filename = "cubesat.txt",
-  SecondsUntilResync = 24 * 60 * 60
+  SecondsUntilResync = openspace.time.secondsPerDay()
 })
 
 
diff --git a/data/assets/scene/solarsystem/planets/earth/satellites/misc/hubble_trail.asset b/data/assets/scene/solarsystem/planets/earth/satellites/misc/hubble_trail.asset
index e76db0267e..b29818479d 100644
--- a/data/assets/scene/solarsystem/planets/earth/satellites/misc/hubble_trail.asset
+++ b/data/assets/scene/solarsystem/planets/earth/satellites/misc/hubble_trail.asset
@@ -9,7 +9,7 @@ local omm = asset.resource({
   Identifier = "satellite_omm_data_hst",
   Url = "https://www.celestrak.com/NORAD/elements/gp.php?CATNR=20580&FORMAT=kvn",
   Filename = "hst.txt",
-  SecondsUntilResync = 24 * 60 * 60
+  SecondsUntilResync = openspace.time.secondsPerDay()
 })
 
 
diff --git a/data/assets/scene/solarsystem/planets/earth/satellites/misc/iss.asset b/data/assets/scene/solarsystem/planets/earth/satellites/misc/iss.asset
index 80fdcca2c4..36efd6a593 100644
--- a/data/assets/scene/solarsystem/planets/earth/satellites/misc/iss.asset
+++ b/data/assets/scene/solarsystem/planets/earth/satellites/misc/iss.asset
@@ -24,7 +24,7 @@ local omm = asset.resource({
   Identifier = "satellite_omm_data_iss",
   Url = "https://www.celestrak.com/NORAD/elements/gp.php?CATNR=25544&FORMAT=kvn",
   Filename = "ISS.txt",
-  SecondsUntilResync = 24 * 60 * 60
+  SecondsUntilResync = openspace.time.secondsPerDay()
 })
 
 local tle = asset.resource({
@@ -33,7 +33,7 @@ local tle = asset.resource({
   Identifier = "satellite_tle_data_iss",
   Url = "https://www.celestrak.com/NORAD/elements/gp.php?CATNR=25544&FORMAT=tle",
   Filename = "ISS.txt",
-  SecondsUntilResync = 24 * 60 * 60
+  SecondsUntilResync = openspace.time.secondsPerDay()
 })
 
 
diff --git a/data/assets/scene/solarsystem/planets/earth/satellites/misc/military.asset b/data/assets/scene/solarsystem/planets/earth/satellites/misc/military.asset
index 35c2cf0fce..1098be5793 100644
--- a/data/assets/scene/solarsystem/planets/earth/satellites/misc/military.asset
+++ b/data/assets/scene/solarsystem/planets/earth/satellites/misc/military.asset
@@ -8,7 +8,7 @@ local omm = asset.resource({
   Identifier = "satellite_omm_data_military",
   Url = "https://www.celestrak.com/NORAD/elements/gp.php?GROUP=military&FORMAT=kvn",
   Filename = "military.txt",
-  SecondsUntilResync = 24 * 60 * 60
+  SecondsUntilResync = openspace.time.secondsPerDay()
 })
 
 
diff --git a/data/assets/scene/solarsystem/planets/earth/satellites/misc/other.asset b/data/assets/scene/solarsystem/planets/earth/satellites/misc/other.asset
index a7188dd62f..64ea9f90d9 100644
--- a/data/assets/scene/solarsystem/planets/earth/satellites/misc/other.asset
+++ b/data/assets/scene/solarsystem/planets/earth/satellites/misc/other.asset
@@ -8,7 +8,7 @@ local omm = asset.resource({
   Identifier = "satellite_omm_data_other",
   Url = "https://www.celestrak.com/NORAD/elements/gp.php?GROUP=other&FORMAT=kvn",
   Filename = "other.txt",
-  SecondsUntilResync = 24 * 60 * 60
+  SecondsUntilResync = openspace.time.secondsPerDay()
 })
 
 
diff --git a/data/assets/scene/solarsystem/planets/earth/satellites/misc/radar.asset b/data/assets/scene/solarsystem/planets/earth/satellites/misc/radar.asset
index 5c3f925612..75d2402b85 100644
--- a/data/assets/scene/solarsystem/planets/earth/satellites/misc/radar.asset
+++ b/data/assets/scene/solarsystem/planets/earth/satellites/misc/radar.asset
@@ -8,7 +8,7 @@ local omm = asset.resource({
   Identifier = "satellite_omm_data_radar",
   Url = "https://www.celestrak.com/NORAD/elements/gp.php?GROUP=radar&FORMAT=kvn",
   Filename = "radar.txt",
-  SecondsUntilResync = 24 * 60 * 60
+  SecondsUntilResync = openspace.time.secondsPerDay()
 })
 
 
diff --git a/data/assets/scene/solarsystem/planets/earth/satellites/misc/spacestations.asset b/data/assets/scene/solarsystem/planets/earth/satellites/misc/spacestations.asset
index 94ac750ee0..ad7ef07723 100644
--- a/data/assets/scene/solarsystem/planets/earth/satellites/misc/spacestations.asset
+++ b/data/assets/scene/solarsystem/planets/earth/satellites/misc/spacestations.asset
@@ -8,7 +8,7 @@ local omm = asset.resource({
   Identifier = "satellite_omm_data_stations",
   Url = "https://www.celestrak.com/NORAD/elements/gp.php?GROUP=stations&FORMAT=kvn",
   Filename = "stations.txt",
-  SecondsUntilResync = 24 * 60 * 60
+  SecondsUntilResync = openspace.time.secondsPerDay()
 })
 
 
diff --git a/data/assets/scene/solarsystem/planets/earth/satellites/misc/tiangong.asset b/data/assets/scene/solarsystem/planets/earth/satellites/misc/tiangong.asset
index b58a428eb1..7b0a23b77e 100644
--- a/data/assets/scene/solarsystem/planets/earth/satellites/misc/tiangong.asset
+++ b/data/assets/scene/solarsystem/planets/earth/satellites/misc/tiangong.asset
@@ -16,7 +16,7 @@ local omm = asset.resource({
   Identifier = "satellite_omm_data_tiangong",
   Url = "https://www.celestrak.com/NORAD/elements/gp.php?CATNR=48274&FORMAT=kvn",
   Filename = "Tiangong.txt",
-  SecondsUntilResync = 24 * 60 * 60
+  SecondsUntilResync = openspace.time.secondsPerDay()
 })
 
 
diff --git a/data/assets/scene/solarsystem/planets/earth/satellites/misc/tle-new.asset b/data/assets/scene/solarsystem/planets/earth/satellites/misc/tle-new.asset
index e7716f1b04..cd7537f716 100644
--- a/data/assets/scene/solarsystem/planets/earth/satellites/misc/tle-new.asset
+++ b/data/assets/scene/solarsystem/planets/earth/satellites/misc/tle-new.asset
@@ -8,7 +8,7 @@ local omm = asset.resource({
   Identifier = "satellite_omm_data_tle-new",
   Url = "https://www.celestrak.com/NORAD/elements/gp.php?GROUP=last-30-days&FORMAT=kvn",
   Filename = "tle-new.txt",
-  SecondsUntilResync = 24 * 60 * 60
+  SecondsUntilResync = openspace.time.secondsPerDay()
 })
 
 
diff --git a/data/assets/scene/solarsystem/planets/earth/satellites/navigation/beidou.asset b/data/assets/scene/solarsystem/planets/earth/satellites/navigation/beidou.asset
index e8161cb938..dfd9306d03 100644
--- a/data/assets/scene/solarsystem/planets/earth/satellites/navigation/beidou.asset
+++ b/data/assets/scene/solarsystem/planets/earth/satellites/navigation/beidou.asset
@@ -8,7 +8,7 @@ local omm = asset.resource({
   Identifier = "satellite_omm_data_beidou",
   Url = "https://www.celestrak.com/NORAD/elements/gp.php?GROUP=beidou&FORMAT=kvn",
   Filename = "beidou.txt",
-  SecondsUntilResync = 24 * 60 * 60
+  SecondsUntilResync = openspace.time.secondsPerDay()
 })
 
 
diff --git a/data/assets/scene/solarsystem/planets/earth/satellites/navigation/galileo.asset b/data/assets/scene/solarsystem/planets/earth/satellites/navigation/galileo.asset
index b371767419..4a905b2cdd 100644
--- a/data/assets/scene/solarsystem/planets/earth/satellites/navigation/galileo.asset
+++ b/data/assets/scene/solarsystem/planets/earth/satellites/navigation/galileo.asset
@@ -8,7 +8,7 @@ local omm = asset.resource({
   Identifier = "satellite_omm_data_galileo",
   Url = "https://www.celestrak.com/NORAD/elements/gp.php?GROUP=galileo&FORMAT=kvn",
   Filename = "galileo.txt",
-  SecondsUntilResync = 24 * 60 * 60
+  SecondsUntilResync = openspace.time.secondsPerDay()
 })
 
 
diff --git a/data/assets/scene/solarsystem/planets/earth/satellites/navigation/glosnass.asset b/data/assets/scene/solarsystem/planets/earth/satellites/navigation/glosnass.asset
index 3348aadfba..84b6de8b2f 100644
--- a/data/assets/scene/solarsystem/planets/earth/satellites/navigation/glosnass.asset
+++ b/data/assets/scene/solarsystem/planets/earth/satellites/navigation/glosnass.asset
@@ -8,7 +8,7 @@ local omm = asset.resource({
   Identifier = "satellite_omm_data_glo-ops",
   Url = "https://www.celestrak.com/NORAD/elements/gp.php?GROUP=glo-ops&FORMAT=kvn",
   Filename = "glo-ops.txt",
-  SecondsUntilResync = 24 * 60 * 60
+  SecondsUntilResync = openspace.time.secondsPerDay()
 })
 
 
diff --git a/data/assets/scene/solarsystem/planets/earth/satellites/navigation/gps.asset b/data/assets/scene/solarsystem/planets/earth/satellites/navigation/gps.asset
index a6a7f9f1cb..31b8578fb6 100644
--- a/data/assets/scene/solarsystem/planets/earth/satellites/navigation/gps.asset
+++ b/data/assets/scene/solarsystem/planets/earth/satellites/navigation/gps.asset
@@ -8,7 +8,7 @@ local omm = asset.resource({
   Identifier = "satellite_omm_data_gps-ops",
   Url = "https://www.celestrak.com/NORAD/elements/gp.php?GROUP=gps-ops&FORMAT=kvn",
   Filename = "gps-ops.txt",
-  SecondsUntilResync = 24 * 60 * 60
+  SecondsUntilResync = openspace.time.secondsPerDay()
 })
 
 
diff --git a/data/assets/scene/solarsystem/planets/earth/satellites/navigation/musson.asset b/data/assets/scene/solarsystem/planets/earth/satellites/navigation/musson.asset
index 53fd23ec0b..6b688a3585 100644
--- a/data/assets/scene/solarsystem/planets/earth/satellites/navigation/musson.asset
+++ b/data/assets/scene/solarsystem/planets/earth/satellites/navigation/musson.asset
@@ -8,7 +8,7 @@ local omm = asset.resource({
   Identifier = "satellite_omm_data_musson",
   Url = "https://www.celestrak.com/NORAD/elements/gp.php?GROUP=musson&FORMAT=kvn",
   Filename = "musson.txt",
-  SecondsUntilResync = 24 * 60 * 60
+  SecondsUntilResync = openspace.time.secondsPerDay()
 })
 
 
diff --git a/data/assets/scene/solarsystem/planets/earth/satellites/navigation/nnss.asset b/data/assets/scene/solarsystem/planets/earth/satellites/navigation/nnss.asset
index cf083e6a39..0457dafb50 100644
--- a/data/assets/scene/solarsystem/planets/earth/satellites/navigation/nnss.asset
+++ b/data/assets/scene/solarsystem/planets/earth/satellites/navigation/nnss.asset
@@ -8,7 +8,7 @@ local omm = asset.resource({
   Identifier = "satellite_omm_data_nnss",
   Url = "https://www.celestrak.com/NORAD/elements/gp.php?GROUP=nnss&FORMAT=kvn",
   Filename = "nnss.txt",
-  SecondsUntilResync = 24 * 60 * 60
+  SecondsUntilResync = openspace.time.secondsPerDay()
 })
 
 
diff --git a/data/assets/scene/solarsystem/planets/earth/satellites/navigation/sbas.asset b/data/assets/scene/solarsystem/planets/earth/satellites/navigation/sbas.asset
index 55401243bb..a092adf1d6 100644
--- a/data/assets/scene/solarsystem/planets/earth/satellites/navigation/sbas.asset
+++ b/data/assets/scene/solarsystem/planets/earth/satellites/navigation/sbas.asset
@@ -8,7 +8,7 @@ local omm = asset.resource({
   Identifier = "satellite_omm_data_sbas",
   Url = "https://www.celestrak.com/NORAD/elements/gp.php?GROUP=sbas&FORMAT=kvn",
   Filename = "sbas.txt",
-  SecondsUntilResync = 24 * 60 * 60
+  SecondsUntilResync = openspace.time.secondsPerDay()
 })
 
 
diff --git a/data/assets/scene/solarsystem/planets/earth/satellites/science/education.asset b/data/assets/scene/solarsystem/planets/earth/satellites/science/education.asset
index 408e8b7fd5..d7567078de 100644
--- a/data/assets/scene/solarsystem/planets/earth/satellites/science/education.asset
+++ b/data/assets/scene/solarsystem/planets/earth/satellites/science/education.asset
@@ -8,7 +8,7 @@ local omm = asset.resource({
   Identifier = "satellite_omm_data_education",
   Url = "https://www.celestrak.com/NORAD/elements/gp.php?GROUP=education&FORMAT=kvn",
   Filename = "education.txt",
-  SecondsUntilResync = 24 * 60 * 60
+  SecondsUntilResync = openspace.time.secondsPerDay()
 })
 
 
diff --git a/data/assets/scene/solarsystem/planets/earth/satellites/science/engineering.asset b/data/assets/scene/solarsystem/planets/earth/satellites/science/engineering.asset
index 7d14321be1..5ee3c70cf3 100644
--- a/data/assets/scene/solarsystem/planets/earth/satellites/science/engineering.asset
+++ b/data/assets/scene/solarsystem/planets/earth/satellites/science/engineering.asset
@@ -8,7 +8,7 @@ local omm = asset.resource({
   Identifier = "satellite_omm_data_engineering",
   Url = "https://www.celestrak.com/NORAD/elements/gp.php?GROUP=engineering&FORMAT=kvn",
   Filename = "engineering.txt",
-  SecondsUntilResync = 24 * 60 * 60
+  SecondsUntilResync = openspace.time.secondsPerDay()
 })
 
 
diff --git a/data/assets/scene/solarsystem/planets/earth/satellites/science/geodetic.asset b/data/assets/scene/solarsystem/planets/earth/satellites/science/geodetic.asset
index 348418d008..656c7d6330 100644
--- a/data/assets/scene/solarsystem/planets/earth/satellites/science/geodetic.asset
+++ b/data/assets/scene/solarsystem/planets/earth/satellites/science/geodetic.asset
@@ -8,7 +8,7 @@ local omm = asset.resource({
   Identifier = "satellite_omm_data_geodetic",
   Url = "https://www.celestrak.com/NORAD/elements/gp.php?GROUP=geodetic&FORMAT=kvn",
   Filename = "geodetic.txt",
-  SecondsUntilResync = 24 * 60 * 60
+  SecondsUntilResync = openspace.time.secondsPerDay()
 })
 
 
diff --git a/data/assets/scene/solarsystem/planets/earth/satellites/science/spaceearth.asset b/data/assets/scene/solarsystem/planets/earth/satellites/science/spaceearth.asset
index 42d4b5c09c..8daedff803 100644
--- a/data/assets/scene/solarsystem/planets/earth/satellites/science/spaceearth.asset
+++ b/data/assets/scene/solarsystem/planets/earth/satellites/science/spaceearth.asset
@@ -8,7 +8,7 @@ local omm = asset.resource({
   Identifier = "satellite_omm_data_science",
   Url = "https://www.celestrak.com/NORAD/elements/gp.php?GROUP=science&FORMAT=kvn",
   Filename = "science.txt",
-  SecondsUntilResync = 24 * 60 * 60
+  SecondsUntilResync = openspace.time.secondsPerDay()
 })
 
 
diff --git a/data/assets/scene/solarsystem/planets/earth/satellites/weather/aqua.asset b/data/assets/scene/solarsystem/planets/earth/satellites/weather/aqua.asset
index 0d9664f73c..d8a9f8e2f3 100644
--- a/data/assets/scene/solarsystem/planets/earth/satellites/weather/aqua.asset
+++ b/data/assets/scene/solarsystem/planets/earth/satellites/weather/aqua.asset
@@ -9,7 +9,7 @@ local omm = asset.resource({
   Identifier = "satellite_omm_data_aqua",
   Url = "https://www.celestrak.com/NORAD/elements/gp.php?CATNR=27424&FORMAT=kvn",
   Filename = "Aqua.txt",
-  SecondsUntilResync = 24 * 60 * 60
+  SecondsUntilResync = openspace.time.secondsPerDay()
 })
 
 
diff --git a/data/assets/scene/solarsystem/planets/earth/satellites/weather/argos.asset b/data/assets/scene/solarsystem/planets/earth/satellites/weather/argos.asset
index 7be059f832..fd2a4bab75 100644
--- a/data/assets/scene/solarsystem/planets/earth/satellites/weather/argos.asset
+++ b/data/assets/scene/solarsystem/planets/earth/satellites/weather/argos.asset
@@ -8,7 +8,7 @@ local omm = asset.resource({
   Identifier = "satellite_omm_data_argos",
   Url = "https://www.celestrak.com/NORAD/elements/gp.php?GROUP=argos&FORMAT=kvn",
   Filename = "argos.txt",
-  SecondsUntilResync = 24 * 60 * 60
+  SecondsUntilResync = openspace.time.secondsPerDay()
 })
 
 
diff --git a/data/assets/scene/solarsystem/planets/earth/satellites/weather/dmc.asset b/data/assets/scene/solarsystem/planets/earth/satellites/weather/dmc.asset
index 05588ee42c..051a79b8c1 100644
--- a/data/assets/scene/solarsystem/planets/earth/satellites/weather/dmc.asset
+++ b/data/assets/scene/solarsystem/planets/earth/satellites/weather/dmc.asset
@@ -8,7 +8,7 @@ local omm = asset.resource({
   Identifier = "satellite_omm_data_dmc",
   Url = "https://www.celestrak.com/NORAD/elements/gp.php?GROUP=dmc&FORMAT=kvn",
   Filename = "dmc.txt",
-  SecondsUntilResync = 24 * 60 * 60
+  SecondsUntilResync = openspace.time.secondsPerDay()
 })
 
 
diff --git a/data/assets/scene/solarsystem/planets/earth/satellites/weather/earth_resources.asset b/data/assets/scene/solarsystem/planets/earth/satellites/weather/earth_resources.asset
index 4848a12932..5d23acbdb8 100644
--- a/data/assets/scene/solarsystem/planets/earth/satellites/weather/earth_resources.asset
+++ b/data/assets/scene/solarsystem/planets/earth/satellites/weather/earth_resources.asset
@@ -8,7 +8,7 @@ local omm = asset.resource({
   Identifier = "satellite_omm_data_resource",
   Url = "https://www.celestrak.com/NORAD/elements/gp.php?GROUP=resource&FORMAT=kvn",
   Filename = "resource.txt",
-  SecondsUntilResync = 24 * 60 * 60
+  SecondsUntilResync = openspace.time.secondsPerDay()
 })
 
 
diff --git a/data/assets/scene/solarsystem/planets/earth/satellites/weather/goes.asset b/data/assets/scene/solarsystem/planets/earth/satellites/weather/goes.asset
index a694780a81..68d2a9dd4e 100644
--- a/data/assets/scene/solarsystem/planets/earth/satellites/weather/goes.asset
+++ b/data/assets/scene/solarsystem/planets/earth/satellites/weather/goes.asset
@@ -8,7 +8,7 @@ local omm = asset.resource({
   Identifier = "satellite_omm_data_goes",
   Url = "https://www.celestrak.com/NORAD/elements/gp.php?GROUP=goes&FORMAT=kvn",
   Filename = "goes.txt",
-  SecondsUntilResync = 24 * 60 * 60
+  SecondsUntilResync = openspace.time.secondsPerDay()
 })
 
 
diff --git a/data/assets/scene/solarsystem/planets/earth/satellites/weather/noaa.asset b/data/assets/scene/solarsystem/planets/earth/satellites/weather/noaa.asset
index 7ff751cda9..d3e360be01 100644
--- a/data/assets/scene/solarsystem/planets/earth/satellites/weather/noaa.asset
+++ b/data/assets/scene/solarsystem/planets/earth/satellites/weather/noaa.asset
@@ -8,7 +8,7 @@ local omm = asset.resource({
   Identifier = "satellite_omm_data_noaa",
   Url = "https://www.celestrak.com/NORAD/elements/gp.php?GROUP=noaa&FORMAT=kvn",
   Filename = "noaa.txt",
-  SecondsUntilResync = 24 * 60 * 60
+  SecondsUntilResync = openspace.time.secondsPerDay()
 })
 
 
diff --git a/data/assets/scene/solarsystem/planets/earth/satellites/weather/planet.asset b/data/assets/scene/solarsystem/planets/earth/satellites/weather/planet.asset
index dab42495da..b28fe2cc53 100644
--- a/data/assets/scene/solarsystem/planets/earth/satellites/weather/planet.asset
+++ b/data/assets/scene/solarsystem/planets/earth/satellites/weather/planet.asset
@@ -8,7 +8,7 @@ local omm = asset.resource({
   Identifier = "satellite_omm_data_planet",
   Url = "https://www.celestrak.com/NORAD/elements/gp.php?GROUP=planet&FORMAT=kvn",
   Filename = "planet.txt",
-  SecondsUntilResync = 24 * 60 * 60
+  SecondsUntilResync = openspace.time.secondsPerDay()
 })
 
 
diff --git a/data/assets/scene/solarsystem/planets/earth/satellites/weather/sarsat.asset b/data/assets/scene/solarsystem/planets/earth/satellites/weather/sarsat.asset
index b988cfe526..a786fa426c 100644
--- a/data/assets/scene/solarsystem/planets/earth/satellites/weather/sarsat.asset
+++ b/data/assets/scene/solarsystem/planets/earth/satellites/weather/sarsat.asset
@@ -8,7 +8,7 @@ local omm = asset.resource({
   Identifier = "satellite_omm_data_sarsat",
   Url = "https://www.celestrak.com/NORAD/elements/gp.php?GROUP=sarsat&FORMAT=kvn",
   Filename = "sarsat.txt",
-  SecondsUntilResync = 24 * 60 * 60
+  SecondsUntilResync = openspace.time.secondsPerDay()
 })
 
 
diff --git a/data/assets/scene/solarsystem/planets/earth/satellites/weather/snpp.asset b/data/assets/scene/solarsystem/planets/earth/satellites/weather/snpp.asset
index cc6957477c..3094da65ec 100644
--- a/data/assets/scene/solarsystem/planets/earth/satellites/weather/snpp.asset
+++ b/data/assets/scene/solarsystem/planets/earth/satellites/weather/snpp.asset
@@ -9,7 +9,7 @@ local omm = asset.resource({
   Identifier = "satellite_omm_data_snpp",
   Url = "https://www.celestrak.com/NORAD/elements/gp.php?CATNR=37849&FORMAT=kvn",
   Filename = "SNPP.txt",
-  SecondsUntilResync = 24 * 60 * 60
+  SecondsUntilResync = openspace.time.secondsPerDay()
 })
 
 
diff --git a/data/assets/scene/solarsystem/planets/earth/satellites/weather/spire.asset b/data/assets/scene/solarsystem/planets/earth/satellites/weather/spire.asset
index c1c545f937..972274778a 100644
--- a/data/assets/scene/solarsystem/planets/earth/satellites/weather/spire.asset
+++ b/data/assets/scene/solarsystem/planets/earth/satellites/weather/spire.asset
@@ -8,7 +8,7 @@ local omm = asset.resource({
   Identifier = "satellite_omm_data_spire",
   Url = "https://www.celestrak.com/NORAD/elements/gp.php?GROUP=spire&FORMAT=kvn",
   Filename = "spire.txt",
-  SecondsUntilResync = 24 * 60 * 60
+  SecondsUntilResync = openspace.time.secondsPerDay()
 })
 
 
diff --git a/data/assets/scene/solarsystem/planets/earth/satellites/weather/tdrss.asset b/data/assets/scene/solarsystem/planets/earth/satellites/weather/tdrss.asset
index 48ae177086..e44459833c 100644
--- a/data/assets/scene/solarsystem/planets/earth/satellites/weather/tdrss.asset
+++ b/data/assets/scene/solarsystem/planets/earth/satellites/weather/tdrss.asset
@@ -8,7 +8,7 @@ local omm = asset.resource({
   Identifier = "satellite_omm_data_tdrss",
   Url = "https://www.celestrak.com/NORAD/elements/gp.php?GROUP=tdrss&FORMAT=kvn",
   Filename = "tdrss.txt",
-  SecondsUntilResync = 24 * 60 * 60
+  SecondsUntilResync = openspace.time.secondsPerDay()
 })
 
 
diff --git a/data/assets/scene/solarsystem/planets/earth/satellites/weather/terra.asset b/data/assets/scene/solarsystem/planets/earth/satellites/weather/terra.asset
index d19b20f30c..ba5fbdb877 100644
--- a/data/assets/scene/solarsystem/planets/earth/satellites/weather/terra.asset
+++ b/data/assets/scene/solarsystem/planets/earth/satellites/weather/terra.asset
@@ -9,7 +9,7 @@ local omm = asset.resource({
   Identifier = "satellite_omm_data_terra",
   Url = "https://www.celestrak.com/NORAD/elements/gp.php?CATNR=25994&FORMAT=kvn",
   Filename = "Terra.txt",
-  SecondsUntilResync = 24 * 60 * 60
+  SecondsUntilResync = openspace.time.secondsPerDay()
 })
 
 
diff --git a/data/assets/scene/solarsystem/planets/earth/satellites/weather/weather.asset b/data/assets/scene/solarsystem/planets/earth/satellites/weather/weather.asset
index 479eeee5d6..c4a0c29460 100644
--- a/data/assets/scene/solarsystem/planets/earth/satellites/weather/weather.asset
+++ b/data/assets/scene/solarsystem/planets/earth/satellites/weather/weather.asset
@@ -8,7 +8,7 @@ local omm = asset.resource({
   Identifier = "satellite_omm_data_weather",
   Url = "https://www.celestrak.com/NORAD/elements/gp.php?GROUP=weather&FORMAT=kvn",
   Filename = "weather.txt",
-  SecondsUntilResync = 24 * 60 * 60
+  SecondsUntilResync = openspace.time.secondsPerDay()
 })
 
 
diff --git a/data/assets/scene/solarsystem/sssb/c2019y4atlas.asset b/data/assets/scene/solarsystem/sssb/c2019y4atlas.asset
index a9c113c9b8..3dafeab613 100644
--- a/data/assets/scene/solarsystem/sssb/c2019y4atlas.asset
+++ b/data/assets/scene/solarsystem/sssb/c2019y4atlas.asset
@@ -10,6 +10,9 @@ local orbit = asset.resource({
 }) .. "c2019y4atlas.hrz"
 
 
+local StartTime = "1950 JAN 1 00:00:00"
+local EndTime = "2100 JAN 1 00:00:00"
+
 local C2019Y4AtlasTrail = {
   Identifier = "C2019Y4AtlasTrail",
   Parent = sunTransforms.SolarSystemBarycenter.Identifier,
@@ -26,10 +29,9 @@ local C2019Y4AtlasTrail = {
     },
     Color = { 0.533333, 0.850980, 0.996078 },
     EnableFade = false,
-    StartTime = "1950 JAN 1 0:00:00",
-    EndTime = "2100 JAN 1 00:00:00",
-    SampleInterval = 52595, -- About 14h 36m 35.5200s in seconds
-    TimeStampSubsampleFactor = 1
+    StartTime = StartTime,
+    EndTime = EndTime,
+    SampleInterval = openspace.time.duration(StartTime, EndTime) / 90000
   },
   GUI = {
     Name = "C2019 Y4 Atlas Trail",
diff --git a/src/util/time.cpp b/src/util/time.cpp
index d46edef658..a6ca8e8d37 100644
--- a/src/util/time.cpp
+++ b/src/util/time.cpp
@@ -223,6 +223,9 @@ scripting::LuaLibrary Time::luaLibrary() {
             codegen::lua::CurrentApplicationTime,
             codegen::lua::AdvancedTime,
             codegen::lua::ConvertTime,
+            codegen::lua::Duration,
+            codegen::lua::SecondsPerDay,
+            codegen::lua::SecondsPerYear
         }
     };
 }
diff --git a/src/util/time_lua.inl b/src/util/time_lua.inl
index a0dd915112..3a0536105a 100644
--- a/src/util/time_lua.inl
+++ b/src/util/time_lua.inl
@@ -22,6 +22,8 @@
  * OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                                         *
  ****************************************************************************************/
 
+#include <openspace/util/timeconversion.h>
+
 namespace {
 
 /**
@@ -374,6 +376,36 @@ namespace {
     }
 }
 
+/**
+ * Returns the number of seconds between the provided start time and end time. If the end
+ * time is before the start time, the return value is negative. If the start time is equal
+ * to the end time, the return value is 0.
+ * Both start and end times must be valid ISO 8601 date strings.
+ */
+[[codegen::luawrap]] double duration(std::string start, std::string end) {
+    using namespace openspace;
+
+    const double tStart = Time::convertTime(start);
+    const double tEnd = Time::convertTime(end);
+    return tEnd - tStart;
+}
+
+/**
+ * Returns the number of seconds per day where a day in this case is exactly 24 hours.
+ * The total number of seconds is equal to 86400.
+ */
+[[codegen::luawrap]] int secondsPerDay() {
+    return openspace::SecondsPerDay;
+}
+
+/**
+ * Returns the number of seconds in a Julian year, which is equal to 31557600.
+ */
+[[codegen::luawrap]] int secondsPerYear() {
+    // We could use a call to SPICE here, but the value is a constant anyway
+    return openspace::SecondsPerYear;
+}
+
 #include "time_lua_codegen.cpp"
 
 } // namespace

From c0f85857d464e3fe377b5019e31da51f3504bc5a Mon Sep 17 00:00:00 2001
From: Emma Broman <emma.broman@liu.se>
Date: Mon, 15 Jul 2024 08:52:22 +0200
Subject: [PATCH 529/701] "Fix" warning from hdf.asset (#3343)

The "proximity" parameter does not exist in the dataset. Just addd all tha parameters for color mapping.
---
 data/assets/scene/digitaluniverse/hdf.asset | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/data/assets/scene/digitaluniverse/hdf.asset b/data/assets/scene/digitaluniverse/hdf.asset
index 73df37d79d..68585a4aa7 100644
--- a/data/assets/scene/digitaluniverse/hdf.asset
+++ b/data/assets/scene/digitaluniverse/hdf.asset
@@ -32,11 +32,7 @@ local Object = {
     },
     Coloring = {
       ColorMapping = {
-        File = ColorMap .. "hudf.cmap",
-        ParameterOptions = {
-          { Key = "proximity", Range = { 1.0, 25.0 } },
-          { Key = "redshift", Range = { 0.0, 0.075 } }
-        }
+        File = ColorMap .. "hudf.cmap"
       }
     },
     Unit = "Mpc",

From 065d73db641ed974bd66bb382c88e97da8be6e40 Mon Sep 17 00:00:00 2001
From: Alexander Bock <mail@alexanderbock.eu>
Date: Mon, 15 Jul 2024 18:54:49 +0200
Subject: [PATCH 530/701] Add non-main dashboard as a propertyowner for a
 ScreenSpaceDashboard

---
 modules/base/rendering/screenspacedashboard.cpp | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/modules/base/rendering/screenspacedashboard.cpp b/modules/base/rendering/screenspacedashboard.cpp
index 1e32157e71..e6ad767d9a 100644
--- a/modules/base/rendering/screenspacedashboard.cpp
+++ b/modules/base/rendering/screenspacedashboard.cpp
@@ -92,6 +92,10 @@ ScreenSpaceDashboard::ScreenSpaceDashboard(const ghoul::Dictionary& dictionary)
         throw ghoul::RuntimeError("Cannot specify items when using the main dashboard");
     }
 
+    if (!_useMainDashboard) {
+        addPropertySubOwner(_dashboard);
+    }
+
     if (p.items.has_value()) {
         ghoul_assert(_useMainDashboard, "Cannot add items to the main dashboard");
         for (const ghoul::Dictionary& item : *p.items) {

From acab685178558f2f81d198ef85c6023522488894 Mon Sep 17 00:00:00 2001
From: Alexander Bock <alexander.bock@liu.se>
Date: Tue, 16 Jul 2024 12:27:03 +0200
Subject: [PATCH 531/701] Apply coding style to Lua scripting files

---
 modules/gaia/scripts/filtering.lua            | 166 +++--
 .../globebrowsing/scripts/layer_support.lua   | 703 +++++++++---------
 .../globebrowsing/scripts/node_support.lua    |  71 +-
 modules/space/scripts/spice.lua               |  14 +-
 4 files changed, 516 insertions(+), 438 deletions(-)

diff --git a/modules/gaia/scripts/filtering.lua b/modules/gaia/scripts/filtering.lua
index 6179d3acd6..8de241bd5b 100644
--- a/modules/gaia/scripts/filtering.lua
+++ b/modules/gaia/scripts/filtering.lua
@@ -1,102 +1,126 @@
 openspace.gaia.documentation = {
-    {
-        Name = "addClippingBox",
-        Arguments = {{ "name", "String" },{ "size", "vec3" }, { "position", "vec3" }},
-        Documentation = "Creates a clipping box for the Gaia renderable in the first argument"
+  {
+    Name = "addClippingBox",
+    Arguments = {
+      { "name", "String" },
+      { "size", "vec3" },
+      { "position", "vec3" }
     },
-    {
-        Name = "removeClippingBox",
-        Arguments = {},
-        Documentation = ""
+    Documentation = "Creates a clipping box for the Gaia renderable in the first argument"
+  },
+  {
+    Name = "removeClippingBox",
+    Arguments = {},
+    Documentation = ""
+  },
+  {
+    Name = "addClippingSphere",
+    Arguments = {
+      { "name", "String" },
+      { "radius", "Number" }
     },
-    {
-        Name = "addClippingSphere",
-        Arguments = {{ "name", "String" }, { "radius", "Number" }},
-        Documentation = "Creates a clipping sphere for the Gaia renderable in the first argument"
-    }
+    Documentation = "Creates a clipping sphere for the Gaia renderable in the first argument"
+  }
 }
 
 openspace.gaia.addClippingBox = function (name, size, position)
-    local grid_identifier = "Filtering_Box"
-    local kilo_parsec_in_meter = 30856775814913700000
+  local grid_identifier = "Filtering_Box"
+  local kilo_parsec_in_meter = 30856775814913700000
 
-    if openspace.hasSceneGraphNode(grid_identifier) then
-        openspace.removeSceneGraphNode(grid_identifier)
-    end
+  if openspace.hasSceneGraphNode(grid_identifier) then
+    openspace.removeSceneGraphNode(grid_identifier)
+  end
 
-    local grid = {
-        Identifier = grid_identifier,
-        Transform = {
-            Translation = {
-                Type = "StaticTranslation",
-                Position = { position[1] * kilo_parsec_in_meter, position[2] * kilo_parsec_in_meter, position[3] * kilo_parsec_in_meter }
-            }
-        },
-        Renderable = {
-            Type = "RenderableBoxGrid",
-            Color = { 0.6, 0.5, 0.7 },
-            LineWidth = 2.0,
-            Size = { size[1] * kilo_parsec_in_meter, size[2] * kilo_parsec_in_meter, size[3] * kilo_parsec_in_meter}
-        },
-        GUI = {
-            Name = "Filtering Grid",
-            Path = "/Other/Grids"
+  local grid = {
+    Identifier = grid_identifier,
+    Transform = {
+      Translation = {
+        Type = "StaticTranslation",
+        Position = {
+          position[1] * kilo_parsec_in_meter,
+          position[2] * kilo_parsec_in_meter,
+          position[3] * kilo_parsec_in_meter
         }
+      }
+    },
+    Renderable = {
+      Type = "RenderableBoxGrid",
+      Color = { 0.6, 0.5, 0.7 },
+      LineWidth = 2.0,
+      Size = {
+        size[1] * kilo_parsec_in_meter,
+        size[2] * kilo_parsec_in_meter,
+        size[3] * kilo_parsec_in_meter
+      }
+    },
+    GUI = {
+      Name = "Filtering Grid",
+      Path = "/Other/Grids"
     }
+  }
 
-    openspace.addSceneGraphNode(grid)
+  openspace.addSceneGraphNode(grid)
 
-    openspace.setPropertyValue('Scene.' .. name .. '.renderable.FilterPosX', { (position[1] - size[1] / 2) * kilo_parsec_in_meter, (position[1] + size[1] / 2) * kilo_parsec_in_meter })
-    openspace.setPropertyValue('Scene.' .. name .. '.renderable.FilterPosY', { (position[2] - size[2] / 2) * kilo_parsec_in_meter, (position[2] + size[2] / 2) * kilo_parsec_in_meter })
-    openspace.setPropertyValue('Scene.' .. name .. '.renderable.FilterPosZ', { (position[3] - size[3] / 2) * kilo_parsec_in_meter, (position[3] + size[3] / 2) * kilo_parsec_in_meter })
+  openspace.setPropertyValue(
+    "Scene." .. name .. ".renderable.FilterPosX",
+    { (position[1] - size[1] / 2) * kilo_parsec_in_meter, (position[1] + size[1] / 2) * kilo_parsec_in_meter }
+  )
+  openspace.setPropertyValue(
+    "Scene." .. name .. ".renderable.FilterPosY",
+    { (position[2] - size[2] / 2) * kilo_parsec_in_meter, (position[2] + size[2] / 2) * kilo_parsec_in_meter }
+  )
+  openspace.setPropertyValue(
+    "Scene." .. name .. ".renderable.FilterPosZ",
+    { (position[3] - size[3] / 2) * kilo_parsec_in_meter, (position[3] + size[3] / 2) * kilo_parsec_in_meter }
+  )
 end
 
 openspace.gaia.removeClippingBox = function()
-    local grid_identifier = "Filtering_Box"
+  local grid_identifier = "Filtering_Box"
 
-    if openspace.hasSceneGraphNode(grid_identifier) then
-        openspace.removeSceneGraphNode(grid_identifier)
-    end
+  if openspace.hasSceneGraphNode(grid_identifier) then
+    openspace.removeSceneGraphNode(grid_identifier)
+  end
 end
 
 
 openspace.gaia.addClippingSphere = function (name, radius)
-    local grid_identifier = "Filtering_Sphere"
-    local kilo_parsec_in_meter = 30856775814913700000
+  local grid_identifier = "Filtering_Sphere"
+  local kilo_parsec_in_meter = 30856775814913700000
 
 
-    if openspace.hasSceneGraphNode(grid_identifier) then
-        openspace.removeSceneGraphNode(grid_identifier)
-    end
+  if openspace.hasSceneGraphNode(grid_identifier) then
+    openspace.removeSceneGraphNode(grid_identifier)
+  end
 
-    local grid = {
-        Identifier = grid_identifier,
-        Transform = {
-            Scale = {
-                Type = "StaticScale",
-                Scale = radius * kilo_parsec_in_meter
-            }
-        },
-        Renderable = {
-            Type = "RenderableSphericalGrid",
-            Color = { 0.6, 0.5, 0.7 },
-            LineWidth = 1.0,
-        },
-        GUI = {
-            Name = "Filtering Sphere",
-            Path = "/Other/Grids"
-        }
+  local grid = {
+    Identifier = grid_identifier,
+    Transform = {
+      Scale = {
+        Type = "StaticScale",
+        Scale = radius * kilo_parsec_in_meter
+      }
+    },
+    Renderable = {
+      Type = "RenderableSphericalGrid",
+      Color = { 0.6, 0.5, 0.7 },
+      LineWidth = 1.0,
+    },
+    GUI = {
+      Name = "Filtering Sphere",
+      Path = "/Other/Grids"
     }
+  }
 
-    openspace.addSceneGraphNode(grid)
+  openspace.addSceneGraphNode(grid)
 
-    openspace.setPropertyValue('Scene.' .. name .. '.renderable.FilterDist', radius * kilo_parsec_in_meter)
+  openspace.setPropertyValue("Scene." .. name .. ".renderable.FilterDist", radius * kilo_parsec_in_meter)
 end
 
 openspace.gaia.removeClippingSphere = function()
-    local grid_identifier = "Filtering_Sphere"
+  local grid_identifier = "Filtering_Sphere"
 
-    if openspace.hasSceneGraphNode(grid_identifier) then
-        openspace.removeSceneGraphNode(grid_identifier)
-    end
+  if openspace.hasSceneGraphNode(grid_identifier) then
+    openspace.removeSceneGraphNode(grid_identifier)
+  end
 end
diff --git a/modules/globebrowsing/scripts/layer_support.lua b/modules/globebrowsing/scripts/layer_support.lua
index e779650232..c43a904941 100644
--- a/modules/globebrowsing/scripts/layer_support.lua
+++ b/modules/globebrowsing/scripts/layer_support.lua
@@ -1,396 +1,433 @@
 openspace.globebrowsing.documentation = {
-    {
-        Name = "createTemporalGibsGdalXml",
-        Arguments = {{ "layerName", "String" }, { "resolution", "String" }, { "format", "String" }},
-        Documentation = [[
-            Creates an XML configuration for a temporal GIBS dataset to be used in
-            a TemporalTileprovider
-        ]]
+  {
+    Name = "createTemporalGibsGdalXml",
+    Arguments = {
+      { "layerName", "String" },
+      { "resolution", "String" },
+      { "format", "String" }
     },
-    {
-        Name = "createGibsGdalXml",
-        Arguments = {{ "layerName", "String" }, { "date", "String" }, { "resolution",  "String" }, { "format", "String" }},
-        Documentation =
-            "Creates an XML configuration for a GIBS dataset." ..
-            "Arguments are: layerName, date, resolution, format." ..
-            "For all specifications, see " ..
-            "https://wiki.earthdata.nasa.gov/display/GIBS/GIBS+Available+Imagery+Products" ..
-            "Usage:" ..
-            "openspace.globebrowsing.addLayer(" ..
-                "\"Earth\"," ..
-                "\"ColorLayers\"," ..
-                "{" ..
-                    "Name = \"MODIS_Terra_Chlorophyll_A\"," ..
-                    "FilePath = openspace.globebrowsing.createGibsGdalXml(" ..
-                        "\"MODIS_Terra_Chlorophyll_A\"," ..
-                        "\"2013-07-02\"," ..
-                        "\"1km\"," ..
-                        "\"png\"" ..
-                    ")" ..
-                "}" ..
-            ")"
+    Documentation = [[
+      Creates an XML configuration for a temporal GIBS dataset to be used in a
+      TemporalTileprovider
+    ]]
+  },
+  {
+    Name = "createGibsGdalXml",
+    Arguments = {
+      { "layerName", "String" },
+      { "date", "String" },
+      { "resolution",  "String" },
+      { "format", "String" }
     },
-    {
-        Name = "addGibsLayer",
-        Arguments = {{ "layer", "String" }, { "resolution", "String" }, { "format", "String" }, { "startDate", "String" }, { "endDate", "String" }},
-        Documentation = "Adds a new layer from NASA GIBS to the Earth globe. Arguments " ..
-            "are: imagery layer name, imagery resolution, start date, end date, format. " ..
-             "For all specifications, see " ..
-            "https://wiki.earthdata.nasa.gov/display/GIBS/GIBS+Available+Imagery+Products" ..
-            "Usage:" ..
-            "openspace.globebrowsing.addGibsLayer('AIRS_Temperature_850hPa_Night', '2km', '2013-07-15', 'Present', 'png')"
+    Documentation = [[
+      Creates an XML configuration for a GIBS dataset.
+      Arguments are: layerName, date, resolution, format.
+      For all specifications, see
+      https://wiki.earthdata.nasa.gov/display/GIBS/GIBS+Available+Imagery+Products
+
+      Usage:
+      openspace.globebrowsing.addLayer(
+        "Earth",
+        "ColorLayers",
+        {
+          Name = "MODIS_Terra_Chlorophyll_A",
+          FilePath = openspace.globebrowsing.createGibsGdalXml(
+            "MODIS_Terra_Chlorophyll_A",
+            "2013-07-02",
+            "1km",
+            "png"
+          )
+        }
+      )
+    ]]
+  },
+  {
+    Name = "addGibsLayer",
+    Arguments = {
+      { "layer", "String" },
+      { "resolution", "String" },
+      { "format", "String" },
+      { "startDate", "String" },
+      { "endDate", "String" }
     },
-    {
-        Name = "parseInfoFile",
-        Arguments = {{ "file", "String" }},
-        Documentation =
-            "Parses the passed info file and return the table with the information " ..
-            "provided in the info file. The return table contains the optional keys: " ..
-            "'Color', 'Height', 'Node', 'Location', 'Identifier'." ..
-            "Usage: local t = openspace.globebrowsing.parseInfoFile(file)" ..
-            "openspace.globebrowsing.addLayer(\"Earth\", \"ColorLayers\", t.color)" ..
-            "openspace.globebrowsing.addLayer(\"Earth\", \"HeightLayers\", t.height)"
+    Documentation = [[
+      Adds a new layer from NASA GIBS to the Earth globe. Arguments are: imagery layer
+      name, imagery resolution, start date, end date, format.
+      For all specifications, see
+      https://wiki.earthdata.nasa.gov/display/GIBS/GIBS+Available+Imagery+Products
+      Usage:
+      openspace.globebrowsing.addGibsLayer(
+        "AIRS_Temperature_850hPa_Night", "2km", "2013-07-15", "Present", "png"
+      )
+    ]]
+  },
+  {
+    Name = "parseInfoFile",
+    Arguments = {
+      { "file", "String" }
     },
-    {
-        Name = "addBlendingLayersFromDirectory",
-        Arguments = {{ "directory", "String" }, { "nodeName", "String" }},
-        Documentation =
-            "Retrieves all info files recursively in the directory passed as the first " ..
-            "argument to this function. The color and height tables retrieved from these " ..
-            "info files are then added to the RenderableGlobe identified by name passed " ..
-            "to the second argument." ..
-            "Usage: openspace.globebrowsing.addBlendingLayersFromDirectory(directory, \"Earth\")"
+    Documentation = [[
+      Parses the passed info file and return the table with the information provided in
+      the info file. The return table contains the optional keys:
+      'Color', 'Height', 'Node', 'Location', 'Identifier'.
+      Usage:
+      local t = openspace.globebrowsing.parseInfoFile(file)
+      openspace.globebrowsing.addLayer("Earth", "ColorLayers", t.color)
+      openspace.globebrowsing.addLayer("Earth", "HeightLayers", t.height)
+    ]]
+  },
+  {
+    Name = "addBlendingLayersFromDirectory",
+    Arguments = {
+      { "directory", "String" },
+      { "nodeName", "String" }
     },
-    {
-        Name = "addFocusNodesFromDirectory",
-        Arguments = {{ "directory", "String" }, { "nodeName", "String" }},
-        Documentation =
-            "Retrieves all info files recursively in the directory passed as the first " ..
-            "argument to this function. The name and location retrieved from these info " ..
-            "files are then used to create new SceneGraphNodes that can be used as " ..
-            "focus nodes. " ..
-            "Usage: openspace.globebrowsing.addFocusNodesFromDirectory(directory, \"Mars\")"
+    Documentation = [[
+      Retrieves all info files recursively in the directory passed as the first argument
+      to this function. The color and height tables retrieved from these info files are
+      then added to the RenderableGlobe identified by name passed to the second argument.
+      Usage:
+      openspace.globebrowsing.addBlendingLayersFromDirectory(directory, "Earth")
+    ]]
+  },
+  {
+    Name = "addFocusNodesFromDirectory",
+    Arguments = {
+      { "directory", "String" },
+      { "nodeName", "String" }
     },
-    {
-        Name = "addFocusNodeFromLatLong",
-        Arguments = {{ "name", "String" }, { "globeIdentifier", "String" }, { "latitude", "Number" }, { "longitude", "Number" }, { "altitude", "Number" }},
-        Documentation =
-            "Creates a new SceneGraphNode that can be used as focus node. " ..
-            "Usage: openspace.globebrowsing.addFocusNodeFromLatLong(" ..
-            "\"Olympus Mons\", \"Mars\", -18.65, 226.2, optionalAltitude)"
+    Documentation = [[
+      Retrieves all info files recursively in the directory passed as the first argument
+      to this function. The name and location retrieved from these info files are then
+      used to create new SceneGraphNodes that can be used as focus nodes.
+      Usage:
+      openspace.globebrowsing.addFocusNodesFromDirectory(directory, "Mars")
+    ]]
+  },
+  {
+    Name = "addFocusNodeFromLatLong",
+    Arguments = {
+      { "name", "String" },
+      { "globeIdentifier", "String" },
+      { "latitude", "Number" },
+      { "longitude", "Number" },
+      { "altitude", "Number" }
     },
-    {
-        Name = "loadWMSServersFromFile",
-        Arguments = {{ "filePath", "String" }},
-        Documentation =
-            "Loads all WMS servers from the provided file and passes them to the " ..
-            "'openspace.globebrowsing.loadWMSCapabilities' file."
-    }
+    Documentation = [[
+      Creates a new SceneGraphNode that can be used as focus node.
+      Usage:
+      openspace.globebrowsing.addFocusNodeFromLatLong(
+        "Olympus Mons", "Mars", -18.65, 226.2, optionalAltitude
+      )
+    ]]
+  },
+  {
+    Name = "loadWMSServersFromFile",
+    Arguments = {
+      { "filePath", "String" }
+    },
+    Documentation = [[
+      Loads all WMS servers from the provided file and passes them to the
+      'openspace.globebrowsing.loadWMSCapabilities' file.
+    ]]
+  }
 }
 
 openspace.globebrowsing.addGibsLayer = function(layerName, resolution, format, startDate, endDate)
-    if endDate == 'Present' then
-        endDate = ''
-    end
+  if endDate == "Present" then
+    endDate = ""
+  end
 
-    local layer = {
-        Identifier = layerName,
-        Type = "TemporalTileLayer",
-        Mode = "Prototyped",
-        Prototyped = {
-            Time = {
-                Start = startDate,
-                End = endDate
-            },
-            TemporalResolution = "1d",
-            TimeFormat = "YYYY-MM-DD",
-            Prototype = openspace.globebrowsing.createTemporalGibsGdalXml(layerName, resolution, format)
-        }
+  local layer = {
+    Identifier = layerName,
+    Type = "TemporalTileLayer",
+    Mode = "Prototyped",
+    Prototyped = {
+      Time = {
+        Start = startDate,
+        End = endDate
+      },
+      TemporalResolution = "1d",
+      TimeFormat = "YYYY-MM-DD",
+      Prototype = openspace.globebrowsing.createTemporalGibsGdalXml(layerName, resolution, format)
     }
+  }
 
-    openspace.globebrowsing.addLayer(
-        'Earth',
-        'ColorLayers',
-        layer
-    )
+  openspace.globebrowsing.addLayer("Earth", "ColorLayers", layer)
 end
 
 openspace.globebrowsing.createGibsGdalXml = function (layerName, date, resolution, format)
-    local tileLevel = 5
-    -- These resolutions are defined by GIBS: https://wiki.earthdata.nasa.gov/display/GIBS/GIBS+API+for+Developers#GIBSAPIforDevelopers-Script-levelAccessviaGDAL
-    if resolution == "2km" then
-        tileLevel = 5
-    elseif resolution == "1km" then
-        tileLevel = 6
-    elseif resolution == "500m" then
-        tileLevel = 7
-    elseif resolution == "250m" then
-        tileLevel = 8
-    elseif resolution == "125m" then
-        tileLevel = 9
-    elseif resolution == "62.5m" then
-        tileLevel = 10
-    elseif resolution == "31.25m" then
-        tileLevel = 11
-    elseif resolution == "15.625m" then
-        tileLevel = 12
-    else
-        openspace.printError("Unknown resolution: " .. resolution)
-        return ""
-    end
+  local tileLevel = 5
+  -- These resolutions are defined by GIBS: https://wiki.earthdata.nasa.gov/display/GIBS/GIBS+API+for+Developers#GIBSAPIforDevelopers-Script-levelAccessviaGDAL
+  if resolution == "2km" then
+    tileLevel = 5
+  elseif resolution == "1km" then
+    tileLevel = 6
+  elseif resolution == "500m" then
+    tileLevel = 7
+  elseif resolution == "250m" then
+    tileLevel = 8
+  elseif resolution == "125m" then
+    tileLevel = 9
+  elseif resolution == "62.5m" then
+    tileLevel = 10
+  elseif resolution == "31.25m" then
+    tileLevel = 11
+  elseif resolution == "15.625m" then
+    tileLevel = 12
+  else
+    openspace.printError("Unknown resolution: " .. resolution)
+    return ""
+  end
 
-    local rasterCount = 3
-    if format == "jpg" then
-        if layerName == "ASTER_GDEM_Greyscale_Shaded_Relief" then
-            rasterCount = 1
-        else
-            rasterCount = 3
-        end
-    elseif format == "png" then
-        rasterCount = 4
+  local rasterCount = 3
+  if format == "jpg" then
+    if layerName == "ASTER_GDEM_Greyscale_Shaded_Relief" then
+      rasterCount = 1
     else
-        openspace.printError("Unknown format \"" .. format .. "\". Use 'jpg' or 'png'")
-        return ""
+      rasterCount = 3
     end
+  elseif format == "png" then
+    rasterCount = 4
+  else
+    openspace.printError("Unknown format \"" .. format .. "\". Use 'jpg' or 'png'")
+    return ""
+  end
 
-    local gdalWmsTemplate =
+  local gdalWmsTemplate =
     "<GDAL_WMS>" ..
-        "<Service name=\"TMS\">" ..
-            "<ServerUrl>https://gibs.earthdata.nasa.gov/wmts/epsg4326/best/" ..
-            layerName .. "/default/" .. date .. "/" .. resolution ..
-            "/${z}/${y}/${x}." .. format .. "</ServerUrl>" ..
-        "</Service>" ..
-        "<DataWindow>" ..
-            "<UpperLeftX>-180.0</UpperLeftX>" ..
-            "<UpperLeftY>90</UpperLeftY>" ..
-            "<LowerRightX>396.0</LowerRightX>" ..
-            "<LowerRightY>-198</LowerRightY>" ..
-            "<TileLevel>" .. tileLevel .. "</TileLevel>" ..
-            "<TileCountX>2</TileCountX>" ..
-            "<TileCountY>1</TileCountY>" ..
-            "<YOrigin>top</YOrigin>" ..
-        "</DataWindow>" ..
-        "<Projection>EPSG:4326</Projection>" ..
-        "<BlockSizeX>512</BlockSizeX>" ..
-        "<BlockSizeY>512</BlockSizeY>" ..
-        "<BandsCount>" .. rasterCount .. "</BandsCount>" ..
-        "<UnsafeSSL>true</UnsafeSSL>" ..
-        "<ZeroBlockHttpCodes>400,204,404</ZeroBlockHttpCodes>" ..
-        "<ZeroBlockOnServerException>true</ZeroBlockOnServerException>" ..
-        "<Timeout>5</Timeout>" ..
+      "<Service name=\"TMS\">" ..
+        "<ServerUrl>https://gibs.earthdata.nasa.gov/wmts/epsg4326/best/" ..
+        layerName .. "/default/" .. date .. "/" .. resolution ..
+        "/${z}/${y}/${x}." .. format .. "</ServerUrl>" ..
+      "</Service>" ..
+      "<DataWindow>" ..
+        "<UpperLeftX>-180.0</UpperLeftX>" ..
+        "<UpperLeftY>90</UpperLeftY>" ..
+        "<LowerRightX>396.0</LowerRightX>" ..
+        "<LowerRightY>-198</LowerRightY>" ..
+        "<TileLevel>" .. tileLevel .. "</TileLevel>" ..
+        "<TileCountX>2</TileCountX>" ..
+        "<TileCountY>1</TileCountY>" ..
+        "<YOrigin>top</YOrigin>" ..
+      "</DataWindow>" ..
+      "<Projection>EPSG:4326</Projection>" ..
+      "<BlockSizeX>512</BlockSizeX>" ..
+      "<BlockSizeY>512</BlockSizeY>" ..
+      "<BandsCount>" .. rasterCount .. "</BandsCount>" ..
+      "<UnsafeSSL>true</UnsafeSSL>" ..
+      "<ZeroBlockHttpCodes>400,204,404</ZeroBlockHttpCodes>" ..
+      "<ZeroBlockOnServerException>true</ZeroBlockOnServerException>" ..
+      "<Timeout>5</Timeout>" ..
     "</GDAL_WMS>"
 
-    return gdalWmsTemplate
+  return gdalWmsTemplate
 end
 
 openspace.globebrowsing.createTemporalGibsGdalXml = function (layerName, resolution, format)
-    return openspace.globebrowsing.createGibsGdalXml(layerName, "${OpenSpaceTimeId}", resolution, format)
+  return openspace.globebrowsing.createGibsGdalXml(layerName, "${OpenSpaceTimeId}", resolution, format)
 end
 
 openspace.globebrowsing.parseInfoFile = function (file)
-    -- We are loading these values from an external info file and since we are switching
-    -- to a strict Lua, we need to predefine these global variables
-    local function declare(name)
-        rawset(_G, name, "")
-    end
+  -- We are loading these values from an external info file and since we are switching
+  -- to a strict Lua, we need to predefine these global variables
+  local function declare(name)
+    rawset(_G, name, "")
+  end
 
-    declare("Name")
-    declare("Identifier")
-    declare("Description")
-    declare("ColorFile")
-    declare("HeightFile")
-    declare("Location")
-    declare("ZIndex")
-    declare("BlendMode")
+  declare("Name")
+  declare("Identifier")
+  declare("Description")
+  declare("ColorFile")
+  declare("HeightFile")
+  declare("Location")
+  declare("ZIndex")
+  declare("BlendMode")
 
-    local dir = openspace.directoryForPath(file)
-    local file_func, error = loadfile(file)
-    if file_func then
-        file_func()
-    else
-        openspace.printError('Error loading file "' .. file .. '": '.. error)
-        return nil
-    end
+  local dir = openspace.directoryForPath(file)
+  local file_func, error = loadfile(file)
+  if file_func then
+    file_func()
+  else
+    openspace.printError('Error loading file "' .. file .. '": '.. error)
+    return nil
+  end
 
-    -- Hoist the global variables into local space
-    local Name = rawget(_G, "Name")
-    local Identifier = rawget(_G, "Identifier")
-    local Description = rawget(_G, "Description")
-    local ColorFile = rawget(_G, "ColorFile")
-    local HeightFile = rawget(_G, "HeightFile")
-    local Location = rawget(_G, "Location")
-    local ZIndex = rawget(_G, "ZIndex")
-    local BlendMode = rawget(_G, "BlendMode")
+  -- Hoist the global variables into local space
+  local Name = rawget(_G, "Name")
+  local Identifier = rawget(_G, "Identifier")
+  local Description = rawget(_G, "Description")
+  local ColorFile = rawget(_G, "ColorFile")
+  local HeightFile = rawget(_G, "HeightFile")
+  local Location = rawget(_G, "Location")
+  local ZIndex = rawget(_G, "ZIndex")
+  local BlendMode = rawget(_G, "BlendMode")
 
-    -- Now we can start
-    local name = Name or Identifier
-    local identifier = Identifier
-    local zIndex = ZIndex
-    local blendMode = BlendMode
-    if zIndex == "" then
-        zIndex = nil
-    end
-    if blendMode == "" then
-        -- Color blending is the default for .info files if nothing else is specified
-        blendMode = "Color"
-    end
+  -- Now we can start
+  local name = Name or Identifier
+  local identifier = Identifier
+  local zIndex = ZIndex
+  local blendMode = BlendMode
+  if zIndex == "" then
+    zIndex = nil
+  end
+  if blendMode == "" then
+    -- Color blending is the default for .info files if nothing else is specified
+    blendMode = "Color"
+  end
 
-    if identifier == "" then
-        openspace.printError('Error loading file "' .. file .. '": No "Identifier" found')
-        return nil
-    end
+  if identifier == "" then
+    openspace.printError('Error loading file "' .. file .. '": No "Identifier" found')
+    return nil
+  end
 
-    local color = nil
-    if ColorFile and ColorFile ~= "" then
-        color = {
-            Identifier = identifier,
-            Name = name,
-            Description = Description or "",
-            FilePath = dir .. '/' .. ColorFile,
-            BlendMode = blendMode,
-            ZIndex = zIndex
-        }
-    end
-
-    local height = nil
-    if HeightFile and HeightFile ~= "" then
-        height = {
-            Identifier = identifier,
-            Name = name,
-            Description = Description or "",
-            FilePath = dir .. '/' .. HeightFile,
-            TilePixelSize = 65,
-            ZIndex = zIndex
-        }
-    end
-
-    local location = nil
-    if Location then
-        location = Location
-    end
-
-    return {
-        Color = color,
-        Height = height,
-        Name = name,
-        Location = location,
-        Identifier = identifier
+  local color = nil
+  if ColorFile and ColorFile ~= "" then
+    color = {
+      Identifier = identifier,
+      Name = name,
+      Description = Description or "",
+      FilePath = dir .. "/" .. ColorFile,
+      BlendMode = blendMode,
+      ZIndex = zIndex
     }
+  end
+
+  local height = nil
+  if HeightFile and HeightFile ~= "" then
+    height = {
+      Identifier = identifier,
+      Name = name,
+      Description = Description or "",
+      FilePath = dir .. "/" .. HeightFile,
+      TilePixelSize = 65,
+      ZIndex = zIndex
+    }
+  end
+
+  local location = nil
+  if Location then
+    location = Location
+  end
+
+  return {
+    Color = color,
+    Height = height,
+    Name = name,
+    Location = location,
+    Identifier = identifier
+  }
 end
 
 openspace.globebrowsing.addBlendingLayersFromDirectory = function (dir, node_name)
-    local function ends_with(str, ending)
-        return ending == '' or str:sub(-#ending) == ending
-    end
-
-    -- Walking the directory with an empty string will cause the current working directory
-    -- to be walked recursively. This is probably not what the users expects (and it is
-    -- also one of the default values in the globebrowsing customization script), so we
-    -- ignore the empty string here
-
-    if dir == nil or dir == '' then
-        openspace.printError("No directory specified")
-        return
-    end
-    if node_name == nil or node_name == '' then
-        openspace.printError("No node name specified")
-        return
-    end
-
-    local files = openspace.walkDirectoryFiles(dir, true, true)
-
-    for _, file in pairs(files) do
-        if file and file:find('.info') and ends_with(file, '.info') then
-            local t = openspace.globebrowsing.parseInfoFile(file)
-
-            if t and t.Color then
-                openspace.printInfo("Adding color layer '" .. t.Color["Identifier"] .. "'")
-                openspace.globebrowsing.addLayer(node_name, "ColorLayers", t.Color)
-            end
-            if t and t.Height then
-                openspace.printInfo("Adding height layer '" .. t.Height["Identifier"] .. "'")
-                openspace.globebrowsing.addLayer(node_name, "HeightLayers", t.Height)
-            end
-        end
+  local function ends_with(str, ending)
+    return ending == "" or str:sub(-#ending) == ending
+  end
+
+  -- Walking the directory with an empty string will cause the current working directory
+  -- to be walked recursively. This is probably not what the users expects (and it is
+  -- also one of the default values in the globebrowsing customization script), so we
+  -- ignore the empty string here
+
+  if dir == nil or dir == "" then
+    openspace.printError("No directory specified")
+    return
+  end
+  if node_name == nil or node_name == "" then
+    openspace.printError("No node name specified")
+    return
+  end
+
+  local files = openspace.walkDirectoryFiles(dir, true, true)
+
+  for _, file in pairs(files) do
+    if file and file:find(".info") and ends_with(file, ".info") then
+      local t = openspace.globebrowsing.parseInfoFile(file)
+
+      if t and t.Color then
+        openspace.printInfo("Adding color layer '" .. t.Color["Identifier"] .. "'")
+        openspace.globebrowsing.addLayer(node_name, "ColorLayers", t.Color)
+      end
+      if t and t.Height then
+        openspace.printInfo("Adding height layer '" .. t.Height["Identifier"] .. "'")
+        openspace.globebrowsing.addLayer(node_name, "HeightLayers", t.Height)
+      end
     end
+  end
 end
 
 openspace.globebrowsing.addFocusNodesFromDirectory = function (dir, node_name)
-    local files = openspace.walkDirectoryFiles(dir, true, true)
+  local files = openspace.walkDirectoryFiles(dir, true, true)
 
-    for _, file in pairs(files) do
-        if file and file:find('.info') then
-            local t = openspace.globebrowsing.parseInfoFile(file)
+  for _, file in pairs(files) do
+    if file and file:find(".info") then
+      local t = openspace.globebrowsing.parseInfoFile(file)
 
-            if node_name and t and t.Location then
-                openspace.printInfo("Creating focus node for '" .. node_name .. "'")
+      if node_name and t and t.Location then
+        openspace.printInfo("Creating focus node for '" .. node_name .. "'")
 
-                local lat = t.Location.Center[1]
-                local long = t.Location.Center[2]
+        local lat = t.Location.Center[1]
+        local long = t.Location.Center[2]
 
-                local identifier = node_name .. " - " .. t.Identifier
-                local name = node_name .. " - " .. t.Name
+        local identifier = node_name .. " - " .. t.Identifier
+        local name = node_name .. " - " .. t.Name
 
-                openspace.addSceneGraphNode({
-                    Identifier = identifier,
-                    Parent = node_name,
-                    Transform = {
-                        Translation = {
-                            Type = "GlobeTranslation",
-                            Globe = node_name,
-                            Latitude = lat,
-                            Longitude = long,
-                            UseHeightmap = true
-                        }
-                    },
-                    GUI = {
-                        Path = "/Other/Bookmarks",
-                        Name = name
-                    }
-                })
-            end
-        end
+        openspace.addSceneGraphNode({
+          Identifier = identifier,
+          Parent = node_name,
+          Transform = {
+            Translation = {
+              Type = "GlobeTranslation",
+              Globe = node_name,
+              Latitude = lat,
+              Longitude = long,
+              UseHeightmap = true
+            }
+          },
+          GUI = {
+            Path = "/Other/Bookmarks",
+            Name = name
+          }
+        })
+      end
     end
+  end
 end
 
 openspace.globebrowsing.addFocusNodeFromLatLong = function (name, globe_identifier, lat, long, altitude)
-    altitude = altitude or 0;
+  altitude = altitude or 0;
 
-    local identifier = globe_identifier .. "-" .. name
+  local identifier = globe_identifier .. "-" .. name
 
-    openspace.addSceneGraphNode({
-        Identifier = identifier,
-        Parent = globe_identifier,
-        Transform = {
-            Translation = {
-                Type = "GlobeTranslation",
-                Globe = globe_identifier,
-                Latitude = lat,
-                Longitude = long,
-                FixedAltitude = altitude
-            }
-        },
-        GUI = {
-            Path = "/Other/Bookmarks",
-            Name = identifier
-        }
-    })
+  openspace.addSceneGraphNode({
+    Identifier = identifier,
+    Parent = globe_identifier,
+    Transform = {
+      Translation = {
+        Type = "GlobeTranslation",
+        Globe = globe_identifier,
+        Latitude = lat,
+        Longitude = long,
+        FixedAltitude = altitude
+      }
+    },
+    GUI = {
+      Path = "/Other/Bookmarks",
+      Name = identifier
+    }
+  })
 
-    return identifier
+  return identifier
 end
 
 
 openspace.globebrowsing.loadWMSServersFromFile = function (file_path)
-    local servers = dofile(file_path)
+  local servers = dofile(file_path)
 
-    for key, value in pairs(servers) do
-        local globe = key
-        for _,val in pairs(value) do
-            openspace.globebrowsing.loadWMSCapabilities(
-                val["Name"],
-                globe,
-                val["URL"]
-            )
-        end
+  for key, value in pairs(servers) do
+    local globe = key
+    for _,val in pairs(value) do
+      openspace.globebrowsing.loadWMSCapabilities(val["Name"], globe, val["URL"] )
     end
+  end
 end
diff --git a/modules/globebrowsing/scripts/node_support.lua b/modules/globebrowsing/scripts/node_support.lua
index d0154a160f..937798766b 100644
--- a/modules/globebrowsing/scripts/node_support.lua
+++ b/modules/globebrowsing/scripts/node_support.lua
@@ -1,35 +1,50 @@
 openspace.globebrowsing.documentation = {
   {
     Name = "setNodePosition",
-    Arguments = {{ "nodeIdentifer", "String" }, { "globeIdentifier", "String" }, { "latitude", "Number" }, { "longitude", "Number" }, { "altitude", "Number" }},
-    Documentation =
-        "Sets the position of a SceneGraphNode that has GlobeTranslation/GlobeRotations. " ..
-        "Usage: openspace.globebrowsing.setNodePosition(" ..
-        "\"Scale_StatueOfLiberty\", \"Earth\", 40.000, -117.5, optionalAltitude)"
+    Arguments = {
+      { "nodeIdentifer", "String" },
+      { "globeIdentifier", "String" },
+      { "latitude", "Number" },
+      { "longitude", "Number" },
+      { "altitude", "Number" }
+    },
+    Documentation = [[
+      Sets the position of a SceneGraphNode that has GlobeTranslation/GlobeRotations.
+      Usage:
+      openspace.globebrowsing.setNodePosition(
+        "Scale_StatueOfLiberty", "Earth", 40.000, -117.5, optionalAltitude
+      )
+    ]]
   },
   {
     Name = "setNodePositionFromCamera",
-    Arguments = {{ "nodeIdentifer", "String" }, { "useAltitude", "Boolean" }},
-    Documentation =
-        "Sets the position of a SceneGraphNode that has GlobeTranslation/GlobeRotations" ..
-        " to match the camera. Only uses camera position not rotation. If useAltitude" ..
-        " is true, then the position will also be updated to the camera's altitude." ..
-        "Usage: openspace.globebrowsing.setNodePositionFromCamera(" ..
-        "\"Scale_StatueOfLiberty\", optionalUseAltitude)"
+    Arguments = {
+      { "nodeIdentifer", "String" },
+      { "useAltitude", "Boolean" }
+    },
+    Documentation = [[
+      Sets the position of a SceneGraphNode that has GlobeTranslation/GlobeRotations to
+      match the camera. Only uses camera position not rotation. If useAltitude is true,
+      then the position will also be updated to the camera's altitude.
+      Usage:
+      openspace.globebrowsing.setNodePositionFromCamera(
+        "Scale_StatueOfLiberty", optionalUseAltitude
+      )
+    ]]
   }
 }
 
 openspace.globebrowsing.setNodePosition = function (node_identifer, globe_identifier, lat, lon, altitude)
     openspace.setParent(node_identifer, globe_identifier)
-    openspace.setPropertyValueSingle('Scene.' .. node_identifer .. '.Translation.Globe', globe_identifier);
-    openspace.setPropertyValueSingle('Scene.' .. node_identifer .. '.Translation.Latitude', lat);
-    openspace.setPropertyValueSingle('Scene.' .. node_identifer .. '.Translation.Longitude', lon);
-    openspace.setPropertyValueSingle('Scene.' .. node_identifer .. '.Rotation.Globe', globe_identifier);
-    openspace.setPropertyValueSingle('Scene.' .. node_identifer .. '.Rotation.Latitude', lat);
-    openspace.setPropertyValueSingle('Scene.' .. node_identifer .. '.Rotation.Longitude', lon);
+    openspace.setPropertyValueSingle("Scene." .. node_identifer .. ".Translation.Globe", globe_identifier);
+    openspace.setPropertyValueSingle("Scene." .. node_identifer .. ".Translation.Latitude", lat);
+    openspace.setPropertyValueSingle("Scene." .. node_identifer .. ".Translation.Longitude", lon);
+    openspace.setPropertyValueSingle("Scene." .. node_identifer .. ".Rotation.Globe", globe_identifier);
+    openspace.setPropertyValueSingle("Scene." .. node_identifer .. ".Rotation.Latitude", lat);
+    openspace.setPropertyValueSingle("Scene." .. node_identifer .. ".Rotation.Longitude", lon);
     if (altitude) then
-        openspace.setPropertyValueSingle('Scene.' .. node_identifer .. '.Translation.Altitude', altitude);
-        openspace.setPropertyValueSingle('Scene.' .. node_identifer .. '.Translation.Altitude', altitude);
+        openspace.setPropertyValueSingle("Scene." .. node_identifer .. ".Translation.Altitude", altitude);
+        openspace.setPropertyValueSingle("Scene." .. node_identifer .. ".Translation.Altitude", altitude);
     end
 end
 
@@ -37,14 +52,14 @@ openspace.globebrowsing.setNodePositionFromCamera = function (node_identifer, us
     local lat, lon, alt = openspace.globebrowsing.geoPositionForCamera();
     local camera = openspace.navigation.getNavigationState();
     openspace.setParent(node_identifer, camera.Anchor)
-    openspace.setPropertyValueSingle('Scene.' .. node_identifer .. '.Translation.Globe', camera.Anchor);
-    openspace.setPropertyValueSingle('Scene.' .. node_identifer .. '.Translation.Latitude', lat);
-    openspace.setPropertyValueSingle('Scene.' .. node_identifer .. '.Translation.Longitude', lon);
-    openspace.setPropertyValueSingle('Scene.' .. node_identifer .. '.Rotation.Globe', camera.Anchor);
-    openspace.setPropertyValueSingle('Scene.' .. node_identifer .. '.Rotation.Latitude', lat);
-    openspace.setPropertyValueSingle('Scene.' .. node_identifer .. '.Rotation.Longitude', lon);
+    openspace.setPropertyValueSingle("Scene." .. node_identifer .. ".Translation.Globe", camera.Anchor);
+    openspace.setPropertyValueSingle("Scene." .. node_identifer .. ".Translation.Latitude", lat);
+    openspace.setPropertyValueSingle("Scene." .. node_identifer .. ".Translation.Longitude", lon);
+    openspace.setPropertyValueSingle("Scene." .. node_identifer .. ".Rotation.Globe", camera.Anchor);
+    openspace.setPropertyValueSingle("Scene." .. node_identifer .. ".Rotation.Latitude", lat);
+    openspace.setPropertyValueSingle("Scene." .. node_identifer .. ".Rotation.Longitude", lon);
     if (use_altitude) then
-        openspace.setPropertyValueSingle('Scene.' .. node_identifer .. '.Translation.Altitude', alt);
-        openspace.setPropertyValueSingle('Scene.' .. node_identifer .. '.Translation.Altitude', alt);
+        openspace.setPropertyValueSingle("Scene." .. node_identifer .. ".Translation.Altitude", alt);
+        openspace.setPropertyValueSingle("Scene." .. node_identifer .. ".Translation.Altitude", alt);
     end
 end
diff --git a/modules/space/scripts/spice.lua b/modules/space/scripts/spice.lua
index d0d53e918f..09c12aa05d 100644
--- a/modules/space/scripts/spice.lua
+++ b/modules/space/scripts/spice.lua
@@ -1,15 +1,17 @@
 openspace.space.documentation = {
   {
     Name = "tleToSpiceTranslation",
-    Arguments = {{ "tlePath", "String" }},
+    Arguments = {
+      { "tlePath", "String" }
+    },
     Return = "{ Translation, SpiceKernel }",
     Documentation = [[
-        Takes the provided TLE file, converts it into a SPICE kernel and returns a
-        SpiceTranslation instance that can be used to access the information in the TLE
-        file using SPICE's superior integral solver.
+      Takes the provided TLE file, converts it into a SPICE kernel and returns a
+      SpiceTranslation instance that can be used to access the information in the TLE
+      file using SPICE's superior integral solver.
 
-        The second return value is the spice kernel that should be loaded and unloaded by
-        whoever called this function.
+      The second return value is the spice kernel that should be loaded and unloaded by
+      whoever called this function.
     ]]
   }
 }

From f10a2b1a22866b386d9c15b0ee9a2c169031ed23 Mon Sep 17 00:00:00 2001
From: Alexander Bock <alexander.bock@liu.se>
Date: Tue, 16 Jul 2024 12:46:15 +0200
Subject: [PATCH 532/701] Add a new Lua function to create debug axes for the
 current focus node

---
 modules/debugging/debuggingmodule.cpp |  8 ++++--
 modules/debugging/scripts/axes.lua    | 35 +++++++++++++++++++++++++++
 2 files changed, 41 insertions(+), 2 deletions(-)
 create mode 100644 modules/debugging/scripts/axes.lua

diff --git a/modules/debugging/debuggingmodule.cpp b/modules/debugging/debuggingmodule.cpp
index 87d81a8663..93add8f04f 100644
--- a/modules/debugging/debuggingmodule.cpp
+++ b/modules/debugging/debuggingmodule.cpp
@@ -37,6 +37,7 @@
 #include <openspace/scripting/scriptengine.h>
 #include <openspace/scripting/lualibrary.h>
 #include <openspace/util/factorymanager.h>
+#include <ghoul/filesystem/filesystem.h>
 #include <ghoul/logging/logmanager.h>
 #include <ghoul/misc/assert.h>
 #include <ghoul/misc/templatefactory.h>
@@ -63,13 +64,16 @@ std::vector<documentation::Documentation> DebuggingModule::documentations() cons
 
 scripting::LuaLibrary DebuggingModule::luaLibrary() const {
     return {
-        "debugging",
-        {
+        .name = "debugging",
+        .functions = {
             codegen::lua::RenderCameraPath,
             codegen::lua::RemoveRenderedCameraPath,
             codegen::lua::RenderPathControlPoints,
             codegen::lua::RemovePathControlPoints,
             codegen::lua::AddCartesianAxes
+        },
+        .scripts = {
+            absPath("${MODULE_DEBUGGING}/scripts/axes.lua")
         }
     };
 }
diff --git a/modules/debugging/scripts/axes.lua b/modules/debugging/scripts/axes.lua
new file mode 100644
index 0000000000..4fa5dac1f1
--- /dev/null
+++ b/modules/debugging/scripts/axes.lua
@@ -0,0 +1,35 @@
+openspace.debugging.documentation = {
+  {
+    Name = "createCoordinateAxes",
+    Arguments = {},
+    Documentation = [[
+      Creates a new scene graph node that show the coordinate system used for the
+      currently selected focus node.
+    ]]
+  }
+}
+
+openspace.debugging.createCoordinateAxes = function ()
+  local anchor = openspace.navigation.getNavigationState().Anchor
+  local radius = openspace.propertyValue("Scene." .. anchor .. ".EvaluatedInteractionSphere")
+
+  local node = {
+    Identifier = anchor .. "_DebugAxes",
+    Parent = anchor,
+    Transform = {
+      Scale = {
+        Type = "StaticScale",
+        Scale = radius * 2.5
+      }
+    },
+    Renderable = {
+      Type = "RenderableCartesianAxes"
+    },
+    GUI = {
+      Name = anchor .. " (Debug Axes)",
+      Path = openspace.propertyValue("Scene." .. anchor .. ".GuiPath")
+    }
+  }
+
+  openspace.addSceneGraphNode(node)
+end

From cca2f7e272d2cdbd8f4223603becb02dbed90392 Mon Sep 17 00:00:00 2001
From: Emma Broman <emma.broman@liu.se>
Date: Wed, 17 Jul 2024 09:54:59 +0200
Subject: [PATCH 533/701] Add possiblity to sort SGNs in GUI based on numerical
 value (#3340)

* Add possiblity to sort SGNs in GUI based on numerical value

And apply to grids

* Fix mistake in docs

* Apply suggestions from code review

Co-authored-by: Ylva Selling <ylva.selling@gmail.com>

* Rename Order -> Ordering and remove unused getter functions

* Update GUI hash to match the UI changes

---------

Co-authored-by: Ylva Selling <ylva.selling@gmail.com>
---
 data/assets/scene/digitaluniverse/grids.asset | 39 ++++++++++++-------
 data/assets/util/webgui.asset                 |  2 +-
 include/openspace/scene/scenegraphnode.h      |  6 ++-
 src/scene/scenegraphnode.cpp                  | 35 +++++++++++++++++
 4 files changed, 66 insertions(+), 16 deletions(-)

diff --git a/data/assets/scene/digitaluniverse/grids.asset b/data/assets/scene/digitaluniverse/grids.asset
index 56ae14703a..c0b5341290 100644
--- a/data/assets/scene/digitaluniverse/grids.asset
+++ b/data/assets/scene/digitaluniverse/grids.asset
@@ -270,7 +270,8 @@ local Plane1lh = {
   },
   GUI = {
     Name = "1lh Grid",
-    Path = "/Other/Grids"
+    Path = "/Other/Grids",
+    OrderingNumber = LightHour
   }
 }
 
@@ -301,7 +302,8 @@ local Plane1ld = {
   },
   GUI = {
     Name = "1ld Grid",
-    Path = "/Other/Grids"
+    Path = "/Other/Grids",
+    OrderingNumber = LightDay
   }
 }
 
@@ -332,7 +334,8 @@ local Plane1lm = {
   },
   GUI = {
     Name = "1lm Grid",
-    Path = "/Other/Grids"
+    Path = "/Other/Grids",
+    OrderingNumber = LightMonth
   }
 }
 
@@ -363,7 +366,8 @@ local Plane1ly = {
   },
   GUI = {
     Name = "1ly Grid",
-    Path = "/Other/Grids"
+    Path = "/Other/Grids",
+    OrderingNumber = LightYear
   }
 }
 
@@ -394,7 +398,8 @@ local Plane10ly = {
   },
   GUI = {
     Name = "10ly Grid",
-    Path = "/Other/Grids"
+    Path = "/Other/Grids",
+    OrderingNumber = 10 * LightYear
   }
 }
 
@@ -425,7 +430,8 @@ local Plane100ly = {
   },
   GUI = {
     Name = "100ly Grid",
-    Path = "/Other/Grids"
+    Path = "/Other/Grids",
+    OrderingNumber = 100 * LightYear
   }
 }
 
@@ -456,7 +462,8 @@ local Plane1kly = {
   },
   GUI = {
     Name = "1kly Grid",
-    Path = "/Other/Grids"
+    Path = "/Other/Grids",
+    OrderingNumber = 1000 * LightYear
   }
 }
 
@@ -487,7 +494,8 @@ local Plane10kly = {
   },
   GUI = {
     Name = "10kly Grid",
-    Path = "/Other/Grids"
+    Path = "/Other/Grids",
+    OrderingNumber = 10000 * LightYear
   }
 }
 
@@ -513,7 +521,8 @@ local Plane100kly = {
   },
   GUI = {
     Name = "100kly Grid",
-    Path = "/Other/Grids"
+    Path = "/Other/Grids",
+    OrderingNumber = 100000 * LightYear
   }
 }
 
@@ -539,7 +548,8 @@ local Plane1Mly = {
   },
   GUI = {
     Name = "1Mly Grid",
-    Path = "/Other/Grids"
+    Path = "/Other/Grids",
+    OrderingNumber = 1E6 * LightYear
   }
 }
 
@@ -565,7 +575,8 @@ local Plane10Mly = {
   },
   GUI = {
     Name = "10Mly Grid",
-    Path = "/Other/Grids"
+    Path = "/Other/Grids",
+    OrderingNumber = 10E6 * LightYear
   }
 }
 
@@ -591,7 +602,8 @@ local Plane100Mly = {
   },
   GUI = {
     Name = "100Mly Grid",
-    Path = "/Other/Grids"
+    Path = "/Other/Grids",
+    OrderingNumber = 100E6 * LightYear
   }
 }
 
@@ -617,7 +629,8 @@ local Plane20Gly = {
   },
   GUI = {
     Name = "20Gly Grid",
-    Path = "/Other/Grids"
+    Path = "/Other/Grids",
+    OrderingNumber = 20E9 * LightYear
   }
 }
 
diff --git a/data/assets/util/webgui.asset b/data/assets/util/webgui.asset
index 3ee09e3a7c..36dae8ce95 100644
--- a/data/assets/util/webgui.asset
+++ b/data/assets/util/webgui.asset
@@ -4,7 +4,7 @@ local guiCustomization = asset.require("customization/gui")
 
 
 -- Select which commit hashes to use for the frontend and backend
-local frontendHash = "67262b3edb3c33580d73e0bb5a61a0321a0b218e"
+local frontendHash = "654c79e7f30e61249b93be509758ac675022e5f3"
 
 local frontend = asset.resource({
   Identifier = "WebGuiFrontend",
diff --git a/include/openspace/scene/scenegraphnode.h b/include/openspace/scene/scenegraphnode.h
index fbd426ab14..edb3a9558f 100644
--- a/include/openspace/scene/scenegraphnode.h
+++ b/include/openspace/scene/scenegraphnode.h
@@ -170,15 +170,17 @@ private:
     std::vector<std::string> _onRecedeAction;
     std::vector<std::string> _onExitAction;
 
+    ghoul::mm_unique_ptr<Renderable> _renderable;
+
     // If this value is 'true' GUIs are asked to hide this node from collections, as it
     // might be a node that is not very interesting (for example barycenters)
     properties::BoolProperty _guiHidden;
 
-    ghoul::mm_unique_ptr<Renderable> _renderable;
-
     properties::StringProperty _guiPath;
     properties::StringProperty _guiDisplayName;
     properties::StringProperty _guiDescription;
+    properties::FloatProperty _guiOrderingNumber;
+    properties::BoolProperty _useGuiOrdering;
 
     // Transformation defined by translation, rotation and scale
     struct {
diff --git a/src/scene/scenegraphnode.cpp b/src/scene/scenegraphnode.cpp
index 9c72936bb1..55f8064813 100644
--- a/src/scene/scenegraphnode.cpp
+++ b/src/scene/scenegraphnode.cpp
@@ -175,6 +175,23 @@ namespace {
         openspace::properties::Property::Visibility::Hidden
     };
 
+    constexpr openspace::properties::Property::PropertyInfo GuiOrderInfo = {
+        "GuiOrderingNumber",
+        "Gui Ordering Number",
+        "This is an optional numerical value that will affect the sorting of this scene "
+        "graph node in relation to its neighbors in the GUI. Nodes with the same value "
+        "will be sorted alphabetically.",
+        openspace::properties::Property::Visibility::Hidden
+    };
+
+    constexpr openspace::properties::Property::PropertyInfo UseGuiOrderInfo = {
+        "UseGuiOrdering",
+        "Use Gui Ordering",
+        "If true, use the 'GuiOrderingNumber' to place this scene graph node in a "
+        "sorted way in relation to its neighbors in the GUI",
+        openspace::properties::Property::Visibility::Hidden
+    };
+
     constexpr openspace::properties::Property::PropertyInfo ShowDebugSphereInfo = {
         "ShowDebugSphere",
         "Show Debug Sphere",
@@ -309,6 +326,15 @@ namespace {
             // scene graph node. This is most useful to trim collective lists of nodes and
             // not display, for example, barycenters
             std::optional<bool> hidden;
+
+            // If this value is specified, the scene graph node will be ordered in
+            // relation to its neighbors in the GUI based on this value, so that nodes
+            // with a higher value appear later in the list. Scene graph nodes with the
+            // same value will be sorted alphabetically.
+            //
+            // The nodes without a given value will be placed at the bottom of the list
+            // and sorted alphabetically.
+            std::optional<double> orderingNumber;
         };
         // Additional information that is passed to GUI applications. These are all hints
         // and do not have any impact on the actual function of the scene graph node
@@ -362,6 +388,11 @@ ghoul::mm_unique_ptr<SceneGraphNode> SceneGraphNode::createFromDictionary(
             }
             result->_guiPath = *p.gui->path;
         }
+
+        result->_useGuiOrdering = p.gui->orderingNumber.has_value();
+        if (p.gui->orderingNumber.has_value()) {
+            result->_guiOrderingNumber = *p.gui->orderingNumber;
+        }
     }
 
     result->_boundingSphere = p.boundingSphere.value_or(result->_boundingSphere);
@@ -512,6 +543,8 @@ SceneGraphNode::SceneGraphNode()
     , _guiPath(GuiPathInfo, "/")
     , _guiDisplayName(GuiNameInfo)
     , _guiDescription(GuiDescriptionInfo)
+    , _guiOrderingNumber(GuiOrderInfo, 0.f)
+    , _useGuiOrdering(UseGuiOrderInfo, false)
     , _transform {
         ghoul::mm_unique_ptr<Translation>(
             global::memoryManager->PersistentMemory.alloc<StaticTranslation>()
@@ -593,6 +626,8 @@ SceneGraphNode::SceneGraphNode()
     addProperty(_guiDescription);
     addProperty(_guiHidden);
     addProperty(_guiPath);
+    addProperty(_guiOrderingNumber);
+    addProperty(_useGuiOrdering);
 }
 
 SceneGraphNode::~SceneGraphNode() {}

From babbb4f97c37c68aa26e77b7917180cde2fc2153 Mon Sep 17 00:00:00 2001
From: Emma Broman <emma.broman@liu.se>
Date: Wed, 17 Jul 2024 11:25:26 +0200
Subject: [PATCH 534/701] 2024 Digital Universe Data Update (#3335)

* Update 2dF.asset

* Changes to the filename metadata, as wekll as the description.

* 2024 DU updates.

* Apply suggestions from code review

Co-authored-by: Alexander Bock <mail@alexanderbock.eu>

Apply suggestions from code review

* Changes to the asset descriptions, the GUI path, and some of the settings.

* Fixed minor error in a variable name.

* Wrote the individual descriptions for each asset.

* Adjusted the size (brightness).

* Update identifier to one that works

* Update asset versions and correctly format asset files

* Reset exoplanet rings size

To make them visible when viewed further away, e..g at the distance of the radiosphere, and make the Kepler FoV more apparent

* Clean up scale variables

* Line-break long descriptions

As long as we expect users to manually edit files, they need to be readable

* Remove letters that sorts the grids by size

* Split allsky into two assets

Remove asset that was split in two and update DU meta asset

* Replace dwarfs texture with generic point texture resource

* Remove all DU version comments, to reduce "noise"

These would be confusing to our users

* Some final cleanup

* Remove commented radii

* Local Universe -> Nearby Surveys

* Remove asset versions

* Apply suggestions from code review

Co-authored-by: Malin E <malin.ejdbo@gmail.com>
Co-authored-by: Alexander Bock <alexander.bock@liu.se>

* Remove background setting (non-existing) for spheres

* Rmeove commented out lines in star orbits asset

They are confusing, and the label file they refer to does not exist

* Apply suggestions from code review

* Fix some missing line breaks

* Update sync identifiers to match updates in BigBang PR

* Reuse point textures from the same resource instead of having one copy per dataset

The texture used is the same

* Set brown dwarfs dataset version to 1

* Update bookmarks file with updated star poistions

---------

Co-authored-by: Brian Abbott <80659386+brianpatrick@users.noreply.github.com>
Co-authored-by: brianpatrick <git@brianabbott.net>
Co-authored-by: Malin E <malin.ejdbo@gmail.com>
Co-authored-by: Alexander Bock <alexander.bock@liu.se>
---
 data/assets/base.asset                        |  15 +-
 data/assets/global/openspacebookmarks.asset   |   2 +-
 data/assets/nightsky/altaz.asset              |  11 +-
 .../assets/nightsky/cardinal_directions.asset |   5 +-
 data/assets/nightsky/ecliptic_band.asset      |  16 +-
 data/assets/nightsky/equatorial_band.asset    |  12 +-
 data/assets/nightsky/galactic_band.asset      |  20 +-
 data/assets/nightsky/light_pollution.asset    |   3 +-
 data/assets/nightsky/meridian.asset           |  10 +-
 data/assets/nightsky/nightsky.asset           |   1 +
 data/assets/nightsky/planets.asset            |  11 +-
 data/assets/nightsky/zenith.asset             |   5 +-
 data/assets/scene/digitaluniverse/2dF.asset   |  29 +-
 data/assets/scene/digitaluniverse/2mass.asset |  22 +-
 data/assets/scene/digitaluniverse/6dF.asset   |  27 +-
 data/assets/scene/digitaluniverse/abell.asset |  33 +-
 .../allsky_hydrogenalpha.asset                |  67 +++++
 .../digitaluniverse/allsky_visible.asset      |  59 ++++
 .../digitaluniverse/alternatestarlabels.asset |  22 +-
 .../digitaluniverse/backgroundradiation.asset | 123 ++++----
 .../scene/digitaluniverse/brown_dwarfs.asset  |  79 +++++
 .../digitaluniverse/constellationbounds.asset |  11 +-
 .../digitaluniverse/constellations.asset      |  56 +---
 .../scene/digitaluniverse/deepsky.asset       |   4 +-
 .../digitaluniverse/digitaluniverse.asset     |  20 +-
 .../assets/scene/digitaluniverse/dwarfs.asset |  91 ------
 .../scene/digitaluniverse/exoplanets.asset    |  23 +-
 .../exoplanets_candidates.asset               |  36 ++-
 .../{clusters.asset => galaxy_clusters.asset} |  16 +-
 .../{groups.asset => galaxy_groups.asset}     |  15 +-
 .../digitaluniverse/globularclusters.asset    |  41 +--
 data/assets/scene/digitaluniverse/grids.asset | 281 +++++++++---------
 .../scene/digitaluniverse/h2regions.asset     |  29 +-
 ...ldwarfs.asset => local_group_dwarfs.asset} |  32 +-
 .../scene/digitaluniverse/milkyway.asset      |  20 +-
 .../digitaluniverse/milkyway_arm_labels.asset |  38 +--
 .../digitaluniverse/milkyway_label.asset      |  15 +-
 .../digitaluniverse/milkyway_sphere.asset     |  57 ----
 .../digitaluniverse/obassociations.asset      |  24 +-
 .../scene/digitaluniverse/oort_cloud.asset    |  72 +++++
 .../scene/digitaluniverse/openclusters.asset  |  30 +-
 .../digitaluniverse/planetarynebulae.asset    |  32 +-
 .../scene/digitaluniverse/pulsars.asset       |  39 ++-
 .../scene/digitaluniverse/quasars.asset       |  34 +--
 data/assets/scene/digitaluniverse/sdss.asset  |  45 ++-
 .../digitaluniverse/star_uncertainty.asset    |  65 ++++
 .../scene/digitaluniverse/starlabels.asset    |  11 +-
 .../scene/digitaluniverse/starorbits.asset    |  66 ++--
 data/assets/scene/digitaluniverse/stars.asset |  26 +-
 .../scene/digitaluniverse/superclusters.asset |  24 +-
 .../digitaluniverse/supernovaremnants.asset   |  26 +-
 data/assets/scene/digitaluniverse/tully.asset |  51 ++--
 data/assets/scene/digitaluniverse/voids.asset |  22 +-
 .../scene/digitaluniverse/white_dwarfs.asset  |  67 +++++
 .../constellations/constellation_art.asset    |   2 +-
 data/assets/scene/milkyway/milkyway/eso.asset |   3 +-
 .../scene/milkyway/milkyway/volume.asset      |   2 +-
 57 files changed, 1059 insertions(+), 939 deletions(-)
 create mode 100644 data/assets/scene/digitaluniverse/allsky_hydrogenalpha.asset
 create mode 100644 data/assets/scene/digitaluniverse/allsky_visible.asset
 create mode 100644 data/assets/scene/digitaluniverse/brown_dwarfs.asset
 delete mode 100644 data/assets/scene/digitaluniverse/dwarfs.asset
 rename data/assets/scene/digitaluniverse/{clusters.asset => galaxy_clusters.asset} (70%)
 rename data/assets/scene/digitaluniverse/{groups.asset => galaxy_groups.asset} (72%)
 rename data/assets/scene/digitaluniverse/{localdwarfs.asset => local_group_dwarfs.asset} (55%)
 delete mode 100644 data/assets/scene/digitaluniverse/milkyway_sphere.asset
 create mode 100644 data/assets/scene/digitaluniverse/oort_cloud.asset
 create mode 100644 data/assets/scene/digitaluniverse/star_uncertainty.asset
 create mode 100644 data/assets/scene/digitaluniverse/white_dwarfs.asset

diff --git a/data/assets/base.asset b/data/assets/base.asset
index 3f07199c09..ff5967475c 100644
--- a/data/assets/base.asset
+++ b/data/assets/base.asset
@@ -42,29 +42,31 @@ asset.require("scene/digitaluniverse/2dF")
 asset.require("scene/digitaluniverse/2mass")
 asset.require("scene/digitaluniverse/6dF")
 asset.require("scene/digitaluniverse/abell")
+asset.require("scene/digitaluniverse/allsky_hydrogenalpha")
+asset.require("scene/digitaluniverse/allsky_visible")
 asset.require("scene/digitaluniverse/alternatestarlabels")
 asset.require("scene/digitaluniverse/backgroundradiation")
-asset.require("scene/digitaluniverse/clusters")
+asset.require("scene/digitaluniverse/brown_dwarfs")
+asset.require("scene/digitaluniverse/galaxy_clusters")
 asset.require("scene/digitaluniverse/constellationbounds")
 asset.require("scene/digitaluniverse/constellations")
-asset.require("scene/digitaluniverse/deepsky")
-asset.require("scene/digitaluniverse/dwarfs")
 asset.require("scene/digitaluniverse/exoplanets")
 asset.require("scene/digitaluniverse/exoplanets_candidates")
 asset.require("scene/digitaluniverse/globularclusters")
 asset.require("scene/digitaluniverse/grids")
-asset.require("scene/digitaluniverse/groups")
+asset.require("scene/digitaluniverse/galaxy_groups")
 asset.require("scene/digitaluniverse/h2regions")
-asset.require("scene/digitaluniverse/localdwarfs")
+asset.require("scene/digitaluniverse/local_group_dwarfs")
 asset.require("scene/digitaluniverse/milkyway")
 asset.require("scene/digitaluniverse/milkyway_arm_labels")
 asset.require("scene/digitaluniverse/milkyway_label")
-asset.require("scene/digitaluniverse/milkyway_sphere")
 asset.require("scene/digitaluniverse/obassociations")
+asset.require("scene/digitaluniverse/oort_cloud")
 asset.require("scene/digitaluniverse/openclusters")
 asset.require("scene/digitaluniverse/planetarynebulae")
 asset.require("scene/digitaluniverse/pulsars")
 asset.require("scene/digitaluniverse/quasars")
+asset.require("scene/digitaluniverse/star_uncertainty")
 asset.require("scene/digitaluniverse/starlabels")
 asset.require("scene/digitaluniverse/starorbits")
 asset.require("scene/digitaluniverse/stars")
@@ -72,6 +74,7 @@ asset.require("scene/digitaluniverse/superclusters")
 asset.require("scene/digitaluniverse/supernovaremnants")
 asset.require("scene/digitaluniverse/tully")
 asset.require("scene/digitaluniverse/voids")
+asset.require("scene/digitaluniverse/white_dwarfs")
 asset.require("nightsky/nightsky")
 
 asset.require("customization/globebrowsing")
diff --git a/data/assets/global/openspacebookmarks.asset b/data/assets/global/openspacebookmarks.asset
index d266a22610..5cc6ec1214 100644
--- a/data/assets/global/openspacebookmarks.asset
+++ b/data/assets/global/openspacebookmarks.asset
@@ -1,6 +1,6 @@
 local bookmarkHelper = asset.require("util/generate_bookmarks")
 
-local dataProvider = "http://data.openspaceproject.com/files/bookmarks/v2/bookmarks.csv"
+local dataProvider = "http://data.openspaceproject.com/files/bookmarks/v3/bookmarks.csv"
 
 local bookmarksCSV = asset.resource({
   Identifier = "openspace_bookmarks",
diff --git a/data/assets/nightsky/altaz.asset b/data/assets/nightsky/altaz.asset
index 6a2fd04120..9c6fe16962 100644
--- a/data/assets/nightsky/altaz.asset
+++ b/data/assets/nightsky/altaz.asset
@@ -25,8 +25,8 @@ local AltAzGridPosition = {
     }
   },
   GUI = {
-    Name = "Altitude/Azimuth Grid Position",
-    Path = "/Other/Night Sky",
+    Name = "Altitude-Azimuth Grid Position",
+    Path = "/Night Sky/Coordinate Systems/Altitude-Azimuth",
     Hidden = true
   }
 }
@@ -48,17 +48,17 @@ local AltAzGrid = {
     Type = "RenderableSphericalGrid",
     Enabled = asset.enabled,
     Opacity = 0.8,
-    Color = { 0.4, 0.8, 0.4 },
+    Color = { 0.2, 0.4, 0.2 },
     LineWidth = 2.0,
     RenderBinMode = "PostDeferredTransparent"
   },
   GUI = {
-    Name = "Altitude/Azimuth Grid",
+    Name = "Altitude-Azimuth Grid",
     Description = [[A local Altitude/Azimuth grid centered around your position on a
     planetary surface. The grid can be toggled, hidden or shown using the accompanying
     actions in the actions panel, under "Night Sky". Use these actions to move it to
     another planet. The default is Earth.]],
-    Path = "/Other/Night Sky"
+    Path = "/Night Sky/Coordinate Systems/Altitude-Azimuth"
   }
 }
 
@@ -126,6 +126,7 @@ asset.export("HideAltaz", HideAltaz.Identifier)
 asset.export("ToggleAltaz", ToggleAltaz.Identifier)
 
 
+
 asset.meta = {
   Name = "Altitude/Azimuth Grid",
   Description = [[A local Altitude/Azimuth grid centered around your position on a
diff --git a/data/assets/nightsky/cardinal_directions.asset b/data/assets/nightsky/cardinal_directions.asset
index 50d2487c15..a8c0afb512 100644
--- a/data/assets/nightsky/cardinal_directions.asset
+++ b/data/assets/nightsky/cardinal_directions.asset
@@ -33,7 +33,7 @@ local CardinalDirectionsPosition = {
   },
   GUI = {
     Name = "Cardinal Directions Position",
-    Path = "/Other/Night Sky",
+    Path = "/Night Sky",
     Hidden = true
   }
 }
@@ -63,7 +63,7 @@ local CardinalDirectionSphere = {
     Description = [[A textured sphere showing the cardinal directions.
       The sphere is placed on the planet surface and follows the camera's movements.
     ]],
-    Path = "/Other/Night Sky"
+    Path = "/Night Sky"
   }
 }
 
@@ -158,6 +158,7 @@ asset.export("ShowNeswLettersSmall", ShowNeswLettersSmall.Identifier)
 asset.export("HideNesw", HideNesw.Identifier)
 
 
+
 asset.meta = {
   Name = "Cardinal Directions",
   Description = [[Adds a sphere showing the cardinal directions, that follows the camera
diff --git a/data/assets/nightsky/ecliptic_band.asset b/data/assets/nightsky/ecliptic_band.asset
index 1f0a7d93a5..b67dd33c4a 100644
--- a/data/assets/nightsky/ecliptic_band.asset
+++ b/data/assets/nightsky/ecliptic_band.asset
@@ -22,7 +22,7 @@ local EclipticLine = {
   Transform = {
     Scale = {
       Type = "StaticScale",
-      Scale = 4.28601E17
+      Scale = 9.46377307652E17
     },
     Rotation = {
       Type = "StaticRotation",
@@ -32,16 +32,15 @@ local EclipticLine = {
   Renderable = {
     Type = "RenderableRadialGrid",
     Opacity = 0.8,
-    Color = { 1.0, 1.0, 1.0 },
-    LineWidth = 3.0,
+    Color = { 0.5, 0.24, 0.24 },
+    LineWidth = 4.0,
     GridSegments = { 1, 1 },
-    Radii = { 0.5, 0.5 },
     Enabled = asset.enabled
   },
   GUI = {
-    Name = "Ecliptic Line",
+    Name = "Ecliptic",
     Description = "A line representation of the Ecliptic plane.",
-    Path = "/Other/Lines"
+    Path = "/Night Sky/Coordinate Systems/Ecliptic"
   }
 }
 
@@ -57,7 +56,7 @@ local EclipticBand = {
   Renderable = {
     Type = "RenderableSphereImageLocal",
     Texture = textures .. "band2x.png",
-    Size = 4.28601E17,
+    Size = 9.46377307652E17,
     Segments = 50,
     DisableFadeInOut = true,
     Orientation = "Inside",
@@ -67,7 +66,7 @@ local EclipticBand = {
   GUI = {
     Name = "Ecliptic Band",
     Description = "A band representation of the Ecliptic plane.",
-    Path = "/Other/Lines"
+    Path = "/Night Sky/Coordinate Systems/Ecliptic"
   }
 }
 
@@ -162,6 +161,7 @@ asset.export("HideEclipticBand", HideEclipticBand.Identifier)
 asset.export("ToggleEclipticBand", ToggleEclipticBand.Identifier)
 
 
+
 asset.meta = {
   Name = "Ecliptic Band/Line",
   Description = [[A line and band representation of the Ecliptic plane, including actions
diff --git a/data/assets/nightsky/equatorial_band.asset b/data/assets/nightsky/equatorial_band.asset
index 6b0084aad5..1fb892ddea 100644
--- a/data/assets/nightsky/equatorial_band.asset
+++ b/data/assets/nightsky/equatorial_band.asset
@@ -19,22 +19,21 @@ local EquatorialLine = {
     },
     Scale = {
       Type = "StaticScale",
-      Scale = 4.28601E17
+      Scale = 7.5686E17
     }
   },
   Renderable = {
     Type = "RenderableRadialGrid",
     Opacity = 0.8,
-    Color = { 1.0, 1.0, 1.0 },
-    LineWidth = 3.0,
+    Color = { 0.6, 0.6, 0.2 },
+    LineWidth = 4.0,
     GridSegments = { 1, 1 },
-    Radii = { 0.5, 0.5 },
     Enabled = asset.enabled
   },
   GUI = {
-    Name = "Equatorial Line",
+    Name = "Celestial Equator",
     Description = "A line representation of the Equatorial plane.",
-    Path = "/Other/Lines"
+    Path = "/Night Sky/Coordinate Systems/Equatorial"
   }
 }
 
@@ -90,6 +89,7 @@ asset.export("HideEquatorialLine", HideEquatorialLine.Identifier)
 asset.export("ToggleEquatorialLine", ToggleEquatorialLine.Identifier)
 
 
+
 asset.meta = {
   Name = "Equatorial Line",
   Description = [[A line representation of the Equatorial plane, including actions
diff --git a/data/assets/nightsky/galactic_band.asset b/data/assets/nightsky/galactic_band.asset
index 6d1838cc3d..14a36db686 100644
--- a/data/assets/nightsky/galactic_band.asset
+++ b/data/assets/nightsky/galactic_band.asset
@@ -2,8 +2,8 @@ local transforms = asset.require("scene/solarsystem/sun/transforms")
 
 
 
-local GalacticBand = {
-    Identifier = "GalacticBand",
+local GalacticLine = {
+    Identifier = "GalacticLine",
     Parent = transforms.SolarSystemBarycenter.Name,
     Transform = {
         Scale = {
@@ -14,16 +14,15 @@ local GalacticBand = {
     Renderable = {
         Type = "RenderableRadialGrid",
         Opacity = 0.8,
-        Color = { 1.0, 1.0, 1.0 },
-        LineWidth = 3.0,
+        Color = { 0.08, 0.40, 0.40 },
+        LineWidth = 4.0,
         GridSegments = { 1, 1 },
-        Radii = { 0.5, 0.5 },
         Enabled = asset.enabled
     },
     GUI = {
-        Name = "Galactic Equator Line",
+        Name = "Galactic Equator",
         Description = "A line representation of the Galactic Equator plane.",
-        Path = "/Other/Lines"
+        Path = "/Night Sky/Coordinate Systems/Galactic"
     }
 }
 
@@ -60,7 +59,7 @@ local ToggleGalacticBand = {
 }
 
 asset.onInitialize(function()
-  openspace.addSceneGraphNode(GalacticBand)
+  openspace.addSceneGraphNode(GalacticLine)
   openspace.action.registerAction(ShowGalacticBand)
   openspace.action.registerAction(HideGalacticBand)
 end)
@@ -68,14 +67,15 @@ end)
 asset.onDeinitialize(function()
   openspace.action.removeAction(HideGalacticBand)
   openspace.action.removeAction(ShowGalacticBand)
-  openspace.removeSceneGraphNode(GalacticBand)
+  openspace.removeSceneGraphNode(GalacticLine)
 end)
 
-asset.export(GalacticBand)
+asset.export(GalacticLine)
 asset.export("ShowGalacticBand", ShowGalacticBand.Identifier)
 asset.export("HideGalacticBand", HideGalacticBand.Identifier)
 
 
+
 asset.meta = {
   Name = "Galactic Line",
   Description = [[A line representation of the Galactic Equator plane, including actions
diff --git a/data/assets/nightsky/light_pollution.asset b/data/assets/nightsky/light_pollution.asset
index 84b2e6a68d..4dba3318bf 100644
--- a/data/assets/nightsky/light_pollution.asset
+++ b/data/assets/nightsky/light_pollution.asset
@@ -42,7 +42,6 @@ local LightPollutionSphere = {
     Orientation = "Inside",
     MirrorTexture = true,
     FadeOutThreshold = 1.00,
-    Background = true,
     RenderBinMode = "PostDeferredTransparent",
     Enabled = asset.enabled
   },
@@ -51,7 +50,7 @@ local LightPollutionSphere = {
     Description = [[A sphere used to simulate the effect of light pollution on
       the night sky. Different pollution levels can be set using the provided actions.
       These alter the opacity of the sphere.]],
-    Path = "/Other/Night Sky",
+    Path = "/Night Sky/Effects",
     Hidden = false
   }
 }
diff --git a/data/assets/nightsky/meridian.asset b/data/assets/nightsky/meridian.asset
index 79673acb00..e855406882 100644
--- a/data/assets/nightsky/meridian.asset
+++ b/data/assets/nightsky/meridian.asset
@@ -24,7 +24,7 @@ local MeridianPosition = {
   },
   GUI = {
     Name = "Local Meridian Position",
-    Path = "/Other/Lines",
+    Path = "/Night Sky/Coordinate Systems/Altitude-Azimuth",
     Hidden = true
   }
 }
@@ -41,17 +41,16 @@ local MeridianPlane = {
   Renderable = {
     Type = "RenderableRadialGrid",
     Opacity = 0.8,
-    Color = { 1.0, 1.0, 1.0 },
-    LineWidth = 3.0,
+    Color = { 0.4, 0.8, 0.4 },
+    LineWidth = 6.0,
     GridSegments = { 1, 1 },
-    Radii = { 0.5, 0.5 },
     Enabled = asset.enabled,
     RenderBinMode = "PostDeferredTransparent"
   },
   GUI = {
     Name = "Local Meridian",
     Description = [[A line representation of the Local Meridian]],
-    Path = "/Other/Lines"
+    Path = "/Night Sky/Coordinate Systems/Altitude-Azimuth"
   }
 }
 
@@ -121,6 +120,7 @@ asset.export("HideMeridian", HideMeridian.Identifier)
 asset.export("ToggleMeridian", ToggleMeridian.Identifier)
 
 
+
 asset.meta = {
   Name = "Meridian",
   Description = [[A line representation of the Local Meridian, including actions
diff --git a/data/assets/nightsky/nightsky.asset b/data/assets/nightsky/nightsky.asset
index 7805b575d0..b2f428af7b 100644
--- a/data/assets/nightsky/nightsky.asset
+++ b/data/assets/nightsky/nightsky.asset
@@ -11,6 +11,7 @@ asset.require("actions/nightsky/camera", false)
 asset.require("actions/nightsky/daytime", false)
 
 
+
 asset.meta = {
   Name = "Night Sky Assets",
   Description = [[A collection of assets useful for studying the night sky.]],
diff --git a/data/assets/nightsky/planets.asset b/data/assets/nightsky/planets.asset
index 7830ac0d3d..13d88df45f 100644
--- a/data/assets/nightsky/planets.asset
+++ b/data/assets/nightsky/planets.asset
@@ -32,7 +32,7 @@ local Mercury = {
     Name = "Night Sky Mercury",
     Description = [[A night sky version of the planet Mercury, making it visible as
       a bright object on the sky (textured representation).]],
-    Path = "/Other/Night Sky/Planets"
+    Path = "/Night Sky/Planets"
   }
 }
 
@@ -54,7 +54,7 @@ local Venus = {
     Name = "Night Sky Venus",
     Description = [[A night sky version of the planet Venus, making it visible as
       a bright object on the sky (textured representation).]],
-    Path = "/Other/Night Sky/Planets"
+    Path = "/Night Sky/Planets"
   }
 }
 
@@ -74,7 +74,7 @@ local Mars = {
   Tag = { "nightsky_billboard" },
   GUI = {
     Name = "Night Sky Mars",
-    Path = "/Other/Night Sky/Planets"
+    Path = "/Night Sky/Planets"
   }
 }
 
@@ -96,7 +96,7 @@ local Jupiter = {
     Name = "Night Sky Jupiter",
     Description = [[A night sky version of the planet Jupiter, making it visible as
       a bright object on the sky (textured representation).]],
-    Path = "/Other/Night Sky/Planets"
+    Path = "/Night Sky/Planets"
   }
 }
 
@@ -118,7 +118,7 @@ local Saturn = {
     Name = "Night Sky Saturn",
     Description = [[A night sky version of the planet Saturn, making it visible as
       a bright object on the sky (textured representation).]],
-    Path = "/Other/Night Sky/Planets"
+    Path = "/Night Sky/Planets"
   }
 }
 
@@ -208,6 +208,7 @@ asset.export("HideNightSkyPlanets", HideNightSkyPlanets.Identifier)
 asset.export("ToggleNightSkyPlanets", ToggleNightSkyPlanets.Identifier)
 
 
+
 asset.meta = {
   Name = "Night Sky Planets",
   Description = [[A collection of night sky versions of the planets Mercury, Venus,
diff --git a/data/assets/nightsky/zenith.asset b/data/assets/nightsky/zenith.asset
index 4cdfd4acca..ddbdd3a760 100644
--- a/data/assets/nightsky/zenith.asset
+++ b/data/assets/nightsky/zenith.asset
@@ -33,7 +33,7 @@ local ZenithPosition = {
   },
   GUI = {
     Name = "Zenith Position",
-    Path = "/Other/Points",
+    Path = "/Night Sky/Coordinate Systems/Altitude-Azimuth",
     Hidden = true
   }
 }
@@ -61,7 +61,7 @@ local ZenithDot = {
     Description = [[A dot representation of the Local Zenith, based on the camera's
       current position on a planet. Use the provided show or toggle action to move it
       between planets. The default is Earth.]],
-    Path = "/Other/Points"
+    Path = "/Night Sky/Coordinate Systems/Altitude-Azimuth"
   }
 }
 
@@ -129,6 +129,7 @@ asset.export("HideZenith", HideZenith.Identifier)
 asset.export("ToggleZenith", ToggleZenith.Identifier)
 
 
+
 asset.meta = {
   Name = "Zenith",
   Description = [[A dot representation of the Local Zenith (based on the current
diff --git a/data/assets/scene/digitaluniverse/2dF.asset b/data/assets/scene/digitaluniverse/2dF.asset
index 34602de58f..0297cc93db 100644
--- a/data/assets/scene/digitaluniverse/2dF.asset
+++ b/data/assets/scene/digitaluniverse/2dF.asset
@@ -1,8 +1,8 @@
 local textures = asset.resource({
-  Name = "2dF Textures",
+  Name = "Point Textures",
   Type = "HttpSynchronization",
-  Identifier = "digitaluniverse_2dF_textures",
-  Version = 2
+  Identifier = "digitaluniverse_point_textures",
+  Version = 1
 })
 
 local speck = asset.resource({
@@ -41,20 +41,13 @@ local Object = {
   },
   GUI = {
     Name = "2dF Galaxies",
-    Path = "/Universe/Galaxies",
-    Description = [[Census 229,293 galaxies. DU Version 1.7. <br> The Two-degree Field
-    (2dF) Survey was a project designed to map portions of the extragalactic universe. The
-    2dF instrument was mounted on the 3.9-meter (12.8-foot) Anglo-Australian Telescope
-    (AAT), located 450 km (280 miles) northwest of Sydney. The telescope has a two-degree
-    field of view on the sky, enabling large parts of the sky to be observed at one time.
-    For each pointing of the telescope, the instrument can acquire up to 400 spectra
-    simultaneously via optical fibers that feed into two spectrographs. Each spectrograph
-    sees light that is between 350 nm and 800 nm, spanning the visible spectrum. <br><br>
-    The 2dF survey has three main components: the North Galactic Pole strip, the South
-    Galactic Pole strip, and the random fields that surround the South Galactic Pole
-    strip. The galaxy survey is composed of about 230,000 galaxies with brightness and
-    redshift measurements. (Description from URL) <br><br> Data Reference: 2dF Galaxy
-    Redshift Survey (2dFGRS Team, 1998-2003)]]
+    Path = "/Universe/Deep Sky Surveys",
+    Description = [[The Two-degree Field (2dF) Survey was a project designed to map
+      portions of the extragalactic universe. The 2dF survey has three main components:
+      the North Galactic Pole strip, the South Galactic Pole strip, and the random fields
+      that surround the South Galactic Pole strip. Colors: Orange galaxies show dense
+      regions of galaxies, aqua galaxies are areas of intermediate density, and green
+      galaxies are areas of lower density. Census: 229,293 galaxies.]]
   }
 }
 
@@ -73,7 +66,7 @@ asset.export(Object)
 
 asset.meta = {
   Name = "2dF Galaxies",
-  Description = "Digital Universe asset for the The Two-degree Field (2dF) Survey",
+  Description = Object.GUI.Description,
   Author = "Brian Abbott (AMNH), Eric Gawiser (Rutgers U)",
   URL = "https://www.amnh.org/research/hayden-planetarium/digital-universe",
   License = "AMNH Digital Universe"
diff --git a/data/assets/scene/digitaluniverse/2mass.asset b/data/assets/scene/digitaluniverse/2mass.asset
index b8ec2ba045..f05c1d84d0 100644
--- a/data/assets/scene/digitaluniverse/2mass.asset
+++ b/data/assets/scene/digitaluniverse/2mass.asset
@@ -1,8 +1,8 @@
 local textures = asset.resource({
-  Name = "2MASS Textures",
+  Name = "Point Textures",
   Type = "HttpSynchronization",
-  Identifier = "digitaluniverse_2mass_textures",
-  Version = 2
+  Identifier = "digitaluniverse_point_textures",
+  Version = 1
 })
 
 local speck = asset.resource({
@@ -42,14 +42,14 @@ local Object = {
   },
   GUI = {
     Name = "2MASS Galaxies",
-    Path = "/Universe/Galaxies",
+    Path = "/Universe/Nearby Surveys",
     Description = [[The Two Micron All-Sky Survey (2MASS) is an infrared survey of the
-    sky published in 2003. Because it is looking in the infrared, and this is a composite
-    of the 2MASS point-source catalog, most of the light from this survey is starlight. In
-    visible light, clouds of gas and dust obscure our view. However, in infrared, the
-    longer wavelengths of light can penetrate these clouds without being scattered,
-    thereby revealing stars that would normally be hidden to our eye.
-    (Description from URL)]]
+      sky published in 2003. Taken from two telescopes in Arizona and Chile, it offers an
+      all-sky view of galaxies beyond the Milky Way. Because it is infrared, the light
+      detected is mostly from cool stars within the galaxies, which comprises the majority
+      of mass in a galaxy. Colors: Orange galaxies show dense regions of galaxies, aqua
+      galaxies are areas of intermediate density, and green galaxies are areas of lower
+      density. Census: 43,533 galaxies.]]
   }
 }
 
@@ -68,7 +68,7 @@ asset.export(Object)
 
 asset.meta = {
   Name = "2MASS Galaxies",
-  Description = "Digital Universe asset for the Two Micron All-Sky Survey (2MASS) survey",
+  Description = Object.GUI.Description,
   Author = "Brian Abbott (AMNH)",
   URL = "https://www.amnh.org/research/hayden-planetarium/digital-universe",
   License = "AMNH Digital Universe"
diff --git a/data/assets/scene/digitaluniverse/6dF.asset b/data/assets/scene/digitaluniverse/6dF.asset
index c1de5b1b9e..48039ecc6e 100644
--- a/data/assets/scene/digitaluniverse/6dF.asset
+++ b/data/assets/scene/digitaluniverse/6dF.asset
@@ -1,8 +1,8 @@
 local textures = asset.resource({
-  Name = "6dF Textures",
+  Name = "Point Textures",
   Type = "HttpSynchronization",
-  Identifier = "digitaluniverse_6dF_textures",
-  Version = 2
+  Identifier = "digitaluniverse_point_textures",
+  Version = 1
 })
 
 local speck = asset.resource({
@@ -42,18 +42,13 @@ local Object = {
   },
   GUI = {
     Name = "6dF Galaxies",
-    Path = "/Universe/Galaxies",
-    Description = [[Census 109,569 galaxies. DU Version 1.4.<br> The Six-degree Field
-        (6dF) Galaxy Survey mapped nearly half the sky from the Anglo-Australian
-        Observatory. Unlike previous datasets, this one is not all-sky, meaning there
-        are patches of sky that are not covered. In this case, the entire northern
-        hemisphere has no coverage at all. This catalog overlaps with the Tully
-        dataset, and there is a noticeable difference in the quality of these
-        datasets. Tully is much tighter and the structure is more apparent, while the
-        6dF data are more spread out. This is because of local motions within galaxy
-        clusters have not been corrected in these data. (Description from URL)
-        <br><br> Data Reference: The 6dF Galaxy Survey Redshift Catalogue
-        (Jones+, 2009)]]
+    Path = "/Universe/Deep Sky Surveys",
+    Description = [[The Six-degree Field (6dF) Galaxy Survey mapped nearly half the sky
+      from the Anglo-Australian Observatory. Because it's a southern hemisphere survey,
+      there is no coverage in these data for the northern hemisphere's sky. As with all
+      galaxy surveys, the organge galaxies are in relatively dense areas, the green
+      galaxies are in relatively sparse areas, and the aqua galaxies are between. Census:
+      109,569 galaxies.]]
   }
 }
 
@@ -72,7 +67,7 @@ asset.export(Object)
 
 asset.meta = {
   Name = "6dF Galaxies",
-  Description = "Digital Universe asset for The Six-degree Field (6dF) Galaxy Survey",
+  Description = Object.GUI.Description,
   Author = "Brian Abbott (AMNH)",
   URL = "https://www.amnh.org/research/hayden-planetarium/digital-universe",
   License = "AMNH Digital Universe"
diff --git a/data/assets/scene/digitaluniverse/abell.asset b/data/assets/scene/digitaluniverse/abell.asset
index 51d563b570..dce457d151 100644
--- a/data/assets/scene/digitaluniverse/abell.asset
+++ b/data/assets/scene/digitaluniverse/abell.asset
@@ -1,8 +1,8 @@
 local textures = asset.resource({
-  Name = "Abell Textures",
+  Name = "Point Textures",
   Type = "HttpSynchronization",
-  Identifier = "digitaluniverse_abell_textures",
-  Version = 2
+  Identifier = "digitaluniverse_point_textures",
+  Version = 1
 })
 
 local speck = asset.resource({
@@ -30,7 +30,7 @@ local Object = {
       File = speck .. "abell.label",
       Opacity = 1.0,
       Color = { 0.0, 0.8, 0.0 },
-      Size = 22,
+      Size = 21.2,
       MinMaxSize = { 10, 12 },
       Unit = "Mpc",
       TransformationMatrix = TransformMatrix
@@ -46,26 +46,21 @@ local Object = {
     Unit = "Mpc",
     TransformationMatrix = TransformMatrix,
     SizeSettings = {
-      ScaleExponent = 22.6,
+      ScaleExponent = 23.2,
       MaxSize = 0.27,
       EnableMaxSizeControl = true
     }
   },
   GUI = {
     Name = "Abell Galaxy Clusters",
-    Path = "/Universe/Galaxies",
-    Description = [[Census 2,246 galaxies. DU Version 1.4. <br> The Abell catalog
-        includes all the nearby, and not so nearby, galaxy clusters. The northern
-        hemisphere survey, published in 1958, was compiled by George Abell (1927-1983)
-        from the Palomar Sky Survey plates. A subsequent southern hemisphere catalog
-        was published posthumously in 1989. Further analysis by Brent Tully determined
-        their distance and three-dimensional distribution. Each point in this data set
-        represents a cluster of tens to hundreds (possibly even thousands) of
-        galaxies, similar to the Virgo or Fornax Clusters. You will notice some points
-        are assigned colors while most are gray. The data set also has an arbitrary
-        cut-off for completeness, resulting in the rectangular shape of the data set.
-        (Description from URL) <br><br> Data Reference: Abell Clusters of Rich
-        Galaxies, Brent Tully (U Hawaii), Stuart Levy (NCSA/UIUC)]]
+    Path = "/Universe/Deep Sky Surveys",
+    Description = [[The Abell catalog includes all the nearby, and not so nearby, galaxy
+      clusters. The northern hemisphere survey, published in 1958, was compiled by George
+      Abell from the Palomar Sky Survey plates. A subsequent southern hemisphere catalog
+      was published posthumously in 1989. Each point in this data set represents a
+      cluster of tens to hundreds (possibly even thousands) of galaxies, similar to the
+      Virgo or Fornax Clusters. The data have an arbitrary cut-off for completeness,
+      resulting in the rectangular shape of the data set. Census: 2,246 galaxy clusters.]]
   }
 }
 
@@ -84,7 +79,7 @@ asset.export(Object)
 
 asset.meta = {
   Name = "Abell Galaxy Clusters",
-  Description = "Digital Universe asset for The Abell catalog",
+  Description = Object.GUI.Description,
   Author = "Stuart Levy (NCSA/UIUC), Brian Abbott (AMNH)",
   URL = "https://www.amnh.org/research/hayden-planetarium/digital-universe",
   License = "AMNH Digital Universe"
diff --git a/data/assets/scene/digitaluniverse/allsky_hydrogenalpha.asset b/data/assets/scene/digitaluniverse/allsky_hydrogenalpha.asset
new file mode 100644
index 0000000000..caf7cfde10
--- /dev/null
+++ b/data/assets/scene/digitaluniverse/allsky_hydrogenalpha.asset
@@ -0,0 +1,67 @@
+local textures = asset.resource({
+  Name = "Multiwavelength Milky Way Textures",
+  Type = "HttpSynchronization",
+  Identifier = "digitaluniverse_multiwavelength_milkyway_textures",
+  Version = 1
+})
+
+
+local Object = {
+  Identifier = "AllSky_HAlpha",
+  Transform = {
+    Rotation = {
+      Type = "StaticRotation",
+      Rotation = { 0, 0, math.pi }
+    }
+  },
+  Renderable = {
+    Type = "RenderableSphereImageLocal",
+    Enabled = false,
+    Size = 9.2E21,
+    Segments = 40,
+    Opacity = 0.4,
+    Texture = textures .. "mwHalpha-f.png",
+    Orientation = "Inside",
+    MirrorTexture = true,
+    FadeOutThreshold = 0.025
+  },
+  GUI = {
+    Name = "Hydrogen Alpha",
+    Path = "/Milky Way/All Sky Images",
+    Description = [[Hydrogen-alpha is a term that describes light from the ground state of
+      the hydrogen atom. When an electron in an atom moves from one energy level to a
+      higher one, we say the atom is excited. When the electron moves back down to the
+      lower energy level, light is released at a wavelength commensurate with the energy
+      between the two levels. For the H-alpha line, this energy difference translates to a
+      wavelength in the extreme red end of the visible spectrum. This survey of the sky is
+      a snapshot of light from this wavelength.
+
+      One distinctive element of the sky at this wavelength is the presence of large,
+      spherical bubbles surrounding hot stars. Many nebulae and star-forming regions are
+      visible, including the Great Nebula of Orion. We also see that galaxies emit H-alpha
+      light, including the Andromeda Galaxy and the faint M33, the large face-on spiral in
+      Triangulum, and the Large and Small Magellanic Clouds (LMC and SMC) in the southern
+      sky. Census: 1 all-sky image.]]
+  }
+}
+
+
+asset.onInitialize(function()
+  openspace.addSceneGraphNode(Object)
+end)
+
+asset.onDeinitialize(function()
+  openspace.removeSceneGraphNode(Object)
+end)
+
+asset.export(Object)
+
+
+
+asset.meta = {
+  Name = "Milky Way All-Sky Hydrogen Alpha",
+  Description = Object.GUI.Description,
+  Author = "Brian Abbott, Carter Emmart (AMNH), OpenSpace Team",
+  URL = "https://www.amnh.org/research/hayden-planetarium/digital-universe",
+  License = "AMNH Digital Universe"
+}
diff --git a/data/assets/scene/digitaluniverse/allsky_visible.asset b/data/assets/scene/digitaluniverse/allsky_visible.asset
new file mode 100644
index 0000000000..437d4f492c
--- /dev/null
+++ b/data/assets/scene/digitaluniverse/allsky_visible.asset
@@ -0,0 +1,59 @@
+local textures = asset.resource({
+  Name = "Milky Way All Sky Textures",
+  Type = "HttpSynchronization",
+  Identifier = "milkyway_textures",
+  Version = 2
+})
+
+
+local Object = {
+  Identifier = "AllSky_Visible",
+  Transform = {
+    Rotation = {
+      Type = "StaticRotation",
+      Rotation = { 0, 0, math.pi }
+    }
+  },
+  Renderable = {
+    Type = "RenderableSphereImageLocal",
+    Size = 9.2E21,
+    Segments = 40,
+    Opacity = 0.25,
+    Texture = textures .. "DarkUniverse_mellinger_4k.jpg",
+    Orientation = "Inside",
+    MirrorTexture = true,
+    FadeOutThreshold = 0.0015,
+    DimInAtmosphere = true
+  },
+  Tag = { "daytime_hidden" },
+  GUI = {
+    Name = "Visible Milky Way",
+    Path = "/Milky Way/All Sky Images",
+    Description = [[An all-sky image of the night sky as our eye sees it (in the visible
+      spectrum), with the stars removed. You will see the brightest part of the Galaxy if
+      you look toward Galactic center toward the constellations Scorpius and Sagittarius.
+      This bright haze is the light from millions of stars; the dark lanes are foreground
+      dust clouds, obscuring our view of the stars behind them. Census: 1 all-sky image.]]
+  }
+}
+
+
+asset.onInitialize(function()
+  openspace.addSceneGraphNode(Object)
+end)
+
+asset.onDeinitialize(function()
+  openspace.removeSceneGraphNode(Object)
+end)
+
+asset.export(Object)
+
+
+
+asset.meta = {
+  Name = "Milky Way All-Sky Visible Light",
+  Description = Object.GUI.Description,
+  Author = "Brian Abbott, Carter Emmart (AMNH), OpenSpace Team",
+  URL = "https://www.amnh.org/research/hayden-planetarium/digital-universe",
+  License = "AMNH Digital Universe"
+}
diff --git a/data/assets/scene/digitaluniverse/alternatestarlabels.asset b/data/assets/scene/digitaluniverse/alternatestarlabels.asset
index 7d14086700..04e2dff18c 100644
--- a/data/assets/scene/digitaluniverse/alternatestarlabels.asset
+++ b/data/assets/scene/digitaluniverse/alternatestarlabels.asset
@@ -2,7 +2,7 @@ local speck = asset.resource({
   Name = "Alternate Star Labels Speck Files",
   Type = "HttpSynchronization",
   Identifier = "digitaluniverse_alternatestarlabels_speck",
-  Version = 2
+  Version = 3
 })
 
 
@@ -13,10 +13,10 @@ local Object = {
     Enabled = false,
     Labels = {
       Enabled = true,
-      File = speck .. "altstarlabels.label",
+      File = speck .. "stars_alt_labels.label",
       Color = { 0.4, 0.4, 0.4 },
       Size = 14.7,
-      MinMaxSize = { 6, 20 },
+      MinMaxSize = { 15, 20 },
       Unit = "pc"
     },
     Opacity = 0.65,
@@ -25,13 +25,9 @@ local Object = {
   GUI = {
     Name = "Stars Labels - Alternate",
     Path = "/Milky Way/Stars",
-    Description = [[Census 3,395 star names. DU Version 1.8. <br>The main star data
-      identify the accepted IAU star names for the brightest stars. However, astronomers
-      have long cataloged thousands of stars beyond the brightest ones we see. Several
-      attempts over thousands of years to name all the visible stars have led to two
-      main catalogs: Johann Bayer's Catalog from 1603 and John Flamsteed's Catalog
-      published in 1725. (Description from URL) <br><br> Data Reference: Various
-      sources]]
+    Description = [[Alternate star labels for the stars. Priority goes to Bayer IDs
+      (Greek designations, like Alpha Orionis), then to Flamsteed numbers (like 1
+      Orionis).]]
   }
 }
 
@@ -49,9 +45,9 @@ asset.export(Object)
 
 
 asset.meta = {
-  Name = "Stars Labels - Alternate",
-  Description = "Digital Universe asset for alternate start labels",
-  Author = "Brian Abbott (AMNH)",
+  Name = "Alternative Labels for the Stars",
+  Description = Object.GUI.Description,
+  Author = "Zack Reeves, Brian Abbott (AMNH)",
   URL = "https://www.amnh.org/research/hayden-planetarium/digital-universe",
   License = "AMNH Digital Universe"
 }
diff --git a/data/assets/scene/digitaluniverse/backgroundradiation.asset b/data/assets/scene/digitaluniverse/backgroundradiation.asset
index c92e587606..e1a753a756 100644
--- a/data/assets/scene/digitaluniverse/backgroundradiation.asset
+++ b/data/assets/scene/digitaluniverse/backgroundradiation.asset
@@ -13,6 +13,38 @@ local textures = asset.resource({
 })
 
 
+local COBE = {
+  Identifier = "COBE",
+  Transform = {
+    Rotation = {
+      Type = "StaticRotation",
+      Rotation = { 0, 0, math.pi }
+    }
+  },
+  Renderable = {
+    Type = "RenderableSphereImageLocal",
+    Enabled = false,
+    Size = 3975.41417036064E23,
+    Segments = 80,
+    Opacity = 0.5,
+    Texture = textures .. "COBErect.png",
+    Orientation = "Both",
+    MirrorTexture = true,
+    FadeInThreshold = 0.4
+  },
+  GUI = {
+    Name = "1990 COBE CMB",
+    Path = "/Universe/Cosmic Microwave Background",
+    Description = [[In 1990, COBE, the Cosmic Background Explorer, took the first
+      detailed map of the cosmic microwave background light. The red areas are
+      relatively hotter areas of the CMB, while the blue areas are cooler than the
+      average. The lines of latitude and longitude are baked into this image, and
+      reflect galactic coordinates. Image resolution is 7 degrees. Census: 1
+      all-sky image.]]
+  }
+}
+
+
 local WMAP = {
   Identifier = "WMAP",
   Transform = {
@@ -33,35 +65,16 @@ local WMAP = {
     FadeInThreshold = 0.4
   },
   GUI = {
-    Name = "Wilkinson Microwave Anisotropy Probe (WMAP)",
-    Path = "/Universe/Cosmic Microwave Background"
+    Name = "2003 WMAP CMB",
+    Path = "/Universe/Cosmic Microwave Background",
+    Description = [[WMAP, the Wilkinson Microwave Anisotropy Probe, released this all-sky
+      image of the cosmic microwave background light in 2003. The blue colors are slightly
+      cooler than average and red is slightly warmer, with fluctuations of about a
+      100,000th of a degree above or below the average. The resolution on this image is
+      0.5 degrees. Census: 1 all-sky image.]]
   }
 }
 
-local CBE = {
-  Identifier = "CBE",
-  Transform = {
-    Rotation = {
-      Type = "StaticRotation",
-      Rotation = { 0, 0, math.pi }
-    }
-  },
-  Renderable = {
-    Type = "RenderableSphereImageLocal",
-    Enabled = false,
-    Size = 3975.41417036064E23,
-    Segments = 80,
-    Opacity = 0.5,
-    Texture = textures .. "COBErect.png",
-    Orientation = "Both",
-    MirrorTexture = true,
-    FadeInThreshold = 0.4
-  },
-  GUI = {
-    Name = "Cosmic Background Explorer",
-    Path = "/Universe/Cosmic Microwave Background"
-  }
-}
 
 local Planck = {
   Identifier = "Planck",
@@ -83,67 +96,43 @@ local Planck = {
     FadeInThreshold = 0.4
   },
   GUI = {
-    Name = "Planck",
-    Path = "/Universe/Cosmic Microwave Background"
-  }
-}
-
-
-local HAlpha = {
-  Identifier = "HAlpha",
-  Transform = {
-    Rotation = {
-      Type = "StaticRotation",
-      Rotation = { 0, 0, math.pi }
-    }
-  },
-  Renderable = {
-    Type = "RenderableSphereImageLocal",
-    Enabled = false,
-    Size = 9.2E21,
-    Segments = 40,
-    Opacity = 0.4,
-    Texture = textures .. "mwHalpha-f.png",
-    Orientation = "Inside",
-    MirrorTexture = true,
-    FadeOutThreshold = 0.025,
-    Background = true
-  },
-  GUI = {
-    Name = "H Alpha",
-    Path = "/Milky Way/All Sky Images"
+    Name = "2013 Planck CMB",
+    Path = "/Universe/Cosmic Microwave Background",
+    Description = [[The Planck mission's 2013 image of the cosmic microwave background
+      light release is the most detailed view of the CMB we have to date. The orange
+      areas represent the slightly hotter areas, and the blue areas show the areas that
+      are slightly cooler. The resolution on this image is 0.16 degrees. Census: 1
+      all-sky image.]]
   }
 }
 
 
 asset.onInitialize(function()
+  openspace.addSceneGraphNode(COBE)
   openspace.addSceneGraphNode(WMAP)
-  openspace.addSceneGraphNode(CBE)
   openspace.addSceneGraphNode(Planck)
-  openspace.addSceneGraphNode(HAlpha)
 end)
 
 asset.onDeinitialize(function()
-  openspace.removeSceneGraphNode(HAlpha)
   openspace.removeSceneGraphNode(Planck)
-  openspace.removeSceneGraphNode(CBE)
   openspace.removeSceneGraphNode(WMAP)
+  openspace.removeSceneGraphNode(COBE)
 end)
 
+asset.export(COBE)
 asset.export(WMAP)
-asset.export(CBE)
 asset.export(Planck)
-asset.export(HAlpha)
 
 
 
 asset.meta = {
-  Name = "Background Radiation",
-  Description = [[Various AllSky images for the Milky Way and observable Universe.
-    Included: Wilkinson Microwave Anisotropy Probe (WMAP), Cosmic Background Explorer,
-    Planck, and H Alpha <br><br> Data Reference: Planck/ESA and the Planck
-    Collaboration, Wilkinson Microwave Anisotropy Probe/NASA, Doug
-    Finkbeiner (Princeton)]],
+  Name = "Cosmic Microwave Background",
+  Description = [[All-sky images of the Cosmic Microwave Background Light. The CMB has
+    been mapped by three main missions: COBE, WMAP, and Planck. The images are not true
+    all-sky images because the light from our own galaxy has been subtracted out of them.
+    From the discovery of the CMB in 1964, to the three space telescopes whose images we
+    see in this asset, we've gained a more detailed view of the CMB light, thereby telling
+    us more about the origin of the universe.]],
   Author = "Brian Abbott (AMNH), OpenSpace Team",
   URL = "https://www.amnh.org/research/hayden-planetarium/digital-universe",
   License = "AMNH Digital Universe"
diff --git a/data/assets/scene/digitaluniverse/brown_dwarfs.asset b/data/assets/scene/digitaluniverse/brown_dwarfs.asset
new file mode 100644
index 0000000000..768a4791d6
--- /dev/null
+++ b/data/assets/scene/digitaluniverse/brown_dwarfs.asset
@@ -0,0 +1,79 @@
+local textures = asset.resource({
+  Name = "Point Textures",
+  Type = "HttpSynchronization",
+  Identifier = "digitaluniverse_point_textures",
+  Version = 1
+})
+
+local speck = asset.resource({
+  Name = "Brown Dwarf Speck Files",
+  Type = "HttpSynchronization",
+  Identifier = "digitaluniverse_brown_dwarfs_speck",
+  Version = 1
+})
+
+
+local Object = {
+  Identifier = "BrownDwarfs",
+  Renderable = {
+    Type = "RenderablePointCloud",
+    Enabled = false,
+    File = speck .. "bd.speck",
+    Texture = {
+      File = textures .. "point3.png"
+    },
+    Unit = "pc",
+    Coloring = {
+      FixedColor = { 0.4, 0.0, 0.1 },
+      ColorMapping = {
+        File = speck .. "bd.cmap",
+        ParameterOptions = {
+          { Key = "typeindex", Range = { 1.0, 4.0 } }
+        }
+      }
+    },
+    SizeSettings = {
+      ScaleExponent = 15.8,
+      MaxSize = 0.7,
+      EnableMaxSizeControl = true
+    }
+  },
+  GUI = {
+    Name = "Brown Dwarfs",
+    Path = "/Milky Way/Substellar Objects",
+    Description = [[For decades it was believed that M stars were the coolest stars in
+      the Galaxy. Some M stars, called red dwarfs, make up 70% of the stars in the
+      Galaxy. However, a new class of objects, even cooler than M stars, was recently
+      discovered and given a spectral type of L. L-type objects straddle the boundary
+      between red dwarfs and brown dwarfs and they are typically very dim stars or brown
+      dwarfs. Even cooler than L-type objects are T-type objects. These are mostly brown
+      dwarfs and resemble large, massive, Jupiter-like objects, too large to be planets
+      and typically too small to be stars. Beyond the T dwarfs are the Y-type objects,
+      which are even more dim. Brown dwarfs are extremely difficult to see, mainly because
+      they are so dim in optical light. However, they appear brighter in infrared light.
+      Colors: We represent these objects as exaggeratged points and they are either red
+      for L type objects, Maroon for T type, and purple for Y type objects. Census:
+      2,196 objects.]]
+  }
+}
+
+
+asset.onInitialize(function()
+  openspace.addSceneGraphNode(Object)
+end)
+
+asset.onDeinitialize(function()
+  openspace.removeSceneGraphNode(Object)
+end)
+
+asset.export(Object)
+
+
+
+asset.meta = {
+  Name = "Brown Dwarfs",
+  Author = "Brian Abbott, Zack Reeves, Jackie Faherty (AMNH)",
+  Description = Object.GUI.Description,
+  License = "AMNH Digital Universe",
+  URL = "https://www.amnh.org/research/hayden-planetarium/digital-universe",
+}
diff --git a/data/assets/scene/digitaluniverse/constellationbounds.asset b/data/assets/scene/digitaluniverse/constellationbounds.asset
index 1858cdd07a..b366279854 100644
--- a/data/assets/scene/digitaluniverse/constellationbounds.asset
+++ b/data/assets/scene/digitaluniverse/constellationbounds.asset
@@ -35,10 +35,12 @@ local Object = {
     }
   },
   GUI = {
-    Name = "Constellation Bounds",
+    Name = "Constellation Boundaries",
     Path = "/Milky Way/Constellations",
-    Description = [[A Spherical mesh dividing the sky into regions that fit the
-      constellations]]
+    Description = [[As a continent is divided into countries, astronomers divide the sky
+      into 88 regions called constellations. Every object falls into one of these 88
+      regions. The boundaries of these regions are shown in this asset. Use these in
+      concert with the constellation labels. Census: 88 constellations.]]
   }
 }
 
@@ -57,8 +59,7 @@ asset.export(Object)
 
 asset.meta = {
   Name = "Constellation Bounds",
-  Description = [[DU asset providing a Spherical mesh dividing the sky into regions that
-    fit the constellations]],
+  Description = Object.GUI.Description,
   Author = "Brian Abbott (AMNH)",
   URL = "https://www.amnh.org/research/hayden-planetarium/digital-universe",
   License = "AMNH Digital Universe"
diff --git a/data/assets/scene/digitaluniverse/constellations.asset b/data/assets/scene/digitaluniverse/constellations.asset
index 2258107161..49a0768069 100644
--- a/data/assets/scene/digitaluniverse/constellations.asset
+++ b/data/assets/scene/digitaluniverse/constellations.asset
@@ -6,7 +6,7 @@ local speck = asset.resource({
   Name = "Constellation Files",
   Type = "HttpSynchronization",
   Identifier = "digitaluniverse_constellations_data",
-  Version = 2
+  Version = 3
 })
 
 
@@ -35,31 +35,6 @@ local function zodiacsString(zodiacsList)
   return zodiacsString
 end
 
-local ConstellationsExtragalactic = {
-  Identifier = "ConstellationsExtragalactic",
-  Renderable = {
-    Type = "RenderableConstellationLines",
-    Enabled = false,
-    Labels = {
-      File = speck .. "constellationsEXGAL.label",
-      Opacity = 0.4,
-      Color = { 0.8, 0.8, 0.8 },
-      Size = 20.0,
-      MinMaxSize = { 20, 30 },
-      Unit = "Mpc"
-    },
-    Opacity = 0.4,
-    File = speck .. "constellationsEXGAL.speck",
-    NamesFile = speck .. "constellations.dat",
-    Colors = { { 0.6, 0.4, 0.4 }, { 0.8, 0.0, 0.0 }, { 0.0, 0.3, 0.8 } },
-    Unit = "Mpc",
-    -- Selection = zodiacs
-  },
-  GUI = {
-    Name = "Constellations (Extragalactic)",
-    Path = "/Milky Way/Constellations"
-  }
-}
 
 local Constellations = {
   Identifier = "Constellations",
@@ -67,7 +42,7 @@ local Constellations = {
     Type = "RenderableConstellationLines",
     Enabled = false,
     Labels = {
-      File = speck .. "constellations.label",
+      File = speck .. "constellation_lines.label",
       Opacity = 0.3,
       Color = { 0.8, 0.8, 0.8 },
       Size = 14.5,
@@ -75,7 +50,7 @@ local Constellations = {
       Unit = "pc"
     },
     Opacity = 0.3,
-    File = speck .. "constellations.speck",
+    File = speck .. "constellation_lines.speck",
     NamesFile = speck .. "constellations.dat",
     Colors = { { 0.6, 0.4, 0.4 }, { 0.8, 0.0, 0.0 }, { 0.0, 0.3, 0.8 } },
     Unit = "pc",
@@ -83,17 +58,14 @@ local Constellations = {
   },
   Tag = { "daytime_hidden" },
   GUI = {
-    Name = "Constellations",
+    Name = "Constellation Lines",
     Path = "/Milky Way/Constellations",
-    Description = [[Census 88 constellations and labels. DU Version 3.4. <br> These
-      modern constellations are largely based on those of the Babylonians and
-      Greeks; however, most cultures have their own figures and stories of the sky.
-      More than half the official constellations adopted by scientists in 1930 were
-      known to the ancients over 2,000 years ago. Each star falls into one of these
-      88 regions. Of course, today we know the stars in any given constellation do
-      not necessarily have any physical relationship with one another. One star may
-      be nearby, while an adjacent star in the sky may be far away.(Description
-      from URL) <br><br> Data Reference: various]]
+    Description = [[Lines connecting the stars that make up the constellation figures.
+      We represent the constellations by connecting the main stars that make up the
+      constellation "stick figures," as seen from Earth. Colors: most constellations
+      are pink, while the zodical constellations are red. We also color Orion and Ursa
+      Major blue as two recognizable constellations in the night sky. Census: 88
+      constellations.]]
   }
 }
 
@@ -137,7 +109,6 @@ local ShowZodiacs = {
 
 
 asset.onInitialize(function()
-  openspace.addSceneGraphNode(ConstellationsExtragalactic)
   openspace.addSceneGraphNode(Constellations)
 
   openspace.action.registerAction(ShowConstellations)
@@ -151,10 +122,8 @@ asset.onDeinitialize(function()
   openspace.action.removeAction(ShowConstellations)
 
   openspace.removeSceneGraphNode(Constellations)
-  openspace.removeSceneGraphNode(ConstellationsExtragalactic)
 end)
 
-asset.export(ConstellationsExtragalactic)
 asset.export(Constellations)
 asset.export("ShowConstellations", ShowConstellations.Identifier)
 asset.export("HideConstellations", HideConstellations.Identifier)
@@ -163,9 +132,8 @@ asset.export("ShowZodiacs", ShowZodiacs.Identifier)
 
 
 asset.meta = {
-  Name = "Constellations",
-  Description = "Digital Universe asset for constellation lines",
-  Author = "Brian Abbott (AMNH)",
+  Description = Constellations.GUI.Description,
+  Author = "Brian Abbott, Zack Reeves (AMNH)",
   URL = "https://www.amnh.org/research/hayden-planetarium/digital-universe",
   License = "AMNH Digital Universe"
 }
diff --git a/data/assets/scene/digitaluniverse/deepsky.asset b/data/assets/scene/digitaluniverse/deepsky.asset
index f7d75e7f3e..3973a79262 100644
--- a/data/assets/scene/digitaluniverse/deepsky.asset
+++ b/data/assets/scene/digitaluniverse/deepsky.asset
@@ -49,7 +49,7 @@ local DeepSkyObjects = {
   },
   GUI = {
     Name = "Deep Sky Objects Points",
-    Path = "/Universe/Galaxies",
+    Path = "/Universe/Nearby Surveys",
     Description = "Point cloud and labels for Deep Sky Objects"
   }
 }
@@ -87,7 +87,7 @@ local DeepSkyObjectsImages = {
   },
   GUI = {
     Name = "Deep Sky Objects Images",
-    Path = "/Universe/Galaxies",
+    Path = "/Universe/Nearby Surveys",
     Description = [[Census: 63 images and labels. DU Version 1.3. <br> These data are
       2-D images of Messier objects placed in 3-D space. Not only do we place these
       images at the proper location and give them the correct orientation, we also
diff --git a/data/assets/scene/digitaluniverse/digitaluniverse.asset b/data/assets/scene/digitaluniverse/digitaluniverse.asset
index 2c7c8ef4dc..36ff48a180 100644
--- a/data/assets/scene/digitaluniverse/digitaluniverse.asset
+++ b/data/assets/scene/digitaluniverse/digitaluniverse.asset
@@ -3,44 +3,46 @@ asset.require("./2dF")
 asset.require("./2mass")
 asset.require("./6dF")
 asset.require("./abell")
-asset.require("./alternatestarlabels")
+asset.require("./allsky_hydrogenalpha")
+asset.require("./allsky_visible")
 asset.require("./backgroundradiation")
 asset.require("./backgroundradiation_multiverse")
-asset.require("./clusters")
+asset.require("./brown_dwarfs")
+asset.require("./galaxy_clusters")
 asset.require("./constellationbounds")
 asset.require("./constellations")
-asset.require("./deepsky")
-asset.require("./dwarfs")
 asset.require("./exoplanets")
 asset.require("./exoplanets_candidates")
 asset.require("./globularclusters")
 asset.require("./grids")
-asset.require("./groups")
+asset.require("./galaxy_groups")
 asset.require("./h2regions")
-asset.require("./localdwarfs")
+asset.require("./local_group_dwarfs")
 asset.require("./milkyway")
 asset.require("./milkyway_arm_labels")
 asset.require("./milkyway_label")
-asset.require("./milkyway_sphere")
 asset.require("./obassociations")
+asset.require("./oort_cloud")
 asset.require("./openclusters")
 asset.require("./planetarynebulae")
 asset.require("./pulsars")
 asset.require("./quasars")
 asset.require("./starlabels")
+asset.require("./alternatestarlabels")
 asset.require("./starorbits")
+asset.require("./star_uncertainty")
 asset.require("./stars")
 asset.require("./superclusters")
 asset.require("./supernovaremnants")
 asset.require("./tully")
 asset.require("./voids")
+asset.require("./white_dwarfs")
 
 
 
 asset.meta = {
   Name = "Digital Universe",
-  Description = [[This asset is a meta asset, containing all the assets from the AMNH
-    Digital Universe]],
+  Description = [[This asset is a meta asset, containing all the assets from the AMNH Digital Universe.]],
   Author = "Brian Abbott (AMNH)",
   URL = "https://www.amnh.org/research/hayden-planetarium/digital-universe",
   License = "AMNH Digital Universe"
diff --git a/data/assets/scene/digitaluniverse/dwarfs.asset b/data/assets/scene/digitaluniverse/dwarfs.asset
deleted file mode 100644
index 4d7d93caf0..0000000000
--- a/data/assets/scene/digitaluniverse/dwarfs.asset
+++ /dev/null
@@ -1,91 +0,0 @@
-local textures = asset.resource({
-  Name = "Brown Dwarf Textures",
-  Type = "HttpSynchronization",
-  Identifier = "digitaluniverse_dwarfs_textures",
-  Version = 1
-})
-
-local speck = asset.resource({
-  Name = "Brown Dwarf Speck Files",
-  Type = "HttpSynchronization",
-  Identifier = "digitaluniverse_dwarfs_speck",
-  Version = 3
-})
-
-
-local Object = {
-  Identifier = "Dwarfs",
-  Renderable = {
-    Type = "RenderablePointCloud",
-    Enabled = false,
-    File = speck .. "dwarfs.speck",
-    Labels = {
-      File = speck .. "dwarfs.label",
-      Color = { 0.5, 0.1, 0.2 },
-      Size = 14.6,
-      MinMaxSize = { 10, 20 },
-      Unit = "pc"
-    },
-    Opacity = 1.0,
-    Texture = {
-      File = textures .. "point3.png",
-    },
-    Unit = "pc",
-    Coloring = {
-      FixedColor = { 0.4, 0.0, 0.1 },
-      ColorMapping = {
-        File = speck .. "dwarfs.cmap",
-        ParameterOptions = {
-          { Key = "typeindex", Range = { 1.0, 4.0 } }
-        }
-      }
-    },
-    SizeSettings = {
-      ScaleExponent = 16.2,
-      MaxSize = 0.7,
-      EnableMaxSizeControl = true
-    }
-  },
-  GUI = {
-    Name = "Brown Dwarfs",
-    Path = "/Milky Way",
-    Description = [[Census: 785 L dwarfs, 101 T dwarfs, 17 Y dwarfs. DU Version 6.4.
-      <br> In astronomy, there are dwarf stars-red, white, and brown-dwarf novae,
-      and even dwarf galaxies. As you might imagine, astronomers use the term dwarf
-      when they refer to the smaller objects in any given class. For decades it was
-      believed that M stars were the coolest stars in the Galaxy. Some M stars,
-      called red dwarfs, make up 70% of the stars in the Galaxy, including our
-      nearest known neighbor, Proxima Centauri. However, a new class of objects,
-      even cooler than M stars, was recently discovered and given a spectral type
-      of L. L-type objects straddle the boundary between red dwarfs and brown
-      dwarfs, the latter of which are not massive enough to ignite the nuclear
-      processes necessary for it to shine as a star. L-type objects are typically
-      very dim stars or brown dwarfs. Even cooler than L-type objects are T-type
-      objects. These are mostly brown dwarfs and resemble large, massive,
-      Jupiter-like objects, too large to be planets and typically too small to be
-      stars. Beyond the T dwarfs are the Y-type objects, which are even more
-      dim.(Description from URL) <br><br> Data Reference: The Brown Dwarf Kinematics
-      Project (Faherty+ 2019)]]
-  }
-}
-
-
-asset.onInitialize(function()
-  openspace.addSceneGraphNode(Object)
-end)
-
-asset.onDeinitialize(function()
-  openspace.removeSceneGraphNode(Object)
-end)
-
-asset.export(Object)
-
-
-
-asset.meta = {
-  Name = "Brown Dwarfs",
-  Description = "Digital Universe asset for Brown Dwarfs",
-  Author = "Brian Abbott (AMNH)",
-  URL = "https://www.amnh.org/research/hayden-planetarium/digital-universe",
-  License = "AMNH Digital Universe"
-}
diff --git a/data/assets/scene/digitaluniverse/exoplanets.asset b/data/assets/scene/digitaluniverse/exoplanets.asset
index 933465dbdb..ec0dcdfdf7 100644
--- a/data/assets/scene/digitaluniverse/exoplanets.asset
+++ b/data/assets/scene/digitaluniverse/exoplanets.asset
@@ -9,7 +9,7 @@ local speck = asset.resource({
   Name = "Exoplanets Speck Files",
   Type = "HttpSynchronization",
   Identifier = "digitaluniverse_exoplanets_speck",
-  Version = 3
+  Version = 4
 })
 
 
@@ -22,7 +22,7 @@ local Object = {
     Labels = {
       File = speck .. "expl.label",
       Color = { 0.3, 0.3, 0.8 },
-      Size = 14.8,
+      Size = 13.75,
       MinMaxSize = { 10, 100 },
       Unit = "pc"
     },
@@ -40,13 +40,14 @@ local Object = {
   GUI = {
     Name = "Exoplanets",
     Path = "/Milky Way/Exoplanets",
-    Description = [[Census: 5,361 planets in 3,982 systems. DU Version 20.12. <br>
-      Extrasolar planets, or exoplanets, are a relatively new phenomenon in
-      astronomy. While many astronomers believed in their existence, no
-      observational evidence was available until 1995. Since that time, scientists
-      have discovered thousands of systems consisting of one or more planets around
-      a host star.(Description from URL) <br><br> Data Reference: NASA Exoplanet
-      Archive (CalTech/NASA)]]
+    Description = [[Extrasolar planets, or exoplanets, are a relatively new phenomenon in
+      astronomy - no observational evidence was available until 1995. To the eye,
+      exoplanets are lost in the glare of their host star. Unconventional techniques are
+      required to infer or observe them. Here, exoplanet systems are represented by a blue
+      ring centered on each host star. The ring is not intended to signify an orbit, but
+      serve only as a marker. The labels list the host star name, and if there is more
+      than one planet, will list the number of planets in parentheses. Census: 5,589
+      planets in 4,139 systems.]]
   }
 }
 
@@ -65,8 +66,8 @@ asset.export(Object)
 
 asset.meta = {
   Name = "Exoplanets",
-  Description = "Digital Universe asset for Exoplanets",
-  Author = "Brian Abbott (AMNH)",
+  Description = Object.GUI.Description,
+  Author = "Brian Abbott, Zack Reeves (AMNH)",
   URL = "https://www.amnh.org/research/hayden-planetarium/digital-universe",
   License = "AMNH Digital Universe"
 }
diff --git a/data/assets/scene/digitaluniverse/exoplanets_candidates.asset b/data/assets/scene/digitaluniverse/exoplanets_candidates.asset
index abca6cf097..91d8dcaba8 100644
--- a/data/assets/scene/digitaluniverse/exoplanets_candidates.asset
+++ b/data/assets/scene/digitaluniverse/exoplanets_candidates.asset
@@ -9,7 +9,7 @@ local speck = asset.resource({
   Name = "Exoplanets Candidates Speck Files",
   Type = "HttpSynchronization",
   Identifier = "digitaluniverse_exoplanets_candidates_speck",
-  Version = 1
+  Version = 2
 })
 
 
@@ -19,13 +19,19 @@ local Object = {
     Type = "RenderablePointCloud",
     Enabled = false,
     Opacity = 0.99,
-    File = speck .. "exoplanet_candidates.speck",
+    File = speck .. "expl_candidates.speck",
     Unit = "pc",
     Texture = {
       File = textures .. "halo.png",
     },
     Coloring = {
-      FixedColor = { 1.0, 1.0, 0.0 }
+      FixedColor = { 1.0, 1.0, 0.0 },
+      ColorMapping = {
+        File = speck .. "expl_candidates.cmap",
+        ParameterOptions = {
+          { Key = "survey_num" }
+        }
+      }
     },
     SizeSettings = {
       ScaleExponent = 17.8,
@@ -34,18 +40,16 @@ local Object = {
     }
   },
   GUI = {
-    Name = "Planetary Candidates",
+    Name = "Exoplanetary Candidates",
     Path = "/Milky Way/Exoplanets",
-    Description = [[Census: 6,082 stars with candidate planetary systems. DU Version 11.8.
-      <br> The exoplanet candidate stars are likely hosts for exoplanets. These are stars
-      plucked from NASA's Kepler and TESS space telescopes. The Kepler mission was
-      designed to stare at one spot, roughly twelve degrees across, in the constellation
-      Cygnus. By staring at one spot, the spacecraft could monitor over 500,000 stars in
-      that field for subtle variations in brightness. The data included here are the stars
-      that are considered good candidates to host planets. Rather than represent them
+    Description = [[The exoplanet candidate stars are likely hosts for exoplanets. These
+      are stars plucked from NASA's Kepler and TESS space telescopes. Further observations
+      are needed to confirm a planet's existence. Rather than represent them
       photo-realistically, with accurate colors, we choose to visualize them as generic,
-      pure yellow stars. (Description from URL) <br><br> Data Reference: NASA Exoplanet
-      Archive (CalTech/NASA)]]
+      colored stars. The nature of these stars is not important, it is the sheer numbers
+      of potential exoplanets that allows us to wonder just how many we will find in the
+      entire Galaxy. Colors: Yellow denote Kepler candidates, Orange stars are from the K2
+      mission, and green stars are from TESS. Census: 7,225 candidate stars.]]
   }
 }
 
@@ -63,9 +67,9 @@ asset.export(Object)
 
 
 asset.meta = {
-  Name = "Planetary Candidates",
-  Description = "Digital Universe asset for Planetary Candidates",
-  Author = "Brian Abbott, Emily Rice, and Jason No (AMNH)",
+  Name = "Exoplanetary Candidates",
+  Description = Object.GUI.Description,
+  Author = "Brian Abbott, Zack Reeves, Emily Rice, and Jason No (AMNH)",
   URL = "https://www.amnh.org/research/hayden-planetarium/digital-universe",
   License = "AMNH Digital Universe"
 }
diff --git a/data/assets/scene/digitaluniverse/clusters.asset b/data/assets/scene/digitaluniverse/galaxy_clusters.asset
similarity index 70%
rename from data/assets/scene/digitaluniverse/clusters.asset
rename to data/assets/scene/digitaluniverse/galaxy_clusters.asset
index 7b8e34a08d..82ca6b29c9 100644
--- a/data/assets/scene/digitaluniverse/clusters.asset
+++ b/data/assets/scene/digitaluniverse/galaxy_clusters.asset
@@ -21,9 +21,9 @@ local Object = {
     Labels = {
       Enabled = true,
       File = speck .. "galclust.label",
-      Color = { 1.0, 0.44, 0.0 },
+      Color = { 0.9, 0.5, 0.22 },
       Size = 22,
-      MinMaxSize = { 8, 20 },
+      MinMaxSize = { 8, 15 },
       Unit = "Mpc",
       TransformationMatrix = TransformMatrix
     },
@@ -33,12 +33,10 @@ local Object = {
   },
   GUI = {
     Name = "Galaxy Cluster Labels",
-    Path = "/Universe/Galaxies",
-    Description = [[Census 15 galaxy cluster labels. DU Version 1.2. <br>The Galaxy
-      clusters dataset is a series of labels that mark where the large clusters of
-      galaxies are in the nearby universe. These labels must be used in conjunction
-      with the Tully galaxy group.(Description from URL) <br><br> Data Reference:
-      Brian Abbott (AMNH)]]
+    Path = "/Universe/Nearby Surveys",
+    Description = [[The galaxy clusters dataset is a series of labels that mark where the
+      large clusters of galaxies are in the nearby universe. These labels must be used in
+      conjunction with the Tully galaxy group. Census: 15 galaxy cluster labels.]]
   }
 }
 
@@ -57,7 +55,7 @@ asset.export(Object)
 
 asset.meta = {
   Name = "Galaxy Clusters Labels",
-  Description = "Digital Universe asset for Galaxy Clusters",
+  Description = Object.GUI.Description,
   Author = "Brian Abbott (AMNH)",
   URL = "https://www.amnh.org/research/hayden-planetarium/digital-universe",
   License = "AMNH Digital Universe"
diff --git a/data/assets/scene/digitaluniverse/groups.asset b/data/assets/scene/digitaluniverse/galaxy_groups.asset
similarity index 72%
rename from data/assets/scene/digitaluniverse/groups.asset
rename to data/assets/scene/digitaluniverse/galaxy_groups.asset
index 6039b93fca..e56532083a 100644
--- a/data/assets/scene/digitaluniverse/groups.asset
+++ b/data/assets/scene/digitaluniverse/galaxy_groups.asset
@@ -21,8 +21,8 @@ local Object = {
     Labels = {
       Enabled = true,
       File = speck .. "groups.label",
-      Color = { 0.1, 0.6, 0.2 },
-      Size = 21.5,
+      Color = { 0.1, 0.4, 0.2 },
+      Size = 20.4,
       MinMaxSize = { 8, 20 },
       Unit = "Mpc",
       TransformationMatrix = TransformMatrix
@@ -33,11 +33,10 @@ local Object = {
   },
   GUI = {
     Name = "Galaxy Group Labels",
-    Path = "/Universe/Galaxies",
-    Description = [[Census: 62 galaxy group labels. DU Version 1.2. <br> The Galaxy
-    Groups data are a set of labels that mark the nearby galaxy groups. The Milky Way
-    is in the Local Group, and we are surrounded by many other groups.(Description
-    from URL) <br><br> Data Reference: Brian Abbott (AMNH)]]
+    Path = "/Universe/Nearby Surveys",
+    Description = [[The Galaxy Groups data are a set of labels that mark the nearby
+      galaxy groups. The Milky Way is in the Local Group, and we are surrounded by
+      many other groups delineated by these labels. Census: 62 galaxy group labels.]]
   }
 }
 
@@ -57,7 +56,7 @@ asset.export(Object)
 asset.meta = {
   Name = "Galaxy Group Labels",
   Author = "Brian Abbott (AMNH)",
-  Description = "Digital Universe asset for Galaxy Groups",
+  Description = Object.GUI.Description,
   URL = "https://www.amnh.org/research/hayden-planetarium/digital-universe",
   License = "AMNH Digital Universe"
 }
diff --git a/data/assets/scene/digitaluniverse/globularclusters.asset b/data/assets/scene/digitaluniverse/globularclusters.asset
index ccc07cc910..c2f97e6a63 100644
--- a/data/assets/scene/digitaluniverse/globularclusters.asset
+++ b/data/assets/scene/digitaluniverse/globularclusters.asset
@@ -9,7 +9,7 @@ local speck = asset.resource({
   Name = "Globular Clusters Speck Files",
   Type = "HttpSynchronization",
   Identifier = "digitaluniverse_globularclusters_speck",
-  Version = 2
+  Version = 3
 })
 
 
@@ -20,7 +20,7 @@ local Object = {
     Enabled = false,
     Labels = {
       File = speck .. "gc.label",
-      Color = { 0.5, 0.5, 0.0 },
+      Color = { 0.36, 0.36, 0.0 },
       Size = 16.7,
       MinMaxSize = { 4, 20 },
       Unit = "pc"
@@ -28,32 +28,23 @@ local Object = {
     Coloring = {
       FixedColor = { 0.8, 0.8, 0.0 }
     },
-    Opacity = 0.4,
+    Opacity = 0.65,
     File = speck .. "gc.speck",
     PolygonSides = 5,
     Unit = "pc",
     SizeSettings = {
-      ScaleExponent = 18.9,
+      ScaleExponent = 18.6,
       MaxSize = 13.0,
       EnableMaxSizeControl = true
     }
   },
   GUI = {
     Name = "Globular Clusters",
-    Path = "/Milky Way",
-    Description = [[Census: 157 globular clusters. DU Version 2.6. <br>Globular star
-      clusters are gravitationally bound groups of 100,000 to 1 million stars. They
-      are compact, spherical "balls" of stars with very high stellar densities in
-      their centers (stars near their center are within a light year of one
-      another). These clusters are typically 30 to 100 light years in diameter. If
-      Earth were located inside one of these clusters, our sky would be lit by an
-      abundance of stars brighter than the Sun. The globular clusters form one of
-      the most complete data sets in the Atlas. Data for the clusters represent
-      almost all the clusters in our Galaxy—several on the opposite side of Galactic
-      center may be invisible to us. The clusters orbit the Milky Way in random
-      orientations, as comets orbit the Sun.(Description from URL) <br><br> Data
-      Reference: Properties of Galactic Globular Clusters, C. Francis+
-      (U Cambridge)]]
+    Path = "/Milky Way/Star Clusters",
+    Description = [[Globular star clusters are gravitationally bound groups of 100,000
+      to 1 million stars. They are compact, spherical "balls" of stars with very high
+      stellar densities. These clusters are typically 30 to 100 light years in diameter.
+      Census: 161 globular clusters.]]
   }
 }
 
@@ -72,18 +63,8 @@ asset.export(Object)
 
 asset.meta = {
   Name = "Globular Clusters",
-  Description = [[Census: 157 globular clusters. DU Version 2.6. Globular star clusters
-    are gravitationally bound groups of 100,000 to 1 million stars. They are compact,
-    spherical "balls" of stars with very high stellar densities in their centers (stars
-    near their center are within a light year of one another). These clusters are
-    typically 30 to 100 light years in diameter. If Earth were located inside one of these
-    clusters, our sky would be lit by an abundance of stars brighter than the Sun. The
-    globular clusters form one of the most complete data sets in the Atlas. Data for the
-    clusters represent almost all the clusters in our Galaxy—several on the opposite side
-    of Galactic center may be invisible to us. The clusters orbit the Milky Way in random
-    orientations, as comets orbit the Sun.(Description from URL) <br><br> Data Reference:
-    Properties of Galactic Globular Clusters, C. Francis+ (U Cambridge)]],
-  Author = "Brian Abbott (AMNH)",
+  Description = Object.GUI.Description,
+  Author = "Brian Abbott, Zack Reeves (AMNH)",
   URL = "https://www.amnh.org/research/hayden-planetarium/digital-universe",
   License = "AMNH Digital Universe"
 }
diff --git a/data/assets/scene/digitaluniverse/grids.asset b/data/assets/scene/digitaluniverse/grids.asset
index c0b5341290..d36526ba0d 100644
--- a/data/assets/scene/digitaluniverse/grids.asset
+++ b/data/assets/scene/digitaluniverse/grids.asset
@@ -66,84 +66,20 @@ local RadioSphere = {
   },
   GUI = {
     Name = "Radio Sphere",
-    Path = "/Other/Grids"
-  }
-}
-
-local OortSphere = {
-  Identifier = "OortSphere",
-  Parent = transforms.SolarSystemBarycenter.Name,
-  Transform = {
-    Scale = {
-      Type = "StaticScale",
-      Scale = 7.47989845E15
-    },
-    Rotation = {
-      Type = "StaticRotation",
-      Rotation = EclipticRotationMatrix
-    }
-  },
-  Renderable = {
-    Type = "RenderableSphericalGrid",
-    Enabled = false,
-    Opacity = 0.8,
-    Color = { 0.8, 0.4, 0.4 },
-    LineWidth = 2.0
-  },
-  GUI = {
-    Name = "Oort Sphere",
-    Path = "/Other/Grids"
-  }
-}
-
-local EclipticSphere = {
-  Identifier = "EclipticSphere",
-  Parent = transforms.SolarSystemBarycenter.Name,
-  Transform = {
-    Scale = {
-      Type = "StaticScale",
-      Scale = 9.46377307652E17
-    },
-    Rotation = {
-      Type = "StaticRotation",
-      Rotation = EclipticRotationMatrix
-    }
-  },
-  Renderable = {
-    Type = "RenderableSphericalGrid",
-    Enabled = false,
-    Opacity = 1.0,
-    Color = { 0.74, 0.26, 0.26 },
-    LineWidth = 2.0
-  },
-  GUI = {
-    Name = "Ecliptic Sphere",
-    Path = "/Other/Grids"
-  }
-}
-
-local EclipticSphereLabels = {
-  Identifier = "EclipticSphereLabels",
-  Parent = transforms.SolarSystemBarycenter.Name,
-  Renderable = {
-    Type = "RenderablePointCloud",
-    Enabled = false,
-    Labels = {
-      Enabled = true,
-      File = speck .. "eclip.label",
-      Color = { 0.5, 0.5, 0.5 },
-      Size = 14.75,
-      MinMaxSize = { 1, 50 },
-      Unit = "pc",
-      TransformationMatrix = EclipticTransformationMatrix
-    },
-    Opacity = 0.65,
-    Unit = "pc",
-    TransformationMatrix = EclipticTransformationMatrix
-  },
-  GUI = {
-    Name = "Ecliptic Sphere Labels",
-    Path = "/Other/Grids"
+    Path = "/Milky Way/Grids",
+    Description = [[The radio sphere describes the theoretical extent of Earth's radio
+      signals in space. Before television carrier waves, early-warning radar first used
+      in World War II, and the detonation of atomic weapons, Earth was radio-quiet to the
+      universe (AM and FM radio signals bounce off the atmosphere and do not escape it).
+      After the use of these and other radio emitters began, in the late 1930s and early
+      1940s, signals were able to escape the atmosphere and travel into space at the speed
+      of light. Since then, we have been broadcasting to the universe. We mention earlier
+      that this is the theoretical extent of these signals. In reality, these signals
+      will dissipate rapidly into the ambient cosmic noise of the universe. All light
+      falls off as the square of the distance, and radio waves are no different. The
+      signals that emanate from Earth are likely lost in the noise before they leave the
+      solar system, but the radio sphere remains a visually compelling astronomical
+      concept.]]
   }
 }
 
@@ -153,7 +89,7 @@ local EquatorialSphere = {
   Transform = {
     Scale = {
       Type = "StaticScale",
-      Scale = 4.28601E17
+      Scale = 80 * LightYear
     },
     Rotation = {
       Type = "StaticRotation",
@@ -163,13 +99,16 @@ local EquatorialSphere = {
   Renderable = {
     Type = "RenderableSphericalGrid",
     Enabled = false,
-    Opacity = 0.8,
-    Color = { 0.69, 0.68, 0.29 },
-    LineWidth = 2.0
+    Opacity = 1.0,
+    Color = { 0.3, 0.3, 0.15 },
+    LineWidth = 2.0,
+    GridSegments = { 18, 24 },
   },
   GUI = {
-    Name = "Equatorial Sphere",
-    Path = "/Other/Grids"
+    Name = "Equatorial Coordinates",
+    Path = "/Night Sky/Coordinate Systems/Equatorial",
+    Description = [[An 80-light-year sphere representing equatorial coordinates (right
+      ascension and declination).]]
   }
 }
 
@@ -193,8 +132,65 @@ local EquatorialSphereLabels = {
     TransformationMatrix = EquatorialTransformationMatrix
   },
   GUI = {
-    Name = "Equatorial Sphere Labels",
-    Path = "/Other/Grids"
+    Name = "Equatorial Coordinates Labels",
+    Path = "/Night Sky/Coordinate Systems/Equatorial",
+    Description = [[Labels on a sphere representing right ascension in hours and
+      declination in degrees.]]
+  }
+}
+
+local EclipticSphere = {
+  Identifier = "EclipticSphere",
+  Parent = transforms.SolarSystemBarycenter.Name,
+  Transform = {
+    Scale = {
+      Type = "StaticScale",
+      Scale = 100 * LightYear
+    },
+    Rotation = {
+      Type = "StaticRotation",
+      Rotation = EclipticRotationMatrix
+    }
+  },
+  Renderable = {
+    Type = "RenderableSphericalGrid",
+    Enabled = false,
+    Opacity = 1.0,
+    Color = { 0.3, 0.15, 0.15 },
+    LineWidth = 2.0
+  },
+  GUI = {
+    Name = "Ecliptic Coordinates",
+    Path = "/Night Sky/Coordinate Systems/Ecliptic",
+    Description = [[A 100-light-year sphere representing ecliptic coordinates (ecliptic
+      longitude and latitude).]]
+  }
+}
+
+local EclipticSphereLabels = {
+  Identifier = "EclipticSphereLabels",
+  Parent = transforms.SolarSystemBarycenter.Name,
+  Renderable = {
+    Type = "RenderablePointCloud",
+    Enabled = false,
+    Labels = {
+      Enabled = true,
+      File = speck .. "eclip.label",
+      Color = { 0.5, 0.5, 0.5 },
+      Size = 14.5,
+      MinMaxSize = { 1, 50 },
+      Unit = "pc",
+      TransformationMatrix = EclipticTransformationMatrix
+    },
+    Opacity = 0.65,
+    Unit = "pc",
+    TransformationMatrix = EclipticTransformationMatrix
+  },
+  GUI = {
+    Name = "Ecliptic Coordinates Labels",
+    Path = "/Night Sky/Coordinate Systems/Ecliptic",
+    Description = [[Labels on a sphere representing ecliptic longitude and latitude in
+      degrees.]]
   }
 }
 
@@ -204,7 +200,7 @@ local GalacticSphere = {
   Transform = {
     Scale = {
       Type = "StaticScale",
-      Scale = 9.46377307652E18
+      Scale = 1000 * LightYear
     }
   },
   Renderable = {
@@ -212,11 +208,13 @@ local GalacticSphere = {
     Enabled = false,
     LineWidth = 2.0,
     Opacity = 1.0,
-    Color = { 0.0, 0.6, 0.6 }
+    Color = { 0.05, 0.25, 0.25 }
   },
   GUI = {
-    Name = "Galactic Sphere",
-    Path = "/Other/Grids"
+    Name = "Galactic Coordinates",
+    Path = "/Night Sky/Coordinate Systems/Galactic",
+    Description = [[A 1000-light-year sphere representing galactic coordinates (galactic
+      longitude and latitude).]]
   }
 }
 
@@ -230,7 +228,7 @@ local GalacticSphereLabels = {
       Enabled = true,
       File = speck .. "galac.label",
       Color = { 0.5, 0.5, 0.5 },
-      Size = 15.8,
+      Size = 15.5,
       MinMaxSize = { 1, 100 },
       Unit = "pc"
     },
@@ -238,8 +236,10 @@ local GalacticSphereLabels = {
     Unit = "pc"
   },
   GUI = {
-    Name = "Galactic Sphere Labels",
-    Path = "/Other/Grids"
+    Name = "Galactic Coordinates Labels",
+    Path = "/Night Sky/Coordinate Systems/Galactic",
+    Description = [[Labels on a sphere representing galactic longitude and latitude in
+      degrees.]]
   }
 }
 
@@ -258,7 +258,7 @@ local Plane1lh = {
     Labels = {
       File = speck .. "1lh.label",
       Color = { 0.0, 0.2, 0.5 },
-      Size = 9.5,
+      Size = 8.9,
       MinMaxSize = { 0, 30 },
       Unit = "Km"
     },
@@ -269,8 +269,9 @@ local Plane1lh = {
     Size = { 2 * LightHour, 2 * LightHour }
   },
   GUI = {
-    Name = "1lh Grid",
-    Path = "/Other/Grids",
+    Name = "1-light-hour Grid",
+    Path = "/Solar System/Grids",
+    Description = [[A 1-light-hour Cartesian grid aligned on the plane of the Solar System.]],
     OrderingNumber = LightHour
   }
 }
@@ -301,8 +302,9 @@ local Plane1ld = {
     Size = { 2 * LightDay, 2 * LightDay }
   },
   GUI = {
-    Name = "1ld Grid",
-    Path = "/Other/Grids",
+    Name = "1-light-day Grid",
+    Path = "/Solar System/Grids",
+    Description = [[A 1-light-day Cartesian grid aligned on the plane of the Solar System.]],
     OrderingNumber = LightDay
   }
 }
@@ -333,8 +335,9 @@ local Plane1lm = {
     Size = { 2 * LightMonth, 2 * LightMonth }
   },
   GUI = {
-    Name = "1lm Grid",
-    Path = "/Other/Grids",
+    Name = "1-light-month Grid",
+    Path = "/Solar System/Grids",
+    Description = [[A 1-light-month Cartesian grid aligned on the plane of the Solar System.]],
     OrderingNumber = LightMonth
   }
 }
@@ -365,8 +368,9 @@ local Plane1ly = {
     Size = { 2 * LightYear, 2 * LightYear }
   },
   GUI = {
-    Name = "1ly Grid",
-    Path = "/Other/Grids",
+    Name = "1-light-year Grid",
+    Path = "/Solar System/Grids",
+    Description = [[A 1-light-year Cartesian grid aligned on the plane of the Solar System.]],
     OrderingNumber = LightYear
   }
 }
@@ -397,8 +401,9 @@ local Plane10ly = {
     Size = { 10 * 2 * LightYear, 10 * 2 * LightYear }
   },
   GUI = {
-    Name = "10ly Grid",
-    Path = "/Other/Grids",
+    Name = "10-light-year Grid",
+    Path = "/Milky Way/Grids",
+    Description = [[A 10-light-year Cartesian grid aligned on the plane of the Solar System.]],
     OrderingNumber = 10 * LightYear
   }
 }
@@ -429,8 +434,9 @@ local Plane100ly = {
     Size = { 100 * 2 * LightYear, 100 * 2 * LightYear }
   },
   GUI = {
-    Name = "100ly Grid",
-    Path = "/Other/Grids",
+    Name = "100-light-year Grid",
+    Path = "/Milky Way/Grids",
+    Description = [[A 100-light-year Cartesian grid aligned on the plane of the Solar System.]],
     OrderingNumber = 100 * LightYear
   }
 }
@@ -461,8 +467,9 @@ local Plane1kly = {
     Size = { 1000 * 2 * LightYear, 1000 * 2 * LightYear }
   },
   GUI = {
-    Name = "1kly Grid",
-    Path = "/Other/Grids",
+    Name = "1,000-light-year Grid",
+    Path = "/Milky Way/Grids",
+    Description = [[A 1,000-light-year Cartesian grid aligned on the plane of the Solar System.]],
     OrderingNumber = 1000 * LightYear
   }
 }
@@ -493,8 +500,9 @@ local Plane10kly = {
     Size = { 10000 * 2 * LightYear, 10000 * 2 * LightYear }
   },
   GUI = {
-    Name = "10kly Grid",
-    Path = "/Other/Grids",
+    Name = "10,000-light-year Grid",
+    Path = "/Milky Way/Grids",
+    Description = [[A 10,000-light-year Cartesian grid aligned on the plane of the Solar System.]],
     OrderingNumber = 10000 * LightYear
   }
 }
@@ -507,7 +515,7 @@ local Plane100kly = {
     Labels = {
       File = speck .. "100kly.label",
       Color = { 0.0, 0.2, 0.5 },
-      Size = 18.6,
+      Size = 18.0,
       MinMaxSize = { 0, 30 },
       Unit = "Mpc"
     },
@@ -520,8 +528,9 @@ local Plane100kly = {
     Size = { 100000 * 2 * LightYear, 100000 * 2 * LightYear }
   },
   GUI = {
-    Name = "100kly Grid",
-    Path = "/Other/Grids",
+    Name = "100,000-light-year Grid",
+    Path = "/Universe/Grids",
+    Description = [[A 100,000-light-year Cartesian grid aligned on the plane of the Milky Way.]],
     OrderingNumber = 100000 * LightYear
   }
 }
@@ -534,7 +543,7 @@ local Plane1Mly = {
     Labels = {
       File = speck .. "1Mly.label",
       Color = { 0.0, 0.2, 0.5 },
-      Size = 19.6,
+      Size = 19.0,
       MinMaxSize = { 0, 30 },
       Unit = "Mpc"
     },
@@ -547,8 +556,9 @@ local Plane1Mly = {
     Size = { 1E6 * 2 * LightYear, 1E6 * 2 * LightYear }
   },
   GUI = {
-    Name = "1Mly Grid",
-    Path = "/Other/Grids",
+    Name = "1-million-light-year Grid",
+    Path = "/Universe/Grids",
+    Description = [[A 1-million-light-year Cartesian grid aligned on the plane of the Milky Way.]],
     OrderingNumber = 1E6 * LightYear
   }
 }
@@ -561,7 +571,7 @@ local Plane10Mly = {
     Labels = {
       File = speck .. "10Mly.label",
       Color = { 0.0, 0.2, 0.5 },
-      Size = 20.6,
+      Size = 20.3,
       MinMaxSize = { 0, 30 },
       Unit = "Mpc"
     },
@@ -574,8 +584,9 @@ local Plane10Mly = {
     Size = { 10E6 * 2 * LightYear, 10E6 * 2 * LightYear }
   },
   GUI = {
-    Name = "10Mly Grid",
-    Path = "/Other/Grids",
+    Name = "10-million-light-year Grid",
+    Path = "/Universe/Grids",
+    Description = [[A 10-million-light-year Cartesian grid aligned on the plane of the Milky Way.]],
     OrderingNumber = 10E6 * LightYear
   }
 }
@@ -588,7 +599,7 @@ local Plane100Mly = {
     Labels = {
       File = speck .. "100Mly.label",
       Color = { 0.0, 0.2, 0.5 },
-      Size = 21.6,
+      Size = 20.9,
       MinMaxSize = { 0, 30 },
       Unit = "Mpc"
     },
@@ -601,8 +612,9 @@ local Plane100Mly = {
     Size = { 100E6 * 2 * LightYear, 100E6 * 2 * LightYear }
   },
   GUI = {
-    Name = "100Mly Grid",
-    Path = "/Other/Grids",
+    Name = "100-million-light-year Grid",
+    Path = "/Universe/Grids",
+    Description = [[A 100-million-light-year Cartesian grid aligned on the plane of the Milky Way.]],
     OrderingNumber = 100E6 * LightYear
   }
 }
@@ -615,7 +627,7 @@ local Plane20Gly = {
     Labels = {
       File = speck .. "20Gly.label",
       Color = { 0.0, 0.2, 0.5 },
-      Size = 23.6,
+      Size = 23.1,
       MinMaxSize = { 0, 30 },
       Unit = "Mpc"
     },
@@ -628,8 +640,9 @@ local Plane20Gly = {
     Size = { 20E9 * 2 * LightYear, 20E9 * 2 * LightYear }
   },
   GUI = {
-    Name = "20Gly Grid",
-    Path = "/Other/Grids",
+    Name = "20-billion-light-year Grid",
+    Path = "/Universe/Grids",
+    Description = [[A 20-billion-light-year Cartesian grid aligned on the plane of the Milky Way.]],
     OrderingNumber = 20E9 * LightYear
   }
 }
@@ -637,7 +650,6 @@ local Plane20Gly = {
 
 asset.onInitialize(function()
   openspace.addSceneGraphNode(RadioSphere)
-  openspace.addSceneGraphNode(OortSphere)
   openspace.addSceneGraphNode(EclipticSphere)
   openspace.addSceneGraphNode(EclipticSphereLabels)
   openspace.addSceneGraphNode(EquatorialSphere)
@@ -679,12 +691,10 @@ asset.onDeinitialize(function()
     openspace.removeSceneGraphNode(EquatorialSphere)
     openspace.removeSceneGraphNode(EclipticSphereLabels)
     openspace.removeSceneGraphNode(EclipticSphere)
-    openspace.removeSceneGraphNode(OortSphere)
     openspace.removeSceneGraphNode(RadioSphere)
 end)
 
 asset.export(RadioSphere)
-asset.export(OortSphere)
 asset.export(EclipticSphere)
 asset.export(EclipticSphereLabels)
 asset.export(EquatorialSphere)
@@ -709,13 +719,14 @@ asset.export(Plane20Gly)
 
 asset.meta = {
   Name = "Grids",
-  Description = [[Various grids for showing size reference. Included: 10,000 light year
-    grid, 10 light year grid, 20 billion light year grid, 10 million light year grid,
-    100 light year grid, 100 million light year grid, Ecliptic Coordinate Sphere
-    (500-light-year radius), Galactic Coordinate Sphere (1000-light-year radius),
-    Galaxy Coordinate Grid, Celestial Coordinates / Radio Sphere (dynamic radius), 1
-    billion light year grid, Celestial Coordinate Sphere (1000000-light-year radius),
-    1,000 light year grid, 1 million light year grid, 1 light year grid]],
+  Description = [[Various grids and spheres for showing size reference. Included:
+    10,000 light year grid, 10 light year grid, 20 billion light year grid, 10 million
+    light year grid, 100 light year grid, 100 million light year grid, Ecliptic
+    Coordinate Sphere (500-light-year radius), Galactic Coordinate Sphere
+    (1000-light-year radius), Galaxy Coordinate Grid, Celestial Coordinates / Radio Sphere
+    (dynamic radius), 1 billion light year grid, Celestial Coordinate Sphere
+    (1000000-light-year radius), 1,000 light year grid, 1 million light year grid,
+    1 light year grid.]],
   Author = "Brian Abbott (AMNH)",
   URL = "https://www.amnh.org/research/hayden-planetarium/digital-universe",
   License = "AMNH Digital Universe"
diff --git a/data/assets/scene/digitaluniverse/h2regions.asset b/data/assets/scene/digitaluniverse/h2regions.asset
index 000ca7c6f1..21f88f9a7f 100644
--- a/data/assets/scene/digitaluniverse/h2regions.asset
+++ b/data/assets/scene/digitaluniverse/h2regions.asset
@@ -9,7 +9,7 @@ local speck = asset.resource({
   Name = "HII Regions Speck Files",
   Type = "HttpSynchronization",
   Identifier = "digitaluniverse_h2regions_speck",
-  Version = 3
+  Version = 4
 })
 
 
@@ -33,25 +33,23 @@ local Object = {
     PolygonSides = 6,
     Unit = "pc",
     SizeSettings = {
-      ScaleExponent = 18.24,
+      ScaleExponent = 18.5,
       MaxSize = 8.0,
       EnableMaxSizeControl = true
     }
   },
   GUI = {
     Name = "HII Regions",
-    Path = "/Milky Way",
-    Description = [[Census: 1,271 nebulae. DU Version 4.6. <br> H ii (pronounced
-      H-two) regions are stellar nurseries for newborn stars. Stars are born from
-      condensing clouds of hydrogen gas. As these clouds condense, the densities
-      become high enough to form stars. From Earth's perspective, you'll notice that
-      the H ii regions all lie close to the Galactic plane. This is not an accident
-      of nature. These star-forming regions lie in the plane of the Galaxy because
-      that is where star formation occurs in spiral galaxies such as our Milky Way.
-      Because of this, they are great tracers of the spiral arms of the Galaxy, and
-      were instrumental in our understanding of the Galaxy's overall structure
-      (Description from URL) <br><br> Data Reference: The WISE catalog of Galactic
-      HII Regions (Anderson+, 2014)]]
+    Path = "/Milky Way/Nebulae",
+    Description = [[HII (pronounced "H-two") regions are stellar nurseries for newborn
+      stars. Stars are born from condensing clouds of hydrogen gas. As these clouds
+      condense, the densities become high enough to form stars. An HII region is the
+      surrounding clouds of hydrogen that glow from the stars born within them. The
+      result is a bright, glowing nebula which is seen to great distances. One local
+      celebrity among HII regions is the Orion Nebula (M42). These star-forming regions
+      lie in the plane of the Galaxy because that is where star formation occurs in
+      spiral galaxies such as our Milky Way. Because of this, they are great tracers of
+      the spiral arms of the Galaxy. Census: 1,108 star-forming regions.]]
   }
 }
 
@@ -70,8 +68,7 @@ asset.export(Object)
 
 asset.meta = {
   Name = "HII Regions",
-  Description = "Digital Universe asset for HII Regions",
-  Author = "Carter Emmart, Brian Abbott (AMNH)",
+  Description = Object.GUI.Description,
   URL = "https://www.amnh.org/research/hayden-planetarium/digital-universe",
   License = "AMNH Digital Universe"
 }
diff --git a/data/assets/scene/digitaluniverse/localdwarfs.asset b/data/assets/scene/digitaluniverse/local_group_dwarfs.asset
similarity index 55%
rename from data/assets/scene/digitaluniverse/localdwarfs.asset
rename to data/assets/scene/digitaluniverse/local_group_dwarfs.asset
index 23ad7fadb8..4535910ce0 100644
--- a/data/assets/scene/digitaluniverse/localdwarfs.asset
+++ b/data/assets/scene/digitaluniverse/local_group_dwarfs.asset
@@ -23,12 +23,12 @@ local Object = {
     Labels = {
       File = speck .. "localgroup.label",
       Color = { 0.3, 0.3, 1.0 },
-      Size = 18.3,
+      Size = 18.4,
       MinMaxSize = { 7, 20 },
       Unit = "Mpc"
     },
     Coloring = {
-      FixedColor = { 0.0, 1.0, 0.0 },
+      FixedColor = { 0.5, 1.0, 1.0 },
       ColorMapping = {
         File = speck .. "localgroup.cmap",
         ParameterOptions = {
@@ -39,25 +39,25 @@ local Object = {
     PolygonSides = 12,
     Unit = "Mpc",
     SizeSettings = {
-      ScaleExponent = 20.2,
+      ScaleExponent = 20.77,
       MaxSize = 0.7,
       EnableMaxSizeControl = true
     }
   },
   GUI = {
     Name = "Local Group",
-    Path = "/Universe/Galaxies",
-    Description = [[Census: 102 galaxies. DU Version 6.4. <br> A group of galaxies is
-      a small number of large galaxies that are typically surrounded by a large
-      number of small galaxies. The Milky Way belongs to the Local Group, and is one
-      of roughly 100 galaxies in that group. The Milky Way, the Andromeda Galaxy
-      (also known as Messier 31, or M31), and the Triangulum Galaxy (M33) are three
-      of the largest galaxies in the Local Group. Each is a spiral galaxy containing
-      hundreds of billions of stars. Surrounding the Milky Way and Andromeda are a
-      bevy of dwarf galaxies-smaller, often irregular galaxies, that contain
-      hundreds of millions to a few billion stars. (Description from URL) <br><br>
-      Data Reference: Properties of dwarf galaxies in the Local Group
-      (McConnachie+, 2012)]]
+    Path = "/Universe/Nearby Surveys",
+    Description = [[A group of galaxies is typically composed of a small number of large
+      galaxies that are surrounded by a large number of small galaxies. The Milky Way
+      belongs to the Local Group, and is one of roughly 100 galaxies in that group. The
+      Milky Way, the Andromeda Galaxy (also known as Messier 31, or M31), and the
+      Triangulum Galaxy (M33) are three of the largest galaxies in the Local Group. Each
+      is a spiral galaxy containing hundreds of billions of stars. Surrounding the Milky
+      Way and Andromeda are a bevy of dwarf galaxies--smaller, often irregular galaxies,
+      that contain hundreds of millions to a few billion stars. Colors: Aqua are galaxies
+      associated with the Milky Way, Yellow shows galaxies huddled around the Andromeda
+      Galaxy, Green are other Local Group members, and Gray are neighboring galaxies not
+      in the Local Group. Census: 102 galaxies.]]
   }
 }
 
@@ -76,7 +76,7 @@ asset.export(Object)
 
 asset.meta = {
   Name = "Local Group",
-  Description = "Digital Universe asset for the Local Goup",
+  Description = Object.GUI.Description,
   Author = "Brian Abbott (AMNH)",
   URL = "https://www.amnh.org/research/hayden-planetarium/digital-universe",
   License = "AMNH Digital Universe"
diff --git a/data/assets/scene/digitaluniverse/milkyway.asset b/data/assets/scene/digitaluniverse/milkyway.asset
index 64ff019b9a..dd9cf291d0 100644
--- a/data/assets/scene/digitaluniverse/milkyway.asset
+++ b/data/assets/scene/digitaluniverse/milkyway.asset
@@ -39,15 +39,14 @@ local Object = {
   },
   GUI = {
     Name = "Milky Way Galaxy Image",
-    Path = "/Milky Way",
-    Description = [[Census: 1 image. DU Version 2.2. <br> The exterior view of the
-      Milky Way is simply a two-dimensional image. The image is that of NGC 1232, a
-      galaxy thought to resemble our Milky Way. The image has been properly sized
-      and approximately oriented to function as a placeholder, allowing one to see
-      the context of the Galaxy relative to other data in the atlas. The features
-      you see in the image, of course, do not represent our Galaxy, per se, but
-      resemble similar features found in our Galaxy.(Description from URL)
-      <br><br> Data Reference: European Southern Observatory]]
+    Path = "/Milky Way/Galaxy",
+    Description = [[The exterior view of the Milky Way is represented here by a
+      two-dimensional image. The image is that of NGC 1232, a galaxy thought to resemble
+      our Milky Way. The image has been properly sized and approximately oriented to
+      function as a placeholder, allowing one to see the context of the Galaxy relative
+      to other data in the atlas. The features you see in the image, of course, do not
+      represent our Galaxy, per se, but resemble similar features found in our Galaxy.
+      Census: 1 image.]]
   }
 }
 
@@ -66,8 +65,7 @@ asset.export(Object)
 
 asset.meta = {
   Name = "MilkyWay Galaxy",
-  Description = [[Digital Universe asset containt 2D image of the MilkyWay. For
-    extragalactic viewing]],
+  Description = Object.GUI.Description,
   Author = "Brian Abbott, Carter Emmart (AMNH)",
   URL = "https://www.amnh.org/research/hayden-planetarium/digital-universe",
   License = "AMNH Digital Universe"
diff --git a/data/assets/scene/digitaluniverse/milkyway_arm_labels.asset b/data/assets/scene/digitaluniverse/milkyway_arm_labels.asset
index d55bc511a7..10e31e117c 100644
--- a/data/assets/scene/digitaluniverse/milkyway_arm_labels.asset
+++ b/data/assets/scene/digitaluniverse/milkyway_arm_labels.asset
@@ -40,12 +40,15 @@ local Object = {
   },
   GUI = {
     Name = "Milky Way Arms Labels",
-    Path = "/Milky Way",
-    Description = [[Census: 1 image. DU Version:  1.2. This image contains labels for
-      the Milky Way's spiral arms. We label them in this manner ("hard coding" the
-      labels into an image rather than having native labels) so that they can retain
-      their size, shape, and location as they overlay the galaxy. (Description from
-      Digital Universe Data Profiles)]]
+    Path = "/Milky Way/Galaxy",
+    Description = [[This is an image that contains labels for the Milky Way's spiral
+      arms. We label them in this manner--"hard-coding" the labels into an image rather
+      than having native labels--so that they can retain their size, shape, and location
+      as they overlay the galaxy. These labels are designed to be a guide, and they map
+      more accurately to the various datasets in the Digital Universe. For example, the
+      pulsars, the star-forming (HII) regions, and open clusters all show the local spiral
+      structure. We can use trends in these data sets to map the arms of the Milky Way.
+      Census: 1 image.]]
   }
 }
 
@@ -64,27 +67,8 @@ asset.export(Object)
 
 asset.meta = {
   Name = "Milky Way Arms Labels",
-  Description = "Image with arm labels for the Milky Way galaxy",
+  Description = Object.GUI.Description,
   Author = "Brian Abbott (AMNH)",
   URL = "https://www.amnh.org/research/hayden-planetarium/digital-universe",
-  License = [[Copyright &#169; American Museum of Natural History. All rights reserved.
-    <br><br> Downloading the Atlas: AMNH offers the Atlas free of charge via our
-    website, http://www.haydenplanetarium.org/. The User is free to download and/or
-    duplicate verbatim copies of the Atlas provided this license and copyright
-    information accompany the Atlas. <br><br> Modifying the Atlas: The user is free to
-    modify the Atlas by either adding data or altering existing data, provided it is
-    for personal use only. Once the user modifies the Atlas, it is no longer part of
-    AMNH's Atlas and cannot be used publicly alongside or within the Atlas without
-    written permission from AMNH. <br><br> Distributing the Atlas: The user is
-    forbidden to distribute and use the Atlas for profit, as part of a software and/or
-    production system that will subsequently be redistributed, or for public
-    consumption (via print, electronic media, or broadcast/produced pieces) without
-    written permission from AMNH. <br><br> Neither the names of American Museum of
-    Natural History and Hayden Planetarium nor the names of their contributors may be
-    used to endorse or promote products derived from this Atlas without specific,
-    prior written permission. <br><br> The Atlas is free but is offered WITHOUT ANY
-    WARRANTY of any kind. We provide the Atlas as is and take no responsibility for
-    any damage resulting from the use of this Atlas. The entire risk as to the quality
-    and performance of this product is with the user. <br><br> For more information,
-    please visit http://www.haydenplanetarium.org/universe]]
+  License = "AMNH Digital Universe"
 }
diff --git a/data/assets/scene/digitaluniverse/milkyway_label.asset b/data/assets/scene/digitaluniverse/milkyway_label.asset
index 68b6b07559..41a7752969 100644
--- a/data/assets/scene/digitaluniverse/milkyway_label.asset
+++ b/data/assets/scene/digitaluniverse/milkyway_label.asset
@@ -13,7 +13,7 @@ local TransformMatrix = {
 }
 
 
-local HomeLabel = {
+local Object = {
   Identifier = "HomeLabel",
   Renderable = {
     Type = "RenderablePointCloud",
@@ -30,27 +30,28 @@ local HomeLabel = {
   },
   GUI = {
     Name = "Home Label",
-    Path = "/Universe/Galaxies",
-    Description = "Label for the Milky Way titled 'Home', sided for the galactic level"
+    Path = "/Universe/Nearby Surveys",
+    Description = [[Label for the Milky Way titled 'Home', sized for viewing outside
+      the Milky Way Galaxy.]]
   }
 }
 
 
 asset.onInitialize(function()
-  openspace.addSceneGraphNode(HomeLabel)
+  openspace.addSceneGraphNode(Object)
 end)
 
 asset.onDeinitialize(function()
-  openspace.removeSceneGraphNode(HomeLabel)
+  openspace.removeSceneGraphNode(Object)
 end)
 
-asset.export(HomeLabel)
+asset.export(Object)
 
 
 
 asset.meta = {
   Name = "Home Label",
-  Description = "Label for the Milky Way titled 'Home', sided for the galactic level",
+  Description = Object.GUI.Description,
   Author = "OpenSpace Team",
   URL = "http://openspaceproject.com",
   License = "MIT license"
diff --git a/data/assets/scene/digitaluniverse/milkyway_sphere.asset b/data/assets/scene/digitaluniverse/milkyway_sphere.asset
deleted file mode 100644
index 3bb9723354..0000000000
--- a/data/assets/scene/digitaluniverse/milkyway_sphere.asset
+++ /dev/null
@@ -1,57 +0,0 @@
-local sphereTextures = asset.resource({
-  Name = "Milky Way Sphere Textures",
-  Type = "HttpSynchronization",
-  Identifier = "milkyway_textures",
-  Version = 2
-})
-
-
-local Sphere = {
-  Identifier = "MilkyWay",
-  Transform = {
-    Rotation = {
-      Type = "StaticRotation",
-      Rotation = { 0, 0, math.pi }
-    }
-  },
-  Renderable = {
-    Type = "RenderableSphereImageLocal",
-    Size = 9.2E21,
-    Segments = 40,
-    Opacity = 0.25,
-    Texture = sphereTextures .. "DarkUniverse_mellinger_4k.jpg",
-    Orientation = "Inside",
-    MirrorTexture = true,
-    FadeOutThreshold = 0.0015,
-    Background = true,
-    DimInAtmosphere = true
-  },
-  Tag = { "daytime_hidden" },
-  GUI = {
-    Name = "Milky Way Sphere",
-    Path = "/Milky Way",
-    Description = [[All sky image of the Milky Way that is visible when inside. Fades
-      out when zooming away from the Milky Way]]
-  }
-}
-
-
-asset.onInitialize(function()
-  openspace.addSceneGraphNode(Sphere)
-end)
-
-asset.onDeinitialize(function()
-  openspace.removeSceneGraphNode(Sphere)
-end)
-
-asset.export(Sphere)
-
-
-
-asset.meta = {
-  Name = "Milky Way Galaxy Sphere",
-  Description = "All sky image of the Milky Way",
-  Author = "OpenSpace Team",
-  URL = "http://openspaceproject.com",
-  License = "MIT license"
-}
diff --git a/data/assets/scene/digitaluniverse/obassociations.asset b/data/assets/scene/digitaluniverse/obassociations.asset
index c8ceffb51d..ad3a01a619 100644
--- a/data/assets/scene/digitaluniverse/obassociations.asset
+++ b/data/assets/scene/digitaluniverse/obassociations.asset
@@ -48,18 +48,14 @@ local Object = {
   },
   GUI = {
     Name = "OB Associations",
-    Path = "/Milky Way",
-    Description = [[Census: 61 OB associations. DU Version 2.4. <br> OB associations
-      are young groups of stars that were formed within a giant molecular cloud, but
-      have dispersed after the original gas and dust from the cloud was blown away
-      by the star's radiation pressure. Although an association's stars are no
-      longer gravitationally bound to one another, they share a common motion in
-      space because they were formed from the same cloud. This allows astronomers to
-      easily determine OB association membership stars. These objects are color
-      coded by their spiral arm membership. Blue associations trace the Sagittarius
-      Arm. Purple associations are in the local Orion Spur. Orange associations are
-      in the Perseus Arm (Description from URL) <br><br> Data Reference: New List of
-      OB Associations (Melnik+)]]
+    Path = "/Milky Way/Star Clusters",
+    Description = [[Stellar associations are loose agglomerations of stars that form from
+      the same gas cloud. OB associations typically have on the order of dozens of O and
+      B stars in them (hotter, massive, younger stars) in addition to cooler stars. Over
+      time the stars dispurse and the association is less concentrated. These associations
+      track relatviey recent star formation. Colors: Blue trace the Sagittarius Arm,
+      Purple are in the local Orion Spur, and Orange are in the Perseus Arm. Census: 61 OB
+      associations.]]
   }
 }
 
@@ -78,8 +74,8 @@ asset.export(Object)
 
 asset.meta = {
   Name = "OB Associations",
-  Description = "Digital Universe asset for OB Associations",
-  Author = "Brian Abbott (AMNH)",
+  Description = Object.GUI.Description,
+  Author = "Brian Abbott, Zack Reeves (AMNH)",
   URL = "https://www.amnh.org/research/hayden-planetarium/digital-universe",
   License = "AMNH Digital Universe"
 }
diff --git a/data/assets/scene/digitaluniverse/oort_cloud.asset b/data/assets/scene/digitaluniverse/oort_cloud.asset
new file mode 100644
index 0000000000..52c9e45384
--- /dev/null
+++ b/data/assets/scene/digitaluniverse/oort_cloud.asset
@@ -0,0 +1,72 @@
+local transforms = asset.require("scene/solarsystem/sun/transforms")
+
+
+
+local speck = asset.resource({
+  Name = "Grids Speck Files",
+  Type = "HttpSynchronization",
+  Identifier = "digitaluniverse_grids_speck",
+  Version = 3
+})
+
+
+local EclipticRotationMatrix = {
+  -0.05487554,  0.4941095, -0.8676661,
+  -0.9938214 , -0.1109906, -0.0003515167,
+  -0.09647644,  0.8622859,  0.4971472
+}
+
+local Object = {
+  Identifier = "OortSphere",
+  Parent = transforms.SolarSystemBarycenter.Name,
+  Transform = {
+    Scale = {
+      Type = "StaticScale",
+      Scale = 7.47989845E15
+    },
+    Rotation = {
+      Type = "StaticRotation",
+      Rotation = EclipticRotationMatrix
+    }
+  },
+  Renderable = {
+    Type = "RenderableSphericalGrid",
+    Enabled = false,
+    Opacity = 0.8,
+    Color = { 0.4, 0.3, 0.2 },
+    LineWidth = 2.0,
+    Segments = 24
+  },
+  GUI = {
+    Name = "Oort Sphere",
+    Path = "/Solar System/Comets",
+    Description = [[The Oort cloud is a region of space surrounding the Sun where comets
+      are believed to originate. It is believed to extend from 20,000-100,000 Astronomical
+      Units (AU), with its greatest concentration around 50,000 AU (1 AU is the average
+      Earth-Sun distance, which equals 149 million kilometers, or 93 million miles). We
+      represent the Oort cloud with a 50,000-AU-radius, wire-frame sphere representing
+      the location of the central concentration. Fifty thousand astronomical units is
+      equal to about 10 light months, which is 0.8 light years, or 4.8 trillion miles.]]
+  }
+}
+
+
+asset.onInitialize(function()
+  openspace.addSceneGraphNode(Object)
+end)
+
+asset.onDeinitialize(function()
+  openspace.removeSceneGraphNode(Object)
+end)
+
+asset.export(Object)
+
+
+
+asset.meta = {
+  Name = "Oort Cloud Sphere",
+  Description = Object.GUI.Description,
+  Author = "Brian Abbott (AMNH)",
+  URL = "https://www.amnh.org/research/hayden-planetarium/digital-universe",
+  License = "AMNH Digital Universe"
+}
diff --git a/data/assets/scene/digitaluniverse/openclusters.asset b/data/assets/scene/digitaluniverse/openclusters.asset
index 6069a90547..035b42cda3 100644
--- a/data/assets/scene/digitaluniverse/openclusters.asset
+++ b/data/assets/scene/digitaluniverse/openclusters.asset
@@ -9,7 +9,7 @@ local speck = asset.resource({
   Name = "Open Clusters Speck Files",
   Type = "HttpSynchronization",
   Identifier = "digitaluniverse_openclusters_speck",
-  Version = 3
+  Version = 4
 })
 
 
@@ -20,39 +20,33 @@ local Object = {
     Enabled = false,
     Labels = {
       File = speck .. "oc.label",
-      Color = { 0.05, 0.4, 0.2 },
+      Color = { 0.0, 0.36, 0.14 },
       Size = 15.5,
       MinMaxSize = { 4, 30 },
       Unit = "pc"
     },
     Coloring = {
-      FixedColor = { 0.1, 0.8, 0.4 }
+      FixedColor = { 0.13, 0.99, 0.50 }
     },
-    Opacity = 0.5,
+    Opacity = 0.9,
     File = speck .. "oc.speck",
     Unit = "pc",
     PolygonSides = 12,
     SizeSettings = {
-      ScaleExponent = 17.6,
+      ScaleExponent = 17.8,
       MaxSize = 23.0,
       EnableMaxSizeControl = true
     }
   },
   GUI = {
     Name = "Open Star Clusters",
-    Path = "/Milky Way",
-    Description = [[Census: 1,867 clusters. DU Version 7.8. <br> An open star cluster is a
-      loose assemblage of stars numbering from hundreds to thousands that are bound by
-      their mutual gravitation. Astronomers know from their stellar spectra that stars in
-      open clusters are typically young. (With a star's spectrum, we can determine the
-      spectral type and the luminosity class, revealing the star's age.) Because these are
+    Path = "/Milky Way/Star Clusters",
+    Description = [[An open star cluster is a loose assemblage of stars numbering from
+      hundreds to thousands that are bound by their mutual gravitation. Because these are
       young stars, we expect to see them in the star-forming regions of our Galaxy, namely
       in the spiral arms. For this reason, open clusters exist, for the most part, in the
-      plane of the Galaxy, where we view the arms edge-on as that band of light in the
-      night sky. Because of this, open clusters were originally known as Galactic
-      clusters, but this term fell out of favor once astronomers began to understand that
-      the Galaxy includes objects beyond the Milky Way's disk. <br><br> Data Reference:
-      Galactic spiral structure revealed by Gaia EDR3 (Poggio+, 2021)]]
+      plane of the Galaxy and indicate relatively recent star formation. Census: 1,867 star
+      clusters.]]
   }
 }
 
@@ -71,8 +65,8 @@ asset.export(Object)
 
 asset.meta = {
   Name = "Open Star Clusters",
-  Description = "Digital Universe asset for Open Star Clusters",
-  Author = "Brian Abbott (AMNH)",
+  Description = Object.GUI.Description,
+  Author = "Brian Abbott, Zack Reeves (AMNH)",
   URL = "https://www.amnh.org/research/hayden-planetarium/digital-universe",
   License = "AMNH Digital Universe"
 }
diff --git a/data/assets/scene/digitaluniverse/planetarynebulae.asset b/data/assets/scene/digitaluniverse/planetarynebulae.asset
index 09b64c8215..68ce205538 100644
--- a/data/assets/scene/digitaluniverse/planetarynebulae.asset
+++ b/data/assets/scene/digitaluniverse/planetarynebulae.asset
@@ -9,7 +9,7 @@ local speck = asset.resource({
   Name = "Planetary Nebulae Speck Files",
   Type = "HttpSynchronization",
   Identifier = "digitaluniverse_planetarynebulae_speck",
-  Version = 2
+  Version = 3
 })
 
 
@@ -20,7 +20,7 @@ local Object = {
     Enabled = false,
     Labels = {
       File = speck .. "pn.label",
-      Color = { 0.25, 0.25, 0.65 },
+      Color = { 0.35, 0.35, 0.60 },
       Size = 16.24,
       MinMaxSize = { 4, 25 },
       Unit = "pc"
@@ -28,27 +28,29 @@ local Object = {
     Coloring = {
       FixedColor = { 0.4, 0.4, 0.9 }
     },
-    Opacity = 0.65,
+    Opacity = 0.99,
     File = speck .. "pn.speck",
     PolygonSides = 3,
     Unit = "pc",
     SizeSettings = {
-      ScaleExponent = 18.46,
+      ScaleExponent = 18.2,
       MaxSize = 19.0,
       EnableMaxSizeControl = true
     }
   },
   GUI = {
     Name = "Planetary Nebulae",
-    Path = "/Milky Way",
-    Description = [[Census: 283 nebulae. DU Version 2.8. <br> A planetary nebula is an
-      expanding shell of gas ejected from a star late in its life cycle. Appearing
-      like greenish disks to a telescopic observer, planetary nebulae received their
-      name from their resemblance to the gaseous planets of our solar system. In no
-      way are they related to planets, rather, they are products of dying stars.
-      (Description from URL) <br><br> Data Reference: Planetary Nebulae distances
-      in Gaia DR2 (Kimeswenger+, 2018), Strasbourg-ESO Catalog of Planetary Nebulae
-      (Acker+ 1992)]]
+    Path = "/Milky Way/Nebulae",
+    Description = [[A planetary nebula is an expanding shell of gas ejected from an
+      average-sized star late in its life cycle. Appearing like greenish disks to a
+      telescopic observer, planetary nebulae received their name from their resemblance to
+      the gaseous planets of our solar system. In no way are they related to planets,
+      rather, they are products of dying stars. As the gas from the star expands, it
+      sweeps up the cooler gas like a snowplow. The gas glows because of the ultraviolet
+      light from the stellar remnant at the center. Because the planetary nebula phase of
+      a star's evolution is relatively short, we observe only those that have occurred
+      recently in the younger stellar population. Therefore, we expect to see planetary
+      nebulae in the disk of the Galaxy. Census: 1,657 planetary nebulae.]]
   }
 }
 
@@ -67,8 +69,8 @@ asset.export(Object)
 
 asset.meta = {
   Name = "Planetary Nebulae",
-  Description = "Digital Universe asset for Planetary Nebulae",
-  Author = "Brian Abbott (AMNH)",
+  Description = Object.GUI.Description,
+  Author = "Brian Abbott, Zack Reeves (AMNH)",
   URL = "https://www.amnh.org/research/hayden-planetarium/digital-universe",
   License = "AMNH Digital Universe"
 }
diff --git a/data/assets/scene/digitaluniverse/pulsars.asset b/data/assets/scene/digitaluniverse/pulsars.asset
index 6e40f56363..82be71fa9b 100644
--- a/data/assets/scene/digitaluniverse/pulsars.asset
+++ b/data/assets/scene/digitaluniverse/pulsars.asset
@@ -9,7 +9,7 @@ local speck = asset.resource({
   Name = "Pulsars Speck Files",
   Type = "HttpSynchronization",
   Identifier = "digitaluniverse_pulsars_speck",
-  Version = 2
+  Version = 3
 })
 
 
@@ -19,9 +19,9 @@ local Object = {
     Type = "RenderablePolygonCloud",
     Enabled = false,
     Labels = {
-      File = speck .. "pulsar.label",
-      Color = { 0.7, 0.2, 0.2 },
-      Size = 15.77,
+      File = speck .. "pulsars.label",
+      Color = { 0.75, 0.21, 0.21 },
+      Size = 15.27,
       MinMaxSize = { 4, 20 },
       Unit = "pc"
     },
@@ -29,30 +29,27 @@ local Object = {
       FixedColor = { 0.7, 0.0, 0.0 }
     },
     Opacity = 1.0,
-    File = speck .. "pulsar.speck",
+    File = speck .. "pulsars.speck",
     PolygonSides = 4,
     Unit = "pc",
     SizeSettings = {
-      ScaleExponent = 18.4,
+      ScaleExponent = 18.1,
       MaxSize = 19.0,
       EnableMaxSizeControl = true
     }
   },
   GUI = {
     Name = "Pulsars",
-    Path = "/Milky Way",
-    Description = [[Census: 2,498 pulsars. DU Version 5.6. <br> Upon death, stars
-      leave behind one of three possible remnants: a white dwarf, a neutron star, or
-      a black hole. Stars that are more massive than the sun will often become
-      neutron stars in a violent explosion called a supernova. During a supernova,
-      the core of the star collapses under such high pressure that the electrons,
-      which normally remain outside the atomic nucleus, are forced to combine with
-      the protons in the nucleus. Atomic nuclei break apart, producing what is
-      called a degenerate state of matter. The collapse is halted when the material
-      cannot be packed any tighter. At this point, the star has a radius of about
-      10-15 kilometers. The density of this material is so high that a teaspoonful
-      would weigh about 100 million tons on Earth. (Description from URL) <br><br>
-      Data Reference: ATNF Pulsar Catalogue, (Manchester+, 2005)]]
+    Path = "/Milky Way/Stellar Remnants",
+    Description = [[A pulsar is a spinning neutron star, an ultra-dense stellar remnant
+      resulting from a supernova-driven collapse of the stellar core. Upon death, stars
+      leave behind one of three possible remnants: a white dwarf, a neutron star, or a
+      black hole. Stars that are more massive than the sun will often become neutron
+      stars in a violent explosion called a supernova. Pulsars are not pulsing but are
+      spinning neutron stars whose beams of radiation point toward Earth just as a
+      lighthouse sweeps the horizon. Their strong magnetic fields funnel beams of light
+      from its poles. When these beams point to Earth, we see a strong radio signal.
+      Census: 3,221 pulsars.]]
   }
 }
 
@@ -71,8 +68,8 @@ asset.export(Object)
 
 asset.meta = {
   Name = "Pulsars",
-  Description = "Digital Universe asset for Pulsars",
-  Author = "Brian Abbott (AMNH)",
+  Description = Object.GUI.Description,
+  Author = "Brian Abbott, Zack Reeves (AMNH)",
   URL = "https://www.amnh.org/research/hayden-planetarium/digital-universe",
   License = "AMNH Digital Universe"
 }
diff --git a/data/assets/scene/digitaluniverse/quasars.asset b/data/assets/scene/digitaluniverse/quasars.asset
index 7815c2acdb..d9482df27a 100644
--- a/data/assets/scene/digitaluniverse/quasars.asset
+++ b/data/assets/scene/digitaluniverse/quasars.asset
@@ -1,15 +1,15 @@
 local textures = asset.resource({
-  Name = "Quasars Textures",
+  Name = "Point Textures",
   Type = "HttpSynchronization",
-  Identifier = "digitaluniverse_quasars_textures",
-  Version = 2
+  Identifier = "digitaluniverse_point_textures",
+  Version = 1
 })
 
 local speck = asset.resource({
   Name = "Quasars Speck Files",
   Type = "HttpSynchronization",
   Identifier = "digitaluniverse_quasars_speck",
-  Version = 2
+  Version = 3
 })
 
 local colormaps = asset.resource({
@@ -26,7 +26,7 @@ local Object = {
     Type = "RenderablePointCloud",
     Enabled = true,
     Opacity = 0.95,
-    File = speck .. "quasars.speck",
+    File = speck .. "qso.speck",
     Texture = {
       File = textures .. "point3A.png",
     },
@@ -35,14 +35,12 @@ local Object = {
       FadeInDistances = { 1000.0, 10000.0 } -- Fade in value in the same unit as "Unit"
     },
     Coloring = {
-      FixedColor = { 1.0, 0.4, 0.2 },
+      FixedColor = { 0.85, 0.35, 0.18 },
       ColorMapping = {
         Enabled = false,
         File = colormaps .. "viridis.cmap",
         ParameterOptions = {
-          { Key = "distMpc", Range = { 440.5, 8852.099609 } },
-          { Key = "redshift", Range = { 0.102, 7.085 } },
-          { Key = "Tlookback", Range = { 1.4, 13.0 } }
+          { Key = "lookback_time", Range = { 1.4, 13.0 } }
         }
       }
     },
@@ -54,15 +52,11 @@ local Object = {
   },
   GUI = {
     Name = "Quasars",
-    Path = "/Universe",
-    Description = [[Census: 569,442 quasars. DU Version 2.2. <br>
-      Quasars are the most distant objects we can see. They are extremely active
-      galaxies that contain supermassive black holes which are gobbling up material
-      at a furious rate. The Million Quasars Catalogue is an aggregate catalog of
-      several surveys, including 2dF and Sloan. So, it should not be surprising that
-      the shape of these data mimic the shape of the Sloan and 2dF galaxy surveys,
-      with large parts of the sky unobserved.(Description from URL) <br><br> Data
-      Reference: The Million Quasars catalog (Flesch, 2017)]]
+    Path = "/Universe/Deep Sky Surveys",
+    Description = [[Quasars are the most distant objects we see. They are extremely
+      active galaxies that contain supermassive black holes which gobble up material at a
+      furious rate. As the material falls into the black hole, it forms a disk and emits
+      high-energy light that we see to great distances. Census: 755,850 quasars.]]
   }
 }
 
@@ -81,8 +75,8 @@ asset.export(Object)
 
 asset.meta = {
   Name = "Quasars",
-  Description = "Digital Universe asset for Quasars",
-  Author = "Brian Abbott (AMNH)",
+  Description = Object.GUI.Description,
+  Author = "Brian Abbott, Sohum Udani (AMNH)",
   URL = "https://www.amnh.org/research/hayden-planetarium/digital-universe",
   License = "AMNH Digital Universe"
 }
diff --git a/data/assets/scene/digitaluniverse/sdss.asset b/data/assets/scene/digitaluniverse/sdss.asset
index 7bd45ca637..7d59a9d162 100644
--- a/data/assets/scene/digitaluniverse/sdss.asset
+++ b/data/assets/scene/digitaluniverse/sdss.asset
@@ -1,15 +1,15 @@
 local textures = asset.resource({
-  Name = "Sloan Digital Sky Survey Textures",
+  Name = "Point Textures",
   Type = "HttpSynchronization",
-  Identifier = "digitaluniverse_sloandss_textures",
-  Version = 2
+  Identifier = "digitaluniverse_point_textures",
+  Version = 1
 })
 
 local speck = asset.resource({
   Name = "Sloan Digital Sky Survey Speck Files",
   Type = "HttpSynchronization",
   Identifier = "digitaluniverse_sloandss_speck",
-  Version = 3
+  Version = 4
 })
 
 
@@ -19,14 +19,13 @@ local Object = {
     Type = "RenderablePointCloud",
     Enabled = true,
     Opacity = 0.8,
-    File = speck .. "SDSSgals.speck",
+    File = speck .. "sdss.speck",
     Coloring = {
       FixedColor = { 0.8, 0.8, 1.0 },
       ColorMapping = {
         File = speck .. "SDSSgals.cmap",
         ParameterOptions = {
-          { Key = "proximity", Range = { 1.0, 50.0 } },
-          { Key = "redshift", Range = { 0.0, 0.075 } }
+          { Key = "num_nearby_galaxies", Range = { 1.0, 25.0 } }
         }
       }
     },
@@ -45,22 +44,16 @@ local Object = {
   },
   GUI = {
     Name = "Sloan Digital Sky Survey",
-    Path = "/Universe/Galaxies",
-    Description = [[Census: 2,600,258 galaxies. DU Version 10.6.<br> The Sloan Digital
-      Sky Survey (SDSS) is an ambitious project to image about 35% of the sky, deep
-      into the universe. The survey measured the position and brightness of almost 1
-      billion objects, and obtained spectra to more than 4 million objects. This is
-      not an all-sky survey, so there are large parts of the sky that remain
-      unobserved, which produces the bow tie distribution and the black areas where
-      there surely are galaxies, but we have yet to observe them. These galaxies
-      appear to extend beyond the 2dF survey to distances that exceed 5 billion
-      light years. However, the weblike structure of clusters, filaments, and voids
-      seems to fade by about 2 billion light years. Beyond this distance, the
-      completeness of the survey drops so that only the intrinsically bright
-      galaxies are visible. The weblike cosmic structure is echoed in these data,
-      with orange clusters standing out among the less dense aqua-colored galaxies
-      and the less dense regions of green-colored galaxies. (Description from URL)
-      <br><br> Data Reference: Sloan Digital Sky Survey (http://www.sdss.org/)]]
+    Path = "/Universe/Deep Sky Surveys",
+    Description = [[The Sloan Digital Sky Survey (SDSS) is an ambitious project to image
+      about 35% of the sky, deep into the universe. The SDSS galaxies form triangular
+      wedges, revealing those parts of the sky observed by the telescope. If the entire
+      sky were covered, you would see a spherical distribution of galaxies surrounding
+      the Milky Way. With only 35% of the entire sky observed, we see only a few select
+      slices or larger wedgelike portions from that sphere. The weblike cosmic structure
+      is echoed in these data, with orange clusters standing out among the less dense
+      aqua-colored galaxies and the less dense regions of green-colored galaxies.
+      Census: 2,862,767 galaxies.]]
   }
 }
 
@@ -78,9 +71,9 @@ asset.export(Object)
 
 
 asset.meta = {
-  Name = "Sloan Digital Sky Survey",
-  Description = "Digital Universe asset for The Sloan Digital Sky Survey (SDSS)",
-  Author = "Brian Abbott (AMNH)",
+  Name = "Sloan Digital Sky Survey Galaxies",
+  Description = Object.GUI.Description,
+  Author = "Brian Abbott, Zack Reeves (AMNH), Eric Gawiser (Rutgers)",
   URL = "https://www.amnh.org/research/hayden-planetarium/digital-universe",
   License = "AMNH Digital Universe"
 }
diff --git a/data/assets/scene/digitaluniverse/star_uncertainty.asset b/data/assets/scene/digitaluniverse/star_uncertainty.asset
new file mode 100644
index 0000000000..2273022321
--- /dev/null
+++ b/data/assets/scene/digitaluniverse/star_uncertainty.asset
@@ -0,0 +1,65 @@
+local speck = asset.resource({
+  Name = "Star Uncertainty Files",
+  Type = "HttpSynchronization",
+  Identifier = "digitaluniverse_star_uncertainty_data",
+  Version = 1
+})
+
+
+local Object = {
+  Identifier = "StarUncertainty",
+  Renderable = {
+    Type = "RenderableConstellationLines",
+    Enabled = false,
+    Labels = {
+      File = speck .. "star_uncertainty.label",
+      Opacity = 0.75,
+      Color = { 0.6, 0.6, 1.0 },
+      Size = 14.1,
+      MinMaxSize = { 8, 170 },
+      Unit = "pc"
+    },
+    Opacity = 0.8,
+    LineWidth = 5.0,
+    File = speck .. "star_uncertainty.speck",
+    NamesFile = speck .. "star_uncertainty.dat",
+    Colors = { { 1.0, 1.0, 0.0 }, { 0.0, 0.8, 1.0 }, { 0.957, 0.51, 0.10 } },
+    Unit = "pc",
+    DimInAtmosphere = true
+  },
+  Tag = { "daytime_hidden" },
+  GUI = {
+    Name = "Star Distance Uncertainty",
+    Path = "/Milky Way/Stars",
+    Description = [[The uncertainty of a star's position is derived from the uncertainty
+      in its parallax measurement. This results in a range in distance where the star
+      could exist. Here we draw lines on top of select stars which give us a visual cue
+      of the range in possible distances for that star. Colors: Aqua lines are stars with
+      Gaia geometric parallax measurements (the most accurate), orange lines indicate
+      stars with Hipparcos geometric parallaxes, and yellow lines are stars with Gaia
+      photogeomentric parallaxes (the least accurate). The label includes the star name
+      and the length of the uncertainty in light years. Census: 3,440 stars with
+      uncertainty.]]
+  }
+}
+
+
+asset.onInitialize(function()
+  openspace.addSceneGraphNode(Object)
+end)
+
+asset.onDeinitialize(function()
+  openspace.removeSceneGraphNode(Object)
+end)
+
+asset.export(Object)
+
+
+
+asset.meta = {
+  Name = "Star Distance Uncertainty",
+  Description = Object.GUI.Description,
+  Author = "Brian Abbott, Zack Reeves (AMNH)",
+  URL = "https://www.amnh.org/research/hayden-planetarium/digital-universe",
+  License = "AMNH Digital Universe"
+}
diff --git a/data/assets/scene/digitaluniverse/starlabels.asset b/data/assets/scene/digitaluniverse/starlabels.asset
index 85c3d64c0e..368ec4a330 100644
--- a/data/assets/scene/digitaluniverse/starlabels.asset
+++ b/data/assets/scene/digitaluniverse/starlabels.asset
@@ -2,7 +2,7 @@ local speck = asset.resource({
   Name = "Star Labels Speck Files",
   Type = "HttpSynchronization",
   Identifier = "digitaluniverse_starlabels_speck",
-  Version = 2
+  Version = 3
 })
 
 
@@ -15,7 +15,7 @@ local Object = {
       Enabled = true,
       File = speck .. "stars.label",
       Color = { 0.4, 0.4, 0.4 },
-      Size = 14.7,
+      Size = 14.4,
       MinMaxSize = { 6, 50 },
       Unit = "pc"
     },
@@ -25,7 +25,8 @@ local Object = {
   GUI = {
     Name = "Stars Labels",
     Path = "/Milky Way/Stars",
-    Description = "Labels for stars in the Milky Way. See 'Stars' for more info"
+    Description = [[Common name labels for nearby stars in the Milky Way. See 'Stars'
+      for more information.]]
   }
 }
 
@@ -44,8 +45,8 @@ asset.export(Object)
 
 asset.meta = {
   Name = "Star Labels",
-  Description = "Digital Universe asset for labels of the stars",
-  Author = "Brian Abbott (AMNH)",
+  Description = Object.GUI.Description,
+  Author = "Brian Abbott, Zack Reeves, Andrew Ayala, Jackie Faherty (AMNH)",
   URL = "https://www.amnh.org/research/hayden-planetarium/digital-universe",
   License = "AMNH Digital Universe"
 }
diff --git a/data/assets/scene/digitaluniverse/starorbits.asset b/data/assets/scene/digitaluniverse/starorbits.asset
index ecf8a63b95..4efbe36beb 100644
--- a/data/assets/scene/digitaluniverse/starorbits.asset
+++ b/data/assets/scene/digitaluniverse/starorbits.asset
@@ -4,163 +4,136 @@ local earth_transforms = asset.require("scene/solarsystem/planets/earth/transfor
 
 
 local speck = asset.resource({
-  Name = "Grids Speck Files",
+  Name = "Star Orbits Speck Files",
   Type = "HttpSynchronization",
   Identifier = "digitaluniverse_starorbits_speck",
-  Version = 1
+  Version = 2
 })
 
 
 local SunOrbit = {
   Identifier = "SunOrbit",
-  --Parent = transforms.SolarSystemBarycenter.Name,
   Renderable = {
     Type = "RenderableDUMeshes",
     Enabled = false,
     Opacity = 1.0,
     File = speck .. "starorbits-Sun.speck",
     MeshColor = { { 1.0, 0.65, 0.0 } },
-    --LabelFile = speck .. "1ld.label",
-    -- TextColor = { 0.0, 0.2, 0.5 },
-    -- TextMinMaxSize = { 0, 30 },
     Unit = "pc"
   },
   GUI = {
     Name = "Sun Orbit",
     Path = "/Milky Way/Stars/Stars Orbits",
-    Description = "Orbits of the Sun around the Milky Way"
+    Description = [[Projected orbit of the Sun around the Milky Way over the next 1
+      billion years.]]
   }
 }
 
 local BarnardsOrbit = {
   Identifier = "BarnardsOrbit",
-  --Parent = transforms.SolarSystemBarycenter.Name,
   Renderable = {
     Type = "RenderableDUMeshes",
     Enabled = false,
     Opacity = 1.0,
     File = speck .. "starorbits-BarnardsStar.speck",
     MeshColor = { { 0.39, 0.58, 0.93 } },
-    --LabelFile = speck .. "1ld.label",
-    -- TextColor = { 0.0, 0.2, 0.5 },
-    -- TextSize = 10.3,
-    -- TextMinMaxSize = { 0, 30 },
     Unit = "pc"
   },
   GUI = {
     Name = "Barnards Orbit",
     Path = "/Milky Way/Stars/Stars Orbits",
-    Description = "Orbits of Barnard's Star around the Milky Way"
+    Description = [[Projected orbit of Barnard's Star around the Milky Way over the next
+      1 billion years.]]
   }
 }
 
 local KapteynsOrbit = {
   Identifier = "KapteynsOrbit",
-  --Parent = transforms.SolarSystemBarycenter.Name,
   Renderable = {
     Type = "RenderableDUMeshes",
     Enabled = false,
     Opacity = 1.0,
     File = speck .. "starorbits-KapteynsStar.speck",
     MeshColor = { { 0.6, 0.6, 0.6 } },
-    --LabelFile = speck .. "1ld.label",
-    -- TextColor = { 0.0, 0.2, 0.5 },
-    -- TextSize = 10.3,
-    -- TextMinMaxSize = { 0, 30 },
     Unit = "pc"
   },
   GUI = {
     Name = "Kapteyns Orbit",
     Path = "/Milky Way/Stars/Stars Orbits",
-    Description = "Orbits of Kapteyn's Star around the Milky Way"
+    Description = [[Projected orbit of Kapteyn's Star around the Milky Way over the next
+      1 billion years.]]
   }
 }
 
 local Lacaille9352Orbit = {
   Identifier = "Lacaille9352Orbit",
-  --Parent = transforms.SolarSystemBarycenter.Name,
   Renderable = {
     Type = "RenderableDUMeshes",
     Enabled = false,
     Opacity = 1.0,
     File = speck .. "starorbits-Lacaille9352.speck",
     MeshColor = { { 0.58, 0.0, 0.83 } },
-    --LabelFile = speck .. "1ld.label",
-    -- TextColor = { 0.0, 0.2, 0.5 },
-    -- TextSize = 10.3,
-    -- TextMinMaxSize = { 0, 30 },
     Unit = "pc"
   },
   GUI = {
     Name = "Lacaille 9352 Orbit",
     Path = "/Milky Way/Stars/Stars Orbits",
-    Description = "Orbits of Lacaille9352 around the Milky Way"
+    Description = [[Projected orbit of Lacaille9352 around the Milky Way over the next
+      1 billion years.]]
   }
 }
 
 local LSR1826Orbit = {
   Identifier = "LSR1826Orbit",
-  --Parent = transforms.SolarSystemBarycenter.Name,
   Renderable = {
     Type = "RenderableDUMeshes",
     Enabled = false,
     Opacity = 1.0,
     File = speck .. "starorbits-LSR1826+3014.speck",
     MeshColor = { { 0.0, 0.39, 0.0 } },
-    --LabelFile = speck .. "1ld.label",
-    -- TextColor = { 0.0, 0.2, 0.5 },
-    -- TextSize = 10.3,
-    -- TextMinMaxSize = { 0, 30 },
     Unit = "pc"
   },
   GUI = {
     Name = "LSR1826+3014 Orbit",
     Path = "/Milky Way/Stars/Stars Orbits",
-    Description = "Orbits of LSR1826+3014 around the Milky Way"
+    Description = [[Projected orbit of LSR1826+3014 around the Milky Way over the next 1
+      billion years.]]
   }
 }
 
 local LSRJ0822Orbit = {
   Identifier = "LSRJ0822Orbit",
-  --Parent = transforms.SolarSystemBarycenter.Name,
   Renderable = {
     Type = "RenderableDUMeshes",
     Enabled = false,
     Opacity = 1.0,
     File = speck .. "starorbits-LSRJ0822+1700.speck",
     MeshColor = { { 0.5, 1.0, 0.0 } },
-    --LabelFile = speck .. "1ld.label",
-    -- TextColor = { 0.0, 0.2, 0.5 },
-    -- TextSize = 10.3,
-    -- TextMinMaxSize = { 0, 30 },
     Unit = "pc"
   },
   GUI = {
     Name = "LSRJ0822+1700 Orbit",
     Path = "/Milky Way/Stars/Stars Orbits",
-    Description = "Orbits of LSRJ0822+1700 around the Milky Way"
+    Description = [[Projected orbit of LSRJ0822+1700 around the Milky Way over the next 1
+      billion years.]]
   }
 }
 
 local PM_J13420Orbit = {
   Identifier = "PM_J13420Orbit",
-  --Parent = transforms.SolarSystemBarycenter.Name,
   Renderable = {
     Type = "RenderableDUMeshes",
     Enabled = false,
     Opacity = 1.0,
     File = speck .. "starorbits-PM_J13420-3415.speck",
     MeshColor = { { 0.70, 0.13, 0.13 } },
-    --LabelFile = speck .. "1ld.label",
-    -- TextColor = { 0.0, 0.2, 0.5 },
-    -- TextSize = 10.3,
-    -- TextMinMaxSize = { 0, 30 },
     Unit = "pc"
   },
   GUI = {
     Name = "PM_J13420-3415 Orbit",
     Path = "/Milky Way/Stars/Stars Orbits",
-    Description = "Orbits of PM_J13420-3415 around the Milky Way"
+    Description = [[Projected orbit of PM_J13420-3415 around the Milky Way over the next
+      1 billion years.]]
   }
 }
 
@@ -197,11 +170,8 @@ asset.export(PM_J13420Orbit)
 
 asset.meta = {
   Name = "Star Orbits",
-  Description = [[Select Star Orbital paths that delineate their trajectory around the
-    Milky Way over 1 billion years into the future. Included: Sun, Barnards, Kapteyns,
-    Lacaille 9352, LSR1826+3014, LSRJ0822+1700, PM_J13420-3415. <br><br> Data
-    Reference: Sebastien Lepine (AMNH)]],
-  Author = "Brian Abbott (AMNH)",
+  Description = [[Projected star orbits for selected stars over the next 1 billion years. Census: 7 star orbits.]],
+  Author = "Brian Abbott, Zack Reeves (AMNH)",
   URL = "https://www.amnh.org/research/hayden-planetarium/digital-universe",
   License = "AMNH Digital Universe"
 }
diff --git a/data/assets/scene/digitaluniverse/stars.asset b/data/assets/scene/digitaluniverse/stars.asset
index 0d5ff15e04..ef29bce444 100644
--- a/data/assets/scene/digitaluniverse/stars.asset
+++ b/data/assets/scene/digitaluniverse/stars.asset
@@ -2,7 +2,7 @@ local speck = asset.resource({
   Name = "Stars Speck Files",
   Type = "HttpSynchronization",
   Identifier = "stars_du",
-  Version = 5
+  Version = 6
 })
 
 local sunspeck = asset.resource({
@@ -62,13 +62,13 @@ local Stars = {
   GUI = {
     Name = "Stars",
     Path = "/Milky Way/Stars",
-    Description = [[Census:  116,584 stars with 321 labels.<br> DU Version 8.10. This
-      star catalog is a combination of all available star catalogs, wherein we
-      choose the best distance available to place the stars around the Sun as
-      accurately as is possible. (Description from URL) <br><br> Data Reference:
-      Gaia Data Release 3 (Gaia Collaboration, 2022); XHIP: An Extended Hipparcos
-      Compilation (Anderson E., Francis C. 2012); Hipparcos Catalog (European Space Agency
-      1997); Gliese Catalog (Gliese and Jahriess 1991)]]
+    Description = [[These are the nearby stars that surround the Sun and are close enough
+      to get accurate distances. These include all the stars we see with the unaided eye
+      and many stars dimmer than that. Over the entire night sky, all year round, and in
+      the northern and southern hemispheres, we can see roughly 9,000 stars total with
+      the unaided eye. Stars are the light factories of the universe, and come in a
+      variety of sizes, colors, and brightnesses. The base catalog is Hipparcos, with Gaia
+      DR3 data applied for distance and velocity when available. Census: 112,746 stars.]]
   }
 }
 
@@ -105,10 +105,10 @@ local SunStar = {
     DimInAtmosphere = true
   },
   GUI = {
-    Name = "Sun Star",
+    Name = "Sun",
     Path = "/Milky Way/Stars",
-    Description = [[Individual star to represent the sun when outside of the solar
-      system]]
+    Description = [[Individual star to represent the Sun when outside of the Solar
+      System.]]
   }
 }
 
@@ -130,8 +130,8 @@ asset.export(SunStar)
 
 asset.meta = {
   Name = "Stars",
-  Description = "Digital Universe asset for the stars",
-  Author = "Brian Abbott (AMNH)",
+  Description = Stars.GUI.Description,
+  Author = "Brian Abbott, Zack Reeves, Andrew Ayala, Jackie Faherty (AMNH)",
   URL = "https://www.amnh.org/research/hayden-planetarium/digital-universe",
   License = "AMNH Digital Universe"
 }
diff --git a/data/assets/scene/digitaluniverse/superclusters.asset b/data/assets/scene/digitaluniverse/superclusters.asset
index 7899d631bd..71c50f95ad 100644
--- a/data/assets/scene/digitaluniverse/superclusters.asset
+++ b/data/assets/scene/digitaluniverse/superclusters.asset
@@ -1,8 +1,8 @@
 local textures = asset.resource({
-  Name = "Galaxy Superclusters Textures",
+  Name = "Point Textures",
   Type = "HttpSynchronization",
-  Identifier = "digitaluniverse_superclusters_textures",
-  Version = 2
+  Identifier = "digitaluniverse_point_textures",
+  Version = 1
 })
 
 local speck = asset.resource({
@@ -40,14 +40,14 @@ local Object = {
     }
   },
   GUI = {
-    Name = "Galaxy Superclusters",
-    Path = "/Universe/Galaxies",
-    Description = [[Census: 33 labels. DU Version 1.3.<br> The superclusters dataset
-      is a set of labels that mark the major galaxy superclusters in the local universe.
-      They correspond to, and should be viewed with, the Abell clusters. Astronomers
-      estimate there are 10 million superclusters in the observable universe.
-      (Description from URL) <br><br> Data Reference: Superclusters of Abell and X-ray
-      clusters (Einasto+, 2001)]]
+    Name = "Supercluster Labels",
+    Path = "/Universe/Deep Sky Surveys",
+    Description = [[The superclusters dataset is a set of labels that mark the major
+      galaxy superclusters in the local universe. They correspond to, and should be viewed
+      with, the Abell clusters. Astronomers estimate there are 10 million superclusters in
+      the observable universe. Often, they carry constellation names because they are
+      viewed in those constellations from our night-sky perspective. Census: 33
+      supercluster labels.]]
   }
 }
 
@@ -66,7 +66,7 @@ asset.export(Object)
 
 asset.meta = {
   Name = "Galaxy Superclusters",
-  Description = "Digital Universe asset for Galaxy Superclusters",
+  Description = Object.GUI.Description,
   Author = "Brian Abbott (AMNH)",
   URL = "https://www.amnh.org/research/hayden-planetarium/digital-universe",
   License = "AMNH Digital Universe"
diff --git a/data/assets/scene/digitaluniverse/supernovaremnants.asset b/data/assets/scene/digitaluniverse/supernovaremnants.asset
index b44c695f32..3b890d0858 100644
--- a/data/assets/scene/digitaluniverse/supernovaremnants.asset
+++ b/data/assets/scene/digitaluniverse/supernovaremnants.asset
@@ -9,7 +9,7 @@ local speck = asset.resource({
   Name = "Supernova Remnants Speck Files",
   Type = "HttpSynchronization",
   Identifier = "digitaluniverse_supernovaremnants_speck",
-  Version = 2
+  Version = 3
 })
 
 
@@ -20,8 +20,8 @@ local Object = {
     Enabled = false,
     Labels = {
       File = speck .. "snr.label",
-      Color = { 0.6, 0.46, 0.0 },
-      Size = 16.44,
+      Color = { 0.51, 0.40, 0.04 },
+      Size = 16.0,
       MinMaxSize = { 4, 100 },
       Unit = "pc"
     },
@@ -40,12 +40,16 @@ local Object = {
   },
   GUI = {
     Name = "Supernova Remnants",
-    Path = "/Milky Way",
-    Description = [[Census: 112 supernova remnants.<br> DU Version 3.7. A supernova
-      remnant is the ejected gas that results from a supernova. It glows for a
-      cosmically short period of time before mixing with the interstellar medium.
-      (Description from URL) <br><br> Data Reference: The First Fermi LAT SNR
-      Catalog (Acero+, 2016)]]
+    Path = "/Milky Way/Nebulae",
+    Description = [[A supernova remnant is the nebulous gas left over from a supernova
+      explosion. This gas expands at great speeds and rams into the surrounding
+      interstellar gas. This excites the surrounding gas and causes it to glow, producing
+      the nebulous cloud we observe from Earth. A supernova remnant contains a neutron
+      star or pulsar at its center, the core of the dying star. The cloud that enshrouds
+      the core does not last long, though. After about 50,000 years, the gas mixes into
+      the interstellar medium and no longer glows. Astronomically, this is a very short
+      time, so the supernova remnants we see must be left from explosions that have
+      occurred recently, cosmically speaking. Census: 112 supernova remnants.]]
   }
 }
 
@@ -63,8 +67,8 @@ asset.export(Object)
 
 asset.meta = {
   Name = "Supernova Remnants",
-  Description = "Digital Universe asset for Supernova Remnants",
-  Author = "Brian Abbott (AMNH)",
+  Description = Object.GUI.Description,
+  Author = "Brian Abbott, Zack Reeves (AMNH)",
   URL = "https://www.amnh.org/research/hayden-planetarium/digital-universe",
   License = "AMNH Digital Universe"
 }
diff --git a/data/assets/scene/digitaluniverse/tully.asset b/data/assets/scene/digitaluniverse/tully.asset
index f9fd6daa1d..44d72b1a50 100644
--- a/data/assets/scene/digitaluniverse/tully.asset
+++ b/data/assets/scene/digitaluniverse/tully.asset
@@ -54,30 +54,25 @@ local TullyGalaxies = {
       FadeInDistances = { 0.001, 1.0 } -- Fade in value in the same unit as "Unit"
     },
     SizeSettings = {
-      ScaleExponent = 21.9,
+      ScaleExponent = 21.7,
       MaxSize = 0.3,
       EnableMaxSizeControl = true
     }
   },
   GUI = {
     Name = "Tully Galaxies",
-    Path = "/Universe/Galaxies",
-    Description = [[Census: 30,059 galaxies. DU Version 1.5.<br> The Tully Catalog is
-      the most polished, accurate catalog of nearby galaxies. It includes over 30,000
-      galaxies in the local universe that surround the Milky Way. This catalog
-      demonstrates the large-scale structure of the universe exceptionally well. And,
-      each galaxy has a representative image reflecting its morphological type, and is
-      properly sized and inclined. Size and shape. The data form a cube, which is an
+    Path = "/Universe/Nearby Surveys",
+    Description = [[The Tully Catalog is the most polished, accurate catalog of nearby
+      galaxies. It includes over 30,000 galaxies in the local universe that surround the
+      Milky Way. This catalog demonstrates the large-scale structure of the universe
+      exceptionally well. Each galaxy has a representative image that is properly sized
+      and inclined and reflects its morphological type. The data form a cube, which is an
       arbitrary cutoff based on the completeness of these data. Beyond this, data from
-      these sources are not as reliable, so effort is made to show a complete picture,
-      albeit limited by observations (for example, we cannot see dwarf galaxies much
-      beyond the Local Group). The size of the cube is roughly 1 billion light years on
-      a diagonal (so the farthest galaxies in the dataset are about 1 billion light
-      years from the Milky Way), or about 700 million light years per side.
-      <br><br>Colors. Orange denotes more dense regions of the local universe, aqua is
-      given to galaxies in an intermediate-density area, and green is given to lower
-      density regions.(Description from URL) <br><br> Data Reference: Tully Galaxy
-      Catalog: Brent Tully (U Hawaii), Stuart Levy (NCSA/UIUC)]]
+      these sources are not as reliable. The size of the cube is roughly 1 billion light
+      years on a diagonal, or about 700 million light years per side. Colors: Orange
+      denotes more dense regions of the local universe, aqua is given to galaxies in an
+      intermediate-density area, and green is given to lower density regions. Census:
+      30,059 galaxies.]]
   }
 }
 
@@ -111,17 +106,14 @@ local TullyGalaxiesImages = {
   },
   GUI = {
     Name = "Tully Galaxies Images",
-    Path = "/Universe/Galaxies",
-    Description = [[Each galaxy is represented by an image
-      that represents its morphological type (spiral, elliptical, etc.). Most of these
-      come from The Galaxy Catalog. A handful of nearby galaxies are represented by
-      their actual images, which come mostly from the National Optical Astronomy
-      Observatory (NOAO). Each of these images has been altered from its original state.
-      These images were taken from Earth on some of the world's largest telescopes, so
-      foreground stars from our own Galaxy appear in each image. We are representing
-      galaxies in extragalactic space, so we have removed the stars from each image.
-      (Description from URL) <br><br> Data Reference: Tully Galaxy Catalog: Brent Tully
-      (U Hawaii), Stuart Levy (NCSA/UIUC)]]
+    Path = "/Universe/Nearby Surveys",
+    Description = [[Each Tully galaxy is represented by an image that represents its
+      morphological type (spiral, elliptical, etc.). Most of these come from The Galaxy
+      Catalog. A handful of nearby galaxies are represented by their actual images, which
+      come mostly from the National Optical Astronomy Observatory (NOAO). Each of these
+      images has been altered from its original state. Taken from Earth, foreground stars
+      from our own Galaxy appear in each image and were removed. Census: 30,159 galaxy
+      images.]]
   }
 }
 
@@ -143,8 +135,7 @@ asset.export(TullyGalaxiesImages)
 
 asset.meta = {
   Name = "Tully Galaxies",
-  Description = [[Digital Universe asset for Tully Galaxies, including point cloud and
-    images]],
+  Description = TullyGalaxies.GUI.Description,
   Author = "Stuart Levy (NCSA/UIUC), Brian Abbott (AMNH)",
   URL = "https://www.amnh.org/research/hayden-planetarium/digital-universe",
   License = "AMNH Digital Universe"
diff --git a/data/assets/scene/digitaluniverse/voids.asset b/data/assets/scene/digitaluniverse/voids.asset
index 6493e3a500..66dfd12df0 100644
--- a/data/assets/scene/digitaluniverse/voids.asset
+++ b/data/assets/scene/digitaluniverse/voids.asset
@@ -25,17 +25,15 @@ local Object = {
   },
   GUI = {
     Name = "Voids",
-    Path = "/Universe/Galaxies",
-    Description = [[Census: 24 cosmic voids. DU Version 1.2. <br>Cosmic voids are
-      vast, empty spaces where there are either no galaxies, or very few galaxies.
-      They are associated with cold spots in the cosmic microwave background (CMB)
-      light, the earliest picture we have of the universe (see page 58). Those cold
-      spots in the CMB evolved into large voids, some as much as 300 million light
-      years in diameter. Labels roughly denote the location of cosmic voids in the
-      Tully galaxies. Voids are only visible with motion cuing as you spin around
-      these data. The labels help to guide the eye and provide sign posts for the
-      largest voids in our cosmic neighborhood. (Description from URL) <br><br> Data
-      Reference: various sources]]
+    Path = "/Universe/Nearby Surveys",
+    Description = [[Cosmic voids are vast, empty spaces where there are either no
+      galaxies, or very few galaxies. They are associated with cold spots in the cosmic
+      microwave background (CMB) light, the earliest picture we have of the universe.
+      Those cold spots in the CMB evolved into large voids, some as much as 300 million
+      light years in diameter. Labels roughly denote the location of cosmic voids in the
+      Tully galaxies. Voids are only visible with motion cuing as you spin around these
+      data. The labels help to guide the eye and provide sign posts for the largest voids
+      in our cosmic neighborhood. Census: 24 cosmic void labels.]]
   }
 }
 
@@ -55,7 +53,7 @@ asset.export(Object)
 asset.meta = {
   Name = "Voids",
   Author = "Brian Abbott (AMNH)",
-  Description = "Digital Universe asset for Cosmic voids",
+  Description = Object.GUI.Description,
   URL = "https://www.amnh.org/research/hayden-planetarium/digital-universe",
   License = "AMNH Digital Universe"
 }
diff --git a/data/assets/scene/digitaluniverse/white_dwarfs.asset b/data/assets/scene/digitaluniverse/white_dwarfs.asset
new file mode 100644
index 0000000000..4d0813d4e3
--- /dev/null
+++ b/data/assets/scene/digitaluniverse/white_dwarfs.asset
@@ -0,0 +1,67 @@
+local textures = asset.resource({
+  Name = "Point Textures",
+  Type = "HttpSynchronization",
+  Identifier = "digitaluniverse_point_textures",
+  Version = 1
+})
+
+local speck = asset.resource({
+  Name = "White Dwarf Speck Files",
+  Type = "HttpSynchronization",
+  Identifier = "digitaluniverse_white_dwarfs_speck",
+  Version = 1
+})
+
+
+local Object = {
+  Identifier = "WhiteDwarfs",
+  Renderable = {
+    Type = "RenderablePointCloud",
+    Enabled = false,
+    File = speck .. "wd.speck",
+    Texture = {
+      File = textures .. "point3.png",
+    },
+    Unit = "pc",
+    Coloring = {
+      FixedColor = { 1.0, 1.0, 1.0 },
+    },
+    SizeSettings = {
+      ScaleExponent = 15.5,
+      MaxSize = 0.7,
+      EnableMaxSizeControl = true
+    }
+  },
+  GUI = {
+    Name = "White Dwarfs",
+    Path = "/Milky Way/Stellar Remnants",
+    Description = [[A white dwarf is the core of a dying star. These are dim objects that
+      are roughly the size of Earth but with the desity of a sunlike star. Stars that are
+      not massive enough to end in a neutraon star or black hole will evolve into a white
+      dwarf. This is the ultimate fate of over 95% of the stars in our Galaxy. As the
+      star is dying, the outer layers will expand out and the gas will glow and become a
+      planetaery nebula, while the core of the star transforms into a white dwarf. Census:
+      192,613 white dwarfs.]]
+  }
+}
+
+
+asset.onInitialize(function()
+  openspace.addSceneGraphNode(Object)
+end)
+
+asset.onDeinitialize(function()
+  openspace.removeSceneGraphNode(Object)
+end)
+
+asset.export(Object)
+
+
+
+asset.meta = {
+  Name = "White Dwarfs",
+  Description = Object.GUI.Description,
+  Author = "Zack Reeves, Brian Abbott (AMNH)",
+  URL = "https://www.amnh.org/research/hayden-planetarium/digital-universe",
+  License = "AMNH Digital Universe"
+}
diff --git a/data/assets/scene/milkyway/constellations/constellation_art.asset b/data/assets/scene/milkyway/constellations/constellation_art.asset
index 937e5ebd7c..f9f4e25d66 100644
--- a/data/assets/scene/milkyway/constellations/constellation_art.asset
+++ b/data/assets/scene/milkyway/constellations/constellation_art.asset
@@ -84,7 +84,7 @@ local function createConstellations(baseIdentifier, guiPath, constellationfile)
         Tag = { "ImageConstellation", group, "daytime_hidden" },
         GUI = {
           Name = name .. " Image",
-          Path = "/Milky Way/" .. guiPath,
+          Path = "/Milky Way/Constellations/" .. guiPath,
           Description = name .. " Image"
         }
       }
diff --git a/data/assets/scene/milkyway/milkyway/eso.asset b/data/assets/scene/milkyway/milkyway/eso.asset
index 41323b2229..285e1c75cf 100644
--- a/data/assets/scene/milkyway/milkyway/eso.asset
+++ b/data/assets/scene/milkyway/milkyway/eso.asset
@@ -22,8 +22,7 @@ local Object = {
     Texture = textures .. "eso0932a_blend.png",
     Orientation = "Inside",
     MirrorTexture = true,
-    FadeOutThreshold = 0.01,
-    Background = true
+    FadeOutThreshold = 0.01
   },
   GUI = {
     Name = "Milky Way (ESO)",
diff --git a/data/assets/scene/milkyway/milkyway/volume.asset b/data/assets/scene/milkyway/milkyway/volume.asset
index e6af7d4bea..642e21d4f4 100644
--- a/data/assets/scene/milkyway/milkyway/volume.asset
+++ b/data/assets/scene/milkyway/milkyway/volume.asset
@@ -45,7 +45,7 @@ local MilkyWayVolume = {
     }
   },
   GUI = {
-    Path = "/Milky Way",
+    Path = "/Milky Way/Galaxy",
     Name = "Milky Way Volume",
     Description = "Volumetric rendering of Milky Way galaxy based on simulation from NAOJ"
   }

From 6337b8e5aabb36e4449d5191346db597050b5dd3 Mon Sep 17 00:00:00 2001
From: Alexander Bock <alexander.bock@liu.se>
Date: Wed, 17 Jul 2024 13:17:03 +0200
Subject: [PATCH 535/701] Move the statistics and frame info rendering from the
 RenderEngine into the debugging module (closes #1248)

---
 include/openspace/rendering/renderengine.h |  4 -
 modules/debugging/debuggingmodule.cpp      | 94 +++++++++++++++++++++-
 modules/debugging/debuggingmodule.h        | 12 +++
 src/rendering/renderengine.cpp             | 70 ----------------
 4 files changed, 105 insertions(+), 75 deletions(-)

diff --git a/include/openspace/rendering/renderengine.h b/include/openspace/rendering/renderengine.h
index 032efebf69..6047fbc961 100644
--- a/include/openspace/rendering/renderengine.h
+++ b/include/openspace/rendering/renderengine.h
@@ -186,10 +186,7 @@ private:
 
     properties::IntListProperty _screenshotWindowIds;
     properties::BoolProperty _applyWarping;
-    properties::BoolProperty _showStatistics;
-    properties::FloatProperty _statisticsScale;
     properties::BoolProperty _screenshotUseDate;
-    properties::BoolProperty _showFrameInformation;
     properties::BoolProperty _disableMasterRendering;
 
     properties::FloatProperty _globalBlackOutFactor;
@@ -218,7 +215,6 @@ private:
 
     std::vector<ghoul::opengl::ProgramObject*> _programs;
 
-    std::shared_ptr<ghoul::fontrendering::Font> _fontFrameInfo;
     std::shared_ptr<ghoul::fontrendering::Font> _fontCameraInfo;
     std::shared_ptr<ghoul::fontrendering::Font> _fontVersionInfo;
     std::shared_ptr<ghoul::fontrendering::Font> _fontShutdown;
diff --git a/modules/debugging/debuggingmodule.cpp b/modules/debugging/debuggingmodule.cpp
index 93add8f04f..5781dc60f2 100644
--- a/modules/debugging/debuggingmodule.cpp
+++ b/modules/debugging/debuggingmodule.cpp
@@ -26,7 +26,10 @@
 
 #include <modules/debugging/rendering/renderabledebugplane.h>
 #include <openspace/documentation/documentation.h>
+#include <openspace/engine/configuration.h>
 #include <openspace/engine/globals.h>
+#include <openspace/engine/globalscallbacks.h>
+#include <openspace/engine/windowdelegate.h>
 #include <openspace/navigation/navigationhandler.h>
 #include <openspace/navigation/path.h>
 #include <openspace/navigation/pathnavigator.h>
@@ -38,15 +41,99 @@
 #include <openspace/scripting/lualibrary.h>
 #include <openspace/util/factorymanager.h>
 #include <ghoul/filesystem/filesystem.h>
+#include <ghoul/font/fontmanager.h>
+#include <ghoul/font/fontrenderer.h>
 #include <ghoul/logging/logmanager.h>
 #include <ghoul/misc/assert.h>
 #include <ghoul/misc/templatefactory.h>
 
 #include "debuggingmodule_lua.inl"
 
+namespace {
+    constexpr std::string_view KeyFontMono = "Mono";
+
+    constexpr openspace::properties::Property::PropertyInfo ShowStatisticsInfo = {
+        "ShowStatistics",
+        "Show Statistics",
+        "Show updating, rendering, and network statistics on all rendering nodes.",
+        openspace::properties::Property::Visibility::AdvancedUser
+    };
+
+    constexpr openspace::properties::Property::PropertyInfo StatisticsScaleInfo = {
+        "StatisticsScale",
+        "Statistics Scale",
+        "This value is scaling the statatistics window by the provided amount. For flat "
+        "projections this is rarely necessary, but it is important when using a setup "
+        "where the cornders of the image are masked out.",
+        openspace::properties::Property::Visibility::AdvancedUser
+    };
+
+    constexpr openspace::properties::Property::PropertyInfo ShowFrameNumberInfo = {
+        "ShowFrameInformation",
+        "Show Frame Information",
+        "If this value is enabled, the current frame number and frame times are rendered "
+        "into the window.",
+        openspace::properties::Property::Visibility::AdvancedUser
+    };
+} // namespace
+
 namespace openspace {
 
-DebuggingModule::DebuggingModule() : OpenSpaceModule(Name) {}
+DebuggingModule::DebuggingModule()
+    : OpenSpaceModule(Name)
+    , _showStatistics(ShowStatisticsInfo, false)
+    , _statisticsScale(StatisticsScaleInfo, 1.f, 0.f, 1.f)
+    , _showFrameInformation(ShowFrameNumberInfo, false)
+{
+    _showStatistics.onChange([this]() {
+        global::windowDelegate->showStatistics(_showStatistics);
+        // We need to reset the scale as it is not updated when the statistics window is
+        // not currently shown
+        global::windowDelegate->setStatisticsGraphScale(_statisticsScale);
+    });
+    addProperty(_showStatistics);
+
+    _statisticsScale.onChange([this]() {
+        global::windowDelegate->setStatisticsGraphScale(_statisticsScale);
+    });
+    addProperty(_statisticsScale);
+
+    addProperty(_showFrameInformation);
+
+    global::callback::render->push_back([this]() {
+        if (_showFrameInformation) {
+            ZoneScopedN("Show Frame Information");
+            WindowDelegate* del = global::windowDelegate;
+
+            glm::vec2 penPosition = glm::vec2(
+                global::renderEngine->fontResolution().x / 2 - 50,
+                global::renderEngine->fontResolution().y / 3
+            );
+
+            std::string fn = std::to_string(global::renderEngine->frameNumber());
+            const WindowDelegate::Frustum frustum = del->frustumMode();
+            std::string fr = [](WindowDelegate::Frustum f) -> std::string {
+                switch (f) {
+                    case WindowDelegate::Frustum::Mono:     return "";
+                    case WindowDelegate::Frustum::LeftEye:  return "(left)";
+                    case WindowDelegate::Frustum::RightEye: return "(right)";
+                    default:                          throw ghoul::MissingCaseException();
+
+                }
+            }(frustum);
+
+            std::string sgFn = std::to_string(del->swapGroupFrameNumber());
+            std::string dt = std::to_string(del->deltaTime());
+            std::string avgDt = std::to_string(del->averageDeltaTime());
+
+            const std::string res = std::format(
+                "Frame: {} {}\nSwap group frame: {}\nDt: {}\nAvg Dt: {}",
+                fn, fr, sgFn, dt, avgDt
+            );
+            RenderFont(*_fontFrameInfo, penPosition, res);
+        }
+    });
+}
 
 void DebuggingModule::internalInitialize(const ghoul::Dictionary&) {
     ghoul::TemplateFactory<Renderable>* fRenderable =
@@ -56,6 +143,11 @@ void DebuggingModule::internalInitialize(const ghoul::Dictionary&) {
     fRenderable->registerClass<RenderableDebugPlane>("RenderableDebugPlane");
 }
 
+void DebuggingModule::internalInitializeGL() {
+    const Configuration::FontSizes fontSize = global::configuration->fontSize;
+    _fontFrameInfo = global::fontManager->font(KeyFontMono, fontSize.frameInfo);
+}
+
 std::vector<documentation::Documentation> DebuggingModule::documentations() const {
     return {
         RenderableDebugPlane::Documentation()
diff --git a/modules/debugging/debuggingmodule.h b/modules/debugging/debuggingmodule.h
index 4dcc34d075..ccd7439d88 100644
--- a/modules/debugging/debuggingmodule.h
+++ b/modules/debugging/debuggingmodule.h
@@ -27,6 +27,10 @@
 
 #include <openspace/util/openspacemodule.h>
 
+#include <openspace/properties/scalar/boolproperty.h>
+#include <openspace/properties/scalar/floatproperty.h>
+#include <ghoul/font/font.h>
+
 namespace openspace {
 
 class DebuggingModule : public OpenSpaceModule {
@@ -41,6 +45,14 @@ public:
 
 protected:
     void internalInitialize(const ghoul::Dictionary&) override;
+    void internalInitializeGL() override;
+
+private:
+    properties::BoolProperty _showStatistics;
+    properties::FloatProperty _statisticsScale;
+    properties::BoolProperty _showFrameInformation;
+
+    std::shared_ptr<ghoul::fontrendering::Font> _fontFrameInfo;
 };
 
 } // namespace openspace
diff --git a/src/rendering/renderengine.cpp b/src/rendering/renderengine.cpp
index db8bf2ea75..60d8b580d2 100644
--- a/src/rendering/renderengine.cpp
+++ b/src/rendering/renderengine.cpp
@@ -139,22 +139,6 @@ namespace {
         openspace::properties::Property::Visibility::AdvancedUser
     };
 
-    constexpr openspace::properties::Property::PropertyInfo ShowStatisticsInfo = {
-        "ShowStatistics",
-        "Show Statistics",
-        "Show updating, rendering, and network statistics on all rendering nodes.",
-        openspace::properties::Property::Visibility::AdvancedUser
-    };
-
-    constexpr openspace::properties::Property::PropertyInfo StatisticsScaleInfo = {
-        "StatisticsScale",
-        "Statistics Scale",
-        "This value is scaling the statatistics window by the provided amount. For flat "
-        "projections this is rarely necessary, but it is important when using a setup "
-        "where the cornders of the image are masked out.",
-        openspace::properties::Property::Visibility::AdvancedUser
-    };
-
     constexpr openspace::properties::Property::PropertyInfo ScreenshotUseDateInfo = {
         "ScreenshotUseDate",
         "Screenshot Folder uses Date",
@@ -163,14 +147,6 @@ namespace {
         openspace::properties::Property::Visibility::AdvancedUser
     };
 
-    constexpr openspace::properties::Property::PropertyInfo ShowFrameNumberInfo = {
-        "ShowFrameInformation",
-        "Show Frame Information",
-        "If this value is enabled, the current frame number and frame times are rendered "
-        "into the window.",
-        openspace::properties::Property::Visibility::AdvancedUser
-    };
-
     constexpr openspace::properties::Property::PropertyInfo DisableMasterInfo = {
         "DisableMasterRendering",
         "Disable Master Rendering",
@@ -321,10 +297,7 @@ RenderEngine::RenderEngine()
     , _showCameraInfo(ShowCameraInfo, true)
     , _screenshotWindowIds(ScreenshotWindowIdsInfo)
     , _applyWarping(ApplyWarpingInfo, false)
-    , _showStatistics(ShowStatisticsInfo, false)
-    , _statisticsScale(StatisticsScaleInfo, 1.f, 0.f, 1.f)
     , _screenshotUseDate(ScreenshotUseDateInfo, false)
-    , _showFrameInformation(ShowFrameNumberInfo, false)
     , _disableMasterRendering(DisableMasterInfo, false)
     , _globalBlackOutFactor(GlobalBlackoutFactorInfo, 1.f, 0.f, 1.f)
     , _applyBlackoutToMaster(ApplyBlackoutToMasterInfo, true)
@@ -395,19 +368,6 @@ RenderEngine::RenderEngine()
     addProperty(_screenshotWindowIds);
     addProperty(_applyWarping);
 
-    _showStatistics.onChange([this]() {
-        global::windowDelegate->showStatistics(_showStatistics);
-        // We need to reset the scale as it is not updated when the statistics window is
-        // not currently shown
-        global::windowDelegate->setStatisticsGraphScale(_statisticsScale);
-    });
-    addProperty(_showStatistics);
-
-    _statisticsScale.onChange([this]() {
-        global::windowDelegate->setStatisticsGraphScale(_statisticsScale);
-    });
-    addProperty(_statisticsScale);
-
     _screenshotUseDate.onChange([this]() {
         // If there is no screenshot folder, don't bother with handling the change
         if (!FileSys.hasRegisteredToken("${STARTUP_SCREENSHOT}")) {
@@ -453,7 +413,6 @@ RenderEngine::RenderEngine()
     });
     addProperty(_horizFieldOfView);
 
-    addProperty(_showFrameInformation);
 
     addProperty(_framerateLimit);
     addProperty(_globalRotation);
@@ -540,7 +499,6 @@ void RenderEngine::initializeGL() {
     {
         ZoneScopedN("Fonts");
         TracyGpuZone("Fonts");
-        _fontFrameInfo = global::fontManager->font(KeyFontMono, fontSize.frameInfo);
         _fontShutdown = global::fontManager->font(KeyFontMono, fontSize.shutdown);
         _fontCameraInfo = global::fontManager->font(KeyFontMono, fontSize.cameraInfo);
         _fontVersionInfo = global::fontManager->font(KeyFontMono, fontSize.versionInfo);
@@ -721,35 +679,7 @@ void RenderEngine::render(const glm::mat4& sceneMatrix, const glm::mat4& viewMat
         (*global::callback::webBrowserPerformanceHotfix)();
     }
 
-    if (_showFrameInformation) {
-        ZoneScopedN("Show Frame Information");
 
-        glm::vec2 penPosition = glm::vec2(
-            fontResolution().x / 2 - 50,
-            fontResolution().y / 3
-        );
-
-        std::string fn = std::to_string(_frameNumber);
-        const WindowDelegate::Frustum frustum = global::windowDelegate->frustumMode();
-        std::string fr = [](WindowDelegate::Frustum f) -> std::string {
-            switch (f) {
-                case WindowDelegate::Frustum::Mono:     return "";
-                case WindowDelegate::Frustum::LeftEye:  return "(left)";
-                case WindowDelegate::Frustum::RightEye: return "(right)";
-                default:                              throw ghoul::MissingCaseException();
-            }
-        }(frustum);
-
-        std::string sgFn = std::to_string(global::windowDelegate->swapGroupFrameNumber());
-        std::string dt = std::to_string(global::windowDelegate->deltaTime());
-        std::string avgDt = std::to_string(global::windowDelegate->averageDeltaTime());
-
-        const std::string res = std::format(
-            "Frame: {} {}\nSwap group frame: {}\nDt: {}\nAvg Dt: {}",
-            fn, fr, sgFn, dt, avgDt
-        );
-        RenderFont(*_fontFrameInfo, penPosition, res);
-    }
 
     if (renderingEnabled && !delegate.isGuiWindow()) {
         ZoneScopedN("Render ScreenSpace Renderable");

From 01483ef982894113e52d83be1b1d77e0c4b4c2e8 Mon Sep 17 00:00:00 2001
From: Malin E <malin.ejdbo@gmail.com>
Date: Wed, 17 Jul 2024 09:56:06 -0400
Subject: [PATCH 536/701] Add support for model vertex colors (#3346)

* Add model vertex color support

* Fix an issue with the Tiangong model not loading properly and set a correct bounding sphere size for it

* Update caching for models

* Update previous model examples to the new format

* And add a new example to test the new vertex colors support

* Apply suggestions from code review

Co-authored-by: Alexander Bock <alexander.bock@liu.se>

* Add a model example with lighting

* Improve the basic example and add a separate example for vertex colors

* Add visual test for vertex colors (#3348)

* Update the readme file for the visual tests

* Add asset instruction to the visual testing readme

* Add visual test for RenderableModel with vertex colors

* Apply suggestions from code review

Co-authored-by: Alexander Bock <alexander.bock@liu.se>

* Update test when asset changed name

---------

Co-authored-by: Alexander Bock <alexander.bock@liu.se>

* Update Ghoul

---------

Co-authored-by: Alexander Bock <alexander.bock@liu.se>
---
 data/assets/examples/animation.asset          | 196 ------------------
 .../examples/modelshader/modelshader.asset    |  53 -----
 .../advanced/model_shader.asset               |  50 +++++
 .../renderablemodel/data}/model_fs.glsl       |   0
 .../renderablemodel/data}/model_vs.glsl       |   0
 .../renderable/renderablemodel/model.asset    |  43 ++++
 .../renderablemodel/model_animation.asset     |  49 +++++
 .../model_animation_mode_bounce.asset         |  52 +++++
 ...del_animation_mode_bounce_infinitely.asset |  52 +++++
 .../model_animation_mode_loop.asset           |  51 +++++
 ...model_animation_mode_loop_infinitely.asset |  51 +++++
 .../renderablemodel/model_lighting.asset      |  51 +++++
 .../renderablemodel/model_vertex_colors.asset |  43 ++++
 .../earth/satellites/misc/tiangong.asset      |   2 +-
 ext/ghoul                                     |   2 +-
 modules/base/shaders/model_fs.glsl            |  16 +-
 modules/base/shaders/model_vs.glsl            |   3 +
 tests/visual/README.md                        |  39 ++--
 .../renderable/model_vertex_colors.ostest     |  25 +++
 19 files changed, 509 insertions(+), 269 deletions(-)
 delete mode 100644 data/assets/examples/animation.asset
 delete mode 100644 data/assets/examples/modelshader/modelshader.asset
 create mode 100644 data/assets/examples/renderable/renderablemodel/advanced/model_shader.asset
 rename data/assets/examples/{modelshader => renderable/renderablemodel/data}/model_fs.glsl (100%)
 rename data/assets/examples/{modelshader => renderable/renderablemodel/data}/model_vs.glsl (100%)
 create mode 100644 data/assets/examples/renderable/renderablemodel/model.asset
 create mode 100644 data/assets/examples/renderable/renderablemodel/model_animation.asset
 create mode 100644 data/assets/examples/renderable/renderablemodel/model_animation_mode_bounce.asset
 create mode 100644 data/assets/examples/renderable/renderablemodel/model_animation_mode_bounce_infinitely.asset
 create mode 100644 data/assets/examples/renderable/renderablemodel/model_animation_mode_loop.asset
 create mode 100644 data/assets/examples/renderable/renderablemodel/model_animation_mode_loop_infinitely.asset
 create mode 100644 data/assets/examples/renderable/renderablemodel/model_lighting.asset
 create mode 100644 data/assets/examples/renderable/renderablemodel/model_vertex_colors.asset
 create mode 100644 tests/visual/renderable/model_vertex_colors.ostest

diff --git a/data/assets/examples/animation.asset b/data/assets/examples/animation.asset
deleted file mode 100644
index 78a7d9dc35..0000000000
--- a/data/assets/examples/animation.asset
+++ /dev/null
@@ -1,196 +0,0 @@
-local sun = asset.require("scene/solarsystem/sun/transforms")
-local transforms = asset.require("scene/solarsystem/planets/earth/transforms")
-
-
-
-local model = asset.resource({
-  Name = "Animated Box",
-  Type = "HttpSynchronization",
-  Identifier = "animated_box",
-  Version = 1
-})
-
-
-local StartTime = "2021 06 01 00:00:00"
-
-local AnimationLoop = {
-  Identifier = "AnimationLoop",
-  Parent = transforms.EarthCenter.Identifier,
-  Transform = {
-    Translation = {
-      Type = "StaticTranslation",
-      Position = { 0.0, -11E7, 0.0 }
-    }
-  },
-  Renderable = {
-    Type = "RenderableModel",
-    GeometryFile = model .. "BoxAnimated.glb",
-    EnableAnimation = true,
-    AnimationMode = "LoopFromStart",
-    AnimationStartTime = StartTime,
-    ModelScale = 3E7,
-    LightSources = {
-      sun.LightSource
-    }
-  },
-  GUI = {
-    Name = "Animated Model (LoopFromStart)",
-    Path = "/Examples",
-    Description = "Simple animated box model with the animation mode 'LoopFromStart'"
-  }
-}
-
-local AnimationLoopInf = {
-  Identifier = "AnimationLoopInf",
-  Parent = transforms.EarthCenter.Identifier,
-  Transform = {
-    Translation = {
-      Type = "StaticTranslation",
-      Position = { 0.0, 11E7, 0.0 }
-    }
-  },
-  Renderable = {
-    Type = "RenderableModel",
-    GeometryFile = model .. "BoxAnimated.glb",
-    EnableAnimation = true,
-    AnimationMode = "LoopInfinitely",
-    AnimationStartTime = StartTime,
-    ModelScale = 3E7,
-    LightSources = {
-      sun.LightSource
-    }
-  },
-  GUI = {
-    Name = "Animated Model (LoopInfinitely)",
-    Path = "/Examples",
-    Description = "Simple animated box model with the animation mode 'LoopInfinitely'"
-  }
-}
-
-local AnimationOnce = {
-  Identifier = "AnimationOnce",
-  Parent = transforms.EarthCenter.Identifier,
-  Transform = {
-    Translation = {
-      Type = "StaticTranslation",
-      Position = { 11E7, 0.0, 0.0 }
-    }
-  },
-  Renderable = {
-    Type = "RenderableModel",
-    GeometryFile = model .. "BoxAnimated.glb",
-    EnableAnimation = true,
-    AnimationMode = "Once",
-    AnimationStartTime = StartTime,
-    ModelScale = 3E7,
-    LightSources = {
-      sun.LightSource
-    }
-  },
-  GUI = {
-    Name = "Animated Model (Once)",
-    Path = "/Examples",
-    Description = "Simple animated box model with the animation mode 'Once'"
-  }
-}
-
-local AnimationBounceInf = {
-  Identifier = "AnimationBounceInf",
-  Parent = transforms.EarthCenter.Identifier,
-  Transform = {
-    Translation = {
-      Type = "StaticTranslation",
-      Position = { 0.0, 0.0, 11E7 }
-    }
-  },
-  Renderable = {
-    Type = "RenderableModel",
-    GeometryFile = model .. "BoxAnimated.glb",
-    EnableAnimation = true,
-    AnimationMode = "BounceInfinitely",
-    AnimationStartTime = StartTime,
-    ModelScale = 3E7,
-    LightSources = {
-      sun.LightSource
-    }
-  },
-  GUI = {
-    Name = "Animated Model (BounceInfinitely)",
-    Path = "/Examples",
-    Description = "Simple animated box model with the animation mode 'BounceInfinitely'"
-  }
-}
-
-local AnimationBounce = {
-  Identifier = "AnimationBounce",
-  Parent = transforms.EarthCenter.Identifier,
-  Transform = {
-    Translation = {
-      Type = "StaticTranslation",
-      Position = { 0.0, 0.0, -11E7 }
-    }
-  },
-  Renderable = {
-    Type = "RenderableModel",
-    GeometryFile = model .. "BoxAnimated.glb",
-    EnableAnimation = true,
-    AnimationMode = "BounceFromStart",
-    AnimationStartTime = StartTime,
-    ModelScale = 3E7,
-    LightSources = {
-      sun.LightSource
-    }
-  },
-  GUI = {
-    Name = "Animated Model (BounceFromStart)",
-    Path = "/Examples",
-    Description = "Simple animated box model with the animation mode 'BounceFromStart'"
-  }
-}
-
-
-asset.onInitialize(function()
-  openspace.addSceneGraphNode(AnimationLoop)
-  openspace.addSceneGraphNode(AnimationLoopInf)
-  openspace.addSceneGraphNode(AnimationOnce)
-  openspace.addSceneGraphNode(AnimationBounceInf)
-  openspace.addSceneGraphNode(AnimationBounce)
-end)
-
-asset.onDeinitialize(function()
-  openspace.removeSceneGraphNode(AnimationBounce)
-  openspace.removeSceneGraphNode(AnimationBounceInf)
-  openspace.removeSceneGraphNode(AnimationOnce)
-  openspace.removeSceneGraphNode(AnimationLoopInf)
-  openspace.removeSceneGraphNode(AnimationLoop)
-end)
-
-
-asset.export(AnimationLoop)
-asset.export(AnimationLoopInf)
-asset.export(AnimationOnce)
-asset.export(AnimationBounceInf)
-asset.export(AnimationBounce)
-
-
-
-asset.meta = {
-  Name = "Animation Example asset",
-  Description = "Simple animation example asset with an animated box model",
-  Author = "OpenSpace Team",
-  URL = "http://openspaceproject.com",
-  License = "MIT license"
-}
-
--- Model
--- @TODO: At the moment, this overwrites the previous meta description. Probably needs a way to specify multiple meta's per file?
-asset.meta = {
-  Name = "Animated Box Model",
-  Description = "Simple animated box model",
-  Author = "Cesium, https://cesium.com/",
-  URL = "https://github.com/KhronosGroup/glTF-Sample-Models/tree/master/2.0/BoxAnimated",
-  License = [[
-    Creative Commons Attribution 4.0 International License,
-    https://creativecommons.org/licenses/by/4.0/
-  ]]
-}
diff --git a/data/assets/examples/modelshader/modelshader.asset b/data/assets/examples/modelshader/modelshader.asset
deleted file mode 100644
index 6204ab3eb9..0000000000
--- a/data/assets/examples/modelshader/modelshader.asset
+++ /dev/null
@@ -1,53 +0,0 @@
-local sun = asset.require("scene/solarsystem/sun/sun")
-local transforms = asset.require("scene/solarsystem/planets/earth/transforms")
-
-
-
-local model = asset.resource({
-  Name = "Animated Box",
-  Type = "HttpSynchronization",
-  Identifier = "animated_box",
-  Version = 1
-})
-
-
-local Model = {
-  Identifier = "ModelShader",
-  Parent = transforms.EarthCenter.Identifier,
-  Transform = {
-    Translation = {
-      Type = "StaticTranslation",
-      Position = { -11E7, 0.0, 0.0 }
-    }
-  },
-  Renderable = {
-    Type = "RenderableModel",
-    GeometryFile = model .. "BoxAnimated.glb",
-    ModelScale = 3E7,
-    -- (malej 2023-MAY-22) Note that PerformShading should be false in this example,
-    -- since these example shaders dont't contain any light calculations
-    PerformShading = false,
-    VertexShader = asset.resource("model_vs.glsl"),
-    FragmentShader = asset.resource("model_fs.glsl"),
-    EnableAnimation = true,
-    AnimationStartTime = "2023 05 11 00:00:00",
-    AnimationTimeScale = "Second",
-    AnimationMode = "LoopInfinitely"
-  },
-  GUI = {
-    Name = "Model Shader",
-    Path = "/Examples",
-    Description = "Simple box model with a custom shader"
-  }
-}
-
-
-asset.onInitialize(function()
-  openspace.addSceneGraphNode(Model)
-end)
-
-asset.onDeinitialize(function()
-  openspace.removeSceneGraphNode(Model)
-end)
-
-asset.export(Model)
diff --git a/data/assets/examples/renderable/renderablemodel/advanced/model_shader.asset b/data/assets/examples/renderable/renderablemodel/advanced/model_shader.asset
new file mode 100644
index 0000000000..8db9863e65
--- /dev/null
+++ b/data/assets/examples/renderable/renderablemodel/advanced/model_shader.asset
@@ -0,0 +1,50 @@
+-- Custom Shaders
+-- This example loads a model with custom shaders.
+
+-- Load the example model from OpenSpace servers
+-- If you want to use your own model, this block of code can be safely deleted
+local model = asset.resource({
+  Name = "Animated Box",
+  Type = "HttpSynchronization",
+  Identifier = "animated_box",
+  Version = 1
+})
+
+local Node = {
+  Identifier = "RenderableModel_Example_Shader",
+  Renderable = {
+    Type = "RenderableModel",
+    GeometryFile = model .. "BoxAnimated.glb",
+    -- Use the line below insted of the one above if you want to use your own model
+    --GeometryFile = "C:/path/to/model.fbx",
+
+    -- PerformShading is turned off since the provided custom shaders does not do any
+    -- light calculations
+    PerformShading = false,
+    -- Custom shaders
+    VertexShader = asset.resource("../data/model_vs.glsl"),
+    FragmentShader = asset.resource("../data/model_fs.glsl"),
+  },
+  GUI = {
+    Name = "RenderableModel - Custom Shaders",
+    Path = "/Examples"
+  }
+}
+
+asset.onInitialize(function()
+  openspace.addSceneGraphNode(Node)
+end)
+
+asset.onDeinitialize(function()
+  openspace.removeSceneGraphNode(Node)
+end)
+
+
+-- Model credit
+--[[
+  Author = Cesium, https://cesium.com/
+  URL = https://github.com/KhronosGroup/glTF-Sample-Models/tree/master/2.0/BoxAnimated
+  License =
+    Creative Commons Attribution 4.0 International License,
+    https://creativecommons.org/licenses/by/4.0/
+]]
diff --git a/data/assets/examples/modelshader/model_fs.glsl b/data/assets/examples/renderable/renderablemodel/data/model_fs.glsl
similarity index 100%
rename from data/assets/examples/modelshader/model_fs.glsl
rename to data/assets/examples/renderable/renderablemodel/data/model_fs.glsl
diff --git a/data/assets/examples/modelshader/model_vs.glsl b/data/assets/examples/renderable/renderablemodel/data/model_vs.glsl
similarity index 100%
rename from data/assets/examples/modelshader/model_vs.glsl
rename to data/assets/examples/renderable/renderablemodel/data/model_vs.glsl
diff --git a/data/assets/examples/renderable/renderablemodel/model.asset b/data/assets/examples/renderable/renderablemodel/model.asset
new file mode 100644
index 0000000000..b10567b2e4
--- /dev/null
+++ b/data/assets/examples/renderable/renderablemodel/model.asset
@@ -0,0 +1,43 @@
+-- Basic
+-- This example loads a model.
+
+-- Load the example model from OpenSpace servers
+-- If you want to use your own model, this block of code can be safely deleted
+local model = asset.resource({
+  Name = "Animated Box",
+  Type = "HttpSynchronization",
+  Identifier = "animated_box",
+  Version = 1
+})
+
+local Node = {
+  Identifier = "RenderableModel_Example",
+  Renderable = {
+    Type = "RenderableModel",
+    GeometryFile = model .. "BoxAnimated.glb",
+    -- Use the line below insted of the one above if you want to use your own model
+    --GeometryFile = "C:/path/to/model.fbx",
+  },
+  GUI = {
+    Name = "RenderableModel - Basic",
+    Path = "/Examples"
+  }
+}
+
+asset.onInitialize(function()
+  openspace.addSceneGraphNode(Node)
+end)
+
+asset.onDeinitialize(function()
+  openspace.removeSceneGraphNode(Node)
+end)
+
+
+-- Model credit
+--[[
+  Author = Cesium, https://cesium.com/
+  URL = https://github.com/KhronosGroup/glTF-Sample-Models/tree/master/2.0/BoxAnimated
+  License =
+    Creative Commons Attribution 4.0 International License,
+    https://creativecommons.org/licenses/by/4.0/
+]]
diff --git a/data/assets/examples/renderable/renderablemodel/model_animation.asset b/data/assets/examples/renderable/renderablemodel/model_animation.asset
new file mode 100644
index 0000000000..b977c80e2a
--- /dev/null
+++ b/data/assets/examples/renderable/renderablemodel/model_animation.asset
@@ -0,0 +1,49 @@
+-- Animation
+-- This example loads a model with an animation. The animation starts at a set time, in
+-- this case "2024 07 09 12:00:00".
+
+-- Load the example model from OpenSpace servers
+-- If you want to use your own model, this block of code can be safely deleted
+local model = asset.resource({
+  Name = "Animated Box",
+  Type = "HttpSynchronization",
+  Identifier = "animated_box",
+  Version = 1
+})
+
+local Node = {
+  Identifier = "RenderableModel_Example_Animation",
+  Renderable = {
+    Type = "RenderableModel",
+    GeometryFile = model .. "BoxAnimated.glb",
+    -- Use the line below insted of the one above if you want to use your own model
+    --GeometryFile = "C:/path/to/model.fbx",
+
+    -- Animation Parameters:
+    EnableAnimation = true,
+    -- Start the animation and play it once at this time
+    AnimationStartTime = "2024 07 09 12:00:00",
+  },
+  GUI = {
+    Name = "RenderableModel - Basic Animation",
+    Path = "/Examples"
+  }
+}
+
+asset.onInitialize(function()
+  openspace.addSceneGraphNode(Node)
+end)
+
+asset.onDeinitialize(function()
+  openspace.removeSceneGraphNode(Node)
+end)
+
+
+-- Model credit
+--[[
+  Author = Cesium, https://cesium.com/
+  URL = https://github.com/KhronosGroup/glTF-Sample-Models/tree/master/2.0/BoxAnimated
+  License =
+    Creative Commons Attribution 4.0 International License,
+    https://creativecommons.org/licenses/by/4.0/
+]]
diff --git a/data/assets/examples/renderable/renderablemodel/model_animation_mode_bounce.asset b/data/assets/examples/renderable/renderablemodel/model_animation_mode_bounce.asset
new file mode 100644
index 0000000000..0ab0634aa1
--- /dev/null
+++ b/data/assets/examples/renderable/renderablemodel/model_animation_mode_bounce.asset
@@ -0,0 +1,52 @@
+-- Animation Bounce From Start
+-- This example loads a model with an animation. The animation starts at a set time, in
+-- this case "2024 07 09 12:00:00" and is set to bounce after that time (bounce is similar
+-- to a boomerang for videos).
+
+-- Load the example model from OpenSpace servers
+-- If you want to use your own model, this block of code can be safely deleted
+local model = asset.resource({
+  Name = "Animated Box",
+  Type = "HttpSynchronization",
+  Identifier = "animated_box",
+  Version = 1
+})
+
+local Node = {
+  Identifier = "RenderableModel_Example_Animation_Bounce",
+  Renderable = {
+    Type = "RenderableModel",
+    GeometryFile = model .. "BoxAnimated.glb",
+    -- Use the line below insted of the one above if you want to use your own model
+    --GeometryFile = "C:/path/to/model.fbx",
+
+    -- Animation Parameters:
+    EnableAnimation = true,
+    -- Start the animation and play it once at this time
+    AnimationStartTime = "2024 07 09 12:00:00",
+    -- Bounce the animation after the set start time
+    AnimationMode = "BounceFromStart",
+  },
+  GUI = {
+    Name = "RenderableModel - Animation Bounce From Start",
+    Path = "/Examples"
+  }
+}
+
+asset.onInitialize(function()
+  openspace.addSceneGraphNode(Node)
+end)
+
+asset.onDeinitialize(function()
+  openspace.removeSceneGraphNode(Node)
+end)
+
+
+-- Model credit
+--[[
+  Author = Cesium, https://cesium.com/
+  URL = https://github.com/KhronosGroup/glTF-Sample-Models/tree/master/2.0/BoxAnimated
+  License =
+    Creative Commons Attribution 4.0 International License,
+    https://creativecommons.org/licenses/by/4.0/
+]]
diff --git a/data/assets/examples/renderable/renderablemodel/model_animation_mode_bounce_infinitely.asset b/data/assets/examples/renderable/renderablemodel/model_animation_mode_bounce_infinitely.asset
new file mode 100644
index 0000000000..1fd1d5c33b
--- /dev/null
+++ b/data/assets/examples/renderable/renderablemodel/model_animation_mode_bounce_infinitely.asset
@@ -0,0 +1,52 @@
+-- Animation Bounce Infinitely
+-- This example loads a model with an animation. The animation starts at a set time, in
+-- this case "2024 07 09 12:00:00" and is set to bounce both before and after that time
+-- (bounce is similar to a boomerang for videos).
+
+-- Load the example model from OpenSpace servers
+-- If you want to use your own model, this block of code can be safely deleted
+local model = asset.resource({
+  Name = "Animated Box",
+  Type = "HttpSynchronization",
+  Identifier = "animated_box",
+  Version = 1
+})
+
+local Node = {
+  Identifier = "RenderableModel_Example_Animation_Bounce_Infinitely",
+  Renderable = {
+    Type = "RenderableModel",
+    GeometryFile = model .. "BoxAnimated.glb",
+    -- Use the line below insted of the one above if you want to use your own model
+    --GeometryFile = "C:/path/to/model.fbx",
+
+    -- Animation Parameters:
+    EnableAnimation = true,
+    -- Start the animation and play it once at this time
+    AnimationStartTime = "2024 07 09 12:00:00",
+    -- Bounce the animation both before and after the set start time
+    AnimationMode = "BounceInfinitely",
+  },
+  GUI = {
+    Name = "RenderableModel - Animation Bounce Infinitely",
+    Path = "/Examples"
+  }
+}
+
+asset.onInitialize(function()
+  openspace.addSceneGraphNode(Node)
+end)
+
+asset.onDeinitialize(function()
+  openspace.removeSceneGraphNode(Node)
+end)
+
+
+-- Model credit
+--[[
+  Author = Cesium, https://cesium.com/
+  URL = https://github.com/KhronosGroup/glTF-Sample-Models/tree/master/2.0/BoxAnimated
+  License =
+    Creative Commons Attribution 4.0 International License,
+    https://creativecommons.org/licenses/by/4.0/
+]]
diff --git a/data/assets/examples/renderable/renderablemodel/model_animation_mode_loop.asset b/data/assets/examples/renderable/renderablemodel/model_animation_mode_loop.asset
new file mode 100644
index 0000000000..2d441b0771
--- /dev/null
+++ b/data/assets/examples/renderable/renderablemodel/model_animation_mode_loop.asset
@@ -0,0 +1,51 @@
+-- Animation Loop From Start
+-- This example loads a model with an animation. The animation starts at a set time, in
+-- this case "2024 07 09 12:00:00" and is set to loop after that time.
+
+-- Load the example model from OpenSpace servers
+-- If you want to use your own model, this block of code can be safely deleted
+local model = asset.resource({
+  Name = "Animated Box",
+  Type = "HttpSynchronization",
+  Identifier = "animated_box",
+  Version = 1
+})
+
+local Node = {
+  Identifier = "RenderableModel_Example_Animation_Loop",
+  Renderable = {
+    Type = "RenderableModel",
+    GeometryFile = model .. "BoxAnimated.glb",
+    -- Use the line below insted of the one above if you want to use your own model
+    --GeometryFile = "C:/path/to/model.fbx",
+
+    -- Animation Parameters:
+    EnableAnimation = true,
+    -- Start the animation and play it once at this time
+    AnimationStartTime = "2024 07 09 12:00:00",
+    -- Loop the animation after the set start time
+    AnimationMode = "LoopFromStart",
+  },
+  GUI = {
+    Name = "RenderableModel - Animation Loop From Start",
+    Path = "/Examples"
+  }
+}
+
+asset.onInitialize(function()
+  openspace.addSceneGraphNode(Node)
+end)
+
+asset.onDeinitialize(function()
+  openspace.removeSceneGraphNode(Node)
+end)
+
+
+-- Model credit
+--[[
+  Author = Cesium, https://cesium.com/
+  URL = https://github.com/KhronosGroup/glTF-Sample-Models/tree/master/2.0/BoxAnimated
+  License =
+    Creative Commons Attribution 4.0 International License,
+    https://creativecommons.org/licenses/by/4.0/
+]]
diff --git a/data/assets/examples/renderable/renderablemodel/model_animation_mode_loop_infinitely.asset b/data/assets/examples/renderable/renderablemodel/model_animation_mode_loop_infinitely.asset
new file mode 100644
index 0000000000..5b8852c970
--- /dev/null
+++ b/data/assets/examples/renderable/renderablemodel/model_animation_mode_loop_infinitely.asset
@@ -0,0 +1,51 @@
+-- Animation Loop Infinitely
+-- This example loads a model with an animation. The animation starts at a set time, in
+-- this case "2024 07 09 12:00:00" and is set to loop both before and after that time.
+
+-- Load the example model from OpenSpace servers
+-- If you want to use your own model, this block of code can be safely deleted
+local model = asset.resource({
+  Name = "Animated Box",
+  Type = "HttpSynchronization",
+  Identifier = "animated_box",
+  Version = 1
+})
+
+local Node = {
+  Identifier = "RenderableModel_Example_Animation_Loop_Infinitely",
+  Renderable = {
+    Type = "RenderableModel",
+    GeometryFile = model .. "BoxAnimated.glb",
+    -- Use the line below insted of the one above if you want to use your own model
+    --GeometryFile = "C:/path/to/model.fbx",
+
+    -- Animation Parameters:
+    EnableAnimation = true,
+    -- Start the animation and play it once at this time
+    AnimationStartTime = "2024 07 09 12:00:00",
+    -- Loop the animation both before and after the set start time
+    AnimationMode = "LoopInfinitely",
+  },
+  GUI = {
+    Name = "RenderableModel - Animation Loop Infinitely",
+    Path = "/Examples"
+  }
+}
+
+asset.onInitialize(function()
+  openspace.addSceneGraphNode(Node)
+end)
+
+asset.onDeinitialize(function()
+  openspace.removeSceneGraphNode(Node)
+end)
+
+
+-- Model credit
+--[[
+  Author = Cesium, https://cesium.com/
+  URL = https://github.com/KhronosGroup/glTF-Sample-Models/tree/master/2.0/BoxAnimated
+  License =
+    Creative Commons Attribution 4.0 International License,
+    https://creativecommons.org/licenses/by/4.0/
+]]
diff --git a/data/assets/examples/renderable/renderablemodel/model_lighting.asset b/data/assets/examples/renderable/renderablemodel/model_lighting.asset
new file mode 100644
index 0000000000..d848937f2c
--- /dev/null
+++ b/data/assets/examples/renderable/renderablemodel/model_lighting.asset
@@ -0,0 +1,51 @@
+-- Lighting
+-- This example loads a model and load the Sun to illuminate it.
+
+-- Load the asset of the Sun to illuminate the model
+local sun = asset.require("scene/solarsystem/sun/transforms")
+
+-- Load the example model from OpenSpace servers
+-- If you want to use your own model, this block of code can be safely deleted
+local model = asset.resource({
+  Name = "Animated Box",
+  Type = "HttpSynchronization",
+  Identifier = "animated_box",
+  Version = 1
+})
+
+local Node = {
+  Identifier = "RenderableModel_Example_Lighting",
+  Renderable = {
+    Type = "RenderableModel",
+    GeometryFile = model .. "BoxAnimated.glb",
+    -- Use the line below insted of the one above if you want to use your own model
+    --GeometryFile = "C:/path/to/model.fbx",
+
+    -- Add the Sun as a light source to illuminate the model
+    LightSources = {
+      sun.LightSource
+    }
+  },
+  GUI = {
+    Name = "RenderableModel - Lighting",
+    Path = "/Examples"
+  }
+}
+
+asset.onInitialize(function()
+  openspace.addSceneGraphNode(Node)
+end)
+
+asset.onDeinitialize(function()
+  openspace.removeSceneGraphNode(Node)
+end)
+
+
+-- Model credit
+--[[
+  Author = Cesium, https://cesium.com/
+  URL = https://github.com/KhronosGroup/glTF-Sample-Models/tree/master/2.0/BoxAnimated
+  License =
+    Creative Commons Attribution 4.0 International License,
+    https://creativecommons.org/licenses/by/4.0/
+]]
diff --git a/data/assets/examples/renderable/renderablemodel/model_vertex_colors.asset b/data/assets/examples/renderable/renderablemodel/model_vertex_colors.asset
new file mode 100644
index 0000000000..83471ddacb
--- /dev/null
+++ b/data/assets/examples/renderable/renderablemodel/model_vertex_colors.asset
@@ -0,0 +1,43 @@
+-- Vertex Colors
+-- This example loads a model with vertex colors as material.
+
+-- Load the example model from OpenSpace servers
+-- If you want to use your own model, this block of code can be safely deleted
+local model = asset.resource({
+  Name = "Vertex Colors Test Model",
+  Type = "HttpSynchronization",
+  Identifier = "model_vertex_color_test",
+  Version = 1
+})
+
+local Node = {
+  Identifier = "RenderableModel_Example_Vertex_Colors",
+  Renderable = {
+    Type = "RenderableModel",
+    GeometryFile = model .. "VertexColorTest.glb",
+    -- Use the line below insted of the one above if you want to use your own model
+    --GeometryFile = "C:/path/to/model.fbx",
+  },
+  GUI = {
+    Name = "RenderableModel - Vertex Colors",
+    Path = "/Examples"
+  }
+}
+
+asset.onInitialize(function()
+  openspace.addSceneGraphNode(Node)
+end)
+
+asset.onDeinitialize(function()
+  openspace.removeSceneGraphNode(Node)
+end)
+
+
+-- Model credit
+--[[
+  Author = Ed Mackey
+  URL = "https://github.com/KhronosGroup/glTF-Sample-Models/tree/main/2.0/VertexColorTest"
+  License =
+    Creative Commons Attribution 4.0 International License,
+    https://creativecommons.org/licenses/by/4.0/
+]]
diff --git a/data/assets/scene/solarsystem/planets/earth/satellites/misc/tiangong.asset b/data/assets/scene/solarsystem/planets/earth/satellites/misc/tiangong.asset
index 7b0a23b77e..5f421a2df9 100644
--- a/data/assets/scene/solarsystem/planets/earth/satellites/misc/tiangong.asset
+++ b/data/assets/scene/solarsystem/planets/earth/satellites/misc/tiangong.asset
@@ -23,7 +23,7 @@ local omm = asset.resource({
 local TiangongPosition = {
   Identifier = "TiangongPosition",
   Parent = transforms.EarthInertial.Identifier,
-  BoundingSphere = 54.5, -- half the width
+  BoundingSphere = 27.8, -- half the width
   Transform = {
     Translation = {
       Type = "GPTranslation",
diff --git a/ext/ghoul b/ext/ghoul
index 07e37f0029..bb3695cc14 160000
--- a/ext/ghoul
+++ b/ext/ghoul
@@ -1 +1 @@
-Subproject commit 07e37f0029bf68f4178fe091445eff7339c9ff17
+Subproject commit bb3695cc14b12e26d46bc06914715200417c879e
diff --git a/modules/base/shaders/model_fs.glsl b/modules/base/shaders/model_fs.glsl
index c15de3dc49..e1ff381e39 100644
--- a/modules/base/shaders/model_fs.glsl
+++ b/modules/base/shaders/model_fs.glsl
@@ -29,6 +29,7 @@ in vec3 vs_normalViewSpace;
 in vec4 vs_positionCameraSpace;
 in float vs_screenSpaceDepth;
 in mat3 vs_TBN;
+in vec3 vs_color;
 
 uniform float ambientIntensity = 0.2;
 uniform float diffuseIntensity = 1.0;
@@ -36,6 +37,7 @@ uniform float specularIntensity = 1.0;
 uniform bool performShading = true;
 
 uniform bool use_forced_color = false;
+uniform bool use_vertex_colors = false;
 uniform bool has_texture_diffuse;
 uniform bool has_texture_normal;
 uniform bool has_texture_specular;
@@ -95,7 +97,7 @@ Fragment getFragment() {
   }
 
   // Base color
-  vec4 diffuseAlbedo;
+  vec4 diffuseAlbedo = vec4(0.0);
   if (has_texture_diffuse) {
     diffuseAlbedo = texture(texture_diffuse, vs_st);
   }
@@ -103,6 +105,16 @@ Fragment getFragment() {
     diffuseAlbedo = color_diffuse;
   }
 
+  // Multiply with vertex color if specified
+  if (use_vertex_colors) {
+    diffuseAlbedo.rgb *= vs_color;
+
+    // Make sure to not go beyond color range
+    diffuseAlbedo.r = clamp(diffuseAlbedo.r, 0.0, 1.0);
+    diffuseAlbedo.g = clamp(diffuseAlbedo.g, 0.0, 1.0);
+    diffuseAlbedo.b = clamp(diffuseAlbedo.b, 0.0, 1.0);
+  }
+
   if (performShading) {
     // Specular color
     vec3 specularAlbedo;
@@ -118,7 +130,7 @@ Fragment getFragment() {
       }
     }
 
-    // Bumb mapping
+    // Bump mapping
     vec3 normal;
     if (has_texture_normal) {
       vec3 normalAlbedo = texture(texture_normal, vs_st).rgb;
diff --git a/modules/base/shaders/model_vs.glsl b/modules/base/shaders/model_vs.glsl
index 9d12edc407..d8dfbeee0f 100644
--- a/modules/base/shaders/model_vs.glsl
+++ b/modules/base/shaders/model_vs.glsl
@@ -30,12 +30,14 @@ layout(location = 0) in vec4 in_position;
 layout(location = 1) in vec2 in_st;
 layout(location = 2) in vec3 in_normal;
 layout(location = 3) in vec3 in_tangent;
+layout(location = 4) in vec3 in_color;
 
 out vec2 vs_st;
 out vec3 vs_normalViewSpace;
 out float vs_screenSpaceDepth;
 out vec4 vs_positionCameraSpace;
 out mat3 vs_TBN;
+out vec3 vs_color;
 
 uniform mat4 modelViewTransform;
 uniform mat4 projectionTransform;
@@ -51,6 +53,7 @@ void main() {
 
   gl_Position = positionScreenSpace;
   vs_st = in_st;
+  vs_color = in_color;
   vs_screenSpaceDepth = positionScreenSpace.w;
 
   vs_normalViewSpace =
diff --git a/tests/visual/README.md b/tests/visual/README.md
index 010a0e9f3f..a6528c4410 100644
--- a/tests/visual/README.md
+++ b/tests/visual/README.md
@@ -1,33 +1,40 @@
 # Visual Test Specification
-All `.ostest` files in this folders specify visual image tests that are automatically run to ensure that changes in OpenSpace do not negatively impact the rendered results. The tested results are available at https://regression.openspaceproject.com.
+All `.ostest` files in these folders specify visual image tests that are automatically run to ensure that changes in OpenSpace do not negatively impact the rendered results. The test results are available at https://regression.openspaceproject.com.
 
-The files are organized by folders, which are used as the "group" name for the test and filename of each test (without `.ostest` extension) is used as the name of the test. In general the first folder should name a profile that is being tested by the files within or a specific use-case, such as testing all renderables. Additional subfolders can be used as required within each top-level folder.
+The files are organized in folders, where the folder name is used as the "group" name for the tests within, and the filename of each test (without the `.ostest` extension) is used as the name of the test. In general, the top-level folder should name a profile or a specific use case that is tested by the files within, such as testing all renderables. Additional subfolders can be used within each top-level folder.
 
 ## Test Structure
-Each test must have a `screenshot` instruction as the last entry, which causes an image to be created that is used as the end result of the test. Only exactly one `screenshot` instruction per test is currently supported. Each `.ostest` file is a JSON file with two top-level keys: `profile` provides the name of the profile that should be loaded before running these test instructions, and `commands` is a list of instructions that should be executed after the profile was loaded. All instructions must have a `type` key to determine which type of instruction it is and most have a `value` key that determines the parameters for that instruction.
+Each test must have a `screenshot` instruction as the **last** entry, which causes an image to be created that is used as the result of the test. Only exactly one `screenshot` instruction per test is currently supported. Each `.ostest` file is a JSON file with two top-level keys: `profile` provides the name of the profile that should be loaded before running these test instructions, and `commands` is a list of instructions that should be executed after the profile is loaded. All instructions must have a `type` and `value` key to determine which type of instruction it is and the parameters for that instruction.
+
+By default on the servers that generate tests for https://regression.openspaceproject.com, all tests always start paused, MRF caching is enabled, and the user interface and dashboard items are disabled.
 
 ### Best practices
-  - By default, all tests always start paused, MRF caching is enabled, and the user interface and dashboard items are disabled
-  - All test should start with in instruction to set a specific time to improve reproducibility
-  - The few instructions there are per test, the better
-  - Adding `wait` instructions to ensure OpenSpace has time to load dynamic datasets increases reliability, but too many `wait`s will slow-down the over all testing
+  - All tests should start with the instruction to set a specific time to improve reproducibility
+  - The fewer instructions there are per test, the better
+  - Adding `wait` instructions to ensure OpenSpace has time to load dynamic datasets increases reliability, but too many `wait`s will slow down the overall testing
   - Avoid `recording` and use `navigationstate` and `time` instead
-  - Avoid `script` if possible and use dedicated instructions when they exist. If we see the same `script` instruction used in many tests, they can be upgraded to a first-class instruction at later stage
+  - Avoid `script` if possible and use dedicated instructions when they exist. If we see the same `script` instruction used in several tests, they can be upgraded to a dedicated instruction at a later stage
 
 ### Instructions
-  - `action`: Triggers an action that must already be defined in the profile or that was defined previously in this test. The provided value must be a string that is the identifier of the action that should be triggered.
+  - `action`: Triggers an action that must already be defined in the profile or previously defined in the test. The provided value must be a string that is the identifier of the action that should be triggered.
 
     Example: `{ "type": "action", "value": "os.FadeDownTrails" }`
 
     Script Equivalent: `openspace.action.triggerAction`
 
-  - `deltatime`: Instantly changes the delta time in OpenSpace to the provided value. The provided value must be a number that is the delta time in seconds per realtime second that the engine should be set to.
+  - `asset`: Loads a given asset file. The provided value must be a string that is the path to the asset file to be loaded. This is specified relative to the `data/asset` folder inside OpenSpace.
+
+    Example: `{ "type": "asset", "value": "path/to/file.asset" }`
+
+    Script Equivalent: `openspace.asset.add`
+
+  - `deltatime`: Instantly changes the delta time in OpenSpace to the provided value. The provided value must be a number that is the delta time in seconds per real-time second that the engine should be set to.
 
     Example: `{ "type": "deltatime", "value": 10 }`
 
     Script Equivalent: `openspace.time.setDeltaTime`
 
-  - `navigationstate`: Sets the camera to the provided navigation state. The provided value must be an object that must contain at least a `anchor` and `position` and may optionally contain an `aim`, `referenceFrame`, `up`, `yaw`, `pitch`, and `timestamp`. All these values are then used to instantaneously set the position of the camera.
+  - `navigationstate`: Instantly moves the camera to the provided navigation state. The provided value must be an object that must contain at least an `anchor` and `position` key and may optionally contain the keys `aim`, `referenceFrame`, `up`, `yaw`, `pitch`, and `timestamp`. All these values are then used to instantaneously set the position and rotation of the camera.
 
     Example: `{ "type": "navigationstate", "value": { "anchor": "Juno", "pitch": -0.0165756, "position": [ -22.49081, 1.191533, 26.35740 ], "up": [ 0.0288083, 0.999373, -0.0205962 ], "yaw": 0.152454 } }`
 
@@ -39,7 +46,7 @@ Each test must have a `screenshot` instruction as the last entry, which causes a
 
     Script Equivalent: `openspace.time.setPause`
 
-  - `property`: Sets a specific property or group of properties to the specified value. This change is instantaneous. The provided value must contain a `property` key that is the identifier or regex for the property that should be set and a `value` key that is the new value for the property. The type of the `value` must be correct for the matched `property`.
+  - `property`: Instantly sets a specific property or group of properties to the specified value. The provided value must be an object containing another `property` and `value` key. The (other) `property` key is the identifier or regex for the property or properties that should be set. The (other) `value` key is the new value for the property where the type must match the (other) `property`.
 
     Example: `{ "type": "property", "value": { "property": "Scene.Constellations.Renderable.Enabled", "value": true } }`
 
@@ -51,19 +58,19 @@ Each test must have a `screenshot` instruction as the last entry, which causes a
 
     Script Equivalent: `openspace.sessionRecording.startPlayback`
 
-  - `screenshot`: Takes a screenshot of the application. At the moment, there can be only exactly one instruction of this type and it should be the last instruction in the test. This instruction also does not take any parameters
+  - `screenshot`: Takes a screenshot of the application. At the moment, there can be only exactly one instruction of this type and it must be the last instruction in the test. This instruction is the only one to not use the `value` key.
 
     Example: `{ "type": "screenshot" }`
 
     Script Equivalent: `openspace.takeScreenshot`
 
-  - `script`: Executes the script that is passed in as a value. That value must be a string that is the Lua script that is executed directly.
+  - `script`: Instantly executes the script that is passed in as a value. That value must be a string that is the Lua script to execute.
 
-    Example: `{ "type": "script", "value": "openspace.printError("Hello world") }`
+    Example: `{ "type": "script", "value": "openspace.printError('Hello world')" }`
 
     Script Equivalent: `value`
 
-  - `time`: Sets the in-game time to the provided value. The value can be either a string, in which case it needs to be a valid date-time string, or a number, in which case it represents the number of seconds past the J2000 epoch.
+  - `time`: Sets the in-game time to the provided value. The value can be either a string, which needs to be a valid date-time string, or a number, which represents the number of seconds past the J2000 epoch.
 
     Example: `{ "type": "time", "value": "2016-07-01T00:00:01.00" }`
 
diff --git a/tests/visual/renderable/model_vertex_colors.ostest b/tests/visual/renderable/model_vertex_colors.ostest
new file mode 100644
index 0000000000..e9ea0e9d8b
--- /dev/null
+++ b/tests/visual/renderable/model_vertex_colors.ostest
@@ -0,0 +1,25 @@
+{
+  "profile": "empty",
+  "commands": [
+    { "type": "time", "value": "2024-07-11T12:00:00.00" },
+    {
+      "type": "property",
+      "value": { "property": "NavigationHandler.OrbitalNavigator.LimitZoom.EnabledMinimumAllowedDistance", "value": false }
+    },
+    {
+      "type": "asset",
+      "value": "examples/renderable/renderablemodel/model_vertex_colors.asset"
+    },
+    { "type": "wait", "value": 5 },
+    {
+      "type": "navigationstate",
+      "value": {
+        "anchor": "RenderableModel_Example_Vertex_Colors",
+        "up": [ -0.008132849760983194, 0.9986021710677091, 0.0522260537818345 ],
+        "position": [0.10334103813188818, -0.20823861895763798, 3.9977746547860167 ]
+      }
+    },
+    { "type": "wait", "value": 2 },
+    { "type": "screenshot" }
+  ]
+}

From cabb8cb55bd8d73b430fea538d7a06db4805496d Mon Sep 17 00:00:00 2001
From: Alexander Bock <alexander.bock@liu.se>
Date: Thu, 18 Jul 2024 11:11:26 +0200
Subject: [PATCH 537/701] Add Down and Up keybinds to set the time to realtime
 and "now" respectively (closes #3275)

---
 data/assets/default_keybindings.asset | 60 +++++++++++++++++++++++++++
 1 file changed, 60 insertions(+)

diff --git a/data/assets/default_keybindings.asset b/data/assets/default_keybindings.asset
index 66446dfd25..f12f872467 100644
--- a/data/assets/default_keybindings.asset
+++ b/data/assets/default_keybindings.asset
@@ -158,6 +158,42 @@ local PreviousDeltaStepImmediate = {
   IsLocal = true
 }
 
+local RealTimeDeltaStepInterpolate = {
+  Identifier = "os.RealTimeDeltaStepInterpolate",
+  Name = "Reset the simulation time to realtime (interpolate)",
+  Command = "openspace.time.interpolateDeltaTime(1)",
+  Documentation = "Smoothly interpolate the simulation speed to match real-time speed",
+  GuiPath = "/Time/Simulation Speed",
+  IsLocal = true
+}
+
+local RealTimeDeltaStepImmediate = {
+  Identifier = "os.RealTimeDeltaStepImmediate",
+  Name = "Reset the simulation time to realtime (immediate)",
+  Command = "openspace.time.setDeltaTime(1)",
+  Documentation = "Immediately set the simulation speed to match real-time speed",
+  GuiPath = "/Time/Simulation Speed",
+  IsLocal = true
+}
+
+local DateToNowInterpolate = {
+  Identifier = "os.DateToNowInterpolate",
+  Name = "Set the in-game time to now (interpolate)",
+  Command = "openspace.time.interpolateTime(openspace.time.currentWallTime())",
+  Documentation = "Immediately set the current in-game time to the 'now' time",
+  GuiPath = "/Time/Simulation Speed",
+  IsLocal = true
+}
+
+local DateToNowImmediate = {
+  Identifier = "os.DateToNowImmediate",
+  Name = "Set the in-game time to now (immediate)",
+  Command = "openspace.time.setTime(openspace.time.currentWallTime())",
+  Documentation = "Smoothly interpolate the current in-game time to the 'now' time",
+  GuiPath = "/Time/Simulation Speed",
+  IsLocal = true
+}
+
 local ReloadGui = {
   Identifier = "os.ReloadGui",
   Name = "Reload GUI",
@@ -217,6 +253,18 @@ asset.onInitialize(function()
   openspace.action.registerAction(PreviousDeltaStepImmediate)
   openspace.bindKey("Shift+Left", PreviousDeltaStepImmediate.Identifier)
 
+  openspace.action.registerAction(RealTimeDeltaStepInterpolate)
+  openspace.bindKey("Down", RealTimeDeltaStepInterpolate.Identifier)
+
+  openspace.action.registerAction(RealTimeDeltaStepImmediate)
+  openspace.bindKey("Shift+Down", RealTimeDeltaStepImmediate.Identifier)
+
+  openspace.action.registerAction(DateToNowInterpolate)
+  openspace.bindKey("Up", DateToNowInterpolate.Identifier)
+
+  openspace.action.registerAction(DateToNowImmediate)
+  openspace.bindKey("Shift+Up", DateToNowImmediate.Identifier)
+
   openspace.action.registerAction(ReloadGui)
   openspace.bindKey("F5", ReloadGui.Identifier)
 end)
@@ -225,6 +273,18 @@ asset.onDeinitialize(function()
   openspace.clearKey("F5")
   openspace.action.removeAction(ReloadGui)
 
+  openspace.clearKey("Shift+Up")
+  openspace.actiion.removeAction(DateToNowImmediate)
+
+  openspace.clearKey("Up")
+  openspace.actiion.removeAction(DateToNowInterpolate)
+
+  openspace.clearKey("Shift+Down")
+  openspace.action.removeAction(RealTimeDeltaStepImmediate)
+
+  openspace.clearKey("Down")
+  openspace.action.removeAction(RealTimeDeltaStepInterpolate)
+
   openspace.clearKey("Shift+Left")
   openspace.action.removeAction(PreviousDeltaStepImmediate)
 

From 981a13a8556316bdc71dfd2ed611fed86c25374f Mon Sep 17 00:00:00 2001
From: Alexander Bock <alexander.bock@liu.se>
Date: Thu, 18 Jul 2024 11:18:57 +0200
Subject: [PATCH 538/701] Add new TileProvider to select tile providers based
 on the date and apply to VIIRS Joint Polar Satellite System (#3350)

---
 .../colorlayers/definitions/noaa20.asset      |  33 +++
 .../colorlayers/definitions/noaa21.asset      |  33 +++
 .../layers/colorlayers/definitions/snpp.asset |  33 +++
 .../colorlayers/esri_noaa20_combo.asset       |  22 +-
 .../colorlayers/esri_noaa21_combo.asset       |  22 +-
 .../layers/colorlayers/esri_snpp_combo.asset  |  52 +++++
 .../layers/colorlayers/esri_viirs_combo.asset |  33 ++-
 .../colorlayers/viirs_noaa20_temporal.asset   |  32 +--
 .../colorlayers/viirs_noaa21_temporal.asset   |  23 +++
 .../colorlayers/viirs_snpp_temporal.asset     |  32 +--
 modules/globebrowsing/CMakeLists.txt          |   2 +
 modules/globebrowsing/globebrowsingmodule.cpp |   3 +
 .../shaders/texturetilemapping.glsl           |  12 +-
 modules/globebrowsing/src/gpulayergroup.cpp   |   2 +
 modules/globebrowsing/src/layer.cpp           |   7 +-
 modules/globebrowsing/src/layergroupid.h      |   7 +-
 .../src/tileprovider/tileproviderbydate.cpp   | 190 ++++++++++++++++++
 .../src/tileprovider/tileproviderbydate.h     |  65 ++++++
 18 files changed, 477 insertions(+), 126 deletions(-)
 create mode 100644 data/assets/scene/solarsystem/planets/earth/layers/colorlayers/definitions/noaa20.asset
 create mode 100644 data/assets/scene/solarsystem/planets/earth/layers/colorlayers/definitions/noaa21.asset
 create mode 100644 data/assets/scene/solarsystem/planets/earth/layers/colorlayers/definitions/snpp.asset
 create mode 100644 data/assets/scene/solarsystem/planets/earth/layers/colorlayers/esri_snpp_combo.asset
 create mode 100644 data/assets/scene/solarsystem/planets/earth/layers/colorlayers/viirs_noaa21_temporal.asset
 create mode 100644 modules/globebrowsing/src/tileprovider/tileproviderbydate.cpp
 create mode 100644 modules/globebrowsing/src/tileprovider/tileproviderbydate.h

diff --git a/data/assets/scene/solarsystem/planets/earth/layers/colorlayers/definitions/noaa20.asset b/data/assets/scene/solarsystem/planets/earth/layers/colorlayers/definitions/noaa20.asset
new file mode 100644
index 0000000000..c948982e52
--- /dev/null
+++ b/data/assets/scene/solarsystem/planets/earth/layers/colorlayers/definitions/noaa20.asset
@@ -0,0 +1,33 @@
+local Layer = {
+  Identifier = "Temporal_NOAA20_VIIRS",
+  Name = "Temporal NOAA20 VIIRS",
+  Type = "TemporalTileProvider",
+  Mode = "Prototyped",
+  Prototyped = {
+    Time = {
+      Start = "2018-01-05",
+      End = "Today"
+    },
+    TemporalResolution = "1d",
+    TimeFormat = "YYYY-MM-DD",
+    Prototype = openspace.globebrowsing.createTemporalGibsGdalXml(
+      "VIIRS_NOAA20_CorrectedReflectance_TrueColor",
+      "250m",
+      "jpg"
+    )
+  },
+  PadTiles = false
+}
+
+
+asset.export("Layer", Layer)
+
+
+
+asset.meta = {
+  Name = "NOAA 20",
+  Description = [[A layer that sources its images from the NOAA-20 satellite that is part of the Joint Polar Satellite System.]],
+  Author = "OpenSpace Team",
+  URL = "http://www.openspaceproject.com",
+  License = "MIT License"
+}
diff --git a/data/assets/scene/solarsystem/planets/earth/layers/colorlayers/definitions/noaa21.asset b/data/assets/scene/solarsystem/planets/earth/layers/colorlayers/definitions/noaa21.asset
new file mode 100644
index 0000000000..200649673e
--- /dev/null
+++ b/data/assets/scene/solarsystem/planets/earth/layers/colorlayers/definitions/noaa21.asset
@@ -0,0 +1,33 @@
+local Layer = {
+  Identifier = "Temporal_NOAA21_VIIRS",
+  Name = "Temporal NOAA21 VIIRS",
+  Type = "TemporalTileProvider",
+  Mode = "Prototyped",
+  Prototyped = {
+    Time = {
+      Start = "2024-04-19",
+      End = "Today"
+    },
+    TemporalResolution = "1d",
+    TimeFormat = "YYYY-MM-DD",
+    Prototype = openspace.globebrowsing.createTemporalGibsGdalXml(
+      "VIIRS_NOAA21_CorrectedReflectance_TrueColor",
+      "250m",
+      "jpg"
+    )
+  },
+  PadTiles = false
+}
+
+
+asset.export("Layer", Layer)
+
+
+
+asset.meta = {
+  Name = "NOAA 20",
+  Description = [[A layer that sources its images from the NOAA-21 satellite that is part of the Joint Polar Satellite System.]],
+  Author = "OpenSpace Team",
+  URL = "http://www.openspaceproject.com",
+  License = "MIT License"
+}
diff --git a/data/assets/scene/solarsystem/planets/earth/layers/colorlayers/definitions/snpp.asset b/data/assets/scene/solarsystem/planets/earth/layers/colorlayers/definitions/snpp.asset
new file mode 100644
index 0000000000..50b9648d00
--- /dev/null
+++ b/data/assets/scene/solarsystem/planets/earth/layers/colorlayers/definitions/snpp.asset
@@ -0,0 +1,33 @@
+local Layer = {
+  Identifier = "Temporal_SNPP_VIIRS",
+  Name = "Temporal SNPP VIIRS",
+  Type = "TemporalTileProvider",
+  Mode = "Prototyped",
+  Prototyped = {
+    Time = {
+      Start = "2015-11-24",
+      End = "Today"
+    },
+    TemporalResolution = "1d",
+    TimeFormat = "YYYY-MM-DD",
+    Prototype = openspace.globebrowsing.createTemporalGibsGdalXml(
+      "VIIRS_SNPP_CorrectedReflectance_TrueColor",
+      "250m",
+      "jpg"
+    )
+  },
+  PadTiles = false
+}
+
+
+asset.export("Layer", Layer)
+
+
+
+asset.meta = {
+  Name = "NOAA 20",
+  Description = [[A layer that sources its images from the Suomi NPP satellite that is part of the Joint Polar Satellite System.]],
+  Author = "OpenSpace Team",
+  URL = "http://www.openspaceproject.com",
+  License = "MIT License"
+}
diff --git a/data/assets/scene/solarsystem/planets/earth/layers/colorlayers/esri_noaa20_combo.asset b/data/assets/scene/solarsystem/planets/earth/layers/colorlayers/esri_noaa20_combo.asset
index ae680ca127..19466f157a 100644
--- a/data/assets/scene/solarsystem/planets/earth/layers/colorlayers/esri_noaa20_combo.asset
+++ b/data/assets/scene/solarsystem/planets/earth/layers/colorlayers/esri_noaa20_combo.asset
@@ -1,4 +1,5 @@
 local globe = asset.require("../../earth")
+local noaa20 = asset.require("./definitions/noaa20")
 
 
 
@@ -11,26 +12,7 @@ local Layer = {
   LevelTileProviders = {
     {
       MaxLevel = 4,
-      TileProvider = {
-        Identifier = "Temporal_VIIRS_NOAA20",
-        Name = "Temporal VIIRS NOAA20",
-        Type = "TemporalTileProvider",
-        Mode = "Prototyped",
-        Prototyped = {
-          Time = {
-            Start = "2020-04-25",
-            End = "Today"
-          },
-          TemporalResolution = "1d",
-          TimeFormat = "YYYY-MM-DD",
-          Prototype = openspace.globebrowsing.createTemporalGibsGdalXml(
-            "VIIRS_NOAA20_CorrectedReflectance_TrueColor",
-            "250m",
-            "jpg"
-          )
-        },
-        PadTiles = false
-      }
+      TileProvider = noaa20.Layer
     },
     {
       MaxLevel = 22,
diff --git a/data/assets/scene/solarsystem/planets/earth/layers/colorlayers/esri_noaa21_combo.asset b/data/assets/scene/solarsystem/planets/earth/layers/colorlayers/esri_noaa21_combo.asset
index 504ca739eb..06b44c5325 100644
--- a/data/assets/scene/solarsystem/planets/earth/layers/colorlayers/esri_noaa21_combo.asset
+++ b/data/assets/scene/solarsystem/planets/earth/layers/colorlayers/esri_noaa21_combo.asset
@@ -1,4 +1,5 @@
 local globe = asset.require("../../earth")
+local noaa21 = asset.require("./definitions/noaa21")
 
 
 
@@ -11,26 +12,7 @@ local Layer = {
   LevelTileProviders = {
     {
       MaxLevel = 4,
-      TileProvider = {
-        Identifier = "Temporal_VIIRS_NOAA21",
-        Name = "Temporal VIIRS NOAA21",
-        Type = "TemporalTileProvider",
-        Mode = "Prototyped",
-        Prototyped = {
-          Time = {
-            Start = "2024-04-19",
-            End = "Today"
-          },
-          TemporalResolution = "1d",
-          TimeFormat = "YYYY-MM-DD",
-          Prototype = openspace.globebrowsing.createTemporalGibsGdalXml(
-            "VIIRS_NOAA21_CorrectedReflectance_TrueColor",
-            "250m",
-            "jpg"
-          )
-        },
-        PadTiles = false
-      }
+      TileProvider = noaa21.Layer
     },
     {
       MaxLevel = 22,
diff --git a/data/assets/scene/solarsystem/planets/earth/layers/colorlayers/esri_snpp_combo.asset b/data/assets/scene/solarsystem/planets/earth/layers/colorlayers/esri_snpp_combo.asset
new file mode 100644
index 0000000000..2ee2480dc3
--- /dev/null
+++ b/data/assets/scene/solarsystem/planets/earth/layers/colorlayers/esri_snpp_combo.asset
@@ -0,0 +1,52 @@
+local globe = asset.require("../../earth")
+local snpp = asset.require("./definitions/snpp")
+
+
+
+local Layer = {
+  Identifier = "ESRI_VIIRS_Combo",
+  Name = "ESRI VIIRS Combo",
+  Enabled = asset.enabled,
+  ZIndex = 20,
+  Type = "TileProviderByLevel",
+  LevelTileProviders = {
+    {
+      MaxLevel = 4,
+      TileProvider = snpp.Layer
+    },
+    {
+      MaxLevel = 22,
+      TileProvider = {
+        Identifier = "ESRI_World_Imagery",
+        Name = "ESRI World Imagery",
+        FilePath = asset.resource("esri_world_imagery.wms"),
+        PadTiles = false
+      }
+    }
+  },
+  PadTiles = false,
+  Description = [[Level based layer combining "VIIRS SNPP (Temporal)" and ESRI World
+    Imagery. "VIIRS SNPP (Temporal)" is faded out at tile level 4]]
+}
+
+
+asset.onInitialize(function()
+  openspace.globebrowsing.addLayer(globe.Earth.Identifier, "ColorLayers", Layer)
+end)
+
+asset.onDeinitialize(function()
+  openspace.globebrowsing.deleteLayer(globe.Earth.Identifier, "ColorLayers", Layer)
+end)
+
+asset.export("layer", Layer)
+
+
+
+asset.meta = {
+  Name = "ESRI VIIRS Combo",
+  Description = [[Level based layer combining "VIIRS SNPP (Temporal)" and ESRI World
+  Imagery. "VIIRS SNPP (Temporal)" is faded out at tile level 4]],
+  Author = "OpenSpace Tem",
+  URL = "http://www.openspaceproject.com",
+  License = "MIT License"
+}
diff --git a/data/assets/scene/solarsystem/planets/earth/layers/colorlayers/esri_viirs_combo.asset b/data/assets/scene/solarsystem/planets/earth/layers/colorlayers/esri_viirs_combo.asset
index a8a1ca1b74..4c3e24bd9c 100644
--- a/data/assets/scene/solarsystem/planets/earth/layers/colorlayers/esri_viirs_combo.asset
+++ b/data/assets/scene/solarsystem/planets/earth/layers/colorlayers/esri_viirs_combo.asset
@@ -1,4 +1,7 @@
 local globe = asset.require("../../earth")
+local snpp = asset.require("./definitions/snpp")
+local noaa20 = asset.require("./definitions/noaa20")
+local noaa21 = asset.require("./definitions/noaa21")
 
 
 
@@ -12,24 +15,14 @@ local Layer = {
     {
       MaxLevel = 4,
       TileProvider = {
-        Identifier = "Temporal_VIIRS_SNPP",
-        Name = "Temporal VIIRS SNPP",
-        Type = "TemporalTileProvider",
-        Mode = "Prototyped",
-        Prototyped = {
-          Time = {
-            Start = "2015-11-24",
-            End = "2024-05-27"
-          },
-          TemporalResolution = "1d",
-          TimeFormat = "YYYY-MM-DD",
-          Prototype = openspace.globebrowsing.createTemporalGibsGdalXml(
-            "VIIRS_SNPP_CorrectedReflectance_TrueColor",
-            "250m",
-            "jpg"
-          )
-        },
-        PadTiles = false
+        Identifier = "VIIRS_Joint_Layer",
+        Name = "VIIRS Joint Layer",
+        Type = "TileProviderByDate",
+        Providers = {
+          ["2015-11-24"] = snpp.Layer,
+          ["2018-01-05"] = noaa20.Layer,
+          ["2024-04-19"] = noaa21.Layer
+        }
       }
     },
     {
@@ -43,8 +36,8 @@ local Layer = {
     }
   },
   PadTiles = false,
-  Description = [[Level based layer combining "VIIRS SNPP (Temporal)" and ESRI World
-    Imagery. "VIIRS SNPP (Temporal)" is faded out at tile level 4]]
+  Description = [[Level based layer combining different VIIRS layers and ESRI World
+    Imagery. VIIRS is faded out at tile level 4]]
 }
 
 
diff --git a/data/assets/scene/solarsystem/planets/earth/layers/colorlayers/viirs_noaa20_temporal.asset b/data/assets/scene/solarsystem/planets/earth/layers/colorlayers/viirs_noaa20_temporal.asset
index 4f75667c4d..4380875f21 100644
--- a/data/assets/scene/solarsystem/planets/earth/layers/colorlayers/viirs_noaa20_temporal.asset
+++ b/data/assets/scene/solarsystem/planets/earth/layers/colorlayers/viirs_noaa20_temporal.asset
@@ -1,42 +1,16 @@
 local globe = asset.require("../../earth")
+local noaa20 = asset.require("./definitions/noaa20")
 
 
 
-local Layer = {
-  Identifier = "VIIRS_NOAA20_Temporal",
-  Name = "VIIRS NOAA20 (Temporal)",
-  Enabled = asset.enabled,
-  ZIndex = 30,
-  Type = "TemporalTileProvider",
-  Mode = "Prototyped",
-  Prototyped = {
-    Time = {
-      Start = "2020-04-25",
-      End = "Yesterday"
-    },
-    TemporalResolution = "1d",
-    TimeFormat = "YYYY-MM-DD",
-    Prototype = openspace.globebrowsing.createTemporalGibsGdalXml(
-      "VIIRS_NOAA20_CorrectedReflectance_TrueColor",
-      "250m",
-      "jpg"
-    )
-  },
-  Description = [[Temporal coverage: 11 November 2015 - Present. The imagery resolution
-    is 0.25 km, and the temporal resolution is daily]]
-}
-
-
 asset.onInitialize(function()
-  openspace.globebrowsing.addLayer(globe.Earth.Identifier, "ColorLayers", Layer)
+  openspace.globebrowsing.addLayer(globe.Earth.Identifier, "ColorLayers", noaa20.Layer)
 end)
 
 asset.onDeinitialize(function()
-  openspace.globebrowsing.deleteLayer(globe.Earth.Identifier, "ColorLayers", Layer)
+  openspace.globebrowsing.deleteLayer(globe.Earth.Identifier, "ColorLayers", noaa20.Layer)
 end)
 
-asset.export("layer", Layer)
-
 
 
 asset.meta = {
diff --git a/data/assets/scene/solarsystem/planets/earth/layers/colorlayers/viirs_noaa21_temporal.asset b/data/assets/scene/solarsystem/planets/earth/layers/colorlayers/viirs_noaa21_temporal.asset
new file mode 100644
index 0000000000..e74851f857
--- /dev/null
+++ b/data/assets/scene/solarsystem/planets/earth/layers/colorlayers/viirs_noaa21_temporal.asset
@@ -0,0 +1,23 @@
+local globe = asset.require("../../earth")
+local noaa21 = asset.require("./definitions/noaa21")
+
+
+
+asset.onInitialize(function()
+  openspace.globebrowsing.addLayer(globe.Earth.Identifier, "ColorLayers", noaa21.Layer)
+end)
+
+asset.onDeinitialize(function()
+  openspace.globebrowsing.deleteLayer(globe.Earth.Identifier, "ColorLayers", noaa21.Layer)
+end)
+
+
+
+asset.meta = {
+  Name = "VIIRS NOAA21 (Temporal)",
+  Description = "This layer has the best daily Earth Image",
+  Author = "NASA EOSDIS Global Imagery Browse Services",
+  URL =
+    "https://earthdata.nasa.gov/eosdis/science-system-description/eosdis-components/gibs",
+  License = "NASA"
+}
diff --git a/data/assets/scene/solarsystem/planets/earth/layers/colorlayers/viirs_snpp_temporal.asset b/data/assets/scene/solarsystem/planets/earth/layers/colorlayers/viirs_snpp_temporal.asset
index e9888466e6..bf07ec7483 100644
--- a/data/assets/scene/solarsystem/planets/earth/layers/colorlayers/viirs_snpp_temporal.asset
+++ b/data/assets/scene/solarsystem/planets/earth/layers/colorlayers/viirs_snpp_temporal.asset
@@ -1,42 +1,16 @@
 local globe = asset.require("../../earth")
+local snpp = asset.require("./definitions/snpp")
 
 
 
-local Layer = {
-  Identifier = "VIIRS_SNPP_Temporal",
-  Name = "VIIRS SNPP (Temporal)",
-  Enabled = asset.enabled,
-  ZIndex = 30,
-  Type = "TemporalTileProvider",
-  Mode = "Prototyped",
-  Prototyped = {
-    Time = {
-      Start = "2015-11-24",
-      End = "Today"
-    },
-    TemporalResolution = "1d",
-    TimeFormat = "YYYY-MM-DD",
-    Prototype = openspace.globebrowsing.createTemporalGibsGdalXml(
-      "VIIRS_SNPP_CorrectedReflectance_TrueColor",
-      "250m",
-      "jpg"
-    )
-  },
-  Description = [[Temporal coverage: 11 November 2015 - Present. The imagery resolution
-    is 0.25 km, and the temporal resolution is daily]]
-}
-
-
 asset.onInitialize(function()
-  openspace.globebrowsing.addLayer(globe.Earth.Identifier, "ColorLayers", Layer)
+  openspace.globebrowsing.addLayer(globe.Earth.Identifier, "ColorLayers", snpp.Layer)
 end)
 
 asset.onDeinitialize(function()
-  openspace.globebrowsing.deleteLayer(globe.Earth.Identifier, "ColorLayers", Layer)
+  openspace.globebrowsing.deleteLayer(globe.Earth.Identifier, "ColorLayers", snpp.Layer)
 end)
 
-asset.export("layer", Layer)
-
 
 
 asset.meta = {
diff --git a/modules/globebrowsing/CMakeLists.txt b/modules/globebrowsing/CMakeLists.txt
index 75ec1e9e24..bb1e85d6b6 100644
--- a/modules/globebrowsing/CMakeLists.txt
+++ b/modules/globebrowsing/CMakeLists.txt
@@ -74,6 +74,7 @@ set(HEADER_FILES
   src/tileprovider/texttileprovider.h
   src/tileprovider/tileindextileprovider.h
   src/tileprovider/tileprovider.h
+  src/tileprovider/tileproviderbydate.h
   src/tileprovider/tileproviderbyindex.h
   src/tileprovider/tileproviderbylevel.h
 )
@@ -120,6 +121,7 @@ set(SOURCE_FILES
   src/tileprovider/texttileprovider.cpp
   src/tileprovider/tileindextileprovider.cpp
   src/tileprovider/tileprovider.cpp
+  src/tileprovider/tileproviderbydate.cpp
   src/tileprovider/tileproviderbyindex.cpp
   src/tileprovider/tileproviderbylevel.cpp
 )
diff --git a/modules/globebrowsing/globebrowsingmodule.cpp b/modules/globebrowsing/globebrowsingmodule.cpp
index c6c4ffa7f4..6a9eafccb9 100644
--- a/modules/globebrowsing/globebrowsingmodule.cpp
+++ b/modules/globebrowsing/globebrowsingmodule.cpp
@@ -48,6 +48,7 @@
 #include <modules/globebrowsing/src/tileprovider/temporaltileprovider.h>
 #include <modules/globebrowsing/src/tileprovider/tileindextileprovider.h>
 #include <modules/globebrowsing/src/tileprovider/tileprovider.h>
+#include <modules/globebrowsing/src/tileprovider/tileproviderbydate.h>
 #include <modules/globebrowsing/src/tileprovider/tileproviderbyindex.h>
 #include <modules/globebrowsing/src/tileprovider/tileproviderbylevel.h>
 #include <openspace/camera/camera.h>
@@ -310,6 +311,7 @@ void GlobeBrowsingModule::internalInitialize(const ghoul::Dictionary& dict) {
     fTileProvider->registerClass<TemporalTileProvider>("TemporalTileProvider");
     fTileProvider->registerClass<TileIndexTileProvider>("TileIndexTileProvider");
     fTileProvider->registerClass<SizeReferenceTileProvider>("SizeReferenceTileProvider");
+    fTileProvider->registerClass<TileProviderByDate>("TileProviderByDate");
     fTileProvider->registerClass<TileProviderByLevel>("TileProviderByLevel");
     fTileProvider->registerClass<TileProviderByIndex>("TileProviderByIndex");
 
@@ -338,6 +340,7 @@ std::vector<documentation::Documentation> GlobeBrowsingModule::documentations()
         globebrowsing::SizeReferenceTileProvider::Documentation(),
         globebrowsing::TemporalTileProvider::Documentation(),
         globebrowsing::TileIndexTileProvider::Documentation(),
+        globebrowsing::TileProviderByDate::Documentation(),
         globebrowsing::TileProviderByIndex::Documentation(),
         globebrowsing::TileProviderByLevel::Documentation(),
         globebrowsing::GeoJsonManager::Documentation(),
diff --git a/modules/globebrowsing/shaders/texturetilemapping.glsl b/modules/globebrowsing/shaders/texturetilemapping.glsl
index 9ede2085c0..5ae7ae60c0 100644
--- a/modules/globebrowsing/shaders/texturetilemapping.glsl
+++ b/modules/globebrowsing/shaders/texturetilemapping.glsl
@@ -151,15 +151,17 @@ vec4 getSample#{layerGroup}#{i}(vec2 uv, vec3 levelWeights,
   c = getTexVal(#{layerGroup}[#{i}].pile, levelWeights, uv);
 #elif (#{#{layerGroup}#{i}LayerType} == 5) // TileIndexTileProvider
   c = getTexVal(#{layerGroup}[#{i}].pile, levelWeights, uv);
-#elif (#{#{layerGroup}#{i}LayerType} == 6) // TileProviderByIndex
+#elif (#{#{layerGroup}#{i}LayerType} == 6) // TileProviderByDate
   c = getTexVal(#{layerGroup}[#{i}].pile, levelWeights, uv);
-#elif (#{#{layerGroup}#{i}LayerType} == 7) // TileProviderByLevel
+#elif (#{#{layerGroup}#{i}LayerType} == 7) // TileProviderByIndex
   c = getTexVal(#{layerGroup}[#{i}].pile, levelWeights, uv);
-#elif (#{#{layerGroup}#{i}LayerType} == 8) // SolidColor
+#elif (#{#{layerGroup}#{i}LayerType} == 8) // TileProviderByLevel
+  c = getTexVal(#{layerGroup}[#{i}].pile, levelWeights, uv);
+#elif (#{#{layerGroup}#{i}LayerType} == 9) // SolidColor
   c.rgb = #{layerGroup}[#{i}].color;
-#elif (#{#{layerGroup}#{i}LayerType} == 9) // SpoutImageProvider
+#elif (#{#{layerGroup}#{i}LayerType} == 10) // SpoutImageProvider
   c = getTexVal(#{layerGroup}[#{i}].pile, levelWeights, uv);
-#elif (#{#{layerGroup}#{i}LayerType} == 10) // VideoTileProvider
+#elif (#{#{layerGroup}#{i}LayerType} == 11) // VideoTileProvider
   c = getTexVal(#{layerGroup}[#{i}].pile, levelWeights, uv);
 #endif
 
diff --git a/modules/globebrowsing/src/gpulayergroup.cpp b/modules/globebrowsing/src/gpulayergroup.cpp
index 319ae6ea7c..fff16af0e9 100644
--- a/modules/globebrowsing/src/gpulayergroup.cpp
+++ b/modules/globebrowsing/src/gpulayergroup.cpp
@@ -74,6 +74,7 @@ void GPULayerGroup::setValue(ghoul::opengl::ProgramObject& program,
             case layers::Layer::ID::SizeReferenceTileProvider:
             case layers::Layer::ID::TemporalTileProvider:
             case layers::Layer::ID::TileIndexTileProvider:
+            case layers::Layer::ID::TileProviderByDate:
             case layers::Layer::ID::TileProviderByIndex:
             case layers::Layer::ID::TileProviderByLevel: {
                 const ChunkTilePile& ctp = al.chunkTilePile(
@@ -146,6 +147,7 @@ void GPULayerGroup::bind(ghoul::opengl::ProgramObject& p, const LayerGroup& laye
             case layers::Layer::ID::SizeReferenceTileProvider:
             case layers::Layer::ID::TemporalTileProvider:
             case layers::Layer::ID::TileIndexTileProvider:
+            case layers::Layer::ID::TileProviderByDate:
             case layers::Layer::ID::TileProviderByIndex:
             case layers::Layer::ID::TileProviderByLevel: {
                 gal.gpuChunkTiles.resize(pileSize);
diff --git a/modules/globebrowsing/src/layer.cpp b/modules/globebrowsing/src/layer.cpp
index cd73fa70e3..7c30f94048 100644
--- a/modules/globebrowsing/src/layer.cpp
+++ b/modules/globebrowsing/src/layer.cpp
@@ -130,8 +130,8 @@ namespace {
         std::optional<std::string> type [[codegen::inlist("DefaultTileProvider",
             "SingleImageProvider", "ImageSequenceTileProvider",
             "SizeReferenceTileProvider", "TemporalTileProvider", "TileIndexTileProvider",
-            "TileProviderByIndex", "TileProviderByLevel", "SolidColor",
-            "SpoutImageProvider", "VideoTileProvider")]];
+            "TileProviderByDate", "TileProviderByIndex", "TileProviderByLevel",
+            "SolidColor", "SpoutImageProvider", "VideoTileProvider")]];
 
         // Determine whether the layer is enabled or not. If this value is not specified,
         // the layer is disabled
@@ -342,6 +342,7 @@ Layer::Layer(layers::Group::ID id, const ghoul::Dictionary& layerDict, LayerGrou
             case layers::Layer::ID::SizeReferenceTileProvider:
             case layers::Layer::ID::TemporalTileProvider:
             case layers::Layer::ID::TileIndexTileProvider:
+            case layers::Layer::ID::TileProviderByDate:
             case layers::Layer::ID::TileProviderByIndex:
             case layers::Layer::ID::TileProviderByLevel:
             case layers::Layer::ID::VideoTileProvider:
@@ -513,6 +514,7 @@ void Layer::initializeBasedOnType(layers::Layer::ID id, ghoul::Dictionary initDi
         case layers::Layer::ID::SizeReferenceTileProvider:
         case layers::Layer::ID::TemporalTileProvider:
         case layers::Layer::ID::TileIndexTileProvider:
+        case layers::Layer::ID::TileProviderByDate:
         case layers::Layer::ID::TileProviderByIndex:
         case layers::Layer::ID::TileProviderByLevel:
         case layers::Layer::ID::VideoTileProvider:
@@ -546,6 +548,7 @@ void Layer::addVisibleProperties() {
         case layers::Layer::ID::SizeReferenceTileProvider:
         case layers::Layer::ID::TemporalTileProvider:
         case layers::Layer::ID::TileIndexTileProvider:
+        case layers::Layer::ID::TileProviderByDate:
         case layers::Layer::ID::TileProviderByIndex:
         case layers::Layer::ID::TileProviderByLevel:
         case layers::Layer::ID::VideoTileProvider:
diff --git a/modules/globebrowsing/src/layergroupid.h b/modules/globebrowsing/src/layergroupid.h
index a1d5f159fd..c11fbacc7b 100644
--- a/modules/globebrowsing/src/layergroupid.h
+++ b/modules/globebrowsing/src/layergroupid.h
@@ -84,6 +84,7 @@ struct Layer {
         SizeReferenceTileProvider,
         TemporalTileProvider,
         TileIndexTileProvider,
+        TileProviderByDate,
         TileProviderByIndex,
         TileProviderByLevel,
         SolidColor,
@@ -95,7 +96,7 @@ struct Layer {
     std::string_view identifier;
 };
 
-constexpr std::array<Layer, 11> Layers = {
+constexpr std::array<Layer, 12> Layers = {
     Layer {
         .id = Layer::ID::DefaultTileProvider,
         .identifier = "DefaultTileProvider"
@@ -120,6 +121,10 @@ constexpr std::array<Layer, 11> Layers = {
         .id = Layer::ID::TileIndexTileProvider,
         .identifier = "TileIndexTileProvider"
     },
+    Layer {
+        .id = Layer::ID::TileProviderByDate,
+        .identifier = "TileProviderByDate"
+    },
     Layer {
         .id = Layer::ID::TileProviderByIndex,
         .identifier = "TileProviderByIndex"
diff --git a/modules/globebrowsing/src/tileprovider/tileproviderbydate.cpp b/modules/globebrowsing/src/tileprovider/tileproviderbydate.cpp
new file mode 100644
index 0000000000..968f51bb1f
--- /dev/null
+++ b/modules/globebrowsing/src/tileprovider/tileproviderbydate.cpp
@@ -0,0 +1,190 @@
+/*****************************************************************************************
+ *                                                                                       *
+ * OpenSpace                                                                             *
+ *                                                                                       *
+ * Copyright (c) 2014-2024                                                               *
+ *                                                                                       *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
+ * software and associated documentation files (the "Software"), to deal in the Software *
+ * without restriction, including without limitation the rights to use, copy, modify,    *
+ * merge, publish, distribute, sublicense, and/or sell copies of the Software, and to    *
+ * permit persons to whom the Software is furnished to do so, subject to the following   *
+ * conditions:                                                                           *
+ *                                                                                       *
+ * The above copyright notice and this permission notice shall be included in all copies *
+ * or substantial portions of the Software.                                              *
+ *                                                                                       *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED,   *
+ * INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A         *
+ * PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT    *
+ * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF  *
+ * CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE  *
+ * OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                                         *
+ ****************************************************************************************/
+
+#include <modules/globebrowsing/src/tileprovider/tileproviderbydate.h>
+
+#include <openspace/documentation/documentation.h>
+#include <openspace/engine/globals.h>
+#include <openspace/util/spicemanager.h>
+#include <openspace/util/timemanager.h>
+#include <functional>
+
+namespace {
+    struct [[codegen::Dictionary(TileProviderByDate)]] Parameters {
+        // Specifies the list of tile providers and for which times they are used for. The
+        // tile provider with the earliest time will be used for all dates prior to that
+        // date and the provider with the latest time will be used for all dates
+        // afterwards. In between, a provider is used from the specified time until the
+        // time of the next provider
+        std::map<std::string, ghoul::Dictionary> providers;
+    };
+#include "tileproviderbydate_codegen.cpp"
+} // namespace
+
+namespace openspace::globebrowsing {
+
+documentation::Documentation TileProviderByDate::Documentation() {
+    return codegen::doc<Parameters>("globebrowsing_tileproviderbydate");
+}
+
+TileProviderByDate::TileProviderByDate(const ghoul::Dictionary& dictionary) {
+    ZoneScoped;
+
+    Parameters p = codegen::bake<Parameters>(dictionary);
+
+    // For now we need to inject the LayerGroupID this way. We don't want it to be part of
+    // the parameters struct as that would mean it would be visible to the end user, which
+    // we don't want since this value just comes from whoever creates it, not the user
+    ghoul_assert(dictionary.hasValue<int>("LayerGroupID"), "No Layer Group ID provided");
+    const layers::Group::ID group = static_cast<layers::Group::ID>(
+        dictionary.value<int>("LayerGroupID")
+    );
+
+    for (std::pair<const std::string, ghoul::Dictionary>& prov : p.providers) {
+        prov.second.setValue("LayerGroupID", static_cast<int>(group));
+
+        // Pass down the caching information from the enclosing dictionary
+        if (dictionary.hasValue<std::string>("GlobeName")) {
+            prov.second.setValue("GlobeName", dictionary.value<std::string>("GlobeName"));
+        }
+        layers::Layer::ID typeID = layers::Layer::ID::DefaultTileProvider;
+
+        if (prov.second.hasValue<std::string>("Type")) {
+            const std::string type = prov.second.value<std::string>("Type");
+            typeID = ghoul::from_string<layers::Layer::ID>(type);
+        }
+
+        std::unique_ptr<TileProvider> tp = createFromDictionary(typeID, prov.second);
+        const std::string provId = prov.second.value<std::string>("Identifier");
+        tp->setIdentifier(provId);
+        const std::string providerName = prov.second.value<std::string>("Name");
+        tp->setGuiName(providerName);
+        addPropertySubOwner(tp.get());
+
+        const double time = SpiceManager::ref().ephemerisTimeFromDate(prov.first);
+        _tileProviders.emplace_back(time, std::move(tp));
+    }
+
+    // After we added all tile providers, we need to sort them as they might have been
+    // given in an arbitrary order
+    std::sort(
+        _tileProviders.begin(),
+        _tileProviders.end(),
+        [](const Provider& lhs, const Provider& rhs) {
+            return lhs.startTime < rhs.startTime;
+        }
+    );
+}
+
+void TileProviderByDate::internalInitialize() {
+    for (const Provider& p : _tileProviders) {
+        p.tileProvider->initialize();
+    }
+}
+
+void TileProviderByDate::internalDeinitialize() {
+    for (const Provider& p : _tileProviders) {
+        p.tileProvider->deinitialize();
+    }
+}
+
+Tile TileProviderByDate::tile(const TileIndex& tileIndex) {
+    ZoneScoped;
+
+    return _currentTileProvider ? _currentTileProvider->tile(tileIndex) : Tile();
+}
+
+Tile::Status TileProviderByDate::tileStatus(const TileIndex& index) {
+    return
+        _currentTileProvider ?
+        _currentTileProvider->tileStatus(index) :
+        Tile::Status::Unavailable;
+}
+
+
+TileDepthTransform TileProviderByDate::depthTransform() {
+    return _currentTileProvider ?
+        _currentTileProvider->depthTransform() :
+        TileDepthTransform(0.f, 1.f);
+}
+
+void TileProviderByDate::update() {
+    if (_tileProviders.empty()) {
+        // If there are no tile providers, then there is no work to be done
+        _currentTileProvider = nullptr;
+        return;
+    }
+
+    // First update all tile providers
+    for (const Provider& p : _tileProviders) {
+        p.tileProvider->update();
+    }
+
+    // Then check update our current tile provider pointer
+    const double time = global::timeManager->time().j2000Seconds();
+    ghoul_assert(!_tileProviders.empty(), "There should be tile providers at this point");
+
+    // We use the first tileprovider for all times before the beginning start
+    if (time < _tileProviders.begin()->startTime) {
+        _currentTileProvider = _tileProviders.begin()->tileProvider.get();
+        return;
+    }
+
+    // And the last tileprovider for all times after the end
+    if (time > _tileProviders.back().startTime) {
+        _currentTileProvider = _tileProviders.back().tileProvider.get();
+        return;
+    }
+
+    _currentTileProvider = _tileProviders.begin()->tileProvider.get();
+    for (const Provider& p : _tileProviders) {
+        if (p.startTime > time) {
+            // We have found the first entry that is larger than the current time, which
+            // means that we are done
+            return;
+        }
+
+        _currentTileProvider = p.tileProvider.get();
+    }
+}
+
+void TileProviderByDate::reset() {
+    for (const Provider& p : _tileProviders) {
+        p.tileProvider->reset();
+    }
+}
+
+int TileProviderByDate::minLevel() {
+    return _currentTileProvider ? _currentTileProvider->minLevel() : 1;
+}
+
+int TileProviderByDate::maxLevel() {
+    return _currentTileProvider ? _currentTileProvider->maxLevel() : 1;
+}
+
+float TileProviderByDate::noDataValueAsFloat() {
+    return _currentTileProvider ? _currentTileProvider->noDataValueAsFloat() : 1;
+}
+
+} // namespace openspace::globebrowsing
diff --git a/modules/globebrowsing/src/tileprovider/tileproviderbydate.h b/modules/globebrowsing/src/tileprovider/tileproviderbydate.h
new file mode 100644
index 0000000000..9c2f29179b
--- /dev/null
+++ b/modules/globebrowsing/src/tileprovider/tileproviderbydate.h
@@ -0,0 +1,65 @@
+/*****************************************************************************************
+ *                                                                                       *
+ * OpenSpace                                                                             *
+ *                                                                                       *
+ * Copyright (c) 2014-2024                                                               *
+ *                                                                                       *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
+ * software and associated documentation files (the "Software"), to deal in the Software *
+ * without restriction, including without limitation the rights to use, copy, modify,    *
+ * merge, publish, distribute, sublicense, and/or sell copies of the Software, and to    *
+ * permit persons to whom the Software is furnished to do so, subject to the following   *
+ * conditions:                                                                           *
+ *                                                                                       *
+ * The above copyright notice and this permission notice shall be included in all copies *
+ * or substantial portions of the Software.                                              *
+ *                                                                                       *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED,   *
+ * INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A         *
+ * PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT    *
+ * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF  *
+ * CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE  *
+ * OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                                         *
+ ****************************************************************************************/
+
+#ifndef __OPENSPACE_MODULE_GLOBEBROWSING___TILEPROVIDER__TILEPROVIDERBYDATE___H__
+#define __OPENSPACE_MODULE_GLOBEBROWSING___TILEPROVIDER__TILEPROVIDERBYDATE___H__
+
+#include <modules/globebrowsing/src/tileprovider/tileprovider.h>
+
+#include <vector>
+
+namespace openspace::globebrowsing {
+
+class TileProviderByDate : public TileProvider {
+public:
+    TileProviderByDate(const ghoul::Dictionary& dictionary);
+
+    Tile tile(const TileIndex& tileIndex) override final;
+    Tile::Status tileStatus(const TileIndex& index) override final;
+    TileDepthTransform depthTransform() override final;
+    void update() override final;
+    void reset() override final;
+    int minLevel() override final;
+    int maxLevel() override final;
+    float noDataValueAsFloat() override final;
+
+    static documentation::Documentation Documentation();
+
+private:
+    struct Provider {
+        // The time at which this provider becomes valid
+        double startTime = 0.0;
+        std::unique_ptr<TileProvider> tileProvider;
+    };
+
+    std::vector<Provider> _tileProviders;
+    TileProvider* _currentTileProvider = nullptr;
+
+    void internalInitialize() override final;
+    void internalDeinitialize() override final;
+};
+
+} // namespace openspace::globebrowsing
+
+#endif // __OPENSPACE_MODULE_GLOBEBROWSING___TILEPROVIDER__TILEPROVIDERBYDATE___H__

From 4a3e8524e2975c5c10ec6884b93b7d371cd8ccf1 Mon Sep 17 00:00:00 2001
From: Alexander Bock <alexander.bock@liu.se>
Date: Thu, 18 Jul 2024 11:59:08 +0200
Subject: [PATCH 539/701] Remove Git Status from on-screen message

---
 CMakeLists.txt                          | 12 ------------
 support/cmake/openspace_header.template |  3 +--
 2 files changed, 1 insertion(+), 14 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index e5b4a10d4b..ea84b63827 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -88,18 +88,6 @@ execute_process(
   OUTPUT_STRIP_TRAILING_WHITESPACE
 )
 
-# See if working directory is clean or not
-execute_process(
-  COMMAND git diff-index --quiet HEAD --
-  WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}
-  RESULT_VARIABLE OPENSPACE_GIT_STATUS_RETURN
-)
-if (NOT OPENSPACE_GIT_STATUS_RETURN EQUAL 0)
-  set(OPENSPACE_GIT_STATUS "uncommitted changes")
-else ()
-  set(OPENSPACE_GIT_STATUS "")
-endif ()
-
 if (MSVC)
   option(OPENSPACE_BREAK_ON_FLOATING_POINT_EXCEPTION "Raise exceptions when encountering Inf's or Nan's in floating point numbers" OFF)
 
diff --git a/support/cmake/openspace_header.template b/support/cmake/openspace_header.template
index bae418ab74..c8369ab938 100644
--- a/support/cmake/openspace_header.template
+++ b/support/cmake/openspace_header.template
@@ -43,8 +43,7 @@ constexpr std::string_view OPENSPACE_VERSION_STRING_FULL = "@OPENSPACE_VERSION_M
 
 constexpr std::string_view OPENSPACE_GIT_BRANCH = "@OPENSPACE_GIT_BRANCH@";
 constexpr std::string_view OPENSPACE_GIT_COMMIT = "@OPENSPACE_GIT_COMMIT@";
-constexpr std::string_view OPENSPACE_GIT_STATUS = "@OPENSPACE_GIT_STATUS@";
-constexpr std::string_view OPENSPACE_GIT_FULL = "@OPENSPACE_GIT_BRANCH@@@OPENSPACE_GIT_COMMIT@ @OPENSPACE_GIT_STATUS@";
+constexpr std::string_view OPENSPACE_GIT_FULL = "@OPENSPACE_GIT_BRANCH@@@OPENSPACE_GIT_COMMIT@";
 
 } // namespace openspace
 

From aa99f9d6cbdd52efd23ec6bc34a8cd8fe570a80e Mon Sep 17 00:00:00 2001
From: Alexander Bock <alexander.bock@liu.se>
Date: Thu, 18 Jul 2024 12:01:47 +0200
Subject: [PATCH 540/701] No longer enforce a scale of 1 for
 screenspacedashboards

---
 modules/base/rendering/screenspacedashboard.cpp | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/modules/base/rendering/screenspacedashboard.cpp b/modules/base/rendering/screenspacedashboard.cpp
index e6ad767d9a..736e8555be 100644
--- a/modules/base/rendering/screenspacedashboard.cpp
+++ b/modules/base/rendering/screenspacedashboard.cpp
@@ -85,9 +85,6 @@ ScreenSpaceDashboard::ScreenSpaceDashboard(const ghoul::Dictionary& dictionary)
     _useMainDashboard = p.useMainDashboard.value_or(_useMainDashboard);
     addProperty(_useMainDashboard);
 
-    _scale = 1.f;
-    _scale.setMaxValue(15.f);
-
     if (_useMainDashboard && p.items.has_value()) {
         throw ghoul::RuntimeError("Cannot specify items when using the main dashboard");
     }
@@ -97,7 +94,7 @@ ScreenSpaceDashboard::ScreenSpaceDashboard(const ghoul::Dictionary& dictionary)
     }
 
     if (p.items.has_value()) {
-        ghoul_assert(_useMainDashboard, "Cannot add items to the main dashboard");
+        ghoul_assert(!_useMainDashboard, "Cannot add items to the main dashboard");
         for (const ghoul::Dictionary& item : *p.items) {
             std::unique_ptr<DashboardItem> i = DashboardItem::createFromDictionary(item);
             _dashboard.addDashboardItem(std::move(i));

From 99a976a53cde1c29c129cacfc023c9ccec8a0302 Mon Sep 17 00:00:00 2001
From: Alexander Bock <alexander.bock@liu.se>
Date: Thu, 18 Jul 2024 12:02:09 +0200
Subject: [PATCH 541/701] Add an example to show the current in-game time in a
 screenspace object (closes #3312)

---
 data/assets/examples/screenspacedate.asset | 44 ++++++++++++++++++++++
 1 file changed, 44 insertions(+)
 create mode 100644 data/assets/examples/screenspacedate.asset

diff --git a/data/assets/examples/screenspacedate.asset b/data/assets/examples/screenspacedate.asset
new file mode 100644
index 0000000000..4b3b154ce6
--- /dev/null
+++ b/data/assets/examples/screenspacedate.asset
@@ -0,0 +1,44 @@
+local Dashboard = {
+  Identifier = "ScreenSpaceTime",
+  Name = "Time",
+  Type = "ScreenSpaceDashboard",
+  FaceCamera = false,
+  Scale = 3.0,
+  Items = {
+    {
+      Type = "DashboardItemDate",
+      Identifier = "Date",
+      GuiName = "Date",
+      FontSize = 72,
+      FormatString = "{}",
+      TimeFormat = "YYYY MON DD HR:MN:SC.### ::RND"
+    }
+  }
+}
+
+
+asset.onInitialize(function()
+  openspace.addScreenSpaceRenderable(Dashboard)
+
+  openspace.setPropertyValueSingle("ScreenSpace.ScreenSpaceTime.Size", {0.000000,0.000000,640.000000,320.000000})
+
+end)
+
+asset.onDeinitialize(function()
+  openspace.addScreenSpaceRenderable(Dashboard)
+end)
+
+asset.export(Dashboard)
+
+
+
+asset.meta = {
+  Name = "ScreenSpace - Date",
+  Description = [[
+    This asset provides a Date dashboard item that is shown on a screen space object.
+    This can be place on a dome surface to show the current time to the audience.
+  ]],
+  Author = "OpenSpace Team",
+  URL = "http://openspaceproject.com",
+  License = "MIT license"
+}

From 91cf916321626a8672d458f1931e86a8c576a894 Mon Sep 17 00:00:00 2001
From: Andreas Engberg <adde.engberg@gmail.com>
Date: Fri, 5 Jul 2024 14:49:27 +0200
Subject: [PATCH 542/701] Add server name to parallelpeer authentication, used
 as unique identifier on wormhole server

---
 .../openspace/network/parallelconnection.h    |  2 +-
 include/openspace/network/parallelpeer.h      |  2 ++
 src/network/parallelpeer.cpp                  | 31 ++++++++++++++++++-
 src/network/parallelpeer_lua.inl              |  4 ++-
 4 files changed, 36 insertions(+), 3 deletions(-)

diff --git a/include/openspace/network/parallelconnection.h b/include/openspace/network/parallelconnection.h
index 60f67b7172..b17ef6ae21 100644
--- a/include/openspace/network/parallelconnection.h
+++ b/include/openspace/network/parallelconnection.h
@@ -86,7 +86,7 @@ public:
     ParallelConnection::Message receiveMessage();
 
     // Gonna do some UTF-like magic once we reach 255 to introduce a second byte or so
-    static constexpr uint8_t ProtocolVersion = 6;
+    static constexpr uint8_t ProtocolVersion = 7;
 
 private:
     std::unique_ptr<ghoul::io::TcpSocket> _socket;
diff --git a/include/openspace/network/parallelpeer.h b/include/openspace/network/parallelpeer.h
index 734ba6e8f2..6fa11ea13c 100644
--- a/include/openspace/network/parallelpeer.h
+++ b/include/openspace/network/parallelpeer.h
@@ -52,6 +52,7 @@ public:
     void connect();
     void setPort(std::string port);
     void setAddress(std::string address);
+    void setServerName(std::string name);
     void setName(std::string name);
     bool isHost();
     const std::string& hostName();
@@ -97,6 +98,7 @@ private:
 
     properties::StringProperty _password;
     properties::StringProperty _hostPassword;
+    properties::StringProperty _serverName;
 
     // While the port should in theory be an int,
     // we use a StringProperty to avoid a slider in the GUI.
diff --git a/src/network/parallelpeer.cpp b/src/network/parallelpeer.cpp
index 6fbda61212..1fbd36d470 100644
--- a/src/network/parallelpeer.cpp
+++ b/src/network/parallelpeer.cpp
@@ -85,6 +85,13 @@ namespace {
         openspace::properties::Property::Visibility::AdvancedUser
     };
 
+    constexpr openspace::properties::Property::PropertyInfo ServerNameInfo = {
+        "ServerName",
+        "Server Name",
+        "The name of the server instance to join.",
+        openspace::properties::Property::Visibility::AdvancedUser
+    };
+
     constexpr openspace::properties::Property::PropertyInfo BufferTimeInfo = {
         "BufferTime",
         "Buffer Time",
@@ -123,6 +130,7 @@ ParallelPeer::ParallelPeer()
     , _port(PortInfo)
     , _address(AddressInfo)
     , _name(NameInfo)
+    , _serverName(ServerNameInfo)
     , _bufferTime(BufferTimeInfo, 0.2f, 0.01f, 5.0f)
     , _timeKeyframeInterval(TimeKeyFrameInfo, 0.1f, 0.f, 1.f)
     , _cameraKeyframeInterval(CameraKeyFrameInfo, 0.1f, 0.f, 1.f)
@@ -130,6 +138,7 @@ ParallelPeer::ParallelPeer()
     , _connection(nullptr)
 {
     addProperty(_name);
+    addProperty(_serverName);
     addProperty(_port);
     addProperty(_address);
     addProperty(_bufferTime);
@@ -190,6 +199,12 @@ void ParallelPeer::sendAuthentication() {
     }
     const uint16_t hostPasswordSize = static_cast<uint16_t>(hostPassword.size());
 
+    std::string serverName = _serverName;
+    if (serverName.size() > std::numeric_limits<uint8_t>::max()) {
+        serverName.resize(std::numeric_limits<uint8_t>::max());
+    }
+    const uint8_t serverNameSize = static_cast<uint8_t>(serverName.size());
+
     std::string name = _name;
     if (name.size() > std::numeric_limits<uint8_t>::max()) {
         name.resize(std::numeric_limits<uint8_t>::max());
@@ -200,9 +215,11 @@ void ParallelPeer::sendAuthentication() {
     // Total size of the buffer
     const size_t size =
         sizeof(uint16_t) + // password length
-        passwordSize +     // password
+        passwordSize     + // password
         sizeof(uint16_t) + // host password length
         hostPasswordSize + // host password
+        sizeof(uint8_t) + // server name length
+        serverNameSize   + // server name
         sizeof(uint8_t)  + // name length
         nameLength;        // name
 
@@ -226,6 +243,14 @@ void ParallelPeer::sendAuthentication() {
     );
     buffer.insert(buffer.end(), hostPassword.begin(), hostPassword.end());
 
+    // Write the server name to the buffer
+    buffer.insert(
+        buffer.end(),
+        reinterpret_cast<const char*>(&serverNameSize),
+        reinterpret_cast<const char*>(&serverNameSize) + sizeof(uint8_t)
+    );
+    buffer.insert(buffer.end(), serverName.begin(), serverName.end());
+
     // Write the length of the nodes name to buffer
     buffer.insert(
         buffer.end(),
@@ -485,6 +510,10 @@ void ParallelPeer::setAddress(std::string address) {
     _address = std::move(address);
 }
 
+void ParallelPeer::setServerName(std::string name) {
+    _serverName = std::move(name);
+}
+
 void ParallelPeer::setName(std::string name) {
     _name = std::move(name);
 }
diff --git a/src/network/parallelpeer_lua.inl b/src/network/parallelpeer_lua.inl
index 00be96d35a..279fe057fc 100644
--- a/src/network/parallelpeer_lua.inl
+++ b/src/network/parallelpeer_lua.inl
@@ -25,7 +25,8 @@
 namespace {
 
 [[codegen::luawrap]] void joinServer(std::string port, std::string address,
-                                     std::string password, std::string hostpassword = "",
+                                     std::string serverName, std::string password,
+                                     std::string hostpassword = "",
                                      std::string name = "Anonymous") {
     using namespace openspace;
     if (global::windowDelegate->isMaster()) {
@@ -34,6 +35,7 @@ namespace {
         peer->setAddress(std::move(address));
         peer->setPassword(std::move(password));
         peer->setHostPassword(std::move(hostpassword));
+        peer->setServerName(std::move(serverName));
         peer->setName(std::move(name));
         peer->connect();
     }

From e46cb269d03d5c91660c99cccab89f28eafeb612 Mon Sep 17 00:00:00 2001
From: Alexander Bock <alexander.bock@liu.se>
Date: Thu, 18 Jul 2024 13:59:05 +0200
Subject: [PATCH 543/701] Update WebGUI hash

---
 data/assets/default_keybindings.asset | 4 ++--
 data/assets/util/webgui.asset         | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/data/assets/default_keybindings.asset b/data/assets/default_keybindings.asset
index f12f872467..9e14ea494c 100644
--- a/data/assets/default_keybindings.asset
+++ b/data/assets/default_keybindings.asset
@@ -274,10 +274,10 @@ asset.onDeinitialize(function()
   openspace.action.removeAction(ReloadGui)
 
   openspace.clearKey("Shift+Up")
-  openspace.actiion.removeAction(DateToNowImmediate)
+  openspace.action.removeAction(DateToNowImmediate)
 
   openspace.clearKey("Up")
-  openspace.actiion.removeAction(DateToNowInterpolate)
+  openspace.action.removeAction(DateToNowInterpolate)
 
   openspace.clearKey("Shift+Down")
   openspace.action.removeAction(RealTimeDeltaStepImmediate)
diff --git a/data/assets/util/webgui.asset b/data/assets/util/webgui.asset
index 36dae8ce95..6b757eb07d 100644
--- a/data/assets/util/webgui.asset
+++ b/data/assets/util/webgui.asset
@@ -4,7 +4,7 @@ local guiCustomization = asset.require("customization/gui")
 
 
 -- Select which commit hashes to use for the frontend and backend
-local frontendHash = "654c79e7f30e61249b93be509758ac675022e5f3"
+local frontendHash = "95ed7fb5853d27d2b879f6f409f3101a018e03ce"
 
 local frontend = asset.resource({
   Identifier = "WebGuiFrontend",

From 79dce8acfac120abf4597992ca854890d9146be0 Mon Sep 17 00:00:00 2001
From: Emma Broman <emma.broman@liu.se>
Date: Thu, 18 Jul 2024 14:09:30 +0200
Subject: [PATCH 544/701] Fix broken light pollution update

Broke in DU Update #3335 due to updated identifiers
---
 data/assets/nightsky/light_pollution.asset | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/data/assets/nightsky/light_pollution.asset b/data/assets/nightsky/light_pollution.asset
index 4dba3318bf..c8f7269839 100644
--- a/data/assets/nightsky/light_pollution.asset
+++ b/data/assets/nightsky/light_pollution.asset
@@ -62,7 +62,7 @@ local SetLightPollutionLevel1 = {
     openspace.globebrowsing.setNodePositionFromCamera("LightPollutionSphere", true)
     openspace.setPropertyValueSingle("Scene.LightPollutionSphere.Renderable.Enabled", true)
     openspace.setPropertyValueSingle("Scene.LightPollutionSphere.Renderable.Fade", 1.0)
-    openspace.setPropertyValueSingle("Scene.MilkyWay.Renderable.Fade", 0.9, 0.3)
+    openspace.setPropertyValueSingle("Scene.AllSky_Visible.Renderable.Fade", 0.9, 0.3)
     openspace.setPropertyValueSingle("Scene.LightPollutionSphere.Renderable.Opacity", 0.01, 0.5)
     openspace.setPropertyValueSingle("Scene.Stars.Renderable.MagnitudeExponent", 6.1, 0.3)
   ]],
@@ -78,7 +78,7 @@ local SetLightPollutionLevel2 = {
     openspace.globebrowsing.setNodePositionFromCamera("LightPollutionSphere", true)
     openspace.setPropertyValueSingle("Scene.LightPollutionSphere.Renderable.Enabled", true)
     openspace.setPropertyValueSingle("Scene.LightPollutionSphere.Renderable.Fade", 1.0)
-    openspace.setPropertyValueSingle("Scene.MilkyWay.Renderable.Fade", 0.8, 0.3)
+    openspace.setPropertyValueSingle("Scene.AllSky_Visible.Renderable.Fade", 0.8, 0.3)
     openspace.setPropertyValueSingle("Scene.LightPollutionSphere.Renderable.Opacity", 0.02, 0.5)
     openspace.setPropertyValueSingle("Scene.Stars.Renderable.MagnitudeExponent", 6.0, 0.3)
   ]],
@@ -94,7 +94,7 @@ local SetLightPollutionLevel3 = {
     openspace.globebrowsing.setNodePositionFromCamera("LightPollutionSphere", true)
     openspace.setPropertyValueSingle("Scene.LightPollutionSphere.Renderable.Enabled", true)
     openspace.setPropertyValueSingle("Scene.LightPollutionSphere.Renderable.Fade", 1.0)
-    openspace.setPropertyValueSingle("Scene.MilkyWay.Renderable.Fade", 0.7, 0.3)
+    openspace.setPropertyValueSingle("Scene.AllSky_Visible.Renderable.Fade", 0.7, 0.3)
     openspace.setPropertyValueSingle("Scene.LightPollutionSphere.Renderable.Opacity", 0.03, 0.5)
     openspace.setPropertyValueSingle("Scene.Stars.Renderable.MagnitudeExponent", 5.9, 0.3)
   ]],
@@ -110,7 +110,7 @@ local SetLightPollutionLevel4 = {
     openspace.globebrowsing.setNodePositionFromCamera("LightPollutionSphere", true)
     openspace.setPropertyValueSingle("Scene.LightPollutionSphere.Renderable.Enabled", true)
     openspace.setPropertyValueSingle("Scene.LightPollutionSphere.Renderable.Fade", 1.0)
-    openspace.setPropertyValueSingle("Scene.MilkyWay.Renderable.Fade", 0.6, 0.3)
+    openspace.setPropertyValueSingle("Scene.AllSky_Visible.Renderable.Fade", 0.6, 0.3)
     openspace.setPropertyValueSingle("Scene.LightPollutionSphere.Renderable.Opacity", 0.04, 0.5)
     openspace.setPropertyValueSingle("Scene.Stars.Renderable.MagnitudeExponent", 5.8, 0.3)
   ]],
@@ -126,7 +126,7 @@ local SetLightPollutionLevel5 = {
     openspace.globebrowsing.setNodePositionFromCamera("LightPollutionSphere", true)
     openspace.setPropertyValueSingle("Scene.LightPollutionSphere.Renderable.Enabled", true)
     openspace.setPropertyValueSingle("Scene.LightPollutionSphere.Renderable.Fade", 1.0)
-    openspace.setPropertyValueSingle("Scene.MilkyWay.Renderable.Fade", 0.5, 0.3)
+    openspace.setPropertyValueSingle("Scene.AllSky_Visible.Renderable.Fade", 0.5, 0.3)
     openspace.setPropertyValueSingle("Scene.LightPollutionSphere.Renderable.Opacity", 0.05, 0.5)
     openspace.setPropertyValueSingle("Scene.Stars.Renderable.MagnitudeExponent", 5.8, 0.4)
   ]],
@@ -142,7 +142,7 @@ local SetLightPollutionLevel6 = {
     openspace.globebrowsing.setNodePositionFromCamera("LightPollutionSphere", true)
     openspace.setPropertyValueSingle("Scene.LightPollutionSphere.Renderable.Enabled", true)
     openspace.setPropertyValueSingle("Scene.LightPollutionSphere.Renderable.Fade", 1.0)
-    openspace.setPropertyValueSingle("Scene.MilkyWay.Renderable.Fade", 0.4, 0.3)
+    openspace.setPropertyValueSingle("Scene.AllSky_Visible.Renderable.Fade", 0.4, 0.3)
     openspace.setPropertyValueSingle("Scene.LightPollutionSphere.Renderable.Opacity", 0.06, 0.5)
     openspace.setPropertyValueSingle("Scene.Stars.Renderable.MagnitudeExponent", 5.7, 0.4)
   ]],
@@ -158,7 +158,7 @@ local SetLightPollutionLevel7 = {
     openspace.globebrowsing.setNodePositionFromCamera("LightPollutionSphere", true)
     openspace.setPropertyValueSingle("Scene.LightPollutionSphere.Renderable.Enabled", true)
     openspace.setPropertyValueSingle("Scene.LightPollutionSphere.Renderable.Fade", 1.0)
-    openspace.setPropertyValueSingle("Scene.MilkyWay.Renderable.Fade", 0.3, 0.3)
+    openspace.setPropertyValueSingle("Scene.AllSky_Visible.Renderable.Fade", 0.3, 0.3)
     openspace.setPropertyValueSingle("Scene.LightPollutionSphere.Renderable.Opacity", 0.07, 0.5)
     openspace.setPropertyValueSingle("Scene.Stars.Renderable.MagnitudeExponent", 5.6, 0.4)
   ]],
@@ -174,7 +174,7 @@ local SetLightPollutionLevel8 = {
     openspace.globebrowsing.setNodePositionFromCamera("LightPollutionSphere", true)
     openspace.setPropertyValueSingle("Scene.LightPollutionSphere.Renderable.Enabled", true)
     openspace.setPropertyValueSingle("Scene.LightPollutionSphere.Renderable.Fade", 1.0)
-    openspace.setPropertyValueSingle("Scene.MilkyWay.Renderable.Fade", 0.2, 0.3)
+    openspace.setPropertyValueSingle("Scene.AllSky_Visible.Renderable.Fade", 0.2, 0.3)
     openspace.setPropertyValueSingle("Scene.LightPollutionSphere.Renderable.Opacity", 0.08, 0.5)
     openspace.setPropertyValueSingle("Scene.Stars.Renderable.MagnitudeExponent", 5.5, 0.4)
   ]],
@@ -191,7 +191,7 @@ local SetLightPollutionLevel9 = {
     openspace.setPropertyValueSingle("Scene.LightPollutionSphere.Renderable.Enabled", true)
     openspace.setPropertyValueSingle("Scene.LightPollutionSphere.Renderable.Fade", 1.0)
     openspace.setPropertyValueSingle("Scene.LightPollutionSphere.Renderable.Opacity", 0.09, 0.5)
-    openspace.setPropertyValueSingle("Scene.MilkyWay.Renderable.Fade", 0.1, 0.3)
+    openspace.setPropertyValueSingle("Scene.AllSky_Visible.Renderable.Fade", 0.1, 0.3)
     openspace.setPropertyValueSingle("Scene.Stars.Renderable.MagnitudeExponent", 5.4, 0.4)
   ]],
   Documentation = "Adds a light pollution sphere and lowers the level of the stars by 0.9",
@@ -205,7 +205,7 @@ local UndoLightPollution = {
   Command = [[
     openspace.setPropertyValueSingle("Scene.LightPollutionSphere.Renderable.Fade", 0.0, 0.3)
     openspace.setPropertyValueSingle("Scene.Stars.Renderable.MagnitudeExponent", 6.2, 0.3)
-    openspace.setPropertyValueSingle("Scene.MilkyWay.Renderable.Fade", 1.0, 0.3)
+    openspace.setPropertyValueSingle("Scene.AllSky_Visible.Renderable.Fade", 1.0, 0.3)
     ]],
   Documentation = "Hides the light pollution sphere and resets the stars",
   GuiPath = "/Night Sky/Light Pollution",

From 3566296f202bb2e4d3fc86a0487203549c1d9526 Mon Sep 17 00:00:00 2001
From: Alexander Bock <alexander.bock@liu.se>
Date: Thu, 18 Jul 2024 14:35:42 +0200
Subject: [PATCH 545/701] Only provide a single Lua function for creating debug
 axes

---
 modules/debugging/debuggingmodule.cpp     |  3 +-
 modules/debugging/debuggingmodule_lua.inl | 55 -----------------------
 modules/debugging/scripts/axes.lua        | 36 ++++++++++-----
 3 files changed, 25 insertions(+), 69 deletions(-)

diff --git a/modules/debugging/debuggingmodule.cpp b/modules/debugging/debuggingmodule.cpp
index 5781dc60f2..1a38bf8cb0 100644
--- a/modules/debugging/debuggingmodule.cpp
+++ b/modules/debugging/debuggingmodule.cpp
@@ -161,8 +161,7 @@ scripting::LuaLibrary DebuggingModule::luaLibrary() const {
             codegen::lua::RenderCameraPath,
             codegen::lua::RemoveRenderedCameraPath,
             codegen::lua::RenderPathControlPoints,
-            codegen::lua::RemovePathControlPoints,
-            codegen::lua::AddCartesianAxes
+            codegen::lua::RemovePathControlPoints
         },
         .scripts = {
             absPath("${MODULE_DEBUGGING}/scripts/axes.lua")
diff --git a/modules/debugging/debuggingmodule_lua.inl b/modules/debugging/debuggingmodule_lua.inl
index 06d543cc1e..63c5b9c106 100644
--- a/modules/debugging/debuggingmodule_lua.inl
+++ b/modules/debugging/debuggingmodule_lua.inl
@@ -247,61 +247,6 @@ constexpr glm::vec3 OrientationLineColor = glm::vec3(0.0, 1.0, 1.0);
     );
 }
 
-/**
- * Adds a set of Cartesian axes to the scene graph node identified by the first string, to
- * illustrate its local coordinate system. The second (optional) argument is a scale
- * value, in meters.
- */
-[[codegen::luawrap]] void addCartesianAxes(std::string nodeIdentifier,
-                                           std::optional<double> scale)
-{
-    using namespace openspace;
-    SceneGraphNode* n = global::renderEngine->scene()->sceneGraphNode(nodeIdentifier);
-    if (!n) {
-        throw ghoul::lua::LuaError("Unknown scene graph node: " + nodeIdentifier);
-    }
-
-    if (!scale.has_value()) {
-        scale = 2.0 * n->boundingSphere();
-        if (n->boundingSphere() <= 0.0) {
-            LWARNINGC(
-                "Debugging: Cartesian Axes",
-                "Using zero bounding sphere for scale of created axes. You need to set "
-                "the scale manually for them to be visible"
-            );
-            scale = 1.0;
-        }
-    }
-
-    const std::string identifier = makeIdentifier(nodeIdentifier + "_AxesXYZ");
-    const std::string& axes = "{"
-        "Identifier = '" + identifier + "',"
-        "Parent = '" + nodeIdentifier + "',"
-        "Transform = { "
-            "Scale = {"
-                "Type = 'StaticScale',"
-                "Scale = " + std::to_string(*scale) + ""
-            "}"
-        "},"
-        "Renderable = {"
-            "Type = 'RenderableCartesianAxes',"
-            "Enabled = true,"
-            "XColor = { 1.0, 0.0, 0.0 },"
-            "YColor = { 0.0, 1.0, 0.0 },"
-            "ZColor = { 0.0, 0.0, 1.0 }"
-        "},"
-        "GUI = {"
-            "Name = '" + identifier + "',"
-            "Path = '" + DebuggingGuiPath + "/Coordiante Systems'"
-        "}"
-    "}";
-
-    global::scriptEngine->queueScript(
-        std::format("openspace.addSceneGraphNode({});", axes),
-        scripting::ScriptEngine::ShouldBeSynchronized::Yes,
-        scripting::ScriptEngine::ShouldSendToRemote::Yes
-    );
-}
 
 #include "debuggingmodule_lua_codegen.cpp"
 
diff --git a/modules/debugging/scripts/axes.lua b/modules/debugging/scripts/axes.lua
index 4fa5dac1f1..d6fbda714d 100644
--- a/modules/debugging/scripts/axes.lua
+++ b/modules/debugging/scripts/axes.lua
@@ -1,35 +1,47 @@
 openspace.debugging.documentation = {
   {
     Name = "createCoordinateAxes",
-    Arguments = {},
+    Arguments = {
+      { "nodeIdentifier", "String?" },
+      { "scale", "Number?" }
+    },
     Documentation = [[
       Creates a new scene graph node that show the coordinate system used for the
-      currently selected focus node.
+      currently selected focus node. The first argument specifies the name of the
+      scene graph node for which the axes should be added. If this parameter is
+      not specified, the current focus node is used instead. The second argument
+      provides the length of the coordinate axis in meters. If this value is not
+      specified 2.5 times the interaction sphere of the selected node is used
+      instead.
     ]]
   }
 }
 
-openspace.debugging.createCoordinateAxes = function ()
-  local anchor = openspace.navigation.getNavigationState().Anchor
-  local radius = openspace.propertyValue("Scene." .. anchor .. ".EvaluatedInteractionSphere")
+openspace.debugging.createCoordinateAxes = function (nodeIdentifier, scale)
+  local node = nodeIdentifier or openspace.navigation.getNavigationState().Anchor
+  local sphere = openspace.propertyValue("Scene." .. node .. ".EvaluatedInteractionSphere")
+  if sphere == -1 then
+    sphere = 1
+  end
+  local size = scale or sphere * 2.5
 
-  local node = {
-    Identifier = anchor .. "_DebugAxes",
-    Parent = anchor,
+  local nodespec = {
+    Identifier = node .. "_DebugAxes",
+    Parent = node,
     Transform = {
       Scale = {
         Type = "StaticScale",
-        Scale = radius * 2.5
+        Scale = size
       }
     },
     Renderable = {
       Type = "RenderableCartesianAxes"
     },
     GUI = {
-      Name = anchor .. " (Debug Axes)",
-      Path = openspace.propertyValue("Scene." .. anchor .. ".GuiPath")
+      Name = node .. " (Debug Axes)",
+      Path = openspace.propertyValue("Scene." .. node .. ".GuiPath")
     }
   }
 
-  openspace.addSceneGraphNode(node)
+  openspace.addSceneGraphNode(nodespec)
 end

From c0b4103d46f951243a2a29f25eaa5f5c935cf989 Mon Sep 17 00:00:00 2001
From: Emma Broman <emma.broman@liu.se>
Date: Thu, 18 Jul 2024 15:26:27 +0200
Subject: [PATCH 546/701] Change default value for IsLocal for actions to false
 (closes #3194)

---
 include/openspace/interaction/action.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/include/openspace/interaction/action.h b/include/openspace/interaction/action.h
index 50e34439c3..6a69dfcf87 100644
--- a/include/openspace/interaction/action.h
+++ b/include/openspace/interaction/action.h
@@ -63,7 +63,7 @@ struct Action {
     /// current OpenSpace instance. If it is `No`, it is synchronized to other OpenSpace
     /// instances, for example other nodes in a cluster environment, or to other OpenSpace
     /// instances using a parallel connection
-    IsLocal isLocal = IsLocal::Yes;
+    IsLocal isLocal = IsLocal::No;
 };
 
 } // namespace openspace::interaction

From ca823e1bb05777cbd32b5bf1512d2a42544a054f Mon Sep 17 00:00:00 2001
From: Malin E <malin.ejdbo@gmail.com>
Date: Thu, 18 Jul 2024 15:46:02 +0200
Subject: [PATCH 547/701] Update Ghoul

* Fix uniform warning for model projections
---
 ext/ghoul | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ext/ghoul b/ext/ghoul
index bb3695cc14..2dad49f3c1 160000
--- a/ext/ghoul
+++ b/ext/ghoul
@@ -1 +1 @@
-Subproject commit bb3695cc14b12e26d46bc06914715200417c879e
+Subproject commit 2dad49f3c127e16dd3fd14964b2761147bfd1d6f

From 04fc890879b54975cec7893307c7abb5801c7830 Mon Sep 17 00:00:00 2001
From: Malin E <malin.ejdbo@gmail.com>
Date: Thu, 18 Jul 2024 17:33:05 +0200
Subject: [PATCH 548/701] Update Ghoul (Temporary hack to fix osmodel reader)

---
 ext/ghoul | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ext/ghoul b/ext/ghoul
index 2dad49f3c1..6907aaf116 160000
--- a/ext/ghoul
+++ b/ext/ghoul
@@ -1 +1 @@
-Subproject commit 2dad49f3c127e16dd3fd14964b2761147bfd1d6f
+Subproject commit 6907aaf116b3b571760a8fec00f68263f514f6b1

From 77a84be5ab64cfbef2717f8099bf82b86f069ecc Mon Sep 17 00:00:00 2001
From: Alexander Bock <mail@alexanderbock.eu>
Date: Sat, 27 Jul 2024 11:33:01 +0200
Subject: [PATCH 549/701] Update deploy script to also build Tracy version

---
 deploy.bat => support/deploy.bat | 112 ++++++++++++++++++++++++-------
 1 file changed, 86 insertions(+), 26 deletions(-)
 rename deploy.bat => support/deploy.bat (55%)

diff --git a/deploy.bat b/support/deploy.bat
similarity index 55%
rename from deploy.bat
rename to support/deploy.bat
index 6f05c1eb1a..edd2eb85dc 100644
--- a/deploy.bat
+++ b/support/deploy.bat
@@ -1,43 +1,106 @@
 @echo off
+setlocal
 
+:: This script might have been executed from the support folder
+if NOT exist openspace.cfg cd ..
+
+call :RemoveFolders
+
+call :VSRedist
+
+:: Build with tracy
+echo ## Build with Tracy
+call :RunCMake build-deploy-tracy, 1
+call :Build build-deploy-tracy
+
+:: Save the OpenSpace.exe with Tracy
+move bin\RelWithDebInfo\OpenSpace.exe .
+ren OpenSpace.exe OpenSpace-Tracy.exe
+rmdir /S /Q bin
+
+:: Build without tracy
+echo ## Build without Tracy
+call :RunCMake build-deploy
+call :Build build-deploy
+
+echo ### Save the PDB files
+"C:\Program Files\7-Zip\7z.exe" a pdbs.zip bin/RelWithDebInfo/*.pdb
+
+call :PostBuildCleanup
+
+move OpenSpace-Tracy.exe bin
+
+call :ZipDistributable OpenSpace-minimal
+if exist sync call :ZipDistributable OpenSpace, 1
+
+echo ### Clean up
+rmdir /S /Q bin
+del vc_redist.x64.exe
+if exist bin-old move bin-old bin
+if exist build-deploy rmdir /S /Q build-deploy
+if exist build-deploy-tracy rmdir /S /Q build-deploy-tracy
+exit /b 0
+
+
+
+:RemoveFolders
 echo ### Removing old folders
 if exist bin-old rmdir /S /Q bin-old
 if exist build-deploy rmdir /S /Q build-deploy
+if exist build-deploy-tracy rmdir /S /Q build-deploy-tracy
 if exist pdbs.zip del pdbs.zip
 if exist OpenSpace.zip del OpenSpace.zip
 if exist OpenSpace-minimal.zip del OpenSpace-minimal.zip
 
 echo ### Moving existing folders out of the way
 if exist bin move bin bin-old
+exit /b 0
 
 
 
-echo ### Run CMake into the 'build-deploy' folder
+:VSRedist
+echo ### Download the Microsoft redistributable
+curl "http://aka.ms/vs/17/release/vc_redist.x64.exe" --output vc_redist.x64.exe -L
+exit /b 0
+
+
+
+:RunCMake
+:: The first parameter is the destination folder where we want to build
+:: If the second parameter to this subroutine is defined, we want to build with Tracy
+echo ### Run CMake into the %~1 folder
+if "%~2"=="" (
+  set "param="
+) else (
+  set "param=-D TRACY_ENABLE=ON -DSGCT_TRACY_SUPPORT=ON"
+)
 cmake^
   -D SGCT_BUILD_TESTS=OFF^
   -D GHOUL_HIGH_DEBUG_MODE=OFF^
   -D GHOUL_HAVE_TESTS=OFF^
   -D OPENSPACE_HAVE_TESTS=OFF^
   -D OPENSPACE_ENABLE_ALL_MODULES=ON^
+  %param%^
   -S .^
-  -B build-deploy
+  -B %~1
+exit /b 0
 
 
 
+:Build
+:: The first parameter is the destination folder where we want to build
 echo ### Build OpenSpace in RelWithDebInfo mode
 cmake^
-  --build build-deploy^
+  --build %~1^
   --config RelWithDebInfo^
   --target OpenSpace^
   --parallel^
   -- /p:CL_MPcount=16
-
-if %ERRORLEVEL% NEQ 0 EXIT /B
-
-echo ### Save the PDB files
-"C:\Program Files\7-Zip\7z.exe" a pdbs.zip bin/RelWithDebInfo/*.pdb
+exit /b 0
 
 
+
+:PostBuildCleanup
 echo ### Dealing with some files
 :: Remove unnecessary files of our own making
 del bin\RelWithDebInfo\*.pdb
@@ -49,23 +112,25 @@ rmdir /S /Q bin\RelWithDebInfo\iconengines
 rmdir /S /Q bin\RelWithDebInfo\imageformats
 rmdir /S /Q bin\RelWithDebInfo\networkinformation
 
-:: Reset the documentation back to the master as it will have been updated locally
-cd documentation
-copy documentationData.js ..
-git checkout HEAD -- documentationData.js
-cd ..
-
 :: The binary files are created in the RelWithDebInfo subdirectory and we want them in bin
 robocopy bin\\RelWithDebInfo bin /E /MOV
 rmdir /S /Q bin\\RelWithDebInfo
-
-:: Download the Microsoft redistributable
-curl "http://aka.ms/vs/17/release/vc_redist.x64.exe" --output vc_redist.x64.exe -L
+exit /b 0
 
 
-echo ### Create main zip file
+
+:ZipDistributable
+:: The first parameter specifies the output file
+:: If the second parameter to this subroutine is defined, we want to include the sync folder
+echo ### Create minimal zip file
+if "%~2"=="" (
+  set "sync="
+) else (
+  set "sync=sync"
+)
+
 :: Need to manually add any new weird paths that don't match the wildcards below
-"C:\Program Files\7-Zip\7z.exe" a -tzip -mx=9 -mfb=257 -mpass=15 OpenSpace.zip^
+"C:\Program Files\7-Zip\7z.exe" a -tzip -mx=9 -mfb=257 -mpass=15 %~1.zip^
   bin/*^
   config/*^
   data/*^
@@ -87,12 +152,7 @@ echo ### Create main zip file
   modules/globebrowsing/gdal_data/*^
   modules/webgui/ext/nodejs/node.exe^
   ^
+  %sync%^
   -x!documentation/.git
 
-
-echo ### Clean up
-rmdir /S /Q bin
-del vc_redist.x64.exe
-if exist bin-old move bin-old bin
-if exist build-deploy rmdir /S /Q build-deploy
-move documentationData.js documentation
+exit /b 0

From 9c71ba2f4263fdd7a5444d798f675d702a7cc499 Mon Sep 17 00:00:00 2001
From: Emma Broman <emma.broman@liu.se>
Date: Mon, 29 Jul 2024 09:49:31 +0200
Subject: [PATCH 550/701] Apply opacity to screenspace border (closes #3355)

---
 modules/base/shaders/screenspace_fs.glsl | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/base/shaders/screenspace_fs.glsl b/modules/base/shaders/screenspace_fs.glsl
index cf4f9b721a..88be411afb 100644
--- a/modules/base/shaders/screenspace_fs.glsl
+++ b/modules/base/shaders/screenspace_fs.glsl
@@ -53,7 +53,7 @@ Fragment getFragment() {
   if (vs_st.x < borderWidth.x || vs_st.x > 1 - borderWidth.x ||
       vs_st.y < borderWidth.y || vs_st.y > 1 - borderWidth.y)
   {
-    frag.color = vec4(borderColor, 1.0);
+    frag.color = vec4(borderColor, opacity);
   }
 
   if (frag.color.a == 0.0) {

From 664c1c951e677662844646cebcf737dec7f6b921 Mon Sep 17 00:00:00 2001
From: Emma Broman <emma.broman@liu.se>
Date: Mon, 29 Jul 2024 09:53:13 +0200
Subject: [PATCH 551/701] Change "on-screen version" setting visiblity level to
 User

To be consistent with the other settings for things that are shown on screen. It was confusing that these were different. Now Users can hide that, but still include the camera information, for example.
---
 src/rendering/renderengine.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/rendering/renderengine.cpp b/src/rendering/renderengine.cpp
index 60d8b580d2..cdfa5c3908 100644
--- a/src/rendering/renderengine.cpp
+++ b/src/rendering/renderengine.cpp
@@ -109,7 +109,7 @@ namespace {
         "Shows the version on-screen information",
         "This value determines whether the Git version information (branch and commit) "
         "hash are shown on the screen.",
-        openspace::properties::Property::Visibility::AdvancedUser
+        openspace::properties::Property::Visibility::User
     };
 
     constexpr openspace::properties::Property::PropertyInfo ShowCameraInfo = {

From c2f7712c4ad8f7557f727818e20d75f9783b60df Mon Sep 17 00:00:00 2001
From: Emma Broman <emma.broman@liu.se>
Date: Mon, 29 Jul 2024 11:33:28 +0200
Subject: [PATCH 552/701] Add a Label for Exoplanet Systems (Issue #3318)
 (#3352)

* Add a disables label for the star for all added exoplanet systems

* Refactor queue script code a bit, to reduce duplicate code

* Apply suggestions from code review

Co-authored-by: Alexander Bock <alexander.bock@liu.se>

---------

Co-authored-by: Alexander Bock <alexander.bock@liu.se>
---
 modules/exoplanets/exoplanetsmodule_lua.inl | 87 +++++++++++----------
 1 file changed, 44 insertions(+), 43 deletions(-)

diff --git a/modules/exoplanets/exoplanetsmodule_lua.inl b/modules/exoplanets/exoplanetsmodule_lua.inl
index 18c123f164..1c829d0ed4 100644
--- a/modules/exoplanets/exoplanetsmodule_lua.inl
+++ b/modules/exoplanets/exoplanetsmodule_lua.inl
@@ -105,6 +105,17 @@ openspace::exoplanets::ExoplanetSystem findExoplanetSystemInData(
     return system;
 }
 
+void queueAddSceneGraphNodeScript(const std::string& sgnTableAsString) {
+    using namespace openspace;
+    // No sync or send because this will already be called inside a Lua script,
+    // therefor it has already been synced and sent to the connected nodes and peers
+    global::scriptEngine->queueScript(
+        std::format("openspace.addSceneGraphNode({})", sgnTableAsString),
+        scripting::ScriptEngine::ShouldBeSynchronized::No,
+        scripting::ScriptEngine::ShouldSendToRemote::No
+    );
+}
+
 void createExoplanetSystem(const std::string& starName,
                            openspace::exoplanets::ExoplanetSystem system)
 {
@@ -211,13 +222,33 @@ void createExoplanetSystem(const std::string& starName,
         "}"
     "}";
 
-    // No sync or send because this is already inside a Lua script, therefor it has
-    // already been synced and sent to the connected nodes and peers
-    global::scriptEngine->queueScript(
-        "openspace.addSceneGraphNode(" + starParent + ");",
-        scripting::ScriptEngine::ShouldBeSynchronized::No,
-        scripting::ScriptEngine::ShouldSendToRemote::No
-    );
+    queueAddSceneGraphNodeScript(starParent);
+
+    // Add a label for the star.
+    // The fade values are set based on the values for the Sun label
+    const std::string starLabel = "{"
+        "Identifier = '" + starIdentifier + "_Label',"
+        "Parent = '" + starIdentifier + "',"
+        "Renderable = {"
+          "Type = 'RenderableLabel',"
+          "Enabled = false,"
+          "Text = '" + sanitizedStarName + "',"
+          "FontSize = 70.0,"
+          "Size = 14.17,"
+          "MinMaxSize = { 1, 50 },"
+          "EnableFading = true,"
+          "FadeUnit = 'pc',"
+          "FadeDistances = { 1.33, 15.0 },"
+          "FadeWidths = {1.0, 20.0}"
+        "},"
+        "Tag = {'exoplanet_system_labels'},"
+        "GUI = {"
+            "Name = '" + sanitizedStarName + " Label',"
+            "Path = '" + guiPath + "'"
+        "}"
+    "}";
+
+    queueAddSceneGraphNodeScript(starLabel);
 
     // Planets
     for (size_t i = 0; i < system.planetNames.size(); i++) {
@@ -330,14 +361,8 @@ void createExoplanetSystem(const std::string& starName,
             "}"
         "}";
 
-        // No sync or send because this is already inside a Lua script, therefor it has
-        // already been synced and sent to the connected nodes and peers
-        global::scriptEngine->queueScript(
-            "openspace.addSceneGraphNode(" + planetTrailNode + ");"
-            "openspace.addSceneGraphNode(" + planetNode + ");",
-            scripting::ScriptEngine::ShouldBeSynchronized::No,
-            scripting::ScriptEngine::ShouldSendToRemote::No
-        );
+        queueAddSceneGraphNodeScript(planetTrailNode);
+        queueAddSceneGraphNodeScript(planetNode);
 
         bool hasUpperAUncertainty = !std::isnan(planet.aUpper);
         bool hasLowerAUncertainty = !std::isnan(planet.aLower);
@@ -387,13 +412,7 @@ void createExoplanetSystem(const std::string& starName,
                 "}"
             "}";
 
-            // No sync or send because this is already inside a Lua script, therefor it
-            // has already been synced and sent to the connected nodes and peers
-            global::scriptEngine->queueScript(
-                "openspace.addSceneGraphNode(" + discNode + ");",
-                scripting::ScriptEngine::ShouldBeSynchronized::No,
-                scripting::ScriptEngine::ShouldSendToRemote::No
-            );
+            queueAddSceneGraphNodeScript(discNode);
         }
     }
 
@@ -437,13 +456,7 @@ void createExoplanetSystem(const std::string& starName,
         "}"
     "}";
 
-    // No sync or send because this is already inside a Lua script, therefor it has
-    // already been synced and sent to the connected nodes and peers
-    global::scriptEngine->queueScript(
-        "openspace.addSceneGraphNode(" + circle + ");",
-        scripting::ScriptEngine::ShouldBeSynchronized::No,
-        scripting::ScriptEngine::ShouldSendToRemote::No
-    );
+    queueAddSceneGraphNodeScript(circle);
 
     // Habitable Zone
     bool hasTeff = !std::isnan(system.starData.teff);
@@ -491,13 +504,7 @@ void createExoplanetSystem(const std::string& starName,
             "}"
         "}";
 
-        // No sync or send because this is already inside a Lua script, therefor it has
-        // already been synced and sent to the connected nodes and peers
-        global::scriptEngine->queueScript(
-            "openspace.addSceneGraphNode(" + zoneDiscNode + ");",
-            scripting::ScriptEngine::ShouldBeSynchronized::No,
-            scripting::ScriptEngine::ShouldSendToRemote::No
-        );
+        queueAddSceneGraphNodeScript(zoneDiscNode);
 
         // Star glare
         if (starColor.has_value()) {
@@ -535,13 +542,7 @@ void createExoplanetSystem(const std::string& starName,
                 "}"
             "}";
 
-            // No sync or send because this is already inside a Lua script, therefor it
-            // has already been synced and sent to the connected nodes and peers
-            global::scriptEngine->queueScript(
-                "openspace.addSceneGraphNode(" + starGlare + ");",
-                scripting::ScriptEngine::ShouldBeSynchronized::No,
-                scripting::ScriptEngine::ShouldSendToRemote::No
-            );
+            queueAddSceneGraphNodeScript(starGlare);
         }
     }
 }

From 9ea69d6b1a0a33984df82a1b345f845ab2db97b4 Mon Sep 17 00:00:00 2001
From: Emma Broman <emma.broman@liu.se>
Date: Tue, 30 Jul 2024 09:05:40 +0200
Subject: [PATCH 553/701] Add option to specify a default texture for added
 exoplanets (#3353)

* Add possibility to specify a default texture for added exoplanets

* Warn if exoplanet texture does not exists and provide more user friendly warnings

* Address review comments
---
 modules/exoplanets/exoplanetsmodule.cpp     | 22 +++++++++++++++
 modules/exoplanets/exoplanetsmodule.h       |  2 ++
 modules/exoplanets/exoplanetsmodule_lua.inl | 31 ++++++++++++++++++++-
 3 files changed, 54 insertions(+), 1 deletion(-)

diff --git a/modules/exoplanets/exoplanetsmodule.cpp b/modules/exoplanets/exoplanetsmodule.cpp
index 454b89fbcc..5884d7426c 100644
--- a/modules/exoplanets/exoplanetsmodule.cpp
+++ b/modules/exoplanets/exoplanetsmodule.cpp
@@ -94,6 +94,15 @@ namespace {
         openspace::properties::Property::Visibility::AdvancedUser
     };
 
+    constexpr openspace::properties::Property::PropertyInfo PlanetDefaultTextureInfo = {
+        "PlanetDefaultTexture",
+        "Planet Default Texture",
+        "The path to an image that should be used by default for the planets in all "
+        "added exoplanet systems. If not specified, the planets are rendered without a "
+        "texture when added.",
+        openspace::properties::Property::Visibility::AdvancedUser
+    };
+
     constexpr openspace::properties::Property::PropertyInfo OrbitDiscTextureInfo = {
         "OrbitDiscTexture",
         "Orbit Disc Texture",
@@ -182,6 +191,9 @@ namespace {
        // [[codegen::verbatim(NoDataTextureInfo.description)]]
        std::optional<std::filesystem::path> noDataTexture;
 
+       // [[codegen::verbatim(PlanetDefaultTextureInfo.description)]]
+       std::optional<std::filesystem::path> planetDefaultTexture;
+
        // [[codegen::verbatim(OrbitDiscTextureInfo.description)]]
        std::optional<std::filesystem::path> orbitDiscTexture;
 
@@ -221,6 +233,7 @@ ExoplanetsModule::ExoplanetsModule()
     , _starTexturePath(StarTextureInfo)
     , _starGlareTexturePath(StarGlareTextureInfo)
     , _noDataTexturePath(NoDataTextureInfo)
+    , _planetDefaultTexturePath(PlanetDefaultTextureInfo)
     , _orbitDiscTexturePath(OrbitDiscTextureInfo)
     , _habitableZoneTexturePath(HabitableZoneTextureInfo)
     , _comparisonCircleColor(
@@ -244,6 +257,7 @@ ExoplanetsModule::ExoplanetsModule()
     addProperty(_starTexturePath);
     addProperty(_starGlareTexturePath);
     addProperty(_noDataTexturePath);
+    addProperty(_planetDefaultTexturePath);
     addProperty(_orbitDiscTexturePath);
     addProperty(_habitableZoneTexturePath);
 
@@ -301,6 +315,10 @@ std::filesystem::path ExoplanetsModule::noDataTexturePath() const {
     return _noDataTexturePath.value();
 }
 
+std::filesystem::path ExoplanetsModule::planetDefaultTexturePath() const {
+    return _planetDefaultTexturePath.value();
+}
+
 std::filesystem::path ExoplanetsModule::orbitDiscTexturePath() const {
     return _orbitDiscTexturePath.value();
 }
@@ -354,6 +372,10 @@ void ExoplanetsModule::internalInitialize(const ghoul::Dictionary& dict) {
         _starGlareTexturePath = p.starGlareTexture->string();
     }
 
+    if (p.planetDefaultTexture.has_value()) {
+        _planetDefaultTexturePath = p.planetDefaultTexture->string();
+    }
+
     if (p.noDataTexture.has_value()) {
         _noDataTexturePath = p.noDataTexture->string();
     }
diff --git a/modules/exoplanets/exoplanetsmodule.h b/modules/exoplanets/exoplanetsmodule.h
index c1ff4a787a..10de1c5f77 100644
--- a/modules/exoplanets/exoplanetsmodule.h
+++ b/modules/exoplanets/exoplanetsmodule.h
@@ -51,6 +51,7 @@ public:
     std::filesystem::path starTexturePath() const;
     std::filesystem::path starGlareTexturePath() const;
     std::filesystem::path noDataTexturePath() const;
+    std::filesystem::path planetDefaultTexturePath() const;
     std::filesystem::path orbitDiscTexturePath() const;
     std::filesystem::path habitableZoneTexturePath() const;
     glm::vec3 comparisonCircleColor() const;
@@ -72,6 +73,7 @@ protected:
     properties::StringProperty _starTexturePath;
     properties::StringProperty _starGlareTexturePath;
     properties::StringProperty _noDataTexturePath;
+    properties::StringProperty _planetDefaultTexturePath;
     properties::StringProperty _orbitDiscTexturePath;
     properties::StringProperty _habitableZoneTexturePath;
 
diff --git a/modules/exoplanets/exoplanetsmodule_lua.inl b/modules/exoplanets/exoplanetsmodule_lua.inl
index 1c829d0ed4..60d5a56f6d 100644
--- a/modules/exoplanets/exoplanetsmodule_lua.inl
+++ b/modules/exoplanets/exoplanetsmodule_lua.inl
@@ -166,6 +166,14 @@ void createExoplanetSystem(const std::string& starName,
     if (!std::isnan(bv)) {
         starColor = computeStarColor(bv);
         const std::filesystem::path starTexture = module->starTexturePath();
+
+        if (!starTexture.empty() && !std::filesystem::is_regular_file(starTexture)) {
+            LWARNING(std::format(
+                "Could not find specified star texture set in {} module: '{}'",
+                module->guiName(), starTexture
+            ));
+        }
+
         colorLayers =
             "{"
                 "Identifier = 'StarColor',"
@@ -251,6 +259,15 @@ void createExoplanetSystem(const std::string& starName,
     queueAddSceneGraphNodeScript(starLabel);
 
     // Planets
+
+    const std::filesystem::path planetTexture = module->planetDefaultTexturePath();
+    if (!planetTexture.empty() && !std::filesystem::is_regular_file(planetTexture)) {
+        LWARNING(std::format(
+            "Could not find specified planet default texture set in {} module: '{}'",
+            module->guiName(), planetTexture
+        ));
+    }
+
     for (size_t i = 0; i < system.planetNames.size(); i++) {
         // Note that we are here overriding some invalid parameters in the planet data.
         // Use a reference, so that it is changed down the line
@@ -317,6 +334,16 @@ void createExoplanetSystem(const std::string& starName,
             "Period = " + std::to_string(periodInSeconds) + ""
         "}";
 
+        std::string planetLayers = "";
+        if (!planetTexture.empty()) {
+            planetLayers = "{"
+                "Identifier = 'PlanetTexture',"
+                "FilePath = openspace.absPath('" + formatPathToLua(planetTexture) + "'),"
+                "BlendMode = 'Color',"
+                "Enabled = true"
+            "}";
+        }
+
         const std::string planetNode = "{"
             "Identifier = '" + planetIdentifier + "',"
             "Parent = '" + starIdentifier + "',"
@@ -325,7 +352,9 @@ void createExoplanetSystem(const std::string& starName,
                 "Enabled = " + enabled + ","
                 "Radii = " + std::to_string(planetRadius) + "," // in meters
                 "PerformShading = true,"
-                "Layers = {},"
+                "Layers = {"
+                    "ColorLayers = {" + planetLayers + "}"
+                "},"
                 "LightSourceNode = '" + starIdentifier + "'"
             "},"
             "Transform = { "

From 97e455f7aff78befcb591871993f16819327159b Mon Sep 17 00:00:00 2001
From: Alexander Bock <mail@alexanderbock.eu>
Date: Mon, 29 Jul 2024 12:49:08 +0200
Subject: [PATCH 554/701] Update kernel data for Rosetta

---
 .../missions/rosetta/kernels.asset            | 88 +++++++++++--------
 .../missions/rosetta/rosetta.asset            |  4 +
 src/scene/rotation.cpp                        |  2 +
 src/scene/scale.cpp                           |  2 +
 src/scene/translation.cpp                     |  2 +
 5 files changed, 61 insertions(+), 37 deletions(-)

diff --git a/data/assets/scene/solarsystem/missions/rosetta/kernels.asset b/data/assets/scene/solarsystem/missions/rosetta/kernels.asset
index 1c3b9f0f67..3d4766270f 100644
--- a/data/assets/scene/solarsystem/missions/rosetta/kernels.asset
+++ b/data/assets/scene/solarsystem/missions/rosetta/kernels.asset
@@ -2,57 +2,71 @@ local data = asset.resource({
   Name = "Rosetta Kernels",
   Type = "HttpSynchronization",
   Identifier = "rosetta_kernels",
-  Version = 1
+  Version = 2
 })
 
 
 local Kernels = {
-  data .. "ROS_160718_STEP.TSC",
-  data .. "ros_triv.tsc",
+  data .. "ROS_160929_STEP.TSC",
 
-  data .. "CORB_DV_243_01___T19_00325.BSP",
-  data .. "CORB_DV_223_01___T19_00302.BSP",
-  data .. "CORB_DV_145_01___T19_00216.BSP",
+  data .. "RORB_DV_257_03___T19_00345.BSP",
+  data .. "CORB_DV_257_03___T19_00345.BSP",
+  data .. "LORB_C_G_FIXED_RBD_7_V2_0.BSP",
+  data .. "LORB_ROS_SC_PRESEP_V1_0.BSP",
 
-  data .. "LORB_DV_236_01___T19_00318.BSP",
-  data .. "LORB_DV_223_01___T19_00302.BSP",
-  data .. "LORB_DV_145_01___T19_00216.BSP",
+  data .. "ATNR_P040302093352_T6_00127.BC",
 
-  data .. "RORB_DV_243_01___T19_00325.BSP",
-  data .. "RORB_DV_223_01___T19_00302.BSP",
-  data .. "RORB_DV_145_01___T19_00216.BSP",
+  data .. "ROS_STRUCT_V8.BSP",
 
-  data .. "ATNR_P040302093352_00127.BC",
+  data .. "ROS_ALICE_V17.TI",
+  data .. "ROS_CIVA_V11.TI",
+  data .. "ROS_CONSERT_V11.TI",
+  data .. "ROS_COSIMA_V15.TI",
+  data .. "ROS_DIM_V11.TI",
+  data .. "ROS_GIADA_V12.TI",
+  data .. "ROS_MIDAS_V11.TI",
+  data .. "ROS_MIRO_V11.TI",
+  data .. "ROS_NAVCAM_V03.TI",
+  data .. "ROS_OSIRIS_V17.TI",
+  data .. "ROS_ROLIS_V03.TI",
+  data .. "ROS_ROSINA_V12.TI",
+  data .. "ROS_RPC_V20.TI",
 
-  data .. "ROS_STRUCT_V5.BSP",
+  data .. "ROS_V38.TF",
 
-  data .. "ROS_NAVCAM_V01.TI",
+  data .. "RATT_DV_257_02_01_T6_00344.BC",
+  data .. "RATT_DV_223_01_01_T6_00302.BC",
+  data .. "RATT_DV_145_01_01_T6_00216.BC",
 
-  data .. "ROS_CHURYUMOV_V01.TF",
-  data .. "ROS_V26.TF",
+  data .. "CATT_DV_257_03_______00344.BC",
+  data .. "CATT_DV_223_02_______00302.BC",
+  data .. "CATT_DV_145_02_______00216.BC",
 
-  -- CK
-  -- Rosetta attitude
-  data .. "RATT_DV_243_01_01____00325.BC",
-  data .. "RATT_DV_223_01_01____00302.BC",
-  data .. "RATT_DV_145_01_01____00216.BC",
+  data .. "ROS_HGA_2004_V0002.BC",
+  data .. "ROS_HGA_2005_V0002.BC",
+  data .. "ROS_HGA_2006_V0002.BC",
+  data .. "ROS_HGA_2007_V0002.BC",
+  data .. "ROS_HGA_2008_V0020.BC",
+  data .. "ROS_HGA_2009_V0053.BC",
+  data .. "ROS_HGA_2010_V0047.BC",
+  data .. "ROS_HGA_2011_V0019.BC",
+  data .. "ROS_HGA_2014_V0045.BC",
+  data .. "ROS_HGA_2015_V0054.BC",
+  data .. "ROS_HGA_2016_V0043.BC",
 
-  -- Comet attitude
-  data .. "CATT_DV_243_01_______00325.BC",
-  data .. "CATT_DV_223_01_______00302.BC",
-  data .. "CATT_DV_145_01_______00216.BC",
+  data .. "ROS_SA_2004_V0002.BC",
+  data .. "ROS_SA_2005_V0002.BC",
+  data .. "ROS_SA_2006_V0002.BC",
+  data .. "ROS_SA_2007_V0002.BC",
+  data .. "ROS_SA_2008_V0039.BC",
+  data .. "ROS_SA_2009_V0055.BC",
+  data .. "ROS_SA_2010_V0053.BC",
+  data .. "ROS_SA_2011_V0021.BC",
+  data .. "ROS_SA_2014_V0048.BC",
+  data .. "ROS_SA_2015_V0043.BC",
+  data .. "ROS_SA_2016_V0042.BC",
 
-  -- High gain antenna
-  data .. "ROS_HGA_2016_V0035.BC",
-  data .. "ROS_HGA_2015_V0053.BC",
-  data .. "ROS_HGA_2014_V0044.BC",
-
-  -- Solar arrays
-  data .. "ROS_SA_2016_V0034.BC",
-  data .. "ROS_SA_2015_V0042.BC",
-  data .. "ROS_SA_2014_V0047.BC",
-
-  data .. "ROS_CGS_RSOC_V03.TPC"
+  data .. "ROS_CG_RAD_V10.TPC"
 }
 
 local ID = {
diff --git a/data/assets/scene/solarsystem/missions/rosetta/rosetta.asset b/data/assets/scene/solarsystem/missions/rosetta/rosetta.asset
index a531ac30a0..c11f985565 100644
--- a/data/assets/scene/solarsystem/missions/rosetta/rosetta.asset
+++ b/data/assets/scene/solarsystem/missions/rosetta/rosetta.asset
@@ -97,6 +97,10 @@ local Philae = {
   Identifier = "Philae",
   Parent = PhilaePosition.Identifier,
   Transform = {
+    Translation = {
+      Type = "StaticTranslation",
+      Position = { 1.0, 0.0, -1.25 }
+    },
     Rotation = {
       Type = "StaticRotation",
       Rotation = { 0.0, math.pi / 2.0, 0.0 }
diff --git a/src/scene/rotation.cpp b/src/scene/rotation.cpp
index 2ba4a76e3e..6ca29ae3c1 100644
--- a/src/scene/rotation.cpp
+++ b/src/scene/rotation.cpp
@@ -82,6 +82,8 @@ const glm::dmat3& Rotation::matrix() const {
 }
 
 void Rotation::update(const UpdateData& data) {
+    ZoneScoped;
+
     if (!_needsUpdate && (data.time.j2000Seconds() == _cachedTime)) {
         return;
     }
diff --git a/src/scene/scale.cpp b/src/scene/scale.cpp
index 812a029fd5..21fe1441dd 100644
--- a/src/scene/scale.cpp
+++ b/src/scene/scale.cpp
@@ -83,6 +83,8 @@ glm::dvec3 Scale::scaleValue() const {
 }
 
 void Scale::update(const UpdateData& data) {
+    ZoneScoped;
+
     if (!_needsUpdate && data.time.j2000Seconds() == _cachedTime) {
         return;
     }
diff --git a/src/scene/translation.cpp b/src/scene/translation.cpp
index 717242f402..923026bd54 100644
--- a/src/scene/translation.cpp
+++ b/src/scene/translation.cpp
@@ -72,6 +72,8 @@ bool Translation::initialize() {
 }
 
 void Translation::update(const UpdateData& data) {
+    ZoneScoped;
+
     if (!_needsUpdate && data.time.j2000Seconds() == _cachedTime) {
         return;
     }

From 202e598415372817cf11f0517946df72e8440b3b Mon Sep 17 00:00:00 2001
From: Alexander Bock <alexander.bock@liu.se>
Date: Tue, 30 Jul 2024 13:30:06 +0200
Subject: [PATCH 555/701] Update SGCT repository

---
 apps/OpenSpace/ext/sgct | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/apps/OpenSpace/ext/sgct b/apps/OpenSpace/ext/sgct
index c68e7cf398..7b08cda0ed 160000
--- a/apps/OpenSpace/ext/sgct
+++ b/apps/OpenSpace/ext/sgct
@@ -1 +1 @@
-Subproject commit c68e7cf398dbdeb181724f39787887623a9e5946
+Subproject commit 7b08cda0ed002bda77f82a96ad721f34e7caa0a0

From 90d05187b4bbfe406113fcfe91fbae2b3a43d4b2 Mon Sep 17 00:00:00 2001
From: Alexander Bock <alexander.bock@liu.se>
Date: Tue, 30 Jul 2024 13:51:18 +0200
Subject: [PATCH 556/701] Instead of deleting layers directly through the
 property, schedule them to delete in the next frame instead (closes #3357)

---
 modules/globebrowsing/src/layer.cpp      | 4 +++-
 modules/globebrowsing/src/layergroup.cpp | 9 +++++++++
 modules/globebrowsing/src/layergroup.h   | 5 +++++
 3 files changed, 17 insertions(+), 1 deletion(-)

diff --git a/modules/globebrowsing/src/layer.cpp b/modules/globebrowsing/src/layer.cpp
index 7c30f94048..91f263208e 100644
--- a/modules/globebrowsing/src/layer.cpp
+++ b/modules/globebrowsing/src/layer.cpp
@@ -26,6 +26,8 @@
 
 #include <openspace/documentation/documentation.h>
 #include <openspace/documentation/verifier.h>
+#include <openspace/engine/globals.h>
+#include <openspace/scripting/scriptengine.h>
 #include <modules/globebrowsing/src/layergroup.h>
 #include <modules/globebrowsing/src/layermanager.h>
 #include <modules/globebrowsing/src/tileindex.h>
@@ -320,7 +322,7 @@ Layer::Layer(layers::Group::ID id, const ghoul::Dictionary& layerDict, LayerGrou
     _remove.onChange([this]() {
         if (_tileProvider) {
             _tileProvider->reset();
-            _parent.deleteLayer(identifier());
+            _parent.scheduleDeleteLayer(identifier());
         }
     });
 
diff --git a/modules/globebrowsing/src/layergroup.cpp b/modules/globebrowsing/src/layergroup.cpp
index e85439fbc8..0b8ae03134 100644
--- a/modules/globebrowsing/src/layergroup.cpp
+++ b/modules/globebrowsing/src/layergroup.cpp
@@ -89,6 +89,11 @@ void LayerGroup::deinitialize() {
 void LayerGroup::update() {
     ZoneScoped;
 
+    for (const std::string& layer : _layersToDelete) {
+        deleteLayer(layer);
+    }
+    _layersToDelete.clear();
+
     _activeLayers.clear();
 
     for (const std::unique_ptr<Layer>& layer : _layers) {
@@ -217,6 +222,10 @@ void LayerGroup::deleteLayer(const std::string& layerName) {
     LERROR("Could not find layer " + layerName);
 }
 
+void LayerGroup::scheduleDeleteLayer(const std::string& layerName) {
+    _layersToDelete.push_back(layerName);
+}
+
 void LayerGroup::moveLayer(int oldPosition, int newPosition) {
     if (_layers.size() == 1) {
         ghoul_assert(
diff --git a/modules/globebrowsing/src/layergroup.h b/modules/globebrowsing/src/layergroup.h
index 91609612b0..1844178662 100644
--- a/modules/globebrowsing/src/layergroup.h
+++ b/modules/globebrowsing/src/layergroup.h
@@ -53,6 +53,9 @@ struct LayerGroup : public properties::PropertyOwner {
 
     Layer* addLayer(const ghoul::Dictionary& layerDict);
     void deleteLayer(const std::string& layerName);
+
+    // The same as `deleteLayer` but executed later before the next frame
+    void scheduleDeleteLayer(const std::string& layerName);
     void moveLayer(int oldPosition, int newPosition);
 
     /**
@@ -81,6 +84,8 @@ private:
     std::vector<std::unique_ptr<Layer>> _layers;
     std::vector<Layer*> _activeLayers;
 
+    std::vector<std::string> _layersToDelete;
+
     properties::BoolProperty _levelBlendingEnabled;
     std::function<void(Layer*)> _onChangeCallback;
 };

From b27eae7051a120b8774d73823355981424a08da7 Mon Sep 17 00:00:00 2001
From: Alexander Bock <alexander.bock@liu.se>
Date: Tue, 30 Jul 2024 14:10:21 +0200
Subject: [PATCH 557/701] Correctly generate the mipmap for text tiles after
 rerendering them (closes #3356)

---
 modules/globebrowsing/src/tileprovider/texttileprovider.cpp | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/modules/globebrowsing/src/tileprovider/texttileprovider.cpp b/modules/globebrowsing/src/tileprovider/texttileprovider.cpp
index bef9727ad1..ec4563080f 100644
--- a/modules/globebrowsing/src/tileprovider/texttileprovider.cpp
+++ b/modules/globebrowsing/src/tileprovider/texttileprovider.cpp
@@ -97,6 +97,8 @@ Tile TextTileProvider::renderTile(const TileIndex& tileIndex, const std::string&
 
         fontRenderer->render(*font, position, text, color);
 
+        texture->setFilter(ghoul::opengl::Texture::FilterMode::LinearMipMap);
+
         tile = Tile{ texture, std::nullopt, Tile::Status::OK };
         tileCache->put(key, initData.hashKey, tile);
 

From c4c82483e003c26e688488fc8aace2d07bb05519 Mon Sep 17 00:00:00 2001
From: Alexander Bock <alexander.bock@liu.se>
Date: Wed, 31 Jul 2024 10:57:10 +0200
Subject: [PATCH 558/701] Update copyright header in CMakeLists files

---
 CMakeLists.txt                                     | 2 +-
 apps/CMakeLists.txt                                | 2 +-
 apps/OpenSpace/CMakeLists.txt                      | 2 +-
 apps/OpenSpace/ext/launcher/CMakeLists.txt         | 2 +-
 ext/CMakeLists.txt                                 | 2 +-
 modules/CMakeLists.txt                             | 2 +-
 modules/atmosphere/CMakeLists.txt                  | 2 +-
 modules/audio/CMakeLists.txt                       | 2 +-
 modules/base/CMakeLists.txt                        | 2 +-
 modules/cefwebgui/CMakeLists.txt                   | 2 +-
 modules/debugging/CMakeLists.txt                   | 2 +-
 modules/digitaluniverse/CMakeLists.txt             | 2 +-
 modules/exoplanets/CMakeLists.txt                  | 2 +-
 modules/fieldlines/CMakeLists.txt                  | 2 +-
 modules/fieldlinessequence/CMakeLists.txt          | 2 +-
 modules/fitsfilereader/CMakeLists.txt              | 2 +-
 modules/gaia/CMakeLists.txt                        | 2 +-
 modules/galaxy/CMakeLists.txt                      | 2 +-
 modules/globebrowsing/CMakeLists.txt               | 2 +-
 modules/imgui/CMakeLists.txt                       | 2 +-
 modules/imgui/ext/imgui/CMakeLists.txt             | 2 +-
 modules/iswa/CMakeLists.txt                        | 2 +-
 modules/kameleon/CMakeLists.txt                    | 2 +-
 modules/kameleonvolume/CMakeLists.txt              | 2 +-
 modules/multiresvolume/CMakeLists.txt              | 2 +-
 modules/server/CMakeLists.txt                      | 2 +-
 modules/skybrowser/CMakeLists.txt                  | 2 +-
 modules/space/CMakeLists.txt                       | 2 +-
 modules/spacecraftinstruments/CMakeLists.txt       | 2 +-
 modules/spout/CMakeLists.txt                       | 2 +-
 modules/statemachine/CMakeLists.txt                | 2 +-
 modules/sync/CMakeLists.txt                        | 2 +-
 modules/touch/CMakeLists.txt                       | 2 +-
 modules/touch/ext/CMakeLists.txt                   | 2 +-
 modules/toyvolume/CMakeLists.txt                   | 2 +-
 modules/video/CMakeLists.txt                       | 2 +-
 modules/vislab/CMakeLists.txt                      | 2 +-
 modules/volume/CMakeLists.txt                      | 2 +-
 modules/webbrowser/CMakeLists.txt                  | 2 +-
 modules/webbrowser/cmake/cef_support.cmake         | 2 +-
 modules/webbrowser/cmake/webbrowser_helpers.cmake  | 2 +-
 modules/webgui/CMakeLists.txt                      | 2 +-
 modules/webgui/cmake/nodejs_support.cmake          | 2 +-
 src/CMakeLists.txt                                 | 2 +-
 support/cmake/application_definition.cmake         | 2 +-
 support/cmake/global_variables.cmake               | 2 +-
 support/cmake/module_common.cmake                  | 2 +-
 support/cmake/module_definition.cmake              | 2 +-
 support/cmake/packaging.cmake                      | 2 +-
 support/cmake/set_openspace_compile_settings.cmake | 2 +-
 tests/CMakeLists.txt                               | 2 +-
 51 files changed, 51 insertions(+), 51 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index ea84b63827..1ac09c4647 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -2,7 +2,7 @@
 #                                                                                        #
 # OpenSpace                                                                              #
 #                                                                                        #
-# Copyright (c) 2014-2023                                                                #
+# Copyright (c) 2014-2024                                                                #
 #                                                                                        #
 # Permission is hereby granted, free of charge, to any person obtaining a copy of this   #
 # software and associated documentation files (the "Software"), to deal in the Software  #
diff --git a/apps/CMakeLists.txt b/apps/CMakeLists.txt
index d28a99f874..6d7931f159 100644
--- a/apps/CMakeLists.txt
+++ b/apps/CMakeLists.txt
@@ -2,7 +2,7 @@
 #                                                                                        #
 # OpenSpace                                                                              #
 #                                                                                        #
-# Copyright (c) 2014-2023                                                                #
+# Copyright (c) 2014-2024                                                                #
 #                                                                                        #
 # Permission is hereby granted, free of charge, to any person obtaining a copy of this   #
 # software and associated documentation files (the "Software"), to deal in the Software  #
diff --git a/apps/OpenSpace/CMakeLists.txt b/apps/OpenSpace/CMakeLists.txt
index f79ee8f174..c4a1234cd0 100644
--- a/apps/OpenSpace/CMakeLists.txt
+++ b/apps/OpenSpace/CMakeLists.txt
@@ -2,7 +2,7 @@
 #                                                                                        #
 # OpenSpace                                                                              #
 #                                                                                        #
-# Copyright (c) 2014-2023                                                                #
+# Copyright (c) 2014-2024                                                                #
 #                                                                                        #
 # Permission is hereby granted, free of charge, to any person obtaining a copy of this   #
 # software and associated documentation files (the "Software"), to deal in the Software  #
diff --git a/apps/OpenSpace/ext/launcher/CMakeLists.txt b/apps/OpenSpace/ext/launcher/CMakeLists.txt
index 42b1c0f042..3fe59b0c89 100644
--- a/apps/OpenSpace/ext/launcher/CMakeLists.txt
+++ b/apps/OpenSpace/ext/launcher/CMakeLists.txt
@@ -2,7 +2,7 @@
 #                                                                                        #
 # OpenSpace                                                                              #
 #                                                                                        #
-# Copyright (c) 2014-2023                                                                #
+# Copyright (c) 2014-2024                                                                #
 #                                                                                        #
 # Permission is hereby granted, free of charge, to any person obtaining a copy of this   #
 # software and associated documentation files (the "Software"), to deal in the Software  #
diff --git a/ext/CMakeLists.txt b/ext/CMakeLists.txt
index be0d33f15d..f33aeb676a 100644
--- a/ext/CMakeLists.txt
+++ b/ext/CMakeLists.txt
@@ -2,7 +2,7 @@
 #                                                                                        #
 # OpenSpace                                                                              #
 #                                                                                        #
-# Copyright (c) 2014-2023                                                                #
+# Copyright (c) 2014-2024                                                                #
 #                                                                                        #
 # Permission is hereby granted, free of charge, to any person obtaining a copy of this   #
 # software and associated documentation files (the "Software"), to deal in the Software  #
diff --git a/modules/CMakeLists.txt b/modules/CMakeLists.txt
index c4e0bc5b6f..0450d19af1 100644
--- a/modules/CMakeLists.txt
+++ b/modules/CMakeLists.txt
@@ -2,7 +2,7 @@
 #                                                                                        #
 # OpenSpace                                                                              #
 #                                                                                        #
-# Copyright (c) 2014-2023                                                                #
+# Copyright (c) 2014-2024                                                                #
 #                                                                                        #
 # Permission is hereby granted, free of charge, to any person obtaining a copy of this   #
 # software and associated documentation files (the "Software"), to deal in the Software  #
diff --git a/modules/atmosphere/CMakeLists.txt b/modules/atmosphere/CMakeLists.txt
index b49ac4af6c..ef9be6bff5 100644
--- a/modules/atmosphere/CMakeLists.txt
+++ b/modules/atmosphere/CMakeLists.txt
@@ -2,7 +2,7 @@
 #                                                                                        #
 # OpenSpace                                                                              #
 #                                                                                        #
-# Copyright (c) 2014-2023                                                                #
+# Copyright (c) 2014-2024                                                                #
 #                                                                                        #
 # Permission is hereby granted, free of charge, to any person obtaining a copy of this   #
 # software and associated documentation files (the "Software"), to deal in the Software  #
diff --git a/modules/audio/CMakeLists.txt b/modules/audio/CMakeLists.txt
index 76129785b6..f176e75e03 100644
--- a/modules/audio/CMakeLists.txt
+++ b/modules/audio/CMakeLists.txt
@@ -2,7 +2,7 @@
 #                                                                                        #
 # OpenSpace                                                                              #
 #                                                                                        #
-# Copyright (c) 2014-2023                                                                #
+# Copyright (c) 2014-2024                                                                #
 #                                                                                        #
 # Permission is hereby granted, free of charge, to any person obtaining a copy of this   #
 # software and associated documentation files (the "Software"), to deal in the Software  #
diff --git a/modules/base/CMakeLists.txt b/modules/base/CMakeLists.txt
index 54bbd06ec7..fe79b952b8 100644
--- a/modules/base/CMakeLists.txt
+++ b/modules/base/CMakeLists.txt
@@ -2,7 +2,7 @@
 #                                                                                        #
 # OpenSpace                                                                              #
 #                                                                                        #
-# Copyright (c) 2014-2023                                                                #
+# Copyright (c) 2014-2024                                                                #
 #                                                                                        #
 # Permission is hereby granted, free of charge, to any person obtaining a copy of this   #
 # software and associated documentation files (the "Software"), to deal in the Software  #
diff --git a/modules/cefwebgui/CMakeLists.txt b/modules/cefwebgui/CMakeLists.txt
index 531702b264..f5fd6fc5eb 100644
--- a/modules/cefwebgui/CMakeLists.txt
+++ b/modules/cefwebgui/CMakeLists.txt
@@ -2,7 +2,7 @@
 #                                                                                        #
 # OpenSpace                                                                              #
 #                                                                                        #
-# Copyright (c) 2014-2023                                                                #
+# Copyright (c) 2014-2024                                                                #
 #                                                                                        #
 # Permission is hereby granted, free of charge, to any person obtaining a copy of this   #
 # software and associated documentation files (the "Software"), to deal in the Software  #
diff --git a/modules/debugging/CMakeLists.txt b/modules/debugging/CMakeLists.txt
index b72d237135..c9868b3c3f 100644
--- a/modules/debugging/CMakeLists.txt
+++ b/modules/debugging/CMakeLists.txt
@@ -2,7 +2,7 @@
 #                                                                                        #
 # OpenSpace                                                                              #
 #                                                                                        #
-# Copyright (c) 2014-2023                                                                #
+# Copyright (c) 2014-2024                                                                #
 #                                                                                        #
 # Permission is hereby granted, free of charge, to any person obtaining a copy of this   #
 # software and associated documentation files (the "Software"), to deal in the Software  #
diff --git a/modules/digitaluniverse/CMakeLists.txt b/modules/digitaluniverse/CMakeLists.txt
index 0815b5df8e..2ee49f6062 100644
--- a/modules/digitaluniverse/CMakeLists.txt
+++ b/modules/digitaluniverse/CMakeLists.txt
@@ -2,7 +2,7 @@
 #                                                                                        #
 # OpenSpace                                                                              #
 #                                                                                        #
-# Copyright (c) 2014-2023                                                                #
+# Copyright (c) 2014-2024                                                                #
 #                                                                                        #
 # Permission is hereby granted, free of charge, to any person obtaining a copy of this   #
 # software and associated documentation files (the "Software"), to deal in the Software  #
diff --git a/modules/exoplanets/CMakeLists.txt b/modules/exoplanets/CMakeLists.txt
index a803fa179b..169beb4215 100644
--- a/modules/exoplanets/CMakeLists.txt
+++ b/modules/exoplanets/CMakeLists.txt
@@ -2,7 +2,7 @@
 #                                                                                        #
 # OpenSpace                                                                              #
 #                                                                                        #
-# Copyright (c) 2014-2023                                                                #
+# Copyright (c) 2014-2024                                                                #
 #                                                                                        #
 # Permission is hereby granted, free of charge, to any person obtaining a copy of this   #
 # software and associated documentation files (the "Software"), to deal in the Software  #
diff --git a/modules/fieldlines/CMakeLists.txt b/modules/fieldlines/CMakeLists.txt
index 8951237b92..5e9c15f8e2 100644
--- a/modules/fieldlines/CMakeLists.txt
+++ b/modules/fieldlines/CMakeLists.txt
@@ -2,7 +2,7 @@
 #                                                                                        #
 # OpenSpace                                                                              #
 #                                                                                        #
-# Copyright (c) 2014-2023                                                                #
+# Copyright (c) 2014-2024                                                                #
 #                                                                                        #
 # Permission is hereby granted, free of charge, to any person obtaining a copy of this   #
 # software and associated documentation files (the "Software"), to deal in the Software  #
diff --git a/modules/fieldlinessequence/CMakeLists.txt b/modules/fieldlinessequence/CMakeLists.txt
index e04a63f744..e7ccdae21b 100644
--- a/modules/fieldlinessequence/CMakeLists.txt
+++ b/modules/fieldlinessequence/CMakeLists.txt
@@ -2,7 +2,7 @@
 #                                                                                        #
 # OpenSpace                                                                              #
 #                                                                                        #
-# Copyright (c) 2014-2023                                                                #
+# Copyright (c) 2014-2024                                                                #
 #                                                                                        #
 # Permission is hereby granted, free of charge, to any person obtaining a copy of this   #
 # software and associated documentation files (the "Software"), to deal in the Software  #
diff --git a/modules/fitsfilereader/CMakeLists.txt b/modules/fitsfilereader/CMakeLists.txt
index 72613a82ae..640ec48106 100644
--- a/modules/fitsfilereader/CMakeLists.txt
+++ b/modules/fitsfilereader/CMakeLists.txt
@@ -2,7 +2,7 @@
 #                                                                                        #
 # OpenSpace                                                                              #
 #                                                                                        #
-# Copyright (c) 2014-2023                                                                #
+# Copyright (c) 2014-2024                                                                #
 #                                                                                        #
 # Permission is hereby granted, free of charge, to any person obtaining a copy of this   #
 # software and associated documentation files (the "Software"), to deal in the Software  #
diff --git a/modules/gaia/CMakeLists.txt b/modules/gaia/CMakeLists.txt
index dae14a125a..679ee5d378 100644
--- a/modules/gaia/CMakeLists.txt
+++ b/modules/gaia/CMakeLists.txt
@@ -2,7 +2,7 @@
 #                                                                                        #
 # OpenSpace                                                                              #
 #                                                                                        #
-# Copyright (c) 2014-2023                                                                #
+# Copyright (c) 2014-2024                                                                #
 #                                                                                        #
 # Permission is hereby granted, free of charge, to any person obtaining a copy of this   #
 # software and associated documentation files (the "Software"), to deal in the Software  #
diff --git a/modules/galaxy/CMakeLists.txt b/modules/galaxy/CMakeLists.txt
index 0aeb7134cc..6466650d9c 100644
--- a/modules/galaxy/CMakeLists.txt
+++ b/modules/galaxy/CMakeLists.txt
@@ -2,7 +2,7 @@
 #                                                                                        #
 # OpenSpace                                                                              #
 #                                                                                        #
-# Copyright (c) 2014-2023                                                                #
+# Copyright (c) 2014-2024                                                                #
 #                                                                                        #
 # Permission is hereby granted, free of charge, to any person obtaining a copy of this   #
 # software and associated documentation files (the "Software"), to deal in the Software  #
diff --git a/modules/globebrowsing/CMakeLists.txt b/modules/globebrowsing/CMakeLists.txt
index bb1e85d6b6..c4d06db4c3 100644
--- a/modules/globebrowsing/CMakeLists.txt
+++ b/modules/globebrowsing/CMakeLists.txt
@@ -2,7 +2,7 @@
 #                                                                                        #
 # OpenSpace                                                                              #
 #                                                                                        #
-# Copyright (c) 2014-2023                                                                #
+# Copyright (c) 2014-2024                                                                #
 #                                                                                        #
 # Permission is hereby granted, free of charge, to any person obtaining a copy of this   #
 # software and associated documentation files (the "Software"), to deal in the Software  #
diff --git a/modules/imgui/CMakeLists.txt b/modules/imgui/CMakeLists.txt
index 4cb0a0b834..181d6c9e49 100644
--- a/modules/imgui/CMakeLists.txt
+++ b/modules/imgui/CMakeLists.txt
@@ -2,7 +2,7 @@
 #                                                                                        #
 # OpenSpace                                                                              #
 #                                                                                        #
-# Copyright (c) 2014-2023                                                                #
+# Copyright (c) 2014-2024                                                                #
 #                                                                                        #
 # Permission is hereby granted, free of charge, to any person obtaining a copy of this   #
 # software and associated documentation files (the "Software"), to deal in the Software  #
diff --git a/modules/imgui/ext/imgui/CMakeLists.txt b/modules/imgui/ext/imgui/CMakeLists.txt
index b5e6d70d94..be5458c86a 100644
--- a/modules/imgui/ext/imgui/CMakeLists.txt
+++ b/modules/imgui/ext/imgui/CMakeLists.txt
@@ -2,7 +2,7 @@
 #                                                                                        #
 # OpenSpace                                                                              #
 #                                                                                        #
-# Copyright (c) 2014-2023                                                                #
+# Copyright (c) 2014-2024                                                                #
 #                                                                                        #
 # Permission is hereby granted, free of charge, to any person obtaining a copy of this   #
 # software and associated documentation files (the "Software"), to deal in the Software  #
diff --git a/modules/iswa/CMakeLists.txt b/modules/iswa/CMakeLists.txt
index 6031ea4eff..20b143e009 100644
--- a/modules/iswa/CMakeLists.txt
+++ b/modules/iswa/CMakeLists.txt
@@ -2,7 +2,7 @@
 #                                                                                        #
 # OpenSpace                                                                              #
 #                                                                                        #
-# Copyright (c) 2014-2023                                                                #
+# Copyright (c) 2014-2024                                                                #
 #                                                                                        #
 # Permission is hereby granted, free of charge, to any person obtaining a copy of this   #
 # software and associated documentation files (the "Software"), to deal in the Software  #
diff --git a/modules/kameleon/CMakeLists.txt b/modules/kameleon/CMakeLists.txt
index be25d7dc12..5933965c9c 100644
--- a/modules/kameleon/CMakeLists.txt
+++ b/modules/kameleon/CMakeLists.txt
@@ -2,7 +2,7 @@
 #                                                                                        #
 # OpenSpace                                                                              #
 #                                                                                        #
-# Copyright (c) 2014-2023                                                                #
+# Copyright (c) 2014-2024                                                                #
 #                                                                                        #
 # Permission is hereby granted, free of charge, to any person obtaining a copy of this   #
 # software and associated documentation files (the "Software"), to deal in the Software  #
diff --git a/modules/kameleonvolume/CMakeLists.txt b/modules/kameleonvolume/CMakeLists.txt
index e4931f2065..da6b16bdc2 100644
--- a/modules/kameleonvolume/CMakeLists.txt
+++ b/modules/kameleonvolume/CMakeLists.txt
@@ -2,7 +2,7 @@
 #                                                                                        #
 # OpenSpace                                                                              #
 #                                                                                        #
-# Copyright (c) 2014-2023                                                                #
+# Copyright (c) 2014-2024                                                                #
 #                                                                                        #
 # Permission is hereby granted, free of charge, to any person obtaining a copy of this   #
 # software and associated documentation files (the "Software"), to deal in the Software  #
diff --git a/modules/multiresvolume/CMakeLists.txt b/modules/multiresvolume/CMakeLists.txt
index 33414e7b08..5a9fcbfae3 100644
--- a/modules/multiresvolume/CMakeLists.txt
+++ b/modules/multiresvolume/CMakeLists.txt
@@ -2,7 +2,7 @@
 #                                                                                        #
 # OpenSpace                                                                              #
 #                                                                                        #
-# Copyright (c) 2014-2023                                                                #
+# Copyright (c) 2014-2024                                                                #
 #                                                                                        #
 # Permission is hereby granted, free of charge, to any person obtaining a copy of this   #
 # software and associated documentation files (the "Software"), to deal in the Software  #
diff --git a/modules/server/CMakeLists.txt b/modules/server/CMakeLists.txt
index 6b278b6984..6979a06d7e 100644
--- a/modules/server/CMakeLists.txt
+++ b/modules/server/CMakeLists.txt
@@ -2,7 +2,7 @@
 #                                                                                        #
 # OpenSpace                                                                              #
 #                                                                                        #
-# Copyright (c) 2014-2023                                                                #
+# Copyright (c) 2014-2024                                                                #
 #                                                                                        #
 # Permission is hereby granted, free of charge, to any person obtaining a copy of this   #
 # software and associated documentation files (the "Software"), to deal in the Software  #
diff --git a/modules/skybrowser/CMakeLists.txt b/modules/skybrowser/CMakeLists.txt
index 7673e2f661..1bf961321e 100644
--- a/modules/skybrowser/CMakeLists.txt
+++ b/modules/skybrowser/CMakeLists.txt
@@ -2,7 +2,7 @@
 #                                                                                        #
 # OpenSpace                                                                              #
 #                                                                                        #
-# Copyright (c) 2014-2023                                                                #
+# Copyright (c) 2014-2024                                                                #
 #                                                                                        #
 # Permission is hereby granted, free of charge, to any person obtaining a copy of this   #
 # software and associated documentation files (the "Software"), to deal in the Software  #
diff --git a/modules/space/CMakeLists.txt b/modules/space/CMakeLists.txt
index dcd096bbb4..9a5eb1dd58 100644
--- a/modules/space/CMakeLists.txt
+++ b/modules/space/CMakeLists.txt
@@ -2,7 +2,7 @@
 #                                                                                        #
 # OpenSpace                                                                              #
 #                                                                                        #
-# Copyright (c) 2014-2023                                                                #
+# Copyright (c) 2014-2024                                                                #
 #                                                                                        #
 # Permission is hereby granted, free of charge, to any person obtaining a copy of this   #
 # software and associated documentation files (the "Software"), to deal in the Software  #
diff --git a/modules/spacecraftinstruments/CMakeLists.txt b/modules/spacecraftinstruments/CMakeLists.txt
index a45da7f0fc..7e01cfcd96 100644
--- a/modules/spacecraftinstruments/CMakeLists.txt
+++ b/modules/spacecraftinstruments/CMakeLists.txt
@@ -2,7 +2,7 @@
 #                                                                                        #
 # OpenSpace                                                                              #
 #                                                                                        #
-# Copyright (c) 2014-2023                                                                #
+# Copyright (c) 2014-2024                                                                #
 #                                                                                        #
 # Permission is hereby granted, free of charge, to any person obtaining a copy of this   #
 # software and associated documentation files (the "Software"), to deal in the Software  #
diff --git a/modules/spout/CMakeLists.txt b/modules/spout/CMakeLists.txt
index 8cbb806213..78fcac90f6 100644
--- a/modules/spout/CMakeLists.txt
+++ b/modules/spout/CMakeLists.txt
@@ -2,7 +2,7 @@
 #                                                                                        #
 # OpenSpace                                                                              #
 #                                                                                        #
-# Copyright (c) 2014-2023                                                                #
+# Copyright (c) 2014-2024                                                                #
 #                                                                                        #
 # Permission is hereby granted, free of charge, to any person obtaining a copy of this   #
 # software and associated documentation files (the "Software"), to deal in the Software  #
diff --git a/modules/statemachine/CMakeLists.txt b/modules/statemachine/CMakeLists.txt
index 55b3d8aa31..cc60bd2089 100644
--- a/modules/statemachine/CMakeLists.txt
+++ b/modules/statemachine/CMakeLists.txt
@@ -2,7 +2,7 @@
 #                                                                                        #
 # OpenSpace                                                                              #
 #                                                                                        #
-# Copyright (c) 2014-2023                                                                #
+# Copyright (c) 2014-2024                                                                #
 #                                                                                        #
 # Permission is hereby granted, free of charge, to any person obtaining a copy of this   #
 # software and associated documentation files (the "Software"), to deal in the Software  #
diff --git a/modules/sync/CMakeLists.txt b/modules/sync/CMakeLists.txt
index fd88a89ebb..18b7e60c63 100644
--- a/modules/sync/CMakeLists.txt
+++ b/modules/sync/CMakeLists.txt
@@ -2,7 +2,7 @@
 #                                                                                        #
 # OpenSpace                                                                              #
 #                                                                                        #
-# Copyright (c) 2014-2023                                                                #
+# Copyright (c) 2014-2024                                                                #
 #                                                                                        #
 # Permission is hereby granted, free of charge, to any person obtaining a copy of this   #
 # software and associated documentation files (the "Software"), to deal in the Software  #
diff --git a/modules/touch/CMakeLists.txt b/modules/touch/CMakeLists.txt
index 778c756fda..9ad65d48eb 100644
--- a/modules/touch/CMakeLists.txt
+++ b/modules/touch/CMakeLists.txt
@@ -2,7 +2,7 @@
 #                                                                                        #
 # OpenSpace                                                                              #
 #                                                                                        #
-# Copyright (c) 2014-2023                                                                #
+# Copyright (c) 2014-2024                                                                #
 #                                                                                        #
 # Permission is hereby granted, free of charge, to any person obtaining a copy of this   #
 # software and associated documentation files (the "Software"), to deal in the Software  #
diff --git a/modules/touch/ext/CMakeLists.txt b/modules/touch/ext/CMakeLists.txt
index 4013ffb0c8..78f58433ca 100644
--- a/modules/touch/ext/CMakeLists.txt
+++ b/modules/touch/ext/CMakeLists.txt
@@ -2,7 +2,7 @@
 #                                                                                        #
 # OpenSpace                                                                              #
 #                                                                                        #
-# Copyright (c) 2014-2023                                                                #
+# Copyright (c) 2014-2024                                                                #
 #                                                                                        #
 # Permission is hereby granted, free of charge, to any person obtaining a copy of this   #
 # software and associated documentation files (the "Software"), to deal in the Software  #
diff --git a/modules/toyvolume/CMakeLists.txt b/modules/toyvolume/CMakeLists.txt
index 03ab3be8c4..7e901c6840 100644
--- a/modules/toyvolume/CMakeLists.txt
+++ b/modules/toyvolume/CMakeLists.txt
@@ -2,7 +2,7 @@
 #                                                                                        #
 # OpenSpace                                                                              #
 #                                                                                        #
-# Copyright (c) 2014-2023                                                                #
+# Copyright (c) 2014-2024                                                                #
 #                                                                                        #
 # Permission is hereby granted, free of charge, to any person obtaining a copy of this   #
 # software and associated documentation files (the "Software"), to deal in the Software  #
diff --git a/modules/video/CMakeLists.txt b/modules/video/CMakeLists.txt
index af48257537..b1da87faf3 100644
--- a/modules/video/CMakeLists.txt
+++ b/modules/video/CMakeLists.txt
@@ -2,7 +2,7 @@
 #                                                                                        #
 # OpenSpace                                                                              #
 #                                                                                        #
-# Copyright (c) 2014-2023                                                                #
+# Copyright (c) 2014-2024                                                                #
 #                                                                                        #
 # Permission is hereby granted, free of charge, to any person obtaining a copy of this   #
 # software and associated documentation files (the "Software"), to deal in the Software  #
diff --git a/modules/vislab/CMakeLists.txt b/modules/vislab/CMakeLists.txt
index 05e583dfb5..32e5457636 100644
--- a/modules/vislab/CMakeLists.txt
+++ b/modules/vislab/CMakeLists.txt
@@ -2,7 +2,7 @@
 #                                                                                        #
 # OpenSpace                                                                              #
 #                                                                                        #
-# Copyright (c) 2014-2023                                                                #
+# Copyright (c) 2014-2024                                                                #
 #                                                                                        #
 # Permission is hereby granted, free of charge, to any person obtaining a copy of this   #
 # software and associated documentation files (the "Software"), to deal in the Software  #
diff --git a/modules/volume/CMakeLists.txt b/modules/volume/CMakeLists.txt
index f997e0a719..4a7fdf6941 100644
--- a/modules/volume/CMakeLists.txt
+++ b/modules/volume/CMakeLists.txt
@@ -2,7 +2,7 @@
 #                                                                                        #
 # OpenSpace                                                                              #
 #                                                                                        #
-# Copyright (c) 2014-2023                                                                #
+# Copyright (c) 2014-2024                                                                #
 #                                                                                        #
 # Permission is hereby granted, free of charge, to any person obtaining a copy of this   #
 # software and associated documentation files (the "Software"), to deal in the Software  #
diff --git a/modules/webbrowser/CMakeLists.txt b/modules/webbrowser/CMakeLists.txt
index 241d8bfd21..9d4674f4e5 100644
--- a/modules/webbrowser/CMakeLists.txt
+++ b/modules/webbrowser/CMakeLists.txt
@@ -2,7 +2,7 @@
 #                                                                                        #
 # OpenSpace                                                                              #
 #                                                                                        #
-# Copyright (c) 2014-2023                                                                #
+# Copyright (c) 2014-2024                                                                #
 #                                                                                        #
 # Permission is hereby granted, free of charge, to any person obtaining a copy of this   #
 # software and associated documentation files (the "Software"), to deal in the Software  #
diff --git a/modules/webbrowser/cmake/cef_support.cmake b/modules/webbrowser/cmake/cef_support.cmake
index 305bfc6485..057a24de16 100644
--- a/modules/webbrowser/cmake/cef_support.cmake
+++ b/modules/webbrowser/cmake/cef_support.cmake
@@ -2,7 +2,7 @@
 #                                                                                        #
 # OpenSpace                                                                              #
 #                                                                                        #
-# Copyright (c) 2014-2023                                                                #
+# Copyright (c) 2014-2024                                                                #
 #                                                                                        #
 # Permission is hereby granted, free of charge, to any person obtaining a copy of this   #
 # software and associated documentation files (the "Software"), to deal in the Software  #
diff --git a/modules/webbrowser/cmake/webbrowser_helpers.cmake b/modules/webbrowser/cmake/webbrowser_helpers.cmake
index b57f41db26..0a2feb9ffc 100644
--- a/modules/webbrowser/cmake/webbrowser_helpers.cmake
+++ b/modules/webbrowser/cmake/webbrowser_helpers.cmake
@@ -2,7 +2,7 @@
 #                                                                                        #
 # OpenSpace                                                                              #
 #                                                                                        #
-# Copyright (c) 2014-2023                                                                #
+# Copyright (c) 2014-2024                                                                #
 #                                                                                        #
 # Permission is hereby granted, free of charge, to any person obtaining a copy of this   #
 # software and associated documentation files (the "Software"), to deal in the Software  #
diff --git a/modules/webgui/CMakeLists.txt b/modules/webgui/CMakeLists.txt
index 94b5a7c2cd..9e6f93a234 100644
--- a/modules/webgui/CMakeLists.txt
+++ b/modules/webgui/CMakeLists.txt
@@ -2,7 +2,7 @@
 #                                                                                        #
 # OpenSpace                                                                              #
 #                                                                                        #
-# Copyright (c) 2014-2023                                                                #
+# Copyright (c) 2014-2024                                                                #
 #                                                                                        #
 # Permission is hereby granted, free of charge, to any person obtaining a copy of this   #
 # software and associated documentation files (the "Software"), to deal in the Software  #
diff --git a/modules/webgui/cmake/nodejs_support.cmake b/modules/webgui/cmake/nodejs_support.cmake
index bb1a3d6c5d..1baba0e9c1 100644
--- a/modules/webgui/cmake/nodejs_support.cmake
+++ b/modules/webgui/cmake/nodejs_support.cmake
@@ -2,7 +2,7 @@
 #                                                                                        #
 # OpenSpace                                                                              #
 #                                                                                        #
-# Copyright (c) 2014-2023                                                                #
+# Copyright (c) 2014-2024                                                                #
 #                                                                                        #
 # Permission is hereby granted, free of charge, to any person obtaining a copy of this   #
 # software and associated documentation files (the "Software"), to deal in the Software  #
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 1faaebc1b9..b80cad0304 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -2,7 +2,7 @@
 #                                                                                        #
 # OpenSpace                                                                              #
 #                                                                                        #
-# Copyright (c) 2014-2023                                                                #
+# Copyright (c) 2014-2024                                                                #
 #                                                                                        #
 # Permission is hereby granted, free of charge, to any person obtaining a copy of this   #
 # software and associated documentation files (the "Software"), to deal in the Software  #
diff --git a/support/cmake/application_definition.cmake b/support/cmake/application_definition.cmake
index caeb2666bd..b2464a3ba0 100644
--- a/support/cmake/application_definition.cmake
+++ b/support/cmake/application_definition.cmake
@@ -2,7 +2,7 @@
 #                                                                                        #
 # OpenSpace                                                                              #
 #                                                                                        #
-# Copyright (c) 2014-2023                                                                #
+# Copyright (c) 2014-2024                                                                #
 #                                                                                        #
 # Permission is hereby granted, free of charge, to any person obtaining a copy of this   #
 # software and associated documentation files (the "Software"), to deal in the Software  #
diff --git a/support/cmake/global_variables.cmake b/support/cmake/global_variables.cmake
index e6dfa7e593..1a05eb8d3d 100644
--- a/support/cmake/global_variables.cmake
+++ b/support/cmake/global_variables.cmake
@@ -2,7 +2,7 @@
 #                                                                                        #
 # OpenSpace                                                                              #
 #                                                                                        #
-# Copyright (c) 2014-2023                                                                #
+# Copyright (c) 2014-2024                                                                #
 #                                                                                        #
 # Permission is hereby granted, free of charge, to any person obtaining a copy of this   #
 # software and associated documentation files (the "Software"), to deal in the Software  #
diff --git a/support/cmake/module_common.cmake b/support/cmake/module_common.cmake
index a2306feda5..8cef114230 100644
--- a/support/cmake/module_common.cmake
+++ b/support/cmake/module_common.cmake
@@ -2,7 +2,7 @@
 #                                                                                        #
 # OpenSpace                                                                              #
 #                                                                                        #
-# Copyright (c) 2014-2023                                                                #
+# Copyright (c) 2014-2024                                                                #
 #                                                                                        #
 # Permission is hereby granted, free of charge, to any person obtaining a copy of this   #
 # software and associated documentation files (the "Software"), to deal in the Software  #
diff --git a/support/cmake/module_definition.cmake b/support/cmake/module_definition.cmake
index 30a2b412d4..11a33eed04 100644
--- a/support/cmake/module_definition.cmake
+++ b/support/cmake/module_definition.cmake
@@ -2,7 +2,7 @@
 #                                                                                        #
 # OpenSpace                                                                              #
 #                                                                                        #
-# Copyright (c) 2014-2023                                                                #
+# Copyright (c) 2014-2024                                                                #
 #                                                                                        #
 # Permission is hereby granted, free of charge, to any person obtaining a copy of this   #
 # software and associated documentation files (the "Software"), to deal in the Software  #
diff --git a/support/cmake/packaging.cmake b/support/cmake/packaging.cmake
index 528309880a..d3000e8231 100644
--- a/support/cmake/packaging.cmake
+++ b/support/cmake/packaging.cmake
@@ -2,7 +2,7 @@
 #                                                                                        #
 # OpenSpace                                                                              #
 #                                                                                        #
-# Copyright (c) 2014-2023                                                                #
+# Copyright (c) 2014-2024                                                                #
 #                                                                                        #
 # Permission is hereby granted, free of charge, to any person obtaining a copy of this   #
 # software and associated documentation files (the "Software"), to deal in the Software  #
diff --git a/support/cmake/set_openspace_compile_settings.cmake b/support/cmake/set_openspace_compile_settings.cmake
index 8d44f0b44e..31c578c582 100644
--- a/support/cmake/set_openspace_compile_settings.cmake
+++ b/support/cmake/set_openspace_compile_settings.cmake
@@ -2,7 +2,7 @@
 #                                                                                        #
 # OpenSpace                                                                              #
 #                                                                                        #
-# Copyright (c) 2014-2023                                                                #
+# Copyright (c) 2014-2024                                                                #
 #                                                                                        #
 # Permission is hereby granted, free of charge, to any person obtaining a copy of this   #
 # software and associated documentation files (the "Software"), to deal in the Software  #
diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
index 434608d6e0..3fc2ce772a 100644
--- a/tests/CMakeLists.txt
+++ b/tests/CMakeLists.txt
@@ -2,7 +2,7 @@
 #                                                                                        #
 # OpenSpace                                                                              #
 #                                                                                        #
-# Copyright (c) 2014-2023                                                                #
+# Copyright (c) 2014-2024                                                                #
 #                                                                                        #
 # Permission is hereby granted, free of charge, to any person obtaining a copy of this   #
 # software and associated documentation files (the "Software"), to deal in the Software  #

From dd73978fa22ea6c50b00b54aad7ec1d40a632c0f Mon Sep 17 00:00:00 2001
From: Alexander Bock <alexander.bock@liu.se>
Date: Fri, 2 Aug 2024 14:57:13 +0200
Subject: [PATCH 559/701] Use correct UTC time string in Pluto trail

---
 .../solarsystem/dwarf_planets/pluto/pluto_trail_kepler.asset    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/data/assets/scene/solarsystem/dwarf_planets/pluto/pluto_trail_kepler.asset b/data/assets/scene/solarsystem/dwarf_planets/pluto/pluto_trail_kepler.asset
index f354e963c0..37406804ca 100644
--- a/data/assets/scene/solarsystem/dwarf_planets/pluto/pluto_trail_kepler.asset
+++ b/data/assets/scene/solarsystem/dwarf_planets/pluto/pluto_trail_kepler.asset
@@ -19,7 +19,7 @@ local PlutoKeplerianTrail = {
       AscendingNode = 110.2099981996057,
       ArgumentOfPeriapsis = 114.2248569189779,
       MeanAnomaly = 14.53,
-      Epoch = "2000 01 01 00:00",
+      Epoch = "2000 JAN 01 00:00:00",
       Period = 7824380000
     },
     Color = { 0.2, 0.8, 0.3 },

From ca40f173b5cdfd7ef180102d30c2c97ea2f05304 Mon Sep 17 00:00:00 2001
From: Alexander Bock <alexander.bock@liu.se>
Date: Fri, 2 Aug 2024 15:36:41 +0200
Subject: [PATCH 560/701] Don't try to convert "Today" or "Yesterday" using
 SPICE

---
 modules/globebrowsing/src/tileprovider/temporaltileprovider.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/globebrowsing/src/tileprovider/temporaltileprovider.cpp b/modules/globebrowsing/src/tileprovider/temporaltileprovider.cpp
index 82982310eb..fe66bba7be 100644
--- a/modules/globebrowsing/src/tileprovider/temporaltileprovider.cpp
+++ b/modules/globebrowsing/src/tileprovider/temporaltileprovider.cpp
@@ -200,11 +200,11 @@ TemporalTileProvider::TemporalTileProvider(const ghoul::Dictionary& dictionary)
         const Time start = Time(p.prototyped->time.start);
         Time end = Time::now();
         _prototyped.startTimeJ2000 = start.j2000Seconds();
-        _prototyped.endTimeJ2000 = Time(p.prototyped->time.end).j2000Seconds();
         if (p.prototyped->time.end == "Yesterday") {
             end.advanceTime(-60.0 * 60.0 * 24.0); // Go back one day
         }
         else if (p.prototyped->time.end != "Today") {
+            _prototyped.endTimeJ2000 = Time(p.prototyped->time.end).j2000Seconds();
             end.setTime(p.prototyped->time.end);
         }
 

From 952f177c544856fdfd553f4ce8f8f62f1c364ccd Mon Sep 17 00:00:00 2001
From: Ylva Selling <ylva.selling@gmail.com>
Date: Fri, 2 Aug 2024 16:30:07 +0200
Subject: [PATCH 561/701] UI updates (#3358)

* Remove events for scenegraphnodes and screenspacerenderables

* Add events for updating the property tree

* Remove duplicate function calls

* Update src/properties/propertyowner.cpp

Co-authored-by: Emma Broman <emma.broman@liu.se>

* Address PR comments and make helper functions with better comments

* Make uri function not return the identifier if the uri is not valid

* Rename fullyQualifiedIdentifier to uri

* Update gui hash

---------

Co-authored-by: Ylva Selling <ylva.selling@liu.se>
Co-authored-by: Emma Broman <emma.broman@liu.se>
---
 data/assets/util/webgui.asset                 |   2 +-
 include/openspace/events/event.h              | 107 ++-----------
 .../properties/numericalproperty.inl          |   2 +-
 include/openspace/properties/property.h       |  10 +-
 .../renderableinterpolatedpoints.cpp          |   8 +-
 modules/globebrowsing/src/layergroup.cpp      |  20 +--
 modules/imgui/src/renderproperties.cpp        |  48 +++---
 src/documentation/documentationengine.cpp     |   2 +-
 src/events/event.cpp                          | 147 +++---------------
 src/interaction/sessionrecording.cpp          |   2 +-
 src/properties/property.cpp                   |   8 +-
 src/properties/propertyowner.cpp              |  37 ++++-
 src/rendering/renderengine.cpp                |   3 -
 src/scene/profile.cpp                         |   2 +-
 src/scene/scene.cpp                           |   2 -
 src/scene/scene_lua.inl                       |   6 +-
 16 files changed, 125 insertions(+), 281 deletions(-)

diff --git a/data/assets/util/webgui.asset b/data/assets/util/webgui.asset
index 6b757eb07d..b58de5162b 100644
--- a/data/assets/util/webgui.asset
+++ b/data/assets/util/webgui.asset
@@ -4,7 +4,7 @@ local guiCustomization = asset.require("customization/gui")
 
 
 -- Select which commit hashes to use for the frontend and backend
-local frontendHash = "95ed7fb5853d27d2b879f6f409f3101a018e03ce"
+local frontendHash = "c607523e86ab29c573b157c956dcf0b0e4492395"
 
 local frontend = asset.resource({
   Identifier = "WebGuiFrontend",
diff --git a/include/openspace/events/event.h b/include/openspace/events/event.h
index c1f685fa12..e1ce7c0ad1 100644
--- a/include/openspace/events/event.h
+++ b/include/openspace/events/event.h
@@ -58,21 +58,17 @@ struct Event {
     //     if they are triggered by events
     //  6. Add the new enum entry into the `toString` and `fromString` methods
     enum class Type : uint8_t {
-        SceneGraphNodeAdded,
-        SceneGraphNodeRemoved,
         ParallelConnection,
         ProfileLoadingFinished,
         ApplicationShutdown,
-        ScreenSpaceRenderableAdded,
-        ScreenSpaceRenderableRemoved,
         CameraFocusTransition,
         TimeOfInterestReached,
         MissionEventReached,
         PlanetEclipsed,
         InterpolationFinished,
         FocusNodeChanged,
-        LayerAdded,
-        LayerRemoved,
+        PropertyTreeUpdated,
+        PropertyTreePruned,
         ActionAdded,
         ActionRemoved,
         SessionRecordingPlayback,
@@ -114,43 +110,6 @@ void logAllEvents(const Event* e);
 //  Events
 //
 
-/**
- * This event is created whenever a new scene graph node is added to the system. By the
- * time this event is signalled, the scene graph node has already been created and added
- * to the scene.
- */
-struct EventSceneGraphNodeAdded : public Event {
-    static constexpr Type Type = Event::Type::SceneGraphNodeAdded;
-
-    /**
-     * Creates an instance of an EventSceneGraphNodeAdded event.
-     *
-     * \param node_ A pointer to the node that was added
-     *
-     * \pre node_ must not be nullptr
-     */
-    explicit EventSceneGraphNodeAdded(const SceneGraphNode* node_);
-    const tstring uri;
-};
-
-/**
- * This event is created whenever a scene graph node was removed. By the time this event
- * is signalled, the scene graph node has already been removed.
- */
-struct EventSceneGraphNodeRemoved : public Event {
-    static constexpr Type Type = Event::Type::SceneGraphNodeRemoved;
-
-    /**
-     * Creates an instance of an EventSceneGraphNodeRemoved event.
-     *
-     * \param node_ A pointer to the node that was removed
-     *
-     * \pre node_ must not be nullptr
-     */
-    explicit EventSceneGraphNodeRemoved(const SceneGraphNode* node_);
-    const tstring uri;
-};
-
 /**
  * This event is created whenever something in the parallel connection subsystem changes.
  * The new state is sent as an argument with this event.
@@ -212,43 +171,6 @@ struct EventApplicationShutdown : public Event {
     const State state;
 };
 
-/**
- * This event is created when a new screenspace renderable has been created.  By the time
- * this event is created, the screenspace renderable is already registered and available.
- */
-struct EventScreenSpaceRenderableAdded : public Event {
-    static constexpr Type Type = Event::Type::ScreenSpaceRenderableAdded;
-
-    /**
-     * Creates an instance of an EventScreenSpaceRenderableAdded event.
-     *
-     * \param renderable_ The the new screenspace renderable that was added to the system
-     *
-     * \pre renderable_ must not be nullptr
-     */
-    explicit EventScreenSpaceRenderableAdded(const ScreenSpaceRenderable* renderable_);
-    const tstring uri;
-};
-
-/**
- * This event is created when a screenspace renderable has been removed from the system.
- * When this event is created, the screenspace renderable has already been removed and is
- * no longer available.
- */
-struct EventScreenSpaceRenderableRemoved : public Event {
-    static constexpr Type Type = Event::Type::ScreenSpaceRenderableRemoved;
-
-    /**
-     * Creates an instance of an EventScreenSpaceRenderableRemoved event.
-     *
-     * \param renderable_ The the new screenspace renderable that was removed
-     *
-     * \pre renderable_ must not be nullptr
-     */
-    explicit EventScreenSpaceRenderableRemoved(const ScreenSpaceRenderable* renderable_);
-    const tstring uri;
-};
-
 /**
  * This event is created when the camera transitions between different interaction sphere
  * distances. Right now, only movement relative to camera's focus node is considered.
@@ -393,37 +315,38 @@ struct EventFocusNodeChanged : public Event {
 };
 
 /**
- * This event is created when a layer is added to to a globe.
+ * This event is created a property owner or property has been added or has changed.
  */
-struct EventLayerAdded : public Event {
-    static constexpr Type Type = Event::Type::LayerAdded;
+struct EventPropertyTreeUpdated : public Event {
+    static constexpr Type Type = Event::Type::PropertyTreeUpdated;
 
     /**
-     * Creates an instance of an EventLayerAdded event.
+     * Creates an instance of an EventPropertyTreeUpdated event.
      *
-     * \param uri_ A string with the uri of the layer that was added
+     * \param uri_ A string with the uri of the property or property owner that was added
      *
      * \pre uri_ must be a valid uri
      */
-    explicit EventLayerAdded(std::string_view uri_);
+    explicit EventPropertyTreeUpdated(std::string_view uri_);
 
     const tstring uri;
 };
 
 /**
- * This event is created when a layer is removed from a globe.
+ * This event is created when a property owner or property is removed from a the property
+ * tree.
  */
-struct EventLayerRemoved : public Event {
-    static constexpr Type Type = Event::Type::LayerRemoved;
+struct EventPropertyTreePruned : public Event {
+    static constexpr Type Type = Event::Type::PropertyTreePruned;
 
     /**
-     * Creates an instance of an EventLayerRemoved event.
+     * Creates an instance of an EventPropertyTreePruned event.
      *
-     * \param uri_ The uri of the layer that was removed
+     * \param uri_ The uri of the property or property owner that was removed
      *
      * \pre uri_ must be a valid uri
      */
-    explicit EventLayerRemoved(std::string_view uri_);
+    explicit EventPropertyTreePruned(std::string_view uri_);
 
     const tstring uri;
 };
diff --git a/include/openspace/properties/numericalproperty.inl b/include/openspace/properties/numericalproperty.inl
index 284b821e35..d687449650 100644
--- a/include/openspace/properties/numericalproperty.inl
+++ b/include/openspace/properties/numericalproperty.inl
@@ -113,7 +113,7 @@ void NumericalProperty<T>::setExponent(float exponent) {
                 std::format(
                     "Setting exponent for properties with negative values in "
                     "[min, max] range is not yet supported. Property: {}",
-                    this->fullyQualifiedIdentifier()
+                    this->uri()
                 )
             );
             _exponent = 1.f;
diff --git a/include/openspace/properties/property.h b/include/openspace/properties/property.h
index 2d1e6721e1..e2e66d940b 100644
--- a/include/openspace/properties/property.h
+++ b/include/openspace/properties/property.h
@@ -294,13 +294,15 @@ public:
     const std::string& identifier() const;
 
     /**
-     * Returns the fully qualified name for this Property that uniquely identifies this
-     * Property within OpenSpace. It consists of the identifier preceded by all levels of
-     * PropertyOwner%s separated with `.`; for example: `owner1.owner2.identifier`.
+     * Returns the URI for this Property that uniquely identifies this Property within
+     * OpenSpace. It consists of the identifier preceded by all levels of PropertyOwner%s
+     * separated with `.`; for example: `owner1.owner2.identifier`. If the URI is invalid
+     * (the Property hasn't been added to the property tree yet), it returns an empty
+     * string.
      *
      * \return The fully qualified identifier for this Property
      */
-    std::string fullyQualifiedIdentifier() const;
+    std::string uri() const;
 
     /**
      * Returns the PropertyOwner of this Property or `nullptr`, if it does not have an
diff --git a/modules/base/rendering/pointcloud/renderableinterpolatedpoints.cpp b/modules/base/rendering/pointcloud/renderableinterpolatedpoints.cpp
index 8cc051be28..c499192fbe 100644
--- a/modules/base/rendering/pointcloud/renderableinterpolatedpoints.cpp
+++ b/modules/base/rendering/pointcloud/renderableinterpolatedpoints.cpp
@@ -198,7 +198,7 @@ RenderableInterpolatedPoints::Interpolation::Interpolation()
         float remaining = value.maxValue() - value;
         float duration = remaining / speed;
         triggerInterpolation(
-            value.fullyQualifiedIdentifier(),
+            value.uri(),
             value.maxValue(),
             duration
         );
@@ -206,21 +206,21 @@ RenderableInterpolatedPoints::Interpolation::Interpolation()
 
     interpolateToStart.onChange([triggerInterpolation, this]() {
         float duration = value / speed;
-        triggerInterpolation(value.fullyQualifiedIdentifier(), 0.f, duration);
+        triggerInterpolation(value.uri(), 0.f, duration);
     });
 
     interpolateToNextStep.onChange([triggerInterpolation, this]() {
         float prevValue = glm::floor(value);
         float newValue = glm::min(prevValue + 1.f, value.maxValue());
         float duration = 1.f / speed;
-        triggerInterpolation(value.fullyQualifiedIdentifier(), newValue, duration);
+        triggerInterpolation(value.uri(), newValue, duration);
     });
 
     interpolateToPrevStep.onChange([triggerInterpolation, this]() {
         float prevValue = glm::ceil(value);
         float newValue = glm::max(prevValue - 1.f, value.minValue());
         float duration = 1.f / speed;
-        triggerInterpolation(value.fullyQualifiedIdentifier(), newValue, duration);
+        triggerInterpolation(value.uri(), newValue, duration);
     });
 
     addProperty(interpolateToEnd);
diff --git a/modules/globebrowsing/src/layergroup.cpp b/modules/globebrowsing/src/layergroup.cpp
index 0b8ae03134..1e14b80063 100644
--- a/modules/globebrowsing/src/layergroup.cpp
+++ b/modules/globebrowsing/src/layergroup.cpp
@@ -168,19 +168,6 @@ Layer* LayerGroup::addLayer(const ghoul::Dictionary& layerDict) {
     properties::PropertyOwner* layerGroup = ptr->owner();
     properties::PropertyOwner* layerManager = layerGroup->owner();
 
-    // @TODO (emmbr, 2021-11-03) If the layer is added as part of the globe's
-    // dictionary during construction this function is called in the LayerManager's
-    // initialize function. This means that the layerManager does not exists yet, and
-    // we cannot find which SGN it belongs to... Want to avoid doing this check, so
-    // this should be fixed (probably as part of a cleanup/rewite of the LayerManager)
-    if (layerManager) {
-        properties::PropertyOwner* globe = layerManager->owner();
-        properties::PropertyOwner* sceneGraphNode = globe->owner();
-        global::eventEngine->publishEvent<events::EventLayerAdded>(
-            ptr->uri()
-        );
-    }
-
     return ptr;
 }
 
@@ -198,9 +185,7 @@ void LayerGroup::deleteLayer(const std::string& layerName) {
             properties::PropertyOwner* layerManager = layerGroup->owner();
             properties::PropertyOwner* globe = layerManager->owner();
             properties::PropertyOwner* sceneGraphNode = globe->owner();
-            global::eventEngine->publishEvent<events::EventLayerRemoved>(
-                it->get()->uri()
-            );
+
             // We need to keep the name of the layer since we only get it as a reference
             // and the name needs to survive the deletion
             const std::string lName = layerName;
@@ -301,6 +286,9 @@ void LayerGroup::moveLayer(int oldPosition, int newPosition) {
     RenderableGlobe* renderable = dynamic_cast<RenderableGlobe*>(manager->owner());
     ghoul_assert(manager, "Hierarchy error: LayerManager. Owner is not RenderableGlobe");
     renderable->invalidateShader();
+
+    // Notify that the layers are in a different order
+    global::eventEngine->publishEvent<events::EventPropertyTreeUpdated>(uri());
 }
 
 std::vector<Layer*> LayerGroup::layers() const {
diff --git a/modules/imgui/src/renderproperties.cpp b/modules/imgui/src/renderproperties.cpp
index 4e1b285951..c748be1f94 100644
--- a/modules/imgui/src/renderproperties.cpp
+++ b/modules/imgui/src/renderproperties.cpp
@@ -65,7 +65,7 @@ void renderTooltip(Property* prop, double delay) {
         }
         ImGui::Text(
             "%s",
-            (std::string("Identifier: ") + prop->fullyQualifiedIdentifier()).c_str()
+            (std::string("Identifier: ") + prop->uri()).c_str()
         );
         ImGui::EndTooltip();
     }
@@ -95,7 +95,7 @@ void renderBoolProperty(Property* prop, const std::string& ownerName,
     }
 
     if (value != p->value()) {
-        executeSetPropertyScript(p->fullyQualifiedIdentifier(), value ? "true" : "false");
+        executeSetPropertyScript(p->uri(), value ? "true" : "false");
     }
     ImGui::PopID();
 }
@@ -158,7 +158,7 @@ void renderOptionProperty(Property* prop, const std::string& ownerName,
         }
     }
     if (value != p->value() && !isReadOnly) {
-        executeSetPropertyScript(p->fullyQualifiedIdentifier(), std::to_string(value));
+        executeSetPropertyScript(p->uri(), std::to_string(value));
     }
     ImGui::PopID();
 }
@@ -200,7 +200,7 @@ void renderSelectionProperty(Property* prop, const std::string& ownerName,
                 parameters.pop_back();
             }
             parameters += "}";
-            executeSetPropertyScript(p->fullyQualifiedIdentifier(), parameters);
+            executeSetPropertyScript(p->uri(), parameters);
         }
         ImGui::TreePop();
     }
@@ -231,7 +231,7 @@ void renderStringProperty(Property* prop, const std::string& ownerName,
 
     if (hasNewValue) {
         executeSetPropertyScript(
-            p->fullyQualifiedIdentifier(),
+            p->uri(),
             "[[" + std::string(buffer.data()) + "]]"
         );
     }
@@ -283,7 +283,7 @@ void renderDoubleListProperty(Property* prop, const std::string& ownerName,
     ImGui::PushID((ownerName + '.' + name).c_str());
 
     const std::string value = p->stringValue();
-    renderListProperty(name, p->fullyQualifiedIdentifier(), value);
+    renderListProperty(name, p->uri(), value);
 
     if (showTooltip) {
         renderTooltip(prop, tooltipDelay);
@@ -301,7 +301,7 @@ void renderIntListProperty(Property* prop, const std::string& ownerName,
     ImGui::PushID((ownerName + '.' + name).c_str());
 
     const std::string value = p->stringValue();
-    renderListProperty(name, p->fullyQualifiedIdentifier(), value);
+    renderListProperty(name, p->uri(), value);
 
     if (showTooltip) {
         renderTooltip(prop, tooltipDelay);
@@ -319,7 +319,7 @@ void renderStringListProperty(Property* prop, const std::string& ownerName,
     ImGui::PushID((ownerName + '.' + name).c_str());
 
     const std::string value = p->stringValue();
-    renderListProperty(name, p->fullyQualifiedIdentifier(), value);
+    renderListProperty(name, p->uri(), value);
 
     if (showTooltip) {
         renderTooltip(prop, tooltipDelay);
@@ -358,7 +358,7 @@ void renderDoubleProperty(properties::Property* prop, const std::string& ownerNa
     }
 
     if (changed) {
-        executeSetPropertyScript(p->fullyQualifiedIdentifier(), std::to_string(value));
+        executeSetPropertyScript(p->uri(), std::to_string(value));
     }
 
     ImGui::PopID();
@@ -382,7 +382,7 @@ void renderIntProperty(Property* prop, const std::string& ownerName,
     }
 
     if (changed) {
-        executeSetPropertyScript(p->fullyQualifiedIdentifier(), std::to_string(value));
+        executeSetPropertyScript(p->uri(), std::to_string(value));
     }
 
     ImGui::PopID();
@@ -405,7 +405,7 @@ void renderIVec2Property(Property* prop, const std::string& ownerName,
     }
 
     if (changed) {
-        executeSetPropertyScript(p->fullyQualifiedIdentifier(), ghoul::to_string(value));
+        executeSetPropertyScript(p->uri(), ghoul::to_string(value));
     }
 
     ImGui::PopID();
@@ -428,7 +428,7 @@ void renderIVec3Property(Property* prop, const std::string& ownerName,
     }
 
     if (changed) {
-        executeSetPropertyScript(p->fullyQualifiedIdentifier(), ghoul::to_string(value));
+        executeSetPropertyScript(p->uri(), ghoul::to_string(value));
     }
     ImGui::PopID();
 }
@@ -450,7 +450,7 @@ void renderIVec4Property(Property* prop, const std::string& ownerName,
     }
 
     if (changed) {
-        executeSetPropertyScript(p->fullyQualifiedIdentifier(), ghoul::to_string(value));
+        executeSetPropertyScript(p->uri(), ghoul::to_string(value));
     }
     ImGui::PopID();
 }
@@ -479,7 +479,7 @@ void renderFloatProperty(Property* prop, const std::string& ownerName,
     }
 
     if (changed) {
-        executeSetPropertyScript(p->fullyQualifiedIdentifier(), std::to_string(value));
+        executeSetPropertyScript(p->uri(), std::to_string(value));
     }
 
     ImGui::PopID();
@@ -509,7 +509,7 @@ void renderVec2Property(Property* prop, const std::string& ownerName,
     }
 
     if (changed) {
-        executeSetPropertyScript(p->fullyQualifiedIdentifier(), ghoul::to_string(value));
+        executeSetPropertyScript(p->uri(), ghoul::to_string(value));
     }
 
     ImGui::PopID();
@@ -545,7 +545,7 @@ void renderVec3Property(Property* prop, const std::string& ownerName,
     }
 
     if (changed) {
-        executeSetPropertyScript(p->fullyQualifiedIdentifier(), ghoul::to_string(value));
+        executeSetPropertyScript(p->uri(), ghoul::to_string(value));
     }
 
     ImGui::PopID();
@@ -581,7 +581,7 @@ void renderVec4Property(Property* prop, const std::string& ownerName,
     }
 
     if (changed) {
-        executeSetPropertyScript(p->fullyQualifiedIdentifier(), ghoul::to_string(value));
+        executeSetPropertyScript(p->uri(), ghoul::to_string(value));
     }
 
     ImGui::PopID();
@@ -611,7 +611,7 @@ void renderDVec2Property(Property* prop, const std::string& ownerName,
     }
 
     if (changed) {
-        executeSetPropertyScript(p->fullyQualifiedIdentifier(), ghoul::to_string(value));
+        executeSetPropertyScript(p->uri(), ghoul::to_string(value));
     }
 
     ImGui::PopID();
@@ -641,7 +641,7 @@ void renderDVec3Property(Property* prop, const std::string& ownerName,
     }
 
     if (changed) {
-        executeSetPropertyScript(p->fullyQualifiedIdentifier(), ghoul::to_string(value));
+        executeSetPropertyScript(p->uri(), ghoul::to_string(value));
     }
 
     ImGui::PopID();
@@ -671,7 +671,7 @@ void renderDVec4Property(Property* prop, const std::string& ownerName,
     }
 
     if (changed) {
-        executeSetPropertyScript(p->fullyQualifiedIdentifier(), ghoul::to_string(value));
+        executeSetPropertyScript(p->uri(), ghoul::to_string(value));
     }
 
     ImGui::PopID();
@@ -723,7 +723,7 @@ void renderDMat2Property(Property* prop, const std::string& ownerName,
     }
 
     if (changed) {
-        executeSetPropertyScript(p->fullyQualifiedIdentifier(), ghoul::to_string(value));
+        executeSetPropertyScript(p->uri(), ghoul::to_string(value));
     }
 
     ImGui::PopID();
@@ -785,7 +785,7 @@ void renderDMat3Property(Property* prop, const std::string& ownerName,
     }
 
     if (changed) {
-        executeSetPropertyScript(p->fullyQualifiedIdentifier(), ghoul::to_string(value));
+        executeSetPropertyScript(p->uri(), ghoul::to_string(value));
     }
 
     ImGui::PopID();
@@ -857,7 +857,7 @@ void renderDMat4Property(Property* prop, const std::string& ownerName,
     }
 
     if (changed) {
-        executeSetPropertyScript(p->fullyQualifiedIdentifier(), ghoul::to_string(value));
+        executeSetPropertyScript(p->uri(), ghoul::to_string(value));
     }
 
     ImGui::PopID();
@@ -872,7 +872,7 @@ void renderTriggerProperty(Property* prop, const std::string& ownerName,
 
     const bool pressed = ImGui::Button(name.c_str());
     if (pressed) {
-        executeSetPropertyScript(prop->fullyQualifiedIdentifier(), "nil");
+        executeSetPropertyScript(prop->uri(), "nil");
     }
     if (showTooltip) {
         renderTooltip(prop, tooltipDelay);
diff --git a/src/documentation/documentationengine.cpp b/src/documentation/documentationengine.cpp
index 044ab77bb8..6dc5de0afa 100644
--- a/src/documentation/documentationengine.cpp
+++ b/src/documentation/documentationengine.cpp
@@ -206,7 +206,7 @@ namespace {
             std::string name = !p->guiName().empty() ? p->guiName() : p->identifier();
             propertyJson[NameKey] = name;
             propertyJson[TypeKey] = p->className();
-            propertyJson[UriKey] = p->fullyQualifiedIdentifier();
+            propertyJson[UriKey] = p->uri();
             propertyJson[IdentifierKey] = p->identifier();
             propertyJson[DescriptionKey] = p->description();
 
diff --git a/src/events/event.cpp b/src/events/event.cpp
index d6d59fbb3c..b3b2e4311b 100644
--- a/src/events/event.cpp
+++ b/src/events/event.cpp
@@ -43,16 +43,6 @@ using namespace std::string_literals;
 
 namespace openspace::events {
 
-void log(int i, const EventSceneGraphNodeAdded& e) {
-    ghoul_assert(e.type == EventSceneGraphNodeAdded::Type, "Wrong type");
-    LINFO(std::format("[{}] SceneGraphNodeAdded: {}", i, e.uri));
-}
-
-void log(int i, const EventSceneGraphNodeRemoved& e) {
-    ghoul_assert(e.type == EventSceneGraphNodeRemoved::Type, "Wrong type");
-    LINFO(std::format("[{}] SceneGraphNodeRemoved: {}", i, e.uri));
-}
-
 void log(int i, const EventParallelConnection& e) {
     ghoul_assert(e.type == EventParallelConnection::Type, "Wrong type");
     std::string_view state = [](EventParallelConnection::State s) {
@@ -85,16 +75,6 @@ void log(int i, const EventApplicationShutdown& e) {
     LINFO(std::format("[{}] ApplicationShutdown", i));
 }
 
-void log(int i, const EventScreenSpaceRenderableAdded& e) {
-    ghoul_assert(e.type == EventScreenSpaceRenderableAdded::Type, "Wrong type");
-    LINFO(std::format("[{}] ScreenSpaceRenderableAdded: {}", i, e.uri));
-}
-
-void log(int i, const EventScreenSpaceRenderableRemoved& e) {
-    ghoul_assert(e.type == EventScreenSpaceRenderableRemoved::Type, "Wrong type");
-    LINFO(std::format("[{}] ScreenSpaceRenderableRemoved: {}", i, e.uri));
-}
-
 void log(int i, const EventCameraFocusTransition& e) {
     ghoul_assert(e.type == EventCameraFocusTransition::Type, "Wrong type");
     std::string_view t = [](EventCameraFocusTransition::Transition transition) {
@@ -146,14 +126,14 @@ void log(int i, const EventFocusNodeChanged& e) {
     LINFO(std::format("[{}] FocusNodeChanged: {} -> {}", i, e.oldNode, e.newNode));
 }
 
-void log(int i, const EventLayerAdded& e) {
-    ghoul_assert(e.type == EventLayerAdded::Type, "Wrong type");
-    LINFO(std::format("[{}] LayerAdded: {}", i, e.uri));
+void log(int i, const EventPropertyTreeUpdated& e) {
+    ghoul_assert(e.type == EventPropertyTreeUpdated::Type, "Wrong type");
+    LINFO(std::format("[{}] PropertyTreeUpdated: {}", i, e.uri));
 }
 
-void log(int i, const EventLayerRemoved& e) {
-    ghoul_assert(e.type == EventLayerRemoved::Type, "Wrong type");
-    LINFO(std::format("[{}] LayerRemoved: {}", i, e.uri));
+void log(int i, const EventPropertyTreePruned& e) {
+    ghoul_assert(e.type == EventPropertyTreePruned::Type, "Wrong type");
+    LINFO(std::format("[{}] PropertyTreePruned: {}", i, e.uri));
 }
 
 void log(int i, const EventActionAdded& e) {
@@ -233,22 +213,17 @@ void log(int i, const CustomEvent& e) {
 
 std::string_view toString(Event::Type type) {
     switch (type) {
-        case Event::Type::SceneGraphNodeAdded: return "SceneGraphNodeAdded";
-        case Event::Type::SceneGraphNodeRemoved: return "SceneGraphNodeRemoved";
         case Event::Type::ParallelConnection: return "ParallelConnection";
         case Event::Type::ProfileLoadingFinished: return "ProfileLoadingFinished";
         case Event::Type::ApplicationShutdown: return "ApplicationShutdown";
-        case Event::Type::ScreenSpaceRenderableAdded: return "ScreenSpaceRenderableAdded";
-        case Event::Type::ScreenSpaceRenderableRemoved:
-            return "ScreenSpaceRenderableRemoved";
         case Event::Type::CameraFocusTransition: return "CameraFocusTransition";
         case Event::Type::TimeOfInterestReached: return "TimeOfInterestReached";
         case Event::Type::MissionEventReached: return "MissionEventReached";
         case Event::Type::PlanetEclipsed: return "PlanetEclipsed";
         case Event::Type::InterpolationFinished: return "InterpolationFinished";
         case Event::Type::FocusNodeChanged: return "FocusNodeChanged";
-        case Event::Type::LayerAdded: return "LayerAdded";
-        case Event::Type::LayerRemoved: return "LayerRemoved";
+        case Event::Type::PropertyTreeUpdated: return "PropertyTreeUpdated";
+        case Event::Type::PropertyTreePruned: return "PropertyTreePruned";
         case Event::Type::ActionAdded: return "ActionAdded";
         case Event::Type::ActionRemoved: return "ActionRemoved";
         case Event::Type::SessionRecordingPlayback: return "SessionRecordingPlayback";
@@ -266,13 +241,7 @@ std::string_view toString(Event::Type type) {
 }
 
 Event::Type fromString(std::string_view str) {
-    if (str == "SceneGraphNodeAdded") {
-        return Event::Type::SceneGraphNodeAdded;
-    }
-    else if (str == "SceneGraphNodeRemoved") {
-        return Event::Type::SceneGraphNodeRemoved;
-    }
-    else if (str == "ParallelConnection") {
+    if (str == "ParallelConnection") {
         return Event::Type::ParallelConnection;
     }
     else if (str == "ProfileLoadingFinished") {
@@ -281,12 +250,6 @@ Event::Type fromString(std::string_view str) {
     else if (str == "ApplicationShutdown") {
         return Event::Type::ApplicationShutdown;
     }
-    else if (str == "ScreenSpaceRenderableAdded") {
-        return Event::Type::ScreenSpaceRenderableAdded;
-    }
-    else if (str == "ScreenSpaceRenderableRemoved") {
-        return Event::Type::ScreenSpaceRenderableRemoved;
-    }
     else if (str == "CameraFocusTransition") {
         return Event::Type::CameraFocusTransition;
     }
@@ -305,11 +268,11 @@ Event::Type fromString(std::string_view str) {
     else if (str == "FocusNodeChanged") {
         return Event::Type::FocusNodeChanged;
     }
-    else if (str == "LayerAdded") {
-        return Event::Type::LayerAdded;
+    else if (str == "PropertyTreeUpdated") {
+        return Event::Type::PropertyTreeUpdated;
     }
-    else if (str == "LayerRemoved") {
-        return Event::Type::LayerRemoved;
+    else if (str == "PropertyTreePruned") {
+        return Event::Type::PropertyTreePruned;
     }
     else if (str == "ActionAdded") {
         return Event::Type::ActionAdded;
@@ -351,18 +314,6 @@ Event::Type fromString(std::string_view str) {
 ghoul::Dictionary toParameter(const Event& e) {
     ghoul::Dictionary d;
     switch (e.type) {
-        case Event::Type::SceneGraphNodeAdded:
-            d.setValue(
-                "Uri",
-                std::string(static_cast<const EventSceneGraphNodeAdded&>(e).uri)
-            );
-            break;
-        case Event::Type::SceneGraphNodeRemoved:
-            d.setValue(
-                "Uri",
-                std::string(static_cast<const EventSceneGraphNodeRemoved&>(e).uri)
-            );
-            break;
         case Event::Type::ParallelConnection:
             switch (static_cast<const EventParallelConnection&>(e).state) {
                 case EventParallelConnection::State::Established:
@@ -392,22 +343,6 @@ ghoul::Dictionary toParameter(const Event& e) {
                     break;
             }
             break;
-        case Event::Type::ScreenSpaceRenderableAdded:
-            d.setValue(
-                "Uri",
-                std::string(
-                    static_cast<const EventScreenSpaceRenderableAdded&>(e).uri
-                )
-            );
-            break;
-        case Event::Type::ScreenSpaceRenderableRemoved:
-            d.setValue(
-                "Uri",
-                std::string(
-                    static_cast<const EventScreenSpaceRenderableRemoved&>(e).uri
-                )
-            );
-            break;
         case Event::Type::CameraFocusTransition:
             d.setValue(
                 "Node",
@@ -454,16 +389,16 @@ ghoul::Dictionary toParameter(const Event& e) {
                 std::string(static_cast<const EventFocusNodeChanged&>(e).newNode)
             );
             break;
-        case Event::Type::LayerAdded:
+        case Event::Type::PropertyTreeUpdated:
             d.setValue(
                 "Uri",
-                std::string(static_cast<const EventLayerAdded&>(e).uri)
+                std::string(static_cast<const EventPropertyTreeUpdated&>(e).uri)
             );
             break;
-        case Event::Type::LayerRemoved:
+        case Event::Type::PropertyTreePruned:
             d.setValue(
                 "Uri",
-                std::string(static_cast<const EventLayerRemoved&>(e).uri)
+                std::string(static_cast<const EventPropertyTreePruned&>(e).uri)
             );
             break;
         case Event::Type::ActionAdded:
@@ -555,12 +490,6 @@ void logAllEvents(const Event* e) {
     int i = 0;
     while (e) {
         switch (e->type) {
-            case Event::Type::SceneGraphNodeAdded:
-                log(i, *static_cast<const EventSceneGraphNodeAdded*>(e));
-                break;
-            case Event::Type::SceneGraphNodeRemoved:
-                log(i, *static_cast<const EventSceneGraphNodeRemoved*>(e));
-                break;
             case Event::Type::ParallelConnection:
                 log(i, *static_cast<const EventParallelConnection*>(e));
                 break;
@@ -570,12 +499,6 @@ void logAllEvents(const Event* e) {
             case Event::Type::ApplicationShutdown:
                 log(i, *static_cast<const EventApplicationShutdown*>(e));
                 break;
-            case Event::Type::ScreenSpaceRenderableAdded:
-                log(i, *static_cast<const EventScreenSpaceRenderableAdded*>(e));
-                break;
-            case Event::Type::ScreenSpaceRenderableRemoved:
-                log(i, *static_cast<const EventScreenSpaceRenderableRemoved*>(e));
-                break;
             case Event::Type::CameraFocusTransition:
                 log(i, *static_cast<const EventCameraFocusTransition*>(e));
                 break;
@@ -594,11 +517,11 @@ void logAllEvents(const Event* e) {
             case Event::Type::FocusNodeChanged:
                 log(i, *static_cast<const EventFocusNodeChanged*>(e));
                 break;
-            case Event::Type::LayerAdded:
-                log(i, *static_cast<const EventLayerAdded*>(e));
+            case Event::Type::PropertyTreeUpdated:
+                log(i, *static_cast<const EventPropertyTreeUpdated*>(e));
                 break;
-            case Event::Type::LayerRemoved:
-                log(i, *static_cast<const EventLayerRemoved*>(e));
+            case Event::Type::PropertyTreePruned:
+                log(i, *static_cast<const EventPropertyTreePruned*>(e));
                 break;
             case Event::Type::ActionAdded:
                 log(i, *static_cast<const EventActionAdded*>(e));
@@ -642,16 +565,6 @@ void logAllEvents(const Event* e) {
     }
 }
 
-EventSceneGraphNodeAdded::EventSceneGraphNodeAdded(const SceneGraphNode* node_)
-    : Event(Type)
-    , uri(temporaryString(node_->uri()))
-{}
-
-EventSceneGraphNodeRemoved::EventSceneGraphNodeRemoved(const SceneGraphNode* node_)
-    : Event(Type)
-    , uri(temporaryString(node_->uri()))
-{}
-
 EventParallelConnection::EventParallelConnection(State state_)
     : Event(Type)
     , state(state_)
@@ -666,18 +579,6 @@ EventApplicationShutdown::EventApplicationShutdown(State state_)
     , state(state_)
 {}
 
-EventScreenSpaceRenderableAdded::EventScreenSpaceRenderableAdded(
-                                                 const ScreenSpaceRenderable* renderable_)
-    : Event(Type)
-    , uri(temporaryString(renderable_->uri()))
-{}
-
-EventScreenSpaceRenderableRemoved::EventScreenSpaceRenderableRemoved(
-                                                 const ScreenSpaceRenderable* renderable_)
-    : Event(Type)
-    , uri(temporaryString(renderable_->uri()))
-{}
-
 EventCameraFocusTransition::EventCameraFocusTransition(const Camera* camera_,
                                                        const SceneGraphNode* node_,
                                                        Transition transition_)
@@ -708,7 +609,7 @@ EventPlanetEclipsed::EventPlanetEclipsed(const SceneGraphNode* eclipsee_,
 EventInterpolationFinished::EventInterpolationFinished(
                                                     const properties::Property* property_)
     : Event(Type)
-    , property(temporaryString(property_->fullyQualifiedIdentifier()))
+    , property(temporaryString(property_->uri()))
 {}
 
 EventFocusNodeChanged::EventFocusNodeChanged(const SceneGraphNode* oldNode_,
@@ -720,12 +621,12 @@ EventFocusNodeChanged::EventFocusNodeChanged(const SceneGraphNode* oldNode_,
     ghoul_assert(newNode_, "There must be a new node");
 }
 
-EventLayerAdded::EventLayerAdded(std::string_view uri_)
+EventPropertyTreeUpdated::EventPropertyTreeUpdated(std::string_view uri_)
     : Event(Type)
     , uri(temporaryString(uri_))
 {}
 
-EventLayerRemoved::EventLayerRemoved(std::string_view uri_)
+EventPropertyTreePruned::EventPropertyTreePruned(std::string_view uri_)
     : Event(Type)
     , uri(temporaryString(uri_))
 {}
diff --git a/src/interaction/sessionrecording.cpp b/src/interaction/sessionrecording.cpp
index 2237ade442..7c5af56778 100644
--- a/src/interaction/sessionrecording.cpp
+++ b/src/interaction/sessionrecording.cpp
@@ -976,7 +976,7 @@ void SessionRecording::saveScriptKeyframeAscii(Timestamps& times,
 }
 
 void SessionRecording::savePropertyBaseline(properties::Property& prop) {
-    const std::string propIdentifier = prop.fullyQualifiedIdentifier();
+    const std::string propIdentifier = prop.uri();
     if (isPropertyAllowedForBaseline(propIdentifier)) {
         const bool isPropAlreadySaved = (
             std::find(
diff --git a/src/properties/property.cpp b/src/properties/property.cpp
index d48b505d73..b47286d512 100644
--- a/src/properties/property.cpp
+++ b/src/properties/property.cpp
@@ -76,11 +76,11 @@ const std::string& Property::identifier() const {
     return _identifier;
 }
 
-std::string Property::fullyQualifiedIdentifier() const {
-    std::string identifier = _identifier;
+std::string Property::uri() const {
+    std::string identifier = "";
     const std::string& ownerUri = owner()->uri();
     if (!ownerUri.empty()) {
-        identifier = std::format("{}.{}", ownerUri, identifier);
+        identifier = std::format("{}.{}", ownerUri, _identifier);
     }
     return identifier;
 }
@@ -264,7 +264,7 @@ void Property::resetToUnchanged() {
 
 std::string Property::generateJsonDescription() const {
     const std::string cName = escapedJson(std::string(className()));
-    const std::string identifier = fullyQualifiedIdentifier();
+    const std::string identifier = uri();
     const std::string identifierSan = escapedJson(identifier);
     const std::string gName = guiName();
     const std::string gNameSan = escapedJson(gName);
diff --git a/src/properties/propertyowner.cpp b/src/properties/propertyowner.cpp
index 945eafad6d..cae9dca8a4 100644
--- a/src/properties/propertyowner.cpp
+++ b/src/properties/propertyowner.cpp
@@ -38,6 +38,25 @@
 
 namespace {
     constexpr std::string_view _loggerCat = "PropertyOwner";
+    using namespace openspace;
+
+    // The URIs have to be validated because it is not known in what order things are
+    // constructed. For example, a SceneGraphNode can be created before its Renderable,
+    // and vice versa. Invalid URIs are empty. The reason this works even though we don't
+    // know what is created first is because if the child is created first, it has not
+    // been added to the property tree so URI will be invalid and not sent. But the parent
+    // will be added later, which will include the child in it's subowners
+    void publishPropertyTreeUpdatedEvent(const std::string& uri) {
+        if (!uri.empty()) {
+            global::eventEngine->publishEvent<events::EventPropertyTreeUpdated>(uri);
+        }
+    }
+
+    void publishPropertyTreePrunedEvent(const std::string& uri) {
+        if (!uri.empty()) {
+            global::eventEngine->publishEvent<events::EventPropertyTreePruned>(uri);
+        }
+    }
 } // namespace
 
 namespace openspace::properties {
@@ -137,13 +156,18 @@ std::string PropertyOwner::uri() const {
     std::string identifier = _identifier;
     PropertyOwner* currentOwner = owner();
     while (currentOwner) {
+        // We have reached the top of the property tree and the uri is finished
+        if (currentOwner == global::rootPropertyOwner) {
+            return identifier;
+        }
         const std::string& ownerId = currentOwner->identifier();
         if (!ownerId.empty()) {
             identifier = std::format("{}.{}", ownerId, identifier);
         }
         currentOwner = currentOwner->owner();
     }
-    return identifier;
+    // If the uri hasn't been sent at this point it is not valid, so send an empty string
+    return "";
 }
 
 bool PropertyOwner::hasProperty(const std::string& uri) const {
@@ -235,6 +259,9 @@ void PropertyOwner::addProperty(Property* prop) {
         else {
             _properties.push_back(prop);
             prop->setPropertyOwner(this);
+
+            // Notify change so we can update the UI
+            publishPropertyTreeUpdatedEvent(prop->uri());
         }
     }
 }
@@ -282,6 +309,9 @@ void PropertyOwner::addPropertySubOwner(openspace::properties::PropertyOwner* ow
         else {
             _subOwners.push_back(owner);
             owner->setPropertyOwner(this);
+
+            // Notify change so UI gets updated
+            publishPropertyTreeUpdatedEvent(owner->uri());
         }
     }
 }
@@ -302,6 +332,9 @@ void PropertyOwner::removeProperty(Property* prop) {
 
     // If we found the property identifier, we can delete it
     if (it != _properties.end() && (*it)->identifier() == prop->identifier()) {
+        // Notify change so we can update the UI
+        publishPropertyTreePrunedEvent(prop->uri());
+
         (*it)->setPropertyOwner(nullptr);
         _properties.erase(it);
     }
@@ -330,6 +363,8 @@ void PropertyOwner::removePropertySubOwner(openspace::properties::PropertyOwner*
 
     // If we found the propertyowner, we can delete it
     if (it != _subOwners.end() && (*it)->identifier() == owner->identifier()) {
+        // Notify the change so the UI can update
+        publishPropertyTreePrunedEvent(owner->uri());
         _subOwners.erase(it);
     }
     else {
diff --git a/src/rendering/renderengine.cpp b/src/rendering/renderengine.cpp
index cdfa5c3908..8fcafb9932 100644
--- a/src/rendering/renderengine.cpp
+++ b/src/rendering/renderengine.cpp
@@ -1069,8 +1069,6 @@ void RenderEngine::addScreenSpaceRenderable(std::unique_ptr<ScreenSpaceRenderabl
     ScreenSpaceRenderable* ssr = s.get();
     global::screenSpaceRootPropertyOwner->addPropertySubOwner(ssr);
     global::screenSpaceRenderables->push_back(std::move(s));
-
-    global::eventEngine->publishEvent<events::EventScreenSpaceRenderableAdded>(ssr);
 }
 
 void RenderEngine::removeScreenSpaceRenderable(ScreenSpaceRenderable* s) {
@@ -1081,7 +1079,6 @@ void RenderEngine::removeScreenSpaceRenderable(ScreenSpaceRenderable* s) {
     );
 
     if (it != global::screenSpaceRenderables->end()) {
-        global::eventEngine->publishEvent<events::EventScreenSpaceRenderableRemoved>(s);
         s->deinitializeGL();
         s->deinitialize();
         global::screenSpaceRootPropertyOwner->removePropertySubOwner(s);
diff --git a/src/scene/profile.cpp b/src/scene/profile.cpp
index 29f2516531..3bcf72b006 100644
--- a/src/scene/profile.cpp
+++ b/src/scene/profile.cpp
@@ -640,7 +640,7 @@ void Profile::saveCurrentSettingsToProfile(const properties::PropertyOwner& root
     for (properties::Property* prop : ps) {
         Property p;
         p.setType = Property::SetType::SetPropertyValueSingle;
-        p.name = prop->fullyQualifiedIdentifier();
+        p.name = prop->uri();
         p.value = prop->stringValue();
         properties.push_back(std::move(p));
     }
diff --git a/src/scene/scene.cpp b/src/scene/scene.cpp
index 2987fa8ed2..ac5062e4aa 100644
--- a/src/scene/scene.cpp
+++ b/src/scene/scene.cpp
@@ -166,7 +166,6 @@ void Scene::registerNode(SceneGraphNode* node) {
     _nodesByIdentifier[node->identifier()] = node;
     addPropertySubOwner(node);
     _dirtyNodeRegistry = true;
-    global::eventEngine->publishEvent<events::EventSceneGraphNodeAdded>(node);
 }
 
 void Scene::unregisterNode(SceneGraphNode* node) {
@@ -186,7 +185,6 @@ void Scene::unregisterNode(SceneGraphNode* node) {
     }
     removePropertySubOwner(node);
     _dirtyNodeRegistry = true;
-    global::eventEngine->publishEvent<events::EventSceneGraphNodeRemoved>(node);
 }
 
 void Scene::markNodeRegistryDirty() {
diff --git a/src/scene/scene_lua.inl b/src/scene/scene_lua.inl
index f49a254de3..519ffdd7a4 100644
--- a/src/scene/scene_lua.inl
+++ b/src/scene/scene_lua.inl
@@ -141,7 +141,7 @@ std::vector<openspace::properties::Property*> findMatchesInAllProperties(
     // of the loop, the property name regex was probably misspelled.
     for (properties::Property* prop : properties) {
         // Check the regular expression for all properties
-        const std::string id = prop->fullyQualifiedIdentifier();
+        const std::string id = prop->uri();
 
         if (isLiteral && id != propertyName) {
             continue;
@@ -227,7 +227,7 @@ void applyRegularExpression(lua_State* L, const std::string& regex,
                 std::format(
                     "{}: Property '{}' does not accept input of type '{}'. Requested "
                     "type: {}",
-                    errorLocation(L), prop->fullyQualifiedIdentifier(),
+                    errorLocation(L), prop->uri(),
                     luaTypeToString(type), luaTypeToString(prop->typeLua())
                 )
             );
@@ -544,7 +544,7 @@ namespace {
     std::vector<std::string> res;
     for (properties::Property* prop : props) {
         // Check the regular expression for all properties
-        const std::string& id = prop->fullyQualifiedIdentifier();
+        const std::string& id = prop->uri();
 
         if (isLiteral && id != propertyName) {
             continue;

From 0973d2421a00e893149b473d11d58f5b627add03 Mon Sep 17 00:00:00 2001
From: Emma Broman <emma.broman@liu.se>
Date: Mon, 5 Aug 2024 13:52:09 +0200
Subject: [PATCH 562/701] Add STB texture writer functionality (#2912)

---
 ext/ghoul                          |  2 +-
 src/engine/openspaceengine_lua.inl | 72 ++++++++++++++++++++----------
 src/rendering/renderengine.cpp     | 10 ++++-
 3 files changed, 57 insertions(+), 27 deletions(-)

diff --git a/ext/ghoul b/ext/ghoul
index 6907aaf116..8bf9b6bc91 160000
--- a/ext/ghoul
+++ b/ext/ghoul
@@ -1 +1 @@
-Subproject commit 6907aaf116b3b571760a8fec00f68263f514f6b1
+Subproject commit 8bf9b6bc91b4690a5803f252bd1ad7538024f14a
diff --git a/src/engine/openspaceengine_lua.inl b/src/engine/openspaceengine_lua.inl
index 616e64446b..43cf0c4550 100644
--- a/src/engine/openspaceengine_lua.inl
+++ b/src/engine/openspaceengine_lua.inl
@@ -22,8 +22,22 @@
  * OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                                         *
  ****************************************************************************************/
 
+#include <openspace/documentation/documentation.h>
+#include <openspace/engine/downloadmanager.h>
+#include <openspace/engine/globals.h>
+#include <openspace/engine/openspaceengine.h>
+#include <openspace/engine/windowdelegate.h>
 #include <openspace/openspace.h>
+#include <openspace/rendering/renderengine.h>
+#include <openspace/scene/scenegraphnode.h>
+#include <ghoul/filesystem/cachemanager.h>
+#include <ghoul/filesystem/filesystem.h>
+#include <ghoul/glm.h>
+#include <ghoul/io/texture/texturewriter.h>
 #include <ghoul/misc/csvreader.h>
+#include <ghoul/misc/dictionary.h>
+#include <ghoul/opengl/texture.h>
+#include <filesystem>
 
 namespace {
 
@@ -136,40 +150,50 @@ namespace {
         );
     }
 
-    std::filesystem::path fileName = FileSys.cacheManager()->cachedFilename(
-        name + ".ppm",
-        ""
-    );
+    const std::string namePng = std::format("{}.png", name);
+    std::filesystem::path fileName = FileSys.cacheManager()->cachedFilename(namePng, "");
+
     const bool hasCachedFile = std::filesystem::is_regular_file(fileName);
     if (hasCachedFile) {
         LDEBUGC("OpenSpaceEngine", std::format("Cached file '{}' used", fileName));
         return fileName;
     }
     else {
-        // Write the color to a ppm file
-        static std::mutex fileMutex;
-        std::lock_guard guard(fileMutex);
-        std::ofstream ppmFile(fileName, std::ofstream::binary | std::ofstream::trunc);
+        // Write the color to a new file
+        constexpr unsigned int Width = 1;
+        constexpr unsigned int Height = 1;
+        constexpr unsigned int Size = Width * Height;
+        std::array<GLubyte, Size * 3> img = {
+            static_cast<GLubyte>(255 * color.r),
+            static_cast<GLubyte>(255 * color.g),
+            static_cast<GLubyte>(255 * color.b)
+        };
 
-        unsigned int width = 1;
-        unsigned int height = 1;
-        unsigned int size = width * height;
-        std::vector<unsigned char> img(size * 3);
-        img[0] = static_cast<unsigned char>(255 * color.r);
-        img[1] = static_cast<unsigned char>(255 * color.g);
-        img[2] = static_cast<unsigned char>(255 * color.b);
+        using Texture = ghoul::opengl::Texture;
+        Texture textureFromData = Texture(
+            reinterpret_cast<void*>(img.data()),
+            glm::uvec3(Width, Height, 1),
+            GL_TEXTURE_2D,
+            Texture::Format::RGB
+        );
+        textureFromData.setDataOwnership(Texture::TakeOwnership::No);
 
-        if (!ppmFile.is_open()) {
-            throw ghoul::lua::LuaError("Could not open ppm file for writing");
+        try {
+            ghoul::io::TextureWriter::ref().saveTexture(
+                textureFromData,
+                fileName.string()
+            );
+        }
+        catch (const ghoul::io::TextureWriter::MissingWriterException& e) {
+            // This should not happen, as we know .png is a supported format
+            throw ghoul::lua::LuaError(e.message);
+        }
+        catch (const std::filesystem::filesystem_error& e) {
+            LERRORC("Exception: {}", e.what());
         }
-
-        ppmFile << "P6" << std::endl;
-        ppmFile << width << " " << height << std::endl;
-        ppmFile << 255 << std::endl;
-        ppmFile.write(reinterpret_cast<char*>(img.data()), size * 3);
-        ppmFile.close();
-        return fileName;
     }
+
+    return fileName;
 }
 
 /**
diff --git a/src/rendering/renderengine.cpp b/src/rendering/renderengine.cpp
index 8fcafb9932..970ba6acc6 100644
--- a/src/rendering/renderengine.cpp
+++ b/src/rendering/renderengine.cpp
@@ -53,12 +53,14 @@
 #include <ghoul/font/font.h>
 #include <ghoul/font/fontmanager.h>
 #include <ghoul/font/fontrenderer.h>
-#include <ghoul/io/texture/texturereader.h>
-#include <ghoul/io/texture/texturereadercmap.h>
 #include <ghoul/io/model/modelreader.h>
 #include <ghoul/io/model/modelreaderassimp.h>
 #include <ghoul/io/model/modelreaderbinary.h>
+#include <ghoul/io/texture/texturereader.h>
+#include <ghoul/io/texture/texturereadercmap.h>
 #include <ghoul/io/texture/texturereaderstb.h>
+#include <ghoul/io/texture/texturewriter.h>
+#include <ghoul/io/texture/texturewriterstb.h>
 #include <ghoul/logging/logmanager.h>
 #include <ghoul/misc/easing.h>
 #include <ghoul/misc/profiling.h>
@@ -452,6 +454,10 @@ void RenderEngine::initialize() {
         std::make_unique<ghoul::io::TextureReaderCMAP>()
     );
 
+    ghoul::io::TextureWriter::ref().addWriter(
+        std::make_unique<ghoul::io::TextureWriterSTB>()
+    );
+
     ghoul::io::ModelReader::ref().addReader(
         std::make_unique<ghoul::io::ModelReaderAssimp>()
     );

From aec4f473dcdf8aefd24251fab2226f8976749c1b Mon Sep 17 00:00:00 2001
From: Alexander Bock <alexander.bock@liu.se>
Date: Tue, 6 Aug 2024 10:51:26 +0200
Subject: [PATCH 563/701] No longer specify an inaccurate version number on the
 master branch.

---
 CMakeLists.txt                             |  9 ++--
 include/openspace/rendering/renderengine.h |  2 -
 src/CMakeLists.txt                         |  4 +-
 src/engine/openspaceengine_lua.inl         |  6 +--
 src/rendering/renderengine.cpp             | 60 +++++++++++++---------
 support/cmake/openspace_header.template    | 28 ++++++++--
 6 files changed, 69 insertions(+), 40 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 1ac09c4647..65ac51bcc3 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -27,10 +27,11 @@ cmake_policy(VERSION 3.25)
 
 project(OpenSpace)
 
-set(OPENSPACE_VERSION_MAJOR 0)
-set(OPENSPACE_VERSION_MINOR 20)
-set(OPENSPACE_VERSION_PATCH 0)
-set(OPENSPACE_VERSION_STRING "Beta-13")
+set(OPENSPACE_RELEASE_BUILD OFF)
+set(OPENSPACE_VERSION_MAJOR)
+set(OPENSPACE_VERSION_MINOR)
+set(OPENSPACE_VERSION_PATCH)
+set(OPENSPACE_VERSION_STRING)
 
 include(${PROJECT_SOURCE_DIR}/support/cmake/module_common.cmake)
 include(${PROJECT_SOURCE_DIR}/ext/ghoul/support/cmake/message_macros.cmake)
diff --git a/include/openspace/rendering/renderengine.h b/include/openspace/rendering/renderengine.h
index 6047fbc961..d64c689fd1 100644
--- a/include/openspace/rendering/renderengine.h
+++ b/include/openspace/rendering/renderengine.h
@@ -226,8 +226,6 @@ private:
         glm::ivec4 roll = glm::ivec4(0);
     } _cameraButtonLocations;
 
-    std::string _versionString;
-
     properties::Vec4Property _enabledFontColor;
     properties::Vec4Property _disabledFontColor;
 };
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index b80cad0304..5ea8e03999 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -488,13 +488,13 @@ add_dependencies(openspace-core run_codegen)
 configure_file(
   ${PROJECT_SOURCE_DIR}/support/cmake/openspace_header.template
   ${CMAKE_BINARY_DIR}/_generated/include/openspace/openspace.h
-  @ONLY IMMEDIATE
+  @ONLY
 )
 
 configure_file(
   ${PROJECT_SOURCE_DIR}/support/cmake/commit.template
   ${PROJECT_SOURCE_DIR}/COMMIT.md
-  @ONLY IMMEDIATE
+  @ONLY
 )
 
 if (APPLE)
diff --git a/src/engine/openspaceengine_lua.inl b/src/engine/openspaceengine_lua.inl
index 43cf0c4550..f4d5efd5f8 100644
--- a/src/engine/openspaceengine_lua.inl
+++ b/src/engine/openspaceengine_lua.inl
@@ -222,9 +222,9 @@ namespace {
     ghoul::Dictionary res;
 
     ghoul::Dictionary version;
-    version.setValue("Major", openspace::OPENSPACE_VERSION_MAJOR);
-    version.setValue("Minor", openspace::OPENSPACE_VERSION_MINOR);
-    version.setValue("Patch", openspace::OPENSPACE_VERSION_PATCH);
+    version.setValue("Major", static_cast<int>(openspace::OPENSPACE_VERSION_MAJOR));
+    version.setValue("Minor", static_cast<int>(openspace::OPENSPACE_VERSION_MINOR));
+    version.setValue("Patch", static_cast<int>(openspace::OPENSPACE_VERSION_PATCH));
     res.setValue("Version", std::move(version));
 
     res.setValue("Commit", std::string(openspace::OPENSPACE_GIT_COMMIT));
diff --git a/src/rendering/renderengine.cpp b/src/rendering/renderengine.cpp
index 970ba6acc6..960b893f8f 100644
--- a/src/rendering/renderengine.cpp
+++ b/src/rendering/renderengine.cpp
@@ -465,22 +465,6 @@ void RenderEngine::initialize() {
     ghoul::io::ModelReader::ref().addReader(
         std::make_unique<ghoul::io::ModelReaderBinary>()
     );
-
-    _versionString = OPENSPACE_VERSION_STRING_FULL;
-    if (global::versionChecker->hasLatestVersionInfo()) {
-        VersionChecker::SemanticVersion latest = global::versionChecker->latestVersion();
-
-        const VersionChecker::SemanticVersion current {
-            OPENSPACE_VERSION_MAJOR,
-            OPENSPACE_VERSION_MINOR,
-            OPENSPACE_VERSION_PATCH
-        };
-        if (current < latest) {
-            _versionString += std::format(
-                " [Available: {}.{}.{}]", latest.major, latest.minor, latest.patch
-            );
-        }
-    }
 }
 
 void RenderEngine::initializeGL() {
@@ -1203,15 +1187,43 @@ void RenderEngine::renderVersionInformation() {
     }
 
     using FR = ghoul::fontrendering::FontRenderer;
-    const glm::vec2 versionBox = _fontVersionInfo->boundingBox(_versionString);
-    const glm::vec2 commitBox = _fontVersionInfo->boundingBox(OPENSPACE_GIT_FULL);
+    glm::vec2 versionBox = glm::vec2(0.f, 0.f);
+    if (OPENSPACE_IS_RELEASE_BUILD) {
+        if (global::versionChecker->hasLatestVersionInfo()) {
+            VersionChecker::SemanticVersion ver = global::versionChecker->latestVersion();
 
-    FR::defaultRenderer().render(
-        *_fontVersionInfo,
-        glm::vec2(fontResolution().x - versionBox.x - 10.f, 5.f),
-        _versionString,
-        glm::vec4(0.5f, 0.5f, 0.5f, 1.f)
-    );
+            std::string versionString = std::string(OPENSPACE_VERSION_STRING_FULL);
+            const VersionChecker::SemanticVersion current {
+                OPENSPACE_VERSION_MAJOR,
+                OPENSPACE_VERSION_MINOR,
+                OPENSPACE_VERSION_PATCH
+            };
+            if (current < ver) {
+                versionString += std::format(
+                    " [Available: {}.{}.{}]", ver.major, ver.minor, ver.patch
+                );
+            }
+
+            versionBox = _fontVersionInfo->boundingBox(versionString);
+            FR::defaultRenderer().render(
+                *_fontVersionInfo,
+                glm::vec2(fontResolution().x - versionBox.x - 10.f, 5.f),
+                versionString,
+                glm::vec4(0.5f, 0.5f, 0.5f, 1.f)
+            );
+        }
+        else {
+            versionBox = _fontVersionInfo->boundingBox(OPENSPACE_VERSION_STRING_FULL);
+            FR::defaultRenderer().render(
+                *_fontVersionInfo,
+                glm::vec2(fontResolution().x - versionBox.x - 10.f, 5.f),
+                OPENSPACE_VERSION_STRING_FULL,
+                glm::vec4(0.5f, 0.5f, 0.5f, 1.f)
+            );
+        }
+    }
+
+    const glm::vec2 commitBox = _fontVersionInfo->boundingBox(OPENSPACE_GIT_FULL);
 
     // If a developer hasn't placed the Git command in the path, this variable will be
     // empty
diff --git a/support/cmake/openspace_header.template b/support/cmake/openspace_header.template
index c8369ab938..7e1814a580 100644
--- a/support/cmake/openspace_header.template
+++ b/support/cmake/openspace_header.template
@@ -27,20 +27,38 @@
 
 #include <string>
 
+#cmakedefine OPENSPACE_RELEASE_BUILD
+
 namespace openspace {
 
 std::string licenseText();
 
-constexpr int OPENSPACE_VERSION_MAJOR = @OPENSPACE_VERSION_MAJOR@;
-constexpr int OPENSPACE_VERSION_MINOR = @OPENSPACE_VERSION_MINOR@;
-constexpr int OPENSPACE_VERSION_PATCH = @OPENSPACE_VERSION_PATCH@;
+#ifdef OPENSPACE_RELEASE_BUILD
+
+constexpr bool OPENSPACE_IS_RELEASE_BUILD = true;
+
+constexpr uint8_t OPENSPACE_VERSION_MAJOR = @OPENSPACE_VERSION_MAJOR@;
+constexpr uint8_t OPENSPACE_VERSION_MINOR = @OPENSPACE_VERSION_MINOR@;
+constexpr uint8_t OPENSPACE_VERSION_PATCH = @OPENSPACE_VERSION_PATCH@;
 
 constexpr std::string_view OPENSPACE_VERSION_NUMBER = "@OPENSPACE_VERSION_MAJOR@.@OPENSPACE_VERSION_MINOR@.@OPENSPACE_VERSION_PATCH@";
-
 constexpr std::string_view OPENSPACE_VERSION_STRING = "@OPENSPACE_VERSION_STRING@";
-
 constexpr std::string_view OPENSPACE_VERSION_STRING_FULL = "@OPENSPACE_VERSION_MAJOR@.@OPENSPACE_VERSION_MINOR@.@OPENSPACE_VERSION_PATCH@ (@OPENSPACE_VERSION_STRING@)";
 
+#else // ^^^^ OPENSPACE_RELEASE_BUILD || !OPENSPACE_RELEASE_BUILD vvvv
+
+constexpr bool OPENSPACE_IS_RELEASE_BUILD = false;
+
+constexpr uint8_t OPENSPACE_VERSION_MAJOR = std::numeric_limits<uint8_t>::max();
+constexpr uint8_t OPENSPACE_VERSION_MINOR = std::numeric_limits<uint8_t>::max();
+constexpr uint8_t OPENSPACE_VERSION_PATCH = std::numeric_limits<uint8_t>::max();
+
+constexpr std::string_view OPENSPACE_VERSION_NUMBER = "";
+constexpr std::string_view OPENSPACE_VERSION_STRING = "";
+constexpr std::string_view OPENSPACE_VERSION_STRING_FULL = "";
+
+#endif // OPENSPACE_RELEASE_BUILD
+
 constexpr std::string_view OPENSPACE_GIT_BRANCH = "@OPENSPACE_GIT_BRANCH@";
 constexpr std::string_view OPENSPACE_GIT_COMMIT = "@OPENSPACE_GIT_COMMIT@";
 constexpr std::string_view OPENSPACE_GIT_FULL = "@OPENSPACE_GIT_BRANCH@@@OPENSPACE_GIT_COMMIT@";

From 9109918955daddb90415072b40551f9ad6432d1f Mon Sep 17 00:00:00 2001
From: Alexander Bock <alexander.bock@liu.se>
Date: Tue, 6 Aug 2024 10:56:56 +0200
Subject: [PATCH 564/701] Remove warnings

---
 modules/globebrowsing/src/layergroup.cpp | 4 ----
 src/util/time_lua.inl                    | 4 ++--
 2 files changed, 2 insertions(+), 6 deletions(-)

diff --git a/modules/globebrowsing/src/layergroup.cpp b/modules/globebrowsing/src/layergroup.cpp
index 1e14b80063..037f038df4 100644
--- a/modules/globebrowsing/src/layergroup.cpp
+++ b/modules/globebrowsing/src/layergroup.cpp
@@ -164,10 +164,6 @@ Layer* LayerGroup::addLayer(const ghoul::Dictionary& layerDict) {
     std::stable_sort(_subOwners.begin(), _subOwners.end(), compareZIndexSubOwners);
 
     _levelBlendingEnabled.setVisibility(properties::Property::Visibility::User);
-
-    properties::PropertyOwner* layerGroup = ptr->owner();
-    properties::PropertyOwner* layerManager = layerGroup->owner();
-
     return ptr;
 }
 
diff --git a/src/util/time_lua.inl b/src/util/time_lua.inl
index 3a0536105a..a7a79f4a2d 100644
--- a/src/util/time_lua.inl
+++ b/src/util/time_lua.inl
@@ -394,14 +394,14 @@ namespace {
  * Returns the number of seconds per day where a day in this case is exactly 24 hours.
  * The total number of seconds is equal to 86400.
  */
-[[codegen::luawrap]] int secondsPerDay() {
+[[codegen::luawrap]] double secondsPerDay() {
     return openspace::SecondsPerDay;
 }
 
 /**
  * Returns the number of seconds in a Julian year, which is equal to 31557600.
  */
-[[codegen::luawrap]] int secondsPerYear() {
+[[codegen::luawrap]] double secondsPerYear() {
     // We could use a call to SPICE here, but the value is a constant anyway
     return openspace::SecondsPerYear;
 }

From 19bb1c5d912b452bfa89a957cf7246f1d5f10096 Mon Sep 17 00:00:00 2001
From: Alexander Bock <alexander.bock@liu.se>
Date: Tue, 6 Aug 2024 11:45:25 +0200
Subject: [PATCH 565/701] Update Rosetta kernels to extend coverage (#3370)

---
 data/assets/scene/solarsystem/missions/rosetta/67p.asset     | 5 +++++
 data/assets/scene/solarsystem/missions/rosetta/rosetta.asset | 5 +++++
 2 files changed, 10 insertions(+)

diff --git a/data/assets/scene/solarsystem/missions/rosetta/67p.asset b/data/assets/scene/solarsystem/missions/rosetta/67p.asset
index 09770c0aa8..11b67b441f 100644
--- a/data/assets/scene/solarsystem/missions/rosetta/67p.asset
+++ b/data/assets/scene/solarsystem/missions/rosetta/67p.asset
@@ -33,6 +33,11 @@ local imagesDestination = images .. "images"
 local Barycenter = {
   Identifier = "67PBarycenter",
   Parent = transforms.SolarSystemBarycenter.Identifier,
+  TimeFrame = {
+    Type = "TimeFrameInterval",
+    Start = "2014 JAN 01 00:00:00.000",
+    End = "2017 JAN 01 00:00:00.000"
+  },
   Transform = {
     Translation = {
       Type = "SpiceTranslation",
diff --git a/data/assets/scene/solarsystem/missions/rosetta/rosetta.asset b/data/assets/scene/solarsystem/missions/rosetta/rosetta.asset
index c11f985565..cd03949867 100644
--- a/data/assets/scene/solarsystem/missions/rosetta/rosetta.asset
+++ b/data/assets/scene/solarsystem/missions/rosetta/rosetta.asset
@@ -23,6 +23,11 @@ local RotationMatrix = {
 local RosettaPosition = {
   Identifier = "RosettaPosition",
   Parent = sunTransforms.SolarSystemBarycenter.Identifier,
+  TimeFrame = {
+    Type = "TimeFrameInterval",
+    Start = "2014 JAN 01 00:00:00.000",
+    End = "2016 OCT 01 00:00:00.000"
+  },
   Transform = {
     Translation = {
       Type = "SpiceTranslation",

From d0ca4c836bb6e323d335a54f215c008d23e7a175 Mon Sep 17 00:00:00 2001
From: Alexander Bock <alexander.bock@liu.se>
Date: Tue, 6 Aug 2024 16:44:48 +0200
Subject: [PATCH 566/701] Prevent illegal memory access when creating globals
 (closes #1657)

---
 src/engine/globals.cpp | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/engine/globals.cpp b/src/engine/globals.cpp
index 70874bec4d..20be3a5305 100644
--- a/src/engine/globals.cpp
+++ b/src/engine/globals.cpp
@@ -92,6 +92,7 @@ namespace {
         sizeof(Configuration) +
         sizeof(interaction::ActionManager) +
         sizeof(interaction::InteractionMonitor) +
+        sizeof(interaction::JoystickInputStates) +
         sizeof(interaction::WebsocketInputStates) +
         sizeof(interaction::KeybindingManager) +
         sizeof(interaction::NavigationHandler) +

From 2b64f2445873d58f1764a8a28826f3ae725168b8 Mon Sep 17 00:00:00 2001
From: Alexander Bock <alexander.bock@liu.se>
Date: Tue, 6 Aug 2024 16:55:37 +0200
Subject: [PATCH 567/701] Build Lua as a static library to benefit from LTO

---
 ext/ghoul | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ext/ghoul b/ext/ghoul
index 8bf9b6bc91..3aab5f1879 160000
--- a/ext/ghoul
+++ b/ext/ghoul
@@ -1 +1 @@
-Subproject commit 8bf9b6bc91b4690a5803f252bd1ad7538024f14a
+Subproject commit 3aab5f18796393e18815cf1fe287d6c86aad6fbc

From ca6c14e9b503e32b7ad55d2f69162df6f83a3cdb Mon Sep 17 00:00:00 2001
From: Alexander Bock <alexander.bock@liu.se>
Date: Wed, 7 Aug 2024 06:53:05 +0200
Subject: [PATCH 568/701] Make the SampleInterval for RenderableTrailTrajectory
 optional and use a sample per 2 days by default

---
 .../missions/pioneer/pioneer10.asset          | 12 +++------
 .../missions/pioneer/pioneer11.asset          | 12 +++------
 .../missions/voyager/voyager1.asset           | 16 +++---------
 .../missions/voyager/voyager2.asset           | 25 ++++---------------
 .../rendering/renderabletrailtrajectory.cpp   | 18 ++++++++++---
 5 files changed, 29 insertions(+), 54 deletions(-)

diff --git a/data/assets/scene/solarsystem/missions/pioneer/pioneer10.asset b/data/assets/scene/solarsystem/missions/pioneer/pioneer10.asset
index f1d9fabd52..57ed722850 100644
--- a/data/assets/scene/solarsystem/missions/pioneer/pioneer10.asset
+++ b/data/assets/scene/solarsystem/missions/pioneer/pioneer10.asset
@@ -32,9 +32,6 @@ local Pioneer10 = {
   }
 }
 
-local StartTime = "1972 MAR 03 02:04:00"
-local EndTime = "1990 JAN 02 00:00:00"
-
 local Pioneer10Trail = {
   Identifier = "Pioneer_10Trail",
   Parent = sunTransforms.SolarSystemBarycenter.Identifier,
@@ -46,12 +43,9 @@ local Pioneer10Trail = {
       Observer = coreKernels.ID.SolarSystemBarycenter
     },
     Color = { 0.70, 0.50, 0.20 },
-    StartTime = StartTime,
-    EndTime = EndTime,
-    EnableFade = false,
-    -- 1 sample every 2d
-    SampleInterval =
-      openspace.time.duration(StartTime, EndTime) / openspace.time.secondsPerYear() * 2
+    StartTime = "1972 MAR 03 02:04:00",
+    EndTime = "1990 JAN 02 00:00:00",
+    EnableFade = false
   },
   GUI = {
     Name = "Pioneer 10 Trail (SPICE)",
diff --git a/data/assets/scene/solarsystem/missions/pioneer/pioneer11.asset b/data/assets/scene/solarsystem/missions/pioneer/pioneer11.asset
index 5d841c3873..4db1484673 100644
--- a/data/assets/scene/solarsystem/missions/pioneer/pioneer11.asset
+++ b/data/assets/scene/solarsystem/missions/pioneer/pioneer11.asset
@@ -37,9 +37,6 @@ local Pioneer11 = {
   }
 }
 
-local StartTime = "1973 APR 06 02:25:00.000"
-local EndTime = "1990 JAN 02 00:00:00.000"
-
 local Pioneer11Trail = {
   Identifier = "Pioneer_11Trail",
   Parent = sunTransforms.SolarSystemBarycenter.Identifier,
@@ -51,12 +48,9 @@ local Pioneer11Trail = {
       Observer = coreKernels.ID.SolarSystemBarycenter
     },
     Color = { 0.70, 0.50, 0.20 },
-    StartTime = StartTime,
-    EndTime = EndTime,
-    EnableFade = false,
-    -- 1 sample every 2d
-    SampleInterval =
-      openspace.time.duration(StartTime, EndTime) / openspace.time.secondsPerYear() * 2
+    StartTime = "1973 APR 06 02:25:00.000",
+    EndTime = "1990 JAN 02 00:00:00.000",
+    EnableFade = false
   },
   GUI = {
     Name = "Pioneer 11 Trail (SPICE)",
diff --git a/data/assets/scene/solarsystem/missions/voyager/voyager1.asset b/data/assets/scene/solarsystem/missions/voyager/voyager1.asset
index 0d7660639b..c328d4a974 100644
--- a/data/assets/scene/solarsystem/missions/voyager/voyager1.asset
+++ b/data/assets/scene/solarsystem/missions/voyager/voyager1.asset
@@ -94,10 +94,7 @@ local VoyagerTrailCruiseEarthJupiter = {
     },
     Color = { 0.70, 0.50, 0.20 },
     StartTime = "1977 SEP 05",
-    EndTime = "1979 MAR 04",
-    -- 1 sample every 2d
-    SampleInterval = openspace.time.duration("1977 SEP 05", "1979 MAR 04") /
-                     openspace.time.secondsPerYear() * 2
+    EndTime = "1979 MAR 04"
   },
   Tag = { "voyager1_trail" },
   GUI = {
@@ -145,10 +142,7 @@ local VoyagerTrailCruiseJupiterSaturn = {
     EnableFade = false,
     Color = { 0.70, 0.50, 0.20 },
     StartTime = "1979 MAR 09",
-    EndTime = "1980 NOV 11",
-    -- 1 sample every 2d
-    SampleInterval = openspace.time.duration("1979 MAR 09", "1980 NOV 11") /
-                     openspace.time.secondsPerYear() * 2
+    EndTime = "1980 NOV 11"
   },
   Tag = { "voyager1_trail" },
   GUI = {
@@ -196,11 +190,7 @@ local VoyagerTrailCruiseSaturnInf = {
     EnableFade = false,
     Color = { 0.70, 0.50, 0.20 },
     StartTime = "1980 NOV 16",
-    EndTime = "2100 JAN 01",
-    -- 1 sample every 2d
-    SampleInterval = openspace.time.duration("1980 NOV 16", "2100 JAN 01") /
-                     openspace.time.secondsPerYear() * 2
-
+    EndTime = "2100 JAN 01"
   },
   Tag = { "voyager1_trail" },
   GUI = {
diff --git a/data/assets/scene/solarsystem/missions/voyager/voyager2.asset b/data/assets/scene/solarsystem/missions/voyager/voyager2.asset
index 884865df88..178428d12c 100644
--- a/data/assets/scene/solarsystem/missions/voyager/voyager2.asset
+++ b/data/assets/scene/solarsystem/missions/voyager/voyager2.asset
@@ -97,10 +97,7 @@ local VoyagerTrailCruiseEarthJupiter = {
     },
     Color = { 0.70, 0.50, 0.20 },
     StartTime = "1977-AUG-20 16:07:06.535",
-    EndTime = "1979 JUL 06",
-    -- 1 sample every 2d
-    SampleInterval = openspace.time.duration("1977-AUG-20 16:07:06.535", "1979 JUL 06") /
-                     openspace.time.secondsPerYear() * 2
+    EndTime = "1979 JUL 06"
   },
   Tag = { "voyager2_trail" },
   GUI = {
@@ -148,10 +145,7 @@ local VoyagerTrailCruiseJupiterSaturn = {
     EnableFade = false,
     Color = { 0.70, 0.50, 0.20 },
     StartTime = "1979 JUL 15",
-    EndTime = "1981 AUG 23",
-    -- 1 sample every 2d
-    SampleInterval = openspace.time.duration("1979 JUL 15", "1981 AUG 23") /
-                     openspace.time.secondsPerYear() * 2
+    EndTime = "1981 AUG 23"
   },
   Tag = { "voyager2_trail" },
   GUI = {
@@ -199,10 +193,7 @@ local VoyagerTrailCruiseSaturnUranus = {
     EnableFade = false,
     Color = { 0.70, 0.50, 0.20 },
     StartTime = "1981 AUG 30",
-    EndTime = "1986 JAN 22",
-    -- 1 sample every 2d
-    SampleInterval = openspace.time.duration("1981 AUG 30", "1986 JAN 22") /
-                     openspace.time.secondsPerYear() * 2
+    EndTime = "1986 JAN 22"
   },
   Tag = { "voyager2_trail" },
   GUI = {
@@ -250,10 +241,7 @@ local VoyagerTrailCruiseUranusNeptune = {
     EnableFade = false,
     Color = { 0.70, 0.50, 0.20 },
     StartTime = "1986 JAN 27",
-    EndTime = "1989 AUG 24",
-    -- 1 sample every 2d
-    SampleInterval = openspace.time.duration("1986 JAN 27", "1989 AUG 24") /
-                     openspace.time.secondsPerYear() * 2
+    EndTime = "1989 AUG 24"
   },
   Tag = { "voyager2_trail" },
   GUI = {
@@ -301,10 +289,7 @@ local VoyagerTrailCruiseNeptuneInf = {
     EnableFade = false,
     Color = { 0.70, 0.50, 0.20 },
     StartTime = "1989 AUG 26",
-    EndTime = "2100 JAN 01",
-    -- 1 sample every 2d
-    SampleInterval = openspace.time.duration("1989 AUG 26", "2100 JAN 01") /
-                     openspace.time.secondsPerYear() * 2
+    EndTime = "2100 JAN 01"
   },
   Tag = { "voyager2_trail" },
   GUI = {
diff --git a/modules/base/rendering/renderabletrailtrajectory.cpp b/modules/base/rendering/renderabletrailtrajectory.cpp
index f664d8dbc2..4d8eb67e92 100644
--- a/modules/base/rendering/renderabletrailtrajectory.cpp
+++ b/modules/base/rendering/renderabletrailtrajectory.cpp
@@ -28,6 +28,7 @@
 #include <openspace/documentation/verifier.h>
 #include <openspace/scene/translation.h>
 #include <openspace/util/spicemanager.h>
+#include <openspace/util/timeconversion.h>
 #include <openspace/util/updatestructures.h>
 #include <optional>
 
@@ -124,8 +125,13 @@ namespace {
         // [[codegen::verbatim(EndTimeInfo.description)]]
         std::string endTime [[codegen::annotation("A valid date in ISO 8601 format")]];
 
-        // [[codegen::verbatim(SampleIntervalInfo.description)]]
-        double sampleInterval;
+        // The interval between samples of the trajectory. This value (together with
+        // 'TimeStampSubsampleFactor') determines how far apart (in time) the samples are
+        // spaced along the trajectory. The time interval between 'StartTime' and
+        // 'EndTime' is split into 'SampleInterval' * 'TimeStampSubsampleFactor' segments.
+        // If this value is not specified, it will be automatically calculated to produce
+        // one sample every two day between the 'StartTime' and 'EndTime'.
+        std::optional<double> sampleInterval;
 
         // [[codegen::verbatim(TimeSubSampleInfo.description)]]
         std::optional<int> timeStampSubsampleFactor;
@@ -182,7 +188,13 @@ RenderableTrailTrajectory::RenderableTrailTrajectory(const ghoul::Dictionary& di
     _endTime.onChange([this] { reset(); });
     addProperty(_endTime);
 
-    _sampleInterval = p.sampleInterval;
+    if (p.sampleInterval.has_value()) {
+        _sampleInterval = *p.sampleInterval;
+    }
+    else {
+        const double delta = Time::convertTime(_endTime) - Time::convertTime(_startTime);
+        _sampleInterval = delta / (openspace::SecondsPerYear * 2);
+    }
     _sampleInterval.onChange([this] { reset(); });
     addProperty(_sampleInterval);
 

From d07edbdc7733fd6d9bc3c846bb3d7f17e22c21de Mon Sep 17 00:00:00 2001
From: Alexander Bock <alexander.bock@liu.se>
Date: Wed, 7 Aug 2024 06:58:50 +0200
Subject: [PATCH 569/701] Fixing arrangement for TimeFrames in assets

---
 .../solarsystem/missions/apollo/15/apollo15.asset      | 10 +++++-----
 .../scene/solarsystem/missions/insight/edl.asset       | 10 +++++-----
 data/assets/scene/solarsystem/sun/transforms.asset     |  2 +-
 3 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/data/assets/scene/solarsystem/missions/apollo/15/apollo15.asset b/data/assets/scene/solarsystem/missions/apollo/15/apollo15.asset
index acfae57516..5c52ec3b03 100644
--- a/data/assets/scene/solarsystem/missions/apollo/15/apollo15.asset
+++ b/data/assets/scene/solarsystem/missions/apollo/15/apollo15.asset
@@ -17,6 +17,11 @@ local models = asset.resource({
 local Apollo15 = {
   Identifier = "Apollo15",
   Parent = moonTransforms.Moon.Identifier,
+  TimeFrame = {
+    Type = "TimeFrameInterval",
+    Start = "1971-07-30T02:22:00.00",
+    End = "1971-08-01T18:05:00.00"
+  },
   Transform = {
     Translation = {
       Type = "SpiceTranslation",
@@ -39,11 +44,6 @@ local Apollo15 = {
     },
     PerformShading = true
   },
-  TimeFrame = {
-    Type = "TimeFrameInterval",
-    Start = "1971-07-30T02:22:00.00",
-    End = "1971-08-01T18:05:00.00"
-  },
   GUI = {
     Name = "Apollo 15",
     Path = "/Solar System/Missions/Apollo/15"
diff --git a/data/assets/scene/solarsystem/missions/insight/edl.asset b/data/assets/scene/solarsystem/missions/insight/edl.asset
index 039f473695..c8f8314147 100644
--- a/data/assets/scene/solarsystem/missions/insight/edl.asset
+++ b/data/assets/scene/solarsystem/missions/insight/edl.asset
@@ -133,6 +133,11 @@ local RotationKeyframes = {
 local InsightParent = {
   Identifier = "InsightParent",
   Parent = mars.Mars.Identifier,
+  -- TimeFrame = {
+  --   Type = "TimeFrameInterval",
+  --   Start = EntryTimeStart,
+  --   End = SpiceRotationEndTime
+  -- },
   Transform = {
     Translation = {
       Type = "TimelineTranslation",
@@ -143,11 +148,6 @@ local InsightParent = {
       Keyframes = RotationKeyframes
     }
   },
-  -- TimeFrame = {
-  --   Type = "TimeFrameInterval",
-  --   Start = EntryTimeStart,
-  --   End = SpiceRotationEndTime
-  -- },
   GUI = {
     Name = "InsightParent",
     Path = "/Solar System/Missions/Insight",
diff --git a/data/assets/scene/solarsystem/sun/transforms.asset b/data/assets/scene/solarsystem/sun/transforms.asset
index 82d7b9a60e..4cd42b86e9 100644
--- a/data/assets/scene/solarsystem/sun/transforms.asset
+++ b/data/assets/scene/solarsystem/sun/transforms.asset
@@ -6,7 +6,7 @@ local coreKernels = asset.require("spice/core")
 local SolarSystemBarycenter = {
   Identifier = "SolarSystemBarycenter",
   -- No parent; this node is attached to the scene graph root
-  TimeFrame = { -- Using Spice kernels for 1850-2150
+  TimeFrame = {
     Type = "TimeFrameInterval",
     Start = "1550-JAN-01",
     End = "2650-JAN-22"

From 7f3482b5b6abf075bc5b7c9da02c5bdc991547f6 Mon Sep 17 00:00:00 2001
From: Alexander Bock <alexander.bock@liu.se>
Date: Wed, 7 Aug 2024 08:55:03 +0200
Subject: [PATCH 570/701] Update Lua to 5.4.7

---
 ext/ghoul | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ext/ghoul b/ext/ghoul
index 3aab5f1879..7eb3d942c4 160000
--- a/ext/ghoul
+++ b/ext/ghoul
@@ -1 +1 @@
-Subproject commit 3aab5f18796393e18815cf1fe287d6c86aad6fbc
+Subproject commit 7eb3d942c48f8678519ffcd57c325db35bd192d8

From 75b4609c52083d1ab0b472314b6f01be78f03030 Mon Sep 17 00:00:00 2001
From: Alexander Bock <alexander.bock@liu.se>
Date: Wed, 7 Aug 2024 11:34:57 +0200
Subject: [PATCH 571/701] Remove explicitly specifying LuaState constructors

---
 modules/base/rotation/luarotation.cpp       | 4 ----
 modules/base/scale/luascale.cpp             | 4 ----
 modules/base/translation/luatranslation.cpp | 4 ----
 src/engine/openspaceengine.cpp              | 2 +-
 src/scene/scene.cpp                         | 2 +-
 5 files changed, 2 insertions(+), 14 deletions(-)

diff --git a/modules/base/rotation/luarotation.cpp b/modules/base/rotation/luarotation.cpp
index 2e6124db18..c33215f63a 100644
--- a/modules/base/rotation/luarotation.cpp
+++ b/modules/base/rotation/luarotation.cpp
@@ -64,10 +64,6 @@ documentation::Documentation LuaRotation::Documentation() {
 
 LuaRotation::LuaRotation(const ghoul::Dictionary& dictionary)
     : _luaScriptFile(ScriptInfo)
-    , _state(
-        ghoul::lua::LuaState::IncludeStandardLibrary::Yes,
-        ghoul::lua::LuaState::StrictState::No
-    )
 {
     const Parameters p = codegen::bake<Parameters>(dictionary);
 
diff --git a/modules/base/scale/luascale.cpp b/modules/base/scale/luascale.cpp
index f5ee885472..7058eca845 100644
--- a/modules/base/scale/luascale.cpp
+++ b/modules/base/scale/luascale.cpp
@@ -63,10 +63,6 @@ documentation::Documentation LuaScale::Documentation() {
 
 LuaScale::LuaScale(const ghoul::Dictionary& dictionary)
     : _luaScriptFile(ScriptInfo)
-    , _state(
-        ghoul::lua::LuaState::IncludeStandardLibrary::Yes,
-        ghoul::lua::LuaState::StrictState::No
-    )
 {
     const Parameters p = codegen::bake<Parameters>(dictionary);
 
diff --git a/modules/base/translation/luatranslation.cpp b/modules/base/translation/luatranslation.cpp
index cd74c7c103..603205bf1e 100644
--- a/modules/base/translation/luatranslation.cpp
+++ b/modules/base/translation/luatranslation.cpp
@@ -64,10 +64,6 @@ documentation::Documentation LuaTranslation::Documentation() {
 
 LuaTranslation::LuaTranslation(const ghoul::Dictionary& dictionary)
     : _luaScriptFile(ScriptInfo)
-    , _state(
-        ghoul::lua::LuaState::IncludeStandardLibrary::Yes,
-        ghoul::lua::LuaState::StrictState::No
-    )
 {
     const Parameters p = codegen::bake<Parameters>(dictionary);
 
diff --git a/src/engine/openspaceengine.cpp b/src/engine/openspaceengine.cpp
index acd97af002..ff8bbbb243 100644
--- a/src/engine/openspaceengine.cpp
+++ b/src/engine/openspaceengine.cpp
@@ -1383,7 +1383,7 @@ void OpenSpaceEngine::touchExitCallback(TouchInput input) {
 }
 
 void OpenSpaceEngine::handleDragDrop(std::filesystem::path file) {
-    const ghoul::lua::LuaState s(ghoul::lua::LuaState::IncludeStandardLibrary::Yes);
+    const ghoul::lua::LuaState s;
     const std::filesystem::path path = absPath("${SCRIPTS}/drag_drop_handler.lua");
     const std::string p = path.string();
     int status = luaL_loadfile(s, p.c_str());
diff --git a/src/scene/scene.cpp b/src/scene/scene.cpp
index ac5062e4aa..7c1072ac64 100644
--- a/src/scene/scene.cpp
+++ b/src/scene/scene.cpp
@@ -576,7 +576,7 @@ void Scene::updateInterpolations() {
 }
 
 void Scene::setPropertiesFromProfile(const Profile& p) {
-    ghoul::lua::LuaState L(ghoul::lua::LuaState::IncludeStandardLibrary::Yes);
+    ghoul::lua::LuaState L;
 
     for (const Profile::Property& prop : p.properties) {
         if (prop.name.empty()) {

From d25d3072d8f712b07cc857ee61fa631fd14e2e3b Mon Sep 17 00:00:00 2001
From: Alexander Bock <alexander.bock@liu.se>
Date: Wed, 7 Aug 2024 11:35:15 +0200
Subject: [PATCH 572/701] Add new Lua function to read files by lines

---
 src/scripting/scriptengine.cpp     |  1 +
 src/scripting/scriptengine_lua.inl | 18 ++++++++++++++++++
 2 files changed, 19 insertions(+)

diff --git a/src/scripting/scriptengine.cpp b/src/scripting/scriptengine.cpp
index 1c44e9e149..57cd2c42fb 100644
--- a/src/scripting/scriptengine.cpp
+++ b/src/scripting/scriptengine.cpp
@@ -654,6 +654,7 @@ void ScriptEngine::addBaseLibrary() {
             codegen::lua::SetPathToken,
             codegen::lua::FileExists,
             codegen::lua::ReadFile,
+            codegen::lua::ReadFileLines,
             codegen::lua::DirectoryExists,
             codegen::lua::CreateDirectory,
             codegen::lua::WalkDirectory,
diff --git a/src/scripting/scriptengine_lua.inl b/src/scripting/scriptengine_lua.inl
index 1d9ca9c630..c1c130f480 100644
--- a/src/scripting/scriptengine_lua.inl
+++ b/src/scripting/scriptengine_lua.inl
@@ -103,6 +103,24 @@ namespace {
     return contents;
 }
 
+// Reads a file from disk and return its as a list of lines.
+[[codegen::luawrap]] std::vector<std::string> readFileLines(std::filesystem::path file) {
+    std::filesystem::path p = absPath(file);
+    if (!std::filesystem::is_regular_file(p)) {
+        throw ghoul::lua::LuaError(std::format("Could not open file '{}'", file));
+    }
+
+    std::ifstream f = std::ifstream(p);
+    std::vector<std::string> contents;
+    while (f.good()) {
+        std::string line;
+        ghoul::getline(f, line);
+        contents.push_back(std::move(line));
+    }
+
+    return contents;
+}
+
 // Checks whether the provided directory exists.
 [[codegen::luawrap]] bool directoryExists(std::filesystem::path file) {
     const bool e = std::filesystem::is_directory(absPath(std::move(file)));

From 2ee18b6862e1b384c1053e6bba24c7854ed5dd2b Mon Sep 17 00:00:00 2001
From: Alexander Bock <alexander.bock@liu.se>
Date: Wed, 7 Aug 2024 11:36:19 +0200
Subject: [PATCH 573/701] No longer report OpenSpace version explicitly if it
 is the current version

---
 src/util/versionchecker.cpp | 8 --------
 1 file changed, 8 deletions(-)

diff --git a/src/util/versionchecker.cpp b/src/util/versionchecker.cpp
index ecdfff0504..5d7ae63c8e 100644
--- a/src/util/versionchecker.cpp
+++ b/src/util/versionchecker.cpp
@@ -111,14 +111,6 @@ void VersionChecker::cancel() {
                     currentVersion.patch
                 ));
             }
-            else {
-                LINFO(std::format(
-                    "OpenSpace version {}.{}.{} is up to date",
-                    currentVersion.major,
-                    currentVersion.minor,
-                    currentVersion.patch
-                ));
-            }
             return true;
         }
         if (_request->hasFailed()) {

From 845724b7886b241c49f08a6181a365f3d1ee25e6 Mon Sep 17 00:00:00 2001
From: Alexander Bock <mail@alexanderbock.eu>
Date: Sat, 10 Aug 2024 16:48:00 +0200
Subject: [PATCH 574/701] Add the ability to drag and drop WMS files and add
 them to the current Anchor

---
 scripts/drag_drop_handler.lua | 23 +++++++++++++++++++----
 1 file changed, 19 insertions(+), 4 deletions(-)

diff --git a/scripts/drag_drop_handler.lua b/scripts/drag_drop_handler.lua
index 7104ca0880..569da1ff0a 100644
--- a/scripts/drag_drop_handler.lua
+++ b/scripts/drag_drop_handler.lua
@@ -47,28 +47,43 @@ local is_geojson_file = function(extension)
   return extension == ".geojson"
 end
 
+local is_wms_file = function(extension)
+  return extension == ".wms"
+end
+
 if is_image_file(extension) then
   return [[
   openspace.addScreenSpaceRenderable({
     Identifier = openspace.makeIdentifier("]] .. basename_without_extension .. [["),
     Type = "ScreenSpaceImageLocal",
     TexturePath = "]] .. filename .. [["
-  });]] 
+  });]]
 elseif is_video_file(extension) then
   return [[
     openspace.addScreenSpaceRenderable({
       Identifier = openspace.makeIdentifier("]] .. basename_without_extension .. [["),
       Type = "ScreenSpaceVideo",
       Video = "]] .. filename .. [["
-    });]] 
+    });]]
 elseif is_asset_file(extension) then
   return [[
     if openspace.asset.isLoaded("]] .. filename .. [[") ~= true then
       openspace.printInfo("Adding asset: ']] .. filename .. [[' (drag-and-drop)");
     end
-    openspace.asset.add("]] .. filename .. '");' 
+    openspace.asset.add("]] .. filename .. '");'
 elseif is_recording_file(extension) then
   return 'openspace.sessionRecording.startPlayback("' .. filename .. '")'
 elseif is_geojson_file(extension) then
-  return 'openspace.globebrowsing.addGeoJsonFromFile("' .. filename .. '")'  
+  return 'openspace.globebrowsing.addGeoJsonFromFile("' .. filename .. '")'
+elseif is_wms_file(extension) then
+  return [[
+    openspace.globebrowsing.addLayer(
+      openspace.navigation.getNavigationState().Anchor,
+      "ColorLayers",
+      {
+        Identifier = openspace.makeIdentifier("]] .. basename_without_extension .. [["),
+        FilePath = ']] .. filename .. [['
+      }
+    )
+  ]]
 end

From 414c050330b35c8c6a61d3d462599636bcbbc2ac Mon Sep 17 00:00:00 2001
From: Alexander Bock <alexander.bock@liu.se>
Date: Sat, 10 Aug 2024 23:26:46 +0200
Subject: [PATCH 575/701] Update to newer Qt version (#3369)

---
 apps/OpenSpace/CMakeLists.txt                             | 3 +--
 apps/OpenSpace/ext/launcher/src/launcherwindow.cpp        | 2 +-
 apps/OpenSpace/ext/launcher/src/profile/assettreeitem.cpp | 2 +-
 3 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/apps/OpenSpace/CMakeLists.txt b/apps/OpenSpace/CMakeLists.txt
index c4a1234cd0..8e41455eca 100644
--- a/apps/OpenSpace/CMakeLists.txt
+++ b/apps/OpenSpace/CMakeLists.txt
@@ -147,10 +147,9 @@ if (WIN32)
   # Find the windeployqt application
   get_target_property(_qmake_executable Qt6::qmake IMPORTED_LOCATION)
   get_filename_component(_qt_bin_dir "${_qmake_executable}" DIRECTORY)
-  find_program(WINDEPLOYQT_EXECUTABLE windeployqt HINTS "${_qt_bin_dir}")
   add_custom_command(
     TARGET OpenSpace POST_BUILD
-    COMMAND "${CMAKE_COMMAND}" -E env PATH="${_qt_bin_dir}" "${WINDEPLOYQT_EXECUTABLE}" --verbose 0 --no-compiler-runtime --no-translations \"$<TARGET_FILE:OpenSpace>\"
+    COMMAND "${CMAKE_COMMAND}" -E env PATH="${_qt_bin_dir}" "${_qt_bin_dir}/windeployqt6.exe" --verbose 0 --no-compiler-runtime --no-translations \"$<TARGET_FILE:OpenSpace>\"
     COMMENT "Deploying Qt libraries"
   )
 endif ()
diff --git a/apps/OpenSpace/ext/launcher/src/launcherwindow.cpp b/apps/OpenSpace/ext/launcher/src/launcherwindow.cpp
index 162d11b0d9..e9db214d84 100644
--- a/apps/OpenSpace/ext/launcher/src/launcherwindow.cpp
+++ b/apps/OpenSpace/ext/launcher/src/launcherwindow.cpp
@@ -224,7 +224,7 @@ LauncherWindow::LauncherWindow(bool profileEnabled,
 
     qInstallMessageHandler(
         [](QtMsgType type, const QMessageLogContext&, const QString& msg) {
-            if (type == QtCriticalMsg || type == QtFatalMsg || type == QtSystemMsg) {
+            if (type == QtCriticalMsg || type == QtFatalMsg || type == QtCriticalMsg) {
                 std::cerr << msg.toStdString() << '\n';
             }
         }
diff --git a/apps/OpenSpace/ext/launcher/src/profile/assettreeitem.cpp b/apps/OpenSpace/ext/launcher/src/profile/assettreeitem.cpp
index 15a9b69e08..67690c8b33 100644
--- a/apps/OpenSpace/ext/launcher/src/profile/assettreeitem.cpp
+++ b/apps/OpenSpace/ext/launcher/src/profile/assettreeitem.cpp
@@ -151,7 +151,7 @@ bool AssetTreeItem::insertColumns(int position, int columns) {
         _itemData.insert(_itemData.begin() + position, QVariant());
     }
 
-    for (AssetTreeItem* child : qAsConst(_childItems)) {
+    for (AssetTreeItem* child : _childItems) {
         child->insertColumns(position, columns);
     }
 

From 0ec3d5e2842bf23a3152f36c38718ef05e8029e6 Mon Sep 17 00:00:00 2001
From: Alexander Bock <alexander.bock@liu.se>
Date: Mon, 12 Aug 2024 09:55:03 +0200
Subject: [PATCH 576/701] Add Sweden caching server to Earth map layer

---
 .../colorlayers/esri_viirs_combo_sweden.asset | 63 +++++++++++++++++++
 .../esri_world_imagery_sweden.asset           | 42 +++++++++++++
 .../colorlayers/esri_world_imagery_sweden.wms | 21 +++++++
 3 files changed, 126 insertions(+)
 create mode 100644 data/assets/scene/solarsystem/planets/earth/layers/colorlayers/esri_viirs_combo_sweden.asset
 create mode 100644 data/assets/scene/solarsystem/planets/earth/layers/colorlayers/esri_world_imagery_sweden.asset
 create mode 100644 data/assets/scene/solarsystem/planets/earth/layers/colorlayers/esri_world_imagery_sweden.wms

diff --git a/data/assets/scene/solarsystem/planets/earth/layers/colorlayers/esri_viirs_combo_sweden.asset b/data/assets/scene/solarsystem/planets/earth/layers/colorlayers/esri_viirs_combo_sweden.asset
new file mode 100644
index 0000000000..ec96772a81
--- /dev/null
+++ b/data/assets/scene/solarsystem/planets/earth/layers/colorlayers/esri_viirs_combo_sweden.asset
@@ -0,0 +1,63 @@
+local globe = asset.require("../../earth")
+local snpp = asset.require("./definitions/snpp")
+local noaa20 = asset.require("./definitions/noaa20")
+local noaa21 = asset.require("./definitions/noaa21")
+
+
+
+local Layer = {
+  Identifier = "ESRI_VIIRS_Combo_UsSweden",
+  Name = "ESRI VIIRS Combo [US/Sweden]",
+  Enabled = asset.enabled,
+  ZIndex = 20,
+  Type = "TileProviderByLevel",
+  LevelTileProviders = {
+    {
+      MaxLevel = 4,
+      TileProvider = {
+        Identifier = "VIIRS_Joint_Layer",
+        Name = "VIIRS Joint Layer",
+        Type = "TileProviderByDate",
+        Providers = {
+          ["2015-11-24"] = snpp.Layer,
+          ["2018-01-05"] = noaa20.Layer,
+          ["2024-04-19"] = noaa21.Layer
+        }
+      }
+    },
+    {
+      MaxLevel = 22,
+      TileProvider = {
+        Identifier = "ESRI_World_Imagery_Sweden",
+        Name = "ESRI World Imagery [Sweden]",
+        FilePath = asset.resource("esri_world_imagery_sweden.wms"),
+        PadTiles = false
+      }
+    }
+  },
+  PadTiles = false,
+  Description = [[Level based layer combining different VIIRS layers and ESRI World
+    Imagery. VIIRS is faded out at tile level 4]]
+}
+
+
+asset.onInitialize(function()
+  openspace.globebrowsing.addLayer(globe.Earth.Identifier, "ColorLayers", Layer)
+end)
+
+asset.onDeinitialize(function()
+  openspace.globebrowsing.deleteLayer(globe.Earth.Identifier, "ColorLayers", Layer)
+end)
+
+asset.export("layer", Layer)
+
+
+
+asset.meta = {
+  Name = "ESRI VIIRS Combo",
+  Description = [[Level based layer combining "VIIRS SNPP (Temporal)" and ESRI World
+  Imagery. "VIIRS SNPP (Temporal)" is faded out at tile level 4]],
+  Author = "OpenSpace Tem",
+  URL = "http://www.openspaceproject.com",
+  License = "MIT License"
+}
diff --git a/data/assets/scene/solarsystem/planets/earth/layers/colorlayers/esri_world_imagery_sweden.asset b/data/assets/scene/solarsystem/planets/earth/layers/colorlayers/esri_world_imagery_sweden.asset
new file mode 100644
index 0000000000..b0f95b6f82
--- /dev/null
+++ b/data/assets/scene/solarsystem/planets/earth/layers/colorlayers/esri_world_imagery_sweden.asset
@@ -0,0 +1,42 @@
+local globe = asset.require("../../earth")
+
+
+
+local Layer = {
+  Identifier = "ESRI_World_Imagery_Sweden",
+  Name = "ESRI World Imagery [Sweden]",
+  Enabled = asset.enabled,
+  ZIndex = 10,
+  FilePath = asset.resource("esri_world_imagery_sweden.wms"),
+  Description = [[World Imagery provides one meter or better satellite and aerial
+    imagery in many parts of the world and lower resolution satellite imagery
+    worldwide. The map includes 15m TerraColor imagery at small and mid-scales
+    (~1:591M down to ~1:72k) and 2.5m SPOT Imagery (~1:288k to ~1:72k) for the world.
+    The map features 0.5m resolution imagery in the continental United States and
+    parts of Western Europe from Maxar. Additional Maxar sub-meter imagery is
+    featured in many parts of the world. In other parts of the world, imagery at
+    different resolutions has been contributed by the GIS User Community. In select
+    communities, very high resolution imagery (down to 0.03m) is available down to
+    ~1:280 scale. (Description from URL)]]
+}
+
+
+asset.onInitialize(function()
+  openspace.globebrowsing.addLayer(globe.Earth.Identifier, "ColorLayers", Layer)
+end)
+
+asset.onDeinitialize(function()
+  openspace.globebrowsing.deleteLayer(globe.Earth.Identifier, "ColorLayers", Layer)
+end)
+
+asset.export("layer", Layer)
+
+
+
+asset.meta = {
+  Name = "ESRI World Imagery",
+  Description = "Main web loaded map layer for Earth. This layer is hosted by ESRI",
+  Author = "ESRI",
+  URL = "https://www.arcgis.com/home/item.html?id=10df2279f9684e4a9f6a7f08febac2a9",
+  License = "Esri Master License Agreement"
+}
diff --git a/data/assets/scene/solarsystem/planets/earth/layers/colorlayers/esri_world_imagery_sweden.wms b/data/assets/scene/solarsystem/planets/earth/layers/colorlayers/esri_world_imagery_sweden.wms
new file mode 100644
index 0000000000..01cf55ef13
--- /dev/null
+++ b/data/assets/scene/solarsystem/planets/earth/layers/colorlayers/esri_world_imagery_sweden.wms
@@ -0,0 +1,21 @@
+<GDAL_WMS>
+  <Service name="TMS">
+    <ServerUrl>http://liu-se.wms.openspaceproject.com/Earth/Esri_World_Imagery/tile/${z}/${y}/${x}.jpg</ServerUrl>
+  </Service>
+  <DataWindow>
+    <UpperLeftX>-180.0</UpperLeftX>
+    <UpperLeftY>90</UpperLeftY>
+    <LowerRightX>180</LowerRightX>
+    <LowerRightY>-90</LowerRightY>
+    <TileLevel>19</TileLevel>
+    <TileCountX>2</TileCountX>
+    <TileCountY>1</TileCountY>
+    <YOrigin>top</YOrigin>
+  </DataWindow>
+  <Projection>EPSG:4326</Projection>
+  <BlockSizeX>256</BlockSizeX>
+  <BlockSizeY>256</BlockSizeY>
+  <BandsCount>3</BandsCount>
+  <MaxConnections>5</MaxConnections>
+  <Timeout>5</Timeout>
+</GDAL_WMS>

From 5d2186f11dbe567cf1dd434e6b6b05a007e4b5df Mon Sep 17 00:00:00 2001
From: Alexander Bock <alexander.bock@liu.se>
Date: Mon, 12 Aug 2024 21:20:39 +0200
Subject: [PATCH 577/701] Add Esri Wayback layers (#3382)

---
 .../esri_world_imagery_wayback.asset          | 155 ++++++++++++++++++
 .../esri_world_imagery_wayback/20140220.wms   |  21 +++
 .../esri_world_imagery_wayback/20150430.wms   |  21 +++
 .../esri_world_imagery_wayback/20160613.wms   |  21 +++
 .../esri_world_imagery_wayback/20180108.wms   |  21 +++
 .../esri_world_imagery_wayback/20180627.wms   |  21 +++
 .../esri_world_imagery_wayback/20190626.wms   |  21 +++
 .../esri_world_imagery_wayback/20200610.wms   |  21 +++
 .../esri_world_imagery_wayback/20210408.wms   |  21 +++
 .../esri_world_imagery_wayback/20211221.wms   |  21 +++
 .../esri_world_imagery_wayback/20221012.wms   |  21 +++
 .../esri_world_imagery_wayback/20230613.wms   |  21 +++
 .../esri_world_imagery_wayback/20231207.wms   |  21 +++
 13 files changed, 407 insertions(+)
 create mode 100644 data/assets/scene/solarsystem/planets/earth/layers/colorlayers/esri_world_imagery_wayback.asset
 create mode 100644 data/assets/scene/solarsystem/planets/earth/layers/colorlayers/esri_world_imagery_wayback/20140220.wms
 create mode 100644 data/assets/scene/solarsystem/planets/earth/layers/colorlayers/esri_world_imagery_wayback/20150430.wms
 create mode 100644 data/assets/scene/solarsystem/planets/earth/layers/colorlayers/esri_world_imagery_wayback/20160613.wms
 create mode 100644 data/assets/scene/solarsystem/planets/earth/layers/colorlayers/esri_world_imagery_wayback/20180108.wms
 create mode 100644 data/assets/scene/solarsystem/planets/earth/layers/colorlayers/esri_world_imagery_wayback/20180627.wms
 create mode 100644 data/assets/scene/solarsystem/planets/earth/layers/colorlayers/esri_world_imagery_wayback/20190626.wms
 create mode 100644 data/assets/scene/solarsystem/planets/earth/layers/colorlayers/esri_world_imagery_wayback/20200610.wms
 create mode 100644 data/assets/scene/solarsystem/planets/earth/layers/colorlayers/esri_world_imagery_wayback/20210408.wms
 create mode 100644 data/assets/scene/solarsystem/planets/earth/layers/colorlayers/esri_world_imagery_wayback/20211221.wms
 create mode 100644 data/assets/scene/solarsystem/planets/earth/layers/colorlayers/esri_world_imagery_wayback/20221012.wms
 create mode 100644 data/assets/scene/solarsystem/planets/earth/layers/colorlayers/esri_world_imagery_wayback/20230613.wms
 create mode 100644 data/assets/scene/solarsystem/planets/earth/layers/colorlayers/esri_world_imagery_wayback/20231207.wms

diff --git a/data/assets/scene/solarsystem/planets/earth/layers/colorlayers/esri_world_imagery_wayback.asset b/data/assets/scene/solarsystem/planets/earth/layers/colorlayers/esri_world_imagery_wayback.asset
new file mode 100644
index 0000000000..27fa8892d4
--- /dev/null
+++ b/data/assets/scene/solarsystem/planets/earth/layers/colorlayers/esri_world_imagery_wayback.asset
@@ -0,0 +1,155 @@
+local globe = asset.require("../../earth")
+
+
+
+local WaybackLayer20140220 = {
+  Identifier = "ESRI_World_Imagery_Wayback_20140220",
+  ZIndex = 10,
+  FilePath = asset.resource("esri_world_imagery_wayback/20140220.wms"),
+  Description = [[The ESRI World Imagery dataset from the wayback feature showing the
+    Earth how it looked like in 2014 FEB 20. https://livingatlas.arcgis.com/wayback]]
+}
+
+local WaybackLayer20150430 = {
+  Identifier = "ESRI_World_Imagery_Wayback_20150430",
+  ZIndex = 10,
+  FilePath = asset.resource("esri_world_imagery_wayback/20150430.wms"),
+  Description = [[The ESRI World Imagery dataset from the wayback feature showing the
+    Earth how it looked like in 2015 APR 30. https://livingatlas.arcgis.com/wayback]]
+}
+
+local WaybackLayer20160613 = {
+  Identifier = "ESRI_World_Imagery_Wayback_20160613",
+  ZIndex = 10,
+  FilePath = asset.resource("esri_world_imagery_wayback/20160613.wms"),
+  Description = [[The ESRI World Imagery dataset from the wayback feature showing the
+    Earth how it looked like in 2016 JUN 13. https://livingatlas.arcgis.com/wayback]]
+}
+
+local WaybackLayer20180108 = {
+  Identifier = "ESRI_World_Imagery_Wayback_20180108",
+  ZIndex = 10,
+  FilePath = asset.resource("esri_world_imagery_wayback/20180108.wms"),
+  Description = [[The ESRI World Imagery dataset from the wayback feature showing the
+    Earth how it looked like in 2018 JAN 08. https://livingatlas.arcgis.com/wayback]]
+}
+
+local WaybackLayer20180627 = {
+  Identifier = "ESRI_World_Imagery_Wayback_20180627",
+  ZIndex = 10,
+  FilePath = asset.resource("esri_world_imagery_wayback/20180627.wms"),
+  Description = [[The ESRI World Imagery dataset from the wayback feature showing the
+    Earth how it looked like in 2018 JUN 27. https://livingatlas.arcgis.com/wayback]]
+}
+
+local WaybackLayer20190626 = {
+  Identifier = "ESRI_World_Imagery_Wayback_20190626",
+  ZIndex = 10,
+  FilePath = asset.resource("esri_world_imagery_wayback/20190626.wms"),
+  Description = [[The ESRI World Imagery dataset from the wayback feature showing the
+    Earth how it looked like in 2019 JUN 26. https://livingatlas.arcgis.com/wayback]]
+}
+
+local WaybackLayer20200610 = {
+  Identifier = "ESRI_World_Imagery_Wayback_20200610",
+  ZIndex = 10,
+  FilePath = asset.resource("esri_world_imagery_wayback/20200610.wms"),
+  Description = [[The ESRI World Imagery dataset from the wayback feature showing the
+    Earth how it looked like in 2020 JUN 10. https://livingatlas.arcgis.com/wayback]]
+}
+
+local WaybackLayer20210408 = {
+  Identifier = "ESRI_World_Imagery_Wayback_20210408",
+  ZIndex = 10,
+  FilePath = asset.resource("esri_world_imagery_wayback/20210408.wms"),
+  Description = [[The ESRI World Imagery dataset from the wayback feature showing the
+    Earth how it looked like in 2021 APR 08. https://livingatlas.arcgis.com/wayback]]
+}
+
+local WaybackLayer20211221 = {
+  Identifier = "ESRI_World_Imagery_Wayback_20211221",
+  ZIndex = 10,
+  FilePath = asset.resource("esri_world_imagery_wayback/20211221.wms"),
+  Description = [[The ESRI World Imagery dataset from the wayback feature showing the
+    Earth how it looked like in 2021 DEC 21. https://livingatlas.arcgis.com/wayback]]
+}
+
+local WaybackLayer20221012 = {
+  Identifier = "ESRI_World_Imagery_Wayback_20221012",
+  ZIndex = 10,
+  FilePath = asset.resource("esri_world_imagery_wayback/20221012.wms"),
+  Description = [[The ESRI World Imagery dataset from the wayback feature showing the
+    Earth how it looked like in 2022 OCT 12. https://livingatlas.arcgis.com/wayback]]
+}
+
+local WaybackLayer20230613 = {
+  Identifier = "ESRI_World_Imagery_Wayback_20230613",
+  ZIndex = 10,
+  FilePath = asset.resource("esri_world_imagery_wayback/20230613.wms"),
+  Description = [[The ESRI World Imagery dataset from the wayback feature showing the
+    Earth how it looked like in 2023 JUN 13. https://livingatlas.arcgis.com/wayback]]
+}
+
+local WaybackLayer20231207 = {
+  Identifier = "ESRI_World_Imagery_Wayback_20231207",
+  ZIndex = 10,
+  FilePath = asset.resource("esri_world_imagery_wayback/20231207.wms"),
+  Description = [[The ESRI World Imagery dataset from the wayback feature showing the
+    Earth how it looked like in 2023 DEC 07. https://livingatlas.arcgis.com/wayback]]
+}
+
+
+
+asset.onInitialize(function()
+  openspace.globebrowsing.addLayer(globe.Earth.Identifier, "ColorLayers", WaybackLayer20140220)
+  openspace.globebrowsing.addLayer(globe.Earth.Identifier, "ColorLayers", WaybackLayer20150430)
+  openspace.globebrowsing.addLayer(globe.Earth.Identifier, "ColorLayers", WaybackLayer20160613)
+  openspace.globebrowsing.addLayer(globe.Earth.Identifier, "ColorLayers", WaybackLayer20180108)
+  openspace.globebrowsing.addLayer(globe.Earth.Identifier, "ColorLayers", WaybackLayer20180627)
+  openspace.globebrowsing.addLayer(globe.Earth.Identifier, "ColorLayers", WaybackLayer20190626)
+  openspace.globebrowsing.addLayer(globe.Earth.Identifier, "ColorLayers", WaybackLayer20200610)
+  openspace.globebrowsing.addLayer(globe.Earth.Identifier, "ColorLayers", WaybackLayer20210408)
+  openspace.globebrowsing.addLayer(globe.Earth.Identifier, "ColorLayers", WaybackLayer20211221)
+  openspace.globebrowsing.addLayer(globe.Earth.Identifier, "ColorLayers", WaybackLayer20221012)
+  openspace.globebrowsing.addLayer(globe.Earth.Identifier, "ColorLayers", WaybackLayer20230613)
+  openspace.globebrowsing.addLayer(globe.Earth.Identifier, "ColorLayers", WaybackLayer20231207)
+end)
+
+asset.onDeinitialize(function()
+  openspace.globebrowsing.deleteLayer(globe.Earth.Identifier, "ColorLayers", WaybackLayer20231207)
+  openspace.globebrowsing.deleteLayer(globe.Earth.Identifier, "ColorLayers", WaybackLayer20230613)
+  openspace.globebrowsing.deleteLayer(globe.Earth.Identifier, "ColorLayers", WaybackLayer20221012)
+  openspace.globebrowsing.deleteLayer(globe.Earth.Identifier, "ColorLayers", WaybackLayer20211221)
+  openspace.globebrowsing.deleteLayer(globe.Earth.Identifier, "ColorLayers", WaybackLayer20210408)
+  openspace.globebrowsing.deleteLayer(globe.Earth.Identifier, "ColorLayers", WaybackLayer20200610)
+  openspace.globebrowsing.deleteLayer(globe.Earth.Identifier, "ColorLayers", WaybackLayer20190626)
+  openspace.globebrowsing.deleteLayer(globe.Earth.Identifier, "ColorLayers", WaybackLayer20180627)
+  openspace.globebrowsing.deleteLayer(globe.Earth.Identifier, "ColorLayers", WaybackLayer20180108)
+  openspace.globebrowsing.deleteLayer(globe.Earth.Identifier, "ColorLayers", WaybackLayer20160613)
+  openspace.globebrowsing.deleteLayer(globe.Earth.Identifier, "ColorLayers", WaybackLayer20150430)
+  openspace.globebrowsing.deleteLayer(globe.Earth.Identifier, "ColorLayers", WaybackLayer20140220)
+end)
+
+asset.export("layer20140220", WaybackLayer20140220)
+asset.export("layer20150430", WaybackLayer20150430)
+asset.export("layer20160613", WaybackLayer20160613)
+asset.export("layer20180108", WaybackLayer20180108)
+asset.export("layer20180627", WaybackLayer20180627)
+asset.export("layer20190626", WaybackLayer20190626)
+asset.export("layer20200610", WaybackLayer20200610)
+asset.export("layer20210408", WaybackLayer20210408)
+asset.export("layer20211221", WaybackLayer20211221)
+asset.export("layer20221012", WaybackLayer20221012)
+asset.export("layer20230613", WaybackLayer20230613)
+asset.export("layer20231207", WaybackLayer20231207)
+
+
+
+asset.meta = {
+  Name = "ESRI World Imagery Wayback machine",
+  Description = [[Access to the ESRI World Imagery Wayback machine layers ranging from
+    2014 to 2023]],
+  Author = "ESRI",
+  URL = "https://livingatlas.arcgis.com/wayback",
+  License = "Esri Master License Agreement"
+}
diff --git a/data/assets/scene/solarsystem/planets/earth/layers/colorlayers/esri_world_imagery_wayback/20140220.wms b/data/assets/scene/solarsystem/planets/earth/layers/colorlayers/esri_world_imagery_wayback/20140220.wms
new file mode 100644
index 0000000000..b2a2bfa18a
--- /dev/null
+++ b/data/assets/scene/solarsystem/planets/earth/layers/colorlayers/esri_world_imagery_wayback/20140220.wms
@@ -0,0 +1,21 @@
+<GDAL_WMS>
+  <Service name="TMS">
+    <ServerUrl>http://liu-se.wms.openspaceproject.com/Earth/Esri_Wayback/tile/10/${z}/${y}/${x}</ServerUrl>
+  </Service>
+  <DataWindow>
+    <UpperLeftX>-180.0</UpperLeftX>
+    <UpperLeftY>90</UpperLeftY>
+    <LowerRightX>180</LowerRightX>
+    <LowerRightY>-90</LowerRightY>
+    <TileLevel>19</TileLevel>
+    <TileCountX>2</TileCountX>
+    <TileCountY>1</TileCountY>
+    <YOrigin>top</YOrigin>
+  </DataWindow>
+  <Projection>EPSG:4326</Projection>
+  <BlockSizeX>256</BlockSizeX>
+  <BlockSizeY>256</BlockSizeY>
+  <BandsCount>3</BandsCount>
+  <MaxConnections>5</MaxConnections>
+  <Timeout>5</Timeout>
+</GDAL_WMS>
diff --git a/data/assets/scene/solarsystem/planets/earth/layers/colorlayers/esri_world_imagery_wayback/20150430.wms b/data/assets/scene/solarsystem/planets/earth/layers/colorlayers/esri_world_imagery_wayback/20150430.wms
new file mode 100644
index 0000000000..e4cabf068f
--- /dev/null
+++ b/data/assets/scene/solarsystem/planets/earth/layers/colorlayers/esri_world_imagery_wayback/20150430.wms
@@ -0,0 +1,21 @@
+<GDAL_WMS>
+  <Service name="TMS">
+    <ServerUrl>http://liu-se.wms.openspaceproject.com/Earth/Esri_Wayback/tile/23880/${z}/${y}/${x}</ServerUrl>
+  </Service>
+  <DataWindow>
+    <UpperLeftX>-180.0</UpperLeftX>
+    <UpperLeftY>90</UpperLeftY>
+    <LowerRightX>180</LowerRightX>
+    <LowerRightY>-90</LowerRightY>
+    <TileLevel>19</TileLevel>
+    <TileCountX>2</TileCountX>
+    <TileCountY>1</TileCountY>
+    <YOrigin>top</YOrigin>
+  </DataWindow>
+  <Projection>EPSG:4326</Projection>
+  <BlockSizeX>256</BlockSizeX>
+  <BlockSizeY>256</BlockSizeY>
+  <BandsCount>3</BandsCount>
+  <MaxConnections>5</MaxConnections>
+  <Timeout>5</Timeout>
+</GDAL_WMS>
diff --git a/data/assets/scene/solarsystem/planets/earth/layers/colorlayers/esri_world_imagery_wayback/20160613.wms b/data/assets/scene/solarsystem/planets/earth/layers/colorlayers/esri_world_imagery_wayback/20160613.wms
new file mode 100644
index 0000000000..86ea70aef5
--- /dev/null
+++ b/data/assets/scene/solarsystem/planets/earth/layers/colorlayers/esri_world_imagery_wayback/20160613.wms
@@ -0,0 +1,21 @@
+<GDAL_WMS>
+  <Service name="TMS">
+    <ServerUrl>http://liu-se.wms.openspaceproject.com/Earth/Esri_Wayback/tile/11509/${z}/${y}/${x}</ServerUrl>
+  </Service>
+  <DataWindow>
+    <UpperLeftX>-180.0</UpperLeftX>
+    <UpperLeftY>90</UpperLeftY>
+    <LowerRightX>180</LowerRightX>
+    <LowerRightY>-90</LowerRightY>
+    <TileLevel>19</TileLevel>
+    <TileCountX>2</TileCountX>
+    <TileCountY>1</TileCountY>
+    <YOrigin>top</YOrigin>
+  </DataWindow>
+  <Projection>EPSG:4326</Projection>
+  <BlockSizeX>256</BlockSizeX>
+  <BlockSizeY>256</BlockSizeY>
+  <BandsCount>3</BandsCount>
+  <MaxConnections>5</MaxConnections>
+  <Timeout>5</Timeout>
+</GDAL_WMS>
diff --git a/data/assets/scene/solarsystem/planets/earth/layers/colorlayers/esri_world_imagery_wayback/20180108.wms b/data/assets/scene/solarsystem/planets/earth/layers/colorlayers/esri_world_imagery_wayback/20180108.wms
new file mode 100644
index 0000000000..38f9de5ba0
--- /dev/null
+++ b/data/assets/scene/solarsystem/planets/earth/layers/colorlayers/esri_world_imagery_wayback/20180108.wms
@@ -0,0 +1,21 @@
+<GDAL_WMS>
+  <Service name="TMS">
+    <ServerUrl>http://liu-se.wms.openspaceproject.com/Earth/Esri_Wayback/tile/13161/${z}/${y}/${x}</ServerUrl>
+  </Service>
+  <DataWindow>
+    <UpperLeftX>-180.0</UpperLeftX>
+    <UpperLeftY>90</UpperLeftY>
+    <LowerRightX>180</LowerRightX>
+    <LowerRightY>-90</LowerRightY>
+    <TileLevel>19</TileLevel>
+    <TileCountX>2</TileCountX>
+    <TileCountY>1</TileCountY>
+    <YOrigin>top</YOrigin>
+  </DataWindow>
+  <Projection>EPSG:4326</Projection>
+  <BlockSizeX>256</BlockSizeX>
+  <BlockSizeY>256</BlockSizeY>
+  <BandsCount>3</BandsCount>
+  <MaxConnections>5</MaxConnections>
+  <Timeout>5</Timeout>
+</GDAL_WMS>
diff --git a/data/assets/scene/solarsystem/planets/earth/layers/colorlayers/esri_world_imagery_wayback/20180627.wms b/data/assets/scene/solarsystem/planets/earth/layers/colorlayers/esri_world_imagery_wayback/20180627.wms
new file mode 100644
index 0000000000..9bfdfefc00
--- /dev/null
+++ b/data/assets/scene/solarsystem/planets/earth/layers/colorlayers/esri_world_imagery_wayback/20180627.wms
@@ -0,0 +1,21 @@
+<GDAL_WMS>
+  <Service name="TMS">
+    <ServerUrl>http://liu-se.wms.openspaceproject.com/Earth/Esri_Wayback/tile/11334/${z}/${y}/${x}</ServerUrl>
+  </Service>
+  <DataWindow>
+    <UpperLeftX>-180.0</UpperLeftX>
+    <UpperLeftY>90</UpperLeftY>
+    <LowerRightX>180</LowerRightX>
+    <LowerRightY>-90</LowerRightY>
+    <TileLevel>19</TileLevel>
+    <TileCountX>2</TileCountX>
+    <TileCountY>1</TileCountY>
+    <YOrigin>top</YOrigin>
+  </DataWindow>
+  <Projection>EPSG:4326</Projection>
+  <BlockSizeX>256</BlockSizeX>
+  <BlockSizeY>256</BlockSizeY>
+  <BandsCount>3</BandsCount>
+  <MaxConnections>5</MaxConnections>
+  <Timeout>5</Timeout>
+</GDAL_WMS>
diff --git a/data/assets/scene/solarsystem/planets/earth/layers/colorlayers/esri_world_imagery_wayback/20190626.wms b/data/assets/scene/solarsystem/planets/earth/layers/colorlayers/esri_world_imagery_wayback/20190626.wms
new file mode 100644
index 0000000000..272eb62d4e
--- /dev/null
+++ b/data/assets/scene/solarsystem/planets/earth/layers/colorlayers/esri_world_imagery_wayback/20190626.wms
@@ -0,0 +1,21 @@
+<GDAL_WMS>
+  <Service name="TMS">
+    <ServerUrl>http://liu-se.wms.openspaceproject.com/Earth/Esri_Wayback/tile/645/${z}/${y}/${x}</ServerUrl>
+  </Service>
+  <DataWindow>
+    <UpperLeftX>-180.0</UpperLeftX>
+    <UpperLeftY>90</UpperLeftY>
+    <LowerRightX>180</LowerRightX>
+    <LowerRightY>-90</LowerRightY>
+    <TileLevel>19</TileLevel>
+    <TileCountX>2</TileCountX>
+    <TileCountY>1</TileCountY>
+    <YOrigin>top</YOrigin>
+  </DataWindow>
+  <Projection>EPSG:4326</Projection>
+  <BlockSizeX>256</BlockSizeX>
+  <BlockSizeY>256</BlockSizeY>
+  <BandsCount>3</BandsCount>
+  <MaxConnections>5</MaxConnections>
+  <Timeout>5</Timeout>
+</GDAL_WMS>
diff --git a/data/assets/scene/solarsystem/planets/earth/layers/colorlayers/esri_world_imagery_wayback/20200610.wms b/data/assets/scene/solarsystem/planets/earth/layers/colorlayers/esri_world_imagery_wayback/20200610.wms
new file mode 100644
index 0000000000..e289c32548
--- /dev/null
+++ b/data/assets/scene/solarsystem/planets/earth/layers/colorlayers/esri_world_imagery_wayback/20200610.wms
@@ -0,0 +1,21 @@
+<GDAL_WMS>
+  <Service name="TMS">
+    <ServerUrl>http://liu-se.wms.openspaceproject.com/Earth/Esri_Wayback/tile/11135/${z}/${y}/${x}</ServerUrl>
+  </Service>
+  <DataWindow>
+    <UpperLeftX>-180.0</UpperLeftX>
+    <UpperLeftY>90</UpperLeftY>
+    <LowerRightX>180</LowerRightX>
+    <LowerRightY>-90</LowerRightY>
+    <TileLevel>19</TileLevel>
+    <TileCountX>2</TileCountX>
+    <TileCountY>1</TileCountY>
+    <YOrigin>top</YOrigin>
+  </DataWindow>
+  <Projection>EPSG:4326</Projection>
+  <BlockSizeX>256</BlockSizeX>
+  <BlockSizeY>256</BlockSizeY>
+  <BandsCount>3</BandsCount>
+  <MaxConnections>5</MaxConnections>
+  <Timeout>5</Timeout>
+</GDAL_WMS>
diff --git a/data/assets/scene/solarsystem/planets/earth/layers/colorlayers/esri_world_imagery_wayback/20210408.wms b/data/assets/scene/solarsystem/planets/earth/layers/colorlayers/esri_world_imagery_wayback/20210408.wms
new file mode 100644
index 0000000000..ae992e75f1
--- /dev/null
+++ b/data/assets/scene/solarsystem/planets/earth/layers/colorlayers/esri_world_imagery_wayback/20210408.wms
@@ -0,0 +1,21 @@
+<GDAL_WMS>
+  <Service name="TMS">
+    <ServerUrl>http://liu-se.wms.openspaceproject.com/Earth/Esri_Wayback/tile/6863/${z}/${y}/${x}</ServerUrl>
+  </Service>
+  <DataWindow>
+    <UpperLeftX>-180.0</UpperLeftX>
+    <UpperLeftY>90</UpperLeftY>
+    <LowerRightX>180</LowerRightX>
+    <LowerRightY>-90</LowerRightY>
+    <TileLevel>19</TileLevel>
+    <TileCountX>2</TileCountX>
+    <TileCountY>1</TileCountY>
+    <YOrigin>top</YOrigin>
+  </DataWindow>
+  <Projection>EPSG:4326</Projection>
+  <BlockSizeX>256</BlockSizeX>
+  <BlockSizeY>256</BlockSizeY>
+  <BandsCount>3</BandsCount>
+  <MaxConnections>5</MaxConnections>
+  <Timeout>5</Timeout>
+</GDAL_WMS>
diff --git a/data/assets/scene/solarsystem/planets/earth/layers/colorlayers/esri_world_imagery_wayback/20211221.wms b/data/assets/scene/solarsystem/planets/earth/layers/colorlayers/esri_world_imagery_wayback/20211221.wms
new file mode 100644
index 0000000000..628fbf81b4
--- /dev/null
+++ b/data/assets/scene/solarsystem/planets/earth/layers/colorlayers/esri_world_imagery_wayback/20211221.wms
@@ -0,0 +1,21 @@
+<GDAL_WMS>
+  <Service name="TMS">
+    <ServerUrl>http://liu-se.wms.openspaceproject.com/Earth/Esri_Wayback/tile/26120/${z}/${y}/${x}</ServerUrl>
+  </Service>
+  <DataWindow>
+    <UpperLeftX>-180.0</UpperLeftX>
+    <UpperLeftY>90</UpperLeftY>
+    <LowerRightX>180</LowerRightX>
+    <LowerRightY>-90</LowerRightY>
+    <TileLevel>19</TileLevel>
+    <TileCountX>2</TileCountX>
+    <TileCountY>1</TileCountY>
+    <YOrigin>top</YOrigin>
+  </DataWindow>
+  <Projection>EPSG:4326</Projection>
+  <BlockSizeX>256</BlockSizeX>
+  <BlockSizeY>256</BlockSizeY>
+  <BandsCount>3</BandsCount>
+  <MaxConnections>5</MaxConnections>
+  <Timeout>5</Timeout>
+</GDAL_WMS>
diff --git a/data/assets/scene/solarsystem/planets/earth/layers/colorlayers/esri_world_imagery_wayback/20221012.wms b/data/assets/scene/solarsystem/planets/earth/layers/colorlayers/esri_world_imagery_wayback/20221012.wms
new file mode 100644
index 0000000000..44aafcf12f
--- /dev/null
+++ b/data/assets/scene/solarsystem/planets/earth/layers/colorlayers/esri_world_imagery_wayback/20221012.wms
@@ -0,0 +1,21 @@
+<GDAL_WMS>
+  <Service name="TMS">
+    <ServerUrl>http://liu-se.wms.openspaceproject.com/Earth/Esri_Wayback/tile/44988/${z}/${y}/${x}</ServerUrl>
+  </Service>
+  <DataWindow>
+    <UpperLeftX>-180.0</UpperLeftX>
+    <UpperLeftY>90</UpperLeftY>
+    <LowerRightX>180</LowerRightX>
+    <LowerRightY>-90</LowerRightY>
+    <TileLevel>19</TileLevel>
+    <TileCountX>2</TileCountX>
+    <TileCountY>1</TileCountY>
+    <YOrigin>top</YOrigin>
+  </DataWindow>
+  <Projection>EPSG:4326</Projection>
+  <BlockSizeX>256</BlockSizeX>
+  <BlockSizeY>256</BlockSizeY>
+  <BandsCount>3</BandsCount>
+  <MaxConnections>5</MaxConnections>
+  <Timeout>5</Timeout>
+</GDAL_WMS>
diff --git a/data/assets/scene/solarsystem/planets/earth/layers/colorlayers/esri_world_imagery_wayback/20230613.wms b/data/assets/scene/solarsystem/planets/earth/layers/colorlayers/esri_world_imagery_wayback/20230613.wms
new file mode 100644
index 0000000000..ae41d06d4e
--- /dev/null
+++ b/data/assets/scene/solarsystem/planets/earth/layers/colorlayers/esri_world_imagery_wayback/20230613.wms
@@ -0,0 +1,21 @@
+<GDAL_WMS>
+  <Service name="TMS">
+    <ServerUrl>http://liu-se.wms.openspaceproject.com/Earth/Esri_Wayback/tile/25982/${z}/${y}/${x}</ServerUrl>
+  </Service>
+  <DataWindow>
+    <UpperLeftX>-180.0</UpperLeftX>
+    <UpperLeftY>90</UpperLeftY>
+    <LowerRightX>180</LowerRightX>
+    <LowerRightY>-90</LowerRightY>
+    <TileLevel>19</TileLevel>
+    <TileCountX>2</TileCountX>
+    <TileCountY>1</TileCountY>
+    <YOrigin>top</YOrigin>
+  </DataWindow>
+  <Projection>EPSG:4326</Projection>
+  <BlockSizeX>256</BlockSizeX>
+  <BlockSizeY>256</BlockSizeY>
+  <BandsCount>3</BandsCount>
+  <MaxConnections>5</MaxConnections>
+  <Timeout>5</Timeout>
+</GDAL_WMS>
diff --git a/data/assets/scene/solarsystem/planets/earth/layers/colorlayers/esri_world_imagery_wayback/20231207.wms b/data/assets/scene/solarsystem/planets/earth/layers/colorlayers/esri_world_imagery_wayback/20231207.wms
new file mode 100644
index 0000000000..9a6388ad64
--- /dev/null
+++ b/data/assets/scene/solarsystem/planets/earth/layers/colorlayers/esri_world_imagery_wayback/20231207.wms
@@ -0,0 +1,21 @@
+<GDAL_WMS>
+  <Service name="TMS">
+    <ServerUrl>http://liu-se.wms.openspaceproject.com/Earth/Esri_Wayback/tile/56102/${z}/${y}/${x}</ServerUrl>
+  </Service>
+  <DataWindow>
+    <UpperLeftX>-180.0</UpperLeftX>
+    <UpperLeftY>90</UpperLeftY>
+    <LowerRightX>180</LowerRightX>
+    <LowerRightY>-90</LowerRightY>
+    <TileLevel>19</TileLevel>
+    <TileCountX>2</TileCountX>
+    <TileCountY>1</TileCountY>
+    <YOrigin>top</YOrigin>
+  </DataWindow>
+  <Projection>EPSG:4326</Projection>
+  <BlockSizeX>256</BlockSizeX>
+  <BlockSizeY>256</BlockSizeY>
+  <BandsCount>3</BandsCount>
+  <MaxConnections>5</MaxConnections>
+  <Timeout>5</Timeout>
+</GDAL_WMS>

From 43ada7fa1feddd7a8422cadd8ad0e0982e140e85 Mon Sep 17 00:00:00 2001
From: Alexander Bock <alexander.bock@liu.se>
Date: Tue, 13 Aug 2024 13:37:39 +0200
Subject: [PATCH 578/701] Add the ability to feather borders of screenspace
 renderables

---
 include/openspace/rendering/screenspacerenderable.h |  3 ++-
 modules/base/shaders/screenspace_fs.glsl            |  8 ++++++++
 src/rendering/screenspacerenderable.cpp             | 13 +++++++++++++
 3 files changed, 23 insertions(+), 1 deletion(-)

diff --git a/include/openspace/rendering/screenspacerenderable.h b/include/openspace/rendering/screenspacerenderable.h
index ae37a25c30..47f5af91dd 100644
--- a/include/openspace/rendering/screenspacerenderable.h
+++ b/include/openspace/rendering/screenspacerenderable.h
@@ -140,6 +140,7 @@ protected:
     // Border
     properties::FloatProperty _borderWidth;
     properties::Vec3Property _borderColor;
+    properties::BoolProperty _borderFeather;
 
     properties::FloatProperty _scale;
     properties::FloatProperty _gammaOffset;
@@ -149,7 +150,7 @@ protected:
 
     glm::ivec2 _objectSize = glm::ivec2(0);
     UniformCache(color, opacity, blackoutFactor, hue, value, saturation, mvpMatrix, tex,
-        backgroundColor, gamma, borderColor, borderWidth) _uniformCache;
+        backgroundColor, gamma, borderColor, borderWidth, borderFeather) _uniformCache;
     std::unique_ptr<ghoul::opengl::ProgramObject> _shader;
 };
 
diff --git a/modules/base/shaders/screenspace_fs.glsl b/modules/base/shaders/screenspace_fs.glsl
index 88be411afb..68402103a1 100644
--- a/modules/base/shaders/screenspace_fs.glsl
+++ b/modules/base/shaders/screenspace_fs.glsl
@@ -40,6 +40,7 @@ uniform float saturation;
 uniform float gamma = 1.0;
 uniform vec2 borderWidth = vec2(0.1);
 uniform vec3 borderColor = vec3(0.0);
+uniform int borderFeather = 0;
 
 
 Fragment getFragment() {
@@ -54,6 +55,13 @@ Fragment getFragment() {
       vs_st.y < borderWidth.y || vs_st.y > 1 - borderWidth.y)
   {
     frag.color = vec4(borderColor, opacity);
+    if (borderFeather == 1) {
+      vec2 f1 = vs_st / borderWidth;
+      float g1 = min(f1.x, f1.y);
+      vec2 f2 = (vec2(1) - vs_st) / borderWidth;
+      float g2 = min(f2.x, f2.y);
+      frag.color *= min(g1, g2);
+    }
   }
 
   if (frag.color.a == 0.0) {
diff --git a/src/rendering/screenspacerenderable.cpp b/src/rendering/screenspacerenderable.cpp
index 5e7e7ccb78..c2fc14d38a 100644
--- a/src/rendering/screenspacerenderable.cpp
+++ b/src/rendering/screenspacerenderable.cpp
@@ -169,6 +169,13 @@ namespace {
         openspace::properties::Property::Visibility::NoviceUser
     };
 
+    constexpr openspace::properties::Property::PropertyInfo BorderFeatherInfo = {
+        "BorderFeather",
+        "Border Feather",
+        "If this value is enabled and a border width is set, the border will be rendered "
+        "as a feathered border rather than a hard corner."
+    };
+
     float wrap(float value, float min, float max) {
         return glm::mod(value - min, max - min) + min;
     }
@@ -222,6 +229,9 @@ namespace {
         // [[codegen::verbatim(BorderColorInfo.description)]]
         std::optional<glm::vec3> borderColor [[codegen::color()]];
 
+        // [[codegen::verbatim(BorderFeatherInfo.description)]]
+        std::optional<bool> borderFeather;
+
         // [[codegen::verbatim(ScaleInfo.description)]]
         std::optional<float> scale;
 
@@ -318,6 +328,7 @@ ScreenSpaceRenderable::ScreenSpaceRenderable(const ghoul::Dictionary& dictionary
     )
     , _borderWidth(BorderWidthInfo, 0.f, 0.f, 1000.f)
     , _borderColor(BorderColorInfo, glm::vec3(0.f), glm::vec3(0.f), glm::vec3(1.f))
+    , _borderFeather(BorderFeatherInfo, false)
     , _scale(ScaleInfo, 0.25f, 0.f, 2.f)
     , _gammaOffset(GammaOffsetInfo, 0.f, -1.f, 10.f)
     , _multiplyColor(MultiplyColorInfo, glm::vec3(1.f), glm::vec3(0.f), glm::vec3(1.f))
@@ -368,6 +379,7 @@ ScreenSpaceRenderable::ScreenSpaceRenderable(const ghoul::Dictionary& dictionary
 
     addProperty(_borderColor);
     addProperty(_borderWidth);
+    addProperty(_borderFeather);
 
     _borderWidth = p.borderWidth.value_or(_borderWidth);
 
@@ -667,6 +679,7 @@ void ScreenSpaceRenderable::draw(const glm::mat4& modelTransform,
     _shader->setUniform(_uniformCache.backgroundColor, _backgroundColor);
     _shader->setUniform(_uniformCache.borderWidth, borderUV);
     _shader->setUniform(_uniformCache.borderColor, _borderColor);
+    _shader->setUniform(_uniformCache.borderFeather, _borderFeather);
     _shader->setUniform(
         _uniformCache.mvpMatrix,
         global::renderEngine->scene()->camera()->viewProjectionMatrix() * modelTransform

From 0b91fd26421f4ad526c4a3956ff481bf541e12be Mon Sep 17 00:00:00 2001
From: Alexander Bock <alexander.bock@liu.se>
Date: Wed, 14 Aug 2024 10:22:20 +0200
Subject: [PATCH 579/701] Global cleanup pass over asset files

- Lua style guides
- FrameConversions
- unloadMission, Add mission identifiers
---
 data/assets/base_keybindings.asset            |   1 +
 data/assets/default_keybindings.asset         |  32 ++--
 .../educational/scale/burj_khalifa.asset      |   7 +-
 data/assets/examples/dashboarditems.asset     |   1 +
 .../assets/examples/debugcoordinateaxes.asset |   1 +
 data/assets/examples/discs.asset              |   1 +
 .../geojson/geojson_multiple_polygons.asset   |   1 +
 data/assets/examples/globerotation.asset      |   1 +
 data/assets/examples/globetranslation.asset   |   1 +
 data/assets/examples/grids.asset              |   9 +-
 data/assets/examples/joystickproperty.asset   |   1 +
 data/assets/examples/navigationstate.asset    |   2 +-
 data/assets/examples/nodeline.asset           |   2 +-
 data/assets/examples/primitives.asset         |   1 +
 .../pointcloud_colormappingsettings.asset     |   1 -
 .../advanced/pointcloud_datamapping.asset     |   1 -
 .../advanced/pointcloud_fading.asset          |   1 -
 data/assets/examples/screenspacebrowser.asset |   1 +
 data/assets/examples/screenspacedate.asset    |   1 -
 data/assets/examples/spheres.asset            |   1 +
 data/assets/examples/statemachine.asset       |   1 +
 .../assets/examples/terra_texture_spout.asset |   1 -
 data/assets/examples/urlsynchronization.asset |   8 +-
 data/assets/examples/video/videosphere.asset  |   2 +-
 .../volume/generated/cartesiansequence.asset  |  12 +-
 data/assets/global/localbookmarks.asset       |   3 +
 data/assets/global/openspacebookmarks.asset   |   4 +
 .../modules/skybrowser/hover_circle.asset     |   2 +
 data/assets/nightsky/altaz.asset              |   2 +-
 .../assets/nightsky/cardinal_directions.asset |   1 +
 data/assets/nightsky/ecliptic_band.asset      |   6 +-
 data/assets/nightsky/equatorial_band.asset    |   6 +-
 data/assets/nightsky/galactic_band.asset      |  41 ++---
 data/assets/nightsky/light_pollution.asset    |   1 +
 data/assets/nightsky/meridian.asset           |   1 -
 data/assets/nightsky/planets.asset            |   2 +-
 data/assets/nightsky/zenith.asset             |   1 +
 .../constellations/constellation_art.asset    |   3 +-
 .../ceres/layers/colorlayers/lamo.asset       |   1 +
 .../dwarf_planets/eris/trail.asset            |   3 +-
 .../dwarf_planets/eris/transforms.asset       |   4 +-
 .../dwarf_planets/gonggong/planet.asset       |   3 +-
 .../dwarf_planets/gonggong/trail.asset        |   3 +-
 .../dwarf_planets/makemake/trail.asset        |   3 +-
 .../dwarf_planets/makemake/transforms.asset   |   4 +-
 .../dwarf_planets/orcus/planet.asset          |   3 +-
 .../dwarf_planets/orcus/trail.asset           |   3 +-
 .../dwarf_planets/orcus/transforms.asset      |   4 +-
 .../pluto/pluto_trail_kepler.asset            |   1 -
 .../2012/sun_earth_2012_fieldlines_pfss.asset |   7 -
 .../bastille_day/fluxnodescutplane.asset      |   1 +
 .../missions/apollo/11/apollo11.asset         |   3 -
 .../missions/apollo/11/lem_flipbook.asset     |   2 -
 .../missions/apollo/15/apollo15.asset         |   1 +
 .../missions/apollo/17/bouldersstation2.asset |   1 +
 .../missions/apollo/17/bouldersstation6.asset |   3 -
 .../apollo/apollo_globebrowsing.asset         |   2 +
 .../missions/apollo/insignias_map.asset       |  19 +--
 .../missions/artemis/kernels.asset            |   1 -
 .../missions/artemis/mission.asset            |   3 +-
 .../missions/bepicolombo/fov/bela.asset       |   9 +-
 .../missions/bepicolombo/fov/hga.asset        |   3 +-
 .../missions/bepicolombo/fov/mertis.asset     |   9 +-
 .../missions/bepicolombo/fov/mgns.asset       |   3 +-
 .../missions/bepicolombo/fov/mixs.asset       |   6 +-
 .../missions/bepicolombo/fov/phebus.asset     |  12 +-
 .../missions/bepicolombo/fov/serena.asset     |   3 +-
 .../bepicolombo/fov/serena_anodes.asset       |  97 ++++--------
 .../missions/bepicolombo/fov/sibbiosys.asset  |  42 ++----
 .../missions/bepicolombo/fov/sixs.asset       |   9 +-
 .../bepicolombo/fov/startracker.asset         |   9 +-
 .../missions/bepicolombo/kernels.asset        |  83 +----------
 .../solarsystem/missions/dawn/dawn.asset      |   1 -
 .../solarsystem/missions/insight/edl.asset    |   1 +
 .../missions/juice/dashboard.asset            |   1 +
 .../solarsystem/missions/juice/fov/gala.asset |   4 +-
 .../missions/juice/fov/janus.asset            |   3 +-
 .../solarsystem/missions/juice/fov/jmc.asset  |   6 +-
 .../missions/juice/fov/majis.asset            |  21 +--
 .../missions/juice/fov/navcam.asset           |   3 +-
 .../solarsystem/missions/juice/fov/rime.asset |   6 +-
 .../missions/juice/fov/startracker.asset      |   9 +-
 .../solarsystem/missions/juice/fov/swi.asset  |   9 +-
 .../solarsystem/missions/juice/fov/uvs.asset  |   3 +-
 .../solarsystem/missions/juno/kernels.asset   |   3 +-
 .../missions/messenger/messenger.asset        |   1 +
 .../missions/osirisrex/actions.asset          |   1 +
 .../missions/osirisrex/model.asset            |   1 +
 .../solarsystem/missions/rosetta/67p.asset    |   1 -
 .../missions/voyager/mission.asset            |   2 +-
 .../solarsystem/planets/base_layers.asset     |   1 +
 .../solarsystem/planets/default_layers.asset  |   1 -
 .../planets/earth/eclipse_shadow.asset        |   3 +
 .../eclipses/corona/corona20170821.asset      |   4 +-
 .../grid/earth_ecliptic_radial_grid.asset     |   2 +-
 .../eclipses/grid/moon_radial_grid.asset      |   2 +-
 .../planets/earth/lagrange_points/l4.asset    |   1 -
 .../planets/earth/lagrange_points/l5.asset    |   1 -
 .../colorlayers/definitions/noaa20.asset      |   1 -
 .../colorlayers/definitions/noaa21.asset      |   1 -
 .../layers/colorlayers/definitions/snpp.asset |   1 -
 .../esri_world_imagery_wayback.asset          |   1 -
 .../earth/magnetosphere/magnetosphere.asset   |   1 +
 .../transforms_magnetosphere.asset            |   1 +
 .../nasa-treks/Apollo_15_Metric_Cam_DEM.asset |   4 +
 .../nasa-treks/Apollo_15_Pan_Cam_DEM.asset    |   4 +
 .../Apollo_15_Pan_Cam_Image_Mosaic.asset      |   4 +
 .../nasa-treks/Apollo_16_Metric_Cam_DEM.asset |   4 +
 .../nasa-treks/Apollo_17_Metric_Cam_DEM.asset |   4 +
 .../nasa-treks/Apollo_Zone_Metric_Cam.asset   |   4 +
 .../Apollo_Zone_Metric_Cam_DEM.asset          |   4 +
 .../earth/moon/nasa-treks/Global.asset        |   4 +
 .../Kaguya_LGM2011_Freeair_Gravity.asset      |   4 +
 .../Kaguya_LGM2011_Surface_Gravity.asset      |   4 +
 .../nasa-treks/LOLA_Roughness_16ppd.asset     |   4 +
 .../moon/nasa-treks/LOLA_Slope_16ppd.asset    |   4 +
 .../LOLA_Slope_Northpole_120m.asset           |   4 +
 .../LOLA_Slope_Southpole_120m.asset           |   4 +
 .../LOLA_and_TC_Stereo_DEM_Merge_512ppd.asset |   4 +
 ..._of_Region_Inside_Schrodinger_Crater.asset |   4 +
 ...trolled_Mosaic_of_Schrodinger_Crater.asset |   4 +
 .../nasa-treks/LRO_Diviner_CF_Mosaic.asset    |   4 +
 .../LRO_Diviner_CF_Mosaic_128ppd.asset        |   4 +
 .../LRO_Diviner_Surface_Temp_Avg.asset        |   4 +
 .../LRO_Diviner_Surface_Temp_Normal_Avg.asset |   4 +
 ...er_Surface_Temperature_Mosaic_128ppd.asset |   4 +
 .../earth/moon/nasa-treks/LRO_LOLA_DEM.asset  |   4 +
 .../LRO_LROC_Crater_Abundance.asset           |   4 +
 .../LRO_LROC_Crater_Abundance_Hazard.asset    |   4 +
 .../nasa-treks/LRO_LROC_Crater_Density.asset  |   4 +
 .../LRO_LROC_Crater_Density_Hazard.asset      |   4 +
 .../earth/moon/nasa-treks/LRO_LROC_DEM.asset  |   4 +
 .../nasa-treks/LRO_LROC_Image_Mosaic.asset    |   4 +
 .../LRO_LROC_Image_Mosaic_26cm.asset          |   4 +
 .../LRO_LROC_Image_Mosaic_28cm.asset          |   4 +
 .../moon/nasa-treks/LRO_LROC_Mosaic.asset     |   4 +
 .../LRO_LROC_NAC_Image_Mosaic.asset           |   4 +
 .../nasa-treks/LRO_LROC_Rock_Abundance.asset  |   4 +
 .../LRO_LROC_Rock_Abundance_Hazard.asset      |   4 +
 .../nasa-treks/LRO_LROC_Rock_Density.asset    |   4 +
 .../LRO_LROC_Rock_Density_Hazard.asset        |   4 +
 .../moon/nasa-treks/LRO_Laser_Altimeter.asset |   4 +
 ..._Mini-RF_Circular_Polarization_Ratio.asset |   4 +
 .../nasa-treks/LRO_NAC_ColorHillshade.asset   |   4 +
 .../moon/nasa-treks/LRO_NAC_Mosaic.asset      |   4 +
 .../nasa-treks/LRO_NAC_Mosaic_0.5mpp.asset    |   4 +
 .../moon/nasa-treks/LRO_NAC_Mosaic_1mpp.asset |   4 +
 .../nasa-treks/LRO_NAC_PSR_Mosaic_20mpp.asset |   4 +
 .../LRO_NAC_and_CE-2_CCD_Mosaic_1mpp.asset    |   4 +
 .../nasa-treks/LRO_Narrow_Angle_Camera.asset  |   4 +
 .../moon/nasa-treks/LRO_WAC-GLD100_DEM.asset  |   4 +
 .../moon/nasa-treks/LRO_WAC_GLD100_DEM.asset  |   4 +
 ..._Kaguya_Multi_Instruments_1895.21mpp.asset |   4 +
 .../communications/other_comm.asset           |   1 +
 .../earth/satellites/weather/planet.asset     |   1 +
 .../planets/jupiter/default_layers.asset      |   1 +
 .../jupiter/europa/default_layers.asset       |   1 -
 .../voyager_global_mosaic_local.asset         |   1 +
 .../jupiter/europa/layers/local_layers.asset  |   1 -
 .../europa/layers/newyork_layers.asset        |   1 -
 .../jupiter/europa/layers/sweden_layers.asset |   1 -
 .../solarsystem/planets/jupiter/kernels.asset |   1 +
 .../planets/jupiter/minor/ananke_group.asset  |   1 +
 .../jupiter/minor/pasiphae_group.asset        |   1 +
 .../mars/layers/nasa-treks/MEX_HRSC.asset     |   4 +
 .../layers/nasa-treks/MGS_MOC_Atlas.asset     |   4 +
 .../mars/layers/nasa-treks/MGS_MOLA.asset     |   4 +
 .../MGS_MOLA_and_Mars_Express_HRSC.asset      |   4 +
 .../mars/layers/nasa-treks/MGS_TES.asset      |   4 +
 .../layers/nasa-treks/MO_THEMIS-IR_Day.asset  |   4 +
 .../nasa-treks/MO_THEMIS-IR_Night.asset       |   4 +
 .../mars/layers/nasa-treks/MRO_CTX.asset      |   4 +
 .../mars/layers/nasa-treks/MRO_HiRISE.asset   |   4 +
 .../planets/mars/layers/nasa-treks/MSL.asset  |   4 +
 .../layers/nasa-treks/Mars_Express_HRSC.asset |   4 +
 .../Mars_Reconnaissance_Orbiter_CTX.asset     |   4 +
 .../planets/mars/layers/newyork_layers.asset  |   1 -
 .../planets/mars/layers/sweden_layers.asset   |   1 -
 .../planets/mars/layers/utah_layers.asset     |   1 -
 .../planets/mercury/default_layers.asset      |   1 -
 .../layers/colorlayers/mercury_texture.asset  |   2 +-
 .../colorlayers/messenger_bdr_utah.asset      |   6 +-
 .../heightlayers/messenger_dem_utah.asset     |   2 +
 .../mercury/layers/nasa-treks/MSGR_MDIS.asset |   4 +
 .../layers/nasa-treks/MSGR_MDIS_Mosaic.asset  |   4 +
 .../layers/nasa-treks/MSGR_MDIS_Slope.asset   |   4 +
 .../mercury/layers/newyork_layers.asset       |   1 -
 .../mercury/layers/sweden_layers.asset        |   1 -
 .../planets/mercury/layers/utah_layers.asset  |   1 -
 .../planets/neptune/nereid/nereid.asset       |   7 +-
 .../neptune/triton/default_layers.asset       |   1 +
 ...n_voyager2_clrmosaic_globalfill_600m.asset |  10 +-
 .../planets/neptune/triton/triton.asset       |   7 +-
 .../solarsystem/planets/newyork_layers.asset  |   1 -
 .../planets/saturn/dione/dione.asset          |   1 -
 .../saturn/enceladus/default_layers.asset     |   1 -
 .../planets/saturn/enceladus/enceladus.asset  |   3 +-
 .../enceladus/layers/newyork_layers.asset     |   1 -
 .../enceladus/layers/sweden_layers.asset      |   1 -
 .../planets/saturn/hyperion/trail.asset       |   7 +-
 .../planets/saturn/iapetus/iapetus.asset      |   6 +-
 .../solarsystem/planets/saturn/kernels.asset  |   1 +
 .../planets/saturn/kernels415.asset           |   1 +
 .../planets/saturn/minor/gallic_group.asset   |  12 +-
 .../planets/saturn/minor/inuit_group.asset    |  24 +--
 .../planets/saturn/minor/norse_group.asset    | 141 ++++++------------
 .../planets/saturn/minor/other_group.asset    |  27 ++--
 .../planets/saturn/minor/shepherd_group.asset |  23 +--
 .../planets/saturn/rhea/rhea.asset            |   3 +-
 .../planets/saturn/rhea/trail.asset           |   7 +-
 .../planets/saturn/tethys/tethys.asset        |   3 +-
 .../planets/saturn/tethys/trail.asset         |   7 +-
 .../planets/saturn/titan/trail.asset          |   7 +-
 .../solarsystem/planets/sweden_layers.asset   |   1 -
 .../planets/uranus/inner_moons.asset          |  40 ++---
 .../uranus/irregular_prograde_moons.asset     |   3 +-
 .../uranus/irregular_retrograde_moons.asset   |  25 ++--
 .../solarsystem/planets/uranus/kernels.asset  |   1 +
 .../planets/uranus/major_moons.asset          |  92 +++++++++---
 .../solarsystem/planets/uranus/uranus.asset   |   6 +-
 .../solarsystem/planets/utah_layers.asset     |   1 -
 .../planets/venus/default_layers.asset        |   1 -
 .../planets/venus/layers/newyork_layers.asset |   1 -
 .../planets/venus/layers/utah_layers.asset    |   1 -
 .../solarsystem/planets/venus/trail.asset     |   3 +-
 .../planets/venus/trail_barycenter.asset      |   3 +-
 .../solarsystem/planets/venus/venus.asset     |   6 +-
 .../telescopes/jwst/targets/crab.asset        |   4 +-
 .../telescopes/jwst/targets/hh212.asset       |   4 +-
 .../telescopes/jwst/targets/orion.asset       |   4 +-
 .../jwst/targets/sn1987a_image.asset          |   5 +-
 .../telescopes/jwst/timelapse.asset           |   2 +
 .../solarsystem/telescopes/jwst/trail.asset   |  21 +--
 data/assets/util/debug_helper.asset           |   1 +
 data/assets/util/joysticks/any-joystick.asset |   2 +
 .../joysticks/microsoft-xbox-360-pad.asset    |   2 +
 data/assets/util/joysticks/ps4.asset          |   2 +
 data/assets/util/joysticks/ps5.asset          |   2 +
 .../space-mouse-compact-wireless.asset        |   2 +
 .../util/joysticks/space-mouse-compact.asset  |   2 +
 .../space-mouse-enterprise-wireless.asset     |   2 +
 .../joysticks/space-mouse-enterprise.asset    |   2 +
 .../assets/util/joysticks/xbox-wireless.asset |   2 +
 data/assets/util/joysticks/xbox.asset         |   2 +
 244 files changed, 752 insertions(+), 700 deletions(-)

diff --git a/data/assets/base_keybindings.asset b/data/assets/base_keybindings.asset
index 2339db9862..ce49ac2117 100644
--- a/data/assets/base_keybindings.asset
+++ b/data/assets/base_keybindings.asset
@@ -18,6 +18,7 @@ local TogglePlanetLabels = {
   IsLocal = false
 }
 
+
 asset.onInitialize(function()
   openspace.action.registerAction(TogglePlanetLabels)
   openspace.bindKey("L", TogglePlanetLabels.Identifier)
diff --git a/data/assets/default_keybindings.asset b/data/assets/default_keybindings.asset
index 9e14ea494c..7137dfe9ff 100644
--- a/data/assets/default_keybindings.asset
+++ b/data/assets/default_keybindings.asset
@@ -15,7 +15,9 @@ local ToggleShutdown = {
   Identifier = "os.ToggleShutdown",
   Name = "Toggle shutdown",
   Command = "openspace.toggleShutdown()",
-  Documentation = "Toggles the shutdown that will stop OpenSpace after a grace period. Press again to cancel the shutdown during this period",
+  Documentation = [[
+    Toggles the shutdown that will stop OpenSpace after a grace period. Press again to
+    cancel the shutdown during this period]],
   GuiPath = "/System",
   IsLocal = true
 }
@@ -24,7 +26,8 @@ local TakeScreenshot = {
   Identifier = "os.TakeScreenshot",
   Name = "Take screenshot",
   Command = "openspace.takeScreenshot()",
-  Documentation = "Saves the contents of the screen to a file in the ${SCREENSHOTS} directory",
+  Documentation = [[Saves the contents of the screen to a file in the ${SCREENSHOTS}
+    directory]],
   GuiPath = "/System/Rendering",
   IsLocal = true
 }
@@ -51,7 +54,8 @@ local ToggleRotationFriction = {
   Identifier = "os.ToggleRotationFriction",
   Name = "Toggle rotation friction",
   Command = propertyHelper.invert("NavigationHandler.OrbitalNavigator.Friction.RotationalFriction"),
-  Documentation = "Toggles the rotational friction of the camera. If it is disabled, the camera rotates around the focus object indefinitely",
+  Documentation = [[Toggles the rotational friction of the camera. If it is disabled, the
+    camera rotates around the focus object indefinitely]],
   GuiPath = "/Navigation",
   IsLocal = true
 }
@@ -60,7 +64,8 @@ local ToggleZoomFriction = {
   Identifier = "os.ToggleZoomFriction",
   Name = "Toggle zoom friction",
   Command = propertyHelper.invert("NavigationHandler.OrbitalNavigator.Friction.ZoomFriction"),
-  Documentation = "Toggles the zoom friction of the camera. If it is disabled, the camera rises up from or closes in towards the focus object indefinitely",
+  Documentation = [[Toggles the zoom friction of the camera. If it is disabled, the camera
+    rises up from or closes in towards the focus object indefinitely]],
   GuiPath = "/Navigation",
   IsLocal = true
 }
@@ -69,7 +74,8 @@ local ToggleRollFriction = {
   Identifier = "os.ToggleRollFriction",
   Name = "Toggle roll friction",
   Command = propertyHelper.invert("NavigationHandler.OrbitalNavigator.Friction.RollFriction"),
-  Documentation = "Toggles the roll friction of the camera. If it is disabled, the camera rolls around its own axis indefinitely",
+  Documentation = [[Toggles the roll friction of the camera. If it is disabled, the camera
+    rolls around its own axis indefinitely]],
   GuiPath = "/Navigation",
   IsLocal = true
 }
@@ -84,7 +90,8 @@ local FadeToBlack = {
       openspace.setPropertyValueSingle("RenderEngine.BlackoutFactor", 1.0, 3)
     end
   ]],
-  Documentation = "Toggles the fade to black within 3 seconds or shows the rendering after 3 seconds",
+  Documentation = [[Toggles the fade to black within 3 seconds or shows the rendering
+    after 3 seconds]],
   GuiPath = "/Rendering",
   IsLocal = false
 }
@@ -126,7 +133,8 @@ local NextDeltaStepInterpolate = {
   Identifier = "os.NextDeltaStepInterpolate",
   Name = "Next simulation time step (interpolate)",
   Command = "openspace.time.interpolateNextDeltaTimeStep()",
-  Documentation = "Smoothly interpolates the simulation speed to the next simulation time step, if one exists",
+  Documentation = [[Smoothly interpolates the simulation speed to the next simulation time
+    step, if one exists]],
   GuiPath = "/Time/Simulation Speed",
   IsLocal = true
 }
@@ -135,7 +143,8 @@ local NextDeltaStepImmediate = {
   Identifier = "os.NextDeltaStepImmediate",
   Name = "Next simulation time step (immediate)",
   Command = "openspace.time.setNextDeltaTimeStep()",
-  Documentation = "Immediately set the simulation speed to the next simulation time step, if one exists",
+  Documentation = [[Immediately set the simulation speed to the next simulation time step,
+    if one exists]],
   GuiPath = "/Time/Simulation Speed",
   IsLocal = true
 }
@@ -144,7 +153,8 @@ local PreviousDeltaStepInterpolate = {
   Identifier = "os.PreviousDeltaStepInterpolate",
   Name = "Previous simulation time step (interpolate)",
   Command = "openspace.time.interpolatePreviousDeltaTimeStep()",
-  Documentation = "Smoothly interpolates the simulation speed to the previous simulation time step, if one exists",
+  Documentation = [[Smoothly interpolates the simulation speed to the previous simulation
+      time step, if one exists]],
   GuiPath = "/Time/Simulation Speed",
   IsLocal = true
 }
@@ -153,7 +163,8 @@ local PreviousDeltaStepImmediate = {
   Identifier = "os.PreviousDeltaStepImmediate",
   Name = "Previous simulation time step (immediate)",
   Command = "openspace.time.setPreviousDeltaTimeStep()",
-  Documentation = "Immediately set the simulation speed to the previous simulation time step, if one exists",
+  Documentation = [[Immediately set the simulation speed to the previous simulation time
+    step, if one exists]],
   GuiPath = "/Time/Simulation Speed",
   IsLocal = true
 }
@@ -203,6 +214,7 @@ local ReloadGui = {
   IsLocal = true
 }
 
+
 asset.onInitialize(function()
   openspace.action.registerAction(ToggleNativeUi)
   openspace.bindKey("F1", ToggleNativeUi.Identifier)
diff --git a/data/assets/educational/scale/burj_khalifa.asset b/data/assets/educational/scale/burj_khalifa.asset
index de8caf9ec4..5fee28a602 100644
--- a/data/assets/educational/scale/burj_khalifa.asset
+++ b/data/assets/educational/scale/burj_khalifa.asset
@@ -4,11 +4,10 @@ local sunAsset = asset.require("scene/solarsystem/sun/transforms")
 
 
 local modelFolder = asset.resource({
-  Name = "Scale Burj Khalifa",
-  Type = "UrlSynchronization",
+  Name = "Scale Model Burj Khalifa",
+  Type = "HttpSynchronization",
   Identifier = "scale_model_burj_khalifa",
-  Url = "https://wms.openspace.amnh.org/static/sync/url/scalemodels/Burj_Khalifa.osmodel",
-  Filename = "Burj_Khalifa.osmodel"
+  Version = 1
 })
 
 
diff --git a/data/assets/examples/dashboarditems.asset b/data/assets/examples/dashboarditems.asset
index 14009061c1..0a9bee3b09 100644
--- a/data/assets/examples/dashboarditems.asset
+++ b/data/assets/examples/dashboarditems.asset
@@ -186,6 +186,7 @@ asset.export(ElapsedTime)
 asset.export(InputState)
 
 
+
 asset.meta = {
   Name = "Dashboard Items Example",
   Description = [[Examples of different types of dashboard items. These are dynamic
diff --git a/data/assets/examples/debugcoordinateaxes.asset b/data/assets/examples/debugcoordinateaxes.asset
index 9300904891..c74c4628d4 100644
--- a/data/assets/examples/debugcoordinateaxes.asset
+++ b/data/assets/examples/debugcoordinateaxes.asset
@@ -121,6 +121,7 @@ asset.export(SunIAUAxes)
 asset.export(SolarSystemBarycenterAxes)
 
 
+
 asset.meta = {
   Name = "Debug Coordinates",
   Description = [[A set of coordinate axes demonstrating different XYZ coordinate
diff --git a/data/assets/examples/discs.asset b/data/assets/examples/discs.asset
index 623312f3d0..f24420bd08 100644
--- a/data/assets/examples/discs.asset
+++ b/data/assets/examples/discs.asset
@@ -53,6 +53,7 @@ asset.export(BasicDisc)
 asset.export(FullEllipticDisc)
 
 
+
 asset.meta = {
   Name = "Example Discs",
   Description = [[Examples of different types of rendered discs.]],
diff --git a/data/assets/examples/geojson/geojson_multiple_polygons.asset b/data/assets/examples/geojson/geojson_multiple_polygons.asset
index 1858e7b0af..5a55511cb7 100644
--- a/data/assets/examples/geojson/geojson_multiple_polygons.asset
+++ b/data/assets/examples/geojson/geojson_multiple_polygons.asset
@@ -51,6 +51,7 @@ asset.export(ExamplePolygon)
 asset.export(ExamplePolygonDiffHeights)
 
 
+
 asset.meta = {
   Name = "GeoJson Example - Multiple Polygons",
   Description = [[GeoJson example asset with multiple polygons]],
diff --git a/data/assets/examples/globerotation.asset b/data/assets/examples/globerotation.asset
index d3a09f2d7a..58f7ab0dfc 100644
--- a/data/assets/examples/globerotation.asset
+++ b/data/assets/examples/globerotation.asset
@@ -58,6 +58,7 @@ end)
 asset.export(ExampleGlobeRotation)
 
 
+
 asset.meta = {
   Name = "GlobeRotation Example",
   Description = [[An example that demonstrates how to load a 3D model from a geometry
diff --git a/data/assets/examples/globetranslation.asset b/data/assets/examples/globetranslation.asset
index 781294a543..ec71e979d7 100644
--- a/data/assets/examples/globetranslation.asset
+++ b/data/assets/examples/globetranslation.asset
@@ -76,6 +76,7 @@ asset.export(ExampleFixedHeight)
 asset.export(ExampleAdaptiveHeight)
 
 
+
 asset.meta = {
   Name = "GlobeTranslation Example",
   Description = [[An example that demonstrates how to place an object on a planet surface
diff --git a/data/assets/examples/grids.asset b/data/assets/examples/grids.asset
index 66d7a91941..4c51b3d8c5 100644
--- a/data/assets/examples/grids.asset
+++ b/data/assets/examples/grids.asset
@@ -19,7 +19,7 @@ local RadialGrid = {
   },
   GUI = {
     Name = "Example Radial Grid",
-    Description = [[A circular 2D grid, with segments based on the radius and angle.]],
+    Description = "A circular 2D grid, with segments based on the radius and angle.",
     Path = "/Examples/Grids"
   }
 }
@@ -44,7 +44,7 @@ local PlanarGrid = {
   },
   GUI = {
     Name = "Example Grid",
-    Description = [[A basic 2D grid, with a given size and number of segments.]],
+    Description = "A basic 2D grid, with a given size and number of segments.",
     Path = "/Examples/Grids"
   }
 }
@@ -65,7 +65,7 @@ local SphericalGrid = {
   },
   GUI = {
     Name = "Example Spherical Grid",
-    Description = [[A grid in the form of a 3D sphere.]],
+    Description = "A grid in the form of a 3D sphere.",
     Path = "/Examples/Grids"
   }
 }
@@ -87,7 +87,7 @@ local BoxGrid = {
   },
   GUI = {
     Name = "Example Box Grid",
-    Description = [[A grid in the form of a 3D box.]],
+    Description = "A grid in the form of a 3D box.",
     Path = "/Examples/Grids"
   }
 }
@@ -113,6 +113,7 @@ asset.export(SphericalGrid)
 asset.export(BoxGrid)
 
 
+
 asset.meta = {
   Name = "Example Grids",
   Description = [[Examples of different types of rendered grids.]],
diff --git a/data/assets/examples/joystickproperty.asset b/data/assets/examples/joystickproperty.asset
index 1d4db7ae37..9090545b14 100644
--- a/data/assets/examples/joystickproperty.asset
+++ b/data/assets/examples/joystickproperty.asset
@@ -96,6 +96,7 @@ asset.onInitialize(function()
 end)
 
 
+
 asset.meta = {
   Name = "Joystick example",
   Description = [[Example asset that binds a joystick to use for input and navigation.
diff --git a/data/assets/examples/navigationstate.asset b/data/assets/examples/navigationstate.asset
index da04d88241..4fc351ee27 100644
--- a/data/assets/examples/navigationstate.asset
+++ b/data/assets/examples/navigationstate.asset
@@ -18,7 +18,7 @@ local FlipUpsideDown = {
       Up = {0.0, 0.0, -1.0}
     }
     -- Set the navigation state with the new navigation state variable
-    openspace.navigation.setNavigationState(newNavState) 
+    openspace.navigation.setNavigationState(newNavState)
   ]],
   GUI = {
     Name = "Basic",
diff --git a/data/assets/examples/nodeline.asset b/data/assets/examples/nodeline.asset
index e1f5887291..91f8319822 100644
--- a/data/assets/examples/nodeline.asset
+++ b/data/assets/examples/nodeline.asset
@@ -15,7 +15,7 @@ local RenderableNodeLineExample = {
   GUI = {
     Name = "RenderableNodeLine - Basic",
     Path = "/Examples",
-    Description = [[Draws a line between two nodes in the scene.]]
+    Description = "Draws a line between two nodes in the scene."
   }
 }
 
diff --git a/data/assets/examples/primitives.asset b/data/assets/examples/primitives.asset
index fb2c77c00e..3e2cb1432f 100644
--- a/data/assets/examples/primitives.asset
+++ b/data/assets/examples/primitives.asset
@@ -59,6 +59,7 @@ asset.export(Circle)
 asset.export(Ellipse)
 
 
+
 asset.meta = {
   Name = "Primitives Example",
   Description = [[Examples of different simple rendered primitives, such as circles
diff --git a/data/assets/examples/renderable/renderablepointcloud/advanced/pointcloud_colormappingsettings.asset b/data/assets/examples/renderable/renderablepointcloud/advanced/pointcloud_colormappingsettings.asset
index a2403cde01..b706e69db2 100644
--- a/data/assets/examples/renderable/renderablepointcloud/advanced/pointcloud_colormappingsettings.asset
+++ b/data/assets/examples/renderable/renderablepointcloud/advanced/pointcloud_colormappingsettings.asset
@@ -60,7 +60,6 @@ local Node = {
   }
 }
 
-
 asset.onInitialize(function()
   openspace.addSceneGraphNode(Node)
 end)
diff --git a/data/assets/examples/renderable/renderablepointcloud/advanced/pointcloud_datamapping.asset b/data/assets/examples/renderable/renderablepointcloud/advanced/pointcloud_datamapping.asset
index c2a5d8e213..dbdefec9c8 100644
--- a/data/assets/examples/renderable/renderablepointcloud/advanced/pointcloud_datamapping.asset
+++ b/data/assets/examples/renderable/renderablepointcloud/advanced/pointcloud_datamapping.asset
@@ -43,7 +43,6 @@ local Node = {
   }
 }
 
-
 asset.onInitialize(function()
   openspace.addSceneGraphNode(Node)
 end)
diff --git a/data/assets/examples/renderable/renderablepointcloud/advanced/pointcloud_fading.asset b/data/assets/examples/renderable/renderablepointcloud/advanced/pointcloud_fading.asset
index 82ac22be0d..48d3aa493a 100644
--- a/data/assets/examples/renderable/renderablepointcloud/advanced/pointcloud_fading.asset
+++ b/data/assets/examples/renderable/renderablepointcloud/advanced/pointcloud_fading.asset
@@ -57,7 +57,6 @@ local Node_Invert = {
   }
 }
 
-
 asset.onInitialize(function()
   openspace.addSceneGraphNode(Node)
   openspace.addSceneGraphNode(Node_Invert)
diff --git a/data/assets/examples/screenspacebrowser.asset b/data/assets/examples/screenspacebrowser.asset
index c378622c86..651c905055 100644
--- a/data/assets/examples/screenspacebrowser.asset
+++ b/data/assets/examples/screenspacebrowser.asset
@@ -17,6 +17,7 @@ end)
 asset.export(Browser)
 
 
+
 asset.meta = {
   Name = "ScreenSpaceBrowser Example",
   Description = [[Example of how to load and show a webpage in the rendering. The loaded
diff --git a/data/assets/examples/screenspacedate.asset b/data/assets/examples/screenspacedate.asset
index 4b3b154ce6..1411707622 100644
--- a/data/assets/examples/screenspacedate.asset
+++ b/data/assets/examples/screenspacedate.asset
@@ -21,7 +21,6 @@ asset.onInitialize(function()
   openspace.addScreenSpaceRenderable(Dashboard)
 
   openspace.setPropertyValueSingle("ScreenSpace.ScreenSpaceTime.Size", {0.000000,0.000000,640.000000,320.000000})
-
 end)
 
 asset.onDeinitialize(function()
diff --git a/data/assets/examples/spheres.asset b/data/assets/examples/spheres.asset
index 1231b6dcdd..4c7b834604 100644
--- a/data/assets/examples/spheres.asset
+++ b/data/assets/examples/spheres.asset
@@ -51,6 +51,7 @@ for _, n in ipairs(spheres) do
 end
 
 
+
 asset.meta = {
   Name = "Spheres Example",
   Description = [[Example showing how to render textured spheres in 3D space. Some
diff --git a/data/assets/examples/statemachine.asset b/data/assets/examples/statemachine.asset
index 9d42e605c8..46253d3957 100644
--- a/data/assets/examples/statemachine.asset
+++ b/data/assets/examples/statemachine.asset
@@ -73,6 +73,7 @@ asset.onInitialize(function()
 end)
 
 
+
 asset.meta = {
   Name = "State Machine",
   Description = [[Example of how to create a state machine in OpenSpace, where each
diff --git a/data/assets/examples/terra_texture_spout.asset b/data/assets/examples/terra_texture_spout.asset
index 74c0d97754..a026a0b1cc 100644
--- a/data/assets/examples/terra_texture_spout.asset
+++ b/data/assets/examples/terra_texture_spout.asset
@@ -14,7 +14,6 @@ asset.onInitialize(function()
   openspace.globebrowsing.addLayer(globe.Earth.Identifier, "ColorLayers", Layer)
 end)
 
-
 asset.onDeinitialize(function()
   openspace.globebrowsing.deleteLayer(globe.Earth.Identifier, "ColorLayers", Layer)
 end)
diff --git a/data/assets/examples/urlsynchronization.asset b/data/assets/examples/urlsynchronization.asset
index cddb53ee19..e2139a84bf 100644
--- a/data/assets/examples/urlsynchronization.asset
+++ b/data/assets/examples/urlsynchronization.asset
@@ -20,17 +20,12 @@ asset.resource({
   Type = "UrlSynchronization",
   Identifier = "example_large",
   Url = {
-    "http://speedtest.tele2.net/1GB.zip",
     "http://speedtest.tele2.net/100MB.zip",
 
-    "https://proof.ovh.net/files/1Gb.dat",
     "https://proof.ovh.net/files/100Mb.dat",
 
-    "https://speed.hetzner.de/1GB.bin",
     "https://speed.hetzner.de/100MB.bin",
 
-    "http://ipv4.download.thinkbroadband.com/1GB.zip",
-    "http://ipv4.download.thinkbroadband.com/512MB.zip",
     "http://ipv4.download.thinkbroadband.com/200MB.zip",
     "http://ipv4.download.thinkbroadband.com/100MB.zip",
     "http://ipv4.download.thinkbroadband.com/50MB.zip",
@@ -56,11 +51,12 @@ asset.resource({
   Name = "Example No Hash",
   Type = "UrlSynchronization",
   Identifier = "no_hash",
-  Url = "http://wms.itn.liu.se/Mercury/Messenger_Mosaic/Messenger_Mosaic.wms",
+  Url = "http://liu-se.wms.openspaceproject.com/Mercury/Messenger_Mosaic/Messenger_Mosaic.wms",
   UseHash = false
 })
 
 
+
 asset.meta = {
   Name = "UrlSynchronization",
   Description = [[Example showing how to load resources (any type of data file) from
diff --git a/data/assets/examples/video/videosphere.asset b/data/assets/examples/video/videosphere.asset
index 6278994676..2e658633d8 100644
--- a/data/assets/examples/video/videosphere.asset
+++ b/data/assets/examples/video/videosphere.asset
@@ -18,7 +18,7 @@ local Sphere = {
 
 
 asset.onInitialize(function()
-    openspace.addSceneGraphNode(Sphere)
+  openspace.addSceneGraphNode(Sphere)
 end)
 
 asset.onDeinitialize(function()
diff --git a/data/assets/examples/volume/generated/cartesiansequence.asset b/data/assets/examples/volume/generated/cartesiansequence.asset
index b45e1cc17f..406ed9c387 100644
--- a/data/assets/examples/volume/generated/cartesiansequence.asset
+++ b/data/assets/examples/volume/generated/cartesiansequence.asset
@@ -11,6 +11,12 @@ local SunRadius = 695508000
 local Volume = {
   Identifier = "GeneratedVolumeCartesianSequence",
   Parent = transforms.SolarSystemBarycenter.Identifier,
+  Transform = {
+    Scale = {
+      Type = "StaticScale",
+      Scale = 1000 * SunRadius
+    }
+  },
   Renderable = {
     Type = "RenderableTimeVaryingVolume",
     SourceDirectory = asset.resource("cartesiansequence"),
@@ -24,12 +30,6 @@ local Volume = {
   },
   GUI = {
     Path = "/Examples"
-  },
-  Transform = {
-    Scale = {
-      Type = "StaticScale",
-      Scale = 1000 * SunRadius
-    }
   }
 }
 
diff --git a/data/assets/global/localbookmarks.asset b/data/assets/global/localbookmarks.asset
index f616ff2d76..93888ace92 100644
--- a/data/assets/global/localbookmarks.asset
+++ b/data/assets/global/localbookmarks.asset
@@ -4,6 +4,8 @@ local bookmarkHelper = asset.require("util/generate_bookmarks")
 -- ensure that it is loaded first
 asset.require("scene/solarsystem/planets/earth/earth")
 
+
+
 local localBookmarks = openspace.absPath("${USER}/bookmarks/localbookmarks.csv")
 local bookmarksDirectory = openspace.absPath("${USER}/bookmarks")
 
@@ -29,6 +31,7 @@ local nodes = bookmarkHelper.loadBookmarks(
   "${USER}/bookmarks/localbookmarks.csv"
 )
 
+
 asset.onInitialize(function()
   for _, n in ipairs(nodes) do
     local success, error = pcall(openspace.addSceneGraphNode, n)
diff --git a/data/assets/global/openspacebookmarks.asset b/data/assets/global/openspacebookmarks.asset
index 5cc6ec1214..18d615397d 100644
--- a/data/assets/global/openspacebookmarks.asset
+++ b/data/assets/global/openspacebookmarks.asset
@@ -1,5 +1,7 @@
 local bookmarkHelper = asset.require("util/generate_bookmarks")
 
+
+
 local dataProvider = "http://data.openspaceproject.com/files/bookmarks/v3/bookmarks.csv"
 
 local bookmarksCSV = asset.resource({
@@ -11,8 +13,10 @@ local bookmarksCSV = asset.resource({
   Url = dataProvider
 })
 
+
 local nodes = {}
 
+
 asset.onInitialize(function()
   nodes = bookmarkHelper.loadBookmarks("OpenSpace Bookmarks", bookmarksCSV .. "bookmarks.csv")
   for _, n in ipairs(nodes) do
diff --git a/data/assets/modules/skybrowser/hover_circle.asset b/data/assets/modules/skybrowser/hover_circle.asset
index 2ee4e00790..bd1123c9a9 100644
--- a/data/assets/modules/skybrowser/hover_circle.asset
+++ b/data/assets/modules/skybrowser/hover_circle.asset
@@ -1,5 +1,7 @@
 local transforms = asset.require("scene/solarsystem/sun/transforms")
 
+
+
 local imageFolder = asset.resource({
   Name = "Hover Circle Image",
   Type = "HttpSynchronization",
diff --git a/data/assets/nightsky/altaz.asset b/data/assets/nightsky/altaz.asset
index 9c6fe16962..1ec3c7f65b 100644
--- a/data/assets/nightsky/altaz.asset
+++ b/data/assets/nightsky/altaz.asset
@@ -62,7 +62,6 @@ local AltAzGrid = {
   }
 }
 
-
 local ShowAltaz = {
   Identifier = "os.nightsky.ShowAltaz",
   Name = "Show Alt/Az grid",
@@ -102,6 +101,7 @@ local ToggleAltaz = {
   IsLocal = false
 }
 
+
 asset.onInitialize(function()
   openspace.addSceneGraphNode(AltAzGridPosition)
   openspace.addSceneGraphNode(AltAzGrid)
diff --git a/data/assets/nightsky/cardinal_directions.asset b/data/assets/nightsky/cardinal_directions.asset
index a8c0afb512..026bc3ca2c 100644
--- a/data/assets/nightsky/cardinal_directions.asset
+++ b/data/assets/nightsky/cardinal_directions.asset
@@ -129,6 +129,7 @@ local HideNesw = {
   IsLocal = false
 }
 
+
 asset.onInitialize(function()
   openspace.addSceneGraphNode(CardinalDirectionsPosition)
   openspace.addSceneGraphNode(CardinalDirectionSphere)
diff --git a/data/assets/nightsky/ecliptic_band.asset b/data/assets/nightsky/ecliptic_band.asset
index b67dd33c4a..f2f268c274 100644
--- a/data/assets/nightsky/ecliptic_band.asset
+++ b/data/assets/nightsky/ecliptic_band.asset
@@ -11,9 +11,9 @@ local textures = asset.resource({
 
 
 local EclipticRotationMatrix = {
-    -0.05487554,  0.4941095, -0.8676661,
-    -0.9938214,  -0.1109906, -0.0003515167,
-    -0.09647644,  0.8622859,  0.4971472
+  -0.05487554,  0.4941095, -0.8676661,
+  -0.9938214,  -0.1109906, -0.0003515167,
+  -0.09647644,  0.8622859,  0.4971472
 }
 
 local EclipticLine = {
diff --git a/data/assets/nightsky/equatorial_band.asset b/data/assets/nightsky/equatorial_band.asset
index 1fb892ddea..b72e01e5df 100644
--- a/data/assets/nightsky/equatorial_band.asset
+++ b/data/assets/nightsky/equatorial_band.asset
@@ -3,9 +3,9 @@ local transforms = asset.require("scene/solarsystem/sun/transforms")
 
 
 local EquatorialRotationMatrix = {
-    -0.05487554,  0.4941095, -0.8676661,
-    -0.8734371,  -0.4448296, -0.1980764,
-    -0.483835,    0.7469823,  0.4559838
+  -0.05487554,  0.4941095, -0.8676661,
+  -0.8734371,  -0.4448296, -0.1980764,
+  -0.483835,    0.7469823,  0.4559838
 }
 
 
diff --git a/data/assets/nightsky/galactic_band.asset b/data/assets/nightsky/galactic_band.asset
index 14a36db686..79752a29aa 100644
--- a/data/assets/nightsky/galactic_band.asset
+++ b/data/assets/nightsky/galactic_band.asset
@@ -3,27 +3,27 @@ local transforms = asset.require("scene/solarsystem/sun/transforms")
 
 
 local GalacticLine = {
-    Identifier = "GalacticLine",
-    Parent = transforms.SolarSystemBarycenter.Name,
-    Transform = {
-        Scale = {
-          Type = "StaticScale",
-          Scale = 9.46377307652E18
-        }
-    },
-    Renderable = {
-        Type = "RenderableRadialGrid",
-        Opacity = 0.8,
-        Color = { 0.08, 0.40, 0.40 },
-        LineWidth = 4.0,
-        GridSegments = { 1, 1 },
-        Enabled = asset.enabled
-    },
-    GUI = {
-        Name = "Galactic Equator",
-        Description = "A line representation of the Galactic Equator plane.",
-        Path = "/Night Sky/Coordinate Systems/Galactic"
+  Identifier = "GalacticLine",
+  Parent = transforms.SolarSystemBarycenter.Name,
+  Transform = {
+    Scale = {
+      Type = "StaticScale",
+      Scale = 9.46377307652E18
     }
+  },
+  Renderable = {
+    Type = "RenderableRadialGrid",
+    Opacity = 0.8,
+    Color = { 0.08, 0.40, 0.40 },
+    LineWidth = 4.0,
+    GridSegments = { 1, 1 },
+    Enabled = asset.enabled
+  },
+  GUI = {
+    Name = "Galactic Equator",
+    Description = "A line representation of the Galactic Equator plane.",
+    Path = "/Night Sky/Coordinate Systems/Galactic"
+  }
 }
 
 
@@ -58,6 +58,7 @@ local ToggleGalacticBand = {
   IsLocal = false
 }
 
+
 asset.onInitialize(function()
   openspace.addSceneGraphNode(GalacticLine)
   openspace.action.registerAction(ShowGalacticBand)
diff --git a/data/assets/nightsky/light_pollution.asset b/data/assets/nightsky/light_pollution.asset
index c8f7269839..e4f502c0c8 100644
--- a/data/assets/nightsky/light_pollution.asset
+++ b/data/assets/nightsky/light_pollution.asset
@@ -254,6 +254,7 @@ asset.export("SetLightPollutionLevel9", SetLightPollutionLevel9.Identifier)
 asset.export("UndoLightPollution", UndoLightPollution.Identifier)
 
 
+
 asset.meta = {
   Name = "Light Pollution",
   Description = [[Includes a sphere used to simulate the effect of light pollution on
diff --git a/data/assets/nightsky/meridian.asset b/data/assets/nightsky/meridian.asset
index e855406882..df007e1367 100644
--- a/data/assets/nightsky/meridian.asset
+++ b/data/assets/nightsky/meridian.asset
@@ -80,7 +80,6 @@ local HideMeridian = {
   IsLocal = false
 }
 
-
 local ToggleMeridian = {
   Identifier = "os.nightsky.ToggleMeridian",
   Name = "Toggle local meridian",
diff --git a/data/assets/nightsky/planets.asset b/data/assets/nightsky/planets.asset
index 13d88df45f..5d44a0328a 100644
--- a/data/assets/nightsky/planets.asset
+++ b/data/assets/nightsky/planets.asset
@@ -154,7 +154,6 @@ local HideNightSkyPlanets = {
   IsLocal = false
 }
 
-
 local ToggleNightSkyPlanets = {
   Identifier = "os.nightsky.ToggleNightSkyPlanets",
   Name = "Toggle night sky planets",
@@ -176,6 +175,7 @@ local ToggleNightSkyPlanets = {
   IsLocal = false
 }
 
+
 asset.onInitialize(function()
   openspace.addSceneGraphNode(Mercury)
   openspace.addSceneGraphNode(Venus)
diff --git a/data/assets/nightsky/zenith.asset b/data/assets/nightsky/zenith.asset
index ddbdd3a760..1104c34124 100644
--- a/data/assets/nightsky/zenith.asset
+++ b/data/assets/nightsky/zenith.asset
@@ -106,6 +106,7 @@ local ToggleZenith = {
   IsLocal = false
 }
 
+
 asset.onInitialize(function()
   openspace.addSceneGraphNode(ZenithPosition)
   openspace.addSceneGraphNode(ZenithDot)
diff --git a/data/assets/scene/milkyway/constellations/constellation_art.asset b/data/assets/scene/milkyway/constellations/constellation_art.asset
index f9f4e25d66..efc0cef81e 100644
--- a/data/assets/scene/milkyway/constellations/constellation_art.asset
+++ b/data/assets/scene/milkyway/constellations/constellation_art.asset
@@ -97,7 +97,6 @@ local function createConstellations(baseIdentifier, guiPath, constellationfile)
   return genConstellations
 end
 
-
 local ShowArt = {
   Identifier = "os.constellation_art.ShowArt",
   Name = "Show all",
@@ -192,6 +191,8 @@ asset.export("DisableArtAction", DisableArt.Identifier)
 asset.export("ShowZodiacArt", ShowZodiacArt.Identifier)
 asset.export("HideZodiacArt", HideZodiacArt.Identifier)
 
+
+
 asset.meta = {
   Name = "Constellation Images",
   Description = "Artistic images depicting the constellations",
diff --git a/data/assets/scene/solarsystem/dwarf_planets/ceres/layers/colorlayers/lamo.asset b/data/assets/scene/solarsystem/dwarf_planets/ceres/layers/colorlayers/lamo.asset
index af497bcfd3..e661aaba8f 100644
--- a/data/assets/scene/solarsystem/dwarf_planets/ceres/layers/colorlayers/lamo.asset
+++ b/data/assets/scene/solarsystem/dwarf_planets/ceres/layers/colorlayers/lamo.asset
@@ -22,6 +22,7 @@ end)
 asset.export("layer", Layer)
 
 
+
 asset.meta = {
   Name = "LAMO [Sweden]",
   Description = [[]],
diff --git a/data/assets/scene/solarsystem/dwarf_planets/eris/trail.asset b/data/assets/scene/solarsystem/dwarf_planets/eris/trail.asset
index 0f9b20b8ee..418a202e70 100644
--- a/data/assets/scene/solarsystem/dwarf_planets/eris/trail.asset
+++ b/data/assets/scene/solarsystem/dwarf_planets/eris/trail.asset
@@ -18,8 +18,7 @@ local Trail = {
   Tag = { "planetTrail_dwarf" },
   GUI = {
     Name = "Eris Trail",
-    Path = "/Solar System/Dwarf Planets/Eris",
-    Description = "Trail of Eris"
+    Path = "/Solar System/Dwarf Planets/Eris"
   }
 }
 
diff --git a/data/assets/scene/solarsystem/dwarf_planets/eris/transforms.asset b/data/assets/scene/solarsystem/dwarf_planets/eris/transforms.asset
index 6837a7d0ff..4370649bc3 100644
--- a/data/assets/scene/solarsystem/dwarf_planets/eris/transforms.asset
+++ b/data/assets/scene/solarsystem/dwarf_planets/eris/transforms.asset
@@ -30,11 +30,11 @@ local Position = {
 
 
 asset.onInitialize(function()
-    openspace.addSceneGraphNode(Position)
+  openspace.addSceneGraphNode(Position)
 end)
 
 asset.onDeinitialize(function()
-    openspace.removeSceneGraphNode(Position)
+  openspace.removeSceneGraphNode(Position)
 end)
 
 asset.export("Translation", Translation)
diff --git a/data/assets/scene/solarsystem/dwarf_planets/gonggong/planet.asset b/data/assets/scene/solarsystem/dwarf_planets/gonggong/planet.asset
index b7fd1f842c..85699046f8 100644
--- a/data/assets/scene/solarsystem/dwarf_planets/gonggong/planet.asset
+++ b/data/assets/scene/solarsystem/dwarf_planets/gonggong/planet.asset
@@ -18,8 +18,7 @@ local Planet = {
   },
   GUI = {
     Name = "Gonggong",
-    Path = "/Solar System/Dwarf Planets/Gonggong",
-    Description = "Globe of Gonggong"
+    Path = "/Solar System/Dwarf Planets/Gonggong"
   }
 }
 
diff --git a/data/assets/scene/solarsystem/dwarf_planets/gonggong/trail.asset b/data/assets/scene/solarsystem/dwarf_planets/gonggong/trail.asset
index 5ad73424fb..940fde7b9e 100644
--- a/data/assets/scene/solarsystem/dwarf_planets/gonggong/trail.asset
+++ b/data/assets/scene/solarsystem/dwarf_planets/gonggong/trail.asset
@@ -18,8 +18,7 @@ local Trail = {
   Tag = { "planetTrail_dwarf" },
   GUI = {
     Name = "Gonggong Trail",
-    Path = "/Solar System/Dwarf Planets/Gonggong",
-    Description = "Trail of Gonggong"
+    Path = "/Solar System/Dwarf Planets/Gonggong"
   }
 }
 
diff --git a/data/assets/scene/solarsystem/dwarf_planets/makemake/trail.asset b/data/assets/scene/solarsystem/dwarf_planets/makemake/trail.asset
index 2f2fa27da4..d9f8506ee1 100644
--- a/data/assets/scene/solarsystem/dwarf_planets/makemake/trail.asset
+++ b/data/assets/scene/solarsystem/dwarf_planets/makemake/trail.asset
@@ -18,8 +18,7 @@ local Trail = {
   Tag = { "planetTrail_dwarf" },
   GUI = {
     Name = "Makemake Trail",
-    Path = "/Solar System/Dwarf Planets/Makemake",
-    Description = "Trail of Makemake"
+    Path = "/Solar System/Dwarf Planets/Makemake"
   }
 }
 
diff --git a/data/assets/scene/solarsystem/dwarf_planets/makemake/transforms.asset b/data/assets/scene/solarsystem/dwarf_planets/makemake/transforms.asset
index 54d44a56d2..ebc89a82d6 100644
--- a/data/assets/scene/solarsystem/dwarf_planets/makemake/transforms.asset
+++ b/data/assets/scene/solarsystem/dwarf_planets/makemake/transforms.asset
@@ -31,11 +31,11 @@ local Position = {
 
 
 asset.onInitialize(function()
-    openspace.addSceneGraphNode(Position)
+  openspace.addSceneGraphNode(Position)
 end)
 
 asset.onDeinitialize(function()
-    openspace.removeSceneGraphNode(Position)
+  openspace.removeSceneGraphNode(Position)
 end)
 
 asset.export("Translation", Translation)
diff --git a/data/assets/scene/solarsystem/dwarf_planets/orcus/planet.asset b/data/assets/scene/solarsystem/dwarf_planets/orcus/planet.asset
index 5b88e83636..97aeb7abc6 100644
--- a/data/assets/scene/solarsystem/dwarf_planets/orcus/planet.asset
+++ b/data/assets/scene/solarsystem/dwarf_planets/orcus/planet.asset
@@ -19,8 +19,7 @@ local Planet = {
   },
   GUI = {
     Name = "Orcus",
-    Path = "/Solar System/Dwarf Planets/Orcus",
-    Description = "Globe of Orcus"
+    Path = "/Solar System/Dwarf Planets/Orcus"
   }
 }
 
diff --git a/data/assets/scene/solarsystem/dwarf_planets/orcus/trail.asset b/data/assets/scene/solarsystem/dwarf_planets/orcus/trail.asset
index a2a57f1733..185e661178 100644
--- a/data/assets/scene/solarsystem/dwarf_planets/orcus/trail.asset
+++ b/data/assets/scene/solarsystem/dwarf_planets/orcus/trail.asset
@@ -18,8 +18,7 @@ local Trail = {
   Tag = { "planetTrail_dwarf" },
   GUI = {
     Name = "Orcus Trail",
-    Path = "/Solar System/Dwarf Planets/Orcus",
-    Description = "Trail of Orcus"
+    Path = "/Solar System/Dwarf Planets/Orcus"
   }
 }
 
diff --git a/data/assets/scene/solarsystem/dwarf_planets/orcus/transforms.asset b/data/assets/scene/solarsystem/dwarf_planets/orcus/transforms.asset
index 72c414270f..388d13f9e9 100644
--- a/data/assets/scene/solarsystem/dwarf_planets/orcus/transforms.asset
+++ b/data/assets/scene/solarsystem/dwarf_planets/orcus/transforms.asset
@@ -31,11 +31,11 @@ local Position = {
 
 
 asset.onInitialize(function()
-    openspace.addSceneGraphNode(Position)
+  openspace.addSceneGraphNode(Position)
 end)
 
 asset.onDeinitialize(function()
-    openspace.removeSceneGraphNode(Position)
+  openspace.removeSceneGraphNode(Position)
 end)
 
 asset.export("Translation", Translation)
diff --git a/data/assets/scene/solarsystem/dwarf_planets/pluto/pluto_trail_kepler.asset b/data/assets/scene/solarsystem/dwarf_planets/pluto/pluto_trail_kepler.asset
index 37406804ca..e0ff0f1342 100644
--- a/data/assets/scene/solarsystem/dwarf_planets/pluto/pluto_trail_kepler.asset
+++ b/data/assets/scene/solarsystem/dwarf_planets/pluto/pluto_trail_kepler.asset
@@ -4,7 +4,6 @@ local transforms = asset.require("scene/solarsystem/sun/transforms")
 
 local AU = 1.496e+8
 
-
 local PlutoKeplerianTrail = {
   Identifier = "PlutoKeplerianTrail",
   Parent = transforms.SunEclipJ2000.Identifier,
diff --git a/data/assets/scene/solarsystem/heliosphere/2012/sun_earth_2012_fieldlines_pfss.asset b/data/assets/scene/solarsystem/heliosphere/2012/sun_earth_2012_fieldlines_pfss.asset
index 844f5f0207..9c3d4b2d67 100644
--- a/data/assets/scene/solarsystem/heliosphere/2012/sun_earth_2012_fieldlines_pfss.asset
+++ b/data/assets/scene/solarsystem/heliosphere/2012/sun_earth_2012_fieldlines_pfss.asset
@@ -78,14 +78,7 @@ local PFSS = {
 
 asset.onInitialize(function()
   openspace.action.registerAction(DarkSun)
-
   openspace.addSceneGraphNode(PFSS)
-
-  -- openspace.setPropertyValueSingle("Scene.FL_PFSS.Renderable.FlowEnabled", true)
-  -- openspace.setPropertyValueSingle("Scene.FL_PFSS.Renderable.Flow.Reversed", true)
-  --openspace.setPropertyValueSingle("Scene.FL_PFSS.Renderable.Flow.particleSize", 5)
-  --openspace.setPropertyValueSingle("Scene.FL_PFSS.Renderable.Flow.particleSpacing", 250)
-  --openspace.setPropertyValueSingle("Scene.FL_PFSS.Renderable.Flow.speed", 75.0)
 end)
 
 asset.onDeinitialize(function()
diff --git a/data/assets/scene/solarsystem/heliosphere/bastille_day/fluxnodescutplane.asset b/data/assets/scene/solarsystem/heliosphere/bastille_day/fluxnodescutplane.asset
index 37893aad5a..5746496ed9 100644
--- a/data/assets/scene/solarsystem/heliosphere/bastille_day/fluxnodescutplane.asset
+++ b/data/assets/scene/solarsystem/heliosphere/bastille_day/fluxnodescutplane.asset
@@ -100,6 +100,7 @@ local ToggleEquatorial = {
   GuiPath = "/Bastille-Day 2000",
   IsLocal = false
 }
+
 local ToggleMeridial = {
   Identifier = "os.bastilleday.fluxnodescutplane.ToggleMeridial",
   Name = "Toggle meridial cutplane",
diff --git a/data/assets/scene/solarsystem/missions/apollo/11/apollo11.asset b/data/assets/scene/solarsystem/missions/apollo/11/apollo11.asset
index aa059a69ba..f41ca6553d 100644
--- a/data/assets/scene/solarsystem/missions/apollo/11/apollo11.asset
+++ b/data/assets/scene/solarsystem/missions/apollo/11/apollo11.asset
@@ -105,7 +105,6 @@ local Apollo11MoonTrail = {
   }
 }
 
-
 local lemTranslation = {
   Type = "TimelineTranslation",
   Keyframes = {
@@ -130,8 +129,6 @@ local lemRotation = {
   Keyframes = descentRotationKeyframes.keyframes
 }
 
-
-
 local Apollo11LemTrail = {
   Identifier = "Apollo11LemTrail",
   Parent = moonTransforms.Moon.Identifier,
diff --git a/data/assets/scene/solarsystem/missions/apollo/11/lem_flipbook.asset b/data/assets/scene/solarsystem/missions/apollo/11/lem_flipbook.asset
index 58f1aba6c4..bedc3c2b69 100644
--- a/data/assets/scene/solarsystem/missions/apollo/11/lem_flipbook.asset
+++ b/data/assets/scene/solarsystem/missions/apollo/11/lem_flipbook.asset
@@ -17,7 +17,6 @@ local vrts = asset.resource({
 })
 
 
-
 asset.onInitialize(function()
   openspace.globebrowsing.addBlendingLayersFromDirectory(vrts, assetGlobe)
   flipbook = helper.createFlipbook(assetPrefix, assetGlobe, 19)
@@ -43,7 +42,6 @@ asset.onInitialize(function()
   })
 end)
 
-
 asset.onDeinitialize(function()
   flipbook = nil
 
diff --git a/data/assets/scene/solarsystem/missions/apollo/15/apollo15.asset b/data/assets/scene/solarsystem/missions/apollo/15/apollo15.asset
index 5c52ec3b03..233a597e03 100644
--- a/data/assets/scene/solarsystem/missions/apollo/15/apollo15.asset
+++ b/data/assets/scene/solarsystem/missions/apollo/15/apollo15.asset
@@ -72,6 +72,7 @@ local Apollo15Trail = {
   }
 }
 
+
 asset.onInitialize(function()
   openspace.addSceneGraphNode(Apollo15)
   openspace.addSceneGraphNode(Apollo15Trail)
diff --git a/data/assets/scene/solarsystem/missions/apollo/17/bouldersstation2.asset b/data/assets/scene/solarsystem/missions/apollo/17/bouldersstation2.asset
index c082eaac53..074b3dc905 100644
--- a/data/assets/scene/solarsystem/missions/apollo/17/bouldersstation2.asset
+++ b/data/assets/scene/solarsystem/missions/apollo/17/bouldersstation2.asset
@@ -158,6 +158,7 @@ local Station2Boulder3Model = {
   }
 }
 
+
 asset.onInitialize(function()
   openspace.addSceneGraphNode(Station2Boulder1Holder)
   openspace.addSceneGraphNode(Station2Boulder1Model)
diff --git a/data/assets/scene/solarsystem/missions/apollo/17/bouldersstation6.asset b/data/assets/scene/solarsystem/missions/apollo/17/bouldersstation6.asset
index b971c3dbe2..5cbe8f72f5 100644
--- a/data/assets/scene/solarsystem/missions/apollo/17/bouldersstation6.asset
+++ b/data/assets/scene/solarsystem/missions/apollo/17/bouldersstation6.asset
@@ -68,8 +68,6 @@ local Station6Frag1Model = {
   }
 }
 
-
-
 local Station6Frag23Holder = {
   Identifier = "Station_6_Fragments_2_3",
   Parent = moonAsset.Moon.Identifier,
@@ -79,7 +77,6 @@ local Station6Frag23Holder = {
   }
 }
 
-
 local Station6Frag2Model = {
   Identifier = "A17S6F5",
   Parent = Station6Frag23Holder.Identifier,
diff --git a/data/assets/scene/solarsystem/missions/apollo/apollo_globebrowsing.asset b/data/assets/scene/solarsystem/missions/apollo/apollo_globebrowsing.asset
index e5333e8134..a32046950d 100644
--- a/data/assets/scene/solarsystem/missions/apollo/apollo_globebrowsing.asset
+++ b/data/assets/scene/solarsystem/missions/apollo/apollo_globebrowsing.asset
@@ -5,6 +5,7 @@ local moon = asset.require("scene/solarsystem/planets/earth/moon/moon")
 asset.require("scene/solarsystem/planets/earth/moon/default_layers")
 
 
+
 local heightmaps = asset.resource({
   Name = "Apollo Globebrowsing Heightmaps",
   Type = "HttpSynchronization",
@@ -64,6 +65,7 @@ local DisableApolloSites = {
   IsLocal = false
 }
 
+
 asset.onInitialize(function()
   openspace.globebrowsing.addBlendingLayersFromDirectory(heightmaps, moon.Moon.Identifier)
   openspace.globebrowsing.addBlendingLayersFromDirectory(basemaps, moon.Moon.Identifier)
diff --git a/data/assets/scene/solarsystem/missions/apollo/insignias_map.asset b/data/assets/scene/solarsystem/missions/apollo/insignias_map.asset
index e6771b3c80..ab1828e639 100644
--- a/data/assets/scene/solarsystem/missions/apollo/insignias_map.asset
+++ b/data/assets/scene/solarsystem/missions/apollo/insignias_map.asset
@@ -1,6 +1,4 @@
 -- Apollo mission insignias on their locations on the Lunar surface.
--- The insignias are invisible by default, but can be enabled using shown or hidden using
--- the exported functions `showInsignias(interpolationDuration)` and `hideInsignias(interpolationDuration)`.
 
 local moon = asset.require("scene/solarsystem/planets/earth/moon/moon")
 
@@ -194,6 +192,7 @@ local HideInsignias = {
   IsLocal = false
 }
 
+
 asset.onInitialize(function()
   openspace.addSceneGraphNode(Apollo11)
   openspace.addSceneGraphNode(Apollo12)
@@ -223,19 +222,3 @@ asset.export(Apollo12)
 asset.export(Apollo14)
 asset.export(Apollo15)
 asset.export(Apollo16)
-
-asset.export("showInsignia", function (missionNumber, interpolationDuration)
-  openspace.setPropertyValue("Scene.Apollo" .. missionNumber .. "Insignia.Renderable.Opacity", 1, interpolationDuration)
-end)
-
-asset.export("hideInsignia", function (missionNumber, interpolationDuration)
-  openspace.setPropertyValue("Scene.Apollo" .. missionNumber .. "Insignia.Renderable.Opacity", 0, interpolationDuration)
-end)
-
-asset.export("showInsignias", function (interpolationDuration)
-  openspace.setPropertyValue("Scene.Apollo*Insignia.Renderable.Opacity", 1, interpolationDuration)
-end)
-
-asset.export("hideInsignias", function (interpolationDuration)
-  openspace.setPropertyValue("Scene.Apollo*Insignia.Renderable.Opacity", 0, interpolationDuration)
-end)
diff --git a/data/assets/scene/solarsystem/missions/artemis/kernels.asset b/data/assets/scene/solarsystem/missions/artemis/kernels.asset
index 6572ce320c..278e26b502 100644
--- a/data/assets/scene/solarsystem/missions/artemis/kernels.asset
+++ b/data/assets/scene/solarsystem/missions/artemis/kernels.asset
@@ -5,7 +5,6 @@ local data = asset.resource({
   Version = 1
 })
 
-
 local ID = {
   Artemis = -1023
 }
diff --git a/data/assets/scene/solarsystem/missions/artemis/mission.asset b/data/assets/scene/solarsystem/missions/artemis/mission.asset
index 676a92cc15..44bcce8503 100644
--- a/data/assets/scene/solarsystem/missions/artemis/mission.asset
+++ b/data/assets/scene/solarsystem/missions/artemis/mission.asset
@@ -1,6 +1,7 @@
 -- Source:  https://solarsystem.nasa.gov/missions/rosetta-philae/in-depth/
 
 local Mission = {
+  Identifier = "Artemis",
   Name = "Artemis",
   TimeRange = { Start = "2022 NOV 16 06:47:00", End = "2022 DEC 11 17:40:30" },
   Image = "https://www.nasa.gov/sites/default/files/thumbnails/image/em1_patch_final.png",
@@ -74,5 +75,5 @@ asset.onInitialize(function()
 end)
 
 asset.onDeinitialize(function()
-  openspace.unloadMission(Mission.Name)
+  openspace.unloadMission(Mission)
 end)
diff --git a/data/assets/scene/solarsystem/missions/bepicolombo/fov/bela.asset b/data/assets/scene/solarsystem/missions/bepicolombo/fov/bela.asset
index d06d82348b..d60f6f2658 100644
--- a/data/assets/scene/solarsystem/missions/bepicolombo/fov/bela.asset
+++ b/data/assets/scene/solarsystem/missions/bepicolombo/fov/bela.asset
@@ -17,8 +17,7 @@ local BelaReceiver = {
       Aberration = "NONE"
     },
     AlwaysDrawFov = true,
-    PotentialTargets = { "MERCURY", "EARTH", "VENUS" },
-    FrameConversions = {}
+    PotentialTargets = { "MERCURY", "EARTH", "VENUS" }
   },
   GUI = {
     Name = "MPO BELA Receiver",
@@ -40,8 +39,7 @@ local BelaTransmitterMain = {
       Aberration = "NONE"
     },
     AlwaysDrawFov = true,
-    PotentialTargets = { "MERCURY", "EARTH", "VENUS" },
-    FrameConversions = {}
+    PotentialTargets = { "MERCURY", "EARTH", "VENUS" }
   },
   GUI = {
     Name = "MPO BELA Transmitter Main",
@@ -63,8 +61,7 @@ local BelaTransmitterRed = {
       Aberration = "NONE"
     },
     AlwaysDrawFov = true,
-    PotentialTargets = { "MERCURY", "EARTH", "VENUS" },
-    FrameConversions = {}
+    PotentialTargets = { "MERCURY", "EARTH", "VENUS" }
   },
   GUI = {
     Name = "MPO BELA Transmitter Main",
diff --git a/data/assets/scene/solarsystem/missions/bepicolombo/fov/hga.asset b/data/assets/scene/solarsystem/missions/bepicolombo/fov/hga.asset
index 8b1f13b8a2..730c2841ae 100644
--- a/data/assets/scene/solarsystem/missions/bepicolombo/fov/hga.asset
+++ b/data/assets/scene/solarsystem/missions/bepicolombo/fov/hga.asset
@@ -17,8 +17,7 @@ local HGA = {
       Aberration = "NONE"
     },
     AlwaysDrawFov = true,
-    PotentialTargets = { "MERCURY", "EARTH", "VENUS" },
-    FrameConversions = {}
+    PotentialTargets = { "MERCURY", "EARTH", "VENUS" }
   },
   GUI = {
     Name = "MPO HGA",
diff --git a/data/assets/scene/solarsystem/missions/bepicolombo/fov/mertis.asset b/data/assets/scene/solarsystem/missions/bepicolombo/fov/mertis.asset
index 0f8fa5c52b..75e04598a6 100644
--- a/data/assets/scene/solarsystem/missions/bepicolombo/fov/mertis.asset
+++ b/data/assets/scene/solarsystem/missions/bepicolombo/fov/mertis.asset
@@ -17,8 +17,7 @@ local MertisTis = {
       Aberration = "NONE"
     },
     AlwaysDrawFov = true,
-    PotentialTargets = { "MERCURY", "EARTH", "VENUS" },
-    FrameConversions = {}
+    PotentialTargets = { "MERCURY", "EARTH", "VENUS" }
   },
   GUI = {
     Name = "MPO MERTIS TIS",
@@ -40,8 +39,7 @@ local MertisTisPlanet = {
       Aberration = "NONE"
     },
     AlwaysDrawFov = true,
-    PotentialTargets = { "MERCURY", "EARTH", "VENUS" },
-    FrameConversions = {}
+    PotentialTargets = { "MERCURY", "EARTH", "VENUS" }
   },
   GUI = {
     Name = "MPO MERTIS TIS Planet",
@@ -63,8 +61,7 @@ local MertisTisSpace = {
       Aberration = "NONE"
     },
     AlwaysDrawFov = true,
-    PotentialTargets = { "MERCURY", "EARTH", "VENUS" },
-    FrameConversions = {}
+    PotentialTargets = { "MERCURY", "EARTH", "VENUS" }
   },
   GUI = {
     Name = "MPO MERTIS TIS Space",
diff --git a/data/assets/scene/solarsystem/missions/bepicolombo/fov/mgns.asset b/data/assets/scene/solarsystem/missions/bepicolombo/fov/mgns.asset
index b825943c8a..836712e892 100644
--- a/data/assets/scene/solarsystem/missions/bepicolombo/fov/mgns.asset
+++ b/data/assets/scene/solarsystem/missions/bepicolombo/fov/mgns.asset
@@ -17,8 +17,7 @@ local MGNS = {
       Aberration = "NONE"
     },
     AlwaysDrawFov = true,
-    PotentialTargets = { "MERCURY", "EARTH", "VENUS" },
-    FrameConversions = {}
+    PotentialTargets = { "MERCURY", "EARTH", "VENUS" }
   },
   GUI = {
     Name = "MPO MGNS",
diff --git a/data/assets/scene/solarsystem/missions/bepicolombo/fov/mixs.asset b/data/assets/scene/solarsystem/missions/bepicolombo/fov/mixs.asset
index 660fbf0011..1286f23bfe 100644
--- a/data/assets/scene/solarsystem/missions/bepicolombo/fov/mixs.asset
+++ b/data/assets/scene/solarsystem/missions/bepicolombo/fov/mixs.asset
@@ -17,8 +17,7 @@ local MIXS_C = {
       Aberration = "NONE"
     },
     AlwaysDrawFov = true,
-    PotentialTargets = { "MERCURY", "EARTH", "VENUS" },
-    FrameConversions = {}
+    PotentialTargets = { "MERCURY", "EARTH", "VENUS" }
   },
   GUI = {
     Name = "MPO MIXS-C",
@@ -40,8 +39,7 @@ local MIXS_T = {
       Aberration = "NONE"
     },
     AlwaysDrawFov = true,
-    PotentialTargets = { "MERCURY", "EARTH", "VENUS" },
-    FrameConversions = {}
+    PotentialTargets = { "MERCURY", "EARTH", "VENUS" }
   },
   GUI = {
     Name = "MPO MIXS-T",
diff --git a/data/assets/scene/solarsystem/missions/bepicolombo/fov/phebus.asset b/data/assets/scene/solarsystem/missions/bepicolombo/fov/phebus.asset
index 99774fd548..18fe04b1c5 100644
--- a/data/assets/scene/solarsystem/missions/bepicolombo/fov/phebus.asset
+++ b/data/assets/scene/solarsystem/missions/bepicolombo/fov/phebus.asset
@@ -17,8 +17,7 @@ local PhebusSlit75 = {
       Aberration = "NONE"
     },
     AlwaysDrawFov = true,
-    PotentialTargets = { "MERCURY", "EARTH", "VENUS" },
-    FrameConversions = {}
+    PotentialTargets = { "MERCURY", "EARTH", "VENUS" }
   },
   GUI = {
     Name = "MPO Phebus Slit 75",
@@ -40,8 +39,7 @@ local PhebusSlit100 = {
       Aberration = "NONE"
     },
     AlwaysDrawFov = true,
-    PotentialTargets = { "MERCURY", "EARTH", "VENUS" },
-    FrameConversions = {}
+    PotentialTargets = { "MERCURY", "EARTH", "VENUS" }
   },
   GUI = {
     Name = "MPO Phebus Slit 100",
@@ -63,8 +61,7 @@ local Phebus75 = {
       Aberration = "NONE"
     },
     AlwaysDrawFov = true,
-    PotentialTargets = { "MERCURY", "EARTH", "VENUS" },
-    FrameConversions = {}
+    PotentialTargets = { "MERCURY", "EARTH", "VENUS" }
   },
   GUI = {
     Name = "MPO Phebus 75",
@@ -86,8 +83,7 @@ local Phebus100 = {
       Aberration = "NONE"
     },
     AlwaysDrawFov = true,
-    PotentialTargets = { "MERCURY", "EARTH", "VENUS" },
-    FrameConversions = {}
+    PotentialTargets = { "MERCURY", "EARTH", "VENUS" }
   },
   GUI = {
     Name = "MPO Phebus 100",
diff --git a/data/assets/scene/solarsystem/missions/bepicolombo/fov/serena.asset b/data/assets/scene/solarsystem/missions/bepicolombo/fov/serena.asset
index b65a60d545..d2c303524a 100644
--- a/data/assets/scene/solarsystem/missions/bepicolombo/fov/serena.asset
+++ b/data/assets/scene/solarsystem/missions/bepicolombo/fov/serena.asset
@@ -17,8 +17,7 @@ local SerenaElena = {
       Aberration = "NONE"
     },
     AlwaysDrawFov = true,
-    PotentialTargets = { "MERCURY", "EARTH", "VENUS" },
-    FrameConversions = {}
+    PotentialTargets = { "MERCURY", "EARTH", "VENUS" }
   },
   GUI = {
     Name = "MPO Serena Elena",
diff --git a/data/assets/scene/solarsystem/missions/bepicolombo/fov/serena_anodes.asset b/data/assets/scene/solarsystem/missions/bepicolombo/fov/serena_anodes.asset
index 37dc6226ec..a10d997bf1 100644
--- a/data/assets/scene/solarsystem/missions/bepicolombo/fov/serena_anodes.asset
+++ b/data/assets/scene/solarsystem/missions/bepicolombo/fov/serena_anodes.asset
@@ -17,8 +17,7 @@ local SerenaElenaAN01 = {
       Aberration = "NONE"
     },
     AlwaysDrawFov = true,
-    PotentialTargets = { "MERCURY", "EARTH", "VENUS" },
-    FrameConversions = {}
+    PotentialTargets = { "MERCURY", "EARTH", "VENUS" }
   },
   GUI = {
     Name = "MPO Serena Elena AN01",
@@ -40,8 +39,7 @@ local SerenaElenaAN02 = {
       Aberration = "NONE"
     },
     AlwaysDrawFov = true,
-    PotentialTargets = { "MERCURY", "EARTH", "VENUS" },
-    FrameConversions = {}
+    PotentialTargets = { "MERCURY", "EARTH", "VENUS" }
   },
   GUI = {
     Name = "MPO Serena Elena AN02",
@@ -63,8 +61,7 @@ local SerenaElenaAN03 = {
       Aberration = "NONE"
     },
     AlwaysDrawFov = true,
-    PotentialTargets = { "MERCURY", "EARTH", "VENUS" },
-    FrameConversions = {}
+    PotentialTargets = { "MERCURY", "EARTH", "VENUS" }
   },
   GUI = {
     Name = "MPO Serena Elena AN03",
@@ -86,8 +83,7 @@ local SerenaElenaAN04 = {
       Aberration = "NONE"
     },
     AlwaysDrawFov = true,
-    PotentialTargets = { "MERCURY", "EARTH", "VENUS" },
-    FrameConversions = {}
+    PotentialTargets = { "MERCURY", "EARTH", "VENUS" }
   },
   GUI = {
     Name = "MPO Serena Elena AN04",
@@ -109,8 +105,7 @@ local SerenaElenaAN05 = {
       Aberration = "NONE"
     },
     AlwaysDrawFov = true,
-    PotentialTargets = { "MERCURY", "EARTH", "VENUS" },
-    FrameConversions = {}
+    PotentialTargets = { "MERCURY", "EARTH", "VENUS" }
   },
   GUI = {
     Name = "MPO Serena Elena AN05",
@@ -132,8 +127,7 @@ local SerenaElenaAN06 = {
       Aberration = "NONE"
     },
     AlwaysDrawFov = true,
-    PotentialTargets = { "MERCURY", "EARTH", "VENUS" },
-    FrameConversions = {}
+    PotentialTargets = { "MERCURY", "EARTH", "VENUS" }
   },
   GUI = {
     Name = "MPO Serena Elena AN06",
@@ -155,8 +149,7 @@ local SerenaElenaAN07 = {
       Aberration = "NONE"
     },
     AlwaysDrawFov = true,
-    PotentialTargets = { "MERCURY", "EARTH", "VENUS" },
-    FrameConversions = {}
+    PotentialTargets = { "MERCURY", "EARTH", "VENUS" }
   },
   GUI = {
     Name = "MPO Serena Elena AN07",
@@ -178,8 +171,7 @@ local SerenaElenaAN08 = {
       Aberration = "NONE"
     },
     AlwaysDrawFov = true,
-    PotentialTargets = { "MERCURY", "EARTH", "VENUS" },
-    FrameConversions = {}
+    PotentialTargets = { "MERCURY", "EARTH", "VENUS" }
   },
   GUI = {
     Name = "MPO Serena Elena AN08",
@@ -201,8 +193,7 @@ local SerenaElenaAN09 = {
       Aberration = "NONE"
     },
     AlwaysDrawFov = true,
-    PotentialTargets = { "MERCURY", "EARTH", "VENUS" },
-    FrameConversions = {}
+    PotentialTargets = { "MERCURY", "EARTH", "VENUS" }
   },
   GUI = {
     Name = "MPO Serena Elena AN09",
@@ -224,8 +215,7 @@ local SerenaElenaAN10 = {
       Aberration = "NONE"
     },
     AlwaysDrawFov = true,
-    PotentialTargets = { "MERCURY", "EARTH", "VENUS" },
-    FrameConversions = {}
+    PotentialTargets = { "MERCURY", "EARTH", "VENUS" }
   },
   GUI = {
     Name = "MPO Serena Elena AN10",
@@ -247,8 +237,7 @@ local SerenaElenaAN11 = {
       Aberration = "NONE"
     },
     AlwaysDrawFov = true,
-    PotentialTargets = { "MERCURY", "EARTH", "VENUS" },
-    FrameConversions = {}
+    PotentialTargets = { "MERCURY", "EARTH", "VENUS" }
   },
   GUI = {
     Name = "MPO Serena Elena AN11",
@@ -270,8 +259,7 @@ local SerenaElenaAN12 = {
       Aberration = "NONE"
     },
     AlwaysDrawFov = true,
-    PotentialTargets = { "MERCURY", "EARTH", "VENUS" },
-    FrameConversions = {}
+    PotentialTargets = { "MERCURY", "EARTH", "VENUS" }
   },
   GUI = {
     Name = "MPO Serena Elena AN12",
@@ -293,8 +281,7 @@ local SerenaElenaAN13 = {
       Aberration = "NONE"
     },
     AlwaysDrawFov = true,
-    PotentialTargets = { "MERCURY", "EARTH", "VENUS" },
-    FrameConversions = {}
+    PotentialTargets = { "MERCURY", "EARTH", "VENUS" }
   },
   GUI = {
     Name = "MPO Serena Elena AN13",
@@ -316,8 +303,7 @@ local SerenaElenaAN14 = {
       Aberration = "NONE"
     },
     AlwaysDrawFov = true,
-    PotentialTargets = { "MERCURY", "EARTH", "VENUS" },
-    FrameConversions = {}
+    PotentialTargets = { "MERCURY", "EARTH", "VENUS" }
   },
   GUI = {
     Name = "MPO Serena Elena AN14",
@@ -339,8 +325,7 @@ local SerenaElenaAN15 = {
       Aberration = "NONE"
     },
     AlwaysDrawFov = true,
-    PotentialTargets = { "MERCURY", "EARTH", "VENUS" },
-    FrameConversions = {}
+    PotentialTargets = { "MERCURY", "EARTH", "VENUS" }
   },
   GUI = {
     Name = "MPO Serena Elena AN15",
@@ -362,8 +347,7 @@ local SerenaElenaAN16 = {
       Aberration = "NONE"
     },
     AlwaysDrawFov = true,
-    PotentialTargets = { "MERCURY", "EARTH", "VENUS" },
-    FrameConversions = {}
+    PotentialTargets = { "MERCURY", "EARTH", "VENUS" }
   },
   GUI = {
     Name = "MPO Serena Elena AN16",
@@ -385,8 +369,7 @@ local SerenaElenaAN17 = {
       Aberration = "NONE"
     },
     AlwaysDrawFov = true,
-    PotentialTargets = { "MERCURY", "EARTH", "VENUS" },
-    FrameConversions = {}
+    PotentialTargets = { "MERCURY", "EARTH", "VENUS" }
   },
   GUI = {
     Name = "MPO Serena Elena AN17",
@@ -408,8 +391,7 @@ local SerenaElenaAN18 = {
       Aberration = "NONE"
     },
     AlwaysDrawFov = true,
-    PotentialTargets = { "MERCURY", "EARTH", "VENUS" },
-    FrameConversions = {}
+    PotentialTargets = { "MERCURY", "EARTH", "VENUS" }
   },
   GUI = {
     Name = "MPO Serena Elena AN18",
@@ -431,8 +413,7 @@ local SerenaElenaAN19 = {
       Aberration = "NONE"
     },
     AlwaysDrawFov = true,
-    PotentialTargets = { "MERCURY", "EARTH", "VENUS" },
-    FrameConversions = {}
+    PotentialTargets = { "MERCURY", "EARTH", "VENUS" }
   },
   GUI = {
     Name = "MPO Serena Elena AN19",
@@ -454,8 +435,7 @@ local SerenaElenaAN20 = {
       Aberration = "NONE"
     },
     AlwaysDrawFov = true,
-    PotentialTargets = { "MERCURY", "EARTH", "VENUS" },
-    FrameConversions = {}
+    PotentialTargets = { "MERCURY", "EARTH", "VENUS" }
   },
   GUI = {
     Name = "MPO Serena Elena AN20",
@@ -477,8 +457,7 @@ local SerenaElenaAN21 = {
       Aberration = "NONE"
     },
     AlwaysDrawFov = true,
-    PotentialTargets = { "MERCURY", "EARTH", "VENUS" },
-    FrameConversions = {}
+    PotentialTargets = { "MERCURY", "EARTH", "VENUS" }
   },
   GUI = {
     Name = "MPO Serena Elena AN21",
@@ -500,8 +479,7 @@ local SerenaElenaAN22 = {
       Aberration = "NONE"
     },
     AlwaysDrawFov = true,
-    PotentialTargets = { "MERCURY", "EARTH", "VENUS" },
-    FrameConversions = {}
+    PotentialTargets = { "MERCURY", "EARTH", "VENUS" }
   },
   GUI = {
     Name = "MPO Serena Elena AN22",
@@ -523,8 +501,7 @@ local SerenaElenaAN23 = {
       Aberration = "NONE"
     },
     AlwaysDrawFov = true,
-    PotentialTargets = { "MERCURY", "EARTH", "VENUS" },
-    FrameConversions = {}
+    PotentialTargets = { "MERCURY", "EARTH", "VENUS" }
   },
   GUI = {
     Name = "MPO Serena Elena AN23",
@@ -546,8 +523,7 @@ local SerenaElenaAN24 = {
       Aberration = "NONE"
     },
     AlwaysDrawFov = true,
-    PotentialTargets = { "MERCURY", "EARTH", "VENUS" },
-    FrameConversions = {}
+    PotentialTargets = { "MERCURY", "EARTH", "VENUS" }
   },
   GUI = {
     Name = "MPO Serena Elena AN24",
@@ -569,8 +545,7 @@ local SerenaElenaAN25 = {
       Aberration = "NONE"
     },
     AlwaysDrawFov = true,
-    PotentialTargets = { "MERCURY", "EARTH", "VENUS" },
-    FrameConversions = {}
+    PotentialTargets = { "MERCURY", "EARTH", "VENUS" }
   },
   GUI = {
     Name = "MPO Serena Elena AN25",
@@ -592,8 +567,7 @@ local SerenaElenaAN26 = {
       Aberration = "NONE"
     },
     AlwaysDrawFov = true,
-    PotentialTargets = { "MERCURY", "EARTH", "VENUS" },
-    FrameConversions = {}
+    PotentialTargets = { "MERCURY", "EARTH", "VENUS" }
   },
   GUI = {
     Name = "MPO Serena Elena AN26",
@@ -615,8 +589,7 @@ local SerenaElenaAN27 = {
       Aberration = "NONE"
     },
     AlwaysDrawFov = true,
-    PotentialTargets = { "MERCURY", "EARTH", "VENUS" },
-    FrameConversions = {}
+    PotentialTargets = { "MERCURY", "EARTH", "VENUS" }
   },
   GUI = {
     Name = "MPO Serena Elena AN27",
@@ -638,8 +611,7 @@ local SerenaElenaAN28 = {
       Aberration = "NONE"
     },
     AlwaysDrawFov = true,
-    PotentialTargets = { "MERCURY", "EARTH", "VENUS" },
-    FrameConversions = {}
+    PotentialTargets = { "MERCURY", "EARTH", "VENUS" }
   },
   GUI = {
     Name = "MPO Serena Elena AN28",
@@ -661,8 +633,7 @@ local SerenaElenaAN29 = {
       Aberration = "NONE"
     },
     AlwaysDrawFov = true,
-    PotentialTargets = { "MERCURY", "EARTH", "VENUS" },
-    FrameConversions = {}
+    PotentialTargets = { "MERCURY", "EARTH", "VENUS" }
   },
   GUI = {
     Name = "MPO Serena Elena AN29",
@@ -684,8 +655,7 @@ local SerenaElenaAN30 = {
       Aberration = "NONE"
     },
     AlwaysDrawFov = true,
-    PotentialTargets = { "MERCURY", "EARTH", "VENUS" },
-    FrameConversions = {}
+    PotentialTargets = { "MERCURY", "EARTH", "VENUS" }
   },
   GUI = {
     Name = "MPO Serena Elena AN30",
@@ -707,8 +677,7 @@ local SerenaElenaAN31 = {
       Aberration = "NONE"
     },
     AlwaysDrawFov = true,
-    PotentialTargets = { "MERCURY", "EARTH", "VENUS" },
-    FrameConversions = {}
+    PotentialTargets = { "MERCURY", "EARTH", "VENUS" }
   },
   GUI = {
     Name = "MPO Serena Elena AN31",
@@ -730,8 +699,7 @@ local SerenaElenaAN32 = {
       Aberration = "NONE"
     },
     AlwaysDrawFov = true,
-    PotentialTargets = { "MERCURY", "EARTH", "VENUS" },
-    FrameConversions = {}
+    PotentialTargets = { "MERCURY", "EARTH", "VENUS" }
   },
   GUI = {
     Name = "MPO Serena Elena AN32",
@@ -740,7 +708,6 @@ local SerenaElenaAN32 = {
 }
 
 
-
 asset.onInitialize(function()
   openspace.addSceneGraphNode(SerenaElenaAN01)
   openspace.addSceneGraphNode(SerenaElenaAN02)
diff --git a/data/assets/scene/solarsystem/missions/bepicolombo/fov/sibbiosys.asset b/data/assets/scene/solarsystem/missions/bepicolombo/fov/sibbiosys.asset
index 7227b9a4ad..1f00714adf 100644
--- a/data/assets/scene/solarsystem/missions/bepicolombo/fov/sibbiosys.asset
+++ b/data/assets/scene/solarsystem/missions/bepicolombo/fov/sibbiosys.asset
@@ -17,8 +17,7 @@ local SimbioSys_HRIC_FPA = {
       Aberration = "NONE"
     },
     AlwaysDrawFov = true,
-    PotentialTargets = { "MERCURY", "EARTH", "VENUS" },
-    FrameConversions = {}
+    PotentialTargets = { "MERCURY", "EARTH", "VENUS" }
   },
   GUI = {
     Name = "MPO Simbio-Sys HRIC FPA",
@@ -40,8 +39,7 @@ local SimbioSys_HRIC_F550 = {
       Aberration = "NONE"
     },
     AlwaysDrawFov = true,
-    PotentialTargets = { "MERCURY", "EARTH", "VENUS" },
-    FrameConversions = {}
+    PotentialTargets = { "MERCURY", "EARTH", "VENUS" }
   },
   GUI = {
     Name = "MPO Simbio-Sys HRIC F550",
@@ -63,8 +61,7 @@ local SimbioSys_HRIC_FPAN = {
       Aberration = "NONE"
     },
     AlwaysDrawFov = true,
-    PotentialTargets = { "MERCURY", "EARTH", "VENUS" },
-    FrameConversions = {}
+    PotentialTargets = { "MERCURY", "EARTH", "VENUS" }
   },
   GUI = {
     Name = "MPO Simbio-Sys HRIC FPAN",
@@ -86,8 +83,7 @@ local SimbioSys_HRIC_F750 = {
       Aberration = "NONE"
     },
     AlwaysDrawFov = true,
-    PotentialTargets = { "MERCURY", "EARTH", "VENUS" },
-    FrameConversions = {}
+    PotentialTargets = { "MERCURY", "EARTH", "VENUS" }
   },
   GUI = {
     Name = "MPO Simbio-Sys HRIC F750",
@@ -109,8 +105,7 @@ local SimbioSys_HRIC_F880 = {
       Aberration = "NONE"
     },
     AlwaysDrawFov = true,
-    PotentialTargets = { "MERCURY", "EARTH", "VENUS" },
-    FrameConversions = {}
+    PotentialTargets = { "MERCURY", "EARTH", "VENUS" }
   },
   GUI = {
     Name = "MPO Simbio-Sys HRIC F880",
@@ -132,8 +127,7 @@ local SimbioSys_STC_L = {
       Aberration = "NONE"
     },
     AlwaysDrawFov = true,
-    PotentialTargets = { "MERCURY", "EARTH", "VENUS" },
-    FrameConversions = {}
+    PotentialTargets = { "MERCURY", "EARTH", "VENUS" }
   },
   GUI = {
     Name = "MPO Simbio-Sys STC L",
@@ -155,8 +149,7 @@ local SimbioSys_STC_H = {
       Aberration = "NONE"
     },
     AlwaysDrawFov = true,
-    PotentialTargets = { "MERCURY", "EARTH", "VENUS" },
-    FrameConversions = {}
+    PotentialTargets = { "MERCURY", "EARTH", "VENUS" }
   },
   GUI = {
     Name = "MPO Simbio-Sys STC H",
@@ -178,8 +171,7 @@ local SimbioSys_STC_L_F920 = {
       Aberration = "NONE"
     },
     AlwaysDrawFov = true,
-    PotentialTargets = { "MERCURY", "EARTH", "VENUS" },
-    FrameConversions = {}
+    PotentialTargets = { "MERCURY", "EARTH", "VENUS" }
   },
   GUI = {
     Name = "MPO Simbio-Sys STC L F920",
@@ -201,8 +193,7 @@ local SimbioSys_STC_L_F550 = {
       Aberration = "NONE"
     },
     AlwaysDrawFov = true,
-    PotentialTargets = { "MERCURY", "EARTH", "VENUS" },
-    FrameConversions = {}
+    PotentialTargets = { "MERCURY", "EARTH", "VENUS" }
   },
   GUI = {
     Name = "MPO Simbio-Sys STC L F550",
@@ -224,8 +215,7 @@ local SimbioSys_STC_L_P700 = {
       Aberration = "NONE"
     },
     AlwaysDrawFov = true,
-    PotentialTargets = { "MERCURY", "EARTH", "VENUS" },
-    FrameConversions = {}
+    PotentialTargets = { "MERCURY", "EARTH", "VENUS" }
   },
   GUI = {
     Name = "MPO Simbio-Sys STC L P700",
@@ -247,8 +237,7 @@ local SimbioSys_STC_H_P700 = {
       Aberration = "NONE"
     },
     AlwaysDrawFov = true,
-    PotentialTargets = { "MERCURY", "EARTH", "VENUS" },
-    FrameConversions = {}
+    PotentialTargets = { "MERCURY", "EARTH", "VENUS" }
   },
   GUI = {
     Name = "MPO Simbio-Sys STC H P700",
@@ -270,8 +259,7 @@ local SimbioSys_STC_H_F420 = {
       Aberration = "NONE"
     },
     AlwaysDrawFov = true,
-    PotentialTargets = { "MERCURY", "EARTH", "VENUS" },
-    FrameConversions = {}
+    PotentialTargets = { "MERCURY", "EARTH", "VENUS" }
   },
   GUI = {
     Name = "MPO Simbio-Sys STC H F420",
@@ -293,8 +281,7 @@ local SimbioSys_STC_H_F750 = {
       Aberration = "NONE"
     },
     AlwaysDrawFov = true,
-    PotentialTargets = { "MERCURY", "EARTH", "VENUS" },
-    FrameConversions = {}
+    PotentialTargets = { "MERCURY", "EARTH", "VENUS" }
   },
   GUI = {
     Name = "MPO Simbio-Sys STC H F750",
@@ -316,8 +303,7 @@ local SimbioSys_VIHI = {
       Aberration = "NONE"
     },
     AlwaysDrawFov = true,
-    PotentialTargets = { "MERCURY", "EARTH", "VENUS" },
-    FrameConversions = {}
+    PotentialTargets = { "MERCURY", "EARTH", "VENUS" }
   },
   GUI = {
     Name = "MPO Simbio-Sys VIHI",
diff --git a/data/assets/scene/solarsystem/missions/bepicolombo/fov/sixs.asset b/data/assets/scene/solarsystem/missions/bepicolombo/fov/sixs.asset
index ab08db5aad..78c81c9818 100644
--- a/data/assets/scene/solarsystem/missions/bepicolombo/fov/sixs.asset
+++ b/data/assets/scene/solarsystem/missions/bepicolombo/fov/sixs.asset
@@ -17,8 +17,7 @@ local SixsX1 = {
       Aberration = "NONE"
     },
     AlwaysDrawFov = true,
-    PotentialTargets = { "MERCURY", "EARTH", "VENUS" },
-    FrameConversions = {}
+    PotentialTargets = { "MERCURY", "EARTH", "VENUS" }
   },
   GUI = {
     Name = "MPO Sixs X1",
@@ -40,8 +39,7 @@ local SixsX2 = {
       Aberration = "NONE"
     },
     AlwaysDrawFov = true,
-    PotentialTargets = { "MERCURY", "EARTH", "VENUS" },
-    FrameConversions = {}
+    PotentialTargets = { "MERCURY", "EARTH", "VENUS" }
   },
   GUI = {
     Name = "MPO Sixs X2",
@@ -63,8 +61,7 @@ local SixsX3 = {
       Aberration = "NONE"
     },
     AlwaysDrawFov = true,
-    PotentialTargets = { "MERCURY", "EARTH", "VENUS" },
-    FrameConversions = {}
+    PotentialTargets = { "MERCURY", "EARTH", "VENUS" }
   },
   GUI = {
     Name = "MPO Sixs X3",
diff --git a/data/assets/scene/solarsystem/missions/bepicolombo/fov/startracker.asset b/data/assets/scene/solarsystem/missions/bepicolombo/fov/startracker.asset
index 9d2fec4234..f5afe6f213 100644
--- a/data/assets/scene/solarsystem/missions/bepicolombo/fov/startracker.asset
+++ b/data/assets/scene/solarsystem/missions/bepicolombo/fov/startracker.asset
@@ -17,8 +17,7 @@ local StarTracker1 = {
       Aberration = "NONE"
     },
     AlwaysDrawFov = true,
-    PotentialTargets = { "MERCURY", "EARTH", "VENUS" },
-    FrameConversions = {}
+    PotentialTargets = { "MERCURY", "EARTH", "VENUS" }
   },
   GUI = {
     Name = "MPO Star Tracker 1",
@@ -40,8 +39,7 @@ local StarTracker2 = {
       Aberration = "NONE"
     },
     AlwaysDrawFov = true,
-    PotentialTargets = { "MERCURY", "EARTH", "VENUS" },
-    FrameConversions = {}
+    PotentialTargets = { "MERCURY", "EARTH", "VENUS" }
   },
   GUI = {
     Name = "MPO Star Tracker 2",
@@ -63,8 +61,7 @@ local StarTracker3 = {
       Aberration = "NONE"
     },
     AlwaysDrawFov = true,
-    PotentialTargets = { "MERCURY", "EARTH", "VENUS" },
-    FrameConversions = {}
+    PotentialTargets = { "MERCURY", "EARTH", "VENUS" }
   },
   GUI = {
     Name = "MPO Star Tracker 3",
diff --git a/data/assets/scene/solarsystem/missions/bepicolombo/kernels.asset b/data/assets/scene/solarsystem/missions/bepicolombo/kernels.asset
index c473ebb013..7963c2df11 100644
--- a/data/assets/scene/solarsystem/missions/bepicolombo/kernels.asset
+++ b/data/assets/scene/solarsystem/missions/bepicolombo/kernels.asset
@@ -120,82 +120,6 @@ local BepiColomboKernels = {
   kernels .. "bc_mpo_schulte_vector_v01.bsp",
   kernels .. "bc_mpo_prelaunch_v01.bsp",
   kernels .. "bc_mpo_fcp_00160_20181020_20260328_v01.bsp"
-
-
---   kernels .. "bc_mpo_step_20240110.tsc",
--- 
---   kernels .. "de432s.bsp",
---   kernels .. "bc_mpo_fcp_00160_20181020_20260328_v01.bsp",
---   kernels .. "bc_mmo_struct_v01.bsp",
---   kernels .. "bc_mtm_struct_v06.bsp",
---   kernels .. "bc_mpo_struct_v09.bsp",
--- 
---   kernels .. "bc_mmo_mppe_v04.ti",
---   kernels .. "bc_mmo_msasi_v03.ti",
---   kernels .. "bc_mmo_ssas_v01.ti",
---   kernels .. "bc_mpo_aux_v01.ti",
---   kernels .. "bc_mpo_bela_v09.ti",
---   kernels .. "bc_mpo_mertis_v08.ti",
---   kernels .. "bc_mpo_mgns_v02.ti",
---   kernels .. "bc_mpo_mixs_v06.ti",
---   kernels .. "bc_mpo_phebus_v06.ti",
---   kernels .. "bc_mpo_serena_v08.ti",
---   kernels .. "bc_mpo_simbio-sys_v10.ti",
---   kernels .. "bc_mpo_sixs_v08.ti",
---   kernels .. "bc_mpo_str_v02.ti",
---   kernels .. "bc_mtm_mcam_v05.ti",
--- 
---   kernels .. "bc_sci_v12.tf",
---   kernels .. "bc_mmo_v13.tf",
---   kernels .. "bc_mpo_v34.tf",
---   kernels .. "bc_mtm_v12.tf",
---   kernels .. "bc_ops_v01.tf",
--- 
---   kernels .. "bc_mpo_sc_fcp_00160_20181020_20240216_f20181127_v01.bc",
---   -- kernels .. "bc_mpo_sc_scm_20240101_20240111_s20240110_v01.bc",
---   -- kernels .. "bc_mpo_sc_scm_20230101_20240101_s20240104_v01.bc",
---   -- kernels .. "bc_mpo_sc_scm_20220101_20230101_s20230309_v01.bc",
---   -- kernels .. "bc_mpo_sc_scm_20210101_20220101_s20230309_v01.bc",
---   -- kernels .. "bc_mpo_sc_scm_20200101_20210101_s20210618_v01.bc",
---   -- kernels .. "bc_mpo_sc_scm_20190101_20200101_s20230309_v01.bc",
---   -- kernels .. "bc_mpo_sc_scm_20181020_20190101_s20230309_v01.bc",
--- 
---   kernels .. "bc_mpo_sc_scc_20240101_20240111_s20240110_v01.bc",
---   kernels .. "bc_mpo_sc_scc_20230101_20240101_s20240104_v01.bc",
---   kernels .. "bc_mpo_sc_scc_20220101_20230101_s20221229_v01.bc",
---   kernels .. "bc_mpo_sc_scc_20210101_20220101_s20230309_v01.bc",
---   kernels .. "bc_mpo_sc_scc_20200101_20210101_s20230309_v01.bc",
---   kernels .. "bc_mpo_sc_scc_20190101_20200101_s20230309_v01.bc",
---   kernels .. "bc_mpo_sc_scc_20181019_20190101_s20230309_v01.bc",
--- 
---   kernels .. "bc_mpo_hga_scm_20240101_20240111_s20240110_v01.bc",
---   kernels .. "bc_mpo_hga_scm_20181020_20190101_s20201020_v02.bc",
---   kernels .. "bc_mpo_hga_scm_20190101_20200101_s20230309_v01.bc",
---   kernels .. "bc_mpo_hga_scm_20200101_20210101_s20230309_v01.bc",
---   kernels .. "bc_mpo_hga_scm_20210101_20220101_s20230309_v01.bc",
---   kernels .. "bc_mpo_hga_scm_20220101_20230101_s20221229_v01.bc",
---   kernels .. "bc_mpo_hga_scm_20230101_20240101_s20240104_v01.bc",
---   kernels .. "bc_mpo_magboom_default_s20191107_v01.bc",
---   kernels .. "bc_mpo_mertis_zero_s20191107_v02.bc",
---   kernels .. "bc_mpo_mga_scm_20181020_20190101_s20200109_v02.bc",
---   kernels .. "bc_mpo_mga_scm_20190101_20200101_s20230309_v01.bc",
---   kernels .. "bc_mpo_mga_scm_20200101_20210101_s20230309_v01.bc",
---   kernels .. "bc_mpo_mga_scm_20210101_20220101_s20230309_v01.bc",
---   kernels .. "bc_mpo_mga_scm_20220101_20230101_s20221229_v01.bc",
---   kernels .. "bc_mpo_mga_scm_20230101_20240101_s20240104_v01.bc",
---   kernels .. "bc_mpo_mga_scm_20240101_20240111_s20240110_v01.bc",
---   kernels .. "bc_mpo_mga_zero_s20191107_v02.bc",
---   kernels .. "bc_mpo_phebus_zero_s20210408_v02.bc",
---   kernels .. "bc_mpo_sa_scm_20181020_20190101_s20211202_v01.bc",
---   kernels .. "bc_mpo_sa_scm_20190101_20200101_s20230309_v01.bc",
---   kernels .. "bc_mpo_sa_scm_20200101_20210101_s20230309_v01.bc",
---   kernels .. "bc_mpo_sa_scm_20210101_20220101_s20230309_v01.bc",
---   kernels .. "bc_mpo_sa_scm_20220101_20230101_s20221229_v01.bc",
---   kernels .. "bc_mpo_sa_scm_20230101_20240101_s20240104_v01.bc",
---   kernels .. "bc_mpo_sa_scm_20240101_20240111_s20240110_v01.bc",
---   kernels .. "bc_mpo_sa_zero_s20191107_v02.bc",
---   kernels .. "bc_mpo_sa_zero_s20191107_v02.bc",
---   kernels .. "bc_mpo_serena_zero_s20191207_v02.bc"
 }
 
 local ID = {
@@ -271,12 +195,7 @@ local Frame = {
   Sixs_X3 = "MPO_SIXS-X-3",
   StarTracker1 = "MPO_STR-1",
   StarTracker2 = "MPO_STR-2",
-  StarTracker3 = "MPO_STR-3",
-
-
-
-
-
+  StarTracker3 = "MPO_STR-3"
 }
 
 
diff --git a/data/assets/scene/solarsystem/missions/dawn/dawn.asset b/data/assets/scene/solarsystem/missions/dawn/dawn.asset
index b5aa5aa3de..d2096a1ac5 100644
--- a/data/assets/scene/solarsystem/missions/dawn/dawn.asset
+++ b/data/assets/scene/solarsystem/missions/dawn/dawn.asset
@@ -39,7 +39,6 @@ local DawnPosition = {
       Target = kernels.ID.Dawn,
       Observer = coreKernels.ID.SolarSystemBarycenter
     },
-    -- Rotation for model version 2
     Rotation = {
       Type = "StaticRotation",
       Rotation = { math.pi / 2.0, 0.0, math.pi / 2.0 }
diff --git a/data/assets/scene/solarsystem/missions/insight/edl.asset b/data/assets/scene/solarsystem/missions/insight/edl.asset
index c8f8314147..e37316b37f 100644
--- a/data/assets/scene/solarsystem/missions/insight/edl.asset
+++ b/data/assets/scene/solarsystem/missions/insight/edl.asset
@@ -770,6 +770,7 @@ local Insight_Trail = {
   }
 }
 
+
 asset.onInitialize(function()
   openspace.addSceneGraphNode(InsightParent)
   openspace.addSceneGraphNode(Insight)
diff --git a/data/assets/scene/solarsystem/missions/juice/dashboard.asset b/data/assets/scene/solarsystem/missions/juice/dashboard.asset
index b334e828e8..fdd20f5580 100644
--- a/data/assets/scene/solarsystem/missions/juice/dashboard.asset
+++ b/data/assets/scene/solarsystem/missions/juice/dashboard.asset
@@ -3,6 +3,7 @@ local jupiter = asset.require("scene/solarsystem/planets/jupiter/jupiter")
 local ganymede = asset.require("scene/solarsystem/planets/jupiter/ganymede/ganymede")
 
 
+
 local DistanceJuiceJupiter = {
   Type = "DashboardItemDistance",
   Identifier = "JuiceJupiterDistance",
diff --git a/data/assets/scene/solarsystem/missions/juice/fov/gala.asset b/data/assets/scene/solarsystem/missions/juice/fov/gala.asset
index 2bdb877dad..e1bf3b5373 100644
--- a/data/assets/scene/solarsystem/missions/juice/fov/gala.asset
+++ b/data/assets/scene/solarsystem/missions/juice/fov/gala.asset
@@ -22,8 +22,7 @@ local Gala = {
       Aberration = "NONE"
     },
     AlwaysDrawFov = true,
-    PotentialTargets = { "JUPITER", "CALLISTO", "EUROPA", "GANYMEDE", "IO" },
-    FrameConversions = {}
+    PotentialTargets = { "JUPITER", "CALLISTO", "EUROPA", "GANYMEDE", "IO" }
   },
   GUI = {
     Name = "Gala FOV",
@@ -33,7 +32,6 @@ local Gala = {
 }
 
 
-
 asset.onInitialize(function()
   -- Circle shapes are currently not supported
   openspace.addSceneGraphNode(Gala)
diff --git a/data/assets/scene/solarsystem/missions/juice/fov/janus.asset b/data/assets/scene/solarsystem/missions/juice/fov/janus.asset
index 8b4d872e93..65d440a769 100644
--- a/data/assets/scene/solarsystem/missions/juice/fov/janus.asset
+++ b/data/assets/scene/solarsystem/missions/juice/fov/janus.asset
@@ -28,8 +28,7 @@ local Janus = {
       Aberration = "NONE"
     },
     AlwaysDrawFov = true,
-    PotentialTargets = { "JUPITER", "CALLISTO", "EUROPA", "GANYMEDE", "IO" },
-    FrameConversions = {}
+    PotentialTargets = { "JUPITER", "CALLISTO", "EUROPA", "GANYMEDE", "IO" }
   },
   GUI = {
     Name = "Janus FOV",
diff --git a/data/assets/scene/solarsystem/missions/juice/fov/jmc.asset b/data/assets/scene/solarsystem/missions/juice/fov/jmc.asset
index cd8a82ae90..57e183f1e7 100644
--- a/data/assets/scene/solarsystem/missions/juice/fov/jmc.asset
+++ b/data/assets/scene/solarsystem/missions/juice/fov/jmc.asset
@@ -22,8 +22,7 @@ local JMC1 = {
       Aberration = "NONE"
     },
     AlwaysDrawFov = true,
-    PotentialTargets = { "JUPITER", "CALLISTO", "EUROPA", "GANYMEDE", "IO" },
-    FrameConversions = {}
+    PotentialTargets = { "JUPITER", "CALLISTO", "EUROPA", "GANYMEDE", "IO" }
   },
   GUI = {
     Name = "JUICE_JMC-1 FOV",
@@ -51,8 +50,7 @@ local JMC2 = {
       Aberration = "NONE"
     },
     AlwaysDrawFov = true,
-    PotentialTargets = { "JUPITER", "CALLISTO", "EUROPA", "GANYMEDE", "IO" },
-    FrameConversions = {}
+    PotentialTargets = { "JUPITER", "CALLISTO", "EUROPA", "GANYMEDE", "IO" }
   },
   GUI = {
     Name = "JUICE_JMC-2 FOV",
diff --git a/data/assets/scene/solarsystem/missions/juice/fov/majis.asset b/data/assets/scene/solarsystem/missions/juice/fov/majis.asset
index 772c537e71..2802dbce6a 100644
--- a/data/assets/scene/solarsystem/missions/juice/fov/majis.asset
+++ b/data/assets/scene/solarsystem/missions/juice/fov/majis.asset
@@ -22,8 +22,7 @@ local MajisVisnir = {
       Aberration = "NONE"
     },
     AlwaysDrawFov = true,
-    PotentialTargets = { "JUPITER", "CALLISTO", "EUROPA", "GANYMEDE", "IO" },
-    FrameConversions = {}
+    PotentialTargets = { "JUPITER", "CALLISTO", "EUROPA", "GANYMEDE", "IO" }
   },
   GUI = {
     Name = "Majis Visnir FOV",
@@ -54,8 +53,7 @@ local MajisVisnirB2 = {
       Aberration = "NONE"
     },
     AlwaysDrawFov = true,
-    PotentialTargets = { "JUPITER", "CALLISTO", "EUROPA", "GANYMEDE", "IO" },
-    FrameConversions = {}
+    PotentialTargets = { "JUPITER", "CALLISTO", "EUROPA", "GANYMEDE", "IO" }
   },
   GUI = {
     Name = "Majis Visnir B2 FOV",
@@ -82,8 +80,7 @@ local MajisVisnirB4 = {
       Aberration = "NONE"
     },
     AlwaysDrawFov = true,
-    PotentialTargets = { "JUPITER", "CALLISTO", "EUROPA", "GANYMEDE", "IO" },
-    FrameConversions = {}
+    PotentialTargets = { "JUPITER", "CALLISTO", "EUROPA", "GANYMEDE", "IO" }
   },
   GUI = {
     Name = "Majis Visnir B4 FOV",
@@ -110,8 +107,7 @@ local MajisIr = {
       Aberration = "NONE"
     },
     AlwaysDrawFov = true,
-    PotentialTargets = { "JUPITER", "CALLISTO", "EUROPA", "GANYMEDE", "IO" },
-    FrameConversions = {}
+    PotentialTargets = { "JUPITER", "CALLISTO", "EUROPA", "GANYMEDE", "IO" }
   },
   GUI = {
     Name = "Majis IR FOV",
@@ -138,8 +134,7 @@ local MajisIrB2 = {
       Aberration = "NONE"
     },
     AlwaysDrawFov = true,
-    PotentialTargets = { "JUPITER", "CALLISTO", "EUROPA", "GANYMEDE", "IO" },
-    FrameConversions = {}
+    PotentialTargets = { "JUPITER", "CALLISTO", "EUROPA", "GANYMEDE", "IO" }
   },
   GUI = {
     Name = "Majis IR B2 FOV",
@@ -166,8 +161,7 @@ local MajisIrB4 = {
       Aberration = "NONE"
     },
     AlwaysDrawFov = true,
-    PotentialTargets = { "JUPITER", "CALLISTO", "EUROPA", "GANYMEDE", "IO" },
-    FrameConversions = {}
+    PotentialTargets = { "JUPITER", "CALLISTO", "EUROPA", "GANYMEDE", "IO" }
   },
   GUI = {
     Name = "Majis IR B4 FOV",
@@ -194,8 +188,7 @@ local Majis = {
       Aberration = "NONE"
     },
     AlwaysDrawFov = true,
-    PotentialTargets = { "JUPITER", "CALLISTO", "EUROPA", "GANYMEDE", "IO" },
-    FrameConversions = {}
+    PotentialTargets = { "JUPITER", "CALLISTO", "EUROPA", "GANYMEDE", "IO" }
   },
   GUI = {
     Name = "Majis FOV",
diff --git a/data/assets/scene/solarsystem/missions/juice/fov/navcam.asset b/data/assets/scene/solarsystem/missions/juice/fov/navcam.asset
index f560ff49fc..1adead87e0 100644
--- a/data/assets/scene/solarsystem/missions/juice/fov/navcam.asset
+++ b/data/assets/scene/solarsystem/missions/juice/fov/navcam.asset
@@ -22,8 +22,7 @@ local NavCam = {
       Aberration = "NONE"
     },
     AlwaysDrawFov = true,
-    PotentialTargets = { "JUPITER", "CALLISTO", "EUROPA", "GANYMEDE", "IO" },
-    FrameConversions = {}
+    PotentialTargets = { "JUPITER", "CALLISTO", "EUROPA", "GANYMEDE", "IO" }
   },
   GUI = {
     Name = "NavCam FOV",
diff --git a/data/assets/scene/solarsystem/missions/juice/fov/rime.asset b/data/assets/scene/solarsystem/missions/juice/fov/rime.asset
index 0cf595d298..185a8afc35 100644
--- a/data/assets/scene/solarsystem/missions/juice/fov/rime.asset
+++ b/data/assets/scene/solarsystem/missions/juice/fov/rime.asset
@@ -23,8 +23,7 @@ local RimeBase = {
       Aberration = "NONE"
     },
     AlwaysDrawFov = true,
-    PotentialTargets = { "JUPITER", "CALLISTO", "EUROPA", "GANYMEDE", "IO" },
-    FrameConversions = {}
+    PotentialTargets = { "JUPITER", "CALLISTO", "EUROPA", "GANYMEDE", "IO" }
   },
   GUI = {
     Name = "Rime Base FOV",
@@ -53,8 +52,7 @@ local Rime = {
       Aberration = "NONE"
     },
     AlwaysDrawFov = true,
-    PotentialTargets = { "JUPITER", "CALLISTO", "EUROPA", "GANYMEDE", "IO" },
-    FrameConversions = {}
+    PotentialTargets = { "JUPITER", "CALLISTO", "EUROPA", "GANYMEDE", "IO" }
   },
   GUI = {
     Name = "Rime FOV",
diff --git a/data/assets/scene/solarsystem/missions/juice/fov/startracker.asset b/data/assets/scene/solarsystem/missions/juice/fov/startracker.asset
index 0919a57cb3..42a7fefc8e 100644
--- a/data/assets/scene/solarsystem/missions/juice/fov/startracker.asset
+++ b/data/assets/scene/solarsystem/missions/juice/fov/startracker.asset
@@ -22,8 +22,7 @@ local StarOh1 = {
       Aberration = "NONE"
     },
     AlwaysDrawFov = true,
-    PotentialTargets = { "JUPITER", "CALLISTO", "EUROPA", "GANYMEDE", "IO" },
-    FrameConversions = {}
+    PotentialTargets = { "JUPITER", "CALLISTO", "EUROPA", "GANYMEDE", "IO" }
   },
   GUI = {
     Name = "Star Tracker OH1 FOV",
@@ -51,8 +50,7 @@ local StarOh2 = {
       Aberration = "NONE"
     },
     AlwaysDrawFov = true,
-    PotentialTargets = { "JUPITER", "CALLISTO", "EUROPA", "GANYMEDE", "IO" },
-    FrameConversions = {}
+    PotentialTargets = { "JUPITER", "CALLISTO", "EUROPA", "GANYMEDE", "IO" }
   },
   GUI = {
     Name = "Star Tracker OH2 FOV",
@@ -80,8 +78,7 @@ local StarOh3 = {
       Aberration = "NONE"
     },
     AlwaysDrawFov = true,
-    PotentialTargets = { "JUPITER", "CALLISTO", "EUROPA", "GANYMEDE", "IO" },
-    FrameConversions = {}
+    PotentialTargets = { "JUPITER", "CALLISTO", "EUROPA", "GANYMEDE", "IO" }
   },
   GUI = {
     Name = "Star Tracker OH3 FOV",
diff --git a/data/assets/scene/solarsystem/missions/juice/fov/swi.asset b/data/assets/scene/solarsystem/missions/juice/fov/swi.asset
index a5e7f54196..8e06bff28e 100644
--- a/data/assets/scene/solarsystem/missions/juice/fov/swi.asset
+++ b/data/assets/scene/solarsystem/missions/juice/fov/swi.asset
@@ -23,8 +23,7 @@ local SwiCh2 = {
       Aberration = "NONE"
     },
     AlwaysDrawFov = true,
-    PotentialTargets = { "JUPITER", "CALLISTO", "EUROPA", "GANYMEDE", "IO" },
-    FrameConversions = {}
+    PotentialTargets = { "JUPITER", "CALLISTO", "EUROPA", "GANYMEDE", "IO" }
   },
   GUI = {
     Name = "SWI CH2 FOV",
@@ -58,8 +57,7 @@ local SwiFull = {
       Aberration = "NONE"
     },
     AlwaysDrawFov = true,
-    PotentialTargets = { "JUPITER", "CALLISTO", "EUROPA", "GANYMEDE", "IO" },
-    FrameConversions = {}
+    PotentialTargets = { "JUPITER", "CALLISTO", "EUROPA", "GANYMEDE", "IO" }
   },
   GUI = {
     Name = "SWI Full FOV",
@@ -96,8 +94,7 @@ local SwiFullGCO500 = {
       Aberration = "NONE"
     },
     AlwaysDrawFov = true,
-    PotentialTargets = { "JUPITER", "CALLISTO", "EUROPA", "GANYMEDE", "IO" },
-    FrameConversions = {}
+    PotentialTargets = { "JUPITER", "CALLISTO", "EUROPA", "GANYMEDE", "IO" }
   },
   GUI = {
     Name = "SWI Full GCO500 FOV",
diff --git a/data/assets/scene/solarsystem/missions/juice/fov/uvs.asset b/data/assets/scene/solarsystem/missions/juice/fov/uvs.asset
index 0190a72bea..e264b5b0fd 100644
--- a/data/assets/scene/solarsystem/missions/juice/fov/uvs.asset
+++ b/data/assets/scene/solarsystem/missions/juice/fov/uvs.asset
@@ -22,8 +22,7 @@ local UVS = {
       Aberration = "NONE"
     },
     AlwaysDrawFov = true,
-    PotentialTargets = { "JUPITER", "CALLISTO", "EUROPA", "GANYMEDE", "IO" },
-    FrameConversions = {}
+    PotentialTargets = { "JUPITER", "CALLISTO", "EUROPA", "GANYMEDE", "IO" }
   },
   GUI = {
     Name = "UVS FOV",
diff --git a/data/assets/scene/solarsystem/missions/juno/kernels.asset b/data/assets/scene/solarsystem/missions/juno/kernels.asset
index f660655afd..d2d03b78bf 100644
--- a/data/assets/scene/solarsystem/missions/juno/kernels.asset
+++ b/data/assets/scene/solarsystem/missions/juno/kernels.asset
@@ -115,7 +115,6 @@ local Kernels = {
   data .. "juno_sc_prl_230228_230407_jm0490rp_v01.bc"
 }
 
-
 local ID = {
   Juno = "JUNO"
 }
@@ -124,6 +123,7 @@ local Frame = {
   Juno = "JUNO_SPACECRAFT"
 }
 
+
 asset.onInitialize(function()
   openspace.spice.loadKernel(Kernels)
 end)
@@ -132,6 +132,5 @@ asset.onDeinitialize(function()
   openspace.spice.unloadKernel(Kernels)
 end)
 
-
 asset.export("ID", ID)
 asset.export("Frame", Frame)
diff --git a/data/assets/scene/solarsystem/missions/messenger/messenger.asset b/data/assets/scene/solarsystem/missions/messenger/messenger.asset
index e779b7177c..04805ebcab 100644
--- a/data/assets/scene/solarsystem/missions/messenger/messenger.asset
+++ b/data/assets/scene/solarsystem/missions/messenger/messenger.asset
@@ -5,6 +5,7 @@ local kernels = asset.require("./kernels")
 local coreKernels = asset.require("spice/core")
 
 
+
 local models = asset.resource({
   Name = "Messenger Models",
   Type = "HttpSynchronization",
diff --git a/data/assets/scene/solarsystem/missions/osirisrex/actions.asset b/data/assets/scene/solarsystem/missions/osirisrex/actions.asset
index d11290c461..09f90f1fca 100644
--- a/data/assets/scene/solarsystem/missions/osirisrex/actions.asset
+++ b/data/assets/scene/solarsystem/missions/osirisrex/actions.asset
@@ -136,6 +136,7 @@ local LookImageCapture = {
   IsLocal = false
 }
 
+
 asset.onInitialize(function()
   openspace.action.registerAction(FocusOsirisRex)
   openspace.action.registerAction(FocusBennu)
diff --git a/data/assets/scene/solarsystem/missions/osirisrex/model.asset b/data/assets/scene/solarsystem/missions/osirisrex/model.asset
index ac98b5bee2..647eea7f94 100644
--- a/data/assets/scene/solarsystem/missions/osirisrex/model.asset
+++ b/data/assets/scene/solarsystem/missions/osirisrex/model.asset
@@ -161,6 +161,7 @@ local PolyCamFov = {
 --   }
 -- }
 
+
 asset.onInitialize(function()
   openspace.addSceneGraphNode(OsirisRex)
   openspace.addSceneGraphNode(PolyCam)
diff --git a/data/assets/scene/solarsystem/missions/rosetta/67p.asset b/data/assets/scene/solarsystem/missions/rosetta/67p.asset
index 11b67b441f..27c0dafd75 100644
--- a/data/assets/scene/solarsystem/missions/rosetta/67p.asset
+++ b/data/assets/scene/solarsystem/missions/rosetta/67p.asset
@@ -137,7 +137,6 @@ local Trail67P = {
   }
 }
 
--- actions
 local Focus67p = {
   Identifier = "os.rosetta.Focus67p",
   Name = "Focus on 67P",
diff --git a/data/assets/scene/solarsystem/missions/voyager/mission.asset b/data/assets/scene/solarsystem/missions/voyager/mission.asset
index 4efd6cea00..5084e98480 100644
--- a/data/assets/scene/solarsystem/missions/voyager/mission.asset
+++ b/data/assets/scene/solarsystem/missions/voyager/mission.asset
@@ -108,7 +108,7 @@ local Mission = {
         {
           Name = "Voyager 2 Neptune Encounter",
           TimeRange = { Start = "1989 AUG 25 00:00:00", End = "1989 AUG 25 00:00:00" }
-        }            
+        }
       }
     }
   }
diff --git a/data/assets/scene/solarsystem/planets/base_layers.asset b/data/assets/scene/solarsystem/planets/base_layers.asset
index 878844ac6b..b9203c6a45 100644
--- a/data/assets/scene/solarsystem/planets/base_layers.asset
+++ b/data/assets/scene/solarsystem/planets/base_layers.asset
@@ -26,6 +26,7 @@ asset.require("./uranus/default_layers")
 asset.require("./neptune/default_layers")
 
 
+
 asset.meta = {
   Name = "Base Solar System Layers",
   Description = [[Adds base layers for all planets. Remove this asset and include
diff --git a/data/assets/scene/solarsystem/planets/default_layers.asset b/data/assets/scene/solarsystem/planets/default_layers.asset
index 13641ff86c..cf5dafcb95 100644
--- a/data/assets/scene/solarsystem/planets/default_layers.asset
+++ b/data/assets/scene/solarsystem/planets/default_layers.asset
@@ -10,7 +10,6 @@ asset.meta = {
   Description = [[Adds default layers for all planets. Remove this asset and include
     individual layers for planets to customize planet layers
 
-
     Layers loaded from all servers
   ]],
   Author = "OpenSpace Team",
diff --git a/data/assets/scene/solarsystem/planets/earth/eclipse_shadow.asset b/data/assets/scene/solarsystem/planets/earth/eclipse_shadow.asset
index bc4cde4de6..6543fcc589 100644
--- a/data/assets/scene/solarsystem/planets/earth/eclipse_shadow.asset
+++ b/data/assets/scene/solarsystem/planets/earth/eclipse_shadow.asset
@@ -1,6 +1,8 @@
 local transforms = asset.require("scene/solarsystem/planets/earth/moon/moon")
 local coreKernels = asset.require("spice/core")
 
+
+
 local EarthMoonShadow = {
   Identifier = "EarthMoonShadow",
   Parent = transforms.Moon.Identifier,
@@ -22,6 +24,7 @@ local EarthMoonShadow = {
   }
 }
 
+
 asset.onInitialize(function()
   openspace.addSceneGraphNode(EarthMoonShadow)
 end)
diff --git a/data/assets/scene/solarsystem/planets/earth/eclipses/corona/corona20170821.asset b/data/assets/scene/solarsystem/planets/earth/eclipses/corona/corona20170821.asset
index 982abdda01..02176e3200 100644
--- a/data/assets/scene/solarsystem/planets/earth/eclipses/corona/corona20170821.asset
+++ b/data/assets/scene/solarsystem/planets/earth/eclipses/corona/corona20170821.asset
@@ -31,12 +31,12 @@ local Plane = {
     Video = videos .. "corona20170821_0171.mp4",
     PlaybackMode = "MapToSimulationTime",
     StartTime = "2017 08 21 00:00:00",
-    EndTime = "2017 08 21 23:59:59",
+    EndTime = "2017 08 21 23:59:59"
   },
   GUI = {
     Name = "Sun Corona",
     Path = "/Solar System/Sun"
-  },
+  }
 }
 
 
diff --git a/data/assets/scene/solarsystem/planets/earth/eclipses/grid/earth_ecliptic_radial_grid.asset b/data/assets/scene/solarsystem/planets/earth/eclipses/grid/earth_ecliptic_radial_grid.asset
index 1b062f9d61..de490a5d80 100644
--- a/data/assets/scene/solarsystem/planets/earth/eclipses/grid/earth_ecliptic_radial_grid.asset
+++ b/data/assets/scene/solarsystem/planets/earth/eclipses/grid/earth_ecliptic_radial_grid.asset
@@ -32,7 +32,7 @@ local eclipticGrid = {
   },
   GUI = {
     Name = "Earth Ecliptic Grid",
-    Path = "/Solar System/Planets/Earth",
+    Path = "/Solar System/Planets/Earth"
   }
 }
 
diff --git a/data/assets/scene/solarsystem/planets/earth/eclipses/grid/moon_radial_grid.asset b/data/assets/scene/solarsystem/planets/earth/eclipses/grid/moon_radial_grid.asset
index e0d23ad425..9b3ca56a3d 100644
--- a/data/assets/scene/solarsystem/planets/earth/eclipses/grid/moon_radial_grid.asset
+++ b/data/assets/scene/solarsystem/planets/earth/eclipses/grid/moon_radial_grid.asset
@@ -21,7 +21,7 @@ local orbitalPlaneGrid = {
   },
   GUI = {
     Name = "Moon Ecliptic Grid",
-    Path = "/Solar System/Planets/Earth/Moon",
+    Path = "/Solar System/Planets/Earth/Moon"
   }
 }
 
diff --git a/data/assets/scene/solarsystem/planets/earth/lagrange_points/l4.asset b/data/assets/scene/solarsystem/planets/earth/lagrange_points/l4.asset
index e528314041..fc31d9a812 100644
--- a/data/assets/scene/solarsystem/planets/earth/lagrange_points/l4.asset
+++ b/data/assets/scene/solarsystem/planets/earth/lagrange_points/l4.asset
@@ -79,7 +79,6 @@ local L4Label = {
 }
 
 
-
 asset.onInitialize(function()
   openspace.spice.loadKernel(kernels .. "L4_de431.bsp")
 
diff --git a/data/assets/scene/solarsystem/planets/earth/lagrange_points/l5.asset b/data/assets/scene/solarsystem/planets/earth/lagrange_points/l5.asset
index 7ea7f29b64..ac2902a3f8 100644
--- a/data/assets/scene/solarsystem/planets/earth/lagrange_points/l5.asset
+++ b/data/assets/scene/solarsystem/planets/earth/lagrange_points/l5.asset
@@ -79,7 +79,6 @@ local L5Label = {
 }
 
 
-
 asset.onInitialize(function()
   openspace.spice.loadKernel(kernels .. "L5_de431.bsp")
 
diff --git a/data/assets/scene/solarsystem/planets/earth/layers/colorlayers/definitions/noaa20.asset b/data/assets/scene/solarsystem/planets/earth/layers/colorlayers/definitions/noaa20.asset
index c948982e52..f65ff9e786 100644
--- a/data/assets/scene/solarsystem/planets/earth/layers/colorlayers/definitions/noaa20.asset
+++ b/data/assets/scene/solarsystem/planets/earth/layers/colorlayers/definitions/noaa20.asset
@@ -19,7 +19,6 @@ local Layer = {
   PadTiles = false
 }
 
-
 asset.export("Layer", Layer)
 
 
diff --git a/data/assets/scene/solarsystem/planets/earth/layers/colorlayers/definitions/noaa21.asset b/data/assets/scene/solarsystem/planets/earth/layers/colorlayers/definitions/noaa21.asset
index 200649673e..45f5807a23 100644
--- a/data/assets/scene/solarsystem/planets/earth/layers/colorlayers/definitions/noaa21.asset
+++ b/data/assets/scene/solarsystem/planets/earth/layers/colorlayers/definitions/noaa21.asset
@@ -19,7 +19,6 @@ local Layer = {
   PadTiles = false
 }
 
-
 asset.export("Layer", Layer)
 
 
diff --git a/data/assets/scene/solarsystem/planets/earth/layers/colorlayers/definitions/snpp.asset b/data/assets/scene/solarsystem/planets/earth/layers/colorlayers/definitions/snpp.asset
index 50b9648d00..d6656ff70c 100644
--- a/data/assets/scene/solarsystem/planets/earth/layers/colorlayers/definitions/snpp.asset
+++ b/data/assets/scene/solarsystem/planets/earth/layers/colorlayers/definitions/snpp.asset
@@ -19,7 +19,6 @@ local Layer = {
   PadTiles = false
 }
 
-
 asset.export("Layer", Layer)
 
 
diff --git a/data/assets/scene/solarsystem/planets/earth/layers/colorlayers/esri_world_imagery_wayback.asset b/data/assets/scene/solarsystem/planets/earth/layers/colorlayers/esri_world_imagery_wayback.asset
index 27fa8892d4..76e05aee71 100644
--- a/data/assets/scene/solarsystem/planets/earth/layers/colorlayers/esri_world_imagery_wayback.asset
+++ b/data/assets/scene/solarsystem/planets/earth/layers/colorlayers/esri_world_imagery_wayback.asset
@@ -99,7 +99,6 @@ local WaybackLayer20231207 = {
 }
 
 
-
 asset.onInitialize(function()
   openspace.globebrowsing.addLayer(globe.Earth.Identifier, "ColorLayers", WaybackLayer20140220)
   openspace.globebrowsing.addLayer(globe.Earth.Identifier, "ColorLayers", WaybackLayer20150430)
diff --git a/data/assets/scene/solarsystem/planets/earth/magnetosphere/magnetosphere.asset b/data/assets/scene/solarsystem/planets/earth/magnetosphere/magnetosphere.asset
index 13bf2172bc..6bf4588ed2 100644
--- a/data/assets/scene/solarsystem/planets/earth/magnetosphere/magnetosphere.asset
+++ b/data/assets/scene/solarsystem/planets/earth/magnetosphere/magnetosphere.asset
@@ -11,6 +11,7 @@ local fieldlinesDirectory = asset.resource({
   Version = 1
 })
 
+
 local EarthMagnetosphere = {
   Identifier = "EarthMagnetosphere",
   Parent = transforms.GSMReferenceFrame.Identifier,
diff --git a/data/assets/scene/solarsystem/planets/earth/magnetosphere/transforms_magnetosphere.asset b/data/assets/scene/solarsystem/planets/earth/magnetosphere/transforms_magnetosphere.asset
index fb5be33d4f..b169211d78 100644
--- a/data/assets/scene/solarsystem/planets/earth/magnetosphere/transforms_magnetosphere.asset
+++ b/data/assets/scene/solarsystem/planets/earth/magnetosphere/transforms_magnetosphere.asset
@@ -5,6 +5,7 @@ local coreKernels = asset.require("spice/core")
 
 local GSMKernel = asset.resource("../kernels/GSM.ti")
 
+
 local Frame = {
   GSM = "GSM" -- Geocentric Solar Magnetospheric
 }
diff --git a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/Apollo_15_Metric_Cam_DEM.asset b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/Apollo_15_Metric_Cam_DEM.asset
index e145e3b6ec..aea2431c0e 100644
--- a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/Apollo_15_Metric_Cam_DEM.asset
+++ b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/Apollo_15_Metric_Cam_DEM.asset
@@ -6,6 +6,8 @@
 
 local globeIdentifier = asset.require("scene/solarsystem//planets/earth/moon/moon").Moon.Identifier
 
+
+
 local treks_Apollo15_MetricCam_ClrShade_Global_1024ppd = {
   Identifier = "Apollo15_MetricCam_ClrShade_Global_1024ppd",
   Name = [[Apollo 15 Metric Cam DEM, ColorHillshade]],
@@ -38,6 +40,7 @@ local treks_Apollo15_MetricCam_Shade_Global_1024ppd = {
   Description = [[]]
 }
 
+
 asset.onInitialize(function()
   openspace.globebrowsing.addLayer(globeIdentifier, "ColorLayers", treks_Apollo15_MetricCam_ClrShade_Global_1024ppd)
   openspace.globebrowsing.addLayer(globeIdentifier, "ColorLayers", treks_Apollo15_MetricCam_ClrConf_Global_1024ppd)
@@ -58,6 +61,7 @@ asset.export("Apollo15_MetricCam_Gray_Global_1024ppd", treks_Apollo15_MetricCam_
 asset.export("Apollo15_MetricCam_Shade_Global_1024ppd", treks_Apollo15_MetricCam_Shade_Global_1024ppd)
 
 
+
 asset.meta = {
   Name = [[NASA Treks Layers for Moon Apollo_15_Metric_Cam_DEM]],
   Author = "NASA/Treks",
diff --git a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/Apollo_15_Pan_Cam_DEM.asset b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/Apollo_15_Pan_Cam_DEM.asset
index be463708d6..8c08136de2 100644
--- a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/Apollo_15_Pan_Cam_DEM.asset
+++ b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/Apollo_15_Pan_Cam_DEM.asset
@@ -6,6 +6,8 @@
 
 local globeIdentifier = asset.require("scene/solarsystem//planets/earth/moon/moon").Moon.Identifier
 
+
+
 local treks_Apollo15_PanCam_ClrShade_25N311E_5mp = {
   Identifier = "Apollo15_PanCam_ClrShade_25N311E_5mp",
   Name = [[Apollo 15 Pan Cam DEM, Aristarchus Plateau 1, ColorHillshade]],
@@ -30,6 +32,7 @@ local treks_Apollo15_PanCam_ClrShade_19S129E_5mp = {
   Description = [[]]
 }
 
+
 asset.onInitialize(function()
   openspace.globebrowsing.addLayer(globeIdentifier, "ColorLayers", treks_Apollo15_PanCam_ClrShade_25N311E_5mp)
   openspace.globebrowsing.addLayer(globeIdentifier, "ColorLayers", treks_Apollo15_PanCam_ClrShade_28N307E_3mp)
@@ -47,6 +50,7 @@ asset.export("Apollo15_PanCam_ClrShade_28N307E_3mp", treks_Apollo15_PanCam_ClrSh
 asset.export("Apollo15_PanCam_ClrShade_19S129E_5mp", treks_Apollo15_PanCam_ClrShade_19S129E_5mp)
 
 
+
 asset.meta = {
   Name = [[NASA Treks Layers for Moon Apollo_15_Pan_Cam_DEM]],
   Author = "NASA/Treks",
diff --git a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/Apollo_15_Pan_Cam_Image_Mosaic.asset b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/Apollo_15_Pan_Cam_Image_Mosaic.asset
index b878c0589e..b5940572c1 100644
--- a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/Apollo_15_Pan_Cam_Image_Mosaic.asset
+++ b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/Apollo_15_Pan_Cam_Image_Mosaic.asset
@@ -6,6 +6,8 @@
 
 local globeIdentifier = asset.require("scene/solarsystem//planets/earth/moon/moon").Moon.Identifier
 
+
+
 local treks_Apollo15_PanCam_Mosaic_25N311E_150cmp = {
   Identifier = "Apollo15_PanCam_Mosaic_25N311E_150cmp",
   Name = [[Apollo 15 Pan Cam Image Mosaic, Aristarchus Plateau 1]],
@@ -30,6 +32,7 @@ local treks_Apollo15_PanCam_Mosaic_19S129E_2mp = {
   Description = [[]]
 }
 
+
 asset.onInitialize(function()
   openspace.globebrowsing.addLayer(globeIdentifier, "ColorLayers", treks_Apollo15_PanCam_Mosaic_25N311E_150cmp)
   openspace.globebrowsing.addLayer(globeIdentifier, "ColorLayers", treks_Apollo15_PanCam_Mosaic_28N307E_1mp)
@@ -47,6 +50,7 @@ asset.export("Apollo15_PanCam_Mosaic_28N307E_1mp", treks_Apollo15_PanCam_Mosaic_
 asset.export("Apollo15_PanCam_Mosaic_19S129E_2mp", treks_Apollo15_PanCam_Mosaic_19S129E_2mp)
 
 
+
 asset.meta = {
   Name = [[NASA Treks Layers for Moon Apollo_15_Pan_Cam_Image_Mosaic]],
   Author = "NASA/Treks",
diff --git a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/Apollo_16_Metric_Cam_DEM.asset b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/Apollo_16_Metric_Cam_DEM.asset
index 62f6f338ba..9d74660154 100644
--- a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/Apollo_16_Metric_Cam_DEM.asset
+++ b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/Apollo_16_Metric_Cam_DEM.asset
@@ -6,6 +6,8 @@
 
 local globeIdentifier = asset.require("scene/solarsystem//planets/earth/moon/moon").Moon.Identifier
 
+
+
 local treks_Apollo16_MetricCam_ClrConf_Global_1024ppd = {
   Identifier = "Apollo16_MetricCam_ClrConf_Global_1024ppd",
   Name = [[Apollo 16 Metric Cam DEM, Colorized Confidence]],
@@ -30,6 +32,7 @@ local treks_Apollo16_MetricCam_Shade_Global_1024ppd = {
   Description = [[]]
 }
 
+
 asset.onInitialize(function()
   openspace.globebrowsing.addLayer(globeIdentifier, "ColorLayers", treks_Apollo16_MetricCam_ClrConf_Global_1024ppd)
   openspace.globebrowsing.addLayer(globeIdentifier, "ColorLayers", treks_Apollo16_MetricCam_Gray_Global_1024ppd)
@@ -47,6 +50,7 @@ asset.export("Apollo16_MetricCam_Gray_Global_1024ppd", treks_Apollo16_MetricCam_
 asset.export("Apollo16_MetricCam_Shade_Global_1024ppd", treks_Apollo16_MetricCam_Shade_Global_1024ppd)
 
 
+
 asset.meta = {
   Name = [[NASA Treks Layers for Moon Apollo_16_Metric_Cam_DEM]],
   Author = "NASA/Treks",
diff --git a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/Apollo_17_Metric_Cam_DEM.asset b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/Apollo_17_Metric_Cam_DEM.asset
index 8ad4eb1b59..e517f41b13 100644
--- a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/Apollo_17_Metric_Cam_DEM.asset
+++ b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/Apollo_17_Metric_Cam_DEM.asset
@@ -6,6 +6,8 @@
 
 local globeIdentifier = asset.require("scene/solarsystem//planets/earth/moon/moon").Moon.Identifier
 
+
+
 local treks_Apollo17_MetricCam_ClrShade_Global_1024ppd = {
   Identifier = "Apollo17_MetricCam_ClrShade_Global_1024ppd",
   Name = [[Apollo 17 Metric Cam DEM, ColorHillshade]],
@@ -22,6 +24,7 @@ local treks_Apollo17_MetricCam_Gray_Global_1024ppd = {
   Description = [[]]
 }
 
+
 asset.onInitialize(function()
   openspace.globebrowsing.addLayer(globeIdentifier, "ColorLayers", treks_Apollo17_MetricCam_ClrShade_Global_1024ppd)
   openspace.globebrowsing.addLayer(globeIdentifier, "ColorLayers", treks_Apollo17_MetricCam_Gray_Global_1024ppd)
@@ -36,6 +39,7 @@ asset.export("Apollo17_MetricCam_ClrShade_Global_1024ppd", treks_Apollo17_Metric
 asset.export("Apollo17_MetricCam_Gray_Global_1024ppd", treks_Apollo17_MetricCam_Gray_Global_1024ppd)
 
 
+
 asset.meta = {
   Name = [[NASA Treks Layers for Moon Apollo_17_Metric_Cam_DEM],
   Author = "NASA/Treks",
diff --git a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/Apollo_Zone_Metric_Cam.asset b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/Apollo_Zone_Metric_Cam.asset
index 40887e2587..8d456e27ad 100644
--- a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/Apollo_Zone_Metric_Cam.asset
+++ b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/Apollo_Zone_Metric_Cam.asset
@@ -6,6 +6,8 @@
 
 local globeIdentifier = asset.require("scene/solarsystem//planets/earth/moon/moon").Moon.Identifier
 
+
+
 local treks_ApolloZone_MetricCam_Shade_Global_1024ppd = {
   Identifier = "ApolloZone_MetricCam_Shade_Global_1024ppd",
   Name = [[Apollo Zone Metric Cam, Hillshade]],
@@ -14,6 +16,7 @@ local treks_ApolloZone_MetricCam_Shade_Global_1024ppd = {
   Description = [[]]
 }
 
+
 asset.onInitialize(function()
   openspace.globebrowsing.addLayer(globeIdentifier, "ColorLayers", treks_ApolloZone_MetricCam_Shade_Global_1024ppd)
 end)
@@ -25,6 +28,7 @@ end)
 asset.export("ApolloZone_MetricCam_Shade_Global_1024ppd", treks_ApolloZone_MetricCam_Shade_Global_1024ppd)
 
 
+
 asset.meta = {
   Name = [[NASA Treks Layers for Moon Apollo_Zone_Metric_Cam]],
   Author = "NASA/Treks",
diff --git a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/Apollo_Zone_Metric_Cam_DEM.asset b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/Apollo_Zone_Metric_Cam_DEM.asset
index 59792e47d6..59fe56c6b0 100644
--- a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/Apollo_Zone_Metric_Cam_DEM.asset
+++ b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/Apollo_Zone_Metric_Cam_DEM.asset
@@ -6,6 +6,8 @@
 
 local globeIdentifier = asset.require("scene/solarsystem//planets/earth/moon/moon").Moon.Identifier
 
+
+
 local treks_ApolloZone_MetricCam_ClrShade_Global_1024ppd = {
   Identifier = "ApolloZone_MetricCam_ClrShade_Global_1024ppd",
   Name = [[Apollo Zone Metric Cam DEM, ColorHillshade]],
@@ -14,6 +16,7 @@ local treks_ApolloZone_MetricCam_ClrShade_Global_1024ppd = {
   Description = [[]]
 }
 
+
 asset.onInitialize(function()
   openspace.globebrowsing.addLayer(globeIdentifier, "ColorLayers", treks_ApolloZone_MetricCam_ClrShade_Global_1024ppd)
 end)
@@ -25,6 +28,7 @@ end)
 asset.export("ApolloZone_MetricCam_ClrShade_Global_1024ppd", treks_ApolloZone_MetricCam_ClrShade_Global_1024ppd)
 
 
+
 asset.meta = {
   Name = [[NASA Treks Layers for Moon Apollo_Zone_Metric_Cam_DEM]],
   Author = "NASA/Treks",
diff --git a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/Global.asset b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/Global.asset
index 746e644fa2..123fc56510 100644
--- a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/Global.asset
+++ b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/Global.asset
@@ -6,6 +6,8 @@
 
 local globeIdentifier = asset.require("scene/solarsystem//planets/earth/moon/moon").Moon.Identifier
 
+
+
 local treks_Apollo15_MetricCam_Mosaic_Global_4096ppd = {
   Identifier = "Apollo15_MetricCam_Mosaic_Global_4096ppd",
   Name = [[Apollo 15 Metric Cam Image Mosaic]],
@@ -164,6 +166,7 @@ local treks_LRO_LOLA_Illumination_SPole65S_240m_EQ = {
   Description = [[This data product is a map of the permanently shadowed regions (PSRs) in the lunar South Pole. The map resolution is 240m/pix by 240m/pix, true at the pole in polar stereographic (spherical) projection. The calculations are based on the LOLA elevation map LDEM_75S_240M and are described in. The values are binary, indicating whether a pixel is in permanent shadow (1) or not (0, NoDATA).]]
 }
 
+
 asset.onInitialize(function()
   openspace.globebrowsing.addLayer(globeIdentifier, "ColorLayers", treks_Apollo15_MetricCam_Mosaic_Global_4096ppd)
   openspace.globebrowsing.addLayer(globeIdentifier, "ColorLayers", treks_Apollo17_MetricCam_Mosaic_Global_3033ppd)
@@ -229,6 +232,7 @@ asset.export("LRO_LOLA_Illumination_NPole65N_240m_EQ", treks_LRO_LOLA_Illuminati
 asset.export("LRO_LOLA_Illumination_SPole65S_240m_EQ", treks_LRO_LOLA_Illumination_SPole65S_240m_EQ)
 
 
+
 asset.meta = {
   Name = [[NASA Treks Layers for Moon Global]],
   Author = "NASA/Treks",
diff --git a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/Kaguya_LGM2011_Freeair_Gravity.asset b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/Kaguya_LGM2011_Freeair_Gravity.asset
index e3575ecaac..a888bd697f 100644
--- a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/Kaguya_LGM2011_Freeair_Gravity.asset
+++ b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/Kaguya_LGM2011_Freeair_Gravity.asset
@@ -6,6 +6,8 @@
 
 local globeIdentifier = asset.require("scene/solarsystem//planets/earth/moon/moon").Moon.Identifier
 
+
+
 local treks_Kaguya_LGM2011_FreeairGravity_Colorized_Global_mgal3m_20ppd = {
   Identifier = "Kaguya_LGM2011_FreeairGravity_Colorized_Global_mgal3m_20ppd",
   Name = [[Kaguya LGM2011 Freeair Gravity, Colorized]],
@@ -22,6 +24,7 @@ local treks_Kaguya_LGM2011_FreeairGravity_Gray_Global_mgal3m_20ppd = {
   Description = [[]]
 }
 
+
 asset.onInitialize(function()
   openspace.globebrowsing.addLayer(globeIdentifier, "ColorLayers", treks_Kaguya_LGM2011_FreeairGravity_Colorized_Global_mgal3m_20ppd)
   openspace.globebrowsing.addLayer(globeIdentifier, "ColorLayers", treks_Kaguya_LGM2011_FreeairGravity_Gray_Global_mgal3m_20ppd)
@@ -36,6 +39,7 @@ asset.export("Kaguya_LGM2011_FreeairGravity_Colorized_Global_mgal3m_20ppd", trek
 asset.export("Kaguya_LGM2011_FreeairGravity_Gray_Global_mgal3m_20ppd", treks_Kaguya_LGM2011_FreeairGravity_Gray_Global_mgal3m_20ppd)
 
 
+
 asset.meta = {
   Name = [[NASA Treks Layers for Moon Kaguya_LGM2011_Freeair_Gravity]],
   Author = "NASA/Treks",
diff --git a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/Kaguya_LGM2011_Surface_Gravity.asset b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/Kaguya_LGM2011_Surface_Gravity.asset
index 6cfc20277a..8cfd6f674e 100644
--- a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/Kaguya_LGM2011_Surface_Gravity.asset
+++ b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/Kaguya_LGM2011_Surface_Gravity.asset
@@ -6,6 +6,8 @@
 
 local globeIdentifier = asset.require("scene/solarsystem//planets/earth/moon/moon").Moon.Identifier
 
+
+
 local treks_Kaguya_LGM2011_SurfaceGravity_Colorized_Global_mgal3m_20ppd = {
   Identifier = "Kaguya_LGM2011_SurfaceGravity_Colorized_Global_mgal3m_20ppd",
   Name = [[Kaguya LGM2011 Surface Gravity, Colorized]],
@@ -22,6 +24,7 @@ local treks_Kaguya_LGM2011_SurfaceGravity_Gray_Global_mgal3m_20ppd = {
   Description = [[]]
 }
 
+
 asset.onInitialize(function()
   openspace.globebrowsing.addLayer(globeIdentifier, "ColorLayers", treks_Kaguya_LGM2011_SurfaceGravity_Colorized_Global_mgal3m_20ppd)
   openspace.globebrowsing.addLayer(globeIdentifier, "ColorLayers", treks_Kaguya_LGM2011_SurfaceGravity_Gray_Global_mgal3m_20ppd)
@@ -36,6 +39,7 @@ asset.export("Kaguya_LGM2011_SurfaceGravity_Colorized_Global_mgal3m_20ppd", trek
 asset.export("Kaguya_LGM2011_SurfaceGravity_Gray_Global_mgal3m_20ppd", treks_Kaguya_LGM2011_SurfaceGravity_Gray_Global_mgal3m_20ppd)
 
 
+
 asset.meta = {
   Name = [[NASA Treks Layers for Moon Kaguya_LGM2011_Surface_Gravity]],
   Author = "NASA/Treks",
diff --git a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LOLA_Roughness_16ppd.asset b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LOLA_Roughness_16ppd.asset
index 7df2bc27e8..af32c41ece 100644
--- a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LOLA_Roughness_16ppd.asset
+++ b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LOLA_Roughness_16ppd.asset
@@ -6,6 +6,8 @@
 
 local globeIdentifier = asset.require("scene/solarsystem//planets/earth/moon/moon").Moon.Identifier
 
+
+
 local treks_LRO_LOLA_ClrRoughness_Global_16ppd = {
   Identifier = "LRO_LOLA_ClrRoughness_Global_16ppd",
   Name = [[LOLA Roughness 16ppd, Colorized]],
@@ -14,6 +16,7 @@ local treks_LRO_LOLA_ClrRoughness_Global_16ppd = {
   Description = [[]]
 }
 
+
 asset.onInitialize(function()
   openspace.globebrowsing.addLayer(globeIdentifier, "ColorLayers", treks_LRO_LOLA_ClrRoughness_Global_16ppd)
 end)
@@ -25,6 +28,7 @@ end)
 asset.export("LRO_LOLA_ClrRoughness_Global_16ppd", treks_LRO_LOLA_ClrRoughness_Global_16ppd)
 
 
+
 asset.meta = {
   Name = [[NASA Treks Layers for Moon LOLA_Roughness_16ppd]],
   Author = "NASA/Treks",
diff --git a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LOLA_Slope_16ppd.asset b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LOLA_Slope_16ppd.asset
index fadff404ca..4098fe058a 100644
--- a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LOLA_Slope_16ppd.asset
+++ b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LOLA_Slope_16ppd.asset
@@ -6,6 +6,8 @@
 
 local globeIdentifier = asset.require("scene/solarsystem//planets/earth/moon/moon").Moon.Identifier
 
+
+
 local treks_LRO_LOLA_ClrSlope_Global_16ppd = {
   Identifier = "LRO_LOLA_ClrSlope_Global_16ppd",
   Name = [[LOLA Slope 16ppd, Colorized]],
@@ -14,6 +16,7 @@ local treks_LRO_LOLA_ClrSlope_Global_16ppd = {
   Description = [[]]
 }
 
+
 asset.onInitialize(function()
   openspace.globebrowsing.addLayer(globeIdentifier, "ColorLayers", treks_LRO_LOLA_ClrSlope_Global_16ppd)
 end)
@@ -25,6 +28,7 @@ end)
 asset.export("LRO_LOLA_ClrSlope_Global_16ppd", treks_LRO_LOLA_ClrSlope_Global_16ppd)
 
 
+
 asset.meta = {
   Name = [[NASA Treks Layers for Moon LOLA_Slope_16ppd]],
   Author = "NASA/Treks",
diff --git a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LOLA_Slope_Northpole_120m.asset b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LOLA_Slope_Northpole_120m.asset
index 6040f37c0e..e773fca8c6 100644
--- a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LOLA_Slope_Northpole_120m.asset
+++ b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LOLA_Slope_Northpole_120m.asset
@@ -6,6 +6,8 @@
 
 local globeIdentifier = asset.require("scene/solarsystem//planets/earth/moon/moon").Moon.Identifier
 
+
+
 local treks_LRO_LOLA_ClrSlope_NPole75N_120m_EQ = {
   Identifier = "LRO_LOLA_ClrSlope_NPole75N_120m_EQ",
   Name = [[LOLA Slope Northpole 120m, Colorized]],
@@ -14,6 +16,7 @@ local treks_LRO_LOLA_ClrSlope_NPole75N_120m_EQ = {
   Description = [[This is a colorized map of the original north polar surface slope of the Moon at a resolution of 16 m/pix by 16 m/pix, based on altimetry data acquired by the LOLA instrument. The LOLA Laser 1 and 2 data through mission phase LRO_SM_17 are the source for this data set. The bi-directional slope was calculated from a plane fit to three successive laser shots requiring n=5 to 15 profile returns. Depending on orbital velocity, probability of detection, and spacecraft altitude, the slope baseline may vary from 30 to 120 meters.]]
 }
 
+
 asset.onInitialize(function()
   openspace.globebrowsing.addLayer(globeIdentifier, "ColorLayers", treks_LRO_LOLA_ClrSlope_NPole75N_120m_EQ)
 end)
@@ -25,6 +28,7 @@ end)
 asset.export("LRO_LOLA_ClrSlope_NPole75N_120m_EQ", treks_LRO_LOLA_ClrSlope_NPole75N_120m_EQ)
 
 
+
 asset.meta = {
   Name = [[NASA Treks Layers for Moon LOLA_Slope_Northpole_120m]],
   Author = "NASA/Treks",
diff --git a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LOLA_Slope_Southpole_120m.asset b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LOLA_Slope_Southpole_120m.asset
index 94c4cc2340..61d77fc204 100644
--- a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LOLA_Slope_Southpole_120m.asset
+++ b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LOLA_Slope_Southpole_120m.asset
@@ -6,6 +6,8 @@
 
 local globeIdentifier = asset.require("scene/solarsystem//planets/earth/moon/moon").Moon.Identifier
 
+
+
 local treks_LRO_LOLA_ClrSlope_SPole75S_120m_EQ = {
   Identifier = "LRO_LOLA_ClrSlope_SPole75S_120m_EQ",
   Name = [[LOLA Slope Southpole 120m, Colorized]],
@@ -14,6 +16,7 @@ local treks_LRO_LOLA_ClrSlope_SPole75S_120m_EQ = {
   Description = [[This is a colorized map of the original south polar surface slope of the Moon at a resolution of 16 m/pix by 16 m/pix, based on altimetry data acquired by the LOLA instrument. The LOLA Laser 1 and 2 data through mission phase LRO_SM_17 are the source for this data set. The bi-directional slope was calculated from a plane fit to three successive laser shots requiring n=5 to 15 profile returns. Depending on orbital velocity, probability of detection, and spacecraft altitude, the slope baseline may vary from 30 to 120 meters.]]
 }
 
+
 asset.onInitialize(function()
   openspace.globebrowsing.addLayer(globeIdentifier, "ColorLayers", treks_LRO_LOLA_ClrSlope_SPole75S_120m_EQ)
 end)
@@ -25,6 +28,7 @@ end)
 asset.export("LRO_LOLA_ClrSlope_SPole75S_120m_EQ", treks_LRO_LOLA_ClrSlope_SPole75S_120m_EQ)
 
 
+
 asset.meta = {
   Name = [[NASA Treks Layers for Moon LOLA_Slope_Southpole_120m]],
   Author = "NASA/Treks",
diff --git a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LOLA_and_TC_Stereo_DEM_Merge_512ppd.asset b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LOLA_and_TC_Stereo_DEM_Merge_512ppd.asset
index 5b129cd0a5..087b865b46 100644
--- a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LOLA_and_TC_Stereo_DEM_Merge_512ppd.asset
+++ b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LOLA_and_TC_Stereo_DEM_Merge_512ppd.asset
@@ -6,6 +6,8 @@
 
 local globeIdentifier = asset.require("scene/solarsystem//planets/earth/moon/moon").Moon.Identifier
 
+
+
 local treks_LRO_LrocKaguya_Shade_60N60S_512ppd = {
   Identifier = "LRO_LrocKaguya_Shade_60N60S_512ppd",
   Name = [[LOLA and TC Stereo DEM Merge 512ppd, Shade]],
@@ -14,6 +16,7 @@ local treks_LRO_LrocKaguya_Shade_60N60S_512ppd = {
   Description = [[]]
 }
 
+
 asset.onInitialize(function()
   openspace.globebrowsing.addLayer(globeIdentifier, "ColorLayers", treks_LRO_LrocKaguya_Shade_60N60S_512ppd)
 end)
@@ -25,6 +28,7 @@ end)
 asset.export("LRO_LrocKaguya_Shade_60N60S_512ppd", treks_LRO_LrocKaguya_Shade_60N60S_512ppd)
 
 
+
 asset.meta = {
   Name = [[NASA Treks Layers for Moon LOLA_and_TC_Stereo_DEM_Merge_512ppd]],
   Author = "NASA/Treks",
diff --git a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LROC_NAC_Uncontrolled_Mosaic_of_Region_Inside_Schrodinger_Crater.asset b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LROC_NAC_Uncontrolled_Mosaic_of_Region_Inside_Schrodinger_Crater.asset
index 5c7d5e370b..0f5a316a3d 100644
--- a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LROC_NAC_Uncontrolled_Mosaic_of_Region_Inside_Schrodinger_Crater.asset
+++ b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LROC_NAC_Uncontrolled_Mosaic_of_Region_Inside_Schrodinger_Crater.asset
@@ -6,6 +6,8 @@
 
 local globeIdentifier = asset.require("scene/solarsystem//planets/earth/moon/moon").Moon.Identifier
 
+
+
 local treks_SchrodingerMareNortheq = {
   Identifier = "SchrodingerMareNortheq",
   Name = [[LROC NAC Uncontrolled Mosaic of Region Inside Schrodinger Crater, 50cm/px]],
@@ -14,6 +16,7 @@ local treks_SchrodingerMareNortheq = {
   Description = [[This is a 50cm/px uncontrolled visible image mosaic generated using Lunar Reconnaissance Orbiter Camera (LROC) Narrow Angle Camera (NAC) images from the Lunar Reconnaissance Orbiter mission. Each NAC image was registered horizontally to the LRO's Lunar Orbiter Laser Altimeter (LOLA) global DEM, and then mosaicked together and color balanced.]]
 }
 
+
 asset.onInitialize(function()
   openspace.globebrowsing.addLayer(globeIdentifier, "ColorLayers", treks_SchrodingerMareNortheq)
 end)
@@ -25,6 +28,7 @@ end)
 asset.export("SchrodingerMareNortheq", treks_SchrodingerMareNortheq)
 
 
+
 asset.meta = {
   Name = [[NASA Treks Layers for Moon LROC_NAC_Uncontrolled_Mosaic_of_Region_Inside_Schrodinger_Crater]],
   Author = "NASA/Treks",
diff --git a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LROC_NAC_Uncontrolled_Mosaic_of_Schrodinger_Crater.asset b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LROC_NAC_Uncontrolled_Mosaic_of_Schrodinger_Crater.asset
index 27488b71b4..79c92db21d 100644
--- a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LROC_NAC_Uncontrolled_Mosaic_of_Schrodinger_Crater.asset
+++ b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LROC_NAC_Uncontrolled_Mosaic_of_Schrodinger_Crater.asset
@@ -6,6 +6,8 @@
 
 local globeIdentifier = asset.require("scene/solarsystem//planets/earth/moon/moon").Moon.Identifier
 
+
+
 local treks_allSchrodinger_10mV10eq = {
   Identifier = "allSchrodinger_10mV10eq",
   Name = [[LROC NAC Uncontrolled Mosaic of Schrodinger Crater, 10m/px]],
@@ -14,6 +16,7 @@ local treks_allSchrodinger_10mV10eq = {
   Description = [[This is a 10m/px uncontrolled visible image mosaic generated using Lunar Reconnaissance Orbiter Camera (LROC) Narrow Angle Camera (NAC) images from the Lunar Reconnaissance Orbiter mission. Each NAC image was registered horizontally to the LRO's Lunar Orbiter Laser Altimeter (LOLA) global DEM, and then mosaicked together and color balanced.]]
 }
 
+
 asset.onInitialize(function()
   openspace.globebrowsing.addLayer(globeIdentifier, "ColorLayers", treks_allSchrodinger_10mV10eq)
 end)
@@ -25,6 +28,7 @@ end)
 asset.export("allSchrodinger_10mV10eq", treks_allSchrodinger_10mV10eq)
 
 
+
 asset.meta = {
   Name = [[NASA Treks Layers for Moon LROC_NAC_Uncontrolled_Mosaic_of_Schrodinger_Crater]],
   Author = "NASA/Treks",
diff --git a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_Diviner_CF_Mosaic.asset b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_Diviner_CF_Mosaic.asset
index 6f9b0e1dee..0ca5945888 100644
--- a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_Diviner_CF_Mosaic.asset
+++ b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_Diviner_CF_Mosaic.asset
@@ -6,6 +6,8 @@
 
 local globeIdentifier = asset.require("scene/solarsystem//planets/earth/moon/moon").Moon.Identifier
 
+
+
 local treks_LRO_Diviner_CF_Filled_Global_8ppd = {
   Identifier = "LRO_Diviner_CF_Filled_Global_8ppd",
   Name = [[LRO Diviner CF Mosaic, Filled]],
@@ -14,6 +16,7 @@ local treks_LRO_Diviner_CF_Filled_Global_8ppd = {
   Description = [[]]
 }
 
+
 asset.onInitialize(function()
   openspace.globebrowsing.addLayer(globeIdentifier, "ColorLayers", treks_LRO_Diviner_CF_Filled_Global_8ppd)
 end)
@@ -25,6 +28,7 @@ end)
 asset.export("LRO_Diviner_CF_Filled_Global_8ppd", treks_LRO_Diviner_CF_Filled_Global_8ppd)
 
 
+
 asset.meta = {
   Name = [[NASA Treks Layers for Moon LRO_Diviner_CF_Mosaic]],
   Author = "NASA/Treks",
diff --git a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_Diviner_CF_Mosaic_128ppd.asset b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_Diviner_CF_Mosaic_128ppd.asset
index 956e457f5b..5efd441828 100644
--- a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_Diviner_CF_Mosaic_128ppd.asset
+++ b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_Diviner_CF_Mosaic_128ppd.asset
@@ -6,6 +6,8 @@
 
 local globeIdentifier = asset.require("scene/solarsystem//planets/earth/moon/moon").Moon.Identifier
 
+
+
 local treks_LRO_DIVINER_ClrCF_Global_128ppd = {
   Identifier = "LRO_DIVINER_ClrCF_Global_128ppd",
   Name = [[LRO Diviner CF Mosaic 128ppd, Colorized]],
@@ -14,6 +16,7 @@ local treks_LRO_DIVINER_ClrCF_Global_128ppd = {
   Description = [[]]
 }
 
+
 asset.onInitialize(function()
   openspace.globebrowsing.addLayer(globeIdentifier, "ColorLayers", treks_LRO_DIVINER_ClrCF_Global_128ppd)
 end)
@@ -25,6 +28,7 @@ end)
 asset.export("LRO_DIVINER_ClrCF_Global_128ppd", treks_LRO_DIVINER_ClrCF_Global_128ppd)
 
 
+
 asset.meta = {
   Name = [[NASA Treks Layers for Moon LRO_Diviner_CF_Mosaic_128ppd]],
   Author = "NASA/Treks",
diff --git a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_Diviner_Surface_Temp_Avg.asset b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_Diviner_Surface_Temp_Avg.asset
index 2d8c2bcce9..e28d43ba39 100644
--- a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_Diviner_Surface_Temp_Avg.asset
+++ b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_Diviner_Surface_Temp_Avg.asset
@@ -6,6 +6,8 @@
 
 local globeIdentifier = asset.require("scene/solarsystem//planets/earth/moon/moon").Moon.Identifier
 
+
+
 local treks_LRO_Diviner_ST_Avg_Clr_Global_32ppd = {
   Identifier = "LRO_Diviner_ST_Avg_Clr_Global_32ppd",
   Name = [[LRO Diviner Surface Temp Avg, Color]],
@@ -14,6 +16,7 @@ local treks_LRO_Diviner_ST_Avg_Clr_Global_32ppd = {
   Description = [[]]
 }
 
+
 asset.onInitialize(function()
   openspace.globebrowsing.addLayer(globeIdentifier, "ColorLayers", treks_LRO_Diviner_ST_Avg_Clr_Global_32ppd)
 end)
@@ -25,6 +28,7 @@ end)
 asset.export("LRO_Diviner_ST_Avg_Clr_Global_32ppd", treks_LRO_Diviner_ST_Avg_Clr_Global_32ppd)
 
 
+
 asset.meta = {
   Name = [[NASA Treks Layers for Moon LRO_Diviner_Surface_Temp_Avg]],
   Author = "NASA/Treks",
diff --git a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_Diviner_Surface_Temp_Normal_Avg.asset b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_Diviner_Surface_Temp_Normal_Avg.asset
index ee4d7da9af..61ef22e1d4 100644
--- a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_Diviner_Surface_Temp_Normal_Avg.asset
+++ b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_Diviner_Surface_Temp_Normal_Avg.asset
@@ -6,6 +6,8 @@
 
 local globeIdentifier = asset.require("scene/solarsystem//planets/earth/moon/moon").Moon.Identifier
 
+
+
 local treks_LRO_Diviner_STN_Avg_Clr_Global_32ppd = {
   Identifier = "LRO_Diviner_STN_Avg_Clr_Global_32ppd",
   Name = [[LRO Diviner Surface Temp Normal Avg, Color]],
@@ -14,6 +16,7 @@ local treks_LRO_Diviner_STN_Avg_Clr_Global_32ppd = {
   Description = [[]]
 }
 
+
 asset.onInitialize(function()
   openspace.globebrowsing.addLayer(globeIdentifier, "ColorLayers", treks_LRO_Diviner_STN_Avg_Clr_Global_32ppd)
 end)
@@ -25,6 +28,7 @@ end)
 asset.export("LRO_Diviner_STN_Avg_Clr_Global_32ppd", treks_LRO_Diviner_STN_Avg_Clr_Global_32ppd)
 
 
+
 asset.meta = {
   Name = [[NASA Treks Layers for Moon LRO_Diviner_Surface_Temp_Normal_Avg]],
   Author = "NASA/Treks",
diff --git a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_Diviner_Surface_Temperature_Mosaic_128ppd.asset b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_Diviner_Surface_Temperature_Mosaic_128ppd.asset
index e76af03887..52315d6b92 100644
--- a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_Diviner_Surface_Temperature_Mosaic_128ppd.asset
+++ b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_Diviner_Surface_Temperature_Mosaic_128ppd.asset
@@ -6,6 +6,8 @@
 
 local globeIdentifier = asset.require("scene/solarsystem//planets/earth/moon/moon").Moon.Identifier
 
+
+
 local treks_LRO_DIVINER_ClrRockFreeSurfaceTemp_Global_128ppd = {
   Identifier = "LRO_DIVINER_ClrRockFreeSurfaceTemp_Global_128ppd",
   Name = [[LRO Diviner Surface Temperature Mosaic 128ppd, Colorized]],
@@ -14,6 +16,7 @@ local treks_LRO_DIVINER_ClrRockFreeSurfaceTemp_Global_128ppd = {
   Description = [[]]
 }
 
+
 asset.onInitialize(function()
   openspace.globebrowsing.addLayer(globeIdentifier, "ColorLayers", treks_LRO_DIVINER_ClrRockFreeSurfaceTemp_Global_128ppd)
 end)
@@ -25,6 +28,7 @@ end)
 asset.export("LRO_DIVINER_ClrRockFreeSurfaceTemp_Global_128ppd", treks_LRO_DIVINER_ClrRockFreeSurfaceTemp_Global_128ppd)
 
 
+
 asset.meta = {
   Name = [[NASA Treks Layers for Moon LRO_Diviner_Surface_Temperature_Mosaic_128ppd]],
   Author = "NASA/Treks",
diff --git a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LOLA_DEM.asset b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LOLA_DEM.asset
index 4c5c65a4e1..11a67102de 100644
--- a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LOLA_DEM.asset
+++ b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LOLA_DEM.asset
@@ -6,6 +6,8 @@
 
 local globeIdentifier = asset.require("scene/solarsystem//planets/earth/moon/moon").Moon.Identifier
 
+
+
 local treks_LRO_LOLA_ClrShade_Global_128ppd_v04 = {
   Identifier = "LRO_LOLA_ClrShade_Global_128ppd_v04",
   Name = [[LRO LOLA DEM, ColorHillshade]],
@@ -62,6 +64,7 @@ local treks_LRO_LOLA_ClrShade_SPole875_5mp_v04_EQ = {
   Description = [[This is version 4 of the LRO LOLA South Pole 87.5 deg DEM, ColorHillshade. This is a colorized shaded-relief of a original polar LOLA Digital Elevation Model (DEM). The DEM is a shape map (radius) of the Moon at a resolution 100 meters per pixel, based on altimetry data acquired through Spetember 2011 by the LOLA instrument. The ground tracks were interpolated using the Generic Mapping Tools programs "surface" and "grdblend". Map values are referred to a radius of 1737400 m.]]
 }
 
+
 asset.onInitialize(function()
   openspace.globebrowsing.addLayer(globeIdentifier, "ColorLayers", treks_LRO_LOLA_ClrShade_Global_128ppd_v04)
   openspace.globebrowsing.addLayer(globeIdentifier, "ColorLayers", treks_LRO_LOLA_ClrShade_Global_256ppd_v06)
@@ -91,6 +94,7 @@ asset.export("LRO_LOLA_ClrShade_NPole875_5mp_v04_EQ", treks_LRO_LOLA_ClrShade_NP
 asset.export("LRO_LOLA_ClrShade_SPole875_5mp_v04_EQ", treks_LRO_LOLA_ClrShade_SPole875_5mp_v04_EQ)
 
 
+
 asset.meta = {
   Name = [[NASA Treks Layers for Moon LRO_LOLA_DEM]],
   Author = "NASA/Treks",
diff --git a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Crater_Abundance.asset b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Crater_Abundance.asset
index fb7bcc4ac6..4761e4c52e 100644
--- a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Crater_Abundance.asset
+++ b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Crater_Abundance.asset
@@ -6,6 +6,8 @@
 
 local globeIdentifier = asset.require("scene/solarsystem//planets/earth/moon/moon").Moon.Identifier
 
+
+
 local treks_LRO_NAC_CratAbnd_17S173E_150cmp = {
   Identifier = "LRO_NAC_CratAbnd_17S173E_150cmp",
   Name = [[LRO LROC Crater Abundance, Aitken Crater]],
@@ -190,6 +192,7 @@ local treks_LRO_NAC_CratAbnd_43S349E_150cmp = {
   Description = [[]]
 }
 
+
 asset.onInitialize(function()
   openspace.globebrowsing.addLayer(globeIdentifier, "ColorLayers", treks_LRO_NAC_CratAbnd_17S173E_150cmp)
   openspace.globebrowsing.addLayer(globeIdentifier, "ColorLayers", treks_LRO_NAC_CratAbnd_13S358E_2mp)
@@ -267,6 +270,7 @@ asset.export("LRO_NAC_CratAbnd_20N010E_2mp", treks_LRO_NAC_CratAbnd_20N010E_2mp)
 asset.export("LRO_NAC_CratAbnd_43S349E_150cmp", treks_LRO_NAC_CratAbnd_43S349E_150cmp)
 
 
+
 asset.meta = {
   Name = [[NASA Treks Layers for Moon LRO_LROC_Crater_Abundance]],
   Author = "NASA/Treks",
diff --git a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Crater_Abundance_Hazard.asset b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Crater_Abundance_Hazard.asset
index 283c649c11..aa6b876da6 100644
--- a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Crater_Abundance_Hazard.asset
+++ b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Crater_Abundance_Hazard.asset
@@ -6,6 +6,8 @@
 
 local globeIdentifier = asset.require("scene/solarsystem//planets/earth/moon/moon").Moon.Identifier
 
+
+
 local treks_LRO_NAC_CratAbndHaz_17S173E_150cmp = {
   Identifier = "LRO_NAC_CratAbndHaz_17S173E_150cmp",
   Name = [[LRO LROC Crater Abundance Hazard, Aitken Crater]],
@@ -190,6 +192,7 @@ local treks_LRO_NAC_CratAbndHaz_43S349E_150cmp = {
   Description = [[]]
 }
 
+
 asset.onInitialize(function()
   openspace.globebrowsing.addLayer(globeIdentifier, "ColorLayers", treks_LRO_NAC_CratAbndHaz_17S173E_150cmp)
   openspace.globebrowsing.addLayer(globeIdentifier, "ColorLayers", treks_LRO_NAC_CratAbndHaz_13S358E_2mp)
@@ -267,6 +270,7 @@ asset.export("LRO_NAC_CratAbndHaz_20N010E_2mp", treks_LRO_NAC_CratAbndHaz_20N010
 asset.export("LRO_NAC_CratAbndHaz_43S349E_150cmp", treks_LRO_NAC_CratAbndHaz_43S349E_150cmp)
 
 
+
 asset.meta = {
   Name = [[NASA Treks Layers for Moon LRO_LROC_Crater_Abundance_Hazard]],
   Author = "NASA/Treks",
diff --git a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Crater_Density.asset b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Crater_Density.asset
index d4c7b7accd..3eb1d16a1f 100644
--- a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Crater_Density.asset
+++ b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Crater_Density.asset
@@ -6,6 +6,8 @@
 
 local globeIdentifier = asset.require("scene/solarsystem//planets/earth/moon/moon").Moon.Identifier
 
+
+
 local treks_LRO_NAC_CratDen_17S173E_150cmp = {
   Identifier = "LRO_NAC_CratDen_17S173E_150cmp",
   Name = [[LRO LROC Crater Density, Aitken Crater]],
@@ -190,6 +192,7 @@ local treks_LRO_NAC_CratDen_43S349E_150cmp = {
   Description = [[]]
 }
 
+
 asset.onInitialize(function()
   openspace.globebrowsing.addLayer(globeIdentifier, "ColorLayers", treks_LRO_NAC_CratDen_17S173E_150cmp)
   openspace.globebrowsing.addLayer(globeIdentifier, "ColorLayers", treks_LRO_NAC_CratDen_13S358E_2mp)
@@ -267,6 +270,7 @@ asset.export("LRO_NAC_CratDen_20N010E_2mp", treks_LRO_NAC_CratDen_20N010E_2mp)
 asset.export("LRO_NAC_CratDen_43S349E_150cmp", treks_LRO_NAC_CratDen_43S349E_150cmp)
 
 
+
 asset.meta = {
   Name = [[NASA Treks Layers for Moon LRO_LROC_Crater_Density]],
   Author = "NASA/Treks",
diff --git a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Crater_Density_Hazard.asset b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Crater_Density_Hazard.asset
index 43913b5d68..572af75530 100644
--- a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Crater_Density_Hazard.asset
+++ b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Crater_Density_Hazard.asset
@@ -6,6 +6,8 @@
 
 local globeIdentifier = asset.require("scene/solarsystem//planets/earth/moon/moon").Moon.Identifier
 
+
+
 local treks_LRO_NAC_CratDenHaz_17S173E_150cmp = {
   Identifier = "LRO_NAC_CratDenHaz_17S173E_150cmp",
   Name = [[LRO LROC Crater Density Hazard, Aitken Crater]],
@@ -190,6 +192,7 @@ local treks_LRO_NAC_CratDenHaz_43S349E_150cmp = {
   Description = [[]]
 }
 
+
 asset.onInitialize(function()
   openspace.globebrowsing.addLayer(globeIdentifier, "ColorLayers", treks_LRO_NAC_CratDenHaz_17S173E_150cmp)
   openspace.globebrowsing.addLayer(globeIdentifier, "ColorLayers", treks_LRO_NAC_CratDenHaz_13S358E_2mp)
@@ -267,6 +270,7 @@ asset.export("LRO_NAC_CratDenHaz_20N010E_2mp", treks_LRO_NAC_CratDenHaz_20N010E_
 asset.export("LRO_NAC_CratDenHaz_43S349E_150cmp", treks_LRO_NAC_CratDenHaz_43S349E_150cmp)
 
 
+
 asset.meta = {
   Name = [[NASA Treks Layers for Moon LRO_LROC_Crater_Density_Hazard]],
   Author = "NASA/Treks",
diff --git a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_DEM.asset b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_DEM.asset
index 7aff2c1b6a..6f036e2175 100644
--- a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_DEM.asset
+++ b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_DEM.asset
@@ -6,6 +6,8 @@
 
 local globeIdentifier = asset.require("scene/solarsystem//planets/earth/moon/moon").Moon.Identifier
 
+
+
 local treks_LRO_NAC_ClrRoughness_15m_17S173E_150cmp = {
   Identifier = "LRO_NAC_ClrRoughness_15m_17S173E_150cmp",
   Name = [[LRO LROC DEM, Aitken Crater, 15m Color Roughness]],
@@ -350,6 +352,7 @@ local treks_LRO_NAC_ClrRoughness_15m_43S349E_150cmp = {
   Description = [[]]
 }
 
+
 asset.onInitialize(function()
   openspace.globebrowsing.addLayer(globeIdentifier, "ColorLayers", treks_LRO_NAC_ClrRoughness_15m_17S173E_150cmp)
   openspace.globebrowsing.addLayer(globeIdentifier, "ColorLayers", treks_LRO_NAC_ClrRoughness_15m_13S358E_2mp)
@@ -487,6 +490,7 @@ asset.export("LRO_NAC_ClrRoughness_15m_19S129E_150cmp", treks_LRO_NAC_ClrRoughne
 asset.export("LRO_NAC_ClrRoughness_15m_43S349E_150cmp", treks_LRO_NAC_ClrRoughness_15m_43S349E_150cmp)
 
 
+
 asset.meta = {
   Name = [[NASA Treks Layers for Moon LRO_LROC_DEM]],
   Author = "NASA/Treks",
diff --git a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Image_Mosaic.asset b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Image_Mosaic.asset
index 3d7d93f52e..15a593e4b1 100644
--- a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Image_Mosaic.asset
+++ b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Image_Mosaic.asset
@@ -6,6 +6,8 @@
 
 local globeIdentifier = asset.require("scene/solarsystem//planets/earth/moon/moon").Moon.Identifier
 
+
+
 local treks_LRO_NAC_Mosaic_17S173E_50cmp = {
   Identifier = "LRO_NAC_Mosaic_17S173E_50cmp",
   Name = [[LRO LROC Image Mosaic, Aitken Crater]],
@@ -278,6 +280,7 @@ local treks_LRO_NAC_Mosaic_43S349E_50cmp = {
   Description = [[]]
 }
 
+
 asset.onInitialize(function()
   openspace.globebrowsing.addLayer(globeIdentifier, "ColorLayers", treks_LRO_NAC_Mosaic_17S173E_50cmp)
   openspace.globebrowsing.addLayer(globeIdentifier, "ColorLayers", treks_LRO_NAC_Mosaic_13S358E_50cmp)
@@ -388,6 +391,7 @@ asset.export("LRO_NAC_Mosaic_19S129E_50cmp", treks_LRO_NAC_Mosaic_19S129E_50cmp)
 asset.export("LRO_NAC_Mosaic_43S349E_50cmp", treks_LRO_NAC_Mosaic_43S349E_50cmp)
 
 
+
 asset.meta = {
   Name = [[NASA Treks Layers for Moon LRO_LROC_Image_Mosaic]],
   Author = "NASA/Treks",
diff --git a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Image_Mosaic_26cm.asset b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Image_Mosaic_26cm.asset
index 416f353f03..a6658993a5 100644
--- a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Image_Mosaic_26cm.asset
+++ b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Image_Mosaic_26cm.asset
@@ -6,6 +6,8 @@
 
 local globeIdentifier = asset.require("scene/solarsystem//planets/earth/moon/moon").Moon.Identifier
 
+
+
 local treks_apollo11_26cm_mosaic_byte_geo_1_2_highContrast = {
   Identifier = "apollo11_26cm_mosaic_byte_geo_1_2_highContrast",
   Name = [[LRO LROC Image Mosaic 26cm, Apollo 11]],
@@ -14,6 +16,7 @@ local treks_apollo11_26cm_mosaic_byte_geo_1_2_highContrast = {
   Description = [[]]
 }
 
+
 asset.onInitialize(function()
   openspace.globebrowsing.addLayer(globeIdentifier, "ColorLayers", treks_apollo11_26cm_mosaic_byte_geo_1_2_highContrast)
 end)
@@ -25,6 +28,7 @@ end)
 asset.export("apollo11_26cm_mosaic_byte_geo_1_2_highContrast", treks_apollo11_26cm_mosaic_byte_geo_1_2_highContrast)
 
 
+
 asset.meta = {
   Name = [[NASA Treks Layers for Moon LRO_LROC_Image_Mosaic_26cm]],
   Author = "NASA/Treks",
diff --git a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Image_Mosaic_28cm.asset b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Image_Mosaic_28cm.asset
index c3f0910886..86b7affc5d 100644
--- a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Image_Mosaic_28cm.asset
+++ b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Image_Mosaic_28cm.asset
@@ -6,6 +6,8 @@
 
 local globeIdentifier = asset.require("scene/solarsystem//planets/earth/moon/moon").Moon.Identifier
 
+
+
 local treks_apollo14_28cm_mosaic_byte_geo_1_2_highContrast = {
   Identifier = "apollo14_28cm_mosaic_byte_geo_1_2_highContrast",
   Name = [[LRO LROC Image Mosaic 28cm, Apollo 14]],
@@ -14,6 +16,7 @@ local treks_apollo14_28cm_mosaic_byte_geo_1_2_highContrast = {
   Description = [[]]
 }
 
+
 asset.onInitialize(function()
   openspace.globebrowsing.addLayer(globeIdentifier, "ColorLayers", treks_apollo14_28cm_mosaic_byte_geo_1_2_highContrast)
 end)
@@ -25,6 +28,7 @@ end)
 asset.export("apollo14_28cm_mosaic_byte_geo_1_2_highContrast", treks_apollo14_28cm_mosaic_byte_geo_1_2_highContrast)
 
 
+
 asset.meta = {
   Name = [[NASA Treks Layers for Moon LRO_LROC_Image_Mosaic_28cm]],
   Author = "NASA/Treks",
diff --git a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Mosaic.asset b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Mosaic.asset
index 63d579dd7b..3df8953539 100644
--- a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Mosaic.asset
+++ b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Mosaic.asset
@@ -6,6 +6,8 @@
 
 local globeIdentifier = asset.require("scene/solarsystem//planets/earth/moon/moon").Moon.Identifier
 
+
+
 local treks_LRO_NAC_Mosaic_03N280E_70cm = {
   Identifier = "LRO_NAC_Mosaic_03N280E_70cm",
   Name = [[LRO LROC Mosaic, Fresh Crater East of Lents]],
@@ -14,6 +16,7 @@ local treks_LRO_NAC_Mosaic_03N280E_70cm = {
   Description = [[]]
 }
 
+
 asset.onInitialize(function()
   openspace.globebrowsing.addLayer(globeIdentifier, "ColorLayers", treks_LRO_NAC_Mosaic_03N280E_70cm)
 end)
@@ -25,6 +28,7 @@ end)
 asset.export("LRO_NAC_Mosaic_03N280E_70cm", treks_LRO_NAC_Mosaic_03N280E_70cm)
 
 
+
 asset.meta = {
   Name = [[NASA Treks Layers for Moon LRO_LROC_Mosaic]],
   Author = "NASA/Treks",
diff --git a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_NAC_Image_Mosaic.asset b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_NAC_Image_Mosaic.asset
index 6d47c51747..1448d2bfbc 100644
--- a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_NAC_Image_Mosaic.asset
+++ b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_NAC_Image_Mosaic.asset
@@ -6,6 +6,8 @@
 
 local globeIdentifier = asset.require("scene/solarsystem//planets/earth/moon/moon").Moon.Identifier
 
+
+
 local treks_LRO_NAC_AvgMosaic_NPole855_1mp_EQ = {
   Identifier = "LRO_NAC_AvgMosaic_NPole855_1mp_EQ",
   Name = [[LRO LROC NAC Image Mosaic, N Pole, Avg Merge]],
@@ -22,6 +24,7 @@ local treks_LRO_NAC_AvgMosaic_SPole855_1mp_EQ = {
   Description = [[This is a visible image mosaic generated using Lunar Reconnaissance Orbiter Camera (LROC) Narrow Angle Camera (NAC) images from the Lunar Reconnaissance Orbiter mission. The images were orthorectified using LRO's Lunar Orbiter Laser Altimeter (LOLA) polar 5 meter/pixel DEM. The mosaic is generated at half the resolution at which the individual LROC NAC images were gathered, which is approximately 0.5 meters/pixel. The mosaic was registered horizontally to the LOLA global DEM.]]
 }
 
+
 asset.onInitialize(function()
   openspace.globebrowsing.addLayer(globeIdentifier, "ColorLayers", treks_LRO_NAC_AvgMosaic_NPole855_1mp_EQ)
   openspace.globebrowsing.addLayer(globeIdentifier, "ColorLayers", treks_LRO_NAC_AvgMosaic_SPole855_1mp_EQ)
@@ -36,6 +39,7 @@ asset.export("LRO_NAC_AvgMosaic_NPole855_1mp_EQ", treks_LRO_NAC_AvgMosaic_NPole8
 asset.export("LRO_NAC_AvgMosaic_SPole855_1mp_EQ", treks_LRO_NAC_AvgMosaic_SPole855_1mp_EQ)
 
 
+
 asset.meta = {
   Name = [[NASA Treks Layers for Moon LRO_LROC_NAC_Image_Mosaic]],
   Author = "NASA/Treks",
diff --git a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Rock_Abundance.asset b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Rock_Abundance.asset
index 4240d25182..60b5b50712 100644
--- a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Rock_Abundance.asset
+++ b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Rock_Abundance.asset
@@ -6,6 +6,8 @@
 
 local globeIdentifier = asset.require("scene/solarsystem//planets/earth/moon/moon").Moon.Identifier
 
+
+
 local treks_LRO_NAC_RockAbnd_17S173E_150cmp = {
   Identifier = "LRO_NAC_RockAbnd_17S173E_150cmp",
   Name = [[LRO LROC Rock Abundance, Aitken Crater]],
@@ -190,6 +192,7 @@ local treks_LRO_NAC_RockAbnd_43S349E_150cmp = {
   Description = [[]]
 }
 
+
 asset.onInitialize(function()
   openspace.globebrowsing.addLayer(globeIdentifier, "ColorLayers", treks_LRO_NAC_RockAbnd_17S173E_150cmp)
   openspace.globebrowsing.addLayer(globeIdentifier, "ColorLayers", treks_LRO_NAC_RockAbnd_13S358E_2mp)
@@ -267,6 +270,7 @@ asset.export("LRO_NAC_RockAbnd_20N010E_2mp", treks_LRO_NAC_RockAbnd_20N010E_2mp)
 asset.export("LRO_NAC_RockAbnd_43S349E_150cmp", treks_LRO_NAC_RockAbnd_43S349E_150cmp)
 
 
+
 asset.meta = {
   Name = [[NASA Treks Layers for Moon LRO_LROC_Rock_Abundance]],
   Author = "NASA/Treks",
diff --git a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Rock_Abundance_Hazard.asset b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Rock_Abundance_Hazard.asset
index 87b502da24..1adcbafd4d 100644
--- a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Rock_Abundance_Hazard.asset
+++ b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Rock_Abundance_Hazard.asset
@@ -6,6 +6,8 @@
 
 local globeIdentifier = asset.require("scene/solarsystem//planets/earth/moon/moon").Moon.Identifier
 
+
+
 local treks_LRO_NAC_RockAbndHaz_17S173E_150cmp = {
   Identifier = "LRO_NAC_RockAbndHaz_17S173E_150cmp",
   Name = [[LRO LROC Rock Abundance Hazard, Aitken Crater]],
@@ -190,6 +192,7 @@ local treks_LRO_NAC_RockAbndHaz_43S349E_150cmp = {
   Description = [[]]
 }
 
+
 asset.onInitialize(function()
   openspace.globebrowsing.addLayer(globeIdentifier, "ColorLayers", treks_LRO_NAC_RockAbndHaz_17S173E_150cmp)
   openspace.globebrowsing.addLayer(globeIdentifier, "ColorLayers", treks_LRO_NAC_RockAbndHaz_13S358E_2mp)
@@ -267,6 +270,7 @@ asset.export("LRO_NAC_RockAbndHaz_20N010E_2mp", treks_LRO_NAC_RockAbndHaz_20N010
 asset.export("LRO_NAC_RockAbndHaz_43S349E_150cmp", treks_LRO_NAC_RockAbndHaz_43S349E_150cmp)
 
 
+
 asset.meta = {
   Name = [[NASA Treks Layers for Moon LRO_LROC_Rock_Abundance_Hazard]],
   Author = "NASA/Treks",
diff --git a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Rock_Density.asset b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Rock_Density.asset
index 7212a13050..4f0a61c05c 100644
--- a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Rock_Density.asset
+++ b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Rock_Density.asset
@@ -6,6 +6,8 @@
 
 local globeIdentifier = asset.require("scene/solarsystem//planets/earth/moon/moon").Moon.Identifier
 
+
+
 local treks_LRO_NAC_RockDen_17S173E_150cmp = {
   Identifier = "LRO_NAC_RockDen_17S173E_150cmp",
   Name = [[LRO LROC Rock Density, Aitken Crater]],
@@ -198,6 +200,7 @@ local treks_LRO_NAC_RockDen_43S349E_150cmp = {
   Description = [[]]
 }
 
+
 asset.onInitialize(function()
   openspace.globebrowsing.addLayer(globeIdentifier, "ColorLayers", treks_LRO_NAC_RockDen_17S173E_150cmp)
   openspace.globebrowsing.addLayer(globeIdentifier, "ColorLayers", treks_LRO_NAC_RockDen_13S358E_2mp)
@@ -278,6 +281,7 @@ asset.export("LRO_NAC_RockDen_20N010E_2mp", treks_LRO_NAC_RockDen_20N010E_2mp)
 asset.export("LRO_NAC_RockDen_43S349E_150cmp", treks_LRO_NAC_RockDen_43S349E_150cmp)
 
 
+
 asset.meta = {
   Name = [[NASA Treks Layers for Moon LRO_LROC_Rock_Density]],
   Author = "NASA/Treks",
diff --git a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Rock_Density_Hazard.asset b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Rock_Density_Hazard.asset
index c1066b99b7..5e004a06de 100644
--- a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Rock_Density_Hazard.asset
+++ b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Rock_Density_Hazard.asset
@@ -6,6 +6,8 @@
 
 local globeIdentifier = asset.require("scene/solarsystem//planets/earth/moon/moon").Moon.Identifier
 
+
+
 local treks_LRO_NAC_RockDenHaz_13S358E_2mp = {
   Identifier = "LRO_NAC_RockDenHaz_13S358E_2mp",
   Name = [[LRO LROC Rock Density Hazard, Alphonsus Crater]],
@@ -182,6 +184,7 @@ local treks_LRO_NAC_RockDenHaz_43S349E_150cmp = {
   Description = [[]]
 }
 
+
 asset.onInitialize(function()
   openspace.globebrowsing.addLayer(globeIdentifier, "ColorLayers", treks_LRO_NAC_RockDenHaz_13S358E_2mp)
   openspace.globebrowsing.addLayer(globeIdentifier, "ColorLayers", treks_LRO_NAC_RockDenHaz_73N350E_150cmp)
@@ -256,6 +259,7 @@ asset.export("LRO_NAC_RockDenHaz_20N010E_2mp", treks_LRO_NAC_RockDenHaz_20N010E_
 asset.export("LRO_NAC_RockDenHaz_43S349E_150cmp", treks_LRO_NAC_RockDenHaz_43S349E_150cmp)
 
 
+
 asset.meta = {
   Name = [[NASA Treks Layers for Moon LRO_LROC_Rock_Density_Hazard]],
   Author = "NASA/Treks",
diff --git a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_Laser_Altimeter.asset b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_Laser_Altimeter.asset
index 3e082882a9..d126e5599f 100644
--- a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_Laser_Altimeter.asset
+++ b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_Laser_Altimeter.asset
@@ -6,6 +6,8 @@
 
 local globeIdentifier = asset.require("scene/solarsystem//planets/earth/moon/moon").Moon.Identifier
 
+
+
 local treks_ldam_10 = {
   Identifier = "ldam_10",
   Name = [[LRO Laser Altimeter, Albedo Global]],
@@ -14,6 +16,7 @@ local treks_ldam_10 = {
   Description = [[The Lunar Orbiter Laser Altimeter (LOLA) experiment on Lunar Reconnaissance Orbiter (LRO) is a laser altimeter that also measures the strength of the return pulse from the lunar surface. These data have been used to estimate the reflectance (albedo) of the lunar surface, including regions lacking direct solar illumination. A new calibration of these data was used to generate a 2016 albedo map that features lower uncertainties overall and more consistent results in the polar regions than the previous 2014 version. (Improved calibration of reflectance data from the LRO Lunar Orbiter Laser Altimeter (LOLA) and implications for space weathering; M. Lemelin, P.G. Lucey, G.A. Neumann, E.M. Mazarico, M.K. Barker, A. Kakazu, D. Trang, D.E. Smith, M.T. Zuber; Icarus, Volume 273, 15 July 2016, Pages 315-328)]]
 }
 
+
 asset.onInitialize(function()
   openspace.globebrowsing.addLayer(globeIdentifier, "ColorLayers", treks_ldam_10)
 end)
@@ -25,6 +28,7 @@ end)
 asset.export("ldam_10", treks_ldam_10)
 
 
+
 asset.meta = {
   Name = [[NASA Treks Layers for Moon LRO_Laser_Altimeter]],
   Author = "NASA/Treks",
diff --git a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_Mini-RF_Circular_Polarization_Ratio.asset b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_Mini-RF_Circular_Polarization_Ratio.asset
index ec79095ba5..4441b6e064 100644
--- a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_Mini-RF_Circular_Polarization_Ratio.asset
+++ b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_Mini-RF_Circular_Polarization_Ratio.asset
@@ -6,6 +6,8 @@
 
 local globeIdentifier = asset.require("scene/solarsystem//planets/earth/moon/moon").Moon.Identifier
 
+
+
 local treks_LRO_MiniRF_CPR_Gray_Global_128ppd = {
   Identifier = "LRO_MiniRF_CPR_Gray_Global_128ppd",
   Name = [[LRO Mini-RF Circular Polarization Ratio, Grayscale]],
@@ -14,6 +16,7 @@ local treks_LRO_MiniRF_CPR_Gray_Global_128ppd = {
   Description = [[]]
 }
 
+
 asset.onInitialize(function()
   openspace.globebrowsing.addLayer(globeIdentifier, "ColorLayers", treks_LRO_MiniRF_CPR_Gray_Global_128ppd)
 end)
@@ -25,6 +28,7 @@ end)
 asset.export("LRO_MiniRF_CPR_Gray_Global_128ppd", treks_LRO_MiniRF_CPR_Gray_Global_128ppd)
 
 
+
 asset.meta = {
   Name = [[NASA Treks Layers for Moon LRO_Mini-RF_Circular_Polarization_Ratio]],
   Author = "NASA/Treks",
diff --git a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_NAC_ColorHillshade.asset b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_NAC_ColorHillshade.asset
index 662bec56db..a50a7f8fd3 100644
--- a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_NAC_ColorHillshade.asset
+++ b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_NAC_ColorHillshade.asset
@@ -6,6 +6,8 @@
 
 local globeIdentifier = asset.require("scene/solarsystem//planets/earth/moon/moon").Moon.Identifier
 
+
+
 local treks_20191118demmoseqccolorhillshade = {
   Identifier = "20191118demmoseqccolorhillshade",
   Name = [[LRO NAC ColorHillshade, Lacus Mortis]],
@@ -14,6 +16,7 @@ local treks_20191118demmoseqccolorhillshade = {
   Description = [[TBD]]
 }
 
+
 asset.onInitialize(function()
   openspace.globebrowsing.addLayer(globeIdentifier, "ColorLayers", treks_20191118demmoseqccolorhillshade)
 end)
@@ -25,6 +28,7 @@ end)
 asset.export("20191118demmoseqccolorhillshade", treks_20191118demmoseqccolorhillshade)
 
 
+
 asset.meta = {
   Name = [[NASA Treks Layers for Moon LRO_NAC_ColorHillshade]],
   Author = "NASA/Treks",
diff --git a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_NAC_Mosaic.asset b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_NAC_Mosaic.asset
index ac616fac1d..acd7264e32 100644
--- a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_NAC_Mosaic.asset
+++ b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_NAC_Mosaic.asset
@@ -6,6 +6,8 @@
 
 local globeIdentifier = asset.require("scene/solarsystem//planets/earth/moon/moon").Moon.Identifier
 
+
+
 local treks_20200415_lacusmortis_orthomos_filled_8bit_lzw = {
   Identifier = "20200415_lacusmortis_orthomos_filled_8bit_lzw",
   Name = [[LRO NAC Mosaic, Lacus Mortis, Extended Version]],
@@ -14,6 +16,7 @@ local treks_20200415_lacusmortis_orthomos_filled_8bit_lzw = {
   Description = [[This is an orthoimage mosaic produced by combining LROC NAC images, for the southwestern area of Lacus Mortis, including Rimae Bürg and the Lacus Mortis Pit. The images are projected onto a DEM mosaic produced by stereo reconstructions in which each of the images is paired with another LROC NAC.]]
 }
 
+
 asset.onInitialize(function()
   openspace.globebrowsing.addLayer(globeIdentifier, "ColorLayers", treks_20200415_lacusmortis_orthomos_filled_8bit_lzw)
 end)
@@ -25,6 +28,7 @@ end)
 asset.export("20200415_lacusmortis_orthomos_filled_8bit_lzw", treks_20200415_lacusmortis_orthomos_filled_8bit_lzw)
 
 
+
 asset.meta = {
   Name = [[NASA Treks Layers for Moon LRO_NAC_Mosaic]],
   Author = "NASA/Treks",
diff --git a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_NAC_Mosaic_0.5mpp.asset b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_NAC_Mosaic_0.5mpp.asset
index 1d9dd3333b..e5871ce7ea 100644
--- a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_NAC_Mosaic_0.5mpp.asset
+++ b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_NAC_Mosaic_0.5mpp.asset
@@ -6,6 +6,8 @@
 
 local globeIdentifier = asset.require("scene/solarsystem//planets/earth/moon/moon").Moon.Identifier
 
+
+
 local treks_LRO_NAC_Mosaic_50cmpp_VonKarman_v2 = {
   Identifier = "LRO_NAC_Mosaic_50cmpp_VonKarman_v2",
   Name = [[LRO NAC Mosaic 0.5mpp, Von Karman]],
@@ -14,6 +16,7 @@ local treks_LRO_NAC_Mosaic_50cmpp_VonKarman_v2 = {
   Description = [[This is an orthorectified NAC mosaic of the Von Karman Crater region for the south pole of the Moon. This mosaic includes a total of 370 orthorectified NAC images: 252 sampled at 0.5 m/px and 118 sampled at 1 m/px. NAC orthoimages have been constructed from EDRs downloaded from the Planetary Data System (PDS) and subsequent USGS-ISIS processing. This mosaic has been coaligned to Chang'e-2 20 m/px DEM which has been coaligned to the USGS 59 m/px LOLA-SELENE DEM using ENVI (v5.6.2) patented auto-coreg. Most of the area used stereo-photogrammetrically processing of LROC-NAC stereo-pairs with the UCL CASPGO 3D mapping system, CASP-GO is described in Tao, Y., Muller, J.-P. et al. (2018) Massive Stereo-based DTM Production for Mars on Cloud Computers. Planetary Space Science 154, 30-58 (2018). doi: 10.1016/j.pss.2018.02.012 and CASP-GO is now integrated into ASP (https://stereopipeline.readthedocs.io/en/latest/experimental.html?highlight=casp-go#the-casp-go-stereo-processing-system) as part of the NASA PDART program. Individual NAC orthoimages mosaicked together using ArcGIS Pro (v2.9.2). A color balancing algorithm has been applied to roughly correct for color differences at the seams of NAC images. This data has been made available by and should be credited to: Yu Tao and Jan-Peter Muller, Imaging Group, Mullard Space Science Laboratory, University College London.]]
 }
 
+
 asset.onInitialize(function()
   openspace.globebrowsing.addLayer(globeIdentifier, "ColorLayers", treks_LRO_NAC_Mosaic_50cmpp_VonKarman_v2)
 end)
@@ -25,6 +28,7 @@ end)
 asset.export("LRO_NAC_Mosaic_50cmpp_VonKarman_v2", treks_LRO_NAC_Mosaic_50cmpp_VonKarman_v2)
 
 
+
 asset.meta = {
   Name = [[NASA Treks Layers for Moon LRO_NAC_Mosaic_0.5mpp]],
   Author = "NASA/Treks",
diff --git a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_NAC_Mosaic_1mpp.asset b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_NAC_Mosaic_1mpp.asset
index 594e5d20be..5b6d6f2fb3 100644
--- a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_NAC_Mosaic_1mpp.asset
+++ b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_NAC_Mosaic_1mpp.asset
@@ -6,6 +6,8 @@
 
 local globeIdentifier = asset.require("scene/solarsystem//planets/earth/moon/moon").Moon.Identifier
 
+
+
 local treks_LRO_NAC_Mosaic_1mpp = {
   Identifier = "LRO_NAC_Mosaic_1mpp",
   Name = [[LRO NAC Mosaic 1mpp, Von Karman]],
@@ -14,6 +16,7 @@ local treks_LRO_NAC_Mosaic_1mpp = {
   Description = [[This is an orthorectified NAC mosaic of the Von Karman Crater region for the south pole of the Moon. This mosaic includes 118 individual orthorectified NAC images sampled at 1 m/px. NAC orthoimages have been constructed from EDRs downloaded from the Planetary Data System (PDS) and subsequent USGS-ISIS processing. This mosaic has been coaligned to Chang&rsquo;e 2 20 m/px DEM which has been coaligned to the USGS 59 m/px LOLA-SELENE DEM using ENVI (v5.6.2) patented auto-coreg. Individual NAC orthoimages have been mosaicked together using ArcGIS Pro (v2.9.0). A color balancing algorithm has been applied to roughly correct for color differences at the seams of NAC images. This data has been made available by and should be credited to: Yu Tao and Jan-Peter Muller, Imaging Group, Mullard Space Science Laboratory, University College London.]]
 }
 
+
 asset.onInitialize(function()
   openspace.globebrowsing.addLayer(globeIdentifier, "ColorLayers", treks_LRO_NAC_Mosaic_1mpp)
 end)
@@ -25,6 +28,7 @@ end)
 asset.export("LRO_NAC_Mosaic_1mpp", treks_LRO_NAC_Mosaic_1mpp)
 
 
+
 asset.meta = {
   Name = [[NASA Treks Layers for Moon LRO_NAC_Mosaic_1mpp]],
   Author = "NASA/Treks",
diff --git a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_NAC_PSR_Mosaic_20mpp.asset b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_NAC_PSR_Mosaic_20mpp.asset
index e8468a7ade..4d4ca5da2a 100644
--- a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_NAC_PSR_Mosaic_20mpp.asset
+++ b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_NAC_PSR_Mosaic_20mpp.asset
@@ -6,6 +6,8 @@
 
 local globeIdentifier = asset.require("scene/solarsystem//planets/earth/moon/moon").Moon.Identifier
 
+
+
 local treks_NAC_POLE_PSR_NORTH_STRETCH_EQ = {
   Identifier = "NAC_POLE_PSR_NORTH_STRETCH_EQ",
   Name = [[LRO NAC PSR Mosaic 20mpp, N Pole]],
@@ -22,6 +24,7 @@ local treks_NAC_POLE_PSR_SOUTH_STRETCH_EQ = {
   Description = [[This is an uncontrolled mosaic generated from images taken by the Narrow Angle Camera (NAC) onboard the Lunar Reconnaissance Orbiter (LRO) for the South Pole region of the Moon. The NAC mosaics have been trimmed to the Permanently Shadowed Region (PSR) shapefile, providing visible NAC image coverage of the PSRs only. Acquisition of NAC PSR observations were optimized over several campaigns to maximize signal-to-noise ratio (SNR), resulting in a comprehensive dataset that is systematically reviewed and analyzed. Observations are acquired at a variety of pixel scales (2 to 20 m/px). The final PSR mosaics are assembled from re-sampled images to 20 m/px, and ordering of images is based on image quality and areal coverage of individual PSRs. A total of 550 NAC images were used to create a South Pole PSR mosaic at 20 m/px, 90&deg; to 80&deg; latitude, and -180&deg; to 180&deg; longitude. This mosaic has been merged with the existing LROC NAC South Pole RDR product to replace over-saturated illuminated polar areas.]]
 }
 
+
 asset.onInitialize(function()
   openspace.globebrowsing.addLayer(globeIdentifier, "ColorLayers", treks_NAC_POLE_PSR_NORTH_STRETCH_EQ)
   openspace.globebrowsing.addLayer(globeIdentifier, "ColorLayers", treks_NAC_POLE_PSR_SOUTH_STRETCH_EQ)
@@ -36,6 +39,7 @@ asset.export("NAC_POLE_PSR_NORTH_STRETCH_EQ", treks_NAC_POLE_PSR_NORTH_STRETCH_E
 asset.export("NAC_POLE_PSR_SOUTH_STRETCH_EQ", treks_NAC_POLE_PSR_SOUTH_STRETCH_EQ)
 
 
+
 asset.meta = {
   Name = [[NASA Treks Layers for Moon LRO_NAC_PSR_Mosaic_20mpp]],
   Author = "NASA/Treks",
diff --git a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_NAC_and_CE-2_CCD_Mosaic_1mpp.asset b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_NAC_and_CE-2_CCD_Mosaic_1mpp.asset
index 28a4a8af70..072db19e9b 100644
--- a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_NAC_and_CE-2_CCD_Mosaic_1mpp.asset
+++ b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_NAC_and_CE-2_CCD_Mosaic_1mpp.asset
@@ -6,6 +6,8 @@
 
 local globeIdentifier = asset.require("scene/solarsystem//planets/earth/moon/moon").Moon.Identifier
 
+
+
 local treks_LRO_NAC_CE2_Mosaic_1mpp = {
   Identifier = "LRO_NAC_CE2_Mosaic_1mpp",
   Name = [[LRO NAC and CE-2 CCD Mosaic 1mpp, Von Karman]],
@@ -14,6 +16,7 @@ local treks_LRO_NAC_CE2_Mosaic_1mpp = {
   Description = [[This is an orthorectified NAC and Chang&rsquo;e-2 mosaic of the Von Karman Crater region for the south pole of the Moon. This mosaic includes 118 individual orthorectified NAC images sampled at 1 m/px and has been mosaicked on top of the respective Chang&rsquo;e 7 m/px orthomosaic. NAC orthoimages have been constructed from EDRs downloaded from the Planetary Data System (PDS) and subsequent USGS-ISIS processing. This mosaic has been coaligned to Chang&rsquo;e-2 20 m/px DEM which has been coaligned to the USGS 59 m/px LOLA-SELENE DEM using ENVI (v5.6.2) patented auto-coreg. Individual NAC orthoimages and the underlying Chang&rsquo;e ortho product have been mosaicked together using ArcGIS Pro (v2.9.0). A color balancing algorithm has been applied to roughly correct for color differences at the seams of NAC images. This data has been made available by and should be credited to: Yu Tao and Jan-Peter Muller, Imaging Group, Mullard Space Science Laboratory, University College London.]]
 }
 
+
 asset.onInitialize(function()
   openspace.globebrowsing.addLayer(globeIdentifier, "ColorLayers", treks_LRO_NAC_CE2_Mosaic_1mpp)
 end)
@@ -25,6 +28,7 @@ end)
 asset.export("LRO_NAC_CE2_Mosaic_1mpp", treks_LRO_NAC_CE2_Mosaic_1mpp)
 
 
+
 asset.meta = {
   Name = [[NASA Treks Layers for Moon LRO_NAC_and_CE-2_CCD_Mosaic_1mpp]],
   Author = "NASA/Treks",
diff --git a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_Narrow_Angle_Camera.asset b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_Narrow_Angle_Camera.asset
index b935c34b4e..4ca1d55652 100644
--- a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_Narrow_Angle_Camera.asset
+++ b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_Narrow_Angle_Camera.asset
@@ -6,6 +6,8 @@
 
 local globeIdentifier = asset.require("scene/solarsystem//planets/earth/moon/moon").Moon.Identifier
 
+
+
 local treks_LRO_NAC_Apollo11_Mosaic_p = {
   Identifier = "LRO_NAC_Apollo11_Mosaic_p",
   Name = [[LRO Narrow Angle Camera, Apollo 11 Landing Site]],
@@ -234,6 +236,7 @@ local treks_NAC_DTM_APOLLO17_SLOPE = {
   Description = [[This is a color slope map derived from a 5m Digital Terrain Model (DTM) of the Apollo 17 landing site created with Narrow Angle Camera (NAC) stereo image pairs from the Lunar Reconnaissance Orbiter Camera (LROC) aboard the Lunar Reconnaissance Orbiter (LRO). Image is 3-channel RGB TIFF, 8 bits/sample, 3 samples/pixel in single image plane configuration]]
 }
 
+
 asset.onInitialize(function()
   openspace.globebrowsing.addLayer(globeIdentifier, "ColorLayers", treks_LRO_NAC_Apollo11_Mosaic_p)
   openspace.globebrowsing.addLayer(globeIdentifier, "ColorLayers", treks_LRO_NAC_Apollo12_Mosaic_p)
@@ -317,6 +320,7 @@ asset.export("small_tranq_skylight_2", treks_small_tranq_skylight_2)
 asset.export("NAC_DTM_APOLLO17_SLOPE", treks_NAC_DTM_APOLLO17_SLOPE)
 
 
+
 asset.meta = {
   Name = [[NASA Treks Layers for Moon LRO_Narrow_Angle_Camera]],
   Author = "NASA/Treks",
diff --git a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_WAC-GLD100_DEM.asset b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_WAC-GLD100_DEM.asset
index a9d8553a85..78c5c10943 100644
--- a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_WAC-GLD100_DEM.asset
+++ b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_WAC-GLD100_DEM.asset
@@ -6,6 +6,8 @@
 
 local globeIdentifier = asset.require("scene/solarsystem//planets/earth/moon/moon").Moon.Identifier
 
+
+
 local treks_LRO_WACGLD100_Gray_79S79N_256ppd = {
   Identifier = "LRO_WACGLD100_Gray_79S79N_256ppd",
   Name = [[LRO WAC-GLD100 DEM, Grayscale]],
@@ -14,6 +16,7 @@ local treks_LRO_WACGLD100_Gray_79S79N_256ppd = {
   Description = [[]]
 }
 
+
 asset.onInitialize(function()
   openspace.globebrowsing.addLayer(globeIdentifier, "ColorLayers", treks_LRO_WACGLD100_Gray_79S79N_256ppd)
 end)
@@ -25,6 +28,7 @@ end)
 asset.export("LRO_WACGLD100_Gray_79S79N_256ppd", treks_LRO_WACGLD100_Gray_79S79N_256ppd)
 
 
+
 asset.meta = {
   Name = [[NASA Treks Layers for Moon LRO_WAC-GLD100_DEM]],
   Author = "NASA/Treks",
diff --git a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_WAC_GLD100_DEM.asset b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_WAC_GLD100_DEM.asset
index f75243f26a..2ae126aa57 100644
--- a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_WAC_GLD100_DEM.asset
+++ b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_WAC_GLD100_DEM.asset
@@ -6,6 +6,8 @@
 
 local globeIdentifier = asset.require("scene/solarsystem//planets/earth/moon/moon").Moon.Identifier
 
+
+
 local treks_LRO_WACGLD100_ClrShade_79S79N_256ppd = {
   Identifier = "LRO_WACGLD100_ClrShade_79S79N_256ppd",
   Name = [[LRO WAC GLD100 DEM, ColorHillShade]],
@@ -22,6 +24,7 @@ local treks_LRO_WACGLD100_Shade_79S79N_256ppd = {
   Description = [[]]
 }
 
+
 asset.onInitialize(function()
   openspace.globebrowsing.addLayer(globeIdentifier, "ColorLayers", treks_LRO_WACGLD100_ClrShade_79S79N_256ppd)
   openspace.globebrowsing.addLayer(globeIdentifier, "ColorLayers", treks_LRO_WACGLD100_Shade_79S79N_256ppd)
@@ -36,6 +39,7 @@ asset.export("LRO_WACGLD100_ClrShade_79S79N_256ppd", treks_LRO_WACGLD100_ClrShad
 asset.export("LRO_WACGLD100_Shade_79S79N_256ppd", treks_LRO_WACGLD100_Shade_79S79N_256ppd)
 
 
+
 asset.meta = {
   Name = [[NASA Treks Layers for Moon LRO_WAC_GLD100_DEM]],
   Author = "NASA/Treks",
diff --git a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_and_Kaguya_Multi_Instruments_1895.21mpp.asset b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_and_Kaguya_Multi_Instruments_1895.21mpp.asset
index e63b500a19..1e1d93ef26 100644
--- a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_and_Kaguya_Multi_Instruments_1895.21mpp.asset
+++ b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_and_Kaguya_Multi_Instruments_1895.21mpp.asset
@@ -6,6 +6,8 @@
 
 local globeIdentifier = asset.require("scene/solarsystem//planets/earth/moon/moon").Moon.Identifier
 
+
+
 local treks_3He_Dig_Here_Layer = {
   Identifier = "3He_Dig_Here_Layer",
   Name = [[LRO and Kaguya Multi Instruments 1895.21mpp, 3He Dig Here]],
@@ -46,6 +48,7 @@ local treks_3He_Very_Likely_Layer = {
   Description = [[This data represents potential Helium-3 deposits and other solar wind implanted volatiles on the Moon. This data layer has been generated by querying specific criteria from the following datasets: Titanium Oxide (TiO2) abundance from Lunar Reconnaissance Orbiter&rsquo;s (LRO) Wide-Angle Camera (WAC), Optical Maturity Index (OMAT) from Kaguya Lunar Multiband Imager (MI), slope from LRO&rsquo;s Lunar Orbital Laser Altimeter (LOLA), and Rock Abundance from LRO&rsquo;s Lunar Radiometer Experiment (DIVINER). For this &ldquo;Very Likely&rdquo; layer, the following criteria has been applied: TiO2 &gt; 6.0&percnt;, OMAT &lt; 0.20, Slope &lt; 12&deg;, and rock abundance &lt; 0.06&percnt;. The research on Helium-3 as a potential use for fuel for a fusion cell and the data presented as a result of this research culminated as an outcome of a group project at the Colorado School of Mines. The research for this data should be credited to: Stewart Ray, Colleen Olson, Lisa Robibero, Steven Coutts, and Maxwell Sissman of the Planetary and Terrestrial Mining Sciences Symposium and Space Resources Roundtable, Colorado School of Mines.]]
 }
 
+
 asset.onInitialize(function()
   openspace.globebrowsing.addLayer(globeIdentifier, "ColorLayers", treks_3He_Dig_Here_Layer)
   openspace.globebrowsing.addLayer(globeIdentifier, "ColorLayers", treks_3He_Likely_Layer)
@@ -69,6 +72,7 @@ asset.export("3He_Most_Likely_Layer", treks_3He_Most_Likely_Layer)
 asset.export("3He_Very_Likely_Layer", treks_3He_Very_Likely_Layer)
 
 
+
 asset.meta = {
   Name = [[NASA Treks Layers for Moon LRO_and_Kaguya_Multi_Instruments_1895.21mpp]],
   Author = "NASA/Treks",
diff --git a/data/assets/scene/solarsystem/planets/earth/satellites/communications/other_comm.asset b/data/assets/scene/solarsystem/planets/earth/satellites/communications/other_comm.asset
index dd9d8a7180..ab09abef8a 100644
--- a/data/assets/scene/solarsystem/planets/earth/satellites/communications/other_comm.asset
+++ b/data/assets/scene/solarsystem/planets/earth/satellites/communications/other_comm.asset
@@ -32,6 +32,7 @@ local OtherCommunicationSatellites = {
   }
 }
 
+
 asset.onInitialize(function()
   openspace.addSceneGraphNode(OtherCommunicationSatellites)
 end)
diff --git a/data/assets/scene/solarsystem/planets/earth/satellites/weather/planet.asset b/data/assets/scene/solarsystem/planets/earth/satellites/weather/planet.asset
index b28fe2cc53..c9148ea6a7 100644
--- a/data/assets/scene/solarsystem/planets/earth/satellites/weather/planet.asset
+++ b/data/assets/scene/solarsystem/planets/earth/satellites/weather/planet.asset
@@ -32,6 +32,7 @@ local PlanetSatellites = {
   }
 }
 
+
 asset.onInitialize(function()
   openspace.addSceneGraphNode(PlanetSatellites)
 end)
diff --git a/data/assets/scene/solarsystem/planets/jupiter/default_layers.asset b/data/assets/scene/solarsystem/planets/jupiter/default_layers.asset
index 31ad1ab6eb..6ba6b9bf7c 100644
--- a/data/assets/scene/solarsystem/planets/jupiter/default_layers.asset
+++ b/data/assets/scene/solarsystem/planets/jupiter/default_layers.asset
@@ -1,6 +1,7 @@
 asset.require("./layers/colorlayers/jupiter_texture", true)
 
 
+
 asset.meta = {
   Name = "Default Jupiter Layers",
   Description = "Default Jupiter layers are: Jupiter Texture",
diff --git a/data/assets/scene/solarsystem/planets/jupiter/europa/default_layers.asset b/data/assets/scene/solarsystem/planets/jupiter/europa/default_layers.asset
index a99800dbd1..b3f4f701d7 100644
--- a/data/assets/scene/solarsystem/planets/jupiter/europa/default_layers.asset
+++ b/data/assets/scene/solarsystem/planets/jupiter/europa/default_layers.asset
@@ -9,7 +9,6 @@ asset.meta = {
   Name = "Default Europa Layers",
   Description = [[Default Europa layers are: Europa Texture & Voyager Global Mosaic.
 
-
     Layers loaded from all available servers
   ]],
   Author = "OpenSpace Team",
diff --git a/data/assets/scene/solarsystem/planets/jupiter/europa/layers/colorlayers/voyager_global_mosaic_local.asset b/data/assets/scene/solarsystem/planets/jupiter/europa/layers/colorlayers/voyager_global_mosaic_local.asset
index c4f4c5244e..97781587b5 100644
--- a/data/assets/scene/solarsystem/planets/jupiter/europa/layers/colorlayers/voyager_global_mosaic_local.asset
+++ b/data/assets/scene/solarsystem/planets/jupiter/europa/layers/colorlayers/voyager_global_mosaic_local.asset
@@ -19,6 +19,7 @@ local Layer = {
   BlendMode = "Color"
 }
 
+
 asset.onInitialize(function()
   openspace.globebrowsing.addLayer(globe.Europa.Identifier, "ColorLayers", Layer)
 end)
diff --git a/data/assets/scene/solarsystem/planets/jupiter/europa/layers/local_layers.asset b/data/assets/scene/solarsystem/planets/jupiter/europa/layers/local_layers.asset
index 4a2fe473f1..c043b14dd3 100644
--- a/data/assets/scene/solarsystem/planets/jupiter/europa/layers/local_layers.asset
+++ b/data/assets/scene/solarsystem/planets/jupiter/europa/layers/local_layers.asset
@@ -7,7 +7,6 @@ asset.meta = {
   Name = "Default Europa Layers (Local)",
   Description = [[Default Europa layers are: Europa Texture & Voyager Global Mosaic.
 
-
     Layers only loaded locally
   ]],
   Author = "OpenSpace Team",
diff --git a/data/assets/scene/solarsystem/planets/jupiter/europa/layers/newyork_layers.asset b/data/assets/scene/solarsystem/planets/jupiter/europa/layers/newyork_layers.asset
index bdba5d78d2..13bef07189 100644
--- a/data/assets/scene/solarsystem/planets/jupiter/europa/layers/newyork_layers.asset
+++ b/data/assets/scene/solarsystem/planets/jupiter/europa/layers/newyork_layers.asset
@@ -7,7 +7,6 @@ asset.meta = {
   Name = "Default Europa Layers (New York)",
   Description = [[Default Europa layers are: Europa Texture & Voyager Global Mosaic.
 
-
     Layers only loaded from the New York server
   ]],
   Author = "OpenSpace Team",
diff --git a/data/assets/scene/solarsystem/planets/jupiter/europa/layers/sweden_layers.asset b/data/assets/scene/solarsystem/planets/jupiter/europa/layers/sweden_layers.asset
index 29809a8bb3..d1daae51d5 100644
--- a/data/assets/scene/solarsystem/planets/jupiter/europa/layers/sweden_layers.asset
+++ b/data/assets/scene/solarsystem/planets/jupiter/europa/layers/sweden_layers.asset
@@ -7,7 +7,6 @@ asset.meta = {
   Name = "Default Europa Layers (Sweden)",
   Description = [[Default Europa layers are: Europa Texture & Voyager Global Mosaic.
 
-
     Layers only loaded from the Sweden server
   ]],
   Author = "OpenSpace Team",
diff --git a/data/assets/scene/solarsystem/planets/jupiter/kernels.asset b/data/assets/scene/solarsystem/planets/jupiter/kernels.asset
index 11df00395a..da4665c9ba 100644
--- a/data/assets/scene/solarsystem/planets/jupiter/kernels.asset
+++ b/data/assets/scene/solarsystem/planets/jupiter/kernels.asset
@@ -36,6 +36,7 @@ asset.export("ID", ID)
 asset.export("Frame", Frame)
 
 
+
 asset.meta = {
   Name = "Jupiter Spice Kernels",
   Description = "Generic SPICE kernels for Jupiter",
diff --git a/data/assets/scene/solarsystem/planets/jupiter/minor/ananke_group.asset b/data/assets/scene/solarsystem/planets/jupiter/minor/ananke_group.asset
index af343c41f8..7c6e31f410 100644
--- a/data/assets/scene/solarsystem/planets/jupiter/minor/ananke_group.asset
+++ b/data/assets/scene/solarsystem/planets/jupiter/minor/ananke_group.asset
@@ -1745,6 +1745,7 @@ local S2003J12Label = {
   }
 }
 
+
 asset.onInitialize(function()
   openspace.addSceneGraphNode(S2010J2)
   openspace.addSceneGraphNode(S2010J2Trail)
diff --git a/data/assets/scene/solarsystem/planets/jupiter/minor/pasiphae_group.asset b/data/assets/scene/solarsystem/planets/jupiter/minor/pasiphae_group.asset
index 3737f36155..e31425a8f2 100644
--- a/data/assets/scene/solarsystem/planets/jupiter/minor/pasiphae_group.asset
+++ b/data/assets/scene/solarsystem/planets/jupiter/minor/pasiphae_group.asset
@@ -2288,6 +2288,7 @@ asset.export(S2003J23Trail)
 asset.export(S2003J23Label)
 
 
+
 asset.meta = {
   Name = "Jupiter Pasiphae Group Moons",
   Description = [[Procedural Globe asset containing Jupiter's Pasiphae Group moons:
diff --git a/data/assets/scene/solarsystem/planets/mars/layers/nasa-treks/MEX_HRSC.asset b/data/assets/scene/solarsystem/planets/mars/layers/nasa-treks/MEX_HRSC.asset
index 361de68b0e..81d17e3e2f 100644
--- a/data/assets/scene/solarsystem/planets/mars/layers/nasa-treks/MEX_HRSC.asset
+++ b/data/assets/scene/solarsystem/planets/mars/layers/nasa-treks/MEX_HRSC.asset
@@ -6,6 +6,8 @@
 
 local globeIdentifier = asset.require("scene/solarsystem//planets/mars/mars").Mars.Identifier
 
+
+
 local treks_hrsc_dem_martian_east = {
   Identifier = "hrsc_dem_martian_east",
   Name = [[MEX HRSC, Martian Path Eastern Section DEM]],
@@ -22,6 +24,7 @@ local treks_MC11E11_HRDTMAR_DA5 = {
   Description = [[This layer is a greyscale mosaic assembled using data from the High Resolution Stereo Camera aboard the European Space Agency's Mars Express orbiter. HRSC is being used to obtain color and stereo images that will map 100% of Mars' surface at resolution better than 30 m/pixel, and 50% of the surface at better than 15 m/pixel. Each of the nine CCD lines of HRSC, a linescan imager (pushbroom camera), contains 5184 pixels. The channels consist of red, green, blue, near-infrared, three stereo channels (backward, nadir, and forward) and two photometric channels. The digital elevation model used for this layer is a combination of data derived from the HRSC and the Mars Orbiter Laser Altimeter.]]
 }
 
+
 asset.onInitialize(function()
   openspace.globebrowsing.addLayer(globeIdentifier, "ColorLayers", treks_hrsc_dem_martian_east)
   openspace.globebrowsing.addLayer(globeIdentifier, "ColorLayers", treks_MC11E11_HRDTMAR_DA5)
@@ -36,6 +39,7 @@ asset.export("hrsc_dem_martian_east", treks_hrsc_dem_martian_east)
 asset.export("MC11E11_HRDTMAR_DA5", treks_MC11E11_HRDTMAR_DA5)
 
 
+
 asset.meta = {
   Name = [[NASA Treks Layers for Mars MEX_HRSC]],
   Author = "NASA/Treks",
diff --git a/data/assets/scene/solarsystem/planets/mars/layers/nasa-treks/MGS_MOC_Atlas.asset b/data/assets/scene/solarsystem/planets/mars/layers/nasa-treks/MGS_MOC_Atlas.asset
index 916faaca68..d90fc9ab41 100644
--- a/data/assets/scene/solarsystem/planets/mars/layers/nasa-treks/MGS_MOC_Atlas.asset
+++ b/data/assets/scene/solarsystem/planets/mars/layers/nasa-treks/MGS_MOC_Atlas.asset
@@ -6,6 +6,8 @@
 
 local globeIdentifier = asset.require("scene/solarsystem//planets/mars/mars").Mars.Identifier
 
+
+
 local treks_msss_atlas_simp_clon = {
   Identifier = "msss_atlas_simp_clon",
   Name = [[MGS MOC Atlas, Global Color Mosaic]],
@@ -16,6 +18,7 @@ local treks_msss_atlas_simp_clon = {
 The Mars Orbiter Camera (MOC) consisted of 3 instruments. A black-and-white narrow angle camera captured high resolution images (typically 1.5 to 12 m per pixel) and red and blue wide angle cameras for context (240 m per pixel) and daily global imaging (7.5 km per pixel). This mosaic was assembled from Wide Angle red images (primarily those acquired in May-June 1999) from the Mars Orbiter Camera.]]
 }
 
+
 asset.onInitialize(function()
   openspace.globebrowsing.addLayer(globeIdentifier, "ColorLayers", treks_msss_atlas_simp_clon)
 end)
@@ -27,6 +30,7 @@ end)
 asset.export("msss_atlas_simp_clon", treks_msss_atlas_simp_clon)
 
 
+
 asset.meta = {
   Name = [[NASA Treks Layers for Mars MGS_MOC_Atlas]],
   Author = "NASA/Treks",
diff --git a/data/assets/scene/solarsystem/planets/mars/layers/nasa-treks/MGS_MOLA.asset b/data/assets/scene/solarsystem/planets/mars/layers/nasa-treks/MGS_MOLA.asset
index fa2732925a..9f9f3a2682 100644
--- a/data/assets/scene/solarsystem/planets/mars/layers/nasa-treks/MGS_MOLA.asset
+++ b/data/assets/scene/solarsystem/planets/mars/layers/nasa-treks/MGS_MOLA.asset
@@ -6,6 +6,8 @@
 
 local globeIdentifier = asset.require("scene/solarsystem//planets/mars/mars").Mars.Identifier
 
+
+
 local treks_Mars_MGS_MOLA_ClrShade_merge_global_463m = {
   Identifier = "Mars_MGS_MOLA_ClrShade_merge_global_463m",
   Name = [[MGS MOLA, Global Color Hillshade]],
@@ -36,6 +38,7 @@ local treks_mola_roughness = {
   Description = [[The Mars Orbiter Laser Altimeter (MOLA) aboard the Mars Global Surveyor (MGS) spacecraft, made precise altimetry measurements from orbit around Mars from September 1997 to June, 2001. The MOLA instrument transmitted infrared laser pulses towards Mars at a rate of 10 times per second, and measured the time of flight to determine the range (distance) of the MGS spacecraft to the Martian surface. The range measurements resulted in precise topographic maps of Mars. This kilometer-scale global roughness map is presented as an RGB composite image. The Blue, Green and Red channels contain roughness at 0.6 km, 2.4 km, and 9.2 km baselines. Brighter shades denote rougher surface. Thus, general brightness denotes general roughness, and color hue denotes the nature of the scale dependence of roughness. Map resolution/scale: 8 ppd/7.5km. Kreslavsky and Head, 2000, JGR, VOL. 105, NO. Ell, PAGES 26,695-26,711]]
 }
 
+
 asset.onInitialize(function()
   openspace.globebrowsing.addLayer(globeIdentifier, "ColorLayers", treks_Mars_MGS_MOLA_ClrShade_merge_global_463m)
   openspace.globebrowsing.addLayer(globeIdentifier, "ColorLayers", treks_mola128_mola64_merge_90Nto90S_SimpleC_clon0)
@@ -53,6 +56,7 @@ asset.export("mola128_mola64_merge_90Nto90S_SimpleC_clon0", treks_mola128_mola64
 asset.export("mola_roughness", treks_mola_roughness)
 
 
+
 asset.meta = {
   Name = [[NASA Treks Layers for Mars MGS_MOLA]],
   Author = "NASA/Treks",
diff --git a/data/assets/scene/solarsystem/planets/mars/layers/nasa-treks/MGS_MOLA_and_Mars_Express_HRSC.asset b/data/assets/scene/solarsystem/planets/mars/layers/nasa-treks/MGS_MOLA_and_Mars_Express_HRSC.asset
index aa7cbe10e0..ad914beb2e 100644
--- a/data/assets/scene/solarsystem/planets/mars/layers/nasa-treks/MGS_MOLA_and_Mars_Express_HRSC.asset
+++ b/data/assets/scene/solarsystem/planets/mars/layers/nasa-treks/MGS_MOLA_and_Mars_Express_HRSC.asset
@@ -6,6 +6,8 @@
 
 local globeIdentifier = asset.require("scene/solarsystem//planets/mars/mars").Mars.Identifier
 
+
+
 local treks_Mars_MOLA_blend200ppx_HRSC_ClrShade_clon0dd_200mpp_lzw = {
   Identifier = "Mars_MOLA_blend200ppx_HRSC_ClrShade_clon0dd_200mpp_lzw",
   Name = [[MGS MOLA and Mars Express HRSC, Color Hillshade Blend]],
@@ -34,6 +36,7 @@ HRSC, the only dedicated stereo camera orbiting Mars, is a multi-sensor push bro
 R. Jaumann, et al. (2007), The high-resolution stereo camera (HRSC) experiment on Mars Express: instrument aspects and experiment conduct from interplanetary cruise through the nominal mission, Planet. Space Sci., 55 (7-8) (2007), pp. 928-952]]
 }
 
+
 asset.onInitialize(function()
   openspace.globebrowsing.addLayer(globeIdentifier, "ColorLayers", treks_Mars_MOLA_blend200ppx_HRSC_ClrShade_clon0dd_200mpp_lzw)
   openspace.globebrowsing.addLayer(globeIdentifier, "ColorLayers", treks_Mars_MOLA_blend200ppx_HRSC_Shade_clon0dd_200mpp_lzw)
@@ -48,6 +51,7 @@ asset.export("Mars_MOLA_blend200ppx_HRSC_ClrShade_clon0dd_200mpp_lzw", treks_Mar
 asset.export("Mars_MOLA_blend200ppx_HRSC_Shade_clon0dd_200mpp_lzw", treks_Mars_MOLA_blend200ppx_HRSC_Shade_clon0dd_200mpp_lzw)
 
 
+
 asset.meta = {
   Name = [[NASA Treks Layers for Mars MGS_MOLA_and_Mars_Express_HRSC]],
   Author = "NASA/Treks",
diff --git a/data/assets/scene/solarsystem/planets/mars/layers/nasa-treks/MGS_TES.asset b/data/assets/scene/solarsystem/planets/mars/layers/nasa-treks/MGS_TES.asset
index 6acec704b7..4138866f9b 100644
--- a/data/assets/scene/solarsystem/planets/mars/layers/nasa-treks/MGS_TES.asset
+++ b/data/assets/scene/solarsystem/planets/mars/layers/nasa-treks/MGS_TES.asset
@@ -6,6 +6,8 @@
 
 local globeIdentifier = asset.require("scene/solarsystem//planets/mars/mars").Mars.Identifier
 
+
+
 local treks_TES_Dust = {
   Identifier = "TES_Dust",
   Name = [[MGS TES, Global Dust]],
@@ -51,6 +53,7 @@ local treks_TES_Thermal_Inertia = {
   Description = [[The Thermal Emission Spectrometer (TES) is one of the instruments aboard the Mars Global Surveyor spacecraft. TES is designed to measure the thermal infrared energy (heat) emitted from Mars. This technique, called thermal emission spectroscopy, can tell us much about the geology and atmosphere of Mars. One of the objectives of the MGS TES instrument is the derivation of thermal inertia of the surface at 3-km spatial resolution. Thermal inertia represents the ability of a material to conduct and store heat, and in the context of planetary science, it is a measure of the subsurface's ability to store heat during the day and reradiate it during the night. While compositional differences (ie, mineralogy) will have some effect, for a terrestrial planetary surface such as that of Mars, thermal inertia will depend predominantly on the physical properties of the near surface materials such as particle size, degree of induration (ie, cementation of grains), rock abundance, and exposure of bedrock (rocks will have a much higher thermal inertia than sand or dust - that is, it takes longer to heat rocks up during the day and to cool them off at night). For example, on a visit to the desert you may notice that sandy areas are much hotter at midday than adjacent rocks, and the sand cools off quickly after sunset whereas the rocks remain warm well into the evening. Map resolution/scale: 20 ppd/3km. Putzig et al, 2005, Icarus 173, 325-341]]
 }
 
+
 asset.onInitialize(function()
   openspace.globebrowsing.addLayer(globeIdentifier, "ColorLayers", treks_TES_Dust)
   openspace.globebrowsing.addLayer(globeIdentifier, "ColorLayers", treks_tes_ruffdust)
@@ -77,6 +80,7 @@ asset.export("TES_Glass_Clay", treks_TES_Glass_Clay)
 asset.export("TES_Thermal_Inertia", treks_TES_Thermal_Inertia)
 
 
+
 asset.meta = {
   Name = [[NASA Treks Layers for Mars MGS_TES]],
   Author = "NASA/Treks",
diff --git a/data/assets/scene/solarsystem/planets/mars/layers/nasa-treks/MO_THEMIS-IR_Day.asset b/data/assets/scene/solarsystem/planets/mars/layers/nasa-treks/MO_THEMIS-IR_Day.asset
index 6fe34d09d3..34b8d36adb 100644
--- a/data/assets/scene/solarsystem/planets/mars/layers/nasa-treks/MO_THEMIS-IR_Day.asset
+++ b/data/assets/scene/solarsystem/planets/mars/layers/nasa-treks/MO_THEMIS-IR_Day.asset
@@ -6,6 +6,8 @@
 
 local globeIdentifier = asset.require("scene/solarsystem//planets/mars/mars").Mars.Identifier
 
+
+
 local treks_THEMIS_DayIR_ControlledMosaics_100m_v2_oct2018 = {
   Identifier = "THEMIS_DayIR_ControlledMosaics_100m_v2_oct2018",
   Name = [[MO THEMIS-IR Day, Global Mosaic]],
@@ -14,6 +16,7 @@ local treks_THEMIS_DayIR_ControlledMosaics_100m_v2_oct2018 = {
   Description = [[This data was acquired using the Thermal Emission Imaging System instrument aboard NASA's Mars Odyssey spacecraft. Odyssey was launched on April 7, 2001 and arrived at Mars on October 24, 2001. It maintains a polar orbit around Mars with an altitude of about 3,800 km or 2,400 miles. Odyssey's mission includes studying the mineralogy of Mars' surface (especially looking at minerals formed in the presence of water), detecting water and shallow buried ice, and studying the radiation environment. The Thermal Emission Imaging System (THEMIS) instrument is a camera system that gathers data in infrared and visible light. The infrared images sample nine different wavelengths allowing spectra to be constructed and compositions of imaged surfaces to be inferred. Daytime infrared Themis images typically emphasize topography, with warmer sunward slopes being brighter than cooler shaded slopes. Nighttime Themis images emphasize differences in thermal inertia between areas being observed, giving insights into the physical characteristics of the surfaces. This map is a THEMIS daytime infrared map. The 2017 release featured preliminary geodetically controlled mosaics tied to a known coordinate system (USGS Viking Orbiter MDIM 2.1), spatially adjusted to align feature boundaries, and orthoprojected at 100 m/pixel scale. Further adjustments have been processed for the 2018 release of this final mosaic.]]
 }
 
+
 asset.onInitialize(function()
   openspace.globebrowsing.addLayer(globeIdentifier, "ColorLayers", treks_THEMIS_DayIR_ControlledMosaics_100m_v2_oct2018)
 end)
@@ -25,6 +28,7 @@ end)
 asset.export("THEMIS_DayIR_ControlledMosaics_100m_v2_oct2018", treks_THEMIS_DayIR_ControlledMosaics_100m_v2_oct2018)
 
 
+
 asset.meta = {
   Name = [[NASA Treks Layers for Mars MO_THEMIS-IR_Day]],
   Author = "NASA/Treks",
diff --git a/data/assets/scene/solarsystem/planets/mars/layers/nasa-treks/MO_THEMIS-IR_Night.asset b/data/assets/scene/solarsystem/planets/mars/layers/nasa-treks/MO_THEMIS-IR_Night.asset
index 803d9898f5..7cc37f22ef 100644
--- a/data/assets/scene/solarsystem/planets/mars/layers/nasa-treks/MO_THEMIS-IR_Night.asset
+++ b/data/assets/scene/solarsystem/planets/mars/layers/nasa-treks/MO_THEMIS-IR_Night.asset
@@ -6,6 +6,8 @@
 
 local globeIdentifier = asset.require("scene/solarsystem//planets/mars/mars").Mars.Identifier
 
+
+
 local treks_THEMIS_NightIR_ControlledMosaics_100m_v2_oct2018 = {
   Identifier = "THEMIS_NightIR_ControlledMosaics_100m_v2_oct2018",
   Name = [[MO THEMIS-IR Night, Global Mosaic]],
@@ -14,6 +16,7 @@ local treks_THEMIS_NightIR_ControlledMosaics_100m_v2_oct2018 = {
   Description = [[This data was acquired using the Thermal Emission Imaging System instrument aboard NASA's Mars Odyssey spacecraft. Odyssey was launched on April 7, 2001 and arrived at Mars on October 24, 2001. It maintains a polar orbit around Mars with an altitude of about 3,800 km or 2,400 miles. Odyssey's mission includes studying the mineralogy of Mars' surface (especially looking at minerals formed in the presence of water), detecting water and shallow buried ice, and studying the radiation environment. The Thermal Emission Imaging System (THEMIS) instrument is a camera system that gathers data in infrared and visible light. The infrared images sample nine different wavelengths allowing spectra to be constructed and compositions of imaged surfaces to be inferred. Daytime infrared Themis images typically emphasize topography, with warmer sunward slopes being brighter than cooler shaded slopes. Nighttime Themis images emphasize differences in thermal inertia between areas being observed, giving insights into the physical characteristics of the surfaces. This map is a THEMIS nighttime infrared map. The 2017 release featured preliminary geodetically controlled mosaics tied to a known coordinate system (USGS Viking Orbiter MDIM 2.1), spatially adjusted to align feature boundaries, and orthoprojected at 100 m/pixel scale. Further adjustments have been processed for the 2018 release of this final mosaic.]]
 }
 
+
 asset.onInitialize(function()
   openspace.globebrowsing.addLayer(globeIdentifier, "ColorLayers", treks_THEMIS_NightIR_ControlledMosaics_100m_v2_oct2018)
 end)
@@ -25,6 +28,7 @@ end)
 asset.export("THEMIS_NightIR_ControlledMosaics_100m_v2_oct2018", treks_THEMIS_NightIR_ControlledMosaics_100m_v2_oct2018)
 
 
+
 asset.meta = {
   Name = [[NASA Treks Layers for Mars MO_THEMIS-IR_Night]],
   Author = "NASA/Treks",
diff --git a/data/assets/scene/solarsystem/planets/mars/layers/nasa-treks/MRO_CTX.asset b/data/assets/scene/solarsystem/planets/mars/layers/nasa-treks/MRO_CTX.asset
index 0d3d4f13a0..4fb6cfd830 100644
--- a/data/assets/scene/solarsystem/planets/mars/layers/nasa-treks/MRO_CTX.asset
+++ b/data/assets/scene/solarsystem/planets/mars/layers/nasa-treks/MRO_CTX.asset
@@ -6,6 +6,8 @@
 
 local globeIdentifier = asset.require("scene/solarsystem//planets/mars/mars").Mars.Identifier
 
+
+
 local treks_b21_017819_2025_xn_22n048w = {
   Identifier = "b21_017819_2025_xn_22n048w",
   Name = [[MRO CTX, 22n048w Mosaic]],
@@ -495,6 +497,7 @@ local treks_Zephyria_CTX_BlockAdj_dd = {
 The Context Camera (CTX) provides black-and-white images with resolutions up to 6 meters/pixel. It provides broader context maps for the higher resolution but narrower fields of view of the HiRISE camera, as well as for other instruments aboard MRO, and is useful for producing mosaicked images of larger areas on Mars' surface.]]
 }
 
+
 asset.onInitialize(function()
   openspace.globebrowsing.addLayer(globeIdentifier, "ColorLayers", treks_b21_017819_2025_xn_22n048w)
   openspace.globebrowsing.addLayer(globeIdentifier, "ColorLayers", treks_Acheron_Fossae_CTX_BlockAdj_dd)
@@ -650,6 +653,7 @@ asset.export("Noachis_CTX_BlockAdj_dd", treks_Noachis_CTX_BlockAdj_dd)
 asset.export("Zephyria_CTX_BlockAdj_dd", treks_Zephyria_CTX_BlockAdj_dd)
 
 
+
 asset.meta = {
   Name = [[NASA Treks Layers for Mars MRO_CTX]],
   Author = "NASA/Treks",
diff --git a/data/assets/scene/solarsystem/planets/mars/layers/nasa-treks/MRO_HiRISE.asset b/data/assets/scene/solarsystem/planets/mars/layers/nasa-treks/MRO_HiRISE.asset
index e61d671e02..088c533a72 100644
--- a/data/assets/scene/solarsystem/planets/mars/layers/nasa-treks/MRO_HiRISE.asset
+++ b/data/assets/scene/solarsystem/planets/mars/layers/nasa-treks/MRO_HiRISE.asset
@@ -6,6 +6,8 @@
 
 local globeIdentifier = asset.require("scene/solarsystem//planets/mars/mars").Mars.Identifier
 
+
+
 local treks_DTEEC_001918_1735_001984_1735_U01_longlat = {
   Identifier = "DTEEC_001918_1735_001984_1735_U01_longlat",
   Name = [[MRO HiRISE, 001918_1735_001984_1735 DEM]],
@@ -236,6 +238,7 @@ local treks_PSP_001501_2280_RED = {
 The High Resolution Imaging Science Experiment (HiRISE) camera utilizes a 0.5-meter telescope to obtain very high resolution images of Martian landforms and terrains. From an altitude of 300 km, HiRISE has a resolution of 0.3 meters per pixel. In addition to being used for getting very detailed images of surface features, pairs of slightly offset HiRISE images are combined to produce precise digital elevation models of Martian topography.]]
 }
 
+
 asset.onInitialize(function()
   openspace.globebrowsing.addLayer(globeIdentifier, "ColorLayers", treks_DTEEC_001918_1735_001984_1735_U01_longlat)
   openspace.globebrowsing.addLayer(globeIdentifier, "ColorLayers", treks_DTEED_042014_1760_042647_1760_A01)
@@ -307,6 +310,7 @@ asset.export("PSP_001521_2025_RED", treks_PSP_001521_2025_RED)
 asset.export("PSP_001501_2280_RED", treks_PSP_001501_2280_RED)
 
 
+
 asset.meta = {
   Name = [[NASA Treks Layers for Mars MRO_HiRISE]],
   Author = "NASA/Treks",
diff --git a/data/assets/scene/solarsystem/planets/mars/layers/nasa-treks/MSL.asset b/data/assets/scene/solarsystem/planets/mars/layers/nasa-treks/MSL.asset
index e8270d4d82..d1b1931272 100644
--- a/data/assets/scene/solarsystem/planets/mars/layers/nasa-treks/MSL.asset
+++ b/data/assets/scene/solarsystem/planets/mars/layers/nasa-treks/MSL.asset
@@ -6,6 +6,8 @@
 
 local globeIdentifier = asset.require("scene/solarsystem//planets/mars/mars").Mars.Identifier
 
+
+
 local treks_mars_pahrump_patch_8k_256m = {
   Identifier = "mars_pahrump_patch_8k_256m",
   Name = [[MSL, Pahrump Hills]],
@@ -14,6 +16,7 @@ local treks_mars_pahrump_patch_8k_256m = {
   Description = [[This layer is a greyscale mosaic assembled using data from the High Resolution Stereo Camera aboard the European Space Agency's Mars Express orbiter. HRSC is being used to obtain color and stereo images that will map 100% of Mars' surface at resolution better than 30 m/pixel, and 50% of the surface at better than 15 m/pixel. Each of the nine CCD lines of HRSC, a linescan imager (pushbroom camera), contains 5184 pixels. The channels consist of red, green, blue, near-infrared, three stereo channels (backward, nadir, and forward) and two photometric channels. The digital elevation model used for this layer is a combination of data derived from the HRSC and the Mars Orbiter Laser Altimeter.]]
 }
 
+
 asset.onInitialize(function()
   openspace.globebrowsing.addLayer(globeIdentifier, "ColorLayers", treks_mars_pahrump_patch_8k_256m)
 end)
@@ -25,6 +28,7 @@ end)
 asset.export("mars_pahrump_patch_8k_256m", treks_mars_pahrump_patch_8k_256m)
 
 
+
 asset.meta = {
   Name = [[NASA Treks Layers for Mars MSL]],
   Author = "NASA/Treks",
diff --git a/data/assets/scene/solarsystem/planets/mars/layers/nasa-treks/Mars_Express_HRSC.asset b/data/assets/scene/solarsystem/planets/mars/layers/nasa-treks/Mars_Express_HRSC.asset
index 1ab311dfe0..26539e06ed 100644
--- a/data/assets/scene/solarsystem/planets/mars/layers/nasa-treks/Mars_Express_HRSC.asset
+++ b/data/assets/scene/solarsystem/planets/mars/layers/nasa-treks/Mars_Express_HRSC.asset
@@ -6,6 +6,8 @@
 
 local globeIdentifier = asset.require("scene/solarsystem//planets/mars/mars").Mars.Identifier
 
+
+
 local treks_HRSC_Martian_east = {
   Identifier = "HRSC_Martian_east",
   Name = [[Mars Express HRSC, Martian Path Eastern Section Color Mosaic]],
@@ -62,6 +64,7 @@ local treks_h1394_0000_nd3 = {
   Description = [[This layer is a greyscale mosaic assembled using data from the High Resolution Stereo Camera aboard the European Space Agency's Mars Express orbiter. HRSC is being used to obtain color and stereo images that will map 100% of Mars' surface at resolution better than 30 m/pixel, and 50% of the surface at better than 15 m/pixel. Each of the nine CCD lines of HRSC, a linescan imager (pushbroom camera), contains 5184 pixels. The channels consist of red, green, blue, near-infrared, three stereo channels (backward, nadir, and forward) and two photometric channels. The digital elevation model used for this layer is a combination of data derived from the HRSC and the Mars Orbiter Laser Altimeter.]]
 }
 
+
 asset.onInitialize(function()
   openspace.globebrowsing.addLayer(globeIdentifier, "ColorLayers", treks_HRSC_Martian_east)
   openspace.globebrowsing.addLayer(globeIdentifier, "ColorLayers", treks_MC11E_HRMOSCO_COL)
@@ -91,6 +94,7 @@ asset.export("h2942_0000_nd3", treks_h2942_0000_nd3)
 asset.export("h1394_0000_nd3", treks_h1394_0000_nd3)
 
 
+
 asset.meta = {
   Name = [[NASA Treks Layers for Mars Mars_Express_HRSC]],
   Author = "NASA/Treks",
diff --git a/data/assets/scene/solarsystem/planets/mars/layers/nasa-treks/Mars_Reconnaissance_Orbiter_CTX.asset b/data/assets/scene/solarsystem/planets/mars/layers/nasa-treks/Mars_Reconnaissance_Orbiter_CTX.asset
index c8aa9d488b..6c4c1de974 100644
--- a/data/assets/scene/solarsystem/planets/mars/layers/nasa-treks/Mars_Reconnaissance_Orbiter_CTX.asset
+++ b/data/assets/scene/solarsystem/planets/mars/layers/nasa-treks/Mars_Reconnaissance_Orbiter_CTX.asset
@@ -6,6 +6,8 @@
 
 local globeIdentifier = asset.require("scene/solarsystem//planets/mars/mars").Mars.Identifier
 
+
+
 local treks_CTX_ClrSlope_8bit_12S182E_24mp_P22_009609_1674_B02_010453_1675 = {
   Identifier = "CTX_ClrSlope_8bit_12S182E_24mp_P22_009609_1674_B02_010453_1675",
   Name = [[Mars Reconnaissance Orbiter CTX, Color Slope Apollinaris 12S182E]],
@@ -871,6 +873,7 @@ Mayer, D. P., E. S. Kite, 2016, An Integrated Workflow for Producing Digital Ter
 Slopes were derived using the Python script called gdal_baseline_slope.py: https://github.com/USGS-Astrogeology/GDAL_scripts/blob/master/gdal_baseline_slope ]]
 }
 
+
 asset.onInitialize(function()
   openspace.globebrowsing.addLayer(globeIdentifier, "ColorLayers", treks_CTX_ClrSlope_8bit_12S182E_24mp_P22_009609_1674_B02_010453_1675)
   openspace.globebrowsing.addLayer(globeIdentifier, "ColorLayers", treks_CTX_ClrSlope_8bit_13S182E_24mp_G15_024127_1673_G16_024483_1673)
@@ -1068,6 +1071,7 @@ asset.export("CTX_Slope_13S182E_24mp_G15_024127_1673_G16_024483_1673", treks_CTX
 asset.export("CTX_Slope_14S184E_24mp_B01_009886_1658_P21_009385_1658", treks_CTX_Slope_14S184E_24mp_B01_009886_1658_P21_009385_1658)
 
 
+
 asset.meta = {
   Name = [[NASA Treks Layers for Mars Mars_Reconnaissance_Orbiter_CTX]],
   Author = "NASA/Treks",
diff --git a/data/assets/scene/solarsystem/planets/mars/layers/newyork_layers.asset b/data/assets/scene/solarsystem/planets/mars/layers/newyork_layers.asset
index 6ef0ec008c..20b3e5ed1e 100644
--- a/data/assets/scene/solarsystem/planets/mars/layers/newyork_layers.asset
+++ b/data/assets/scene/solarsystem/planets/mars/layers/newyork_layers.asset
@@ -19,7 +19,6 @@ asset.meta = {
     Themis IR Day, Themis IR Night, CTX Mosaic, MDEM200M (3D), HiRISE Local Set DEM (3D),
     Mola Elevation (3D), Tile Indicies, and Size Reference.
 
-
     Layers only loaded from the New York server
   ]],
   Author = "OpenSpace Team",
diff --git a/data/assets/scene/solarsystem/planets/mars/layers/sweden_layers.asset b/data/assets/scene/solarsystem/planets/mars/layers/sweden_layers.asset
index 70cfbc254b..cd48e088bb 100644
--- a/data/assets/scene/solarsystem/planets/mars/layers/sweden_layers.asset
+++ b/data/assets/scene/solarsystem/planets/mars/layers/sweden_layers.asset
@@ -18,7 +18,6 @@ asset.meta = {
     Themis IR Day, Themis IR Night, CTX Mosaic, MDEM200M (3D), HiRISE Local Set DEM (3D),
     Mola Elevation (3D), Tile Indicies, and Size Reference.
 
-
     Layers only loaded from the Sweden server
   ]],
   Author = "OpenSpace Team",
diff --git a/data/assets/scene/solarsystem/planets/mars/layers/utah_layers.asset b/data/assets/scene/solarsystem/planets/mars/layers/utah_layers.asset
index 6efcd06a09..32eb5201b1 100644
--- a/data/assets/scene/solarsystem/planets/mars/layers/utah_layers.asset
+++ b/data/assets/scene/solarsystem/planets/mars/layers/utah_layers.asset
@@ -18,7 +18,6 @@ asset.meta = {
     Themis IR Day, Themis IR Night, CTX Mosaic, MDEM200M (3D), HiRISE Local Set DEM (3D),
     Mola Elevation (3D), Tile Indicies, and Size Reference.
 
-
     Layers only loaded from the Utah server
   ]],
   Author = "OpenSpace Team",
diff --git a/data/assets/scene/solarsystem/planets/mercury/default_layers.asset b/data/assets/scene/solarsystem/planets/mercury/default_layers.asset
index d4b85a8fb1..d85dde8778 100644
--- a/data/assets/scene/solarsystem/planets/mercury/default_layers.asset
+++ b/data/assets/scene/solarsystem/planets/mercury/default_layers.asset
@@ -12,7 +12,6 @@ asset.meta = {
     Messenger Mosaic, Messenger Mosaic2, Messenger BDR, Messenger HIE, Messenger HIW,
     Messenger LOI, Messenger SHADE, Messenger MDR, Messenger MP3, and Messenger DEM (3D).
 
-
     Layers loaded from all servers
   ]],
   Author = "OpenSpace Team",
diff --git a/data/assets/scene/solarsystem/planets/mercury/layers/colorlayers/mercury_texture.asset b/data/assets/scene/solarsystem/planets/mercury/layers/colorlayers/mercury_texture.asset
index 0137fea10d..7a8a724054 100644
--- a/data/assets/scene/solarsystem/planets/mercury/layers/colorlayers/mercury_texture.asset
+++ b/data/assets/scene/solarsystem/planets/mercury/layers/colorlayers/mercury_texture.asset
@@ -18,7 +18,7 @@ local Layer = {
   Description = [[The Map Projected Basemap RDR (BDR) data set consists of a global
     monochrome map of reflectance at a resolution of 256 pixels per degree (~166 m/p).
     This is an offline version with lower resoution than the Messenger BDR layer.]],
-    CacheSettings = { Enabled = false }
+  CacheSettings = { Enabled = false }
 }
 
 
diff --git a/data/assets/scene/solarsystem/planets/mercury/layers/colorlayers/messenger_bdr_utah.asset b/data/assets/scene/solarsystem/planets/mercury/layers/colorlayers/messenger_bdr_utah.asset
index 7554ef87e1..b9e4470bf5 100644
--- a/data/assets/scene/solarsystem/planets/mercury/layers/colorlayers/messenger_bdr_utah.asset
+++ b/data/assets/scene/solarsystem/planets/mercury/layers/colorlayers/messenger_bdr_utah.asset
@@ -14,9 +14,9 @@ local Layer = {
   This edition, version 1, was released May 6, 2016 to the Planetary Data System (PDS)
   MESSENGER archive. It is compiled using NAC or WAC 750-nm images from any campaign that
   best fit the intended illumination geometry or low emission angle and incidence angle
-  near 74 degrees. It is controlled and projected onto a global digital elevation model. It uses
-  a Kasseleinin-Shkuratov photometric model, whose parameters are the same for any given
-  wavelength band across all MESSENGER end-of-mission map data products]]
+  near 74 degrees. It is controlled and projected onto a global digital elevation model.
+  It uses a Kasseleinin-Shkuratov photometric model, whose parameters are the same for any
+  given wavelength band across all MESSENGER end-of-mission map data products]]
 }
 
 
diff --git a/data/assets/scene/solarsystem/planets/mercury/layers/heightlayers/messenger_dem_utah.asset b/data/assets/scene/solarsystem/planets/mercury/layers/heightlayers/messenger_dem_utah.asset
index 64d2d8bc98..60649ccdc6 100644
--- a/data/assets/scene/solarsystem/planets/mercury/layers/heightlayers/messenger_dem_utah.asset
+++ b/data/assets/scene/solarsystem/planets/mercury/layers/heightlayers/messenger_dem_utah.asset
@@ -1,5 +1,7 @@
 local globe = asset.require("../../mercury")
 
+
+
 local Layer = {
   Identifier = "Messenger_DEM_Utah",
   Name = "Messenger DEM [Utah]",
diff --git a/data/assets/scene/solarsystem/planets/mercury/layers/nasa-treks/MSGR_MDIS.asset b/data/assets/scene/solarsystem/planets/mercury/layers/nasa-treks/MSGR_MDIS.asset
index e812df5031..3dd4d0da94 100644
--- a/data/assets/scene/solarsystem/planets/mercury/layers/nasa-treks/MSGR_MDIS.asset
+++ b/data/assets/scene/solarsystem/planets/mercury/layers/nasa-treks/MSGR_MDIS.asset
@@ -6,6 +6,8 @@
 
 local globeIdentifier = asset.require("scene/solarsystem//planets/mercury/mercury").Mercury.Identifier
 
+
+
 local treks_Mercury_Messenger_USGS_DEM_665m_v2_HillshadeColor = {
   Identifier = "Mercury_Messenger_USGS_DEM_665m_v2_HillshadeColor",
   Name = [[MSGR MDIS, ColorHillshade Global]],
@@ -30,6 +32,7 @@ local treks_Mercury_Messenger_USGS_DEM_665m_v2_SlopeColor = {
   Description = [[This is a colorized slope data product of the USGS Astrogeology Science Center's Mercury MESSENGER Global DEM 665m v2 data product providing global coverage of Mercury. This slope data product was generated in ArcMap with the slope spatial analysis tool. The resolution of this product is 64 pixels/degree (665 m/pixel). The control network used for registration contains tie points that are sample/line coordinates with geometric locations (derived from SPICE) that are automatically measured across the overlapping image areas. Slope values are in degrees and referred to a radius of 2439400m. Slope values range from a minimum value of 0 to a maximum value of 71.0409. The legend conveys the mapping colors to slope values (degrees).]]
 }
 
+
 asset.onInitialize(function()
   openspace.globebrowsing.addLayer(globeIdentifier, "ColorLayers", treks_Mercury_Messenger_USGS_DEM_665m_v2_HillshadeColor)
   openspace.globebrowsing.addLayer(globeIdentifier, "ColorLayers", treks_Mercury_Messenger_USGS_DEM_665m_v2_Hillshade)
@@ -47,6 +50,7 @@ asset.export("Mercury_Messenger_USGS_DEM_665m_v2_Hillshade", treks_Mercury_Messe
 asset.export("Mercury_Messenger_USGS_DEM_665m_v2_SlopeColor", treks_Mercury_Messenger_USGS_DEM_665m_v2_SlopeColor)
 
 
+
 asset.meta = {
   Name = [[NASA Treks Layers for Mercury MSGR_MDIS]],
   Author = "NASA/Treks",
diff --git a/data/assets/scene/solarsystem/planets/mercury/layers/nasa-treks/MSGR_MDIS_Mosaic.asset b/data/assets/scene/solarsystem/planets/mercury/layers/nasa-treks/MSGR_MDIS_Mosaic.asset
index d736a30685..28a8ff539e 100644
--- a/data/assets/scene/solarsystem/planets/mercury/layers/nasa-treks/MSGR_MDIS_Mosaic.asset
+++ b/data/assets/scene/solarsystem/planets/mercury/layers/nasa-treks/MSGR_MDIS_Mosaic.asset
@@ -6,6 +6,8 @@
 
 local globeIdentifier = asset.require("scene/solarsystem//planets/mercury/mercury").Mercury.Identifier
 
+
+
 local treks_MSGR_Aksakov_Crater_Peak_Ring_Ortho_29m = {
   Identifier = "MSGR_Aksakov_Crater_Peak_Ring_Ortho_29m",
   Name = [[MSGR MDIS Mosaic, Aksakov Crater Peak Ring]],
@@ -86,6 +88,7 @@ local treks_MSGR_Sholem_Aleichem_Crater_Wall_Ortho_8m = {
   Description = [[This is a visible orthoimage for the Sholem Aleichem Crater Wall region on Mercury. This data product class of this data is observational and has been constructed to examine the visible and topographic settings of landforms around Mercury's hollows. Observations of topography, specifically the relationships of hollows to their surroundings, can be used to investigate hollow formation. The visible image has been orthorectified using a digital elevation model (DEM) created from Mercury Dual Imaging System (MDIS) stereo pair images. The DEM used to generate the orthoimage has been aligned and controlled to Mercury Laser Altimeter (MLA) individual elevation points. The orthoimage was then projected onto the DEM and exported. This ortho image has been generated at a resolution of 8m/pixel.]]
 }
 
+
 asset.onInitialize(function()
   openspace.globebrowsing.addLayer(globeIdentifier, "ColorLayers", treks_MSGR_Aksakov_Crater_Peak_Ring_Ortho_29m)
   openspace.globebrowsing.addLayer(globeIdentifier, "ColorLayers", treks_MSGR_near_Dali_Crater_Ortho_20m)
@@ -124,6 +127,7 @@ asset.export("MSGR_Sander_Crater_Ortho_22m", treks_MSGR_Sander_Crater_Ortho_22m)
 asset.export("MSGR_Sholem_Aleichem_Crater_Wall_Ortho_8m", treks_MSGR_Sholem_Aleichem_Crater_Wall_Ortho_8m)
 
 
+
 asset.meta = {
   Name = [[NASA Treks Layers for Mercury MSGR_MDIS_Mosaic]],
   Author = "NASA/Treks",
diff --git a/data/assets/scene/solarsystem/planets/mercury/layers/nasa-treks/MSGR_MDIS_Slope.asset b/data/assets/scene/solarsystem/planets/mercury/layers/nasa-treks/MSGR_MDIS_Slope.asset
index 8b6e226f65..770fc65708 100644
--- a/data/assets/scene/solarsystem/planets/mercury/layers/nasa-treks/MSGR_MDIS_Slope.asset
+++ b/data/assets/scene/solarsystem/planets/mercury/layers/nasa-treks/MSGR_MDIS_Slope.asset
@@ -6,6 +6,8 @@
 
 local globeIdentifier = asset.require("scene/solarsystem//planets/mercury/mercury").Mercury.Identifier
 
+
+
 local treks_MSGR_Aksakov_Crater_Peak_Ring_Slope_100m = {
   Identifier = "MSGR_Aksakov_Crater_Peak_Ring_Slope_100m",
   Name = [[MSGR MDIS Slope, Aksakov Crater Peak Ring]],
@@ -86,6 +88,7 @@ local treks_MSGR_Sholem_Aleichem_Crater_Wall_Slope_25m = {
   Description = [[This is a colorized slope product of the digital elevation model (DEM) for the Sholem Aleichem Crater Wall region on Mercury. This data product class of this data is observational and has been constructed to examine the topographic settings of landforms around Mercury's hollows. Observations of topography, specifically the relationships of hollows to their surroundings, can be used to investigate hollow formation. This DEM has been derived from Mercury Dual Imaging System (MDIS) data and has been generated at a resolution of 25m/pixel. The DEM has been aligned and controlled to Mercury Laser Altimeter (MLA) individual elevation points. Vertical offsets in this DEM have been roughly corrected relative to the USGS's 665m Global DEM of Mercury. DEM elevation values are in meters and referred to a radius of 2440000m. Slope values are in degrees with a minimum value of 0 and a maximum value of 40.746.]]
 }
 
+
 asset.onInitialize(function()
   openspace.globebrowsing.addLayer(globeIdentifier, "ColorLayers", treks_MSGR_Aksakov_Crater_Peak_Ring_Slope_100m)
   openspace.globebrowsing.addLayer(globeIdentifier, "ColorLayers", treks_MSGR_near_Dali_Crater_Slope_60m)
@@ -124,6 +127,7 @@ asset.export("MSGR_Sander_Crater_Slope_80m", treks_MSGR_Sander_Crater_Slope_80m)
 asset.export("MSGR_Sholem_Aleichem_Crater_Wall_Slope_25m", treks_MSGR_Sholem_Aleichem_Crater_Wall_Slope_25m)
 
 
+
 asset.meta = {
   Name = [[NASA Treks Layers for Mercury MSGR_MDIS_Slope]],
   Author = "NASA/Treks",
diff --git a/data/assets/scene/solarsystem/planets/mercury/layers/newyork_layers.asset b/data/assets/scene/solarsystem/planets/mercury/layers/newyork_layers.asset
index 8b6e5cf72c..4c847f0c77 100644
--- a/data/assets/scene/solarsystem/planets/mercury/layers/newyork_layers.asset
+++ b/data/assets/scene/solarsystem/planets/mercury/layers/newyork_layers.asset
@@ -21,7 +21,6 @@ asset.meta = {
     Messenger Mosaic, Messenger Mosaic2, Messenger BDR, Messenger HIE, Messenger HIW,
     Messenger LOI, Messenger SHADE, Messenger MDR, Messenger MP3, and Messenger DEM (3D).
 
-
     Layers only loaded from the New York server
   ]],
   Author = "OpenSpace Team",
diff --git a/data/assets/scene/solarsystem/planets/mercury/layers/sweden_layers.asset b/data/assets/scene/solarsystem/planets/mercury/layers/sweden_layers.asset
index 6f05c9dde1..022492bd4f 100644
--- a/data/assets/scene/solarsystem/planets/mercury/layers/sweden_layers.asset
+++ b/data/assets/scene/solarsystem/planets/mercury/layers/sweden_layers.asset
@@ -21,7 +21,6 @@ asset.meta = {
     Messenger Mosaic, Messenger Mosaic2, Messenger BDR, Messenger HIE, Messenger HIW,
     Messenger LOI, Messenger SHADE, Messenger MDR, Messenger MP3, and Messenger DEM (3D).
 
-
     Layers only loaded from the Sweden server
   ]],
   Author = "OpenSpace Team",
diff --git a/data/assets/scene/solarsystem/planets/mercury/layers/utah_layers.asset b/data/assets/scene/solarsystem/planets/mercury/layers/utah_layers.asset
index 738ea253a4..d2afff19d1 100644
--- a/data/assets/scene/solarsystem/planets/mercury/layers/utah_layers.asset
+++ b/data/assets/scene/solarsystem/planets/mercury/layers/utah_layers.asset
@@ -19,7 +19,6 @@ asset.meta = {
     Messenger Mosaic, Messenger Mosaic2, Messenger BDR, Messenger HIE, Messenger HIW,
     Messenger LOI, Messenger SHADE, Messenger MDR, Messenger MP3, and Messenger DEM (3D).
 
-
     Layers only loaded from the Utah server
   ]],
   Author = "OpenSpace Team",
diff --git a/data/assets/scene/solarsystem/planets/neptune/nereid/nereid.asset b/data/assets/scene/solarsystem/planets/neptune/nereid/nereid.asset
index a68f4cf9e2..7db4b2e752 100644
--- a/data/assets/scene/solarsystem/planets/neptune/nereid/nereid.asset
+++ b/data/assets/scene/solarsystem/planets/neptune/nereid/nereid.asset
@@ -46,7 +46,12 @@ local NereidTrail = {
     Period = 360.13,
     Resolution = 1000
   },
-  Tag = { "moonTrail_solarSystem", "moonTrail_giants", "moonTrail_neptune", "moonTrail_major_neptune" },
+  Tag = {
+    "moonTrail_solarSystem",
+    "moonTrail_giants",
+    "moonTrail_neptune",
+    "moonTrail_major_neptune"
+  },
   GUI = {
     Name = "Nereid Trail",
     Path = "/Solar System/Planets/Neptune/Major Moons/Nereid"
diff --git a/data/assets/scene/solarsystem/planets/neptune/triton/default_layers.asset b/data/assets/scene/solarsystem/planets/neptune/triton/default_layers.asset
index 559f1969d2..b66160cca5 100644
--- a/data/assets/scene/solarsystem/planets/neptune/triton/default_layers.asset
+++ b/data/assets/scene/solarsystem/planets/neptune/triton/default_layers.asset
@@ -1,6 +1,7 @@
 asset.require("./layers/colorlayers/triton_voyager2_clrmosaic_globalfill_600m", true)
 
 
+
 asset.meta = {
   Name = "Default Triton Layers",
   Description = "Default Triton layers are: Voyager2 Mosaic",
diff --git a/data/assets/scene/solarsystem/planets/neptune/triton/layers/colorlayers/triton_voyager2_clrmosaic_globalfill_600m.asset b/data/assets/scene/solarsystem/planets/neptune/triton/layers/colorlayers/triton_voyager2_clrmosaic_globalfill_600m.asset
index f5c302c199..6873986135 100644
--- a/data/assets/scene/solarsystem/planets/neptune/triton/layers/colorlayers/triton_voyager2_clrmosaic_globalfill_600m.asset
+++ b/data/assets/scene/solarsystem/planets/neptune/triton/layers/colorlayers/triton_voyager2_clrmosaic_globalfill_600m.asset
@@ -16,11 +16,11 @@ local Layer = {
   Enabled = asset.enabled,
   ZIndex = 5,
   FilePath = texturesPath .. "Triton_Voyager2_ClrMosaic_GlobalFill_600m.png",
-  Description = [[Voyager 2 data was used to construct the best-ever global color map of Triton.
-    This map has a resolution of 1,970 feet (600 meters per pixel [m]). Color was synthesized by
-    combining high-resolution images taken through orange, violet, and ultraviolet filters; these
-    images were displayed as red, green, and blue images and combined to create this
-    color version (Smith et al., 1989).]],
+  Description = [[Voyager 2 data was used to construct the best-ever global color map of
+    Triton. This map has a resolution of 1,970 feet (600 meters per pixel [m]). Color was
+    synthesized by combining high-resolution images taken through orange, violet, and
+    ultraviolet filters; these images were displayed as red, green, and blue images and
+    combined to create this color version (Smith et al., 1989).]],
     CacheSettings = { Enabled = false }
 }
 
diff --git a/data/assets/scene/solarsystem/planets/neptune/triton/triton.asset b/data/assets/scene/solarsystem/planets/neptune/triton/triton.asset
index 426d7e65f9..f50ba6297a 100644
--- a/data/assets/scene/solarsystem/planets/neptune/triton/triton.asset
+++ b/data/assets/scene/solarsystem/planets/neptune/triton/triton.asset
@@ -51,7 +51,12 @@ local TritonTrail = {
     Period = 5.875,
     Resolution = 1000
   },
-  Tag = { "moonTrail_solarSystem", "moonTrail_giants", "moonTrail_neptune", "moonTrail_major_neptune" },
+  Tag = {
+    "moonTrail_solarSystem",
+    "moonTrail_giants",
+    "moonTrail_neptune",
+    "moonTrail_major_neptune"
+  },
   GUI = {
     Name = "Triton Trail",
     Path = "/Solar System/Planets/Neptune/Major Moons/Triton"
diff --git a/data/assets/scene/solarsystem/planets/newyork_layers.asset b/data/assets/scene/solarsystem/planets/newyork_layers.asset
index 6e1ac2db8b..0feae86a38 100644
--- a/data/assets/scene/solarsystem/planets/newyork_layers.asset
+++ b/data/assets/scene/solarsystem/planets/newyork_layers.asset
@@ -15,7 +15,6 @@ asset.meta = {
   Description = [[Adds default layers for all planets. Remove this asset and include
     individual layers for planets to customize planet layers
 
-
     Layers only loaded from the New York server
   ]],
   Author = "OpenSpace Team",
diff --git a/data/assets/scene/solarsystem/planets/saturn/dione/dione.asset b/data/assets/scene/solarsystem/planets/saturn/dione/dione.asset
index 7bfa019f5a..0dd8f2b2aa 100644
--- a/data/assets/scene/solarsystem/planets/saturn/dione/dione.asset
+++ b/data/assets/scene/solarsystem/planets/saturn/dione/dione.asset
@@ -50,7 +50,6 @@ local Dione = {
   }
 }
 
-
 local DioneLabel = {
   Identifier = "DioneLabel",
   Parent = Dione.Identifier,
diff --git a/data/assets/scene/solarsystem/planets/saturn/enceladus/default_layers.asset b/data/assets/scene/solarsystem/planets/saturn/enceladus/default_layers.asset
index 8c48efa562..17fe06b6c0 100644
--- a/data/assets/scene/solarsystem/planets/saturn/enceladus/default_layers.asset
+++ b/data/assets/scene/solarsystem/planets/saturn/enceladus/default_layers.asset
@@ -9,7 +9,6 @@ asset.meta = {
   Description = [[Default Enceladus layers are: Enceladus Texture,
     and Cassini Global Mosaic 100m HPF.
 
-
     Layers loaded from all available servers
   ]],
   Author = "OpenSpace Team",
diff --git a/data/assets/scene/solarsystem/planets/saturn/enceladus/enceladus.asset b/data/assets/scene/solarsystem/planets/saturn/enceladus/enceladus.asset
index ae7c0b62e4..b218e8066c 100644
--- a/data/assets/scene/solarsystem/planets/saturn/enceladus/enceladus.asset
+++ b/data/assets/scene/solarsystem/planets/saturn/enceladus/enceladus.asset
@@ -47,8 +47,7 @@ local Enceladus = {
   Tag = { "moon_solarSystem", "moon_giants", "moon_saturn", "moon_major_saturn" },
   GUI = {
     Name = "Enceladus",
-    Path = "/Solar System/Planets/Saturn/Major Moons/Enceladus",
-    Description = "Enceladus globe with labels"
+    Path = "/Solar System/Planets/Saturn/Major Moons/Enceladus"
   }
 }
 
diff --git a/data/assets/scene/solarsystem/planets/saturn/enceladus/layers/newyork_layers.asset b/data/assets/scene/solarsystem/planets/saturn/enceladus/layers/newyork_layers.asset
index 50ddc4cb29..b9f0fc57fc 100644
--- a/data/assets/scene/solarsystem/planets/saturn/enceladus/layers/newyork_layers.asset
+++ b/data/assets/scene/solarsystem/planets/saturn/enceladus/layers/newyork_layers.asset
@@ -8,7 +8,6 @@ asset.meta = {
   Description = [[Default Enceladus layers are: Enceladus Texture,
     and Cassini Global Mosaic 100m HPF.
 
-
     Layers only loaded from the New York server
   ]],
   Author = "OpenSpace Team",
diff --git a/data/assets/scene/solarsystem/planets/saturn/enceladus/layers/sweden_layers.asset b/data/assets/scene/solarsystem/planets/saturn/enceladus/layers/sweden_layers.asset
index d830102319..c8b293402c 100644
--- a/data/assets/scene/solarsystem/planets/saturn/enceladus/layers/sweden_layers.asset
+++ b/data/assets/scene/solarsystem/planets/saturn/enceladus/layers/sweden_layers.asset
@@ -8,7 +8,6 @@ asset.meta = {
   Description = [[Default Enceladus layers are: Enceladus Texture,
     and Cassini Global Mosaic 100m HPF.
 
-
     Layers only loaded from the Sweden server
   ]],
   Author = "OpenSpace Team",
diff --git a/data/assets/scene/solarsystem/planets/saturn/hyperion/trail.asset b/data/assets/scene/solarsystem/planets/saturn/hyperion/trail.asset
index 976ba140ac..29260a58e8 100644
--- a/data/assets/scene/solarsystem/planets/saturn/hyperion/trail.asset
+++ b/data/assets/scene/solarsystem/planets/saturn/hyperion/trail.asset
@@ -18,7 +18,12 @@ local HyperionTrail = {
     Period = 21.276,
     Resolution = 1000
   },
-  Tag = { "moonTrail_solarSystem", "moonTrail_giants", "moonTrail_saturn", "moonTrail_major_saturn" },
+  Tag = {
+    "moonTrail_solarSystem",
+    "moonTrail_giants",
+    "moonTrail_saturn",
+    "moonTrail_major_saturn"
+  },
   GUI = {
     Name = "Hyperion Trail",
     Path = "/Solar System/Planets/Saturn/Major Moons/Hyperion"
diff --git a/data/assets/scene/solarsystem/planets/saturn/iapetus/iapetus.asset b/data/assets/scene/solarsystem/planets/saturn/iapetus/iapetus.asset
index f1fbb1efc0..e9a51fc40a 100644
--- a/data/assets/scene/solarsystem/planets/saturn/iapetus/iapetus.asset
+++ b/data/assets/scene/solarsystem/planets/saturn/iapetus/iapetus.asset
@@ -47,8 +47,7 @@ local Iapetus = {
   Tag = { "moon_solarSystem", "moon_giants", "moon_saturn", "moon_major_saturn" },
   GUI = {
     Name = "Iapetus",
-    Path = "/Solar System/Planets/Saturn/Major Moons/Iapetus",
-    Description = "Third largest moon of Saturn"
+    Path = "/Solar System/Planets/Saturn/Major Moons/Iapetus"
   }
 }
 
@@ -72,8 +71,7 @@ local IapetusLabel = {
   Tag = { "solarsystem_labels", "moon_labels", "major_moon_labels" },
   GUI = {
     Name = "Iapetus Label",
-    Path = "/Solar System/Planets/Saturn/Major Moons/Iapetus",
-    Description = "Label for Saturn's moon Iapetus"
+    Path = "/Solar System/Planets/Saturn/Major Moons/Iapetus"
   }
 }
 
diff --git a/data/assets/scene/solarsystem/planets/saturn/kernels.asset b/data/assets/scene/solarsystem/planets/saturn/kernels.asset
index 3185fe6eb1..f64cc6d7fd 100644
--- a/data/assets/scene/solarsystem/planets/saturn/kernels.asset
+++ b/data/assets/scene/solarsystem/planets/saturn/kernels.asset
@@ -49,6 +49,7 @@ asset.export("ID", ID)
 asset.export("Frame", Frame)
 
 
+
 asset.meta = {
   Name = "Saturn Spice Kernels",
   Description = "Generic SPICE kernels for Saturn",
diff --git a/data/assets/scene/solarsystem/planets/saturn/kernels415.asset b/data/assets/scene/solarsystem/planets/saturn/kernels415.asset
index 8bdf08b953..7b0890c505 100644
--- a/data/assets/scene/solarsystem/planets/saturn/kernels415.asset
+++ b/data/assets/scene/solarsystem/planets/saturn/kernels415.asset
@@ -48,6 +48,7 @@ asset.export("ID", ID)
 asset.export("Frame", Frame)
 
 
+
 asset.meta = {
   Name = "Saturn Spice Kernels",
   Description = "Generic SPICE kernels for Saturn",
diff --git a/data/assets/scene/solarsystem/planets/saturn/minor/gallic_group.asset b/data/assets/scene/solarsystem/planets/saturn/minor/gallic_group.asset
index 48485914da..3767e88daa 100644
--- a/data/assets/scene/solarsystem/planets/saturn/minor/gallic_group.asset
+++ b/data/assets/scene/solarsystem/planets/saturn/minor/gallic_group.asset
@@ -86,8 +86,7 @@ local AlbiorixLabel = {
   },
   GUI = {
     Name = "Albiorix Label",
-    Path = "/Solar System/Planets/Saturn/Minor Moons/Gallic Group/Albiorix",
-    Description = "Label for Saturn's moon Albiorix (Gallic group)"
+    Path = "/Solar System/Planets/Saturn/Minor Moons/Gallic Group/Albiorix"
   }
 }
 
@@ -173,8 +172,7 @@ local BebhionnLabel = {
   },
   GUI = {
     Name = "Bebhionn Label",
-    Path = "/Solar System/Planets/Saturn/Minor Moons/Gallic Group/Bebhionn",
-    Description = "Label for Saturn's moon Bebhionn (Gallic group)"
+    Path = "/Solar System/Planets/Saturn/Minor Moons/Gallic Group/Bebhionn"
   }
 }
 
@@ -260,8 +258,7 @@ local ErriapusLabel = {
   },
   GUI = {
     Name = "Erriapus Label",
-    Path = "/Solar System/Planets/Saturn/Minor Moons/Gallic Group/Erriapus",
-    Description = "Label for Saturn's moon Erriapus (Gallic group)"
+    Path = "/Solar System/Planets/Saturn/Minor Moons/Gallic Group/Erriapus"
   }
 }
 
@@ -347,8 +344,7 @@ local TarvosLabel = {
   },
   GUI = {
     Name = "Tarvos Label",
-    Path = "/Solar System/Planets/Saturn/Minor Moons/Gallic Group/Tarvos",
-    Description = "Label for Saturn's moon Tarvos (Gallic group)"
+    Path = "/Solar System/Planets/Saturn/Minor Moons/Gallic Group/Tarvos"
   }
 }
 
diff --git a/data/assets/scene/solarsystem/planets/saturn/minor/inuit_group.asset b/data/assets/scene/solarsystem/planets/saturn/minor/inuit_group.asset
index dd8ca6a549..55403af79c 100644
--- a/data/assets/scene/solarsystem/planets/saturn/minor/inuit_group.asset
+++ b/data/assets/scene/solarsystem/planets/saturn/minor/inuit_group.asset
@@ -86,8 +86,7 @@ local KiviuqLabel = {
   },
   GUI = {
     Name = "Kiviuq Label",
-    Path = "/Solar System/Planets/Saturn/Minor Moons/Inuit Group/Kiviuq",
-    Description = "Label for Saturn's moon Kiviuq (Inuit group)"
+    Path = "/Solar System/Planets/Saturn/Minor Moons/Inuit Group/Kiviuq"
   }
 }
 
@@ -173,8 +172,7 @@ local IjiraqLabel = {
   },
   GUI = {
     Name = "Ijiraq Label",
-    Path = "/Solar System/Planets/Saturn/Minor Moons/Inuit Group/Ijiraq",
-    Description = "Label for Saturn's moon Ijiraq (Inuit group)"
+    Path = "/Solar System/Planets/Saturn/Minor Moons/Inuit Group/Ijiraq"
   }
 }
 
@@ -260,8 +258,7 @@ local PaaliaqLabel = {
   },
   GUI = {
     Name = "Paaliaq Label",
-    Path = "/Solar System/Planets/Saturn/Minor Moons/Inuit Group/Paaliaq",
-    Description = "Label for Saturn's moon Paaliaq (Inuit group)"
+    Path = "/Solar System/Planets/Saturn/Minor Moons/Inuit Group/Paaliaq"
   }
 }
 
@@ -347,8 +344,7 @@ local SiarnaqLabel = {
   },
   GUI = {
     Name = "Siarnaq Label",
-    Path = "/Solar System/Planets/Saturn/Minor Moons/Inuit Group/Siarnaq",
-    Description = "Label for Saturn's moon Siarnaq (Inuit group)"
+    Path = "/Solar System/Planets/Saturn/Minor Moons/Inuit Group/Siarnaq"
   }
 }
 
@@ -434,8 +430,7 @@ local TarqeqLabel = {
   },
   GUI = {
     Name = "Tarqeq Label",
-    Path = "/Solar System/Planets/Saturn/Minor Moons/Inuit Group/Tarqeq",
-    Description = "Label for Saturn's moon Tarqeq (Inuit group)"
+    Path = "/Solar System/Planets/Saturn/Minor Moons/Inuit Group/Tarqeq"
   }
 }
 
@@ -521,8 +516,7 @@ local S2004S29Label = {
   },
   GUI = {
     Name = "S/2004 S 29 Label",
-    Path = "/Solar System/Planets/Saturn/Minor Moons/Inuit Group/S2004S29",
-    Description = "Label for Saturn's moon S/2004 S 29 (Inuit group)"
+    Path = "/Solar System/Planets/Saturn/Minor Moons/Inuit Group/S2004S29"
   }
 }
 
@@ -608,8 +602,7 @@ local S2004S31Label = {
   },
   GUI = {
     Name = "S/2004 S 31 Label",
-    Path = "/Solar System/Planets/Saturn/Minor Moons/Inuit Group/S2004S31",
-    Description = "Label for Saturn's moon S/2004 S 31 (Inuit group)"
+    Path = "/Solar System/Planets/Saturn/Minor Moons/Inuit Group/S2004S31"
   }
 }
 
@@ -695,8 +688,7 @@ local S2019S01Label = {
   },
   GUI = {
     Name = "S/2019 S 01 Label",
-    Path = "/Solar System/Planets/Saturn/Minor Moons/Inuit Group/S2019S01",
-    Description = "Label for Saturn's moon S/2019 S 01 (Inuit group)"
+    Path = "/Solar System/Planets/Saturn/Minor Moons/Inuit Group/S2019S01"
   }
 }
 
diff --git a/data/assets/scene/solarsystem/planets/saturn/minor/norse_group.asset b/data/assets/scene/solarsystem/planets/saturn/minor/norse_group.asset
index 6c30ed7f07..9e0499b62f 100644
--- a/data/assets/scene/solarsystem/planets/saturn/minor/norse_group.asset
+++ b/data/assets/scene/solarsystem/planets/saturn/minor/norse_group.asset
@@ -87,8 +87,7 @@ local PhoebeLabel = {
   },
   GUI = {
     Name = "Phoebe Label",
-    Path = "/Solar System/Planets/Saturn/Minor Moons/Norse Group/Phoebe",
-    Description = "Label for Saturn's moon Phoebe (Norse group)"
+    Path = "/Solar System/Planets/Saturn/Minor Moons/Norse Group/Phoebe"
   }
 }
 
@@ -174,8 +173,7 @@ local SkathiLabel = {
   },
   GUI = {
     Name = "Skathi Label",
-    Path = "/Solar System/Planets/Saturn/Minor Moons/Norse Group/Skathi",
-    Description = "Label for Saturn's moon Skathi (Norse group)"
+    Path = "/Solar System/Planets/Saturn/Minor Moons/Norse Group/Skathi"
   }
 }
 
@@ -261,8 +259,7 @@ local S2007S2Label = {
   },
   GUI = {
     Name = "S/2007 S 2 Label",
-    Path = "/Solar System/Planets/Saturn/Minor Moons/Norse Group/S2007S2",
-    Description = "Label for Saturn's moon S/2007 S 2 (Norse group)"
+    Path = "/Solar System/Planets/Saturn/Minor Moons/Norse Group/S2007S2"
   }
 }
 
@@ -348,8 +345,7 @@ local SkollLabel = {
   },
   GUI = {
     Name = "Skoll Label",
-    Path = "/Solar System/Planets/Saturn/Minor Moons/Norse Group/Skoll",
-    Description = "Label for Saturn's moon Skoll (Norse group)"
+    Path = "/Solar System/Planets/Saturn/Minor Moons/Norse Group/Skoll"
   }
 }
 
@@ -435,8 +431,7 @@ local S2004S13Label = {
   },
   GUI = {
     Name = "S/2004 S 13 Label",
-    Path = "/Solar System/Planets/Saturn/Minor Moons/Norse Group/S2004S13",
-    Description = "Label for Saturn's moon S/2004 S 13 (Norse group)"
+    Path = "/Solar System/Planets/Saturn/Minor Moons/Norse Group/S2004S13"
   }
 }
 
@@ -522,8 +517,7 @@ local GreipLabel = {
   },
   GUI = {
     Name = "Greip Label",
-    Path = "/Solar System/Planets/Saturn/Minor Moons/Norse Group/Greip",
-    Description = "Label for Saturn's moon Greip (Norse group)"
+    Path = "/Solar System/Planets/Saturn/Minor Moons/Norse Group/Greip"
   }
 }
 
@@ -609,8 +603,7 @@ local HyrrokkinLabel = {
   },
   GUI = {
     Name = "Hyrrokkin Label",
-    Path = "/Solar System/Planets/Saturn/Minor Moons/Norse Group/Hyrrokkin",
-    Description = "Label for Saturn's moon Hyrrokkin (Norse group)"
+    Path = "/Solar System/Planets/Saturn/Minor Moons/Norse Group/Hyrrokkin"
   }
 }
 
@@ -696,8 +689,7 @@ local JarnsaxaLabel = {
   },
   GUI = {
     Name = "Jarnsaxa Label",
-    Path = "/Solar System/Planets/Saturn/Minor Moons/Norse Group/Jarnsaxa",
-    Description = "Label for Saturn's moon Jarnsaxa (Norse group)"
+    Path = "/Solar System/Planets/Saturn/Minor Moons/Norse Group/Jarnsaxa"
   }
 }
 
@@ -783,8 +775,7 @@ local MundilfariLabel = {
   },
   GUI = {
     Name = "Mundilfari Label",
-    Path = "/Solar System/Planets/Saturn/Minor Moons/Norse Group/Mundilfari",
-    Description = "Label for Saturn's moon Mundilfari (Norse group)"
+    Path = "/Solar System/Planets/Saturn/Minor Moons/Norse Group/Mundilfari"
   }
 }
 
@@ -870,8 +861,7 @@ local S2006S1Label = {
   },
   GUI = {
     Name = "S/2006 S 1 Label",
-    Path = "/Solar System/Planets/Saturn/Minor Moons/Norse Group/S2006S1",
-    Description = "Label for Saturn's moon S/2006 S 1 (Norse group)"
+    Path = "/Solar System/Planets/Saturn/Minor Moons/Norse Group/S2006S1"
   }
 }
 
@@ -957,8 +947,7 @@ local S2004S17Label = {
   },
   GUI = {
     Name = "S/2004 S 17 Label",
-    Path = "/Solar System/Planets/Saturn/Minor Moons/Norse Group/S2004S17",
-    Description = "Label for Saturn's moon S/2004 S 17 (Norse group)"
+    Path = "/Solar System/Planets/Saturn/Minor Moons/Norse Group/S2004S17"
   }
 }
 
@@ -1044,8 +1033,7 @@ local BergelmirLabel = {
   },
   GUI = {
     Name = "Bergelmir Label",
-    Path = "/Solar System/Planets/Saturn/Minor Moons/Norse Group/Bergelmir",
-    Description = "Label for Saturn's moon Bergelmir (Norse group)"
+    Path = "/Solar System/Planets/Saturn/Minor Moons/Norse Group/Bergelmir"
   }
 }
 
@@ -1131,8 +1119,7 @@ local NarviLabel = {
   },
   GUI = {
     Name = "Narvi Label",
-    Path = "/Solar System/Planets/Saturn/Minor Moons/Norse Group/Narvi",
-    Description = "Label for Saturn's moon Narvi (Norse group)"
+    Path = "/Solar System/Planets/Saturn/Minor Moons/Norse Group/Narvi"
   }
 }
 
@@ -1218,8 +1205,7 @@ local SuttungrLabel = {
   },
   GUI = {
     Name = "Suttungr Label",
-    Path = "/Solar System/Planets/Saturn/Minor Moons/Norse Group/Suttungr",
-    Description = "Label for Saturn's moon Suttungr (Norse group)"
+    Path = "/Solar System/Planets/Saturn/Minor Moons/Norse Group/Suttungr"
   }
 }
 
@@ -1305,8 +1291,7 @@ local HatiLabel = {
   },
   GUI = {
     Name = "Hati Label",
-    Path = "/Solar System/Planets/Saturn/Minor Moons/Norse Group/Hati",
-    Description = "Label for Saturn's moon Hati (Norse group)"
+    Path = "/Solar System/Planets/Saturn/Minor Moons/Norse Group/Hati"
   }
 }
 
@@ -1392,8 +1377,7 @@ local S2004S12Label = {
   },
   GUI = {
     Name = "S/2004 S 12 Label",
-    Path = "/Solar System/Planets/Saturn/Minor Moons/Norse Group/S2004S12",
-    Description = "Label for Saturn's moon S/2004 S 12 (Norse group)"
+    Path = "/Solar System/Planets/Saturn/Minor Moons/Norse Group/S2004S12"
   }
 }
 
@@ -1479,8 +1463,7 @@ local FarbautiLabel = {
   },
   GUI = {
     Name = "Farbauti Label",
-    Path = "/Solar System/Planets/Saturn/Minor Moons/Norse Group/Farbauti",
-    Description = "Label for Saturn's moon Farbauti (Norse group)"
+    Path = "/Solar System/Planets/Saturn/Minor Moons/Norse Group/Farbauti"
   }
 }
 
@@ -1566,8 +1549,7 @@ local ThrymrLabel = {
   },
   GUI = {
     Name = "Thrymr Label",
-    Path = "/Solar System/Planets/Saturn/Minor Moons/Norse Group/Thrymr",
-    Description = "Label for Saturn's moon Thrymr (Norse group)"
+    Path = "/Solar System/Planets/Saturn/Minor Moons/Norse Group/Thrymr"
   }
 }
 
@@ -1653,8 +1635,7 @@ local AegirLabel = {
   },
   GUI = {
     Name = "Aegir Label",
-    Path = "/Solar System/Planets/Saturn/Minor Moons/Norse Group/Aegir",
-    Description = "Label for Saturn's moon Aegir (Norse group)"
+    Path = "/Solar System/Planets/Saturn/Minor Moons/Norse Group/Aegir"
   }
 }
 
@@ -1740,8 +1721,7 @@ local S2007S3Label = {
   },
   GUI = {
     Name = "S/2007 S 3 Label",
-    Path = "/Solar System/Planets/Saturn/Minor Moons/Norse Group/S2007S3",
-    Description = "Label for Saturn's moon S/2007 S 3 (Norse group)"
+    Path = "/Solar System/Planets/Saturn/Minor Moons/Norse Group/S2007S3"
   }
 }
 
@@ -1827,8 +1807,7 @@ local BestlaLabel = {
   },
   GUI = {
     Name = "Bestla Label",
-    Path = "/Solar System/Planets/Saturn/Minor Moons/Norse Group/Bestla",
-    Description = "Label for Saturn's moon Bestla (Norse group)"
+    Path = "/Solar System/Planets/Saturn/Minor Moons/Norse Group/Bestla"
   }
 }
 
@@ -1914,8 +1893,7 @@ local S2004S7Label = {
   },
   GUI = {
     Name = "S/2004 S 7 Label",
-    Path = "/Solar System/Planets/Saturn/Minor Moons/Norse Group/S2004S7",
-    Description = "Label for Saturn's moon S/2004 S 7 (Norse group)"
+    Path = "/Solar System/Planets/Saturn/Minor Moons/Norse Group/S2004S7"
   }
 }
 
@@ -2001,8 +1979,7 @@ local S2006S3Label = {
   },
   GUI = {
     Name = "S/2006 S 3 Label",
-    Path = "/Solar System/Planets/Saturn/Minor Moons/Norse Group/S2006S3",
-    Description = "Label for Saturn's moon S/2006 S 3 (Norse group)"
+    Path = "/Solar System/Planets/Saturn/Minor Moons/Norse Group/S2006S3"
   }
 }
 
@@ -2088,8 +2065,7 @@ local FenrirLabel = {
   },
   GUI = {
     Name = "Fenrir Label",
-    Path = "/Solar System/Planets/Saturn/Minor Moons/Norse Group/Fenrir",
-    Description = "Label for Saturn's moon Fenrir (Norse group)"
+    Path = "/Solar System/Planets/Saturn/Minor Moons/Norse Group/Fenrir"
   }
 }
 
@@ -2175,8 +2151,7 @@ local SurturLabel = {
   },
   GUI = {
     Name = "Surtur Label",
-    Path = "/Solar System/Planets/Saturn/Minor Moons/Norse Group/Surtur",
-    Description = "Label for Saturn's moon Surtur (Norse group)"
+    Path = "/Solar System/Planets/Saturn/Minor Moons/Norse Group/Surtur"
   }
 }
 
@@ -2262,8 +2237,7 @@ local KariLabel = {
   },
   GUI = {
     Name = "Kari Label",
-    Path = "/Solar System/Planets/Saturn/Minor Moons/Norse Group/Kari",
-    Description = "Label for Saturn's moon Kari (Norse group)"
+    Path = "/Solar System/Planets/Saturn/Minor Moons/Norse Group/Kari"
   }
 }
 
@@ -2349,8 +2323,7 @@ local YmirLabel = {
   },
   GUI = {
     Name = "Ymir Label",
-    Path = "/Solar System/Planets/Saturn/Minor Moons/Norse Group/Ymir",
-    Description = "Label for Saturn's moon Ymir (Norse group)"
+    Path = "/Solar System/Planets/Saturn/Minor Moons/Norse Group/Ymir"
   }
 }
 
@@ -2436,8 +2409,7 @@ local LogeLabel = {
   },
   GUI = {
     Name = "Loge Label",
-    Path = "/Solar System/Planets/Saturn/Minor Moons/Norse Group/Loge",
-    Description = "Label for Saturn's moon Loge (Norse group)"
+    Path = "/Solar System/Planets/Saturn/Minor Moons/Norse Group/Loge"
   }
 }
 
@@ -2523,8 +2495,7 @@ local FornjotLabel = {
   },
   GUI = {
     Name = "Fornjot Label",
-    Path = "/Solar System/Planets/Saturn/Minor Moons/Norse Group/Fornjot",
-    Description = "Label for Saturn's moon Fornjot (Norse group)"
+    Path = "/Solar System/Planets/Saturn/Minor Moons/Norse Group/Fornjot"
   }
 }
 
@@ -2610,8 +2581,7 @@ local SkadiLabel = {
   },
   GUI = {
     Name = "Skadi Label",
-    Path = "/Solar System/Planets/Saturn/Minor Moons/Norse Group/Skadi",
-    Description = "Label for Saturn's moon Skadi (Norse group)"
+    Path = "/Solar System/Planets/Saturn/Minor Moons/Norse Group/Skadi"
   }
 }
 
@@ -2697,8 +2667,7 @@ local GridrLabel = {
   },
   GUI = {
     Name = "Gridr Label",
-    Path = "/Solar System/Planets/Saturn/Minor Moons/Norse Group/Gridr",
-    Description = "Label for Saturn's moon Gridr (Norse group)"
+    Path = "/Solar System/Planets/Saturn/Minor Moons/Norse Group/Gridr"
   }
 }
 
@@ -2784,8 +2753,7 @@ local AngrbodaLabel = {
   },
   GUI = {
     Name = "Angrboda Label",
-    Path = "/Solar System/Planets/Saturn/Minor Moons/Norse Group/Angrboda",
-    Description = "Label for Saturn's moon Angrboda (Norse group)"
+    Path = "/Solar System/Planets/Saturn/Minor Moons/Norse Group/Angrboda"
   }
 }
 
@@ -2871,8 +2839,7 @@ local SkrymirLabel = {
   },
   GUI = {
     Name = "Skrymir Label",
-    Path = "/Solar System/Planets/Saturn/Minor Moons/Norse Group/Skrymir",
-    Description = "Label for Saturn's moon Skrymir (Norse group)"
+    Path = "/Solar System/Planets/Saturn/Minor Moons/Norse Group/Skrymir"
   }
 }
 
@@ -2958,8 +2925,7 @@ local GerdLabel = {
   },
   GUI = {
     Name = "Gerd Label",
-    Path = "/Solar System/Planets/Saturn/Minor Moons/Norse Group/Gerd",
-    Description = "Label for Saturn's moon Gerd (Norse group)"
+    Path = "/Solar System/Planets/Saturn/Minor Moons/Norse Group/Gerd"
   }
 }
 
@@ -3045,8 +3011,7 @@ local S2004S26Label = {
   },
   GUI = {
     Name = "S/2004 S 26 Label",
-    Path = "/Solar System/Planets/Saturn/Minor Moons/Norse Group/S2004S26",
-    Description = "Label for Saturn's moon S/2004 S 26 (Norse group)"
+    Path = "/Solar System/Planets/Saturn/Minor Moons/Norse Group/S2004S26"
   }
 }
 
@@ -3132,8 +3097,7 @@ local EggtherLabel = {
   },
   GUI = {
     Name = "Eggther Label",
-    Path = "/Solar System/Planets/Saturn/Minor Moons/Norse Group/Eggther",
-    Description = "Label for Saturn's moon Eggther (Norse group)"
+    Path = "/Solar System/Planets/Saturn/Minor Moons/Norse Group/Eggther"
   }
 }
 
@@ -3219,8 +3183,7 @@ local BeliLabel = {
   },
   GUI = {
     Name = "Beli Label",
-    Path = "/Solar System/Planets/Saturn/Minor Moons/Norse Group/Beli",
-    Description = "Label for Saturn's moon Beli (Norse group)"
+    Path = "/Solar System/Planets/Saturn/Minor Moons/Norse Group/Beli"
   }
 }
 
@@ -3306,8 +3269,7 @@ local GunnlodLabel = {
   },
   GUI = {
     Name = "Gunnlod Label",
-    Path = "/Solar System/Planets/Saturn/Minor Moons/Norse Group/Gunnlod",
-    Description = "Label for Saturn's moon Gunnlod (Norse group)"
+    Path = "/Solar System/Planets/Saturn/Minor Moons/Norse Group/Gunnlod"
   }
 }
 
@@ -3393,8 +3355,7 @@ local ThiazziLabel = {
   },
   GUI = {
     Name = "Thiazzi Label",
-    Path = "/Solar System/Planets/Saturn/Minor Moons/Norse Group/Thiazzi",
-    Description = "Label for Saturn's moon Thiazzi (Norse group)"
+    Path = "/Solar System/Planets/Saturn/Minor Moons/Norse Group/Thiazzi"
   }
 }
 
@@ -3480,8 +3441,7 @@ local S2004S34Label = {
   },
   GUI = {
     Name = "S/2004 S 34 Label",
-    Path = "/Solar System/Planets/Saturn/Minor Moons/Norse Group/S2004S34",
-    Description = "Label for Saturn's moon S/2004 S 34 (Norse group)"
+    Path = "/Solar System/Planets/Saturn/Minor Moons/Norse Group/S2004S34"
   }
 }
 
@@ -3567,8 +3527,7 @@ local AlvaldiLabel = {
   },
   GUI = {
     Name = "Alvaldi Label",
-    Path = "/Solar System/Planets/Saturn/Minor Moons/Norse Group/Alvaldi",
-    Description = "Label for Saturn's moon Alvaldi (Norse group)"
+    Path = "/Solar System/Planets/Saturn/Minor Moons/Norse Group/Alvaldi"
   }
 }
 
@@ -3654,8 +3613,7 @@ local GeirrodLabel = {
   },
   GUI = {
     Name = "Geirrod Label",
-    Path = "/Solar System/Planets/Saturn/Minor Moons/Norse Group/Geirrod",
-    Description = "Label for Saturn's moon Geirrod (Norse group)"
+    Path = "/Solar System/Planets/Saturn/Minor Moons/Norse Group/Geirrod"
   }
 }
 
@@ -3741,8 +3699,7 @@ local S2004S28Label = {
   },
   GUI = {
     Name = "S/2004 S 28 Label",
-    Path = "/Solar System/Planets/Saturn/Minor Moons/Norse Group/S2004S28",
-    Description = "Label for Saturn's moon S/2004 S 28 (Norse group)"
+    Path = "/Solar System/Planets/Saturn/Minor Moons/Norse Group/S2004S28"
   }
 }
 
@@ -3828,8 +3785,7 @@ local S2004S21Label = {
   },
   GUI = {
     Name = "S/2004 S 21 Label",
-    Path = "/Solar System/Planets/Saturn/Minor Moons/Norse Group/S2004S21",
-    Description = "Label for Saturn's moon S/2004 S 21 (Norse group)"
+    Path = "/Solar System/Planets/Saturn/Minor Moons/Norse Group/S2004S21"
   }
 }
 
@@ -3915,8 +3871,7 @@ local S2004S36Label = {
   },
   GUI = {
     Name = "S/2004 S 36 Label",
-    Path = "/Solar System/Planets/Saturn/Minor Moons/Norse Group/S2004S36",
-    Description = "Label for Saturn's moon S/2004 S 36 (Norse group)"
+    Path = "/Solar System/Planets/Saturn/Minor Moons/Norse Group/S2004S36"
   }
 }
 
@@ -4002,8 +3957,7 @@ local S2004S37Label = {
   },
   GUI = {
     Name = "S/2004 S 37 Label",
-    Path = "/Solar System/Planets/Saturn/Minor Moons/Norse Group/S2004S37",
-    Description = "Label for Saturn's moon S/2004 S 37 (Norse group)"
+    Path = "/Solar System/Planets/Saturn/Minor Moons/Norse Group/S2004S37"
   }
 }
 
@@ -4089,8 +4043,7 @@ local S2004S39Label = {
   },
   GUI = {
     Name = "S/2004 S 39 Label",
-    Path = "/Solar System/Planets/Saturn/Minor Moons/Norse Group/S2004S39",
-    Description = "Label for Saturn's moon S/2004 S 39 (Norse group)"
+    Path = "/Solar System/Planets/Saturn/Minor Moons/Norse Group/S2004S39"
   }
 }
 
diff --git a/data/assets/scene/solarsystem/planets/saturn/minor/other_group.asset b/data/assets/scene/solarsystem/planets/saturn/minor/other_group.asset
index 710f33ada2..6a10e65078 100644
--- a/data/assets/scene/solarsystem/planets/saturn/minor/other_group.asset
+++ b/data/assets/scene/solarsystem/planets/saturn/minor/other_group.asset
@@ -88,8 +88,7 @@ local AegaeonLabel = {
   },
   GUI = {
     Name = "Aegaeon Label",
-    Path = "/Solar System/Planets/Saturn/Minor Moons/Other Group/Aegaeon",
-    Description = "Label for Saturn's moon Aegaeon (Other group)"
+    Path = "/Solar System/Planets/Saturn/Minor Moons/Other Group/Aegaeon"
   }
 }
 
@@ -175,8 +174,7 @@ local MethoneLabel = {
   },
   GUI = {
     Name = "Methone Label",
-    Path = "/Solar System/Planets/Saturn/Minor Moons/Other Group/Methone",
-    Description = "Label for Saturn's moon Methone (Other group)"
+    Path = "/Solar System/Planets/Saturn/Minor Moons/Other Group/Methone"
   }
 }
 
@@ -262,8 +260,7 @@ local AntheLabel = {
   },
   GUI = {
     Name = "Anthe Label",
-    Path = "/Solar System/Planets/Saturn/Minor Moons/Other Group/Anthe",
-    Description = "Label for Saturn's moon Anthe (Other group)"
+    Path = "/Solar System/Planets/Saturn/Minor Moons/Other Group/Anthe"
   }
 }
 
@@ -349,8 +346,7 @@ local PalleneLabel = {
   },
   GUI = {
     Name = "Pallene Label",
-    Path = "/Solar System/Planets/Saturn/Minor Moons/Other Group/Pallene",
-    Description = "Label for Saturn's moon Pallene (Other group)"
+    Path = "/Solar System/Planets/Saturn/Minor Moons/Other Group/Pallene"
   }
 }
 
@@ -436,8 +432,7 @@ local TelestoLabel = {
   },
   GUI = {
     Name = "Telesto Label",
-    Path = "/Solar System/Planets/Saturn/Minor Moons/Other Group/Telesto",
-    Description = "Label for Saturn's moon Telesto (Other group)"
+    Path = "/Solar System/Planets/Saturn/Minor Moons/Other Group/Telesto"
   }
 }
 
@@ -523,8 +518,7 @@ local CalypsoLabel = {
   },
   GUI = {
     Name = "Calypso Label",
-    Path = "/Solar System/Planets/Saturn/Minor Moons/Other Group/Calypso",
-    Description = "Label for Saturn's moon Calypso (Other group)"
+    Path = "/Solar System/Planets/Saturn/Minor Moons/Other Group/Calypso"
   }
 }
 
@@ -610,8 +604,7 @@ local HeleneLabel = {
   },
   GUI = {
     Name = "Helene Label",
-    Path = "/Solar System/Planets/Saturn/Minor Moons/Other Group/Helene",
-    Description = "Label for Saturn's moon Helene (Other group)"
+    Path = "/Solar System/Planets/Saturn/Minor Moons/Other Group/Helene"
   }
 }
 
@@ -697,8 +690,7 @@ local PolydeucesLabel = {
   },
   GUI = {
     Name = "Polydeuces Label",
-    Path = "/Solar System/Planets/Saturn/Minor Moons/Other Group/Polydeuces",
-    Description = "Label for Saturn's moon Polydeuces (Other group)"
+    Path = "/Solar System/Planets/Saturn/Minor Moons/Other Group/Polydeuces"
   }
 }
 
@@ -784,8 +776,7 @@ local S2004S24Label = {
   },
   GUI = {
     Name = "S/2004 S 24 Label",
-    Path = "/Solar System/Planets/Saturn/Minor Moons/Other Group/S2004S24",
-    Description = "Label for Saturn's moon S/2004 S 24 (Other group)"
+    Path = "/Solar System/Planets/Saturn/Minor Moons/Other Group/S2004S24"
   }
 }
 
diff --git a/data/assets/scene/solarsystem/planets/saturn/minor/shepherd_group.asset b/data/assets/scene/solarsystem/planets/saturn/minor/shepherd_group.asset
index 410c15c741..b371212420 100644
--- a/data/assets/scene/solarsystem/planets/saturn/minor/shepherd_group.asset
+++ b/data/assets/scene/solarsystem/planets/saturn/minor/shepherd_group.asset
@@ -17,7 +17,6 @@ local kernels = {
   syncedKernels .. "sat393_daphnis.bsp"
 }
 
-
 local Prometheus = {
   Identifier = "Prometheus",
   Parent = transforms.SaturnBarycenter.Identifier,
@@ -100,8 +99,7 @@ local PrometheusLabel = {
   },
   GUI = {
     Name = "Prometheus Label",
-    Path = "/Solar System/Planets/Saturn/Minor Moons/Shepherd Moons/Prometheus",
-    Description = "Label for Saturn's moon Prometheus (Shepherd Moons)"
+    Path = "/Solar System/Planets/Saturn/Minor Moons/Shepherd Moons/Prometheus"
   }
 }
 
@@ -187,8 +185,7 @@ local PandoraLabel = {
   },
   GUI = {
     Name = "Pandora Label",
-    Path = "/Solar System/Planets/Saturn/Minor Moons/Shepherd Moons/Pandora",
-    Description = "Label for Saturn's moon Pandora (Shepherd Moons)"
+    Path = "/Solar System/Planets/Saturn/Minor Moons/Shepherd Moons/Pandora"
   }
 }
 
@@ -274,8 +271,7 @@ local AtlasLabel = {
   },
   GUI = {
     Name = "Atlas Label",
-    Path = "/Solar System/Planets/Saturn/Minor Moons/Shepherd Moons/Atlas",
-    Description = "Label for Saturn's moon Atlas (Shepherd Moons)"
+    Path = "/Solar System/Planets/Saturn/Minor Moons/Shepherd Moons/Atlas"
   }
 }
 
@@ -361,8 +357,7 @@ local JanusLabel = {
   },
   GUI = {
     Name = "Janus Label",
-    Path = "/Solar System/Planets/Saturn/Minor Moons/Shepherd Moons/Janus",
-    Description = "Label for Saturn's moon Janus (Shepherd Moons)"
+    Path = "/Solar System/Planets/Saturn/Minor Moons/Shepherd Moons/Janus"
   }
 }
 
@@ -448,8 +443,7 @@ local EpimetheusLabel = {
   },
   GUI = {
     Name = "Epimetheus Label",
-    Path = "/Solar System/Planets/Saturn/Minor Moons/Shepherd Moons/Epimetheus",
-    Description = "Label for Saturn's moon Epimetheus (Shepherd Moons)"
+    Path = "/Solar System/Planets/Saturn/Minor Moons/Shepherd Moons/Epimetheus"
   }
 }
 
@@ -535,8 +529,7 @@ local DaphnisLabel = {
   },
   GUI = {
     Name = "Daphnis Label",
-    Path = "/Solar System/Planets/Saturn/Minor Moons/Shepherd Moons/Daphnis",
-    Description = "Label for Saturn's moon Daphnis (Shepherd Moons)"
+    Path = "/Solar System/Planets/Saturn/Minor Moons/Shepherd Moons/Daphnis"
   }
 }
 
@@ -622,11 +615,11 @@ local PanLabel = {
   },
   GUI = {
     Name = "Pan Label",
-    Path = "/Solar System/Planets/Saturn/Minor Moons/Shepherd Moons/Pan",
-    Description = "Label for Saturn's moon Pan (Shepherd Moons)"
+    Path = "/Solar System/Planets/Saturn/Minor Moons/Shepherd Moons/Pan"
   }
 }
 
+
 asset.onInitialize(function()
   openspace.spice.loadKernel(syncedKernels .. "sat393_daphnis.bsp")
   openspace.spice.loadKernel(syncedKernels .. "sat415.bsp")
diff --git a/data/assets/scene/solarsystem/planets/saturn/rhea/rhea.asset b/data/assets/scene/solarsystem/planets/saturn/rhea/rhea.asset
index 67d9563193..0c7e8d1b64 100644
--- a/data/assets/scene/solarsystem/planets/saturn/rhea/rhea.asset
+++ b/data/assets/scene/solarsystem/planets/saturn/rhea/rhea.asset
@@ -72,8 +72,7 @@ local RheaLabel = {
   Tag = { "solarsystem_labels", "moon_labels", "major_moon_labels", "moon_major_saturn" },
   GUI = {
     Name = "Rhea Label",
-    Path = "/Solar System/Planets/Saturn/Major Moons/Rhea",
-    Description = "Label for Saturn's moon Rhea"
+    Path = "/Solar System/Planets/Saturn/Major Moons/Rhea"
   }
 }
 
diff --git a/data/assets/scene/solarsystem/planets/saturn/rhea/trail.asset b/data/assets/scene/solarsystem/planets/saturn/rhea/trail.asset
index fa62a7f6a9..f439933392 100644
--- a/data/assets/scene/solarsystem/planets/saturn/rhea/trail.asset
+++ b/data/assets/scene/solarsystem/planets/saturn/rhea/trail.asset
@@ -18,7 +18,12 @@ local RheaTrail = {
     Period = 108.0 / 24.0,
     Resolution = 1000
   },
-  Tag = { "moonTrail_solarSystem", "moonTrail_giants", "moonTrail_saturn", "moonTrail_major_saturn" },
+  Tag = {
+    "moonTrail_solarSystem",
+    "moonTrail_giants",
+    "moonTrail_saturn",
+    "moonTrail_major_saturn"
+  },
   GUI = {
     Name = "Rhea Trail",
     Path = "/Solar System/Planets/Saturn/Major Moons/Rhea",
diff --git a/data/assets/scene/solarsystem/planets/saturn/tethys/tethys.asset b/data/assets/scene/solarsystem/planets/saturn/tethys/tethys.asset
index 8ad3a467a5..d895eb207a 100644
--- a/data/assets/scene/solarsystem/planets/saturn/tethys/tethys.asset
+++ b/data/assets/scene/solarsystem/planets/saturn/tethys/tethys.asset
@@ -70,8 +70,7 @@ local TethysLabel = {
   Tag = { "solarsystem_labels", "moon_labels", "major_moon_labels", "moon_major_saturn" },
   GUI = {
     Name = "Tethys Label",
-    Path = "/Solar System/Planets/Saturn/Major Moons/Tethys",
-    Description = "Label for Saturn's moon Tethys"
+    Path = "/Solar System/Planets/Saturn/Major Moons/Tethys"
   }
 }
 
diff --git a/data/assets/scene/solarsystem/planets/saturn/tethys/trail.asset b/data/assets/scene/solarsystem/planets/saturn/tethys/trail.asset
index 911399eef1..1a9539d8f6 100644
--- a/data/assets/scene/solarsystem/planets/saturn/tethys/trail.asset
+++ b/data/assets/scene/solarsystem/planets/saturn/tethys/trail.asset
@@ -18,7 +18,12 @@ local TethysTrail = {
     Period = 45.0 / 24.0,
     Resolution = 1000
   },
-  Tag = { "moonTrail_solarSystem", "moonTrail_giants", "moonTrail_saturn", "moonTrail_major_saturn" },
+  Tag = {
+    "moonTrail_solarSystem",
+    "moonTrail_giants",
+    "moonTrail_saturn",
+    "moonTrail_major_saturn"
+  },
   GUI = {
     Name = "Tethys Trail",
     Path = "/Solar System/Planets/Saturn/Major Moons/Tethys",
diff --git a/data/assets/scene/solarsystem/planets/saturn/titan/trail.asset b/data/assets/scene/solarsystem/planets/saturn/titan/trail.asset
index ad5bf68132..942716d5f0 100644
--- a/data/assets/scene/solarsystem/planets/saturn/titan/trail.asset
+++ b/data/assets/scene/solarsystem/planets/saturn/titan/trail.asset
@@ -18,7 +18,12 @@ local TitanTrail = {
     Period = 16.0,
     Resolution = 1000
   },
-  Tag = { "moonTrail_solarSystem", "moonTrail_giants", "moonTrail_saturn", "moonTrail_major_saturn" },
+  Tag = {
+    "moonTrail_solarSystem",
+    "moonTrail_giants",
+    "moonTrail_saturn",
+    "moonTrail_major_saturn"
+  },
   GUI = {
     Name = "Titan Trail",
     Path = "/Solar System/Planets/Saturn/Major Moons/Titan",
diff --git a/data/assets/scene/solarsystem/planets/sweden_layers.asset b/data/assets/scene/solarsystem/planets/sweden_layers.asset
index b7a584bab2..43cb383cf2 100644
--- a/data/assets/scene/solarsystem/planets/sweden_layers.asset
+++ b/data/assets/scene/solarsystem/planets/sweden_layers.asset
@@ -17,7 +17,6 @@ asset.meta = {
   Description = [[Adds default layers for all planets. Remove this asset and include
     individual layers for planets to customize planet layers
 
-
     Layers only loaded from the Sweden server
   ]],
   Author = "OpenSpace Team",
diff --git a/data/assets/scene/solarsystem/planets/uranus/inner_moons.asset b/data/assets/scene/solarsystem/planets/uranus/inner_moons.asset
index a04d610317..eecd6fbe4b 100644
--- a/data/assets/scene/solarsystem/planets/uranus/inner_moons.asset
+++ b/data/assets/scene/solarsystem/planets/uranus/inner_moons.asset
@@ -79,8 +79,7 @@ local CordeliaLabel = {
   Tag = { "solarsystem_labels", "moon_labels", "minor_moon_labels" },
   GUI = {
     Name = "Cordelia Label",
-    Path = "/Solar System/Planets/Uranus/Minor Moons/Inner Moons/Cordelia",
-    Description = "Label for Uranus' moon Cordelia (Inner Moons)"
+    Path = "/Solar System/Planets/Uranus/Minor Moons/Inner Moons/Cordelia"
   }
 }
 
@@ -159,8 +158,7 @@ local OpheliaLabel = {
   Tag = { "solarsystem_labels", "moon_labels", "minor_moon_labels" },
   GUI = {
     Name = "Ophelia Label",
-    Path = "/Solar System/Planets/Uranus/Minor Moons/Inner Moons/Ophelia",
-    Description = "Label for Uranus' moon Ophelia (Inner Moons)"
+    Path = "/Solar System/Planets/Uranus/Minor Moons/Inner Moons/Ophelia"
   }
 }
 
@@ -239,8 +237,7 @@ local BiancaLabel = {
   Tag = { "solarsystem_labels", "moon_labels", "minor_moon_labels" },
   GUI = {
     Name = "Bianca Label",
-    Path = "/Solar System/Planets/Uranus/Minor Moons/Inner Moons/Bianca",
-    Description = "Label for Uranus' moon Bianca (Inner Moons)"
+    Path = "/Solar System/Planets/Uranus/Minor Moons/Inner Moons/Bianca"
   }
 }
 
@@ -319,8 +316,7 @@ local CressidaLabel = {
   Tag = { "solarsystem_labels", "moon_labels", "minor_moon_labels" },
   GUI = {
     Name = "Cressida Label",
-    Path = "/Solar System/Planets/Uranus/Minor Moons/Inner Moons/Cressida",
-    Description = "Label for Uranus' moon Cressida (Inner Moons)"
+    Path = "/Solar System/Planets/Uranus/Minor Moons/Inner Moons/Cressida"
   }
 }
 
@@ -399,8 +395,7 @@ local DesdemonaLabel = {
   Tag = { "solarsystem_labels", "moon_labels", "minor_moon_labels" },
   GUI = {
     Name = "Desdemona Label",
-    Path = "/Solar System/Planets/Uranus/Minor Moons/Inner Moons/Desdemona",
-    Description = "Label for Uranus' moon Desdemona (Inner Moons)"
+    Path = "/Solar System/Planets/Uranus/Minor Moons/Inner Moons/Desdemona"
   }
 }
 
@@ -479,8 +474,7 @@ local JulietLabel = {
   Tag = { "solarsystem_labels", "moon_labels", "minor_moon_labels" },
   GUI = {
     Name = "Juliet Label",
-    Path = "/Solar System/Planets/Uranus/Minor Moons/Inner Moons/Juliet",
-    Description = "Label for Uranus' moon Juliet (Inner Moons)"
+    Path = "/Solar System/Planets/Uranus/Minor Moons/Inner Moons/Juliet"
   }
 }
 
@@ -559,8 +553,7 @@ local PortiaLabel = {
   Tag = { "solarsystem_labels", "moon_labels", "minor_moon_labels" },
   GUI = {
     Name = "Portia Label",
-    Path = "/Solar System/Planets/Uranus/Minor Moons/Inner Moons/Portia",
-    Description = "Label for Uranus' moon Portia (Inner Moons)"
+    Path = "/Solar System/Planets/Uranus/Minor Moons/Inner Moons/Portia"
   }
 }
 
@@ -639,8 +632,7 @@ local RosalindLabel = {
   Tag = { "solarsystem_labels", "moon_labels", "minor_moon_labels" },
   GUI = {
     Name = "Rosalind Label",
-    Path = "/Solar System/Planets/Uranus/Minor Moons/Inner Moons/Rosalind",
-    Description = "Label for Uranus' moon Rosalind (Inner Moons)"
+    Path = "/Solar System/Planets/Uranus/Minor Moons/Inner Moons/Rosalind"
   }
 }
 
@@ -719,8 +711,7 @@ local CupidLabel = {
   Tag = { "solarsystem_labels", "moon_labels", "minor_moon_labels" },
   GUI = {
     Name = "Cupid Label",
-    Path = "/Solar System/Planets/Uranus/Minor Moons/Inner Moons/Cupid",
-    Description = "Label for Uranus' moon Cupid (Inner Moons)"
+    Path = "/Solar System/Planets/Uranus/Minor Moons/Inner Moons/Cupid"
   }
 }
 
@@ -799,8 +790,7 @@ local BelindaLabel = {
   Tag = { "solarsystem_labels", "moon_labels", "minor_moon_labels" },
   GUI = {
     Name = "Belinda Label",
-    Path = "/Solar System/Planets/Uranus/Minor Moons/Inner Moons/Belinda",
-    Description = "Label for Uranus' moon Belinda (Inner Moons)"
+    Path = "/Solar System/Planets/Uranus/Minor Moons/Inner Moons/Belinda"
   }
 }
 
@@ -879,8 +869,7 @@ local PerditaLabel = {
   Tag = { "solarsystem_labels", "moon_labels", "minor_moon_labels" },
   GUI = {
     Name = "Perdita Label",
-    Path = "/Solar System/Planets/Uranus/Minor Moons/Inner Moons/Perdita",
-    Description = "Label for Uranus' moon Perdita (Inner Moons)"
+    Path = "/Solar System/Planets/Uranus/Minor Moons/Inner Moons/Perdita"
   }
 }
 
@@ -959,8 +948,7 @@ local PuckLabel = {
   Tag = { "solarsystem_labels", "moon_labels", "minor_moon_labels" },
   GUI = {
     Name = "Puck Label",
-    Path = "/Solar System/Planets/Uranus/Minor Moons/Inner Moons/Puck",
-    Description = "Label for Uranus' moon Puck (Inner Moons)"
+    Path = "/Solar System/Planets/Uranus/Minor Moons/Inner Moons/Puck"
   }
 }
 
@@ -1039,11 +1027,11 @@ local MabLabel = {
   Tag = { "solarsystem_labels", "moon_labels", "minor_moon_labels" },
   GUI = {
     Name = "Mab Label",
-    Path = "/Solar System/Planets/Uranus/Minor Moons/Inner Moons/Mab",
-    Description = "Label for Uranus' moon Mab (Inner Moons)"
+    Path = "/Solar System/Planets/Uranus/Minor Moons/Inner Moons/Mab"
   }
 }
 
+
 asset.onInitialize(function()
   openspace.addSceneGraphNode(Cordelia)
   openspace.addSceneGraphNode(CordeliaTrail)
diff --git a/data/assets/scene/solarsystem/planets/uranus/irregular_prograde_moons.asset b/data/assets/scene/solarsystem/planets/uranus/irregular_prograde_moons.asset
index dd68a69582..3502dfc264 100644
--- a/data/assets/scene/solarsystem/planets/uranus/irregular_prograde_moons.asset
+++ b/data/assets/scene/solarsystem/planets/uranus/irregular_prograde_moons.asset
@@ -79,8 +79,7 @@ local MargaretLabel = {
   Tag = { "solarsystem_labels", "moon_labels", "minor_moon_labels" },
   GUI = {
     Name = "Margaret Label",
-    Path = "/Solar System/Planets/Uranus/Minor Moons/Irregular Prograde Moons/Margaret",
-    Description = "Label for Uranus' moon Margaret (Irregular Prograde Moons)"
+    Path = "/Solar System/Planets/Uranus/Minor Moons/Irregular Prograde Moons/Margaret"
   }
 }
 
diff --git a/data/assets/scene/solarsystem/planets/uranus/irregular_retrograde_moons.asset b/data/assets/scene/solarsystem/planets/uranus/irregular_retrograde_moons.asset
index f60afa381f..15fbab936d 100644
--- a/data/assets/scene/solarsystem/planets/uranus/irregular_retrograde_moons.asset
+++ b/data/assets/scene/solarsystem/planets/uranus/irregular_retrograde_moons.asset
@@ -79,8 +79,7 @@ local FranciscoLabel = {
   Tag = { "solarsystem_labels", "moon_labels", "minor_moon_labels" },
   GUI = {
     Name = "Francisco Label",
-    Path = "/Solar System/Planets/Uranus/Minor Moons/Irregular Retrograde Moons/Francisco",
-    Description = "Label for Uranus' moon Francisco (Irregular Retrograde Moons)"
+    Path = "/Solar System/Planets/Uranus/Minor Moons/Irregular Retrograde Moons/Francisco"
   }
 }
 
@@ -159,8 +158,7 @@ local CalibanLabel = {
   Tag = { "solarsystem_labels", "moon_labels", "minor_moon_labels" },
   GUI = {
     Name = "Caliban Label",
-    Path = "/Solar System/Planets/Uranus/Minor Moons/Irregular Retrograde Moons/Caliban",
-    Description = "Label for Uranus' moon Caliban (Irregular Retrograde Moons)"
+    Path = "/Solar System/Planets/Uranus/Minor Moons/Irregular Retrograde Moons/Caliban"
   }
 }
 
@@ -239,8 +237,7 @@ local StephanoLabel = {
   Tag = { "solarsystem_labels", "moon_labels", "minor_moon_labels" },
   GUI = {
     Name = "Stephano Label",
-    Path = "/Solar System/Planets/Uranus/Minor Moons/Irregular Retrograde Moons/Stephano",
-    Description = "Label for Uranus' moon Stephano (Irregular Retrograde Moons)"
+    Path = "/Solar System/Planets/Uranus/Minor Moons/Irregular Retrograde Moons/Stephano"
   }
 }
 
@@ -319,8 +316,7 @@ local TrinculoLabel = {
   Tag = { "solarsystem_labels", "moon_labels", "minor_moon_labels" },
   GUI = {
     Name = "Trinculo Label",
-    Path = "/Solar System/Planets/Uranus/Minor Moons/Irregular Retrograde Moons/Trinculo",
-    Description = "Label for Uranus' moon Trinculo (Irregular Retrograde Moons)"
+    Path = "/Solar System/Planets/Uranus/Minor Moons/Irregular Retrograde Moons/Trinculo"
   }
 }
 
@@ -399,8 +395,7 @@ local SycoraxLabel = {
   Tag = { "solarsystem_labels", "moon_labels", "minor_moon_labels" },
   GUI = {
     Name = "Sycorax Label",
-    Path = "/Solar System/Planets/Uranus/Minor Moons/Irregular Retrograde Moons/Sycorax",
-    Description = "Label for Uranus' moon Sycorax (Irregular Retrograde Moons)"
+    Path = "/Solar System/Planets/Uranus/Minor Moons/Irregular Retrograde Moons/Sycorax"
   }
 }
 
@@ -479,8 +474,7 @@ local ProsperoLabel = {
   Tag = { "solarsystem_labels", "moon_labels", "minor_moon_labels" },
   GUI = {
     Name = "Prospero Label",
-    Path = "/Solar System/Planets/Uranus/Minor Moons/Irregular Retrograde Moons/Prospero",
-    Description = "Label for Uranus' moon Prospero (Irregular Retrograde Moons)"
+    Path = "/Solar System/Planets/Uranus/Minor Moons/Irregular Retrograde Moons/Prospero"
   }
 }
 
@@ -559,8 +553,7 @@ local SetebosLabel = {
   Tag = { "solarsystem_labels", "moon_labels", "minor_moon_labels" },
   GUI = {
     Name = "Setebos Label",
-    Path = "/Solar System/Planets/Uranus/Minor Moons/Irregular Retrograde Moons/Setebos",
-    Description = "Label for Uranus' moon Setebos (Irregular Retrograde Moons)"
+    Path = "/Solar System/Planets/Uranus/Minor Moons/Irregular Retrograde Moons/Setebos"
   }
 }
 
@@ -639,8 +632,7 @@ local FerdinandLabel = {
   Tag = { "solarsystem_labels", "moon_labels", "minor_moon_labels" },
   GUI = {
     Name = "Ferdinand Label",
-    Path = "/Solar System/Planets/Uranus/Minor Moons/Irregular Retrograde Moons/Ferdinand",
-    Description = "Label for Uranus' moon Ferdinand (Irregular Retrograde Moons)"
+    Path = "/Solar System/Planets/Uranus/Minor Moons/Irregular Retrograde Moons/Ferdinand"
   }
 }
 
@@ -746,6 +738,7 @@ asset.export(FerdinandTrail)
 asset.export(FerdinandLabel)
 
 
+
 asset.meta = {
   Name = "Uranus Irregular Retrograde Moons",
   Description = [[Procedural Globe asset containing Uranus' irregular retrograde moons:
diff --git a/data/assets/scene/solarsystem/planets/uranus/kernels.asset b/data/assets/scene/solarsystem/planets/uranus/kernels.asset
index 2ce3e6350f..50ea5d8bb7 100644
--- a/data/assets/scene/solarsystem/planets/uranus/kernels.asset
+++ b/data/assets/scene/solarsystem/planets/uranus/kernels.asset
@@ -39,6 +39,7 @@ asset.export("ID", ID)
 asset.export("Frame", Frame)
 
 
+
 asset.meta = {
   Name = "Uranus Spice Kernels",
   Description = "Generic SPICE kernels for Uranus",
diff --git a/data/assets/scene/solarsystem/planets/uranus/major_moons.asset b/data/assets/scene/solarsystem/planets/uranus/major_moons.asset
index 4764b2d179..771216c58f 100644
--- a/data/assets/scene/solarsystem/planets/uranus/major_moons.asset
+++ b/data/assets/scene/solarsystem/planets/uranus/major_moons.asset
@@ -18,7 +18,13 @@ local Miranda = {
     Type = "RenderableGlobe",
     Radii = { 471600, 468000, 466000 }
   },
-  Tag = { "moon_solarSystem", "moon_giants", "moon_uranus", "moon_major", "moon_major_uranus" },
+  Tag = {
+    "moon_solarSystem",
+    "moon_giants",
+    "moon_uranus",
+    "moon_major",
+    "moon_major_uranus"
+  },
   GUI = {
     Name = "Miranda",
     Path = "/Solar System/Planets/Uranus/Major Moons/Miranda"
@@ -39,7 +45,12 @@ local MirandaTrail = {
     Period = 1.413479,
     Resolution = 1000
   },
-  Tag = { "moonTrail_solarSystem", "moonTrail_giants", "moonTrail_uranus", "moonTrail_major_uranus" },
+  Tag = {
+    "moonTrail_solarSystem",
+    "moonTrail_giants",
+    "moonTrail_uranus",
+    "moonTrail_major_uranus"
+  },
   GUI = {
     Name = "Miranda Trail",
     Path = "/Solar System/Planets/Uranus/Major Moons/Miranda"
@@ -66,8 +77,7 @@ local MirandaLabel = {
   Tag = { "solarsystem_labels", "moon_labels", "major_moon_labels" },
   GUI = {
     Name = "Miranda Label",
-    Path = "/Solar System/Planets/Uranus/Major Moons/Miranda",
-    Description = "Label for Uranus' moon Miranda"
+    Path = "/Solar System/Planets/Uranus/Major Moons/Miranda"
   }
 }
 
@@ -85,7 +95,13 @@ local Ariel = {
     Type = "RenderableGlobe",
     Radii = { 1162000, 1156000, 1155000 }
   },
-  Tag = { "moon_solarSystem", "moon_giants", "moon_uranus", "moon_major", "moon_major_uranus" },
+  Tag = {
+    "moon_solarSystem",
+    "moon_giants",
+    "moon_uranus",
+    "moon_major",
+    "moon_major_uranus"
+  },
   GUI = {
     Name = "Ariel",
     Path = "/Solar System/Planets/Uranus/Major Moons/Ariel"
@@ -106,7 +122,12 @@ local ArielTrail = {
     Period = 2.520379,
     Resolution = 1000
   },
-  Tag = { "moonTrail_solarSystem", "moonTrail_giants", "moonTrail_uranus", "moonTrail_major_uranus" },
+  Tag = {
+    "moonTrail_solarSystem",
+    "moonTrail_giants",
+    "moonTrail_uranus",
+    "moonTrail_major_uranus"
+  },
   GUI = {
     Name = "Ariel Trail",
     Path = "/Solar System/Planets/Uranus/Major Moons/Ariel"
@@ -133,8 +154,7 @@ local ArielLabel = {
   Tag = { "solarsystem_labels", "moon_labels", "major_moon_labels" },
   GUI = {
     Name = "Ariel Label",
-    Path = "/Solar System/Planets/Uranus/Major Moons/Ariel",
-    Description = "Label for Uranus' moon Ariel"
+    Path = "/Solar System/Planets/Uranus/Major Moons/Ariel"
   }
 }
 
@@ -152,7 +172,13 @@ local Umbriel = {
     Type = "RenderableGlobe",
     Radii = { 1169400, 1169400, 1169400 }
   },
-  Tag = { "moon_solarSystem", "moon_giants", "moon_uranus", "moon_major", "moon_major_uranus" },
+  Tag = {
+    "moon_solarSystem",
+    "moon_giants",
+    "moon_uranus",
+    "moon_major",
+    "moon_major_uranus"
+  },
   GUI = {
     Name = "Umbriel",
     Path = "/Solar System/Planets/Uranus/Major Moons/Umbriel"
@@ -173,7 +199,12 @@ local UmbrielTrail = {
     Period = 4.144177,
     Resolution = 1000
   },
-  Tag = { "moonTrail_solarSystem", "moonTrail_giants", "moonTrail_uranus", "moonTrail_major_uranus" },
+  Tag = {
+     "moonTrail_solarSystem",
+     "moonTrail_giants",
+     "moonTrail_uranus",
+     "moonTrail_major_uranus"
+  },
   GUI = {
     Name = "Umbriel Trail",
     Path = "/Solar System/Planets/Uranus/Major Moons/Umbriel"
@@ -200,8 +231,7 @@ local UmbrielLabel = {
   Tag = { "solarsystem_labels", "moon_labels", "major_moon_labels" },
   GUI = {
     Name = "Umbriel Label",
-    Path = "/Solar System/Planets/Uranus/Major Moons/Umbriel",
-    Description = "Label for Uranus' moon Umbriel"
+    Path = "/Solar System/Planets/Uranus/Major Moons/Umbriel"
   }
 }
 
@@ -219,7 +249,13 @@ local Titania = {
     Type = "RenderableGlobe",
     Radii = { 1576800, 1576800, 1576800 }
   },
-  Tag = { "moon_solarSystem", "moon_giants", "moon_uranus", "moon_major", "moon_major_uranus" },
+  Tag = {
+    "moon_solarSystem",
+    "moon_giants",
+    "moon_uranus",
+    "moon_major",
+    "moon_major_uranus"
+  },
   GUI = {
     Name = "Titania",
     Path = "/Solar System/Planets/Uranus/Major Moons/Titania"
@@ -240,7 +276,12 @@ local TitaniaTrail = {
     Period = 8.705872,
     Resolution = 1000
   },
-  Tag = { "moonTrail_solarSystem", "moonTrail_giants", "moonTrail_uranus", "moonTrail_major_uranus" },
+  Tag = {
+    "moonTrail_solarSystem",
+    "moonTrail_giants",
+    "moonTrail_uranus",
+    "moonTrail_major_uranus"
+  },
   GUI = {
     Name = "Titania Trail",
     Path = "/Solar System/Planets/Uranus/Major Moons/Titania"
@@ -267,8 +308,7 @@ local TitaniaLabel = {
   Tag = { "solarsystem_labels", "moon_labels", "major_moon_labels" },
   GUI = {
     Name = "Titania Label",
-    Path = "/Solar System/Planets/Uranus/Major Moons/Titania",
-    Description = "Label for Uranus' moon Titania"
+    Path = "/Solar System/Planets/Uranus/Major Moons/Titania"
   }
 }
 
@@ -286,7 +326,13 @@ local Oberon = {
     Type = "RenderableGlobe",
     Radii = { 1522800, 1522800, 1522800 }
   },
-  Tag = { "moon_solarSystem", "moon_giants", "moon_uranus", "moon_major", "moon_major_uranus" },
+  Tag = {
+    "moon_solarSystem",
+    "moon_giants",
+    "moon_uranus",
+    "moon_major",
+    "moon_major_uranus"
+  },
   GUI = {
     Name = "Oberon",
     Path = "/Solar System/Planets/Uranus/Major Moons/Oberon"
@@ -307,7 +353,12 @@ local OberonTrail = {
     Period = 13.463239,
     Resolution = 1000
   },
-  Tag = { "moonTrail_solarSystem", "moonTrail_giants", "moonTrail_uranus", "moonTrail_major_uranus" },
+  Tag = {
+    "moonTrail_solarSystem",
+    "moonTrail_giants",
+    "moonTrail_uranus",
+    "moonTrail_major_uranus"
+  },
   GUI = {
     Name = "Oberon Trail",
     Path = "/Solar System/Planets/Uranus/Major Moons/Oberon"
@@ -334,12 +385,10 @@ local OberonLabel = {
   Tag = { "solarsystem_labels", "moon_labels", "major_moon_labels" },
   GUI = {
     Name = "Oberon Label",
-    Path = "/Solar System/Planets/Uranus/Major Moons/Oberon",
-    Description = "Label for Uranus' moon Oberon"
+    Path = "/Solar System/Planets/Uranus/Major Moons/Oberon"
   }
 }
 
-
 local UranusMajorMoonsOn = {
   Identifier = "os.solarsystem.UranusMajorMoonsOn",
   Name = "Turn ON major moons and trails",
@@ -470,6 +519,7 @@ asset.export("UranusMajorMoonsOn", UranusMajorMoonsOn.Identifier)
 asset.export("UranusMajorMoonsOff", UranusMajorMoonsOff.Identifier)
 
 
+
 asset.meta = {
   Name = "Uranus Marjor Moons",
   Description = [[Procedural Globe asset containing Uranus' major moons: Miranda, Ariel,
diff --git a/data/assets/scene/solarsystem/planets/uranus/uranus.asset b/data/assets/scene/solarsystem/planets/uranus/uranus.asset
index 4b0fa6fc17..5bda3b2e01 100644
--- a/data/assets/scene/solarsystem/planets/uranus/uranus.asset
+++ b/data/assets/scene/solarsystem/planets/uranus/uranus.asset
@@ -26,8 +26,7 @@ local Uranus = {
   Tag = { "planet_solarSystem", "planet_giants" },
   GUI = {
     Name = "Uranus",
-    Path = "/Solar System/Planets/Uranus",
-    Description = "Globe for Uranus"
+    Path = "/Solar System/Planets/Uranus"
   }
 }
 
@@ -51,8 +50,7 @@ local UranusLabel = {
   Tag = { "solarsystem_labels" },
   GUI = {
     Name = "Uranus Label",
-    Path = "/Solar System/Planets/Uranus",
-    Description = "Main planet label for Uranus"
+    Path = "/Solar System/Planets/Uranus"
   }
 }
 
diff --git a/data/assets/scene/solarsystem/planets/utah_layers.asset b/data/assets/scene/solarsystem/planets/utah_layers.asset
index 573c491653..741cd1188f 100644
--- a/data/assets/scene/solarsystem/planets/utah_layers.asset
+++ b/data/assets/scene/solarsystem/planets/utah_layers.asset
@@ -17,7 +17,6 @@ asset.meta = {
   Description = [[Adds default layers for all planets. Remove this asset and include
     individual layers for planets to customize planet layers
 
-
     Layers only loaded from the Utah server
   ]],
   Author = "OpenSpace Team",
diff --git a/data/assets/scene/solarsystem/planets/venus/default_layers.asset b/data/assets/scene/solarsystem/planets/venus/default_layers.asset
index 321479015f..401dccc331 100644
--- a/data/assets/scene/solarsystem/planets/venus/default_layers.asset
+++ b/data/assets/scene/solarsystem/planets/venus/default_layers.asset
@@ -9,7 +9,6 @@ asset.meta = {
   Description = [[Default Venus layers are: Venus Texture, Magellan Mosaic,
     Clouds Magellan Combo, and Magellan Elevation (3D).
 
-
     Layers loaded from all available servers
   ]],
   Author = "OpenSpace Team",
diff --git a/data/assets/scene/solarsystem/planets/venus/layers/newyork_layers.asset b/data/assets/scene/solarsystem/planets/venus/layers/newyork_layers.asset
index cf107b8e8b..5513383ff4 100644
--- a/data/assets/scene/solarsystem/planets/venus/layers/newyork_layers.asset
+++ b/data/assets/scene/solarsystem/planets/venus/layers/newyork_layers.asset
@@ -11,7 +11,6 @@ asset.meta = {
   Description = [[Default Venus layers are: Venus Texture, Magellan Mosaic,
     Clouds Magellan Combo, and Magellan Elevation (3D).
 
-
     Layers only loaded from the New York server
   ]],
   Author = "OpenSpace Team",
diff --git a/data/assets/scene/solarsystem/planets/venus/layers/utah_layers.asset b/data/assets/scene/solarsystem/planets/venus/layers/utah_layers.asset
index 3bf8b4aa95..17e40ea29a 100644
--- a/data/assets/scene/solarsystem/planets/venus/layers/utah_layers.asset
+++ b/data/assets/scene/solarsystem/planets/venus/layers/utah_layers.asset
@@ -11,7 +11,6 @@ asset.meta = {
   Description = [[Default Venus layers are: Venus Texture, Magellan Mosaic,
     Clouds Magellan Combo, and Magellan Elevation (3D).
 
-
     Layers only loaded from the Utah server
   ]],
   Author = "OpenSpace Team",
diff --git a/data/assets/scene/solarsystem/planets/venus/trail.asset b/data/assets/scene/solarsystem/planets/venus/trail.asset
index ebc7385bb1..5e8d0a37a9 100644
--- a/data/assets/scene/solarsystem/planets/venus/trail.asset
+++ b/data/assets/scene/solarsystem/planets/venus/trail.asset
@@ -20,8 +20,7 @@ local VenusTrail = {
   Tag = { "planetTrail_solarSystem", "planetTrail_terrestrial" },
   GUI = {
     Name = "Venus Trail",
-    Path = "/Solar System/Planets/Venus",
-    Description = "Main trail for Venus"
+    Path = "/Solar System/Planets/Venus"
   }
 }
 
diff --git a/data/assets/scene/solarsystem/planets/venus/trail_barycenter.asset b/data/assets/scene/solarsystem/planets/venus/trail_barycenter.asset
index e79a48e0d8..ec46a030d9 100644
--- a/data/assets/scene/solarsystem/planets/venus/trail_barycenter.asset
+++ b/data/assets/scene/solarsystem/planets/venus/trail_barycenter.asset
@@ -21,8 +21,7 @@ local VenusBarycenterTrail = {
   Tag = { "planetTrail_solarSystem", "planetTrail_terrestrial" },
   GUI = {
     Name = "Venus Barycenter Trail",
-    Path = "/Solar System/Planets/Venus",
-    Description = "Berycenter trail for Venus"
+    Path = "/Solar System/Planets/Venus"
   }
 }
 
diff --git a/data/assets/scene/solarsystem/planets/venus/venus.asset b/data/assets/scene/solarsystem/planets/venus/venus.asset
index 8f5ad01181..8d536081c5 100644
--- a/data/assets/scene/solarsystem/planets/venus/venus.asset
+++ b/data/assets/scene/solarsystem/planets/venus/venus.asset
@@ -47,8 +47,7 @@ local Venus = {
   Tag = { "planet_solarSystem", "planet_terrestrial" },
   GUI = {
     Name = "Venus",
-    Path = "/Solar System/Planets/Venus",
-    Description = "Venus globe with labels and map layers"
+    Path = "/Solar System/Planets/Venus"
   }
 }
 
@@ -72,8 +71,7 @@ local VenusLabel = {
   Tag = { "solarsystem_labels" },
   GUI = {
       Name = "Venus Label",
-      Path = "/Solar System/Planets/Venus",
-      Description = "Label for Venus, viewable within the solar system"
+      Path = "/Solar System/Planets/Venus"
   }
 }
 
diff --git a/data/assets/scene/solarsystem/telescopes/jwst/targets/crab.asset b/data/assets/scene/solarsystem/telescopes/jwst/targets/crab.asset
index b1b31eac5c..d3d6c7f572 100644
--- a/data/assets/scene/solarsystem/telescopes/jwst/targets/crab.asset
+++ b/data/assets/scene/solarsystem/telescopes/jwst/targets/crab.asset
@@ -13,9 +13,7 @@ local CrabImage = {
   Opacity = 1.0,
   TexturePath = crab.image .. "crab-nebula.png",
   Tag = { "mission_jwst_target" },
-  Description = [[
-    Image of the Crab Nebula by NASA, ESA and Allison Loll/Jeff Hester.
-  ]]
+  Description = "Image of the Crab Nebula by NASA, ESA and Allison Loll/Jeff Hester."
 }
 
 
diff --git a/data/assets/scene/solarsystem/telescopes/jwst/targets/hh212.asset b/data/assets/scene/solarsystem/telescopes/jwst/targets/hh212.asset
index 744dc4755f..cdaa51e25c 100644
--- a/data/assets/scene/solarsystem/telescopes/jwst/targets/hh212.asset
+++ b/data/assets/scene/solarsystem/telescopes/jwst/targets/hh212.asset
@@ -13,9 +13,7 @@ local HH212Image = {
   Opacity = 1.0,
   TexturePath = hh212.image .. "hh212.png",
   Tag = { "mission_jwst_target" },
-  Description = [[
-    Image of HH 212 by ESO/M. McCaughrean.
-  ]]
+  Description = "Image of HH 212 by ESO/M. McCaughrean."
 }
 
 
diff --git a/data/assets/scene/solarsystem/telescopes/jwst/targets/orion.asset b/data/assets/scene/solarsystem/telescopes/jwst/targets/orion.asset
index 3c5eab468e..ce79b81ca0 100644
--- a/data/assets/scene/solarsystem/telescopes/jwst/targets/orion.asset
+++ b/data/assets/scene/solarsystem/telescopes/jwst/targets/orion.asset
@@ -13,9 +13,7 @@ local OrionImage = {
   Opacity = 1.0,
   TexturePath = orion.image .. "orion-nebula.png",
   Tag = { "mission_jwst_target" },
-  Description = [[
-    Image of the Orion Nebula by Bill Schoening/NOIRLab/NSF/AURA.
-  ]]
+  Description = "Image of the Orion Nebula by Bill Schoening/NOIRLab/NSF/AURA."
 }
 
 
diff --git a/data/assets/scene/solarsystem/telescopes/jwst/targets/sn1987a_image.asset b/data/assets/scene/solarsystem/telescopes/jwst/targets/sn1987a_image.asset
index 2dc660828a..b87ea56888 100644
--- a/data/assets/scene/solarsystem/telescopes/jwst/targets/sn1987a_image.asset
+++ b/data/assets/scene/solarsystem/telescopes/jwst/targets/sn1987a_image.asset
@@ -13,10 +13,7 @@ asset.export("image", image)
 asset.meta = {
   Name = "Supernova SN 1987a",
   Description = "Supernova SN 1987a Image",
-  Author = [[
-    X-ray: NASA/CXC/PSU/S.Park & D.Burrows.
-    Optical: NASA/STScI/CfA/P.Challis
-  ]],
+  Author = "X-ray: NASA/CXC/PSU/S.Park & D.Burrows. Optical: NASA/STScI/CfA/P.Challis",
   URL = "https://chandra.harvard.edu/photo/2007/sn87a/",
   License = "https://chandra.harvard.edu/photo/image_use.html"
 }
diff --git a/data/assets/scene/solarsystem/telescopes/jwst/timelapse.asset b/data/assets/scene/solarsystem/telescopes/jwst/timelapse.asset
index 1aa47abf68..02ef78313d 100644
--- a/data/assets/scene/solarsystem/telescopes/jwst/timelapse.asset
+++ b/data/assets/scene/solarsystem/telescopes/jwst/timelapse.asset
@@ -1,6 +1,8 @@
 asset.require("spice/core") -- openspace.time.advancedTime depends on SPICE
 asset.require("scene/solarsystem/planets/earth/atmosphere")
 
+
+
 -- Function to advance a time stamp in the given number of days, hours, minutes and
 -- seconds. returns the new time stamp
 local function advance(time, days, hours, minutes, seconds)
diff --git a/data/assets/scene/solarsystem/telescopes/jwst/trail.asset b/data/assets/scene/solarsystem/telescopes/jwst/trail.asset
index 478477024d..eccc987873 100644
--- a/data/assets/scene/solarsystem/telescopes/jwst/trail.asset
+++ b/data/assets/scene/solarsystem/telescopes/jwst/trail.asset
@@ -5,6 +5,7 @@ local kernels = asset.require("./kernels")
 local coreKernels = asset.require("spice/core")
 
 
+
 local LaunchTime = "2021 DEC 25 12:20:00"
 local DetachTime = "2021 DEC 25 12:50:00"
 local L2orbitInsertionTime = "2022 JAN 25 00:00:00"
@@ -36,9 +37,7 @@ local JWSTTrailLaunch = {
   GUI = {
     Name = "JWST Launch Trail",
     Path = "/Solar System/Telescopes/JWST/Trails",
-    Description = [[
-      James Webb Space Telescope Launch Trail relative to Earth IAU.
-    ]]
+    Description = "James Webb Space Telescope Launch Trail relative to Earth IAU."
   }
 }
 
@@ -68,9 +67,7 @@ local JWSTTrailCruise = {
   GUI = {
     Name = "JWST Cruise Trail",
     Path = "/Solar System/Telescopes/JWST/Trails",
-    Description = [[
-      James Webb Space Telescope Cruise Trail relative to Earth.
-    ]]
+    Description = "James Webb Space Telescope Cruise Trail relative to Earth."
   }
 }
 
@@ -100,9 +97,7 @@ local JWSTTrailOrbit = {
   GUI = {
     Name = "JWST Orbit Trail",
     Path = "/Solar System/Telescopes/JWST/Trails",
-    Description = [[
-      James Webb Space Telescope Orbit Trail relative to L2.
-    ]]
+    Description = "James Webb Space Telescope Orbit Trail relative to L2."
   }
 }
 
@@ -131,9 +126,7 @@ local JWSTTrailCoRevOrbit = {
   GUI = {
     Name = "JWST L2 Co-revolving Orbit Trail",
     Path = "/Solar System/Telescopes/JWST/Trails",
-    Description = [[
-      James Webb Space Telescope Orbit Trail that Co-revolves with L2.
-    ]]
+    Description = "James Webb Space Telescope Orbit Trail that Co-revolves with L2."
   }
 }
 
@@ -160,9 +153,7 @@ local JWSTSunTrail = {
   GUI = {
     Name = "JWST Sun Trail",
     Path = "/Solar System/Telescopes/JWST/Trails",
-    Description = [[
-      James Webb Space Telescope Trail relative to the Sun.
-    ]]
+    Description = "James Webb Space Telescope Trail relative to the Sun."
   }
 }
 
diff --git a/data/assets/util/debug_helper.asset b/data/assets/util/debug_helper.asset
index 2c9d94db2d..2c5c242d3f 100644
--- a/data/assets/util/debug_helper.asset
+++ b/data/assets/util/debug_helper.asset
@@ -123,6 +123,7 @@ local function registerCartesianAxes(axesAsset, specification)
   registerNode(axesAsset, addCartesianAxes, generateAxesIdentifier, specification)
 end
 
+
 asset.export("addGrid", addGrid)
 asset.export("registerGrid", registerGrid)
 
diff --git a/data/assets/util/joysticks/any-joystick.asset b/data/assets/util/joysticks/any-joystick.asset
index b25838aeeb..9e9ef66a9e 100644
--- a/data/assets/util/joysticks/any-joystick.asset
+++ b/data/assets/util/joysticks/any-joystick.asset
@@ -77,6 +77,8 @@ asset.onDeinitialize(function()
   end
 end)
 
+
+
 asset.meta = {
   Name = "Joystick controller: Any",
   Description = [[
diff --git a/data/assets/util/joysticks/microsoft-xbox-360-pad.asset b/data/assets/util/joysticks/microsoft-xbox-360-pad.asset
index 07d2af220d..528c6b18f9 100644
--- a/data/assets/util/joysticks/microsoft-xbox-360-pad.asset
+++ b/data/assets/util/joysticks/microsoft-xbox-360-pad.asset
@@ -207,6 +207,8 @@ asset.onInitialize(function()
   )
 end)
 
+
+
 asset.meta = {
   Name = "Joystick controller: Microsoft X-Box 360 pad",
   Description = "Joystick controller configuration for Microsoft X-Box 360 pad",
diff --git a/data/assets/util/joysticks/ps4.asset b/data/assets/util/joysticks/ps4.asset
index 599e0de9da..f8696079e8 100644
--- a/data/assets/util/joysticks/ps4.asset
+++ b/data/assets/util/joysticks/ps4.asset
@@ -229,6 +229,8 @@ asset.onInitialize(function()
   )
 end)
 
+
+
 asset.meta = {
   Name = "Joystick controller: PS4",
   Description = "Joystick controller configuration for PS4",
diff --git a/data/assets/util/joysticks/ps5.asset b/data/assets/util/joysticks/ps5.asset
index e4398c7767..f2c55bc0e0 100644
--- a/data/assets/util/joysticks/ps5.asset
+++ b/data/assets/util/joysticks/ps5.asset
@@ -242,6 +242,8 @@ asset.onInitialize(function()
   )
 end)
 
+
+
 asset.meta = {
   Name = "Joystick controller: PS5",
   Description = "Joystick controller configuration for PS5",
diff --git a/data/assets/util/joysticks/space-mouse-compact-wireless.asset b/data/assets/util/joysticks/space-mouse-compact-wireless.asset
index b17426cec4..3ef46d306c 100644
--- a/data/assets/util/joysticks/space-mouse-compact-wireless.asset
+++ b/data/assets/util/joysticks/space-mouse-compact-wireless.asset
@@ -70,6 +70,8 @@ asset.onInitialize(function()
   )
 end)
 
+
+
 asset.meta = {
   Name = "Joystick controller: SpaceMouse compact wireless",
   Description = "Joystick controller configuration for SpaceMouse compact wireless",
diff --git a/data/assets/util/joysticks/space-mouse-compact.asset b/data/assets/util/joysticks/space-mouse-compact.asset
index 4a79cf9881..77b911effe 100644
--- a/data/assets/util/joysticks/space-mouse-compact.asset
+++ b/data/assets/util/joysticks/space-mouse-compact.asset
@@ -70,6 +70,8 @@ asset.onInitialize(function()
   )
 end)
 
+
+
 asset.meta = {
   Name = "Joystick controller: SpaceMouse compact (wired)",
   Description = "Joystick controller configuration for SpaceMouse compact (wired)",
diff --git a/data/assets/util/joysticks/space-mouse-enterprise-wireless.asset b/data/assets/util/joysticks/space-mouse-enterprise-wireless.asset
index 4687d42fa0..279a8c3cd2 100644
--- a/data/assets/util/joysticks/space-mouse-enterprise-wireless.asset
+++ b/data/assets/util/joysticks/space-mouse-enterprise-wireless.asset
@@ -64,6 +64,8 @@ asset.onInitialize(function()
   openspace.navigation.bindJoystickAxis(name, controller.Tilt.LeftRight, "LocalRoll")
 end)
 
+
+
 asset.meta = {
   Name = "Joystick controller: SpaceMouse enterprise wireless",
   Description = "Joystick controller configuration for SpaceMouse enterprise wireless",
diff --git a/data/assets/util/joysticks/space-mouse-enterprise.asset b/data/assets/util/joysticks/space-mouse-enterprise.asset
index 74731d2e33..b3ee78bf1c 100644
--- a/data/assets/util/joysticks/space-mouse-enterprise.asset
+++ b/data/assets/util/joysticks/space-mouse-enterprise.asset
@@ -64,6 +64,8 @@ asset.onInitialize(function()
   openspace.navigation.bindJoystickAxis(name, controller.Tilt.LeftRight, "LocalRoll")
 end)
 
+
+
 asset.meta = {
   Name = "Joystick controller: SpaceMouse enterprise (wired)",
   Description = "Joystick controller configuration for SpaceMouse enterprise (wired)",
diff --git a/data/assets/util/joysticks/xbox-wireless.asset b/data/assets/util/joysticks/xbox-wireless.asset
index f5c8cafc78..699dc1eb6a 100644
--- a/data/assets/util/joysticks/xbox-wireless.asset
+++ b/data/assets/util/joysticks/xbox-wireless.asset
@@ -207,6 +207,8 @@ asset.onInitialize(function()
   )
 end)
 
+
+
 asset.meta = {
   Name = "Joystick controller: Xbox wireless",
   Description = "Joystick controller configuration for Xbox wireless",
diff --git a/data/assets/util/joysticks/xbox.asset b/data/assets/util/joysticks/xbox.asset
index 40efb93d89..a31b8cb5db 100644
--- a/data/assets/util/joysticks/xbox.asset
+++ b/data/assets/util/joysticks/xbox.asset
@@ -207,6 +207,8 @@ asset.onInitialize(function()
   )
 end)
 
+
+
 asset.meta = {
   Name = "Joystick controller: Xbox (wired)",
   Description = "Joystick controller configuration for Xbox (wired)",

From 1cef84ca7438c88a5bf573dcd1ad50c22679d2e3 Mon Sep 17 00:00:00 2001
From: Alexander Bock <alexander.bock@liu.se>
Date: Wed, 14 Aug 2024 10:22:41 +0200
Subject: [PATCH 580/701] Add an identifier to mission files and use that
 instead of the name

---
 .../solarsystem/missions/apollo/mission.asset |  3 +-
 .../missions/bepicolombo/mission.asset        |  3 +-
 .../solarsystem/missions/dawn/mission.asset   |  3 +-
 .../solarsystem/missions/juice/mission.asset  |  3 +-
 .../solarsystem/missions/juno/mission.asset   |  3 +-
 .../missions/newhorizons/mission.asset        |  3 +-
 .../missions/osirisrex/mission.asset          |  3 +-
 .../missions/perseverance/mission.asset       |  3 +-
 .../missions/rosetta/mission.asset            |  3 +-
 .../missions/voyager/mission.asset            |  3 +-
 .../planets/earth/eclipses/timeline.asset     |  3 +-
 .../telescopes/euclid/mission.asset           |  3 +-
 .../solarsystem/telescopes/jwst/mission.asset |  3 +-
 src/mission/missionmanager_lua.inl            | 42 +++++++++++++------
 14 files changed, 55 insertions(+), 26 deletions(-)

diff --git a/data/assets/scene/solarsystem/missions/apollo/mission.asset b/data/assets/scene/solarsystem/missions/apollo/mission.asset
index 6c1e4543d7..804cf3e4fa 100644
--- a/data/assets/scene/solarsystem/missions/apollo/mission.asset
+++ b/data/assets/scene/solarsystem/missions/apollo/mission.asset
@@ -1,4 +1,5 @@
 local Mission = {
+  Identifier = "Apollo",
   Name = "The Apollo Missions",
   Image = "https://solarsystem.nasa.gov/system/downloadable_items/2962_s65-55202.jpg",
   Description = "Apollo was the NASA program that resulted in American astronauts' making a total of 11 spaceflights and walking on the moon. The first four flights tested the equipment used in the Apollo Program. Six of the other seven flights landed on the moon. The first Apollo flight happened in 1968. The first moon landing took place in 1969. The last moon landing was in 1972. A total of 12 astronauts walked on the moon. The astronauts conducted scientific research there. They studied the lunar surface. They collected moon rocks to bring back to Earth.",
@@ -54,5 +55,5 @@ asset.onInitialize(function()
 end)
 
 asset.onDeinitialize(function()
-  openspace.unloadMission(Mission.Name)
+  openspace.unloadMission(Mission)
 end)
diff --git a/data/assets/scene/solarsystem/missions/bepicolombo/mission.asset b/data/assets/scene/solarsystem/missions/bepicolombo/mission.asset
index e3c7ad03c7..c108ec8b8a 100644
--- a/data/assets/scene/solarsystem/missions/bepicolombo/mission.asset
+++ b/data/assets/scene/solarsystem/missions/bepicolombo/mission.asset
@@ -1,4 +1,5 @@
 local Mission = {
+  Identifier = "BepiColombo",
   Name = "BepiColombo",
   Image = "https://scifleet.esa.int/downloads/bepi_mcs/bepicolombo.png",
   Description = [[BepiColombo is Europe's first mission to Mercury. It launched in October 2018 on a journey to the smallest and least explored terrestrial planet in our Solar System. Arriving at Mercury in December 2025, it will endure temperatures in excess of 350°C and gather data during a 1 year nominal mission. The mission comprises two spacecraft: 1. Mercury Planetary Orbiter (MPO), 2. Mercury Magnetospheric Orbiter (MMO). BepiColombo is a joint mission between ESA and the Japan Aerospace Exploration Agency (JAXA), executed under ESA leadership.]],
@@ -73,7 +74,7 @@ asset.onInitialize(function()
 end)
 
 asset.onDeinitialize(function()
-  openspace.unloadMission(Mission.Name)
+  openspace.unloadMission(Mission)
 end)
 
 
diff --git a/data/assets/scene/solarsystem/missions/dawn/mission.asset b/data/assets/scene/solarsystem/missions/dawn/mission.asset
index cf1e6f2dac..5843ccea24 100644
--- a/data/assets/scene/solarsystem/missions/dawn/mission.asset
+++ b/data/assets/scene/solarsystem/missions/dawn/mission.asset
@@ -1,4 +1,5 @@
 local Mission = {
+  Identifier = "Dawn",
   Name = "Dawn",
   Image = "https://photojournal.jpl.nasa.gov/jpegMod/PIA19375_modest.jpg",
   TimeRange = { Start = "2007 SEP 07 11:34:00", End = "2018 OCT 30 00:00:00" },
@@ -38,5 +39,5 @@ asset.onInitialize(function()
 end)
 
 asset.onDeinitialize(function()
-  openspace.unloadMission(Mission.Name)
+  openspace.unloadMission(Mission)
 end)
diff --git a/data/assets/scene/solarsystem/missions/juice/mission.asset b/data/assets/scene/solarsystem/missions/juice/mission.asset
index 87306365ac..3554bc5c5f 100644
--- a/data/assets/scene/solarsystem/missions/juice/mission.asset
+++ b/data/assets/scene/solarsystem/missions/juice/mission.asset
@@ -1,4 +1,5 @@
 local Mission = {
+  Identifier = "Juice",
   Name = "Juice",
   Image = "https://www.esa.int/var/esa/storage/images/science_exploration/space_science/juice/23388092-2-eng-GB/Juice_pillars.jpg",
   Description = "ESA's Jupiter Icy Moons Explorer, Juice, will make detailed observations of the giant gas planet and its three large ocean-bearing moons - Ganymede, Callisto and Europa - with a suite of remote sensing, geophysical, and in situ instruments. The mission will characterize these moons as both planetary objects and possible habitats, explore Jupiter's complex environment in depth, and study the wider Jupiter system as an archetype for gas giants across the Universe.",
@@ -63,5 +64,5 @@ asset.onInitialize(function()
 end)
 
 asset.onDeinitialize(function()
-  openspace.unloadMission(Mission.Name)
+  openspace.unloadMission(Mission)
 end)
diff --git a/data/assets/scene/solarsystem/missions/juno/mission.asset b/data/assets/scene/solarsystem/missions/juno/mission.asset
index 2d09c4a3f9..b823e46e3f 100644
--- a/data/assets/scene/solarsystem/missions/juno/mission.asset
+++ b/data/assets/scene/solarsystem/missions/juno/mission.asset
@@ -1,4 +1,5 @@
 local Mission = {
+  Identifier = "Juno",
   Name = "Juno",
   Image = "https://upload.wikimedia.org/wikipedia/commons/3/32/Juno_mission_insignia.svg",
   Description = "On August 5, 2011, NASA's Juno spacecraft embarked on a 5-year journey to our solar system's largest planet - the gas giant Jupiter. Its mission: to probe beneath the planet's dense clouds and answer questions about the origin and evolution of Jupiter, our solar system, and giant planets in general across the cosmos. Juno arrived at Jupiter on July 4, 2016, after a 5-year, 1.7-billion-mile journey, and settled into a 53-day polar orbit stretching from just above Jupiter's cloud tops to the outer reaches of the Jovian magnetosphere.",
@@ -43,5 +44,5 @@ asset.onInitialize(function()
 end)
 
 asset.onDeinitialize(function()
-  openspace.unloadMission(Mission.Name)
+  openspace.unloadMission(Mission)
 end)
diff --git a/data/assets/scene/solarsystem/missions/newhorizons/mission.asset b/data/assets/scene/solarsystem/missions/newhorizons/mission.asset
index 2450233836..99dff527e6 100644
--- a/data/assets/scene/solarsystem/missions/newhorizons/mission.asset
+++ b/data/assets/scene/solarsystem/missions/newhorizons/mission.asset
@@ -3,6 +3,7 @@
 -- are approximate and need fixing
 
 local Mission = {
+  Identifier = "NewHorizons",
   Name = "New Horizons",
   Phases = {
     {
@@ -126,5 +127,5 @@ asset.onInitialize(function()
 end)
 
 asset.onDeinitialize(function()
-  openspace.unloadMission(Mission.Name)
+  openspace.unloadMission(Mission)
 end)
diff --git a/data/assets/scene/solarsystem/missions/osirisrex/mission.asset b/data/assets/scene/solarsystem/missions/osirisrex/mission.asset
index 5ddde1a336..d2d3e229d6 100644
--- a/data/assets/scene/solarsystem/missions/osirisrex/mission.asset
+++ b/data/assets/scene/solarsystem/missions/osirisrex/mission.asset
@@ -30,6 +30,7 @@ https://www.asteroidmission.org/wp-content/uploads/2018/10/SPP-Approach-Poster-1
 --]]
 
 local Mission = {
+  Identifier = "OsirisRex",
   Name = "OSIRIS-REx",
   Description = "Launched on Sept. 8, 2016, the Origins, Spectral Interpretation, Resource Identification, Security-Regolith Explorer (OSIRIS-REx) spacecraft traveled to a near-Earth asteroid called Bennu (formerly 1999 RQ36), and collected a sample of the of rocks and material from the surface that it will return to Earth in 2023. The mission will help scientists investigate how planets formed and how life began, as well as improve our understanding of asteroids that could impact Earth.",
   Image = "https://www.nasa.gov/sites/default/files/styles/full_width_feature/public/thumbnails/image/osiris-rex-mission-logo12_copy.png",
@@ -308,5 +309,5 @@ asset.onInitialize(function()
 end)
 
 asset.onDeinitialize(function()
-  openspace.unloadMission(Mission.Name)
+  openspace.unloadMission(Mission)
 end)
diff --git a/data/assets/scene/solarsystem/missions/perseverance/mission.asset b/data/assets/scene/solarsystem/missions/perseverance/mission.asset
index 6a27ddc505..db45229dae 100644
--- a/data/assets/scene/solarsystem/missions/perseverance/mission.asset
+++ b/data/assets/scene/solarsystem/missions/perseverance/mission.asset
@@ -1,4 +1,5 @@
 local Mission = {
+  Identifier = "Perseverance",
   Name = "Mars 2020 Perseverance Events on Mars",
   Phases = {
     {
@@ -34,5 +35,5 @@ asset.onInitialize(function()
 end)
 
 asset.onDeinitialize(function()
-  openspace.unloadMission(Mission.Name)
+  openspace.unloadMission(Mission)
 end)
diff --git a/data/assets/scene/solarsystem/missions/rosetta/mission.asset b/data/assets/scene/solarsystem/missions/rosetta/mission.asset
index d2e87043f5..3ee1cbb585 100644
--- a/data/assets/scene/solarsystem/missions/rosetta/mission.asset
+++ b/data/assets/scene/solarsystem/missions/rosetta/mission.asset
@@ -1,6 +1,7 @@
 -- Source:  https://solarsystem.nasa.gov/missions/rosetta-philae/in-depth/
 
 local Mission = {
+  Identifier = "Rosetta",
   Name = "Rosetta",
   TimeRange = { Start = "2004 MAR 02 00:00:00", End = "2016 SEP 30 00:00:00" },
   Image = "https://www.cosmos.esa.int/documents/522118/522182/Rosetta_logo.png/cd85878d-2fac-e086-e32a-df0eaee5e505?t=1614026031720",
@@ -113,5 +114,5 @@ asset.onInitialize(function()
 end)
 
 asset.onDeinitialize(function()
-  openspace.unloadMission(Mission.Name)
+  openspace.unloadMission(Mission)
 end)
diff --git a/data/assets/scene/solarsystem/missions/voyager/mission.asset b/data/assets/scene/solarsystem/missions/voyager/mission.asset
index 5084e98480..23b712834d 100644
--- a/data/assets/scene/solarsystem/missions/voyager/mission.asset
+++ b/data/assets/scene/solarsystem/missions/voyager/mission.asset
@@ -5,6 +5,7 @@
 -- are approximate and need fixing
 
 local Mission = {
+  Identifier = "Voyager",
   Name = "Voyager",
   Image = "https://upload.wikimedia.org/wikipedia/commons/8/87/Voyager_-_mission_logo.png",
   Description = "The twin Voyager 1 and 2 spacecraft are exploring where nothing from Earth has flown before. Continuing on their more-than-40-year journey since their 1977 launches, they each are much farther away from Earth and the sun than Pluto. In August 2012, Voyager 1 made the historic entry into interstellar space, the region between stars, filled with material ejected by the death of nearby stars millions of years ago. Voyager 2 entered interstellar space on November 5, 2018 and scientists hope to learn more about this region. Both spacecraft are still sending scientific information about their surroundings through the Deep Space Network, or DSN. The primary mission was the exploration of Jupiter and Saturn. After making a string of discoveries there — such as active volcanoes on Jupiter's moon Io and intricacies of Saturn's rings — the mission was extended. Voyager 2 went on to explore Uranus and Neptune, and is still the only spacecraft to have visited those outer planets. The adventurers' current mission, the Voyager Interstellar Mission (VIM), will explore the outermost edge of the Sun's domain. And beyond.",
@@ -120,5 +121,5 @@ asset.onInitialize(function()
 end)
 
 asset.onDeinitialize(function()
-  openspace.unloadMission(Mission.Name)
+  openspace.unloadMission(Mission)
 end)
diff --git a/data/assets/scene/solarsystem/planets/earth/eclipses/timeline.asset b/data/assets/scene/solarsystem/planets/earth/eclipses/timeline.asset
index d263f2d1bd..a94559e606 100644
--- a/data/assets/scene/solarsystem/planets/earth/eclipses/timeline.asset
+++ b/data/assets/scene/solarsystem/planets/earth/eclipses/timeline.asset
@@ -1,4 +1,5 @@
 local Timeline = {
+  Identifier = "Eclipses",
   Name = "Eclipses",
   Image = "https://www.esa.int/var/esa/storage/images/esa_multimedia/images/2019/07/stages_of_a_total_solar_eclipse/19468511-1-eng-GB/Stages_of_a_total_solar_eclipse_pillars.jpg",
   Description = "An eclipse is an awe-inspiring celestial event that drastically changes the appearance of the two biggest objects we see in our sky: our Sun and Moon. On Earth, people can experience solar eclipses when Earth, the Moon, and the Sun line up. There are four types of solar eclipses: total, partial, hybrid, and annular. The type of eclipse that people get to see depends on how the Moon aligns with Earth and the Sun, and how far away the Moon is from Earth. In addition to inspiring artists and musicians, eclipses have driven numerous scientific discoveries. For over a century, solar eclipses helped scientists decipher the Sun's structure and explosive events, find evidence for the theory of general relativity, discover a new element, and much more. Scientists still study eclipses to make new discoveries about the Sun, Earth, and our space environment. Total solar eclipses are particularly important because they allow scientists to see a part of the Sun's atmosphere - known as the corona - which is too faint to see except when the bright light of the Sun's surface is blocked.",
@@ -2275,7 +2276,7 @@ asset.onInitialize(function()
 end)
 
 asset.onDeinitialize(function()
-  openspace.unloadMission(Timeline.Name)
+  openspace.unloadMission(Timeline)
 end)
 
 
diff --git a/data/assets/scene/solarsystem/telescopes/euclid/mission.asset b/data/assets/scene/solarsystem/telescopes/euclid/mission.asset
index a9b2ba0c43..a5379df34a 100644
--- a/data/assets/scene/solarsystem/telescopes/euclid/mission.asset
+++ b/data/assets/scene/solarsystem/telescopes/euclid/mission.asset
@@ -1,4 +1,5 @@
 local Mission = {
+  Identifier = "Euclid",
   Name = "Euclid",
   Image = "https://www.esa.int/var/esa/storage/images/esa_multimedia/images/2013/01/euclid_logo/12493233-3-eng-GB/Euclid_logo_pillars.png",
   Description = [[Euclid is designed to explore the evolution of the dark universe. It will make a 3D-map of the universe (with time as the third dimension) by observing billions of galaxies out to 10 billion light-years, across more than a third of the sky.
@@ -74,7 +75,7 @@ asset.onInitialize(function()
 end)
 
 asset.onDeinitialize(function()
-  openspace.unloadMission(Mission.Name)
+  openspace.unloadMission(Mission)
 end)
 
 
diff --git a/data/assets/scene/solarsystem/telescopes/jwst/mission.asset b/data/assets/scene/solarsystem/telescopes/jwst/mission.asset
index 9224b52ff4..f04eba7452 100644
--- a/data/assets/scene/solarsystem/telescopes/jwst/mission.asset
+++ b/data/assets/scene/solarsystem/telescopes/jwst/mission.asset
@@ -5,6 +5,7 @@
 -- are approximate and need fixing
 
 local Mission = {
+  Identifier = "JWST",
   Name = "James Webb Space Telescope",
   Image = "https://www.esa.int/var/esa/storage/images/esa_multimedia/images/2016/12/jwst_mission_logo/16561412-4-eng-GB/JWST_mission_logo_pillars.png",
   Description = "The James Webb Space Telescope (sometimes called JWST or Webb) is an orbiting infrared observatory that will complement and extend the discoveries of the Hubble Space Telescope, with longer wavelength coverage and greatly improved sensitivity. The longer wavelengths enable Webb to look much closer to the beginning of time and to hunt for the unobserved formation of the first galaxies, as well as to look inside dust clouds where stars and planetary systems are forming today.",
@@ -96,5 +97,5 @@ asset.onInitialize(function()
 end)
 
 asset.onDeinitialize(function()
-  openspace.unloadMission(Mission.Name)
+  openspace.unloadMission(Mission)
 end)
diff --git a/src/mission/missionmanager_lua.inl b/src/mission/missionmanager_lua.inl
index 3f31ff869f..528ef24f94 100644
--- a/src/mission/missionmanager_lua.inl
+++ b/src/mission/missionmanager_lua.inl
@@ -31,36 +31,52 @@
 }
 
 // Unloads a previously loaded mission.
-[[codegen::luawrap]] void unloadMission(std::string missionName) {
+[[codegen::luawrap]] void unloadMission(
+                         std::variant<std::string, ghoul::Dictionary> identifierOrMission)
+{
     using namespace openspace;
 
-    if (missionName.empty()) {
-        throw ghoul::lua::LuaError("Mission name is empty");
+    std::string identifier;
+    if (std::holds_alternative<std::string>(identifierOrMission)) {
+        identifier = std::move(std::get<std::string>(identifierOrMission));
+    }
+    else {
+        ghoul::Dictionary dict = std::get<ghoul::Dictionary>(identifierOrMission);
+        if (!dict.hasValue<std::string>("Identifier")) {
+            throw ghoul::lua::LuaError("Mission table needs 'Identifier'");
+        }
+
+        identifier = dict.value<std::string>("Identifier");
     }
 
-    if (!global::missionManager->hasMission(missionName)) {
+
+    if (identifier.empty()) {
+        throw ghoul::lua::LuaError("Mission identifier is empty");
+    }
+
+    if (!global::missionManager->hasMission(identifier)) {
         throw ghoul::lua::LuaError("Mission was not previously loaded");
     }
 
-    global::missionManager->unloadMission(missionName);
+    global::missionManager->unloadMission(identifier);
 }
 
 // Returns whether a mission with the provided name has been loaded.
-[[codegen::luawrap]] bool hasMission(std::string missionName) {
-    if (missionName.empty()) {
-        throw ghoul::lua::LuaError("Missing name is empty");
+[[codegen::luawrap]] bool hasMission(std::string identifier) {
+    if (identifier.empty()) {
+        throw ghoul::lua::LuaError("Mission identifier is empty");
     }
 
-    bool hasMission = openspace::global::missionManager->hasMission(missionName);
+    bool hasMission = openspace::global::missionManager->hasMission(identifier);
     return hasMission;
 }
 
 // Set the currnet mission.
-[[codegen::luawrap]] void setCurrentMission(std::string missionName) {
-    if (missionName.empty()) {
-        throw ghoul::lua::LuaError("Mission name is empty");
+[[codegen::luawrap]] void setCurrentMission(std::string identifier) {
+    if (identifier.empty()) {
+        throw ghoul::lua::LuaError("Mission identifier is empty");
     }
-    openspace::global::missionManager->setCurrentMission(missionName);
+    openspace::global::missionManager->setCurrentMission(identifier);
 }
 #include "missionmanager_lua_codegen.cpp"
 

From ab4023b9fd90448fb35912cab4e5fbd45fd94f50 Mon Sep 17 00:00:00 2001
From: Alexander Bock <alexander.bock@liu.se>
Date: Wed, 14 Aug 2024 14:38:46 +0200
Subject: [PATCH 581/701] No longer send the script source of shortcuts via the
 topic.  Don't scripts into the log that are binary blobs

---
 modules/server/src/topics/shortcuttopic.cpp | 2 --
 src/scripting/scriptengine.cpp              | 5 +++--
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/modules/server/src/topics/shortcuttopic.cpp b/modules/server/src/topics/shortcuttopic.cpp
index 83bf4a47eb..2884869a35 100644
--- a/modules/server/src/topics/shortcuttopic.cpp
+++ b/modules/server/src/topics/shortcuttopic.cpp
@@ -58,7 +58,6 @@ std::vector<nlohmann::json> ShortcutTopic::shortcutsJson() const {
         const nlohmann::json shortcutJson = {
             { "identifier", action.identifier },
             { "name", action.name },
-            { "script", action.command },
             { "synchronization", static_cast<bool>(!action.isLocal) },
             { "documentation", action.documentation },
             { "guiPath", action.guiPath },
@@ -121,7 +120,6 @@ nlohmann::json ShortcutTopic::shortcutJson(const std::string& identifier) const
     json.push_back({
         { "identifier", action.identifier },
         { "name", action.name },
-        { "script", action.command },
         { "synchronization", static_cast<bool>(!action.isLocal) },
         { "documentation", action.documentation },
         { "guiPath", action.guiPath },
diff --git a/src/scripting/scriptengine.cpp b/src/scripting/scriptengine.cpp
index 57cd2c42fb..faa268c8dc 100644
--- a/src/scripting/scriptengine.cpp
+++ b/src/scripting/scriptengine.cpp
@@ -170,8 +170,9 @@ bool ScriptEngine::runScript(const std::string& script, const ScriptCallback& ca
 
     ghoul_assert(!script.empty(), "Script must not be empty");
 
-    if (_logScripts) {
-        // Write command to log before it's executed
+    if (_logScripts && script[0] != '\x1b') {
+        // \x1b = A byte in the beginning that Lua uses to represent whether a string is
+        // an ASCII or a binary blob. We don't want to print binary blobs into the log
         writeLog(script);
     }
 

From c7f2ab1a438dcc554c9d73fc07b3fcf835c89869 Mon Sep 17 00:00:00 2001
From: Alexander Bock <alexander.bock@liu.se>
Date: Wed, 14 Aug 2024 15:10:44 +0200
Subject: [PATCH 582/701] Define the supergalactic transformation matrix only
 once and reuse in other assets

---
 data/assets/scene/digitaluniverse/abell.asset | 15 ++++++---------
 .../digitaluniverse/galaxy_clusters.asset     | 15 ++++++---------
 .../scene/digitaluniverse/galaxy_groups.asset | 15 ++++++---------
 .../digitaluniverse/milkyway_label.asset      | 13 +++++--------
 .../scene/digitaluniverse/transforms.asset    | 19 +++++++++++++++++++
 data/assets/scene/digitaluniverse/tully.asset | 17 +++++++----------
 6 files changed, 49 insertions(+), 45 deletions(-)
 create mode 100644 data/assets/scene/digitaluniverse/transforms.asset

diff --git a/data/assets/scene/digitaluniverse/abell.asset b/data/assets/scene/digitaluniverse/abell.asset
index dce457d151..a7282aaac8 100644
--- a/data/assets/scene/digitaluniverse/abell.asset
+++ b/data/assets/scene/digitaluniverse/abell.asset
@@ -1,3 +1,7 @@
+local transforms = asset.require("./transforms")
+
+
+
 local textures = asset.resource({
   Name = "Point Textures",
   Type = "HttpSynchronization",
@@ -13,13 +17,6 @@ local speck = asset.resource({
 })
 
 
-local TransformMatrix = {
-  -0.7357425748,    0.67726129641,  0.0,           0.0,
-  -0.074553778365, -0.080991471307, 0.9939225904,  0.0,
-  0.67314530211,    0.73127116582,  0.11008126223, 0.0,
-  0.0,              0.0,            0.0,           1.0
-}
-
 local Object = {
   Identifier = "Abell",
   Renderable = {
@@ -33,7 +30,7 @@ local Object = {
       Size = 21.2,
       MinMaxSize = { 10, 12 },
       Unit = "Mpc",
-      TransformationMatrix = TransformMatrix
+      TransformationMatrix = transforms.Supergalactic
     },
     Opacity = 1.0,
     Coloring = {
@@ -44,7 +41,7 @@ local Object = {
       File = textures .. "point3A.png",
     },
     Unit = "Mpc",
-    TransformationMatrix = TransformMatrix,
+    TransformationMatrix = transforms.Supergalactic,
     SizeSettings = {
       ScaleExponent = 23.2,
       MaxSize = 0.27,
diff --git a/data/assets/scene/digitaluniverse/galaxy_clusters.asset b/data/assets/scene/digitaluniverse/galaxy_clusters.asset
index 82ca6b29c9..bd7fda1509 100644
--- a/data/assets/scene/digitaluniverse/galaxy_clusters.asset
+++ b/data/assets/scene/digitaluniverse/galaxy_clusters.asset
@@ -1,3 +1,7 @@
+local transforms = asset.require("./transforms")
+
+
+
 local speck = asset.resource({
   Name = "Clusters Speck Files",
   Type = "HttpSynchronization",
@@ -6,13 +10,6 @@ local speck = asset.resource({
 })
 
 
-local TransformMatrix = {
-  -0.7357425748,    0.67726129641,  0.0,           0.0,
-  -0.074553778365, -0.080991471307, 0.9939225904,  0.0,
-  0.67314530211,    0.73127116582,  0.11008126223, 0.0,
-  0.0,              0.0,            0.0,           1.0
-}
-
 local Object = {
   Identifier = "GalaxyClusterLabels",
   Renderable = {
@@ -25,11 +22,11 @@ local Object = {
       Size = 22,
       MinMaxSize = { 8, 15 },
       Unit = "Mpc",
-      TransformationMatrix = TransformMatrix
+      TransformationMatrix = transforms.Supergalactic
     },
     Opacity = 0.65,
     Unit = "Mpc",
-    TransformationMatrix = TransformMatrix
+    TransformationMatrix = transforms.Supergalactic
   },
   GUI = {
     Name = "Galaxy Cluster Labels",
diff --git a/data/assets/scene/digitaluniverse/galaxy_groups.asset b/data/assets/scene/digitaluniverse/galaxy_groups.asset
index e56532083a..e051227eee 100644
--- a/data/assets/scene/digitaluniverse/galaxy_groups.asset
+++ b/data/assets/scene/digitaluniverse/galaxy_groups.asset
@@ -1,3 +1,7 @@
+local transforms = asset.require("./transforms")
+
+
+
 local speck = asset.resource({
   Name = "Galaxy Groups Speck Files",
   Type = "HttpSynchronization",
@@ -6,13 +10,6 @@ local speck = asset.resource({
 })
 
 
-local TransformMatrix = {
-  -0.7357425748,    0.67726129641,  0.0,           0.0,
-  -0.074553778365, -0.080991471307, 0.9939225904,  0.0,
-  0.67314530211,    0.73127116582,  0.11008126223, 0.0,
-  0.0,              0.0,            0.0,           1.0
-}
-
 local Object = {
   Identifier = "NearbyGalaxyGroups",
   Renderable = {
@@ -25,11 +22,11 @@ local Object = {
       Size = 20.4,
       MinMaxSize = { 8, 20 },
       Unit = "Mpc",
-      TransformationMatrix = TransformMatrix
+      TransformationMatrix = transforms.Supergalactic
     },
     Opacity = 0.65,
     Unit = "Mpc",
-    TransformationMatrix = TransformMatrix
+    TransformationMatrix = transforms.Supergalactic
   },
   GUI = {
     Name = "Galaxy Group Labels",
diff --git a/data/assets/scene/digitaluniverse/milkyway_label.asset b/data/assets/scene/digitaluniverse/milkyway_label.asset
index 41a7752969..5393556afc 100644
--- a/data/assets/scene/digitaluniverse/milkyway_label.asset
+++ b/data/assets/scene/digitaluniverse/milkyway_label.asset
@@ -1,3 +1,7 @@
+local transforms = asset.require("./transforms")
+
+
+
 local homespeck = asset.resource({
   Name = "Home Speck File",
   Type = "HttpSynchronization",
@@ -5,13 +9,6 @@ local homespeck = asset.resource({
   Version = 1
 })
 
-local TransformMatrix = {
-  -0.7357425748,    0.67726129641,  0.0,           0.0,
-  -0.074553778365, -0.080991471307, 0.9939225904,  0.0,
-  0.67314530211,    0.73127116582,  0.11008126223, 0.0,
-  0.0,              0.0,            0.0,           1.0
-}
-
 
 local Object = {
   Identifier = "HomeLabel",
@@ -25,7 +22,7 @@ local Object = {
       Size = 20.50,
       MinMaxSize = { 16, 20 },
       Unit = "Mpc",
-      TransformationMatrix = TransformMatrix
+      TransformationMatrix = transforms.Supergalactic
     }
   },
   GUI = {
diff --git a/data/assets/scene/digitaluniverse/transforms.asset b/data/assets/scene/digitaluniverse/transforms.asset
new file mode 100644
index 0000000000..7276eb0083
--- /dev/null
+++ b/data/assets/scene/digitaluniverse/transforms.asset
@@ -0,0 +1,19 @@
+local Supergalactic = {
+  -0.7357425748,    0.67726129641,  0.0,           0.0,
+  -0.074553778365, -0.080991471307, 0.9939225904,  0.0,
+  0.67314530211,    0.73127116582,  0.11008126223, 0.0,
+  0.0,              0.0,            0.0,           1.0
+}
+
+asset.export("Supergalactic", Supergalactic)
+
+
+
+asset.meta = {
+  Name = "Supergalactic Transformation",
+  Description = [[This asset defines the transformation matrix to convert supergalactic
+    coordinates into galactic coordinates.]],
+  Author = "OpenSpace Team",
+  URL = "https://openspaceproject.com",
+  License = "MIT license"
+}
diff --git a/data/assets/scene/digitaluniverse/tully.asset b/data/assets/scene/digitaluniverse/tully.asset
index 44d72b1a50..ba74452a65 100644
--- a/data/assets/scene/digitaluniverse/tully.asset
+++ b/data/assets/scene/digitaluniverse/tully.asset
@@ -1,3 +1,7 @@
+local transforms = asset.require("./transforms")
+
+
+
 local textures = asset.resource({
   Name = "Tully Textures",
   Type = "HttpSynchronization",
@@ -13,13 +17,6 @@ local speck = asset.resource({
 })
 
 
-local TransformMatrix = {
-  -0.7357425748,    0.67726129641,  0.0,           0.0,
-  -0.074553778365, -0.080991471307, 0.9939225904,  0.0,
-  0.67314530211,    0.73127116582,  0.11008126223, 0.0,
-  0.0,              0.0,            0.0,           1.0
-}
-
 local TullyGalaxies = {
   Identifier = "TullyGalaxies",
   Renderable = {
@@ -31,7 +28,7 @@ local TullyGalaxies = {
       Size = 19.36,
       MinMaxSize = { 8, 20 },
       Unit = "Mpc",
-      TransformationMatrix = TransformMatrix
+      TransformationMatrix = transforms.Supergalactic
     },
     Opacity = 0.99,
     File = speck .. "tully.speck",
@@ -49,7 +46,7 @@ local TullyGalaxies = {
       }
     },
     Unit = "Mpc",
-    TransformationMatrix = TransformMatrix,
+    TransformationMatrix = transforms.Supergalactic,
     Fading = {
       FadeInDistances = { 0.001, 1.0 } -- Fade in value in the same unit as "Unit"
     },
@@ -86,7 +83,7 @@ local TullyGalaxiesImages = {
     Texture = {
       Folder = textures
     },
-    TransformationMatrix = TransformMatrix,
+    TransformationMatrix = transforms.Supergalactic,
     -- Use fixed orientation, and rotate planes based on orientation information in
     -- the dataset
     OrientationRenderOption = "Fixed Rotation",

From 39dc3a4dcf79024c4e675af7b632d3bf4175324e Mon Sep 17 00:00:00 2001
From: Alexander Bock <alexander.bock@liu.se>
Date: Thu, 15 Aug 2024 22:50:41 +0200
Subject: [PATCH 583/701] Don't enforce resolution in single.json configuration

---
 config/single.json | 1 -
 1 file changed, 1 deletion(-)

diff --git a/config/single.json b/config/single.json
index 38004b58c5..f36ad5b290 100644
--- a/config/single.json
+++ b/config/single.json
@@ -18,7 +18,6 @@
           "stereo": "none",
           "pos": { "x": 50, "y": 50 },
           "size": { "x": 1280, "y": 720 },
-          "res": { "x": 2560, "y": 1440 },
           "viewports": [
             {
               "tracked": true,

From f72e0af2f1b074e357156c092127fb3751db081d Mon Sep 17 00:00:00 2001
From: Alexander Bock <alexander.bock@liu.se>
Date: Fri, 16 Aug 2024 13:39:48 +0200
Subject: [PATCH 584/701] Don't delete the autogenerated kernel files as they
 need to be available when unloading a text kernel

---
 src/util/spicemanager.cpp | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/src/util/spicemanager.cpp b/src/util/spicemanager.cpp
index 8bb87c8b3b..ee8d07f769 100644
--- a/src/util/spicemanager.cpp
+++ b/src/util/spicemanager.cpp
@@ -1388,8 +1388,7 @@ glm::dmat3 SpiceManager::getEstimatedTransformMatrix(const std::string& fromFram
 }
 
 void SpiceManager::loadLeapSecondsSpiceKernel() {
-    constexpr std::string_view Naif00012tlsSource = R"(
-KPL/LSK
+    constexpr std::string_view Naif00012tlsSource = R"(KPL/LSK
 
 
 LEAPSECONDS KERNEL FILE
@@ -1549,12 +1548,10 @@ const std::filesystem::path path = std::filesystem::temp_directory_path();
         f << Naif00012tlsSource;
     }
     loadKernel(file);
-    std::filesystem::remove(file);
 }
 
 void SpiceManager::loadGeophysicalConstantsKernel() {
-    constexpr std::string_view GeoPhysicalConstantsKernelSource = R"(
-KPL/PCK
+    constexpr std::string_view GeoPhysicalConstantsKernelSource = R"(KPL/PCK
 
       The SPK creations applications (mkspk, mkspk_c) require the data in
       this kernel to produce Type 10 SPK segments based upon the Two-Line
@@ -1683,7 +1680,6 @@ References:
           f << GeoPhysicalConstantsKernelSource;
       }
       loadKernel(file);
-      std::filesystem::remove(file);
 }
 
 void SpiceManager::setExceptionHandling(UseException useException) {

From 7ec6b6cfb53e5411534de71540738ae80d34d642 Mon Sep 17 00:00:00 2001
From: Alexander Bock <alexander.bock@liu.se>
Date: Fri, 16 Aug 2024 13:45:24 +0200
Subject: [PATCH 585/701] Add examples for GlobeRotation (#3377)

* Add examples for GlobeRotation and make the longitude and latitude defintion non-optional
* Remove old GlobeRotation example
---
 data/assets/examples/globerotation.asset      | 71 -------------------
 .../rotation/globerotation/angle.asset        | 57 +++++++++++++++
 .../rotation/globerotation/globe.asset        | 55 ++++++++++++++
 .../rotation/globerotation/usecamera.asset    | 61 ++++++++++++++++
 modules/globebrowsing/src/globerotation.cpp   | 20 +++---
 5 files changed, 183 insertions(+), 81 deletions(-)
 delete mode 100644 data/assets/examples/globerotation.asset
 create mode 100644 data/assets/examples/rotation/globerotation/angle.asset
 create mode 100644 data/assets/examples/rotation/globerotation/globe.asset
 create mode 100644 data/assets/examples/rotation/globerotation/usecamera.asset

diff --git a/data/assets/examples/globerotation.asset b/data/assets/examples/globerotation.asset
deleted file mode 100644
index 58f7ab0dfc..0000000000
--- a/data/assets/examples/globerotation.asset
+++ /dev/null
@@ -1,71 +0,0 @@
-local sun = asset.require("scene/solarsystem/sun/transforms")
-local earth = asset.require("scene/solarsystem/planets/earth/earth")
-
-
-
-local models = asset.resource({
-  Name = "New Horizons Model",
-  Type = "HttpSynchronization",
-  Identifier = "newhorizons_model",
-  Version = 2
-})
-
-
-local ExampleGlobeRotation = {
-  Identifier = "ExampleGlobeRotation",
-  Parent = earth.Earth.Identifier,
-  Transform = {
-    Translation = {
-      Type = "GlobeTranslation",
-      Globe = earth.Earth.Identifier,
-      Latitude = 40.7306,
-      Longitude = -73.9352,
-      Altitude = 6,
-      UseHeightmap = true
-    },
-    Rotation = {
-      Type = "GlobeRotation",
-      Globe = earth.Earth.Identifier,
-      Latitude = 40.7306,
-      Longitude = -73.9352
-      -- Can be used to to put flat on leaning surfaces, but also leads to updating
-      -- the rotation every frame
-      --UseHeightmap = true
-    }
-  },
-  Renderable = {
-    Type = "RenderableModel",
-    GeometryFile = models .. "NewHorizonsCleanModel.obj",
-    LightSources = {
-      sun.LightSource
-    }
-  },
-  GUI = {
-    Name = "GlobeRotation",
-    Path = "/Examples"
-  }
-}
-
-
-asset.onInitialize(function()
-  openspace.addSceneGraphNode(ExampleGlobeRotation)
-end)
-
-asset.onDeinitialize(function()
-  openspace.removeSceneGraphNode(ExampleGlobeRotation)
-end)
-
-asset.export(ExampleGlobeRotation)
-
-
-
-asset.meta = {
-  Name = "GlobeRotation Example",
-  Description = [[An example that demonstrates how to load a 3D model from a geometry
-    file, placing it on a planetary surface and rotate it to align with the surface
-    normal using a "GlobeRotation" transform. Note that "GlobeTranslation" is needed to
-    put the model in the correct location.]],
-  Author = "OpenSpace Team",
-  URL = "http://openspaceproject.com",
-  License = "MIT license"
-}
diff --git a/data/assets/examples/rotation/globerotation/angle.asset b/data/assets/examples/rotation/globerotation/angle.asset
new file mode 100644
index 0000000000..03aa39e050
--- /dev/null
+++ b/data/assets/examples/rotation/globerotation/angle.asset
@@ -0,0 +1,57 @@
+-- Angle
+-- This asset creates a rotation that places a coordinate axes on the surface of a
+-- planetary body. The rotation causes the coordinate axes to remain fixed to the surface
+-- of the globe. Additionally, the coordinate axes are rotated around the up-axis by a
+-- fixed amount.
+--
+-- In order for this feature to work properly, the coordinate axes need to be located at
+-- the same place as well, so this example also needs a `GlobeTranslation` applied.
+
+-- The example needs a `RenderableGlobe` as a parent to function
+local Globe = {
+  Identifier = "GlobeRotation_Example_Angle_Globe",
+  Renderable = {
+    Type = "RenderableGlobe"
+  },
+  GUI = {
+    Name = "GlobeRotation - Angle (Globe)",
+    Path = "/Examples"
+  }
+}
+
+local Node = {
+  Identifier = "GlobeRotation_Example_Angle",
+  Parent = "GlobeRotation_Example_Angle_Globe",
+  Transform = {
+    Translation = {
+      Type = "GlobeTranslation",
+      Globe = "GlobeRotation_Example_Angle_Globe",
+      Latitude = 20.0,
+      Longitude = -45.0
+    },
+    Rotation = {
+      Type = "GlobeRotation",
+      Globe = "GlobeRotation_Example_Angle_Globe",
+      Latitude = 20.0,
+      Longitude = -45.0,
+      Angle = 45.0
+    }
+  },
+  Renderable = {
+    Type = "RenderableCartesianAxes"
+  },
+  GUI = {
+    Name = "GlobeRotation - Angle",
+    Path = "/Examples"
+  }
+}
+
+asset.onInitialize(function()
+  openspace.addSceneGraphNode(Globe)
+  openspace.addSceneGraphNode(Node)
+end)
+
+asset.onDeinitialize(function()
+  openspace.removeSceneGraphNode(Node)
+  openspace.removeSceneGraphNode(Globe)
+end)
diff --git a/data/assets/examples/rotation/globerotation/globe.asset b/data/assets/examples/rotation/globerotation/globe.asset
new file mode 100644
index 0000000000..b85209bfcb
--- /dev/null
+++ b/data/assets/examples/rotation/globerotation/globe.asset
@@ -0,0 +1,55 @@
+-- Basic
+-- This asset creates a rotation that places a coordinate axes on the surface of a
+-- planetary body. The rotation causes the coordinate axes to remain fixed to the surface
+-- of the globe.
+--
+-- In order for this feature to work properly, the coordinate axes need to be located at
+-- the same place as well, so this example also needs a `GlobeTranslation` applied.
+
+-- The example needs a `RenderableGlobe` as a parent to function
+local Globe = {
+  Identifier = "GlobeRotation_Example_Globe",
+  Renderable = {
+    Type = "RenderableGlobe"
+  },
+  GUI = {
+    Name = "GlobeRotation - Basic (Globe)",
+    Path = "/Examples"
+  }
+}
+
+local Node = {
+  Identifier = "GlobeRotation_Example",
+  Parent = "GlobeRotation_Example_Globe",
+  Transform = {
+    Translation = {
+      Type = "GlobeTranslation",
+      Globe = "GlobeRotation_Example_Globe",
+      Latitude = 20.0,
+      Longitude = -45.0
+    },
+    Rotation = {
+      Type = "GlobeRotation",
+      Globe = "GlobeRotation_Example_Globe",
+      Latitude = 20.0,
+      Longitude = -45.0
+    }
+  },
+  Renderable = {
+    Type = "RenderableCartesianAxes"
+  },
+  GUI = {
+    Name = "GlobeRotation - Basic",
+    Path = "/Examples"
+  }
+}
+
+asset.onInitialize(function()
+  openspace.addSceneGraphNode(Globe)
+  openspace.addSceneGraphNode(Node)
+end)
+
+asset.onDeinitialize(function()
+  openspace.removeSceneGraphNode(Node)
+  openspace.removeSceneGraphNode(Globe)
+end)
diff --git a/data/assets/examples/rotation/globerotation/usecamera.asset b/data/assets/examples/rotation/globerotation/usecamera.asset
new file mode 100644
index 0000000000..ceb2b3e156
--- /dev/null
+++ b/data/assets/examples/rotation/globerotation/usecamera.asset
@@ -0,0 +1,61 @@
+-- UseCamera
+-- This asset creates a rotation that places a coordinate axes on the surface of a
+-- planetary body. The rotation causes the coordinate axes to remain fixed to the surface
+-- of the globe. In this example, the rotation of the object will be updated based on the
+-- location of the camera. When loading this example, make sure to focus the camera on
+-- the Globe object for the follow-function to work.
+--
+-- In order for this feature to work properly, the coordinate axes need to be located at
+-- the same place as well, so this example also needs a `GlobeTranslation` applied, which
+-- in this case also updated based on the camera location.
+
+-- The example needs a `RenderableGlobe` as a parent to function
+local Globe = {
+  Identifier = "GlobeRotation_Example_UseCamera_Globe",
+  Renderable = {
+    Type = "RenderableGlobe"
+  },
+  GUI = {
+    Name = "GlobeRotation - UseCamera (Globe)",
+    Path = "/Examples"
+  }
+}
+
+local Node = {
+  Identifier = "GlobeRotation_Example_UseCamera",
+  Parent = "GlobeRotation_Example_UseCamera_Globe",
+  Transform = {
+    Translation = {
+      Type = "GlobeTranslation",
+      Globe = "GlobeRotation_Example_UseCamera_Globe",
+      Latitude = 20.0,
+      Longitude = -45.0,
+      UseCamera = true
+    },
+    Rotation = {
+      Type = "GlobeRotation",
+      Globe = "GlobeRotation_Example_UseCamera_Globe",
+      Latitude = 20.0,
+      Longitude = -45.0,
+      Angle = 45.0,
+      UseCamera = true
+    }
+  },
+  Renderable = {
+    Type = "RenderableCartesianAxes"
+  },
+  GUI = {
+    Name = "GlobeRotation - UseCamera",
+    Path = "/Examples"
+  }
+}
+
+asset.onInitialize(function()
+  openspace.addSceneGraphNode(Globe)
+  openspace.addSceneGraphNode(Node)
+end)
+
+asset.onDeinitialize(function()
+  openspace.removeSceneGraphNode(Node)
+  openspace.removeSceneGraphNode(Globe)
+end)
diff --git a/modules/globebrowsing/src/globerotation.cpp b/modules/globebrowsing/src/globerotation.cpp
index 0dbe8ae0d4..bc2ea848bf 100644
--- a/modules/globebrowsing/src/globerotation.cpp
+++ b/modules/globebrowsing/src/globerotation.cpp
@@ -49,7 +49,7 @@ namespace {
         "Latitude",
         "The latitude of the location on the globe's surface. The value can range from "
         "-90 to 90, with negative values representing the southern hemisphere of the "
-        "globe. The default value is 0.0.",
+        "globe.",
         openspace::properties::Property::Visibility::User
     };
 
@@ -58,15 +58,15 @@ namespace {
         "Longitude",
         "The longitude of the location on the globe's surface. The value can range from "
         "-180 to 180, with negative values representing the western hemisphere of the "
-        "globe. The default value is 0.0.",
+        "globe.",
         openspace::properties::Property::Visibility::User
     };
 
     constexpr openspace::properties::Property::PropertyInfo AngleInfo = {
         "Angle",
         "Angle",
-        "A rotation angle that can be used to rotate the object around its own y-axis, "
-        "which will be pointing out of the globe's surface.",
+        "A rotation angle (in degrees) that can be used to rotate the object around its "
+        "own y-axis, which will be pointing out of the globe's surface.",
         openspace::properties::Property::Visibility::AdvancedUser
     };
 
@@ -82,7 +82,8 @@ namespace {
     constexpr openspace::properties::Property::PropertyInfo UseCameraInfo = {
         "UseCamera",
         "Use Camera",
-        "If this value is 'true', the lat and lon are updated to match the camera.",
+        "If this value is 'true', the latitute and longitude are updated each frame "
+        "to match the location of the camera.",
         openspace::properties::Property::Visibility::AdvancedUser
     };
 
@@ -92,10 +93,10 @@ namespace {
             [[codegen::annotation("A valid scene graph node with a RenderableGlobe")]];
 
         // [[codegen::verbatim(LatitudeInfo.description)]]
-        std::optional<double> latitude;
+        double latitude [[codegen::inrange(-90.0, 90.0)]];
 
         // [[codegen::verbatim(LongitudeInfo.description)]]
-        std::optional<double> longitude;
+        double longitude [[codegen::inrange(-180.0, 180.0)]];
 
         // [[codegen::verbatim(AngleInfo.description)]]
         std::optional<double> angle;
@@ -132,11 +133,11 @@ GlobeRotation::GlobeRotation(const ghoul::Dictionary& dictionary)
     });
     addProperty(_globe);
 
-    _latitude = p.latitude.value_or(_latitude);
+    _latitude = p.latitude;
     _latitude.onChange([this]() { setUpdateVariables(); });
     addProperty(_latitude);
 
-    _longitude = p.longitude.value_or(_longitude);
+    _longitude = p.longitude;
     _longitude.onChange([this]() { setUpdateVariables(); });
     addProperty(_longitude);
 
@@ -151,7 +152,6 @@ GlobeRotation::GlobeRotation(const ghoul::Dictionary& dictionary)
     _useCamera = p.useCamera.value_or(_useCamera);
     _useCamera.onChange([this]() { setUpdateVariables(); });
     addProperty(_useCamera);
-
 }
 
 void GlobeRotation::findGlobe() {

From 9decd9aad22e59fd2f647e6574e209d2a2bbb99c Mon Sep 17 00:00:00 2001
From: Alexander Bock <alexander.bock@liu.se>
Date: Fri, 16 Aug 2024 13:45:40 +0200
Subject: [PATCH 586/701] Add examples for SpiceTranslation (#3376)

---
 .../rotation/spicerotation/fixeddate.asset    | 36 ++++++++++++++++
 .../rotation/spicerotation/spice.asset        | 34 +++++++++++++++
 .../rotation/spicerotation/timeframe.asset    | 41 +++++++++++++++++++
 3 files changed, 111 insertions(+)
 create mode 100644 data/assets/examples/rotation/spicerotation/fixeddate.asset
 create mode 100644 data/assets/examples/rotation/spicerotation/spice.asset
 create mode 100644 data/assets/examples/rotation/spicerotation/timeframe.asset

diff --git a/data/assets/examples/rotation/spicerotation/fixeddate.asset b/data/assets/examples/rotation/spicerotation/fixeddate.asset
new file mode 100644
index 0000000000..d3c580a656
--- /dev/null
+++ b/data/assets/examples/rotation/spicerotation/fixeddate.asset
@@ -0,0 +1,36 @@
+-- Fixed Date
+-- This asset creates a rotation provided by a SPICE kernel and applies it to a
+-- SceneGraphNode that only displays coordinate axes. The rotation of the coordinate axes
+-- are determined by SPICE, in this case pretending that the coordinate axes are rotating
+-- at the same rate as Earth. In this specific example, the orientation is independent of
+-- the actual in-game time in OpenSpace and only uses a fixed date of 2000 JAN 01 instead.
+
+-- Load the default SPICE kernels, which is the planetary constants and the DE430 kernel
+asset.require("spice/core")
+
+local Node = {
+  Identifier = "SpiceRotation_Example_FixedDate",
+  Transform = {
+    Rotation = {
+      Type = "SpiceRotation",
+      SourceFrame = "IAU_EARTH",
+      DestinationFrame = "GALACTIC",
+      FixedDate = "2000 JAN 01 00:00:00.000"
+    }
+  },
+  Renderable = {
+    Type = "RenderableCartesianAxes"
+  },
+  GUI = {
+    Name = "SpiceRotation - Fixed Date",
+    Path = "/Examples"
+  }
+}
+
+asset.onInitialize(function()
+  openspace.addSceneGraphNode(Node)
+end)
+
+asset.onDeinitialize(function()
+  openspace.removeSceneGraphNode(Node)
+end)
diff --git a/data/assets/examples/rotation/spicerotation/spice.asset b/data/assets/examples/rotation/spicerotation/spice.asset
new file mode 100644
index 0000000000..e084dde9bb
--- /dev/null
+++ b/data/assets/examples/rotation/spicerotation/spice.asset
@@ -0,0 +1,34 @@
+-- Basic
+-- This asset creates a rotation provided by a SPICE kernel and applies it to a
+-- SceneGraphNode that only displays coordinate axes. The rotation of the coordinate axes
+-- are determined by SPICE, in this case pretending that the coordinate axes are rotating
+-- at the same rate as Earth.
+
+-- Load the default SPICE kernels, which is the planetary constants and the DE430 kernel
+asset.require("spice/core")
+
+local Node = {
+  Identifier = "SpiceRotation_Example",
+  Transform = {
+    Rotation = {
+      Type = "SpiceRotation",
+      SourceFrame = "IAU_EARTH",
+      DestinationFrame = "GALACTIC"
+    }
+  },
+  Renderable = {
+    Type = "RenderableCartesianAxes"
+  },
+  GUI = {
+    Name = "SpiceRotation - Basic",
+    Path = "/Examples"
+  }
+}
+
+asset.onInitialize(function()
+  openspace.addSceneGraphNode(Node)
+end)
+
+asset.onDeinitialize(function()
+  openspace.removeSceneGraphNode(Node)
+end)
diff --git a/data/assets/examples/rotation/spicerotation/timeframe.asset b/data/assets/examples/rotation/spicerotation/timeframe.asset
new file mode 100644
index 0000000000..6eb7eb3f90
--- /dev/null
+++ b/data/assets/examples/rotation/spicerotation/timeframe.asset
@@ -0,0 +1,41 @@
+-- TimeFrame
+-- This asset creates a rotation provided by a SPICE kernel and applies it to a
+-- SceneGraphNode that only displays coordinate axes. The rotation of the coordinate axes
+-- are determined by SPICE, in this case pretending that the coordinate axes are rotating
+-- at the same rate as Earth. In this example, the rotation is only calculated between
+-- 2000 JAN 01 and 2002 JAN 01 to exemplify a use-case in which the data from the SPICE
+-- kernel is not available for the whole duration.
+
+-- Load the default SPICE kernels, which is the planetary constants and the DE430 kernel
+asset.require("spice/core")
+
+local Node = {
+  Identifier = "SpiceRotation_Example_TimeFrame",
+  Transform = {
+    Rotation = {
+      Type = "SpiceRotation",
+      SourceFrame = "IAU_EARTH",
+      DestinationFrame = "GALACTIC",
+      TimeFrame = {
+        Type = "TimeFrameInterval",
+        Start = "2000 JAN 01",
+        End = "2002 JAN 01"
+      }
+    }
+  },
+  Renderable = {
+    Type = "RenderableCartesianAxes"
+  },
+  GUI = {
+    Name = "SpiceRotation - TimeFrame",
+    Path = "/Examples"
+  }
+}
+
+asset.onInitialize(function()
+  openspace.addSceneGraphNode(Node)
+end)
+
+asset.onDeinitialize(function()
+  openspace.removeSceneGraphNode(Node)
+end)

From f2a9477eb5353943cec6ff6f44fb618a45730af8 Mon Sep 17 00:00:00 2001
From: Alexander Bock <alexander.bock@liu.se>
Date: Fri, 16 Aug 2024 13:46:39 +0200
Subject: [PATCH 587/701] Lua Securty Sandboxing (#3378)

* Add Lua sandboxing
* Convert existing files to use custom functions instead of now-prohibited library functions
---
 data/assets/global/localbookmarks.asset       |  12 +-
 .../constellations/constellation_art.asset    | 118 +++++++++---------
 data/assets/util/constellations_helper.asset  |   9 +-
 ext/ghoul                                     |   2 +-
 include/openspace/engine/configuration.h      |   2 +
 include/openspace/scripting/scriptengine.h    |   2 +-
 openspace.cfg                                 |   2 +
 src/engine/configuration.cpp                  |  11 ++
 src/engine/openspaceengine.cpp                |  15 ++-
 src/scripting/scriptengine.cpp                |   7 +-
 10 files changed, 101 insertions(+), 79 deletions(-)

diff --git a/data/assets/global/localbookmarks.asset b/data/assets/global/localbookmarks.asset
index 93888ace92..dadea5c098 100644
--- a/data/assets/global/localbookmarks.asset
+++ b/data/assets/global/localbookmarks.asset
@@ -15,15 +15,11 @@ end
 
 -- Create bookmarks file if it does not exist
 if not openspace.fileExists(localBookmarks) then
-  local file = io.open(localBookmarks, "w")
-  file:write(
-    "Group (optional),Name (required),Globe (optional),Lat (required if globe)," ..
-    "Lon (required if globe),Altitude (optional if globe),x (required if not globe)," ..
-    "y (required if not globe),z (required if not globe),Scale (optional)," ..
-    "LineWidth (optional)\n" ..
-    "NASA,Kennedy Space Center,Earth,28.6658276,-80.70282839,,,,,,\n"
+  openspace.downloadFile(
+    "http://liu-se.cdn.openspaceproject.com/files/misc/localbookmarks.csv",
+    openspace.absPath("${USER}/bookmarks/localbookmarks.csv"),
+    true
   )
-  file:close()
 end
 
 local nodes = bookmarkHelper.loadBookmarks(
diff --git a/data/assets/scene/milkyway/constellations/constellation_art.asset b/data/assets/scene/milkyway/constellations/constellation_art.asset
index efc0cef81e..9a0ec35623 100644
--- a/data/assets/scene/milkyway/constellations/constellation_art.asset
+++ b/data/assets/scene/milkyway/constellations/constellation_art.asset
@@ -22,8 +22,6 @@ local data = asset.resource({
 --function that reads the file
 local function createConstellations(baseIdentifier, guiPath, constellationfile)
   local genConstellations = {}
-  --skip the first line
-  local notFirstLine = false
   -- define parsec to meters
   local PARSEC_CONSTANT = 3.0856776E16
   -- how many parsecs away do you want the images to be?
@@ -31,68 +29,74 @@ local function createConstellations(baseIdentifier, guiPath, constellationfile)
   -- but they can really be anywhere since the billboard size will scale with distance.
   local distanceMultiplier = 3.2
   local baseScale = 1e17
-  for line in io.lines(openspace.absPath(constellationfile)) do
-    if (notFirstLine) then
-      -- describes the data
-      local matchstring = "(.-),(.-),(.-),(.-),(.-),(.-),(.-),(.-),(.-),(.-),(.-),(.-)$"
-      local group, abbreviation, name, x, y, z, scale, imageName, rotX, rotY, rotZ, centerStar = line:match(matchstring)
-      local magVec = math.sqrt(x*x + y*y + z*z)
-      local normx = x / magVec
-      local normy = y / magVec
-      local normz = z / magVec
+  local lines = openspace.readCSVFile(openspace.absPath(constellationfile))
+  for _, line in ipairs(lines) do
+    -- describes the data
+    local group = line[1]
+    local abbreviation = line[2]
+    local name = line[3]
+    local x = tonumber(line[4])
+    local y = tonumber(line[5])
+    local z = tonumber(line[6])
+    local scale = tonumber(line[7])
+    local imageName = line[8]
+    local rotX = tonumber(line[9])
+    local rotY = tonumber(line[10])
+    local rotZ = tonumber(line[11])
+    local centerStar = line[12]
+    local magVec = math.sqrt(x*x + y*y + z*z)
+    local normx = x / magVec
+    local normy = y / magVec
+    local normz = z / magVec
 
-      -- Use the full name in the data constellations.dat if possible
-      -- Otherwise, use the given name in the constellation_data.csv file
-      local foundName = constellations_helper.findFullName(abbreviation)
-      if foundName ~= nil then
-        name = foundName
-      end
+    -- Use the full name in the data constellations.dat if possible
+    -- Otherwise, use the given name in the constellation_data.csv file
+    local foundName = constellations_helper.findFullName(abbreviation)
+    if foundName ~= nil then
+      name = foundName
+    end
 
-      group = (group == "" and globe or group)
+    group = (group == "" and globe or group)
 
-      local aconstellation = {
-        -- Identifier = guiPath .. "-" .. name,
-        Identifier = baseIdentifier .. "-" .. abbreviation,
-        Parent = transforms.SolarSystemBarycenter.Identifier,
-        Transform = {
-          Translation = {
-            Type = "StaticTranslation",
-            -- position is in parsecs from the SolarSystemBarycenter, so convert to meters
-            Position = {
-              normx * PARSEC_CONSTANT * distanceMultiplier,
-              normy * PARSEC_CONSTANT * distanceMultiplier,
-              normz * PARSEC_CONSTANT * distanceMultiplier
-            }
-          },
-          Rotation = {
-            Type = "StaticRotation",
-            Rotation = { tonumber(rotX), tonumber(rotY), tonumber(rotZ) }
+    local aconstellation = {
+      -- Identifier = guiPath .. "-" .. name,
+      Identifier = baseIdentifier .. "-" .. abbreviation,
+      Parent = transforms.SolarSystemBarycenter.Identifier,
+      Transform = {
+        Translation = {
+          Type = "StaticTranslation",
+          -- position is in parsecs from the SolarSystemBarycenter, so convert to meters
+          Position = {
+            normx * PARSEC_CONSTANT * distanceMultiplier,
+            normy * PARSEC_CONSTANT * distanceMultiplier,
+            normz * PARSEC_CONSTANT * distanceMultiplier
           }
         },
-        Renderable = {
-          Type = "RenderablePlaneImageLocal",
-          Enabled = false,
-          Size = tonumber(baseScale * scale * distanceMultiplier / 10),
-          Origin = "Center",
-          Billboard = false,
-          LazyLoading = true,
-          Texture = images .. imageName,
-          BlendMode = "Additive",
-          Opacity = 0.1,
-          DimInAtmosphere = true
-        },
-        Tag = { "ImageConstellation", group, "daytime_hidden" },
-        GUI = {
-          Name = name .. " Image",
-          Path = "/Milky Way/Constellations/" .. guiPath,
-          Description = name .. " Image"
+        Rotation = {
+          Type = "StaticRotation",
+          Rotation = { tonumber(rotX), tonumber(rotY), tonumber(rotZ) }
         }
+      },
+      Renderable = {
+        Type = "RenderablePlaneImageLocal",
+        Enabled = false,
+        Size = tonumber(baseScale * scale * distanceMultiplier / 10),
+        Origin = "Center",
+        Billboard = false,
+        LazyLoading = true,
+        Texture = images .. imageName,
+        BlendMode = "Additive",
+        Opacity = 0.1,
+        DimInAtmosphere = true
+      },
+      Tag = { "ImageConstellation", group, "daytime_hidden" },
+      GUI = {
+        Name = name .. " Image",
+        Path = "/Milky Way/Constellations/" .. guiPath,
+        Description = name .. " Image"
       }
-      table.insert(genConstellations, aconstellation)
-
-    else
-      notFirstLine = true
-    end
+    }
+    table.insert(genConstellations, aconstellation)
   end
   return genConstellations
 end
diff --git a/data/assets/util/constellations_helper.asset b/data/assets/util/constellations_helper.asset
index ffbce5157c..69975b7a99 100644
--- a/data/assets/util/constellations_helper.asset
+++ b/data/assets/util/constellations_helper.asset
@@ -11,14 +11,10 @@ local data = asset.resource({
 -- If the file does not exist or if a match could not be found, it returns nil
 local function findFullName(abbreviation)
   local namesFile = data .. "constellations.dat"
-  local file = io.open(namesFile, "r")
   local fullName = ""
 
-  if file == nil then
-    return nil
-  end
-
-  for line in io.lines(namesFile) do
+  local lines = openspace.readFileLines(namesFile)
+  for _, line in ipairs(lines) do
     -- Try and find the identifier in the file
     local index, length = line:find(abbreviation)
     if index ~= nil and index < 4 then
@@ -37,7 +33,6 @@ local function findFullName(abbreviation)
     end
   end
 
-  file:close()
   if fullName == "" then
     openspace.printError(
       "Error when calling function 'findFullName' in file 'util/constellations_helper': " ..
diff --git a/ext/ghoul b/ext/ghoul
index 7eb3d942c4..b0517f0be9 160000
--- a/ext/ghoul
+++ b/ext/ghoul
@@ -1 +1 @@
-Subproject commit 7eb3d942c48f8678519ffcd57c325db35bd192d8
+Subproject commit b0517f0be9d4087328c6ebb5811141c801864089
diff --git a/include/openspace/engine/configuration.h b/include/openspace/engine/configuration.h
index 7bb5abeacc..2c6a624001 100644
--- a/include/openspace/engine/configuration.h
+++ b/include/openspace/engine/configuration.h
@@ -105,6 +105,8 @@ struct Configuration {
 
     bool shouldUseScreenshotDate = false;
 
+    bool sandboxedLua = true;
+
     std::string onScreenTextScaling = "window";
     bool usePerProfileCache = false;
 
diff --git a/include/openspace/scripting/scriptengine.h b/include/openspace/scripting/scriptengine.h
index 8776856ec4..ff6c37e976 100644
--- a/include/openspace/scripting/scriptengine.h
+++ b/include/openspace/scripting/scriptengine.h
@@ -62,7 +62,7 @@ public:
 
     static constexpr std::string_view OpenSpaceLibraryName = "openspace";
 
-    ScriptEngine();
+    explicit ScriptEngine(bool sandboxedLua = true);
 
     /**
      * Initializes the internal Lua state and registers a common set of library functions.
diff --git a/openspace.cfg b/openspace.cfg
index 042913cfe5..4de0cbfe0b 100644
--- a/openspace.cfg
+++ b/openspace.cfg
@@ -226,6 +226,8 @@ LogEachOpenGLCall = false
 PrintEvents = false
 ConsoleKey = "GRAVEACCENT"
 
+SandboxedLua = true
+
 ShutdownCountdown = 3
 ScreenshotUseDate = true
 BypassLauncher = false
diff --git a/src/engine/configuration.cpp b/src/engine/configuration.cpp
index cd2d26d9e4..ff22ad6ae7 100644
--- a/src/engine/configuration.cpp
+++ b/src/engine/configuration.cpp
@@ -191,6 +191,12 @@ namespace {
         // pass beyond local midnight
         std::optional<bool> screenshotUseDate;
 
+        // Toggles whether the Lua states used inside OpenSpace are sandboxed which
+        // prevents potentially unsafe malicious code to run on the system. Only turn this
+        // setting to `false` if you are sure that no external code from asset files,
+        // session recordings, or parallel connections can be executed on this machine.
+        std::optional<bool> sandboxedLua;
+
         struct HttpProxy {
             // Determines whether the proxy is being used
             std::optional<bool> activate;
@@ -405,6 +411,7 @@ ghoul::Dictionary Configuration::createDictionary() {
     res.setValue("ConsoleKey", ghoul::to_string(consoleKey));
     res.setValue("ShutdownCountdown", static_cast<double>(shutdownCountdown));
     res.setValue("shouldUseScreenshotDate", shouldUseScreenshotDate);
+    res.setValue("sandboxedLua", sandboxedLua);
     res.setValue("OnScreenTextScaling", onScreenTextScaling);
     res.setValue("UsePerProfileCache", usePerProfileCache);
     res.setValue("IsRenderingOnMasterDisabled", isRenderingOnMasterDisabled);
@@ -562,6 +569,7 @@ void parseLuaState(Configuration& configuration) {
 
     c.shutdownCountdown = p.shutdownCountdown.value_or(c.shutdownCountdown);
     c.shouldUseScreenshotDate = p.screenshotUseDate.value_or(c.shouldUseScreenshotDate);
+    c.sandboxedLua = p.sandboxedLua.value_or(c.sandboxedLua);
     c.onScreenTextScaling = p.onScreenTextScaling.value_or(c.onScreenTextScaling);
     c.usePerProfileCache = p.perProfileCache.value_or(c.usePerProfileCache);
     c.isRenderingOnMasterDisabled =
@@ -705,6 +713,9 @@ Configuration loadConfigurationFromFile(const std::filesystem::path& configurati
     ghoul_assert(std::filesystem::is_regular_file(configurationFile), "File must exist");
 
     Configuration result;
+    // Having the configuration not sandboxed is safe as there is no way for a third-party
+    // file to have any input this early in the loading phase
+    result.state = ghoul::lua::LuaState(ghoul::lua::LuaState::Sandboxed::No);
 
     // Injecting the resolution of the primary screen into the Lua state
     const std::string script = std::format(
diff --git a/src/engine/openspaceengine.cpp b/src/engine/openspaceengine.cpp
index ff8bbbb243..3f04d62077 100644
--- a/src/engine/openspaceengine.cpp
+++ b/src/engine/openspaceengine.cpp
@@ -389,6 +389,17 @@ void OpenSpaceEngine::initialize() {
     // Register the provided shader directories
     ghoul::opengl::ShaderPreprocessor::addIncludePath(absPath("${SHADERS}"));
 
+    if (!global::configuration->sandboxedLua) {
+        // The Lua state is sandboxed by default, so if the user wants an unsandboxed one,
+        // we have to recreate it here.
+        // @TODO (2024-08-07, abock) It's not pretty, but doing it differently would
+        // require a bigger rewrite of how we handle the ScriptEngine
+        global::scriptEngine->~ScriptEngine();
+        global::scriptEngine = new (global::scriptEngine) scripting::ScriptEngine(
+            global::configuration->sandboxedLua
+        );
+    }
+
     // Register Lua script functions
     LDEBUG("Registering Lua libraries");
     registerCoreClasses(*global::scriptEngine);
@@ -906,7 +917,9 @@ void OpenSpaceEngine::runGlobalCustomizationScripts() {
     ZoneScoped;
 
     LINFO("Running Global initialization scripts");
-    const ghoul::lua::LuaState state;
+    const ghoul::lua::LuaState state = ghoul::lua::LuaState(
+        ghoul::lua::LuaState::Sandboxed::No
+    );
     global::scriptEngine->initializeLuaState(state);
 
     for (const std::string& script : global::configuration->globalCustomizationScripts) {
diff --git a/src/scripting/scriptengine.cpp b/src/scripting/scriptengine.cpp
index faa268c8dc..636ce6f750 100644
--- a/src/scripting/scriptengine.cpp
+++ b/src/scripting/scriptengine.cpp
@@ -80,15 +80,14 @@ namespace {
 
         return result;
     }
-
-
-
 #include "scriptengine_codegen.cpp"
 } // namespace
 
 namespace openspace::scripting {
 
-ScriptEngine::ScriptEngine() {}
+ScriptEngine::ScriptEngine(bool sandboxedLua)
+    : _state(ghoul::lua::LuaState::Sandboxed(sandboxedLua))
+{}
 
 void ScriptEngine::initialize() {
     ZoneScoped;

From e7533ba6a5298c724463b02763f4691cdd769583 Mon Sep 17 00:00:00 2001
From: Alexander Bock <alexander.bock@liu.se>
Date: Fri, 16 Aug 2024 16:00:54 +0200
Subject: [PATCH 588/701] Update Ghoul submodule

---
 ext/ghoul | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ext/ghoul b/ext/ghoul
index b0517f0be9..a88d75e2cc 160000
--- a/ext/ghoul
+++ b/ext/ghoul
@@ -1 +1 @@
-Subproject commit b0517f0be9d4087328c6ebb5811141c801864089
+Subproject commit a88d75e2cc564ca12d8295b8282d9798ed5dd1db

From a01760a3caeacecca64dc1d6c5710cb9ae34e84b Mon Sep 17 00:00:00 2001
From: Alexander Bock <alexander.bock@liu.se>
Date: Sun, 18 Aug 2024 12:55:55 +0200
Subject: [PATCH 589/701] Remove remains of visibility voting

---
 modules/base/translation/statictranslation.cpp               | 1 -
 .../kameleonvolume/rendering/renderablekameleonvolume.cpp    | 2 --
 .../multiresvolume/rendering/renderablemultiresvolume.cpp    | 5 -----
 3 files changed, 8 deletions(-)

diff --git a/modules/base/translation/statictranslation.cpp b/modules/base/translation/statictranslation.cpp
index 894c0f68e7..58f89177e0 100644
--- a/modules/base/translation/statictranslation.cpp
+++ b/modules/base/translation/statictranslation.cpp
@@ -33,7 +33,6 @@ namespace {
         "Position",
         "This value is used as a static offset (in meters) that is applied to the scene "
         "graph node that this transformation is attached to relative to its parent.",
-        // @VISIBILITY(2.25)
         openspace::properties::Property::Visibility::User
     };
 
diff --git a/modules/kameleonvolume/rendering/renderablekameleonvolume.cpp b/modules/kameleonvolume/rendering/renderablekameleonvolume.cpp
index 96b948be76..5ee8b4e9b4 100644
--- a/modules/kameleonvolume/rendering/renderablekameleonvolume.cpp
+++ b/modules/kameleonvolume/rendering/renderablekameleonvolume.cpp
@@ -104,7 +104,6 @@ namespace {
         "LowerValueBound",
         "Lower Value Bound",
         "", // @TODO Missing documentation
-        // @VISIBILITY(?)
         openspace::properties::Property::Visibility::AdvancedUser
     };
 
@@ -112,7 +111,6 @@ namespace {
         "UpperValueBound",
         "Upper Value Bound",
         "", // @TODO Missing documentation
-        // @VISIBILITY(?)
         openspace::properties::Property::Visibility::AdvancedUser
     };
 
diff --git a/modules/multiresvolume/rendering/renderablemultiresvolume.cpp b/modules/multiresvolume/rendering/renderablemultiresvolume.cpp
index 805e8f8fe0..3f8ee49dfa 100644
--- a/modules/multiresvolume/rendering/renderablemultiresvolume.cpp
+++ b/modules/multiresvolume/rendering/renderablemultiresvolume.cpp
@@ -79,7 +79,6 @@ namespace {
         "CurrentTime",
         "Current Time",
         "", // @TODO Missing documentation
-        // @VISIBILITY(2.5)
         openspace::properties::Property::Visibility::User
     };
 
@@ -87,7 +86,6 @@ namespace {
         "MemoryBudget",
         "Memory Budget",
         "", // @TODO Missing documentation
-        // @VISIBILITY(3.5)
         openspace::properties::Property::Visibility::AdvancedUser
     };
 
@@ -95,7 +93,6 @@ namespace {
         "StreamingBudget",
         "Streaming Budget",
         "", // @TODO Missing documentation
-        // @VISIBILITY(3.5)
         openspace::properties::Property::Visibility::AdvancedUser
     };
 
@@ -103,7 +100,6 @@ namespace {
         "UseGlobalTime",
         "Global Time",
         "", // @TODO Missing documentation
-        // @VISIBILITY(2.5)
         openspace::properties::Property::Visibility::User
     };
 
@@ -118,7 +114,6 @@ namespace {
         "Selector",
         "Brick Selector",
         "", // @TODO Missing documentation
-        // @VISIBILITY(3.5)
         openspace::properties::Property::Visibility::AdvancedUser
     };
 

From a75c6f3c9e3f3d105de8ca6e6c9cd6580815bf47 Mon Sep 17 00:00:00 2001
From: Alexander Bock <alexander.bock@liu.se>
Date: Sun, 18 Aug 2024 13:46:17 +0200
Subject: [PATCH 590/701] Adapt core scripts to Lua style guide

---
 scripts/core_scripts.lua | 516 +++++++++++++++++++--------------------
 1 file changed, 251 insertions(+), 265 deletions(-)

diff --git a/scripts/core_scripts.lua b/scripts/core_scripts.lua
index 91884ac3d0..21ab69f942 100644
--- a/scripts/core_scripts.lua
+++ b/scripts/core_scripts.lua
@@ -1,319 +1,305 @@
 openspace.documentation = {
-    {
-        Name = "markInterestingNodes",
-        Arguments = {{ "sceneGraphNodes", "String[]" }},
-        Documentation = "This function marks the scene graph nodes identified by name " ..
-        "as interesting, which will provide shortcut access to focus buttons and " ..
-        "featured properties"
+  {
+    Name = "markInterestingNodes",
+    Arguments = {{ "sceneGraphNodes", "String[]" }},
+    Documentation = [[This function marks the scene graph nodes identified by name as
+      interesting, which will provide shortcut access to focus buttons and featured
+      properties]]
+  },
+  {
+    Name = "markInterestingTimes",
+    Arguments = {{ "times", "Table[]" }},
+    Documentation = [[This function marks interesting times for the current scene, which
+      will create shortcuts for a quick access]]
+  },
+  {
+    Name = "removeInterestingNodes",
+    Arguments = {{ "sceneGraphNodes", "String[]" }},
+    Documentation = [[This function removes unmarks the scene graph nodes identified by
+      name as interesting, thus removing the shortcuts from the features properties list]]
+  },
+  {
+    Name = "setDefaultGuiSorting",
+    Arguments = {},
+    Documentation = [[This function sets the default GUI sorting for the space environment
+      to increasing size, from solar system, through Milky Way, Universe and finishing
+      with other elements]]
+  },
+  {
+    Name = "setDefaultDashboard",
+    Arguments = {},
+    Documentation = [[This function sets the default values for the dashboard consisting
+      of 'DashboardItemDate', 'DashboardItemSimulationIncrement', 'DashboardItemDistance',
+      'DashboardItemFramerate', and 'DashboardItemParallelConnection']]
+  },
+  {
+    Name = "rebindKey",
+    Arguments = {{ "oldKey", "String" }, { "newKey", "String" }},
+    Documentation = [[Rebinds all scripts from the old key (first argument) to the new
+      key (second argument)]]
+  },
+  {
+    Name = "appendToListProperty",
+    Arguments = {{ "identifier","String" }, { "value", "any" }},
+    Documentation = [[Add a value to the list property with the given identifier. The
+      value can be any type, as long as it is the correct type for the given property.
+      Note that a number will be converted to a string automatically.]]
+  },
+  {
+    Name = "addToPropertyValue",
+    Arguments = {{ "identifier", "String" } , { "value", "String | Number" }},
+    Documentation = [[Add a value to the property with the given identifier. Works on both
+      numerical and string properties, where adding to a string property means appending
+      the given string value to the existing string value.]]
+  },
+  {
+    Name = "invertBooleanProperty",
+    Arguments = {{ "identifier", "String" }},
+    Documentation = "Inverts the value of a boolean property with the given identifier"
+  },
+  {
+    Name = "fadeIn",
+    Arguments = {
+      { "identifier", "String" },
+      { "fadeTime", "Number?" },
+      { "endScript", "String?" }
     },
-    {
-        Name = "markInterestingTimes",
-        Arguments = {{ "times", "Table[]" }},
-        Documentation = "This function marks interesting times for the current scene, " ..
-        "which will create shortcuts for a quick access"
+    Documentation = [[Fades in the node(s) with the given identifier over the given time
+      in seconds. The identifier can contain a tag and/or a wildcard to target several
+      nodes. If the fade time is not provided then the 'OpenSpaceEngine.FadeDuration'
+      property will be used instead. If the third argument (endScript) is provided then
+      that script will be run after the fade is finished.]]
+  },
+  {
+    Name = "fadeOut",
+    Arguments = {
+      { "identifier", "String" },
+      { "fadeTime", "Number?" },
+      { "endScript", "String?" }
     },
-    {
-        Name = "removeInterestingNodes",
-        Arguments = {{ "sceneGraphNodes", "String[]" }},
-        Documentation = "This function removes unmarks the scene graph nodes " ..
-        "identified by name as interesting, thus removing the shortcuts from the " ..
-        "features properties list"
+    Documentation = [[Fades out the node(s) with the given identifier over the given time
+      in seconds. The identifier can contain a tag and/or a wildcard to target several
+      nodes. If the fade time is not provided then the 'OpenSpaceEngine.FadeDuration'
+      property will be used instead. If the third argument (endScript) is provided then
+      that script will be run after the fade is finished.]]
+  },
+  {
+    Name = "toggleFade",
+    Arguments = {
+      { "identifier", "String" },
+      { "fadeTime", "Number?" },
+      { "endScript", "String?" }
     },
-    {
-        Name = "setDefaultGuiSorting",
-        Arguments = {},
-        Documentation = "This function sets the default GUI sorting for the space " ..
-        "environment to increasing size, from solar system, through Milky Way, " ..
-        "Universe and finishing with other elements"
-    },
-    {
-        Name = "setDefaultDashboard",
-        Arguments = {},
-        Documentation = "This function sets the default values for the dashboard " ..
-        "consisting of 'DashboardItemDate', 'DashboardItemSimulationIncrement', " ..
-        "'DashboardItemDistance', 'DashboardItemFramerate', and " ..
-        "'DashboardItemParallelConnection'"
-    },
-    {
-        Name = "rebindKey",
-        Arguments = {{ "oldKey", "String" }, { "newKey", "String" }},
-        Documentation = "Rebinds all scripts from the old key (first argument) to the " ..
-        "new key (second argument)"
-    },
-    {
-        Name = "appendToListProperty",
-        Arguments = {{ "identifier","String" }, { "value", "any" }},
-        Documentation = "Add a value to the list property with the given identifier. " ..
-        "The value can be any type, as long as it is the correct type for the given " ..
-        "property. Note that a number will be converted to a string automatically."
-    },
-    {
-        Name = "addToPropertyValue",
-        Arguments = {{ "identifier", "String" } , { "value", "String | Number" }},
-        Documentation = "Add a value to the property with the given identifier. " ..
-        "Works on both numerical and string properties, where adding to a string " ..
-        "property means appending the given string value to the existing string value."
-    },
-    {
-        Name = "invertBooleanProperty",
-        Arguments = {{ "identifier", "String" }},
-        Documentation = "Inverts the value of a boolean property with the given "..
-        "identifier"
-    },
-    {
-        Name = "fadeIn",
-        Arguments = {
-            { "identifier", "String" },
-            { "fadeTime", "Number?" },
-            { "endScript", "String?" }
-        },
-        Documentation = "Fades in the node(s) with the given identifier over the given " ..
-        "time in seconds. The identifier can contain a tag and/or a wildcard to target " ..
-        "several nodes. If the fade time is not provided then the " ..
-        "'OpenSpaceEngine.FadeDuration' property will be used instead. If the third " ..
-        "argument (endScript) is provided then that script will be run after the fade " ..
-        "is finished."
-    },
-    {
-        Name = "fadeOut",
-        Arguments = {
-            { "identifier", "String" },
-            { "fadeTime", "Number?" },
-            { "endScript", "String?" }
-        },
-        Documentation = "Fades out the node(s) with the given identifier over the given " ..
-        "time in seconds. The identifier can contain a tag and/or a wildcard to target " ..
-        "several nodes. If the fade time is not provided then the " ..
-        "'OpenSpaceEngine.FadeDuration' property will be used instead. If the third " ..
-        "argument (endScript) is provided then that script will be run after the fade " ..
-        "is finished."
-    },
-    {
-        Name = "toggleFade",
-        Arguments = {
-            { "identifier", "String" },
-            { "fadeTime", "Number?" },
-            { "endScript", "String?" }
-        },
-        Documentation = [[Toggles the fade state of the node(s) with the given identifier over the given
-          time in seconds. The identifier can contain a tag and/or a wildcard to target
-          several nodes. If the fade time is not provided then the
-          "OpenSpaceEngine.FadeDuration" property will be used instead. If the third
-          argument (endScript) is provided then that script will be run after the fade
-          is finished.]]
-    }
+    Documentation = [[Toggles the fade state of the node(s) with the given identifier over
+      the given time in seconds. The identifier can contain a tag and/or a wildcard to
+      target several nodes. If the fade time is not provided then the
+      "OpenSpaceEngine.FadeDuration" property will be used instead. If the third argument
+      (endScript) is provided then that script will be run after the fade is finished.]]
+  }
 }
 
 openspace.markInterestingNodes = function(nodes)
-    for _, n in pairs(nodes) do
-        if openspace.hasSceneGraphNode(n) then
-            openspace.addTag(n, "GUI.Interesting")
-        end
+  for _, n in pairs(nodes) do
+    if openspace.hasSceneGraphNode(n) then
+      openspace.addTag(n, "GUI.Interesting")
     end
+  end
 end
 
 openspace.markInterestingTimes = function(times)
-    for _, n in pairs(times) do
-        local name = n["Name"] or n[1]
-        local time = n["Time"] or n[2]
-        openspace.addInterestingTime(name, time)
-    end
+  for _, n in pairs(times) do
+    local name = n["Name"] or n[1]
+    local time = n["Time"] or n[2]
+    openspace.addInterestingTime(name, time)
+  end
 end
 
 openspace.removeInterestingNodes = function(nodes)
-    for _, n in pairs(nodes) do
-        if openspace.hasSceneGraphNode(n) then
-            openspace.removeTag(n, "GUI.Interesting")
-        end
+  for _, n in pairs(nodes) do
+    if openspace.hasSceneGraphNode(n) then
+      openspace.removeTag(n, "GUI.Interesting")
     end
+  end
 end
 
 openspace.setDefaultGuiSorting = function()
-    openspace.setPropertyValueSingle(
-        'Modules.ImGUI.Scene.Ordering',
-        {
-            "Solar System", "Milky Way", "Universe", "Other"
-        }
-    )
+  openspace.setPropertyValueSingle(
+    "Modules.ImGUI.Scene.Ordering",
+    { "Solar System", "Milky Way", "Universe", "Other" }
+  )
 end
 
 openspace.rebindKey = function(oldKey, newKey)
-    local t = openspace.keyBindings(oldKey)
-    openspace.clearKey(oldKey)
-    for _, v in pairs(t) do
-        openspace.bindKey(newKey, v)
-    end
+  local t = openspace.keyBindings(oldKey)
+  openspace.clearKey(oldKey)
+  for _, v in pairs(t) do
+    openspace.bindKey(newKey, v)
+  end
 end
 
 openspace.appendToListProperty = function(propertyIdentifier, newItem)
-    local list = openspace.propertyValue(propertyIdentifier)
-    if type(list) ~= 'table' then
-        openspace.printError(
-            "Error when calling script 'openspace.appendToListProperty': " ..
-            "Could not append to non-list property '" .. propertyIdentifier .. "'"
-        )
-        return;
-    end
-    table.insert(list, newItem)
-    openspace.setPropertyValueSingle(propertyIdentifier, list)
+  local list = openspace.propertyValue(propertyIdentifier)
+  if type(list) ~= "table" then
+    openspace.printError(
+      "Error when calling script 'openspace.appendToListProperty': " ..
+      "Could not append to non-list property '" .. propertyIdentifier .. "'"
+    )
+    return;
+  end
+  table.insert(list, newItem)
+  openspace.setPropertyValueSingle(propertyIdentifier, list)
 end
 
 openspace.addToPropertyValue = function(propertyIdentifier, valueToAdd)
-    local value = openspace.propertyValue(propertyIdentifier)
-    if type(value) == 'string' then
-        value = value .. valueToAdd;
-    else
-        value = value + valueToAdd;
-    end
-    openspace.setPropertyValueSingle(propertyIdentifier, value)
+  local value = openspace.propertyValue(propertyIdentifier)
+  if type(value) == "string" then
+    value = value .. valueToAdd;
+  else
+    value = value + valueToAdd;
+  end
+  openspace.setPropertyValueSingle(propertyIdentifier, value)
 end
 
 openspace.invertBooleanProperty = function(propertyIdentifier)
-    local value = openspace.propertyValue(propertyIdentifier)
-    if type(value) ~= 'boolean' then
-        openspace.printError(
-            "Error when calling script 'openspace.invertBooleanProperty': " ..
-            "Could not invert non-boolean property '" .. propertyIdentifier .. "'"
-        )
-        return;
-    end
-    openspace.setPropertyValueSingle(propertyIdentifier, not value)
+  local value = openspace.propertyValue(propertyIdentifier)
+  if type(value) ~= "boolean" then
+    openspace.printError(
+      "Error when calling script 'openspace.invertBooleanProperty': " ..
+      "Could not invert non-boolean property '" .. propertyIdentifier .. "'"
+    )
+    return;
+  end
+  openspace.setPropertyValueSingle(propertyIdentifier, not value)
 end
 
 openspace.fadeIn = function(identifier, fadeTime, endScript)
-    -- Set default values for optional arguments
-    endScript = endScript or ""
-    fadeTime = fadeTime or openspace.propertyValue("OpenSpaceEngine.FadeDuration")
+  -- Set default values for optional arguments
+  endScript = endScript or ""
+  fadeTime = fadeTime or openspace.propertyValue("OpenSpaceEngine.FadeDuration")
 
-    local enabledProperty = identifier .. ".Enabled"
-    local fadeProperty = identifier .. ".Fade"
+  local enabledProperty = identifier .. ".Enabled"
+  local fadeProperty = identifier .. ".Fade"
 
-    -- Assume that we need to enable the node(s) as we fade it/them in
-    local isEnabled = false
+  -- Assume that we need to enable the node(s) as we fade it/them in
+  local isEnabled = false
 
-    -- Check if the identifier is a single node or a regex for several nodes
-    local hasTag, _ = identifier:find('{')
-    local hasWild, _ = identifier:find('*')
+  -- Check if the identifier is a single node or a regex for several nodes
+  local hasTag, _ = identifier:find("{")
+  local hasWild, _ = identifier:find("*")
 
-    if hasTag ~= nil or hasWild ~= nil then
-        -- Regex, several nodes
-        local enabledPropertyList = openspace.property(enabledProperty)
-        if next(enabledPropertyList) == nil then
-            -- List is empty, no matches found
-            openspace.printError(
-                "Error when calling script 'openspace.fadeIn': " ..
-                "Could not find any property matching '" .. enabledProperty .. "'"
-            )
-            return
-        end
+  if hasTag ~= nil or hasWild ~= nil then
+    -- Regex, several nodes
+    local enabledPropertyList = openspace.property(enabledProperty)
+    if next(enabledPropertyList) == nil then
+      -- List is empty, no matches found
+      openspace.printError(
+        "Error when calling script 'openspace.fadeIn': " ..
+        "Could not find any property matching '" .. enabledProperty .. "'"
+      )
+      return
+    end
 
-        local fadePropertyList = openspace.property(fadeProperty)
-        if next(fadePropertyList) == nil then
-            -- List is empty, no matches found
-            openspace.printError(
-                "Error when calling script 'openspace.fadeIn': " ..
-                "Could not find any property matching '" .. fadeProperty .. "'"
-            )
-            return
-        end
+    local fadePropertyList = openspace.property(fadeProperty)
+    if next(fadePropertyList) == nil then
+      -- List is empty, no matches found
+      openspace.printError(
+        "Error when calling script 'openspace.fadeIn': " ..
+        "Could not find any property matching '" .. fadeProperty .. "'"
+      )
+      return
+    end
+  else
+    -- Literal, single node
+    local hasEnabled = openspace.hasProperty(enabledProperty)
+    local hasFade = openspace.hasProperty(fadeProperty)
+
+    if not hasEnabled then
+      openspace.printError(
+        "Error when calling script 'openspace.fadeIn': " ..
+        "Could not find property '" .. enabledProperty .. "'"
+      )
+      return
+    elseif not hasFade then
+      openspace.printError(
+        "Error when calling script 'openspace.fadeIn': " ..
+        "Could not find property '" .. fadeProperty .. "'"
+      )
+      return
     else
-        -- Literal, single node
-        local hasEnabled = openspace.hasProperty(enabledProperty)
-        local hasFade = openspace.hasProperty(fadeProperty)
-
-        if not hasEnabled then
-            openspace.printError(
-                "Error when calling script 'openspace.fadeIn': " ..
-                "Could not find property '" .. enabledProperty .. "'"
-            )
-            return
-        elseif not hasFade then
-            openspace.printError(
-                "Error when calling script 'openspace.fadeIn': " ..
-                "Could not find property '" .. fadeProperty .. "'"
-            )
-            return
-        else
-            isEnabled = openspace.propertyValue(enabledProperty)
-        end
+      isEnabled = openspace.propertyValue(enabledProperty)
     end
+  end
 
-    -- If node is already enabled we only have to fade it
-    if not isEnabled then
-        openspace.setPropertyValue(fadeProperty, 0.0)
-        openspace.setPropertyValue(enabledProperty, true)
-    end
+  -- If node is already enabled we only have to fade it
+  if not isEnabled then
+    openspace.setPropertyValue(fadeProperty, 0.0)
+    openspace.setPropertyValue(enabledProperty, true)
+  end
 
-    openspace.setPropertyValue(fadeProperty, 1.0, fadeTime, "Linear", endScript)
+  openspace.setPropertyValue(fadeProperty, 1.0, fadeTime, "Linear", endScript)
 end
 
 openspace.fadeOut = function(identifier, fadeTime, endScript)
-    -- Set default values for optional arguments
-    endScript = endScript or ""
-    fadeTime = fadeTime or openspace.propertyValue("OpenSpaceEngine.FadeDuration")
+  -- Set default values for optional arguments
+  endScript = endScript or ""
+  fadeTime = fadeTime or openspace.propertyValue("OpenSpaceEngine.FadeDuration")
 
-    local enabledProperty = identifier .. ".Enabled"
-    local fadeProperty = identifier .. ".Fade"
+  local enabledProperty = identifier .. ".Enabled"
+  local fadeProperty = identifier .. ".Fade"
 
-    -- Assume that the node(s) are enabled and that we need to fade it/them out
-    local isEnabled = true
+  -- Assume that the node(s) are enabled and that we need to fade it/them out
+  local isEnabled = true
 
-    -- Is the identifier a single node or a regex for several nodes
-    local hasTag, _ = identifier:find('{')
-    local hasWild, _ = identifier:find('*')
+  -- Is the identifier a single node or a regex for several nodes
+  local hasTag, _ = identifier:find("{")
+  local hasWild, _ = identifier:find("*")
 
-    if hasTag ~= nil or hasWild ~= nil then
-        -- Regex, several nodes
-        local enabledPropertyList = openspace.property(enabledProperty)
-        if next(enabledPropertyList) == nil then
-            -- List is empty, no matches found
-            openspace.printError(
-                "Error when calling script 'openspace.fadeIn': " ..
-                "Could not find any property matching '" .. enabledProperty .. "'"
-            )
-            return
-        end
-
-        local fadePropertyList = openspace.property(fadeProperty)
-        if next(fadePropertyList) == nil then
-            -- List is empty, no matches found
-            openspace.printError(
-                "Error when calling script 'openspace.fadeIn': " ..
-                "Could not find any property matching '" .. fadeProperty .. "'"
-            )
-            return
-        end
-    else
-        -- Literal, single node
-        local hasEnabled = openspace.hasProperty(enabledProperty)
-        local hasFade = openspace.hasProperty(fadeProperty)
-
-        if not hasEnabled then
-            openspace.printError(
-                "Error when calling script 'openspace.fadeIn': " ..
-                "Could not find property '" .. enabledProperty .. "'"
-            )
-            return
-        elseif not hasFade then
-            openspace.printError(
-                "Error when calling script 'openspace.fadeIn': " ..
-                "Could not find property '" .. fadeProperty .. "'"
-            )
-            return
-        else
-            isEnabled = openspace.propertyValue(enabledProperty)
-        end
+  if hasTag ~= nil or hasWild ~= nil then
+    -- Regex, several nodes
+    local enabledPropertyList = openspace.property(enabledProperty)
+    if next(enabledPropertyList) == nil then
+      -- List is empty, no matches found
+      openspace.printError(
+        "Error when calling script 'openspace.fadeIn': " ..
+        "Could not find any property matching '" .. enabledProperty .. "'"
+      )
+      return
     end
 
-    -- If node is already disabled we don't have to do anything
-    if isEnabled then
-        openspace.setPropertyValue(
-            fadeProperty,
-            0.0,
-            fadeTime,
-            "Linear",
-            endScript
-        )
+    local fadePropertyList = openspace.property(fadeProperty)
+    if next(fadePropertyList) == nil then
+      -- List is empty, no matches found
+      openspace.printError(
+        "Error when calling script 'openspace.fadeIn': " ..
+        "Could not find any property matching '" .. fadeProperty .. "'"
+      )
+      return
+    end
+  else
+    -- Literal, single node
+    local hasEnabled = openspace.hasProperty(enabledProperty)
+    local hasFade = openspace.hasProperty(fadeProperty)
+
+    if not hasEnabled then
+      openspace.printError(
+        "Error when calling script 'openspace.fadeIn': " ..
+        "Could not find property '" .. enabledProperty .. "'"
+      )
+      return
+    elseif not hasFade then
+      openspace.printError(
+        "Error when calling script 'openspace.fadeIn': " ..
+        "Could not find property '" .. fadeProperty .. "'"
+      )
+      return
+    else
+      isEnabled = openspace.propertyValue(enabledProperty)
+    end
+  end
+
+  -- If node is already disabled we don't have to do anything
+  if isEnabled then
+    openspace.setPropertyValue(fadeProperty, 0.0, fadeTime, "Linear", endScript)
     end
 end
 

From b5114658e66d76cb34338ffe0e933829ad717616 Mon Sep 17 00:00:00 2001
From: Alexander Bock <mail@alexanderbock.eu>
Date: Sun, 18 Aug 2024 22:19:44 +0200
Subject: [PATCH 591/701] Update required CMake version to 3.26

---
 CMakeLists.txt                | 4 ++--
 apps/OpenSpace/CMakeLists.txt | 2 +-
 ext/ghoul                     | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 65ac51bcc3..85e125850e 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -22,8 +22,8 @@
 # OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                                          #
 ##########################################################################################
 
-cmake_minimum_required(VERSION 3.25 FATAL_ERROR)
-cmake_policy(VERSION 3.25)
+cmake_minimum_required(VERSION 3.26 FATAL_ERROR)
+cmake_policy(VERSION 3.26)
 
 project(OpenSpace)
 
diff --git a/apps/OpenSpace/CMakeLists.txt b/apps/OpenSpace/CMakeLists.txt
index 8e41455eca..fe166610db 100644
--- a/apps/OpenSpace/CMakeLists.txt
+++ b/apps/OpenSpace/CMakeLists.txt
@@ -190,7 +190,7 @@ endif ()
 
 if (WIN32)
   add_custom_command(TARGET OpenSpace POST_BUILD
-    COMMAND ${CMAKE_COMMAND} -E copy $<TARGET_RUNTIME_DLLS:OpenSpace> $<TARGET_FILE_DIR:OpenSpace>
+    COMMAND ${CMAKE_COMMAND} -E copy -t $<TARGET_FILE_DIR:OpenSpace> $<TARGET_RUNTIME_DLLS:OpenSpace>
     COMMAND_EXPAND_LISTS
   )
 endif ()
diff --git a/ext/ghoul b/ext/ghoul
index a88d75e2cc..eaeb5a304c 160000
--- a/ext/ghoul
+++ b/ext/ghoul
@@ -1 +1 @@
-Subproject commit a88d75e2cc564ca12d8295b8282d9798ed5dd1db
+Subproject commit eaeb5a304c7d28229b331a747891fc9839f9f84d

From 38e20403a1dd2a203dbba74e6a0ee6b0cf6be80b Mon Sep 17 00:00:00 2001
From: Alexander Bock <alexander.bock@liu.se>
Date: Mon, 19 Aug 2024 13:25:13 +0200
Subject: [PATCH 592/701] Revert "Update required CMake version to 3.26"

This reverts commit b5114658e66d76cb34338ffe0e933829ad717616.
---
 CMakeLists.txt                | 4 ++--
 apps/OpenSpace/CMakeLists.txt | 2 +-
 ext/ghoul                     | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 85e125850e..65ac51bcc3 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -22,8 +22,8 @@
 # OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                                          #
 ##########################################################################################
 
-cmake_minimum_required(VERSION 3.26 FATAL_ERROR)
-cmake_policy(VERSION 3.26)
+cmake_minimum_required(VERSION 3.25 FATAL_ERROR)
+cmake_policy(VERSION 3.25)
 
 project(OpenSpace)
 
diff --git a/apps/OpenSpace/CMakeLists.txt b/apps/OpenSpace/CMakeLists.txt
index fe166610db..8e41455eca 100644
--- a/apps/OpenSpace/CMakeLists.txt
+++ b/apps/OpenSpace/CMakeLists.txt
@@ -190,7 +190,7 @@ endif ()
 
 if (WIN32)
   add_custom_command(TARGET OpenSpace POST_BUILD
-    COMMAND ${CMAKE_COMMAND} -E copy -t $<TARGET_FILE_DIR:OpenSpace> $<TARGET_RUNTIME_DLLS:OpenSpace>
+    COMMAND ${CMAKE_COMMAND} -E copy $<TARGET_RUNTIME_DLLS:OpenSpace> $<TARGET_FILE_DIR:OpenSpace>
     COMMAND_EXPAND_LISTS
   )
 endif ()
diff --git a/ext/ghoul b/ext/ghoul
index eaeb5a304c..a88d75e2cc 160000
--- a/ext/ghoul
+++ b/ext/ghoul
@@ -1 +1 @@
-Subproject commit eaeb5a304c7d28229b331a747891fc9839f9f84d
+Subproject commit a88d75e2cc564ca12d8295b8282d9798ed5dd1db

From 3eaa3cb593aa73d7c2193c7166d38f3944f5d814 Mon Sep 17 00:00:00 2001
From: Alexander Bock <alexander.bock@liu.se>
Date: Mon, 19 Aug 2024 13:35:12 +0200
Subject: [PATCH 593/701] Update ghoul repository

---
 ext/ghoul | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ext/ghoul b/ext/ghoul
index a88d75e2cc..eb64096b7e 160000
--- a/ext/ghoul
+++ b/ext/ghoul
@@ -1 +1 @@
-Subproject commit a88d75e2cc564ca12d8295b8282d9798ed5dd1db
+Subproject commit eb64096b7e50b0f2a6d5208574ad2cc2b98bfefd

From 351ee0f82be7a5b659fd9e5241b91c31325c4e64 Mon Sep 17 00:00:00 2001
From: Emma Broman <emma.broman@liu.se>
Date: Mon, 19 Aug 2024 15:41:50 +0200
Subject: [PATCH 594/701] Use Cmake provided variable for windeployqt file

Instead of path to a speicific file that might not exists for the currently installed version
---
 apps/OpenSpace/CMakeLists.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/apps/OpenSpace/CMakeLists.txt b/apps/OpenSpace/CMakeLists.txt
index 8e41455eca..729f4bf4fe 100644
--- a/apps/OpenSpace/CMakeLists.txt
+++ b/apps/OpenSpace/CMakeLists.txt
@@ -149,7 +149,7 @@ if (WIN32)
   get_filename_component(_qt_bin_dir "${_qmake_executable}" DIRECTORY)
   add_custom_command(
     TARGET OpenSpace POST_BUILD
-    COMMAND "${CMAKE_COMMAND}" -E env PATH="${_qt_bin_dir}" "${_qt_bin_dir}/windeployqt6.exe" --verbose 0 --no-compiler-runtime --no-translations \"$<TARGET_FILE:OpenSpace>\"
+    COMMAND "${WINDEPLOYQT_EXECUTABLE}" --verbose 0 --no-compiler-runtime --no-translations \"$<TARGET_FILE:OpenSpace>\"
     COMMENT "Deploying Qt libraries"
   )
 endif ()

From 09c192f46e2a2598a6374ab46bf38b21f083c8f3 Mon Sep 17 00:00:00 2001
From: Emma Broman <emma.broman@liu.se>
Date: Mon, 19 Aug 2024 17:47:03 +0200
Subject: [PATCH 595/701] Fix TravelSpeed uniform variables not being set
 correctly (closes #3381)

---
 modules/space/rendering/renderabletravelspeed.cpp | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/modules/space/rendering/renderabletravelspeed.cpp b/modules/space/rendering/renderabletravelspeed.cpp
index d143d8d264..f1bad6e7a5 100644
--- a/modules/space/rendering/renderabletravelspeed.cpp
+++ b/modules/space/rendering/renderabletravelspeed.cpp
@@ -287,9 +287,6 @@ void RenderableTravelSpeed::update(const UpdateData& data) {
     else { // in case we've reached the target
         reinitiateTravel();
     }
-
-    _shaderProgram->setUniform("lineColor", _lineColor);
-    _shaderProgram->setUniform("opacity", opacity());
 }
 
 void RenderableTravelSpeed::render(const RenderData& data, RendererTasks&) {
@@ -304,6 +301,9 @@ void RenderableTravelSpeed::render(const RenderData& data, RendererTasks&) {
     );
     _shaderProgram->setUniform("projectionTransform", data.camera.projectionMatrix());
 
+    _shaderProgram->setUniform("lineColor", _lineColor);
+    _shaderProgram->setUniform("opacity", opacity());
+
 #ifndef __APPLE__
     glLineWidth(_lineWidth);
 #else

From 1fa4b3fd37d5cdcf207dce94c818ab67e2483825 Mon Sep 17 00:00:00 2001
From: Alexander Bock <alexander.bock@liu.se>
Date: Wed, 21 Aug 2024 10:32:49 +0200
Subject: [PATCH 596/701] Update Ghoul submodule to fix WMI crash (closes
 #3330)

---
 ext/ghoul | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ext/ghoul b/ext/ghoul
index eb64096b7e..448f5b9b8d 160000
--- a/ext/ghoul
+++ b/ext/ghoul
@@ -1 +1 @@
-Subproject commit eb64096b7e50b0f2a6d5208574ad2cc2b98bfefd
+Subproject commit 448f5b9b8d0dada956fd5ef2393f1f6473695200

From a138be3f9208e1607cadeef7178d68eb4e784aea Mon Sep 17 00:00:00 2001
From: Alexander Bock <alexander.bock@liu.se>
Date: Wed, 21 Aug 2024 10:33:59 +0200
Subject: [PATCH 597/701] Add example for StaticTranslation (#3385)

---
 .../statictranslation/static.asset            | 29 +++++++++++++++++++
 1 file changed, 29 insertions(+)
 create mode 100644 data/assets/examples/translation/statictranslation/static.asset

diff --git a/data/assets/examples/translation/statictranslation/static.asset b/data/assets/examples/translation/statictranslation/static.asset
new file mode 100644
index 0000000000..c5f0e40b50
--- /dev/null
+++ b/data/assets/examples/translation/statictranslation/static.asset
@@ -0,0 +1,29 @@
+-- Basic
+-- This asset creates a set of coordinate axes that are offset from their original
+-- position by a fixed and static amount. In this specific example, the axes are offset
+-- by 50 meters along the y-axis and 10 meters along the negative z-axis.
+
+local Node = {
+  Identifier = "StaticTranslation_Example",
+  Transform = {
+    Translation = {
+      Type = "StaticTranslation",
+      Position = { 0.0, 50.0, -10.0 }
+    }
+  },
+  Renderable = {
+    Type = "RenderableCartesianAxes"
+  },
+  GUI = {
+    Name = "StaticTranslation - Basic",
+    Path = "/Examples"
+  }
+}
+
+asset.onInitialize(function()
+  openspace.addSceneGraphNode(Node)
+end)
+
+asset.onDeinitialize(function()
+  openspace.removeSceneGraphNode(Node)
+end)

From d0b3cd6e8903ae55d1d918b35cb67231a85296f1 Mon Sep 17 00:00:00 2001
From: Alexander Bock <alexander.bock@liu.se>
Date: Wed, 21 Aug 2024 10:34:08 +0200
Subject: [PATCH 598/701] Add example for ConstantRotation (#3384)

---
 .../rotation/constantrotation/constant.asset  | 29 +++++++++++++++++++
 modules/base/rotation/constantrotation.cpp    |  9 ++++--
 2 files changed, 36 insertions(+), 2 deletions(-)
 create mode 100644 data/assets/examples/rotation/constantrotation/constant.asset

diff --git a/data/assets/examples/rotation/constantrotation/constant.asset b/data/assets/examples/rotation/constantrotation/constant.asset
new file mode 100644
index 0000000000..e4da3360b4
--- /dev/null
+++ b/data/assets/examples/rotation/constantrotation/constant.asset
@@ -0,0 +1,29 @@
+-- Basic
+-- This asset applies a rotation to a set of coordinate axes that makes them rotate at a 
+-- constant rate of one revolution around the z-axis every 2 seconds.
+
+local Node = {
+  Identifier = "ConstantRotation_Example",
+  Transform = {
+    Rotation = {
+      Type = "ConstantRotation",
+      RotationAxis = { 0.0, 0.0, 1.0 },
+      RotationRate = 0.5
+    }
+  },
+  Renderable = {
+    Type = "RenderableCartesianAxes"
+  },
+  GUI = {
+    Name = "ConstantRotation - Basic",
+    Path = "/Examples"
+  }
+}
+
+asset.onInitialize(function()
+  openspace.addSceneGraphNode(Node)
+end)
+
+asset.onDeinitialize(function()
+  openspace.removeSceneGraphNode(Node)
+end)
diff --git a/modules/base/rotation/constantrotation.cpp b/modules/base/rotation/constantrotation.cpp
index 0a14cbd1f3..292012ad04 100644
--- a/modules/base/rotation/constantrotation.cpp
+++ b/modules/base/rotation/constantrotation.cpp
@@ -47,7 +47,9 @@ namespace {
 
     struct [[codegen::Dictionary(ConstantRotation)]] Parameters {
         // [[codegen::verbatim(RotationInfo.description)]]
-        std::optional<glm::dvec3> rotationAxis;
+        std::optional<glm::dvec3> rotationAxis
+            [[codegen::inrange(glm::dvec3(-1.0), glm::dvec3(1.0))]];
+            
         // [[codegen::verbatim(RotationRateInfo.description)]]
         std::optional<float> rotationRate;
     };
@@ -100,7 +102,10 @@ glm::dmat3 ConstantRotation::matrix(const UpdateData& data) const {
         _accumulatedRotation += glm::tau<double>();
     }
 
-    const glm::dquat q = glm::angleAxis(_accumulatedRotation, _rotationAxis.value());
+    const glm::dquat q = glm::angleAxis(
+        _accumulatedRotation,
+        glm::normalize(_rotationAxis.value())
+    );
     return glm::toMat3(q);
 }
 

From 67965e8844912ed8b643709bd522cfaa91b454ee Mon Sep 17 00:00:00 2001
From: Ylva Selling <ylva.selling@gmail.com>
Date: Wed, 21 Aug 2024 11:16:17 +0200
Subject: [PATCH 599/701] Issue/3174 update cef (#3383)

* Update CEF version number

* Set OpenSpace_Helper version of C++ to 20

* Update C++ syntax to v 20

* Remove deprecated function (now default)

* Set the cache folder for cef

* Update modules/webbrowser/src/cefhost.cpp

Co-authored-by: Alexander Bock <alexander.bock@liu.se>

* Update version number

---------

Co-authored-by: Ylva Selling <ylva.selling@liu.se>
Co-authored-by: Alexander Bock <alexander.bock@liu.se>
---
 modules/webbrowser/CMakeLists.txt       | 4 +++-
 modules/webbrowser/src/cefhost.cpp      | 9 ++++-----
 modules/webbrowser/src/eventhandler.cpp | 6 +++---
 3 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/modules/webbrowser/CMakeLists.txt b/modules/webbrowser/CMakeLists.txt
index 9d4674f4e5..10ff587420 100644
--- a/modules/webbrowser/CMakeLists.txt
+++ b/modules/webbrowser/CMakeLists.txt
@@ -48,7 +48,7 @@ set_property(GLOBAL PROPERTY OS_FOLDERS ON)
 cmake_policy(SET CMP0074 NEW)
 
 # Specify the CEF distribution version.
-set(CEF_VERSION "102.0.10+gf249b2e+chromium-102.0.5005.115")
+set(CEF_VERSION "127.3.5+g114ea2a+chromium-127.0.6533.120")
 
 # CEF Sandbox is not working with the latest Visual Studio, so we disable it for now.
 if (WIN32 OR UNIX)
@@ -219,6 +219,7 @@ else()
 endif ()
 
 set_target_properties(${CEF_HELPER_TARGET} PROPERTIES FOLDER "Helper")
+set_openspace_compile_settings(${CEF_HELPER_TARGET})
 
 ##########################################################################################
 # Create OpenSpace module.
@@ -266,6 +267,7 @@ target_precompile_headers(${webbrowser_module} PRIVATE
 )
 
 set_target_properties(libcef_dll_wrapper PROPERTIES FOLDER "Helper")
+set_openspace_compile_settings(libcef_dll_wrapper)
 
 # Display CEF configuration settings.
 # PRINT_CEF_CONFIG()
diff --git a/modules/webbrowser/src/cefhost.cpp b/modules/webbrowser/src/cefhost.cpp
index 2c6e7870a4..4995f841bd 100644
--- a/modules/webbrowser/src/cefhost.cpp
+++ b/modules/webbrowser/src/cefhost.cpp
@@ -44,6 +44,10 @@ CefHost::CefHost([[maybe_unused]] const std::string& helperLocation) {
     LDEBUG("Initializing CEF...");
 
     CefSettings settings;
+    const std::filesystem::path root =
+        std::filesystem::path(helperLocation).parent_path();
+    const std::filesystem::path cefcache = std::format("{}/cefcache", root);
+    CefString(&settings.root_cache_path).FromString(cefcache.string());
 
 #ifndef __APPLE__
     // Apple will always look for helper in a fixed location
@@ -53,11 +57,6 @@ CefHost::CefHost([[maybe_unused]] const std::string& helperLocation) {
     settings.windowless_rendering_enabled = true;
     attachDebugSettings(settings);
 
-#ifdef WIN32
-    // Enable High-DPI support on Windows 7 or newer
-    CefEnableHighDPISupport();
-#endif // WIN32
-
 #ifdef __APPLE__
     // Load the CEF framework library at runtime instead of linking directly as required
     // by the macOS sandbox implementation
diff --git a/modules/webbrowser/src/eventhandler.cpp b/modules/webbrowser/src/eventhandler.cpp
index cff278d280..726576edee 100644
--- a/modules/webbrowser/src/eventhandler.cpp
+++ b/modules/webbrowser/src/eventhandler.cpp
@@ -406,7 +406,7 @@ bool EventHandler::charCallback(unsigned int charCode, KeyModifier modifier) {
     keyEvent.windows_key_code = mapFromGlfwToWindows(Key(charCode));
     keyEvent.character = mapFromGlfwToCharacter(Key(charCode));
     keyEvent.native_key_code = mapFromGlfwToNative(Key(charCode));
-    keyEvent.modifiers = static_cast<uint32>(modifier);
+    keyEvent.modifiers = static_cast<uint32_t>(modifier);
     keyEvent.type = KEYEVENT_CHAR;
 
     return _browserInstance->sendKeyEvent(keyEvent);
@@ -443,7 +443,7 @@ bool EventHandler::specialKeyEvent(Key key, KeyModifier mod, KeyAction action) {
                 keyEvent.windows_key_code = mapFromGlfwToWindows(Key(45));
                 keyEvent.character = mapFromGlfwToCharacter(Key(45));
                 keyEvent.native_key_code = mapFromGlfwToNative(Key(45));
-                keyEvent.modifiers = static_cast<uint32>(mod);
+                keyEvent.modifiers = static_cast<uint32_t>(mod);
                 keyEvent.type = keyEventType(action);
                 _browserInstance->sendKeyEvent(keyEvent);
                 return true;
@@ -454,7 +454,7 @@ bool EventHandler::specialKeyEvent(Key key, KeyModifier mod, KeyAction action) {
             keyEvent.windows_key_code = mapFromGlfwToWindows(Key::KeypadDecimal);
             keyEvent.character = mapFromGlfwToCharacter(Key::KeypadDecimal);
             keyEvent.native_key_code = mapFromGlfwToNative(Key::KeypadDecimal);
-            keyEvent.modifiers = static_cast<uint32>(mod);
+            keyEvent.modifiers = static_cast<uint32_t>(mod);
             keyEvent.type = keyEventType(action);
             _browserInstance->sendKeyEvent(keyEvent);
             return true;

From 423d409dc8ac21196e5ce0399e9dc18a417d71a6 Mon Sep 17 00:00:00 2001
From: Alexander Bock <alexander.bock@liu.se>
Date: Thu, 22 Aug 2024 14:00:51 +0200
Subject: [PATCH 600/701] Always use the alpha blending independent of the
 renderbin (closes #3304)

It wasn't really clear why the check for the PreDeferredTransparent bin was in here in the first place
---
 modules/base/rendering/renderablesphere.cpp | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/modules/base/rendering/renderablesphere.cpp b/modules/base/rendering/renderablesphere.cpp
index 0ef11b65b6..e63803cfa1 100644
--- a/modules/base/rendering/renderablesphere.cpp
+++ b/modules/base/rendering/renderablesphere.cpp
@@ -330,10 +330,7 @@ void RenderableSphere::render(const RenderData& data, RendererTasks&) {
         glDisable(GL_CULL_FACE);
     }
 
-    if (renderBin() == Renderable::RenderBin::PreDeferredTransparent) {
-        glBlendFunc(GL_SRC_ALPHA, GL_ONE);
-        glDepthMask(false);
-    }
+    glBlendFunc(GL_SRC_ALPHA, GL_ONE);
 
     _sphere->render();
 

From 1f202339c803616f3128004e94ef7dceab5a9187 Mon Sep 17 00:00:00 2001
From: Alexander Bock <alexander.bock@liu.se>
Date: Thu, 22 Aug 2024 14:26:03 +0200
Subject: [PATCH 601/701] Update SGCT repository (closes #2655)

---
 apps/OpenSpace/ext/sgct | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/apps/OpenSpace/ext/sgct b/apps/OpenSpace/ext/sgct
index 7b08cda0ed..b6171ab0a0 160000
--- a/apps/OpenSpace/ext/sgct
+++ b/apps/OpenSpace/ext/sgct
@@ -1 +1 @@
-Subproject commit 7b08cda0ed002bda77f82a96ad721f34e7caa0a0
+Subproject commit b6171ab0a0df76a44ad53be41bdfd08ea39e4249

From 2e4b99787f9d4bdaa227321f59163ee77a4bf7f5 Mon Sep 17 00:00:00 2001
From: Alexander Bock <alexander.bock@liu.se>
Date: Thu, 22 Aug 2024 15:20:02 +0200
Subject: [PATCH 602/701] Resolve ShellLink files before passing them to the
 drag/drop handler (closes #2544). Add new Lua function to resolve Shell links

---
 ext/ghoul                          |  2 +-
 scripts/drag_drop_handler.lua      |  1 +
 src/engine/openspaceengine.cpp     | 10 +++++++++-
 src/engine/openspaceengine_lua.inl | 15 +++++++++++++++
 4 files changed, 26 insertions(+), 2 deletions(-)

diff --git a/ext/ghoul b/ext/ghoul
index 448f5b9b8d..e5ebfd2288 160000
--- a/ext/ghoul
+++ b/ext/ghoul
@@ -1 +1 @@
-Subproject commit 448f5b9b8d0dada956fd5ef2393f1f6473695200
+Subproject commit e5ebfd228894448ab15e9be9bac9a7ba274c2355
diff --git a/scripts/drag_drop_handler.lua b/scripts/drag_drop_handler.lua
index 569da1ff0a..e15db99429 100644
--- a/scripts/drag_drop_handler.lua
+++ b/scripts/drag_drop_handler.lua
@@ -51,6 +51,7 @@ local is_wms_file = function(extension)
   return extension == ".wms"
 end
 
+
 if is_image_file(extension) then
   return [[
   openspace.addScreenSpaceRenderable({
diff --git a/src/engine/openspaceengine.cpp b/src/engine/openspaceengine.cpp
index 3f04d62077..17a7e5f5f7 100644
--- a/src/engine/openspaceengine.cpp
+++ b/src/engine/openspaceengine.cpp
@@ -1406,6 +1406,13 @@ void OpenSpaceEngine::handleDragDrop(std::filesystem::path file) {
         return;
     }
 
+#ifdef WIN32
+    if (file.extension() == ".lnk") {
+        LDEBUG(std::format("Replacing shell link path '{}'", file));
+        file = FileSys.resolveShellLink(file);
+    }
+#endif // WIN32
+
     ghoul::lua::push(s, file);
     lua_setglobal(s, "filename");
 
@@ -1548,7 +1555,8 @@ scripting::LuaLibrary OpenSpaceEngine::luaLibrary() {
             codegen::lua::ResetCamera,
             codegen::lua::Configuration,
             codegen::lua::LayerServer,
-            codegen::lua::LoadJson
+            codegen::lua::LoadJson,
+            codegen::lua::ResolveShortcut,
         },
         {
             absPath("${SCRIPTS}/core_scripts.lua")
diff --git a/src/engine/openspaceengine_lua.inl b/src/engine/openspaceengine_lua.inl
index f4d5efd5f8..866d11159a 100644
--- a/src/engine/openspaceengine_lua.inl
+++ b/src/engine/openspaceengine_lua.inl
@@ -293,4 +293,19 @@ namespace {
     return openspace::jsonToDictionary(json);
 }
 
+/**
+ * Returns the target path for a Windows shortcut file. This function will produce an
+ * error on non-Windows operating systems. The `path` has to be a valid Windows Shell link
+ * file.
+ */
+[[codegen::luawrap]] std::filesystem::path resolveShortcut(std::filesystem::path path) {
+#ifdef WIN32
+    return FileSys.resolveShellLink(std::move(path));
+#else // ^^^^ WIN32 // !WIN32 vvvv
+    throw ghoul::lua::LuaError(std::format(
+        "Tried to resolve shortcut file '{}' on unsupported non-Windows platform", path
+    ));
+#endif // WIN32
+}
+
 #include "openspaceengine_lua_codegen.cpp"

From f962a10e036adfedade8d7f55cedd35d9b74c4cf Mon Sep 17 00:00:00 2001
From: Alexander Bock <alexander.bock@liu.se>
Date: Thu, 22 Aug 2024 16:38:04 +0200
Subject: [PATCH 603/701] Add new maps for the Globe representation of Phobos
 (closes #1397)

---
 .../colorlayers/phobos_mars_express.asset     | 52 +++++++++++++++++++
 .../layers/colorlayers/phobos_viking.asset    | 41 +++++++++++----
 2 files changed, 83 insertions(+), 10 deletions(-)
 create mode 100644 data/assets/scene/solarsystem/planets/mars/moons/layers/colorlayers/phobos_mars_express.asset

diff --git a/data/assets/scene/solarsystem/planets/mars/moons/layers/colorlayers/phobos_mars_express.asset b/data/assets/scene/solarsystem/planets/mars/moons/layers/colorlayers/phobos_mars_express.asset
new file mode 100644
index 0000000000..083b569074
--- /dev/null
+++ b/data/assets/scene/solarsystem/planets/mars/moons/layers/colorlayers/phobos_mars_express.asset
@@ -0,0 +1,52 @@
+local globe = asset.require("../../phobos_globe")
+
+
+
+local maps = asset.resource({
+  Name = "Phobos Maps",
+  Type = "HttpSynchronization",
+  Identifier = "phobos_maps",
+  Version = 1
+})
+
+
+local Layer = {
+  Identifier = "Mars_Express_HRSC_100m",
+  Name = "Mars Express HRCS 100m",
+  Enabled = asset.enabled,
+  ZIndex = 10,
+  FilePath = maps .. "mex_hrsc_100m_dem.vrt",
+  Description = [[Images from the European Space Agency's High Resolution Stereo Camera
+    (HRSC) aboard the Mars Express were used to obtain 3-dimensional coordinates of
+    surface points of Phobos. As currently the HRSC could not gain global coverage yet,
+    the data was complimented by Viking orbiter image data to be able to provide the
+    digital elevation model (DEM) globally (Willner et al., 2010).  Resolution of this DEM
+    is 100 meters per pixel (m).
+
+    The research leading to the data products has received funding from the European
+    Community's Seventh Framework Programme ([FP7/2007-2013]) under grant agreement number
+    263466 for the FP7-ESPaCE program.
+
+    Willner, K., Oberst, J., Hussmann, H., Giese, B., Hoffman, H., Matz, K.-D.,
+    Roatsch, T., & Duxbury, T. (2010). Phobos control point network, rotation, and shape.
+    Earth and Planetary Science Letters, 294(3–4), 541-546.
+    https://doi.org/10.1016/j.epsl.2009.07.033]]
+}
+
+
+asset.onInitialize(function()
+  openspace.globebrowsing.addLayer(globe.Phobos_Globe.Identifier, "HeightLayers", Layer)
+end)
+
+asset.onDeinitialize(function()
+  openspace.globebrowsing.deleteLayer(globe.Phobos_Globe.Identifier, "HeightLayers", Layer)
+end)
+
+
+
+asset.meta = {
+  Name = "Phobos Mars Express HRSC DEM Global 100m",
+  Author = "OpenSpace Team",
+  URL = "https://astrogeology.usgs.gov/search/map/phobos_mars_express_hrsc_dem_global_100m",
+  License = "Please cite authors"
+}
diff --git a/data/assets/scene/solarsystem/planets/mars/moons/layers/colorlayers/phobos_viking.asset b/data/assets/scene/solarsystem/planets/mars/moons/layers/colorlayers/phobos_viking.asset
index 8f7c8f1408..877033922c 100644
--- a/data/assets/scene/solarsystem/planets/mars/moons/layers/colorlayers/phobos_viking.asset
+++ b/data/assets/scene/solarsystem/planets/mars/moons/layers/colorlayers/phobos_viking.asset
@@ -2,13 +2,35 @@ local globe = asset.require("../../phobos_globe")
 
 
 
+local maps = asset.resource({
+  Name = "Phobos Maps",
+  Type = "HttpSynchronization",
+  Identifier = "phobos_maps",
+  Version = 1
+})
+
+
 local Layer = {
-  Identifier = "Phobos_Global_Shaded_Relief_USGS",
-  Name = "Phobos Global Shaded Relief [USGS]",
+  Identifier = "Viking_5m",
+  Name = "Viking 5m",
   Enabled = asset.enabled,
   ZIndex = 10,
-  FilePath = "WMS:https://wms.wr.usgs.gov/cgi-bin/mapserv?map=/maps/mars/phobos_simp_cyl.map&SERVICE=WMS&VERSION=1.1.1&REQUEST=GetMap&LAYERS=Phobos_Simple_Cylindrical_Rasters&SRS=EPSG:4326&BBOX=-180,-90,360,90",
-  Description = "Viking-base Phobos shaded relief created by USGS"
+  FilePath = maps .. "viking_5m.vrt",
+  Description = [[This mosaic of Phobos was created by compiling updated versions of
+    Viking high-resolution mosaics and selecting the best high-resolution images from
+    other spacecraft to construct an entirely new mosaic. The process of compiling this
+    mosaic significantly improved areas of poor control. Where images with reverse
+    lighting meet, artistic effects are necessary to create satisfactory appearance, but
+    this affects the appearance only and not the map geometry. This global mosaic has a
+    pixel resolution of five meters per pixel (m).
+
+    References:
+    Stooke, P. (2012). Stooke Small Bodies Maps V2.0. MULTI-SA-MULTI-6-STOOKEMAPS-V2.0.
+    NASA Planetary Data System. https://sbn.psi.edu/pds/resource/stookemaps.html
+
+    Simonelli, D. P., Thomas, P. C., Carcich, B. T., & Veverka, J. (1993). The generation
+    and use of numerical shape models for irregular solar system objects. Icarus, 103,
+    49-61. https://doi.org/10.1006/icar.1993.1057]]
 }
 
 
@@ -20,13 +42,12 @@ asset.onDeinitialize(function()
   openspace.globebrowsing.deleteLayer(globe.Phobos_Globe.Identifier, "ColorLayers", Layer)
 end)
 
-asset.export("layer", Layer)
-
+asset.export(Layer)
 
 
 asset.meta = {
-  Name = "Phobos Global Shaded Relief [USGS]",
-  Author = "USGS/NASA",
-  URL = "https://astrowebmaps.wr.usgs.gov/webmapatlas/Layers/maps.html",
-  License = "NASA/PDS"
+  Name = "Phobos Viking Global Mosaic 5m",
+  Author = "OpenSpace Team",
+  URL = "https://astrogeology.usgs.gov/search/map/phobos_viking_global_mosaic_5m",
+  License = "Please cite authors"
 }

From 6e6f425a0a655d14bc5bfe4b734831194d355cf5 Mon Sep 17 00:00:00 2001
From: Emma Broman <emma.broman@liu.se>
Date: Thu, 22 Aug 2024 16:51:28 +0200
Subject: [PATCH 604/701] Issue/3337 Custom UI group ordering (#3363)

* remove code for controlling group sorting in ImGui

We only use this for debug and the sorting here is no longer relevant

* Add feature to add custom ordering to UI groups

* Tiny cleanup

* Add numerical ordering for night sky planets

* Update Lua function name and create an event when ordering updated

* Set top-level ordering

* Add function documentation

* Add a custom ordering that previously was hardcoded in UI

* Apply suggestions from code review

Co-authored-by: Alexander Bock <alexander.bock@liu.se>

* Rename GUI ordering function

* Update GUI hash

---------

Co-authored-by: Alexander Bock <alexander.bock@liu.se>
---
 data/assets/base.asset                        |  9 ++++
 data/assets/base_blank.asset                  |  1 -
 data/assets/nightsky/planets.asset            | 15 ++++--
 .../scene/solarsystem/planets/planets.asset   |  7 +++
 data/assets/util/webgui.asset                 |  2 +-
 include/openspace/events/event.h              | 14 +++++
 include/openspace/scene/scene.h               | 23 ++++++++-
 modules/imgui/include/guipropertycomponent.h  |  1 -
 modules/imgui/src/guipropertycomponent.cpp    | 51 ++-----------------
 scripts/core_scripts.lua                      | 14 -----
 src/events/event.cpp                          | 16 ++++++
 src/scene/scene.cpp                           | 21 +++++++-
 src/scene/scene_lua.inl                       | 24 +++++++++
 13 files changed, 125 insertions(+), 73 deletions(-)

diff --git a/data/assets/base.asset b/data/assets/base.asset
index ff5967475c..b82a1f30e6 100644
--- a/data/assets/base.asset
+++ b/data/assets/base.asset
@@ -87,4 +87,13 @@ asset.onInitialize(function()
   openspace.globebrowsing.loadWMSServersFromFile(
     openspace.absPath("${DATA}/globebrowsing_servers.lua")
   )
+
+  openspace.setGuiOrder(
+    "/",
+    { "Solar System", "Milky Way", "Universe", "Night Sky", "Examples" }
+  )
+  openspace.setGuiOrder(
+    "/Solar System",
+    { "Planets", "Dwarf Planets", "Sun", "Solar System Barycenter" }
+  )
 end)
diff --git a/data/assets/base_blank.asset b/data/assets/base_blank.asset
index 12f43b97ed..e4ec936782 100644
--- a/data/assets/base_blank.asset
+++ b/data/assets/base_blank.asset
@@ -22,6 +22,5 @@ asset.require("modules/touch/default_settings")
 
 asset.onInitialize(function()
   webGui.setCefRoute("onscreen")
-  openspace.setDefaultGuiSorting()
   openspace.setPropertyValueSingle("RenderEngine.VerticalLogOffset", 0.100000)
 end)
diff --git a/data/assets/nightsky/planets.asset b/data/assets/nightsky/planets.asset
index 5d44a0328a..8239d168e8 100644
--- a/data/assets/nightsky/planets.asset
+++ b/data/assets/nightsky/planets.asset
@@ -32,7 +32,8 @@ local Mercury = {
     Name = "Night Sky Mercury",
     Description = [[A night sky version of the planet Mercury, making it visible as
       a bright object on the sky (textured representation).]],
-    Path = "/Night Sky/Planets"
+    Path = "/Night Sky/Planets",
+    OrderingNumber = 1
   }
 }
 
@@ -54,7 +55,8 @@ local Venus = {
     Name = "Night Sky Venus",
     Description = [[A night sky version of the planet Venus, making it visible as
       a bright object on the sky (textured representation).]],
-    Path = "/Night Sky/Planets"
+    Path = "/Night Sky/Planets",
+    OrderingNumber = 2
   }
 }
 
@@ -74,7 +76,8 @@ local Mars = {
   Tag = { "nightsky_billboard" },
   GUI = {
     Name = "Night Sky Mars",
-    Path = "/Night Sky/Planets"
+    Path = "/Night Sky/Planets",
+    OrderingNumber = 4
   }
 }
 
@@ -96,7 +99,8 @@ local Jupiter = {
     Name = "Night Sky Jupiter",
     Description = [[A night sky version of the planet Jupiter, making it visible as
       a bright object on the sky (textured representation).]],
-    Path = "/Night Sky/Planets"
+    Path = "/Night Sky/Planets",
+    OrderingNumber = 5
   }
 }
 
@@ -118,7 +122,8 @@ local Saturn = {
     Name = "Night Sky Saturn",
     Description = [[A night sky version of the planet Saturn, making it visible as
       a bright object on the sky (textured representation).]],
-    Path = "/Night Sky/Planets"
+    Path = "/Night Sky/Planets",
+    OrderingNumber = 6
   }
 }
 
diff --git a/data/assets/scene/solarsystem/planets/planets.asset b/data/assets/scene/solarsystem/planets/planets.asset
index 2263756812..ed6e79e3e1 100644
--- a/data/assets/scene/solarsystem/planets/planets.asset
+++ b/data/assets/scene/solarsystem/planets/planets.asset
@@ -30,6 +30,13 @@ asset.require("./neptune/neptune")
 asset.require("./neptune/major_moons")
 
 
+asset.onInitialize(function()
+  openspace.setGuiOrder(
+    "/Solar System/Planets",
+    { "Mercury", "Venus", "Earth", "Mars", "Jupiter", "Saturn", "Uranus", "Neptune" }
+  )
+end)
+
 
 asset.meta = {
   Name = "Planets",
diff --git a/data/assets/util/webgui.asset b/data/assets/util/webgui.asset
index b58de5162b..f8ae2d62fa 100644
--- a/data/assets/util/webgui.asset
+++ b/data/assets/util/webgui.asset
@@ -4,7 +4,7 @@ local guiCustomization = asset.require("customization/gui")
 
 
 -- Select which commit hashes to use for the frontend and backend
-local frontendHash = "c607523e86ab29c573b157c956dcf0b0e4492395"
+local frontendHash = "cb4c80198d15caf410f5f8bb2c310339793d5747"
 
 local frontend = asset.resource({
   Identifier = "WebGuiFrontend",
diff --git a/include/openspace/events/event.h b/include/openspace/events/event.h
index e1ce7c0ad1..58c48c39e9 100644
--- a/include/openspace/events/event.h
+++ b/include/openspace/events/event.h
@@ -79,6 +79,7 @@ struct Event {
         CameraPathFinished,
         CameraMovedPosition,
         ScheduledScriptExecuted,
+        GuiTreeUpdated,
         Custom,
         Last // sentinel value
     };
@@ -538,6 +539,19 @@ struct EventScheduledScriptExecuted : public Event {
     const tstring script;
 };
 
+/**
+ * This event is created when the custom ordering for a specific branch in the Scene
+ * GUI tree is changed. It signals to the UI that the tree should be updated.
+ */
+struct EventGuiTreeUpdated : public Event {
+    static constexpr Type Type = Event::Type::GuiTreeUpdated;
+
+    /**
+     * Creates an instance of an EventGuiTreeUpdated event.
+     */
+    EventGuiTreeUpdated();
+};
+
 /**
  * A custom event type that can be used in a pinch when no explicit event type is
  * available. This should only be used in special circumstances and it should be
diff --git a/include/openspace/scene/scene.h b/include/openspace/scene/scene.h
index e7c10db589..38d77c931d 100644
--- a/include/openspace/scene/scene.h
+++ b/include/openspace/scene/scene.h
@@ -248,7 +248,26 @@ public:
      *
      * \return A list of all unique tags that are used in the currently loaded scene.
      */
-    std::vector<std::string> allTags();
+    std::vector<std::string> allTags() const;
+
+    /**
+     * Set a custom order for items in a given branch in the Scene GUI tree.
+     *
+     * \param guiPath The GUI path for which to set the order
+     * \param list A list of names of scene graph nodes or subgroups in the GUI, in the
+     *             order of which they should appear in the tree.
+     */
+    void setGuiTreeOrder(const std::string& guiPath,
+        const std::vector<std::string>& list);
+
+    /**
+     * Returns a dictionary containing all the currently set custom orderings for the
+     * Scene GUI tree.
+     *
+     * \return A dictionary containing key value pairs with custom item orderings for
+     *         specific paths in the Scene GUI tree
+     */
+    ghoul::Dictionary guiTreeOrder() const;
 
 private:
     /**
@@ -333,6 +352,8 @@ private:
     std::vector<PropertyInterpolationInfo> _propertyInterpolationInfos;
 
     ghoul::MemoryPool<4096> _memoryPool;
+
+    std::unordered_map<std::string, std::vector<std::string>> _guiTreeOrderMap;
 };
 
 // Convert the input string to a format that is valid as an identifier
diff --git a/modules/imgui/include/guipropertycomponent.h b/modules/imgui/include/guipropertycomponent.h
index 1b380d3f11..33d4da7eb7 100644
--- a/modules/imgui/include/guipropertycomponent.h
+++ b/modules/imgui/include/guipropertycomponent.h
@@ -62,7 +62,6 @@ protected:
     std::function<std::vector<properties::PropertyOwner*>()> _propertyOwnerFunction;
 
     properties::BoolProperty _useTreeLayout;
-    properties::StringListProperty _treeOrdering;
 };
 
 } // namespace openspace::gui
diff --git a/modules/imgui/src/guipropertycomponent.cpp b/modules/imgui/src/guipropertycomponent.cpp
index b91884463d..41c01cdcc6 100644
--- a/modules/imgui/src/guipropertycomponent.cpp
+++ b/modules/imgui/src/guipropertycomponent.cpp
@@ -46,15 +46,6 @@ namespace {
         openspace::properties::Property::Visibility::AdvancedUser
     };
 
-    constexpr openspace::properties::Property::PropertyInfo OrderingInfo = {
-        "Ordering",
-        "Tree Ordering",
-        "This list determines the order of the first tree layer if it is used. Elements "
-        "present in this list will be shown first, with an alphabetical ordering for "
-        "elements not listed.",
-        openspace::properties::Property::Visibility::AdvancedUser
-    };
-
     int nVisibleProperties(const std::vector<openspace::properties::Property*>& props)
     {
         using namespace openspace;
@@ -185,10 +176,8 @@ GuiPropertyComponent::GuiPropertyComponent(std::string identifier, std::string g
                                            UseTreeLayout useTree)
     : GuiComponent(std::move(identifier), std::move(guiName))
     , _useTreeLayout(UseTreeInfo, useTree)
-    , _treeOrdering(OrderingInfo)
 {
     addProperty(_useTreeLayout);
-    addProperty(_treeOrdering);
 }
 
 void GuiPropertyComponent::setPropertyOwners(
@@ -303,14 +292,11 @@ void GuiPropertyComponent::render() {
             (void)owner; // using [[maybe_unused]] in the for loop gives an error
         }
 
-        // Sort:
-        // if guigrouping, sort by name and shortest first, but respect the user specified
-        // ordering then all w/o guigroup
-        const std::vector<std::string>& ordering = _treeOrdering;
+        // Sort: by name and shortest first
         std::stable_sort(
             owners.begin(),
             owners.end(),
-            [&ordering](PropertyOwner* lhs, PropertyOwner* rhs) {
+            [](PropertyOwner* lhs, PropertyOwner* rhs) {
                 const std::string lhsGrp = dynamic_cast<SceneGraphNode*>(lhs)->guiPath();
                 const std::string rhsGrp = dynamic_cast<SceneGraphNode*>(rhs)->guiPath();
 
@@ -321,38 +307,7 @@ void GuiPropertyComponent::render() {
                     return true;
                 }
 
-                if (ordering.empty()) {
-                    return lhsGrp < rhsGrp;
-                }
-
-                std::vector<std::string> lhsToken = ghoul::tokenizeString(lhsGrp, '/');
-                // The first token is always empty
-                auto lhsIt = std::find(ordering.begin(), ordering.end(), lhsToken[1]);
-
-                std::vector<std::string> rhsToken = ghoul::tokenizeString(rhsGrp, '/');
-                // The first token is always empty
-                auto rhsIt = std::find(ordering.begin(), ordering.end(), rhsToken[1]);
-
-                if (lhsIt != ordering.end() && rhsIt != ordering.end()) {
-                    if (lhsToken[1] != rhsToken[1]) {
-                        // If both top-level groups are in the ordering list, the
-                        // order of the iterators gives us the order of the groups
-                        return lhsIt < rhsIt;
-                    }
-                    else {
-                        return lhsGrp < rhsGrp;
-                    }
-                }
-                else if (lhsIt != ordering.end() && rhsIt == ordering.end()) {
-                    // If only one of them is in the list, we have a sorting
-                    return true;
-                }
-                else if (lhsIt == ordering.end() && rhsIt != ordering.end()) {
-                    return false;
-                }
-                else {
-                    return lhsGrp < rhsGrp;
-                }
+                return lhsGrp < rhsGrp;
             }
         );
     }
diff --git a/scripts/core_scripts.lua b/scripts/core_scripts.lua
index 21ab69f942..89a4bd0ad6 100644
--- a/scripts/core_scripts.lua
+++ b/scripts/core_scripts.lua
@@ -18,13 +18,6 @@ openspace.documentation = {
     Documentation = [[This function removes unmarks the scene graph nodes identified by
       name as interesting, thus removing the shortcuts from the features properties list]]
   },
-  {
-    Name = "setDefaultGuiSorting",
-    Arguments = {},
-    Documentation = [[This function sets the default GUI sorting for the space environment
-      to increasing size, from solar system, through Milky Way, Universe and finishing
-      with other elements]]
-  },
   {
     Name = "setDefaultDashboard",
     Arguments = {},
@@ -122,13 +115,6 @@ openspace.removeInterestingNodes = function(nodes)
   end
 end
 
-openspace.setDefaultGuiSorting = function()
-  openspace.setPropertyValueSingle(
-    "Modules.ImGUI.Scene.Ordering",
-    { "Solar System", "Milky Way", "Universe", "Other" }
-  )
-end
-
 openspace.rebindKey = function(oldKey, newKey)
   local t = openspace.keyBindings(oldKey)
   openspace.clearKey(oldKey)
diff --git a/src/events/event.cpp b/src/events/event.cpp
index b3b2e4311b..dac24c8aea 100644
--- a/src/events/event.cpp
+++ b/src/events/event.cpp
@@ -206,6 +206,11 @@ void log(int i, const EventScheduledScriptExecuted& e) {
     LINFO(std::format("[{}] ScheduledScriptExecuted: Script '{}'", i, e.script));
 }
 
+void log(int i, const EventGuiTreeUpdated& e) {
+    ghoul_assert(e.type == EventGuiTreeUpdated::Type, "Wrong type");
+    LINFO(std::format("[{}] EventGuiTreeUpdated", i));
+}
+
 void log(int i, const CustomEvent& e) {
     ghoul_assert(e.type == CustomEvent::Type, "Wrong type");
     LINFO(std::format("[{}] CustomEvent: {} ({})", i, e.subtype, e.payload));
@@ -234,6 +239,7 @@ std::string_view toString(Event::Type type) {
         case Event::Type::CameraPathFinished: return "CameraPathFinished";
         case Event::Type::CameraMovedPosition: return "CameraMovedPosition";
         case Event::Type::ScheduledScriptExecuted: return "ScheduledScriptExecuted";
+        case Event::Type::GuiTreeUpdated: return "GuiTreeUpdated";
         case Event::Type::Custom: return "Custom";
         default:
             throw ghoul::MissingCaseException();
@@ -304,6 +310,9 @@ Event::Type fromString(std::string_view str) {
     else if (str == "ScheduledScriptExecuted") {
         return Event::Type::ScheduledScriptExecuted;
     }
+    else if (str == "GuiTreeUpdated") {
+        return Event::Type::GuiTreeUpdated;
+    }
     else if (str == "Custom") {
         return Event::Type::Custom;
     }
@@ -553,6 +562,9 @@ void logAllEvents(const Event* e) {
             case Event::Type::ScheduledScriptExecuted:
                 log(i, *static_cast<const EventScheduledScriptExecuted*>(e));
                 break;
+            case Event::Type::GuiTreeUpdated:
+                log(i, *static_cast<const EventGuiTreeUpdated*>(e));
+                break;
             case Event::Type::Custom:
                 log(i, *static_cast<const CustomEvent*>(e));
                 break;
@@ -686,6 +698,10 @@ EventScheduledScriptExecuted::EventScheduledScriptExecuted(std::string_view scri
     , script(temporaryString(script_))
 {}
 
+EventGuiTreeUpdated::EventGuiTreeUpdated()
+    : Event(Type)
+{}
+
 CustomEvent::CustomEvent(std::string_view subtype_, std::string_view payload_)
     : Event(Type)
     , subtype(subtype_)
diff --git a/src/scene/scene.cpp b/src/scene/scene.cpp
index 7c1072ac64..2204e0929e 100644
--- a/src/scene/scene.cpp
+++ b/src/scene/scene.cpp
@@ -779,7 +779,7 @@ std::vector<properties::Property*> Scene::propertiesMatchingRegex(
     return findMatchesInAllProperties(propertyString, allProperties(), "");
 }
 
-std::vector<std::string> Scene::allTags() {
+std::vector<std::string> Scene::allTags() const {
     std::set<std::string> result;
     for (SceneGraphNode* node : _topologicallySortedNodes) {
         const std::vector<std::string>& tags = node->tags();
@@ -789,6 +789,21 @@ std::vector<std::string> Scene::allTags() {
     return std::vector<std::string>(result.begin(), result.end());
 }
 
+void Scene::setGuiTreeOrder(const std::string& guiPath,
+                            const std::vector<std::string>& list)
+{
+    _guiTreeOrderMap[guiPath] = list;
+    global::eventEngine->publishEvent<events::EventGuiTreeUpdated>();
+}
+
+ghoul::Dictionary Scene::guiTreeOrder() const {
+    ghoul::Dictionary dict;
+    for (const auto& [key, list] : _guiTreeOrderMap) {
+        dict.setValue(key, list);
+    }
+    return dict;
+}
+
 scripting::LuaLibrary Scene::luaLibrary() {
     return {
         "",
@@ -877,7 +892,9 @@ scripting::LuaLibrary Scene::luaLibrary() {
             codegen::lua::SetParent,
             codegen::lua::BoundingSphere,
             codegen::lua::InteractionSphere,
-            codegen::lua::MakeIdentifier
+            codegen::lua::MakeIdentifier,
+            codegen::lua::SetGuiOrder,
+            codegen::lua::GuiOrder
         }
     };
 }
diff --git a/src/scene/scene_lua.inl b/src/scene/scene_lua.inl
index 519ffdd7a4..180956ad17 100644
--- a/src/scene/scene_lua.inl
+++ b/src/scene/scene_lua.inl
@@ -1234,6 +1234,30 @@ enum class [[codegen::enum]] CustomPropertyType {
     return openspace::makeIdentifier(input);
 }
 
+/**
+ * Set a custom ordering of the items in a specific branch in the Scene GUI tree, i.e.
+ * for a specific GUI path.
+ *
+ * \param guiPath The GUI path for which the order should be set.
+ * \param list A list of names of scene graph nodes or subgroups in the GUI, in the order
+ *             of which they should appear in the tree. The list does not have to include
+ *             all items in the given GUI path. Any excluded items will be placed after
+ *             the ones in the list.
+ */
+[[codegen::luawrap]] void setGuiOrder(std::string guiPath, std::vector<std::string> list)
+{
+    return openspace::global::renderEngine->scene()->setGuiTreeOrder(guiPath, list);
+}
+
+/**
+ * Get a dictionary containing the current map with custom orderings for the Scene GUI
+ * tree. Each key in the dictionary corresponds to a branch in the tree, i.e. a specific
+ * GUI path.
+ */
+[[codegen::luawrap]] ghoul::Dictionary guiOrder() {
+    return openspace::global::renderEngine->scene()->guiTreeOrder();
+}
+
 } // namespace
 
 #include "scene_lua_codegen.cpp"

From 11bb8e7ac50a840d07ab7b1fee8d7a776d937b64 Mon Sep 17 00:00:00 2001
From: Ylva Selling <ylva.selling@gmail.com>
Date: Fri, 23 Aug 2024 09:37:01 +0200
Subject: [PATCH 605/701] GPU accelerate CEF (#3386)

* Update CEF version number

* Set OpenSpace_Helper version of C++ to 20

* Update C++ syntax to v 20

* Remove deprecated function (now default)

* Set the cache folder for cef

* Make static function in webbrowsermodule that determines if we can use accelerated rendering

* Add flag for accelerated rendering to webrenderhandler

* Use accelerated rendering

* Implement function to see if gui should absorb click

* Adhere to 80 char linewidth

* Make only the UI GPU accelerated

* Use dirty rects size for the texture to remove crash

* Better comments

* Make has content function work for GPU acceleration

* Make it so all browsers can be accelerated

Tried making it so only the gui was accelerated for simplicity. Performance plummeted, so reverted that

* Tidy up

* Add accelerated rendering flag to the screenspacerenderable shader

* Add temporary fix to make the sky browser work

* Remove flag from gui render handler

* Enable webgl in a nicer way

* Unbind texture in screenspacerenderable

* Add better comments for error handling

* Tidy up

* Address PR comments

* Make the acceleration Windows only

* Remove unnecessary setting of shader dictionary

* Allow web dev tools to connect to CEF

* Update modules/webbrowser/include/browserinstance.h

Co-authored-by: Emma Broman <emma.broman@liu.se>

* Update modules/webbrowser/include/webrenderhandler.h

Co-authored-by: Emma Broman <emma.broman@liu.se>

* Apply suggestions from code review

Co-authored-by: Emma Broman <emma.broman@liu.se>

---------

Co-authored-by: Ylva Selling <ylva.selling@liu.se>
Co-authored-by: Emma Broman <emma.broman@liu.se>
---
 .../rendering/screenspacerenderable.h         |   2 +-
 modules/base/shaders/screenspace_fs.glsl      |  12 +-
 modules/cefwebgui/cefwebguimodule.cpp         |  18 ++-
 modules/cefwebgui/shaders/gui_fs.glsl         |  10 +-
 modules/cefwebgui/src/guirenderhandler.cpp    |   7 +-
 modules/skybrowser/include/browser.h          |   3 +
 modules/skybrowser/src/browser.cpp            |   3 +-
 modules/webbrowser/include/browserinstance.h  |   9 +-
 .../webbrowser/include/screenspacebrowser.h   |   1 -
 modules/webbrowser/include/webrenderhandler.h |  18 ++-
 modules/webbrowser/src/browserinstance.cpp    |  11 +-
 modules/webbrowser/src/screenspacebrowser.cpp |  28 ++--
 modules/webbrowser/src/webbrowserapp.cpp      |   5 +-
 modules/webbrowser/src/webrenderhandler.cpp   | 148 +++++++++++++++++-
 modules/webbrowser/webbrowsermodule.cpp       |  20 +++
 modules/webbrowser/webbrowsermodule.h         |   2 +
 src/rendering/screenspacerenderable.cpp       |   8 +-
 17 files changed, 256 insertions(+), 49 deletions(-)

diff --git a/include/openspace/rendering/screenspacerenderable.h b/include/openspace/rendering/screenspacerenderable.h
index 47f5af91dd..28f262f61d 100644
--- a/include/openspace/rendering/screenspacerenderable.h
+++ b/include/openspace/rendering/screenspacerenderable.h
@@ -98,7 +98,7 @@ public:
     static documentation::Documentation Documentation();
 
 protected:
-    void createShaders();
+    void createShaders(ghoul::Dictionary dict = ghoul::Dictionary());
     std::string makeUniqueIdentifier(std::string name);
 
     virtual glm::mat4 scaleMatrix();
diff --git a/modules/base/shaders/screenspace_fs.glsl b/modules/base/shaders/screenspace_fs.glsl
index 68402103a1..5d0b7fea8a 100644
--- a/modules/base/shaders/screenspace_fs.glsl
+++ b/modules/base/shaders/screenspace_fs.glsl
@@ -42,11 +42,21 @@ uniform vec2 borderWidth = vec2(0.1);
 uniform vec3 borderColor = vec3(0.0);
 uniform int borderFeather = 0;
 
+// Accelerated rendering can be used for the CEF browser
+#define USE_ACCELERATED_RENDERING #{useAcceleratedRendering}
 
 Fragment getFragment() {
   Fragment frag;
+  vec4 originalColor;
+  #if USE_ACCELERATED_RENDERING
+    vec2 flippedTexCoords = vec2(vs_st.x, 1.0 - vs_st.y);
+    // Correcting both orientation and color channels
+    originalColor = texture(tex, flippedTexCoords).bgra;
+  #else
+    originalColor = texture(tex, vs_st);
+  #endif
 
-  vec4 texColor = texture(tex, vs_st) * vec4(color, opacity);
+  vec4 texColor = originalColor * vec4(color, opacity);
 
   frag.color = texColor.a * texColor + (1.0 - texColor.a) * backgroundColor;
 
diff --git a/modules/cefwebgui/cefwebguimodule.cpp b/modules/cefwebgui/cefwebguimodule.cpp
index 308aa07347..e809d47350 100644
--- a/modules/cefwebgui/cefwebguimodule.cpp
+++ b/modules/cefwebgui/cefwebguimodule.cpp
@@ -216,6 +216,17 @@ void CefWebGuiModule::internalInitialize(const ghoul::Dictionary& configuration)
         startOrStopGui();
     });
 
+    global::callback::postDraw->emplace_back([this]() {
+        bool windowChanged = global::windowDelegate->windowHasResized(); 
+        if (_instance && (windowChanged || _instance->_shouldReshape)){
+            const glm::ivec2 res = global::windowDelegate->guiWindowResolution();
+            _instance->reshape(static_cast<glm::ivec2>(
+                glm::vec2(res) * global::windowDelegate->dpiScaling()
+            ));
+            _instance->_shouldReshape = false;
+        }
+    });
+
     global::callback::draw2D->emplace_back([this](){
         ZoneScopedN("CefWebGuiModule");
 
@@ -227,13 +238,6 @@ void CefWebGuiModule::internalInitialize(const ghoul::Dictionary& configuration)
         const bool isMaster = global::windowDelegate->isMaster();
 
         if (isGuiWindow && isMaster && _instance) {
-            if (global::windowDelegate->windowHasResized() || _instance->_shouldReshape) {
-                const glm::ivec2 csws = global::windowDelegate->guiWindowResolution();
-                _instance->reshape(static_cast<glm::ivec2>(
-                    static_cast<glm::vec2>(csws) * global::windowDelegate->dpiScaling()
-                ));
-                _instance->_shouldReshape = false;
-            }
             if (_visible) {
                 _instance->draw();
             }
diff --git a/modules/cefwebgui/shaders/gui_fs.glsl b/modules/cefwebgui/shaders/gui_fs.glsl
index 288018f598..7e40d3ce72 100644
--- a/modules/cefwebgui/shaders/gui_fs.glsl
+++ b/modules/cefwebgui/shaders/gui_fs.glsl
@@ -29,8 +29,14 @@ in vec2 vs_st;
 out vec4 outputColor;
 
 uniform sampler2D tex;
-
+#define USE_ACCELERATED_RENDERING #{useAcceleratedRendering}
 
 void main() {
-  outputColor = texture(tex, vs_st);
+  #if USE_ACCELERATED_RENDERING
+    vec2 flippedTexCoords = vec2(vs_st.x, 1.0 - vs_st.y);
+    vec4 texColor = texture(tex, flippedTexCoords);
+    outputColor = texColor.bgra;  // Correcting both orientation and color channels
+  #else
+    outputColor = texture(tex, vs_st);
+  #endif
 }
diff --git a/modules/cefwebgui/src/guirenderhandler.cpp b/modules/cefwebgui/src/guirenderhandler.cpp
index 4853fcc30a..836908f9f4 100644
--- a/modules/cefwebgui/src/guirenderhandler.cpp
+++ b/modules/cefwebgui/src/guirenderhandler.cpp
@@ -38,10 +38,14 @@ namespace openspace {
 
 GUIRenderHandler::GUIRenderHandler() {
     LDEBUG("Initializing CEF GL environment...");
+    ghoul::Dictionary define;
+    define.setValue("useAcceleratedRendering", _acceleratedRendering);
+
     _programObject = ghoul::opengl::ProgramObject::Build(
         "WebGUICEFProgram",
         absPath("${MODULE_CEFWEBGUI}/shaders/gui_vs.glsl"),
-        absPath("${MODULE_CEFWEBGUI}/shaders/gui_fs.glsl")
+        absPath("${MODULE_CEFWEBGUI}/shaders/gui_fs.glsl"),
+        define
     );
     constexpr std::array<float, 12> Vtx = {
         -1.f, -1.f, -1.f,
@@ -53,7 +57,6 @@ GUIRenderHandler::GUIRenderHandler() {
     glGenVertexArrays(1, &_vao);
     glBindVertexArray(_vao);
     glGenBuffers(1, &_vbo);
-    glGenTextures(1, &_texture);
     glBindBuffer(GL_ARRAY_BUFFER, _vbo);
     glBufferData(GL_ARRAY_BUFFER, Vtx.size() * sizeof(float), Vtx.data(), GL_STATIC_DRAW);
     glEnableVertexAttribArray(0);
diff --git a/modules/skybrowser/include/browser.h b/modules/skybrowser/include/browser.h
index 900afc2ae9..5a5235bf11 100644
--- a/modules/skybrowser/include/browser.h
+++ b/modules/skybrowser/include/browser.h
@@ -94,6 +94,9 @@ protected:
 private:
     class RenderHandler : public WebRenderHandler {
     public:
+        RenderHandler()
+            : WebRenderHandler(false)
+        {}
         void draw() override;
         void render() override;
 
diff --git a/modules/skybrowser/src/browser.cpp b/modules/skybrowser/src/browser.cpp
index 7cd47925cc..bb6edbfc6e 100644
--- a/modules/skybrowser/src/browser.cpp
+++ b/modules/skybrowser/src/browser.cpp
@@ -109,7 +109,8 @@ Browser::Browser(const ghoul::Dictionary& dictionary)
     // Create browser and render handler
     _browserInstance = std::make_unique<BrowserInstance>(
         _renderHandler.get(),
-        _keyboardHandler.get()
+        _keyboardHandler.get(),
+        false
     );
 
     WebBrowserModule* webBrowser = global::moduleEngine->module<WebBrowserModule>();
diff --git a/modules/webbrowser/include/browserinstance.h b/modules/webbrowser/include/browserinstance.h
index 0e29b93c49..b5a0dfd221 100644
--- a/modules/webbrowser/include/browserinstance.h
+++ b/modules/webbrowser/include/browserinstance.h
@@ -57,8 +57,13 @@ class WebKeyboardHandler;
 class BrowserInstance {
 public:
     static constexpr int SingleClick = 1;
-
-    BrowserInstance(WebRenderHandler* renderer, WebKeyboardHandler* keyboardHandler);
+    // @TODO (ylvse 2024-08-20): remove third argument when the sky browser rewrite is done.
+    //   The browser instance should always accelerate the rendering if possible but for
+    //   now the skybrowser is not accelerated. Will be when the rewrite is done.
+    BrowserInstance(WebRenderHandler* renderer,
+        WebKeyboardHandler* keyboardHandler,
+        bool accelerateRendering = true
+    );
     ~BrowserInstance();
 
     void loadUrl(const std::string& url);
diff --git a/modules/webbrowser/include/screenspacebrowser.h b/modules/webbrowser/include/screenspacebrowser.h
index f08e371308..a2d6d5cfad 100644
--- a/modules/webbrowser/include/screenspacebrowser.h
+++ b/modules/webbrowser/include/screenspacebrowser.h
@@ -77,7 +77,6 @@ public:
 protected:
     properties::UVec2Property _dimensions;
     std::unique_ptr<BrowserInstance> _browserInstance;
-    std::unique_ptr<ghoul::opengl::Texture> _texture;
 
 private:
     class ScreenSpaceRenderHandler : public WebRenderHandler {
diff --git a/modules/webbrowser/include/webrenderhandler.h b/modules/webbrowser/include/webrenderhandler.h
index 10e374e43d..b58044d2ee 100644
--- a/modules/webbrowser/include/webrenderhandler.h
+++ b/modules/webbrowser/include/webrenderhandler.h
@@ -50,6 +50,9 @@ namespace openspace {
 
 class WebRenderHandler : public CefRenderHandler {
 public:
+    // @TODO (ylvse 2024-08-20): Remove this argument when the skybrowser rewrite is done.
+    // It is necessary atm for making the skybrowser work.
+    WebRenderHandler(bool accelerate = true);
     using Pixel = glm::tvec4<char>;
 
     virtual void draw(void) = 0;
@@ -58,15 +61,28 @@ public:
     void reshape(int, int);
 
     void GetViewRect(CefRefPtr<CefBrowser> browser, CefRect &rect) override;
+
+    // Regular OnPaint method. Uses CPU allocation
     void OnPaint(CefRefPtr<CefBrowser> browser, PaintElementType type,
         const RectList &dirtyRects, const void* buffer, int width, int height) override;
+
+    // Used when the "shared_texture" flag is set to true for CEF. Uses a shared texture
+    // from CEF that is allocated on another part of the GPU. Skip CPU allocationn for
+    // better performance. Needs OpenGl 4.5 or higher. 
+    void OnAcceleratedPaint(CefRefPtr<CefBrowser> browser, PaintElementType type,
+        const RectList& dirtyRects, const CefAcceleratedPaintInfo& info) override;
+
+    // Determines if the alpha value is > 0 at the specified pixel coordinates. Used in
+    // the GUI to determine if the click is consumed
     bool hasContent(int x, int y);
 
     bool isTextureReady() const;
-    void updateTexture();
+    void updateTexture(); 
+    void bindTexture();
 
 protected:
     GLuint _texture = 0;
+    const bool _acceleratedRendering;
 
 private:
     glm::ivec2 _windowSize = glm::ivec2(0);
diff --git a/modules/webbrowser/src/browserinstance.cpp b/modules/webbrowser/src/browserinstance.cpp
index f62d5aec0e..41c66294da 100644
--- a/modules/webbrowser/src/browserinstance.cpp
+++ b/modules/webbrowser/src/browserinstance.cpp
@@ -27,6 +27,7 @@
 #include <modules/webbrowser/include/browserclient.h>
 #include <modules/webbrowser/include/webrenderhandler.h>
 #include <modules/webbrowser/include/webkeyboardhandler.h>
+#include <modules/webbrowser/webbrowsermodule.h>
 #include <openspace/engine/globals.h>
 #include <openspace/engine/windowdelegate.h>
 #include <ghoul/filesystem/file.h>
@@ -44,7 +45,8 @@ namespace {
 namespace openspace {
 
 BrowserInstance::BrowserInstance(WebRenderHandler* renderer,
-                                 WebKeyboardHandler* keyboardHandler)
+                                 WebKeyboardHandler* keyboardHandler,
+                                 bool accelerateRendering)
     : _renderHandler(renderer)
     , _keyboardHandler(keyboardHandler)
     , _client(new BrowserClient(_renderHandler.get(), _keyboardHandler.get()))
@@ -54,8 +56,15 @@ BrowserInstance::BrowserInstance(WebRenderHandler* renderer,
     // requires this to be a long unsigned int, so we can't use nullptr here
     windowInfo.SetAsWindowless(0);
 
+    // Use accelerated rendering if possible
+    if (WebBrowserModule::canUseAcceleratedRendering() && accelerateRendering) {
+        windowInfo.shared_texture_enabled = true;
+        LINFO("Enabling shared texture mode for CEF");
+    }
+
     CefBrowserSettings browserSettings;
     browserSettings.windowless_frame_rate = 60;
+    browserSettings.webgl = cef_state_t::STATE_ENABLED;
 
     _browser = CefBrowserHost::CreateBrowserSync(
         windowInfo,
diff --git a/modules/webbrowser/src/screenspacebrowser.cpp b/modules/webbrowser/src/screenspacebrowser.cpp
index 6fbb0f303b..8ee054ba11 100644
--- a/modules/webbrowser/src/screenspacebrowser.cpp
+++ b/modules/webbrowser/src/screenspacebrowser.cpp
@@ -96,9 +96,9 @@ documentation::Documentation ScreenSpaceBrowser::Documentation() {
 ScreenSpaceBrowser::ScreenSpaceBrowser(const ghoul::Dictionary& dictionary)
     : ScreenSpaceRenderable(dictionary)
     , _dimensions(DimensionsInfo, glm::uvec2(0), glm::uvec2(0), glm::uvec2(3000))
-    , _renderHandler(new ScreenSpaceRenderHandler)
     , _url(UrlInfo)
     , _reload(ReloadInfo)
+    , _renderHandler(new ScreenSpaceRenderHandler)
     , _keyboardHandler(new WebKeyboardHandler)
 {
     const Parameters p = codegen::bake<Parameters>(dictionary);
@@ -109,8 +109,7 @@ ScreenSpaceBrowser::ScreenSpaceBrowser(const ghoul::Dictionary& dictionary)
 
     _url = p.url.value_or(_url);
 
-    const glm::vec2 windowDimensions = global::windowDelegate->currentSubwindowSize();
-    _dimensions = p.dimensions.value_or(windowDimensions);
+    _dimensions = p.dimensions.value_or(global::windowDelegate->currentSubwindowSize());
 
     _browserInstance = std::make_unique<BrowserInstance>(
         _renderHandler.get(),
@@ -132,14 +131,13 @@ ScreenSpaceBrowser::ScreenSpaceBrowser(const ghoul::Dictionary& dictionary)
 }
 
 bool ScreenSpaceBrowser::initializeGL() {
-    _texture = std::make_unique<ghoul::opengl::Texture>(
-        glm::uvec3(_dimensions.value(), 1),
-        GL_TEXTURE_2D
+    ghoul::Dictionary dict = ghoul::Dictionary();
+
+    dict.setValue(
+        "useAcceleratedRendering",
+        WebBrowserModule::canUseAcceleratedRendering()
     );
-
-    _renderHandler->setTexture(*_texture);
-
-    createShaders();
+    createShaders(dict);
 
     _browserInstance->initialize();
     _browserInstance->loadUrl(_url);
@@ -147,9 +145,6 @@ bool ScreenSpaceBrowser::initializeGL() {
 }
 
 bool ScreenSpaceBrowser::deinitializeGL() {
-    _renderHandler->setTexture(0);
-    _texture = nullptr;
-
     LDEBUG(std::format("Deinitializing ScreenSpaceBrowser: {}", _url.value()));
 
     _browserInstance->close(true);
@@ -172,6 +167,7 @@ void ScreenSpaceBrowser::render(const RenderData& renderData) {
     }
 
     _renderHandler->updateTexture();
+
     const glm::mat4 mat =
         globalRotationMatrix() *
         translationMatrix() *
@@ -181,7 +177,7 @@ void ScreenSpaceBrowser::render(const RenderData& renderData) {
 }
 
 void ScreenSpaceBrowser::update() {
-    _objectSize = _texture->dimensions();
+    _objectSize = _dimensions.value();
 
     if (_isUrlDirty) {
         _browserInstance->loadUrl(_url);
@@ -195,11 +191,11 @@ void ScreenSpaceBrowser::update() {
 }
 
 bool ScreenSpaceBrowser::isReady() const {
-    return _shader && _texture;
+    return _shader != nullptr;
 }
 
 void ScreenSpaceBrowser::bindTexture() {
-    _texture->bind();
+    _renderHandler->bindTexture();
 }
 
 } // namespace openspace
diff --git a/modules/webbrowser/src/webbrowserapp.cpp b/modules/webbrowser/src/webbrowserapp.cpp
index 8867954074..817118ba1f 100644
--- a/modules/webbrowser/src/webbrowserapp.cpp
+++ b/modules/webbrowser/src/webbrowserapp.cpp
@@ -42,9 +42,8 @@ void WebBrowserApp::OnContextCreated(CefRefPtr<CefBrowser>, CefRefPtr<CefFrame>,
 void WebBrowserApp::OnBeforeCommandLineProcessing(const CefString&,
                                                   CefRefPtr<CefCommandLine> commandline)
 {
-    commandline->AppendSwitch("--enable-gpu-rasterization");
-    commandline->AppendSwitch("--use-gl=desktop");
-    commandline->AppendSwitch("--enable-webgl2-compute-context");
+    // This is to allow dev tools to connect
+    commandline->AppendSwitchWithValue("remote-allow-origins", "http://localhost:8088");
     commandline->AppendSwitch("log-gpu-control-list-decisions");
     commandline->AppendSwitch("use-mock-keychain");
     commandline->AppendSwitch("enable-begin-frame-scheduling");
diff --git a/modules/webbrowser/src/webrenderhandler.cpp b/modules/webbrowser/src/webrenderhandler.cpp
index 0bdccd183b..658f0c6417 100644
--- a/modules/webbrowser/src/webrenderhandler.cpp
+++ b/modules/webbrowser/src/webrenderhandler.cpp
@@ -23,16 +23,33 @@
  ****************************************************************************************/
 
 #include <modules/webbrowser/include/webrenderhandler.h>
-
+#include <modules/webbrowser/webbrowsermodule.h>
 #include <ghoul/glm.h>
 #include <ghoul/logging/logmanager.h>
 
+namespace {
+    constexpr std::string_view _loggerCat = "WebRenderHandler";
+} // namespace
+
+
 namespace openspace {
 
+WebRenderHandler::WebRenderHandler(bool accelerate)
+    : _acceleratedRendering(WebBrowserModule::canUseAcceleratedRendering() && accelerate)
+{
+    if (_acceleratedRendering) {
+        glCreateTextures(GL_TEXTURE_2D, 1, &_texture);
+    }
+    else {
+        glGenTextures(1, &_texture);
+    }
+}
+
 void WebRenderHandler::reshape(int w, int h) {
     if (w == _windowSize.x && h == _windowSize.y) {
         return;
     }
+    ghoul_assert(w > 0 && h > 0, std::format("Reshaped browser to {} x {}", w, h));
     _windowSize = glm::ivec2(w, h);
     _needsRepaint = true;
 }
@@ -45,6 +62,11 @@ void WebRenderHandler::OnPaint(CefRefPtr<CefBrowser>, CefRenderHandler::PaintEle
                                const CefRenderHandler::RectList& dirtyRects,
                                const void* buffer, int w, int h)
 {
+    // This should never happen - if accelerated rendering is on the OnAcceleratePaint
+    // method should be called. But we instatiate the web render handler and the browser
+    // instance in different places so room for error
+    ghoul_assert(!_acceleratedRendering, "Accelerated rendering flag is turned on");
+
     const size_t bufferSize = static_cast<size_t>(w * h);
 
     glm::ivec2 upperUpdatingRectBound = glm::ivec2(0, 0);
@@ -94,8 +116,70 @@ void WebRenderHandler::OnPaint(CefRefPtr<CefBrowser>, CefRenderHandler::PaintEle
     _needsRepaint = false;
 }
 
+void WebRenderHandler::OnAcceleratedPaint(CefRefPtr<CefBrowser> browser,
+                                          PaintElementType type,
+                                          const RectList& dirtyRects,
+                                          const CefAcceleratedPaintInfo& info)
+{
+    // This should never happen - if accelerated rendering is off the OnPaint method
+    // should be called. But we instatiate the web render handler and the browser instance
+    // in different places so room for error
+    ghoul_assert(_acceleratedRendering, "Accelerated rendering flag is turned off");
+
+    if (dirtyRects.empty()) {
+        return;
+    }
+    // When the window is minimized the texture is 1x1.
+    // This prevents a hard crash when minimizing the window or when you resize the window
+    // so that only the top bar is visible.
+    // @TODO (ylvse 2024-08-20): minimizing window should be handled with the appropriate
+    // function in the CefBrowser called WasHidden
+    if (dirtyRects[0].height <= 1 || dirtyRects[0].width <= 1) {
+        return; 
+    }
+    // This function is called asynchronously after a reshape which means we have to check
+    // for what we request. Validate the size. This prevents rendering a texture with the
+    // wrong size (the look will be deformed)
+    int newWidth = dirtyRects[0].width;
+    int newHeight = dirtyRects[0].height;
+    if (newWidth != _windowSize.x || newHeight != _windowSize.y) {
+        return;
+    }
+
+    GLuint sharedTexture;
+    GLuint memObj;
+    // Create new texture that we can copy the shared texture into. Unfortunately
+    // textures are immutable so we have to create a new one
+    glCreateTextures(GL_TEXTURE_2D, 1, &sharedTexture);
+
+    // Create the memory object handle
+    glCreateMemoryObjectsEXT(1, &memObj);
+
+    // The size of the texture we get from CEF. The CEF format is CEF_COLOR_TYPE_BGRA_8888
+    // It has 4 bytes per pixel. The mem object requires this to be multiplied with 2
+    int size = newWidth * newHeight * 8;
+
+    // Cef uses the GL_HANDLE_TYPE_D3D11_IMAGE_EXT handle for their shared texture
+    // Import the shared texture to the memory object
+    glImportMemoryWin32HandleEXT(
+        memObj, size, GL_HANDLE_TYPE_D3D11_IMAGE_EXT, info.shared_texture_handle
+    );
+
+    // Allocate immutable storage for the texture for the data from the memory object
+    // Use GL_RGBA8 since it is 4 bytes
+    glTextureStorageMem2DEXT(sharedTexture, 1, GL_RGBA8, newWidth, newHeight, memObj, 0);
+
+    // Clean up the temporary allocations
+    glDeleteTextures(1, &_texture);
+
+    glDeleteMemoryObjectsEXT(1, &memObj);
+    // Set the updated texture
+    _texture = sharedTexture;
+    _needsRepaint = false;
+}
+
 void WebRenderHandler::updateTexture() {
-    if (_needsRepaint) {
+    if (_acceleratedRendering || _needsRepaint) {
         return;
     }
 
@@ -149,16 +233,66 @@ void WebRenderHandler::updateTexture() {
 }
 
 bool WebRenderHandler::hasContent(int x, int y) {
-    if (_browserBuffer.empty()) {
-        return false;
+    if (_acceleratedRendering) {
+        // To see the alpha value of the pixel we first have to get the texture from the
+        // GPU. Use a PBO for better performance
+        bool hasContent = false;
+        GLuint pbo = 0;
+        glGenBuffers(1, &pbo);
+        glBindBuffer(GL_PIXEL_PACK_BUFFER, pbo);
+
+        // Allocate memory for the PBO (width * height * 4 bytes for RGBA)
+        glBufferData(
+            GL_PIXEL_PACK_BUFFER,
+            _windowSize.x * _windowSize.y * 4,
+            nullptr,
+            GL_STREAM_READ
+        );
+
+        glBindTexture(GL_TEXTURE_2D, _texture);
+
+        // Read the texture data into the PBO
+        glGetTexImage(GL_TEXTURE_2D, 0, GL_RGBA, GL_UNSIGNED_BYTE, 0);
+
+        // Map the PBO to the CPU memory space
+        GLubyte* pixels = reinterpret_cast<GLubyte*>(
+            glMapBuffer(GL_PIXEL_PACK_BUFFER, GL_READ_ONLY)
+        );
+
+        ghoul_assert(pixels, "Could not read pixels from the GPU for the cef gui.");
+        if (pixels) {
+            // Access the specific pixel data
+            int index = (y * _windowSize.x + x) * 4;
+            if (index < _windowSize.x* _windowSize.y * 4) {
+                // The alpha value is at the fourth place (rgba)
+                GLubyte a = pixels[index + 3];
+                hasContent = a > 0;
+            }
+        }
+        // Unmap the buffer
+        glUnmapBuffer(GL_PIXEL_PACK_BUFFER);
+
+        // Unbind and delete the PBO
+        glBindBuffer(GL_PIXEL_PACK_BUFFER, 0);
+        glDeleteBuffers(1, &pbo);
+        return hasContent;
+    }
+    else {
+        if (_browserBuffer.empty()) {
+            return false;
+        }
+        int index = x + _browserBufferSize.x * (_browserBufferSize.y - y - 1);
+        index = glm::clamp(index, 0, static_cast<int>(_browserBuffer.size() - 1));
+        return _browserBuffer[index].a;
     }
-    int index = x + _browserBufferSize.x * (_browserBufferSize.y - y - 1);
-    index = glm::clamp(index, 0, static_cast<int>(_browserBuffer.size() - 1));
-    return _browserBuffer[index].a;
 }
 
 bool WebRenderHandler::isTextureReady() const {
     return !_needsRepaint;
 }
 
+void WebRenderHandler::bindTexture() {
+    glBindTexture(GL_TEXTURE_2D, _texture);
+}
+
 } // namespace openspace
diff --git a/modules/webbrowser/webbrowsermodule.cpp b/modules/webbrowser/webbrowsermodule.cpp
index 2e5cadddea..7628edc62a 100644
--- a/modules/webbrowser/webbrowsermodule.cpp
+++ b/modules/webbrowser/webbrowsermodule.cpp
@@ -38,6 +38,7 @@
 #include <ghoul/logging/logmanager.h>
 #include <ghoul/misc/dictionary.h>
 #include <ghoul/misc/profiling.h>
+#include <ghoul/systemcapabilities/openglcapabilitiescomponent.h>
 #include <filesystem>
 
 namespace {
@@ -225,6 +226,25 @@ bool WebBrowserModule::isEnabled() const {
     return _enabled;
 }
 
+bool WebBrowserModule::canUseAcceleratedRendering() {
+// Linux doesn't have a problem with the rendering, Apple doesn't support OpenGL 4.5
+#ifdef WIN32
+    ghoul::systemcapabilities::Version acceleratedVersion = {
+        .major = 4, .minor = 5, .release = 0
+    };
+    auto it = std::find(
+        OpenGLCap.extensions().begin(),
+        OpenGLCap.extensions().end(),
+        "GL_EXT_memory_object_win32"
+    );
+    bool isVersionOk = OpenGLCap.openGLVersion() >= acceleratedVersion;
+    bool isExtensionsOk = it != OpenGLCap.extensions().end();
+    return isVersionOk && isExtensionsOk;
+#else
+    return false;
+#endif
+}
+
 std::vector<documentation::Documentation> WebBrowserModule::documentations() const {
     return {
         ScreenSpaceBrowser::Documentation()
diff --git a/modules/webbrowser/webbrowsermodule.h b/modules/webbrowser/webbrowsermodule.h
index a65a81a2f8..7d595c5497 100644
--- a/modules/webbrowser/webbrowsermodule.h
+++ b/modules/webbrowser/webbrowsermodule.h
@@ -58,6 +58,8 @@ public:
     void detachEventHandler();
     bool isEnabled() const;
 
+    static bool canUseAcceleratedRendering();
+
     std::vector<documentation::Documentation> documentations() const override;
 
 protected:
diff --git a/src/rendering/screenspacerenderable.cpp b/src/rendering/screenspacerenderable.cpp
index c2fc14d38a..422a509fc1 100644
--- a/src/rendering/screenspacerenderable.cpp
+++ b/src/rendering/screenspacerenderable.cpp
@@ -510,9 +510,7 @@ float ScreenSpaceRenderable::scale() const {
     return _scale;
 }
 
-void ScreenSpaceRenderable::createShaders() {
-    ghoul::Dictionary dict = ghoul::Dictionary();
-
+void ScreenSpaceRenderable::createShaders(ghoul::Dictionary dict) {
     auto res = global::windowDelegate->currentDrawBufferResolution();
     ghoul::Dictionary rendererData;
     rendererData.setValue(
@@ -699,7 +697,9 @@ void ScreenSpaceRenderable::draw(const glm::mat4& modelTransform,
     unbindTexture();
 }
 
-void ScreenSpaceRenderable::unbindTexture() {}
+void ScreenSpaceRenderable::unbindTexture() {
+    glBindTexture(GL_TEXTURE_2D, 0);
+}
 
 glm::vec3 ScreenSpaceRenderable::sanitizeSphericalCoordinates(glm::vec3 spherical) const {
     const float r = spherical.x;

From bf8c2bbe130e24212f7a1ff9d42dc7938b99d0dc Mon Sep 17 00:00:00 2001
From: Alexander Bock <alexander.bock@liu.se>
Date: Fri, 23 Aug 2024 10:30:15 +0200
Subject: [PATCH 606/701] Add missing information about color-enhancement for
 the Viking image

---
 .../planets/mars/moons/layers/colorlayers/phobos_viking.asset  | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/data/assets/scene/solarsystem/planets/mars/moons/layers/colorlayers/phobos_viking.asset b/data/assets/scene/solarsystem/planets/mars/moons/layers/colorlayers/phobos_viking.asset
index 877033922c..903484d6a3 100644
--- a/data/assets/scene/solarsystem/planets/mars/moons/layers/colorlayers/phobos_viking.asset
+++ b/data/assets/scene/solarsystem/planets/mars/moons/layers/colorlayers/phobos_viking.asset
@@ -24,6 +24,9 @@ local Layer = {
     this affects the appearance only and not the map geometry. This global mosaic has a
     pixel resolution of five meters per pixel (m).
 
+    This image was further color-enhanced based on data from the Mars Reconnaissance
+    Orbiter: https://www.planetary.org/space-images/color-view-of-phobos-from-mars-reconnaissance-orbiter#:~:text=The%20color%20view%20shows%20that
+
     References:
     Stooke, P. (2012). Stooke Small Bodies Maps V2.0. MULTI-SA-MULTI-6-STOOKEMAPS-V2.0.
     NASA Planetary Data System. https://sbn.psi.edu/pds/resource/stookemaps.html

From fd586e30a345f4364ab2a112e36a2c0d917eda31 Mon Sep 17 00:00:00 2001
From: Ylva Selling <ylva.selling@liu.se>
Date: Fri, 23 Aug 2024 16:46:36 +0200
Subject: [PATCH 607/701] Set useAcceleratedRendering flag in skybrowser

---
 modules/skybrowser/src/screenspaceskybrowser.cpp | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/modules/skybrowser/src/screenspaceskybrowser.cpp b/modules/skybrowser/src/screenspaceskybrowser.cpp
index 388fe3fb6f..16307ebdd7 100644
--- a/modules/skybrowser/src/screenspaceskybrowser.cpp
+++ b/modules/skybrowser/src/screenspaceskybrowser.cpp
@@ -193,7 +193,10 @@ ScreenSpaceSkyBrowser::~ScreenSpaceSkyBrowser() {
 
 bool ScreenSpaceSkyBrowser::initializeGL() {
     WwtCommunicator::initializeGL();
-    ScreenSpaceRenderable::initializeGL();
+    // @TODO (ylvse, 2024-08-23) Remove this once the skybrowser has been rewritten
+    ghoul::Dictionary dict;
+    dict.setValue("useAcceleratedRendering", false);
+    createShaders(dict);
     return true;
 }
 

From aed2c0b0c8f4f51d154d5ba95fa162d37371fee9 Mon Sep 17 00:00:00 2001
From: Ylva Selling <ylva.selling@gmail.com>
Date: Wed, 28 Aug 2024 10:44:17 +0200
Subject: [PATCH 608/701] Issue/2244 different mouse cursors (#3388)

* Update CEF version number

* Set OpenSpace_Helper version of C++ to 20

* Update C++ syntax to v 20

* Remove deprecated function (now default)

* Set the cache folder for cef

* Make static function in webbrowsermodule that determines if we can use accelerated rendering

* Add flag for accelerated rendering to webrenderhandler

* Use accelerated rendering

* Implement function to see if gui should absorb click

* Adhere to 80 char linewidth

* Make only the UI GPU accelerated

* Use dirty rects size for the texture to remove crash

* Better comments

* Make has content function work for GPU acceleration

* Make it so all browsers can be accelerated

Tried making it so only the gui was accelerated for simplicity. Performance plummeted, so reverted that

* Tidy up

* Add accelerated rendering flag to the screenspacerenderable shader

* Add temporary fix to make the sky browser work

* Remove flag from gui render handler

* Enable webgl in a nicer way

* Unbind texture in screenspacerenderable

* Add better comments for error handling

* Tidy up

* Address PR comments

* Make the acceleration Windows only

* Remove unnecessary setting of shader dictionary

* Add display handler to browser client

* Make glfw change mouse cursor depending on cef cursor

* formatting

* Add switch to main

* Update modules/webbrowser/src/browserclient.cpp

Co-authored-by: Alexander Bock <alexander.bock@liu.se>

* Address comments on PR

* Update again

* Update modules/webbrowser/src/browserclient.cpp

Co-authored-by: Emma Broman <emma.broman@liu.se>

* Address PR comments

---------

Co-authored-by: Ylva Selling <ylva.selling@liu.se>
Co-authored-by: Alexander Bock <alexander.bock@liu.se>
Co-authored-by: Emma Broman <emma.broman@liu.se>
---
 apps/OpenSpace/main.cpp                       | 48 +++++++++++++++
 include/openspace/engine/windowdelegate.h     |  5 ++
 modules/webbrowser/include/browserclient.h    |  9 +++
 modules/webbrowser/include/browserinstance.h  |  7 ++-
 modules/webbrowser/include/webrenderhandler.h |  1 +
 modules/webbrowser/src/browserclient.cpp      | 61 +++++++++++++++++++
 6 files changed, 128 insertions(+), 3 deletions(-)

diff --git a/apps/OpenSpace/main.cpp b/apps/OpenSpace/main.cpp
index 1528a1c0c8..2f731bede4 100644
--- a/apps/OpenSpace/main.cpp
+++ b/apps/OpenSpace/main.cpp
@@ -995,6 +995,54 @@ void setSgctDelegateFunctions() {
     sgctDelegate.setStatisticsGraphScale = [](float scale) {
         sgct::Engine::instance().setStatsGraphScale(scale);
     };
+    sgctDelegate.setMouseCursor = [](WindowDelegate::Cursor mouse) {
+        static std::unordered_map<WindowDelegate::Cursor, GLFWcursor*> Cursors = {
+            {
+                WindowDelegate::Cursor::Arrow,
+                glfwCreateStandardCursor(GLFW_ARROW_CURSOR)
+            },
+            {
+                WindowDelegate::Cursor::IBeam,
+                glfwCreateStandardCursor(GLFW_IBEAM_CURSOR)
+            },
+            {
+                WindowDelegate::Cursor::CrossHair,
+                glfwCreateStandardCursor(GLFW_CROSSHAIR_CURSOR)
+            },
+            {
+                WindowDelegate::Cursor::PointingHand,
+                glfwCreateStandardCursor(GLFW_POINTING_HAND_CURSOR)
+            },
+            {
+                WindowDelegate::Cursor::ResizeEW,
+                glfwCreateStandardCursor(GLFW_RESIZE_EW_CURSOR)
+            },
+            {
+                WindowDelegate::Cursor::ResizeNS,
+                glfwCreateStandardCursor(GLFW_RESIZE_NS_CURSOR)
+            },
+            {
+                WindowDelegate::Cursor::ResizeNWSE,
+                glfwCreateStandardCursor(GLFW_RESIZE_NWSE_CURSOR)
+            },
+            {
+                WindowDelegate::Cursor::ResizeNESW,
+                glfwCreateStandardCursor(GLFW_RESIZE_NESW_CURSOR)
+            },
+            {
+                WindowDelegate::Cursor::ResizeAll,
+                glfwCreateStandardCursor(GLFW_RESIZE_ALL_CURSOR)
+            },
+            {
+                WindowDelegate::Cursor::NotAllowed,
+                glfwCreateStandardCursor(GLFW_NOT_ALLOWED_CURSOR)
+            },
+        };
+        ghoul_assert(
+            Cursors.find(mouse) != Cursors.end(), "Tried to create non-existent cursor"
+        );
+        glfwSetCursor(glfwGetCurrentContext(), Cursors[mouse]);
+    };
 }
 
 std::string setWindowConfigPresetForGui(const std::string& labelFromCfgFile,
diff --git a/include/openspace/engine/windowdelegate.h b/include/openspace/engine/windowdelegate.h
index f81be481cd..2a44e55528 100644
--- a/include/openspace/engine/windowdelegate.h
+++ b/include/openspace/engine/windowdelegate.h
@@ -34,6 +34,9 @@ namespace openspace {
 struct WindowDelegate {
     enum class Frustum { Mono, LeftEye, RightEye };
 
+    enum class Cursor { Arrow, IBeam, CrossHair, PointingHand, ResizeEW, ResizeNS,
+        ResizeNWSE, ResizeNESW, ResizeAll, NotAllowed };
+
     void (*terminate)() = [](){};
 
     void (*setBarrier)(bool enabled) = [](bool) {};
@@ -126,6 +129,8 @@ struct WindowDelegate {
         [](const glm::vec2&) { return glm::vec2(0); };
 
     void (*setStatisticsGraphScale)(float scale) = [](float) {};
+
+    void (*setMouseCursor)(Cursor cursor) = [](Cursor) {};
 };
 
 } // namespace openspace
diff --git a/modules/webbrowser/include/browserclient.h b/modules/webbrowser/include/browserclient.h
index 07d1ba459b..ef637f4048 100644
--- a/modules/webbrowser/include/browserclient.h
+++ b/modules/webbrowser/include/browserclient.h
@@ -51,6 +51,13 @@ public:
         IMPLEMENT_REFCOUNTING(NoContextMenuHandler);
     };
 
+    class DisplayHandler : public CefDisplayHandler {
+        bool OnCursorChange(CefRefPtr<CefBrowser> browser,
+            CefCursorHandle cursor,
+            cef_cursor_type_t type,
+            const CefCursorInfo& custom_cursor_info) override; 
+        IMPLEMENT_REFCOUNTING(DisplayHandler);
+    };
     BrowserClient(WebRenderHandler* handler, WebKeyboardHandler* keyboardHandler);
 
     CefRefPtr<CefRenderHandler> GetRenderHandler() override;
@@ -58,6 +65,7 @@ public:
     CefRefPtr<CefRequestHandler> GetRequestHandler() override;
     CefRefPtr<CefKeyboardHandler> GetKeyboardHandler() override;
     CefRefPtr<CefContextMenuHandler> GetContextMenuHandler() override;
+    CefRefPtr<CefDisplayHandler> GetDisplayHandler() override;
 
 private:
     CefRefPtr<CefRenderHandler> _renderHandler;
@@ -65,6 +73,7 @@ private:
     CefRefPtr<CefLifeSpanHandler> _lifeSpanHandler;
     CefRefPtr<CefRequestHandler> _requestHandler;
     CefRefPtr<CefContextMenuHandler> _contextMenuHandler;
+    CefRefPtr<CefDisplayHandler> _displayHandler;
 
     IMPLEMENT_REFCOUNTING(BrowserClient);
 };
diff --git a/modules/webbrowser/include/browserinstance.h b/modules/webbrowser/include/browserinstance.h
index b5a0dfd221..050db97b22 100644
--- a/modules/webbrowser/include/browserinstance.h
+++ b/modules/webbrowser/include/browserinstance.h
@@ -57,9 +57,10 @@ class WebKeyboardHandler;
 class BrowserInstance {
 public:
     static constexpr int SingleClick = 1;
-    // @TODO (ylvse 2024-08-20): remove third argument when the sky browser rewrite is done.
-    //   The browser instance should always accelerate the rendering if possible but for
-    //   now the skybrowser is not accelerated. Will be when the rewrite is done.
+    // @TODO (ylvse 2024-08-20): remove third argument when the sky browser rewrite is
+    // done.
+    // The browser instance should always accelerate the rendering if possible but for
+    // now the skybrowser is not accelerated. Will be when the rewrite is done.
     BrowserInstance(WebRenderHandler* renderer,
         WebKeyboardHandler* keyboardHandler,
         bool accelerateRendering = true
diff --git a/modules/webbrowser/include/webrenderhandler.h b/modules/webbrowser/include/webrenderhandler.h
index b58044d2ee..6274fce02d 100644
--- a/modules/webbrowser/include/webrenderhandler.h
+++ b/modules/webbrowser/include/webrenderhandler.h
@@ -37,6 +37,7 @@
 #endif // _MSC_VER
 
 #include <include/cef_render_handler.h>
+#include <include/cef_display_handler.h>
 
 #ifdef _MSC_VER
 #pragma warning (pop)
diff --git a/modules/webbrowser/src/browserclient.cpp b/modules/webbrowser/src/browserclient.cpp
index 688a71a449..18d4f69f31 100644
--- a/modules/webbrowser/src/browserclient.cpp
+++ b/modules/webbrowser/src/browserclient.cpp
@@ -28,6 +28,8 @@
 #include <modules/webbrowser/include/webrenderhandler.h>
 #include <modules/webbrowser/include/webkeyboardhandler.h>
 #include <ghoul/misc/assert.h>
+#include <openspace/engine/globals.h>
+#include <openspace/engine/windowdelegate.h>
 
 namespace openspace {
 
@@ -43,6 +45,7 @@ BrowserClient::BrowserClient(WebRenderHandler* handler,
     _lifeSpanHandler = browserLauncher;
     _requestHandler = browserLauncher;
     _contextMenuHandler = new BrowserClient::NoContextMenuHandler;
+    _displayHandler = new BrowserClient::DisplayHandler;
 }
 
 CefRefPtr<CefContextMenuHandler> BrowserClient::GetContextMenuHandler() {
@@ -65,6 +68,10 @@ CefRefPtr<CefKeyboardHandler> BrowserClient::GetKeyboardHandler() {
     return _keyboardHandler;
 }
 
+CefRefPtr<CefDisplayHandler> BrowserClient::GetDisplayHandler() {
+    return _displayHandler;
+}
+
 bool BrowserClient::NoContextMenuHandler::RunContextMenu(CefRefPtr<CefBrowser>,
                                                          CefRefPtr<CefFrame>,
                                                          CefRefPtr<CefContextMenuParams>,
@@ -75,4 +82,58 @@ bool BrowserClient::NoContextMenuHandler::RunContextMenu(CefRefPtr<CefBrowser>,
     return true;
 }
 
+bool BrowserClient::DisplayHandler::OnCursorChange(CefRefPtr<CefBrowser> browser,
+                                                  CefCursorHandle cursor,
+                                                  cef_cursor_type_t type,
+                                                  const CefCursorInfo& custom_cursor_info)
+{
+    WindowDelegate::Cursor newCursor;
+    switch (type) {
+        case cef_cursor_type_t::CT_POINTER:
+            newCursor = WindowDelegate::Cursor::Arrow;
+            break;
+        case cef_cursor_type_t::CT_IBEAM:
+            newCursor = WindowDelegate::Cursor::IBeam;
+            break;
+        case cef_cursor_type_t::CT_CROSS:
+            newCursor = WindowDelegate::Cursor::CrossHair;
+            break;
+        case cef_cursor_type_t::CT_HAND:
+            newCursor = WindowDelegate::Cursor::PointingHand;
+            break;
+        case cef_cursor_type_t::CT_EASTWESTRESIZE: 
+        case cef_cursor_type_t::CT_COLUMNRESIZE:
+        case cef_cursor_type_t::CT_EASTRESIZE:
+        case cef_cursor_type_t::CT_WESTRESIZE:
+            newCursor = WindowDelegate::Cursor::ResizeEW;
+            break;
+        case cef_cursor_type_t::CT_NORTHSOUTHRESIZE: 
+        case cef_cursor_type_t::CT_ROWRESIZE:
+        case cef_cursor_type_t::CT_NORTHRESIZE:
+        case cef_cursor_type_t::CT_SOUTHRESIZE:
+            newCursor = WindowDelegate::Cursor::ResizeNS;
+            break;
+        case cef_cursor_type_t::CT_NORTHWESTSOUTHEASTRESIZE:
+        case cef_cursor_type_t::CT_SOUTHEASTRESIZE:
+        case cef_cursor_type_t::CT_NORTHWESTRESIZE:
+            newCursor = WindowDelegate::Cursor::ResizeNWSE;
+            break;
+        case cef_cursor_type_t::CT_NORTHEASTSOUTHWESTRESIZE:
+        case cef_cursor_type_t::CT_SOUTHWESTRESIZE:
+        case cef_cursor_type_t::CT_NORTHEASTRESIZE:
+            newCursor = WindowDelegate::Cursor::ResizeNESW;
+            break;
+        case cef_cursor_type_t::CT_MOVE:
+            newCursor = WindowDelegate::Cursor::ResizeAll;
+            break;
+        case cef_cursor_type_t::CT_NOTALLOWED:
+            newCursor = WindowDelegate::Cursor::NotAllowed;
+            break;
+        default:
+            newCursor = WindowDelegate::Cursor::Arrow;
+            break;
+    }
+    global::windowDelegate->setMouseCursor(newCursor);
+    return false;
+}
 } // namespace openspace

From 16484dc295913d26123f74ab28b2101353a6b127 Mon Sep 17 00:00:00 2001
From: Alexander Bock <mail@alexanderbock.eu>
Date: Wed, 28 Aug 2024 11:50:39 +0200
Subject: [PATCH 609/701] Doxygen cleanup and moving functions in
 SceneGraphNodes

---
 apps/OpenSpace/ext/launcher/include/filesystemaccess.h |  2 +-
 apps/OpenSpace/ext/launcher/include/launcherwindow.h   |  4 ++--
 .../ext/launcher/include/profile/assettreemodel.h      |  8 ++++----
 .../ext/launcher/include/profile/cameradialog.h        |  4 ++--
 .../ext/launcher/include/profile/deltatimesdialog.h    |  4 ++--
 .../ext/launcher/include/profile/marknodesdialog.h     |  4 ++--
 .../ext/launcher/include/profile/metadialog.h          |  4 ++--
 .../ext/launcher/include/profile/modulesdialog.h       |  2 +-
 .../ext/launcher/include/sgctedit/displaywindowunion.h |  6 +++---
 ext/ghoul                                              |  2 +-
 include/openspace/scene/scenegraphnode.h               |  7 ++++---
 modules/audio/audiomodule.h                            |  5 +++--
 modules/digitaluniverse/digitaluniversemodule.cpp      |  2 --
 modules/digitaluniverse/digitaluniversemodule.h        |  2 --
 src/scene/scenegraphnode.cpp                           | 10 ++--------
 15 files changed, 29 insertions(+), 37 deletions(-)

diff --git a/apps/OpenSpace/ext/launcher/include/filesystemaccess.h b/apps/OpenSpace/ext/launcher/include/filesystemaccess.h
index 3113335234..5f5d593598 100644
--- a/apps/OpenSpace/ext/launcher/include/filesystemaccess.h
+++ b/apps/OpenSpace/ext/launcher/include/filesystemaccess.h
@@ -44,7 +44,7 @@ public:
         bool useCheckboxes);
 
     /**
-     * Function that uses the #QtFileSystemModel class to search the given directory.
+     * Function that uses the QtFileSystemModel class to search the given directory.
      *
      * \param dir The directory from which to start the search from
      */
diff --git a/apps/OpenSpace/ext/launcher/include/launcherwindow.h b/apps/OpenSpace/ext/launcher/include/launcherwindow.h
index 6ea2a689f7..c622fa325f 100644
--- a/apps/OpenSpace/ext/launcher/include/launcherwindow.h
+++ b/apps/OpenSpace/ext/launcher/include/launcherwindow.h
@@ -51,8 +51,8 @@ public:
      * \param sgctConfigEnabled `true` if window selection combo box will be enabled
      * \param sgctConfigName The name of the sgct configuration function used to generate
      *        window config (blank if file is used)
-     * \param parentItem The parent that contains this (and possibly other) children
-     *                   in the tree structure.
+     * \param parent The parent that contains this (and possibly other) children in the
+     *        tree structure.
      */
     LauncherWindow(bool profileEnabled, const openspace::Configuration& globalConfig,
         bool sgctConfigEnabled, std::string sgctConfigName, QWidget* parent);
diff --git a/apps/OpenSpace/ext/launcher/include/profile/assettreemodel.h b/apps/OpenSpace/ext/launcher/include/profile/assettreemodel.h
index f3317192e5..3e01675759 100644
--- a/apps/OpenSpace/ext/launcher/include/profile/assettreemodel.h
+++ b/apps/OpenSpace/ext/launcher/include/profile/assettreemodel.h
@@ -59,7 +59,7 @@ public:
         int role = Qt::DisplayRole) const final;
 
     /**
-      * Returns the index of item in #QModelIndex object form.
+      * Returns the index of item in QModelIndex object form.
       *
       * \param row The row number
       * \param column The column number
@@ -116,7 +116,7 @@ public:
       * Return the Qt flags of the item specified by index, which can include
       * Qt::ItemIsEnabled, Qt::ItemIsSelectable.
       *
-      * \param index The index specified by the #QModelIndex index
+      * \param index The index specified by the QModelIndex index
       * \return The Qt flags
       */
     Qt::ItemFlags flags(const QModelIndex& index) const final;
@@ -125,7 +125,7 @@ public:
       * Set data at index \p index.
       *
       * \param index Location of the item to set
-      * \param value The #QVariant data element to store at column \p column
+      * \param value The QVariant data element to store at column \p column
       * \param role Qt-specific role to define context of the call
       * \return `true` if the data set was successful
       */
@@ -133,7 +133,7 @@ public:
         int role = Qt::EditRole) final;
 
     /**
-      * Returns a vector of all #Assets selected in the tree view.
+      * Returns a vector of all #Asset%s selected in the tree view.
       *
       * \param outputPaths The vector of paths that were selected
       * \param outputItems The vector of AssetTreeItem that were selected
diff --git a/apps/OpenSpace/ext/launcher/include/profile/cameradialog.h b/apps/OpenSpace/ext/launcher/include/profile/cameradialog.h
index 79e20b661e..54fb9cb2b1 100644
--- a/apps/OpenSpace/ext/launcher/include/profile/cameradialog.h
+++ b/apps/OpenSpace/ext/launcher/include/profile/cameradialog.h
@@ -41,8 +41,8 @@ public:
      * Constructor for camera gui class
      *
      * \param parent Pointer to parent Qt widget
-     * \param profile The #openspace::Profile::CameraType object containing all data of
-     *        the new or imported profile
+     * \param camera The #openspace::Profile::CameraType object containing all data of the
+     *        new or imported profile
      */
     CameraDialog(QWidget* parent, std::optional<openspace::Profile::CameraType>* camera);
 
diff --git a/apps/OpenSpace/ext/launcher/include/profile/deltatimesdialog.h b/apps/OpenSpace/ext/launcher/include/profile/deltatimesdialog.h
index d6fd44fa1f..ed5b57e66d 100644
--- a/apps/OpenSpace/ext/launcher/include/profile/deltatimesdialog.h
+++ b/apps/OpenSpace/ext/launcher/include/profile/deltatimesdialog.h
@@ -40,8 +40,8 @@ public:
      * Constructor for deltaTimes class.
      *
      * \param parent Pointer to parent Qt widget
-     * \param profile The list of delta times containing all data of the new or imported
-     *        profile
+     * \param deltaTimes The list of delta times containing all data of the new or
+     *        imported profile
      */
     DeltaTimesDialog(QWidget* parent, std::vector<double>* deltaTimes);
 
diff --git a/apps/OpenSpace/ext/launcher/include/profile/marknodesdialog.h b/apps/OpenSpace/ext/launcher/include/profile/marknodesdialog.h
index 35e3fff8e0..963631e4f1 100644
--- a/apps/OpenSpace/ext/launcher/include/profile/marknodesdialog.h
+++ b/apps/OpenSpace/ext/launcher/include/profile/marknodesdialog.h
@@ -39,8 +39,8 @@ public:
      * Constructor for markNodes class.
      *
      * \param parent Pointer to parent Qt widget
-     * \param profile The list of marked nodes containing all data of the new or imported
-     *        profile
+     * \param markedNodes The list of marked nodes containing all data of the new or
+     *        imported profile
      */
     MarkNodesDialog(QWidget* parent, std::vector<std::string>* markedNodes);
 
diff --git a/apps/OpenSpace/ext/launcher/include/profile/metadialog.h b/apps/OpenSpace/ext/launcher/include/profile/metadialog.h
index 600d79f399..40d151e978 100644
--- a/apps/OpenSpace/ext/launcher/include/profile/metadialog.h
+++ b/apps/OpenSpace/ext/launcher/include/profile/metadialog.h
@@ -40,8 +40,8 @@ public:
     * Constructor for meta class.
     *
     * \param parent Pointer to parent Qt widget
-    * \param profile The #openspace::Profile::Meta object containing all data of the
-    *        new or imported profile
+    * \param meta The #openspace::Profile::Meta object containing all data of the new or
+    *        imported profile
     */
     MetaDialog(QWidget* parent, std::optional<openspace::Profile::Meta>* meta);
 
diff --git a/apps/OpenSpace/ext/launcher/include/profile/modulesdialog.h b/apps/OpenSpace/ext/launcher/include/profile/modulesdialog.h
index 45b232e97b..14002476b8 100644
--- a/apps/OpenSpace/ext/launcher/include/profile/modulesdialog.h
+++ b/apps/OpenSpace/ext/launcher/include/profile/modulesdialog.h
@@ -42,7 +42,7 @@ public:
      * Constructor for modules class.
      *
      * \param parent Pointer to parent Qt widget
-     * \param profile The #openspace::Profile::Module object containing all data of the
+     * \param modules The #openspace::Profile::Module object containing all data of the
      *        new or imported profile
      */
     ModulesDialog(QWidget* parent, std::vector<openspace::Profile::Module>* modules);
diff --git a/apps/OpenSpace/ext/launcher/include/sgctedit/displaywindowunion.h b/apps/OpenSpace/ext/launcher/include/sgctedit/displaywindowunion.h
index 2d41e61039..19311f452f 100644
--- a/apps/OpenSpace/ext/launcher/include/sgctedit/displaywindowunion.h
+++ b/apps/OpenSpace/ext/launcher/include/sgctedit/displaywindowunion.h
@@ -45,9 +45,9 @@ public:
      *        each monitor
      * \param nMaxWindows The maximum number of windows allowed (depends on the number of
      *        monitors in the system)
-     * \param winColors An array of QColor objects for window colors. The indexing of this
-     *        array matches the window indexing used elsewhere in the class. This allows
-     *        for a unique color for each window
+     * \param windowColors An array of QColor objects for window colors. The indexing of
+     *        this array matches the window indexing used elsewhere in the class. This
+     *        allows for a unique color for each window
      * \param resetToDefault If set to true, all display and window settings will be
      *        initialized to their default values
      * \param parent The parent to which this widget belongs
diff --git a/ext/ghoul b/ext/ghoul
index e5ebfd2288..47565ecda4 160000
--- a/ext/ghoul
+++ b/ext/ghoul
@@ -1 +1 @@
-Subproject commit e5ebfd228894448ab15e9be9bac9a7ba274c2355
+Subproject commit 47565ecda4877077831b80eb9c16a38ad9f7e18b
diff --git a/include/openspace/scene/scenegraphnode.h b/include/openspace/scene/scenegraphnode.h
index edb3a9558f..7e35625d82 100644
--- a/include/openspace/scene/scenegraphnode.h
+++ b/include/openspace/scene/scenegraphnode.h
@@ -90,8 +90,6 @@ public:
     void deinitialize();
     void deinitializeGL();
 
-    void traversePreOrder(const std::function<void(SceneGraphNode*)>& fn);
-    void traversePostOrder(const std::function<void(SceneGraphNode*)>& fn);
     void update(const UpdateData& data);
     void render(const RenderData& data, RendererTasks& tasks);
 
@@ -152,6 +150,9 @@ public:
     static documentation::Documentation Documentation();
 
 private:
+    void traversePreOrder(const std::function<void(SceneGraphNode*)>& fn);
+    void traversePostOrder(const std::function<void(SceneGraphNode*)>& fn);
+
     glm::dvec3 calculateWorldPosition() const;
     glm::dmat3 calculateWorldRotation() const;
     glm::dvec3 calculateWorldScale() const;
@@ -179,8 +180,8 @@ private:
     properties::StringProperty _guiPath;
     properties::StringProperty _guiDisplayName;
     properties::StringProperty _guiDescription;
-    properties::FloatProperty _guiOrderingNumber;
     properties::BoolProperty _useGuiOrdering;
+    properties::FloatProperty _guiOrderingNumber;
 
     // Transformation defined by translation, rotation and scale
     struct {
diff --git a/modules/audio/audiomodule.h b/modules/audio/audiomodule.h
index 7ff817124c..943abfe08e 100644
--- a/modules/audio/audiomodule.h
+++ b/modules/audio/audiomodule.h
@@ -219,7 +219,8 @@ public:
      * The \p identifier must be a name for a sound that was started through the
      * #playAudio3d function.
      *
-     * \param handle A valid handle for a track started through the #playAudio3d function
+     * \param identifier The identifier of a track started through the #playAudio3d
+     *        function
      * \param position The new position from which the track originates
      */
     void set3dSourcePosition(const std::string& identifier,
@@ -272,7 +273,7 @@ public:
 
     /**
      * Sets the position of the speaker for the provided \p channel to the provided
-     * \position. In general, this is considered an advanced feature to accommodate
+     * \p position. In general, this is considered an advanced feature to accommodate
      * non-standard audio environments.
      *
      * \param channel The channel whose speaker's position should be changed
diff --git a/modules/digitaluniverse/digitaluniversemodule.cpp b/modules/digitaluniverse/digitaluniversemodule.cpp
index 03d69f996e..818ef9a7d1 100644
--- a/modules/digitaluniverse/digitaluniversemodule.cpp
+++ b/modules/digitaluniverse/digitaluniversemodule.cpp
@@ -34,7 +34,6 @@
 namespace openspace {
 
 ghoul::opengl::ProgramObjectManager DigitalUniverseModule::ProgramObjectManager;
-ghoul::opengl::TextureManager DigitalUniverseModule::TextureManager;
 
 DigitalUniverseModule::DigitalUniverseModule()
     : OpenSpaceModule(DigitalUniverseModule::Name)
@@ -50,7 +49,6 @@ void DigitalUniverseModule::internalInitialize(const ghoul::Dictionary&) {
 
 void DigitalUniverseModule::internalDeinitializeGL() {
     ProgramObjectManager.releaseAll(ghoul::opengl::ProgramObjectManager::Warnings::Yes);
-    TextureManager.releaseAll(ghoul::opengl::TextureManager::Warnings::Yes);
 }
 
 std::vector<documentation::Documentation> DigitalUniverseModule::documentations() const {
diff --git a/modules/digitaluniverse/digitaluniversemodule.h b/modules/digitaluniverse/digitaluniversemodule.h
index 51b17d457e..0734edb0f4 100644
--- a/modules/digitaluniverse/digitaluniversemodule.h
+++ b/modules/digitaluniverse/digitaluniversemodule.h
@@ -28,7 +28,6 @@
 #include <openspace/util/openspacemodule.h>
 
 #include <ghoul/opengl/programobjectmanager.h>
-#include <ghoul/opengl/texturemanager.h>
 
 namespace openspace {
 
@@ -41,7 +40,6 @@ public:
     std::vector<documentation::Documentation> documentations() const override;
 
     static ghoul::opengl::ProgramObjectManager ProgramObjectManager;
-    static ghoul::opengl::TextureManager TextureManager;
 
 protected:
     void internalInitialize(const ghoul::Dictionary&) override;
diff --git a/src/scene/scenegraphnode.cpp b/src/scene/scenegraphnode.cpp
index 55f8064813..e74ea97172 100644
--- a/src/scene/scenegraphnode.cpp
+++ b/src/scene/scenegraphnode.cpp
@@ -456,9 +456,6 @@ ghoul::mm_unique_ptr<SceneGraphNode> SceneGraphNode::createFromDictionary(
         ghoul_assert(result->_renderable, "Failed to create Renderable");
         result->_renderable->_parent = result.get();
         result->addPropertySubOwner(result->_renderable.get());
-        //LDEBUG(std::format(
-        //    "Successfully created renderable for '{}'", result->identifier()
-        //));
     }
 
     // Extracting the actions from the dictionary
@@ -512,16 +509,13 @@ ghoul::mm_unique_ptr<SceneGraphNode> SceneGraphNode::createFromDictionary(
         if (std::holds_alternative<std::string>(*p.tag)) {
             result->addTag(std::get<std::string>(*p.tag));
         }
-        else if (std::holds_alternative<std::vector<std::string>>(*p.tag)) {
+        else {
             for (const std::string& tag : std::get<std::vector<std::string>>(*p.tag)) {
                 if (!tag.empty()) {
                     result->addTag(tag);
                 }
             }
         }
-        else {
-            throw ghoul::MissingCaseException();
-        }
     }
 
     LDEBUG(std::format("Successfully created SceneGraphNode '{}'", result->identifier()));
@@ -543,8 +537,8 @@ SceneGraphNode::SceneGraphNode()
     , _guiPath(GuiPathInfo, "/")
     , _guiDisplayName(GuiNameInfo)
     , _guiDescription(GuiDescriptionInfo)
-    , _guiOrderingNumber(GuiOrderInfo, 0.f)
     , _useGuiOrdering(UseGuiOrderInfo, false)
+    , _guiOrderingNumber(GuiOrderInfo, 0.f)
     , _transform {
         ghoul::mm_unique_ptr<Translation>(
             global::memoryManager->PersistentMemory.alloc<StaticTranslation>()

From a7c11b4de9cad0241e2b1f055b538a5517530bc6 Mon Sep 17 00:00:00 2001
From: Emma Broman <emma.broman@liu.se>
Date: Thu, 29 Aug 2024 09:30:33 +0200
Subject: [PATCH 610/701] Make empty dictionary convert into an empty json
 object and not undefined

Fixes a crash in the GUI when no gui order was set, e.g. in the empty profile
---
 modules/server/src/jsonconverters.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/server/src/jsonconverters.cpp b/modules/server/src/jsonconverters.cpp
index 37065ed7f8..174ae80140 100644
--- a/modules/server/src/jsonconverters.cpp
+++ b/modules/server/src/jsonconverters.cpp
@@ -72,7 +72,7 @@ void to_json(json& j, const PropertyOwner* p) {
 namespace ghoul {
 
 void to_json(json& j, const Dictionary& d) {
-    json object;
+    json object = json::object();
     for (const std::string_view k : d.keys()) {
         const std::string key = std::string(k);
         if (d.hasValue<glm::dvec4>(key)) {

From 311c69cc7a5d11fb3efeb674cd0a3a3b8b9f8b56 Mon Sep 17 00:00:00 2001
From: Emma Broman <emma.broman@liu.se>
Date: Thu, 29 Aug 2024 09:41:58 +0200
Subject: [PATCH 611/701] Update GUI hash

For a couple of small fixes. Non-breaking
---
 data/assets/util/webgui.asset | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/data/assets/util/webgui.asset b/data/assets/util/webgui.asset
index f8ae2d62fa..5c2318946f 100644
--- a/data/assets/util/webgui.asset
+++ b/data/assets/util/webgui.asset
@@ -4,7 +4,7 @@ local guiCustomization = asset.require("customization/gui")
 
 
 -- Select which commit hashes to use for the frontend and backend
-local frontendHash = "cb4c80198d15caf410f5f8bb2c310339793d5747"
+local frontendHash = "5a58a3ca0215b6dc264e985ab321a75d51e4a8e5"
 
 local frontend = asset.resource({
   Identifier = "WebGuiFrontend",

From ed39d4fc68c18f4ed363308afe0d508fb3b91b9a Mon Sep 17 00:00:00 2001
From: Joakim Kilby <jockekilby@gmail.com>
Date: Fri, 30 Aug 2024 10:25:38 +0200
Subject: [PATCH 612/701] Add possibility to capture, edit & replay
 camera-keyframes (#2785)

* Add possibility to capture, edit & replay camera-keyframes

* fix compilation on non-windows systems

* use cbegin/cend instead of std::views

* Coding style adaptions

* Member variable names

* add Keyframe struct, fix pr suggestions

* add function to remove keyframes

* add lua function to fetch keyframes

* Update lua documentation

* add constexpr keys for json entries

* Add log info messages, input checks and general pr suggestions

* update comments to doxygen style

* batch of pr suggestions

* add jump to keyframe function

* update docs

---------

Co-authored-by: Alexander Bock <mail@alexanderbock.eu>
Co-authored-by: Alexander Bock <alexander.bock@liu.se>
Co-authored-by: Andreas Engberg <adde.engberg@gmail.com>
---
 include/openspace/engine/globals.h            |   2 +
 .../openspace/interaction/keyframerecording.h |  84 ++++
 src/CMakeLists.txt                            |   3 +
 src/documentation/core_registration.cpp       |   2 +
 src/engine/globals.cpp                        |  18 +
 src/engine/openspaceengine.cpp                |   2 +
 src/interaction/keyframerecording.cpp         | 430 ++++++++++++++++++
 src/interaction/keyframerecording_lua.inl     | 190 ++++++++
 8 files changed, 731 insertions(+)
 create mode 100644 include/openspace/interaction/keyframerecording.h
 create mode 100644 src/interaction/keyframerecording.cpp
 create mode 100644 src/interaction/keyframerecording_lua.inl

diff --git a/include/openspace/engine/globals.h b/include/openspace/engine/globals.h
index e94c3caeab..df8fa1f578 100644
--- a/include/openspace/engine/globals.h
+++ b/include/openspace/engine/globals.h
@@ -57,6 +57,7 @@ namespace interaction {
     class ActionManager;
     class InteractionMonitor;
     class KeybindingManager;
+    class KeyframeRecording;
     class NavigationHandler;
     class SessionRecording;
 } // namespace interaction
@@ -93,6 +94,7 @@ inline interaction::InteractionMonitor* interactionMonitor;
 inline interaction::JoystickInputStates* joystickInputStates;
 inline interaction::WebsocketInputStates* websocketInputStates;
 inline interaction::KeybindingManager* keybindingManager;
+inline interaction::KeyframeRecording* keyframeRecording;
 inline interaction::NavigationHandler* navigationHandler;
 inline interaction::SessionRecording* sessionRecording;
 inline properties::PropertyOwner* rootPropertyOwner;
diff --git a/include/openspace/interaction/keyframerecording.h b/include/openspace/interaction/keyframerecording.h
new file mode 100644
index 0000000000..48adef6542
--- /dev/null
+++ b/include/openspace/interaction/keyframerecording.h
@@ -0,0 +1,84 @@
+/*****************************************************************************************
+ *                                                                                       *
+ * OpenSpace                                                                             *
+ *                                                                                       *
+ * Copyright (c) 2014-2024                                                               *
+ *                                                                                       *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
+ * software and associated documentation files (the "Software"), to deal in the Software *
+ * without restriction, including without limitation the rights to use, copy, modify,    *
+ * merge, publish, distribute, sublicense, and/or sell copies of the Software, and to    *
+ * permit persons to whom the Software is furnished to do so, subject to the following   *
+ * conditions:                                                                           *
+ *                                                                                       *
+ * The above copyright notice and this permission notice shall be included in all copies *
+ * or substantial portions of the Software.                                              *
+ *                                                                                       *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED,   *
+ * INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A         *
+ * PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT    *
+ * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF  *
+ * CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE  *
+ * OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                                         *
+ ****************************************************************************************/
+
+#ifndef __OPENSPACE_CORE___KEYFRAMERECORDING___H__
+#define __OPENSPACE_CORE___KEYFRAMERECORDING___H__
+
+#include <openspace/navigation/keyframenavigator.h>
+#include <openspace/properties/propertyowner.h>
+#include <openspace/scripting/lualibrary.h>
+#include <json/json.hpp>
+#include <string>
+#include <vector>
+
+namespace openspace::interaction {
+
+class KeyframeRecording : public properties::PropertyOwner {
+public:
+    struct Keyframe {
+        struct TimeStamp {
+            double application;
+            double sequenceTime;
+            double simulation;
+        };
+
+        KeyframeNavigator::CameraPose camera;
+        TimeStamp timestamp;
+    };
+
+    KeyframeRecording();
+
+    void newSequence();
+    void addKeyframe(double sequenceTime);
+    void removeKeyframe(int index);
+    void updateKeyframe(int index);
+    void moveKeyframe(int index, double sequenceTime);
+    bool saveSequence(std::optional<std::string> filename);
+    void loadSequence(std::string filename);
+    void preSynchronization(double dt);
+    void play();
+    void pause();
+    void setSequenceTime(double sequenceTime);
+    void jumpToKeyframe(int index);
+    bool hasKeyframeRecording() const;
+    std::vector<ghoul::Dictionary> keyframes() const;
+
+    static openspace::scripting::LuaLibrary luaLibrary();
+
+private:
+    void sortKeyframes();
+
+    Keyframe newKeyframe(double sequenceTime);
+    bool isInRange(int index) const;
+
+    std::vector<Keyframe> _keyframes;
+    std::string _filename;
+    bool _isPlaying = false;
+    bool _hasStateChanged = false;
+    double _sequenceTime = 0.0;
+};
+
+} // namespace openspace
+
+#endif // __OPENSPACE_CORE___KEYFRAMERECORDING___H__
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 5ea8e03999..5e7829ba07 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -58,6 +58,8 @@ set(OPENSPACE_SOURCE
   interaction/joystickcamerastates.cpp
   interaction/keybindingmanager.cpp
   interaction/keybindingmanager_lua.inl
+  interaction/keyframerecording.cpp
+  interaction/keyframerecording_lua.inl
   interaction/keyboardinputstate.cpp
   interaction/mousecamerastates.cpp
   interaction/scriptcamerastates.cpp
@@ -250,6 +252,7 @@ set(OPENSPACE_HEADER
   ${PROJECT_SOURCE_DIR}/include/openspace/interaction/joystickcamerastates.h
   ${PROJECT_SOURCE_DIR}/include/openspace/interaction/keybindingmanager.h
   ${PROJECT_SOURCE_DIR}/include/openspace/interaction/keyboardinputstate.h
+  ${PROJECT_SOURCE_DIR}/include/openspace/interaction/keyframerecording.h
   ${PROJECT_SOURCE_DIR}/include/openspace/interaction/mousecamerastates.h
   ${PROJECT_SOURCE_DIR}/include/openspace/interaction/scriptcamerastates.h
   ${PROJECT_SOURCE_DIR}/include/openspace/interaction/sessionrecording.h
diff --git a/src/documentation/core_registration.cpp b/src/documentation/core_registration.cpp
index 3c0138453c..ff209ccca3 100644
--- a/src/documentation/core_registration.cpp
+++ b/src/documentation/core_registration.cpp
@@ -32,6 +32,7 @@
 #include <openspace/events/eventengine.h>
 #include <openspace/interaction/actionmanager.h>
 #include <openspace/interaction/keybindingmanager.h>
+#include <openspace/interaction/keyframerecording.h>
 #include <openspace/interaction/sessionrecording.h>
 #include <openspace/mission/mission.h>
 #include <openspace/mission/missionmanager.h>
@@ -106,6 +107,7 @@ void registerCoreClasses(scripting::ScriptEngine& engine) {
     engine.addLibrary(Time::luaLibrary());
     engine.addLibrary(interaction::ActionManager::luaLibrary());
     engine.addLibrary(interaction::KeybindingManager::luaLibrary());
+    engine.addLibrary(interaction::KeyframeRecording::luaLibrary());
     engine.addLibrary(interaction::NavigationHandler::luaLibrary());
     engine.addLibrary(interaction::OrbitalNavigator::luaLibrary());
     engine.addLibrary(interaction::PathNavigator::luaLibrary());
diff --git a/src/engine/globals.cpp b/src/engine/globals.cpp
index 20be3a5305..d9be116dc5 100644
--- a/src/engine/globals.cpp
+++ b/src/engine/globals.cpp
@@ -35,6 +35,7 @@
 #include <openspace/interaction/actionmanager.h>
 #include <openspace/interaction/interactionmonitor.h>
 #include <openspace/interaction/keybindingmanager.h>
+#include <openspace/interaction/keyframerecording.h>
 #include <openspace/interaction/joystickinputstate.h>
 #include <openspace/interaction/websocketinputstate.h>
 #include <openspace/interaction/sessionrecording.h>
@@ -95,6 +96,7 @@ namespace {
         sizeof(interaction::JoystickInputStates) +
         sizeof(interaction::WebsocketInputStates) +
         sizeof(interaction::KeybindingManager) +
+        sizeof(interaction::KeyframeRecording) +
         sizeof(interaction::NavigationHandler) +
         sizeof(interaction::SessionRecording) +
         sizeof(properties::PropertyOwner) +
@@ -314,6 +316,14 @@ void create() {
     keybindingManager = new interaction::KeybindingManager;
 #endif // WIN32
 
+#ifdef WIN32
+    keyframeRecording = new (currentPos) interaction::KeyframeRecording;
+    ghoul_assert(keyframeRecording, "No keyframeRecording");
+    currentPos += sizeof(interaction::KeyframeRecording);
+#else // ^^^ WIN32 / !WIN32 vvv
+    keyframeRecording = new interaction::KeyframeRecording;
+#endif // WIN32
+
 #ifdef WIN32
     navigationHandler = new (currentPos) interaction::NavigationHandler;
     ghoul_assert(navigationHandler, "No navigationHandler");
@@ -387,6 +397,7 @@ void initialize() {
 
     // New property subowners also have to be added to the ImGuiModule callback!
     rootPropertyOwner->addPropertySubOwner(global::navigationHandler);
+    rootPropertyOwner->addPropertySubOwner(global::keyframeRecording);
     rootPropertyOwner->addPropertySubOwner(global::interactionMonitor);
     rootPropertyOwner->addPropertySubOwner(global::sessionRecording);
     rootPropertyOwner->addPropertySubOwner(global::timeManager);
@@ -459,6 +470,13 @@ void destroy() {
     delete navigationHandler;
 #endif // WIN32
 
+    LDEBUGC("Globals", "Destroying 'KeyframeRecording'");
+#ifdef WIN32
+    keyframeRecording->~KeyframeRecording();
+#else // ^^^ WIN32 / !WIN32 vvv
+    delete keyframeRecording;
+#endif // WIN32
+
     LDEBUGC("Globals", "Destroying 'KeybindingManager'");
 #ifdef WIN32
     keybindingManager->~KeybindingManager();
diff --git a/src/engine/openspaceengine.cpp b/src/engine/openspaceengine.cpp
index 17a7e5f5f7..a8aa17ce70 100644
--- a/src/engine/openspaceengine.cpp
+++ b/src/engine/openspaceengine.cpp
@@ -40,6 +40,7 @@
 #include <openspace/interaction/actionmanager.h>
 #include <openspace/interaction/interactionmonitor.h>
 #include <openspace/interaction/keybindingmanager.h>
+#include <openspace/interaction/keyframerecording.h>
 #include <openspace/interaction/sessionrecording.h>
 #include <openspace/navigation/navigationhandler.h>
 #include <openspace/navigation/orbitalnavigator.h>
@@ -1036,6 +1037,7 @@ void OpenSpaceEngine::preSynchronization() {
             }
         }
         global::sessionRecording->preSynchronization();
+        global::keyframeRecording->preSynchronization(dt);
         global::parallelPeer->preSynchronization();
         global::interactionMonitor->updateActivityState();
     }
diff --git a/src/interaction/keyframerecording.cpp b/src/interaction/keyframerecording.cpp
new file mode 100644
index 0000000000..bdc3919dc3
--- /dev/null
+++ b/src/interaction/keyframerecording.cpp
@@ -0,0 +1,430 @@
+/*****************************************************************************************
+ *                                                                                       *
+ * OpenSpace                                                                             *
+ *                                                                                       *
+ * Copyright (c) 2014-2024                                                               *
+ *                                                                                       *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
+ * software and associated documentation files (the "Software"), to deal in the Software *
+ * without restriction, including without limitation the rights to use, copy, modify,    *
+ * merge, publish, distribute, sublicense, and/or sell copies of the Software, and to    *
+ * permit persons to whom the Software is furnished to do so, subject to the following   *
+ * conditions:                                                                           *
+ *                                                                                       *
+ * The above copyright notice and this permission notice shall be included in all copies *
+ * or substantial portions of the Software.                                              *
+ *                                                                                       *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED,   *
+ * INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A         *
+ * PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT    *
+ * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF  *
+ * CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE  *
+ * OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                                         *
+ ****************************************************************************************/
+
+#include <openspace/interaction/keyframerecording.h>
+
+#include <openspace/camera/camera.h>
+#include <openspace/engine/globals.h>
+#include <openspace/engine/windowdelegate.h>
+#include <openspace/navigation/navigationhandler.h>
+#include <openspace/navigation/orbitalnavigator.h>
+#include <openspace/scene/scene.h>
+#include <openspace/scene/scenegraphnode.h>
+#include <openspace/util/timemanager.h>
+#include <ghoul/filesystem/filesystem.h>
+#include <ghoul/glm.h>
+#include <algorithm>
+#include <iostream>
+
+#include "keyframerecording_lua.inl"
+
+namespace {
+    constexpr std::string_view _loggerCat = "KeyframeRecording";
+} // namespace
+
+namespace openspace::interaction::keys {
+    // These keys are const char* since nlohmann::json do not support string_view in .at()
+    constexpr const char* Camera = "camera";
+    constexpr const char* Position = "position";
+    constexpr const char* Rotation = "rotation";
+    constexpr const char* Scale = "scale";
+    constexpr const char* FollowFocusNodeRotation = "followFocusNodeRotation";
+    constexpr const char* FocusNode = "focusNode";
+
+    constexpr const char* Timestamp = "timestamp";
+    constexpr const char* Application = "application";
+    constexpr const char* Sequence = "sequence";
+    constexpr const char* Simulation = "simulation";
+    constexpr const char* X = "x";
+    constexpr const char* Y = "y";
+    constexpr const char* Z = "z";
+    constexpr const char* W = "w";
+}
+
+namespace openspace::interaction {
+
+void to_json(nlohmann::json& j, const KeyframeRecording::Keyframe& keyframe) {
+    nlohmann::json position = {
+        { keys::X, keyframe.camera.position.x },
+        { keys::Y, keyframe.camera.position.y },
+        { keys::Z, keyframe.camera.position.z },
+    };
+    nlohmann::json rotation = {
+        { keys::X, keyframe.camera.rotation.x },
+        { keys::Y, keyframe.camera.rotation.y },
+        { keys::Z, keyframe.camera.rotation.z },
+        { keys::W, keyframe.camera.rotation.w },
+    };
+    nlohmann::json camera = {
+        { keys::Position, position },
+        { keys::Rotation, rotation },
+        { keys::Scale, keyframe.camera.scale },
+        { keys::FollowFocusNodeRotation, keyframe.camera.followFocusNodeRotation },
+        { keys::FocusNode, keyframe.camera.focusNode }
+    };
+
+    nlohmann::json timestamp = {
+        { keys::Application, keyframe.timestamp.application },
+        { keys::Sequence, keyframe.timestamp.sequenceTime },
+        { keys::Simulation, keyframe.timestamp.simulation }
+    };
+
+    j = {
+        { keys::Camera, camera },
+        { keys::Timestamp, timestamp }
+    };
+}
+
+void from_json(const nlohmann::json& j, KeyframeRecording::Keyframe::TimeStamp& ts) {
+    j.at(keys::Application).get_to(ts.application);
+    j.at(keys::Sequence).get_to(ts.sequenceTime);
+    j.at(keys::Simulation).get_to(ts.simulation);
+}
+
+void from_json(const nlohmann::json& j, KeyframeNavigator::CameraPose& pose) {
+    j.at(keys::Position).at(keys::X).get_to(pose.position.x);
+    j.at(keys::Position).at(keys::Y).get_to(pose.position.y);
+    j.at(keys::Position).at(keys::Z).get_to(pose.position.z);
+
+    j.at(keys::Rotation).at(keys::X).get_to(pose.rotation.x);
+    j.at(keys::Rotation).at(keys::Y).get_to(pose.rotation.y);
+    j.at(keys::Rotation).at(keys::Z).get_to(pose.rotation.z);
+    j.at(keys::Rotation).at(keys::W).get_to(pose.rotation.w);
+
+    j.at(keys::FocusNode).get_to(pose.focusNode);
+    j.at(keys::Scale).get_to(pose.scale);
+    j.at(keys::FollowFocusNodeRotation).get_to(pose.followFocusNodeRotation);
+}
+
+void from_json(const nlohmann::json& j, KeyframeRecording::Keyframe& keyframe) {
+    j.at(keys::Camera).get_to(keyframe.camera);
+    j.at(keys::Timestamp).get_to(keyframe.timestamp);
+}
+
+KeyframeRecording::KeyframeRecording()
+    : properties::PropertyOwner({ "KeyframeRecording", "Keyframe Recording" })
+{}
+
+void KeyframeRecording::newSequence() {
+    _keyframes.clear();
+    _filename.clear();
+    LINFO("Created new sequence");
+}
+
+void KeyframeRecording::addKeyframe(double sequenceTime) {
+    ghoul_assert(sequenceTime >= 0, "Sequence time must be positive");
+
+    Keyframe keyframe = newKeyframe(sequenceTime);
+
+    auto it = std::find_if(
+        _keyframes.begin(),
+        _keyframes.end(),
+        [&sequenceTime](const Keyframe& entry) {
+            return sequenceTime < entry.timestamp.sequenceTime;
+        }
+    );
+    _keyframes.insert(it, keyframe);
+    LINFO(std::format(
+        "Added new keyframe {} at time: {}",
+        _keyframes.size() - 1 , sequenceTime
+    ));
+}
+
+void KeyframeRecording::removeKeyframe(int index) {
+    ghoul_assert(hasKeyframeRecording(), "Can't remove keyframe on empty sequence");
+
+    if (!isInRange(index)) {
+        LERROR(std::format("Index {} out of range", index));
+        return;
+    }
+    _keyframes.erase(_keyframes.begin() + index);
+    LINFO(std::format("Removed keyframe with index {}", index));
+}
+
+void KeyframeRecording::updateKeyframe(int index) {
+    ghoul_assert(hasKeyframeRecording(), "Can't update keyframe on empty sequence");
+
+    if (!isInRange(index)) {
+        LERROR(std::format("Index {} out of range", index));
+        return;
+    }
+    Keyframe old = _keyframes[index];
+    _keyframes[index] = newKeyframe(old.timestamp.sequenceTime);
+     LINFO(std::format("Update camera position of keyframe {}", index));
+}
+
+void KeyframeRecording::moveKeyframe(int index, double sequenceTime) {
+    ghoul_assert(hasKeyframeRecording(), "can't move keyframe on empty sequence");
+    ghoul_assert(sequenceTime >= 0, "Sequence time must be positive");
+
+    if (!isInRange(index)) {
+        LERROR(std::format("Index {} out of range", index));
+        return;
+    }
+    double oldSequenceTime = _keyframes[index].timestamp.sequenceTime;
+    _keyframes[index].timestamp.sequenceTime = sequenceTime;
+    sortKeyframes();
+    LINFO(std::format(
+        "Moved keyframe {} from sequence time: {} to {}",
+        index, oldSequenceTime, sequenceTime
+    ));
+}
+
+bool KeyframeRecording::saveSequence(std::optional<std::string> filename) {
+    ghoul_assert(hasKeyframeRecording(), "Keyframe sequence can't be empty");
+
+    // If we didn't specify any filename we save the one we currently have stored
+    if (filename.has_value()) {
+        _filename = filename.value();
+    }
+
+    if (_filename.empty()) {
+        LERROR("Failed to save file, reason: Invalid empty file name");
+        return false;
+    }
+
+    nlohmann::json sequence = _keyframes;
+    std::filesystem::path path = absPath(
+        std::format("${{RECORDINGS}}/{}.json", _filename)
+    );
+    std::ofstream ofs(path);
+    ofs << sequence.dump(2);
+    LINFO(std::format("Saved keyframe sequence to '{}'", path.string()));
+    return true;
+}
+
+void KeyframeRecording::loadSequence(std::string filename) {
+    std::filesystem::path path = absPath(
+        std::format("${{RECORDINGS}}/{}.json", filename)
+    );
+    if (!std::filesystem::exists(path)) {
+        LERROR(std::format("File '{}' does not exist", path));
+        return;
+    }
+
+    LINFO(std::format("Loading keyframe sequence from '{}'", path));
+    _keyframes.clear();
+    std::ifstream file(path);
+    std::vector<nlohmann::json> jsonKeyframes =
+        nlohmann::json::parse(file).get<std::vector<nlohmann::json>>();
+
+    for (const nlohmann::json& keyframeJson : jsonKeyframes) {
+        Keyframe keyframe = keyframeJson;
+        _keyframes.push_back(keyframe);
+    }
+    _filename = filename;
+}
+
+void KeyframeRecording::play() {
+    ghoul_assert(hasKeyframeRecording(), "Keyframe sequence can't be empty");
+
+    LINFO("Keyframe sequence playing");
+    _isPlaying = true;
+}
+
+void KeyframeRecording::pause() {
+    LINFO("Keyframe sequence paused");
+    _isPlaying = false;
+}
+
+void KeyframeRecording::setSequenceTime(double sequenceTime) {
+    ghoul_assert(sequenceTime >= 0, "Sequence time must be positive");
+
+    _sequenceTime = sequenceTime;
+    _hasStateChanged = true;
+    LINFO(std::format("Set sequence time to {}", sequenceTime));
+}
+
+void KeyframeRecording::jumpToKeyframe(int index) {
+    if (!isInRange(index)) {
+        LERROR(std::format("Index {} out of range", index));
+        return;
+    }
+    const double time = _keyframes[index].timestamp.sequenceTime;
+    LINFO(std::format("Jumped to keyframe {}", index));
+    setSequenceTime(time);
+}
+
+bool KeyframeRecording::hasKeyframeRecording() const {
+    return !_keyframes.empty();
+}
+
+std::vector<ghoul::Dictionary> KeyframeRecording::keyframes() const {
+    std::vector<ghoul::Dictionary> result;
+    for (const auto& keyframe : _keyframes) {
+        ghoul::Dictionary camera;
+        ghoul::Dictionary timestamp;
+        ghoul::Dictionary entry;
+        ghoul::Dictionary position;
+        ghoul::Dictionary rotation;
+
+        // Add each entry to position & rotation to avoid ambiguity on the client side
+        position.setValue(keys::X, keyframe.camera.position.x);
+        position.setValue(keys::Y, keyframe.camera.position.y);
+        position.setValue(keys::Z, keyframe.camera.position.z);
+        camera.setValue(keys::Position, position);
+
+        rotation.setValue(keys::X, static_cast<double>(keyframe.camera.rotation.x));
+        rotation.setValue(keys::Y, static_cast<double>(keyframe.camera.rotation.y));
+        rotation.setValue(keys::Z, static_cast<double>(keyframe.camera.rotation.z));
+        rotation.setValue(keys::W, static_cast<double>(keyframe.camera.rotation.w));
+        camera.setValue(keys::Rotation, rotation);
+
+        camera.setValue(keys::Scale, static_cast<double>(keyframe.camera.scale));
+        camera.setValue(keys::FocusNode, keyframe.camera.focusNode);
+        camera.setValue(keys::FollowFocusNodeRotation, keyframe.camera.followFocusNodeRotation);
+
+        timestamp.setValue(keys::Application, keyframe.timestamp.application);
+        timestamp.setValue(keys::Sequence, keyframe.timestamp.sequenceTime);
+        timestamp.setValue(keys::Simulation, keyframe.timestamp.simulation);
+
+        entry.setValue(keys::Camera, camera);
+        entry.setValue(keys::Timestamp, timestamp);
+        result.push_back(entry);
+    }
+    return result;
+}
+
+void KeyframeRecording::preSynchronization(double dt) {
+    if (_hasStateChanged) {
+        auto it = std::find_if(
+            _keyframes.rbegin(),
+            _keyframes.rend(),
+            [timestamp = _sequenceTime](const Keyframe& entry) {
+                return timestamp >= entry.timestamp.sequenceTime;
+            }
+        );
+
+        Keyframe currKeyframe;
+        Keyframe nextKeyframe;
+        double factor = 0.0;
+
+        // Before first keyframe
+        if (it == _keyframes.rend()) {
+            currKeyframe = nextKeyframe = _keyframes.front();
+        }
+        // At or after last keyframe
+        else if (it == _keyframes.rbegin()) {
+            currKeyframe = nextKeyframe = _keyframes.back();
+            _isPlaying = false;
+        }
+        else {
+            currKeyframe = *it;
+            nextKeyframe = *(--it);
+            double t0 = currKeyframe.timestamp.sequenceTime;
+            double t1 = nextKeyframe.timestamp.sequenceTime;
+            factor = (_sequenceTime - t0) / (t1 - t0);
+        }
+
+        interaction::KeyframeNavigator::CameraPose curr = currKeyframe.camera;
+        interaction::KeyframeNavigator::CameraPose next = nextKeyframe.camera;
+
+        Camera* camera = global::navigationHandler->camera();
+        Scene* scene = camera->parent()->scene();
+        SceneGraphNode* node = scene->sceneGraphNode(curr.focusNode);
+
+        global::navigationHandler->orbitalNavigator().setFocusNode(node);
+        bool success = interaction::KeyframeNavigator::updateCamera(
+            global::navigationHandler->camera(),
+            curr,
+            next,
+            factor,
+            false
+        );
+
+        _hasStateChanged = false;
+    }
+
+    if (_isPlaying) {
+        _sequenceTime += dt;
+        _hasStateChanged = true;
+    }
+}
+
+scripting::LuaLibrary KeyframeRecording::luaLibrary() {
+    return {
+        "keyframeRecording",
+        {
+            codegen::lua::NewSequence,
+            codegen::lua::AddKeyframe,
+            codegen::lua::RemoveKeyframe,
+            codegen::lua::UpdateKeyframe,
+            codegen::lua::MoveKeyframe,
+            codegen::lua::SaveSequence,
+            codegen::lua::LoadSequence,
+            codegen::lua::Play,
+            codegen::lua::Pause,
+            codegen::lua::Resume,
+            codegen::lua::SetTime,
+            codegen::lua::JumpToKeyframe,
+            codegen::lua::HasKeyframeRecording,
+            codegen::lua::Keyframes
+        }
+    };
+}
+
+void KeyframeRecording::sortKeyframes() {
+    std::sort(
+        _keyframes.begin(),
+        _keyframes.end(),
+        [](Keyframe lhs, Keyframe rhs) {
+            return lhs.timestamp.sequenceTime < rhs.timestamp.sequenceTime;
+        }
+    );
+}
+
+KeyframeRecording::Keyframe KeyframeRecording::newKeyframe(double sequenceTime) {
+    interaction::NavigationHandler& handler = *global::navigationHandler;
+    interaction::OrbitalNavigator& navigator = handler.orbitalNavigator();
+    const SceneGraphNode* node = navigator.anchorNode();
+
+    glm::dvec3 position = navigator.anchorNodeToCameraVector();
+    glm::dquat rotation = handler.camera()->rotationQuaternion();
+    float scale = handler.camera()->scaling();
+    bool followNodeRotation = navigator.followingAnchorRotation();
+
+    if (followNodeRotation) {
+        position = glm::inverse(node->worldRotationMatrix()) * position;
+        rotation = navigator.anchorNodeToCameraRotation();
+    }
+
+    Keyframe keyframe;
+    keyframe.camera.position = position;
+    keyframe.camera.rotation = rotation;
+    keyframe.camera.focusNode = navigator.anchorNode()->identifier();
+    keyframe.camera.scale = scale;
+    keyframe.camera.followFocusNodeRotation = followNodeRotation;
+
+    keyframe.timestamp.application = global::windowDelegate->applicationTime();
+    keyframe.timestamp.sequenceTime = sequenceTime;
+    keyframe.timestamp.simulation = global::timeManager->time().j2000Seconds();
+
+    return keyframe;
+}
+
+bool KeyframeRecording::isInRange(int index) const {
+    return index >= 0 && index < _keyframes.size();
+}
+
+} // namespace openspace::interaction
diff --git a/src/interaction/keyframerecording_lua.inl b/src/interaction/keyframerecording_lua.inl
new file mode 100644
index 0000000000..94c8e37378
--- /dev/null
+++ b/src/interaction/keyframerecording_lua.inl
@@ -0,0 +1,190 @@
+/*****************************************************************************************
+ *                                                                                       *
+ * OpenSpace                                                                             *
+ *                                                                                       *
+ * Copyright (c) 2014-2024                                                               *
+ *                                                                                       *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
+ * software and associated documentation files (the "Software"), to deal in the Software *
+ * without restriction, including without limitation the rights to use, copy, modify,    *
+ * merge, publish, distribute, sublicense, and/or sell copies of the Software, and to    *
+ * permit persons to whom the Software is furnished to do so, subject to the following   *
+ * conditions:                                                                           *
+ *                                                                                       *
+ * The above copyright notice and this permission notice shall be included in all copies *
+ * or substantial portions of the Software.                                              *
+ *                                                                                       *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED,   *
+ * INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A         *
+ * PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT    *
+ * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF  *
+ * CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE  *
+ * OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                                         *
+ ****************************************************************************************/
+
+#include <openspace/engine/globals.h>
+#include <optional>
+
+namespace {
+
+/**
+ * Starts a new sequence of keyframes. Any previously loaded sequence is discarded.
+ */
+[[codegen::luawrap]] void newSequence() {
+    openspace::global::keyframeRecording->newSequence();
+}
+
+/**
+ * Adds a keyframe at the specified time in the sequence.
+ *
+ * \param sequenceTime The time at which to add the new keyframe in the sequence given in
+ *                     seconds
+ */
+[[codegen::luawrap]] void addKeyframe(double sequenceTime) {
+    if (sequenceTime < 0) {
+        throw ghoul::lua::LuaError("Error can't add keyframe with negative time value");
+    }
+    openspace::global::keyframeRecording->addKeyframe(sequenceTime);
+}
+
+/**
+ * Removes a keyframe at the specified index.
+ *
+ * \param index The 0-based index of the keyframe to remove
+ */
+[[codegen::luawrap]] void removeKeyframe(int index) {
+    if (!openspace::global::keyframeRecording->hasKeyframeRecording()) {
+        throw ghoul::lua::LuaError("Can't remove keyframe on empty sequence");
+    }
+    if (index < 0) {
+        throw ghoul::lua::LuaError("Index value must be positive");
+    }
+    openspace::global::keyframeRecording->removeKeyframe(index);
+}
+
+/**
+ * Update the camera position of a keyframe at the specified index.
+ *
+ * \param index The 0-based index of the keyframe to update
+ */
+[[codegen::luawrap]] void updateKeyframe(int index) {
+    if (!openspace::global::keyframeRecording->hasKeyframeRecording()) {
+        throw ghoul::lua::LuaError("Can't update keyframe on empty sequence");
+    }
+    if (index < 0) {
+        throw ghoul::lua::LuaError("Index value must be positive");
+    }
+    openspace::global::keyframeRecording->updateKeyframe(index);
+}
+
+/**
+ * Move an existing keyframe in time.
+ *
+ * \param index The index of the keyframe to move
+ * \param sequenceTime The new time in seconds to update the keyframe to
+ */
+[[codegen::luawrap]] void moveKeyframe(int index, double sequenceTime) {
+    if (!openspace::global::keyframeRecording->hasKeyframeRecording()) {
+        throw ghoul::lua::LuaError("Can't move keyframe on empty sequence");
+    }
+    if (index < 0) {
+        throw ghoul::lua::LuaError("Index value must be positive");
+    }
+    if (sequenceTime < 0) {
+        throw ghoul::lua::LuaError("Error can't add keyframe with negative time value");
+    }
+    openspace::global::keyframeRecording->moveKeyframe(index, sequenceTime);
+}
+
+/**
+ * Saves the current sequence of keyframes to disk by the optionally specified `filename`.
+ * `filename` can be omitted if the sequence was previously saved or loaded from file.
+ *
+ * \param filename The name of the file to save
+ */
+[[codegen::luawrap]] void saveSequence(std::optional<std::string> filename) {
+    if (!openspace::global::keyframeRecording->hasKeyframeRecording()) {
+        throw ghoul::lua::LuaError("No keyframe sequence to save");
+    }
+    openspace::global::keyframeRecording->saveSequence(filename);
+}
+
+/**
+ * Loads a keyframe recording sequence from the specified file.
+ *
+ * \param filename The name of the file to load
+ */
+[[codegen::luawrap]] void loadSequence(std::string filename) {
+    openspace::global::keyframeRecording->loadSequence(std::move(filename));
+}
+
+/**
+ * Playback keyframe recording sequence optionally from the specified `sequenceTime` or if
+ * not specified starts playing from the beginning.
+ *
+ * \param sequenceTime The time in seconds at which to start playing the sequence. If
+ *                     omitted, the playback starts at the beginning of the sequence.
+ */
+[[codegen::luawrap]] void play(std::optional<double> sequenceTime) {
+    if (!openspace::global::keyframeRecording->hasKeyframeRecording()) {
+        throw ghoul::lua::LuaError("No keyframe sequence to play");
+    }
+    openspace::global::keyframeRecording->setSequenceTime(sequenceTime.value_or(0.0));
+    openspace::global::keyframeRecording->play();
+}
+
+/**
+ * Pauses a playing keyframe recording sequence.
+ */
+[[codegen::luawrap]] void pause() {
+    openspace::global::keyframeRecording->pause();
+}
+
+/**
+ * Resume playing a keyframe recording sequence that has been paused.
+ */
+[[codegen::luawrap]] void resume() {
+    openspace::global::keyframeRecording->play();
+}
+
+/**
+ * Jumps to a specified time within the keyframe recording sequence.
+ *
+ * \param sequenceTime The time in seconds to jump to
+ */
+[[codegen::luawrap]] void setTime(double sequenceTime) {
+    if (sequenceTime < 0) {
+        throw ghoul::lua::LuaError("Sequence time must be greater or equal than 0");
+    }
+    openspace::global::keyframeRecording->setSequenceTime(sequenceTime);
+}
+
+/**
+ * Jumps to a specified keyframe within the keyframe recording sequence.
+ *
+ * \param index The index of the keyframe to jump to
+ */
+[[codegen::luawrap]] void jumpToKeyframe(int index) {
+    if (index < 0) {
+        throw ghoul::lua::LuaError("Index must be positive");
+    }
+    openspace::global::keyframeRecording->jumpToKeyframe(index);
+}
+
+/**
+ * Returns true if there currently is a sequence loaded, otherwise false.
+ */
+[[codegen::luawrap]] bool hasKeyframeRecording() {
+    return openspace::global::keyframeRecording->hasKeyframeRecording();
+}
+
+/**
+ * Fetches the sequence keyframes as a JSON object.
+ */
+[[codegen::luawrap]] std::vector<ghoul::Dictionary> keyframes() {
+    return openspace::global::keyframeRecording->keyframes();
+}
+
+#include "keyframerecording_lua_codegen.cpp"
+
+} // namespace

From ddbf155e8b47623f25951af468eb6b189b5889ce Mon Sep 17 00:00:00 2001
From: Andreas Engberg <adde.engberg@gmail.com>
Date: Wed, 4 Sep 2024 09:21:59 +0200
Subject: [PATCH 613/701] fixed return type to tuple

---
 modules/space/scripts/spice.lua | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/space/scripts/spice.lua b/modules/space/scripts/spice.lua
index 09c12aa05d..cd326b588e 100644
--- a/modules/space/scripts/spice.lua
+++ b/modules/space/scripts/spice.lua
@@ -4,7 +4,7 @@ openspace.space.documentation = {
     Arguments = {
       { "tlePath", "String" }
     },
-    Return = "{ Translation, SpiceKernel }",
+    Return = "( Translation, SpiceKernel )",
     Documentation = [[
       Takes the provided TLE file, converts it into a SPICE kernel and returns a
       SpiceTranslation instance that can be used to access the information in the TLE

From fd64fe7c9658899ef7db6a74d883e868f6913333 Mon Sep 17 00:00:00 2001
From: Alexander Bock <alexander.bock@liu.se>
Date: Mon, 9 Sep 2024 21:16:57 +0200
Subject: [PATCH 614/701] Improvements to the ScriptLog logging (#3389)

* Restructuring the queueScript function
* Don't log the contents of actions that are triggered.  Add the ability to do verbose logging in the scriptlog
---
 include/openspace/engine/configuration.h      |   1 +
 include/openspace/interaction/actionmanager.h |   4 +-
 include/openspace/scripting/scriptengine.h    |  59 ++++--
 .../renderableinterpolatedpoints.cpp          |  10 +-
 modules/debugging/debuggingmodule_lua.inl     |  39 ++--
 modules/exoplanets/exoplanetsmodule_lua.inl   |  20 +-
 .../src/geojson/geojsoncomponent.cpp          |  22 +--
 modules/imgui/src/guiactioncomponent.cpp      |   6 +-
 modules/imgui/src/guigibscomponent.cpp        |   6 +-
 .../imgui/src/guiglobebrowsingcomponent.cpp   |  19 +-
 modules/imgui/src/guispacetimecomponent.cpp   | 181 ++++++------------
 modules/imgui/src/renderproperties.cpp        |   4 +-
 modules/iswa/rendering/iswacygnet.cpp         |  12 +-
 modules/iswa/rendering/iswakameleongroup.cpp  |  14 +-
 modules/iswa/rendering/kameleonplane.cpp      |   7 +-
 modules/iswa/rendering/screenspacecygnet.cpp  |   7 +-
 modules/iswa/util/iswamanager.cpp             |  31 +--
 modules/iswa/util/iswamanager_lua.inl         |  14 +-
 .../src/topics/flightcontrollertopic.cpp      |   6 +-
 modules/server/src/topics/luascripttopic.cpp  |  16 +-
 .../server/src/topics/setpropertytopic.cpp    |  11 +-
 .../src/topics/triggerpropertytopic.cpp       |   9 +-
 modules/skybrowser/skybrowsermodule.cpp       |  21 +-
 modules/skybrowser/skybrowsermodule_lua.inl   |  74 +++----
 modules/skybrowser/src/targetbrowserpair.cpp  |  12 +-
 modules/statemachine/src/state.cpp            |  12 +-
 modules/statemachine/src/transition.cpp       |   6 +-
 openspace.cfg                                 |   1 +
 src/engine/configuration.cpp                  |  10 +
 src/engine/openspaceengine.cpp                |  36 +---
 src/interaction/actionmanager.cpp             |  23 +--
 src/interaction/joystickcamerastates.cpp      |  22 ++-
 src/interaction/keybindingmanager.cpp         |   3 +-
 src/interaction/sessionrecording.cpp          |   6 +-
 src/navigation/navigationhandler.cpp          |  10 +-
 src/navigation/pathnavigator.cpp              |  16 +-
 src/network/parallelpeer.cpp                  |  10 +-
 src/rendering/luaconsole.cpp                  |  11 +-
 src/rendering/renderengine.cpp                |  18 +-
 src/rendering/screenspacerenderable.cpp       |  10 +-
 src/scene/scene.cpp                           |  11 +-
 src/scripting/scriptengine.cpp                | 120 +++++-------
 src/scripting/scriptscheduler.cpp             |   6 +-
 43 files changed, 365 insertions(+), 571 deletions(-)

diff --git a/include/openspace/engine/configuration.h b/include/openspace/engine/configuration.h
index 2c6a624001..537872502e 100644
--- a/include/openspace/engine/configuration.h
+++ b/include/openspace/engine/configuration.h
@@ -78,6 +78,7 @@ struct Configuration {
     Logging logging;
 
     std::string scriptLog;
+    bool verboseScriptLog = false;
     int scriptLogRotation = 3;
 
     struct DocumentationInfo {
diff --git a/include/openspace/interaction/actionmanager.h b/include/openspace/interaction/actionmanager.h
index b8c37637ad..009ba8f8f3 100644
--- a/include/openspace/interaction/actionmanager.h
+++ b/include/openspace/interaction/actionmanager.h
@@ -36,6 +36,7 @@ namespace openspace::interaction {
 class ActionManager {
 public:
     BooleanType(ShouldBeSynchronized);
+    BooleanType(ShouldBeLogged);
 
     bool hasAction(const std::string& identifier) const;
     void registerAction(Action action);
@@ -44,7 +45,8 @@ public:
     std::vector<Action> actions() const;
 
     void triggerAction(const std::string& identifier, const ghoul::Dictionary& arguments,
-        ShouldBeSynchronized shouldBeSynchronized) const;
+        ShouldBeSynchronized shouldBeSynchronized,
+        ShouldBeLogged shouldBeLogged = ShouldBeLogged::No) const;
     static scripting::LuaLibrary luaLibrary();
 
 private:
diff --git a/include/openspace/scripting/scriptengine.h b/include/openspace/scripting/scriptengine.h
index ff6c37e976..7ad56ca38a 100644
--- a/include/openspace/scripting/scriptengine.h
+++ b/include/openspace/scripting/scriptengine.h
@@ -41,23 +41,42 @@ namespace openspace::scripting {
 
 /**
  * The ScriptEngine is responsible for handling the execution of custom Lua functions and
- * executing scripts (#runScript and #runScriptFile). Before usage, it has to be
- * #initialize%d and #deinitialize%d. New ScriptEngine::Library%s consisting of
- * Library::Function%s have to be added which can then be called using the
- * `openspace` namespace prefix in Lua. The same functions can be exposed to other Lua
- * states by passing them to the #initializeLuaState method.
+ * executing scripts (#runScript). Before usage, it has to be #initialize%d and
+ * #deinitialize%d. New ScriptEngine::Library%s consisting of Library::Function%s have to
+ * be added which can then be called using the `openspace` namespace prefix in Lua. The
+ * same functions can be exposed to other Lua states by passing them to the
+ * #initializeLuaState method.
  */
 class ScriptEngine : public Syncable {
 public:
-    using ScriptCallback = std::function<void(ghoul::Dictionary)>;
-    BooleanType(ShouldBeSynchronized);
-    BooleanType(ShouldSendToRemote);
+    struct Script {
+        BooleanType(ShouldBeSynchronized);
+        BooleanType(ShouldSendToRemote);
+        BooleanType(ShouldBeLogged);
+        using Callback = std::function<void(ghoul::Dictionary)>;
 
-    struct QueueItem {
-        std::string script;
-        ShouldBeSynchronized shouldBeSynchronized;
-        ShouldSendToRemote shouldSendToRemote;
-        ScriptCallback callback;
+        /// The Lua script that should be executed
+        std::string code;
+
+        /// Determines whether a script should be sent to computers that are in the same
+        /// _cluster_ as the master machine that the user is interacting with. These are
+        /// usually different computers that tile a bigger display area and that need to
+        /// be tightly locked
+        ShouldBeSynchronized synchronized = ShouldBeSynchronized::Yes;
+
+        /// Determines whether a script should be send to a distant OpenSpace instance
+        /// that is not part of the same cluster. This is used in the ParallelConnection
+        /// feature that can connect OpenSpace instances in a connection that does not
+        /// require instantaneous synchronization
+        ShouldSendToRemote sendToRemote = ShouldSendToRemote::Yes;
+
+        /// Determines whether the script should be logged to a local script log file.
+        /// Note that this might be overwritten if the user requested a verbose log file
+        ShouldBeLogged addToLog = ShouldBeLogged::Yes;
+
+        /// A callback that will be called when the script finishes executing and that
+        /// provides access to the return value of the script
+        Callback callback;
     };
 
     static constexpr std::string_view OpenSpaceLibraryName = "openspace";
@@ -83,18 +102,14 @@ public:
     void addLibrary(LuaLibrary library);
     bool hasLibrary(const std::string& name);
 
-    bool runScript(const std::string& script,
-        const ScriptCallback& callback = ScriptCallback());
-    bool runScriptFile(const std::filesystem::path& filename);
 
     virtual void preSync(bool isMaster) override;
     virtual void encode(SyncBuffer* syncBuffer) override;
     virtual void decode(SyncBuffer* syncBuffer) override;
     virtual void postSync(bool isMaster) override;
 
-    void queueScript(std::string script, ShouldBeSynchronized shouldBeSynchronized,
-        ShouldSendToRemote shouldSendToRemote,
-        ScriptCallback callback = ScriptCallback());
+    void queueScript(Script script);
+    void queueScript(std::string script);
 
     std::vector<std::string> allLuaFunctions() const;
     const std::vector<LuaLibrary>& allLuaLibraries() const;
@@ -111,16 +126,18 @@ private:
 
     void addBaseLibrary();
 
+    bool runScript(const Script& script);
+
     ghoul::lua::LuaState _state;
     std::vector<LuaLibrary> _registeredLibraries;
 
-    std::queue<QueueItem> _incomingScripts;
+    std::queue<Script> _incomingScripts;
 
     // Client scripts are mutex protected since decode and rendering may happen
     // asynchronously
     std::mutex _clientScriptsMutex;
     std::queue<std::string> _clientScriptQueue;
-    std::queue<QueueItem> _masterScriptQueue;
+    std::queue<Script> _masterScriptQueue;
 
     std::vector<std::string> _scriptsToSync;
 
diff --git a/modules/base/rendering/pointcloud/renderableinterpolatedpoints.cpp b/modules/base/rendering/pointcloud/renderableinterpolatedpoints.cpp
index c499192fbe..887543b0a9 100644
--- a/modules/base/rendering/pointcloud/renderableinterpolatedpoints.cpp
+++ b/modules/base/rendering/pointcloud/renderableinterpolatedpoints.cpp
@@ -187,11 +187,11 @@ RenderableInterpolatedPoints::Interpolation::Interpolation()
         );
         // No syncing, as this was triggered from a property change (which happened
         // based on an already synced script)
-        global::scriptEngine->queueScript(
-            script,
-            scripting::ScriptEngine::ShouldBeSynchronized::No,
-            scripting::ScriptEngine::ShouldSendToRemote::No
-        );
+        global::scriptEngine->queueScript({
+            .code = script,
+            .synchronized = scripting::ScriptEngine::Script::ShouldBeSynchronized::No,
+            .sendToRemote = scripting::ScriptEngine::Script::ShouldSendToRemote::No
+        });
     };
 
     interpolateToEnd.onChange([triggerInterpolation, this]() {
diff --git a/modules/debugging/debuggingmodule_lua.inl b/modules/debugging/debuggingmodule_lua.inl
index 63c5b9c106..9b0f80ff94 100644
--- a/modules/debugging/debuggingmodule_lua.inl
+++ b/modules/debugging/debuggingmodule_lua.inl
@@ -64,11 +64,7 @@ constexpr glm::vec3 OrientationLineColor = glm::vec3(0.0, 1.0, 1.0);
         RenderedPathIdentifier
     );
 
-    global::scriptEngine->queueScript(
-        addParentScript,
-        scripting::ScriptEngine::ShouldBeSynchronized::Yes,
-        scripting::ScriptEngine::ShouldSendToRemote::Yes
-    );
+    global::scriptEngine->queueScript(addParentScript);
 
     // Get the poses along the path
     std::vector<CameraPose> poses;
@@ -98,9 +94,7 @@ constexpr glm::vec3 OrientationLineColor = glm::vec3(0.0, 1.0, 1.0);
         "}";
 
         global::scriptEngine->queueScript(
-            std::format("openspace.addSceneGraphNode({})", pointNode),
-            scripting::ScriptEngine::ShouldBeSynchronized::Yes,
-            scripting::ScriptEngine::ShouldSendToRemote::Yes
+            std::format("openspace.addSceneGraphNode({})", pointNode)
         );
     };
 
@@ -121,9 +115,7 @@ constexpr glm::vec3 OrientationLineColor = glm::vec3(0.0, 1.0, 1.0);
         "}";
 
         global::scriptEngine->queueScript(
-            std::format("openspace.addSceneGraphNode({})", lineNode),
-            scripting::ScriptEngine::ShouldBeSynchronized::Yes,
-            scripting::ScriptEngine::ShouldSendToRemote::Yes
+            std::format("openspace.addSceneGraphNode({})", lineNode)
         );
     };
 
@@ -158,11 +150,10 @@ constexpr glm::vec3 OrientationLineColor = glm::vec3(0.0, 1.0, 1.0);
 // Removes the currently rendered camera path if there is one.
 [[codegen::luawrap]] void removeRenderedCameraPath() {
     using namespace openspace;
-    global::scriptEngine->queueScript(
-        std::format("openspace.removeSceneGraphNode('{}');", RenderedPathIdentifier),
-        scripting::ScriptEngine::ShouldBeSynchronized::Yes,
-        scripting::ScriptEngine::ShouldSendToRemote::Yes
+    const std::string script = std::format(
+        "openspace.removeSceneGraphNode('{}');", RenderedPathIdentifier
     );
+    global::scriptEngine->queueScript(script);
 }
 
 /**
@@ -191,11 +182,7 @@ constexpr glm::vec3 OrientationLineColor = glm::vec3(0.0, 1.0, 1.0);
         RenderedPointsIdentifier
     );
 
-    global::scriptEngine->queueScript(
-        addParentScript,
-        scripting::ScriptEngine::ShouldBeSynchronized::Yes,
-        scripting::ScriptEngine::ShouldSendToRemote::Yes
-    );
+    global::scriptEngine->queueScript(addParentScript);
 
     const std::vector<glm::dvec3> points = currentPath->controlPoints();
 
@@ -230,9 +217,7 @@ constexpr glm::vec3 OrientationLineColor = glm::vec3(0.0, 1.0, 1.0);
         "}";
 
         global::scriptEngine->queueScript(
-            std::format("openspace.addSceneGraphNode({})", node),
-            scripting::ScriptEngine::ShouldBeSynchronized::Yes,
-            scripting::ScriptEngine::ShouldSendToRemote::Yes
+            std::format("openspace.addSceneGraphNode({})", node)
         );
     }
 }
@@ -240,14 +225,12 @@ constexpr glm::vec3 OrientationLineColor = glm::vec3(0.0, 1.0, 1.0);
 // Removes the rendered control points.
 [[codegen::luawrap]] void removePathControlPoints() {
     using namespace openspace;
-    global::scriptEngine->queueScript(
-        std::format("openspace.removeSceneGraphNode('{}');", RenderedPointsIdentifier),
-        scripting::ScriptEngine::ShouldBeSynchronized::Yes,
-        scripting::ScriptEngine::ShouldSendToRemote::Yes
+    const std::string script = std::format(
+        "openspace.removeSceneGraphNode('{}');", RenderedPointsIdentifier
     );
+    global::scriptEngine->queueScript(script);
 }
 
-
 #include "debuggingmodule_lua_codegen.cpp"
 
 } // namespace
diff --git a/modules/exoplanets/exoplanetsmodule_lua.inl b/modules/exoplanets/exoplanetsmodule_lua.inl
index 60d5a56f6d..09085c38a5 100644
--- a/modules/exoplanets/exoplanetsmodule_lua.inl
+++ b/modules/exoplanets/exoplanetsmodule_lua.inl
@@ -109,11 +109,11 @@ void queueAddSceneGraphNodeScript(const std::string& sgnTableAsString) {
     using namespace openspace;
     // No sync or send because this will already be called inside a Lua script,
     // therefor it has already been synced and sent to the connected nodes and peers
-    global::scriptEngine->queueScript(
-        std::format("openspace.addSceneGraphNode({})", sgnTableAsString),
-        scripting::ScriptEngine::ShouldBeSynchronized::No,
-        scripting::ScriptEngine::ShouldSendToRemote::No
-    );
+    global::scriptEngine->queueScript({
+        .code = std::format("openspace.addSceneGraphNode({})", sgnTableAsString),
+        .synchronized = scripting::ScriptEngine::Script::ShouldBeSynchronized::No,
+        .sendToRemote = scripting::ScriptEngine::Script::ShouldSendToRemote::No
+    });
 }
 
 void createExoplanetSystem(const std::string& starName,
@@ -680,11 +680,11 @@ std::vector<std::string> hostStarsWithSufficientData() {
 
     // No sync or send because this is already inside a Lua script, therefor it has
     // already been synced and sent to the connected nodes and peers
-    global::scriptEngine->queueScript(
-        "openspace.removeSceneGraphNode('" + starIdentifier + "');",
-        scripting::ScriptEngine::ShouldBeSynchronized::No,
-        scripting::ScriptEngine::ShouldSendToRemote::No
-    );
+    global::scriptEngine->queueScript({
+        .code = "openspace.removeSceneGraphNode('" + starIdentifier + "');",
+        .synchronized = scripting::ScriptEngine::Script::ShouldBeSynchronized::No,
+        .sendToRemote = scripting::ScriptEngine::Script::ShouldSendToRemote::No
+    });
 }
 
 /**
diff --git a/modules/globebrowsing/src/geojson/geojsoncomponent.cpp b/modules/globebrowsing/src/geojson/geojsoncomponent.cpp
index 3b9d7ca869..d9b0dc972b 100644
--- a/modules/globebrowsing/src/geojson/geojsoncomponent.cpp
+++ b/modules/globebrowsing/src/geojson/geojsoncomponent.cpp
@@ -834,25 +834,19 @@ void GeoJsonComponent::flyToFeature(std::optional<int> index) const {
     float lat = centroidLat + _latLongOffset.value().x;
     float lon = centroidLon + _latLongOffset.value().y;
 
-    global::scriptEngine->queueScript(
-        std::format(
-            "openspace.globebrowsing.flyToGeo([[{}]], {}, {}, {})",
-            _globeNode.owner()->identifier(), lat, lon, d
-        ),
-        scripting::ScriptEngine::ShouldBeSynchronized::Yes,
-        scripting::ScriptEngine::ShouldSendToRemote::Yes
+    const std::string script = std::format(
+        "openspace.globebrowsing.flyToGeo([[{}]], {}, {}, {})",
+        _globeNode.owner()->identifier(), lat, lon, d
     );
+    global::scriptEngine->queueScript(script);
 }
 
 void GeoJsonComponent::triggerDeletion() const {
-    global::scriptEngine->queueScript(
-        std::format(
-            "openspace.globebrowsing.deleteGeoJson([[{}]], [[{}]])",
-            _globeNode.owner()->identifier(), _identifier
-        ),
-        scripting::ScriptEngine::ShouldBeSynchronized::Yes,
-        scripting::ScriptEngine::ShouldSendToRemote::Yes
+    const std::string script = std::format(
+        "openspace.globebrowsing.deleteGeoJson([[{}]], [[{}]])",
+        _globeNode.owner()->identifier(), _identifier
     );
+    global::scriptEngine->queueScript(script);
 }
 
 } // namespace openspace::globebrowsing
diff --git a/modules/imgui/src/guiactioncomponent.cpp b/modules/imgui/src/guiactioncomponent.cpp
index 7d66115e65..4ca63185d5 100644
--- a/modules/imgui/src/guiactioncomponent.cpp
+++ b/modules/imgui/src/guiactioncomponent.cpp
@@ -58,7 +58,8 @@ void GuiActionComponent::render() {
             global::actionManager->triggerAction(
                 p.second,
                 ghoul::Dictionary(),
-                interaction::ActionManager::ShouldBeSynchronized::Yes
+                interaction::ActionManager::ShouldBeSynchronized::Yes,
+                interaction::ActionManager::ShouldBeLogged::Yes
             );
         }
         ImGui::SameLine();
@@ -85,7 +86,8 @@ void GuiActionComponent::render() {
             global::actionManager->triggerAction(
                 action.command,
                 ghoul::Dictionary(),
-                interaction::ActionManager::ShouldBeSynchronized::Yes
+                interaction::ActionManager::ShouldBeSynchronized::Yes,
+                interaction::ActionManager::ShouldBeLogged::Yes
             );
         }
         ImGui::SameLine();
diff --git a/modules/imgui/src/guigibscomponent.cpp b/modules/imgui/src/guigibscomponent.cpp
index 7310bc5bf7..d9f1ba5627 100644
--- a/modules/imgui/src/guigibscomponent.cpp
+++ b/modules/imgui/src/guigibscomponent.cpp
@@ -145,11 +145,7 @@ void GuiGIBSComponent::render() {
             "openspace.globebrowsing.addLayer('Earth', 'ColorLayers', {})",
             layerScript
         );
-        global::scriptEngine->queueScript(
-            std::move(script),
-            scripting::ScriptEngine::ShouldBeSynchronized::Yes,
-            scripting::ScriptEngine::ShouldSendToRemote::Yes
-        );
+        global::scriptEngine->queueScript(std::move(script));
     }
 
     ImGui::End();
diff --git a/modules/imgui/src/guiglobebrowsingcomponent.cpp b/modules/imgui/src/guiglobebrowsingcomponent.cpp
index 3f37d802d6..e65cc0c574 100644
--- a/modules/imgui/src/guiglobebrowsingcomponent.cpp
+++ b/modules/imgui/src/guiglobebrowsingcomponent.cpp
@@ -329,9 +329,8 @@ void GuiGlobeBrowsingComponent::render() {
                 std::remove(layerName.begin(), layerName.end(), ' '),
                 layerName.end()
             );
-            global::scriptEngine->queueScript(
-                std::format(
-                    "openspace.globebrowsing.addLayer(\
+            const std::string script = std::format(
+                "openspace.globebrowsing.addLayer(\
                         '{}', \
                         '{}', \
                         {{ \
@@ -341,15 +340,13 @@ void GuiGlobeBrowsingComponent::render() {
                             Enabled = true\
                         }}\
                     );",
-                    n,
-                    type,
-                    layerName,
-                    l.name,
-                    l.url
-                ),
-                scripting::ScriptEngine::ShouldBeSynchronized::Yes,
-                scripting::ScriptEngine::ShouldSendToRemote::Yes
+                n,
+                type,
+                layerName,
+                l.name,
+                l.url
             );
+            global::scriptEngine->queueScript(script);
         };
 
         if (addColor) {
diff --git a/modules/imgui/src/guispacetimecomponent.cpp b/modules/imgui/src/guispacetimecomponent.cpp
index 4801528fd6..e8ff797daf 100644
--- a/modules/imgui/src/guispacetimecomponent.cpp
+++ b/modules/imgui/src/guispacetimecomponent.cpp
@@ -32,6 +32,7 @@
 #include <openspace/rendering/renderengine.h>
 #include <openspace/scene/scenegraphnode.h>
 #include <openspace/scene/scene.h>
+#include <openspace/util/timeconversion.h>
 #include <openspace/util/timemanager.h>
 #include <openspace/scripting/scriptengine.h>
 
@@ -105,19 +106,12 @@ void GuiSpaceTimeComponent::render() {
             const bool pressed = ImGui::Button(n->guiName().c_str());
             ImGui::SameLine();
             if (pressed) {
-                global::scriptEngine->queueScript(
-                    "openspace.setPropertyValue('" +
-                    std::string(AnchorProperty) + "', '" +
-                    n->identifier() + "');",
-                    scripting::ScriptEngine::ShouldBeSynchronized::Yes,
-                    scripting::ScriptEngine::ShouldSendToRemote::Yes
-                );
-                global::scriptEngine->queueScript(
-                    "openspace.setPropertyValue('" +
-                    std::string(RetargetAnchorProperty) + "', nil);",
-                    scripting::ScriptEngine::ShouldBeSynchronized::Yes,
-                    scripting::ScriptEngine::ShouldSendToRemote::Yes
+                const std::string script = std::format(
+                    "openspace.setPropertyValue('{}', '{}');"
+                    "openspace.setPropertyValue('{}', nil);",
+                    AnchorProperty, n->identifier(), RetargetAnchorProperty
                 );
+                global::scriptEngine->queueScript(script);
             }
         }
     }
@@ -143,29 +137,21 @@ void GuiSpaceTimeComponent::render() {
 
     const bool hasChanged = ImGui::Combo("", &currentPosition, nodeNames.c_str());
     if (hasChanged) {
-        global::scriptEngine->queueScript(
-            "openspace.setPropertyValue('" + std::string(AnchorProperty) + "', '" +
-            nodes[currentPosition]->identifier() + "');",
-            scripting::ScriptEngine::ShouldBeSynchronized::Yes,
-            scripting::ScriptEngine::ShouldSendToRemote::Yes
-        );
-        global::scriptEngine->queueScript(
-            "openspace.setPropertyValue('" +
-            std::string(RetargetAnchorProperty) + "', nil);",
-            scripting::ScriptEngine::ShouldBeSynchronized::Yes,
-            scripting::ScriptEngine::ShouldSendToRemote::Yes
+        const std::string script = std::format(
+            "openspace.setPropertyValue('{}', '{}');"
+            "openspace.setPropertyValue('{}', nil);",
+            AnchorProperty, nodes[currentPosition]->identifier(), RetargetAnchorProperty
         );
+        global::scriptEngine->queueScript(script);
     }
 
     ImGui::SameLine();
     const bool pressed = ImGui::Button("Refocus");
     if (pressed) {
-        global::scriptEngine->queueScript(
-            "openspace.setPropertyValue('" +
-            std::string(RetargetAnchorProperty) + "', nil);",
-            scripting::ScriptEngine::ShouldBeSynchronized::Yes,
-            scripting::ScriptEngine::ShouldSendToRemote::Yes
+        const std::string script = std::format(
+            "openspace.setPropertyValue('{}', nil);", RetargetAnchorProperty
         );
+        global::scriptEngine->queueScript(script);
     }
 
     float interpolationTime = global::navigationHandler->interpolationTime();
@@ -210,11 +196,10 @@ void GuiSpaceTimeComponent::render() {
     if (dateChanged) {
         // No sync or send because time settings are always synced and sent to the
         // connected nodes and peers
-        global::scriptEngine->queueScript(
-            std::format("openspace.time.setTime([[{}]])", std::string_view(Buffer)),
-            scripting::ScriptEngine::ShouldBeSynchronized::No,
-            scripting::ScriptEngine::ShouldSendToRemote::No
+        const std::string script = std::format(
+            "openspace.time.setTime([[{}]])", std::string_view(Buffer)
         );
+        global::scriptEngine->queueScript(script);
     }
 
     showTooltip(
@@ -239,29 +224,23 @@ void GuiSpaceTimeComponent::render() {
             std::chrono::hours(24) * std::abs(days)
         ).count();
 
-        const double newTime = days < 0 ?
-            j2000 - seconds :
-            j2000 + seconds;
+        const double newTime = days < 0.f ? j2000 - seconds : j2000 + seconds;
 
         if (shift) {
             // If any shift key is pressed we want to always jump to the time.
             // No sync or send because time settings are always synced and sent
             // to the connected nodes and peers
             global::scriptEngine->queueScript(
-                "openspace.time.setTime(" + std::to_string(newTime) + ")",
-                scripting::ScriptEngine::ShouldBeSynchronized::No,
-                scripting::ScriptEngine::ShouldSendToRemote::No
+                "openspace.time.setTime(" + std::to_string(newTime) + ")"
             );
         }
         else {
             // No sync or send because time settings are always synced and sent
             // to the connected nodes and peers
-            global::scriptEngine->queueScript(
-                "openspace.time.interpolateTime(" + std::to_string(newTime) + ", " +
-                std::to_string(duration) + ")",
-                scripting::ScriptEngine::ShouldBeSynchronized::No,
-                scripting::ScriptEngine::ShouldSendToRemote::No
+            const std::string script = std::format(
+                "openspace.time.interpolateTime({}, {})", newTime, duration
             );
+            global::scriptEngine->queueScript(script);
         }
     };
 
@@ -300,11 +279,8 @@ void GuiSpaceTimeComponent::render() {
         // No sync or send because time settings are always synced and sent
         // to the connected nodes and peers
         global::scriptEngine->queueScript(
-            "openspace.time.setTime(\"" + nowTime + "\")",
-            scripting::ScriptEngine::ShouldBeSynchronized::No,
-            scripting::ScriptEngine::ShouldSendToRemote::No
+            std::format("openspace.time.setTime('{}')", nowTime)
         );
-
     }
     ImGui::SameLine();
 
@@ -386,11 +362,9 @@ void GuiSpaceTimeComponent::render() {
 
             // No sync or send because time settings are always synced and sent
             // to the connected nodes and peers
-            global::scriptEngine->queueScript(
-                "openspace.time.interpolateDeltaTime(" + std::to_string(newDt) + ")",
-                scripting::ScriptEngine::ShouldBeSynchronized::No,
-                scripting::ScriptEngine::ShouldSendToRemote::No
-            );
+            global::scriptEngine->queueScript(std::format(
+                "openspace.time.interpolateDeltaTime({})", newDt
+            ));
         }
         if (unitChanged) {
             // If only the unit changes, we keep the delta time, but need to convert the
@@ -437,22 +411,22 @@ void GuiSpaceTimeComponent::render() {
 
             // No sync or send because time settings are always synced and sent
             // to the connected nodes and peers
-            global::scriptEngine->queueScript(
-                "openspace.time.setDeltaTime(" + std::to_string(newDeltaTime) + ")",
-                scripting::ScriptEngine::ShouldBeSynchronized::No,
-                scripting::ScriptEngine::ShouldSendToRemote::No
+            const std::string s = std::format(
+                "openspace.time.setDeltaTime({})", newDeltaTime
             );
+            global::scriptEngine->queueScript(s);
         }
         if (!ImGui::IsItemActive() && !ImGui::IsItemClicked()) {
             if (_slidingDelta != 0.f) {
                 // No sync or send because time settings are always synced and sent
                 // to the connected nodes and peers
-                global::scriptEngine->queueScript(
-                    "openspace.time.setDeltaTime(" + std::to_string(_oldDeltaTime) + ")",
-                    scripting::ScriptEngine::ShouldBeSynchronized::No,
-                    scripting::ScriptEngine::ShouldSendToRemote::No
+                const std::string script = std::format(
+                    "openspace.time.setDeltaTime({})", _oldDeltaTime
                 );
 
+                using Script = scripting::ScriptEngine::Script;
+                global::scriptEngine->queueScript(script);
+
             }
             _slidingDelta = 0.f;
         }
@@ -477,11 +451,10 @@ void GuiSpaceTimeComponent::render() {
 
             // No sync or send because time settings are always synced and sent
             // to the connected nodes and peers
-            global::scriptEngine->queueScript(
-                "openspace.time.setDeltaTime(" + std::to_string(newDeltaTime) + ")",
-                scripting::ScriptEngine::ShouldBeSynchronized::No,
-                scripting::ScriptEngine::ShouldSendToRemote::No
+            const std::string script = std::format(
+                "openspace.time.setDeltaTime({})", newDeltaTime
             );
+            global::scriptEngine->queueScript(script);
         }
         else {
             _accelerationDelta = 0.f;
@@ -496,11 +469,7 @@ void GuiSpaceTimeComponent::render() {
         { ImGui::GetWindowWidth() / 2 - 7.5f, 0.f }
     );
     if (pauseChanged) {
-        global::scriptEngine->queueScript(
-            "openspace.time.interpolateTogglePause()",
-            scripting::ScriptEngine::ShouldBeSynchronized::Yes,
-            scripting::ScriptEngine::ShouldSendToRemote::Yes
-        );
+        global::scriptEngine->queueScript("openspace.time.interpolateTogglePause()");
     }
     ImGui::SameLine();
     const bool invert = ImGui::Button(
@@ -510,22 +479,18 @@ void GuiSpaceTimeComponent::render() {
     if (invert) {
         // No sync or send because time settings are always synced and sent
         // to the connected nodes and peers
-        global::scriptEngine->queueScript(
-            "openspace.time.interpolateDeltaTime(-1 * openspace.time.deltaTime());",
-            scripting::ScriptEngine::ShouldBeSynchronized::No,
-            scripting::ScriptEngine::ShouldSendToRemote::No
-        );
+        const std::string script =
+            "openspace.time.interpolateDeltaTime(-1 * openspace.time.deltaTime());";
+        global::scriptEngine->queueScript(script);
     }
 
     const bool minusDs = ImGui::Button("-1d/s");
     if (minusDs) {
         // No sync or send because time settings are always synced and sent
         // to the connected nodes and peers
-        global::scriptEngine->queueScript(
-            "openspace.time.interpolateDeltaTime(" + std::to_string(-24 * 60 * 60) + ")",
-            scripting::ScriptEngine::ShouldBeSynchronized::No,
-            scripting::ScriptEngine::ShouldSendToRemote::No
-        );
+        global::scriptEngine->queueScript(std::format(
+            "openspace.time.interpolateDeltaTime(-{})", SecondsPerDay
+        ));
     }
     ImGui::SameLine();
 
@@ -533,11 +498,9 @@ void GuiSpaceTimeComponent::render() {
     if (minusHs) {
         // No sync or send because time settings are always synced and sent
         // to the connected nodes and peers
-        global::scriptEngine->queueScript(
-            "openspace.time.interpolateDeltaTime(" + std::to_string(-60 * 60) + ")",
-            scripting::ScriptEngine::ShouldBeSynchronized::No,
-            scripting::ScriptEngine::ShouldSendToRemote::No
-        );
+        global::scriptEngine->queueScript(std::format(
+            "openspace.time.interpolateDeltaTime(-{})", SecondsPerHour
+        ));
     }
     ImGui::SameLine();
 
@@ -545,11 +508,9 @@ void GuiSpaceTimeComponent::render() {
     if (minusMs) {
         // No sync or send because time settings are always synced and sent
         // to the connected nodes and peers
-        global::scriptEngine->queueScript(
-            "openspace.time.interpolateDeltaTime(" + std::to_string(-60) + ")",
-            scripting::ScriptEngine::ShouldBeSynchronized::No,
-            scripting::ScriptEngine::ShouldSendToRemote::No
-        );
+        global::scriptEngine->queueScript(std::format(
+            "openspace.time.interpolateDeltaTime(-{})", SecondsPerMinute
+        ));
     }
     ImGui::SameLine();
 
@@ -557,11 +518,7 @@ void GuiSpaceTimeComponent::render() {
     if (minusSs) {
         // No sync or send because time settings are always synced and sent
         // to the connected nodes and peers
-        global::scriptEngine->queueScript(
-            "openspace.time.interpolateDeltaTime(" + std::to_string(-1) + ")",
-            scripting::ScriptEngine::ShouldBeSynchronized::No,
-            scripting::ScriptEngine::ShouldSendToRemote::No
-        );
+        global::scriptEngine->queueScript("openspace.time.interpolateDeltaTime(-1)");
     }
     ImGui::SameLine();
 
@@ -569,11 +526,7 @@ void GuiSpaceTimeComponent::render() {
     if (zero) {
         // No sync or send because time settings are always synced and sent
         // to the connected nodes and peers
-        global::scriptEngine->queueScript(
-            "openspace.time.interpolateDeltaTime(" + std::to_string(0) + ")",
-            scripting::ScriptEngine::ShouldBeSynchronized::No,
-            scripting::ScriptEngine::ShouldSendToRemote::No
-        );
+        global::scriptEngine->queueScript("openspace.time.interpolateDeltaTime(0)");
     }
     ImGui::SameLine();
 
@@ -582,11 +535,7 @@ void GuiSpaceTimeComponent::render() {
     if (plusSs) {
         // No sync or send because time settings are always synced and sent
         // to the connected nodes and peers
-        global::scriptEngine->queueScript(
-            "openspace.time.interpolateDeltaTime(" + std::to_string(1) + ")",
-            scripting::ScriptEngine::ShouldBeSynchronized::No,
-            scripting::ScriptEngine::ShouldSendToRemote::No
-        );
+        global::scriptEngine->queueScript("openspace.time.interpolateDeltaTime(1)");
     }
     ImGui::SameLine();
 
@@ -594,11 +543,9 @@ void GuiSpaceTimeComponent::render() {
     if (plusMs) {
         // No sync or send because time settings are always synced and sent
         // to the connected nodes and peers
-        global::scriptEngine->queueScript(
-            "openspace.time.interpolateDeltaTime(" + std::to_string(60) + ")",
-            scripting::ScriptEngine::ShouldBeSynchronized::No,
-            scripting::ScriptEngine::ShouldSendToRemote::No
-        );
+        global::scriptEngine->queueScript(std::format(
+            "openspace.time.interpolateDeltaTime({})", SecondsPerMinute
+        ));
     }
     ImGui::SameLine();
 
@@ -606,11 +553,9 @@ void GuiSpaceTimeComponent::render() {
     if (plusHs) {
         // No sync or send because time settings are always synced and sent
         // to the connected nodes and peers
-        global::scriptEngine->queueScript(
-            "openspace.time.interpolateDeltaTime(" + std::to_string(60 * 60) + ")",
-            scripting::ScriptEngine::ShouldBeSynchronized::No,
-            scripting::ScriptEngine::ShouldSendToRemote::No
-        );
+        global::scriptEngine->queueScript(std::format(
+            "openspace.time.interpolateDeltaTime({})", SecondsPerHour
+        ));
     }
     ImGui::SameLine();
 
@@ -618,11 +563,9 @@ void GuiSpaceTimeComponent::render() {
     if (plusDs) {
         // No sync or send because time settings are always synced and sent
         // to the connected nodes and peers
-        global::scriptEngine->queueScript(
-            "openspace.time.interpolateDeltaTime(" + std::to_string(24 * 60 * 60) + ")",
-            scripting::ScriptEngine::ShouldBeSynchronized::No,
-            scripting::ScriptEngine::ShouldSendToRemote::No
-        );
+        global::scriptEngine->queueScript(std::format(
+            "openspace.time.interpolateDeltaTime({})", SecondsPerDay
+        ));
     }
 
     ImGui::End();
diff --git a/modules/imgui/src/renderproperties.cpp b/modules/imgui/src/renderproperties.cpp
index c748be1f94..71365044b1 100644
--- a/modules/imgui/src/renderproperties.cpp
+++ b/modules/imgui/src/renderproperties.cpp
@@ -73,9 +73,7 @@ void renderTooltip(Property* prop, double delay) {
 
 void executeSetPropertyScript(const std::string& id, const std::string& value) {
     global::scriptEngine->queueScript(
-        std::format("openspace.setPropertyValueSingle('{}', {});", id, value),
-        scripting::ScriptEngine::ShouldBeSynchronized::Yes,
-        scripting::ScriptEngine::ShouldSendToRemote::Yes
+        std::format("openspace.setPropertyValueSingle('{}', {});", id, value)
     );
 }
 
diff --git a/modules/iswa/rendering/iswacygnet.cpp b/modules/iswa/rendering/iswacygnet.cpp
index 80623a50e7..565267dba4 100644
--- a/modules/iswa/rendering/iswacygnet.cpp
+++ b/modules/iswa/rendering/iswacygnet.cpp
@@ -137,11 +137,9 @@ void IswaCygnet::initializeGL() {
     else {
         _delete.onChange([this]() {
             deinitialize();
-            global::scriptEngine->queueScript(
-                "openspace.removeSceneGraphNode('" + identifier() + "')",
-                scripting::ScriptEngine::ShouldBeSynchronized::Yes,
-                scripting::ScriptEngine::ShouldSendToRemote::Yes
-            );
+            global::scriptEngine->queueScript(std::format(
+                "openspace.removeSceneGraphNode('{}')", identifier()
+            ));
         });
     }
 
@@ -306,9 +304,7 @@ void IswaCygnet::initializeGroup() {
         [this](ghoul::Dictionary) {
             LDEBUG(identifier() + " Event clearGroup");
             global::scriptEngine->queueScript(
-                "openspace.removeSceneGraphNode('" + identifier() + "')",
-                scripting::ScriptEngine::ShouldBeSynchronized::Yes,
-                scripting::ScriptEngine::ShouldSendToRemote::Yes
+                "openspace.removeSceneGraphNode('" + identifier() + "')"
             );
         }
     );
diff --git a/modules/iswa/rendering/iswakameleongroup.cpp b/modules/iswa/rendering/iswakameleongroup.cpp
index 0cf2b1e6d0..5df45cfbe3 100644
--- a/modules/iswa/rendering/iswakameleongroup.cpp
+++ b/modules/iswa/rendering/iswakameleongroup.cpp
@@ -152,11 +152,10 @@ void IswaKameleonGroup::updateFieldlineSeeds() {
         if (it == options.end() && std::get<2>(seedPath.second)) {
             LDEBUG("Removed fieldlines: " + std::get<0>(seedPath.second));
 
-            global::scriptEngine->queueScript(
-                "openspace.removeSceneGraphNode('" + std::get<0>(seedPath.second) + "')",
-                scripting::ScriptEngine::ShouldBeSynchronized::Yes,
-                scripting::ScriptEngine::ShouldSendToRemote::Yes
+            const std::string script = std::format(
+                "openspace.removeSceneGraphNode('{}')", std::get<0>(seedPath.second)
             );
+            global::scriptEngine->queueScript(script);
             std::get<2>(seedPath.second) = false;
         // if this option was turned on
         }
@@ -180,11 +179,10 @@ void IswaKameleonGroup::clearFieldlines() {
         if (std::get<2>(seedPath.second)) {
             LDEBUG("Removed fieldlines: " + std::get<0>(seedPath.second));
 
-            global::scriptEngine->queueScript(
-                "openspace.removeSceneGraphNode('" + std::get<0>(seedPath.second) + "')",
-                scripting::ScriptEngine::ShouldBeSynchronized::Yes,
-                scripting::ScriptEngine::ShouldSendToRemote::Yes
+            const std::string script = std::format(
+                "openspace.removeSceneGraphNode('{}')", std::get<0>(seedPath.second)
             );
+            global::scriptEngine->queueScript(script);
             std::get<2>(seedPath.second) = false;
         }
     }
diff --git a/modules/iswa/rendering/kameleonplane.cpp b/modules/iswa/rendering/kameleonplane.cpp
index 3bc8372b16..3e82e4df20 100644
--- a/modules/iswa/rendering/kameleonplane.cpp
+++ b/modules/iswa/rendering/kameleonplane.cpp
@@ -290,11 +290,10 @@ void KameleonPlane::updateFieldlineSeeds() {
             }
 
             LDEBUG("Removed fieldlines: " + std::get<0>(seedPath.second));
-            global::scriptEngine->queueScript(
-                "openspace.removeSceneGraphNode('" + std::get<0>(seedPath.second) + "')",
-                scripting::ScriptEngine::ShouldBeSynchronized::Yes,
-                scripting::ScriptEngine::ShouldSendToRemote::Yes
+            const std::string script = std::format(
+                "openspace.removeSceneGraphNode('{}')", std::get<0>(seedPath.second)
             );
+            global::scriptEngine->queueScript(script);
             std::get<2>(seedPath.second) = false;
         // if this option was turned on
         }
diff --git a/modules/iswa/rendering/screenspacecygnet.cpp b/modules/iswa/rendering/screenspacecygnet.cpp
index 4b91fd645e..32360a1377 100644
--- a/modules/iswa/rendering/screenspacecygnet.cpp
+++ b/modules/iswa/rendering/screenspacecygnet.cpp
@@ -53,11 +53,10 @@ ScreenSpaceCygnet::ScreenSpaceCygnet(const ghoul::Dictionary& dictionary)
     _minRealTimeUpdateInterval = 100;
 
     _delete.onChange([this]() {
-        global::scriptEngine->queueScript(
-            "openspace.iswa.removeScreenSpaceCygnet("+std::to_string(_cygnetId)+");",
-            scripting::ScriptEngine::ShouldBeSynchronized::Yes,
-            scripting::ScriptEngine::ShouldSendToRemote::Yes
+        const std::string script = std::format(
+            "openspace.iswa.removeScreenSpaceCygnet({});", _cygnetId
         );
+        global::scriptEngine->queueScript(script);
     });
 }
 
diff --git a/modules/iswa/util/iswamanager.cpp b/modules/iswa/util/iswamanager.cpp
index f3d06cc35a..47c0fe9a45 100644
--- a/modules/iswa/util/iswamanager.cpp
+++ b/modules/iswa/util/iswamanager.cpp
@@ -85,11 +85,10 @@ namespace {
     }
 
     void createScreenSpace(int id) {
+        using namespace openspace;
         std::string idStr = std::to_string(id);
-        openspace::global::scriptEngine->queueScript(
-            "openspace.iswa.addScreenSpaceCygnet({CygnetId =" + idStr + "});",
-            openspace::scripting::ScriptEngine::ShouldBeSynchronized::Yes,
-            openspace::scripting::ScriptEngine::ShouldSendToRemote::Yes
+        global::scriptEngine->queueScript(
+            "openspace.iswa.addScreenSpaceCygnet({CygnetId =" + idStr + "});"
         );
     }
 } // namespace
@@ -546,11 +545,7 @@ void IswaManager::createPlane(MetadataFuture& data) {
     std::string luaTable = jsonPlaneToLuaTable(data);
     if (!luaTable.empty()) {
         std::string script = "openspace.addSceneGraphNode(" + luaTable + ");";
-        global::scriptEngine->queueScript(
-            script,
-            scripting::ScriptEngine::ShouldBeSynchronized::Yes,
-            scripting::ScriptEngine::ShouldSendToRemote::Yes
-        );
+        global::scriptEngine->queueScript(script);
     }
 }
 
@@ -580,11 +575,7 @@ void IswaManager::createSphere(MetadataFuture& data) {
     std::string luaTable = jsonSphereToLuaTable(data);
     if (luaTable != "") {
         std::string script = "openspace.addSceneGraphNode(" + luaTable + ");";
-        global::scriptEngine->queueScript(
-            script,
-            scripting::ScriptEngine::ShouldBeSynchronized::Yes,
-            scripting::ScriptEngine::ShouldSendToRemote::Yes
-        );
+        global::scriptEngine->queueScript(script);
     }
 }
 
@@ -614,11 +605,7 @@ void IswaManager::createKameleonPlane(CdfInfo info, std::string cut) {
         std::string luaTable = parseKWToLuaTable(info, cut);
         if (!luaTable.empty()) {
             std::string script = "openspace.addSceneGraphNode(" + luaTable + ");";
-            global::scriptEngine->queueScript(
-                script,
-                scripting::ScriptEngine::ShouldBeSynchronized::Yes,
-                scripting::ScriptEngine::ShouldSendToRemote::Yes
-            );
+            global::scriptEngine->queueScript(script);
         }
     }
     else {
@@ -656,11 +643,7 @@ void IswaManager::createFieldline(std::string name, std::filesystem::path cdfPat
         "}";
         if (!luaTable.empty()) {
             std::string script = "openspace.addSceneGraphNode(" + luaTable + ");";
-            global::scriptEngine->queueScript(
-                script,
-                scripting::ScriptEngine::ShouldBeSynchronized::Yes,
-                scripting::ScriptEngine::ShouldSendToRemote::Yes
-            );
+            global::scriptEngine->queueScript(script);
         }
     }
     else {
diff --git a/modules/iswa/util/iswamanager_lua.inl b/modules/iswa/util/iswamanager_lua.inl
index fa98b9966d..cc2dc2394a 100644
--- a/modules/iswa/util/iswamanager_lua.inl
+++ b/modules/iswa/util/iswamanager_lua.inl
@@ -68,11 +68,8 @@ namespace {
 
 // Remove a Cygnets.
 [[codegen::luawrap]] void removeCygnet(std::string name) {
-    using namespace openspace;
-    global::scriptEngine->queueScript(
-        "openspace.removeSceneGraphNode('" + name + "')",
-        scripting::ScriptEngine::ShouldBeSynchronized::Yes,
-        scripting::ScriptEngine::ShouldSendToRemote::Yes
+    openspace::global::scriptEngine->queueScript(
+        "openspace.removeSceneGraphNode('" + name + "')"
     );
 }
 
@@ -94,12 +91,7 @@ namespace {
     std::string script = std::format(
         "openspace.unregisterScreenSpaceRenderable('{}');", cygnetInformation[id]->name
     );
-
-    global::scriptEngine->queueScript(
-        script,
-        scripting::ScriptEngine::ShouldBeSynchronized::Yes,
-        scripting::ScriptEngine::ShouldSendToRemote::Yes
-    );
+    global::scriptEngine->queueScript(script);
 }
 
 // Remove a group of Cygnets.
diff --git a/modules/server/src/topics/flightcontrollertopic.cpp b/modules/server/src/topics/flightcontrollertopic.cpp
index 653b5998c5..0256d40eb8 100644
--- a/modules/server/src/topics/flightcontrollertopic.cpp
+++ b/modules/server/src/topics/flightcontrollertopic.cpp
@@ -446,11 +446,7 @@ void FlightControllerTopic::processInputState(const nlohmann::json& json) {
 
 void FlightControllerTopic::processLua(const nlohmann::json &json) {
     const std::string script = json[LuaScript];
-    global::scriptEngine->queueScript(
-        script,
-        scripting::ScriptEngine::ShouldBeSynchronized::Yes,
-        scripting::ScriptEngine::ShouldSendToRemote::Yes
-    );
+    global::scriptEngine->queueScript(script);
 }
 
 } // namespace openspace
diff --git a/modules/server/src/topics/luascripttopic.cpp b/modules/server/src/topics/luascripttopic.cpp
index bb0ac24bd4..d594065f20 100644
--- a/modules/server/src/topics/luascripttopic.cpp
+++ b/modules/server/src/topics/luascripttopic.cpp
@@ -190,7 +190,9 @@ void LuaScriptTopic::handleJson(const nlohmann::json& json) {
 void LuaScriptTopic::runScript(std::string script, bool shouldReturn,
                                bool shouldBeSynchronized)
 {
-    scripting::ScriptEngine::ScriptCallback callback;
+    using namespace scripting;
+
+    ScriptEngine::Script::Callback callback;
     if (shouldReturn) {
         callback = [this](const ghoul::Dictionary& data) {
             if (_connection) {
@@ -205,12 +207,12 @@ void LuaScriptTopic::runScript(std::string script, bool shouldReturn,
         _waitingForReturnValue = false;
     }
 
-    global::scriptEngine->queueScript(
-        std::move(script),
-        scripting::ScriptEngine::ShouldBeSynchronized(shouldBeSynchronized),
-        scripting::ScriptEngine::ShouldSendToRemote(shouldBeSynchronized),
-        callback
-    );
+    global::scriptEngine->queueScript({
+        .code = std::move(script),
+        .synchronized = ScriptEngine::Script::ShouldBeSynchronized(shouldBeSynchronized),
+        .sendToRemote = ScriptEngine::Script::ShouldSendToRemote(shouldBeSynchronized),
+        .callback = callback
+    });
 }
 
 bool LuaScriptTopic::isDone() const {
diff --git a/modules/server/src/topics/setpropertytopic.cpp b/modules/server/src/topics/setpropertytopic.cpp
index e9d8bc04e3..c62d68dc4b 100644
--- a/modules/server/src/topics/setpropertytopic.cpp
+++ b/modules/server/src/topics/setpropertytopic.cpp
@@ -122,13 +122,10 @@ void SetPropertyTopic::handleJson(const nlohmann::json& json) {
             const nlohmann::json value = json.at("value");
             std::string literal = luaLiteralFromJson(value);
 
-            global::scriptEngine->queueScript(
-                std::format(
-                    "openspace.setPropertyValueSingle(\"{}\", {})", propertyKey, literal
-                ),
-                scripting::ScriptEngine::ShouldBeSynchronized::Yes,
-                scripting::ScriptEngine::ShouldSendToRemote::Yes
-             );
+            const std::string script = std::format(
+                "openspace.setPropertyValueSingle(\"{}\", {})", propertyKey, literal
+            );
+            global::scriptEngine->queueScript(script);
         }
     }
     catch (const std::out_of_range& e) {
diff --git a/modules/server/src/topics/triggerpropertytopic.cpp b/modules/server/src/topics/triggerpropertytopic.cpp
index c20f0afdfa..b3fd1b67e6 100644
--- a/modules/server/src/topics/triggerpropertytopic.cpp
+++ b/modules/server/src/topics/triggerpropertytopic.cpp
@@ -40,13 +40,10 @@ namespace openspace {
 void TriggerPropertyTopic::handleJson(const nlohmann::json& json) {
     try {
         const std::string& propertyKey = json.at("property").get<std::string>();
-        global::scriptEngine->queueScript(
-            std::format(
-                "openspace.setPropertyValueSingle(\"{}\", nil)", propertyKey
-            ),
-            scripting::ScriptEngine::ShouldBeSynchronized::Yes,
-            scripting::ScriptEngine::ShouldSendToRemote::Yes
+        const std::string script = std::format(
+            "openspace.setPropertyValueSingle(\"{}\", nil)", propertyKey
         );
+        global::scriptEngine->queueScript(script);
     }
     catch (const std::out_of_range& e) {
         LERROR("Could not trigger property -- key or value is missing in payload");
diff --git a/modules/skybrowser/skybrowsermodule.cpp b/modules/skybrowser/skybrowsermodule.cpp
index c0105f12e6..a7c0db4aab 100644
--- a/modules/skybrowser/skybrowsermodule.cpp
+++ b/modules/skybrowser/skybrowsermodule.cpp
@@ -345,14 +345,9 @@ void SkyBrowserModule::moveHoverCircle(const std::string& imageUrl, bool useScri
     // Show the circle
     if (useScript) {
         const std::string script = std::format(
-            "openspace.setPropertyValueSingle('Scene.{}.Renderable.Fade', 1.0);",
-            id
-        );
-        global::scriptEngine->queueScript(
-            script,
-            scripting::ScriptEngine::ShouldBeSynchronized::Yes,
-            scripting::ScriptEngine::ShouldSendToRemote::Yes
+            "openspace.setPropertyValueSingle('Scene.{}.Renderable.Fade', 1.0);", id
         );
+        global::scriptEngine->queueScript(script);
     }
     else {
         Renderable* renderable = _hoverCircle->renderable();
@@ -372,11 +367,7 @@ void SkyBrowserModule::moveHoverCircle(const std::string& imageUrl, bool useScri
         "openspace.setPropertyValueSingle('Scene.{}.Translation.Position', {});",
         id, ghoul::to_string(pos)
     );
-    global::scriptEngine->queueScript(
-        script,
-        scripting::ScriptEngine::ShouldBeSynchronized::Yes,
-        scripting::ScriptEngine::ShouldSendToRemote::Yes
-    );
+    global::scriptEngine->queueScript(script);
 }
 
 void SkyBrowserModule::disableHoverCircle(bool useScript) {
@@ -386,11 +377,7 @@ void SkyBrowserModule::disableHoverCircle(bool useScript) {
                 "openspace.setPropertyValueSingle('Scene.{}.Renderable.Fade', 0.0);",
                 _hoverCircle->identifier()
             );
-            global::scriptEngine->queueScript(
-                script,
-                scripting::ScriptEngine::ShouldBeSynchronized::Yes,
-                scripting::ScriptEngine::ShouldSendToRemote::Yes
-            );
+            global::scriptEngine->queueScript(script);
         }
         else {
             _hoverCircle->renderable()->property("Fade")->set(0.f);
diff --git a/modules/skybrowser/skybrowsermodule_lua.inl b/modules/skybrowser/skybrowsermodule_lua.inl
index f5894e5fba..e405f037d4 100644
--- a/modules/skybrowser/skybrowsermodule_lua.inl
+++ b/modules/skybrowser/skybrowsermodule_lua.inl
@@ -249,21 +249,21 @@ std::string prunedIdentifier(std::string identifier) {
 
             // No sync or send because this is already inside a Lua script, therefor it
             // has already been synced and sent to the connected nodes and peers
-            global::scriptEngine->queueScript(
-                script,
-                scripting::ScriptEngine::ShouldBeSynchronized::No,
-                scripting::ScriptEngine::ShouldSendToRemote::No
-            );
+            global::scriptEngine->queueScript({
+                .code = script,
+                .synchronized = scripting::ScriptEngine::Script::ShouldBeSynchronized::No,
+                .sendToRemote = scripting::ScriptEngine::Script::ShouldSendToRemote::No
+            });
         }
     }
     // To ensure each node in a cluster calls its own instance of the wwt application
     // Do not send this script to the other nodes. (Note malej 2023-AUG-23: Due to this
     // already being inside a Lua function that have already been synced out)
-    global::scriptEngine->queueScript(
-        "openspace.skybrowser.sendOutIdsToBrowsers()",
-        scripting::ScriptEngine::ShouldBeSynchronized::No,
-        scripting::ScriptEngine::ShouldSendToRemote::No
-    );
+    global::scriptEngine->queueScript({
+        .code = "openspace.skybrowser.sendOutIdsToBrowsers()",
+        .synchronized = scripting::ScriptEngine::Script::ShouldBeSynchronized::No,
+        .sendToRemote = scripting::ScriptEngine::Script::ShouldSendToRemote::No
+    });
 }
 
 /**
@@ -607,30 +607,18 @@ ghoul::Dictionary wwtImageCollectionUrlDeprecated()
 
     // No sync or send because this is already inside a Lua script, therefor it has
     // already been synced and sent to the connected nodes and peers
-    global::scriptEngine->queueScript(
-        "openspace.addScreenSpaceRenderable(" + browser + ");",
-        scripting::ScriptEngine::ShouldBeSynchronized::No,
-        scripting::ScriptEngine::ShouldSendToRemote::No
-    );
-
-    global::scriptEngine->queueScript(
-        "openspace.addSceneGraphNode(" + target + ");",
-        scripting::ScriptEngine::ShouldBeSynchronized::No,
-        scripting::ScriptEngine::ShouldSendToRemote::No
-    );
-
-    global::scriptEngine->queueScript(
-        "openspace.skybrowser.addPairToSkyBrowserModule('" + idTarget + "','"
-        + idBrowser + "');",
-        scripting::ScriptEngine::ShouldBeSynchronized::No,
-        scripting::ScriptEngine::ShouldSendToRemote::No
-    );
-
-    global::scriptEngine->queueScript(
-        "openspace.skybrowser.setSelectedBrowser('" + idBrowser + "');",
-        scripting::ScriptEngine::ShouldBeSynchronized::No,
-        scripting::ScriptEngine::ShouldSendToRemote::No
+    const std::string script = std::format(
+        "openspace.addScreenSpaceRenderable({0});"
+        "openspace.addSceneGraphNode({1});"
+        "openspace.skybrowser.addPairToSkyBrowserModule('{2}','{3}');"
+        "openspace.skybrowser.setSelectedBrowser('{3}')",
+        browser, target, idTarget, idBrowser
     );
+    global::scriptEngine->queueScript({
+        .code = script,
+        .synchronized = scripting::ScriptEngine::Script::ShouldBeSynchronized::No,
+        .sendToRemote = scripting::ScriptEngine::Script::ShouldSendToRemote::No
+    });
 }
 
 /**
@@ -650,17 +638,17 @@ ghoul::Dictionary wwtImageCollectionUrlDeprecated()
         // Remove from engine.
         // No sync or send because this is already inside a Lua script, therefor it has
         // already been synced and sent to the connected nodes and peers
-        global::scriptEngine->queueScript(
-            "openspace.removeScreenSpaceRenderable('" + browser + "');",
-            scripting::ScriptEngine::ShouldBeSynchronized::No,
-            scripting::ScriptEngine::ShouldSendToRemote::No
-        );
+        global::scriptEngine->queueScript({
+            .code = "openspace.removeScreenSpaceRenderable('" + browser + "');",
+            .synchronized = scripting::ScriptEngine::Script::ShouldBeSynchronized::No,
+            .sendToRemote = scripting::ScriptEngine::Script::ShouldSendToRemote::No
+        });
 
-        global::scriptEngine->queueScript(
-            "openspace.removeSceneGraphNode('" + target + "');",
-            scripting::ScriptEngine::ShouldBeSynchronized::No,
-            scripting::ScriptEngine::ShouldSendToRemote::No
-        );
+        global::scriptEngine->queueScript({
+            .code = "openspace.removeSceneGraphNode('" + target + "');",
+            .synchronized = scripting::ScriptEngine::Script::ShouldBeSynchronized::No,
+            .sendToRemote = scripting::ScriptEngine::Script::ShouldSendToRemote::No
+        });
     }
 }
 
diff --git a/modules/skybrowser/src/targetbrowserpair.cpp b/modules/skybrowser/src/targetbrowserpair.cpp
index acd3430e92..1ae17dbcd3 100644
--- a/modules/skybrowser/src/targetbrowserpair.cpp
+++ b/modules/skybrowser/src/targetbrowserpair.cpp
@@ -49,11 +49,7 @@ namespace {
             "openspace.setPropertyValueSingle('Scene.{}.Translation.Position', {});",
             id, ghoul::to_string(positionCelestial)
         );
-        openspace::global::scriptEngine->queueScript(
-            script,
-            openspace::scripting::ScriptEngine::ShouldBeSynchronized::Yes,
-            openspace::scripting::ScriptEngine::ShouldSendToRemote::Yes
-        );
+        openspace::global::scriptEngine->queueScript(script);
     }
 } // namespace
 
@@ -328,11 +324,7 @@ void TargetBrowserPair::startFading(float goal, float fadeTime) {
         _targetNode->identifier(), _browser->identifier(), goal, fadeTime
     );
 
-    global::scriptEngine->queueScript(
-        script,
-        scripting::ScriptEngine::ShouldBeSynchronized::Yes,
-        scripting::ScriptEngine::ShouldSendToRemote::Yes
-    );
+    global::scriptEngine->queueScript(script);
 }
 
 void TargetBrowserPair::stopAnimations() {
diff --git a/modules/statemachine/src/state.cpp b/modules/statemachine/src/state.cpp
index cb611e6f05..36b4021433 100644
--- a/modules/statemachine/src/state.cpp
+++ b/modules/statemachine/src/state.cpp
@@ -60,19 +60,11 @@ State::State(const ghoul::Dictionary& dictionary) {
 }
 
 void State::enter() const {
-    global::scriptEngine->queueScript(
-        _enter,
-        scripting::ScriptEngine::ShouldBeSynchronized::Yes,
-        scripting::ScriptEngine::ShouldSendToRemote::Yes
-    );
+    global::scriptEngine->queueScript(_enter);
 }
 
 void State::exit() const {
-    global::scriptEngine->queueScript(
-        _exit,
-        scripting::ScriptEngine::ShouldBeSynchronized::Yes,
-        scripting::ScriptEngine::ShouldSendToRemote::Yes
-    );
+    global::scriptEngine->queueScript(_exit);
 }
 
 std::string State::name() const {
diff --git a/modules/statemachine/src/transition.cpp b/modules/statemachine/src/transition.cpp
index 554722e707..bcdc739a8e 100644
--- a/modules/statemachine/src/transition.cpp
+++ b/modules/statemachine/src/transition.cpp
@@ -69,11 +69,7 @@ void Transition::performAction() const {
     if (_action.empty()) {
         return;
     }
-    global::scriptEngine->queueScript(
-        _action,
-        scripting::ScriptEngine::ShouldBeSynchronized::Yes,
-        scripting::ScriptEngine::ShouldSendToRemote::Yes
-    );
+    global::scriptEngine->queueScript(_action);
 }
 
 } // namespace openspace
diff --git a/openspace.cfg b/openspace.cfg
index 4de0cbfe0b..a8eb2e3524 100644
--- a/openspace.cfg
+++ b/openspace.cfg
@@ -208,6 +208,7 @@ Logging = {
     CapabilitiesVerbosity = "Full"
 }
 ScriptLog = "${LOGS}/ScriptLog.txt"
+-- VerboseScriptLog = true
 
 Documentation = {
     Path = "${DOCUMENTATION}/"
diff --git a/src/engine/configuration.cpp b/src/engine/configuration.cpp
index ff22ad6ae7..606af929d8 100644
--- a/src/engine/configuration.cpp
+++ b/src/engine/configuration.cpp
@@ -134,6 +134,14 @@ namespace {
         // from previous runs) will be silently overwritten
         std::optional<std::string> scriptLog;
 
+        // If this value is set to `true`, the script log will contain scripts that have
+        // been triggered by the system itself. These scripts are marked with Lua comments
+        // to indicate additional information about whether a script was generated by the
+        // system, whether it was synchronized, or other information. If this setting is
+        // `false` (the default), only user-initiated scripts will be listed in the
+        // scriptlog.
+        std::optional<bool> verboseScriptLog;
+
         // If this value is specified, this many number of script log files are being
         // retained before overwriting any
         std::optional<int> scriptLogRotation;
@@ -378,6 +386,7 @@ ghoul::Dictionary Configuration::createDictionary() {
     }
 
     res.setValue("ScriptLog", scriptLog);
+    res.setValue("VerboseScriptLog", verboseScriptLog);
     res.setValue("ScriptLogRotation", scriptLogRotation);
 
     {
@@ -547,6 +556,7 @@ void parseLuaState(Configuration& configuration) {
     c.fontSize.cameraInfo = p.fontSize.cameraInfo;
     c.fontSize.versionInfo = p.fontSize.versionInfo;
     c.scriptLog = p.scriptLog.value_or(c.scriptLog);
+    c.verboseScriptLog = p.verboseScriptLog.value_or(c.verboseScriptLog);
     c.scriptLogRotation = p.scriptLogRotation.value_or(3);
     c.versionCheckUrl = p.versionCheckUrl.value_or(c.versionCheckUrl);
     c.useMultithreadedInitialization =
diff --git a/src/engine/openspaceengine.cpp b/src/engine/openspaceengine.cpp
index a8aa17ce70..17458ee116 100644
--- a/src/engine/openspaceengine.cpp
+++ b/src/engine/openspaceengine.cpp
@@ -1016,11 +1016,7 @@ void OpenSpaceEngine::preSynchronization() {
                 continue;
             }
 
-            global::scriptEngine->queueScript(
-                script,
-                scripting::ScriptEngine::ShouldBeSynchronized::Yes,
-                scripting::ScriptEngine::ShouldSendToRemote::Yes
-            );
+            global::scriptEngine->queueScript(script);
 
             global::eventEngine->publishEvent<events::EventScheduledScriptExecuted>(
                 script
@@ -1441,11 +1437,7 @@ void OpenSpaceEngine::handleDragDrop(std::filesystem::path file) {
     }
 
     std::string script = ghoul::lua::value<std::string>(s);
-    global::scriptEngine->queueScript(
-        std::move(script),
-        scripting::ScriptEngine::ShouldBeSynchronized::Yes,
-        scripting::ScriptEngine::ShouldSendToRemote::Yes
-    );
+    global::scriptEngine->queueScript(std::move(script));
 }
 
 std::vector<std::byte> OpenSpaceEngine::encode() {
@@ -1641,11 +1633,7 @@ void setCameraFromProfile(const Profile& p) {
                         geo.anchor, geo.latitude, geo.longitude
                     );
                 }
-                global::scriptEngine->queueScript(
-                    geoScript,
-                    scripting::ScriptEngine::ShouldBeSynchronized::Yes,
-                    scripting::ScriptEngine::ShouldSendToRemote::Yes
-                );
+                global::scriptEngine->queueScript(geoScript);
             },
             [&checkNodeExists](const Profile::CameraGoToNode& node) {
                 using namespace interaction;
@@ -1673,20 +1661,12 @@ void setModulesFromProfile(const Profile& p) {
             });
         if (it != m.end()) {
             if (mod.loadedInstruction.has_value()) {
-                global::scriptEngine->queueScript(
-                    mod.loadedInstruction.value(),
-                    scripting::ScriptEngine::ShouldBeSynchronized::Yes,
-                    scripting::ScriptEngine::ShouldSendToRemote::Yes
-                );
+                global::scriptEngine->queueScript(mod.loadedInstruction.value());
             }
         }
         else {
             if (mod.notLoadedInstruction.has_value()) {
-                global::scriptEngine->queueScript(
-                    mod.notLoadedInstruction.value(),
-                    scripting::ScriptEngine::ShouldBeSynchronized::Yes,
-                    scripting::ScriptEngine::ShouldSendToRemote::Yes
-                );
+                global::scriptEngine->queueScript(mod.notLoadedInstruction.value());
             }
         }
     }
@@ -1747,11 +1727,7 @@ void setMarkInterestingNodesFromProfile(const Profile& p) {
 
 void setAdditionalScriptsFromProfile(const Profile& p) {
     for (const std::string& a : p.additionalScripts) {
-        global::scriptEngine->queueScript(
-            a,
-            scripting::ScriptEngine::ShouldBeSynchronized::Yes,
-            scripting::ScriptEngine::ShouldSendToRemote::Yes
-        );
+        global::scriptEngine->queueScript(a);
     }
 }
 
diff --git a/src/interaction/actionmanager.cpp b/src/interaction/actionmanager.cpp
index 329a788017..e5771a37b9 100644
--- a/src/interaction/actionmanager.cpp
+++ b/src/interaction/actionmanager.cpp
@@ -89,7 +89,8 @@ std::vector<Action> ActionManager::actions() const {
 
 void ActionManager::triggerAction(const std::string& identifier,
                                   const ghoul::Dictionary& arguments,
-                           ActionManager::ShouldBeSynchronized shouldBeSynchronized) const
+                                 ActionManager::ShouldBeSynchronized shouldBeSynchronized,
+                                                      ShouldBeLogged shouldBeLogged) const
 {
     ghoul_assert(!identifier.empty(), "Identifier must not be empty");
 
@@ -108,18 +109,18 @@ void ActionManager::triggerAction(const std::string& identifier,
         std::format("args = {}\n{}", ghoul::formatLua(arguments), a.command);
 
     if (!shouldBeSynchronized || a.isLocal) {
-        global::scriptEngine->queueScript(
-            std::move(script),
-            scripting::ScriptEngine::ShouldBeSynchronized::No,
-            scripting::ScriptEngine::ShouldSendToRemote::No
-        );
+        global::scriptEngine->queueScript({
+            .code = std::move(script),
+            .synchronized = scripting::ScriptEngine::Script::ShouldBeSynchronized::No,
+            .sendToRemote = scripting::ScriptEngine::Script::ShouldSendToRemote::No,
+            .addToLog = scripting::ScriptEngine::Script::ShouldBeLogged(shouldBeLogged)
+        });
     }
     else {
-        global::scriptEngine->queueScript(
-            std::move(script),
-            scripting::ScriptEngine::ShouldBeSynchronized::Yes,
-            scripting::ScriptEngine::ShouldSendToRemote::Yes
-        );
+        global::scriptEngine->queueScript({
+            .code = std::move(script),
+            .addToLog = scripting::ScriptEngine::Script::ShouldBeLogged(shouldBeLogged)
+        });
     }
 }
 
diff --git a/src/interaction/joystickcamerastates.cpp b/src/interaction/joystickcamerastates.cpp
index 676130bbe4..099e72e945 100644
--- a/src/interaction/joystickcamerastates.cpp
+++ b/src/interaction/joystickcamerastates.cpp
@@ -167,11 +167,12 @@ void JoystickCameraStates::updateStateFromInput(
                         t.propertyUri, value
                     );
 
-                    global::scriptEngine->queueScript(
-                        script,
-                        scripting::ScriptEngine::ShouldBeSynchronized(t.isRemote),
-                        scripting::ScriptEngine::ShouldSendToRemote(t.isRemote)
-                    );
+                    using Script = scripting::ScriptEngine::Script;
+                    global::scriptEngine->queueScript({
+                        .code = script,
+                        .synchronized = Script::ShouldBeSynchronized(t.isRemote),
+                        .sendToRemote = Script::ShouldSendToRemote(t.isRemote)
+                    });
                     break;
             }
         }
@@ -187,15 +188,16 @@ void JoystickCameraStates::updateStateFromInput(
                 );
 
                 if (active) {
-                    global::scriptEngine->queueScript(
-                        it->second.command,
-                        scripting::ScriptEngine::ShouldBeSynchronized(
+                    using Script = scripting::ScriptEngine::Script;
+                    global::scriptEngine->queueScript({
+                        .code = it->second.command,
+                        .synchronized = Script::ShouldBeSynchronized(
                             it->second.synchronization
                         ),
-                        scripting::ScriptEngine::ShouldSendToRemote(
+                        .sendToRemote = Script::ShouldSendToRemote(
                             it->second.synchronization
                         )
-                    );
+                    });
                 }
             }
         }
diff --git a/src/interaction/keybindingmanager.cpp b/src/interaction/keybindingmanager.cpp
index 1e43f92526..284ea5291e 100644
--- a/src/interaction/keybindingmanager.cpp
+++ b/src/interaction/keybindingmanager.cpp
@@ -52,7 +52,8 @@ void KeybindingManager::keyboardCallback(Key key, KeyModifier modifier, KeyActio
             global::actionManager->triggerAction(
                 it->second,
                 ghoul::Dictionary(),
-                interaction::ActionManager::ShouldBeSynchronized::Yes
+                interaction::ActionManager::ShouldBeSynchronized::Yes,
+                interaction::ActionManager::ShouldBeLogged::Yes
             );
         }
     }
diff --git a/src/interaction/sessionrecording.cpp b/src/interaction/sessionrecording.cpp
index 7c5af56778..1a516c7c27 100644
--- a/src/interaction/sessionrecording.cpp
+++ b/src/interaction/sessionrecording.cpp
@@ -2107,11 +2107,7 @@ bool SessionRecording::processScriptKeyframe() {
         _keyframesScript,
         ([this]() { signalPlaybackFinishedForComponent(RecordedType::Script); })
     );
-    global::scriptEngine->queueScript(
-        nextScript,
-        scripting::ScriptEngine::ShouldBeSynchronized::Yes,
-        scripting::ScriptEngine::ShouldSendToRemote::Yes
-    );
+    global::scriptEngine->queueScript(nextScript);
 
     return true;
 }
diff --git a/src/navigation/navigationhandler.cpp b/src/navigation/navigationhandler.cpp
index 307199c3c3..1701e00ed9 100644
--- a/src/navigation/navigationhandler.cpp
+++ b/src/navigation/navigationhandler.cpp
@@ -218,11 +218,11 @@ void NavigationHandler::triggerFadeToTransition(const std::string& transitionScr
     }
 
     // No syncing, as this was called from a script that should have been synced already
-    global::scriptEngine->queueScript(
-        std::move(script),
-        scripting::ScriptEngine::ShouldBeSynchronized::No,
-        scripting::ScriptEngine::ShouldSendToRemote::No
-    );
+    global::scriptEngine->queueScript({
+        .code = std::move(script),
+        .synchronized = scripting::ScriptEngine::Script::ShouldBeSynchronized::No,
+        .sendToRemote = scripting::ScriptEngine::Script::ShouldSendToRemote::No
+    });
 }
 
 void NavigationHandler::updateCamera(double deltaTime) {
diff --git a/src/navigation/pathnavigator.cpp b/src/navigation/pathnavigator.cpp
index 39cf783f09..94f9ad5322 100644
--- a/src/navigation/pathnavigator.cpp
+++ b/src/navigation/pathnavigator.cpp
@@ -344,11 +344,7 @@ void PathNavigator::startPath() {
     // moving. However, keep track of whether the time was running before the path
     // was started, so we can reset it on finish
     if (!global::timeManager->isPaused()) {
-        openspace::global::scriptEngine->queueScript(
-            "openspace.time.setPause(true)",
-            scripting::ScriptEngine::ShouldBeSynchronized::Yes,
-            scripting::ScriptEngine::ShouldSendToRemote::Yes
-        );
+        openspace::global::scriptEngine->queueScript("openspace.time.setPause(true)");
 
         _startSimulationTimeOnFinish = true;
         LINFO("Pausing time simulation during path traversal");
@@ -471,11 +467,7 @@ void PathNavigator::handlePathEnd() {
     global::openSpaceEngine->resetMode();
 
     if (_startSimulationTimeOnFinish) {
-        openspace::global::scriptEngine->queueScript(
-            "openspace.time.setPause(false)",
-            scripting::ScriptEngine::ShouldBeSynchronized::Yes,
-            scripting::ScriptEngine::ShouldSendToRemote::Yes
-        );
+        global::scriptEngine->queueScript("openspace.time.setPause(false)");
         _startSimulationTimeOnFinish = false;
     }
 
@@ -484,9 +476,7 @@ void PathNavigator::handlePathEnd() {
             "openspace.setPropertyValueSingle("
                 "'NavigationHandler.OrbitalNavigator.IdleBehavior.ApplyIdleBehavior',"
                 "true"
-            ");",
-            openspace::scripting::ScriptEngine::ShouldBeSynchronized::Yes,
-            openspace::scripting::ScriptEngine::ShouldSendToRemote::Yes
+            ");"
         );
     }
 
diff --git a/src/network/parallelpeer.cpp b/src/network/parallelpeer.cpp
index 1fbd36d470..8d2c13c7a8 100644
--- a/src/network/parallelpeer.cpp
+++ b/src/network/parallelpeer.cpp
@@ -415,11 +415,11 @@ void ParallelPeer::dataMessageReceived(const std::vector<char>& message) {
 
             // No sync or send because this has already been recived by a peer,
             // don't send it back again
-            global::scriptEngine->queueScript(
-                sm._script,
-                scripting::ScriptEngine::ShouldBeSynchronized::No,
-                scripting::ScriptEngine::ShouldSendToRemote::No
-            );
+            global::scriptEngine->queueScript({
+                .code = sm._script,
+                .synchronized = scripting::ScriptEngine::Script::ShouldBeSynchronized::No,
+                .sendToRemote = scripting::ScriptEngine::Script::ShouldSendToRemote::No
+            });
             break;
         }
         default:
diff --git a/src/rendering/luaconsole.cpp b/src/rendering/luaconsole.cpp
index decae4c8ef..4e7c1f521d 100644
--- a/src/rendering/luaconsole.cpp
+++ b/src/rendering/luaconsole.cpp
@@ -455,11 +455,12 @@ bool LuaConsole::keyboardCallback(Key key, KeyModifier modifier, KeyAction actio
     if (key == Key::Enter || key == Key::KeypadEnter) {
         const std::string cmd = _commands.at(_activeCommand);
         if (!cmd.empty()) {
-            global::scriptEngine->queueScript(
-                cmd,
-                scripting::ScriptEngine::ShouldBeSynchronized(_shouldBeSynchronized),
-                scripting::ScriptEngine::ShouldSendToRemote(_shouldSendToRemote)
-            );
+            using Script = scripting::ScriptEngine::Script;
+            global::scriptEngine->queueScript({
+                .code = cmd,
+                .synchronized = Script::ShouldBeSynchronized(_shouldBeSynchronized),
+                .sendToRemote = Script::ShouldSendToRemote(_shouldSendToRemote)
+            });
 
             // Only add the current command to the history if it hasn't been
             // executed before. We don't want two of the same commands in a row
diff --git a/src/rendering/renderengine.cpp b/src/rendering/renderengine.cpp
index 960b893f8f..ade20562b5 100644
--- a/src/rendering/renderengine.cpp
+++ b/src/rendering/renderengine.cpp
@@ -725,11 +725,7 @@ bool RenderEngine::mouseActivationCallback(const glm::dvec2& mousePosition) cons
             local f = 'NavigationHandler.OrbitalNavigator.Friction.RotationalFriction';
             openspace.setPropertyValueSingle(f, not openspace.propertyValue(f));)";
 
-        global::scriptEngine->queueScript(
-            std::string(ToggleRotationFrictionScript),
-            scripting::ScriptEngine::ShouldBeSynchronized::Yes,
-            scripting::ScriptEngine::ShouldSendToRemote::Yes
-        );
+        global::scriptEngine->queueScript(std::string(ToggleRotationFrictionScript));
         return true;
     }
 
@@ -738,11 +734,7 @@ bool RenderEngine::mouseActivationCallback(const glm::dvec2& mousePosition) cons
             local f = 'NavigationHandler.OrbitalNavigator.Friction.ZoomFriction';
             openspace.setPropertyValueSingle(f, not openspace.propertyValue(f));)";
 
-        global::scriptEngine->queueScript(
-            std::string(ToggleZoomFrictionScript),
-            scripting::ScriptEngine::ShouldBeSynchronized::Yes,
-            scripting::ScriptEngine::ShouldSendToRemote::Yes
-        );
+        global::scriptEngine->queueScript(std::string(ToggleZoomFrictionScript));
         return true;
     }
 
@@ -751,11 +743,7 @@ bool RenderEngine::mouseActivationCallback(const glm::dvec2& mousePosition) cons
             local f = 'NavigationHandler.OrbitalNavigator.Friction.RollFriction';
             openspace.setPropertyValueSingle(f, not openspace.propertyValue(f));)";
 
-        global::scriptEngine->queueScript(
-            std::string(ToggleRollFrictionScript),
-            scripting::ScriptEngine::ShouldBeSynchronized::Yes,
-            scripting::ScriptEngine::ShouldSendToRemote::Yes
-        );
+        global::scriptEngine->queueScript(std::string(ToggleRollFrictionScript));
         return true;
     }
 
diff --git a/src/rendering/screenspacerenderable.cpp b/src/rendering/screenspacerenderable.cpp
index 422a509fc1..2d02451c76 100644
--- a/src/rendering/screenspacerenderable.cpp
+++ b/src/rendering/screenspacerenderable.cpp
@@ -434,11 +434,11 @@ ScreenSpaceRenderable::ScreenSpaceRenderable(const ghoul::Dictionary& dictionary
         // No sync or send because this is already inside a Lua script that was triggered
         // when this triggerProperty was pressed in the gui, therefor it has already been
         // synced and sent to the connected nodes and peers
-        global::scriptEngine->queueScript(
-            std::move(script),
-            scripting::ScriptEngine::ShouldBeSynchronized::No,
-            scripting::ScriptEngine::ShouldSendToRemote::No
-        );
+        global::scriptEngine->queueScript({
+            .code = std::move(script),
+            .synchronized = scripting::ScriptEngine::Script::ShouldBeSynchronized::No,
+            .sendToRemote = scripting::ScriptEngine::Script::ShouldSendToRemote::No
+        });
     });
     addProperty(_delete);
 }
diff --git a/src/scene/scene.cpp b/src/scene/scene.cpp
index 2204e0929e..6e453bad6c 100644
--- a/src/scene/scene.cpp
+++ b/src/scene/scene.cpp
@@ -554,11 +554,12 @@ void Scene::updateInterpolations() {
                 // triggered when the interpolation of the property was triggered,
                 // therefore it has already been synced and sent to the connected nodes
                 // and peers
-                global::scriptEngine->queueScript(
-                    std::move(i.postScript),
-                    scripting::ScriptEngine::ShouldBeSynchronized::No,
-                    scripting::ScriptEngine::ShouldSendToRemote::No
-                );
+                using Script = scripting::ScriptEngine::Script;
+                global::scriptEngine->queueScript({
+                    .code = std::move(i.postScript),
+                    .synchronized = Script::ShouldBeSynchronized::No,
+                    .sendToRemote = Script::ShouldSendToRemote::No
+                });
             }
 
             global::eventEngine->publishEvent<events::EventInterpolationFinished>(i.prop);
diff --git a/src/scripting/scriptengine.cpp b/src/scripting/scriptengine.cpp
index 636ce6f750..f6ee986123 100644
--- a/src/scripting/scriptengine.cpp
+++ b/src/scripting/scriptengine.cpp
@@ -163,54 +163,70 @@ bool ScriptEngine::hasLibrary(const std::string& name) {
     return (it != _registeredLibraries.end());
 }
 
-bool ScriptEngine::runScript(const std::string& script, const ScriptCallback& callback) {
+bool ScriptEngine::runScript(const Script& script) {
     ZoneScoped;
-    ZoneText(script.c_str(), script.size());
+    ZoneText(script.code.c_str(), script.code.size());
 
-    ghoul_assert(!script.empty(), "Script must not be empty");
+    ghoul_assert(!script.code.empty(), "Script must not be empty");
+    ghoul_assert(
+        !(script.addToLog && ghoul::lua::isScriptBinary(script.code)),
+        "Shouldn't try to add a script to a log that is a binary blob"
+    );
 
-    if (_logScripts && script[0] != '\x1b') {
-        // \x1b = A byte in the beginning that Lua uses to represent whether a string is
-        // an ASCII or a binary blob. We don't want to print binary blobs into the log
-        writeLog(script);
+    // Binary scripts should never be logged
+    if (_logScripts && !ghoul::lua::isScriptBinary(script.code)) {
+        if (script.addToLog && !global::configuration->verboseScriptLog) {
+            writeLog(script.code);
+        }
+        else if (global::configuration->verboseScriptLog) {
+            // Even if the script doesn't want to get logged, it will get anyway if
+            // verbose logging is enabled
+            writeLog(std::format(
+                "{}{}{}{}",
+                script.addToLog ? "" : "--[[generated]]",
+                script.synchronized ? "--[[sync]]" : "--[[!sync]]",
+                script.sendToRemote ? "--[[sendRemote]]" : "--[[!sendRemote]]",
+                script.code
+            ));
+        }
     }
 
     try {
-        if (callback) {
+        if (script.callback) {
             ghoul::Dictionary returnValue =
-                ghoul::lua::loadArrayDictionaryFromString(script, _state);
-            callback(std::move(returnValue));
+                ghoul::lua::loadArrayDictionaryFromString(script.code, _state);
+            script.callback(std::move(returnValue));
         }
         else {
-            ghoul::lua::runScript(_state, script);
+            ghoul::lua::runScript(_state, script.code);
         }
     }
     catch (const ghoul::lua::LuaLoadingException& e) {
         LERRORC(e.component, e.message);
-        if (callback) {
-            callback(ghoul::Dictionary());
+        if (script.callback) {
+            script.callback(ghoul::Dictionary());
         }
         return false;
     }
     catch (const ghoul::lua::LuaExecutionException& e) {
         LERRORC(e.component, e.message);
-        if (callback) {
-            callback(ghoul::Dictionary());
+        if (script.callback) {
+            script.callback(ghoul::Dictionary());
         }
         return false;
     }
     catch (const documentation::SpecificationError& e) {
         LERRORC(e.component, e.message);
         documentation::logError(e, e.component);
-        if (callback) {
-            callback(ghoul::Dictionary());
+        if (script.callback) {
+            script.callback(ghoul::Dictionary());
         }
         return false;
     }
     catch (const ghoul::RuntimeError& e) {
         LERRORC(e.component, e.message);
-        if (callback) {
-            callback(ghoul::Dictionary());
+        if (script.callback) {
+            script.callback(ghoul::Dictionary());
         }
         return false;
     }
@@ -218,29 +234,6 @@ bool ScriptEngine::runScript(const std::string& script, const ScriptCallback& ca
     return true;
 }
 
-bool ScriptEngine::runScriptFile(const std::filesystem::path& filename) {
-    ZoneScoped;
-
-    if (!std::filesystem::is_regular_file(filename)) {
-        LERROR(std::format("Script with name {} did not exist", filename));
-        return false;
-    }
-
-    try {
-        ghoul::lua::runScriptFile(_state, filename);
-    }
-    catch (const ghoul::lua::LuaLoadingException& e) {
-        LERRORC(e.component, e.message);
-        return false;
-    }
-    catch (const ghoul::lua::LuaExecutionException& e) {
-        LERRORC(e.component, e.message);
-        return false;
-    }
-
-    return true;
-}
-
 bool ScriptEngine::isLibraryNameAllowed(lua_State* state, const std::string& name) {
     bool result = false;
     lua_getglobal(state, OpenSpaceLibraryName.data());
@@ -451,7 +444,6 @@ void ScriptEngine::writeLog(const std::string& script) {
                 LERROR(std::format(
                     "Could not open file '{}' for logging scripts", _logFilename
                 ));
-
                 return;
             }
         }
@@ -477,34 +469,33 @@ void ScriptEngine::preSync(bool isMaster) {
     std::lock_guard guard(_clientScriptsMutex);
     if (isMaster) {
         while (!_incomingScripts.empty()) {
-            QueueItem item = std::move(_incomingScripts.front());
+            Script item = std::move(_incomingScripts.front());
             _incomingScripts.pop();
 
             // Not really a received script but the master also needs to run the script...
             _masterScriptQueue.push(item);
 
             if (global::sessionRecording->isRecording()) {
-                global::sessionRecording->saveScriptKeyframeToTimeline(item.script);
+                global::sessionRecording->saveScriptKeyframeToTimeline(item.code);
             }
 
             // Sync out to other nodes (cluster)
-            if (!item.shouldBeSynchronized) {
+            if (!item.synchronized) {
                 continue;
             }
-            _scriptsToSync.push_back(item.script);
+            _scriptsToSync.push_back(item.code);
 
             // Send to other peers (parallel connection)
-            const bool shouldSendToRemote = item.shouldSendToRemote;
-            if (global::parallelPeer->isHost() && shouldSendToRemote) {
-                global::parallelPeer->sendScript(item.script);
+            if (global::parallelPeer->isHost() && item.sendToRemote) {
+                global::parallelPeer->sendScript(item.code);
             }
         }
     }
     else {
         while (!_incomingScripts.empty()) {
-            QueueItem item = std::move(_incomingScripts.front());
+            Script item = std::move(_incomingScripts.front());
             _incomingScripts.pop();
-            _clientScriptQueue.push(item.script);
+            _clientScriptQueue.push(item.code);
         }
     }
 }
@@ -539,11 +530,10 @@ void ScriptEngine::postSync(bool isMaster) {
 
     if (isMaster) {
         while (!_masterScriptQueue.empty()) {
-            std::string script = std::move(_masterScriptQueue.front().script);
-            ScriptCallback callback = std::move(_masterScriptQueue.front().callback);
+            Script script = std::move(_masterScriptQueue.front());
             _masterScriptQueue.pop();
             try {
-                runScript(script, callback);
+                runScript(script);
             }
             catch (const ghoul::RuntimeError& e) {
                 LERRORC(e.component, e.message);
@@ -555,7 +545,7 @@ void ScriptEngine::postSync(bool isMaster) {
         std::lock_guard guard(_clientScriptsMutex);
         while (!_clientScriptQueue.empty()) {
             try {
-                runScript(_clientScriptQueue.front());
+                runScript({ _clientScriptQueue.front() });
                 _clientScriptQueue.pop();
             }
             catch (const ghoul::RuntimeError& e) {
@@ -565,24 +555,18 @@ void ScriptEngine::postSync(bool isMaster) {
     }
 }
 
-void ScriptEngine::queueScript(std::string script,
-                               ScriptEngine::ShouldBeSynchronized shouldBeSynchronized,
-                               ScriptEngine::ShouldSendToRemote shouldSendToRemote,
-                               ScriptCallback callback)
-{
+void ScriptEngine::queueScript(Script script) {
     ZoneScoped;
 
-    if (script.empty()) {
+    if (script.code.empty()) {
         return;
     }
-    _incomingScripts.push({
-        std::move(script),
-        shouldBeSynchronized,
-        shouldSendToRemote,
-        std::move(callback)
-    });
+    _incomingScripts.push(std::move(script));
 }
 
+void ScriptEngine::queueScript(std::string script) {
+    queueScript({ .code = std::move(script) });
+}
 
 void ScriptEngine::addBaseLibrary() {
     ZoneScoped;
diff --git a/src/scripting/scriptscheduler.cpp b/src/scripting/scriptscheduler.cpp
index 7bf4fb1956..f7270ab576 100644
--- a/src/scripting/scriptscheduler.cpp
+++ b/src/scripting/scriptscheduler.cpp
@@ -259,11 +259,7 @@ void ScriptScheduler::setCurrentTime(double time) {
     if (_shouldRunAllTimeJump) {
         // Queue all scripts for the time jump
         for (const std::string& script : scheduledScripts) {
-            global::scriptEngine->queueScript(
-                script,
-                scripting::ScriptEngine::ShouldBeSynchronized::Yes,
-                scripting::ScriptEngine::ShouldSendToRemote::Yes
-            );
+            global::scriptEngine->queueScript(script);
         }
     }
 }

From bc8df9a3d9e131868ab6435aa23894f0bea43b3f Mon Sep 17 00:00:00 2001
From: Alexander Bock <mail@alexanderbock.eu>
Date: Tue, 10 Sep 2024 13:58:06 +0200
Subject: [PATCH 615/701] Fix issue with constellations asset when no sync
 folder is present

---
 .../digitaluniverse/constellations.asset      | 41 ++++++++++---------
 1 file changed, 22 insertions(+), 19 deletions(-)

diff --git a/data/assets/scene/digitaluniverse/constellations.asset b/data/assets/scene/digitaluniverse/constellations.asset
index 49a0768069..bf1957ef16 100644
--- a/data/assets/scene/digitaluniverse/constellations.asset
+++ b/data/assets/scene/digitaluniverse/constellations.asset
@@ -10,10 +10,6 @@ local speck = asset.resource({
 })
 
 
-local zodiacs = {
-  "CNC", "TAU", "PSC", "ARI", "LIB", "AQR", "CAP", "SCO", "VIR", "SGR", "GEM", "LEO"
-}
-
 local function zodiacsString(zodiacsList)
   local zodiacsString = "{"
   local isFirst = true
@@ -69,8 +65,6 @@ local Constellations = {
   }
 }
 
-local zodiacsString = zodiacsString(zodiacs)
-
 -- Actions
 local ShowConstellations = {
   Identifier = "os.constellations.ShowConstellations",
@@ -95,20 +89,29 @@ local HideConstellations = {
   IsLocal = false
 }
 
-local ShowZodiacs = {
-  Identifier = "os.constellation.ShowZodiacs",
-  Name = "Show zodiac",
-  Command = [[
-    openspace.setPropertyValueSingle("Scene.Constellations.Renderable.ConstellationSelection", ]] .. zodiacsString .. [[)
-    openspace.fadeIn("Scene.Constellations.Renderable")
-  ]],
-  Documentation = "Shows the zodiac constellations lines",
-  GuiPath = "/Constellations/Lines",
-  IsLocal = false
-}
+local ShowZodiacsIdentifier = "os.constellation.ShowZodiacs"
+
 
 
 asset.onInitialize(function()
+  -- Defining this in here as the zodiacsString function requires the file synchronization
+  -- to be completed
+
+  local zodiacsString = zodiacsString({
+    "CNC", "TAU", "PSC", "ARI", "LIB", "AQR", "CAP", "SCO", "VIR", "SGR", "GEM", "LEO"
+  })
+  local ShowZodiacs = {
+    Identifier = ShowZodiacsIdentifier,
+    Name = "Show zodiac",
+    Command = [[
+      openspace.setPropertyValueSingle("Scene.Constellations.Renderable.ConstellationSelection", ]] .. zodiacsString .. [[)
+      openspace.fadeIn("Scene.Constellations.Renderable")
+    ]],
+    Documentation = "Shows the zodiac constellations lines",
+    GuiPath = "/Constellations/Lines",
+    IsLocal = false
+  }
+
   openspace.addSceneGraphNode(Constellations)
 
   openspace.action.registerAction(ShowConstellations)
@@ -117,7 +120,7 @@ asset.onInitialize(function()
 end)
 
 asset.onDeinitialize(function()
-  openspace.action.removeAction(ShowZodiacs)
+  openspace.action.removeAction(ShowZodiacsIdentifier)
   openspace.action.removeAction(HideConstellations)
   openspace.action.removeAction(ShowConstellations)
 
@@ -127,7 +130,7 @@ end)
 asset.export(Constellations)
 asset.export("ShowConstellations", ShowConstellations.Identifier)
 asset.export("HideConstellations", HideConstellations.Identifier)
-asset.export("ShowZodiacs", ShowZodiacs.Identifier)
+asset.export("ShowZodiacs", ShowZodiacsIdentifier)
 
 
 

From 3024467cbc6d53113d8db24634978a3cf0431611 Mon Sep 17 00:00:00 2001
From: Alexander Bock <mail@alexanderbock.eu>
Date: Tue, 10 Sep 2024 15:05:23 +0200
Subject: [PATCH 616/701] Prevent crash when requesting a mouse click outside
 the window borders

---
 modules/webbrowser/src/webrenderhandler.cpp | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/modules/webbrowser/src/webrenderhandler.cpp b/modules/webbrowser/src/webrenderhandler.cpp
index 658f0c6417..a6388cde1f 100644
--- a/modules/webbrowser/src/webrenderhandler.cpp
+++ b/modules/webbrowser/src/webrenderhandler.cpp
@@ -233,6 +233,11 @@ void WebRenderHandler::updateTexture() {
 }
 
 bool WebRenderHandler::hasContent(int x, int y) {
+    // We don't have any content if we are querying outside the window size
+    if (x < 0 || x > _windowSize.x || y < 0 || y > _windowSize.y) {
+        return false;
+    }
+
     if (_acceleratedRendering) {
         // To see the alpha value of the pixel we first have to get the texture from the
         // GPU. Use a PBO for better performance

From b6819fc22e9c0f2e6cc7721675d39c1c5f2997ee Mon Sep 17 00:00:00 2001
From: Alexander Bock <mail@alexanderbock.eu>
Date: Wed, 11 Sep 2024 10:51:00 +0200
Subject: [PATCH 617/701] Fixes for unit tests.

  - Fix issue where a propertyowner would not report its uri correctly
  - Fix inconsistency with number->string conversions
  - Adapt SPICE tests to now baked-in leap seconds kernel
  - Disable CreateSingleColorImage test as it requires an OpenGL context
---
 include/openspace/util/json_helper.inl    |  22 +--
 src/properties/property.cpp               |   6 +-
 src/properties/propertyowner.cpp          |   2 +-
 src/util/json_helper.cpp                  |   2 +-
 tests/SpiceTest/spicekernels/naif0008.tls | 136 -----------------
 tests/test_jsonformatting.cpp             |   5 +-
 tests/test_lua_createsinglecolorimage.cpp |   4 +
 tests/test_profile.cpp                    |   2 +-
 tests/test_scriptscheduler.cpp            |  69 ---------
 tests/test_spicemanager.cpp               | 178 ++--------------------
 tests/test_timequantizer.cpp              |  17 ---
 11 files changed, 34 insertions(+), 409 deletions(-)
 delete mode 100644 tests/SpiceTest/spicekernels/naif0008.tls

diff --git a/include/openspace/util/json_helper.inl b/include/openspace/util/json_helper.inl
index cb7b8d8347..7ee5ef9608 100644
--- a/include/openspace/util/json_helper.inl
+++ b/include/openspace/util/json_helper.inl
@@ -71,22 +71,16 @@ std::string formatJson(T value) {
         return ghoul::formatJson(value);
     }
     else if constexpr (internal::isGlmVector<T>()) {
-        std::string values;
-        for (glm::length_t i = 0; i < ghoul::glm_components<T>::value; i++) {
-            values += std::to_string(value[i]) + ',';
-        }
-        values.pop_back();
-        return std::format("[{}]", values);
+        std::string v = std::format("{}", value);
+        v.front() = '[';
+        v.back() = ']';
+        return v;
     }
     else if constexpr (internal::isGlmMatrix<T>()) {
-        std::string values;
-        for (glm::length_t i = 0; i < T::type::row_type::length(); i++) {
-            for (glm::length_t j = 0; j < T::type::col_type::length(); j++) {
-                values += std::to_string(value[i][j]) + ',';
-            }
-        }
-        values.pop_back();
-        return std::format("[{}]", values);
+        std::string v = std::format("{}", value);
+        v.front() = '[';
+        v.back() = ']';
+        return v;
     }
     else {
         static_assert(sizeof(T) == 0, "JSON formatting of type T not implemented");
diff --git a/src/properties/property.cpp b/src/properties/property.cpp
index b47286d512..8a79e9bbd2 100644
--- a/src/properties/property.cpp
+++ b/src/properties/property.cpp
@@ -77,12 +77,8 @@ const std::string& Property::identifier() const {
 }
 
 std::string Property::uri() const {
-    std::string identifier = "";
     const std::string& ownerUri = owner()->uri();
-    if (!ownerUri.empty()) {
-        identifier = std::format("{}.{}", ownerUri, _identifier);
-    }
-    return identifier;
+    return !ownerUri.empty() ? std::format("{}.{}", ownerUri, _identifier) : _identifier;
 }
 
 std::any Property::get() const {
diff --git a/src/properties/propertyowner.cpp b/src/properties/propertyowner.cpp
index cae9dca8a4..0ee6dd5df7 100644
--- a/src/properties/propertyowner.cpp
+++ b/src/properties/propertyowner.cpp
@@ -167,7 +167,7 @@ std::string PropertyOwner::uri() const {
         currentOwner = currentOwner->owner();
     }
     // If the uri hasn't been sent at this point it is not valid, so send an empty string
-    return "";
+    return identifier;
 }
 
 bool PropertyOwner::hasProperty(const std::string& uri) const {
diff --git a/src/util/json_helper.cpp b/src/util/json_helper.cpp
index 4d32fb52b3..8f3f8cb938 100644
--- a/src/util/json_helper.cpp
+++ b/src/util/json_helper.cpp
@@ -83,7 +83,7 @@ std::string formatJsonNumber(double d) {
     if (!std::isfinite(d)) {
         return "null";
     }
-    return std::to_string(d);
+    return std::format("{}", d);
 }
 
 void sortJson(nlohmann::json& json, const std::string& key) {
diff --git a/tests/SpiceTest/spicekernels/naif0008.tls b/tests/SpiceTest/spicekernels/naif0008.tls
deleted file mode 100644
index e89e17ce28..0000000000
--- a/tests/SpiceTest/spicekernels/naif0008.tls
+++ /dev/null
@@ -1,136 +0,0 @@
-KPL/LSK
-
-
-LEAPSECONDS KERNEL FILE
-===========================================================================
-
-Modifications:
---------------
-
-2005, Aug. 3    NJB  Modified file to account for the leapsecond that
-                     will occur on December 31, 2005.
-                     
-1998, Jul  17   WLT  Modified file to account for the leapsecond that
-                     will occur on December 31, 1998.
-                     
-1997, Feb  22   WLT  Modified file to account for the leapsecond that
-                     will occur on June 30, 1997.
-                     
-1995, Dec  14   KSZ  Corrected date of last leapsecond from 1-1-95
-                     to 1-1-96.
-
-1995, Oct  25   WLT  Modified file to account for the leapsecond that
-                     will occur on Dec 31, 1995.
-
-1994, Jun  16   WLT  Modified file to account for the leapsecond on
-                     June 30, 1994.
-
-1993, Feb. 22  CHA   Modified file to account for the leapsecond on
-                     June 30, 1993.
-
-1992, Mar. 6   HAN   Modified file to account for the leapsecond on
-                     June 30, 1992.
-
-1990, Oct. 8   HAN   Modified file to account for the leapsecond on 
-                     Dec. 31, 1990.  
-
-
-Explanation:
-------------
-
-The contents of this file are used by the routine DELTET to compute the 
-time difference
-
-[1]       DELTA_ET  =  ET - UTC                                         
-          
-the increment to be applied to UTC to give ET. 
-
-The difference between UTC and TAI,
-
-[2]       DELTA_AT  =  TAI - UTC
-
-is always an integral number of seconds. The value of DELTA_AT was 10
-seconds in January 1972, and increases by one each time a leap second
-is declared. Combining [1] and [2] gives
-
-[3]       DELTA_ET  =  ET - (TAI - DELTA_AT)
-
-                    =  (ET - TAI) + DELTA_AT
-
-The difference (ET - TAI) is periodic, and is given by
-
-[4]       ET - TAI  =  DELTA_T_A  + K sin E 
-
-where DELTA_T_A and K are constant, and E is the eccentric anomaly of the 
-heliocentric orbit of the Earth-Moon barycenter. Equation [4], which ignores 
-small-period fluctuations, is accurate to about 0.000030 seconds.
-
-The eccentric anomaly E is given by 
-
-[5]       E = M + EB sin M
-
-where M is the mean anomaly, which in turn is given by 
-
-[6]       M = M  +  M t
-               0     1
-
-where t is the number of ephemeris seconds past J2000.
-
-Thus, in order to compute DELTA_ET, the following items are necessary.
-
-          DELTA_TA
-          K
-          EB
-          M0
-          M1
-          DELTA_AT      after each leap second.
-
-The numbers, and the formulation, are taken from the following sources.
-
-     1) Moyer, T.D., Transformation from Proper Time on Earth to 
-        Coordinate Time in Solar System Barycentric Space-Time Frame
-        of Reference, Parts 1 and 2, Celestial Mechanics 23 (1981),
-        33-56 and 57-68.
-
-     2) Moyer, T.D., Effects of Conversion to the J2000 Astronomical
-        Reference System on Algorithms for Computing Time Differences
-        and Clock Rates, JPL IOM 314.5--942, 1 October 1985.
-
-The variable names used above are consistent with those used in the 
-Astronomical Almanac.
-
-\begindata
-
-DELTET/DELTA_T_A       =   32.184
-DELTET/K               =    1.657D-3
-DELTET/EB              =    1.671D-2
-DELTET/M               = (  6.239996D0   1.99096871D-7 )
-
-DELTET/DELTA_AT        = ( 10,   @1972-JAN-1
-                           11,   @1972-JUL-1     
-                           12,   @1973-JAN-1     
-                           13,   @1974-JAN-1     
-                           14,   @1975-JAN-1          
-                           15,   @1976-JAN-1          
-                           16,   @1977-JAN-1          
-                           17,   @1978-JAN-1          
-                           18,   @1979-JAN-1          
-                           19,   @1980-JAN-1          
-                           20,   @1981-JUL-1          
-                           21,   @1982-JUL-1          
-                           22,   @1983-JUL-1          
-                           23,   @1985-JUL-1          
-                           24,   @1988-JAN-1 
-                           25,   @1990-JAN-1
-                           26,   @1991-JAN-1 
-                           27,   @1992-JUL-1
-                           28,   @1993-JUL-1
-                           29,   @1994-JUL-1
-                           30,   @1996-JAN-1 
-                           31,   @1997-JUL-1
-                           32,   @1999-JAN-1
-                           33,   @2006-JAN-1 )
-
-
-\begintext
-
diff --git a/tests/test_jsonformatting.cpp b/tests/test_jsonformatting.cpp
index e63a9acfa9..abc6e3f360 100644
--- a/tests/test_jsonformatting.cpp
+++ b/tests/test_jsonformatting.cpp
@@ -47,9 +47,8 @@ TEMPLATE_TEST_CASE("FormatJson", "[formatjson]", glm::vec2, glm::vec3,
     // Compare with Ghoul's Lua conversions. Note that Lua uses '{' for arrays,
     // while we here expect '[' for all glm types
     std::string luaValue = ghoul::to_string(val);
-    luaValue.replace(0, 1, "[");
-    luaValue.replace(luaValue.size() - 1, 1, "]");
-
+    luaValue.front() = '[';
+    luaValue.back() = ']';
     CHECK(json == luaValue);
 }
 
diff --git a/tests/test_lua_createsinglecolorimage.cpp b/tests/test_lua_createsinglecolorimage.cpp
index b4ac72ef88..ff0d53a289 100644
--- a/tests/test_lua_createsinglecolorimage.cpp
+++ b/tests/test_lua_createsinglecolorimage.cpp
@@ -34,6 +34,8 @@
 #include <ghoul/lua/lua_helper.h>
 #include <filesystem>
 
+#if 0
+
 TEST_CASE("CreateSingleColorImage: Create image and check return value",
           "[createsinglecolorimage]")
 {
@@ -86,3 +88,5 @@ TEST_CASE("CreateSingleColorImage: Load created image", "[createsinglecolorimage
     CHECK(width == 1);
     CHECK(height == 1);
 }
+
+#endif
diff --git a/tests/test_profile.cpp b/tests/test_profile.cpp
index 19255ebe4e..e69e4654e4 100644
--- a/tests/test_profile.cpp
+++ b/tests/test_profile.cpp
@@ -942,7 +942,7 @@ TEST_CASE("Save settings to profile", "[profile]") {
         Profile::Property::SetType::SetPropertyValueSingle
     );
     CHECK(profile.properties[0].name == "base.p1");
-    CHECK(profile.properties[0].value == "2.000000");
+    CHECK(profile.properties[0].value == "2");
     CHECK(
         profile.properties[1].setType ==
         Profile::Property::SetType::SetPropertyValueSingle
diff --git a/tests/test_scriptscheduler.cpp b/tests/test_scriptscheduler.cpp
index 42ac160e85..cce279fabd 100644
--- a/tests/test_scriptscheduler.cpp
+++ b/tests/test_scriptscheduler.cpp
@@ -36,10 +36,6 @@ TEST_CASE("ScriptScheduler: Simple Forward", "[scriptscheduler]") {
     using namespace openspace::scripting;
 
     SpiceManager::initialize();
-    SpiceManager::ref().loadKernel(
-        absPath("${TESTDIR}/SpiceTest/spicekernels/naif0008.tls")
-    );
-
 
     ScriptScheduler scheduler;
 
@@ -70,9 +66,6 @@ TEST_CASE("ScriptScheduler: Multiple Forward Single Jump", "[scriptscheduler]")
     using namespace openspace::scripting;
 
     SpiceManager::initialize();
-    SpiceManager::ref().loadKernel(
-        absPath("${TESTDIR}/SpiceTest/spicekernels/naif0008.tls")
-    );
 
     std::vector<ScriptScheduler::ScheduledScript> scripts;
     {
@@ -113,10 +106,6 @@ TEST_CASE("ScriptScheduler: Multiple Forward Ordering", "[scriptscheduler]") {
     using namespace std::string_literals;
 
     SpiceManager::initialize();
-    SpiceManager::ref().loadKernel(
-        absPath("${TESTDIR}/SpiceTest/spicekernels/naif0008.tls")
-    );
-
 
     std::vector<ScriptScheduler::ScheduledScript> scripts;
     {
@@ -154,9 +143,6 @@ TEST_CASE("ScriptScheduler: Simple Backward", "[scriptscheduler]") {
     using namespace std::string_literals;
 
     SpiceManager::initialize();
-    SpiceManager::ref().loadKernel(
-        absPath("${TESTDIR}/SpiceTest/spicekernels/naif0008.tls")
-    );
 
     std::vector<ScriptScheduler::ScheduledScript> scripts;
     {
@@ -187,10 +173,6 @@ TEST_CASE("ScriptScheduler: Multiple Backward Single Jump", "[scriptscheduler]")
     using namespace std::string_literals;
 
     SpiceManager::initialize();
-    SpiceManager::ref().loadKernel(
-        absPath("${TESTDIR}/SpiceTest/spicekernels/naif0008.tls")
-    );
-
 
     std::vector<ScriptScheduler::ScheduledScript> scripts;
     {
@@ -231,9 +213,6 @@ TEST_CASE("ScriptScheduler: Multiple Backward Ordering", "[scriptscheduler]") {
     using namespace std::string_literals;
 
     SpiceManager::initialize();
-    SpiceManager::ref().loadKernel(
-        absPath("${TESTDIR}/SpiceTest/spicekernels/naif0008.tls")
-    );
 
     std::vector<ScriptScheduler::ScheduledScript> scripts;
     {
@@ -270,9 +249,6 @@ TEST_CASE("ScriptScheduler: Empty", "[scriptscheduler]") {
     using namespace openspace::scripting;
 
     SpiceManager::initialize();
-    SpiceManager::ref().loadKernel(
-        absPath("${TESTDIR}/SpiceTest/spicekernels/naif0008.tls")
-    );
 
     static const std::vector<double> TestTimes = {
         0.0, 1.0, -1.0, std::numeric_limits<double>::min(),
@@ -302,9 +278,6 @@ TEST_CASE("ScriptScheduler: Forward Backwards", "[scriptscheduler]") {
     using namespace std::string_literals;
 
     SpiceManager::initialize();
-    SpiceManager::ref().loadKernel(
-        absPath("${TESTDIR}/SpiceTest/spicekernels/naif0008.tls")
-    );
 
     std::vector<ScriptScheduler::ScheduledScript> scripts;
     {
@@ -349,9 +322,6 @@ TEST_CASE("ScriptScheduler: Rewind", "[scriptscheduler]") {
     using namespace std::string_literals;
 
     SpiceManager::initialize();
-    SpiceManager::ref().loadKernel(
-        absPath("${TESTDIR}/SpiceTest/spicekernels/naif0008.tls")
-    );
 
     std::vector<ScriptScheduler::ScheduledScript> scripts;
     {
@@ -389,9 +359,6 @@ TEST_CASE("ScriptScheduler: CurrentTime", "[scriptscheduler]") {
     using namespace openspace::scripting;
 
     SpiceManager::initialize();
-    SpiceManager::ref().loadKernel(
-        absPath("${TESTDIR}/SpiceTest/spicekernels/naif0008.tls")
-    );
 
     static const std::vector<double> TestValues = {
         0.0, 1.0, 42.0, std::numeric_limits<double>::min(),
@@ -413,9 +380,6 @@ TEST_CASE("ScriptScheduler: All Scripts", "[scriptscheduler]") {
     using namespace std::string_literals;
 
     SpiceManager::initialize();
-    SpiceManager::ref().loadKernel(
-        absPath("${TESTDIR}/SpiceTest/spicekernels/naif0008.tls")
-    );
 
     std::vector<ScriptScheduler::ScheduledScript> scripts;
     {
@@ -456,9 +420,6 @@ TEST_CASE("ScriptScheduler: Jump Equal", "[scriptscheduler]") {
     using namespace std::string_literals;
 
     SpiceManager::initialize();
-    SpiceManager::ref().loadKernel(
-        absPath("${TESTDIR}/SpiceTest/spicekernels/naif0008.tls")
-    );
 
     std::vector<ScriptScheduler::ScheduledScript> scripts;
     {
@@ -496,9 +457,6 @@ TEST_CASE("ScriptScheduler: Same Time", "[scriptscheduler]") {
     using namespace std::string_literals;
 
     SpiceManager::initialize();
-    SpiceManager::ref().loadKernel(
-        absPath("${TESTDIR}/SpiceTest/spicekernels/naif0008.tls")
-    );
 
     std::vector<ScriptScheduler::ScheduledScript> scripts;
     {
@@ -529,9 +487,6 @@ TEST_CASE("ScriptScheduler: Multi Inner Jump", "[scriptscheduler]") {
     using namespace std::string_literals;
 
     SpiceManager::initialize();
-    SpiceManager::ref().loadKernel(
-        absPath("${TESTDIR}/SpiceTest/spicekernels/naif0008.tls")
-    );
 
     std::vector<ScriptScheduler::ScheduledScript> scripts;
     {
@@ -571,9 +526,6 @@ TEST_CASE(
     using namespace std::string_literals;
 
     SpiceManager::initialize();
-    SpiceManager::ref().loadKernel(
-        absPath("${TESTDIR}/SpiceTest/spicekernels/naif0008.tls")
-    );
 
     ScriptScheduler::ScheduledScript script1;
     script1.time = Time::convertTime("2000 JAN 03");
@@ -612,9 +564,6 @@ TEST_CASE("ScriptScheduler: Multiple Forward Ordering Multiple Load" "[scriptsch
     using namespace std::string_literals;
 
     SpiceManager::initialize();
-    SpiceManager::ref().loadKernel(
-        absPath("${TESTDIR}/SpiceTest/spicekernels/naif0008.tls")
-    );
 
     ScriptScheduler::ScheduledScript script1;
     script1.time = Time::convertTime("2000 JAN 03");
@@ -651,9 +600,6 @@ TEST_CASE(
     using namespace std::string_literals;
 
     SpiceManager::initialize();
-    SpiceManager::ref().loadKernel(
-        absPath("${TESTDIR}/SpiceTest/spicekernels/naif0008.tls")
-    );
 
     ScriptScheduler::ScheduledScript script1;
     script1.time = Time::convertTime("2000 JAN 03");
@@ -693,9 +639,6 @@ TEST_CASE(
     using namespace std::string_literals;
 
     SpiceManager::initialize();
-    SpiceManager::ref().loadKernel(
-        absPath("${TESTDIR}/SpiceTest/spicekernels/naif0008.tls")
-    );
 
     ScriptScheduler scheduler;
 
@@ -730,9 +673,6 @@ TEST_CASE("ScriptScheduler: Forward Backwards Multiple Load", "[scriptscheduler]
     using namespace std::string_literals;
 
     SpiceManager::initialize();
-    SpiceManager::ref().loadKernel(
-        absPath("${TESTDIR}/SpiceTest/spicekernels/naif0008.tls")
-    );
 
     ScriptScheduler::ScheduledScript script1;
     script1.time = Time::convertTime("2000 JAN 03");
@@ -773,9 +713,6 @@ TEST_CASE("ScriptScheduler: Rewind Multiple Load", "[scriptscheduler]") {
     using namespace std::string_literals;
 
     SpiceManager::initialize();
-    SpiceManager::ref().loadKernel(
-        absPath("${TESTDIR}/SpiceTest/spicekernels/naif0008.tls")
-    );
 
     ScriptScheduler::ScheduledScript script1;
     script1.time = Time::convertTime("2000 JAN 03");
@@ -810,9 +747,6 @@ TEST_CASE("ScriptScheduler: All Scripts Multiple Load", "[scriptscheduler]") {
     using namespace std::string_literals;
 
     SpiceManager::initialize();
-    SpiceManager::ref().loadKernel(
-        absPath("${TESTDIR}/SpiceTest/spicekernels/naif0008.tls")
-    );
 
     ScriptScheduler::ScheduledScript script1;
     script1.time = Time::convertTime("2000 JAN 03");
@@ -849,9 +783,6 @@ TEST_CASE("ScriptScheduler: All Scripts Mixed Load", "[scriptscheduler]") {
     using namespace std::string_literals;
 
     SpiceManager::initialize();
-    SpiceManager::ref().loadKernel(
-        absPath("${TESTDIR}/SpiceTest/spicekernels/naif0008.tls")
-    );
 
     ScriptScheduler::ScheduledScript script1;
     script1.time = Time::convertTime("2000 JAN 03");
diff --git a/tests/test_spicemanager.cpp b/tests/test_spicemanager.cpp
index 2f8b2be770..3b0deb9585 100644
--- a/tests/test_spicemanager.cpp
+++ b/tests/test_spicemanager.cpp
@@ -37,199 +37,55 @@ namespace {
     // The remaining methods rely on multiple kernels, loaded as a SPICE 'meta-kernel'
     void loadMetaKernel() {
         const int k1 = SpiceManager::ref().loadKernel(
-            absPath("${TESTDIR}/SpiceTest/spicekernels/naif0008.tls")
-        );
-        CHECK(k1 == 1);
-
-        const int k2 = SpiceManager::ref().loadKernel(
             absPath("${TESTDIR}/SpiceTest/spicekernels/cas00084.tsc")
         );
-        CHECK(k2 == 2);
+        CHECK(k1 == 3);
 
-        const int k3 = SpiceManager::ref().loadKernel(
+        const int k2 = SpiceManager::ref().loadKernel(
             absPath("${TESTDIR}/SpiceTest/spicekernels/981005_PLTEPH-DE405S.bsp")
         );
-        CHECK(k3 == 3);
+        CHECK(k2 == 4);
 
-        const int k4 = SpiceManager::ref().loadKernel(
+        const int k3 = SpiceManager::ref().loadKernel(
             absPath("${TESTDIR}/SpiceTest/spicekernels/020514_SE_SAT105.bsp")
         );
-        CHECK(k4 == 4);
+        CHECK(k3 == 5);
 
-        const int k5 = SpiceManager::ref().loadKernel(
+        const int k4 = SpiceManager::ref().loadKernel(
             absPath("${TESTDIR}/SpiceTest/spicekernels/030201AP_SK_SM546_T45.bsp")
         );
-        CHECK(k5 == 5);
+        CHECK(k4 == 6);
 
-        const int k6 = SpiceManager::ref().loadKernel(
+        const int k5 = SpiceManager::ref().loadKernel(
             absPath("${TESTDIR}/SpiceTest/spicekernels/cas_v37.tf")
         );
-        CHECK(k6 == 6);
+        CHECK(k5 == 7);
 
-        const int k7 = SpiceManager::ref().loadKernel(
+        const int k6 = SpiceManager::ref().loadKernel(
             absPath("${TESTDIR}/SpiceTest/spicekernels/04135_04171pc_psiv2.bc")
         );
-        CHECK(k7 == 7);
+        CHECK(k6 == 8);
 
-        const int k8 = SpiceManager::ref().loadKernel(
+        const int k7 = SpiceManager::ref().loadKernel(
             absPath("${TESTDIR}/SpiceTest/spicekernels/cpck05Mar2004.tpc")
         );
-        CHECK(k8 == 8);
+        CHECK(k7 == 9);
 
-        const int k9 = SpiceManager::ref().loadKernel(
+        const int k8 = SpiceManager::ref().loadKernel(
             absPath("${TESTDIR}/SpiceTest/spicekernels/cas_iss_v09.ti")
         );
-        CHECK(k9 == 9);
-    }
-
-    int loadLSKKernel() {
-        const int kernelID = SpiceManager::ref().loadKernel(
-            absPath("${TESTDIR}/SpiceTest/spicekernels/naif0008.tls")
-        );
-        CHECK(kernelID == 1);
-        return kernelID;
+        CHECK(k8 == 10);
     }
 
     int loadPCKKernel() {
         const int kernelID = SpiceManager::ref().loadKernel(
             absPath("${TESTDIR}/SpiceTest/spicekernels/cpck05Mar2004.tpc")
         );
-        CHECK(kernelID == 1);
+        CHECK(kernelID == 3);
         return kernelID;
     }
 } // namespace
 
-TEST_CASE("SpiceManager: Load Single Kernel", "[spicemanager]") {
-    constexpr int FileLength = 128;
-    constexpr int TypeLength = 32;
-    constexpr int SourceLength = 128;
-
-    SpiceManager::initialize();
-
-    loadLSKKernel();
-
-    SpiceInt handle = 0;
-    std::array<char, FileLength> file;
-    std::array<char, TypeLength> filtyp;
-    std::array<char, SourceLength> source;
-    SpiceBoolean found = SPICEFALSE;
-    kdata_c(
-        0,
-        "text",
-        FileLength,
-        TypeLength,
-        SourceLength,
-        file.data(),
-        filtyp.data(),
-        source.data(),
-        &handle,
-        &found
-    );
-    CHECK(found == SPICETRUE);
-
-    SpiceManager::deinitialize();
-}
-
-TEST_CASE("SpiceManager: Unload Kernel String", "[spicemanager]") {
-    constexpr int FileLength = 128;
-    constexpr int TypeLength = 32;
-    constexpr int SourceLength = 128;
-
-    SpiceManager::initialize();
-
-    loadLSKKernel();
-
-    SpiceInt handle = 0;
-    std::array<char, FileLength> file;
-    std::array<char, TypeLength> filtyp;
-    std::array<char, SourceLength> source;
-    SpiceBoolean found = SPICEFALSE;
-    kdata_c(
-        0,
-        "text",
-        FileLength,
-        TypeLength,
-        SourceLength,
-        file.data(),
-        filtyp.data(),
-        source.data(),
-        &handle,
-        &found
-    );
-    CHECK(found == SPICETRUE);
-
-    // unload using string keyword
-    SpiceManager::ref().unloadKernel(
-        absPath("${TESTDIR}/SpiceTest/spicekernels/naif0008.tls")
-    );
-
-    found = SPICEFALSE;
-    kdata_c(
-        0,
-        "text",
-        FileLength,
-        TypeLength,
-        SourceLength,
-        file.data(),
-        filtyp.data(),
-        source.data(),
-        &handle,
-        &found
-    );
-    CHECK(found != SPICETRUE);
-
-    SpiceManager::deinitialize();
-}
-
-TEST_CASE("SpiceManager: Unload Kernel Integer", "[spicemanager]") {
-    constexpr int FileLength = 128;
-    constexpr int TypeLength = 32;
-    constexpr int SourceLength = 128;
-
-    SpiceManager::initialize();
-
-    const int kernelID = loadLSKKernel();
-
-    SpiceInt handle = 0;
-    std::array<char, FileLength> file;
-    std::array<char, TypeLength> filtyp;
-    std::array<char, SourceLength> source;
-    SpiceBoolean found = SPICEFALSE;
-    kdata_c(
-        0,
-        "text",
-        FileLength,
-        TypeLength,
-        SourceLength,
-        file.data(),
-        filtyp.data(),
-        source.data(),
-        &handle,
-        &found
-    );
-    CHECK(found == SPICETRUE);
-
-    // unload using unique int ID
-    SpiceManager::ref().unloadKernel(kernelID);
-
-    found = SPICEFALSE;
-    kdata_c(
-        0,
-        "text",
-        FileLength,
-        TypeLength,
-        SourceLength,
-        file.data(),
-        filtyp.data(),
-        source.data(),
-        &handle,
-        &found
-    );
-    CHECK(found != SPICETRUE);
-
-    SpiceManager::deinitialize();
-}
-
 TEST_CASE("SpiceManager: Has Value", "[spicemanager]") {
     SpiceManager::initialize();
 
@@ -299,8 +155,6 @@ TEST_CASE("SpiceManager: Get Value From ID ND", "[spicemanager]") {
 TEST_CASE("SpiceManager: String To Ephemeris Time", "[spicemanager]") {
     SpiceManager::initialize();
 
-    loadLSKKernel();
-
     double control_ephemerisTime = 0.0;
     const std::string date = "Thu Mar 20 12:53:29 PST 1997";
     str2et_c(date.c_str(), &control_ephemerisTime);
diff --git a/tests/test_timequantizer.cpp b/tests/test_timequantizer.cpp
index 25df8bee32..175c926e30 100644
--- a/tests/test_timequantizer.cpp
+++ b/tests/test_timequantizer.cpp
@@ -34,14 +34,6 @@
 using namespace openspace;
 
 namespace {
-    int loadLSKKernel() {
-        const int kernelID = openspace::SpiceManager::ref().loadKernel(
-            absPath("${TESTDIR}/SpiceTest/spicekernels/naif0008.tls")
-        );
-        CHECK(kernelID == 1);
-        return kernelID;
-    }
-
     void singleTimeTest(Time& t, globebrowsing::TimeQuantizer& tq, bool clamp,
                         const std::string& input, const std::string& expected)
     {
@@ -113,7 +105,6 @@ namespace {
 TEST_CASE("TimeQuantizer: Test years resolution", "[timequantizer]") {
     SpiceManager::initialize();
 
-    loadLSKKernel();
     globebrowsing::TimeQuantizer t1;
     Time testT;
 
@@ -154,7 +145,6 @@ TEST_CASE("TimeQuantizer: Test years resolution", "[timequantizer]") {
 TEST_CASE("TimeQuantizer: Test days resolution", "[timequantizer]") {
     SpiceManager::initialize();
 
-    loadLSKKernel();
     globebrowsing::TimeQuantizer t1;
     Time testT;
 
@@ -202,7 +192,6 @@ TEST_CASE("TimeQuantizer: Test days resolution", "[timequantizer]") {
 TEST_CASE("TimeQuantizer: Test months resolution", "[timequantizer]") {
     SpiceManager::initialize();
 
-    loadLSKKernel();
     globebrowsing::TimeQuantizer t1;
     Time testT;
 
@@ -249,7 +238,6 @@ TEST_CASE("TimeQuantizer: Test months resolution", "[timequantizer]") {
 TEST_CASE("TimeQuantizer: Test hours & minutes resolution", "[timequantizer]") {
     SpiceManager::initialize();
 
-    loadLSKKernel();
     globebrowsing::TimeQuantizer t1;
     Time testT;
 
@@ -288,7 +276,6 @@ TEST_CASE("TimeQuantizer: Test hours & minutes resolution", "[timequantizer]") {
 TEST_CASE("TimeQuantizer: Test pre-2000 dates", "[timequantizer]") {
     SpiceManager::initialize();
 
-    loadLSKKernel();
     globebrowsing::TimeQuantizer t1;
     Time testT;
 
@@ -319,7 +306,6 @@ TEST_CASE("TimeQuantizer: Test pre-2000 dates", "[timequantizer]") {
 TEST_CASE("TimeQuantizer: Test valid resolutions", "[timequantizer]") {
     SpiceManager::initialize();
 
-    loadLSKKernel();
     globebrowsing::TimeQuantizer t1;
 
     singleResolutionTest(t1, "29d", "(d)ay option.", true);
@@ -342,7 +328,6 @@ TEST_CASE("TimeQuantizer: Test valid resolutions", "[timequantizer]") {
 TEST_CASE("TimeQuantizer: Test start time pre-existing object", "[timequantizer]") {
     SpiceManager::initialize();
 
-    loadLSKKernel();
     globebrowsing::TimeQuantizer t1;
 
     singleStartTimeTest(t1, "2017-01-20T00:00:00", "Invalid start", false);
@@ -357,8 +342,6 @@ TEST_CASE("TimeQuantizer: Test start time pre-existing object", "[timequantizer]
 TEST_CASE("TimeQuantizer: Test start time using constructor", "[timequantizer]") {
     SpiceManager::initialize();
 
-    loadLSKKernel();
-
     singleStartTimeTest("2017-01-20T00:00:00", "Invalid start", false);
     singleStartTimeTest("2017-01-32T00:00:00", "For January the day must be at least 1.0D0 and less than 3.2E+01", true);
     singleStartTimeTest("2017-01-28T12:00:00", "Invalid start time value", true);

From 77672f0cc4f163d440a3cfefb4e7fc5dece9b0df Mon Sep 17 00:00:00 2001
From: Emma Broman <emma.broman@liu.se>
Date: Wed, 11 Sep 2024 16:40:38 +0200
Subject: [PATCH 618/701] Fix, cleanup and simplify RenderableGlobe properties
 (#3408)

* Restructure "general properties" into shadow mapping and regular ones

To better connect to subpropertyowners and avoid having to specify an ordered list in constructor... Hard to keep track of

* Restructure properties in constructor to more easily find errors

* Add values that could not be set from parameters (e.g. from asset or script)

* Apply suggestions from code review

Co-authored-by: Alexander Bock <alexander.bock@liu.se>

* Address review comments

---------

Co-authored-by: Alexander Bock <alexander.bock@liu.se>
---
 modules/globebrowsing/src/renderableglobe.cpp | 243 +++++++++---------
 modules/globebrowsing/src/renderableglobe.h   |  71 +++--
 2 files changed, 162 insertions(+), 152 deletions(-)

diff --git a/modules/globebrowsing/src/renderableglobe.cpp b/modules/globebrowsing/src/renderableglobe.cpp
index e223a9da50..ceb4822174 100644
--- a/modules/globebrowsing/src/renderableglobe.cpp
+++ b/modules/globebrowsing/src/renderableglobe.cpp
@@ -176,6 +176,13 @@ namespace {
         openspace::properties::Property::Visibility::AdvancedUser
     };
 
+    constexpr openspace::properties::Property::PropertyInfo AmbientIntensityInfo = {
+        "AmbientIntensity",
+        "Ambient Intensity",
+        "The intensity factor for the ambient light used for light shading.",
+        openspace::properties::Property::Visibility::User
+    };
+
     constexpr openspace::properties::Property::PropertyInfo LightSourceNodeInfo = {
         "LightSourceNode",
         "Light Source",
@@ -253,13 +260,6 @@ namespace {
         openspace::properties::Property::Visibility::Developer
     };
 
-    constexpr openspace::properties::Property::PropertyInfo AmbientIntensityInfo = {
-        "AmbientIntensity",
-        "Ambient Intensity",
-        "The intensity factor for the ambient light used for light shading.",
-        openspace::properties::Property::Visibility::User
-    };
-
     constexpr openspace::properties::Property::PropertyInfo NActiveLayersInfo = {
         "NActiveLayers",
         "Number of active layers",
@@ -276,9 +276,24 @@ namespace {
         // [[codegen::verbatim(PerformShadingInfo.description)]]
         std::optional<bool> performShading;
 
+        // [[codegen::verbatim(AccurateNormalsInfo.description)]]
+        std::optional<bool> useAccurateNormals;
+
+        // [[codegen::verbatim(AmbientIntensityInfo.description)]]
+        std::optional<double> ambientIntensity;
+
+        // [[codegen::verbatim(LightSourceNodeInfo.description)]]
+        std::optional<std::string> lightSourceNode;
+
         // [[codegen::verbatim(RenderAtDistanceInfo.description)]]
         std::optional<bool> renderAtDistance;
 
+        // [[codegen::verbatim(TargetLodScaleFactorInfo.description)]]
+        std::optional<double> targetLodScaleFactor;
+
+        // [[codegen::verbatim(OrenNayarRoughnessInfo.description)]]
+        std::optional<double> orenNayarRoughness;
+
         // A list of layers that should be added to the globe.
         std::optional<std::map<std::string, ghoul::Dictionary>> layers
             [[codegen::reference("globebrowsing_layermanager")]];
@@ -314,9 +329,6 @@ namespace {
 
         std::optional<ghoul::Dictionary> shadows
             [[codegen::reference("globebrowsing_shadows_component")]];
-
-        // [[codegen::verbatim(LightSourceNodeInfo.description)]]
-        std::optional<std::string> lightSourceNode;
     };
 #include "renderableglobe_codegen.cpp"
 } // namespace
@@ -570,6 +582,17 @@ documentation::Documentation RenderableGlobe::Documentation() {
 
 RenderableGlobe::RenderableGlobe(const ghoul::Dictionary& dictionary)
     : Renderable(dictionary)
+    , _performShading(PerformShadingInfo, true)
+    , _useAccurateNormals(AccurateNormalsInfo, false)
+    , _ambientIntensity(AmbientIntensityInfo, 0.05f, 0.f, 1.f)
+    , _lightSourceNodeName(LightSourceNodeInfo)
+    , _renderAtDistance(RenderAtDistanceInfo, false)
+    , _eclipseShadowsEnabled(EclipseInfo, false)
+    , _eclipseHardShadows(EclipseHardShadowsInfo, false)
+    , _targetLodScaleFactor(TargetLodScaleFactorInfo, 15.f, 1.f, 50.f)
+    , _currentLodScaleFactor(CurrentLodScaleFactorInfo, 15.f, 1.f, 50.f)
+    , _orenNayarRoughness(OrenNayarRoughnessInfo, 0.f, 0.f, 1.f)
+    , _nActiveLayers(NActiveLayersInfo, 0, 0, OpenGLCap.maxTextureUnits() / 3)
     , _debugProperties({
         BoolProperty(ShowChunkEdgeInfo, false),
         BoolProperty(LevelProjectedAreaInfo, true),
@@ -578,31 +601,20 @@ RenderableGlobe::RenderableGlobe(const ghoul::Dictionary& dictionary)
         IntProperty(ModelSpaceRenderingInfo, 14, 1, 22),
         IntProperty(DynamicLodIterationCountInfo, 16, 4, 128)
     })
-    , _generalProperties({
-        BoolProperty(PerformShadingInfo, true),
-        BoolProperty(AccurateNormalsInfo, false),
-        BoolProperty(EclipseInfo, false),
-        BoolProperty(EclipseHardShadowsInfo, false),
-        BoolProperty(ShadowMappingInfo, false),
-        BoolProperty(RenderAtDistanceInfo, false),
-        FloatProperty(ZFightingPercentageInfo, 0.995f, 0.000001f, 1.f),
-        IntProperty(NumberShadowSamplesInfo, 5, 1, 7),
-        FloatProperty(TargetLodScaleFactorInfo, 15.f, 1.f, 50.f),
-        FloatProperty(CurrentLodScaleFactorInfo, 15.f, 1.f, 50.f),
-        FloatProperty(OrenNayarRoughnessInfo, 0.f, 0.f, 1.f),
-        FloatProperty(AmbientIntensityInfo, 0.05f, 0.f, 1.f),
-        IntProperty(NActiveLayersInfo, 0, 0, OpenGLCap.maxTextureUnits() / 3)
-    })
     , _debugPropertyOwner({ "Debug" })
-    , _shadowMappingPropertyOwner({ "ShadowMapping" })
+    , _shadowMappingProperties({
+        BoolProperty(ShadowMappingInfo, false),
+        FloatProperty(ZFightingPercentageInfo, 0.995f, 0.000001f, 1.f),
+        IntProperty(NumberShadowSamplesInfo, 5, 1, 7)
+    })
+    , _shadowMappingPropertyOwner({ "ShadowMapping", "Shadow Mapping"})
     , _grid(DefaultSkirtedGridSegments, DefaultSkirtedGridSegments)
     , _leftRoot(Chunk(LeftHemisphereIndex))
     , _rightRoot(Chunk(RightHemisphereIndex))
-    , _lightSourceNodeName(LightSourceNodeInfo)
 {
     const Parameters p = codegen::bake<Parameters>(dictionary);
 
-    _generalProperties.currentLodScaleFactor.setReadOnly(true);
+    _currentLodScaleFactor.setReadOnly(true);
 
     // Read the radii in to its own dictionary
     if (p.radii.has_value()) {
@@ -623,12 +635,6 @@ RenderableGlobe::RenderableGlobe(const ghoul::Dictionary& dictionary)
     // For globes, the interaction sphere is always the same as the bounding sphere
     setInteractionSphere(boundingSphere());
 
-    _generalProperties.performShading =
-        p.performShading.value_or(_generalProperties.performShading);
-
-    _generalProperties.renderAtDistance =
-        p.renderAtDistance.value_or(_generalProperties.renderAtDistance);
-
     // Init layer manager
     // @TODO (abock, 2021-03-25) The layermanager should be changed to take a
     // std::map<std::string, ghoul::Dictionary> instead and then we don't need to get it
@@ -642,9 +648,18 @@ RenderableGlobe::RenderableGlobe(const ghoul::Dictionary& dictionary)
     }
 
     addProperty(Fadeable::_opacity);
-    addProperty(_generalProperties.performShading);
-    addProperty(_generalProperties.useAccurateNormals);
-    addProperty(_generalProperties.renderAtDistance);
+
+    _performShading = p.performShading.value_or(_performShading);
+    addProperty(_performShading);
+
+    _useAccurateNormals = p.useAccurateNormals.value_or(_useAccurateNormals);
+    addProperty(_useAccurateNormals);
+
+    _renderAtDistance = p.renderAtDistance.value_or(_renderAtDistance);
+    addProperty(_renderAtDistance);
+
+    _ambientIntensity = p.ambientIntensity.value_or(_ambientIntensity);
+    addProperty(_ambientIntensity);
 
     _lightSourceNodeName.onChange([this]() {
         if (_lightSourceNodeName.value().empty()) {
@@ -678,29 +693,33 @@ RenderableGlobe::RenderableGlobe(const ghoul::Dictionary& dictionary)
         }
         _ellipsoid.setShadowConfigurationArray(shadowConfArray);
 
-        addProperty(_generalProperties.eclipseShadowsEnabled);
-        addProperty(_generalProperties.eclipseHardShadows);
+        // TODO: Missing value from parameters
+        addProperty(_eclipseShadowsEnabled);
+        addProperty(_eclipseHardShadows);
     }
 
-    _shadowMappingPropertyOwner.addProperty(_generalProperties.shadowMapping);
-    _shadowMappingPropertyOwner.addProperty(_generalProperties.zFightingPercentage);
-    _shadowMappingPropertyOwner.addProperty(_generalProperties.nShadowSamples);
-    _generalProperties.nShadowSamples.onChange([this]() {
+    _shadowMappingPropertyOwner.addProperty(_shadowMappingProperties.shadowMapping);
+    _shadowMappingPropertyOwner.addProperty(_shadowMappingProperties.zFightingPercentage);
+    _shadowMappingPropertyOwner.addProperty(_shadowMappingProperties.nShadowSamples);
+    _shadowMappingProperties.nShadowSamples.onChange([this]() {
         _shadersNeedRecompilation = true;
     });
     addPropertySubOwner(_shadowMappingPropertyOwner);
 
-    _generalProperties.targetLodScaleFactor.onChange([this]() {
-        const float sf = _generalProperties.targetLodScaleFactor;
-        _generalProperties.currentLodScaleFactor = sf;
+    _targetLodScaleFactor = p.targetLodScaleFactor.value_or(_targetLodScaleFactor);
+    _targetLodScaleFactor.onChange([this]() {
+        const float sf = _targetLodScaleFactor;
+        _currentLodScaleFactor = sf;
         _lodScaleFactorDirty = true;
     });
-    addProperty(_generalProperties.targetLodScaleFactor);
-    addProperty(_generalProperties.currentLodScaleFactor);
-    addProperty(_generalProperties.orenNayarRoughness);
-    addProperty(_generalProperties.ambientIntensity);
-    _generalProperties.nActiveLayers.setReadOnly(true);
-    addProperty(_generalProperties.nActiveLayers);
+    addProperty(_targetLodScaleFactor);
+    addProperty(_currentLodScaleFactor);
+
+    _orenNayarRoughness = p.orenNayarRoughness.value_or(_orenNayarRoughness);
+    addProperty(_orenNayarRoughness);
+
+    _nActiveLayers.setReadOnly(true);
+    addProperty(_nActiveLayers);
 
     _debugPropertyOwner.addProperty(_debugProperties.showChunkEdges);
     _debugPropertyOwner.addProperty(_debugProperties.levelByProjectedAreaElseDistance);
@@ -708,15 +727,17 @@ RenderableGlobe::RenderableGlobe(const ghoul::Dictionary& dictionary)
     _debugPropertyOwner.addProperty(_debugProperties.performFrustumCulling);
     _debugPropertyOwner.addProperty(_debugProperties.modelSpaceRenderingCutoffLevel);
     _debugPropertyOwner.addProperty(_debugProperties.dynamicLodIterationCount);
+    addPropertySubOwner(_debugPropertyOwner);
 
     auto notifyShaderRecompilation = [this]() {
         _shadersNeedRecompilation = true;
     };
-    _generalProperties.useAccurateNormals.onChange(notifyShaderRecompilation);
-    _generalProperties.eclipseShadowsEnabled.onChange(notifyShaderRecompilation);
-    _generalProperties.eclipseHardShadows.onChange(notifyShaderRecompilation);
-    _generalProperties.performShading.onChange(notifyShaderRecompilation);
+    _useAccurateNormals.onChange(notifyShaderRecompilation);
+    _eclipseShadowsEnabled.onChange(notifyShaderRecompilation);
+    _eclipseHardShadows.onChange(notifyShaderRecompilation);
+    _performShading.onChange(notifyShaderRecompilation);
     _debugProperties.showChunkEdges.onChange(notifyShaderRecompilation);
+    _shadowMappingProperties.shadowMapping.onChange(notifyShaderRecompilation);
 
     _layerManager.onChange([this](Layer* l) {
         _shadersNeedRecompilation = true;
@@ -724,8 +745,6 @@ RenderableGlobe::RenderableGlobe(const ghoul::Dictionary& dictionary)
         _nLayersIsDirty = true;
         _lastChangedLayer = l;
     });
-
-    addPropertySubOwner(_debugPropertyOwner);
     addPropertySubOwner(_layerManager);
 
     _globalChunkBuffer.resize(2048);
@@ -733,6 +752,11 @@ RenderableGlobe::RenderableGlobe(const ghoul::Dictionary& dictionary)
     _traversalMemory.resize(512);
 
     _labelsDictionary = p.labels.value_or(_labelsDictionary);
+    if (!_labelsDictionary.isEmpty()) {
+        // Fading of the labels should also depend on the fading of the globe
+        _globeLabelsComponent.setParentFadeable(this);
+        addPropertySubOwner(_globeLabelsComponent);
+    }
 
     // Init geojson manager
     _geoJsonManager.initialize(this);
@@ -750,9 +774,8 @@ RenderableGlobe::RenderableGlobe(const ghoul::Dictionary& dictionary)
         _shadowComponent = std::make_unique<ShadowComponent>(dictionary);
         _shadowComponent->initialize();
         addPropertySubOwner(_shadowComponent.get());
-        _generalProperties.shadowMapping = true;
+        _shadowMappingProperties.shadowMapping = true;
     }
-    _generalProperties.shadowMapping.onChange(notifyShaderRecompilation);
 
     // Use a secondary renderbin for labels, and other things that we want to be able to
     // render with transparency, on top of the globe, after the atmosphere step
@@ -762,10 +785,6 @@ RenderableGlobe::RenderableGlobe(const ghoul::Dictionary& dictionary)
 void RenderableGlobe::initializeGL() {
     if (!_labelsDictionary.isEmpty()) {
         _globeLabelsComponent.initialize(_labelsDictionary, this);
-        addPropertySubOwner(_globeLabelsComponent);
-
-        // Fading of the labels should also depend on the fading of the globe
-        _globeLabelsComponent.setParentFadeable(this);
     }
 
     _layerManager.update();
@@ -831,7 +850,7 @@ void RenderableGlobe::render(const RenderData& data, RendererTasks& rendererTask
     constexpr int res = 2880;
     const double distance = res * boundingSphere() / tfov;
 
-    if ((distanceToCamera < distance) || (_generalProperties.renderAtDistance)) {
+    if ((distanceToCamera < distance) || (_renderAtDistance)) {
         try {
             if (_shadowComponent && _shadowComponent->isEnabled()) {
                 // Set matrices and other GL states
@@ -1055,7 +1074,7 @@ void RenderableGlobe::renderChunks(const RenderData& data, RendererTasks&,
     if (_nLayersIsDirty) {
         std::array<LayerGroup*, LayerManager::NumLayerGroups> lgs =
             _layerManager.layerGroups();
-        _generalProperties.nActiveLayers = std::accumulate(
+        _nActiveLayers = std::accumulate(
             lgs.begin(),
             lgs.end(),
             0,
@@ -1076,7 +1095,7 @@ void RenderableGlobe::renderChunks(const RenderData& data, RendererTasks&,
     if (_layerManager.hasAnyBlendingLayersEnabled()) {
         if (_lodScaleFactorDirty) {
             const float dsf = static_cast<float>(
-                _generalProperties.currentLodScaleFactor * _ellipsoid.minimumRadius()
+                _currentLodScaleFactor * _ellipsoid.minimumRadius()
             );
 
             // We are setting the setIgnoreUniformLocationError as it is not super trivial
@@ -1098,12 +1117,12 @@ void RenderableGlobe::renderChunks(const RenderData& data, RendererTasks&,
         }
     }
 
-    if (_generalProperties.performShading) {
-        const float onr = _generalProperties.orenNayarRoughness;
+    if (_performShading) {
+        const float onr = _orenNayarRoughness;
         _localRenderer.program->setUniform("orenNayarRoughness", onr);
         _globalRenderer.program->setUniform("orenNayarRoughness", onr);
 
-        const float amb = _generalProperties.ambientIntensity;
+        const float amb = _ambientIntensity;
         _localRenderer.program->setUniform("ambientIntensity", amb);
         _globalRenderer.program->setUniform("ambientIntensity", amb);
     }
@@ -1124,7 +1143,7 @@ void RenderableGlobe::renderChunks(const RenderData& data, RendererTasks&,
         }
 
         const float dsf = static_cast<float>(
-            _generalProperties.currentLodScaleFactor * _ellipsoid.minimumRadius()
+            _currentLodScaleFactor * _ellipsoid.minimumRadius()
         );
         using IgnoreError = ghoul::opengl::ProgramObject::IgnoreError;
         _globalRenderer.program->setIgnoreUniformLocationError(IgnoreError::Yes);
@@ -1146,7 +1165,7 @@ void RenderableGlobe::renderChunks(const RenderData& data, RendererTasks&,
         }
 
         const float dsf = static_cast<float>(
-            _generalProperties.currentLodScaleFactor * _ellipsoid.minimumRadius()
+            _currentLodScaleFactor * _ellipsoid.minimumRadius()
         );
         using IgnoreError = ghoul::opengl::ProgramObject::IgnoreError;
         _localRenderer.program->setIgnoreUniformLocationError(IgnoreError::Yes);
@@ -1200,7 +1219,7 @@ void RenderableGlobe::renderChunks(const RenderData& data, RendererTasks&,
 
     const bool hasHeightLayer =
         !_layerManager.layerGroup(layers::Group::ID::HeightLayers).activeLayers().empty();
-    if (_generalProperties.useAccurateNormals && hasHeightLayer) {
+    if (_useAccurateNormals && hasHeightLayer) {
         // Apply an extra scaling to the height if the object is scaled
         _globalRenderer.program->setUniform(
             "heightScale",
@@ -1216,7 +1235,7 @@ void RenderableGlobe::renderChunks(const RenderData& data, RendererTasks&,
     const bool waterLayersActive =
         !_layerManager.layerGroup(Group::ID::WaterMasks).activeLayers().empty();
 
-    if (nightLayersActive || waterLayersActive || _generalProperties.performShading) {
+    if (nightLayersActive || waterLayersActive || _performShading) {
         const glm::dvec3 directionToSunWorldSpace =
             directionToLightSource(data.modelTransform.translation, _lightSourceNode);
 
@@ -1242,7 +1261,7 @@ void RenderableGlobe::renderChunks(const RenderData& data, RendererTasks&,
         data.camera.sgctInternal.projectionMatrix()
     );
 
-    if (nightLayersActive || waterLayersActive || _generalProperties.performShading) {
+    if (nightLayersActive || waterLayersActive || _performShading) {
         const glm::dvec3 directionToSunWorldSpace =
             directionToLightSource(data.modelTransform.translation, _lightSourceNode);
 
@@ -1343,21 +1362,19 @@ void RenderableGlobe::renderChunks(const RenderData& data, RendererTasks&,
         const int iterCount = _debugProperties.dynamicLodIterationCount;
         const bool exceededIterations =
             static_cast<int>(_iterationsOfUnavailableData) > iterCount;
-        const float clf = _generalProperties.currentLodScaleFactor;
-        const float clfMin = _generalProperties.currentLodScaleFactor.minValue();
-        const float targetLod = _generalProperties.targetLodScaleFactor;
+        const float clf = _currentLodScaleFactor;
+        const float clfMin = _currentLodScaleFactor.minValue();
+        const float targetLod = _targetLodScaleFactor;
         const bool validLodFactor = clf > clfMin;
         if (exceededIterations && validLodFactor) {
-            _generalProperties.currentLodScaleFactor =
-                _generalProperties.currentLodScaleFactor - 0.1f;
+            _currentLodScaleFactor = _currentLodScaleFactor - 0.1f;
             _iterationsOfUnavailableData = 0;
             _lodScaleFactorDirty = true;
         } // Make 2 times the iterations with available data to move it up again
         else if (static_cast<int>(_iterationsOfAvailableData) >
             (iterCount * 2) && clf < targetLod)
         {
-            _generalProperties.currentLodScaleFactor =
-                _generalProperties.currentLodScaleFactor + 0.1f;
+            _currentLodScaleFactor = _currentLodScaleFactor + 0.1f;
             _iterationsOfAvailableData = 0;
             _lodScaleFactorDirty = true;
         }
@@ -1410,15 +1427,13 @@ void RenderableGlobe::renderChunkGlobally(const Chunk& chunk, const RenderData&
 
     setCommonUniforms(program, chunk, data);
 
-    if (_generalProperties.eclipseShadowsEnabled &&
-        !_ellipsoid.shadowConfigurationArray().empty())
-    {
+    if (_eclipseShadowsEnabled && !_ellipsoid.shadowConfigurationArray().empty()) {
         calculateEclipseShadows(program, data, ShadowCompType::GLOBAL_SHADOW);
     }
 
     // Shadow Mapping
     ghoul::opengl::TextureUnit shadowMapUnit;
-    if (_generalProperties.shadowMapping && shadowData.shadowDepthTexture != 0) {
+    if (_shadowMappingProperties.shadowMapping && shadowData.shadowDepthTexture != 0) {
         // Adding the model transformation to the final shadow matrix so we have a
         // complete transformation from the model coordinates to the clip space of the
         // light position.
@@ -1431,9 +1446,12 @@ void RenderableGlobe::renderChunkGlobally(const Chunk& chunk, const RenderData&
         glBindTexture(GL_TEXTURE_2D, shadowData.shadowDepthTexture);
 
         program.setUniform("shadowMapTexture", shadowMapUnit);
-        program.setUniform("zFightingPercentage", _generalProperties.zFightingPercentage);
+        program.setUniform(
+            "zFightingPercentage",
+            _shadowMappingProperties.zFightingPercentage
+        );
     }
-    else if (_generalProperties.shadowMapping) {
+    else if (_shadowMappingProperties.shadowMapping) {
         shadowMapUnit.activate();
         // JCC: Avoiding a to recompiling the shaders or having more than one
         // set of shaders for this step.
@@ -1549,15 +1567,13 @@ void RenderableGlobe::renderChunkLocally(const Chunk& chunk, const RenderData& d
 
     setCommonUniforms(program, chunk, data);
 
-    if (_generalProperties.eclipseShadowsEnabled &&
-        !_ellipsoid.shadowConfigurationArray().empty())
-    {
+    if (_eclipseShadowsEnabled && !_ellipsoid.shadowConfigurationArray().empty()) {
         calculateEclipseShadows(program, data, ShadowCompType::LOCAL_SHADOW);
     }
 
     // Shadow Mapping
     ghoul::opengl::TextureUnit shadowMapUnit;
-    if (_generalProperties.shadowMapping && shadowData.shadowDepthTexture != 0) {
+    if (_shadowMappingProperties.shadowMapping && shadowData.shadowDepthTexture != 0) {
         // Adding the model transformation to the final shadow matrix so we have a
         // complete transformation from the model coordinates to the clip space of the
         // light position.
@@ -1570,9 +1586,12 @@ void RenderableGlobe::renderChunkLocally(const Chunk& chunk, const RenderData& d
         glBindTexture(GL_TEXTURE_2D, shadowData.shadowDepthTexture);
 
         program.setUniform("shadowMapTexture", shadowMapUnit);
-        program.setUniform("zFightingPercentage", _generalProperties.zFightingPercentage);
+        program.setUniform(
+            "zFightingPercentage",
+            _shadowMappingProperties.zFightingPercentage
+        );
     }
-    else if (_generalProperties.shadowMapping) {
+    else if (_shadowMappingProperties.shadowMapping) {
         shadowMapUnit.activate();
         // JCC: Avoiding a to recompiling the shaders or having more than one
         // set of shaders for this step.
@@ -1636,7 +1655,7 @@ void RenderableGlobe::setCommonUniforms(ghoul::opengl::ProgramObject& programObj
 
     ZoneScoped;
 
-    if (_generalProperties.useAccurateNormals &&
+    if (_useAccurateNormals &&
         !_layerManager.layerGroup(Group::ID::HeightLayers).activeLayers().empty())
     {
         const glm::dvec3 corner00 = _ellipsoid.cartesianSurfacePosition(
@@ -1737,31 +1756,22 @@ void RenderableGlobe::recompileShaders() {
     const bool hasHeightLayer =
         !_layerManager.layerGroup(layers::Group::ID::HeightLayers).activeLayers().empty();
 
-    pairs.emplace_back("useAccurateNormals",
-        std::to_string(_generalProperties.useAccurateNormals && hasHeightLayer)
-    );
     pairs.emplace_back(
-        "performShading",
-        std::to_string(_generalProperties.performShading)
-    );
-    pairs.emplace_back(
-        "useEclipseShadows",
-        std::to_string(_generalProperties.eclipseShadowsEnabled)
-    );
-    pairs.emplace_back(
-        "useEclipseHardShadows",
-        std::to_string(_generalProperties.eclipseHardShadows)
+        "useAccurateNormals",
+        std::to_string(_useAccurateNormals && hasHeightLayer)
     );
+    pairs.emplace_back("performShading", std::to_string(_performShading));
+    pairs.emplace_back("useEclipseShadows", std::to_string(_eclipseShadowsEnabled));
+    pairs.emplace_back("useEclipseHardShadows", std::to_string(_eclipseHardShadows));
     pairs.emplace_back(
         "enableShadowMapping",
-        std::to_string(_generalProperties.shadowMapping)
+        std::to_string(_shadowMappingProperties.shadowMapping)
     );
     pairs.emplace_back("showChunkEdges", std::to_string(_debugProperties.showChunkEdges));
     pairs.emplace_back("showHeightResolution", "0");
     pairs.emplace_back("showHeightIntensities", "0");
     pairs.emplace_back("defaultHeight", std::to_string(DefaultHeight));
 
-
     //
     // Create dictionary from layerpreprocessing data
     //
@@ -1850,7 +1860,10 @@ void RenderableGlobe::recompileShaders() {
     }
 
     // Shadow Mapping Samples
-    shaderDictionary.setValue("nShadowSamples", _generalProperties.nShadowSamples - 1);
+    shaderDictionary.setValue(
+        "nShadowSamples",
+        _shadowMappingProperties.nShadowSamples - 1
+    );
 
     // Exclise Shadow Samples
     const int nEclipseShadows = static_cast<int>(
@@ -2274,7 +2287,7 @@ void RenderableGlobe::calculateEclipseShadows(ghoul::opengl::ProgramObject& prog
     // JCC: Removed in favor of: #define USE_ECLIPSE_HARD_SHADOWS #{useEclipseHardShadows}
     /*programObject.setUniform(
         "hardShadows",
-        _generalProperties.eclipseHardShadows
+        _eclipseHardShadows
     );*/
     //programObject.setUniform("calculateEclipseShadows", true);
 }
@@ -2312,8 +2325,7 @@ int RenderableGlobe::desiredLevelByDistance(const Chunk& chunk,
     const double distanceToPatch = glm::length(cameraToChunk);
     const double distance = distanceToPatch;
 
-    const double scaleFactor = _generalProperties.currentLodScaleFactor *
-        _ellipsoid.minimumRadius();
+    const double scaleFactor = _currentLodScaleFactor * _ellipsoid.minimumRadius();
     const double projectedScaleFactor = scaleFactor / distance;
     const int desiredLevel = static_cast<int>(ceil(log2(projectedScaleFactor)));
     return desiredLevel;
@@ -2399,8 +2411,7 @@ int RenderableGlobe::desiredLevelByProjectedArea(const Chunk& chunk,
     const double areaABC = 0.5 * glm::length(glm::cross(AC, AB));
     const double projectedChunkAreaApprox = 8 * areaABC;
 
-    const double scaledArea = _generalProperties.currentLodScaleFactor *
-                              projectedChunkAreaApprox;
+    const double scaledArea = _currentLodScaleFactor * projectedChunkAreaApprox;
     return chunk.tileIndex.level + static_cast<int>(round(scaledArea - 1));
 }
 
diff --git a/modules/globebrowsing/src/renderableglobe.h b/modules/globebrowsing/src/renderableglobe.h
index e1f69b6045..7d3a81c1fb 100644
--- a/modules/globebrowsing/src/renderableglobe.h
+++ b/modules/globebrowsing/src/renderableglobe.h
@@ -128,38 +128,6 @@ public:
     static documentation::Documentation Documentation();
 
 private:
-    static constexpr int MinSplitDepth = 2;
-    static constexpr int MaxSplitDepth = 22;
-
-    struct {
-        properties::BoolProperty showChunkEdges;
-        properties::BoolProperty levelByProjectedAreaElseDistance;
-        properties::BoolProperty resetTileProviders;
-        properties::BoolProperty performFrustumCulling;
-        properties::IntProperty  modelSpaceRenderingCutoffLevel;
-        properties::IntProperty  dynamicLodIterationCount;
-    } _debugProperties;
-
-    struct {
-        properties::BoolProperty  performShading;
-        properties::BoolProperty  useAccurateNormals;
-        properties::BoolProperty  eclipseShadowsEnabled;
-        properties::BoolProperty  eclipseHardShadows;
-        properties::BoolProperty  shadowMapping;
-        properties::BoolProperty  renderAtDistance;
-        properties::FloatProperty zFightingPercentage;
-        properties::IntProperty   nShadowSamples;
-        properties::FloatProperty targetLodScaleFactor;
-        properties::FloatProperty currentLodScaleFactor;
-        properties::FloatProperty orenNayarRoughness;
-        properties::FloatProperty ambientIntensity;
-        properties::IntProperty   nActiveLayers;
-    } _generalProperties;
-
-    properties::PropertyOwner _debugPropertyOwner;
-
-    properties::PropertyOwner _shadowMappingPropertyOwner;
-
     /**
      * Test if a specific chunk can safely be culled without affecting the rendered image.
      *
@@ -245,16 +213,49 @@ private:
     void setCommonUniforms(ghoul::opengl::ProgramObject& programObject,
         const Chunk& chunk, const RenderData& data);
 
-
     void recompileShaders();
 
-
     void splitChunkNode(Chunk& cn, int depth);
     void mergeChunkNode(Chunk& cn);
     bool updateChunkTree(Chunk& cn, const RenderData& data, const glm::dmat4& mvp);
     void updateChunk(Chunk& chunk, const RenderData& data, const glm::dmat4& mvp) const;
     void freeChunkNode(Chunk* n);
 
+    static constexpr int MinSplitDepth = 2;
+    static constexpr int MaxSplitDepth = 22;
+
+    properties::BoolProperty _performShading;
+    properties::BoolProperty _useAccurateNormals;
+    properties::FloatProperty _ambientIntensity;
+    properties::StringProperty _lightSourceNodeName;
+
+    properties::BoolProperty _renderAtDistance;
+    properties::BoolProperty _eclipseShadowsEnabled;
+    properties::BoolProperty _eclipseHardShadows;
+    properties::FloatProperty _targetLodScaleFactor;
+    properties::FloatProperty _currentLodScaleFactor;
+    properties::FloatProperty _orenNayarRoughness;
+    properties::IntProperty _nActiveLayers;
+
+    struct {
+        properties::BoolProperty showChunkEdges;
+        properties::BoolProperty levelByProjectedAreaElseDistance;
+        properties::BoolProperty resetTileProviders;
+        properties::BoolProperty performFrustumCulling;
+        properties::IntProperty  modelSpaceRenderingCutoffLevel;
+        properties::IntProperty  dynamicLodIterationCount;
+    } _debugProperties;
+
+    properties::PropertyOwner _debugPropertyOwner;
+
+    struct {
+        properties::BoolProperty shadowMapping;
+        properties::FloatProperty zFightingPercentage;
+        properties::IntProperty nShadowSamples;
+    } _shadowMappingProperties;
+
+    properties::PropertyOwner _shadowMappingPropertyOwner;
+
     Ellipsoid _ellipsoid;
     SkirtedGrid _grid;
     LayerManager _layerManager;
@@ -270,7 +271,6 @@ private:
     std::vector<const Chunk*> _localChunkBuffer;
     std::vector<const Chunk*> _traversalMemory;
 
-
     Chunk _leftRoot;  // Covers all negative longitudes
     Chunk _rightRoot; // Covers all positive longitudes
 
@@ -293,7 +293,6 @@ private:
     } _localRenderer;
 
     SceneGraphNode* _lightSourceNode = nullptr;
-    properties::StringProperty _lightSourceNodeName;
 
     bool _shadersNeedRecompilation = true;
     bool _lodScaleFactorDirty = true;

From e24cff1d19a5049ef5ae7e94d2c58bd2ba7e6cc9 Mon Sep 17 00:00:00 2001
From: Alexander Bock <alexander.bock@liu.se>
Date: Thu, 12 Sep 2024 16:30:09 +0200
Subject: [PATCH 619/701] Handle warnings and coding style adaptations

---
 ext/ghoul                                      |  2 +-
 .../openspace/navigation/keyframenavigator.h   |  4 ++--
 .../pointcloud/sizemappingcomponent.cpp        |  4 ++--
 modules/base/rotation/constantrotation.cpp     |  2 +-
 .../globebrowsing/globebrowsingmodule_lua.inl  |  7 ++++---
 modules/globebrowsing/src/layergroup.cpp       |  4 ----
 modules/globebrowsing/src/renderableglobe.cpp  |  6 +++---
 modules/multiresvolume/rendering/tsp.cpp       |  4 ++--
 .../tasks/generaterawvolumefromfiletask.cpp    |  6 ++++--
 modules/volume/transferfunction.cpp            |  4 +++-
 modules/volume/volumemodule.cpp                |  4 +++-
 modules/webbrowser/include/browserclient.h     |  2 +-
 modules/webbrowser/include/webrenderhandler.h  |  4 ++--
 modules/webbrowser/src/browserclient.cpp       |  8 ++++----
 modules/webbrowser/src/webrenderhandler.cpp    |  4 ++--
 src/interaction/keyframerecording.cpp          |  2 +-
 src/interaction/sessionrecording.cpp           |  3 ++-
 src/navigation/keyframenavigator.cpp           | 18 +++++++-----------
 src/navigation/path.cpp                        | 13 +++++++++----
 src/scene/scenegraphnode.cpp                   |  2 +-
 20 files changed, 54 insertions(+), 49 deletions(-)

diff --git a/ext/ghoul b/ext/ghoul
index 47565ecda4..e26ea6366c 160000
--- a/ext/ghoul
+++ b/ext/ghoul
@@ -1 +1 @@
-Subproject commit 47565ecda4877077831b80eb9c16a38ad9f7e18b
+Subproject commit e26ea6366ca7e634b88ecf646da5b4adc8168b95
diff --git a/include/openspace/navigation/keyframenavigator.h b/include/openspace/navigation/keyframenavigator.h
index c9e2b8153d..76d1f58554 100644
--- a/include/openspace/navigation/keyframenavigator.h
+++ b/include/openspace/navigation/keyframenavigator.h
@@ -68,8 +68,8 @@ public:
      * \param ignoreFutureKeyframes `true` if only past keyframes are to be used
      * \return true only if a new future keyframe is available to set camera pose
      */
-    bool updateCamera(Camera& camera, bool ignoreFutureKeyframes);
-    static bool updateCamera(Camera* camera, const CameraPose& prevPose,
+    void updateCamera(Camera& camera, bool ignoreFutureKeyframes);
+    static void updateCamera(Camera* camera, const CameraPose& prevPose,
         const CameraPose& nextPose, double t, bool ignoreFutureKeyframes);
 
     Timeline<CameraPose>& timeline();
diff --git a/modules/base/rendering/pointcloud/sizemappingcomponent.cpp b/modules/base/rendering/pointcloud/sizemappingcomponent.cpp
index 4ed05e5ff5..1f3a65d711 100644
--- a/modules/base/rendering/pointcloud/sizemappingcomponent.cpp
+++ b/modules/base/rendering/pointcloud/sizemappingcomponent.cpp
@@ -170,10 +170,10 @@ SizeMappingComponent::SizeMappingComponent(const ghoul::Dictionary& dictionary)
             const Parameters::ScaleUnit scaleUnit =
                 std::get<Parameters::ScaleUnit>(*p.scaleFactor);
             const DistanceUnit distanceUnit = codegen::map<DistanceUnit>(scaleUnit);
-            scaleFactor = toMeter(distanceUnit);
+            scaleFactor = static_cast<float>(toMeter(distanceUnit));
         }
         else if (std::holds_alternative<double>(*p.scaleFactor)) {
-            scaleFactor = std::get<double>(*p.scaleFactor);
+            scaleFactor = static_cast<float>(std::get<double>(*p.scaleFactor));
         }
     }
 
diff --git a/modules/base/rotation/constantrotation.cpp b/modules/base/rotation/constantrotation.cpp
index 292012ad04..639b4d9e9f 100644
--- a/modules/base/rotation/constantrotation.cpp
+++ b/modules/base/rotation/constantrotation.cpp
@@ -49,7 +49,7 @@ namespace {
         // [[codegen::verbatim(RotationInfo.description)]]
         std::optional<glm::dvec3> rotationAxis
             [[codegen::inrange(glm::dvec3(-1.0), glm::dvec3(1.0))]];
-            
+
         // [[codegen::verbatim(RotationRateInfo.description)]]
         std::optional<float> rotationRate;
     };
diff --git a/modules/globebrowsing/globebrowsingmodule_lua.inl b/modules/globebrowsing/globebrowsingmodule_lua.inl
index df5170a851..af7d4a8269 100644
--- a/modules/globebrowsing/globebrowsingmodule_lua.inl
+++ b/modules/globebrowsing/globebrowsingmodule_lua.inl
@@ -284,7 +284,8 @@ namespace {
  * \param y The y value of the tile index
  * \param level The level of the tile index
  */
-[[codegen::luawrap]] void goToChunk(std::string globeIdentifier, int x, int y, int level) {
+[[codegen::luawrap]] void goToChunk(std::string globeIdentifier, int x, int y, int level)
+{
     using namespace openspace;
     using namespace globebrowsing;
 
@@ -495,8 +496,8 @@ void flyToGeoInternal(std::string globe, double latitude,
 }
 
  /**
-  * Fly the camera to a geographic coordinate (latitude, longitude and altitude) on a globe,
-  * using the path navigation system.
+  * Fly the camera to a geographic coordinate (latitude, longitude and altitude) on a
+  * globe, using the path navigation system.
   *
   * \param globe The identifier of a scene graph node that has a RenderableGlobe attached.
   *              If an empty string is provided, the current anchor node is used
diff --git a/modules/globebrowsing/src/layergroup.cpp b/modules/globebrowsing/src/layergroup.cpp
index 037f038df4..7d4d4aa64d 100644
--- a/modules/globebrowsing/src/layergroup.cpp
+++ b/modules/globebrowsing/src/layergroup.cpp
@@ -177,10 +177,6 @@ void LayerGroup::deleteLayer(const std::string& layerName) {
             // which will no longer be valid once it is deleted
             removePropertySubOwner(it->get());
             (*it)->deinitialize();
-            properties::PropertyOwner* layerGroup = it->get()->owner();
-            properties::PropertyOwner* layerManager = layerGroup->owner();
-            properties::PropertyOwner* globe = layerManager->owner();
-            properties::PropertyOwner* sceneGraphNode = globe->owner();
 
             // We need to keep the name of the layer since we only get it as a reference
             // and the name needs to survive the deletion
diff --git a/modules/globebrowsing/src/renderableglobe.cpp b/modules/globebrowsing/src/renderableglobe.cpp
index ceb4822174..e4f95bbec1 100644
--- a/modules/globebrowsing/src/renderableglobe.cpp
+++ b/modules/globebrowsing/src/renderableglobe.cpp
@@ -280,7 +280,7 @@ namespace {
         std::optional<bool> useAccurateNormals;
 
         // [[codegen::verbatim(AmbientIntensityInfo.description)]]
-        std::optional<double> ambientIntensity;
+        std::optional<float> ambientIntensity;
 
         // [[codegen::verbatim(LightSourceNodeInfo.description)]]
         std::optional<std::string> lightSourceNode;
@@ -289,10 +289,10 @@ namespace {
         std::optional<bool> renderAtDistance;
 
         // [[codegen::verbatim(TargetLodScaleFactorInfo.description)]]
-        std::optional<double> targetLodScaleFactor;
+        std::optional<float> targetLodScaleFactor;
 
         // [[codegen::verbatim(OrenNayarRoughnessInfo.description)]]
-        std::optional<double> orenNayarRoughness;
+        std::optional<float> orenNayarRoughness;
 
         // A list of layers that should be added to the globe.
         std::optional<std::map<std::string, ghoul::Dictionary>> layers
diff --git a/modules/multiresvolume/rendering/tsp.cpp b/modules/multiresvolume/rendering/tsp.cpp
index 0cacd4cae6..1fcab6636f 100644
--- a/modules/multiresvolume/rendering/tsp.cpp
+++ b/modules/multiresvolume/rendering/tsp.cpp
@@ -571,11 +571,11 @@ bool TSP::writeCache() {
 }
 
 float TSP::spatialError(unsigned int brickIndex) const {
-    return *reinterpret_cast<const float*>(_data[brickIndex*NUM_DATA + SPATIAL_ERR]);
+    return *reinterpret_cast<const float*>(&_data[brickIndex*NUM_DATA + SPATIAL_ERR]);
 }
 
 float TSP::temporalError(unsigned int brickIndex) const {
-    return *reinterpret_cast<const float*>(_data[brickIndex*NUM_DATA + TEMPORAL_ERR]);
+    return *reinterpret_cast<const float*>(&_data[brickIndex*NUM_DATA + TEMPORAL_ERR]);
 }
 
 unsigned int TSP::firstOctreeChild(unsigned int brickIndex) const {
diff --git a/modules/volume/tasks/generaterawvolumefromfiletask.cpp b/modules/volume/tasks/generaterawvolumefromfiletask.cpp
index 5eb19ebbf8..5052a069be 100644
--- a/modules/volume/tasks/generaterawvolumefromfiletask.cpp
+++ b/modules/volume/tasks/generaterawvolumefromfiletask.cpp
@@ -71,7 +71,9 @@ documentation::Documentation GenerateRawVolumeFromFileTask::Documentation() {
     return codegen::doc<Parameters>("generate_raw_volume_task");
 }
 
-GenerateRawVolumeFromFileTask::GenerateRawVolumeFromFileTask(const ghoul::Dictionary& dictionary) {
+GenerateRawVolumeFromFileTask::GenerateRawVolumeFromFileTask(
+                                                      const ghoul::Dictionary& dictionary)
+{
     const Parameters p = codegen::bake<Parameters>(dictionary);
 
     _inputFilePath = absPath(p.dataInputPath);
@@ -93,7 +95,7 @@ std::string GenerateRawVolumeFromFileTask::description() {
     );
 }
 
-void GenerateRawVolumeFromFileTask::perform(const Task::ProgressCallback& progressCallback) {
+void GenerateRawVolumeFromFileTask::perform(const ProgressCallback& progressCallback) {
 
     dataloader::Dataset data = dataloader::csv::loadCsvFile(_inputFilePath);
     progressCallback(0.3f);
diff --git a/modules/volume/transferfunction.cpp b/modules/volume/transferfunction.cpp
index f07afd4ce8..9c3bf02b83 100644
--- a/modules/volume/transferfunction.cpp
+++ b/modules/volume/transferfunction.cpp
@@ -71,7 +71,9 @@ bool TransferFunction::setEnvelopesFromLua(lua_State* state) {
             //    lua_pushnil(state);
             //    while (lua_next(state, -2)) {
             //        PrintTable(state);
-            //        std::string color = static_cast<std::string>(lua_tostring(state, -1));
+            //        std::string color = static_cast<std::string>(
+            //            lua_tostring(state, -1)
+            //        );
             //        lua_pop(state, 1);
             //        lua_pushnil(state);
             //        lua_next(state, -2);
diff --git a/modules/volume/volumemodule.cpp b/modules/volume/volumemodule.cpp
index 6818fdfcb7..dfc7d0ab00 100644
--- a/modules/volume/volumemodule.cpp
+++ b/modules/volume/volumemodule.cpp
@@ -49,7 +49,9 @@ void VolumeModule::internalInitialize(const ghoul::Dictionary&) {
     ghoul::TemplateFactory<Task>* tFactory = FactoryManager::ref().factory<Task>();
     ghoul_assert(tFactory, "No task factory existed");
     tFactory->registerClass<GenerateRawVolumeTask>("GenerateRawVolumeTask");
-    tFactory->registerClass<GenerateRawVolumeFromFileTask>("GenerateRawVolumeFromFileTask");
+    tFactory->registerClass<GenerateRawVolumeFromFileTask>(
+        "GenerateRawVolumeFromFileTask"
+    );
 }
 
 std::vector<documentation::Documentation> VolumeModule::documentations() const {
diff --git a/modules/webbrowser/include/browserclient.h b/modules/webbrowser/include/browserclient.h
index ef637f4048..962c38a6e2 100644
--- a/modules/webbrowser/include/browserclient.h
+++ b/modules/webbrowser/include/browserclient.h
@@ -55,7 +55,7 @@ public:
         bool OnCursorChange(CefRefPtr<CefBrowser> browser,
             CefCursorHandle cursor,
             cef_cursor_type_t type,
-            const CefCursorInfo& custom_cursor_info) override; 
+            const CefCursorInfo& custom_cursor_info) override;
         IMPLEMENT_REFCOUNTING(DisplayHandler);
     };
     BrowserClient(WebRenderHandler* handler, WebKeyboardHandler* keyboardHandler);
diff --git a/modules/webbrowser/include/webrenderhandler.h b/modules/webbrowser/include/webrenderhandler.h
index 6274fce02d..7119b7712a 100644
--- a/modules/webbrowser/include/webrenderhandler.h
+++ b/modules/webbrowser/include/webrenderhandler.h
@@ -69,7 +69,7 @@ public:
 
     // Used when the "shared_texture" flag is set to true for CEF. Uses a shared texture
     // from CEF that is allocated on another part of the GPU. Skip CPU allocationn for
-    // better performance. Needs OpenGl 4.5 or higher. 
+    // better performance. Needs OpenGl 4.5 or higher.
     void OnAcceleratedPaint(CefRefPtr<CefBrowser> browser, PaintElementType type,
         const RectList& dirtyRects, const CefAcceleratedPaintInfo& info) override;
 
@@ -78,7 +78,7 @@ public:
     bool hasContent(int x, int y);
 
     bool isTextureReady() const;
-    void updateTexture(); 
+    void updateTexture();
     void bindTexture();
 
 protected:
diff --git a/modules/webbrowser/src/browserclient.cpp b/modules/webbrowser/src/browserclient.cpp
index 18d4f69f31..bdb6868395 100644
--- a/modules/webbrowser/src/browserclient.cpp
+++ b/modules/webbrowser/src/browserclient.cpp
@@ -83,9 +83,9 @@ bool BrowserClient::NoContextMenuHandler::RunContextMenu(CefRefPtr<CefBrowser>,
 }
 
 bool BrowserClient::DisplayHandler::OnCursorChange(CefRefPtr<CefBrowser> browser,
-                                                  CefCursorHandle cursor,
+                                                  CefCursorHandle,
                                                   cef_cursor_type_t type,
-                                                  const CefCursorInfo& custom_cursor_info)
+                                                  const CefCursorInfo&)
 {
     WindowDelegate::Cursor newCursor;
     switch (type) {
@@ -101,13 +101,13 @@ bool BrowserClient::DisplayHandler::OnCursorChange(CefRefPtr<CefBrowser> browser
         case cef_cursor_type_t::CT_HAND:
             newCursor = WindowDelegate::Cursor::PointingHand;
             break;
-        case cef_cursor_type_t::CT_EASTWESTRESIZE: 
+        case cef_cursor_type_t::CT_EASTWESTRESIZE:
         case cef_cursor_type_t::CT_COLUMNRESIZE:
         case cef_cursor_type_t::CT_EASTRESIZE:
         case cef_cursor_type_t::CT_WESTRESIZE:
             newCursor = WindowDelegate::Cursor::ResizeEW;
             break;
-        case cef_cursor_type_t::CT_NORTHSOUTHRESIZE: 
+        case cef_cursor_type_t::CT_NORTHSOUTHRESIZE:
         case cef_cursor_type_t::CT_ROWRESIZE:
         case cef_cursor_type_t::CT_NORTHRESIZE:
         case cef_cursor_type_t::CT_SOUTHRESIZE:
diff --git a/modules/webbrowser/src/webrenderhandler.cpp b/modules/webbrowser/src/webrenderhandler.cpp
index a6388cde1f..38c11b4aea 100644
--- a/modules/webbrowser/src/webrenderhandler.cpp
+++ b/modules/webbrowser/src/webrenderhandler.cpp
@@ -117,7 +117,7 @@ void WebRenderHandler::OnPaint(CefRefPtr<CefBrowser>, CefRenderHandler::PaintEle
 }
 
 void WebRenderHandler::OnAcceleratedPaint(CefRefPtr<CefBrowser> browser,
-                                          PaintElementType type,
+                                          PaintElementType,
                                           const RectList& dirtyRects,
                                           const CefAcceleratedPaintInfo& info)
 {
@@ -135,7 +135,7 @@ void WebRenderHandler::OnAcceleratedPaint(CefRefPtr<CefBrowser> browser,
     // @TODO (ylvse 2024-08-20): minimizing window should be handled with the appropriate
     // function in the CefBrowser called WasHidden
     if (dirtyRects[0].height <= 1 || dirtyRects[0].width <= 1) {
-        return; 
+        return;
     }
     // This function is called asynchronously after a reshape which means we have to check
     // for what we request. Validate the size. This prevents rendering a texture with the
diff --git a/src/interaction/keyframerecording.cpp b/src/interaction/keyframerecording.cpp
index bdc3919dc3..88d33e49d0 100644
--- a/src/interaction/keyframerecording.cpp
+++ b/src/interaction/keyframerecording.cpp
@@ -345,7 +345,7 @@ void KeyframeRecording::preSynchronization(double dt) {
         SceneGraphNode* node = scene->sceneGraphNode(curr.focusNode);
 
         global::navigationHandler->orbitalNavigator().setFocusNode(node);
-        bool success = interaction::KeyframeNavigator::updateCamera(
+        interaction::KeyframeNavigator::updateCamera(
             global::navigationHandler->camera(),
             curr,
             next,
diff --git a/src/interaction/sessionrecording.cpp b/src/interaction/sessionrecording.cpp
index 1a516c7c27..d1b2322c04 100644
--- a/src/interaction/sessionrecording.cpp
+++ b/src/interaction/sessionrecording.cpp
@@ -2088,13 +2088,14 @@ bool SessionRecording::processCameraKeyframe(double now) {
         global::navigationHandler->orbitalNavigator().setFocusNode(n->identifier());
     }
 
-    return interaction::KeyframeNavigator::updateCamera(
+    interaction::KeyframeNavigator::updateCamera(
         global::navigationHandler->camera(),
         prevPose,
         nextPose,
         t,
         _ignoreRecordedScale
     );
+    return true;
 }
 
 bool SessionRecording::processScriptKeyframe() {
diff --git a/src/navigation/keyframenavigator.cpp b/src/navigation/keyframenavigator.cpp
index 1e62597f17..571f7e82bc 100644
--- a/src/navigation/keyframenavigator.cpp
+++ b/src/navigation/keyframenavigator.cpp
@@ -45,12 +45,12 @@ KeyframeNavigator::CameraPose::CameraPose(datamessagestructures::CameraKeyframe&
     , followFocusNodeRotation(kf._followNodeRotation)
 {}
 
-bool KeyframeNavigator::updateCamera(Camera& camera, bool ignoreFutureKeyframes) {
+void KeyframeNavigator::updateCamera(Camera& camera, bool ignoreFutureKeyframes) {
     const double now = currentTime();
     bool foundPrevKeyframe = false;
 
     if (_cameraPoseTimeline.nKeyframes() == 0) {
-        return false;
+        return;
     }
 
     const Keyframe<CameraPose>* nextKeyframe =
@@ -66,7 +66,7 @@ bool KeyframeNavigator::updateCamera(Camera& camera, bool ignoreFutureKeyframes)
         if (ignoreFutureKeyframes) {
             _cameraPoseTimeline.removeKeyframesBefore(now);
         }
-        return false;
+        return;
     }
 
     double prevTime = 0.0;
@@ -87,14 +87,12 @@ bool KeyframeNavigator::updateCamera(Camera& camera, bool ignoreFutureKeyframes)
     const CameraPose nextPose = nextKeyframe->data;
     _cameraPoseTimeline.removeKeyframesBefore(prevTime);
 
-    if (!foundPrevKeyframe && ignoreFutureKeyframes) {
-        return false;
+    if (foundPrevKeyframe || !ignoreFutureKeyframes) {
+        updateCamera(&camera, prevPose, nextPose, t, ignoreFutureKeyframes);
     }
-
-    return updateCamera(&camera, prevPose, nextPose, t, ignoreFutureKeyframes);
 }
 
-bool KeyframeNavigator::updateCamera(Camera* camera, const CameraPose& prevPose,
+void KeyframeNavigator::updateCamera(Camera* camera, const CameraPose& prevPose,
                                      const CameraPose& nextPose, double t,
                                      bool ignoreFutureKeyframes)
 {
@@ -103,7 +101,7 @@ bool KeyframeNavigator::updateCamera(Camera* camera, const CameraPose& prevPose,
     SceneGraphNode* nextFocusNode = scene->sceneGraphNode(nextPose.focusNode);
 
     if (!prevFocusNode || !nextFocusNode) {
-        return false;
+        return;
     }
 
     glm::dvec3 prevKeyframeCameraPosition = prevPose.position;
@@ -158,8 +156,6 @@ bool KeyframeNavigator::updateCamera(Camera* camera, const CameraPose& prevPose,
         );
         camera->setScaling(1.f / glm::exp(interpolatedInvScaleExp));
     }
-
-    return true;
 }
 
 double KeyframeNavigator::currentTime() const {
diff --git a/src/navigation/path.cpp b/src/navigation/path.cpp
index 4a89772f36..99cc50305a 100644
--- a/src/navigation/path.cpp
+++ b/src/navigation/path.cpp
@@ -355,8 +355,8 @@ glm::dquat Path::linearPathRotation(double) const {
     //const double tHalf = 0.5;
     //if (t < tHalf) {
     //    // Interpolate to look at target
-    //    const glm::dvec3 halfWayPosition = _curve->positionAt(tHalf);
-    //    const glm::dquat q = ghoul::lookAtQuaternion(halfWayPosition, endNodePos, endUp);
+    //    const glm::dvec3 halfWayPos = _curve->positionAt(tHalf);
+    //    const glm::dquat q = ghoul::lookAtQuaternion(halfWayPos, endNodePos, endUp);
 
     //    const double tScaled = ghoul::sineEaseInOut(t / tHalf);
     //    return glm::slerp(_start.rotation(), q, tScaled);
@@ -375,13 +375,18 @@ glm::dquat Path::linearPathRotation(double) const {
 
     //if (distanceToEnd < closingUpDistance) {
     //    // Interpolate to target rotation
-    //    const double tScaled = ghoul::sineEaseInOut(1.0 - distanceToEnd / closingUpDistance);
+    //    const double tScaled =
+    //        ghoul::sineEaseInOut(1.0 - distanceToEnd / closingUpDistance);
 
     //    // Compute a position in front of the camera at the end orientation
     //    const double inFrontDistance = glm::distance(_end.position(), endNodePos);
     //    const glm::dvec3 viewDir = ghoul::viewDirection(_end.rotation());
     //    const glm::dvec3 inFrontOfEnd = _end.position() + inFrontDistance * viewDir;
-    //    const glm::dvec3 lookAtPos = ghoul::interpolateLinear(tScaled, endNodePos, inFrontOfEnd);
+    //    const glm::dvec3 lookAtPos = ghoul::interpolateLinear(
+    //        tScaled,
+    //        endNodePos,
+    //        inFrontOfEnd
+    //    );
     //    return ghoul::lookAtQuaternion(_prevPose.position, lookAtPos, endUp);
     //}
 
diff --git a/src/scene/scenegraphnode.cpp b/src/scene/scenegraphnode.cpp
index e74ea97172..b1dd345960 100644
--- a/src/scene/scenegraphnode.cpp
+++ b/src/scene/scenegraphnode.cpp
@@ -334,7 +334,7 @@ namespace {
             //
             // The nodes without a given value will be placed at the bottom of the list
             // and sorted alphabetically.
-            std::optional<double> orderingNumber;
+            std::optional<float> orderingNumber;
         };
         // Additional information that is passed to GUI applications. These are all hints
         // and do not have any impact on the actual function of the scene graph node

From 462629762acc7f8ea5cb928ba1c5e6e1838eb7e9 Mon Sep 17 00:00:00 2001
From: Alexander Bock <alexander.bock@liu.se>
Date: Thu, 12 Sep 2024 16:34:30 +0200
Subject: [PATCH 620/701] Don't print version number in dump file if not in
 release mode

---
 apps/OpenSpace/main.cpp | 44 ++++++++++++++++++++++++++++-------------
 1 file changed, 30 insertions(+), 14 deletions(-)

diff --git a/apps/OpenSpace/main.cpp b/apps/OpenSpace/main.cpp
index 2f731bede4..43ea2120d7 100644
--- a/apps/OpenSpace/main.cpp
+++ b/apps/OpenSpace/main.cpp
@@ -140,20 +140,36 @@ LONG WINAPI generateMiniDump(EXCEPTION_POINTERS* exceptionPointers) {
         LINFO(s);
     }
 
-    std::string dumpFile = std::format(
-        "OpenSpace_{}_{}_{}-{}-{}-{}-{}-{}-{}--{}--{}.dmp",
-        OPENSPACE_VERSION_MAJOR,
-        OPENSPACE_VERSION_MINOR,
-        OPENSPACE_VERSION_PATCH,
-        stLocalTime.wYear,
-        stLocalTime.wMonth,
-        stLocalTime.wDay,
-        stLocalTime.wHour,
-        stLocalTime.wMinute,
-        stLocalTime.wSecond,
-        GetCurrentProcessId(),
-        GetCurrentThreadId()
-    );
+    std::string dumpFile;
+    if (OPENSPACE_IS_RELEASE_BUILD) {
+        dumpFile = std::format(
+            "OpenSpace_{}_{}_{}-{}-{}-{}-{}-{}-{}--{}--{}.dmp",
+            OPENSPACE_VERSION_MAJOR,
+            OPENSPACE_VERSION_MINOR,
+            OPENSPACE_VERSION_PATCH,
+            stLocalTime.wYear,
+            stLocalTime.wMonth,
+            stLocalTime.wDay,
+            stLocalTime.wHour,
+            stLocalTime.wMinute,
+            stLocalTime.wSecond,
+            GetCurrentProcessId(),
+            GetCurrentThreadId()
+        );
+    }
+    else {
+        dumpFile = std::format(
+            "OpenSpace_{}-{}-{}-{}-{}-{}--{}--{}.dmp",
+            stLocalTime.wYear,
+            stLocalTime.wMonth,
+            stLocalTime.wDay,
+            stLocalTime.wHour,
+            stLocalTime.wMinute,
+            stLocalTime.wSecond,
+            GetCurrentProcessId(),
+            GetCurrentThreadId()
+        );
+    }
 
     LINFO(std::format("Creating dump file: {}", dumpFile));
 

From 67992558e135a8338713a0c81ff2ad36e30f6874 Mon Sep 17 00:00:00 2001
From: Gene Payne <payne.gene@gmail.com>
Date: Thu, 12 Sep 2024 09:17:24 -0600
Subject: [PATCH 621/701] Fixes for linux build with most recent CEF update
 (#3407)

---
 modules/webbrowser/cmake/patch/cmake/cef_variables.cmake | 1 -
 modules/webbrowser/include/webrenderhandler.h            | 2 ++
 modules/webbrowser/src/webrenderhandler.cpp              | 2 ++
 3 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/modules/webbrowser/cmake/patch/cmake/cef_variables.cmake b/modules/webbrowser/cmake/patch/cmake/cef_variables.cmake
index 0271a8c89b..85c0e67dc1 100644
--- a/modules/webbrowser/cmake/patch/cmake/cef_variables.cmake
+++ b/modules/webbrowser/cmake/patch/cmake/cef_variables.cmake
@@ -103,7 +103,6 @@ if(OS_LINUX)
     -fno-rtti                       # Disable real-time type information
     -fno-threadsafe-statics         # Don't generate thread-safe statics
     -fvisibility-inlines-hidden     # Give hidden visibility to inlined class member functions
-    -std=gnu++14                    # Use the C++14 language standard including GNU extensions
     -Wsign-compare                  # Warn about mixed signed/unsigned type comparisons
     )
   list(APPEND CEF_COMPILER_FLAGS_DEBUG
diff --git a/modules/webbrowser/include/webrenderhandler.h b/modules/webbrowser/include/webrenderhandler.h
index 7119b7712a..ec26958201 100644
--- a/modules/webbrowser/include/webrenderhandler.h
+++ b/modules/webbrowser/include/webrenderhandler.h
@@ -67,11 +67,13 @@ public:
     void OnPaint(CefRefPtr<CefBrowser> browser, PaintElementType type,
         const RectList &dirtyRects, const void* buffer, int width, int height) override;
 
+#ifdef WIN32
     // Used when the "shared_texture" flag is set to true for CEF. Uses a shared texture
     // from CEF that is allocated on another part of the GPU. Skip CPU allocationn for
     // better performance. Needs OpenGl 4.5 or higher.
     void OnAcceleratedPaint(CefRefPtr<CefBrowser> browser, PaintElementType type,
         const RectList& dirtyRects, const CefAcceleratedPaintInfo& info) override;
+#endif // WIN32
 
     // Determines if the alpha value is > 0 at the specified pixel coordinates. Used in
     // the GUI to determine if the click is consumed
diff --git a/modules/webbrowser/src/webrenderhandler.cpp b/modules/webbrowser/src/webrenderhandler.cpp
index 38c11b4aea..f3bc9b6c54 100644
--- a/modules/webbrowser/src/webrenderhandler.cpp
+++ b/modules/webbrowser/src/webrenderhandler.cpp
@@ -116,6 +116,7 @@ void WebRenderHandler::OnPaint(CefRefPtr<CefBrowser>, CefRenderHandler::PaintEle
     _needsRepaint = false;
 }
 
+#ifdef WIN32
 void WebRenderHandler::OnAcceleratedPaint(CefRefPtr<CefBrowser> browser,
                                           PaintElementType,
                                           const RectList& dirtyRects,
@@ -177,6 +178,7 @@ void WebRenderHandler::OnAcceleratedPaint(CefRefPtr<CefBrowser> browser,
     _texture = sharedTexture;
     _needsRepaint = false;
 }
+#endif // WIN32
 
 void WebRenderHandler::updateTexture() {
     if (_acceleratedRendering || _needsRepaint) {

From b351f80298d05825537b2ada38c53cb266e3a762 Mon Sep 17 00:00:00 2001
From: Emma Broman <emma.broman@liu.se>
Date: Fri, 13 Sep 2024 11:05:30 +0200
Subject: [PATCH 622/701] Fix broken Earth radius distance constant

---
 include/openspace/util/distanceconstants.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/include/openspace/util/distanceconstants.h b/include/openspace/util/distanceconstants.h
index 7b950a8198..6df18fcda3 100644
--- a/include/openspace/util/distanceconstants.h
+++ b/include/openspace/util/distanceconstants.h
@@ -26,7 +26,7 @@
 #define __OPENSPACE_CORE___DISTANCECONSTANTS___H__
 
 namespace openspace::distanceconstants {
-    constexpr double EarthRadius = 6371;
+    constexpr double EarthRadius = 6371E3;
     constexpr double JupiterRadius = 7.1492E7;
     constexpr double SolarRadius = 6.95700E8;
     constexpr double LightYear = 9.4607304725808E15;

From 6d56fec0ecc8be42d62208bc0c9f212585b2eb5c Mon Sep 17 00:00:00 2001
From: Alexander Bock <alexander.bock@liu.se>
Date: Fri, 13 Sep 2024 11:32:17 +0200
Subject: [PATCH 623/701] Update README.md

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 2426de74ae..2574661f66 100644
--- a/README.md
+++ b/README.md
@@ -41,7 +41,7 @@ This repository contains the source code and example profiles for OpenSpace, but
 
 Requirements for compiling are:
   - CMake version 3.25 or above
-  - C++ compiler supporting C++20/C++23 (MSVC 19.39, GCC13, Clang17, AppleClang 15.0.0)
+  - C++ compiler supporting C++20/C++23 (Visual Studio 2022 17.11, GCC13, Clang17, AppleClang 15.0.0)
   - [Boost](http://www.boost.org/)
   - [Qt](http://www.qt.io/download)
 

From 062278b0a0164ee22ab891f08cf54960807f228d Mon Sep 17 00:00:00 2001
From: Alexander Bock <mail@alexanderbock.eu>
Date: Fri, 13 Sep 2024 12:30:24 +0200
Subject: [PATCH 624/701] Store last profile and configuration from the
 launcher (closes #3410)

---
 apps/OpenSpace/main.cpp      | 60 +++++++++++++++++-------------------
 src/engine/configuration.cpp |  6 ++--
 2 files changed, 33 insertions(+), 33 deletions(-)

diff --git a/apps/OpenSpace/main.cpp b/apps/OpenSpace/main.cpp
index 43ea2120d7..5649270502 100644
--- a/apps/OpenSpace/main.cpp
+++ b/apps/OpenSpace/main.cpp
@@ -1080,11 +1080,13 @@ std::string setWindowConfigPresetForGui(const std::string& labelFromCfgFile,
     return preset;
 }
 
-std::string selectedSgctProfileFromLauncher(LauncherWindow& lw, bool hasCliSGCTConfig,
-                                            const std::string& windowConfiguration,
-                                            const std::string& labelFromCfgFile)
+std::pair<std::string, bool> selectedSgctProfileFromLauncher(LauncherWindow& lw,
+                                                             bool hasCliSGCTConfig,
+                                                   const std::string& windowConfiguration,
+                                                      const std::string& labelFromCfgFile)
 {
     std::string config = windowConfiguration;
+    bool isGeneratedConfig = false;
     if (!hasCliSGCTConfig) {
         config = lw.selectedWindowConfig();
         if (config.find(labelFromCfgFile) != std::string::npos) {
@@ -1093,6 +1095,7 @@ std::string selectedSgctProfileFromLauncher(LauncherWindow& lw, bool hasCliSGCTC
             }
             else {
                 config = windowConfiguration;
+                isGeneratedConfig = true;
             }
         }
         else {
@@ -1118,7 +1121,7 @@ std::string selectedSgctProfileFromLauncher(LauncherWindow& lw, bool hasCliSGCTC
         }
         global::configuration->windowConfiguration = config;
     }
-    return config;
+    return { config, isGeneratedConfig };
 }
 
 } // namespace
@@ -1231,6 +1234,7 @@ int main(int argc, char* argv[]) {
 
     // Create the OpenSpace engine and get arguments for the SGCT engine
     std::string windowConfiguration;
+    bool isGeneratedWindowConfig = true;
     try {
         // Find configuration
         std::filesystem::path configurationFilePath;
@@ -1435,12 +1439,13 @@ int main(int argc, char* argv[]) {
         );
 
         global::configuration->profile = win.selectedProfile();
-        windowConfiguration = selectedSgctProfileFromLauncher(
-            win,
-            commandlineArguments.windowConfig.has_value(),
-            windowConfiguration,
-            labelFromCfgFile
-        );
+        std::tie(windowConfiguration, isGeneratedWindowConfig) =
+            selectedSgctProfileFromLauncher(
+                win,
+                commandlineArguments.windowConfig.has_value(),
+                windowConfiguration,
+                labelFromCfgFile
+            );
     }
     else {
         glfwInit();
@@ -1451,6 +1456,20 @@ int main(int argc, char* argv[]) {
     }
 
 
+    {
+        openspace::Settings settings = loadSettings();
+        settings.hasStartedBefore = true;
+
+        const std::filesystem::path p = global::configuration->profile;
+        const std::filesystem::path reducedName = p.filename().replace_extension();
+        settings.profile = reducedName.string();
+
+        settings.configuration =
+            isGeneratedWindowConfig ? "" : global::configuration->windowConfiguration;
+
+        saveSettings(settings, findSettings());
+    }
+
     // Prepend the outgoing sgctArguments with the program name
     // as well as the configuration file that sgct is supposed to use
     arguments.insert(arguments.begin(), argv[0]);
@@ -1540,27 +1559,6 @@ int main(int argc, char* argv[]) {
     // Only timeout after 15 minutes
     Engine::instance().setSyncParameters(false, 15.f * 60.f);
 
-    {
-        openspace::Settings settings = loadSettings();
-        settings.hasStartedBefore = true;
-
-        if (settings.rememberLastProfile) {
-            const std::filesystem::path p = global::configuration->profile;
-            const std::filesystem::path reducedName = p.filename().replace_extension();
-            settings.profile = reducedName.string();
-        }
-
-        if (settings.rememberLastConfiguration &&
-            !global::configuration->sgctConfigNameInitialized.empty())
-        {
-            // We only want to store the window configuration if it was not a dynamically
-            // created one
-            settings.configuration = global::configuration->windowConfiguration;
-        }
-
-        saveSettings(settings, findSettings());
-    }
-
     LINFO("Starting rendering loop");
     Engine::instance().exec();
     LINFO("Ending rendering loop");
diff --git a/src/engine/configuration.cpp b/src/engine/configuration.cpp
index 606af929d8..76458a7802 100644
--- a/src/engine/configuration.cpp
+++ b/src/engine/configuration.cpp
@@ -655,11 +655,13 @@ void parseLuaState(Configuration& configuration) {
 }
 
 void patchConfiguration(Configuration& configuration, const Settings& settings) {
-    if (settings.configuration.has_value()) {
+    if (settings.rememberLastConfiguration.value_or(false) &&
+        settings.configuration.has_value())
+    {
         configuration.windowConfiguration = *settings.configuration;
         configuration.sgctConfigNameInitialized.clear();
     }
-    if (settings.profile.has_value()) {
+    if (settings.rememberLastProfile.value_or(false) && settings.profile.has_value()) {
         configuration.profile = *settings.profile;
     }
     if (settings.visibility.has_value()) {

From 06a92620d141e50fa0150b9be4623d4796f3ab9b Mon Sep 17 00:00:00 2001
From: Alexander Bock <alexander.bock@liu.se>
Date: Mon, 16 Sep 2024 17:32:38 +0200
Subject: [PATCH 625/701] Ignore GlobeBrowsing shader warning when setting
 camera position (closes #3405)

---
 modules/globebrowsing/src/renderableglobe.cpp | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/modules/globebrowsing/src/renderableglobe.cpp b/modules/globebrowsing/src/renderableglobe.cpp
index e4f95bbec1..888333a3b1 100644
--- a/modules/globebrowsing/src/renderableglobe.cpp
+++ b/modules/globebrowsing/src/renderableglobe.cpp
@@ -1202,7 +1202,13 @@ void RenderableGlobe::renderChunks(const RenderData& data, RendererTasks&,
             _cachedInverseModelTransform * glm::dvec4(data.camera.positionVec3(), 1.0)
         );
 
+        using IgnoreError = ghoul::opengl::ProgramObject::IgnoreError;
+        _globalRenderer.program->setIgnoreUniformLocationError(IgnoreError::Yes);
+        // The cameraPosition is not used if a globe only has a solid color, but it would
+        // be costlier to figure that out and will only trigger rarely, so instead we just
+        // ignore the location error
         _globalRenderer.program->setUniform("cameraPosition", glm::vec3(cameraPosition));
+        _globalRenderer.program->setIgnoreUniformLocationError(IgnoreError::No);
     }
 
     const glm::mat4 modelViewTransform = glm::mat4(viewTransform * _cachedModelTransform);

From c0ca1acb3339dd410e65d57a97044827e226805d Mon Sep 17 00:00:00 2001
From: Alexander Bock <alexander.bock@liu.se>
Date: Mon, 16 Sep 2024 18:01:10 +0200
Subject: [PATCH 626/701] Don't crash when enableing the shadow component on a
 planet that doesn't have a ring system (closes #3404)

---
 modules/globebrowsing/src/renderableglobe.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/modules/globebrowsing/src/renderableglobe.cpp b/modules/globebrowsing/src/renderableglobe.cpp
index 888333a3b1..ea02c0f744 100644
--- a/modules/globebrowsing/src/renderableglobe.cpp
+++ b/modules/globebrowsing/src/renderableglobe.cpp
@@ -1457,7 +1457,7 @@ void RenderableGlobe::renderChunkGlobally(const Chunk& chunk, const RenderData&
             _shadowMappingProperties.zFightingPercentage
         );
     }
-    else if (_shadowMappingProperties.shadowMapping) {
+    else if (_shadowMappingProperties.shadowMapping && _shadowComponent) {
         shadowMapUnit.activate();
         // JCC: Avoiding a to recompiling the shaders or having more than one
         // set of shaders for this step.
@@ -1771,7 +1771,7 @@ void RenderableGlobe::recompileShaders() {
     pairs.emplace_back("useEclipseHardShadows", std::to_string(_eclipseHardShadows));
     pairs.emplace_back(
         "enableShadowMapping",
-        std::to_string(_shadowMappingProperties.shadowMapping)
+        std::to_string(_shadowMappingProperties.shadowMapping && _shadowComponent)
     );
     pairs.emplace_back("showChunkEdges", std::to_string(_debugProperties.showChunkEdges));
     pairs.emplace_back("showHeightResolution", "0");

From 8ad84b6d35452d03b99bd25e9f3ef4900740ecc9 Mon Sep 17 00:00:00 2001
From: Ylva Selling <ylva.selling@liu.se>
Date: Tue, 17 Sep 2024 17:17:46 +0200
Subject: [PATCH 627/701] Make useAcceleratedRendering a uniform for
 screenspace renderables

---
 include/openspace/rendering/screenspacerenderable.h |  6 ++++--
 modules/base/shaders/screenspace_fs.glsl            | 10 +++++-----
 modules/webbrowser/include/screenspacebrowser.h     |  1 +
 modules/webbrowser/src/screenspacebrowser.cpp       | 11 +++--------
 src/rendering/screenspacerenderable.cpp             |  4 +++-
 5 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/include/openspace/rendering/screenspacerenderable.h b/include/openspace/rendering/screenspacerenderable.h
index 28f262f61d..49977b8b9d 100644
--- a/include/openspace/rendering/screenspacerenderable.h
+++ b/include/openspace/rendering/screenspacerenderable.h
@@ -109,7 +109,8 @@ protected:
     glm::vec3 raeToCartesian(const glm::vec3& rae) const;
     glm::vec3 cartesianToRae(const glm::vec3& cartesian) const;
 
-    void draw(const glm::mat4& modelTransform, const RenderData& renderData);
+    void draw(const glm::mat4& modelTransform, const RenderData& renderData,
+        bool useAcceleratedRendering = false);
 
     virtual void bindTexture() = 0;
     virtual void unbindTexture();
@@ -150,7 +151,8 @@ protected:
 
     glm::ivec2 _objectSize = glm::ivec2(0);
     UniformCache(color, opacity, blackoutFactor, hue, value, saturation, mvpMatrix, tex,
-        backgroundColor, gamma, borderColor, borderWidth, borderFeather) _uniformCache;
+        backgroundColor, gamma, borderColor, borderWidth, borderFeather,
+        useAcceleratedRendering) _uniformCache;
     std::unique_ptr<ghoul::opengl::ProgramObject> _shader;
 };
 
diff --git a/modules/base/shaders/screenspace_fs.glsl b/modules/base/shaders/screenspace_fs.glsl
index 5d0b7fea8a..f3aa9f27a0 100644
--- a/modules/base/shaders/screenspace_fs.glsl
+++ b/modules/base/shaders/screenspace_fs.glsl
@@ -41,20 +41,20 @@ uniform float gamma = 1.0;
 uniform vec2 borderWidth = vec2(0.1);
 uniform vec3 borderColor = vec3(0.0);
 uniform int borderFeather = 0;
-
 // Accelerated rendering can be used for the CEF browser
-#define USE_ACCELERATED_RENDERING #{useAcceleratedRendering}
+uniform bool useAcceleratedRendering = false;
+
 
 Fragment getFragment() {
   Fragment frag;
   vec4 originalColor;
-  #if USE_ACCELERATED_RENDERING
+  if (useAcceleratedRendering) {
     vec2 flippedTexCoords = vec2(vs_st.x, 1.0 - vs_st.y);
     // Correcting both orientation and color channels
     originalColor = texture(tex, flippedTexCoords).bgra;
-  #else
+  } else {
     originalColor = texture(tex, vs_st);
-  #endif
+  }
 
   vec4 texColor = originalColor * vec4(color, opacity);
 
diff --git a/modules/webbrowser/include/screenspacebrowser.h b/modules/webbrowser/include/screenspacebrowser.h
index a2d6d5cfad..9a10898dc8 100644
--- a/modules/webbrowser/include/screenspacebrowser.h
+++ b/modules/webbrowser/include/screenspacebrowser.h
@@ -97,6 +97,7 @@ private:
 
     CefRefPtr<WebKeyboardHandler> _keyboardHandler;
 
+    bool _useAcceleratedRendering = false;
     bool _isUrlDirty = false;
     bool _isDimensionsDirty = false;
 };
diff --git a/modules/webbrowser/src/screenspacebrowser.cpp b/modules/webbrowser/src/screenspacebrowser.cpp
index 8ee054ba11..78ccc956fb 100644
--- a/modules/webbrowser/src/screenspacebrowser.cpp
+++ b/modules/webbrowser/src/screenspacebrowser.cpp
@@ -123,6 +123,7 @@ ScreenSpaceBrowser::ScreenSpaceBrowser(const ghoul::Dictionary& dictionary)
     addProperty(_url);
     addProperty(_dimensions);
     addProperty(_reload);
+    _useAcceleratedRendering = WebBrowserModule::canUseAcceleratedRendering();
 
     WebBrowserModule* webBrowser = global::moduleEngine->module<WebBrowserModule>();
     if (webBrowser) {
@@ -131,13 +132,7 @@ ScreenSpaceBrowser::ScreenSpaceBrowser(const ghoul::Dictionary& dictionary)
 }
 
 bool ScreenSpaceBrowser::initializeGL() {
-    ghoul::Dictionary dict = ghoul::Dictionary();
-
-    dict.setValue(
-        "useAcceleratedRendering",
-        WebBrowserModule::canUseAcceleratedRendering()
-    );
-    createShaders(dict);
+    createShaders();
 
     _browserInstance->initialize();
     _browserInstance->loadUrl(_url);
@@ -173,7 +168,7 @@ void ScreenSpaceBrowser::render(const RenderData& renderData) {
         translationMatrix() *
         localRotationMatrix() *
         scaleMatrix();
-    draw(mat, renderData);
+    draw(mat, renderData, _useAcceleratedRendering);
 }
 
 void ScreenSpaceBrowser::update() {
diff --git a/src/rendering/screenspacerenderable.cpp b/src/rendering/screenspacerenderable.cpp
index 2d02451c76..fa49bc7e11 100644
--- a/src/rendering/screenspacerenderable.cpp
+++ b/src/rendering/screenspacerenderable.cpp
@@ -653,7 +653,8 @@ glm::mat4 ScreenSpaceRenderable::translationMatrix() {
 }
 
 void ScreenSpaceRenderable::draw(const glm::mat4& modelTransform,
-                                 const RenderData& renderData)
+                                 const RenderData& renderData,
+                                 bool useAcceleratedRendering)
 {
     glDisable(GL_CULL_FACE);
 
@@ -678,6 +679,7 @@ void ScreenSpaceRenderable::draw(const glm::mat4& modelTransform,
     _shader->setUniform(_uniformCache.borderWidth, borderUV);
     _shader->setUniform(_uniformCache.borderColor, _borderColor);
     _shader->setUniform(_uniformCache.borderFeather, _borderFeather);
+    _shader->setUniform(_uniformCache.useAcceleratedRendering, useAcceleratedRendering);
     _shader->setUniform(
         _uniformCache.mvpMatrix,
         global::renderEngine->scene()->camera()->viewProjectionMatrix() * modelTransform

From 24a2247aa4959fcf698adfda095f9a6cba4c2c2d Mon Sep 17 00:00:00 2001
From: Emma Broman <emma.broman@liu.se>
Date: Wed, 18 Sep 2024 11:02:30 +0200
Subject: [PATCH 628/701] Give exoplanets a color based on their size (#3412)

* Add a tag for all exoplanet globes

* Add color to exoplanet globes based on their size

* Update color of terrestrial planets to be more deeply brown

* Change order so that the default texture for planets is shown on top

I.e. only use color if no other texture was provided

* Add descriptions of layer and planet type

* Add descriptions for some more things in the system

* Increase ambient intensity for when a planet is colored (not textured)

* Ignore GlobeBrowsing shader warning when setting camera position (closes #3405)

* Apply suggestions from code review

* Fix new constant names (from review)

---------

Co-authored-by: Alexander Bock <alexander.bock@liu.se>
---
 modules/exoplanets/exoplanetsmodule_lua.inl | 139 ++++++++++++++++++--
 1 file changed, 129 insertions(+), 10 deletions(-)

diff --git a/modules/exoplanets/exoplanetsmodule_lua.inl b/modules/exoplanets/exoplanetsmodule_lua.inl
index 09085c38a5..29e555d34c 100644
--- a/modules/exoplanets/exoplanetsmodule_lua.inl
+++ b/modules/exoplanets/exoplanetsmodule_lua.inl
@@ -200,6 +200,25 @@ void createExoplanetSystem(const std::string& starName,
             "}";
     }
 
+    // @TODO (2024-09-16, emmbr) Compose a more extensive summary of the system,
+    // based on more data in the archive (like number of stars) and the planets.
+    // Also include more data on the star itself (like spectral type)
+    float distanceToOurSystem = glm::length(starPosInParsec) *
+        distanceconstants::Parsec / distanceconstants::LightYear;
+
+    size_t nPlanets = system.planetNames.size();
+    const std::string starDescription = std::format(
+        "The star {} is the host star of an exoplanet system with {} {} that {}  "
+        "enough data to be visualized. It has a size of {:.2f} solar radii and an "
+        "effective temperature of {:.0f} Kelvin. The system is located at a "
+        "distance of {:.0f} light-years from Earth.",
+        sanitizedStarName, nPlanets,
+        nPlanets > 1 ? "planets" : "planet",
+        nPlanets > 1 ? "have" : "has",
+        radiusInMeter / distanceconstants::SolarRadius,
+        system.starData.teff, distanceToOurSystem
+    );
+
     const std::string starGlobeRenderableString = "Renderable = {"
         "Type = 'RenderableGlobe',"
         "Radii = " + std::to_string(radiusInMeter) + ","
@@ -226,7 +245,8 @@ void createExoplanetSystem(const std::string& starName,
         "Tag = {'exoplanet_system'},"
         "GUI = {"
             "Name = '" + sanitizedStarName + " (Star)',"
-            "Path = '" + guiPath + "'"
+            "Path = '" + guiPath + "',"
+            "Description = \"" + starDescription + "\""
         "}"
     "}";
 
@@ -334,16 +354,106 @@ void createExoplanetSystem(const std::string& starName,
             "Period = " + std::to_string(periodInSeconds) + ""
         "}";
 
-        std::string planetLayers = "";
+        std::string planetLayers;
+        std::string planetTypeDesc;
+
+        // Constant for different categories of sizes of planets (in Earth radii)
+        // Source: https://www.nasa.gov/image-article/sizes-of-known-exoplanets/
+        constexpr float TerrestrialMaxR = 1.25f;
+        constexpr float SuperEarthMaxR = 2.f;
+        constexpr float NeptuneLikeMaxR = 6.f;
+
+        const std::string TerrestrialDesc = std::format(
+            "Terrestrial planets (R < {} Earth radii)",
+            TerrestrialMaxR
+        );
+
+        const std::string SuperEarthDesc = std::format(
+            "Super-Earths ({} < R < {} Earth radii)",
+            TerrestrialMaxR, SuperEarthMaxR
+        );
+
+        const std::string NeptuneLikeDesc = std::format(
+            "Neptune-like planets ({} < R < {} Earth radii)",
+            SuperEarthMaxR, NeptuneLikeMaxR
+        );
+
+        const std::string GasGiantDesc = std::format(
+            "Gas giants or larger planets (R > {} Earth radii)",
+            NeptuneLikeMaxR
+        );
+
+        // Add a color layer with a fixed single color that represent the planet size,
+        // that is, approximately what type of planet it is.
+        // @TODO (2024-09-10, emmbr) Ideally the user should be able to edit this
+        if (!std::isnan(planet.r)) {
+            float rInMeter = static_cast<float>(planetRadius);
+            glm::vec3 colorFromSize = glm::vec3(0.f);
+
+            if (rInMeter < TerrestrialMaxR * distanceconstants::EarthRadius) {
+                // Terrestrial
+                colorFromSize = glm::vec3(0.32f, 0.2f, 0.1f); // Brown
+                planetTypeDesc = TerrestrialDesc;
+            }
+            else if (rInMeter < SuperEarthMaxR * distanceconstants::EarthRadius) {
+                // Super-Earths
+                colorFromSize = glm::vec3(1.f, 0.76f, 0.65f); // Beige
+                planetTypeDesc = SuperEarthDesc;
+            }
+            else if (rInMeter < NeptuneLikeMaxR * distanceconstants::EarthRadius) {
+                // Neptune-like
+                colorFromSize = glm::vec3(0.22f, 0.49f, 0.50f); // Blue
+                planetTypeDesc = NeptuneLikeDesc;
+            }
+            else {
+                // Gas Giants (Saturn and Jupiter size, and much larger!)
+                colorFromSize = glm::vec3(0.55f, 0.34f, 0.39f); // Wine red
+                planetTypeDesc = GasGiantDesc;
+            }
+
+            const std::string description = std::format(
+                "This layer gives a fixed color to the planet surface based on the "
+                "planet radius. The planets are split into four categories based on "
+                "their radius (in Earth radii). 1) {} are Brown, 2) {} are Beige, 3) "
+                "{} are Blue, and 4) {} are Wine red.",
+                TerrestrialDesc, SuperEarthDesc, NeptuneLikeDesc, GasGiantDesc
+            );
+
+            planetLayers += "{"
+                "Identifier = 'ColorFromSize',"
+                "Name = 'Color From Size',"
+                "Type = 'SolidColor',"
+                "Color = " + ghoul::to_string(colorFromSize) + ","
+                "Enabled = true,"
+                "Description = \"" + description + "\""
+            "}";
+        }
+
         if (!planetTexture.empty()) {
-            planetLayers = "{"
+            planetLayers += ",{"
                 "Identifier = 'PlanetTexture',"
+                "Name = 'Planet Texture',"
                 "FilePath = openspace.absPath('" + formatPathToLua(planetTexture) + "'),"
-                "BlendMode = 'Color',"
                 "Enabled = true"
             "}";
         }
 
+        const std::string planetDescription = std::format(
+            "The exoplanet {} falls into the category of {}. Some key facts: "
+            "Radius: {:.2f} Earth radii, {:.2f} Jupiter radii. "
+            "Orbit Period: {:.1f} (Earth) days. "
+            "Orbit Semi-major axis: {:.2f} (AU). "
+            "Orbit Eccentricity: {:.2f}.",
+            planetName, planetTypeDesc,
+            planetRadius / distanceconstants::EarthRadius,
+            planetRadius / distanceconstants::JupiterRadius,
+            planet.per, planet.a, planet.ecc
+        );
+
+        // Use a higher ambient intensity when only the color from size is used, so that
+        // the color is more clearly visible from any direction
+        float ambientIntensity = planetTexture.empty() ? 0.5f : 0.15f;
+
         const std::string planetNode = "{"
             "Identifier = '" + planetIdentifier + "',"
             "Parent = '" + starIdentifier + "',"
@@ -355,22 +465,25 @@ void createExoplanetSystem(const std::string& starName,
                 "Layers = {"
                     "ColorLayers = {" + planetLayers + "}"
                 "},"
-                "LightSourceNode = '" + starIdentifier + "'"
+                "LightSourceNode = '" + starIdentifier + "',"
+                "AmbientIntensity = " + std::to_string(ambientIntensity) +
             "},"
+            "Tag = { 'exoplanet_planet' }, "
             "Transform = { "
                 "Translation = " + planetKeplerTranslation + ""
             "},"
             "GUI = {"
                 "Name = '" + planetName + "',"
-                "Path = '" + guiPath + "'"
+                "Path = '" + guiPath + "',"
+                "Description = [[" + planetDescription + "]]"
             "}"
         "}";
 
         int trailResolution = 1000;
 
         // Increase the resolution for highly eccentric orbits
-        const float eccentricityThreshold = 0.85f;
-        if (planet.ecc > eccentricityThreshold) {
+        constexpr float EccentricityThreshold = 0.85f;
+        if (planet.ecc > EccentricityThreshold) {
             trailResolution *= 2;
         }
 
@@ -437,7 +550,11 @@ void createExoplanetSystem(const std::string& starName,
                 "Tag = {'exoplanet_uncertainty_disc'},"
                 "GUI = {"
                     "Name = '" + planetName + " Disc',"
-                    "Path = '" + guiPath + "'"
+                    "Path = '" + guiPath + "',"
+                    "Description = \"The width of this disc around the planet's orbit "
+                        "marks the uncertainty of the orbit (based on the uncertainty of "
+                        "the semi-major axis and eccentricity measures). The wider the "
+                        "disc, the more uncertain the orbit is.\""
                 "}"
             "}";
 
@@ -481,7 +598,9 @@ void createExoplanetSystem(const std::string& starName,
         "Tag = {'exoplanet_1au_ring'},"
         "GUI = {"
             "Name = '1 AU Size Comparison Circle',"
-            "Path = '" + guiPath + "'"
+            "Path = '" + guiPath + "',"
+            "Description = \"A circle with a radius of 1 Astronomical Unit. That is, its "
+                "size corresponds to the size of Earth's orbit.\""
         "}"
     "}";
 

From db23148af0e76e555993838f1eb6ce7e4419177d Mon Sep 17 00:00:00 2001
From: Alexander Bock <alexander.bock@liu.se>
Date: Mon, 23 Sep 2024 11:34:51 +0200
Subject: [PATCH 629/701] Add ability to schedule Lua scripts (#3416)

---
 include/openspace/scripting/scriptengine.h | 19 +++++-
 src/scripting/scriptengine.cpp             | 71 +++++++++++++++++++++-
 src/scripting/scriptengine_lua.inl         | 33 ++++++++++
 3 files changed, 121 insertions(+), 2 deletions(-)

diff --git a/include/openspace/scripting/scriptengine.h b/include/openspace/scripting/scriptengine.h
index 7ad56ca38a..9b721617bf 100644
--- a/include/openspace/scripting/scriptengine.h
+++ b/include/openspace/scripting/scriptengine.h
@@ -102,7 +102,6 @@ public:
     void addLibrary(LuaLibrary library);
     bool hasLibrary(const std::string& name);
 
-
     virtual void preSync(bool isMaster) override;
     virtual void encode(SyncBuffer* syncBuffer) override;
     virtual void decode(SyncBuffer* syncBuffer) override;
@@ -111,6 +110,11 @@ public:
     void queueScript(Script script);
     void queueScript(std::string script);
 
+    // Runs the `script` every `timeout` seconds wallclock time 
+    void registerRepeatedScript(std::string identifier, std::string script,
+        double timeout, std::string preScript = "", std::string postScript = "");
+    void removeRepeatedScript(std::string_view identifier);
+
     std::vector<std::string> allLuaFunctions() const;
     const std::vector<LuaLibrary>& allLuaLibraries() const;
 
@@ -141,6 +145,19 @@ private:
 
     std::vector<std::string> _scriptsToSync;
 
+    struct RepeatedScriptInfo {
+        /// This script is run everytime `timeout` seconds have passed
+        std::string script;
+
+        /// This script is run when the repeated script is unregistered
+        std::string postScript;
+
+        std::string identifier;
+        double timeout = 0.0;
+        double lastRun = 0.0;
+    };
+    std::vector<RepeatedScriptInfo> _repeatedScripts;
+
     // Logging variables
     bool _logFileExists = false;
     bool _logScripts = true;
diff --git a/src/scripting/scriptengine.cpp b/src/scripting/scriptengine.cpp
index f6ee986123..3ade730808 100644
--- a/src/scripting/scriptengine.cpp
+++ b/src/scripting/scriptengine.cpp
@@ -27,6 +27,7 @@
 #include <openspace/documentation/documentation.h>
 #include <openspace/engine/configuration.h>
 #include <openspace/engine/globals.h>
+#include <openspace/engine/windowdelegate.h>
 #include <openspace/interaction/sessionrecording.h>
 #include <openspace/network/parallelpeer.h>
 #include <openspace/util/syncbuffer.h>
@@ -103,6 +104,12 @@ void ScriptEngine::deinitialize() {
     ZoneScoped;
 
     _registeredLibraries.clear();
+    for (const RepeatedScriptInfo& info : _repeatedScripts) {
+        if (info.postScript.empty()) {
+            queueScript(info.postScript);
+        }
+    }
+    _repeatedScripts.clear();
 }
 
 void ScriptEngine::initializeLuaState(lua_State* state) {
@@ -553,6 +560,17 @@ void ScriptEngine::postSync(bool isMaster) {
             }
         }
     }
+
+    double now =
+        global::sessionRecording->isSavingFramesDuringPlayback() ?
+        global::sessionRecording->currentApplicationInterpolationTime() :
+        global::windowDelegate->applicationTime();
+    for (RepeatedScriptInfo& info : _repeatedScripts) {
+        if (now - info.lastRun >= info.timeout) {
+            runScript({ info.script });
+            info.lastRun = now;
+        }
+    }
 }
 
 void ScriptEngine::queueScript(Script script) {
@@ -568,6 +586,55 @@ void ScriptEngine::queueScript(std::string script) {
     queueScript({ .code = std::move(script) });
 }
 
+void ScriptEngine::registerRepeatedScript(std::string identifier, std::string script,
+                                          double timeout, std::string preScript,
+                                          std::string postScript)
+{
+    auto it = std::find_if(
+        _repeatedScripts.begin(),
+        _repeatedScripts.end(),
+        [&identifier](const RepeatedScriptInfo& info) {
+            return info.identifier == identifier;
+        }
+    );
+    if (it != _repeatedScripts.end()) {
+        throw ghoul::RuntimeError(
+            std::format("Script with identifier '{}' already registered", identifier),
+            "ScriptEngine"
+        );
+    }
+
+    if (!preScript.empty()) {
+        runScript({ std::move(preScript) });
+    }
+    _repeatedScripts.emplace_back(
+        std::move(script),
+        std::move(postScript),
+        std::move(identifier),
+        timeout
+    );
+}
+
+void ScriptEngine::removeRepeatedScript(std::string_view identifier) {
+    auto it = std::find_if(
+        _repeatedScripts.begin(),
+        _repeatedScripts.end(),
+        [&identifier](const RepeatedScriptInfo& info) {
+            return info.identifier == identifier;
+        }
+    );
+    if (it != _repeatedScripts.end()) {
+        if (!it->postScript.empty()) {
+            queueScript(it->postScript);
+        }
+
+        _repeatedScripts.erase(it);
+    }
+    else {
+        LERROR(std::format("Could not find script with identifier '{}'", identifier));
+    }
+}
+
 void ScriptEngine::addBaseLibrary() {
     ZoneScoped;
 
@@ -645,7 +712,9 @@ void ScriptEngine::addBaseLibrary() {
             codegen::lua::WalkDirectoryFiles,
             codegen::lua::WalkDirectoryFolders,
             codegen::lua::DirectoryForPath,
-            codegen::lua::UnzipFile
+            codegen::lua::UnzipFile,
+            codegen::lua::RegisterRepeatedScript,
+            codegen::lua::RemoveRepeatedScript
         }
     };
     addLibrary(lib);
diff --git a/src/scripting/scriptengine_lua.inl b/src/scripting/scriptengine_lua.inl
index c1c130f480..e66bc3baf3 100644
--- a/src/scripting/scriptengine_lua.inl
+++ b/src/scripting/scriptengine_lua.inl
@@ -279,6 +279,39 @@ std::vector<std::filesystem::path> walkCommon(const std::filesystem::path& path,
     }
 }
 
+/**
+ * This function registers another Lua script that will be periodically executed as long
+ * as the application is running. The `identifier` is used to later remove the script. The
+ * `script` is being executed every `timeout` seconds. This timeout is only as accurate as
+ * the framerate at which the application is running. Optionally the `preScript` Lua
+ * script is run when registering the repeated script and the `postScript` is run when
+ * unregistering it or when the application closes.
+ * If the `timeout` is 0, the script will be executed every frame.
+ * The `identifier` has to be a unique name that cannot have been used to register a
+ * repeated script before. A registered script is removed with the #removeRepeatedScript
+ * function.
+ */
+[[codegen::luawrap]] void registerRepeatedScript(std::string identifier,
+                                                 std::string script, double timeout = 0.0,
+                                                 std::string preScript = "",
+                                                 std::string postScript = "")
+{
+    openspace::global::scriptEngine->registerRepeatedScript(
+        std::move(identifier),
+        std::move(script),
+        timeout,
+        std::move(preScript),
+        std::move(postScript)
+    );
+}
+
+/**
+ * Removes a previously registered repeated script (see #registerRepeatedScript)
+ */
+[[codegen::luawrap]] void removeRepeatedScript(std::string identifier) {
+    openspace::global::scriptEngine->removeRepeatedScript(identifier);
+}
+
 #include "scriptengine_lua_codegen.cpp"
 
 } // namespace

From 5fdc2c4bb866a89722d860b63fa96be3f4613149 Mon Sep 17 00:00:00 2001
From: Alexander Bock <alexander.bock@liu.se>
Date: Mon, 23 Sep 2024 11:35:01 +0200
Subject: [PATCH 630/701] Add examples for SpiceTranslation (#3413)

---
 .../rotation/spicerotation/spice.asset        |  3 +-
 .../spicetranslation/fixeddate.asset          | 38 +++++++++++++++++++
 .../spicetranslation/referenceframe.asset     | 37 ++++++++++++++++++
 .../translation/spicetranslation/spice.asset  | 35 +++++++++++++++++
 .../space/translation/spicetranslation.cpp    | 36 +++++++++---------
 5 files changed, 131 insertions(+), 18 deletions(-)
 create mode 100644 data/assets/examples/translation/spicetranslation/fixeddate.asset
 create mode 100644 data/assets/examples/translation/spicetranslation/referenceframe.asset
 create mode 100644 data/assets/examples/translation/spicetranslation/spice.asset

diff --git a/data/assets/examples/rotation/spicerotation/spice.asset b/data/assets/examples/rotation/spicerotation/spice.asset
index e084dde9bb..be46c5f4ba 100644
--- a/data/assets/examples/rotation/spicerotation/spice.asset
+++ b/data/assets/examples/rotation/spicerotation/spice.asset
@@ -3,8 +3,9 @@
 -- SceneGraphNode that only displays coordinate axes. The rotation of the coordinate axes
 -- are determined by SPICE, in this case pretending that the coordinate axes are rotating
 -- at the same rate as Earth.
+-- For more information about SPICE see: https://naif.jpl.nasa.gov/naif/
 
--- Load the default SPICE kernels, which is the planetary constants and the DE430 kernel
+-- Load the default SPICE kernels, which are the planetary constants and the DE430 kernel
 asset.require("spice/core")
 
 local Node = {
diff --git a/data/assets/examples/translation/spicetranslation/fixeddate.asset b/data/assets/examples/translation/spicetranslation/fixeddate.asset
new file mode 100644
index 0000000000..93285faa76
--- /dev/null
+++ b/data/assets/examples/translation/spicetranslation/fixeddate.asset
@@ -0,0 +1,38 @@
+-- Fixed Date
+-- This asset creates a time-varying translation with information from a SPICE kernel and
+-- applies it to a SceneGraphNode that only displays coordinate axes. The position of the
+-- coordinate axes are determined by SPICE, in this case pretending that the axes are
+-- orbiting the same way the Moon does around Earth. In this specific example, the
+-- position is independent of the actual in-game time in OpenSpace and only uses a fixed
+-- date of 2000 JAN 01 instead.
+-- For more information about SPICE see: https://naif.jpl.nasa.gov/naif/
+
+-- Load the default SPICE kernels, which are the planetary constants and the DE430 kernel
+asset.require("spice/core")
+
+local Node = {
+  Identifier = "SpiceTranslation_Example_FixedDate",
+  Transform = {
+    Translation = {
+      Type = "SpiceTranslation",
+      Target = "MOON",
+      Observer = "EARTH",
+      FixedDate = "2000 JAN 01 00:00:00.000"
+    }
+  },
+  Renderable = {
+    Type = "RenderableCartesianAxes"
+  },
+  GUI = {
+    Name = "SpiceTranslation - Fixed Date",
+    Path = "/Examples"
+  }
+}
+
+asset.onInitialize(function()
+  openspace.addSceneGraphNode(Node)
+end)
+
+asset.onDeinitialize(function()
+  openspace.removeSceneGraphNode(Node)
+end)
diff --git a/data/assets/examples/translation/spicetranslation/referenceframe.asset b/data/assets/examples/translation/spicetranslation/referenceframe.asset
new file mode 100644
index 0000000000..cb16f29b19
--- /dev/null
+++ b/data/assets/examples/translation/spicetranslation/referenceframe.asset
@@ -0,0 +1,37 @@
+-- Reference Frame
+-- This asset creates a time-varying translation with information from a SPICE kernel and
+-- applies it to a SceneGraphNode that only displays coordinate axes. The position of the
+-- coordinate axes are determined by SPICE, in this case pretending that the axes are
+-- orbiting the same way the Moon does around Earth. The calculated position will be
+-- provided in the rotating coordinate system of Earth itself.
+-- For more information about SPICE see: https://naif.jpl.nasa.gov/naif/
+
+-- Load the default SPICE kernels, which are the planetary constants and the DE430 kernel
+asset.require("spice/core")
+
+local Node = {
+  Identifier = "SpiceTranslation_Example_ReferenceFrame",
+  Transform = {
+    Translation = {
+      Type = "SpiceTranslation",
+      Target = "MOON",
+      Observer = "EARTH",
+      Frame = "IAU_EARTH"
+    }
+  },
+  Renderable = {
+    Type = "RenderableCartesianAxes"
+  },
+  GUI = {
+    Name = "SpiceTranslation - Reference Frame",
+    Path = "/Examples"
+  }
+}
+
+asset.onInitialize(function()
+  openspace.addSceneGraphNode(Node)
+end)
+
+asset.onDeinitialize(function()
+  openspace.removeSceneGraphNode(Node)
+end)
diff --git a/data/assets/examples/translation/spicetranslation/spice.asset b/data/assets/examples/translation/spicetranslation/spice.asset
new file mode 100644
index 0000000000..49b33775e5
--- /dev/null
+++ b/data/assets/examples/translation/spicetranslation/spice.asset
@@ -0,0 +1,35 @@
+-- Basic
+-- This asset creates a time-varying translation with information from a SPICE kernel and
+-- applies it to a SceneGraphNode that only displays coordinate axes. The position of the
+-- coordinate axes are determined by SPICE, in this case pretending that the axes are
+-- orbiting the same way the Moon does around Earth.
+-- For more information about SPICE see: https://naif.jpl.nasa.gov/naif/
+
+-- Load the default SPICE kernels, which are the planetary constants and the DE430 kernel
+asset.require("spice/core")
+
+local Node = {
+  Identifier = "SpiceTranslation_Example",
+  Transform = {
+    Translation = {
+      Type = "SpiceTranslation",
+      Target = "MOON",
+      Observer = "EARTH"
+    }
+  },
+  Renderable = {
+    Type = "RenderableCartesianAxes"
+  },
+  GUI = {
+    Name = "SpiceTranslation - Basic",
+    Path = "/Examples"
+  }
+}
+
+asset.onInitialize(function()
+  openspace.addSceneGraphNode(Node)
+end)
+
+asset.onDeinitialize(function()
+  openspace.removeSceneGraphNode(Node)
+end)
diff --git a/modules/space/translation/spicetranslation.cpp b/modules/space/translation/spicetranslation.cpp
index e8bddcc75f..80025e78d4 100644
--- a/modules/space/translation/spicetranslation.cpp
+++ b/modules/space/translation/spicetranslation.cpp
@@ -41,34 +41,39 @@ namespace {
     constexpr openspace::properties::Property::PropertyInfo TargetInfo = {
         "Target",
         "Target",
-        "This is the SPICE NAIF name for the body whose translation is to be computed by "
-        "the SpiceTranslation. It can either be a fully qualified name (such as 'EARTH') "
-        "or a NAIF integer id code (such as '399').",
+        "This is the SPICE name for the body whose translation is to be computed by the "
+        "SpiceTranslation. It can either be a fully qualified name (such as 'EARTH') or "
+        "a NAIF integer id code (such as '399'). The resulting translation will be a "
+        "vector leading from the `Target` to the `Observer`.",
         openspace::properties::Property::Visibility::AdvancedUser
     };
 
     constexpr openspace::properties::Property::PropertyInfo ObserverInfo = {
         "Observer",
         "Observer",
-        "This is the SPICE NAIF name for the parent of the body whose translation is to "
-        "be computed by the SpiceTranslation. It can either be a fully qualified name "
-        "(such as 'SOLAR SYSTEM BARYCENTER') or a NAIF integer id code (such as '0').",
+        "This is the SPICE name for the parent of the body whose translation is to be "
+        "computed by the SpiceTranslation. It can either be a fully qualified name (such "
+        "as 'SOLAR SYSTEM BARYCENTER') or a NAIF integer id code (such as '0'). The "
+        "resulting translation will be a vector leading from the `Target` to the "
+        "`Observer`.",
         openspace::properties::Property::Visibility::AdvancedUser
     };
 
     constexpr openspace::properties::Property::PropertyInfo FrameInfo = {
         "Frame",
         "Reference Frame",
-        "This is the SPICE NAIF name for the reference frame in which the position "
-        "should be retrieved. The default value is GALACTIC.",
+        "This is the SPICE name of the reference frame in which the position should be "
+        "calculated. The default value is GALACTIC.",
         openspace::properties::Property::Visibility::AdvancedUser
     };
 
     constexpr openspace::properties::Property::PropertyInfo FixedDateInfo = {
         "FixedDate",
         "Fixed Date",
-        "A time to lock the position to. Setting this to an empty string will "
-        "unlock the time and return to position based on current simulation time.",
+        "If this value is specified, the position will be locked to a specific time "
+        "rather than following the in-game in the system. Setting this to an empty "
+        "string will unlock the time and return to position based on current simulation "
+        "time.",
         openspace::properties::Property::Visibility::User
     };
 
@@ -82,8 +87,8 @@ namespace {
         std::optional<std::string> frame
             [[codegen::annotation("A valid SPICE NAIF name for a reference frame")]];
 
-        std::optional<std::string> fixedDate
-            [[codegen::annotation("A date to lock the position to")]];
+        // [[codegen::verbatim(FixedDateInfo.description)]]
+        std::optional<std::string> fixedDate;
     };
 #include "spicetranslation_codegen.cpp"
 } // namespace
@@ -155,16 +160,13 @@ SpiceTranslation::SpiceTranslation(const ghoul::Dictionary& dictionary)
 glm::dvec3 SpiceTranslation::position(const UpdateData& data) const {
     double lightTime = 0.0;
 
-    double time = data.time.j2000Seconds();
-    if (_fixedEphemerisTime.has_value()) {
-        time = *_fixedEphemerisTime;
-    }
+    // Spice handles positions in KM, but we use meters in OpenSpace
     return SpiceManager::ref().targetPosition(
         _cachedTarget,
         _cachedObserver,
         _cachedFrame,
         {},
-        time,
+        _fixedEphemerisTime.value_or(data.time.j2000Seconds()),
         lightTime
     ) * 1000.0;
 }

From 75bbd3b8ada05730c2b0870d4ef6e39a579dc12a Mon Sep 17 00:00:00 2001
From: Emma Broman <emma.broman@liu.se>
Date: Tue, 24 Sep 2024 08:53:23 +0200
Subject: [PATCH 631/701] Add possiblity to set timestamp when using
 `jumpToNavigationState`

---
 src/navigation/pathnavigator_lua.inl | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/src/navigation/pathnavigator_lua.inl b/src/navigation/pathnavigator_lua.inl
index 9b7832ccb4..f168bef11c 100644
--- a/src/navigation/pathnavigator_lua.inl
+++ b/src/navigation/pathnavigator_lua.inl
@@ -333,11 +333,14 @@ namespace {
  * Fade rendering to black, jump to the specified node, and then fade in. This is done by
  * triggering another script that handles the logic.
  *
- * \param navigationState A [NavigationState](#core_navigation_state) to jump to
+ * \param navigationState A [NavigationState](#core_navigation_state) to jump to.
+ * \param useTimeStamp if true, and the provided NavigationState includes a timestamp,
+ *                     the time will be set as well.
  * \param fadeDuration An optional duration for the fading. If not included, the
- *                     property in Navigation Handler will be used
+ *                     property in Navigation Handler will be used.
  */
 [[codegen::luawrap]] void jumpToNavigationState(ghoul::Dictionary navigationState,
+                                                std::optional<bool> useTimeStamp,
                                                 std::optional<double> fadeDuration)
 {
     using namespace openspace;
@@ -362,8 +365,11 @@ namespace {
     // (@TODO emmbr 2024-04-03, This formatting problem should probably be fixed)
     interaction::NavigationState ns = interaction::NavigationState(navigationState);
 
+    bool setTime = (ns.timestamp.has_value() && useTimeStamp.value_or(false));
+
     const std::string script = std::format(
-        "openspace.navigation.setNavigationState({})", ghoul::formatLua(ns.dictionary())
+        "openspace.navigation.setNavigationState({}, {})",
+        ghoul::formatLua(ns.dictionary()), setTime
     );
 
     if (fadeDuration.has_value()) {

From 0fe90ed5b4dafab2524a62ff3f085460b904ffbf Mon Sep 17 00:00:00 2001
From: Emma Broman <emma.broman@liu.se>
Date: Tue, 24 Sep 2024 11:48:18 +0200
Subject: [PATCH 632/701] Fix ScreenSpace Rotation not being settable from
 asset

And restructure construction code to make it easier to find issues with unset parameters
---
 src/rendering/screenspacerenderable.cpp | 71 ++++++++++++++-----------
 1 file changed, 39 insertions(+), 32 deletions(-)

diff --git a/src/rendering/screenspacerenderable.cpp b/src/rendering/screenspacerenderable.cpp
index fa49bc7e11..e444aed037 100644
--- a/src/rendering/screenspacerenderable.cpp
+++ b/src/rendering/screenspacerenderable.cpp
@@ -235,6 +235,9 @@ namespace {
         // [[codegen::verbatim(ScaleInfo.description)]]
         std::optional<float> scale;
 
+        // [[codegen::verbatim(LocalRotationInfo.description)]]
+        std::optional<glm::vec3> rotation;
+
         // [[codegen::verbatim(GammaOffsetInfo.description)]]
         std::optional<float> gammaOffset;
 
@@ -350,15 +353,31 @@ ScreenSpaceRenderable::ScreenSpaceRenderable(const ghoul::Dictionary& dictionary
         setGuiName(*p.name);
     }
 
+    _enabled = p.enabled.value_or(_enabled);
     addProperty(_enabled);
+
     _renderDuringBlackout = p.renderDuringBlackout.value_or(_renderDuringBlackout);
     addProperty(_renderDuringBlackout);
+
+    _useRadiusAzimuthElevation =
+        p.useRadiusAzimuthElevation.value_or(_useRadiusAzimuthElevation);
     addProperty(_useRadiusAzimuthElevation);
+
+    _usePerspectiveProjection =
+        p.usePerspectiveProjection.value_or(_usePerspectiveProjection);
     addProperty(_usePerspectiveProjection);
+
+    _faceCamera = p.faceCamera.value_or(_faceCamera);
     addProperty(_faceCamera);
+
+    if (_useRadiusAzimuthElevation) {
+        _raePosition = p.radiusAzimuthElevation.value_or(_raePosition);
+    }
+    else {
+        _cartesianPosition = p.cartesianPosition.value_or(_cartesianPosition);
+    }
     addProperty(_cartesianPosition);
     addProperty(_raePosition);
-    addProperty(_gammaOffset);
 
     // Setting spherical/euclidean onchange handler
     _useRadiusAzimuthElevation.onChange([this]() {
@@ -370,47 +389,35 @@ ScreenSpaceRenderable::ScreenSpaceRenderable(const ghoul::Dictionary& dictionary
         }
     });
 
+    _gammaOffset = p.gammaOffset.value_or(_gammaOffset);
+    addProperty(_gammaOffset);
+
+    _scale = p.scale.value_or(_scale);
     addProperty(_scale);
-    addProperty(_multiplyColor);
-    addProperty(_backgroundColor);
-    addProperty(Fadeable::_opacity);
-    addProperty(Fadeable::_fade);
-    addProperty(_localRotation);
-
-    addProperty(_borderColor);
-    addProperty(_borderWidth);
-    addProperty(_borderFeather);
-
-    _borderWidth = p.borderWidth.value_or(_borderWidth);
-
-    _borderColor = p.borderColor.value_or(_borderColor);
-    _borderColor.setViewOption(properties::Property::ViewOptions::Color);
 
     _multiplyColor = p.multiplyColor.value_or(_multiplyColor);
     _multiplyColor.setViewOption(properties::Property::ViewOptions::Color);
+    addProperty(_multiplyColor);
 
     _backgroundColor = p.backgroundColor.value_or(_backgroundColor);
     _backgroundColor.setViewOption(properties::Property::ViewOptions::Color);
+    addProperty(_backgroundColor);
 
-    _enabled = p.enabled.value_or(_enabled);
-    _gammaOffset = p.gammaOffset.value_or(_gammaOffset);
-
-    _useRadiusAzimuthElevation =
-        p.useRadiusAzimuthElevation.value_or(_useRadiusAzimuthElevation);
-
-    if (_useRadiusAzimuthElevation) {
-        _raePosition = p.radiusAzimuthElevation.value_or(_raePosition);
-    }
-    else {
-        _cartesianPosition = p.cartesianPosition.value_or(_cartesianPosition);
-    }
-
-    _scale = p.scale.value_or(_scale);
     _opacity = p.opacity.value_or(_opacity);
-    _usePerspectiveProjection =
-        p.usePerspectiveProjection.value_or(_usePerspectiveProjection);
+    addProperty(Fadeable::_opacity);
+    addProperty(Fadeable::_fade);
 
-    _faceCamera = p.faceCamera.value_or(_faceCamera);
+    _localRotation = p.rotation.value_or(_localRotation);
+    addProperty(_localRotation);
+
+    _borderColor = p.borderColor.value_or(_borderColor);
+    _borderColor.setViewOption(properties::Property::ViewOptions::Color);
+    addProperty(_borderColor);
+
+    addProperty(_borderFeather);
+
+    _borderWidth = p.borderWidth.value_or(_borderWidth);
+    addProperty(_borderWidth);
 
     if (p.tag.has_value()) {
         if (std::holds_alternative<std::string>(*p.tag)) {

From acc6e41f3db2d2abd531418584452165d224a3bd Mon Sep 17 00:00:00 2001
From: Emma Broman <emma.broman@liu.se>
Date: Wed, 25 Sep 2024 09:45:05 +0200
Subject: [PATCH 633/701] Screenspace dashboard distance to earth example
 (#3428)

* Add screenspace dashboard example for showing distance to earth in lightyears

* Address review comments
---
 .../examples/screenspacedistancetoearth.asset | 61 +++++++++++++++++++
 1 file changed, 61 insertions(+)
 create mode 100644 data/assets/examples/screenspacedistancetoearth.asset

diff --git a/data/assets/examples/screenspacedistancetoearth.asset b/data/assets/examples/screenspacedistancetoearth.asset
new file mode 100644
index 0000000000..8d912e2a53
--- /dev/null
+++ b/data/assets/examples/screenspacedistancetoearth.asset
@@ -0,0 +1,61 @@
+local earth = asset.require("scene/solarsystem/planets/earth/earth")
+
+local Dashboard = {
+  Identifier = "ScreenSpaceDistanceToEarth",
+  Name = "Distance to Earth",
+  Type = "ScreenSpaceDashboard",
+  FaceCamera = false,
+  Scale = 3.0,
+  UseRadiusAzimuthElevation = true,
+  RadiusAzimuthElevation = { 2.0, -0.2, -0.2 },
+  Items = {
+    {
+      Type = "DashboardItemDistance",
+      Identifier = "EarthToCameraDistance",
+      GuiName = "Distance to Earth",
+      FontSize = 40,
+      SourceType = "Camera",
+      DestinationType = "Node",
+      DestinationNodeName = earth.Earth.Identifier,
+      -- Specify to use a specific unit, by disabling the automatic simplification of
+      -- unit and instead use light-years
+      Simplification = false,
+      RequestedUnit = "lightyear",
+      -- If we don't want to use the default format of the text, we can specify our own
+      -- format. Here we've decided to not include the name of the source object (index 0),
+      -- which would be "Camera". We just include the name of the destination node (Earth,
+      -- index 1), the distance (index 2) as a floating point number (f), and then the
+      -- name for the unit (index 3)
+      FormatString = "Distance to {1}: {2:f} {3}"
+    }
+  }
+}
+
+
+asset.onInitialize(function()
+  openspace.addScreenSpaceRenderable(Dashboard)
+  openspace.setPropertyValueSingle(
+    "ScreenSpace.ScreenSpaceDistanceToEarth.Size",
+    {0.0, 0.0, 640.0, 320.0}
+  )
+end)
+
+asset.onDeinitialize(function()
+  openspace.addScreenSpaceRenderable(Dashboard)
+end)
+
+asset.export(Dashboard)
+
+
+
+asset.meta = {
+  Name = "ScreenSpace - Distance to Earth",
+  Description = [[
+    This asset provides a screenspace dashboard item that shows the distance from the
+    camera to Earth, in light-years. This can be placed on a dome surface to show the
+    current distance to the audience.
+  ]],
+  Author = "OpenSpace Team",
+  URL = "http://openspaceproject.com",
+  License = "MIT license"
+}

From 4f58eff235d6c0ab29cf829839edc3aac68a7fd3 Mon Sep 17 00:00:00 2001
From: Alexander Bock <mail@alexanderbock.eu>
Date: Wed, 25 Sep 2024 10:24:15 +0200
Subject: [PATCH 634/701] Make it possible to choose in the asset whether the
 domain filtering in a fieldline sequence.  Apply the change to the Juice
 fieldlines (closes #3437)

---
 .../assets/scene/solarsystem/missions/juice/fieldlines.asset | 3 ++-
 .../rendering/renderablefieldlinessequence.cpp               | 5 +++++
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/data/assets/scene/solarsystem/missions/juice/fieldlines.asset b/data/assets/scene/solarsystem/missions/juice/fieldlines.asset
index 37f8c3793a..e578bd3471 100644
--- a/data/assets/scene/solarsystem/missions/juice/fieldlines.asset
+++ b/data/assets/scene/solarsystem/missions/juice/fieldlines.asset
@@ -25,7 +25,8 @@ local GanymedeMagnetosphere = {
     Color = { 0.03, 0.0, 0.0, 1.0 },
     ParticleSpacing = 42.0,
     ParticleSize = 30.0,
-    FlowColor = { 1.0, 1.0, 1.0, 0.1 }
+    FlowColor = { 1.0, 1.0, 1.0, 0.1 },
+    DomainEnabled = false
 
   },
   GUI = {
diff --git a/modules/fieldlinessequence/rendering/renderablefieldlinessequence.cpp b/modules/fieldlinessequence/rendering/renderablefieldlinessequence.cpp
index e72436b3e9..057d44bfb5 100644
--- a/modules/fieldlinessequence/rendering/renderablefieldlinessequence.cpp
+++ b/modules/fieldlinessequence/rendering/renderablefieldlinessequence.cpp
@@ -266,6 +266,9 @@ namespace {
         // masked by. Should be entered as {min value, max value} per range
         std::optional<std::vector<glm::vec2>> maskingRanges;
 
+        // [[codegen::verbatim(DomainEnabledInfo.description)]]
+        std::optional<bool> domainEnabled;
+
         // Value should be path to folder where states are saved. Specifying this
         // makes it use file type converter
         // (JSON/CDF input => osfls output & oslfs input => JSON output)
@@ -478,6 +481,8 @@ RenderableFieldlinesSequence::RenderableFieldlinesSequence(
         _maskingRanges.push_back(glm::vec2(-100000.f, 100000.f)); // some default values
     }
 
+    _domainEnabled = p.domainEnabled.value_or(_domainEnabled);
+
     _outputFolderPath = p.outputFolder.value_or(_outputFolderPath);
     if (!_outputFolderPath.empty() && !std::filesystem::is_directory(_outputFolderPath)) {
         _outputFolderPath.clear();

From 326740095fcafed931af8cab540f47927cb3a1f1 Mon Sep 17 00:00:00 2001
From: Emma Broman <emma.broman@liu.se>
Date: Wed, 25 Sep 2024 11:03:23 +0200
Subject: [PATCH 635/701] Do not hide requestedUnit of dashboarditem distance
 in UI (#3435)

* Do not hide requestedUnit of dashboarditem distance in UI

We want to be able to change it during runtime

* Change visiblity of RequestedUnit properties
---
 modules/base/dashboard/dashboarditemdistance.cpp | 13 +++----------
 1 file changed, 3 insertions(+), 10 deletions(-)

diff --git a/modules/base/dashboard/dashboarditemdistance.cpp b/modules/base/dashboard/dashboarditemdistance.cpp
index da03286844..20440c3e13 100644
--- a/modules/base/dashboard/dashboarditemdistance.cpp
+++ b/modules/base/dashboard/dashboarditemdistance.cpp
@@ -86,14 +86,15 @@ namespace {
         "If this value is enabled, the distance is displayed in nuanced units, such as "
         "km, AU, light years, parsecs, etc. If this value is disabled, the unit can be "
         "explicitly requested.",
-        openspace::properties::Property::Visibility::User
+        openspace::properties::Property::Visibility::AdvancedUser
     };
 
     constexpr openspace::properties::Property::PropertyInfo RequestedUnitInfo = {
         "RequestedUnit",
         "Requested Unit",
         "If the simplification is disabled, this distance unit is used as a destination "
-        "to convert the meters into."
+        "to convert the meters into.",
+        openspace::properties::Property::Visibility::AdvancedUser
     };
 
     constexpr openspace::properties::Property::PropertyInfo FormatStringInfo = {
@@ -253,13 +254,6 @@ DashboardItemDistance::DashboardItemDistance(const ghoul::Dictionary& dictionary
     addProperty(_destination.nodeName);
 
     _doSimplification = p.simplification.value_or(_doSimplification);
-    _doSimplification.onChange([this]() {
-        _requestedUnit.setVisibility(
-            _doSimplification ?
-            properties::Property::Visibility::Hidden :
-            properties::Property::Visibility::User
-        );
-    });
     addProperty(_doSimplification);
 
     for (const DistanceUnit u : DistanceUnits) {
@@ -273,7 +267,6 @@ DashboardItemDistance::DashboardItemDistance(const ghoul::Dictionary& dictionary
         const DistanceUnit unit = distanceUnitFromString(*p.requestedUnit);
         _requestedUnit = static_cast<int>(unit);
     }
-    _requestedUnit.setVisibility(properties::Property::Visibility::Hidden);
     addProperty(_requestedUnit);
 
     _formatString = p.formatString.value_or(_formatString);

From 56a9d6ae8c560b4ad9c687be510f2dad8fe32f31 Mon Sep 17 00:00:00 2001
From: Alexander Bock <alexander.bock@liu.se>
Date: Sat, 28 Sep 2024 13:19:29 +0200
Subject: [PATCH 636/701] Add the ability to query RAM and VRAM usage (#3427)

---
 include/openspace/engine/openspaceengine.h |   3 +
 modules/imgui/src/guimemorycomponent.cpp   |  10 +-
 src/CMakeLists.txt                         |   3 +
 src/engine/openspaceengine.cpp             | 115 +++++++++++++++++++++
 src/engine/openspaceengine_lua.inl         |  16 +++
 src/rendering/renderengine.cpp             |   8 ++
 src/scene/scenegraphnode.cpp               |  20 +++-
 7 files changed, 172 insertions(+), 3 deletions(-)

diff --git a/include/openspace/engine/openspaceengine.h b/include/openspace/engine/openspaceengine.h
index 1bee159c44..bca6e52241 100644
--- a/include/openspace/engine/openspaceengine.h
+++ b/include/openspace/engine/openspaceengine.h
@@ -134,6 +134,9 @@ public:
 
     void createUserDirectoriesIfNecessary();
 
+    uint64_t ramInUse() const;
+    uint64_t vramInUse() const;
+
     /**
      * Returns the Lua library that contains all Lua functions available to affect the
      * application.
diff --git a/modules/imgui/src/guimemorycomponent.cpp b/modules/imgui/src/guimemorycomponent.cpp
index c1ca19ccfb..7e78184d4f 100644
--- a/modules/imgui/src/guimemorycomponent.cpp
+++ b/modules/imgui/src/guimemorycomponent.cpp
@@ -26,6 +26,7 @@
 
 #include <modules/imgui/include/imgui_include.h>
 #include <openspace/engine/globals.h>
+#include <openspace/engine/openspaceengine.h>
 #include <openspace/util/memorymanager.h>
 
 namespace {
@@ -65,11 +66,16 @@ void GuiMemoryComponent::render() {
     _isEnabled = v;
     _isCollapsed = ImGui::IsWindowCollapsed();
 
+    uint64_t ram = global::openSpaceEngine->ramInUse();
+    ImGui::Text("RAM: %u (%f MiB)", ram, ram / (1024.f * 1024.f));
+    uint64_t vram = global::openSpaceEngine->vramInUse();
+    ImGui::Text("VRAM: %u (%f MiB)", vram, vram / (1024.f * 1024.f));
+
+    ImGui::Spacing();
+
     ImGui::Text("%s", "Persistent Memory Pool");
     renderMemoryPoolInformation(global::memoryManager->PersistentMemory);
 
-    //ImGui::Text("%s", "Temporary Memory Pool");
-    //renderMemoryPoolInformation(global::memoryManager.TemporaryMemory);
     ImGui::End();
 }
 
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 5e7829ba07..3cf7b141b6 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -503,6 +503,9 @@ configure_file(
 if (APPLE)
   target_link_libraries(openspace-core INTERFACE external-system-apple)
 endif ()
+if (WIN32)
+  target_link_libraries(openspace-core PUBLIC "pdh")
+endif ()
 
 set_openspace_compile_settings(openspace-core)
 target_link_libraries(openspace-core PUBLIC Ghoul spice external-curl)
diff --git a/src/engine/openspaceengine.cpp b/src/engine/openspaceengine.cpp
index 17458ee116..bca6ccc6ed 100644
--- a/src/engine/openspaceengine.cpp
+++ b/src/engine/openspaceengine.cpp
@@ -92,6 +92,8 @@
 
 #ifdef WIN32
 #include <Windows.h>
+#include <Pdh.h>
+#include "Psapi.h"
 #endif // WIN32
 
 #ifdef __APPLE__
@@ -107,6 +109,12 @@ namespace {
 
     constexpr std::string_view _loggerCat = "OpenSpaceEngine";
 
+#ifdef WIN32
+    // This counter is used to measure the VRAM usage of OpenSpace
+    PDH_HQUERY vramQuery;
+    PDH_HCOUNTER vramCounter;
+#endif // WIN32
+
     constexpr std::string_view stringify(openspace::OpenSpaceEngine::Mode m) {
         using Mode = openspace::OpenSpaceEngine::Mode;
         switch (m) {
@@ -222,6 +230,22 @@ OpenSpaceEngine::OpenSpaceEngine()
 
     addProperty(_fadeOnEnableDuration);
     addProperty(_disableAllMouseInputs);
+
+#ifdef WIN32
+    PDH_STATUS status = PdhOpenQueryA(nullptr, 0, &vramQuery);
+    if (status != ERROR_SUCCESS) {
+        LWARNING("Error opening Performance Query for VRAM usage");
+    }
+
+    const std::string queryStr = std::format(
+        "\\GPU Process Memory(pid_{}*)\\Dedicated Usage",
+        GetCurrentProcessId()
+    );
+    status = PdhAddEnglishCounterA(vramQuery, queryStr.c_str(), 0, &vramCounter);
+    if (status != ERROR_SUCCESS) {
+        LWARNING("Error add Performance Query for VRAM usage");
+    }
+#endif // WIN32
 }
 
 OpenSpaceEngine::~OpenSpaceEngine() {}
@@ -914,6 +938,53 @@ void OpenSpaceEngine::createUserDirectoriesIfNecessary() {
     }
 }
 
+uint64_t OpenSpaceEngine::ramInUse() const {
+#ifdef WIN32
+    PROCESS_MEMORY_COUNTERS_EX pmc;
+    BOOL success = GetProcessMemoryInfo(
+        GetCurrentProcess(),
+        reinterpret_cast<PROCESS_MEMORY_COUNTERS*>(&pmc),
+        sizeof(PROCESS_MEMORY_COUNTERS_EX)
+    );
+    if (!success) {
+        LERROR("Error retrieving RAM usage");
+        return 0;
+    }
+
+    return pmc.PrivateUsage;
+#else // ^^^^ WIN32 // !WIN32 vvvv
+    LWARNING("Unsupported operating");
+    return 0;
+#endif
+}
+
+uint64_t OpenSpaceEngine::vramInUse() const {
+#ifdef WIN32
+    PDH_STATUS status = PdhCollectQueryData(vramQuery);
+    if (status != ERROR_SUCCESS) {
+        LERROR("Error collecting VRAM query data");
+        return 0;
+    }
+
+    PDH_FMT_COUNTERVALUE value;
+    status = PdhGetFormattedCounterValue(
+        vramCounter,
+        PDH_FMT_LARGE | PDH_FMT_NOSCALE,
+        nullptr,
+        &value
+    );
+    if (status != ERROR_SUCCESS) {
+        LERROR("Error formatting VRAM query data");
+        return 0;
+    }
+    LONGLONG v = value.largeValue;
+    return v;
+#else // ^^^^ WIN32 // !WIN32 vvvv
+    LWARNING("Unsupported operating");
+    return 0;
+#endif
+}
+
 void OpenSpaceEngine::runGlobalCustomizationScripts() {
     ZoneScoped;
 
@@ -974,6 +1045,10 @@ void OpenSpaceEngine::loadFonts() {
 void OpenSpaceEngine::preSynchronization() {
     ZoneScoped;
     TracyGpuZone("preSynchronization");
+#ifdef TRACY_ENABLE
+    TracyPlot("RAM", static_cast<int64_t>(ramInUse()));
+    TracyPlot("VRAM", static_cast<int64_t>(vramInUse()));
+#endif // TRACY_ENABLE
 
     LTRACE("OpenSpaceEngine::preSynchronization(begin)");
 
@@ -1040,6 +1115,10 @@ void OpenSpaceEngine::preSynchronization() {
 
     for (const std::function<void()>& func : *global::callback::preSync) {
         ZoneScopedN("[Module] preSync");
+#ifdef TRACY_ENABLE
+        TracyPlot("RAM", static_cast<int64_t>(ramInUse()));
+        TracyPlot("VRAM", static_cast<int64_t>(vramInUse()));
+#endif // TRACY_ENABLE
 
         func();
     }
@@ -1066,6 +1145,10 @@ void OpenSpaceEngine::postSynchronizationPreDraw() {
     ZoneScoped;
     TracyGpuZone("postSynchronizationPreDraw");
     LTRACE("OpenSpaceEngine::postSynchronizationPreDraw(begin)");
+#ifdef TRACY_ENABLE
+    TracyPlot("RAM", static_cast<int64_t>(ramInUse()));
+    TracyPlot("VRAM", static_cast<int64_t>(vramInUse()));
+#endif // TRACY_ENABLE
 
     const bool master = global::windowDelegate->isMaster();
     global::syncEngine->postSynchronization(SyncEngine::IsMaster(master));
@@ -1095,6 +1178,10 @@ void OpenSpaceEngine::postSynchronizationPreDraw() {
 
     for (const std::function<void()>& func : *global::callback::postSyncPreDraw) {
         ZoneScopedN("[Module] postSyncPreDraw");
+#ifdef TRACY_ENABLE
+        TracyPlot("RAM", static_cast<int64_t>(ramInUse()));
+        TracyPlot("VRAM", static_cast<int64_t>(vramInUse()));
+#endif // TRACY_ENABLE
 
         func();
     }
@@ -1128,12 +1215,21 @@ void OpenSpaceEngine::render(const glm::mat4& sceneMatrix, const glm::mat4& view
     TracyGpuZone("Render");
     LTRACE("OpenSpaceEngine::render(begin)");
 
+#ifdef TRACY_ENABLE
+    TracyPlot("RAM", static_cast<int64_t>(ramInUse()));
+    TracyPlot("VRAM", static_cast<int64_t>(vramInUse()));
+#endif // TRACY_ENABLE
+
     viewportChanged();
 
     global::renderEngine->render(sceneMatrix, viewMatrix, projectionMatrix);
 
     for (const std::function<void()>& func : *global::callback::render) {
         ZoneScopedN("[Module] render");
+#ifdef TRACY_ENABLE
+        TracyPlot("RAM", static_cast<int64_t>(ramInUse()));
+        TracyPlot("VRAM", static_cast<int64_t>(vramInUse()));
+#endif // TRACY_ENABLE
 
         func();
     }
@@ -1145,6 +1241,10 @@ void OpenSpaceEngine::drawOverlays() {
     ZoneScoped;
     TracyGpuZone("Draw2D");
     LTRACE("OpenSpaceEngine::drawOverlays(begin)");
+#ifdef TRACY_ENABLE
+    TracyPlot("RAM", static_cast<int64_t>(ramInUse()));
+    TracyPlot("VRAM", static_cast<int64_t>(vramInUse()));
+#endif // TRACY_ENABLE
 
     viewportChanged();
 
@@ -1161,6 +1261,11 @@ void OpenSpaceEngine::drawOverlays() {
 
     for (const std::function<void()>& func : *global::callback::draw2D) {
         ZoneScopedN("[Module] draw2D");
+#ifdef TRACY_ENABLE
+        TracyPlot("RAM", static_cast<int64_t>(ramInUse()));
+        TracyPlot("VRAM", static_cast<int64_t>(vramInUse()));
+#endif // TRACY_ENABLE
+
         func();
     }
 
@@ -1170,12 +1275,20 @@ void OpenSpaceEngine::drawOverlays() {
 void OpenSpaceEngine::postDraw() {
     ZoneScoped;
     TracyGpuZone("postDraw");
+#ifdef TRACY_ENABLE
+    TracyPlot("RAM", static_cast<int64_t>(ramInUse()));
+    TracyPlot("VRAM", static_cast<int64_t>(vramInUse()));
+#endif // TRACY_ENABLE
     LTRACE("OpenSpaceEngine::postDraw(begin)");
 
     global::renderEngine->postDraw();
 
     for (const std::function<void()>& func : *global::callback::postDraw) {
         ZoneScopedN("[Module] postDraw");
+#ifdef TRACY_ENABLE
+        TracyPlot("RAM", static_cast<int64_t>(ramInUse()));
+        TracyPlot("VRAM", static_cast<int64_t>(vramInUse()));
+#endif // TRACY_ENABLE
 
         func();
     }
@@ -1551,6 +1664,8 @@ scripting::LuaLibrary OpenSpaceEngine::luaLibrary() {
             codegen::lua::LayerServer,
             codegen::lua::LoadJson,
             codegen::lua::ResolveShortcut,
+            codegen::lua::VramInUse,
+            codegen::lua::RamInUse
         },
         {
             absPath("${SCRIPTS}/core_scripts.lua")
diff --git a/src/engine/openspaceengine_lua.inl b/src/engine/openspaceengine_lua.inl
index 866d11159a..bcfd2c6534 100644
--- a/src/engine/openspaceengine_lua.inl
+++ b/src/engine/openspaceengine_lua.inl
@@ -308,4 +308,20 @@ namespace {
 #endif // WIN32
 }
 
+/**
+ * Returns the number of bytes of video memory that is currently being used. This function
+ * only works on Windows.
+ */
+[[codegen::luawrap]] double vramInUse() {
+    return static_cast<double>(openspace::global::openSpaceEngine->vramInUse());
+}
+
+/**
+ * Returns the number of bytes of system memory that is currently being used. This
+ * function only works on Windows.
+ */
+[[codegen::luawrap]] double ramInUse() {
+    return static_cast<double>(openspace::global::openSpaceEngine->ramInUse());
+}
+
 #include "openspaceengine_lua_codegen.cpp"
diff --git a/src/rendering/renderengine.cpp b/src/rendering/renderengine.cpp
index ade20562b5..a950c085dd 100644
--- a/src/rendering/renderengine.cpp
+++ b/src/rendering/renderengine.cpp
@@ -572,6 +572,10 @@ void RenderEngine::updateScreenSpaceRenderables() {
     ZoneScoped;
 
     for (std::unique_ptr<ScreenSpaceRenderable>& ssr : *global::screenSpaceRenderables) {
+#ifdef TRACY_ENABLE
+        TracyPlot("RAM", static_cast<int64_t>(global::openSpaceEngine->ramInUse()));
+        TracyPlot("VRAM", static_cast<int64_t>(global::openSpaceEngine->vramInUse()));
+#endif // TRACY_ENABLE
         ssr->update();
     }
 }
@@ -706,6 +710,10 @@ void RenderEngine::render(const glm::mat4& sceneMatrix, const glm::mat4& viewMat
             .gamma = _gamma
         };
         for (ScreenSpaceRenderable* ssr : ssrs) {
+#ifdef TRACY_ENABLE
+            TracyPlot("RAM", static_cast<int64_t>(global::openSpaceEngine->ramInUse()));
+            TracyPlot("VRAM", static_cast<int64_t>(global::openSpaceEngine->vramInUse()));
+#endif // TRACY_ENABLE
             ssr->render(data);
         }
         glDisable(GL_BLEND);
diff --git a/src/scene/scenegraphnode.cpp b/src/scene/scenegraphnode.cpp
index b1dd345960..aadb260571 100644
--- a/src/scene/scenegraphnode.cpp
+++ b/src/scene/scenegraphnode.cpp
@@ -29,6 +29,7 @@
 #include <modules/base/translation/statictranslation.h>
 #include <openspace/documentation/documentation.h>
 #include <openspace/engine/globals.h>
+#include <openspace/engine/openspaceengine.h>
 #include <openspace/engine/windowdelegate.h>
 #include <openspace/rendering/helper.h>
 #include <openspace/rendering/renderable.h>
@@ -629,6 +630,11 @@ SceneGraphNode::~SceneGraphNode() {}
 void SceneGraphNode::initialize() {
     ZoneScoped;
     ZoneName(identifier().c_str(), identifier().size());
+#ifdef TRACY_ENABLE
+    TracyPlot("RAM", static_cast<int64_t>(global::openSpaceEngine->ramInUse()));
+    TracyPlot("VRAM", static_cast<int64_t>(global::openSpaceEngine->vramInUse()));
+#endif // TRACY_ENABLE
+
 
     LDEBUG(std::format("Initializing: {}", identifier()));
 
@@ -657,7 +663,11 @@ void SceneGraphNode::initialize() {
 void SceneGraphNode::initializeGL() {
     ZoneScoped;
     ZoneName(identifier().c_str(), identifier().size());
-    TracyGpuZone("initializeGL")
+    TracyGpuZone("initializeGL");
+#ifdef TRACY_ENABLE
+    TracyPlot("RAM", static_cast<int64_t>(global::openSpaceEngine->ramInUse()));
+    TracyPlot("VRAM", static_cast<int64_t>(global::openSpaceEngine->vramInUse()));
+#endif // TRACY_ENABLE
 
     LDEBUG(std::format("Initializing GL: {}", identifier()));
 
@@ -735,6 +745,10 @@ void SceneGraphNode::traversePostOrder(const std::function<void(SceneGraphNode*)
 void SceneGraphNode::update(const UpdateData& data) {
     ZoneScoped;
     ZoneName(identifier().c_str(), identifier().size());
+#ifdef TRACY_ENABLE
+    TracyPlot("RAM", static_cast<int64_t>(global::openSpaceEngine->ramInUse()));
+    TracyPlot("VRAM", static_cast<int64_t>(global::openSpaceEngine->vramInUse()));
+#endif // TRACY_ENABLE
 
     if (_state != State::Initialized && _state != State::GLInitialized) {
         return;
@@ -785,6 +799,10 @@ void SceneGraphNode::update(const UpdateData& data) {
 void SceneGraphNode::render(const RenderData& data, RendererTasks& tasks) {
     ZoneScoped;
     ZoneName(identifier().c_str(), identifier().size());
+#ifdef TRACY_ENABLE
+    TracyPlot("RAM", static_cast<int64_t>(global::openSpaceEngine->ramInUse()));
+    TracyPlot("VRAM", static_cast<int64_t>(global::openSpaceEngine->vramInUse()));
+#endif // TRACY_ENABLE
 
     if (_state != State::GLInitialized) {
         return;

From 2d6e2d891b5f3c3300cafd9c1b9ce45e40b84967 Mon Sep 17 00:00:00 2001
From: Emma Broman <emma.broman@liu.se>
Date: Thu, 3 Oct 2024 14:05:28 +0200
Subject: [PATCH 637/701] Remove any double whitespace in script documentations
 (closes #3448)

---
 src/documentation/documentationengine.cpp | 14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)

diff --git a/src/documentation/documentationengine.cpp b/src/documentation/documentationengine.cpp
index 6dc5de0afa..ddcbae1b1f 100644
--- a/src/documentation/documentationengine.cpp
+++ b/src/documentation/documentationengine.cpp
@@ -46,6 +46,7 @@
 #include <ghoul/filesystem/filesystem.h>
 #include <ghoul/format.h>
 #include <ghoul/misc/profiling.h>
+#include <ghoul/misc/stringhelper.h>
 #include <fstream>
 #include <future>
 
@@ -242,7 +243,18 @@ namespace {
 
         function[ArgumentsKey] = arguments;
         function[ReturnTypeKey] = f.returnType;
-        function[HelpKey] = f.helpText;
+
+        // Remove all double whitespaces from the helptext (these may be generated when
+        // using multi-line strings in Lua)
+        std::string cleanedHelpText = f.helpText;
+        ghoul::trimWhitespace(cleanedHelpText);
+        std::size_t doubleSpace = cleanedHelpText.find("  ");
+        while (doubleSpace != std::string::npos) {
+            cleanedHelpText.erase(doubleSpace, 1);
+            doubleSpace = cleanedHelpText.find("  ");
+        }
+
+        function[HelpKey] = cleanedHelpText;
 
         if (includeSourceLocation) {
             nlohmann::json sourceLocation;

From 9582d81fb63c402b33ec279b04e1d43854c32164 Mon Sep 17 00:00:00 2001
From: Malin E <malin.ejdbo@gmail.com>
Date: Wed, 9 Oct 2024 10:39:13 +0200
Subject: [PATCH 638/701] Sync out the anchor node, issue 2854 (#3398)

* Sync out anchor node to all connected clients

* Remove warning in case anchor node is nullptr

* Always sync out the anchor node to nodes
---
 include/openspace/navigation/orbitalnavigator.h |  5 +++++
 src/engine/openspaceengine.cpp                  |  5 ++++-
 src/navigation/orbitalnavigator.cpp             | 14 ++++++++++++++
 3 files changed, 23 insertions(+), 1 deletion(-)

diff --git a/include/openspace/navigation/orbitalnavigator.h b/include/openspace/navigation/orbitalnavigator.h
index c5f1cd05ee..deaa8b5f85 100644
--- a/include/openspace/navigation/orbitalnavigator.h
+++ b/include/openspace/navigation/orbitalnavigator.h
@@ -38,6 +38,7 @@
 #include <openspace/properties/scalar/boolproperty.h>
 #include <openspace/properties/scalar/floatproperty.h>
 #include <openspace/properties/triggerproperty.h>
+#include <openspace/util/syncdata.h>
 #include <ghoul/glm.h>
 #include <glm/gtx/quaternion.hpp>
 #include <optional>
@@ -148,6 +149,9 @@ public:
      */
     glm::dvec3 pushToSurfaceOfAnchor(const glm::dvec3& cameraPosition) const;
 
+    void updateAnchor();
+    std::vector<Syncable*> syncables();
+
     /**
      * \return The Lua library that contains all Lua functions available to affect the
      *         OrbitalNavigator
@@ -244,6 +248,7 @@ private:
     WebsocketCameraStates _websocketStates;
     ScriptCameraStates _scriptStates;
 
+    SyncData<std::string> _syncedAnchorNode;
     const SceneGraphNode* _anchorNode = nullptr;
     const SceneGraphNode* _aimNode = nullptr;
 
diff --git a/src/engine/openspaceengine.cpp b/src/engine/openspaceengine.cpp
index bca6ccc6ed..4bfd4e8662 100644
--- a/src/engine/openspaceengine.cpp
+++ b/src/engine/openspaceengine.cpp
@@ -831,6 +831,9 @@ void OpenSpaceEngine::loadAssets() {
     global::renderEngine->updateScene();
 
     global::syncEngine->addSyncables(global::timeManager->syncables());
+    global::syncEngine->addSyncables(
+        global::navigationHandler->orbitalNavigator().syncables()
+    );
     if (_scene && _scene->camera()) {
         global::syncEngine->addSyncables(_scene->camera()->syncables());
     }
@@ -1173,6 +1176,7 @@ void OpenSpaceEngine::postSynchronizationPreDraw() {
     global::luaConsole->update();
 
     if (!master) {
+        global::navigationHandler->orbitalNavigator().updateAnchor();
         _scene->camera()->invalidateCache();
     }
 
@@ -1309,7 +1313,6 @@ void OpenSpaceEngine::postDraw() {
     global::eventEngine->triggerActions();
     global::eventEngine->triggerTopics();
 
-
     global::eventEngine->postFrameCleanup();
     global::memoryManager->PersistentMemory.housekeeping();
 
diff --git a/src/navigation/orbitalnavigator.cpp b/src/navigation/orbitalnavigator.cpp
index fb729b8485..1e0035552b 100644
--- a/src/navigation/orbitalnavigator.cpp
+++ b/src/navigation/orbitalnavigator.cpp
@@ -1109,6 +1109,7 @@ void OrbitalNavigator::setAnchorNode(const SceneGraphNode* anchorNode,
 
     const bool changedAnchor = _anchorNode != anchorNode;
     _anchorNode = anchorNode;
+    _syncedAnchorNode = anchorNode ? anchorNode->identifier() : "";
 
     // Need to reset velocities after the actual switch in anchor node,
     // since the reset behavior depends on the anchor node.
@@ -2084,6 +2085,19 @@ double OrbitalNavigator::rotationSpeedScaleFromCameraHeight(
         1.0;
 }
 
+// This should only be run on nodes and not on master
+void OrbitalNavigator::updateAnchor() {
+    ghoul_assert(!global::windowDelegate->isMaster());
+
+    if (!_syncedAnchorNode.data().empty()) {
+        setAnchorNode(_syncedAnchorNode);
+    }
+}
+
+std::vector<Syncable*> OrbitalNavigator::syncables() {
+    return { &_syncedAnchorNode };
+}
+
 scripting::LuaLibrary OrbitalNavigator::luaLibrary() {
     return {
         "orbitalnavigation",

From 125114cad545e653c3b76080dd6c4ec4727303ce Mon Sep 17 00:00:00 2001
From: Alexander Bock <alexander.bock@liu.se>
Date: Thu, 10 Oct 2024 09:48:39 +0200
Subject: [PATCH 639/701] Add documentation for TileProviderByLevel (#3446)

---------

Co-authored-by: Ylva Selling <ylva.selling@gmail.com>
---
 .../tileproviderbylevel/bylevel.asset         | 62 +++++++++++++++++++
 .../src/tileprovider/tileproviderbylevel.cpp  | 19 +++++-
 2 files changed, 80 insertions(+), 1 deletion(-)
 create mode 100644 data/assets/examples/tileprovider/tileproviderbylevel/bylevel.asset

diff --git a/data/assets/examples/tileprovider/tileproviderbylevel/bylevel.asset b/data/assets/examples/tileprovider/tileproviderbylevel/bylevel.asset
new file mode 100644
index 0000000000..d4aac29455
--- /dev/null
+++ b/data/assets/examples/tileprovider/tileproviderbylevel/bylevel.asset
@@ -0,0 +1,62 @@
+-- Basic
+-- This example file adds two layers to a globe. The first layer being used is showing
+-- a cloud layer and at higher levels a Blue Marble image is used instead. Recommended
+-- reading for this example is the documentation on the
+-- [DefaultTileProvider](#globebrowsing_defaulttileprovider).
+
+-- Download some example images that we can use
+local images = asset.resource({
+  Name = "Earth Textures",
+  Type = "HttpSynchronization",
+  Identifier = "earth_textures",
+  Version = 3
+})
+
+-- Define the TileProvider
+local TileProvider = {
+  Identifier = "Example",
+  Type = "TileProviderByLevel",
+  Enabled = true,
+  LevelTileProviders = {
+    {
+      -- Show only a cloud layer for the first 3 layers (2, 3, 4)
+      MaxLevel = 4,
+      TileProvider = {
+        Identifier = "Blue_Marble_Clouds",
+        FilePath = images .. "earth_clouds.jpg"
+      }
+    },
+    {
+      -- Then transition fade into the Blue Marble image representation
+      MaxLevel = 22,
+      TileProvider = {
+        Identifier = "Blue_Marble",
+        FilePath = images .. "earth_bluemarble.jpg"
+      }
+    }
+  }
+}
+
+-- Define the scene graph node
+local Node = {
+  Identifier = "TileProviderByLevel_Example",
+  Renderable = {
+    Type = "RenderableGlobe",
+    Layers = {
+      -- The globe has exactly one layer, which is the one we defined above
+      ColorLayers = { TileProvider }
+    }
+  },
+  GUI = {
+    Name = "TileProviderByLevel - Basic",
+    Path = "/Examples"
+  }
+}
+
+asset.onInitialize(function()
+  openspace.addSceneGraphNode(Node)
+end)
+
+asset.onDeinitialize(function()
+  openspace.removeSceneGraphNode(Node)
+end)
diff --git a/modules/globebrowsing/src/tileprovider/tileproviderbylevel.cpp b/modules/globebrowsing/src/tileprovider/tileproviderbylevel.cpp
index 95625a3655..6abd4830e7 100644
--- a/modules/globebrowsing/src/tileprovider/tileproviderbylevel.cpp
+++ b/modules/globebrowsing/src/tileprovider/tileproviderbylevel.cpp
@@ -27,11 +27,28 @@
 #include <openspace/documentation/documentation.h>
 
 namespace {
+    // This tile provider will switch between different tile providers specified within
+    // based on the level of detail that is requested by the Globe. All other things being
+    // equal, this corresponds to the distance of the camera to the planet, with a closer
+    // distance resulting in a higher lever. Due to technical reasons, the available
+    // levels are in the range [2, 22] and each increase in levels corresponds to a
+    // doubling in the effective resolution. For a given requested level, the tile
+    // provider that has the largest `MaxLevel` that is not greater than the requested
+    // level will be used.
     struct [[codegen::Dictionary(TileProviderByLevel)]] Parameters {
+        // Each collection describes a distinct layer which can be toggled at a specified
+        // max level at which it is requested.
         struct Provider {
+            // The maximum level until which the tile provider is used. This number is
+            // inclusive, meaning that a value of 4 causes the tile provider to be used
+            // at level 4 but not at level 5.
             int maxLevel [[codegen::greaterequal(0)]];
-            ghoul::Dictionary tileProvider;
+
+            // The tile provider that should be used at this stage.
+            ghoul::Dictionary tileProvider [[codegen::reference("globebrowsing_layer")]];
         };
+
+        // The list of all tile providers that are used by this TileProviderByLevel.
         std::vector<Provider> levelTileProviders;
     };
 #include "tileproviderbylevel_codegen.cpp"

From ff345006d108608a29ac07e490b71241f3124534 Mon Sep 17 00:00:00 2001
From: Alexander Bock <alexander.bock@liu.se>
Date: Thu, 10 Oct 2024 09:49:02 +0200
Subject: [PATCH 640/701] General code cleanup (#3445)

---
 README.md                                     |   1 -
 apps/OpenSpace/ext/sgct                       |   2 +-
 ext/ghoul                                     |   2 +-
 .../openspace/documentation/documentation.h   |  24 +-
 include/openspace/documentation/verifier.h    |  24 +-
 include/openspace/documentation/verifier.inl  |   6 +-
 include/openspace/engine/configuration.h      |   2 +-
 include/openspace/engine/moduleengine.h       |   6 +
 include/openspace/scripting/scriptengine.h    |   2 +-
 include/openspace/util/openspacemodule.h      |   6 +
 modules/CMakeLists.txt                        |   6 +
 modules/audio/audiomodule.cpp                 |   4 +
 modules/audio/audiomodule.h                   |   2 +
 .../rendering/grids/renderableboxgrid.cpp     |   2 +-
 .../base/rendering/grids/renderablegrid.cpp   |   2 +-
 .../grids/renderablesphericalgrid.cpp         |   2 +-
 .../rendering/renderablecartesianaxes.cpp     |   2 +-
 .../renderableplanetimevaryingimage.cpp       |  33 +-
 modules/base/rendering/renderabletrail.cpp    |   4 +-
 .../base/rendering/screenspacedashboard.cpp   |  13 +-
 .../base/rendering/screenspaceimagelocal.cpp  |  13 +-
 .../base/rendering/screenspaceimageonline.cpp |  13 +-
 modules/cefwebgui/cefwebguimodule.cpp         |  35 +-
 modules/cefwebgui/cefwebguimodule.h           |   2 +
 .../debugging/rendering/debugshader_fs.glsl   |   2 +-
 .../debugging/rendering/debugshader_vs.glsl   |   2 +-
 modules/exoplanets/exoplanetsmodule.cpp       |   4 +
 modules/exoplanets/exoplanetsmodule.h         |   1 +
 modules/fitsfilereader/src/fitsfilereader.cpp |   2 +-
 .../gaia/rendering/renderablegaiastars.cpp    |   6 +-
 modules/gaia/shaders/gaia_ssbo_vs.glsl        |   2 +-
 modules/gaia/tasks/readfitstask.cpp           |   5 +-
 .../galaxy/tasks/milkywayconversiontask.cpp   |  51 +-
 modules/globebrowsing/globebrowsingmodule.cpp |   6 +-
 modules/globebrowsing/globebrowsingmodule.h   |   1 +
 .../src/geojson/geojsoncomponent.cpp          |   6 +-
 .../src/geojson/geojsonmanager.cpp            |  18 -
 .../src/geojson/geojsonmanager.h              |   5 -
 modules/globebrowsing/src/layer.cpp           |  32 +-
 modules/globebrowsing/src/layeradjustment.cpp |   2 +-
 modules/globebrowsing/src/layergroup.cpp      |  13 -
 modules/globebrowsing/src/layergroup.h        |   2 -
 modules/globebrowsing/src/layermanager.cpp    |  60 +-
 modules/globebrowsing/src/layermanager.h      |   4 +-
 modules/globebrowsing/src/renderableglobe.cpp |  31 +-
 modules/globebrowsing/src/ringscomponent.cpp  |  30 +-
 modules/globebrowsing/src/shadowcomponent.cpp |   7 +-
 .../src/tileprovider/tileprovider.cpp         |   7 +-
 .../src/tileprovider/tileprovider.h           |   2 +-
 .../src/tileprovider/tileproviderbydate.cpp   |  23 +-
 .../src/tileprovider/tileproviderbyindex.cpp  |  36 +-
 .../src/tileprovider/tileproviderbylevel.cpp  |  23 +-
 modules/imgui/src/guispacetimecomponent.cpp   |   7 +-
 modules/iswa/rendering/dataplane.cpp          |   2 +-
 modules/iswa/rendering/iswacygnet.cpp         |   4 +-
 modules/iswa/util/iswamanager.cpp             |   4 +-
 modules/kameleon/ext/kameleon                 |   2 +-
 modules/kameleon/src/kameleonhelper.cpp       |   2 +-
 modules/kameleon/src/kameleonwrapper.cpp      |   4 +-
 .../rendering/renderablekameleonvolume.cpp    | 154 +++--
 .../rendering/renderablemultiresvolume.cpp    | 115 +---
 modules/server/servermodule.cpp               |  38 +-
 modules/server/servermodule.h                 |   2 +
 modules/server/src/serverinterface.cpp        | 145 ++--
 modules/skybrowser/skybrowsermodule.cpp       |   4 +
 modules/skybrowser/skybrowsermodule.h         |   1 +
 modules/space/horizonsfile.cpp                |   2 +-
 modules/space/kepler.cpp                      |   2 +-
 modules/space/rendering/renderablestars.cpp   |   8 +-
 modules/space/rotation/spicerotation.cpp      |   9 +-
 modules/space/shaders/fluxnodes_vs.glsl       |   4 +-
 modules/space/spacemodule.cpp                 |  16 +-
 modules/space/spacemodule.h                   |   1 +
 .../util/instrumenttimesparser.cpp            |   2 +-
 modules/sync/syncmodule.cpp                   |   4 +
 modules/sync/syncmodule.h                     |   2 +-
 modules/touch/touchmodule.cpp                 |   2 +-
 .../rendering/renderabletoyvolume.cpp         |  75 ++-
 modules/video/src/screenspacevideo.cpp        |   1 -
 modules/video/videomodule.cpp                 |   4 +
 modules/video/videomodule.h                   |   1 +
 modules/volume/rendering/volumeclipplane.cpp  |  36 +-
 modules/webbrowser/src/browserclient.cpp      |   7 +-
 modules/webbrowser/src/screenspacebrowser.cpp |   2 +-
 modules/webbrowser/src/webrenderhandler.cpp   |   7 +-
 modules/webbrowser/webbrowsermodule.cpp       |  82 +--
 modules/webbrowser/webbrowsermodule.h         |   1 +
 modules/webgui/webguimodule.cpp               |   4 +
 modules/webgui/webguimodule.h                 |   2 +
 openspace.cfg                                 |   3 +-
 src/documentation/documentation.cpp           |   7 +-
 src/documentation/verifier.cpp                |  16 +-
 src/engine/configuration.cpp                  |  52 +-
 src/engine/moduleengine.cpp                   |   4 +
 src/engine/openspaceengine.cpp                |   5 +-
 .../tasks/convertrecfileversiontask.cpp       |   1 +
 .../tasks/convertrecformattask.cpp            |   2 +
 src/network/parallelpeer.cpp                  |   2 +-
 src/rendering/transferfunction.cpp            |   2 +-
 src/util/histogram.cpp                        |   6 +-
 src/util/openspacemodule.cpp                  |   4 +
 src/util/touch.cpp                            |   2 +-
 support/cmake/module_documentation.template   |  15 +
 support/cmake/module_path.template            |  19 -
 support/cmake/module_registration.template    |   7 +-
 support/coding/codegen                        |   2 +-
 tests/test_documentation.cpp                  | 627 ++++++------------
 tests/test_spicemanager.cpp                   |   2 +-
 108 files changed, 938 insertions(+), 1189 deletions(-)
 create mode 100644 support/cmake/module_documentation.template
 delete mode 100644 support/cmake/module_path.template

diff --git a/README.md b/README.md
index 2574661f66..51a719488f 100644
--- a/README.md
+++ b/README.md
@@ -42,7 +42,6 @@ This repository contains the source code and example profiles for OpenSpace, but
 Requirements for compiling are:
   - CMake version 3.25 or above
   - C++ compiler supporting C++20/C++23 (Visual Studio 2022 17.11, GCC13, Clang17, AppleClang 15.0.0)
-  - [Boost](http://www.boost.org/)
   - [Qt](http://www.qt.io/download)
 
 
diff --git a/apps/OpenSpace/ext/sgct b/apps/OpenSpace/ext/sgct
index b6171ab0a0..93dfc1caba 160000
--- a/apps/OpenSpace/ext/sgct
+++ b/apps/OpenSpace/ext/sgct
@@ -1 +1 @@
-Subproject commit b6171ab0a0df76a44ad53be41bdfd08ea39e4249
+Subproject commit 93dfc1caba38d300bcc438a3d8a1a4c808b12aef
diff --git a/ext/ghoul b/ext/ghoul
index e26ea6366c..0379738e63 160000
--- a/ext/ghoul
+++ b/ext/ghoul
@@ -1 +1 @@
-Subproject commit e26ea6366ca7e634b88ecf646da5b4adc8168b95
+Subproject commit 0379738e63e13ca2d9671bdf8b9fd399de7ba578
diff --git a/include/openspace/documentation/documentation.h b/include/openspace/documentation/documentation.h
index 738a88cb3e..0989e0697f 100644
--- a/include/openspace/documentation/documentation.h
+++ b/include/openspace/documentation/documentation.h
@@ -39,6 +39,7 @@ namespace openspace::documentation {
 class Verifier;
 
 BooleanType(Optional);
+BooleanType(Private);
 
 /**
  * The TestResult structure returns the information from the #testSpecification method. It
@@ -161,16 +162,20 @@ struct DocumentationEntry {
      *        contains this DocumentationEntry will be matched
      * \param v The Verifier that is used to test the \p k%'s value to determine if it is
      *        a valid value
-     * \param doc The textual documentation that describes the DocumentationEntry in a
-     *        human readable format
      * \param opt Determines whether the Documentation containing this DocumentationEntry
      *        must have a key \p key, or whether it is optional
+     * \param priv Determines whether the DocumentationEntry is considered private. If it
+     *        is, then shall not be reported in a user-facing manner, but its values
+     *        should still be checked when verifying the correctness and completeness of
+     *        an entry
+     * \param doc The textual documentation that describes the DocumentationEntry in a
+     *        human readable format
      *
      * \pre \p k must not be empty
      * \pre \p v must not be nullptr
      */
     DocumentationEntry(std::string k, std::shared_ptr<Verifier> v,
-        Optional opt, std::string doc = "");
+        Optional opt = Optional::No, Private priv = Private::No, std::string doc = "");
 
     /**
      * The constructor for a DocumentationEntry describing a key \p k in a Documentation.
@@ -187,15 +192,20 @@ struct DocumentationEntry {
      * \param v The Verifier that is used to test the \p key%'s value to determine if it
      *        is a valid value. The DocumentationEntry will take ownership of the passed
      *        object
-     * \param doc The textual documentation that describes the DocumentationEntry in a
-     *        human readable format
      * \param opt Determines whether the Documentation containing this DocumentationEntry
      *        must have a key \p key, or whether it is optional
+     * \param priv Determines whether the DocumentationEntry is considered private. If it
+     *        is, then shall not be reported in a user-facing manner, but its values
+     *        should still be checked when verifying the correctness and completeness of
+     *        an entry
+     * \param doc The textual documentation that describes the DocumentationEntry in a
+     *        human readable format
      *
      * \pre \p k must not be empty
      * \pre \p v must not be nullptr
      */
-    DocumentationEntry(std::string k, Verifier* v, Optional opt, std::string doc = "");
+    DocumentationEntry(std::string k, Verifier* v, Optional opt = Optional::No,
+        Private priv = Private::No, std::string doc = "");
 
     /// The key that is described by this DocumentationEntry
     std::string key;
@@ -203,6 +213,8 @@ struct DocumentationEntry {
     std::shared_ptr<Verifier> verifier;
     /// Determines whether the described DocumentationEntry is optional or not
     Optional optional;
+    /// Determines if the entry should be visible to the user
+    Private isPrivate;
     /// The textual description of this DocumentationEntry
     std::string documentation;
 };
diff --git a/include/openspace/documentation/verifier.h b/include/openspace/documentation/verifier.h
index 5fa838f988..8108508459 100644
--- a/include/openspace/documentation/verifier.h
+++ b/include/openspace/documentation/verifier.h
@@ -369,7 +369,13 @@ class Vector2ListVerifier : public TableVerifier {
 public:
     Vector2ListVerifier(std::string elementDocumentation = "")
         : TableVerifier({
-            { "*", new Vector2Verifier<T>, Optional::No, std::move(elementDocumentation) }
+            {
+                "*",
+                new Vector2Verifier<T>,
+                Optional::No,
+                Private::No,
+                std::move(elementDocumentation)
+            }
         })
     {}
 
@@ -387,7 +393,13 @@ class Vector3ListVerifier : public TableVerifier {
 public:
     Vector3ListVerifier(std::string elementDocumentation = "")
         : TableVerifier({
-            { "*", new Vector3Verifier<T>, Optional::No, std::move(elementDocumentation) }
+            {
+                "*",
+                new Vector3Verifier<T>,
+                Optional::No,
+                Private::No,
+                std::move(elementDocumentation)
+            }
         })
     {}
 
@@ -405,7 +417,13 @@ class Vector4ListVerifier : public TableVerifier {
 public:
     Vector4ListVerifier(std::string elementDocumentation = "")
         : TableVerifier({
-            { "*", new Vector4Verifier<T>, Optional::No, std::move(elementDocumentation) }
+            {
+                "*",
+                new Vector4Verifier<T>,
+                Optional::No,
+                Private::No,
+                std::move(elementDocumentation)
+            }
         })
     {}
 
diff --git a/include/openspace/documentation/verifier.inl b/include/openspace/documentation/verifier.inl
index dab3c5d699..ce930ff558 100644
--- a/include/openspace/documentation/verifier.inl
+++ b/include/openspace/documentation/verifier.inl
@@ -422,7 +422,7 @@ NotInListVerifier<T>::NotInListVerifier(std::vector<typename T::Type> vals)
 
 template <typename T>
 TestResult NotInListVerifier<T>::operator()(const ghoul::Dictionary& dict,
-                                         const std::string& key) const
+                                            const std::string& key) const
 {
     TestResult res = T::operator()(dict, key);
     if (res.success) {
@@ -686,9 +686,7 @@ std::string NotInRangeVerifier<T>::documentation() const {
 template <typename T>
 AnnotationVerifier<T>::AnnotationVerifier(std::string a)
     : annotation(std::move(a))
-{
-
-}
+{}
 
 template <typename T>
 std::string AnnotationVerifier<T>::documentation() const {
diff --git a/include/openspace/engine/configuration.h b/include/openspace/engine/configuration.h
index 537872502e..e592a907e6 100644
--- a/include/openspace/engine/configuration.h
+++ b/include/openspace/engine/configuration.h
@@ -156,7 +156,7 @@ struct Configuration {
     // Values not read from the openspace.cfg file
     std::string sgctConfigNameInitialized;
 
-    static documentation::Documentation Documentation;
+    static documentation::Documentation Documentation();
     ghoul::lua::LuaState state;
 };
 
diff --git a/include/openspace/engine/moduleengine.h b/include/openspace/engine/moduleengine.h
index 0a4bee8110..ac59c614c3 100644
--- a/include/openspace/engine/moduleengine.h
+++ b/include/openspace/engine/moduleengine.h
@@ -39,6 +39,7 @@ namespace openspace {
 
 class OpenSpaceModule;
 
+namespace documentation { struct Documentation; }
 namespace scripting { struct LuaLibrary; }
 
 /**
@@ -122,6 +123,11 @@ public:
      */
     static scripting::LuaLibrary luaLibrary();
 
+    /**
+     * Returns the list of all documentations for all modules.
+     */
+    std::vector<documentation::Documentation> moduleDocumentations() const;
+
 private:
     /// The list of all names of all registered OpenSpaceModules
     properties::StringListProperty _allModules;
diff --git a/include/openspace/scripting/scriptengine.h b/include/openspace/scripting/scriptengine.h
index 9b721617bf..fd518684c1 100644
--- a/include/openspace/scripting/scriptengine.h
+++ b/include/openspace/scripting/scriptengine.h
@@ -76,7 +76,7 @@ public:
 
         /// A callback that will be called when the script finishes executing and that
         /// provides access to the return value of the script
-        Callback callback;
+        Callback callback = Callback();
     };
 
     static constexpr std::string_view OpenSpaceLibraryName = "openspace";
diff --git a/include/openspace/util/openspacemodule.h b/include/openspace/util/openspacemodule.h
index c519481073..0a110a0ce3 100644
--- a/include/openspace/util/openspacemodule.h
+++ b/include/openspace/util/openspacemodule.h
@@ -92,6 +92,12 @@ public:
      */
     virtual std::vector<documentation::Documentation> documentations() const;
 
+    /**
+     * Returns the documentation that describes the parameters that can be passed to the
+     * initialize function of this module.
+     */
+    static documentation::Documentation Documentation();
+
     /**
      * Returns the Lua library with functions defined by this OpenSpaceModule. The default
      * implementation returns an empty library.
diff --git a/modules/CMakeLists.txt b/modules/CMakeLists.txt
index 0450d19af1..c9c9ee2ad3 100644
--- a/modules/CMakeLists.txt
+++ b/modules/CMakeLists.txt
@@ -320,6 +320,7 @@ list(REMOVE_DUPLICATES topologically_sorted)
 
 set(MODULE_HEADERS "")
 set(MODULE_CLASSES "")
+set(MODULE_DOCUMENTATION "")
 
 foreach (key RANGE ${enabled_module_count})
   list(GET topologically_sorted ${key} name)
@@ -335,6 +336,7 @@ foreach (key RANGE ${enabled_module_count})
 
   list(APPEND MODULE_HEADERS "#include <${header_filepath}>\n")
   list(APPEND MODULE_CLASSES "        new ${class_name},\n")
+  list(APPEND MODULE_DOCUMENTATION "        ${class_name}::Documentation(),\n")
 endforeach ()
 
 get_unique_include_paths(
@@ -359,6 +361,10 @@ if (NOT "${MODULE_CLASSES}" STREQUAL "")
   string(REPLACE ";" "" MODULE_CLASSES ${MODULE_CLASSES})
 endif ()
 
+if (NOT "${MODULE_DOCUMENTATION}" STREQUAL "")
+  string(REPLACE ";" "" MODULE_DOCUMENTATION ${MODULE_DOCUMENTATION})
+endif ()
+
 configure_file(
   ${PROJECT_SOURCE_DIR}/support/cmake/module_registration.template
   ${CMAKE_BINARY_DIR}/_generated/include/openspace/moduleregistration.h
diff --git a/modules/audio/audiomodule.cpp b/modules/audio/audiomodule.cpp
index 6a5cb8e7d5..26f3b97030 100644
--- a/modules/audio/audiomodule.cpp
+++ b/modules/audio/audiomodule.cpp
@@ -47,6 +47,10 @@ namespace {
 
 namespace openspace {
 
+documentation::Documentation AudioModule::Documentation() {
+    return codegen::doc<Parameters>("module_audio");
+}
+
 AudioModule::AudioModule()
     : OpenSpaceModule(Name)
     , _engine(std::make_unique<SoLoud::Soloud>())
diff --git a/modules/audio/audiomodule.h b/modules/audio/audiomodule.h
index 943abfe08e..752f40bb93 100644
--- a/modules/audio/audiomodule.h
+++ b/modules/audio/audiomodule.h
@@ -287,6 +287,8 @@ public:
      */
     glm::vec3 speakerPosition(int channel) const;
 
+    static documentation::Documentation Documentation();
+
 private:
     struct Info {
         std::unique_ptr<SoLoud::Wav> sound;
diff --git a/modules/base/rendering/grids/renderableboxgrid.cpp b/modules/base/rendering/grids/renderableboxgrid.cpp
index 9a9b97e75b..0a6a3956aa 100644
--- a/modules/base/rendering/grids/renderableboxgrid.cpp
+++ b/modules/base/rendering/grids/renderableboxgrid.cpp
@@ -163,7 +163,7 @@ void RenderableBoxGrid::deinitializeGL() {
     _gridProgram = nullptr;
 }
 
-void RenderableBoxGrid::render(const RenderData& data, RendererTasks&){
+void RenderableBoxGrid::render(const RenderData& data, RendererTasks&) {
     _gridProgram->activate();
 
     auto [modelTransform, modelViewTransform, modelViewProjectionTransform] =
diff --git a/modules/base/rendering/grids/renderablegrid.cpp b/modules/base/rendering/grids/renderablegrid.cpp
index 2353ef282c..dd76443cdf 100644
--- a/modules/base/rendering/grids/renderablegrid.cpp
+++ b/modules/base/rendering/grids/renderablegrid.cpp
@@ -237,7 +237,7 @@ void RenderableGrid::deinitializeGL() {
     _gridProgram = nullptr;
 }
 
-void RenderableGrid::render(const RenderData& data, RendererTasks&){
+void RenderableGrid::render(const RenderData& data, RendererTasks&) {
     _gridProgram->activate();
 
     const glm::dmat4 modelTransform = calcModelTransform(data);
diff --git a/modules/base/rendering/grids/renderablesphericalgrid.cpp b/modules/base/rendering/grids/renderablesphericalgrid.cpp
index fe7f00379e..e18afe6285 100644
--- a/modules/base/rendering/grids/renderablesphericalgrid.cpp
+++ b/modules/base/rendering/grids/renderablesphericalgrid.cpp
@@ -179,7 +179,7 @@ void RenderableSphericalGrid::deinitializeGL() {
     _gridProgram = nullptr;
 }
 
-void RenderableSphericalGrid::render(const RenderData& data, RendererTasks&){
+void RenderableSphericalGrid::render(const RenderData& data, RendererTasks&) {
     _gridProgram->activate();
 
     auto [modelTransform, modelViewTransform, modelViewProjectionTransform] =
diff --git a/modules/base/rendering/renderablecartesianaxes.cpp b/modules/base/rendering/renderablecartesianaxes.cpp
index 3f57ea0b1a..42ff5a1d3d 100644
--- a/modules/base/rendering/renderablecartesianaxes.cpp
+++ b/modules/base/rendering/renderablecartesianaxes.cpp
@@ -184,7 +184,7 @@ void RenderableCartesianAxes::deinitializeGL() {
     _program = nullptr;
 }
 
-void RenderableCartesianAxes::render(const RenderData& data, RendererTasks&){
+void RenderableCartesianAxes::render(const RenderData& data, RendererTasks&) {
     _program->activate();
 
     const glm::dmat4 modelViewTransform = calcModelViewTransform(data);
diff --git a/modules/base/rendering/renderableplanetimevaryingimage.cpp b/modules/base/rendering/renderableplanetimevaryingimage.cpp
index 1d47dadc87..63de039e02 100644
--- a/modules/base/rendering/renderableplanetimevaryingimage.cpp
+++ b/modules/base/rendering/renderableplanetimevaryingimage.cpp
@@ -44,14 +44,18 @@ namespace {
     constexpr openspace::properties::Property::PropertyInfo SourceFolderInfo = {
         "SourceFolder",
         "Source Folder",
-       "An image directory that is loaded from disk and contains the textures to use "
-       "for this plane.",
+        "An image directory that is loaded from disk and contains the textures to use "
+        "for this plane.",
        openspace::properties::Property::Visibility::AdvancedUser
     };
 
     struct [[codegen::Dictionary(RenderablePlaneTimeVaryingImage)]] Parameters {
         // [[codegen::verbatim(SourceFolderInfo.description)]]
         std::string sourceFolder;
+
+        // If set to `true` the images are only loaded when it is about to be shown
+        // instead of preloading them
+        std::optional<bool> lazyLoading;
     };
 #include "renderableplanetimevaryingimage_codegen.cpp"
 } // namespace
@@ -83,20 +87,17 @@ RenderablePlaneTimeVaryingImage::RenderablePlaneTimeVaryingImage(
     addProperty(_sourceFolder);
     _sourceFolder.onChange([this]() { _texture = loadTexture(); });
 
-    if (dictionary.hasKey(KeyLazyLoading)) {
-        _isLoadingLazily = dictionary.value<bool>(KeyLazyLoading);
-
-        if (_isLoadingLazily) {
-            _enabled.onChange([this]() {
-                if (_enabled) {
-                    _textureIsDirty = true;
-                }
-                else {
-                    BaseModule::TextureManager.release(_texture);
-                    _texture = nullptr;
-                }
-            });
-        }
+    _isLoadingLazily = p.lazyLoading.value_or(_isLoadingLazily);
+    if (_isLoadingLazily) {
+        _enabled.onChange([this]() {
+            if (_enabled) {
+                _textureIsDirty = true;
+            }
+            else {
+                BaseModule::TextureManager.release(_texture);
+                _texture = nullptr;
+            }
+        });
     }
 }
 
diff --git a/modules/base/rendering/renderabletrail.cpp b/modules/base/rendering/renderabletrail.cpp
index 9cf7518ecd..5b073c2d75 100644
--- a/modules/base/rendering/renderabletrail.cpp
+++ b/modules/base/rendering/renderabletrail.cpp
@@ -219,9 +219,7 @@ RenderableTrail::RenderableTrail(const ghoul::Dictionary& dictionary)
     setRenderBin(RenderBin::Overlay);
     addProperty(Fadeable::_opacity);
 
-    _translation = Translation::createFromDictionary(
-        dictionary.value<ghoul::Dictionary>("Translation")
-    );
+    _translation = Translation::createFromDictionary(p.translation);
     addPropertySubOwner(_translation.get());
 
     _appearance.lineColor = p.color;
diff --git a/modules/base/rendering/screenspacedashboard.cpp b/modules/base/rendering/screenspacedashboard.cpp
index 736e8555be..c76b17a9e5 100644
--- a/modules/base/rendering/screenspacedashboard.cpp
+++ b/modules/base/rendering/screenspacedashboard.cpp
@@ -46,6 +46,8 @@ namespace {
     };
 
     struct [[codegen::Dictionary(ScreenSpaceDashboard)]] Parameters {
+        std::optional<std::string> identifier;
+
         // [[codegen::verbatim(UseMainInfo.description)]]
         std::optional<bool> useMainDashboard;
 
@@ -72,15 +74,8 @@ ScreenSpaceDashboard::ScreenSpaceDashboard(const ghoul::Dictionary& dictionary)
 {
     const Parameters p = codegen::bake<Parameters>(dictionary);
 
-    std::string identifier;
-    if (dictionary.hasValue<std::string>(KeyIdentifier)) {
-        identifier = dictionary.value<std::string>(KeyIdentifier);
-    }
-    else {
-        identifier = "ScreenSpaceDashboard";
-    }
-    identifier = makeUniqueIdentifier(identifier);
-    setIdentifier(std::move(identifier));
+    std::string identifier = p.identifier.value_or("ScreenSpaceDashboard");
+    setIdentifier(makeUniqueIdentifier(std::move(identifier)));
 
     _useMainDashboard = p.useMainDashboard.value_or(_useMainDashboard);
     addProperty(_useMainDashboard);
diff --git a/modules/base/rendering/screenspaceimagelocal.cpp b/modules/base/rendering/screenspaceimagelocal.cpp
index 984433c90d..696966bbcf 100644
--- a/modules/base/rendering/screenspaceimagelocal.cpp
+++ b/modules/base/rendering/screenspaceimagelocal.cpp
@@ -52,6 +52,8 @@ namespace {
     // To load an image from a web URL, see
     // [ScreenSpaceImageOnline](#base_screenspace_image_online).
     struct [[codegen::Dictionary(ScreenSpaceImageLocal)]] Parameters {
+        std::optional<std::string> identifier;
+
         // [[codegen::verbatim(TexturePathInfo.description)]]
         std::optional<std::string> texturePath;
     };
@@ -70,15 +72,8 @@ ScreenSpaceImageLocal::ScreenSpaceImageLocal(const ghoul::Dictionary& dictionary
 {
     const Parameters p = codegen::bake<Parameters>(dictionary);
 
-    std::string identifier;
-    if (dictionary.hasValue<std::string>(KeyIdentifier)) {
-        identifier = dictionary.value<std::string>(KeyIdentifier);
-    }
-    else {
-        identifier = "ScreenSpaceImageLocal";
-    }
-    identifier = makeUniqueIdentifier(identifier);
-    setIdentifier(identifier);
+    std::string identifier = p.identifier.value_or("ScreenSpaceImageLocal");
+    setIdentifier(makeUniqueIdentifier(std::move(identifier)));
 
     _texturePath.onChange([this]() {
         if (!std::filesystem::is_regular_file(absPath(_texturePath))) {
diff --git a/modules/base/rendering/screenspaceimageonline.cpp b/modules/base/rendering/screenspaceimageonline.cpp
index 1c66b733e1..48c68e4414 100644
--- a/modules/base/rendering/screenspaceimageonline.cpp
+++ b/modules/base/rendering/screenspaceimageonline.cpp
@@ -52,6 +52,8 @@ namespace {
     // To load an image from a local file on disk, see
     // [`ScreenSpaceImageLocal`](#base_screenspace_image_local).
     struct [[codegen::Dictionary(ScreenSpaceImageOnline)]] Parameters {
+        std::optional<std::string> identifier;
+
         // [[codegen::verbatim(TextureInfo.description)]]
         std::optional<std::string> url [[codegen::key("URL")]];
     };
@@ -71,15 +73,8 @@ ScreenSpaceImageOnline::ScreenSpaceImageOnline(const ghoul::Dictionary& dictiona
 {
     const Parameters p = codegen::bake<Parameters>(dictionary);
 
-    std::string identifier;
-    if (dictionary.hasValue<std::string>(KeyIdentifier)) {
-        identifier = dictionary.value<std::string>(KeyIdentifier);
-    }
-    else {
-        identifier = "ScreenSpaceImageOnline";
-    }
-    identifier = makeUniqueIdentifier(identifier);
-    setIdentifier(std::move(identifier));
+    std::string identifier = p.identifier.value_or("ScreenSpaceImageOnline");
+    setIdentifier(makeUniqueIdentifier(std::move(identifier)));
 
     _texturePath.onChange([this]() { _textureIsDirty = true; });
     _texturePath = p.url.value_or(_texturePath);
diff --git a/modules/cefwebgui/cefwebguimodule.cpp b/modules/cefwebgui/cefwebguimodule.cpp
index e809d47350..08d88dfc31 100644
--- a/modules/cefwebgui/cefwebguimodule.cpp
+++ b/modules/cefwebgui/cefwebguimodule.cpp
@@ -28,6 +28,7 @@
 #include <modules/cefwebgui/include/guirenderhandler.h>
 #include <modules/cefwebgui/include/guikeyboardhandler.h>
 #include <modules/webbrowser/include/browserinstance.h>
+#include <openspace/documentation/documentation.h>
 #include <openspace/engine/globals.h>
 #include <openspace/engine/globalscallbacks.h>
 #include <openspace/engine/moduleengine.h>
@@ -72,10 +73,27 @@ namespace {
         "GUI scale multiplier.",
         openspace::properties::Property::Visibility::Always
     };
+
+    struct [[codegen::Dictionary(CefWebGuiModule)]] Parameters {
+        // [[codegen::verbatim(GuiScaleInfo.description)]]
+        std::optional<float> guiScale;
+
+        // [[codegen::verbatim(EnabledInfo.description)]]
+        std::optional<bool> enabled;
+
+        // [[codegen::verbatim(VisibleInfo.description)]]
+        std::optional<bool> visible;
+
+    };
+#include "cefwebguimodule_codegen.cpp"
 } // namespace
 
 namespace openspace {
 
+documentation::Documentation CefWebGuiModule::Documentation() {
+    return codegen::doc<Parameters>("module_cefwebgui");
+}
+
 CefWebGuiModule::CefWebGuiModule()
     : OpenSpaceModule(CefWebGuiModule::Name)
     , _enabled(EnabledInfo, true)
@@ -200,17 +218,10 @@ void CefWebGuiModule::internalInitialize(const ghoul::Dictionary& configuration)
         }
     );
 
-    if (configuration.hasValue<double>(GuiScaleInfo.identifier)) {
-        _guiScale = static_cast<float>(
-            configuration.value<double>(GuiScaleInfo.identifier)
-        );
-    }
-
-    _enabled = configuration.hasValue<bool>(EnabledInfo.identifier) &&
-               configuration.value<bool>(EnabledInfo.identifier);
-
-    _visible = configuration.hasValue<bool>(VisibleInfo.identifier) &&
-               configuration.value<bool>(VisibleInfo.identifier);
+    const Parameters p = codegen::bake<Parameters>(configuration);
+    _guiScale = p.guiScale.value_or(_guiScale);
+    _enabled = p.enabled.value_or(_enabled);
+    _visible = p.visible.value_or(_visible);
 
     global::callback::initializeGL->emplace_back([this]() {
         startOrStopGui();
@@ -218,7 +229,7 @@ void CefWebGuiModule::internalInitialize(const ghoul::Dictionary& configuration)
 
     global::callback::postDraw->emplace_back([this]() {
         bool windowChanged = global::windowDelegate->windowHasResized(); 
-        if (_instance && (windowChanged || _instance->_shouldReshape)){
+        if (_instance && (windowChanged || _instance->_shouldReshape)) {
             const glm::ivec2 res = global::windowDelegate->guiWindowResolution();
             _instance->reshape(static_cast<glm::ivec2>(
                 glm::vec2(res) * global::windowDelegate->dpiScaling()
diff --git a/modules/cefwebgui/cefwebguimodule.h b/modules/cefwebgui/cefwebguimodule.h
index f2855ab2b6..0b3c18ac5a 100644
--- a/modules/cefwebgui/cefwebguimodule.h
+++ b/modules/cefwebgui/cefwebguimodule.h
@@ -46,6 +46,8 @@ public:
 
     void internalInitialize(const ghoul::Dictionary& configuration) override;
 
+    static documentation::Documentation Documentation();
+
 private:
     void startOrStopGui();
 
diff --git a/modules/debugging/rendering/debugshader_fs.glsl b/modules/debugging/rendering/debugshader_fs.glsl
index a8c3532d3e..75b69e40f7 100644
--- a/modules/debugging/rendering/debugshader_fs.glsl
+++ b/modules/debugging/rendering/debugshader_fs.glsl
@@ -30,7 +30,7 @@ in vec4 fs_vertexPosition;
 
 uniform vec4 color;
 
-Fragment getFragment(){
+Fragment getFragment() {
     Fragment frag;
     frag.color = color;
     frag.depth = fs_vertexPosition.w;
diff --git a/modules/debugging/rendering/debugshader_vs.glsl b/modules/debugging/rendering/debugshader_vs.glsl
index decfa49b9d..1e1475f97e 100644
--- a/modules/debugging/rendering/debugshader_vs.glsl
+++ b/modules/debugging/rendering/debugshader_vs.glsl
@@ -30,7 +30,7 @@ layout(location = 0) in vec4 vertexPositionClippingSpace;
 
 out vec4 fs_vertexPosition;
 
-void main(){
+void main() {
     fs_vertexPosition = z_normalization(vertexPositionClippingSpace);
     gl_Position = fs_vertexPosition;
 }
diff --git a/modules/exoplanets/exoplanetsmodule.cpp b/modules/exoplanets/exoplanetsmodule.cpp
index 5884d7426c..f27abf7ccc 100644
--- a/modules/exoplanets/exoplanetsmodule.cpp
+++ b/modules/exoplanets/exoplanetsmodule.cpp
@@ -225,6 +225,10 @@ namespace openspace {
 
 using namespace exoplanets;
 
+documentation::Documentation ExoplanetsModule::Documentation() {
+    return codegen::doc<Parameters>("module_exoplanets");
+}
+
 ExoplanetsModule::ExoplanetsModule()
     : OpenSpaceModule(Name)
     , _enabled(EnabledInfo)
diff --git a/modules/exoplanets/exoplanetsmodule.h b/modules/exoplanets/exoplanetsmodule.h
index 10de1c5f77..742df53ac6 100644
--- a/modules/exoplanets/exoplanetsmodule.h
+++ b/modules/exoplanets/exoplanetsmodule.h
@@ -63,6 +63,7 @@ public:
 
     scripting::LuaLibrary luaLibrary() const override;
     std::vector<documentation::Documentation> documentations() const override;
+    static documentation::Documentation Documentation();
 
 protected:
     void internalInitialize(const ghoul::Dictionary& dict) override;
diff --git a/modules/fitsfilereader/src/fitsfilereader.cpp b/modules/fitsfilereader/src/fitsfilereader.cpp
index 83a66404a1..7a501e93ed 100644
--- a/modules/fitsfilereader/src/fitsfilereader.cpp
+++ b/modules/fitsfilereader/src/fitsfilereader.cpp
@@ -81,7 +81,7 @@ std::shared_ptr<ImageData<T>> FitsFileReader::readImage(const std::filesystem::p
         }
         // Extension HDU Object
         return readImageInternal<T>(_infile->currentExtension());
-    } catch (const FitsException& e){
+    } catch (const FitsException& e) {
         LERROR("Could not read FITS image from table. " + e.message());
     }
 
diff --git a/modules/gaia/rendering/renderablegaiastars.cpp b/modules/gaia/rendering/renderablegaiastars.cpp
index ecb71c2a30..787e415e8f 100644
--- a/modules/gaia/rendering/renderablegaiastars.cpp
+++ b/modules/gaia/rendering/renderablegaiastars.cpp
@@ -406,7 +406,7 @@ namespace {
         std::optional<int> lastRow;
 
         // [codegen::verbatim(ColumnNamesInfo.description)]]
-        std::optional<std::vector<std::string>> columnNames;
+        std::optional<ghoul::Dictionary> columnNames;
 
         // [codegen::verbatim(LodPixelThresholdInfo.description)]]
         std::optional<float> lodPixelThreshold;
@@ -636,9 +636,7 @@ RenderableGaiaStars::RenderableGaiaStars(const ghoul::Dictionary& dictionary)
         addProperty(_lastRow);
 
         if (p.columnNames.has_value()) {
-            const ghoul::Dictionary tmpDict = dictionary.value<ghoul::Dictionary>(
-                ColumnNamesInfo.identifier
-            );
+            const ghoul::Dictionary tmpDict = *p.columnNames;
 
             // Ugly fix for ASCII sorting when there are more columns read than 10.
             std::set<int> intKeys;
diff --git a/modules/gaia/shaders/gaia_ssbo_vs.glsl b/modules/gaia/shaders/gaia_ssbo_vs.glsl
index faa139202d..31452e772d 100644
--- a/modules/gaia/shaders/gaia_ssbo_vs.glsl
+++ b/modules/gaia/shaders/gaia_ssbo_vs.glsl
@@ -176,7 +176,7 @@ void main() {
 
   // Remove stars without position, happens when VBO chunk is stuffed with zeros.
   // Has to be done in Geometry shader because Vertices cannot be discarded here.
-  if (length(in_position) > EPS){
+  if (length(in_position) > EPS) {
     vs_gPosition = vec4(model * objectPosition);
     gl_Position = vec4(projection * viewPosition);
   }
diff --git a/modules/gaia/tasks/readfitstask.cpp b/modules/gaia/tasks/readfitstask.cpp
index a334b62ba5..3373319766 100644
--- a/modules/gaia/tasks/readfitstask.cpp
+++ b/modules/gaia/tasks/readfitstask.cpp
@@ -72,7 +72,7 @@ namespace {
         // A list of strings with the names of all the additional columns that are to be
         // read from the specified FITS file(s). These columns can be used for filtering
         // while constructing Octree later
-        std::optional<std::vector<std::string>> filterColumnNames;
+        std::optional<ghoul::Dictionary> filterColumnNames;
     };
 #include "readfitstask_codegen.cpp"
 } // namespace
@@ -90,8 +90,7 @@ ReadFitsTask::ReadFitsTask(const ghoul::Dictionary& dictionary) {
     _lastRow = p.lastRow.value_or(_lastRow);
 
     if (p.filterColumnNames.has_value()) {
-        const ghoul::Dictionary d =
-            dictionary.value<ghoul::Dictionary>(KeyFilterColumnNames);
+        const ghoul::Dictionary d = *p.filterColumnNames;
 
         // Ugly fix for ASCII sorting when there are more columns read than 10.
         std::set<int> intKeys;
diff --git a/modules/galaxy/tasks/milkywayconversiontask.cpp b/modules/galaxy/tasks/milkywayconversiontask.cpp
index b199db45be..707db73a0f 100644
--- a/modules/galaxy/tasks/milkywayconversiontask.cpp
+++ b/modules/galaxy/tasks/milkywayconversiontask.cpp
@@ -31,35 +31,31 @@
 #include <ghoul/misc/dictionary.h>
 
 namespace {
-    constexpr std::string_view KeyInFilenamePrefix = "InFilenamePrefix";
-    constexpr std::string_view KeyInFilenameSuffix = "InFilenameSuffix";
-    constexpr std::string_view KeyInFirstIndex = "InFirstIndex";
-    constexpr std::string_view KeyInNSlices = "InNSlices";
-    constexpr std::string_view KeyOutFilename = "OutFilename";
-    constexpr std::string_view KeyOutDimensions = "OutDimensions";
+    struct [[codegen::Dictionary(MilkywayConversionTask)]] Parameters {
+        std::string inFilenamePrefix;
+        std::string inFilenameSuffix;
+        int inFirstIndex;
+        int inNSlices;
+        std::string outFilename;
+        glm::ivec3 outDimensions;
+    };
+#include "milkywayconversiontask_codegen.cpp"
 } // namespace
 
 namespace openspace {
+    
+documentation::Documentation MilkywayConversionTask::Documentation() {
+    return codegen::doc<Parameters>("galaxy_milkywayconversiontask");
+}
 
 MilkywayConversionTask::MilkywayConversionTask(const ghoul::Dictionary& dictionary) {
-    if (dictionary.hasKey(KeyInFilenamePrefix)) {
-        _inFilenamePrefix = dictionary.value<std::string>(KeyInFilenamePrefix);
-    }
-    if (dictionary.hasKey(KeyInFilenameSuffix)) {
-        _inFilenameSuffix = dictionary.value<std::string>(KeyInFilenameSuffix);
-    }
-    if (dictionary.hasKey(KeyInFirstIndex)) {
-        _inFirstIndex = static_cast<size_t>(dictionary.value<int>(KeyInFirstIndex));
-    }
-    if (dictionary.hasKey(KeyInNSlices)) {
-        _inNSlices = static_cast<size_t>(dictionary.value<int>(KeyInNSlices));
-    }
-    if (dictionary.hasKey(KeyOutFilename)) {
-        _outFilename = dictionary.value<std::string>(KeyOutFilename);
-    }
-    if (dictionary.hasKey(KeyOutDimensions)) {
-        _outDimensions = dictionary.value<glm::ivec3>(KeyOutDimensions);
-    }
+    const Parameters p = codegen::bake<Parameters>(dictionary);
+    _inFilenamePrefix = p.inFilenamePrefix;
+    _inFilenameSuffix = p.inFilenameSuffix;
+    _inFirstIndex = p.inFirstIndex;
+    _inNSlices = p.inNSlices;
+    _outFilename = p.outFilename;
+    _outDimensions = p.outDimensions;
 }
 
 std::string MilkywayConversionTask::description() {
@@ -99,11 +95,4 @@ void MilkywayConversionTask::perform(const Task::ProgressCallback& onProgress) {
     rawWriter.write(sampleFunction, onProgress);
 }
 
-documentation::Documentation MilkywayConversionTask::Documentation() {
-    return {
-        "MilkywayConversionTask",
-        "galaxy_milkywayconversiontask"
-    };
-}
-
 } // namespace openspace
diff --git a/modules/globebrowsing/globebrowsingmodule.cpp b/modules/globebrowsing/globebrowsingmodule.cpp
index 6a9eafccb9..bfcb5fea0e 100644
--- a/modules/globebrowsing/globebrowsingmodule.cpp
+++ b/modules/globebrowsing/globebrowsingmodule.cpp
@@ -197,6 +197,10 @@ namespace {
 
 namespace openspace {
 
+documentation::Documentation GlobeBrowsingModule::Documentation() {
+    return codegen::doc<Parameters>("module_globebrowsing");
+}
+
 GlobeBrowsingModule::GlobeBrowsingModule()
     : OpenSpaceModule(Name)
     , _tileCacheSizeMB(TileCacheSizeInfo, 1024)
@@ -330,7 +334,6 @@ std::vector<documentation::Documentation> GlobeBrowsingModule::documentations()
     return {
         globebrowsing::Layer::Documentation(),
         globebrowsing::LayerAdjustment::Documentation(),
-        globebrowsing::LayerManager::Documentation(),
         globebrowsing::GlobeTranslation::Documentation(),
         globebrowsing::GlobeRotation::Documentation(),
         globebrowsing::RenderableGlobe::Documentation(),
@@ -343,7 +346,6 @@ std::vector<documentation::Documentation> GlobeBrowsingModule::documentations()
         globebrowsing::TileProviderByDate::Documentation(),
         globebrowsing::TileProviderByIndex::Documentation(),
         globebrowsing::TileProviderByLevel::Documentation(),
-        globebrowsing::GeoJsonManager::Documentation(),
         globebrowsing::GeoJsonComponent::Documentation(),
         globebrowsing::GeoJsonProperties::Documentation(),
         GlobeLabelsComponent::Documentation(),
diff --git a/modules/globebrowsing/globebrowsingmodule.h b/modules/globebrowsing/globebrowsingmodule.h
index c6d6cf279d..691fb794f8 100644
--- a/modules/globebrowsing/globebrowsingmodule.h
+++ b/modules/globebrowsing/globebrowsingmodule.h
@@ -71,6 +71,7 @@ public:
     globebrowsing::cache::MemoryAwareTileCache* tileCache();
     scripting::LuaLibrary luaLibrary() const override;
     std::vector<documentation::Documentation> documentations() const override;
+    static documentation::Documentation Documentation();
 
     const globebrowsing::RenderableGlobe* castFocusNodeRenderableToGlobe();
 
diff --git a/modules/globebrowsing/src/geojson/geojsoncomponent.cpp b/modules/globebrowsing/src/geojson/geojsoncomponent.cpp
index d9b0dc972b..4c4e282a0b 100644
--- a/modules/globebrowsing/src/geojson/geojsoncomponent.cpp
+++ b/modules/globebrowsing/src/geojson/geojsoncomponent.cpp
@@ -363,7 +363,7 @@ GeoJsonComponent::GeoJsonComponent(const ghoul::Dictionary& dictionary,
 
     _defaultProperties.pointTexture.onChange([this]() {
         const std::filesystem::path texturePath = _defaultProperties.pointTexture.value();
-        // Not ethat an empty texture is also valid => use default texture from module
+        // Note that an empty texture is also valid => use default texture from module
         if (std::filesystem::is_regular_file(texturePath) || texturePath.empty()) {
             _textureIsDirty = true;
         }
@@ -378,9 +378,7 @@ GeoJsonComponent::GeoJsonComponent(const ghoul::Dictionary& dictionary,
     _defaultProperties.tessellation.enabled.onChange([this]() { _dataIsDirty = true; });
     _defaultProperties.tessellation.useLevel.onChange([this]() { _dataIsDirty = true; });
     _defaultProperties.tessellation.level.onChange([this]() { _dataIsDirty = true; });
-    _defaultProperties.tessellation.distance.onChange([this]() {
-        _dataIsDirty = true;
-    });
+    _defaultProperties.tessellation.distance.onChange([this]() { _dataIsDirty = true; });
 
     _forceUpdateHeightData.onChange([this]() {
         for (GlobeGeometryFeature& f : _geometryFeatures) {
diff --git a/modules/globebrowsing/src/geojson/geojsonmanager.cpp b/modules/globebrowsing/src/geojson/geojsonmanager.cpp
index c0a4c61f2a..3e15c35d6e 100644
--- a/modules/globebrowsing/src/geojson/geojsonmanager.cpp
+++ b/modules/globebrowsing/src/geojson/geojsonmanager.cpp
@@ -36,17 +36,6 @@ namespace {
 
 namespace openspace::globebrowsing {
 
-documentation::Documentation GeoJsonManager::Documentation() {
-    using namespace documentation;
-    return {
-        "GeoJsonManager",
-        "globebrowsing_geojsonmanager",
-        "",
-        {}
-    };
-}
-
-// TODO: Gui name and description
 GeoJsonManager::GeoJsonManager() : properties::PropertyOwner({ "GeoJson" }) {}
 
 void GeoJsonManager::initialize(RenderableGlobe* globe) {
@@ -75,13 +64,6 @@ void GeoJsonManager::addGeoJsonLayer(const ghoul::Dictionary& layerDict) {
     ZoneScoped;
 
     try {
-        // Parse dictionary
-        documentation::testSpecificationAndThrow(
-            GeoJsonComponent::Documentation(),
-            layerDict,
-            "GeoJsonComponent"
-        );
-
         const std::string identifier = layerDict.value<std::string>("Identifier");
         if (hasPropertySubOwner(identifier)) {
             LERROR("GeoJson layer with identifier '" + identifier + "' already exists");
diff --git a/modules/globebrowsing/src/geojson/geojsonmanager.h b/modules/globebrowsing/src/geojson/geojsonmanager.h
index 84109b4361..5798161fcc 100644
--- a/modules/globebrowsing/src/geojson/geojsonmanager.h
+++ b/modules/globebrowsing/src/geojson/geojsonmanager.h
@@ -54,16 +54,11 @@ public:
     bool isReady() const;
 
     void addGeoJsonLayer(const ghoul::Dictionary& layerDict);
-    //void addGeoJsonLayer(const std::string& filePath); // TODO: just add from file
     void deleteLayer(const std::string& layerIdentifier);
 
     void update();
     void render(const RenderData& data);
 
-    //void onChange(std::function<void(Layer* l)> callback);
-
-    static documentation::Documentation Documentation();
-
 private:
     std::vector<std::unique_ptr<GeoJsonComponent>> _geoJsonObjects;
     RenderableGlobe* _parentGlobe = nullptr;
diff --git a/modules/globebrowsing/src/layer.cpp b/modules/globebrowsing/src/layer.cpp
index 91f263208e..9366eaca4f 100644
--- a/modules/globebrowsing/src/layer.cpp
+++ b/modules/globebrowsing/src/layer.cpp
@@ -44,7 +44,6 @@ namespace {
     constexpr std::string_view KeyName = "Name";
     constexpr std::string_view KeyDesc = "Description";
     constexpr std::string_view KeyLayerGroupID = "LayerGroupID";
-    constexpr std::string_view KeyAdjustment = "Adjustment";
 
     constexpr openspace::properties::Property::PropertyInfo TypeInfo = {
         "Type",
@@ -158,25 +157,9 @@ namespace {
         // Specifies the render settings that should be applied to this layer
         std::optional<Settings> settings;
 
-        struct LayerAdjustment {
-            enum class Type {
-                None,
-                ChromaKey,
-                TransferFunction
-            };
-
-            // Specifies the type of the adjustment that is applied
-            std::optional<Type> type;
-
-            // Specifies the chroma key used when selecting 'ChromaKey' for the 'Type'
-            std::optional<glm::dvec3> chromaKeyColor;
-
-            // Specifies the tolerance to match the color to the chroma key when the
-            // 'ChromaKey' type is selected for the 'Type'
-            std::optional<double> chromaKeyTolerance;
-        };
         // Parameters that set individual adjustment parameters for this layer
-        std::optional<LayerAdjustment> adjustment;
+        std::optional<ghoul::Dictionary> adjustment
+            [[codegen::reference("globebrowsing_layeradjustment")]];
 
         enum class BlendMode {
             Normal,
@@ -211,7 +194,6 @@ Layer::Layer(layers::Group::ID id, const ghoul::Dictionary& layerDict, LayerGrou
     , _guiDescription(GuiDescriptionInfo)
     , _solidColor(ColorInfo, glm::vec3(1.f), glm::vec3(0.f), glm::vec3(1.f))
     , _layerGroupId(id)
-
 {
     const Parameters p = codegen::bake<Parameters>(layerDict);
 
@@ -265,10 +247,8 @@ Layer::Layer(layers::Group::ID id, const ghoul::Dictionary& layerDict, LayerGrou
             p.settings->multiplier.value_or(_renderSettings.multiplier);
         _renderSettings.offset = p.settings->offset.value_or(_renderSettings.offset);
     }
-    if (layerDict.hasValue<ghoul::Dictionary>(KeyAdjustment)) {
-        _layerAdjustment.setValuesFromDictionary(
-            layerDict.value<ghoul::Dictionary>(KeyAdjustment)
-        );
+    if (p.adjustment.has_value()) {
+        _layerAdjustment.setValuesFromDictionary(*p.adjustment);
     }
 
     // Add options to option properties
@@ -530,7 +510,7 @@ void Layer::initializeBasedOnType(layers::Layer::ID id, ghoul::Dictionary initDi
                 const std::string name = initDict.value<std::string>(KeyName);
                 LDEBUG("Initializing tile provider for layer: '" + name + "'");
             }
-            _tileProvider = TileProvider::createFromDictionary(id, initDict);
+            _tileProvider = TileProvider::createFromDictionary(initDict);
             break;
         case layers::Layer::ID::SolidColor:
             if (initDict.hasValue<glm::dvec3>(ColorInfo.identifier)) {
@@ -541,7 +521,7 @@ void Layer::initializeBasedOnType(layers::Layer::ID id, ghoul::Dictionary initDi
 }
 
 void Layer::addVisibleProperties() {
-    switch (type()) {
+    switch (_typeId) {
         // Intentional fall through. Same for all tile layers
         case layers::Layer::ID::DefaultTileProvider:
         case layers::Layer::ID::SingleImageProvider:
diff --git a/modules/globebrowsing/src/layeradjustment.cpp b/modules/globebrowsing/src/layeradjustment.cpp
index d46d0eb495..e453f74d03 100644
--- a/modules/globebrowsing/src/layeradjustment.cpp
+++ b/modules/globebrowsing/src/layeradjustment.cpp
@@ -138,7 +138,7 @@ layers::Adjustment::ID LayerAdjustment::type() const {
 }
 
 void LayerAdjustment::addVisibleProperties() {
-    switch (type()) {
+    switch (_typeId) {
         case layers::Adjustment::ID::None:
             break;
         case layers::Adjustment::ID::ChromaKey:
diff --git a/modules/globebrowsing/src/layergroup.cpp b/modules/globebrowsing/src/layergroup.cpp
index 7d4d4aa64d..cc43c14119 100644
--- a/modules/globebrowsing/src/layergroup.cpp
+++ b/modules/globebrowsing/src/layergroup.cpp
@@ -57,19 +57,6 @@ LayerGroup::LayerGroup(layers::Group group)
     addProperty(_levelBlendingEnabled);
 }
 
-void LayerGroup::setLayersFromDict(const ghoul::Dictionary& dict) {
-    for (size_t i = 1; i <= dict.size(); i++) {
-        const ghoul::Dictionary layer = dict.value<ghoul::Dictionary>(std::to_string(i));
-
-        try {
-            addLayer(layer);
-        }
-        catch (const ghoul::RuntimeError& e) {
-            LERRORC(e.component, e.message);
-        }
-    }
-}
-
 void LayerGroup::initialize() {
     ZoneScoped;
 
diff --git a/modules/globebrowsing/src/layergroup.h b/modules/globebrowsing/src/layergroup.h
index 1844178662..013cc07d67 100644
--- a/modules/globebrowsing/src/layergroup.h
+++ b/modules/globebrowsing/src/layergroup.h
@@ -41,8 +41,6 @@ struct TileProvider;
 struct LayerGroup : public properties::PropertyOwner {
     LayerGroup(layers::Group group);
 
-    void setLayersFromDict(const ghoul::Dictionary& dict);
-
     void initialize();
     void deinitialize();
 
diff --git a/modules/globebrowsing/src/layermanager.cpp b/modules/globebrowsing/src/layermanager.cpp
index 3c088952fc..145d89f9e7 100644
--- a/modules/globebrowsing/src/layermanager.cpp
+++ b/modules/globebrowsing/src/layermanager.cpp
@@ -35,54 +35,38 @@
 
 namespace openspace::globebrowsing {
 
-documentation::Documentation LayerManager::Documentation() {
-    using namespace documentation;
-    return {
-        "LayerManager",
-        "globebrowsing_layermanager",
-        "",
-        {
-            {
-                "*",
-                new ReferencingVerifier("globebrowsing_layer"),
-                Optional::Yes,
-                "Specifies an individual layer"
-            }
-        }
-    };
-}
-
 LayerManager::LayerManager() : properties::PropertyOwner({ "Layers" }) {}
 
-void LayerManager::initialize(const ghoul::Dictionary& layerGroupsDict) {
+void LayerManager::initialize(const std::map<layers::Group::ID, ghoul::Dictionary>& dict)
+{
     ZoneScoped;
 
     // First create empty layer groups in case not all are specified
     for (size_t i = 0; i < _layerGroups.size(); i++) {
         _layerGroups[i] = std::make_unique<LayerGroup>(layers::Groups[i]);
-    }
-
-    // Create all the layer groups
-    for (std::string_view group : layerGroupsDict.keys()) {
-        using namespace layers;
-        const Group::ID id = ghoul::from_string<Group::ID>(group);
-
-        if (id != Group::ID::Unknown) {
-            const ghoul::Dictionary d = layerGroupsDict.value<ghoul::Dictionary>(group);
-            _layerGroups[static_cast<int>(id)]->setLayersFromDict(d);
+        addPropertySubOwner(_layerGroups[i].get());
+        _layerGroups[i]->initialize();
+        auto it = dict.find(layers::Groups[i].id);
+        if (!dict.empty() && it == dict.end()) {
+            LWARNINGC(
+                "LayerManager",
+                std::format("Unknown layer group '{}'", layers::Groups[i].identifier)
+            );
+            continue;
         }
-        else {
-            LWARNINGC("LayerManager", std::format("Unknown layer group '{}'", group));
+
+        for (size_t j = 1; j <= dict.size(); j++) {
+            const ghoul::Dictionary layer =
+                it->second.value<ghoul::Dictionary>(std::to_string(j));
+
+            try {
+                _layerGroups[i]->addLayer(layer);
+            }
+            catch (const ghoul::RuntimeError& e) {
+                LERRORC(e.component, e.message);
+            }
         }
     }
-
-    for (const std::unique_ptr<LayerGroup>& layerGroup : _layerGroups) {
-        addPropertySubOwner(layerGroup.get());
-    }
-
-    for (const std::unique_ptr<LayerGroup>& lg : _layerGroups) {
-        lg->initialize();
-    }
 }
 
 void LayerManager::deinitialize() {
diff --git a/modules/globebrowsing/src/layermanager.h b/modules/globebrowsing/src/layermanager.h
index f55341c610..f76b0a7321 100644
--- a/modules/globebrowsing/src/layermanager.h
+++ b/modules/globebrowsing/src/layermanager.h
@@ -52,7 +52,7 @@ public:
 
     LayerManager();
 
-    void initialize(const ghoul::Dictionary& layerGroupsDict);
+    void initialize(const std::map<layers::Group::ID, ghoul::Dictionary>& dict);
     void deinitialize();
 
     Layer* addLayer(layers::Group::ID id, const ghoul::Dictionary& layerDict);
@@ -70,8 +70,6 @@ public:
 
     void onChange(const std::function<void(Layer* l)>& callback);
 
-    static documentation::Documentation Documentation();
-
 private:
     std::array<std::unique_ptr<LayerGroup>, NumLayerGroups> _layerGroups;
 };
diff --git a/modules/globebrowsing/src/renderableglobe.cpp b/modules/globebrowsing/src/renderableglobe.cpp
index ea02c0f744..1d5cd71e9d 100644
--- a/modules/globebrowsing/src/renderableglobe.cpp
+++ b/modules/globebrowsing/src/renderableglobe.cpp
@@ -294,9 +294,17 @@ namespace {
         // [[codegen::verbatim(OrenNayarRoughnessInfo.description)]]
         std::optional<float> orenNayarRoughness;
 
+        enum class [[codegen::map(openspace::globebrowsing::layers::Group::ID)]] Group {
+            HeightLayers,
+            ColorLayers,
+            Overlays,
+            NightLayers,
+            WaterMasks,
+        };
+
         // A list of layers that should be added to the globe.
-        std::optional<std::map<std::string, ghoul::Dictionary>> layers
-            [[codegen::reference("globebrowsing_layermanager")]];
+        std::optional<std::map<Group, ghoul::Dictionary>> layers
+            [[codegen::reference("globebrowsing_layer")]];
 
         // Specifies information about planetary labels that can be rendered on the
         // object's surface.
@@ -636,16 +644,13 @@ RenderableGlobe::RenderableGlobe(const ghoul::Dictionary& dictionary)
     setInteractionSphere(boundingSphere());
 
     // Init layer manager
-    // @TODO (abock, 2021-03-25) The layermanager should be changed to take a
-    // std::map<std::string, ghoul::Dictionary> instead and then we don't need to get it
-    // as a bare dictionary anymore and can use the value from the struct directly
-    if (dictionary.hasValue<ghoul::Dictionary>("Layers")) {
-        const ghoul::Dictionary dict = dictionary.value<ghoul::Dictionary>("Layers");
-        _layerManager.initialize(dict);
-    }
-    else {
-        _layerManager.initialize(ghoul::Dictionary());
+    std::map<layers::Group::ID, ghoul::Dictionary> layers;
+    if (p.layers.has_value()) {
+        for (const auto& [key, value] : *p.layers) {
+            layers[codegen::map<layers::Group::ID>(key)] = value;
+        }
     }
+    _layerManager.initialize(layers);
 
     addProperty(Fadeable::_opacity);
 
@@ -764,14 +769,14 @@ RenderableGlobe::RenderableGlobe(const ghoul::Dictionary& dictionary)
 
     // Components
     if (p.rings.has_value()) {
-        _ringsComponent = std::make_unique<RingsComponent>(dictionary);
+        _ringsComponent = std::make_unique<RingsComponent>(*p.rings);
         _ringsComponent->setParentFadeable(this);
         _ringsComponent->initialize();
         addPropertySubOwner(_ringsComponent.get());
     }
 
     if (p.shadows.has_value()) {
-        _shadowComponent = std::make_unique<ShadowComponent>(dictionary);
+        _shadowComponent = std::make_unique<ShadowComponent>(*p.shadows);
         _shadowComponent->initialize();
         addPropertySubOwner(_shadowComponent.get());
         _shadowMappingProperties.shadowMapping = true;
diff --git a/modules/globebrowsing/src/ringscomponent.cpp b/modules/globebrowsing/src/ringscomponent.cpp
index c075f1dec0..c0d28d6ebc 100644
--- a/modules/globebrowsing/src/ringscomponent.cpp
+++ b/modules/globebrowsing/src/ringscomponent.cpp
@@ -223,29 +223,17 @@ RingsComponent::RingsComponent(const ghoul::Dictionary& dictionary)
     , _nightFactor(NightFactorInfo, 0.33f, 0.f, 1.f)
     , _colorFilter(ColorFilterInfo, 0.15f, 0.f, 1.f)
     , _enabled(EnabledInfo, true)
-    , _zFightingPercentage(ZFightingPercentageInfo, 0.995f, 0.000001f, 1.f)
+    , _zFightingPercentage(ZFightingPercentageInfo, 0.95f, 0.000001f, 1.f)
     , _nShadowSamples(NumberShadowSamplesInfo, 2, 1, 7)
+    // @TODO (abock, 2019-12-16) It would be better to not store the dictionary long
+    // term and rather extract the values directly here.  This would require a bit of
+    // a rewrite in the RenderableGlobe class to not create the RingsComponent in the
+    // class-initializer list though
+    // @TODO (abock, 2021-03-25) Righto!  The RenderableGlobe passes this dictionary
+    // in as-is so it would be easy to just pass it directly to the initialize method
+    // instead
     , _ringsDictionary(dictionary)
-{
-    using ghoul::filesystem::File;
-
-    if (dictionary.hasValue<ghoul::Dictionary>("Rings")) {
-        // @TODO (abock, 2019-12-16) It would be better to not store the dictionary long
-        // term and rather extract the values directly here.  This would require a bit of
-        // a rewrite in the RenderableGlobe class to not create the RingsComponent in the
-        // class-initializer list though
-        // @TODO (abock, 2021-03-25) Righto!  The RenderableGlobe passes this dictionary
-        // in as-is so it would be easy to just pass it directly to the initialize method
-        // instead
-        _ringsDictionary = dictionary.value<ghoul::Dictionary>("Rings");
-
-        documentation::testSpecificationAndThrow(
-            Documentation(),
-            _ringsDictionary,
-            "RingsComponent"
-        );
-    }
-}
+{}
 
 void RingsComponent::initialize() {
     ZoneScoped;
diff --git a/modules/globebrowsing/src/shadowcomponent.cpp b/modules/globebrowsing/src/shadowcomponent.cpp
index c43c4cc9f4..30aeca2994 100644
--- a/modules/globebrowsing/src/shadowcomponent.cpp
+++ b/modules/globebrowsing/src/shadowcomponent.cpp
@@ -186,12 +186,7 @@ ShadowComponent::ShadowComponent(const ghoul::Dictionary& dictionary)
     // coded into the RenderableGlobe. Instead, the parent should unpack the dictionary
     // and pass the unpacked dictionary in here;  Or maybe we don't want a dictionary at
     // this state anyway?
-    if (!dictionary.hasValue<ghoul::Dictionary>("Shadows")) {
-        return;
-    }
-    const ghoul::Dictionary d = dictionary.value<ghoul::Dictionary>("Shadows");
-
-    const Parameters p = codegen::bake<Parameters>(d);
+    const Parameters p = codegen::bake<Parameters>(dictionary);
 
     addProperty(_enabled);
 
diff --git a/modules/globebrowsing/src/tileprovider/tileprovider.cpp b/modules/globebrowsing/src/tileprovider/tileprovider.cpp
index d6af722e30..8cefb2f406 100644
--- a/modules/globebrowsing/src/tileprovider/tileprovider.cpp
+++ b/modules/globebrowsing/src/tileprovider/tileprovider.cpp
@@ -70,11 +70,16 @@ Tile DefaultTile = Tile { nullptr, std::nullopt, Tile::Status::Unavailable };
 unsigned int TileProvider::NumTileProviders = 0;
 
 std::unique_ptr<TileProvider> TileProvider::createFromDictionary(
-                                                            layers::Layer::ID layerTypeID,
                                                       const ghoul::Dictionary& dictionary)
 {
     ZoneScoped;
 
+    layers::Layer::ID layerTypeID = layers::Layer::ID::DefaultTileProvider;
+    if (dictionary.hasValue<std::string>("Type")) {
+        const std::string type = dictionary.value<std::string>("Type");
+        layerTypeID = ghoul::from_string<layers::Layer::ID>(type);
+    }
+
     const std::string_view type =
         layers::Layers[static_cast<int>(layerTypeID)].identifier;
 
diff --git a/modules/globebrowsing/src/tileprovider/tileprovider.h b/modules/globebrowsing/src/tileprovider/tileprovider.h
index 5712353df5..520d3054c7 100644
--- a/modules/globebrowsing/src/tileprovider/tileprovider.h
+++ b/modules/globebrowsing/src/tileprovider/tileprovider.h
@@ -75,7 +75,7 @@ struct TileProvider : public properties::PropertyOwner {
     static unsigned int NumTileProviders;
 
     static std::unique_ptr<TileProvider> createFromDictionary(
-        layers::Layer::ID layerTypeID, const ghoul::Dictionary& dictionary);
+        const ghoul::Dictionary& dictionary);
 
     static void initializeDefaultTile();
     static void deinitializeDefaultTile();
diff --git a/modules/globebrowsing/src/tileprovider/tileproviderbydate.cpp b/modules/globebrowsing/src/tileprovider/tileproviderbydate.cpp
index 968f51bb1f..71b7d296a8 100644
--- a/modules/globebrowsing/src/tileprovider/tileproviderbydate.cpp
+++ b/modules/globebrowsing/src/tileprovider/tileproviderbydate.cpp
@@ -32,6 +32,12 @@
 
 namespace {
     struct [[codegen::Dictionary(TileProviderByDate)]] Parameters {
+        // The layer needs to know about the LayerGroupID this but we don't want it to be
+        // part of the parameters struct as that would mean it would be visible to the end
+        // user, which we don't want since this value just comes from whoever creates it,
+        // not the user.
+        int layerGroupID [[codegen::private()]];
+
         // Specifies the list of tile providers and for which times they are used for. The
         // tile provider with the earliest time will be used for all dates prior to that
         // date and the provider with the latest time will be used for all dates
@@ -53,16 +59,8 @@ TileProviderByDate::TileProviderByDate(const ghoul::Dictionary& dictionary) {
 
     Parameters p = codegen::bake<Parameters>(dictionary);
 
-    // For now we need to inject the LayerGroupID this way. We don't want it to be part of
-    // the parameters struct as that would mean it would be visible to the end user, which
-    // we don't want since this value just comes from whoever creates it, not the user
-    ghoul_assert(dictionary.hasValue<int>("LayerGroupID"), "No Layer Group ID provided");
-    const layers::Group::ID group = static_cast<layers::Group::ID>(
-        dictionary.value<int>("LayerGroupID")
-    );
-
     for (std::pair<const std::string, ghoul::Dictionary>& prov : p.providers) {
-        prov.second.setValue("LayerGroupID", static_cast<int>(group));
+        prov.second.setValue("LayerGroupID", p.layerGroupID);
 
         // Pass down the caching information from the enclosing dictionary
         if (dictionary.hasValue<std::string>("GlobeName")) {
@@ -70,12 +68,7 @@ TileProviderByDate::TileProviderByDate(const ghoul::Dictionary& dictionary) {
         }
         layers::Layer::ID typeID = layers::Layer::ID::DefaultTileProvider;
 
-        if (prov.second.hasValue<std::string>("Type")) {
-            const std::string type = prov.second.value<std::string>("Type");
-            typeID = ghoul::from_string<layers::Layer::ID>(type);
-        }
-
-        std::unique_ptr<TileProvider> tp = createFromDictionary(typeID, prov.second);
+        std::unique_ptr<TileProvider> tp = createFromDictionary(prov.second);
         const std::string provId = prov.second.value<std::string>("Identifier");
         tp->setIdentifier(provId);
         const std::string providerName = prov.second.value<std::string>("Name");
diff --git a/modules/globebrowsing/src/tileprovider/tileproviderbyindex.cpp b/modules/globebrowsing/src/tileprovider/tileproviderbyindex.cpp
index 50caabde7f..2b95e8c1de 100644
--- a/modules/globebrowsing/src/tileprovider/tileproviderbyindex.cpp
+++ b/modules/globebrowsing/src/tileprovider/tileproviderbyindex.cpp
@@ -71,6 +71,12 @@ namespace {
 
         // The list of all TileProviders and the indices at which they are used.
         std::vector<IndexProvider> tileProviders;
+
+        // The layer needs to know about the LayerGroupID this but we don't want it to be
+        // part of the parameters struct as that would mean it would be visible to the end
+        // user, which we don't want since this value just comes from whoever creates it,
+        // not the user.
+        int layerGroupID [[codegen::private()]];
     };
 #include "tileproviderbyindex_codegen.cpp"
 } // namespace
@@ -86,22 +92,8 @@ TileProviderByIndex::TileProviderByIndex(const ghoul::Dictionary& dictionary) {
 
     Parameters p = codegen::bake<Parameters>(dictionary);
 
-    // For now we need to inject the LayerGroupID this way. We don't want it to be part of
-    // the parameters struct as that would mean it would be visible to the end user, which
-    // we don't want since this value just comes from whoever creates it, not the user
-    ghoul_assert(dictionary.hasValue<int>("LayerGroupID"), "No Layer Group ID provided");
-    const layers::Group::ID group = static_cast<layers::Group::ID>(
-        dictionary.value<int>("LayerGroupID")
-    );
-
-    layers::Layer::ID typeID = layers::Layer::ID::DefaultTileProvider;
-    if (p.defaultTileProvider.hasValue<std::string>("Type")) {
-        const std::string type = p.defaultTileProvider.value<std::string>("Type");
-        typeID = ghoul::from_string<layers::Layer::ID>(type);
-    }
-
-    p.defaultTileProvider.setValue("LayerGroupID", static_cast<int>(group));
-    _defaultTileProvider = createFromDictionary(typeID, p.defaultTileProvider);
+    p.defaultTileProvider.setValue("LayerGroupID", p.layerGroupID);
+    _defaultTileProvider = createFromDictionary(p.defaultTileProvider);
 
     for (Parameters::IndexProvider& ip : p.tileProviders) {
         const TileIndex tileIndex = TileIndex(
@@ -110,17 +102,9 @@ TileProviderByIndex::TileProviderByIndex(const ghoul::Dictionary& dictionary) {
             static_cast<uint8_t>(ip.index.level)
         );
 
-        layers::Layer::ID providerID = layers::Layer::ID::DefaultTileProvider;
-        if (ip.tileProvider.hasValue<std::string>("Type")) {
-            const std::string type = ip.tileProvider.value<std::string>("Type");
-            providerID = ghoul::from_string<layers::Layer::ID>(type);
-        }
 
-        ip.tileProvider.setValue("LayerGroupID", static_cast<int>(group));
-        std::unique_ptr<TileProvider> stp = createFromDictionary(
-            providerID,
-            ip.tileProvider
-        );
+        ip.tileProvider.setValue("LayerGroupID", p.layerGroupID);
+        std::unique_ptr<TileProvider> stp = createFromDictionary(ip.tileProvider);
         const TileIndex::TileHashKey key = tileIndex.hashKey();
         _providers.emplace(key, std::move(stp));
     }
diff --git a/modules/globebrowsing/src/tileprovider/tileproviderbylevel.cpp b/modules/globebrowsing/src/tileprovider/tileproviderbylevel.cpp
index 6abd4830e7..4bf86c241d 100644
--- a/modules/globebrowsing/src/tileprovider/tileproviderbylevel.cpp
+++ b/modules/globebrowsing/src/tileprovider/tileproviderbylevel.cpp
@@ -50,6 +50,12 @@ namespace {
 
         // The list of all tile providers that are used by this TileProviderByLevel.
         std::vector<Provider> levelTileProviders;
+
+        // The layer needs to know about the LayerGroupID this but we don't want it to be
+        // part of the parameters struct as that would mean it would be visible to the end
+        // user, which we don't want since this value just comes from whoever creates it,
+        // not the user.
+        int layerGroupID [[codegen::private()]];
     };
 #include "tileproviderbylevel_codegen.cpp"
 } // namespace
@@ -65,17 +71,9 @@ TileProviderByLevel::TileProviderByLevel(const ghoul::Dictionary& dictionary) {
 
     const Parameters p = codegen::bake<Parameters>(dictionary);
 
-    // For now we need to inject the LayerGroupID this way. We don't want it to be part of
-    // the parameters struct as that would mean it would be visible to the end user, which
-    // we don't want since this value just comes from whoever creates it, not the user
-    ghoul_assert(dictionary.hasValue<int>("LayerGroupID"), "No Layer Group ID provided");
-    const layers::Group::ID group = static_cast<layers::Group::ID>(
-        dictionary.value<int>("LayerGroupID")
-    );
-
     for (Parameters::Provider provider : p.levelTileProviders) {
         ghoul::Dictionary& tileProviderDict = provider.tileProvider;
-        tileProviderDict.setValue("LayerGroupID", static_cast<int>(group));
+        tileProviderDict.setValue("LayerGroupID", p.layerGroupID);
 
         // Pass down the caching information from the enclosing dictionary
         if (dictionary.hasValue<std::string>("GlobeName")) {
@@ -84,13 +82,8 @@ TileProviderByLevel::TileProviderByLevel(const ghoul::Dictionary& dictionary) {
                 dictionary.value<std::string>("GlobeName")
             );
         }
-        layers::Layer::ID typeID = layers::Layer::ID::DefaultTileProvider;
-        if (tileProviderDict.hasValue<std::string>("Type")) {
-            const std::string type = tileProviderDict.value<std::string>("Type");
-            typeID = ghoul::from_string<layers::Layer::ID>(type);
-        }
 
-        std::unique_ptr<TileProvider> tp = createFromDictionary(typeID, tileProviderDict);
+        std::unique_ptr<TileProvider> tp = createFromDictionary(tileProviderDict);
 
         const std::string provId = tileProviderDict.value<std::string>("Identifier");
         tp->setIdentifier(provId);
diff --git a/modules/imgui/src/guispacetimecomponent.cpp b/modules/imgui/src/guispacetimecomponent.cpp
index e8ff797daf..27c2ca29bf 100644
--- a/modules/imgui/src/guispacetimecomponent.cpp
+++ b/modules/imgui/src/guispacetimecomponent.cpp
@@ -420,12 +420,9 @@ void GuiSpaceTimeComponent::render() {
             if (_slidingDelta != 0.f) {
                 // No sync or send because time settings are always synced and sent
                 // to the connected nodes and peers
-                const std::string script = std::format(
+                global::scriptEngine->queueScript(std::format(
                     "openspace.time.setDeltaTime({})", _oldDeltaTime
-                );
-
-                using Script = scripting::ScriptEngine::Script;
-                global::scriptEngine->queueScript(script);
+                ));
 
             }
             _slidingDelta = 0.f;
diff --git a/modules/iswa/rendering/dataplane.cpp b/modules/iswa/rendering/dataplane.cpp
index 89ac02d673..b16f3ee076 100644
--- a/modules/iswa/rendering/dataplane.cpp
+++ b/modules/iswa/rendering/dataplane.cpp
@@ -144,7 +144,7 @@ void DataPlane::setUniforms() {
     _shader->setUniform("transparency", _alpha);
 }
 
-std::vector<float*> DataPlane::textureData(){
+std::vector<float*> DataPlane::textureData() {
     // if the buffer in the datafile is empty, do not proceed
     if (_dataBuffer.empty()) {
         return std::vector<float*>();
diff --git a/modules/iswa/rendering/iswacygnet.cpp b/modules/iswa/rendering/iswacygnet.cpp
index 565267dba4..c2372a1619 100644
--- a/modules/iswa/rendering/iswacygnet.cpp
+++ b/modules/iswa/rendering/iswacygnet.cpp
@@ -172,8 +172,8 @@ void IswaCygnet::render(const RenderData& data, RendererTasks&) {
     }
 
     glm::mat4 transform = glm::mat4(1.f);
-    for (int i = 0; i < 3; i++){
-        for (int j = 0; j < 3; j++){
+    for (int i = 0; i < 3; i++) {
+        for (int j = 0; j < 3; j++) {
             transform[i][j] = static_cast<float>(_stateMatrix[i][j]);
         }
     }
diff --git a/modules/iswa/util/iswamanager.cpp b/modules/iswa/util/iswamanager.cpp
index 47c0fe9a45..3016fc33d8 100644
--- a/modules/iswa/util/iswamanager.cpp
+++ b/modules/iswa/util/iswamanager.cpp
@@ -553,7 +553,7 @@ void IswaManager::createSphere(MetadataFuture& data) {
     // check if this sphere already exist
     std::string name = _type[data.type] + _geom[data.geom] + std::to_string(data.id);
 
-    if (!data.group.empty()){
+    if (!data.group.empty()) {
         std::string type = typeid(DataSphere).name();
         registerGroup(data.group, type);
 
@@ -693,7 +693,7 @@ void IswaManager::addCdfFiles(std::string cdfpath) {
 
         if (jsonFile.is_open()) {
             nlohmann::json cdfGroups = nlohmann::json::parse(jsonFile);
-            for(size_t i = 0; i < cdfGroups.size(); i++) {
+            for (size_t i = 0; i < cdfGroups.size(); i++) {
                 nlohmann::json cdfGroup = cdfGroups.at(i);
 
                 std::string groupName = cdfGroup["group"];
diff --git a/modules/kameleon/ext/kameleon b/modules/kameleon/ext/kameleon
index 18aa3fdd93..33ae5e637d 160000
--- a/modules/kameleon/ext/kameleon
+++ b/modules/kameleon/ext/kameleon
@@ -1 +1 @@
-Subproject commit 18aa3fdd932e5a4a8e6cd9725b88acaa1fdafb49
+Subproject commit 33ae5e637dc95437458c667817e93ef5411c9be1
diff --git a/modules/kameleon/src/kameleonhelper.cpp b/modules/kameleon/src/kameleonhelper.cpp
index 237e1c7fea..041ee36056 100644
--- a/modules/kameleon/src/kameleonhelper.cpp
+++ b/modules/kameleon/src/kameleonhelper.cpp
@@ -78,7 +78,7 @@ double getTime(ccmc::Kameleon* kameleon, double manualOffset) {
     // redundant!
 
     std::string seqStartStr;
-    if (kameleon->doesAttributeExist("start_time")){
+    if (kameleon->doesAttributeExist("start_time")) {
         seqStartStr =
                 kameleon->getGlobalAttribute("start_time").getAttributeString();
     }
diff --git a/modules/kameleon/src/kameleonwrapper.cpp b/modules/kameleon/src/kameleonwrapper.cpp
index c103d86625..7d56a9c57c 100644
--- a/modules/kameleon/src/kameleonwrapper.cpp
+++ b/modules/kameleon/src/kameleonwrapper.cpp
@@ -303,7 +303,7 @@ float* KameleonWrapper::uniformSampledValues(const std::string& var,
     const double dist = ((varMax - varMin) / NBins) * stop;
 
     const double varMaxNew = varMin + dist;
-    for(size_t i = 0; i < size; i++) {
+    for (size_t i = 0; i < size; i++) {
         const double normalizedVal = (doubleData[i] - varMin) / (varMaxNew - varMin);
 
         data[i] = static_cast<float>(glm::clamp(normalizedVal, 0.0, 1.0));
@@ -362,7 +362,7 @@ float* KameleonWrapper::uniformSliceValues(const std::string& var,
 
     for (size_t x = 0; x < outDimensions.x; ++x) {
         for (size_t y = 0; y < outDimensions.y; ++y) {
-            for(size_t z = 0; z < outDimensions.z; ++z){
+            for (size_t z = 0; z < outDimensions.z; ++z) {
 
                 const float xi = (hasXSlice) ? slice : x;
                 const float yi = (hasYSlice) ? slice : y;
diff --git a/modules/kameleonvolume/rendering/renderablekameleonvolume.cpp b/modules/kameleonvolume/rendering/renderablekameleonvolume.cpp
index 5ee8b4e9b4..fed8680c63 100644
--- a/modules/kameleonvolume/rendering/renderablekameleonvolume.cpp
+++ b/modules/kameleonvolume/rendering/renderablekameleonvolume.cpp
@@ -27,7 +27,6 @@
 #include <modules/volume/rendering/basicvolumeraycaster.h>
 #include <modules/volume/rawvolume.h>
 #include <modules/kameleon/include/kameleonwrapper.h>
-#include <openspace/rendering/transferfunction.h>
 #include <modules/kameleon/include/kameleonwrapper.h>
 #include <modules/kameleonvolume/kameleonvolumereader.h>
 #include <modules/volume/rawvolumereader.h>
@@ -37,8 +36,10 @@
 #include <modules/volume/transferfunctionhandler.h>
 #include <modules/volume/volumegridtype.h>
 #include <openspace/engine/globals.h>
+#include <openspace/documentation/documentation.h>
 #include <openspace/rendering/renderengine.h>
 #include <openspace/rendering/raycastermanager.h>
+#include <openspace/rendering/transferfunction.h>
 #include <openspace/util/updatestructures.h>
 #include <ghoul/filesystem/cachemanager.h>
 #include <ghoul/filesystem/file.h>
@@ -50,21 +51,6 @@
 namespace {
     constexpr std::string_view _loggerCat = "RenderableKameleonVolume";
 
-    constexpr std::string_view KeyDimensions = "Dimensions";
-    constexpr std::string_view KeyStepSize = "StepSize";
-    constexpr std::string_view KeyTransferFunction = "TransferFunction";
-    constexpr std::string_view KeySource = "Source";
-    constexpr std::string_view KeyVariable = "Variable";
-    constexpr std::string_view KeyLowerDomainBound = "LowerDomainBound";
-    constexpr std::string_view KeyUpperDomainBound = "UpperDomainBound";
-    constexpr std::string_view KeyDomainScale = "DomainScale";
-    constexpr std::string_view KeyLowerValueBound = "LowerValueBound";
-    constexpr std::string_view KeyUpperValueBound = "UpperValueBound";
-    constexpr std::string_view KeyClipPlanes = "ClipPlanes";
-    constexpr std::string_view KeyCache = "Cache";
-    constexpr std::string_view KeyGridType = "GridType";
-    constexpr std::string_view ValueSphericalGridType = "Spherical";
-
     constexpr openspace::properties::Property::PropertyInfo DimensionsInfo = {
         "Dimensions",
         "Dimensions",
@@ -148,6 +134,50 @@ namespace {
         "", // @TODO Missing documentation
         openspace::properties::Property::Visibility::Developer
     };
+
+    struct [[codegen::Dictionary(RenderableKameleonVolume)]] Parameters {
+        // [[codegen::verbatim(DimensionsInfo.description)]]
+        glm::ivec3 dimensions [[codegen::greater(glm::ivec3(0))]];
+
+        // [[codegen::verbatim(StepSizeInfo.description)]]
+        float stepSize;
+
+        // [[codegen::verbatim(TransferFunctionInfo.description)]]
+        std::optional<std::filesystem::path> transferFunction;
+
+        // [[codegen::verbatim(SourcePathInfo.description)]]
+        std::optional<std::filesystem::path> source;
+
+        // [[codegen::verbatim(VariableInfo.description)]]
+        std::optional<std::string> variable;
+
+        // [[codegen::verbatim(LowerDomainBoundInfo.description)]]
+        std::optional<glm::vec3> lowerDomainBound;
+
+        // [[codegen::verbatim(UpperDomainBoundInfo.description)]]
+        std::optional<glm::vec3> upperDomainBound;
+
+        // [[codegen::verbatim(DomainScaleInfo.description)]]
+        std::optional<glm::vec3> domainScale;
+
+        // [[codegen::verbatim(LowerValueBoundInfo.description)]]
+        std::optional<float> lowerValueBound;
+
+        // [[codegen::verbatim(UpperValueBoundInfo.description)]]
+        std::optional<float> upperValueBound;
+
+        std::optional<ghoul::Dictionary> clipPlanes;
+
+        // [[codegen::verbatim(CacheInfo.description)]]
+        std::optional<bool> cache;
+
+        enum class GridType {
+            Cartesian,
+            Spherical
+        };
+        std::optional<GridType> gridType;
+    };
+#include "renderablekameleonvolume_codegen.cpp"
 } // namespace
 
 namespace openspace::kameleonvolume {
@@ -167,78 +197,42 @@ RenderableKameleonVolume::RenderableKameleonVolume(const ghoul::Dictionary& dict
     , _transferFunctionPath(TransferFunctionInfo)
     , _cache(CacheInfo)
 {
-    if (dictionary.hasValue<glm::dvec3>(KeyDimensions)) {
-        _dimensions = dictionary.value<glm::dvec3>(KeyDimensions);
-    }
-    else {
-        LWARNING("No dimensions specified for volumetric data, falling back to 32^3");
-        _dimensions = glm::uvec3(32);
-    }
+    const Parameters p = codegen::bake<Parameters>(dictionary);
 
-    _stepSize = static_cast<float>(dictionary.value<double>(KeyStepSize));
+    _dimensions = p.dimensions;
+    _stepSize = p.stepSize;
 
-    if (dictionary.hasValue<std::string>(KeyTransferFunction)) {
-        _transferFunctionPath = dictionary.value<std::string>(KeyTransferFunction);
+    if (p.transferFunction.has_value()) {
+        _transferFunctionPath = p.transferFunction->string();
         _transferFunction = std::make_shared<openspace::TransferFunction>(
             _transferFunctionPath.value()
         );
     }
 
-    if (dictionary.hasValue<std::string>(KeySource)) {
-        _sourcePath = absPath(dictionary.value<std::string>(KeySource)).string();
+    if (p.source.has_value()) {
+        _sourcePath = p.source->string();
     }
 
-    if (dictionary.hasValue<std::string>(KeyVariable)) {
-        _variable = dictionary.value<std::string>(KeyVariable);
-    }
+    _variable = p.variable.value_or(_variable);
+    _lowerDomainBound = p.lowerDomainBound.value_or(_lowerDomainBound);
+    _upperDomainBound = p.upperDomainBound.value_or(_upperDomainBound);
+    _autoDomainBounds =
+        !p.lowerDomainBound.has_value() || !p.upperDomainBound.has_value();
 
-    if (dictionary.hasValue<glm::dvec3>(KeyLowerDomainBound)) {
-        _lowerDomainBound = dictionary.value<glm::dvec3>(KeyLowerDomainBound);
-    }
-    else {
-        _autoDomainBounds = true;
-    }
+    _domainScale = p.domainScale.value_or(_domainScale);
 
-    if (dictionary.hasValue<glm::dvec3>(KeyUpperDomainBound)) {
-        _upperDomainBound = dictionary.value<glm::dvec3>(KeyUpperDomainBound);
-    }
-    else {
-        _autoDomainBounds = true;
-    }
+    _lowerValueBound = p.lowerValueBound.value_or(_lowerValueBound);
+    _upperValueBound = p.upperValueBound.value_or(_upperValueBound);
+    _autoValueBounds = !p.lowerValueBound.has_value() || !p.upperValueBound.has_value();
 
-    if (dictionary.hasValue<glm::dvec3>(KeyDomainScale)) {
-        _domainScale = dictionary.value<glm::dvec3>(KeyDomainScale);
-    }
 
-    if (dictionary.hasValue<double>(KeyLowerValueBound)) {
-        _lowerValueBound = static_cast<float>(
-            dictionary.value<double>(KeyLowerValueBound)
-        );
-    }
-    else {
-        _autoValueBounds = true;
-    }
-
-    if (dictionary.hasValue<double>(KeyUpperValueBound)) {
-        _upperValueBound = static_cast<float>(
-            dictionary.value<double>(KeyUpperValueBound)
-        );
-    }
-    else {
-        _autoValueBounds = true;
-    }
-
-    ghoul::Dictionary clipPlanesDictionary;
-    if (dictionary.hasValue<ghoul::Dictionary>(KeyClipPlanes)) {
-        clipPlanesDictionary = dictionary.value<ghoul::Dictionary>(KeyClipPlanes);
-    }
-    _clipPlanes = std::make_shared<volume::VolumeClipPlanes>(clipPlanesDictionary);
+    _clipPlanes = std::make_shared<volume::VolumeClipPlanes>(
+        p.clipPlanes.value_or(ghoul::Dictionary())
+    );
     _clipPlanes->setIdentifier("clipPlanes");
     _clipPlanes->setGuiName("Clip Planes");
 
-    if (dictionary.hasValue<bool>(KeyCache)) {
-        _cache = dictionary.value<bool>(KeyCache);
-    }
+    _cache = p.cache.value_or(_cache);
 
     _gridType.addOption(
         static_cast<int>(volume::VolumeGridType::Cartesian),
@@ -248,17 +242,17 @@ RenderableKameleonVolume::RenderableKameleonVolume(const ghoul::Dictionary& dict
         static_cast<int>(volume::VolumeGridType::Spherical),
         "Spherical grid"
     );
-    _gridType.setValue(static_cast<int>(volume::VolumeGridType::Cartesian));
 
-    if (dictionary.hasValue<std::string>(KeyGridType)) {
-        const std::string& gridType = dictionary.value<std::string>(KeyGridType);
-        if (gridType == ValueSphericalGridType) {
+    Parameters::GridType type = p.gridType.value_or(Parameters::GridType::Cartesian);
+    switch (type) {
+        case Parameters::GridType::Cartesian:
+            _gridType.setValue(static_cast<int>(volume::VolumeGridType::Cartesian));
+            break;
+        case Parameters::GridType::Spherical:
             _gridType.setValue(static_cast<int>(volume::VolumeGridType::Spherical));
-        }
-        else {
-            _autoGridType = true;
-        }
+            break;
     }
+    _autoGridType = !p.gridType.has_value();
 }
 
 RenderableKameleonVolume::~RenderableKameleonVolume() {}
diff --git a/modules/multiresvolume/rendering/renderablemultiresvolume.cpp b/modules/multiresvolume/rendering/renderablemultiresvolume.cpp
index 3f8ee49dfa..1980a4dac8 100644
--- a/modules/multiresvolume/rendering/renderablemultiresvolume.cpp
+++ b/modules/multiresvolume/rendering/renderablemultiresvolume.cpp
@@ -35,6 +35,7 @@
 #include <modules/multiresvolume/rendering/simpletfbrickselector.h>
 #include <modules/multiresvolume/rendering/tfbrickselector.h>
 #include <modules/multiresvolume/rendering/tsp.h>
+#include <openspace/documentation/documentation.h>
 #include <openspace/engine/globals.h>
 #include <openspace/rendering/renderengine.h>
 #include <openspace/rendering/raycastermanager.h>
@@ -60,13 +61,6 @@
 
 namespace {
     constexpr std::string_view _loggerCat = "RenderableMultiresVolume";
-    constexpr std::string_view KeyDataSource = "Source";
-    constexpr std::string_view KeyErrorHistogramsSource = "ErrorHistogramsSource";
-    constexpr std::string_view KeyTransferFunction = "TransferFunction";
-
-    constexpr std::string_view KeyBrickSelector = "BrickSelector";
-    constexpr std::string_view KeyStartTime = "StartTime";
-    constexpr std::string_view KeyEndTime = "EndTime";
 
     constexpr openspace::properties::Property::PropertyInfo StepSizeCoefficientInfo = {
         "StepSizeCoefficient",
@@ -158,6 +152,24 @@ namespace {
         "", // @TODO Missing documentation
         openspace::properties::Property::Visibility::Developer
     };
+
+    struct [[codegen::Dictionary(RenderableMultiresVolume)]] Parameters {
+        std::filesystem::path source;
+        std::optional<std::filesystem::path> errorHistogramsSource;
+        std::optional<int> scalingExponent;
+        std::optional<float> stepSizeCoefficient;
+        std::optional<glm::vec3> scaling;
+        std::optional<glm::vec3> translation;
+        std::optional<glm::vec3> rotation;
+
+        std::optional<std::string> startTime;
+        std::optional<std::string> endTime;
+
+        std::filesystem::path transferFunction;
+
+        std::optional<std::string> brickSelector;
+    };
+#include "renderablemultiresvolume_codegen.cpp"
 } // namespace
 
 namespace openspace {
@@ -183,49 +195,19 @@ RenderableMultiresVolume::RenderableMultiresVolume(const ghoul::Dictionary& dict
     )
     , _scaling(ScalingInfo, glm::vec3(1.f), glm::vec3(0.f), glm::vec3(10.f))
 {
-    if (dictionary.hasValue<std::string>(KeyDataSource)) {
-        _filename = absPath(dictionary.value<std::string>(KeyDataSource));
-    }
-    else {
-        LERROR(std::format("Node did not contain a valid '{}'", KeyDataSource));
-        return;
-    }
+    const Parameters p = codegen::bake<Parameters>(dictionary);
 
-    if (dictionary.hasValue<std::string>(KeyErrorHistogramsSource)) {
-        _errorHistogramsPath = absPath(
-            dictionary.value<std::string>(KeyErrorHistogramsSource)
-        );
-    }
+    _filename = p.source;
+    _errorHistogramsPath = p.errorHistogramsSource.value_or(_errorHistogramsPath);
+    _scalingExponent = p.scalingExponent.value_or(_scalingExponent);
+    _stepSizeCoefficient = p.stepSizeCoefficient.value_or(_stepSizeCoefficient);
+    _scaling = p.scaling.value_or(_scaling);
+    _translation = p.translation.value_or(_translation);
+    _rotation = p.rotation.value_or(_rotation);
 
-    if (dictionary.hasValue<double>("ScalingExponent")) {
-        _scalingExponent = static_cast<int>(dictionary.value<double>("ScalingExponent"));
-    }
-
-    if (dictionary.hasValue<double>("StepSizeCoefficient")) {
-        _stepSizeCoefficient = static_cast<float>(
-            dictionary.value<double>("StepSizeCoefficient")
-        );
-    }
-
-    if (dictionary.hasValue<glm::dvec3>("Scaling")) {
-        _scaling = dictionary.value<glm::dvec3>("Scaling");
-    }
-
-    if (dictionary.hasValue<glm::dvec3>("Translation")) {
-        _translation = dictionary.value<glm::dvec3>("Translation");
-    }
-
-    if (dictionary.hasValue<glm::dvec3>("Rotation")) {
-        _rotation = dictionary.value<glm::dvec3>("Rotation");
-    }
-
-    if (dictionary.hasValue<std::string>(KeyStartTime) &&
-        dictionary.hasValue<std::string>(KeyEndTime))
-    {
-        std::string startTimeString = dictionary.value<std::string>(KeyStartTime);
-        std::string endTimeString = dictionary.value<std::string>(KeyEndTime);
-        _startTime = SpiceManager::ref().ephemerisTimeFromDate(startTimeString);
-        _endTime = SpiceManager::ref().ephemerisTimeFromDate(endTimeString);
+    if (p.startTime.has_value() && p.endTime.has_value()) {
+        _startTime = SpiceManager::ref().ephemerisTimeFromDate(*p.startTime);
+        _endTime = SpiceManager::ref().ephemerisTimeFromDate(*p.endTime);
         _loop = false;
     }
     else {
@@ -233,44 +215,13 @@ RenderableMultiresVolume::RenderableMultiresVolume(const ghoul::Dictionary& dict
         LWARNING("Node does not provide time information. Viewing one image / frame");
     }
 
-    if (dictionary.hasValue<std::string>(KeyTransferFunction)) {
-        _transferFunctionPath = absPath(
-            dictionary.value<std::string>(KeyTransferFunction)
-        );
-        _transferFunction = std::make_shared<TransferFunction>(_transferFunctionPath);
-    }
-    else {
-        LERROR(std::format("Node did not contain a valid '{}'", KeyTransferFunction));
-        return;
-    }
-
-    //_pscOffset = psc(glm::vec4(0.f));
-    //_boxScaling = glm::vec3(1.f);
-
-
-    /*if (dictionary.hasKey(KeyBoxScaling)) {
-        glm::vec4 scalingVec4(_boxScaling, _w);
-        success = dictionary.getValue(KeyBoxScaling, scalingVec4);
-        if (success) {
-            _boxScaling = scalingVec4.xyz;
-            _w = scalingVec4.w;
-        }
-        else {
-            success = dictionary.getValue(KeyBoxScaling, _boxScaling);
-            if (!success) {
-                LERROR("Node '" << name << "' did not contain a valid '" <<
-                    KeyBoxScaling << "'");
-                return;
-            }
-        }
-    }*/
+    _transferFunctionPath = p.transferFunction;
+    _transferFunction = std::make_shared<TransferFunction>(_transferFunctionPath);
 
     _tsp = std::make_shared<TSP>(_filename);
     _atlasManager = std::make_shared<AtlasManager>(_tsp.get());
 
-    if (dictionary.hasValue<std::string>(KeyBrickSelector)) {
-        _selectorName = dictionary.value<std::string>(KeyBrickSelector);
-    }
+    _selectorName = p.brickSelector.value_or(_selectorName);
 
     std::string selectorName = _selectorName;
     if (selectorName == "simple") {
diff --git a/modules/server/servermodule.cpp b/modules/server/servermodule.cpp
index 6aae5399ce..ff79690a80 100644
--- a/modules/server/servermodule.cpp
+++ b/modules/server/servermodule.cpp
@@ -28,6 +28,7 @@
 #include <modules/server/include/serverinterface.h>
 #include <modules/server/include/connection.h>
 #include <modules/server/include/topics/topic.h>
+#include <openspace/documentation/documentation.h>
 #include <openspace/engine/globalscallbacks.h>
 #include <openspace/engine/globals.h>
 #include <openspace/engine/windowdelegate.h>
@@ -41,11 +42,20 @@
 #include <ghoul/misc/templatefactory.h>
 
 namespace {
-    constexpr std::string_view KeyInterfaces = "Interfaces";
+    struct [[codegen::Dictionary(ServerModule)]] Parameters {
+        std::optional<ghoul::Dictionary> interfaces;
+        std::optional<std::vector<std::string>> allowAddresses;
+        std::optional<int> skyBrowserUpdateTime;
+    };
+#include "servermodule_codegen.cpp"
 } // namespace
 
 namespace openspace {
 
+documentation::Documentation ServerModule::Documentation() {
+    return codegen::doc<Parameters>("module_server");
+}
+
 ServerModule::ServerModule()
     : OpenSpaceModule(ServerModule::Name)
     , _interfaceOwner({"Interfaces", "Interfaces", "Server Interfaces"})
@@ -93,26 +103,17 @@ void ServerModule::internalInitialize(const ghoul::Dictionary& configuration) {
         preSync();
     });
 
-    if (!configuration.hasValue<ghoul::Dictionary>(KeyInterfaces)) {
+    const Parameters p = codegen::bake<Parameters>(configuration);
+    if (!p.interfaces.has_value()) {
         return;
     }
-    const ghoul::Dictionary interfaces =
-        configuration.value<ghoul::Dictionary>(KeyInterfaces);
 
-    for (const std::string_view key : interfaces.keys()) {
-        ghoul::Dictionary interfaceDictionary = interfaces.value<ghoul::Dictionary>(key);
 
-        // @TODO (abock, 2019-09-17);  This is a hack to make the parsing of the
-        // openspace.cfg file not corrupt the heap and cause a potential crash at shutdown
-        // (see ticket https://github.com/OpenSpace/OpenSpace/issues/982)
-        // The AllowAddresses are specified externally and are injected here
-        interfaceDictionary.setValue(
-            "AllowAddresses",
-            configuration.value<ghoul::Dictionary>("AllowAddresses")
-        );
+    for (const std::string_view key : p.interfaces->keys()) {
+        ghoul::Dictionary interface = p.interfaces->value<ghoul::Dictionary>(key);
 
         std::unique_ptr<ServerInterface> serverInterface =
-            ServerInterface::createFromDictionary(interfaceDictionary);
+            ServerInterface::createFromDictionary(interface);
 
         serverInterface->initialize();
 
@@ -122,11 +123,8 @@ void ServerModule::internalInitialize(const ghoul::Dictionary& configuration) {
             _interfaces.push_back(std::move(serverInterface));
         }
     }
-    if (configuration.hasValue<double>("SkyBrowserUpdateTime")) {
-        _skyBrowserUpdateTime = static_cast<int>(
-            configuration.value<double>("SkyBrowserUpdateTime")
-        );
-    }
+
+    _skyBrowserUpdateTime = p.skyBrowserUpdateTime.value_or(_skyBrowserUpdateTime);
 }
 
 void ServerModule::preSync() {
diff --git a/modules/server/servermodule.h b/modules/server/servermodule.h
index 3bf7823a11..f4c69990f9 100644
--- a/modules/server/servermodule.h
+++ b/modules/server/servermodule.h
@@ -62,6 +62,8 @@ public:
     CallbackHandle addPreSyncCallback(CallbackFunction cb);
     void removePreSyncCallback(CallbackHandle handle);
 
+    static documentation::Documentation Documentation();
+
 protected:
     void internalInitialize(const ghoul::Dictionary& configuration) override;
 
diff --git a/modules/server/src/serverinterface.cpp b/modules/server/src/serverinterface.cpp
index f2f5272381..16948d4eaf 100644
--- a/modules/server/src/serverinterface.cpp
+++ b/modules/server/src/serverinterface.cpp
@@ -23,20 +23,14 @@
  ****************************************************************************************/
 
 #include <modules/server/include/serverinterface.h>
-#include <ghoul/io/socket/socketserver.h>
 
+#include <openspace/documentation/documentation.h>
+#include <ghoul/io/socket/socketserver.h>
 #include <ghoul/io/socket/tcpsocketserver.h>
 #include <ghoul/io/socket/websocketserver.h>
 #include <functional>
 
 namespace {
-    constexpr std::string_view KeyIdentifier = "Identifier";
-    constexpr std::string_view TcpSocketType = "TcpSocket";
-    constexpr std::string_view WebSocketType = "WebSocket";
-    constexpr std::string_view DenyAccess = "Deny";
-    constexpr std::string_view RequirePassword = "RequirePassword";
-    constexpr std::string_view AllowAccess = "Allow";
-
     constexpr openspace::properties::Property::PropertyInfo EnabledInfo = {
         "Enabled",
         "Enabled",
@@ -94,6 +88,45 @@ namespace {
         "Password for connecting to this interface.",
         openspace::properties::Property::Visibility::AdvancedUser
     };
+
+    struct [[codegen::Dictionary(ServerInterface)]] Parameters {
+        enum class [[codegen::stringify()]] Access {
+            Allow,
+            Deny,
+            RequirePassword
+        };
+
+        // [[codegen::verbatim(DefaultAccessInfo.description)]]
+        std::optional<Access> defaultAccess;
+
+        std::string identifier;
+
+        // [[codegen::verbatim(AllowAddressesInfo.description)]]
+        std::optional<std::vector<std::string>> allowAddresses;
+
+        // [[codegen::verbatim(DenyAddressesInfo.description)]]
+        std::optional<std::vector<std::string>> denyAddresses;
+
+        // [[codegen::verbatim(RequirePasswordAddressesInfo.description)]]
+        std::optional<std::vector<std::string>> requirePasswordAddresses;
+
+        enum class [[codegen::stringify()]] Type {
+            TcpSocket,
+            WebSocket
+        };
+        // [[codegen::verbatim(TypeInfo.description)]]
+        Type type;
+
+        // [[codegen::verbatim(PasswordInfo.description)]]
+        std::optional<std::string> password;
+
+        // [[codegen::verbatim(PortInfo.description)]]
+        int port;
+
+        // [[codegen::verbatim(EnabledInfo.description)]]
+        bool enabled;
+    };
+#include "serverinterface_codegen.cpp"
 } // namespace
 
 namespace openspace {
@@ -117,80 +150,65 @@ ServerInterface::ServerInterface(const ghoul::Dictionary& dictionary)
     , _defaultAccess(DefaultAccessInfo)
     , _password(PasswordInfo)
 {
+    const Parameters p = codegen::bake<Parameters>(dictionary);
 
     _socketType.addOption(
         static_cast<int>(InterfaceType::TcpSocket),
-        std::string(TcpSocketType)
+        "TcpSocket"
     );
     _socketType.addOption(
         static_cast<int>(InterfaceType::WebSocket),
-        std::string(WebSocketType)
+        "WebSocket"
     );
 
     _defaultAccess.addOption(
         static_cast<int>(Access::Deny),
-        std::string(DenyAccess)
+        "Deny"
     );
     _defaultAccess.addOption(
         static_cast<int>(Access::RequirePassword),
-        std::string(RequirePassword)
+        "RequirePassword"
     );
     _defaultAccess.addOption(
         static_cast<int>(Access::Allow),
-        std::string(AllowAccess)
+        "Allow"
     );
 
-    if (dictionary.hasKey(DefaultAccessInfo.identifier)) {
-        const std::string access = dictionary.value<std::string>(
-            DefaultAccessInfo.identifier
-        );
-        if (access == DenyAccess) {
-            _defaultAccess.setValue(static_cast<int>(Access::Deny));
-        }
-        else if (access == RequirePassword) {
-            _defaultAccess.setValue(static_cast<int>(Access::RequirePassword));
-        }
-        else if (access == AllowAccess) {
-            _defaultAccess.setValue(static_cast<int>(Access::Allow));
+    if (p.defaultAccess.has_value()) {
+        switch (*p.defaultAccess) {
+            case Parameters::Access::Allow:
+                _defaultAccess.setValue(static_cast<int>(Access::Allow));
+                break;
+            case Parameters::Access::Deny:
+                _defaultAccess.setValue(static_cast<int>(Access::Deny));
+                break;
+            case Parameters::Access::RequirePassword:
+                _defaultAccess.setValue(static_cast<int>(Access::RequirePassword));
+                break;
         }
     }
 
-    const std::string identifier = dictionary.value<std::string>(KeyIdentifier);
+    _allowAddresses = p.allowAddresses.value_or(_allowAddresses);
+    _denyAddresses = p.denyAddresses.value_or(_denyAddresses);
+    _requirePasswordAddresses =
+        p.requirePasswordAddresses.value_or(_requirePasswordAddresses);
 
-    auto readList =
-        [dictionary](const std::string& key, properties::StringListProperty& list) {
-            if (dictionary.hasValue<ghoul::Dictionary>(key)) {
-                const ghoul::Dictionary& dict = dictionary.value<ghoul::Dictionary>(key);
-                std::vector<std::string> v;
-                for (const std::string_view k : dict.keys()) {
-                    v.push_back(dict.value<std::string>(k));
-                }
-                list = v;
-            }
-        };
+    setIdentifier(p.identifier);
+    setGuiName(p.identifier);
+    setDescription("Settings for server interface " + p.identifier);
 
-    readList(AllowAddressesInfo.identifier, _allowAddresses);
-    readList(DenyAddressesInfo.identifier, _denyAddresses);
-    readList(RequirePasswordAddressesInfo.identifier, _requirePasswordAddresses);
-
-    setIdentifier(identifier);
-    setGuiName(identifier);
-    setDescription("Settings for server interface " + identifier);
-
-    const std::string type = dictionary.value<std::string>(TypeInfo.identifier);
-    if (type == TcpSocketType) {
-        _socketType = static_cast<int>(InterfaceType::TcpSocket);
-    }
-    else if (type == WebSocketType) {
-        _socketType = static_cast<int>(InterfaceType::WebSocket);
+    switch (p.type) {
+        case Parameters::Type::TcpSocket:
+            _socketType = static_cast<int>(InterfaceType::TcpSocket);
+            break;
+        case Parameters::Type::WebSocket:
+            _socketType = static_cast<int>(InterfaceType::WebSocket);
+            break;
     }
 
-    if (dictionary.hasValue<std::string>(PasswordInfo.identifier)) {
-        _password = dictionary.value<std::string>(PasswordInfo.identifier);
-    }
-
-    _port = static_cast<int>(dictionary.value<double>(PortInfo.identifier));
-    _enabled = dictionary.value<bool>(EnabledInfo.identifier);
+    _password = p.password.value_or(_password);
+    _port = p.port;
+    _enabled = p.enabled;
 
     auto reinitialize = [this]() {
         deinitialize();
@@ -198,19 +216,18 @@ ServerInterface::ServerInterface(const ghoul::Dictionary& dictionary)
     };
 
     _socketType.onChange(reinitialize);
-    _port.onChange(reinitialize);
-    _enabled.onChange(reinitialize);
-    _defaultAccess.onChange(reinitialize);
-    _allowAddresses.onChange(reinitialize);
-    _requirePasswordAddresses.onChange(reinitialize);
-    _denyAddresses.onChange(reinitialize);
-
     addProperty(_socketType);
+    _port.onChange(reinitialize);
     addProperty(_port);
+    _enabled.onChange(reinitialize);
     addProperty(_enabled);
+    _defaultAccess.onChange(reinitialize);
     addProperty(_defaultAccess);
+    _allowAddresses.onChange(reinitialize);
     addProperty(_allowAddresses);
+    _requirePasswordAddresses.onChange(reinitialize);
     addProperty(_requirePasswordAddresses);
+    _denyAddresses.onChange(reinitialize);
     addProperty(_denyAddresses);
     addProperty(_password);
 }
diff --git a/modules/skybrowser/skybrowsermodule.cpp b/modules/skybrowser/skybrowsermodule.cpp
index a7c0db4aab..e9f38758d1 100644
--- a/modules/skybrowser/skybrowsermodule.cpp
+++ b/modules/skybrowser/skybrowsermodule.cpp
@@ -160,6 +160,10 @@ namespace {
 
 namespace openspace {
 
+documentation::Documentation SkyBrowserModule::Documentation() {
+    return codegen::doc<Parameters>("module_skybrowser");
+}
+
 SkyBrowserModule::SkyBrowserModule()
     : OpenSpaceModule(SkyBrowserModule::Name)
     , _enabled(EnabledInfo)
diff --git a/modules/skybrowser/skybrowsermodule.h b/modules/skybrowser/skybrowsermodule.h
index b194768f83..1c0f5b9591 100644
--- a/modules/skybrowser/skybrowsermodule.h
+++ b/modules/skybrowser/skybrowsermodule.h
@@ -87,6 +87,7 @@ public:
 
     scripting::LuaLibrary luaLibrary() const override;
     std::vector<documentation::Documentation> documentations() const override;
+    static documentation::Documentation Documentation();
 
 protected:
     void internalInitialize(const ghoul::Dictionary& dict) override;
diff --git a/modules/space/horizonsfile.cpp b/modules/space/horizonsfile.cpp
index b1bbcda8c2..b4e74cfc7d 100644
--- a/modules/space/horizonsfile.cpp
+++ b/modules/space/horizonsfile.cpp
@@ -800,7 +800,7 @@ std::pair<std::string, std::string> HorizonsFile::parseValidTimeRange(
                 "{} T {}", words[words.size() - 2], words[words.size() - 1]
             );
         }
-        else if (words.size() > 2){
+        else if (words.size() > 2) {
             // Sometimes the format can be yyyy-mon-dd without time
             startTime = words[words.size() - 2];
             endTime = words[words.size() - 1];
diff --git a/modules/space/kepler.cpp b/modules/space/kepler.cpp
index 8d0bf940a8..9ae20a9a28 100644
--- a/modules/space/kepler.cpp
+++ b/modules/space/kepler.cpp
@@ -440,7 +440,7 @@ std::vector<Parameters> readTleFile(const std::filesystem::path& file) {
         // patch it to the full year
         {
             const std::string id = firstLine.substr(9, 6);
-            const std::string prefix = [y = id.substr(0, 2)](){
+            const std::string prefix = [y = id.substr(0, 2)]() {
                 const int year = std::atoi(y.c_str());
                 return year >= 57 ? "19" : "20";
             }();
diff --git a/modules/space/rendering/renderablestars.cpp b/modules/space/rendering/renderablestars.cpp
index bae9fe64c5..b826718886 100644
--- a/modules/space/rendering/renderablestars.cpp
+++ b/modules/space/rendering/renderablestars.cpp
@@ -451,14 +451,18 @@ RenderableStars::RenderableStars(const ghoul::Dictionary& dictionary)
         properties::StringProperty(TextureInfo),
         properties::FloatProperty(MultiplierInfo, 1.f, 0.f, 20.f),
         properties::FloatProperty(GammaInfo, 1.f, 0.f, 5.f),
-        properties::FloatProperty(ScaleInfo, 1.f, 0.f, 1.f)
+        properties::FloatProperty(ScaleInfo, 1.f, 0.f, 1.f),
+        nullptr,
+        nullptr
     }
     , _glare {
         properties::PropertyOwner(GlareOwnerInfo),
         properties::StringProperty(TextureInfo),
         properties::FloatProperty(MultiplierInfo, 1.f, 0.f, 20.f),
         properties::FloatProperty(GammaInfo, 1.f, 0.f, 5.f),
-        properties::FloatProperty(ScaleInfo, 1.f, 0.f, 1.f)
+        properties::FloatProperty(ScaleInfo, 1.f, 0.f, 1.f),
+        nullptr,
+        nullptr
     }
     , _parameters {
         properties::PropertyOwner(SizeCompositionInfo),
diff --git a/modules/space/rotation/spicerotation.cpp b/modules/space/rotation/spicerotation.cpp
index bdba3390dc..cdb5e03ba7 100644
--- a/modules/space/rotation/spicerotation.cpp
+++ b/modules/space/rotation/spicerotation.cpp
@@ -111,13 +111,8 @@ SpiceRotation::SpiceRotation(const ghoul::Dictionary& dictionary)
     _fixedDate = p.fixedDate.value_or(_fixedDate);
     addProperty(_fixedDate);
 
-    if (dictionary.hasKey(TimeFrameInfo.identifier)) {
-        const ghoul::Dictionary timeFrameDictionary =
-            dictionary.value<ghoul::Dictionary>(TimeFrameInfo.identifier);
-        _timeFrame = TimeFrame::createFromDictionary(timeFrameDictionary);
-        if (_timeFrame == nullptr) {
-            throw ghoul::RuntimeError("Invalid dictionary for TimeFrame");
-        }
+    if (p.timeFrame.has_value()) {
+        _timeFrame = TimeFrame::createFromDictionary(*p.timeFrame);
         addPropertySubOwner(_timeFrame.get());
     }
 
diff --git a/modules/space/shaders/fluxnodes_vs.glsl b/modules/space/shaders/fluxnodes_vs.glsl
index c8da051462..c4ace2a360 100644
--- a/modules/space/shaders/fluxnodes_vs.glsl
+++ b/modules/space/shaders/fluxnodes_vs.glsl
@@ -152,7 +152,7 @@ void setEarthProximitySettings() {
     if (usingPulse) {
       int speed = 2;
       int modulusResult = int(speed * time) % 2;
-      if (fluxValue > thresholdFlux){
+      if (fluxValue > thresholdFlux) {
         if (modulusResult == 1) {
           vs_color.a = 0.01;
         }
@@ -199,7 +199,7 @@ void main() {
         vs_color.a = 0.0;
       }
     }
-    else if (colorMode == uniformColor){
+    else if (colorMode == uniformColor) {
       vs_color = streamColor;
     }
     setEarthProximitySettings();
diff --git a/modules/space/spacemodule.cpp b/modules/space/spacemodule.cpp
index 9c75829c99..c7bc8c3590 100644
--- a/modules/space/spacemodule.cpp
+++ b/modules/space/spacemodule.cpp
@@ -59,12 +59,23 @@ namespace {
         "disabled, the errors will be ignored silently.",
         openspace::properties::Property::Visibility::Developer
     };
+
+    struct [[codegen::Dictionary(SpaceModule)]] Parameters {
+        // [[codegen::verbatim(SpiceExceptionInfo.description)]]
+        std::optional<bool> showExceptions;
+    };
+#include "spacemodule_codegen.cpp"
+
 } // namespace
 
 namespace openspace {
 
 ghoul::opengl::ProgramObjectManager SpaceModule::ProgramObjectManager;
 
+documentation::Documentation SpaceModule::Documentation() {
+    return codegen::doc<Parameters>("module_space");
+}
+
 SpaceModule::SpaceModule()
     : OpenSpaceModule(Name)
     , _showSpiceExceptions(SpiceExceptionInfo, true)
@@ -109,9 +120,8 @@ void SpaceModule::internalInitialize(const ghoul::Dictionary& dictionary) {
 
     fRotation->registerClass<SpiceRotation>("SpiceRotation");
 
-    if (dictionary.hasValue<bool>(SpiceExceptionInfo.identifier)) {
-        _showSpiceExceptions = dictionary.value<bool>(SpiceExceptionInfo.identifier);
-    }
+    const Parameters p = codegen::bake<Parameters>(dictionary);
+    _showSpiceExceptions = p.showExceptions.value_or(_showSpiceExceptions);
 }
 
 void SpaceModule::internalDeinitializeGL() {
diff --git a/modules/space/spacemodule.h b/modules/space/spacemodule.h
index d53f42d0ff..1be7a72470 100644
--- a/modules/space/spacemodule.h
+++ b/modules/space/spacemodule.h
@@ -43,6 +43,7 @@ public:
     static ghoul::opengl::ProgramObjectManager ProgramObjectManager;
 
     scripting::LuaLibrary luaLibrary() const override;
+    static documentation::Documentation Documentation();
 
 private:
     void internalInitialize(const ghoul::Dictionary&) override;
diff --git a/modules/spacecraftinstruments/util/instrumenttimesparser.cpp b/modules/spacecraftinstruments/util/instrumenttimesparser.cpp
index 5dfcaacfc0..b28cfc23f8 100644
--- a/modules/spacecraftinstruments/util/instrumenttimesparser.cpp
+++ b/modules/spacecraftinstruments/util/instrumenttimesparser.cpp
@@ -142,7 +142,7 @@ bool InstrumentTimesParser::create() {
                 };
                 _subsetMap[_target]._subset.push_back(std::move(image));
             }
-            if (successfulRead){
+            if (successfulRead) {
                 _subsetMap[_target]._range.include(instrumentActiveTimeRange);
                 _instrumentTimes.emplace_back(instrumentID, instrumentActiveTimeRange);
             }
diff --git a/modules/sync/syncmodule.cpp b/modules/sync/syncmodule.cpp
index 90ebdbad30..e4e128b826 100644
--- a/modules/sync/syncmodule.cpp
+++ b/modules/sync/syncmodule.cpp
@@ -59,6 +59,10 @@ namespace {
 
 namespace openspace {
 
+documentation::Documentation SyncModule::Documentation() {
+    return codegen::doc<Parameters>("module_sync");
+}
+
 SyncModule::SyncModule() : OpenSpaceModule(Name) {}
 
 void SyncModule::internalInitialize(const ghoul::Dictionary& configuration) {
diff --git a/modules/sync/syncmodule.h b/modules/sync/syncmodule.h
index aeb8899372..b9ea6c5bc2 100644
--- a/modules/sync/syncmodule.h
+++ b/modules/sync/syncmodule.h
@@ -40,8 +40,8 @@ public:
     std::filesystem::path synchronizationRoot() const;
 
     std::vector<documentation::Documentation> documentations() const override;
-
     scripting::LuaLibrary luaLibrary() const override;
+    static documentation::Documentation Documentation();
 
 protected:
     void internalInitialize(const ghoul::Dictionary& configuration) override;
diff --git a/modules/touch/touchmodule.cpp b/modules/touch/touchmodule.cpp
index 5d8c043122..0761db66ac 100644
--- a/modules/touch/touchmodule.cpp
+++ b/modules/touch/touchmodule.cpp
@@ -117,7 +117,7 @@ bool TouchModule::isDefaultDirectTouchType(std::string_view renderableType) cons
         _sortedDefaultRenderableTypes.end();
 }
 
-void TouchModule::internalInitialize(const ghoul::Dictionary&){
+void TouchModule::internalInitialize(const ghoul::Dictionary&) {
     _ear.reset(new TuioEar());
 
     global::callback::initializeGL->push_back([this]() {
diff --git a/modules/toyvolume/rendering/renderabletoyvolume.cpp b/modules/toyvolume/rendering/renderabletoyvolume.cpp
index b59cc5c6d0..3755f9f03a 100644
--- a/modules/toyvolume/rendering/renderabletoyvolume.cpp
+++ b/modules/toyvolume/rendering/renderabletoyvolume.cpp
@@ -25,6 +25,7 @@
 #include <modules/toyvolume/rendering/renderabletoyvolume.h>
 
 #include <modules/toyvolume/rendering/toyvolumeraycaster.h>
+#include <openspace/documentation/documentation.h>
 #include <openspace/engine/globals.h>
 #include <openspace/rendering/renderengine.h>
 #include <openspace/rendering/raycastermanager.h>
@@ -83,6 +84,33 @@ namespace {
         "The downscaling factor used when rendering the current volume.",
         openspace::properties::Property::Visibility::AdvancedUser
     };
+
+    struct [[codegen::Dictionary(RenderableToyVolume)]] Parameters {
+        // [[codegen::verbatim(ScalingExponentInfo.description)]]
+        std::optional<int> scalingExponent;
+
+        // [[codegen::verbatim(SizeInfo.description)]]
+        std::optional<glm::vec3> size;
+
+        // [[codegen::verbatim(TranslationInfo.description)]]
+        std::optional<glm::vec3> translation;
+
+        // [[codegen::verbatim(RotationInfo.description)]]
+        std::optional<glm::vec3> rotation;
+
+        // [[codegen::verbatim(ColorInfo.description)]]
+        std::optional<glm::vec3> color [[codegen::color()]];
+
+        // [[codegen::verbatim(StepSizeInfo.description)]]
+        std::optional<float> stepSize;
+
+        // Raycast steps
+        std::optional<int> steps;
+
+        // [[codegen::verbatim(DownscaleVolumeRenderingInfo.description)]]
+        std::optional<float> downscale;
+    };
+#include "renderabletoyvolume_codegen.cpp"
 } // namespace
 
 namespace openspace {
@@ -102,47 +130,18 @@ RenderableToyVolume::RenderableToyVolume(const ghoul::Dictionary& dictionary)
     , _color(ColorInfo, glm::vec3(1.f, 0.f, 0.f), glm::vec3(0.f), glm::vec3(1.f))
     , _downScaleVolumeRendering(DownscaleVolumeRenderingInfo, 1.f, 0.1f, 1.f)
 {
-    if (dictionary.hasValue<double>(ScalingExponentInfo.identifier)) {
-        _scalingExponent = static_cast<int>(
-            dictionary.value<double>(ScalingExponentInfo.identifier)
-        );
-    }
+    const Parameters p = codegen::bake<Parameters>(dictionary);
 
-    if (dictionary.hasValue<glm::dvec3>(SizeInfo.identifier)) {
-        _size = dictionary.value<glm::dvec3>(SizeInfo.identifier);
-    }
-
-    if (dictionary.hasValue<glm::dvec3>(TranslationInfo.identifier)) {
-        _translation = dictionary.value<glm::dvec3>(TranslationInfo.identifier);
-    }
-
-    if (dictionary.hasValue<glm::dvec3>(RotationInfo.identifier)) {
-        _rotation = dictionary.value<glm::dvec3>(RotationInfo.identifier);
-    }
-
-    if (dictionary.hasValue<glm::dvec3>(ColorInfo.identifier)) {
-        _color = dictionary.value<glm::dvec3>(ColorInfo.identifier);
-    }
-
-    if (dictionary.hasValue<double>(StepSizeInfo.identifier)) {
-        _stepSize = static_cast<float>(dictionary.value<double>(StepSizeInfo.identifier));
-    }
+    _scalingExponent = p.scalingExponent.value_or(_scalingExponent);
+    _size = p.size.value_or(_size);
+    _translation = p.translation.value_or(_translation);
+    _rotation = p.rotation.value_or(_rotation);
+    _color = p.color.value_or(_color);
+    _stepSize = p.stepSize.value_or(_stepSize);
+    _rayCastSteps = p.steps.value_or(_rayCastSteps);
 
     _downScaleVolumeRendering.setVisibility(properties::Property::Visibility::Developer);
-    if (dictionary.hasKey("Downscale")) {
-        _downScaleVolumeRendering = static_cast<float>(
-            dictionary.value<double>("Downscale")
-        );
-    }
-
-    if (dictionary.hasKey("Steps")) {
-        _rayCastSteps = static_cast<int>(dictionary.value<double>("Steps"));
-    }
-    else {
-        LINFO(
-            "Number of raycasting steps not specified for ToyVolume. Using default value"
-        );
-    }
+    _downScaleVolumeRendering = p.downscale.value_or(_downScaleVolumeRendering);
 }
 
 RenderableToyVolume::~RenderableToyVolume() {}
diff --git a/modules/video/src/screenspacevideo.cpp b/modules/video/src/screenspacevideo.cpp
index 637a2600bc..5e1590dab8 100644
--- a/modules/video/src/screenspacevideo.cpp
+++ b/modules/video/src/screenspacevideo.cpp
@@ -41,7 +41,6 @@ documentation::Documentation ScreenSpaceVideo::Documentation() {
     documentation::Documentation doc = VideoPlayer::Documentation();
     doc.name = "ScreenSpaceVideo";
     doc.id = "video_screenspacevideo";
-
     return doc;
 }
 
diff --git a/modules/video/videomodule.cpp b/modules/video/videomodule.cpp
index b15d8d91a7..d30c93740e 100644
--- a/modules/video/videomodule.cpp
+++ b/modules/video/videomodule.cpp
@@ -50,6 +50,10 @@ namespace {
 
 namespace openspace {
 
+documentation::Documentation VideoModule::Documentation() {
+    return codegen::doc<Parameters>("module_video");
+}
+
 VideoModule::VideoModule()
     : OpenSpaceModule(VideoModule::Name)
     , _enabled(EnabledInfo)
diff --git a/modules/video/videomodule.h b/modules/video/videomodule.h
index ec425df31f..198dfae3b1 100644
--- a/modules/video/videomodule.h
+++ b/modules/video/videomodule.h
@@ -38,6 +38,7 @@ public:
     VideoModule();
 
     std::vector<documentation::Documentation> documentations() const override;
+    static documentation::Documentation Documentation();
 
 protected:
     void internalInitialize(const ghoul::Dictionary& dict) override;
diff --git a/modules/volume/rendering/volumeclipplane.cpp b/modules/volume/rendering/volumeclipplane.cpp
index 3f84fd7d3d..64586eb688 100644
--- a/modules/volume/rendering/volumeclipplane.cpp
+++ b/modules/volume/rendering/volumeclipplane.cpp
@@ -24,29 +24,57 @@
 
 #include <modules/volume/rendering/volumeclipplanes.h>
 
+#include <openspace/documentation/documentation.h>
 #include <ghoul/misc/dictionary.h>
 
+namespace {
+    constexpr openspace::properties::Property::PropertyInfo NormalInfo = {
+        "Normal",
+        "Normal",
+        // @TODO Missing documentation
+        ""
+    };
+
+    constexpr openspace::properties::Property::PropertyInfo OffsetsInfo = {
+        "Offsets",
+        "Offsets",
+        // @TODO Missing documentation
+        ""
+    };
+
+    struct [[codegen::Dictionary(VolumeClipPlane)]] Parameters {
+        // [[codegen::verbatim(NormalInfo.description)]]
+        glm::vec3 normal;
+
+        // [[codegen::verbatim(OffsetsInfo.description)]]
+        glm::vec3 offsets;
+    };
+#include "volumeclipplane_codegen.cpp"
+} // namespace
+
 namespace openspace::volume {
 
 VolumeClipPlane::VolumeClipPlane(const ghoul::Dictionary& dictionary)
     : properties::PropertyOwner({ "" }) // @TODO Missing name
     , _normal(
-        { "Normal", "Normal", "" }, // @TODO Missing documentation
+        NormalInfo, 
         glm::vec3(1.f, 0.f, 0.f),
         glm::vec3(-1.f),
         glm::vec3(1.f)
     )
     , _offsets(
-        { "Offsets", "Offsets", "" }, // @TODO Missing documentation
+        OffsetsInfo,
         glm::vec2(-2.f, 0.f),
         glm::vec2(-2.f, 0.f),
         glm::vec2(2.f, 1.f)
     )
 {
-    _normal = dictionary.value<glm::dvec3>("Normal");
-    _offsets = dictionary.value<glm::dvec2>("Offsets");
+    const Parameters p = codegen::bake<Parameters>(dictionary);
 
+    _normal = p.normal;
     addProperty(_normal);
+
+    _offsets = p.offsets;
     addProperty(_offsets);
 }
 
diff --git a/modules/webbrowser/src/browserclient.cpp b/modules/webbrowser/src/browserclient.cpp
index bdb6868395..b266437944 100644
--- a/modules/webbrowser/src/browserclient.cpp
+++ b/modules/webbrowser/src/browserclient.cpp
@@ -82,10 +82,9 @@ bool BrowserClient::NoContextMenuHandler::RunContextMenu(CefRefPtr<CefBrowser>,
     return true;
 }
 
-bool BrowserClient::DisplayHandler::OnCursorChange(CefRefPtr<CefBrowser> browser,
-                                                  CefCursorHandle,
-                                                  cef_cursor_type_t type,
-                                                  const CefCursorInfo&)
+bool BrowserClient::DisplayHandler::OnCursorChange(CefRefPtr<CefBrowser>, CefCursorHandle,
+                                                   cef_cursor_type_t type,
+                                                   const CefCursorInfo&)
 {
     WindowDelegate::Cursor newCursor;
     switch (type) {
diff --git a/modules/webbrowser/src/screenspacebrowser.cpp b/modules/webbrowser/src/screenspacebrowser.cpp
index 78ccc956fb..b5ae4ce420 100644
--- a/modules/webbrowser/src/screenspacebrowser.cpp
+++ b/modules/webbrowser/src/screenspacebrowser.cpp
@@ -96,9 +96,9 @@ documentation::Documentation ScreenSpaceBrowser::Documentation() {
 ScreenSpaceBrowser::ScreenSpaceBrowser(const ghoul::Dictionary& dictionary)
     : ScreenSpaceRenderable(dictionary)
     , _dimensions(DimensionsInfo, glm::uvec2(0), glm::uvec2(0), glm::uvec2(3000))
+    , _renderHandler(new ScreenSpaceRenderHandler)
     , _url(UrlInfo)
     , _reload(ReloadInfo)
-    , _renderHandler(new ScreenSpaceRenderHandler)
     , _keyboardHandler(new WebKeyboardHandler)
 {
     const Parameters p = codegen::bake<Parameters>(dictionary);
diff --git a/modules/webbrowser/src/webrenderhandler.cpp b/modules/webbrowser/src/webrenderhandler.cpp
index f3bc9b6c54..6f70042979 100644
--- a/modules/webbrowser/src/webrenderhandler.cpp
+++ b/modules/webbrowser/src/webrenderhandler.cpp
@@ -27,11 +27,6 @@
 #include <ghoul/glm.h>
 #include <ghoul/logging/logmanager.h>
 
-namespace {
-    constexpr std::string_view _loggerCat = "WebRenderHandler";
-} // namespace
-
-
 namespace openspace {
 
 WebRenderHandler::WebRenderHandler(bool accelerate)
@@ -259,7 +254,7 @@ bool WebRenderHandler::hasContent(int x, int y) {
         glBindTexture(GL_TEXTURE_2D, _texture);
 
         // Read the texture data into the PBO
-        glGetTexImage(GL_TEXTURE_2D, 0, GL_RGBA, GL_UNSIGNED_BYTE, 0);
+        glGetTexImage(GL_TEXTURE_2D, 0, GL_RGBA, GL_UNSIGNED_BYTE, nullptr);
 
         // Map the PBO to the CPU memory space
         GLubyte* pixels = reinterpret_cast<GLubyte*>(
diff --git a/modules/webbrowser/webbrowsermodule.cpp b/modules/webbrowser/webbrowsermodule.cpp
index 7628edc62a..750e3342e5 100644
--- a/modules/webbrowser/webbrowsermodule.cpp
+++ b/modules/webbrowser/webbrowsermodule.cpp
@@ -90,10 +90,29 @@ namespace {
         return execLocation;
     }
 
+    struct [[codegen::Dictionary(WebBrowserModule)]] Parameters {
+        // The location of the web helper application
+        std::optional<std::filesystem::path> webHelperLocation;
+
+        // Determines whether the WebBrowser module is enabled
+        std::optional<bool> enabled;
+
+        // [[codegen::verbatim(UpdateBrowserBetweenRenderablesInfo.description)]]
+        std::optional<bool> updateBrowserBetweenRenderables;
+
+        // [[codegen::verbatim(BrowserUpdateIntervalInfo.description)]]
+        std::optional<float> browserUpdateInterval;
+    };
+#include "webbrowsermodule_codegen.cpp"
+
 } // namespace
 
 namespace openspace {
 
+documentation::Documentation WebBrowserModule::Documentation() {
+    return codegen::doc<Parameters>("module_webbrowser");
+}
+
 WebBrowserModule::WebBrowserModule()
     : OpenSpaceModule(WebBrowserModule::Name)
     , _updateBrowserBetweenRenderables(UpdateBrowserBetweenRenderablesInfo, true)
@@ -127,6 +146,31 @@ WebBrowserModule::WebBrowserModule()
 
 WebBrowserModule::~WebBrowserModule() {}
 
+void WebBrowserModule::internalInitialize(const ghoul::Dictionary& dictionary) {
+    ZoneScoped;
+
+    const Parameters p = codegen::bake<Parameters>(dictionary);
+
+    _webHelperLocation = p.webHelperLocation.value_or(findHelperExecutable());
+    _enabled = p.enabled.value_or(_enabled);
+
+    LDEBUG(std::format("CEF using web helper executable: {}", _webHelperLocation));
+    _cefHost = std::make_unique<CefHost>(_webHelperLocation.string());
+    LDEBUG("Starting CEF... done");
+
+    _updateBrowserBetweenRenderables =
+        p.updateBrowserBetweenRenderables.value_or(_updateBrowserBetweenRenderables);
+    _browserUpdateInterval = p.browserUpdateInterval.value_or(_browserUpdateInterval);
+
+    _eventHandler->initialize();
+
+    // register ScreenSpaceBrowser
+    ghoul::TemplateFactory<ScreenSpaceRenderable>* fScreenSpaceRenderable =
+        FactoryManager::ref().factory<ScreenSpaceRenderable>();
+    ghoul_assert(fScreenSpaceRenderable, "ScreenSpaceRenderable factory was not created");
+    fScreenSpaceRenderable->registerClass<ScreenSpaceBrowser>("ScreenSpaceBrowser");
+}
+
 void WebBrowserModule::internalDeinitialize() {
     ZoneScoped;
 
@@ -142,44 +186,6 @@ void WebBrowserModule::internalDeinitialize() {
     }
 }
 
-void WebBrowserModule::internalInitialize(const ghoul::Dictionary& dictionary) {
-    ZoneScoped;
-
-    if (dictionary.hasValue<bool>("WebHelperLocation")) {
-        _webHelperLocation = absPath(dictionary.value<std::string>("WebHelperLocation"));
-    }
-    else {
-        _webHelperLocation = findHelperExecutable();
-    }
-
-    if (dictionary.hasValue<bool>("Enabled")) {
-        _enabled = dictionary.value<bool>("Enabled");
-    }
-
-    LDEBUG(std::format("CEF using web helper executable: {}", _webHelperLocation));
-    _cefHost = std::make_unique<CefHost>(_webHelperLocation.string());
-    LDEBUG("Starting CEF... done");
-
-    if (dictionary.hasValue<bool>(UpdateBrowserBetweenRenderablesInfo.identifier)) {
-        _updateBrowserBetweenRenderables =
-            dictionary.value<bool>(UpdateBrowserBetweenRenderablesInfo.identifier);
-    }
-
-    if (dictionary.hasValue<double>(BrowserUpdateIntervalInfo.identifier)) {
-        _browserUpdateInterval = static_cast<float>(
-            dictionary.value<double>(BrowserUpdateIntervalInfo.identifier)
-        );
-    }
-
-    _eventHandler->initialize();
-
-    // register ScreenSpaceBrowser
-    ghoul::TemplateFactory<ScreenSpaceRenderable>* fScreenSpaceRenderable =
-        FactoryManager::ref().factory<ScreenSpaceRenderable>();
-    ghoul_assert(fScreenSpaceRenderable, "ScreenSpaceRenderable factory was not created");
-    fScreenSpaceRenderable->registerClass<ScreenSpaceBrowser>("ScreenSpaceBrowser");
-}
-
 void WebBrowserModule::addBrowser(BrowserInstance* browser) {
     ZoneScoped;
 
diff --git a/modules/webbrowser/webbrowsermodule.h b/modules/webbrowser/webbrowsermodule.h
index 7d595c5497..2938bfff73 100644
--- a/modules/webbrowser/webbrowsermodule.h
+++ b/modules/webbrowser/webbrowsermodule.h
@@ -61,6 +61,7 @@ public:
     static bool canUseAcceleratedRendering();
 
     std::vector<documentation::Documentation> documentations() const override;
+    static documentation::Documentation Documentation();
 
 protected:
     void internalInitialize(const ghoul::Dictionary& dictionary) override;
diff --git a/modules/webgui/webguimodule.cpp b/modules/webgui/webguimodule.cpp
index 94edb9e439..fc62990103 100644
--- a/modules/webgui/webguimodule.cpp
+++ b/modules/webgui/webguimodule.cpp
@@ -119,6 +119,10 @@ namespace {
 
 namespace openspace {
 
+documentation::Documentation WebGuiModule::Documentation() {
+    return codegen::doc<Parameters>("module_webgui");
+}
+
 WebGuiModule::WebGuiModule()
     : OpenSpaceModule(WebGuiModule::Name)
     , _enabled(ServerProcessEnabledInfo, true)
diff --git a/modules/webgui/webguimodule.h b/modules/webgui/webguimodule.h
index c7972b8144..c40481e26f 100644
--- a/modules/webgui/webguimodule.h
+++ b/modules/webgui/webguimodule.h
@@ -50,6 +50,8 @@ public:
     CallbackHandle addEndpointChangeCallback(EndpointCallback cb);
     void removeEndpointChangeCallback(CallbackHandle);
 
+    static documentation::Documentation Documentation();
+
 protected:
     void internalInitialize(const ghoul::Dictionary&) override;
 
diff --git a/openspace.cfg b/openspace.cfg
index a8eb2e3524..576edf3268 100644
--- a/openspace.cfg
+++ b/openspace.cfg
@@ -139,7 +139,6 @@ ModuleConfigurations = {
         }
     },
     Server = {
-        AllowAddresses = { "127.0.0.1", "localhost" },
         SkyBrowserUpdateTime = 50,
         Interfaces = {
             {
@@ -148,6 +147,7 @@ ModuleConfigurations = {
                 Port = 4681,
                 Enabled = true,
                 DefaultAccess = "Deny",
+                AllowAddresses = { "127.0.0.1", "localhost" },
                 RequirePasswordAddresses = {},
                 Password = ""
             },
@@ -157,6 +157,7 @@ ModuleConfigurations = {
                 Port = 4682,
                 Enabled = true,
                 DefaultAccess = "Deny",
+                AllowAddresses = { "127.0.0.1", "localhost" },
                 RequirePasswordAddresses = {},
                 Password = ""
             }
diff --git a/src/documentation/documentation.cpp b/src/documentation/documentation.cpp
index c66e45de23..74f92f8e02 100644
--- a/src/documentation/documentation.cpp
+++ b/src/documentation/documentation.cpp
@@ -178,10 +178,11 @@ void logError(const SpecificationError& error, std::string component) {
 }
 
 DocumentationEntry::DocumentationEntry(std::string k, std::shared_ptr<Verifier> v,
-                                       Optional opt, std::string doc)
+                                       Optional opt, Private priv, std::string doc)
     : key(std::move(k))
     , verifier(std::move(v))
     , optional(opt)
+    , isPrivate(priv)
     , documentation(std::move(doc))
 {
     ghoul_assert(!key.empty(), "Key must not be empty");
@@ -189,8 +190,8 @@ DocumentationEntry::DocumentationEntry(std::string k, std::shared_ptr<Verifier>
 }
 
 DocumentationEntry::DocumentationEntry(std::string k, Verifier* v, Optional opt,
-                                       std::string doc)
-    : DocumentationEntry(std::move(k), std::shared_ptr<Verifier>(v), opt,
+                                       Private priv, std::string doc)
+    : DocumentationEntry(std::move(k), std::shared_ptr<Verifier>(v), opt, priv,
                          std::move(doc))
 {}
 
diff --git a/src/documentation/verifier.cpp b/src/documentation/verifier.cpp
index 7c85cecbdc..3ca10c8208 100644
--- a/src/documentation/verifier.cpp
+++ b/src/documentation/verifier.cpp
@@ -689,7 +689,13 @@ std::string TableVerifier::type() const {
 
 StringListVerifier::StringListVerifier(std::string elementDocumentation)
     : TableVerifier({
-        { "*", new StringVerifier, Optional::No, std::move(elementDocumentation) }
+        {
+            "*",
+            new StringVerifier,
+            Optional::No,
+            Private::No,
+            std::move(elementDocumentation)
+        }
     })
 {}
 
@@ -699,7 +705,13 @@ std::string StringListVerifier::type() const {
 
 IntListVerifier::IntListVerifier(std::string elementDocumentation)
     : TableVerifier({
-        { "*", new IntVerifier, Optional::No, std::move(elementDocumentation) }
+        {
+            "*",
+            new IntVerifier,
+            Optional::No,
+            Private::No,
+            std::move(elementDocumentation)
+        }
     })
 {}
 
diff --git a/src/engine/configuration.cpp b/src/engine/configuration.cpp
index 76458a7802..a9edfefd71 100644
--- a/src/engine/configuration.cpp
+++ b/src/engine/configuration.cpp
@@ -25,7 +25,9 @@
 #include <openspace/engine/configuration.h>
 
 #include <openspace/documentation/documentation.h>
+#include <openspace/engine/globals.h>
 #include <openspace/engine/settings.h>
+#include <openspace/engine/moduleengine.h>
 #include <ghoul/filesystem/file.h>
 #include <ghoul/filesystem/filesystem.h>
 #include <ghoul/logging/logmanager.h>
@@ -327,9 +329,6 @@ namespace {
         // Values in this table describe the behavior of the loading screen that is
         // displayed while the scene graph is created and initialized
         std::optional<LoadingScreen> loadingScreen;
-
-        // Configurations for each module
-        std::optional<std::map<std::string, ghoul::Dictionary>> moduleConfigurations;
     };
 #include "configuration_codegen.cpp"
 } // namespace
@@ -522,9 +521,7 @@ void parseLuaState(Configuration& configuration) {
 
     // We go through all of the entries and lift them from global scope into the table on
     // the stack so that we can create a ghoul::Dictionary from this new table
-    const documentation::Documentation doc = codegen::doc<Parameters>(
-        "core_configuration"
-    );
+    const documentation::Documentation doc = Configuration::Documentation();
     for (const documentation::DocumentationEntry& e : doc.entries) {
         lua_pushstring(s, e.key.c_str());
         lua_getglobal(s, e.key.c_str());
@@ -611,7 +608,14 @@ void parseLuaState(Configuration& configuration) {
             l.showLogMessages.value_or(c.loadingScreen.isShowingLogMessages);
     }
 
-    c.moduleConfigurations = p.moduleConfigurations.value_or(c.moduleConfigurations);
+    // ModuleConfigurations depend on the list of modules that are added, which has to be
+    // done dynamically. Hence we can't have it written directly into the struct
+    if (d.hasValue<ghoul::Dictionary>("ModuleConfigurations")) {
+        ghoul::Dictionary dict = d.value<ghoul::Dictionary>("ModuleConfigurations");
+        for (std::string_view key : dict.keys()) {
+            c.moduleConfigurations[std::string(key)] = dict.value<ghoul::Dictionary>(key);
+        }
+    }
 
     if (p.openGLDebugContext.has_value()) {
         const Parameters::OpenGLDebugContext& l = *p.openGLDebugContext;
@@ -691,8 +695,38 @@ void patchConfiguration(Configuration& configuration, const Settings& settings)
     }
 }
 
-documentation::Documentation Configuration::Documentation =
-    codegen::doc<Parameters>("core_configuration");
+documentation::Documentation Configuration::Documentation() {
+    using namespace documentation;
+
+    documentation::Documentation doc = codegen::doc<Parameters>("core_configuration");
+
+    auto moduleConfiguration = std::make_shared<TableVerifier>();
+    for (OpenSpaceModule* mod : global::moduleEngine->modules()) {
+        std::string name = mod->identifier();
+        std::string id = mod->Documentation().id;
+
+        if (id.empty()) {
+            continue;
+        }
+
+        moduleConfiguration->documentations.push_back({
+            name,
+            new ReferencingVerifier(id),
+            Optional::Yes,
+            Private::No,
+            mod->Documentation().description
+        });
+    }
+    doc.entries.push_back({
+        "ModuleConfigurations",
+        std::move(moduleConfiguration),
+        Optional::Yes,
+        Private::No,
+        "Configurations for each module"
+    });
+
+    return doc;
+}
 
 std::filesystem::path findConfiguration(const std::string& filename) {
     std::filesystem::path directory = absPath("${BIN}");
diff --git a/src/engine/moduleengine.cpp b/src/engine/moduleengine.cpp
index 0621df1589..5edb772d9a 100644
--- a/src/engine/moduleengine.cpp
+++ b/src/engine/moduleengine.cpp
@@ -185,4 +185,8 @@ scripting::LuaLibrary ModuleEngine::luaLibrary() {
     };
 }
 
+std::vector<documentation::Documentation> ModuleEngine::moduleDocumentations() const {
+    return AllModuleDocumentation();
+}
+
 } // namespace openspace
diff --git a/src/engine/openspaceengine.cpp b/src/engine/openspaceengine.cpp
index 4bfd4e8662..ac7d32ca34 100644
--- a/src/engine/openspaceengine.cpp
+++ b/src/engine/openspaceengine.cpp
@@ -404,12 +404,15 @@ void OpenSpaceEngine::initialize() {
 
     // After registering the modules, the documentations for the available classes
     // can be added as well
+    for (documentation::Documentation d : global::moduleEngine->moduleDocumentations()) {
+        DocEng.addDocumentation(std::move(d));
+    }
     for (OpenSpaceModule* m : global::moduleEngine->modules()) {
         for (const documentation::Documentation& doc : m->documentations()) {
             DocEng.addDocumentation(doc);
         }
     }
-    DocEng.addDocumentation(Configuration::Documentation);
+    DocEng.addDocumentation(Configuration::Documentation());
 
     // Register the provided shader directories
     ghoul::opengl::ShaderPreprocessor::addIncludePath(absPath("${SHADERS}"));
diff --git a/src/interaction/tasks/convertrecfileversiontask.cpp b/src/interaction/tasks/convertrecfileversiontask.cpp
index 930f7a0112..f309eab39e 100644
--- a/src/interaction/tasks/convertrecfileversiontask.cpp
+++ b/src/interaction/tasks/convertrecfileversiontask.cpp
@@ -107,6 +107,7 @@ documentation::Documentation ConvertRecFileVersionTask::documentation() {
                 "InputFilePath",
                 new StringAnnotationVerifier("A valid filename to convert"),
                 Optional::No,
+                Private::No,
                 "The filename to update to the current file format",
             },
         },
diff --git a/src/interaction/tasks/convertrecformattask.cpp b/src/interaction/tasks/convertrecformattask.cpp
index 52c7e47def..d7f19fe300 100644
--- a/src/interaction/tasks/convertrecformattask.cpp
+++ b/src/interaction/tasks/convertrecformattask.cpp
@@ -314,12 +314,14 @@ documentation::Documentation ConvertRecFormatTask::documentation() {
                 "InputFilePath",
                 new StringAnnotationVerifier("A valid filename to convert"),
                 Optional::No,
+                Private::No,
                 "The filename to convert to the opposite format",
             },
             {
                 "OutputFilePath",
                 new StringAnnotationVerifier("A valid output filename"),
                 Optional::No,
+                Private::No,
                 "The filename containing the converted result",
             },
         },
diff --git a/src/network/parallelpeer.cpp b/src/network/parallelpeer.cpp
index 8d2c13c7a8..d5be7e52f3 100644
--- a/src/network/parallelpeer.cpp
+++ b/src/network/parallelpeer.cpp
@@ -127,10 +127,10 @@ ParallelPeer::ParallelPeer()
     : properties::PropertyOwner({ "ParallelPeer", "Parallel Peer" })
     , _password(PasswordInfo)
     , _hostPassword(HostPasswordInfo)
+    , _serverName(ServerNameInfo)
     , _port(PortInfo)
     , _address(AddressInfo)
     , _name(NameInfo)
-    , _serverName(ServerNameInfo)
     , _bufferTime(BufferTimeInfo, 0.2f, 0.01f, 5.0f)
     , _timeKeyframeInterval(TimeKeyFrameInfo, 0.1f, 0.f, 1.f)
     , _cameraKeyframeInterval(CameraKeyFrameInfo, 0.1f, 0.f, 1.f)
diff --git a/src/rendering/transferfunction.cpp b/src/rendering/transferfunction.cpp
index 232437a9c5..79e1458ac5 100644
--- a/src/rendering/transferfunction.cpp
+++ b/src/rendering/transferfunction.cpp
@@ -129,7 +129,7 @@ void TransferFunction::setTextureFromTxt() {
             float intensity = 0.f;
             glm::vec4 rgba;
             iss >> intensity;
-            for(int i = 0; i < 4; i++) {
+            for (int i = 0; i < 4; i++) {
                 iss >> rgba[i];
             }
             mappingKeys.emplace_back(intensity, rgba);
diff --git a/src/util/histogram.cpp b/src/util/histogram.cpp
index 3f96709933..3e20ba4a11 100644
--- a/src/util/histogram.cpp
+++ b/src/util/histogram.cpp
@@ -86,7 +86,7 @@ bool Histogram::add(float value, float repeat) {
     return true;
 }
 
-void Histogram::changeRange(float minValue, float maxValue){
+void Histogram::changeRange(float minValue, float maxValue) {
     if (minValue > _minValue && maxValue < _maxValue) {
         return;
     }
@@ -96,7 +96,7 @@ void Histogram::changeRange(float minValue, float maxValue){
     const float oldMax = _maxValue;
 
     float* newData = new float[_numBins]{0.0};
-    for(int i=0; i<_numBins; i++){
+    for (int i = 0; i < _numBins; i++) {
         const float unNormalizedValue = i * (oldMax - oldMin) + oldMin;
         const float normalizedValue = (unNormalizedValue - _minValue) /
                                       (_maxValue - _minValue);      // [0.0, 1.0]
@@ -297,7 +297,7 @@ void Histogram::print() const {
     //// std::cout << std::endl << std::endl << std::endl<< "==============" << std::endl;
 }
 
-float Histogram::highestBinValue(bool equalized, int overBins){
+float Histogram::highestBinValue(bool equalized, int overBins) {
     int highestBin = 0;
     float highestValue = 0;
 
diff --git a/src/util/openspacemodule.cpp b/src/util/openspacemodule.cpp
index 3200400660..1fb76804b8 100644
--- a/src/util/openspacemodule.cpp
+++ b/src/util/openspacemodule.cpp
@@ -89,6 +89,10 @@ std::vector<documentation::Documentation> OpenSpaceModule::documentations() cons
     return {};
 }
 
+documentation::Documentation OpenSpaceModule::Documentation() {
+    return {};
+}
+
 scripting::LuaLibrary OpenSpaceModule::luaLibrary() const {
     return {};
 }
diff --git a/src/util/touch.cpp b/src/util/touch.cpp
index e24e5ac33e..aed365a87d 100644
--- a/src/util/touch.cpp
+++ b/src/util/touch.cpp
@@ -98,7 +98,7 @@ bool TouchInputHolder::tryAddInput(TouchInput input) {
         _inputs.emplace_front(input);
         successful = true;
     }
-    else if (!sameTimeAsLastInput){
+    else if (!sameTimeAsLastInput) {
         _inputs.front().timestamp = input.timestamp;
         successful = true;
     }
diff --git a/support/cmake/module_documentation.template b/support/cmake/module_documentation.template
new file mode 100644
index 0000000000..bf03dc8a78
--- /dev/null
+++ b/support/cmake/module_documentation.template
@@ -0,0 +1,15 @@
+// This file has been auto-generated by CMake based on
+// support/cmake/module_documentation.template
+// Do not change this file manually
+
+#ifndef __MODULE_DOCUMENTATION_H__
+#define __MODULE_DOCUMENTATION_H__
+
+namespace {
+    struct [[codegen::Dictionary(ModuleConfiguration)]] Parameters {
+@MODULE_DOCUMENTATION_CODEGEN@
+    };
+#include "moduledocumentation_codegen.cpp"
+} // namespace
+
+#endif // __MODULE_DOCUMENTATION_H__
diff --git a/support/cmake/module_path.template b/support/cmake/module_path.template
deleted file mode 100644
index b2fd07b548..0000000000
--- a/support/cmake/module_path.template
+++ /dev/null
@@ -1,19 +0,0 @@
-// This file has been auto-generated by CMake based on
-// support/cmake/module_path.template
-// Do not change this file manually
-
-#ifndef __MODULE_PATH_H__
-#define __MODULE_PATH_H__
-
-namespace openspace {
-
-constexpr std::string_view ModulePaths[] = {
-    // We need the empty string here or otherwise ModulePaths might be empty and thus
-    // cause a compiler error
-    "",
-@MODULE_PATHS@
-};
-
-} // namespace openspace
-
-#endif // __MODULE_PATH_H__
diff --git a/support/cmake/module_registration.template b/support/cmake/module_registration.template
index e9f2a382a9..4b95a58ae2 100644
--- a/support/cmake/module_registration.template
+++ b/support/cmake/module_registration.template
@@ -8,11 +8,16 @@
 @MODULE_HEADERS@
 namespace openspace {
 
-auto AllModules = []() -> std::vector<OpenSpaceModule*> {
+constexpr auto AllModules = []() -> std::vector<OpenSpaceModule*> {
     return {
 @MODULE_CLASSES@    };
 };
 
+constexpr auto AllModuleDocumentation = []() -> std::vector<documentation::Documentation> {
+    return {
+@MODULE_DOCUMENTATION@    };
+};
+
 } // namespace openspace
 
 #endif // __MODULE_REGISTRATION_H__
diff --git a/support/coding/codegen b/support/coding/codegen
index 32f22c537e..5e85e1ab58 160000
--- a/support/coding/codegen
+++ b/support/coding/codegen
@@ -1 +1 @@
-Subproject commit 32f22c537eb855a36f72fd3c1c39d9318e116238
+Subproject commit 5e85e1ab581bfe0cded3cb4d7dfae3cb24a435de
diff --git a/tests/test_documentation.cpp b/tests/test_documentation.cpp
index 35f53fc078..6372d89423 100644
--- a/tests/test_documentation.cpp
+++ b/tests/test_documentation.cpp
@@ -37,241 +37,71 @@ TEST_CASE("Documentation: Constructor", "[documentation]") {
     Documentation doc;
 
     // Basic Verifiers
-    doc.entries.emplace_back(
-        "BoolVerifier",
-        new BoolVerifier,
-        Optional::No
-    );
-    doc.entries.emplace_back(
-        "DoubleVerifier",
-        new DoubleVerifier,
-        Optional::No
-    );
-    doc.entries.emplace_back(
-        "IntVerifier",
-        new IntVerifier,
-        Optional::No
-    );
-    doc.entries.emplace_back(
-        "StringVerifier",
-        new StringVerifier,
-        Optional::No
-    );
-    doc.entries.emplace_back(
-        "IdentifierVerifier",
-        new IdentifierVerifier,
-        Optional::No
-    );
-    doc.entries.emplace_back(
-        "FileVerifier",
-        new FileVerifier,
-        Optional::No
-    );
-    doc.entries.emplace_back(
-        "DirectoryVerifier",
-        new DirectoryVerifier,
-        Optional::No
-    );
-    doc.entries.emplace_back(
-        "DateTimeVerifier",
-        new DateTimeVerifier,
-        Optional::No
-    );
-    doc.entries.emplace_back(
-        "TableVerifier",
-        new TableVerifier,
-        Optional::No
-    );
+    doc.entries.emplace_back("BoolVerifier", new BoolVerifier);
+    doc.entries.emplace_back("DoubleVerifier", new DoubleVerifier);
+    doc.entries.emplace_back("IntVerifier", new IntVerifier);
+    doc.entries.emplace_back("StringVerifier", new StringVerifier);
+    doc.entries.emplace_back("IdentifierVerifier", new IdentifierVerifier);
+    doc.entries.emplace_back("FileVerifier", new FileVerifier);
+    doc.entries.emplace_back("DirectoryVerifier", new DirectoryVerifier);
+    doc.entries.emplace_back("DateTimeVerifier", new DateTimeVerifier);
+    doc.entries.emplace_back("TableVerifier", new TableVerifier);
 
     // Operator Verifiers
-    doc.entries.emplace_back(
-        "LessDouble",
-        new DoubleLessVerifier(0.0),
-        Optional::No
-    );
-    doc.entries.emplace_back(
-        "LessInt",
-        new IntLessVerifier(0),
-        Optional::No
-    );
-    doc.entries.emplace_back(
-        "LessEqualDouble",
-        new DoubleLessEqualVerifier(0.0),
-        Optional::No
-    );
-    doc.entries.emplace_back(
-        "LessEqualInt",
-        new IntLessEqualVerifier(0),
-        Optional::No
-    );
+    doc.entries.emplace_back("LessDouble", new DoubleLessVerifier(0.0));
+    doc.entries.emplace_back("LessInt", new IntLessVerifier(0));
+    doc.entries.emplace_back("LessEqualDouble", new DoubleLessEqualVerifier(0.0));
+    doc.entries.emplace_back("LessEqualInt", new IntLessEqualVerifier(0));
 
-    doc.entries.emplace_back(
-        "GreaterDouble",
-        new DoubleGreaterVerifier(0.0),
-        Optional::No
-    );
-    doc.entries.emplace_back(
-        "GreaterInt",
-        new IntGreaterVerifier(0),
-        Optional::No
-    );
+    doc.entries.emplace_back("GreaterDouble", new DoubleGreaterVerifier(0.0));
+    doc.entries.emplace_back("GreaterInt", new IntGreaterVerifier(0));
 
-    doc.entries.emplace_back(
-        "GreaterEqualDouble",
-        new DoubleGreaterEqualVerifier(0.0),
-        Optional::No
-    );
-    doc.entries.emplace_back(
-        "GreaterEqualInt",
-        new IntGreaterEqualVerifier(0),
-        Optional::No
-    );
+    doc.entries.emplace_back("GreaterEqualDouble", new DoubleGreaterEqualVerifier(0.0));
+    doc.entries.emplace_back("GreaterEqualInt", new IntGreaterEqualVerifier(0));
 
-    doc.entries.emplace_back(
-        "EqualBool",
-        new BoolEqualVerifier(false),
-        Optional::No
-    );
-    doc.entries.emplace_back(
-        "EqualDouble",
-        new DoubleEqualVerifier(0.0),
-        Optional::No
-     );
-    doc.entries.emplace_back(
-        "EqualInt",
-        new IntEqualVerifier(0),
-        Optional::No
-    );
-    doc.entries.emplace_back(
-        "EqualString",
-        new StringEqualVerifier(""),
-        Optional::No
-    );
+    doc.entries.emplace_back("EqualBool", new BoolEqualVerifier(false));
+    doc.entries.emplace_back("EqualDouble", new DoubleEqualVerifier(0.0));
+    doc.entries.emplace_back("EqualInt", new IntEqualVerifier(0));
+    doc.entries.emplace_back("EqualString", new StringEqualVerifier(""));
 
-    doc.entries.emplace_back(
-        "UnequalBool",
-        new BoolUnequalVerifier(false),
-        Optional::No
-    );
-    doc.entries.emplace_back(
-        "UnequalDouble",
-        new DoubleUnequalVerifier(0.0),
-        Optional::No
-    );
-    doc.entries.emplace_back(
-        "UnequalInt",
-        new IntUnequalVerifier(0),
-        Optional::No
-    );
-    doc.entries.emplace_back(
-        "UnequalString",
-        new StringUnequalVerifier(""),
-        Optional::No
-    );
+    doc.entries.emplace_back("UnequalBool", new BoolUnequalVerifier(false));
+    doc.entries.emplace_back("UnequalDouble", new DoubleUnequalVerifier(0.0));
+    doc.entries.emplace_back("UnequalInt", new IntUnequalVerifier(0));
+    doc.entries.emplace_back("UnequalString", new StringUnequalVerifier(""));
 
     // List Verifiers
-    doc.entries.emplace_back(
-        "InListBool",
-        new BoolInListVerifier({ true, false }),
-        Optional::No
-    );
-    doc.entries.emplace_back(
-        "InListDouble",
-        new DoubleInListVerifier({ 0.0, 1.0}),
-        Optional::No
-    );
-    doc.entries.emplace_back(
-        "InListInt",
-        new IntInListVerifier({ 0, 1 }),
-        Optional::No
-    );
-    doc.entries.emplace_back(
-        "InListString",
-        new StringInListVerifier({ "", "a" }),
-        Optional::No
-    );
+    doc.entries.emplace_back("InListBool", new BoolInListVerifier({ true, false }));
+    doc.entries.emplace_back("InListDouble", new DoubleInListVerifier({ 0.0, 1.0 }));
+    doc.entries.emplace_back("InListInt", new IntInListVerifier({ 0, 1 }));
+    doc.entries.emplace_back("InListString", new StringInListVerifier({ "", "a" }));
 
-    doc.entries.emplace_back(
-        "NotInListBool",
-        new BoolNotInListVerifier({ true, false }),
-        Optional::No
-    );
+    doc.entries.emplace_back("NotInListBool", new BoolNotInListVerifier({ true, false }));
     doc.entries.emplace_back(
         "NotInListDouble",
-        new DoubleNotInListVerifier({ 0.0, 1.0 }),
-        Optional::No
-    );
-    doc.entries.emplace_back(
-        "NotInListInt",
-        new IntNotInListVerifier({ 0, 1 }),
-        Optional::No
-    );
-    doc.entries.emplace_back(
-        "NotInListString",
-        new StringNotInListVerifier({ "", "a" }),
-        Optional::No
+        new DoubleNotInListVerifier({ 0.0, 1.0 })
     );
+    doc.entries.emplace_back("NotInListInt", new IntNotInListVerifier({ 0, 1 }));
+    doc.entries.emplace_back("NotInListString", new StringNotInListVerifier({ "", "a" }));
 
-    doc.entries.emplace_back(
-        "StringListVerifier",
-        new StringListVerifier,
-        Optional::No
-    );
-    doc.entries.emplace_back(
-        "IntListVerifier",
-        new IntListVerifier,
-        Optional::No
-    );
+    doc.entries.emplace_back("StringListVerifier", new StringListVerifier);
+    doc.entries.emplace_back("IntListVerifier", new IntListVerifier);
 
     // Range Verifiers
-    doc.entries.emplace_back(
-        "InListDouble",
-        new DoubleInRangeVerifier({ 0.0, 1.0 }),
-        Optional::No
-    );
-    doc.entries.emplace_back(
-        "InListInt",
-        new IntInRangeVerifier({ 0, 1 }),
-        Optional::No
-    );
+    doc.entries.emplace_back("InListDouble", new DoubleInRangeVerifier({ 0.0, 1.0 }));
+    doc.entries.emplace_back("InListInt", new IntInRangeVerifier({ 0, 1 }));
 
     doc.entries.emplace_back(
         "NotInListDouble",
-        new DoubleNotInRangeVerifier({ 0.0, 1.0 }),
-        Optional::No
-    );
-    doc.entries.emplace_back(
-        "NotInListInt",
-        new IntNotInRangeVerifier({ 0, 1 }),
-        Optional::No
+        new DoubleNotInRangeVerifier({ 0.0, 1.0 })
     );
+    doc.entries.emplace_back("NotInListInt", new IntNotInRangeVerifier({ 0, 1 }));
 
     // Misc Verifiers
-    doc.entries.emplace_back(
-        "AnnotationBool",
-        new BoolAnnotationVerifier("Bool"),
-        Optional::No
-    );
-    doc.entries.emplace_back(
-        "AnnotationDouble",
-        new DoubleAnnotationVerifier("Double"),
-        Optional::No
-    );
-    doc.entries.emplace_back(
-        "AnnotationInt",
-        new IntAnnotationVerifier("Int"),
-        Optional::No
-    );
-    doc.entries.emplace_back(
-        "AnnotationString",
-        new StringAnnotationVerifier("String"),
-        Optional::No
-    );
-    doc.entries.emplace_back(
-        "AnnotationTable",
-        new TableAnnotationVerifier("Table"),
-        Optional::No
-    );
+    doc.entries.emplace_back("AnnotationBool", new BoolAnnotationVerifier("Bool"));
+    doc.entries.emplace_back("AnnotationDouble", new DoubleAnnotationVerifier("Double"));
+    doc.entries.emplace_back("AnnotationInt", new IntAnnotationVerifier("Int"));
+    doc.entries.emplace_back("AnnotationString", new StringAnnotationVerifier("String"));
+    doc.entries.emplace_back("AnnotationTable", new TableAnnotationVerifier("Table"));
 }
 
 TEST_CASE("Documentation: Initializer Constructor", "[documentation]") {
@@ -280,63 +110,63 @@ TEST_CASE("Documentation: Initializer Constructor", "[documentation]") {
     const Documentation doc = {
         .entries = {
             // Basic Verifiers
-            { "BoolVerifier", new BoolVerifier, Optional::No },
-            { "DoubleVerifier", new DoubleVerifier, Optional::No },
-            { "IntVerifier", new IntVerifier, Optional::No },
-            { "StringVerifier", new StringVerifier, Optional::No },
-            { "IdentifierVerifier", new IdentifierVerifier, Optional::No },
-            { "FileVerifier", new FileVerifier, Optional::No },
-            { "DirectoryVerifier", new DirectoryVerifier, Optional::No },
-            { "DateTimeVerifier", new DateTimeVerifier, Optional::No },
-            { "TableVerifier", new TableVerifier, Optional::No },
+            { "BoolVerifier", new BoolVerifier },
+            { "DoubleVerifier", new DoubleVerifier },
+            { "IntVerifier", new IntVerifier },
+            { "StringVerifier", new StringVerifier },
+            { "IdentifierVerifier", new IdentifierVerifier },
+            { "FileVerifier", new FileVerifier },
+            { "DirectoryVerifier", new DirectoryVerifier },
+            { "DateTimeVerifier", new DateTimeVerifier },
+            { "TableVerifier", new TableVerifier },
 
             // Operator Verifiers
-            { "LessDouble", new DoubleLessVerifier(0.0), Optional::No },
-            { "LessInt", new IntLessVerifier(0), Optional::No },
+            { "LessDouble", new DoubleLessVerifier(0.0) },
+            { "LessInt", new IntLessVerifier(0) },
 
-            { "LessEqualDouble", new DoubleLessEqualVerifier(0.0), Optional::No },
-            { "LessEqualInt", new IntLessEqualVerifier(0), Optional::No },
+            { "LessEqualDouble", new DoubleLessEqualVerifier(0.0) },
+            { "LessEqualInt", new IntLessEqualVerifier(0) },
 
-            { "GreaterDouble", new DoubleGreaterVerifier(0.0), Optional::No },
-            { "GreaterInt", new IntGreaterVerifier(0), Optional::No },
+            { "GreaterDouble", new DoubleGreaterVerifier(0.0) },
+            { "GreaterInt", new IntGreaterVerifier(0) },
 
-            { "GreaterEqualDouble", new DoubleGreaterEqualVerifier(0.0), Optional::No },
-            { "GreaterEqualInt", new IntGreaterEqualVerifier(0), Optional::No },
+            { "GreaterEqualDouble", new DoubleGreaterEqualVerifier(0.0) },
+            { "GreaterEqualInt", new IntGreaterEqualVerifier(0) },
 
-            { "EqualBool", new BoolEqualVerifier(false), Optional::No },
-            { "EqualDouble", new DoubleEqualVerifier(0.0), Optional::No },
-            { "EqualInt", new IntEqualVerifier(0), Optional::No },
-            { "EqualString", new StringEqualVerifier(""), Optional::No },
+            { "EqualBool", new BoolEqualVerifier(false) },
+            { "EqualDouble", new DoubleEqualVerifier(0.0) },
+            { "EqualInt", new IntEqualVerifier(0) },
+            { "EqualString", new StringEqualVerifier("") },
 
-            { "UnequalBool", new BoolUnequalVerifier(false), Optional::No },
-            { "UnequalDouble", new DoubleUnequalVerifier(0.0), Optional::No },
-            { "UnequalInt", new IntUnequalVerifier(0), Optional::No },
-            { "UnequalString", new StringUnequalVerifier(""), Optional::No },
+            { "UnequalBool", new BoolUnequalVerifier(false) },
+            { "UnequalDouble", new DoubleUnequalVerifier(0.0) },
+            { "UnequalInt", new IntUnequalVerifier(0) },
+            { "UnequalString", new StringUnequalVerifier("") },
 
             // List Verifiers
-            { "InListBool", new BoolInListVerifier({ true, false }), Optional::No },
-            { "InListDouble", new DoubleInListVerifier({ 0.0, 1.0 }), Optional::No },
-            { "InListInt", new IntInListVerifier({ 0, 1 }), Optional::No },
-            { "InListString", new StringInListVerifier({ "", "a" }), Optional::No },
+            { "InListBool", new BoolInListVerifier({ true, false }) },
+            { "InListDouble", new DoubleInListVerifier({ 0.0, 1.0 }) },
+            { "InListInt", new IntInListVerifier({ 0, 1 }) },
+            { "InListString", new StringInListVerifier({ "", "a" }) },
 
-            { "NotInListBool", new BoolNotInListVerifier({ true, false }), Optional::No },
-            { "NotInListDouble", new DoubleNotInListVerifier({ 0.0, 1.0 }), Optional::No },
-            { "NotInListInt", new IntNotInListVerifier({ 0, 1 }), Optional::No },
-            { "NotInListString", new StringNotInListVerifier({ "", "a" }), Optional::No },
+            { "NotInListBool", new BoolNotInListVerifier({ true, false }) },
+            { "NotInListDouble", new DoubleNotInListVerifier({ 0.0, 1.0 }) },
+            { "NotInListInt", new IntNotInListVerifier({ 0, 1 }) },
+            { "NotInListString", new StringNotInListVerifier({ "", "a" }) },
 
             // Range Verifiers
-            { "InRangeDouble", new DoubleInRangeVerifier(0.0, 1.0), Optional::No },
-            { "InRangeInt", new IntInRangeVerifier(0, 1), Optional::No },
+            { "InRangeDouble", new DoubleInRangeVerifier(0.0, 1.0) },
+            { "InRangeInt", new IntInRangeVerifier(0, 1) },
 
-            { "InRangeDouble", new DoubleNotInRangeVerifier(0.0, 1.0), Optional::No },
-            { "InRangeInt", new IntNotInRangeVerifier(0, 1), Optional::No },
+            { "InRangeDouble", new DoubleNotInRangeVerifier(0.0, 1.0) },
+            { "InRangeInt", new IntNotInRangeVerifier(0, 1) },
 
             // Misc Verifiers
-            { "AnnotationBool", new BoolAnnotationVerifier("Bool"), Optional::No },
-            { "AnnotationDouble", new DoubleAnnotationVerifier("Double"), Optional::No },
-            { "AnnotationInt", new IntAnnotationVerifier("Int"), Optional::No },
-            { "AnnotationString", new StringAnnotationVerifier("String"), Optional::No },
-            { "AnnotationTable", new TableAnnotationVerifier("Table"), Optional::No }
+            { "AnnotationBool", new BoolAnnotationVerifier("Bool") },
+            { "AnnotationDouble", new DoubleAnnotationVerifier("Double") },
+            { "AnnotationInt", new IntAnnotationVerifier("Int") },
+            { "AnnotationString", new StringAnnotationVerifier("String") },
+            { "AnnotationTable", new TableAnnotationVerifier("Table") }
         }
     };
 }
@@ -345,9 +175,7 @@ TEST_CASE("Documentation: BoolVerifier", "[documentation]") {
     using namespace openspace::documentation;
 
     const Documentation doc = {
-        .entries = {
-            { "Bool", new BoolVerifier, Optional::No }
-        }
+        .entries = {{ "Bool", new BoolVerifier }}
     };
 
     ghoul::Dictionary positive;
@@ -378,9 +206,7 @@ TEST_CASE("Documentation: DoubleVerifier", "[documentation]") {
     using namespace openspace::documentation;
 
     const Documentation doc = {
-        .entries = {
-            { "Double", new DoubleVerifier, Optional::No }
-        }
+        .entries = {{ "Double", new DoubleVerifier }}
     };
 
     ghoul::Dictionary positive;
@@ -410,9 +236,7 @@ TEST_CASE("Documentation: IntVerifier", "[documentation]") {
     using namespace openspace::documentation;
 
     const Documentation doc = {
-        .entries = {
-            { "Int", new IntVerifier, Optional::No }
-        }
+        .entries = {{ "Int", new IntVerifier }}
     };
 
     ghoul::Dictionary positive;
@@ -449,9 +273,7 @@ TEST_CASE("Documentation: StringVerifier", "[documentation]") {
     using namespace std::string_literals;
 
     const Documentation doc = {
-        .entries = {
-            { "String", new StringVerifier, Optional::No }
-        }
+        .entries = {{ "String", new StringVerifier }}
     };
 
     ghoul::Dictionary positive;
@@ -482,9 +304,7 @@ TEST_CASE("Documentation: IdentifierVerifier", "[documentation]") {
     using namespace std::string_literals;
 
     const Documentation doc = {
-        .entries = {
-            { "Identifier", new IdentifierVerifier, Optional::No }
-        }
+        .entries = {{ "Identifier", new IdentifierVerifier }}
     };
 
     ghoul::Dictionary positive;
@@ -547,9 +367,7 @@ TEST_CASE("Documentation: FileVerifier", "[documentation]") {
     using namespace std::string_literals;
 
     const Documentation doc = {
-        .entries = {
-            { "File", new FileVerifier, Optional::No }
-        }
+        .entries = {{ "File", new FileVerifier }}
     };
 
     ghoul::Dictionary positive;
@@ -588,9 +406,7 @@ TEST_CASE("Documentation: DirectoryVerifier", "[documentation]") {
     using namespace std::string_literals;
 
     const Documentation doc = {
-        .entries = {
-            { "Dir", new DirectoryVerifier, Optional::No }
-        }
+        .entries = {{ "Dir", new DirectoryVerifier }}
     };
 
     ghoul::Dictionary positive;
@@ -629,9 +445,7 @@ TEST_CASE("Documentation: DateTimeVerifier", "[documentation]") {
     using namespace std::string_literals;
 
     const Documentation doc = {
-        .entries = {
-            { "DateTime", new DateTimeVerifier, Optional::No }
-        }
+        .entries = {{ "DateTime", new DateTimeVerifier }}
     };
 
     ghoul::Dictionary positive;
@@ -669,9 +483,7 @@ TEST_CASE("Documentation: TableVerifierType", "[documentation]") {
     using namespace openspace::documentation;
 
     const Documentation doc = {
-        .entries = {
-            { "Table", new TableVerifier, Optional::No }
-        }
+        .entries = {{ "Table", new TableVerifier }}
     };
 
     ghoul::Dictionary positive;
@@ -702,9 +514,7 @@ TEST_CASE("Documentation: StringListVerifierType", "[documentation]") {
     using namespace std::string_literals;
 
     const Documentation doc = {
-        .entries = {
-            { "StringList", new StringListVerifier, Optional::No }
-        }
+        .entries = {{ "StringList", new StringListVerifier }}
     };
 
     ghoul::Dictionary positive;
@@ -756,9 +566,7 @@ TEST_CASE("Documentation: IntListVerifierType", "[documentation]") {
     using namespace std::string_literals;
 
     const Documentation doc = {
-        .entries = {
-            { "IntList", new IntListVerifier, Optional::No }
-        }
+        .entries = {{ "IntList", new IntListVerifier }}
     };
 
     ghoul::Dictionary positive;
@@ -810,11 +618,11 @@ TEST_CASE("Documentation: MixedVerifiers", "[documentation]") {
 
     const Documentation doc = {
         .entries = {
-            { "Bool", new BoolVerifier, Optional::No },
-            { "Double", new DoubleVerifier, Optional::No },
-            { "Int", new IntVerifier, Optional::No },
-            { "String", new StringVerifier, Optional::No },
-            { "Table", new TableVerifier, Optional::No }
+            { "Bool", new BoolVerifier },
+            { "Double", new DoubleVerifier },
+            { "Int", new IntVerifier },
+            { "String", new StringVerifier },
+            { "Table", new TableVerifier }
         }
     };
 
@@ -861,19 +669,28 @@ TEST_CASE("Documentation: NestedTables", "[documentation]") {
 
     const Documentation doc = {
         .entries = {
-            { "Outer_Int", new IntVerifier, Optional::No },
-            { "Outer_Table", new TableVerifier({
-                { "Inner_Double", new DoubleVerifier, Optional::No },
-                { "Inner_String", new StringVerifier, Optional::No }
-            }), Optional::No },
-            { "Outer_Double", new DoubleVerifier, Optional::No },
-            { "Outer_Table2" , new TableVerifier({
-                { "Inner_Double2", new DoubleVerifier, Optional::No },
-                { "Inner_String2", new StringVerifier, Optional::No },
-                { "Inner_Table" , new TableVerifier({
-                    { "Inner_Inner_Int", new IntVerifier, Optional::No }
-                }), Optional::No }
-            }), Optional::No}
+            { "Outer_Int", new IntVerifier },
+            {
+                "Outer_Table",
+                new TableVerifier({
+                    { "Inner_Double", new DoubleVerifier },
+                    { "Inner_String", new StringVerifier }
+                })
+            },
+            { "Outer_Double", new DoubleVerifier },
+            {
+                "Outer_Table2",
+                new TableVerifier({
+                    { "Inner_Double2", new DoubleVerifier },
+                    { "Inner_String2", new StringVerifier },
+                    {
+                        "Inner_Table",
+                        new TableVerifier({
+                            { "Inner_Inner_Int", new IntVerifier }
+                        })
+                    }
+                })
+            }
         }
     };
 
@@ -1040,8 +857,8 @@ TEST_CASE("Documentation: Optional", "[documentation]") {
 
     const Documentation doc = {
         .entries = {
-            { "Bool_Force", new BoolVerifier, Optional::No },
-            { "Bool_Optional", new BoolVerifier, Optional::Yes }
+            { "Bool_Force", new BoolVerifier },
+            { "Bool_Optional", new BoolVerifier }
         }
     };
 
@@ -1090,18 +907,7 @@ TEST_CASE("Documentation: Required In Optional", "[documentation]") {
         .entries = {
             {
                 "a",
-                new TableVerifier({
-                    {
-                        "b",
-                        new IntVerifier,
-                        Optional::No
-                    },
-                    {
-                        "c",
-                        new IntVerifier,
-                        Optional::Yes
-                    }
-                }),
+                new TableVerifier({{ "b", new IntVerifier }, { "c", new IntVerifier }}),
                 Optional::Yes
             }
         }
@@ -1150,9 +956,7 @@ TEST_CASE("Documentation: Exhaustive", "[documentation]") {
     using namespace openspace::documentation;
 
     const Documentation doc = {
-        .entries = {
-            { "Int", new IntVerifier, Optional::No }
-        }
+        .entries = {{ "Int", new IntVerifier }}
     };
 
     ghoul::Dictionary positive;
@@ -1182,13 +986,7 @@ TEST_CASE("Documentation: Nested Exhaustive", "[documentation]") {
     using namespace openspace::documentation;
 
     const Documentation doc = {
-        .entries = {
-            {
-                "Table",
-                new TableVerifier({ { "a", new IntVerifier, Optional::No } }),
-                Optional::No
-            }
-        }
+        .entries = {{ "Table", new TableVerifier({{ "a", new IntVerifier }}) }}
     };
 
     ghoul::Dictionary positive;
@@ -1235,9 +1033,7 @@ TEST_CASE("Documentation: Empty Nested Exhaustive", "[documentation]") {
     using namespace openspace::documentation;
 
     const Documentation doc = {
-        .entries = {
-            { "Table", new TableVerifier(), Optional::No }
-        }
+        .entries = {{ "Table", new TableVerifier() }}
     };
 
     ghoul::Dictionary positive;
@@ -1261,9 +1057,7 @@ TEST_CASE("Documentation: Less Int", "[documentation]") {
     using namespace openspace::documentation;
 
     const Documentation doc = {
-        .entries = {
-            { "Int", new IntLessVerifier(5), Optional::No }
-        }
+        .entries = {{ "Int", new IntLessVerifier(5) }}
     };
 
     ghoul::Dictionary positive;
@@ -1285,7 +1079,7 @@ TEST_CASE("Documentation: Less Double", "[documentation]") {
     using namespace openspace::documentation;
 
     const Documentation doc = {
-        .entries = { { "Double", new DoubleLessVerifier(5.0), Optional::No } }
+        .entries = {{ "Double", new DoubleLessVerifier(5.0) }}
     };
 
     ghoul::Dictionary positive;
@@ -1307,7 +1101,7 @@ TEST_CASE("Documentation: LessEqual Int", "[documentation]") {
     using namespace openspace::documentation;
 
     const Documentation doc = {
-        .entries = { { "Int", new IntLessEqualVerifier(5), Optional::No } }
+        .entries = {{ "Int", new IntLessEqualVerifier(5) }}
     };
 
     ghoul::Dictionary positive;
@@ -1335,7 +1129,7 @@ TEST_CASE("Documentation: LessEqual Double", "[documentation]") {
     using namespace openspace::documentation;
 
     const Documentation doc = {
-        .entries = { { "Double", new DoubleLessEqualVerifier(5.0), Optional::No } }
+        .entries = {{ "Double", new DoubleLessEqualVerifier(5.0) }}
     };
 
     ghoul::Dictionary positive;
@@ -1363,7 +1157,7 @@ TEST_CASE("Documentation: Greater Int", "[documentation]") {
     using namespace openspace::documentation;
 
     const Documentation doc = {
-        .entries = { { "Int", new IntGreaterVerifier(5), Optional::No } }
+        .entries = {{ "Int", new IntGreaterVerifier(5) }}
     };
 
     ghoul::Dictionary positive;
@@ -1385,7 +1179,7 @@ TEST_CASE("Documentation: Greater Double", "[documentation]") {
     using namespace openspace::documentation;
 
     const Documentation doc = {
-        .entries = { { "Double", new DoubleGreaterVerifier(5.0), Optional::No } }
+        .entries = {{ "Double", new DoubleGreaterVerifier(5.0) }}
     };
 
     ghoul::Dictionary positive;
@@ -1407,7 +1201,7 @@ TEST_CASE("Documentation: GreaterEqual Int", "[documentation]") {
     using namespace openspace::documentation;
 
     const Documentation doc = {
-        .entries = { { "Int", new IntGreaterEqualVerifier(5), Optional::No } }
+        .entries = {{ "Int", new IntGreaterEqualVerifier(5) }}
     };
 
     ghoul::Dictionary positive;
@@ -1435,7 +1229,7 @@ TEST_CASE("Documentation: GreaterEqual Double", "[documentation]") {
     using namespace openspace::documentation;
 
     const Documentation doc = {
-        .entries = { { "Double", new DoubleGreaterEqualVerifier(5.0), Optional::No } }
+        .entries = {{ "Double", new DoubleGreaterEqualVerifier(5.0) }}
     };
 
     ghoul::Dictionary positive;
@@ -1463,7 +1257,7 @@ TEST_CASE("Documentation: Equal Bool", "[documentation]") {
     using namespace openspace::documentation;
 
     const Documentation doc = {
-        .entries = { { "Bool", new BoolEqualVerifier(true), Optional::No } }
+        .entries = {{ "Bool", new BoolEqualVerifier(true) }}
     };
 
     ghoul::Dictionary positive;
@@ -1485,7 +1279,7 @@ TEST_CASE("Documentation: Equal Int", "[documentation]") {
     using namespace openspace::documentation;
 
     const Documentation doc = {
-        .entries = { { "Int", new IntEqualVerifier(1), Optional::No } }
+        .entries = {{ "Int", new IntEqualVerifier(1) }}
     };
 
     ghoul::Dictionary positive;
@@ -1507,7 +1301,7 @@ TEST_CASE("Documentation: Equal Double", "[documentation]") {
     using namespace openspace::documentation;
 
     const Documentation doc = {
-        .entries = { { "Double", new DoubleEqualVerifier(1.0), Optional::No } }
+        .entries = {{ "Double", new DoubleEqualVerifier(1.0) }}
     };
 
     ghoul::Dictionary positive;
@@ -1530,7 +1324,7 @@ TEST_CASE("Documentation: Equal String", "[documentation]") {
     using namespace std::string_literals;
 
     const Documentation doc = {
-        .entries = { { "String", new StringEqualVerifier("string"s), Optional::No } }
+        .entries = {{ "String", new StringEqualVerifier("string"s) }}
     };
 
     ghoul::Dictionary positive;
@@ -1552,7 +1346,7 @@ TEST_CASE("Documentation: Unequal Bool", "[documentation]") {
     using namespace openspace::documentation;
 
     const Documentation doc = {
-        .entries = { { "Bool", new BoolUnequalVerifier(true), Optional::No } }
+        .entries = {{ "Bool", new BoolUnequalVerifier(true) }}
     };
 
     ghoul::Dictionary positive;
@@ -1574,7 +1368,7 @@ TEST_CASE("Documentation: Unequal Int", "[documentation]") {
     using namespace openspace::documentation;
 
     const Documentation doc = {
-        .entries = { { "Int", new IntUnequalVerifier(1), Optional::No } }
+        .entries = {{ "Int", new IntUnequalVerifier(1) }}
     };
 
     ghoul::Dictionary positive;
@@ -1596,7 +1390,7 @@ TEST_CASE("Documentation: Unequal Double", "[documentation]") {
     using namespace openspace::documentation;
 
     const Documentation doc = {
-        .entries = { { "Double", new DoubleUnequalVerifier(1.0), Optional::No } }
+        .entries = {{ "Double", new DoubleUnequalVerifier(1.0) }}
     };
 
     ghoul::Dictionary positive;
@@ -1619,7 +1413,7 @@ TEST_CASE("Documentation: Unequal String", "[documentation]") {
     using namespace std::string_literals;
 
     const Documentation doc = {
-        .entries = { { "String", new StringUnequalVerifier("string"s), Optional::No } }
+        .entries = {{ "String", new StringUnequalVerifier("string"s) }}
     };
 
     ghoul::Dictionary positive;
@@ -1641,7 +1435,7 @@ TEST_CASE("Documentation: List Bool", "[documentation]") {
     using namespace openspace::documentation;
 
     const Documentation doc = {
-        .entries = { { "Bool" , new BoolInListVerifier({ true }), Optional::No } }
+        .entries = {{ "Bool", new BoolInListVerifier({ true }) }}
     };
 
     ghoul::Dictionary positive;
@@ -1663,7 +1457,7 @@ TEST_CASE("Documentation: List Int", "[documentation]") {
     using namespace openspace::documentation;
 
     const Documentation doc = {
-        .entries = { { "Int" , new IntInListVerifier({ 0, 1, 2 }), Optional::No } }
+        .entries = {{ "Int", new IntInListVerifier({ 0, 1, 2 }) }}
     };
 
     ghoul::Dictionary positive;
@@ -1691,9 +1485,7 @@ TEST_CASE("Documentation: List Double", "[documentation]") {
     using namespace openspace::documentation;
 
     const Documentation doc = {
-        .entries = {
-            { "Double" , new DoubleInListVerifier({ 0.0, 1.0, 2.0 }), Optional::No }
-        }
+        .entries = {{ "Double", new DoubleInListVerifier({ 0.0, 1.0, 2.0 }) }}
     };
 
     ghoul::Dictionary positive;
@@ -1722,9 +1514,7 @@ TEST_CASE("Documentation: List String", "[documentation]") {
     using namespace std::string_literals;
 
     const Documentation doc = {
-        .entries = {
-            { "String" , new StringInListVerifier({ "0"s, "1"s, "2"s }), Optional::No }
-        }
+        .entries = {{ "String", new StringInListVerifier({ "0"s, "1"s, "2"s }) }}
     };
 
     ghoul::Dictionary positive;
@@ -1752,7 +1542,7 @@ TEST_CASE("Documentation: NotList Bool", "[documentation]") {
     using namespace openspace::documentation;
 
     const Documentation doc = {
-        .entries = { { "Bool" , new BoolNotInListVerifier({ true }), Optional::No } }
+        .entries = {{ "Bool", new BoolNotInListVerifier({ true }) }}
     };
 
     ghoul::Dictionary positive;
@@ -1774,7 +1564,7 @@ TEST_CASE("Documentation: NotList Int", "[documentation]") {
     using namespace openspace::documentation;
 
     const Documentation doc = {
-        .entries = { { "Int" , new IntNotInListVerifier({ 0, 1, 2 }), Optional::No } }
+        .entries = {{ "Int", new IntNotInListVerifier({ 0, 1, 2 }) }}
     };
 
     ghoul::Dictionary positive;
@@ -1802,9 +1592,7 @@ TEST_CASE("Documentation: NotList Double", "[documentation]") {
     using namespace openspace::documentation;
 
     const Documentation doc = {
-        .entries = {
-            { "Double" , new DoubleNotInListVerifier({ 0.0, 1.0, 2.0 }), Optional::No }
-        }
+        .entries = {{ "Double", new DoubleNotInListVerifier({ 0.0, 1.0, 2.0 }) }}
     };
 
     ghoul::Dictionary positive;
@@ -1833,9 +1621,7 @@ TEST_CASE("Documentation: NotList String", "[documentation]") {
     using namespace std::string_literals;
 
     const Documentation doc = {
-        .entries = {
-            { "String" , new StringNotInListVerifier({ "0"s, "1"s, "2"s }), Optional::No }
-        }
+        .entries = {{ "String", new StringNotInListVerifier({ "0"s, "1"s, "2"s }) }}
     };
 
     ghoul::Dictionary positive;
@@ -1863,7 +1649,7 @@ TEST_CASE("Documentation: Annotation Bool", "[documentation]") {
     using namespace openspace::documentation;
 
     const Documentation doc = {
-        .entries = { { "Bool", new BoolAnnotationVerifier("Bool"), Optional::No } }
+        .entries = {{ "Bool", new BoolAnnotationVerifier("Bool") }}
     };
 
     ghoul::Dictionary positive;
@@ -1885,7 +1671,7 @@ TEST_CASE("Documentation: Annotation Int", "[documentation]") {
     using namespace openspace::documentation;
 
     const Documentation doc = {
-        .entries = { { "Int", new IntAnnotationVerifier("Int"), Optional::No } }
+        .entries = {{ "Int", new IntAnnotationVerifier("Int") }}
     };
 
     ghoul::Dictionary positive;
@@ -1907,7 +1693,7 @@ TEST_CASE("Documentation: Annotation Double", "[documentation]") {
     using namespace openspace::documentation;
 
     const Documentation doc = {
-        .entries = { { "Double", new DoubleAnnotationVerifier("Double"), Optional::No } }
+        .entries = {{ "Double", new DoubleAnnotationVerifier("Double") }}
     };
 
     ghoul::Dictionary positive;
@@ -1930,7 +1716,7 @@ TEST_CASE("Documentation: Annotation String", "[documentation]") {
     using namespace std::string_literals;
 
     const Documentation doc = {
-        .entries = { { "String", new StringAnnotationVerifier("String"), Optional::No } }
+        .entries = {{ "String", new StringAnnotationVerifier("String") }}
     };
 
     ghoul::Dictionary positive;
@@ -1952,7 +1738,7 @@ TEST_CASE("Documentation: Annotation Table", "[documentation]") {
     using namespace openspace::documentation;
 
     const Documentation doc = {
-        .entries = { { "Table", new TableAnnotationVerifier("Table"), Optional::No } }
+        .entries = {{ "Table", new TableAnnotationVerifier("Table") }}
     };
 
     ghoul::Dictionary positive;
@@ -1974,7 +1760,7 @@ TEST_CASE("Documentation: InRange Int", "[documentation]") {
     using namespace openspace::documentation;
 
     const Documentation doc = {
-        .entries = { { "Int", new InRangeVerifier<IntVerifier>(0, 5), Optional::No } }
+        .entries = {{ "Int", new InRangeVerifier<IntVerifier>(0, 5) }}
     };
 
     ghoul::Dictionary positive;
@@ -2008,9 +1794,7 @@ TEST_CASE("Documentation: InRange Double", "[documentation]") {
     using namespace openspace::documentation;
 
     const Documentation doc = {
-        .entries = {
-            { "Double", new InRangeVerifier<DoubleVerifier>(0.0, 5.0), Optional::No }
-        }
+        .entries = {{ "Double", new InRangeVerifier<DoubleVerifier>(0.0, 5.0) }}
     };
 
     ghoul::Dictionary positive;
@@ -2050,7 +1834,7 @@ TEST_CASE("Documentation: NotInRange Int", "[documentation]") {
     using namespace openspace::documentation;
 
     const Documentation doc = {
-        .entries = { { "Int", new NotInRangeVerifier<IntVerifier>(0, 5), Optional::No } }
+        .entries = {{ "Int", new NotInRangeVerifier<IntVerifier>(0, 5) }}
     };
 
     ghoul::Dictionary positive;
@@ -2094,9 +1878,7 @@ TEST_CASE("Documentation: NotInRange Double", "[documentation]") {
     using namespace openspace::documentation;
 
     const Documentation doc = {
-        .entries = {
-            { "Double", new NotInRangeVerifier<DoubleVerifier>(0.0, 5.0), Optional::No }
-        }
+        .entries = {{ "Double", new NotInRangeVerifier<DoubleVerifier>(0.0, 5.0) }}
     };
 
     ghoul::Dictionary positive;
@@ -2140,7 +1922,7 @@ TEST_CASE("Documentation: Wildcard", "[documentation]") {
     using namespace openspace::documentation;
 
     const Documentation doc = {
-        .entries = { { DocumentationEntry::Wildcard, new IntVerifier, Optional::No } }
+        .entries = {{ DocumentationEntry::Wildcard, new IntVerifier }}
     };
 
     ghoul::Dictionary positive;
@@ -2193,8 +1975,8 @@ TEST_CASE("Documentation: Wildcard Mixed", "[documentation]") {
 
     const Documentation doc = {
         .entries = {
-            { DocumentationEntry::Wildcard, new IntVerifier, Optional::No },
-            { "b", new IntGreaterVerifier(5), Optional::No }
+            { DocumentationEntry::Wildcard, new IntVerifier },
+            { "b", new IntGreaterVerifier(5) }
         }
     };
 
@@ -2264,17 +2046,12 @@ TEST_CASE("Documentation: Referencing", "[documentation]") {
         "Referenced Name",
         "referenced_id",
         "",
-        {
-            { "a", new IntVerifier, Optional::No },
-            { "b", new DoubleVerifier, Optional::No }
-        },
+        {{ "a", new IntVerifier }, { "b", new DoubleVerifier }},
     };
     DocEng.addDocumentation(referenced);
 
     const Documentation doc = {
-        .entries = {
-            { "Table", new ReferencingVerifier("referenced_id"), Optional::No }
-        }
+        .entries = {{ "Table", new ReferencingVerifier("referenced_id") }}
     };
 
     ghoul::Dictionary positive;
@@ -2311,9 +2088,7 @@ TEST_CASE("Documentation: Referencing", "[documentation]") {
 
 
     const Documentation wrongDoc = {
-        .entries = {
-            { "Table", new ReferencingVerifier("WRONG"), Optional::No }
-        }
+        .entries = {{ "Table", new ReferencingVerifier("WRONG") }}
     };
     ghoul::Dictionary wrongNegative;
     {
@@ -2336,9 +2111,7 @@ TEST_CASE("Documentation: OrOperator", "[documentation]") {
     using namespace std::string_literals;
 
     const Documentation doc = {
-        .entries = {
-            { "a", new OrVerifier({ new StringVerifier, new IntVerifier }), Optional::No }
-        }
+        .entries = {{ "a", new OrVerifier({ new StringVerifier, new IntVerifier }) }}
     };
 
     ghoul::Dictionary positive;
@@ -2366,9 +2139,7 @@ TEST_CASE("Documentation: IntVector2Verifier", "[documentation]") {
     using namespace openspace::documentation;
 
     const Documentation doc = {
-        .entries = {
-            { "a", new IntVector2Verifier, Optional::No }
-        }
+        .entries = {{ "a", new IntVector2Verifier }}
     };
 
     ghoul::Dictionary positive;
@@ -2403,9 +2174,7 @@ TEST_CASE("Documentation: DoubleVector2Verifier", "[documentation]") {
     using namespace openspace::documentation;
 
     const Documentation doc = {
-        .entries = {
-            { "a", new DoubleVector2Verifier, Optional::No }
-        }
+        .entries = {{ "a", new DoubleVector2Verifier }}
     };
 
     ghoul::Dictionary positive;
@@ -2441,9 +2210,7 @@ TEST_CASE("Documentation: IntVector3Verifier", "[documentation]") {
     using namespace std::string_literals;
 
     const Documentation doc = {
-        .entries = {
-            { "a", new IntVector3Verifier, Optional::No }
-        }
+        .entries = {{ "a", new IntVector3Verifier }}
     };
 
     ghoul::Dictionary positive;
@@ -2480,9 +2247,7 @@ TEST_CASE("Documentation: DoubleVector3Verifier", "[documentation]") {
     using namespace std::string_literals;
 
     const Documentation doc = {
-        .entries = {
-            { "a", new DoubleVector3Verifier, Optional::No }
-        }
+        .entries = {{ "a", new DoubleVector3Verifier }}
     };
 
     ghoul::Dictionary positive;
@@ -2519,9 +2284,7 @@ TEST_CASE("Documentation: IntVector4Verifier", "[documentation]") {
     using namespace std::string_literals;
 
     const Documentation doc = {
-        .entries = {
-            { "a", new IntVector4Verifier, Optional::No }
-        }
+        .entries = {{ "a", new IntVector4Verifier }}
     };
 
     ghoul::Dictionary positive;
@@ -2559,9 +2322,7 @@ TEST_CASE("Documentation: DoubleVector4Verifier", "[documentation]") {
     using namespace std::string_literals;
 
     const Documentation doc = {
-        .entries = {
-            { "a", new DoubleVector4Verifier, Optional::No }
-        }
+        .entries = {{ "a", new DoubleVector4Verifier }}
     };
 
     ghoul::Dictionary positive;
@@ -2599,9 +2360,7 @@ TEST_CASE("Documentation: DoubleMatrix2x2Verifier", "[documentation]") {
     using namespace std::string_literals;
 
     const Documentation doc = {
-        .entries = {
-            { "a", new DoubleMatrix2x2Verifier, Optional::No }
-        }
+        .entries = {{ "a", new DoubleMatrix2x2Verifier }}
     };
 
     ghoul::Dictionary positive;
@@ -2638,9 +2397,7 @@ TEST_CASE("Documentation: DoubleMatrix2x3Verifier", "[documentation]") {
     using namespace std::string_literals;
 
     const Documentation doc = {
-        .entries = {
-            { "a", new DoubleMatrix2x3Verifier, Optional::No }
-        }
+        .entries = {{ "a", new DoubleMatrix2x3Verifier }}
     };
 
     ghoul::Dictionary positive;
@@ -2677,9 +2434,7 @@ TEST_CASE("Documentation: DoubleMatrix2x4Verifier", "[documentation]") {
     using namespace std::string_literals;
 
     const Documentation doc = {
-        .entries = {
-            { "a", new DoubleMatrix2x4Verifier, Optional::No }
-        }
+        .entries = {{ "a", new DoubleMatrix2x4Verifier }}
     };
 
     ghoul::Dictionary positive;
@@ -2716,9 +2471,7 @@ TEST_CASE("Documentation: DoubleMatrix3x2Verifier", "[documentation]") {
     using namespace std::string_literals;
 
     const Documentation doc = {
-        .entries = {
-            { "a", new DoubleMatrix3x2Verifier, Optional::No }
-        }
+        .entries = {{ "a", new DoubleMatrix3x2Verifier }}
     };
 
     ghoul::Dictionary positive;
@@ -2755,9 +2508,7 @@ TEST_CASE("Documentation: DoubleMatrix3x3Verifier", "[documentation]") {
     using namespace std::string_literals;
 
     const Documentation doc = {
-        .entries = {
-            { "a", new DoubleMatrix3x3Verifier, Optional::No }
-        }
+        .entries = {{ "a", new DoubleMatrix3x3Verifier }}
     };
 
     ghoul::Dictionary positive;
@@ -2794,9 +2545,7 @@ TEST_CASE("Documentation: DoubleMatrix3x4Verifier", "[documentation]") {
     using namespace std::string_literals;
 
     const Documentation doc = {
-        .entries = {
-            { "a", new DoubleMatrix3x4Verifier, Optional::No }
-        }
+        .entries = {{ "a", new DoubleMatrix3x4Verifier }}
     };
 
     ghoul::Dictionary positive;
@@ -2833,9 +2582,7 @@ TEST_CASE("Documentation: DoubleMatrix4x2Verifier", "[documentation]") {
     using namespace std::string_literals;
 
     const Documentation doc = {
-        .entries = {
-            { "a", new DoubleMatrix4x2Verifier, Optional::No }
-        }
+        .entries = {{ "a", new DoubleMatrix4x2Verifier }}
     };
 
     ghoul::Dictionary positive;
@@ -2872,9 +2619,7 @@ TEST_CASE("Documentation: DoubleMatrix4x3Verifier", "[documentation]") {
     using namespace std::string_literals;
 
     const Documentation doc = {
-        .entries = {
-            { "a", new DoubleMatrix4x3Verifier, Optional::No }
-        }
+        .entries = {{ "a", new DoubleMatrix4x3Verifier }}
     };
 
     ghoul::Dictionary positive;
@@ -2911,9 +2656,7 @@ TEST_CASE("Documentation: DoubleMatrix4x4Verifier", "[documentation]") {
     using namespace std::string_literals;
 
     const Documentation doc = {
-        .entries = {
-            { "a", new DoubleMatrix4x4Verifier, Optional::No }
-        }
+        .entries = {{ "a", new DoubleMatrix4x4Verifier }}
     };
 
     ghoul::Dictionary positive;
diff --git a/tests/test_spicemanager.cpp b/tests/test_spicemanager.cpp
index 3b0deb9585..fb257b02c2 100644
--- a/tests/test_spicemanager.cpp
+++ b/tests/test_spicemanager.cpp
@@ -229,7 +229,7 @@ TEST_CASE("SpiceManager: Get Target State", "[spicemanager]") {
         res = SpiceManager::ref().targetState("EARTH", "CASSINI", "J2000", corr, et)
     );
 
-    for (int i = 0; i < 3; i++){
+    for (int i = 0; i < 3; i++) {
         CHECK(state[i] == Catch::Approx(res.position[i]));
         CHECK(state[i+3] == Catch::Approx(res.velocity[i]));
     }

From 3d3d696eb9251ccb0458b10d5f6bcb3321d7e598 Mon Sep 17 00:00:00 2001
From: Malin E <malin.ejdbo@gmail.com>
Date: Thu, 10 Oct 2024 10:11:03 +0200
Subject: [PATCH 641/701] Update OS-model format and fix model cache bug
 (#3395)

* Update ghoul - update model cache version

* Update OS-model format to work with the new cache version

* Plus some backward compatibility
---
 ext/ghoul | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ext/ghoul b/ext/ghoul
index 0379738e63..1c9121472f 160000
--- a/ext/ghoul
+++ b/ext/ghoul
@@ -1 +1 @@
-Subproject commit 0379738e63e13ca2d9671bdf8b9fd399de7ba578
+Subproject commit 1c9121472f18c5b9035c493260fc6441be03b1a5

From 8d176e4aa8c88e7ba60cc7c11ddba50132673a32 Mon Sep 17 00:00:00 2001
From: Emma Broman <emma.broman@liu.se>
Date: Thu, 10 Oct 2024 11:33:45 +0200
Subject: [PATCH 642/701] Fix error in `openspace.time.secondsPerYear` function
 documentation

---
 src/util/time_lua.inl | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/util/time_lua.inl b/src/util/time_lua.inl
index a7a79f4a2d..0227d516cc 100644
--- a/src/util/time_lua.inl
+++ b/src/util/time_lua.inl
@@ -399,7 +399,7 @@ namespace {
 }
 
 /**
- * Returns the number of seconds in a Julian year, which is equal to 31557600.
+ * Returns the number of seconds in a Gregorian year, which is equal to 31556952.
  */
 [[codegen::luawrap]] double secondsPerYear() {
     // We could use a call to SPICE here, but the value is a constant anyway

From 275fbb63b7eb4e6b4f98f52b1f6bb36d8e76596f Mon Sep 17 00:00:00 2001
From: Emma Broman <emma.broman@liu.se>
Date: Thu, 10 Oct 2024 11:47:26 +0200
Subject: [PATCH 643/701] Fix broken ghoul_assert that prevented building in
 Debug

---
 src/navigation/orbitalnavigator.cpp | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/src/navigation/orbitalnavigator.cpp b/src/navigation/orbitalnavigator.cpp
index 1e0035552b..bee8a29227 100644
--- a/src/navigation/orbitalnavigator.cpp
+++ b/src/navigation/orbitalnavigator.cpp
@@ -24,6 +24,7 @@
 
 #include <openspace/camera/camerapose.h>
 #include <openspace/engine/openspaceengine.h>
+#include <openspace/engine/windowdelegate.h>
 #include <openspace/interaction/mouseinputstate.h>
 #include <openspace/interaction/keyboardinputstate.h>
 #include <openspace/navigation/navigationhandler.h>
@@ -2085,9 +2086,11 @@ double OrbitalNavigator::rotationSpeedScaleFromCameraHeight(
         1.0;
 }
 
-// This should only be run on nodes and not on master
 void OrbitalNavigator::updateAnchor() {
-    ghoul_assert(!global::windowDelegate->isMaster());
+    ghoul_assert(
+        !global::windowDelegate->isMaster(),
+        "Anchor should only be synced on nodes, not on master"
+    );
 
     if (!_syncedAnchorNode.data().empty()) {
         setAnchorNode(_syncedAnchorNode);

From e3271670a78b27562366a1caf472e474f073ccba Mon Sep 17 00:00:00 2001
From: Emma Broman <emma.broman@liu.se>
Date: Thu, 10 Oct 2024 11:51:12 +0200
Subject: [PATCH 644/701] Update comments in time_lua to new script
 documentation format (#3438)

* Update comments in time_lua to new script documentation format

* Fix some mistakes in formulation about how pausing works

* Add return value documentation
---
 src/util/time_lua.inl | 189 ++++++++++++++++++++++++++++++------------
 1 file changed, 138 insertions(+), 51 deletions(-)

diff --git a/src/util/time_lua.inl b/src/util/time_lua.inl
index 0227d516cc..cee0fe80ca 100644
--- a/src/util/time_lua.inl
+++ b/src/util/time_lua.inl
@@ -27,16 +27,21 @@
 namespace {
 
 /**
- * Sets the amount of simulation time that happens in one second of real time.
+ * Set the amount of simulation time that happens in one second of real time.
+ *
+ * \param deltaTime The value to set the speed to, in seconds per real time second
  */
 [[codegen::luawrap]] void setDeltaTime(double deltaTime) {
     openspace::global::timeManager->setDeltaTime(deltaTime);
 }
 
 /**
- * Sets the list of discrete delta time steps for the simulation speed that can be quickly
+ * Set the list of discrete delta time steps for the simulation speed that can be quickly
  * jumped between. The list will be sorted to be in increasing order. A negative verison
  * of each specified time step will be added per default as well.
+ *
+ * \param deltaTime The list of delta times, given in seconds per real time second.
+ *                  Should only include positive values.
  */
 [[codegen::luawrap]] void setDeltaTimeSteps(std::vector<double> deltaTime) {
     openspace::global::timeManager->setDeltaTimeSteps(deltaTime);
@@ -52,7 +57,7 @@ namespace {
 
 /**
  * Immediately set the simulation speed to the first delta time step in the list that is
- * smaller than the current choice of simulation speed if any.
+ * smaller than the current choice of simulation speed, if any.
  */
 [[codegen::luawrap]] void setPreviousDeltaTimeStep() {
     openspace::global::timeManager->setPreviousDeltaTimeStep();
@@ -60,8 +65,11 @@ namespace {
 
 /**
  * Interpolate the simulation speed to the first delta time step in the list that is
- * larger than the current simulation speed, if any. If an input value is given, the
- * interpolation is done over the specified number of seconds.
+ * larger than the current simulation speed, if any.
+ *
+ * \param interpolationDuration The number of seconds that the interpolation should
+ *                              be done over. If excluded, the time is decided based
+ *                              on the default value specified in the TimeManager.
  */
 [[codegen::luawrap]] void interpolateNextDeltaTimeStep(
                                               std::optional<double> interpolationDuration)
@@ -76,8 +84,11 @@ namespace {
 
 /**
  * Interpolate the simulation speed to the first delta time step in the list that is
- * smaller than the current simulation speed, if any. If an input value is given, the
- * interpolation is done over the specified number of seconds.
+ * smaller than the current simulation speed, if any.
+ *
+ * \param interpolationDuration The number of seconds that the interpolation should
+ *                              be done over. If excluded, the time is decided based
+ *                              on the default value specified in the TimeManager.
  */
 [[codegen::luawrap]] void interpolatePreviousDeltaTimeStep(
                                               std::optional<double> interpolationDuration)
@@ -91,8 +102,14 @@ namespace {
 }
 
 /**
- * Sets the amount of simulation time that happens in one second of real time. If a second
- * input value is given, the interpolation is done over the specified number of seconds.
+ * Set the amount of simulation time that happens in one second of real time, by smoothly
+ * interpolating to that value.
+ *
+ * \param deltaTime The value to set the speed to, in seconds per real time second
+ * \param interpolationDuration The number of seconds that the interpolation should
+ *                              be done over. If excluded, the time is decided based
+ *                              on the default value for delta time interpolation
+ *                              specified in the TimeManager.
  */
 [[codegen::luawrap]] void interpolateDeltaTime(double deltaTime,
                                               std::optional<double> interpolationDuration)
@@ -108,14 +125,17 @@ namespace {
 
 /**
  * Returns the amount of simulated time that passes in one second of real time.
+ *
+ * \return The simulated delta time, in seconds per real time second
  */
 [[codegen::luawrap]] double deltaTime() {
     return openspace::global::timeManager->deltaTime();
 }
 
 /**
- * Toggles the pause function, i.e. temporarily setting the delta time to 0 and restoring
- * it afterwards.
+ * Toggle the pause function, i.e. if the simulation is paused it will resume, and
+ * otherwise it will be paused. Note that to pause means temporarily setting the delta
+ * time to 0, and unpausing means restoring it to whatever delta time value is set.
  */
 [[codegen::luawrap]] void togglePause() {
     using namespace openspace;
@@ -123,9 +143,15 @@ namespace {
 }
 
 /**
- * Toggles the pause function, i.e. temporarily setting the delta time to 0 and restoring
- * it afterwards. If an input value is given, the interpolation is done over the specified
- * number of seconds.
+ * Toggle the pause function, i.e. if the simulation is paused it will resume, and
+ * otherwise it will be paused. This is done by smoothly interpolating from the
+ * current delta time value to 0 (pause), or from 0 to the current delta time value
+ * (unpause).
+ *
+ * \param interpolationDuration The number of seconds that the interpolation should be
+ *                              done over. If excluded, the time is decided based on the
+ *                              default value for pause/unpause specified in the
+ *                              TimeManager.
  */
 [[codegen::luawrap]] void interpolateTogglePause(
                                               std::optional<double> interpolationDuration)
@@ -167,17 +193,26 @@ namespace {
 }
 
 /**
- * Toggles a pause function i.e. setting the delta time to 0 and restoring it afterwards.
+ * Set whether the simulation should be paused or not. Note that to pause means
+ * temporarily setting the delta time to 0, and unpausing means restoring it to whatever
+ * delta time value is set.
+ *
+ * \param isPaused True if the simulation should be paused, and false otherwise
  */
 [[codegen::luawrap]] void setPause(bool isPaused) {
     openspace::global::timeManager->setPause(isPaused);
 }
 
 /**
- * Same behaviour as setPause, but with interpolation. If no interpolation duration is
- * provided, the interpolation time will be based on the
- * `defaultPauseInterpolationDuration` and `defaultUnpauseInterpolationDuration`
- * properties of the TimeManager.
+ * Same behaviour as `setPause`, but with interpolation. That is, if it should be paused,
+ * the delta time will be interpolated to 0, and if unpausing, the delta time will be
+ * interpolated to whatever delta time value is set.
+ *
+ * \param isPaused True if the simulation should be paused, and false otherwise
+ * \param interpolationDuration The number of seconds that the interpolation should be
+ *                              done over. If excluded, the time is decided based on the
+ *                              default value for pause/unpause specified in the
+ *                              TimeManager.
  */
 [[codegen::luawrap]] void interpolatePause(bool isPaused,
                                            std::optional<double> interpolationDuration)
@@ -195,16 +230,22 @@ namespace {
 
 /**
  * Returns whether the simulation time is currently paused or is progressing.
+ *
+ * \return True if the simulation is paused, and false otherwise
  */
 [[codegen::luawrap]] bool isPaused() {
     return openspace::global::timeManager->isPaused();
 }
 
 /**
- * Sets the current simulation time to the specified value. If the parameter is a number,
- * the value is the number of seconds past the J2000 epoch. If it is a string, it has to
- * be a valid ISO 8601-like date string of the format YYYY-MM-DDTHH:MN:SS. Note: providing
- * time zone using the Z format is not supported. UTC is assumed.
+ * Set the current simulation time to the specified value. The time can be specified
+ * either a number of seconds past the J2000 epoch, or as a ISO 8601 string.
+ *
+ * Note that providing time zone using the Z format is not supported. UTC is assumed.
+ *
+ * \param time The time to set. If the parameter is a number, the value is the number of
+ *             seconds past the J2000 epoch. If it is a string, it has to be a valid ISO
+ *             8601-like date string of the format YYYY-MM-DDTHH:MN:SS.
  */
 [[codegen::luawrap]] void setTime(std::variant<double, std::string> time) {
     using namespace openspace;
@@ -220,13 +261,21 @@ namespace {
     global::timeManager->setTimeNextFrame(Time(t));
 }
 
-/**
- * Sets the current simulation time to the specified value. If the first parameter is a
- * number, the target is the number of seconds past the J2000 epoch. If it is a string, it
- * has to be a valid ISO 8601-like date string of the format YYYY-MM-DDTHH:MN:SS (Note:
- * providing time zone using the Z format is not supported. UTC is assumed). If a second
- * input value is given, the interpolation is done over the specified number of seconds.
- */
+ /**
+  * Set the current simulation time to the specified value, using interpolation. The time
+  * can be specified either a number of seconds past the J2000 epoch, or as a ISO 8601
+  * string.
+  *
+  * Note that providing time zone using the Z format is not supported. UTC is assumed.
+  *
+  * \param time The time to set. If the parameter is a number, the value is the number of
+  *             seconds past the J2000 epoch. If it is a string, it has to be a valid ISO
+  *             8601-like date string of the format YYYY-MM-DDTHH:MN:SS.
+  * \param interpolationDuration The number of seconds that the interpolation should
+  *                              be done over. If excluded, the time is decided based
+  *                              on the default value for time interpolation specified in
+  *                              the TimeManager.
+  */
 [[codegen::luawrap]] void interpolateTime(std::variant<std::string, double> time,
                                           std::optional<double> interpolationDutation)
 {
@@ -249,10 +298,16 @@ namespace {
     }
 }
 
-/**
- * Increments the current simulation time by the specified number of seconds. If a second
- * input value is given, the interpolation is done over the specified number of seconds.
- */
+ /**
+  * Increment the current simulation time by the specified number of seconds, using
+  * interpolation.
+  *
+  * \param delta The number of seconds to increase the current simulation time by
+  * \param interpolationDuration The number of seconds that the interpolation should
+  *                              be done over. If excluded, the time is decided based
+  *                              on the default value for time interpolation specified in
+  *                              the TimeManager.
+  */
 [[codegen::luawrap]] void interpolateTimeRelative(double delta,
                                               std::optional<double> interpolationDuration)
 {
@@ -274,6 +329,8 @@ namespace {
 
 /**
  * Returns the current time as the number of seconds since the J2000 epoch.
+ *
+ * \return The current time, as the number of seconds since the J2000 epoch
  */
 [[codegen::luawrap]] double currentTime() {
     return openspace::global::timeManager->time().j2000Seconds();
@@ -281,6 +338,8 @@ namespace {
 
 /**
  * Returns the current time as an ISO 8601 date string (YYYY-MM-DDTHH:MN:SS).
+ *
+ * \return The current time, as an ISO 8601 date string
  */
 [[codegen::luawrap("UTC")]] std::string currentTimeUTC() {
     return std::string(openspace::global::timeManager->time().ISO8601());
@@ -290,6 +349,8 @@ namespace {
 /**
  * Returns the current time as an date string of the form
  * (YYYY MON DDTHR:MN:SC.### ::RND) as returned by SPICE.
+ *
+ * \return The current time, in the format used by SPICE (YYYY MON DDTHR:MN:SC.### ::RND)
  */
 [[codegen::luawrap("SPICE")]] std::string currentTimeSpice() {
     return std::string(openspace::global::timeManager->time().UTC());
@@ -298,6 +359,8 @@ namespace {
 /**
  * Returns the current wall time as an ISO 8601 date string (YYYY-MM-DDTHH-MN-SS) in the
  * UTC timezone.
+ *
+ * \return The current wall time, in the UTC time zone, as an ISO 8601 date string
  */
 [[codegen::luawrap]] std::string currentWallTime() {
     return openspace::Time::currentWallTime();
@@ -306,19 +369,29 @@ namespace {
 /**
  * Returns the current application time as the number of seconds since the OpenSpace
  * application started.
+ *
+ * \return The number of seconds since OpenSpace started
  */
 [[codegen::luawrap]] double currentApplicationTime() {
     return openspace::global::windowDelegate->applicationTime();
 }
 
 /**
- * Modifies the passed time (first argument) by the delta time (second argument). The
- * first argument can either be an ISO 8601 date string or the number of seconds past the
- * J2000 epoch. The second argument can either be a string of the form [-]XX(s,m,h,d,M,y]
- * with (s)econds, (m)inutes, (h)ours, (d)ays, (M)onths, and (y)ears as units and an
- * optional - sign to move backwards in time. If the second argument is a number, it is
- * interpreted as a number of seconds. The return value is of the same type as the first
- * argument.
+ * Modify a specified timestamp by a given delta time. That is, advance the value either
+ * forwards or backwards in time.
+ *
+ * The returned value will be of the same type as the first argument. That is, either a
+ * number of seconds past the J2000 epoch, or an ISO 8601 date string.
+ *
+ * \param base The timestamp to alter, either given as an ISO 8601 date string or a
+ *             number of seconds past the J2000 epoch.
+ * \param change The amount of time to add to the specified timestamp. Can be given
+ *               either in a number of seconds (including negative), or as a string of
+ *               the form [-]XX(s,m,h,d,M,y] with (s)econds, (m)inutes, (h)ours, (d)ays,
+ *               (M)onths, and (y)ears as units and an optional - sign to move backwards
+ *               in time.
+ *
+ * \return The updated timestamp
  */
 [[codegen::luawrap]] std::variant<std::string, double> advancedTime(
                                                    std::variant<std::string, double> base,
@@ -352,14 +425,19 @@ namespace {
 }
 
 /**
- * Converts the given time to either a J2000 seconds number or a ISO 8601 timestamp,
- * depending on the type of the given time.
+ * Convert the given time from either a J2000 seconds number to an ISO 8601 timestamp,
+ * or vice versa.
  *
- * If the given time is a timestamp: the function returns a double precision value
- * representing the ephemeris version of that time; that is the number of TDB seconds past
+ * If the given time is a timestamp, the function returns a double precision value
+ * representing the ephemeris version of that time; that is, the number of TDB seconds past
  * the J2000 epoch.
  *
- * If the given time is a J2000 seconds value: the function returns a ISO 8601 timestamp.
+ * If the given time is a J2000 seconds value, the function returns a ISO 8601 timestamp.
+ *
+ * \param time The timestamp to convert, either given as an ISO 8601 date string or a
+ *             number of seconds past the J2000 epoch.
+ *
+ * \return The converted timestamp
  */
 [[codegen::luawrap]] std::variant<std::string, double> convertTime(
                                                    std::variant<std::string, double> time)
@@ -377,10 +455,15 @@ namespace {
 }
 
 /**
- * Returns the number of seconds between the provided start time and end time. If the end
- * time is before the start time, the return value is negative. If the start time is equal
- * to the end time, the return value is 0.
- * Both start and end times must be valid ISO 8601 date strings.
+ * Returns the number of seconds between the provided start time and end time.
+ *
+ * If the end time is before the start time, the return value is negative. If the start
+ * time is equal to the end time, the return value is 0.
+ *
+ * \param start The start time for the computation, given as an ISO 8601 date string
+ * \param end The end time for the computation, given as an ISO 8601 date string
+ *
+ * \return The time between the start time and end time
  */
 [[codegen::luawrap]] double duration(std::string start, std::string end) {
     using namespace openspace;
@@ -391,8 +474,10 @@ namespace {
 }
 
 /**
- * Returns the number of seconds per day where a day in this case is exactly 24 hours.
+ * Returns the number of seconds per day, where a day in this case is exactly 24 hours.
  * The total number of seconds is equal to 86400.
+ *
+ * \return The number of seconds in a day
  */
 [[codegen::luawrap]] double secondsPerDay() {
     return openspace::SecondsPerDay;
@@ -400,6 +485,8 @@ namespace {
 
 /**
  * Returns the number of seconds in a Gregorian year, which is equal to 31556952.
+ *
+ * \return The number of seconds in a Gregorian year
  */
 [[codegen::luawrap]] double secondsPerYear() {
     // We could use a call to SPICE here, but the value is a constant anyway

From 0fc9265837cb9dd26a0585042198c700e5ef51a0 Mon Sep 17 00:00:00 2001
From: Andreas Engberg <48772850+engbergandreas@users.noreply.github.com>
Date: Thu, 10 Oct 2024 15:55:53 +0200
Subject: [PATCH 645/701] Feature/assetvalidation (#3396)

# To run the script
Make sure to install the latest Python API version `openspace-api 0.1.2`
The script is located in `OpenSpace/support/assetvalidation`, the main script takes a few command line arguments

`--dir` - specify the OpenSpace directory
`--filter` - optionally supply a regex string to filter which assets to validate
`--verbose` - flag to print debug info to log and also console (default off), if off only warnings and errors are logged
`--start` - flag to start OpenSpace as a subprocess (default on) if this is off it assumes OpenSpace is already running, useful if you want to run OpenSpace via Visual Studio for example.
`--at` - specify an index to start at a specific asset

run eg:
`python main.py --dir="C:/User/Desktop/OpenSpace" --filter="examples" --verbose=True --start=False --at=35`
---
 data/assets/examples/dashboarditems.asset     |   3 +
 data/assets/examples/screenspacedate.asset    |   2 +-
 data/assets/examples/statemachine.asset       |   3 +
 data/assets/examples/urlsynchronization.asset |   4 -
 data/assets/global/openspacebookmarks.asset   |   3 +-
 include/openspace/events/event.h              |  15 +
 include/openspace/rendering/dashboard.h       |   1 +
 modules/server/CMakeLists.txt                 |   2 +
 modules/server/include/topics/errorlogtopic.h |  49 +++
 modules/server/src/connection.cpp             |  18 +-
 modules/server/src/topics/errorlogtopic.cpp   | 121 +++++++
 modules/sync/syncs/httpsynchronization.cpp    |   6 +-
 modules/sync/syncs/urlsynchronization.cpp     |   4 +-
 src/events/event.cpp                          |  16 +
 src/rendering/dashboard.cpp                   |  12 +-
 src/rendering/dashboard_lua.inl               |  17 +
 src/scene/assetmanager.cpp                    |  22 +-
 support/assetvalidation/.gitignore            |  16 +
 support/assetvalidation/AssetValidation.py    | 297 ++++++++++++++++++
 support/assetvalidation/main.py               | 126 ++++++++
 support/assetvalidation/readme.md             |  15 +
 support/assetvalidation/requirements.txt      |   1 +
 22 files changed, 730 insertions(+), 23 deletions(-)
 create mode 100644 modules/server/include/topics/errorlogtopic.h
 create mode 100644 modules/server/src/topics/errorlogtopic.cpp
 create mode 100644 support/assetvalidation/.gitignore
 create mode 100644 support/assetvalidation/AssetValidation.py
 create mode 100644 support/assetvalidation/main.py
 create mode 100644 support/assetvalidation/readme.md
 create mode 100644 support/assetvalidation/requirements.txt

diff --git a/data/assets/examples/dashboarditems.asset b/data/assets/examples/dashboarditems.asset
index 0a9bee3b09..a072f0c44d 100644
--- a/data/assets/examples/dashboarditems.asset
+++ b/data/assets/examples/dashboarditems.asset
@@ -1,3 +1,6 @@
+asset.require("scene/solarsystem/planets/earth/earth")
+asset.require("scene/solarsystem/planets/earth/moon/moon")
+
 local Angle = {
   Type = "DashboardItemAngle",
   Identifier = "Angle",
diff --git a/data/assets/examples/screenspacedate.asset b/data/assets/examples/screenspacedate.asset
index 1411707622..7e7e189f5c 100644
--- a/data/assets/examples/screenspacedate.asset
+++ b/data/assets/examples/screenspacedate.asset
@@ -24,7 +24,7 @@ asset.onInitialize(function()
 end)
 
 asset.onDeinitialize(function()
-  openspace.addScreenSpaceRenderable(Dashboard)
+  openspace.removeScreenSpaceRenderable(Dashboard)
 end)
 
 asset.export(Dashboard)
diff --git a/data/assets/examples/statemachine.asset b/data/assets/examples/statemachine.asset
index 46253d3957..c7a1bd4384 100644
--- a/data/assets/examples/statemachine.asset
+++ b/data/assets/examples/statemachine.asset
@@ -1,6 +1,9 @@
 -- Create a state machine with a few different states. The state machine can be controlled through
 -- the scripting commands from the state machine module.
 
+asset.require("scene/solarsystem/planets/earth/earth")
+asset.require("scene/digitaluniverse/constellations")
+
 local function targetNode(nodeIdentifier)
   return [[
     openspace.setPropertyValueSingle("NavigationHandler.OrbitalNavigator.RetargetAnchor", nil)
diff --git a/data/assets/examples/urlsynchronization.asset b/data/assets/examples/urlsynchronization.asset
index e2139a84bf..ebf609ca71 100644
--- a/data/assets/examples/urlsynchronization.asset
+++ b/data/assets/examples/urlsynchronization.asset
@@ -20,12 +20,8 @@ asset.resource({
   Type = "UrlSynchronization",
   Identifier = "example_large",
   Url = {
-    "http://speedtest.tele2.net/100MB.zip",
-
     "https://proof.ovh.net/files/100Mb.dat",
 
-    "https://speed.hetzner.de/100MB.bin",
-
     "http://ipv4.download.thinkbroadband.com/200MB.zip",
     "http://ipv4.download.thinkbroadband.com/100MB.zip",
     "http://ipv4.download.thinkbroadband.com/50MB.zip",
diff --git a/data/assets/global/openspacebookmarks.asset b/data/assets/global/openspacebookmarks.asset
index 18d615397d..f647f678a4 100644
--- a/data/assets/global/openspacebookmarks.asset
+++ b/data/assets/global/openspacebookmarks.asset
@@ -1,7 +1,8 @@
+asset.require("scene/solarsystem/planets/earth/earth")
+asset.require("scene/solarsystem/planets/mars/mars")
 local bookmarkHelper = asset.require("util/generate_bookmarks")
 
 
-
 local dataProvider = "http://data.openspaceproject.com/files/bookmarks/v3/bookmarks.csv"
 
 local bookmarksCSV = asset.resource({
diff --git a/include/openspace/events/event.h b/include/openspace/events/event.h
index 58c48c39e9..cebcea7d2a 100644
--- a/include/openspace/events/event.h
+++ b/include/openspace/events/event.h
@@ -60,6 +60,7 @@ struct Event {
     enum class Type : uint8_t {
         ParallelConnection,
         ProfileLoadingFinished,
+        AssetLoadingFinished,
         ApplicationShutdown,
         CameraFocusTransition,
         TimeOfInterestReached,
@@ -148,6 +149,20 @@ struct EventProfileLoadingFinished : public Event {
     EventProfileLoadingFinished();
 };
 
+/**
+* This event is created when the loading of all assets are finished. This is emitted
+* regardless of whether it is the initial startup of a profile, or any subsequent asset
+* being loaded e.g., through add or drag-and-drop.
+*/
+struct EventAssetLoadingFinished : public Event {
+    static constexpr Type Type = Event::Type::AssetLoadingFinished;
+
+    /**
+     * Creates an instance of an AssetLoadingFinished event.
+     */
+    EventAssetLoadingFinished();
+};
+
 /**
  * This event is created whenever some information about the application shutdown sequence
  * changes. This can either be that the seqeuence started, was aborted, or is finished,
diff --git a/include/openspace/rendering/dashboard.h b/include/openspace/rendering/dashboard.h
index 1373a378cc..d3a74cc4a3 100644
--- a/include/openspace/rendering/dashboard.h
+++ b/include/openspace/rendering/dashboard.h
@@ -52,6 +52,7 @@ public:
     void removeDashboardItem(int index);
     void clearDashboardItems();
     glm::vec2 getStartPositionOffset();
+    std::vector<DashboardItem*> dashboardItems() const;
 
     /**
      * Returns the Lua library that contains all Lua functions available to affect the
diff --git a/modules/server/CMakeLists.txt b/modules/server/CMakeLists.txt
index 6979a06d7e..cd1642455f 100644
--- a/modules/server/CMakeLists.txt
+++ b/modules/server/CMakeLists.txt
@@ -37,6 +37,7 @@ set(HEADER_FILES
   include/topics/cameratopic.h
   include/topics/documentationtopic.h
   include/topics/enginemodetopic.h
+  include/topics/errorlogtopic.h
   include/topics/eventtopic.h
   include/topics/flightcontrollertopic.h
   include/topics/getpropertytopic.h
@@ -66,6 +67,7 @@ set(SOURCE_FILES
   src/topics/cameratopic.cpp
   src/topics/documentationtopic.cpp
   src/topics/enginemodetopic.cpp
+  src/topics/errorlogtopic.cpp
   src/topics/eventtopic.cpp
   src/topics/flightcontrollertopic.cpp
   src/topics/getpropertytopic.cpp
diff --git a/modules/server/include/topics/errorlogtopic.h b/modules/server/include/topics/errorlogtopic.h
new file mode 100644
index 0000000000..2541cabaad
--- /dev/null
+++ b/modules/server/include/topics/errorlogtopic.h
@@ -0,0 +1,49 @@
+/*****************************************************************************************
+ *                                                                                       *
+ * OpenSpace                                                                             *
+ *                                                                                       *
+ * Copyright (c) 2014-2024                                                               *
+ *                                                                                       *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
+ * software and associated documentation files (the "Software"), to deal in the Software *
+ * without restriction, including without limitation the rights to use, copy, modify,    *
+ * merge, publish, distribute, sublicense, and/or sell copies of the Software, and to    *
+ * permit persons to whom the Software is furnished to do so, subject to the following   *
+ * conditions:                                                                           *
+ *                                                                                       *
+ * The above copyright notice and this permission notice shall be included in all copies *
+ * or substantial portions of the Software.                                              *
+ *                                                                                       *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED,   *
+ * INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A         *
+ * PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT    *
+ * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF  *
+ * CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE  *
+ * OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                                         *
+ ****************************************************************************************/
+
+#ifndef __OPENSPACE_MODULE_SERVER___ERRORLOGTOPIC____H__
+#define __OPENSPACE_MODULE_SERVER___ERRORLOGTOPIC____H__
+
+#include <modules/server/include/topics/topic.h>
+#include <ghoul/logging/log.h>
+
+namespace openspace {
+
+class ErrorLogTopic : public Topic {
+public:
+    ErrorLogTopic() = default;
+    ~ErrorLogTopic() override;
+
+    void handleJson(const nlohmann::json& json) override;
+    bool isDone() const override;
+
+private:
+    bool _isSubscribedTo = false;
+    // Non owning but we remove the log from LogManager on destruction
+    ghoul::logging::Log* _log = nullptr;
+};
+
+} // namespace openspace
+
+#endif // !__OPENSPACE_MODULE_SERVER___ERRORLOGTOPIC____H__
diff --git a/modules/server/src/connection.cpp b/modules/server/src/connection.cpp
index 74b367af8c..93a5102cba 100644
--- a/modules/server/src/connection.cpp
+++ b/modules/server/src/connection.cpp
@@ -30,6 +30,7 @@
 #include <modules/server/include/topics/cameratopic.h>
 #include <modules/server/include/topics/documentationtopic.h>
 #include <modules/server/include/topics/enginemodetopic.h>
+#include <modules/server/include/topics/errorlogtopic.h>
 #include <modules/server/include/topics/eventtopic.h>
 #include <modules/server/include/topics/flightcontrollertopic.h>
 #include <modules/server/include/topics/getpropertytopic.h>
@@ -85,24 +86,25 @@ Connection::Connection(std::unique_ptr<ghoul::io::Socket> s, std::string address
         }
     );
 
-    _topicFactory.registerClass<MissionTopic>("missions");
+    _topicFactory.registerClass<BounceTopic>("bounce");
+    _topicFactory.registerClass<CameraTopic>("camera");
+    _topicFactory.registerClass<CameraPathTopic>("cameraPath");
     _topicFactory.registerClass<DocumentationTopic>("documentation");
+    _topicFactory.registerClass<EngineModeTopic>("engineMode");
+    _topicFactory.registerClass<ErrorLogTopic>("errorLog");
+    _topicFactory.registerClass<EventTopic>("event");
+    _topicFactory.registerClass<FlightControllerTopic>("flightcontroller");
     _topicFactory.registerClass<GetPropertyTopic>("get");
     _topicFactory.registerClass<LuaScriptTopic>("luascript");
-    _topicFactory.registerClass<EngineModeTopic>("engineMode");
+    _topicFactory.registerClass<MissionTopic>("missions");
     _topicFactory.registerClass<SessionRecordingTopic>("sessionRecording");
     _topicFactory.registerClass<SetPropertyTopic>("set");
     _topicFactory.registerClass<ShortcutTopic>("shortcuts");
+    _topicFactory.registerClass<SkyBrowserTopic>("skybrowser");
     _topicFactory.registerClass<SubscriptionTopic>("subscribe");
     _topicFactory.registerClass<TimeTopic>("time");
     _topicFactory.registerClass<TriggerPropertyTopic>("trigger");
-    _topicFactory.registerClass<BounceTopic>("bounce");
-    _topicFactory.registerClass<FlightControllerTopic>("flightcontroller");
     _topicFactory.registerClass<VersionTopic>("version");
-    _topicFactory.registerClass<SkyBrowserTopic>("skybrowser");
-    _topicFactory.registerClass<CameraTopic>("camera");
-    _topicFactory.registerClass<CameraPathTopic>("cameraPath");
-    _topicFactory.registerClass<EventTopic>("event");
 }
 
 void Connection::handleMessage(const std::string& message) {
diff --git a/modules/server/src/topics/errorlogtopic.cpp b/modules/server/src/topics/errorlogtopic.cpp
new file mode 100644
index 0000000000..e47cc5ebd0
--- /dev/null
+++ b/modules/server/src/topics/errorlogtopic.cpp
@@ -0,0 +1,121 @@
+/*****************************************************************************************
+ *                                                                                       *
+ * OpenSpace                                                                             *
+ *                                                                                       *
+ * Copyright (c) 2014-2024                                                               *
+ *                                                                                       *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
+ * software and associated documentation files (the "Software"), to deal in the Software *
+ * without restriction, including without limitation the rights to use, copy, modify,    *
+ * merge, publish, distribute, sublicense, and/or sell copies of the Software, and to    *
+ * permit persons to whom the Software is furnished to do so, subject to the following   *
+ * conditions:                                                                           *
+ *                                                                                       *
+ * The above copyright notice and this permission notice shall be included in all copies *
+ * or substantial portions of the Software.                                              *
+ *                                                                                       *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED,   *
+ * INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A         *
+ * PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT    *
+ * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF  *
+ * CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE  *
+ * OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                                         *
+ ****************************************************************************************/
+
+#include <modules/server/include/topics/errorlogtopic.h>
+
+#include <ghoul/logging/callbacklog.h>
+#include <ghoul/logging/logmanager.h>
+
+namespace {
+    constexpr std::string_view StartSubscription = "start_subscription";
+    constexpr std::string_view StopSubscription = "stop_subscription";
+
+    constexpr std::string_view SettingsKey = "settings";
+    constexpr std::string_view TimeStampingKey = "timeStamping";
+    constexpr std::string_view DateStampingKey = "dateStamping";
+    constexpr std::string_view CategoryStampingKey = "categoryStamping";
+    constexpr std::string_view LogLevelStampingKey = "logLevelStamping";
+    constexpr std::string_view LogLevelKey = "logLevel";
+} // namespace
+
+namespace openspace {
+
+ErrorLogTopic::~ErrorLogTopic() {
+    if (_log) {
+        ghoul::logging::LogManager::ref().removeLog(_log);
+        _log = nullptr;
+    }
+}
+
+void ErrorLogTopic::handleJson(const nlohmann::json& json) {
+    const std::string& event = json.at("event").get<std::string>();
+
+    if (event == StartSubscription) {
+        // Default settings for logging
+        auto timeStamping = ghoul::logging::Log::TimeStamping::Yes;
+        auto dateStamping = ghoul::logging::Log::DateStamping::Yes;
+        auto categoryStamping = ghoul::logging::Log::CategoryStamping::Yes;
+        auto logLevelStamping = ghoul::logging::Log::LogLevelStamping::Yes;
+        auto logLevel = ghoul::logging::LogLevel::AllLogging;
+
+        // Check if we got log settings on subscription
+        auto settings = json.find(SettingsKey);
+
+        if (settings != json.end()) {
+            if (auto ts = settings->find(TimeStampingKey); ts != settings->end()) {
+                timeStamping = ghoul::logging::Log::TimeStamping(ts->get<bool>()).value;
+            }
+
+            if (auto ds = settings->find(DateStampingKey); ds != settings->end()) {
+                dateStamping = ghoul::logging::Log::DateStamping(ds->get<bool>()).value;
+            }
+
+            if (auto cs = settings->find(CategoryStampingKey); cs != settings->end()) {
+                categoryStamping = ghoul::logging::Log::CategoryStamping(
+                    cs->get<bool>()).value;
+            }
+
+            if(auto lls = settings->find(LogLevelStampingKey); lls != settings->end()){
+                logLevelStamping = ghoul::logging::Log::LogLevelStamping(
+                    lls->get<bool>()).value;
+            }
+
+            if (auto ls = settings->find(LogLevelKey); ls != settings->end()) {
+                std::string level = ls->get<std::string>();
+                logLevel = ghoul::from_string<ghoul::logging::LogLevel>(level);
+            }
+
+        }
+
+        auto onLogging = [this](std::string message) {
+            _connection->sendJson(wrappedPayload(std::move(message)));
+        };
+
+        auto log = std::make_unique<ghoul::logging::CallbackLog>(
+            onLogging,
+            timeStamping,
+            dateStamping,
+            categoryStamping,
+            logLevelStamping,
+            logLevel
+        );
+        _log = log.get();
+
+        ghoul::logging::LogManager::ref().addLog(std::move(log));
+        _isSubscribedTo = true;
+    }
+
+    if (event == StopSubscription) {
+        _isSubscribedTo = false;
+
+        ghoul::logging::LogManager::ref().removeLog(_log);
+        _log = nullptr;
+    }
+}
+
+bool ErrorLogTopic::isDone() const {
+    return !_isSubscribedTo;
+}
+
+} // namespace openspace
diff --git a/modules/sync/syncs/httpsynchronization.cpp b/modules/sync/syncs/httpsynchronization.cpp
index f179178bc6..b42a4481d5 100644
--- a/modules/sync/syncs/httpsynchronization.cpp
+++ b/modules/sync/syncs/httpsynchronization.cpp
@@ -97,9 +97,10 @@ std::filesystem::path HttpSynchronization::directory() const {
 }
 
 void HttpSynchronization::start() {
-    if (isSyncing()) {
+    if (isSyncing() || isRejected()) {
         return;
     }
+
     _state = State::Syncing;
 
     const bool isSynced = isEachFileDownloaded();
@@ -108,9 +109,6 @@ void HttpSynchronization::start() {
         return;
     }
 
-    if (isRejected()) {
-        return;
-    }
 
     const std::string query = std::format(
         "?identifier={}&file_version={}&application_version={}",
diff --git a/modules/sync/syncs/urlsynchronization.cpp b/modules/sync/syncs/urlsynchronization.cpp
index 071f54ba8c..78572fc5fa 100644
--- a/modules/sync/syncs/urlsynchronization.cpp
+++ b/modules/sync/syncs/urlsynchronization.cpp
@@ -390,7 +390,9 @@ bool UrlSynchronization::trySyncUrls() {
         if (ec) {
             LERRORC(
                 "URLSynchronization",
-                std::format("Error renaming file '{}' to '{}'", tempName, originalName)
+                std::format(
+                    "Error renaming file '{}' to '{}' error code {}",
+                    tempName, originalName, ec.message())
             );
 
             failed = true;
diff --git a/src/events/event.cpp b/src/events/event.cpp
index dac24c8aea..ae631c6f67 100644
--- a/src/events/event.cpp
+++ b/src/events/event.cpp
@@ -62,6 +62,11 @@ void log(int i, [[maybe_unused]] const EventProfileLoadingFinished& e) {
     LINFO(std::format("[{}] ProfileLoadingFinished", i));
 }
 
+void log(int i, const EventAssetLoadingFinished& e) {
+    ghoul_assert(e.type == EventAssetLoadingFinished::Type, "Wrong type");
+    LINFO(std::format("[{}] AssetLoadingFinished", i));
+}
+
 void log(int i, const EventApplicationShutdown& e) {
     ghoul_assert(e.type == EventApplicationShutdown::Type, "Wrong type");
     const std::string t = [](EventApplicationShutdown::State state) {
@@ -220,6 +225,7 @@ std::string_view toString(Event::Type type) {
     switch (type) {
         case Event::Type::ParallelConnection: return "ParallelConnection";
         case Event::Type::ProfileLoadingFinished: return "ProfileLoadingFinished";
+        case Event::Type::AssetLoadingFinished: return "AssetLoadingFinished";
         case Event::Type::ApplicationShutdown: return "ApplicationShutdown";
         case Event::Type::CameraFocusTransition: return "CameraFocusTransition";
         case Event::Type::TimeOfInterestReached: return "TimeOfInterestReached";
@@ -253,6 +259,9 @@ Event::Type fromString(std::string_view str) {
     else if (str == "ProfileLoadingFinished") {
         return Event::Type::ProfileLoadingFinished;
     }
+    else if (str == "AssetLoadingFinished") {
+        return Event::Type::AssetLoadingFinished;
+    }
     else if (str == "ApplicationShutdown") {
         return Event::Type::ApplicationShutdown;
     }
@@ -505,6 +514,9 @@ void logAllEvents(const Event* e) {
             case Event::Type::ProfileLoadingFinished:
                 log(i, *static_cast<const EventProfileLoadingFinished*>(e));
                 break;
+            case Event::Type::AssetLoadingFinished:
+                log(i, *static_cast<const EventAssetLoadingFinished*>(e));
+                break;
             case Event::Type::ApplicationShutdown:
                 log(i, *static_cast<const EventApplicationShutdown*>(e));
                 break;
@@ -586,6 +598,10 @@ EventProfileLoadingFinished::EventProfileLoadingFinished()
     : Event(Type)
 {}
 
+EventAssetLoadingFinished::EventAssetLoadingFinished()
+    : Event(Type)
+{}
+
 EventApplicationShutdown::EventApplicationShutdown(State state_)
     : Event(Type)
     , state(state_)
diff --git a/src/rendering/dashboard.cpp b/src/rendering/dashboard.cpp
index c14511505c..572e75b933 100644
--- a/src/rendering/dashboard.cpp
+++ b/src/rendering/dashboard.cpp
@@ -148,13 +148,23 @@ glm::vec2 Dashboard::getStartPositionOffset() {
     return _startPositionOffset.value();
 }
 
+std::vector<DashboardItem*> Dashboard::dashboardItems() const {
+    std::vector<DashboardItem*> result;
+    result.reserve(_items.size());
+    for (const std::unique_ptr<DashboardItem>& d : _items) {
+        result.push_back(d.get());
+    }
+    return result;
+}
+
 scripting::LuaLibrary Dashboard::luaLibrary() {
     return {
         "dashboard",
         {
             codegen::lua::AddDashboardItem,
             codegen::lua::RemoveDashboardItem,
-            codegen::lua::ClearDashboardItems
+            codegen::lua::ClearDashboardItems,
+            codegen::lua::DashboardItems
         }
     };
 }
diff --git a/src/rendering/dashboard_lua.inl b/src/rendering/dashboard_lua.inl
index a7533b834a..f3141e9c0a 100644
--- a/src/rendering/dashboard_lua.inl
+++ b/src/rendering/dashboard_lua.inl
@@ -63,6 +63,23 @@ namespace {
     openspace::global::dashboard->clearDashboardItems();
 }
 
+
+/**
+ * Returns all loaded dashboard-item identifiers from the main dashboard.
+ *
+ * \return a list of loaded dashboard-item identifiers from the main dashbaord
+ */
+[[codegen::luawrap]] std::vector<std::string> dashboardItems() {
+    std::vector<std::string> result;
+    std::vector<openspace::DashboardItem*> dashboardItems =
+        openspace::global::dashboard->dashboardItems();
+    result.reserve(dashboardItems.size());
+    for (openspace::DashboardItem* dItem : dashboardItems) {
+        result.push_back(dItem->identifier());
+    }
+    return result;
+}
+
 #include "dashboard_lua_codegen.cpp"
 
 } // namespace
diff --git a/src/scene/assetmanager.cpp b/src/scene/assetmanager.cpp
index 419ec68e92..f58b8abb3b 100644
--- a/src/scene/assetmanager.cpp
+++ b/src/scene/assetmanager.cpp
@@ -27,6 +27,8 @@
 #include <openspace/documentation/documentation.h>
 #include <openspace/engine/openspaceengine.h>
 #include <openspace/engine/globals.h>
+#include <openspace/events/event.h>
+#include <openspace/events/eventengine.h>
 #include <openspace/scene/asset.h>
 #include <openspace/scripting/lualibrary.h>
 #include <ghoul/filesystem/filesystem.h>
@@ -145,6 +147,9 @@ void AssetManager::deinitialize() {
 void AssetManager::update() {
     ZoneScoped;
 
+    // Flag to keep track of when to emit synchronization event
+    const bool isLoadingAssets = !_toBeInitialized.empty();
+
     // Delete all the assets that have been marked for deletion in the previous frame
     {
         ZoneScopedN("Deleting assets");
@@ -158,12 +163,19 @@ void AssetManager::update() {
         ZoneScopedN("Initializing queued assets");
         Asset* a = *it;
 
-        if (a->isInitialized() || !a->isSynchronized()) {
+        if (a->isFailed()) {
+            _toBeInitialized.erase(it);
+            break;
+        }
+
+        if (!a->isSynchronized()) {
             // nothing to do here
             continue;
         }
 
-        a->initialize();
+        if (!a->isInitialized()) {
+            a->initialize();
+        }
 
         // We are only doing one asset per frame to keep the loading screen working a bit
         // smoother, so we remove the current one and then break out of the loop
@@ -257,7 +269,6 @@ void AssetManager::update() {
     }
     _assetRemoveQueue.clear();
 
-
     // Change state based on synchronizations. If any of the unfinished synchronizations
     // has finished since the last call of this function, we should notify the assets and
     // remove the synchronization from the list of unfinished ones so that we don't need
@@ -285,6 +296,11 @@ void AssetManager::update() {
             it++;
         }
     }
+
+    // If the _toBeInitialized state has changed in this update call we emit the event
+    if (isLoadingAssets && _toBeInitialized.empty()) {
+        global::eventEngine->publishEvent<events::EventAssetLoadingFinished>();
+    }
 }
 
 void AssetManager::add(const std::string& path) {
diff --git a/support/assetvalidation/.gitignore b/support/assetvalidation/.gitignore
new file mode 100644
index 0000000000..64e6ee9cf7
--- /dev/null
+++ b/support/assetvalidation/.gitignore
@@ -0,0 +1,16 @@
+# Custom
+log*.txt
+
+# Byte-compiled / optimized / DLL files
+__pycache__/
+*.py[cod]
+*$py.class
+
+# Environments
+.env
+.venv
+env/
+venv/
+ENV/
+env.bak/
+venv.bak/
diff --git a/support/assetvalidation/AssetValidation.py b/support/assetvalidation/AssetValidation.py
new file mode 100644
index 0000000000..68f022c0e5
--- /dev/null
+++ b/support/assetvalidation/AssetValidation.py
@@ -0,0 +1,297 @@
+"""
+OpenSpace
+
+Copyright (c) 2014-2024
+
+Permission is hereby granted, free of charge, to any person obtaining a copy of this
+software and associated documentation files (the "Software"), to deal in the Software
+without restriction, including without limitation the rights to use, copy, modify,
+merge, publish, distribute, sublicense, and/or sell copies of the Software, and to
+permit persons to whom the Software is furnished to do so, subject to the following
+conditions:
+
+The above copyright notice and this permission notice shall be included in all copies
+or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED,
+INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A
+PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF
+CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE
+OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+"""
+
+from openspace import Api
+import asyncio
+import logging
+import os
+import pathlib
+import subprocess
+import shutil
+import time
+
+# Global flag for verbose output
+verbose = False
+# Logging object
+logger = logging.getLogger(__name__)
+
+def log(*values: object, logLevel = logging.DEBUG):
+    """Custom log function to log messages to file and optionally to console"""
+    msg = ' '.join(str(v) for v in values)
+    if verbose:
+        print(msg)
+
+    match logLevel:
+        case logging.DEBUG:
+            logger.debug(msg)
+        case logging.INFO:
+            logger.info(msg)
+        case logging.WARNING:
+            logger.warning(msg)
+        case logging.ERROR:
+            logger.error(msg)
+        case logging.CRITICAL:
+            logger.critical(msg)
+
+def incrementLogNames():
+    """Keeps the last 5 logs and increment each log by one in each run"""
+    scriptDirectory = pathlib.Path(__file__).parent.resolve()
+    logs = list(pathlib.Path(scriptDirectory).rglob("log*.txt"))
+    for log in reversed(logs):
+        logname = log.name
+        if "_" in logname:
+            n = int(logname[logname.find("_") + 1])
+            if n == 5:
+                log.unlink()
+                continue
+            log.rename(f"{scriptDirectory}/log_{n + 1}.txt")
+        else:
+            log.rename(f"{scriptDirectory}/log_{1}.txt")
+
+async def subscribeToErrorlog(api: Api, exit: asyncio.Event):
+    topic = api.subscribeToLogMessages({
+        "timeStamping": False,
+        "dateStamping": False,
+        "logLevel": "Warning"
+    })
+    log("Subscribed to error log", logLevel = logging.INFO)
+
+    async for future in topic.iterator():
+        message = await future
+
+        level = logging.WARNING
+        if ("Error" in message):
+            level = logging.ERROR
+        if( "Fatal" in message):
+            level = logging.CRITICAL
+
+        log(message, logLevel = level)
+
+
+        if exit.is_set():
+            log("Unsubscribing from error log...")
+            topic.cancel()
+            log("Unsubscribed to error log", logLevel = logging.INFO)
+            break
+
+def removeCache(osDir):
+    """
+    Clears the contents of the OpenSpace cache directory
+    """
+    try:
+        cacheDir = os.path.join(osDir, "cache")
+        with os.scandir(cacheDir) as entries:
+            for entry in entries:
+                if entry.is_file():
+                    os.unlink(entry.path)
+                else:
+                    shutil.rmtree(entry.path)
+    except OSError as e:
+        log(f"Error removing cache: {e}", logLevel = logging.ERROR)
+
+async def ensureEmptyScene(openspace, loadedAsset: pathlib.Path):
+    """ Make sure that the scene is empty of all assets, actions, and screenspace
+    renderables. Unload and log any existing items
+    """
+    assets = await openspace.asset.allAssets()
+    if assets:
+        log(f"Handling asset: {loadedAsset}: {len(assets)} assets are still loaded",
+            logLevel = logging.ERROR
+        )
+        for asset in assets.values():
+            log(f"Removing asset: '{asset}'", logLevel = logging.ERROR)
+            await openspace.asset.remove(asset)
+
+    sceneGraphNodes = await openspace.sceneGraphNodes()
+    if len(sceneGraphNodes) > 1: # Root is always returned
+        log(f"Handling asset: {loadedAsset}: {len(sceneGraphNodes) - 1} scene graph" + \
+            " nodes are still loaded",
+            logLevel = logging.ERROR
+        )
+        for node in sceneGraphNodes.values():
+            if node == "Root":
+                continue
+            log(f"Removing scene graph node: '{node}'", logLevel = logging.ERROR)
+            await openspace.removeSceneGraphNode(node)
+
+    actions = await openspace.action.actions()
+    if actions:
+        log(f"Handling asset: {loadedAsset}: {len(actions)} actions are still loaded",
+            logLevel = logging.ERROR
+        )
+        for action in actions.values():
+            log(f"Removing action: '{action}'", logLevel = logging.ERROR)
+            await openspace.action.removeAction(action)
+
+    screenSpaceRenderables = await openspace.screenSpaceRenderables()
+    if screenSpaceRenderables:
+        log(f"Handling asset: {loadedAsset}: {len(screenSpaceRenderables)} screen-space" +
+            " renderables are still loaded",
+            logLevel = logging.ERROR
+        )
+        for screenSpace in screenSpaceRenderables.values():
+            log(f"Removing screen space renderable: '{screenSpace}'",
+                logLevel = logging.ERROR
+            )
+            await openspace.removeScreenSpaceRenderable(screenSpace)
+
+    dashboardItems = await openspace.dashboard.dashboardItems()
+    if dashboardItems:
+        log(f"Handling asset: {loadedAsset}: {len(dashboardItems)} dashboard items are" +
+            " still loaded", logLevel = logging.ERROR)
+        for dashboardItem in dashboardItems.values():
+            log(f"Removing dashboard item: '{dashboardItem}'", logLevel = logging.ERROR)
+            await openspace.dashboard.removeDashboardItem(dashboardItem)
+
+async def internalRun(openspace, assets: list[pathlib.Path], osDir: str, api: Api):
+    """
+    Logic for running the asset validation tests
+    """
+    assetCount = 1
+
+    logsettings = {
+        "timeStamping": False,
+        "dateStamping": False,
+        "logLevel": "Warning"
+    }
+    def onMessage(message):
+        level = logging.WARNING
+        if ("Error" in message):
+            level = logging.ERROR
+        if( "Fatal" in message):
+            level = logging.CRITICAL
+
+        log(message, logLevel = level)
+
+    cancelSubscriptionToErrorLog = api.subscribeToLogMessages(logsettings, onMessage)
+
+    async def unloadAssets():
+        log("Getting root assets")
+        roots = await openspace.asset.rootAssets()
+        log("Removing root assets")
+        for root in roots.values():
+            await openspace.asset.remove(root)
+
+    # Make sure we start on a completely empty scene
+    await unloadAssets()
+    await ensureEmptyScene(openspace, "Pre-emptying scene")
+
+    assetLoadingEvent = api.subscribeToEvent("AssetLoadingFinished")
+    log("Subscribed to AssetLoadingFinished event", logLevel = logging.INFO)
+
+    for asset in assets:
+        log(f"Handling asset {assetCount}/{len(assets)}", logLevel = logging.INFO)
+        log(f"Asset: {asset}")
+
+        # We want to start with a cleared cache to make sure assets load correctly from
+        # scratch
+        removeCache(osDir)
+        path = str(asset).replace(os.sep, "/")
+
+        # Load asset
+        log(f"Adding asset without cache")
+        await openspace.asset.add(path)
+        log("Waiting for AssetLoadingFinished event")
+        await api.nextValue(assetLoadingEvent)
+        log("AssetLoadingFinished event received")
+
+        # Unload asset
+        log("Unloading assets")
+        await unloadAssets()
+        log("Ensuring scene is empty")
+        await ensureEmptyScene(openspace, asset)
+
+        # Load asset using cache
+        log(f"Adding asset from cache")
+        await openspace.asset.add(path)
+        log("Waiting for AssetLoadingFinished event")
+        await api.nextValue(assetLoadingEvent)
+        log("AssetLoadingFinished event received")
+
+        # Unload assets again
+        log("Unloading assets")
+        await unloadAssets()
+        log("Ensuring scene is empty")
+        await ensureEmptyScene(openspace, asset)
+
+        assetCount += 1
+        log("Finished testing asset", logLevel = logging.INFO)
+        time.sleep(0.5) # Arbitrary sleep to let OpenSpace breathe
+
+    # eventUnsubscribeToErrorLog.set()
+    assetLoadingEvent.cancel() # Unsubscribe to event
+    await cancelSubscriptionToErrorLog()
+
+async def mainLoop(files, osDir):
+    log("Connecting to OpenSpace...")
+    api = Api("localhost", 4681)
+    api.connect()
+    openspace = await api.singleReturnLibrary()
+    log("Connected to OpenSpace")
+
+    await asyncio.create_task(internalRun(openspace, files, osDir, api))
+    api.disconnect()
+
+def runAssetValidation(files: list[pathlib.Path], executable: str, args):
+    """Run the validation on the given files using OpenSpace executable provided by
+    `executable`. This includes starting OpenSpace as a subprocess using a known
+    configuration file and the empty profile, establishing a connection using the Python
+    API to the OpenSpace instance, and then running the validation on the given files.
+
+    - `files` a list of file paths to the assets to validate
+    - `executable` the path to the OpenSpace executable that should be run for the
+    validation
+    """
+    incrementLogNames()
+
+    global verbose
+    verbose = args.verbose
+    scriptDirectory = pathlib.Path(__file__).parent.resolve()
+    logging.basicConfig(filename=f"{scriptDirectory}/log.txt",
+                    format='[%(asctime)s.%(msecs)03d] %(levelname)s: %(message)s',
+                    datefmt='%Y-%m-%d | %H:%M:%S',
+                    encoding='utf-8',
+                    level=logging.DEBUG if verbose else logging.WARNING
+                    )
+
+    startOpenSpace = args.startOS
+
+    if startOpenSpace:
+        log("Starting OpenSpace...")
+        process = subprocess.Popen(
+            [executable,
+            "--bypassLauncher"
+            ],
+            cwd=os.path.dirname(executable),
+            stdout=subprocess.DEVNULL,
+            stderr=subprocess.PIPE
+        )
+
+    # We wait for OpenSpace to start before trying to connect
+    if startOpenSpace:
+        time.sleep(5)
+    asyncio.new_event_loop().run_until_complete(mainLoop(files, args.dir))
+
+    if startOpenSpace:
+        process.kill()
\ No newline at end of file
diff --git a/support/assetvalidation/main.py b/support/assetvalidation/main.py
new file mode 100644
index 0000000000..94682ecce1
--- /dev/null
+++ b/support/assetvalidation/main.py
@@ -0,0 +1,126 @@
+"""
+OpenSpace
+
+Copyright (c) 2014-2024
+
+Permission is hereby granted, free of charge, to any person obtaining a copy of this
+software and associated documentation files (the "Software"), to deal in the Software
+without restriction, including without limitation the rights to use, copy, modify,
+merge, publish, distribute, sublicense, and/or sell copies of the Software, and to
+permit persons to whom the Software is furnished to do so, subject to the following
+conditions:
+
+The above copyright notice and this permission notice shall be included in all copies
+or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED,
+INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A
+PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF
+CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE
+OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+"""
+
+import argparse
+import os
+import pathlib
+from AssetValidation import runAssetValidation
+import re
+
+
+# Helper func because argparse does not handle boolean values nicely
+# https://stackoverflow.com/questions/15008758/parsing-boolean-values-with-argparse
+def str2bool(v):
+    """Helper function to parse boolean arguments passed in cli"""
+    if isinstance(v, bool):
+        return v
+    if v.lower() in ("yes", "true", "t", "y", "1"):
+        return True
+    elif v.lower() in ("no", "false", "f", "n", "0"):
+        return False
+    else:
+        raise argparse.ArgumentTypeError("Boolean value expected")
+
+def setupArgparse():
+    """
+    Creates and sets up a parser for commandline arguments. This function returns the parsed
+    arguments as a dictionary.
+    """
+
+    parser = argparse.ArgumentParser()
+    parser.add_argument(
+        "-d", "--dir",
+        dest="dir",
+        type=str,
+        help="Specifies the OpenSpace directory in which to run the validation",
+        required=True
+    )
+
+    parser.add_argument(
+        "-f", "--filter",
+        dest="filter",
+        type=str,
+        help="Specifies a regex expression to filter on a certain subset of .assets",
+        required=False
+    )
+
+    parser.add_argument(
+        "-v", "--verbose",
+        dest="verbose",
+        help="Prints verbose output",
+        required=False,
+        default=False,
+    )
+
+    parser.add_argument(
+        "-s", "--start",
+        dest="startOS",
+        help="Specifies whether to start OpenSpace as a subprocess before running the "
+             "validation",
+        required=False,
+        default=True,
+    )
+
+    parser.add_argument(
+        "-a", "--at",
+        dest="startAt",
+        help="Start validating at asset nr #. Useful if there OpenSpace crashed during "
+             "testing. Note the order in which assets are loaded is not guaranteed to be "
+             "the same between runs.",
+        required=False,
+        default=0,
+        type=int
+    )
+
+    args = parser.parse_args()
+    return args
+
+
+args = setupArgparse()
+
+args.verbose = str2bool(args.verbose)
+args.startOS = str2bool(args.startOS)
+
+# Find the exectuable location and its name
+if os.name == "nt":
+    # Windows
+    executable = f"{args.dir}/bin/RelWithDebInfo/OpenSpace.exe"
+else:
+    # Linux/Mac
+    executable = f"{args.dir}/bin/OpenSpace"
+
+if not os.path.exists(executable):
+    raise FileNotFoundError(f"Could not find OpenSpace executable at '{executable}'")
+
+files = list(pathlib.Path(f"{args.dir}/data/").rglob("*.asset"))
+if args.filter:
+    p = re.compile(args.filter)
+    files = [x for x in files if re.search(p, str(x))]
+
+# Sort files to make sure the files we've gotten are consistent between runs, this way we
+# can start from a specific index
+files.sort()
+files = files[args.startAt:]
+
+runAssetValidation(files, executable, args)
\ No newline at end of file
diff --git a/support/assetvalidation/readme.md b/support/assetvalidation/readme.md
new file mode 100644
index 0000000000..64da48c10e
--- /dev/null
+++ b/support/assetvalidation/readme.md
@@ -0,0 +1,15 @@
+# Description
+This script validates all* assets files by loading them one at a time into an empty scene in OpenSpace. The assets are loaded from scratch and then from cache and any errors are logged.
+
+# Setup
+The project provides a `requirements.txt` with the necessary dependencies. Install using e.g., pip `pip install -r /path/to/requirements.txt`
+
+# Running validation tests
+
+| Parameter | Description |
+| --------- | ----------- |
+| `--dir` | Points to the base folder of the OpenSpace version that is used to execute the validation. There needs to be a compiled version of OpenSpace available in the folder such that `bin/RelWithDebInfo/OpenSpace.exe`(on Windows) or `bin/OpenSpace` (on Linux) exists and is executable.|
+| `--filter` | Regex string to filter the assets to validate |
+| `--verbose` | If set to True output messages will also be printed to the console. |
+
+Example `python main.py --dir "C:/Development/OpenSpace" --filter "examples/*"
\ No newline at end of file
diff --git a/support/assetvalidation/requirements.txt b/support/assetvalidation/requirements.txt
new file mode 100644
index 0000000000..fdf963d4b8
--- /dev/null
+++ b/support/assetvalidation/requirements.txt
@@ -0,0 +1 @@
+openspace-api==0.1.2

From 6dd3dd8ab88653fddee0b2e480934faf53d3c0f8 Mon Sep 17 00:00:00 2001
From: Andreas Engberg <48772850+engbergandreas@users.noreply.github.com>
Date: Fri, 11 Oct 2024 10:13:32 +0200
Subject: [PATCH 646/701] Feature/UI launcher accessibility (#3417)

* update background and foreground colors in launcher

* Change tab order and preliminary focus visuals

* update focus color

Improves on #3091 but does not fixes it, the contrast ratio is 2.4/2.9-3.3 versus the white border/the gray background on each button/dropdown

* update focus border width

* Update color of error messages fixes #3103

* Enable enter key interaction on ui launcher buttons fixes #3092

* Update accessibility names on buttons and fields where the current readout does not make sense, fixes #3089

* Fixed issue where you could not tab out of multiline textfields

* Add overlay to the launcher image to increase contrast

* Slightly improves readability of Start button fixes #3096

We decided to keep the all caps to indicate call to action

* Add start button to have default focus which enables quick start by pressing enter or space on startup

* Removed overriden object name

* Update color label text for better clarity fixes #3094

The actual fix is in #9a7e8e1

* Add `esc` keypress to exit the launcher fixes #3097

* add placeholder text for profile name fixes #3101

* Fixed issue with properties, assets, and keybindings multiline readout, fixes #3098

* Change tab order of properties, assets, and keybindings: text area -> edit button,  fixes #3099

* Add prompt to user warning of unsaved changes in profile editor

* Add error message dialog fixes #3100

* Removed unused code

* Remove hardcoded color for information text in cameradialog

* Don't compare profile files but profiles instead

* Add same focus outline to all buttons in launcher

---------

Co-authored-by: Alexander Bock <mail@alexanderbock.eu>
Co-authored-by: Alexander Bock <alexander.bock@liu.se>
---
 .../ext/launcher/include/launcherwindow.h     |   7 +
 .../launcher/include/profile/actiondialog.h   |   3 +-
 .../ext/launcher/include/profile/assetedit.h  |   2 -
 .../launcher/include/profile/cameradialog.h   |   3 +-
 .../include/profile/deltatimesdialog.h        |   2 -
 .../launcher/include/profile/horizonsdialog.h |   1 -
 .../launcher/include/profile/modulesdialog.h  |   2 -
 .../launcher/include/profile/profileedit.h    |  10 +-
 .../include/profile/propertiesdialog.h        |   3 +-
 .../ext/launcher/resources/qss/launcher.qss   |  71 ++++---
 .../ext/launcher/src/launcherwindow.cpp       | 186 ++++++++++++------
 .../ext/launcher/src/profile/actiondialog.cpp |  27 +--
 .../src/profile/additionalscriptsdialog.cpp   |   1 +
 .../ext/launcher/src/profile/assetedit.cpp    | 109 ----------
 .../ext/launcher/src/profile/cameradialog.cpp |  20 +-
 .../launcher/src/profile/deltatimesdialog.cpp |  35 ++--
 .../launcher/src/profile/horizonsdialog.cpp   |  80 ++++----
 .../launcher/src/profile/marknodesdialog.cpp  |   2 +
 .../ext/launcher/src/profile/metadialog.cpp   |   6 +
 .../launcher/src/profile/modulesdialog.cpp    |  24 +--
 .../ext/launcher/src/profile/profileedit.cpp  | 112 +++++++----
 .../launcher/src/profile/propertiesdialog.cpp |  16 +-
 .../ext/launcher/src/profile/timedialog.cpp   |   7 +-
 .../ext/launcher/src/settingsdialog.cpp       |   2 +
 data/assets/util/launcher_images.asset        |   2 +-
 include/openspace/scene/profile.h             |  22 +++
 tests/test_profile.cpp                        | 103 +---------
 27 files changed, 390 insertions(+), 468 deletions(-)

diff --git a/apps/OpenSpace/ext/launcher/include/launcherwindow.h b/apps/OpenSpace/ext/launcher/include/launcherwindow.h
index c622fa325f..e0016cfe21 100644
--- a/apps/OpenSpace/ext/launcher/include/launcherwindow.h
+++ b/apps/OpenSpace/ext/launcher/include/launcherwindow.h
@@ -88,6 +88,13 @@ public:
       */
     bool isUserConfigSelected() const;
 
+    /**
+     * Handles keypresses while the Qt launcher window is open.
+     *
+     * \param evt QKeyEevent object of the key press event
+     */
+    void keyPressEvent(QKeyEvent* evt) override;
+
 private:
     QWidget* createCentralWidget();
     void setBackgroundImage(const std::filesystem::path& syncPath);
diff --git a/apps/OpenSpace/ext/launcher/include/profile/actiondialog.h b/apps/OpenSpace/ext/launcher/include/profile/actiondialog.h
index e7ec4b81b0..0cdd2b5c13 100644
--- a/apps/OpenSpace/ext/launcher/include/profile/actiondialog.h
+++ b/apps/OpenSpace/ext/launcher/include/profile/actiondialog.h
@@ -32,6 +32,7 @@
 class QCheckBox;
 class QComboBox;
 class QDialogButtonBox;
+class QErrorMessage;
 class QGridLayout;
 class QLabel;
 class QLineEdit;
@@ -78,7 +79,7 @@ private:
     struct {
         QListWidget* list = nullptr;
         QLineEdit* identifier = nullptr;
-        QLabel* infoText = nullptr;
+        QErrorMessage* infoText = nullptr;
         QLineEdit* name = nullptr;
         QLineEdit* guiPath = nullptr;
         QLineEdit* documentation = nullptr;
diff --git a/apps/OpenSpace/ext/launcher/include/profile/assetedit.h b/apps/OpenSpace/ext/launcher/include/profile/assetedit.h
index b34db0bbcf..7b0d329fb0 100644
--- a/apps/OpenSpace/ext/launcher/include/profile/assetedit.h
+++ b/apps/OpenSpace/ext/launcher/include/profile/assetedit.h
@@ -48,8 +48,6 @@ private:
 
     QBoxLayout* _layout = nullptr;
     QLineEdit* _nameEdit = nullptr;
-
-    QLabel* _errorMsg = nullptr;
 };
 
 #endif // __OPENSPACE_UI_LAUNCHER___ASSETEDIT___H__
diff --git a/apps/OpenSpace/ext/launcher/include/profile/cameradialog.h b/apps/OpenSpace/ext/launcher/include/profile/cameradialog.h
index 54fb9cb2b1..ea98ffc2cf 100644
--- a/apps/OpenSpace/ext/launcher/include/profile/cameradialog.h
+++ b/apps/OpenSpace/ext/launcher/include/profile/cameradialog.h
@@ -32,6 +32,7 @@
 
 class QLabel;
 class QLineEdit;
+class QMessageBox;
 class QTabWidget;
 
 class CameraDialog final : public QDialog {
@@ -88,7 +89,7 @@ private:
         QLineEdit* altitude = nullptr;
     } _geoState;
 
-    QLabel* _errorMsg = nullptr;
+    QMessageBox* _errorMsg = nullptr;
 };
 
 #endif // __OPENSPACE_UI_LAUNCHER___CAMERA___H__
diff --git a/apps/OpenSpace/ext/launcher/include/profile/deltatimesdialog.h b/apps/OpenSpace/ext/launcher/include/profile/deltatimesdialog.h
index ed5b57e66d..0b516cf276 100644
--- a/apps/OpenSpace/ext/launcher/include/profile/deltatimesdialog.h
+++ b/apps/OpenSpace/ext/launcher/include/profile/deltatimesdialog.h
@@ -97,8 +97,6 @@ private:
     QPushButton* _saveButton = nullptr;
     QPushButton* _discardButton = nullptr;
     QDialogButtonBox* _buttonBox = nullptr;
-
-    QLabel* _errorMsg = nullptr;
 };
 
 #endif // __OPENSPACE_UI_LAUNCHER___DELTATIMESDIALOG___H__
diff --git a/apps/OpenSpace/ext/launcher/include/profile/horizonsdialog.h b/apps/OpenSpace/ext/launcher/include/profile/horizonsdialog.h
index da4cb49118..3fd5f5006a 100644
--- a/apps/OpenSpace/ext/launcher/include/profile/horizonsdialog.h
+++ b/apps/OpenSpace/ext/launcher/include/profile/horizonsdialog.h
@@ -121,7 +121,6 @@ private:
     QLabel* _downloadLabel = nullptr;
     QPlainTextEdit* _log = nullptr;
 
-    QLabel* _errorMsg = nullptr;
     std::string _latestHorizonsError;
 };
 
diff --git a/apps/OpenSpace/ext/launcher/include/profile/modulesdialog.h b/apps/OpenSpace/ext/launcher/include/profile/modulesdialog.h
index 14002476b8..649ecba6f0 100644
--- a/apps/OpenSpace/ext/launcher/include/profile/modulesdialog.h
+++ b/apps/OpenSpace/ext/launcher/include/profile/modulesdialog.h
@@ -86,8 +86,6 @@ private:
     QPushButton* _buttonSave = nullptr;
     QPushButton* _buttonCancel = nullptr;
     QDialogButtonBox* _buttonBox = nullptr;
-
-    QLabel* _errorMsg = nullptr;
 };
 
 #endif // __OPENSPACE_UI_LAUNCHER___MODULESDIALOG___H__
diff --git a/apps/OpenSpace/ext/launcher/include/profile/profileedit.h b/apps/OpenSpace/ext/launcher/include/profile/profileedit.h
index e50a490a7c..383dcddd9a 100644
--- a/apps/OpenSpace/ext/launcher/include/profile/profileedit.h
+++ b/apps/OpenSpace/ext/launcher/include/profile/profileedit.h
@@ -79,6 +79,13 @@ public:
      */
     virtual void keyPressEvent(QKeyEvent* evt) override;
 
+    void reject() override;
+    void closeWithoutSaving();
+    void promptUserOfUnsavedChanges();
+
+signals:
+    void raiseExitWindow();
+
 private slots:
     void duplicateProfile();
     void openMeta();
@@ -91,7 +98,6 @@ private slots:
     void openDeltaTimes();
     void openCamera();
     void openMarkNodes();
-    void cancel();
     void approved();
 
 private:
@@ -119,8 +125,6 @@ private:
     QLabel* _timeLabel = nullptr;
     QLabel* _metaLabel = nullptr;
     QLabel* _additionalScriptsLabel = nullptr;
-
-    QLabel* _errorMsg = nullptr;
 };
 
 #endif // __OPENSPACE_UI_LAUNCHER___PROFILEEDIT___H__
diff --git a/apps/OpenSpace/ext/launcher/include/profile/propertiesdialog.h b/apps/OpenSpace/ext/launcher/include/profile/propertiesdialog.h
index a1ae8fc28d..8783ab6242 100644
--- a/apps/OpenSpace/ext/launcher/include/profile/propertiesdialog.h
+++ b/apps/OpenSpace/ext/launcher/include/profile/propertiesdialog.h
@@ -34,6 +34,7 @@ class QDialogButtonBox;
 class QLabel;
 class QLineEdit;
 class QListWidget;
+class QMessageBox;
 class QPushButton;
 
 class PropertiesDialog final : public QDialog {
@@ -93,7 +94,7 @@ private:
     QPushButton* _cancelButton = nullptr;
     QDialogButtonBox* _buttonBox = nullptr;
 
-    QLabel* _errorMsg = nullptr;
+    QMessageBox* _errorMsg = nullptr;
 };
 
 #endif // __OPENSPACE_UI_LAUNCHER___PROPERTIESDIALOG___H__
diff --git a/apps/OpenSpace/ext/launcher/resources/qss/launcher.qss b/apps/OpenSpace/ext/launcher/resources/qss/launcher.qss
index 68d95a4b84..c30323e20e 100644
--- a/apps/OpenSpace/ext/launcher/resources/qss/launcher.qss
+++ b/apps/OpenSpace/ext/launcher/resources/qss/launcher.qss
@@ -9,8 +9,13 @@ QLabel#heading {
   font-size: 12pt;
 }
 
-QLabel#error-message {
-  color: rgb(221, 17, 17);
+QPushButton:focus,
+QTextEdit:focus,
+QTabWidget:focus,
+QCheckBox:focus,
+QComboBox:focus {
+  outline: none;
+  border: 2px solid rgb(61, 189, 238);
 }
 
 /*
@@ -22,7 +27,7 @@ LauncherWindow  QLabel {
 }
 
 LauncherWindow  QLabel#label_choose, QLabel#label_options {
-  color: #dddddd;
+  color: rgb(255, 255, 255);
   font-size: 10pt;
 }
 
@@ -36,10 +41,9 @@ LauncherWindow  QLabel#version-info {
 }
 
 LauncherWindow  QComboBox#config {
-  background: rgb(96, 96, 96);
-  border: 1px solid rgb(128, 128, 128);
-  border-radius: 3px;
-  border-color: rgb(225, 225, 225);
+  background: rgb(86, 86, 86);
+  border: 1px solid rgb(225, 225, 225);
+  border-radius: 2px;
   padding: 1px 18px 1px 3px;
   min-width: 14em;
   font-size: 10pt;
@@ -49,7 +53,7 @@ LauncherWindow  QComboBox#config {
 }
 
 LauncherWindow  QComboBox#config:hover {
-  background: rgb(120, 120, 120);
+  background: rgb(110, 110, 110);
 }
 
 LauncherWindow  QComboBox#config:disabled {
@@ -57,26 +61,25 @@ LauncherWindow  QComboBox#config:disabled {
   color: rgb(225, 225, 225);
 }
 
-LauncherWindow  QPushButton#large {
-  background: rgb(128, 128, 128);
+LauncherWindow  QPushButton#start {
+  background: rgb(96, 96, 96);
+  border: 2px solid rgb(225, 225, 225);
   border-radius: 2px;
   border-style: outset;
-  border-width: 2px;
-  border-color: rgb(225, 225, 225);
   font-size: 16pt;
   font-weight: bold;
-  color: rgb(239, 239, 239);
+  letter-spacing: 1px;
+  color: rgb(255, 255, 255);
 }
-LauncherWindow  QPushButton#large:hover {
-  background: rgb(150, 150, 150);
+LauncherWindow  QPushButton#start:hover {
+  background: rgb(120, 120, 120);
 }
 
 LauncherWindow  QPushButton#small {
-  background: rgb(96, 96, 96);
+  background: rgb(86, 86, 86);
+  border: 1px solid rgb(225, 225, 225);
   border-radius: 2px;
   border-style: outset;
-  border-width: 1px;
-  border-color: rgb(225, 225, 225);
   min-height: 1em;
   font-size: 10pt;
   font-weight: bold;
@@ -84,12 +87,12 @@ LauncherWindow  QPushButton#small {
 }
 
 LauncherWindow  QPushButton#small:hover {
-  background: rgb(120, 120, 120);
+  background: rgb(110, 110, 110);
 }
 
 LauncherWindow  QPushButton#small:disabled {
-  color: rgb(180, 180, 180);
-  background: rgb(160, 160, 160);
+  background: rgb(204, 204, 204);
+  color: rgb(86, 86, 86);
 }
 
 LauncherWindow  QPushButton#settings {
@@ -101,7 +104,17 @@ LauncherWindow  QPushButton#settings:hover {
   border-image: url(:/images/cogwheel-highlight);
 }
 
+LauncherWindow QPushButton#small:focus,
+LauncherWindow QPushButton#start:focus,
+LauncherWindow QComboBox#config:focus
+{
+  outline: none;
+  border: 2px solid rgb(61, 189, 238);
+}
 
+LauncherWindow QPushButton#settings:focus {
+  outline: 2px solid rgb(61, 189, 238);
+}
 /*
  * ProfileEdit
  */
@@ -165,12 +178,7 @@ DeltaTimesDialog  QListWidget {
 /*
  * Camera
  */
-CameraDialog  QLabel#error-message {
-  min-width: 10em;
-}
-
 CameraDialog  QLabel#camera-description {
-  color:rgb(96, 96, 96);
   margin: 1em;
   margin-top: 0.2em;
   margin-bottom: 0.4em;
@@ -198,10 +206,6 @@ HorizonsDialog  QLabel#thin {
   font-weight: normal;
 }
 
-HorizonsDialog  QLabel#error {
-  color: rgb(221, 17, 17);
-}
-
 HorizonsDialog  QLabel#normal {
   color: rgb(0, 0, 0);
 }
@@ -223,8 +227,13 @@ WindowControl QLabel#notice {
 /*
  * Settings
  */
-SettingsWidget  QLabel#information {
+SettingsDialog QLabel#information {
   font-style: italic;
   font-weight: normal;
   font-size: 8pt;
 }
+
+SettingsDialog QComboBox#dropdown:focus {
+  outline: none;
+  border: 2px solid rgb(61, 189, 238);
+}
diff --git a/apps/OpenSpace/ext/launcher/src/launcherwindow.cpp b/apps/OpenSpace/ext/launcher/src/launcherwindow.cpp
index e9db214d84..406e8ca8fa 100644
--- a/apps/OpenSpace/ext/launcher/src/launcherwindow.cpp
+++ b/apps/OpenSpace/ext/launcher/src/launcherwindow.cpp
@@ -34,9 +34,12 @@
 #include <ghoul/logging/logmanager.h>
 #include <sgct/readconfig.h>
 #include <QComboBox>
+#include <QDialogButtonBox>
 #include <QFile>
+#include <QKeyEvent>
 #include <QLabel>
 #include <QMessageBox>
+#include <QPainter>
 #include <QPushButton>
 #include <QStandardItemModel>
 #include <filesystem>
@@ -51,6 +54,8 @@
 using namespace openspace;
 
 namespace {
+    constexpr std::string_view _loggerCat = "LauncherWindow";
+
     constexpr int ScreenWidth = 480;
     constexpr int ScreenHeight = 640;
 
@@ -66,7 +71,7 @@ namespace {
     namespace geometry {
         constexpr QRect BackgroundImage(0, 0, ScreenWidth, ScreenHeight);
         constexpr QRect LogoImage(LeftRuler, TopRuler, ItemWidth, ItemHeight);
-        constexpr QRect ChooseLabel(LeftRuler, TopRuler + 80, 151, 24);
+        constexpr QRect ChooseLabel(LeftRuler + 10, TopRuler + 80, 151, 24);
         constexpr QRect ProfileBox(LeftRuler, TopRuler + 110, ItemWidth, ItemHeight);
         constexpr QRect NewProfileButton(
             LeftRuler + 160, TopRuler + 180, SmallItemWidth, SmallItemHeight
@@ -74,7 +79,7 @@ namespace {
         constexpr QRect EditProfileButton(
             LeftRuler, TopRuler + 180, SmallItemWidth, SmallItemHeight
         );
-        constexpr QRect OptionsLabel(LeftRuler, TopRuler + 230, 151, 24);
+        constexpr QRect OptionsLabel(LeftRuler + 10, TopRuler + 230, 151, 24);
         constexpr QRect WindowConfigBox(LeftRuler, TopRuler + 260, ItemWidth, ItemHeight);
         constexpr QRect NewWindowButton(
             LeftRuler + 160, TopRuler + 330, SmallItemWidth, SmallItemHeight
@@ -242,6 +247,10 @@ LauncherWindow::LauncherWindow(bool profileEnabled,
     }
 
     setCentralWidget(createCentralWidget());
+    QPushButton* startButton = centralWidget()->findChild<QPushButton*>("start");
+    if (startButton) {
+        startButton->setFocus(Qt::OtherFocusReason);
+    }
 
     populateProfilesList(globalConfig.profile);
     _profileBox->setEnabled(profileEnabled);
@@ -277,43 +286,29 @@ QWidget* LauncherWindow::createCentralWidget() {
     logoImage->setPixmap(QPixmap(":/images/openspace-horiz-logo-small.png"));
 
     QLabel* labelChoose = new QLabel("Choose Profile", centralWidget);
-    labelChoose->setObjectName("clear");
     labelChoose->setGeometry(geometry::ChooseLabel);
     labelChoose->setObjectName("label_choose");
 
     _profileBox = new QComboBox(centralWidget);
     _profileBox->setObjectName("config");
     _profileBox->setGeometry(geometry::ProfileBox);
+    _profileBox->setAccessibleName("Choose profile");
 
-    QLabel* optionsLabel = new QLabel("Window Options", centralWidget);
-    optionsLabel->setObjectName("clear");
-    optionsLabel->setGeometry(geometry::OptionsLabel);
-    optionsLabel->setObjectName("label_options");
-
-    _windowConfigBox = new QComboBox(centralWidget);
-    _windowConfigBox->setObjectName("config");
-    _windowConfigBox->setGeometry(geometry::WindowConfigBox);
-
-    QPushButton* startButton = new QPushButton("START", centralWidget);
+    QPushButton* editProfileButton = new QPushButton("Edit", centralWidget);
     connect(
-        startButton, &QPushButton::released,
+        editProfileButton, &QPushButton::released,
         [this]() {
-            if (_profileBox->currentText().isEmpty()) {
-                QMessageBox::critical(
-                    this,
-                    "Empty Profile",
-                    "Cannot launch with an empty profile"
-                );
-            }
-            else {
-                _shouldLaunch = true;
-                close();
-            }
-        }
+        const std::string selection = _profileBox->currentText().toStdString();
+        const int selectedIndex = _profileBox->currentIndex();
+        const bool isUserProfile = selectedIndex < _userAssetCount;
+        openProfileEditor(selection, isUserProfile);
+    }
     );
-    startButton->setObjectName("large");
-    startButton->setGeometry(geometry::StartButton);
-    startButton->setCursor(Qt::PointingHandCursor);
+    editProfileButton->setObjectName("small");
+    editProfileButton->setGeometry(geometry::EditProfileButton);
+    editProfileButton->setCursor(Qt::PointingHandCursor);
+    editProfileButton->setAutoDefault(true);
+    editProfileButton->setAccessibleName("Edit profile");
 
     QPushButton* newProfileButton = new QPushButton("New", centralWidget);
     connect(
@@ -325,31 +320,17 @@ QWidget* LauncherWindow::createCentralWidget() {
     newProfileButton->setObjectName("small");
     newProfileButton->setGeometry(geometry::NewProfileButton);
     newProfileButton->setCursor(Qt::PointingHandCursor);
+    newProfileButton->setAutoDefault(true);
+    newProfileButton->setAccessibleName("New profile");
 
-    QPushButton* editProfileButton = new QPushButton("Edit", centralWidget);
-    connect(
-        editProfileButton, &QPushButton::released,
-        [this]() {
-            const std::string selection = _profileBox->currentText().toStdString();
-            const int selectedIndex = _profileBox->currentIndex();
-            const bool isUserProfile = selectedIndex < _userAssetCount;
-            openProfileEditor(selection, isUserProfile);
-        }
-    );
-    editProfileButton->setObjectName("small");
-    editProfileButton->setGeometry(geometry::EditProfileButton);
-    editProfileButton->setCursor(Qt::PointingHandCursor);
+    QLabel* optionsLabel = new QLabel("Window Options", centralWidget);
+    optionsLabel->setGeometry(geometry::OptionsLabel);
+    optionsLabel->setObjectName("label_options");
 
-    QPushButton* newWindowButton = new QPushButton("New", centralWidget);
-    connect(
-        newWindowButton, &QPushButton::released,
-        [this]() {
-            openWindowEditor("", true);
-        }
-    );
-    newWindowButton->setObjectName("small");
-    newWindowButton->setGeometry(geometry::NewWindowButton);
-    newWindowButton->setCursor(Qt::PointingHandCursor);
+    _windowConfigBox = new QComboBox(centralWidget);
+    _windowConfigBox->setObjectName("config");
+    _windowConfigBox->setGeometry(geometry::WindowConfigBox);
+    _windowConfigBox->setAccessibleName("Select window configuration");
 
     _editWindowButton = new QPushButton("Edit", centralWidget);
     connect(
@@ -368,7 +349,44 @@ QWidget* LauncherWindow::createCentralWidget() {
     _editWindowButton->setObjectName("small");
     _editWindowButton->setGeometry(geometry::EditWindowButton);
     _editWindowButton->setCursor(Qt::PointingHandCursor);
+    _editWindowButton->setAutoDefault(true);
+    _editWindowButton->setAccessibleName("Edit window configuration");
 
+    QPushButton* newWindowButton = new QPushButton("New", centralWidget);
+    connect(
+        newWindowButton, &QPushButton::released,
+        [this]() {
+            openWindowEditor("", true);
+        }
+    );
+    newWindowButton->setObjectName("small");
+    newWindowButton->setGeometry(geometry::NewWindowButton);
+    newWindowButton->setCursor(Qt::PointingHandCursor);
+    newWindowButton->setAutoDefault(true);
+    newWindowButton->setAccessibleName("New window configuration");
+
+    QPushButton* startButton = new QPushButton("START", centralWidget);
+    connect(
+        startButton, &QPushButton::released,
+        [this]() {
+            if (_profileBox->currentText().isEmpty()) {
+                QMessageBox::critical(
+                    this,
+                    "Empty Profile",
+                    "Cannot launch with an empty profile"
+                );
+            }
+            else {
+                _shouldLaunch = true;
+                close();
+            }
+        }
+    );
+    startButton->setObjectName("start");
+    startButton->setGeometry(geometry::StartButton);
+    startButton->setCursor(Qt::PointingHandCursor);
+    startButton->setAutoDefault(true);
+    startButton->setAccessibleName("Start OpenSpace");
 
     QLabel* versionLabel = new QLabel(centralWidget);
     versionLabel->setVisible(true);
@@ -379,9 +397,6 @@ QWidget* LauncherWindow::createCentralWidget() {
     versionLabel->setGeometry(geometry::VersionString);
 
     QPushButton* settingsButton = new QPushButton(centralWidget);
-    settingsButton->setObjectName("settings");
-    settingsButton->setGeometry(geometry::SettingsButton);
-    settingsButton->setIconSize(QSize(SettingsIconSize, SettingsIconSize));
     connect(
         settingsButton,
         &QPushButton::released,
@@ -410,6 +425,11 @@ QWidget* LauncherWindow::createCentralWidget() {
             dialog.exec();
         }
     );
+    settingsButton->setObjectName("settings");
+    settingsButton->setGeometry(geometry::SettingsButton);
+    settingsButton->setIconSize(QSize(SettingsIconSize, SettingsIconSize));
+    settingsButton->setAutoDefault(true);
+    settingsButton->setAccessibleName("Settings");
 
     return centralWidget;
 }
@@ -454,27 +474,33 @@ void LauncherWindow::setBackgroundImage(const std::filesystem::path& syncPath) {
     // We know there has to be at least one folder, so it's fine to just pick the first
     while (!files.empty()) {
         const std::filesystem::path& p = files.front();
-        if (p.extension() == ".png") {
-            // If the top path starts with the png extension, we have found our candidate
-            break;
+        if (p.extension() != ".png" || p.filename() == "overlay.png") {
+            files.erase(files.begin());
         }
         else {
-            // There shouldn't be any non-png images in here, but you never know. So we 
-            // just remove non-image files here
-            files.erase(files.begin());
+            // If the top path starts with the png extension, we have found our candidate
+            break;
         }
     }
 
     // There better be at least one file left, but just in in case
     if (!files.empty()) {
+        // Take the selected image and overpaint the overlay increasing the contrast
         std::string image = files.front().string();
-        _backgroundImage->setPixmap(QPixmap(QString::fromStdString(image)));
+        QPixmap pixmap = QPixmap(QString::fromStdString(image));
+        QPainter painter = QPainter(&pixmap);
+        painter.setOpacity(0.7);
+        QPixmap overlay = QPixmap(QString::fromStdString(
+            std::format("{}/overlay.png", latest.path.path())
+        ));
+        painter.drawPixmap(pixmap.rect(), overlay);
+        _backgroundImage->setPixmap(pixmap);
     }
 }
 
 void LauncherWindow::populateProfilesList(const std::string& preset) {
     namespace fs = std::filesystem;
-    
+
     _profileBox->clear();
     _userAssetCount = 0;
 
@@ -745,7 +771,7 @@ void LauncherWindow::onNewWindowConfigSelection(int newIndex) {
                     versionMin.versionString()
                 )));
                 return;
-            } 
+            }
         }
         catch (const std::runtime_error&) {
             // Ignore an exception here because clicking the edit button will
@@ -781,6 +807,29 @@ void LauncherWindow::openProfileEditor(const std::string& profile, bool isUserPr
         savePath,
         this
     );
+
+    // Check whether there are unsaved changes from the profile editor
+    connect(
+        &editor,
+        &ProfileEdit::raiseExitWindow,
+        [this, &editor, &savePath, &p, &profile]() {
+            const std::string origPath = std::format("{}{}.profile", savePath, profile);
+            // If this is a new profile we want to prompt the user
+            if (!std::filesystem::exists(origPath)) {
+                editor.promptUserOfUnsavedChanges();
+                return;
+            }
+
+            // Check if the profile is the same as current existing file
+            if (*p != Profile(origPath)) {
+                editor.promptUserOfUnsavedChanges();
+            }
+            else {
+                editor.closeWithoutSaving();
+            }
+        }
+    );
+
     editor.exec();
     if (editor.wasSaved()) {
         if (editor.specifiedFilename() != profile) {
@@ -932,3 +981,12 @@ bool LauncherWindow::isUserConfigSelected() const {
     const int selectedIndex = _windowConfigBox->currentIndex();
     return (selectedIndex <= _userConfigCount);
 }
+
+void LauncherWindow::keyPressEvent(QKeyEvent* evt) {
+    if (evt->key() == Qt::Key_Escape) {
+        _shouldLaunch = false;
+        close();
+        return;
+    }
+    QMainWindow::keyPressEvent(evt);
+}
diff --git a/apps/OpenSpace/ext/launcher/src/profile/actiondialog.cpp b/apps/OpenSpace/ext/launcher/src/profile/actiondialog.cpp
index 31257856b0..5207f4ddde 100644
--- a/apps/OpenSpace/ext/launcher/src/profile/actiondialog.cpp
+++ b/apps/OpenSpace/ext/launcher/src/profile/actiondialog.cpp
@@ -32,6 +32,7 @@
 #include <QCheckBox>
 #include <QComboBox>
 #include <QDialogButtonBox>
+#include <QErrorMessage>
 #include <QGridLayout>
 #include <QHBoxLayout>
 #include <QLabel>
@@ -103,7 +104,7 @@ void ActionDialog::createWidgets() {
     //  *----------------------*---------------*-----------------*
 
     QGridLayout* layout = new QGridLayout(this);
-    
+
     createActionWidgets(layout);
     clearActionFields();
 
@@ -161,25 +162,17 @@ void ActionDialog::createActionWidgets(QGridLayout* layout) {
         [this]() {
             // Check if the identifier is legal
             const std::string id = _actionWidgets.identifier->text().toStdString();
-            const bool isLegal = id.find_first_of("\t\n. ") == std::string::npos;
-            if (isLegal) {
-                _actionWidgets.infoText->clear();
-                _actionWidgets.infoText->setHidden(true);
-            }
-            else {
-                _actionWidgets.infoText->setText(
-                    "Identifier must not contain whitespace or ."
+            const bool isLegal = id.find_first_of("\t\n ") == std::string::npos;
+            if (!isLegal) {
+                _actionWidgets.infoText->showMessage(
+                    "Identifier must not contain whitespace"
                 );
-                _actionWidgets.infoText->setHidden(false);
             }
         }
     );
     layout->addWidget(_actionWidgets.identifier, 1, 2);
 
-    _actionWidgets.infoText = new QLabel;
-    _actionWidgets.infoText->setHidden(true);
-    _actionWidgets.infoText->setObjectName("error-message");
-    layout->addWidget(_actionWidgets.infoText, 1, 3);
+    _actionWidgets.infoText = new QErrorMessage(this);
 
     layout->addWidget(new QLabel("Name"), 2, 1);
     _actionWidgets.name = new QLineEdit;
@@ -243,6 +236,7 @@ void ActionDialog::createActionWidgets(QGridLayout* layout) {
         "`args` variable when this script executes. If no arguments are passed, this "
         "variable does not exist"
     );
+    _actionWidgets.script->setTabChangesFocus(true);
     _actionWidgets.script->setEnabled(false);
     layout->addWidget(_actionWidgets.script, 6, 2, 1, 2);
 
@@ -612,7 +606,6 @@ void ActionDialog::actionSaved() {
         }
         action->identifier = newIdentifier;
     }
-    
 
     action->name = _actionWidgets.name->text().toStdString();
     std::string guiPath = _actionWidgets.guiPath->text().toStdString();
@@ -643,8 +636,6 @@ void ActionDialog::clearActionFields() const {
     _actionWidgets.list->setCurrentRow(-1);
     _actionWidgets.identifier->clear();
     _actionWidgets.identifier->setEnabled(false);
-    _actionWidgets.infoText->clear();
-    _actionWidgets.infoText->setHidden(true);
     _actionWidgets.name->clear();
     _actionWidgets.name->setEnabled(false);
     _actionWidgets.guiPath->clear();
@@ -701,7 +692,7 @@ void ActionDialog::keybindingAdd() {
 void ActionDialog::keybindingRemove() {
     const Profile::Keybinding* keybinding = selectedKeybinding();
     ghoul_assert(keybinding, "A keybinding must be selected at this point");
-    
+
     for (size_t i = 0; i < _keybindingsData.size(); i++) {
         if (_keybindingsData[i].key == keybinding->key &&
             _keybindingsData[i].action == keybinding->action)
diff --git a/apps/OpenSpace/ext/launcher/src/profile/additionalscriptsdialog.cpp b/apps/OpenSpace/ext/launcher/src/profile/additionalscriptsdialog.cpp
index fe57e85aaf..9810c3d530 100644
--- a/apps/OpenSpace/ext/launcher/src/profile/additionalscriptsdialog.cpp
+++ b/apps/OpenSpace/ext/launcher/src/profile/additionalscriptsdialog.cpp
@@ -64,6 +64,7 @@ void AdditionalScriptsDialog::createWidgets() {
 
     _textScripts = new QTextEdit;
     _textScripts->setAcceptRichText(false);
+    _textScripts->setTabChangesFocus(true);
     layout->addWidget(_textScripts, 1);
 
     _chooseScriptsButton = new QPushButton("Choose Scripts");
diff --git a/apps/OpenSpace/ext/launcher/src/profile/assetedit.cpp b/apps/OpenSpace/ext/launcher/src/profile/assetedit.cpp
index 2d94fd6aa4..cd744d2b64 100644
--- a/apps/OpenSpace/ext/launcher/src/profile/assetedit.cpp
+++ b/apps/OpenSpace/ext/launcher/src/profile/assetedit.cpp
@@ -72,40 +72,10 @@ void AssetEdit::createWidgets() {
 
         _layout->addWidget(generateButton);
     }
-    //{
-    //    QBoxLayout* container = new QHBoxLayout(this);
-    //    QLabel* assetLabel = new QLabel("Asset Name:");
-    //    assetLabel->setObjectName("profile");
-    //    container->addWidget(assetLabel);
 
-    //    _nameEdit = new QLineEdit();
-    //    container->addWidget(_nameEdit);
-
-    //    _layout->addLayout(container);
-    //}
-    //_layout->addWidget(new Line);
-    //{
-    //    QBoxLayout* container = new QHBoxLayout(this);
-    //    _components = new QComboBox(this);
-    //    _components->addItems(_supportedComponents);
-    //    _components->setCurrentIndex(0);
-    //    container->addWidget(_components);
-
-    //    QPushButton* addButton = new QPushButton("Add", this);
-    //    connect(addButton, &QPushButton::clicked, this, &AssetEdit::openComponent);
-    //    addButton->setCursor(Qt::PointingHandCursor);
-    //    container->addWidget(addButton);
-
-    //    _layout->addLayout(container);
-    //}
     _layout->addWidget(new Line);
     {
         QBoxLayout* footer = new QHBoxLayout;
-        _errorMsg = new QLabel;
-        _errorMsg->setObjectName("error-message");
-        _errorMsg->setWordWrap(true);
-        footer->addWidget(_errorMsg);
-
         QDialogButtonBox* buttons = new QDialogButtonBox;
         buttons->setStandardButtons(QDialogButtonBox::Save | QDialogButtonBox::Cancel);
         connect(buttons, &QDialogButtonBox::accepted, this, &AssetEdit::approved);
@@ -115,93 +85,14 @@ void AssetEdit::createWidgets() {
     }
 }
 
-//void AssetEdit::openComponent() {
-//    switch (_components->currentIndex()) {
-//        case 0:
-//            _errorMsg->setText("Choose a component to add to the asset");
-//            break;
-//        case 1: {
-//            QBoxLayout* horizonsLayout = new QVBoxLayout(this);
-//            {
-//                QLabel* label = new QLabel("Horizons Translation:", this);
-//                label->setObjectName("heading");
-//                horizonsLayout->addWidget(label);
-//            }
-//            {
-//                QBoxLayout* container = new QHBoxLayout(this);
-//                QLabel* fileLabel = new QLabel("File path:", this);
-//                container->addWidget(fileLabel);
-//
-//                _horizonsFileEdit = new QLineEdit(this);
-//                container->addWidget(_horizonsFileEdit);
-//
-//                QPushButton* fileButton = new QPushButton("Browse", this);
-//                connect(
-//                    fileButton,
-//                    &QPushButton::released,
-//                    this,
-//                    &AssetEdit::openHorizonsFile
-//                );
-//                fileButton->setCursor(Qt::PointingHandCursor);
-//                container->addWidget(fileButton);
-//
-//                QPushButton* generateButton = new QPushButton("Generate", this);
-//                connect(
-//                    generateButton,
-//                    &QPushButton::released,
-//                    this,
-//                    &AssetEdit::openHorizons
-//                );
-//
-//                // In order to generate a Horizons File the Space module is required
-//                #ifndef OPENSPACE_MODULE_SPACE_ENABLED
-//                    generateButton->setEnabled(false);
-//                    generateButton->setToolTip(
-//                        "Connot generate Horizons file without the space module enabled"
-//                    );
-//                #else
-//                    generateButton->setCursor(Qt::PointingHandCursor);
-//                #endif // OPENSPACE_MODULE_SPACE_ENABLED
-//
-//                container->addWidget(generateButton);
-//                horizonsLayout->addLayout(container);
-//            }
-//            horizonsLayout->addWidget(new Line);
-//            _layout->insertLayout(_layout->count() - 3, horizonsLayout);
-//            break;
-//        }
-//        default:
-//            _errorMsg->setText("Unkown component");
-//            break;
-//    }
-//}
-//
-//void AssetEdit::openHorizonsFile() {
-//    std::string filePath = QFileDialog::getOpenFileName(
-//        this,
-//        tr("Open Horizons file"),
-//        "",
-//        tr("Horiozons file (*.dat)")
-//    ).toStdString();
-//    _horizonsFile = std::filesystem::absolute(filePath);
-//    _horizonsFileEdit->setText(QString(_horizonsFile.string().c_str()));
-//}
 
 void AssetEdit::openHorizons() {
-    _errorMsg->clear();
 #ifdef OPENSPACE_MODULE_SPACE_ENABLED
     HorizonsDialog* horizonsDialog = new HorizonsDialog(this);
     horizonsDialog->exec();
-    //_horizonsFile = horizonsDialog->file();
-    //_horizonsFileEdit->setText(QString(_horizonsFile.string().c_str()));
 #endif // OPENSPACE_MODULE_SPACE_ENABLED
 }
 
 void AssetEdit::approved() {
-//    std::string assetName = _nameEdit->text().toStdString();
-//    if (assetName.empty()) {
-//        _errorMsg->setText("Asset name must be specified");
-//        return;
-//    }
     accept();
 }
diff --git a/apps/OpenSpace/ext/launcher/src/profile/cameradialog.cpp b/apps/OpenSpace/ext/launcher/src/profile/cameradialog.cpp
index 82e4360098..3da47bdafc 100644
--- a/apps/OpenSpace/ext/launcher/src/profile/cameradialog.cpp
+++ b/apps/OpenSpace/ext/launcher/src/profile/cameradialog.cpp
@@ -34,6 +34,7 @@
 #include <QKeyEvent>
 #include <QLabel>
 #include <QLineEdit>
+#include <QMessageBox>
 #include <QPlainTextEdit>
 #include <QPushButton>
 #include <QTabWidget>
@@ -173,10 +174,9 @@ void CameraDialog::createWidgets() {
     {
         QBoxLayout* footerLayout = new QHBoxLayout;
 
-        _errorMsg = new QLabel;
-        _errorMsg->setObjectName("error-message");
-        _errorMsg->setWordWrap(true);
-        footerLayout->addWidget(_errorMsg);
+        _errorMsg = new QMessageBox(this);
+        _errorMsg->setIcon(QMessageBox::Critical);
+        _errorMsg->setText("Invalid input data");
 
         QDialogButtonBox* buttons = new QDialogButtonBox;
         buttons->setStandardButtons(QDialogButtonBox::Save | QDialogButtonBox::Cancel);
@@ -352,6 +352,9 @@ QWidget* CameraDialog::createNavStateWidget() {
                 this,
                 "Select navigate state file"
             );
+            if (file.isEmpty()) {
+                return;
+            }
 
             std::ifstream f = std::ifstream(file.toStdString());
             const std::string contents = std::string(
@@ -441,7 +444,7 @@ QWidget* CameraDialog::createGeoWidget() {
 
 bool CameraDialog::areRequiredFormsFilledAndValid() {
     bool allFormsOk = true;
-    _errorMsg->clear();
+    _errorMsg->setInformativeText("");
 
     if (_tabWidget->currentIndex() == CameraTypeNode) {
         if (_nodeState.anchor->text().isEmpty()) {
@@ -525,16 +528,17 @@ bool CameraDialog::areRequiredFormsFilledAndValid() {
 }
 
 void CameraDialog::addErrorMsg(const QString& errorDescription) {
-    QString contents = _errorMsg->text();
+    QString contents = _errorMsg->informativeText();
     if (!contents.isEmpty()) {
         contents += ", ";
     }
     contents += errorDescription;
-    _errorMsg->setText(contents);
+    _errorMsg->setInformativeText(contents);
 }
 
 void CameraDialog::approved() {
     if (!areRequiredFormsFilledAndValid()) {
+        _errorMsg->exec();
         return;
     }
 
@@ -597,7 +601,7 @@ void CameraDialog::approved() {
 }
 
 void CameraDialog::tabSelect(int tabIndex) {
-    _errorMsg->clear();
+    _errorMsg->setInformativeText("");
 
     if (tabIndex == CameraTypeNode) {
         _nodeState.anchor->setFocus(Qt::OtherFocusReason);
diff --git a/apps/OpenSpace/ext/launcher/src/profile/deltatimesdialog.cpp b/apps/OpenSpace/ext/launcher/src/profile/deltatimesdialog.cpp
index 8a8fcb1688..78e1f3c945 100644
--- a/apps/OpenSpace/ext/launcher/src/profile/deltatimesdialog.cpp
+++ b/apps/OpenSpace/ext/launcher/src/profile/deltatimesdialog.cpp
@@ -35,6 +35,7 @@
 #include <QLabel>
 #include <QLineEdit>
 #include <QListWidget>
+#include <QMessageBox>
 #include <QPushButton>
 #include <QVBoxLayout>
 #include <array>
@@ -107,7 +108,7 @@ void DeltaTimesDialog::createWidgets() {
     _listWidget->setAutoScroll(true);
     _listWidget->setLayoutMode(QListView::SinglePass);
     layout->addWidget(_listWidget);
-    
+
     {
         QBoxLayout* buttonLayout = new QHBoxLayout;
         _addButton = new QPushButton("Add Entry");
@@ -128,14 +129,15 @@ void DeltaTimesDialog::createWidgets() {
         layout->addLayout(buttonLayout);
     }
 
-    _adjustLabel = new QLabel("Set Simulation Time Increment for key");
+    _adjustLabel = new QLabel("Set Simulation Time Increment (in seconds) for key");
     layout->addWidget(_adjustLabel);
-    
+
     {
         QBoxLayout* box = new QHBoxLayout;
         _seconds = new QLineEdit;
         _seconds->setValidator(new QDoubleValidator);
         connect(_seconds, &QLineEdit::textChanged, this, &DeltaTimesDialog::valueChanged);
+        _seconds->setAccessibleName("Set simulation time increment in seconds for key");
         box->addWidget(_seconds);
 
         _value = new QLabel;
@@ -165,11 +167,6 @@ void DeltaTimesDialog::createWidgets() {
     layout->addWidget(new Line);
     {
         QBoxLayout* footer = new QHBoxLayout;
-        _errorMsg = new QLabel;
-        _errorMsg->setObjectName("error-message");
-        _errorMsg->setWordWrap(true);
-        footer->addWidget(_errorMsg);
-
         _buttonBox = new QDialogButtonBox;
         _buttonBox->setStandardButtons(QDialogButtonBox::Save | QDialogButtonBox::Cancel);
         connect(
@@ -230,7 +227,7 @@ void DeltaTimesDialog::listItemSelected() {
 }
 
 void DeltaTimesDialog::setLabelForKey(int index, bool editMode, std::string_view color) {
-    std::string labelS = "Set Simulation Time Increment for key";
+    std::string labelS = "Set Simulation Time Increment (in seconds) for key";
     if (index >= static_cast<int>(_deltaTimesData.size())) {
         index = static_cast<int>(_deltaTimesData.size()) - 1;
     }
@@ -243,15 +240,9 @@ void DeltaTimesDialog::setLabelForKey(int index, bool editMode, std::string_view
 }
 
 void DeltaTimesDialog::valueChanged(const QString& text) {
-    if (text.isEmpty()) {
-        _errorMsg->setText("");
-    }
-    else {
-        const double value = text.toDouble();
-        if (value != 0.0) {
-            _value->setText(QString::fromStdString(timeDescription(value)));
-            _errorMsg->setText("");
-        }
+    const double value = text.toDouble();
+    if (value != 0.0) {
+        _value->setText(QString::fromStdString(timeDescription(value)));
     }
 }
 
@@ -282,7 +273,11 @@ void DeltaTimesDialog::addDeltaTimeValue() {
         _listWidget->addItem(new QListWidgetItem(messageAddValue));
     }
     else {
-        _errorMsg->setText("Exceeded maximum amount of simulation time increments");
+        QMessageBox::critical(
+            this,
+            "Error",
+            "Exceeded maximum amount of simulation time increments"
+        );
     }
     _listWidget->setCurrentRow(_listWidget->count() - 1);
     _seconds->setFocus(Qt::OtherFocusReason);
@@ -337,7 +332,6 @@ void DeltaTimesDialog::transitionEditMode(int index, bool state) {
     _discardButton->setEnabled(state);
     _adjustLabel->setEnabled(state);
     _seconds->setEnabled(state);
-    _errorMsg->clear();
 
     if (state) {
         _seconds->setFocus(Qt::OtherFocusReason);
@@ -348,7 +342,6 @@ void DeltaTimesDialog::transitionEditMode(int index, bool state) {
         setLabelForKey(index, false, "light gray");
         _value->clear();
     }
-    _errorMsg->clear();
 }
 
 void DeltaTimesDialog::parseSelections() {
diff --git a/apps/OpenSpace/ext/launcher/src/profile/horizonsdialog.cpp b/apps/OpenSpace/ext/launcher/src/profile/horizonsdialog.cpp
index 94b5d24882..beecd9e159 100644
--- a/apps/OpenSpace/ext/launcher/src/profile/horizonsdialog.cpp
+++ b/apps/OpenSpace/ext/launcher/src/profile/horizonsdialog.cpp
@@ -125,7 +125,7 @@ void HorizonsDialog::typeOnChange(int index) {
         _timeTypeCombo->insertItem(0, TimeVarying.data());
     }
     else {
-        _errorMsg->setText("Invalid Horizons type");
+        QMessageBox::critical(this, "Error", "Invalid Horizons type");
         styleLabel(_typeLabel, IsDirty::Yes);
     }
 }
@@ -162,12 +162,11 @@ void HorizonsDialog::importTimeRange() {
                 _validTimeRange = std::pair<std::string, std::string>();
                 return;
             }
-
-            _errorMsg->setText("Could not import time range");
             const std::string msg = std::format(
                 "Could not import time range '{}' to '{}'",
                 _validTimeRange.first, _validTimeRange.second
             );
+            QMessageBox::critical(this, "Error", QString::fromStdString(msg));
             appendLog(msg, LogLevel::Error);
             return;
         }
@@ -296,6 +295,7 @@ void HorizonsDialog::createWidgets() {
         _startEdit = new QDateTimeEdit;
         _startEdit->setDisplayFormat("yyyy-MM-dd  T  hh:mm:ss");
         _startEdit->setDate(QDate::currentDate().addYears(-1));
+        _startEdit->setAccessibleName("Set start time");
         _startEdit->setToolTip("Enter the start date and time for the data");
         layout->addWidget(_startEdit, 8, 2);
     }
@@ -306,6 +306,7 @@ void HorizonsDialog::createWidgets() {
         _endEdit = new QDateTimeEdit(this);
         _endEdit->setDisplayFormat("yyyy-MM-dd  T  hh:mm:ss");
         _endEdit->setDate(QDate::currentDate());
+        _endEdit->setAccessibleName("Set end time");
         _endEdit->setToolTip("Enter the end date and time for the data");
         layout->addWidget(_endEdit, 9, 2);
     }
@@ -375,11 +376,6 @@ void HorizonsDialog::createWidgets() {
     }
     {
         QBoxLayout* footer = new QHBoxLayout;
-        _errorMsg = new QLabel;
-        _errorMsg->setObjectName("error-message");
-        _errorMsg->setWordWrap(true);
-        footer->addWidget(_errorMsg);
-
         QDialogButtonBox* buttons = new QDialogButtonBox;
         buttons->setStandardButtons(QDialogButtonBox::Save | QDialogButtonBox::Cancel);
         connect(buttons, &QDialogButtonBox::accepted, this, &HorizonsDialog::approved);
@@ -392,7 +388,8 @@ void HorizonsDialog::createWidgets() {
 bool HorizonsDialog::isValidInput() {
     // File
     if (_fileEdit->text().isEmpty()) {
-        _errorMsg->setText("File path not selected");
+        QMessageBox::critical(this, "Error", "File path not selected");
+        _fileEdit->setFocus();
         styleLabel(_fileLabel, IsDirty::Yes);
         return false;
     }
@@ -401,13 +398,15 @@ bool HorizonsDialog::isValidInput() {
     if (_targetEdit->text().isEmpty() && ((_chooseTargetCombo->count() > 0 &&
         _chooseTargetCombo->currentIndex() == 0) || _chooseTargetCombo->count() == 0))
     {
-        _errorMsg->setText("Target not selected");
+        QMessageBox::critical(this, "Error", "Target not selected");
+        _targetEdit->setFocus();
         styleLabel(_targetLabel, IsDirty::Yes);
         return false;
     }
     if (_targetEdit->text().toStdString().find_first_of("¤<>§£´¨€") != std::string::npos)
     {
-        _errorMsg->setText("Target includes illegal characters");
+        QMessageBox::critical(this, "Error", "Target includes illegal characters");
+        _targetEdit->setFocus();
         styleLabel(_targetLabel, IsDirty::Yes);
         return false;
     }
@@ -416,13 +415,15 @@ bool HorizonsDialog::isValidInput() {
     if (_centerEdit->text().isEmpty() && ((_chooseObserverCombo->count() > 0 &&
         _chooseObserverCombo->currentIndex() == 0) || _chooseObserverCombo->count() == 0))
     {
-        _errorMsg->setText("Observer not selected");
+        QMessageBox::critical(this, "Error", "Observer not selected");
+        _centerEdit->setFocus();
         styleLabel(_centerLabel, IsDirty::Yes);
         return false;
     }
     if (_centerEdit->text().toStdString().find_first_of("¤<>§£´¨€") != std::string::npos)
     {
-        _errorMsg->setText("Observer includes illegal characters");
+        QMessageBox::critical(this, "Error", "Observer includes illegal characters");
+        _centerEdit->setFocus();
         styleLabel(_centerLabel, IsDirty::Yes);
         return false;
     }
@@ -430,7 +431,8 @@ bool HorizonsDialog::isValidInput() {
     // Step size
     // Empty
     if (_stepEdit->text().isEmpty()) {
-        _errorMsg->setText("Step size not selected");
+        QMessageBox::critical(this, "Error", "Step size is not selected");
+        _stepEdit->setFocus();
         styleLabel(_stepLabel, IsDirty::Yes);
         return false;
     }
@@ -438,17 +440,26 @@ bool HorizonsDialog::isValidInput() {
     bool couldConvert = false;
     const int32_t step = _stepEdit->text().toInt(&couldConvert);
     if (!couldConvert) {
-        _errorMsg->setText(QString::fromStdString(std::format(
-            "Step size needs to be a number in range 1 to {}",
-            std::numeric_limits<int32_t>::max()
-        )));
+        QMessageBox::critical(
+            this, "Error",
+            QString::fromStdString(std::format(
+                "Step size needs to be a number in range 1 to {}",
+                std::numeric_limits<int32_t>::max()
+            ))
+        );
+        _stepEdit->setFocus();
         styleLabel(_stepLabel, IsDirty::Yes);
         return false;
     }
     // In the case of arcseconds range is different
     if (_timeTypeCombo->currentText().toStdString() == TimeVarying) {
         if (step < 60  || step > 3600) {
-            _errorMsg->setText("Angular step size needs to be in range 60 to 3600");
+            QMessageBox::critical(
+                this,
+                "Error",
+                "Angular step size needs to be in range 60 to 3600"
+            );
+            _stepEdit->setFocus();
             styleLabel(_stepLabel, IsDirty::Yes);
             return false;
         }
@@ -458,10 +469,11 @@ bool HorizonsDialog::isValidInput() {
     // website as a uint32_t. If step size over 32 bit int is sent, this error message is
     // received: Cannot read numeric value -- re-enter
     if (step < 1) {
-        _errorMsg->setText(QString::fromStdString(std::format(
+        QMessageBox::critical(this, "Error", QString::fromStdString(std::format(
             "Step size is outside valid range 1 to '{}'",
             std::numeric_limits<int32_t>::max()
         )));
+        _stepEdit->setFocus();
         styleLabel(_stepLabel, IsDirty::Yes);
         return false;
     }
@@ -658,14 +670,14 @@ std::pair<std::string, std::string> HorizonsDialog::readTimeRange() {
 
             if (!start.isValid() || !end.isValid()) {
                 if (timeRange.first.empty() || timeRange.second.empty()) {
-                    _errorMsg->setText("Could not find time range");
+                    QMessageBox::critical(this, "Error", "Could not find time range");
                     appendLog(
                         "Could not find time range in Horizons file",
                         LogLevel::Error
                     );
                 }
                 else {
-                    _errorMsg->setText("Could not parse time range");
+                    QMessageBox::critical(this, "Error", "Could not parse time range");
                     const std::string msg = std::format(
                         "Could not read time range '{}' to '{}'",
                         timeRange.first, timeRange.second
@@ -693,10 +705,6 @@ bool HorizonsDialog::handleRequest() {
         return false;
     }
 
-    // Reset
-    _errorMsg->clear();
-
-    //
     // Clean all widgets
     styleLabel(_typeLabel, IsDirty::No);
     styleLabel(_fileLabel, IsDirty::No);
@@ -719,7 +727,7 @@ bool HorizonsDialog::handleRequest() {
 
     nlohmann::json answer = sendRequest(url);
     if (answer.empty()) {
-        _errorMsg->setText("Connection error");
+        QMessageBox::critical(this, "Errpr", "Connection error");
         return false;
     }
 
@@ -762,7 +770,7 @@ std::string HorizonsDialog::constructUrl() {
         type = HorizonsType::Observer;
     }
     else {
-        _errorMsg->setText("Invalid Horizons type");
+        QMessageBox::critical(this, "Error", "Invalid Horizons type");
         styleLabel(_typeLabel, IsDirty::Yes);
         return "";
     }
@@ -829,7 +837,7 @@ std::string HorizonsDialog::constructUrl() {
         unit = "";
     }
     else {
-        _errorMsg->setText("Invalid time unit type");
+        QMessageBox::critical(this, "Error", "Invalid time unit type");
         styleLabel(_stepLabel, IsDirty::Yes);
         return "";
     }
@@ -894,11 +902,15 @@ openspace::HorizonsFile HorizonsDialog::handleAnswer(nlohmann::json& answer) {
                 break;
             case QMessageBox::No:
             case QMessageBox::Cancel:
-                _errorMsg->setText("File already exist, try another file path");
+                QMessageBox::critical(
+                    this,
+                    "Error",
+                    "File already exist, try another file path"
+                );
                 styleLabel(_fileLabel, IsDirty::Yes);
                 return openspace::HorizonsFile();
             default:
-                _errorMsg->setText("Invalid answer");
+                QMessageBox::critical(this, "Error", "Invalid answer");
                 styleLabel(_fileLabel, IsDirty::Yes);
                 return openspace::HorizonsFile();
         }
@@ -927,7 +939,7 @@ bool HorizonsDialog::handleResult(openspace::HorizonsResultCode& result) {
             break;
         }
         case HorizonsResultCode::Empty: {
-            _errorMsg->setText("The horizons file is empty");
+            QMessageBox::critical(this, "Error", "The horizons file is empty");
             if (!_latestHorizonsError.empty()) {
                 const std::string msg = std::format(
                     "Latest Horizons error: {}", _latestHorizonsError
@@ -1172,7 +1184,7 @@ bool HorizonsDialog::handleResult(openspace::HorizonsResultCode& result) {
                 );
                 appendLog(msg, LogLevel::Error);
             }
-            _errorMsg->setText("An unknown error occured");
+            QMessageBox::critical(this, "Error", "An unknown error occured");
             break;
         }
         default: {
@@ -1182,7 +1194,7 @@ bool HorizonsDialog::handleResult(openspace::HorizonsResultCode& result) {
                 );
                 appendLog(msg, LogLevel::Error);
             }
-            _errorMsg->setText("Invalid result type");
+            QMessageBox::critical(this, "Error", "Invalid result type");
             break;
         }
     }
diff --git a/apps/OpenSpace/ext/launcher/src/profile/marknodesdialog.cpp b/apps/OpenSpace/ext/launcher/src/profile/marknodesdialog.cpp
index 3c2af72a44..3409693f14 100644
--- a/apps/OpenSpace/ext/launcher/src/profile/marknodesdialog.cpp
+++ b/apps/OpenSpace/ext/launcher/src/profile/marknodesdialog.cpp
@@ -65,6 +65,7 @@ void MarkNodesDialog::createWidgets() {
 
     _removeButton = new QPushButton("Remove");
     connect(_removeButton, &QPushButton::clicked, this, &MarkNodesDialog::listItemRemove);
+    _removeButton->setAccessibleName("Remove node");
     layout->addWidget(_removeButton);
 
     {
@@ -78,6 +79,7 @@ void MarkNodesDialog::createWidgets() {
 
         QPushButton* addButton = new QPushButton("Add new");
         connect(addButton, &QPushButton::clicked, this, &MarkNodesDialog::listItemAdded);
+        addButton->setAccessibleName("Add new node");
         box->addWidget(addButton);
         layout->addLayout(box);
     }
diff --git a/apps/OpenSpace/ext/launcher/src/profile/metadialog.cpp b/apps/OpenSpace/ext/launcher/src/profile/metadialog.cpp
index 90bf7783cc..8ee1586c7b 100644
--- a/apps/OpenSpace/ext/launcher/src/profile/metadialog.cpp
+++ b/apps/OpenSpace/ext/launcher/src/profile/metadialog.cpp
@@ -68,28 +68,34 @@ void MetaDialog::createWidgets() {
     QBoxLayout* layout = new QVBoxLayout(this);
     layout->addWidget(new QLabel("Name"));
     _nameEdit = new QLineEdit;
+    _nameEdit->setAccessibleName("Profile name");
     layout->addWidget(_nameEdit);
 
     layout->addWidget(new QLabel("Version"));
     _versionEdit = new QLineEdit;
+    _versionEdit->setAccessibleName("Profile version number");
     layout->addWidget(_versionEdit);
 
     layout->addWidget(new QLabel("Description"));
     _descriptionEdit = new QTextEdit;
     _descriptionEdit->setAcceptRichText(false);
     _descriptionEdit->setTabChangesFocus(true);
+    _descriptionEdit->setAccessibleName("Profile description");
     layout->addWidget(_descriptionEdit);
 
     layout->addWidget(new QLabel("Author"));
     _authorEdit = new QLineEdit;
+    _authorEdit->setAccessibleName("Profile author name");
     layout->addWidget(_authorEdit);
 
     layout->addWidget(new QLabel("URL"));
     _urlEdit = new QLineEdit;
+    _urlEdit->setAccessibleName("Profile url");
     layout->addWidget(_urlEdit);
 
     layout->addWidget(new QLabel("License"));
     _licenseEdit = new QLineEdit;
+    _licenseEdit->setAccessibleName("Profile license");
     layout->addWidget(_licenseEdit);
 
     layout->addWidget(new Line);
diff --git a/apps/OpenSpace/ext/launcher/src/profile/modulesdialog.cpp b/apps/OpenSpace/ext/launcher/src/profile/modulesdialog.cpp
index 7ccd0487ac..218d522c8f 100644
--- a/apps/OpenSpace/ext/launcher/src/profile/modulesdialog.cpp
+++ b/apps/OpenSpace/ext/launcher/src/profile/modulesdialog.cpp
@@ -31,6 +31,7 @@
 #include <QLabel>
 #include <QListWidget>
 #include <QLineEdit>
+#include <QMessageBox>
 #include <QPushButton>
 #include <QVBoxLayout>
 
@@ -92,11 +93,12 @@ void ModulesDialog::createWidgets() {
         _list->addItem(new QListWidgetItem(createOneLineSummary(m)));
     }
     layout->addWidget(_list);
-    
+
     {
         QBoxLayout* box = new QHBoxLayout;
         _buttonAdd = new QPushButton("Add new");
         connect(_buttonAdd, &QPushButton::clicked, this, &ModulesDialog::listItemAdded);
+        _buttonAdd->setAccessibleName("Add new module");
         box->addWidget(_buttonAdd);
 
         _buttonRemove = new QPushButton("Remove");
@@ -104,6 +106,7 @@ void ModulesDialog::createWidgets() {
             _buttonRemove, &QPushButton::clicked,
             this, &ModulesDialog::listItemRemove
         );
+        _buttonRemove->setAccessibleName("Remove module");
         box->addWidget(_buttonRemove);
 
         box->addStretch();
@@ -113,14 +116,14 @@ void ModulesDialog::createWidgets() {
     {
         _moduleLabel = new QLabel("Module");
         layout->addWidget(_moduleLabel);
-        
+
         _moduleEdit = new QLineEdit;
         _moduleEdit->setToolTip("Name of OpenSpace module related to this profile");
         layout->addWidget(_moduleEdit);
 
         _loadedLabel = new QLabel("Command if Module is Loaded");
         layout->addWidget(_loadedLabel);
-        
+
         _loadedEdit = new QLineEdit;
         _loadedEdit->setToolTip(
             "Lua command(s) to execute if OpenSpace has been compiled with the module"
@@ -129,7 +132,7 @@ void ModulesDialog::createWidgets() {
 
         _notLoadedLabel = new QLabel("Command if Module is NOT Loaded");
         layout->addWidget(_notLoadedLabel);
-        
+
         _notLoadedEdit = new QLineEdit;
         _notLoadedEdit->setToolTip(
             "Lua command(s) to execute if the module is not present in the OpenSpace "
@@ -159,12 +162,6 @@ void ModulesDialog::createWidgets() {
     layout->addWidget(new Line);
     {
         QBoxLayout* footerLayout = new QHBoxLayout;
-
-        _errorMsg = new QLabel;
-        _errorMsg->setObjectName("error-message");
-        _errorMsg->setWordWrap(true);
-        footerLayout->addWidget(_errorMsg);
-
         _buttonBox = new QDialogButtonBox;
         _buttonBox->setStandardButtons(QDialogButtonBox::Save | QDialogButtonBox::Cancel);
         QObject::connect(
@@ -193,7 +190,7 @@ void ModulesDialog::listItemSelected() {
         else {
             _loadedEdit->clear();
         }
-        
+
         if (m.notLoadedInstruction.has_value()) {
             _notLoadedEdit->setText(QString::fromStdString(*m.notLoadedInstruction));
         }
@@ -227,7 +224,6 @@ void ModulesDialog::listItemAdded() {
         _list->addItem(new QListWidgetItem("  (Enter details below & click 'Save')"));
         //Scroll down to that blank line highlighted
         _list->setCurrentRow(_list->count() - 1);
-        _errorMsg->clear();
     }
 
     // Blank-out the 2 text fields, set combo box to index 0
@@ -254,7 +250,7 @@ void ModulesDialog::listItemAdded() {
 
 void ModulesDialog::listItemSave() {
     if (_moduleEdit->text().isEmpty()) {
-        _errorMsg->setText("Missing module name");
+        QMessageBox::critical(this, "Error", "Missing module name");
         return;
     }
 
@@ -311,7 +307,6 @@ void ModulesDialog::transitionToEditMode() {
     _loadedLabel->setText("<font color='black'>Command if Module is Loaded</font>");
     _notLoadedLabel->setText("<font color='black'>Command if Module is NOT Loaded</font>");
     editBoxDisabled(false);
-    _errorMsg->setText("");
 }
 
 void ModulesDialog::transitionFromEditMode() {
@@ -326,7 +321,6 @@ void ModulesDialog::transitionFromEditMode() {
     _moduleLabel->setText("<font color='light gray'>Module</font>");
     _loadedLabel->setText("<font color='light gray'>Command if Module is Loaded</font>");
     _notLoadedLabel->setText("<font color='light gray'>Command if Module is NOT Loaded</font>");
-    _errorMsg->setText("");
 }
 
 void ModulesDialog::editBoxDisabled(bool disabled) {
diff --git a/apps/OpenSpace/ext/launcher/src/profile/profileedit.cpp b/apps/OpenSpace/ext/launcher/src/profile/profileedit.cpp
index 64760c0205..be512f3e62 100644
--- a/apps/OpenSpace/ext/launcher/src/profile/profileedit.cpp
+++ b/apps/OpenSpace/ext/launcher/src/profile/profileedit.cpp
@@ -41,6 +41,7 @@
 #include <QKeyEvent>
 #include <QLabel>
 #include <QLineEdit>
+#include <QMessageBox>
 #include <QPushButton>
 #include <QTextEdit>
 #include <QVBoxLayout>
@@ -65,7 +66,7 @@ namespace {
     std::string summarizeAssets(const std::vector<std::string>& assets) {
         std::string results;
         for (const std::string& a : assets) {
-            results += a + '\n';
+            results += std::format("{}<br>", a);
         }
         return results;
     }
@@ -81,7 +82,7 @@ namespace {
             );
 
             std::string name = it != actions.end() ? it->name : "Unknown action";
-            results += std::format("{} ({})\n", name, ghoul::to_string(k.key));
+            results += std::format("{} ({})<br>", name, ghoul::to_string(k.key));
         }
         return results;
     }
@@ -89,13 +90,13 @@ namespace {
     std::string summarizeProperties(const std::vector<Profile::Property>& properties) {
         std::string results;
         for (openspace::Profile::Property p : properties) {
-            results += std::format("{} = {}\n", p.name, p.value);
+            results += std::format("{} = {}<br>", p.name, p.value);
         }
         return results;
     }
 } // namespace
 
-ProfileEdit::ProfileEdit(Profile& profile, const std::string& profileName, 
+ProfileEdit::ProfileEdit(Profile& profile, const std::string& profileName,
                          std::filesystem::path assetBasePath,
                          std::filesystem::path userAssetBasePath,
                          std::filesystem::path builtInProfileBasePath,
@@ -125,6 +126,7 @@ void ProfileEdit::createWidgets(const std::string& profileName) {
         container->addWidget(profileLabel);
 
         _profileEdit = new QLineEdit(QString::fromStdString(profileName));
+        _profileEdit->setPlaceholderText("required");
         container->addWidget(_profileEdit);
 
         QPushButton* duplicateButton = new QPushButton("Duplicate Profile");
@@ -146,17 +148,19 @@ void ProfileEdit::createWidgets(const std::string& profileName) {
         _propertiesLabel->setWordWrap(true);
         container->addWidget(_propertiesLabel, 0, 0);
 
+        _propertiesEdit = new QTextEdit;
+        _propertiesEdit->setReadOnly(true);
+        _propertiesEdit->setAccessibleName("Property value settings");
+        container->addWidget(_propertiesEdit, 1, 0, 1, 3);
+
         QPushButton* editProperties = new QPushButton("Edit");
         connect(
             editProperties, &QPushButton::clicked,
             this, &ProfileEdit::openProperties
         );
+        editProperties->setAccessibleName("Edit properties");
         container->addWidget(editProperties, 0, 2);
 
-        _propertiesEdit = new QTextEdit;
-        _propertiesEdit->setReadOnly(true);
-        container->addWidget(_propertiesEdit, 1, 0, 1, 3);
-
         leftLayout->addLayout(container);
     }
     leftLayout->addWidget(new Line);
@@ -169,14 +173,16 @@ void ProfileEdit::createWidgets(const std::string& profileName) {
         _assetsLabel->setWordWrap(true);
         container->addWidget(_assetsLabel, 0, 0);
 
-        QPushButton* assetsProperties = new QPushButton("Edit");
-        connect(assetsProperties, &QPushButton::clicked, this, &ProfileEdit::openAssets);
-        container->addWidget(assetsProperties, 0, 2);
-
         _assetsEdit = new QTextEdit;
         _assetsEdit->setReadOnly(true);
+        _assetsEdit->setAccessibleName("Loaded assets");
         container->addWidget(_assetsEdit, 1, 0, 1, 3);
 
+        QPushButton* assetsProperties = new QPushButton("Edit");
+        connect(assetsProperties, &QPushButton::clicked, this, &ProfileEdit::openAssets);
+        assetsProperties->setAccessibleName("Edit assets");
+        container->addWidget(assetsProperties, 0, 2);
+
         leftLayout->addLayout(container);
     }
     leftLayout->addWidget(new Line);
@@ -188,17 +194,19 @@ void ProfileEdit::createWidgets(const std::string& profileName) {
         _keybindingsLabel->setObjectName("heading");
         container->addWidget(_keybindingsLabel, 0, 0);
 
+        _keybindingsEdit = new QTextEdit;
+        _keybindingsEdit->setReadOnly(true);
+        _keybindingsEdit->setAccessibleName("Loaded action and keybindings");
+        container->addWidget(_keybindingsEdit, 1, 0, 1, 3);
+
         QPushButton* keybindingsProperties = new QPushButton("Edit");
         connect(
             keybindingsProperties, &QPushButton::clicked,
             this, &ProfileEdit::openKeybindings
         );
+        keybindingsProperties->setAccessibleName("Edit actions and keybindings");
         container->addWidget(keybindingsProperties, 0, 2);
 
-        _keybindingsEdit = new QTextEdit;
-        _keybindingsEdit->setReadOnly(true);
-        container->addWidget(_keybindingsEdit, 1, 0, 1, 3);
-
         leftLayout->addLayout(container);
     }
     topLayout->addLayout(leftLayout, 3);
@@ -216,6 +224,7 @@ void ProfileEdit::createWidgets(const std::string& profileName) {
         QPushButton* metaEdit = new QPushButton("Edit");
         connect(metaEdit, &QPushButton::clicked, this, &ProfileEdit::openMeta);
         metaEdit->setLayoutDirection(Qt::RightToLeft);
+        metaEdit->setAccessibleName("Edit metadata");
         container->addWidget(metaEdit);
         rightLayout->addLayout(container);
     }
@@ -233,6 +242,7 @@ void ProfileEdit::createWidgets(const std::string& profileName) {
             this, &ProfileEdit::openMarkNodes
         );
         interestingNodesEdit->setLayoutDirection(Qt::RightToLeft);
+        interestingNodesEdit->setAccessibleName("Edit interesting nodes");
         container->addWidget(interestingNodesEdit);
         rightLayout->addLayout(container);
     }
@@ -250,6 +260,7 @@ void ProfileEdit::createWidgets(const std::string& profileName) {
             this, &ProfileEdit::openDeltaTimes
         );
         deltaTimesEdit->setLayoutDirection(Qt::RightToLeft);
+        deltaTimesEdit->setAccessibleName("Edit simulation time increments");
         container->addWidget(deltaTimesEdit);
         rightLayout->addLayout(container);
     }
@@ -264,6 +275,7 @@ void ProfileEdit::createWidgets(const std::string& profileName) {
         QPushButton* cameraEdit = new QPushButton("Edit");
         connect(cameraEdit, &QPushButton::clicked, this, &ProfileEdit::openCamera);
         cameraEdit->setLayoutDirection(Qt::RightToLeft);
+        cameraEdit->setAccessibleName("Edit camera");
         container->addWidget(cameraEdit);
         rightLayout->addLayout(container);
     }
@@ -278,6 +290,7 @@ void ProfileEdit::createWidgets(const std::string& profileName) {
         QPushButton* timeEdit = new QPushButton("Edit");
         connect(timeEdit, &QPushButton::clicked, this, &ProfileEdit::openTime);
         timeEdit->setLayoutDirection(Qt::RightToLeft);
+        timeEdit->setAccessibleName("Edit time");
         container->addWidget(timeEdit);
         rightLayout->addLayout(container);
     }
@@ -292,6 +305,7 @@ void ProfileEdit::createWidgets(const std::string& profileName) {
         QPushButton* modulesEdit = new QPushButton("Edit");
         connect(modulesEdit, &QPushButton::clicked, this, &ProfileEdit::openModules);
         modulesEdit->setLayoutDirection(Qt::RightToLeft);
+        modulesEdit->setAccessibleName("Edit modules");
         container->addWidget(modulesEdit);
         rightLayout->addLayout(container);
     }
@@ -309,6 +323,7 @@ void ProfileEdit::createWidgets(const std::string& profileName) {
             this, &ProfileEdit::openAddedScripts
         );
         additionalScriptsEdit->setLayoutDirection(Qt::RightToLeft);
+        additionalScriptsEdit->setAccessibleName("Edit additional scripts");
         container->addWidget(additionalScriptsEdit);
         rightLayout->addLayout(container);
     }
@@ -319,11 +334,6 @@ void ProfileEdit::createWidgets(const std::string& profileName) {
 
     {
         QBoxLayout* footer = new QHBoxLayout;
-        _errorMsg = new QLabel;
-        _errorMsg->setObjectName("error-message");
-        _errorMsg->setWordWrap(true);
-        footer->addWidget(_errorMsg);
-
         QDialogButtonBox* buttons = new QDialogButtonBox;
         buttons->setStandardButtons(QDialogButtonBox::Save | QDialogButtonBox::Cancel);
         connect(buttons, &QDialogButtonBox::accepted, this, &ProfileEdit::approved);
@@ -360,7 +370,6 @@ void ProfileEdit::initSummaryTextForEachCategory() {
 }
 
 void ProfileEdit::duplicateProfile() {
-    _errorMsg->clear();
     std::string profile = _profileEdit->text().toStdString();
     if (profile.empty()) {
         return;
@@ -405,18 +414,15 @@ void ProfileEdit::duplicateProfile() {
 }
 
 void ProfileEdit::openMeta() {
-    _errorMsg->clear();
     MetaDialog(this, &_profile.meta).exec();
 }
 
 void ProfileEdit::openModules() {
-    _errorMsg->clear();
     ModulesDialog(this, &_profile.modules).exec();
     _modulesLabel->setText(labelText(_profile.modules.size(), "Modules"));
 }
 
 void ProfileEdit::openProperties() {
-    _errorMsg->clear();
     PropertiesDialog(this, &_profile.properties).exec();
     _propertiesLabel->setText(labelText(_profile.properties.size(), "Properties"));
     _propertiesEdit->setText(
@@ -425,7 +431,6 @@ void ProfileEdit::openProperties() {
 }
 
 void ProfileEdit::openKeybindings() {
-    _errorMsg->clear();
     ActionDialog(this, &_profile.actions, &_profile.keybindings).exec();
     _keybindingsLabel->setText(labelText(_profile.keybindings.size(), "Keybindings"));
     _keybindingsEdit->setText(QString::fromStdString(
@@ -434,19 +439,16 @@ void ProfileEdit::openKeybindings() {
 }
 
 void ProfileEdit::openAssets() {
-    _errorMsg->clear();
     AssetsDialog(this, &_profile, _assetBasePath, _userAssetBasePath).exec();
     _assetsLabel->setText(labelText(_profile.assets.size(), "Assets"));
     _assetsEdit->setText(QString::fromStdString(summarizeAssets(_profile.assets)));
 }
 
 void ProfileEdit::openTime() {
-    _errorMsg->clear();
     TimeDialog(this, &_profile.time).exec();
 }
 
 void ProfileEdit::openDeltaTimes() {
-    _errorMsg->clear();
     DeltaTimesDialog(this, &_profile.deltaTimes).exec();
     _deltaTimesLabel->setText(
         labelText(_profile.deltaTimes.size(), "Simulation Time Increments")
@@ -454,17 +456,14 @@ void ProfileEdit::openDeltaTimes() {
 }
 
 void ProfileEdit::openAddedScripts() {
-    _errorMsg->clear();
     AdditionalScriptsDialog(this, &_profile.additionalScripts).exec();
 }
 
 void ProfileEdit::openCamera() {
-    _errorMsg->clear();
     CameraDialog(this, &_profile.camera).exec();
 }
 
 void ProfileEdit::openMarkNodes() {
-    _errorMsg->clear();
     MarkNodesDialog(this, &_profile.markNodes).exec();
     _interestingNodesLabel->setText(
         labelText(_profile.markNodes.size(), "Mark Interesting Nodes")
@@ -479,15 +478,11 @@ std::string ProfileEdit::specifiedFilename() const {
     return _profileEdit->text().toStdString();
 }
 
-void ProfileEdit::cancel() {
-    _saveSelected = false;
-    reject();
-}
-
 void ProfileEdit::approved() {
     std::string profileName = _profileEdit->text().toStdString();
     if (profileName.empty()) {
-        _errorMsg->setText("Profile name must be specified");
+        QMessageBox::critical(this, "No profile name", "Profile name must be specified");
+        _profileEdit->setFocus();
         return;
     }
 
@@ -497,13 +492,15 @@ void ProfileEdit::approved() {
     if (std::filesystem::exists(p)) {
         // The filename exists in the OpenSpace-provided folder, so we don't want to allow
         // a user to overwrite it
-        _errorMsg->setText(
-            "This is a read-only profile. Click 'Duplicate' or rename & save"
+        QMessageBox::critical(
+            this,
+            "Reserved profile name",
+            "This is a read-only profile. Click 'Duplicate' or rename profile and save"
         );
+        _profileEdit->setFocus();
     }
     else {
         _saveSelected = true;
-        _errorMsg->setText("");
         accept();
     }
 }
@@ -515,3 +512,36 @@ void ProfileEdit::keyPressEvent(QKeyEvent* evt) {
     QDialog::keyPressEvent(evt);
 }
 
+
+void ProfileEdit::reject()  {
+    // We hijack the reject (i.e., exit window) and emit the signal. The actual shutdown
+    // of the window comes at a later stage.
+    emit raiseExitWindow();
+}
+
+void ProfileEdit::closeWithoutSaving() {
+    _saveSelected = false;
+    QDialog::reject();
+}
+
+void ProfileEdit::promptUserOfUnsavedChanges() {
+    QMessageBox msgBox;
+    msgBox.setText("There are unsaved changes");
+    msgBox.setInformativeText("Do you want to save your changes");
+    msgBox.setStandardButtons(QMessageBox::Save | QMessageBox::Discard | QMessageBox::Cancel);
+    msgBox.setDefaultButton(QMessageBox::Save);
+    int ret = msgBox.exec();
+
+    switch (ret) {
+        case QMessageBox::Save:
+            approved();
+            break;
+        case QMessageBox::Discard:
+            closeWithoutSaving();
+            break;
+        case QMessageBox::Cancel:
+            break;
+        default:
+            break;
+    }
+}
diff --git a/apps/OpenSpace/ext/launcher/src/profile/propertiesdialog.cpp b/apps/OpenSpace/ext/launcher/src/profile/propertiesdialog.cpp
index 9fe9e61d4d..5b3ef0dcae 100644
--- a/apps/OpenSpace/ext/launcher/src/profile/propertiesdialog.cpp
+++ b/apps/OpenSpace/ext/launcher/src/profile/propertiesdialog.cpp
@@ -35,6 +35,7 @@
 #include <QLabel>
 #include <QLineEdit>
 #include <QListWidget>
+#include <QMessageBox>
 #include <QPushButton>
 #include <QTextStream>
 #include <QVBoxLayout>
@@ -157,13 +158,11 @@ void PropertiesDialog::createWidgets() {
     }
     layout->addWidget(new Line);
     {
+        _errorMsg = new QMessageBox(this);
+        _errorMsg->setIcon(QMessageBox::Critical);
+        _errorMsg->setText("Invalid input data");
+
         QBoxLayout* footerLayout = new QHBoxLayout;
-
-        _errorMsg = new QLabel;
-        _errorMsg->setObjectName("error-message");
-        _errorMsg->setWordWrap(true);
-        footerLayout->addWidget(_errorMsg);
-
         _buttonBox = new QDialogButtonBox;
         _buttonBox->setStandardButtons(QDialogButtonBox::Save | QDialogButtonBox::Cancel);
 
@@ -238,6 +237,7 @@ void PropertiesDialog::listItemAdded() {
 
 void PropertiesDialog::listItemSave() {
     if (!areRequiredFormsFilled()) {
+        _errorMsg->exec();
         return;
     }
 
@@ -274,7 +274,7 @@ bool PropertiesDialog::areRequiredFormsFilled() {
         errors += "Missing value";
         requiredFormsFilled = false;
     }
-    _errorMsg->setText("<font color='red'>" + errors + "</font>");
+    _errorMsg->setInformativeText(errors);
     return requiredFormsFilled;
 }
 
@@ -322,7 +322,6 @@ void PropertiesDialog::transitionToEditMode() {
     _propertyLabel->setText("<font color='black'>Property</font>");
     _valueLabel->setText("<font color='black'>Value to set</font>");
     editBoxDisabled(false);
-    _errorMsg->setText("");
 }
 
 void PropertiesDialog::transitionFromEditMode() {
@@ -338,7 +337,6 @@ void PropertiesDialog::transitionFromEditMode() {
     _propertyLabel->setText("<font color='light gray'>Property</font>");
     _valueLabel->setText("<font color='light gray'>Value to set</font>");
     editBoxDisabled(true);
-    _errorMsg->setText("");
 }
 
 void PropertiesDialog::editBoxDisabled(bool disabled) {
diff --git a/apps/OpenSpace/ext/launcher/src/profile/timedialog.cpp b/apps/OpenSpace/ext/launcher/src/profile/timedialog.cpp
index 6aa1998b04..bfcf007978 100644
--- a/apps/OpenSpace/ext/launcher/src/profile/timedialog.cpp
+++ b/apps/OpenSpace/ext/launcher/src/profile/timedialog.cpp
@@ -75,6 +75,7 @@ void TimeDialog::createWidgets() {
     {
         layout->addWidget(new QLabel("Time Type"));
         _typeCombo = new QComboBox;
+        _typeCombo->setAccessibleName("Time type");
         _typeCombo->setToolTip("Types: Absolute defined time or Relative to actual time");
         connect(
             _typeCombo, QOverload<int>::of(&QComboBox::currentIndexChanged),
@@ -85,17 +86,19 @@ void TimeDialog::createWidgets() {
     {
         _absoluteLabel = new QLabel("Absolute UTC:");
         layout->addWidget(_absoluteLabel);
-        
+
         _absoluteEdit = new QDateTimeEdit;
         _absoluteEdit->setDisplayFormat("yyyy-MM-dd  T  hh:mm:ss");
         _absoluteEdit->setDateTime(QDateTime::currentDateTime());
+        _absoluteEdit->setAccessibleName("Set absolute time");
         layout->addWidget(_absoluteEdit);
     }
     {
         _relativeLabel = new QLabel("Relative Time:");
         layout->addWidget(_relativeLabel);
-        
+
         _relativeEdit = new QLineEdit;
+        _relativeEdit->setAccessibleName("Set relative time");
         _relativeEdit->setToolTip(
             "String for relative time to actual (e.g. \"-1d\" for back 1 day)"
         );
diff --git a/apps/OpenSpace/ext/launcher/src/settingsdialog.cpp b/apps/OpenSpace/ext/launcher/src/settingsdialog.cpp
index b82c13c4fd..5aba82fd34 100644
--- a/apps/OpenSpace/ext/launcher/src/settingsdialog.cpp
+++ b/apps/OpenSpace/ext/launcher/src/settingsdialog.cpp
@@ -230,6 +230,7 @@ void SettingsDialog::createWidgets() {
                 updateSaveButton();
             }
         );
+        _propertyVisibility->setObjectName("dropdown");
         layout->addWidget(_propertyVisibility, 9, 1);
 
         _bypassLauncher = new QCheckBox("Bypass Launcher");
@@ -299,6 +300,7 @@ void SettingsDialog::createWidgets() {
                 updateSaveButton();
             }
         );
+        _layerServer->setObjectName("dropdown");
         layout->addWidget(_layerServer, 14, 1);
 
         _mrf.isEnabled = new QCheckBox("Enable MRF Caching");
diff --git a/data/assets/util/launcher_images.asset b/data/assets/util/launcher_images.asset
index 9801bea354..a95d1b7386 100644
--- a/data/assets/util/launcher_images.asset
+++ b/data/assets/util/launcher_images.asset
@@ -2,6 +2,6 @@ local DataPath = asset.resource({
   Name = "Launcher Images",
   Type = "HttpSynchronization",
   Identifier = "launcher_images",
-  Version = 3
+  Version = 4
 })
 asset.export("DataPath", DataPath)
diff --git a/include/openspace/scene/profile.h b/include/openspace/scene/profile.h
index f745be9aed..e455eb3004 100644
--- a/include/openspace/scene/profile.h
+++ b/include/openspace/scene/profile.h
@@ -55,11 +55,15 @@ public:
     struct Version {
         int major = 0;
         int minor = 0;
+
+        auto operator<=>(const Version&) const = default;
     };
     struct Module {
         std::string name;
         std::optional<std::string> loadedInstruction;
         std::optional<std::string> notLoadedInstruction;
+
+        auto operator<=>(const Module&) const = default;
     };
     struct Meta {
         std::optional<std::string> name;
@@ -68,6 +72,8 @@ public:
         std::optional<std::string> author;
         std::optional<std::string> url;
         std::optional<std::string> license;
+
+        auto operator<=>(const Meta&) const = default;
     };
 
     struct Property {
@@ -79,6 +85,8 @@ public:
         SetType setType = SetType::SetPropertyValue;
         std::string name;
         std::string value;
+
+        auto operator<=>(const Property&) const = default;
     };
 
     struct Action {
@@ -88,11 +96,15 @@ public:
         std::string guiPath;
         bool isLocal = false;
         std::string script;
+
+        auto operator<=>(const Action&) const = default;
     };
 
     struct Keybinding {
         KeyWithModifier key;
         std::string action;
+
+        auto operator<=>(const Keybinding&) const = default;
     };
 
     struct Time {
@@ -104,6 +116,8 @@ public:
         Type type = Type::Relative;
         std::string value;
         bool startPaused = false;
+
+        auto operator<=>(const Time&) const = default;
     };
 
     struct CameraGoToNode {
@@ -111,6 +125,8 @@ public:
 
         std::string anchor;
         std::optional<double> height;
+
+        auto operator<=>(const CameraGoToNode&) const = default;
     };
 
     struct CameraNavState {
@@ -123,6 +139,8 @@ public:
         std::optional<glm::dvec3> up;
         std::optional<double> yaw;
         std::optional<double> pitch;
+
+        auto operator<=>(const CameraNavState&) const = default;
     };
 
     struct CameraGoToGeo {
@@ -132,6 +150,8 @@ public:
         double latitude = 0.0;
         double longitude = 0.0;
         std::optional<double> altitude;
+
+        auto operator<=>(const CameraGoToGeo&) const = default;
     };
 
     using CameraType = std::variant<CameraGoToNode, CameraNavState, CameraGoToGeo>;
@@ -140,6 +160,8 @@ public:
     explicit Profile(const std::filesystem::path& path);
     std::string serialize() const;
 
+    auto operator<=>(const Profile&) const = default;
+
     /**
      * Saves all current settings, starting from the profile that was loaded at startup,
      * and all of the property & asset changes that were made since startup.
diff --git a/tests/test_profile.cpp b/tests/test_profile.cpp
index e69e4654e4..a6220fbd28 100644
--- a/tests/test_profile.cpp
+++ b/tests/test_profile.cpp
@@ -41,108 +41,7 @@
 // compiler to agree
 // NOLINTBEGIN(modernize-use-emplace)
 
-namespace openspace {
-    bool operator==(const openspace::Profile::Version& lhs,
-                    const openspace::Profile::Version& rhs) noexcept
-    {
-        return lhs.major == rhs.major && lhs.minor == rhs.minor;
-    }
-
-    bool operator==(const openspace::Profile::Module& lhs,
-                    const openspace::Profile::Module& rhs) noexcept
-    {
-        return lhs.name == rhs.name &&
-               lhs.loadedInstruction == rhs.loadedInstruction &&
-               lhs.notLoadedInstruction == rhs.notLoadedInstruction;
-    }
-
-    bool operator==(const openspace::Profile::Meta& lhs,
-                    const openspace::Profile::Meta& rhs) noexcept
-    {
-        return lhs.name == rhs.name &&
-               lhs.version == rhs.version &&
-               lhs.description == rhs.description &&
-               lhs.author == rhs.author &&
-               lhs.url == rhs.url &&
-               lhs.license == rhs.license;
-    }
-
-    bool operator==(const openspace::Profile::Property& lhs,
-                    const openspace::Profile::Property& rhs) noexcept
-    {
-        return lhs.setType == rhs.setType &&
-               lhs.name == rhs.name &&
-               lhs.value == rhs.value;
-    }
-
-    bool operator==(const openspace::Profile::Action& lhs,
-                    const openspace::Profile::Action& rhs) noexcept
-    {
-        return lhs.identifier == rhs.identifier &&
-               lhs.documentation == rhs.documentation &&
-               lhs.name == rhs.name &&
-               lhs.guiPath == rhs.guiPath &&
-               lhs.isLocal == rhs.isLocal &&
-               lhs.script == rhs.script;
-    }
-
-    bool operator==(const openspace::Profile::Keybinding& lhs,
-                    const openspace::Profile::Keybinding& rhs) noexcept
-    {
-        return lhs.key == rhs.key && lhs.action == rhs.action;
-    }
-
-    bool operator==(const openspace::Profile::Time& lhs,
-                    const openspace::Profile::Time& rhs) noexcept
-    {
-        return lhs.type == rhs.type && lhs.value == rhs.value;
-    }
-
-    bool operator==(const openspace::Profile::CameraGoToNode& lhs,
-        const openspace::Profile::CameraGoToNode& rhs) noexcept
-    {
-        return lhs.anchor == rhs.anchor && lhs.height == rhs.height;
-    }
-
-    bool operator==(const openspace::Profile::CameraNavState& lhs,
-                    const openspace::Profile::CameraNavState& rhs) noexcept
-    {
-        return lhs.anchor == rhs.anchor &&
-               lhs.aim == rhs.aim &&
-               lhs.referenceFrame == rhs.referenceFrame &&
-               lhs.position == rhs.position &&
-               lhs.up == rhs.up &&
-               lhs.yaw == rhs.yaw &&
-               lhs.pitch == rhs.pitch;
-    }
-
-    bool operator==(const openspace::Profile::CameraGoToGeo& lhs,
-                    const openspace::Profile::CameraGoToGeo& rhs) noexcept
-    {
-        return lhs.anchor == rhs.anchor &&
-               lhs.latitude == rhs.latitude &&
-               lhs.longitude == rhs.longitude &&
-               lhs.altitude == rhs.altitude;
-    }
-
-    bool operator==(const openspace::Profile& lhs,
-                    const openspace::Profile& rhs) noexcept
-    {
-        return lhs.version == rhs.version &&
-               lhs.modules == rhs.modules &&
-               lhs.meta == rhs.meta &&
-               lhs.assets == rhs.assets &&
-               lhs.properties == rhs.properties &&
-               lhs.actions == rhs.actions &&
-               lhs.keybindings == rhs.keybindings &&
-               lhs.time == rhs.time &&
-               lhs.deltaTimes == rhs.deltaTimes &&
-               lhs.camera == rhs.camera &&
-               lhs.markNodes == rhs.markNodes &&
-               lhs.additionalScripts == rhs.additionalScripts &&
-               lhs.ignoreUpdates == rhs.ignoreUpdates;
-    }
-
+namespace {
     std::ostream& operator<<(std::ostream& os, const openspace::Profile& profile) {
         os << profile.serialize();
         return os;

From 68c2157dd4f9b49b575fa0d2b5e9198f4c3d244c Mon Sep 17 00:00:00 2001
From: Emma Broman <emma.broman@liu.se>
Date: Mon, 21 Oct 2024 09:30:18 +0200
Subject: [PATCH 647/701] Move Exoplanet creation code from C++ to Lua  (#3450)

* Move exoplanet creation code to Lua

* Add more descriptions and handle missing values

* Remove old creation function and move load from CSV to Lua

* Properly document all functions, including a type for the `systemData` return value

* Add `\param` documentation to the scripts

* Cleanup and move helper functions to core scripts

* Throw Lua errors when things go wrong, instead of returning empty objects

This prevents the rest of the code from being run

* Flesh out TODO comments, so future us know why they are there


---------

Co-authored-by: Alexander Bock <alexander.bock@liu.se>
---
 modules/exoplanets/CMakeLists.txt             |   2 +
 modules/exoplanets/datastructure.cpp          | 337 ++++++++
 modules/exoplanets/datastructure.h            | 155 ++++
 modules/exoplanets/exoplanetshelper.cpp       |   3 +-
 modules/exoplanets/exoplanetshelper.h         | 117 +--
 modules/exoplanets/exoplanetsmodule.cpp       |  15 +-
 modules/exoplanets/exoplanetsmodule_lua.inl   | 747 ++----------------
 modules/exoplanets/scripts/systemcreation.lua | 641 +++++++++++++++
 .../tasks/exoplanetsdatapreparationtask.h     |   3 +-
 scripts/core_scripts.lua                      |  44 ++
 10 files changed, 1268 insertions(+), 796 deletions(-)
 create mode 100644 modules/exoplanets/datastructure.cpp
 create mode 100644 modules/exoplanets/datastructure.h
 create mode 100644 modules/exoplanets/scripts/systemcreation.lua

diff --git a/modules/exoplanets/CMakeLists.txt b/modules/exoplanets/CMakeLists.txt
index 169beb4215..4f5a98e8d5 100644
--- a/modules/exoplanets/CMakeLists.txt
+++ b/modules/exoplanets/CMakeLists.txt
@@ -25,6 +25,7 @@
 include(${PROJECT_SOURCE_DIR}/support/cmake/module_definition.cmake)
 
 set(HEADER_FILES
+    datastructure.h    
     exoplanetshelper.h
     exoplanetsmodule.h
     rendering/renderableorbitdisc.h
@@ -33,6 +34,7 @@ set(HEADER_FILES
 source_group("Header Files" FILES ${HEADER_FILES})
 
 set(SOURCE_FILES
+    datastructure.cpp    
     exoplanetshelper.cpp
     exoplanetsmodule.cpp
     exoplanetsmodule_lua.inl
diff --git a/modules/exoplanets/datastructure.cpp b/modules/exoplanets/datastructure.cpp
new file mode 100644
index 0000000000..f752c037dc
--- /dev/null
+++ b/modules/exoplanets/datastructure.cpp
@@ -0,0 +1,337 @@
+/*****************************************************************************************
+ *                                                                                       *
+ * OpenSpace                                                                             *
+ *                                                                                       *
+ * Copyright (c) 2014-2024                                                               *
+ *                                                                                       *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
+ * software and associated documentation files (the "Software"), to deal in the Software *
+ * without restriction, including without limitation the rights to use, copy, modify,    *
+ * merge, publish, distribute, sublicense, and/or sell copies of the Software, and to    *
+ * permit persons to whom the Software is furnished to do so, subject to the following   *
+ * conditions:                                                                           *
+ *                                                                                       *
+ * The above copyright notice and this permission notice shall be included in all copies *
+ * or substantial portions of the Software.                                              *
+ *                                                                                       *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED,   *
+ * INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A         *
+ * PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT    *
+ * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF  *
+ * CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE  *
+ * OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                                         *
+ ****************************************************************************************/
+
+#include <modules/exoplanets/datastructure.h>
+
+#include <modules/exoplanets/exoplanetshelper.h>
+#include <openspace/scene/scene.h>
+#include <openspace/util/distanceconstants.h>
+#include <openspace/util/time.h>
+#include <openspace/util/timeconversion.h>
+#include <ghoul/logging/logmanager.h>
+#include <string_view>
+
+namespace {
+    constexpr std::string_view _loggerCat = "ExoplanetsModule";
+
+    // This is the documentation for the data object that is returned from the
+    // `openspace.exoplanets.systemData` function in the Scripting API.
+    //
+    // The data object provides the information needed to create the scene graph nodes
+    // for an exoplanet system. However, depending on what data is available for the
+    // specific planets and star, some values may be undefined.
+    struct [[codegen::Dictionary(ExoplanetSystemData)]] Parameters {
+        // The identifier of the system, which equals the identifier of the host star
+        // created based on the star name.
+        std::string systemId;
+
+        // The position of the host star, expressed in meters.
+        glm::dvec3 position;
+
+        // The number of known planets in the system that have enough data to be
+        // visualized.
+        int numPlanets;
+
+        // The name of the star.
+        std::string starName;
+
+        // The radius of the star, in meters, if data exists.
+        std::optional<double> starRadius;
+
+        // An RGB color for the host star, computed from the star's B-V value, if data
+        // exists.
+        std::optional<glm::dvec3> starColor [[codegen::color()]];
+
+        // The effective temperature of the star, in Kelvin, if data exists.
+        std::optional<double> starTeff;
+
+        // The luminosity for the star, in units of solar luminosities [log10(Solar)], if
+        // data exists.
+        std::optional<double> starLuminosity;
+
+        struct Planet {
+            // An identifier to use for the planet, created based on the planet name.
+            std::string id;
+
+            // The name of the exoplanet.
+            std::string name;
+
+            // The radius of the planet, in meters, if data exists.
+            std::optional<double> starRadius;
+
+            // The semi-major axis of the planet's orbit, in meters. That is, the orbit
+            // size. This is required to be able to be visualize the planetary orbit.
+            double semiMajorAxis;
+
+            // The uncertainty of the semi-major axis, given as an asymmetric uncertainty
+            // with two values: the lower and upper uncertainty for the orbit size. The
+            // values are given as values relative to the size of the `SemiMajorAxis`. For
+            // example, the lower (first) value is computed as the lower uncertainty
+            // value divided by the value for the semi-major axis.
+            //
+            // If no value is given, there is no uncertainty and the semi-major axis value
+            // is exact.
+            std::optional<glm::dvec2> semiMajorAxisUncertainty;
+
+            // The eccentricity of the planet's orbit. If it does not exist in the data,
+            // it is given a default value of 0.
+            double eccentricity;
+
+            // The inclination of the planet's orbit, given as an angle in degrees in the
+            // range 0-360. If it does not exist in the data, it is given a default value
+            // of 90 degrees.
+            double inclination;
+
+            // The longitude of ascending node, that is, the angle for the direction of
+            // the point where the orbit passes through a reference plane. Also
+            // known as the right ascension of the ascending node. The angle is given as
+            // degrees in the range 0-360. If it does not exist in the data, it is given
+            // a default value of 180 degrees.
+            double ascendingNode;
+
+            // The argument of periapsis of the orbit, given as an angle in degrees in
+            // the range 0-360. It is the angle between the planet's periapsis (the point
+            // where it is closest to its star) and its ascending node, that is, where it
+            // passes through its reference plane. If it does not exist in the data, it
+            // is given a default value of 90 degrees.
+            double argumentOfPeriapsis;
+
+            // The epoch to use when computing the planet's initial position in its orbit,
+            // given as an ISO 8601-like date string of the format YYYY-MM-DDTHH:MN:SS.
+            //
+            // Computed based on the \"Time of Conjunction (Transit Midpoint)\" value in
+            // the data from the exoplanet archive.
+            std::string epoch;
+
+            // Time the planet takes to make a complete orbit around the host star or
+            // system, in days.
+            double period;
+
+            // A rotation matrix that represents the rotation of the plane of the orbit.
+            // It is computed based on the inclination, ascending node, and argument of
+            // periapsis values. Hence, it may be derived from default values.
+            glm::dmat3 orbitPlaneRotationMatrix;
+
+            // True, if default values have been used for any of the orbit parameters, due
+            // to missing data.
+            bool hasUsedDefaultValues;
+        };
+
+        // A list of data tables for the planets in the system (that have enough data to be
+        // visualized), with data about the planet and its orbit.
+        std::vector<Planet> planets;
+
+        // A rotation matrix to use for the entire system's rotation. Broadly speaking, it
+        // rotates the system so that the reference plane is perpendicular to the
+        // line-of-sight from Earth (and so that a 90 degree orbit inclination leads to
+        // an orbit that passes in front of its star, relative to the line-of-sight).
+        glm::dmat3 systemRotation;
+
+        // A rotation matrix that represents the average of all the orbit planes in the
+        // system. Computed using the planets' average inclinations, ascending nodes, and
+        // arguments of periapsis.
+        glm::dmat3 meanOrbitRotation;
+
+        // The distance from this system to our solar system, in light years.
+        double distance;
+    };
+#include "datastructure_codegen.cpp"
+} // namespace
+
+namespace openspace::exoplanets {
+
+ghoul::Dictionary ExoplanetSystem::toDataDictionary() const {
+    ghoul_assert(
+        planetNames.size() == planetsData.size(),
+        "The length of the planet names list must match the planet data list"
+    );
+
+    ghoul::Dictionary res;
+
+    res.setValue("SystemId", makeIdentifier(starName));
+
+    const glm::dvec3 starPosInParsec = static_cast<glm::dvec3>(starData.position);
+
+    if (!isValidPosition(starPosInParsec)) {
+        LERROR(std::format(
+            "Insufficient data available for exoplanet system '{}'. Could not "
+            "determine star position", starName
+        ));
+        return ghoul::Dictionary();
+    }
+
+    const glm::dvec3 starPos = starPosInParsec * distanceconstants::Parsec;
+    res.setValue("Position", starPos);
+
+    res.setValue("NumPlanets", static_cast<int>(planetNames.size()));
+
+    std::string sanitizedStarName = starName;
+    sanitizeNameString(sanitizedStarName);
+    res.setValue("StarName", sanitizedStarName);
+
+    if (!std::isnan(starData.radius)) {
+        double radiusInMeter = distanceconstants::SolarRadius * starData.radius;
+        res.setValue("StarRadius", radiusInMeter);
+    }
+
+    if (!std::isnan(starData.bv)) {
+        res.setValue("StarColor", glm::dvec3(computeStarColor(starData.bv)));
+    }
+
+    if (!std::isnan(starData.teff)) {
+        res.setValue("StarTeff", static_cast<double>(starData.teff));
+    }
+
+    if (!std::isnan(starData.luminosity)) {
+        res.setValue("StarLuminosity", static_cast<double>(starData.luminosity));
+    }
+
+    ghoul::Dictionary planets;
+    std::vector<float> inclinations;
+    inclinations.reserve(planetNames.size());
+
+    for (size_t i = 0; i < planetNames.size(); i++) {
+        const ExoplanetDataEntry& data = planetsData[i];
+        const std::string& name = planetNames[i];
+        const std::string id = makeIdentifier(name);
+
+        ghoul::Dictionary planet;
+
+        planet.setValue("Id", id);
+        planet.setValue("Name", name);
+
+        bool hasUsedDefaultValues = false;
+
+        if (!std::isnan(data.r)) {
+            double planetRadius = data.r * distanceconstants::JupiterRadius;
+            planet.setValue("Radius", planetRadius);
+        }
+
+        // Orbit data
+        {
+            planet.setValue(
+                "SemiMajorAxis",
+                static_cast<double>(data.a) * distanceconstants::AstronomicalUnit
+            );
+
+            bool hasUpperAUncertainty = !std::isnan(data.aUpper);
+            bool hasLowerAUncertainty = !std::isnan(data.aLower);
+
+            if (hasUpperAUncertainty && hasLowerAUncertainty) {
+                const float lowerOffset = static_cast<float>(data.aLower / data.a);
+                const float upperOffset = static_cast<float>(data.aUpper / data.a);
+                planet.setValue(
+                    "SemiMajorAxisUncertainty",
+                    glm::dvec2(lowerOffset, upperOffset)
+                );
+            }
+
+            if (!std::isnan(data.ecc)) {
+                planet.setValue("Eccentricity", static_cast<double>(data.ecc));
+            }
+            else {
+                planet.setValue("Eccentricity", 0.0);
+                hasUsedDefaultValues = true;
+            }
+
+            // KeplerTranslation requires angles in range [0, 360]
+            auto validAngle = [&hasUsedDefaultValues](float angle, float defaultValue) {
+                if (std::isnan(angle)) {
+                    hasUsedDefaultValues = true;
+                    return defaultValue;
+                }
+                while (angle < 0.f) {
+                    angle += 360.f;
+                }
+                while (angle > 360.f) {
+                    angle = -360.f;
+                }
+                return angle;
+            };
+
+            float inclination = validAngle(data.i, 90.f);
+            float bigOmega = validAngle(data.bigOmega, 180.f);
+            float omega = validAngle(data.omega, 90.f);
+
+            inclinations.push_back(inclination);
+
+            planet.setValue("Inclination", static_cast<double>(inclination));
+            planet.setValue("AscendingNode", static_cast<double>(bigOmega));
+            planet.setValue("ArgumentOfPeriapsis", static_cast<double>(omega));
+
+            std::string sEpoch;
+            if (!std::isnan(data.tt)) {
+                Time epoch;
+                epoch.setTime("JD " + std::to_string(data.tt));
+                sEpoch = std::string(epoch.ISO8601());
+            }
+            else {
+                hasUsedDefaultValues = true;
+                sEpoch = "2009-05-19T07:11:34.080";
+            }
+            planet.setValue("Epoch", sEpoch);
+            planet.setValue("Period", data.per);
+
+            const glm::dmat4 rotation = computeOrbitPlaneRotationMatrix(
+                inclination,
+                bigOmega,
+                omega
+            );
+            const glm::dmat3 rotationMat3 = static_cast<glm::dmat3>(rotation);
+            planet.setValue("OrbitPlaneRotationMatrix", rotationMat3);
+
+            planet.setValue("HasUsedDefaultValues", hasUsedDefaultValues);
+        }
+
+        planets.setValue(id, planet);
+    }
+
+    res.setValue("Planets", planets);
+
+    // Extra stuff that is useful for rendering
+    const glm::dmat3 exoplanetSystemRotation = computeSystemRotation(starPos);
+    res.setValue("SystemRotation", exoplanetSystemRotation);
+
+    float meanInclination = 0.f;
+    for (const float& i : inclinations) {
+        meanInclination += i / static_cast<float>(inclinations.size());
+    }
+    const glm::dmat4 rotation = computeOrbitPlaneRotationMatrix(meanInclination);
+    const glm::dmat3 meanOrbitPlaneRotationMatrix = static_cast<glm::dmat3>(rotation);
+
+    res.setValue("MeanOrbitRotation", meanOrbitPlaneRotationMatrix);
+
+    double distanceToOurSystem = glm::length(starPosInParsec) *
+        distanceconstants::Parsec / distanceconstants::LightYear;
+
+    res.setValue("Distance", distanceToOurSystem);
+
+    return res;
+}
+
+documentation::Documentation ExoplanetSystem::Documentation() {
+    return codegen::doc<Parameters>("exoplanets_exoplanet_system_data");
+}
+
+} // namespace openspace::exoplanets
diff --git a/modules/exoplanets/datastructure.h b/modules/exoplanets/datastructure.h
new file mode 100644
index 0000000000..be3e6c2ea1
--- /dev/null
+++ b/modules/exoplanets/datastructure.h
@@ -0,0 +1,155 @@
+/*****************************************************************************************
+ *                                                                                       *
+ * OpenSpace                                                                             *
+ *                                                                                       *
+ * Copyright (c) 2014-2024                                                               *
+ *                                                                                       *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
+ * software and associated documentation files (the "Software"), to deal in the Software *
+ * without restriction, including without limitation the rights to use, copy, modify,    *
+ * merge, publish, distribute, sublicense, and/or sell copies of the Software, and to    *
+ * permit persons to whom the Software is furnished to do so, subject to the following   *
+ * conditions:                                                                           *
+ *                                                                                       *
+ * The above copyright notice and this permission notice shall be included in all copies *
+ * or substantial portions of the Software.                                              *
+ *                                                                                       *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED,   *
+ * INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A         *
+ * PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT    *
+ * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF  *
+ * CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE  *
+ * OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                                         *
+ ****************************************************************************************/
+
+#ifndef __OPENSPACE_MODULE_EXOPLANETS___DATASTRUCTURE___H__
+#define __OPENSPACE_MODULE_EXOPLANETS___DATASTRUCTURE___H__
+
+#include <openspace/documentation/documentation.h>
+#include <ghoul/glm.h>
+#include <ghoul/misc/dictionary.h>
+#include <optional>
+#include <string>
+#include <vector>
+
+namespace openspace::exoplanets {
+
+struct ExoplanetDataEntry {
+    /// Orbital semi-major axis in AU
+    float a = std::numeric_limits<float>::quiet_NaN();
+    /// Upper uncertainty of orbital semi-major axis
+    double aUpper = std::numeric_limits<double>::quiet_NaN();
+    /// Lower uncertainty of orbital semi-major axis
+    double aLower = std::numeric_limits<double>::quiet_NaN();
+
+    /// Longitude of ascending node in degrees
+    float bigOmega = std::numeric_limits<float>::quiet_NaN();
+    /// Upper uncertainty of longitude of ascending node
+    float bigOmegaUpper = std::numeric_limits<float>::quiet_NaN();
+    /// Lower uncertainty of longitude of ascending node
+    float bigOmegaLower = std::numeric_limits<float>::quiet_NaN();
+
+    /// Star known to be binary?
+    bool binary = false;
+
+    /// Star B − V color
+    float bmv = std::numeric_limits<float>::quiet_NaN();
+
+    /// Orbital eccentricity
+    float ecc = std::numeric_limits<float>::quiet_NaN();
+    /// Upper uncertainty of orbital eccentricity
+    float eccUpper = std::numeric_limits<float>::quiet_NaN();
+    /// Lower uncertainty of orbital eccentricity
+    float eccLower = std::numeric_limits<float>::quiet_NaN();
+
+    /// Orbital inclination in degrees (for transiting systems only)
+    float i = std::numeric_limits<float>::quiet_NaN();
+    /// Upper uncertainty of orbital inclination
+    float iUpper = std::numeric_limits<float>::quiet_NaN();
+    /// Lower uncertainty of orbital inclination
+    float iLower = std::numeric_limits<float>::quiet_NaN();
+
+    /// Number of known planets in the planetary system
+    int nPlanets = std::numeric_limits<int>::quiet_NaN();
+
+    /// Number of stars in the planetary system
+    int nStars = std::numeric_limits<int>::quiet_NaN();
+
+    /// Argument of periastron in degrees
+    float omega = std::numeric_limits<float>::quiet_NaN();
+    /// Upper uncertainty of argument of periastron
+    float omegaUpper = std::numeric_limits<float>::quiet_NaN();
+    /// Lower uncertainty of argument of periastron
+    float omegaLower = std::numeric_limits<float>::quiet_NaN();
+
+    /// Orbital period in days
+    double per = std::numeric_limits<double>::quiet_NaN();
+    /// Upper uncertainty of period
+    float perUpper = std::numeric_limits<float>::quiet_NaN();
+    /// Lower uncertainty of period
+    float perLower = std::numeric_limits<float>::quiet_NaN();
+
+    /// Radius of the planet in Jupiter radii
+    double r = std::numeric_limits<double>::quiet_NaN();
+    /// Upper uncertainty of radius of the planet
+    double rUpper = std::numeric_limits<double>::quiet_NaN();
+    /// Lower uncertainty of radius of the planet
+    double rLower = std::numeric_limits<double>::quiet_NaN();
+
+    /// Estimated radius of the star in solar radii
+    float rStar = std::numeric_limits<float>::quiet_NaN();
+    /// Upper uncertainty of estimated star radius
+    float rStarUpper = std::numeric_limits<float>::quiet_NaN();
+    /// Lower uncertainty of estimated star radius
+    float rStarLower = std::numeric_limits<float>::quiet_NaN();
+
+    /// Star luminosity, in units of solar luminosities
+    float luminosity = std::numeric_limits<float>::quiet_NaN();
+    /// Upper uncertainty of star luminosity
+    float luminosityUpper = std::numeric_limits<float>::quiet_NaN();
+    /// Lower uncertainty of star luminosity
+    float luminosityLower = std::numeric_limits<float>::quiet_NaN();
+
+    /// Star's effective temperature in Kelvin
+    float teff = std::numeric_limits<float>::quiet_NaN();
+    /// Upper uncertainty of effective temperature
+    float teffUpper = std::numeric_limits<float>::quiet_NaN();
+    /// Lower uncertainty of effective temperature
+    float teffLower = std::numeric_limits<float>::quiet_NaN();
+
+    /// Epoch of transit center in HJD-2440000
+    double tt = std::numeric_limits<double>::quiet_NaN();
+    /// Upper uncertainty of epoch of transit center
+    float ttUpper = std::numeric_limits<float>::quiet_NaN();
+    /// Lower uncertainty of epoch of transit center
+    float ttLower = std::numeric_limits<float>::quiet_NaN();
+
+    /// Star position's X-coordinate in parsec
+    float positionX = std::numeric_limits<float>::quiet_NaN();
+    /// Star position's Y-coordinate in parsec
+    float positionY = std::numeric_limits<float>::quiet_NaN();
+    /// Star position's Z-coordinate in parsec
+    float positionZ = std::numeric_limits<float>::quiet_NaN();
+};
+
+struct StarData {
+    glm::vec3 position = glm::vec3(std::numeric_limits<float>::quiet_NaN()); // In parsec
+    float radius = std::numeric_limits<float>::quiet_NaN(); // In solar radii
+    float bv = std::numeric_limits<float>::quiet_NaN();
+    float teff = std::numeric_limits<float>::quiet_NaN(); // In Kelvin
+    float luminosity = std::numeric_limits<float>::quiet_NaN(); // In solar luminosities
+};
+
+struct ExoplanetSystem {
+    std::string starName;
+    StarData starData;
+    std::vector<std::string> planetNames;
+    std::vector<ExoplanetDataEntry> planetsData;
+
+    ghoul::Dictionary toDataDictionary() const;
+    static documentation::Documentation Documentation();
+};
+
+} // namespace openspace::exoplanets
+
+#endif // __OPENSPACE_MODULE_EXOPLANETS___DATASTRUCTURE___H__
diff --git a/modules/exoplanets/exoplanetshelper.cpp b/modules/exoplanets/exoplanetshelper.cpp
index ff8c5287bc..0504aa700d 100644
--- a/modules/exoplanets/exoplanetshelper.cpp
+++ b/modules/exoplanets/exoplanetshelper.cpp
@@ -24,12 +24,13 @@
 
 #include <modules/exoplanets/exoplanetshelper.h>
 
+#include <modules/exoplanets/datastructure.h>
 #include <modules/exoplanets/exoplanetsmodule.h>
 #include <openspace/engine/globals.h>
 #include <openspace/engine/moduleengine.h>
+#include <openspace/util/distanceconstants.h>
 #include <openspace/util/spicemanager.h>
 #include <ghoul/filesystem/filesystem.h>
-#include <ghoul/format.h>
 #include <ghoul/logging/logmanager.h>
 #include <ghoul/misc/stringhelper.h>
 #include <glm/gtx/quaternion.hpp>
diff --git a/modules/exoplanets/exoplanetshelper.h b/modules/exoplanets/exoplanetshelper.h
index 9af3a0c0d4..b1f99e2210 100644
--- a/modules/exoplanets/exoplanetshelper.h
+++ b/modules/exoplanets/exoplanetshelper.h
@@ -26,124 +26,13 @@
 #define __OPENSPACE_MODULE_EXOPLANETS___EXOPLANETSHELPER___H__
 
 #include <ghoul/glm.h>
-#include <optional>
+#include <ghoul/misc/dictionary.h>
 #include <string>
-#include <vector>
 
 namespace openspace::exoplanets {
 
-struct ExoplanetDataEntry {
-    /// Orbital semi-major axis in AU
-    float a = std::numeric_limits<float>::quiet_NaN();
-    /// Upper uncertainty of orbital semi-major axis
-    double aUpper = std::numeric_limits<double>::quiet_NaN();
-    /// Lower uncertainty of orbital semi-major axis
-    double aLower = std::numeric_limits<double>::quiet_NaN();
-
-    /// Longitude of ascending node in degrees
-    float bigOmega = std::numeric_limits<float>::quiet_NaN();
-    /// Upper uncertainty of longitude of ascending node
-    float bigOmegaUpper = std::numeric_limits<float>::quiet_NaN();
-    /// Lower uncertainty of longitude of ascending node
-    float bigOmegaLower = std::numeric_limits<float>::quiet_NaN();
-
-    /// Star known to be binary?
-    bool binary = false;
-
-    /// Star B − V color
-    float bmv = std::numeric_limits<float>::quiet_NaN();
-
-    /// Orbital eccentricity
-    float ecc = std::numeric_limits<float>::quiet_NaN();
-    /// Upper uncertainty of orbital eccentricity
-    float eccUpper = std::numeric_limits<float>::quiet_NaN();
-    /// Lower uncertainty of orbital eccentricity
-    float eccLower = std::numeric_limits<float>::quiet_NaN();
-
-    /// Orbital inclination in degrees (for transiting systems only)
-    float i = std::numeric_limits<float>::quiet_NaN();
-    /// Upper uncertainty of orbital inclination
-    float iUpper = std::numeric_limits<float>::quiet_NaN();
-    /// Lower uncertainty of orbital inclination
-    float iLower = std::numeric_limits<float>::quiet_NaN();
-
-    /// Number of known planets in the planetary system
-    int nPlanets = std::numeric_limits<int>::quiet_NaN();
-
-    /// Number of stars in the planetary system
-    int nStars = std::numeric_limits<int>::quiet_NaN();
-
-    /// Argument of periastron in degrees
-    float omega = std::numeric_limits<float>::quiet_NaN();
-    /// Upper uncertainty of argument of periastron
-    float omegaUpper = std::numeric_limits<float>::quiet_NaN();
-    /// Lower uncertainty of argument of periastron
-    float omegaLower = std::numeric_limits<float>::quiet_NaN();
-
-    /// Orbital period in days
-    double per = std::numeric_limits<double>::quiet_NaN();
-    /// Upper uncertainty of period
-    float perUpper = std::numeric_limits<float>::quiet_NaN();
-    /// Lower uncertainty of period
-    float perLower = std::numeric_limits<float>::quiet_NaN();
-
-    /// Radius of the planet in Jupiter radii
-    double r = std::numeric_limits<double>::quiet_NaN();
-    /// Upper uncertainty of radius of the planet
-    double rUpper = std::numeric_limits<double>::quiet_NaN();
-    /// Lower uncertainty of radius of the planet
-    double rLower = std::numeric_limits<double>::quiet_NaN();
-
-    /// Estimated radius of the star in solar radii
-    float rStar = std::numeric_limits<float>::quiet_NaN();
-    /// Upper uncertainty of estimated star radius
-    float rStarUpper = std::numeric_limits<float>::quiet_NaN();
-    /// Lower uncertainty of estimated star radius
-    float rStarLower = std::numeric_limits<float>::quiet_NaN();
-
-    /// Star luminosity, in units of solar luminosities
-    float luminosity = std::numeric_limits<float>::quiet_NaN();
-    /// Upper uncertainty of star luminosity
-    float luminosityUpper = std::numeric_limits<float>::quiet_NaN();
-    /// Lower uncertainty of star luminosity
-    float luminosityLower = std::numeric_limits<float>::quiet_NaN();
-
-    /// Star's effective temperature in Kelvin
-    float teff = std::numeric_limits<float>::quiet_NaN();
-    /// Upper uncertainty of effective temperature
-    float teffUpper = std::numeric_limits<float>::quiet_NaN();
-    /// Lower uncertainty of effective temperature
-    float teffLower = std::numeric_limits<float>::quiet_NaN();
-
-    /// Epoch of transit center in HJD-2440000
-    double tt = std::numeric_limits<double>::quiet_NaN();
-    /// Upper uncertainty of epoch of transit center
-    float ttUpper = std::numeric_limits<float>::quiet_NaN();
-    /// Lower uncertainty of epoch of transit center
-    float ttLower = std::numeric_limits<float>::quiet_NaN();
-
-    /// Star position's X-coordinate in parsec
-    float positionX = std::numeric_limits<float>::quiet_NaN();
-    /// Star position's Y-coordinate in parsec
-    float positionY = std::numeric_limits<float>::quiet_NaN();
-    /// Star position's Z-coordinate in parsec
-    float positionZ = std::numeric_limits<float>::quiet_NaN();
-};
-
-struct StarData {
-    glm::vec3 position = glm::vec3(std::numeric_limits<float>::quiet_NaN()); // In parsec
-    float radius = std::numeric_limits<float>::quiet_NaN(); // In solar radii
-    float bv = std::numeric_limits<float>::quiet_NaN();
-    float teff = std::numeric_limits<float>::quiet_NaN(); // In Kelvin
-    float luminosity = std::numeric_limits<float>::quiet_NaN(); // In solar luminosities
-};
-
-struct ExoplanetSystem {
-    std::string starName;
-    StarData starData;
-    std::vector<std::string> planetNames;
-    std::vector<ExoplanetDataEntry> planetsData;
-};
+struct ExoplanetDataEntry;
+struct StarData;
 
 bool isValidPosition(const glm::vec3& pos);
 
diff --git a/modules/exoplanets/exoplanetsmodule.cpp b/modules/exoplanets/exoplanetsmodule.cpp
index f27abf7ccc..ad56c50dd0 100644
--- a/modules/exoplanets/exoplanetsmodule.cpp
+++ b/modules/exoplanets/exoplanetsmodule.cpp
@@ -24,6 +24,7 @@
 
 #include <modules/exoplanets/exoplanetsmodule.h>
 
+#include <modules/exoplanets/datastructure.h>
 #include <modules/exoplanets/exoplanetshelper.h>
 #include <modules/exoplanets/rendering/renderableorbitdisc.h>
 #include <modules/exoplanets/tasks/exoplanetsdatapreparationtask.h>
@@ -411,20 +412,24 @@ void ExoplanetsModule::internalInitialize(const ghoul::Dictionary& dict) {
 std::vector<documentation::Documentation> ExoplanetsModule::documentations() const {
     return {
         ExoplanetsDataPreparationTask::documentation(),
-        RenderableOrbitDisc::Documentation()
+        RenderableOrbitDisc::Documentation(),
+        ExoplanetSystem::Documentation()
     };
 }
 
 scripting::LuaLibrary ExoplanetsModule::luaLibrary() const {
     return {
-        "exoplanets",
-        {
-            codegen::lua::AddExoplanetSystem,
+        .name = "exoplanets",
+        .functions = {
             codegen::lua::RemoveExoplanetSystem,
+            codegen::lua::SystemData,
             codegen::lua::ListOfExoplanets,
             codegen::lua::ListOfExoplanetsDeprecated,
             codegen::lua::ListAvailableExoplanetSystems,
-            codegen::lua::LoadExoplanetsFromCsv
+            codegen::lua::LoadSystemDataFromCsv
+        },
+        .scripts = {
+            absPath("${MODULE_EXOPLANETS}/scripts/systemcreation.lua")
         }
     };
 }
diff --git a/modules/exoplanets/exoplanetsmodule_lua.inl b/modules/exoplanets/exoplanetsmodule_lua.inl
index 29e555d34c..8338b2d70e 100644
--- a/modules/exoplanets/exoplanetsmodule_lua.inl
+++ b/modules/exoplanets/exoplanetsmodule_lua.inl
@@ -22,6 +22,9 @@
  * OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                                         *
  ****************************************************************************************/
 
+#include <modules/exoplanets/datastructure.h>
+#include <modules/exoplanets/exoplanetshelper.h>
+#include <modules/exoplanets/tasks/exoplanetsdatapreparationtask.h>
 #include <openspace/scene/scene.h>
 #include <ghoul/misc/csvreader.h>
 #include <ghoul/misc/stringhelper.h>
@@ -34,18 +37,7 @@ namespace {
 
 constexpr std::string_view _loggerCat = "ExoplanetsModule";
 
-constexpr std::string_view ExoplanetsGuiPath = "/Milky Way/Exoplanets/Exoplanet Systems/";
-
-// Lua cannot handle backslashes, so replace these with forward slashes
-std::string formatPathToLua(const std::filesystem::path& path) {
-    std::string resPath = path.string();
-    std::replace(resPath.begin(), resPath.end(), '\\', '/');
-    return resPath;
-}
-
-openspace::exoplanets::ExoplanetSystem findExoplanetSystemInData(
-                                                                std::string_view starName)
-{
+openspace::exoplanets::ExoplanetSystem findSystemInData(std::string_view starName) {
     using namespace openspace;
     using namespace exoplanets;
 
@@ -54,15 +46,17 @@ openspace::exoplanets::ExoplanetSystem findExoplanetSystemInData(
     const std::filesystem::path binPath = module->exoplanetsDataPath();
     std::ifstream data(absPath(binPath), std::ios::in | std::ios::binary);
     if (!data.good()) {
-        LERROR(std::format("Failed to open exoplanets data file '{}'", binPath));
-        return ExoplanetSystem();
+        throw ghoul::lua::LuaError(std::format(
+            "Failed to open exoplanets data file '{}'", binPath
+        ));
     }
 
     const std::filesystem::path lutPath = module->lookUpTablePath();
     std::ifstream lut(absPath(lutPath));
     if (!lut.good()) {
-        LERROR(std::format("Failed to open exoplanets look-up table '{}'", lutPath));
-        return ExoplanetSystem();
+        throw ghoul::lua::LuaError(std::format(
+            "Failed to open exoplanets look-up table '{}'", lutPath
+        ));
     }
 
     ExoplanetSystem system;
@@ -105,596 +99,6 @@ openspace::exoplanets::ExoplanetSystem findExoplanetSystemInData(
     return system;
 }
 
-void queueAddSceneGraphNodeScript(const std::string& sgnTableAsString) {
-    using namespace openspace;
-    // No sync or send because this will already be called inside a Lua script,
-    // therefor it has already been synced and sent to the connected nodes and peers
-    global::scriptEngine->queueScript({
-        .code = std::format("openspace.addSceneGraphNode({})", sgnTableAsString),
-        .synchronized = scripting::ScriptEngine::Script::ShouldBeSynchronized::No,
-        .sendToRemote = scripting::ScriptEngine::Script::ShouldSendToRemote::No
-    });
-}
-
-void createExoplanetSystem(const std::string& starName,
-                           openspace::exoplanets::ExoplanetSystem system)
-{
-    using namespace openspace;
-    using namespace exoplanets;
-
-    const std::string starIdentifier = makeIdentifier(starName);
-
-    std::string sanitizedStarName = starName;
-    sanitizeNameString(sanitizedStarName);
-
-    const std::string guiPath = std::format("{}{}", ExoplanetsGuiPath, sanitizedStarName);
-
-    SceneGraphNode* existingStarNode = sceneGraphNode(starIdentifier);
-    if (existingStarNode) {
-        LERROR(std::format(
-            "Adding of exoplanet system '{}' failed. The system has already been added",
-            starName
-        ));
-        return;
-    }
-
-    const glm::vec3 starPosInParsec = system.starData.position;
-    if (!isValidPosition(starPosInParsec)) {
-        LERROR(std::format(
-            "Insufficient data available for exoplanet system '{}'. Could not determine "
-            "star position", starName
-        ));
-        return;
-    }
-
-    const ExoplanetsModule* module = global::moduleEngine->module<ExoplanetsModule>();
-
-    const glm::dvec3 starPos =
-        static_cast<glm::dvec3>(starPosInParsec) * distanceconstants::Parsec;
-    const glm::dmat3 exoplanetSystemRotation = computeSystemRotation(starPos);
-
-    // Star
-    double radiusInMeter = distanceconstants::SolarRadius;
-    if (!std::isnan(system.starData.radius)) {
-        radiusInMeter *= system.starData.radius;
-    }
-
-    std::string colorLayers;
-    std::optional<glm::vec3> starColor = std::nullopt;
-    const float bv = system.starData.bv;
-
-    if (!std::isnan(bv)) {
-        starColor = computeStarColor(bv);
-        const std::filesystem::path starTexture = module->starTexturePath();
-
-        if (!starTexture.empty() && !std::filesystem::is_regular_file(starTexture)) {
-            LWARNING(std::format(
-                "Could not find specified star texture set in {} module: '{}'",
-                module->guiName(), starTexture
-            ));
-        }
-
-        colorLayers =
-            "{"
-                "Identifier = 'StarColor',"
-                "Type = 'SolidColor',"
-                "Color = " + ghoul::to_string(*starColor) + ","
-                "BlendMode = 'Normal',"
-                "Enabled = true"
-            "},"
-            "{"
-                "Identifier = 'StarTexture',"
-                "FilePath = openspace.absPath('" + formatPathToLua(starTexture) + "'),"
-                "BlendMode = 'Color',"
-                "Enabled = true"
-            "}";
-    }
-    else {
-        const std::filesystem::path noDataTexture = module->noDataTexturePath();
-        colorLayers =
-            "{"
-                "Identifier = 'NoDataStarTexture',"
-                "FilePath = openspace.absPath('" + formatPathToLua(noDataTexture) + "'),"
-                "BlendMode = 'Color',"
-                "Enabled = true"
-            "}";
-    }
-
-    // @TODO (2024-09-16, emmbr) Compose a more extensive summary of the system,
-    // based on more data in the archive (like number of stars) and the planets.
-    // Also include more data on the star itself (like spectral type)
-    float distanceToOurSystem = glm::length(starPosInParsec) *
-        distanceconstants::Parsec / distanceconstants::LightYear;
-
-    size_t nPlanets = system.planetNames.size();
-    const std::string starDescription = std::format(
-        "The star {} is the host star of an exoplanet system with {} {} that {}  "
-        "enough data to be visualized. It has a size of {:.2f} solar radii and an "
-        "effective temperature of {:.0f} Kelvin. The system is located at a "
-        "distance of {:.0f} light-years from Earth.",
-        sanitizedStarName, nPlanets,
-        nPlanets > 1 ? "planets" : "planet",
-        nPlanets > 1 ? "have" : "has",
-        radiusInMeter / distanceconstants::SolarRadius,
-        system.starData.teff, distanceToOurSystem
-    );
-
-    const std::string starGlobeRenderableString = "Renderable = {"
-        "Type = 'RenderableGlobe',"
-        "Radii = " + std::to_string(radiusInMeter) + ","
-        "PerformShading = false,"
-        "Layers = {"
-            "ColorLayers = { " + colorLayers + "}"
-        "}"
-    "},";
-
-    const std::string starParent = "{"
-        "Identifier = '" + starIdentifier + "',"
-        "Parent = 'SolarSystemBarycenter',"
-        "" + starGlobeRenderableString + ""
-        "Transform = {"
-            "Rotation = {"
-                "Type = 'StaticRotation',"
-                "Rotation = " + ghoul::to_string(exoplanetSystemRotation) + ""
-            "},"
-            "Translation = {"
-                "Type = 'StaticTranslation',"
-                "Position = " + ghoul::to_string(starPos) + ""
-            "}"
-        "},"
-        "Tag = {'exoplanet_system'},"
-        "GUI = {"
-            "Name = '" + sanitizedStarName + " (Star)',"
-            "Path = '" + guiPath + "',"
-            "Description = \"" + starDescription + "\""
-        "}"
-    "}";
-
-    queueAddSceneGraphNodeScript(starParent);
-
-    // Add a label for the star.
-    // The fade values are set based on the values for the Sun label
-    const std::string starLabel = "{"
-        "Identifier = '" + starIdentifier + "_Label',"
-        "Parent = '" + starIdentifier + "',"
-        "Renderable = {"
-          "Type = 'RenderableLabel',"
-          "Enabled = false,"
-          "Text = '" + sanitizedStarName + "',"
-          "FontSize = 70.0,"
-          "Size = 14.17,"
-          "MinMaxSize = { 1, 50 },"
-          "EnableFading = true,"
-          "FadeUnit = 'pc',"
-          "FadeDistances = { 1.33, 15.0 },"
-          "FadeWidths = {1.0, 20.0}"
-        "},"
-        "Tag = {'exoplanet_system_labels'},"
-        "GUI = {"
-            "Name = '" + sanitizedStarName + " Label',"
-            "Path = '" + guiPath + "'"
-        "}"
-    "}";
-
-    queueAddSceneGraphNodeScript(starLabel);
-
-    // Planets
-
-    const std::filesystem::path planetTexture = module->planetDefaultTexturePath();
-    if (!planetTexture.empty() && !std::filesystem::is_regular_file(planetTexture)) {
-        LWARNING(std::format(
-            "Could not find specified planet default texture set in {} module: '{}'",
-            module->guiName(), planetTexture
-        ));
-    }
-
-    for (size_t i = 0; i < system.planetNames.size(); i++) {
-        // Note that we are here overriding some invalid parameters in the planet data.
-        // Use a reference, so that it is changed down the line
-        ExoplanetDataEntry& planet = system.planetsData[i];
-        const std::string planetName = system.planetNames[i];
-
-        if (std::isnan(planet.ecc)) {
-            planet.ecc = 0.f;
-        }
-
-        // KeplerTranslation requires angles in range [0, 360]
-        auto validAngle = [](float angle, float defaultValue) {
-            if (std::isnan(angle)) { return defaultValue; }
-            if (angle < 0.f) { return angle + 360.f; }
-            if (angle > 360.f) { return angle - 360.f; }
-            return angle;
-        };
-
-        planet.i = validAngle(planet.i, 90.f);
-        planet.bigOmega = validAngle(planet.bigOmega, 180.f);
-        planet.omega = validAngle(planet.omega, 90.f);
-
-        Time epoch;
-        std::string sEpoch;
-        if (!std::isnan(planet.tt)) {
-            epoch.setTime("JD " + std::to_string(planet.tt));
-            sEpoch = std::string(epoch.ISO8601());
-        }
-        else {
-            sEpoch = "2009-05-19T07:11:34.080";
-        }
-
-        double planetRadius;
-        std::string enabled;
-        if (std::isnan(planet.r)) {
-            if (std::isnan(planet.rStar)) {
-                planetRadius = planet.a * 0.001 * distanceconstants::AstronomicalUnit;
-            }
-            else {
-                planetRadius = planet.rStar * 0.1 * distanceconstants::SolarRadius;
-            }
-            enabled = "false";
-        }
-        else {
-            planetRadius = planet.r * distanceconstants::JupiterRadius;
-            enabled = "true";
-        }
-
-        float periodInSeconds = static_cast<float>(planet.per * SecondsPerDay);
-        double semiMajorAxisInMeter = planet.a * distanceconstants::AstronomicalUnit;
-        double semiMajorAxisInKm = semiMajorAxisInMeter * 0.001;
-
-        const std::string planetIdentifier = makeIdentifier(planetName);
-
-        const std::string planetKeplerTranslation = "{"
-            "Type = 'KeplerTranslation',"
-            "Eccentricity = " + std::to_string(planet.ecc) + ","
-            "SemiMajorAxis = " + std::to_string(semiMajorAxisInKm) + ","
-            "Inclination = " + std::to_string(planet.i) + ","
-            "AscendingNode = " + std::to_string(planet.bigOmega) + ","
-            "ArgumentOfPeriapsis = " + std::to_string(planet.omega) + ","
-            "MeanAnomaly = 0.0,"
-            "Epoch = '" + sEpoch + "'," //TT. JD to YYYY MM DD hh:mm:ss
-            "Period = " + std::to_string(periodInSeconds) + ""
-        "}";
-
-        std::string planetLayers;
-        std::string planetTypeDesc;
-
-        // Constant for different categories of sizes of planets (in Earth radii)
-        // Source: https://www.nasa.gov/image-article/sizes-of-known-exoplanets/
-        constexpr float TerrestrialMaxR = 1.25f;
-        constexpr float SuperEarthMaxR = 2.f;
-        constexpr float NeptuneLikeMaxR = 6.f;
-
-        const std::string TerrestrialDesc = std::format(
-            "Terrestrial planets (R < {} Earth radii)",
-            TerrestrialMaxR
-        );
-
-        const std::string SuperEarthDesc = std::format(
-            "Super-Earths ({} < R < {} Earth radii)",
-            TerrestrialMaxR, SuperEarthMaxR
-        );
-
-        const std::string NeptuneLikeDesc = std::format(
-            "Neptune-like planets ({} < R < {} Earth radii)",
-            SuperEarthMaxR, NeptuneLikeMaxR
-        );
-
-        const std::string GasGiantDesc = std::format(
-            "Gas giants or larger planets (R > {} Earth radii)",
-            NeptuneLikeMaxR
-        );
-
-        // Add a color layer with a fixed single color that represent the planet size,
-        // that is, approximately what type of planet it is.
-        // @TODO (2024-09-10, emmbr) Ideally the user should be able to edit this
-        if (!std::isnan(planet.r)) {
-            float rInMeter = static_cast<float>(planetRadius);
-            glm::vec3 colorFromSize = glm::vec3(0.f);
-
-            if (rInMeter < TerrestrialMaxR * distanceconstants::EarthRadius) {
-                // Terrestrial
-                colorFromSize = glm::vec3(0.32f, 0.2f, 0.1f); // Brown
-                planetTypeDesc = TerrestrialDesc;
-            }
-            else if (rInMeter < SuperEarthMaxR * distanceconstants::EarthRadius) {
-                // Super-Earths
-                colorFromSize = glm::vec3(1.f, 0.76f, 0.65f); // Beige
-                planetTypeDesc = SuperEarthDesc;
-            }
-            else if (rInMeter < NeptuneLikeMaxR * distanceconstants::EarthRadius) {
-                // Neptune-like
-                colorFromSize = glm::vec3(0.22f, 0.49f, 0.50f); // Blue
-                planetTypeDesc = NeptuneLikeDesc;
-            }
-            else {
-                // Gas Giants (Saturn and Jupiter size, and much larger!)
-                colorFromSize = glm::vec3(0.55f, 0.34f, 0.39f); // Wine red
-                planetTypeDesc = GasGiantDesc;
-            }
-
-            const std::string description = std::format(
-                "This layer gives a fixed color to the planet surface based on the "
-                "planet radius. The planets are split into four categories based on "
-                "their radius (in Earth radii). 1) {} are Brown, 2) {} are Beige, 3) "
-                "{} are Blue, and 4) {} are Wine red.",
-                TerrestrialDesc, SuperEarthDesc, NeptuneLikeDesc, GasGiantDesc
-            );
-
-            planetLayers += "{"
-                "Identifier = 'ColorFromSize',"
-                "Name = 'Color From Size',"
-                "Type = 'SolidColor',"
-                "Color = " + ghoul::to_string(colorFromSize) + ","
-                "Enabled = true,"
-                "Description = \"" + description + "\""
-            "}";
-        }
-
-        if (!planetTexture.empty()) {
-            planetLayers += ",{"
-                "Identifier = 'PlanetTexture',"
-                "Name = 'Planet Texture',"
-                "FilePath = openspace.absPath('" + formatPathToLua(planetTexture) + "'),"
-                "Enabled = true"
-            "}";
-        }
-
-        const std::string planetDescription = std::format(
-            "The exoplanet {} falls into the category of {}. Some key facts: "
-            "Radius: {:.2f} Earth radii, {:.2f} Jupiter radii. "
-            "Orbit Period: {:.1f} (Earth) days. "
-            "Orbit Semi-major axis: {:.2f} (AU). "
-            "Orbit Eccentricity: {:.2f}.",
-            planetName, planetTypeDesc,
-            planetRadius / distanceconstants::EarthRadius,
-            planetRadius / distanceconstants::JupiterRadius,
-            planet.per, planet.a, planet.ecc
-        );
-
-        // Use a higher ambient intensity when only the color from size is used, so that
-        // the color is more clearly visible from any direction
-        float ambientIntensity = planetTexture.empty() ? 0.5f : 0.15f;
-
-        const std::string planetNode = "{"
-            "Identifier = '" + planetIdentifier + "',"
-            "Parent = '" + starIdentifier + "',"
-            "Renderable = {"
-                "Type = 'RenderableGlobe',"
-                "Enabled = " + enabled + ","
-                "Radii = " + std::to_string(planetRadius) + "," // in meters
-                "PerformShading = true,"
-                "Layers = {"
-                    "ColorLayers = {" + planetLayers + "}"
-                "},"
-                "LightSourceNode = '" + starIdentifier + "',"
-                "AmbientIntensity = " + std::to_string(ambientIntensity) +
-            "},"
-            "Tag = { 'exoplanet_planet' }, "
-            "Transform = { "
-                "Translation = " + planetKeplerTranslation + ""
-            "},"
-            "GUI = {"
-                "Name = '" + planetName + "',"
-                "Path = '" + guiPath + "',"
-                "Description = [[" + planetDescription + "]]"
-            "}"
-        "}";
-
-        int trailResolution = 1000;
-
-        // Increase the resolution for highly eccentric orbits
-        constexpr float EccentricityThreshold = 0.85f;
-        if (planet.ecc > EccentricityThreshold) {
-            trailResolution *= 2;
-        }
-
-        const std::string planetTrailNode = "{"
-            "Identifier = '" + planetIdentifier + "_Trail',"
-            "Parent = '" + starIdentifier + "',"
-            "Renderable = {"
-                "Type = 'RenderableTrailOrbit',"
-                "Period = " + std::to_string(planet.per) + ","
-                "Resolution = " + std::to_string(trailResolution) + ","
-                "Translation = " + planetKeplerTranslation + ","
-                "Color = { 1, 1, 1 }"
-            "},"
-            "GUI = {"
-                "Name = '" + planetName + " Trail',"
-                "Path = '" + guiPath + "'"
-            "}"
-        "}";
-
-        queueAddSceneGraphNodeScript(planetTrailNode);
-        queueAddSceneGraphNodeScript(planetNode);
-
-        bool hasUpperAUncertainty = !std::isnan(planet.aUpper);
-        bool hasLowerAUncertainty = !std::isnan(planet.aLower);
-
-        if (hasUpperAUncertainty && hasLowerAUncertainty) {
-            const glm::dmat4 rotation = computeOrbitPlaneRotationMatrix(
-                planet.i,
-                planet.bigOmega,
-                planet.omega
-            );
-            const glm::dmat3 rotationMat3 = static_cast<glm::dmat3>(rotation);
-
-            const float lowerOffset = static_cast<float>(planet.aLower / planet.a);
-            const float upperOffset = static_cast<float>(planet.aUpper / planet.a);
-
-            const std::filesystem::path discTexture = module->orbitDiscTexturePath();
-
-            bool isDiscEnabled = module->showOrbitUncertainty();
-
-            const std::string discNode = "{"
-                "Identifier = '" + planetIdentifier + "_Disc',"
-                "Parent = '" + starIdentifier + "',"
-                "Renderable = {"
-                    "Type = 'RenderableOrbitDisc',"
-                    "Enabled = " + (isDiscEnabled ? "true" : "false") +  ","
-                    "Texture = openspace.absPath('" +
-                        formatPathToLua(discTexture) +
-                    "'),"
-                    "Size = " + std::to_string(semiMajorAxisInMeter) + ","
-                    "Eccentricity = " + std::to_string(planet.ecc) + ","
-                    "Offset = { " +
-                        std::to_string(lowerOffset) + ", " +
-                        std::to_string(upperOffset) +
-                    "}," //min / max extend
-                    "Opacity = 0.25"
-                "},"
-                "Transform = {"
-                    "Rotation = {"
-                        "Type = 'StaticRotation',"
-                        "Rotation = " + ghoul::to_string(rotationMat3) + ""
-                    "}"
-                "},"
-                "Tag = {'exoplanet_uncertainty_disc'},"
-                "GUI = {"
-                    "Name = '" + planetName + " Disc',"
-                    "Path = '" + guiPath + "',"
-                    "Description = \"The width of this disc around the planet's orbit "
-                        "marks the uncertainty of the orbit (based on the uncertainty of "
-                        "the semi-major axis and eccentricity measures). The wider the "
-                        "disc, the more uncertain the orbit is.\""
-                "}"
-            "}";
-
-            queueAddSceneGraphNodeScript(discNode);
-        }
-    }
-
-    float meanInclination = 0.f;
-    for (const ExoplanetDataEntry& p : system.planetsData) {
-        meanInclination += p.i;
-    }
-    meanInclination /= static_cast<float>(system.planetsData.size());
-    const glm::dmat4 rotation = computeOrbitPlaneRotationMatrix(meanInclination);
-    const glm::dmat3 meanOrbitPlaneRotationMatrix = static_cast<glm::dmat3>(rotation);
-
-    bool isCircleEnabled = module->showComparisonCircle();
-    glm::vec3 circleColor = module->comparisonCircleColor();
-
-    // 1 AU Size Comparison Circle
-    const std::string circle = "{"
-        "Identifier = '" + starIdentifier + "_1AU_Circle',"
-        "Parent = '" + starIdentifier + "',"
-        "Renderable = {"
-            "Type = 'RenderableRadialGrid',"
-            "Enabled = " + (isCircleEnabled ? "true" : "false") + ","
-            "Radii = { 0.0, 1.0 },"
-            "Color = " + ghoul::to_string(circleColor) + ","
-            "CircleSegments = 64,"
-            "LineWidth = 2.0,"
-        "},"
-        "Transform = {"
-            "Rotation = {"
-                "Type = 'StaticRotation',"
-                "Rotation = " + ghoul::to_string(meanOrbitPlaneRotationMatrix) + ""
-            "},"
-            "Scale = {"
-                "Type = 'StaticScale',"
-                "Scale = " + std::to_string(distanceconstants::AstronomicalUnit) + ""
-            "}"
-        "},"
-        "Tag = {'exoplanet_1au_ring'},"
-        "GUI = {"
-            "Name = '1 AU Size Comparison Circle',"
-            "Path = '" + guiPath + "',"
-            "Description = \"A circle with a radius of 1 Astronomical Unit. That is, its "
-                "size corresponds to the size of Earth's orbit.\""
-        "}"
-    "}";
-
-    queueAddSceneGraphNodeScript(circle);
-
-    // Habitable Zone
-    bool hasTeff = !std::isnan(system.starData.teff);
-    bool hasLuminosity = !std::isnan(system.starData.luminosity);
-
-    if (hasTeff && hasLuminosity) {
-        constexpr std::string_view description =
-            "The habitable zone is the region around a star in which an Earth-like "
-            "planet can potentially have liquid water on its surface."
-            "<br><br>"
-            "The inner boundary is where the greenhouse gases in the atmosphere "
-            "would trap any incoming infrared radiation, leading to the planet "
-            "surface becoming so hot that water boils away. The outer boundary is where "
-            "the greenhouse effect would not be able to maintain surface temperature "
-            "above freezing anywhere on the planet";
-
-        const std::filesystem::path hzTexture = module->habitableZoneTexturePath();
-        bool isHzEnabled = module->showHabitableZone();
-        bool useOptimistic = module->useOptimisticZone();
-        float opacity = module->habitableZoneOpacity();
-
-        const std::string zoneDiscNode = "{"
-            "Identifier = '" + starIdentifier + "_HZ_Disc',"
-            "Parent = '" + starIdentifier + "',"
-            "Renderable = {"
-                "Type = 'RenderableHabitableZone',"
-                "Enabled = " + (isHzEnabled ? "true" : "false") + ","
-                "Texture = openspace.absPath('" + formatPathToLua(hzTexture) + "'),"
-                "Luminosity = " + std::to_string(system.starData.luminosity) + ","
-                "EffectiveTemperature = " + std::to_string(system.starData.teff) + ","
-                "Optimistic = " + (useOptimistic ? "true" : "false") + ","
-                "Opacity = " + std::to_string(opacity) + ""
-            "},"
-            "Transform = {"
-                "Rotation = {"
-                    "Type = 'StaticRotation',"
-                    "Rotation = " + ghoul::to_string(meanOrbitPlaneRotationMatrix) + ""
-                "}"
-            "},"
-            "Tag = {'exoplanet_habitable_zone'},"
-            "GUI = {"
-                "Name = '" + starName + " Habitable Zone',"
-                "Path = '" + guiPath + "',"
-                "Description = '" + std::string(description) + "'"
-            "}"
-        "}";
-
-        queueAddSceneGraphNodeScript(zoneDiscNode);
-
-        // Star glare
-        if (starColor.has_value()) {
-            // This is a little magic to make the size of the glare dependent on the
-            // size and the temperature of the star. It's kind of based on the fact that
-            // the luminosity of a star is proportional to: (radius^2)*(temperature^4)
-            // Maybe a better option would be to compute the size based on the aboslute
-            // magnitude or star luminosity, but for now this looks good enough.
-            double size = 59.0 * radiusInMeter;
-            if (hasTeff) {
-                constexpr float sunTeff = 5780.f;
-                size *= std::pow(system.starData.teff / sunTeff, 2.0);
-            }
-
-            const std::filesystem::path glareTexture = module->starGlareTexturePath();
-
-            const std::string starGlare = "{"
-                "Identifier = '" + starIdentifier + "_Glare',"
-                "Parent = '" + starIdentifier + "',"
-                "Renderable = {"
-                    "Type = 'RenderablePlaneImageLocal',"
-                    "Size = " + ghoul::to_string(size) + ","
-                    "Origin = 'Center',"
-                    "Billboard = true,"
-                    "Texture = openspace.absPath('"
-                        + formatPathToLua(glareTexture) +
-                    "'),"
-                    "BlendMode = 'Additive',"
-                    "Opacity = 0.65,"
-                    "MultiplyColor = " + ghoul::to_string(*starColor) + ""
-                "},"
-                "GUI = {"
-                    "Name = '" + sanitizedStarName + " Glare',"
-                    "Path = '" + guiPath + "'"
-                "}"
-            "}";
-
-            queueAddSceneGraphNodeScript(starGlare);
-        }
-    }
-}
-
 std::vector<std::string> hostStarsWithSufficientData() {
     using namespace openspace;
     using namespace exoplanets;
@@ -702,22 +106,21 @@ std::vector<std::string> hostStarsWithSufficientData() {
 
     if (!module->hasDataFiles()) {
         // If no data file path has been configured at all, we just bail out early here
-        LINFO("No data path was configured for the exoplanets");
-        return {};
+        throw ghoul::lua::LuaError("No data path was configured for the exoplanets");
     }
 
     const std::filesystem::path lutPath = module->lookUpTablePath();
     std::ifstream lookupTableFile(absPath(lutPath));
     if (!lookupTableFile.good()) {
-        LERROR(std::format("Failed to open lookup table file '{}'", lutPath));
-        return {};
+        throw ghoul::lua::LuaError(std::format(
+            "Failed to open lookup table file '{}'", lutPath
+        ));
     }
 
     const std::filesystem::path binPath = module->exoplanetsDataPath();
     std::ifstream data(absPath(binPath), std::ios::in | std::ios::binary);
     if (!data.good()) {
-        LERROR(std::format("Failed to open data file '{}'", binPath));
-        return {};
+        throw ghoul::lua::LuaError(std::format("Failed to open data file '{}'", binPath));
     }
 
     std::vector<std::string> names;
@@ -761,37 +164,34 @@ std::vector<std::string> hostStarsWithSufficientData() {
 }
 
 /**
- * Add one or multiple exoplanet systems to the scene, as specified by the input. An input
- * string should be the name of the system host star.
+ * Return an object containing the information needed to add a specific exoplanet system.
+ * The data is retrieved from the module's prepared datafile for exoplanets. This file is
+ * in a binary format, for fast retrieval during runtime.
+ *
+ * \param starName The name of the star to get the information for.
+ *
+ * \return An object of the type [ExoplanetSystemData](#exoplanets_exoplanet_system_data)
+ *         that can be used to create the scene graph nodes for the exoplanet system
  */
-[[codegen::luawrap]] void addExoplanetSystem(
-                            std::variant<std::string, std::vector<std::string>> starNames)
-{
-    std::vector<std::string> starsToAdd;
+[[codegen::luawrap]] ghoul::Dictionary systemData(std::string starName){
+    using namespace openspace;
 
-    if (std::holds_alternative<std::string>(starNames)) {
-        // The user provided a single name
-        const std::string starName = std::get<std::string>(starNames);
-        starsToAdd.push_back(starName);
-    }
-    else {
-        starsToAdd = std::get<std::vector<std::string>>(starNames);
-    }
-
-    for (const std::string& starName : starsToAdd) {
-        openspace::exoplanets::ExoplanetSystem systemData =
-            findExoplanetSystemInData(starName);
-
-        if (systemData.planetsData.empty()) {
-            LERROR(std::format("Exoplanet system '{}' could not be found", starName));
-            return;
-        }
-
-        createExoplanetSystem(starName, systemData);
+    exoplanets::ExoplanetSystem systemData = findSystemInData(starName);
+
+    if (systemData.planetsData.empty()) {
+        throw ghoul::lua::LuaError(std::format(
+            "Exoplanet system '{}' could not be found", starName
+        ));
     }
 
+    return systemData.toDataDictionary();
 }
 
+/**
+ * Remove a loaded exoplanet system.
+ *
+ * \param starName The name of the host star for the system to remove.
+ */
 [[codegen::luawrap]] void removeExoplanetSystem(std::string starName) {
     using namespace openspace;
     using namespace exoplanets;
@@ -810,6 +210,8 @@ std::vector<std::string> hostStarsWithSufficientData() {
  * Returns a list with names of the host star of all the exoplanet systems
  * that have sufficient data for generating a visualization, based on the
  * module's loaded data file.
+ *
+ * \return A list of exoplanet host star names.
  */
 [[codegen::luawrap]] std::vector<std::string> listOfExoplanets() {
     std::vector<std::string> names = hostStarsWithSufficientData();
@@ -830,6 +232,10 @@ listOfExoplanetsDeprecated()
     return listOfExoplanets();
 }
 
+/**
+ * Lists the names of the host stars of all exoplanet systems that have sufficient
+ * data for generating a visualization, and prints the list to the console.
+ */
 [[codegen::luawrap]] void listAvailableExoplanetSystems() {
     std::vector<std::string> names = hostStarsWithSufficientData();
 
@@ -846,26 +252,24 @@ listOfExoplanetsDeprecated()
     ));
 }
 
-/**
- * Load a set of exoplanets based on custom data, in the form of a CSV file, and add
- * them to the rendering. Can be used to load custom datasets, or more recent planets
- * than what are included in the internal data file that is released with OpenSpace.
- *
- * The format and column names in the CSV sould be the same as the ones provided by the
- * NASA Exoplanet Archive. https://exoplanetarchive.ipac.caltech.edu/
- *
- * We recommend downloading the file from the Exoplanet Archive's Composite data table,
- * where multiple sources are combined into one row per planet.
- * https://exoplanetarchive.ipac.caltech.edu
- * /cgi-bin/TblView/nph-tblView?app=ExoTbls&config=PSCompPars
- *
- * Please remember to include all columns in the file download, as missing data columns
- * may lead to an incomplete visualization.
- *
- * Also, avoid loading too large files of planets, as each added system will affect the
- * rendering performance.
- */
-[[codegen::luawrap]] void loadExoplanetsFromCsv(std::string csvFile) {
+ /**
+  * Load a set of exoplanet information based on custom data in the form of a CSV file.
+  *
+  * The format and column names in the CSV should be the same as the ones provided by the
+  * [NASA Exoplanet Archive](https://exoplanetarchive.ipac.caltech.edu/).
+  *
+  * When dowloading the data from the archive we recommend including all columns, since a
+  * few required ones are not selected by default.
+  *
+  * \param csvFile A path to the CSV file to load the data from.
+  *
+  * \return A list of objects of the type
+  *         [ExoplanetSystemData](#exoplanets_exoplanet_system_data), that can be used to
+  *         create the scene graph nodes for the exoplanet systems
+  */
+[[codegen::luawrap]] std::vector<ghoul::Dictionary> loadSystemDataFromCsv(
+                                                                      std::string csvFile)
+{
     using namespace openspace;
     using namespace exoplanets;
 
@@ -873,8 +277,7 @@ listOfExoplanetsDeprecated()
 
     std::ifstream inputDataFile(csvFile);
     if (!inputDataFile.good()) {
-        LERROR(std::format("Failed to open input file '{}'", csvFile));
-        return;
+        throw ghoul::lua::LuaError(std::format("Failed to open input file '{}'", csvFile));
     }
 
     std::vector<std::string> columnNames =
@@ -886,6 +289,8 @@ listOfExoplanetsDeprecated()
 
     std::map<std::string, ExoplanetSystem> hostNameToSystemDataMap;
 
+    LINFO(std::format("Reading exoplanet data from file '{}'", csvFile));
+
     // Parse the file line by line to compose system information
     std::string row;
     while (ghoul::getline(inputDataFile, row)) {
@@ -896,8 +301,6 @@ listOfExoplanetsDeprecated()
             module->teffToBvConversionFilePath()
         );
 
-        LINFO(std::format("Reading data for planet '{}'", planetData.name));
-
         if (!hasSufficientData(planetData.dataEntry)) {
             LWARNING(std::format(
                 "Insufficient data for exoplanet '{}'", planetData.name
@@ -905,6 +308,8 @@ listOfExoplanetsDeprecated()
             continue;
         }
 
+        LINFO(std::format("Loaded data for planet '{}'", planetData.name));
+
         auto found = hostNameToSystemDataMap.find(planetData.host);
         if (found != hostNameToSystemDataMap.end()) {
             // Found a match. Add the planet to the system data
@@ -918,6 +323,7 @@ listOfExoplanetsDeprecated()
             // No host found. Add a new one
             ExoplanetSystem system;
             sanitizeNameString(planetData.name);
+            system.starName = planetData.host;
             system.planetNames.push_back(planetData.name);
             system.planetsData.push_back(planetData.dataEntry);
             updateStarDataFromNewPlanet(system.starData, planetData.dataEntry);
@@ -926,20 +332,13 @@ listOfExoplanetsDeprecated()
         }
     }
 
-    // Add all the added exoplanet systems
-    using K = const std::string;
-    using V = ExoplanetSystem;
-    for (const std::pair<K, V>& entry : hostNameToSystemDataMap) {
-        const std::string& hostName = entry.first;
-        const ExoplanetSystem& data = entry.second;
-        createExoplanetSystem(hostName, data);
-    }
+    std::vector<ghoul::Dictionary> result;
+    result.reserve(hostNameToSystemDataMap.size());
 
-    LINFO(std::format(
-        "Read data for {} exoplanet systems from CSV file: {}. Please wait until "
-        "they are all finished initializing. You may have to reload the user interface.",
-        hostNameToSystemDataMap.size(), csvFile
-    ));
+    for (auto const& [_, system]: hostNameToSystemDataMap) {
+        result.push_back(system.toDataDictionary());
+    }
+    return result;
 }
 
 #include "exoplanetsmodule_lua_codegen.cpp"
diff --git a/modules/exoplanets/scripts/systemcreation.lua b/modules/exoplanets/scripts/systemcreation.lua
new file mode 100644
index 0000000000..e10f4f532b
--- /dev/null
+++ b/modules/exoplanets/scripts/systemcreation.lua
@@ -0,0 +1,641 @@
+openspace.exoplanets.documentation = {
+  {
+    Name = "addExoplanetSystem",
+    Arguments = {
+      { "starName", "String" }
+    },
+    Documentation = [[
+      Add a specific exoplanet system to the scene, based on a star name.
+
+      Note that the formatting of the name must match the one in the dataset. That is, it
+      must match the name as given in the [NASA Exoplanet Archive](https://exoplanetarchive.ipac.caltech.edu/).
+
+      \\param starName The name of the star
+    ]]
+  },
+  {
+    Name = "addExoplanetSystems",
+    Arguments = {
+      { "listOfStarNames", "String[]" }
+    },
+    Documentation = [[
+      Add multiple exoplanet systems to the scene, based on a list of names.
+
+      Note that the formatting of the name must match the one in the dataset. That is,
+      they must match the names as given in the [NASA Exoplanet Archive](https://exoplanetarchive.ipac.caltech.edu/).
+
+      \\param listOfStarNames A list of star names for which to create the exoplanet systems
+    ]]
+  },
+  {
+    Name = "loadExoplanetsFromCsv",
+    Arguments = {
+      { "csvFile", "String" }
+    },
+    Documentation = [[
+      Load a set of exoplanets based on custom data, in the form of a CSV file, and add
+      them to the rendering. Can be used to load custom datasets, or more recent planets
+      than what are included in the internal data file that is released with OpenSpace.
+
+      The format and column names in the CSV should be the same as the ones provided by
+      the [NASA Exoplanet Archive](https://exoplanetarchive.ipac.caltech.edu/).
+
+      We recommend downloading the file from the [Exoplanet Archive's Composite data table](https://exoplanetarchive.ipac.caltech.edu/cgi-bin/TblView/nph-tblView?app=ExoTbls&config=PSCompPars),
+      where multiple sources are combined into one row per planet.
+
+      Please remember to include all columns in the file download, as missing data columns
+      may lead to an incomplete visualization.
+
+      Also, avoid loading too large files of planets, as each added system will affect the
+      rendering performance.
+
+      \\param csvFile A path to a .csv file that contains the data for the exoplanets
+    ]]
+  }
+}
+
+openspace.exoplanets.addExoplanetSystem = function (starName)
+  local data = openspace.exoplanets.systemData(starName)
+  addExoplanetSystem(data)
+end
+
+openspace.exoplanets.addExoplanetSystems = function (listOfStarNames)
+  for _,starName in pairs(listOflistOfStarNamesNames) do
+    local data = openspace.exoplanets.systemData(starName)
+    addExoplanetSystem(data)
+  end
+end
+
+openspace.exoplanets.loadExoplanetsFromCsv = function (csvFile)
+  local dataList = openspace.exoplanets.loadSystemDataFromCsv(csvFile)
+  for _,data in pairs(dataList) do
+    addExoplanetSystem(data)
+  end
+end
+
+-----------------------------------------------------------------------------------
+-- Some Settings and things that will be used for the creation
+-----------------------------------------------------------------------------------
+
+local ExoplanetsGuiPath = "/Milky Way/Exoplanets/Exoplanet Systems/";
+
+-- @TODO (2024-10-11, emmbr) We should add a way of getting constants like this from
+-- OpenSpace instead (for example though the Lua API) so we don't have to redefine them
+-- everywhere we need a value for e.g. the Earth radius
+local SolarRadius = 6.95700E8
+local EarthRadius = 6371E3
+local JupiterRadius = 7.1492E7
+local AstronomicalUnit = 149597871E3
+
+-- Constants for different categories of sizes of planets (in Earth radii)
+-- Source: https://www.nasa.gov/image-article/sizes-of-known-exoplanets/
+local MaxRadius = {
+  Terrestrial = 1.25,
+  SuperEarth = 2.0,
+  NeptuneLike = 6.0
+}
+
+-- Planets will be colored based on their size (from thresholds above), and
+-- described based on the planet types
+local PlanetType = {
+  Terrestrial = {
+    Description = string.format(
+      "Terrestrial planets (R < %.2f Earth radii)",
+      MaxRadius.Terrestrial
+    ),
+    Color = { 0.32, 0.2, 0.1 },
+    ColorName = "Brown"
+  },
+  SuperEarth = {
+    Description = string.format(
+      "Super-Earths (%.0f < R < %.0f Earth radii)",
+      MaxRadius.Terrestrial, MaxRadius.SuperEarth
+    ),
+    Color = { 1.0, 0.76, 0.65 },
+    ColorName = "Beige"
+  },
+  NeptuneLike = {
+    Description = string.format(
+      "Neptune-like planets (%.0f < R < %.0f Earth radii)",
+      MaxRadius.SuperEarth, MaxRadius.NeptuneLike
+    ),
+    Color = { 0.22, 0.49, 0.50 },
+    ColorName = "Blue"
+  },
+  GasGiant = {
+    Description = string.format(
+      "Gas giants or larger planets (R > %.0f Earth radii)",
+      MaxRadius.NeptuneLike
+    ),
+    Color = { 0.55, 0.34, 0.39 },
+    ColorName = "Wine red"
+  }
+}
+
+local SizeColorLayerDescription = string.format(
+  [[This layer gives a fixed color to the planet surface based on the
+    planet radius. The planets are split into four categories based on
+    their radius (in Earth radii). 1) %s are %s, 2) %s are %s, 3)
+    %s are %s, and 4) %s are %s.]],
+  PlanetType.Terrestrial.Description, PlanetType.Terrestrial.ColorName,
+  PlanetType.SuperEarth.Description, PlanetType.SuperEarth.ColorName,
+  PlanetType.NeptuneLike.Description, PlanetType.NeptuneLike.ColorName,
+  PlanetType.GasGiant.Description, PlanetType.GasGiant.ColorName
+);
+
+function planetTypeKey(radiusInMeter)
+  if radiusInMeter < MaxRadius.Terrestrial * EarthRadius then
+    return "Terrestrial"
+  elseif radiusInMeter < MaxRadius.SuperEarth * EarthRadius then
+    return "SuperEarth"
+  elseif radiusInMeter < MaxRadius.NeptuneLike * EarthRadius then
+    return "NeptuneLike"
+  else
+    return "GasGiant"
+  end
+end
+
+function hasValue(v)
+  return v ~= nil
+end
+
+-----------------------------------------------------------------------------------
+-- This is the function that adds the scene graph nodes for each exoplanet system.
+-- Edit this to change the visuals of the created exoplanet systems
+-----------------------------------------------------------------------------------
+function addExoplanetSystem(data)
+  if openspace.isEmpty(data) then
+    -- No data was found
+    return
+  end
+
+  local starIdentifier = data.SystemId
+  local guiPath = ExoplanetsGuiPath .. data.StarName
+
+  if openspace.hasSceneGraphNode(starIdentifier) then
+    openspace.printError(
+      "Adding of exoplanet system '" .. data.StarName .. "' failed. " ..
+      "The system has already been added"
+    )
+    return
+  end
+
+  --------------------------------------------------------------------
+  -- Star Globe
+  --------------------------------------------------------------------
+  local starTexture = openspace.propertyValue("Modules.Exoplanets.StarTexture")
+  local starNoDataTexture = openspace.propertyValue("Modules.Exoplanets.NoDataTexture")
+
+  local colorLayers = {}
+  if hasValue(data.StarColor) and hasValue(data.StarRadius) then
+    -- If a star color was computed, there was enough data to visualize the star
+    colorLayers = {
+      {
+        Identifier = "StarColor",
+        Type = "SolidColor",
+        Color = data.StarColor,
+        BlendMode = "Normal",
+        Enabled = true
+      },
+      {
+        Identifier = "StarTexture",
+        FilePath = openspace.absPath(starTexture),
+        BlendMode = "Color",
+        Enabled = true
+      }
+    }
+  else
+    colorLayers = {
+      {
+        Identifier = "NoDataStarTexture",
+        FilePath = openspace.absPath(starNoDataTexture),
+        BlendMode = "Color",
+        Enabled = true
+      }
+    }
+  end
+
+  local starSizeAndTempInfo = function (data)
+    if hasValue(data.StarRadius) and hasValue(data.StarTeff) then
+      return string.format(
+        "It has a size of %.2f solar radii and an effective temperature of %.0f Kelvin",
+        data.StarRadius / SolarRadius, data.StarTeff
+      )
+    elseif hasValue(data.StarTeff) then
+      return string.format(
+        "Its size is uknown, but it has an effective temperature of %.0f Kelvin",
+        data.StarTeff
+      )
+    elseif hasValue(data.StarRadius) then
+      return string.format(
+        "It has a size of %.2f solar radii, but its temperature is unknown",
+        data.StarRadius
+      )
+    else
+      return "Both its size and temperature is unknown"
+    end
+  end
+
+  local Star = {
+    Identifier = starIdentifier,
+    Parent = "SolarSystemBarycenter",
+    Transform = {
+      Rotation = {
+        Type = "StaticRotation",
+        Rotation = data.SystemRotation
+      },
+      Translation = {
+        Type = "StaticTranslation",
+        Position = data.Position
+      }
+    },
+    Renderable = {
+      Type = "RenderableGlobe",
+      -- If there is not a value for the radius, render a globe with a default radius,
+      -- to allow us to navigate to something. Note that it can't be too small, due to
+      -- precision issues at this distance
+      Radii = openspace.ternary(
+        hasValue(data.StarRadius),
+        data.StarRadius,
+        0.1 * SolarRadius
+      ),
+      PerformShading = false,
+      Layers = {
+        ColorLayers = colorLayers
+      }
+    },
+    Tag = { "exoplanet_system" },
+    GUI = {
+      Name = data.StarName .. " (Star)",
+      Path = guiPath,
+      Description = string.format(
+        [[The star %s is the host star of an exoplanet system with %d known %s that %s
+          enough data to be visualized. %s. The system is located at a distance of %.0f
+          light-years from Earth.]],
+        data.StarName,
+        data.NumPlanets,
+        openspace.ternary(data.NumPlanets > 1, "planets", "planet"),
+        openspace.ternary(data.NumPlanets > 1, "have", "has"),
+        starSizeAndTempInfo(data),
+        data.Distance
+      )
+    }
+  }
+  openspace.addSceneGraphNode(Star)
+
+  --------------------------------------------------------------------
+  -- Star Label
+  --------------------------------------------------------------------
+  local StarLabel = {
+    Identifier = starIdentifier .. "_Label",
+    Parent = starIdentifier,
+    Renderable = {
+      Type = "RenderableLabel",
+      Enabled = false,
+      Text = data.StarName,
+      FontSize = 70.0,
+      Size = 14.17,
+      MinMaxSize = { 1, 50 },
+      EnableFading = true,
+      FadeUnit = "pc",
+      FadeDistances = { 1.33, 15.0 },
+      FadeWidths = { 1.0, 20.0 }
+    },
+    Tag = { "exoplanet_system_labels" },
+    GUI = {
+      Name = data.StarName .. " Label",
+      Path = guiPath,
+      Description = string.format(
+        "A label for the exoplanet host star %s.", data.StarName
+      )
+    }
+  }
+  openspace.addSceneGraphNode(StarLabel)
+
+  --------------------------------------------------------------------
+  -- Star Glare
+  --------------------------------------------------------------------
+  local starGlareTexture = openspace.propertyValue("Modules.Exoplanets.StarGlareTexture")
+
+  if hasValue(data.StarColor) and hasValue(data.StarRadius) then
+    -- This is a little magic to make the size of the glare dependent on the
+    -- size and the temperature of the star. It's kind of based on the fact that
+    -- the luminosity of a star is proportional to: (radius^2)*(temperature^4)
+    -- Maybe a better option would be to compute the size based on the absolute
+    -- magnitude or star luminosity, but for now this looks good enough.
+    local size = 59.0 * data.StarRadius
+    if hasValue(data.StarTeff) then
+      local SunTeff = 5780.90;
+      local RelativeTeff = (data.StarTeff / SunTeff)
+      size = size * RelativeTeff * RelativeTeff;
+    end
+
+    local StarGlare = {
+      Identifier = starIdentifier .. "_Glare",
+      Parent = starIdentifier,
+      Renderable = {
+        Type = "RenderablePlaneImageLocal",
+        Size = size,
+        Origin = "Center",
+        Billboard = true,
+        Texture = openspace.absPath(starGlareTexture),
+        BlendMode = "Additive",
+        Opacity = 0.65,
+        MultiplyColor = data.StarColor
+      },
+      GUI = {
+        Name = data.StarName .. " Glare",
+        Path = guiPath,
+        Description = string.format(
+          "A glare effect for the star %s. %s",
+          data.StarName,
+          openspace.ternary(
+            hasValue(data.StarTeff),
+            [[The size of the glare has been computed based on data of the star's
+              temperature, in a way that's relative to the visualization for our Sun.]],
+            "The size of the glare is not data-based."
+          )
+        )
+      }
+    }
+    openspace.addSceneGraphNode(StarGlare)
+  end
+
+  --------------------------------------------------------------------
+  -- 1 AU Comparison Circle
+  --------------------------------------------------------------------
+  local showCircle = openspace.propertyValue("Modules.Exoplanets.ShowComparisonCircle")
+  local circleColor = openspace.propertyValue("Modules.Exoplanets.ComparisonCircleColor")
+
+  local Circle = {
+    Identifier = starIdentifier .. "_1AU_Circle",
+    Parent = starIdentifier,
+    Renderable = {
+      Type = "RenderableRadialGrid",
+      Enabled = showCircle,
+      Radii = { 0.0, 1.0 },
+      Color = circleColor,
+      CircleSegments = 64,
+      LineWidth = 2.0
+    },
+    Transform = {
+      Rotation = {
+        Type = "StaticRotation",
+        Rotation = data.MeanOrbitRotation
+      },
+      Scale = {
+        Type = "StaticScale",
+        Scale = AstronomicalUnit
+      }
+    },
+    Tag = { "exoplanet_1au_ring" },
+    GUI = {
+      Name = "1 AU Size Comparison Circle",
+      Path = guiPath,
+      Description = [[A circle with a radius of 1 Astronomical Unit. That is, its
+        size corresponds to the size of Earth's orbit.]]
+    }
+  }
+  openspace.addSceneGraphNode(Circle)
+
+  --------------------------------------------------------------------
+  -- Habitable Zone
+  --------------------------------------------------------------------
+  local showZone = openspace.propertyValue("Modules.Exoplanets.ShowHabitableZone")
+  local zoneOpacity = openspace.propertyValue("Modules.Exoplanets.HabitableZoneOpacity")
+  local zoneTexture = openspace.propertyValue("Modules.Exoplanets.HabitableZoneTexture")
+  local useOptimisticBounds = openspace.propertyValue(
+    "Modules.Exoplanets.UseOptimisticZone"
+  )
+
+  if hasValue(data.StarTeff) and hasValue(data.StarLuminosity) then
+    local HabitableZoneDisc = {
+      Identifier = starIdentifier .. "_HZ_Disc",
+      Parent = starIdentifier,
+      Renderable = {
+        Type = "RenderableHabitableZone",
+        Enabled = showZone,
+        Texture = openspace.absPath(zoneTexture),
+        Luminosity = data.StarLuminosity,
+        EffectiveTemperature = data.StarTeff,
+        Optimistic = useOptimisticBounds,
+        Opacity = zoneOpacity
+      },
+      Transform = {
+        Rotation = {
+          Type = "StaticRotation",
+          Rotation = data.MeanOrbitRotation
+        }
+      },
+      Tag = { "exoplanet_habitable_zone" },
+      GUI = {
+        Name = data.StarName .. " Habitable Zone",
+        Path = guiPath,
+        Description = [[
+          The habitable zone is the region around a star in which an Earth-like planet
+          can potentially have liquid water on its surface. The inner boundary is where
+          the greenhouse gases in the atmosphere would trap any incoming infrared
+          radiation, leading to the planet surface becoming so hot that water boils away.
+          The outer boundary is where the greenhouse effect would not be able to maintain
+          surface temperature above freezing anywhere on the planet.
+        ]]
+      }
+    }
+    openspace.addSceneGraphNode(HabitableZoneDisc)
+  end
+
+  --------------------------------------------------------------------
+  -- Planets
+  --------------------------------------------------------------------
+  local defaultPlanetTexture = openspace.propertyValue(
+    "Modules.Exoplanets.PlanetDefaultTexture"
+  )
+
+  local addExoplanet = function(id, planetData)
+    -- This translation will be used for both the trail and globe
+    local PlanetKeplerTranslation = {
+      Type = "KeplerTranslation",
+      Eccentricity = planetData.Eccentricity,
+      SemiMajorAxis = 0.001 * planetData.SemiMajorAxis, -- km
+      Inclination = planetData.Inclination,
+      AscendingNode = planetData.AscendingNode,
+      ArgumentOfPeriapsis = planetData.ArgumentOfPeriapsis,
+      MeanAnomaly = 0.0,
+      Epoch = planetData.Epoch,
+      Period = planetData.Period * openspace.time.secondsPerDay()
+    }
+
+    --------------------------------------------------------------------
+    -- Planet Globe (if we know how big it is)
+    --------------------------------------------------------------------
+    local ambientIntensity = 0.5 -- High to show the color from size more clearly
+
+    local planetSizeInfo = function (data)
+      if hasValue(data.Radius) then
+        return string.format(
+          "%.2f Earth radii, %.2f Jupiter radii",
+          planetData.Radius / EarthRadius,
+          planetData.Radius / JupiterRadius
+        )
+      else
+        return "unknown"
+      end
+    end
+
+    if hasValue(planetData.Radius) then
+      local planetTypeKey = planetTypeKey(planetData.Radius)
+      local planetTypeData = PlanetType[planetTypeKey]
+
+      local planetColorLayers = {
+        {
+          Identifier = "ColorFromSize",
+          Name = "Color From Size Classification",
+          Type = "SolidColor",
+          Color = planetTypeData.Color,
+          Enabled = true,
+          Description = SizeColorLayerDescription
+        }
+      }
+
+      -- If a default texture was provided, use it. Also, reduce the ambient intensity
+      if not openspace.isEmpty(defaultPlanetTexture) then
+        local PlanetTextureLayer = {
+          Identifier = "PlanetTexture",
+          Name = "Planet Texture",
+          FilePath = openspace.absPath(defaultPlanetTexture),
+          Enabled = true
+        }
+        table.insert(planetColorLayers, PlanetTextureLayer)
+        ambientIntensity = 0.15
+      end
+
+      local Planet = {
+        Identifier = id,
+        Parent = starIdentifier,
+        Transform = {
+          Translation = PlanetKeplerTranslation
+        },
+        Renderable = {
+          Type = "RenderableGlobe",
+          Radii = planetData.Radius,
+          PerformShading = true,
+          Layers = {
+            ColorLayers = planetColorLayers
+          },
+          LightSourceNode = starIdentifier,
+          AmbientIntensity = ambientIntensity
+        },
+        Tag = { "exoplanet_planet" },
+        GUI = {
+          Name = planetData.Name,
+          Path = guiPath,
+          Description = string.format(
+            [[The exoplanet %s falls into the category of %s. Some key facts:
+              Radius: %s.
+              Orbit Period: %.1f (Earth) days.
+              Orbit Semi-major axis: %.2f (AU).
+              Orbit Eccentricity: %.2f. %s]],
+            planetData.Name,
+            planetTypeData.Description,
+            planetSizeInfo(planetData),
+            planetData.Period,
+            planetData.SemiMajorAxis / AstronomicalUnit,
+            planetData.Eccentricity,
+            openspace.ternary(
+              planetData.HasUsedDefaultValues,
+              [[OBS! Default values have been used to visualize the orbit (for example for
+                inclination, eccentricity, or argument of periastron), and hence the data
+                specified for the orbit might not be reliable.]],
+              ""
+            )
+          )
+        }
+      }
+      openspace.addSceneGraphNode(Planet)
+    end
+
+    --------------------------------------------------------------------
+    -- Planet Orbit
+    --------------------------------------------------------------------
+    local trailResolution = 1000.0
+    -- Increase the resolution of very eccentric orbits
+    local EccentricityThreshold = 0.85
+    if planetData.Eccentricity > EccentricityThreshold then
+      trailResolution = trailResolution * 2.0
+    end
+
+    local orbitDescription = string.format(
+      "The orbit trail of the exoplanet %s.", planetData.Name
+    )
+    if planetData.HasUsedDefaultValues then
+      orbitDescription = orbitDescription .. " " .. [[
+        OBS! Default values have been used to visualize the orbit (for example for
+        inclination, eccentricity, or argument of periastron). The shape or orientation
+        of the orbit might hence not be completely accurate.
+      ]]
+    end
+
+    local Orbit = {
+      Identifier = id .. "_Trail",
+      Parent = starIdentifier,
+      Renderable = {
+        Type = "RenderableTrailOrbit",
+        Period = planetData.Period,
+        Resolution = trailResolution,
+        Translation = PlanetKeplerTranslation,
+        Color = { 1.0, 1.0, 1.0 }
+      },
+      Tag = { "exoplanet_trail" },
+      GUI = {
+        Name = planetData.Name .. " Trail",
+        Path = guiPath,
+        Description = orbitDescription
+      }
+    }
+    openspace.addSceneGraphNode(Orbit)
+
+    --------------------------------------------------------------------
+    -- Planet Orbit Uncertainty
+    --------------------------------------------------------------------
+    local showUncertaintyDisc = openspace.propertyValue("Modules.Exoplanets.ShowHabitableZone")
+    local discTexture = openspace.propertyValue("Modules.Exoplanets.OrbitDiscTexture")
+
+    if hasValue(planetData.SemiMajorAxisUncertainty) then
+      local OrbitDisc = {
+        Identifier = id .. "_Disc",
+        Parent = starIdentifier,
+        Transform = {
+          Rotation = {
+            Type = "StaticRotation",
+            Rotation = planetData.OrbitPlaneRotationMatrix
+          }
+        },
+        Renderable = {
+          Type = "RenderableOrbitDisc",
+          Enabled = showUncertaintyDisc,
+          Texture = openspace.absPath(discTexture),
+          Size = planetData.SemiMajorAxis,
+          Eccentricity = planetData.Eccentricity,
+          Offset = planetData.SemiMajorAxisUncertainty,
+          Opacity = 0.25
+        },
+        Tag = { "exoplanet_uncertainty_disc" },
+        GUI = {
+          Name = planetData.Name .. " Disc",
+          Path = guiPath,
+          Description = [[
+            The width of this disc around the planet's orbit marks the uncertainty of the
+            orbit (based on the uncertainty of the semi-major axis, and the eccentricity
+            of the orbit). The wider the disc, the more uncertain the orbit is.
+          ]]
+        }
+      }
+      openspace.addSceneGraphNode(OrbitDisc)
+    end
+  end
+
+  -- Add all the planets that have sufficient data
+  for planetId,planetData in pairs(data.Planets) do
+    addExoplanet(planetId, planetData)
+  end
+end
diff --git a/modules/exoplanets/tasks/exoplanetsdatapreparationtask.h b/modules/exoplanets/tasks/exoplanetsdatapreparationtask.h
index 2a0fc765e6..9c913e337e 100644
--- a/modules/exoplanets/tasks/exoplanetsdatapreparationtask.h
+++ b/modules/exoplanets/tasks/exoplanetsdatapreparationtask.h
@@ -27,8 +27,7 @@
 
 #include <openspace/util/task.h>
 
-#include <modules/exoplanets/exoplanetshelper.h>
-
+#include <modules/exoplanets/datastructure.h>
 #include <openspace/properties/vector/vec3property.h>
 #include <filesystem>
 #include <string>
diff --git a/scripts/core_scripts.lua b/scripts/core_scripts.lua
index 89a4bd0ad6..f17ee63820 100644
--- a/scripts/core_scripts.lua
+++ b/scripts/core_scripts.lua
@@ -88,6 +88,38 @@ openspace.documentation = {
       target several nodes. If the fade time is not provided then the
       "OpenSpaceEngine.FadeDuration" property will be used instead. If the third argument
       (endScript) is provided then that script will be run after the fade is finished.]]
+  },
+  {
+    Name = "ternary",
+    Arguments = {
+      { "condition", "Boolean" },
+      { "trueValue", "any" },
+      { "falseValue", "any" }
+    },
+    Return = "any",
+    Documentation = [[
+      A utility function to return a specific value based on a True/False condition.
+
+      \\param condition The condition to check against
+      \\param trueValue The value to return if the condition is True
+      \\param falseValue The value to return if the condition is False
+      \\return Either the trueValue of falseValue, depending on if the condition is true
+               or not
+    ]]
+  },
+  {
+    Name = "isEmpty",
+    Arguments = {
+      { "object", "any" }
+    },
+    Return = "Boolean",
+    Documentation = [[
+      A utility function to check whether an object is empty or not. Identifies `nil`
+      objects, Tables without any keys, and empty strings.
+
+      \\param object The object to check
+      \\return A Boolean that specifies if the object is empty or not
+    ]]
   }
 }
 
@@ -305,3 +337,15 @@ openspace.toggleFade = function(renderable, fadeTime, endScript)
     openspace.fadeIn(renderable, fadeTime, endScript)
   end
 end
+
+openspace.ternary = function(condition, trueValue, falseValue)
+  if condition then return trueValue else return falseValue end
+end
+
+openspace.isEmpty = function(v)
+  if type(v) == "table" then
+    return next(v) == nil
+  else
+    return v == nil or v == ''
+  end
+end

From 304cbb2032e5e97348bff1abd1e308fed70020e3 Mon Sep 17 00:00:00 2001
From: Emma Broman <emma.broman@liu.se>
Date: Mon, 21 Oct 2024 10:04:35 +0200
Subject: [PATCH 648/701] Provide errors when setting exoplanet module file
 paths

---
 modules/exoplanets/exoplanetsmodule.cpp | 34 +++++++++++++++++++++++++
 1 file changed, 34 insertions(+)

diff --git a/modules/exoplanets/exoplanetsmodule.cpp b/modules/exoplanets/exoplanetsmodule.cpp
index ad56c50dd0..26e8e33c56 100644
--- a/modules/exoplanets/exoplanetsmodule.cpp
+++ b/modules/exoplanets/exoplanetsmodule.cpp
@@ -257,13 +257,47 @@ ExoplanetsModule::ExoplanetsModule()
 
     addProperty(_enabled);
 
+    _exoplanetsDataFolder.onChange([this]() {
+        std::filesystem::path f = _exoplanetsDataFolder.value();
+       if (!std::filesystem::is_directory(f)) {
+            LERROR(std::format(
+                "Could not find directory: '{}' for module setting '{}'",
+                f, _exoplanetsDataFolder.identifier()
+            ));
+        }
+    });
     addProperty(_exoplanetsDataFolder);
+
+    auto createPathOnChange = [](const properties::StringProperty& p) {
+        return [&p]() {
+            std::filesystem::path f = p.value();
+            if (!std::filesystem::is_regular_file(f)) {
+                LERROR(std::format(
+                    "Could not find file: '{}' for module setting '{}'",
+                    f, p.identifier()
+                ));
+            }
+        };
+    };
+    _bvColorMapPath.onChange(createPathOnChange(_bvColorMapPath));
     addProperty(_bvColorMapPath);
+
+    _starTexturePath.onChange(createPathOnChange(_starTexturePath));
     addProperty(_starTexturePath);
+
+    _starGlareTexturePath.onChange(createPathOnChange(_starGlareTexturePath));
     addProperty(_starGlareTexturePath);
+
+    _noDataTexturePath.onChange(createPathOnChange(_noDataTexturePath));
     addProperty(_noDataTexturePath);
+
+    _planetDefaultTexturePath.onChange(createPathOnChange(_planetDefaultTexturePath));
     addProperty(_planetDefaultTexturePath);
+
+    _orbitDiscTexturePath.onChange(createPathOnChange(_orbitDiscTexturePath));
     addProperty(_orbitDiscTexturePath);
+
+    _habitableZoneTexturePath.onChange(createPathOnChange(_habitableZoneTexturePath));
     addProperty(_habitableZoneTexturePath);
 
     _comparisonCircleColor.setViewOption(properties::Property::ViewOptions::Color);

From 438d6e3dddb856de2d110c0c92abba419db558df Mon Sep 17 00:00:00 2001
From: Alexander Bock <alexander.bock@liu.se>
Date: Mon, 21 Oct 2024 15:06:40 +0200
Subject: [PATCH 649/701] SessionRecording and KeyframeRecording redesign
 (#3399)

---
 include/openspace/engine/globals.h            |    8 +-
 ...recording.h => keyframerecordinghandler.h} |   48 +-
 .../openspace/interaction/sessionrecording.h  |  885 +----
 .../interaction/sessionrecording.inl          |   72 -
 .../interaction/sessionrecordinghandler.h     |  288 ++
 .../tasks/convertrecfileversiontask.h         |   55 -
 .../interaction/tasks/convertrecformattask.h  |   16 +-
 .../openspace/navigation/keyframenavigator.h  |    1 +
 include/openspace/scene/scene.h               |    2 +-
 include/openspace/scripting/scriptscheduler.h |   15 -
 modules/globebrowsing/src/renderableglobe.cpp |    6 +-
 modules/imgui/imguimodule.cpp                 |    4 +-
 .../include/topics/sessionrecordingtopic.h    |    6 +-
 .../src/topics/sessionrecordingtopic.cpp      |   21 +-
 modules/video/src/videoplayer.cpp             |    6 +-
 modules/volume/linearlrucache.inl             |    2 +-
 src/CMakeLists.txt                            |   13 +-
 src/documentation/core_registration.cpp       |    8 +-
 src/engine/globals.cpp                        |   34 +-
 src/engine/openspaceengine.cpp                |   20 +-
 src/interaction/keyframerecording.cpp         |  430 ---
 src/interaction/keyframerecording_lua.inl     |  190 -
 src/interaction/keyframerecordinghandler.cpp  |  166 +
 .../keyframerecordinghandler_lua.inl          |  108 +
 src/interaction/sessionrecording.cpp          | 3233 ++++-------------
 src/interaction/sessionrecording_lua.inl      |  212 --
 src/interaction/sessionrecordinghandler.cpp   |  786 ++++
 .../sessionrecordinghandler_lua.inl           |  121 +
 .../tasks/convertrecfileversiontask.cpp       |  117 -
 .../tasks/convertrecformattask.cpp            |  303 +-
 src/navigation/keyframenavigator.cpp          |    2 +-
 src/scene/scene.cpp                           |    8 +-
 src/scene/scene_lua.inl                       |   14 +-
 src/scripting/scriptengine.cpp                |    9 +-
 src/scripting/scriptscheduler.cpp             |   19 -
 src/scripting/scriptscheduler_lua.inl         |   24 -
 src/util/time.cpp                             |    2 +-
 src/util/time_lua.inl                         |    4 +-
 src/util/timemanager.cpp                      |    6 +-
 tests/CMakeLists.txt                          |    1 +
 .../0100_ascii_linux.osrectxt                 |    7 +
 .../0100_ascii_windows.osrectxt               |    7 +
 .../sessionrecording/0100_binary_linux.osrec  |  Bin 0 -> 599 bytes
 .../0100_binary_windows.osrec                 |  Bin 0 -> 600 bytes
 .../0200_ascii_linux.osrectxt                 |    7 +
 .../0200_ascii_windows.osrectxt               |    7 +
 .../sessionrecording/0200_binary_linux.osrec  |  Bin 0 -> 531 bytes
 .../0200_binary_windows.osrec                 |  Bin 0 -> 456 bytes
 tests/test_sessionrecording.cpp               |  854 +++++
 49 files changed, 3176 insertions(+), 4971 deletions(-)
 rename include/openspace/interaction/{keyframerecording.h => keyframerecordinghandler.h} (70%)
 delete mode 100644 include/openspace/interaction/sessionrecording.inl
 create mode 100644 include/openspace/interaction/sessionrecordinghandler.h
 delete mode 100644 include/openspace/interaction/tasks/convertrecfileversiontask.h
 delete mode 100644 src/interaction/keyframerecording.cpp
 delete mode 100644 src/interaction/keyframerecording_lua.inl
 create mode 100644 src/interaction/keyframerecordinghandler.cpp
 create mode 100644 src/interaction/keyframerecordinghandler_lua.inl
 delete mode 100644 src/interaction/sessionrecording_lua.inl
 create mode 100644 src/interaction/sessionrecordinghandler.cpp
 create mode 100644 src/interaction/sessionrecordinghandler_lua.inl
 delete mode 100644 src/interaction/tasks/convertrecfileversiontask.cpp
 create mode 100644 tests/sessionrecording/0100_ascii_linux.osrectxt
 create mode 100644 tests/sessionrecording/0100_ascii_windows.osrectxt
 create mode 100644 tests/sessionrecording/0100_binary_linux.osrec
 create mode 100644 tests/sessionrecording/0100_binary_windows.osrec
 create mode 100644 tests/sessionrecording/0200_ascii_linux.osrectxt
 create mode 100644 tests/sessionrecording/0200_ascii_windows.osrectxt
 create mode 100644 tests/sessionrecording/0200_binary_linux.osrec
 create mode 100644 tests/sessionrecording/0200_binary_windows.osrec
 create mode 100644 tests/test_sessionrecording.cpp

diff --git a/include/openspace/engine/globals.h b/include/openspace/engine/globals.h
index df8fa1f578..2e7b671373 100644
--- a/include/openspace/engine/globals.h
+++ b/include/openspace/engine/globals.h
@@ -57,9 +57,9 @@ namespace interaction {
     class ActionManager;
     class InteractionMonitor;
     class KeybindingManager;
-    class KeyframeRecording;
+    class KeyframeRecordingHandler;
     class NavigationHandler;
-    class SessionRecording;
+    class SessionRecordingHandler;
 } // namespace interaction
 namespace properties { class PropertyOwner; }
 namespace scripting {
@@ -94,9 +94,9 @@ inline interaction::InteractionMonitor* interactionMonitor;
 inline interaction::JoystickInputStates* joystickInputStates;
 inline interaction::WebsocketInputStates* websocketInputStates;
 inline interaction::KeybindingManager* keybindingManager;
-inline interaction::KeyframeRecording* keyframeRecording;
+inline interaction::KeyframeRecordingHandler* keyframeRecording;
 inline interaction::NavigationHandler* navigationHandler;
-inline interaction::SessionRecording* sessionRecording;
+inline interaction::SessionRecordingHandler* sessionRecordingHandler;
 inline properties::PropertyOwner* rootPropertyOwner;
 inline properties::PropertyOwner* screenSpaceRootPropertyOwner;
 inline properties::PropertyOwner* userPropertyOwner;
diff --git a/include/openspace/interaction/keyframerecording.h b/include/openspace/interaction/keyframerecordinghandler.h
similarity index 70%
rename from include/openspace/interaction/keyframerecording.h
rename to include/openspace/interaction/keyframerecordinghandler.h
index 48adef6542..c8e814cc3a 100644
--- a/include/openspace/interaction/keyframerecording.h
+++ b/include/openspace/interaction/keyframerecordinghandler.h
@@ -22,63 +22,41 @@
  * OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                                         *
  ****************************************************************************************/
 
-#ifndef __OPENSPACE_CORE___KEYFRAMERECORDING___H__
-#define __OPENSPACE_CORE___KEYFRAMERECORDING___H__
+#ifndef __OPENSPACE_CORE___KEYFRAMERECORDINGHANDLER___H__
+#define __OPENSPACE_CORE___KEYFRAMERECORDINGHANDLER___H__
 
-#include <openspace/navigation/keyframenavigator.h>
 #include <openspace/properties/propertyowner.h>
+
+#include <openspace/interaction/sessionrecording.h>
 #include <openspace/scripting/lualibrary.h>
-#include <json/json.hpp>
+#include <filesystem>
 #include <string>
 #include <vector>
 
 namespace openspace::interaction {
 
-class KeyframeRecording : public properties::PropertyOwner {
+class KeyframeRecordingHandler : public properties::PropertyOwner {
 public:
-    struct Keyframe {
-        struct TimeStamp {
-            double application;
-            double sequenceTime;
-            double simulation;
-        };
-
-        KeyframeNavigator::CameraPose camera;
-        TimeStamp timestamp;
-    };
-
-    KeyframeRecording();
+    KeyframeRecordingHandler();
 
     void newSequence();
-    void addKeyframe(double sequenceTime);
+    void addCameraKeyframe(double sequenceTime);
+    void addScriptKeyframe(double sequenceTime, std::string script);
     void removeKeyframe(int index);
     void updateKeyframe(int index);
     void moveKeyframe(int index, double sequenceTime);
-    bool saveSequence(std::optional<std::string> filename);
-    void loadSequence(std::string filename);
-    void preSynchronization(double dt);
+    void saveSequence(std::filesystem::path filename);
+    void loadSequence(std::filesystem::path filename);
     void play();
-    void pause();
-    void setSequenceTime(double sequenceTime);
-    void jumpToKeyframe(int index);
     bool hasKeyframeRecording() const;
     std::vector<ghoul::Dictionary> keyframes() const;
 
     static openspace::scripting::LuaLibrary luaLibrary();
 
 private:
-    void sortKeyframes();
-
-    Keyframe newKeyframe(double sequenceTime);
-    bool isInRange(int index) const;
-
-    std::vector<Keyframe> _keyframes;
-    std::string _filename;
-    bool _isPlaying = false;
-    bool _hasStateChanged = false;
-    double _sequenceTime = 0.0;
+    SessionRecording _timeline;
 };
 
 } // namespace openspace
 
-#endif // __OPENSPACE_CORE___KEYFRAMERECORDING___H__
+#endif // __OPENSPACE_CORE___KEYFRAMERECORDINGHANDLER___H__
diff --git a/include/openspace/interaction/sessionrecording.h b/include/openspace/interaction/sessionrecording.h
index 1adfbce109..1af1bf9e39 100644
--- a/include/openspace/interaction/sessionrecording.h
+++ b/include/openspace/interaction/sessionrecording.h
@@ -25,863 +25,62 @@
 #ifndef __OPENSPACE_CORE___SESSIONRECORDING___H__
 #define __OPENSPACE_CORE___SESSIONRECORDING___H__
 
-#include <openspace/properties/propertyowner.h>
-
 #include <openspace/navigation/keyframenavigator.h>
-#include <openspace/properties/scalar/boolproperty.h>
-#include <openspace/scripting/lualibrary.h>
+#include <ghoul/misc/dictionary.h>
+#include <filesystem>
+#include <functional>
+#include <string>
+#include <variant>
 #include <vector>
-#include <chrono>
 
 namespace openspace::interaction {
 
-struct ConversionError : public ghoul::RuntimeError {
-    explicit ConversionError(std::string msg);
+enum class DataMode {
+    Ascii = 0,
+    Binary
 };
 
-class SessionRecording : public properties::PropertyOwner {
-public:
+struct SessionRecording {
+    struct Entry {
+        auto operator<=>(const SessionRecording::Entry&) const = default;
 
-    inline static const std::string FileHeaderTitle = "OpenSpace_record/playback";
-    inline static const std::string HeaderCameraAscii = "camera";
-    inline static const std::string HeaderTimeAscii = "time";
-    inline static const std::string HeaderScriptAscii = "script";
-    inline static const std::string HeaderCommentAscii = "#";
-    inline static const char HeaderCameraBinary = 'c';
-    inline static const char HeaderTimeBinary = 't';
-    inline static const char HeaderScriptBinary = 's';
-    inline static const std::string FileExtensionBinary = ".osrec";
-    inline static const std::string FileExtensionAscii = ".osrectxt";
+        using Camera = KeyframeNavigator::CameraPose;
+        using Script = std::string;
 
-    enum class DataMode {
-        Ascii = 0,
-        Binary,
-        Unknown
+        double timestamp = 0.0;
+        double simulationTime = 0.0;
+        std::variant<Camera, Script> value;
     };
 
-    enum class SessionState {
-        Idle = 0,
-        Recording,
-        Playback,
-        PlaybackPaused
-    };
-
-    struct Timestamps {
-        double timeOs;
-        double timeRec;
-        double timeSim;
-    };
-
-    /**
-     * Struct for storing a script substring that, if found in a saved script, will be
-     * replaced by its substringReplacement counterpart.
-     */
-    struct ScriptSubstringReplace {
-        std::string substringFound;
-        std::string substringReplacement;
-        ScriptSubstringReplace(std::string found, std::string replace)
-            : substringFound(found)
-            , substringReplacement(replace) {}
-    };
-
-    static const size_t FileHeaderVersionLength = 5;
-    char FileHeaderVersion[FileHeaderVersionLength+1] = "01.00";
-    char TargetConvertVersion[FileHeaderVersionLength+1] = "01.00";
-    static const char DataFormatAsciiTag = 'A';
-    static const char DataFormatBinaryTag = 'B';
-    static const size_t keyframeHeaderSize_bytes = 33;
-    static const size_t saveBufferCameraSize_min = 82;
-    static const size_t saveBufferStringSize_max = 2000;
-    static const size_t _saveBufferMaxSize_bytes = keyframeHeaderSize_bytes +
-        + saveBufferCameraSize_min + saveBufferStringSize_max;
-
-    using CallbackHandle = int;
-    using StateChangeCallback = std::function<void()>;
-
-    SessionRecording();
-    SessionRecording(bool isGlobal);
-
-    ~SessionRecording() override = default;
-
-    /**
-     * Used to de-initialize the session recording feature. Any recording or playback
-     * in progress will be stopped, files closed, and keyframes in memory deleted.
-     */
-    void deinitialize();
-
-    /**
-     * This is called with every rendered frame. If in recording state, the camera state
-     * will be saved to the recording file (if its state has changed since last). If in
-     * playback state, the next keyframe will be used (if it is time to do so).
-     */
-    void preSynchronization();
-
-    /**
-     * If enabled, calling this function will render information about the session
-     * recording that is currently taking place to the screen.
-     */
-    void render();
-
-    /**
-     * Current time based on playback mode.
-     */
-    double currentTime() const;
-
-    /**
-     * Fixed delta time set by user for use during saving of frame during playback mode.
-     */
-    double fixedDeltaTimeDuringFrameOutput() const;
-
-    /**
-     * Returns the number of microseconds that have elapsed since playback started, if
-     * playback is set to be in the mode where a screenshot is captured with every
-     * rendered frame (enableTakeScreenShotDuringPlayback() is used to enable this mode).
-     * At the start of playback, this timer is set to the current steady_clock value.
-     * However, during playback it is incremented by the fixed framerate of the playback
-     * rather than the actual clock value (as in normal operation).
-     *
-     * \return Number of microseconds elapsed since playback started in terms of the
-     *         number of rendered frames multiplied by the fixed time increment per frame
-     */
-    std::chrono::steady_clock::time_point currentPlaybackInterpolationTime() const;
-
-    /**
-     * Returns the simulated application time. This simulated application time is only
-     * used when playback is set to be in the mode where a screenshot is captured with
-     * every rendered frame (enableTakeScreenShotDuringPlayback() is used to enable this
-     * mode). At the start of playback, this timer is set to the value of the current
-     * applicationTime function provided by the window delegate (used during normal mode
-     * or playback). However, during playback it is incremented by the fixed framerate of
-     * the playback rather than the actual clock value.
-     *
-     * \return Application time in seconds, for use in playback-with-frames mode
-     */
-    double currentApplicationInterpolationTime() const;
-
-    /**
-     * Starts a recording session, which will save data to the provided filename according
-     * to the data format specified, and will continue until recording is stopped using
-     * stopRecording() method.
-     *
-     * \param filename File saved with recorded keyframes
-     * \return `true` if recording to file starts without errors
-     */
-    bool startRecording(const std::string& filename);
-
-    /**
-     * Starts a recording session, which will save data to the provided filename in ASCII
-     * data format until recording is stopped using stopRecording() method.
-     *
-     * \param dataMode The format in which the session recording is stored
-     */
-    void setRecordDataFormat(DataMode dataMode);
-
-    /**
-     * Used to stop a recording in progress. If open, the recording file will be closed,
-     * and all keyframes deleted from memory.
-     */
-    void stopRecording();
-
-    /**
-     * Used to check if a session recording is in progress.
-     *
-     * \return `true` if recording is in progress
-     */
-    bool isRecording() const;
-
-    /**
-     * Starts a playback session, which can run in one of three different time modes.
-     *
-     * \param filename File containing recorded keyframes to play back. The file path is
-     *                 relative to the base recordings directory specified in the config
-     *                 file by the RECORDINGS variable
-     * \param timeMode Which of the 3 time modes to use for time reference during
-     * \param forceSimTimeAtStart If true simulation time is forced to that of playback
-     *        playback: recorded time, application time, or simulation time. See the
-     *        LuaLibrary entry for SessionRecording for details on these time modes
-     * \param loop If true then the file will playback in loop mode, continuously looping
-     *        back to the beginning until it is manually stopped
-     * \param shouldWaitForFinishedTiles If true, the playback will wait for tiles to be
-     *        finished before progressing to the next frame. This value is only used when
-     *        `enableTakeScreenShotDuringPlayback` was called before. Otherwise this value
-     *        will be ignored
-     *
-     * \return `true` if recording to file starts without errors
-     */
-    bool startPlayback(std::string& filename, KeyframeTimeRef timeMode,
-        bool forceSimTimeAtStart, bool loop, bool shouldWaitForFinishedTiles);
-
-    /**
-     * Used to stop a playback in progress. If open, the playback file will be closed, and
-     * all keyframes deleted from memory.
-     */
-    void stopPlayback();
-
-    /**
-     * Returns playback pause status.
-     *
-     * \return `true` if playback is paused
-     */
-    bool isPlaybackPaused();
-
-    /**
-     * Pauses a playback session. This does both the normal pause functionality of setting
-     * simulation delta time to zero, and pausing the progression through the timeline.
-     *
-     * \param pause If `true`, then will set playback timeline progression to zero
-     */
-    void setPlaybackPause(bool pause);
-
-    /**
-     * Enables that rendered frames should be saved during playback.
-     *
-     * \param fps Number of frames per second.
-     */
-    void enableTakeScreenShotDuringPlayback(int fps);
-
-    /**
-     * Used to disable that renderings are saved during playback.
-     */
-    void disableTakeScreenShotDuringPlayback();
-
-    /**
-     * Used to check if a session playback is in progress.
-     *
-     * \return `true` if playback is in progress
-     */
-    bool isPlayingBack() const;
-
-    /**
-     * Is saving frames during playback.
-     */
-    bool isSavingFramesDuringPlayback() const;
-
-    bool shouldWaitForTileLoading() const;
-
-    /**
-     * Used to obtain the state of idle/recording/playback.
-     *
-     * \return int value of state as defined by struct SessionState
-     */
-    SessionState state() const;
-
-    /**
-     * Used to trigger a save of the camera states (position, rotation, focus node,
-     * whether it is following the rotation of a node, and timestamp). The data will be
-     * saved to the recording file only if a recording is currently in progress.
-     */
-    void saveCameraKeyframeToTimeline();
-
-    /**
-     * Used to trigger a save of the current timing states. The data will be saved to the
-     * recording file only if a recording is currently in progress.
-     */
-    void saveTimeKeyframeToTimeline();
-
-    /**
-     * Used to trigger a save of a script to the recording file, but only if a recording
-     * is currently in progress.
-     *
-     * \param script String of the Lua command to be saved
-     */
-    void saveScriptKeyframeToTimeline(std::string script);
-
-    /**
-     * \return The Lua library that contains all Lua functions available to affect the
-     *         interaction
-     */
-    static openspace::scripting::LuaLibrary luaLibrary();
-
-    /**
-     * Used to request a callback for notification of playback state change.
-     *
-     * \param cb Function handle for callback
-     * \return CallbackHandle value of callback number
-     */
-    CallbackHandle addStateChangeCallback(StateChangeCallback cb);
-
-    /**
-     * Removes the callback for notification of playback state change.
-     *
-     * \param callback Function handle for the callback
-     */
-    void removeStateChangeCallback(CallbackHandle handle);
-
-    /**
-     * Provides list of available playback files.
-     *
-     * \return Vector of filenames in recordings dir
-     */
-    std::vector<std::string> playbackList() const;
-
-    /**
-     * Reads a camera keyframe from a binary format playback file, and populates input
-     * references with the parameters of the keyframe.
-     *
-     * \param times Reference to a timestamps structure which contains recorded times
-     * \param kf Reference to a camera keyframe which contains camera details
-     * \param file An ifstream reference to the playback file being read
-     * \param lineN Keyframe number in playback file where this keyframe resides
-     * \return `true` if data read has no errors
-     */
-    bool readCameraKeyframeBinary(Timestamps& times,
-        datamessagestructures::CameraKeyframe& kf, std::ifstream& file, int lineN);
-
-    /**
-     * Reads a camera keyframe from an ascii format playback file, and populates input
-     * references with the parameters of the keyframe.
-     *
-     * \param times Reference to a timestamps structure which contains recorded times
-     * \param kf Reference to a camera keyframe which contains camera details
-     * \param currentParsingLine String containing the most current line that was read
-     * \param lineN Line number in playback file where this keyframe resides
-     * \return `true` if data read has no errors
-     */
-    bool readCameraKeyframeAscii(Timestamps& times,
-        datamessagestructures::CameraKeyframe& kf, const std::string& currentParsingLine,
-        int lineN);
-
-    /**
-     * Reads a time keyframe from a binary format playback file, and populates input
-     * references with the parameters of the keyframe.
-     *
-     * \param times Reference to a timestamps structure which contains recorded times
-     * \param kf Reference to a time keyframe which contains time details
-     * \param file An ifstream reference to the playback file being read
-     * \param lineN Keyframe number in playback file where this keyframe resides
-     * \return `true` if data read has no errors
-     */
-    bool readTimeKeyframeBinary(Timestamps& times,
-        datamessagestructures::TimeKeyframe& kf, std::ifstream& file, int lineN);
-
-    /**
-     * Reads a time keyframe from an ascii format playback file, and populates input
-     * references with the parameters of the keyframe.
-     *
-     * \param times Reference to a timestamps structure which contains recorded times
-     * \param kf Reference to a time keyframe which contains time details
-     * \param currentParsingLine String containing the most current line that was read
-     * \param lineN Line number in playback file where this keyframe resides
-     * \return `true` if data read has no errors
-     */
-    bool readTimeKeyframeAscii(Timestamps& times,
-        datamessagestructures::TimeKeyframe& kf, const std::string& currentParsingLine,
-        int lineN);
-
-    /**
-     * Reads a script keyframe from a binary format playback file, and populates input
-     * references with the parameters of the keyframe.
-     *
-     * \param times Reference to a timestamps structure which contains recorded times
-     * \param kf Reference to a script keyframe which contains the size of the script (in
-     *        chars) and the text itself
-     * \param file An ifstream reference to the playback file being read
-     * \param lineN Keyframe number in playback file where this keyframe resides
-     * \return `true` if data read has no errors
-     */
-    bool readScriptKeyframeBinary(Timestamps& times,
-        datamessagestructures::ScriptMessage& kf, std::ifstream& file, int lineN);
-
-    /**
-     * Reads a script keyframe from an ascii format playback file, and populates input
-     * references with the parameters of the keyframe.
-     *
-     * \param times Reference to a timestamps structure which contains recorded times
-     * \param kf Reference to a script keyframe which contains the size of the script (in
-     *        chars) and the text itself
-     * \param currentParsingLine String containing the most current line that was read
-     * \param lineN Line number in playback file where this keyframe resides
-     * \return `true` if data read has no errors
-     */
-    bool readScriptKeyframeAscii(Timestamps& times,
-        datamessagestructures::ScriptMessage& kf, const std::string& currentParsingLine,
-        int lineN);
-
-    /**
-     * Writes a camera keyframe to a binary format recording file using a CameraKeyframe.
-     *
-     * \param times Reference to a timestamps structure which contains recorded times
-     * \param kf Reference to a camera keyframe which contains the camera details
-     * \param kfBuffer A buffer temporarily used for preparing data to be written
-     * \param file An ofstream reference to the recording file being written-to
-     */
-    void saveCameraKeyframeBinary(Timestamps& times,
-        datamessagestructures::CameraKeyframe& kf, unsigned char* kfBuffer,
-        std::ofstream& file);
-
-    /**
-     * Writes a camera keyframe to an ascii format recording file using a CameraKeyframe.
-     *
-     * \param times Reference to a timestamps structure which contains recorded times
-     * \param kf Reference to a camera keyframe which contains the camera details
-     * \param file An ofstream reference to the recording file being written-to
-     */
-    void saveCameraKeyframeAscii(Timestamps& times,
-        datamessagestructures::CameraKeyframe& kf, std::ofstream& file);
-
-    /**
-     * Writes a time keyframe to a binary format recording file using a TimeKeyframe
-     *
-     * \param times Reference to a timestamps structure which contains recorded times
-     * \param kf Reference to a time keyframe which contains the time details
-     * \param kfBuffer A buffer temporarily used for preparing data to be written
-     * \param file An ofstream reference to the recording file being written-to
-     */
-    void saveTimeKeyframeBinary(Timestamps& times,
-        datamessagestructures::TimeKeyframe& kf, unsigned char* kfBuffer,
-        std::ofstream& file);
-
-    /**
-     * Writes a time keyframe to an ascii format recording file using a TimeKeyframe.
-     *
-     * \param times Reference to a timestamps structure which contains recorded times
-     * \param kf Reference to a time keyframe which contains the time details
-     * \param file An ofstream reference to the recording file being written-to
-     */
-    void saveTimeKeyframeAscii(Timestamps& times,
-        datamessagestructures::TimeKeyframe& kf, std::ofstream& file);
-
-    /**
-     * Writes a script keyframe to a binary format recording file using a ScriptMessage.
-     *
-     * \param times Reference to a timestamps structure which contains recorded times
-     * \param sm Reference to a ScriptMessage object which contains the script details
-     * \param smBuffer A buffer temporarily used for preparing data to be written
-     * \param file An ofstream reference to the recording file being written-to
-     */
-    void saveScriptKeyframeBinary(Timestamps& times,
-        datamessagestructures::ScriptMessage& sm, unsigned char* smBuffer,
-        std::ofstream& file);
-
-    /**
-     * Writes a script keyframe to an ascii format recording file using a ScriptMessage.
-     *
-     * \param times Reference to a timestamps structure which contains recorded times
-     * \param sm Reference to a ScriptMessage which contains the script details
-     * \param file An ofstream reference to the recording file being written-to
-     */
-    void saveScriptKeyframeAscii(Timestamps& times,
-        datamessagestructures::ScriptMessage& sm, std::ofstream& file);
-
-    /**
-     * Since session recordings only record changes, the initial conditions aren't
-     * preserved when a playback starts. This function is called whenever a property value
-     * is set and a recording is in progress. Before the set happens, this function will
-     * read the current value of the property and store it so that when the recording is
-     * finished, the initial state will be added as a set property command at the
-     * beginning of the recording file, to be applied when playback starts.
-     *
-     * \param prop The property being set
-     */
-    void savePropertyBaseline(properties::Property& prop);
-
-    /**
-     * Reads header information from a session recording file.
-     *
-     * \param stream Reference to ifstream that contains the session recording file data
-     * \param readLen_chars Number of characters to be read, which may be the expected
-     *        length of the header line, or an arbitrary number of characters within it
-     */
-    static std::string readHeaderElement(std::ifstream& stream, size_t readLenChars);
-
-    /**
-     * Reads header information from a session recording file.
-     *
-     * \param stream Reference to ifstream that contains the session recording file data
-     * \param readLen_chars Number of characters to be read, which may be the expected
-     *        length of the header line, or an arbitrary number of characters within it
-     */
-    static std::string readHeaderElement(std::stringstream& stream, size_t readLenChars);
-
-    /**
-     * Writes a header to a binary recording file buffer.
-     *
-     * \param times Reference to a timestamps structure which contains recorded times
-     * \param type Single character signifying the keyframe type
-     * \param kfBuffer The char buffer holding the recording info to be written
-     * \param idx Index into write buffer (this is updated with the num of chars written)
-     */
-    static void saveHeaderBinary(Timestamps& times, char type, unsigned char* kfBuffer,
-        size_t& idx);
-
-    /**
-     * Writes a header to an ASCII recording file buffer.
-     *
-     * \param times Reference to a timestamps structure which contains recorded times
-     * \param type String signifying the keyframe type
-     * \param line The stringstream buffer being written to
-     */
-    static void saveHeaderAscii(Timestamps& times, const std::string& type,
-        std::stringstream& line);
-
-    /**
-     * Saves a keyframe to an ASCII recording file.
-     *
-     * \param entry The ASCII string version of the keyframe (any type)
-     * \param file `std::ofstream` object to write to
-     */
-    static void saveKeyframeToFile(const std::string& entry, std::ofstream& file);
-
-    /**
-     * Checks if a specified recording file ends with a particular file extension.
-     *
-     * \param filename The name of the file to record to
-     * \param extension The file extension to check for
-     */
-    static bool hasFileExtension(const std::string& filename,
-        const std::string& extension);
-
-    /**
-     * Converts file format of a session recording file to the current format version
-     * (will determine the file format conversion to convert from based on the file's
-     * header version number).
-     *
-     * \param filename Name of the file to convert
-     * \param depth iteration number to prevent runaway recursion (init call with zero)
-     * \return String containing the filename of the previous conversion step. This is
-     *         used if there are multiple conversion steps where each step has to use
-     *         the output of the previous.
-     */
-    std::string convertFile(std::string filename, int depth = 0);
-
-    /**
-     * Converts file format of a session recording file to the current format version
-     * (will determine the file format conversion to convert from based on the file's
-     * header version number). Accepts a relative path (currently from task runner dir)
-     * rather than a path assumed to be relative to `${RECORDINGS}`.
-     *
-     * \param filenameRelative name of the file to convert
-     */
-    void convertFileRelativePath(std::string filenameRelative);
-
-    /**
-     * Goes to legacy session recording inherited class, and calls its #convertFile
-     * method, and then returns the resulting conversion filename.
-     *
-     * \param filename Name of the file to convert
-     * \param depth Iteration number to prevent runaway recursion (init call with zero)
-     * \return string containing the filename of the conversion
-     */
-    virtual std::string getLegacyConversionResult(std::string filename, int depth);
-
-    /**
-     * Version string for file format version currently supported by this class.
-     *
-     * \return string of the file format version this class supports
-     */
-    virtual std::string fileFormatVersion();
-
-    /**
-     * Version string for file format version that a conversion operation will convert to
-     * (e.g. upgrades to this version). This is only relevant for inherited classes that
-     * support conversion from legacy versions (if called in the base class, it will
-     * return its own current version).
-     *
-     * \return string of the file format version this class supports
-     */
-    virtual std::string targetFileFormatVersion();
-
-    /**
-     * Determines a filename for the conversion result based on the original filename and
-     the file format version number.
-     *
-     * \param filename source filename to be converted
-     * \param mode Whether the file is binary or text-based
-     *
-     * \return pathname of the converted version of the file
-     */
-    std::string determineConversionOutFilename(const std::string& filename,
-        DataMode mode);
-
-protected:
-    properties::BoolProperty _renderPlaybackInformation;
-    properties::BoolProperty _ignoreRecordedScale;
-    properties::BoolProperty _addModelMatrixinAscii;
-
-    enum class RecordedType {
-        Camera = 0,
-        Time,
-        Script,
-        Invalid
-    };
-    struct TimelineEntry {
-        RecordedType keyframeType;
-        unsigned int idxIntoKeyframeTypeArray;
-        Timestamps t3stamps;
-    };
-    double _timestampRecordStarted = 0.0;
-    Timestamps _timestamps3RecordStarted{ 0.0, 0.0, 0.0 };
-    double _timestampPlaybackStarted_application = 0.0;
-    double _timestampPlaybackStarted_simulation = 0.0;
-    double _timestampApplicationStarted_simulation = 0.0;
-    bool hasCameraChangedFromPrev(const datamessagestructures::CameraKeyframe& kfNew);
-    double appropriateTimestamp(Timestamps t3stamps);
-    double equivalentSimulationTime(double timeOs, double timeRec, double timeSim);
-    double equivalentApplicationTime(double timeOs, double timeRec, double timeSim);
-    void recordCurrentTimePauseState();
-    void recordCurrentTimeRate();
-    bool handleRecordingFile(std::string filenameIn);
-    static bool isPath(std::string& filename);
-    void removeTrailingPathSlashes(std::string& filename) const;
-    bool playbackCamera();
-    bool playbackTimeChange();
-    bool playbackScript();
-    bool playbackAddEntriesToTimeline();
-    void signalPlaybackFinishedForComponent(RecordedType type);
-    void handlePlaybackEnd();
-
-    bool findFirstCameraKeyframeInTimeline();
-    Timestamps generateCurrentTimestamp3(double keyframeTime) const;
-    static void saveStringToFile(const std::string& s, unsigned char* kfBuffer,
-        size_t& idx, std::ofstream& file);
-    static void saveKeyframeToFileBinary(unsigned char* buffer, size_t size,
-        std::ofstream& file);
-
-    bool addKeyframe(Timestamps t3stamps,
-        interaction::KeyframeNavigator::CameraPose keyframe, int lineNum);
-    bool addKeyframe(Timestamps t3stamps,
-        datamessagestructures::TimeKeyframe keyframe, int lineNum);
-    bool addKeyframe(Timestamps t3stamps,
-        std::string scriptToQueue, int lineNum);
-    bool addKeyframeToTimeline(std::vector<TimelineEntry>& timeline, RecordedType type,
-            size_t indexIntoTypeKeyframes, Timestamps t3stamps, int lineNum);
-
-    void initializePlayback_time(double now);
-    void initializePlayback_modeFlags();
-    bool initializePlayback_timeline();
-    void initializePlayback_triggerStart();
-    void moveAheadInTime();
-    void lookForNonCameraKeyframesThatHaveComeDue(double currTime);
-    void updateCameraWithOrWithoutNewKeyframes(double currTime);
-    bool isTimeToHandleNextNonCameraKeyframe(double currTime);
-    bool processNextNonCameraKeyframeAheadInTime();
-    bool findNextFutureCameraIndex(double currTime);
-    bool processCameraKeyframe(double now);
-    bool processScriptKeyframe();
-    bool readSingleKeyframeCamera(datamessagestructures::CameraKeyframe& kf,
-        Timestamps& times, DataMode mode, std::ifstream& file,
-        std::string& inLine, const int lineNum);
-    void saveSingleKeyframeCamera(datamessagestructures::CameraKeyframe& kf,
-        Timestamps& times, DataMode mode, std::ofstream& file, unsigned char* buffer);
-    bool readSingleKeyframeTime(datamessagestructures::TimeKeyframe& kf,
-        Timestamps& times, DataMode mode, std::ifstream& file, std::string& inLine,
-        const int lineNum);
-    void saveSingleKeyframeTime(datamessagestructures::TimeKeyframe& kf,
-        Timestamps& times, DataMode mode, std::ofstream& file, unsigned char* buffer);
-    bool readSingleKeyframeScript(datamessagestructures::ScriptMessage& kf,
-        Timestamps& times, DataMode mode, std::ifstream& file, std::string& inLine,
-        const int lineNum);
-    void saveSingleKeyframeScript(datamessagestructures::ScriptMessage& kf,
-        Timestamps& times, DataMode mode, std::ofstream& file, unsigned char* buffer);
-    void saveScriptKeyframeToPropertiesBaseline(std::string script);
-    bool isPropertyAllowedForBaseline(const std::string& propString);
-    unsigned int findIndexOfLastCameraKeyframeInTimeline();
-    bool doesTimelineEntryContainCamera(unsigned int index) const;
-    void trimCommandsFromScriptIfFound(std::string& script);
-    void replaceCommandsFromScriptIfFound(std::string& script);
-
-    RecordedType getNextKeyframeType();
-    RecordedType getPrevKeyframeType();
-    double getNextTimestamp();
-    double getPrevTimestamp();
-    void cleanUpPlayback();
-    void cleanUpRecording();
-    void cleanUpTimelinesAndKeyframes();
-    bool convertEntries(std::string& inFilename, std::stringstream& inStream,
-        DataMode mode, int lineNum, std::ofstream& outFile);
-    virtual bool convertCamera(std::stringstream& inStream, DataMode mode, int lineNum,
-        std::string& inputLine, std::ofstream& outFile, unsigned char* buffer);
-    virtual bool convertTimeChange(std::stringstream& inStream, DataMode mode,
-        int lineNum, std::string& inputLine, std::ofstream& outFile,
-        unsigned char* buffer);
-    virtual bool convertScript(std::stringstream& inStream, DataMode mode, int lineNum,
-        std::string& inputLine, std::ofstream& outFile, unsigned char* buffer);
-    DataMode readModeFromHeader(const std::string& filename);
-    void readPlaybackHeader_stream(std::stringstream& conversionInStream,
-        std::string& version, DataMode& mode);
-    void populateListofLoadedSceneGraphNodes();
-
-    void checkIfScriptUsesScenegraphNode(std::string s);
-    bool checkForScenegraphNodeAccessScene(const std::string& s);
-    bool checkForScenegraphNodeAccessNav(std::string& navTerm);
-    std::string extractScenegraphNodeFromScene(const std::string& s);
-    bool checkIfInitialFocusNodeIsLoaded(unsigned int firstCamIndex);
-    std::string isolateTermFromQuotes(std::string s);
-    void eraseSpacesFromString(std::string& s);
-    std::string getNameFromSurroundingQuotes(std::string& s);
-
-    static void writeToFileBuffer(unsigned char* buf, size_t& idx, double src);
-    static void writeToFileBuffer(unsigned char* buf, size_t& idx, std::vector<char>& cv);
-    static void writeToFileBuffer(unsigned char* buf, size_t& idx, unsigned char c);
-    static void writeToFileBuffer(unsigned char* buf, size_t& idx, bool b);
-    void readFileIntoStringStream(std::string filename,
-        std::ifstream& inputFstream, std::stringstream& stream);
-
-    DataMode _recordingDataMode = DataMode::Binary;
-    SessionState _state = SessionState::Idle;
-    SessionState _lastState = SessionState::Idle;
-    std::string _playbackFilename;
-    std::ifstream _playbackFile;
-    std::string _playbackLineParsing;
-    std::ofstream _recordFile;
-    int _playbackLineNum = 1;
-    int _recordingEntryNum = 1;
-    KeyframeTimeRef _playbackTimeReferenceMode;
-    datamessagestructures::CameraKeyframe _prevRecordedCameraKeyframe;
-    bool _playbackActive_camera = false;
-    bool _playbackActive_time = false;
-    bool _playbackActive_script = false;
-    bool _hasHitEndOfCameraKeyframes = false;
-    bool _playbackPausedWithinDeltaTimePause = false;
-    bool _playbackLoopMode = false;
-    bool _playbackForceSimTimeAtStart = false;
-    double _playbackPauseOffset = 0.0;
-    double _previousTime = 0.0;
-
-    bool _saveRenderingDuringPlayback = false;
-    double _saveRenderingDeltaTime = 1.0 / 30.0;
-    double _saveRenderingCurrentRecordedTime = 0.0;
-    bool _shouldWaitForFinishLoadingWhenPlayback = false;
-    std::chrono::steady_clock::duration _saveRenderingDeltaTime_interpolation_usec;
-    std::chrono::steady_clock::time_point _saveRenderingCurrentRecordedTime_interpolation;
-    double _saveRenderingCurrentApplicationTime_interpolation = 0.0;
-    long long _saveRenderingClockInterpolation_countsPerSec = 1;
-    bool _saveRendering_isFirstFrame = true;
-
-    unsigned char _keyframeBuffer[_saveBufferMaxSize_bytes];
-
-    bool _cleanupNeededRecording = false;
-    bool _cleanupNeededPlayback = false;
-    const std::string scriptReturnPrefix = "return ";
-
-    std::vector<interaction::KeyframeNavigator::CameraPose> _keyframesCamera;
-    std::vector<datamessagestructures::TimeKeyframe> _keyframesTime;
-    std::vector<std::string> _keyframesScript;
-    std::vector<TimelineEntry> _timeline;
-
-    std::vector<std::string> _keyframesSavePropertiesBaseline_scripts;
-    std::vector<TimelineEntry> _keyframesSavePropertiesBaseline_timeline;
-    std::vector<std::string> _propertyBaselinesSaved;
-    const std::vector<std::string> _propertyBaselineRejects = {
-        "NavigationHandler.OrbitalNavigator.Anchor",
-        "NavigationHandler.OrbitalNavigator.Aim",
-        "NavigationHandler.OrbitalNavigator.RetargetAnchor",
-        "NavigationHandler.OrbitalNavigator.RetargetAim"
-    };
-
-    //A script that begins with an exact match of any of the strings contained in
-    // _scriptRejects will not be recorded
-    const std::vector<std::string> _scriptRejects = {
-        "openspace.sessionRecording.enableTakeScreenShotDuringPlayback",
-        "openspace.sessionRecording.startPlayback",
-        "openspace.sessionRecording.stopPlayback",
-        "openspace.sessionRecording.startRecording",
-        "openspace.sessionRecording.stopRecording",
-        "openspace.scriptScheduler.clear"
-    };
-    const std::vector<std::string> _navScriptsUsingNodes = {
-        "RetargetAnchor",
-        "Anchor",
-        "Aim"
-    };
-
-    //Any script snippet included in this vector will be trimmed from any script
-    // from the script manager, before it is recorded in the session recording file.
-    // The remainder of the script will be retained.
-    const std::vector<std::string> _scriptsToBeTrimmed = {
-        "openspace.sessionRecording.togglePlaybackPause"
-    };
-
-    //Any script snippet included in this vector will be trimmed from any script
-    // from the script manager, before it is recorded in the session recording file.
-    // The remainder of the script will be retained.
-    const std::vector<ScriptSubstringReplace> _scriptsToBeReplaced = {
-        {
-            "openspace.time.pauseToggleViaKeyboard",
-            "openspace.time.interpolateTogglePause"
-        }
-    };
-    std::vector<std::string> _loadedNodes;
-
-    unsigned int _idxTimeline_nonCamera = 0;
-    unsigned int _idxTime = 0;
-    unsigned int _idxScript = 0;
-
-    unsigned int _idxTimeline_cameraPtrNext = 0;
-    unsigned int _idxTimeline_cameraPtrPrev = 0;
-
-    unsigned int _idxTimeline_cameraFirstInTimeline = 0;
-    double _cameraFirstInTimeline_timestamp = 0;
-
-    int _nextCallbackHandle = 0;
-    std::vector<std::pair<CallbackHandle, StateChangeCallback>> _stateChangeCallbacks;
-
-    DataMode _conversionDataMode = DataMode::Binary;
-    int _conversionLineNum = 1;
-    const int _maximumRecursionDepth = 50;
-};
-
-// Instructions for bumping the file format version with new changes:
-//
-// 1. Create a new subclass with the current version # in its name, such as:
-//    SessionRecording_legacy_####, which inherits from SessionRecording
-// 2. Override any method that changes in the new version. This includes both
-//    methods in SessionRecording class and structs in
-//    openspace::datamessagestructure that do data read/writes. Make the modified
-//    method/struct virtual, and override it in the new legacy subclass. This
-//    override will contain the code as it is before the new changes. This will
-//    need to be done in every legacy subclass/struct that exists, but only if that
-//    subclass does NOT already contain an override of that method/struct.
-// 3. Override FileHeaderVersion with the version # of the new subclass (which is
-//    the version being replaced by the new changes).
-// 4. Override TargetConvertVersion with the version # with the new changes. This
-//    is now the version that this legacy subclass converts up to.
-// 5. Override getLegacyConversionResult method so that it creates an instance of
-//    the new version subclass. This is how the current version looks back to the
-//    legacy version that preceded it.
-// 6. The convert method for frame types that changed will need to be changed
-//    (for example SessionRecording_legacy_0085::convertScript uses its own
-//    override of script keyframe for the conversion functionality).
-
-class SessionRecording_legacy_0085 : public SessionRecording {
-public:
-    SessionRecording_legacy_0085() : SessionRecording() {}
-    ~SessionRecording_legacy_0085() override {}
-    char FileHeaderVersion[FileHeaderVersionLength+1] = "00.85";
-    char TargetConvertVersion[FileHeaderVersionLength+1] = "01.00";
-    std::string fileFormatVersion() override {
-        return std::string(FileHeaderVersion);
-    }
-    std::string targetFileFormatVersion() override {
-        return std::string(TargetConvertVersion);
-    }
-    std::string getLegacyConversionResult(std::string filename, int depth) override;
-
-    struct ScriptMessage_legacy_0085 : public datamessagestructures::ScriptMessage {
-        void read(std::istream* in) override {
-            size_t strLen;
-            //Read string length from file
-            in->read(reinterpret_cast<char*>(&strLen), sizeof(strLen));
-            if (strLen > saveBufferStringSize_max) {
-                throw ConversionError("Invalid script size for conversion read");
+    auto operator<=>(const SessionRecording&) const = default;
+
+    std::vector<Entry> entries;
+
+    bool hasCameraFrame() const noexcept;
+
+    // Call the provided \p function for all entries of the specified type \tparam T. The
+    // function calls will be ordered by the entries timestamps. If the callback function
+    // returns `true`, the loop is aborted
+    template <typename T>
+    void forAll(std::function<bool (const T&)> function) {
+        for (const Entry& e : entries) {
+            if (std::holds_alternative<T>(e.value)) {
+                bool cont = function(std::get<T>(e.value));
+                if (cont) {
+                    break;
+                }
             }
-            //Read back full string
-            std::vector<char> temp(strLen + 1);
-            in->read(temp.data(), strLen);
-            temp[strLen] = '\0';
-
-            _script.erase();
-            _script = temp.data();
         }
-    };
-
-protected:
-    bool convertScript(std::stringstream& inStream, DataMode mode, int lineNum,
-        std::string& inputLine, std::ofstream& outFile, unsigned char* buffer) override;
+    }
 };
 
-} // namespace openspace
+SessionRecording loadSessionRecording(const std::filesystem::path& filename);
+void saveSessionRecording(const std::filesystem::path& filename,
+    const SessionRecording& sessionRecording, DataMode dataMode);
 
-#include "sessionrecording.inl"
+std::vector<ghoul::Dictionary> sessionRecordingToDictionary(
+    const SessionRecording& recording);
 
-#endif // __OPENSPACE_CORE___SESSIONRECORDING___H__
+} // namespace openspace::interaction
+
+#endif // __OPENSPACE_CORE___SESSIONRECORDINGHANDLER___H__
diff --git a/include/openspace/interaction/sessionrecording.inl b/include/openspace/interaction/sessionrecording.inl
deleted file mode 100644
index 0be76b5709..0000000000
--- a/include/openspace/interaction/sessionrecording.inl
+++ /dev/null
@@ -1,72 +0,0 @@
-/*****************************************************************************************
- *                                                                                       *
- * OpenSpace                                                                             *
- *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
- *                                                                                       *
- * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
- * software and associated documentation files (the "Software"), to deal in the Software *
- * without restriction, including without limitation the rights to use, copy, modify,    *
- * merge, publish, distribute, sublicense, and/or sell copies of the Software, and to    *
- * permit persons to whom the Software is furnished to do so, subject to the following   *
- * conditions:                                                                           *
- *                                                                                       *
- * The above copyright notice and this permission notice shall be included in all copies *
- * or substantial portions of the Software.                                              *
- *                                                                                       *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED,   *
- * INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A         *
- * PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT    *
- * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF  *
- * CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE  *
- * OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                                         *
- ****************************************************************************************/
-
-namespace openspace::interaction {
-
-template <class T>
-T nextKeyframeObj(unsigned int index, const std::vector<T>& keyframeContainer,
-                  std::function<void()> finishedCallback)
-{
-    if (index >= (keyframeContainer.size() - 1)) {
-        if (index == (keyframeContainer.size() - 1)) {
-            finishedCallback();
-        }
-        return keyframeContainer.back();
-    }
-    else if (index < keyframeContainer.size()) {
-        return keyframeContainer[index];
-    }
-    else {
-        return keyframeContainer.back();
-    }
-}
-
-template <class T>
-T prevKeyframeObj(unsigned int index, const std::vector<T>& keyframeContainer) {
-    if (index >= keyframeContainer.size()) {
-        return keyframeContainer.back();
-    }
-    else if (index > 0) {
-        return keyframeContainer[index - 1];
-    }
-    else {
-        return keyframeContainer.front();
-    }
-}
-
-template <typename T>
-T readFromPlayback(std::ifstream& stream) {
-    T res;
-    stream.read(reinterpret_cast<char*>(&res), sizeof(T));
-    return res;
-}
-
-template <typename T>
-T readFromPlayback(std::stringstream& stream) {
-    T res;
-    stream.read(reinterpret_cast<char*>(&res), sizeof(T));
-    return res;
-}
-
-} // namespace openspace::interaction
diff --git a/include/openspace/interaction/sessionrecordinghandler.h b/include/openspace/interaction/sessionrecordinghandler.h
new file mode 100644
index 0000000000..796b0e7fcc
--- /dev/null
+++ b/include/openspace/interaction/sessionrecordinghandler.h
@@ -0,0 +1,288 @@
+/*****************************************************************************************
+ *                                                                                       *
+ * OpenSpace                                                                             *
+ *                                                                                       *
+ * Copyright (c) 2014-2024                                                               *
+ *                                                                                       *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
+ * software and associated documentation files (the "Software"), to deal in the Software *
+ * without restriction, including without limitation the rights to use, copy, modify,    *
+ * merge, publish, distribute, sublicense, and/or sell copies of the Software, and to    *
+ * permit persons to whom the Software is furnished to do so, subject to the following   *
+ * conditions:                                                                           *
+ *                                                                                       *
+ * The above copyright notice and this permission notice shall be included in all copies *
+ * or substantial portions of the Software.                                              *
+ *                                                                                       *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED,   *
+ * INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A         *
+ * PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT    *
+ * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF  *
+ * CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE  *
+ * OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                                         *
+ ****************************************************************************************/
+
+#ifndef __OPENSPACE_CORE___SESSIONRECORDINGHANDLER___H__
+#define __OPENSPACE_CORE___SESSIONRECORDINGHANDLER___H__
+
+#include <openspace/properties/propertyowner.h>
+
+#include <openspace/interaction/sessionrecording.h>
+#include <openspace/properties/scalar/boolproperty.h>
+#include <openspace/scripting/lualibrary.h>
+
+namespace openspace::interaction {
+
+class SessionRecordingHandler : public properties::PropertyOwner {
+public:
+    enum class SessionState {
+        Idle = 0,
+        Recording,
+        Playback,
+        PlaybackPaused
+    };
+
+    using CallbackHandle = int;
+    using StateChangeCallback = std::function<void()>;
+
+    SessionRecordingHandler();
+    ~SessionRecordingHandler() override = default;
+
+    /**
+     * This is called with every rendered frame. If in recording state, the camera state
+     * will be saved to the recording file (if its state has changed since last). If in
+     * playback state, the next keyframe will be used (if it is time to do so).
+     */
+    void preSynchronization(double dt);
+
+    /**
+     * If enabled, calling this function will render information about the session
+     * recording that is currently taking place to the screen.
+     */
+    void render() const;
+
+    /**
+     * Fixed delta time set by user for use during saving of frame during playback mode.
+     */
+    double fixedDeltaTimeDuringFrameOutput() const;
+
+    /**
+     * Returns the number of microseconds that have elapsed since playback started, if
+     * playback is set to be in the mode where a screenshot is captured with every
+     * rendered frame (enableTakeScreenShotDuringPlayback() is used to enable this mode).
+     * At the start of playback, this timer is set to the current steady_clock value.
+     * However, during playback it is incremented by the fixed framerate of the playback
+     * rather than the actual clock value (as in normal operation).
+     *
+     * \return Number of microseconds elapsed since playback started in terms of the
+     *         number of rendered frames multiplied by the fixed time increment per frame
+     */
+    std::chrono::steady_clock::time_point currentPlaybackInterpolationTime() const;
+
+    /**
+     * Returns the simulated application time. This simulated application time is only
+     * used when playback is set to be in the mode where a screenshot is captured with
+     * every rendered frame (enableTakeScreenShotDuringPlayback() is used to enable this
+     * mode). At the start of playback, this timer is set to the value of the current
+     * applicationTime function provided by the window delegate (used during normal mode
+     * or playback). However, during playback it is incremented by the fixed framerate of
+     * the playback rather than the actual clock value.
+     *
+     * \return Application time in seconds, for use in playback-with-frames mode
+     */
+    double currentApplicationInterpolationTime() const;
+
+    /**
+     * Starts a recording session, which will save data to the provided filename according
+     * to the data format specified, and will continue until recording is stopped using
+     * stopRecording() method.
+     *
+     * \return `true` if recording to file starts without errors
+     */
+    void startRecording();
+
+    /**
+     * Used to stop a recording in progress. If open, the recording file will be closed,
+     * and all keyframes deleted from memory.
+     * \param filename File saved with recorded keyframes
+     */
+    void stopRecording(const std::filesystem::path& filename, DataMode dataMode);
+
+    /**
+     * Used to check if a session recording is in progress.
+     *
+     * \return `true` if recording is in progress
+     */
+    bool isRecording() const;
+
+    /**
+     * Starts a playback session, which can run in one of three different time modes.
+     *
+     * \param filename File containing recorded keyframes to play back. The file path is
+     *                 relative to the base recordings directory specified in the config
+     *                 file by the RECORDINGS variable
+     * \param timeMode Which of the 3 time modes to use for time reference during
+     * \param loop If true then the file will playback in loop mode, continuously looping
+     *        back to the beginning until it is manually stopped
+     * \param shouldWaitForFinishedTiles If true, the playback will wait for tiles to be
+     *        finished before progressing to the next frame. This value is only used when
+     *        `enableTakeScreenShotDuringPlayback` was called before. Otherwise this value
+     *        will be ignored
+     */
+    void startPlayback(SessionRecording timeline, bool loop,
+        bool shouldWaitForFinishedTiles, std::optional<int> saveScreenshotFps);
+
+    /**
+     * Used to stop a playback in progress. If open, the playback file will be closed, and
+     * all keyframes deleted from memory.
+     */
+    void stopPlayback();
+
+    /**
+     * Returns playback pause status.
+     *
+     * \return `true` if playback is paused
+     */
+    bool isPlaybackPaused() const;
+
+    /**
+     * Pauses a playback session. This does both the normal pause functionality of setting
+     * simulation delta time to zero, and pausing the progression through the timeline.
+     *
+     * \param pause If `true`, then will set playback timeline progression to zero
+     */
+    void setPlaybackPause(bool pause);
+
+    /**
+     * Enables that rendered frames should be saved during playback.
+     *
+     * \param fps Number of frames per second.
+     */
+    //void enableTakeScreenShotDuringPlayback(int fps);
+
+    /**
+     * Used to disable that renderings are saved during playback.
+     */
+    //void disableTakeScreenShotDuringPlayback();
+
+    /**
+     * Used to check if a session playback is in progress.
+     *
+     * \return `true` if playback is in progress
+     */
+    bool isPlayingBack() const;
+
+    void seek(double recordingTime);
+
+    /**
+     * Is saving frames during playback.
+     */
+    bool isSavingFramesDuringPlayback() const;
+
+    bool shouldWaitForTileLoading() const;
+
+    /**
+     * Used to obtain the state of idle/recording/playback.
+     *
+     * \return int value of state as defined by struct SessionState
+     */
+    SessionState state() const;
+
+    /**
+     * Used to trigger a save of a script to the recording file, but only if a recording
+     * is currently in progress.
+     *
+     * \param script String of the Lua command to be saved
+     */
+    void saveScriptKeyframeToTimeline(std::string script);
+
+    /**
+     * \return The Lua library that contains all Lua functions available to affect the
+     *         interaction
+     */
+    static openspace::scripting::LuaLibrary luaLibrary();
+
+    /**
+     * Used to request a callback for notification of playback state change.
+     *
+     * \param cb Function handle for callback
+     * \return CallbackHandle value of callback number
+     */
+    CallbackHandle addStateChangeCallback(StateChangeCallback cb);
+
+    /**
+     * Removes the callback for notification of playback state change.
+     *
+     * \param callback Function handle for the callback
+     */
+    void removeStateChangeCallback(CallbackHandle handle);
+
+    /**
+     * Provides list of available playback files.
+     *
+     * \return Vector of filenames in recordings dir
+     */
+    std::vector<std::string> playbackList() const;
+
+    /**
+     * Since session recordings only record changes, the initial conditions aren't
+     * preserved when a playback starts. This function is called whenever a property value
+     * is set and a recording is in progress. Before the set happens, this function will
+     * read the current value of the property and store it so that when the recording is
+     * finished, the initial state will be added as a set property command at the
+     * beginning of the recording file, to be applied when playback starts.
+     *
+     * \param prop The property being set
+     */
+    void savePropertyBaseline(properties::Property& prop);
+
+private:
+    void tickPlayback(double dt);
+    void tickRecording(double dt);
+
+    void setupPlayback(double startTime);
+
+    void cleanUpTimelinesAndKeyframes();
+
+    void checkIfScriptUsesScenegraphNode(std::string_view s) const;
+
+
+    properties::BoolProperty _renderPlaybackInformation;
+    properties::BoolProperty _ignoreRecordedScale;
+    properties::BoolProperty _addModelMatrixinAscii;
+
+    struct {
+        double elapsedTime = 0.0;
+        bool isLooping = false;
+        bool playbackPausedWithDeltaTimePause = false;
+        bool waitForLoading = false;
+
+        struct {
+            bool enabled = false;
+            double deltaTime = 1.0 / 30.0;
+            std::chrono::steady_clock::time_point currentRecordedTime;
+            double currentApplicationTime = 0.0;
+        } saveScreenshots;
+    } _playback;
+
+    struct {
+        double elapsedTime = 0.0;
+    } _recording;
+
+    SessionState _state = SessionState::Idle;
+    SessionState _lastState = SessionState::Idle;
+
+
+    SessionRecording _timeline;
+    std::vector<SessionRecording::Entry>::const_iterator _currentEntry =
+        _timeline.entries.end();
+    std::unordered_map<std::string, std::string> _savePropertiesBaseline;
+    std::vector<std::string> _loadedNodes;
+
+    int _nextCallbackHandle = 0;
+    std::vector<std::pair<CallbackHandle, StateChangeCallback>> _stateChangeCallbacks;
+};
+
+} // namespace openspace::interaction
+
+#endif // __OPENSPACE_CORE___SESSIONRECORDINGHANDLER___H__
diff --git a/include/openspace/interaction/tasks/convertrecfileversiontask.h b/include/openspace/interaction/tasks/convertrecfileversiontask.h
deleted file mode 100644
index 5ae50c68ca..0000000000
--- a/include/openspace/interaction/tasks/convertrecfileversiontask.h
+++ /dev/null
@@ -1,55 +0,0 @@
-/*****************************************************************************************
- *                                                                                       *
- * OpenSpace                                                                             *
- *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
- *                                                                                       *
- * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
- * software and associated documentation files (the "Software"), to deal in the Software *
- * without restriction, including without limitation the rights to use, copy, modify,    *
- * merge, publish, distribute, sublicense, and/or sell copies of the Software, and to    *
- * permit persons to whom the Software is furnished to do so, subject to the following   *
- * conditions:                                                                           *
- *                                                                                       *
- * The above copyright notice and this permission notice shall be included in all copies *
- * or substantial portions of the Software.                                              *
- *                                                                                       *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED,   *
- * INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A         *
- * PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT    *
- * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF  *
- * CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE  *
- * OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                                         *
- ****************************************************************************************/
-
-#ifndef __OPENSPACE_CORE___CONVERTRECFILEVERSIONTASK___H__
-#define __OPENSPACE_CORE___CONVERTRECFILEVERSIONTASK___H__
-
-#include <openspace/util/task.h>
-#include <openspace/interaction/sessionrecording.h>
-
-#include <ghoul/glm.h>
-#include <filesystem>
-#include <string>
-
-namespace openspace::interaction {
-
-class ConvertRecFileVersionTask : public Task {
-public:
-    ConvertRecFileVersionTask(const ghoul::Dictionary& dictionary);
-    ~ConvertRecFileVersionTask() override;
-    std::string description() override;
-    void perform(const Task::ProgressCallback& progressCallback) override;
-    static documentation::Documentation documentation();
-    void convert();
-    SessionRecording* sessRec;
-
-private:
-    std::string _inFilename;
-    std::filesystem::path _inFilePath;
-    std::string _valueFunctionLua;
-};
-
-} // namespace openspace::interaction
-
-#endif // __OPENSPACE_CORE___CONVERTRECFILEVERSIONTASK___H__
diff --git a/include/openspace/interaction/tasks/convertrecformattask.h b/include/openspace/interaction/tasks/convertrecformattask.h
index be519c99f2..86d3539ca1 100644
--- a/include/openspace/interaction/tasks/convertrecformattask.h
+++ b/include/openspace/interaction/tasks/convertrecformattask.h
@@ -26,7 +26,7 @@
 #define __OPENSPACE_CORE___CONVERTRECFORMATTASK___H__
 
 #include <openspace/util/task.h>
-#include <openspace/interaction/sessionrecording.h>
+#include <openspace/interaction/sessionrecordinghandler.h>
 
 #include <ghoul/glm.h>
 #include <filesystem>
@@ -41,25 +41,15 @@ public:
         ToBinary
     };
     ConvertRecFormatTask(const ghoul::Dictionary& dictionary);
-    ~ConvertRecFormatTask() override;
+    ~ConvertRecFormatTask() override = default;
     std::string description() override;
     void perform(const Task::ProgressCallback& progressCallback) override;
     static documentation::Documentation documentation();
-    void convert();
 
 private:
-    void convertToAscii();
-    void convertToBinary();
-    void determineFormatType();
     std::filesystem::path _inFilePath;
     std::filesystem::path _outFilePath;
-    std::ifstream _iFile;
-    std::ofstream _oFile;
-    SessionRecording::DataMode _fileFormatType;
-    std::string _version;
-
-    std::string _valueFunctionLua;
-    SessionRecording* sessRec;
+    DataMode _dataMode;
 };
 
 } // namespace openspace::interaction
diff --git a/include/openspace/navigation/keyframenavigator.h b/include/openspace/navigation/keyframenavigator.h
index 76d1f58554..4e923dcdb5 100644
--- a/include/openspace/navigation/keyframenavigator.h
+++ b/include/openspace/navigation/keyframenavigator.h
@@ -57,6 +57,7 @@ public:
 
         CameraPose() = default;
         CameraPose(datamessagestructures::CameraKeyframe&& kf);
+        auto operator<=>(const CameraPose&) const = default;
     };
 
     /**
diff --git a/include/openspace/scene/scene.h b/include/openspace/scene/scene.h
index 38d77c931d..0c26ef79bf 100644
--- a/include/openspace/scene/scene.h
+++ b/include/openspace/scene/scene.h
@@ -241,7 +241,7 @@ public:
      * \return Vector of Property objs containing property names that matched the regex
      */
     std::vector<properties::Property*> propertiesMatchingRegex(
-        const std::string& propertyString);
+        std::string_view propertyString);
 
     /**
      * Returns a list of all unique tags that are used in the currently loaded scene.
diff --git a/include/openspace/scripting/scriptscheduler.h b/include/openspace/scripting/scriptscheduler.h
index 77f80e4c26..7e9198a171 100644
--- a/include/openspace/scripting/scriptscheduler.h
+++ b/include/openspace/scripting/scriptscheduler.h
@@ -120,19 +120,7 @@ public:
     std::vector<ScheduledScript> allScripts(
         std::optional<int> group = std::nullopt) const;
 
-    /**
-     * Sets the mode for how each scheduled script's timestamp will be interpreted.
-     * \param refType reference mode (for exact syntax, see definition of
-     * interaction::KeyframeTimeRef) which is either relative to the application start
-     * time, relative to the recorded session playback start time, or according to the
-     * absolute simulation time in seconds from J2000 epoch.
-     */
-    void setTimeReferenceMode(openspace::interaction::KeyframeTimeRef refType);
-
     static LuaLibrary luaLibrary();
-    void setModeApplicationTime();
-    void setModeRecordedTime();
-    void setModeSimulationTime();
 
     static documentation::Documentation Documentation();
 
@@ -143,9 +131,6 @@ private:
 
     int _currentIndex = 0;
     double _currentTime = 0;
-
-    openspace::interaction::KeyframeTimeRef _timeframeMode
-        = openspace::interaction::KeyframeTimeRef::Absolute_simTimeJ2000;
 };
 
 } // namespace openspace::scripting
diff --git a/modules/globebrowsing/src/renderableglobe.cpp b/modules/globebrowsing/src/renderableglobe.cpp
index 1d5cd71e9d..9c0693c1f0 100644
--- a/modules/globebrowsing/src/renderableglobe.cpp
+++ b/modules/globebrowsing/src/renderableglobe.cpp
@@ -33,7 +33,7 @@
 #include <openspace/documentation/documentation.h>
 #include <openspace/documentation/verifier.h>
 #include <openspace/engine/globals.h>
-#include <openspace/interaction/sessionrecording.h>
+#include <openspace/interaction/sessionrecordinghandler.h>
 #include <openspace/query/query.h>
 #include <openspace/rendering/renderengine.h>
 #include <openspace/scene/scenegraphnode.h>
@@ -1363,8 +1363,8 @@ void RenderableGlobe::renderChunks(const RenderData& data, RendererTasks&,
     }
     _localRenderer.program->deactivate();
 
-    if (global::sessionRecording->isSavingFramesDuringPlayback() &&
-        global::sessionRecording->shouldWaitForTileLoading())
+    if (global::sessionRecordingHandler->isSavingFramesDuringPlayback() &&
+        global::sessionRecordingHandler->shouldWaitForTileLoading())
     {
         // If our tile cache is very full, we assume we need to adjust the level of detail
         // dynamically to not keep rendering frames with unavailable data
diff --git a/modules/imgui/imguimodule.cpp b/modules/imgui/imguimodule.cpp
index 8031e560cf..4de4e8edcd 100644
--- a/modules/imgui/imguimodule.cpp
+++ b/modules/imgui/imguimodule.cpp
@@ -29,7 +29,7 @@
 #include <openspace/engine/globalscallbacks.h>
 #include <openspace/engine/moduleengine.h>
 #include <openspace/engine/windowdelegate.h>
-#include <openspace/interaction/sessionrecording.h>
+#include <openspace/interaction/sessionrecordinghandler.h>
 #include <openspace/navigation/navigationhandler.h>
 #include <openspace/network/parallelpeer.h>
 #include <openspace/rendering/dashboard.h>
@@ -258,7 +258,7 @@ void ImGUIModule::internalInitialize(const ghoul::Dictionary&) {
         global::screenSpaceRootPropertyOwner,
         global::moduleEngine,
         global::navigationHandler,
-        global::sessionRecording,
+        global::sessionRecordingHandler,
         global::timeManager,
         global::renderEngine,
         global::parallelPeer,
diff --git a/modules/server/include/topics/sessionrecordingtopic.h b/modules/server/include/topics/sessionrecordingtopic.h
index 7e7d7ce41c..48fc4b710b 100644
--- a/modules/server/include/topics/sessionrecordingtopic.h
+++ b/modules/server/include/topics/sessionrecordingtopic.h
@@ -27,7 +27,7 @@
 
 #include <modules/server/include/topics/topic.h>
 
-#include <openspace/interaction/sessionrecording.h>
+#include <openspace/interaction/sessionrecordinghandler.h>
 
 namespace openspace {
 
@@ -48,8 +48,8 @@ private:
     // Provides the idle/recording/playback state int value in json message
     void sendJsonData();
 
-    interaction::SessionRecording::SessionState _lastState =
-        interaction::SessionRecording::SessionState::Idle;
+    interaction::SessionRecordingHandler::SessionState _lastState =
+        interaction::SessionRecordingHandler::SessionState::Idle;
     int _stateCallbackHandle = UnsetOnChangeHandle;
     bool _isDone = false;
 };
diff --git a/modules/server/src/topics/sessionrecordingtopic.cpp b/modules/server/src/topics/sessionrecordingtopic.cpp
index 5b785a3e48..bf2660da91 100644
--- a/modules/server/src/topics/sessionrecordingtopic.cpp
+++ b/modules/server/src/topics/sessionrecordingtopic.cpp
@@ -51,7 +51,7 @@ SessionRecordingTopic::SessionRecordingTopic() {
 
 SessionRecordingTopic::~SessionRecordingTopic() {
     if (_stateCallbackHandle != UnsetOnChangeHandle) {
-        global::sessionRecording->removeStateChangeCallback(_stateCallbackHandle);
+        global::sessionRecordingHandler->removeStateChangeCallback(_stateCallbackHandle);
     }
 }
 
@@ -99,10 +99,10 @@ void SessionRecordingTopic::handleJson(const nlohmann::json& json) {
     sendJsonData();
 
     if (event == SubscribeEvent && _sendState) {
-        _stateCallbackHandle = global::sessionRecording->addStateChangeCallback(
+        _stateCallbackHandle = global::sessionRecordingHandler->addStateChangeCallback(
             [this]() {
-                const interaction::SessionRecording::SessionState currentState =
-                    global::sessionRecording->state();
+                const interaction::SessionRecordingHandler::SessionState currentState =
+                    global::sessionRecordingHandler->state();
                 if (currentState != _lastState) {
                     sendJsonData();
                     _lastState = currentState;
@@ -114,18 +114,17 @@ void SessionRecordingTopic::handleJson(const nlohmann::json& json) {
 
 void SessionRecordingTopic::sendJsonData() {
     json stateJson;
-    using SessionRecording = interaction::SessionRecording;
+    using SessionRecordingHandler = interaction::SessionRecordingHandler;
     if (_sendState) {
-        const SessionRecording::SessionState state = global::sessionRecording->state();
         std::string stateString;
-        switch (state) {
-            case SessionRecording::SessionState::Recording:
+        switch (global::sessionRecordingHandler->state()) {
+            case SessionRecordingHandler::SessionState::Recording:
                 stateString = "recording";
                 break;
-            case SessionRecording::SessionState::Playback:
+            case SessionRecordingHandler::SessionState::Playback:
                 stateString = "playing";
                 break;
-            case SessionRecording::SessionState::PlaybackPaused:
+            case SessionRecordingHandler::SessionState::PlaybackPaused:
                 stateString = "playing-paused";
                 break;
             default:
@@ -135,7 +134,7 @@ void SessionRecordingTopic::sendJsonData() {
         stateJson[StateKey] = stateString;
     };
     if (_sendFiles) {
-        stateJson[FilesKey] = global::sessionRecording->playbackList();
+        stateJson[FilesKey] = global::sessionRecordingHandler->playbackList();
     }
     if (!stateJson.empty()) {
         _connection->sendJson(wrappedPayload(stateJson));
diff --git a/modules/video/src/videoplayer.cpp b/modules/video/src/videoplayer.cpp
index 389fef2cfd..ddc0708e9d 100644
--- a/modules/video/src/videoplayer.cpp
+++ b/modules/video/src/videoplayer.cpp
@@ -29,7 +29,7 @@
 #include <openspace/engine/syncengine.h>
 #include <openspace/engine/moduleengine.h>
 #include <openspace/engine/windowdelegate.h>
-#include <openspace/interaction/sessionrecording.h>
+#include <openspace/interaction/sessionrecordinghandler.h>
 #include <openspace/rendering/renderengine.h>
 #include <openspace/util/time.h>
 #include <openspace/util/timemanager.h>
@@ -495,8 +495,8 @@ void VideoPlayer::update() {
         return;
     }
 
-    if (global::sessionRecording->isSavingFramesDuringPlayback()) {
-        const double dt = global::sessionRecording->fixedDeltaTimeDuringFrameOutput();
+    if (global::sessionRecordingHandler->isSavingFramesDuringPlayback()) {
+        const double dt = global::sessionRecordingHandler->fixedDeltaTimeDuringFrameOutput();
         if (_playbackMode == PlaybackMode::MapToSimulationTime) {
             _currentVideoTime = correctVideoPlaybackTime();
         }
diff --git a/modules/volume/linearlrucache.inl b/modules/volume/linearlrucache.inl
index 39fac068af..302a5b8cf0 100644
--- a/modules/volume/linearlrucache.inl
+++ b/modules/volume/linearlrucache.inl
@@ -51,7 +51,7 @@ void LinearLruCache<ValueType>::set(size_t key, ValueType value) {
 
 template <typename ValueType>
 ValueType& LinearLruCache<ValueType>::use(size_t key) {
-    auto& pair = _cache[key];
+    const auto& pair = _cache[key];
     const std::list<size_t>::iterator trackerIter = pair.second;
     _tracker.splice(_tracker.end(), _tracker, trackerIter);
     return pair.first;
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 3cf7b141b6..0c6468a574 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -58,16 +58,16 @@ set(OPENSPACE_SOURCE
   interaction/joystickcamerastates.cpp
   interaction/keybindingmanager.cpp
   interaction/keybindingmanager_lua.inl
-  interaction/keyframerecording.cpp
-  interaction/keyframerecording_lua.inl
+  interaction/keyframerecordinghandler.cpp
+  interaction/keyframerecordinghandler_lua.inl
   interaction/keyboardinputstate.cpp
   interaction/mousecamerastates.cpp
   interaction/scriptcamerastates.cpp
   interaction/sessionrecording.cpp
-  interaction/sessionrecording_lua.inl
+  interaction/sessionrecordinghandler.cpp
+  interaction/sessionrecordinghandler_lua.inl
   interaction/websocketinputstate.cpp
   interaction/websocketcamerastates.cpp
-  interaction/tasks/convertrecfileversiontask.cpp
   interaction/tasks/convertrecformattask.cpp
   mission/mission.cpp
   mission/missionmanager.cpp
@@ -252,14 +252,13 @@ set(OPENSPACE_HEADER
   ${PROJECT_SOURCE_DIR}/include/openspace/interaction/joystickcamerastates.h
   ${PROJECT_SOURCE_DIR}/include/openspace/interaction/keybindingmanager.h
   ${PROJECT_SOURCE_DIR}/include/openspace/interaction/keyboardinputstate.h
-  ${PROJECT_SOURCE_DIR}/include/openspace/interaction/keyframerecording.h
+  ${PROJECT_SOURCE_DIR}/include/openspace/interaction/keyframerecordinghandler.h
   ${PROJECT_SOURCE_DIR}/include/openspace/interaction/mousecamerastates.h
   ${PROJECT_SOURCE_DIR}/include/openspace/interaction/scriptcamerastates.h
   ${PROJECT_SOURCE_DIR}/include/openspace/interaction/sessionrecording.h
-  ${PROJECT_SOURCE_DIR}/include/openspace/interaction/sessionrecording.inl
+  ${PROJECT_SOURCE_DIR}/include/openspace/interaction/sessionrecordinghandler.h
   ${PROJECT_SOURCE_DIR}/include/openspace/interaction/websocketinputstate.h
   ${PROJECT_SOURCE_DIR}/include/openspace/interaction/websocketcamerastates.h
-  ${PROJECT_SOURCE_DIR}/include/openspace/interaction/tasks/convertrecfileversiontask.h
   ${PROJECT_SOURCE_DIR}/include/openspace/interaction/tasks/convertrecformattask.h
   ${PROJECT_SOURCE_DIR}/include/openspace/mission/mission.h
   ${PROJECT_SOURCE_DIR}/include/openspace/mission/missionmanager.h
diff --git a/src/documentation/core_registration.cpp b/src/documentation/core_registration.cpp
index ff209ccca3..5673548aae 100644
--- a/src/documentation/core_registration.cpp
+++ b/src/documentation/core_registration.cpp
@@ -32,8 +32,8 @@
 #include <openspace/events/eventengine.h>
 #include <openspace/interaction/actionmanager.h>
 #include <openspace/interaction/keybindingmanager.h>
-#include <openspace/interaction/keyframerecording.h>
-#include <openspace/interaction/sessionrecording.h>
+#include <openspace/interaction/keyframerecordinghandler.h>
+#include <openspace/interaction/sessionrecordinghandler.h>
 #include <openspace/mission/mission.h>
 #include <openspace/mission/missionmanager.h>
 #include <openspace/navigation/navigationhandler.h>
@@ -107,11 +107,11 @@ void registerCoreClasses(scripting::ScriptEngine& engine) {
     engine.addLibrary(Time::luaLibrary());
     engine.addLibrary(interaction::ActionManager::luaLibrary());
     engine.addLibrary(interaction::KeybindingManager::luaLibrary());
-    engine.addLibrary(interaction::KeyframeRecording::luaLibrary());
+    engine.addLibrary(interaction::KeyframeRecordingHandler::luaLibrary());
     engine.addLibrary(interaction::NavigationHandler::luaLibrary());
     engine.addLibrary(interaction::OrbitalNavigator::luaLibrary());
     engine.addLibrary(interaction::PathNavigator::luaLibrary());
-    engine.addLibrary(interaction::SessionRecording::luaLibrary());
+    engine.addLibrary(interaction::SessionRecordingHandler::luaLibrary());
     engine.addLibrary(scripting::ScriptScheduler::luaLibrary());
     engine.addLibrary(scripting::generalSystemCapabilities());
     engine.addLibrary(scripting::openglSystemCapabilities());
diff --git a/src/engine/globals.cpp b/src/engine/globals.cpp
index d9be116dc5..97745bdf94 100644
--- a/src/engine/globals.cpp
+++ b/src/engine/globals.cpp
@@ -35,10 +35,10 @@
 #include <openspace/interaction/actionmanager.h>
 #include <openspace/interaction/interactionmonitor.h>
 #include <openspace/interaction/keybindingmanager.h>
-#include <openspace/interaction/keyframerecording.h>
+#include <openspace/interaction/keyframerecordinghandler.h>
 #include <openspace/interaction/joystickinputstate.h>
 #include <openspace/interaction/websocketinputstate.h>
-#include <openspace/interaction/sessionrecording.h>
+#include <openspace/interaction/sessionrecordinghandler.h>
 #include <openspace/mission/missionmanager.h>
 #include <openspace/navigation/navigationhandler.h>
 #include <openspace/network/parallelpeer.h>
@@ -96,9 +96,9 @@ namespace {
         sizeof(interaction::JoystickInputStates) +
         sizeof(interaction::WebsocketInputStates) +
         sizeof(interaction::KeybindingManager) +
-        sizeof(interaction::KeyframeRecording) +
+        sizeof(interaction::KeyframeRecordingHandler) +
         sizeof(interaction::NavigationHandler) +
-        sizeof(interaction::SessionRecording) +
+        sizeof(interaction::SessionRecordingHandler) +
         sizeof(properties::PropertyOwner) +
         sizeof(properties::PropertyOwner) +
         sizeof(properties::PropertyOwner) +
@@ -317,11 +317,11 @@ void create() {
 #endif // WIN32
 
 #ifdef WIN32
-    keyframeRecording = new (currentPos) interaction::KeyframeRecording;
+    keyframeRecording = new (currentPos) interaction::KeyframeRecordingHandler;
     ghoul_assert(keyframeRecording, "No keyframeRecording");
-    currentPos += sizeof(interaction::KeyframeRecording);
+    currentPos += sizeof(interaction::KeyframeRecordingHandler);
 #else // ^^^ WIN32 / !WIN32 vvv
-    keyframeRecording = new interaction::KeyframeRecording;
+    keyframeRecording = new interaction::KeyframeRecordingHandler;
 #endif // WIN32
 
 #ifdef WIN32
@@ -333,11 +333,11 @@ void create() {
 #endif // WIN32
 
 #ifdef WIN32
-    sessionRecording = new (currentPos) interaction::SessionRecording(true);
-    ghoul_assert(sessionRecording, "No sessionRecording");
-    currentPos += sizeof(interaction::SessionRecording);
+    sessionRecordingHandler = new (currentPos) interaction::SessionRecordingHandler;
+    ghoul_assert(sessionRecordingHandler, "No sessionRecording");
+    currentPos += sizeof(interaction::SessionRecordingHandler);
 #else // ^^^ WIN32 / !WIN32 vvv
-    sessionRecording = new interaction::SessionRecording(true);
+    sessionRecordingHandler = new interaction::SessionRecordingHandler;
 #endif // WIN32
 
 #ifdef WIN32
@@ -399,7 +399,7 @@ void initialize() {
     rootPropertyOwner->addPropertySubOwner(global::navigationHandler);
     rootPropertyOwner->addPropertySubOwner(global::keyframeRecording);
     rootPropertyOwner->addPropertySubOwner(global::interactionMonitor);
-    rootPropertyOwner->addPropertySubOwner(global::sessionRecording);
+    rootPropertyOwner->addPropertySubOwner(global::sessionRecordingHandler);
     rootPropertyOwner->addPropertySubOwner(global::timeManager);
     rootPropertyOwner->addPropertySubOwner(global::scriptScheduler);
 
@@ -456,11 +456,11 @@ void destroy() {
     delete rootPropertyOwner;
 #endif // WIN32
 
-    LDEBUGC("Globals", "Destroying 'SessionRecording'");
+    LDEBUGC("Globals", "Destroying 'SessionRecordingHandler'");
 #ifdef WIN32
-    sessionRecording->~SessionRecording();
+    sessionRecordingHandler->~SessionRecordingHandler();
 #else // ^^^ WIN32 / !WIN32 vvv
-    delete sessionRecording;
+    delete sessionRecordingHandler;
 #endif // WIN32
 
     LDEBUGC("Globals", "Destroying 'NavigationHandler'");
@@ -470,9 +470,9 @@ void destroy() {
     delete navigationHandler;
 #endif // WIN32
 
-    LDEBUGC("Globals", "Destroying 'KeyframeRecording'");
+    LDEBUGC("Globals", "Destroying 'KeyframeRecordingHandler'");
 #ifdef WIN32
-    keyframeRecording->~KeyframeRecording();
+    keyframeRecording->~KeyframeRecordingHandler();
 #else // ^^^ WIN32 / !WIN32 vvv
     delete keyframeRecording;
 #endif // WIN32
diff --git a/src/engine/openspaceengine.cpp b/src/engine/openspaceengine.cpp
index ac7d32ca34..aaff37332b 100644
--- a/src/engine/openspaceengine.cpp
+++ b/src/engine/openspaceengine.cpp
@@ -40,8 +40,8 @@
 #include <openspace/interaction/actionmanager.h>
 #include <openspace/interaction/interactionmonitor.h>
 #include <openspace/interaction/keybindingmanager.h>
-#include <openspace/interaction/keyframerecording.h>
-#include <openspace/interaction/sessionrecording.h>
+#include <openspace/interaction/sessionrecordinghandler.h>
+#include <openspace/interaction/tasks/convertrecformattask.h>
 #include <openspace/navigation/navigationhandler.h>
 #include <openspace/navigation/orbitalnavigator.h>
 #include <openspace/navigation/waypoint.h>
@@ -63,6 +63,7 @@
 #include <openspace/util/memorymanager.h>
 #include <openspace/util/screenlog.h>
 #include <openspace/util/spicemanager.h>
+#include <openspace/util/task.h>
 #include <openspace/util/timemanager.h>
 #include <openspace/util/transformationmanager.h>
 #include <ghoul/ghoul.h>
@@ -231,6 +232,11 @@ OpenSpaceEngine::OpenSpaceEngine()
     addProperty(_fadeOnEnableDuration);
     addProperty(_disableAllMouseInputs);
 
+
+    ghoul::TemplateFactory<Task>* fTask = FactoryManager::ref().factory<Task>();
+    ghoul_assert(fTask, "No task factory existed");
+    fTask->registerClass<interaction::ConvertRecFormatTask>("ConvertRecFormatTask");
+
 #ifdef WIN32
     PDH_STATUS status = PdhOpenQueryA(nullptr, 0, &vramQuery);
     if (status != ERROR_SUCCESS) {
@@ -875,7 +881,6 @@ void OpenSpaceEngine::deinitialize() {
             global::renderEngine->scene()->camera()->syncables()
         );
     }
-    global::sessionRecording->deinitialize();
     global::versionChecker->cancel();
 
     _assetManager = nullptr;
@@ -1083,8 +1088,8 @@ void OpenSpaceEngine::preSynchronization() {
     global::syncEngine->preSynchronization(SyncEngine::IsMaster(master));
     if (master) {
         const double dt =
-            global::sessionRecording->isSavingFramesDuringPlayback() ?
-            global::sessionRecording->fixedDeltaTimeDuringFrameOutput() :
+            global::sessionRecordingHandler->isSavingFramesDuringPlayback() ?
+            global::sessionRecordingHandler->fixedDeltaTimeDuringFrameOutput() :
             global::windowDelegate->deltaTime();
 
         global::timeManager->preSynchronization(dt);
@@ -1113,8 +1118,7 @@ void OpenSpaceEngine::preSynchronization() {
                 camera->invalidateCache();
             }
         }
-        global::sessionRecording->preSynchronization();
-        global::keyframeRecording->preSynchronization(dt);
+        global::sessionRecordingHandler->preSynchronization(dt);
         global::parallelPeer->preSynchronization();
         global::interactionMonitor->updateActivityState();
     }
@@ -1263,7 +1267,7 @@ void OpenSpaceEngine::drawOverlays() {
     if (isGuiWindow) {
         global::renderEngine->renderOverlays(_shutdown);
         global::luaConsole->render();
-        global::sessionRecording->render();
+        global::sessionRecordingHandler->render();
     }
 
     for (const std::function<void()>& func : *global::callback::draw2D) {
diff --git a/src/interaction/keyframerecording.cpp b/src/interaction/keyframerecording.cpp
deleted file mode 100644
index 88d33e49d0..0000000000
--- a/src/interaction/keyframerecording.cpp
+++ /dev/null
@@ -1,430 +0,0 @@
-/*****************************************************************************************
- *                                                                                       *
- * OpenSpace                                                                             *
- *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
- *                                                                                       *
- * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
- * software and associated documentation files (the "Software"), to deal in the Software *
- * without restriction, including without limitation the rights to use, copy, modify,    *
- * merge, publish, distribute, sublicense, and/or sell copies of the Software, and to    *
- * permit persons to whom the Software is furnished to do so, subject to the following   *
- * conditions:                                                                           *
- *                                                                                       *
- * The above copyright notice and this permission notice shall be included in all copies *
- * or substantial portions of the Software.                                              *
- *                                                                                       *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED,   *
- * INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A         *
- * PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT    *
- * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF  *
- * CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE  *
- * OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                                         *
- ****************************************************************************************/
-
-#include <openspace/interaction/keyframerecording.h>
-
-#include <openspace/camera/camera.h>
-#include <openspace/engine/globals.h>
-#include <openspace/engine/windowdelegate.h>
-#include <openspace/navigation/navigationhandler.h>
-#include <openspace/navigation/orbitalnavigator.h>
-#include <openspace/scene/scene.h>
-#include <openspace/scene/scenegraphnode.h>
-#include <openspace/util/timemanager.h>
-#include <ghoul/filesystem/filesystem.h>
-#include <ghoul/glm.h>
-#include <algorithm>
-#include <iostream>
-
-#include "keyframerecording_lua.inl"
-
-namespace {
-    constexpr std::string_view _loggerCat = "KeyframeRecording";
-} // namespace
-
-namespace openspace::interaction::keys {
-    // These keys are const char* since nlohmann::json do not support string_view in .at()
-    constexpr const char* Camera = "camera";
-    constexpr const char* Position = "position";
-    constexpr const char* Rotation = "rotation";
-    constexpr const char* Scale = "scale";
-    constexpr const char* FollowFocusNodeRotation = "followFocusNodeRotation";
-    constexpr const char* FocusNode = "focusNode";
-
-    constexpr const char* Timestamp = "timestamp";
-    constexpr const char* Application = "application";
-    constexpr const char* Sequence = "sequence";
-    constexpr const char* Simulation = "simulation";
-    constexpr const char* X = "x";
-    constexpr const char* Y = "y";
-    constexpr const char* Z = "z";
-    constexpr const char* W = "w";
-}
-
-namespace openspace::interaction {
-
-void to_json(nlohmann::json& j, const KeyframeRecording::Keyframe& keyframe) {
-    nlohmann::json position = {
-        { keys::X, keyframe.camera.position.x },
-        { keys::Y, keyframe.camera.position.y },
-        { keys::Z, keyframe.camera.position.z },
-    };
-    nlohmann::json rotation = {
-        { keys::X, keyframe.camera.rotation.x },
-        { keys::Y, keyframe.camera.rotation.y },
-        { keys::Z, keyframe.camera.rotation.z },
-        { keys::W, keyframe.camera.rotation.w },
-    };
-    nlohmann::json camera = {
-        { keys::Position, position },
-        { keys::Rotation, rotation },
-        { keys::Scale, keyframe.camera.scale },
-        { keys::FollowFocusNodeRotation, keyframe.camera.followFocusNodeRotation },
-        { keys::FocusNode, keyframe.camera.focusNode }
-    };
-
-    nlohmann::json timestamp = {
-        { keys::Application, keyframe.timestamp.application },
-        { keys::Sequence, keyframe.timestamp.sequenceTime },
-        { keys::Simulation, keyframe.timestamp.simulation }
-    };
-
-    j = {
-        { keys::Camera, camera },
-        { keys::Timestamp, timestamp }
-    };
-}
-
-void from_json(const nlohmann::json& j, KeyframeRecording::Keyframe::TimeStamp& ts) {
-    j.at(keys::Application).get_to(ts.application);
-    j.at(keys::Sequence).get_to(ts.sequenceTime);
-    j.at(keys::Simulation).get_to(ts.simulation);
-}
-
-void from_json(const nlohmann::json& j, KeyframeNavigator::CameraPose& pose) {
-    j.at(keys::Position).at(keys::X).get_to(pose.position.x);
-    j.at(keys::Position).at(keys::Y).get_to(pose.position.y);
-    j.at(keys::Position).at(keys::Z).get_to(pose.position.z);
-
-    j.at(keys::Rotation).at(keys::X).get_to(pose.rotation.x);
-    j.at(keys::Rotation).at(keys::Y).get_to(pose.rotation.y);
-    j.at(keys::Rotation).at(keys::Z).get_to(pose.rotation.z);
-    j.at(keys::Rotation).at(keys::W).get_to(pose.rotation.w);
-
-    j.at(keys::FocusNode).get_to(pose.focusNode);
-    j.at(keys::Scale).get_to(pose.scale);
-    j.at(keys::FollowFocusNodeRotation).get_to(pose.followFocusNodeRotation);
-}
-
-void from_json(const nlohmann::json& j, KeyframeRecording::Keyframe& keyframe) {
-    j.at(keys::Camera).get_to(keyframe.camera);
-    j.at(keys::Timestamp).get_to(keyframe.timestamp);
-}
-
-KeyframeRecording::KeyframeRecording()
-    : properties::PropertyOwner({ "KeyframeRecording", "Keyframe Recording" })
-{}
-
-void KeyframeRecording::newSequence() {
-    _keyframes.clear();
-    _filename.clear();
-    LINFO("Created new sequence");
-}
-
-void KeyframeRecording::addKeyframe(double sequenceTime) {
-    ghoul_assert(sequenceTime >= 0, "Sequence time must be positive");
-
-    Keyframe keyframe = newKeyframe(sequenceTime);
-
-    auto it = std::find_if(
-        _keyframes.begin(),
-        _keyframes.end(),
-        [&sequenceTime](const Keyframe& entry) {
-            return sequenceTime < entry.timestamp.sequenceTime;
-        }
-    );
-    _keyframes.insert(it, keyframe);
-    LINFO(std::format(
-        "Added new keyframe {} at time: {}",
-        _keyframes.size() - 1 , sequenceTime
-    ));
-}
-
-void KeyframeRecording::removeKeyframe(int index) {
-    ghoul_assert(hasKeyframeRecording(), "Can't remove keyframe on empty sequence");
-
-    if (!isInRange(index)) {
-        LERROR(std::format("Index {} out of range", index));
-        return;
-    }
-    _keyframes.erase(_keyframes.begin() + index);
-    LINFO(std::format("Removed keyframe with index {}", index));
-}
-
-void KeyframeRecording::updateKeyframe(int index) {
-    ghoul_assert(hasKeyframeRecording(), "Can't update keyframe on empty sequence");
-
-    if (!isInRange(index)) {
-        LERROR(std::format("Index {} out of range", index));
-        return;
-    }
-    Keyframe old = _keyframes[index];
-    _keyframes[index] = newKeyframe(old.timestamp.sequenceTime);
-     LINFO(std::format("Update camera position of keyframe {}", index));
-}
-
-void KeyframeRecording::moveKeyframe(int index, double sequenceTime) {
-    ghoul_assert(hasKeyframeRecording(), "can't move keyframe on empty sequence");
-    ghoul_assert(sequenceTime >= 0, "Sequence time must be positive");
-
-    if (!isInRange(index)) {
-        LERROR(std::format("Index {} out of range", index));
-        return;
-    }
-    double oldSequenceTime = _keyframes[index].timestamp.sequenceTime;
-    _keyframes[index].timestamp.sequenceTime = sequenceTime;
-    sortKeyframes();
-    LINFO(std::format(
-        "Moved keyframe {} from sequence time: {} to {}",
-        index, oldSequenceTime, sequenceTime
-    ));
-}
-
-bool KeyframeRecording::saveSequence(std::optional<std::string> filename) {
-    ghoul_assert(hasKeyframeRecording(), "Keyframe sequence can't be empty");
-
-    // If we didn't specify any filename we save the one we currently have stored
-    if (filename.has_value()) {
-        _filename = filename.value();
-    }
-
-    if (_filename.empty()) {
-        LERROR("Failed to save file, reason: Invalid empty file name");
-        return false;
-    }
-
-    nlohmann::json sequence = _keyframes;
-    std::filesystem::path path = absPath(
-        std::format("${{RECORDINGS}}/{}.json", _filename)
-    );
-    std::ofstream ofs(path);
-    ofs << sequence.dump(2);
-    LINFO(std::format("Saved keyframe sequence to '{}'", path.string()));
-    return true;
-}
-
-void KeyframeRecording::loadSequence(std::string filename) {
-    std::filesystem::path path = absPath(
-        std::format("${{RECORDINGS}}/{}.json", filename)
-    );
-    if (!std::filesystem::exists(path)) {
-        LERROR(std::format("File '{}' does not exist", path));
-        return;
-    }
-
-    LINFO(std::format("Loading keyframe sequence from '{}'", path));
-    _keyframes.clear();
-    std::ifstream file(path);
-    std::vector<nlohmann::json> jsonKeyframes =
-        nlohmann::json::parse(file).get<std::vector<nlohmann::json>>();
-
-    for (const nlohmann::json& keyframeJson : jsonKeyframes) {
-        Keyframe keyframe = keyframeJson;
-        _keyframes.push_back(keyframe);
-    }
-    _filename = filename;
-}
-
-void KeyframeRecording::play() {
-    ghoul_assert(hasKeyframeRecording(), "Keyframe sequence can't be empty");
-
-    LINFO("Keyframe sequence playing");
-    _isPlaying = true;
-}
-
-void KeyframeRecording::pause() {
-    LINFO("Keyframe sequence paused");
-    _isPlaying = false;
-}
-
-void KeyframeRecording::setSequenceTime(double sequenceTime) {
-    ghoul_assert(sequenceTime >= 0, "Sequence time must be positive");
-
-    _sequenceTime = sequenceTime;
-    _hasStateChanged = true;
-    LINFO(std::format("Set sequence time to {}", sequenceTime));
-}
-
-void KeyframeRecording::jumpToKeyframe(int index) {
-    if (!isInRange(index)) {
-        LERROR(std::format("Index {} out of range", index));
-        return;
-    }
-    const double time = _keyframes[index].timestamp.sequenceTime;
-    LINFO(std::format("Jumped to keyframe {}", index));
-    setSequenceTime(time);
-}
-
-bool KeyframeRecording::hasKeyframeRecording() const {
-    return !_keyframes.empty();
-}
-
-std::vector<ghoul::Dictionary> KeyframeRecording::keyframes() const {
-    std::vector<ghoul::Dictionary> result;
-    for (const auto& keyframe : _keyframes) {
-        ghoul::Dictionary camera;
-        ghoul::Dictionary timestamp;
-        ghoul::Dictionary entry;
-        ghoul::Dictionary position;
-        ghoul::Dictionary rotation;
-
-        // Add each entry to position & rotation to avoid ambiguity on the client side
-        position.setValue(keys::X, keyframe.camera.position.x);
-        position.setValue(keys::Y, keyframe.camera.position.y);
-        position.setValue(keys::Z, keyframe.camera.position.z);
-        camera.setValue(keys::Position, position);
-
-        rotation.setValue(keys::X, static_cast<double>(keyframe.camera.rotation.x));
-        rotation.setValue(keys::Y, static_cast<double>(keyframe.camera.rotation.y));
-        rotation.setValue(keys::Z, static_cast<double>(keyframe.camera.rotation.z));
-        rotation.setValue(keys::W, static_cast<double>(keyframe.camera.rotation.w));
-        camera.setValue(keys::Rotation, rotation);
-
-        camera.setValue(keys::Scale, static_cast<double>(keyframe.camera.scale));
-        camera.setValue(keys::FocusNode, keyframe.camera.focusNode);
-        camera.setValue(keys::FollowFocusNodeRotation, keyframe.camera.followFocusNodeRotation);
-
-        timestamp.setValue(keys::Application, keyframe.timestamp.application);
-        timestamp.setValue(keys::Sequence, keyframe.timestamp.sequenceTime);
-        timestamp.setValue(keys::Simulation, keyframe.timestamp.simulation);
-
-        entry.setValue(keys::Camera, camera);
-        entry.setValue(keys::Timestamp, timestamp);
-        result.push_back(entry);
-    }
-    return result;
-}
-
-void KeyframeRecording::preSynchronization(double dt) {
-    if (_hasStateChanged) {
-        auto it = std::find_if(
-            _keyframes.rbegin(),
-            _keyframes.rend(),
-            [timestamp = _sequenceTime](const Keyframe& entry) {
-                return timestamp >= entry.timestamp.sequenceTime;
-            }
-        );
-
-        Keyframe currKeyframe;
-        Keyframe nextKeyframe;
-        double factor = 0.0;
-
-        // Before first keyframe
-        if (it == _keyframes.rend()) {
-            currKeyframe = nextKeyframe = _keyframes.front();
-        }
-        // At or after last keyframe
-        else if (it == _keyframes.rbegin()) {
-            currKeyframe = nextKeyframe = _keyframes.back();
-            _isPlaying = false;
-        }
-        else {
-            currKeyframe = *it;
-            nextKeyframe = *(--it);
-            double t0 = currKeyframe.timestamp.sequenceTime;
-            double t1 = nextKeyframe.timestamp.sequenceTime;
-            factor = (_sequenceTime - t0) / (t1 - t0);
-        }
-
-        interaction::KeyframeNavigator::CameraPose curr = currKeyframe.camera;
-        interaction::KeyframeNavigator::CameraPose next = nextKeyframe.camera;
-
-        Camera* camera = global::navigationHandler->camera();
-        Scene* scene = camera->parent()->scene();
-        SceneGraphNode* node = scene->sceneGraphNode(curr.focusNode);
-
-        global::navigationHandler->orbitalNavigator().setFocusNode(node);
-        interaction::KeyframeNavigator::updateCamera(
-            global::navigationHandler->camera(),
-            curr,
-            next,
-            factor,
-            false
-        );
-
-        _hasStateChanged = false;
-    }
-
-    if (_isPlaying) {
-        _sequenceTime += dt;
-        _hasStateChanged = true;
-    }
-}
-
-scripting::LuaLibrary KeyframeRecording::luaLibrary() {
-    return {
-        "keyframeRecording",
-        {
-            codegen::lua::NewSequence,
-            codegen::lua::AddKeyframe,
-            codegen::lua::RemoveKeyframe,
-            codegen::lua::UpdateKeyframe,
-            codegen::lua::MoveKeyframe,
-            codegen::lua::SaveSequence,
-            codegen::lua::LoadSequence,
-            codegen::lua::Play,
-            codegen::lua::Pause,
-            codegen::lua::Resume,
-            codegen::lua::SetTime,
-            codegen::lua::JumpToKeyframe,
-            codegen::lua::HasKeyframeRecording,
-            codegen::lua::Keyframes
-        }
-    };
-}
-
-void KeyframeRecording::sortKeyframes() {
-    std::sort(
-        _keyframes.begin(),
-        _keyframes.end(),
-        [](Keyframe lhs, Keyframe rhs) {
-            return lhs.timestamp.sequenceTime < rhs.timestamp.sequenceTime;
-        }
-    );
-}
-
-KeyframeRecording::Keyframe KeyframeRecording::newKeyframe(double sequenceTime) {
-    interaction::NavigationHandler& handler = *global::navigationHandler;
-    interaction::OrbitalNavigator& navigator = handler.orbitalNavigator();
-    const SceneGraphNode* node = navigator.anchorNode();
-
-    glm::dvec3 position = navigator.anchorNodeToCameraVector();
-    glm::dquat rotation = handler.camera()->rotationQuaternion();
-    float scale = handler.camera()->scaling();
-    bool followNodeRotation = navigator.followingAnchorRotation();
-
-    if (followNodeRotation) {
-        position = glm::inverse(node->worldRotationMatrix()) * position;
-        rotation = navigator.anchorNodeToCameraRotation();
-    }
-
-    Keyframe keyframe;
-    keyframe.camera.position = position;
-    keyframe.camera.rotation = rotation;
-    keyframe.camera.focusNode = navigator.anchorNode()->identifier();
-    keyframe.camera.scale = scale;
-    keyframe.camera.followFocusNodeRotation = followNodeRotation;
-
-    keyframe.timestamp.application = global::windowDelegate->applicationTime();
-    keyframe.timestamp.sequenceTime = sequenceTime;
-    keyframe.timestamp.simulation = global::timeManager->time().j2000Seconds();
-
-    return keyframe;
-}
-
-bool KeyframeRecording::isInRange(int index) const {
-    return index >= 0 && index < _keyframes.size();
-}
-
-} // namespace openspace::interaction
diff --git a/src/interaction/keyframerecording_lua.inl b/src/interaction/keyframerecording_lua.inl
deleted file mode 100644
index 94c8e37378..0000000000
--- a/src/interaction/keyframerecording_lua.inl
+++ /dev/null
@@ -1,190 +0,0 @@
-/*****************************************************************************************
- *                                                                                       *
- * OpenSpace                                                                             *
- *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
- *                                                                                       *
- * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
- * software and associated documentation files (the "Software"), to deal in the Software *
- * without restriction, including without limitation the rights to use, copy, modify,    *
- * merge, publish, distribute, sublicense, and/or sell copies of the Software, and to    *
- * permit persons to whom the Software is furnished to do so, subject to the following   *
- * conditions:                                                                           *
- *                                                                                       *
- * The above copyright notice and this permission notice shall be included in all copies *
- * or substantial portions of the Software.                                              *
- *                                                                                       *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED,   *
- * INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A         *
- * PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT    *
- * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF  *
- * CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE  *
- * OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                                         *
- ****************************************************************************************/
-
-#include <openspace/engine/globals.h>
-#include <optional>
-
-namespace {
-
-/**
- * Starts a new sequence of keyframes. Any previously loaded sequence is discarded.
- */
-[[codegen::luawrap]] void newSequence() {
-    openspace::global::keyframeRecording->newSequence();
-}
-
-/**
- * Adds a keyframe at the specified time in the sequence.
- *
- * \param sequenceTime The time at which to add the new keyframe in the sequence given in
- *                     seconds
- */
-[[codegen::luawrap]] void addKeyframe(double sequenceTime) {
-    if (sequenceTime < 0) {
-        throw ghoul::lua::LuaError("Error can't add keyframe with negative time value");
-    }
-    openspace::global::keyframeRecording->addKeyframe(sequenceTime);
-}
-
-/**
- * Removes a keyframe at the specified index.
- *
- * \param index The 0-based index of the keyframe to remove
- */
-[[codegen::luawrap]] void removeKeyframe(int index) {
-    if (!openspace::global::keyframeRecording->hasKeyframeRecording()) {
-        throw ghoul::lua::LuaError("Can't remove keyframe on empty sequence");
-    }
-    if (index < 0) {
-        throw ghoul::lua::LuaError("Index value must be positive");
-    }
-    openspace::global::keyframeRecording->removeKeyframe(index);
-}
-
-/**
- * Update the camera position of a keyframe at the specified index.
- *
- * \param index The 0-based index of the keyframe to update
- */
-[[codegen::luawrap]] void updateKeyframe(int index) {
-    if (!openspace::global::keyframeRecording->hasKeyframeRecording()) {
-        throw ghoul::lua::LuaError("Can't update keyframe on empty sequence");
-    }
-    if (index < 0) {
-        throw ghoul::lua::LuaError("Index value must be positive");
-    }
-    openspace::global::keyframeRecording->updateKeyframe(index);
-}
-
-/**
- * Move an existing keyframe in time.
- *
- * \param index The index of the keyframe to move
- * \param sequenceTime The new time in seconds to update the keyframe to
- */
-[[codegen::luawrap]] void moveKeyframe(int index, double sequenceTime) {
-    if (!openspace::global::keyframeRecording->hasKeyframeRecording()) {
-        throw ghoul::lua::LuaError("Can't move keyframe on empty sequence");
-    }
-    if (index < 0) {
-        throw ghoul::lua::LuaError("Index value must be positive");
-    }
-    if (sequenceTime < 0) {
-        throw ghoul::lua::LuaError("Error can't add keyframe with negative time value");
-    }
-    openspace::global::keyframeRecording->moveKeyframe(index, sequenceTime);
-}
-
-/**
- * Saves the current sequence of keyframes to disk by the optionally specified `filename`.
- * `filename` can be omitted if the sequence was previously saved or loaded from file.
- *
- * \param filename The name of the file to save
- */
-[[codegen::luawrap]] void saveSequence(std::optional<std::string> filename) {
-    if (!openspace::global::keyframeRecording->hasKeyframeRecording()) {
-        throw ghoul::lua::LuaError("No keyframe sequence to save");
-    }
-    openspace::global::keyframeRecording->saveSequence(filename);
-}
-
-/**
- * Loads a keyframe recording sequence from the specified file.
- *
- * \param filename The name of the file to load
- */
-[[codegen::luawrap]] void loadSequence(std::string filename) {
-    openspace::global::keyframeRecording->loadSequence(std::move(filename));
-}
-
-/**
- * Playback keyframe recording sequence optionally from the specified `sequenceTime` or if
- * not specified starts playing from the beginning.
- *
- * \param sequenceTime The time in seconds at which to start playing the sequence. If
- *                     omitted, the playback starts at the beginning of the sequence.
- */
-[[codegen::luawrap]] void play(std::optional<double> sequenceTime) {
-    if (!openspace::global::keyframeRecording->hasKeyframeRecording()) {
-        throw ghoul::lua::LuaError("No keyframe sequence to play");
-    }
-    openspace::global::keyframeRecording->setSequenceTime(sequenceTime.value_or(0.0));
-    openspace::global::keyframeRecording->play();
-}
-
-/**
- * Pauses a playing keyframe recording sequence.
- */
-[[codegen::luawrap]] void pause() {
-    openspace::global::keyframeRecording->pause();
-}
-
-/**
- * Resume playing a keyframe recording sequence that has been paused.
- */
-[[codegen::luawrap]] void resume() {
-    openspace::global::keyframeRecording->play();
-}
-
-/**
- * Jumps to a specified time within the keyframe recording sequence.
- *
- * \param sequenceTime The time in seconds to jump to
- */
-[[codegen::luawrap]] void setTime(double sequenceTime) {
-    if (sequenceTime < 0) {
-        throw ghoul::lua::LuaError("Sequence time must be greater or equal than 0");
-    }
-    openspace::global::keyframeRecording->setSequenceTime(sequenceTime);
-}
-
-/**
- * Jumps to a specified keyframe within the keyframe recording sequence.
- *
- * \param index The index of the keyframe to jump to
- */
-[[codegen::luawrap]] void jumpToKeyframe(int index) {
-    if (index < 0) {
-        throw ghoul::lua::LuaError("Index must be positive");
-    }
-    openspace::global::keyframeRecording->jumpToKeyframe(index);
-}
-
-/**
- * Returns true if there currently is a sequence loaded, otherwise false.
- */
-[[codegen::luawrap]] bool hasKeyframeRecording() {
-    return openspace::global::keyframeRecording->hasKeyframeRecording();
-}
-
-/**
- * Fetches the sequence keyframes as a JSON object.
- */
-[[codegen::luawrap]] std::vector<ghoul::Dictionary> keyframes() {
-    return openspace::global::keyframeRecording->keyframes();
-}
-
-#include "keyframerecording_lua_codegen.cpp"
-
-} // namespace
diff --git a/src/interaction/keyframerecordinghandler.cpp b/src/interaction/keyframerecordinghandler.cpp
new file mode 100644
index 0000000000..5ba3eff36b
--- /dev/null
+++ b/src/interaction/keyframerecordinghandler.cpp
@@ -0,0 +1,166 @@
+/*****************************************************************************************
+ *                                                                                       *
+ * OpenSpace                                                                             *
+ *                                                                                       *
+ * Copyright (c) 2014-2024                                                               *
+ *                                                                                       *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
+ * software and associated documentation files (the "Software"), to deal in the Software *
+ * without restriction, including without limitation the rights to use, copy, modify,    *
+ * merge, publish, distribute, sublicense, and/or sell copies of the Software, and to    *
+ * permit persons to whom the Software is furnished to do so, subject to the following   *
+ * conditions:                                                                           *
+ *                                                                                       *
+ * The above copyright notice and this permission notice shall be included in all copies *
+ * or substantial portions of the Software.                                              *
+ *                                                                                       *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED,   *
+ * INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A         *
+ * PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT    *
+ * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF  *
+ * CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE  *
+ * OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                                         *
+ ****************************************************************************************/
+
+#include <openspace/interaction/keyframerecordinghandler.h>
+
+#include <openspace/interaction/sessionrecordinghandler.h>
+#include <openspace/network/messagestructureshelper.h>
+#include <openspace/util/timemanager.h>
+
+#include "keyframerecordinghandler_lua.inl"
+
+namespace {
+    constexpr std::string_view _loggerCat = "KeyframeRecording";
+} // namespace
+
+namespace openspace::interaction {
+
+KeyframeRecordingHandler::KeyframeRecordingHandler()
+    : properties::PropertyOwner({ "KeyframeRecording", "Keyframe Recording" })
+{}
+
+void KeyframeRecordingHandler::newSequence() {
+    _timeline = SessionRecording();
+}
+
+void KeyframeRecordingHandler::addCameraKeyframe(double sequenceTime) {
+    using namespace datamessagestructures;
+    CameraKeyframe kf = datamessagestructures::generateCameraKeyframe();
+
+    SessionRecording::Entry entry = {
+        sequenceTime,
+        global::timeManager->time().j2000Seconds(),
+        KeyframeNavigator::CameraPose(std::move(kf))
+    };
+
+    auto it = std::upper_bound(
+        _timeline.entries.begin(),
+        _timeline.entries.end(),
+        sequenceTime,
+        [](double value, const SessionRecording::Entry& e) {
+            return value < e.timestamp;
+        }
+    );
+    _timeline.entries.insert(it, std::move(entry));
+}
+
+void KeyframeRecordingHandler::addScriptKeyframe(double sequenceTime, std::string script)
+{
+    SessionRecording::Entry entry = {
+        sequenceTime,
+        global::timeManager->time().j2000Seconds(),
+        std::move(script)
+    };
+
+    auto it = std::upper_bound(
+        _timeline.entries.begin(),
+        _timeline.entries.end(),
+        sequenceTime,
+        [](double value, const SessionRecording::Entry& e) {
+            return value < e.timestamp;
+        }
+    );
+    _timeline.entries.insert(it, std::move(entry));
+}
+
+void KeyframeRecordingHandler::removeKeyframe(int index) {
+    if (index < 0 || static_cast<size_t>(index) >(_timeline.entries.size() - 1)) {
+        throw ghoul::RuntimeError(std::format("Index {} out of range", index));
+    }
+    _timeline.entries.erase(_timeline.entries.begin() + index);
+}
+
+void KeyframeRecordingHandler::updateKeyframe(int index) {
+    using namespace datamessagestructures;
+    if (index < 0 || static_cast<size_t>(index) > (_timeline.entries.size() - 1)) {
+        throw ghoul::RuntimeError(std::format("Index {} out of range", index));
+    }
+
+    SessionRecording::Entry& entry = _timeline.entries[index];
+    if (!std::holds_alternative<SessionRecording::Entry::Camera>(entry.value)) {
+        throw ghoul::RuntimeError(std::format("Index {} is not a camera frame", index));
+    }
+    auto& camera = std::get<SessionRecording::Entry::Camera>(entry.value);
+    camera = KeyframeNavigator::CameraPose(generateCameraKeyframe());
+}
+
+void KeyframeRecordingHandler::moveKeyframe(int index, double sequenceTime) {
+    if (index < 0 || static_cast<size_t>(index) >(_timeline.entries.size() - 1)) {
+        throw ghoul::RuntimeError(std::format("Index {} out of range", index));
+    }
+
+    _timeline.entries[index].timestamp = sequenceTime;
+    std::sort(
+        _timeline.entries.begin(),
+        _timeline.entries.end(),
+        [](const SessionRecording::Entry& lhs, const SessionRecording::Entry& rhs) {
+            return lhs.timestamp < rhs.timestamp;
+        }
+    );
+}
+
+void KeyframeRecordingHandler::saveSequence(std::filesystem::path filename) {
+    if (filename.empty()) {
+        throw ghoul::RuntimeError("Failed to save file, reason: Invalid empty file name");
+    }
+
+    saveSessionRecording(filename, _timeline, DataMode::Ascii);
+}
+
+void KeyframeRecordingHandler::loadSequence(std::filesystem::path filename) {
+    _timeline = loadSessionRecording(filename);
+}
+
+void KeyframeRecordingHandler::play() {
+    global::sessionRecordingHandler->startPlayback(_timeline, false, false, std::nullopt);
+}
+
+bool KeyframeRecordingHandler::hasKeyframeRecording() const {
+    return !_timeline.entries.empty();
+}
+
+std::vector<ghoul::Dictionary> KeyframeRecordingHandler::keyframes() const {
+    return sessionRecordingToDictionary(_timeline);
+}
+
+scripting::LuaLibrary KeyframeRecordingHandler::luaLibrary() {
+    return {
+        "keyframeRecording",
+        {
+            codegen::lua::NewSequence,
+            codegen::lua::AddCameraKeyframe,
+            codegen::lua::AddScriptKeyframe,
+            codegen::lua::RemoveKeyframe,
+            codegen::lua::UpdateKeyframe,
+            codegen::lua::MoveKeyframe,
+            codegen::lua::SaveSequence,
+            codegen::lua::LoadSequence,
+            codegen::lua::Play,
+            codegen::lua::Pause,
+            codegen::lua::Keyframes
+        }
+    };
+}
+
+} // namespace openspace::interaction
diff --git a/src/interaction/keyframerecordinghandler_lua.inl b/src/interaction/keyframerecordinghandler_lua.inl
new file mode 100644
index 0000000000..a2d3ad600f
--- /dev/null
+++ b/src/interaction/keyframerecordinghandler_lua.inl
@@ -0,0 +1,108 @@
+/*****************************************************************************************
+ *                                                                                       *
+ * OpenSpace                                                                             *
+ *                                                                                       *
+ * Copyright (c) 2014-2023                                                               *
+ *                                                                                       *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
+ * software and associated documentation files (the "Software"), to deal in the Software *
+ * without restriction, including without limitation the rights to use, copy, modify,    *
+ * merge, publish, distribute, sublicense, and/or sell copies of the Software, and to    *
+ * permit persons to whom the Software is furnished to do so, subject to the following   *
+ * conditions:                                                                           *
+ *                                                                                       *
+ * The above copyright notice and this permission notice shall be included in all copies *
+ * or substantial portions of the Software.                                              *
+ *                                                                                       *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED,   *
+ * INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A         *
+ * PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT    *
+ * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF  *
+ * CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE  *
+ * OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                                         *
+ ****************************************************************************************/
+
+#include <openspace/engine/globals.h>
+#include <optional>
+
+namespace {
+
+// Starts a new sequence of keyframes, any previously loaded sequence is discarded
+[[codegen::luawrap]] void newSequence() {
+    using namespace openspace;
+    global::keyframeRecording->newSequence();
+}
+
+// Adds a keyframe at the specified sequence-time
+[[codegen::luawrap]] void addCameraKeyframe(double sequenceTime) {
+    using namespace openspace;
+    global::keyframeRecording->addCameraKeyframe(sequenceTime);
+}
+
+// Adds a keyframe at the specified sequence-time
+[[codegen::luawrap]] void addScriptKeyframe(double sequenceTime, std::string script) {
+    using namespace openspace;
+    global::keyframeRecording->addScriptKeyframe(sequenceTime, std::move(script));
+}
+
+// Removes a keyframe at the specified 0-based index
+[[codegen::luawrap]] void removeKeyframe(int index) {
+    using namespace openspace;
+    global::keyframeRecording->removeKeyframe(index);
+}
+
+// Update the camera position at keyframe specified by the 0-based index
+[[codegen::luawrap]] void updateKeyframe(int index) {
+    using namespace openspace;
+    global::keyframeRecording->updateKeyframe(index);
+}
+
+// Move keyframe of `index` to the new specified `sequenceTime`
+[[codegen::luawrap]] void moveKeyframe(int index, double sequenceTime) {
+    using namespace openspace;
+    global::keyframeRecording->moveKeyframe(index, sequenceTime);
+}
+
+// Saves the current sequence of keyframes to disk by the optionally specified `filename`.
+[[codegen::luawrap]] void saveSequence(std::filesystem::path filename) {
+    using namespace openspace;
+    global::keyframeRecording->saveSequence(std::move(filename));
+}
+
+// Loads a sequence from the specified file
+[[codegen::luawrap]] void loadSequence(std::filesystem::path filename) {
+    using namespace openspace;
+    global::keyframeRecording->loadSequence(std::move(filename));
+}
+
+// Playback sequence optionally from the specified `sequenceTime` or if not specified
+// starts playing from the current time set within the sequence
+[[codegen::luawrap]] void play(std::optional<double> sequenceTime) {
+    using namespace openspace;
+
+    global::keyframeRecording->play();
+    if (sequenceTime.has_value()) {
+        global::sessionRecordingHandler->seek(*sequenceTime);
+    }
+}
+
+// Pauses a playing sequence
+[[codegen::luawrap]] void pause() {
+    using namespace openspace;
+    global::sessionRecordingHandler->setPlaybackPause(true);
+}
+
+// Returns `true` if there currently is a sequence loaded, otherwise `false`
+[[codegen::luawrap]] bool hasKeyframeRecording() {
+    using namespace openspace;
+    return global::keyframeRecording->hasKeyframeRecording();
+}
+
+[[codegen::luawrap]] std::vector<ghoul::Dictionary> keyframes() {
+    using namespace openspace;
+    return global::keyframeRecording->keyframes();
+}
+
+#include "keyframerecordinghandler_lua_codegen.cpp"
+
+} // namespace
diff --git a/src/interaction/sessionrecording.cpp b/src/interaction/sessionrecording.cpp
index d1b2322c04..3b579ae726 100644
--- a/src/interaction/sessionrecording.cpp
+++ b/src/interaction/sessionrecording.cpp
@@ -24,2622 +24,677 @@
 
 #include <openspace/interaction/sessionrecording.h>
 
-#include <openspace/camera/camera.h>
-#include <openspace/engine/globals.h>
-#include <openspace/engine/openspaceengine.h>
-#include <openspace/engine/windowdelegate.h>
-#include <openspace/events/eventengine.h>
-#include <openspace/interaction/tasks/convertrecfileversiontask.h>
-#include <openspace/interaction/tasks/convertrecformattask.h>
-#include <openspace/navigation/keyframenavigator.h>
-#include <openspace/navigation/navigationhandler.h>
-#include <openspace/navigation/orbitalnavigator.h>
-#include <openspace/network/messagestructureshelper.h>
-#include <openspace/query/query.h>
-#include <openspace/rendering/luaconsole.h>
-#include <openspace/rendering/renderable.h>
-#include <openspace/rendering/renderengine.h>
-#include <openspace/scene/scene.h>
-#include <openspace/scripting/scriptengine.h>
-#include <openspace/scripting/scriptscheduler.h>
-#include <openspace/util/factorymanager.h>
-#include <openspace/util/task.h>
-#include <openspace/util/timemanager.h>
-#include <ghoul/filesystem/file.h>
-#include <ghoul/filesystem/filesystem.h>
-#include <ghoul/font/fontmanager.h>
-#include <ghoul/font/fontrenderer.h>
 #include <ghoul/glm.h>
-#include <ghoul/logging/logmanager.h>
-#include <ghoul/misc/profiling.h>
-#include <ghoul/misc/stringhelper.h>
-#include <algorithm>
-#include <filesystem>
-#include <iomanip>
-
-#ifdef WIN32
-#include <Windows.h>
-#endif // WIN32
-
-#include "sessionrecording_lua.inl"
+#include <ghoul/misc/assert.h>
+#include <array>
+#include <format>
+#include <optional>
 
 namespace {
-    constexpr std::string_view _loggerCat = "SessionRecording";
+    template <class... Ts> struct overloaded : Ts... { using Ts::operator()...; };
+    template <class... Ts> overloaded(Ts...) -> overloaded<Ts...>;
 
-    constexpr bool UsingTimeKeyframes = false;
+    using namespace openspace::interaction;
 
-    constexpr openspace::properties::Property::PropertyInfo RenderPlaybackInfo = {
-        "RenderInfo",
-        "Render Playback Information",
-        "If enabled, information about a currently played back session recording is "
-        "rendering to screen.",
-        openspace::properties::Property::Visibility::AdvancedUser
+    class LoadingError : public ghoul::RuntimeError {
+    public:
+        LoadingError(std::string error_, std::filesystem::path file_, int entry_)
+            : ghoul::RuntimeError(
+                std::format(
+                    "Error loading session recording '{}' (entry #{}): {}",
+                    file_, entry_, error_
+                ),
+                "SessionRecording"
+            )
+            , error(std::move(error_))
+            , file(std::move(file_))
+            , entry(entry_)
+        {}
+
+        LoadingError(std::string error_, std::filesystem::path file_)
+            : ghoul::RuntimeError(
+                std::format("Error loading session recording '{}': {}", file_, error_),
+                "SessionRecording"
+            )
+            , error(std::move(error_))
+            , file(std::move(file_))
+        {}
+
+        explicit LoadingError(std::string error_)
+            : ghoul::RuntimeError(error_, "SessionRecording")
+            , error(std::move(error_))
+        {}
+
+        std::string error;
+        std::filesystem::path file;
+        int entry = -1;
     };
 
-    constexpr openspace::properties::Property::PropertyInfo IgnoreRecordedScaleInfo = {
-        "IgnoreRecordedScale",
-        "Ignore Recorded Scale",
-        "If this value is enabled, the scale value from a recording is ignored and the "
-        "computed values are used instead.",
-        openspace::properties::Property::Visibility::AdvancedUser
+    constexpr std::string_view FrameTypeCameraAscii = "camera";
+    constexpr std::string_view FrameTypeScriptAscii = "script";
+    constexpr std::string_view FrameTypeCommentAscii = "#";
+    constexpr char FrameTypeCameraBinary = 'c';
+    constexpr char FrameTypeScriptBinary = 's';
+
+    // Mapping for version numbers in session recording files
+    constexpr std::array<std::pair<std::string_view, int>, 3> Versions = {
+        std::pair("00.85", 0),
+        std::pair("01.00", 1),
+        std::pair("02.00", 2)
     };
 
-    constexpr openspace::properties::Property::PropertyInfo AddModelMatrixinAsciiInfo = {
-        "AddModelMatrixinAscii",
-        "Add Model Matrix in ASCII recording",
-        "If this is 'true', the model matrix is written into the ASCII recording format "
-        "in the line before each camera keyframe. The model matrix is the full matrix "
-        "that converts the position into a J2000+Galactic reference frame.",
-        openspace::properties::Property::Visibility::Developer
+
+    //
+    // Header information
+    //
+    struct Header {
+        static constexpr std::string_view MagicBytes = "OpenSpace_record/playback";
+        static constexpr char DataModeAscii = 'A';
+        static constexpr char DataModeBinary = 'B';
+
+        int version;
+        DataMode dataMode = DataMode::Ascii;
     };
+
+    Header readHeader(std::istream& stream, const std::filesystem::path& filename) {
+        Header result;
+
+        // Read magic title bytes that must always be the same
+        std::string magicBytes;
+        magicBytes.resize(Header::MagicBytes.size());
+        stream.read(magicBytes.data(), Header::MagicBytes.size());
+        if (!stream || magicBytes != Header::MagicBytes) {
+            throw LoadingError("Error loading header magic bytes", filename);
+        }
+
+        // Read the version of the session recording
+        std::string version;
+        constexpr int VersionLength = 5 * sizeof(std::byte);
+        version.resize(VersionLength);
+        stream.read(version.data(), VersionLength);
+        if (!stream) {
+            throw LoadingError("Error loading header version information", filename);
+        }
+        result.version = [&version, &filename]() {
+            for (const std::pair<std::string_view, int>& p : Versions) {
+                if (p.first == version) {
+                    return p.second;
+                }
+            }
+            throw LoadingError(std::format("Unsupported version {}", version), filename);
+        }();
+
+        // Read whether the rest of the file is in ASCII or binary mode
+        char dataMode = 0;
+        stream.read(&dataMode, sizeof(char));
+        const bool goodDataMode =
+            dataMode == Header::DataModeAscii || dataMode == Header::DataModeBinary;
+        if (!stream || !goodDataMode) {
+            throw LoadingError("Error loading header data mode", filename);
+        }
+        result.dataMode =
+            (dataMode == Header::DataModeAscii) ? DataMode::Ascii : DataMode::Binary;
+
+        // Skip over the line ending
+        char buffer = 0;
+        stream.read(&buffer, sizeof(char));
+        if (buffer == '\r') {
+            // Skip over the following \n as well as we have a DOS line ending
+            stream.seekg(1, std::ios::cur);
+        }
+
+        return result;
+    }
+
+    void writeHeader(std::ostream& stream, const Header& header) { 
+        stream.write(Header::MagicBytes.data(), Header::MagicBytes.size());
+
+        std::string_view version = [&header]() {
+            for (const std::pair<std::string_view, int>& p : Versions) {
+                if (p.second == header.version) {
+                    return p.first;
+                }
+            }
+            throw std::logic_error(std::format("Unsupported version {}", header.version));
+        }();
+        stream.write(version.data(), version.size());
+
+        const char dataMode =
+            header.dataMode == DataMode::Ascii ?
+            Header::DataModeAscii :
+            Header::DataModeBinary;
+        stream.write(&dataMode, sizeof(char));
+
+        stream.write("\n", sizeof(char));
+    }
+
+
+    //
+    // Type of the frame
+    //
+    enum class FrameType {
+        Camera,
+        Script
+    };
+
+    template <DataMode mode>
+    std::optional<FrameType> readFrameType(std::istream&, int) {
+        static_assert(sizeof(int) == 0, "Unimplemented overload");
+    }
+
+    template <>
+    std::optional<FrameType> readFrameType<DataMode::Ascii>(std::istream& stream, int) {
+        std::string frameType;
+        stream >> frameType;
+
+        if (!stream || frameType.empty()) {
+            // Reading the frame type is the first action when reading a frame so we have
+            // to check here if we have reached the end of the file. This is either
+            // signalled by the stream ending (if there no terminating empty line) or by
+            // the `frameType` being empty (if there is a terminating empty line)
+            return std::nullopt;
+        }
+
+        if (frameType == FrameTypeCameraAscii) {
+            return FrameType::Camera;
+        }
+        else if (frameType == FrameTypeScriptAscii) {
+            return FrameType::Script;
+        }
+        else {
+            throw LoadingError(std::format("Unrecognized frame '{}'", frameType));
+        }
+    }
+
+    template <>
+    std::optional<FrameType> readFrameType<DataMode::Binary>(std::istream& stream, int) {
+        char frameType = 0;
+        stream.read(&frameType, sizeof(char));
+
+        if (!stream) {
+            // Reading the frame type is the first action when reading a frame so we have
+            // to check here if we have reached the end of the file.
+            return std::nullopt;
+        }
+
+        switch (frameType) {
+            case FrameTypeCameraBinary:
+                return FrameType::Camera;
+            case FrameTypeScriptBinary:
+                return FrameType::Script;
+            default:
+                throw LoadingError(std::format("Unrecognized frame '{}'", frameType));
+        }
+    }
+
+    template <DataMode mode>
+    void writeFrameType(std::ostream&, const FrameType&) {
+        static_assert(sizeof(int) == 0, "Unimplemented overload");
+    }
+
+    template <>
+    void writeFrameType<DataMode::Ascii>(std::ostream& stream, const FrameType& type) {
+        switch (type) {
+            case FrameType::Camera:
+                stream.write(FrameTypeCameraAscii.data(), FrameTypeCameraAscii.size());
+                break;
+            case FrameType::Script:
+                stream.write(FrameTypeScriptAscii.data(), FrameTypeScriptAscii.size());
+                break;
+        }
+    }
+
+    template <>
+    void writeFrameType<DataMode::Binary>(std::ostream& stream, const FrameType& type) {
+        switch (type) {
+            case FrameType::Camera:
+                stream.write(&FrameTypeCameraBinary, sizeof(char));
+                break;
+            case FrameType::Script:
+                stream.write(&FrameTypeScriptBinary, sizeof(char));
+                break;
+        }
+    }
+
+    //
+    // Reading the first part of an entry
+    //
+    struct Timestamps {
+        double timestamp = 0.0;
+        double simulationTime = 0.0;
+    };
+
+    // Not defined on purpose
+    template <DataMode mode>
+    Timestamps readTimestamps(std::istream&, int);
+
+    template <>
+    Timestamps readTimestamps<DataMode::Ascii>(std::istream& stream, int version) {
+        Timestamps result;
+        if (version < 2) {
+            double dummy; // previously `times.timeOs`
+            stream >> dummy;
+        }
+
+        stream >> result.timestamp >> result.simulationTime;
+        return result;
+    }
+
+    template <>
+    Timestamps readTimestamps<DataMode::Binary>(std::istream& stream, int version) {
+        Timestamps result;
+        if (version < 2) {
+            stream.seekg(sizeof(double), std::ios::cur); // previously `times.timeOs`
+        }
+        stream.read(reinterpret_cast<char*>(&result.timestamp), sizeof(double));
+        stream.read(reinterpret_cast<char*>(&result.simulationTime), sizeof(double));
+        return result;
+    }
+
+    // Not defined on purpose
+    template <DataMode mode>
+    void writeTimestamps(std::ostream&, const Timestamps&);
+
+    template <>
+    void writeTimestamps<DataMode::Ascii>(std::ostream& stream,
+                                          const Timestamps& timestamps)
+    {
+        std::string buffer = std::format(
+            "{} {}", timestamps.timestamp, timestamps.simulationTime
+        );
+        stream.write(buffer.data(), buffer.size());
+    }
+
+    template <>
+    void writeTimestamps<DataMode::Binary>(std::ostream& stream,
+                                           const Timestamps& timestamps)
+    {
+        stream.write(
+            reinterpret_cast<const char*>(&timestamps.timestamp),
+            sizeof(double)
+        );
+        stream.write(
+            reinterpret_cast<const char*>(&timestamps.simulationTime),
+            sizeof(double)
+        );
+    }
+
+
+    //
+    // Camera frames
+    //
+
+    // Not defined on purpose
+    template <DataMode mode>
+    SessionRecording::Entry::Camera readCamera(std::istream&, int);
+
+    template <>
+    SessionRecording::Entry::Camera readCamera<DataMode::Ascii>(std::istream& stream, int)
+    {
+        SessionRecording::Entry::Camera camera;
+        std::string rotationFollowing;
+        stream >> camera.position.x >> camera.position.y >> camera.position.z
+               >> camera.rotation.x >> camera.rotation.y
+               >> camera.rotation.z >> camera.rotation.w
+               >> camera.scale
+               >> rotationFollowing
+               >> camera.focusNode;
+        camera.followFocusNodeRotation = (rotationFollowing == "F");
+        return camera;
+    }
+
+    template <>
+    SessionRecording::Entry::Camera readCamera<DataMode::Binary>(std::istream& stream,
+                                                                 int version)
+    {
+        SessionRecording::Entry::Camera camera;
+        std::array<double, 4> buffer = {};
+        stream.read(reinterpret_cast<char*>(buffer.data()), 3 * sizeof(double));
+        camera.position = glm::dvec3(buffer[0], buffer[1], buffer[2]);
+
+        if (version < 2) {
+            // Rotations are stored as four doubles immediately get downcasted to floats
+            stream.read(reinterpret_cast<char*>(buffer.data()), 4 * sizeof(double));
+            camera.rotation = glm::dquat(buffer[3], buffer[0], buffer[1], buffer[2]);
+        }
+        else {
+            std::array<float, 4> b = {};
+            stream.read(reinterpret_cast<char*>(b.data()), 4 * sizeof(float));
+            camera.rotation = glm::quat(b[3], b[0], b[1], b[2]);
+        }
+        char follow = 0;
+        stream.read(&follow, sizeof(char));
+        camera.followFocusNodeRotation = (follow == 1);
+
+        int32_t nodeNameLength = 0;
+        stream.read(reinterpret_cast<char*>(&nodeNameLength), sizeof(int32_t));
+        camera.focusNode.resize(nodeNameLength);
+        stream.read(camera.focusNode.data(), nodeNameLength);
+
+        stream.read(reinterpret_cast<char*>(&camera.scale), sizeof(float));
+
+        if (version < 2) {
+            stream.seekg(sizeof(double), std::ios::cur); // previously `timestamp`
+        }
+        return camera;
+    }
+
+    // Not defined on purpose
+    template <DataMode mode>
+    void writeCamera(std::ostream&, const SessionRecording::Entry::Camera&);
+
+    template <>
+    void writeCamera<DataMode::Ascii>(std::ostream& stream,
+                                      const SessionRecording::Entry::Camera& camera)
+    {
+        std::string buffer = std::format(
+            "{} {} {} {} {} {} {} {} {} {}",
+            camera.position.x, camera.position.y, camera.position.z,
+            camera.rotation.x, camera.rotation.y, camera.rotation.z, camera.rotation.w,
+            camera.scale,
+            camera.followFocusNodeRotation ? "F" : "-",
+            camera.focusNode
+        );
+        stream.write(buffer.data(), buffer.size());
+    }
+
+    template <>
+    void writeCamera<DataMode::Binary>(std::ostream& stream,
+                                       const SessionRecording::Entry::Camera& camera)
+    {
+        stream.write(
+            reinterpret_cast<const char*>(glm::value_ptr(camera.position)),
+            3 * sizeof(double)
+        );
+        stream.write(
+            reinterpret_cast<const char*>(glm::value_ptr(camera.rotation)),
+            4 * sizeof(float)
+        );
+
+        const char follow = camera.followFocusNodeRotation ? 1 : 0;
+        stream.write(&follow, sizeof(char));
+
+        const int32_t nodeNameLength = static_cast<int32_t>(camera.focusNode.size());
+        stream.write(reinterpret_cast<const char*>(&nodeNameLength), sizeof(int32_t));
+        stream.write(camera.focusNode.data(), camera.focusNode.size());
+
+        stream.write(reinterpret_cast<const char*>(&camera.scale), sizeof(float));
+    }
+
+    //
+    // Script frames
+    //
+
+    // Not defined on purpose
+    template <DataMode mode>
+    SessionRecording::Entry::Script readScript(std::istream&, int);
+
+    template <>
+    SessionRecording::Entry::Script readScript<DataMode::Ascii>(std::istream& stream, int)
+    {
+        SessionRecording::Entry::Script script;
+
+        int numScriptLines = 0;
+        stream >> numScriptLines;
+
+        std::string tmpReadbackScript;
+        for (int i = 0; i < numScriptLines; i++) {
+            ghoul::getline(stream, tmpReadbackScript);
+            size_t start = tmpReadbackScript.find_first_not_of(" ");
+            tmpReadbackScript = tmpReadbackScript.substr(start);
+            if (tmpReadbackScript.back() == '\r') {
+                tmpReadbackScript.pop_back();
+            }
+            script.append(tmpReadbackScript);
+            if (i < (numScriptLines - 1)) {
+                script.append("\n");
+            }
+        }
+
+        return script;
+    }
+
+    template <>
+    SessionRecording::Entry::Script readScript<DataMode::Binary>(std::istream& stream,
+                                                                 int)
+    {
+        SessionRecording::Entry::Script script;
+
+        uint32_t scriptLength = 0;
+        stream.read(reinterpret_cast<char*>(&scriptLength), sizeof(uint32_t));
+        script.resize(scriptLength);
+        stream.read(script.data(), scriptLength);
+
+        return script;
+    }
+
+    // Not defined on purpose
+    template <DataMode>
+    void writeScript(std::ostream&, const SessionRecording::Entry::Script&);
+
+    template <>
+    void writeScript<DataMode::Ascii>(std::ostream& stream,
+                                      const SessionRecording::Entry::Script& script)
+    {
+        SessionRecording::Entry::Script s = script;
+
+        // Erase all \r (from windows newline), and all \n from line endings and replace
+        // with ';' so that lua will treat them as separate lines. This is done in order
+        // to treat a multi-line script as a single line in the file.
+        size_t startPos = s.find('\r', 0);
+        while (startPos != std::string::npos) {
+            s.erase(startPos, 1);
+            startPos = s.find('\r', startPos);
+        }
+        startPos = s.find('\n', 0);
+        while (startPos != std::string::npos) {
+            s.replace(startPos, 1, ";");
+            startPos = s.find('\n', startPos);
+        }
+        stream.write("1 ", 2 * sizeof(char));
+        stream.write(s.data(), s.size());
+    }
+
+    template <>
+    void writeScript<DataMode::Binary>(std::ostream& stream,
+                                       const SessionRecording::Entry::Script& script)
+    {
+        uint32_t scriptLength = static_cast<uint32_t>(script.size());
+        stream.write(reinterpret_cast<const char*>(&scriptLength), sizeof(uint32_t));
+        stream.write(script.data(), script.size());
+    }
+
+    //
+    // SessionRecordingEntry
+    //
+    template <DataMode mode>
+    std::optional<SessionRecording::Entry> readEntry(std::istream& stream, int version) {
+        std::optional<FrameType> frameType = readFrameType<mode>(stream, version);
+
+        if (!frameType.has_value()) {
+            // We have reached the end of the file
+            return std::nullopt;
+        }
+
+        Timestamps timestamps = readTimestamps<mode>(stream, version);
+        SessionRecording::Entry entry = {
+            .timestamp = timestamps.timestamp,
+            .simulationTime = timestamps.simulationTime
+        };
+
+        switch (*frameType) {
+            case FrameType::Camera:
+                entry.value = readCamera<mode>(stream, version);
+                break;
+            case FrameType::Script:
+                entry.value = readScript<mode>(stream, version);
+                break;
+        }
+
+        return entry;
+    }
+
+    std::optional<SessionRecording::Entry> readEntry(std::istream& stream,
+                                                     DataMode dataMode, int version)
+    {
+        return
+            dataMode == DataMode::Ascii ?
+            readEntry<DataMode::Ascii>(stream, version) :
+            readEntry<DataMode::Binary>(stream, version);
+    }
+
+    template <DataMode mode>
+    void writeEntry(std::ostream& stream, const SessionRecording::Entry& entry) {
+        if (std::holds_alternative<SessionRecording::Entry::Camera>(entry.value)) {
+            writeFrameType<mode>(stream, FrameType::Camera);
+        }
+        else if (std::holds_alternative<SessionRecording::Entry::Script>(entry.value)) {
+            writeFrameType<mode>(stream, FrameType::Script);
+        }
+        else {
+            throw std::logic_error("Unhandled variant");
+        }
+        if constexpr (mode == DataMode::Ascii) {
+            stream.write(" ", sizeof(char));
+        }
+
+
+        writeTimestamps<mode>(stream, { entry.timestamp, entry.simulationTime });
+        if constexpr (mode == DataMode::Ascii) {
+            stream.write(" ", sizeof(char));
+        }
+
+        std::visit(overloaded {
+            [&stream](const SessionRecording::Entry::Camera& value) {
+                writeCamera<mode>(stream, value);
+            },
+            [&stream](const SessionRecording::Entry::Script& value) {
+                writeScript<mode>(stream, value);
+            }
+        }, entry.value);
+    }
+
+    void writeEntry(std::ostream& stream, const SessionRecording::Entry& entry,
+                    DataMode dataMode)
+    {
+        dataMode == DataMode::Ascii ?
+            writeEntry<DataMode::Ascii>(stream, entry) :
+            writeEntry<DataMode::Binary>(stream, entry);
+    }
+
+
 } // namespace
 
 namespace openspace::interaction {
 
-ConversionError::ConversionError(std::string msg)
-    : ghoul::RuntimeError(std::move(msg), "conversionError")
-{}
-
-SessionRecording::SessionRecording()
-    : properties::PropertyOwner({ "SessionRecording", "Session Recording" })
-    , _renderPlaybackInformation(RenderPlaybackInfo, false)
-    , _ignoreRecordedScale(IgnoreRecordedScaleInfo, false)
-    , _addModelMatrixinAscii(AddModelMatrixinAsciiInfo, false)
-{}
-
-SessionRecording::SessionRecording(bool isGlobal)
-    : SessionRecording()
-{
-    if (isGlobal) {
-        ghoul::TemplateFactory<Task>* fTask = FactoryManager::ref().factory<Task>();
-        ghoul_assert(fTask, "No task factory existed");
-        fTask->registerClass<ConvertRecFormatTask>("ConvertRecFormatTask");
-        fTask->registerClass<ConvertRecFileVersionTask>("ConvertRecFileVersionTask");
-        addProperty(_renderPlaybackInformation);
-        addProperty(_ignoreRecordedScale);
-        addProperty(_addModelMatrixinAscii);
-    }
-}
-
-void SessionRecording::deinitialize() {
-    stopRecording();
-    stopPlayback();
-}
-
-void SessionRecording::setRecordDataFormat(DataMode dataMode) {
-    _recordingDataMode = dataMode;
-}
-
-bool SessionRecording::hasFileExtension(const std::string& filename,
-                                        const std::string& extension)
-{
-    if (filename.length() <= extension.length()) {
-        return false;
-    }
-    else {
-        return (filename.substr(filename.length() - extension.length()) == extension);
-    }
-}
-
-bool SessionRecording::isPath(std::string& filename) {
-    const size_t unixDelimiter = filename.find('/');
-    const size_t windowsDelimiter = filename.find('\\');
-    return (unixDelimiter != std::string::npos || windowsDelimiter != std::string::npos);
-}
-
-void SessionRecording::removeTrailingPathSlashes(std::string& filename) const {
-    while (filename.substr(filename.length() - 1, 1) == "/") {
-        filename.pop_back();
-    }
-    while (filename.substr(filename.length() - 1, 1) == "\\") {
-        filename.pop_back();
-    }
-}
-
-bool SessionRecording::handleRecordingFile(std::string filenameIn) {
-    if (_recordingDataMode == DataMode::Binary) {
-        if (hasFileExtension(filenameIn, FileExtensionAscii)) {
-            LERROR("Specified filename for binary recording has ascii file extension");
-            return false;
-        }
-        else if (!hasFileExtension(filenameIn, FileExtensionBinary)) {
-            filenameIn += FileExtensionBinary;
-        }
-    }
-    else if (_recordingDataMode == DataMode::Ascii) {
-        if (hasFileExtension(filenameIn, FileExtensionBinary)) {
-            LERROR("Specified filename for ascii recording has binary file extension");
-            return false;
-        }
-        else if (!hasFileExtension(filenameIn, FileExtensionAscii)) {
-            filenameIn += FileExtensionAscii;
-        }
-    }
-
-    std::filesystem::path absFilename = filenameIn;
-    if (absFilename.parent_path().empty() || absFilename.parent_path() == absFilename) {
-        absFilename = absPath("${RECORDINGS}/" + filenameIn);
-    }
-    else if (absFilename.parent_path().is_relative()) {
-        LERROR("If path is provided with the filename, then it must be an absolute path");
-        return false;
-    }
-    else if (!std::filesystem::exists(absFilename.parent_path())) {
-        LERROR(std::format(
-            "The recording filename path '{}' is not a valid location in the filesytem",
-            absFilename.parent_path().string()
-        ));
-        return false;
-    }
-
-    if (std::filesystem::is_regular_file(absFilename)) {
-        LERROR(std::format(
-            "Unable to start recording; file '{}' already exists", absFilename
-        ));
-        return false;
-    }
-    if (_recordingDataMode == DataMode::Binary) {
-        _recordFile.open(absFilename, std::ios::binary);
-    }
-    else {
-        _recordFile.open(absFilename);
-    }
-
-    if (!_recordFile.is_open() || !_recordFile.good()) {
-        LERROR(std::format(
-            "Unable to open file '{}' for keyframe recording", absFilename
-        ));
-        return false;
-    }
-    return true;
-}
-
-bool SessionRecording::startRecording(const std::string& filename) {
-    _timeline.clear();
-    if (_state == SessionState::Recording) {
-        LERROR("Unable to start recording while already in recording mode");
-        return false;
-    }
-    else if (isPlayingBack()) {
-        LERROR("Unable to start recording while in session playback mode");
-        return false;
-    }
-    if (!std::filesystem::is_directory(absPath("${RECORDINGS}"))) {
-        std::filesystem::create_directories(absPath("${RECORDINGS}"));
-    }
-
-    const bool recordingFileOK = handleRecordingFile(filename);
-
-    if (recordingFileOK) {
-        _state = SessionState::Recording;
-        _playbackActive_camera = false;
-        _playbackActive_time = false;
-        _playbackActive_script = false;
-        _propertyBaselinesSaved.clear();
-        _keyframesSavePropertiesBaseline_scripts.clear();
-        _keyframesSavePropertiesBaseline_timeline.clear();
-        _recordingEntryNum = 1;
-
-        _recordFile << FileHeaderTitle;
-        _recordFile.write(FileHeaderVersion, FileHeaderVersionLength);
-        if (_recordingDataMode == DataMode::Binary) {
-            _recordFile << DataFormatBinaryTag;
-        }
-        else {
-            _recordFile << DataFormatAsciiTag;
-        }
-        _recordFile << '\n';
-
-        _timestampRecordStarted = global::windowDelegate->applicationTime();
-
-        // Record the current delta time as the first property to save in the file.
-        // This needs to be saved as a baseline whether or not it changes during recording
-        _timestamps3RecordStarted = {
-            .timeOs = _timestampRecordStarted,
-            .timeRec = 0.0,
-            .timeSim = global::timeManager->time().j2000Seconds()
-        };
-
-        recordCurrentTimePauseState();
-        recordCurrentTimeRate();
-        LINFO("Session recording started");
-    }
-
-    return recordingFileOK;
-}
-
-void SessionRecording::recordCurrentTimePauseState() {
-    const bool isPaused = global::timeManager->isPaused();
-    std::string initialTimePausedCommand = "openspace.time.setPause(" +
-        std::string(isPaused ? "true" : "false") + ")";
-    saveScriptKeyframeToPropertiesBaseline(std::move(initialTimePausedCommand));
-}
-
-void SessionRecording::recordCurrentTimeRate() {
-    std::string initialTimeRateCommand = std::format(
-        "openspace.time.setDeltaTime({})", global::timeManager->targetDeltaTime()
-    );
-    saveScriptKeyframeToPropertiesBaseline(std::move(initialTimeRateCommand));
-}
-
-void SessionRecording::stopRecording() {
-    if (_state == SessionState::Recording) {
-        // Add all property baseline scripts to the beginning of the recording file
-        datamessagestructures::ScriptMessage smTmp;
-        for (TimelineEntry& initPropScripts : _keyframesSavePropertiesBaseline_timeline) {
-            if (initPropScripts.keyframeType == RecordedType::Script) {
-                smTmp._script = _keyframesSavePropertiesBaseline_scripts
-                    [initPropScripts.idxIntoKeyframeTypeArray];
-                saveSingleKeyframeScript(
-                    smTmp,
-                    _timestamps3RecordStarted,
-                    _recordingDataMode,
-                    _recordFile,
-                    _keyframeBuffer
-                );
-            }
-        }
-        for (TimelineEntry entry : _timeline) {
-            switch (entry.keyframeType) {
-                case RecordedType::Camera:
-                {
-                    interaction::KeyframeNavigator::CameraPose kf
-                        = _keyframesCamera[entry.idxIntoKeyframeTypeArray];
-                    datamessagestructures::CameraKeyframe kfMsg(
-                        std::move(kf.position),
-                        std::move(kf.rotation),
-                        std::move(kf.focusNode),
-                        kf.followFocusNodeRotation,
-                        kf.scale
-                    );
-                    saveSingleKeyframeCamera(
-                        kfMsg,
-                        entry.t3stamps,
-                        _recordingDataMode,
-                        _recordFile,
-                        _keyframeBuffer
-                    );
-                    break;
-                }
-                case RecordedType::Time:
-                {
-                    datamessagestructures::TimeKeyframe tf
-                        = _keyframesTime[entry.idxIntoKeyframeTypeArray];
-                    saveSingleKeyframeTime(
-                        tf,
-                        entry.t3stamps,
-                        _recordingDataMode,
-                        _recordFile,
-                        _keyframeBuffer
-                    );
-                    break;
-                }
-                case RecordedType::Script:
-                {
-                    smTmp._script = _keyframesScript[entry.idxIntoKeyframeTypeArray];
-                    saveSingleKeyframeScript(
-                        smTmp,
-                        entry.t3stamps,
-                        _recordingDataMode,
-                        _recordFile,
-                        _keyframeBuffer
-                    );
-                    break;
-                }
-                default:
-                {
-                    break;
-                }
-            }
-        }
-        _state = SessionState::Idle;
-        LINFO("Session recording stopped");
-    }
-    // Close the recording file
-    _recordFile.close();
-    _cleanupNeededRecording = true;
-}
-
-bool SessionRecording::startPlayback(std::string& filename,
-                                     KeyframeTimeRef timeMode,
-                                     bool forceSimTimeAtStart,
-                                     bool loop, bool shouldWaitForFinishedTiles)
-{
-    std::string absFilename;
-    if (std::filesystem::is_regular_file(filename)) {
-        absFilename = filename;
-    }
-    else {
-        absFilename = absPath("${RECORDINGS}/" + filename).string();
-    }
-    // Run through conversion in case file is older. Does nothing if the file format
-    // is up-to-date
-    absFilename = convertFile(absFilename);
-
-    if (_state == SessionState::Recording) {
-        LERROR("Unable to start playback while in session recording mode");
-        return false;
-    }
-    else if (isPlayingBack()) {
-        LERROR("Unable to start new playback while in session playback mode");
-        return false;
-    }
-
-    if (!std::filesystem::is_regular_file(absFilename)) {
-        LERROR("Cannot find the specified playback file");
-        cleanUpPlayback();
-        return false;
-    }
-
-    _playbackLineNum = 1;
-    _playbackFilename = absFilename;
-    _playbackLoopMode = loop;
-    _shouldWaitForFinishLoadingWhenPlayback = shouldWaitForFinishedTiles;
-
-    // Open in ASCII first
-    _playbackFile.open(_playbackFilename, std::ifstream::in);
-    // Read header
-    const std::string readBackHeaderString = readHeaderElement(
-        _playbackFile,
-        FileHeaderTitle.length()
-    );
-    if (readBackHeaderString != FileHeaderTitle) {
-        LERROR("Specified playback file does not contain expected header");
-        cleanUpPlayback();
-        return false;
-    }
-    readHeaderElement(_playbackFile, FileHeaderVersionLength);
-    std::string readDataMode = readHeaderElement(_playbackFile, 1);
-    if (readDataMode[0] == DataFormatAsciiTag) {
-        _recordingDataMode = DataMode::Ascii;
-    }
-    else if (readDataMode[0] == DataFormatBinaryTag) {
-        _recordingDataMode = DataMode::Binary;
-    }
-    else {
-        LERROR("Unknown data type in header (should be Ascii or Binary)");
-        cleanUpPlayback();
-    }
-    // throwaway newline character(s)
-    std::string lineEnd = readHeaderElement(_playbackFile, 1);
-    bool hasDosLineEnding = (lineEnd == "\r");
-    if (hasDosLineEnding) {
-        // throwaway the second newline character (\n) also
-        readHeaderElement(_playbackFile, 1);
-    }
-
-    if (_recordingDataMode == DataMode::Binary) {
-        // Close & re-open the file, starting from the beginning, and do dummy read
-        // past the header, version, and data type
-        _playbackFile.close();
-        _playbackFile.open(_playbackFilename, std::ifstream::in | std::ios::binary);
-        const size_t headerSize = FileHeaderTitle.length() + FileHeaderVersionLength
-            + sizeof(DataFormatBinaryTag) + sizeof('\n');
-        std::vector<char> hBuffer;
-        hBuffer.resize(headerSize);
-        _playbackFile.read(hBuffer.data(), headerSize);
-    }
-
-    if (!_playbackFile.is_open() || !_playbackFile.good()) {
-        LERROR(std::format(
-            "Unable to open file '{}' for keyframe playback", absFilename.c_str()
-        ));
-        stopPlayback();
-        cleanUpPlayback();
-        return false;
-    }
-    _saveRendering_isFirstFrame = true;
-    // Set time reference mode
-    _playbackForceSimTimeAtStart = forceSimTimeAtStart;
-    double now = global::windowDelegate->applicationTime();
-    _playbackTimeReferenceMode = timeMode;
-    initializePlayback_time(now);
-
-    global::scriptScheduler->setTimeReferenceMode(timeMode);
-    _loadedNodes.clear();
-    populateListofLoadedSceneGraphNodes();
-
-    if (!playbackAddEntriesToTimeline()) {
-        cleanUpPlayback();
-        return false;
-    }
-
-    initializePlayback_modeFlags();
-    if (!initializePlayback_timeline()) {
-        cleanUpPlayback();
-        return false;
-    }
-
-    const bool canTriggerPlayback = global::openSpaceEngine->setMode(
-        OpenSpaceEngine::Mode::SessionRecordingPlayback
-    );
-
-    if (!canTriggerPlayback) {
-        cleanUpPlayback();
-        return false;
-    }
-
-    LINFO(std::format(
-        "Playback session started: ({:8.3f},0.0,{:13.3f}) with {}/{}/{} entries, "
-        "forceTime={}",
-        now, _timestampPlaybackStarted_simulation, _keyframesCamera.size(),
-        _keyframesTime.size(), _keyframesScript.size(),
-        (_playbackForceSimTimeAtStart ? 1 : 0)
-    ));
-
-    global::eventEngine->publishEvent<events::EventSessionRecordingPlayback>(
-        events::EventSessionRecordingPlayback::State::Started
-    );
-    initializePlayback_triggerStart();
-
-    global::navigationHandler->orbitalNavigator().updateOnCameraInteraction();
-
-    return true;
-}
-
-void SessionRecording::initializePlayback_time(double now) {
-    using namespace std::chrono;
-    _timestampPlaybackStarted_application = now;
-    _timestampPlaybackStarted_simulation = global::timeManager->time().j2000Seconds();
-    _timestampApplicationStarted_simulation = _timestampPlaybackStarted_simulation - now;
-    _saveRenderingCurrentRecordedTime_interpolation = steady_clock::now();
-    _saveRenderingCurrentApplicationTime_interpolation =
-        global::windowDelegate->applicationTime();
-    _saveRenderingClockInterpolation_countsPerSec =
-        system_clock::duration::period::den / system_clock::duration::period::num;
-    _playbackPauseOffset = 0.0;
-    global::navigationHandler->keyframeNavigator().setTimeReferenceMode(
-        _playbackTimeReferenceMode, now);
-}
-
-void SessionRecording::initializePlayback_modeFlags() {
-    _playbackActive_camera = true;
-    _playbackActive_script = true;
-    if (UsingTimeKeyframes) {
-        _playbackActive_time = true;
-    }
-    _hasHitEndOfCameraKeyframes = false;
-}
-
-bool SessionRecording::initializePlayback_timeline() {
-    if (!findFirstCameraKeyframeInTimeline()) {
-        return false;
-    }
-    if (_playbackForceSimTimeAtStart) {
-        const Timestamps times = _timeline[_idxTimeline_cameraFirstInTimeline].t3stamps;
-        global::timeManager->setTimeNextFrame(Time(times.timeSim));
-        _saveRenderingCurrentRecordedTime = times.timeRec;
-    }
-    _idxTimeline_nonCamera = 0;
-    _idxTime = 0;
-    _idxScript = 0;
-    _idxTimeline_cameraPtrNext = 0;
-    _idxTimeline_cameraPtrPrev = 0;
-    return true;
-}
-
-void SessionRecording::initializePlayback_triggerStart() {
-    _state = SessionState::Playback;
-}
-
-bool SessionRecording::isPlaybackPaused() {
-    return (_state == SessionState::PlaybackPaused);
-}
-
-void SessionRecording::setPlaybackPause(bool pause) {
-    if (pause && _state == SessionState::Playback) {
-        _playbackPausedWithinDeltaTimePause = global::timeManager->isPaused();
-        if (!_playbackPausedWithinDeltaTimePause) {
-            global::timeManager->setPause(true);
-        }
-        _state = SessionState::PlaybackPaused;
-        global::eventEngine->publishEvent<events::EventSessionRecordingPlayback>(
-            events::EventSessionRecordingPlayback::State::Paused
-        );
-    }
-    else if (!pause && _state == SessionState::PlaybackPaused) {
-        if (!_playbackPausedWithinDeltaTimePause) {
-            global::timeManager->setPause(false);
-        }
-        _state = SessionState::Playback;
-        global::eventEngine->publishEvent<events::EventSessionRecordingPlayback>(
-            events::EventSessionRecordingPlayback::State::Resumed
-        );
-    }
-}
-
-bool SessionRecording::findFirstCameraKeyframeInTimeline() {
-    bool foundCameraKeyframe = false;
-    for (unsigned int i = 0; i < _timeline.size(); i++) {
-        if (doesTimelineEntryContainCamera(i)) {
-            _idxTimeline_cameraFirstInTimeline = i;
-            _idxTimeline_cameraPtrPrev = _idxTimeline_cameraFirstInTimeline;
-            _idxTimeline_cameraPtrNext = _idxTimeline_cameraFirstInTimeline;
-            _cameraFirstInTimeline_timestamp = appropriateTimestamp(
-                _timeline[_idxTimeline_cameraFirstInTimeline].t3stamps);
-            foundCameraKeyframe = true;
-            break;
-        }
-    }
-
-    if (!foundCameraKeyframe) {
-        signalPlaybackFinishedForComponent(RecordedType::Camera);
-        return true;
-    }
-    else {
-        return checkIfInitialFocusNodeIsLoaded(_idxTimeline_cameraFirstInTimeline);
-    }
-}
-
-void SessionRecording::signalPlaybackFinishedForComponent(RecordedType type) {
-    if (type == RecordedType::Camera) {
-        _playbackActive_camera = false;
-        LINFO("Playback finished signal: camera");
-    }
-    else if (type == RecordedType::Time) {
-        _playbackActive_time = false;
-        LINFO("Playback finished signal: time");
-    }
-    else if (type == RecordedType::Script) {
-        _playbackActive_script = false;
-        LINFO("Playback finished signal: script");
-    }
-
-    if (!_playbackActive_camera && !_playbackActive_time && !_playbackActive_script) {
-        if (_playbackLoopMode) {
-            // Loop back to the beginning to replay
-            _saveRenderingDuringPlayback = false;
-            initializePlayback_time(global::windowDelegate->applicationTime());
-            initializePlayback_modeFlags();
-            initializePlayback_timeline();
-            initializePlayback_triggerStart();
-        }
-        else {
-            LINFO("Playback session finished");
-            handlePlaybackEnd();
-        }
-    }
-}
-
-void SessionRecording::handlePlaybackEnd() {
-    _state = SessionState::Idle;
-    _cleanupNeededPlayback = true;
-    global::eventEngine->publishEvent<events::EventSessionRecordingPlayback>(
-        events::EventSessionRecordingPlayback::State::Finished
-    );
-    global::openSpaceEngine->resetMode();
-    global::navigationHandler->resetNavigationUpdateVariables();
-}
-
-void SessionRecording::enableTakeScreenShotDuringPlayback(int fps) {
-    _saveRenderingDuringPlayback = true;
-    _saveRenderingDeltaTime = 1.0 / fps;
-    _saveRenderingDeltaTime_interpolation_usec =
-        std::chrono::microseconds(static_cast<long>(_saveRenderingDeltaTime * 1000000));
-}
-
-void SessionRecording::disableTakeScreenShotDuringPlayback() {
-    _saveRenderingDuringPlayback = false;
-}
-
-void SessionRecording::stopPlayback() {
-    if (isPlayingBack()) {
-        LINFO("Session playback stopped");
-        handlePlaybackEnd();
-    }
-}
-
-void SessionRecording::cleanUpPlayback() {
-    Camera* camera = global::navigationHandler->camera();
-    ghoul_assert(camera != nullptr, "Camera must not be nullptr");
-    Scene* scene = camera->parent()->scene();
-    if (!_timeline.empty()) {
-        const unsigned int p =
-            _timeline[_idxTimeline_cameraPtrPrev].idxIntoKeyframeTypeArray;
-        if (!_keyframesCamera.empty()) {
-            const SceneGraphNode* n = scene->sceneGraphNode(
-                _keyframesCamera[p].focusNode
-            );
-            if (n) {
-                global::navigationHandler->orbitalNavigator().setFocusNode(
-                    n->identifier()
-                );
-            }
-        }
-    }
-
-    _playbackFile.close();
-    cleanUpTimelinesAndKeyframes();
-    _cleanupNeededPlayback = false;
-}
-
-void SessionRecording::cleanUpRecording() {
-    cleanUpTimelinesAndKeyframes();
-    _cleanupNeededRecording = false;
-}
-
-void SessionRecording::cleanUpTimelinesAndKeyframes() {
-    _timeline.clear();
-    _keyframesCamera.clear();
-    _keyframesTime.clear();
-    _keyframesScript.clear();
-    _keyframesSavePropertiesBaseline_scripts.clear();
-    _keyframesSavePropertiesBaseline_timeline.clear();
-    _propertyBaselinesSaved.clear();
-    _loadedNodes.clear();
-    _idxTimeline_nonCamera = 0;
-    _idxTime = 0;
-    _idxScript = 0;
-    _idxTimeline_cameraPtrNext = 0;
-    _idxTimeline_cameraPtrPrev = 0;
-    _hasHitEndOfCameraKeyframes = false;
-    _saveRenderingDuringPlayback = false;
-    _saveRendering_isFirstFrame = true;
-    _playbackPauseOffset = 0.0;
-    _playbackLoopMode = false;
-    _playbackForceSimTimeAtStart = false;
-}
-
-void SessionRecording::writeToFileBuffer(unsigned char* buf,
-                                         size_t& idx,
-                                         double src)
-{
-    const size_t writeSize_bytes = sizeof(double);
-    unsigned char const *p = reinterpret_cast<unsigned char const*>(&src);
-    memcpy((buf + idx), p, writeSize_bytes);
-    idx += writeSize_bytes;
-}
-
-void SessionRecording::writeToFileBuffer(unsigned char* buf,
-                                         size_t& idx,
-                                         std::vector<char>& cv)
-{
-    const size_t writeSize_bytes = cv.size() * sizeof(char);
-    memcpy((buf + idx), cv.data(), writeSize_bytes);
-    idx += writeSize_bytes;
-}
-
-void SessionRecording::writeToFileBuffer(unsigned char* buf,
-                                         size_t& idx,
-                                         unsigned char c)
-{
-    const size_t writeSize_bytes = sizeof(char);
-    buf[idx] = c;
-    idx += writeSize_bytes;
-}
-
-void SessionRecording::writeToFileBuffer(unsigned char* buf,
-                                         size_t& idx,
-                                         bool b)
-{
-    buf[idx] = b ? 1 : 0;
-    idx += sizeof(char);
-}
-
-void SessionRecording::saveStringToFile(const std::string& s,
-                                        unsigned char* kfBuffer,
-                                        size_t& idx,
-                                        std::ofstream& file)
-{
-    size_t strLen = s.size();
-    const size_t writeSize_bytes = sizeof(size_t);
-
-    idx = 0;
-    unsigned char const *p = reinterpret_cast<unsigned char const*>(&strLen);
-    memcpy((kfBuffer + idx), p, writeSize_bytes);
-    idx += static_cast<unsigned int>(writeSize_bytes);
-    saveKeyframeToFileBinary(kfBuffer, idx, file);
-
-    file.write(s.c_str(), s.size());
-}
-
-bool SessionRecording::hasCameraChangedFromPrev(
-                                       const datamessagestructures::CameraKeyframe& kfNew)
-{
-    constexpr double threshold = 1e-2;
-    bool hasChanged = false;
-
-    const glm::dvec3 position = kfNew._position - _prevRecordedCameraKeyframe._position;
-    if (glm::length(position) > threshold) {
-        hasChanged = true;
-    }
-
-    const double rotation = dot(kfNew._rotation, _prevRecordedCameraKeyframe._rotation);
-    if (std::abs(rotation - 1.0) > threshold) {
-        hasChanged = true;
-    }
-
-    _prevRecordedCameraKeyframe = kfNew;
-    return hasChanged;
-}
-
-SessionRecording::Timestamps SessionRecording::generateCurrentTimestamp3(
-                                                                double keyframeTime) const
-{
-    return {
-        keyframeTime,
-        keyframeTime - _timestampRecordStarted,
-        global::timeManager->time().j2000Seconds()
-    };
-}
-
-void SessionRecording::saveCameraKeyframeToTimeline() {
-    const SceneGraphNode* an = global::navigationHandler->orbitalNavigator().anchorNode();
-    if (!an) {
-        return;
-    }
-
-    // Create a camera keyframe, then call to populate it with current position
-    // & orientation of camera
-    datamessagestructures::CameraKeyframe kf =
-        datamessagestructures::generateCameraKeyframe();
-
-    Timestamps times = generateCurrentTimestamp3(kf._timestamp);
-    interaction::KeyframeNavigator::CameraPose pbFrame(std::move(kf));
-    addKeyframe(std::move(times), std::move(pbFrame), _recordingEntryNum++);
-}
-
-void SessionRecording::saveHeaderBinary(Timestamps& times,
-                                        char type,
-                                        unsigned char* kfBuffer,
-                                        size_t& idx)
-{
-    kfBuffer[idx++] = type;
-    writeToFileBuffer(kfBuffer, idx, times.timeOs);
-    writeToFileBuffer(kfBuffer, idx, times.timeRec);
-    writeToFileBuffer(kfBuffer, idx, times.timeSim);
-}
-
-void SessionRecording::saveHeaderAscii(Timestamps& times,
-                                       const std::string& type,
-                                       std::stringstream& line)
-{
-    line << type << ' ';
-    line << times.timeOs << ' ';
-    line << times.timeRec << ' ';
-    line << std::fixed << std::setprecision(3) << times.timeSim << ' ';
-}
-
-void SessionRecording::saveCameraKeyframeBinary(Timestamps& times,
-                                                datamessagestructures::CameraKeyframe& kf,
-                                                unsigned char* kfBuffer,
-                                                std::ofstream& file)
-{
-    // Writing to a binary session recording file
-    size_t idx = 0;
-    saveHeaderBinary(times, HeaderCameraBinary, kfBuffer, idx);
-    // Writing to internal buffer, and then to file, for performance reasons
-    std::vector<char> writeBuffer;
-    kf.serialize(writeBuffer);
-    writeToFileBuffer(kfBuffer, idx, writeBuffer);
-    saveKeyframeToFileBinary(kfBuffer, idx, file);
-}
-
-void SessionRecording::saveCameraKeyframeAscii(Timestamps& times,
-                                               datamessagestructures::CameraKeyframe& kf,
-                                               std::ofstream& file)
-{
-    if (_addModelMatrixinAscii) {
-        SceneGraphNode* node = sceneGraphNode(kf._focusNode);
-        const glm::dmat4 modelTransform = node->modelTransform();
-
-        file << HeaderCommentAscii << ' ' << ghoul::to_string(modelTransform) << '\n';
-    }
-
-    std::stringstream keyframeLine = std::stringstream();
-    saveHeaderAscii(times, HeaderCameraAscii, keyframeLine);
-    kf.write(keyframeLine);
-    saveKeyframeToFile(keyframeLine.str(), file);
-}
-
-void SessionRecording::saveTimeKeyframeToTimeline() {
-    // Create a time keyframe, then call to populate it with current time props
-    const datamessagestructures::TimeKeyframe kf =
-        datamessagestructures::generateTimeKeyframe();
-
-    Timestamps times = generateCurrentTimestamp3(kf._timestamp);
-    addKeyframe(std::move(times), kf, _recordingEntryNum++);
-}
-
-void SessionRecording::saveTimeKeyframeBinary(Timestamps& times,
-                                              datamessagestructures::TimeKeyframe& kf,
-                                              unsigned char* kfBuffer,
-                                              std::ofstream& file)
-{
-    size_t idx = 0;
-    saveHeaderBinary(times, HeaderTimeBinary, kfBuffer, idx);
-    std::vector<char> writeBuffer;
-    kf.serialize(writeBuffer);
-    writeToFileBuffer(kfBuffer, idx, writeBuffer);
-    saveKeyframeToFileBinary(kfBuffer, idx, file);
-}
-
-void SessionRecording::saveTimeKeyframeAscii(Timestamps& times,
-                                             datamessagestructures::TimeKeyframe& kf,
-                                             std::ofstream& file)
-{
-    std::stringstream keyframeLine = std::stringstream();
-    saveHeaderAscii(times, HeaderTimeAscii, keyframeLine);
-    kf.write(keyframeLine);
-    saveKeyframeToFile(keyframeLine.str(), file);
-}
-
-void SessionRecording::saveScriptKeyframeToTimeline(std::string script) {
-    if (script.starts_with(scriptReturnPrefix)) {
-        script = script.substr(scriptReturnPrefix.length());
-    }
-    for (const std::string& reject : _scriptRejects) {
-        if (script.starts_with(reject)) {
-            return;
-        }
-    }
-    trimCommandsFromScriptIfFound(script);
-    replaceCommandsFromScriptIfFound(script);
-    const datamessagestructures::ScriptMessage sm
-        = datamessagestructures::generateScriptMessage(script);
-
-    Timestamps times = generateCurrentTimestamp3(sm._timestamp);
-    addKeyframe(std::move(times), sm._script, _playbackLineNum);
-}
-
-void SessionRecording::saveScriptKeyframeToPropertiesBaseline(std::string script) {
-    const Timestamps times = generateCurrentTimestamp3(
-        global::windowDelegate->applicationTime()
-    );
-    const size_t indexIntoScriptKeyframesFromMainTimeline =
-        _keyframesSavePropertiesBaseline_scripts.size();
-    _keyframesSavePropertiesBaseline_scripts.push_back(std::move(script));
-    addKeyframeToTimeline(
-        _keyframesSavePropertiesBaseline_timeline,
-        RecordedType::Script,
-        indexIntoScriptKeyframesFromMainTimeline,
-        times,
-        0
-    );
-}
-
-void SessionRecording::trimCommandsFromScriptIfFound(std::string& script) {
-    for (const std::string& trimSnippet : _scriptsToBeTrimmed) {
-        auto findIdx = script.find(trimSnippet);
-        if (findIdx != std::string::npos) {
-            auto findClosingParens = script.find_first_of(')', findIdx);
-            script.erase(findIdx, findClosingParens + 1);
-        }
-    }
-}
-
-void SessionRecording::replaceCommandsFromScriptIfFound(std::string& script) {
-    for (const ScriptSubstringReplace& replacementSnippet : _scriptsToBeReplaced) {
-        auto findIdx = script.find(replacementSnippet.substringFound);
-        if (findIdx != std::string::npos) {
-            script.erase(findIdx, replacementSnippet.substringFound.length());
-            script.insert(findIdx, replacementSnippet.substringReplacement);
-        }
-    }
-}
-
-void SessionRecording::saveScriptKeyframeBinary(Timestamps& times,
-                                                datamessagestructures::ScriptMessage& sm,
-                                                unsigned char* smBuffer,
-                                                std::ofstream& file)
-{
-    size_t idx = 0;
-    saveHeaderBinary(times, HeaderScriptBinary, smBuffer, idx);
-    // Writing to internal buffer, and then to file, for performance reasons
-    std::vector<char> writeBuffer;
-    sm.serialize(writeBuffer);
-    writeToFileBuffer(smBuffer, idx, writeBuffer);
-    saveKeyframeToFileBinary(smBuffer, idx, file);
-}
-
-void SessionRecording::saveScriptKeyframeAscii(Timestamps& times,
-                                               datamessagestructures::ScriptMessage& sm,
-                                               std::ofstream& file)
-{
-    std::stringstream keyframeLine = std::stringstream();
-    saveHeaderAscii(times, HeaderScriptAscii, keyframeLine);
-    // Erase all \r (from windows newline), and all \n from line endings and replace with
-    // ';' so that lua will treat them as separate lines. This is done in order to treat
-    // a multi-line script as a single line in the file.
-    size_t startPos = sm._script.find('\r', 0);
-    while (startPos != std::string::npos) {
-        sm._script.erase(startPos, 1);
-        startPos = sm._script.find('\r', startPos);
-    }
-    startPos = sm._script.find('\n', 0);
-    while (startPos != std::string::npos) {
-        sm._script.replace(startPos, 1, ";");
-        startPos = sm._script.find('\n', startPos);
-    }
-    sm.write(keyframeLine);
-    saveKeyframeToFile(keyframeLine.str(), file);
-}
-
-void SessionRecording::savePropertyBaseline(properties::Property& prop) {
-    const std::string propIdentifier = prop.uri();
-    if (isPropertyAllowedForBaseline(propIdentifier)) {
-        const bool isPropAlreadySaved = (
-            std::find(
-                _propertyBaselinesSaved.begin(),
-                _propertyBaselinesSaved.end(),
-                propIdentifier
-            )
-            != _propertyBaselinesSaved.end()
-            );
-        if (!isPropAlreadySaved) {
-            const std::string initialScriptCommand = std::format(
-                "openspace.setPropertyValueSingle(\"{}\", {})",
-                propIdentifier, prop.stringValue()
-            );
-            saveScriptKeyframeToPropertiesBaseline(initialScriptCommand);
-            _propertyBaselinesSaved.push_back(propIdentifier);
-        }
-    }
-}
-
-bool SessionRecording::isPropertyAllowedForBaseline(const std::string& propString) {
-    for (const std::string& reject : _propertyBaselineRejects) {
-        if (propString.starts_with(reject)) {
-            return false;
-        }
-    }
-    return true;
-}
-
-void SessionRecording::preSynchronization() {
-    ZoneScoped;
-
-    if (_state == SessionState::Recording) {
-        saveCameraKeyframeToTimeline();
-        if (UsingTimeKeyframes) {
-            saveTimeKeyframeToTimeline();
-        }
-    }
-    else if (isPlayingBack()) {
-        moveAheadInTime();
-    }
-    else if (_cleanupNeededPlayback) {
-        cleanUpPlayback();
-    }
-    else if (_cleanupNeededRecording) {
-        cleanUpRecording();
-    }
-
-    // Handle callback(s) for change in idle/record/playback state
-    if (_state != _lastState) {
-        using K = CallbackHandle;
-        using V = StateChangeCallback;
-        for (const std::pair<K, V>& it : _stateChangeCallbacks) {
-            it.second();
-        }
-    }
-    _lastState = _state;
-}
-
-void SessionRecording::render() {
-    ZoneScoped;
-
-    if (!(_renderPlaybackInformation && isPlayingBack())) {
-        return;
-    }
-
-
-    constexpr std::string_view FontName = "Mono";
-    constexpr float FontSizeFrameinfo = 32.f;
-    const std::shared_ptr<ghoul::fontrendering::Font> font =
-        global::fontManager->font(FontName, FontSizeFrameinfo);
-
-    const glm::vec2 res = global::renderEngine->fontResolution();
-    glm::vec2 penPosition = glm::vec2(
-        res.x / 2 - 150.f,
-        res.y / 4
-    );
-    const std::string text1 = std::to_string(currentTime());
-    ghoul::fontrendering::RenderFont(
-        *font,
-        penPosition,
-        text1,
-        glm::vec4(1.f),
-        ghoul::fontrendering::CrDirection::Down
-    );
-    const std::string text2 = std::format(
-        "Scale: {}", global::navigationHandler->camera()->scaling()
-    );
-    ghoul::fontrendering::RenderFont(*font, penPosition, text2, glm::vec4(1.f));
-}
-
-bool SessionRecording::isRecording() const {
-    return (_state == SessionState::Recording);
-}
-
-bool SessionRecording::isPlayingBack() const {
-    return (_state == SessionState::Playback || _state == SessionState::PlaybackPaused);
-}
-
-bool SessionRecording::isSavingFramesDuringPlayback() const {
-    return (isPlayingBack() && _saveRenderingDuringPlayback);
-}
-
-bool SessionRecording::shouldWaitForTileLoading() const {
-    return _shouldWaitForFinishLoadingWhenPlayback;
-}
-
-SessionRecording::SessionState SessionRecording::state() const {
-    return _state;
-}
-
-bool SessionRecording::playbackAddEntriesToTimeline() {
-    bool parsingStatusOk = true;
-
-    if (_recordingDataMode == DataMode::Binary) {
-        while (parsingStatusOk) {
-            unsigned char frameType = readFromPlayback<unsigned char>(_playbackFile);
-            // Check if have reached EOF
-            if (!_playbackFile) {
-                LINFO(std::format(
-                    "Finished parsing {} entries from playback file '{}'",
-                    _playbackLineNum - 1, _playbackFilename
-                ));
-                break;
-            }
-            if (frameType == HeaderCameraBinary) {
-                parsingStatusOk = playbackCamera();
-            }
-            else if (frameType == HeaderTimeBinary) {
-                parsingStatusOk = playbackTimeChange();
-            }
-            else if (frameType == HeaderScriptBinary) {
-                parsingStatusOk = playbackScript();
-            }
-            else {
-                LERROR(std::format(
-                    "Unknown frame type {} @ index {} of playback file '{}'",
-                    frameType, _playbackLineNum - 1, _playbackFilename
-                ));
-                parsingStatusOk = false;
-                break;
-            }
-
-            _playbackLineNum++;
-        }
-    }
-    else {
-        while (parsingStatusOk && ghoul::getline(_playbackFile, _playbackLineParsing)) {
-            _playbackLineNum++;
-
-            std::istringstream iss(_playbackLineParsing);
-            std::string entryType;
-            if (!(iss >> entryType)) {
-                LERROR(std::format(
-                    "Error reading entry type @ line {} of playback file '{}'",
-                    _playbackLineNum, _playbackFilename
-                ));
-                break;
-            }
-
-            if (entryType == HeaderCameraAscii) {
-                parsingStatusOk = playbackCamera();
-            }
-            else if (entryType == HeaderTimeAscii) {
-                parsingStatusOk = playbackTimeChange();
-            }
-            else if (entryType == HeaderScriptAscii) {
-                parsingStatusOk = playbackScript();
-            }
-            else if (entryType.substr(0, 1) == HeaderCommentAscii) {
-                continue;
-            }
-            else {
-                LERROR(std::format(
-                    "Unknown frame type {} @ line {} of playback file '{}'",
-                    entryType, _playbackLineNum, _playbackFilename
-                ));
-                parsingStatusOk = false;
-                break;
-            }
-        }
-        LINFO(std::format(
-            "Finished parsing {} entries from playback file '{}'",
-            _playbackLineNum, _playbackFilename
-        ));
-    }
-
-    return parsingStatusOk;
-}
-
-double SessionRecording::appropriateTimestamp(Timestamps t3stamps)
-{
-    if (_playbackTimeReferenceMode == KeyframeTimeRef::Relative_recordedStart) {
-        return t3stamps.timeRec;
-    }
-    else if (_playbackTimeReferenceMode == KeyframeTimeRef::Absolute_simTimeJ2000) {
-        return t3stamps.timeSim;
-    }
-    else {
-        return t3stamps.timeOs;
-    }
-}
-
-double SessionRecording::equivalentSimulationTime(double timeOs,
-                                                  double timeRec,
-                                                  double timeSim)
-{
-    if (_playbackTimeReferenceMode == KeyframeTimeRef::Relative_recordedStart) {
-        return _timestampPlaybackStarted_simulation + timeRec;
-    }
-    else if (_playbackTimeReferenceMode == KeyframeTimeRef::Relative_applicationStart) {
-        return _timestampApplicationStarted_simulation + timeOs;
-    }
-    else {
-        return timeSim;
-    }
-}
-
-double SessionRecording::equivalentApplicationTime(double timeOs,
-                                                   double timeRec,
-                                                   double timeSim)
-{
-    if (_playbackTimeReferenceMode == KeyframeTimeRef::Relative_recordedStart) {
-        return _timestampPlaybackStarted_application + timeRec;
-    }
-    else if (_playbackTimeReferenceMode == KeyframeTimeRef::Absolute_simTimeJ2000) {
-        return timeSim - _timestampApplicationStarted_simulation;
-    }
-    else {
-        return timeOs;
-    }
-}
-
-double SessionRecording::currentTime() const {
-    if (isSavingFramesDuringPlayback()) {
-        return _saveRenderingCurrentRecordedTime;
-    }
-    else if (_playbackTimeReferenceMode == KeyframeTimeRef::Relative_recordedStart) {
-        return (global::windowDelegate->applicationTime() -
-                _timestampPlaybackStarted_application) - _playbackPauseOffset;
-    }
-    else if (_playbackTimeReferenceMode == KeyframeTimeRef::Absolute_simTimeJ2000) {
-        return global::timeManager->time().j2000Seconds();
-    }
-    else {
-        return global::windowDelegate->applicationTime() - _playbackPauseOffset;
-    }
-}
-
-double SessionRecording::fixedDeltaTimeDuringFrameOutput() const {
-    // Check if renderable in focus is still resolving tile loading
-    // do not adjust time while we are doing this
-    const SceneGraphNode* focusNode =
-        global::navigationHandler->orbitalNavigator().anchorNode();
-    const Renderable* focusRenderable = focusNode->renderable();
-    if (!focusRenderable || focusRenderable->renderedWithDesiredData()) {
-        return _saveRenderingDeltaTime;
-    }
-    else {
-        return 0;
-    }
-}
-
-std::chrono::steady_clock::time_point
-SessionRecording::currentPlaybackInterpolationTime() const {
-    return _saveRenderingCurrentRecordedTime_interpolation;
-}
-
-double SessionRecording::currentApplicationInterpolationTime() const {
-    return _saveRenderingCurrentApplicationTime_interpolation;
-}
-
-bool SessionRecording::playbackCamera() {
-    Timestamps times;
-    datamessagestructures::CameraKeyframe kf;
-
-    bool success = readSingleKeyframeCamera(
-        kf,
-        times,
-        _recordingDataMode,
-        _playbackFile,
-        _playbackLineParsing,
-        _playbackLineNum
-    );
-
-    const interaction::KeyframeNavigator::CameraPose pbFrame(std::move(kf));
-    if (success) {
-        success = addKeyframe(
-            {times.timeOs, times.timeRec, times.timeSim},
-            pbFrame,
-            _playbackLineNum
-        );
-    }
-    return success;
-}
-
-bool SessionRecording::convertCamera(std::stringstream& inStream, DataMode mode,
-                                     int lineNum, std::string& inputLine,
-                                     std::ofstream& outFile, unsigned char* buffer)
-{
-    Timestamps times;
-    datamessagestructures::CameraKeyframe kf;
-
-    const bool success = readSingleKeyframeCamera(
-        kf,
-        times,
-        mode,
-        reinterpret_cast<std::ifstream&>(inStream),
-        inputLine,
-        lineNum
-    );
-    if (success) {
-        saveSingleKeyframeCamera(
-            kf,
-            times,
-            mode,
-            outFile,
-            buffer
-        );
-    }
-    return success;
-}
-
-bool SessionRecording::readSingleKeyframeCamera(datamessagestructures::CameraKeyframe& kf,
-                                                Timestamps& times, DataMode mode,
-                                                std::ifstream& file, std::string& inLine,
-                                                const int lineNum)
-{
-    if (mode == DataMode::Binary) {
-        return readCameraKeyframeBinary(times, kf, file, lineNum);
-    }
-    else {
-        return readCameraKeyframeAscii(times, kf, inLine, lineNum);
-    }
-}
-
-void SessionRecording::saveSingleKeyframeCamera(datamessagestructures::CameraKeyframe& kf,
-                                                Timestamps& times, DataMode mode,
-                                                std::ofstream& file,
-                                                unsigned char* buffer)
-{
-    if (mode == DataMode::Binary) {
-        saveCameraKeyframeBinary(times, kf, buffer, file);
-    }
-    else {
-        saveCameraKeyframeAscii(times, kf, file);
-    }
-}
-
-bool SessionRecording::readCameraKeyframeBinary(Timestamps& times,
-                                                datamessagestructures::CameraKeyframe& kf,
-                                                std::ifstream& file, int lineN)
-{
-    times.timeOs = readFromPlayback<double>(file);
-    times.timeRec = readFromPlayback<double>(file);
-    times.timeSim = readFromPlayback<double>(file);
-
-    try {
-        kf.read(&file);
-    }
-    catch (std::bad_alloc&) {
-        LERROR(std::format(
-            "Allocation error with camera playback from keyframe entry {}",
-            lineN - 1
-        ));
-        return false;
-    }
-    catch (std::length_error&) {
-        LERROR(std::format(
-            "length_error with camera playback from keyframe entry {}",
-            lineN - 1
-        ));
-        return false;
-    }
-
-    if (!file) {
-        LINFO(std::format(
-            "Error reading camera playback from keyframe entry {}",
-            lineN - 1
-        ));
-        return false;
-    }
-    return true;
-}
-
-bool SessionRecording::readCameraKeyframeAscii(Timestamps& times,
-                                               datamessagestructures::CameraKeyframe& kf,
-                                               const std::string& currentParsingLine,
-                                               int lineN)
-{
-    std::istringstream iss = std::istringstream(currentParsingLine);
-    std::string entryType;
-    iss >> entryType;
-    iss >> times.timeOs >> times.timeRec >> times.timeSim;
-    kf.read(iss);
-    // ASCII format does not contain trailing timestamp so add it here
-    kf._timestamp = times.timeOs;
-
-    if (iss.fail() || !iss.eof()) {
-        LERROR(std::format("Error parsing camera line {} of playback file", lineN));
-        return false;
-    }
-    return true;
-}
-
-bool SessionRecording::playbackTimeChange() {
-    Timestamps times;
-    datamessagestructures::TimeKeyframe kf;
-
-    bool success = readSingleKeyframeTime(
-        kf,
-        times,
-        _recordingDataMode,
-        _playbackFile,
-        _playbackLineParsing,
-        _playbackLineNum
-    );
-    kf._timestamp = equivalentApplicationTime(times.timeOs, times.timeRec, times.timeSim);
-    kf._time = kf._timestamp + _timestampApplicationStarted_simulation;
-    if (success) {
-        success = addKeyframe(
-            {times.timeOs, times.timeRec, times.timeSim},
-            kf,
-            _playbackLineNum
-        );
-    }
-    return success;
-}
-
-bool SessionRecording::convertTimeChange(std::stringstream& inStream, DataMode mode,
-                                         int lineNum, std::string& inputLine,
-                                         std::ofstream& outFile, unsigned char* buffer)
-{
-    Timestamps times;
-    datamessagestructures::TimeKeyframe kf;
-
-    const bool success = readSingleKeyframeTime(
-        kf,
-        times,
-        mode,
-        reinterpret_cast<std::ifstream&>(inStream),
-        inputLine,
-        lineNum
-    );
-    if (success) {
-        saveSingleKeyframeTime(
-            kf,
-            times,
-            mode,
-            outFile,
-            buffer
-        );
-    }
-    return success;
-}
-
-bool SessionRecording::readSingleKeyframeTime(datamessagestructures::TimeKeyframe& kf,
-                                              Timestamps& times, DataMode mode,
-                                              std::ifstream& file, std::string& inLine,
-                                              const int lineNum)
-{
-    if (mode == DataMode::Binary) {
-        return readTimeKeyframeBinary(times, kf, file, lineNum);
-    } else {
-        return readTimeKeyframeAscii(times, kf, inLine, lineNum);
-    }
-}
-
-void SessionRecording::saveSingleKeyframeTime(datamessagestructures::TimeKeyframe& kf,
-                                              Timestamps& times, DataMode mode,
-                                              std::ofstream& file, unsigned char* buffer)
-{
-    if (mode == DataMode::Binary) {
-        saveTimeKeyframeBinary(times, kf, buffer, file);
-    } else {
-        saveTimeKeyframeAscii(times, kf, file);
-    }
-}
-
-bool SessionRecording::readTimeKeyframeBinary(Timestamps& times,
-                                              datamessagestructures::TimeKeyframe& kf,
-                                              std::ifstream& file, int lineN)
-{
-    times.timeOs = readFromPlayback<double>(file);
-    times.timeRec = readFromPlayback<double>(file);
-    times.timeSim = readFromPlayback<double>(file);
-
-    try {
-        kf.read(&file);
-    }
-    catch (std::bad_alloc&) {
-        LERROR(std::format(
-            "Allocation error with time playback from keyframe entry {}",
-            lineN - 1
-        ));
-        return false;
-    }
-    catch (std::length_error&) {
-        LERROR(std::format(
-            "length_error with time playback from keyframe entry {}",
-            lineN - 1
-        ));
-        return false;
-    }
-
-    if (!file) {
-        LERROR(std::format(
-            "Error reading time playback from keyframe entry {}", lineN - 1
-        ));
-        return false;
-    }
-    return true;
-}
-
-bool SessionRecording::readTimeKeyframeAscii(Timestamps& times,
-                                             datamessagestructures::TimeKeyframe& kf,
-                                             const std::string& currentParsingLine,
-                                             int lineN)
-{
-    std::string entryType;
-
-    std::istringstream iss(currentParsingLine);
-    iss >> entryType;
-    iss >> times.timeOs >> times.timeRec >> times.timeSim;
-    kf.read(iss);
-
-    if (iss.fail() || !iss.eof()) {
-        LERROR(std::format(
-            "Error parsing time line {} of playback file", lineN
-        ));
-        return false;
-    }
-    return true;
-}
-
-std::string SessionRecording::readHeaderElement(std::ifstream& stream,
-                                                size_t readLenChars)
-{
-    std::vector<char> readTemp(readLenChars);
-    stream.read(readTemp.data(), readLenChars);
-    return std::string(readTemp.begin(), readTemp.end());
-}
-
-std::string SessionRecording::readHeaderElement(std::stringstream& stream,
-                                                size_t readLenChars)
-{
-    std::vector<char> readTemp = std::vector<char>(readLenChars);
-    stream.read(readTemp.data(), readLenChars);
-    return std::string(readTemp.begin(), readTemp.end());
-}
-
-bool SessionRecording::playbackScript() {
-    Timestamps times;
-    datamessagestructures::ScriptMessage kf;
-
-    bool success = readSingleKeyframeScript(
-        kf,
-        times,
-        _recordingDataMode,
-        _playbackFile,
-        _playbackLineParsing,
-        _playbackLineNum
-    );
-
-    checkIfScriptUsesScenegraphNode(kf._script);
-
-    if (success) {
-        success = addKeyframe(
-            {times.timeOs, times.timeRec, times.timeSim},
-            kf._script,
-            _playbackLineNum
-        );
-    }
-    return success;
-}
-
-void SessionRecording::populateListofLoadedSceneGraphNodes() {
-    const std::vector<SceneGraphNode*> nodes =
-        global::renderEngine->scene()->allSceneGraphNodes();
-    for (SceneGraphNode* n : nodes) {
-        _loadedNodes.push_back(n->identifier());
-    }
-}
-
-void SessionRecording::checkIfScriptUsesScenegraphNode(std::string s) {
-    if (s.rfind(scriptReturnPrefix, 0) == 0) {
-        s.erase(0, scriptReturnPrefix.length());
-    }
-    // This works for both setPropertyValue and setPropertyValueSingle
-    const bool containsSetPropertyVal = (s.rfind("openspace.setPropertyValue", 0) == 0);
-    const bool containsParensStart = (s.find('(') != std::string::npos);
-    if (containsSetPropertyVal && containsParensStart) {
-        std::string subjectOfSetProp = isolateTermFromQuotes(s.substr(s.find('(') + 1));
-        if (checkForScenegraphNodeAccessNav(subjectOfSetProp)) {
-            const size_t commaPos = s.find(',');
-            std::string navNode = isolateTermFromQuotes(s.substr(commaPos + 1));
-            if (navNode != "nil") {
-                auto it = std::find(_loadedNodes.begin(), _loadedNodes.end(), navNode);
-                if (it == _loadedNodes.end()) {
-                    LWARNING(std::format(
-                        "Playback file contains a property setting of navigation using "
-                        "scenegraph node '{}', which is not currently loaded", navNode
-                    ));
-                }
-            }
-        }
-        else if (checkForScenegraphNodeAccessScene(subjectOfSetProp)) {
-            std::string found = extractScenegraphNodeFromScene(subjectOfSetProp);
-            if (!found.empty()) {
-                const std::vector<properties::Property*> matchHits =
-                    global::renderEngine->scene()->propertiesMatchingRegex(
-                        subjectOfSetProp
-                    );
-                if (matchHits.empty()) {
-                    LWARNING(std::format(
-                        "Playback file contains a property setting of scenegraph "
-                        "node '{}', which is not currently loaded", found
-                    ));
-                }
-            }
-        }
-    }
-}
-
-bool SessionRecording::checkForScenegraphNodeAccessScene(const std::string& s) {
-    const std::string scene = "Scene.";
-    return (s.find(scene) != std::string::npos);
-}
-
-std::string SessionRecording::extractScenegraphNodeFromScene(const std::string& s) {
-    const std::string scene = "Scene.";
-    std::string extracted;
-    const size_t posScene = s.find(scene);
-    if (posScene != std::string::npos) {
-        const size_t posDot = s.find('.', posScene + scene.length() + 1);
-        if (posDot > posScene && posDot != std::string::npos) {
-            extracted = s.substr(posScene + scene.length(), posDot -
-                (posScene + scene.length()));
-        }
-    }
-    return extracted;
-}
-
-bool SessionRecording::checkForScenegraphNodeAccessNav(std::string& navTerm) {
-    const std::string nextTerm = "NavigationHandler.OrbitalNavigator.";
-    const size_t posNav = navTerm.find(nextTerm);
-    if (posNav != std::string::npos) {
-        for (const std::string& accessName : _navScriptsUsingNodes) {
-              if (navTerm.find(accessName) != std::string::npos) {
-                  return true;
-              }
+bool SessionRecording::hasCameraFrame() const noexcept {
+    for (const Entry& e : entries) {
+        if (std::holds_alternative<Entry::Camera>(e.value)) {
+            return true;
         }
     }
     return false;
 }
 
-std::string SessionRecording::isolateTermFromQuotes(std::string s) {
-    //Remove any leading spaces
-    while (s.front() == ' ') {
-        s.erase(0, 1);
+SessionRecording loadSessionRecording(const std::filesystem::path& filename) {
+    ghoul_assert(std::filesystem::exists(filename), "Session recording did not exist");
+
+    std::ifstream file = std::ifstream(filename, std::ios::in | std::ios::binary);
+    if (!file) {
+        throw LoadingError("Failed to open file", filename);
     }
-    const std::string possibleQuotes = "\'\"[]";
-    while (possibleQuotes.find(s.front()) != std::string::npos) {
-        s.erase(0, 1);
-    }
-    for (const char q : possibleQuotes) {
-        if (s.find(q) != std::string::npos) {
-            s = s.substr(0, s.find(q));
-            return s;
+
+    SessionRecording sessionRecording;
+
+    Header header = readHeader(file, filename);
+    while (true) {
+        std::optional<SessionRecording::Entry> entry;
+        try {
+            entry = readEntry(file, header.dataMode, header.version);
         }
-    }
-    //If no quotes found, remove other possible characters from end
-    const std::string unwantedChars = " );";
-    while (!s.empty() && (unwantedChars.find(s.back()) != std::string::npos)) {
-        s.pop_back();
-    }
-    return s;
+        catch (const LoadingError& e) {
+            const int nEntries = static_cast<int>(sessionRecording.entries.size());
+            throw LoadingError(e.error, filename, nEntries + 1);
+        }
+
+        if (!entry.has_value()) {
+            // Reached the end of the file
+            break;
+        }
+
+        sessionRecording.entries.push_back(std::move(*entry));
+    };
+
+    ghoul_assert(
+        std::is_sorted(
+            sessionRecording.entries.begin(),
+            sessionRecording.entries.end(),
+            [](const SessionRecording::Entry& lhs, const SessionRecording::Entry& rhs) {
+                return lhs.timestamp < rhs.timestamp;
+            }
+        ),
+        "Session Recording not sorted by timestamp"
+    );
+
+    return sessionRecording;
 }
 
-void SessionRecording::eraseSpacesFromString(std::string& s) {
-    s.erase(std::remove_if(s.begin(), s.end(), ::isspace), s.end());
-}
+void saveSessionRecording(const std::filesystem::path& filename,
+                          const SessionRecording& sessionRecording, DataMode dataMode)
+{
+    std::ofstream file = std::ofstream(filename, std::ios::binary);
 
-std::string SessionRecording::getNameFromSurroundingQuotes(std::string& s) {
-    std::string result;
-    const char quote = s.at(0);
-    // Handle either ' or " marks
-    if (quote == '\'' || quote == '\"') {
-        const size_t quoteCount = std::count(s.begin(), s.end(), quote);
-        // Must be an opening and closing quote char
-        if (quoteCount == 2) {
-            result = s.substr(1, s.rfind(quote) - 1);
+    constexpr int CurrentVersion = Versions.back().second;
+    const Header header = {
+        .version = CurrentVersion,
+        .dataMode = dataMode
+    };
+    writeHeader(file, header);
+
+    for (const SessionRecording::Entry& entry : sessionRecording.entries) {
+        writeEntry(file, entry, dataMode);
+
+        if (dataMode == DataMode::Ascii) {
+            file.write("\n", sizeof(char));
         }
     }
+}
+
+std::vector<ghoul::Dictionary> sessionRecordingToDictionary(
+                                                        const SessionRecording& recording)
+{
+    std::vector<ghoul::Dictionary> result;
+    for (const SessionRecording::Entry& entry : recording.entries) {
+        ghoul::Dictionary e;
+        e.setValue("Timestamp", entry.timestamp);
+        e.setValue("SimulationTime", entry.simulationTime);
+
+        if (std::holds_alternative<SessionRecording::Entry::Camera>(entry.value)) {
+            const auto& cam = std::get<SessionRecording::Entry::Camera>(entry.value);
+
+            ghoul::Dictionary c;
+            c.setValue("Position", cam.position);
+            glm::dvec4 q = glm::dvec4(
+                cam.rotation.w,
+                cam.rotation.x,
+                cam.rotation.y,
+                cam.rotation.z
+            );
+            c.setValue("Rotation", q);
+            c.setValue("FocusNode", cam.focusNode);
+            c.setValue("Scale", static_cast<double>(cam.scale));
+            c.setValue("FollowFocusNode", cam.followFocusNodeRotation);
+            e.setValue("Camera", std::move(c));
+        }
+        else if (std::holds_alternative<SessionRecording::Entry::Script>(entry.value)) {
+            const std::string& s = std::get<SessionRecording::Entry::Script>(entry.value);
+            e.setValue("Script", s);
+        }
+
+        result.push_back(e);
+    }
+
     return result;
 }
 
-bool SessionRecording::checkIfInitialFocusNodeIsLoaded(unsigned int firstCamIndex) {
-    if (_keyframesCamera.empty()) {
-        return true;
-    }
-
-    std::string startFocusNode =
-        _keyframesCamera[_timeline[firstCamIndex].idxIntoKeyframeTypeArray].focusNode;
-    auto it = std::find(_loadedNodes.begin(), _loadedNodes.end(), startFocusNode);
-    if (it == _loadedNodes.end()) {
-        LERROR(std::format(
-            "Playback file requires scenegraph node '{}', which is "
-            "not currently loaded", startFocusNode
-        ));
-        return false;
-    }
-    return true;
-}
-
-
-bool SessionRecording::convertScript(std::stringstream& inStream, DataMode mode,
-                                     int lineNum, std::string& inputLine,
-                                     std::ofstream& outFile, unsigned char* buffer)
-{
-    Timestamps times;
-    datamessagestructures::ScriptMessage kf;
-
-    const bool success = readSingleKeyframeScript(
-        kf,
-        times,
-        mode,
-        reinterpret_cast<std::ifstream&>(inStream),
-        inputLine,
-        lineNum
-    );
-    if (success) {
-        saveSingleKeyframeScript(
-            kf,
-            times,
-            mode,
-            outFile,
-            buffer
-        );
-    }
-    return success;
-}
-
-bool SessionRecording::readSingleKeyframeScript(datamessagestructures::ScriptMessage& kf,
-                                                Timestamps& times, DataMode mode,
-                                                std::ifstream& file, std::string& inLine,
-                                                const int lineNum)
-{
-    if (mode == DataMode::Binary) {
-        return readScriptKeyframeBinary(times, kf, file, lineNum);
-    }
-    else {
-        return readScriptKeyframeAscii(times, kf, inLine, lineNum);
-    }
-}
-
-void SessionRecording::saveSingleKeyframeScript(datamessagestructures::ScriptMessage& kf,
-                                                Timestamps& times, DataMode mode,
-                                                std::ofstream& file,
-                                                unsigned char* buffer)
-{
-    if (mode == DataMode::Binary) {
-        saveScriptKeyframeBinary(times, kf, buffer, file);
-    }
-    else {
-        saveScriptKeyframeAscii(times, kf, file);
-    }
-}
-
-bool SessionRecording::readScriptKeyframeBinary(Timestamps& times,
-                                                datamessagestructures::ScriptMessage& kf,
-                                                std::ifstream& file, int lineN)
-{
-    times.timeOs = readFromPlayback<double>(file);
-    times.timeRec = readFromPlayback<double>(file);
-    times.timeSim = readFromPlayback<double>(file);
-
-    try {
-        kf.read(&file);
-    }
-    catch (std::bad_alloc&) {
-        LERROR(std::format(
-            "Allocation error with script playback from keyframe entry {}",
-            lineN - 1
-        ));
-        return false;
-    }
-    catch (std::length_error&) {
-        LERROR(std::format(
-            "length_error with script playback from keyframe entry {}",
-            lineN - 1
-        ));
-        return false;
-    }
-
-    if (!file) {
-        LERROR(std::format(
-            "Error reading script playback from keyframe entry {}",
-            lineN - 1
-        ));
-        return false;
-    }
-    return true;
-}
-
-bool SessionRecording::readScriptKeyframeAscii(Timestamps& times,
-                                               datamessagestructures::ScriptMessage& kf,
-                                               const std::string& currentParsingLine,
-                                               int lineN)
-{
-    std::string entryType;
-    std::istringstream iss(currentParsingLine);
-    iss >> entryType;
-    iss >> times.timeOs >> times.timeRec >> times.timeSim;
-    kf.read(iss);
-    if (iss.fail()) {
-        LERROR(std::format("Error parsing script line {} of playback file", lineN));
-        return false;
-    }
-    else if (!iss.eof()) {
-        LERROR(std::format("Did not find an EOL at line {} of playback file", lineN));
-        return false;
-    }
-    return true;
-}
-
-bool SessionRecording::addKeyframeToTimeline(std::vector<TimelineEntry>& timeline,
-                                             RecordedType type,
-                                             size_t indexIntoTypeKeyframes,
-                                             Timestamps t3stamps, int lineNum)
-{
-    try {
-        timeline.push_back({
-            type,
-            static_cast<unsigned int>(indexIntoTypeKeyframes),
-            t3stamps
-        });
-    }
-    catch(...) {
-        LERROR(std::format(
-            "Timeline memory allocation error trying to add keyframe {}. The playback "
-            "file may be too large for system memory",
-            lineNum - 1
-        ));
-        return false;
-    }
-    return true;
-}
-
-bool SessionRecording::addKeyframe(Timestamps t3stamps,
-                                   interaction::KeyframeNavigator::CameraPose keyframe,
-                                   int lineNum)
-{
-    const size_t indexIntoCameraKeyframesFromMainTimeline = _keyframesCamera.size();
-    _keyframesCamera.push_back(std::move(keyframe));
-    return addKeyframeToTimeline(
-        _timeline,
-        RecordedType::Camera,
-        indexIntoCameraKeyframesFromMainTimeline,
-        t3stamps,
-        lineNum
-    );
-}
-
-bool SessionRecording::addKeyframe(Timestamps t3stamps,
-                                   datamessagestructures::TimeKeyframe keyframe,
-                                   int lineNum)
-{
-    const size_t indexIntoTimeKeyframesFromMainTimeline = _keyframesTime.size();
-    _keyframesTime.push_back(std::move(keyframe));
-    return addKeyframeToTimeline(
-        _timeline,
-        RecordedType::Time,
-        indexIntoTimeKeyframesFromMainTimeline,
-        t3stamps,
-        lineNum
-    );
-}
-
-bool SessionRecording::addKeyframe(Timestamps t3stamps,
-                                   std::string scriptToQueue,
-                                   int lineNum)
-{
-    const size_t indexIntoScriptKeyframesFromMainTimeline = _keyframesScript.size();
-    _keyframesScript.push_back(std::move(scriptToQueue));
-    return addKeyframeToTimeline(
-        _timeline,
-        RecordedType::Script,
-        indexIntoScriptKeyframesFromMainTimeline,
-        t3stamps,
-        lineNum
-    );
-}
-
-void SessionRecording::moveAheadInTime() {
-    using namespace std::chrono;
-
-    const bool playbackPaused = (_state == SessionState::PlaybackPaused);
-    if (playbackPaused) {
-        _playbackPauseOffset
-            += global::windowDelegate->applicationTime() - _previousTime;
-    }
-    _previousTime = global::windowDelegate->applicationTime();
-
-    const double currTime = currentTime();
-    lookForNonCameraKeyframesThatHaveComeDue(currTime);
-    updateCameraWithOrWithoutNewKeyframes(currTime);
-    // Unfortunately the first frame is sometimes rendered because globebrowsing reports
-    // that all chunks are rendered when they apparently are not.
-    if (_saveRendering_isFirstFrame) {
-        _saveRendering_isFirstFrame = false;
-        return;
-    }
-    if (_shouldWaitForFinishLoadingWhenPlayback && isSavingFramesDuringPlayback()) {
-        // Check if renderable in focus is still resolving tile loading
-        // do not adjust time while we are doing this, or take screenshot
-        const SceneGraphNode* focusNode =
-            global::navigationHandler->orbitalNavigator().anchorNode();
-        const Renderable* focusRenderable = focusNode->renderable();
-        if (!focusRenderable || focusRenderable->renderedWithDesiredData()) {
-            if (!playbackPaused) {
-                _saveRenderingCurrentRecordedTime_interpolation +=
-                    _saveRenderingDeltaTime_interpolation_usec;
-                _saveRenderingCurrentRecordedTime += _saveRenderingDeltaTime;
-                _saveRenderingCurrentApplicationTime_interpolation +=
-                    _saveRenderingDeltaTime;
-                global::renderEngine->takeScreenshot();
-            }
-        }
-    }
-}
-
-void SessionRecording::lookForNonCameraKeyframesThatHaveComeDue(double currTime) {
-    while (isTimeToHandleNextNonCameraKeyframe(currTime)) {
-        if (!processNextNonCameraKeyframeAheadInTime()) {
-            break;
-        }
-
-        if (++_idxTimeline_nonCamera >= _timeline.size()) {
-            _idxTimeline_nonCamera--;
-            if (_playbackActive_time) {
-                signalPlaybackFinishedForComponent(RecordedType::Time);
-            }
-            if (_playbackActive_script) {
-                signalPlaybackFinishedForComponent(RecordedType::Script);
-            }
-            break;
-        }
-    }
-}
-
-void SessionRecording::updateCameraWithOrWithoutNewKeyframes(double currTime) {
-    if (!_playbackActive_camera) {
-        return;
-    }
-
-    const bool didFindFutureCameraKeyframes = findNextFutureCameraIndex(currTime);
-    const bool isPrevAtFirstKeyframe =
-        (_idxTimeline_cameraPtrPrev == _idxTimeline_cameraFirstInTimeline);
-    const bool isFirstTimelineCameraKeyframeInFuture =
-        (currTime < _cameraFirstInTimeline_timestamp);
-
-    if (! (isPrevAtFirstKeyframe && isFirstTimelineCameraKeyframeInFuture)) {
-        processCameraKeyframe(currTime);
-    }
-    if (!didFindFutureCameraKeyframes) {
-        signalPlaybackFinishedForComponent(RecordedType::Camera);
-    }
-}
-
-bool SessionRecording::isTimeToHandleNextNonCameraKeyframe(double currTime) {
-    const bool nonCameraPlaybackActive = (_playbackActive_time || _playbackActive_script);
-    return (currTime > getNextTimestamp()) && nonCameraPlaybackActive;
-}
-
-bool SessionRecording::findNextFutureCameraIndex(double currTime) {
-    unsigned int seekAheadIndex = _idxTimeline_cameraPtrPrev;
-    while (true) {
-        seekAheadIndex++;
-        if (seekAheadIndex >= static_cast<unsigned int>(_timeline.size())) {
-            seekAheadIndex = static_cast<unsigned int>(_timeline.size()) - 1;
-        }
-
-        if (doesTimelineEntryContainCamera(seekAheadIndex)) {
-            const unsigned int indexIntoCameraKeyframes =
-                _timeline[seekAheadIndex].idxIntoKeyframeTypeArray;
-            const double seekAheadKeyframeTimestamp
-                = appropriateTimestamp(_timeline[seekAheadIndex].t3stamps);
-
-            if (indexIntoCameraKeyframes >= (_keyframesCamera.size() - 1)) {
-                _hasHitEndOfCameraKeyframes = true;
-            }
-
-            if (currTime < seekAheadKeyframeTimestamp) {
-                if (seekAheadIndex > _idxTimeline_cameraPtrNext) {
-                    _idxTimeline_cameraPtrPrev = _idxTimeline_cameraPtrNext;
-                    _idxTimeline_cameraPtrNext = seekAheadIndex;
-                }
-                break;
-            }
-            else {
-                // Force interpolation between consecutive keyframes
-                _idxTimeline_cameraPtrPrev = seekAheadIndex;
-            }
-        }
-
-        const double interpolationUpperBoundTimestamp =
-            appropriateTimestamp(_timeline[_idxTimeline_cameraPtrNext].t3stamps);
-        if ((currTime > interpolationUpperBoundTimestamp) && _hasHitEndOfCameraKeyframes)
-        {
-            _idxTimeline_cameraPtrPrev = _idxTimeline_cameraPtrNext;
-            return false;
-        }
-
-        if (seekAheadIndex == (_timeline.size() - 1)) {
-            break;
-        }
-    }
-    return true;
-}
-
-bool SessionRecording::doesTimelineEntryContainCamera(unsigned int index) const {
-    return (_timeline[index].keyframeType == RecordedType::Camera);
-}
-
-bool SessionRecording::processNextNonCameraKeyframeAheadInTime() {
-    switch (getNextKeyframeType()) {
-        case RecordedType::Camera:
-            // Just return true since this function no longer handles camera keyframes
-            return true;
-        case RecordedType::Time:
-            _idxTime = _timeline[_idxTimeline_nonCamera].idxIntoKeyframeTypeArray;
-            if (_keyframesTime.empty()) {
-                return false;
-            }
-            LINFO("Time keyframe type");
-            // TBD: the TimeManager restricts setting time directly
-            return false;
-        case RecordedType::Script:
-            _idxScript = _timeline[_idxTimeline_nonCamera].idxIntoKeyframeTypeArray;
-            return processScriptKeyframe();
-        default:
-            LERROR(std::format(
-                "Bad keyframe type encountered during playback at index {}",
-                _idxTimeline_nonCamera
-            ));
-            return false;
-    }
-}
-
-//void SessionRecording::moveBackInTime() { } //for future use
-
-unsigned int SessionRecording::findIndexOfLastCameraKeyframeInTimeline() {
-    unsigned int i = static_cast<unsigned int>(_timeline.size()) - 1;
-    for (; i > 0; i--) {
-        if (_timeline[i].keyframeType == RecordedType::Camera) {
-            break;
-        }
-    }
-    return i;
-}
-
-bool SessionRecording::processCameraKeyframe(double now) {
-    interaction::KeyframeNavigator::CameraPose nextPose;
-    interaction::KeyframeNavigator::CameraPose prevPose;
-
-    unsigned int prevIdx = 0;
-    unsigned int nextIdx = 0;
-    if (!_playbackActive_camera) {
-        return false;
-    }
-    else if (_keyframesCamera.empty()) {
-        return false;
-    }
-    else {
-        prevIdx = _timeline[_idxTimeline_cameraPtrPrev].idxIntoKeyframeTypeArray;
-        prevPose = _keyframesCamera[prevIdx];
-        nextIdx = _timeline[_idxTimeline_cameraPtrNext].idxIntoKeyframeTypeArray;
-        nextPose = _keyframesCamera[nextIdx];
-    }
-
-    // getPrevTimestamp();
-    const double prevTime = appropriateTimestamp(
-        _timeline[_idxTimeline_cameraPtrPrev].t3stamps
-    );
-    // getNextTimestamp();
-    const double nextTime = appropriateTimestamp(
-        _timeline[_idxTimeline_cameraPtrNext].t3stamps
-    );
-
-    double t = 0.0;
-    if ((nextTime - prevTime) >= 1e-7) {
-        t = (now - prevTime) / (nextTime - prevTime);
-    }
-
-#ifdef INTERPOLATION_DEBUG_PRINT
-    LINFOC("prev", std::to_string(prevTime));
-    LINFOC("now", std::to_string(prevTime + t));
-    LINFOC("next", std::to_string(nextTime));
-#endif
-
-    // Need to activly update the focusNode position of the camera in relation to
-    // the rendered objects will be unstable and actually incorrect
-    Camera* camera = global::navigationHandler->camera();
-    Scene* scene = camera->parent()->scene();
-
-    const SceneGraphNode* n = scene->sceneGraphNode(_keyframesCamera[prevIdx].focusNode);
-    if (n) {
-        global::navigationHandler->orbitalNavigator().setFocusNode(n->identifier());
-    }
-
-    interaction::KeyframeNavigator::updateCamera(
-        global::navigationHandler->camera(),
-        prevPose,
-        nextPose,
-        t,
-        _ignoreRecordedScale
-    );
-    return true;
-}
-
-bool SessionRecording::processScriptKeyframe() {
-    if (!_playbackActive_script || _keyframesScript.empty()) {
-        return false;
-    }
-
-    const std::string nextScript = nextKeyframeObj(
-        _idxScript,
-        _keyframesScript,
-        ([this]() { signalPlaybackFinishedForComponent(RecordedType::Script); })
-    );
-    global::scriptEngine->queueScript(nextScript);
-
-    return true;
-}
-
-double SessionRecording::getNextTimestamp() {
-    if (_timeline.empty()) {
-        return 0.0;
-    }
-    else if (_idxTimeline_nonCamera < _timeline.size()) {
-        return appropriateTimestamp(_timeline[_idxTimeline_nonCamera].t3stamps);
-    }
-    else {
-        return appropriateTimestamp(_timeline.back().t3stamps);
-    }
-}
-
-double SessionRecording::getPrevTimestamp() {
-    if (_timeline.empty()) {
-        return 0.0;
-    }
-    else if (_idxTimeline_nonCamera == 0) {
-        return appropriateTimestamp(_timeline.front().t3stamps);
-    }
-    else if (_idxTimeline_nonCamera < _timeline.size()) {
-        return appropriateTimestamp(_timeline[_idxTimeline_nonCamera - 1].t3stamps);
-    }
-    else {
-        return appropriateTimestamp(_timeline.back().t3stamps);
-    }
-}
-
-SessionRecording::RecordedType SessionRecording::getNextKeyframeType() {
-    if (_timeline.empty()) {
-        return RecordedType::Invalid;
-    }
-    else if (_idxTimeline_nonCamera < _timeline.size()) {
-        return _timeline[_idxTimeline_nonCamera].keyframeType;
-    }
-    else {
-        return _timeline.back().keyframeType;
-    }
-}
-
-SessionRecording::RecordedType SessionRecording::getPrevKeyframeType() {
-    if (_timeline.empty()) {
-        return RecordedType::Invalid;
-    }
-    else if (_idxTimeline_nonCamera < _timeline.size()) {
-        if (_idxTimeline_nonCamera > 0) {
-            return _timeline[_idxTimeline_nonCamera - 1].keyframeType;
-        }
-        else {
-            return _timeline.front().keyframeType;
-        }
-    }
-    else {
-        return _timeline.back().keyframeType;
-    }
-}
-
-void SessionRecording::saveKeyframeToFileBinary(unsigned char* buffer,
-                                                size_t size,
-                                                std::ofstream& file)
-{
-    file.write(reinterpret_cast<char*>(buffer), size);
-}
-
-void SessionRecording::saveKeyframeToFile(const std::string& entry, std::ofstream& file) {
-    file << entry << '\n';
-}
-
-SessionRecording::CallbackHandle SessionRecording::addStateChangeCallback(
-                                                                   StateChangeCallback cb)
-{
-    const CallbackHandle handle = _nextCallbackHandle++;
-    _stateChangeCallbacks.emplace_back(handle, std::move(cb));
-    return handle;
-}
-
-void SessionRecording::removeStateChangeCallback(CallbackHandle handle) {
-    const auto it = std::find_if(
-        _stateChangeCallbacks.begin(),
-        _stateChangeCallbacks.end(),
-        [handle](const std::pair<CallbackHandle, std::function<void()>>& cb) {
-            return cb.first == handle;
-        }
-    );
-
-    ghoul_assert(
-        it != _stateChangeCallbacks.end(),
-        "handle must be a valid callback handle"
-    );
-
-    _stateChangeCallbacks.erase(it);
-}
-
-std::vector<std::string> SessionRecording::playbackList() const {
-    const std::filesystem::path path = absPath("${RECORDINGS}");
-
-    std::vector<std::string> fileList;
-    if (std::filesystem::is_directory(path)) {
-        namespace fs = std::filesystem;
-        for (const fs::directory_entry& e : fs::directory_iterator(path)) {
-            if (!e.is_regular_file()) {
-                continue;
-            }
-
-            // Remove path and keep only the filename
-            const std::string filename = e.path().filename().string();
-#ifdef WIN32
-            DWORD attributes = GetFileAttributes(e.path().string().c_str());
-            bool isHidden = attributes & FILE_ATTRIBUTE_HIDDEN;
-#else
-            const bool isHidden = filename.find('.') == 0;
-#endif // WIN32
-            if (!isHidden) {
-                // Don't add hidden files
-                fileList.push_back(filename);
-            }
-        }
-    }
-    std::sort(fileList.begin(), fileList.end());
-    return fileList;
-}
-
-void SessionRecording::readPlaybackHeader_stream(std::stringstream& conversionInStream,
-                                                 std::string& version, DataMode& mode)
-{
-    // Read header
-    const std::string readBackHeaderString = readHeaderElement(
-        conversionInStream,
-        FileHeaderTitle.length()
-    );
-
-    if (readBackHeaderString != FileHeaderTitle) {
-        throw ConversionError("File to convert does not contain expected header");
-    }
-    version = readHeaderElement(conversionInStream, FileHeaderVersionLength);
-    std::string readDataMode = readHeaderElement(conversionInStream, 1);
-    if (readDataMode[0] == DataFormatAsciiTag) {
-        mode = DataMode::Ascii;
-    }
-    else if (readDataMode[0] == DataFormatBinaryTag) {
-        mode = DataMode::Binary;
-    }
-    else {
-        throw ConversionError("Unknown data type in header (needs Ascii or Binary)");
-    }
-    // Read to throw out newline at end of header
-    readHeaderElement(conversionInStream, 1);
-}
-
-SessionRecording::DataMode SessionRecording::readModeFromHeader(
-                                                              const std::string& filename)
-{
-    DataMode mode = DataMode::Unknown;
-    std::ifstream inputFile;
-    // Open in ASCII first
-    inputFile.open(filename, std::ifstream::in);
-    // Read header
-    const std::string readBackHeaderString = readHeaderElement(
-        inputFile,
-        FileHeaderTitle.length()
-    );
-    if (readBackHeaderString != FileHeaderTitle) {
-        LERROR("Specified playback file does not contain expected header");
-    }
-    readHeaderElement(inputFile, FileHeaderVersionLength);
-    std::string readDataMode = readHeaderElement(inputFile, 1);
-    if (readDataMode[0] == DataFormatAsciiTag) {
-        mode = DataMode::Ascii;
-    }
-    else if (readDataMode[0] == DataFormatBinaryTag) {
-        mode = DataMode::Binary;
-    }
-    else {
-        throw ConversionError("Unknown data type in header (should be Ascii or Binary)");
-    }
-    return mode;
-}
-
-void SessionRecording::readFileIntoStringStream(std::string filename,
-                                                std::ifstream& inputFstream,
-                                                std::stringstream& stream)
-{
-    std::filesystem::path conversionInFilename = absPath(filename);
-    if (!std::filesystem::is_regular_file(conversionInFilename)) {
-        throw ConversionError(std::format(
-            "Cannot find the specified playback file '{}' to convert",
-            conversionInFilename
-        ));
-    }
-
-    const DataMode mode = readModeFromHeader(conversionInFilename.string());
-
-    stream.str("");
-    stream.clear();
-    inputFstream.close();
-    if (mode == DataMode::Binary) {
-        inputFstream.open(conversionInFilename, std::ifstream::in | std::ios::binary);
-    }
-    else {
-        inputFstream.open(conversionInFilename, std::ifstream::in);
-    }
-    stream << inputFstream.rdbuf();
-    if (!inputFstream.is_open() || !inputFstream.good()) {
-        throw ConversionError(std::format(
-            "Unable to open file '{}' for conversion", filename
-        ));
-    }
-    inputFstream.close();
-}
-
-void SessionRecording::convertFileRelativePath(std::string filenameRelative) {
-    const std::filesystem::path path = absPath(std::move(filenameRelative));
-    convertFile(path.string());
-}
-
-std::string SessionRecording::convertFile(std::string filename, int depth) {
-    std::string conversionOutFilename = filename;
-    std::ifstream conversionInFile;
-    std::stringstream conversionInStream;
-    if (depth >= _maximumRecursionDepth) {
-        LERROR("Runaway recursion in session recording conversion of file version");
-        exit(EXIT_FAILURE);
-    }
-    std::string newFilename = filename;
-    try {
-        readFileIntoStringStream(filename, conversionInFile, conversionInStream);
-        DataMode mode = DataMode::Unknown;
-        std::string fileVersion;
-        readPlaybackHeader_stream(
-            conversionInStream,
-            fileVersion,
-            mode
-        );
-        const int conversionLineNum = 1;
-
-        // If this instance of the SessionRecording class isn't the instance with the
-        // correct version of the file to be converted, then call getLegacy() to recurse
-        // to the next level down in the legacy subclasses until we get the right
-        // version, then proceed with conversion from there.
-        if (fileVersion != fileFormatVersion()) {
-            //conversionInStream.seekg(conversionInStream.beg);
-            newFilename = getLegacyConversionResult(filename, depth + 1);
-            removeTrailingPathSlashes(newFilename);
-            if (filename == newFilename) {
-                return filename;
-            }
-            readFileIntoStringStream(newFilename, conversionInFile, conversionInStream);
-            readPlaybackHeader_stream(
-                conversionInStream,
-                fileVersion,
-                mode
-            );
-        }
-        if (depth != 0) {
-            conversionOutFilename = determineConversionOutFilename(filename, mode);
-            LINFO(std::format(
-                "Starting conversion on rec file '{}', version {} in {} mode. "
-                "Writing result to '{}'",
-                newFilename, fileVersion, (mode == DataMode::Ascii) ? "ascii" : "binary",
-                conversionOutFilename
-            ));
-            std::ofstream conversionOutFile;
-            if (mode == DataMode::Binary) {
-                conversionOutFile.open(conversionOutFilename, std::ios::binary);
-            }
-            else {
-                conversionOutFile.open(conversionOutFilename);
-            }
-            if (!conversionOutFile.is_open() || !conversionOutFile.good()) {
-                LERROR(std::format(
-                    "Unable to open file '{}' for conversion result",
-                    conversionOutFilename
-                ));
-                return "";
-            }
-            conversionOutFile << FileHeaderTitle;
-            conversionOutFile.write(
-                targetFileFormatVersion().c_str(),
-                FileHeaderVersionLength
-            );
-            if (mode == DataMode::Binary) {
-                conversionOutFile << DataFormatBinaryTag;
-            }
-            else {
-                conversionOutFile << DataFormatAsciiTag;
-            }
-            conversionOutFile << '\n';
-            convertEntries(
-                newFilename,
-                conversionInStream,
-                mode,
-                conversionLineNum,
-                conversionOutFile
-            );
-            conversionOutFile.close();
-        }
-        conversionInFile.close();
-    }
-    catch (ConversionError& c) {
-        LERROR(c.message);
-    }
-
-    if (depth == 0) {
-        return newFilename;
-    }
-    else {
-        return conversionOutFilename;
-    }
-}
-
-bool SessionRecording::convertEntries(std::string& inFilename,
-                                      std::stringstream& inStream, DataMode mode,
-                                      int lineNum, std::ofstream& outFile)
-{
-    bool conversionStatusOk = true;
-    std::string lineParsing;
-
-    if (mode == DataMode::Binary) {
-        while (conversionStatusOk) {
-            unsigned char frameType = readFromPlayback<unsigned char>(inStream);
-            // Check if have reached EOF
-            if (!inStream) {
-                LINFO(std::format(
-                    "Finished converting {} entries from playback file '{}'",
-                    lineNum - 1, inFilename
-                ));
-                break;
-            }
-            if (frameType == HeaderCameraBinary) {
-                conversionStatusOk = convertCamera(
-                    inStream,
-                    mode,
-                    lineNum,
-                    lineParsing,
-                    outFile,
-                    _keyframeBuffer
-                );
-            }
-            else if (frameType == HeaderTimeBinary) {
-                conversionStatusOk = convertTimeChange(
-                    inStream,
-                    mode,
-                    lineNum,
-                    lineParsing,
-                    outFile,
-                    _keyframeBuffer
-                );
-            }
-            else if (frameType == HeaderScriptBinary) {
-                try {
-                    conversionStatusOk = convertScript(
-                        inStream,
-                        mode,
-                        lineNum,
-                        lineParsing,
-                        outFile,
-                        _keyframeBuffer
-                    );
-                }
-                catch (ConversionError& c) {
-                    LERROR(c.message);
-                    conversionStatusOk = false;
-                }
-            }
-            else {
-                LERROR(std::format(
-                    "Unknown frame type {} @ index {} of conversion file '{}'",
-                    frameType, lineNum - 1, inFilename
-                ));
-                conversionStatusOk = false;
-            }
-            lineNum++;
-        }
-    }
-    else {
-        while (conversionStatusOk && ghoul::getline(inStream, lineParsing)) {
-            lineNum++;
-
-            std::istringstream iss(lineParsing);
-            std::string entryType;
-            if (!(iss >> entryType)) {
-                LERROR(std::format(
-                    "Error reading entry type @ line {} of conversion file '{}'",
-                    lineNum, inFilename
-                ));
-                break;
-            }
-
-            if (entryType == HeaderCameraAscii) {
-                conversionStatusOk = convertCamera(
-                    inStream,
-                    mode,
-                    lineNum,
-                    lineParsing,
-                    outFile,
-                    _keyframeBuffer
-                );
-            }
-            else if (entryType == HeaderTimeAscii) {
-                conversionStatusOk = convertTimeChange(
-                    inStream,
-                    mode,
-                    lineNum,
-                    lineParsing,
-                    outFile,
-                    _keyframeBuffer
-                );
-            }
-            else if (entryType == HeaderScriptAscii) {
-                try {
-                    conversionStatusOk = convertScript(
-                        inStream,
-                        mode,
-                        lineNum,
-                        lineParsing,
-                        outFile,
-                        _keyframeBuffer
-                    );
-                }
-                catch (ConversionError& c) {
-                    LERROR(c.message);
-                    conversionStatusOk = false;
-                }
-            }
-            else if (entryType.substr(0, 1) == HeaderCommentAscii) {
-                continue;
-            }
-            else {
-                LERROR(std::format(
-                    "Unknown frame type {} @ line {} of conversion file '{}'",
-                    entryType, lineNum, inFilename
-                ));
-                conversionStatusOk = false;
-            }
-        }
-        LINFO(std::format(
-            "Finished parsing {} entries from conversion file '{}'",
-            lineNum, inFilename
-        ));
-    }
-    return conversionStatusOk;
-}
-
-std::string SessionRecording::getLegacyConversionResult(std::string filename, int depth) {
-    SessionRecording_legacy_0085 legacy;
-    return legacy.convertFile(std::move(filename), depth);
-}
-
-std::string SessionRecording_legacy_0085::getLegacyConversionResult(std::string filename,
-                                                                    int)
-{
-    // This method is overriden in each legacy subclass, but does nothing in this instance
-    // as the oldest supported legacy version.
-    LERROR(std::format(
-        "Version 00.85 is the oldest supported legacy file format; no conversion "
-        "can be made. It is possible that file '{}' has a corrupted header or an invalid "
-        "file format version number",
-        filename
-    ));
-    return filename;
-}
-
-std::string SessionRecording::fileFormatVersion() {
-    return std::string(FileHeaderVersion);
-}
-
-std::string SessionRecording::targetFileFormatVersion() {
-    return std::string(FileHeaderVersion);
-}
-
-std::string SessionRecording::determineConversionOutFilename(const std::string& filename,
-                                                             DataMode mode)
-{
-    std::string filenameSansExtension = filename;
-    const std::string fileExtension = (mode == DataMode::Binary) ?
-        FileExtensionBinary : FileExtensionAscii;
-
-    if (filename.find_last_of('.') != std::string::npos) {
-        filenameSansExtension = filename.substr(0, filename.find_last_of('.'));
-    }
-    filenameSansExtension += "_" + fileFormatVersion() + "-" + targetFileFormatVersion();
-    return filenameSansExtension + fileExtension;
-}
-
-bool SessionRecording_legacy_0085::convertScript(std::stringstream& inStream,
-                                                 DataMode mode, int lineNum,
-                                                 std::string& inputLine,
-                                                 std::ofstream& outFile,
-                                                 unsigned char* buffer)
-{
-    Timestamps times;
-    ScriptMessage_legacy_0085 kf;
-
-    const bool success = readSingleKeyframeScript(
-        kf,
-        times,
-        mode,
-        reinterpret_cast<std::ifstream&>(inStream),
-        inputLine,
-        lineNum
-    );
-    if (success) {
-        saveSingleKeyframeScript(kf, times, mode, outFile, buffer);
-    }
-    return success;
-}
-
-scripting::LuaLibrary SessionRecording::luaLibrary() {
-    return {
-        "sessionRecording",
-        {
-            codegen::lua::StartRecording,
-            codegen::lua::StartRecordingAscii,
-            codegen::lua::StopRecording,
-            codegen::lua::StartPlaybackDefault,
-            codegen::lua::StartPlaybackApplicationTime,
-            codegen::lua::StartPlaybackRecordedTime,
-            codegen::lua::StartPlaybackSimulationTime,
-            codegen::lua::StopPlayback,
-            codegen::lua::EnableTakeScreenShotDuringPlayback,
-            codegen::lua::DisableTakeScreenShotDuringPlayback,
-            codegen::lua::FileFormatConversion,
-            codegen::lua::SetPlaybackPause,
-            codegen::lua::TogglePlaybackPause,
-            codegen::lua::IsPlayingBack,
-            codegen::lua::IsRecording
-        }
-    };
-}
-
 } // namespace openspace::interaction
diff --git a/src/interaction/sessionrecording_lua.inl b/src/interaction/sessionrecording_lua.inl
deleted file mode 100644
index 1fb6164865..0000000000
--- a/src/interaction/sessionrecording_lua.inl
+++ /dev/null
@@ -1,212 +0,0 @@
-/*****************************************************************************************
- *                                                                                       *
- * OpenSpace                                                                             *
- *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
- *                                                                                       *
- * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
- * software and associated documentation files (the "Software"), to deal in the Software *
- * without restriction, including without limitation the rights to use, copy, modify,    *
- * merge, publish, distribute, sublicense, and/or sell copies of the Software, and to    *
- * permit persons to whom the Software is furnished to do so, subject to the following   *
- * conditions:                                                                           *
- *                                                                                       *
- * The above copyright notice and this permission notice shall be included in all copies *
- * or substantial portions of the Software.                                              *
- *                                                                                       *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED,   *
- * INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A         *
- * PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT    *
- * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF  *
- * CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE  *
- * OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                                         *
- ****************************************************************************************/
-
-namespace {
-
-/**
- * Starts a recording session. The string argument is the filename used for the file where
- * the recorded keyframes are saved. The file data format is binary.
- */
-[[codegen::luawrap]] void startRecording(std::string recordFilePath) {
-    using namespace openspace;
-
-    if (recordFilePath.empty()) {
-        throw ghoul::lua::LuaError("Filepath string is empty");
-    }
-    global::sessionRecording->setRecordDataFormat(
-        interaction::SessionRecording::DataMode::Binary
-    );
-    global::sessionRecording->startRecording(recordFilePath);
-}
-
-/**
- * Starts a recording session. The string argument is the filename used for the file where
- * the recorded keyframes are saved. The file data format is ASCII.
- */
-[[codegen::luawrap]] void startRecordingAscii(std::string recordFilePath) {
-    using namespace openspace;
-
-    if (recordFilePath.empty()) {
-        throw ghoul::lua::LuaError("Filepath string is empty");
-    }
-    global::sessionRecording->setRecordDataFormat(
-        interaction::SessionRecording::DataMode::Ascii
-    );
-    global::sessionRecording->startRecording(recordFilePath);
-}
-
-// Stops a recording session.
-[[codegen::luawrap]] void stopRecording() {
-    openspace::global::sessionRecording->stopRecording();
-}
-
-/**
- * Starts a playback session with keyframe times that are relative to the time since the
- * recording was started (the same relative time applies to the playback). When playback
- * starts, the simulation time is automatically set to what it was at recording time. The
- * string argument is the filename to pull playback keyframes from (the file path is
- * relative to the RECORDINGS variable specified in the config file). If a second input
- * value of true is given, then playback will continually loop until it is manually
- * stopped.
- */
-[[codegen::luawrap("startPlayback")]] void startPlaybackDefault(std::string file,
-                                                                bool loop = false,
-                                                           bool shouldWaitForTiles = true)
-{
-    using namespace openspace;
-
-    if (file.empty()) {
-        throw ghoul::lua::LuaError("Filepath string is empty");
-    }
-    global::sessionRecording->startPlayback(
-        file,
-        interaction::KeyframeTimeRef::Relative_recordedStart,
-        true,
-        loop,
-        shouldWaitForTiles
-    );
-}
-
-/**
- * Starts a playback session with keyframe times that are relative to application time
- * (seconds since OpenSpace application started). The string argument is the filename to
- * pull playback keyframes from (the file path is relative to the RECORDINGS variable
- * specified in the config file).
- */
-[[codegen::luawrap]] void startPlaybackApplicationTime(std::string file) {
-    using namespace openspace;
-
-    if (file.empty()) {
-        throw ghoul::lua::LuaError("Filepath string is empty");
-    }
-    global::sessionRecording->startPlayback(
-        file,
-        interaction::KeyframeTimeRef::Relative_applicationStart,
-        false,
-        false,
-        false
-    );
-}
-
-/**
- * Starts a playback session with keyframe times that are relative to the time since the
- * recording was started (the same relative time applies to the playback). The string
- * argument is the filename to pull playback keyframes from (the file path is relative to
- * the RECORDINGS variable specified in the config file). If a second input value of true
- * is given, then playback will continually loop until it is manually stopped.
- */
-[[codegen::luawrap]] void startPlaybackRecordedTime(std::string file, bool loop = false) {
-    using namespace openspace;
-
-    if (file.empty()) {
-        throw ghoul::lua::LuaError("Filepath string is empty");
-    }
-    global::sessionRecording->startPlayback(
-        file,
-        interaction::KeyframeTimeRef::Relative_recordedStart,
-        false,
-        loop,
-        false
-    );
-}
-
-/**
- * Starts a playback session with keyframe times that are relative to the simulated date &
- * time. The string argument is the filename to pull playback keyframes from (the file
- * path is relative to the RECORDINGS variable specified in the config file).
- */
-[[codegen::luawrap]] void startPlaybackSimulationTime(std::string file) {
-    using namespace openspace;
-
-    if (file.empty()) {
-        throw ghoul::lua::LuaError("Filepath string is empty");
-    }
-    global::sessionRecording->startPlayback(
-        file,
-        interaction::KeyframeTimeRef::Absolute_simTimeJ2000,
-        false,
-        false,
-        false
-    );
-}
-
-// Stops a playback session before playback of all keyframes is complete.
-[[codegen::luawrap]] void stopPlayback() {
-    openspace::global::sessionRecording->stopPlayback();
-}
-
-/**
- * Enables that rendered frames should be saved during playback. The parameter determines
- * the number of frames that are exported per second if this value is not provided, 60
- * frames per second will be exported.
- */
-[[codegen::luawrap]] void enableTakeScreenShotDuringPlayback(int fps = 60) {
-    openspace::global::sessionRecording->enableTakeScreenShotDuringPlayback(fps);
-}
-
-// Used to disable that renderings are saved during playback.
-[[codegen::luawrap]] void disableTakeScreenShotDuringPlayback() {
-    openspace::global::sessionRecording->disableTakeScreenShotDuringPlayback();
-}
-
-/**
- * Performs a conversion of the specified file to the most most recent file format,
- * creating a copy of the recording file.
- */
-[[codegen::luawrap]] void fileFormatConversion(std::string convertFilePath) {
-    if (convertFilePath.empty()) {
-        throw ghoul::lua::LuaError("Filepath string must not be empty");
-    }
-    openspace::global::sessionRecording->convertFile(convertFilePath);
-}
-
-// Pauses or resumes the playback progression through keyframes.
-[[codegen::luawrap]] void setPlaybackPause(bool pause) {
-    openspace::global::sessionRecording->setPlaybackPause(pause);
-}
-
-/**
- * Toggles the pause function, i.e. temporarily setting the delta time to 0 and restoring
- * it afterwards.
- */
-[[codegen::luawrap]] void togglePlaybackPause() {
-    using namespace openspace;
-
-    bool isPlaybackPaused = global::sessionRecording->isPlaybackPaused();
-    global::sessionRecording->setPlaybackPause(!isPlaybackPaused);
-}
-
-// Returns true if session recording is currently playing back a recording.
-[[codegen::luawrap]] bool isPlayingBack() {
-    return openspace::global::sessionRecording->isPlayingBack();
-}
-
-// Returns true if session recording is currently recording a recording.
-[[codegen::luawrap]] bool isRecording() {
-    return openspace::global::sessionRecording->isRecording();
-}
-
-#include "sessionrecording_lua_codegen.cpp"
-
-} // namespace
diff --git a/src/interaction/sessionrecordinghandler.cpp b/src/interaction/sessionrecordinghandler.cpp
new file mode 100644
index 0000000000..fd50725b52
--- /dev/null
+++ b/src/interaction/sessionrecordinghandler.cpp
@@ -0,0 +1,786 @@
+/*****************************************************************************************
+ *                                                                                       *
+ * OpenSpace                                                                             *
+ *                                                                                       *
+ * Copyright (c) 2014-2024                                                               *
+ *                                                                                       *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
+ * software and associated documentation files (the "Software"), to deal in the Software *
+ * without restriction, including without limitation the rights to use, copy, modify,    *
+ * merge, publish, distribute, sublicense, and/or sell copies of the Software, and to    *
+ * permit persons to whom the Software is furnished to do so, subject to the following   *
+ * conditions:                                                                           *
+ *                                                                                       *
+ * The above copyright notice and this permission notice shall be included in all copies *
+ * or substantial portions of the Software.                                              *
+ *                                                                                       *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED,   *
+ * INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A         *
+ * PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT    *
+ * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF  *
+ * CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE  *
+ * OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                                         *
+ ****************************************************************************************/
+
+#include <openspace/interaction/sessionrecordinghandler.h>
+
+#include <openspace/camera/camera.h>
+#include <openspace/engine/globals.h>
+#include <openspace/engine/openspaceengine.h>
+#include <openspace/engine/windowdelegate.h>
+#include <openspace/events/eventengine.h>
+#include <openspace/navigation/navigationhandler.h>
+#include <openspace/network/messagestructureshelper.h>
+#include <openspace/query/query.h>
+#include <openspace/rendering/renderable.h>
+#include <openspace/rendering/renderengine.h>
+#include <openspace/scene/scene.h>
+#include <openspace/scene/scenegraphnode.h>
+#include <openspace/util/timemanager.h>
+#include <ghoul/filesystem/filesystem.h>
+#include <ghoul/font/fontmanager.h>
+#include <ghoul/font/fontrenderer.h>
+
+#ifdef WIN32
+#include <Windows.h>
+#endif // WIN32
+
+#include "sessionrecordinghandler_lua.inl"
+
+namespace {
+    constexpr std::string_view _loggerCat = "SessionRecording";
+
+    template <class... Ts> struct overloaded : Ts... { using Ts::operator()...; };
+    template <class... Ts> overloaded(Ts...) -> overloaded<Ts...>;
+
+    constexpr openspace::properties::Property::PropertyInfo RenderPlaybackInfo = {
+        "RenderInfo",
+        "Render Playback Information",
+        "If enabled, information about a currently played back session recording is "
+        "rendering to screen.",
+        openspace::properties::Property::Visibility::AdvancedUser
+    };
+
+    constexpr openspace::properties::Property::PropertyInfo IgnoreRecordedScaleInfo = {
+        "IgnoreRecordedScale",
+        "Ignore Recorded Scale",
+        "If this value is enabled, the scale value from a recording is ignored and the "
+        "computed values are used instead.",
+        openspace::properties::Property::Visibility::AdvancedUser
+    };
+
+    constexpr openspace::properties::Property::PropertyInfo AddModelMatrixinAsciiInfo = {
+        "AddModelMatrixinAscii",
+        "Add Model Matrix in ASCII recording",
+        "If this is 'true', the model matrix is written into the ASCII recording format "
+        "in the line before each camera keyframe. The model matrix is the full matrix "
+        "that converts the position into a J2000+Galactic reference frame.",
+        openspace::properties::Property::Visibility::Developer
+    };
+
+    const std::string FileExtensionBinary = ".osrec";
+    const std::string FileExtensionAscii = ".osrectxt";
+
+    constexpr std::string_view ScriptReturnPrefix = "return ";
+} // namespace
+
+namespace openspace::interaction {
+
+SessionRecordingHandler::SessionRecordingHandler()
+    : properties::PropertyOwner({ "SessionRecording", "Session Recording" })
+    , _renderPlaybackInformation(RenderPlaybackInfo, false)
+    , _ignoreRecordedScale(IgnoreRecordedScaleInfo, false)
+    , _addModelMatrixinAscii(AddModelMatrixinAsciiInfo, false)
+{
+    addProperty(_renderPlaybackInformation);
+    addProperty(_ignoreRecordedScale);
+    addProperty(_addModelMatrixinAscii);
+}
+
+void SessionRecordingHandler::preSynchronization(double dt) {
+    ZoneScoped;
+
+    if (_state == SessionState::Recording) {
+        tickRecording(dt);
+    }
+    else if (isPlayingBack()) {
+        tickPlayback(dt);
+    }
+
+    // Handle callback(s) for change in idle/record/playback state
+    if (_state != _lastState) {
+        using K = CallbackHandle;
+        using V = StateChangeCallback;
+        for (const std::pair<const K, V>& it : _stateChangeCallbacks) {
+            it.second();
+        }
+        _lastState = _state;
+    }
+}
+
+void SessionRecordingHandler::tickPlayback(double dt) {
+    if (_state == SessionState::PlaybackPaused) {
+        return;
+    }
+
+    const double previousTime = _playback.elapsedTime;
+    _playback.elapsedTime += dt;
+
+    // Find the first value whose recording time is past now
+    std::vector<SessionRecording::Entry>::const_iterator probe = _currentEntry;
+    while (probe != _timeline.entries.end() && _playback.elapsedTime > probe->timestamp) {
+        probe++;
+    }
+
+    // All script entries between _previous and now have to be applied
+    for (auto& it = _currentEntry; it != probe; it++) {
+        if (std::holds_alternative<SessionRecording::Entry::Script>(it->value)) {
+            global::scriptEngine->queueScript(
+                std::get<SessionRecording::Entry::Script>(it->value)
+            );
+        }
+    }
+
+    //  ... < _previous < ... < prevCamera <= now <= nextCamera < ...
+    std::vector<SessionRecording::Entry>::const_iterator prevCamera = probe - 1;
+    while (prevCamera != _timeline.entries.begin() &&
+           !std::holds_alternative<SessionRecording::Entry::Camera>(prevCamera->value))
+    {
+        prevCamera--;
+    }
+    // We need to check this here as there might be a chance that the first camera entry
+    // is after the current elapsed time, which would result in `prevCamera` being equal
+    // to `begin()` but not being a camera keyframe
+    const bool hasValidPrevCamera =
+        std::holds_alternative<SessionRecording::Entry::Camera>(prevCamera->value);
+
+    std::vector<SessionRecording::Entry>::const_iterator nextCamera = probe;
+    while (nextCamera != _timeline.entries.end() &&
+           !std::holds_alternative<SessionRecording::Entry::Camera>(nextCamera->value))
+    {
+        nextCamera++;
+    }
+    // Same argument but in reverse from the `hasValidPrevCamera` comment
+    const bool hasValidNextCamera =
+        (nextCamera != _timeline.entries.end()) &&
+        std::holds_alternative<SessionRecording::Entry::Camera>(nextCamera->value);
+
+
+    if (!hasValidPrevCamera && !hasValidNextCamera) {
+        throw ghoul::RuntimeError("No valid camera keyframes found in recording");
+    }
+
+    // update camera with or without new keyframes
+    const auto& prevPose =
+        hasValidPrevCamera ?
+        std::get<SessionRecording::Entry::Camera>(prevCamera->value) :
+        std::get<SessionRecording::Entry::Camera>(nextCamera->value);
+    const double prevTime =
+        hasValidPrevCamera ?
+        prevCamera->timestamp :
+        0.0;
+
+    const auto& nextPose =
+        hasValidNextCamera ?
+        std::get<SessionRecording::Entry::Camera>(nextCamera->value) :
+        std::get<SessionRecording::Entry::Camera>(prevCamera->value);
+    const double nextTime =
+        hasValidNextCamera ?
+        nextCamera->timestamp :
+        _timeline.entries.back().timestamp;
+
+    // Need to actively update the focusNode position of the camera in relation to
+    // the rendered objects will be unstable and actually incorrect
+    const SceneGraphNode* n = sceneGraphNode(prevPose.focusNode);
+    if (n) {
+        global::navigationHandler->orbitalNavigator().setFocusNode(n->identifier());
+    }
+
+    const double t = std::clamp(
+        (_playback.elapsedTime - prevTime) / (nextTime - prevTime),
+        0.0,
+        1.0
+    );
+
+    interaction::KeyframeNavigator::updateCamera(
+        global::navigationHandler->camera(),
+        prevPose,
+        nextPose,
+        t,
+        _ignoreRecordedScale
+    );
+
+    if (isSavingFramesDuringPlayback()) {
+        ghoul_assert(dt == _playback.saveScreenshots.deltaTime, "Misaligned delta times");
+
+        // Check if renderable in focus is still resolving tile loading
+        // do not adjust time while we are doing this, or take screenshot
+        const SceneGraphNode* focusNode =
+            global::navigationHandler->orbitalNavigator().anchorNode();
+        const Renderable* focusRenderable = focusNode->renderable();
+        if (!_playback.waitForLoading ||
+            !focusRenderable || focusRenderable->renderedWithDesiredData())
+        {
+            _playback.saveScreenshots.currentRecordedTime +=
+                std::chrono::microseconds(static_cast<long>(dt * 1000000));
+            _playback.saveScreenshots.currentApplicationTime += dt;
+
+            // Unfortunately the first frame is sometimes rendered because globebrowsing
+            // reports that all chunks are rendered when they apparently are not.
+            // previousTime == 0.0 -> rendering the first frame
+            if (previousTime != 0.0) {
+                global::renderEngine->takeScreenshot();
+            }
+        }
+    }
+
+    _currentEntry = probe;
+    if (probe == _timeline.entries.end()) {
+        if (_playback.isLooping) {
+            _playback.saveScreenshots.enabled = false;
+            setupPlayback(global::windowDelegate->applicationTime());
+        }
+        else {
+            stopPlayback();
+        }
+    }
+}
+
+void SessionRecordingHandler::tickRecording(double dt) {
+    _recording.elapsedTime += dt;
+
+    using namespace datamessagestructures;
+    CameraKeyframe kf = generateCameraKeyframe();
+    _timeline.entries.emplace_back(
+        _recording.elapsedTime,
+        global::timeManager->time().j2000Seconds(),
+        KeyframeNavigator::CameraPose(std::move(kf))
+    );
+}
+
+void SessionRecordingHandler::render() const {
+    if (!_renderPlaybackInformation || !isPlayingBack()) {
+        return;
+    }
+
+    constexpr std::string_view FontName = "Mono";
+    constexpr float FontSizeFrameinfo = 32.f;
+    const std::shared_ptr<ghoul::fontrendering::Font> font =
+        global::fontManager->font(FontName, FontSizeFrameinfo);
+
+    glm::vec2 penPosition = global::renderEngine->fontResolution() - glm::ivec2(150, 0);
+    const std::string text = std::format(
+        "Elapsed:  {:.3f} / {}\n"
+        "Keyframe: {} / {}\n"
+        "Is Looping: {}\n"
+        "Saving frames: {}\n"
+        "Wait for Loading: {}\n"
+        "Scale: {}",
+        _playback.elapsedTime, _timeline.entries.back().timestamp,
+        std::distance(_timeline.entries.begin(), _currentEntry), _timeline.entries.size(),
+        _playback.isLooping ? "true" : "false",
+        _playback.saveScreenshots.enabled ? "true" : "false",
+        _playback.waitForLoading ? "true" : "false",
+        global::navigationHandler->camera()->scaling()
+    );
+    ghoul::fontrendering::RenderFont(
+        *font,
+        penPosition,
+        text,
+        glm::vec4(1.f),
+        ghoul::fontrendering::CrDirection::Down
+    );
+}
+
+void SessionRecordingHandler::startRecording() {
+    if (_state == SessionState::Recording) {
+        throw ghoul::RuntimeError(
+            "Unable to start recording while already in recording mode",
+            "SessionRecordingHandler"
+        );
+    }
+    else if (isPlayingBack()) {
+        throw ghoul::RuntimeError(
+            "Unable to start recording while in session playback mode",
+            "SessionRecordingHandler"
+        );
+    }
+
+    LINFO("Session recording started");
+
+    _state = SessionState::Recording;
+    _timeline = SessionRecording();
+    _savePropertiesBaseline.clear();
+    _recording.elapsedTime = 0.0;
+
+    // Record the current delta time as the first property to save in the file.
+    // This needs to be saved as a baseline whether or not it changes during recording
+    // Dummy `_time` "property" to store the time setup in the baseline
+    _savePropertiesBaseline["_time"] = std::format(
+        "openspace.time.setPause({});openspace.time.setDeltaTime({});",
+        global::timeManager->isPaused() ? "true" : "false",
+        global::timeManager->targetDeltaTime()
+    );
+}
+
+void SessionRecordingHandler::stopRecording(const std::filesystem::path& filename,
+                                            DataMode dataMode)
+{
+    if (_state != SessionState::Recording) {
+        return;
+    }
+
+    if (std::filesystem::is_regular_file(filename)) {
+        throw ghoul::RuntimeError(std::format(
+            "Unable to start recording. File '{}' already exists", filename
+        ), "SessionRecording");
+    }
+
+    for (const auto& [prop, script] : _savePropertiesBaseline) {
+        _timeline.entries.insert(_timeline.entries.begin(), { 0.0, 0.0, script });
+    }
+
+    saveSessionRecording(filename, _timeline, dataMode);
+    _state = SessionState::Idle;
+    cleanUpTimelinesAndKeyframes();
+    LINFO("Session recording stopped");
+}
+
+void SessionRecordingHandler::startPlayback(SessionRecording timeline, bool loop,
+                                            bool shouldWaitForFinishedTiles,
+                                            std::optional<int> saveScreenshotFps)
+{
+    OpenSpaceEngine::Mode prevMode = global::openSpaceEngine->currentMode();
+    const bool canTriggerPlayback = global::openSpaceEngine->setMode(
+        OpenSpaceEngine::Mode::SessionRecordingPlayback
+    );
+    if (!canTriggerPlayback) {
+        return;
+    }
+
+    if (_state == SessionState::Recording) {
+        global::openSpaceEngine->setMode(prevMode);
+        throw ghoul::RuntimeError(
+            "Unable to start playback while in session recording mode"
+        );
+    }
+    else if (isPlayingBack()) {
+        global::openSpaceEngine->setMode(prevMode);
+        throw ghoul::RuntimeError(
+            "Unable to start new playback while in session playback mode"
+        );
+    }
+
+    _playback.isLooping = loop;
+    _playback.waitForLoading = shouldWaitForFinishedTiles;
+
+    timeline.forAll<SessionRecording::Entry::Script>(
+        [this](const SessionRecording::Entry::Script& script) {
+            checkIfScriptUsesScenegraphNode(script);
+            return false;
+        }
+    );
+
+    if (timeline.entries.empty()) {
+        global::openSpaceEngine->setMode(prevMode);
+        throw ghoul::RuntimeError("Session recording is empty");
+    }
+    if (!timeline.hasCameraFrame()) {
+        global::openSpaceEngine->setMode(prevMode);
+        throw ghoul::RuntimeError("Session recording did not contain camera keyframes");
+    }
+
+    _timeline = std::move(timeline);
+
+    // Populate list of loaded scene graph nodes
+    _loadedNodes.clear();
+    const std::vector<SceneGraphNode*> nodes = sceneGraph()->allSceneGraphNodes();
+    for (SceneGraphNode* n : nodes) {
+        _loadedNodes.push_back(n->identifier());
+    }
+
+    double now = global::windowDelegate->applicationTime();
+    setupPlayback(now);
+    _playback.saveScreenshots.enabled = saveScreenshotFps.has_value();
+    if (saveScreenshotFps.has_value()) {
+        _playback.saveScreenshots.deltaTime = 1.0 / *saveScreenshotFps;
+    }
+
+    global::navigationHandler->orbitalNavigator().updateOnCameraInteraction();
+
+    LINFO("Playback session started");
+    global::eventEngine->publishEvent<events::EventSessionRecordingPlayback>(
+        events::EventSessionRecordingPlayback::State::Started
+    );
+}
+
+void SessionRecordingHandler::setupPlayback(double startTime) {
+    _playback.elapsedTime = 0.0;
+    _playback.saveScreenshots.currentRecordedTime = std::chrono::steady_clock::now();
+    _playback.saveScreenshots.currentApplicationTime =
+        global::windowDelegate->applicationTime();
+    global::navigationHandler->keyframeNavigator().setTimeReferenceMode(
+        KeyframeTimeRef::Relative_recordedStart, startTime);
+
+
+    auto firstCamera = _timeline.entries.begin();
+    while (firstCamera != _timeline.entries.end() &&
+           !std::holds_alternative<SessionRecording::Entry::Camera>(firstCamera->value))
+    {
+        firstCamera++;
+    }
+
+    std::string startFocusNode =
+        std::get<SessionRecording::Entry::Camera>(firstCamera->value).focusNode;
+    auto it = std::find(_loadedNodes.begin(), _loadedNodes.end(), startFocusNode);
+    if (it == _loadedNodes.end()) {
+        throw ghoul::RuntimeError(std::format(
+            "Playback file requires scenegraph node '{}', which is "
+            "not currently loaded", startFocusNode
+        ));
+    }
+
+    global::timeManager->setTimeNextFrame(Time(firstCamera->simulationTime));
+    _currentEntry = _timeline.entries.begin();
+    _state = SessionState::Playback;
+}
+
+void SessionRecordingHandler::seek(double recordingTime) {
+    _currentEntry = std::upper_bound(
+        _timeline.entries.begin(),
+        _timeline.entries.end(),
+        recordingTime,
+        [](double recordingTime, const SessionRecording::Entry& e) {
+            return recordingTime < e.timestamp;
+        }
+    );
+    _playback.elapsedTime = recordingTime;
+}
+
+bool SessionRecordingHandler::isPlaybackPaused() const {
+    return (_state == SessionState::PlaybackPaused);
+}
+
+void SessionRecordingHandler::setPlaybackPause(bool pause) {
+    if (pause && _state == SessionState::Playback) {
+        _playback.playbackPausedWithDeltaTimePause = global::timeManager->isPaused();
+        if (!_playback.playbackPausedWithDeltaTimePause) {
+            global::timeManager->setPause(true);
+        }
+        _state = SessionState::PlaybackPaused;
+        global::eventEngine->publishEvent<events::EventSessionRecordingPlayback>(
+            events::EventSessionRecordingPlayback::State::Paused
+        );
+    }
+    else if (!pause && _state == SessionState::PlaybackPaused) {
+        if (!_playback.playbackPausedWithDeltaTimePause) {
+            global::timeManager->setPause(false);
+        }
+        _state = SessionState::Playback;
+        global::eventEngine->publishEvent<events::EventSessionRecordingPlayback>(
+            events::EventSessionRecordingPlayback::State::Resumed
+        );
+    }
+}
+
+void SessionRecordingHandler::stopPlayback() {
+    if (!isPlayingBack()) {
+        return;
+    }
+
+    LINFO("Session playback finished");
+    _state = SessionState::Idle;
+    cleanUpTimelinesAndKeyframes();
+    global::eventEngine->publishEvent<events::EventSessionRecordingPlayback>(
+        events::EventSessionRecordingPlayback::State::Finished
+    );
+    global::openSpaceEngine->resetMode();
+    global::navigationHandler->resetNavigationUpdateVariables();
+}
+
+void SessionRecordingHandler::cleanUpTimelinesAndKeyframes() {
+    _timeline = SessionRecording();
+    _savePropertiesBaseline.clear();
+    _loadedNodes.clear();
+    _currentEntry = _timeline.entries.end();
+    _playback.saveScreenshots.enabled = false;
+    _playback.isLooping = false;
+}
+
+void SessionRecordingHandler::saveScriptKeyframeToTimeline(std::string script) {
+    constexpr std::array<std::string_view, 6> ScriptRejects = {
+        "openspace.sessionRecording.enableTakeScreenShotDuringPlayback",
+        "openspace.sessionRecording.startPlayback",
+        "openspace.sessionRecording.stopPlayback",
+        "openspace.sessionRecording.startRecording",
+        "openspace.sessionRecording.stopRecording",
+        "openspace.scriptScheduler.clear"
+    };
+
+    constexpr std::array<std::string_view, 1> ScriptsToBeTrimmed = {
+        "openspace.sessionRecording.togglePlaybackPause"
+    };
+
+    if (script.starts_with(ScriptReturnPrefix)) {
+        script = script.substr(ScriptReturnPrefix.length());
+    }
+    for (std::string_view reject : ScriptRejects) {
+        if (script.starts_with(reject)) {
+            return;
+        }
+    }
+
+    // Trim commands from script if found
+    for (std::string_view trimSnippet : ScriptsToBeTrimmed) {
+        auto findIdx = script.find(trimSnippet);
+        if (findIdx != std::string::npos) {
+            auto findClosingParens = script.find_first_of(')', findIdx);
+            script.erase(findIdx, findClosingParens + 1);
+        }
+    }
+
+    // Any script snippet included in this vector will be trimmed from any script
+    // from the script manager, before it is recorded in the session recording file.
+    // The remainder of the script will be retained.
+    using ScriptSubstringReplace = std::pair<std::string_view, std::string_view>;
+    constexpr std::array<ScriptSubstringReplace, 2> ScriptsToBeReplaced = {
+        std::pair {
+            "openspace.time.pauseToggleViaKeyboard",
+            "openspace.time.interpolateTogglePause"
+        }
+    };
+
+    // Replace commands from script if found
+    for (const ScriptSubstringReplace& replacementSnippet : ScriptsToBeReplaced) {
+        auto findIdx = script.find(replacementSnippet.first);
+        if (findIdx != std::string::npos) {
+            script.erase(findIdx, replacementSnippet.first.length());
+            script.insert(findIdx, replacementSnippet.second);
+        }
+    }
+
+    _timeline.entries.emplace_back(
+        _recording.elapsedTime,
+        global::timeManager->time().j2000Seconds(),
+        std::move(script)
+    );
+}
+
+void SessionRecordingHandler::savePropertyBaseline(properties::Property& prop) {
+    constexpr std::array<std::string_view, 4> PropertyBaselineRejects{
+        "NavigationHandler.OrbitalNavigator.Anchor",
+        "NavigationHandler.OrbitalNavigator.Aim",
+        "NavigationHandler.OrbitalNavigator.RetargetAnchor",
+        "NavigationHandler.OrbitalNavigator.RetargetAim"
+    };
+
+    const std::string propIdentifier = prop.uri();
+    for (std::string_view reject : PropertyBaselineRejects) {
+        if (propIdentifier.starts_with(reject)) {
+            return;
+        }
+    }
+
+    const bool isPropAlreadySaved = _savePropertiesBaseline.contains(propIdentifier);
+    if (!isPropAlreadySaved) {
+        const std::string initialScriptCommand = std::format(
+            "openspace.setPropertyValueSingle(\"{}\", {})",
+            propIdentifier, prop.stringValue()
+        );
+        _savePropertiesBaseline[propIdentifier] = initialScriptCommand;
+    }
+}
+
+bool SessionRecordingHandler::isRecording() const {
+    return _state == SessionState::Recording;
+}
+
+bool SessionRecordingHandler::isPlayingBack() const {
+    return _state == SessionState::Playback || _state == SessionState::PlaybackPaused;
+}
+
+bool SessionRecordingHandler::isSavingFramesDuringPlayback() const {
+    return isPlayingBack() && _playback.saveScreenshots.enabled;
+}
+
+bool SessionRecordingHandler::shouldWaitForTileLoading() const {
+    return _playback.waitForLoading;
+}
+
+SessionRecordingHandler::SessionState SessionRecordingHandler::state() const {
+    return _state;
+}
+
+double SessionRecordingHandler::fixedDeltaTimeDuringFrameOutput() const {
+    // Check if renderable in focus is still resolving tile loading
+    // do not adjust time while we are doing this
+    const SceneGraphNode* an = global::navigationHandler->orbitalNavigator().anchorNode();
+    const Renderable* focusRenderable = an->renderable();
+    if (!focusRenderable || focusRenderable->renderedWithDesiredData()) {
+        return _playback.saveScreenshots.deltaTime;
+    }
+    else {
+        return 0.0;
+    }
+}
+
+std::chrono::steady_clock::time_point
+SessionRecordingHandler::currentPlaybackInterpolationTime() const {
+    return _playback.saveScreenshots.currentRecordedTime;
+}
+
+double SessionRecordingHandler::currentApplicationInterpolationTime() const {
+    return _playback.saveScreenshots.currentApplicationTime;
+}
+
+void SessionRecordingHandler::checkIfScriptUsesScenegraphNode(std::string_view s) const {
+    auto isolateTermFromQuotes = [](std::string_view s) -> std::string_view {
+        // Remove any leading spaces
+        s.remove_prefix(s.find_first_not_of(" "));
+
+        // Find the first substring that is surrounded by possible quotes
+        constexpr std::string_view PossibleQuotes = "\'\"[]";
+        s.remove_prefix(s.find_first_not_of(PossibleQuotes));
+        size_t end = s.find_first_of(PossibleQuotes);
+        if (end != std::string::npos) {
+            return s.substr(0, end);
+        }
+        else {
+            // There were no closing quotes so we remove as much as possible
+            constexpr std::string_view UnwantedChars = " );";
+            s.remove_suffix(s.find_last_not_of(UnwantedChars));
+            return s;
+        }
+    };
+
+    auto checkForScenegraphNodeAccessNav = [](std::string_view navTerm) -> bool {
+        constexpr std::array<std::string_view, 3> NavScriptsUsingNodes = {
+            "NavigationHandler.OrbitalNavigator.RetargetAnchor",
+            "NavigationHandler.OrbitalNavigator.Anchor",
+            "NavigationHandler.OrbitalNavigator.Aim"
+        };
+
+        for (std::string_view script : NavScriptsUsingNodes) {
+            if (navTerm.find(script) != std::string::npos) {
+                return true;
+            }
+        }
+        return false;
+    };
+
+    if (s.starts_with(ScriptReturnPrefix)) {
+        s.remove_prefix(ScriptReturnPrefix.length());
+    }
+    // This works for both setPropertyValue and setPropertyValueSingle
+    if (!s.starts_with("openspace.setPropertyValue") || s.find('(') == std::string::npos)
+    {
+        return;
+    }
+
+    std::string_view subjectOfSetProp = isolateTermFromQuotes(s.substr(s.find('(') + 1));
+    if (checkForScenegraphNodeAccessNav(subjectOfSetProp)) {
+        std::string_view navNode = isolateTermFromQuotes(s.substr(s.find(',') + 1));
+        if (navNode != "nil") {
+            auto it = std::find(_loadedNodes.begin(), _loadedNodes.end(), navNode);
+            if (it == _loadedNodes.end()) {
+                LWARNING(std::format(
+                    "Playback file contains a property setting of navigation using "
+                    "scenegraph node '{}', which is not currently loaded", navNode
+                ));
+            }
+        }
+    }
+    else if (subjectOfSetProp.find("Scene.") != std::string::npos) {
+        auto extractScenegraphNodeFromScene = [](std::string_view s) -> std::string_view {
+            constexpr std::string_view Scene = "Scene.";
+            size_t scene = s.find(Scene);
+            if (scene == std::string_view::npos) {
+                return "";
+            }
+            s.remove_prefix(scene + Scene.length());
+            size_t end = s.find('.');
+            return end != std::string_view::npos ? s.substr(0, end) : "";
+        };
+
+        std::string_view found = extractScenegraphNodeFromScene(subjectOfSetProp);
+        if (!found.empty()) {
+            const std::vector<properties::Property*> matchHits =
+                sceneGraph()->propertiesMatchingRegex(subjectOfSetProp);
+            if (matchHits.empty()) {
+                LWARNING(std::format(
+                    "Playback file contains a property setting of scenegraph "
+                    "node '{}', which is not currently loaded", found
+                ));
+            }
+        }
+    }
+}
+
+SessionRecordingHandler::CallbackHandle SessionRecordingHandler::addStateChangeCallback(
+                                                                   StateChangeCallback cb)
+{
+    const CallbackHandle handle = _nextCallbackHandle++;
+    _stateChangeCallbacks.emplace_back(handle, std::move(cb));
+    return handle;
+}
+
+void SessionRecordingHandler::removeStateChangeCallback(CallbackHandle handle) {
+    const auto it = std::find_if(
+        _stateChangeCallbacks.begin(),
+        _stateChangeCallbacks.end(),
+        [handle](const std::pair<CallbackHandle, std::function<void()>>& cb) {
+            return cb.first == handle;
+        }
+    );
+
+    ghoul_assert(it != _stateChangeCallbacks.end(), "handle must be a valid callback");
+    _stateChangeCallbacks.erase(it);
+}
+
+std::vector<std::string> SessionRecordingHandler::playbackList() const {
+    const std::filesystem::path path = absPath("${RECORDINGS}");
+    if (!std::filesystem::is_directory(path)) {
+        return std::vector<std::string>();
+    }
+
+    std::vector<std::string> fileList;
+    namespace fs = std::filesystem;
+    for (const fs::directory_entry& e : fs::directory_iterator(path)) {
+        if (!e.is_regular_file()) {
+            continue;
+        }
+
+        // Remove path and keep only the filename
+        const std::string filename = e.path().filename().string();
+#ifdef WIN32
+        DWORD attributes = GetFileAttributes(e.path().string().c_str());
+        bool isHidden = attributes & FILE_ATTRIBUTE_HIDDEN;
+#else
+        const bool isHidden = filename.find('.') == 0;
+#endif // WIN32
+        if (!isHidden) {
+            // Don't add hidden files
+            fileList.push_back(filename);
+        }
+    }
+    std::sort(fileList.begin(), fileList.end());
+    return fileList;
+}
+
+scripting::LuaLibrary SessionRecordingHandler::luaLibrary() {
+    return {
+        "sessionRecording",
+        {
+            codegen::lua::StartRecording,
+            codegen::lua::StopRecording,
+            codegen::lua::StartPlayback,
+            codegen::lua::StopPlayback,
+            codegen::lua::SetPlaybackPause,
+            codegen::lua::TogglePlaybackPause,
+            codegen::lua::IsPlayingBack,
+            codegen::lua::IsRecording
+        }
+    };
+}
+
+} // namespace openspace
diff --git a/src/interaction/sessionrecordinghandler_lua.inl b/src/interaction/sessionrecordinghandler_lua.inl
new file mode 100644
index 0000000000..d533b59a39
--- /dev/null
+++ b/src/interaction/sessionrecordinghandler_lua.inl
@@ -0,0 +1,121 @@
+/*****************************************************************************************
+ *                                                                                       *
+ * OpenSpace                                                                             *
+ *                                                                                       *
+ * Copyright (c) 2014-2024                                                               *
+ *                                                                                       *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
+ * software and associated documentation files (the "Software"), to deal in the Software *
+ * without restriction, including without limitation the rights to use, copy, modify,    *
+ * merge, publish, distribute, sublicense, and/or sell copies of the Software, and to    *
+ * permit persons to whom the Software is furnished to do so, subject to the following   *
+ * conditions:                                                                           *
+ *                                                                                       *
+ * The above copyright notice and this permission notice shall be included in all copies *
+ * or substantial portions of the Software.                                              *
+ *                                                                                       *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED,   *
+ * INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A         *
+ * PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT    *
+ * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF  *
+ * CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE  *
+ * OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                                         *
+ ****************************************************************************************/
+
+namespace {
+
+/**
+ * Starts a recording session. The string argument is the filename used for the file where
+ * the recorded keyframes are saved.
+ */
+[[codegen::luawrap]] void startRecording() {
+    openspace::global::sessionRecordingHandler->startRecording();
+}
+
+// Stops a recording session. `dataMode` has to be "Ascii" or "Binary"
+[[codegen::luawrap]] void stopRecording(std::filesystem::path recordFilePath,
+                                        std::string dataMode)
+{
+    if (recordFilePath.empty()) {
+        throw ghoul::lua::LuaError("Filepath string is empty");
+    }
+
+    if (dataMode != "Ascii" && dataMode != "Binary") {
+        throw ghoul::lua::LuaError(std::format("Invalid data mode {}", dataMode));
+    }
+
+    using DataMode = openspace::interaction::DataMode;
+    openspace::global::sessionRecordingHandler->stopRecording(
+        recordFilePath,
+        dataMode == "Ascii" ? DataMode::Ascii : DataMode::Binary
+    );
+}
+
+/**
+ * Starts a playback session with keyframe times that are relative to the time since the
+ * recording was started (the same relative time applies to the playback). When playback
+ * starts, the simulation time is automatically set to what it was at recording time. The
+ * string argument is the filename to pull playback keyframes from (the file path is
+ * relative to the RECORDINGS variable specified in the config file). If a second input
+ * value of true is given, then playback will continually loop until it is manually
+ * stopped.
+ */
+[[codegen::luawrap]] void startPlayback(std::string file, bool loop = false,
+                                        bool shouldWaitForTiles = true,
+                                        std::optional<int> screenshotFps = std::nullopt)
+{
+    using namespace openspace;
+
+    if (file.empty()) {
+        throw ghoul::lua::LuaError("Filepath string is empty");
+    }
+
+    if (!std::filesystem::is_regular_file(file)) {
+        throw ghoul::RuntimeError(std::format(
+            "Cannot find the specified playback file '{}'", file
+        ));
+    }
+
+    interaction::SessionRecording timeline = interaction::loadSessionRecording(file);
+    global::sessionRecordingHandler->startPlayback(
+        std::move(timeline),
+        loop,
+        shouldWaitForTiles,
+        screenshotFps
+    );
+}
+
+// Stops a playback session before playback of all keyframes is complete.
+[[codegen::luawrap]] void stopPlayback() {
+    openspace::global::sessionRecordingHandler->stopPlayback();
+}
+
+// Pauses or resumes the playback progression through keyframes.
+[[codegen::luawrap]] void setPlaybackPause(bool pause) {
+    openspace::global::sessionRecordingHandler->setPlaybackPause(pause);
+}
+
+/**
+ * Toggles the pause function, i.e. temporarily setting the delta time to 0 and restoring
+ * it afterwards.
+ */
+[[codegen::luawrap]] void togglePlaybackPause() {
+    using namespace openspace;
+
+    bool isPlaybackPaused = global::sessionRecordingHandler->isPlaybackPaused();
+    global::sessionRecordingHandler->setPlaybackPause(!isPlaybackPaused);
+}
+
+// Returns true if session recording is currently playing back a recording.
+[[codegen::luawrap]] bool isPlayingBack() {
+    return openspace::global::sessionRecordingHandler->isPlayingBack();
+}
+
+// Returns true if session recording is currently recording a recording.
+[[codegen::luawrap]] bool isRecording() {
+    return openspace::global::sessionRecordingHandler->isRecording();
+}
+
+#include "sessionrecordinghandler_lua_codegen.cpp"
+
+} // namespace
diff --git a/src/interaction/tasks/convertrecfileversiontask.cpp b/src/interaction/tasks/convertrecfileversiontask.cpp
deleted file mode 100644
index f309eab39e..0000000000
--- a/src/interaction/tasks/convertrecfileversiontask.cpp
+++ /dev/null
@@ -1,117 +0,0 @@
-/*****************************************************************************************
- *                                                                                       *
- * OpenSpace                                                                             *
- *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
- *                                                                                       *
- * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
- * software and associated documentation files (the "Software"), to deal in the Software *
- * without restriction, including without limitation the rights to use, copy, modify,    *
- * merge, publish, distribute, sublicense, and/or sell copies of the Software, and to    *
- * permit persons to whom the Software is furnished to do so, subject to the following   *
- * conditions:                                                                           *
- *                                                                                       *
- * The above copyright notice and this permission notice shall be included in all copies *
- * or substantial portions of the Software.                                              *
- *                                                                                       *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED,   *
- * INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A         *
- * PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT    *
- * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF  *
- * CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE  *
- * OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                                         *
- ****************************************************************************************/
-
-#include <openspace/interaction/tasks/convertrecfileversiontask.h>
-#include <openspace/interaction/sessionrecording.h>
-#include <openspace/documentation/verifier.h>
-
-#include <openspace/engine/globals.h>
-#include <ghoul/filesystem/file.h>
-#include <ghoul/filesystem/filesystem.h>
-#include <filesystem>
-#include <iomanip>
-#include <ghoul/logging/logmanager.h>
-
-namespace {
-    constexpr std::string_view _loggerCat = "ConvertRecFileVersionTask";
-
-    constexpr std::string_view KeyInFilePath = "InputFilePath";
-} // namespace
-
-namespace openspace::interaction {
-
-ConvertRecFileVersionTask::ConvertRecFileVersionTask(const ghoul::Dictionary& dictionary)
-{
-    openspace::documentation::testSpecificationAndThrow(
-        documentation(),
-        dictionary,
-        "ConvertRecFileVersionTask"
-    );
-
-    _inFilename = dictionary.value<std::string>(KeyInFilePath);
-    _inFilePath = absPath(_inFilename);
-
-    ghoul_assert(std::filesystem::is_regular_file(_inFilePath), "The file must exist");
-    if (!std::filesystem::is_regular_file(_inFilePath)) {
-        LERROR(std::format("Failed to load session recording file: {}", _inFilePath));
-    }
-    else {
-        sessRec = new SessionRecording(false);
-    }
-}
-
-ConvertRecFileVersionTask::~ConvertRecFileVersionTask() {
-    delete sessRec;
-}
-
-std::string ConvertRecFileVersionTask::description() {
-    std::string description = std::format(
-        "Convert file format of session recording file '{}' to current version",
-        _inFilePath
-    );
-    return description;
-}
-
-void ConvertRecFileVersionTask::perform(const Task::ProgressCallback&) {
-    convert();
-}
-
-void ConvertRecFileVersionTask::convert() {
-    const bool hasBinaryFileExtension = SessionRecording::hasFileExtension(
-        _inFilename,
-        SessionRecording::FileExtensionBinary
-    );
-    const bool hasAsciiFileExtension = SessionRecording::hasFileExtension(
-        _inFilename,
-        SessionRecording::FileExtensionAscii
-    );
-    if (!hasBinaryFileExtension && !hasAsciiFileExtension) {
-        LERROR(std::format(
-            "Input filename does not have expected '{}' or '{}' extension",
-            SessionRecording::FileExtensionBinary, SessionRecording::FileExtensionAscii
-        ));
-        return;
-    }
-    sessRec->convertFileRelativePath(_inFilename);
-}
-
-documentation::Documentation ConvertRecFileVersionTask::documentation() {
-    using namespace documentation;
-    return {
-        "ConvertRecFileVersionTask",
-        "convert_file_version_task",
-        "",
-        {
-            {
-                "InputFilePath",
-                new StringAnnotationVerifier("A valid filename to convert"),
-                Optional::No,
-                Private::No,
-                "The filename to update to the current file format",
-            },
-        },
-    };
-}
-
-} // namespace openspace::interaction
diff --git a/src/interaction/tasks/convertrecformattask.cpp b/src/interaction/tasks/convertrecformattask.cpp
index d7f19fe300..289ee653d8 100644
--- a/src/interaction/tasks/convertrecformattask.cpp
+++ b/src/interaction/tasks/convertrecformattask.cpp
@@ -39,293 +39,54 @@ namespace {
 
     constexpr std::string_view KeyInFilePath = "InputFilePath";
     constexpr std::string_view KeyOutFilePath = "OutputFilePath";
+
+    struct [[codegen::Dictionary(ConvertRecFormatTask)]] Parameters {
+        std::filesystem::path inputFilePath;
+        std::filesystem::path outputFilePath;
+
+        enum class DataMode {
+            Ascii,
+            Binary
+        };
+        DataMode outputMode;
+    };
+
+#include "convertrecformattask_codegen.cpp"
 } // namespace
 
 namespace openspace::interaction {
 
+documentation::Documentation ConvertRecFormatTask::documentation() {
+    return codegen::doc<Parameters>("convert_format_task");
+}
+
 ConvertRecFormatTask::ConvertRecFormatTask(const ghoul::Dictionary& dictionary) {
-    openspace::documentation::testSpecificationAndThrow(
-        documentation(),
-        dictionary,
-        "ConvertRecFormatTask"
-    );
+    const Parameters p = codegen::bake<Parameters>(dictionary);
 
-    _inFilePath = absPath(dictionary.value<std::string>(KeyInFilePath));
-    _outFilePath = absPath(dictionary.value<std::string>(KeyOutFilePath));
+    _inFilePath = p.inputFilePath;
+    _outFilePath = p.outputFilePath;
+
+    switch (p.outputMode) {
+        case Parameters::DataMode::Ascii:
+            _dataMode = DataMode::Ascii;
+            break;
+        case Parameters::DataMode::Binary:
+            _dataMode = DataMode::Binary;
+            break;
+    }
 
-    ghoul_assert(std::filesystem::is_regular_file(_inFilePath), "The file must exist");
     if (!std::filesystem::is_regular_file(_inFilePath)) {
         LERROR(std::format("Failed to load session recording file: {}", _inFilePath));
     }
-    else {
-        _iFile.open(_inFilePath, std::ifstream::in | std::ifstream::binary);
-        determineFormatType();
-        sessRec = new SessionRecording(false);
-    }
-}
-
-ConvertRecFormatTask::~ConvertRecFormatTask() {
-    _iFile.close();
-    _oFile.close();
-    delete sessRec;
 }
 
 std::string ConvertRecFormatTask::description() {
-    std::string description =
-        std::format("Convert session recording file '{}'", _inFilePath);
-    if (_fileFormatType == SessionRecording::DataMode::Ascii) {
-        description += "(ascii format) ";
-    }
-    else if (_fileFormatType == SessionRecording::DataMode::Binary) {
-        description += "(binary format) ";
-    }
-    else {
-        description += "(UNKNOWN format) ";
-    }
-    description += std::format("conversion to file '{}'", _outFilePath);
-    return description;
+    return "Convert session recording files between ASCII and Binary formats";
 }
 
 void ConvertRecFormatTask::perform(const Task::ProgressCallback&) {
-    convert();
-}
-
-void ConvertRecFormatTask::convert() {
-    std::string expectedFileExtension_in;
-    std::string expectedFileExtension_out;
-    std::string currentFormat;
-    if (_fileFormatType == SessionRecording::DataMode::Binary) {
-        currentFormat = "binary";
-        expectedFileExtension_in = SessionRecording::FileExtensionBinary;
-        expectedFileExtension_out = SessionRecording::FileExtensionAscii;
-    }
-    else if (_fileFormatType == SessionRecording::DataMode::Ascii) {
-        currentFormat = "ascii";
-        expectedFileExtension_in = SessionRecording::FileExtensionAscii;
-        expectedFileExtension_out = SessionRecording::FileExtensionBinary;
-    }
-
-    if (_inFilePath.extension() != expectedFileExtension_in) {
-        LWARNING(std::format(
-            "Input filename doesn't have expected '{}' format file extension",
-            currentFormat
-        ));
-    }
-    if (_outFilePath.extension() == expectedFileExtension_in) {
-        LERROR(std::format(
-            "Output filename has '{}' file extension, but is conversion from '{}'",
-            currentFormat, currentFormat
-        ));
-        return;
-    }
-    else if (_outFilePath.extension() != expectedFileExtension_out) {
-        _outFilePath += expectedFileExtension_out;
-    }
-
-    if (_fileFormatType == SessionRecording::DataMode::Ascii) {
-        _iFile.close();
-        _iFile.open(_inFilePath, std::ifstream::in);
-        //Throw out first line
-        std::string throw_out;
-        ghoul::getline(_iFile, throw_out);
-        _oFile.open(_outFilePath);
-    }
-    else if (_fileFormatType == SessionRecording::DataMode::Binary) {
-        _oFile.open(_outFilePath, std::ios::binary);
-    }
-    _oFile.write(
-        SessionRecording::FileHeaderTitle.c_str(),
-        SessionRecording::FileHeaderTitle.length()
-    );
-    _oFile.write(_version.c_str(), SessionRecording::FileHeaderVersionLength);
-    _oFile.close();
-
-    if (_fileFormatType == SessionRecording::DataMode::Ascii) {
-        convertToBinary();
-    }
-    else if (_fileFormatType == SessionRecording::DataMode::Binary) {
-        convertToAscii();
-    }
-    else {
-        // Add error output for file type not recognized
-        LERROR("Session recording file unrecognized format type");
-    }
-}
-
-void ConvertRecFormatTask::determineFormatType() {
-    _fileFormatType = SessionRecording::DataMode::Unknown;
-    std::string line;
-
-    line = SessionRecording::readHeaderElement(_iFile,
-        SessionRecording::FileHeaderTitle.length());
-
-    if (line.substr(0, SessionRecording::FileHeaderTitle.length())
-        != SessionRecording::FileHeaderTitle)
-    {
-        LERROR(std::format(
-            "Session recording file '{}' does not have expected header", _inFilePath
-        ));
-    }
-    else {
-        //Read version string and throw it away (and also line feed character at end)
-        _version = SessionRecording::readHeaderElement(_iFile,
-            SessionRecording::FileHeaderVersionLength);
-        line = SessionRecording::readHeaderElement(_iFile, 1);
-        SessionRecording::readHeaderElement(_iFile, 1);
-
-        if (line.at(0) == SessionRecording::DataFormatAsciiTag) {
-            _fileFormatType = SessionRecording::DataMode::Ascii;
-        }
-        else if (line.at(0) == SessionRecording::DataFormatBinaryTag) {
-            _fileFormatType = SessionRecording::DataMode::Binary;
-        }
-    }
-}
-
-void ConvertRecFormatTask::convertToAscii() {
-    SessionRecording::Timestamps times;
-    datamessagestructures::CameraKeyframe ckf;
-    datamessagestructures::TimeKeyframe tkf;
-    datamessagestructures::ScriptMessage skf;
-    int lineNum = 1;
-    _oFile.open(_outFilePath, std::ifstream::app);
-    const char tmpType = SessionRecording::DataFormatAsciiTag;
-    _oFile.write(&tmpType, 1);
-    _oFile.write("\n", 1);
-
-    while (true) {
-        const unsigned char frameType = readFromPlayback<unsigned char>(_iFile);
-        // Check if have reached EOF
-        if (!_iFile) {
-            LINFO(std::format(
-                "Finished converting {} entries from file '{}'", lineNum - 1, _inFilePath
-            ));
-            break;
-        }
-
-        std::stringstream keyframeLine = std::stringstream();
-        keyframeLine.str(std::string());
-
-        if (frameType == SessionRecording::HeaderCameraBinary) {
-            sessRec->readCameraKeyframeBinary(times, ckf, _iFile, lineNum);
-            SessionRecording::saveHeaderAscii(
-                times,
-                SessionRecording::HeaderCameraAscii,
-                keyframeLine
-            );
-            ckf.write(keyframeLine);
-        }
-        else if (frameType == SessionRecording::HeaderTimeBinary) {
-            sessRec->readTimeKeyframeBinary(times, tkf, _iFile, lineNum);
-            SessionRecording::saveHeaderAscii(
-                times,
-                SessionRecording::HeaderTimeAscii,
-                keyframeLine
-            );
-            tkf.write(keyframeLine);
-        }
-        else if (frameType == SessionRecording::HeaderScriptBinary) {
-            sessRec->readScriptKeyframeBinary(times, skf, _iFile, lineNum);
-            SessionRecording::saveHeaderAscii(
-                times,
-                SessionRecording::HeaderScriptAscii,
-                keyframeLine
-            );
-            skf.write(keyframeLine);
-        }
-        else {
-            LERROR(std::format(
-                "Unknown frame type @ index {} of playback file '{}'",
-                lineNum - 1, _inFilePath
-            ));
-            break;
-        }
-
-        SessionRecording::saveKeyframeToFile(keyframeLine.str(), _oFile);
-        lineNum++;
-    }
-}
-
-void ConvertRecFormatTask::convertToBinary() {
-    SessionRecording::Timestamps times;
-    datamessagestructures::CameraKeyframe ckf;
-    datamessagestructures::TimeKeyframe tkf;
-    datamessagestructures::ScriptMessage skf;
-    int lineNum = 1;
-    std::string lineContents;
-    std::array<unsigned char, SessionRecording::_saveBufferMaxSize_bytes> keyframeBuffer;
-    _oFile.open(_outFilePath, std::ifstream::app | std::ios::binary);
-    const char tmpType = SessionRecording::DataFormatBinaryTag;
-    _oFile.write(&tmpType, 1);
-    _oFile.write("\n", 1);
-
-    while (ghoul::getline(_iFile, lineContents)) {
-        lineNum++;
-
-        std::istringstream iss(lineContents);
-        std::string entryType;
-        if (!(iss >> entryType)) {
-            LERROR(std::format(
-                "Error reading entry type @ line {} of file '{}'", lineNum, _inFilePath
-            ));
-            break;
-        }
-
-        if (entryType == SessionRecording::HeaderCameraAscii) {
-            sessRec->readCameraKeyframeAscii(times, ckf, lineContents, lineNum);
-            sessRec->saveCameraKeyframeBinary(times, ckf, keyframeBuffer.data(),
-            _oFile);
-        }
-        else if (entryType == SessionRecording::HeaderTimeAscii) {
-            sessRec->readTimeKeyframeAscii(times, tkf, lineContents, lineNum);
-            sessRec->saveTimeKeyframeBinary(times, tkf, keyframeBuffer.data(),
-            _oFile);
-        }
-        else if (entryType == SessionRecording::HeaderScriptAscii) {
-            sessRec->readScriptKeyframeAscii(times, skf, lineContents, lineNum);
-            sessRec->saveScriptKeyframeBinary(times, skf, keyframeBuffer.data(),
-            _oFile);
-        }
-        else if (entryType.substr(0, 1) == SessionRecording::HeaderCommentAscii) {
-            continue;
-        }
-        else {
-            LERROR(std::format(
-                "Unknown frame type {} @ line {} of file '{}'",
-                entryType, lineContents, _inFilePath
-            ));
-            break;
-        }
-    }
-    _oFile.close();
-    LINFO(std::format(
-        "Finished converting {} entries from file '{}'", lineNum, _inFilePath
-    ));
-}
-
-documentation::Documentation ConvertRecFormatTask::documentation() {
-    using namespace documentation;
-    return {
-        "ConvertRecFormatTask",
-        "convert_format_task",
-        "",
-        {
-            {
-                "InputFilePath",
-                new StringAnnotationVerifier("A valid filename to convert"),
-                Optional::No,
-                Private::No,
-                "The filename to convert to the opposite format",
-            },
-            {
-                "OutputFilePath",
-                new StringAnnotationVerifier("A valid output filename"),
-                Optional::No,
-                Private::No,
-                "The filename containing the converted result",
-            },
-        },
-    };
+    SessionRecording sessionRecording = loadSessionRecording(_inFilePath);
+    saveSessionRecording(_outFilePath, sessionRecording, _dataMode);
 }
 
 } // namespace openspace::interaction
diff --git a/src/navigation/keyframenavigator.cpp b/src/navigation/keyframenavigator.cpp
index 571f7e82bc..47313e71b8 100644
--- a/src/navigation/keyframenavigator.cpp
+++ b/src/navigation/keyframenavigator.cpp
@@ -134,7 +134,7 @@ void KeyframeNavigator::updateCamera(Camera* camera, const CameraPose& prevPose,
 
     // Linear interpolation
     t = std::max(0.0, std::min(1.0, t));
-    const glm::dvec3 nowCameraPosition =
+    glm::dvec3 nowCameraPosition =
         prevKeyframeCameraPosition * (1.0 - t) + nextKeyframeCameraPosition * t;
     glm::dquat nowCameraRotation = glm::slerp(
         prevKeyframeCameraRotation,
diff --git a/src/scene/scene.cpp b/src/scene/scene.cpp
index 6e453bad6c..dd1af7d847 100644
--- a/src/scene/scene.cpp
+++ b/src/scene/scene.cpp
@@ -32,7 +32,7 @@
 #include <openspace/engine/windowdelegate.h>
 #include <openspace/events/event.h>
 #include <openspace/events/eventengine.h>
-#include <openspace/interaction/sessionrecording.h>
+#include <openspace/interaction/sessionrecordinghandler.h>
 #include <openspace/navigation/navigationhandler.h>
 #include <openspace/query/query.h>
 #include <openspace/rendering/renderengine.h>
@@ -91,8 +91,8 @@ namespace {
 
     std::chrono::steady_clock::time_point currentTimeForInterpolation() {
         using namespace openspace::global;
-        if (sessionRecording->isSavingFramesDuringPlayback()) {
-            return sessionRecording->currentPlaybackInterpolationTime();
+        if (sessionRecordingHandler->isSavingFramesDuringPlayback()) {
+            return sessionRecordingHandler->currentPlaybackInterpolationTime();
         }
         else {
             return std::chrono::steady_clock::now();
@@ -775,7 +775,7 @@ PropertyValueType Scene::propertyValueType(const std::string& value) {
 }
 
 std::vector<properties::Property*> Scene::propertiesMatchingRegex(
-                                                        const std::string& propertyString)
+                                                          std::string_view propertyString)
 {
     return findMatchesInAllProperties(propertyString, allProperties(), "");
 }
diff --git a/src/scene/scene_lua.inl b/src/scene/scene_lua.inl
index 180956ad17..1bed6974a8 100644
--- a/src/scene/scene_lua.inl
+++ b/src/scene/scene_lua.inl
@@ -87,9 +87,9 @@ openspace::properties::PropertyOwner* findPropertyOwnerWithMatchingGroupTag(T* p
 }
 
 std::vector<openspace::properties::Property*> findMatchesInAllProperties(
-                                                                const std::string& regex,
-                         const std::vector<openspace::properties::Property*>& properties,
-                                                            const std::string& groupName)
+                                                                   std::string_view regex,
+                          const std::vector<openspace::properties::Property*>& properties,
+                                                             const std::string& groupName)
 {
     using namespace openspace;
 
@@ -241,8 +241,8 @@ void applyRegularExpression(lua_State* L, const std::string& regex,
             // value from the stack, so we need to push it to the end
             lua_pushvalue(L, -1);
 
-            if (global::sessionRecording->isRecording()) {
-                global::sessionRecording->savePropertyBaseline(*prop);
+            if (global::sessionRecordingHandler->isRecording()) {
+                global::sessionRecordingHandler->savePropertyBaseline(*prop);
             }
             if (interpolationDuration == 0.0) {
                 global::renderEngine->scene()->removePropertyInterpolation(prop);
@@ -312,8 +312,8 @@ int setPropertyCallSingle(properties::Property& prop, const std::string& uri,
         );
     }
     else {
-        if (global::sessionRecording->isRecording()) {
-            global::sessionRecording->savePropertyBaseline(prop);
+        if (global::sessionRecordingHandler->isRecording()) {
+            global::sessionRecordingHandler->savePropertyBaseline(prop);
         }
         if (duration == 0.0) {
             global::renderEngine->scene()->removePropertyInterpolation(&prop);
diff --git a/src/scripting/scriptengine.cpp b/src/scripting/scriptengine.cpp
index 3ade730808..201cb544ec 100644
--- a/src/scripting/scriptengine.cpp
+++ b/src/scripting/scriptengine.cpp
@@ -29,6 +29,7 @@
 #include <openspace/engine/globals.h>
 #include <openspace/engine/windowdelegate.h>
 #include <openspace/interaction/sessionrecording.h>
+#include <openspace/interaction/sessionrecordinghandler.h>
 #include <openspace/network/parallelpeer.h>
 #include <openspace/util/syncbuffer.h>
 #include <openspace/documentation/documentation.h>
@@ -482,8 +483,8 @@ void ScriptEngine::preSync(bool isMaster) {
             // Not really a received script but the master also needs to run the script...
             _masterScriptQueue.push(item);
 
-            if (global::sessionRecording->isRecording()) {
-                global::sessionRecording->saveScriptKeyframeToTimeline(item.code);
+            if (global::sessionRecordingHandler->isRecording()) {
+                global::sessionRecordingHandler->saveScriptKeyframeToTimeline(item.code);
             }
 
             // Sync out to other nodes (cluster)
@@ -562,8 +563,8 @@ void ScriptEngine::postSync(bool isMaster) {
     }
 
     double now =
-        global::sessionRecording->isSavingFramesDuringPlayback() ?
-        global::sessionRecording->currentApplicationInterpolationTime() :
+        global::sessionRecordingHandler->isSavingFramesDuringPlayback() ?
+        global::sessionRecordingHandler->currentApplicationInterpolationTime() :
         global::windowDelegate->applicationTime();
     for (RepeatedScriptInfo& info : _repeatedScripts) {
         if (now - info.lastRun >= info.timeout) {
diff --git a/src/scripting/scriptscheduler.cpp b/src/scripting/scriptscheduler.cpp
index f7270ab576..c6a55a8d3c 100644
--- a/src/scripting/scriptscheduler.cpp
+++ b/src/scripting/scriptscheduler.cpp
@@ -244,10 +244,6 @@ std::vector<std::string> ScriptScheduler::progressTo(double newTime) {
     }
 }
 
-void ScriptScheduler::setTimeReferenceMode(interaction::KeyframeTimeRef refType) {
-    _timeframeMode = refType;
-}
-
 double ScriptScheduler::currentTime() const {
     return _currentTime;
 }
@@ -276,27 +272,12 @@ std::vector<ScriptScheduler::ScheduledScript> ScriptScheduler::allScripts(
     return result;
 }
 
-void ScriptScheduler::setModeApplicationTime() {
-    _timeframeMode = interaction::KeyframeTimeRef::Relative_applicationStart;
-}
-
-void ScriptScheduler::setModeRecordedTime() {
-    _timeframeMode = interaction::KeyframeTimeRef::Relative_recordedStart;
-}
-
-void ScriptScheduler::setModeSimulationTime() {
-    _timeframeMode = interaction::KeyframeTimeRef::Absolute_simTimeJ2000;
-}
-
 LuaLibrary ScriptScheduler::luaLibrary() {
     return {
         "scriptScheduler",
         {
             codegen::lua::LoadFile,
             codegen::lua::LoadScheduledScript,
-            codegen::lua::SetModeApplicationTime,
-            codegen::lua::SetModeRecordedTime,
-            codegen::lua::SetModeSimulationTime,
             codegen::lua::Clear,
             codegen::lua::ScheduledScripts
         }
diff --git a/src/scripting/scriptscheduler_lua.inl b/src/scripting/scriptscheduler_lua.inl
index 66d7598b0a..3b2a41c78d 100644
--- a/src/scripting/scriptscheduler_lua.inl
+++ b/src/scripting/scriptscheduler_lua.inl
@@ -78,30 +78,6 @@ namespace {
     global::scriptScheduler->loadScripts(scripts);
 }
 
-/**
- * Sets the time reference for scheduled scripts to application time (seconds since
- * OpenSpace application started).
- */
-[[codegen::luawrap]] void setModeApplicationTime() {
-    openspace::global::scriptScheduler->setModeApplicationTime();
-}
-
-/**
- * Sets the time reference for scheduled scripts to the time since the recording was
- * started (the same relative time applies to playback).
- */
-[[codegen::luawrap]] void setModeRecordedTime() {
-    openspace::global::scriptScheduler->setModeRecordedTime();
-}
-
-/**
- * Sets the time reference for scheduled scripts to the simulated date & time (J2000 epoch
- * seconds).
- */
-[[codegen::luawrap]] void setModeSimulationTime() {
-    openspace::global::scriptScheduler->setModeSimulationTime();
-}
-
 // Clears all scheduled scripts.
 [[codegen::luawrap]] void clear(std::optional<int> group) {
     openspace::global::scriptScheduler->clearSchedule(group);
diff --git a/src/util/time.cpp b/src/util/time.cpp
index a6ca8e8d37..97c51265d0 100644
--- a/src/util/time.cpp
+++ b/src/util/time.cpp
@@ -27,7 +27,7 @@
 #include <openspace/engine/openspaceengine.h>
 #include <openspace/engine/globals.h>
 #include <openspace/engine/windowdelegate.h>
-#include <openspace/interaction/sessionrecording.h>
+#include <openspace/interaction/sessionrecordinghandler.h>
 #include <openspace/rendering/renderengine.h>
 #include <openspace/scene/profile.h>
 #include <openspace/scene/scene.h>
diff --git a/src/util/time_lua.inl b/src/util/time_lua.inl
index cee0fe80ca..9b4abe4f21 100644
--- a/src/util/time_lua.inl
+++ b/src/util/time_lua.inl
@@ -178,8 +178,8 @@ namespace {
 
     OpenSpaceEngine::Mode m = global::openSpaceEngine->currentMode();
     if (m == OpenSpaceEngine::Mode::SessionRecordingPlayback) {
-        bool isPlaybackPaused = global::sessionRecording->isPlaybackPaused();
-        global::sessionRecording->setPlaybackPause(!isPlaybackPaused);
+        bool isPlaybackPaused = global::sessionRecordingHandler->isPlaybackPaused();
+        global::sessionRecordingHandler->setPlaybackPause(!isPlaybackPaused);
     }
     else {
         const bool isPaused = !global::timeManager->isPaused();
diff --git a/src/util/timemanager.cpp b/src/util/timemanager.cpp
index 3a5347971b..47cb8875ed 100644
--- a/src/util/timemanager.cpp
+++ b/src/util/timemanager.cpp
@@ -29,7 +29,7 @@
 #include <openspace/engine/windowdelegate.h>
 #include <openspace/interaction/actionmanager.h>
 #include <openspace/interaction/keybindingmanager.h>
-#include <openspace/interaction/sessionrecording.h>
+#include <openspace/interaction/sessionrecordinghandler.h>
 #include <openspace/network/parallelpeer.h>
 #include <openspace/scripting/scriptscheduler.h>
 #include <openspace/util/keys.h>
@@ -88,8 +88,8 @@ namespace {
     double currentApplicationTimeForInterpolation() {
         using namespace openspace;
 
-        if (global::sessionRecording->isSavingFramesDuringPlayback()) {
-            return global::sessionRecording->currentApplicationInterpolationTime();
+        if (global::sessionRecordingHandler->isSavingFramesDuringPlayback()) {
+            return global::sessionRecordingHandler->currentApplicationInterpolationTime();
         }
         else {
             return global::windowDelegate->applicationTime();
diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
index 3fc2ce772a..25ba287d85 100644
--- a/tests/CMakeLists.txt
+++ b/tests/CMakeLists.txt
@@ -38,6 +38,7 @@ add_executable(
   test_profile.cpp
   test_rawvolumeio.cpp
   test_scriptscheduler.cpp
+  test_sessionrecording.cpp
   test_settings.cpp
   test_sgctedit.cpp
   test_spicemanager.cpp
diff --git a/tests/sessionrecording/0100_ascii_linux.osrectxt b/tests/sessionrecording/0100_ascii_linux.osrectxt
new file mode 100644
index 0000000000..d51e31c259
--- /dev/null
+++ b/tests/sessionrecording/0100_ascii_linux.osrectxt
@@ -0,0 +1,7 @@
+OpenSpace_record/playback01.00A
+script 212.227 0 762933560.401  1 openspace.setPropertyValueSingle("Modules.CefWebGui.Visible", true)
+camera 212.237 0.0107105 762933560.412 -13521714.7579869 -18987604.3886074 -1780842.2573154 0.6953145 -0.2337213 -0.1973068 0.6503710 0.00126470590475947 F Earth
+camera 212.248 0.0210999 762933560.423 -13521714.7579868 -18987604.3885993 -1780842.2573175 0.6953145 -0.2337212 -0.1973068 0.6503710 0.00126470590475947 F Earth
+script 214.708 2.48093 762933562.877  1 openspace.pathnavigation.flyTo("Mars")
+camera 214.709 2.48222 762933562.886 -13521714.7579865 -18987604.3886450 -1780842.2572641 0.6953144 -0.2337212 -0.1973068 0.6503708 0.00126470590475947 F Earth
+camera 214.717 2.49067 762933562.886 -13523362.1802436 -18989917.8348593 -1781059.2290947 0.6953144 -0.2337212 -0.1973068 0.6503708 0.00126449402887374 F Earth
diff --git a/tests/sessionrecording/0100_ascii_windows.osrectxt b/tests/sessionrecording/0100_ascii_windows.osrectxt
new file mode 100644
index 0000000000..78a2e20adb
--- /dev/null
+++ b/tests/sessionrecording/0100_ascii_windows.osrectxt
@@ -0,0 +1,7 @@
+OpenSpace_record/playback01.00A
+script 10.0 0.0 100.0  1 openspace.time.setPause(false)
+camera 11.0 1.0 101.0 101.123 201.456 301.789 0.06 0.26 0.49 0.82 1.26e-03 F Earth
+camera 11.5 2.0 102.0 102.123 202.456 302.789 0.12 0.19 0.48 0.84 1.25e-03 F Earth
+script 12.0 4.0 104.0  1 openspace.setPropertyValueSingle("Scene.Earth.Renderable.Fade", 1.0)
+camera 12.5 4.0 104.0 104.123 204.456 304.789 0.30 -0.01 0.41 0.85 1.27e-03 F Earth
+camera 13.0 5.0 105.0 105.123 205.456 305.789 0.31 -0.02 0.41 0.85 1.28e-03 F Earth
diff --git a/tests/sessionrecording/0100_binary_linux.osrec b/tests/sessionrecording/0100_binary_linux.osrec
new file mode 100644
index 0000000000000000000000000000000000000000..ea9b230bb67db878b1025ec0e1ed18924f6d94eb
GIT binary patch
literal 599
zcmeY-NX-i_NK8(RFG@|$FG|rb$VseBN=(i+Fw`?JaN;VSmA*A%Hgkvr0~GAvE_?m(
zfn$zxKz=?@b1_J>UP)$ds$OwwNkC$0ajHgIVoq_YX7Vm}zlClrAgwGS!kMl1)BehV
zwO)M7ARCmCcd*z$xXB<g-Z3JP>+6A;IR}9zK5*B0Z4aa!_84E;52O#wczz2+H%$As
zaz7(0kmZ_KRFYA9WT_R94F<_=rj3bJf<S9-%$_c|@3j5-G)u5GG9Mt;ESn3lW`hz=
zYZ{=|Figj3O|eIsC*RTfFo%M#^Vj%3RCbtgT=WhoAe@1&Km-IR42po<qLRw6#GKO9
z;LN=AoKy{^;N;Z2R6Vfc^@39KQc{Z&lX6n^+!9k#m2?br3^kKqztl~#ZU}Se5IW+`
z@Ko91GM6~m{P4^mIcc`MgM}@BA2TcFI5IppNSJ7t2nwwP4Y!w|&{>dj{sJh}5>87$
z0MQF7Hk`FbgqGk@q|kaNowIbsqcDdBi?*g_{ZMm=d2$<UO-aJZ8=OFEmfY4^DFd{o
c{qbq0cBnNf5NjOrAl4i>1+nJ9Je<}50OGOQApigX

literal 0
HcmV?d00001

diff --git a/tests/sessionrecording/0100_binary_windows.osrec b/tests/sessionrecording/0100_binary_windows.osrec
new file mode 100644
index 0000000000000000000000000000000000000000..5ae86513b7d6e4e8f52db4244d4b2bbaf4d58bdb
GIT binary patch
literal 600
zcmeY-NX-i_NK8(RFG@|$FG|rb$VseBN=(i+Fw`?JaN;UvzzQNA<bdM&K+VM<&3Yx7
zxv6@^sU-o4rNyZlX^A<-shY{CIzQNh`3{i|vQa74_uV5Mtnd5xPS?wH*m9z5-~2m8
z4m;#pUkC13XTPMtmh1ZB3-&SnhrVjW+_wku3T$85GqM6ra7`>K$(W|L)Cy)gnl%g#
zV2K8(HSJJq{GisnfmyT9J_u~z344gO_v{~5iL7&fh-?keUbr=A0U-dfh9Szq1!x~4
zAV6VI1mqT#RE8zyl%@t}=B4MPYA6LKr{<;VfgP_Gl$w{4T9lZSld9*In3AfbqW}zR
z^x#5R01htpC`fSiLH)r~>|hKAm+h-T&aP_N4+*AQ_7L&cNWrC8whZnMwBQnf_`@Lz
e8Y@t1)<Lb2DRuybJ=b-ZHB<0dv*ze>xHSM=zpnTI

literal 0
HcmV?d00001

diff --git a/tests/sessionrecording/0200_ascii_linux.osrectxt b/tests/sessionrecording/0200_ascii_linux.osrectxt
new file mode 100644
index 0000000000..3bcd2ae48a
--- /dev/null
+++ b/tests/sessionrecording/0200_ascii_linux.osrectxt
@@ -0,0 +1,7 @@
+OpenSpace_record/playback02.00A
+script 0 0 1 openspace.time.setPause(false);openspace.time.setDeltaTime(1);
+script 0 0 1 openspace.setPropertyValueSingle("Scene.hoverCircle.Renderable.Fade", 0)
+camera 0.002065126085653901 779267322.4886187 123389190187.6973 -987938150497.865 346357762351.6706 -0.36478543 0.4468942 -0.6903772 -0.4365736 2.0395897e-08 - Venus
+camera 0.004236564040184021 779267322.4907901 123389190187.6973 -987938150497.865 346357762351.6706 -0.36478543 0.4468942 -0.6903772 -0.4365736 2.0395897e-08 - Venus
+script 8.958355146809481 779267331.4449104 1 openspace.setPropertyValueSingle('Scene.hoverCircle.Renderable.Fade', 0.0);
+camera 26.381116207921878 779267348.8676736 62165003943664156672 482784744565750824960 1117492338753629847552 -0.16281216 -0.117395274 -0.6741872 0.7107617 1.7638751e-17 - Venus
diff --git a/tests/sessionrecording/0200_ascii_windows.osrectxt b/tests/sessionrecording/0200_ascii_windows.osrectxt
new file mode 100644
index 0000000000..387187ff79
--- /dev/null
+++ b/tests/sessionrecording/0200_ascii_windows.osrectxt
@@ -0,0 +1,7 @@
+OpenSpace_record/playback02.00A
+script 0.0 100.0 1 openspace.time.setPause(false)
+camera 1.0 101.0 101.123 201.456 301.789 0.06 0.26 0.49 0.82 1.26e-03 F Earth
+camera 2.0 102.0 102.123 202.456 302.789 0.12 0.19 0.48 0.84 1.25e-03 F Earth
+script 4.0 104.0 1 openspace.setPropertyValueSingle("Scene.Earth.Renderable.Fade", 1.0)
+camera 4.0 104.0 104.123 204.456 304.789 0.30 -0.01 0.41 0.85 1.27e-03 F Earth
+camera 5.0 105.0 105.123 205.456 305.789 0.31 -0.02 0.41 0.85 1.28e-03 F Earth
diff --git a/tests/sessionrecording/0200_binary_linux.osrec b/tests/sessionrecording/0200_binary_linux.osrec
new file mode 100644
index 0000000000000000000000000000000000000000..e3d370fb0ea1112f78047ba50638a2ec4626efb6
GIT binary patch
literal 531
zcmeY-NX-i_NK8(RFG@|$FG|rb$VseBN=(i+Fw!$HaN;UvKm&F_em+oBF-VhMNoH=U
zUU6zkKw@ceszzF3PI0QHHKw#nYEDUF2vDttp{8{*(1ZrR+zk8vdr3)Qmd72rHg;-x
zb~rog$Yw6F<_SA^Dy=1NE3?+YElL9R-xo62Tkv}CQ<qb)XJiHH3`@-`Ef(PIumu^z
zFhQ!qew}SH*qDOn5M%T-AjZ@>5n~L{gR++o_^CKZ>6WE~T$2wp7U2Vs-->|TqLRw6
z#GKO9;LN=AoKy{^;N;Z2R6Vd`^nz0JQc{Z&lX6n^d=e{Di;DG}^K<fxVC<ay(v;$O
z-^BFPoSekGc<21wr2P2MlEe%>x5SiGB^?7zpjTwekNc}Q9L|Hdf#HL02UBqOL573}
zPh+pgJ2D6rdDiWichI>>!@gL+a)0e3<$dm<+;$A`5V^8j%`%yxVeS2u9o7ynFRB%Q
zyrNJp?;pqc@nC~X`Qf$C4?F(3x={OrG4r9Vts3@UL@oELO;+A_@D~@7G0MIFO#wwf
Bxv~HN

literal 0
HcmV?d00001

diff --git a/tests/sessionrecording/0200_binary_windows.osrec b/tests/sessionrecording/0200_binary_windows.osrec
new file mode 100644
index 0000000000000000000000000000000000000000..419ce83f1fdbf03583da42a3959f74a07c379100
GIT binary patch
literal 456
zcmeY-NX-i_NK8(RFG@|$FG|rb$VseBN=(i+Fw!$HaN;UvKmm~sazK7QP*X8TlU_+?
zZmM2!YDqw1X>qDXT4GLds%A1o#|L{b?GWi88<k>x-#ya7`o4efbiGW6EhozM&A(IR
z(0{1Zc86T6oyWspcCD`i?HO5tI$RTrN;0OYEwzFg!{7imrU7b9JJc9Is4;Iq#(cGn
z>36aN(ss67;Yh}CU0-Yk^?(4x7=|bZ7od3v4}jcW1mqT#RE8zyl%@t}=B4MPYA6LK
zr{<;VfgPh4l$w{4T9lZSld9*In3AfbqhP3K0P`loV6ZpYqafbwgSwBW*kRVpnRZ;)
zmG`v1zGydVW+amP6w8*uyeR^4pF<Qhw4lbUgBl}K>=3kL9?+P@Sd3Y7bh#A(p9_;f

literal 0
HcmV?d00001

diff --git a/tests/test_sessionrecording.cpp b/tests/test_sessionrecording.cpp
new file mode 100644
index 0000000000..bf63167d23
--- /dev/null
+++ b/tests/test_sessionrecording.cpp
@@ -0,0 +1,854 @@
+/*****************************************************************************************
+ *                                                                                       *
+ * OpenSpace                                                                             *
+ *                                                                                       *
+ * Copyright (c) 2014-2024                                                               *
+ *                                                                                       *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
+ * software and associated documentation files (the "Software"), to deal in the Software *
+ * without restriction, including without limitation the rights to use, copy, modify,    *
+ * merge, publish, distribute, sublicense, and/or sell copies of the Software, and to    *
+ * permit persons to whom the Software is furnished to do so, subject to the following   *
+ * conditions:                                                                           *
+ *                                                                                       *
+ * The above copyright notice and this permission notice shall be included in all copies *
+ * or substantial portions of the Software.                                              *
+ *                                                                                       *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED,   *
+ * INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A         *
+ * PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT    *
+ * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF  *
+ * CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE  *
+ * OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                                         *
+ ****************************************************************************************/
+
+#include <catch2/catch_approx.hpp>
+#include <catch2/catch_test_macros.hpp>
+
+#include <openspace/interaction/sessionrecording.h>
+#include <ghoul/filesystem/filesystem.h>
+#include <filesystem>
+
+using namespace openspace::interaction;
+
+namespace {
+    std::filesystem::path test(std::string_view file) {
+        return absPath(std::format("${{TESTDIR}}/sessionrecording/{}", file));
+    }
+} // namespace
+
+TEST_CASE("SessionRecording: 01.00 Ascii Windows", "[sessionrecording]") {
+    SessionRecording rec = loadSessionRecording(test("0100_ascii_windows.osrectxt"));
+    REQUIRE(rec.entries.size() == 6);
+
+    {
+        const SessionRecording::Entry& e = rec.entries[0];
+        CHECK(e.timestamp == 0.0);
+        CHECK(e.simulationTime == 100.0);
+        REQUIRE(std::holds_alternative<SessionRecording::Entry::Script>(e.value));
+        const auto& script = std::get<SessionRecording::Entry::Script>(e.value);
+        CHECK(script == "openspace.time.setPause(false)");
+    }
+    {
+        const SessionRecording::Entry& e = rec.entries[1];
+        CHECK(e.timestamp == 1.0);
+        CHECK(e.simulationTime == 101.0);
+        REQUIRE(std::holds_alternative<SessionRecording::Entry::Camera>(e.value));
+        const auto& camera = std::get<SessionRecording::Entry::Camera>(e.value);
+        CHECK(camera.position == glm::dvec3(101.123, 201.456, 301.789));
+        CHECK(camera.rotation == glm::quat(0.82f, 0.06f, 0.26f, 0.49f));
+        CHECK(camera.scale == 1.26e-03f);
+        CHECK(camera.followFocusNodeRotation);
+        CHECK(camera.focusNode == "Earth");
+    }
+    {
+        const SessionRecording::Entry& e = rec.entries[2];
+        CHECK(e.timestamp == 2.0);
+        CHECK(e.simulationTime == 102.0);
+        REQUIRE(std::holds_alternative<SessionRecording::Entry::Camera>(e.value));
+        const auto& camera = std::get<SessionRecording::Entry::Camera>(e.value);
+        CHECK(camera.position == glm::dvec3(102.123, 202.456, 302.789));
+        CHECK(camera.rotation == glm::quat(0.84f, 0.12f, 0.19f, 0.48f));
+        CHECK(camera.scale == 1.25e-03f);
+        CHECK(camera.followFocusNodeRotation);
+        CHECK(camera.focusNode == "Earth");
+    }
+    {
+        const SessionRecording::Entry& e = rec.entries[3];
+        CHECK(e.timestamp == 4.0);
+        CHECK(e.simulationTime == 104.0);
+        REQUIRE(std::holds_alternative<SessionRecording::Entry::Script>(e.value));
+        const auto& script = std::get<SessionRecording::Entry::Script>(e.value);
+        CHECK(
+            script ==
+            "openspace.setPropertyValueSingle(\"Scene.Earth.Renderable.Fade\", 1.0)"
+        );
+    }
+    {
+        const SessionRecording::Entry& e = rec.entries[4];
+        CHECK(e.timestamp == 4.0);
+        CHECK(e.simulationTime == 104.0);
+        REQUIRE(std::holds_alternative<SessionRecording::Entry::Camera>(e.value));
+        const auto& camera = std::get<SessionRecording::Entry::Camera>(e.value);
+        CHECK(camera.position == glm::dvec3(104.123, 204.456, 304.789));
+        CHECK(camera.rotation == glm::quat(0.85f, 0.30f, -0.01f, 0.41f));
+        CHECK(camera.scale == 1.27e-03f);
+        CHECK(camera.followFocusNodeRotation);
+        CHECK(camera.focusNode == "Earth");
+    }
+    {
+        const SessionRecording::Entry& e = rec.entries[5];
+        CHECK(e.timestamp == 5.0);
+        CHECK(e.simulationTime == 105.0);
+        REQUIRE(std::holds_alternative<SessionRecording::Entry::Camera>(e.value));
+        const auto& camera = std::get<SessionRecording::Entry::Camera>(e.value);
+        CHECK(camera.position == glm::dvec3(105.123, 205.456, 305.789));
+        CHECK(camera.rotation == glm::quat(0.85f, 0.31f, -0.02f, 0.41f));
+        CHECK(camera.scale == 1.28e-03f);
+        CHECK(camera.followFocusNodeRotation);
+        CHECK(camera.focusNode == "Earth");
+    }
+}
+
+TEST_CASE("SessionRecording: 01.00 Ascii Windows Roundtrip", "[sessionrecording]") {
+    SessionRecording rec = loadSessionRecording(test("0100_ascii_windows.osrectxt"));
+    saveSessionRecording(absPath("${TEMPORARY}/ascii"), rec, DataMode::Ascii);
+    saveSessionRecording(absPath("${TEMPORARY}/binary"), rec, DataMode::Binary);
+    SessionRecording a = loadSessionRecording(absPath("${TEMPORARY}/ascii"));
+    SessionRecording b = loadSessionRecording(absPath("${TEMPORARY}/binary"));
+
+    CHECK(rec == a);
+    CHECK(rec == b);
+    CHECK(a == b);
+}
+
+TEST_CASE("SessionRecording: 02.00 Ascii Windows", "[sessionrecording]") {
+    SessionRecording rec = loadSessionRecording(test("0200_ascii_windows.osrectxt"));
+    REQUIRE(rec.entries.size() == 6);
+
+    {
+        const SessionRecording::Entry& e = rec.entries[0];
+        CHECK(e.timestamp == 0.0);
+        CHECK(e.simulationTime == 100.0);
+        REQUIRE(std::holds_alternative<SessionRecording::Entry::Script>(e.value));
+        const auto& script = std::get<SessionRecording::Entry::Script>(e.value);
+        CHECK(script == "openspace.time.setPause(false)");
+    }
+    {
+        const SessionRecording::Entry& e = rec.entries[1];
+        CHECK(e.timestamp == 1.0);
+        CHECK(e.simulationTime == 101.0);
+        REQUIRE(std::holds_alternative<SessionRecording::Entry::Camera>(e.value));
+        const auto& camera = std::get<SessionRecording::Entry::Camera>(e.value);
+        CHECK(camera.position == glm::dvec3(101.123, 201.456, 301.789));
+        CHECK(camera.rotation == glm::quat(0.82f, 0.06f, 0.26f, 0.49f));
+        CHECK(camera.scale == 1.26e-03f);
+        CHECK(camera.followFocusNodeRotation);
+        CHECK(camera.focusNode == "Earth");
+    }
+    {
+        const SessionRecording::Entry& e = rec.entries[2];
+        CHECK(e.timestamp == 2.0);
+        CHECK(e.simulationTime == 102.0);
+        REQUIRE(std::holds_alternative<SessionRecording::Entry::Camera>(e.value));
+        const auto& camera = std::get<SessionRecording::Entry::Camera>(e.value);
+        CHECK(camera.position == glm::dvec3(102.123, 202.456, 302.789));
+        CHECK(camera.rotation == glm::quat(0.84f, 0.12f, 0.19f, 0.48f));
+        CHECK(camera.scale == 1.25e-03f);
+        CHECK(camera.followFocusNodeRotation);
+        CHECK(camera.focusNode == "Earth");
+    }
+    {
+        const SessionRecording::Entry& e = rec.entries[3];
+        CHECK(e.timestamp == 4.0);
+        CHECK(e.simulationTime == 104.0);
+        REQUIRE(std::holds_alternative<SessionRecording::Entry::Script>(e.value));
+        const auto& script = std::get<SessionRecording::Entry::Script>(e.value);
+        CHECK(
+            script ==
+            "openspace.setPropertyValueSingle(\"Scene.Earth.Renderable.Fade\", 1.0)"
+        );
+    }
+    {
+        const SessionRecording::Entry& e = rec.entries[4];
+        CHECK(e.timestamp == 4.0);
+        CHECK(e.simulationTime == 104.0);
+        REQUIRE(std::holds_alternative<SessionRecording::Entry::Camera>(e.value));
+        const auto& camera = std::get<SessionRecording::Entry::Camera>(e.value);
+        CHECK(camera.position == glm::dvec3(104.123, 204.456, 304.789));
+        CHECK(camera.rotation == glm::quat(0.85f, 0.30f, -0.01f, 0.41f));
+        CHECK(camera.scale == 1.27e-03f);
+        CHECK(camera.followFocusNodeRotation);
+        CHECK(camera.focusNode == "Earth");
+    }
+    {
+        const SessionRecording::Entry& e = rec.entries[5];
+        CHECK(e.timestamp == 5.0);
+        CHECK(e.simulationTime == 105.0);
+        REQUIRE(std::holds_alternative<SessionRecording::Entry::Camera>(e.value));
+        const auto& camera = std::get<SessionRecording::Entry::Camera>(e.value);
+        CHECK(camera.position == glm::dvec3(105.123, 205.456, 305.789));
+        CHECK(camera.rotation == glm::quat(0.85f, 0.31f, -0.02f, 0.41f));
+        CHECK(camera.scale == 1.28e-03f);
+        CHECK(camera.followFocusNodeRotation);
+        CHECK(camera.focusNode == "Earth");
+    }
+}
+
+TEST_CASE("SessionRecording: 02.00 Ascii Windows Roundtrip", "[sessionrecording]") {
+    SessionRecording rec = loadSessionRecording(test("0200_ascii_windows.osrectxt"));
+    saveSessionRecording(absPath("${TEMPORARY}/ascii"), rec, DataMode::Ascii);
+    saveSessionRecording(absPath("${TEMPORARY}/binary"), rec, DataMode::Binary);
+    SessionRecording a = loadSessionRecording(absPath("${TEMPORARY}/ascii"));
+    SessionRecording b = loadSessionRecording(absPath("${TEMPORARY}/binary"));
+
+    CHECK(rec == a);
+    CHECK(rec == b);
+    CHECK(a == b);
+}
+
+TEST_CASE("SessionRecording: 01.00 <-> 02.00 Ascii Windows", "[sessionrecording]") {
+    SessionRecording v0100 = loadSessionRecording(test("0100_ascii_windows.osrectxt"));
+    SessionRecording v0200 = loadSessionRecording(test("0200_ascii_windows.osrectxt"));
+    CHECK(v0100 == v0200);
+}
+
+TEST_CASE("SessionRecording: 01.00 Binary Windows", "[sessionrecording]") {
+    SessionRecording rec = loadSessionRecording(test("0100_binary_windows.osrec"));
+    REQUIRE(rec.entries.size() == 6);
+
+    {
+        const SessionRecording::Entry& e = rec.entries[0];
+        CHECK(e.timestamp == 0.0);
+        CHECK(e.simulationTime == 100.0);
+        REQUIRE(std::holds_alternative<SessionRecording::Entry::Script>(e.value));
+        const auto& script = std::get<SessionRecording::Entry::Script>(e.value);
+        CHECK(script == "openspace.time.setPause(false)");
+    }
+    {
+        const SessionRecording::Entry& e = rec.entries[1];
+        CHECK(e.timestamp == 1.0);
+        CHECK(e.simulationTime == 101.0);
+        REQUIRE(std::holds_alternative<SessionRecording::Entry::Camera>(e.value));
+        const auto& camera = std::get<SessionRecording::Entry::Camera>(e.value);
+        CHECK(camera.position == glm::dvec3(101.123, 201.456, 301.789));
+        CHECK(camera.rotation == glm::quat(0.82f, 0.06f, 0.26f, 0.49f));
+        CHECK(camera.scale == 1.26e-03f);
+        CHECK(camera.followFocusNodeRotation);
+        CHECK(camera.focusNode == "Earth");
+    }
+    {
+        const SessionRecording::Entry& e = rec.entries[2];
+        CHECK(e.timestamp == 2.0);
+        CHECK(e.simulationTime == 102.0);
+        REQUIRE(std::holds_alternative<SessionRecording::Entry::Camera>(e.value));
+        const auto& camera = std::get<SessionRecording::Entry::Camera>(e.value);
+        CHECK(camera.position == glm::dvec3(102.123, 202.456, 302.789));
+        CHECK(camera.rotation == glm::quat(0.84f, 0.12f, 0.19f, 0.48f));
+        CHECK(camera.scale == 1.25e-03f);
+        CHECK(camera.followFocusNodeRotation);
+        CHECK(camera.focusNode == "Earth");
+    }
+    {
+        const SessionRecording::Entry& e = rec.entries[3];
+        CHECK(e.timestamp == 4.0);
+        CHECK(e.simulationTime == 104.0);
+        REQUIRE(std::holds_alternative<SessionRecording::Entry::Script>(e.value));
+        const auto& script = std::get<SessionRecording::Entry::Script>(e.value);
+        CHECK(
+            script ==
+            "openspace.setPropertyValueSingle(\"Scene.Earth.Renderable.Fade\", 1.0)"
+        );
+    }
+    {
+        const SessionRecording::Entry& e = rec.entries[4];
+        CHECK(e.timestamp == 4.0);
+        CHECK(e.simulationTime == 104.0);
+        REQUIRE(std::holds_alternative<SessionRecording::Entry::Camera>(e.value));
+        const auto& camera = std::get<SessionRecording::Entry::Camera>(e.value);
+        CHECK(camera.position == glm::dvec3(104.123, 204.456, 304.789));
+        CHECK(camera.rotation == glm::quat(0.85f, 0.30f, -0.01f, 0.41f));
+        CHECK(camera.scale == 1.27e-03f);
+        CHECK(camera.followFocusNodeRotation);
+        CHECK(camera.focusNode == "Earth");
+    }
+    {
+        const SessionRecording::Entry& e = rec.entries[5];
+        CHECK(e.timestamp == 5.0);
+        CHECK(e.simulationTime == 105.0);
+        REQUIRE(std::holds_alternative<SessionRecording::Entry::Camera>(e.value));
+        const auto& camera = std::get<SessionRecording::Entry::Camera>(e.value);
+        CHECK(camera.position == glm::dvec3(105.123, 205.456, 305.789));
+        CHECK(camera.rotation == glm::quat(0.85f, 0.31f, -0.02f, 0.41f));
+        CHECK(camera.scale == 1.28e-03f);
+        CHECK(camera.followFocusNodeRotation);
+        CHECK(camera.focusNode == "Earth");
+    }
+}
+
+TEST_CASE("SessionRecording: 01.00 Binary Windows Roundtrip", "[sessionrecording]") {
+    SessionRecording rec = loadSessionRecording(test("0100_binary_windows.osrec"));
+    saveSessionRecording(absPath("${TEMPORARY}/ascii"), rec, DataMode::Ascii);
+    saveSessionRecording(absPath("${TEMPORARY}/binary"), rec, DataMode::Binary);
+    SessionRecording a = loadSessionRecording(absPath("${TEMPORARY}/ascii"));
+    SessionRecording b = loadSessionRecording(absPath("${TEMPORARY}/binary"));
+
+    CHECK(rec == a);
+    CHECK(rec == b);
+    CHECK(a == b);
+}
+
+TEST_CASE("SessionRecording: 02.00 Binary Windows", "[sessionrecording]") {
+    SessionRecording rec = loadSessionRecording(test("0200_binary_windows.osrec"));
+    REQUIRE(rec.entries.size() == 6);
+
+    {
+        const SessionRecording::Entry& e = rec.entries[0];
+        CHECK(e.timestamp == 0.0);
+        CHECK(e.simulationTime == 100.0);
+        REQUIRE(std::holds_alternative<SessionRecording::Entry::Script>(e.value));
+        const auto& script = std::get<SessionRecording::Entry::Script>(e.value);
+        CHECK(script == "openspace.time.setPause(false)");
+    }
+    {
+        const SessionRecording::Entry& e = rec.entries[1];
+        CHECK(e.timestamp == 1.0);
+        CHECK(e.simulationTime == 101.0);
+        REQUIRE(std::holds_alternative<SessionRecording::Entry::Camera>(e.value));
+        const auto& camera = std::get<SessionRecording::Entry::Camera>(e.value);
+        CHECK(camera.position == glm::dvec3(101.123, 201.456, 301.789));
+        CHECK(camera.rotation == glm::quat(0.82f, 0.06f, 0.26f, 0.49f));
+        CHECK(camera.scale == 1.26e-03f);
+        CHECK(camera.followFocusNodeRotation);
+        CHECK(camera.focusNode == "Earth");
+    }
+    {
+        const SessionRecording::Entry& e = rec.entries[2];
+        CHECK(e.timestamp == 2.0);
+        CHECK(e.simulationTime == 102.0);
+        REQUIRE(std::holds_alternative<SessionRecording::Entry::Camera>(e.value));
+        const auto& camera = std::get<SessionRecording::Entry::Camera>(e.value);
+        CHECK(camera.position == glm::dvec3(102.123, 202.456, 302.789));
+        CHECK(camera.rotation == glm::quat(0.84f, 0.12f, 0.19f, 0.48f));
+        CHECK(camera.scale == 1.25e-03f);
+        CHECK(camera.followFocusNodeRotation);
+        CHECK(camera.focusNode == "Earth");
+    }
+    {
+        const SessionRecording::Entry& e = rec.entries[3];
+        CHECK(e.timestamp == 4.0);
+        CHECK(e.simulationTime == 104.0);
+        REQUIRE(std::holds_alternative<SessionRecording::Entry::Script>(e.value));
+        const auto& script = std::get<SessionRecording::Entry::Script>(e.value);
+        CHECK(
+            script ==
+            "openspace.setPropertyValueSingle(\"Scene.Earth.Renderable.Fade\", 1.0)"
+        );
+    }
+    {
+        const SessionRecording::Entry& e = rec.entries[4];
+        CHECK(e.timestamp == 4.0);
+        CHECK(e.simulationTime == 104.0);
+        REQUIRE(std::holds_alternative<SessionRecording::Entry::Camera>(e.value));
+        const auto& camera = std::get<SessionRecording::Entry::Camera>(e.value);
+        CHECK(camera.position == glm::dvec3(104.123, 204.456, 304.789));
+        CHECK(camera.rotation == glm::quat(0.85f, 0.30f, -0.01f, 0.41f));
+        CHECK(camera.scale == 1.27e-03f);
+        CHECK(camera.followFocusNodeRotation);
+        CHECK(camera.focusNode == "Earth");
+    }
+    {
+        const SessionRecording::Entry& e = rec.entries[5];
+        CHECK(e.timestamp == 5.0);
+        CHECK(e.simulationTime == 105.0);
+        REQUIRE(std::holds_alternative<SessionRecording::Entry::Camera>(e.value));
+        const auto& camera = std::get<SessionRecording::Entry::Camera>(e.value);
+        CHECK(camera.position == glm::dvec3(105.123, 205.456, 305.789));
+        CHECK(camera.rotation == glm::quat(0.85f, 0.31f, -0.02f, 0.41f));
+        CHECK(camera.scale == 1.28e-03f);
+        CHECK(camera.followFocusNodeRotation);
+        CHECK(camera.focusNode == "Earth");
+    }
+}
+
+TEST_CASE("SessionRecording: 02.00 Binary Windows Roundtrip", "[sessionrecording]") {
+    SessionRecording rec = loadSessionRecording(test("0200_binary_windows.osrec"));
+    saveSessionRecording(absPath("${TEMPORARY}/ascii"), rec, DataMode::Ascii);
+    saveSessionRecording(absPath("${TEMPORARY}/binary"), rec, DataMode::Binary);
+    SessionRecording a = loadSessionRecording(absPath("${TEMPORARY}/ascii"));
+    SessionRecording b = loadSessionRecording(absPath("${TEMPORARY}/binary"));
+
+    CHECK(rec == a);
+    CHECK(rec == b);
+    CHECK(a == b);
+}
+
+TEST_CASE("SessionRecording: 01.00 <-> 02.00 Binary Windows", "[sessionrecording]") {
+    SessionRecording v0100 = loadSessionRecording(test("0100_binary_windows.osrec"));
+    SessionRecording v0200 = loadSessionRecording(test("0200_binary_windows.osrec"));
+    CHECK(v0100 == v0200);
+}
+
+TEST_CASE("SessionRecording: 02.00 Ascii <-> Binary Windows", "[sessionrecording]") {
+    SessionRecording ascii = loadSessionRecording(test("0200_ascii_windows.osrectxt"));
+    SessionRecording binary = loadSessionRecording(test("0200_binary_windows.osrec"));
+    CHECK(ascii == binary);
+}
+
+TEST_CASE("SessionRecording: 01.00 Ascii Linux", "[sessionrecording]") {
+    SessionRecording rec = loadSessionRecording(test("0100_ascii_linux.osrectxt"));
+    REQUIRE(rec.entries.size() == 6);
+
+    {
+        const SessionRecording::Entry& e = rec.entries[0];
+        CHECK(e.timestamp == 0.0);
+        CHECK(e.simulationTime == 762933560.401);
+        REQUIRE(std::holds_alternative<SessionRecording::Entry::Script>(e.value));
+        const auto& script = std::get<SessionRecording::Entry::Script>(e.value);
+        CHECK(script == "openspace.setPropertyValueSingle(\"Modules.CefWebGui.Visible\", true)");
+    }
+    {
+        const SessionRecording::Entry& e = rec.entries[1];
+        CHECK(e.timestamp == 0.0107105);
+        CHECK(e.simulationTime == 762933560.412);
+        REQUIRE(std::holds_alternative<SessionRecording::Entry::Camera>(e.value));
+        const auto& camera = std::get<SessionRecording::Entry::Camera>(e.value);
+        CHECK(
+            camera.position ==
+            glm::dvec3(-13521714.7579869, -18987604.3886074, -1780842.2573154)
+        );
+        CHECK(
+            camera.rotation ==
+            glm::quat(0.6503710f, 0.6953145f, -0.2337213f, -0.1973068f)
+        );
+        CHECK(camera.scale == 0.00126470590475947f);
+        CHECK(camera.followFocusNodeRotation);
+        CHECK(camera.focusNode == "Earth");
+    }
+    {
+        const SessionRecording::Entry& e = rec.entries[2];
+        CHECK(e.timestamp == 0.0210999);
+        CHECK(e.simulationTime == 762933560.423);
+        REQUIRE(std::holds_alternative<SessionRecording::Entry::Camera>(e.value));
+        const auto& camera = std::get<SessionRecording::Entry::Camera>(e.value);
+        CHECK(
+            camera.position ==
+            glm::dvec3(-13521714.7579868, -18987604.3885993, -1780842.2573175)
+        );
+        CHECK(
+            camera.rotation ==
+            glm::quat(0.6503710f, 0.6953145f, -0.2337212f, -0.1973068f)
+        );
+        CHECK(camera.scale == 0.00126470590475947f);
+        CHECK(camera.followFocusNodeRotation);
+        CHECK(camera.focusNode == "Earth");
+    }
+    {
+        const SessionRecording::Entry& e = rec.entries[3];
+        CHECK(e.timestamp == 2.48093);
+        CHECK(e.simulationTime == 762933562.877);
+        REQUIRE(std::holds_alternative<SessionRecording::Entry::Script>(e.value));
+        const auto& script = std::get<SessionRecording::Entry::Script>(e.value);
+        CHECK(script == "openspace.pathnavigation.flyTo(\"Mars\")");
+    }
+    {
+        const SessionRecording::Entry& e = rec.entries[4];
+        CHECK(e.timestamp == 2.48222);
+        CHECK(e.simulationTime == 762933562.886);
+        REQUIRE(std::holds_alternative<SessionRecording::Entry::Camera>(e.value));
+        const auto& camera = std::get<SessionRecording::Entry::Camera>(e.value);
+        CHECK(
+            camera.position ==
+            glm::dvec3(-13521714.7579865, -18987604.3886450, -1780842.2572641)
+        );
+        CHECK(
+            camera.rotation ==
+            glm::quat(0.6503708f, 0.6953144f, -0.2337212f, -0.1973068f)
+        );
+        CHECK(camera.scale == 0.00126470590475947f);
+        CHECK(camera.followFocusNodeRotation);
+        CHECK(camera.focusNode == "Earth");
+    }
+    {
+        const SessionRecording::Entry& e = rec.entries[5];
+        CHECK(e.timestamp == 2.49067);
+        CHECK(e.simulationTime == 762933562.886);
+        REQUIRE(std::holds_alternative<SessionRecording::Entry::Camera>(e.value));
+        const auto& camera = std::get<SessionRecording::Entry::Camera>(e.value);
+        CHECK(
+            camera.position ==
+            glm::dvec3(-13523362.1802436, -18989917.8348593, -1781059.2290947)
+        );
+        CHECK(
+            camera.rotation ==
+            glm::quat(0.6503708f, 0.6953144f, -0.2337212f, -0.1973068f)
+        );
+        CHECK(camera.scale == 0.00126449402887374f);
+        CHECK(camera.followFocusNodeRotation);
+        CHECK(camera.focusNode == "Earth");
+    }
+}
+
+TEST_CASE("SessionRecording: 01.00 Ascii Linux Roundtrip", "[sessionrecording]") {
+    SessionRecording rec = loadSessionRecording(test("0100_ascii_linux.osrectxt"));
+    saveSessionRecording(absPath("${TEMPORARY}/ascii"), rec, DataMode::Ascii);
+    saveSessionRecording(absPath("${TEMPORARY}/binary"), rec, DataMode::Binary);
+    SessionRecording a = loadSessionRecording(absPath("${TEMPORARY}/ascii"));
+    SessionRecording b = loadSessionRecording(absPath("${TEMPORARY}/binary"));
+
+    CHECK(rec == a);
+    CHECK(rec == b);
+    CHECK(a == b);
+}
+
+TEST_CASE("SessionRecording: 01.00 Binary Linux", "[sessionrecording]") {
+    SessionRecording rec = loadSessionRecording(test("0100_binary_linux.osrec"));
+    REQUIRE(rec.entries.size() == 6);
+
+    {
+        const SessionRecording::Entry& e = rec.entries[0];
+        CHECK(e.timestamp == 0.0);
+        CHECK(e.simulationTime == 763463598.23217);
+        REQUIRE(std::holds_alternative<SessionRecording::Entry::Script>(e.value));
+        const auto& script = std::get<SessionRecording::Entry::Script>(e.value);
+        CHECK(script == "openspace.time.setPause(false)");
+    }
+    {
+        const SessionRecording::Entry& e = rec.entries[1];
+        CHECK(e.timestamp == 0.01045432000000801);
+        CHECK(e.simulationTime == 763463598.2421138);
+        REQUIRE(std::holds_alternative<SessionRecording::Entry::Camera>(e.value));
+        const auto& camera = std::get<SessionRecording::Entry::Camera>(e.value);
+        CHECK(
+            camera.position ==
+            glm::dvec3(-15942288.9063634, 8217794.03633486, -14994951.65751712)
+        );
+        CHECK(
+            camera.rotation ==
+            glm::quat(
+                -0.05070944130420685f,
+                0.8491553664207458f,
+                -0.31565767526626587f,
+                -0.42038553953170776f
+            )
+        );
+        CHECK(camera.scale == 0.0012647059047594666f);
+        CHECK(camera.followFocusNodeRotation);
+        CHECK(camera.focusNode == "Earth");
+    }
+    {
+        const SessionRecording::Entry& e = rec.entries[2];
+        CHECK(e.timestamp == 0.21673793700000488);
+        CHECK(e.simulationTime == 763463598.44845);
+        REQUIRE(std::holds_alternative<SessionRecording::Entry::Camera>(e.value));
+        const auto& camera = std::get<SessionRecording::Entry::Camera>(e.value);
+        CHECK(
+            camera.position ==
+            glm::dvec3(-15942288.906364493, 8217794.036353504, -14994951.657487243)
+        );
+        CHECK(
+            camera.rotation ==
+            glm::quat(
+                -0.05070945620536804f,
+                0.8491553664207458f,
+                -0.31565767526626587f,
+                -0.420385479927063f
+            )
+        );
+        CHECK(camera.scale == 0.0012647059047594666f);
+        CHECK(camera.followFocusNodeRotation);
+        CHECK(camera.focusNode == "Earth");
+    }
+    {
+        const SessionRecording::Entry& e = rec.entries[3];
+        CHECK(e.timestamp == 9.940045733000005);
+        CHECK(e.simulationTime == 763463608.1701536);
+        REQUIRE(std::holds_alternative<SessionRecording::Entry::Script>(e.value));
+        const auto& script = std::get<SessionRecording::Entry::Script>(e.value);
+        CHECK(script == "openspace.setPropertyValueSingle(\"Scene.Earth.Renderable.Fade\",0,1)");
+    }
+    {
+        const SessionRecording::Entry& e = rec.entries[4];
+        CHECK(e.timestamp == 9.94726788300001);
+        CHECK(e.simulationTime == 763463608.1800178);
+        REQUIRE(std::holds_alternative<SessionRecording::Entry::Camera>(e.value));
+        const auto& camera = std::get<SessionRecording::Entry::Camera>(e.value);
+        CHECK(
+            camera.position ==
+            glm::dvec3(-15741144.947559996, 14747679.124696942, -9014411.005969524)
+        );
+        CHECK(
+            camera.rotation ==
+            glm::quat(
+                0.23194797337055206f,
+                -0.7898141741752625f,
+                0.2626582682132721f,
+                0.5033928751945496f
+            )
+        );
+        CHECK(camera.scale == 0.001264723134227097f);
+        CHECK(camera.followFocusNodeRotation);
+        CHECK(camera.focusNode == "Earth");
+    }
+    {
+        const SessionRecording::Entry& e = rec.entries[5];
+        CHECK(e.timestamp == 11.485186747);
+        CHECK(e.simulationTime == 763463609.7179065);
+        REQUIRE(std::holds_alternative<SessionRecording::Entry::Camera>(e.value));
+        const auto& camera = std::get<SessionRecording::Entry::Camera>(e.value);
+        CHECK(
+            camera.position ==
+            glm::dvec3(-15741006.774582125, 14747877.286725827, -9014328.087388767)
+        );
+        CHECK(
+            camera.rotation ==
+            glm::quat(
+                0.2319525182247162f,
+                -0.7898122668266296f,
+                0.26266056299209595f,
+                0.5033925771713257f
+            )
+        );
+        CHECK(camera.scale == 0.001264723134227097f);
+        CHECK(camera.followFocusNodeRotation);
+        CHECK(camera.focusNode == "Earth");
+    }
+}
+
+TEST_CASE("SessionRecording: 01.00 Binary Linux Roundtrip", "[sessionrecording]") {
+    SessionRecording rec = loadSessionRecording(test("0100_binary_linux.osrec"));
+    saveSessionRecording(absPath("${TEMPORARY}/ascii"), rec, DataMode::Ascii);
+    saveSessionRecording(absPath("${TEMPORARY}/binary"), rec, DataMode::Binary);
+    SessionRecording a = loadSessionRecording(absPath("${TEMPORARY}/ascii"));
+    SessionRecording b = loadSessionRecording(absPath("${TEMPORARY}/binary"));
+
+    CHECK(rec == a);
+    CHECK(rec == b);
+    CHECK(a == b);
+}
+
+TEST_CASE("SessionRecording: 02.00 Ascii Linux", "[sessionrecording]") {
+    SessionRecording rec = loadSessionRecording(test("0200_ascii_linux.osrectxt"));
+    REQUIRE(rec.entries.size() == 6);
+
+    {
+        const SessionRecording::Entry& e = rec.entries[0];
+        CHECK(e.timestamp == 0.0);
+        CHECK(e.simulationTime == 0.0);
+        REQUIRE(std::holds_alternative<SessionRecording::Entry::Script>(e.value));
+        const auto& script = std::get<SessionRecording::Entry::Script>(e.value);
+        CHECK(script == "openspace.time.setPause(false);openspace.time.setDeltaTime(1);");
+    }
+    {
+        const SessionRecording::Entry& e = rec.entries[1];
+        CHECK(e.timestamp == 0.0);
+        CHECK(e.simulationTime == 0.0);
+        REQUIRE(std::holds_alternative<SessionRecording::Entry::Script>(e.value));
+        const auto& script = std::get<SessionRecording::Entry::Script>(e.value);
+        CHECK(script == "openspace.setPropertyValueSingle(\"Scene.hoverCircle.Renderable.Fade\", 0)");
+    }
+    {
+        const SessionRecording::Entry& e = rec.entries[2];
+        CHECK(e.timestamp == 0.002065126085653901);
+        CHECK(e.simulationTime == 779267322.4886187);
+        REQUIRE(std::holds_alternative<SessionRecording::Entry::Camera>(e.value));
+        const auto& camera = std::get<SessionRecording::Entry::Camera>(e.value);
+        CHECK(
+            camera.position ==
+            glm::dvec3(123389190187.6973, -987938150497.865, 346357762351.6706)
+        );
+        CHECK(
+            camera.rotation ==
+            glm::quat(-0.4365736f, -0.36478543f, 0.4468942f, -0.6903772f)
+        );
+        CHECK(camera.scale == 2.0395897e-08f);
+        CHECK(!camera.followFocusNodeRotation);
+        CHECK(camera.focusNode == "Venus");
+    }
+    {
+        const SessionRecording::Entry& e = rec.entries[3];
+        CHECK(e.timestamp == 0.004236564040184021);
+        CHECK(e.simulationTime == 779267322.4907901);
+        REQUIRE(std::holds_alternative<SessionRecording::Entry::Camera>(e.value));
+        const auto& camera = std::get<SessionRecording::Entry::Camera>(e.value);
+        CHECK(
+            camera.position ==
+            glm::dvec3(123389190187.6973, -987938150497.865, 346357762351.6706)
+        );
+        CHECK(
+            camera.rotation ==
+            glm::quat(-0.4365736f, -0.36478543f, 0.4468942f, -0.6903772f)
+        );
+        CHECK(camera.scale == 2.0395897e-08f);
+        CHECK(!camera.followFocusNodeRotation);
+        CHECK(camera.focusNode == "Venus");
+    }
+    {
+        const SessionRecording::Entry& e = rec.entries[4];
+        CHECK(e.timestamp == 8.958355146809481);
+        CHECK(e.simulationTime == 779267331.4449104);
+        REQUIRE(std::holds_alternative<SessionRecording::Entry::Script>(e.value));
+        const auto& script = std::get<SessionRecording::Entry::Script>(e.value);
+        CHECK(script == "openspace.setPropertyValueSingle('Scene.hoverCircle.Renderable.Fade', 0.0);");
+    }
+    {
+        const SessionRecording::Entry& e = rec.entries[5];
+        CHECK(e.timestamp == 26.381116207921878);
+        CHECK(e.simulationTime == 779267348.8676736);
+        REQUIRE(std::holds_alternative<SessionRecording::Entry::Camera>(e.value));
+        const auto& camera = std::get<SessionRecording::Entry::Camera>(e.value);
+        CHECK(
+            camera.position ==
+            glm::dvec3(
+                62165003943664156672.0,
+                482784744565750824960.0,
+                1117492338753629847552.0
+            )
+        );
+        CHECK(
+            camera.rotation ==
+            glm::quat(0.7107617f, -0.16281216f, -0.117395274f, -0.6741872f)
+        );
+        CHECK(camera.scale == 1.7638751e-17f);
+        CHECK(!camera.followFocusNodeRotation);
+        CHECK(camera.focusNode == "Venus");
+    }
+}
+
+TEST_CASE("SessionRecording: 02.00 Ascii Linux Roundtrip", "[sessionrecording]") {
+    SessionRecording rec = loadSessionRecording(test("0200_ascii_linux.osrectxt"));
+    saveSessionRecording(absPath("${TEMPORARY}/ascii"), rec, DataMode::Ascii);
+    saveSessionRecording(absPath("${TEMPORARY}/binary"), rec, DataMode::Binary);
+    SessionRecording a = loadSessionRecording(absPath("${TEMPORARY}/ascii"));
+    SessionRecording b = loadSessionRecording(absPath("${TEMPORARY}/binary"));
+
+    CHECK(rec == a);
+    CHECK(rec == b);
+    CHECK(a == b);
+}
+
+TEST_CASE("SessionRecording: 02.00 Binary Linux", "[sessionrecording]") {
+    SessionRecording rec = loadSessionRecording(test("0200_binary_linux.osrec"));
+    REQUIRE(rec.entries.size() == 6);
+
+    {
+        const SessionRecording::Entry& e = rec.entries[0];
+        CHECK(e.timestamp == 0.0);
+        CHECK(e.simulationTime == 0.0);
+        REQUIRE(std::holds_alternative<SessionRecording::Entry::Script>(e.value));
+        const auto& script = std::get<SessionRecording::Entry::Script>(e.value);
+        CHECK(script == "openspace.time.setPause(false);openspace.time.setDeltaTime(1);");
+    }
+    {
+        const SessionRecording::Entry& e = rec.entries[1];
+        CHECK(e.timestamp == 0.0029818089678883553);
+        CHECK(e.simulationTime == 779267268.772417);
+        REQUIRE(std::holds_alternative<SessionRecording::Entry::Camera>(e.value));
+        const auto& camera = std::get<SessionRecording::Entry::Camera>(e.value);
+        CHECK(
+            camera.position ==
+            glm::dvec3(2560146.332327013, -5779694.5689156465, -852442.7158538934)
+        );
+        CHECK(
+            camera.rotation ==
+            glm::quat(
+                0.6254600882530212f,
+                0.5630295276641846f,
+                0.502471387386322f,
+                -0.19829261302947998f
+            )
+        );
+        CHECK(camera.scale == 0.06643116474151611f);
+        CHECK(camera.followFocusNodeRotation);
+        CHECK(camera.focusNode == "Venus");
+    }
+    {
+        const SessionRecording::Entry& e = rec.entries[2];
+        CHECK(e.timestamp == 0.005884706974029541);
+        CHECK(e.simulationTime == 779267268.7753198);
+        REQUIRE(std::holds_alternative<SessionRecording::Entry::Camera>(e.value));
+        const auto& camera = std::get<SessionRecording::Entry::Camera>(e.value);
+        CHECK(
+            camera.position ==
+            glm::dvec3(2560146.3323334977, -5779694.568918271, -852442.7158528116)
+        );
+        CHECK(
+            camera.rotation ==
+            glm::quat(
+                0.6254600882530212f,
+                0.5630295276641846f,
+                0.502471387386322f,
+                -0.19829261302947998f
+            )
+        );
+        CHECK(camera.scale == 0.06643116474151611f);
+        CHECK(camera.followFocusNodeRotation);
+        CHECK(camera.focusNode == "Venus");
+    }
+    {
+        const SessionRecording::Entry& e = rec.entries[3];
+        CHECK(e.timestamp == 10.153814885416068);
+        CHECK(e.simulationTime == 779267278.9232514);
+        REQUIRE(std::holds_alternative<SessionRecording::Entry::Script>(e.value));
+        const auto& script = std::get<SessionRecording::Entry::Script>(e.value);
+        CHECK(script == "openspace.setPropertyValueSingle(\"Scene.Venus.Renderable.Layers.ColorLayers.Clouds_Magellan_Combo_Utah.Fade\",0)");
+    }
+    {
+        const SessionRecording::Entry& e = rec.entries[4];
+        CHECK(e.timestamp == 10.155818674364127);
+        CHECK(e.simulationTime == 779267278.9252552);
+        REQUIRE(std::holds_alternative<SessionRecording::Entry::Camera>(e.value));
+        const auto& camera = std::get<SessionRecording::Entry::Camera>(e.value);
+        CHECK(
+            camera.position ==
+            glm::dvec3(-57303121.02243042, 8346999.591819763, -128851858.36139679)
+        );
+        CHECK(
+            camera.rotation ==
+            glm::quat(
+                0.1360674947500229f,
+                0.658237636089325f,
+                -0.7229072451591492f,
+                -0.16004367172718048f
+            )
+        );
+        CHECK(camera.scale == 0.0001590096508152783f);
+        CHECK(!camera.followFocusNodeRotation);
+        CHECK(camera.focusNode == "Venus");
+    }
+    {
+        const SessionRecording::Entry& e = rec.entries[5];
+        CHECK(e.timestamp == 27.533842067583464);
+        CHECK(e.simulationTime == 779267296.303281);
+        REQUIRE(std::holds_alternative<SessionRecording::Entry::Camera>(e.value));
+        const auto& camera = std::get<SessionRecording::Entry::Camera>(e.value);
+        CHECK(
+            camera.position ==
+            glm::dvec3(-4573226225.966583, 667900806.931778, -10309469556.229485)
+        );
+        CHECK(
+            camera.rotation ==
+            glm::quat(
+                0.13572217524051666f,
+                0.6582902073860168f,
+                -0.7229912281036377f,
+                -0.15974101424217224f
+            )
+        );
+        CHECK(camera.scale == 0.0000019040056713492959f);
+        CHECK(!camera.followFocusNodeRotation);
+        CHECK(camera.focusNode == "Venus");
+    }
+}
+
+TEST_CASE("SessionRecording: 02.00 Binary Linux Roundtrip", "[sessionrecording]") {
+    SessionRecording rec = loadSessionRecording(test("0200_binary_linux.osrec"));
+    saveSessionRecording(absPath("${TEMPORARY}/ascii"), rec, DataMode::Ascii);
+    saveSessionRecording(absPath("${TEMPORARY}/binary"), rec, DataMode::Binary);
+    SessionRecording a = loadSessionRecording(absPath("${TEMPORARY}/ascii"));
+    SessionRecording b = loadSessionRecording(absPath("${TEMPORARY}/binary"));
+
+    CHECK(rec == a);
+    CHECK(rec == b);
+    CHECK(a == b);
+}

From fef526652d0b007caf94e02e9b770c323976c136 Mon Sep 17 00:00:00 2001
From: Alexander Bock <mail@alexanderbock.eu>
Date: Mon, 21 Oct 2024 15:08:32 +0200
Subject: [PATCH 650/701] Update WebGUI commit hash

---
 data/assets/util/webgui.asset | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/data/assets/util/webgui.asset b/data/assets/util/webgui.asset
index 5c2318946f..a382a4a524 100644
--- a/data/assets/util/webgui.asset
+++ b/data/assets/util/webgui.asset
@@ -4,7 +4,7 @@ local guiCustomization = asset.require("customization/gui")
 
 
 -- Select which commit hashes to use for the frontend and backend
-local frontendHash = "5a58a3ca0215b6dc264e985ab321a75d51e4a8e5"
+local frontendHash = "1e64af3b19764af15ad844dec543b1fffec99fe9"
 
 local frontend = asset.resource({
   Identifier = "WebGuiFrontend",

From 390d4a3e5050b7a0949718bb0124f4af4ebc62b1 Mon Sep 17 00:00:00 2001
From: Alexander Bock <mail@alexanderbock.eu>
Date: Tue, 22 Oct 2024 15:24:35 +0200
Subject: [PATCH 651/701] Fix issue with creating RenderableGlobes with layers

---
 modules/globebrowsing/src/layermanager.cpp    | 17 ++++++-----------
 modules/globebrowsing/src/layermanager.h      |  3 ++-
 modules/globebrowsing/src/renderableglobe.cpp |  4 ++--
 support/coding/codegen                        |  2 +-
 4 files changed, 11 insertions(+), 15 deletions(-)

diff --git a/modules/globebrowsing/src/layermanager.cpp b/modules/globebrowsing/src/layermanager.cpp
index 145d89f9e7..f4e79ed6af 100644
--- a/modules/globebrowsing/src/layermanager.cpp
+++ b/modules/globebrowsing/src/layermanager.cpp
@@ -37,7 +37,8 @@ namespace openspace::globebrowsing {
 
 LayerManager::LayerManager() : properties::PropertyOwner({ "Layers" }) {}
 
-void LayerManager::initialize(const std::map<layers::Group::ID, ghoul::Dictionary>& dict)
+void LayerManager::initialize(
+                  const std::map<layers::Group::ID, std::vector<ghoul::Dictionary>>& dict)
 {
     ZoneScoped;
 
@@ -47,20 +48,14 @@ void LayerManager::initialize(const std::map<layers::Group::ID, ghoul::Dictionar
         addPropertySubOwner(_layerGroups[i].get());
         _layerGroups[i]->initialize();
         auto it = dict.find(layers::Groups[i].id);
-        if (!dict.empty() && it == dict.end()) {
-            LWARNINGC(
-                "LayerManager",
-                std::format("Unknown layer group '{}'", layers::Groups[i].identifier)
-            );
+        if (it == dict.end()) {
             continue;
         }
 
-        for (size_t j = 1; j <= dict.size(); j++) {
-            const ghoul::Dictionary layer =
-                it->second.value<ghoul::Dictionary>(std::to_string(j));
-
+        for (const ghoul::Dictionary& layer : it->second) {
             try {
-                _layerGroups[i]->addLayer(layer);
+                Layer* l = _layerGroups[i]->addLayer(layer);
+                l->initialize();
             }
             catch (const ghoul::RuntimeError& e) {
                 LERRORC(e.component, e.message);
diff --git a/modules/globebrowsing/src/layermanager.h b/modules/globebrowsing/src/layermanager.h
index f76b0a7321..d83a0f0dd1 100644
--- a/modules/globebrowsing/src/layermanager.h
+++ b/modules/globebrowsing/src/layermanager.h
@@ -52,7 +52,8 @@ public:
 
     LayerManager();
 
-    void initialize(const std::map<layers::Group::ID, ghoul::Dictionary>& dict);
+    void initialize(
+        const std::map<layers::Group::ID, std::vector<ghoul::Dictionary>>& dict);
     void deinitialize();
 
     Layer* addLayer(layers::Group::ID id, const ghoul::Dictionary& layerDict);
diff --git a/modules/globebrowsing/src/renderableglobe.cpp b/modules/globebrowsing/src/renderableglobe.cpp
index 9c0693c1f0..ff5bd32d9a 100644
--- a/modules/globebrowsing/src/renderableglobe.cpp
+++ b/modules/globebrowsing/src/renderableglobe.cpp
@@ -303,7 +303,7 @@ namespace {
         };
 
         // A list of layers that should be added to the globe.
-        std::optional<std::map<Group, ghoul::Dictionary>> layers
+        std::optional<std::map<Group, std::vector<ghoul::Dictionary>>> layers
             [[codegen::reference("globebrowsing_layer")]];
 
         // Specifies information about planetary labels that can be rendered on the
@@ -644,7 +644,7 @@ RenderableGlobe::RenderableGlobe(const ghoul::Dictionary& dictionary)
     setInteractionSphere(boundingSphere());
 
     // Init layer manager
-    std::map<layers::Group::ID, ghoul::Dictionary> layers;
+    std::map<layers::Group::ID, std::vector<ghoul::Dictionary>> layers;
     if (p.layers.has_value()) {
         for (const auto& [key, value] : *p.layers) {
             layers[codegen::map<layers::Group::ID>(key)] = value;
diff --git a/support/coding/codegen b/support/coding/codegen
index 5e85e1ab58..784b38767e 160000
--- a/support/coding/codegen
+++ b/support/coding/codegen
@@ -1 +1 @@
-Subproject commit 5e85e1ab581bfe0cded3cb4d7dfae3cb24a435de
+Subproject commit 784b38767ede46a24e937f7a6f011943dca15f5d

From 417996565ebbcbbc52932f8a432fb45a9f1e5c57 Mon Sep 17 00:00:00 2001
From: Emma Broman <emma.broman@liu.se>
Date: Wed, 23 Oct 2024 13:45:51 +0200
Subject: [PATCH 652/701] Fix renderbin mode Parameters list to include new
 Sticker

So that Sticker bin can be set from an asset
---
 src/rendering/renderable.cpp | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/rendering/renderable.cpp b/src/rendering/renderable.cpp
index 2fcd263d57..d4379ff7ba 100644
--- a/src/rendering/renderable.cpp
+++ b/src/rendering/renderable.cpp
@@ -93,8 +93,9 @@ namespace {
             Background,
             Opaque,
             PreDeferredTransparent,
+            Overlay,
             PostDeferredTransparent,
-            Overlay
+            Sticker
         };
 
         // [[codegen::verbatim(RenderableRenderBinModeInfo.description)]]

From 40578ebc8106f7bda6462867fbb3f51349a55848 Mon Sep 17 00:00:00 2001
From: Malin E <malin.ejdbo@gmail.com>
Date: Tue, 29 Oct 2024 17:02:48 +0100
Subject: [PATCH 653/701] Update string versions of distance and time units,
 start with capital letter

* Update RenderableModel to better make use of these predefined units
---
 include/openspace/util/distanceconversion.h | 96 ++++++++++-----------
 include/openspace/util/timeconversion.h     | 36 ++++----
 modules/base/rendering/renderablemodel.cpp  | 88 ++++++++++---------
 3 files changed, 113 insertions(+), 107 deletions(-)

diff --git a/include/openspace/util/distanceconversion.h b/include/openspace/util/distanceconversion.h
index d968f94845..7ce480b650 100644
--- a/include/openspace/util/distanceconversion.h
+++ b/include/openspace/util/distanceconversion.h
@@ -66,59 +66,59 @@ enum class DistanceUnit {
 };
 
 // Assumption:  Unit names are sequential in memory
-constexpr std::string_view DistanceUnitNanometer = "nanometer";
-constexpr std::string_view DistanceUnitMicrometer = "micrometer";
-constexpr std::string_view DistanceUnitMillimeter = "millimeter";
-constexpr std::string_view DistanceUnitCentimeter = "centimeter";
-constexpr std::string_view DistanceUnitDecimeter = "decimeter";
-constexpr std::string_view DistanceUnitMeter = "meter";
-constexpr std::string_view DistanceUnitKilometer = "km";
+constexpr std::string_view DistanceUnitNanometer = "Nanometer";
+constexpr std::string_view DistanceUnitMicrometer = "Micrometer";
+constexpr std::string_view DistanceUnitMillimeter = "Millimeter";
+constexpr std::string_view DistanceUnitCentimeter = "Centimeter";
+constexpr std::string_view DistanceUnitDecimeter = "Decimeter";
+constexpr std::string_view DistanceUnitMeter = "Meter";
+constexpr std::string_view DistanceUnitKilometer = "Kilometer";
 constexpr std::string_view DistanceUnitAU = "AU";
-constexpr std::string_view DistanceUnitLighthour = "lighthour";
-constexpr std::string_view DistanceUnitLightday = "lightday";
-constexpr std::string_view DistanceUnitLightmonth = "lightmonth";
-constexpr std::string_view DistanceUnitLightyear = "lightyear";
-constexpr std::string_view DistanceUnitParsec = "parsec";
-constexpr std::string_view DistanceUnitKiloparsec = "kiloparsec";
-constexpr std::string_view DistanceUnitMegaparsec = "megaparsec";
-constexpr std::string_view DistanceUnitGigaparsec = "gigaparsec";
-constexpr std::string_view DistanceUnitGigalightyear = "gigalightyear";
-constexpr std::string_view DistanceUnitThou = "thou";
-constexpr std::string_view DistanceUnitInch = "inch";
-constexpr std::string_view DistanceUnitFoot = "foot";
-constexpr std::string_view DistanceUnitYard = "yard";
-constexpr std::string_view DistanceUnitChain = "chain";
-constexpr std::string_view DistanceUnitFurlong = "furlong";
-constexpr std::string_view DistanceUnitMile = "mile";
-constexpr std::string_view DistanceUnitLeague = "league";
+constexpr std::string_view DistanceUnitLighthour = "Lighthour";
+constexpr std::string_view DistanceUnitLightday = "Lightday";
+constexpr std::string_view DistanceUnitLightmonth = "Lightmonth";
+constexpr std::string_view DistanceUnitLightyear = "Lightyear";
+constexpr std::string_view DistanceUnitParsec = "Parsec";
+constexpr std::string_view DistanceUnitKiloparsec = "Kiloparsec";
+constexpr std::string_view DistanceUnitMegaparsec = "Megaparsec";
+constexpr std::string_view DistanceUnitGigaparsec = "Gigaparsec";
+constexpr std::string_view DistanceUnitGigalightyear = "Gigalightyear";
+constexpr std::string_view DistanceUnitThou = "Thou";
+constexpr std::string_view DistanceUnitInch = "Inch";
+constexpr std::string_view DistanceUnitFoot = "Foot";
+constexpr std::string_view DistanceUnitYard = "Yard";
+constexpr std::string_view DistanceUnitChain = "Chain";
+constexpr std::string_view DistanceUnitFurlong = "Furlong";
+constexpr std::string_view DistanceUnitMile = "Mile";
+constexpr std::string_view DistanceUnitLeague = "League";
 
 
 // Assumption:  Unit names are sequential in memory
-constexpr std::string_view DistanceUnitNanometers = "nanometers";
-constexpr std::string_view DistanceUnitMicrometers = "micrometers";
-constexpr std::string_view DistanceUnitMillimeters = "millimeters";
-constexpr std::string_view DistanceUnitCentimeters = "centimeters";
-constexpr std::string_view DistanceUnitDecimeters = "decimeters";
-constexpr std::string_view DistanceUnitMeters = "meters";
-constexpr std::string_view DistanceUnitKilometers = "km";
+constexpr std::string_view DistanceUnitNanometers = "Nanometers";
+constexpr std::string_view DistanceUnitMicrometers = "Micrometers";
+constexpr std::string_view DistanceUnitMillimeters = "Millimeters";
+constexpr std::string_view DistanceUnitCentimeters = "Centimeters";
+constexpr std::string_view DistanceUnitDecimeters = "Decimeters";
+constexpr std::string_view DistanceUnitMeters = "Meters";
+constexpr std::string_view DistanceUnitKilometers = "Kilometers";
 constexpr std::string_view DistanceUnitAUs = "AU";
-constexpr std::string_view DistanceUnitLighthours = "lighthours";
-constexpr std::string_view DistanceUnitLightdays = "lightdays";
-constexpr std::string_view DistanceUnitLightmonths = "lightmonths";
-constexpr std::string_view DistanceUnitLightyears = "lightyears";
-constexpr std::string_view DistanceUnitParsecs = "parsecs";
-constexpr std::string_view DistanceUnitKiloparsecs = "kiloparsecs";
-constexpr std::string_view DistanceUnitMegaparsecs = "megaparsecs";
-constexpr std::string_view DistanceUnitGigaparsecs = "gigaparsecs";
-constexpr std::string_view DistanceUnitGigalightyears = "gigalightyears";
-constexpr std::string_view DistanceUnitThous = "thou";
-constexpr std::string_view DistanceUnitInches = "inches";
-constexpr std::string_view DistanceUnitFeet = "feet";
-constexpr std::string_view DistanceUnitYards = "yards";
-constexpr std::string_view DistanceUnitChains = "chains";
-constexpr std::string_view DistanceUnitFurlongs = "furlongs";
-constexpr std::string_view DistanceUnitMiles = "miles";
-constexpr std::string_view DistanceUnitLeagues = "leagues";
+constexpr std::string_view DistanceUnitLighthours = "Lighthours";
+constexpr std::string_view DistanceUnitLightdays = "Lightdays";
+constexpr std::string_view DistanceUnitLightmonths = "Lightmonths";
+constexpr std::string_view DistanceUnitLightyears = "Lightyears";
+constexpr std::string_view DistanceUnitParsecs = "Parsecs";
+constexpr std::string_view DistanceUnitKiloparsecs = "Kiloparsecs";
+constexpr std::string_view DistanceUnitMegaparsecs = "Megaparsecs";
+constexpr std::string_view DistanceUnitGigaparsecs = "Gigaparsecs";
+constexpr std::string_view DistanceUnitGigalightyears = "Gigalightyears";
+constexpr std::string_view DistanceUnitThous = "Thou";
+constexpr std::string_view DistanceUnitInches = "Inches";
+constexpr std::string_view DistanceUnitFeet = "Feet";
+constexpr std::string_view DistanceUnitYards = "Yards";
+constexpr std::string_view DistanceUnitChains = "Chains";
+constexpr std::string_view DistanceUnitFurlongs = "Furlongs";
+constexpr std::string_view DistanceUnitMiles = "Miles";
+constexpr std::string_view DistanceUnitLeagues = "Leagues";
 
 constexpr std::array<DistanceUnit, static_cast<int>(DistanceUnit::League) + 1>
 DistanceUnits = {
diff --git a/include/openspace/util/timeconversion.h b/include/openspace/util/timeconversion.h
index 2fa2bbdb63..493c5caeb5 100644
--- a/include/openspace/util/timeconversion.h
+++ b/include/openspace/util/timeconversion.h
@@ -60,26 +60,26 @@ enum class TimeUnit {
 };
 
 // Assumption:  Unit names are sequential in memory
-constexpr std::string_view TimeUnitNanosecond   = "nanosecond";
-constexpr std::string_view TimeUnitMicrosecond  = "microsecond";
-constexpr std::string_view TimeUnitMillisecond  = "millisecond";
-constexpr std::string_view TimeUnitSecond       = "second";
-constexpr std::string_view TimeUnitMinute       = "minute";
-constexpr std::string_view TimeUnitHour         = "hour";
-constexpr std::string_view TimeUnitDay          = "day";
-constexpr std::string_view TimeUnitMonth        = "month";
-constexpr std::string_view TimeUnitYear         = "year";
+constexpr std::string_view TimeUnitNanosecond = "Nanosecond";
+constexpr std::string_view TimeUnitMicrosecond = "Microsecond";
+constexpr std::string_view TimeUnitMillisecond = "Millisecond";
+constexpr std::string_view TimeUnitSecond = "Second";
+constexpr std::string_view TimeUnitMinute = "Minute";
+constexpr std::string_view TimeUnitHour = "Hour";
+constexpr std::string_view TimeUnitDay = "Day";
+constexpr std::string_view TimeUnitMonth = "Month";
+constexpr std::string_view TimeUnitYear = "Year";
 
 // Assumption:  Unit names are sequential in memory
-constexpr std::string_view TimeUnitNanoseconds = "nanoseconds";
-constexpr std::string_view TimeUnitMicroseconds = "microseconds";
-constexpr std::string_view TimeUnitMilliseconds = "milliseconds";
-constexpr std::string_view TimeUnitSeconds = "seconds";
-constexpr std::string_view TimeUnitMinutes = "minutes";
-constexpr std::string_view TimeUnitHours = "hours";
-constexpr std::string_view TimeUnitDays = "days";
-constexpr std::string_view TimeUnitMonths = "months";
-constexpr std::string_view TimeUnitYears = "years";
+constexpr std::string_view TimeUnitNanoseconds = "Nanoseconds";
+constexpr std::string_view TimeUnitMicroseconds = "Microseconds";
+constexpr std::string_view TimeUnitMilliseconds = "Milliseconds";
+constexpr std::string_view TimeUnitSeconds = "Seconds";
+constexpr std::string_view TimeUnitMinutes = "Minutes";
+constexpr std::string_view TimeUnitHours = "Hours";
+constexpr std::string_view TimeUnitDays = "Days";
+constexpr std::string_view TimeUnitMonths = "Months";
+constexpr std::string_view TimeUnitYears = "Years";
 
 constexpr std::array<TimeUnit, static_cast<int>(TimeUnit::Year) + 1> TimeUnits = {
     TimeUnit::Nanosecond, TimeUnit::Microsecond, TimeUnit::Millisecond,
diff --git a/modules/base/rendering/renderablemodel.cpp b/modules/base/rendering/renderablemodel.cpp
index 7881a8ddf5..3652725628 100644
--- a/modules/base/rendering/renderablemodel.cpp
+++ b/modules/base/rendering/renderablemodel.cpp
@@ -174,30 +174,13 @@ namespace {
         // the Renderable.
         std::filesystem::path geometryFile;
 
-        enum class [[codegen::map(openspace::DistanceUnit)]] ScaleUnit {
-            Nanometer,
-            Micrometer,
-            Millimeter,
-            Centimeter,
-            Decimeter,
-            Meter,
-            Kilometer,
-            Thou,
-            Inch,
-            Foot,
-            Yard,
-            Chain,
-            Furlong,
-            Mile
-        };
-
         // The scale of the model. For example, if the model is in centimeters then
         // `ModelScale = 'Centimeter'` or `ModelScale = 0.01`. The value that this needs
         // to be in order for the model to be in the correct scale relative to the rest
         // of OpenSpace can be tricky to find. Essentially, it depends on the model
         // software that the model was created with and the original intention of the
         // modeler.
-        std::optional<std::variant<ScaleUnit, double>> modelScale;
+        std::optional<std::variant<std::string, double>> modelScale;
 
         // By default the given `ModelScale` is used to scale down the model. By setting
         // this setting to true the scaling is inverted to that the model is instead
@@ -215,18 +198,10 @@ namespace {
         // In format `'YYYY MM DD hh:mm:ss'`.
         std::optional<std::string> animationStartTime [[codegen::datetime()]];
 
-        enum class [[codegen::map(openspace::TimeUnit)]] AnimationTimeUnit {
-            Nanosecond,
-            Microsecond,
-            Millisecond,
-            Second,
-            Minute
-        };
-
         // The time scale for the animation relative to seconds. For example, if the
         // animation is in milliseconds then `AnimationTimeScale = 0.001` or
         // `AnimationTimeScale = \"Millisecond\"`.
-        std::optional<std::variant<AnimationTimeUnit, float>> animationTimeScale;
+        std::optional<std::variant<std::string, float>> animationTimeScale;
 
         enum class AnimationMode {
             Once,
@@ -340,11 +315,28 @@ RenderableModel::RenderableModel(const ghoul::Dictionary& dictionary)
     _invertModelScale = p.invertModelScale.value_or(_invertModelScale);
 
     if (p.modelScale.has_value()) {
-        if (std::holds_alternative<Parameters::ScaleUnit>(*p.modelScale)) {
-            const Parameters::ScaleUnit scaleUnit =
-                std::get<Parameters::ScaleUnit>(*p.modelScale);
-            const DistanceUnit distanceUnit = codegen::map<DistanceUnit>(scaleUnit);
-            _modelScale = toMeter(distanceUnit);
+        if (std::holds_alternative<std::string>(*p.modelScale)) {
+            const std::string stringUnit = std::get<std::string>(*p.modelScale);
+
+            // Find matching unit name in list of supported unit names
+            DistanceUnit distanceUnit;
+            bool wasFound = false;
+            for (int i = 0; i < DistanceUnitNamesSingular.size(); ++i) {
+                if (stringUnit == DistanceUnitNamesSingular[i]) {
+                    wasFound = true;
+                    distanceUnit = DistanceUnits[i];
+                }
+            }
+
+            if (wasFound) {
+                _modelScale = toMeter(distanceUnit);
+            }
+            else {
+                std::string message = std::format("The given unit name '{}' does not "
+                    "match any currently supported unit names", stringUnit);
+                LERROR(message);
+                _modelScale = 1.0;
+            }
         }
         else if (std::holds_alternative<double>(*p.modelScale)) {
             _modelScale = std::get<double>(*p.modelScale);
@@ -367,17 +359,31 @@ RenderableModel::RenderableModel(const ghoul::Dictionary& dictionary)
         if (std::holds_alternative<float>(*p.animationTimeScale)) {
             _animationTimeScale = std::get<float>(*p.animationTimeScale);
         }
-        else if (std::holds_alternative<Parameters::AnimationTimeUnit>(
-                *p.animationTimeScale
-            ))
+        else if (std::holds_alternative<std::string>(*p.animationTimeScale))
         {
-            const Parameters::AnimationTimeUnit animationTimeUnit =
-                std::get<Parameters::AnimationTimeUnit>(*p.animationTimeScale);
-            const TimeUnit timeUnit = codegen::map<TimeUnit>(animationTimeUnit);
+            const std::string stringUnit = std::get<std::string>(*p.animationTimeScale);
 
-            _animationTimeScale = static_cast<double>(
-                convertTime(1.0, timeUnit, TimeUnit::Second)
-            );
+            // Find matching unit name in list of supported unit names
+            TimeUnit timeUnit;
+            bool wasFound = false;
+            for (int i = 0; i < TimeUnitNamesSingular.size(); ++i) {
+                if (stringUnit == TimeUnitNamesSingular[i]) {
+                    wasFound = true;
+                    timeUnit = TimeUnits[i];
+                }
+            }
+
+            if (wasFound) {
+                _animationTimeScale = static_cast<double>(
+                    convertTime(1.0, timeUnit, TimeUnit::Second)
+                );
+            }
+            else {
+                std::string message = std::format("The given unit name '{}' does not "
+                    "match any currently supported unit names", stringUnit);
+                LERROR(message);
+                _animationTimeScale = 1.0;
+            }
         }
         else {
             throw ghoul::MissingCaseException();

From fc93523914d37f498e6c3ef1a5d3d7b696b3e148 Mon Sep 17 00:00:00 2001
From: Emma Broman <emma.broman@liu.se>
Date: Wed, 30 Oct 2024 16:40:28 +0100
Subject: [PATCH 654/701] "Fix" invalid geometries before adding them (#3452)

However, they might not actually be completely fixed and still look weird. But at least now they load
---
 .../planets/earth/eclipses/paths/total.asset    | 11 ++++-------
 .../earth/eclipses/paths/total/2028-07-22.asset |  6 ++----
 .../earth/eclipses/paths/total/2033-03-30.asset |  6 ++----
 .../earth/eclipses/paths/total/2034-03-20.asset |  6 ++----
 .../earth/eclipses/paths/total/2042-04-20.asset |  6 ++----
 .../src/geojson/geojsoncomponent.cpp            | 17 ++++++++++++++---
 .../src/geojson/globegeometryfeature.cpp        |  6 +-----
 7 files changed, 27 insertions(+), 31 deletions(-)

diff --git a/data/assets/scene/solarsystem/planets/earth/eclipses/paths/total.asset b/data/assets/scene/solarsystem/planets/earth/eclipses/paths/total.asset
index 230c73e921..f247b90f61 100644
--- a/data/assets/scene/solarsystem/planets/earth/eclipses/paths/total.asset
+++ b/data/assets/scene/solarsystem/planets/earth/eclipses/paths/total.asset
@@ -1,6 +1,3 @@
--- The assets that are commented out in this file currently produce a warning as they
--- contain geometry that cannot be displayed by OpenSpace correctly
-
 asset.require("./total/2003-11-23")
 asset.require("./total/2006-03-29")
 asset.require("./total/2008-08-01")
@@ -16,14 +13,14 @@ asset.require("./total/2021-12-04")
 asset.require("./total/2024-04-08")
 asset.require("./total/2026-08-12")
 asset.require("./total/2027-08-02")
--- asset.require("./total/2028-07-22")
+asset.require("./total/2028-07-22")
 asset.require("./total/2030-11-25")
--- asset.require("./total/2033-03-30")
--- asset.require("./total/2034-03-20")
+asset.require("./total/2033-03-30")
+asset.require("./total/2034-03-20")
 asset.require("./total/2035-09-02")
 asset.require("./total/2037-07-13")
 asset.require("./total/2038-12-26")
 asset.require("./total/2039-12-15")
 asset.require("./total/2041-04-30")
--- asset.require("./total/2042-04-20")
+asset.require("./total/2042-04-20")
 asset.require("./total/2043-04-09")
diff --git a/data/assets/scene/solarsystem/planets/earth/eclipses/paths/total/2028-07-22.asset b/data/assets/scene/solarsystem/planets/earth/eclipses/paths/total/2028-07-22.asset
index b9438028df..d27392a283 100644
--- a/data/assets/scene/solarsystem/planets/earth/eclipses/paths/total/2028-07-22.asset
+++ b/data/assets/scene/solarsystem/planets/earth/eclipses/paths/total/2028-07-22.asset
@@ -16,13 +16,11 @@ local Layer = {
 
 
 asset.onInitialize(function()
-  openspace.printWarning("The map for the total eclipse of 22nd July 2028 contains a geometry that cannot be read right now")
-  -- @TODO:  The file contains a non-simple geometry which is currently not supported
-  -- openspace.globebrowsing.addGeoJson(earth.Earth.Identifier, Layer)
+  openspace.globebrowsing.addGeoJson(earth.Earth.Identifier, Layer)
 end)
 
 asset.onDeinitialize(function()
-  -- openspace.globebrowsing.deleteGeoJson(earth.Earth.Identifier, Layer)
+  openspace.globebrowsing.deleteGeoJson(earth.Earth.Identifier, Layer)
 end)
 
 
diff --git a/data/assets/scene/solarsystem/planets/earth/eclipses/paths/total/2033-03-30.asset b/data/assets/scene/solarsystem/planets/earth/eclipses/paths/total/2033-03-30.asset
index 3e4b178908..503855985d 100644
--- a/data/assets/scene/solarsystem/planets/earth/eclipses/paths/total/2033-03-30.asset
+++ b/data/assets/scene/solarsystem/planets/earth/eclipses/paths/total/2033-03-30.asset
@@ -16,13 +16,11 @@ local Layer = {
 
 
 asset.onInitialize(function()
-  openspace.printWarning("The map for the total eclipse of 30th March 2033 contains a geometry that cannot be read right now")
-  -- @TODO:  The file contains a non-simple geometry which is currently not supported
-  -- openspace.globebrowsing.addGeoJson(earth.Earth.Identifier, Layer)
+  openspace.globebrowsing.addGeoJson(earth.Earth.Identifier, Layer)
 end)
 
 asset.onDeinitialize(function()
-  -- openspace.globebrowsing.deleteGeoJson(earth.Earth.Identifier, Layer)
+  openspace.globebrowsing.deleteGeoJson(earth.Earth.Identifier, Layer)
 end)
 
 
diff --git a/data/assets/scene/solarsystem/planets/earth/eclipses/paths/total/2034-03-20.asset b/data/assets/scene/solarsystem/planets/earth/eclipses/paths/total/2034-03-20.asset
index 7e92e6e610..a1168bfe2b 100644
--- a/data/assets/scene/solarsystem/planets/earth/eclipses/paths/total/2034-03-20.asset
+++ b/data/assets/scene/solarsystem/planets/earth/eclipses/paths/total/2034-03-20.asset
@@ -16,13 +16,11 @@ local Layer = {
 
 
 asset.onInitialize(function()
-  openspace.printWarning("The map for the total eclipse of 20th March 2034 contains a geometry that cannot be read right now")
-  -- @TODO:  The file contains a non-simple geometry which is currently not supported
-  -- openspace.globebrowsing.addGeoJson(earth.Earth.Identifier, Layer)
+  openspace.globebrowsing.addGeoJson(earth.Earth.Identifier, Layer)
 end)
 
 asset.onDeinitialize(function()
-  -- openspace.globebrowsing.deleteGeoJson(earth.Earth.Identifier, Layer)
+  openspace.globebrowsing.deleteGeoJson(earth.Earth.Identifier, Layer)
 end)
 
 
diff --git a/data/assets/scene/solarsystem/planets/earth/eclipses/paths/total/2042-04-20.asset b/data/assets/scene/solarsystem/planets/earth/eclipses/paths/total/2042-04-20.asset
index 1b222cd5b7..f4fc2a76a1 100644
--- a/data/assets/scene/solarsystem/planets/earth/eclipses/paths/total/2042-04-20.asset
+++ b/data/assets/scene/solarsystem/planets/earth/eclipses/paths/total/2042-04-20.asset
@@ -16,13 +16,11 @@ local Layer = {
 
 
 asset.onInitialize(function()
-  openspace.printWarning("The map for the total eclipse of 20th April 2042 contains a geometry that cannot be read right now")
-  -- @TODO:  The file contains a non-simple geometry which is currently not supported
-  -- openspace.globebrowsing.addGeoJson(earth.Earth.Identifier, Layer)
+  openspace.globebrowsing.addGeoJson(earth.Earth.Identifier, Layer)
 end)
 
 asset.onDeinitialize(function()
-  -- openspace.globebrowsing.deleteGeoJson(earth.Earth.Identifier, Layer)
+  openspace.globebrowsing.deleteGeoJson(earth.Earth.Identifier, Layer)
 end)
 
 
diff --git a/modules/globebrowsing/src/geojson/geojsoncomponent.cpp b/modules/globebrowsing/src/geojson/geojsoncomponent.cpp
index 4c4e282a0b..a827896d41 100644
--- a/modules/globebrowsing/src/geojson/geojsoncomponent.cpp
+++ b/modules/globebrowsing/src/geojson/geojsoncomponent.cpp
@@ -50,6 +50,7 @@ namespace geos_nlohmann = nlohmann;
 #include <geos/geom/Geometry.h>
 #include <geos/io/GeoJSON.h>
 #include <geos/io/GeoJSONReader.h>
+#include <geos/operation/valid/MakeValid.h>
 
 namespace {
     constexpr std::string_view _loggerCat = "GeoJsonComponent";
@@ -635,8 +636,18 @@ void GeoJsonComponent::readFile() {
 void GeoJsonComponent::parseSingleFeature(const geos::io::GeoJSONFeature& feature,
                                           int indexInFile
 ) {
-    // Read the geometry
-    const geos::geom::Geometry* geom = feature.getGeometry();
+    const geos::geom::Geometry* nonValidatedGeometry = feature.getGeometry();
+
+    if (!nonValidatedGeometry->isValid()) {
+        LWARNING(std::format(
+            "Feature {} in GeoJson file '{}' has invalid geometry (for example due to "
+            "self-intersections or other non-simple geometry). If possible, the feature "
+            "will be split into separate features with valid geometry. However, note "
+            "that this may introduce artifacts.", indexInFile, _geoJsonFile.value()
+        ));
+    }
+    geos::operation::valid::MakeValid makeValid;
+    std::unique_ptr<geos::geom::Geometry> geom = makeValid.build(nonValidatedGeometry);
 
     // Read the properties
     GeoJsonOverrideProperties propsFromFile = propsFromGeoJson(feature);
@@ -652,7 +663,7 @@ void GeoJsonComponent::parseSingleFeature(const geos::io::GeoJSONFeature& featur
     }
     else if (geom->isPuntal()) {
         // If points, handle all point features as one feature, even multi-points
-        geomsToAdd = { geom };
+        geomsToAdd = { geom.get()};
     }
     else {
         const size_t nGeom = geom->getNumGeometries();
diff --git a/modules/globebrowsing/src/geojson/globegeometryfeature.cpp b/modules/globebrowsing/src/geojson/globegeometryfeature.cpp
index f022c9a602..2f1c288d0a 100644
--- a/modules/globebrowsing/src/geojson/globegeometryfeature.cpp
+++ b/modules/globebrowsing/src/geojson/globegeometryfeature.cpp
@@ -236,12 +236,8 @@ void GlobeGeometryFeature::createFromSingleGeosGeometry(const geos::geom::Geomet
             }
             catch (geos::util::IllegalStateException& e) {
                 throw ghoul::RuntimeError(std::format(
-                    "Non-simple (e.g. self-intersecting) polygons not supported yet. "
-                    "GEOS error: {}", e.what()
+                    "GEOS illegal state error: {}", e.what()
                 ));
-
-                // TODO: handle self-intersections points
-                // https://www.sciencedirect.com/science/article/pii/S0304397520304199
             }
             catch (geos::util::GEOSException& e) {
                 throw ghoul::RuntimeError(std::format(

From 07a0912dc19eb716991d39325c3e1f1f88569bcf Mon Sep 17 00:00:00 2001
From: Emma Broman <emma.broman@liu.se>
Date: Thu, 31 Oct 2024 17:43:24 +0100
Subject: [PATCH 655/701] Split up JWST and Lagrange point assets into smaller
 assets (#3432)

* Separate JWST asset into multiple assets and avoid specifying timestamps in multiple files

* Split up L1, L2, L4 and L5 assets

* Include L2 and L2 Sun line in jwst asset

* Add asset.enabled option to jwst and lagrange point assets

* Remove a comment that came from Voyager mission file

* Apply suggestions from code review

Co-authored-by: Alexander Bock <alexander.bock@liu.se>

* Add missing tags for some L2 SGNs

* Fix broken jwst trail asset

* Phrase comment for L2 co-revolving frame a bit more generally

---------

Co-authored-by: Alexander Bock <alexander.bock@liu.se>
---
 .../earth/lagrange_points/l1/kernels.asset    |  22 ++
 .../earth/lagrange_points/{ => l1}/l1.asset   |  46 +---
 .../earth/lagrange_points/l1/transforms.asset |  34 +++
 .../planets/earth/lagrange_points/l2.asset    | 207 ------------------
 .../earth/lagrange_points/l2/kernels.asset    |  29 +++
 .../planets/earth/lagrange_points/l2/l2.asset | 122 +++++++++++
 .../earth/lagrange_points/l2/l2sunline.asset  |  44 ++++
 .../earth/lagrange_points/l2/transforms.asset |  57 +++++
 .../earth/lagrange_points/l4/kernels.asset    |  22 ++
 .../earth/lagrange_points/{ => l4}/l4.asset   |  46 +---
 .../earth/lagrange_points/l4/transforms.asset |  34 +++
 .../earth/lagrange_points/l5/kernels.asset    |  22 ++
 .../earth/lagrange_points/{ => l5}/l5.asset   |  45 +---
 .../earth/lagrange_points/l5/transforms.asset |  34 +++
 .../lagrange_points/lagrange_points.asset     |   8 +-
 .../telescopes/euclid/trails.asset            |   2 +-
 .../telescopes/jwst/fieldofview.asset         |  60 +++++
 .../solarsystem/telescopes/jwst/jwst.asset    | 165 +-------------
 .../solarsystem/telescopes/jwst/label.asset   |  49 +++++
 .../solarsystem/telescopes/jwst/mission.asset |   6 -
 .../solarsystem/telescopes/jwst/model.asset   |  64 ++++++
 .../solarsystem/telescopes/jwst/trail.asset   |  40 ++--
 .../telescopes/jwst/transforms.asset          |  22 +-
 .../telescopes/jwst/viewingband.asset         |  70 ++++++
 24 files changed, 727 insertions(+), 523 deletions(-)
 create mode 100644 data/assets/scene/solarsystem/planets/earth/lagrange_points/l1/kernels.asset
 rename data/assets/scene/solarsystem/planets/earth/lagrange_points/{ => l1}/l1.asset (57%)
 create mode 100644 data/assets/scene/solarsystem/planets/earth/lagrange_points/l1/transforms.asset
 delete mode 100644 data/assets/scene/solarsystem/planets/earth/lagrange_points/l2.asset
 create mode 100644 data/assets/scene/solarsystem/planets/earth/lagrange_points/l2/kernels.asset
 create mode 100644 data/assets/scene/solarsystem/planets/earth/lagrange_points/l2/l2.asset
 create mode 100644 data/assets/scene/solarsystem/planets/earth/lagrange_points/l2/l2sunline.asset
 create mode 100644 data/assets/scene/solarsystem/planets/earth/lagrange_points/l2/transforms.asset
 create mode 100644 data/assets/scene/solarsystem/planets/earth/lagrange_points/l4/kernels.asset
 rename data/assets/scene/solarsystem/planets/earth/lagrange_points/{ => l4}/l4.asset (57%)
 create mode 100644 data/assets/scene/solarsystem/planets/earth/lagrange_points/l4/transforms.asset
 create mode 100644 data/assets/scene/solarsystem/planets/earth/lagrange_points/l5/kernels.asset
 rename data/assets/scene/solarsystem/planets/earth/lagrange_points/{ => l5}/l5.asset (57%)
 create mode 100644 data/assets/scene/solarsystem/planets/earth/lagrange_points/l5/transforms.asset
 create mode 100644 data/assets/scene/solarsystem/telescopes/jwst/fieldofview.asset
 create mode 100644 data/assets/scene/solarsystem/telescopes/jwst/label.asset
 create mode 100644 data/assets/scene/solarsystem/telescopes/jwst/model.asset
 create mode 100644 data/assets/scene/solarsystem/telescopes/jwst/viewingband.asset

diff --git a/data/assets/scene/solarsystem/planets/earth/lagrange_points/l1/kernels.asset b/data/assets/scene/solarsystem/planets/earth/lagrange_points/l1/kernels.asset
new file mode 100644
index 0000000000..1e275688ef
--- /dev/null
+++ b/data/assets/scene/solarsystem/planets/earth/lagrange_points/l1/kernels.asset
@@ -0,0 +1,22 @@
+local kernels = asset.resource({
+  Name = "Lagrange Kernels",
+  Type = "HttpSynchronization",
+  Identifier = "earth_lagrange_kernels",
+  Version = 1
+})
+
+
+local ID = {
+  L1 = 391
+}
+
+
+asset.onInitialize(function()
+  openspace.spice.loadKernel(kernels .. "L1_de431.bsp")
+end)
+
+asset.onDeinitialize(function()
+  openspace.spice.unloadKernel(kernels .. "L1_de431.bsp")
+end)
+
+asset.export("ID", ID)
diff --git a/data/assets/scene/solarsystem/planets/earth/lagrange_points/l1.asset b/data/assets/scene/solarsystem/planets/earth/lagrange_points/l1/l1.asset
similarity index 57%
rename from data/assets/scene/solarsystem/planets/earth/lagrange_points/l1.asset
rename to data/assets/scene/solarsystem/planets/earth/lagrange_points/l1/l1.asset
index 91cd974d50..c1806432eb 100644
--- a/data/assets/scene/solarsystem/planets/earth/lagrange_points/l1.asset
+++ b/data/assets/scene/solarsystem/planets/earth/lagrange_points/l1/l1.asset
@@ -1,5 +1,4 @@
-local transforms = asset.require("scene/solarsystem/sun/transforms")
-local coreKernels = asset.require("spice/core")
+local transforms = asset.require("./transforms")
 
 
 
@@ -10,41 +9,13 @@ local circle = asset.resource({
   Version = 1
 })
 
-local kernels = asset.resource({
-  Name = "Lagrange Kernels",
-  Type = "HttpSynchronization",
-  Identifier = "earth_lagrange_kernels",
-  Version = 1
-})
-
-
-local ID = {
-  L1 = 391
-}
-
-local L1Position = {
-  Identifier = "L1Position",
-  Parent = transforms.SolarSystemBarycenter.Identifier,
-  Transform = {
-    Translation = {
-      Type = "SpiceTranslation",
-      Target = ID.L1,
-      Observer = coreKernels.ID.SolarSystemBarycenter
-    }
-  },
-  Tag = { "lagrange_points_earth" , "lagrange_points_earth_l1" },
-  GUI = {
-    Name = "L1 Position",
-    Path = "/Solar System/Planets/Earth/Lagrange Points",
-    Hidden = true
-  }
-}
 
 local L1 = {
   Identifier = "L1",
-  Parent = L1Position.Identifier,
+  Parent = transforms.L1Position.Identifier,
   Renderable = {
     Type = "RenderablePlaneImageLocal",
+    Enabled = asset.enabled,
     Billboard = true,
     Size = 70000000,
     Texture = circle .. "circle.png",
@@ -59,9 +30,10 @@ local L1 = {
 
 local L1Label = {
   Identifier = "L1Label",
-  Parent = L1Position.Identifier,
+  Parent = transforms.L1Position.Identifier,
   Renderable = {
     Type = "RenderableLabel",
+    Enabled = asset.enabled,
     Text = "L1",
     FontSize = 50,
     Size = 7.5,
@@ -80,9 +52,6 @@ local L1Label = {
 
 
 asset.onInitialize(function()
-  openspace.spice.loadKernel(kernels .. "L1_de431.bsp")
-
-  openspace.addSceneGraphNode(L1Position)
   openspace.addSceneGraphNode(L1)
   openspace.addSceneGraphNode(L1Label)
 end)
@@ -90,13 +59,8 @@ end)
 asset.onDeinitialize(function()
   openspace.removeSceneGraphNode(L1Label)
   openspace.removeSceneGraphNode(L1)
-  openspace.removeSceneGraphNode(L1Position)
-
-  openspace.spice.unloadKernel(kernels .. "L1_de431.bsp")
 end)
 
-asset.export("ID", ID)
-asset.export(L1Position)
 asset.export(L1)
 asset.export(L1Label)
 
diff --git a/data/assets/scene/solarsystem/planets/earth/lagrange_points/l1/transforms.asset b/data/assets/scene/solarsystem/planets/earth/lagrange_points/l1/transforms.asset
new file mode 100644
index 0000000000..57ec462907
--- /dev/null
+++ b/data/assets/scene/solarsystem/planets/earth/lagrange_points/l1/transforms.asset
@@ -0,0 +1,34 @@
+local transforms = asset.require("scene/solarsystem/sun/transforms")
+local kernels = asset.require("./kernels")
+local coreKernels = asset.require("spice/core")
+
+
+
+local L1Position = {
+  Identifier = "L1Position",
+  Parent = transforms.SolarSystemBarycenter.Identifier,
+  Transform = {
+    Translation = {
+      Type = "SpiceTranslation",
+      Target = kernels.ID.L1,
+      Observer = coreKernels.ID.SolarSystemBarycenter
+    }
+  },
+  Tag = { "lagrange_points_earth" , "lagrange_points_earth_l1" },
+  GUI = {
+    Name = "L1 Position",
+    Path = "/Solar System/Planets/Earth/Lagrange Points",
+    Hidden = true
+  }
+}
+
+
+asset.onInitialize(function()
+  openspace.addSceneGraphNode(L1Position)
+end)
+
+asset.onDeinitialize(function()
+  openspace.removeSceneGraphNode(L1Position)
+end)
+
+asset.export(L1Position)
diff --git a/data/assets/scene/solarsystem/planets/earth/lagrange_points/l2.asset b/data/assets/scene/solarsystem/planets/earth/lagrange_points/l2.asset
deleted file mode 100644
index 1697b23bb4..0000000000
--- a/data/assets/scene/solarsystem/planets/earth/lagrange_points/l2.asset
+++ /dev/null
@@ -1,207 +0,0 @@
-local sun = asset.require("scene/solarsystem/sun/sun")
-local transforms = asset.require("scene/solarsystem/sun/transforms")
-local coreKernels = asset.require("spice/core")
-
-
-
-local circle = asset.resource({
-  Name = "Circle",
-  Type = "HttpSynchronization",
-  Identifier = "circle_image",
-  Version = 1
-})
-
-local kernels = asset.resource({
-  Name = "Lagrange Kernels",
-  Type = "HttpSynchronization",
-  Identifier = "earth_lagrange_kernels",
-  Version = 2
-})
-
-
-local ID = {
-  L2 = 392
-}
-
-local Frame = {
-  L2Corevolving = "L2_COREV"
-}
-
-local L2Position = {
-  Identifier = "L2Position",
-  Parent = transforms.SolarSystemBarycenter.Identifier,
-  Transform = {
-    Translation = {
-      Type = "SpiceTranslation",
-      Target = ID.L2,
-      Observer = coreKernels.ID.SolarSystemBarycenter
-    }
-  },
-  Tag = { "lagrange_points_earth", "lagrange_points_earth_l2" },
-  GUI = {
-    Name = "L2 Position",
-    Path = "/Solar System/Planets/Earth/Lagrange Points",
-    Hidden = true
-  }
-}
-
--- This ref. frame co-revolves with L2 and is needed for a more intuitive trail of JWST in
--- relation to L2
-local L2CoRevFrame = {
-  Identifier = "L2CoRevFrame",
-  Parent = L2Position.Identifier,
-  Transform = {
-    Rotation = {
-      Type = "SpiceRotation",
-      SourceFrame = Frame.L2Corevolving,
-      DestinationFrame = coreKernels.Frame.Galactic
-    }
-  },
-  Tag = { "lagrange_points_earth", "lagrange_points_earth_l2" },
-  GUI = {
-    Name = "L2 Co-revolving Reference Frame",
-    Path = "/Solar System/Planets/Earth/Lagrange Points",
-    Hidden = true
-  }
-}
-
-local L2Small = {
-  Identifier = "L2Small",
-  Parent = L2Position.Identifier,
-  Renderable = {
-    Type = "RenderablePlaneImageLocal",
-    Billboard = true,
-    Size = 4000000,
-    Texture = circle .. "circle.png",
-    BlendMode = "Additive"
-  },
-  Tag = { "lagrange_points_earth_l2_small" },
-  GUI = {
-    Name = "L2 Small",
-    Path = "/Solar System/Planets/Earth/Lagrange Points"
-  }
-}
-
-local L2 = {
-  Identifier = "L2",
-  Parent = L2Position.Identifier,
-  Renderable = {
-    Type = "RenderablePlaneImageLocal",
-    Billboard = true,
-    Size = 70000000,
-    Texture = circle .. "circle.png",
-    BlendMode = "Additive"
-  },
-  Tag = { "lagrange_points_earth", "lagrange_points_earth_l2" },
-  GUI = {
-    Name = "L2",
-    Path = "/Solar System/Planets/Earth/Lagrange Points"
-  }
-}
-
-local L2SmallLabel = {
-  Identifier = "L2SmallLabel",
-  Parent = L2Position.Identifier,
-  Renderable = {
-    Type = "RenderableLabel",
-    Text = "L2",
-    FontSize = 50.0,
-    Size = 6.0,
-    MinMaxSize = { 1.0, 100.0 },
-    OrientationOption = "Camera View Direction",
-    BlendMode = "Normal",
-    EnableFading = false
-  },
-  Tag = { "lagrange_points_earth_l2_small" },
-  GUI = {
-    Name = "L2 Small Label",
-    Path = "/Solar System/Planets/Earth/Lagrange Points",
-    Description = "Small label for L2"
-  }
-}
-
-local L2Label = {
-  Identifier = "L2Label",
-  Parent = L2Position.Identifier,
-  Renderable = {
-    Type = "RenderableLabel",
-    Text = "L2",
-    FontSize = 50,
-    Size = 7.5,
-    MinMaxSize = { 1.0, 100.0 },
-    OrientationOption = "Camera View Direction",
-    BlendMode = "Normal",
-    EnableFading = false
-  },
-  Tag = { "lagrange_points_earth", "lagrange_points_earth_l2" },
-  GUI = {
-    Name = "L2 Label",
-    Path = "/Solar System/Planets/Earth/Lagrange Points",
-    Description = "Main label for L2"
-  }
-}
-
-local L2SunLine = {
-  Identifier = "L2SunLine",
-  Parent = transforms.SolarSystemBarycenter.Identifier,
-  Renderable = {
-    Type = "RenderableNodeLine",
-    StartNode = sun.Sun.Identifier,
-    EndNode = L2Small.Identifier,
-    Color = { 0.5, 0.5, 0.5 },
-    LineWidth = 2
-  },
-  Tag = { "lagrange_points_earth_l2_small" },
-  GUI = {
-    Name = "Sun to L2 Line",
-    Path = "/Solar System/Planets/Earth/Lagrange Points"
-  }
-}
-
-
-asset.onInitialize(function()
-  openspace.spice.loadKernel(kernels .. "L2_de431.bsp")
-  openspace.spice.loadKernel(kernels .. "L2_corev.tf")
-
-  openspace.addSceneGraphNode(L2Position)
-  openspace.addSceneGraphNode(L2CoRevFrame)
-  openspace.addSceneGraphNode(L2Small)
-  openspace.addSceneGraphNode(L2)
-  openspace.addSceneGraphNode(L2SunLine)
-  openspace.addSceneGraphNode(L2SmallLabel)
-  openspace.addSceneGraphNode(L2Label)
-end)
-
-asset.onDeinitialize(function()
-  openspace.removeSceneGraphNode(L2Label)
-  openspace.removeSceneGraphNode(L2SmallLabel)
-  openspace.removeSceneGraphNode(L2SunLine)
-  openspace.removeSceneGraphNode(L2)
-  openspace.removeSceneGraphNode(L2Small)
-  openspace.removeSceneGraphNode(L2CoRevFrame)
-  openspace.removeSceneGraphNode(L2Position)
-
-  openspace.spice.unloadKernel(kernels .. "L2_corev.tf")
-  openspace.spice.unloadKernel(kernels .. "L2_de431.bsp")
-end)
-
-asset.export("ID", ID)
-asset.export("Frame", Frame)
-asset.export(L2Position)
-asset.export(L2CoRevFrame)
-asset.export(L2Small)
-asset.export(L2)
-asset.export(L2SunLine)
-asset.export(L2SmallLabel)
-asset.export(L2Label)
-
-
-
-asset.meta = {
-  Name = "Lagrange point L2",
-  Description = [[Lagrange point L2 large and small nodes, sun line, and large and small
-    labels]],
-  Author = "OpenSpace Team",
-  URL = "http://openspaceproject.com",
-  License = "MIT license"
-}
diff --git a/data/assets/scene/solarsystem/planets/earth/lagrange_points/l2/kernels.asset b/data/assets/scene/solarsystem/planets/earth/lagrange_points/l2/kernels.asset
new file mode 100644
index 0000000000..3ac78a69a1
--- /dev/null
+++ b/data/assets/scene/solarsystem/planets/earth/lagrange_points/l2/kernels.asset
@@ -0,0 +1,29 @@
+local kernels = asset.resource({
+  Name = "Lagrange Kernels",
+  Type = "HttpSynchronization",
+  Identifier = "earth_lagrange_kernels",
+  Version = 2
+})
+
+
+local ID = {
+  L2 = 392
+}
+
+local Frame = {
+  L2Corevolving = "L2_COREV"
+}
+
+
+asset.onInitialize(function()
+  openspace.spice.loadKernel(kernels .. "L2_de431.bsp")
+  openspace.spice.loadKernel(kernels .. "L2_corev.tf")
+end)
+
+asset.onDeinitialize(function()
+  openspace.spice.unloadKernel(kernels .. "L2_corev.tf")
+  openspace.spice.unloadKernel(kernels .. "L2_de431.bsp")
+end)
+
+asset.export("ID", ID)
+asset.export("Frame", Frame)
diff --git a/data/assets/scene/solarsystem/planets/earth/lagrange_points/l2/l2.asset b/data/assets/scene/solarsystem/planets/earth/lagrange_points/l2/l2.asset
new file mode 100644
index 0000000000..4ae51aa794
--- /dev/null
+++ b/data/assets/scene/solarsystem/planets/earth/lagrange_points/l2/l2.asset
@@ -0,0 +1,122 @@
+local transforms = asset.require("./transforms")
+
+
+
+local circle = asset.resource({
+  Name = "Circle",
+  Type = "HttpSynchronization",
+  Identifier = "circle_image",
+  Version = 1
+})
+
+
+local L2Small = {
+  Identifier = "L2Small",
+  Parent = transforms.L2Position.Identifier,
+  Renderable = {
+    Type = "RenderablePlaneImageLocal",
+    Enabled = asset.enabled,
+    Billboard = true,
+    Size = 4000000,
+    Texture = circle .. "circle.png",
+    BlendMode = "Additive"
+  },
+  Tag = { "lagrange_points_earth", "lagrange_points_earth_l2_small" },
+  GUI = {
+    Name = "L2 Small",
+    Path = "/Solar System/Planets/Earth/Lagrange Points"
+  }
+}
+
+local L2 = {
+  Identifier = "L2",
+  Parent = transforms.L2Position.Identifier,
+  Renderable = {
+    Type = "RenderablePlaneImageLocal",
+    Enabled = asset.enabled,
+    Billboard = true,
+    Size = 70000000,
+    Texture = circle .. "circle.png",
+    BlendMode = "Additive"
+  },
+  Tag = { "lagrange_points_earth", "lagrange_points_earth_l2" },
+  GUI = {
+    Name = "L2",
+    Path = "/Solar System/Planets/Earth/Lagrange Points"
+  }
+}
+
+local L2SmallLabel = {
+  Identifier = "L2SmallLabel",
+  Parent = transforms.L2Position.Identifier,
+  Renderable = {
+    Type = "RenderableLabel",
+    Enabled = asset.enabled,
+    Text = "L2",
+    FontSize = 50.0,
+    Size = 6.0,
+    MinMaxSize = { 1.0, 100.0 },
+    OrientationOption = "Camera View Direction",
+    BlendMode = "Normal",
+    EnableFading = false
+  },
+  Tag = { "lagrange_points_earth", "lagrange_points_earth_l2_small" },
+  GUI = {
+    Name = "L2 Small Label",
+    Path = "/Solar System/Planets/Earth/Lagrange Points",
+    Description = "Small label for L2"
+  }
+}
+
+local L2Label = {
+  Identifier = "L2Label",
+  Parent = transforms.L2Position.Identifier,
+  Renderable = {
+    Type = "RenderableLabel",
+    Enabled = asset.enabled,
+    Text = "L2",
+    FontSize = 50,
+    Size = 7.5,
+    MinMaxSize = { 1.0, 100.0 },
+    OrientationOption = "Camera View Direction",
+    BlendMode = "Normal",
+    EnableFading = false
+  },
+  Tag = { "lagrange_points_earth", "lagrange_points_earth_l2" },
+  GUI = {
+    Name = "L2 Label",
+    Path = "/Solar System/Planets/Earth/Lagrange Points",
+    Description = "Main label for L2"
+  }
+}
+
+
+asset.onInitialize(function()
+  openspace.addSceneGraphNode(L2Small)
+  openspace.addSceneGraphNode(L2)
+  openspace.addSceneGraphNode(L2SmallLabel)
+  openspace.addSceneGraphNode(L2Label)
+end)
+
+asset.onDeinitialize(function()
+  openspace.removeSceneGraphNode(L2Label)
+  openspace.removeSceneGraphNode(L2SmallLabel)
+  openspace.removeSceneGraphNode(L2)
+  openspace.removeSceneGraphNode(L2Small)
+end)
+
+asset.export(L2Small)
+asset.export(L2)
+asset.export(L2SmallLabel)
+asset.export(L2Label)
+
+
+
+asset.meta = {
+  Name = "Lagrange point L2",
+  Description = [[Lagrange point L2 large and small nodes, and large and small
+    labels]],
+  Author = "OpenSpace Team",
+  URL = "http://openspaceproject.com",
+  License = "MIT license"
+}
diff --git a/data/assets/scene/solarsystem/planets/earth/lagrange_points/l2/l2sunline.asset b/data/assets/scene/solarsystem/planets/earth/lagrange_points/l2/l2sunline.asset
new file mode 100644
index 0000000000..16c3bb83ba
--- /dev/null
+++ b/data/assets/scene/solarsystem/planets/earth/lagrange_points/l2/l2sunline.asset
@@ -0,0 +1,44 @@
+local sun = asset.require("scene/solarsystem/sun/sun")
+local sunTransforms = asset.require("scene/solarsystem/sun/transforms")
+local transforms = asset.require("./transforms")
+
+
+
+local L2SunLine = {
+  Identifier = "L2SunLine",
+  Parent = sunTransforms.SolarSystemBarycenter.Identifier,
+  Renderable = {
+    Type = "RenderableNodeLine",
+    Enabled = asset.enabled,
+    StartNode = sun.Sun.Identifier,
+    EndNode = transforms.L2Position.Identifier,
+    Color = { 0.5, 0.5, 0.5 },
+    LineWidth = 2
+  },
+  Tag = { "lagrange_points_earth_l2_small" },
+  GUI = {
+    Name = "Sun to L2 Line",
+    Path = "/Solar System/Planets/Earth/Lagrange Points"
+  }
+}
+
+
+asset.onInitialize(function()
+  openspace.addSceneGraphNode(L2SunLine)
+end)
+
+asset.onDeinitialize(function()
+  openspace.removeSceneGraphNode(L2SunLine)
+end)
+
+asset.export(L2SunLine)
+
+
+
+asset.meta = {
+  Name = "Lagrange Point L2 to Sun Line",
+  Description = [[Lagrange point L2 to Sun line]],
+  Author = "OpenSpace Team",
+  URL = "http://openspaceproject.com",
+  License = "MIT license"
+}
diff --git a/data/assets/scene/solarsystem/planets/earth/lagrange_points/l2/transforms.asset b/data/assets/scene/solarsystem/planets/earth/lagrange_points/l2/transforms.asset
new file mode 100644
index 0000000000..2fc0f468ee
--- /dev/null
+++ b/data/assets/scene/solarsystem/planets/earth/lagrange_points/l2/transforms.asset
@@ -0,0 +1,57 @@
+local transforms = asset.require("scene/solarsystem/sun/transforms")
+local kernels = asset.require("./kernels")
+local coreKernels = asset.require("spice/core")
+
+
+
+local L2Position = {
+  Identifier = "L2Position",
+  Parent = transforms.SolarSystemBarycenter.Identifier,
+  Transform = {
+    Translation = {
+      Type = "SpiceTranslation",
+      Target = kernels.ID.L2,
+      Observer = coreKernels.ID.SolarSystemBarycenter
+    }
+  },
+  Tag = { "lagrange_points_earth", "lagrange_points_earth_l2" },
+  GUI = {
+    Name = "L2 Position",
+    Path = "/Solar System/Planets/Earth/Lagrange Points",
+    Hidden = true
+  }
+}
+
+-- This reference frame co-revolves with L2 and can be useful for trails for certain
+-- spacecraft that orbit in relation to L2. It is for exmaple used for JWST
+local L2CoRevFrame = {
+  Identifier = "L2CoRevFrame",
+  Parent = L2Position.Identifier,
+  Transform = {
+    Rotation = {
+      Type = "SpiceRotation",
+      SourceFrame = kernels.Frame.L2Corevolving,
+      DestinationFrame = coreKernels.Frame.Galactic
+    }
+  },
+  Tag = { "lagrange_points_earth", "lagrange_points_earth_l2" },
+  GUI = {
+    Name = "L2 Co-revolving Reference Frame",
+    Path = "/Solar System/Planets/Earth/Lagrange Points",
+    Hidden = true
+  }
+}
+
+
+asset.onInitialize(function()
+  openspace.addSceneGraphNode(L2Position)
+  openspace.addSceneGraphNode(L2CoRevFrame)
+end)
+
+asset.onDeinitialize(function()
+  openspace.removeSceneGraphNode(L2CoRevFrame)
+  openspace.removeSceneGraphNode(L2Position)
+end)
+
+asset.export(L2Position)
+asset.export(L2CoRevFrame)
diff --git a/data/assets/scene/solarsystem/planets/earth/lagrange_points/l4/kernels.asset b/data/assets/scene/solarsystem/planets/earth/lagrange_points/l4/kernels.asset
new file mode 100644
index 0000000000..7b6aea683b
--- /dev/null
+++ b/data/assets/scene/solarsystem/planets/earth/lagrange_points/l4/kernels.asset
@@ -0,0 +1,22 @@
+local kernels = asset.resource({
+  Name = "Lagrange Kernels",
+  Type = "HttpSynchronization",
+  Identifier = "earth_lagrange_kernels",
+  Version = 1
+})
+
+
+local ID = {
+  L4 = 394
+}
+
+
+asset.onInitialize(function()
+  openspace.spice.loadKernel(kernels .. "L4_de431.bsp")
+end)
+
+asset.onDeinitialize(function()
+  openspace.spice.unloadKernel(kernels .. "L4_de431.bsp")
+end)
+
+asset.export("ID", ID)
diff --git a/data/assets/scene/solarsystem/planets/earth/lagrange_points/l4.asset b/data/assets/scene/solarsystem/planets/earth/lagrange_points/l4/l4.asset
similarity index 57%
rename from data/assets/scene/solarsystem/planets/earth/lagrange_points/l4.asset
rename to data/assets/scene/solarsystem/planets/earth/lagrange_points/l4/l4.asset
index fc31d9a812..7dda9ff4e9 100644
--- a/data/assets/scene/solarsystem/planets/earth/lagrange_points/l4.asset
+++ b/data/assets/scene/solarsystem/planets/earth/lagrange_points/l4/l4.asset
@@ -1,5 +1,4 @@
-local transforms = asset.require("scene/solarsystem/sun/transforms")
-local coreKernels = asset.require("spice/core")
+local transforms = asset.require("./transforms")
 
 
 
@@ -10,41 +9,13 @@ local circle = asset.resource({
   Version = 1
 })
 
-local kernels = asset.resource({
-  Name = "Lagrange Kernels",
-  Type = "HttpSynchronization",
-  Identifier = "earth_lagrange_kernels",
-  Version = 1
-})
-
-
-local ID = {
-  L4 = 394
-}
-
-local L4Position = {
-  Identifier = "L4Position",
-  Parent = transforms.SolarSystemBarycenter.Identifier,
-  Transform = {
-    Translation = {
-      Type = "SpiceTranslation",
-      Target = ID.L4,
-      Observer = coreKernels.ID.SolarSystemBarycenter
-    }
-  },
-  Tag = { "lagrange_points_earth", "lagrange_points_earth_l4" },
-  GUI = {
-    Name = "L4 Position",
-    Path = "/Solar System/Planets/Earth/Lagrange Points",
-    Hidden = true
-  }
-}
 
 local L4 = {
   Identifier = "L4",
-  Parent = L4Position.Identifier,
+  Parent = transforms.L4Position.Identifier,
   Renderable = {
     Type = "RenderablePlaneImageLocal",
+    Enabled = asset.enabled,
     Billboard = true,
     Size = 800000000,
     Texture = circle .. "circle.png",
@@ -59,9 +30,10 @@ local L4 = {
 
 local L4Label = {
   Identifier = "L4Label",
-  Parent = L4Position.Identifier,
+  Parent = transforms.L4Position.Identifier,
   Renderable = {
     Type = "RenderableLabel",
+    Enabled = asset.enabled,
     Text = "L4",
     FontSize = 50,
     Size = 8.5,
@@ -80,9 +52,6 @@ local L4Label = {
 
 
 asset.onInitialize(function()
-  openspace.spice.loadKernel(kernels .. "L4_de431.bsp")
-
-  openspace.addSceneGraphNode(L4Position)
   openspace.addSceneGraphNode(L4)
   openspace.addSceneGraphNode(L4Label)
 end)
@@ -90,13 +59,8 @@ end)
 asset.onDeinitialize(function()
   openspace.removeSceneGraphNode(L4Label)
   openspace.removeSceneGraphNode(L4)
-  openspace.removeSceneGraphNode(L4Position)
-
-  openspace.spice.unloadKernel(kernels .. "L4_de431.bsp")
 end)
 
-asset.export("ID", ID)
-asset.export(L4Position)
 asset.export(L4)
 asset.export(L4Label)
 
diff --git a/data/assets/scene/solarsystem/planets/earth/lagrange_points/l4/transforms.asset b/data/assets/scene/solarsystem/planets/earth/lagrange_points/l4/transforms.asset
new file mode 100644
index 0000000000..9bf6a983e9
--- /dev/null
+++ b/data/assets/scene/solarsystem/planets/earth/lagrange_points/l4/transforms.asset
@@ -0,0 +1,34 @@
+local transforms = asset.require("scene/solarsystem/sun/transforms")
+local kernels = asset.require("./kernels")
+local coreKernels = asset.require("spice/core")
+
+
+
+local L4Position = {
+  Identifier = "L4Position",
+  Parent = transforms.SolarSystemBarycenter.Identifier,
+  Transform = {
+    Translation = {
+      Type = "SpiceTranslation",
+      Target = kernels.ID.L4,
+      Observer = coreKernels.ID.SolarSystemBarycenter
+    }
+  },
+  Tag = { "lagrange_points_earth", "lagrange_points_earth_l4" },
+  GUI = {
+    Name = "L4 Position",
+    Path = "/Solar System/Planets/Earth/Lagrange Points",
+    Hidden = true
+  }
+}
+
+
+asset.onInitialize(function()
+  openspace.addSceneGraphNode(L4Position)
+end)
+
+asset.onDeinitialize(function()
+  openspace.removeSceneGraphNode(L4Position)
+end)
+
+asset.export(L4Position)
diff --git a/data/assets/scene/solarsystem/planets/earth/lagrange_points/l5/kernels.asset b/data/assets/scene/solarsystem/planets/earth/lagrange_points/l5/kernels.asset
new file mode 100644
index 0000000000..359677a6c4
--- /dev/null
+++ b/data/assets/scene/solarsystem/planets/earth/lagrange_points/l5/kernels.asset
@@ -0,0 +1,22 @@
+local kernels = asset.resource({
+  Name = "Lagrange Kernels",
+  Type = "HttpSynchronization",
+  Identifier = "earth_lagrange_kernels",
+  Version = 1
+})
+
+
+local ID = {
+  L5 = 395
+}
+
+
+asset.onInitialize(function()
+  openspace.spice.loadKernel(kernels .. "L5_de431.bsp")
+end)
+
+asset.onDeinitialize(function()
+  openspace.spice.unloadKernel(kernels .. "L5_de431.bsp")
+end)
+
+asset.export("ID", ID)
diff --git a/data/assets/scene/solarsystem/planets/earth/lagrange_points/l5.asset b/data/assets/scene/solarsystem/planets/earth/lagrange_points/l5/l5.asset
similarity index 57%
rename from data/assets/scene/solarsystem/planets/earth/lagrange_points/l5.asset
rename to data/assets/scene/solarsystem/planets/earth/lagrange_points/l5/l5.asset
index ac2902a3f8..a7f71a277c 100644
--- a/data/assets/scene/solarsystem/planets/earth/lagrange_points/l5.asset
+++ b/data/assets/scene/solarsystem/planets/earth/lagrange_points/l5/l5.asset
@@ -1,5 +1,4 @@
-local transforms = asset.require("scene/solarsystem/sun/transforms")
-local coreKernels = asset.require("spice/core")
+local transforms = asset.require("./transforms")
 
 
 
@@ -10,41 +9,13 @@ local circle = asset.resource({
   Version = 1
 })
 
-local kernels = asset.resource({
-  Name = "Lagrange Kernels",
-  Type = "HttpSynchronization",
-  Identifier = "earth_lagrange_kernels",
-  Version = 1
-})
-
-
-local ID = {
-  L5 = 395
-}
-
-local L5Position = {
-  Identifier = "L5Position",
-  Parent = transforms.SolarSystemBarycenter.Identifier,
-  Transform = {
-    Translation = {
-      Type = "SpiceTranslation",
-      Target = ID.L5,
-      Observer = coreKernels.ID.SolarSystemBarycenter
-    }
-  },
-  Tag = { "lagrange_points_earth", "lagrange_points_earth_l5" },
-  GUI = {
-    Name = "L5 Position",
-    Path = "/Solar System/Planets/Earth/Lagrange Points",
-    Hidden = true
-  }
-}
 
 local L5 = {
   Identifier = "L5",
-  Parent = L5Position.Identifier,
+  Parent = transforms.L5Position.Identifier,
   Renderable = {
     Type = "RenderablePlaneImageLocal",
+    Enabled = asset.enabled,
     Billboard = true,
     Size = 800000000,
     Texture = circle .. "circle.png",
@@ -59,9 +30,10 @@ local L5 = {
 
 local L5Label = {
   Identifier = "L5Label",
-  Parent = L5Position.Identifier,
+  Parent = transforms.L5Position.Identifier,
   Renderable = {
     Type = "RenderableLabel",
+    Enabled = asset.enabled,
     Text = "L5",
     FontSize = 50,
     Size = 8.5,
@@ -80,9 +52,6 @@ local L5Label = {
 
 
 asset.onInitialize(function()
-  openspace.spice.loadKernel(kernels .. "L5_de431.bsp")
-
-  openspace.addSceneGraphNode(L5Position)
   openspace.addSceneGraphNode(L5)
   openspace.addSceneGraphNode(L5Label)
 end)
@@ -90,13 +59,9 @@ end)
 asset.onDeinitialize(function()
   openspace.removeSceneGraphNode(L5Label)
   openspace.removeSceneGraphNode(L5)
-  openspace.removeSceneGraphNode(L5Position)
 
-  openspace.spice.unloadKernel(kernels .. "L5_de431.bsp")
 end)
 
-asset.export("ID", ID)
-asset.export(L5Position)
 asset.export(L5)
 asset.export(L5Label)
 
diff --git a/data/assets/scene/solarsystem/planets/earth/lagrange_points/l5/transforms.asset b/data/assets/scene/solarsystem/planets/earth/lagrange_points/l5/transforms.asset
new file mode 100644
index 0000000000..fef44db03d
--- /dev/null
+++ b/data/assets/scene/solarsystem/planets/earth/lagrange_points/l5/transforms.asset
@@ -0,0 +1,34 @@
+local transforms = asset.require("scene/solarsystem/sun/transforms")
+local kernels = asset.require("./kernels")
+local coreKernels = asset.require("spice/core")
+
+
+
+local L5Position = {
+  Identifier = "L5Position",
+  Parent = transforms.SolarSystemBarycenter.Identifier,
+  Transform = {
+    Translation = {
+      Type = "SpiceTranslation",
+      Target = kernels.ID.L5,
+      Observer = coreKernels.ID.SolarSystemBarycenter
+    }
+  },
+  Tag = { "lagrange_points_earth", "lagrange_points_earth_l5" },
+  GUI = {
+    Name = "L5 Position",
+    Path = "/Solar System/Planets/Earth/Lagrange Points",
+    Hidden = true
+  }
+}
+
+
+asset.onInitialize(function()
+  openspace.addSceneGraphNode(L5Position)
+end)
+
+asset.onDeinitialize(function()
+  openspace.removeSceneGraphNode(L5Position)
+end)
+
+asset.export(L5Position)
diff --git a/data/assets/scene/solarsystem/planets/earth/lagrange_points/lagrange_points.asset b/data/assets/scene/solarsystem/planets/earth/lagrange_points/lagrange_points.asset
index 1d29b3d2f2..f4b46b7f6a 100644
--- a/data/assets/scene/solarsystem/planets/earth/lagrange_points/lagrange_points.asset
+++ b/data/assets/scene/solarsystem/planets/earth/lagrange_points/lagrange_points.asset
@@ -1,7 +1,7 @@
-asset.require("./l1")
-asset.require("./l2")
-asset.require("./l4")
-asset.require("./l5")
+asset.require("./l1/l1")
+asset.require("./l2/l2")
+asset.require("./l4/l4")
+asset.require("./l5/l5")
 
 
 
diff --git a/data/assets/scene/solarsystem/telescopes/euclid/trails.asset b/data/assets/scene/solarsystem/telescopes/euclid/trails.asset
index 5436746b4c..b91f91ad34 100644
--- a/data/assets/scene/solarsystem/telescopes/euclid/trails.asset
+++ b/data/assets/scene/solarsystem/telescopes/euclid/trails.asset
@@ -1,7 +1,7 @@
 local kernels = asset.require("./kernels")
 local earth = asset.require("scene/solarsystem/planets/earth/transforms")
 local solarsystem = asset.require("scene/solarsystem/sun/transforms")
-local transforms = asset.require("scene/solarsystem/planets/earth/lagrange_points/l2")
+local transforms = asset.require("scene/solarsystem/planets/earth/lagrange_points/l2/transforms")
 local coreKernels = asset.require("spice/core")
 
 
diff --git a/data/assets/scene/solarsystem/telescopes/jwst/fieldofview.asset b/data/assets/scene/solarsystem/telescopes/jwst/fieldofview.asset
new file mode 100644
index 0000000000..95d5117d3d
--- /dev/null
+++ b/data/assets/scene/solarsystem/telescopes/jwst/fieldofview.asset
@@ -0,0 +1,60 @@
+local transforms = asset.require("./transforms")
+local model = asset.require("./model")
+
+
+
+local JWSTFov = {
+  Identifier = "JWSTFov",
+  Parent = model.JWSTModel.Identifier,
+  TimeFrame = {
+    Type = "TimeFrameInterval",
+    Start = transforms.LaunchTime
+  },
+  Renderable = {
+    Type = "RenderablePrism",
+    Enabled = asset.enabled,
+    Segments = 6,
+    Lines = 3,
+    Radius = 3.25,
+    LineWidth = 1.0,
+    Color = { 1.0, 1.0, 1.0 },
+    Length = 9.2E15
+  },
+  Transform = {
+    Rotation = {
+      Type = "StaticRotation",
+      Rotation = { 0, 0, math.rad(30) }
+    }
+  },
+  Tag = { "mission_jwst_fov" },
+  GUI = {
+    Name = "JWST Field of View",
+    Path = "/Solar System/Telescopes/JWST",
+    Description = [[
+      The field of view for the James Webb Space Telescope at its current position.
+    ]]
+  }
+}
+
+
+asset.onInitialize(function()
+  openspace.addSceneGraphNode(JWSTFov)
+end)
+
+asset.onDeinitialize(function()
+  openspace.removeSceneGraphNode(JWSTFov)
+end)
+
+asset.export(JWSTFov)
+
+
+
+asset.meta = {
+  Name = "JWST Field of View",
+  Description = [[
+    The field of view for the James Webb Space Telescope at its current position.
+  ]],
+  Author = "OpenSpace Team",
+  URL = "http://openspaceproject.com",
+  License = "MIT license"
+}
diff --git a/data/assets/scene/solarsystem/telescopes/jwst/jwst.asset b/data/assets/scene/solarsystem/telescopes/jwst/jwst.asset
index ceaf3717e7..9d4f5cfb42 100644
--- a/data/assets/scene/solarsystem/telescopes/jwst/jwst.asset
+++ b/data/assets/scene/solarsystem/telescopes/jwst/jwst.asset
@@ -1,176 +1,31 @@
 asset.require("./actions")
+asset.require("./fieldofview")
+asset.require("./label")
 asset.require("./mission")
-local sunTransforms = asset.require("scene/solarsystem/sun/transforms")
-local transforms = asset.require("./transforms")
+asset.require("./model")
+asset.require("./viewingband")
 
+asset.require("scene/solarsystem/planets/earth/lagrange_points/l2/l2")
+asset.require("scene/solarsystem/planets/earth/lagrange_points/l2/l2sunline")
 
 
-local models = asset.resource({
-  Name = "JWST Model",
-  Type = "HttpSynchronization",
-  Identifier = "jwst_model",
-  Version = 3
-})
-
-local band = asset.resource({
-  Name = "JWST band texture",
-  Type = "HttpSynchronization",
-  Identifier = "jwst_band_texture",
-  Version = 1
-})
-
-
-local LaunchTime = "2021 DEC 25 12:20:00"
-
-local JWSTBand = {
-  Identifier = "JWSTBand",
-  Parent = transforms.JWSTPosition.Identifier,
-  TimeFrame = {
-    Type = "TimeFrameInterval",
-    Start = LaunchTime
-  },
-  Transform = {
-    Rotation = {
-      Type = "FixedRotation",
-      Attached = "JWSTBand",
-      XAxis = { 1.0, 0.0, 0.0 },
-      XAxisOrthogonal = true,
-      ZAxis = sunTransforms.SolarSystemBarycenter.Identifier
-    }
-  },
-  Renderable = {
-    Type = "RenderableSphereImageLocal",
-    Texture = band .. "JWST-band.png",
-    Size = 9.2E15,
-    Segments = 50,
-    DisableFadeInOut = true,
-    Orientation = "Inside",
-    Opacity = 0.05
-  },
-  Tag = { "mission_jwst_fov" },
-  GUI = {
-    Name = "JWST Safe Viewing Band",
-    Path = "/Solar System/Telescopes/JWST",
-    Description = [[
-      The safe viewing band for the James Webb Space Telescope at its current position
-    ]]
-  }
-}
-
-local JWSTModel = {
-  Identifier = "JWSTModel",
-  Parent = transforms.JWSTRotation.Identifier,
-  TimeFrame = {
-    Type = "TimeFrameInterval",
-    Start = LaunchTime
-  },
-  Renderable = {
-    Type = "RenderableModel",
-    GeometryFile = models .. "jwst_anim74_2fps_2018_nb.osmodel",
-    ModelScale = 0.0328, -- First scale down with centimeters then scale up with feet
-    EnableAnimation = true,
-    AnimationStartTime = "2021 12 25 12:20:00",
-    AnimationTimeScale = "Millisecond",
-    AnimationMode = "Once",
-    LightSources = {
-      sunTransforms.LightSource
-    },
-    PerformShading = true
-  },
-  GUI = {
-    Name = "James Webb Space Telescope Model",
-    Path = "/Solar System/Telescopes/JWST",
-    Description = [[
-      Animated model of the James Webb Space Telescope that shows its deployment in
-      real time
-    ]]
-  }
-}
-
-local JWSTFov = {
-  Identifier = "JWSTFov",
-  Parent = JWSTModel.Identifier,
-  TimeFrame = {
-    Type = "TimeFrameInterval",
-    Start = LaunchTime
-  },
-  Renderable = {
-    Type = "RenderablePrism",
-    Segments = 6,
-    Lines = 3,
-    Radius = 3.25,
-    LineWidth = 1.0,
-    Color = { 1.0, 1.0, 1.0 },
-    Length = 9.2E15
-  },
-  Transform = {
-    Rotation = {
-      Type = "StaticRotation",
-      Rotation = { 0, 0, math.rad(30) }
-    }
-  },
-  Tag = { "mission_jwst_fov" },
-  GUI = {
-    Name = "JWST Field of View",
-    Path = "/Solar System/Telescopes/JWST",
-    Description = [[
-      The field of view for the James Webb Space Telescope at its current position
-    ]]
-  }
-}
-
-local JWSTLabel = {
-  Identifier = "JWSTLabel",
-  Parent = transforms.JWSTPosition.Identifier,
-  TimeFrame = {
-    Type = "TimeFrameInterval",
-    Start = LaunchTime
-  },
-  Renderable = {
-    Type = "RenderableLabel",
-    Text = "JWST",
-    FontSize = 50,
-    Size = 6.5,
-    MinMaxSize = { 4.0, 30.0 },
-    OrientationOption = "Camera View Direction",
-    BlendMode = "Normal",
-    EnableFading = false
-  },
-  GUI = {
-    Name = "JWST Label",
-    Path = "/Solar System/Telescopes/JWST",
-    Description = "Main label for the James Webb Space Telescope"
-  }
-}
-
 
 asset.onInitialize(function()
-  openspace.addSceneGraphNode(JWSTBand)
-  openspace.addSceneGraphNode(JWSTModel)
-  openspace.addSceneGraphNode(JWSTFov)
-  openspace.addSceneGraphNode(JWSTLabel)
 end)
 
 asset.onDeinitialize(function()
-  openspace.removeSceneGraphNode(JWSTLabel)
-  openspace.removeSceneGraphNode(JWSTFov)
-  openspace.removeSceneGraphNode(JWSTModel)
-  openspace.removeSceneGraphNode(JWSTBand)
-
   openspace.scriptScheduler.clear(2)
 end)
 
-asset.export(JWSTBand)
-asset.export(JWSTModel)
-asset.export(JWSTFov)
-asset.export(JWSTLabel)
-
 
 
 asset.meta = {
   Name = "James Webb Space Telescope",
   Description = [[
-    James Webb Space Telescope animated model, safe viewing band, field of view and label.
+    This assets adds the content for the James Webb Space Telescope mission, including
+    the animated model, safe viewing band, field of view, label, mission file, and actions.
+    It also includes visuals about the Lagrange point L2, and a line between L2 and the
+    Sun.
   ]],
   Author = "OpenSpace Team",
   URL = "http://openspaceproject.com",
diff --git a/data/assets/scene/solarsystem/telescopes/jwst/label.asset b/data/assets/scene/solarsystem/telescopes/jwst/label.asset
new file mode 100644
index 0000000000..21fe46a65c
--- /dev/null
+++ b/data/assets/scene/solarsystem/telescopes/jwst/label.asset
@@ -0,0 +1,49 @@
+local transforms = asset.require("./transforms")
+
+
+
+local JWSTLabel = {
+  Identifier = "JWSTLabel",
+  Parent = transforms.JWSTPosition.Identifier,
+  TimeFrame = {
+    Type = "TimeFrameInterval",
+    Start = transforms.LaunchTime
+  },
+  Renderable = {
+    Type = "RenderableLabel",
+    Enabled = asset.enabled,
+    Text = "JWST",
+    FontSize = 50,
+    Size = 6.5,
+    MinMaxSize = { 4.0, 30.0 },
+    OrientationOption = "Camera View Direction",
+    BlendMode = "Normal",
+    EnableFading = false
+  },
+  GUI = {
+    Name = "JWST Label",
+    Path = "/Solar System/Telescopes/JWST",
+    Description = "Main label for the James Webb Space Telescope."
+  }
+}
+
+
+asset.onInitialize(function()
+  openspace.addSceneGraphNode(JWSTLabel)
+end)
+
+asset.onDeinitialize(function()
+  openspace.removeSceneGraphNode(JWSTLabel)
+end)
+
+asset.export(JWSTLabel)
+
+
+
+asset.meta = {
+  Name = "JWST Label",
+  Description = "Main label for the James Webb Space Telescope",
+  Author = "OpenSpace Team",
+  URL = "http://openspaceproject.com",
+  License = "MIT license"
+}
diff --git a/data/assets/scene/solarsystem/telescopes/jwst/mission.asset b/data/assets/scene/solarsystem/telescopes/jwst/mission.asset
index f04eba7452..e1ede5a9ce 100644
--- a/data/assets/scene/solarsystem/telescopes/jwst/mission.asset
+++ b/data/assets/scene/solarsystem/telescopes/jwst/mission.asset
@@ -1,9 +1,3 @@
---voyager/mission.asset
-
--- Source:  http://pluto.jhuapl.edu/Mission/index.php
--- Many of the values (especially days of the month if 01 or 30 or 31  and  hh::mm::ss if all 0)
--- are approximate and need fixing
-
 local Mission = {
   Identifier = "JWST",
   Name = "James Webb Space Telescope",
diff --git a/data/assets/scene/solarsystem/telescopes/jwst/model.asset b/data/assets/scene/solarsystem/telescopes/jwst/model.asset
new file mode 100644
index 0000000000..016d56a019
--- /dev/null
+++ b/data/assets/scene/solarsystem/telescopes/jwst/model.asset
@@ -0,0 +1,64 @@
+local sunTransforms = asset.require("scene/solarsystem/sun/transforms")
+local transforms = asset.require("./transforms")
+
+
+
+local models = asset.resource({
+  Name = "JWST Model",
+  Type = "HttpSynchronization",
+  Identifier = "jwst_model",
+  Version = 3
+})
+
+
+local JWSTModel = {
+  Identifier = "JWSTModel",
+  Parent = transforms.JWSTRotation.Identifier,
+  TimeFrame = {
+    Type = "TimeFrameInterval",
+    Start = transforms.LaunchTime
+  },
+  Renderable = {
+    Type = "RenderableModel",
+    Enabled = asset.enabled,
+    GeometryFile = models .. "jwst_anim74_2fps_2018_nb.osmodel",
+    ModelScale = 0.0328, -- First scale down with centimeters then scale up with feet
+    EnableAnimation = true,
+    AnimationStartTime = "2021 12 25 12:20:00",
+    AnimationTimeScale = "Millisecond",
+    AnimationMode = "Once",
+    LightSources = {
+      sunTransforms.LightSource
+    },
+    PerformShading = true
+  },
+  GUI = {
+    Name = "James Webb Space Telescope Model",
+    Path = "/Solar System/Telescopes/JWST",
+    Description = [[
+      Animated model of the James Webb Space Telescope that shows its deployment in
+      real time.
+    ]]
+  }
+}
+
+
+asset.onInitialize(function()
+  openspace.addSceneGraphNode(JWSTModel)
+end)
+
+asset.onDeinitialize(function()
+  openspace.removeSceneGraphNode(JWSTModel)
+end)
+
+asset.export(JWSTModel)
+
+
+
+asset.meta = {
+  Name = "James Webb Space Telescope Model",
+  Description = [[James Webb Space Telescope animated model.]],
+  Author = "OpenSpace Team",
+  URL = "http://openspaceproject.com",
+  License = "MIT license"
+}
diff --git a/data/assets/scene/solarsystem/telescopes/jwst/trail.asset b/data/assets/scene/solarsystem/telescopes/jwst/trail.asset
index eccc987873..928564a9e1 100644
--- a/data/assets/scene/solarsystem/telescopes/jwst/trail.asset
+++ b/data/assets/scene/solarsystem/telescopes/jwst/trail.asset
@@ -1,14 +1,13 @@
-local transforms = asset.require("scene/solarsystem/planets/earth/lagrange_points/l2")
+local L2transforms = asset.require("scene/solarsystem/planets/earth/lagrange_points/l2/transforms")
+local L2kernels = asset.require("scene/solarsystem/planets/earth/lagrange_points/l2/kernels")
 local earthTransforms = asset.require("scene/solarsystem/planets/earth/transforms")
 local sunTransforms = asset.require("scene/solarsystem/sun/transforms")
 local kernels = asset.require("./kernels")
+local transforms = asset.require("./transforms")
 local coreKernels = asset.require("spice/core")
 
 
 
-local LaunchTime = "2021 DEC 25 12:20:00"
-local DetachTime = "2021 DEC 25 12:50:00"
-local L2orbitInsertionTime = "2022 JAN 25 00:00:00"
 local EndTime = "2024 JAN 22 00:00:00"
 
 -- Trail of JWST relative the Earth Inertial for the first 30 minutes after launch
@@ -18,8 +17,8 @@ local JWSTTrailLaunch = {
   Parent = earthTransforms.EarthIAU.Identifier,
   TimeFrame = {
     Type = "TimeFrameInterval",
-    Start = LaunchTime,
-    End = DetachTime
+    Start = transforms.LaunchTime,
+    End = transforms.DetachTime
   },
   Renderable = {
     Type = "RenderableTrailTrajectory",
@@ -30,8 +29,8 @@ local JWSTTrailLaunch = {
       Frame = coreKernels.Frame.Earth
     },
     Color = { 0.9, 0.9, 0.0 },
-    StartTime = LaunchTime,
-    EndTime = DetachTime,
+    StartTime = transforms.LaunchTime,
+    EndTime = transforms.DetachTime,
     SampleInterval = 60 -- Sample rate of once per minute
   },
   GUI = {
@@ -48,8 +47,8 @@ local JWSTTrailCruise = {
   Parent = earthTransforms.EarthCenter.Identifier,
   TimeFrame = {
     Type = "TimeFrameInterval",
-    Start = DetachTime,
-    End = L2orbitInsertionTime
+    Start = transforms.DetachTime,
+    End = transforms.L2orbitInsertionTime
   },
   Renderable = {
     Type = "RenderableTrailTrajectory",
@@ -60,8 +59,8 @@ local JWSTTrailCruise = {
       Frame = coreKernels.Frame.Galactic
     },
     Color = { 0.9, 0.9, 0.0 },
-    StartTime = DetachTime,
-    EndTime = L2orbitInsertionTime,
+    StartTime = transforms.DetachTime,
+    EndTime = transforms.L2orbitInsertionTime,
     SampleInterval = 60 -- Sample rate of once per minute
   },
   GUI = {
@@ -76,18 +75,19 @@ local JWSTTrailCruise = {
 -- This does NOT co-rotate with L2 and gives a saddle look of the trail
 local JWSTTrailOrbit = {
   Identifier = "JWSTTrailOrbit",
-  Parent = transforms.L2Position.Identifier,
+  Parent = L2transforms.L2Position.Identifier,
   TimeFrame = {
     Type = "TimeFrameInterval",
-    Start = L2orbitInsertionTime,
+    Start = transforms.L2orbitInsertionTime,
     End = EndTime
   },
   Renderable = {
     Type = "RenderableTrailOrbit",
+    Enabled = asset.enabled,
     Translation = {
       Type = "SpiceTranslation",
       Target = kernels.ID.JWST,
-      Observer = transforms.ID.L2,
+      Observer = L2kernels.ID.L2,
       Frame = coreKernels.Frame.Galactic
     },
     Color = { 0.863, 0.0, 0.902 },
@@ -105,18 +105,19 @@ local JWSTTrailOrbit = {
 -- This gives the trail a look of a wheel going along L2 around the Sun
 local JWSTTrailCoRevOrbit = {
   Identifier = "JWSTTrailCoRevOrbit",
-  Parent = transforms.L2CoRevFrame.Identifier,
+  Parent = L2transforms.L2CoRevFrame.Identifier,
   TimeFrame = {
     Type = "TimeFrameInterval",
-    Start = L2orbitInsertionTime,
+    Start = transforms.L2orbitInsertionTime,
     End = EndTime
   },
   Renderable = {
     Type = "RenderableTrailOrbit",
+    Enabled = asset.enabled,
     Translation = {
       Type = "SpiceTranslation",
       Target = kernels.ID.JWST,
-      Observer = transforms.ID.L2,
+      Observer = L2kernels.ID.L2,
       Frame = "L2_COREV"
     },
     Color = { 1.0, 0.663, 0.157 },
@@ -135,11 +136,12 @@ local JWSTSunTrail = {
   Parent = sunTransforms.SolarSystemBarycenter.Identifier,
   TimeFrame = {
     Type = "TimeFrameInterval",
-    Start = L2orbitInsertionTime,
+    Start = transforms.L2orbitInsertionTime,
     End = EndTime
   },
   Renderable = {
     Type = "RenderableTrailOrbit",
+    Enabled = asset.enabled,
     Translation = {
       Type = "SpiceTranslation",
       Target = kernels.ID.JWST,
diff --git a/data/assets/scene/solarsystem/telescopes/jwst/transforms.asset b/data/assets/scene/solarsystem/telescopes/jwst/transforms.asset
index 9baa639981..56fa1265b7 100644
--- a/data/assets/scene/solarsystem/telescopes/jwst/transforms.asset
+++ b/data/assets/scene/solarsystem/telescopes/jwst/transforms.asset
@@ -1,6 +1,7 @@
 local earthTransforms = asset.require("scene/solarsystem/planets/earth/transforms")
 local sunTransforms = asset.require("scene/solarsystem/sun/transforms")
-local l2 = asset.require("scene/solarsystem/planets/earth/lagrange_points/l2")
+local l2kernels = asset.require("scene/solarsystem/planets/earth/lagrange_points/l2/kernels")
+local l2transforms = asset.require("scene/solarsystem/planets/earth/lagrange_points/l2/transforms")
 local kernels = asset.require("./kernels")
 local coreKernels = asset.require("spice/core")
 
@@ -33,7 +34,7 @@ local JWSTPosition = {
         [L2orbitInsertionTime] = {
           Type = "SpiceTranslation",
           Target = kernels.ID.JWST,
-          Observer = l2.ID.L2,
+          Observer = l2kernels.ID.L2,
           Frame = coreKernels.Frame.Galactic
         }
       }
@@ -75,15 +76,15 @@ asset.onInitialize(function()
   -- Set correct parent during run-time
   openspace.scriptScheduler.loadScheduledScript(
     DetachTime,
-    [[openspace.setParent("JWSTPosition", "EarthCenter")]],
-    [[openspace.setParent("JWSTPosition", "EarthIAU")]],
+    [[openspace.setParent("JWSTPosition", "]] .. earthTransforms.EarthCenter.Identifier .. [[")]],
+    [[openspace.setParent("JWSTPosition", "]] .. earthTransforms.EarthIAU.Identifier .. [[")]],
     "",
     1 -- Not default group, never clear this script
   )
   openspace.scriptScheduler.loadScheduledScript(
     L2orbitInsertionTime,
-    [[openspace.setParent("JWSTPosition", "L2")]],
-    [[openspace.setParent("JWSTPosition", "EarthCenter")]],
+    [[openspace.setParent("JWSTPosition", "]] .. l2transforms.L2Position.Identifier .. [[")]],
+    [[openspace.setParent("JWSTPosition", "]] .. earthTransforms.EarthCenter.Identifier .. [[")]],
     "",
     1 -- Not default group, never clear this script
   )
@@ -91,11 +92,11 @@ asset.onInitialize(function()
   -- Set correct parent at the start
   local now = openspace.time.currentTime()
   if now < openspace.time.convertTime(DetachTime) then
-    openspace.setParent("JWSTPosition", "EarthIAU")
+    openspace.setParent("JWSTPosition", earthTransforms.EarthIAU.Identifier)
   elseif now > openspace.time.convertTime(L2orbitInsertionTime) then
-    openspace.setParent("JWSTPosition", "L2")
+    openspace.setParent("JWSTPosition", l2transforms.L2Position.Identifier)
   else
-    openspace.setParent("JWSTPosition", "EarthCenter")
+    openspace.setParent("JWSTPosition", earthTransforms.EarthCenter.Identifier)
   end
 end)
 
@@ -105,6 +106,9 @@ asset.onDeinitialize(function()
   openspace.scriptScheduler.clear(1)
 end)
 
+asset.export("LaunchTime", LaunchTime)
+asset.export("DetachTime", DetachTime)
+asset.export("L2orbitInsertionTime", L2orbitInsertionTime)
 asset.export(JWSTPosition)
 asset.export(JWSTRotation)
 
diff --git a/data/assets/scene/solarsystem/telescopes/jwst/viewingband.asset b/data/assets/scene/solarsystem/telescopes/jwst/viewingband.asset
new file mode 100644
index 0000000000..9177158b10
--- /dev/null
+++ b/data/assets/scene/solarsystem/telescopes/jwst/viewingband.asset
@@ -0,0 +1,70 @@
+local sunTransforms = asset.require("scene/solarsystem/sun/transforms")
+local transforms = asset.require("./transforms")
+
+
+
+local band = asset.resource({
+  Name = "JWST band texture",
+  Type = "HttpSynchronization",
+  Identifier = "jwst_band_texture",
+  Version = 1
+})
+
+
+local JWSTBand = {
+  Identifier = "JWSTBand",
+  Parent = transforms.JWSTPosition.Identifier,
+  TimeFrame = {
+    Type = "TimeFrameInterval",
+    Start = transforms.LaunchTime
+  },
+  Transform = {
+    Rotation = {
+      Type = "FixedRotation",
+      Attached = "JWSTBand",
+      XAxis = { 1.0, 0.0, 0.0 },
+      XAxisOrthogonal = true,
+      ZAxis = sunTransforms.SolarSystemBarycenter.Identifier
+    }
+  },
+  Renderable = {
+    Type = "RenderableSphereImageLocal",
+    Enabled = asset.enabled,
+    Texture = band .. "JWST-band.png",
+    Size = 9.2E15,
+    Segments = 50,
+    DisableFadeInOut = true,
+    Orientation = "Inside",
+    Opacity = 0.05
+  },
+  Tag = { "mission_jwst_fov" },
+  GUI = {
+    Name = "JWST Safe Viewing Band",
+    Path = "/Solar System/Telescopes/JWST",
+    Description = [[
+      The safe viewing band for the James Webb Space Telescope at its current position.
+    ]]
+  }
+}
+
+
+asset.onInitialize(function()
+  openspace.addSceneGraphNode(JWSTBand)
+end)
+
+asset.onDeinitialize(function()
+  openspace.removeSceneGraphNode(JWSTBand)
+end)
+
+asset.export(JWSTBand)
+
+
+asset.meta = {
+  Name = "JWST Safe Viewing Band",
+  Description = [[
+    The safe viewing band for the James Webb Space Telescope at its current position.
+  ]],
+  Author = "OpenSpace Team",
+  URL = "http://openspaceproject.com",
+  License = "MIT license"
+}

From c00e8e40baa8d8bfbe79926e584950927a2b040f Mon Sep 17 00:00:00 2001
From: Andreas Engberg <adde.engberg@gmail.com>
Date: Mon, 4 Nov 2024 15:15:41 +0100
Subject: [PATCH 656/701] Set `B.C.` to start of time string if year < 1000 B.C

This is to make it faster to check for B.C years on the frontend so we can properly show years < 0
---
 include/openspace/util/spicemanager.h | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)

diff --git a/include/openspace/util/spicemanager.h b/include/openspace/util/spicemanager.h
index 52b1369d5f..88734cc939 100644
--- a/include/openspace/util/spicemanager.h
+++ b/include/openspace/util/spicemanager.h
@@ -25,6 +25,8 @@
 #ifndef __OPENSPACE_CORE___SPICEMANAGER___H__
 #define __OPENSPACE_CORE___SPICEMANAGER___H__
 
+#include <openspace/engine/globals.h>
+#include <openspace/util/memorymanager.h>
 #include <ghoul/format.h>
 #include <ghoul/glm.h>
 #include <ghoul/misc/assert.h>
@@ -589,6 +591,23 @@ public:
             // The conversion failed and we need to use et2utc
             constexpr int SecondsPrecision = 3;
             et2utc_c(ephemerisTime, "C", SecondsPrecision, bufferSize, outBuf);
+            // We want to move the B.C. part to the beginning of the string so that we can
+            // identify B.C. years by inspecting the first character of `outBuf`
+            const char* bcPos = std::strstr(outBuf, "B.C.");
+            if (bcPos) {
+                const size_t bcLength = 4;
+                const size_t prefixYearLength = bcPos - outBuf;
+                // Create temporary storage
+                char* tmp = reinterpret_cast<char*>(
+                    global::memoryManager->TemporaryMemory.allocate(prefixYearLength)
+                );
+                // Copy year into tmp buffer
+                std::memcpy(tmp, outBuf, prefixYearLength);
+                // Copy B.C. to beginning of outBuf, + 1 to add a space ' ' after B.C.
+                std::memcpy(outBuf, "B.C. ", bcLength + 1);
+                // Copy year to after B.C
+                std::memcpy(outBuf + bcLength + 1 , tmp, prefixYearLength);
+            }
         }
     }
 

From 86b4733eeb9cf65316576f9787ec26135a240207 Mon Sep 17 00:00:00 2001
From: Alexander Bock <mail@alexanderbock.eu>
Date: Tue, 5 Nov 2024 22:19:55 +0100
Subject: [PATCH 657/701] Reuse the same generated configuration file (closes
 #3449)

---
 scripts/configuration_helper.lua | 14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)

diff --git a/scripts/configuration_helper.lua b/scripts/configuration_helper.lua
index 85bc348f70..3ab2f6e18f 100644
--- a/scripts/configuration_helper.lua
+++ b/scripts/configuration_helper.lua
@@ -359,7 +359,19 @@ end
 
 
 function sgct.makeConfig(config)
-  local configFile = os.tmpname() .. ".json"
+  --
+  -- Create a file in the operating system's `temp` folder
+  --
+
+  -- tmpname returns the name to a randomly chosen file within the `temp` folder
+  local tempFile = os.tmpname()
+  -- `package.config` contains the path separator used on the current platform
+  local directorySeparator = package.config:match("([^\n]*)\n?")
+  -- Remove the filename and only get the path to the temp folder
+  local separatorIdx = tempFile:reverse():find(directorySeparator)
+  local tempFolder = tempFile:sub(1, #tempFile - separatorIdx + 1)
+
+  local configFile = tempFolder .. "openspace-window-configuration.json"
   local file = io.open(configFile, "w+")
   file:write(config)
   io.close(file)

From f4fe8bd38ae7c66c0bcf76ba9342053beced9bb1 Mon Sep 17 00:00:00 2001
From: Alexander Bock <alexander.bock@liu.se>
Date: Wed, 6 Nov 2024 09:40:15 +0100
Subject: [PATCH 658/701] Update SGCT repository

  - Add the ability to prevent windows from partaking in screenshots
  - Fix issue when recomputing field-of-views for viewports that are rotated
---
 apps/OpenSpace/ext/sgct | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/apps/OpenSpace/ext/sgct b/apps/OpenSpace/ext/sgct
index 93dfc1caba..cc42a0c744 160000
--- a/apps/OpenSpace/ext/sgct
+++ b/apps/OpenSpace/ext/sgct
@@ -1 +1 @@
-Subproject commit 93dfc1caba38d300bcc438a3d8a1a4c808b12aef
+Subproject commit cc42a0c7443a7ca431c0ae558d547b6be93ad453

From 84ad4cf373ea70f1bd6235555174a20c032f5a8a Mon Sep 17 00:00:00 2001
From: Andreas Engberg <adde.engberg@gmail.com>
Date: Thu, 7 Nov 2024 10:16:18 +0100
Subject: [PATCH 659/701] Make sure we search the the actual file name and not
 entire path

Caused an issue where it would not "find" the metadata if there was any '.' in any part of the path e.g., `OpenSpace-0.20.1/..`
---
 modules/space/rendering/renderablefluxnodes.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/space/rendering/renderablefluxnodes.cpp b/modules/space/rendering/renderablefluxnodes.cpp
index 17898a963c..167397084d 100644
--- a/modules/space/rendering/renderablefluxnodes.cpp
+++ b/modules/space/rendering/renderablefluxnodes.cpp
@@ -593,7 +593,7 @@ void RenderableFluxNodes::populateStartTimes() {
             break;
         }
 
-        const std::string f = filePath.string();
+        const std::string f = filePath.filename().string();
         // if no file extention but word "time" in file name
         if (f.find("time") != std::string::npos && f.find('.') == std::string::npos) {
             timeFile = filePath;

From 6ffaee0b45cdc427c4e5138b4ad4664f6a68291d Mon Sep 17 00:00:00 2001
From: Ylva Selling <ylva.selling@gmail.com>
Date: Fri, 15 Nov 2024 16:39:32 +0100
Subject: [PATCH 660/701] Make uri validation work again

---
 src/properties/propertyowner.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/properties/propertyowner.cpp b/src/properties/propertyowner.cpp
index 0ee6dd5df7..cae9dca8a4 100644
--- a/src/properties/propertyowner.cpp
+++ b/src/properties/propertyowner.cpp
@@ -167,7 +167,7 @@ std::string PropertyOwner::uri() const {
         currentOwner = currentOwner->owner();
     }
     // If the uri hasn't been sent at this point it is not valid, so send an empty string
-    return identifier;
+    return "";
 }
 
 bool PropertyOwner::hasProperty(const std::string& uri) const {

From 4bc33368f6aeac353d136f2464a56fd9b58690b7 Mon Sep 17 00:00:00 2001
From: Ylva Selling <ylva.selling@gmail.com>
Date: Fri, 15 Nov 2024 16:56:55 +0100
Subject: [PATCH 661/701] Make property uri validation work again

---
 src/properties/property.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/properties/property.cpp b/src/properties/property.cpp
index 8a79e9bbd2..2336624358 100644
--- a/src/properties/property.cpp
+++ b/src/properties/property.cpp
@@ -78,7 +78,7 @@ const std::string& Property::identifier() const {
 
 std::string Property::uri() const {
     const std::string& ownerUri = owner()->uri();
-    return !ownerUri.empty() ? std::format("{}.{}", ownerUri, _identifier) : _identifier;
+    return !ownerUri.empty() ? std::format("{}.{}", ownerUri, _identifier) : "";
 }
 
 std::any Property::get() const {

From cd1a32a77163f072cb49c42a9d1daab03b81ed15 Mon Sep 17 00:00:00 2001
From: Brian Abbott <80659386+brianpatrick@users.noreply.github.com>
Date: Fri, 22 Nov 2024 06:30:45 -0500
Subject: [PATCH 662/701] Change the tint of the SunGlare to be more yellow
 (#3459)

---
 data/assets/scene/solarsystem/sun/glare.asset | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/data/assets/scene/solarsystem/sun/glare.asset b/data/assets/scene/solarsystem/sun/glare.asset
index 98013f63bc..14223d174e 100644
--- a/data/assets/scene/solarsystem/sun/glare.asset
+++ b/data/assets/scene/solarsystem/sun/glare.asset
@@ -20,7 +20,8 @@ local SunGlare = {
     Billboard = true,
     Texture = textures .. "halo.png",
     BlendMode = "Additive",
-    Opacity = 0.65
+    Opacity = 0.65,
+    MultiplyColor = { 0.92, 0.93, 0.84 }
   },
   GUI = {
     Name = "Sun Glare",

From f1bfaadc35e46d1f48db9cf454fb61bdde4b325f Mon Sep 17 00:00:00 2001
From: Alexander Bock <alexander.bock@liu.se>
Date: Mon, 25 Nov 2024 13:00:26 +0100
Subject: [PATCH 663/701] Update SGCT submodule

  - Add support for ScalableSDK
---
 apps/OpenSpace/ext/sgct | 2 +-
 apps/OpenSpace/main.cpp | 7 +++----
 2 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/apps/OpenSpace/ext/sgct b/apps/OpenSpace/ext/sgct
index cc42a0c744..f6f997c588 160000
--- a/apps/OpenSpace/ext/sgct
+++ b/apps/OpenSpace/ext/sgct
@@ -1 +1 @@
-Subproject commit cc42a0c7443a7ca431c0ae558d547b6be93ad453
+Subproject commit f6f997c588c9731794120a6b08f982385a97860a
diff --git a/apps/OpenSpace/main.cpp b/apps/OpenSpace/main.cpp
index 5649270502..5d991703e7 100644
--- a/apps/OpenSpace/main.cpp
+++ b/apps/OpenSpace/main.cpp
@@ -50,7 +50,6 @@
 #include <sgct/log.h>
 #include <sgct/projection/fisheye.h>
 #include <sgct/projection/nonlinearprojection.h>
-#include <sgct/settings.h>
 #include <sgct/user.h>
 #include <sgct/window.h>
 #include <stb_image.h>
@@ -298,7 +297,7 @@ void mainInitFunc(GLFWwindow*) {
     // We save the startup value of the screenshots just in case we want to add a date
     // to them later in the RenderEngine
     std::filesystem::path screenshotPath = absPath("${SCREENSHOTS}");
-    sgct::Settings::instance().setCapturePath(screenshotPath);
+    sgct::Engine::instance().setCapturePath(screenshotPath);
     FileSys.registerPathToken("${STARTUP_SCREENSHOT}", std::move(screenshotPath));
 
     LDEBUG("Initializing OpenSpace Engine started");
@@ -891,7 +890,7 @@ void setSgctDelegateFunctions() {
     sgctDelegate.takeScreenshot = [](bool applyWarping, std::vector<int> windowIds) {
         ZoneScoped;
 
-        sgct::Settings::instance().setCaptureFromBackBuffer(applyWarping);
+        sgct::Engine::instance().setCaptureFromBackBuffer(applyWarping);
         Engine::instance().takeScreenshot(std::move(windowIds));
         return Engine::instance().screenShotNumber();
     };
@@ -967,7 +966,7 @@ void setSgctDelegateFunctions() {
         return sgct::Window::swapGroupFrameNumber();
     };
     sgctDelegate.setScreenshotFolder = [](std::filesystem::path path) {
-        sgct::Settings::instance().setCapturePath(std::move(path));
+        sgct::Engine::instance().setCapturePath(std::move(path));
     };
     sgctDelegate.showStatistics = [](bool enabled) {
         Engine::instance().setStatsGraphVisibility(enabled);

From 98c0787266db8c6317765709c6bb7c39860c6b2f Mon Sep 17 00:00:00 2001
From: Emma Broman <emma.broman@liu.se>
Date: Tue, 3 Dec 2024 08:26:26 +0100
Subject: [PATCH 664/701] Make `openspace.fadeOut` also disable the object at
 end of fade

Needed when we now start using this function in the UI
---
 scripts/core_scripts.lua | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/scripts/core_scripts.lua b/scripts/core_scripts.lua
index f17ee63820..a19e5e7e16 100644
--- a/scripts/core_scripts.lua
+++ b/scripts/core_scripts.lua
@@ -317,8 +317,15 @@ openspace.fadeOut = function(identifier, fadeTime, endScript)
 
   -- If node is already disabled we don't have to do anything
   if isEnabled then
-    openspace.setPropertyValue(fadeProperty, 0.0, fadeTime, "Linear", endScript)
-    end
+    local disableScript = "openspace.setPropertyValue('" .. enabledProperty .. "', false)"
+    openspace.setPropertyValue(
+      fadeProperty,
+      0.0,
+      fadeTime,
+      "Linear",
+      disableScript .. endScript
+    )
+  end
 end
 
 openspace.toggleFade = function(renderable, fadeTime, endScript)

From 27e46d8cf5fd91fd6974ebfa2770f208716b5d0e Mon Sep 17 00:00:00 2001
From: Andreas Engberg <adde.engberg@gmail.com>
Date: Wed, 4 Dec 2024 13:41:28 +0100
Subject: [PATCH 665/701] add openspace lua table to lua transforms

---
 modules/base/rotation/luarotation.cpp       | 3 +++
 modules/base/scale/luascale.cpp             | 3 +++
 modules/base/translation/luatranslation.cpp | 3 +++
 3 files changed, 9 insertions(+)

diff --git a/modules/base/rotation/luarotation.cpp b/modules/base/rotation/luarotation.cpp
index c33215f63a..198933b183 100644
--- a/modules/base/rotation/luarotation.cpp
+++ b/modules/base/rotation/luarotation.cpp
@@ -26,6 +26,8 @@
 
 #include <openspace/documentation/documentation.h>
 #include <openspace/documentation/verifier.h>
+#include <openspace/engine/globals.h>
+#include <openspace/scripting/scriptengine.h>
 #include <openspace/util/updatestructures.h>
 #include <ghoul/filesystem/file.h>
 #include <ghoul/filesystem/filesystem.h>
@@ -74,6 +76,7 @@ LuaRotation::LuaRotation(const ghoul::Dictionary& dictionary)
     });
 
     addProperty(_luaScriptFile);
+    global::scriptEngine->initializeLuaState(_state);
 
     _luaScriptFile = p.script.string();
 }
diff --git a/modules/base/scale/luascale.cpp b/modules/base/scale/luascale.cpp
index 7058eca845..89c2f60426 100644
--- a/modules/base/scale/luascale.cpp
+++ b/modules/base/scale/luascale.cpp
@@ -26,6 +26,8 @@
 
 #include <openspace/documentation/documentation.h>
 #include <openspace/documentation/verifier.h>
+#include <openspace/engine/globals.h>
+#include <openspace/scripting/scriptengine.h>
 #include <openspace/util/updatestructures.h>
 #include <ghoul/filesystem/file.h>
 #include <ghoul/filesystem/filesystem.h>
@@ -72,6 +74,7 @@ LuaScale::LuaScale(const ghoul::Dictionary& dictionary)
         _fileHandle->setCallback([this]() { requireUpdate(); });
     });
     addProperty(_luaScriptFile);
+    global::scriptEngine->initializeLuaState(_state);
 
     _luaScriptFile = p.script.string();
 }
diff --git a/modules/base/translation/luatranslation.cpp b/modules/base/translation/luatranslation.cpp
index 603205bf1e..a4f0ab2bca 100644
--- a/modules/base/translation/luatranslation.cpp
+++ b/modules/base/translation/luatranslation.cpp
@@ -26,6 +26,8 @@
 
 #include <openspace/documentation/documentation.h>
 #include <openspace/documentation/verifier.h>
+#include <openspace/engine/globals.h>
+#include <openspace/scripting/scriptengine.h>
 #include <openspace/util/updatestructures.h>
 #include <ghoul/filesystem/file.h>
 #include <ghoul/filesystem/filesystem.h>
@@ -76,6 +78,7 @@ LuaTranslation::LuaTranslation(const ghoul::Dictionary& dictionary)
         });
     });
     addProperty(_luaScriptFile);
+    global::scriptEngine->initializeLuaState(_state);
 
     _luaScriptFile = p.script.string();
 }

From 2856085724ff53ed363a743fcc7708f6216dbd28 Mon Sep 17 00:00:00 2001
From: Emma Broman <emma.broman@liu.se>
Date: Mon, 9 Dec 2024 17:08:06 +0100
Subject: [PATCH 666/701] Use a pointing hand GLFW cursor for the web grab
 cursor (#3465)

* Use a pointing hand GLFW cursor for the web grab cursor

* Add TODO comment about custom cursor
---
 modules/webbrowser/src/browserclient.cpp | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/modules/webbrowser/src/browserclient.cpp b/modules/webbrowser/src/browserclient.cpp
index b266437944..dfe23d7d9e 100644
--- a/modules/webbrowser/src/browserclient.cpp
+++ b/modules/webbrowser/src/browserclient.cpp
@@ -128,6 +128,13 @@ bool BrowserClient::DisplayHandler::OnCursorChange(CefRefPtr<CefBrowser>, CefCur
         case cef_cursor_type_t::CT_NOTALLOWED:
             newCursor = WindowDelegate::Cursor::NotAllowed;
             break;
+        case cef_cursor_type_t::CT_GRAB:
+        case cef_cursor_type_t::CT_GRABBING:
+            // There is no "grabbing" cursors in GLFW, so for now the pointing hand to
+            // make web objects that use drag-n-drop look more interactive.
+            // @TODO (emmbr, 2024-12-09) Add custom cursors for these cases
+            newCursor = WindowDelegate::Cursor::PointingHand;
+            break;
         default:
             newCursor = WindowDelegate::Cursor::Arrow;
             break;

From aad10ec154dfa42a1806676cee3f3eed2afbbe80 Mon Sep 17 00:00:00 2001
From: ElonOlsson <olssonelon@gmail.com>
Date: Tue, 10 Dec 2024 18:05:40 -0500
Subject: [PATCH 667/701] Added support for coordinate systems: old GSM as
 Static, real GSM, SM, GSE and time dependent GSM and SM (#3392)

* added old GSM as Static, real GSM, SM, GSE and time dependent GSM and SM

* small formating

* i dont rember changing this, so taking it back

* added support for time dependent GSM and SM to work to year 2099

* added newer kernel

* added HEEQ and HEE

* better naming and descriptions

* rename lowercase

* naming rewrite

* fix after name change

* added earth centric tf files. sun centric left to do and .bpc files and .bsp files

* including kernels with asset.resource now. Left is weather to move or change examples/debugcoordinateaxes

* minor naming cleanup

* cleanup. remove comment

* getting rid of debugcoordinateaxes example asset
---
 .../assets/examples/debugcoordinateaxes.asset | 133 ------------------
 .../sun_earth_2012_fieldlines_batsrus.asset   |   8 +-
 .../solarsystem/planets/earth/kernels/GSM.ti  |  33 -----
 .../earth/magnetosphere/magnetosphere.asset   |   8 +-
 .../transforms_magnetosphere.asset            |  54 -------
 .../planets/earth/transforms_gse.asset        |  65 +++++++++
 .../planets/earth/transforms_gsm_sm.asset     |  92 ++++++++++++
 .../transforms_gsm_sm_timedependent.asset     | 126 +++++++++++++++++
 .../planets/earth/transforms_gsm_static.asset |  65 +++++++++
 .../scene/solarsystem/sun/kernels/HEEQ180.tf  |  41 ------
 .../sun/transforms_heliosphere.asset          | 115 ++++++++++++---
 11 files changed, 453 insertions(+), 287 deletions(-)
 delete mode 100644 data/assets/examples/debugcoordinateaxes.asset
 delete mode 100644 data/assets/scene/solarsystem/planets/earth/kernels/GSM.ti
 delete mode 100644 data/assets/scene/solarsystem/planets/earth/magnetosphere/transforms_magnetosphere.asset
 create mode 100644 data/assets/scene/solarsystem/planets/earth/transforms_gse.asset
 create mode 100644 data/assets/scene/solarsystem/planets/earth/transforms_gsm_sm.asset
 create mode 100644 data/assets/scene/solarsystem/planets/earth/transforms_gsm_sm_timedependent.asset
 create mode 100644 data/assets/scene/solarsystem/planets/earth/transforms_gsm_static.asset
 delete mode 100644 data/assets/scene/solarsystem/sun/kernels/HEEQ180.tf

diff --git a/data/assets/examples/debugcoordinateaxes.asset b/data/assets/examples/debugcoordinateaxes.asset
deleted file mode 100644
index c74c4628d4..0000000000
--- a/data/assets/examples/debugcoordinateaxes.asset
+++ /dev/null
@@ -1,133 +0,0 @@
-local earthTransforms = asset.require("scene/solarsystem/planets/earth/transforms")
-local sunTransforms = asset.require("scene/solarsystem/sun/transforms")
-
-
-
-local SunRadius = 6.957E8
-local EarthRadius = 6.371E6
-
-local EarthBarycenterAxes = {
-  Identifier = "EarthBarycenterAxes",
-  Parent = earthTransforms.EarthBarycenter.Identifier,
-  Transform = {
-    Scale = {
-      Type = "StaticScale",
-      Scale = EarthRadius * 3.5
-    }
-  },
-  Renderable = {
-    Type = "RenderableCartesianAxes"
-  },
-  GUI = {
-    Name = "Earth Barycenter Axes",
-    Path = "/Other/Coordinate Systems"
-  }
-}
-
-local EarthInertialAxes = {
-  Identifier = "EarthInertialAxes",
-  Parent = earthTransforms.EarthInertial.Identifier,
-  Transform = {
-    Scale = {
-      Type = "StaticScale",
-      Scale = EarthRadius * 2.5
-    }
-  },
-  Renderable = {
-    Type = "RenderableCartesianAxes"
-  },
-  GUI = {
-    Name = "Earth Inertial Axes",
-    Path = "/Other/Coordinate Systems"
-  }
-}
-
-local EarthIAUAxes = {
-  Identifier = "EarthIAUAxes",
-  Parent = earthTransforms.EarthIAU.Identifier,
-  Transform = {
-    Scale = {
-      Type = "StaticScale",
-      Scale = EarthRadius * 1.5
-    }
-  },
-  Renderable = {
-    Type = "RenderableCartesianAxes"
-  },
-  GUI = {
-    Name = "Earth IAU Axes",
-    Path = "/Other/Coordinate Systems"
-  }
-}
-
-local SunIAUAxes = {
-  Identifier = "SunIAUAxes",
-  Parent = sunTransforms.SunIAU.Identifier,
-  Transform = {
-    Scale = {
-      Type = "StaticScale",
-      Scale = SunRadius * 300
-    }
-  },
-  Renderable = {
-    Type = "RenderableCartesianAxes"
-  },
-  GUI = {
-    Name = "Sun IAU Axes",
-    Path = "/Other/Coordinate Systems"
-  }
-}
-
-local SolarSystemBarycenterAxes = {
-  Identifier = "SolarSystemBarycenterAxes",
-  Parent = sunTransforms.SolarSystemBarycenter.Identifier,
-  Transform = {
-    Scale = {
-      Type = "StaticScale",
-      Scale = SunRadius * 300
-    }
-  },
-  Renderable = {
-    Type = "RenderableCartesianAxes"
-  },
-  GUI = {
-    Name = "Solar System Barycenter Axes",
-    Path = "/Other/Coordinate Systems"
-  }
-}
-
-
-asset.onInitialize(function()
-  openspace.addSceneGraphNode(EarthBarycenterAxes)
-  openspace.addSceneGraphNode(EarthInertialAxes)
-  openspace.addSceneGraphNode(EarthIAUAxes)
-  openspace.addSceneGraphNode(SunIAUAxes)
-  openspace.addSceneGraphNode(SolarSystemBarycenterAxes)
-
-end)
-
-asset.onDeinitialize(function()
-  openspace.removeSceneGraphNode(SolarSystemBarycenterAxes)
-  openspace.removeSceneGraphNode(SunIAUAxes)
-  openspace.removeSceneGraphNode(EarthIAUAxes)
-  openspace.removeSceneGraphNode(EarthInertialAxes)
-  openspace.removeSceneGraphNode(EarthBarycenterAxes)
-end)
-
-asset.export(EarthBarycenterAxes)
-asset.export(EarthInertialAxes)
-asset.export(EarthIAUAxes)
-asset.export(SunIAUAxes)
-asset.export(SolarSystemBarycenterAxes)
-
-
-
-asset.meta = {
-  Name = "Debug Coordinates",
-  Description = [[A set of coordinate axes demonstrating different XYZ coordinate
-    reference frames that are useful for debugging, such as the Earth or Solar
-    System Barycenter.]],
-  Author = "OpenSpace Team",
-  URL = "http://openspaceproject.com",
-  License = "MIT license"
-}
diff --git a/data/assets/scene/solarsystem/heliosphere/2012/sun_earth_2012_fieldlines_batsrus.asset b/data/assets/scene/solarsystem/heliosphere/2012/sun_earth_2012_fieldlines_batsrus.asset
index b11b3d2658..6a34d700e4 100644
--- a/data/assets/scene/solarsystem/heliosphere/2012/sun_earth_2012_fieldlines_batsrus.asset
+++ b/data/assets/scene/solarsystem/heliosphere/2012/sun_earth_2012_fieldlines_batsrus.asset
@@ -1,5 +1,5 @@
 asset.require("scene/solarsystem/heliosphere/2012/reset_loop_action")
-local transforms = asset.require("scene/solarsystem/planets/earth/magnetosphere/transforms_magnetosphere")
+local transforms = asset.require("scene/solarsystem/planets/earth/transforms_gsm_sm")
 
 
 
@@ -59,7 +59,7 @@ local InteractionSphere = 6380000  -- A value slightly bigger than earth radius
 ----------------------LUTZ's JULY TRACES-------------------------
 local BatsrusJ12OpenClosed = {
   Identifier = "FL_BATSRUS_J12_OpenClosed",
-  Parent = transforms.GSMReferenceFrame.Identifier,
+  Parent = transforms.GeocentricSolarMagnetospheric.Identifier,
   InteractionSphere = InteractionSphere,
   Renderable = {
     Type = "RenderableFieldlinesSequence",
@@ -89,7 +89,7 @@ local BatsrusJ12OpenClosed = {
 --------------------- VELOCITY FLOWLINES ------------------------
 local BatsrusJ12FlowLines = {
   Identifier = "FL_BATSRUS_J12_FlowLines",
-  Parent = transforms.GSMReferenceFrame.Identifier,
+  Parent = transforms.GeocentricSolarMagnetospheric.Identifier,
   InteractionSphere = InteractionSphere,
   Renderable = {
     Type = "RenderableFieldlinesSequence",
@@ -116,7 +116,7 @@ local BatsrusJ12FlowLines = {
 --------------------- Ashers seedpoints ------------------------
 local BatsrusAsherStaticSeedsFlowLines = {
   Identifier = "FL_BATSRUS_ASHER_STATIC_SSEDS_FlowLines",
-  Parent = transforms.GSMReferenceFrame.Identifier,
+  Parent = transforms.GeocentricSolarMagnetospheric.Identifier,
   InteractionSphere = InteractionSphere,
   Renderable = {
     Type = "RenderableFieldlinesSequence",
diff --git a/data/assets/scene/solarsystem/planets/earth/kernels/GSM.ti b/data/assets/scene/solarsystem/planets/earth/kernels/GSM.ti
deleted file mode 100644
index 360c3274f3..0000000000
--- a/data/assets/scene/solarsystem/planets/earth/kernels/GSM.ti
+++ /dev/null
@@ -1,33 +0,0 @@
-Geocentric Solar Magnetospheric (GSM) frame:
-Used by the BATSRUS model
-This Kernel's ID is not a valid ID!
-
- +X is parallel to the geometric earth-sun position vector.
-
- +Z axis is normalized component of north centered geomagnetic dipole
- vector orthogonal to GSM +X axis.
-
- +Y completes the right-handed frame.
-
-\begindata
-
-FRAME_GSM = 13371333
-FRAME_13371333_NAME = 'GSM'
-FRAME_13371333_CLASS = 5
-FRAME_13371333_CLASS_ID = 13371333
-FRAME_13371333_CENTER = 399
-FRAME_13371333_RELATIVE = 'GALACTIC'
-FRAME_13371333_DEF_STYLE = 'PARAMETERIZED'
-FRAME_13371333_FAMILY = 'TWO-VECTOR'
-FRAME_13371333_PRI_AXIS = 'X'
-FRAME_13371333_PRI_VECTOR_DEF = 'OBSERVER_TARGET_POSITION'
-FRAME_13371333_PRI_OBSERVER = 'EARTH'
-FRAME_13371333_PRI_TARGET = 'SUN'
-FRAME_13371333_PRI_ABCORR = 'NONE'
-FRAME_13371333_SEC_AXIS = 'Z'
-FRAME_13371333_SEC_VECTOR_DEF = 'CONSTANT'
-FRAME_13371333_SEC_FRAME = 'ECLIPJ2000'
-FRAME_13371333_SEC_SPEC = 'LATITUDINAL'
-FRAME_13371333_SEC_UNITS = 'DEGREES'
-FRAME_13371333_SEC_LONGITUDE = 288.43
-FRAME_13371333_SEC_LATITUDE = 79.54
diff --git a/data/assets/scene/solarsystem/planets/earth/magnetosphere/magnetosphere.asset b/data/assets/scene/solarsystem/planets/earth/magnetosphere/magnetosphere.asset
index 6bf4588ed2..5190136a15 100644
--- a/data/assets/scene/solarsystem/planets/earth/magnetosphere/magnetosphere.asset
+++ b/data/assets/scene/solarsystem/planets/earth/magnetosphere/magnetosphere.asset
@@ -1,4 +1,4 @@
-local transforms = asset.require("./transforms_magnetosphere")
+local transforms = asset.require("scene/solarsystem/planets/earth/transforms_gsm_static")
 
 
 
@@ -11,15 +11,15 @@ local fieldlinesDirectory = asset.resource({
   Version = 1
 })
 
-
 local EarthMagnetosphere = {
   Identifier = "EarthMagnetosphere",
-  Parent = transforms.GSMReferenceFrame.Identifier,
+  Parent = transforms.GeocentricSolarMagnetosphericStatic.Identifier,
   InteractionSphere = 6380000,  -- A value slightly bigger than earth radius
   Renderable = {
     Type = "RenderableFieldlinesSequence",
     SourceFolder = fieldlinesDirectory,
     LineWidth = 1.0,
+    ShowAtAllTimes = true,
     AlphaBlendlingEnabled = false,
     InputFileType = "Osfls",    -- OpenSpace Field lines sequence
     MaskingEnabled = true,
@@ -28,8 +28,8 @@ local EarthMagnetosphere = {
     ColorMethod = "By Quantity",
     ColorQuantity = 4, -- speed
     ColorTableRanges = { { 50, 300 } },
-    ColorTablePaths = { transferFunction },
     LoadAtRuntime = true,
+    ColorTablePaths = { transferFunction },
     ScaleToMeters = 1.0,
     Color = { 1.0, 0.725, 0.75, 0.8 }
   },
diff --git a/data/assets/scene/solarsystem/planets/earth/magnetosphere/transforms_magnetosphere.asset b/data/assets/scene/solarsystem/planets/earth/magnetosphere/transforms_magnetosphere.asset
deleted file mode 100644
index b169211d78..0000000000
--- a/data/assets/scene/solarsystem/planets/earth/magnetosphere/transforms_magnetosphere.asset
+++ /dev/null
@@ -1,54 +0,0 @@
-local transforms = asset.require("scene/solarsystem/planets/earth/transforms")
-local coreKernels = asset.require("spice/core")
-
-
-
-local GSMKernel = asset.resource("../kernels/GSM.ti")
-
-
-local Frame = {
-  GSM = "GSM" -- Geocentric Solar Magnetospheric
-}
-
-local GSMReferenceFrame = {
-  Identifier = "GSMReferenceFrame",
-  Parent = transforms.EarthCenter.Identifier,
-  Transform = {
-    Rotation = {
-      Type = "SpiceRotation",
-      SourceFrame = Frame.GSM,
-      DestinationFrame = coreKernels.Frame.Galactic
-    }
-  },
-  GUI = {
-    Name = "GSM Reference Frame",
-    Path = "/Solar System/Planets/Earth",
-    Hidden = true
-  }
-}
-
-
-asset.onInitialize(function()
-  openspace.spice.loadKernel(GSMKernel)
-
-  openspace.addSceneGraphNode(GSMReferenceFrame)
-end)
-
-asset.onDeinitialize(function()
-  openspace.removeSceneGraphNode(GSMReferenceFrame)
-
-  openspace.spice.unloadKernel(GSMKernel)
-end)
-
-asset.export("Frame", Frame)
-asset.export(GSMReferenceFrame)
-
-
-
-asset.meta = {
-  Name = "Earth magnetosphere transforms",
-  Description = "Earth transforms: GSMReferenceFrame. Geocentric Solar Magnetospheric",
-  Author = "CCMC",
-  URL = "http://openspaceproject.com",
-  License = "MIT license"
-}
diff --git a/data/assets/scene/solarsystem/planets/earth/transforms_gse.asset b/data/assets/scene/solarsystem/planets/earth/transforms_gse.asset
new file mode 100644
index 0000000000..84e5d71b57
--- /dev/null
+++ b/data/assets/scene/solarsystem/planets/earth/transforms_gse.asset
@@ -0,0 +1,65 @@
+local transforms = asset.require("scene/solarsystem/planets/earth/transforms")
+local coreKernels = asset.require("spice/core")
+
+
+
+local earthcentricKernels = asset.resource({
+  Name = "Earthcenteric Frame Kernels",
+  Type = "HttpSynchronization",
+  Identifier = "earthcentric_frame_kernels",
+  Version = 1
+})
+
+local Frame = {
+  GSE = "GSE"
+}
+
+local GeocentricSolarEcliptic = {
+  Identifier = "GeocentricSolarEcliptic",
+  Parent = transforms.EarthCenter.Identifier,
+  Transform = {
+    Rotation = {
+      Type = "SpiceRotation",
+      SourceFrame = Frame.GSE,
+      DestinationFrame = coreKernels.Frame.Galactic
+    }
+  },
+  GUI = {
+    Name = "Geocentric Solar Ecliptic",
+    Path = "/Solar System/Planets/Earth",
+    Description = [[The X-Y plane is defined by the Earth Mean Ecliptic plane of date:
+        the +Z axis, primary vector, is the normal vector to this plane,
+        always pointing toward the North side of the invariant plane.
+        +X axis is the component of the Earth-Sun vector that is orthogonal
+        to the +Z axis.
+        +Y axis completes the right-handed system.]],
+    Hidden = true
+  }
+}
+
+
+asset.onInitialize(function()
+  openspace.spice.loadKernel(earthcentricKernels .."ECLIPDATE.tf")
+  openspace.spice.loadKernel(earthcentricKernels .."GSE.tf")
+  openspace.addSceneGraphNode(GeocentricSolarEcliptic)
+end)
+
+asset.onDeinitialize(function()
+  openspace.removeSceneGraphNode(GeocentricSolarEcliptic)
+  openspace.spice.unloadKernel(earthcentricKernels .."GSE.tf")
+  openspace.spice.unloadKernel(earthcentricKernels .."ECLIPDATE.tf")
+end)
+
+asset.export("Frame", Frame)
+asset.export(GeocentricSolarEcliptic)
+
+
+
+asset.meta = {
+  Name = "Geocentric Solar Ecliptic (GSE) frame Transform",
+  Version = "1.0",
+  Description = "Earth transform GSE Reference Frame",
+  Author = "CCMC",
+  URL = "http://openspaceproject.com",
+  License = "MIT license"
+}
diff --git a/data/assets/scene/solarsystem/planets/earth/transforms_gsm_sm.asset b/data/assets/scene/solarsystem/planets/earth/transforms_gsm_sm.asset
new file mode 100644
index 0000000000..6b3bf4d13b
--- /dev/null
+++ b/data/assets/scene/solarsystem/planets/earth/transforms_gsm_sm.asset
@@ -0,0 +1,92 @@
+local transforms = asset.require("scene/solarsystem/planets/earth/transforms")
+local coreKernels = asset.require("spice/core")
+
+
+
+local earthcentricKernels = asset.resource({
+  Name = "Earthcenteric Frame Kernels",
+  Type = "HttpSynchronization",
+  Identifier = "earthcentric_frame_kernels",
+  Version = 1
+})
+
+local Frame = {
+  GSM = "EARTH_GSM_IGRF2000", -- Geocentric Solar Magnetospheric
+  SM = "EARTH_SM_IGRF2000",
+}
+
+local GeocentricSolarMagnetospheric = {
+  Identifier = "GeocentricSolarMagnetospheric",
+  Parent = transforms.EarthCenter.Identifier,
+  Transform = {
+    Rotation = {
+      Type = "SpiceRotation",
+      SourceFrame = Frame.GSM,
+      DestinationFrame = coreKernels.Frame.Galactic
+    }
+  },
+  GUI = {
+    Name = "Geocentric Solar Magnetospheric",
+    Path = "/Solar System/Planets/Earth",
+    Description = [[ +X is parallel to the geometric earth-sun position vector.
+      +Z axis is normalized component of north centered geomagnetic dipole
+      vector orthogonal to GSM +X axis.
+      +Y completes the right-handed frame.
+      - the origin of this frame is the center of mass of the Earth.]],
+    Hidden = true
+  }
+}
+
+local SolarMagnetic = {
+  Identifier = "SolarMagnetic",
+  Parent = transforms.EarthCenter.Identifier,
+  Transform = {
+    Rotation = {
+      Type = "SpiceRotation",
+      SourceFrame = Frame.SM,
+      DestinationFrame = coreKernels.Frame.Galactic
+    }
+  },
+  GUI = {
+    Name = "Solar Magnetic",
+    Path = "/Solar System/Planets/Earth",
+    Description = [[+Z axis is the direction of Earth's magnetic dipole axis
+      (positive North); it's the primary vector.
+      +X axis is the projection of the geometric position of the
+      Sun relative to the Earth onto the plane perpendicular to the
+      Z axis.
+      +Y axis completes the right-handed system.
+      - the origin of this frame is the center of mass of the Earth.]],
+    Hidden = true
+  }
+}
+
+
+asset.onInitialize(function()
+  openspace.spice.loadKernel(earthcentricKernels .. "GSM.tf")
+  openspace.spice.loadKernel(earthcentricKernels .. "SM.tf")
+  openspace.addSceneGraphNode(GeocentricSolarMagnetospheric)
+  openspace.addSceneGraphNode(SolarMagnetic)
+end)
+
+asset.onDeinitialize(function()
+  openspace.removeSceneGraphNode(SolarMagnetic)
+  openspace.removeSceneGraphNode(GeocentricSolarMagnetospheric)
+  openspace.spice.unloadKernel(earthcentricKernels .. "SM.tf")
+  openspace.spice.unloadKernel(earthcentricKernels .. "GSM.tf")
+end)
+
+asset.export("Frame", Frame)
+asset.export(GeocentricSolarMagnetospheric)
+asset.export(SolarMagnetic)
+
+
+
+asset.meta = {
+  Name = "Earth GSM and SM transforms",
+  Version = "1.0",
+  Description = "Earth transform GSM Reference Frame. Geocentric Solar Magnetospheric, SM Reference Frame, Solar Magnetic",
+  Author = "CCMC",
+  URL = "http://openspaceproject.com",
+  License = "MIT license"
+}
diff --git a/data/assets/scene/solarsystem/planets/earth/transforms_gsm_sm_timedependent.asset b/data/assets/scene/solarsystem/planets/earth/transforms_gsm_sm_timedependent.asset
new file mode 100644
index 0000000000..eaf1122589
--- /dev/null
+++ b/data/assets/scene/solarsystem/planets/earth/transforms_gsm_sm_timedependent.asset
@@ -0,0 +1,126 @@
+local transforms = asset.require("scene/solarsystem/planets/earth/transforms")
+local coreKernels = asset.require("spice/core")
+
+
+
+local earthcentricKernels = asset.resource({
+  Name = "Earthcenteric Frame Kernels",
+  Type = "HttpSynchronization",
+  Identifier = "earthcentric_frame_kernels",
+  Version = 1
+})
+
+local ITRF93Kernels = asset.resource({
+  Name = "ITRF93 Kernels",
+  Type = "HttpSynchronization",
+  Identifier = "itrf93_kernels",
+  Version = 1
+})
+
+local NorthPoleKernels = asset.resource({
+  Name = "North Pole Kernels",
+  Type = "HttpSynchronization",
+  Identifier = "northpole_kernels",
+  Version = 1
+})
+
+local Frame = {
+  GSM_time = "EARTH_GSM_IGRF",
+  SM_time = "EARTH_SM_IGRF"
+}
+
+local GeocentricSolarMagnetosphericTimeDependent = {
+  Identifier = "GeocentricSolarMagnetosphericTimeDependent",
+  Parent = transforms.EarthCenter.Identifier,
+  Transform = {
+    Rotation = {
+      Type = "SpiceRotation",
+      SourceFrame = Frame.GSM_time,
+      DestinationFrame = coreKernels.Frame.Galactic
+    }
+  },
+  GUI = {
+    Name = "Geocentric Solar Magnetospheric (Timedependent)",
+    Path = "/Solar System/Planets/Earth",
+    Description = [[The Earth's magnetic dipole axis direction is time-
+      variable and is defined by the EARTH_NORTH_POLE/399901 object location
+      as seen from the Earth center provided in the SPK file
+      earthnpole_19500101_20251231_v01.bsp (or newer).
+      +X is parallel to the geometric earth-sun position vector.
+      +Z axis is normalized component of north centered geomagnetic dipole
+      vector orthogonal to GSM +X axis.
+      +Y completes the right-handed frame.
+      - the origin of this frame is the center of mass of the Earth.]],
+    Hidden = true
+  }
+}
+
+--like the other SM reference frame but with a time variant magnetic north pole. Update every 5years :
+-- 20251231, 20301231 etc...
+local SolarMagneticTimeDependent = {
+  Identifier = "SolarMagneticTimeDependent",
+  Parent = transforms.EarthCenter.Identifier,
+  Transform = {
+    Rotation ={
+      Type = "SpiceRotation",
+      SourceFrame = Frame.SM_time,
+      DestinationFrame = coreKernels.Frame.Galactic
+    }
+  },
+  GUI = {
+    Name = "Solar Magnetic (Timedependent)",
+    Path = "/Solar System/Planets/Earth",
+    Description = [[ The Earth's magnetic dipole axis direction is time-
+      variable and is defined by the EARTH_NORTH_POLE/399901 object location
+      as seen from the Earth center provided in the SPK file
+      earthnpole_19500101_20251231_v01.bsp (or newer).
+      +Z axis is the direction of Earth's magnetic dipole axis
+      (positive North); it's the primary vector.
+      +X axis is the projection of the geometric position of the
+      Sun relative to the Earth onto the plane perpendicular to the
+      Z axis.
+      +Y axis completes the right-handed system.
+      - the origin of this frame is the center of mass of the Earth.]],
+    Hidden = true
+  }
+}
+
+
+asset.onInitialize(function()
+  openspace.spice.loadKernel(NorthPoleKernels .. "earthnpole_19500101_20251231_v01.bsp")
+  openspace.spice.loadKernel(NorthPoleKernels .. "earthnpole_runout.bsp")
+  openspace.spice.loadKernel(ITRF93Kernels .. "earth_200101_990825_predict.bpc")
+  openspace.spice.loadKernel(ITRF93Kernels .. "earth_620120_240827.bpc")
+  openspace.spice.loadKernel(ITRF93Kernels .. "earth_latest_high_prec.bpc")
+  openspace.spice.loadKernel(earthcentricKernels .. "GSM_time.tf")
+  openspace.spice.loadKernel(earthcentricKernels .. "SM_time.tf")
+  openspace.addSceneGraphNode(GeocentricSolarMagnetosphericTimeDependent)
+  openspace.addSceneGraphNode(SolarMagneticTimeDependent)
+end)
+
+asset.onDeinitialize(function()
+  openspace.removeSceneGraphNode(SolarMagneticTimeDependent)
+  openspace.removeSceneGraphNode(GeocentricSolarMagnetosphericTimeDependent)
+  openspace.spice.unloadKernel(earthcentricKernels .. "SM_time.tf")
+  openspace.spice.unloadKernel(earthcentricKernels .. "GSM_time.tf")
+  openspace.spice.unloadKernel(ITRF93Kernels .. "earth_latest_high_prec.bpc")
+  openspace.spice.unloadKernel(ITRF93Kernels .. "earth_620120_240827.bpc")
+  openspace.spice.unloadKernel(ITRF93Kernels .. "earth_200101_990825_predict.bpc")
+  openspace.spice.unloadKernel(NorthPoleKernels.. "earthnpole_runout.bsp")
+  openspace.spice.unloadKernel(NorthPoleKernels.. "earthnpole_19500101_20251231_v01.bsp")
+end)
+
+asset.export("Frame", Frame)
+asset.export(GeocentricSolarMagnetosphericTimeDependent)
+asset.export(SolarMagneticTimeDependent)
+
+
+
+asset.meta = {
+  Name = "Earth's time dependent magnetic northpole GSM and SM transforms",
+  Version = "1.0",
+  Description = "Earth transforms: Earth's time dependent magnetic northpole GSM, Geocentric Solar Magnetospheric and SM, Solar Magnetic transforms",
+  Author = "CCMC",
+  URL = "http://openspaceproject.com",
+  License = "MIT license"
+}
diff --git a/data/assets/scene/solarsystem/planets/earth/transforms_gsm_static.asset b/data/assets/scene/solarsystem/planets/earth/transforms_gsm_static.asset
new file mode 100644
index 0000000000..19048f6252
--- /dev/null
+++ b/data/assets/scene/solarsystem/planets/earth/transforms_gsm_static.asset
@@ -0,0 +1,65 @@
+local transforms = asset.require("scene/solarsystem/planets/earth/transforms")
+local coreKernels = asset.require("spice/core")
+
+
+
+local earthcentricKernels = asset.resource({
+  Name = "Earthcenteric Frame Kernels",
+  Type = "HttpSynchronization",
+  Identifier = "earthcentric_frame_kernels",
+  Version = 1
+})
+
+local Frame = {
+  GSM_static = "GSM_STATIC" -- Geocentric Solar Magnetospheric
+}
+
+local GeocentricSolarMagnetosphericStatic  = {
+  Identifier = "GeocentricSolarMagnetosphericStatic",
+  Parent = transforms.EarthCenter.Identifier,
+  Transform = {
+    Rotation = {
+      Type = "SpiceRotation",
+      SourceFrame = Frame.GSM_static,
+      DestinationFrame = coreKernels.Frame.Galactic
+    }
+  },
+  GUI = {
+    Name = "Geocentric Solar Magnetospheric Static",
+    Path = "/Solar System/Planets/Earth",
+    Description =[[The Kernel for this is the same as
+      GSM (Geocentric Solar Magnetospheric), except it is using
+      ECLIPJ2000 instead of IAU_EARTH for the secondary axis. GSM is defind as:
+      +X is parallel to the geometric earth-sun position vector.
+      +Z axis is normalized component of north centered geomagnetic dipole
+      vector orthogonal to GSM +X axis.
+      +Y completes the right-handed frame.
+      - the origin of this frame is the center of mass of the Earth.]],
+    Hidden = true
+  }
+}
+
+
+asset.onInitialize(function()
+  openspace.spice.loadKernel(earthcentricKernels .. "GSM_static.tf")
+  openspace.addSceneGraphNode(GeocentricSolarMagnetosphericStatic )
+end)
+
+asset.onDeinitialize(function()
+  openspace.removeSceneGraphNode(GeocentricSolarMagnetosphericStatic )
+  openspace.spice.unloadKernel(earthcentricKernels .. "GSM_static.tf")
+end)
+
+asset.export("Frame", Frame)
+asset.export(GeocentricSolarMagnetosphericStatic )
+
+
+
+asset.meta = {
+  Name = "Earth static GSM transforms",
+  Version = "1.0",
+  Description = "A static version of Earth transform GSM Reference Frame. Geocentric Solar Magnetospheric",
+  Author = "CCMC",
+  URL = "http://openspaceproject.com",
+  License = "MIT license"
+}
diff --git a/data/assets/scene/solarsystem/sun/kernels/HEEQ180.tf b/data/assets/scene/solarsystem/sun/kernels/HEEQ180.tf
deleted file mode 100644
index 4106801ce9..0000000000
--- a/data/assets/scene/solarsystem/sun/kernels/HEEQ180.tf
+++ /dev/null
@@ -1,41 +0,0 @@
-\begintext
-
-Heliocentric Earth Equatorial (HEEQ+180) Frame
-Used by the BATSRUS model
-This Kernel's ID is not a valid ID!
-     Definition of the Heliocentric Earth Equatorial frame:
-
-              All vectors are geometric: no aberration corrections are
-              used.
-
-              The solar rotation axis is the primary vector: the Z axis points
-	      in the solar north direction.
-
-              The position of the sun relative to the earth is the secondary
-              vector: the X axis is the component of this position vector
-              orthogonal to the Z axis.
-
-              The Y axis is Z cross X, completing the right-handed
-              reference frame.
-
-\begindata
-
-        FRAME_HEEQ180                =  6666666
-        FRAME_6666666_NAME           = 'HEEQ180'
-        FRAME_6666666_CLASS          =  5
-        FRAME_6666666_CLASS_ID       =  6666666
-        FRAME_6666666_CENTER         =  10
-        FRAME_6666666_RELATIVE       = 'J2000'
-        FRAME_6666666_DEF_STYLE      = 'PARAMETERIZED'
-        FRAME_6666666_FAMILY         = 'TWO-VECTOR'
-        FRAME_6666666_PRI_AXIS       = 'Z'
-        FRAME_6666666_PRI_VECTOR_DEF = 'CONSTANT'
-        FRAME_6666666_PRI_FRAME      = 'IAU_SUN'
-        FRAME_6666666_PRI_SPEC       = 'RECTANGULAR'
-        FRAME_6666666_PRI_VECTOR      = ( 0, 0, 1 )
-        FRAME_6666666_SEC_AXIS       = 'X'
-        FRAME_6666666_SEC_VECTOR_DEF = 'OBSERVER_TARGET_POSITION'
-        FRAME_6666666_SEC_OBSERVER   = 'EARTH'
-        FRAME_6666666_SEC_TARGET     = 'SUN'
-        FRAME_6666666_SEC_ABCORR     = 'NONE'
-        FRAME_6666666_SEC_FRAME      = 'IAU_SUN'
diff --git a/data/assets/scene/solarsystem/sun/transforms_heliosphere.asset b/data/assets/scene/solarsystem/sun/transforms_heliosphere.asset
index 56c750dd8c..45e9828964 100644
--- a/data/assets/scene/solarsystem/sun/transforms_heliosphere.asset
+++ b/data/assets/scene/solarsystem/sun/transforms_heliosphere.asset
@@ -3,15 +3,15 @@ local coreKernels = asset.require("spice/core")
 
 
 
-local kernel = asset.resource("kernels/HEEQ180.tf")
+local SunCentricFrameKernels = asset.resource({
+  Name = "Sun Centric Frame Kernels",
+  Type = "HttpSynchronization",
+  Identifier = "suncentric_frame_kernels",
+  Version = 1
+})
 
-local HEEQ180ReferenceFrame = {
-  Identifier = "HEEQ180ReferenceFrame",
-  -- The HEEQ180 reference frame should have Sun_IAU as parent
-  -- instead of Solar center, however the Sun_IAU adds
-  -- an unwanted rotation which is difficult to cancel out
-  -- since it is using SpiceRotation. Sun center
-  -- is used instead.
+local HeliocentricEarthEquatorial180  = {
+  Identifier = "HeliocentricEarthEquatorial180",
   Parent = sunTransforms.SunCenter.Identifier,
   Transform = {
     Rotation = {
@@ -21,32 +21,111 @@ local HEEQ180ReferenceFrame = {
     }
   },
   GUI = {
-    Name = "HEEQ180 Reference Frame",
+    Name = "Heliocentric Earth Equatorial 180",
     Path = "/Solar System/Sun",
+    Description = [[      -  X-Y plane is the solar equator of date, therefore, the +Z axis
+          is the primary vector and it is aligned to the Sun's north pole
+          of date.
+
+      -  +X axis is defined by the intersection between the Sun equatorial
+          plane and the solar central meridian of date as seen from the Earth.
+          The solar central meridian of date is defined as the meridian of the
+          Sun that is turned toward the Earth. Therefore, +X axis is the
+          component of the Sun-Earth vector that is orthogonal to the +Z axis.
+
+      -  +Y axis completes the right-handed system.
+
+      -  the origin of this frame is the Sun's center of mass.]],
+    Hidden = true
+  }
+}
+
+local HeliocentricEarthEquatorial = {
+  Identifier = "HeliocentricEarthEquatorial",
+  Parent = sunTransforms.SunCenter.Identifier,
+  Transform = {
+    Rotation = {
+      Type = "SpiceRotation",
+      SourceFrame = "HEEQ",
+      DestinationFrame = coreKernels.Frame.Galactic
+    }
+  },
+  GUI = {
+    Name = "Heliocentric Earth Equatorial",
+    Path = "/Solar System/Sun",
+    Description = [[      -  X-Y plane is the solar equator of date, therefore, the +Z axis
+         is the primary vector and it is aligned to the Sun's north pole
+         of date.
+
+      -  +X axis is defined by the intersection between the Sun equatorial
+         plane and the solar central meridian of date as seen from the Earth.
+         The solar central meridian of date is defined as the meridian of the
+         Sun that is turned toward the Earth. Therefore, +X axis is the
+         component of the Sun-Earth vector that is orthogonal to the +Z axis.
+
+      -  +Y axis completes the right-handed system.
+
+      -  the origin of this frame is the Sun's center of mass.]],
+    Hidden = true
+  }
+}
+
+local HeliocentricEarthEcliptic = {
+  Identifier = "HeliocentricEarthEcliptic",
+  Parent = sunTransforms.SunCenter.Identifier,
+  Transform = {
+    Rotation = {
+      Type = "SpiceRotation",
+      SourceFrame = "HEE",
+      DestinationFrame = coreKernels.Frame.Galactic
+    }
+  },
+  GUI = {
+    Name = "Heliocentric Earth Ecliptic",
+    Path = "/Solar System/Sun",
+    Description = [[      -  X-Y plane is defined by the Earth Mean Ecliptic plane of date,
+         therefore, the +Z axis is the primary vector,and it defined as
+         the normal vector to the Ecliptic plane that points toward the
+         north pole of date \n
+
+      -  +X axis is the component of the Sun-Earth vector that is
+         orthogonal to the +Z axis.
+
+      -  +Y axis completes the right-handed system.
+
+      -  the origin of this frame is the Sun's center of mass.]],
     Hidden = true
   }
 }
 
 
 asset.onInitialize(function()
-  openspace.spice.loadKernel(kernel)
-
-  openspace.addSceneGraphNode(HEEQ180ReferenceFrame)
+  openspace.spice.loadKernel(SunCentricFrameKernels .. "HEEQ180.tf")
+  openspace.spice.loadKernel(SunCentricFrameKernels .. "HEEQ.tf")
+  openspace.spice.loadKernel(SunCentricFrameKernels .. "HEE.tf")
+  openspace.addSceneGraphNode(HeliocentricEarthEquatorial180)
+  openspace.addSceneGraphNode(HeliocentricEarthEquatorial)
+  openspace.addSceneGraphNode(HeliocentricEarthEcliptic)
 end)
 
 asset.onDeinitialize(function()
-  openspace.removeSceneGraphNode(HEEQ180ReferenceFrame)
-
-  openspace.spice.unloadKernel(kernel)
+  openspace.removeSceneGraphNode(HeliocentricEarthEcliptic)
+  openspace.removeSceneGraphNode(HeliocentricEarthEquatorial)
+  openspace.removeSceneGraphNode(HeliocentricEarthEquatorial180)
+  openspace.spice.unloadKernel(SunCentricFrameKernels .."HEE.tf")
+  openspace.spice.unloadKernel(SunCentricFrameKernels .."HEEQ.tf")
+  openspace.spice.unloadKernel(SunCentricFrameKernels .."HEEQ180.tf")
 end)
 
-asset.export(HEEQ180ReferenceFrame)
+asset.export(HeliocentricEarthEquatorial180)
+asset.export(HeliocentricEarthEquatorial)
+asset.export(HeliocentricEarthEcliptic)
 
 
 
 asset.meta = {
-  Name = "Sun Transform, HEEQ180",
-  Description = "Sun transform: HEEQ180",
+  Name = "Sun Transform, HEE, HEEQ and HEEQ180",
+  Description = "Sun transform: HEE, HEEQ and HEEQ180",
   Author = "CCMC",
   URL = "http://openspaceproject.com",
   License = "MIT license"

From e68b1d4b4a03d74ba544a67874c100b7c615535b Mon Sep 17 00:00:00 2001
From: Adam Rohdin <adam.rohdin@outlook.com>
Date: Tue, 7 Jan 2025 09:24:16 +0100
Subject: [PATCH 668/701] Fix image links in README.md

---
 README.md | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/README.md b/README.md
index 51a719488f..7d004cea5a 100644
--- a/README.md
+++ b/README.md
@@ -11,13 +11,13 @@
 ![Contributors](https://img.shields.io/github/contributors/OpenSpace/OpenSpace?style=flat-square)
 ![Commits](https://img.shields.io/github/commit-activity/m/OpenSpace/OpenSpace?color=green&style=flat-square)
 
-![Image](https://docs.openspaceproject.com/en/latest/_static/images/collection.jpg)
+![Image](https://docs.openspaceproject.com/latest/_static/images/collection.jpg)
 
 
 # Background
 OpenSpace started as a collaboration between Sweden's [Linköping University](https://immvis.github.io) (LiU) and the [American Museum of Natural History](https://www.amnh.org) (AMNH). Development of the software began several years ago through a close collaboration with NASA Goddard's [Community Coordinated Modeling Center](https://ccmc.gsfc.nasa.gov) (CCMC) to model space weather forecasting and continued with visualizations of NASA's New Horizons mission to Pluto and ESA's Rosetta mission to 67P/Churyumov-Gerasimenko. This promising set of preliminary work provided a foundation for continued funding from NASA, the Swedish eScience Research Centre, and the Knut and Alice Wallenberg foundation, which has extended the collaboration to include the University of Utah's [Scientific Computing and Imaging](https://www.sci.utah.edu) (SCI) Institute, [New York University](https://www.nyu.edu)'s Tandon School of Engineering, multiple informal science institutions across the world, and multiple, international vendors.
 
-![Image](https://docs.openspaceproject.com/en/latest/_static/images/presentation.jpg)
+![Image](https://docs.openspaceproject.com/latest/_static/images/presentation.jpg)
 
 
 # Features
@@ -33,7 +33,7 @@ Some of the high-level features supported in OpenSpace are:
 
 OpenSpace requires at least support for [OpenGL](https://www.opengl.org/) version 3.3, some custom components require at least version 4.2.
 
-![Image](https://docs.openspaceproject.com/en/latest/_static/images/display-systems.jpg)
+![Image](https://docs.openspaceproject.com/latest/_static/images/display-systems.jpg)
 
 
 # Getting Started
@@ -51,7 +51,7 @@ Feel free to create issues for missing features, bug reports, or compile problem
 ## :heart: Contributing
 Any contributions to the software are very welcome and can take a multitude of forms, from reporting a bug, fixing bugs, creating new content, writing new features, and even creating and sharing images and videos you have made with the software. Please feel free to share anything you want in the #sharespace channel on the Slack.
 
-![Image](https://docs.openspaceproject.com/en/latest/_static/images/himalaya-nkpg-dome.jpg)
+![Image](https://docs.openspaceproject.com/latest/_static/images/himalaya-nkpg-dome.jpg)
 
 
 # License
@@ -61,4 +61,4 @@ The contents of this repository provided under an [MIT license](https://github.c
 # Support
 OpenSpace is supported by the following institutions:
 
-![Image](https://docs.openspaceproject.com/en/latest/_static/logos/sponsors.png)
+![Image](https://docs.openspaceproject.com/latest/_static/logos/sponsors.png)

From d281b6c33b6a87b224f3e773600c4090ddb0de2f Mon Sep 17 00:00:00 2001
From: Emma Broman <emma.broman@liu.se>
Date: Thu, 9 Jan 2025 11:44:13 +0100
Subject: [PATCH 669/701] Fix error in deinitilialize of distance-to-earth
 example asset

---
 data/assets/examples/screenspacedistancetoearth.asset | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/data/assets/examples/screenspacedistancetoearth.asset b/data/assets/examples/screenspacedistancetoearth.asset
index 8d912e2a53..8200f392a1 100644
--- a/data/assets/examples/screenspacedistancetoearth.asset
+++ b/data/assets/examples/screenspacedistancetoearth.asset
@@ -41,7 +41,7 @@ asset.onInitialize(function()
 end)
 
 asset.onDeinitialize(function()
-  openspace.addScreenSpaceRenderable(Dashboard)
+  openspace.removeScreenSpaceRenderable(Dashboard)
 end)
 
 asset.export(Dashboard)

From f0342e43e8463b1a26854963bd6fb37b726f32e6 Mon Sep 17 00:00:00 2001
From: Alexander Bock <alexander.bock@liu.se>
Date: Tue, 14 Jan 2025 14:17:50 +0100
Subject: [PATCH 670/701] Adapting to SGCT changes (#3488)

---
 .../ext/launcher/include/launcherwindow.h     |   2 +-
 .../launcher/include/sgctedit/windowcontrol.h |  18 +-
 .../ext/launcher/src/launcherwindow.cpp       |  88 +++--
 .../ext/launcher/src/sgctedit/sgctedit.cpp    |  33 +-
 .../launcher/src/sgctedit/windowcontrol.cpp   |  83 ++---
 apps/OpenSpace/ext/sgct                       |   2 +-
 apps/OpenSpace/main.cpp                       |  65 ++--
 config/schema/sgcteditor.schema.json          | 325 ------------------
 config/spout_output_cubemap.json              |  20 +-
 config/spout_output_equirectangular.json      |  67 ----
 config/spout_output_fisheye.json              |  67 ----
 config/spout_output_flat.json                 |  66 ----
 .../shaders/atmosphere_deferred_fs.glsl       |  14 +-
 shaders/framebuffer/raycastframebuffer.frag   |   2 +-
 shaders/framebuffer/renderframebuffer.frag    |   2 +-
 tests/test_sgctedit.cpp                       |  44 +--
 16 files changed, 164 insertions(+), 734 deletions(-)
 delete mode 100644 config/schema/sgcteditor.schema.json
 delete mode 100644 config/spout_output_equirectangular.json
 delete mode 100644 config/spout_output_fisheye.json
 delete mode 100644 config/spout_output_flat.json

diff --git a/apps/OpenSpace/ext/launcher/include/launcherwindow.h b/apps/OpenSpace/ext/launcher/include/launcherwindow.h
index e0016cfe21..c296f45c35 100644
--- a/apps/OpenSpace/ext/launcher/include/launcherwindow.h
+++ b/apps/OpenSpace/ext/launcher/include/launcherwindow.h
@@ -29,8 +29,8 @@
 
 #include "sgctedit/sgctedit.h"
 #include <openspace/scene/profile.h>
+#include <sgct/config.h>
 #include <sgct/error.h>
-#include <sgct/readconfig.h>
 #include <QApplication>
 #include <filesystem>
 #include <optional>
diff --git a/apps/OpenSpace/ext/launcher/include/sgctedit/windowcontrol.h b/apps/OpenSpace/ext/launcher/include/sgctedit/windowcontrol.h
index 1116a2d7f7..bbd5759d75 100644
--- a/apps/OpenSpace/ext/launcher/include/sgctedit/windowcontrol.h
+++ b/apps/OpenSpace/ext/launcher/include/sgctedit/windowcontrol.h
@@ -107,6 +107,11 @@ public:
      */
     void setDecorationState(bool hasWindowDecoration);
 
+    /**
+     * Sets whether the window is shared using spout.
+     */
+    void setSpoutOutputState(bool shouldSpoutOutput);
+
     /**
      * Generates window configuration (sgct::config::Window struct) based on the
      * GUI settings.
@@ -127,14 +132,13 @@ public:
 
     /**
      * Sets the window's projection type to fisheye, with the accompanying quality
-     * setting and spout option.
+     * setting.
      *
      * \param quality The value for number of vertical lines of resolution. This will be
      *        compared against the QualityValues array in order to set the correct
      *       combobox index
-     * \param spoutOutput Enabling the spout output option
      */
-    void setProjectionFisheye(int quality, bool spoutOutput);
+    void setProjectionFisheye(int quality);
 
     /**
      * Sets the window's projection type to spherical mirror, with the accompanying
@@ -159,14 +163,13 @@ public:
 
     /**
      * Sets the window's projection type to equirectangular, with the accompanying
-     * quality setting and spout option.
+     * quality setting.
      *
      * \param quality The value for number of vertical lines of resolution. This will be
      *        compared against the QualityValues array in order to set the correct
      *        combobox index
-     * \param spoutOutput Enabling the spout output option
      */
-    void setProjectionEquirectangular(int quality, bool spoutOutput);
+    void setProjectionEquirectangular(int quality);
 
     /**
      * Controls the visibility of all projection controls, including those that are only
@@ -227,6 +230,7 @@ private:
     QCheckBox* _windowDecoration = nullptr;
     QComboBox* _projectionType = nullptr;
     QLabel* _projectionLabel = nullptr;
+    QCheckBox* _spoutOutput = nullptr;
 
     struct {
         QWidget* widget = nullptr;
@@ -243,7 +247,6 @@ private:
         QLabel* labelInfo = nullptr;
         QComboBox* quality = nullptr;
         QLabel* labelQuality = nullptr;
-        QCheckBox* spoutOutput = nullptr;
     } _fisheye;
 
     struct {
@@ -267,7 +270,6 @@ private:
         QLabel* labelInfo = nullptr;
         QComboBox* quality = nullptr;
         QLabel* labelQuality = nullptr;
-        QCheckBox* spoutOutput = nullptr;
     } _equirectangular;
 
     const QIcon _lockIcon;
diff --git a/apps/OpenSpace/ext/launcher/src/launcherwindow.cpp b/apps/OpenSpace/ext/launcher/src/launcherwindow.cpp
index 406e8ca8fa..33aaeb1a55 100644
--- a/apps/OpenSpace/ext/launcher/src/launcherwindow.cpp
+++ b/apps/OpenSpace/ext/launcher/src/launcherwindow.cpp
@@ -32,7 +32,7 @@
 #include <ghoul/filesystem/filesystem.h>
 #include <ghoul/format.h>
 #include <ghoul/logging/logmanager.h>
-#include <sgct/readconfig.h>
+#include <sgct/config.h>
 #include <QComboBox>
 #include <QDialogButtonBox>
 #include <QFile>
@@ -617,22 +617,18 @@ bool handleConfigurationFile(QComboBox& box, const std::filesystem::directory_en
     box.addItem(QString::fromStdString(p.path().filename().string()));
 
     // Add tooltip
-    if (isJson) {
-        std::string tooltipDescription;
-        try {
-            const sgct::config::Meta meta = sgct::readMeta(p.path());
-            tooltipDescription = meta.description;
-        }
-        catch (const sgct::Error&) {
-            tooltipDescription = "(no description available)";
-        }
-        if (!tooltipDescription.empty()) {
-            const QString toolTip = QString::fromStdString(
-                std::format("<p>{}</p>", tooltipDescription)
-            );
-            box.setItemData(box.count() - 1, toolTip, Qt::ToolTipRole);
+    std::string tooltipDescription = "(no description available)";
+    try {
+        sgct::config::Cluster cluster = sgct::readConfig(p.path());
+        if (cluster.meta && cluster.meta->description.has_value()) {
+            tooltipDescription = *cluster.meta->description;
         }
     }
+    catch (const sgct::Error&) {}
+    const QString toolTip = QString::fromStdString(
+        std::format("<p>{}</p>", tooltipDescription)
+    );
+    box.setItemData(box.count() - 1, toolTip, Qt::ToolTipRole);
 
     return true;
 }
@@ -762,9 +758,8 @@ void LauncherWindow::onNewWindowConfigSelection(int newIndex) {
     }
     else {
         try {
-            sgct::config::GeneratorVersion previewGenVersion =
-                sgct::readConfigGenerator(pathSelected);
-            if (!versionCheck(previewGenVersion)) {
+            sgct::config::Cluster c = sgct::readConfig(pathSelected);
+            if (!c.generator || !versionCheck(*c.generator)) {
                 _editWindowButton->setEnabled(false);
                 _editWindowButton->setToolTip(QString::fromStdString(std::format(
                     "This file does not meet the minimum required version of {}.",
@@ -877,36 +872,39 @@ void LauncherWindow::openWindowEditor(const std::string& winCfg, bool isUserWinC
     }
     else {
         try {
-            config::GeneratorVersion previewGenVersion = readConfigGenerator(winCfg);
-            loadFileAndSchemaThenValidate(
+            sgct::config::Cluster cluster;
+            try {
+                cluster = readConfig(winCfg);
+            }
+            catch (const std::runtime_error& e) {
+                // Re-throw an SGCT error exception with the runtime exception message
+                throw std::runtime_error(std::format(
+                    "Importing of this configuration file failed because of a "
+                    "problem detected in the readConfig function:\n\n{}", e.what()
+                ));
+            }
+
+            assert(cluster.generator);
+            std::string err = validateConfigAgainstSchema(
                 winCfg,
-                _configPath / "schema/sgct.schema.json",
-                "This configuration file is unable to generate a proper display"
+                _configPath / "schema/sgct.schema.json"
             );
-            loadFileAndSchemaThenValidate(
-                winCfg,
-                _configPath / "schema/sgcteditor.schema.json",
-                "This configuration file is valid for generating a display, but "
-                "its format does not match the window editor requirements and "
-                "cannot be opened in the editor"
-            );
-            if (versionCheck(previewGenVersion)) {
-                try {
-                    preview = readConfig(
-                        winCfg,
-                        "This configuration file is unable to generate a proper display "
-                        "due to a problem detected in the readConfig function"
-                    );
-                }
-                catch (const std::runtime_error& e) {
-                    //Re-throw an SGCT error exception with the runtime exception message
-                    throw std::runtime_error(std::format(
-                        "Importing of this configuration file failed because of a "
-                        "problem detected in the readConfig function:\n\n{}", e.what()
-                    ));
-                }
+            if (!err.empty()) {
+                editRefusalDialog(
+                    "Format Validation Error",
+                    std::format("Parsing error found in file '{}'", winCfg),
+                    std::format(
+                        "{}\n\nThis configuration file is unable to generate a proper "
+                        "display",
+                        err
+                    )
+                );
+                return;
+            }
+
+            if (versionCheck(*cluster.generator)) {
                 SgctEdit editor = SgctEdit(
-                    preview,
+                    cluster,
                     winCfg,
                     saveWindowPath,
                     this
diff --git a/apps/OpenSpace/ext/launcher/src/sgctedit/sgctedit.cpp b/apps/OpenSpace/ext/launcher/src/sgctedit/sgctedit.cpp
index 5db67f8228..acd57c8794 100644
--- a/apps/OpenSpace/ext/launcher/src/sgctedit/sgctedit.cpp
+++ b/apps/OpenSpace/ext/launcher/src/sgctedit/sgctedit.cpp
@@ -122,6 +122,7 @@ SgctEdit::SgctEdit(sgct::config::Cluster& cluster, std::string configName,
                 wCtrl->setWindowName(w.name.value());
             }
             wCtrl->setDecorationState(w.isDecorated.value());
+            wCtrl->setSpoutOutputState(w.spout.has_value() && w.spout->enabled);
         }
         setupProjectionTypeInGui(w.viewports.back(), wCtrl);
     }
@@ -200,18 +201,12 @@ void SgctEdit::setupProjectionTypeInGui(sgct::config::Viewport& vPort,
         },
         [&](const sgct::config::EquirectangularProjection& p) {
             if (p.quality) {
-                wCtrl->setProjectionEquirectangular(
-                    *p.quality,
-                    false
-                );
+                wCtrl->setProjectionEquirectangular(*p.quality);
             }
         },
         [&](const sgct::config::FisheyeProjection& p) {
             if (p.quality) {
-                wCtrl->setProjectionFisheye(
-                    *p.quality,
-                    false
-                );
+                wCtrl->setProjectionFisheye(*p.quality);
             }
         },
         [&](const sgct::config::PlanarProjection& p) {
@@ -227,29 +222,9 @@ void SgctEdit::setupProjectionTypeInGui(sgct::config::Viewport& vPort,
                 );
             }
         },
-        [&](const sgct::config::SpoutOutputProjection& p) {
-            if (p.quality) {
-                if (p.mapping ==
-                    sgct::config::SpoutOutputProjection::Mapping::Equirectangular)
-                {
-                    wCtrl->setProjectionEquirectangular(
-                        *p.quality,
-                        true
-                    );
-                }
-                else if (p.mapping ==
-                         sgct::config::SpoutOutputProjection::Mapping::Fisheye)
-                {
-                    wCtrl->setProjectionFisheye(
-                        *p.quality,
-                        true
-                    );
-                }
-            }
-        },
         [&](const sgct::config::NoProjection&) {},
         [&](const sgct::config::ProjectionPlane&) {},
-        [&](const sgct::config::SpoutFlatProjection&) {}
+        [&](const sgct::config::CubemapProjection&) {},
     }, vPort.projection);
 }
 
diff --git a/apps/OpenSpace/ext/launcher/src/sgctedit/windowcontrol.cpp b/apps/OpenSpace/ext/launcher/src/sgctedit/windowcontrol.cpp
index d66e350306..d8fcf6cf63 100644
--- a/apps/OpenSpace/ext/launcher/src/sgctedit/windowcontrol.cpp
+++ b/apps/OpenSpace/ext/launcher/src/sgctedit/windowcontrol.cpp
@@ -289,6 +289,16 @@ void WindowControl::createWidgets(const QColor& windowColor) {
         );
         layout->addWidget(_windowDecoration, 5, 0, 1, 8);
     }
+    {
+        _spoutOutput = new QCheckBox("Spout Output");
+        _spoutOutput->setToolTip(
+            "Share this window using the Spout library.\nThis library only supports the "
+            "Windows operating system. Spout makes it possible to make the rendered\n"
+            "images available to other real-time applications on the same machine for "
+            "further processing"
+        );
+        layout->addWidget(_spoutOutput);
+    }
     {
         QFrame* projectionGroup = new QFrame;
         projectionGroup->setVisible(true);
@@ -458,15 +468,6 @@ QWidget* WindowControl::createFisheyeWidget() {
     _fisheye.quality->setCurrentIndex(2);
     layout->addWidget(_fisheye.quality, 1, 1);
 
-    _fisheye.spoutOutput = new QCheckBox("Spout Output");
-    _fisheye.spoutOutput->setToolTip(
-        "This projection method provides the ability to share the reprojected image "
-        "using the Spout library.\nThis library only supports the Windows operating "
-        "system. Spout makes it possible to make the rendered\nimages available to other "
-        "real-time applications on the same machine for further processing"
-    );
-    layout->addWidget(_fisheye.spoutOutput, 2, 0, 1, 2);
-
     return widget;
 }
 
@@ -593,15 +594,6 @@ QWidget* WindowControl::createEquirectangularWidget() {
     _equirectangular.quality->setCurrentIndex(2);
     layout->addWidget(_equirectangular.quality, 1, 1);
 
-    _equirectangular.spoutOutput = new QCheckBox("Spout Output");
-    _equirectangular.spoutOutput->setToolTip(
-        "This projection method provides the ability to share the reprojected image "
-        "using the Spout library.\nThis library only supports the Windows operating "
-        "system. Spout makes it possible to make the rendered\nimages available to other "
-        "real-time applications on the same machine for further processing"
-    );
-    layout->addWidget(_equirectangular.spoutOutput, 2, 0, 1, 2);
-
     return widget;
 }
 
@@ -629,8 +621,7 @@ void WindowControl::resetToDefaults() {
         _monitor->setCurrentIndex(_monitorIndexDefault);
     }
     _windowDecoration->setChecked(true);
-    _fisheye.spoutOutput->setChecked(false);
-    _equirectangular.spoutOutput->setChecked(false);
+    _spoutOutput->setChecked(false);
     _projectionType->setCurrentIndex(static_cast<int>(ProjectionIndices::Planar));
     _planar.fovV->setValue(DefaultFovLongEdge);
     _planar.fovV->setValue(DefaultFovShortEdge);
@@ -666,28 +657,18 @@ void WindowControl::setDecorationState(bool hasWindowDecoration) {
     _windowDecoration->setChecked(hasWindowDecoration);
 }
 
+void WindowControl::setSpoutOutputState(bool shouldSpoutOutput) {
+    _spoutOutput->setChecked(shouldSpoutOutput);
+}
+
 sgct::config::Projections WindowControl::generateProjectionInformation() const {
     const ProjectionIndices type =
         static_cast<WindowControl::ProjectionIndices>(_projectionType->currentIndex());
 
-    const bool isSpoutFisheye =
-        type == ProjectionIndices::Fisheye && _fisheye.spoutOutput->isChecked();
-    const bool isSpoutEquirectangular =
-        type == ProjectionIndices::Equirectangular &&
-        _equirectangular.spoutOutput->isChecked();
-
-    using namespace sgct::config;
     switch (type) {
         case ProjectionIndices::Fisheye:
-            if (isSpoutFisheye) {
-                SpoutOutputProjection projection;
-                projection.mapping = SpoutOutputProjection::Mapping::Fisheye;
-                projection.quality = QualityValues[_fisheye.quality->currentIndex()];
-                projection.mappingSpoutName = "OpenSpace";
-                return projection;
-            }
-            else {
-                FisheyeProjection projection;
+            {
+                sgct::config::FisheyeProjection projection;
                 projection.quality = QualityValues[_fisheye.quality->currentIndex()];
                 projection.fov = 180.f;
                 projection.tilt = 0.f;
@@ -695,29 +676,21 @@ sgct::config::Projections WindowControl::generateProjectionInformation() const {
             }
         case ProjectionIndices::SphericalMirror:
             {
-                SphericalMirrorProjection projection;
+                sgct::config::SphericalMirrorProjection projection;
                 projection.quality =
                     QualityValues[_sphericalMirror.quality->currentIndex()];
                 return projection;
             }
         case ProjectionIndices::Cylindrical:
             {
-                CylindricalProjection projection;
+                sgct::config::CylindricalProjection projection;
                 projection.quality = QualityValues[_cylindrical.quality->currentIndex()];
                 projection.heightOffset = _cylindrical.heightOffset->text().toFloat();
                 return projection;
             }
         case ProjectionIndices::Equirectangular:
-            if (isSpoutEquirectangular) {
-                SpoutOutputProjection projection;
-                projection.mapping = SpoutOutputProjection::Mapping::Equirectangular;
-                projection.quality =
-                    QualityValues[_equirectangular.quality->currentIndex()];
-                projection.mappingSpoutName = "OpenSpace";
-                return projection;
-            }
-            else {
-                EquirectangularProjection projection;
+            {
+                sgct::config::EquirectangularProjection projection;
                 projection.quality =
                     QualityValues[_equirectangular.quality->currentIndex()];
                 return projection;
@@ -731,7 +704,7 @@ sgct::config::Projections WindowControl::generateProjectionInformation() const {
                 fovV = std::clamp(fovV, FovEpsilon, 180.0 - FovEpsilon);
 
                 // The negative values for left & down are due to SGCT's convention
-                PlanarProjection projection;
+                sgct::config::PlanarProjection projection;
                 projection.fov.right = fovH / 2.0;
                 projection.fov.left = -projection.fov.right;
                 projection.fov.up = fovV / 2.0;
@@ -761,6 +734,10 @@ void WindowControl::generateWindowInformation(sgct::config::Window& window) cons
     window.viewports.push_back(vp);
     
     window.isDecorated = _windowDecoration->isChecked();
+    if (_spoutOutput->isChecked()) {
+        window.spout = sgct::config::Window::Spout();
+        window.spout->enabled = true;
+    }
     if (!_windowName->text().isEmpty()) {
         window.name = _windowName->text().toStdString();
     }
@@ -772,9 +749,8 @@ void WindowControl::setProjectionPlanar(float hfov, float vfov) {
     _projectionType->setCurrentIndex(static_cast<int>(ProjectionIndices::Planar));
 }
 
-void WindowControl::setProjectionFisheye(int quality, bool spoutOutput) {
+void WindowControl::setProjectionFisheye(int quality) {
     setQualityComboBoxFromLinesResolution(quality, _fisheye.quality);
-    _fisheye.spoutOutput->setChecked(spoutOutput);
     _projectionType->setCurrentIndex(static_cast<int>(ProjectionIndices::Fisheye));
 }
 
@@ -791,9 +767,8 @@ void WindowControl::setProjectionCylindrical(int quality, float heightOffset) {
     _projectionType->setCurrentIndex(static_cast<int>(ProjectionIndices::Cylindrical));
 }
 
-void WindowControl::setProjectionEquirectangular(int quality, bool spoutOutput) {
+void WindowControl::setProjectionEquirectangular(int quality) {
     setQualityComboBoxFromLinesResolution(quality, _equirectangular.quality);
-    _equirectangular.spoutOutput->setChecked(spoutOutput);
     _projectionType->setCurrentIndex(
         static_cast<int>(ProjectionIndices::Equirectangular)
     );
@@ -810,7 +785,6 @@ void WindowControl::setVisibilityOfProjectionGui(bool enable) {
     _fisheye.labelInfo->setVisible(enable);
     _fisheye.quality->setVisible(enable);
     _fisheye.labelQuality->setVisible(enable);
-    _fisheye.spoutOutput->setVisible(enable);
     _sphericalMirror.labelInfo->setVisible(enable);
     _sphericalMirror.quality->setVisible(enable);
     _sphericalMirror.labelQuality->setVisible(enable);
@@ -822,7 +796,6 @@ void WindowControl::setVisibilityOfProjectionGui(bool enable) {
     _equirectangular.labelInfo->setVisible(enable);
     _equirectangular.quality->setVisible(enable);
     _equirectangular.labelQuality->setVisible(enable);
-    _equirectangular.spoutOutput->setVisible(enable);
 
     _projectionLabel->setVisible(!enable);
 }
diff --git a/apps/OpenSpace/ext/sgct b/apps/OpenSpace/ext/sgct
index f6f997c588..a7e96b7d07 160000
--- a/apps/OpenSpace/ext/sgct
+++ b/apps/OpenSpace/ext/sgct
@@ -1 +1 @@
-Subproject commit f6f997c588c9731794120a6b08f982385a97860a
+Subproject commit a7e96b7d07ddfd1d20df253fc35c0252358fb740
diff --git a/apps/OpenSpace/main.cpp b/apps/OpenSpace/main.cpp
index 5d991703e7..3918027d29 100644
--- a/apps/OpenSpace/main.cpp
+++ b/apps/OpenSpace/main.cpp
@@ -90,7 +90,7 @@ constexpr std::string_view OpenVRTag = "OpenVR";
 // @TODO (abock, 2020-04-09): These state variables should disappear
 const Window* currentWindow = nullptr;
 const BaseViewport* currentViewport = nullptr;
-Frustum::Mode currentFrustumMode;
+FrustumMode currentFrustumMode;
 glm::mat4 currentModelMatrix;
 glm::ivec2 currentDrawResolution;
 
@@ -459,7 +459,7 @@ void mainRenderFunc(const sgct::RenderData& data) {
     glm::mat4 viewMatrix;
     std::memcpy(
         glm::value_ptr(viewMatrix),
-        data.viewMatrix.values,
+        data.viewMatrix.values.data(),
         sizeof(mat4)
     );
     viewMatrix = viewMatrix * glm::translate(glm::mat4(1.f), pos);
@@ -467,7 +467,7 @@ void mainRenderFunc(const sgct::RenderData& data) {
     glm::mat4 projectionMatrix;
     std::memcpy(
         glm::value_ptr(projectionMatrix),
-        data.projectionMatrix.values,
+        data.projectionMatrix.values.data(),
         sizeof(mat4)
     );
 #ifdef OPENVR_SUPPORT
@@ -483,7 +483,7 @@ void mainRenderFunc(const sgct::RenderData& data) {
         glm::mat4 modelMatrix;
         std::memcpy(
             glm::value_ptr(modelMatrix),
-            data.modelMatrix.values,
+            data.modelMatrix.values.data(),
             sizeof(mat4)
         );
         currentModelMatrix = modelMatrix;
@@ -499,12 +499,12 @@ void mainRenderFunc(const sgct::RenderData& data) {
 
             if (w.leftOrMain.isCreated() && w.leftOrMain.updateSenderSize(width, height))
             {
-                GLuint texId = window.frameBufferTexture(Window::TextureIndex::LeftEye);
+                GLuint texId = window.frameBufferTextureEye(Eye::MonoOrLeft);
                 w.leftOrMain.updateSender(texId, static_cast<int>(GL_TEXTURE_2D));
             }
 
             if (w.right.isCreated() && w.right.updateSenderSize(width, height)) {
-                GLuint texId = window.frameBufferTexture(Window::TextureIndex::RightEye);
+                GLuint texId = window.frameBufferTextureEye(Eye::Right);
                 w.right.updateSender(texId, static_cast<int>(GL_TEXTURE_2D));
             }
 
@@ -731,7 +731,10 @@ void setSgctDelegateFunctions() {
     sgctDelegate.currentWindowSize = []() {
         ZoneScoped;
 
-        return glm::ivec2(currentWindow->resolution().x, currentWindow->resolution().y);
+        return glm::ivec2(
+            currentWindow->windowResolution().x,
+            currentWindow->windowResolution().y
+        );
     };
     sgctDelegate.currentSubwindowSize = []() {
         ZoneScoped;
@@ -740,19 +743,19 @@ void setSgctDelegateFunctions() {
             case Window::StereoMode::SideBySide:
             case Window::StereoMode::SideBySideInverted:
                 return glm::ivec2(
-                    currentWindow->resolution().x / 2,
-                    currentWindow->resolution().y
+                    currentWindow->windowResolution().x / 2,
+                    currentWindow->windowResolution().y
                 );
             case Window::StereoMode::TopBottom:
             case Window::StereoMode::TopBottomInverted:
                 return glm::ivec2(
-                    currentWindow->resolution().x,
-                    currentWindow->resolution().y / 2
+                    currentWindow->windowResolution().x,
+                    currentWindow->windowResolution().y / 2
                 );
             default:
                 return glm::ivec2(
-                    currentWindow->resolution().x * currentViewport->size().x,
-                    currentWindow->resolution().y * currentViewport->size().y
+                    currentWindow->windowResolution().x * currentViewport->size().x,
+                    currentWindow->windowResolution().y * currentViewport->size().y
                 );
         }
     };
@@ -766,7 +769,7 @@ void setSgctDelegateFunctions() {
                 return glm::ivec2(dim.x, dim.y);
             }
             else {
-                const ivec2 dim = currentWindow->finalFBODimensions();
+                const ivec2 dim = currentWindow->framebufferResolution();
                 return glm::ivec2(dim.x, dim.y);
             }
         }
@@ -787,7 +790,7 @@ void setSgctDelegateFunctions() {
         ZoneScoped;
 
         if (currentViewport) {
-            const ivec2 res = currentWindow->resolution();
+            const ivec2 res = currentWindow->windowResolution();
             const vec2 size = currentViewport->size();
             return glm::ivec2(size.x * res.x, size.y * res.y);
         }
@@ -802,23 +805,23 @@ void setSgctDelegateFunctions() {
     sgctDelegate.firstWindowResolution = []() {
         ZoneScoped;
         sgct::Window* window = Engine::instance().windows().front().get();
-        return glm::ivec2(window->resolution().x, window->resolution().y);
+        return glm::ivec2(window->windowResolution().x, window->windowResolution().y);
     };
     sgctDelegate.guiWindowResolution = []() {
         ZoneScoped;
-        const Window* guiWindow = nullptr;
+        const Window* guiWin = nullptr;
         for (const std::unique_ptr<Window>& window : Engine::instance().windows()) {
             if (window->hasTag("GUI")) {
-                guiWindow = window.get();
+                guiWin = window.get();
                 break;
             }
         }
 
-        if (!guiWindow) {
-            guiWindow = Engine::instance().windows().front().get();
+        if (!guiWin) {
+            guiWin = Engine::instance().windows().front().get();
         }
 
-        return glm::ivec2(guiWindow->resolution().x, guiWindow->resolution().y);
+        return glm::ivec2(guiWin->windowResolution().x, guiWin->windowResolution().y);
     };
     sgctDelegate.osDpiScaling = []() {
         ZoneScoped;
@@ -956,9 +959,9 @@ void setSgctDelegateFunctions() {
 
         switch (currentFrustumMode) {
             default:
-            case Frustum::Mode::MonoEye: return WindowDelegate::Frustum::Mono;
-            case Frustum::Mode::StereoLeftEye: return WindowDelegate::Frustum::LeftEye;
-            case Frustum::Mode::StereoRightEye: return WindowDelegate::Frustum::RightEye;
+            case FrustumMode::Mono: return WindowDelegate::Frustum::Mono;
+            case FrustumMode::StereoLeft: return WindowDelegate::Frustum::LeftEye;
+            case FrustumMode::StereoRight: return WindowDelegate::Frustum::RightEye;
         }
     };
     sgctDelegate.swapGroupFrameNumber = []() -> uint64_t {
@@ -983,7 +986,7 @@ void setSgctDelegateFunctions() {
                 continue;
             }
 
-            const sgct::ivec2 res = window->resolution();
+            const sgct::ivec2 res = window->windowResolution();
             for (const std::unique_ptr<Viewport>& viewport : window->viewports()) {
                 const sgct::vec2 pos = viewport->position();
                 const sgct::vec2 size = viewport->size();
@@ -1489,7 +1492,7 @@ int main(int argc, char* argv[]) {
     LDEBUG("Creating SGCT Engine");
     std::vector<std::string> arg(argv + 1, argv + argc);
     LDEBUG("Parsing commandline arguments");
-    const sgct::Configuration config = parseArguments(arg);
+    sgct::Configuration config = parseArguments(arg);
     LDEBUG("Loading cluster information");
     config::Cluster cluster = loadCluster(absPath(windowConfiguration).string());
 
@@ -1512,6 +1515,11 @@ int main(int argc, char* argv[]) {
     };
     Log::instance().setNotifyLevel(Log::Level::Debug);
 
+    // Do not print message if clients are waiting for the master
+    config.printWaitMessage = config.printWaitMessage.value_or(false);
+    // Only timeout after 15 minutes
+    config.waitTimeout = config.waitTimeout.value_or(15.f * 60.f);
+
     try {
         Engine::create(std::move(cluster), std::move(callbacks), config);
     }
@@ -1553,11 +1561,6 @@ int main(int argc, char* argv[]) {
     }
 #endif // __APPLE__
 
-
-    // Do not print message if clients are waiting for the master
-    // Only timeout after 15 minutes
-    Engine::instance().setSyncParameters(false, 15.f * 60.f);
-
     LINFO("Starting rendering loop");
     Engine::instance().exec();
     LINFO("Ending rendering loop");
diff --git a/config/schema/sgcteditor.schema.json b/config/schema/sgcteditor.schema.json
deleted file mode 100644
index b8b0eb3672..0000000000
--- a/config/schema/sgcteditor.schema.json
+++ /dev/null
@@ -1,325 +0,0 @@
-{
-  "$id": "schema2e",
-
-  "$defs": {
-    "cylindricalprojection": {
-      "type": "object",
-      "properties": {
-        "type": {
-          "type": "string",
-          "const": "CylindricalProjection",
-          "default": "CylindricalProjection",
-          "readOnly": true
-        },
-        "quality": {
-          "$ref": "sgct.schema.json#/$defs/projectionquality"
-        },
-        "heightOffset": {
-          "type": "number",
-          "title": "Height Offset",
-          "description": "Offsets the height from which the cylindrical projection is generated. This is, in general, only necessary if the user position is offset and you want to counter that offset to continue producing a “standard” cylindrical projection"
-        }
-      },
-      "required": [ "type" ],
-      "additionalProperties": false,
-      "description": "This projection method renders the scene into a view that can be mapped on the inside or outside of a cylinder. This projection method is support by some live media curation tools. The forward-facing direction will be at the left border of the image unless changed via the rotation option"
-    },
-  
-    "fisheyeprojection": {
-      "type": "object",
-      "properties": {
-        "type": {
-          "type": "string",
-          "const": "FisheyeProjection",
-          "default": "FisheyeProjection",
-          "readOnly": true
-        },
-        "quality": {
-          "$ref": "sgct.schema.json#/$defs/projectionquality"
-        }
-      },
-      "required": [ "type" ],
-      "additionalProperties": false,
-      "description": "Describes a fisheye projection that is used to render into its parent Viewport. This uses a default of 180 degrees field of view and has a 1:1 aspect ratio. This projection type counts as a non-linear projection, which requires 4-6 render passes of the application, meaning that the application might render slower when using these kind of projections than a flat projection. In either case, the application does not need to be aware of the projection as this abstract is handled internally and the applications draw method is only called multiple times per frame with different projection methods that are used to create the full fisheye projection"
-    },
-  
-    "planarprojection": {
-      "type": "object",
-      "properties": {
-        "type": {
-          "type": "string",
-          "const": "PlanarProjection",
-          "default": "PlanarProjection",
-          "readOnly": true
-        },
-        "fov": {
-          "$ref": "sgct.schema.json#/$defs/fovhorizontalvertical",
-          "title": "Camera Field-of-View",
-          "description": "This element describes the field of view used the camera in this planar projection"
-        }
-      },
-      "additionalProperties": false,
-      "description": "Describes a projection for the Viewport that is a flat projection described by simple frustum, which may be asymmetric"
-    },
-  
-    "sphericalmirrorprojection": {
-      "type": "object",
-      "properties": {
-        "type": {
-          "type": "string",
-          "const": "SphericalMirrorProjection",
-          "default": "SphericalMirrorProjection",
-          "readOnly": true
-        },
-        "quality": {
-          "$ref": "sgct.schema.json#/$defs/projectionquality"
-        }
-      },
-      "required": [ "type" ],
-      "additionalProperties": false,
-      "description": "Used to create a projection used for Paul Bourke's spherical mirror setup (see here), which makes it possible to use an off-the-shelf projector to create a planetarium-like environment by bouncing the image of a shiny metal mirror. Please note that this is not the only way to produce these kind of images. Depending on your setup and availability of warping meshes, it might suffice to use the FisheyeProjection node type instead and add a single mesh to the parent Viewport instead. The config folder in SGCT contains an example of this using a default 16x9 warping mesh. This projection type specifically deals with the case where you have four different meshes, one for the bottom, top, left, and right parts of the distorted image"
-    },
-  
-    "spoutoutputprojection": {
-      "type": "object",
-      "properties": {
-        "type": {
-          "type": "string",
-          "const": "SpoutOutputProjection",
-          "default": "SpoutOutputProjection",
-          "readOnly": true
-        },
-        "quality": {
-          "$ref": "sgct.schema.json#/$defs/projectionquality"
-        },
-        "mapping": {
-          "type": "string",
-          "enum": [ "fisheye", "equirectangular" ],
-          "title": "Mapping",
-          "description": "Determines the type of sharing that occurs with this projection and thus how many and which texture is shared via Spout. For the “fisheye” and “equirectangular”, only the single, final reprojected image is shared, for the “cubemap” method, all selected cubemaps will be provided through the Spout interface. The default value is “cubemap”"
-        },
-        "mappingspoutname": {
-          "type": "string",
-          "title": "Mapping Spout Name",
-          "description": "Sets the name of the texture if the mapping type is 'fisheye' or 'equirectangular'. If the mapping is 'cubemap', this value is ignored"
-        }
-      },
-      "required": [ "type", "mapping" ],
-      "additionalProperties": false,
-      "description": "Provides the ability to share a fully reprojected image using the Spout library. This library only supports the Windows operating system, so this projection will only work on Windows machines. Spout's functionality is the abilty to shared textures between different applications on the same machine, making it possible to render images using SGCT and making them available to other real-time applications on the same machine for further processing. Spout uses a textual name for accessing which texture should be used for sharing. The SpoutOutputProjection has three different output types, outputting each cube map face, sharing a fisheye image, or sharing an equirectangular projection, as determined by the mapping attribute"
-    },
-  
-    "projection": {
-      "oneOf": [
-        {
-          "$ref": "#/$defs/planarprojection",
-          "title": "Planar Projection"
-        },
-        {
-          "$ref": "#/$defs/fisheyeprojection",
-          "title": "Fisheye Projection"
-        },
-        {
-          "$ref": "#/$defs/sphericalmirrorprojection",
-          "title": "Spherical Mirror Projection"
-        },
-        {
-          "$ref": "#/$defs/spoutoutputprojection",
-          "title": "Spout Output Projection"
-        },
-        {
-          "$ref": "#/$defs/cylindricalprojection",
-          "title": "Cylindrical Projection"
-        },
-        {
-          "$ref": "sgct.schema.json#/$defs/equirectangularprojection",
-          "title": "Equirectangular Projection"
-        }
-      ],
-      "title": "Projection"
-    },
-  
-    "node": {
-      "type": "object",
-      "properties": {
-        "address": {
-          "$ref": "sgct.schema.json#/$defs/address"
-        },
-        "port": {
-          "$ref": "sgct.schema.json#/$defs/port"
-        },
-        "windows": {
-          "type": "array",
-          "items": {
-            "type": "object",
-            "properties": {
-              "border": {
-                "$ref": "sgct.schema.json#/$defs/windowborder"
-              },
-              "draw2d": {
-                "$ref": "sgct.schema.json#/$defs/draw2d"
-              },
-              "draw3d": {
-                "$ref": "sgct.schema.json#/$defs/draw3d"
-              },
-              "monitor": {
-                "$ref": "sgct.schema.json#/$defs/monitor"
-              },
-              "id": {
-                "$ref": "sgct.schema.json#/$defs/id"
-              },
-              "name": {
-                "$ref": "sgct.schema.json#/$defs/windowname"
-              },
-              "pos": {
-                "$ref": "sgct.schema.json#/$defs/windowpos"
-              },
-              "size": {
-                "$ref": "sgct.schema.json#/$defs/windowsize"
-              },
-              "tags": {
-                "$ref": "sgct.schema.json#/$defs/tags"
-              },
-              "viewports": {
-                "type": "array",
-                "items": {
-                  "type": "object",
-                  "properties": {
-                    "pos": {
-                      "$ref": "sgct.schema.json#/$defs/viewportpos"
-                    },
-                    "size": {
-                      "$ref": "sgct.schema.json#/$defs/viewportsize"
-                    },
-                    "projection": {
-                      "$ref": "sgct.schema.json#/$defs/projection"
-                    },
-                    "tracked": {
-                      "$ref": "sgct.schema.json#/$defs/tracked"
-                    }
-                  }
-                },
-                "title": "Viewports"
-              }
-            },
-	    "required": [ "pos", "size", "viewports" ]
-  	},
-          "title": "Windows",
-          "description": "Specifies a single window that is used to render content into. There can be an arbitrary(-ish) number of windows for each node and they all will be created and initialized at start time. Each window has at least one Viewport that specifies exactly where in the window the rendering occurs with which parameters"
-        }
-      },
-      "required": [ "address", "port", "windows" ],
-      "additionalProperties": false,
-      "description": "Defines a single computing node that is contained in the described cluster. In general this corresponds to a single computer, but it is also possible to create multiple nodes on a local machine by using the 127.0.0.x IP address with x from 0 to 255. It is not possible to create multiple nodes on the same remote computer, however"
-    },
-  
-    "scene": {
-      "type": "object",
-      "properties": {
-        "orientation": {
-          "$ref": "sgct.schema.json#/$defs/quat",
-          "title": "Orientation",
-          "description": "Describes a fixed orientation of the global scene"
-        }
-      },
-      "required": [ "orientation" ],
-      "additionalProperties": false,
-      "description": "Determines an overall orientation of the scene. It consists only of an Orientation, which is included in the projection matrix that is passed to the rendering function callback of the specific application. This node can be used to customize the rendering for a specific rendering window. A common use-case in planetariums, for example, is to account for a tilt in the display system by providing an Orientation with the same pitch as the planetarium surface. This makes it possible to reuse the same application between the planetarium dome and fixed setups without the need for special care"
-    },
-  
-    "display": {
-      "type": "object",
-      "properties": {
-        "swapinterval": {
-          "type": "integer",
-          "minimum": 0,
-          "title": "Swap Interval",
-          "description": "Determines the swap interval for the application. This determines the amount of V-Sync that should occur for the application. The two most common values for this are 0 for disabling V-Sync and 1 for regular V-Sync. The number provided determines the number of screen updates to wait before swapping the backbuffers and returning. For example on a 60Hz monitor, swapinterval=\"1\" would lead to a maximum of 60Hz frame rate, swapinterval=\"2\" would lead to a maximum of 30Hz frame rate. Using the same values for a 144Hz monitor would be a refresh rate of 144 and 72 respectively. The default value is 0, meaning that V-Sync is disabled"
-        }
-      },
-      "title": "Display",
-      "additionalProperties": false,
-      "description": "Settings specific for the handling of display-related settings for the whole application"
-    },
-  
-    "settings": {
-      "type": "object",
-      "properties": {
-        "display": {
-          "$ref": "#/$defs/display"
-        }
-      },
-      "additionalProperties": false,
-      "description": "Controls global settings that affect the overall behavior of the SGCT library that are not limited just to a single window"
-    },
-
-    "user": {
-      "type": "object",
-      "properties": {
-        "name": {
-          "type": "string",
-          "title": "Name",
-          "description": "Specifies the name of this user. Each user needs to have a unique name, but there also has to be exactly one user present that has an empty name (or without a name attribute) which is used as the default user"
-        },
-        "eyeseparation": {
-          "type": "number",
-          "minimum": 0.0,
-          "title": "Eye Separation",
-          "description": "Determines the eye separation used for stereoscopic viewports. If no viewports in the configuration are using stereo, this setting is ignored"
-        },
-        "pos": {
-          "$ref": "sgct.schema.json#/$defs/vec3",
-          "title": "Position",
-          "description": "A linear offset of the user position. Must define three float attributes x, y, and z. The default values are x=0, y=0, z=0, meaning that no linear offset is applied to the user's position"
-        }
-      },
-      "additionalProperties": false,
-      "required": [ "pos" ],
-      "description": "Specifies a user position and parameters. In most cases, only a single unnamed user is necessary. However, in more general cases, it is possible to assign Users to specific Viewports to provide a more fine-grained control over the rendering that occurs in that viewport"
-    }
-  },
-
-  "type": "object",
-  "properties": {
-    "masteraddress": {
-      "$ref": "sgct.schema.json#/$defs/masteraddress"
-    },
-    "nodes": {
-      "type": "array",
-      "items": { "$ref": "#/$defs/node" },
-      "title": "Nodes"
-    },
-    "scene": {
-      "$ref": "#/$defs/scene",
-      "title": "Scene"
-    },
-    "settings": {
-      "$ref": "#/$defs/settings",
-      "title": "Settings"
-    },
-    "version": {
-      "type": "integer"
-    },
-    "users": {
-      "type": "array",
-      "items": { "$ref": "#/$defs/user" },
-      "title": "Users"
-    },
-    "generator": {
-      "type": "object",
-      "properties": {
-        "name": { "type": "string" },
-        "major": { "type": "integer" },
-        "minor": { "type": "integer" }
-      },
-      "required": [ "name", "major", "minor" ]
-    },
-    "meta": {
-      "$ref": "sgct.schema.json#/$defs/meta"
-    }
-  },
-  "additionalProperties": false,
-  "required": [
-    "version", "masteraddress", "scene", "users", "generator"
-  ]
-}
diff --git a/config/spout_output_cubemap.json b/config/spout_output_cubemap.json
index 83cfcdd35d..5190094c2f 100644
--- a/config/spout_output_cubemap.json
+++ b/config/spout_output_cubemap.json
@@ -18,20 +18,14 @@
       "windows": [
         {
           "name": "OpenSpace",
-          "size": { "x": 1024, "y": 1024 },
+          "size": { "x": 1800, "y": 600 },
           "stereo": "none",
           "viewports": [
             {
               "pos": { "x": 0.0, "y": 0.0 },
               "size": { "x": 1.0, "y": 1.0 },
               "projection": {
-                "type": "SpoutOutputProjection",
-                "background": {
-                  "r": 0.1,
-                  "g": 0.1,
-                  "b": 0.1,
-                  "a": 1.0
-                },
+                "type": "CubemapProjection",
                 "channels": {
                   "bottom": true,
                   "left": true,
@@ -40,8 +34,14 @@
                   "zleft": true,
                   "zright": true
                 },
-                "mapping": "cubemap",
-                "mappingspoutname": "OS_CUBEMAP",
+                "spout": {
+                  "enabled": true,
+                  "name": "OS_SPOUT"
+                },
+                "ndi": {
+                  "enabled": true,
+                  "name": "OS_NDI"
+                },
                 "orientation": { "pitch": 0.0, "roll": 0.0, "yaw": 0.0 },
                 "quality": "1024"
               }
diff --git a/config/spout_output_equirectangular.json b/config/spout_output_equirectangular.json
deleted file mode 100644
index 1cf7436a75..0000000000
--- a/config/spout_output_equirectangular.json
+++ /dev/null
@@ -1,67 +0,0 @@
-{
-  "version": 1,
-  "masteraddress": "localhost",
-  "scene": {
-    "offset": { "x": 0.0, "y": 0.0, "z": 0.0 },
-    "orientation": { "yaw": 0.0, "pitch": -90.0, "roll": 0.0 },
-    "scale": 1.0
-  },
-  "settings": {
-    "display": {
-      "swapinterval": 1
-    }
-  },
-  "nodes": [
-    {
-      "address": "localhost",
-      "port": 20401,
-      "windows": [
-        {
-          "name": "OpenSpace",
-          "size": { "x": 1024, "y": 1024 },
-          "stereo": "none",
-          "viewports": [
-            {
-              "pos": { "x": 0.0, "y": 0.0 },
-              "size": { "x": 1.0, "y": 1.0 },
-              "projection": {
-                "type": "SpoutOutputProjection",
-                "background": {
-                  "r": 0.1,
-                  "g": 0.1,
-                  "b": 0.1,
-                  "a": 1.0
-                },
-                "channels": {
-                  "bottom": true,
-                  "left": true,
-                  "right": true,
-                  "top": true,
-                  "zleft": true,
-                  "zright": true
-                },
-                "mapping": "equirectangular",
-                "mappingspoutname": "OS_EQUIRECTANGULAR",
-                "orientation": { "pitch": 0.0, "roll": 0.0, "yaw": 0.0 },
-                "quality": "1024"
-              }
-            }
-          ]
-        }
-      ]
-    }
-  ],
-  "users": [
-    {
-      "eyeseparation": 0.06,
-      "pos": { "x": 0.0, "y": 0.0, "z": 0.0 }
-    }
-  ],
-  "meta": {
-    "author": "OpenSpace Team",
-    "description": "A single 1024x1024 window with Spout output equirectangular projection rendering.",
-    "license": "MIT License",
-    "name": "Equirectangular Spout",
-    "version": "1.0"
-  }
-}
diff --git a/config/spout_output_fisheye.json b/config/spout_output_fisheye.json
deleted file mode 100644
index 584bf5b8f9..0000000000
--- a/config/spout_output_fisheye.json
+++ /dev/null
@@ -1,67 +0,0 @@
-{
-  "version": 1,
-  "masteraddress": "localhost",
-  "scene": {
-    "offset": { "x": 0.0, "y": 0.0, "z": 0.0 },
-    "orientation": { "yaw": 0.0, "pitch": 0.0, "roll": 0.0 },
-    "scale": 1.0
-  },
-  "settings": {
-    "display": {
-      "swapinterval": 1
-    }
-  },
-  "nodes": [
-    {
-      "address": "localhost",
-      "port": 20401,
-      "windows": [
-        {
-          "name": "OpenSpace",
-          "size": { "x": 1024, "y": 1024 },
-          "stereo": "none",
-          "viewports": [
-            {
-              "pos": { "x": 0.0, "y": 0.0 },
-              "size": { "x": 1.0, "y": 1.0 },
-              "projection": {
-                "type": "SpoutOutputProjection",
-                "background": {
-                  "r": 0.1,
-                  "g": 0.1,
-                  "b": 0.1,
-                  "a": 1.0
-                },
-                "channels": {
-                  "bottom": false,
-                  "left": true,
-                  "right": true,
-                  "top": true,
-                  "zleft": true,
-                  "zright": false
-                },
-                "mapping": "fisheye",
-                "mappingspoutname": "OS_FISHEYE",
-                "orientation": { "pitch": 0.0, "roll": 0.0, "yaw": 45.0 },
-                "quality": "1024"
-              }
-            }
-          ]
-        }
-      ]
-    }
-  ],
-  "users": [
-    {
-      "eyeseparation": 0.06,
-      "pos": { "x": 0.0, "y": 0.0, "z": 0.0 }
-    }
-  ],
-  "meta": {
-    "author": "OpenSpace Team",
-    "description": "A single 1024x1024 window with Spout output fisheye projection rendering.",
-    "license": "MIT License",
-    "name": "Fisheye Spout",
-    "version": "1.0"
-  }
-}
diff --git a/config/spout_output_flat.json b/config/spout_output_flat.json
deleted file mode 100644
index 9a953b616a..0000000000
--- a/config/spout_output_flat.json
+++ /dev/null
@@ -1,66 +0,0 @@
-{
-  "version": 1,
-  "masteraddress": "localhost",
-  "scene": {
-    "offset": { "x": 0.0, "y": 0.0, "z": 0.0 },
-    "orientation": { "yaw": 0.0, "pitch": 0.0, "roll": 0.0 },
-    "scale": 1.0
-  },
-  "settings": {
-    "display": {
-      "swapinterval": 1
-    }
-  },
-  "nodes": [
-    {
-      "address": "localhost",
-      "port": 20401,
-      "windows": [
-        {
-          "name": "OpenSpace",
-          "size": { "x": 1440, "y": 810 },
-          "stereo": "none",
-          "viewports": [
-            {
-              "pos": { "x": 0.0, "y": 0.0 },
-              "size": { "x": 1.0, "y": 1.0 },
-              "projection": {
-                "type": "SpoutFlatProjection",
-                "planarprojection": {
-                  "fov": {
-                    "hfov": 80.0,
-                    "vfov": 50.534015846724
-                  },
-                  "orientation": { "yaw": 0.0, "pitch": 0.0, "roll": 0.0 }
-                },
-                "background": {
-                  "r": 0.1,
-                  "g": 0.1,
-                  "b": 0.1,
-                  "a": 1.0
-                },
-                "drawmain": true,
-                "height": 1080,
-                "mappingspoutname": "OS_FLAT",
-                "width": 1920
-              }
-            }
-          ]
-        }
-      ]
-    }
-  ],
-  "users": [
-    {
-      "eyeseparation": 0.05999999865889549,
-      "pos": { "x": 0.0, "y": 0.0, "z": 0.0 }
-    }
-  ],
-  "meta": {
-    "author": "OpenSpace Team",
-    "description": "A single 1024x1024 window with Spout output planar/flat projection rendering at 1920x1080 resolution.",
-    "license": "MIT License",
-    "name": "Planar Spout",
-    "version": "1.0"
-  }
-}
diff --git a/modules/atmosphere/shaders/atmosphere_deferred_fs.glsl b/modules/atmosphere/shaders/atmosphere_deferred_fs.glsl
index 86aea8f114..ec07f2c64c 100644
--- a/modules/atmosphere/shaders/atmosphere_deferred_fs.glsl
+++ b/modules/atmosphere/shaders/atmosphere_deferred_fs.glsl
@@ -531,9 +531,9 @@ void main() {
   st.y = st.y / (resolution.y / viewport[3]) + (viewport[1] / resolution.y);
 
   // Color from G-Buffer
-  vec3 color = texture(mainColorTexture, st).rgb;
+  vec4 color = texture(mainColorTexture, st);
   if (cullAtmosphere == 1) {
-    renderTarget.rgb = color;
+    renderTarget = color;
     return;
   }
 
@@ -544,7 +544,7 @@ void main() {
   double maxLength = 0.0;   // in KM
   bool intersect = atmosphereIntersection(ray, Rt - (ATM_EPSILON * 0.001), offset, maxLength);
   if (!intersect) {
-    renderTarget.rgb = color;
+    renderTarget = color;
     return;
   }
 
@@ -599,7 +599,7 @@ void main() {
 
   if (pixelDepth < offset) {
     // ATM Occluded - Something in front of ATM
-    renderTarget.rgb = color;
+    renderTarget = color;
     return;
   }
 
@@ -630,13 +630,13 @@ void main() {
   vec3 attenuation;
 
   vec3 inscatterColor = inscatterRadiance(x, tF, irradianceFactor, v, s, r,
-    vec3(positionObjectsCoords), maxLength, pixelDepth, color, sunIntensityInscatter, mu,
+    vec3(positionObjectsCoords), maxLength, pixelDepth, color.rgb, sunIntensityInscatter, mu,
     attenuation, groundHit);
   vec3 atmColor = vec3(0.0);
   if (groundHit) {
     vec2 eclipseShadowPlanet = calcShadow(shadowDataArray, positionWorldCoords.xyz, true);
     float sunIntensityGround = sunRadiance * eclipseShadowPlanet.y;
-    atmColor = groundColor(x, tF, v, s, attenuation, color, normal.xyz, irradianceFactor,
+    atmColor = groundColor(x, tF, v, s, attenuation, color.rgb, normal.xyz, irradianceFactor,
       normal.w, sunIntensityGround);
   }
   else {
@@ -647,6 +647,6 @@ void main() {
 
   // Final Color of ATM plus terrain. We want to support opacity so we blend between the
   // planet color and the full atmosphere color using the opacity value
-  vec3 c = mix(color, inscatterColor + atmColor, opacity);
+  vec3 c = mix(color.rgb, inscatterColor + atmColor, opacity);
   renderTarget = vec4(c, 1.0);
 }
diff --git a/shaders/framebuffer/raycastframebuffer.frag b/shaders/framebuffer/raycastframebuffer.frag
index 36f2263439..dce3b71555 100644
--- a/shaders/framebuffer/raycastframebuffer.frag
+++ b/shaders/framebuffer/raycastframebuffer.frag
@@ -125,7 +125,7 @@ void main() {
 
   finalColor = vec4(accumulatedColor, (accumulatedAlpha.r + accumulatedAlpha.g + accumulatedAlpha.b) / 3.f);
 
-  finalColor.rgb /= finalColor.a ;
+  finalColor.rgb /= finalColor.a;
 
   gl_FragDepth = normalizeFloat(entryDepth);
 }
diff --git a/shaders/framebuffer/renderframebuffer.frag b/shaders/framebuffer/renderframebuffer.frag
index 4cecf335d4..b48d80e37d 100644
--- a/shaders/framebuffer/renderframebuffer.frag
+++ b/shaders/framebuffer/renderframebuffer.frag
@@ -35,7 +35,7 @@ layout(location = 1) out vec4 gPosition;
 layout(location = 2) out vec4 gNormal;
 
 void main() {
-  Fragment f  = getFragment();
+  Fragment f = getFragment();
 
   // Color is already in HDR space
   if (f.disableLDR2HDR || (disableHDRPipeline == 1)) {
diff --git a/tests/test_sgctedit.cpp b/tests/test_sgctedit.cpp
index 6efb810e24..fa0c9c974d 100644
--- a/tests/test_sgctedit.cpp
+++ b/tests/test_sgctedit.cpp
@@ -28,7 +28,7 @@
 #include <ghoul/filesystem/filesystem.h>
 #include <nlohmann/json.hpp>
 #include <nlohmann/json-schema.hpp>
-#include <sgct/readconfig.h>
+#include <sgct/config.h>
 #include <openspace/engine/configuration.h>
 #include <filesystem>
 #include <fstream>
@@ -44,15 +44,18 @@ namespace {
         return buffer.str();
     }
 
-    void attemptValidation(const std::string& cfgString) {
+    void validate(std::string_view cfgString) {
         const std::filesystem::path schemaDir = absPath("${TESTDIR}/../config/schema");
-        const std::string schemaString = stringify(schemaDir / "sgcteditor.schema.json");
-        sgct::validateConfigAgainstSchema(cfgString, schemaString, schemaDir);
+        const std::filesystem::path schema = schemaDir / "sgcteditor.schema.json";
+        std::string err = sgct::validateConfigAgainstSchema(cfgString, schema);
+        if (!err.empty()) {
+            throw std::runtime_error(err);
+        }
     }
 } // namespace
 
 TEST_CASE("SgctEdit: pass", "[sgctedit]") {
-    const std::string config =
+    constexpr std::string_view Source =
 R"({
   "generator": {
     "major": 1,
@@ -120,11 +123,11 @@ R"({
   ],
   "version": 1
 })";
-    CHECK_NOTHROW(attemptValidation(config));
+    CHECK_NOTHROW(validate(Source));
 }
 
 TEST_CASE("SgctEdit: addedTrailingBracket", "[sgctedit]") {
-    const std::string config =
+    constexpr std::string_view Source =
 R"({
   "generator": {
     "major": 0,
@@ -193,7 +196,7 @@ R"({
   "version": 1
 }})";
     CHECK_THROWS_MATCHES(
-        attemptValidation(config),
+        validate(Source),
         nlohmann::json::parse_error,
         Catch::Matchers::Message(
             "[json.exception.parse_error.101] parse error at line 67, column 2: "
@@ -204,7 +207,7 @@ R"({
 }
 
 TEST_CASE("SgctEdit: missingMasterAddress", "[sgctedit]") {
-    const std::string config =
+    constexpr std::string_view Source =
 R"({
   "generator": {
     "major": 1,
@@ -272,7 +275,7 @@ R"({
   "version": 1
 })";
     CHECK_THROWS_MATCHES(
-        attemptValidation(config),
+        validate(Source),
         std::exception,
         Catch::Matchers::Message(
             "At  of {\"generator\":{\"major\":1,\"minor\":1,\"name\":"
@@ -291,7 +294,7 @@ R"({
 }
 
 TEST_CASE("SgctEdit: missingPos", "[sgctedit]") {
-    const std::string config =
+    constexpr std::string_view Source =
 R"({
   "generator": {
     "major": 1,
@@ -355,7 +358,7 @@ R"({
   "version": 1
 })";
     CHECK_THROWS_MATCHES(
-        attemptValidation(config),
+        validate(Source),
         std::exception,
         Catch::Matchers::Message(
             "At /users/0 of {\"eyeseparation\":0.06499999761581421} - required "
@@ -365,7 +368,7 @@ R"({
 }
 
 TEST_CASE("SgctEdit: missingGenerator", "[sgctedit]") {
-    const std::string config =
+    constexpr std::string_view Source =
 R"({
   "masteraddress": "localhost",
   "nodes": [
@@ -429,7 +432,7 @@ R"({
   "version": 1
 })";
     CHECK_THROWS_MATCHES(
-        attemptValidation(config),
+        validate(Source),
         std::exception,
         Catch::Matchers::Message(
             "At  of {\"masteraddress\":\"localhost\",\"nodes\":[{\"address\":"
@@ -450,12 +453,13 @@ TEST_CASE("SgctEdit: minimumVersion", "[sgctedit]") {
     const sgct::config::GeneratorVersion minVersion { "SgctWindowConfig", 1, 1 };
     const std::filesystem::path cfg =
         absPath("${TESTDIR}/sgctedit/fails_minimum_version.json");
-    const sgct::config::GeneratorVersion ver = sgct::readConfigGenerator(cfg);
-    CHECK_FALSE(ver.versionCheck(minVersion));
+    const sgct::config::Cluster cluster = sgct::readConfig(cfg);
+    REQUIRE(cluster.generator);
+    CHECK_FALSE(cluster.generator->versionCheck(minVersion));
 }
 
 TEST_CASE("SgctEdit: invalidZvalue", "[sgctedit]") {
-    const std::string config =
+    constexpr std::string_view Source =
 R"({
   "generator": {
     "major": 1,
@@ -525,7 +529,7 @@ R"({
   "version": 1
 })";
     CHECK_THROWS_MATCHES(
-        attemptValidation(config),
+        validate(Source),
         std::exception,
         Catch::Matchers::Message(
             "[json.exception.parse_error.101] parse error at line 25, column 11: "
@@ -535,7 +539,7 @@ R"({
 }
 
 TEST_CASE("SgctEdit: unwelcomeValue", "[sgctedit]") {
-    const std::string config =
+    constexpr std::string_view Source =
 R"({
   "generator": {
     "major": 1,
@@ -605,7 +609,7 @@ R"({
   "version": 1
 })";
     CHECK_THROWS_MATCHES(
-        attemptValidation(config),
+        validate(Source),
         std::exception,
         Catch::Matchers::Message(
             "At /users/0 of {\"extra\":\"???\",\"eyeseparation\":0.6,\"pos\":"

From 820e90eab4e158a6abd315722c478a9d22741fab Mon Sep 17 00:00:00 2001
From: Alexander Bock <alexander.bock@liu.se>
Date: Tue, 14 Jan 2025 16:21:08 +0100
Subject: [PATCH 671/701] Happy new year

---
 CMakeLists.txt                                                | 2 +-
 LICENSE.md                                                    | 2 +-
 apps/CMakeLists.txt                                           | 2 +-
 apps/DocsWriter/CMakeLists.txt                                | 2 +-
 apps/DocsWriter/main.cpp                                      | 2 +-
 apps/OpenSpace-MinVR/main.cpp                                 | 2 +-
 apps/OpenSpace/CMakeLists.txt                                 | 2 +-
 apps/OpenSpace/ext/launcher/CMakeLists.txt                    | 2 +-
 apps/OpenSpace/ext/launcher/include/filesystemaccess.h        | 2 +-
 apps/OpenSpace/ext/launcher/include/launcherwindow.h          | 2 +-
 apps/OpenSpace/ext/launcher/include/profile/actiondialog.h    | 2 +-
 .../ext/launcher/include/profile/additionalscriptsdialog.h    | 2 +-
 apps/OpenSpace/ext/launcher/include/profile/assetedit.h       | 2 +-
 apps/OpenSpace/ext/launcher/include/profile/assetsdialog.h    | 2 +-
 apps/OpenSpace/ext/launcher/include/profile/assettreeitem.h   | 2 +-
 apps/OpenSpace/ext/launcher/include/profile/assettreemodel.h  | 2 +-
 apps/OpenSpace/ext/launcher/include/profile/cameradialog.h    | 2 +-
 .../OpenSpace/ext/launcher/include/profile/deltatimesdialog.h | 2 +-
 apps/OpenSpace/ext/launcher/include/profile/horizonsdialog.h  | 2 +-
 apps/OpenSpace/ext/launcher/include/profile/line.h            | 2 +-
 apps/OpenSpace/ext/launcher/include/profile/marknodesdialog.h | 2 +-
 apps/OpenSpace/ext/launcher/include/profile/metadialog.h      | 2 +-
 apps/OpenSpace/ext/launcher/include/profile/modulesdialog.h   | 2 +-
 apps/OpenSpace/ext/launcher/include/profile/profileedit.h     | 2 +-
 .../OpenSpace/ext/launcher/include/profile/propertiesdialog.h | 2 +-
 apps/OpenSpace/ext/launcher/include/profile/scriptlogdialog.h | 2 +-
 apps/OpenSpace/ext/launcher/include/profile/timedialog.h      | 2 +-
 apps/OpenSpace/ext/launcher/include/settingsdialog.h          | 2 +-
 .../ext/launcher/include/sgctedit/displaywindowunion.h        | 2 +-
 apps/OpenSpace/ext/launcher/include/sgctedit/monitorbox.h     | 2 +-
 .../ext/launcher/include/sgctedit/orientationdialog.h         | 2 +-
 apps/OpenSpace/ext/launcher/include/sgctedit/settingswidget.h | 2 +-
 apps/OpenSpace/ext/launcher/include/sgctedit/sgctedit.h       | 2 +-
 apps/OpenSpace/ext/launcher/include/sgctedit/windowcontrol.h  | 2 +-
 apps/OpenSpace/ext/launcher/src/filesystemaccess.cpp          | 2 +-
 apps/OpenSpace/ext/launcher/src/launcherwindow.cpp            | 2 +-
 apps/OpenSpace/ext/launcher/src/profile/actiondialog.cpp      | 2 +-
 .../ext/launcher/src/profile/additionalscriptsdialog.cpp      | 2 +-
 apps/OpenSpace/ext/launcher/src/profile/assetedit.cpp         | 2 +-
 apps/OpenSpace/ext/launcher/src/profile/assetsdialog.cpp      | 2 +-
 apps/OpenSpace/ext/launcher/src/profile/assettreeitem.cpp     | 2 +-
 apps/OpenSpace/ext/launcher/src/profile/assettreemodel.cpp    | 2 +-
 apps/OpenSpace/ext/launcher/src/profile/cameradialog.cpp      | 2 +-
 apps/OpenSpace/ext/launcher/src/profile/deltatimesdialog.cpp  | 2 +-
 apps/OpenSpace/ext/launcher/src/profile/horizonsdialog.cpp    | 2 +-
 apps/OpenSpace/ext/launcher/src/profile/line.cpp              | 2 +-
 apps/OpenSpace/ext/launcher/src/profile/marknodesdialog.cpp   | 2 +-
 apps/OpenSpace/ext/launcher/src/profile/metadialog.cpp        | 2 +-
 apps/OpenSpace/ext/launcher/src/profile/modulesdialog.cpp     | 2 +-
 apps/OpenSpace/ext/launcher/src/profile/profileedit.cpp       | 2 +-
 apps/OpenSpace/ext/launcher/src/profile/propertiesdialog.cpp  | 2 +-
 apps/OpenSpace/ext/launcher/src/profile/scriptlogdialog.cpp   | 2 +-
 apps/OpenSpace/ext/launcher/src/profile/timedialog.cpp        | 2 +-
 apps/OpenSpace/ext/launcher/src/settingsdialog.cpp            | 2 +-
 .../ext/launcher/src/sgctedit/displaywindowunion.cpp          | 2 +-
 apps/OpenSpace/ext/launcher/src/sgctedit/monitorbox.cpp       | 2 +-
 .../OpenSpace/ext/launcher/src/sgctedit/orientationdialog.cpp | 2 +-
 apps/OpenSpace/ext/launcher/src/sgctedit/settingswidget.cpp   | 2 +-
 apps/OpenSpace/ext/launcher/src/sgctedit/sgctedit.cpp         | 2 +-
 apps/OpenSpace/ext/launcher/src/sgctedit/windowcontrol.cpp    | 2 +-
 apps/OpenSpace/ext/sgct                                       | 2 +-
 apps/OpenSpace/main.cpp                                       | 2 +-
 apps/Sync/main.cpp                                            | 2 +-
 apps/TaskRunner/main.cpp                                      | 2 +-
 .../examples/renderable/renderablemodel/data/model_fs.glsl    | 2 +-
 .../examples/renderable/renderablemodel/data/model_vs.glsl    | 2 +-
 ext/CMakeLists.txt                                            | 2 +-
 ext/ghoul                                                     | 2 +-
 include/openspace/camera/camera.h                             | 2 +-
 include/openspace/camera/camerapose.h                         | 2 +-
 include/openspace/data/csvloader.h                            | 2 +-
 include/openspace/data/dataloader.h                           | 2 +-
 include/openspace/data/datamapping.h                          | 2 +-
 include/openspace/data/speckloader.h                          | 2 +-
 include/openspace/documentation/core_registration.h           | 2 +-
 include/openspace/documentation/documentation.h               | 2 +-
 include/openspace/documentation/documentationengine.h         | 2 +-
 include/openspace/documentation/verifier.h                    | 2 +-
 include/openspace/documentation/verifier.inl                  | 2 +-
 include/openspace/engine/configuration.h                      | 2 +-
 include/openspace/engine/downloadmanager.h                    | 2 +-
 include/openspace/engine/globals.h                            | 2 +-
 include/openspace/engine/globalscallbacks.h                   | 2 +-
 include/openspace/engine/logfactory.h                         | 2 +-
 include/openspace/engine/moduleengine.h                       | 2 +-
 include/openspace/engine/moduleengine.inl                     | 2 +-
 include/openspace/engine/openspaceengine.h                    | 2 +-
 include/openspace/engine/settings.h                           | 2 +-
 include/openspace/engine/syncengine.h                         | 2 +-
 include/openspace/engine/windowdelegate.h                     | 2 +-
 include/openspace/events/event.h                              | 2 +-
 include/openspace/events/eventengine.h                        | 2 +-
 include/openspace/events/eventengine.inl                      | 2 +-
 include/openspace/interaction/action.h                        | 2 +-
 include/openspace/interaction/actionmanager.h                 | 2 +-
 include/openspace/interaction/camerainteractionstates.h       | 2 +-
 include/openspace/interaction/delayedvariable.h               | 2 +-
 include/openspace/interaction/delayedvariable.inl             | 2 +-
 include/openspace/interaction/interactionmonitor.h            | 2 +-
 include/openspace/interaction/interpolator.h                  | 2 +-
 include/openspace/interaction/interpolator.inl                | 2 +-
 include/openspace/interaction/joystickcamerastates.h          | 2 +-
 include/openspace/interaction/joystickinputstate.h            | 2 +-
 include/openspace/interaction/keybindingmanager.h             | 2 +-
 include/openspace/interaction/keyboardinputstate.h            | 2 +-
 include/openspace/interaction/keyframerecordinghandler.h      | 2 +-
 include/openspace/interaction/mousecamerastates.h             | 2 +-
 include/openspace/interaction/mouseinputstate.h               | 2 +-
 include/openspace/interaction/scriptcamerastates.h            | 2 +-
 include/openspace/interaction/sessionrecording.h              | 2 +-
 include/openspace/interaction/sessionrecordinghandler.h       | 2 +-
 include/openspace/interaction/tasks/convertrecformattask.h    | 2 +-
 include/openspace/interaction/touchbar.h                      | 2 +-
 include/openspace/interaction/websocketcamerastates.h         | 2 +-
 include/openspace/interaction/websocketinputstate.h           | 2 +-
 include/openspace/json.h                                      | 2 +-
 include/openspace/mission/mission.h                           | 2 +-
 include/openspace/mission/missionmanager.h                    | 2 +-
 include/openspace/navigation/keyframenavigator.h              | 2 +-
 include/openspace/navigation/navigationhandler.h              | 2 +-
 include/openspace/navigation/navigationstate.h                | 2 +-
 include/openspace/navigation/orbitalnavigator.h               | 2 +-
 include/openspace/navigation/path.h                           | 2 +-
 include/openspace/navigation/pathcurve.h                      | 2 +-
 include/openspace/navigation/pathcurves/avoidcollisioncurve.h | 2 +-
 .../openspace/navigation/pathcurves/zoomoutoverviewcurve.h    | 2 +-
 include/openspace/navigation/pathnavigator.h                  | 2 +-
 include/openspace/navigation/waypoint.h                       | 2 +-
 include/openspace/network/messagestructures.h                 | 2 +-
 include/openspace/network/messagestructureshelper.h           | 2 +-
 include/openspace/network/parallelconnection.h                | 2 +-
 include/openspace/network/parallelpeer.h                      | 2 +-
 include/openspace/properties/list/doublelistproperty.h        | 2 +-
 include/openspace/properties/list/intlistproperty.h           | 2 +-
 include/openspace/properties/list/stringlistproperty.h        | 2 +-
 include/openspace/properties/listproperty.h                   | 2 +-
 include/openspace/properties/listproperty.inl                 | 2 +-
 include/openspace/properties/matrix/dmat2property.h           | 2 +-
 include/openspace/properties/matrix/dmat3property.h           | 2 +-
 include/openspace/properties/matrix/dmat4property.h           | 2 +-
 include/openspace/properties/matrix/mat2property.h            | 2 +-
 include/openspace/properties/matrix/mat3property.h            | 2 +-
 include/openspace/properties/matrix/mat4property.h            | 2 +-
 include/openspace/properties/numericalproperty.h              | 2 +-
 include/openspace/properties/numericalproperty.inl            | 2 +-
 include/openspace/properties/optionproperty.h                 | 2 +-
 include/openspace/properties/property.h                       | 2 +-
 include/openspace/properties/propertyowner.h                  | 2 +-
 include/openspace/properties/scalar/boolproperty.h            | 2 +-
 include/openspace/properties/scalar/doubleproperty.h          | 2 +-
 include/openspace/properties/scalar/floatproperty.h           | 2 +-
 include/openspace/properties/scalar/intproperty.h             | 2 +-
 include/openspace/properties/scalar/longproperty.h            | 2 +-
 include/openspace/properties/scalar/shortproperty.h           | 2 +-
 include/openspace/properties/scalar/uintproperty.h            | 2 +-
 include/openspace/properties/scalar/ulongproperty.h           | 2 +-
 include/openspace/properties/scalar/ushortproperty.h          | 2 +-
 include/openspace/properties/selectionproperty.h              | 2 +-
 include/openspace/properties/stringproperty.h                 | 2 +-
 include/openspace/properties/templateproperty.h               | 2 +-
 include/openspace/properties/templateproperty.inl             | 2 +-
 include/openspace/properties/triggerproperty.h                | 2 +-
 include/openspace/properties/vector/dvec2property.h           | 2 +-
 include/openspace/properties/vector/dvec3property.h           | 2 +-
 include/openspace/properties/vector/dvec4property.h           | 2 +-
 include/openspace/properties/vector/ivec2property.h           | 2 +-
 include/openspace/properties/vector/ivec3property.h           | 2 +-
 include/openspace/properties/vector/ivec4property.h           | 2 +-
 include/openspace/properties/vector/uvec2property.h           | 2 +-
 include/openspace/properties/vector/uvec3property.h           | 2 +-
 include/openspace/properties/vector/uvec4property.h           | 2 +-
 include/openspace/properties/vector/vec2property.h            | 2 +-
 include/openspace/properties/vector/vec3property.h            | 2 +-
 include/openspace/properties/vector/vec4property.h            | 2 +-
 include/openspace/query/query.h                               | 2 +-
 include/openspace/rendering/colormappingcomponent.h           | 2 +-
 include/openspace/rendering/dashboard.h                       | 2 +-
 include/openspace/rendering/dashboarditem.h                   | 2 +-
 include/openspace/rendering/dashboardtextitem.h               | 2 +-
 include/openspace/rendering/deferredcaster.h                  | 2 +-
 include/openspace/rendering/deferredcasterlistener.h          | 2 +-
 include/openspace/rendering/deferredcastermanager.h           | 2 +-
 include/openspace/rendering/fadeable.h                        | 2 +-
 include/openspace/rendering/framebufferrenderer.h             | 2 +-
 include/openspace/rendering/helper.h                          | 2 +-
 include/openspace/rendering/labelscomponent.h                 | 2 +-
 include/openspace/rendering/loadingscreen.h                   | 2 +-
 include/openspace/rendering/luaconsole.h                      | 2 +-
 include/openspace/rendering/raycasterlistener.h               | 2 +-
 include/openspace/rendering/raycastermanager.h                | 2 +-
 include/openspace/rendering/renderable.h                      | 2 +-
 include/openspace/rendering/renderengine.h                    | 2 +-
 include/openspace/rendering/screenspacerenderable.h           | 2 +-
 include/openspace/rendering/texturecomponent.h                | 2 +-
 include/openspace/rendering/transferfunction.h                | 2 +-
 include/openspace/rendering/volumeraycaster.h                 | 2 +-
 include/openspace/scene/asset.h                               | 2 +-
 include/openspace/scene/assetmanager.h                        | 2 +-
 include/openspace/scene/lightsource.h                         | 2 +-
 include/openspace/scene/profile.h                             | 2 +-
 include/openspace/scene/rotation.h                            | 2 +-
 include/openspace/scene/scale.h                               | 2 +-
 include/openspace/scene/scene.h                               | 2 +-
 include/openspace/scene/scenegraphnode.h                      | 2 +-
 include/openspace/scene/sceneinitializer.h                    | 2 +-
 include/openspace/scene/timeframe.h                           | 2 +-
 include/openspace/scene/translation.h                         | 2 +-
 include/openspace/scripting/lualibrary.h                      | 2 +-
 include/openspace/scripting/scriptengine.h                    | 2 +-
 include/openspace/scripting/scriptscheduler.h                 | 2 +-
 include/openspace/scripting/systemcapabilitiesbinding.h       | 2 +-
 include/openspace/util/blockplaneintersectiongeometry.h       | 2 +-
 include/openspace/util/boxgeometry.h                          | 2 +-
 include/openspace/util/collisionhelper.h                      | 2 +-
 include/openspace/util/concurrentjobmanager.h                 | 2 +-
 include/openspace/util/concurrentjobmanager.inl               | 2 +-
 include/openspace/util/concurrentqueue.h                      | 2 +-
 include/openspace/util/concurrentqueue.inl                    | 2 +-
 include/openspace/util/coordinateconversion.h                 | 2 +-
 include/openspace/util/distanceconstants.h                    | 2 +-
 include/openspace/util/distanceconversion.h                   | 2 +-
 include/openspace/util/factorymanager.h                       | 2 +-
 include/openspace/util/factorymanager.inl                     | 2 +-
 include/openspace/util/histogram.h                            | 2 +-
 include/openspace/util/httprequest.h                          | 2 +-
 include/openspace/util/job.h                                  | 2 +-
 include/openspace/util/json_helper.h                          | 2 +-
 include/openspace/util/json_helper.inl                        | 2 +-
 include/openspace/util/keys.h                                 | 2 +-
 include/openspace/util/memorymanager.h                        | 2 +-
 include/openspace/util/mouse.h                                | 2 +-
 include/openspace/util/openspacemodule.h                      | 2 +-
 include/openspace/util/planegeometry.h                        | 2 +-
 include/openspace/util/progressbar.h                          | 2 +-
 include/openspace/util/resourcesynchronization.h              | 2 +-
 include/openspace/util/screenlog.h                            | 2 +-
 include/openspace/util/sphere.h                               | 2 +-
 include/openspace/util/spicemanager.h                         | 2 +-
 include/openspace/util/syncable.h                             | 2 +-
 include/openspace/util/syncbuffer.h                           | 2 +-
 include/openspace/util/syncbuffer.inl                         | 2 +-
 include/openspace/util/syncdata.h                             | 2 +-
 include/openspace/util/syncdata.inl                           | 2 +-
 include/openspace/util/task.h                                 | 2 +-
 include/openspace/util/taskloader.h                           | 2 +-
 include/openspace/util/threadpool.h                           | 2 +-
 include/openspace/util/time.h                                 | 2 +-
 include/openspace/util/timeconversion.h                       | 2 +-
 include/openspace/util/timeline.h                             | 2 +-
 include/openspace/util/timeline.inl                           | 2 +-
 include/openspace/util/timemanager.h                          | 2 +-
 include/openspace/util/timerange.h                            | 2 +-
 include/openspace/util/touch.h                                | 2 +-
 include/openspace/util/transformationmanager.h                | 2 +-
 include/openspace/util/tstring.h                              | 2 +-
 include/openspace/util/universalhelpers.h                     | 2 +-
 include/openspace/util/updatestructures.h                     | 2 +-
 include/openspace/util/versionchecker.h                       | 2 +-
 modules/CMakeLists.txt                                        | 2 +-
 modules/atmosphere/CMakeLists.txt                             | 2 +-
 modules/atmosphere/atmospheremodule.cpp                       | 2 +-
 modules/atmosphere/atmospheremodule.h                         | 2 +-
 modules/atmosphere/rendering/atmospheredeferredcaster.cpp     | 2 +-
 modules/atmosphere/rendering/atmospheredeferredcaster.h       | 2 +-
 modules/atmosphere/rendering/renderableatmosphere.cpp         | 2 +-
 modules/atmosphere/rendering/renderableatmosphere.h           | 2 +-
 modules/atmosphere/shaders/atmosphere_common.glsl             | 2 +-
 modules/atmosphere/shaders/atmosphere_deferred_fs.glsl        | 2 +-
 modules/atmosphere/shaders/atmosphere_deferred_vs.glsl        | 2 +-
 modules/atmosphere/shaders/calculation_gs.glsl                | 2 +-
 modules/atmosphere/shaders/calculation_vs.glsl                | 2 +-
 modules/atmosphere/shaders/deltaE_calc_fs.glsl                | 2 +-
 modules/atmosphere/shaders/deltaJ_calc_fs.glsl                | 2 +-
 modules/atmosphere/shaders/deltaS_calc_fs.glsl                | 2 +-
 modules/atmosphere/shaders/deltaS_sup_calc_fs.glsl            | 2 +-
 modules/atmosphere/shaders/inScattering_calc_fs.glsl          | 2 +-
 modules/atmosphere/shaders/inScattering_sup_calc_fs.glsl      | 2 +-
 modules/atmosphere/shaders/irradiance_calc_fs.glsl            | 2 +-
 modules/atmosphere/shaders/irradiance_final_fs.glsl           | 2 +-
 modules/atmosphere/shaders/irradiance_sup_calc_fs.glsl        | 2 +-
 modules/atmosphere/shaders/transmittance_calc_fs.glsl         | 2 +-
 modules/audio/CMakeLists.txt                                  | 2 +-
 modules/audio/audiomodule.cpp                                 | 2 +-
 modules/audio/audiomodule.h                                   | 2 +-
 modules/audio/audiomodule_lua.inl                             | 2 +-
 modules/base/CMakeLists.txt                                   | 2 +-
 modules/base/basemodule.cpp                                   | 2 +-
 modules/base/basemodule.h                                     | 2 +-
 modules/base/dashboard/dashboarditemangle.cpp                 | 2 +-
 modules/base/dashboard/dashboarditemangle.h                   | 2 +-
 modules/base/dashboard/dashboarditemdate.cpp                  | 2 +-
 modules/base/dashboard/dashboarditemdate.h                    | 2 +-
 modules/base/dashboard/dashboarditemdistance.cpp              | 2 +-
 modules/base/dashboard/dashboarditemdistance.h                | 2 +-
 modules/base/dashboard/dashboarditemelapsedtime.cpp           | 2 +-
 modules/base/dashboard/dashboarditemelapsedtime.h             | 2 +-
 modules/base/dashboard/dashboarditemframerate.cpp             | 2 +-
 modules/base/dashboard/dashboarditemframerate.h               | 2 +-
 modules/base/dashboard/dashboarditeminputstate.cpp            | 2 +-
 modules/base/dashboard/dashboarditeminputstate.h              | 2 +-
 modules/base/dashboard/dashboarditemmission.cpp               | 2 +-
 modules/base/dashboard/dashboarditemmission.h                 | 2 +-
 modules/base/dashboard/dashboarditemparallelconnection.cpp    | 2 +-
 modules/base/dashboard/dashboarditemparallelconnection.h      | 2 +-
 modules/base/dashboard/dashboarditempropertyvalue.cpp         | 2 +-
 modules/base/dashboard/dashboarditempropertyvalue.h           | 2 +-
 modules/base/dashboard/dashboarditemsimulationincrement.cpp   | 2 +-
 modules/base/dashboard/dashboarditemsimulationincrement.h     | 2 +-
 modules/base/dashboard/dashboarditemspacing.cpp               | 2 +-
 modules/base/dashboard/dashboarditemspacing.h                 | 2 +-
 modules/base/dashboard/dashboarditemtext.cpp                  | 2 +-
 modules/base/dashboard/dashboarditemtext.h                    | 2 +-
 modules/base/dashboard/dashboarditemvelocity.cpp              | 2 +-
 modules/base/dashboard/dashboarditemvelocity.h                | 2 +-
 modules/base/lightsource/cameralightsource.cpp                | 2 +-
 modules/base/lightsource/cameralightsource.h                  | 2 +-
 modules/base/lightsource/scenegraphlightsource.cpp            | 2 +-
 modules/base/lightsource/scenegraphlightsource.h              | 2 +-
 modules/base/rendering/grids/renderableboxgrid.cpp            | 2 +-
 modules/base/rendering/grids/renderableboxgrid.h              | 2 +-
 modules/base/rendering/grids/renderablegrid.cpp               | 2 +-
 modules/base/rendering/grids/renderablegrid.h                 | 2 +-
 modules/base/rendering/grids/renderableradialgrid.cpp         | 2 +-
 modules/base/rendering/grids/renderableradialgrid.h           | 2 +-
 modules/base/rendering/grids/renderablesphericalgrid.cpp      | 2 +-
 modules/base/rendering/grids/renderablesphericalgrid.h        | 2 +-
 .../rendering/pointcloud/renderableinterpolatedpoints.cpp     | 2 +-
 .../base/rendering/pointcloud/renderableinterpolatedpoints.h  | 2 +-
 modules/base/rendering/pointcloud/renderablepointcloud.cpp    | 2 +-
 modules/base/rendering/pointcloud/renderablepointcloud.h      | 2 +-
 modules/base/rendering/pointcloud/renderablepolygoncloud.cpp  | 2 +-
 modules/base/rendering/pointcloud/renderablepolygoncloud.h    | 2 +-
 modules/base/rendering/pointcloud/sizemappingcomponent.cpp    | 2 +-
 modules/base/rendering/pointcloud/sizemappingcomponent.h      | 2 +-
 modules/base/rendering/renderablecartesianaxes.cpp            | 2 +-
 modules/base/rendering/renderablecartesianaxes.h              | 2 +-
 modules/base/rendering/renderabledisc.cpp                     | 2 +-
 modules/base/rendering/renderabledisc.h                       | 2 +-
 modules/base/rendering/renderablelabel.cpp                    | 2 +-
 modules/base/rendering/renderablelabel.h                      | 2 +-
 modules/base/rendering/renderablemodel.cpp                    | 2 +-
 modules/base/rendering/renderablemodel.h                      | 2 +-
 modules/base/rendering/renderablenodearrow.cpp                | 2 +-
 modules/base/rendering/renderablenodearrow.h                  | 2 +-
 modules/base/rendering/renderablenodeline.cpp                 | 2 +-
 modules/base/rendering/renderablenodeline.h                   | 2 +-
 modules/base/rendering/renderableplane.cpp                    | 2 +-
 modules/base/rendering/renderableplane.h                      | 2 +-
 modules/base/rendering/renderableplaneimagelocal.cpp          | 2 +-
 modules/base/rendering/renderableplaneimagelocal.h            | 2 +-
 modules/base/rendering/renderableplaneimageonline.cpp         | 2 +-
 modules/base/rendering/renderableplaneimageonline.h           | 2 +-
 modules/base/rendering/renderableplanetimevaryingimage.cpp    | 2 +-
 modules/base/rendering/renderableplanetimevaryingimage.h      | 2 +-
 modules/base/rendering/renderableprism.cpp                    | 2 +-
 modules/base/rendering/renderableprism.h                      | 2 +-
 modules/base/rendering/renderablesphere.cpp                   | 2 +-
 modules/base/rendering/renderablesphere.h                     | 2 +-
 modules/base/rendering/renderablesphereimagelocal.cpp         | 2 +-
 modules/base/rendering/renderablesphereimagelocal.h           | 2 +-
 modules/base/rendering/renderablesphereimageonline.cpp        | 2 +-
 modules/base/rendering/renderablesphereimageonline.h          | 2 +-
 modules/base/rendering/renderabletimevaryingsphere.cpp        | 2 +-
 modules/base/rendering/renderabletimevaryingsphere.h          | 2 +-
 modules/base/rendering/renderabletrail.cpp                    | 2 +-
 modules/base/rendering/renderabletrail.h                      | 2 +-
 modules/base/rendering/renderabletrailorbit.cpp               | 2 +-
 modules/base/rendering/renderabletrailorbit.h                 | 2 +-
 modules/base/rendering/renderabletrailtrajectory.cpp          | 2 +-
 modules/base/rendering/renderabletrailtrajectory.h            | 2 +-
 modules/base/rendering/screenspacedashboard.cpp               | 2 +-
 modules/base/rendering/screenspacedashboard.h                 | 2 +-
 modules/base/rendering/screenspacedashboard_lua.inl           | 2 +-
 modules/base/rendering/screenspaceframebuffer.cpp             | 2 +-
 modules/base/rendering/screenspaceframebuffer.h               | 2 +-
 modules/base/rendering/screenspaceimagelocal.cpp              | 2 +-
 modules/base/rendering/screenspaceimagelocal.h                | 2 +-
 modules/base/rendering/screenspaceimageonline.cpp             | 2 +-
 modules/base/rendering/screenspaceimageonline.h               | 2 +-
 modules/base/rotation/constantrotation.cpp                    | 2 +-
 modules/base/rotation/constantrotation.h                      | 2 +-
 modules/base/rotation/fixedrotation.cpp                       | 2 +-
 modules/base/rotation/fixedrotation.h                         | 2 +-
 modules/base/rotation/luarotation.cpp                         | 2 +-
 modules/base/rotation/luarotation.h                           | 2 +-
 modules/base/rotation/staticrotation.cpp                      | 2 +-
 modules/base/rotation/staticrotation.h                        | 2 +-
 modules/base/rotation/timelinerotation.cpp                    | 2 +-
 modules/base/rotation/timelinerotation.h                      | 2 +-
 modules/base/scale/luascale.cpp                               | 2 +-
 modules/base/scale/luascale.h                                 | 2 +-
 modules/base/scale/nonuniformstaticscale.cpp                  | 2 +-
 modules/base/scale/nonuniformstaticscale.h                    | 2 +-
 modules/base/scale/staticscale.cpp                            | 2 +-
 modules/base/scale/staticscale.h                              | 2 +-
 modules/base/scale/timedependentscale.cpp                     | 2 +-
 modules/base/scale/timedependentscale.h                       | 2 +-
 modules/base/shaders/arrow_fs.glsl                            | 2 +-
 modules/base/shaders/arrow_vs.glsl                            | 2 +-
 modules/base/shaders/axes_fs.glsl                             | 2 +-
 modules/base/shaders/axes_vs.glsl                             | 2 +-
 modules/base/shaders/disc_fs.glsl                             | 2 +-
 modules/base/shaders/disc_vs.glsl                             | 2 +-
 modules/base/shaders/grid_fs.glsl                             | 2 +-
 modules/base/shaders/grid_vs.glsl                             | 2 +-
 modules/base/shaders/imageplane_fs.glsl                       | 2 +-
 modules/base/shaders/imageplane_vs.glsl                       | 2 +-
 modules/base/shaders/line_fs.glsl                             | 2 +-
 modules/base/shaders/line_vs.glsl                             | 2 +-
 modules/base/shaders/model_fs.glsl                            | 2 +-
 modules/base/shaders/model_vs.glsl                            | 2 +-
 modules/base/shaders/plane_fs.glsl                            | 2 +-
 modules/base/shaders/plane_vs.glsl                            | 2 +-
 modules/base/shaders/pointcloud/pointcloud_fs.glsl            | 2 +-
 modules/base/shaders/pointcloud/pointcloud_gs.glsl            | 2 +-
 .../base/shaders/pointcloud/pointcloud_interpolated_vs.glsl   | 2 +-
 modules/base/shaders/pointcloud/pointcloud_vs.glsl            | 2 +-
 modules/base/shaders/polygon_fs.glsl                          | 2 +-
 modules/base/shaders/polygon_gs.glsl                          | 2 +-
 modules/base/shaders/polygon_vs.glsl                          | 2 +-
 modules/base/shaders/prism_fs.glsl                            | 2 +-
 modules/base/shaders/prism_vs.glsl                            | 2 +-
 modules/base/shaders/renderabletrail_apple_fs.glsl            | 2 +-
 modules/base/shaders/renderabletrail_apple_vs.glsl            | 2 +-
 modules/base/shaders/renderabletrail_fs.glsl                  | 2 +-
 modules/base/shaders/renderabletrail_vs.glsl                  | 2 +-
 modules/base/shaders/screenspace_fs.glsl                      | 2 +-
 modules/base/shaders/screenspace_vs.glsl                      | 2 +-
 modules/base/shaders/sphere_fs.glsl                           | 2 +-
 modules/base/shaders/sphere_vs.glsl                           | 2 +-
 modules/base/timeframe/timeframeinterval.cpp                  | 2 +-
 modules/base/timeframe/timeframeinterval.h                    | 2 +-
 modules/base/timeframe/timeframeunion.cpp                     | 2 +-
 modules/base/timeframe/timeframeunion.h                       | 2 +-
 modules/base/translation/luatranslation.cpp                   | 2 +-
 modules/base/translation/luatranslation.h                     | 2 +-
 modules/base/translation/statictranslation.cpp                | 2 +-
 modules/base/translation/statictranslation.h                  | 2 +-
 modules/base/translation/timelinetranslation.cpp              | 2 +-
 modules/base/translation/timelinetranslation.h                | 2 +-
 modules/cefwebgui/CMakeLists.txt                              | 2 +-
 modules/cefwebgui/cefwebguimodule.cpp                         | 2 +-
 modules/cefwebgui/cefwebguimodule.h                           | 2 +-
 modules/cefwebgui/include/guikeyboardhandler.h                | 2 +-
 modules/cefwebgui/include/guirenderhandler.h                  | 2 +-
 modules/cefwebgui/shaders/gui_fs.glsl                         | 2 +-
 modules/cefwebgui/shaders/gui_vs.glsl                         | 2 +-
 modules/cefwebgui/src/guikeyboardhandler.cpp                  | 2 +-
 modules/cefwebgui/src/guirenderhandler.cpp                    | 2 +-
 modules/debugging/CMakeLists.txt                              | 2 +-
 modules/debugging/debuggingmodule.cpp                         | 2 +-
 modules/debugging/debuggingmodule.h                           | 2 +-
 modules/debugging/debuggingmodule_lua.inl                     | 2 +-
 modules/debugging/rendering/debugrenderer.cpp                 | 2 +-
 modules/debugging/rendering/debugrenderer.h                   | 2 +-
 modules/debugging/rendering/debugshader_fs.glsl               | 2 +-
 modules/debugging/rendering/debugshader_vs.glsl               | 2 +-
 modules/debugging/rendering/renderabledebugplane.cpp          | 2 +-
 modules/debugging/rendering/renderabledebugplane.h            | 2 +-
 modules/digitaluniverse/CMakeLists.txt                        | 2 +-
 modules/digitaluniverse/digitaluniversemodule.cpp             | 2 +-
 modules/digitaluniverse/digitaluniversemodule.h               | 2 +-
 modules/digitaluniverse/rendering/renderabledumeshes.cpp      | 2 +-
 modules/digitaluniverse/rendering/renderabledumeshes.h        | 2 +-
 modules/digitaluniverse/shaders/dumesh_fs.glsl                | 2 +-
 modules/digitaluniverse/shaders/dumesh_vs.glsl                | 2 +-
 modules/digitaluniverse/shaders/plane_fs.glsl                 | 2 +-
 modules/digitaluniverse/shaders/plane_vs.glsl                 | 2 +-
 modules/exoplanets/CMakeLists.txt                             | 2 +-
 modules/exoplanets/datastructure.cpp                          | 2 +-
 modules/exoplanets/datastructure.h                            | 2 +-
 modules/exoplanets/exoplanetshelper.cpp                       | 2 +-
 modules/exoplanets/exoplanetshelper.h                         | 2 +-
 modules/exoplanets/exoplanetsmodule.cpp                       | 2 +-
 modules/exoplanets/exoplanetsmodule.h                         | 2 +-
 modules/exoplanets/exoplanetsmodule_lua.inl                   | 2 +-
 modules/exoplanets/rendering/renderableorbitdisc.cpp          | 2 +-
 modules/exoplanets/rendering/renderableorbitdisc.h            | 2 +-
 modules/exoplanets/shaders/orbitdisc_fs.glsl                  | 2 +-
 modules/exoplanets/shaders/orbitdisc_vs.glsl                  | 2 +-
 modules/exoplanets/tasks/exoplanetsdatapreparationtask.cpp    | 2 +-
 modules/exoplanets/tasks/exoplanetsdatapreparationtask.h      | 2 +-
 modules/fieldlines/CMakeLists.txt                             | 2 +-
 modules/fieldlines/fieldlinesmodule.cpp                       | 2 +-
 modules/fieldlines/fieldlinesmodule.h                         | 2 +-
 modules/fieldlines/rendering/renderablefieldlines.cpp         | 2 +-
 modules/fieldlines/rendering/renderablefieldlines.h           | 2 +-
 modules/fieldlines/shaders/fieldline_fs.glsl                  | 2 +-
 modules/fieldlines/shaders/fieldline_gs.glsl                  | 2 +-
 modules/fieldlines/shaders/fieldline_vs.glsl                  | 2 +-
 modules/fieldlinessequence/CMakeLists.txt                     | 2 +-
 modules/fieldlinessequence/fieldlinessequencemodule.cpp       | 2 +-
 modules/fieldlinessequence/fieldlinessequencemodule.h         | 2 +-
 .../rendering/renderablefieldlinessequence.cpp                | 2 +-
 .../rendering/renderablefieldlinessequence.h                  | 2 +-
 modules/fieldlinessequence/shaders/fieldlinessequence_fs.glsl | 2 +-
 modules/fieldlinessequence/shaders/fieldlinessequence_vs.glsl | 2 +-
 modules/fieldlinessequence/util/commons.cpp                   | 2 +-
 modules/fieldlinessequence/util/commons.h                     | 2 +-
 modules/fieldlinessequence/util/fieldlinesstate.cpp           | 2 +-
 modules/fieldlinessequence/util/fieldlinesstate.h             | 2 +-
 modules/fieldlinessequence/util/kameleonfieldlinehelper.cpp   | 2 +-
 modules/fieldlinessequence/util/kameleonfieldlinehelper.h     | 2 +-
 modules/fitsfilereader/CMakeLists.txt                         | 2 +-
 modules/fitsfilereader/fitsfilereadermodule.cpp               | 2 +-
 modules/fitsfilereader/fitsfilereadermodule.h                 | 2 +-
 modules/fitsfilereader/include/fitsfilereader.h               | 2 +-
 modules/fitsfilereader/src/fitsfilereader.cpp                 | 2 +-
 modules/gaia/CMakeLists.txt                                   | 2 +-
 modules/gaia/gaiamodule.cpp                                   | 2 +-
 modules/gaia/gaiamodule.h                                     | 2 +-
 modules/gaia/rendering/gaiaoptions.h                          | 2 +-
 modules/gaia/rendering/octreeculler.cpp                       | 2 +-
 modules/gaia/rendering/octreeculler.h                         | 2 +-
 modules/gaia/rendering/octreemanager.cpp                      | 2 +-
 modules/gaia/rendering/octreemanager.h                        | 2 +-
 modules/gaia/rendering/renderablegaiastars.cpp                | 2 +-
 modules/gaia/rendering/renderablegaiastars.h                  | 2 +-
 modules/gaia/shaders/gaia_billboard_fs.glsl                   | 2 +-
 modules/gaia/shaders/gaia_billboard_ge.glsl                   | 2 +-
 modules/gaia/shaders/gaia_billboard_nofbo_fs.glsl             | 2 +-
 modules/gaia/shaders/gaia_point_fs.glsl                       | 2 +-
 modules/gaia/shaders/gaia_point_ge.glsl                       | 2 +-
 modules/gaia/shaders/gaia_ssbo_vs.glsl                        | 2 +-
 modules/gaia/shaders/gaia_tonemapping_billboard_fs.glsl       | 2 +-
 modules/gaia/shaders/gaia_tonemapping_point_fs.glsl           | 2 +-
 modules/gaia/shaders/gaia_tonemapping_vs.glsl                 | 2 +-
 modules/gaia/shaders/gaia_vbo_vs.glsl                         | 2 +-
 modules/gaia/tasks/constructoctreetask.cpp                    | 2 +-
 modules/gaia/tasks/constructoctreetask.h                      | 2 +-
 modules/gaia/tasks/readfilejob.cpp                            | 2 +-
 modules/gaia/tasks/readfilejob.h                              | 2 +-
 modules/gaia/tasks/readfitstask.cpp                           | 2 +-
 modules/gaia/tasks/readfitstask.h                             | 2 +-
 modules/gaia/tasks/readspecktask.cpp                          | 2 +-
 modules/gaia/tasks/readspecktask.h                            | 2 +-
 modules/galaxy/CMakeLists.txt                                 | 2 +-
 modules/galaxy/galaxymodule.cpp                               | 2 +-
 modules/galaxy/galaxymodule.h                                 | 2 +-
 modules/galaxy/rendering/galaxyraycaster.cpp                  | 2 +-
 modules/galaxy/rendering/galaxyraycaster.h                    | 2 +-
 modules/galaxy/rendering/renderablegalaxy.cpp                 | 2 +-
 modules/galaxy/rendering/renderablegalaxy.h                   | 2 +-
 modules/galaxy/shaders/billboard_fs.glsl                      | 2 +-
 modules/galaxy/shaders/billboard_ge.glsl                      | 2 +-
 modules/galaxy/shaders/billboard_vs.glsl                      | 2 +-
 modules/galaxy/shaders/points_fs.glsl                         | 2 +-
 modules/galaxy/shaders/points_vs.glsl                         | 2 +-
 modules/galaxy/shaders/raycasterbounds_fs.glsl                | 2 +-
 modules/galaxy/shaders/raycasterbounds_vs.glsl                | 2 +-
 modules/galaxy/tasks/milkywayconversiontask.cpp               | 2 +-
 modules/galaxy/tasks/milkywayconversiontask.h                 | 2 +-
 modules/galaxy/tasks/milkywaypointsconversiontask.cpp         | 2 +-
 modules/galaxy/tasks/milkywaypointsconversiontask.h           | 2 +-
 modules/globebrowsing/CMakeLists.txt                          | 2 +-
 modules/globebrowsing/globebrowsingmodule.cpp                 | 2 +-
 modules/globebrowsing/globebrowsingmodule.h                   | 2 +-
 modules/globebrowsing/globebrowsingmodule_lua.inl             | 2 +-
 modules/globebrowsing/shaders/advanced_rings_fs.glsl          | 2 +-
 modules/globebrowsing/shaders/advanced_rings_vs.glsl          | 2 +-
 modules/globebrowsing/shaders/blending.glsl                   | 2 +-
 modules/globebrowsing/shaders/geojson_fs.glsl                 | 2 +-
 modules/globebrowsing/shaders/geojson_points_fs.glsl          | 2 +-
 modules/globebrowsing/shaders/geojson_points_gs.glsl          | 2 +-
 modules/globebrowsing/shaders/geojson_points_vs.glsl          | 2 +-
 modules/globebrowsing/shaders/geojson_vs.glsl                 | 2 +-
 modules/globebrowsing/shaders/globalrenderer_vs.glsl          | 2 +-
 modules/globebrowsing/shaders/interpolate_fs.glsl             | 2 +-
 modules/globebrowsing/shaders/interpolate_vs.glsl             | 2 +-
 modules/globebrowsing/shaders/localrenderer_vs.glsl           | 2 +-
 modules/globebrowsing/shaders/renderer_fs.glsl                | 2 +-
 modules/globebrowsing/shaders/rings_fs.glsl                   | 2 +-
 modules/globebrowsing/shaders/rings_geom_fs.glsl              | 2 +-
 modules/globebrowsing/shaders/rings_geom_vs.glsl              | 2 +-
 modules/globebrowsing/shaders/rings_vs.glsl                   | 2 +-
 modules/globebrowsing/shaders/texturetilemapping.glsl         | 2 +-
 modules/globebrowsing/shaders/tile.glsl                       | 2 +-
 modules/globebrowsing/shaders/tileheight.glsl                 | 2 +-
 modules/globebrowsing/shaders/tilevertexskirt.glsl            | 2 +-
 modules/globebrowsing/src/asynctiledataprovider.cpp           | 2 +-
 modules/globebrowsing/src/asynctiledataprovider.h             | 2 +-
 modules/globebrowsing/src/basictypes.h                        | 2 +-
 modules/globebrowsing/src/dashboarditemglobelocation.cpp      | 2 +-
 modules/globebrowsing/src/dashboarditemglobelocation.h        | 2 +-
 modules/globebrowsing/src/ellipsoid.cpp                       | 2 +-
 modules/globebrowsing/src/ellipsoid.h                         | 2 +-
 modules/globebrowsing/src/gdalwrapper.cpp                     | 2 +-
 modules/globebrowsing/src/gdalwrapper.h                       | 2 +-
 modules/globebrowsing/src/geodeticpatch.cpp                   | 2 +-
 modules/globebrowsing/src/geodeticpatch.h                     | 2 +-
 modules/globebrowsing/src/geojson/geojsoncomponent.cpp        | 2 +-
 modules/globebrowsing/src/geojson/geojsoncomponent.h          | 2 +-
 modules/globebrowsing/src/geojson/geojsonmanager.cpp          | 2 +-
 modules/globebrowsing/src/geojson/geojsonmanager.h            | 2 +-
 modules/globebrowsing/src/geojson/geojsonproperties.cpp       | 2 +-
 modules/globebrowsing/src/geojson/geojsonproperties.h         | 2 +-
 modules/globebrowsing/src/geojson/globegeometryfeature.cpp    | 2 +-
 modules/globebrowsing/src/geojson/globegeometryfeature.h      | 2 +-
 modules/globebrowsing/src/geojson/globegeometryhelper.cpp     | 2 +-
 modules/globebrowsing/src/geojson/globegeometryhelper.h       | 2 +-
 modules/globebrowsing/src/globelabelscomponent.cpp            | 2 +-
 modules/globebrowsing/src/globelabelscomponent.h              | 2 +-
 modules/globebrowsing/src/globerotation.cpp                   | 2 +-
 modules/globebrowsing/src/globerotation.h                     | 2 +-
 modules/globebrowsing/src/globetranslation.cpp                | 2 +-
 modules/globebrowsing/src/globetranslation.h                  | 2 +-
 modules/globebrowsing/src/gpulayergroup.cpp                   | 2 +-
 modules/globebrowsing/src/gpulayergroup.h                     | 2 +-
 modules/globebrowsing/src/layer.cpp                           | 2 +-
 modules/globebrowsing/src/layer.h                             | 2 +-
 modules/globebrowsing/src/layeradjustment.cpp                 | 2 +-
 modules/globebrowsing/src/layeradjustment.h                   | 2 +-
 modules/globebrowsing/src/layergroup.cpp                      | 2 +-
 modules/globebrowsing/src/layergroup.h                        | 2 +-
 modules/globebrowsing/src/layergroupid.cpp                    | 2 +-
 modules/globebrowsing/src/layergroupid.h                      | 2 +-
 modules/globebrowsing/src/layermanager.cpp                    | 2 +-
 modules/globebrowsing/src/layermanager.h                      | 2 +-
 modules/globebrowsing/src/layerrendersettings.cpp             | 2 +-
 modules/globebrowsing/src/layerrendersettings.h               | 2 +-
 modules/globebrowsing/src/lrucache.h                          | 2 +-
 modules/globebrowsing/src/lrucache.inl                        | 2 +-
 modules/globebrowsing/src/lruthreadpool.h                     | 2 +-
 modules/globebrowsing/src/lruthreadpool.inl                   | 2 +-
 modules/globebrowsing/src/memoryawaretilecache.cpp            | 2 +-
 modules/globebrowsing/src/memoryawaretilecache.h              | 2 +-
 modules/globebrowsing/src/prioritizingconcurrentjobmanager.h  | 2 +-
 .../globebrowsing/src/prioritizingconcurrentjobmanager.inl    | 2 +-
 modules/globebrowsing/src/rawtile.h                           | 2 +-
 modules/globebrowsing/src/rawtiledatareader.cpp               | 2 +-
 modules/globebrowsing/src/rawtiledatareader.h                 | 2 +-
 modules/globebrowsing/src/renderableglobe.cpp                 | 2 +-
 modules/globebrowsing/src/renderableglobe.h                   | 2 +-
 modules/globebrowsing/src/ringscomponent.cpp                  | 2 +-
 modules/globebrowsing/src/ringscomponent.h                    | 2 +-
 modules/globebrowsing/src/shadowcomponent.cpp                 | 2 +-
 modules/globebrowsing/src/shadowcomponent.h                   | 2 +-
 modules/globebrowsing/src/skirtedgrid.cpp                     | 2 +-
 modules/globebrowsing/src/skirtedgrid.h                       | 2 +-
 modules/globebrowsing/src/tilecacheproperties.h               | 2 +-
 modules/globebrowsing/src/tileindex.cpp                       | 2 +-
 modules/globebrowsing/src/tileindex.h                         | 2 +-
 modules/globebrowsing/src/tileloadjob.cpp                     | 2 +-
 modules/globebrowsing/src/tileloadjob.h                       | 2 +-
 .../globebrowsing/src/tileprovider/defaulttileprovider.cpp    | 2 +-
 modules/globebrowsing/src/tileprovider/defaulttileprovider.h  | 2 +-
 .../src/tileprovider/imagesequencetileprovider.cpp            | 2 +-
 .../src/tileprovider/imagesequencetileprovider.h              | 2 +-
 .../src/tileprovider/singleimagetileprovider.cpp              | 2 +-
 .../globebrowsing/src/tileprovider/singleimagetileprovider.h  | 2 +-
 .../src/tileprovider/sizereferencetileprovider.cpp            | 2 +-
 .../src/tileprovider/sizereferencetileprovider.h              | 2 +-
 modules/globebrowsing/src/tileprovider/spoutimageprovider.cpp | 2 +-
 modules/globebrowsing/src/tileprovider/spoutimageprovider.h   | 2 +-
 .../globebrowsing/src/tileprovider/temporaltileprovider.cpp   | 2 +-
 modules/globebrowsing/src/tileprovider/temporaltileprovider.h | 2 +-
 modules/globebrowsing/src/tileprovider/texttileprovider.cpp   | 2 +-
 modules/globebrowsing/src/tileprovider/texttileprovider.h     | 2 +-
 .../globebrowsing/src/tileprovider/tileindextileprovider.cpp  | 2 +-
 .../globebrowsing/src/tileprovider/tileindextileprovider.h    | 2 +-
 modules/globebrowsing/src/tileprovider/tileprovider.cpp       | 2 +-
 modules/globebrowsing/src/tileprovider/tileprovider.h         | 2 +-
 modules/globebrowsing/src/tileprovider/tileproviderbydate.cpp | 2 +-
 modules/globebrowsing/src/tileprovider/tileproviderbydate.h   | 2 +-
 .../globebrowsing/src/tileprovider/tileproviderbyindex.cpp    | 2 +-
 modules/globebrowsing/src/tileprovider/tileproviderbyindex.h  | 2 +-
 .../globebrowsing/src/tileprovider/tileproviderbylevel.cpp    | 2 +-
 modules/globebrowsing/src/tileprovider/tileproviderbylevel.h  | 2 +-
 modules/globebrowsing/src/tiletextureinitdata.cpp             | 2 +-
 modules/globebrowsing/src/tiletextureinitdata.h               | 2 +-
 modules/globebrowsing/src/timequantizer.cpp                   | 2 +-
 modules/globebrowsing/src/timequantizer.h                     | 2 +-
 modules/imgui/CMakeLists.txt                                  | 2 +-
 modules/imgui/ext/imgui/CMakeLists.txt                        | 2 +-
 modules/imgui/imguimodule.cpp                                 | 2 +-
 modules/imgui/imguimodule.h                                   | 2 +-
 modules/imgui/include/guiactioncomponent.h                    | 2 +-
 modules/imgui/include/guicomponent.h                          | 2 +-
 modules/imgui/include/guifilepathcomponent.h                  | 2 +-
 modules/imgui/include/guigibscomponent.h                      | 2 +-
 modules/imgui/include/guiglobebrowsingcomponent.h             | 2 +-
 modules/imgui/include/guihelpcomponent.h                      | 2 +-
 modules/imgui/include/guijoystickcomponent.h                  | 2 +-
 modules/imgui/include/guimemorycomponent.h                    | 2 +-
 modules/imgui/include/guimissioncomponent.h                   | 2 +-
 modules/imgui/include/guiparallelcomponent.h                  | 2 +-
 modules/imgui/include/guipropertycomponent.h                  | 2 +-
 modules/imgui/include/guiscenecomponent.h                     | 2 +-
 modules/imgui/include/guispacetimecomponent.h                 | 2 +-
 modules/imgui/include/imgui_include.h                         | 2 +-
 modules/imgui/include/renderproperties.h                      | 2 +-
 modules/imgui/shaders/gui_fs.glsl                             | 2 +-
 modules/imgui/shaders/gui_vs.glsl                             | 2 +-
 modules/imgui/src/guiactioncomponent.cpp                      | 2 +-
 modules/imgui/src/guicomponent.cpp                            | 2 +-
 modules/imgui/src/guifilepathcomponent.cpp                    | 2 +-
 modules/imgui/src/guigibscomponent.cpp                        | 2 +-
 modules/imgui/src/guiglobebrowsingcomponent.cpp               | 2 +-
 modules/imgui/src/guihelpcomponent.cpp                        | 2 +-
 modules/imgui/src/guijoystickcomponent.cpp                    | 2 +-
 modules/imgui/src/guimemorycomponent.cpp                      | 2 +-
 modules/imgui/src/guimissioncomponent.cpp                     | 2 +-
 modules/imgui/src/guiparallelcomponent.cpp                    | 2 +-
 modules/imgui/src/guipropertycomponent.cpp                    | 2 +-
 modules/imgui/src/guiscenecomponent.cpp                       | 2 +-
 modules/imgui/src/guispacetimecomponent.cpp                   | 2 +-
 modules/imgui/src/renderproperties.cpp                        | 2 +-
 modules/iswa/CMakeLists.txt                                   | 2 +-
 modules/iswa/iswamodule.cpp                                   | 2 +-
 modules/iswa/iswamodule.h                                     | 2 +-
 modules/iswa/rendering/datacygnet.cpp                         | 2 +-
 modules/iswa/rendering/datacygnet.h                           | 2 +-
 modules/iswa/rendering/dataplane.cpp                          | 2 +-
 modules/iswa/rendering/dataplane.h                            | 2 +-
 modules/iswa/rendering/datasphere.cpp                         | 2 +-
 modules/iswa/rendering/datasphere.h                           | 2 +-
 modules/iswa/rendering/iswabasegroup.cpp                      | 2 +-
 modules/iswa/rendering/iswabasegroup.h                        | 2 +-
 modules/iswa/rendering/iswacygnet.cpp                         | 2 +-
 modules/iswa/rendering/iswacygnet.h                           | 2 +-
 modules/iswa/rendering/iswadatagroup.cpp                      | 2 +-
 modules/iswa/rendering/iswadatagroup.h                        | 2 +-
 modules/iswa/rendering/iswakameleongroup.cpp                  | 2 +-
 modules/iswa/rendering/iswakameleongroup.h                    | 2 +-
 modules/iswa/rendering/kameleonplane.cpp                      | 2 +-
 modules/iswa/rendering/kameleonplane.h                        | 2 +-
 modules/iswa/rendering/screenspacecygnet.cpp                  | 2 +-
 modules/iswa/rendering/screenspacecygnet.h                    | 2 +-
 modules/iswa/rendering/texturecygnet.cpp                      | 2 +-
 modules/iswa/rendering/texturecygnet.h                        | 2 +-
 modules/iswa/rendering/textureplane.cpp                       | 2 +-
 modules/iswa/rendering/textureplane.h                         | 2 +-
 modules/iswa/shaders/dataplane_fs.glsl                        | 2 +-
 modules/iswa/shaders/dataplane_vs.glsl                        | 2 +-
 modules/iswa/shaders/datasphere_fs.glsl                       | 2 +-
 modules/iswa/shaders/datasphere_vs.glsl                       | 2 +-
 modules/iswa/shaders/textureplane_fs.glsl                     | 2 +-
 modules/iswa/shaders/textureplane_vs.glsl                     | 2 +-
 modules/iswa/util/dataprocessor.cpp                           | 2 +-
 modules/iswa/util/dataprocessor.h                             | 2 +-
 modules/iswa/util/dataprocessorjson.cpp                       | 2 +-
 modules/iswa/util/dataprocessorjson.h                         | 2 +-
 modules/iswa/util/dataprocessorkameleon.cpp                   | 2 +-
 modules/iswa/util/dataprocessorkameleon.h                     | 2 +-
 modules/iswa/util/dataprocessortext.cpp                       | 2 +-
 modules/iswa/util/dataprocessortext.h                         | 2 +-
 modules/iswa/util/iswamanager.cpp                             | 2 +-
 modules/iswa/util/iswamanager.h                               | 2 +-
 modules/iswa/util/iswamanager_lua.inl                         | 2 +-
 modules/kameleon/CMakeLists.txt                               | 2 +-
 modules/kameleon/include/kameleonhelper.h                     | 2 +-
 modules/kameleon/include/kameleonwrapper.h                    | 2 +-
 modules/kameleon/kameleonmodule.cpp                           | 2 +-
 modules/kameleon/kameleonmodule.h                             | 2 +-
 modules/kameleon/src/kameleonhelper.cpp                       | 2 +-
 modules/kameleon/src/kameleonwrapper.cpp                      | 2 +-
 modules/kameleonvolume/CMakeLists.txt                         | 2 +-
 modules/kameleonvolume/kameleonvolumemodule.cpp               | 2 +-
 modules/kameleonvolume/kameleonvolumemodule.h                 | 2 +-
 modules/kameleonvolume/kameleonvolumereader.cpp               | 2 +-
 modules/kameleonvolume/kameleonvolumereader.h                 | 2 +-
 modules/kameleonvolume/rendering/renderablekameleonvolume.cpp | 2 +-
 modules/kameleonvolume/rendering/renderablekameleonvolume.h   | 2 +-
 modules/kameleonvolume/tasks/kameleondocumentationtask.cpp    | 2 +-
 modules/kameleonvolume/tasks/kameleondocumentationtask.h      | 2 +-
 modules/kameleonvolume/tasks/kameleonmetadatatojsontask.cpp   | 2 +-
 modules/kameleonvolume/tasks/kameleonmetadatatojsontask.h     | 2 +-
 modules/kameleonvolume/tasks/kameleonvolumetorawtask.cpp      | 2 +-
 modules/kameleonvolume/tasks/kameleonvolumetorawtask.h        | 2 +-
 modules/multiresvolume/CMakeLists.txt                         | 2 +-
 modules/multiresvolume/multiresvolumemodule.cpp               | 2 +-
 modules/multiresvolume/multiresvolumemodule.h                 | 2 +-
 modules/multiresvolume/rendering/atlasmanager.cpp             | 2 +-
 modules/multiresvolume/rendering/atlasmanager.h               | 2 +-
 modules/multiresvolume/rendering/brickcover.cpp               | 2 +-
 modules/multiresvolume/rendering/brickcover.h                 | 2 +-
 modules/multiresvolume/rendering/brickmanager.cpp             | 2 +-
 modules/multiresvolume/rendering/brickmanager.h               | 2 +-
 modules/multiresvolume/rendering/brickselection.cpp           | 2 +-
 modules/multiresvolume/rendering/brickselection.h             | 2 +-
 modules/multiresvolume/rendering/brickselector.h              | 2 +-
 modules/multiresvolume/rendering/errorhistogrammanager.cpp    | 2 +-
 modules/multiresvolume/rendering/errorhistogrammanager.h      | 2 +-
 modules/multiresvolume/rendering/histogrammanager.cpp         | 2 +-
 modules/multiresvolume/rendering/histogrammanager.h           | 2 +-
 .../multiresvolume/rendering/localerrorhistogrammanager.cpp   | 2 +-
 modules/multiresvolume/rendering/localerrorhistogrammanager.h | 2 +-
 modules/multiresvolume/rendering/localtfbrickselector.cpp     | 2 +-
 modules/multiresvolume/rendering/localtfbrickselector.h       | 2 +-
 modules/multiresvolume/rendering/multiresvolumeraycaster.cpp  | 2 +-
 modules/multiresvolume/rendering/multiresvolumeraycaster.h    | 2 +-
 modules/multiresvolume/rendering/renderablemultiresvolume.cpp | 2 +-
 modules/multiresvolume/rendering/renderablemultiresvolume.h   | 2 +-
 modules/multiresvolume/rendering/shenbrickselector.cpp        | 2 +-
 modules/multiresvolume/rendering/shenbrickselector.h          | 2 +-
 modules/multiresvolume/rendering/simpletfbrickselector.cpp    | 2 +-
 modules/multiresvolume/rendering/simpletfbrickselector.h      | 2 +-
 modules/multiresvolume/rendering/tfbrickselector.cpp          | 2 +-
 modules/multiresvolume/rendering/tfbrickselector.h            | 2 +-
 modules/multiresvolume/rendering/tsp.cpp                      | 2 +-
 modules/multiresvolume/rendering/tsp.h                        | 2 +-
 modules/multiresvolume/shaders/bounds_fs.glsl                 | 2 +-
 modules/multiresvolume/shaders/bounds_vs.glsl                 | 2 +-
 modules/multiresvolume/shaders/helper.glsl                    | 2 +-
 modules/multiresvolume/shaders/raycast.glsl                   | 2 +-
 modules/server/CMakeLists.txt                                 | 2 +-
 modules/server/include/connection.h                           | 2 +-
 modules/server/include/connectionpool.h                       | 2 +-
 modules/server/include/jsonconverters.h                       | 2 +-
 modules/server/include/serverinterface.h                      | 2 +-
 modules/server/include/topics/authorizationtopic.h            | 2 +-
 modules/server/include/topics/bouncetopic.h                   | 2 +-
 modules/server/include/topics/camerapathtopic.h               | 2 +-
 modules/server/include/topics/cameratopic.h                   | 2 +-
 modules/server/include/topics/documentationtopic.h            | 2 +-
 modules/server/include/topics/enginemodetopic.h               | 2 +-
 modules/server/include/topics/errorlogtopic.h                 | 2 +-
 modules/server/include/topics/eventtopic.h                    | 2 +-
 modules/server/include/topics/flightcontrollertopic.h         | 2 +-
 modules/server/include/topics/getpropertytopic.h              | 2 +-
 modules/server/include/topics/luascripttopic.h                | 2 +-
 modules/server/include/topics/missiontopic.h                  | 2 +-
 modules/server/include/topics/sessionrecordingtopic.h         | 2 +-
 modules/server/include/topics/setpropertytopic.h              | 2 +-
 modules/server/include/topics/shortcuttopic.h                 | 2 +-
 modules/server/include/topics/skybrowsertopic.h               | 2 +-
 modules/server/include/topics/subscriptiontopic.h             | 2 +-
 modules/server/include/topics/timetopic.h                     | 2 +-
 modules/server/include/topics/topic.h                         | 2 +-
 modules/server/include/topics/triggerpropertytopic.h          | 2 +-
 modules/server/include/topics/versiontopic.h                  | 2 +-
 modules/server/servermodule.cpp                               | 2 +-
 modules/server/servermodule.h                                 | 2 +-
 modules/server/src/connection.cpp                             | 2 +-
 modules/server/src/connectionpool.cpp                         | 2 +-
 modules/server/src/jsonconverters.cpp                         | 2 +-
 modules/server/src/serverinterface.cpp                        | 2 +-
 modules/server/src/topics/authorizationtopic.cpp              | 2 +-
 modules/server/src/topics/bouncetopic.cpp                     | 2 +-
 modules/server/src/topics/camerapathtopic.cpp                 | 2 +-
 modules/server/src/topics/cameratopic.cpp                     | 2 +-
 modules/server/src/topics/documentationtopic.cpp              | 2 +-
 modules/server/src/topics/enginemodetopic.cpp                 | 2 +-
 modules/server/src/topics/errorlogtopic.cpp                   | 2 +-
 modules/server/src/topics/eventtopic.cpp                      | 2 +-
 modules/server/src/topics/flightcontrollertopic.cpp           | 2 +-
 modules/server/src/topics/getpropertytopic.cpp                | 2 +-
 modules/server/src/topics/luascripttopic.cpp                  | 2 +-
 modules/server/src/topics/missiontopic.cpp                    | 2 +-
 modules/server/src/topics/sessionrecordingtopic.cpp           | 2 +-
 modules/server/src/topics/setpropertytopic.cpp                | 2 +-
 modules/server/src/topics/shortcuttopic.cpp                   | 2 +-
 modules/server/src/topics/skybrowsertopic.cpp                 | 2 +-
 modules/server/src/topics/subscriptiontopic.cpp               | 2 +-
 modules/server/src/topics/timetopic.cpp                       | 2 +-
 modules/server/src/topics/topic.cpp                           | 2 +-
 modules/server/src/topics/triggerpropertytopic.cpp            | 2 +-
 modules/server/src/topics/versiontopic.cpp                    | 2 +-
 modules/skybrowser/CMakeLists.txt                             | 2 +-
 modules/skybrowser/include/browser.h                          | 2 +-
 modules/skybrowser/include/renderableskytarget.h              | 2 +-
 modules/skybrowser/include/screenspaceskybrowser.h            | 2 +-
 modules/skybrowser/include/targetbrowserpair.h                | 2 +-
 modules/skybrowser/include/utility.h                          | 2 +-
 modules/skybrowser/include/wwtcommunicator.h                  | 2 +-
 modules/skybrowser/include/wwtdatahandler.h                   | 2 +-
 modules/skybrowser/shaders/target_fs.glsl                     | 2 +-
 modules/skybrowser/shaders/target_vs.glsl                     | 2 +-
 modules/skybrowser/skybrowsermodule.cpp                       | 2 +-
 modules/skybrowser/skybrowsermodule.h                         | 2 +-
 modules/skybrowser/skybrowsermodule_lua.inl                   | 2 +-
 modules/skybrowser/src/browser.cpp                            | 2 +-
 modules/skybrowser/src/renderableskytarget.cpp                | 2 +-
 modules/skybrowser/src/screenspaceskybrowser.cpp              | 2 +-
 modules/skybrowser/src/targetbrowserpair.cpp                  | 2 +-
 modules/skybrowser/src/utility.cpp                            | 2 +-
 modules/skybrowser/src/wwtcommunicator.cpp                    | 2 +-
 modules/skybrowser/src/wwtdatahandler.cpp                     | 2 +-
 modules/space/CMakeLists.txt                                  | 2 +-
 modules/space/horizonsfile.cpp                                | 2 +-
 modules/space/horizonsfile.h                                  | 2 +-
 modules/space/kepler.cpp                                      | 2 +-
 modules/space/kepler.h                                        | 2 +-
 modules/space/rendering/renderableconstellationbounds.cpp     | 2 +-
 modules/space/rendering/renderableconstellationbounds.h       | 2 +-
 modules/space/rendering/renderableconstellationlines.cpp      | 2 +-
 modules/space/rendering/renderableconstellationlines.h        | 2 +-
 modules/space/rendering/renderableconstellationsbase.cpp      | 2 +-
 modules/space/rendering/renderableconstellationsbase.h        | 2 +-
 modules/space/rendering/renderableeclipsecone.cpp             | 2 +-
 modules/space/rendering/renderableeclipsecone.h               | 2 +-
 modules/space/rendering/renderablefluxnodes.cpp               | 2 +-
 modules/space/rendering/renderablefluxnodes.h                 | 2 +-
 modules/space/rendering/renderablehabitablezone.cpp           | 2 +-
 modules/space/rendering/renderablehabitablezone.h             | 2 +-
 modules/space/rendering/renderableorbitalkepler.cpp           | 2 +-
 modules/space/rendering/renderableorbitalkepler.h             | 2 +-
 modules/space/rendering/renderablerings.cpp                   | 2 +-
 modules/space/rendering/renderablerings.h                     | 2 +-
 modules/space/rendering/renderablestars.cpp                   | 2 +-
 modules/space/rendering/renderablestars.h                     | 2 +-
 modules/space/rendering/renderabletravelspeed.cpp             | 2 +-
 modules/space/rendering/renderabletravelspeed.h               | 2 +-
 modules/space/rotation/spicerotation.cpp                      | 2 +-
 modules/space/rotation/spicerotation.h                        | 2 +-
 modules/space/shaders/constellationbounds_fs.glsl             | 2 +-
 modules/space/shaders/constellationbounds_vs.glsl             | 2 +-
 modules/space/shaders/constellationlines_fs.glsl              | 2 +-
 modules/space/shaders/constellationlines_vs.glsl              | 2 +-
 modules/space/shaders/convolution_fs.glsl                     | 2 +-
 modules/space/shaders/convolution_vs.glsl                     | 2 +-
 modules/space/shaders/debrisVizPoints_fs.glsl                 | 2 +-
 modules/space/shaders/debrisVizPoints_gs.glsl                 | 2 +-
 modules/space/shaders/debrisVizPoints_vs.glsl                 | 2 +-
 modules/space/shaders/debrisVizTrails_fs.glsl                 | 2 +-
 modules/space/shaders/debrisVizTrails_gs.glsl                 | 2 +-
 modules/space/shaders/debrisVizTrails_vs.glsl                 | 2 +-
 modules/space/shaders/eclipsecone_fs.glsl                     | 2 +-
 modules/space/shaders/eclipsecone_vs.glsl                     | 2 +-
 modules/space/shaders/fluxnodes_fs.glsl                       | 2 +-
 modules/space/shaders/fluxnodes_vs.glsl                       | 2 +-
 modules/space/shaders/habitablezone_fs.glsl                   | 2 +-
 modules/space/shaders/habitablezone_vs.glsl                   | 2 +-
 modules/space/shaders/psfToTexture_fs.glsl                    | 2 +-
 modules/space/shaders/psfToTexture_vs.glsl                    | 2 +-
 modules/space/shaders/rings_fs.glsl                           | 2 +-
 modules/space/shaders/rings_vs.glsl                           | 2 +-
 modules/space/shaders/star_fs.glsl                            | 2 +-
 modules/space/shaders/star_ge.glsl                            | 2 +-
 modules/space/shaders/star_vs.glsl                            | 2 +-
 modules/space/shaders/travelspeed_fs.glsl                     | 2 +-
 modules/space/shaders/travelspeed_vs.glsl                     | 2 +-
 modules/space/spacemodule.cpp                                 | 2 +-
 modules/space/spacemodule.h                                   | 2 +-
 modules/space/spacemodule_lua.inl                             | 2 +-
 modules/space/tasks/generatedebrisvolumetask.cpp              | 2 +-
 modules/space/tasks/generatedebrisvolumetask.h                | 2 +-
 modules/space/translation/gptranslation.cpp                   | 2 +-
 modules/space/translation/gptranslation.h                     | 2 +-
 modules/space/translation/horizonstranslation.cpp             | 2 +-
 modules/space/translation/horizonstranslation.h               | 2 +-
 modules/space/translation/keplertranslation.cpp               | 2 +-
 modules/space/translation/keplertranslation.h                 | 2 +-
 modules/space/translation/spicetranslation.cpp                | 2 +-
 modules/space/translation/spicetranslation.h                  | 2 +-
 modules/spacecraftinstruments/CMakeLists.txt                  | 2 +-
 .../dashboard/dashboarditeminstruments.cpp                    | 2 +-
 .../dashboard/dashboarditeminstruments.h                      | 2 +-
 .../rendering/renderablecrawlingline.cpp                      | 2 +-
 .../spacecraftinstruments/rendering/renderablecrawlingline.h  | 2 +-
 modules/spacecraftinstruments/rendering/renderablefov.cpp     | 2 +-
 modules/spacecraftinstruments/rendering/renderablefov.h       | 2 +-
 .../rendering/renderablemodelprojection.cpp                   | 2 +-
 .../rendering/renderablemodelprojection.h                     | 2 +-
 .../rendering/renderableplaneprojection.cpp                   | 2 +-
 .../rendering/renderableplaneprojection.h                     | 2 +-
 .../rendering/renderableplanetprojection.cpp                  | 2 +-
 .../rendering/renderableplanetprojection.h                    | 2 +-
 .../rendering/renderableshadowcylinder.cpp                    | 2 +-
 .../rendering/renderableshadowcylinder.h                      | 2 +-
 modules/spacecraftinstruments/shaders/crawlingline_fs.glsl    | 2 +-
 modules/spacecraftinstruments/shaders/crawlingline_vs.glsl    | 2 +-
 modules/spacecraftinstruments/shaders/dilation_fs.glsl        | 2 +-
 modules/spacecraftinstruments/shaders/dilation_vs.glsl        | 2 +-
 modules/spacecraftinstruments/shaders/fov_fs.glsl             | 2 +-
 modules/spacecraftinstruments/shaders/fov_vs.glsl             | 2 +-
 .../shaders/renderableModelDepth_fs.glsl                      | 2 +-
 .../shaders/renderableModelDepth_vs.glsl                      | 2 +-
 .../shaders/renderableModelProjection_fs.glsl                 | 2 +-
 .../shaders/renderableModelProjection_vs.glsl                 | 2 +-
 modules/spacecraftinstruments/shaders/renderableModel_fs.glsl | 2 +-
 modules/spacecraftinstruments/shaders/renderableModel_vs.glsl | 2 +-
 .../shaders/renderablePlanetProjection_fs.glsl                | 2 +-
 .../shaders/renderablePlanetProjection_vs.glsl                | 2 +-
 .../spacecraftinstruments/shaders/renderablePlanet_fs.glsl    | 2 +-
 .../spacecraftinstruments/shaders/renderablePlanet_vs.glsl    | 2 +-
 .../spacecraftinstruments/shaders/terminatorshadow_fs.glsl    | 2 +-
 .../spacecraftinstruments/shaders/terminatorshadow_vs.glsl    | 2 +-
 modules/spacecraftinstruments/spacecraftinstrumentsmodule.cpp | 2 +-
 modules/spacecraftinstruments/spacecraftinstrumentsmodule.h   | 2 +-
 modules/spacecraftinstruments/util/decoder.cpp                | 2 +-
 modules/spacecraftinstruments/util/decoder.h                  | 2 +-
 modules/spacecraftinstruments/util/hongkangparser.cpp         | 2 +-
 modules/spacecraftinstruments/util/hongkangparser.h           | 2 +-
 modules/spacecraftinstruments/util/image.h                    | 2 +-
 modules/spacecraftinstruments/util/imagesequencer.cpp         | 2 +-
 modules/spacecraftinstruments/util/imagesequencer.h           | 2 +-
 modules/spacecraftinstruments/util/instrumentdecoder.cpp      | 2 +-
 modules/spacecraftinstruments/util/instrumentdecoder.h        | 2 +-
 modules/spacecraftinstruments/util/instrumenttimesparser.cpp  | 2 +-
 modules/spacecraftinstruments/util/instrumenttimesparser.h    | 2 +-
 modules/spacecraftinstruments/util/labelparser.cpp            | 2 +-
 modules/spacecraftinstruments/util/labelparser.h              | 2 +-
 modules/spacecraftinstruments/util/projectioncomponent.cpp    | 2 +-
 modules/spacecraftinstruments/util/projectioncomponent.h      | 2 +-
 modules/spacecraftinstruments/util/scannerdecoder.cpp         | 2 +-
 modules/spacecraftinstruments/util/scannerdecoder.h           | 2 +-
 modules/spacecraftinstruments/util/sequenceparser.cpp         | 2 +-
 modules/spacecraftinstruments/util/sequenceparser.h           | 2 +-
 modules/spacecraftinstruments/util/targetdecoder.cpp          | 2 +-
 modules/spacecraftinstruments/util/targetdecoder.h            | 2 +-
 modules/spout/CMakeLists.txt                                  | 2 +-
 modules/spout/renderableplanespout.cpp                        | 2 +-
 modules/spout/renderableplanespout.h                          | 2 +-
 modules/spout/renderablespherespout.cpp                       | 2 +-
 modules/spout/renderablespherespout.h                         | 2 +-
 modules/spout/screenspacespout.cpp                            | 2 +-
 modules/spout/screenspacespout.h                              | 2 +-
 modules/spout/spoutlibrary.h                                  | 2 +-
 modules/spout/spoutmodule.cpp                                 | 2 +-
 modules/spout/spoutmodule.h                                   | 2 +-
 modules/spout/spoutwrapper.cpp                                | 2 +-
 modules/spout/spoutwrapper.h                                  | 2 +-
 modules/statemachine/CMakeLists.txt                           | 2 +-
 modules/statemachine/include/state.h                          | 2 +-
 modules/statemachine/include/statemachine.h                   | 2 +-
 modules/statemachine/include/transition.h                     | 2 +-
 modules/statemachine/src/state.cpp                            | 2 +-
 modules/statemachine/src/statemachine.cpp                     | 2 +-
 modules/statemachine/src/transition.cpp                       | 2 +-
 modules/statemachine/statemachinemodule.cpp                   | 2 +-
 modules/statemachine/statemachinemodule.h                     | 2 +-
 modules/statemachine/statemachinemodule_lua.inl               | 2 +-
 modules/sync/CMakeLists.txt                                   | 2 +-
 modules/sync/syncmodule.cpp                                   | 2 +-
 modules/sync/syncmodule.h                                     | 2 +-
 modules/sync/syncmodule_lua.inl                               | 2 +-
 modules/sync/syncs/httpsynchronization.cpp                    | 2 +-
 modules/sync/syncs/httpsynchronization.h                      | 2 +-
 modules/sync/syncs/urlsynchronization.cpp                     | 2 +-
 modules/sync/syncs/urlsynchronization.h                       | 2 +-
 modules/touch/CMakeLists.txt                                  | 2 +-
 modules/touch/ext/CMakeLists.txt                              | 2 +-
 modules/touch/include/directinputsolver.h                     | 2 +-
 modules/touch/include/touchinteraction.h                      | 2 +-
 modules/touch/include/touchmarker.h                           | 2 +-
 modules/touch/include/tuioear.h                               | 2 +-
 modules/touch/include/win32_touch.h                           | 2 +-
 modules/touch/shaders/marker_fs.glsl                          | 2 +-
 modules/touch/shaders/marker_vs.glsl                          | 2 +-
 modules/touch/src/directinputsolver.cpp                       | 2 +-
 modules/touch/src/touchinteraction.cpp                        | 2 +-
 modules/touch/src/touchmarker.cpp                             | 2 +-
 modules/touch/src/tuioear.cpp                                 | 2 +-
 modules/touch/src/win32_touch.cpp                             | 2 +-
 modules/touch/touchmodule.cpp                                 | 2 +-
 modules/touch/touchmodule.h                                   | 2 +-
 modules/toyvolume/CMakeLists.txt                              | 2 +-
 modules/toyvolume/rendering/renderabletoyvolume.cpp           | 2 +-
 modules/toyvolume/rendering/renderabletoyvolume.h             | 2 +-
 modules/toyvolume/rendering/toyvolumeraycaster.cpp            | 2 +-
 modules/toyvolume/rendering/toyvolumeraycaster.h              | 2 +-
 modules/toyvolume/shaders/bounds_fs.glsl                      | 2 +-
 modules/toyvolume/shaders/bounds_vs.glsl                      | 2 +-
 modules/toyvolume/shaders/raycast.glsl                        | 2 +-
 modules/toyvolume/toyvolumemodule.cpp                         | 2 +-
 modules/toyvolume/toyvolumemodule.h                           | 2 +-
 modules/video/CMakeLists.txt                                  | 2 +-
 modules/video/include/renderablevideoplane.h                  | 2 +-
 modules/video/include/renderablevideosphere.h                 | 2 +-
 modules/video/include/screenspacevideo.h                      | 2 +-
 modules/video/include/videoplayer.h                           | 2 +-
 modules/video/include/videotileprovider.h                     | 2 +-
 modules/video/src/renderablevideoplane.cpp                    | 2 +-
 modules/video/src/renderablevideosphere.cpp                   | 2 +-
 modules/video/src/screenspacevideo.cpp                        | 2 +-
 modules/video/src/videoplayer.cpp                             | 2 +-
 modules/video/src/videotileprovider.cpp                       | 2 +-
 modules/video/videomodule.cpp                                 | 2 +-
 modules/video/videomodule.h                                   | 2 +-
 modules/vislab/CMakeLists.txt                                 | 2 +-
 modules/vislab/rendering/renderabledistancelabel.cpp          | 2 +-
 modules/vislab/rendering/renderabledistancelabel.h            | 2 +-
 modules/vislab/vislabmodule.cpp                               | 2 +-
 modules/vislab/vislabmodule.h                                 | 2 +-
 modules/volume/CMakeLists.txt                                 | 2 +-
 modules/volume/envelope.cpp                                   | 2 +-
 modules/volume/envelope.h                                     | 2 +-
 modules/volume/linearlrucache.h                               | 2 +-
 modules/volume/linearlrucache.inl                             | 2 +-
 modules/volume/lrucache.h                                     | 2 +-
 modules/volume/lrucache.inl                                   | 2 +-
 modules/volume/rawvolume.h                                    | 2 +-
 modules/volume/rawvolume.inl                                  | 2 +-
 modules/volume/rawvolumemetadata.cpp                          | 2 +-
 modules/volume/rawvolumemetadata.h                            | 2 +-
 modules/volume/rawvolumereader.h                              | 2 +-
 modules/volume/rawvolumereader.inl                            | 2 +-
 modules/volume/rawvolumewriter.h                              | 2 +-
 modules/volume/rawvolumewriter.inl                            | 2 +-
 modules/volume/rendering/basicvolumeraycaster.cpp             | 2 +-
 modules/volume/rendering/basicvolumeraycaster.h               | 2 +-
 modules/volume/rendering/renderabletimevaryingvolume.cpp      | 2 +-
 modules/volume/rendering/renderabletimevaryingvolume.h        | 2 +-
 modules/volume/rendering/volumeclipplane.cpp                  | 2 +-
 modules/volume/rendering/volumeclipplane.h                    | 2 +-
 modules/volume/rendering/volumeclipplanes.cpp                 | 2 +-
 modules/volume/rendering/volumeclipplanes.h                   | 2 +-
 modules/volume/shaders/bounds_fs.glsl                         | 2 +-
 modules/volume/shaders/bounds_vs.glsl                         | 2 +-
 modules/volume/shaders/helper.glsl                            | 2 +-
 modules/volume/shaders/raycast.glsl                           | 2 +-
 modules/volume/tasks/generaterawvolumefromfiletask.cpp        | 2 +-
 modules/volume/tasks/generaterawvolumefromfiletask.h          | 2 +-
 modules/volume/tasks/generaterawvolumetask.cpp                | 2 +-
 modules/volume/tasks/generaterawvolumetask.h                  | 2 +-
 modules/volume/textureslicevolumereader.h                     | 2 +-
 modules/volume/textureslicevolumereader.inl                   | 2 +-
 modules/volume/transferfunction.cpp                           | 2 +-
 modules/volume/transferfunction.h                             | 2 +-
 modules/volume/transferfunctionhandler.cpp                    | 2 +-
 modules/volume/transferfunctionhandler.h                      | 2 +-
 modules/volume/transferfunctionproperty.cpp                   | 2 +-
 modules/volume/transferfunctionproperty.h                     | 2 +-
 modules/volume/volumegridtype.cpp                             | 2 +-
 modules/volume/volumegridtype.h                               | 2 +-
 modules/volume/volumemodule.cpp                               | 2 +-
 modules/volume/volumemodule.h                                 | 2 +-
 modules/volume/volumesampler.h                                | 2 +-
 modules/volume/volumesampler.inl                              | 2 +-
 modules/volume/volumeutils.cpp                                | 2 +-
 modules/volume/volumeutils.h                                  | 2 +-
 modules/webbrowser/CMakeLists.txt                             | 2 +-
 modules/webbrowser/cmake/cef_support.cmake                    | 2 +-
 modules/webbrowser/cmake/webbrowser_helpers.cmake             | 2 +-
 modules/webbrowser/include/browserclient.h                    | 2 +-
 modules/webbrowser/include/browserinstance.h                  | 2 +-
 modules/webbrowser/include/cefhost.h                          | 2 +-
 modules/webbrowser/include/defaultbrowserlauncher.h           | 2 +-
 modules/webbrowser/include/eventhandler.h                     | 2 +-
 modules/webbrowser/include/screenspacebrowser.h               | 2 +-
 modules/webbrowser/include/webbrowserapp.h                    | 2 +-
 modules/webbrowser/include/webkeyboardhandler.h               | 2 +-
 modules/webbrowser/include/webrenderhandler.h                 | 2 +-
 modules/webbrowser/shaders/screenspace_fs.glsl                | 2 +-
 modules/webbrowser/shaders/screenspace_vs.glsl                | 2 +-
 modules/webbrowser/src/browserclient.cpp                      | 2 +-
 modules/webbrowser/src/browserinstance.cpp                    | 2 +-
 modules/webbrowser/src/cefhost.cpp                            | 2 +-
 modules/webbrowser/src/defaultbrowserlauncher.cpp             | 2 +-
 modules/webbrowser/src/eventhandler.cpp                       | 2 +-
 modules/webbrowser/src/processhelperlinux.cpp                 | 2 +-
 modules/webbrowser/src/processhelpermac.cpp                   | 2 +-
 modules/webbrowser/src/processhelperwindows.cpp               | 2 +-
 modules/webbrowser/src/screenspacebrowser.cpp                 | 2 +-
 modules/webbrowser/src/webbrowserapp.cpp                      | 2 +-
 modules/webbrowser/src/webkeyboardhandler.cpp                 | 2 +-
 modules/webbrowser/src/webrenderhandler.cpp                   | 2 +-
 modules/webbrowser/webbrowsermodule.cpp                       | 2 +-
 modules/webbrowser/webbrowsermodule.h                         | 2 +-
 modules/webgui/CMakeLists.txt                                 | 2 +-
 modules/webgui/cmake/nodejs_support.cmake                     | 2 +-
 modules/webgui/webguimodule.cpp                               | 2 +-
 modules/webgui/webguimodule.h                                 | 2 +-
 shaders/PowerScaling/powerScalingMath.hglsl                   | 2 +-
 shaders/PowerScaling/powerScaling_fs.hglsl                    | 2 +-
 shaders/PowerScaling/powerScaling_vs.hglsl                    | 2 +-
 shaders/blending.glsl                                         | 2 +-
 shaders/core/xyzuvrgba_fs.glsl                                | 2 +-
 shaders/core/xyzuvrgba_vs.glsl                                | 2 +-
 shaders/floatoperations.glsl                                  | 2 +-
 shaders/fragment.glsl                                         | 2 +-
 shaders/framebuffer/exitframebuffer.frag                      | 2 +-
 shaders/framebuffer/fxaa.frag                                 | 2 +-
 shaders/framebuffer/fxaa.vert                                 | 2 +-
 shaders/framebuffer/hdrAndFiltering.frag                      | 2 +-
 shaders/framebuffer/hdrAndFiltering.vert                      | 2 +-
 shaders/framebuffer/inside.glsl                               | 2 +-
 shaders/framebuffer/mergeDownscaledVolume.frag                | 2 +-
 shaders/framebuffer/mergeDownscaledVolume.vert                | 2 +-
 shaders/framebuffer/nOneStripMSAA.frag                        | 2 +-
 shaders/framebuffer/nOneStripMSAA.vert                        | 2 +-
 shaders/framebuffer/outside.glsl                              | 2 +-
 shaders/framebuffer/raycastframebuffer.frag                   | 2 +-
 shaders/framebuffer/renderframebuffer.frag                    | 2 +-
 shaders/framebuffer/resolveframebuffer.vert                   | 2 +-
 shaders/hdr.glsl                                              | 2 +-
 shaders/rand.glsl                                             | 2 +-
 src/CMakeLists.txt                                            | 2 +-
 src/camera/camera.cpp                                         | 2 +-
 src/data/csvloader.cpp                                        | 2 +-
 src/data/dataloader.cpp                                       | 2 +-
 src/data/datamapping.cpp                                      | 2 +-
 src/data/speckloader.cpp                                      | 2 +-
 src/documentation/core_registration.cpp                       | 2 +-
 src/documentation/documentation.cpp                           | 2 +-
 src/documentation/documentationengine.cpp                     | 2 +-
 src/documentation/documentationgenerator.cpp                  | 2 +-
 src/documentation/verifier.cpp                                | 2 +-
 src/engine/configuration.cpp                                  | 2 +-
 src/engine/downloadmanager.cpp                                | 2 +-
 src/engine/globals.cpp                                        | 2 +-
 src/engine/globalscallbacks.cpp                               | 2 +-
 src/engine/logfactory.cpp                                     | 2 +-
 src/engine/moduleengine.cpp                                   | 2 +-
 src/engine/moduleengine_lua.inl                               | 2 +-
 src/engine/openspaceengine.cpp                                | 2 +-
 src/engine/openspaceengine_lua.inl                            | 2 +-
 src/engine/settings.cpp                                       | 2 +-
 src/engine/syncengine.cpp                                     | 2 +-
 src/events/event.cpp                                          | 2 +-
 src/events/eventengine.cpp                                    | 2 +-
 src/events/eventengine_lua.inl                                | 2 +-
 src/interaction/actionmanager.cpp                             | 2 +-
 src/interaction/actionmanager_lua.inl                         | 2 +-
 src/interaction/camerainteractionstates.cpp                   | 2 +-
 src/interaction/interactionmonitor.cpp                        | 2 +-
 src/interaction/joystickcamerastates.cpp                      | 2 +-
 src/interaction/joystickinputstate.cpp                        | 2 +-
 src/interaction/keybindingmanager.cpp                         | 2 +-
 src/interaction/keybindingmanager_lua.inl                     | 2 +-
 src/interaction/keyboardinputstate.cpp                        | 2 +-
 src/interaction/keyframerecordinghandler.cpp                  | 2 +-
 src/interaction/mousecamerastates.cpp                         | 2 +-
 src/interaction/mouseinputstate.cpp                           | 2 +-
 src/interaction/scriptcamerastates.cpp                        | 2 +-
 src/interaction/sessionrecording.cpp                          | 2 +-
 src/interaction/sessionrecordinghandler.cpp                   | 2 +-
 src/interaction/sessionrecordinghandler_lua.inl               | 2 +-
 src/interaction/tasks/convertrecformattask.cpp                | 2 +-
 src/interaction/touchbar.mm                                   | 2 +-
 src/interaction/websocketcamerastates.cpp                     | 2 +-
 src/interaction/websocketinputstate.cpp                       | 2 +-
 src/mission/mission.cpp                                       | 2 +-
 src/mission/missionmanager.cpp                                | 2 +-
 src/mission/missionmanager_lua.inl                            | 2 +-
 src/navigation/keyframenavigator.cpp                          | 2 +-
 src/navigation/navigationhandler.cpp                          | 2 +-
 src/navigation/navigationhandler_lua.inl                      | 2 +-
 src/navigation/navigationstate.cpp                            | 2 +-
 src/navigation/orbitalnavigator.cpp                           | 2 +-
 src/navigation/orbitalnavigator_lua.inl                       | 2 +-
 src/navigation/path.cpp                                       | 2 +-
 src/navigation/pathcurve.cpp                                  | 2 +-
 src/navigation/pathcurves/avoidcollisioncurve.cpp             | 2 +-
 src/navigation/pathcurves/zoomoutoverviewcurve.cpp            | 2 +-
 src/navigation/pathnavigator.cpp                              | 2 +-
 src/navigation/pathnavigator_lua.inl                          | 2 +-
 src/navigation/waypoint.cpp                                   | 2 +-
 src/network/messagestructureshelper.cpp                       | 2 +-
 src/network/parallelconnection.cpp                            | 2 +-
 src/network/parallelpeer.cpp                                  | 2 +-
 src/network/parallelpeer_lua.inl                              | 2 +-
 src/openspace.cpp                                             | 4 ++--
 src/properties/list/doublelistproperty.cpp                    | 2 +-
 src/properties/list/intlistproperty.cpp                       | 2 +-
 src/properties/list/stringlistproperty.cpp                    | 2 +-
 src/properties/matrix/dmat2property.cpp                       | 2 +-
 src/properties/matrix/dmat3property.cpp                       | 2 +-
 src/properties/matrix/dmat4property.cpp                       | 2 +-
 src/properties/matrix/mat2property.cpp                        | 2 +-
 src/properties/matrix/mat3property.cpp                        | 2 +-
 src/properties/matrix/mat4property.cpp                        | 2 +-
 src/properties/optionproperty.cpp                             | 2 +-
 src/properties/property.cpp                                   | 2 +-
 src/properties/propertyowner.cpp                              | 2 +-
 src/properties/scalar/boolproperty.cpp                        | 2 +-
 src/properties/scalar/doubleproperty.cpp                      | 2 +-
 src/properties/scalar/floatproperty.cpp                       | 2 +-
 src/properties/scalar/intproperty.cpp                         | 2 +-
 src/properties/scalar/longproperty.cpp                        | 2 +-
 src/properties/scalar/shortproperty.cpp                       | 2 +-
 src/properties/scalar/uintproperty.cpp                        | 2 +-
 src/properties/scalar/ulongproperty.cpp                       | 2 +-
 src/properties/scalar/ushortproperty.cpp                      | 2 +-
 src/properties/selectionproperty.cpp                          | 2 +-
 src/properties/stringproperty.cpp                             | 2 +-
 src/properties/triggerproperty.cpp                            | 2 +-
 src/properties/vector/dvec2property.cpp                       | 2 +-
 src/properties/vector/dvec3property.cpp                       | 2 +-
 src/properties/vector/dvec4property.cpp                       | 2 +-
 src/properties/vector/ivec2property.cpp                       | 2 +-
 src/properties/vector/ivec3property.cpp                       | 2 +-
 src/properties/vector/ivec4property.cpp                       | 2 +-
 src/properties/vector/uvec2property.cpp                       | 2 +-
 src/properties/vector/uvec3property.cpp                       | 2 +-
 src/properties/vector/uvec4property.cpp                       | 2 +-
 src/properties/vector/vec2property.cpp                        | 2 +-
 src/properties/vector/vec3property.cpp                        | 2 +-
 src/properties/vector/vec4property.cpp                        | 2 +-
 src/query/query.cpp                                           | 2 +-
 src/rendering/colormappingcomponent.cpp                       | 2 +-
 src/rendering/dashboard.cpp                                   | 2 +-
 src/rendering/dashboard_lua.inl                               | 2 +-
 src/rendering/dashboarditem.cpp                               | 2 +-
 src/rendering/dashboardtextitem.cpp                           | 2 +-
 src/rendering/deferredcastermanager.cpp                       | 2 +-
 src/rendering/fadeable.cpp                                    | 2 +-
 src/rendering/framebufferrenderer.cpp                         | 2 +-
 src/rendering/helper.cpp                                      | 2 +-
 src/rendering/labelscomponent.cpp                             | 2 +-
 src/rendering/loadingscreen.cpp                               | 2 +-
 src/rendering/luaconsole.cpp                                  | 2 +-
 src/rendering/raycastermanager.cpp                            | 2 +-
 src/rendering/renderable.cpp                                  | 2 +-
 src/rendering/renderengine.cpp                                | 2 +-
 src/rendering/renderengine_lua.inl                            | 2 +-
 src/rendering/screenspacerenderable.cpp                       | 2 +-
 src/rendering/texturecomponent.cpp                            | 2 +-
 src/rendering/transferfunction.cpp                            | 2 +-
 src/rendering/volumeraycaster.cpp                             | 2 +-
 src/scene/asset.cpp                                           | 2 +-
 src/scene/assetmanager.cpp                                    | 2 +-
 src/scene/assetmanager_lua.inl                                | 2 +-
 src/scene/lightsource.cpp                                     | 2 +-
 src/scene/profile.cpp                                         | 2 +-
 src/scene/profile_lua.inl                                     | 2 +-
 src/scene/rotation.cpp                                        | 2 +-
 src/scene/scale.cpp                                           | 2 +-
 src/scene/scene.cpp                                           | 2 +-
 src/scene/scene_lua.inl                                       | 2 +-
 src/scene/scenegraphnode.cpp                                  | 2 +-
 src/scene/sceneinitializer.cpp                                | 2 +-
 src/scene/timeframe.cpp                                       | 2 +-
 src/scene/translation.cpp                                     | 2 +-
 src/scripting/lualibrary.cpp                                  | 2 +-
 src/scripting/scriptengine.cpp                                | 2 +-
 src/scripting/scriptengine_lua.inl                            | 2 +-
 src/scripting/scriptscheduler.cpp                             | 2 +-
 src/scripting/scriptscheduler_lua.inl                         | 2 +-
 src/scripting/systemcapabilitiesbinding.cpp                   | 2 +-
 src/scripting/systemcapabilitiesbinding_lua.inl               | 2 +-
 src/util/blockplaneintersectiongeometry.cpp                   | 2 +-
 src/util/boxgeometry.cpp                                      | 2 +-
 src/util/collisionhelper.cpp                                  | 2 +-
 src/util/coordinateconversion.cpp                             | 2 +-
 src/util/distanceconversion.cpp                               | 2 +-
 src/util/factorymanager.cpp                                   | 2 +-
 src/util/histogram.cpp                                        | 2 +-
 src/util/httprequest.cpp                                      | 2 +-
 src/util/json_helper.cpp                                      | 2 +-
 src/util/keys.cpp                                             | 2 +-
 src/util/openspacemodule.cpp                                  | 2 +-
 src/util/planegeometry.cpp                                    | 2 +-
 src/util/progressbar.cpp                                      | 2 +-
 src/util/resourcesynchronization.cpp                          | 2 +-
 src/util/screenlog.cpp                                        | 2 +-
 src/util/sphere.cpp                                           | 2 +-
 src/util/spicemanager.cpp                                     | 2 +-
 src/util/spicemanager_lua.inl                                 | 2 +-
 src/util/syncbuffer.cpp                                       | 2 +-
 src/util/task.cpp                                             | 2 +-
 src/util/taskloader.cpp                                       | 2 +-
 src/util/threadpool.cpp                                       | 2 +-
 src/util/time.cpp                                             | 2 +-
 src/util/time_lua.inl                                         | 2 +-
 src/util/timeconversion.cpp                                   | 2 +-
 src/util/timeline.cpp                                         | 2 +-
 src/util/timemanager.cpp                                      | 2 +-
 src/util/timerange.cpp                                        | 2 +-
 src/util/touch.cpp                                            | 2 +-
 src/util/transformationmanager.cpp                            | 2 +-
 src/util/tstring.cpp                                          | 2 +-
 src/util/universalhelpers.cpp                                 | 2 +-
 src/util/versionchecker.cpp                                   | 2 +-
 support/assetvalidation/AssetValidation.py                    | 4 ++--
 support/assetvalidation/main.py                               | 4 ++--
 support/cmake/application_definition.cmake                    | 2 +-
 support/cmake/global_variables.cmake                          | 2 +-
 support/cmake/module_common.cmake                             | 2 +-
 support/cmake/module_definition.cmake                         | 2 +-
 support/cmake/openspace_header.template                       | 2 +-
 support/cmake/packaging.cmake                                 | 2 +-
 support/cmake/set_openspace_compile_settings.cmake            | 2 +-
 support/coding/check_style_guide.py                           | 4 ++--
 support/coding/codegen                                        | 2 +-
 tests/CMakeLists.txt                                          | 2 +-
 tests/main.cpp                                                | 2 +-
 tests/property/test_property_listproperties.cpp               | 2 +-
 tests/property/test_property_optionproperty.cpp               | 2 +-
 tests/property/test_property_selectionproperty.cpp            | 2 +-
 tests/regression/517.cpp                                      | 2 +-
 tests/test_assetloader.cpp                                    | 2 +-
 tests/test_concurrentqueue.cpp                                | 2 +-
 tests/test_distanceconversion.cpp                             | 2 +-
 tests/test_documentation.cpp                                  | 2 +-
 tests/test_horizons.cpp                                       | 2 +-
 tests/test_iswamanager.cpp                                    | 2 +-
 tests/test_jsonformatting.cpp                                 | 2 +-
 tests/test_latlonpatch.cpp                                    | 2 +-
 tests/test_lrucache.cpp                                       | 2 +-
 tests/test_lua_createsinglecolorimage.cpp                     | 2 +-
 tests/test_profile.cpp                                        | 2 +-
 tests/test_rawvolumeio.cpp                                    | 2 +-
 tests/test_scriptscheduler.cpp                                | 2 +-
 tests/test_sessionrecording.cpp                               | 2 +-
 tests/test_settings.cpp                                       | 2 +-
 tests/test_sgctedit.cpp                                       | 2 +-
 tests/test_spicemanager.cpp                                   | 2 +-
 tests/test_timeconversion.cpp                                 | 2 +-
 tests/test_timeline.cpp                                       | 2 +-
 tests/test_timequantizer.cpp                                  | 2 +-
 1392 files changed, 1396 insertions(+), 1396 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 65ac51bcc3..c97abd15d3 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -2,7 +2,7 @@
 #                                                                                        #
 # OpenSpace                                                                              #
 #                                                                                        #
-# Copyright (c) 2014-2024                                                                #
+# Copyright (c) 2014-2025                                                                #
 #                                                                                        #
 # Permission is hereby granted, free of charge, to any person obtaining a copy of this   #
 # software and associated documentation files (the "Software"), to deal in the Software  #
diff --git a/LICENSE.md b/LICENSE.md
index 410a6a9215..5d0c0b2827 100644
--- a/LICENSE.md
+++ b/LICENSE.md
@@ -1,4 +1,4 @@
-Copyright (c) 2014-2024
+Copyright (c) 2014-2025
 
 Permission is hereby granted, free of charge, to any person obtaining a copy of this
 software and associated documentation files (the "Software"), to deal in the Software
diff --git a/apps/CMakeLists.txt b/apps/CMakeLists.txt
index 6d7931f159..c4158fd6fa 100644
--- a/apps/CMakeLists.txt
+++ b/apps/CMakeLists.txt
@@ -2,7 +2,7 @@
 #                                                                                        #
 # OpenSpace                                                                              #
 #                                                                                        #
-# Copyright (c) 2014-2024                                                                #
+# Copyright (c) 2014-2025                                                                #
 #                                                                                        #
 # Permission is hereby granted, free of charge, to any person obtaining a copy of this   #
 # software and associated documentation files (the "Software"), to deal in the Software  #
diff --git a/apps/DocsWriter/CMakeLists.txt b/apps/DocsWriter/CMakeLists.txt
index 71ccd08808..05891d8830 100644
--- a/apps/DocsWriter/CMakeLists.txt
+++ b/apps/DocsWriter/CMakeLists.txt
@@ -2,7 +2,7 @@
 #                                                                                        #
 # OpenSpace                                                                              #
 #                                                                                        #
-# Copyright (c) 2014-2024                                                                #
+# Copyright (c) 2014-2025                                                                #
 #                                                                                        #
 # Permission is hereby granted, free of charge, to any person obtaining a copy of this   #
 # software and associated documentation files (the "Software"), to deal in the Software  #
diff --git a/apps/DocsWriter/main.cpp b/apps/DocsWriter/main.cpp
index d285fd7140..1bfe2e79b2 100644
--- a/apps/DocsWriter/main.cpp
+++ b/apps/DocsWriter/main.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/apps/OpenSpace-MinVR/main.cpp b/apps/OpenSpace-MinVR/main.cpp
index bf1deb5c1a..961bb15b9c 100644
--- a/apps/OpenSpace-MinVR/main.cpp
+++ b/apps/OpenSpace-MinVR/main.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/apps/OpenSpace/CMakeLists.txt b/apps/OpenSpace/CMakeLists.txt
index 729f4bf4fe..2df78b12af 100644
--- a/apps/OpenSpace/CMakeLists.txt
+++ b/apps/OpenSpace/CMakeLists.txt
@@ -2,7 +2,7 @@
 #                                                                                        #
 # OpenSpace                                                                              #
 #                                                                                        #
-# Copyright (c) 2014-2024                                                                #
+# Copyright (c) 2014-2025                                                                #
 #                                                                                        #
 # Permission is hereby granted, free of charge, to any person obtaining a copy of this   #
 # software and associated documentation files (the "Software"), to deal in the Software  #
diff --git a/apps/OpenSpace/ext/launcher/CMakeLists.txt b/apps/OpenSpace/ext/launcher/CMakeLists.txt
index 3fe59b0c89..68e32b60ab 100644
--- a/apps/OpenSpace/ext/launcher/CMakeLists.txt
+++ b/apps/OpenSpace/ext/launcher/CMakeLists.txt
@@ -2,7 +2,7 @@
 #                                                                                        #
 # OpenSpace                                                                              #
 #                                                                                        #
-# Copyright (c) 2014-2024                                                                #
+# Copyright (c) 2014-2025                                                                #
 #                                                                                        #
 # Permission is hereby granted, free of charge, to any person obtaining a copy of this   #
 # software and associated documentation files (the "Software"), to deal in the Software  #
diff --git a/apps/OpenSpace/ext/launcher/include/filesystemaccess.h b/apps/OpenSpace/ext/launcher/include/filesystemaccess.h
index 5f5d593598..0817c93efc 100644
--- a/apps/OpenSpace/ext/launcher/include/filesystemaccess.h
+++ b/apps/OpenSpace/ext/launcher/include/filesystemaccess.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/apps/OpenSpace/ext/launcher/include/launcherwindow.h b/apps/OpenSpace/ext/launcher/include/launcherwindow.h
index c296f45c35..a8e311f078 100644
--- a/apps/OpenSpace/ext/launcher/include/launcherwindow.h
+++ b/apps/OpenSpace/ext/launcher/include/launcherwindow.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/apps/OpenSpace/ext/launcher/include/profile/actiondialog.h b/apps/OpenSpace/ext/launcher/include/profile/actiondialog.h
index 0cdd2b5c13..e7ae11d8ea 100644
--- a/apps/OpenSpace/ext/launcher/include/profile/actiondialog.h
+++ b/apps/OpenSpace/ext/launcher/include/profile/actiondialog.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/apps/OpenSpace/ext/launcher/include/profile/additionalscriptsdialog.h b/apps/OpenSpace/ext/launcher/include/profile/additionalscriptsdialog.h
index 3bdfdfd039..031e364f3e 100644
--- a/apps/OpenSpace/ext/launcher/include/profile/additionalscriptsdialog.h
+++ b/apps/OpenSpace/ext/launcher/include/profile/additionalscriptsdialog.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/apps/OpenSpace/ext/launcher/include/profile/assetedit.h b/apps/OpenSpace/ext/launcher/include/profile/assetedit.h
index 7b0d329fb0..7df6c18957 100644
--- a/apps/OpenSpace/ext/launcher/include/profile/assetedit.h
+++ b/apps/OpenSpace/ext/launcher/include/profile/assetedit.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/apps/OpenSpace/ext/launcher/include/profile/assetsdialog.h b/apps/OpenSpace/ext/launcher/include/profile/assetsdialog.h
index ec06ba98bb..84e8da3b00 100644
--- a/apps/OpenSpace/ext/launcher/include/profile/assetsdialog.h
+++ b/apps/OpenSpace/ext/launcher/include/profile/assetsdialog.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/apps/OpenSpace/ext/launcher/include/profile/assettreeitem.h b/apps/OpenSpace/ext/launcher/include/profile/assettreeitem.h
index 9f9d585ca6..a4100b9e3b 100644
--- a/apps/OpenSpace/ext/launcher/include/profile/assettreeitem.h
+++ b/apps/OpenSpace/ext/launcher/include/profile/assettreeitem.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/apps/OpenSpace/ext/launcher/include/profile/assettreemodel.h b/apps/OpenSpace/ext/launcher/include/profile/assettreemodel.h
index 3e01675759..f8a8b903b0 100644
--- a/apps/OpenSpace/ext/launcher/include/profile/assettreemodel.h
+++ b/apps/OpenSpace/ext/launcher/include/profile/assettreemodel.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/apps/OpenSpace/ext/launcher/include/profile/cameradialog.h b/apps/OpenSpace/ext/launcher/include/profile/cameradialog.h
index ea98ffc2cf..ae86162acb 100644
--- a/apps/OpenSpace/ext/launcher/include/profile/cameradialog.h
+++ b/apps/OpenSpace/ext/launcher/include/profile/cameradialog.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/apps/OpenSpace/ext/launcher/include/profile/deltatimesdialog.h b/apps/OpenSpace/ext/launcher/include/profile/deltatimesdialog.h
index 0b516cf276..856ac4d8be 100644
--- a/apps/OpenSpace/ext/launcher/include/profile/deltatimesdialog.h
+++ b/apps/OpenSpace/ext/launcher/include/profile/deltatimesdialog.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/apps/OpenSpace/ext/launcher/include/profile/horizonsdialog.h b/apps/OpenSpace/ext/launcher/include/profile/horizonsdialog.h
index 3fd5f5006a..f1cee0e0ea 100644
--- a/apps/OpenSpace/ext/launcher/include/profile/horizonsdialog.h
+++ b/apps/OpenSpace/ext/launcher/include/profile/horizonsdialog.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/apps/OpenSpace/ext/launcher/include/profile/line.h b/apps/OpenSpace/ext/launcher/include/profile/line.h
index 84bcd02a52..b7602b726d 100644
--- a/apps/OpenSpace/ext/launcher/include/profile/line.h
+++ b/apps/OpenSpace/ext/launcher/include/profile/line.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/apps/OpenSpace/ext/launcher/include/profile/marknodesdialog.h b/apps/OpenSpace/ext/launcher/include/profile/marknodesdialog.h
index 963631e4f1..3ddf7aceac 100644
--- a/apps/OpenSpace/ext/launcher/include/profile/marknodesdialog.h
+++ b/apps/OpenSpace/ext/launcher/include/profile/marknodesdialog.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/apps/OpenSpace/ext/launcher/include/profile/metadialog.h b/apps/OpenSpace/ext/launcher/include/profile/metadialog.h
index 40d151e978..25268a5c8e 100644
--- a/apps/OpenSpace/ext/launcher/include/profile/metadialog.h
+++ b/apps/OpenSpace/ext/launcher/include/profile/metadialog.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/apps/OpenSpace/ext/launcher/include/profile/modulesdialog.h b/apps/OpenSpace/ext/launcher/include/profile/modulesdialog.h
index 649ecba6f0..96a961023b 100644
--- a/apps/OpenSpace/ext/launcher/include/profile/modulesdialog.h
+++ b/apps/OpenSpace/ext/launcher/include/profile/modulesdialog.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/apps/OpenSpace/ext/launcher/include/profile/profileedit.h b/apps/OpenSpace/ext/launcher/include/profile/profileedit.h
index 383dcddd9a..fc75e289e0 100644
--- a/apps/OpenSpace/ext/launcher/include/profile/profileedit.h
+++ b/apps/OpenSpace/ext/launcher/include/profile/profileedit.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/apps/OpenSpace/ext/launcher/include/profile/propertiesdialog.h b/apps/OpenSpace/ext/launcher/include/profile/propertiesdialog.h
index 8783ab6242..99f6cac5b1 100644
--- a/apps/OpenSpace/ext/launcher/include/profile/propertiesdialog.h
+++ b/apps/OpenSpace/ext/launcher/include/profile/propertiesdialog.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/apps/OpenSpace/ext/launcher/include/profile/scriptlogdialog.h b/apps/OpenSpace/ext/launcher/include/profile/scriptlogdialog.h
index 8c59dcf3b6..582741433d 100644
--- a/apps/OpenSpace/ext/launcher/include/profile/scriptlogdialog.h
+++ b/apps/OpenSpace/ext/launcher/include/profile/scriptlogdialog.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/apps/OpenSpace/ext/launcher/include/profile/timedialog.h b/apps/OpenSpace/ext/launcher/include/profile/timedialog.h
index 9875b5eab2..13eaf03910 100644
--- a/apps/OpenSpace/ext/launcher/include/profile/timedialog.h
+++ b/apps/OpenSpace/ext/launcher/include/profile/timedialog.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/apps/OpenSpace/ext/launcher/include/settingsdialog.h b/apps/OpenSpace/ext/launcher/include/settingsdialog.h
index 5ca8b1de01..d28bf3f8f6 100644
--- a/apps/OpenSpace/ext/launcher/include/settingsdialog.h
+++ b/apps/OpenSpace/ext/launcher/include/settingsdialog.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/apps/OpenSpace/ext/launcher/include/sgctedit/displaywindowunion.h b/apps/OpenSpace/ext/launcher/include/sgctedit/displaywindowunion.h
index 19311f452f..251d10e63b 100644
--- a/apps/OpenSpace/ext/launcher/include/sgctedit/displaywindowunion.h
+++ b/apps/OpenSpace/ext/launcher/include/sgctedit/displaywindowunion.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/apps/OpenSpace/ext/launcher/include/sgctedit/monitorbox.h b/apps/OpenSpace/ext/launcher/include/sgctedit/monitorbox.h
index 99e0003fc8..02bcb05ebc 100644
--- a/apps/OpenSpace/ext/launcher/include/sgctedit/monitorbox.h
+++ b/apps/OpenSpace/ext/launcher/include/sgctedit/monitorbox.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/apps/OpenSpace/ext/launcher/include/sgctedit/orientationdialog.h b/apps/OpenSpace/ext/launcher/include/sgctedit/orientationdialog.h
index 5c332589e9..51b088fe41 100644
--- a/apps/OpenSpace/ext/launcher/include/sgctedit/orientationdialog.h
+++ b/apps/OpenSpace/ext/launcher/include/sgctedit/orientationdialog.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/apps/OpenSpace/ext/launcher/include/sgctedit/settingswidget.h b/apps/OpenSpace/ext/launcher/include/sgctedit/settingswidget.h
index 4b020a302b..86cfaac759 100644
--- a/apps/OpenSpace/ext/launcher/include/sgctedit/settingswidget.h
+++ b/apps/OpenSpace/ext/launcher/include/sgctedit/settingswidget.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/apps/OpenSpace/ext/launcher/include/sgctedit/sgctedit.h b/apps/OpenSpace/ext/launcher/include/sgctedit/sgctedit.h
index 850364dafc..8991fdb1da 100644
--- a/apps/OpenSpace/ext/launcher/include/sgctedit/sgctedit.h
+++ b/apps/OpenSpace/ext/launcher/include/sgctedit/sgctedit.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/apps/OpenSpace/ext/launcher/include/sgctedit/windowcontrol.h b/apps/OpenSpace/ext/launcher/include/sgctedit/windowcontrol.h
index bbd5759d75..8a66b6922f 100644
--- a/apps/OpenSpace/ext/launcher/include/sgctedit/windowcontrol.h
+++ b/apps/OpenSpace/ext/launcher/include/sgctedit/windowcontrol.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/apps/OpenSpace/ext/launcher/src/filesystemaccess.cpp b/apps/OpenSpace/ext/launcher/src/filesystemaccess.cpp
index f6ca441454..858570061e 100644
--- a/apps/OpenSpace/ext/launcher/src/filesystemaccess.cpp
+++ b/apps/OpenSpace/ext/launcher/src/filesystemaccess.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/apps/OpenSpace/ext/launcher/src/launcherwindow.cpp b/apps/OpenSpace/ext/launcher/src/launcherwindow.cpp
index 33aaeb1a55..d8fba39c29 100644
--- a/apps/OpenSpace/ext/launcher/src/launcherwindow.cpp
+++ b/apps/OpenSpace/ext/launcher/src/launcherwindow.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/apps/OpenSpace/ext/launcher/src/profile/actiondialog.cpp b/apps/OpenSpace/ext/launcher/src/profile/actiondialog.cpp
index 5207f4ddde..5112712a30 100644
--- a/apps/OpenSpace/ext/launcher/src/profile/actiondialog.cpp
+++ b/apps/OpenSpace/ext/launcher/src/profile/actiondialog.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/apps/OpenSpace/ext/launcher/src/profile/additionalscriptsdialog.cpp b/apps/OpenSpace/ext/launcher/src/profile/additionalscriptsdialog.cpp
index 9810c3d530..245b2f8ec3 100644
--- a/apps/OpenSpace/ext/launcher/src/profile/additionalscriptsdialog.cpp
+++ b/apps/OpenSpace/ext/launcher/src/profile/additionalscriptsdialog.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/apps/OpenSpace/ext/launcher/src/profile/assetedit.cpp b/apps/OpenSpace/ext/launcher/src/profile/assetedit.cpp
index cd744d2b64..0ea4ab91bf 100644
--- a/apps/OpenSpace/ext/launcher/src/profile/assetedit.cpp
+++ b/apps/OpenSpace/ext/launcher/src/profile/assetedit.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/apps/OpenSpace/ext/launcher/src/profile/assetsdialog.cpp b/apps/OpenSpace/ext/launcher/src/profile/assetsdialog.cpp
index d44fa22386..cc0f5999c1 100644
--- a/apps/OpenSpace/ext/launcher/src/profile/assetsdialog.cpp
+++ b/apps/OpenSpace/ext/launcher/src/profile/assetsdialog.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/apps/OpenSpace/ext/launcher/src/profile/assettreeitem.cpp b/apps/OpenSpace/ext/launcher/src/profile/assettreeitem.cpp
index 67690c8b33..085f393d9b 100644
--- a/apps/OpenSpace/ext/launcher/src/profile/assettreeitem.cpp
+++ b/apps/OpenSpace/ext/launcher/src/profile/assettreeitem.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/apps/OpenSpace/ext/launcher/src/profile/assettreemodel.cpp b/apps/OpenSpace/ext/launcher/src/profile/assettreemodel.cpp
index dc392c82a3..06e6baa82a 100644
--- a/apps/OpenSpace/ext/launcher/src/profile/assettreemodel.cpp
+++ b/apps/OpenSpace/ext/launcher/src/profile/assettreemodel.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/apps/OpenSpace/ext/launcher/src/profile/cameradialog.cpp b/apps/OpenSpace/ext/launcher/src/profile/cameradialog.cpp
index 3da47bdafc..fdc0e9baa8 100644
--- a/apps/OpenSpace/ext/launcher/src/profile/cameradialog.cpp
+++ b/apps/OpenSpace/ext/launcher/src/profile/cameradialog.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/apps/OpenSpace/ext/launcher/src/profile/deltatimesdialog.cpp b/apps/OpenSpace/ext/launcher/src/profile/deltatimesdialog.cpp
index 78e1f3c945..6c01ae11eb 100644
--- a/apps/OpenSpace/ext/launcher/src/profile/deltatimesdialog.cpp
+++ b/apps/OpenSpace/ext/launcher/src/profile/deltatimesdialog.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/apps/OpenSpace/ext/launcher/src/profile/horizonsdialog.cpp b/apps/OpenSpace/ext/launcher/src/profile/horizonsdialog.cpp
index beecd9e159..a317892e24 100644
--- a/apps/OpenSpace/ext/launcher/src/profile/horizonsdialog.cpp
+++ b/apps/OpenSpace/ext/launcher/src/profile/horizonsdialog.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/apps/OpenSpace/ext/launcher/src/profile/line.cpp b/apps/OpenSpace/ext/launcher/src/profile/line.cpp
index 6bbf62cf88..c36a89848a 100644
--- a/apps/OpenSpace/ext/launcher/src/profile/line.cpp
+++ b/apps/OpenSpace/ext/launcher/src/profile/line.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/apps/OpenSpace/ext/launcher/src/profile/marknodesdialog.cpp b/apps/OpenSpace/ext/launcher/src/profile/marknodesdialog.cpp
index 3409693f14..bb1a664e18 100644
--- a/apps/OpenSpace/ext/launcher/src/profile/marknodesdialog.cpp
+++ b/apps/OpenSpace/ext/launcher/src/profile/marknodesdialog.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/apps/OpenSpace/ext/launcher/src/profile/metadialog.cpp b/apps/OpenSpace/ext/launcher/src/profile/metadialog.cpp
index 8ee1586c7b..4fd0342c1f 100644
--- a/apps/OpenSpace/ext/launcher/src/profile/metadialog.cpp
+++ b/apps/OpenSpace/ext/launcher/src/profile/metadialog.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/apps/OpenSpace/ext/launcher/src/profile/modulesdialog.cpp b/apps/OpenSpace/ext/launcher/src/profile/modulesdialog.cpp
index 218d522c8f..d59b23d032 100644
--- a/apps/OpenSpace/ext/launcher/src/profile/modulesdialog.cpp
+++ b/apps/OpenSpace/ext/launcher/src/profile/modulesdialog.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/apps/OpenSpace/ext/launcher/src/profile/profileedit.cpp b/apps/OpenSpace/ext/launcher/src/profile/profileedit.cpp
index be512f3e62..a9025d6029 100644
--- a/apps/OpenSpace/ext/launcher/src/profile/profileedit.cpp
+++ b/apps/OpenSpace/ext/launcher/src/profile/profileedit.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/apps/OpenSpace/ext/launcher/src/profile/propertiesdialog.cpp b/apps/OpenSpace/ext/launcher/src/profile/propertiesdialog.cpp
index 5b3ef0dcae..fb99b04bd0 100644
--- a/apps/OpenSpace/ext/launcher/src/profile/propertiesdialog.cpp
+++ b/apps/OpenSpace/ext/launcher/src/profile/propertiesdialog.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/apps/OpenSpace/ext/launcher/src/profile/scriptlogdialog.cpp b/apps/OpenSpace/ext/launcher/src/profile/scriptlogdialog.cpp
index 5ac9a3693d..7a88ce9c57 100644
--- a/apps/OpenSpace/ext/launcher/src/profile/scriptlogdialog.cpp
+++ b/apps/OpenSpace/ext/launcher/src/profile/scriptlogdialog.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/apps/OpenSpace/ext/launcher/src/profile/timedialog.cpp b/apps/OpenSpace/ext/launcher/src/profile/timedialog.cpp
index bfcf007978..22be9609f9 100644
--- a/apps/OpenSpace/ext/launcher/src/profile/timedialog.cpp
+++ b/apps/OpenSpace/ext/launcher/src/profile/timedialog.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/apps/OpenSpace/ext/launcher/src/settingsdialog.cpp b/apps/OpenSpace/ext/launcher/src/settingsdialog.cpp
index 5aba82fd34..0dc036a102 100644
--- a/apps/OpenSpace/ext/launcher/src/settingsdialog.cpp
+++ b/apps/OpenSpace/ext/launcher/src/settingsdialog.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/apps/OpenSpace/ext/launcher/src/sgctedit/displaywindowunion.cpp b/apps/OpenSpace/ext/launcher/src/sgctedit/displaywindowunion.cpp
index cba7f49461..e881d26feb 100644
--- a/apps/OpenSpace/ext/launcher/src/sgctedit/displaywindowunion.cpp
+++ b/apps/OpenSpace/ext/launcher/src/sgctedit/displaywindowunion.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/apps/OpenSpace/ext/launcher/src/sgctedit/monitorbox.cpp b/apps/OpenSpace/ext/launcher/src/sgctedit/monitorbox.cpp
index 57b1eb7809..2966e83514 100644
--- a/apps/OpenSpace/ext/launcher/src/sgctedit/monitorbox.cpp
+++ b/apps/OpenSpace/ext/launcher/src/sgctedit/monitorbox.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/apps/OpenSpace/ext/launcher/src/sgctedit/orientationdialog.cpp b/apps/OpenSpace/ext/launcher/src/sgctedit/orientationdialog.cpp
index d310b51431..a434075c78 100644
--- a/apps/OpenSpace/ext/launcher/src/sgctedit/orientationdialog.cpp
+++ b/apps/OpenSpace/ext/launcher/src/sgctedit/orientationdialog.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/apps/OpenSpace/ext/launcher/src/sgctedit/settingswidget.cpp b/apps/OpenSpace/ext/launcher/src/sgctedit/settingswidget.cpp
index 75a8a2a6c5..f0f8d0a628 100644
--- a/apps/OpenSpace/ext/launcher/src/sgctedit/settingswidget.cpp
+++ b/apps/OpenSpace/ext/launcher/src/sgctedit/settingswidget.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/apps/OpenSpace/ext/launcher/src/sgctedit/sgctedit.cpp b/apps/OpenSpace/ext/launcher/src/sgctedit/sgctedit.cpp
index acd57c8794..f7c4b7a908 100644
--- a/apps/OpenSpace/ext/launcher/src/sgctedit/sgctedit.cpp
+++ b/apps/OpenSpace/ext/launcher/src/sgctedit/sgctedit.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/apps/OpenSpace/ext/launcher/src/sgctedit/windowcontrol.cpp b/apps/OpenSpace/ext/launcher/src/sgctedit/windowcontrol.cpp
index d8fcf6cf63..b250435604 100644
--- a/apps/OpenSpace/ext/launcher/src/sgctedit/windowcontrol.cpp
+++ b/apps/OpenSpace/ext/launcher/src/sgctedit/windowcontrol.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/apps/OpenSpace/ext/sgct b/apps/OpenSpace/ext/sgct
index a7e96b7d07..883b70dd9f 160000
--- a/apps/OpenSpace/ext/sgct
+++ b/apps/OpenSpace/ext/sgct
@@ -1 +1 @@
-Subproject commit a7e96b7d07ddfd1d20df253fc35c0252358fb740
+Subproject commit 883b70dd9fe71c0c8a7c5b5cbdf0fe42c7f85108
diff --git a/apps/OpenSpace/main.cpp b/apps/OpenSpace/main.cpp
index 3918027d29..cd9b3662d9 100644
--- a/apps/OpenSpace/main.cpp
+++ b/apps/OpenSpace/main.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/apps/Sync/main.cpp b/apps/Sync/main.cpp
index db1f64a6f6..f71d43d821 100644
--- a/apps/Sync/main.cpp
+++ b/apps/Sync/main.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/apps/TaskRunner/main.cpp b/apps/TaskRunner/main.cpp
index a3593ea4a9..1ae27cb841 100644
--- a/apps/TaskRunner/main.cpp
+++ b/apps/TaskRunner/main.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/data/assets/examples/renderable/renderablemodel/data/model_fs.glsl b/data/assets/examples/renderable/renderablemodel/data/model_fs.glsl
index 106e1603bc..0904120f5f 100644
--- a/data/assets/examples/renderable/renderablemodel/data/model_fs.glsl
+++ b/data/assets/examples/renderable/renderablemodel/data/model_fs.glsl
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/data/assets/examples/renderable/renderablemodel/data/model_vs.glsl b/data/assets/examples/renderable/renderablemodel/data/model_vs.glsl
index 9d12edc407..9b42649aa3 100644
--- a/data/assets/examples/renderable/renderablemodel/data/model_vs.glsl
+++ b/data/assets/examples/renderable/renderablemodel/data/model_vs.glsl
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/ext/CMakeLists.txt b/ext/CMakeLists.txt
index f33aeb676a..cea0e12481 100644
--- a/ext/CMakeLists.txt
+++ b/ext/CMakeLists.txt
@@ -2,7 +2,7 @@
 #                                                                                        #
 # OpenSpace                                                                              #
 #                                                                                        #
-# Copyright (c) 2014-2024                                                                #
+# Copyright (c) 2014-2025                                                                #
 #                                                                                        #
 # Permission is hereby granted, free of charge, to any person obtaining a copy of this   #
 # software and associated documentation files (the "Software"), to deal in the Software  #
diff --git a/ext/ghoul b/ext/ghoul
index 1c9121472f..e2828e0438 160000
--- a/ext/ghoul
+++ b/ext/ghoul
@@ -1 +1 @@
-Subproject commit 1c9121472f18c5b9035c493260fc6441be03b1a5
+Subproject commit e2828e043863433119513acbd74bd2cf8622d0a0
diff --git a/include/openspace/camera/camera.h b/include/openspace/camera/camera.h
index 9fa3bd8ea8..2c343df921 100644
--- a/include/openspace/camera/camera.h
+++ b/include/openspace/camera/camera.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/include/openspace/camera/camerapose.h b/include/openspace/camera/camerapose.h
index 1eca506326..9e0fb90b57 100644
--- a/include/openspace/camera/camerapose.h
+++ b/include/openspace/camera/camerapose.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/include/openspace/data/csvloader.h b/include/openspace/data/csvloader.h
index 911e2fe3db..ad4b6c297c 100644
--- a/include/openspace/data/csvloader.h
+++ b/include/openspace/data/csvloader.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/include/openspace/data/dataloader.h b/include/openspace/data/dataloader.h
index 2296885f25..1641802767 100644
--- a/include/openspace/data/dataloader.h
+++ b/include/openspace/data/dataloader.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/include/openspace/data/datamapping.h b/include/openspace/data/datamapping.h
index 9504a78aab..5554c630d9 100644
--- a/include/openspace/data/datamapping.h
+++ b/include/openspace/data/datamapping.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/include/openspace/data/speckloader.h b/include/openspace/data/speckloader.h
index eb72101e3a..fe4175f9f4 100644
--- a/include/openspace/data/speckloader.h
+++ b/include/openspace/data/speckloader.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/include/openspace/documentation/core_registration.h b/include/openspace/documentation/core_registration.h
index 6d876b458f..91b19300ca 100644
--- a/include/openspace/documentation/core_registration.h
+++ b/include/openspace/documentation/core_registration.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/include/openspace/documentation/documentation.h b/include/openspace/documentation/documentation.h
index 0989e0697f..e57e7ff262 100644
--- a/include/openspace/documentation/documentation.h
+++ b/include/openspace/documentation/documentation.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/include/openspace/documentation/documentationengine.h b/include/openspace/documentation/documentationengine.h
index cf9dbeff45..60a251a348 100644
--- a/include/openspace/documentation/documentationengine.h
+++ b/include/openspace/documentation/documentationengine.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/include/openspace/documentation/verifier.h b/include/openspace/documentation/verifier.h
index 8108508459..b7d4b03324 100644
--- a/include/openspace/documentation/verifier.h
+++ b/include/openspace/documentation/verifier.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/include/openspace/documentation/verifier.inl b/include/openspace/documentation/verifier.inl
index ce930ff558..7ba00334f6 100644
--- a/include/openspace/documentation/verifier.inl
+++ b/include/openspace/documentation/verifier.inl
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/include/openspace/engine/configuration.h b/include/openspace/engine/configuration.h
index e592a907e6..609caafe16 100644
--- a/include/openspace/engine/configuration.h
+++ b/include/openspace/engine/configuration.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/include/openspace/engine/downloadmanager.h b/include/openspace/engine/downloadmanager.h
index 11bf5d7081..952c8a28eb 100644
--- a/include/openspace/engine/downloadmanager.h
+++ b/include/openspace/engine/downloadmanager.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/include/openspace/engine/globals.h b/include/openspace/engine/globals.h
index 2e7b671373..6eca1b720e 100644
--- a/include/openspace/engine/globals.h
+++ b/include/openspace/engine/globals.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/include/openspace/engine/globalscallbacks.h b/include/openspace/engine/globalscallbacks.h
index e6b9b505b0..f454fb134e 100644
--- a/include/openspace/engine/globalscallbacks.h
+++ b/include/openspace/engine/globalscallbacks.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/include/openspace/engine/logfactory.h b/include/openspace/engine/logfactory.h
index b60a11987c..61e0816ae8 100644
--- a/include/openspace/engine/logfactory.h
+++ b/include/openspace/engine/logfactory.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/include/openspace/engine/moduleengine.h b/include/openspace/engine/moduleengine.h
index ac59c614c3..9cb789dc81 100644
--- a/include/openspace/engine/moduleengine.h
+++ b/include/openspace/engine/moduleengine.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/include/openspace/engine/moduleengine.inl b/include/openspace/engine/moduleengine.inl
index 3925728251..c53d2105af 100644
--- a/include/openspace/engine/moduleengine.inl
+++ b/include/openspace/engine/moduleengine.inl
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/include/openspace/engine/openspaceengine.h b/include/openspace/engine/openspaceengine.h
index bca6e52241..edeb821dac 100644
--- a/include/openspace/engine/openspaceengine.h
+++ b/include/openspace/engine/openspaceengine.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/include/openspace/engine/settings.h b/include/openspace/engine/settings.h
index 0095810d5c..d167d8544d 100644
--- a/include/openspace/engine/settings.h
+++ b/include/openspace/engine/settings.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/include/openspace/engine/syncengine.h b/include/openspace/engine/syncengine.h
index 36abe1d828..9274130233 100644
--- a/include/openspace/engine/syncengine.h
+++ b/include/openspace/engine/syncengine.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/include/openspace/engine/windowdelegate.h b/include/openspace/engine/windowdelegate.h
index 2a44e55528..73c6fa27fd 100644
--- a/include/openspace/engine/windowdelegate.h
+++ b/include/openspace/engine/windowdelegate.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/include/openspace/events/event.h b/include/openspace/events/event.h
index cebcea7d2a..c43f4978ed 100644
--- a/include/openspace/events/event.h
+++ b/include/openspace/events/event.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/include/openspace/events/eventengine.h b/include/openspace/events/eventengine.h
index d6f01da10e..1c3d484cd0 100644
--- a/include/openspace/events/eventengine.h
+++ b/include/openspace/events/eventengine.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/include/openspace/events/eventengine.inl b/include/openspace/events/eventengine.inl
index 7961fa4c7f..ac052670b0 100644
--- a/include/openspace/events/eventengine.inl
+++ b/include/openspace/events/eventengine.inl
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/include/openspace/interaction/action.h b/include/openspace/interaction/action.h
index 6a69dfcf87..77b728ef8b 100644
--- a/include/openspace/interaction/action.h
+++ b/include/openspace/interaction/action.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/include/openspace/interaction/actionmanager.h b/include/openspace/interaction/actionmanager.h
index 009ba8f8f3..ef139163f3 100644
--- a/include/openspace/interaction/actionmanager.h
+++ b/include/openspace/interaction/actionmanager.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/include/openspace/interaction/camerainteractionstates.h b/include/openspace/interaction/camerainteractionstates.h
index efdceb476a..3f22a5eaf8 100644
--- a/include/openspace/interaction/camerainteractionstates.h
+++ b/include/openspace/interaction/camerainteractionstates.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/include/openspace/interaction/delayedvariable.h b/include/openspace/interaction/delayedvariable.h
index 26cd6f059e..790e0d5ac5 100644
--- a/include/openspace/interaction/delayedvariable.h
+++ b/include/openspace/interaction/delayedvariable.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/include/openspace/interaction/delayedvariable.inl b/include/openspace/interaction/delayedvariable.inl
index e0e26dbb45..c7d99f4ddd 100644
--- a/include/openspace/interaction/delayedvariable.inl
+++ b/include/openspace/interaction/delayedvariable.inl
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/include/openspace/interaction/interactionmonitor.h b/include/openspace/interaction/interactionmonitor.h
index d668bd4939..5b634145fd 100644
--- a/include/openspace/interaction/interactionmonitor.h
+++ b/include/openspace/interaction/interactionmonitor.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/include/openspace/interaction/interpolator.h b/include/openspace/interaction/interpolator.h
index 0167776ded..616e512482 100644
--- a/include/openspace/interaction/interpolator.h
+++ b/include/openspace/interaction/interpolator.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/include/openspace/interaction/interpolator.inl b/include/openspace/interaction/interpolator.inl
index d02bc0ec74..ad5312ac47 100644
--- a/include/openspace/interaction/interpolator.inl
+++ b/include/openspace/interaction/interpolator.inl
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/include/openspace/interaction/joystickcamerastates.h b/include/openspace/interaction/joystickcamerastates.h
index 46cc3f6d7b..edd4e86bc3 100644
--- a/include/openspace/interaction/joystickcamerastates.h
+++ b/include/openspace/interaction/joystickcamerastates.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/include/openspace/interaction/joystickinputstate.h b/include/openspace/interaction/joystickinputstate.h
index 87aa4f7497..12b81e1ee4 100644
--- a/include/openspace/interaction/joystickinputstate.h
+++ b/include/openspace/interaction/joystickinputstate.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/include/openspace/interaction/keybindingmanager.h b/include/openspace/interaction/keybindingmanager.h
index 3793387719..94707e68e4 100644
--- a/include/openspace/interaction/keybindingmanager.h
+++ b/include/openspace/interaction/keybindingmanager.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/include/openspace/interaction/keyboardinputstate.h b/include/openspace/interaction/keyboardinputstate.h
index fd0ac8beaf..481ebae77c 100644
--- a/include/openspace/interaction/keyboardinputstate.h
+++ b/include/openspace/interaction/keyboardinputstate.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/include/openspace/interaction/keyframerecordinghandler.h b/include/openspace/interaction/keyframerecordinghandler.h
index c8e814cc3a..64e96ed3b1 100644
--- a/include/openspace/interaction/keyframerecordinghandler.h
+++ b/include/openspace/interaction/keyframerecordinghandler.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/include/openspace/interaction/mousecamerastates.h b/include/openspace/interaction/mousecamerastates.h
index 6015a2e495..55fe49e514 100644
--- a/include/openspace/interaction/mousecamerastates.h
+++ b/include/openspace/interaction/mousecamerastates.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/include/openspace/interaction/mouseinputstate.h b/include/openspace/interaction/mouseinputstate.h
index bef3482969..0c7aaef1bc 100644
--- a/include/openspace/interaction/mouseinputstate.h
+++ b/include/openspace/interaction/mouseinputstate.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/include/openspace/interaction/scriptcamerastates.h b/include/openspace/interaction/scriptcamerastates.h
index 3eb5dfd31e..2aebcc070f 100644
--- a/include/openspace/interaction/scriptcamerastates.h
+++ b/include/openspace/interaction/scriptcamerastates.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/include/openspace/interaction/sessionrecording.h b/include/openspace/interaction/sessionrecording.h
index 1af1bf9e39..88c890eda8 100644
--- a/include/openspace/interaction/sessionrecording.h
+++ b/include/openspace/interaction/sessionrecording.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/include/openspace/interaction/sessionrecordinghandler.h b/include/openspace/interaction/sessionrecordinghandler.h
index 796b0e7fcc..7b1a8aeb69 100644
--- a/include/openspace/interaction/sessionrecordinghandler.h
+++ b/include/openspace/interaction/sessionrecordinghandler.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/include/openspace/interaction/tasks/convertrecformattask.h b/include/openspace/interaction/tasks/convertrecformattask.h
index 86d3539ca1..385e73f9cd 100644
--- a/include/openspace/interaction/tasks/convertrecformattask.h
+++ b/include/openspace/interaction/tasks/convertrecformattask.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/include/openspace/interaction/touchbar.h b/include/openspace/interaction/touchbar.h
index 77f405ab70..68c9263dba 100644
--- a/include/openspace/interaction/touchbar.h
+++ b/include/openspace/interaction/touchbar.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/include/openspace/interaction/websocketcamerastates.h b/include/openspace/interaction/websocketcamerastates.h
index dd5a76c992..2fc50547bf 100644
--- a/include/openspace/interaction/websocketcamerastates.h
+++ b/include/openspace/interaction/websocketcamerastates.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/include/openspace/interaction/websocketinputstate.h b/include/openspace/interaction/websocketinputstate.h
index e37f55fbdb..593fb22394 100644
--- a/include/openspace/interaction/websocketinputstate.h
+++ b/include/openspace/interaction/websocketinputstate.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/include/openspace/json.h b/include/openspace/json.h
index 26fee89531..0ee0f7f992 100644
--- a/include/openspace/json.h
+++ b/include/openspace/json.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/include/openspace/mission/mission.h b/include/openspace/mission/mission.h
index 3e0205ac2d..f959cbc913 100644
--- a/include/openspace/mission/mission.h
+++ b/include/openspace/mission/mission.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/include/openspace/mission/missionmanager.h b/include/openspace/mission/missionmanager.h
index bd0b4cd028..b07dcd5973 100644
--- a/include/openspace/mission/missionmanager.h
+++ b/include/openspace/mission/missionmanager.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/include/openspace/navigation/keyframenavigator.h b/include/openspace/navigation/keyframenavigator.h
index 4e923dcdb5..fd979f5a83 100644
--- a/include/openspace/navigation/keyframenavigator.h
+++ b/include/openspace/navigation/keyframenavigator.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/include/openspace/navigation/navigationhandler.h b/include/openspace/navigation/navigationhandler.h
index 5ba261b7ee..d9e37bcae9 100644
--- a/include/openspace/navigation/navigationhandler.h
+++ b/include/openspace/navigation/navigationhandler.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/include/openspace/navigation/navigationstate.h b/include/openspace/navigation/navigationstate.h
index cc4dc376a3..ced0f6dd3b 100644
--- a/include/openspace/navigation/navigationstate.h
+++ b/include/openspace/navigation/navigationstate.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/include/openspace/navigation/orbitalnavigator.h b/include/openspace/navigation/orbitalnavigator.h
index deaa8b5f85..ab84fad1fd 100644
--- a/include/openspace/navigation/orbitalnavigator.h
+++ b/include/openspace/navigation/orbitalnavigator.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/include/openspace/navigation/path.h b/include/openspace/navigation/path.h
index 752c1f08d6..ffa0661a57 100644
--- a/include/openspace/navigation/path.h
+++ b/include/openspace/navigation/path.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/include/openspace/navigation/pathcurve.h b/include/openspace/navigation/pathcurve.h
index c5aea40b02..f379f24304 100644
--- a/include/openspace/navigation/pathcurve.h
+++ b/include/openspace/navigation/pathcurve.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/include/openspace/navigation/pathcurves/avoidcollisioncurve.h b/include/openspace/navigation/pathcurves/avoidcollisioncurve.h
index 77a3344394..f42257f2f3 100644
--- a/include/openspace/navigation/pathcurves/avoidcollisioncurve.h
+++ b/include/openspace/navigation/pathcurves/avoidcollisioncurve.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/include/openspace/navigation/pathcurves/zoomoutoverviewcurve.h b/include/openspace/navigation/pathcurves/zoomoutoverviewcurve.h
index e32200e97e..32ee9ee5d8 100644
--- a/include/openspace/navigation/pathcurves/zoomoutoverviewcurve.h
+++ b/include/openspace/navigation/pathcurves/zoomoutoverviewcurve.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/include/openspace/navigation/pathnavigator.h b/include/openspace/navigation/pathnavigator.h
index 713288299a..97e95f1053 100644
--- a/include/openspace/navigation/pathnavigator.h
+++ b/include/openspace/navigation/pathnavigator.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/include/openspace/navigation/waypoint.h b/include/openspace/navigation/waypoint.h
index a6cdb9d30e..e1bc04a8b9 100644
--- a/include/openspace/navigation/waypoint.h
+++ b/include/openspace/navigation/waypoint.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/include/openspace/network/messagestructures.h b/include/openspace/network/messagestructures.h
index 8fb79932bd..045b9f2b1f 100644
--- a/include/openspace/network/messagestructures.h
+++ b/include/openspace/network/messagestructures.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/include/openspace/network/messagestructureshelper.h b/include/openspace/network/messagestructureshelper.h
index 21d2028159..dac6cd0504 100644
--- a/include/openspace/network/messagestructureshelper.h
+++ b/include/openspace/network/messagestructureshelper.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/include/openspace/network/parallelconnection.h b/include/openspace/network/parallelconnection.h
index b17ef6ae21..7ccdda42f7 100644
--- a/include/openspace/network/parallelconnection.h
+++ b/include/openspace/network/parallelconnection.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/include/openspace/network/parallelpeer.h b/include/openspace/network/parallelpeer.h
index 6fa11ea13c..6882550974 100644
--- a/include/openspace/network/parallelpeer.h
+++ b/include/openspace/network/parallelpeer.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/include/openspace/properties/list/doublelistproperty.h b/include/openspace/properties/list/doublelistproperty.h
index 86831a15dc..3fbebed9c1 100644
--- a/include/openspace/properties/list/doublelistproperty.h
+++ b/include/openspace/properties/list/doublelistproperty.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/include/openspace/properties/list/intlistproperty.h b/include/openspace/properties/list/intlistproperty.h
index f10f638cf3..a462752a67 100644
--- a/include/openspace/properties/list/intlistproperty.h
+++ b/include/openspace/properties/list/intlistproperty.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/include/openspace/properties/list/stringlistproperty.h b/include/openspace/properties/list/stringlistproperty.h
index 085e42e3da..d7590ca5be 100644
--- a/include/openspace/properties/list/stringlistproperty.h
+++ b/include/openspace/properties/list/stringlistproperty.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/include/openspace/properties/listproperty.h b/include/openspace/properties/listproperty.h
index da39b572a0..dc10f3fc25 100644
--- a/include/openspace/properties/listproperty.h
+++ b/include/openspace/properties/listproperty.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/include/openspace/properties/listproperty.inl b/include/openspace/properties/listproperty.inl
index 8ac8980a9e..6d17be9a39 100644
--- a/include/openspace/properties/listproperty.inl
+++ b/include/openspace/properties/listproperty.inl
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/include/openspace/properties/matrix/dmat2property.h b/include/openspace/properties/matrix/dmat2property.h
index aad0b641b5..0cadb496ba 100644
--- a/include/openspace/properties/matrix/dmat2property.h
+++ b/include/openspace/properties/matrix/dmat2property.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/include/openspace/properties/matrix/dmat3property.h b/include/openspace/properties/matrix/dmat3property.h
index 8487f99b6f..9a15bbf7a6 100644
--- a/include/openspace/properties/matrix/dmat3property.h
+++ b/include/openspace/properties/matrix/dmat3property.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/include/openspace/properties/matrix/dmat4property.h b/include/openspace/properties/matrix/dmat4property.h
index 5c6c199821..9828026526 100644
--- a/include/openspace/properties/matrix/dmat4property.h
+++ b/include/openspace/properties/matrix/dmat4property.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/include/openspace/properties/matrix/mat2property.h b/include/openspace/properties/matrix/mat2property.h
index 625e6c4fad..c8a62f2f5d 100644
--- a/include/openspace/properties/matrix/mat2property.h
+++ b/include/openspace/properties/matrix/mat2property.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/include/openspace/properties/matrix/mat3property.h b/include/openspace/properties/matrix/mat3property.h
index ffab98c91d..7f033f1333 100644
--- a/include/openspace/properties/matrix/mat3property.h
+++ b/include/openspace/properties/matrix/mat3property.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/include/openspace/properties/matrix/mat4property.h b/include/openspace/properties/matrix/mat4property.h
index e77aad59e8..e84a193c89 100644
--- a/include/openspace/properties/matrix/mat4property.h
+++ b/include/openspace/properties/matrix/mat4property.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/include/openspace/properties/numericalproperty.h b/include/openspace/properties/numericalproperty.h
index 5bdd656048..d91a4bc573 100644
--- a/include/openspace/properties/numericalproperty.h
+++ b/include/openspace/properties/numericalproperty.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/include/openspace/properties/numericalproperty.inl b/include/openspace/properties/numericalproperty.inl
index d687449650..2bcc81f9a8 100644
--- a/include/openspace/properties/numericalproperty.inl
+++ b/include/openspace/properties/numericalproperty.inl
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/include/openspace/properties/optionproperty.h b/include/openspace/properties/optionproperty.h
index aaa8b49242..f46826b811 100644
--- a/include/openspace/properties/optionproperty.h
+++ b/include/openspace/properties/optionproperty.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/include/openspace/properties/property.h b/include/openspace/properties/property.h
index e2e66d940b..78f18882ab 100644
--- a/include/openspace/properties/property.h
+++ b/include/openspace/properties/property.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/include/openspace/properties/propertyowner.h b/include/openspace/properties/propertyowner.h
index 80009b2392..5bd852d783 100644
--- a/include/openspace/properties/propertyowner.h
+++ b/include/openspace/properties/propertyowner.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/include/openspace/properties/scalar/boolproperty.h b/include/openspace/properties/scalar/boolproperty.h
index 4c97effe5a..65fc5fab09 100644
--- a/include/openspace/properties/scalar/boolproperty.h
+++ b/include/openspace/properties/scalar/boolproperty.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/include/openspace/properties/scalar/doubleproperty.h b/include/openspace/properties/scalar/doubleproperty.h
index 64718668c8..da55bd7883 100644
--- a/include/openspace/properties/scalar/doubleproperty.h
+++ b/include/openspace/properties/scalar/doubleproperty.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/include/openspace/properties/scalar/floatproperty.h b/include/openspace/properties/scalar/floatproperty.h
index d0e9bd634c..86453fb1be 100644
--- a/include/openspace/properties/scalar/floatproperty.h
+++ b/include/openspace/properties/scalar/floatproperty.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/include/openspace/properties/scalar/intproperty.h b/include/openspace/properties/scalar/intproperty.h
index 293394a06b..25606d2c7a 100644
--- a/include/openspace/properties/scalar/intproperty.h
+++ b/include/openspace/properties/scalar/intproperty.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/include/openspace/properties/scalar/longproperty.h b/include/openspace/properties/scalar/longproperty.h
index b466314766..712d7739eb 100644
--- a/include/openspace/properties/scalar/longproperty.h
+++ b/include/openspace/properties/scalar/longproperty.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/include/openspace/properties/scalar/shortproperty.h b/include/openspace/properties/scalar/shortproperty.h
index c3ee633957..e0151bd487 100644
--- a/include/openspace/properties/scalar/shortproperty.h
+++ b/include/openspace/properties/scalar/shortproperty.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/include/openspace/properties/scalar/uintproperty.h b/include/openspace/properties/scalar/uintproperty.h
index 4704ae52ed..c3cbc01e31 100644
--- a/include/openspace/properties/scalar/uintproperty.h
+++ b/include/openspace/properties/scalar/uintproperty.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/include/openspace/properties/scalar/ulongproperty.h b/include/openspace/properties/scalar/ulongproperty.h
index 0a7e74ae9a..d0e79cfbcd 100644
--- a/include/openspace/properties/scalar/ulongproperty.h
+++ b/include/openspace/properties/scalar/ulongproperty.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/include/openspace/properties/scalar/ushortproperty.h b/include/openspace/properties/scalar/ushortproperty.h
index e3592ed77e..398ff85e0d 100644
--- a/include/openspace/properties/scalar/ushortproperty.h
+++ b/include/openspace/properties/scalar/ushortproperty.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/include/openspace/properties/selectionproperty.h b/include/openspace/properties/selectionproperty.h
index 99363069dc..171e694eff 100644
--- a/include/openspace/properties/selectionproperty.h
+++ b/include/openspace/properties/selectionproperty.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/include/openspace/properties/stringproperty.h b/include/openspace/properties/stringproperty.h
index bd33a65f34..19383e3487 100644
--- a/include/openspace/properties/stringproperty.h
+++ b/include/openspace/properties/stringproperty.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/include/openspace/properties/templateproperty.h b/include/openspace/properties/templateproperty.h
index a61716d466..ad6eb26f17 100644
--- a/include/openspace/properties/templateproperty.h
+++ b/include/openspace/properties/templateproperty.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/include/openspace/properties/templateproperty.inl b/include/openspace/properties/templateproperty.inl
index 81d0a422f5..49b9f0d712 100644
--- a/include/openspace/properties/templateproperty.inl
+++ b/include/openspace/properties/templateproperty.inl
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/include/openspace/properties/triggerproperty.h b/include/openspace/properties/triggerproperty.h
index be71c23053..19f6e84e14 100644
--- a/include/openspace/properties/triggerproperty.h
+++ b/include/openspace/properties/triggerproperty.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/include/openspace/properties/vector/dvec2property.h b/include/openspace/properties/vector/dvec2property.h
index 4ca2d9185b..426d9c2f17 100644
--- a/include/openspace/properties/vector/dvec2property.h
+++ b/include/openspace/properties/vector/dvec2property.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/include/openspace/properties/vector/dvec3property.h b/include/openspace/properties/vector/dvec3property.h
index ccd80659e5..213f4491cb 100644
--- a/include/openspace/properties/vector/dvec3property.h
+++ b/include/openspace/properties/vector/dvec3property.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/include/openspace/properties/vector/dvec4property.h b/include/openspace/properties/vector/dvec4property.h
index 1f6d24ca47..e636a28255 100644
--- a/include/openspace/properties/vector/dvec4property.h
+++ b/include/openspace/properties/vector/dvec4property.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/include/openspace/properties/vector/ivec2property.h b/include/openspace/properties/vector/ivec2property.h
index d0a0bb55ed..873f7fff57 100644
--- a/include/openspace/properties/vector/ivec2property.h
+++ b/include/openspace/properties/vector/ivec2property.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/include/openspace/properties/vector/ivec3property.h b/include/openspace/properties/vector/ivec3property.h
index e392f9a447..744cb2767c 100644
--- a/include/openspace/properties/vector/ivec3property.h
+++ b/include/openspace/properties/vector/ivec3property.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/include/openspace/properties/vector/ivec4property.h b/include/openspace/properties/vector/ivec4property.h
index 2df206908d..7174d21241 100644
--- a/include/openspace/properties/vector/ivec4property.h
+++ b/include/openspace/properties/vector/ivec4property.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/include/openspace/properties/vector/uvec2property.h b/include/openspace/properties/vector/uvec2property.h
index 71b51d8e75..03592af6b5 100644
--- a/include/openspace/properties/vector/uvec2property.h
+++ b/include/openspace/properties/vector/uvec2property.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/include/openspace/properties/vector/uvec3property.h b/include/openspace/properties/vector/uvec3property.h
index b320925f37..7a34adad53 100644
--- a/include/openspace/properties/vector/uvec3property.h
+++ b/include/openspace/properties/vector/uvec3property.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/include/openspace/properties/vector/uvec4property.h b/include/openspace/properties/vector/uvec4property.h
index a2a4c7b05e..aae1f04140 100644
--- a/include/openspace/properties/vector/uvec4property.h
+++ b/include/openspace/properties/vector/uvec4property.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/include/openspace/properties/vector/vec2property.h b/include/openspace/properties/vector/vec2property.h
index 8aae577979..aa5c1cb920 100644
--- a/include/openspace/properties/vector/vec2property.h
+++ b/include/openspace/properties/vector/vec2property.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/include/openspace/properties/vector/vec3property.h b/include/openspace/properties/vector/vec3property.h
index 56bb686768..24effd0c34 100644
--- a/include/openspace/properties/vector/vec3property.h
+++ b/include/openspace/properties/vector/vec3property.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/include/openspace/properties/vector/vec4property.h b/include/openspace/properties/vector/vec4property.h
index ebe2a0c8d3..8291deb4a4 100644
--- a/include/openspace/properties/vector/vec4property.h
+++ b/include/openspace/properties/vector/vec4property.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/include/openspace/query/query.h b/include/openspace/query/query.h
index 6bbe4fad4a..02c0fdd689 100644
--- a/include/openspace/query/query.h
+++ b/include/openspace/query/query.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/include/openspace/rendering/colormappingcomponent.h b/include/openspace/rendering/colormappingcomponent.h
index a949ce41a3..a8eee16a86 100644
--- a/include/openspace/rendering/colormappingcomponent.h
+++ b/include/openspace/rendering/colormappingcomponent.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/include/openspace/rendering/dashboard.h b/include/openspace/rendering/dashboard.h
index d3a74cc4a3..85f1347319 100644
--- a/include/openspace/rendering/dashboard.h
+++ b/include/openspace/rendering/dashboard.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/include/openspace/rendering/dashboarditem.h b/include/openspace/rendering/dashboarditem.h
index 1f8c4ef72c..9c0396dbde 100644
--- a/include/openspace/rendering/dashboarditem.h
+++ b/include/openspace/rendering/dashboarditem.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/include/openspace/rendering/dashboardtextitem.h b/include/openspace/rendering/dashboardtextitem.h
index 4c6a69337e..4e1f54d5d7 100644
--- a/include/openspace/rendering/dashboardtextitem.h
+++ b/include/openspace/rendering/dashboardtextitem.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/include/openspace/rendering/deferredcaster.h b/include/openspace/rendering/deferredcaster.h
index 9a52cd0ccc..7705f43643 100644
--- a/include/openspace/rendering/deferredcaster.h
+++ b/include/openspace/rendering/deferredcaster.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/include/openspace/rendering/deferredcasterlistener.h b/include/openspace/rendering/deferredcasterlistener.h
index bac5e2048a..9f9323435a 100644
--- a/include/openspace/rendering/deferredcasterlistener.h
+++ b/include/openspace/rendering/deferredcasterlistener.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/include/openspace/rendering/deferredcastermanager.h b/include/openspace/rendering/deferredcastermanager.h
index c5fca87586..117d8132e6 100644
--- a/include/openspace/rendering/deferredcastermanager.h
+++ b/include/openspace/rendering/deferredcastermanager.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/include/openspace/rendering/fadeable.h b/include/openspace/rendering/fadeable.h
index c35df7f438..ab460ee9eb 100644
--- a/include/openspace/rendering/fadeable.h
+++ b/include/openspace/rendering/fadeable.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/include/openspace/rendering/framebufferrenderer.h b/include/openspace/rendering/framebufferrenderer.h
index 1fae1d86ef..e71718d978 100644
--- a/include/openspace/rendering/framebufferrenderer.h
+++ b/include/openspace/rendering/framebufferrenderer.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/include/openspace/rendering/helper.h b/include/openspace/rendering/helper.h
index 29146c70fb..6dd85e3591 100644
--- a/include/openspace/rendering/helper.h
+++ b/include/openspace/rendering/helper.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/include/openspace/rendering/labelscomponent.h b/include/openspace/rendering/labelscomponent.h
index 93cc016401..71dfb8cc14 100644
--- a/include/openspace/rendering/labelscomponent.h
+++ b/include/openspace/rendering/labelscomponent.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/include/openspace/rendering/loadingscreen.h b/include/openspace/rendering/loadingscreen.h
index 9d1a9c330a..73e1e09d22 100644
--- a/include/openspace/rendering/loadingscreen.h
+++ b/include/openspace/rendering/loadingscreen.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/include/openspace/rendering/luaconsole.h b/include/openspace/rendering/luaconsole.h
index efce7f5a9b..c545f68a4b 100644
--- a/include/openspace/rendering/luaconsole.h
+++ b/include/openspace/rendering/luaconsole.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/include/openspace/rendering/raycasterlistener.h b/include/openspace/rendering/raycasterlistener.h
index 1a054679bc..ac029f4b76 100644
--- a/include/openspace/rendering/raycasterlistener.h
+++ b/include/openspace/rendering/raycasterlistener.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/include/openspace/rendering/raycastermanager.h b/include/openspace/rendering/raycastermanager.h
index b7bf82f8e1..66d9ae913f 100644
--- a/include/openspace/rendering/raycastermanager.h
+++ b/include/openspace/rendering/raycastermanager.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/include/openspace/rendering/renderable.h b/include/openspace/rendering/renderable.h
index 747c58852e..3d136f4b02 100644
--- a/include/openspace/rendering/renderable.h
+++ b/include/openspace/rendering/renderable.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/include/openspace/rendering/renderengine.h b/include/openspace/rendering/renderengine.h
index d64c689fd1..f2545ea2bb 100644
--- a/include/openspace/rendering/renderengine.h
+++ b/include/openspace/rendering/renderengine.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/include/openspace/rendering/screenspacerenderable.h b/include/openspace/rendering/screenspacerenderable.h
index 49977b8b9d..fbd6105dcb 100644
--- a/include/openspace/rendering/screenspacerenderable.h
+++ b/include/openspace/rendering/screenspacerenderable.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/include/openspace/rendering/texturecomponent.h b/include/openspace/rendering/texturecomponent.h
index bc1cbbb3d2..47a8a19561 100644
--- a/include/openspace/rendering/texturecomponent.h
+++ b/include/openspace/rendering/texturecomponent.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/include/openspace/rendering/transferfunction.h b/include/openspace/rendering/transferfunction.h
index 3e70eb8d34..c1886b9e7c 100644
--- a/include/openspace/rendering/transferfunction.h
+++ b/include/openspace/rendering/transferfunction.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/include/openspace/rendering/volumeraycaster.h b/include/openspace/rendering/volumeraycaster.h
index 586f3e62c6..f9d8809e39 100644
--- a/include/openspace/rendering/volumeraycaster.h
+++ b/include/openspace/rendering/volumeraycaster.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/include/openspace/scene/asset.h b/include/openspace/scene/asset.h
index 5e35c9e148..89041e63cf 100644
--- a/include/openspace/scene/asset.h
+++ b/include/openspace/scene/asset.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/include/openspace/scene/assetmanager.h b/include/openspace/scene/assetmanager.h
index 88ee16636d..f3577dbecf 100644
--- a/include/openspace/scene/assetmanager.h
+++ b/include/openspace/scene/assetmanager.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/include/openspace/scene/lightsource.h b/include/openspace/scene/lightsource.h
index ed2246bae6..566725a5d0 100644
--- a/include/openspace/scene/lightsource.h
+++ b/include/openspace/scene/lightsource.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/include/openspace/scene/profile.h b/include/openspace/scene/profile.h
index e455eb3004..1cdda4144a 100644
--- a/include/openspace/scene/profile.h
+++ b/include/openspace/scene/profile.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/include/openspace/scene/rotation.h b/include/openspace/scene/rotation.h
index 151c2d4e61..991586763a 100644
--- a/include/openspace/scene/rotation.h
+++ b/include/openspace/scene/rotation.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/include/openspace/scene/scale.h b/include/openspace/scene/scale.h
index 375838589b..7679db2c09 100644
--- a/include/openspace/scene/scale.h
+++ b/include/openspace/scene/scale.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/include/openspace/scene/scene.h b/include/openspace/scene/scene.h
index 0c26ef79bf..b18ff8d595 100644
--- a/include/openspace/scene/scene.h
+++ b/include/openspace/scene/scene.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/include/openspace/scene/scenegraphnode.h b/include/openspace/scene/scenegraphnode.h
index 7e35625d82..79b65fc195 100644
--- a/include/openspace/scene/scenegraphnode.h
+++ b/include/openspace/scene/scenegraphnode.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/include/openspace/scene/sceneinitializer.h b/include/openspace/scene/sceneinitializer.h
index 0da2616cac..7004d9f060 100644
--- a/include/openspace/scene/sceneinitializer.h
+++ b/include/openspace/scene/sceneinitializer.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/include/openspace/scene/timeframe.h b/include/openspace/scene/timeframe.h
index c6ff91fb98..489f772585 100644
--- a/include/openspace/scene/timeframe.h
+++ b/include/openspace/scene/timeframe.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/include/openspace/scene/translation.h b/include/openspace/scene/translation.h
index ab01958d46..3a0466a5eb 100644
--- a/include/openspace/scene/translation.h
+++ b/include/openspace/scene/translation.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/include/openspace/scripting/lualibrary.h b/include/openspace/scripting/lualibrary.h
index f86feb2c88..151f46b06e 100644
--- a/include/openspace/scripting/lualibrary.h
+++ b/include/openspace/scripting/lualibrary.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/include/openspace/scripting/scriptengine.h b/include/openspace/scripting/scriptengine.h
index fd518684c1..b28a60163a 100644
--- a/include/openspace/scripting/scriptengine.h
+++ b/include/openspace/scripting/scriptengine.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/include/openspace/scripting/scriptscheduler.h b/include/openspace/scripting/scriptscheduler.h
index 7e9198a171..58e6fafb01 100644
--- a/include/openspace/scripting/scriptscheduler.h
+++ b/include/openspace/scripting/scriptscheduler.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/include/openspace/scripting/systemcapabilitiesbinding.h b/include/openspace/scripting/systemcapabilitiesbinding.h
index d41a20a067..4e7884cae3 100644
--- a/include/openspace/scripting/systemcapabilitiesbinding.h
+++ b/include/openspace/scripting/systemcapabilitiesbinding.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/include/openspace/util/blockplaneintersectiongeometry.h b/include/openspace/util/blockplaneintersectiongeometry.h
index f2f7706e17..1cce32d1b6 100644
--- a/include/openspace/util/blockplaneintersectiongeometry.h
+++ b/include/openspace/util/blockplaneintersectiongeometry.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/include/openspace/util/boxgeometry.h b/include/openspace/util/boxgeometry.h
index 75139b2ea0..c06f7ef6ee 100644
--- a/include/openspace/util/boxgeometry.h
+++ b/include/openspace/util/boxgeometry.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/include/openspace/util/collisionhelper.h b/include/openspace/util/collisionhelper.h
index edcf09a47f..5e9eab4082 100644
--- a/include/openspace/util/collisionhelper.h
+++ b/include/openspace/util/collisionhelper.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/include/openspace/util/concurrentjobmanager.h b/include/openspace/util/concurrentjobmanager.h
index be7b51907d..206783685f 100644
--- a/include/openspace/util/concurrentjobmanager.h
+++ b/include/openspace/util/concurrentjobmanager.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/include/openspace/util/concurrentjobmanager.inl b/include/openspace/util/concurrentjobmanager.inl
index f4d0f894fd..14e5bf1792 100644
--- a/include/openspace/util/concurrentjobmanager.inl
+++ b/include/openspace/util/concurrentjobmanager.inl
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/include/openspace/util/concurrentqueue.h b/include/openspace/util/concurrentqueue.h
index 8afd296f2d..fa3a35d4d9 100644
--- a/include/openspace/util/concurrentqueue.h
+++ b/include/openspace/util/concurrentqueue.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/include/openspace/util/concurrentqueue.inl b/include/openspace/util/concurrentqueue.inl
index 74929c7617..043cb3dac6 100644
--- a/include/openspace/util/concurrentqueue.inl
+++ b/include/openspace/util/concurrentqueue.inl
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/include/openspace/util/coordinateconversion.h b/include/openspace/util/coordinateconversion.h
index f8d6781973..59749abc37 100644
--- a/include/openspace/util/coordinateconversion.h
+++ b/include/openspace/util/coordinateconversion.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/include/openspace/util/distanceconstants.h b/include/openspace/util/distanceconstants.h
index 6df18fcda3..5ca37ef87f 100644
--- a/include/openspace/util/distanceconstants.h
+++ b/include/openspace/util/distanceconstants.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/include/openspace/util/distanceconversion.h b/include/openspace/util/distanceconversion.h
index 7ce480b650..aba17dda6b 100644
--- a/include/openspace/util/distanceconversion.h
+++ b/include/openspace/util/distanceconversion.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/include/openspace/util/factorymanager.h b/include/openspace/util/factorymanager.h
index 1662e04a34..dde02993eb 100644
--- a/include/openspace/util/factorymanager.h
+++ b/include/openspace/util/factorymanager.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/include/openspace/util/factorymanager.inl b/include/openspace/util/factorymanager.inl
index 6af401a2c2..8b093f3519 100644
--- a/include/openspace/util/factorymanager.inl
+++ b/include/openspace/util/factorymanager.inl
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/include/openspace/util/histogram.h b/include/openspace/util/histogram.h
index 63e2cdbf62..b473526b4c 100644
--- a/include/openspace/util/histogram.h
+++ b/include/openspace/util/histogram.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/include/openspace/util/httprequest.h b/include/openspace/util/httprequest.h
index 428a3ec29c..51a49d4c8a 100644
--- a/include/openspace/util/httprequest.h
+++ b/include/openspace/util/httprequest.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/include/openspace/util/job.h b/include/openspace/util/job.h
index 761c85d48c..01350aa21c 100644
--- a/include/openspace/util/job.h
+++ b/include/openspace/util/job.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/include/openspace/util/json_helper.h b/include/openspace/util/json_helper.h
index b98e67f645..1cc2079bcf 100644
--- a/include/openspace/util/json_helper.h
+++ b/include/openspace/util/json_helper.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/include/openspace/util/json_helper.inl b/include/openspace/util/json_helper.inl
index 7ee5ef9608..86d52a96b6 100644
--- a/include/openspace/util/json_helper.inl
+++ b/include/openspace/util/json_helper.inl
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/include/openspace/util/keys.h b/include/openspace/util/keys.h
index 3c03b701cf..efeb1add8c 100644
--- a/include/openspace/util/keys.h
+++ b/include/openspace/util/keys.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/include/openspace/util/memorymanager.h b/include/openspace/util/memorymanager.h
index 2a22913a0d..3202df2b42 100644
--- a/include/openspace/util/memorymanager.h
+++ b/include/openspace/util/memorymanager.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/include/openspace/util/mouse.h b/include/openspace/util/mouse.h
index b1155bd68d..7e2922eae2 100644
--- a/include/openspace/util/mouse.h
+++ b/include/openspace/util/mouse.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/include/openspace/util/openspacemodule.h b/include/openspace/util/openspacemodule.h
index 0a110a0ce3..92f204ccc2 100644
--- a/include/openspace/util/openspacemodule.h
+++ b/include/openspace/util/openspacemodule.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/include/openspace/util/planegeometry.h b/include/openspace/util/planegeometry.h
index 398214ee4d..45f25d0f97 100644
--- a/include/openspace/util/planegeometry.h
+++ b/include/openspace/util/planegeometry.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/include/openspace/util/progressbar.h b/include/openspace/util/progressbar.h
index 50bb5d15ba..68a103eec7 100644
--- a/include/openspace/util/progressbar.h
+++ b/include/openspace/util/progressbar.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/include/openspace/util/resourcesynchronization.h b/include/openspace/util/resourcesynchronization.h
index bc40bc21e7..e19c528c7c 100644
--- a/include/openspace/util/resourcesynchronization.h
+++ b/include/openspace/util/resourcesynchronization.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/include/openspace/util/screenlog.h b/include/openspace/util/screenlog.h
index 7b9b8333f2..c2c9daefbd 100644
--- a/include/openspace/util/screenlog.h
+++ b/include/openspace/util/screenlog.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/include/openspace/util/sphere.h b/include/openspace/util/sphere.h
index cf23199e82..528ef60595 100644
--- a/include/openspace/util/sphere.h
+++ b/include/openspace/util/sphere.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/include/openspace/util/spicemanager.h b/include/openspace/util/spicemanager.h
index 88734cc939..395d46d5b6 100644
--- a/include/openspace/util/spicemanager.h
+++ b/include/openspace/util/spicemanager.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/include/openspace/util/syncable.h b/include/openspace/util/syncable.h
index 89f863a58d..584e74bf6d 100644
--- a/include/openspace/util/syncable.h
+++ b/include/openspace/util/syncable.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/include/openspace/util/syncbuffer.h b/include/openspace/util/syncbuffer.h
index 16fe46215a..4c2dd3c239 100644
--- a/include/openspace/util/syncbuffer.h
+++ b/include/openspace/util/syncbuffer.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/include/openspace/util/syncbuffer.inl b/include/openspace/util/syncbuffer.inl
index 66194089cd..10fd4c748d 100644
--- a/include/openspace/util/syncbuffer.inl
+++ b/include/openspace/util/syncbuffer.inl
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/include/openspace/util/syncdata.h b/include/openspace/util/syncdata.h
index ce99b9366a..d96744b0d4 100644
--- a/include/openspace/util/syncdata.h
+++ b/include/openspace/util/syncdata.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/include/openspace/util/syncdata.inl b/include/openspace/util/syncdata.inl
index e8fb861cfa..f1c5b92833 100644
--- a/include/openspace/util/syncdata.inl
+++ b/include/openspace/util/syncdata.inl
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/include/openspace/util/task.h b/include/openspace/util/task.h
index 48be52d5bd..eb3904047d 100644
--- a/include/openspace/util/task.h
+++ b/include/openspace/util/task.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/include/openspace/util/taskloader.h b/include/openspace/util/taskloader.h
index 752fee1329..1f531037ed 100644
--- a/include/openspace/util/taskloader.h
+++ b/include/openspace/util/taskloader.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/include/openspace/util/threadpool.h b/include/openspace/util/threadpool.h
index 8c5581d750..ba1359d166 100644
--- a/include/openspace/util/threadpool.h
+++ b/include/openspace/util/threadpool.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/include/openspace/util/time.h b/include/openspace/util/time.h
index 5af42816b7..e6fe1b581c 100644
--- a/include/openspace/util/time.h
+++ b/include/openspace/util/time.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/include/openspace/util/timeconversion.h b/include/openspace/util/timeconversion.h
index 493c5caeb5..ee4a7f370b 100644
--- a/include/openspace/util/timeconversion.h
+++ b/include/openspace/util/timeconversion.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/include/openspace/util/timeline.h b/include/openspace/util/timeline.h
index fb6c29aba5..a998153f8c 100644
--- a/include/openspace/util/timeline.h
+++ b/include/openspace/util/timeline.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/include/openspace/util/timeline.inl b/include/openspace/util/timeline.inl
index df9f1fe4a9..c4663e8dfb 100644
--- a/include/openspace/util/timeline.inl
+++ b/include/openspace/util/timeline.inl
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/include/openspace/util/timemanager.h b/include/openspace/util/timemanager.h
index cc4fdfecb7..2d1ebf1bcb 100644
--- a/include/openspace/util/timemanager.h
+++ b/include/openspace/util/timemanager.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/include/openspace/util/timerange.h b/include/openspace/util/timerange.h
index db2b4aa47e..0824c409db 100644
--- a/include/openspace/util/timerange.h
+++ b/include/openspace/util/timerange.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/include/openspace/util/touch.h b/include/openspace/util/touch.h
index 7697a6077b..ca3d1ed90f 100644
--- a/include/openspace/util/touch.h
+++ b/include/openspace/util/touch.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/include/openspace/util/transformationmanager.h b/include/openspace/util/transformationmanager.h
index 148e1c04cf..63350790cc 100644
--- a/include/openspace/util/transformationmanager.h
+++ b/include/openspace/util/transformationmanager.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/include/openspace/util/tstring.h b/include/openspace/util/tstring.h
index 9b8ebe4dbd..4db9e021dc 100644
--- a/include/openspace/util/tstring.h
+++ b/include/openspace/util/tstring.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/include/openspace/util/universalhelpers.h b/include/openspace/util/universalhelpers.h
index e230e7b5e9..cacdb48c1a 100644
--- a/include/openspace/util/universalhelpers.h
+++ b/include/openspace/util/universalhelpers.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/include/openspace/util/updatestructures.h b/include/openspace/util/updatestructures.h
index ff819d1071..0586dd8644 100644
--- a/include/openspace/util/updatestructures.h
+++ b/include/openspace/util/updatestructures.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/include/openspace/util/versionchecker.h b/include/openspace/util/versionchecker.h
index 024fc45cc8..5d16b8f0b4 100644
--- a/include/openspace/util/versionchecker.h
+++ b/include/openspace/util/versionchecker.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/CMakeLists.txt b/modules/CMakeLists.txt
index c9c9ee2ad3..1992860668 100644
--- a/modules/CMakeLists.txt
+++ b/modules/CMakeLists.txt
@@ -2,7 +2,7 @@
 #                                                                                        #
 # OpenSpace                                                                              #
 #                                                                                        #
-# Copyright (c) 2014-2024                                                                #
+# Copyright (c) 2014-2025                                                                #
 #                                                                                        #
 # Permission is hereby granted, free of charge, to any person obtaining a copy of this   #
 # software and associated documentation files (the "Software"), to deal in the Software  #
diff --git a/modules/atmosphere/CMakeLists.txt b/modules/atmosphere/CMakeLists.txt
index ef9be6bff5..4b0e59e2e9 100644
--- a/modules/atmosphere/CMakeLists.txt
+++ b/modules/atmosphere/CMakeLists.txt
@@ -2,7 +2,7 @@
 #                                                                                        #
 # OpenSpace                                                                              #
 #                                                                                        #
-# Copyright (c) 2014-2024                                                                #
+# Copyright (c) 2014-2025                                                                #
 #                                                                                        #
 # Permission is hereby granted, free of charge, to any person obtaining a copy of this   #
 # software and associated documentation files (the "Software"), to deal in the Software  #
diff --git a/modules/atmosphere/atmospheremodule.cpp b/modules/atmosphere/atmospheremodule.cpp
index 6ab9059d2b..9540d6ba0a 100644
--- a/modules/atmosphere/atmospheremodule.cpp
+++ b/modules/atmosphere/atmospheremodule.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/atmosphere/atmospheremodule.h b/modules/atmosphere/atmospheremodule.h
index d720f47bad..a5d1cbf73a 100644
--- a/modules/atmosphere/atmospheremodule.h
+++ b/modules/atmosphere/atmospheremodule.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/atmosphere/rendering/atmospheredeferredcaster.cpp b/modules/atmosphere/rendering/atmospheredeferredcaster.cpp
index 8a4b1fc8d0..5c2632133f 100644
--- a/modules/atmosphere/rendering/atmospheredeferredcaster.cpp
+++ b/modules/atmosphere/rendering/atmospheredeferredcaster.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/atmosphere/rendering/atmospheredeferredcaster.h b/modules/atmosphere/rendering/atmospheredeferredcaster.h
index 3f34bbc967..f7cb74db4b 100644
--- a/modules/atmosphere/rendering/atmospheredeferredcaster.h
+++ b/modules/atmosphere/rendering/atmospheredeferredcaster.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/atmosphere/rendering/renderableatmosphere.cpp b/modules/atmosphere/rendering/renderableatmosphere.cpp
index baa4300284..0aeb0d5f6e 100644
--- a/modules/atmosphere/rendering/renderableatmosphere.cpp
+++ b/modules/atmosphere/rendering/renderableatmosphere.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/atmosphere/rendering/renderableatmosphere.h b/modules/atmosphere/rendering/renderableatmosphere.h
index e038b9fd46..5d1c78c892 100644
--- a/modules/atmosphere/rendering/renderableatmosphere.h
+++ b/modules/atmosphere/rendering/renderableatmosphere.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/atmosphere/shaders/atmosphere_common.glsl b/modules/atmosphere/shaders/atmosphere_common.glsl
index 12a6a760b1..4034c45dbb 100644
--- a/modules/atmosphere/shaders/atmosphere_common.glsl
+++ b/modules/atmosphere/shaders/atmosphere_common.glsl
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/atmosphere/shaders/atmosphere_deferred_fs.glsl b/modules/atmosphere/shaders/atmosphere_deferred_fs.glsl
index ec07f2c64c..24f62861ec 100644
--- a/modules/atmosphere/shaders/atmosphere_deferred_fs.glsl
+++ b/modules/atmosphere/shaders/atmosphere_deferred_fs.glsl
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/atmosphere/shaders/atmosphere_deferred_vs.glsl b/modules/atmosphere/shaders/atmosphere_deferred_vs.glsl
index b18ad2f885..5dfc28e3e1 100644
--- a/modules/atmosphere/shaders/atmosphere_deferred_vs.glsl
+++ b/modules/atmosphere/shaders/atmosphere_deferred_vs.glsl
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/atmosphere/shaders/calculation_gs.glsl b/modules/atmosphere/shaders/calculation_gs.glsl
index 77f7eefbc3..1146c286b9 100644
--- a/modules/atmosphere/shaders/calculation_gs.glsl
+++ b/modules/atmosphere/shaders/calculation_gs.glsl
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/atmosphere/shaders/calculation_vs.glsl b/modules/atmosphere/shaders/calculation_vs.glsl
index d1ac3cf2d5..7981dc522a 100644
--- a/modules/atmosphere/shaders/calculation_vs.glsl
+++ b/modules/atmosphere/shaders/calculation_vs.glsl
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/atmosphere/shaders/deltaE_calc_fs.glsl b/modules/atmosphere/shaders/deltaE_calc_fs.glsl
index c230776c8e..68c90a7920 100644
--- a/modules/atmosphere/shaders/deltaE_calc_fs.glsl
+++ b/modules/atmosphere/shaders/deltaE_calc_fs.glsl
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/atmosphere/shaders/deltaJ_calc_fs.glsl b/modules/atmosphere/shaders/deltaJ_calc_fs.glsl
index 6a5d173849..348329b578 100644
--- a/modules/atmosphere/shaders/deltaJ_calc_fs.glsl
+++ b/modules/atmosphere/shaders/deltaJ_calc_fs.glsl
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/atmosphere/shaders/deltaS_calc_fs.glsl b/modules/atmosphere/shaders/deltaS_calc_fs.glsl
index 189c33a0d1..62558d2fea 100644
--- a/modules/atmosphere/shaders/deltaS_calc_fs.glsl
+++ b/modules/atmosphere/shaders/deltaS_calc_fs.glsl
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/atmosphere/shaders/deltaS_sup_calc_fs.glsl b/modules/atmosphere/shaders/deltaS_sup_calc_fs.glsl
index 4538e3701e..5a57e2ff66 100644
--- a/modules/atmosphere/shaders/deltaS_sup_calc_fs.glsl
+++ b/modules/atmosphere/shaders/deltaS_sup_calc_fs.glsl
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/atmosphere/shaders/inScattering_calc_fs.glsl b/modules/atmosphere/shaders/inScattering_calc_fs.glsl
index 3280280d2e..3f530a84bf 100644
--- a/modules/atmosphere/shaders/inScattering_calc_fs.glsl
+++ b/modules/atmosphere/shaders/inScattering_calc_fs.glsl
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/atmosphere/shaders/inScattering_sup_calc_fs.glsl b/modules/atmosphere/shaders/inScattering_sup_calc_fs.glsl
index 753df9fa4d..a1c225aba7 100644
--- a/modules/atmosphere/shaders/inScattering_sup_calc_fs.glsl
+++ b/modules/atmosphere/shaders/inScattering_sup_calc_fs.glsl
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/atmosphere/shaders/irradiance_calc_fs.glsl b/modules/atmosphere/shaders/irradiance_calc_fs.glsl
index 5758cf3505..1609a1418a 100644
--- a/modules/atmosphere/shaders/irradiance_calc_fs.glsl
+++ b/modules/atmosphere/shaders/irradiance_calc_fs.glsl
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/atmosphere/shaders/irradiance_final_fs.glsl b/modules/atmosphere/shaders/irradiance_final_fs.glsl
index 75abff8b05..ab6c5bf34b 100644
--- a/modules/atmosphere/shaders/irradiance_final_fs.glsl
+++ b/modules/atmosphere/shaders/irradiance_final_fs.glsl
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/atmosphere/shaders/irradiance_sup_calc_fs.glsl b/modules/atmosphere/shaders/irradiance_sup_calc_fs.glsl
index 3fe343ba7c..cba5927c2b 100644
--- a/modules/atmosphere/shaders/irradiance_sup_calc_fs.glsl
+++ b/modules/atmosphere/shaders/irradiance_sup_calc_fs.glsl
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/atmosphere/shaders/transmittance_calc_fs.glsl b/modules/atmosphere/shaders/transmittance_calc_fs.glsl
index 76f3599956..1d4b6102f9 100644
--- a/modules/atmosphere/shaders/transmittance_calc_fs.glsl
+++ b/modules/atmosphere/shaders/transmittance_calc_fs.glsl
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/audio/CMakeLists.txt b/modules/audio/CMakeLists.txt
index f176e75e03..65310c4fa6 100644
--- a/modules/audio/CMakeLists.txt
+++ b/modules/audio/CMakeLists.txt
@@ -2,7 +2,7 @@
 #                                                                                        #
 # OpenSpace                                                                              #
 #                                                                                        #
-# Copyright (c) 2014-2024                                                                #
+# Copyright (c) 2014-2025                                                                #
 #                                                                                        #
 # Permission is hereby granted, free of charge, to any person obtaining a copy of this   #
 # software and associated documentation files (the "Software"), to deal in the Software  #
diff --git a/modules/audio/audiomodule.cpp b/modules/audio/audiomodule.cpp
index 26f3b97030..127bc7c0a8 100644
--- a/modules/audio/audiomodule.cpp
+++ b/modules/audio/audiomodule.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/audio/audiomodule.h b/modules/audio/audiomodule.h
index 752f40bb93..6087fbd7a9 100644
--- a/modules/audio/audiomodule.h
+++ b/modules/audio/audiomodule.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/audio/audiomodule_lua.inl b/modules/audio/audiomodule_lua.inl
index 79a1b524f3..8958e667cb 100644
--- a/modules/audio/audiomodule_lua.inl
+++ b/modules/audio/audiomodule_lua.inl
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/base/CMakeLists.txt b/modules/base/CMakeLists.txt
index fe79b952b8..9f6c3ceeae 100644
--- a/modules/base/CMakeLists.txt
+++ b/modules/base/CMakeLists.txt
@@ -2,7 +2,7 @@
 #                                                                                        #
 # OpenSpace                                                                              #
 #                                                                                        #
-# Copyright (c) 2014-2024                                                                #
+# Copyright (c) 2014-2025                                                                #
 #                                                                                        #
 # Permission is hereby granted, free of charge, to any person obtaining a copy of this   #
 # software and associated documentation files (the "Software"), to deal in the Software  #
diff --git a/modules/base/basemodule.cpp b/modules/base/basemodule.cpp
index 73662afcf6..80f8aeefee 100644
--- a/modules/base/basemodule.cpp
+++ b/modules/base/basemodule.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/base/basemodule.h b/modules/base/basemodule.h
index 87c9a6d353..1ff604d341 100644
--- a/modules/base/basemodule.h
+++ b/modules/base/basemodule.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/base/dashboard/dashboarditemangle.cpp b/modules/base/dashboard/dashboarditemangle.cpp
index f4644b183f..1d87375a91 100644
--- a/modules/base/dashboard/dashboarditemangle.cpp
+++ b/modules/base/dashboard/dashboarditemangle.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/base/dashboard/dashboarditemangle.h b/modules/base/dashboard/dashboarditemangle.h
index 1e44bbdf55..6dbde0bb23 100644
--- a/modules/base/dashboard/dashboarditemangle.h
+++ b/modules/base/dashboard/dashboarditemangle.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/base/dashboard/dashboarditemdate.cpp b/modules/base/dashboard/dashboarditemdate.cpp
index e7f5cdb62c..cd8bb38736 100644
--- a/modules/base/dashboard/dashboarditemdate.cpp
+++ b/modules/base/dashboard/dashboarditemdate.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/base/dashboard/dashboarditemdate.h b/modules/base/dashboard/dashboarditemdate.h
index f9ecff3d9c..b06221dcad 100644
--- a/modules/base/dashboard/dashboarditemdate.h
+++ b/modules/base/dashboard/dashboarditemdate.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/base/dashboard/dashboarditemdistance.cpp b/modules/base/dashboard/dashboarditemdistance.cpp
index 20440c3e13..c67d041e67 100644
--- a/modules/base/dashboard/dashboarditemdistance.cpp
+++ b/modules/base/dashboard/dashboarditemdistance.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/base/dashboard/dashboarditemdistance.h b/modules/base/dashboard/dashboarditemdistance.h
index 80f04ebcb3..1693cd8350 100644
--- a/modules/base/dashboard/dashboarditemdistance.h
+++ b/modules/base/dashboard/dashboarditemdistance.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/base/dashboard/dashboarditemelapsedtime.cpp b/modules/base/dashboard/dashboarditemelapsedtime.cpp
index c7470c2e3c..ef839ace01 100644
--- a/modules/base/dashboard/dashboarditemelapsedtime.cpp
+++ b/modules/base/dashboard/dashboarditemelapsedtime.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/base/dashboard/dashboarditemelapsedtime.h b/modules/base/dashboard/dashboarditemelapsedtime.h
index d2551d9255..c250b2a5e2 100644
--- a/modules/base/dashboard/dashboarditemelapsedtime.h
+++ b/modules/base/dashboard/dashboarditemelapsedtime.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/base/dashboard/dashboarditemframerate.cpp b/modules/base/dashboard/dashboarditemframerate.cpp
index adf69e3a7e..caf65ccf54 100644
--- a/modules/base/dashboard/dashboarditemframerate.cpp
+++ b/modules/base/dashboard/dashboarditemframerate.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/base/dashboard/dashboarditemframerate.h b/modules/base/dashboard/dashboarditemframerate.h
index 6d704aba47..16bbb352b6 100644
--- a/modules/base/dashboard/dashboarditemframerate.h
+++ b/modules/base/dashboard/dashboarditemframerate.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/base/dashboard/dashboarditeminputstate.cpp b/modules/base/dashboard/dashboarditeminputstate.cpp
index 60a0c9b39f..c2db12044c 100644
--- a/modules/base/dashboard/dashboarditeminputstate.cpp
+++ b/modules/base/dashboard/dashboarditeminputstate.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/base/dashboard/dashboarditeminputstate.h b/modules/base/dashboard/dashboarditeminputstate.h
index 4e3c2acf14..bc3b3018ba 100644
--- a/modules/base/dashboard/dashboarditeminputstate.h
+++ b/modules/base/dashboard/dashboarditeminputstate.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/base/dashboard/dashboarditemmission.cpp b/modules/base/dashboard/dashboarditemmission.cpp
index 07cb2ffa93..ea43faf857 100644
--- a/modules/base/dashboard/dashboarditemmission.cpp
+++ b/modules/base/dashboard/dashboarditemmission.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/base/dashboard/dashboarditemmission.h b/modules/base/dashboard/dashboarditemmission.h
index c3d5576a73..efec10730f 100644
--- a/modules/base/dashboard/dashboarditemmission.h
+++ b/modules/base/dashboard/dashboarditemmission.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/base/dashboard/dashboarditemparallelconnection.cpp b/modules/base/dashboard/dashboarditemparallelconnection.cpp
index ed7b20aec2..4de61ad8d8 100644
--- a/modules/base/dashboard/dashboarditemparallelconnection.cpp
+++ b/modules/base/dashboard/dashboarditemparallelconnection.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/base/dashboard/dashboarditemparallelconnection.h b/modules/base/dashboard/dashboarditemparallelconnection.h
index 522f40d9c2..81662f8952 100644
--- a/modules/base/dashboard/dashboarditemparallelconnection.h
+++ b/modules/base/dashboard/dashboarditemparallelconnection.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/base/dashboard/dashboarditempropertyvalue.cpp b/modules/base/dashboard/dashboarditempropertyvalue.cpp
index 19fc39434b..f9d7baa9e0 100644
--- a/modules/base/dashboard/dashboarditempropertyvalue.cpp
+++ b/modules/base/dashboard/dashboarditempropertyvalue.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/base/dashboard/dashboarditempropertyvalue.h b/modules/base/dashboard/dashboarditempropertyvalue.h
index 3af87f1de0..eb6d7edfba 100644
--- a/modules/base/dashboard/dashboarditempropertyvalue.h
+++ b/modules/base/dashboard/dashboarditempropertyvalue.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/base/dashboard/dashboarditemsimulationincrement.cpp b/modules/base/dashboard/dashboarditemsimulationincrement.cpp
index ede6dc1369..dc788555f9 100644
--- a/modules/base/dashboard/dashboarditemsimulationincrement.cpp
+++ b/modules/base/dashboard/dashboarditemsimulationincrement.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/base/dashboard/dashboarditemsimulationincrement.h b/modules/base/dashboard/dashboarditemsimulationincrement.h
index 84ecca1a86..c15a374c3b 100644
--- a/modules/base/dashboard/dashboarditemsimulationincrement.h
+++ b/modules/base/dashboard/dashboarditemsimulationincrement.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/base/dashboard/dashboarditemspacing.cpp b/modules/base/dashboard/dashboarditemspacing.cpp
index 30a5ca9069..344d3c0e12 100644
--- a/modules/base/dashboard/dashboarditemspacing.cpp
+++ b/modules/base/dashboard/dashboarditemspacing.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/base/dashboard/dashboarditemspacing.h b/modules/base/dashboard/dashboarditemspacing.h
index a78cbd28db..40d6f97378 100644
--- a/modules/base/dashboard/dashboarditemspacing.h
+++ b/modules/base/dashboard/dashboarditemspacing.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/base/dashboard/dashboarditemtext.cpp b/modules/base/dashboard/dashboarditemtext.cpp
index ddf52a4ed2..6be4f4c05b 100644
--- a/modules/base/dashboard/dashboarditemtext.cpp
+++ b/modules/base/dashboard/dashboarditemtext.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/base/dashboard/dashboarditemtext.h b/modules/base/dashboard/dashboarditemtext.h
index ef11a0cca1..a517270709 100644
--- a/modules/base/dashboard/dashboarditemtext.h
+++ b/modules/base/dashboard/dashboarditemtext.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/base/dashboard/dashboarditemvelocity.cpp b/modules/base/dashboard/dashboarditemvelocity.cpp
index 3617b5e449..ac51ea2b6f 100644
--- a/modules/base/dashboard/dashboarditemvelocity.cpp
+++ b/modules/base/dashboard/dashboarditemvelocity.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/base/dashboard/dashboarditemvelocity.h b/modules/base/dashboard/dashboarditemvelocity.h
index 90c20aa15c..04a131e8b6 100644
--- a/modules/base/dashboard/dashboarditemvelocity.h
+++ b/modules/base/dashboard/dashboarditemvelocity.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/base/lightsource/cameralightsource.cpp b/modules/base/lightsource/cameralightsource.cpp
index e5285d02e9..ed7694d9bd 100644
--- a/modules/base/lightsource/cameralightsource.cpp
+++ b/modules/base/lightsource/cameralightsource.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/base/lightsource/cameralightsource.h b/modules/base/lightsource/cameralightsource.h
index 7a06f5fe6a..2004d0c74b 100644
--- a/modules/base/lightsource/cameralightsource.h
+++ b/modules/base/lightsource/cameralightsource.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/base/lightsource/scenegraphlightsource.cpp b/modules/base/lightsource/scenegraphlightsource.cpp
index fdb33d58ad..efa98937f5 100644
--- a/modules/base/lightsource/scenegraphlightsource.cpp
+++ b/modules/base/lightsource/scenegraphlightsource.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/base/lightsource/scenegraphlightsource.h b/modules/base/lightsource/scenegraphlightsource.h
index 1a5177f586..1620021b9a 100644
--- a/modules/base/lightsource/scenegraphlightsource.h
+++ b/modules/base/lightsource/scenegraphlightsource.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/base/rendering/grids/renderableboxgrid.cpp b/modules/base/rendering/grids/renderableboxgrid.cpp
index 0a6a3956aa..782744429e 100644
--- a/modules/base/rendering/grids/renderableboxgrid.cpp
+++ b/modules/base/rendering/grids/renderableboxgrid.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/base/rendering/grids/renderableboxgrid.h b/modules/base/rendering/grids/renderableboxgrid.h
index 64690b2079..d0a1dc02af 100644
--- a/modules/base/rendering/grids/renderableboxgrid.h
+++ b/modules/base/rendering/grids/renderableboxgrid.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/base/rendering/grids/renderablegrid.cpp b/modules/base/rendering/grids/renderablegrid.cpp
index dd76443cdf..b4e30221bb 100644
--- a/modules/base/rendering/grids/renderablegrid.cpp
+++ b/modules/base/rendering/grids/renderablegrid.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/base/rendering/grids/renderablegrid.h b/modules/base/rendering/grids/renderablegrid.h
index bee32cd0fe..4423482168 100644
--- a/modules/base/rendering/grids/renderablegrid.h
+++ b/modules/base/rendering/grids/renderablegrid.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/base/rendering/grids/renderableradialgrid.cpp b/modules/base/rendering/grids/renderableradialgrid.cpp
index 3beaadaf9c..c724b7629c 100644
--- a/modules/base/rendering/grids/renderableradialgrid.cpp
+++ b/modules/base/rendering/grids/renderableradialgrid.cpp
@@ -3,7 +3,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/base/rendering/grids/renderableradialgrid.h b/modules/base/rendering/grids/renderableradialgrid.h
index 0abc486631..f22a65885a 100644
--- a/modules/base/rendering/grids/renderableradialgrid.h
+++ b/modules/base/rendering/grids/renderableradialgrid.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/base/rendering/grids/renderablesphericalgrid.cpp b/modules/base/rendering/grids/renderablesphericalgrid.cpp
index e18afe6285..12a53bc200 100644
--- a/modules/base/rendering/grids/renderablesphericalgrid.cpp
+++ b/modules/base/rendering/grids/renderablesphericalgrid.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/base/rendering/grids/renderablesphericalgrid.h b/modules/base/rendering/grids/renderablesphericalgrid.h
index d4278c9b5b..c86a7c8512 100644
--- a/modules/base/rendering/grids/renderablesphericalgrid.h
+++ b/modules/base/rendering/grids/renderablesphericalgrid.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/base/rendering/pointcloud/renderableinterpolatedpoints.cpp b/modules/base/rendering/pointcloud/renderableinterpolatedpoints.cpp
index 887543b0a9..8c640460b0 100644
--- a/modules/base/rendering/pointcloud/renderableinterpolatedpoints.cpp
+++ b/modules/base/rendering/pointcloud/renderableinterpolatedpoints.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/base/rendering/pointcloud/renderableinterpolatedpoints.h b/modules/base/rendering/pointcloud/renderableinterpolatedpoints.h
index 085fbb442e..465ac64d3f 100644
--- a/modules/base/rendering/pointcloud/renderableinterpolatedpoints.h
+++ b/modules/base/rendering/pointcloud/renderableinterpolatedpoints.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/base/rendering/pointcloud/renderablepointcloud.cpp b/modules/base/rendering/pointcloud/renderablepointcloud.cpp
index 4f144c7dd4..4c7aa22eb4 100644
--- a/modules/base/rendering/pointcloud/renderablepointcloud.cpp
+++ b/modules/base/rendering/pointcloud/renderablepointcloud.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/base/rendering/pointcloud/renderablepointcloud.h b/modules/base/rendering/pointcloud/renderablepointcloud.h
index b3e168a22f..5ad1c7182e 100644
--- a/modules/base/rendering/pointcloud/renderablepointcloud.h
+++ b/modules/base/rendering/pointcloud/renderablepointcloud.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/base/rendering/pointcloud/renderablepolygoncloud.cpp b/modules/base/rendering/pointcloud/renderablepolygoncloud.cpp
index 9417801acf..63ccddcd56 100644
--- a/modules/base/rendering/pointcloud/renderablepolygoncloud.cpp
+++ b/modules/base/rendering/pointcloud/renderablepolygoncloud.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/base/rendering/pointcloud/renderablepolygoncloud.h b/modules/base/rendering/pointcloud/renderablepolygoncloud.h
index 9af0282401..e639be95d4 100644
--- a/modules/base/rendering/pointcloud/renderablepolygoncloud.h
+++ b/modules/base/rendering/pointcloud/renderablepolygoncloud.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/base/rendering/pointcloud/sizemappingcomponent.cpp b/modules/base/rendering/pointcloud/sizemappingcomponent.cpp
index 1f3a65d711..9ec8000590 100644
--- a/modules/base/rendering/pointcloud/sizemappingcomponent.cpp
+++ b/modules/base/rendering/pointcloud/sizemappingcomponent.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/base/rendering/pointcloud/sizemappingcomponent.h b/modules/base/rendering/pointcloud/sizemappingcomponent.h
index 3155309e1a..e36901aab0 100644
--- a/modules/base/rendering/pointcloud/sizemappingcomponent.h
+++ b/modules/base/rendering/pointcloud/sizemappingcomponent.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/base/rendering/renderablecartesianaxes.cpp b/modules/base/rendering/renderablecartesianaxes.cpp
index 42ff5a1d3d..d685229f6a 100644
--- a/modules/base/rendering/renderablecartesianaxes.cpp
+++ b/modules/base/rendering/renderablecartesianaxes.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/base/rendering/renderablecartesianaxes.h b/modules/base/rendering/renderablecartesianaxes.h
index 2ef2c180d7..fc231d4f53 100644
--- a/modules/base/rendering/renderablecartesianaxes.h
+++ b/modules/base/rendering/renderablecartesianaxes.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/base/rendering/renderabledisc.cpp b/modules/base/rendering/renderabledisc.cpp
index 0130e2ed9f..4817025841 100644
--- a/modules/base/rendering/renderabledisc.cpp
+++ b/modules/base/rendering/renderabledisc.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/base/rendering/renderabledisc.h b/modules/base/rendering/renderabledisc.h
index ef970ae4d5..7393387771 100644
--- a/modules/base/rendering/renderabledisc.h
+++ b/modules/base/rendering/renderabledisc.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/base/rendering/renderablelabel.cpp b/modules/base/rendering/renderablelabel.cpp
index 68210ac9f3..70b699742d 100644
--- a/modules/base/rendering/renderablelabel.cpp
+++ b/modules/base/rendering/renderablelabel.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/base/rendering/renderablelabel.h b/modules/base/rendering/renderablelabel.h
index ab6bca8772..5708dd6198 100644
--- a/modules/base/rendering/renderablelabel.h
+++ b/modules/base/rendering/renderablelabel.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/base/rendering/renderablemodel.cpp b/modules/base/rendering/renderablemodel.cpp
index 3652725628..7541f2b554 100644
--- a/modules/base/rendering/renderablemodel.cpp
+++ b/modules/base/rendering/renderablemodel.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/base/rendering/renderablemodel.h b/modules/base/rendering/renderablemodel.h
index 74c1d3ff57..78bdbafd70 100644
--- a/modules/base/rendering/renderablemodel.h
+++ b/modules/base/rendering/renderablemodel.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/base/rendering/renderablenodearrow.cpp b/modules/base/rendering/renderablenodearrow.cpp
index 89942cbf9b..ffb78d9ad7 100644
--- a/modules/base/rendering/renderablenodearrow.cpp
+++ b/modules/base/rendering/renderablenodearrow.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/base/rendering/renderablenodearrow.h b/modules/base/rendering/renderablenodearrow.h
index c092e82867..d55b24f768 100644
--- a/modules/base/rendering/renderablenodearrow.h
+++ b/modules/base/rendering/renderablenodearrow.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/base/rendering/renderablenodeline.cpp b/modules/base/rendering/renderablenodeline.cpp
index c509728c2f..6d9642dec8 100644
--- a/modules/base/rendering/renderablenodeline.cpp
+++ b/modules/base/rendering/renderablenodeline.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/base/rendering/renderablenodeline.h b/modules/base/rendering/renderablenodeline.h
index 7160dd96bb..abbf9ca3fe 100644
--- a/modules/base/rendering/renderablenodeline.h
+++ b/modules/base/rendering/renderablenodeline.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/base/rendering/renderableplane.cpp b/modules/base/rendering/renderableplane.cpp
index 690f0d2658..b23f8d4a2a 100644
--- a/modules/base/rendering/renderableplane.cpp
+++ b/modules/base/rendering/renderableplane.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/base/rendering/renderableplane.h b/modules/base/rendering/renderableplane.h
index 2144d95a75..e1e78d20ff 100644
--- a/modules/base/rendering/renderableplane.h
+++ b/modules/base/rendering/renderableplane.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/base/rendering/renderableplaneimagelocal.cpp b/modules/base/rendering/renderableplaneimagelocal.cpp
index 4292869ac7..06af083132 100644
--- a/modules/base/rendering/renderableplaneimagelocal.cpp
+++ b/modules/base/rendering/renderableplaneimagelocal.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/base/rendering/renderableplaneimagelocal.h b/modules/base/rendering/renderableplaneimagelocal.h
index 1891d0f6d7..a20428aedc 100644
--- a/modules/base/rendering/renderableplaneimagelocal.h
+++ b/modules/base/rendering/renderableplaneimagelocal.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/base/rendering/renderableplaneimageonline.cpp b/modules/base/rendering/renderableplaneimageonline.cpp
index 39fe94d583..27753a7371 100644
--- a/modules/base/rendering/renderableplaneimageonline.cpp
+++ b/modules/base/rendering/renderableplaneimageonline.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/base/rendering/renderableplaneimageonline.h b/modules/base/rendering/renderableplaneimageonline.h
index 3c283f11eb..73d012fe5b 100644
--- a/modules/base/rendering/renderableplaneimageonline.h
+++ b/modules/base/rendering/renderableplaneimageonline.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/base/rendering/renderableplanetimevaryingimage.cpp b/modules/base/rendering/renderableplanetimevaryingimage.cpp
index 63de039e02..ed60dc3d2d 100644
--- a/modules/base/rendering/renderableplanetimevaryingimage.cpp
+++ b/modules/base/rendering/renderableplanetimevaryingimage.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/base/rendering/renderableplanetimevaryingimage.h b/modules/base/rendering/renderableplanetimevaryingimage.h
index e61d64ce59..9bba43a79c 100644
--- a/modules/base/rendering/renderableplanetimevaryingimage.h
+++ b/modules/base/rendering/renderableplanetimevaryingimage.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/base/rendering/renderableprism.cpp b/modules/base/rendering/renderableprism.cpp
index a66544c658..606435deff 100644
--- a/modules/base/rendering/renderableprism.cpp
+++ b/modules/base/rendering/renderableprism.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/base/rendering/renderableprism.h b/modules/base/rendering/renderableprism.h
index 3e49f264ef..1e920ac65a 100644
--- a/modules/base/rendering/renderableprism.h
+++ b/modules/base/rendering/renderableprism.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/base/rendering/renderablesphere.cpp b/modules/base/rendering/renderablesphere.cpp
index e63803cfa1..3dba89b11d 100644
--- a/modules/base/rendering/renderablesphere.cpp
+++ b/modules/base/rendering/renderablesphere.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/base/rendering/renderablesphere.h b/modules/base/rendering/renderablesphere.h
index 0dfb3f880e..b6d409516e 100644
--- a/modules/base/rendering/renderablesphere.h
+++ b/modules/base/rendering/renderablesphere.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/base/rendering/renderablesphereimagelocal.cpp b/modules/base/rendering/renderablesphereimagelocal.cpp
index 16bbbd4baa..383cd356c1 100644
--- a/modules/base/rendering/renderablesphereimagelocal.cpp
+++ b/modules/base/rendering/renderablesphereimagelocal.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/base/rendering/renderablesphereimagelocal.h b/modules/base/rendering/renderablesphereimagelocal.h
index 52ecb6adcc..2a2abf092d 100644
--- a/modules/base/rendering/renderablesphereimagelocal.h
+++ b/modules/base/rendering/renderablesphereimagelocal.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/base/rendering/renderablesphereimageonline.cpp b/modules/base/rendering/renderablesphereimageonline.cpp
index 6a45b81dbd..2fac99afcc 100644
--- a/modules/base/rendering/renderablesphereimageonline.cpp
+++ b/modules/base/rendering/renderablesphereimageonline.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/base/rendering/renderablesphereimageonline.h b/modules/base/rendering/renderablesphereimageonline.h
index 0c464fea44..9059e82c18 100644
--- a/modules/base/rendering/renderablesphereimageonline.h
+++ b/modules/base/rendering/renderablesphereimageonline.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/base/rendering/renderabletimevaryingsphere.cpp b/modules/base/rendering/renderabletimevaryingsphere.cpp
index 7a5f9beddc..751dba6946 100644
--- a/modules/base/rendering/renderabletimevaryingsphere.cpp
+++ b/modules/base/rendering/renderabletimevaryingsphere.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/base/rendering/renderabletimevaryingsphere.h b/modules/base/rendering/renderabletimevaryingsphere.h
index d869d6e544..0664b96e60 100644
--- a/modules/base/rendering/renderabletimevaryingsphere.h
+++ b/modules/base/rendering/renderabletimevaryingsphere.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/base/rendering/renderabletrail.cpp b/modules/base/rendering/renderabletrail.cpp
index 5b073c2d75..ca90ed1ff8 100644
--- a/modules/base/rendering/renderabletrail.cpp
+++ b/modules/base/rendering/renderabletrail.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/base/rendering/renderabletrail.h b/modules/base/rendering/renderabletrail.h
index 9130523d40..bc701e4c91 100644
--- a/modules/base/rendering/renderabletrail.h
+++ b/modules/base/rendering/renderabletrail.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/base/rendering/renderabletrailorbit.cpp b/modules/base/rendering/renderabletrailorbit.cpp
index 89fb383fe1..c8d6aedf1e 100644
--- a/modules/base/rendering/renderabletrailorbit.cpp
+++ b/modules/base/rendering/renderabletrailorbit.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/base/rendering/renderabletrailorbit.h b/modules/base/rendering/renderabletrailorbit.h
index 1f56af9f19..9864373f15 100644
--- a/modules/base/rendering/renderabletrailorbit.h
+++ b/modules/base/rendering/renderabletrailorbit.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/base/rendering/renderabletrailtrajectory.cpp b/modules/base/rendering/renderabletrailtrajectory.cpp
index 4d8eb67e92..cabe1174b4 100644
--- a/modules/base/rendering/renderabletrailtrajectory.cpp
+++ b/modules/base/rendering/renderabletrailtrajectory.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/base/rendering/renderabletrailtrajectory.h b/modules/base/rendering/renderabletrailtrajectory.h
index 86e7beed27..24f2f80fc1 100644
--- a/modules/base/rendering/renderabletrailtrajectory.h
+++ b/modules/base/rendering/renderabletrailtrajectory.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/base/rendering/screenspacedashboard.cpp b/modules/base/rendering/screenspacedashboard.cpp
index c76b17a9e5..5a38aa6443 100644
--- a/modules/base/rendering/screenspacedashboard.cpp
+++ b/modules/base/rendering/screenspacedashboard.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/base/rendering/screenspacedashboard.h b/modules/base/rendering/screenspacedashboard.h
index 18aa3fc743..0bfd86c303 100644
--- a/modules/base/rendering/screenspacedashboard.h
+++ b/modules/base/rendering/screenspacedashboard.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/base/rendering/screenspacedashboard_lua.inl b/modules/base/rendering/screenspacedashboard_lua.inl
index 0c1e3f87af..31cbc38a3a 100644
--- a/modules/base/rendering/screenspacedashboard_lua.inl
+++ b/modules/base/rendering/screenspacedashboard_lua.inl
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/base/rendering/screenspaceframebuffer.cpp b/modules/base/rendering/screenspaceframebuffer.cpp
index 8437077e6b..333e6d9cce 100644
--- a/modules/base/rendering/screenspaceframebuffer.cpp
+++ b/modules/base/rendering/screenspaceframebuffer.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/base/rendering/screenspaceframebuffer.h b/modules/base/rendering/screenspaceframebuffer.h
index 0f274631fb..b79dceb3b3 100644
--- a/modules/base/rendering/screenspaceframebuffer.h
+++ b/modules/base/rendering/screenspaceframebuffer.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/base/rendering/screenspaceimagelocal.cpp b/modules/base/rendering/screenspaceimagelocal.cpp
index 696966bbcf..45787101fb 100644
--- a/modules/base/rendering/screenspaceimagelocal.cpp
+++ b/modules/base/rendering/screenspaceimagelocal.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/base/rendering/screenspaceimagelocal.h b/modules/base/rendering/screenspaceimagelocal.h
index d0441945d8..0c1d3ef0e4 100644
--- a/modules/base/rendering/screenspaceimagelocal.h
+++ b/modules/base/rendering/screenspaceimagelocal.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/base/rendering/screenspaceimageonline.cpp b/modules/base/rendering/screenspaceimageonline.cpp
index 48c68e4414..8a8023618d 100644
--- a/modules/base/rendering/screenspaceimageonline.cpp
+++ b/modules/base/rendering/screenspaceimageonline.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/base/rendering/screenspaceimageonline.h b/modules/base/rendering/screenspaceimageonline.h
index 412441e62b..98339296ed 100644
--- a/modules/base/rendering/screenspaceimageonline.h
+++ b/modules/base/rendering/screenspaceimageonline.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/base/rotation/constantrotation.cpp b/modules/base/rotation/constantrotation.cpp
index 639b4d9e9f..ac9c4c5ee1 100644
--- a/modules/base/rotation/constantrotation.cpp
+++ b/modules/base/rotation/constantrotation.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/base/rotation/constantrotation.h b/modules/base/rotation/constantrotation.h
index 3577a7f2f9..df17e516ba 100644
--- a/modules/base/rotation/constantrotation.h
+++ b/modules/base/rotation/constantrotation.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/base/rotation/fixedrotation.cpp b/modules/base/rotation/fixedrotation.cpp
index 41d0e3be7d..0077ae110c 100644
--- a/modules/base/rotation/fixedrotation.cpp
+++ b/modules/base/rotation/fixedrotation.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/base/rotation/fixedrotation.h b/modules/base/rotation/fixedrotation.h
index 569849256a..114246fa3c 100644
--- a/modules/base/rotation/fixedrotation.h
+++ b/modules/base/rotation/fixedrotation.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/base/rotation/luarotation.cpp b/modules/base/rotation/luarotation.cpp
index 198933b183..eb92a57450 100644
--- a/modules/base/rotation/luarotation.cpp
+++ b/modules/base/rotation/luarotation.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/base/rotation/luarotation.h b/modules/base/rotation/luarotation.h
index b9c127edf1..ea8594affb 100644
--- a/modules/base/rotation/luarotation.h
+++ b/modules/base/rotation/luarotation.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/base/rotation/staticrotation.cpp b/modules/base/rotation/staticrotation.cpp
index 34d20416bf..d1fa0c8fed 100644
--- a/modules/base/rotation/staticrotation.cpp
+++ b/modules/base/rotation/staticrotation.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/base/rotation/staticrotation.h b/modules/base/rotation/staticrotation.h
index e0ba9daebf..5515bd5f65 100644
--- a/modules/base/rotation/staticrotation.h
+++ b/modules/base/rotation/staticrotation.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/base/rotation/timelinerotation.cpp b/modules/base/rotation/timelinerotation.cpp
index 6827d42c9a..99d049602a 100644
--- a/modules/base/rotation/timelinerotation.cpp
+++ b/modules/base/rotation/timelinerotation.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/base/rotation/timelinerotation.h b/modules/base/rotation/timelinerotation.h
index a755351c44..c8250b571d 100644
--- a/modules/base/rotation/timelinerotation.h
+++ b/modules/base/rotation/timelinerotation.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/base/scale/luascale.cpp b/modules/base/scale/luascale.cpp
index 89c2f60426..db6089a2ef 100644
--- a/modules/base/scale/luascale.cpp
+++ b/modules/base/scale/luascale.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/base/scale/luascale.h b/modules/base/scale/luascale.h
index 9440ecaebd..e513d5f4ec 100644
--- a/modules/base/scale/luascale.h
+++ b/modules/base/scale/luascale.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/base/scale/nonuniformstaticscale.cpp b/modules/base/scale/nonuniformstaticscale.cpp
index cef4a0003c..48943451dd 100644
--- a/modules/base/scale/nonuniformstaticscale.cpp
+++ b/modules/base/scale/nonuniformstaticscale.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/base/scale/nonuniformstaticscale.h b/modules/base/scale/nonuniformstaticscale.h
index d82fcaeb29..58acfd0802 100644
--- a/modules/base/scale/nonuniformstaticscale.h
+++ b/modules/base/scale/nonuniformstaticscale.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/base/scale/staticscale.cpp b/modules/base/scale/staticscale.cpp
index e577f2a852..49af883c41 100644
--- a/modules/base/scale/staticscale.cpp
+++ b/modules/base/scale/staticscale.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/base/scale/staticscale.h b/modules/base/scale/staticscale.h
index 4e9f9c03ad..a57cb2b544 100644
--- a/modules/base/scale/staticscale.h
+++ b/modules/base/scale/staticscale.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/base/scale/timedependentscale.cpp b/modules/base/scale/timedependentscale.cpp
index e71e0310b6..5c95d2c06c 100644
--- a/modules/base/scale/timedependentscale.cpp
+++ b/modules/base/scale/timedependentscale.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/base/scale/timedependentscale.h b/modules/base/scale/timedependentscale.h
index fdfc5a4a86..99c201be00 100644
--- a/modules/base/scale/timedependentscale.h
+++ b/modules/base/scale/timedependentscale.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/base/shaders/arrow_fs.glsl b/modules/base/shaders/arrow_fs.glsl
index eec482b47d..3d0f24f09c 100644
--- a/modules/base/shaders/arrow_fs.glsl
+++ b/modules/base/shaders/arrow_fs.glsl
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/base/shaders/arrow_vs.glsl b/modules/base/shaders/arrow_vs.glsl
index 5b178876b8..11d7ae18f7 100644
--- a/modules/base/shaders/arrow_vs.glsl
+++ b/modules/base/shaders/arrow_vs.glsl
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/base/shaders/axes_fs.glsl b/modules/base/shaders/axes_fs.glsl
index 3ac974a762..8448d4549f 100644
--- a/modules/base/shaders/axes_fs.glsl
+++ b/modules/base/shaders/axes_fs.glsl
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/base/shaders/axes_vs.glsl b/modules/base/shaders/axes_vs.glsl
index aefbead13c..cdde6b5027 100644
--- a/modules/base/shaders/axes_vs.glsl
+++ b/modules/base/shaders/axes_vs.glsl
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/base/shaders/disc_fs.glsl b/modules/base/shaders/disc_fs.glsl
index cdd79ce781..2bf91721fd 100644
--- a/modules/base/shaders/disc_fs.glsl
+++ b/modules/base/shaders/disc_fs.glsl
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/base/shaders/disc_vs.glsl b/modules/base/shaders/disc_vs.glsl
index 8a7bba9efe..958d5739a8 100644
--- a/modules/base/shaders/disc_vs.glsl
+++ b/modules/base/shaders/disc_vs.glsl
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/base/shaders/grid_fs.glsl b/modules/base/shaders/grid_fs.glsl
index 05aee2d993..957a7049fa 100644
--- a/modules/base/shaders/grid_fs.glsl
+++ b/modules/base/shaders/grid_fs.glsl
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/base/shaders/grid_vs.glsl b/modules/base/shaders/grid_vs.glsl
index 0c0c99a9c5..ebf758be4e 100644
--- a/modules/base/shaders/grid_vs.glsl
+++ b/modules/base/shaders/grid_vs.glsl
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/base/shaders/imageplane_fs.glsl b/modules/base/shaders/imageplane_fs.glsl
index 95fcbb288b..1c04b9df89 100644
--- a/modules/base/shaders/imageplane_fs.glsl
+++ b/modules/base/shaders/imageplane_fs.glsl
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/base/shaders/imageplane_vs.glsl b/modules/base/shaders/imageplane_vs.glsl
index 5a9e789b47..6aa3b82530 100644
--- a/modules/base/shaders/imageplane_vs.glsl
+++ b/modules/base/shaders/imageplane_vs.glsl
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/base/shaders/line_fs.glsl b/modules/base/shaders/line_fs.glsl
index 22277ee1b4..f186be1c6d 100644
--- a/modules/base/shaders/line_fs.glsl
+++ b/modules/base/shaders/line_fs.glsl
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/base/shaders/line_vs.glsl b/modules/base/shaders/line_vs.glsl
index 82d38fc7c3..5da829a486 100644
--- a/modules/base/shaders/line_vs.glsl
+++ b/modules/base/shaders/line_vs.glsl
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/base/shaders/model_fs.glsl b/modules/base/shaders/model_fs.glsl
index e1ff381e39..308793cdae 100644
--- a/modules/base/shaders/model_fs.glsl
+++ b/modules/base/shaders/model_fs.glsl
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/base/shaders/model_vs.glsl b/modules/base/shaders/model_vs.glsl
index d8dfbeee0f..796e4ac417 100644
--- a/modules/base/shaders/model_vs.glsl
+++ b/modules/base/shaders/model_vs.glsl
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/base/shaders/plane_fs.glsl b/modules/base/shaders/plane_fs.glsl
index 5ba8e9d8c7..55beccfcb0 100644
--- a/modules/base/shaders/plane_fs.glsl
+++ b/modules/base/shaders/plane_fs.glsl
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/base/shaders/plane_vs.glsl b/modules/base/shaders/plane_vs.glsl
index 05a368b975..2cbf5e6922 100644
--- a/modules/base/shaders/plane_vs.glsl
+++ b/modules/base/shaders/plane_vs.glsl
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/base/shaders/pointcloud/pointcloud_fs.glsl b/modules/base/shaders/pointcloud/pointcloud_fs.glsl
index af975b08ab..68b420766f 100644
--- a/modules/base/shaders/pointcloud/pointcloud_fs.glsl
+++ b/modules/base/shaders/pointcloud/pointcloud_fs.glsl
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/base/shaders/pointcloud/pointcloud_gs.glsl b/modules/base/shaders/pointcloud/pointcloud_gs.glsl
index 7e8af327c4..2b7b506439 100644
--- a/modules/base/shaders/pointcloud/pointcloud_gs.glsl
+++ b/modules/base/shaders/pointcloud/pointcloud_gs.glsl
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/base/shaders/pointcloud/pointcloud_interpolated_vs.glsl b/modules/base/shaders/pointcloud/pointcloud_interpolated_vs.glsl
index 5b28d95e7b..c9b50bf6b7 100644
--- a/modules/base/shaders/pointcloud/pointcloud_interpolated_vs.glsl
+++ b/modules/base/shaders/pointcloud/pointcloud_interpolated_vs.glsl
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/base/shaders/pointcloud/pointcloud_vs.glsl b/modules/base/shaders/pointcloud/pointcloud_vs.glsl
index aabc12c904..817eba3a58 100644
--- a/modules/base/shaders/pointcloud/pointcloud_vs.glsl
+++ b/modules/base/shaders/pointcloud/pointcloud_vs.glsl
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/base/shaders/polygon_fs.glsl b/modules/base/shaders/polygon_fs.glsl
index 7f44e3fd7d..ac6dcfb06d 100644
--- a/modules/base/shaders/polygon_fs.glsl
+++ b/modules/base/shaders/polygon_fs.glsl
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/base/shaders/polygon_gs.glsl b/modules/base/shaders/polygon_gs.glsl
index 38a3c8b349..77d57b0f42 100644
--- a/modules/base/shaders/polygon_gs.glsl
+++ b/modules/base/shaders/polygon_gs.glsl
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/base/shaders/polygon_vs.glsl b/modules/base/shaders/polygon_vs.glsl
index e39bc57054..1b428bba26 100644
--- a/modules/base/shaders/polygon_vs.glsl
+++ b/modules/base/shaders/polygon_vs.glsl
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/base/shaders/prism_fs.glsl b/modules/base/shaders/prism_fs.glsl
index 149a8e92fe..c944b220ac 100644
--- a/modules/base/shaders/prism_fs.glsl
+++ b/modules/base/shaders/prism_fs.glsl
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/base/shaders/prism_vs.glsl b/modules/base/shaders/prism_vs.glsl
index 563010854a..8276ab4847 100644
--- a/modules/base/shaders/prism_vs.glsl
+++ b/modules/base/shaders/prism_vs.glsl
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/base/shaders/renderabletrail_apple_fs.glsl b/modules/base/shaders/renderabletrail_apple_fs.glsl
index 5911c97000..b756e19379 100644
--- a/modules/base/shaders/renderabletrail_apple_fs.glsl
+++ b/modules/base/shaders/renderabletrail_apple_fs.glsl
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/base/shaders/renderabletrail_apple_vs.glsl b/modules/base/shaders/renderabletrail_apple_vs.glsl
index cc307a5d18..58bb40476b 100644
--- a/modules/base/shaders/renderabletrail_apple_vs.glsl
+++ b/modules/base/shaders/renderabletrail_apple_vs.glsl
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/base/shaders/renderabletrail_fs.glsl b/modules/base/shaders/renderabletrail_fs.glsl
index daaf31985d..62e338a6fe 100644
--- a/modules/base/shaders/renderabletrail_fs.glsl
+++ b/modules/base/shaders/renderabletrail_fs.glsl
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/base/shaders/renderabletrail_vs.glsl b/modules/base/shaders/renderabletrail_vs.glsl
index af08539071..399e93366b 100644
--- a/modules/base/shaders/renderabletrail_vs.glsl
+++ b/modules/base/shaders/renderabletrail_vs.glsl
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/base/shaders/screenspace_fs.glsl b/modules/base/shaders/screenspace_fs.glsl
index f3aa9f27a0..ae057ce0ba 100644
--- a/modules/base/shaders/screenspace_fs.glsl
+++ b/modules/base/shaders/screenspace_fs.glsl
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/base/shaders/screenspace_vs.glsl b/modules/base/shaders/screenspace_vs.glsl
index bf848f68d1..b2377fb434 100644
--- a/modules/base/shaders/screenspace_vs.glsl
+++ b/modules/base/shaders/screenspace_vs.glsl
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/base/shaders/sphere_fs.glsl b/modules/base/shaders/sphere_fs.glsl
index 757fac9510..8800b47bc8 100644
--- a/modules/base/shaders/sphere_fs.glsl
+++ b/modules/base/shaders/sphere_fs.glsl
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/base/shaders/sphere_vs.glsl b/modules/base/shaders/sphere_vs.glsl
index 13aa469132..d55d09f701 100644
--- a/modules/base/shaders/sphere_vs.glsl
+++ b/modules/base/shaders/sphere_vs.glsl
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/base/timeframe/timeframeinterval.cpp b/modules/base/timeframe/timeframeinterval.cpp
index e7c76dbe5a..9e6d3feaeb 100644
--- a/modules/base/timeframe/timeframeinterval.cpp
+++ b/modules/base/timeframe/timeframeinterval.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/base/timeframe/timeframeinterval.h b/modules/base/timeframe/timeframeinterval.h
index 7214c6dd48..59e24e5489 100644
--- a/modules/base/timeframe/timeframeinterval.h
+++ b/modules/base/timeframe/timeframeinterval.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/base/timeframe/timeframeunion.cpp b/modules/base/timeframe/timeframeunion.cpp
index 78d36641c5..56aabb6b86 100644
--- a/modules/base/timeframe/timeframeunion.cpp
+++ b/modules/base/timeframe/timeframeunion.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/base/timeframe/timeframeunion.h b/modules/base/timeframe/timeframeunion.h
index e28167b309..bd61910709 100644
--- a/modules/base/timeframe/timeframeunion.h
+++ b/modules/base/timeframe/timeframeunion.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/base/translation/luatranslation.cpp b/modules/base/translation/luatranslation.cpp
index a4f0ab2bca..686abcabe6 100644
--- a/modules/base/translation/luatranslation.cpp
+++ b/modules/base/translation/luatranslation.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/base/translation/luatranslation.h b/modules/base/translation/luatranslation.h
index e80dec7501..7be969078b 100644
--- a/modules/base/translation/luatranslation.h
+++ b/modules/base/translation/luatranslation.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/base/translation/statictranslation.cpp b/modules/base/translation/statictranslation.cpp
index 58f89177e0..5c6afe7243 100644
--- a/modules/base/translation/statictranslation.cpp
+++ b/modules/base/translation/statictranslation.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/base/translation/statictranslation.h b/modules/base/translation/statictranslation.h
index 620faca325..fb7d51e712 100644
--- a/modules/base/translation/statictranslation.h
+++ b/modules/base/translation/statictranslation.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/base/translation/timelinetranslation.cpp b/modules/base/translation/timelinetranslation.cpp
index 15c6c03fe3..2f7a03f17c 100644
--- a/modules/base/translation/timelinetranslation.cpp
+++ b/modules/base/translation/timelinetranslation.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/base/translation/timelinetranslation.h b/modules/base/translation/timelinetranslation.h
index 1fae1d4b1d..07a4b56a96 100644
--- a/modules/base/translation/timelinetranslation.h
+++ b/modules/base/translation/timelinetranslation.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/cefwebgui/CMakeLists.txt b/modules/cefwebgui/CMakeLists.txt
index f5fd6fc5eb..e62032904f 100644
--- a/modules/cefwebgui/CMakeLists.txt
+++ b/modules/cefwebgui/CMakeLists.txt
@@ -2,7 +2,7 @@
 #                                                                                        #
 # OpenSpace                                                                              #
 #                                                                                        #
-# Copyright (c) 2014-2024                                                                #
+# Copyright (c) 2014-2025                                                                #
 #                                                                                        #
 # Permission is hereby granted, free of charge, to any person obtaining a copy of this   #
 # software and associated documentation files (the "Software"), to deal in the Software  #
diff --git a/modules/cefwebgui/cefwebguimodule.cpp b/modules/cefwebgui/cefwebguimodule.cpp
index 08d88dfc31..aa8750729a 100644
--- a/modules/cefwebgui/cefwebguimodule.cpp
+++ b/modules/cefwebgui/cefwebguimodule.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/cefwebgui/cefwebguimodule.h b/modules/cefwebgui/cefwebguimodule.h
index 0b3c18ac5a..306d9ff250 100644
--- a/modules/cefwebgui/cefwebguimodule.h
+++ b/modules/cefwebgui/cefwebguimodule.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/cefwebgui/include/guikeyboardhandler.h b/modules/cefwebgui/include/guikeyboardhandler.h
index 29eb869a9c..74ff095fc7 100644
--- a/modules/cefwebgui/include/guikeyboardhandler.h
+++ b/modules/cefwebgui/include/guikeyboardhandler.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/cefwebgui/include/guirenderhandler.h b/modules/cefwebgui/include/guirenderhandler.h
index 0552f45a3f..7712c5b43e 100644
--- a/modules/cefwebgui/include/guirenderhandler.h
+++ b/modules/cefwebgui/include/guirenderhandler.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/cefwebgui/shaders/gui_fs.glsl b/modules/cefwebgui/shaders/gui_fs.glsl
index 7e40d3ce72..2fb3a0769c 100644
--- a/modules/cefwebgui/shaders/gui_fs.glsl
+++ b/modules/cefwebgui/shaders/gui_fs.glsl
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/cefwebgui/shaders/gui_vs.glsl b/modules/cefwebgui/shaders/gui_vs.glsl
index ccc480e0b8..25f6ec7a43 100644
--- a/modules/cefwebgui/shaders/gui_vs.glsl
+++ b/modules/cefwebgui/shaders/gui_vs.glsl
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/cefwebgui/src/guikeyboardhandler.cpp b/modules/cefwebgui/src/guikeyboardhandler.cpp
index 041caab579..109d856c97 100644
--- a/modules/cefwebgui/src/guikeyboardhandler.cpp
+++ b/modules/cefwebgui/src/guikeyboardhandler.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/cefwebgui/src/guirenderhandler.cpp b/modules/cefwebgui/src/guirenderhandler.cpp
index 836908f9f4..9c61b81344 100644
--- a/modules/cefwebgui/src/guirenderhandler.cpp
+++ b/modules/cefwebgui/src/guirenderhandler.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/debugging/CMakeLists.txt b/modules/debugging/CMakeLists.txt
index c9868b3c3f..4b0bb2ab02 100644
--- a/modules/debugging/CMakeLists.txt
+++ b/modules/debugging/CMakeLists.txt
@@ -2,7 +2,7 @@
 #                                                                                        #
 # OpenSpace                                                                              #
 #                                                                                        #
-# Copyright (c) 2014-2024                                                                #
+# Copyright (c) 2014-2025                                                                #
 #                                                                                        #
 # Permission is hereby granted, free of charge, to any person obtaining a copy of this   #
 # software and associated documentation files (the "Software"), to deal in the Software  #
diff --git a/modules/debugging/debuggingmodule.cpp b/modules/debugging/debuggingmodule.cpp
index 1a38bf8cb0..7d2b970c72 100644
--- a/modules/debugging/debuggingmodule.cpp
+++ b/modules/debugging/debuggingmodule.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/debugging/debuggingmodule.h b/modules/debugging/debuggingmodule.h
index ccd7439d88..1e7dfbfe69 100644
--- a/modules/debugging/debuggingmodule.h
+++ b/modules/debugging/debuggingmodule.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/debugging/debuggingmodule_lua.inl b/modules/debugging/debuggingmodule_lua.inl
index 9b0f80ff94..873c6603ac 100644
--- a/modules/debugging/debuggingmodule_lua.inl
+++ b/modules/debugging/debuggingmodule_lua.inl
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/debugging/rendering/debugrenderer.cpp b/modules/debugging/rendering/debugrenderer.cpp
index 6b48b6b2f3..322441c7c1 100644
--- a/modules/debugging/rendering/debugrenderer.cpp
+++ b/modules/debugging/rendering/debugrenderer.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/debugging/rendering/debugrenderer.h b/modules/debugging/rendering/debugrenderer.h
index 4198056455..666e9b78f7 100644
--- a/modules/debugging/rendering/debugrenderer.h
+++ b/modules/debugging/rendering/debugrenderer.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/debugging/rendering/debugshader_fs.glsl b/modules/debugging/rendering/debugshader_fs.glsl
index 75b69e40f7..14c7fd1b95 100644
--- a/modules/debugging/rendering/debugshader_fs.glsl
+++ b/modules/debugging/rendering/debugshader_fs.glsl
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/debugging/rendering/debugshader_vs.glsl b/modules/debugging/rendering/debugshader_vs.glsl
index 1e1475f97e..7a875942f5 100644
--- a/modules/debugging/rendering/debugshader_vs.glsl
+++ b/modules/debugging/rendering/debugshader_vs.glsl
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/debugging/rendering/renderabledebugplane.cpp b/modules/debugging/rendering/renderabledebugplane.cpp
index baf33241d2..69315d3ccb 100644
--- a/modules/debugging/rendering/renderabledebugplane.cpp
+++ b/modules/debugging/rendering/renderabledebugplane.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/debugging/rendering/renderabledebugplane.h b/modules/debugging/rendering/renderabledebugplane.h
index 9ff16d651e..0309c376c5 100644
--- a/modules/debugging/rendering/renderabledebugplane.h
+++ b/modules/debugging/rendering/renderabledebugplane.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/digitaluniverse/CMakeLists.txt b/modules/digitaluniverse/CMakeLists.txt
index 2ee49f6062..27abe6c3f7 100644
--- a/modules/digitaluniverse/CMakeLists.txt
+++ b/modules/digitaluniverse/CMakeLists.txt
@@ -2,7 +2,7 @@
 #                                                                                        #
 # OpenSpace                                                                              #
 #                                                                                        #
-# Copyright (c) 2014-2024                                                                #
+# Copyright (c) 2014-2025                                                                #
 #                                                                                        #
 # Permission is hereby granted, free of charge, to any person obtaining a copy of this   #
 # software and associated documentation files (the "Software"), to deal in the Software  #
diff --git a/modules/digitaluniverse/digitaluniversemodule.cpp b/modules/digitaluniverse/digitaluniversemodule.cpp
index 818ef9a7d1..47fb5decdd 100644
--- a/modules/digitaluniverse/digitaluniversemodule.cpp
+++ b/modules/digitaluniverse/digitaluniversemodule.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/digitaluniverse/digitaluniversemodule.h b/modules/digitaluniverse/digitaluniversemodule.h
index 0734edb0f4..e7942bb281 100644
--- a/modules/digitaluniverse/digitaluniversemodule.h
+++ b/modules/digitaluniverse/digitaluniversemodule.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/digitaluniverse/rendering/renderabledumeshes.cpp b/modules/digitaluniverse/rendering/renderabledumeshes.cpp
index 3df83aa027..38a58d85bf 100644
--- a/modules/digitaluniverse/rendering/renderabledumeshes.cpp
+++ b/modules/digitaluniverse/rendering/renderabledumeshes.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/digitaluniverse/rendering/renderabledumeshes.h b/modules/digitaluniverse/rendering/renderabledumeshes.h
index 1ecb169ee0..5a539934c7 100644
--- a/modules/digitaluniverse/rendering/renderabledumeshes.h
+++ b/modules/digitaluniverse/rendering/renderabledumeshes.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/digitaluniverse/shaders/dumesh_fs.glsl b/modules/digitaluniverse/shaders/dumesh_fs.glsl
index 32e622f5a9..c2a1e9435a 100644
--- a/modules/digitaluniverse/shaders/dumesh_fs.glsl
+++ b/modules/digitaluniverse/shaders/dumesh_fs.glsl
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/digitaluniverse/shaders/dumesh_vs.glsl b/modules/digitaluniverse/shaders/dumesh_vs.glsl
index ceb843f68b..e3619b09cf 100644
--- a/modules/digitaluniverse/shaders/dumesh_vs.glsl
+++ b/modules/digitaluniverse/shaders/dumesh_vs.glsl
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/digitaluniverse/shaders/plane_fs.glsl b/modules/digitaluniverse/shaders/plane_fs.glsl
index dadc28be5b..24c223bf38 100644
--- a/modules/digitaluniverse/shaders/plane_fs.glsl
+++ b/modules/digitaluniverse/shaders/plane_fs.glsl
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/digitaluniverse/shaders/plane_vs.glsl b/modules/digitaluniverse/shaders/plane_vs.glsl
index 71bd4bd0b9..2b57225527 100644
--- a/modules/digitaluniverse/shaders/plane_vs.glsl
+++ b/modules/digitaluniverse/shaders/plane_vs.glsl
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/exoplanets/CMakeLists.txt b/modules/exoplanets/CMakeLists.txt
index 4f5a98e8d5..9e2ae2c931 100644
--- a/modules/exoplanets/CMakeLists.txt
+++ b/modules/exoplanets/CMakeLists.txt
@@ -2,7 +2,7 @@
 #                                                                                        #
 # OpenSpace                                                                              #
 #                                                                                        #
-# Copyright (c) 2014-2024                                                                #
+# Copyright (c) 2014-2025                                                                #
 #                                                                                        #
 # Permission is hereby granted, free of charge, to any person obtaining a copy of this   #
 # software and associated documentation files (the "Software"), to deal in the Software  #
diff --git a/modules/exoplanets/datastructure.cpp b/modules/exoplanets/datastructure.cpp
index f752c037dc..0ba731055d 100644
--- a/modules/exoplanets/datastructure.cpp
+++ b/modules/exoplanets/datastructure.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/exoplanets/datastructure.h b/modules/exoplanets/datastructure.h
index be3e6c2ea1..4b592a0b48 100644
--- a/modules/exoplanets/datastructure.h
+++ b/modules/exoplanets/datastructure.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/exoplanets/exoplanetshelper.cpp b/modules/exoplanets/exoplanetshelper.cpp
index 0504aa700d..488f2ed910 100644
--- a/modules/exoplanets/exoplanetshelper.cpp
+++ b/modules/exoplanets/exoplanetshelper.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/exoplanets/exoplanetshelper.h b/modules/exoplanets/exoplanetshelper.h
index b1f99e2210..7acaf2c471 100644
--- a/modules/exoplanets/exoplanetshelper.h
+++ b/modules/exoplanets/exoplanetshelper.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/exoplanets/exoplanetsmodule.cpp b/modules/exoplanets/exoplanetsmodule.cpp
index 26e8e33c56..526e3f7573 100644
--- a/modules/exoplanets/exoplanetsmodule.cpp
+++ b/modules/exoplanets/exoplanetsmodule.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/exoplanets/exoplanetsmodule.h b/modules/exoplanets/exoplanetsmodule.h
index 742df53ac6..3b5b0abe1f 100644
--- a/modules/exoplanets/exoplanetsmodule.h
+++ b/modules/exoplanets/exoplanetsmodule.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/exoplanets/exoplanetsmodule_lua.inl b/modules/exoplanets/exoplanetsmodule_lua.inl
index 8338b2d70e..d2b3bee0d4 100644
--- a/modules/exoplanets/exoplanetsmodule_lua.inl
+++ b/modules/exoplanets/exoplanetsmodule_lua.inl
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/exoplanets/rendering/renderableorbitdisc.cpp b/modules/exoplanets/rendering/renderableorbitdisc.cpp
index 1251ad61dd..ad0b83aac0 100644
--- a/modules/exoplanets/rendering/renderableorbitdisc.cpp
+++ b/modules/exoplanets/rendering/renderableorbitdisc.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/exoplanets/rendering/renderableorbitdisc.h b/modules/exoplanets/rendering/renderableorbitdisc.h
index 796cb5f8a2..dadaa3623a 100644
--- a/modules/exoplanets/rendering/renderableorbitdisc.h
+++ b/modules/exoplanets/rendering/renderableorbitdisc.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/exoplanets/shaders/orbitdisc_fs.glsl b/modules/exoplanets/shaders/orbitdisc_fs.glsl
index ff85d89f33..eb89fdce56 100644
--- a/modules/exoplanets/shaders/orbitdisc_fs.glsl
+++ b/modules/exoplanets/shaders/orbitdisc_fs.glsl
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/exoplanets/shaders/orbitdisc_vs.glsl b/modules/exoplanets/shaders/orbitdisc_vs.glsl
index 60d80b3abd..e8f73f81ac 100644
--- a/modules/exoplanets/shaders/orbitdisc_vs.glsl
+++ b/modules/exoplanets/shaders/orbitdisc_vs.glsl
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/exoplanets/tasks/exoplanetsdatapreparationtask.cpp b/modules/exoplanets/tasks/exoplanetsdatapreparationtask.cpp
index 95a7c7c146..89790c50f4 100644
--- a/modules/exoplanets/tasks/exoplanetsdatapreparationtask.cpp
+++ b/modules/exoplanets/tasks/exoplanetsdatapreparationtask.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/exoplanets/tasks/exoplanetsdatapreparationtask.h b/modules/exoplanets/tasks/exoplanetsdatapreparationtask.h
index 9c913e337e..baeddc3dc5 100644
--- a/modules/exoplanets/tasks/exoplanetsdatapreparationtask.h
+++ b/modules/exoplanets/tasks/exoplanetsdatapreparationtask.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/fieldlines/CMakeLists.txt b/modules/fieldlines/CMakeLists.txt
index 5e9c15f8e2..260394e544 100644
--- a/modules/fieldlines/CMakeLists.txt
+++ b/modules/fieldlines/CMakeLists.txt
@@ -2,7 +2,7 @@
 #                                                                                        #
 # OpenSpace                                                                              #
 #                                                                                        #
-# Copyright (c) 2014-2024                                                                #
+# Copyright (c) 2014-2025                                                                #
 #                                                                                        #
 # Permission is hereby granted, free of charge, to any person obtaining a copy of this   #
 # software and associated documentation files (the "Software"), to deal in the Software  #
diff --git a/modules/fieldlines/fieldlinesmodule.cpp b/modules/fieldlines/fieldlinesmodule.cpp
index 61f58ce31c..74957005e6 100644
--- a/modules/fieldlines/fieldlinesmodule.cpp
+++ b/modules/fieldlines/fieldlinesmodule.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/fieldlines/fieldlinesmodule.h b/modules/fieldlines/fieldlinesmodule.h
index 800e45e90d..bf3c072f37 100644
--- a/modules/fieldlines/fieldlinesmodule.h
+++ b/modules/fieldlines/fieldlinesmodule.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/fieldlines/rendering/renderablefieldlines.cpp b/modules/fieldlines/rendering/renderablefieldlines.cpp
index c311b69dd1..7983ba3caa 100644
--- a/modules/fieldlines/rendering/renderablefieldlines.cpp
+++ b/modules/fieldlines/rendering/renderablefieldlines.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/fieldlines/rendering/renderablefieldlines.h b/modules/fieldlines/rendering/renderablefieldlines.h
index d4a25ad78b..cd53f59bdf 100644
--- a/modules/fieldlines/rendering/renderablefieldlines.h
+++ b/modules/fieldlines/rendering/renderablefieldlines.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/fieldlines/shaders/fieldline_fs.glsl b/modules/fieldlines/shaders/fieldline_fs.glsl
index 304e2a268a..308a88d23d 100644
--- a/modules/fieldlines/shaders/fieldline_fs.glsl
+++ b/modules/fieldlines/shaders/fieldline_fs.glsl
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/fieldlines/shaders/fieldline_gs.glsl b/modules/fieldlines/shaders/fieldline_gs.glsl
index edb2046dec..4fc4ef2e97 100644
--- a/modules/fieldlines/shaders/fieldline_gs.glsl
+++ b/modules/fieldlines/shaders/fieldline_gs.glsl
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/fieldlines/shaders/fieldline_vs.glsl b/modules/fieldlines/shaders/fieldline_vs.glsl
index bef66c6232..c467312733 100644
--- a/modules/fieldlines/shaders/fieldline_vs.glsl
+++ b/modules/fieldlines/shaders/fieldline_vs.glsl
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/fieldlinessequence/CMakeLists.txt b/modules/fieldlinessequence/CMakeLists.txt
index e7ccdae21b..5721c44e97 100644
--- a/modules/fieldlinessequence/CMakeLists.txt
+++ b/modules/fieldlinessequence/CMakeLists.txt
@@ -2,7 +2,7 @@
 #                                                                                        #
 # OpenSpace                                                                              #
 #                                                                                        #
-# Copyright (c) 2014-2024                                                                #
+# Copyright (c) 2014-2025                                                                #
 #                                                                                        #
 # Permission is hereby granted, free of charge, to any person obtaining a copy of this   #
 # software and associated documentation files (the "Software"), to deal in the Software  #
diff --git a/modules/fieldlinessequence/fieldlinessequencemodule.cpp b/modules/fieldlinessequence/fieldlinessequencemodule.cpp
index 9c98e97bb2..13de0c2083 100644
--- a/modules/fieldlinessequence/fieldlinessequencemodule.cpp
+++ b/modules/fieldlinessequence/fieldlinessequencemodule.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/fieldlinessequence/fieldlinessequencemodule.h b/modules/fieldlinessequence/fieldlinessequencemodule.h
index 2272170596..7c2251220e 100644
--- a/modules/fieldlinessequence/fieldlinessequencemodule.h
+++ b/modules/fieldlinessequence/fieldlinessequencemodule.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/fieldlinessequence/rendering/renderablefieldlinessequence.cpp b/modules/fieldlinessequence/rendering/renderablefieldlinessequence.cpp
index 057d44bfb5..e5c6c30a0c 100644
--- a/modules/fieldlinessequence/rendering/renderablefieldlinessequence.cpp
+++ b/modules/fieldlinessequence/rendering/renderablefieldlinessequence.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/fieldlinessequence/rendering/renderablefieldlinessequence.h b/modules/fieldlinessequence/rendering/renderablefieldlinessequence.h
index b2bcb92e1d..c7dbf61c81 100644
--- a/modules/fieldlinessequence/rendering/renderablefieldlinessequence.h
+++ b/modules/fieldlinessequence/rendering/renderablefieldlinessequence.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/fieldlinessequence/shaders/fieldlinessequence_fs.glsl b/modules/fieldlinessequence/shaders/fieldlinessequence_fs.glsl
index f59a3f2ce6..cfdd061465 100644
--- a/modules/fieldlinessequence/shaders/fieldlinessequence_fs.glsl
+++ b/modules/fieldlinessequence/shaders/fieldlinessequence_fs.glsl
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/fieldlinessequence/shaders/fieldlinessequence_vs.glsl b/modules/fieldlinessequence/shaders/fieldlinessequence_vs.glsl
index b3a5271d05..6114bebe73 100644
--- a/modules/fieldlinessequence/shaders/fieldlinessequence_vs.glsl
+++ b/modules/fieldlinessequence/shaders/fieldlinessequence_vs.glsl
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/fieldlinessequence/util/commons.cpp b/modules/fieldlinessequence/util/commons.cpp
index 59afc8bae2..6a747a2319 100644
--- a/modules/fieldlinessequence/util/commons.cpp
+++ b/modules/fieldlinessequence/util/commons.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/fieldlinessequence/util/commons.h b/modules/fieldlinessequence/util/commons.h
index e7a50b6b3b..49b2369dd0 100644
--- a/modules/fieldlinessequence/util/commons.h
+++ b/modules/fieldlinessequence/util/commons.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/fieldlinessequence/util/fieldlinesstate.cpp b/modules/fieldlinessequence/util/fieldlinesstate.cpp
index b2e1b828fd..0db7509a0a 100644
--- a/modules/fieldlinessequence/util/fieldlinesstate.cpp
+++ b/modules/fieldlinessequence/util/fieldlinesstate.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/fieldlinessequence/util/fieldlinesstate.h b/modules/fieldlinessequence/util/fieldlinesstate.h
index 2d5d44afbd..062cb68e8c 100644
--- a/modules/fieldlinessequence/util/fieldlinesstate.h
+++ b/modules/fieldlinessequence/util/fieldlinesstate.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/fieldlinessequence/util/kameleonfieldlinehelper.cpp b/modules/fieldlinessequence/util/kameleonfieldlinehelper.cpp
index 149f93c924..c15eafbd86 100644
--- a/modules/fieldlinessequence/util/kameleonfieldlinehelper.cpp
+++ b/modules/fieldlinessequence/util/kameleonfieldlinehelper.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/fieldlinessequence/util/kameleonfieldlinehelper.h b/modules/fieldlinessequence/util/kameleonfieldlinehelper.h
index 76bfb86aeb..2839060a98 100644
--- a/modules/fieldlinessequence/util/kameleonfieldlinehelper.h
+++ b/modules/fieldlinessequence/util/kameleonfieldlinehelper.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/fitsfilereader/CMakeLists.txt b/modules/fitsfilereader/CMakeLists.txt
index 640ec48106..b13c2b83d3 100644
--- a/modules/fitsfilereader/CMakeLists.txt
+++ b/modules/fitsfilereader/CMakeLists.txt
@@ -2,7 +2,7 @@
 #                                                                                        #
 # OpenSpace                                                                              #
 #                                                                                        #
-# Copyright (c) 2014-2024                                                                #
+# Copyright (c) 2014-2025                                                                #
 #                                                                                        #
 # Permission is hereby granted, free of charge, to any person obtaining a copy of this   #
 # software and associated documentation files (the "Software"), to deal in the Software  #
diff --git a/modules/fitsfilereader/fitsfilereadermodule.cpp b/modules/fitsfilereader/fitsfilereadermodule.cpp
index 7a9eadde32..c17f247e36 100644
--- a/modules/fitsfilereader/fitsfilereadermodule.cpp
+++ b/modules/fitsfilereader/fitsfilereadermodule.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/fitsfilereader/fitsfilereadermodule.h b/modules/fitsfilereader/fitsfilereadermodule.h
index a25b01bc60..1fdd480f7d 100644
--- a/modules/fitsfilereader/fitsfilereadermodule.h
+++ b/modules/fitsfilereader/fitsfilereadermodule.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/fitsfilereader/include/fitsfilereader.h b/modules/fitsfilereader/include/fitsfilereader.h
index 0b2e2ae086..6c4d5d35e8 100644
--- a/modules/fitsfilereader/include/fitsfilereader.h
+++ b/modules/fitsfilereader/include/fitsfilereader.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/fitsfilereader/src/fitsfilereader.cpp b/modules/fitsfilereader/src/fitsfilereader.cpp
index 7a501e93ed..a3aeb79c91 100644
--- a/modules/fitsfilereader/src/fitsfilereader.cpp
+++ b/modules/fitsfilereader/src/fitsfilereader.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/gaia/CMakeLists.txt b/modules/gaia/CMakeLists.txt
index 679ee5d378..8808a8c32c 100644
--- a/modules/gaia/CMakeLists.txt
+++ b/modules/gaia/CMakeLists.txt
@@ -2,7 +2,7 @@
 #                                                                                        #
 # OpenSpace                                                                              #
 #                                                                                        #
-# Copyright (c) 2014-2024                                                                #
+# Copyright (c) 2014-2025                                                                #
 #                                                                                        #
 # Permission is hereby granted, free of charge, to any person obtaining a copy of this   #
 # software and associated documentation files (the "Software"), to deal in the Software  #
diff --git a/modules/gaia/gaiamodule.cpp b/modules/gaia/gaiamodule.cpp
index 1f8d12e8d1..73ef37aa9b 100644
--- a/modules/gaia/gaiamodule.cpp
+++ b/modules/gaia/gaiamodule.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/gaia/gaiamodule.h b/modules/gaia/gaiamodule.h
index 42bc8693d6..8962e068e7 100644
--- a/modules/gaia/gaiamodule.h
+++ b/modules/gaia/gaiamodule.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/gaia/rendering/gaiaoptions.h b/modules/gaia/rendering/gaiaoptions.h
index 790016ce15..4331e8b3c7 100644
--- a/modules/gaia/rendering/gaiaoptions.h
+++ b/modules/gaia/rendering/gaiaoptions.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/gaia/rendering/octreeculler.cpp b/modules/gaia/rendering/octreeculler.cpp
index e417b13366..728655c1c0 100644
--- a/modules/gaia/rendering/octreeculler.cpp
+++ b/modules/gaia/rendering/octreeculler.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/gaia/rendering/octreeculler.h b/modules/gaia/rendering/octreeculler.h
index e4f3d76540..237b13afac 100644
--- a/modules/gaia/rendering/octreeculler.h
+++ b/modules/gaia/rendering/octreeculler.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/gaia/rendering/octreemanager.cpp b/modules/gaia/rendering/octreemanager.cpp
index 506c3c7e4b..18538d53a4 100644
--- a/modules/gaia/rendering/octreemanager.cpp
+++ b/modules/gaia/rendering/octreemanager.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/gaia/rendering/octreemanager.h b/modules/gaia/rendering/octreemanager.h
index 5be8d38d53..2b9f9f8b4a 100644
--- a/modules/gaia/rendering/octreemanager.h
+++ b/modules/gaia/rendering/octreemanager.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/gaia/rendering/renderablegaiastars.cpp b/modules/gaia/rendering/renderablegaiastars.cpp
index 787e415e8f..a06bedc2a7 100644
--- a/modules/gaia/rendering/renderablegaiastars.cpp
+++ b/modules/gaia/rendering/renderablegaiastars.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/gaia/rendering/renderablegaiastars.h b/modules/gaia/rendering/renderablegaiastars.h
index a73fb0e618..2ca44b19c3 100644
--- a/modules/gaia/rendering/renderablegaiastars.h
+++ b/modules/gaia/rendering/renderablegaiastars.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/gaia/shaders/gaia_billboard_fs.glsl b/modules/gaia/shaders/gaia_billboard_fs.glsl
index b377e51e0c..b31937962e 100644
--- a/modules/gaia/shaders/gaia_billboard_fs.glsl
+++ b/modules/gaia/shaders/gaia_billboard_fs.glsl
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/gaia/shaders/gaia_billboard_ge.glsl b/modules/gaia/shaders/gaia_billboard_ge.glsl
index 503b1e8455..df0715fe5e 100644
--- a/modules/gaia/shaders/gaia_billboard_ge.glsl
+++ b/modules/gaia/shaders/gaia_billboard_ge.glsl
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/gaia/shaders/gaia_billboard_nofbo_fs.glsl b/modules/gaia/shaders/gaia_billboard_nofbo_fs.glsl
index e97705f8cf..b60a1db382 100644
--- a/modules/gaia/shaders/gaia_billboard_nofbo_fs.glsl
+++ b/modules/gaia/shaders/gaia_billboard_nofbo_fs.glsl
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/gaia/shaders/gaia_point_fs.glsl b/modules/gaia/shaders/gaia_point_fs.glsl
index 0dc7b66d58..b128a65a6e 100644
--- a/modules/gaia/shaders/gaia_point_fs.glsl
+++ b/modules/gaia/shaders/gaia_point_fs.glsl
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/gaia/shaders/gaia_point_ge.glsl b/modules/gaia/shaders/gaia_point_ge.glsl
index 3880490cbd..5b831b52fb 100644
--- a/modules/gaia/shaders/gaia_point_ge.glsl
+++ b/modules/gaia/shaders/gaia_point_ge.glsl
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/gaia/shaders/gaia_ssbo_vs.glsl b/modules/gaia/shaders/gaia_ssbo_vs.glsl
index 31452e772d..a346d637da 100644
--- a/modules/gaia/shaders/gaia_ssbo_vs.glsl
+++ b/modules/gaia/shaders/gaia_ssbo_vs.glsl
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/gaia/shaders/gaia_tonemapping_billboard_fs.glsl b/modules/gaia/shaders/gaia_tonemapping_billboard_fs.glsl
index aeaf100566..b0a7079002 100644
--- a/modules/gaia/shaders/gaia_tonemapping_billboard_fs.glsl
+++ b/modules/gaia/shaders/gaia_tonemapping_billboard_fs.glsl
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/gaia/shaders/gaia_tonemapping_point_fs.glsl b/modules/gaia/shaders/gaia_tonemapping_point_fs.glsl
index 37c7c907a8..d6a963bbc7 100644
--- a/modules/gaia/shaders/gaia_tonemapping_point_fs.glsl
+++ b/modules/gaia/shaders/gaia_tonemapping_point_fs.glsl
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/gaia/shaders/gaia_tonemapping_vs.glsl b/modules/gaia/shaders/gaia_tonemapping_vs.glsl
index bebaa85c35..fe7b1c4d54 100644
--- a/modules/gaia/shaders/gaia_tonemapping_vs.glsl
+++ b/modules/gaia/shaders/gaia_tonemapping_vs.glsl
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/gaia/shaders/gaia_vbo_vs.glsl b/modules/gaia/shaders/gaia_vbo_vs.glsl
index 19ccf6e1d5..c8449f0b5b 100644
--- a/modules/gaia/shaders/gaia_vbo_vs.glsl
+++ b/modules/gaia/shaders/gaia_vbo_vs.glsl
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/gaia/tasks/constructoctreetask.cpp b/modules/gaia/tasks/constructoctreetask.cpp
index 1151890488..37cc857bc3 100644
--- a/modules/gaia/tasks/constructoctreetask.cpp
+++ b/modules/gaia/tasks/constructoctreetask.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/gaia/tasks/constructoctreetask.h b/modules/gaia/tasks/constructoctreetask.h
index d7635faf26..387aa9fd0e 100644
--- a/modules/gaia/tasks/constructoctreetask.h
+++ b/modules/gaia/tasks/constructoctreetask.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/gaia/tasks/readfilejob.cpp b/modules/gaia/tasks/readfilejob.cpp
index f9b21efcda..6d645944f4 100644
--- a/modules/gaia/tasks/readfilejob.cpp
+++ b/modules/gaia/tasks/readfilejob.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/gaia/tasks/readfilejob.h b/modules/gaia/tasks/readfilejob.h
index 6ab2469a33..1459f2f2e0 100644
--- a/modules/gaia/tasks/readfilejob.h
+++ b/modules/gaia/tasks/readfilejob.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/gaia/tasks/readfitstask.cpp b/modules/gaia/tasks/readfitstask.cpp
index 3373319766..7ba2843dfa 100644
--- a/modules/gaia/tasks/readfitstask.cpp
+++ b/modules/gaia/tasks/readfitstask.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/gaia/tasks/readfitstask.h b/modules/gaia/tasks/readfitstask.h
index cf7352e3d6..d7a70325f0 100644
--- a/modules/gaia/tasks/readfitstask.h
+++ b/modules/gaia/tasks/readfitstask.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/gaia/tasks/readspecktask.cpp b/modules/gaia/tasks/readspecktask.cpp
index ebd6aec48e..123f49a5f6 100644
--- a/modules/gaia/tasks/readspecktask.cpp
+++ b/modules/gaia/tasks/readspecktask.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/gaia/tasks/readspecktask.h b/modules/gaia/tasks/readspecktask.h
index 252c2f547f..d665f9ecf3 100644
--- a/modules/gaia/tasks/readspecktask.h
+++ b/modules/gaia/tasks/readspecktask.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/galaxy/CMakeLists.txt b/modules/galaxy/CMakeLists.txt
index 6466650d9c..1107fe021c 100644
--- a/modules/galaxy/CMakeLists.txt
+++ b/modules/galaxy/CMakeLists.txt
@@ -2,7 +2,7 @@
 #                                                                                        #
 # OpenSpace                                                                              #
 #                                                                                        #
-# Copyright (c) 2014-2024                                                                #
+# Copyright (c) 2014-2025                                                                #
 #                                                                                        #
 # Permission is hereby granted, free of charge, to any person obtaining a copy of this   #
 # software and associated documentation files (the "Software"), to deal in the Software  #
diff --git a/modules/galaxy/galaxymodule.cpp b/modules/galaxy/galaxymodule.cpp
index 14b40dd77f..8de67e6678 100644
--- a/modules/galaxy/galaxymodule.cpp
+++ b/modules/galaxy/galaxymodule.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/galaxy/galaxymodule.h b/modules/galaxy/galaxymodule.h
index e3a2f33602..973ea13595 100644
--- a/modules/galaxy/galaxymodule.h
+++ b/modules/galaxy/galaxymodule.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/galaxy/rendering/galaxyraycaster.cpp b/modules/galaxy/rendering/galaxyraycaster.cpp
index 649de64569..8b4606b8e6 100644
--- a/modules/galaxy/rendering/galaxyraycaster.cpp
+++ b/modules/galaxy/rendering/galaxyraycaster.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/galaxy/rendering/galaxyraycaster.h b/modules/galaxy/rendering/galaxyraycaster.h
index f364fb6b98..8313d701ed 100644
--- a/modules/galaxy/rendering/galaxyraycaster.h
+++ b/modules/galaxy/rendering/galaxyraycaster.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/galaxy/rendering/renderablegalaxy.cpp b/modules/galaxy/rendering/renderablegalaxy.cpp
index e40b337dac..0af22096ca 100644
--- a/modules/galaxy/rendering/renderablegalaxy.cpp
+++ b/modules/galaxy/rendering/renderablegalaxy.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/galaxy/rendering/renderablegalaxy.h b/modules/galaxy/rendering/renderablegalaxy.h
index c1a9390a86..8723d54161 100644
--- a/modules/galaxy/rendering/renderablegalaxy.h
+++ b/modules/galaxy/rendering/renderablegalaxy.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/galaxy/shaders/billboard_fs.glsl b/modules/galaxy/shaders/billboard_fs.glsl
index 1bd3f4630a..350a019674 100644
--- a/modules/galaxy/shaders/billboard_fs.glsl
+++ b/modules/galaxy/shaders/billboard_fs.glsl
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/galaxy/shaders/billboard_ge.glsl b/modules/galaxy/shaders/billboard_ge.glsl
index 7134b506f9..ad58f5a064 100644
--- a/modules/galaxy/shaders/billboard_ge.glsl
+++ b/modules/galaxy/shaders/billboard_ge.glsl
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/galaxy/shaders/billboard_vs.glsl b/modules/galaxy/shaders/billboard_vs.glsl
index 659d760e58..4c0f79766f 100644
--- a/modules/galaxy/shaders/billboard_vs.glsl
+++ b/modules/galaxy/shaders/billboard_vs.glsl
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/galaxy/shaders/points_fs.glsl b/modules/galaxy/shaders/points_fs.glsl
index 8c3d9d2aa3..26d577f1bd 100644
--- a/modules/galaxy/shaders/points_fs.glsl
+++ b/modules/galaxy/shaders/points_fs.glsl
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/galaxy/shaders/points_vs.glsl b/modules/galaxy/shaders/points_vs.glsl
index 86a52394b9..bf13c8255b 100644
--- a/modules/galaxy/shaders/points_vs.glsl
+++ b/modules/galaxy/shaders/points_vs.glsl
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/galaxy/shaders/raycasterbounds_fs.glsl b/modules/galaxy/shaders/raycasterbounds_fs.glsl
index f8a45ec17c..450c5c69ba 100644
--- a/modules/galaxy/shaders/raycasterbounds_fs.glsl
+++ b/modules/galaxy/shaders/raycasterbounds_fs.glsl
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/galaxy/shaders/raycasterbounds_vs.glsl b/modules/galaxy/shaders/raycasterbounds_vs.glsl
index f5592f9b53..9d6a8ddebd 100644
--- a/modules/galaxy/shaders/raycasterbounds_vs.glsl
+++ b/modules/galaxy/shaders/raycasterbounds_vs.glsl
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/galaxy/tasks/milkywayconversiontask.cpp b/modules/galaxy/tasks/milkywayconversiontask.cpp
index 707db73a0f..10c5e237d7 100644
--- a/modules/galaxy/tasks/milkywayconversiontask.cpp
+++ b/modules/galaxy/tasks/milkywayconversiontask.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/galaxy/tasks/milkywayconversiontask.h b/modules/galaxy/tasks/milkywayconversiontask.h
index ac214ba39a..c608aa4e55 100644
--- a/modules/galaxy/tasks/milkywayconversiontask.h
+++ b/modules/galaxy/tasks/milkywayconversiontask.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/galaxy/tasks/milkywaypointsconversiontask.cpp b/modules/galaxy/tasks/milkywaypointsconversiontask.cpp
index 62dd447acc..e8d2170182 100644
--- a/modules/galaxy/tasks/milkywaypointsconversiontask.cpp
+++ b/modules/galaxy/tasks/milkywaypointsconversiontask.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/galaxy/tasks/milkywaypointsconversiontask.h b/modules/galaxy/tasks/milkywaypointsconversiontask.h
index 375a1b78af..6c9ec70069 100644
--- a/modules/galaxy/tasks/milkywaypointsconversiontask.h
+++ b/modules/galaxy/tasks/milkywaypointsconversiontask.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/globebrowsing/CMakeLists.txt b/modules/globebrowsing/CMakeLists.txt
index c4d06db4c3..0b88dc1e86 100644
--- a/modules/globebrowsing/CMakeLists.txt
+++ b/modules/globebrowsing/CMakeLists.txt
@@ -2,7 +2,7 @@
 #                                                                                        #
 # OpenSpace                                                                              #
 #                                                                                        #
-# Copyright (c) 2014-2024                                                                #
+# Copyright (c) 2014-2025                                                                #
 #                                                                                        #
 # Permission is hereby granted, free of charge, to any person obtaining a copy of this   #
 # software and associated documentation files (the "Software"), to deal in the Software  #
diff --git a/modules/globebrowsing/globebrowsingmodule.cpp b/modules/globebrowsing/globebrowsingmodule.cpp
index bfcb5fea0e..1e8209de29 100644
--- a/modules/globebrowsing/globebrowsingmodule.cpp
+++ b/modules/globebrowsing/globebrowsingmodule.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/globebrowsing/globebrowsingmodule.h b/modules/globebrowsing/globebrowsingmodule.h
index 691fb794f8..d0b5cbbf0b 100644
--- a/modules/globebrowsing/globebrowsingmodule.h
+++ b/modules/globebrowsing/globebrowsingmodule.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/globebrowsing/globebrowsingmodule_lua.inl b/modules/globebrowsing/globebrowsingmodule_lua.inl
index af7d4a8269..17aeb6d3d1 100644
--- a/modules/globebrowsing/globebrowsingmodule_lua.inl
+++ b/modules/globebrowsing/globebrowsingmodule_lua.inl
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/globebrowsing/shaders/advanced_rings_fs.glsl b/modules/globebrowsing/shaders/advanced_rings_fs.glsl
index d85529ad24..1ec8dc3e98 100644
--- a/modules/globebrowsing/shaders/advanced_rings_fs.glsl
+++ b/modules/globebrowsing/shaders/advanced_rings_fs.glsl
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/globebrowsing/shaders/advanced_rings_vs.glsl b/modules/globebrowsing/shaders/advanced_rings_vs.glsl
index ef477caeef..a4a19c1270 100644
--- a/modules/globebrowsing/shaders/advanced_rings_vs.glsl
+++ b/modules/globebrowsing/shaders/advanced_rings_vs.glsl
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/globebrowsing/shaders/blending.glsl b/modules/globebrowsing/shaders/blending.glsl
index 6b9a19570e..1211a79859 100644
--- a/modules/globebrowsing/shaders/blending.glsl
+++ b/modules/globebrowsing/shaders/blending.glsl
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/globebrowsing/shaders/geojson_fs.glsl b/modules/globebrowsing/shaders/geojson_fs.glsl
index 00461563a0..28500e4937 100644
--- a/modules/globebrowsing/shaders/geojson_fs.glsl
+++ b/modules/globebrowsing/shaders/geojson_fs.glsl
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/globebrowsing/shaders/geojson_points_fs.glsl b/modules/globebrowsing/shaders/geojson_points_fs.glsl
index ea1fe72a76..68d3e0da3f 100644
--- a/modules/globebrowsing/shaders/geojson_points_fs.glsl
+++ b/modules/globebrowsing/shaders/geojson_points_fs.glsl
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/globebrowsing/shaders/geojson_points_gs.glsl b/modules/globebrowsing/shaders/geojson_points_gs.glsl
index 46fd996494..096df6377c 100644
--- a/modules/globebrowsing/shaders/geojson_points_gs.glsl
+++ b/modules/globebrowsing/shaders/geojson_points_gs.glsl
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/globebrowsing/shaders/geojson_points_vs.glsl b/modules/globebrowsing/shaders/geojson_points_vs.glsl
index d8195796b7..8a018646dc 100644
--- a/modules/globebrowsing/shaders/geojson_points_vs.glsl
+++ b/modules/globebrowsing/shaders/geojson_points_vs.glsl
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/globebrowsing/shaders/geojson_vs.glsl b/modules/globebrowsing/shaders/geojson_vs.glsl
index 8387cde66b..ac982d8f62 100644
--- a/modules/globebrowsing/shaders/geojson_vs.glsl
+++ b/modules/globebrowsing/shaders/geojson_vs.glsl
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/globebrowsing/shaders/globalrenderer_vs.glsl b/modules/globebrowsing/shaders/globalrenderer_vs.glsl
index c5437a19e6..8ea1e434cc 100644
--- a/modules/globebrowsing/shaders/globalrenderer_vs.glsl
+++ b/modules/globebrowsing/shaders/globalrenderer_vs.glsl
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/globebrowsing/shaders/interpolate_fs.glsl b/modules/globebrowsing/shaders/interpolate_fs.glsl
index 7d3f8c3a3c..422dddc738 100644
--- a/modules/globebrowsing/shaders/interpolate_fs.glsl
+++ b/modules/globebrowsing/shaders/interpolate_fs.glsl
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/globebrowsing/shaders/interpolate_vs.glsl b/modules/globebrowsing/shaders/interpolate_vs.glsl
index 238b27367a..8658f26d2c 100644
--- a/modules/globebrowsing/shaders/interpolate_vs.glsl
+++ b/modules/globebrowsing/shaders/interpolate_vs.glsl
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/globebrowsing/shaders/localrenderer_vs.glsl b/modules/globebrowsing/shaders/localrenderer_vs.glsl
index cc7fa0a849..d16bf7623b 100644
--- a/modules/globebrowsing/shaders/localrenderer_vs.glsl
+++ b/modules/globebrowsing/shaders/localrenderer_vs.glsl
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/globebrowsing/shaders/renderer_fs.glsl b/modules/globebrowsing/shaders/renderer_fs.glsl
index 365e178130..f00641ab81 100644
--- a/modules/globebrowsing/shaders/renderer_fs.glsl
+++ b/modules/globebrowsing/shaders/renderer_fs.glsl
@@ -2,7 +2,7 @@
     *                                                                                       *
     * OpenSpace                                                                             *
     *                                                                                       *
-    * Copyright (c) 2014-2024                                                               *
+    * Copyright (c) 2014-2025                                                               *
     *                                                                                       *
     * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
     * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/globebrowsing/shaders/rings_fs.glsl b/modules/globebrowsing/shaders/rings_fs.glsl
index e9c6c3a226..3fc0cbc3b2 100644
--- a/modules/globebrowsing/shaders/rings_fs.glsl
+++ b/modules/globebrowsing/shaders/rings_fs.glsl
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/globebrowsing/shaders/rings_geom_fs.glsl b/modules/globebrowsing/shaders/rings_geom_fs.glsl
index dbfd4736b2..7823e82de7 100644
--- a/modules/globebrowsing/shaders/rings_geom_fs.glsl
+++ b/modules/globebrowsing/shaders/rings_geom_fs.glsl
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/globebrowsing/shaders/rings_geom_vs.glsl b/modules/globebrowsing/shaders/rings_geom_vs.glsl
index 247a6b852e..60c65d419e 100644
--- a/modules/globebrowsing/shaders/rings_geom_vs.glsl
+++ b/modules/globebrowsing/shaders/rings_geom_vs.glsl
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/globebrowsing/shaders/rings_vs.glsl b/modules/globebrowsing/shaders/rings_vs.glsl
index ef477caeef..a4a19c1270 100644
--- a/modules/globebrowsing/shaders/rings_vs.glsl
+++ b/modules/globebrowsing/shaders/rings_vs.glsl
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/globebrowsing/shaders/texturetilemapping.glsl b/modules/globebrowsing/shaders/texturetilemapping.glsl
index 5ae7ae60c0..6f1c696448 100644
--- a/modules/globebrowsing/shaders/texturetilemapping.glsl
+++ b/modules/globebrowsing/shaders/texturetilemapping.glsl
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/globebrowsing/shaders/tile.glsl b/modules/globebrowsing/shaders/tile.glsl
index 1f4f01dfe4..ece8fbd84d 100644
--- a/modules/globebrowsing/shaders/tile.glsl
+++ b/modules/globebrowsing/shaders/tile.glsl
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/globebrowsing/shaders/tileheight.glsl b/modules/globebrowsing/shaders/tileheight.glsl
index bb5e5206a4..6464f6d305 100644
--- a/modules/globebrowsing/shaders/tileheight.glsl
+++ b/modules/globebrowsing/shaders/tileheight.glsl
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/globebrowsing/shaders/tilevertexskirt.glsl b/modules/globebrowsing/shaders/tilevertexskirt.glsl
index 0ae7cc6f82..fcecb3fdb6 100644
--- a/modules/globebrowsing/shaders/tilevertexskirt.glsl
+++ b/modules/globebrowsing/shaders/tilevertexskirt.glsl
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/globebrowsing/src/asynctiledataprovider.cpp b/modules/globebrowsing/src/asynctiledataprovider.cpp
index 39df0e623e..e833b4daab 100644
--- a/modules/globebrowsing/src/asynctiledataprovider.cpp
+++ b/modules/globebrowsing/src/asynctiledataprovider.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/globebrowsing/src/asynctiledataprovider.h b/modules/globebrowsing/src/asynctiledataprovider.h
index f9de5e2fe0..0d92d4cef8 100644
--- a/modules/globebrowsing/src/asynctiledataprovider.h
+++ b/modules/globebrowsing/src/asynctiledataprovider.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/globebrowsing/src/basictypes.h b/modules/globebrowsing/src/basictypes.h
index a4dbec0fb5..c4a58380d4 100644
--- a/modules/globebrowsing/src/basictypes.h
+++ b/modules/globebrowsing/src/basictypes.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/globebrowsing/src/dashboarditemglobelocation.cpp b/modules/globebrowsing/src/dashboarditemglobelocation.cpp
index 99c4b5d116..56abacef48 100644
--- a/modules/globebrowsing/src/dashboarditemglobelocation.cpp
+++ b/modules/globebrowsing/src/dashboarditemglobelocation.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/globebrowsing/src/dashboarditemglobelocation.h b/modules/globebrowsing/src/dashboarditemglobelocation.h
index 7ba878ed2d..5f55f39ca3 100644
--- a/modules/globebrowsing/src/dashboarditemglobelocation.h
+++ b/modules/globebrowsing/src/dashboarditemglobelocation.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/globebrowsing/src/ellipsoid.cpp b/modules/globebrowsing/src/ellipsoid.cpp
index 49bd8537bf..2e91d720c1 100644
--- a/modules/globebrowsing/src/ellipsoid.cpp
+++ b/modules/globebrowsing/src/ellipsoid.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/globebrowsing/src/ellipsoid.h b/modules/globebrowsing/src/ellipsoid.h
index 57d64adbdc..7187431f07 100644
--- a/modules/globebrowsing/src/ellipsoid.h
+++ b/modules/globebrowsing/src/ellipsoid.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/globebrowsing/src/gdalwrapper.cpp b/modules/globebrowsing/src/gdalwrapper.cpp
index 66007bd043..df1f08c932 100644
--- a/modules/globebrowsing/src/gdalwrapper.cpp
+++ b/modules/globebrowsing/src/gdalwrapper.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/globebrowsing/src/gdalwrapper.h b/modules/globebrowsing/src/gdalwrapper.h
index 1bc8d2505d..31c20cc43a 100644
--- a/modules/globebrowsing/src/gdalwrapper.h
+++ b/modules/globebrowsing/src/gdalwrapper.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/globebrowsing/src/geodeticpatch.cpp b/modules/globebrowsing/src/geodeticpatch.cpp
index 86f3d4c3bf..f4bcb17cae 100644
--- a/modules/globebrowsing/src/geodeticpatch.cpp
+++ b/modules/globebrowsing/src/geodeticpatch.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/globebrowsing/src/geodeticpatch.h b/modules/globebrowsing/src/geodeticpatch.h
index 999109defb..d357eac99f 100644
--- a/modules/globebrowsing/src/geodeticpatch.h
+++ b/modules/globebrowsing/src/geodeticpatch.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/globebrowsing/src/geojson/geojsoncomponent.cpp b/modules/globebrowsing/src/geojson/geojsoncomponent.cpp
index a827896d41..d7914ce978 100644
--- a/modules/globebrowsing/src/geojson/geojsoncomponent.cpp
+++ b/modules/globebrowsing/src/geojson/geojsoncomponent.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/globebrowsing/src/geojson/geojsoncomponent.h b/modules/globebrowsing/src/geojson/geojsoncomponent.h
index 81c53c1d9c..b41701bbfc 100644
--- a/modules/globebrowsing/src/geojson/geojsoncomponent.h
+++ b/modules/globebrowsing/src/geojson/geojsoncomponent.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/globebrowsing/src/geojson/geojsonmanager.cpp b/modules/globebrowsing/src/geojson/geojsonmanager.cpp
index 3e15c35d6e..ff60f4b14c 100644
--- a/modules/globebrowsing/src/geojson/geojsonmanager.cpp
+++ b/modules/globebrowsing/src/geojson/geojsonmanager.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/globebrowsing/src/geojson/geojsonmanager.h b/modules/globebrowsing/src/geojson/geojsonmanager.h
index 5798161fcc..c8b146d72d 100644
--- a/modules/globebrowsing/src/geojson/geojsonmanager.h
+++ b/modules/globebrowsing/src/geojson/geojsonmanager.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/globebrowsing/src/geojson/geojsonproperties.cpp b/modules/globebrowsing/src/geojson/geojsonproperties.cpp
index 98fdd97c1c..43de1e733d 100644
--- a/modules/globebrowsing/src/geojson/geojsonproperties.cpp
+++ b/modules/globebrowsing/src/geojson/geojsonproperties.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/globebrowsing/src/geojson/geojsonproperties.h b/modules/globebrowsing/src/geojson/geojsonproperties.h
index d841d6304e..d79b57d078 100644
--- a/modules/globebrowsing/src/geojson/geojsonproperties.h
+++ b/modules/globebrowsing/src/geojson/geojsonproperties.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/globebrowsing/src/geojson/globegeometryfeature.cpp b/modules/globebrowsing/src/geojson/globegeometryfeature.cpp
index 2f1c288d0a..1962466201 100644
--- a/modules/globebrowsing/src/geojson/globegeometryfeature.cpp
+++ b/modules/globebrowsing/src/geojson/globegeometryfeature.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/globebrowsing/src/geojson/globegeometryfeature.h b/modules/globebrowsing/src/geojson/globegeometryfeature.h
index 1f899e8004..71aa18f951 100644
--- a/modules/globebrowsing/src/geojson/globegeometryfeature.h
+++ b/modules/globebrowsing/src/geojson/globegeometryfeature.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/globebrowsing/src/geojson/globegeometryhelper.cpp b/modules/globebrowsing/src/geojson/globegeometryhelper.cpp
index bdaa473685..a5c9185136 100644
--- a/modules/globebrowsing/src/geojson/globegeometryhelper.cpp
+++ b/modules/globebrowsing/src/geojson/globegeometryhelper.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/globebrowsing/src/geojson/globegeometryhelper.h b/modules/globebrowsing/src/geojson/globegeometryhelper.h
index 1712430072..7afd9f8fb0 100644
--- a/modules/globebrowsing/src/geojson/globegeometryhelper.h
+++ b/modules/globebrowsing/src/geojson/globegeometryhelper.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/globebrowsing/src/globelabelscomponent.cpp b/modules/globebrowsing/src/globelabelscomponent.cpp
index 0f885963c5..c759181ac9 100644
--- a/modules/globebrowsing/src/globelabelscomponent.cpp
+++ b/modules/globebrowsing/src/globelabelscomponent.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/globebrowsing/src/globelabelscomponent.h b/modules/globebrowsing/src/globelabelscomponent.h
index 6c63a7bad8..8f62690dbb 100644
--- a/modules/globebrowsing/src/globelabelscomponent.h
+++ b/modules/globebrowsing/src/globelabelscomponent.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/globebrowsing/src/globerotation.cpp b/modules/globebrowsing/src/globerotation.cpp
index bc2ea848bf..00c378ff7b 100644
--- a/modules/globebrowsing/src/globerotation.cpp
+++ b/modules/globebrowsing/src/globerotation.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/globebrowsing/src/globerotation.h b/modules/globebrowsing/src/globerotation.h
index e49e547eb5..ff24345555 100644
--- a/modules/globebrowsing/src/globerotation.h
+++ b/modules/globebrowsing/src/globerotation.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/globebrowsing/src/globetranslation.cpp b/modules/globebrowsing/src/globetranslation.cpp
index 8766c99f60..ce1c888546 100644
--- a/modules/globebrowsing/src/globetranslation.cpp
+++ b/modules/globebrowsing/src/globetranslation.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/globebrowsing/src/globetranslation.h b/modules/globebrowsing/src/globetranslation.h
index 2c52208f6e..a2f7ce3e0b 100644
--- a/modules/globebrowsing/src/globetranslation.h
+++ b/modules/globebrowsing/src/globetranslation.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/globebrowsing/src/gpulayergroup.cpp b/modules/globebrowsing/src/gpulayergroup.cpp
index fff16af0e9..6906dcf42d 100644
--- a/modules/globebrowsing/src/gpulayergroup.cpp
+++ b/modules/globebrowsing/src/gpulayergroup.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/globebrowsing/src/gpulayergroup.h b/modules/globebrowsing/src/gpulayergroup.h
index e7f1f08dd0..ec7ae4ec84 100644
--- a/modules/globebrowsing/src/gpulayergroup.h
+++ b/modules/globebrowsing/src/gpulayergroup.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/globebrowsing/src/layer.cpp b/modules/globebrowsing/src/layer.cpp
index 9366eaca4f..7ae61c005a 100644
--- a/modules/globebrowsing/src/layer.cpp
+++ b/modules/globebrowsing/src/layer.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/globebrowsing/src/layer.h b/modules/globebrowsing/src/layer.h
index ebe1a0d382..bc1a0be378 100644
--- a/modules/globebrowsing/src/layer.h
+++ b/modules/globebrowsing/src/layer.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/globebrowsing/src/layeradjustment.cpp b/modules/globebrowsing/src/layeradjustment.cpp
index e453f74d03..ed6e9e996d 100644
--- a/modules/globebrowsing/src/layeradjustment.cpp
+++ b/modules/globebrowsing/src/layeradjustment.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/globebrowsing/src/layeradjustment.h b/modules/globebrowsing/src/layeradjustment.h
index 8ecb9a4df7..2abe92f003 100644
--- a/modules/globebrowsing/src/layeradjustment.h
+++ b/modules/globebrowsing/src/layeradjustment.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/globebrowsing/src/layergroup.cpp b/modules/globebrowsing/src/layergroup.cpp
index cc43c14119..fe6f9fc325 100644
--- a/modules/globebrowsing/src/layergroup.cpp
+++ b/modules/globebrowsing/src/layergroup.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/globebrowsing/src/layergroup.h b/modules/globebrowsing/src/layergroup.h
index 013cc07d67..8140c23753 100644
--- a/modules/globebrowsing/src/layergroup.h
+++ b/modules/globebrowsing/src/layergroup.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/globebrowsing/src/layergroupid.cpp b/modules/globebrowsing/src/layergroupid.cpp
index 4db0c8237b..9c349e8d4c 100644
--- a/modules/globebrowsing/src/layergroupid.cpp
+++ b/modules/globebrowsing/src/layergroupid.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/globebrowsing/src/layergroupid.h b/modules/globebrowsing/src/layergroupid.h
index c11fbacc7b..71e94beaf7 100644
--- a/modules/globebrowsing/src/layergroupid.h
+++ b/modules/globebrowsing/src/layergroupid.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/globebrowsing/src/layermanager.cpp b/modules/globebrowsing/src/layermanager.cpp
index f4e79ed6af..d2b758c0a7 100644
--- a/modules/globebrowsing/src/layermanager.cpp
+++ b/modules/globebrowsing/src/layermanager.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/globebrowsing/src/layermanager.h b/modules/globebrowsing/src/layermanager.h
index d83a0f0dd1..06042ca9b0 100644
--- a/modules/globebrowsing/src/layermanager.h
+++ b/modules/globebrowsing/src/layermanager.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/globebrowsing/src/layerrendersettings.cpp b/modules/globebrowsing/src/layerrendersettings.cpp
index 5cdfb11116..75d6c11db5 100644
--- a/modules/globebrowsing/src/layerrendersettings.cpp
+++ b/modules/globebrowsing/src/layerrendersettings.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/globebrowsing/src/layerrendersettings.h b/modules/globebrowsing/src/layerrendersettings.h
index 58974cb143..3f3c3c3775 100644
--- a/modules/globebrowsing/src/layerrendersettings.h
+++ b/modules/globebrowsing/src/layerrendersettings.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/globebrowsing/src/lrucache.h b/modules/globebrowsing/src/lrucache.h
index cde58eb408..e7fdad0260 100644
--- a/modules/globebrowsing/src/lrucache.h
+++ b/modules/globebrowsing/src/lrucache.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/globebrowsing/src/lrucache.inl b/modules/globebrowsing/src/lrucache.inl
index 505ca084c1..4dc774fb1c 100644
--- a/modules/globebrowsing/src/lrucache.inl
+++ b/modules/globebrowsing/src/lrucache.inl
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/globebrowsing/src/lruthreadpool.h b/modules/globebrowsing/src/lruthreadpool.h
index 347de4d523..e4666d8f0a 100644
--- a/modules/globebrowsing/src/lruthreadpool.h
+++ b/modules/globebrowsing/src/lruthreadpool.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/globebrowsing/src/lruthreadpool.inl b/modules/globebrowsing/src/lruthreadpool.inl
index cfa17c6170..e1fcce40f8 100644
--- a/modules/globebrowsing/src/lruthreadpool.inl
+++ b/modules/globebrowsing/src/lruthreadpool.inl
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/globebrowsing/src/memoryawaretilecache.cpp b/modules/globebrowsing/src/memoryawaretilecache.cpp
index 41a43872ce..08a3db9f54 100644
--- a/modules/globebrowsing/src/memoryawaretilecache.cpp
+++ b/modules/globebrowsing/src/memoryawaretilecache.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/globebrowsing/src/memoryawaretilecache.h b/modules/globebrowsing/src/memoryawaretilecache.h
index 88a3a303a6..beb6d864e6 100644
--- a/modules/globebrowsing/src/memoryawaretilecache.h
+++ b/modules/globebrowsing/src/memoryawaretilecache.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/globebrowsing/src/prioritizingconcurrentjobmanager.h b/modules/globebrowsing/src/prioritizingconcurrentjobmanager.h
index 83e3c6c5c7..8ff9e7b979 100644
--- a/modules/globebrowsing/src/prioritizingconcurrentjobmanager.h
+++ b/modules/globebrowsing/src/prioritizingconcurrentjobmanager.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/globebrowsing/src/prioritizingconcurrentjobmanager.inl b/modules/globebrowsing/src/prioritizingconcurrentjobmanager.inl
index 4d544cb54f..b9ddd8f4ff 100644
--- a/modules/globebrowsing/src/prioritizingconcurrentjobmanager.inl
+++ b/modules/globebrowsing/src/prioritizingconcurrentjobmanager.inl
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/globebrowsing/src/rawtile.h b/modules/globebrowsing/src/rawtile.h
index 3bb28da410..4152c57e37 100644
--- a/modules/globebrowsing/src/rawtile.h
+++ b/modules/globebrowsing/src/rawtile.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/globebrowsing/src/rawtiledatareader.cpp b/modules/globebrowsing/src/rawtiledatareader.cpp
index 23b6d5ced4..8c0d557708 100644
--- a/modules/globebrowsing/src/rawtiledatareader.cpp
+++ b/modules/globebrowsing/src/rawtiledatareader.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/globebrowsing/src/rawtiledatareader.h b/modules/globebrowsing/src/rawtiledatareader.h
index 7daecca1b3..37ef58407b 100644
--- a/modules/globebrowsing/src/rawtiledatareader.h
+++ b/modules/globebrowsing/src/rawtiledatareader.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/globebrowsing/src/renderableglobe.cpp b/modules/globebrowsing/src/renderableglobe.cpp
index ff5bd32d9a..ba90d1f3be 100644
--- a/modules/globebrowsing/src/renderableglobe.cpp
+++ b/modules/globebrowsing/src/renderableglobe.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/globebrowsing/src/renderableglobe.h b/modules/globebrowsing/src/renderableglobe.h
index 7d3a81c1fb..d55c6f7d92 100644
--- a/modules/globebrowsing/src/renderableglobe.h
+++ b/modules/globebrowsing/src/renderableglobe.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/globebrowsing/src/ringscomponent.cpp b/modules/globebrowsing/src/ringscomponent.cpp
index c0d28d6ebc..c898579f15 100644
--- a/modules/globebrowsing/src/ringscomponent.cpp
+++ b/modules/globebrowsing/src/ringscomponent.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/globebrowsing/src/ringscomponent.h b/modules/globebrowsing/src/ringscomponent.h
index 2ec5de4801..94afbee543 100644
--- a/modules/globebrowsing/src/ringscomponent.h
+++ b/modules/globebrowsing/src/ringscomponent.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/globebrowsing/src/shadowcomponent.cpp b/modules/globebrowsing/src/shadowcomponent.cpp
index 30aeca2994..eff7f620f2 100644
--- a/modules/globebrowsing/src/shadowcomponent.cpp
+++ b/modules/globebrowsing/src/shadowcomponent.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/globebrowsing/src/shadowcomponent.h b/modules/globebrowsing/src/shadowcomponent.h
index 561e961502..24809ed05c 100644
--- a/modules/globebrowsing/src/shadowcomponent.h
+++ b/modules/globebrowsing/src/shadowcomponent.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/globebrowsing/src/skirtedgrid.cpp b/modules/globebrowsing/src/skirtedgrid.cpp
index 7437821cc5..82c1f98f8b 100644
--- a/modules/globebrowsing/src/skirtedgrid.cpp
+++ b/modules/globebrowsing/src/skirtedgrid.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/globebrowsing/src/skirtedgrid.h b/modules/globebrowsing/src/skirtedgrid.h
index 0dd21926cc..022d14cbea 100644
--- a/modules/globebrowsing/src/skirtedgrid.h
+++ b/modules/globebrowsing/src/skirtedgrid.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/globebrowsing/src/tilecacheproperties.h b/modules/globebrowsing/src/tilecacheproperties.h
index 41a3c1776d..6a05704269 100644
--- a/modules/globebrowsing/src/tilecacheproperties.h
+++ b/modules/globebrowsing/src/tilecacheproperties.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/globebrowsing/src/tileindex.cpp b/modules/globebrowsing/src/tileindex.cpp
index 7378563131..8b9e3c35d1 100644
--- a/modules/globebrowsing/src/tileindex.cpp
+++ b/modules/globebrowsing/src/tileindex.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/globebrowsing/src/tileindex.h b/modules/globebrowsing/src/tileindex.h
index 594fc867e3..83469d76c2 100644
--- a/modules/globebrowsing/src/tileindex.h
+++ b/modules/globebrowsing/src/tileindex.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/globebrowsing/src/tileloadjob.cpp b/modules/globebrowsing/src/tileloadjob.cpp
index 4ad9ffed5e..15257ac386 100644
--- a/modules/globebrowsing/src/tileloadjob.cpp
+++ b/modules/globebrowsing/src/tileloadjob.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/globebrowsing/src/tileloadjob.h b/modules/globebrowsing/src/tileloadjob.h
index 9de89411a7..326876e58d 100644
--- a/modules/globebrowsing/src/tileloadjob.h
+++ b/modules/globebrowsing/src/tileloadjob.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/globebrowsing/src/tileprovider/defaulttileprovider.cpp b/modules/globebrowsing/src/tileprovider/defaulttileprovider.cpp
index ab1ee7b025..b8ffe6b476 100644
--- a/modules/globebrowsing/src/tileprovider/defaulttileprovider.cpp
+++ b/modules/globebrowsing/src/tileprovider/defaulttileprovider.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/globebrowsing/src/tileprovider/defaulttileprovider.h b/modules/globebrowsing/src/tileprovider/defaulttileprovider.h
index 9f095353b2..0a90ed20cd 100644
--- a/modules/globebrowsing/src/tileprovider/defaulttileprovider.h
+++ b/modules/globebrowsing/src/tileprovider/defaulttileprovider.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/globebrowsing/src/tileprovider/imagesequencetileprovider.cpp b/modules/globebrowsing/src/tileprovider/imagesequencetileprovider.cpp
index 6bb9f3e997..d88275174a 100644
--- a/modules/globebrowsing/src/tileprovider/imagesequencetileprovider.cpp
+++ b/modules/globebrowsing/src/tileprovider/imagesequencetileprovider.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/globebrowsing/src/tileprovider/imagesequencetileprovider.h b/modules/globebrowsing/src/tileprovider/imagesequencetileprovider.h
index d6aa907122..9933685ae4 100644
--- a/modules/globebrowsing/src/tileprovider/imagesequencetileprovider.h
+++ b/modules/globebrowsing/src/tileprovider/imagesequencetileprovider.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/globebrowsing/src/tileprovider/singleimagetileprovider.cpp b/modules/globebrowsing/src/tileprovider/singleimagetileprovider.cpp
index 1341eb5da3..1e64a67bcb 100644
--- a/modules/globebrowsing/src/tileprovider/singleimagetileprovider.cpp
+++ b/modules/globebrowsing/src/tileprovider/singleimagetileprovider.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/globebrowsing/src/tileprovider/singleimagetileprovider.h b/modules/globebrowsing/src/tileprovider/singleimagetileprovider.h
index a6546040cd..8ce9df104f 100644
--- a/modules/globebrowsing/src/tileprovider/singleimagetileprovider.h
+++ b/modules/globebrowsing/src/tileprovider/singleimagetileprovider.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/globebrowsing/src/tileprovider/sizereferencetileprovider.cpp b/modules/globebrowsing/src/tileprovider/sizereferencetileprovider.cpp
index 136582a69e..a48e4e2d19 100644
--- a/modules/globebrowsing/src/tileprovider/sizereferencetileprovider.cpp
+++ b/modules/globebrowsing/src/tileprovider/sizereferencetileprovider.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/globebrowsing/src/tileprovider/sizereferencetileprovider.h b/modules/globebrowsing/src/tileprovider/sizereferencetileprovider.h
index a88c2d40d7..c55dc21b74 100644
--- a/modules/globebrowsing/src/tileprovider/sizereferencetileprovider.h
+++ b/modules/globebrowsing/src/tileprovider/sizereferencetileprovider.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/globebrowsing/src/tileprovider/spoutimageprovider.cpp b/modules/globebrowsing/src/tileprovider/spoutimageprovider.cpp
index 553f82bb0c..f0080b81f6 100644
--- a/modules/globebrowsing/src/tileprovider/spoutimageprovider.cpp
+++ b/modules/globebrowsing/src/tileprovider/spoutimageprovider.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/globebrowsing/src/tileprovider/spoutimageprovider.h b/modules/globebrowsing/src/tileprovider/spoutimageprovider.h
index bcbaeb9cdb..f8033266d4 100644
--- a/modules/globebrowsing/src/tileprovider/spoutimageprovider.h
+++ b/modules/globebrowsing/src/tileprovider/spoutimageprovider.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/globebrowsing/src/tileprovider/temporaltileprovider.cpp b/modules/globebrowsing/src/tileprovider/temporaltileprovider.cpp
index fe66bba7be..5d6404069d 100644
--- a/modules/globebrowsing/src/tileprovider/temporaltileprovider.cpp
+++ b/modules/globebrowsing/src/tileprovider/temporaltileprovider.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/globebrowsing/src/tileprovider/temporaltileprovider.h b/modules/globebrowsing/src/tileprovider/temporaltileprovider.h
index 507c98e2ed..bfa04983da 100644
--- a/modules/globebrowsing/src/tileprovider/temporaltileprovider.h
+++ b/modules/globebrowsing/src/tileprovider/temporaltileprovider.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/globebrowsing/src/tileprovider/texttileprovider.cpp b/modules/globebrowsing/src/tileprovider/texttileprovider.cpp
index ec4563080f..ef94b8565a 100644
--- a/modules/globebrowsing/src/tileprovider/texttileprovider.cpp
+++ b/modules/globebrowsing/src/tileprovider/texttileprovider.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/globebrowsing/src/tileprovider/texttileprovider.h b/modules/globebrowsing/src/tileprovider/texttileprovider.h
index 4d8ec98b86..c26c10365c 100644
--- a/modules/globebrowsing/src/tileprovider/texttileprovider.h
+++ b/modules/globebrowsing/src/tileprovider/texttileprovider.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/globebrowsing/src/tileprovider/tileindextileprovider.cpp b/modules/globebrowsing/src/tileprovider/tileindextileprovider.cpp
index 018a227375..8562562e21 100644
--- a/modules/globebrowsing/src/tileprovider/tileindextileprovider.cpp
+++ b/modules/globebrowsing/src/tileprovider/tileindextileprovider.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/globebrowsing/src/tileprovider/tileindextileprovider.h b/modules/globebrowsing/src/tileprovider/tileindextileprovider.h
index 27474648f4..59cadf8706 100644
--- a/modules/globebrowsing/src/tileprovider/tileindextileprovider.h
+++ b/modules/globebrowsing/src/tileprovider/tileindextileprovider.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/globebrowsing/src/tileprovider/tileprovider.cpp b/modules/globebrowsing/src/tileprovider/tileprovider.cpp
index 8cefb2f406..eb8caeeacd 100644
--- a/modules/globebrowsing/src/tileprovider/tileprovider.cpp
+++ b/modules/globebrowsing/src/tileprovider/tileprovider.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/globebrowsing/src/tileprovider/tileprovider.h b/modules/globebrowsing/src/tileprovider/tileprovider.h
index 520d3054c7..535db52c83 100644
--- a/modules/globebrowsing/src/tileprovider/tileprovider.h
+++ b/modules/globebrowsing/src/tileprovider/tileprovider.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/globebrowsing/src/tileprovider/tileproviderbydate.cpp b/modules/globebrowsing/src/tileprovider/tileproviderbydate.cpp
index 71b7d296a8..3e048bc284 100644
--- a/modules/globebrowsing/src/tileprovider/tileproviderbydate.cpp
+++ b/modules/globebrowsing/src/tileprovider/tileproviderbydate.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/globebrowsing/src/tileprovider/tileproviderbydate.h b/modules/globebrowsing/src/tileprovider/tileproviderbydate.h
index 9c2f29179b..82df82f761 100644
--- a/modules/globebrowsing/src/tileprovider/tileproviderbydate.h
+++ b/modules/globebrowsing/src/tileprovider/tileproviderbydate.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/globebrowsing/src/tileprovider/tileproviderbyindex.cpp b/modules/globebrowsing/src/tileprovider/tileproviderbyindex.cpp
index 2b95e8c1de..e2cd4f918a 100644
--- a/modules/globebrowsing/src/tileprovider/tileproviderbyindex.cpp
+++ b/modules/globebrowsing/src/tileprovider/tileproviderbyindex.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/globebrowsing/src/tileprovider/tileproviderbyindex.h b/modules/globebrowsing/src/tileprovider/tileproviderbyindex.h
index 53a1cb8989..05830424f6 100644
--- a/modules/globebrowsing/src/tileprovider/tileproviderbyindex.h
+++ b/modules/globebrowsing/src/tileprovider/tileproviderbyindex.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/globebrowsing/src/tileprovider/tileproviderbylevel.cpp b/modules/globebrowsing/src/tileprovider/tileproviderbylevel.cpp
index 4bf86c241d..3d8d8ccde7 100644
--- a/modules/globebrowsing/src/tileprovider/tileproviderbylevel.cpp
+++ b/modules/globebrowsing/src/tileprovider/tileproviderbylevel.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/globebrowsing/src/tileprovider/tileproviderbylevel.h b/modules/globebrowsing/src/tileprovider/tileproviderbylevel.h
index 824ab0ce44..ee1591f0bd 100644
--- a/modules/globebrowsing/src/tileprovider/tileproviderbylevel.h
+++ b/modules/globebrowsing/src/tileprovider/tileproviderbylevel.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/globebrowsing/src/tiletextureinitdata.cpp b/modules/globebrowsing/src/tiletextureinitdata.cpp
index 91687c9b79..68c69993b1 100644
--- a/modules/globebrowsing/src/tiletextureinitdata.cpp
+++ b/modules/globebrowsing/src/tiletextureinitdata.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/globebrowsing/src/tiletextureinitdata.h b/modules/globebrowsing/src/tiletextureinitdata.h
index b1fcf0d80c..6ce5aec05c 100644
--- a/modules/globebrowsing/src/tiletextureinitdata.h
+++ b/modules/globebrowsing/src/tiletextureinitdata.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/globebrowsing/src/timequantizer.cpp b/modules/globebrowsing/src/timequantizer.cpp
index 2e02f941a3..9222efdcc6 100644
--- a/modules/globebrowsing/src/timequantizer.cpp
+++ b/modules/globebrowsing/src/timequantizer.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/globebrowsing/src/timequantizer.h b/modules/globebrowsing/src/timequantizer.h
index df12aaa01b..8e5c0f70c9 100644
--- a/modules/globebrowsing/src/timequantizer.h
+++ b/modules/globebrowsing/src/timequantizer.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/imgui/CMakeLists.txt b/modules/imgui/CMakeLists.txt
index 181d6c9e49..20563f770f 100644
--- a/modules/imgui/CMakeLists.txt
+++ b/modules/imgui/CMakeLists.txt
@@ -2,7 +2,7 @@
 #                                                                                        #
 # OpenSpace                                                                              #
 #                                                                                        #
-# Copyright (c) 2014-2024                                                                #
+# Copyright (c) 2014-2025                                                                #
 #                                                                                        #
 # Permission is hereby granted, free of charge, to any person obtaining a copy of this   #
 # software and associated documentation files (the "Software"), to deal in the Software  #
diff --git a/modules/imgui/ext/imgui/CMakeLists.txt b/modules/imgui/ext/imgui/CMakeLists.txt
index be5458c86a..fa64caeb68 100644
--- a/modules/imgui/ext/imgui/CMakeLists.txt
+++ b/modules/imgui/ext/imgui/CMakeLists.txt
@@ -2,7 +2,7 @@
 #                                                                                        #
 # OpenSpace                                                                              #
 #                                                                                        #
-# Copyright (c) 2014-2024                                                                #
+# Copyright (c) 2014-2025                                                                #
 #                                                                                        #
 # Permission is hereby granted, free of charge, to any person obtaining a copy of this   #
 # software and associated documentation files (the "Software"), to deal in the Software  #
diff --git a/modules/imgui/imguimodule.cpp b/modules/imgui/imguimodule.cpp
index 4de4e8edcd..06c0e3d36e 100644
--- a/modules/imgui/imguimodule.cpp
+++ b/modules/imgui/imguimodule.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/imgui/imguimodule.h b/modules/imgui/imguimodule.h
index 1aa1fb4fa4..f844c76f19 100644
--- a/modules/imgui/imguimodule.h
+++ b/modules/imgui/imguimodule.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/imgui/include/guiactioncomponent.h b/modules/imgui/include/guiactioncomponent.h
index d1c6f2cc3d..5ac07e893f 100644
--- a/modules/imgui/include/guiactioncomponent.h
+++ b/modules/imgui/include/guiactioncomponent.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/imgui/include/guicomponent.h b/modules/imgui/include/guicomponent.h
index a08537444d..88e5b019e3 100644
--- a/modules/imgui/include/guicomponent.h
+++ b/modules/imgui/include/guicomponent.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/imgui/include/guifilepathcomponent.h b/modules/imgui/include/guifilepathcomponent.h
index cebb524a7a..469f7659ac 100644
--- a/modules/imgui/include/guifilepathcomponent.h
+++ b/modules/imgui/include/guifilepathcomponent.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/imgui/include/guigibscomponent.h b/modules/imgui/include/guigibscomponent.h
index b294c8e495..a50cd56b82 100644
--- a/modules/imgui/include/guigibscomponent.h
+++ b/modules/imgui/include/guigibscomponent.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/imgui/include/guiglobebrowsingcomponent.h b/modules/imgui/include/guiglobebrowsingcomponent.h
index 65ba20bdd2..7b0e4b3e71 100644
--- a/modules/imgui/include/guiglobebrowsingcomponent.h
+++ b/modules/imgui/include/guiglobebrowsingcomponent.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/imgui/include/guihelpcomponent.h b/modules/imgui/include/guihelpcomponent.h
index bdc9449cb2..001e1f386b 100644
--- a/modules/imgui/include/guihelpcomponent.h
+++ b/modules/imgui/include/guihelpcomponent.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/imgui/include/guijoystickcomponent.h b/modules/imgui/include/guijoystickcomponent.h
index ac95fd013d..c40f964311 100644
--- a/modules/imgui/include/guijoystickcomponent.h
+++ b/modules/imgui/include/guijoystickcomponent.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/imgui/include/guimemorycomponent.h b/modules/imgui/include/guimemorycomponent.h
index d55eb20d3c..b0f5d05f18 100644
--- a/modules/imgui/include/guimemorycomponent.h
+++ b/modules/imgui/include/guimemorycomponent.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/imgui/include/guimissioncomponent.h b/modules/imgui/include/guimissioncomponent.h
index 44c667a890..d98125716d 100644
--- a/modules/imgui/include/guimissioncomponent.h
+++ b/modules/imgui/include/guimissioncomponent.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/imgui/include/guiparallelcomponent.h b/modules/imgui/include/guiparallelcomponent.h
index 46669f0ff2..d8ecf9f07e 100644
--- a/modules/imgui/include/guiparallelcomponent.h
+++ b/modules/imgui/include/guiparallelcomponent.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/imgui/include/guipropertycomponent.h b/modules/imgui/include/guipropertycomponent.h
index 33d4da7eb7..3783fd053a 100644
--- a/modules/imgui/include/guipropertycomponent.h
+++ b/modules/imgui/include/guipropertycomponent.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/imgui/include/guiscenecomponent.h b/modules/imgui/include/guiscenecomponent.h
index 10268a8024..7318a0b105 100644
--- a/modules/imgui/include/guiscenecomponent.h
+++ b/modules/imgui/include/guiscenecomponent.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/imgui/include/guispacetimecomponent.h b/modules/imgui/include/guispacetimecomponent.h
index af7eb2a278..e194c5174b 100644
--- a/modules/imgui/include/guispacetimecomponent.h
+++ b/modules/imgui/include/guispacetimecomponent.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/imgui/include/imgui_include.h b/modules/imgui/include/imgui_include.h
index 700a5294ff..8866a1e869 100644
--- a/modules/imgui/include/imgui_include.h
+++ b/modules/imgui/include/imgui_include.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/imgui/include/renderproperties.h b/modules/imgui/include/renderproperties.h
index 082aebe7e0..e717dc9724 100644
--- a/modules/imgui/include/renderproperties.h
+++ b/modules/imgui/include/renderproperties.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/imgui/shaders/gui_fs.glsl b/modules/imgui/shaders/gui_fs.glsl
index 72ef4a2c8f..b720cc1388 100644
--- a/modules/imgui/shaders/gui_fs.glsl
+++ b/modules/imgui/shaders/gui_fs.glsl
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/imgui/shaders/gui_vs.glsl b/modules/imgui/shaders/gui_vs.glsl
index 440a7946fa..ff61d833cd 100644
--- a/modules/imgui/shaders/gui_vs.glsl
+++ b/modules/imgui/shaders/gui_vs.glsl
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/imgui/src/guiactioncomponent.cpp b/modules/imgui/src/guiactioncomponent.cpp
index 4ca63185d5..80b5307bab 100644
--- a/modules/imgui/src/guiactioncomponent.cpp
+++ b/modules/imgui/src/guiactioncomponent.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/imgui/src/guicomponent.cpp b/modules/imgui/src/guicomponent.cpp
index 4ad16a8ab0..151db16a03 100644
--- a/modules/imgui/src/guicomponent.cpp
+++ b/modules/imgui/src/guicomponent.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/imgui/src/guifilepathcomponent.cpp b/modules/imgui/src/guifilepathcomponent.cpp
index cdf7761afe..957f6ed72b 100644
--- a/modules/imgui/src/guifilepathcomponent.cpp
+++ b/modules/imgui/src/guifilepathcomponent.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/imgui/src/guigibscomponent.cpp b/modules/imgui/src/guigibscomponent.cpp
index d9f1ba5627..0f2ff65a05 100644
--- a/modules/imgui/src/guigibscomponent.cpp
+++ b/modules/imgui/src/guigibscomponent.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/imgui/src/guiglobebrowsingcomponent.cpp b/modules/imgui/src/guiglobebrowsingcomponent.cpp
index e65cc0c574..17135f231c 100644
--- a/modules/imgui/src/guiglobebrowsingcomponent.cpp
+++ b/modules/imgui/src/guiglobebrowsingcomponent.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/imgui/src/guihelpcomponent.cpp b/modules/imgui/src/guihelpcomponent.cpp
index 3d7d380d41..845fb87355 100644
--- a/modules/imgui/src/guihelpcomponent.cpp
+++ b/modules/imgui/src/guihelpcomponent.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/imgui/src/guijoystickcomponent.cpp b/modules/imgui/src/guijoystickcomponent.cpp
index 362e6b5fdc..d4505e8434 100644
--- a/modules/imgui/src/guijoystickcomponent.cpp
+++ b/modules/imgui/src/guijoystickcomponent.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/imgui/src/guimemorycomponent.cpp b/modules/imgui/src/guimemorycomponent.cpp
index 7e78184d4f..f65b17b990 100644
--- a/modules/imgui/src/guimemorycomponent.cpp
+++ b/modules/imgui/src/guimemorycomponent.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/imgui/src/guimissioncomponent.cpp b/modules/imgui/src/guimissioncomponent.cpp
index eae88610b6..9bb9ba7373 100644
--- a/modules/imgui/src/guimissioncomponent.cpp
+++ b/modules/imgui/src/guimissioncomponent.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/imgui/src/guiparallelcomponent.cpp b/modules/imgui/src/guiparallelcomponent.cpp
index 06717bba5b..6588e85827 100644
--- a/modules/imgui/src/guiparallelcomponent.cpp
+++ b/modules/imgui/src/guiparallelcomponent.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/imgui/src/guipropertycomponent.cpp b/modules/imgui/src/guipropertycomponent.cpp
index 41c01cdcc6..b391096bc0 100644
--- a/modules/imgui/src/guipropertycomponent.cpp
+++ b/modules/imgui/src/guipropertycomponent.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/imgui/src/guiscenecomponent.cpp b/modules/imgui/src/guiscenecomponent.cpp
index 57817bb47b..6c8705136a 100644
--- a/modules/imgui/src/guiscenecomponent.cpp
+++ b/modules/imgui/src/guiscenecomponent.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/imgui/src/guispacetimecomponent.cpp b/modules/imgui/src/guispacetimecomponent.cpp
index 27c2ca29bf..4366f3b30f 100644
--- a/modules/imgui/src/guispacetimecomponent.cpp
+++ b/modules/imgui/src/guispacetimecomponent.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/imgui/src/renderproperties.cpp b/modules/imgui/src/renderproperties.cpp
index 71365044b1..6b24c90acc 100644
--- a/modules/imgui/src/renderproperties.cpp
+++ b/modules/imgui/src/renderproperties.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/iswa/CMakeLists.txt b/modules/iswa/CMakeLists.txt
index 20b143e009..f7acf6d9a3 100644
--- a/modules/iswa/CMakeLists.txt
+++ b/modules/iswa/CMakeLists.txt
@@ -2,7 +2,7 @@
 #                                                                                        #
 # OpenSpace                                                                              #
 #                                                                                        #
-# Copyright (c) 2014-2024                                                                #
+# Copyright (c) 2014-2025                                                                #
 #                                                                                        #
 # Permission is hereby granted, free of charge, to any person obtaining a copy of this   #
 # software and associated documentation files (the "Software"), to deal in the Software  #
diff --git a/modules/iswa/iswamodule.cpp b/modules/iswa/iswamodule.cpp
index 9ec3eb25ae..3cc01bab45 100644
--- a/modules/iswa/iswamodule.cpp
+++ b/modules/iswa/iswamodule.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/iswa/iswamodule.h b/modules/iswa/iswamodule.h
index 85991ab146..35da497e44 100644
--- a/modules/iswa/iswamodule.h
+++ b/modules/iswa/iswamodule.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/iswa/rendering/datacygnet.cpp b/modules/iswa/rendering/datacygnet.cpp
index fcf4b46001..928463691f 100644
--- a/modules/iswa/rendering/datacygnet.cpp
+++ b/modules/iswa/rendering/datacygnet.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/iswa/rendering/datacygnet.h b/modules/iswa/rendering/datacygnet.h
index 361dfa8c0d..68a61961e6 100644
--- a/modules/iswa/rendering/datacygnet.h
+++ b/modules/iswa/rendering/datacygnet.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/iswa/rendering/dataplane.cpp b/modules/iswa/rendering/dataplane.cpp
index b16f3ee076..fbd34396b5 100644
--- a/modules/iswa/rendering/dataplane.cpp
+++ b/modules/iswa/rendering/dataplane.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/iswa/rendering/dataplane.h b/modules/iswa/rendering/dataplane.h
index ac77221753..4dd6e91908 100644
--- a/modules/iswa/rendering/dataplane.h
+++ b/modules/iswa/rendering/dataplane.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/iswa/rendering/datasphere.cpp b/modules/iswa/rendering/datasphere.cpp
index 28d8f0a43f..dadf8276f2 100644
--- a/modules/iswa/rendering/datasphere.cpp
+++ b/modules/iswa/rendering/datasphere.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/iswa/rendering/datasphere.h b/modules/iswa/rendering/datasphere.h
index c6d8e2749a..5c8daefc27 100644
--- a/modules/iswa/rendering/datasphere.h
+++ b/modules/iswa/rendering/datasphere.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/iswa/rendering/iswabasegroup.cpp b/modules/iswa/rendering/iswabasegroup.cpp
index 252ea2d320..6f1349fc6c 100644
--- a/modules/iswa/rendering/iswabasegroup.cpp
+++ b/modules/iswa/rendering/iswabasegroup.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/iswa/rendering/iswabasegroup.h b/modules/iswa/rendering/iswabasegroup.h
index 550196d819..023091b69c 100644
--- a/modules/iswa/rendering/iswabasegroup.h
+++ b/modules/iswa/rendering/iswabasegroup.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/iswa/rendering/iswacygnet.cpp b/modules/iswa/rendering/iswacygnet.cpp
index c2372a1619..2fb57f22b3 100644
--- a/modules/iswa/rendering/iswacygnet.cpp
+++ b/modules/iswa/rendering/iswacygnet.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/iswa/rendering/iswacygnet.h b/modules/iswa/rendering/iswacygnet.h
index 40a7df5762..0b03f5b8bb 100644
--- a/modules/iswa/rendering/iswacygnet.h
+++ b/modules/iswa/rendering/iswacygnet.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/iswa/rendering/iswadatagroup.cpp b/modules/iswa/rendering/iswadatagroup.cpp
index 74965a606e..08f3609acb 100644
--- a/modules/iswa/rendering/iswadatagroup.cpp
+++ b/modules/iswa/rendering/iswadatagroup.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/iswa/rendering/iswadatagroup.h b/modules/iswa/rendering/iswadatagroup.h
index 8d3e3195bc..a24614a8be 100644
--- a/modules/iswa/rendering/iswadatagroup.h
+++ b/modules/iswa/rendering/iswadatagroup.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/iswa/rendering/iswakameleongroup.cpp b/modules/iswa/rendering/iswakameleongroup.cpp
index 5df45cfbe3..594d001931 100644
--- a/modules/iswa/rendering/iswakameleongroup.cpp
+++ b/modules/iswa/rendering/iswakameleongroup.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/iswa/rendering/iswakameleongroup.h b/modules/iswa/rendering/iswakameleongroup.h
index 2c8e4f223e..b23f2b5451 100644
--- a/modules/iswa/rendering/iswakameleongroup.h
+++ b/modules/iswa/rendering/iswakameleongroup.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/iswa/rendering/kameleonplane.cpp b/modules/iswa/rendering/kameleonplane.cpp
index 3e82e4df20..6bb244a4bc 100644
--- a/modules/iswa/rendering/kameleonplane.cpp
+++ b/modules/iswa/rendering/kameleonplane.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/iswa/rendering/kameleonplane.h b/modules/iswa/rendering/kameleonplane.h
index f0abf5ca78..c57f32cc9d 100644
--- a/modules/iswa/rendering/kameleonplane.h
+++ b/modules/iswa/rendering/kameleonplane.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/iswa/rendering/screenspacecygnet.cpp b/modules/iswa/rendering/screenspacecygnet.cpp
index 32360a1377..a195cb6cd9 100644
--- a/modules/iswa/rendering/screenspacecygnet.cpp
+++ b/modules/iswa/rendering/screenspacecygnet.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/iswa/rendering/screenspacecygnet.h b/modules/iswa/rendering/screenspacecygnet.h
index f918115a27..9de184ec92 100644
--- a/modules/iswa/rendering/screenspacecygnet.h
+++ b/modules/iswa/rendering/screenspacecygnet.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/iswa/rendering/texturecygnet.cpp b/modules/iswa/rendering/texturecygnet.cpp
index 280f07f9b7..248523b719 100644
--- a/modules/iswa/rendering/texturecygnet.cpp
+++ b/modules/iswa/rendering/texturecygnet.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/iswa/rendering/texturecygnet.h b/modules/iswa/rendering/texturecygnet.h
index 26505a5a82..29f428efd0 100644
--- a/modules/iswa/rendering/texturecygnet.h
+++ b/modules/iswa/rendering/texturecygnet.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/iswa/rendering/textureplane.cpp b/modules/iswa/rendering/textureplane.cpp
index a9110b121c..5e9d9cc484 100644
--- a/modules/iswa/rendering/textureplane.cpp
+++ b/modules/iswa/rendering/textureplane.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/iswa/rendering/textureplane.h b/modules/iswa/rendering/textureplane.h
index 2d4c185c61..baa76c0ffc 100644
--- a/modules/iswa/rendering/textureplane.h
+++ b/modules/iswa/rendering/textureplane.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/iswa/shaders/dataplane_fs.glsl b/modules/iswa/shaders/dataplane_fs.glsl
index 828a299d2a..e3ddc79828 100644
--- a/modules/iswa/shaders/dataplane_fs.glsl
+++ b/modules/iswa/shaders/dataplane_fs.glsl
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/iswa/shaders/dataplane_vs.glsl b/modules/iswa/shaders/dataplane_vs.glsl
index 8be9f42ff0..4bb9038108 100644
--- a/modules/iswa/shaders/dataplane_vs.glsl
+++ b/modules/iswa/shaders/dataplane_vs.glsl
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/iswa/shaders/datasphere_fs.glsl b/modules/iswa/shaders/datasphere_fs.glsl
index 9d8f7ef24d..15c5dae782 100644
--- a/modules/iswa/shaders/datasphere_fs.glsl
+++ b/modules/iswa/shaders/datasphere_fs.glsl
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/iswa/shaders/datasphere_vs.glsl b/modules/iswa/shaders/datasphere_vs.glsl
index 427322e138..bf3c59de8c 100644
--- a/modules/iswa/shaders/datasphere_vs.glsl
+++ b/modules/iswa/shaders/datasphere_vs.glsl
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/iswa/shaders/textureplane_fs.glsl b/modules/iswa/shaders/textureplane_fs.glsl
index 64a2bcc32a..910b7d398a 100644
--- a/modules/iswa/shaders/textureplane_fs.glsl
+++ b/modules/iswa/shaders/textureplane_fs.glsl
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/iswa/shaders/textureplane_vs.glsl b/modules/iswa/shaders/textureplane_vs.glsl
index 1df1579665..84858166a5 100644
--- a/modules/iswa/shaders/textureplane_vs.glsl
+++ b/modules/iswa/shaders/textureplane_vs.glsl
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/iswa/util/dataprocessor.cpp b/modules/iswa/util/dataprocessor.cpp
index edda318d45..580eaba557 100644
--- a/modules/iswa/util/dataprocessor.cpp
+++ b/modules/iswa/util/dataprocessor.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/iswa/util/dataprocessor.h b/modules/iswa/util/dataprocessor.h
index 8c77d31c8e..3fc5942621 100644
--- a/modules/iswa/util/dataprocessor.h
+++ b/modules/iswa/util/dataprocessor.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/iswa/util/dataprocessorjson.cpp b/modules/iswa/util/dataprocessorjson.cpp
index 5e5c054c3b..3422c754fc 100644
--- a/modules/iswa/util/dataprocessorjson.cpp
+++ b/modules/iswa/util/dataprocessorjson.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/iswa/util/dataprocessorjson.h b/modules/iswa/util/dataprocessorjson.h
index ffc00c52aa..1adc708c32 100644
--- a/modules/iswa/util/dataprocessorjson.h
+++ b/modules/iswa/util/dataprocessorjson.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/iswa/util/dataprocessorkameleon.cpp b/modules/iswa/util/dataprocessorkameleon.cpp
index 56cab6a360..cc36f9c771 100644
--- a/modules/iswa/util/dataprocessorkameleon.cpp
+++ b/modules/iswa/util/dataprocessorkameleon.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/iswa/util/dataprocessorkameleon.h b/modules/iswa/util/dataprocessorkameleon.h
index 69697922ac..366caeff39 100644
--- a/modules/iswa/util/dataprocessorkameleon.h
+++ b/modules/iswa/util/dataprocessorkameleon.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/iswa/util/dataprocessortext.cpp b/modules/iswa/util/dataprocessortext.cpp
index 4ca4c1ca45..c3b2e03227 100644
--- a/modules/iswa/util/dataprocessortext.cpp
+++ b/modules/iswa/util/dataprocessortext.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/iswa/util/dataprocessortext.h b/modules/iswa/util/dataprocessortext.h
index 89186a77fb..80a6c52c19 100644
--- a/modules/iswa/util/dataprocessortext.h
+++ b/modules/iswa/util/dataprocessortext.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/iswa/util/iswamanager.cpp b/modules/iswa/util/iswamanager.cpp
index 3016fc33d8..cd815e118e 100644
--- a/modules/iswa/util/iswamanager.cpp
+++ b/modules/iswa/util/iswamanager.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/iswa/util/iswamanager.h b/modules/iswa/util/iswamanager.h
index cb1aa92607..7577d7928d 100644
--- a/modules/iswa/util/iswamanager.h
+++ b/modules/iswa/util/iswamanager.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/iswa/util/iswamanager_lua.inl b/modules/iswa/util/iswamanager_lua.inl
index cc2dc2394a..7c7993d811 100644
--- a/modules/iswa/util/iswamanager_lua.inl
+++ b/modules/iswa/util/iswamanager_lua.inl
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/kameleon/CMakeLists.txt b/modules/kameleon/CMakeLists.txt
index 5933965c9c..606dc81bf2 100644
--- a/modules/kameleon/CMakeLists.txt
+++ b/modules/kameleon/CMakeLists.txt
@@ -2,7 +2,7 @@
 #                                                                                        #
 # OpenSpace                                                                              #
 #                                                                                        #
-# Copyright (c) 2014-2024                                                                #
+# Copyright (c) 2014-2025                                                                #
 #                                                                                        #
 # Permission is hereby granted, free of charge, to any person obtaining a copy of this   #
 # software and associated documentation files (the "Software"), to deal in the Software  #
diff --git a/modules/kameleon/include/kameleonhelper.h b/modules/kameleon/include/kameleonhelper.h
index 2cf735fb3b..00c11d06ac 100644
--- a/modules/kameleon/include/kameleonhelper.h
+++ b/modules/kameleon/include/kameleonhelper.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/kameleon/include/kameleonwrapper.h b/modules/kameleon/include/kameleonwrapper.h
index 37e2b468d3..3d83151e82 100644
--- a/modules/kameleon/include/kameleonwrapper.h
+++ b/modules/kameleon/include/kameleonwrapper.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/kameleon/kameleonmodule.cpp b/modules/kameleon/kameleonmodule.cpp
index 5057a66d5d..d4b03eb075 100644
--- a/modules/kameleon/kameleonmodule.cpp
+++ b/modules/kameleon/kameleonmodule.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/kameleon/kameleonmodule.h b/modules/kameleon/kameleonmodule.h
index 4f6593b6ec..d5cde6bd53 100644
--- a/modules/kameleon/kameleonmodule.h
+++ b/modules/kameleon/kameleonmodule.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/kameleon/src/kameleonhelper.cpp b/modules/kameleon/src/kameleonhelper.cpp
index 041ee36056..b621710f8c 100644
--- a/modules/kameleon/src/kameleonhelper.cpp
+++ b/modules/kameleon/src/kameleonhelper.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/kameleon/src/kameleonwrapper.cpp b/modules/kameleon/src/kameleonwrapper.cpp
index 7d56a9c57c..5e8cce83dc 100644
--- a/modules/kameleon/src/kameleonwrapper.cpp
+++ b/modules/kameleon/src/kameleonwrapper.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/kameleonvolume/CMakeLists.txt b/modules/kameleonvolume/CMakeLists.txt
index da6b16bdc2..f564106992 100644
--- a/modules/kameleonvolume/CMakeLists.txt
+++ b/modules/kameleonvolume/CMakeLists.txt
@@ -2,7 +2,7 @@
 #                                                                                        #
 # OpenSpace                                                                              #
 #                                                                                        #
-# Copyright (c) 2014-2024                                                                #
+# Copyright (c) 2014-2025                                                                #
 #                                                                                        #
 # Permission is hereby granted, free of charge, to any person obtaining a copy of this   #
 # software and associated documentation files (the "Software"), to deal in the Software  #
diff --git a/modules/kameleonvolume/kameleonvolumemodule.cpp b/modules/kameleonvolume/kameleonvolumemodule.cpp
index 322a892adf..e797f10b0a 100644
--- a/modules/kameleonvolume/kameleonvolumemodule.cpp
+++ b/modules/kameleonvolume/kameleonvolumemodule.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/kameleonvolume/kameleonvolumemodule.h b/modules/kameleonvolume/kameleonvolumemodule.h
index 11a95b4d84..62bca23d0e 100644
--- a/modules/kameleonvolume/kameleonvolumemodule.h
+++ b/modules/kameleonvolume/kameleonvolumemodule.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/kameleonvolume/kameleonvolumereader.cpp b/modules/kameleonvolume/kameleonvolumereader.cpp
index b920611377..4df74203a9 100644
--- a/modules/kameleonvolume/kameleonvolumereader.cpp
+++ b/modules/kameleonvolume/kameleonvolumereader.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/kameleonvolume/kameleonvolumereader.h b/modules/kameleonvolume/kameleonvolumereader.h
index 7c53b30bc8..8cde8ccac5 100644
--- a/modules/kameleonvolume/kameleonvolumereader.h
+++ b/modules/kameleonvolume/kameleonvolumereader.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/kameleonvolume/rendering/renderablekameleonvolume.cpp b/modules/kameleonvolume/rendering/renderablekameleonvolume.cpp
index fed8680c63..1541e8b46d 100644
--- a/modules/kameleonvolume/rendering/renderablekameleonvolume.cpp
+++ b/modules/kameleonvolume/rendering/renderablekameleonvolume.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/kameleonvolume/rendering/renderablekameleonvolume.h b/modules/kameleonvolume/rendering/renderablekameleonvolume.h
index 85fe2c2d92..9fda4a3c16 100644
--- a/modules/kameleonvolume/rendering/renderablekameleonvolume.h
+++ b/modules/kameleonvolume/rendering/renderablekameleonvolume.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/kameleonvolume/tasks/kameleondocumentationtask.cpp b/modules/kameleonvolume/tasks/kameleondocumentationtask.cpp
index 9cca71ce20..fc5926e881 100644
--- a/modules/kameleonvolume/tasks/kameleondocumentationtask.cpp
+++ b/modules/kameleonvolume/tasks/kameleondocumentationtask.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/kameleonvolume/tasks/kameleondocumentationtask.h b/modules/kameleonvolume/tasks/kameleondocumentationtask.h
index 59b8a448c4..98174743ec 100644
--- a/modules/kameleonvolume/tasks/kameleondocumentationtask.h
+++ b/modules/kameleonvolume/tasks/kameleondocumentationtask.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/kameleonvolume/tasks/kameleonmetadatatojsontask.cpp b/modules/kameleonvolume/tasks/kameleonmetadatatojsontask.cpp
index bb2edd39f6..a13af5ce2d 100644
--- a/modules/kameleonvolume/tasks/kameleonmetadatatojsontask.cpp
+++ b/modules/kameleonvolume/tasks/kameleonmetadatatojsontask.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/kameleonvolume/tasks/kameleonmetadatatojsontask.h b/modules/kameleonvolume/tasks/kameleonmetadatatojsontask.h
index 76dfc6c880..89131673d4 100644
--- a/modules/kameleonvolume/tasks/kameleonmetadatatojsontask.h
+++ b/modules/kameleonvolume/tasks/kameleonmetadatatojsontask.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/kameleonvolume/tasks/kameleonvolumetorawtask.cpp b/modules/kameleonvolume/tasks/kameleonvolumetorawtask.cpp
index db84c5aa65..ca5f226fb5 100644
--- a/modules/kameleonvolume/tasks/kameleonvolumetorawtask.cpp
+++ b/modules/kameleonvolume/tasks/kameleonvolumetorawtask.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/kameleonvolume/tasks/kameleonvolumetorawtask.h b/modules/kameleonvolume/tasks/kameleonvolumetorawtask.h
index 1ce8fa3a74..e807488a9b 100644
--- a/modules/kameleonvolume/tasks/kameleonvolumetorawtask.h
+++ b/modules/kameleonvolume/tasks/kameleonvolumetorawtask.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/multiresvolume/CMakeLists.txt b/modules/multiresvolume/CMakeLists.txt
index 5a9fcbfae3..b7bc7a1027 100644
--- a/modules/multiresvolume/CMakeLists.txt
+++ b/modules/multiresvolume/CMakeLists.txt
@@ -2,7 +2,7 @@
 #                                                                                        #
 # OpenSpace                                                                              #
 #                                                                                        #
-# Copyright (c) 2014-2024                                                                #
+# Copyright (c) 2014-2025                                                                #
 #                                                                                        #
 # Permission is hereby granted, free of charge, to any person obtaining a copy of this   #
 # software and associated documentation files (the "Software"), to deal in the Software  #
diff --git a/modules/multiresvolume/multiresvolumemodule.cpp b/modules/multiresvolume/multiresvolumemodule.cpp
index 15063a9667..8df8828ae7 100644
--- a/modules/multiresvolume/multiresvolumemodule.cpp
+++ b/modules/multiresvolume/multiresvolumemodule.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/multiresvolume/multiresvolumemodule.h b/modules/multiresvolume/multiresvolumemodule.h
index acc6efcd4a..e2df1a120a 100644
--- a/modules/multiresvolume/multiresvolumemodule.h
+++ b/modules/multiresvolume/multiresvolumemodule.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/multiresvolume/rendering/atlasmanager.cpp b/modules/multiresvolume/rendering/atlasmanager.cpp
index 33d1705430..dbd528fe30 100644
--- a/modules/multiresvolume/rendering/atlasmanager.cpp
+++ b/modules/multiresvolume/rendering/atlasmanager.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/multiresvolume/rendering/atlasmanager.h b/modules/multiresvolume/rendering/atlasmanager.h
index e1f953aa26..73369ae0ee 100644
--- a/modules/multiresvolume/rendering/atlasmanager.h
+++ b/modules/multiresvolume/rendering/atlasmanager.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/multiresvolume/rendering/brickcover.cpp b/modules/multiresvolume/rendering/brickcover.cpp
index 4bb2619fc3..e47a60538e 100644
--- a/modules/multiresvolume/rendering/brickcover.cpp
+++ b/modules/multiresvolume/rendering/brickcover.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/multiresvolume/rendering/brickcover.h b/modules/multiresvolume/rendering/brickcover.h
index 6d09f55a9b..e72a912061 100644
--- a/modules/multiresvolume/rendering/brickcover.h
+++ b/modules/multiresvolume/rendering/brickcover.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/multiresvolume/rendering/brickmanager.cpp b/modules/multiresvolume/rendering/brickmanager.cpp
index 7c171a2a48..5f7f7d2923 100644
--- a/modules/multiresvolume/rendering/brickmanager.cpp
+++ b/modules/multiresvolume/rendering/brickmanager.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/multiresvolume/rendering/brickmanager.h b/modules/multiresvolume/rendering/brickmanager.h
index 54fd20e2fb..6ffd604b64 100644
--- a/modules/multiresvolume/rendering/brickmanager.h
+++ b/modules/multiresvolume/rendering/brickmanager.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/multiresvolume/rendering/brickselection.cpp b/modules/multiresvolume/rendering/brickselection.cpp
index 545f9b42d3..3f8848b684 100644
--- a/modules/multiresvolume/rendering/brickselection.cpp
+++ b/modules/multiresvolume/rendering/brickselection.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/multiresvolume/rendering/brickselection.h b/modules/multiresvolume/rendering/brickselection.h
index 49d3a20ed9..41db300770 100644
--- a/modules/multiresvolume/rendering/brickselection.h
+++ b/modules/multiresvolume/rendering/brickselection.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/multiresvolume/rendering/brickselector.h b/modules/multiresvolume/rendering/brickselector.h
index 8e78c22bb7..ff03dce50e 100644
--- a/modules/multiresvolume/rendering/brickselector.h
+++ b/modules/multiresvolume/rendering/brickselector.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/multiresvolume/rendering/errorhistogrammanager.cpp b/modules/multiresvolume/rendering/errorhistogrammanager.cpp
index 23320c6770..8e08484696 100644
--- a/modules/multiresvolume/rendering/errorhistogrammanager.cpp
+++ b/modules/multiresvolume/rendering/errorhistogrammanager.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/multiresvolume/rendering/errorhistogrammanager.h b/modules/multiresvolume/rendering/errorhistogrammanager.h
index d819ba7a31..c7b0ea665b 100644
--- a/modules/multiresvolume/rendering/errorhistogrammanager.h
+++ b/modules/multiresvolume/rendering/errorhistogrammanager.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/multiresvolume/rendering/histogrammanager.cpp b/modules/multiresvolume/rendering/histogrammanager.cpp
index a7929f18b5..164d5c54f5 100644
--- a/modules/multiresvolume/rendering/histogrammanager.cpp
+++ b/modules/multiresvolume/rendering/histogrammanager.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/multiresvolume/rendering/histogrammanager.h b/modules/multiresvolume/rendering/histogrammanager.h
index d9abde4d00..e6843fac31 100644
--- a/modules/multiresvolume/rendering/histogrammanager.h
+++ b/modules/multiresvolume/rendering/histogrammanager.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/multiresvolume/rendering/localerrorhistogrammanager.cpp b/modules/multiresvolume/rendering/localerrorhistogrammanager.cpp
index 248f5f3aa2..bab44421e4 100644
--- a/modules/multiresvolume/rendering/localerrorhistogrammanager.cpp
+++ b/modules/multiresvolume/rendering/localerrorhistogrammanager.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/multiresvolume/rendering/localerrorhistogrammanager.h b/modules/multiresvolume/rendering/localerrorhistogrammanager.h
index 8e77e5edd3..8f9cd857cc 100644
--- a/modules/multiresvolume/rendering/localerrorhistogrammanager.h
+++ b/modules/multiresvolume/rendering/localerrorhistogrammanager.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/multiresvolume/rendering/localtfbrickselector.cpp b/modules/multiresvolume/rendering/localtfbrickselector.cpp
index 6037be50df..35e5173db5 100644
--- a/modules/multiresvolume/rendering/localtfbrickselector.cpp
+++ b/modules/multiresvolume/rendering/localtfbrickselector.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/multiresvolume/rendering/localtfbrickselector.h b/modules/multiresvolume/rendering/localtfbrickselector.h
index 03ffa1e413..ce1a03226b 100644
--- a/modules/multiresvolume/rendering/localtfbrickselector.h
+++ b/modules/multiresvolume/rendering/localtfbrickselector.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/multiresvolume/rendering/multiresvolumeraycaster.cpp b/modules/multiresvolume/rendering/multiresvolumeraycaster.cpp
index 3b8217f713..d31d424611 100644
--- a/modules/multiresvolume/rendering/multiresvolumeraycaster.cpp
+++ b/modules/multiresvolume/rendering/multiresvolumeraycaster.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/multiresvolume/rendering/multiresvolumeraycaster.h b/modules/multiresvolume/rendering/multiresvolumeraycaster.h
index 1f14f7c851..e394fe0002 100644
--- a/modules/multiresvolume/rendering/multiresvolumeraycaster.h
+++ b/modules/multiresvolume/rendering/multiresvolumeraycaster.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/multiresvolume/rendering/renderablemultiresvolume.cpp b/modules/multiresvolume/rendering/renderablemultiresvolume.cpp
index 1980a4dac8..2ed9ada2b2 100644
--- a/modules/multiresvolume/rendering/renderablemultiresvolume.cpp
+++ b/modules/multiresvolume/rendering/renderablemultiresvolume.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/multiresvolume/rendering/renderablemultiresvolume.h b/modules/multiresvolume/rendering/renderablemultiresvolume.h
index 87edab8b84..4c65ecab0c 100644
--- a/modules/multiresvolume/rendering/renderablemultiresvolume.h
+++ b/modules/multiresvolume/rendering/renderablemultiresvolume.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/multiresvolume/rendering/shenbrickselector.cpp b/modules/multiresvolume/rendering/shenbrickselector.cpp
index 49278ca833..0d90497ffd 100644
--- a/modules/multiresvolume/rendering/shenbrickselector.cpp
+++ b/modules/multiresvolume/rendering/shenbrickselector.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/multiresvolume/rendering/shenbrickselector.h b/modules/multiresvolume/rendering/shenbrickselector.h
index 24de6b0fd8..6b323c8d62 100644
--- a/modules/multiresvolume/rendering/shenbrickselector.h
+++ b/modules/multiresvolume/rendering/shenbrickselector.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/multiresvolume/rendering/simpletfbrickselector.cpp b/modules/multiresvolume/rendering/simpletfbrickselector.cpp
index 71a04fab99..4b0be588bd 100644
--- a/modules/multiresvolume/rendering/simpletfbrickselector.cpp
+++ b/modules/multiresvolume/rendering/simpletfbrickselector.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/multiresvolume/rendering/simpletfbrickselector.h b/modules/multiresvolume/rendering/simpletfbrickselector.h
index 78f3c8ed66..7da6e9ba7f 100644
--- a/modules/multiresvolume/rendering/simpletfbrickselector.h
+++ b/modules/multiresvolume/rendering/simpletfbrickselector.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/multiresvolume/rendering/tfbrickselector.cpp b/modules/multiresvolume/rendering/tfbrickselector.cpp
index 26a964b2bc..b411fc07b3 100644
--- a/modules/multiresvolume/rendering/tfbrickselector.cpp
+++ b/modules/multiresvolume/rendering/tfbrickselector.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/multiresvolume/rendering/tfbrickselector.h b/modules/multiresvolume/rendering/tfbrickselector.h
index 72a6651333..2e4fa43da1 100644
--- a/modules/multiresvolume/rendering/tfbrickselector.h
+++ b/modules/multiresvolume/rendering/tfbrickselector.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/multiresvolume/rendering/tsp.cpp b/modules/multiresvolume/rendering/tsp.cpp
index 1fcab6636f..0442573732 100644
--- a/modules/multiresvolume/rendering/tsp.cpp
+++ b/modules/multiresvolume/rendering/tsp.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/multiresvolume/rendering/tsp.h b/modules/multiresvolume/rendering/tsp.h
index 9148a2f6e0..8f144ad997 100644
--- a/modules/multiresvolume/rendering/tsp.h
+++ b/modules/multiresvolume/rendering/tsp.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/multiresvolume/shaders/bounds_fs.glsl b/modules/multiresvolume/shaders/bounds_fs.glsl
index 6a8c3cb719..6ceb834ed7 100644
--- a/modules/multiresvolume/shaders/bounds_fs.glsl
+++ b/modules/multiresvolume/shaders/bounds_fs.glsl
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/multiresvolume/shaders/bounds_vs.glsl b/modules/multiresvolume/shaders/bounds_vs.glsl
index a0af27a9ce..1f42f6df18 100644
--- a/modules/multiresvolume/shaders/bounds_vs.glsl
+++ b/modules/multiresvolume/shaders/bounds_vs.glsl
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/multiresvolume/shaders/helper.glsl b/modules/multiresvolume/shaders/helper.glsl
index 896acc9788..41a3de040d 100644
--- a/modules/multiresvolume/shaders/helper.glsl
+++ b/modules/multiresvolume/shaders/helper.glsl
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/multiresvolume/shaders/raycast.glsl b/modules/multiresvolume/shaders/raycast.glsl
index 711cc87671..4c008842be 100644
--- a/modules/multiresvolume/shaders/raycast.glsl
+++ b/modules/multiresvolume/shaders/raycast.glsl
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/server/CMakeLists.txt b/modules/server/CMakeLists.txt
index cd1642455f..870dd05ccc 100644
--- a/modules/server/CMakeLists.txt
+++ b/modules/server/CMakeLists.txt
@@ -2,7 +2,7 @@
 #                                                                                        #
 # OpenSpace                                                                              #
 #                                                                                        #
-# Copyright (c) 2014-2024                                                                #
+# Copyright (c) 2014-2025                                                                #
 #                                                                                        #
 # Permission is hereby granted, free of charge, to any person obtaining a copy of this   #
 # software and associated documentation files (the "Software"), to deal in the Software  #
diff --git a/modules/server/include/connection.h b/modules/server/include/connection.h
index 1937889008..5e6e2db9c7 100644
--- a/modules/server/include/connection.h
+++ b/modules/server/include/connection.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/server/include/connectionpool.h b/modules/server/include/connectionpool.h
index 63c3f3d9e4..11780936b9 100644
--- a/modules/server/include/connectionpool.h
+++ b/modules/server/include/connectionpool.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/server/include/jsonconverters.h b/modules/server/include/jsonconverters.h
index f4144624c1..5a92d3e5c3 100644
--- a/modules/server/include/jsonconverters.h
+++ b/modules/server/include/jsonconverters.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/server/include/serverinterface.h b/modules/server/include/serverinterface.h
index 090d18514b..ea509c0a53 100644
--- a/modules/server/include/serverinterface.h
+++ b/modules/server/include/serverinterface.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/server/include/topics/authorizationtopic.h b/modules/server/include/topics/authorizationtopic.h
index f7db399530..3fa3521eaa 100644
--- a/modules/server/include/topics/authorizationtopic.h
+++ b/modules/server/include/topics/authorizationtopic.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/server/include/topics/bouncetopic.h b/modules/server/include/topics/bouncetopic.h
index b8ceff9dde..2b7107e36c 100644
--- a/modules/server/include/topics/bouncetopic.h
+++ b/modules/server/include/topics/bouncetopic.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/server/include/topics/camerapathtopic.h b/modules/server/include/topics/camerapathtopic.h
index 73c7ba67ca..855ac14741 100644
--- a/modules/server/include/topics/camerapathtopic.h
+++ b/modules/server/include/topics/camerapathtopic.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/server/include/topics/cameratopic.h b/modules/server/include/topics/cameratopic.h
index f28c41f65e..058f98f602 100644
--- a/modules/server/include/topics/cameratopic.h
+++ b/modules/server/include/topics/cameratopic.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/server/include/topics/documentationtopic.h b/modules/server/include/topics/documentationtopic.h
index fd0d5b38f7..3b57532d78 100644
--- a/modules/server/include/topics/documentationtopic.h
+++ b/modules/server/include/topics/documentationtopic.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/server/include/topics/enginemodetopic.h b/modules/server/include/topics/enginemodetopic.h
index 40d3beb678..0ceaeabda6 100644
--- a/modules/server/include/topics/enginemodetopic.h
+++ b/modules/server/include/topics/enginemodetopic.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/server/include/topics/errorlogtopic.h b/modules/server/include/topics/errorlogtopic.h
index 2541cabaad..49bc2e4f61 100644
--- a/modules/server/include/topics/errorlogtopic.h
+++ b/modules/server/include/topics/errorlogtopic.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/server/include/topics/eventtopic.h b/modules/server/include/topics/eventtopic.h
index 0dc863ad74..bfb589c231 100644
--- a/modules/server/include/topics/eventtopic.h
+++ b/modules/server/include/topics/eventtopic.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/server/include/topics/flightcontrollertopic.h b/modules/server/include/topics/flightcontrollertopic.h
index 36be8ed760..6d6d84ed33 100644
--- a/modules/server/include/topics/flightcontrollertopic.h
+++ b/modules/server/include/topics/flightcontrollertopic.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/server/include/topics/getpropertytopic.h b/modules/server/include/topics/getpropertytopic.h
index d1fbce4267..26830bb12c 100644
--- a/modules/server/include/topics/getpropertytopic.h
+++ b/modules/server/include/topics/getpropertytopic.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/server/include/topics/luascripttopic.h b/modules/server/include/topics/luascripttopic.h
index d12f729687..eebfb3ca90 100644
--- a/modules/server/include/topics/luascripttopic.h
+++ b/modules/server/include/topics/luascripttopic.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/server/include/topics/missiontopic.h b/modules/server/include/topics/missiontopic.h
index 59890efabe..40610daf51 100644
--- a/modules/server/include/topics/missiontopic.h
+++ b/modules/server/include/topics/missiontopic.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/server/include/topics/sessionrecordingtopic.h b/modules/server/include/topics/sessionrecordingtopic.h
index 48fc4b710b..65e6b454d8 100644
--- a/modules/server/include/topics/sessionrecordingtopic.h
+++ b/modules/server/include/topics/sessionrecordingtopic.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/server/include/topics/setpropertytopic.h b/modules/server/include/topics/setpropertytopic.h
index a42addcfb4..50b1cdf2b9 100644
--- a/modules/server/include/topics/setpropertytopic.h
+++ b/modules/server/include/topics/setpropertytopic.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/server/include/topics/shortcuttopic.h b/modules/server/include/topics/shortcuttopic.h
index 4f621ec534..8ed9697bf1 100644
--- a/modules/server/include/topics/shortcuttopic.h
+++ b/modules/server/include/topics/shortcuttopic.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/server/include/topics/skybrowsertopic.h b/modules/server/include/topics/skybrowsertopic.h
index 4c93b5c249..12d542465f 100644
--- a/modules/server/include/topics/skybrowsertopic.h
+++ b/modules/server/include/topics/skybrowsertopic.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/server/include/topics/subscriptiontopic.h b/modules/server/include/topics/subscriptiontopic.h
index fe08afdf5a..4ddd92bcce 100644
--- a/modules/server/include/topics/subscriptiontopic.h
+++ b/modules/server/include/topics/subscriptiontopic.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/server/include/topics/timetopic.h b/modules/server/include/topics/timetopic.h
index 9c5534ccb3..ff2c20aff7 100644
--- a/modules/server/include/topics/timetopic.h
+++ b/modules/server/include/topics/timetopic.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/server/include/topics/topic.h b/modules/server/include/topics/topic.h
index fb27ff3cbb..9099845f52 100644
--- a/modules/server/include/topics/topic.h
+++ b/modules/server/include/topics/topic.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/server/include/topics/triggerpropertytopic.h b/modules/server/include/topics/triggerpropertytopic.h
index bf54bdac19..86fb1dfb05 100644
--- a/modules/server/include/topics/triggerpropertytopic.h
+++ b/modules/server/include/topics/triggerpropertytopic.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/server/include/topics/versiontopic.h b/modules/server/include/topics/versiontopic.h
index 6a38b79118..fab7bff78e 100644
--- a/modules/server/include/topics/versiontopic.h
+++ b/modules/server/include/topics/versiontopic.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/server/servermodule.cpp b/modules/server/servermodule.cpp
index ff79690a80..50eca6d3d1 100644
--- a/modules/server/servermodule.cpp
+++ b/modules/server/servermodule.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/server/servermodule.h b/modules/server/servermodule.h
index f4c69990f9..aa46637ced 100644
--- a/modules/server/servermodule.h
+++ b/modules/server/servermodule.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/server/src/connection.cpp b/modules/server/src/connection.cpp
index 93a5102cba..b586c1f29f 100644
--- a/modules/server/src/connection.cpp
+++ b/modules/server/src/connection.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/server/src/connectionpool.cpp b/modules/server/src/connectionpool.cpp
index 69136581d7..52da146c18 100644
--- a/modules/server/src/connectionpool.cpp
+++ b/modules/server/src/connectionpool.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/server/src/jsonconverters.cpp b/modules/server/src/jsonconverters.cpp
index 174ae80140..5818122831 100644
--- a/modules/server/src/jsonconverters.cpp
+++ b/modules/server/src/jsonconverters.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/server/src/serverinterface.cpp b/modules/server/src/serverinterface.cpp
index 16948d4eaf..42c1656af2 100644
--- a/modules/server/src/serverinterface.cpp
+++ b/modules/server/src/serverinterface.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/server/src/topics/authorizationtopic.cpp b/modules/server/src/topics/authorizationtopic.cpp
index 946fc6c3ab..75451cb6e2 100644
--- a/modules/server/src/topics/authorizationtopic.cpp
+++ b/modules/server/src/topics/authorizationtopic.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/server/src/topics/bouncetopic.cpp b/modules/server/src/topics/bouncetopic.cpp
index 52a54b8888..121df10573 100644
--- a/modules/server/src/topics/bouncetopic.cpp
+++ b/modules/server/src/topics/bouncetopic.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/server/src/topics/camerapathtopic.cpp b/modules/server/src/topics/camerapathtopic.cpp
index 7662530fc4..c5a565e95d 100644
--- a/modules/server/src/topics/camerapathtopic.cpp
+++ b/modules/server/src/topics/camerapathtopic.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/server/src/topics/cameratopic.cpp b/modules/server/src/topics/cameratopic.cpp
index 857bf1f3f0..b188be35d2 100644
--- a/modules/server/src/topics/cameratopic.cpp
+++ b/modules/server/src/topics/cameratopic.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/server/src/topics/documentationtopic.cpp b/modules/server/src/topics/documentationtopic.cpp
index 3c9cb8b763..d813f9971c 100644
--- a/modules/server/src/topics/documentationtopic.cpp
+++ b/modules/server/src/topics/documentationtopic.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/server/src/topics/enginemodetopic.cpp b/modules/server/src/topics/enginemodetopic.cpp
index ce4450b5a1..744200c342 100644
--- a/modules/server/src/topics/enginemodetopic.cpp
+++ b/modules/server/src/topics/enginemodetopic.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/server/src/topics/errorlogtopic.cpp b/modules/server/src/topics/errorlogtopic.cpp
index e47cc5ebd0..6e0e2c5cb2 100644
--- a/modules/server/src/topics/errorlogtopic.cpp
+++ b/modules/server/src/topics/errorlogtopic.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/server/src/topics/eventtopic.cpp b/modules/server/src/topics/eventtopic.cpp
index 206b3522b0..9c3f5c2f9e 100644
--- a/modules/server/src/topics/eventtopic.cpp
+++ b/modules/server/src/topics/eventtopic.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/server/src/topics/flightcontrollertopic.cpp b/modules/server/src/topics/flightcontrollertopic.cpp
index 0256d40eb8..dcb6d0baa4 100644
--- a/modules/server/src/topics/flightcontrollertopic.cpp
+++ b/modules/server/src/topics/flightcontrollertopic.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/server/src/topics/getpropertytopic.cpp b/modules/server/src/topics/getpropertytopic.cpp
index 1c19d8ffca..9f43a63f87 100644
--- a/modules/server/src/topics/getpropertytopic.cpp
+++ b/modules/server/src/topics/getpropertytopic.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/server/src/topics/luascripttopic.cpp b/modules/server/src/topics/luascripttopic.cpp
index d594065f20..5c771065fe 100644
--- a/modules/server/src/topics/luascripttopic.cpp
+++ b/modules/server/src/topics/luascripttopic.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/server/src/topics/missiontopic.cpp b/modules/server/src/topics/missiontopic.cpp
index 51489775d3..e5a0fd7334 100644
--- a/modules/server/src/topics/missiontopic.cpp
+++ b/modules/server/src/topics/missiontopic.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/server/src/topics/sessionrecordingtopic.cpp b/modules/server/src/topics/sessionrecordingtopic.cpp
index bf2660da91..edbeac3f15 100644
--- a/modules/server/src/topics/sessionrecordingtopic.cpp
+++ b/modules/server/src/topics/sessionrecordingtopic.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/server/src/topics/setpropertytopic.cpp b/modules/server/src/topics/setpropertytopic.cpp
index c62d68dc4b..94e39d55b6 100644
--- a/modules/server/src/topics/setpropertytopic.cpp
+++ b/modules/server/src/topics/setpropertytopic.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/server/src/topics/shortcuttopic.cpp b/modules/server/src/topics/shortcuttopic.cpp
index 2884869a35..076d3955d8 100644
--- a/modules/server/src/topics/shortcuttopic.cpp
+++ b/modules/server/src/topics/shortcuttopic.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/server/src/topics/skybrowsertopic.cpp b/modules/server/src/topics/skybrowsertopic.cpp
index b4432b7bb7..668018856d 100644
--- a/modules/server/src/topics/skybrowsertopic.cpp
+++ b/modules/server/src/topics/skybrowsertopic.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/server/src/topics/subscriptiontopic.cpp b/modules/server/src/topics/subscriptiontopic.cpp
index 52d7894b53..77f51b606a 100644
--- a/modules/server/src/topics/subscriptiontopic.cpp
+++ b/modules/server/src/topics/subscriptiontopic.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/server/src/topics/timetopic.cpp b/modules/server/src/topics/timetopic.cpp
index f34caff483..6ffc50fdd5 100644
--- a/modules/server/src/topics/timetopic.cpp
+++ b/modules/server/src/topics/timetopic.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/server/src/topics/topic.cpp b/modules/server/src/topics/topic.cpp
index 2ae23d5757..eebed65e5a 100644
--- a/modules/server/src/topics/topic.cpp
+++ b/modules/server/src/topics/topic.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/server/src/topics/triggerpropertytopic.cpp b/modules/server/src/topics/triggerpropertytopic.cpp
index b3fd1b67e6..40aa9a362b 100644
--- a/modules/server/src/topics/triggerpropertytopic.cpp
+++ b/modules/server/src/topics/triggerpropertytopic.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/server/src/topics/versiontopic.cpp b/modules/server/src/topics/versiontopic.cpp
index e8bd0af0c0..598d2cb285 100644
--- a/modules/server/src/topics/versiontopic.cpp
+++ b/modules/server/src/topics/versiontopic.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/skybrowser/CMakeLists.txt b/modules/skybrowser/CMakeLists.txt
index 1bf961321e..a7ad98298b 100644
--- a/modules/skybrowser/CMakeLists.txt
+++ b/modules/skybrowser/CMakeLists.txt
@@ -2,7 +2,7 @@
 #                                                                                        #
 # OpenSpace                                                                              #
 #                                                                                        #
-# Copyright (c) 2014-2024                                                                #
+# Copyright (c) 2014-2025                                                                #
 #                                                                                        #
 # Permission is hereby granted, free of charge, to any person obtaining a copy of this   #
 # software and associated documentation files (the "Software"), to deal in the Software  #
diff --git a/modules/skybrowser/include/browser.h b/modules/skybrowser/include/browser.h
index 5a5235bf11..7fcdd05868 100644
--- a/modules/skybrowser/include/browser.h
+++ b/modules/skybrowser/include/browser.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/skybrowser/include/renderableskytarget.h b/modules/skybrowser/include/renderableskytarget.h
index 367705805d..7d76d0cd23 100644
--- a/modules/skybrowser/include/renderableskytarget.h
+++ b/modules/skybrowser/include/renderableskytarget.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/skybrowser/include/screenspaceskybrowser.h b/modules/skybrowser/include/screenspaceskybrowser.h
index acfd47fbd4..18601f01d6 100644
--- a/modules/skybrowser/include/screenspaceskybrowser.h
+++ b/modules/skybrowser/include/screenspaceskybrowser.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/skybrowser/include/targetbrowserpair.h b/modules/skybrowser/include/targetbrowserpair.h
index 04366b6d12..7c017bff77 100644
--- a/modules/skybrowser/include/targetbrowserpair.h
+++ b/modules/skybrowser/include/targetbrowserpair.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/skybrowser/include/utility.h b/modules/skybrowser/include/utility.h
index bb4ddbc3a2..5f40cb77f0 100644
--- a/modules/skybrowser/include/utility.h
+++ b/modules/skybrowser/include/utility.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/skybrowser/include/wwtcommunicator.h b/modules/skybrowser/include/wwtcommunicator.h
index 082486bf09..6953e7e49e 100644
--- a/modules/skybrowser/include/wwtcommunicator.h
+++ b/modules/skybrowser/include/wwtcommunicator.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/skybrowser/include/wwtdatahandler.h b/modules/skybrowser/include/wwtdatahandler.h
index ac2767b5f2..c3d13e7007 100644
--- a/modules/skybrowser/include/wwtdatahandler.h
+++ b/modules/skybrowser/include/wwtdatahandler.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/skybrowser/shaders/target_fs.glsl b/modules/skybrowser/shaders/target_fs.glsl
index f7516f5831..ea6537e68f 100644
--- a/modules/skybrowser/shaders/target_fs.glsl
+++ b/modules/skybrowser/shaders/target_fs.glsl
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/skybrowser/shaders/target_vs.glsl b/modules/skybrowser/shaders/target_vs.glsl
index d601f353bb..26f5f4bfb1 100644
--- a/modules/skybrowser/shaders/target_vs.glsl
+++ b/modules/skybrowser/shaders/target_vs.glsl
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/skybrowser/skybrowsermodule.cpp b/modules/skybrowser/skybrowsermodule.cpp
index e9f38758d1..61cf1dc73b 100644
--- a/modules/skybrowser/skybrowsermodule.cpp
+++ b/modules/skybrowser/skybrowsermodule.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/skybrowser/skybrowsermodule.h b/modules/skybrowser/skybrowsermodule.h
index 1c0f5b9591..420cf00f5a 100644
--- a/modules/skybrowser/skybrowsermodule.h
+++ b/modules/skybrowser/skybrowsermodule.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/skybrowser/skybrowsermodule_lua.inl b/modules/skybrowser/skybrowsermodule_lua.inl
index e405f037d4..3fcd88bc16 100644
--- a/modules/skybrowser/skybrowsermodule_lua.inl
+++ b/modules/skybrowser/skybrowsermodule_lua.inl
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/skybrowser/src/browser.cpp b/modules/skybrowser/src/browser.cpp
index bb6edbfc6e..33f52cbd06 100644
--- a/modules/skybrowser/src/browser.cpp
+++ b/modules/skybrowser/src/browser.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/skybrowser/src/renderableskytarget.cpp b/modules/skybrowser/src/renderableskytarget.cpp
index 0848bbef32..b6ab839166 100644
--- a/modules/skybrowser/src/renderableskytarget.cpp
+++ b/modules/skybrowser/src/renderableskytarget.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/skybrowser/src/screenspaceskybrowser.cpp b/modules/skybrowser/src/screenspaceskybrowser.cpp
index 16307ebdd7..03db8fc59b 100644
--- a/modules/skybrowser/src/screenspaceskybrowser.cpp
+++ b/modules/skybrowser/src/screenspaceskybrowser.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/skybrowser/src/targetbrowserpair.cpp b/modules/skybrowser/src/targetbrowserpair.cpp
index 1ae17dbcd3..e1cf3cee66 100644
--- a/modules/skybrowser/src/targetbrowserpair.cpp
+++ b/modules/skybrowser/src/targetbrowserpair.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/skybrowser/src/utility.cpp b/modules/skybrowser/src/utility.cpp
index b9e3923fa6..3b6ea320bb 100644
--- a/modules/skybrowser/src/utility.cpp
+++ b/modules/skybrowser/src/utility.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/skybrowser/src/wwtcommunicator.cpp b/modules/skybrowser/src/wwtcommunicator.cpp
index 3507f2f513..d04cf24769 100644
--- a/modules/skybrowser/src/wwtcommunicator.cpp
+++ b/modules/skybrowser/src/wwtcommunicator.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/skybrowser/src/wwtdatahandler.cpp b/modules/skybrowser/src/wwtdatahandler.cpp
index 85b198cc8e..f094c264a8 100644
--- a/modules/skybrowser/src/wwtdatahandler.cpp
+++ b/modules/skybrowser/src/wwtdatahandler.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/space/CMakeLists.txt b/modules/space/CMakeLists.txt
index 9a5eb1dd58..15cedfd993 100644
--- a/modules/space/CMakeLists.txt
+++ b/modules/space/CMakeLists.txt
@@ -2,7 +2,7 @@
 #                                                                                        #
 # OpenSpace                                                                              #
 #                                                                                        #
-# Copyright (c) 2014-2024                                                                #
+# Copyright (c) 2014-2025                                                                #
 #                                                                                        #
 # Permission is hereby granted, free of charge, to any person obtaining a copy of this   #
 # software and associated documentation files (the "Software"), to deal in the Software  #
diff --git a/modules/space/horizonsfile.cpp b/modules/space/horizonsfile.cpp
index b4e74cfc7d..2cd37ce618 100644
--- a/modules/space/horizonsfile.cpp
+++ b/modules/space/horizonsfile.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/space/horizonsfile.h b/modules/space/horizonsfile.h
index 92bc18fd01..3090b079b2 100644
--- a/modules/space/horizonsfile.h
+++ b/modules/space/horizonsfile.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/space/kepler.cpp b/modules/space/kepler.cpp
index 9ae20a9a28..1d30036791 100644
--- a/modules/space/kepler.cpp
+++ b/modules/space/kepler.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/space/kepler.h b/modules/space/kepler.h
index c17e487f69..25ff58539a 100644
--- a/modules/space/kepler.h
+++ b/modules/space/kepler.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/space/rendering/renderableconstellationbounds.cpp b/modules/space/rendering/renderableconstellationbounds.cpp
index 7cb765cea2..9a5cde6bad 100644
--- a/modules/space/rendering/renderableconstellationbounds.cpp
+++ b/modules/space/rendering/renderableconstellationbounds.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/space/rendering/renderableconstellationbounds.h b/modules/space/rendering/renderableconstellationbounds.h
index cc1f354ad9..94073a924c 100644
--- a/modules/space/rendering/renderableconstellationbounds.h
+++ b/modules/space/rendering/renderableconstellationbounds.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/space/rendering/renderableconstellationlines.cpp b/modules/space/rendering/renderableconstellationlines.cpp
index 192c954366..ccd483266d 100644
--- a/modules/space/rendering/renderableconstellationlines.cpp
+++ b/modules/space/rendering/renderableconstellationlines.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/space/rendering/renderableconstellationlines.h b/modules/space/rendering/renderableconstellationlines.h
index d75a2a9d22..75b7d3f390 100644
--- a/modules/space/rendering/renderableconstellationlines.h
+++ b/modules/space/rendering/renderableconstellationlines.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/space/rendering/renderableconstellationsbase.cpp b/modules/space/rendering/renderableconstellationsbase.cpp
index 94e838c628..cf41c2c873 100644
--- a/modules/space/rendering/renderableconstellationsbase.cpp
+++ b/modules/space/rendering/renderableconstellationsbase.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/space/rendering/renderableconstellationsbase.h b/modules/space/rendering/renderableconstellationsbase.h
index 0d02039914..28a42750f6 100644
--- a/modules/space/rendering/renderableconstellationsbase.h
+++ b/modules/space/rendering/renderableconstellationsbase.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/space/rendering/renderableeclipsecone.cpp b/modules/space/rendering/renderableeclipsecone.cpp
index b8bf46eaac..c8bc7d5703 100644
--- a/modules/space/rendering/renderableeclipsecone.cpp
+++ b/modules/space/rendering/renderableeclipsecone.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/space/rendering/renderableeclipsecone.h b/modules/space/rendering/renderableeclipsecone.h
index f154c45211..2963f5da56 100644
--- a/modules/space/rendering/renderableeclipsecone.h
+++ b/modules/space/rendering/renderableeclipsecone.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/space/rendering/renderablefluxnodes.cpp b/modules/space/rendering/renderablefluxnodes.cpp
index 167397084d..44f415c011 100644
--- a/modules/space/rendering/renderablefluxnodes.cpp
+++ b/modules/space/rendering/renderablefluxnodes.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/space/rendering/renderablefluxnodes.h b/modules/space/rendering/renderablefluxnodes.h
index fd77b34b13..9a3318cb8d 100644
--- a/modules/space/rendering/renderablefluxnodes.h
+++ b/modules/space/rendering/renderablefluxnodes.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/space/rendering/renderablehabitablezone.cpp b/modules/space/rendering/renderablehabitablezone.cpp
index 262635f23d..2231271d7d 100644
--- a/modules/space/rendering/renderablehabitablezone.cpp
+++ b/modules/space/rendering/renderablehabitablezone.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/space/rendering/renderablehabitablezone.h b/modules/space/rendering/renderablehabitablezone.h
index 4194a0a59c..024595de4a 100644
--- a/modules/space/rendering/renderablehabitablezone.h
+++ b/modules/space/rendering/renderablehabitablezone.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/space/rendering/renderableorbitalkepler.cpp b/modules/space/rendering/renderableorbitalkepler.cpp
index 4ab04176e8..df517ee0db 100644
--- a/modules/space/rendering/renderableorbitalkepler.cpp
+++ b/modules/space/rendering/renderableorbitalkepler.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/space/rendering/renderableorbitalkepler.h b/modules/space/rendering/renderableorbitalkepler.h
index 76560bc41d..4437646968 100644
--- a/modules/space/rendering/renderableorbitalkepler.h
+++ b/modules/space/rendering/renderableorbitalkepler.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/space/rendering/renderablerings.cpp b/modules/space/rendering/renderablerings.cpp
index 924d374262..76675df9a2 100644
--- a/modules/space/rendering/renderablerings.cpp
+++ b/modules/space/rendering/renderablerings.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/space/rendering/renderablerings.h b/modules/space/rendering/renderablerings.h
index 8fe741281c..9ff1a83ba6 100644
--- a/modules/space/rendering/renderablerings.h
+++ b/modules/space/rendering/renderablerings.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/space/rendering/renderablestars.cpp b/modules/space/rendering/renderablestars.cpp
index b826718886..150e5c2452 100644
--- a/modules/space/rendering/renderablestars.cpp
+++ b/modules/space/rendering/renderablestars.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/space/rendering/renderablestars.h b/modules/space/rendering/renderablestars.h
index e35241a216..f91bca65a2 100644
--- a/modules/space/rendering/renderablestars.h
+++ b/modules/space/rendering/renderablestars.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/space/rendering/renderabletravelspeed.cpp b/modules/space/rendering/renderabletravelspeed.cpp
index f1bad6e7a5..059ad2af8b 100644
--- a/modules/space/rendering/renderabletravelspeed.cpp
+++ b/modules/space/rendering/renderabletravelspeed.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/space/rendering/renderabletravelspeed.h b/modules/space/rendering/renderabletravelspeed.h
index f03d2606c5..9b03d9b460 100644
--- a/modules/space/rendering/renderabletravelspeed.h
+++ b/modules/space/rendering/renderabletravelspeed.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/space/rotation/spicerotation.cpp b/modules/space/rotation/spicerotation.cpp
index cdb5e03ba7..6f7faa7190 100644
--- a/modules/space/rotation/spicerotation.cpp
+++ b/modules/space/rotation/spicerotation.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/space/rotation/spicerotation.h b/modules/space/rotation/spicerotation.h
index b45c143fe6..76ded57030 100644
--- a/modules/space/rotation/spicerotation.h
+++ b/modules/space/rotation/spicerotation.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/space/shaders/constellationbounds_fs.glsl b/modules/space/shaders/constellationbounds_fs.glsl
index 1340445fd5..04788a18b3 100644
--- a/modules/space/shaders/constellationbounds_fs.glsl
+++ b/modules/space/shaders/constellationbounds_fs.glsl
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/space/shaders/constellationbounds_vs.glsl b/modules/space/shaders/constellationbounds_vs.glsl
index e0563e98ff..27fd14f2de 100644
--- a/modules/space/shaders/constellationbounds_vs.glsl
+++ b/modules/space/shaders/constellationbounds_vs.glsl
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/space/shaders/constellationlines_fs.glsl b/modules/space/shaders/constellationlines_fs.glsl
index d650b3084f..fd9207d95d 100644
--- a/modules/space/shaders/constellationlines_fs.glsl
+++ b/modules/space/shaders/constellationlines_fs.glsl
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/space/shaders/constellationlines_vs.glsl b/modules/space/shaders/constellationlines_vs.glsl
index 1c240ddf4a..deb843ad6c 100644
--- a/modules/space/shaders/constellationlines_vs.glsl
+++ b/modules/space/shaders/constellationlines_vs.glsl
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/space/shaders/convolution_fs.glsl b/modules/space/shaders/convolution_fs.glsl
index e0dadb1907..d2952e63dd 100644
--- a/modules/space/shaders/convolution_fs.glsl
+++ b/modules/space/shaders/convolution_fs.glsl
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/space/shaders/convolution_vs.glsl b/modules/space/shaders/convolution_vs.glsl
index b13785d2bc..91d724c271 100644
--- a/modules/space/shaders/convolution_vs.glsl
+++ b/modules/space/shaders/convolution_vs.glsl
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/space/shaders/debrisVizPoints_fs.glsl b/modules/space/shaders/debrisVizPoints_fs.glsl
index 2ad062d058..932efeb8fb 100644
--- a/modules/space/shaders/debrisVizPoints_fs.glsl
+++ b/modules/space/shaders/debrisVizPoints_fs.glsl
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/space/shaders/debrisVizPoints_gs.glsl b/modules/space/shaders/debrisVizPoints_gs.glsl
index af1b784891..6d034a4430 100644
--- a/modules/space/shaders/debrisVizPoints_gs.glsl
+++ b/modules/space/shaders/debrisVizPoints_gs.glsl
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/space/shaders/debrisVizPoints_vs.glsl b/modules/space/shaders/debrisVizPoints_vs.glsl
index 97b0e8e6af..eec8af12d6 100644
--- a/modules/space/shaders/debrisVizPoints_vs.glsl
+++ b/modules/space/shaders/debrisVizPoints_vs.glsl
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/space/shaders/debrisVizTrails_fs.glsl b/modules/space/shaders/debrisVizTrails_fs.glsl
index aa1a1377e6..1563af91db 100644
--- a/modules/space/shaders/debrisVizTrails_fs.glsl
+++ b/modules/space/shaders/debrisVizTrails_fs.glsl
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/space/shaders/debrisVizTrails_gs.glsl b/modules/space/shaders/debrisVizTrails_gs.glsl
index f098d79d18..6f77182a95 100644
--- a/modules/space/shaders/debrisVizTrails_gs.glsl
+++ b/modules/space/shaders/debrisVizTrails_gs.glsl
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/space/shaders/debrisVizTrails_vs.glsl b/modules/space/shaders/debrisVizTrails_vs.glsl
index 3b0c7ce92a..0601dcf079 100644
--- a/modules/space/shaders/debrisVizTrails_vs.glsl
+++ b/modules/space/shaders/debrisVizTrails_vs.glsl
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/space/shaders/eclipsecone_fs.glsl b/modules/space/shaders/eclipsecone_fs.glsl
index 561aed356a..28a8608bb9 100644
--- a/modules/space/shaders/eclipsecone_fs.glsl
+++ b/modules/space/shaders/eclipsecone_fs.glsl
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/space/shaders/eclipsecone_vs.glsl b/modules/space/shaders/eclipsecone_vs.glsl
index e86446e418..c58e4b2772 100644
--- a/modules/space/shaders/eclipsecone_vs.glsl
+++ b/modules/space/shaders/eclipsecone_vs.glsl
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/space/shaders/fluxnodes_fs.glsl b/modules/space/shaders/fluxnodes_fs.glsl
index 4503d84e53..337ad0864e 100644
--- a/modules/space/shaders/fluxnodes_fs.glsl
+++ b/modules/space/shaders/fluxnodes_fs.glsl
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/space/shaders/fluxnodes_vs.glsl b/modules/space/shaders/fluxnodes_vs.glsl
index c4ace2a360..68ee340731 100644
--- a/modules/space/shaders/fluxnodes_vs.glsl
+++ b/modules/space/shaders/fluxnodes_vs.glsl
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/space/shaders/habitablezone_fs.glsl b/modules/space/shaders/habitablezone_fs.glsl
index f80f8519fb..f46b991a71 100644
--- a/modules/space/shaders/habitablezone_fs.glsl
+++ b/modules/space/shaders/habitablezone_fs.glsl
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/space/shaders/habitablezone_vs.glsl b/modules/space/shaders/habitablezone_vs.glsl
index 8a7bba9efe..958d5739a8 100644
--- a/modules/space/shaders/habitablezone_vs.glsl
+++ b/modules/space/shaders/habitablezone_vs.glsl
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/space/shaders/psfToTexture_fs.glsl b/modules/space/shaders/psfToTexture_fs.glsl
index 188afd2973..2a0611f9c0 100644
--- a/modules/space/shaders/psfToTexture_fs.glsl
+++ b/modules/space/shaders/psfToTexture_fs.glsl
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/space/shaders/psfToTexture_vs.glsl b/modules/space/shaders/psfToTexture_vs.glsl
index b2a75fd410..9c96a80aff 100644
--- a/modules/space/shaders/psfToTexture_vs.glsl
+++ b/modules/space/shaders/psfToTexture_vs.glsl
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/space/shaders/rings_fs.glsl b/modules/space/shaders/rings_fs.glsl
index ae6d288922..e9647d9348 100644
--- a/modules/space/shaders/rings_fs.glsl
+++ b/modules/space/shaders/rings_fs.glsl
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/space/shaders/rings_vs.glsl b/modules/space/shaders/rings_vs.glsl
index d90f41316e..a0ec00c399 100644
--- a/modules/space/shaders/rings_vs.glsl
+++ b/modules/space/shaders/rings_vs.glsl
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/space/shaders/star_fs.glsl b/modules/space/shaders/star_fs.glsl
index a9ace5d807..1c64e2d16a 100644
--- a/modules/space/shaders/star_fs.glsl
+++ b/modules/space/shaders/star_fs.glsl
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/space/shaders/star_ge.glsl b/modules/space/shaders/star_ge.glsl
index da590aa0b7..d3e7a9af2b 100644
--- a/modules/space/shaders/star_ge.glsl
+++ b/modules/space/shaders/star_ge.glsl
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/space/shaders/star_vs.glsl b/modules/space/shaders/star_vs.glsl
index 74b845f8a3..f4c9191c47 100644
--- a/modules/space/shaders/star_vs.glsl
+++ b/modules/space/shaders/star_vs.glsl
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/space/shaders/travelspeed_fs.glsl b/modules/space/shaders/travelspeed_fs.glsl
index e46d644bb9..11486bd9d2 100644
--- a/modules/space/shaders/travelspeed_fs.glsl
+++ b/modules/space/shaders/travelspeed_fs.glsl
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/space/shaders/travelspeed_vs.glsl b/modules/space/shaders/travelspeed_vs.glsl
index e5a3e163b6..1c9fbec4bd 100644
--- a/modules/space/shaders/travelspeed_vs.glsl
+++ b/modules/space/shaders/travelspeed_vs.glsl
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/space/spacemodule.cpp b/modules/space/spacemodule.cpp
index c7bc8c3590..8a6939d61f 100644
--- a/modules/space/spacemodule.cpp
+++ b/modules/space/spacemodule.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/space/spacemodule.h b/modules/space/spacemodule.h
index 1be7a72470..de71a12a75 100644
--- a/modules/space/spacemodule.h
+++ b/modules/space/spacemodule.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/space/spacemodule_lua.inl b/modules/space/spacemodule_lua.inl
index 7f0da56a5d..b7c34df652 100644
--- a/modules/space/spacemodule_lua.inl
+++ b/modules/space/spacemodule_lua.inl
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/space/tasks/generatedebrisvolumetask.cpp b/modules/space/tasks/generatedebrisvolumetask.cpp
index 2b9d98aa1e..597ab6da49 100644
--- a/modules/space/tasks/generatedebrisvolumetask.cpp
+++ b/modules/space/tasks/generatedebrisvolumetask.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/space/tasks/generatedebrisvolumetask.h b/modules/space/tasks/generatedebrisvolumetask.h
index 7a382f828e..a6408d81ab 100644
--- a/modules/space/tasks/generatedebrisvolumetask.h
+++ b/modules/space/tasks/generatedebrisvolumetask.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/space/translation/gptranslation.cpp b/modules/space/translation/gptranslation.cpp
index ad27c563e3..5e0357bade 100644
--- a/modules/space/translation/gptranslation.cpp
+++ b/modules/space/translation/gptranslation.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/space/translation/gptranslation.h b/modules/space/translation/gptranslation.h
index aa6d04a0e4..8a0759a0fd 100644
--- a/modules/space/translation/gptranslation.h
+++ b/modules/space/translation/gptranslation.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/space/translation/horizonstranslation.cpp b/modules/space/translation/horizonstranslation.cpp
index 0c985807e1..6ee43a740b 100644
--- a/modules/space/translation/horizonstranslation.cpp
+++ b/modules/space/translation/horizonstranslation.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/space/translation/horizonstranslation.h b/modules/space/translation/horizonstranslation.h
index 60cead9707..7f3e851700 100644
--- a/modules/space/translation/horizonstranslation.h
+++ b/modules/space/translation/horizonstranslation.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/space/translation/keplertranslation.cpp b/modules/space/translation/keplertranslation.cpp
index f87214e3fd..4e9d440765 100644
--- a/modules/space/translation/keplertranslation.cpp
+++ b/modules/space/translation/keplertranslation.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/space/translation/keplertranslation.h b/modules/space/translation/keplertranslation.h
index 5657172f0a..2f00c28da5 100644
--- a/modules/space/translation/keplertranslation.h
+++ b/modules/space/translation/keplertranslation.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/space/translation/spicetranslation.cpp b/modules/space/translation/spicetranslation.cpp
index 80025e78d4..c2c36516ae 100644
--- a/modules/space/translation/spicetranslation.cpp
+++ b/modules/space/translation/spicetranslation.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/space/translation/spicetranslation.h b/modules/space/translation/spicetranslation.h
index 5e3811f255..fe19842d35 100644
--- a/modules/space/translation/spicetranslation.h
+++ b/modules/space/translation/spicetranslation.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/spacecraftinstruments/CMakeLists.txt b/modules/spacecraftinstruments/CMakeLists.txt
index 7e01cfcd96..138b1e0b68 100644
--- a/modules/spacecraftinstruments/CMakeLists.txt
+++ b/modules/spacecraftinstruments/CMakeLists.txt
@@ -2,7 +2,7 @@
 #                                                                                        #
 # OpenSpace                                                                              #
 #                                                                                        #
-# Copyright (c) 2014-2024                                                                #
+# Copyright (c) 2014-2025                                                                #
 #                                                                                        #
 # Permission is hereby granted, free of charge, to any person obtaining a copy of this   #
 # software and associated documentation files (the "Software"), to deal in the Software  #
diff --git a/modules/spacecraftinstruments/dashboard/dashboarditeminstruments.cpp b/modules/spacecraftinstruments/dashboard/dashboarditeminstruments.cpp
index 59e2dc6278..151e7c8baa 100644
--- a/modules/spacecraftinstruments/dashboard/dashboarditeminstruments.cpp
+++ b/modules/spacecraftinstruments/dashboard/dashboarditeminstruments.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/spacecraftinstruments/dashboard/dashboarditeminstruments.h b/modules/spacecraftinstruments/dashboard/dashboarditeminstruments.h
index a44dca9089..952bc80163 100644
--- a/modules/spacecraftinstruments/dashboard/dashboarditeminstruments.h
+++ b/modules/spacecraftinstruments/dashboard/dashboarditeminstruments.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/spacecraftinstruments/rendering/renderablecrawlingline.cpp b/modules/spacecraftinstruments/rendering/renderablecrawlingline.cpp
index 909ee0e9fd..1e49f32af6 100644
--- a/modules/spacecraftinstruments/rendering/renderablecrawlingline.cpp
+++ b/modules/spacecraftinstruments/rendering/renderablecrawlingline.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/spacecraftinstruments/rendering/renderablecrawlingline.h b/modules/spacecraftinstruments/rendering/renderablecrawlingline.h
index 671b430e38..bac3e5207e 100644
--- a/modules/spacecraftinstruments/rendering/renderablecrawlingline.h
+++ b/modules/spacecraftinstruments/rendering/renderablecrawlingline.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/spacecraftinstruments/rendering/renderablefov.cpp b/modules/spacecraftinstruments/rendering/renderablefov.cpp
index 4a9decccb9..5a8da0188c 100644
--- a/modules/spacecraftinstruments/rendering/renderablefov.cpp
+++ b/modules/spacecraftinstruments/rendering/renderablefov.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/spacecraftinstruments/rendering/renderablefov.h b/modules/spacecraftinstruments/rendering/renderablefov.h
index 46702e33a6..9c60b0d311 100644
--- a/modules/spacecraftinstruments/rendering/renderablefov.h
+++ b/modules/spacecraftinstruments/rendering/renderablefov.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/spacecraftinstruments/rendering/renderablemodelprojection.cpp b/modules/spacecraftinstruments/rendering/renderablemodelprojection.cpp
index d0b3657a5c..7f724cc3dc 100644
--- a/modules/spacecraftinstruments/rendering/renderablemodelprojection.cpp
+++ b/modules/spacecraftinstruments/rendering/renderablemodelprojection.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/spacecraftinstruments/rendering/renderablemodelprojection.h b/modules/spacecraftinstruments/rendering/renderablemodelprojection.h
index 5ef866bb5b..7549284b39 100644
--- a/modules/spacecraftinstruments/rendering/renderablemodelprojection.h
+++ b/modules/spacecraftinstruments/rendering/renderablemodelprojection.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/spacecraftinstruments/rendering/renderableplaneprojection.cpp b/modules/spacecraftinstruments/rendering/renderableplaneprojection.cpp
index 862d38db3b..47cf8125cc 100644
--- a/modules/spacecraftinstruments/rendering/renderableplaneprojection.cpp
+++ b/modules/spacecraftinstruments/rendering/renderableplaneprojection.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/spacecraftinstruments/rendering/renderableplaneprojection.h b/modules/spacecraftinstruments/rendering/renderableplaneprojection.h
index 6a33874f7b..3ef58be89a 100644
--- a/modules/spacecraftinstruments/rendering/renderableplaneprojection.h
+++ b/modules/spacecraftinstruments/rendering/renderableplaneprojection.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/spacecraftinstruments/rendering/renderableplanetprojection.cpp b/modules/spacecraftinstruments/rendering/renderableplanetprojection.cpp
index 22b8e9f6bf..d4e185c243 100644
--- a/modules/spacecraftinstruments/rendering/renderableplanetprojection.cpp
+++ b/modules/spacecraftinstruments/rendering/renderableplanetprojection.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/spacecraftinstruments/rendering/renderableplanetprojection.h b/modules/spacecraftinstruments/rendering/renderableplanetprojection.h
index 12fdfc7d6f..dbc7e7af8a 100644
--- a/modules/spacecraftinstruments/rendering/renderableplanetprojection.h
+++ b/modules/spacecraftinstruments/rendering/renderableplanetprojection.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/spacecraftinstruments/rendering/renderableshadowcylinder.cpp b/modules/spacecraftinstruments/rendering/renderableshadowcylinder.cpp
index 1a51c8abf7..fc8737ce5a 100644
--- a/modules/spacecraftinstruments/rendering/renderableshadowcylinder.cpp
+++ b/modules/spacecraftinstruments/rendering/renderableshadowcylinder.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/spacecraftinstruments/rendering/renderableshadowcylinder.h b/modules/spacecraftinstruments/rendering/renderableshadowcylinder.h
index bc6d641d1d..c400abfc2f 100644
--- a/modules/spacecraftinstruments/rendering/renderableshadowcylinder.h
+++ b/modules/spacecraftinstruments/rendering/renderableshadowcylinder.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/spacecraftinstruments/shaders/crawlingline_fs.glsl b/modules/spacecraftinstruments/shaders/crawlingline_fs.glsl
index 4ad4f35dda..30a63aa132 100644
--- a/modules/spacecraftinstruments/shaders/crawlingline_fs.glsl
+++ b/modules/spacecraftinstruments/shaders/crawlingline_fs.glsl
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/spacecraftinstruments/shaders/crawlingline_vs.glsl b/modules/spacecraftinstruments/shaders/crawlingline_vs.glsl
index 1f5d8e42f2..a246ef548c 100644
--- a/modules/spacecraftinstruments/shaders/crawlingline_vs.glsl
+++ b/modules/spacecraftinstruments/shaders/crawlingline_vs.glsl
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/spacecraftinstruments/shaders/dilation_fs.glsl b/modules/spacecraftinstruments/shaders/dilation_fs.glsl
index 50f25efbe2..9cc930babd 100644
--- a/modules/spacecraftinstruments/shaders/dilation_fs.glsl
+++ b/modules/spacecraftinstruments/shaders/dilation_fs.glsl
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/spacecraftinstruments/shaders/dilation_vs.glsl b/modules/spacecraftinstruments/shaders/dilation_vs.glsl
index 6595d2ff81..0ffec9df91 100644
--- a/modules/spacecraftinstruments/shaders/dilation_vs.glsl
+++ b/modules/spacecraftinstruments/shaders/dilation_vs.glsl
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/spacecraftinstruments/shaders/fov_fs.glsl b/modules/spacecraftinstruments/shaders/fov_fs.glsl
index 80ac3e203d..38aa9f0f99 100644
--- a/modules/spacecraftinstruments/shaders/fov_fs.glsl
+++ b/modules/spacecraftinstruments/shaders/fov_fs.glsl
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/spacecraftinstruments/shaders/fov_vs.glsl b/modules/spacecraftinstruments/shaders/fov_vs.glsl
index 2788f07adc..bebb873b43 100644
--- a/modules/spacecraftinstruments/shaders/fov_vs.glsl
+++ b/modules/spacecraftinstruments/shaders/fov_vs.glsl
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/spacecraftinstruments/shaders/renderableModelDepth_fs.glsl b/modules/spacecraftinstruments/shaders/renderableModelDepth_fs.glsl
index 4441ed531e..da7e1ad143 100644
--- a/modules/spacecraftinstruments/shaders/renderableModelDepth_fs.glsl
+++ b/modules/spacecraftinstruments/shaders/renderableModelDepth_fs.glsl
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/spacecraftinstruments/shaders/renderableModelDepth_vs.glsl b/modules/spacecraftinstruments/shaders/renderableModelDepth_vs.glsl
index 5d6f8635e6..8f058337a4 100644
--- a/modules/spacecraftinstruments/shaders/renderableModelDepth_vs.glsl
+++ b/modules/spacecraftinstruments/shaders/renderableModelDepth_vs.glsl
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/spacecraftinstruments/shaders/renderableModelProjection_fs.glsl b/modules/spacecraftinstruments/shaders/renderableModelProjection_fs.glsl
index 885549b432..39f5954d4e 100644
--- a/modules/spacecraftinstruments/shaders/renderableModelProjection_fs.glsl
+++ b/modules/spacecraftinstruments/shaders/renderableModelProjection_fs.glsl
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/spacecraftinstruments/shaders/renderableModelProjection_vs.glsl b/modules/spacecraftinstruments/shaders/renderableModelProjection_vs.glsl
index fb112e8a4a..345595e1a9 100644
--- a/modules/spacecraftinstruments/shaders/renderableModelProjection_vs.glsl
+++ b/modules/spacecraftinstruments/shaders/renderableModelProjection_vs.glsl
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/spacecraftinstruments/shaders/renderableModel_fs.glsl b/modules/spacecraftinstruments/shaders/renderableModel_fs.glsl
index 42b4991828..e2b06e5eff 100644
--- a/modules/spacecraftinstruments/shaders/renderableModel_fs.glsl
+++ b/modules/spacecraftinstruments/shaders/renderableModel_fs.glsl
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/spacecraftinstruments/shaders/renderableModel_vs.glsl b/modules/spacecraftinstruments/shaders/renderableModel_vs.glsl
index 85db434343..6060823378 100644
--- a/modules/spacecraftinstruments/shaders/renderableModel_vs.glsl
+++ b/modules/spacecraftinstruments/shaders/renderableModel_vs.glsl
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/spacecraftinstruments/shaders/renderablePlanetProjection_fs.glsl b/modules/spacecraftinstruments/shaders/renderablePlanetProjection_fs.glsl
index ddc9d9e728..a447ff94bb 100644
--- a/modules/spacecraftinstruments/shaders/renderablePlanetProjection_fs.glsl
+++ b/modules/spacecraftinstruments/shaders/renderablePlanetProjection_fs.glsl
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/spacecraftinstruments/shaders/renderablePlanetProjection_vs.glsl b/modules/spacecraftinstruments/shaders/renderablePlanetProjection_vs.glsl
index ef472190af..944ff48088 100644
--- a/modules/spacecraftinstruments/shaders/renderablePlanetProjection_vs.glsl
+++ b/modules/spacecraftinstruments/shaders/renderablePlanetProjection_vs.glsl
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/spacecraftinstruments/shaders/renderablePlanet_fs.glsl b/modules/spacecraftinstruments/shaders/renderablePlanet_fs.glsl
index 20bd0c7e26..90b17c8059 100644
--- a/modules/spacecraftinstruments/shaders/renderablePlanet_fs.glsl
+++ b/modules/spacecraftinstruments/shaders/renderablePlanet_fs.glsl
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/spacecraftinstruments/shaders/renderablePlanet_vs.glsl b/modules/spacecraftinstruments/shaders/renderablePlanet_vs.glsl
index 2d21045b25..7dd0156dd3 100644
--- a/modules/spacecraftinstruments/shaders/renderablePlanet_vs.glsl
+++ b/modules/spacecraftinstruments/shaders/renderablePlanet_vs.glsl
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/spacecraftinstruments/shaders/terminatorshadow_fs.glsl b/modules/spacecraftinstruments/shaders/terminatorshadow_fs.glsl
index de2b879095..1dad0954cf 100644
--- a/modules/spacecraftinstruments/shaders/terminatorshadow_fs.glsl
+++ b/modules/spacecraftinstruments/shaders/terminatorshadow_fs.glsl
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/spacecraftinstruments/shaders/terminatorshadow_vs.glsl b/modules/spacecraftinstruments/shaders/terminatorshadow_vs.glsl
index c082ccde83..b22b41432a 100644
--- a/modules/spacecraftinstruments/shaders/terminatorshadow_vs.glsl
+++ b/modules/spacecraftinstruments/shaders/terminatorshadow_vs.glsl
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/spacecraftinstruments/spacecraftinstrumentsmodule.cpp b/modules/spacecraftinstruments/spacecraftinstrumentsmodule.cpp
index 34ed44b2b3..9addf166b4 100644
--- a/modules/spacecraftinstruments/spacecraftinstrumentsmodule.cpp
+++ b/modules/spacecraftinstruments/spacecraftinstrumentsmodule.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/spacecraftinstruments/spacecraftinstrumentsmodule.h b/modules/spacecraftinstruments/spacecraftinstrumentsmodule.h
index fd252080ba..0beaa98d36 100644
--- a/modules/spacecraftinstruments/spacecraftinstrumentsmodule.h
+++ b/modules/spacecraftinstruments/spacecraftinstrumentsmodule.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/spacecraftinstruments/util/decoder.cpp b/modules/spacecraftinstruments/util/decoder.cpp
index 432a11149b..2513eecfe7 100644
--- a/modules/spacecraftinstruments/util/decoder.cpp
+++ b/modules/spacecraftinstruments/util/decoder.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/spacecraftinstruments/util/decoder.h b/modules/spacecraftinstruments/util/decoder.h
index d5228bfa1e..1a94e0bd7c 100644
--- a/modules/spacecraftinstruments/util/decoder.h
+++ b/modules/spacecraftinstruments/util/decoder.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/spacecraftinstruments/util/hongkangparser.cpp b/modules/spacecraftinstruments/util/hongkangparser.cpp
index ee21d3269e..05f1f0ba2d 100644
--- a/modules/spacecraftinstruments/util/hongkangparser.cpp
+++ b/modules/spacecraftinstruments/util/hongkangparser.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/spacecraftinstruments/util/hongkangparser.h b/modules/spacecraftinstruments/util/hongkangparser.h
index 2bbe754efd..066c101c48 100644
--- a/modules/spacecraftinstruments/util/hongkangparser.h
+++ b/modules/spacecraftinstruments/util/hongkangparser.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/spacecraftinstruments/util/image.h b/modules/spacecraftinstruments/util/image.h
index 92169c0458..022f9aecbc 100644
--- a/modules/spacecraftinstruments/util/image.h
+++ b/modules/spacecraftinstruments/util/image.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/spacecraftinstruments/util/imagesequencer.cpp b/modules/spacecraftinstruments/util/imagesequencer.cpp
index 5bb97c6e90..9abe706c89 100644
--- a/modules/spacecraftinstruments/util/imagesequencer.cpp
+++ b/modules/spacecraftinstruments/util/imagesequencer.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/spacecraftinstruments/util/imagesequencer.h b/modules/spacecraftinstruments/util/imagesequencer.h
index d7b4799335..da221d2182 100644
--- a/modules/spacecraftinstruments/util/imagesequencer.h
+++ b/modules/spacecraftinstruments/util/imagesequencer.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/spacecraftinstruments/util/instrumentdecoder.cpp b/modules/spacecraftinstruments/util/instrumentdecoder.cpp
index 494d38a714..eda8341fac 100644
--- a/modules/spacecraftinstruments/util/instrumentdecoder.cpp
+++ b/modules/spacecraftinstruments/util/instrumentdecoder.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/spacecraftinstruments/util/instrumentdecoder.h b/modules/spacecraftinstruments/util/instrumentdecoder.h
index 2dbcb5c905..e7a40d3989 100644
--- a/modules/spacecraftinstruments/util/instrumentdecoder.h
+++ b/modules/spacecraftinstruments/util/instrumentdecoder.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/spacecraftinstruments/util/instrumenttimesparser.cpp b/modules/spacecraftinstruments/util/instrumenttimesparser.cpp
index b28cfc23f8..18077e9195 100644
--- a/modules/spacecraftinstruments/util/instrumenttimesparser.cpp
+++ b/modules/spacecraftinstruments/util/instrumenttimesparser.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/spacecraftinstruments/util/instrumenttimesparser.h b/modules/spacecraftinstruments/util/instrumenttimesparser.h
index 2667e01573..ac62db895b 100644
--- a/modules/spacecraftinstruments/util/instrumenttimesparser.h
+++ b/modules/spacecraftinstruments/util/instrumenttimesparser.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/spacecraftinstruments/util/labelparser.cpp b/modules/spacecraftinstruments/util/labelparser.cpp
index 1fd93bd8d5..9301a5fb15 100644
--- a/modules/spacecraftinstruments/util/labelparser.cpp
+++ b/modules/spacecraftinstruments/util/labelparser.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/spacecraftinstruments/util/labelparser.h b/modules/spacecraftinstruments/util/labelparser.h
index f17d8fc1a4..e59c3df7e5 100644
--- a/modules/spacecraftinstruments/util/labelparser.h
+++ b/modules/spacecraftinstruments/util/labelparser.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/spacecraftinstruments/util/projectioncomponent.cpp b/modules/spacecraftinstruments/util/projectioncomponent.cpp
index 78458622c7..b9840d14f8 100644
--- a/modules/spacecraftinstruments/util/projectioncomponent.cpp
+++ b/modules/spacecraftinstruments/util/projectioncomponent.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/spacecraftinstruments/util/projectioncomponent.h b/modules/spacecraftinstruments/util/projectioncomponent.h
index 0681d9330f..0de6753ef9 100644
--- a/modules/spacecraftinstruments/util/projectioncomponent.h
+++ b/modules/spacecraftinstruments/util/projectioncomponent.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/spacecraftinstruments/util/scannerdecoder.cpp b/modules/spacecraftinstruments/util/scannerdecoder.cpp
index 138867afea..d08cf21ba9 100644
--- a/modules/spacecraftinstruments/util/scannerdecoder.cpp
+++ b/modules/spacecraftinstruments/util/scannerdecoder.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/spacecraftinstruments/util/scannerdecoder.h b/modules/spacecraftinstruments/util/scannerdecoder.h
index adeb000c69..6c8d97a0ec 100644
--- a/modules/spacecraftinstruments/util/scannerdecoder.h
+++ b/modules/spacecraftinstruments/util/scannerdecoder.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/spacecraftinstruments/util/sequenceparser.cpp b/modules/spacecraftinstruments/util/sequenceparser.cpp
index 1683396e88..95176f19ef 100644
--- a/modules/spacecraftinstruments/util/sequenceparser.cpp
+++ b/modules/spacecraftinstruments/util/sequenceparser.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/spacecraftinstruments/util/sequenceparser.h b/modules/spacecraftinstruments/util/sequenceparser.h
index 8cbd5fa917..af4b54dc92 100644
--- a/modules/spacecraftinstruments/util/sequenceparser.h
+++ b/modules/spacecraftinstruments/util/sequenceparser.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/spacecraftinstruments/util/targetdecoder.cpp b/modules/spacecraftinstruments/util/targetdecoder.cpp
index 8f2747bdd8..eb819af446 100644
--- a/modules/spacecraftinstruments/util/targetdecoder.cpp
+++ b/modules/spacecraftinstruments/util/targetdecoder.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/spacecraftinstruments/util/targetdecoder.h b/modules/spacecraftinstruments/util/targetdecoder.h
index bc84a5c135..b76fa681b0 100644
--- a/modules/spacecraftinstruments/util/targetdecoder.h
+++ b/modules/spacecraftinstruments/util/targetdecoder.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/spout/CMakeLists.txt b/modules/spout/CMakeLists.txt
index 78fcac90f6..b707507a49 100644
--- a/modules/spout/CMakeLists.txt
+++ b/modules/spout/CMakeLists.txt
@@ -2,7 +2,7 @@
 #                                                                                        #
 # OpenSpace                                                                              #
 #                                                                                        #
-# Copyright (c) 2014-2024                                                                #
+# Copyright (c) 2014-2025                                                                #
 #                                                                                        #
 # Permission is hereby granted, free of charge, to any person obtaining a copy of this   #
 # software and associated documentation files (the "Software"), to deal in the Software  #
diff --git a/modules/spout/renderableplanespout.cpp b/modules/spout/renderableplanespout.cpp
index d70c555d09..7f7b5d920e 100644
--- a/modules/spout/renderableplanespout.cpp
+++ b/modules/spout/renderableplanespout.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/spout/renderableplanespout.h b/modules/spout/renderableplanespout.h
index 7f6ab5c95f..90b1c5c9f7 100644
--- a/modules/spout/renderableplanespout.h
+++ b/modules/spout/renderableplanespout.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/spout/renderablespherespout.cpp b/modules/spout/renderablespherespout.cpp
index 002be2e603..4ff41950c7 100644
--- a/modules/spout/renderablespherespout.cpp
+++ b/modules/spout/renderablespherespout.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/spout/renderablespherespout.h b/modules/spout/renderablespherespout.h
index a871f6127a..d6433065c9 100644
--- a/modules/spout/renderablespherespout.h
+++ b/modules/spout/renderablespherespout.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/spout/screenspacespout.cpp b/modules/spout/screenspacespout.cpp
index a587ef2fae..f7ecd690e0 100644
--- a/modules/spout/screenspacespout.cpp
+++ b/modules/spout/screenspacespout.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/spout/screenspacespout.h b/modules/spout/screenspacespout.h
index 1ec5c5427e..6fa6edb909 100644
--- a/modules/spout/screenspacespout.h
+++ b/modules/spout/screenspacespout.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/spout/spoutlibrary.h b/modules/spout/spoutlibrary.h
index b8937cef3f..30fff44645 100644
--- a/modules/spout/spoutlibrary.h
+++ b/modules/spout/spoutlibrary.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/spout/spoutmodule.cpp b/modules/spout/spoutmodule.cpp
index 972de87bd1..085d1f56ee 100644
--- a/modules/spout/spoutmodule.cpp
+++ b/modules/spout/spoutmodule.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/spout/spoutmodule.h b/modules/spout/spoutmodule.h
index c89d48df26..fee5d069da 100644
--- a/modules/spout/spoutmodule.h
+++ b/modules/spout/spoutmodule.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/spout/spoutwrapper.cpp b/modules/spout/spoutwrapper.cpp
index 2a7dec7016..273e673edf 100644
--- a/modules/spout/spoutwrapper.cpp
+++ b/modules/spout/spoutwrapper.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/spout/spoutwrapper.h b/modules/spout/spoutwrapper.h
index 598b521bb5..c8ac25a2bb 100644
--- a/modules/spout/spoutwrapper.h
+++ b/modules/spout/spoutwrapper.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/statemachine/CMakeLists.txt b/modules/statemachine/CMakeLists.txt
index cc60bd2089..51973e6eba 100644
--- a/modules/statemachine/CMakeLists.txt
+++ b/modules/statemachine/CMakeLists.txt
@@ -2,7 +2,7 @@
 #                                                                                        #
 # OpenSpace                                                                              #
 #                                                                                        #
-# Copyright (c) 2014-2024                                                                #
+# Copyright (c) 2014-2025                                                                #
 #                                                                                        #
 # Permission is hereby granted, free of charge, to any person obtaining a copy of this   #
 # software and associated documentation files (the "Software"), to deal in the Software  #
diff --git a/modules/statemachine/include/state.h b/modules/statemachine/include/state.h
index abf4fd7e8e..a4cd2c7519 100644
--- a/modules/statemachine/include/state.h
+++ b/modules/statemachine/include/state.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/statemachine/include/statemachine.h b/modules/statemachine/include/statemachine.h
index 18d7f725f1..ca5bc94253 100644
--- a/modules/statemachine/include/statemachine.h
+++ b/modules/statemachine/include/statemachine.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/statemachine/include/transition.h b/modules/statemachine/include/transition.h
index 812bede803..f261b53435 100644
--- a/modules/statemachine/include/transition.h
+++ b/modules/statemachine/include/transition.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/statemachine/src/state.cpp b/modules/statemachine/src/state.cpp
index 36b4021433..ce7c8eb694 100644
--- a/modules/statemachine/src/state.cpp
+++ b/modules/statemachine/src/state.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/statemachine/src/statemachine.cpp b/modules/statemachine/src/statemachine.cpp
index 9c1dbe4f64..772b2bacda 100644
--- a/modules/statemachine/src/statemachine.cpp
+++ b/modules/statemachine/src/statemachine.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/statemachine/src/transition.cpp b/modules/statemachine/src/transition.cpp
index bcdc739a8e..def576efcb 100644
--- a/modules/statemachine/src/transition.cpp
+++ b/modules/statemachine/src/transition.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/statemachine/statemachinemodule.cpp b/modules/statemachine/statemachinemodule.cpp
index 356c3775c6..0a782f1f93 100644
--- a/modules/statemachine/statemachinemodule.cpp
+++ b/modules/statemachine/statemachinemodule.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/statemachine/statemachinemodule.h b/modules/statemachine/statemachinemodule.h
index dfb45d81df..31ad618fe2 100644
--- a/modules/statemachine/statemachinemodule.h
+++ b/modules/statemachine/statemachinemodule.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/statemachine/statemachinemodule_lua.inl b/modules/statemachine/statemachinemodule_lua.inl
index 6672835113..660b94aab5 100644
--- a/modules/statemachine/statemachinemodule_lua.inl
+++ b/modules/statemachine/statemachinemodule_lua.inl
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/sync/CMakeLists.txt b/modules/sync/CMakeLists.txt
index 18b7e60c63..4ef8cba109 100644
--- a/modules/sync/CMakeLists.txt
+++ b/modules/sync/CMakeLists.txt
@@ -2,7 +2,7 @@
 #                                                                                        #
 # OpenSpace                                                                              #
 #                                                                                        #
-# Copyright (c) 2014-2024                                                                #
+# Copyright (c) 2014-2025                                                                #
 #                                                                                        #
 # Permission is hereby granted, free of charge, to any person obtaining a copy of this   #
 # software and associated documentation files (the "Software"), to deal in the Software  #
diff --git a/modules/sync/syncmodule.cpp b/modules/sync/syncmodule.cpp
index e4e128b826..8b849c8b91 100644
--- a/modules/sync/syncmodule.cpp
+++ b/modules/sync/syncmodule.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/sync/syncmodule.h b/modules/sync/syncmodule.h
index b9ea6c5bc2..231e31c0cb 100644
--- a/modules/sync/syncmodule.h
+++ b/modules/sync/syncmodule.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/sync/syncmodule_lua.inl b/modules/sync/syncmodule_lua.inl
index 3bf3421faa..565fdfdfc3 100644
--- a/modules/sync/syncmodule_lua.inl
+++ b/modules/sync/syncmodule_lua.inl
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/sync/syncs/httpsynchronization.cpp b/modules/sync/syncs/httpsynchronization.cpp
index b42a4481d5..bf0a6ffbfc 100644
--- a/modules/sync/syncs/httpsynchronization.cpp
+++ b/modules/sync/syncs/httpsynchronization.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/sync/syncs/httpsynchronization.h b/modules/sync/syncs/httpsynchronization.h
index 9f626fe31b..0c196bd503 100644
--- a/modules/sync/syncs/httpsynchronization.h
+++ b/modules/sync/syncs/httpsynchronization.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/sync/syncs/urlsynchronization.cpp b/modules/sync/syncs/urlsynchronization.cpp
index 78572fc5fa..9583f39dc3 100644
--- a/modules/sync/syncs/urlsynchronization.cpp
+++ b/modules/sync/syncs/urlsynchronization.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/sync/syncs/urlsynchronization.h b/modules/sync/syncs/urlsynchronization.h
index 0128af6933..b86310d699 100644
--- a/modules/sync/syncs/urlsynchronization.h
+++ b/modules/sync/syncs/urlsynchronization.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/touch/CMakeLists.txt b/modules/touch/CMakeLists.txt
index 9ad65d48eb..c5ac89d402 100644
--- a/modules/touch/CMakeLists.txt
+++ b/modules/touch/CMakeLists.txt
@@ -2,7 +2,7 @@
 #                                                                                        #
 # OpenSpace                                                                              #
 #                                                                                        #
-# Copyright (c) 2014-2024                                                                #
+# Copyright (c) 2014-2025                                                                #
 #                                                                                        #
 # Permission is hereby granted, free of charge, to any person obtaining a copy of this   #
 # software and associated documentation files (the "Software"), to deal in the Software  #
diff --git a/modules/touch/ext/CMakeLists.txt b/modules/touch/ext/CMakeLists.txt
index 78f58433ca..1bf332f9aa 100644
--- a/modules/touch/ext/CMakeLists.txt
+++ b/modules/touch/ext/CMakeLists.txt
@@ -2,7 +2,7 @@
 #                                                                                        #
 # OpenSpace                                                                              #
 #                                                                                        #
-# Copyright (c) 2014-2024                                                                #
+# Copyright (c) 2014-2025                                                                #
 #                                                                                        #
 # Permission is hereby granted, free of charge, to any person obtaining a copy of this   #
 # software and associated documentation files (the "Software"), to deal in the Software  #
diff --git a/modules/touch/include/directinputsolver.h b/modules/touch/include/directinputsolver.h
index d736253f27..615d36e770 100644
--- a/modules/touch/include/directinputsolver.h
+++ b/modules/touch/include/directinputsolver.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/touch/include/touchinteraction.h b/modules/touch/include/touchinteraction.h
index a782850b42..67722fdb11 100644
--- a/modules/touch/include/touchinteraction.h
+++ b/modules/touch/include/touchinteraction.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/touch/include/touchmarker.h b/modules/touch/include/touchmarker.h
index 1b2f85fd75..6508e8bd80 100644
--- a/modules/touch/include/touchmarker.h
+++ b/modules/touch/include/touchmarker.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/touch/include/tuioear.h b/modules/touch/include/tuioear.h
index 677a945704..f7b5441a44 100644
--- a/modules/touch/include/tuioear.h
+++ b/modules/touch/include/tuioear.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/touch/include/win32_touch.h b/modules/touch/include/win32_touch.h
index 986c8d7af4..93e3cd9024 100644
--- a/modules/touch/include/win32_touch.h
+++ b/modules/touch/include/win32_touch.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/touch/shaders/marker_fs.glsl b/modules/touch/shaders/marker_fs.glsl
index 50f5cd32a3..2829e96f78 100644
--- a/modules/touch/shaders/marker_fs.glsl
+++ b/modules/touch/shaders/marker_fs.glsl
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/touch/shaders/marker_vs.glsl b/modules/touch/shaders/marker_vs.glsl
index dfe9ec457b..f3b14b6bbd 100644
--- a/modules/touch/shaders/marker_vs.glsl
+++ b/modules/touch/shaders/marker_vs.glsl
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/touch/src/directinputsolver.cpp b/modules/touch/src/directinputsolver.cpp
index 0352438163..fd4d0fc2f2 100644
--- a/modules/touch/src/directinputsolver.cpp
+++ b/modules/touch/src/directinputsolver.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/touch/src/touchinteraction.cpp b/modules/touch/src/touchinteraction.cpp
index 23649c7b5e..af291394e4 100644
--- a/modules/touch/src/touchinteraction.cpp
+++ b/modules/touch/src/touchinteraction.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/touch/src/touchmarker.cpp b/modules/touch/src/touchmarker.cpp
index 5863efed3f..9afc508aa3 100644
--- a/modules/touch/src/touchmarker.cpp
+++ b/modules/touch/src/touchmarker.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/touch/src/tuioear.cpp b/modules/touch/src/tuioear.cpp
index f5f715d118..e077f3a98a 100644
--- a/modules/touch/src/tuioear.cpp
+++ b/modules/touch/src/tuioear.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/touch/src/win32_touch.cpp b/modules/touch/src/win32_touch.cpp
index 06dff64ab9..cd97a14861 100644
--- a/modules/touch/src/win32_touch.cpp
+++ b/modules/touch/src/win32_touch.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/touch/touchmodule.cpp b/modules/touch/touchmodule.cpp
index 0761db66ac..0be504f2b0 100644
--- a/modules/touch/touchmodule.cpp
+++ b/modules/touch/touchmodule.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/touch/touchmodule.h b/modules/touch/touchmodule.h
index cb39dbc460..67367034ca 100644
--- a/modules/touch/touchmodule.h
+++ b/modules/touch/touchmodule.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/toyvolume/CMakeLists.txt b/modules/toyvolume/CMakeLists.txt
index 7e901c6840..c783fd7cc4 100644
--- a/modules/toyvolume/CMakeLists.txt
+++ b/modules/toyvolume/CMakeLists.txt
@@ -2,7 +2,7 @@
 #                                                                                        #
 # OpenSpace                                                                              #
 #                                                                                        #
-# Copyright (c) 2014-2024                                                                #
+# Copyright (c) 2014-2025                                                                #
 #                                                                                        #
 # Permission is hereby granted, free of charge, to any person obtaining a copy of this   #
 # software and associated documentation files (the "Software"), to deal in the Software  #
diff --git a/modules/toyvolume/rendering/renderabletoyvolume.cpp b/modules/toyvolume/rendering/renderabletoyvolume.cpp
index 3755f9f03a..55a5c3f899 100644
--- a/modules/toyvolume/rendering/renderabletoyvolume.cpp
+++ b/modules/toyvolume/rendering/renderabletoyvolume.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/toyvolume/rendering/renderabletoyvolume.h b/modules/toyvolume/rendering/renderabletoyvolume.h
index 38c659528a..0509606395 100644
--- a/modules/toyvolume/rendering/renderabletoyvolume.h
+++ b/modules/toyvolume/rendering/renderabletoyvolume.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/toyvolume/rendering/toyvolumeraycaster.cpp b/modules/toyvolume/rendering/toyvolumeraycaster.cpp
index 16b4c79804..7acd30a4d4 100644
--- a/modules/toyvolume/rendering/toyvolumeraycaster.cpp
+++ b/modules/toyvolume/rendering/toyvolumeraycaster.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/toyvolume/rendering/toyvolumeraycaster.h b/modules/toyvolume/rendering/toyvolumeraycaster.h
index f980300e05..c50a5dd4bc 100644
--- a/modules/toyvolume/rendering/toyvolumeraycaster.h
+++ b/modules/toyvolume/rendering/toyvolumeraycaster.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/toyvolume/shaders/bounds_fs.glsl b/modules/toyvolume/shaders/bounds_fs.glsl
index 4e7ba29ec7..b376b0f448 100644
--- a/modules/toyvolume/shaders/bounds_fs.glsl
+++ b/modules/toyvolume/shaders/bounds_fs.glsl
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/toyvolume/shaders/bounds_vs.glsl b/modules/toyvolume/shaders/bounds_vs.glsl
index d71f5ae081..497501dd49 100644
--- a/modules/toyvolume/shaders/bounds_vs.glsl
+++ b/modules/toyvolume/shaders/bounds_vs.glsl
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/toyvolume/shaders/raycast.glsl b/modules/toyvolume/shaders/raycast.glsl
index c7ac37c3d9..a103306751 100644
--- a/modules/toyvolume/shaders/raycast.glsl
+++ b/modules/toyvolume/shaders/raycast.glsl
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/toyvolume/toyvolumemodule.cpp b/modules/toyvolume/toyvolumemodule.cpp
index 6a4b0720a4..f6d90fbdb0 100644
--- a/modules/toyvolume/toyvolumemodule.cpp
+++ b/modules/toyvolume/toyvolumemodule.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/toyvolume/toyvolumemodule.h b/modules/toyvolume/toyvolumemodule.h
index 335ec803b7..ba47b4894e 100644
--- a/modules/toyvolume/toyvolumemodule.h
+++ b/modules/toyvolume/toyvolumemodule.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/video/CMakeLists.txt b/modules/video/CMakeLists.txt
index b1da87faf3..609f1cf623 100644
--- a/modules/video/CMakeLists.txt
+++ b/modules/video/CMakeLists.txt
@@ -2,7 +2,7 @@
 #                                                                                        #
 # OpenSpace                                                                              #
 #                                                                                        #
-# Copyright (c) 2014-2024                                                                #
+# Copyright (c) 2014-2025                                                                #
 #                                                                                        #
 # Permission is hereby granted, free of charge, to any person obtaining a copy of this   #
 # software and associated documentation files (the "Software"), to deal in the Software  #
diff --git a/modules/video/include/renderablevideoplane.h b/modules/video/include/renderablevideoplane.h
index 442bafd7cd..61dccc80d0 100644
--- a/modules/video/include/renderablevideoplane.h
+++ b/modules/video/include/renderablevideoplane.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/video/include/renderablevideosphere.h b/modules/video/include/renderablevideosphere.h
index c25531f446..e6819ca9d4 100644
--- a/modules/video/include/renderablevideosphere.h
+++ b/modules/video/include/renderablevideosphere.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/video/include/screenspacevideo.h b/modules/video/include/screenspacevideo.h
index a11fa0ef54..3b61c6ba78 100644
--- a/modules/video/include/screenspacevideo.h
+++ b/modules/video/include/screenspacevideo.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/video/include/videoplayer.h b/modules/video/include/videoplayer.h
index bc239f4d56..eae37aca2b 100644
--- a/modules/video/include/videoplayer.h
+++ b/modules/video/include/videoplayer.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/video/include/videotileprovider.h b/modules/video/include/videotileprovider.h
index c36fb3f406..25b5e812e6 100644
--- a/modules/video/include/videotileprovider.h
+++ b/modules/video/include/videotileprovider.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/video/src/renderablevideoplane.cpp b/modules/video/src/renderablevideoplane.cpp
index fd399eacb3..43f9b73928 100644
--- a/modules/video/src/renderablevideoplane.cpp
+++ b/modules/video/src/renderablevideoplane.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/video/src/renderablevideosphere.cpp b/modules/video/src/renderablevideosphere.cpp
index 4aa9244af2..e17b0fcc76 100644
--- a/modules/video/src/renderablevideosphere.cpp
+++ b/modules/video/src/renderablevideosphere.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/video/src/screenspacevideo.cpp b/modules/video/src/screenspacevideo.cpp
index 5e1590dab8..325ebb45e0 100644
--- a/modules/video/src/screenspacevideo.cpp
+++ b/modules/video/src/screenspacevideo.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/video/src/videoplayer.cpp b/modules/video/src/videoplayer.cpp
index ddc0708e9d..e72c3d4938 100644
--- a/modules/video/src/videoplayer.cpp
+++ b/modules/video/src/videoplayer.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/video/src/videotileprovider.cpp b/modules/video/src/videotileprovider.cpp
index 6c290f9456..bafe84aedc 100644
--- a/modules/video/src/videotileprovider.cpp
+++ b/modules/video/src/videotileprovider.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/video/videomodule.cpp b/modules/video/videomodule.cpp
index d30c93740e..d604c9755f 100644
--- a/modules/video/videomodule.cpp
+++ b/modules/video/videomodule.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/video/videomodule.h b/modules/video/videomodule.h
index 198dfae3b1..b72dd16c80 100644
--- a/modules/video/videomodule.h
+++ b/modules/video/videomodule.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/vislab/CMakeLists.txt b/modules/vislab/CMakeLists.txt
index 32e5457636..adf95601e7 100644
--- a/modules/vislab/CMakeLists.txt
+++ b/modules/vislab/CMakeLists.txt
@@ -2,7 +2,7 @@
 #                                                                                        #
 # OpenSpace                                                                              #
 #                                                                                        #
-# Copyright (c) 2014-2024                                                                #
+# Copyright (c) 2014-2025                                                                #
 #                                                                                        #
 # Permission is hereby granted, free of charge, to any person obtaining a copy of this   #
 # software and associated documentation files (the "Software"), to deal in the Software  #
diff --git a/modules/vislab/rendering/renderabledistancelabel.cpp b/modules/vislab/rendering/renderabledistancelabel.cpp
index f7f94dd592..9a49becdf1 100644
--- a/modules/vislab/rendering/renderabledistancelabel.cpp
+++ b/modules/vislab/rendering/renderabledistancelabel.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/vislab/rendering/renderabledistancelabel.h b/modules/vislab/rendering/renderabledistancelabel.h
index 14d611fbbf..7bd48d8fa3 100644
--- a/modules/vislab/rendering/renderabledistancelabel.h
+++ b/modules/vislab/rendering/renderabledistancelabel.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/vislab/vislabmodule.cpp b/modules/vislab/vislabmodule.cpp
index 8be4a0716d..d1f6a1b43c 100644
--- a/modules/vislab/vislabmodule.cpp
+++ b/modules/vislab/vislabmodule.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/vislab/vislabmodule.h b/modules/vislab/vislabmodule.h
index 0ece19b840..48829ca8cc 100644
--- a/modules/vislab/vislabmodule.h
+++ b/modules/vislab/vislabmodule.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/volume/CMakeLists.txt b/modules/volume/CMakeLists.txt
index 4a7fdf6941..7fe70d9b27 100644
--- a/modules/volume/CMakeLists.txt
+++ b/modules/volume/CMakeLists.txt
@@ -2,7 +2,7 @@
 #                                                                                        #
 # OpenSpace                                                                              #
 #                                                                                        #
-# Copyright (c) 2014-2024                                                                #
+# Copyright (c) 2014-2025                                                                #
 #                                                                                        #
 # Permission is hereby granted, free of charge, to any person obtaining a copy of this   #
 # software and associated documentation files (the "Software"), to deal in the Software  #
diff --git a/modules/volume/envelope.cpp b/modules/volume/envelope.cpp
index 31cedf7995..7bb89ad003 100644
--- a/modules/volume/envelope.cpp
+++ b/modules/volume/envelope.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/volume/envelope.h b/modules/volume/envelope.h
index 4723630cc4..ec1b598c77 100644
--- a/modules/volume/envelope.h
+++ b/modules/volume/envelope.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/volume/linearlrucache.h b/modules/volume/linearlrucache.h
index 42cae88998..854329857d 100644
--- a/modules/volume/linearlrucache.h
+++ b/modules/volume/linearlrucache.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/volume/linearlrucache.inl b/modules/volume/linearlrucache.inl
index 302a5b8cf0..4ac087c1a6 100644
--- a/modules/volume/linearlrucache.inl
+++ b/modules/volume/linearlrucache.inl
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/volume/lrucache.h b/modules/volume/lrucache.h
index 363d593b3b..21cc6dd59a 100644
--- a/modules/volume/lrucache.h
+++ b/modules/volume/lrucache.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/volume/lrucache.inl b/modules/volume/lrucache.inl
index 81d1d69798..d9d04c0589 100644
--- a/modules/volume/lrucache.inl
+++ b/modules/volume/lrucache.inl
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/volume/rawvolume.h b/modules/volume/rawvolume.h
index b159a61cee..cbfcf658c1 100644
--- a/modules/volume/rawvolume.h
+++ b/modules/volume/rawvolume.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/volume/rawvolume.inl b/modules/volume/rawvolume.inl
index 8dca905d95..703c712db2 100644
--- a/modules/volume/rawvolume.inl
+++ b/modules/volume/rawvolume.inl
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/volume/rawvolumemetadata.cpp b/modules/volume/rawvolumemetadata.cpp
index 27e93726c0..5c27460f85 100644
--- a/modules/volume/rawvolumemetadata.cpp
+++ b/modules/volume/rawvolumemetadata.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/volume/rawvolumemetadata.h b/modules/volume/rawvolumemetadata.h
index 77edffd1e8..1a0af13b5e 100644
--- a/modules/volume/rawvolumemetadata.h
+++ b/modules/volume/rawvolumemetadata.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/volume/rawvolumereader.h b/modules/volume/rawvolumereader.h
index 02911944bf..c2af207af8 100644
--- a/modules/volume/rawvolumereader.h
+++ b/modules/volume/rawvolumereader.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/volume/rawvolumereader.inl b/modules/volume/rawvolumereader.inl
index 2e0113803e..b9c04199c2 100644
--- a/modules/volume/rawvolumereader.inl
+++ b/modules/volume/rawvolumereader.inl
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/volume/rawvolumewriter.h b/modules/volume/rawvolumewriter.h
index 9d66a6c7c0..04f1cce1c1 100644
--- a/modules/volume/rawvolumewriter.h
+++ b/modules/volume/rawvolumewriter.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/volume/rawvolumewriter.inl b/modules/volume/rawvolumewriter.inl
index 54caacbd62..0aaebabbf3 100644
--- a/modules/volume/rawvolumewriter.inl
+++ b/modules/volume/rawvolumewriter.inl
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/volume/rendering/basicvolumeraycaster.cpp b/modules/volume/rendering/basicvolumeraycaster.cpp
index f8d7e5ced3..5548e48d3d 100644
--- a/modules/volume/rendering/basicvolumeraycaster.cpp
+++ b/modules/volume/rendering/basicvolumeraycaster.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/volume/rendering/basicvolumeraycaster.h b/modules/volume/rendering/basicvolumeraycaster.h
index 7fc60f5379..f68b79e17a 100644
--- a/modules/volume/rendering/basicvolumeraycaster.h
+++ b/modules/volume/rendering/basicvolumeraycaster.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/volume/rendering/renderabletimevaryingvolume.cpp b/modules/volume/rendering/renderabletimevaryingvolume.cpp
index e949f5a49d..e77feeeecf 100644
--- a/modules/volume/rendering/renderabletimevaryingvolume.cpp
+++ b/modules/volume/rendering/renderabletimevaryingvolume.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/volume/rendering/renderabletimevaryingvolume.h b/modules/volume/rendering/renderabletimevaryingvolume.h
index ecdd2be8f9..25c01b3548 100644
--- a/modules/volume/rendering/renderabletimevaryingvolume.h
+++ b/modules/volume/rendering/renderabletimevaryingvolume.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/volume/rendering/volumeclipplane.cpp b/modules/volume/rendering/volumeclipplane.cpp
index 64586eb688..73d1afcf68 100644
--- a/modules/volume/rendering/volumeclipplane.cpp
+++ b/modules/volume/rendering/volumeclipplane.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/volume/rendering/volumeclipplane.h b/modules/volume/rendering/volumeclipplane.h
index da4c964c5f..645aad16ea 100644
--- a/modules/volume/rendering/volumeclipplane.h
+++ b/modules/volume/rendering/volumeclipplane.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/volume/rendering/volumeclipplanes.cpp b/modules/volume/rendering/volumeclipplanes.cpp
index 689df97c6e..21a8721c69 100644
--- a/modules/volume/rendering/volumeclipplanes.cpp
+++ b/modules/volume/rendering/volumeclipplanes.cpp
@@ -3,7 +3,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/volume/rendering/volumeclipplanes.h b/modules/volume/rendering/volumeclipplanes.h
index bd7a3a12b0..7a83d6672a 100644
--- a/modules/volume/rendering/volumeclipplanes.h
+++ b/modules/volume/rendering/volumeclipplanes.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/volume/shaders/bounds_fs.glsl b/modules/volume/shaders/bounds_fs.glsl
index a762d77fa3..00326d4f35 100644
--- a/modules/volume/shaders/bounds_fs.glsl
+++ b/modules/volume/shaders/bounds_fs.glsl
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/volume/shaders/bounds_vs.glsl b/modules/volume/shaders/bounds_vs.glsl
index c101c3b173..b66a6aa18d 100644
--- a/modules/volume/shaders/bounds_vs.glsl
+++ b/modules/volume/shaders/bounds_vs.glsl
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/volume/shaders/helper.glsl b/modules/volume/shaders/helper.glsl
index 6f06befed3..ef4250c32a 100644
--- a/modules/volume/shaders/helper.glsl
+++ b/modules/volume/shaders/helper.glsl
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/volume/shaders/raycast.glsl b/modules/volume/shaders/raycast.glsl
index 4a1e046cf1..24780df093 100644
--- a/modules/volume/shaders/raycast.glsl
+++ b/modules/volume/shaders/raycast.glsl
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/volume/tasks/generaterawvolumefromfiletask.cpp b/modules/volume/tasks/generaterawvolumefromfiletask.cpp
index 5052a069be..fc30cd26d3 100644
--- a/modules/volume/tasks/generaterawvolumefromfiletask.cpp
+++ b/modules/volume/tasks/generaterawvolumefromfiletask.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/volume/tasks/generaterawvolumefromfiletask.h b/modules/volume/tasks/generaterawvolumefromfiletask.h
index 26b5b3e7a9..aa19b8041f 100644
--- a/modules/volume/tasks/generaterawvolumefromfiletask.h
+++ b/modules/volume/tasks/generaterawvolumefromfiletask.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/volume/tasks/generaterawvolumetask.cpp b/modules/volume/tasks/generaterawvolumetask.cpp
index 23685f6c07..eb2ee0a520 100644
--- a/modules/volume/tasks/generaterawvolumetask.cpp
+++ b/modules/volume/tasks/generaterawvolumetask.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/volume/tasks/generaterawvolumetask.h b/modules/volume/tasks/generaterawvolumetask.h
index 76337067e5..9886cdc995 100644
--- a/modules/volume/tasks/generaterawvolumetask.h
+++ b/modules/volume/tasks/generaterawvolumetask.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/volume/textureslicevolumereader.h b/modules/volume/textureslicevolumereader.h
index bb0cbf4fd0..6a5691f46a 100644
--- a/modules/volume/textureslicevolumereader.h
+++ b/modules/volume/textureslicevolumereader.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/volume/textureslicevolumereader.inl b/modules/volume/textureslicevolumereader.inl
index a82bcbca69..0128d63505 100644
--- a/modules/volume/textureslicevolumereader.inl
+++ b/modules/volume/textureslicevolumereader.inl
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/volume/transferfunction.cpp b/modules/volume/transferfunction.cpp
index 9c3bf02b83..8a464c0ae4 100644
--- a/modules/volume/transferfunction.cpp
+++ b/modules/volume/transferfunction.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/volume/transferfunction.h b/modules/volume/transferfunction.h
index 58a164e71d..12e7b5d7d3 100644
--- a/modules/volume/transferfunction.h
+++ b/modules/volume/transferfunction.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/volume/transferfunctionhandler.cpp b/modules/volume/transferfunctionhandler.cpp
index c0a5329414..4352cc7984 100644
--- a/modules/volume/transferfunctionhandler.cpp
+++ b/modules/volume/transferfunctionhandler.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/volume/transferfunctionhandler.h b/modules/volume/transferfunctionhandler.h
index 2259f30cc1..69f4d5181a 100644
--- a/modules/volume/transferfunctionhandler.h
+++ b/modules/volume/transferfunctionhandler.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/volume/transferfunctionproperty.cpp b/modules/volume/transferfunctionproperty.cpp
index feb288b63b..1371344b1b 100644
--- a/modules/volume/transferfunctionproperty.cpp
+++ b/modules/volume/transferfunctionproperty.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/volume/transferfunctionproperty.h b/modules/volume/transferfunctionproperty.h
index 6f44855544..931e670182 100644
--- a/modules/volume/transferfunctionproperty.h
+++ b/modules/volume/transferfunctionproperty.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/volume/volumegridtype.cpp b/modules/volume/volumegridtype.cpp
index f301ed671b..00b796af1f 100644
--- a/modules/volume/volumegridtype.cpp
+++ b/modules/volume/volumegridtype.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/volume/volumegridtype.h b/modules/volume/volumegridtype.h
index 3c41faa053..0d8a07edd9 100644
--- a/modules/volume/volumegridtype.h
+++ b/modules/volume/volumegridtype.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/volume/volumemodule.cpp b/modules/volume/volumemodule.cpp
index dfc7d0ab00..40883dd571 100644
--- a/modules/volume/volumemodule.cpp
+++ b/modules/volume/volumemodule.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/volume/volumemodule.h b/modules/volume/volumemodule.h
index 6d6b188c95..7478a55f1a 100644
--- a/modules/volume/volumemodule.h
+++ b/modules/volume/volumemodule.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/volume/volumesampler.h b/modules/volume/volumesampler.h
index 12f16437af..98d1c9c25f 100644
--- a/modules/volume/volumesampler.h
+++ b/modules/volume/volumesampler.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/volume/volumesampler.inl b/modules/volume/volumesampler.inl
index 8d526e3f4d..e71047c708 100644
--- a/modules/volume/volumesampler.inl
+++ b/modules/volume/volumesampler.inl
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/volume/volumeutils.cpp b/modules/volume/volumeutils.cpp
index 624cd3f003..a069385525 100644
--- a/modules/volume/volumeutils.cpp
+++ b/modules/volume/volumeutils.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/volume/volumeutils.h b/modules/volume/volumeutils.h
index 85c44e2f01..76b0550c2e 100644
--- a/modules/volume/volumeutils.h
+++ b/modules/volume/volumeutils.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/webbrowser/CMakeLists.txt b/modules/webbrowser/CMakeLists.txt
index 10ff587420..f9407265ee 100644
--- a/modules/webbrowser/CMakeLists.txt
+++ b/modules/webbrowser/CMakeLists.txt
@@ -2,7 +2,7 @@
 #                                                                                        #
 # OpenSpace                                                                              #
 #                                                                                        #
-# Copyright (c) 2014-2024                                                                #
+# Copyright (c) 2014-2025                                                                #
 #                                                                                        #
 # Permission is hereby granted, free of charge, to any person obtaining a copy of this   #
 # software and associated documentation files (the "Software"), to deal in the Software  #
diff --git a/modules/webbrowser/cmake/cef_support.cmake b/modules/webbrowser/cmake/cef_support.cmake
index 057a24de16..784d7a05dc 100644
--- a/modules/webbrowser/cmake/cef_support.cmake
+++ b/modules/webbrowser/cmake/cef_support.cmake
@@ -2,7 +2,7 @@
 #                                                                                        #
 # OpenSpace                                                                              #
 #                                                                                        #
-# Copyright (c) 2014-2024                                                                #
+# Copyright (c) 2014-2025                                                                #
 #                                                                                        #
 # Permission is hereby granted, free of charge, to any person obtaining a copy of this   #
 # software and associated documentation files (the "Software"), to deal in the Software  #
diff --git a/modules/webbrowser/cmake/webbrowser_helpers.cmake b/modules/webbrowser/cmake/webbrowser_helpers.cmake
index 0a2feb9ffc..19cb305197 100644
--- a/modules/webbrowser/cmake/webbrowser_helpers.cmake
+++ b/modules/webbrowser/cmake/webbrowser_helpers.cmake
@@ -2,7 +2,7 @@
 #                                                                                        #
 # OpenSpace                                                                              #
 #                                                                                        #
-# Copyright (c) 2014-2024                                                                #
+# Copyright (c) 2014-2025                                                                #
 #                                                                                        #
 # Permission is hereby granted, free of charge, to any person obtaining a copy of this   #
 # software and associated documentation files (the "Software"), to deal in the Software  #
diff --git a/modules/webbrowser/include/browserclient.h b/modules/webbrowser/include/browserclient.h
index 962c38a6e2..259c60e0c7 100644
--- a/modules/webbrowser/include/browserclient.h
+++ b/modules/webbrowser/include/browserclient.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/webbrowser/include/browserinstance.h b/modules/webbrowser/include/browserinstance.h
index 050db97b22..8bb49ee9fa 100644
--- a/modules/webbrowser/include/browserinstance.h
+++ b/modules/webbrowser/include/browserinstance.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/webbrowser/include/cefhost.h b/modules/webbrowser/include/cefhost.h
index e42a0fee04..e4eb66348f 100644
--- a/modules/webbrowser/include/cefhost.h
+++ b/modules/webbrowser/include/cefhost.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/webbrowser/include/defaultbrowserlauncher.h b/modules/webbrowser/include/defaultbrowserlauncher.h
index 86946a3f3f..dfd99c47b7 100644
--- a/modules/webbrowser/include/defaultbrowserlauncher.h
+++ b/modules/webbrowser/include/defaultbrowserlauncher.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/webbrowser/include/eventhandler.h b/modules/webbrowser/include/eventhandler.h
index 7897e72492..67865c8818 100644
--- a/modules/webbrowser/include/eventhandler.h
+++ b/modules/webbrowser/include/eventhandler.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/webbrowser/include/screenspacebrowser.h b/modules/webbrowser/include/screenspacebrowser.h
index 9a10898dc8..126f4fa61e 100644
--- a/modules/webbrowser/include/screenspacebrowser.h
+++ b/modules/webbrowser/include/screenspacebrowser.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/webbrowser/include/webbrowserapp.h b/modules/webbrowser/include/webbrowserapp.h
index 32c3d2d3a6..5c2942e111 100644
--- a/modules/webbrowser/include/webbrowserapp.h
+++ b/modules/webbrowser/include/webbrowserapp.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/webbrowser/include/webkeyboardhandler.h b/modules/webbrowser/include/webkeyboardhandler.h
index a94aca00c5..993eb81656 100644
--- a/modules/webbrowser/include/webkeyboardhandler.h
+++ b/modules/webbrowser/include/webkeyboardhandler.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/webbrowser/include/webrenderhandler.h b/modules/webbrowser/include/webrenderhandler.h
index ec26958201..7efad621bd 100644
--- a/modules/webbrowser/include/webrenderhandler.h
+++ b/modules/webbrowser/include/webrenderhandler.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/webbrowser/shaders/screenspace_fs.glsl b/modules/webbrowser/shaders/screenspace_fs.glsl
index 2ebc7c611c..147c1655d2 100644
--- a/modules/webbrowser/shaders/screenspace_fs.glsl
+++ b/modules/webbrowser/shaders/screenspace_fs.glsl
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/webbrowser/shaders/screenspace_vs.glsl b/modules/webbrowser/shaders/screenspace_vs.glsl
index cc503adde3..266a610673 100644
--- a/modules/webbrowser/shaders/screenspace_vs.glsl
+++ b/modules/webbrowser/shaders/screenspace_vs.glsl
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/webbrowser/src/browserclient.cpp b/modules/webbrowser/src/browserclient.cpp
index dfe23d7d9e..1e362ed6d9 100644
--- a/modules/webbrowser/src/browserclient.cpp
+++ b/modules/webbrowser/src/browserclient.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/webbrowser/src/browserinstance.cpp b/modules/webbrowser/src/browserinstance.cpp
index 41c66294da..170887f4ef 100644
--- a/modules/webbrowser/src/browserinstance.cpp
+++ b/modules/webbrowser/src/browserinstance.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/webbrowser/src/cefhost.cpp b/modules/webbrowser/src/cefhost.cpp
index 4995f841bd..1e3c197cf2 100644
--- a/modules/webbrowser/src/cefhost.cpp
+++ b/modules/webbrowser/src/cefhost.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/webbrowser/src/defaultbrowserlauncher.cpp b/modules/webbrowser/src/defaultbrowserlauncher.cpp
index 7f5949662c..132c953a31 100644
--- a/modules/webbrowser/src/defaultbrowserlauncher.cpp
+++ b/modules/webbrowser/src/defaultbrowserlauncher.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/webbrowser/src/eventhandler.cpp b/modules/webbrowser/src/eventhandler.cpp
index 726576edee..1e76dac0e7 100644
--- a/modules/webbrowser/src/eventhandler.cpp
+++ b/modules/webbrowser/src/eventhandler.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/webbrowser/src/processhelperlinux.cpp b/modules/webbrowser/src/processhelperlinux.cpp
index 16ac417937..58b05d86d9 100644
--- a/modules/webbrowser/src/processhelperlinux.cpp
+++ b/modules/webbrowser/src/processhelperlinux.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/webbrowser/src/processhelpermac.cpp b/modules/webbrowser/src/processhelpermac.cpp
index eecebe255e..0e3331277f 100644
--- a/modules/webbrowser/src/processhelpermac.cpp
+++ b/modules/webbrowser/src/processhelpermac.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/webbrowser/src/processhelperwindows.cpp b/modules/webbrowser/src/processhelperwindows.cpp
index e5440661a5..4a34592318 100644
--- a/modules/webbrowser/src/processhelperwindows.cpp
+++ b/modules/webbrowser/src/processhelperwindows.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/webbrowser/src/screenspacebrowser.cpp b/modules/webbrowser/src/screenspacebrowser.cpp
index b5ae4ce420..0c42d921e5 100644
--- a/modules/webbrowser/src/screenspacebrowser.cpp
+++ b/modules/webbrowser/src/screenspacebrowser.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/webbrowser/src/webbrowserapp.cpp b/modules/webbrowser/src/webbrowserapp.cpp
index 817118ba1f..d983dfdef6 100644
--- a/modules/webbrowser/src/webbrowserapp.cpp
+++ b/modules/webbrowser/src/webbrowserapp.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/webbrowser/src/webkeyboardhandler.cpp b/modules/webbrowser/src/webkeyboardhandler.cpp
index 33e16fc0cf..c4be0ac330 100644
--- a/modules/webbrowser/src/webkeyboardhandler.cpp
+++ b/modules/webbrowser/src/webkeyboardhandler.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/webbrowser/src/webrenderhandler.cpp b/modules/webbrowser/src/webrenderhandler.cpp
index 6f70042979..1051297d24 100644
--- a/modules/webbrowser/src/webrenderhandler.cpp
+++ b/modules/webbrowser/src/webrenderhandler.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/webbrowser/webbrowsermodule.cpp b/modules/webbrowser/webbrowsermodule.cpp
index 750e3342e5..4dc2efc5b6 100644
--- a/modules/webbrowser/webbrowsermodule.cpp
+++ b/modules/webbrowser/webbrowsermodule.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/webbrowser/webbrowsermodule.h b/modules/webbrowser/webbrowsermodule.h
index 2938bfff73..86152457f4 100644
--- a/modules/webbrowser/webbrowsermodule.h
+++ b/modules/webbrowser/webbrowsermodule.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/webgui/CMakeLists.txt b/modules/webgui/CMakeLists.txt
index 9e6f93a234..8959182f20 100644
--- a/modules/webgui/CMakeLists.txt
+++ b/modules/webgui/CMakeLists.txt
@@ -2,7 +2,7 @@
 #                                                                                        #
 # OpenSpace                                                                              #
 #                                                                                        #
-# Copyright (c) 2014-2024                                                                #
+# Copyright (c) 2014-2025                                                                #
 #                                                                                        #
 # Permission is hereby granted, free of charge, to any person obtaining a copy of this   #
 # software and associated documentation files (the "Software"), to deal in the Software  #
diff --git a/modules/webgui/cmake/nodejs_support.cmake b/modules/webgui/cmake/nodejs_support.cmake
index 1baba0e9c1..8d73435eb2 100644
--- a/modules/webgui/cmake/nodejs_support.cmake
+++ b/modules/webgui/cmake/nodejs_support.cmake
@@ -2,7 +2,7 @@
 #                                                                                        #
 # OpenSpace                                                                              #
 #                                                                                        #
-# Copyright (c) 2014-2024                                                                #
+# Copyright (c) 2014-2025                                                                #
 #                                                                                        #
 # Permission is hereby granted, free of charge, to any person obtaining a copy of this   #
 # software and associated documentation files (the "Software"), to deal in the Software  #
diff --git a/modules/webgui/webguimodule.cpp b/modules/webgui/webguimodule.cpp
index fc62990103..84f6663a62 100644
--- a/modules/webgui/webguimodule.cpp
+++ b/modules/webgui/webguimodule.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/modules/webgui/webguimodule.h b/modules/webgui/webguimodule.h
index c40481e26f..3c824b5143 100644
--- a/modules/webgui/webguimodule.h
+++ b/modules/webgui/webguimodule.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/shaders/PowerScaling/powerScalingMath.hglsl b/shaders/PowerScaling/powerScalingMath.hglsl
index 6e0cb05102..27123ebae8 100644
--- a/shaders/PowerScaling/powerScalingMath.hglsl
+++ b/shaders/PowerScaling/powerScalingMath.hglsl
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/shaders/PowerScaling/powerScaling_fs.hglsl b/shaders/PowerScaling/powerScaling_fs.hglsl
index 5ccb3b00a2..f652ae0efe 100644
--- a/shaders/PowerScaling/powerScaling_fs.hglsl
+++ b/shaders/PowerScaling/powerScaling_fs.hglsl
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/shaders/PowerScaling/powerScaling_vs.hglsl b/shaders/PowerScaling/powerScaling_vs.hglsl
index 588f1d731c..ef0f74c279 100644
--- a/shaders/PowerScaling/powerScaling_vs.hglsl
+++ b/shaders/PowerScaling/powerScaling_vs.hglsl
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/shaders/blending.glsl b/shaders/blending.glsl
index c0c125ff20..af17d249f2 100644
--- a/shaders/blending.glsl
+++ b/shaders/blending.glsl
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/shaders/core/xyzuvrgba_fs.glsl b/shaders/core/xyzuvrgba_fs.glsl
index ef21de0710..cb00542c71 100644
--- a/shaders/core/xyzuvrgba_fs.glsl
+++ b/shaders/core/xyzuvrgba_fs.glsl
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/shaders/core/xyzuvrgba_vs.glsl b/shaders/core/xyzuvrgba_vs.glsl
index 88ebf1b190..9ee839afff 100644
--- a/shaders/core/xyzuvrgba_vs.glsl
+++ b/shaders/core/xyzuvrgba_vs.glsl
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/shaders/floatoperations.glsl b/shaders/floatoperations.glsl
index 94ccb7eebb..dafc4baa2b 100644
--- a/shaders/floatoperations.glsl
+++ b/shaders/floatoperations.glsl
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/shaders/fragment.glsl b/shaders/fragment.glsl
index 896a63f71e..d247a8c8e7 100644
--- a/shaders/fragment.glsl
+++ b/shaders/fragment.glsl
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/shaders/framebuffer/exitframebuffer.frag b/shaders/framebuffer/exitframebuffer.frag
index b17c921aa9..de07a5cc80 100644
--- a/shaders/framebuffer/exitframebuffer.frag
+++ b/shaders/framebuffer/exitframebuffer.frag
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/shaders/framebuffer/fxaa.frag b/shaders/framebuffer/fxaa.frag
index 563ada1a87..ba805318c3 100644
--- a/shaders/framebuffer/fxaa.frag
+++ b/shaders/framebuffer/fxaa.frag
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/shaders/framebuffer/fxaa.vert b/shaders/framebuffer/fxaa.vert
index bd6e872fe8..700261bd56 100644
--- a/shaders/framebuffer/fxaa.vert
+++ b/shaders/framebuffer/fxaa.vert
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/shaders/framebuffer/hdrAndFiltering.frag b/shaders/framebuffer/hdrAndFiltering.frag
index 5d57ecb20e..b109e075a6 100644
--- a/shaders/framebuffer/hdrAndFiltering.frag
+++ b/shaders/framebuffer/hdrAndFiltering.frag
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/shaders/framebuffer/hdrAndFiltering.vert b/shaders/framebuffer/hdrAndFiltering.vert
index bd6e872fe8..700261bd56 100644
--- a/shaders/framebuffer/hdrAndFiltering.vert
+++ b/shaders/framebuffer/hdrAndFiltering.vert
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/shaders/framebuffer/inside.glsl b/shaders/framebuffer/inside.glsl
index 2bf6b16f2f..2e7e9bfb14 100644
--- a/shaders/framebuffer/inside.glsl
+++ b/shaders/framebuffer/inside.glsl
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/shaders/framebuffer/mergeDownscaledVolume.frag b/shaders/framebuffer/mergeDownscaledVolume.frag
index 3ec1485b0b..4e50aa60ac 100644
--- a/shaders/framebuffer/mergeDownscaledVolume.frag
+++ b/shaders/framebuffer/mergeDownscaledVolume.frag
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/shaders/framebuffer/mergeDownscaledVolume.vert b/shaders/framebuffer/mergeDownscaledVolume.vert
index bd6e872fe8..700261bd56 100644
--- a/shaders/framebuffer/mergeDownscaledVolume.vert
+++ b/shaders/framebuffer/mergeDownscaledVolume.vert
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/shaders/framebuffer/nOneStripMSAA.frag b/shaders/framebuffer/nOneStripMSAA.frag
index c550d8665e..cc65e289c3 100644
--- a/shaders/framebuffer/nOneStripMSAA.frag
+++ b/shaders/framebuffer/nOneStripMSAA.frag
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/shaders/framebuffer/nOneStripMSAA.vert b/shaders/framebuffer/nOneStripMSAA.vert
index 2c8b434092..505b7e7ea8 100644
--- a/shaders/framebuffer/nOneStripMSAA.vert
+++ b/shaders/framebuffer/nOneStripMSAA.vert
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/shaders/framebuffer/outside.glsl b/shaders/framebuffer/outside.glsl
index aa66ae5878..447cf1c475 100644
--- a/shaders/framebuffer/outside.glsl
+++ b/shaders/framebuffer/outside.glsl
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/shaders/framebuffer/raycastframebuffer.frag b/shaders/framebuffer/raycastframebuffer.frag
index dce3b71555..bf14a710bd 100644
--- a/shaders/framebuffer/raycastframebuffer.frag
+++ b/shaders/framebuffer/raycastframebuffer.frag
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/shaders/framebuffer/renderframebuffer.frag b/shaders/framebuffer/renderframebuffer.frag
index b48d80e37d..ec2a0df0fc 100644
--- a/shaders/framebuffer/renderframebuffer.frag
+++ b/shaders/framebuffer/renderframebuffer.frag
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/shaders/framebuffer/resolveframebuffer.vert b/shaders/framebuffer/resolveframebuffer.vert
index c7e5f3fc1a..cbe42d8b0a 100644
--- a/shaders/framebuffer/resolveframebuffer.vert
+++ b/shaders/framebuffer/resolveframebuffer.vert
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/shaders/hdr.glsl b/shaders/hdr.glsl
index 57eab0180e..d468ece062 100644
--- a/shaders/hdr.glsl
+++ b/shaders/hdr.glsl
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/shaders/rand.glsl b/shaders/rand.glsl
index 549ed8fb18..37dd15ea2e 100644
--- a/shaders/rand.glsl
+++ b/shaders/rand.glsl
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 0c6468a574..5b6398d959 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -2,7 +2,7 @@
 #                                                                                        #
 # OpenSpace                                                                              #
 #                                                                                        #
-# Copyright (c) 2014-2024                                                                #
+# Copyright (c) 2014-2025                                                                #
 #                                                                                        #
 # Permission is hereby granted, free of charge, to any person obtaining a copy of this   #
 # software and associated documentation files (the "Software"), to deal in the Software  #
diff --git a/src/camera/camera.cpp b/src/camera/camera.cpp
index 075a851c59..764b4d4b25 100644
--- a/src/camera/camera.cpp
+++ b/src/camera/camera.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/src/data/csvloader.cpp b/src/data/csvloader.cpp
index c68aa9ef27..a8eb92a61d 100644
--- a/src/data/csvloader.cpp
+++ b/src/data/csvloader.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/src/data/dataloader.cpp b/src/data/dataloader.cpp
index 5627d3a4a8..24f890613d 100644
--- a/src/data/dataloader.cpp
+++ b/src/data/dataloader.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/src/data/datamapping.cpp b/src/data/datamapping.cpp
index 5e523b9092..e87fbc1f73 100644
--- a/src/data/datamapping.cpp
+++ b/src/data/datamapping.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/src/data/speckloader.cpp b/src/data/speckloader.cpp
index 65a33fefac..0ef5b62521 100644
--- a/src/data/speckloader.cpp
+++ b/src/data/speckloader.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/src/documentation/core_registration.cpp b/src/documentation/core_registration.cpp
index 5673548aae..24ba1ec1f6 100644
--- a/src/documentation/core_registration.cpp
+++ b/src/documentation/core_registration.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/src/documentation/documentation.cpp b/src/documentation/documentation.cpp
index 74f92f8e02..17cf65175f 100644
--- a/src/documentation/documentation.cpp
+++ b/src/documentation/documentation.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/src/documentation/documentationengine.cpp b/src/documentation/documentationengine.cpp
index ddcbae1b1f..e15687f1ad 100644
--- a/src/documentation/documentationengine.cpp
+++ b/src/documentation/documentationengine.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/src/documentation/documentationgenerator.cpp b/src/documentation/documentationgenerator.cpp
index ea186f1ee2..5c78e70a1b 100644
--- a/src/documentation/documentationgenerator.cpp
+++ b/src/documentation/documentationgenerator.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/src/documentation/verifier.cpp b/src/documentation/verifier.cpp
index 3ca10c8208..528c8b7980 100644
--- a/src/documentation/verifier.cpp
+++ b/src/documentation/verifier.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/src/engine/configuration.cpp b/src/engine/configuration.cpp
index a9edfefd71..1f06e2ca93 100644
--- a/src/engine/configuration.cpp
+++ b/src/engine/configuration.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/src/engine/downloadmanager.cpp b/src/engine/downloadmanager.cpp
index 34e5691e39..df1a1cdeaa 100644
--- a/src/engine/downloadmanager.cpp
+++ b/src/engine/downloadmanager.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/src/engine/globals.cpp b/src/engine/globals.cpp
index 97745bdf94..15605d729d 100644
--- a/src/engine/globals.cpp
+++ b/src/engine/globals.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/src/engine/globalscallbacks.cpp b/src/engine/globalscallbacks.cpp
index 594efb1235..bbe0a8df53 100644
--- a/src/engine/globalscallbacks.cpp
+++ b/src/engine/globalscallbacks.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/src/engine/logfactory.cpp b/src/engine/logfactory.cpp
index 69ff60a67e..e5688a361b 100644
--- a/src/engine/logfactory.cpp
+++ b/src/engine/logfactory.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/src/engine/moduleengine.cpp b/src/engine/moduleengine.cpp
index 5edb772d9a..eaeb3acdaa 100644
--- a/src/engine/moduleengine.cpp
+++ b/src/engine/moduleengine.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/src/engine/moduleengine_lua.inl b/src/engine/moduleengine_lua.inl
index bd2ceee872..e9bb73e33c 100644
--- a/src/engine/moduleengine_lua.inl
+++ b/src/engine/moduleengine_lua.inl
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/src/engine/openspaceengine.cpp b/src/engine/openspaceengine.cpp
index aaff37332b..b70fc32ecb 100644
--- a/src/engine/openspaceengine.cpp
+++ b/src/engine/openspaceengine.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/src/engine/openspaceengine_lua.inl b/src/engine/openspaceengine_lua.inl
index bcfd2c6534..3eeea5d932 100644
--- a/src/engine/openspaceengine_lua.inl
+++ b/src/engine/openspaceengine_lua.inl
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/src/engine/settings.cpp b/src/engine/settings.cpp
index 2b6a09b989..49feff88ad 100644
--- a/src/engine/settings.cpp
+++ b/src/engine/settings.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/src/engine/syncengine.cpp b/src/engine/syncengine.cpp
index a622e58d97..1cceb42b3a 100644
--- a/src/engine/syncengine.cpp
+++ b/src/engine/syncengine.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/src/events/event.cpp b/src/events/event.cpp
index ae631c6f67..b1ff309b9e 100644
--- a/src/events/event.cpp
+++ b/src/events/event.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/src/events/eventengine.cpp b/src/events/eventengine.cpp
index 6a7bf85070..c0a0fbd303 100644
--- a/src/events/eventengine.cpp
+++ b/src/events/eventengine.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/src/events/eventengine_lua.inl b/src/events/eventengine_lua.inl
index 7aef222b9b..e0d026b7c3 100644
--- a/src/events/eventengine_lua.inl
+++ b/src/events/eventengine_lua.inl
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/src/interaction/actionmanager.cpp b/src/interaction/actionmanager.cpp
index e5771a37b9..0a38a410fb 100644
--- a/src/interaction/actionmanager.cpp
+++ b/src/interaction/actionmanager.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/src/interaction/actionmanager_lua.inl b/src/interaction/actionmanager_lua.inl
index be68d6672f..6140d2a60b 100644
--- a/src/interaction/actionmanager_lua.inl
+++ b/src/interaction/actionmanager_lua.inl
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/src/interaction/camerainteractionstates.cpp b/src/interaction/camerainteractionstates.cpp
index c0118d664a..8ba45bef7b 100644
--- a/src/interaction/camerainteractionstates.cpp
+++ b/src/interaction/camerainteractionstates.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/src/interaction/interactionmonitor.cpp b/src/interaction/interactionmonitor.cpp
index 49ea144fec..bebf895bf1 100644
--- a/src/interaction/interactionmonitor.cpp
+++ b/src/interaction/interactionmonitor.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/src/interaction/joystickcamerastates.cpp b/src/interaction/joystickcamerastates.cpp
index 099e72e945..e0013b8935 100644
--- a/src/interaction/joystickcamerastates.cpp
+++ b/src/interaction/joystickcamerastates.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/src/interaction/joystickinputstate.cpp b/src/interaction/joystickinputstate.cpp
index 81ebeea250..8ca2113de1 100644
--- a/src/interaction/joystickinputstate.cpp
+++ b/src/interaction/joystickinputstate.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/src/interaction/keybindingmanager.cpp b/src/interaction/keybindingmanager.cpp
index 284ea5291e..96f1422b6a 100644
--- a/src/interaction/keybindingmanager.cpp
+++ b/src/interaction/keybindingmanager.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/src/interaction/keybindingmanager_lua.inl b/src/interaction/keybindingmanager_lua.inl
index a6d369110c..78642ae21c 100644
--- a/src/interaction/keybindingmanager_lua.inl
+++ b/src/interaction/keybindingmanager_lua.inl
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/src/interaction/keyboardinputstate.cpp b/src/interaction/keyboardinputstate.cpp
index 48fb647e36..85e94d963d 100644
--- a/src/interaction/keyboardinputstate.cpp
+++ b/src/interaction/keyboardinputstate.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/src/interaction/keyframerecordinghandler.cpp b/src/interaction/keyframerecordinghandler.cpp
index 5ba3eff36b..fea3d5733c 100644
--- a/src/interaction/keyframerecordinghandler.cpp
+++ b/src/interaction/keyframerecordinghandler.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/src/interaction/mousecamerastates.cpp b/src/interaction/mousecamerastates.cpp
index 219183c061..b96fbfe986 100644
--- a/src/interaction/mousecamerastates.cpp
+++ b/src/interaction/mousecamerastates.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/src/interaction/mouseinputstate.cpp b/src/interaction/mouseinputstate.cpp
index 0ae6b78911..08d6cc045d 100644
--- a/src/interaction/mouseinputstate.cpp
+++ b/src/interaction/mouseinputstate.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/src/interaction/scriptcamerastates.cpp b/src/interaction/scriptcamerastates.cpp
index b6b8e7ec81..c320e26f85 100644
--- a/src/interaction/scriptcamerastates.cpp
+++ b/src/interaction/scriptcamerastates.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/src/interaction/sessionrecording.cpp b/src/interaction/sessionrecording.cpp
index 3b579ae726..88c22a9c8d 100644
--- a/src/interaction/sessionrecording.cpp
+++ b/src/interaction/sessionrecording.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/src/interaction/sessionrecordinghandler.cpp b/src/interaction/sessionrecordinghandler.cpp
index fd50725b52..dc6e95c901 100644
--- a/src/interaction/sessionrecordinghandler.cpp
+++ b/src/interaction/sessionrecordinghandler.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/src/interaction/sessionrecordinghandler_lua.inl b/src/interaction/sessionrecordinghandler_lua.inl
index d533b59a39..276c031a7a 100644
--- a/src/interaction/sessionrecordinghandler_lua.inl
+++ b/src/interaction/sessionrecordinghandler_lua.inl
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/src/interaction/tasks/convertrecformattask.cpp b/src/interaction/tasks/convertrecformattask.cpp
index 289ee653d8..4ac7a2e7a7 100644
--- a/src/interaction/tasks/convertrecformattask.cpp
+++ b/src/interaction/tasks/convertrecformattask.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/src/interaction/touchbar.mm b/src/interaction/touchbar.mm
index 9264045a27..2de60e439c 100644
--- a/src/interaction/touchbar.mm
+++ b/src/interaction/touchbar.mm
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/src/interaction/websocketcamerastates.cpp b/src/interaction/websocketcamerastates.cpp
index 0262cfd3ea..03451f0559 100644
--- a/src/interaction/websocketcamerastates.cpp
+++ b/src/interaction/websocketcamerastates.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/src/interaction/websocketinputstate.cpp b/src/interaction/websocketinputstate.cpp
index 4ea18f55b2..b0dcd4486e 100644
--- a/src/interaction/websocketinputstate.cpp
+++ b/src/interaction/websocketinputstate.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/src/mission/mission.cpp b/src/mission/mission.cpp
index c22dd8441e..f735f56fe8 100644
--- a/src/mission/mission.cpp
+++ b/src/mission/mission.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/src/mission/missionmanager.cpp b/src/mission/missionmanager.cpp
index 39814f6032..f3fe592c01 100644
--- a/src/mission/missionmanager.cpp
+++ b/src/mission/missionmanager.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/src/mission/missionmanager_lua.inl b/src/mission/missionmanager_lua.inl
index 528ef24f94..a54fba4b0f 100644
--- a/src/mission/missionmanager_lua.inl
+++ b/src/mission/missionmanager_lua.inl
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/src/navigation/keyframenavigator.cpp b/src/navigation/keyframenavigator.cpp
index 47313e71b8..cff0f416ca 100644
--- a/src/navigation/keyframenavigator.cpp
+++ b/src/navigation/keyframenavigator.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/src/navigation/navigationhandler.cpp b/src/navigation/navigationhandler.cpp
index 1701e00ed9..5a3d94a2f1 100644
--- a/src/navigation/navigationhandler.cpp
+++ b/src/navigation/navigationhandler.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/src/navigation/navigationhandler_lua.inl b/src/navigation/navigationhandler_lua.inl
index d2b6e126cf..b6cb6aedf1 100644
--- a/src/navigation/navigationhandler_lua.inl
+++ b/src/navigation/navigationhandler_lua.inl
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/src/navigation/navigationstate.cpp b/src/navigation/navigationstate.cpp
index a8c2d035c2..87fadee90c 100644
--- a/src/navigation/navigationstate.cpp
+++ b/src/navigation/navigationstate.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/src/navigation/orbitalnavigator.cpp b/src/navigation/orbitalnavigator.cpp
index bee8a29227..6cf4c7ca78 100644
--- a/src/navigation/orbitalnavigator.cpp
+++ b/src/navigation/orbitalnavigator.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/src/navigation/orbitalnavigator_lua.inl b/src/navigation/orbitalnavigator_lua.inl
index 363b3c091e..9e17b41a1a 100644
--- a/src/navigation/orbitalnavigator_lua.inl
+++ b/src/navigation/orbitalnavigator_lua.inl
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/src/navigation/path.cpp b/src/navigation/path.cpp
index 99cc50305a..9092e198d7 100644
--- a/src/navigation/path.cpp
+++ b/src/navigation/path.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/src/navigation/pathcurve.cpp b/src/navigation/pathcurve.cpp
index 8553e6c8dc..8aad9ea7b7 100644
--- a/src/navigation/pathcurve.cpp
+++ b/src/navigation/pathcurve.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/src/navigation/pathcurves/avoidcollisioncurve.cpp b/src/navigation/pathcurves/avoidcollisioncurve.cpp
index ebb3286e48..7fc34c1013 100644
--- a/src/navigation/pathcurves/avoidcollisioncurve.cpp
+++ b/src/navigation/pathcurves/avoidcollisioncurve.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/src/navigation/pathcurves/zoomoutoverviewcurve.cpp b/src/navigation/pathcurves/zoomoutoverviewcurve.cpp
index e34b051a4f..4948fef8b6 100644
--- a/src/navigation/pathcurves/zoomoutoverviewcurve.cpp
+++ b/src/navigation/pathcurves/zoomoutoverviewcurve.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/src/navigation/pathnavigator.cpp b/src/navigation/pathnavigator.cpp
index 94f9ad5322..00aafb002b 100644
--- a/src/navigation/pathnavigator.cpp
+++ b/src/navigation/pathnavigator.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/src/navigation/pathnavigator_lua.inl b/src/navigation/pathnavigator_lua.inl
index f168bef11c..049b7a74e3 100644
--- a/src/navigation/pathnavigator_lua.inl
+++ b/src/navigation/pathnavigator_lua.inl
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/src/navigation/waypoint.cpp b/src/navigation/waypoint.cpp
index 2bc6d64a43..1949345665 100644
--- a/src/navigation/waypoint.cpp
+++ b/src/navigation/waypoint.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/src/network/messagestructureshelper.cpp b/src/network/messagestructureshelper.cpp
index 28367240cd..a01c4cb3c5 100644
--- a/src/network/messagestructureshelper.cpp
+++ b/src/network/messagestructureshelper.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/src/network/parallelconnection.cpp b/src/network/parallelconnection.cpp
index 8757ce8b7b..722edc15eb 100644
--- a/src/network/parallelconnection.cpp
+++ b/src/network/parallelconnection.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/src/network/parallelpeer.cpp b/src/network/parallelpeer.cpp
index d5be7e52f3..d998b2f11a 100644
--- a/src/network/parallelpeer.cpp
+++ b/src/network/parallelpeer.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/src/network/parallelpeer_lua.inl b/src/network/parallelpeer_lua.inl
index 279fe057fc..920c8e191c 100644
--- a/src/network/parallelpeer_lua.inl
+++ b/src/network/parallelpeer_lua.inl
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/src/openspace.cpp b/src/openspace.cpp
index e419372c6c..e9cfd27f07 100644
--- a/src/openspace.cpp
+++ b/src/openspace.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
@@ -29,7 +29,7 @@ namespace openspace {
 std::string licenseText() {
     return "OpenSpace\n\
 \n\
-Copyright (c) 2014-2024\n\
+Copyright (c) 2014-2025\n\
 \n\
 Permission is hereby granted, free of charge, to any person obtaining a copy of this\n\
 software and associated documentation files (the \"Software\"), to deal in the Software\n\
diff --git a/src/properties/list/doublelistproperty.cpp b/src/properties/list/doublelistproperty.cpp
index eb3ae55a6b..c2483fc4af 100644
--- a/src/properties/list/doublelistproperty.cpp
+++ b/src/properties/list/doublelistproperty.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/src/properties/list/intlistproperty.cpp b/src/properties/list/intlistproperty.cpp
index 82669b0ad5..cf9a927573 100644
--- a/src/properties/list/intlistproperty.cpp
+++ b/src/properties/list/intlistproperty.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/src/properties/list/stringlistproperty.cpp b/src/properties/list/stringlistproperty.cpp
index 64f198f4d7..add31a45cf 100644
--- a/src/properties/list/stringlistproperty.cpp
+++ b/src/properties/list/stringlistproperty.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/src/properties/matrix/dmat2property.cpp b/src/properties/matrix/dmat2property.cpp
index de9dd9cc90..39030fb704 100644
--- a/src/properties/matrix/dmat2property.cpp
+++ b/src/properties/matrix/dmat2property.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/src/properties/matrix/dmat3property.cpp b/src/properties/matrix/dmat3property.cpp
index 51c6f1b2e5..af539803f2 100644
--- a/src/properties/matrix/dmat3property.cpp
+++ b/src/properties/matrix/dmat3property.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/src/properties/matrix/dmat4property.cpp b/src/properties/matrix/dmat4property.cpp
index c4ec3b2761..d8122b94ca 100644
--- a/src/properties/matrix/dmat4property.cpp
+++ b/src/properties/matrix/dmat4property.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/src/properties/matrix/mat2property.cpp b/src/properties/matrix/mat2property.cpp
index a345b46f71..54f7dc1e1f 100644
--- a/src/properties/matrix/mat2property.cpp
+++ b/src/properties/matrix/mat2property.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/src/properties/matrix/mat3property.cpp b/src/properties/matrix/mat3property.cpp
index c7559d94fa..aab59d2e5c 100644
--- a/src/properties/matrix/mat3property.cpp
+++ b/src/properties/matrix/mat3property.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/src/properties/matrix/mat4property.cpp b/src/properties/matrix/mat4property.cpp
index 816d0e098a..38aedc0436 100644
--- a/src/properties/matrix/mat4property.cpp
+++ b/src/properties/matrix/mat4property.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/src/properties/optionproperty.cpp b/src/properties/optionproperty.cpp
index 98b1be9a3c..06658d75d4 100644
--- a/src/properties/optionproperty.cpp
+++ b/src/properties/optionproperty.cpp
@@ -3,7 +3,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/src/properties/property.cpp b/src/properties/property.cpp
index 2336624358..80a5810760 100644
--- a/src/properties/property.cpp
+++ b/src/properties/property.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/src/properties/propertyowner.cpp b/src/properties/propertyowner.cpp
index cae9dca8a4..e1589f859f 100644
--- a/src/properties/propertyowner.cpp
+++ b/src/properties/propertyowner.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/src/properties/scalar/boolproperty.cpp b/src/properties/scalar/boolproperty.cpp
index 067afddb9d..e34cb79c0b 100644
--- a/src/properties/scalar/boolproperty.cpp
+++ b/src/properties/scalar/boolproperty.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/src/properties/scalar/doubleproperty.cpp b/src/properties/scalar/doubleproperty.cpp
index 8d6f27ed4a..f890780958 100644
--- a/src/properties/scalar/doubleproperty.cpp
+++ b/src/properties/scalar/doubleproperty.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/src/properties/scalar/floatproperty.cpp b/src/properties/scalar/floatproperty.cpp
index 3f30b13252..53f1951227 100644
--- a/src/properties/scalar/floatproperty.cpp
+++ b/src/properties/scalar/floatproperty.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/src/properties/scalar/intproperty.cpp b/src/properties/scalar/intproperty.cpp
index af10f72e5d..31fcc15594 100644
--- a/src/properties/scalar/intproperty.cpp
+++ b/src/properties/scalar/intproperty.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/src/properties/scalar/longproperty.cpp b/src/properties/scalar/longproperty.cpp
index 4b108b6c51..b4e34cd420 100644
--- a/src/properties/scalar/longproperty.cpp
+++ b/src/properties/scalar/longproperty.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/src/properties/scalar/shortproperty.cpp b/src/properties/scalar/shortproperty.cpp
index 644b3821fd..bd302676bf 100644
--- a/src/properties/scalar/shortproperty.cpp
+++ b/src/properties/scalar/shortproperty.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/src/properties/scalar/uintproperty.cpp b/src/properties/scalar/uintproperty.cpp
index 03b454604c..8512a533d7 100644
--- a/src/properties/scalar/uintproperty.cpp
+++ b/src/properties/scalar/uintproperty.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/src/properties/scalar/ulongproperty.cpp b/src/properties/scalar/ulongproperty.cpp
index 70ecbf8004..142b0094eb 100644
--- a/src/properties/scalar/ulongproperty.cpp
+++ b/src/properties/scalar/ulongproperty.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/src/properties/scalar/ushortproperty.cpp b/src/properties/scalar/ushortproperty.cpp
index a66e2c249f..76db3382fb 100644
--- a/src/properties/scalar/ushortproperty.cpp
+++ b/src/properties/scalar/ushortproperty.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/src/properties/selectionproperty.cpp b/src/properties/selectionproperty.cpp
index c652b05c85..7faa4c1b93 100644
--- a/src/properties/selectionproperty.cpp
+++ b/src/properties/selectionproperty.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/src/properties/stringproperty.cpp b/src/properties/stringproperty.cpp
index 492420dd2d..5807c2cee2 100644
--- a/src/properties/stringproperty.cpp
+++ b/src/properties/stringproperty.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/src/properties/triggerproperty.cpp b/src/properties/triggerproperty.cpp
index 53898659e2..b099ad6663 100644
--- a/src/properties/triggerproperty.cpp
+++ b/src/properties/triggerproperty.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/src/properties/vector/dvec2property.cpp b/src/properties/vector/dvec2property.cpp
index 1de60dbae6..3c2368d0be 100644
--- a/src/properties/vector/dvec2property.cpp
+++ b/src/properties/vector/dvec2property.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/src/properties/vector/dvec3property.cpp b/src/properties/vector/dvec3property.cpp
index 5136a7fd75..20f61a5304 100644
--- a/src/properties/vector/dvec3property.cpp
+++ b/src/properties/vector/dvec3property.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/src/properties/vector/dvec4property.cpp b/src/properties/vector/dvec4property.cpp
index c6982348ed..41b19fe5d1 100644
--- a/src/properties/vector/dvec4property.cpp
+++ b/src/properties/vector/dvec4property.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/src/properties/vector/ivec2property.cpp b/src/properties/vector/ivec2property.cpp
index c669ba2001..50d491a2f8 100644
--- a/src/properties/vector/ivec2property.cpp
+++ b/src/properties/vector/ivec2property.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/src/properties/vector/ivec3property.cpp b/src/properties/vector/ivec3property.cpp
index b970a8dd66..43b3c785c6 100644
--- a/src/properties/vector/ivec3property.cpp
+++ b/src/properties/vector/ivec3property.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/src/properties/vector/ivec4property.cpp b/src/properties/vector/ivec4property.cpp
index 5d4d4a7bed..008622d7cb 100644
--- a/src/properties/vector/ivec4property.cpp
+++ b/src/properties/vector/ivec4property.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/src/properties/vector/uvec2property.cpp b/src/properties/vector/uvec2property.cpp
index c52b706f4b..aad60b7c2e 100644
--- a/src/properties/vector/uvec2property.cpp
+++ b/src/properties/vector/uvec2property.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/src/properties/vector/uvec3property.cpp b/src/properties/vector/uvec3property.cpp
index c38da33649..c51ee5f08b 100644
--- a/src/properties/vector/uvec3property.cpp
+++ b/src/properties/vector/uvec3property.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/src/properties/vector/uvec4property.cpp b/src/properties/vector/uvec4property.cpp
index 7e49b3ce37..0c9baa99ae 100644
--- a/src/properties/vector/uvec4property.cpp
+++ b/src/properties/vector/uvec4property.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/src/properties/vector/vec2property.cpp b/src/properties/vector/vec2property.cpp
index 1a3aecb2c0..98581098c1 100644
--- a/src/properties/vector/vec2property.cpp
+++ b/src/properties/vector/vec2property.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/src/properties/vector/vec3property.cpp b/src/properties/vector/vec3property.cpp
index 9b8af65205..9a83bbd8fc 100644
--- a/src/properties/vector/vec3property.cpp
+++ b/src/properties/vector/vec3property.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/src/properties/vector/vec4property.cpp b/src/properties/vector/vec4property.cpp
index de149aa6bf..ebba1755a1 100644
--- a/src/properties/vector/vec4property.cpp
+++ b/src/properties/vector/vec4property.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/src/query/query.cpp b/src/query/query.cpp
index 60103fbdbf..5e2cd8d029 100644
--- a/src/query/query.cpp
+++ b/src/query/query.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/src/rendering/colormappingcomponent.cpp b/src/rendering/colormappingcomponent.cpp
index 63a06b4f87..0f39dd468b 100644
--- a/src/rendering/colormappingcomponent.cpp
+++ b/src/rendering/colormappingcomponent.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/src/rendering/dashboard.cpp b/src/rendering/dashboard.cpp
index 572e75b933..61a971615e 100644
--- a/src/rendering/dashboard.cpp
+++ b/src/rendering/dashboard.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/src/rendering/dashboard_lua.inl b/src/rendering/dashboard_lua.inl
index f3141e9c0a..d7d6858b1f 100644
--- a/src/rendering/dashboard_lua.inl
+++ b/src/rendering/dashboard_lua.inl
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/src/rendering/dashboarditem.cpp b/src/rendering/dashboarditem.cpp
index dab1d12cb8..333a9becbe 100644
--- a/src/rendering/dashboarditem.cpp
+++ b/src/rendering/dashboarditem.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/src/rendering/dashboardtextitem.cpp b/src/rendering/dashboardtextitem.cpp
index 0bd203e0e7..d40d872d34 100644
--- a/src/rendering/dashboardtextitem.cpp
+++ b/src/rendering/dashboardtextitem.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/src/rendering/deferredcastermanager.cpp b/src/rendering/deferredcastermanager.cpp
index d50b5b79f9..3297ef8699 100644
--- a/src/rendering/deferredcastermanager.cpp
+++ b/src/rendering/deferredcastermanager.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/src/rendering/fadeable.cpp b/src/rendering/fadeable.cpp
index 9c66e4a388..3f7d9508ca 100644
--- a/src/rendering/fadeable.cpp
+++ b/src/rendering/fadeable.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/src/rendering/framebufferrenderer.cpp b/src/rendering/framebufferrenderer.cpp
index e519330916..82a82f0af4 100644
--- a/src/rendering/framebufferrenderer.cpp
+++ b/src/rendering/framebufferrenderer.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/src/rendering/helper.cpp b/src/rendering/helper.cpp
index 56e1cea0c4..6585687506 100644
--- a/src/rendering/helper.cpp
+++ b/src/rendering/helper.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/src/rendering/labelscomponent.cpp b/src/rendering/labelscomponent.cpp
index 3a1153ad32..e76bd2091a 100644
--- a/src/rendering/labelscomponent.cpp
+++ b/src/rendering/labelscomponent.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/src/rendering/loadingscreen.cpp b/src/rendering/loadingscreen.cpp
index 7e4b043769..f6cad8c0d1 100644
--- a/src/rendering/loadingscreen.cpp
+++ b/src/rendering/loadingscreen.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/src/rendering/luaconsole.cpp b/src/rendering/luaconsole.cpp
index 4e7c1f521d..580d1a49ac 100644
--- a/src/rendering/luaconsole.cpp
+++ b/src/rendering/luaconsole.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/src/rendering/raycastermanager.cpp b/src/rendering/raycastermanager.cpp
index e178eaa2db..f6bbe00f29 100644
--- a/src/rendering/raycastermanager.cpp
+++ b/src/rendering/raycastermanager.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/src/rendering/renderable.cpp b/src/rendering/renderable.cpp
index d4379ff7ba..67121c7d62 100644
--- a/src/rendering/renderable.cpp
+++ b/src/rendering/renderable.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/src/rendering/renderengine.cpp b/src/rendering/renderengine.cpp
index a950c085dd..4ebf31acd5 100644
--- a/src/rendering/renderengine.cpp
+++ b/src/rendering/renderengine.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/src/rendering/renderengine_lua.inl b/src/rendering/renderengine_lua.inl
index 2e9b8e4a98..7b7f6ea4b1 100644
--- a/src/rendering/renderengine_lua.inl
+++ b/src/rendering/renderengine_lua.inl
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/src/rendering/screenspacerenderable.cpp b/src/rendering/screenspacerenderable.cpp
index e444aed037..c314971371 100644
--- a/src/rendering/screenspacerenderable.cpp
+++ b/src/rendering/screenspacerenderable.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/src/rendering/texturecomponent.cpp b/src/rendering/texturecomponent.cpp
index bcd825bfe2..46f27a46f3 100644
--- a/src/rendering/texturecomponent.cpp
+++ b/src/rendering/texturecomponent.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/src/rendering/transferfunction.cpp b/src/rendering/transferfunction.cpp
index 79e1458ac5..0c4038064f 100644
--- a/src/rendering/transferfunction.cpp
+++ b/src/rendering/transferfunction.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/src/rendering/volumeraycaster.cpp b/src/rendering/volumeraycaster.cpp
index eaba0dcc91..ac8f79da7b 100644
--- a/src/rendering/volumeraycaster.cpp
+++ b/src/rendering/volumeraycaster.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/src/scene/asset.cpp b/src/scene/asset.cpp
index 1bbea55cd2..c2f901d3fc 100644
--- a/src/scene/asset.cpp
+++ b/src/scene/asset.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/src/scene/assetmanager.cpp b/src/scene/assetmanager.cpp
index f58b8abb3b..181f9ce1cb 100644
--- a/src/scene/assetmanager.cpp
+++ b/src/scene/assetmanager.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/src/scene/assetmanager_lua.inl b/src/scene/assetmanager_lua.inl
index 623409b5f6..95377f680b 100644
--- a/src/scene/assetmanager_lua.inl
+++ b/src/scene/assetmanager_lua.inl
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/src/scene/lightsource.cpp b/src/scene/lightsource.cpp
index c16f227269..51b1fd010d 100644
--- a/src/scene/lightsource.cpp
+++ b/src/scene/lightsource.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/src/scene/profile.cpp b/src/scene/profile.cpp
index 3bcf72b006..d4dfc8e228 100644
--- a/src/scene/profile.cpp
+++ b/src/scene/profile.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/src/scene/profile_lua.inl b/src/scene/profile_lua.inl
index 57eb927230..be0d2c966f 100644
--- a/src/scene/profile_lua.inl
+++ b/src/scene/profile_lua.inl
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/src/scene/rotation.cpp b/src/scene/rotation.cpp
index 6ca29ae3c1..cafc4f5db8 100644
--- a/src/scene/rotation.cpp
+++ b/src/scene/rotation.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/src/scene/scale.cpp b/src/scene/scale.cpp
index 21fe1441dd..3b45ee6277 100644
--- a/src/scene/scale.cpp
+++ b/src/scene/scale.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/src/scene/scene.cpp b/src/scene/scene.cpp
index dd1af7d847..f728def1b2 100644
--- a/src/scene/scene.cpp
+++ b/src/scene/scene.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/src/scene/scene_lua.inl b/src/scene/scene_lua.inl
index 1bed6974a8..c005f68364 100644
--- a/src/scene/scene_lua.inl
+++ b/src/scene/scene_lua.inl
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/src/scene/scenegraphnode.cpp b/src/scene/scenegraphnode.cpp
index aadb260571..a40b9b479b 100644
--- a/src/scene/scenegraphnode.cpp
+++ b/src/scene/scenegraphnode.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/src/scene/sceneinitializer.cpp b/src/scene/sceneinitializer.cpp
index 79d911d296..45bc493fcb 100644
--- a/src/scene/sceneinitializer.cpp
+++ b/src/scene/sceneinitializer.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/src/scene/timeframe.cpp b/src/scene/timeframe.cpp
index 4d79d3d6c4..9e603cdc4d 100644
--- a/src/scene/timeframe.cpp
+++ b/src/scene/timeframe.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/src/scene/translation.cpp b/src/scene/translation.cpp
index 923026bd54..189d82344e 100644
--- a/src/scene/translation.cpp
+++ b/src/scene/translation.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/src/scripting/lualibrary.cpp b/src/scripting/lualibrary.cpp
index 2c4045a4bb..89c9f7c2a1 100644
--- a/src/scripting/lualibrary.cpp
+++ b/src/scripting/lualibrary.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/src/scripting/scriptengine.cpp b/src/scripting/scriptengine.cpp
index 201cb544ec..0b1878a9b8 100644
--- a/src/scripting/scriptengine.cpp
+++ b/src/scripting/scriptengine.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/src/scripting/scriptengine_lua.inl b/src/scripting/scriptengine_lua.inl
index e66bc3baf3..8c038f308d 100644
--- a/src/scripting/scriptengine_lua.inl
+++ b/src/scripting/scriptengine_lua.inl
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/src/scripting/scriptscheduler.cpp b/src/scripting/scriptscheduler.cpp
index c6a55a8d3c..e75223290b 100644
--- a/src/scripting/scriptscheduler.cpp
+++ b/src/scripting/scriptscheduler.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/src/scripting/scriptscheduler_lua.inl b/src/scripting/scriptscheduler_lua.inl
index 3b2a41c78d..8a7f3174ef 100644
--- a/src/scripting/scriptscheduler_lua.inl
+++ b/src/scripting/scriptscheduler_lua.inl
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/src/scripting/systemcapabilitiesbinding.cpp b/src/scripting/systemcapabilitiesbinding.cpp
index 5923e78d7c..26a3e081e2 100644
--- a/src/scripting/systemcapabilitiesbinding.cpp
+++ b/src/scripting/systemcapabilitiesbinding.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/src/scripting/systemcapabilitiesbinding_lua.inl b/src/scripting/systemcapabilitiesbinding_lua.inl
index e2ef00afb5..edc8fe4760 100644
--- a/src/scripting/systemcapabilitiesbinding_lua.inl
+++ b/src/scripting/systemcapabilitiesbinding_lua.inl
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/src/util/blockplaneintersectiongeometry.cpp b/src/util/blockplaneintersectiongeometry.cpp
index 888c826c3d..de4d6a4728 100644
--- a/src/util/blockplaneintersectiongeometry.cpp
+++ b/src/util/blockplaneintersectiongeometry.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/src/util/boxgeometry.cpp b/src/util/boxgeometry.cpp
index f9c87ec804..524d29cb84 100644
--- a/src/util/boxgeometry.cpp
+++ b/src/util/boxgeometry.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/src/util/collisionhelper.cpp b/src/util/collisionhelper.cpp
index 3e7f727313..b599beb4d2 100644
--- a/src/util/collisionhelper.cpp
+++ b/src/util/collisionhelper.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/src/util/coordinateconversion.cpp b/src/util/coordinateconversion.cpp
index 2b19ca6496..8d3385ecc8 100644
--- a/src/util/coordinateconversion.cpp
+++ b/src/util/coordinateconversion.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/src/util/distanceconversion.cpp b/src/util/distanceconversion.cpp
index 0767890fa9..e398a97e67 100644
--- a/src/util/distanceconversion.cpp
+++ b/src/util/distanceconversion.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/src/util/factorymanager.cpp b/src/util/factorymanager.cpp
index 5c2fd2227e..e21329af8e 100644
--- a/src/util/factorymanager.cpp
+++ b/src/util/factorymanager.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/src/util/histogram.cpp b/src/util/histogram.cpp
index 3e20ba4a11..3628934076 100644
--- a/src/util/histogram.cpp
+++ b/src/util/histogram.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/src/util/httprequest.cpp b/src/util/httprequest.cpp
index 8b371c1e31..ed2ea95452 100644
--- a/src/util/httprequest.cpp
+++ b/src/util/httprequest.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/src/util/json_helper.cpp b/src/util/json_helper.cpp
index 8f3f8cb938..48038cab95 100644
--- a/src/util/json_helper.cpp
+++ b/src/util/json_helper.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/src/util/keys.cpp b/src/util/keys.cpp
index db49fd8bff..a278136152 100644
--- a/src/util/keys.cpp
+++ b/src/util/keys.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/src/util/openspacemodule.cpp b/src/util/openspacemodule.cpp
index 1fb76804b8..1d0afdb34d 100644
--- a/src/util/openspacemodule.cpp
+++ b/src/util/openspacemodule.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/src/util/planegeometry.cpp b/src/util/planegeometry.cpp
index 5212c7bbe3..0705239d47 100644
--- a/src/util/planegeometry.cpp
+++ b/src/util/planegeometry.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/src/util/progressbar.cpp b/src/util/progressbar.cpp
index b078b9f957..4251da9853 100644
--- a/src/util/progressbar.cpp
+++ b/src/util/progressbar.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/src/util/resourcesynchronization.cpp b/src/util/resourcesynchronization.cpp
index adbe6fbb28..ecf6b6e3da 100644
--- a/src/util/resourcesynchronization.cpp
+++ b/src/util/resourcesynchronization.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/src/util/screenlog.cpp b/src/util/screenlog.cpp
index e3d45623a6..9fd2723fbf 100644
--- a/src/util/screenlog.cpp
+++ b/src/util/screenlog.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/src/util/sphere.cpp b/src/util/sphere.cpp
index 224708684f..457bf9b7d6 100644
--- a/src/util/sphere.cpp
+++ b/src/util/sphere.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/src/util/spicemanager.cpp b/src/util/spicemanager.cpp
index ee8d07f769..9a40c0de17 100644
--- a/src/util/spicemanager.cpp
+++ b/src/util/spicemanager.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/src/util/spicemanager_lua.inl b/src/util/spicemanager_lua.inl
index 06d104bf12..e2d5938b67 100644
--- a/src/util/spicemanager_lua.inl
+++ b/src/util/spicemanager_lua.inl
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/src/util/syncbuffer.cpp b/src/util/syncbuffer.cpp
index 7fc24d91e4..3a7b3836d0 100644
--- a/src/util/syncbuffer.cpp
+++ b/src/util/syncbuffer.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/src/util/task.cpp b/src/util/task.cpp
index 0239ca9850..3c0d5e902c 100644
--- a/src/util/task.cpp
+++ b/src/util/task.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/src/util/taskloader.cpp b/src/util/taskloader.cpp
index 1139e34d64..0870045cdc 100644
--- a/src/util/taskloader.cpp
+++ b/src/util/taskloader.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/src/util/threadpool.cpp b/src/util/threadpool.cpp
index 3b426c1422..d8ccccfd7d 100644
--- a/src/util/threadpool.cpp
+++ b/src/util/threadpool.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/src/util/time.cpp b/src/util/time.cpp
index 97c51265d0..5ae23792e6 100644
--- a/src/util/time.cpp
+++ b/src/util/time.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/src/util/time_lua.inl b/src/util/time_lua.inl
index 9b4abe4f21..f46653e8cb 100644
--- a/src/util/time_lua.inl
+++ b/src/util/time_lua.inl
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/src/util/timeconversion.cpp b/src/util/timeconversion.cpp
index 63e0178662..daacc0b39f 100644
--- a/src/util/timeconversion.cpp
+++ b/src/util/timeconversion.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/src/util/timeline.cpp b/src/util/timeline.cpp
index e326cb492d..4d2ce56089 100644
--- a/src/util/timeline.cpp
+++ b/src/util/timeline.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/src/util/timemanager.cpp b/src/util/timemanager.cpp
index 47cb8875ed..417aeb7739 100644
--- a/src/util/timemanager.cpp
+++ b/src/util/timemanager.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/src/util/timerange.cpp b/src/util/timerange.cpp
index 59f255c6b4..a18826ee60 100644
--- a/src/util/timerange.cpp
+++ b/src/util/timerange.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/src/util/touch.cpp b/src/util/touch.cpp
index aed365a87d..2f2c5bd4e2 100644
--- a/src/util/touch.cpp
+++ b/src/util/touch.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/src/util/transformationmanager.cpp b/src/util/transformationmanager.cpp
index 02e4a6d4a0..f05b888f49 100644
--- a/src/util/transformationmanager.cpp
+++ b/src/util/transformationmanager.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/src/util/tstring.cpp b/src/util/tstring.cpp
index 6eafbdb2c4..ef3ed28bd7 100644
--- a/src/util/tstring.cpp
+++ b/src/util/tstring.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/src/util/universalhelpers.cpp b/src/util/universalhelpers.cpp
index 2dbfd10117..d52b2e0e7c 100644
--- a/src/util/universalhelpers.cpp
+++ b/src/util/universalhelpers.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/src/util/versionchecker.cpp b/src/util/versionchecker.cpp
index 5d7ae63c8e..a589dcbb29 100644
--- a/src/util/versionchecker.cpp
+++ b/src/util/versionchecker.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/support/assetvalidation/AssetValidation.py b/support/assetvalidation/AssetValidation.py
index 68f022c0e5..b77bf1d251 100644
--- a/support/assetvalidation/AssetValidation.py
+++ b/support/assetvalidation/AssetValidation.py
@@ -1,7 +1,7 @@
 """
 OpenSpace
 
-Copyright (c) 2014-2024
+Copyright (c) 2014-2025
 
 Permission is hereby granted, free of charge, to any person obtaining a copy of this
 software and associated documentation files (the "Software"), to deal in the Software
@@ -294,4 +294,4 @@ def runAssetValidation(files: list[pathlib.Path], executable: str, args):
     asyncio.new_event_loop().run_until_complete(mainLoop(files, args.dir))
 
     if startOpenSpace:
-        process.kill()
\ No newline at end of file
+        process.kill()
diff --git a/support/assetvalidation/main.py b/support/assetvalidation/main.py
index 94682ecce1..039685764f 100644
--- a/support/assetvalidation/main.py
+++ b/support/assetvalidation/main.py
@@ -1,7 +1,7 @@
 """
 OpenSpace
 
-Copyright (c) 2014-2024
+Copyright (c) 2014-2025
 
 Permission is hereby granted, free of charge, to any person obtaining a copy of this
 software and associated documentation files (the "Software"), to deal in the Software
@@ -123,4 +123,4 @@ if args.filter:
 files.sort()
 files = files[args.startAt:]
 
-runAssetValidation(files, executable, args)
\ No newline at end of file
+runAssetValidation(files, executable, args)
diff --git a/support/cmake/application_definition.cmake b/support/cmake/application_definition.cmake
index b2464a3ba0..589ae4a06c 100644
--- a/support/cmake/application_definition.cmake
+++ b/support/cmake/application_definition.cmake
@@ -2,7 +2,7 @@
 #                                                                                        #
 # OpenSpace                                                                              #
 #                                                                                        #
-# Copyright (c) 2014-2024                                                                #
+# Copyright (c) 2014-2025                                                                #
 #                                                                                        #
 # Permission is hereby granted, free of charge, to any person obtaining a copy of this   #
 # software and associated documentation files (the "Software"), to deal in the Software  #
diff --git a/support/cmake/global_variables.cmake b/support/cmake/global_variables.cmake
index 1a05eb8d3d..ebe347075c 100644
--- a/support/cmake/global_variables.cmake
+++ b/support/cmake/global_variables.cmake
@@ -2,7 +2,7 @@
 #                                                                                        #
 # OpenSpace                                                                              #
 #                                                                                        #
-# Copyright (c) 2014-2024                                                                #
+# Copyright (c) 2014-2025                                                                #
 #                                                                                        #
 # Permission is hereby granted, free of charge, to any person obtaining a copy of this   #
 # software and associated documentation files (the "Software"), to deal in the Software  #
diff --git a/support/cmake/module_common.cmake b/support/cmake/module_common.cmake
index 8cef114230..6fabc73c90 100644
--- a/support/cmake/module_common.cmake
+++ b/support/cmake/module_common.cmake
@@ -2,7 +2,7 @@
 #                                                                                        #
 # OpenSpace                                                                              #
 #                                                                                        #
-# Copyright (c) 2014-2024                                                                #
+# Copyright (c) 2014-2025                                                                #
 #                                                                                        #
 # Permission is hereby granted, free of charge, to any person obtaining a copy of this   #
 # software and associated documentation files (the "Software"), to deal in the Software  #
diff --git a/support/cmake/module_definition.cmake b/support/cmake/module_definition.cmake
index 11a33eed04..0ca0f68916 100644
--- a/support/cmake/module_definition.cmake
+++ b/support/cmake/module_definition.cmake
@@ -2,7 +2,7 @@
 #                                                                                        #
 # OpenSpace                                                                              #
 #                                                                                        #
-# Copyright (c) 2014-2024                                                                #
+# Copyright (c) 2014-2025                                                                #
 #                                                                                        #
 # Permission is hereby granted, free of charge, to any person obtaining a copy of this   #
 # software and associated documentation files (the "Software"), to deal in the Software  #
diff --git a/support/cmake/openspace_header.template b/support/cmake/openspace_header.template
index 7e1814a580..c1ac4f8ea1 100644
--- a/support/cmake/openspace_header.template
+++ b/support/cmake/openspace_header.template
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/support/cmake/packaging.cmake b/support/cmake/packaging.cmake
index d3000e8231..a02740b0d9 100644
--- a/support/cmake/packaging.cmake
+++ b/support/cmake/packaging.cmake
@@ -2,7 +2,7 @@
 #                                                                                        #
 # OpenSpace                                                                              #
 #                                                                                        #
-# Copyright (c) 2014-2024                                                                #
+# Copyright (c) 2014-2025                                                                #
 #                                                                                        #
 # Permission is hereby granted, free of charge, to any person obtaining a copy of this   #
 # software and associated documentation files (the "Software"), to deal in the Software  #
diff --git a/support/cmake/set_openspace_compile_settings.cmake b/support/cmake/set_openspace_compile_settings.cmake
index 31c578c582..c82fa7fd97 100644
--- a/support/cmake/set_openspace_compile_settings.cmake
+++ b/support/cmake/set_openspace_compile_settings.cmake
@@ -2,7 +2,7 @@
 #                                                                                        #
 # OpenSpace                                                                              #
 #                                                                                        #
-# Copyright (c) 2014-2024                                                                #
+# Copyright (c) 2014-2025                                                                #
 #                                                                                        #
 # Permission is hereby granted, free of charge, to any person obtaining a copy of this   #
 # software and associated documentation files (the "Software"), to deal in the Software  #
diff --git a/support/coding/check_style_guide.py b/support/coding/check_style_guide.py
index f06c90d108..6f034abcaf 100644
--- a/support/coding/check_style_guide.py
+++ b/support/coding/check_style_guide.py
@@ -3,7 +3,7 @@
 """
 OpenSpace
 
-Copyright (c) 2014-2024
+Copyright (c) 2014-2025
 
 Permission is hereby granted, free of charge, to any person obtaining a copy of this
 software and associated documentation files (the "Software"), to deal in the Software
@@ -59,7 +59,7 @@ import os
 import re
 import sys
 
-current_year = '2024'
+current_year = '2025'
 is_strict_mode = False
 is_silent_mode = False
 
diff --git a/support/coding/codegen b/support/coding/codegen
index 784b38767e..967f60ae9d 160000
--- a/support/coding/codegen
+++ b/support/coding/codegen
@@ -1 +1 @@
-Subproject commit 784b38767ede46a24e937f7a6f011943dca15f5d
+Subproject commit 967f60ae9db93418c2ae7fdc9e6f1f355eb7750d
diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
index 25ba287d85..7bcbeac0e7 100644
--- a/tests/CMakeLists.txt
+++ b/tests/CMakeLists.txt
@@ -2,7 +2,7 @@
 #                                                                                        #
 # OpenSpace                                                                              #
 #                                                                                        #
-# Copyright (c) 2014-2024                                                                #
+# Copyright (c) 2014-2025                                                                #
 #                                                                                        #
 # Permission is hereby granted, free of charge, to any person obtaining a copy of this   #
 # software and associated documentation files (the "Software"), to deal in the Software  #
diff --git a/tests/main.cpp b/tests/main.cpp
index 77dd2a7844..f7955cabe6 100644
--- a/tests/main.cpp
+++ b/tests/main.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/tests/property/test_property_listproperties.cpp b/tests/property/test_property_listproperties.cpp
index c3d95f47e9..ce436147c3 100644
--- a/tests/property/test_property_listproperties.cpp
+++ b/tests/property/test_property_listproperties.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/tests/property/test_property_optionproperty.cpp b/tests/property/test_property_optionproperty.cpp
index 061143c7de..ca3fb646d7 100644
--- a/tests/property/test_property_optionproperty.cpp
+++ b/tests/property/test_property_optionproperty.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/tests/property/test_property_selectionproperty.cpp b/tests/property/test_property_selectionproperty.cpp
index 6aa34276a7..9812e01bcd 100644
--- a/tests/property/test_property_selectionproperty.cpp
+++ b/tests/property/test_property_selectionproperty.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/tests/regression/517.cpp b/tests/regression/517.cpp
index 7449450d8a..913544064c 100644
--- a/tests/regression/517.cpp
+++ b/tests/regression/517.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/tests/test_assetloader.cpp b/tests/test_assetloader.cpp
index c170b506e9..257bdfe3de 100644
--- a/tests/test_assetloader.cpp
+++ b/tests/test_assetloader.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/tests/test_concurrentqueue.cpp b/tests/test_concurrentqueue.cpp
index 36b94498fa..74d91b1ebc 100644
--- a/tests/test_concurrentqueue.cpp
+++ b/tests/test_concurrentqueue.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/tests/test_distanceconversion.cpp b/tests/test_distanceconversion.cpp
index b94bb42787..aefb5ad93c 100644
--- a/tests/test_distanceconversion.cpp
+++ b/tests/test_distanceconversion.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/tests/test_documentation.cpp b/tests/test_documentation.cpp
index 6372d89423..88aa78b5aa 100644
--- a/tests/test_documentation.cpp
+++ b/tests/test_documentation.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/tests/test_horizons.cpp b/tests/test_horizons.cpp
index 477b37362e..9639a602df 100644
--- a/tests/test_horizons.cpp
+++ b/tests/test_horizons.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/tests/test_iswamanager.cpp b/tests/test_iswamanager.cpp
index f2464194d1..ec1aa87643 100644
--- a/tests/test_iswamanager.cpp
+++ b/tests/test_iswamanager.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/tests/test_jsonformatting.cpp b/tests/test_jsonformatting.cpp
index abc6e3f360..e45164ee17 100644
--- a/tests/test_jsonformatting.cpp
+++ b/tests/test_jsonformatting.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/tests/test_latlonpatch.cpp b/tests/test_latlonpatch.cpp
index 02897bf3b2..63786ea846 100644
--- a/tests/test_latlonpatch.cpp
+++ b/tests/test_latlonpatch.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/tests/test_lrucache.cpp b/tests/test_lrucache.cpp
index b594386d18..5250f1479b 100644
--- a/tests/test_lrucache.cpp
+++ b/tests/test_lrucache.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/tests/test_lua_createsinglecolorimage.cpp b/tests/test_lua_createsinglecolorimage.cpp
index ff0d53a289..712c12a937 100644
--- a/tests/test_lua_createsinglecolorimage.cpp
+++ b/tests/test_lua_createsinglecolorimage.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/tests/test_profile.cpp b/tests/test_profile.cpp
index a6220fbd28..45e765298a 100644
--- a/tests/test_profile.cpp
+++ b/tests/test_profile.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/tests/test_rawvolumeio.cpp b/tests/test_rawvolumeio.cpp
index b890e0c6d6..e8b1ec0ada 100644
--- a/tests/test_rawvolumeio.cpp
+++ b/tests/test_rawvolumeio.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/tests/test_scriptscheduler.cpp b/tests/test_scriptscheduler.cpp
index cce279fabd..9f58cb95e6 100644
--- a/tests/test_scriptscheduler.cpp
+++ b/tests/test_scriptscheduler.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/tests/test_sessionrecording.cpp b/tests/test_sessionrecording.cpp
index bf63167d23..8b8d0bbcbd 100644
--- a/tests/test_sessionrecording.cpp
+++ b/tests/test_sessionrecording.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/tests/test_settings.cpp b/tests/test_settings.cpp
index de869f6988..758bdfa39a 100644
--- a/tests/test_settings.cpp
+++ b/tests/test_settings.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/tests/test_sgctedit.cpp b/tests/test_sgctedit.cpp
index fa0c9c974d..c91bbb9029 100644
--- a/tests/test_sgctedit.cpp
+++ b/tests/test_sgctedit.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/tests/test_spicemanager.cpp b/tests/test_spicemanager.cpp
index fb257b02c2..cf3e7c78f0 100644
--- a/tests/test_spicemanager.cpp
+++ b/tests/test_spicemanager.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/tests/test_timeconversion.cpp b/tests/test_timeconversion.cpp
index e9718a3cf1..877a70b248 100644
--- a/tests/test_timeconversion.cpp
+++ b/tests/test_timeconversion.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/tests/test_timeline.cpp b/tests/test_timeline.cpp
index 51884024fa..47fd835583 100644
--- a/tests/test_timeline.cpp
+++ b/tests/test_timeline.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/tests/test_timequantizer.cpp b/tests/test_timequantizer.cpp
index 175c926e30..13f1e557e2 100644
--- a/tests/test_timequantizer.cpp
+++ b/tests/test_timequantizer.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2024                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *

From 0979c486d9efc4209421cb0889cb0cf6141dc334 Mon Sep 17 00:00:00 2001
From: Alexander Bock <alexander.bock@liu.se>
Date: Tue, 14 Jan 2025 16:24:15 +0100
Subject: [PATCH 672/701] Update SGCT repository

---
 apps/OpenSpace/ext/sgct | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/apps/OpenSpace/ext/sgct b/apps/OpenSpace/ext/sgct
index 883b70dd9f..965bdc4fee 160000
--- a/apps/OpenSpace/ext/sgct
+++ b/apps/OpenSpace/ext/sgct
@@ -1 +1 @@
-Subproject commit 883b70dd9fe71c0c8a7c5b5cbdf0fe42c7f85108
+Subproject commit 965bdc4fee73b2ec74eafaa0d85fbbdc0be7657e

From 0bc2c4a9ee27d31c0a10ed3e5de087d053b51a3f Mon Sep 17 00:00:00 2001
From: Alexander Bock <alexander.bock@liu.se>
Date: Tue, 14 Jan 2025 16:34:42 +0100
Subject: [PATCH 673/701] Coding style fixes

---
 ext/ghoul                                     |  2 +-
 .../openspace/interaction/sessionrecording.h  |  2 +-
 modules/cefwebgui/cefwebguimodule.cpp         |  2 +-
 modules/exoplanets/datastructure.cpp          |  4 +--
 modules/exoplanets/exoplanetsmodule_lua.inl   |  4 ++-
 .../galaxy/tasks/milkywayconversiontask.cpp   |  2 +-
 modules/video/src/videoplayer.cpp             |  3 ++-
 modules/volume/rendering/volumeclipplane.cpp  |  2 +-
 .../keyframerecordinghandler_lua.inl          |  2 +-
 src/interaction/sessionrecording.cpp          |  2 +-
 src/network/parallelconnection.cpp            | 27 ++++++++++---------
 src/util/time_lua.inl                         |  4 +--
 12 files changed, 30 insertions(+), 26 deletions(-)

diff --git a/ext/ghoul b/ext/ghoul
index e2828e0438..cac65e38d5 160000
--- a/ext/ghoul
+++ b/ext/ghoul
@@ -1 +1 @@
-Subproject commit e2828e043863433119513acbd74bd2cf8622d0a0
+Subproject commit cac65e38d567c89774456d6b4ec5f2e83f21c40d
diff --git a/include/openspace/interaction/sessionrecording.h b/include/openspace/interaction/sessionrecording.h
index 88c890eda8..4603fc2c55 100644
--- a/include/openspace/interaction/sessionrecording.h
+++ b/include/openspace/interaction/sessionrecording.h
@@ -83,4 +83,4 @@ std::vector<ghoul::Dictionary> sessionRecordingToDictionary(
 
 } // namespace openspace::interaction
 
-#endif // __OPENSPACE_CORE___SESSIONRECORDINGHANDLER___H__
+#endif // __OPENSPACE_CORE___SESSIONRECORDING___H__
diff --git a/modules/cefwebgui/cefwebguimodule.cpp b/modules/cefwebgui/cefwebguimodule.cpp
index aa8750729a..89f90478ce 100644
--- a/modules/cefwebgui/cefwebguimodule.cpp
+++ b/modules/cefwebgui/cefwebguimodule.cpp
@@ -228,7 +228,7 @@ void CefWebGuiModule::internalInitialize(const ghoul::Dictionary& configuration)
     });
 
     global::callback::postDraw->emplace_back([this]() {
-        bool windowChanged = global::windowDelegate->windowHasResized(); 
+        bool windowChanged = global::windowDelegate->windowHasResized();
         if (_instance && (windowChanged || _instance->_shouldReshape)) {
             const glm::ivec2 res = global::windowDelegate->guiWindowResolution();
             _instance->reshape(static_cast<glm::ivec2>(
diff --git a/modules/exoplanets/datastructure.cpp b/modules/exoplanets/datastructure.cpp
index 0ba731055d..9f9b0ceb92 100644
--- a/modules/exoplanets/datastructure.cpp
+++ b/modules/exoplanets/datastructure.cpp
@@ -138,8 +138,8 @@ namespace {
             bool hasUsedDefaultValues;
         };
 
-        // A list of data tables for the planets in the system (that have enough data to be
-        // visualized), with data about the planet and its orbit.
+        // A list of data tables for the planets in the system (that have enough data to
+        // be visualized), with data about the planet and its orbit.
         std::vector<Planet> planets;
 
         // A rotation matrix to use for the entire system's rotation. Broadly speaking, it
diff --git a/modules/exoplanets/exoplanetsmodule_lua.inl b/modules/exoplanets/exoplanetsmodule_lua.inl
index d2b3bee0d4..460c786a1a 100644
--- a/modules/exoplanets/exoplanetsmodule_lua.inl
+++ b/modules/exoplanets/exoplanetsmodule_lua.inl
@@ -277,7 +277,9 @@ listOfExoplanetsDeprecated()
 
     std::ifstream inputDataFile(csvFile);
     if (!inputDataFile.good()) {
-        throw ghoul::lua::LuaError(std::format("Failed to open input file '{}'", csvFile));
+        throw ghoul::lua::LuaError(std::format(
+            "Failed to open input file '{}'", csvFile
+        ));
     }
 
     std::vector<std::string> columnNames =
diff --git a/modules/galaxy/tasks/milkywayconversiontask.cpp b/modules/galaxy/tasks/milkywayconversiontask.cpp
index 10c5e237d7..d2d2b219c1 100644
--- a/modules/galaxy/tasks/milkywayconversiontask.cpp
+++ b/modules/galaxy/tasks/milkywayconversiontask.cpp
@@ -43,7 +43,7 @@ namespace {
 } // namespace
 
 namespace openspace {
-    
+
 documentation::Documentation MilkywayConversionTask::Documentation() {
     return codegen::doc<Parameters>("galaxy_milkywayconversiontask");
 }
diff --git a/modules/video/src/videoplayer.cpp b/modules/video/src/videoplayer.cpp
index e72c3d4938..35e5aefbcf 100644
--- a/modules/video/src/videoplayer.cpp
+++ b/modules/video/src/videoplayer.cpp
@@ -496,7 +496,8 @@ void VideoPlayer::update() {
     }
 
     if (global::sessionRecordingHandler->isSavingFramesDuringPlayback()) {
-        const double dt = global::sessionRecordingHandler->fixedDeltaTimeDuringFrameOutput();
+        const double dt =
+            global::sessionRecordingHandler->fixedDeltaTimeDuringFrameOutput();
         if (_playbackMode == PlaybackMode::MapToSimulationTime) {
             _currentVideoTime = correctVideoPlaybackTime();
         }
diff --git a/modules/volume/rendering/volumeclipplane.cpp b/modules/volume/rendering/volumeclipplane.cpp
index 73d1afcf68..8ba0d38877 100644
--- a/modules/volume/rendering/volumeclipplane.cpp
+++ b/modules/volume/rendering/volumeclipplane.cpp
@@ -57,7 +57,7 @@ namespace openspace::volume {
 VolumeClipPlane::VolumeClipPlane(const ghoul::Dictionary& dictionary)
     : properties::PropertyOwner({ "" }) // @TODO Missing name
     , _normal(
-        NormalInfo, 
+        NormalInfo,
         glm::vec3(1.f, 0.f, 0.f),
         glm::vec3(-1.f),
         glm::vec3(1.f)
diff --git a/src/interaction/keyframerecordinghandler_lua.inl b/src/interaction/keyframerecordinghandler_lua.inl
index a2d3ad600f..605e06e49b 100644
--- a/src/interaction/keyframerecordinghandler_lua.inl
+++ b/src/interaction/keyframerecordinghandler_lua.inl
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2023                                                               *
+ * Copyright (c) 2014-2025                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *
diff --git a/src/interaction/sessionrecording.cpp b/src/interaction/sessionrecording.cpp
index 88c22a9c8d..acea0cff90 100644
--- a/src/interaction/sessionrecording.cpp
+++ b/src/interaction/sessionrecording.cpp
@@ -146,7 +146,7 @@ namespace {
         return result;
     }
 
-    void writeHeader(std::ostream& stream, const Header& header) { 
+    void writeHeader(std::ostream& stream, const Header& header) {
         stream.write(Header::MagicBytes.data(), Header::MagicBytes.size());
 
         std::string_view version = [&header]() {
diff --git a/src/network/parallelconnection.cpp b/src/network/parallelconnection.cpp
index 722edc15eb..28672ec517 100644
--- a/src/network/parallelconnection.cpp
+++ b/src/network/parallelconnection.cpp
@@ -90,33 +90,34 @@ void ParallelConnection::sendDataMessage(const DataMessage& dataMessage) {
 bool ParallelConnection::sendMessage(const Message& message) {
     const uint8_t messageTypeOut = static_cast<uint8_t>(message.type);
     const uint32_t messageSizeOut = static_cast<uint32_t>(message.content.size());
-    std::vector<char> header;
+    std::vector<char> payload;
 
-    //insert header into buffer
-    header.push_back('O');
-    header.push_back('S');
+    // insert header into buffer
+    payload.push_back('O');
+    payload.push_back('S');
 
-    header.insert(header.end(),
+    payload.insert(
+        payload.end(),
         reinterpret_cast<const char*>(&ProtocolVersion),
         reinterpret_cast<const char*>(&ProtocolVersion) + sizeof(uint8_t)
     );
 
-    header.insert(header.end(),
+    payload.insert(
+        payload.end(),
         reinterpret_cast<const char*>(&messageTypeOut),
         reinterpret_cast<const char*>(&messageTypeOut) + sizeof(uint8_t)
     );
 
-    header.insert(header.end(),
+    payload.insert(
+        payload.end(),
         reinterpret_cast<const char*>(&messageSizeOut),
         reinterpret_cast<const char*>(&messageSizeOut) + sizeof(uint32_t)
     );
 
-    const bool res = _socket->put<char>(header.data(), header.size());
-    if (!res) {
-        return false;
-    }
-    const bool res2 = _socket->put<char>(message.content.data(), message.content.size());
-    return res2;
+    payload.insert(payload.end(), message.content.begin(), message.content.end());
+
+    const bool res = _socket->put<char>(payload.data(), payload.size());
+    return res;
 }
 
 void ParallelConnection::disconnect() {
diff --git a/src/util/time_lua.inl b/src/util/time_lua.inl
index f46653e8cb..12df5b4c23 100644
--- a/src/util/time_lua.inl
+++ b/src/util/time_lua.inl
@@ -429,8 +429,8 @@ namespace {
  * or vice versa.
  *
  * If the given time is a timestamp, the function returns a double precision value
- * representing the ephemeris version of that time; that is, the number of TDB seconds past
- * the J2000 epoch.
+ * representing the ephemeris version of that time; that is, the number of TDB seconds
+ * past the J2000 epoch.
  *
  * If the given time is a J2000 seconds value, the function returns a ISO 8601 timestamp.
  *

From 318742508963351cc871acf4c4c2d82069c188f7 Mon Sep 17 00:00:00 2001
From: Alexander Bock <alexander.bock@liu.se>
Date: Tue, 14 Jan 2025 16:51:21 +0100
Subject: [PATCH 674/701] Add support for custom TriggerProperty (closes #3487)

---
 src/scene/scene_lua.inl | 130 ++++++++++++++++++++++++----------------
 1 file changed, 77 insertions(+), 53 deletions(-)

diff --git a/src/scene/scene_lua.inl b/src/scene/scene_lua.inl
index c005f68364..5fefdcbb42 100644
--- a/src/scene/scene_lua.inl
+++ b/src/scene/scene_lua.inl
@@ -1035,30 +1035,51 @@ void createCustomProperty(openspace::properties::Property::PropertyInfo info,
     openspace::global::userPropertyOwner->addProperty(p);
 }
 
+template <>
+void createCustomProperty<openspace::properties::TriggerProperty>(
+                                       openspace::properties::Property::PropertyInfo info,
+                                                      std::optional<std::string> onChange)
+{
+    using namespace openspace::properties;
+    TriggerProperty* p = new TriggerProperty(info);
+    if (onChange.has_value() && !onChange->empty()) {
+        p->onChange(
+            [p, script = *onChange]() {
+                using namespace ghoul::lua;
+                LuaState s;
+                openspace::global::scriptEngine->initializeLuaState(s);
+                ghoul::lua::runScript(s, script);
+            }
+        );
+    }
+    openspace::global::userPropertyOwner->addProperty(p);
+}
+
 enum class [[codegen::enum]] CustomPropertyType {
+    BoolProperty,
+    DoubleProperty,
     DMat2Property,
     DMat3Property,
     DMat4Property,
-    Mat2Property,
-    Mat3Property,
-    Mat4Property,
-    BoolProperty,
-    DoubleProperty,
-    FloatProperty,
-    IntProperty,
-    StringProperty,
-    StringListProperty,
-    LongProperty,
-    ShortProperty,
-    UShortProperty,
-    UIntProperty,
-    ULongProperty,
     DVec2Property,
     DVec3Property,
     DVec4Property,
+    FloatProperty,
+    IntProperty,
     IVec2Property,
     IVec3Property,
     IVec4Property,
+    LongProperty,
+    Mat2Property,
+    Mat3Property,
+    Mat4Property,
+    ShortProperty,
+    StringProperty,
+    StringListProperty,
+    TriggerProperty,
+    UShortProperty,
+    UIntProperty,
+    ULongProperty,
     UVec2Property,
     UVec3Property,
     UVec4Property,
@@ -1121,6 +1142,9 @@ enum class [[codegen::enum]] CustomPropertyType {
         description.has_value() ? description->c_str() : ""
     };
     switch (type) {
+        case CustomPropertyType::BoolProperty:
+            createCustomProperty<BoolProperty>(info, std::move(onChange));
+            return;
         case CustomPropertyType::DMat2Property:
             createCustomProperty<DMat2Property>(info, std::move(onChange));
             return;
@@ -1130,48 +1154,9 @@ enum class [[codegen::enum]] CustomPropertyType {
         case CustomPropertyType::DMat4Property:
             createCustomProperty<DMat4Property>(info, std::move(onChange));
             return;
-        case CustomPropertyType::Mat2Property:
-            createCustomProperty<Mat2Property>(info, std::move(onChange));
-            return;
-        case CustomPropertyType::Mat3Property:
-            createCustomProperty<Mat3Property>(info, std::move(onChange));
-            return;
-        case CustomPropertyType::Mat4Property:
-            createCustomProperty<Mat4Property>(info, std::move(onChange));
-            return;
-        case CustomPropertyType::BoolProperty:
-            createCustomProperty<BoolProperty>(info, std::move(onChange));
-            return;
         case CustomPropertyType::DoubleProperty:
             createCustomProperty<DoubleProperty>(info, std::move(onChange));
             return;
-        case CustomPropertyType::FloatProperty:
-            createCustomProperty<FloatProperty>(info, std::move(onChange));
-            return;
-        case CustomPropertyType::IntProperty:
-            createCustomProperty<IntProperty>(info, std::move(onChange));
-            return;
-        case CustomPropertyType::StringProperty:
-            createCustomProperty<StringProperty>(info, std::move(onChange));
-            return;
-        case CustomPropertyType::StringListProperty:
-            createCustomProperty<StringListProperty>(info, std::move(onChange));
-            return;
-        case CustomPropertyType::LongProperty:
-            createCustomProperty<LongProperty>(info, std::move(onChange));
-            return;
-        case CustomPropertyType::ShortProperty:
-            createCustomProperty<ShortProperty>(info, std::move(onChange));
-            return;
-        case CustomPropertyType::UIntProperty:
-            createCustomProperty<UIntProperty>(info, std::move(onChange));
-            return;
-        case CustomPropertyType::ULongProperty:
-            createCustomProperty<ULongProperty>(info, std::move(onChange));
-            return;
-        case CustomPropertyType::UShortProperty:
-            createCustomProperty<UShortProperty>(info, std::move(onChange));
-            return;
         case CustomPropertyType::DVec2Property:
             createCustomProperty<DVec2Property>(info, std::move(onChange));
             return;
@@ -1181,6 +1166,12 @@ enum class [[codegen::enum]] CustomPropertyType {
         case CustomPropertyType::DVec4Property:
             createCustomProperty<DVec4Property>(info, std::move(onChange));
             return;
+        case CustomPropertyType::FloatProperty:
+            createCustomProperty<FloatProperty>(info, std::move(onChange));
+            return;
+        case CustomPropertyType::IntProperty:
+            createCustomProperty<IntProperty>(info, std::move(onChange));
+            return;
         case CustomPropertyType::IVec2Property:
             createCustomProperty<IVec2Property>(info, std::move(onChange));
             return;
@@ -1190,6 +1181,39 @@ enum class [[codegen::enum]] CustomPropertyType {
         case CustomPropertyType::IVec4Property:
             createCustomProperty<IVec4Property>(info, std::move(onChange));
             return;
+        case CustomPropertyType::LongProperty:
+            createCustomProperty<LongProperty>(info, std::move(onChange));
+            return;
+        case CustomPropertyType::Mat2Property:
+            createCustomProperty<Mat2Property>(info, std::move(onChange));
+            return;
+        case CustomPropertyType::Mat3Property:
+            createCustomProperty<Mat3Property>(info, std::move(onChange));
+            return;
+        case CustomPropertyType::Mat4Property:
+            createCustomProperty<Mat4Property>(info, std::move(onChange));
+            return;
+        case CustomPropertyType::ShortProperty:
+            createCustomProperty<ShortProperty>(info, std::move(onChange));
+            return;
+        case CustomPropertyType::StringProperty:
+            createCustomProperty<StringProperty>(info, std::move(onChange));
+            return;
+        case CustomPropertyType::StringListProperty:
+            createCustomProperty<StringListProperty>(info, std::move(onChange));
+            return;
+        case CustomPropertyType::TriggerProperty:
+            createCustomProperty<TriggerProperty>(info, std::move(onChange));
+            return;
+        case CustomPropertyType::UIntProperty:
+            createCustomProperty<UIntProperty>(info, std::move(onChange));
+            return;
+        case CustomPropertyType::ULongProperty:
+            createCustomProperty<ULongProperty>(info, std::move(onChange));
+            return;
+        case CustomPropertyType::UShortProperty:
+            createCustomProperty<UShortProperty>(info, std::move(onChange));
+            return;
         case CustomPropertyType::UVec2Property:
             createCustomProperty<UVec2Property>(info, std::move(onChange));
             return;

From 6a1abf25d6222ff264b7086a4480ab27d4920fde Mon Sep 17 00:00:00 2001
From: Alexander Bock <alexander.bock@liu.se>
Date: Tue, 14 Jan 2025 16:55:33 +0100
Subject: [PATCH 675/701] Timeout correctly when rendering the LoadingScreen
 with a very small window resolution (closes #3473)

---
 src/rendering/loadingscreen.cpp | 9 ++-------
 1 file changed, 2 insertions(+), 7 deletions(-)

diff --git a/src/rendering/loadingscreen.cpp b/src/rendering/loadingscreen.cpp
index f6cad8c0d1..0e8da6285c 100644
--- a/src/rendering/loadingscreen.cpp
+++ b/src/rendering/loadingscreen.cpp
@@ -406,11 +406,11 @@ void LoadingScreen::render() {
                 for (; i < MaxNumberLocationSamples; i++) {
                     std::uniform_int_distribution<int> distX(
                         15,
-                        static_cast<int>(res.x - b.x - 15)
+                        std::max(static_cast<int>(res.x - b.x - 15), 15)
                     );
                     std::uniform_int_distribution<int> distY(
                         15,
-                        static_cast<int>(res.y - b.y - 15)
+                        std::max(static_cast<int>(res.y - b.y - 15), 15)
                     );
 
                     ll = glm::vec2(distX(_randomEngine), distY(_randomEngine));
@@ -436,11 +436,6 @@ void LoadingScreen::render() {
                         false;
 
                     if (logoOverlap || loadingOverlap || messageOverlap || logOverlap) {
-                        // We never want to have an overlap with these, so this try didn't
-                        // count against the maximum, thus ensuring that (if there has to
-                        // be an overlap, it's over other text that might disappear before
-                        // this one)
-                        --i;
                         continue;
                     }
 

From b16327f90a47cc54634958a06b44584c84d6aebe Mon Sep 17 00:00:00 2001
From: Alexander Bock <alexander.bock@liu.se>
Date: Wed, 15 Jan 2025 11:19:00 +0100
Subject: [PATCH 676/701] Use existing codegen::private (closes #3433)

---
 modules/base/rendering/screenspacedashboard.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/base/rendering/screenspacedashboard.cpp b/modules/base/rendering/screenspacedashboard.cpp
index 5a38aa6443..b50466f75d 100644
--- a/modules/base/rendering/screenspacedashboard.cpp
+++ b/modules/base/rendering/screenspacedashboard.cpp
@@ -46,7 +46,7 @@ namespace {
     };
 
     struct [[codegen::Dictionary(ScreenSpaceDashboard)]] Parameters {
-        std::optional<std::string> identifier;
+        std::optional<std::string> identifier [[codegen::private()]];
 
         // [[codegen::verbatim(UseMainInfo.description)]]
         std::optional<bool> useMainDashboard;

From 179f556bacfd34f43c7c7be98d1902d51813ee7d Mon Sep 17 00:00:00 2001
From: Alexander Bock <alexander.bock@liu.se>
Date: Wed, 15 Jan 2025 11:23:51 +0100
Subject: [PATCH 677/701] Overwrite locale to C (#3474)

---
 apps/OpenSpace/main.cpp | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/apps/OpenSpace/main.cpp b/apps/OpenSpace/main.cpp
index cd9b3662d9..961627079c 100644
--- a/apps/OpenSpace/main.cpp
+++ b/apps/OpenSpace/main.cpp
@@ -1137,6 +1137,8 @@ int main(int argc, char* argv[]) {
     _controlfp(_controlfp(0, 0) & ~(_EM_ZERODIVIDE | _EM_OVERFLOW), _MCW_EM);
 #endif // OPENSPACE_BREAK_ON_FLOATING_POINT_EXCEPTION
 
+    std::setlocale(LC_ALL, "C");
+
 #ifdef WIN32
     SetUnhandledExceptionFilter(generateMiniDump);
 #endif // WIN32

From bef6a79b53b371de33f9223292c19ee2a6ff67f0 Mon Sep 17 00:00:00 2001
From: Alexander Bock <alexander.bock@liu.se>
Date: Wed, 15 Jan 2025 11:33:23 +0100
Subject: [PATCH 678/701] Update Ghoul repository

---
 ext/ghoul | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ext/ghoul b/ext/ghoul
index cac65e38d5..96bf82e968 160000
--- a/ext/ghoul
+++ b/ext/ghoul
@@ -1 +1 @@
-Subproject commit cac65e38d567c89774456d6b4ec5f2e83f21c40d
+Subproject commit 96bf82e9682ab924479fa72470e42f9a36f7ca60

From d2c66d47828ea53fea0b3a55d1b76c6e952a3abe Mon Sep 17 00:00:00 2001
From: Alexander Bock <alexander.bock@liu.se>
Date: Wed, 15 Jan 2025 11:53:01 +0100
Subject: [PATCH 679/701] Add documentation of spacecraftinstrument module
 types (closes #1847)

---
 .../dashboard/dashboarditeminstruments.cpp                  | 6 ++++++
 modules/spacecraftinstruments/rendering/renderablefov.cpp   | 6 +++++-
 .../rendering/renderablemodelprojection.cpp                 | 6 ++++++
 .../rendering/renderableplaneprojection.cpp                 | 6 ++++++
 .../rendering/renderableplanetprojection.cpp                | 6 ++++++
 .../rendering/renderableshadowcylinder.cpp                  | 6 ++++++
 6 files changed, 35 insertions(+), 1 deletion(-)

diff --git a/modules/spacecraftinstruments/dashboard/dashboarditeminstruments.cpp b/modules/spacecraftinstruments/dashboard/dashboarditeminstruments.cpp
index 151e7c8baa..da1bebe296 100644
--- a/modules/spacecraftinstruments/dashboard/dashboarditeminstruments.cpp
+++ b/modules/spacecraftinstruments/dashboard/dashboarditeminstruments.cpp
@@ -74,6 +74,12 @@ namespace {
         return glm::vec2(std::max(lhs.x, rhs.x), lhs.y + rhs.y);
     }
 
+    // This dashboard item shows information about the status of individual instruments
+    // onboard a spacecraft with regards to upcoming image capture. An image sequence has
+    // to be registered in order to be able to show the necessary information. The
+    // dashboard item shows a visual representation on how much time has passed since the
+    // previous image capture and how much time remains until the instrument captures the
+    // next image.
     struct [[codegen::Dictionary(DashboardItemInstruments)]] Parameters {
         // [[codegen::verbatim(ActiveColorInfo.description)]]
         std::optional<glm::vec3> activeColor [[codegen::color()]];
diff --git a/modules/spacecraftinstruments/rendering/renderablefov.cpp b/modules/spacecraftinstruments/rendering/renderablefov.cpp
index 5a8da0188c..40e980d6bb 100644
--- a/modules/spacecraftinstruments/rendering/renderablefov.cpp
+++ b/modules/spacecraftinstruments/rendering/renderablefov.cpp
@@ -142,7 +142,11 @@ namespace {
         }
     }
 
-    // Needs support for std::map first for the frameConversions
+    // This Renderable type shows a visual representation of a spacecraft instrument's
+    // field-of-view. Information about the field-of-view are extracted from SPICE kernels
+    // that must be loaded with the correct information. By default a field-of-view is
+    // only visible while an instrument is active, but the field-of-view can be made
+    // visible at all times through the `AlwaysDrawFov` setting.
     struct [[codegen::Dictionary(RenderableFov)]] Parameters {
         // The SPICE name of the source body for which the field of view should be
         // rendered.
diff --git a/modules/spacecraftinstruments/rendering/renderablemodelprojection.cpp b/modules/spacecraftinstruments/rendering/renderablemodelprojection.cpp
index 7f724cc3dc..8c16dca39a 100644
--- a/modules/spacecraftinstruments/rendering/renderablemodelprojection.cpp
+++ b/modules/spacecraftinstruments/rendering/renderablemodelprojection.cpp
@@ -47,6 +47,12 @@ namespace {
         openspace::properties::Property::Visibility::NoviceUser
     };
 
+    // Similarly to the [RenderablePlaneProjection](renderableplaneprojection) and
+    // [RenderablePlanetProjection](renderableplanetprojection), this Renderable type
+    // servers as a potential target for image projections from a spacecraft's instrument.
+    // This renderable will determine whenever an image in a currently loaded image
+    // sequence is projected whether that instrument's field of view intersects this model
+    // and will correctly project the captured image onto the model.
     struct [[codegen::Dictionary(RenderableModelProjection)]] Parameters {
         // The file or files that should be loaded, that specifies the model to load. The
         // file can contain filesystem tokens or can be specified relative to the
diff --git a/modules/spacecraftinstruments/rendering/renderableplaneprojection.cpp b/modules/spacecraftinstruments/rendering/renderableplaneprojection.cpp
index 47cf8125cc..847d78dc88 100644
--- a/modules/spacecraftinstruments/rendering/renderableplaneprojection.cpp
+++ b/modules/spacecraftinstruments/rendering/renderableplaneprojection.cpp
@@ -44,6 +44,12 @@
 namespace {
     constexpr std::string_view _loggerCat = "RenderablePlaneProjection";
 
+    // This specialized Renderable type is used as a target for projections from a
+    // spacecraft instrument. Similarly to the
+    // [RenderablePlanetProject](renderableplanetprojection) it uses the spacecraft's
+    // position and orientation and information about an instruments field-of-view and
+    // set of images to project a captured image. In the case of this renderable the
+    // target geometry is a two-dimensional plane that the image is projected on.
     struct [[codegen::Dictionary(RenderablePlaneProjection)]] Parameters {
         // The SPICE name of the spacecraft from which the projection is performed.
         std::string spacecraft;
diff --git a/modules/spacecraftinstruments/rendering/renderableplanetprojection.cpp b/modules/spacecraftinstruments/rendering/renderableplanetprojection.cpp
index d4e185c243..c55297182b 100644
--- a/modules/spacecraftinstruments/rendering/renderableplanetprojection.cpp
+++ b/modules/spacecraftinstruments/rendering/renderableplanetprojection.cpp
@@ -137,6 +137,12 @@ namespace {
         openspace::properties::Property::Visibility::AdvancedUser
     };
 
+    // This Renderable serves as a potential target for images projected from a
+    // spacecraft's instrument. Images have to be loaded into an image sequence first and
+    // when it is then time to project an image into the world from the point of view of
+    // the instrument, the field-of-view will be checked against the extent of this
+    // planetary body. If the field-of-view intersects, the image gets correctly projected
+    // onto the surface.
     struct [[codegen::Dictionary(RenderablePlanetProjection)]] Parameters {
         // Contains information about projecting onto this planet.
         ghoul::Dictionary projection
diff --git a/modules/spacecraftinstruments/rendering/renderableshadowcylinder.cpp b/modules/spacecraftinstruments/rendering/renderableshadowcylinder.cpp
index fc8737ce5a..bc9764f25e 100644
--- a/modules/spacecraftinstruments/rendering/renderableshadowcylinder.cpp
+++ b/modules/spacecraftinstruments/rendering/renderableshadowcylinder.cpp
@@ -105,6 +105,12 @@ namespace {
         openspace::properties::Property::Visibility::AdvancedUser
     };
 
+    // This Renderable displays the shadow cylinder behind a planetary body. Given the
+    // SPICE name of a planetary body and an observer, it will show a cylinder extending
+    // behind the body away from the observer to highlight the areas of space from which
+    // the observer is occluded by the body. A concrete example is using the Sun as the
+    // observer, in which case the shadow cylinder indicates the areas in which there is
+    // darkness.
     struct [[codegen::Dictionary(RenderableShadowCylinder)]] Parameters {
         // [[codegen::verbatim(NumberPointsInfo.description)]]
         std::optional<int> numberOfPoints;

From c01ce9b09ded3c2ff5ac2a7fe8a0cee9f0f41f1d Mon Sep 17 00:00:00 2001
From: Alexander Bock <alexander.bock@liu.se>
Date: Wed, 15 Jan 2025 12:05:12 +0100
Subject: [PATCH 680/701] Add the ability to schedule scripts based on
 wallclock time (closes #1773)

---
 include/openspace/scripting/scriptengine.h | 11 +++++++++++
 src/scripting/scriptengine.cpp             | 20 +++++++++++++++++++-
 src/scripting/scriptengine_lua.inl         |  9 +++++++++
 3 files changed, 39 insertions(+), 1 deletion(-)

diff --git a/include/openspace/scripting/scriptengine.h b/include/openspace/scripting/scriptengine.h
index b28a60163a..ce73d11f47 100644
--- a/include/openspace/scripting/scriptengine.h
+++ b/include/openspace/scripting/scriptengine.h
@@ -115,6 +115,8 @@ public:
         double timeout, std::string preScript = "", std::string postScript = "");
     void removeRepeatedScript(std::string_view identifier);
 
+    void scheduleScript(std::string script, double delay);
+
     std::vector<std::string> allLuaFunctions() const;
     const std::vector<LuaLibrary>& allLuaLibraries() const;
 
@@ -158,6 +160,15 @@ private:
     };
     std::vector<RepeatedScriptInfo> _repeatedScripts;
 
+    struct ScheduledScriptInfo {
+        // The script that should be executed
+        std::string script;
+
+        // The application timestamp at which time the script should be executed
+        double timestamp = 0.0;
+    };
+    std::vector<ScheduledScriptInfo> _scheduledScripts;
+
     // Logging variables
     bool _logFileExists = false;
     bool _logScripts = true;
diff --git a/src/scripting/scriptengine.cpp b/src/scripting/scriptengine.cpp
index 0b1878a9b8..f8b1915e2e 100644
--- a/src/scripting/scriptengine.cpp
+++ b/src/scripting/scriptengine.cpp
@@ -572,6 +572,15 @@ void ScriptEngine::postSync(bool isMaster) {
             info.lastRun = now;
         }
     }
+
+    for (size_t i = 0; i < _scheduledScripts.size(); i++) {
+        const ScheduledScriptInfo& info = _scheduledScripts[i];
+        if (now > info.timestamp) {
+            runScript({ info.script });
+            _scheduledScripts.erase(_scheduledScripts.begin() + i);
+            i--;
+        }
+    }
 }
 
 void ScriptEngine::queueScript(Script script) {
@@ -636,6 +645,14 @@ void ScriptEngine::removeRepeatedScript(std::string_view identifier) {
     }
 }
 
+void ScriptEngine::scheduleScript(std::string script, double delay) {
+    double now =
+        global::sessionRecordingHandler->isSavingFramesDuringPlayback() ?
+        global::sessionRecordingHandler->currentApplicationInterpolationTime() :
+        global::windowDelegate->applicationTime();
+    _scheduledScripts.emplace_back(std::move(script), now + delay);
+}
+
 void ScriptEngine::addBaseLibrary() {
     ZoneScoped;
 
@@ -715,7 +732,8 @@ void ScriptEngine::addBaseLibrary() {
             codegen::lua::DirectoryForPath,
             codegen::lua::UnzipFile,
             codegen::lua::RegisterRepeatedScript,
-            codegen::lua::RemoveRepeatedScript
+            codegen::lua::RemoveRepeatedScript,
+            codegen::lua::ScheduleScript
         }
     };
     addLibrary(lib);
diff --git a/src/scripting/scriptengine_lua.inl b/src/scripting/scriptengine_lua.inl
index 8c038f308d..0e24921205 100644
--- a/src/scripting/scriptengine_lua.inl
+++ b/src/scripting/scriptengine_lua.inl
@@ -312,6 +312,15 @@ std::vector<std::filesystem::path> walkCommon(const std::filesystem::path& path,
     openspace::global::scriptEngine->removeRepeatedScript(identifier);
 }
 
+/**
+ * Schedules a `script` to be run in `delay` seconds. The delay is measured in wallclock
+ * time, which is seconds that occur in the real world, not in relation to the in-game
+ * time.
+ */
+[[codegen::luawrap]] void scheduleScript(std::string script, double delay) {
+    openspace::global::scriptEngine->scheduleScript(std::move(script), delay);
+}
+
 #include "scriptengine_lua_codegen.cpp"
 
 } // namespace

From 3c61857127eb97908a877738885d6fb10b21af97 Mon Sep 17 00:00:00 2001
From: Malin E <malin.ejdbo@gmail.com>
Date: Wed, 15 Jan 2025 14:54:55 +0100
Subject: [PATCH 681/701] Fix blending and depth issue with RenderableSpheres

* There is now a bool setting to turn off depth writing and testing for
  RenderableSpheres (useful for background images).

* There is also an Option setting to choose blending mode, similar to
  the setting that RenderablModel has.

* NOTE: The default behaviour for RenderableSphere have now changed.
  Before it was always additive blending that was used but now it is
  default blending that is used by default. If additive blending is
  wanted, then use the option setting and select it instead.
---
 .../digitaluniverse/allsky_visible.asset      |  4 +-
 modules/base/rendering/renderablesphere.cpp   | 76 ++++++++++++++++++-
 modules/base/rendering/renderablesphere.h     |  2 +
 3 files changed, 80 insertions(+), 2 deletions(-)

diff --git a/data/assets/scene/digitaluniverse/allsky_visible.asset b/data/assets/scene/digitaluniverse/allsky_visible.asset
index 437d4f492c..2a40c61c6e 100644
--- a/data/assets/scene/digitaluniverse/allsky_visible.asset
+++ b/data/assets/scene/digitaluniverse/allsky_visible.asset
@@ -23,7 +23,9 @@ local Object = {
     Orientation = "Inside",
     MirrorTexture = true,
     FadeOutThreshold = 0.0015,
-    DimInAtmosphere = true
+    DimInAtmosphere = true,
+    RenderBinMode = "Background",
+    DisableDepth = true
   },
   Tag = { "daytime_hidden" },
   GUI = {
diff --git a/modules/base/rendering/renderablesphere.cpp b/modules/base/rendering/renderablesphere.cpp
index 3dba89b11d..61029ddf06 100644
--- a/modules/base/rendering/renderablesphere.cpp
+++ b/modules/base/rendering/renderablesphere.cpp
@@ -40,6 +40,18 @@
 #include <optional>
 
 namespace {
+    constexpr int DefaultBlending = 0;
+    constexpr int AdditiveBlending = 1;
+    constexpr int PolygonBlending = 2;
+    constexpr int ColorAddingBlending = 3;
+
+    std::map<std::string, int> BlendingMapping = {
+        { "Default", DefaultBlending },
+        { "Additive", AdditiveBlending },
+        { "Polygon", PolygonBlending },
+        { "Color Adding", ColorAddingBlending }
+    };
+
     constexpr openspace::properties::Property::PropertyInfo SizeInfo = {
         "Size",
         "Size (in meters)",
@@ -100,6 +112,23 @@ namespace {
         openspace::properties::Property::Visibility::AdvancedUser
     };
 
+    constexpr openspace::properties::Property::PropertyInfo BlendingOptionInfo = {
+        "BlendingOption",
+        "Blending Options",
+        "Controls the blending function used to calculate the colors of the sphere with "
+        "respect to the opacity.",
+        openspace::properties::Property::Visibility::AdvancedUser
+    };
+
+    constexpr openspace::properties::Property::PropertyInfo DisableDepthInfo = {
+        "DisableDepth",
+        "Disable Depth",
+        "If disabled, no depth values are taken into account for this sphere, meaning "
+        "that depth values are neither written or tested against during the rendering. "
+        "This can be useful for spheres that represent a background image.",
+        openspace::properties::Property::Visibility::AdvancedUser
+    };
+
     struct [[codegen::Dictionary(RenderableSphere)]] Parameters {
         // [[codegen::verbatim(SizeInfo.description)]]
         std::optional<float> size [[codegen::greater(0.f)]];
@@ -127,6 +156,12 @@ namespace {
 
         // [[codegen::verbatim(FadeOutThresholdInfo.description)]]
         std::optional<float> fadeOutThreshold [[codegen::inrange(0.0, 1.0)]];
+
+        // [[codegen::verbatim(BlendingOptionInfo.description)]]
+        std::optional<std::string> blendingOption;
+
+        // [[codegen::verbatim(DisableDepthInfo.description)]]
+        std::optional<bool> disableDepth;
     };
 #include "renderablesphere_codegen.cpp"
 } // namespace
@@ -146,6 +181,11 @@ RenderableSphere::RenderableSphere(const ghoul::Dictionary& dictionary)
     , _disableFadeInDistance(DisableFadeInOutInfo, false)
     , _fadeInThreshold(FadeInThresholdInfo, 0.f, 0.f, 1.f, 0.001f)
     , _fadeOutThreshold(FadeOutThresholdInfo, 0.f, 0.f, 1.f, 0.001f)
+    , _blendingFuncOption(
+        BlendingOptionInfo,
+        properties::OptionProperty::DisplayType::Dropdown
+    )
+    , _disableDepth(DisableDepthInfo, false)
 {
     const Parameters p = codegen::bake<Parameters>(dictionary);
 
@@ -187,6 +227,21 @@ RenderableSphere::RenderableSphere(const ghoul::Dictionary& dictionary)
     _fadeOutThreshold = p.fadeOutThreshold.value_or(_fadeOutThreshold);
     addProperty(_fadeOutThreshold);
 
+    _blendingFuncOption.addOption(DefaultBlending, "Default");
+    _blendingFuncOption.addOption(AdditiveBlending, "Additive");
+    _blendingFuncOption.addOption(PolygonBlending, "Polygon");
+    _blendingFuncOption.addOption(ColorAddingBlending, "Color Adding");
+
+    addProperty(_blendingFuncOption);
+
+    if (p.blendingOption.has_value()) {
+        const std::string blendingOpt = *p.blendingOption;
+        _blendingFuncOption = BlendingMapping[blendingOpt];
+    }
+
+    _disableDepth = p.disableDepth.value_or(_disableDepth);
+    addProperty(_disableDepth);
+
     setBoundingSphere(_size);
 }
 
@@ -330,7 +385,26 @@ void RenderableSphere::render(const RenderData& data, RendererTasks&) {
         glDisable(GL_CULL_FACE);
     }
 
-    glBlendFunc(GL_SRC_ALPHA, GL_ONE);
+    // Configure blending
+    glEnablei(GL_BLEND, 0);
+    switch (_blendingFuncOption) {
+        case DefaultBlending:
+            glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
+            break;
+        case AdditiveBlending:
+            glBlendFunc(GL_SRC_ALPHA, GL_ONE);
+            break;
+        case PolygonBlending:
+            glBlendFunc(GL_SRC_ALPHA_SATURATE, GL_ONE);
+            break;
+        case ColorAddingBlending:
+            glBlendFunc(GL_SRC_COLOR, GL_DST_COLOR);
+            break;
+    };
+
+    if (_disableDepth) {
+        glDepthMask(GL_FALSE);
+    }
 
     _sphere->render();
 
diff --git a/modules/base/rendering/renderablesphere.h b/modules/base/rendering/renderablesphere.h
index b6d409516e..c89d0d1d6b 100644
--- a/modules/base/rendering/renderablesphere.h
+++ b/modules/base/rendering/renderablesphere.h
@@ -67,6 +67,8 @@ protected:
     properties::BoolProperty _disableFadeInDistance;
     properties::FloatProperty _fadeInThreshold;
     properties::FloatProperty _fadeOutThreshold;
+    properties::OptionProperty _blendingFuncOption;
+    properties::BoolProperty _disableDepth;
 
 private:
     ghoul::opengl::ProgramObject* _shader = nullptr;

From 066f2d71e8d7814e2d4c4988c8732706887b3e41 Mon Sep 17 00:00:00 2001
From: Arohdin <adam.rohdin@outlook.com>
Date: Thu, 16 Jan 2025 15:21:03 +0100
Subject: [PATCH 682/701] Fixed minor spelling mistake

---
 apps/OpenSpace/ext/launcher/src/profile/horizonsdialog.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/apps/OpenSpace/ext/launcher/src/profile/horizonsdialog.cpp b/apps/OpenSpace/ext/launcher/src/profile/horizonsdialog.cpp
index a317892e24..fa6f973ebd 100644
--- a/apps/OpenSpace/ext/launcher/src/profile/horizonsdialog.cpp
+++ b/apps/OpenSpace/ext/launcher/src/profile/horizonsdialog.cpp
@@ -727,7 +727,7 @@ bool HorizonsDialog::handleRequest() {
 
     nlohmann::json answer = sendRequest(url);
     if (answer.empty()) {
-        QMessageBox::critical(this, "Errpr", "Connection error");
+        QMessageBox::critical(this, "Error", "Connection error");
         return false;
     }
 

From 77ae98ac5998d8d2a53766d8cb8ffc33c6a1a840 Mon Sep 17 00:00:00 2001
From: Arohdin <adam.rohdin@outlook.com>
Date: Thu, 16 Jan 2025 15:30:31 +0100
Subject: [PATCH 683/701] Horizons generator - use correct id for Center Body

---
 apps/OpenSpace/ext/launcher/src/profile/horizonsdialog.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/apps/OpenSpace/ext/launcher/src/profile/horizonsdialog.cpp b/apps/OpenSpace/ext/launcher/src/profile/horizonsdialog.cpp
index fa6f973ebd..70ebcb811e 100644
--- a/apps/OpenSpace/ext/launcher/src/profile/horizonsdialog.cpp
+++ b/apps/OpenSpace/ext/launcher/src/profile/horizonsdialog.cpp
@@ -795,7 +795,7 @@ std::string HorizonsDialog::constructUrl() {
         const std::string id = observer.toString().toStdString();
         center = "@" + id;
         _observerName = _chooseObserverCombo->currentText().toStdString();
-        _centerEdit->setText(QString::fromStdString(id));
+        _centerEdit->setText(QString::fromStdString(center));
     }
     else {
         center = _centerEdit->text().toStdString();

From 5134946fbf4d8a1b30f44aa718e9720a36b03c48 Mon Sep 17 00:00:00 2001
From: Alexander Bock <alexander.bock@liu.se>
Date: Fri, 17 Jan 2025 13:07:04 +0100
Subject: [PATCH 684/701] Fix addGibsLayer script

---
 modules/globebrowsing/scripts/layer_support.lua | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/modules/globebrowsing/scripts/layer_support.lua b/modules/globebrowsing/scripts/layer_support.lua
index c43a904941..6a1eb444ea 100644
--- a/modules/globebrowsing/scripts/layer_support.lua
+++ b/modules/globebrowsing/scripts/layer_support.lua
@@ -135,12 +135,12 @@ openspace.globebrowsing.documentation = {
 
 openspace.globebrowsing.addGibsLayer = function(layerName, resolution, format, startDate, endDate)
   if endDate == "Present" then
-    endDate = ""
+    endDate = "Today"
   end
 
   local layer = {
     Identifier = layerName,
-    Type = "TemporalTileLayer",
+    Type = "TemporalTileProvider",
     Mode = "Prototyped",
     Prototyped = {
       Time = {

From 16aa150f104fe202b162c0e189dfe3e8a29187ef Mon Sep 17 00:00:00 2001
From: Emma Broman <emma.broman@liu.se>
Date: Fri, 17 Jan 2025 13:18:45 +0100
Subject: [PATCH 685/701] Polish `RenderableCartesianAxes` - documentation,
 examples, and make fading work correctly (#3478)

* Make `RenderableCartesianAxes` fade and fix opacity setting

* Update existing documentation of cartesian axes

* Add example with custom colros and parent node

* Apply suggestions from code review

Co-authored-by: Alexander Bock <alexander.bock@liu.se>

* Include earth asset instead of using string identifer

---------

Co-authored-by: Alexander Bock <alexander.bock@liu.se>
---
 .../cartesianaxes.asset                       |  4 +--
 .../cartesianaxes_customcolor.asset           | 32 +++++++++++++++++++
 .../cartesianaxes_parent.asset                | 31 ++++++++++++++++++
 .../rendering/renderablecartesianaxes.cpp     |  8 +++--
 modules/base/shaders/axes_fs.glsl             |  4 +--
 5 files changed, 73 insertions(+), 6 deletions(-)
 create mode 100644 data/assets/examples/renderable/renderablecartesianaxes/cartesianaxes_customcolor.asset
 create mode 100644 data/assets/examples/renderable/renderablecartesianaxes/cartesianaxes_parent.asset

diff --git a/data/assets/examples/renderable/renderablecartesianaxes/cartesianaxes.asset b/data/assets/examples/renderable/renderablecartesianaxes/cartesianaxes.asset
index 49c29d5b6e..14f9f23159 100644
--- a/data/assets/examples/renderable/renderablecartesianaxes/cartesianaxes.asset
+++ b/data/assets/examples/renderable/renderablecartesianaxes/cartesianaxes.asset
@@ -1,6 +1,6 @@
 -- Basic
--- This asset creates a SceneGraphNode that only displays coordinate axes. The
--- parent is not set which defaults to placing the axes at the center the Sun.
+-- This example creates a SceneGraphNode that only displays coordinate axes. The
+-- parent is not set which defaults to placing the axes at the center of the Sun.
 
 local Node = {
   Identifier = "RenderableCartesianAxes_Example",
diff --git a/data/assets/examples/renderable/renderablecartesianaxes/cartesianaxes_customcolor.asset b/data/assets/examples/renderable/renderablecartesianaxes/cartesianaxes_customcolor.asset
new file mode 100644
index 0000000000..a8dc00d6d5
--- /dev/null
+++ b/data/assets/examples/renderable/renderablecartesianaxes/cartesianaxes_customcolor.asset
@@ -0,0 +1,32 @@
+-- Custom Colors
+-- This example creates a set of cartesian coordinate axes with specified colors, instead
+-- of using the default which is red (X), green (Y), and blue (Z). The parent is not set
+-- which defaults to placing the axes at the center of the Solar System.
+
+local Node = {
+  Identifier = "RenderableCartesianAxes_Example_CustomColors",
+  Transform = {
+    Scale = {
+      Type = "StaticScale",
+      Scale = 30000000
+    }
+  },
+  Renderable = {
+    Type = "RenderableCartesianAxes",
+    XColor = { 0.0, 1.0, 1.0 }, -- Cyan
+    YColor = { 1.0, 0.0, 1.0 }, -- Magenta
+    ZColor = { 1.0, 1.0, 0.0 }  -- Yellow
+  },
+  GUI = {
+    Name = "RenderableCartesianAxes - Custom Colors",
+    Path = "/Examples"
+  }
+}
+
+asset.onInitialize(function()
+  openspace.addSceneGraphNode(Node)
+end)
+
+asset.onDeinitialize(function()
+  openspace.removeSceneGraphNode(Node)
+end)
diff --git a/data/assets/examples/renderable/renderablecartesianaxes/cartesianaxes_parent.asset b/data/assets/examples/renderable/renderablecartesianaxes/cartesianaxes_parent.asset
new file mode 100644
index 0000000000..4dc7eb0dfd
--- /dev/null
+++ b/data/assets/examples/renderable/renderablecartesianaxes/cartesianaxes_parent.asset
@@ -0,0 +1,31 @@
+-- With Parent
+-- This example creates a SceneGraphNode that displays coordinate axes of the given parent
+-- node, in this case Earth.
+
+local earth = asset.require("scene/solarsystem/planets/earth/earth")
+
+local Node = {
+  Identifier = "RenderableCartesianAxes_Example_Parent",
+  Parent = earth.Earth.Identifier,
+  Transform = {
+    Scale = {
+      Type = "StaticScale",
+      Scale = 30000000
+    }
+  },
+  Renderable = {
+    Type = "RenderableCartesianAxes"
+  },
+  GUI = {
+    Name = "RenderableCartesianAxes - With Parent",
+    Path = "/Examples"
+  }
+}
+
+asset.onInitialize(function()
+  openspace.addSceneGraphNode(Node)
+end)
+
+asset.onDeinitialize(function()
+  openspace.removeSceneGraphNode(Node)
+end)
diff --git a/modules/base/rendering/renderablecartesianaxes.cpp b/modules/base/rendering/renderablecartesianaxes.cpp
index d685229f6a..9281f4fddd 100644
--- a/modules/base/rendering/renderablecartesianaxes.cpp
+++ b/modules/base/rendering/renderablecartesianaxes.cpp
@@ -65,9 +65,9 @@ namespace {
     //
     // To add the axes, create a scene graph node with the RenderableCartesianAxes
     // renderable and add it as a child to the other scene graph node, i.e. specify the
-    // other node as the Parent of the node with this renderable. Also, the axes have to
+    // other node as the `Parent` of the node with this renderable. Also, the axes have to
     // be scaled to match the parent object for the axes to be visible in the scene, for
-    // example using a StaticScale.
+    // example using a [StaticScale](#base_scale_static).
     struct [[codegen::Dictionary(RenderableCartesianAxes)]] Parameters {
         // [[codegen::verbatim(XColorInfo.description)]]
         std::optional<glm::vec3> xColor [[codegen::color()]];
@@ -95,6 +95,9 @@ RenderableCartesianAxes::RenderableCartesianAxes(const ghoul::Dictionary& dictio
     , _zColor(ZColorInfo, glm::vec3(0.f, 0.f, 1.f), glm::vec3(0.f), glm::vec3(1.f))
 {
     const Parameters p = codegen::bake<Parameters>(dictionary);
+
+    addProperty(Fadeable::_opacity);
+
     _xColor = p.xColor.value_or(_xColor);
     _xColor.setViewOption(properties::Property::ViewOptions::Color);
     addProperty(_xColor);
@@ -195,6 +198,7 @@ void RenderableCartesianAxes::render(const RenderData& data, RendererTasks&) {
     _program->setUniform("xColor", _xColor);
     _program->setUniform("yColor", _yColor);
     _program->setUniform("zColor", _zColor);
+    _program->setUniform("opacity", opacity());
 
     // Changes GL state:
     glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
diff --git a/modules/base/shaders/axes_fs.glsl b/modules/base/shaders/axes_fs.glsl
index 8448d4549f..df84bd633c 100644
--- a/modules/base/shaders/axes_fs.glsl
+++ b/modules/base/shaders/axes_fs.glsl
@@ -31,7 +31,7 @@ in vec3 vs_positionModelSpace;
 uniform vec3 xColor;
 uniform vec3 yColor;
 uniform vec3 zColor;
-
+uniform float opacity;
 
 Fragment getFragment() {
   Fragment frag;
@@ -44,7 +44,7 @@ Fragment getFragment() {
   frag.color.rgb = colorComponents.x * xColor +
     colorComponents.y * yColor +
     colorComponents.z * zColor;
-  frag.color.a = 1.0;
+  frag.color.a = opacity;
 
   frag.depth = vs_screenSpaceDepth;
   frag.gPosition = vs_positionViewSpace;

From e643e8d6536b6407f3508441c13f0d5c5c821b75 Mon Sep 17 00:00:00 2001
From: Emma Broman <emma.broman@liu.se>
Date: Fri, 17 Jan 2025 13:47:37 +0100
Subject: [PATCH 686/701] Make debug plane a `ScreenSpaceRenderable` and add
 documentation (#3483)

* Add screenspace version of debug plane, and an example

* Remove the old renderable

* Apply suggestions from code review

Co-authored-by: Alexander Bock <alexander.bock@liu.se>

---------

Co-authored-by: Alexander Bock <alexander.bock@liu.se>
---
 .../screenspacedebugplane/debugplane.asset    | 20 +++++++++++++
 modules/debugging/CMakeLists.txt              |  4 +--
 modules/debugging/debuggingmodule.cpp         | 12 ++++----
 ...bugplane.cpp => screenspacedebugplane.cpp} | 29 +++++++++----------
 ...ledebugplane.h => screenspacedebugplane.h} | 16 +++++-----
 5 files changed, 49 insertions(+), 32 deletions(-)
 create mode 100644 data/assets/examples/screenspacerenderable/screenspacedebugplane/debugplane.asset
 rename modules/debugging/rendering/{renderabledebugplane.cpp => screenspacedebugplane.cpp} (78%)
 rename modules/debugging/rendering/{renderabledebugplane.h => screenspacedebugplane.h} (84%)

diff --git a/data/assets/examples/screenspacerenderable/screenspacedebugplane/debugplane.asset b/data/assets/examples/screenspacerenderable/screenspacedebugplane/debugplane.asset
new file mode 100644
index 0000000000..33d565610c
--- /dev/null
+++ b/data/assets/examples/screenspacerenderable/screenspacedebugplane/debugplane.asset
@@ -0,0 +1,20 @@
+-- Basic
+-- This example adds a screen space image that shows the content of an OpenGL texture.
+-- This can be useful for debugging textures.
+--
+-- The texture that is displayed can be changed during runtime. Here it is just set to 1.
+
+local Object = {
+  Identifier = "ScreenSpaceDebugPlane_Example",
+  Type = "ScreenSpaceDebugPlane",
+  Texture = 1,
+  Name = "ScreenSpaceDebugPlane Example - Basic"
+}
+
+asset.onInitialize(function()
+  openspace.addScreenSpaceRenderable(Object)
+end)
+
+asset.onDeinitialize(function()
+  openspace.removeScreenSpaceRenderable(Object)
+end)
diff --git a/modules/debugging/CMakeLists.txt b/modules/debugging/CMakeLists.txt
index 4b0bb2ab02..25e929142f 100644
--- a/modules/debugging/CMakeLists.txt
+++ b/modules/debugging/CMakeLists.txt
@@ -26,16 +26,16 @@ include(${PROJECT_SOURCE_DIR}/support/cmake/module_definition.cmake)
 
 set(HEADER_FILES
   debuggingmodule.h
-  rendering/renderabledebugplane.h
   rendering/debugrenderer.h
+  rendering/screenspacedebugplane.h
 )
 source_group("Header Files" FILES ${HEADER_FILES})
 
 set(SOURCE_FILES
   debuggingmodule.cpp
   debuggingmodule_lua.inl
-  rendering/renderabledebugplane.cpp
   rendering/debugrenderer.cpp
+  rendering/screenspacedebugplane.cpp
 )
 source_group("Source Files" FILES ${SOURCE_FILES})
 
diff --git a/modules/debugging/debuggingmodule.cpp b/modules/debugging/debuggingmodule.cpp
index 7d2b970c72..725cf50543 100644
--- a/modules/debugging/debuggingmodule.cpp
+++ b/modules/debugging/debuggingmodule.cpp
@@ -24,7 +24,7 @@
 
 #include <modules/debugging/debuggingmodule.h>
 
-#include <modules/debugging/rendering/renderabledebugplane.h>
+#include <modules/debugging/rendering/screenspacedebugplane.h>
 #include <openspace/documentation/documentation.h>
 #include <openspace/engine/configuration.h>
 #include <openspace/engine/globals.h>
@@ -136,11 +136,11 @@ DebuggingModule::DebuggingModule()
 }
 
 void DebuggingModule::internalInitialize(const ghoul::Dictionary&) {
-    ghoul::TemplateFactory<Renderable>* fRenderable =
-        FactoryManager::ref().factory<Renderable>();
-    ghoul_assert(fRenderable, "No renderable factory existed");
+    ghoul::TemplateFactory<ScreenSpaceRenderable>* fSsRenderable =
+        FactoryManager::ref().factory<ScreenSpaceRenderable>();
+    ghoul_assert(fSsRenderable, "ScreenSpaceRenderable factory was not created");
 
-    fRenderable->registerClass<RenderableDebugPlane>("RenderableDebugPlane");
+    fSsRenderable->registerClass<ScreenSpaceDebugPlane>("ScreenSpaceDebugPlane");
 }
 
 void DebuggingModule::internalInitializeGL() {
@@ -150,7 +150,7 @@ void DebuggingModule::internalInitializeGL() {
 
 std::vector<documentation::Documentation> DebuggingModule::documentations() const {
     return {
-        RenderableDebugPlane::Documentation()
+        ScreenSpaceDebugPlane::Documentation()
     };
 }
 
diff --git a/modules/debugging/rendering/renderabledebugplane.cpp b/modules/debugging/rendering/screenspacedebugplane.cpp
similarity index 78%
rename from modules/debugging/rendering/renderabledebugplane.cpp
rename to modules/debugging/rendering/screenspacedebugplane.cpp
index 69315d3ccb..ec48a80a38 100644
--- a/modules/debugging/rendering/renderabledebugplane.cpp
+++ b/modules/debugging/rendering/screenspacedebugplane.cpp
@@ -22,7 +22,7 @@
  * OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                                         *
  ****************************************************************************************/
 
-#include <modules/debugging/rendering/renderabledebugplane.h>
+#include <modules/debugging/rendering/screenspacedebugplane.h>
 
 #include <openspace/documentation/documentation.h>
 
@@ -34,37 +34,34 @@ namespace {
         openspace::properties::Property::Visibility::AdvancedUser
     };
 
-    struct [[codegen::Dictionary(RenderableDebugPlane)]] Parameters {
+    // This `ScreenSpaceRenderable` can be used for debugging OpenGL textures. It renders
+    // the content of an existing texture, based on a provided OpenGL texture name.
+    struct [[codegen::Dictionary(ScreenSpaceDebugPlane)]] Parameters {
         // [[codegen::verbatim(TextureInfo.description)]]
         std::optional<int> texture;
     };
-#include "renderabledebugplane_codegen.cpp"
+#include "screenspacedebugplane_codegen.cpp"
 } // namespace
 
 namespace openspace {
 
-documentation::Documentation RenderableDebugPlane::Documentation() {
-    return codegen::doc<Parameters>(
-        "debugging_renderable_debugplane",
-        RenderablePlane::Documentation()
-    );
+documentation::Documentation ScreenSpaceDebugPlane::Documentation() {
+    return codegen::doc<Parameters>("debugging_screenspace_debugplane");
 }
 
-RenderableDebugPlane::RenderableDebugPlane(const ghoul::Dictionary& dictionary)
-    : RenderablePlane(dictionary)
-    , _texture(TextureInfo, -1, -1, 512)
+ScreenSpaceDebugPlane::ScreenSpaceDebugPlane(const ghoul::Dictionary& dictionary)
+    : ScreenSpaceRenderable(dictionary)
+    , _texture(TextureInfo, -1, -1, 4096)
 {
     const Parameters p = codegen::bake<Parameters>(dictionary);
 
     _texture = p.texture.value_or(_texture);
     addProperty(_texture);
+
+    _objectSize = glm::ivec2(256);
 }
 
-bool RenderableDebugPlane::isReady() const {
-    return _texture >= 0 && RenderablePlane::isReady();
-}
-
-void RenderableDebugPlane::bindTexture() {
+void ScreenSpaceDebugPlane::bindTexture() {
     glBindTexture(GL_TEXTURE_2D, _texture);
 }
 
diff --git a/modules/debugging/rendering/renderabledebugplane.h b/modules/debugging/rendering/screenspacedebugplane.h
similarity index 84%
rename from modules/debugging/rendering/renderabledebugplane.h
rename to modules/debugging/rendering/screenspacedebugplane.h
index 0309c376c5..a882a6198a 100644
--- a/modules/debugging/rendering/renderabledebugplane.h
+++ b/modules/debugging/rendering/screenspacedebugplane.h
@@ -22,18 +22,18 @@
  * OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                                         *
  ****************************************************************************************/
 
-#ifndef __OPENSPACE_MODULE_DEBUGGING___RENDERABLEDEBUGPLANE___H__
-#define __OPENSPACE_MODULE_DEBUGGING___RENDERABLEDEBUGPLANE___H__
+#ifndef __OPENSPACE_MODULE_DEBUGGING___SCREENSPACEDEBUGPLANE___H__
+#define __OPENSPACE_MODULE_DEBUGGING___SCREENSPACEDEBUGPLANE___H__
 
-#include <modules/base/rendering/renderableplane.h>
+#include <openspace/rendering/screenspacerenderable.h>
+
+#include <openspace/properties/scalar/intproperty.h>
 
 namespace openspace {
 
-class RenderableDebugPlane : public RenderablePlane {
+class ScreenSpaceDebugPlane : public ScreenSpaceRenderable {
 public:
-    RenderableDebugPlane(const ghoul::Dictionary& dictionary);
-
-    bool isReady() const override;
+    ScreenSpaceDebugPlane(const ghoul::Dictionary& dictionary);
 
     static documentation::Documentation Documentation();
 
@@ -45,4 +45,4 @@ private:
 
 } // namespace openspace
 
-#endif // __OPENSPACE_MODULE_DEBUGGING___RENDERABLEDEBUGPLANE___H__
+#endif // __OPENSPACE_MODULE_DEBUGGING___SCREENSPACEDEBUGPLANE___H__

From 7e6128d6205b540059e0ebd4c10a3c8c3d74fe5f Mon Sep 17 00:00:00 2001
From: Emma Broman <emma.broman@liu.se>
Date: Fri, 17 Jan 2025 13:50:07 +0100
Subject: [PATCH 687/701] Add a description for the `Renderable` base class
 (#3486)

---
 src/rendering/renderable.cpp | 15 +++++++++++++--
 1 file changed, 13 insertions(+), 2 deletions(-)

diff --git a/src/rendering/renderable.cpp b/src/rendering/renderable.cpp
index 67121c7d62..a567719d0b 100644
--- a/src/rendering/renderable.cpp
+++ b/src/rendering/renderable.cpp
@@ -73,16 +73,27 @@ namespace {
         openspace::properties::Property::Visibility::AdvancedUser
     };
 
+    // This is the base class for all `Renderable` types. These objects are responsible
+    // for rendering the visuals for scene graph nodes in the 3D rendering. Different
+    // `Renderable` types create various kinds of visuals, sometimes based on external
+    // data files or resources (such as images, 3D models, color maps, or datasets).
+    //
+    // A `Renderable` is created by adding it to a scene graph node in an asset. In
+    // general, this places the rendered object at the position of that scene graph node,
+    // unless otherwise specified by the specific `Renderable` type.
+    //
+    // Each `Renderable` type typically also includes a number of settings to alter its
+    // appearance. See the documentation for the individual types for more details.
     struct [[codegen::Dictionary(Renderable)]] Parameters {
         // [[codegen::verbatim(EnabledInfo.description)]]
         std::optional<bool> enabled;
 
         // This value determines the opacity of this renderable. A value of 0 means
-        // completely transparent
+        // completely transparent.
         std::optional<float> opacity [[codegen::inrange(0.0, 1.0)]];
 
         // A single tag or a list of tags that this renderable will respond to when
-        // setting properties
+        // setting properties.
         std::optional<std::variant<std::vector<std::string>, std::string>> tag;
 
         // [[codegen::verbatim(RenderableTypeInfo.description)]]

From 0dbc331ebfaebac9b2f386113fda7af81e320412 Mon Sep 17 00:00:00 2001
From: Emma Broman <emma.broman@liu.se>
Date: Fri, 17 Jan 2025 13:50:40 +0100
Subject: [PATCH 688/701] Docs and examples for `RenderableBoxGrid` (#3479)

* Add boxgrid examples

* Add description about the box grid renderable for the docs page

* change phrasing in example assets slightly

* Apply suggestions from code review

Co-authored-by: Ylva Selling <ylva.selling@gmail.com>

* Remove labels support for `RenderableBoxGrid`

---------

Co-authored-by: Ylva Selling <ylva.selling@gmail.com>
---
 .../renderableboxgrid/boxgrid.asset           | 31 +++++++++++
 .../renderableboxgrid/boxgrid_size.asset      | 32 +++++++++++
 .../renderableboxgrid/boxgrid_styled.asset    | 24 ++++++++
 .../rendering/grids/renderableboxgrid.cpp     | 55 ++-----------------
 .../base/rendering/grids/renderableboxgrid.h  |  6 --
 5 files changed, 92 insertions(+), 56 deletions(-)
 create mode 100644 data/assets/examples/renderable/renderableboxgrid/boxgrid.asset
 create mode 100644 data/assets/examples/renderable/renderableboxgrid/boxgrid_size.asset
 create mode 100644 data/assets/examples/renderable/renderableboxgrid/boxgrid_styled.asset

diff --git a/data/assets/examples/renderable/renderableboxgrid/boxgrid.asset b/data/assets/examples/renderable/renderableboxgrid/boxgrid.asset
new file mode 100644
index 0000000000..c73dcf4c32
--- /dev/null
+++ b/data/assets/examples/renderable/renderableboxgrid/boxgrid.asset
@@ -0,0 +1,31 @@
+-- Basic
+-- This example adds a box grid, which is a 3D box rendered using grid lines, to the
+-- scene.
+--
+-- Per default, the box will be given a size of 1x1x1 meters, and here it is scaled up by a
+-- factor of 100. It will hence have a size of 100x100x100 meters.
+
+local Node = {
+  Identifier = "RenderableBoxGrid_Example",
+  Transform = {
+    Scale = {
+      Type = "StaticScale",
+      Scale = 100
+    }
+  },
+  Renderable = {
+    Type = "RenderableBoxGrid"
+  },
+  GUI = {
+    Name = "RenderableBoxGrid - Basic",
+    Path = "/Examples"
+  }
+}
+
+asset.onInitialize(function()
+  openspace.addSceneGraphNode(Node)
+end)
+
+asset.onDeinitialize(function()
+  openspace.removeSceneGraphNode(Node)
+end)
diff --git a/data/assets/examples/renderable/renderableboxgrid/boxgrid_size.asset b/data/assets/examples/renderable/renderableboxgrid/boxgrid_size.asset
new file mode 100644
index 0000000000..d89925141e
--- /dev/null
+++ b/data/assets/examples/renderable/renderableboxgrid/boxgrid_size.asset
@@ -0,0 +1,32 @@
+-- With Non-uniform Size
+-- This example creates a box grid with a non-uniform size. The size has been set so the
+-- box is two times larger in the Y-direction.
+--
+-- The `Size` values are given in meters, and here the box is scaled up by a factor of
+-- 100. So, the box will have a size of 100 times the `Size` values.
+
+local Node = {
+  Identifier = "RenderableBoxGrid_Example_Size",
+  Transform = {
+    Scale = {
+      Type = "StaticScale",
+      Scale = 100
+    }
+  },
+  Renderable = {
+    Type = "RenderableBoxGrid",
+    Size = { 1.0, 2.0, 1.0 }
+  },
+  GUI = {
+    Name = "RenderableBoxGrid - Non-uniform Size",
+    Path = "/Examples"
+  }
+}
+
+asset.onInitialize(function()
+  openspace.addSceneGraphNode(Node)
+end)
+
+asset.onDeinitialize(function()
+  openspace.removeSceneGraphNode(Node)
+end)
diff --git a/data/assets/examples/renderable/renderableboxgrid/boxgrid_styled.asset b/data/assets/examples/renderable/renderableboxgrid/boxgrid_styled.asset
new file mode 100644
index 0000000000..e2911244b4
--- /dev/null
+++ b/data/assets/examples/renderable/renderableboxgrid/boxgrid_styled.asset
@@ -0,0 +1,24 @@
+-- Styled
+-- This example creates a box grid where the grid lines are styled to have a specific
+-- color and line width.
+
+local Node = {
+  Identifier = "RenderableBoxGrid_Example_Styled",
+  Renderable = {
+    Type = "RenderableBoxGrid",
+    LineWidth = 4.0,
+    Color = { 1.0, 1.0, 0.0 }
+  },
+  GUI = {
+    Name = "RenderableBoxGrid - Styled",
+    Path = "/Examples"
+  }
+}
+
+asset.onInitialize(function()
+  openspace.addSceneGraphNode(Node)
+end)
+
+asset.onDeinitialize(function()
+  openspace.removeSceneGraphNode(Node)
+end)
diff --git a/modules/base/rendering/grids/renderableboxgrid.cpp b/modules/base/rendering/grids/renderableboxgrid.cpp
index 782744429e..d98e44c82e 100644
--- a/modules/base/rendering/grids/renderableboxgrid.cpp
+++ b/modules/base/rendering/grids/renderableboxgrid.cpp
@@ -57,12 +57,10 @@ namespace {
         openspace::properties::Property::Visibility::AdvancedUser
     };
 
-    const openspace::properties::PropertyOwner::PropertyOwnerInfo LabelsInfo = {
-        "Labels",
-        "Labels",
-        "The labels for the grid."
-    };
-
+    // A RenderableBoxGrid creates a 3D box that is rendered using grid lines.
+    //
+    // Per default the box is given a uniform size of 1x1x1 meters. It can then be scaled
+    // to the desired size. Alternatively, the size in each dimension can be specified.
     struct [[codegen::Dictionary(RenderableBoxGrid)]] Parameters {
         // [[codegen::verbatim(ColorInfo.description)]]
         std::optional<glm::vec3> color [[codegen::color()]];
@@ -72,10 +70,6 @@ namespace {
 
         // [[codegen::verbatim(SizeInfo.description)]]
         std::optional<glm::vec3> size;
-
-        // [[codegen::verbatim(LabelsInfo.description)]]
-        std::optional<ghoul::Dictionary> labels
-            [[codegen::reference("labelscomponent")]];
     };
 #include "renderableboxgrid_codegen.cpp"
 } // namespace
@@ -106,24 +100,10 @@ RenderableBoxGrid::RenderableBoxGrid(const ghoul::Dictionary& dictionary)
     _size = p.size.value_or(_size);
     _size.onChange([this]() { _gridIsDirty = true; });
     addProperty(_size);
-
-    if (p.labels.has_value()) {
-        _labels = std::make_unique<LabelsComponent>(*p.labels);
-        _hasLabels = true;
-        addPropertySubOwner(_labels.get());
-        // Fading of the labels should also depend on the fading of the renderable
-        _labels->setParentFadeable(this);
-    }
 }
 
 bool RenderableBoxGrid::isReady() const {
-    return _hasLabels ? _gridProgram && _labels->isReady() : _gridProgram != nullptr;
-}
-
-void RenderableBoxGrid::initialize() {
-    if (_hasLabels) {
-        _labels->initialize();
-    }
+    return _gridProgram != nullptr;
 }
 
 void RenderableBoxGrid::initializeGL() {
@@ -195,31 +175,6 @@ void RenderableBoxGrid::render(const RenderData& data, RendererTasks&) {
     global::renderEngine->openglStateCache().resetBlendState();
     global::renderEngine->openglStateCache().resetLineState();
     global::renderEngine->openglStateCache().resetDepthState();
-
-    // Draw labels
-    if (_hasLabels && _labels->enabled()) {
-        const glm::vec3 lookup = data.camera.lookUpVectorWorldSpace();
-        const glm::vec3 viewDirection = data.camera.viewDirectionWorldSpace();
-        glm::vec3 right = glm::cross(viewDirection, lookup);
-        const glm::vec3 up = glm::cross(right, viewDirection);
-
-        const glm::dmat4 worldToModelTransform = glm::inverse(modelTransform);
-        glm::vec3 orthoRight = glm::normalize(
-            glm::vec3(worldToModelTransform * glm::vec4(right, 0.0))
-        );
-
-        if (orthoRight == glm::vec3(0.0)) {
-            const glm::vec3 otherVector = glm::vec3(lookup.y, lookup.x, lookup.z);
-            right = glm::cross(viewDirection, otherVector);
-            orthoRight = glm::normalize(
-                glm::vec3(worldToModelTransform * glm::vec4(right, 0.0))
-            );
-        }
-        const glm::vec3 orthoUp = glm::normalize(
-            glm::vec3(worldToModelTransform * glm::dvec4(up, 0.0))
-        );
-        _labels->render(data, modelViewProjectionTransform, orthoRight, orthoUp);
-    }
 }
 
 void RenderableBoxGrid::update(const UpdateData&) {
diff --git a/modules/base/rendering/grids/renderableboxgrid.h b/modules/base/rendering/grids/renderableboxgrid.h
index d0a1dc02af..ef3b0e161b 100644
--- a/modules/base/rendering/grids/renderableboxgrid.h
+++ b/modules/base/rendering/grids/renderableboxgrid.h
@@ -29,7 +29,6 @@
 
 #include <openspace/properties/scalar/floatproperty.h>
 #include <openspace/properties/vector/vec3property.h>
-#include <openspace/rendering/labelscomponent.h>
 #include <ghoul/opengl/ghoul_gl.h>
 
 namespace ghoul::opengl {
@@ -44,7 +43,6 @@ class RenderableBoxGrid : public Renderable {
 public:
     RenderableBoxGrid(const ghoul::Dictionary& dictionary);
 
-    void initialize() override;
     void initializeGL() override;
     void deinitializeGL() override;
 
@@ -73,10 +71,6 @@ protected:
 
     GLenum _mode = GL_LINE_STRIP;
     std::vector<Vertex> _varray;
-
-    // Labels
-    bool _hasLabels = false;
-    std::unique_ptr<LabelsComponent> _labels;
 };
 
 }// namespace openspace

From c4cf883ec94a2b2657e396b990a947450e2b991b Mon Sep 17 00:00:00 2001
From: Emma Broman <emma.broman@liu.se>
Date: Fri, 17 Jan 2025 14:16:01 +0100
Subject: [PATCH 689/701] Docs and examples for `RenderableDisc` (#3482)

* Add description and update GUI property values

* Add examples with a single color

* Remove old example file

* Rename ellipse example and remove width

* Apply suggestions from code review

Co-authored-by: Ylva Selling <ylva.selling@gmail.com>

* Address review comments

* Also update renerable description

---------

Co-authored-by: Ylva Selling <ylva.selling@gmail.com>
---
 data/assets/examples/discs.asset              | 63 -------------------
 .../renderable/renderabledisc/disc.asset      | 30 +++++++++
 .../renderabledisc/disc_ellipse.asset         | 37 +++++++++++
 .../renderabledisc/disc_with_hole.asset       | 33 ++++++++++
 modules/base/rendering/renderabledisc.cpp     | 15 +++--
 5 files changed, 110 insertions(+), 68 deletions(-)
 delete mode 100644 data/assets/examples/discs.asset
 create mode 100644 data/assets/examples/renderable/renderabledisc/disc.asset
 create mode 100644 data/assets/examples/renderable/renderabledisc/disc_ellipse.asset
 create mode 100644 data/assets/examples/renderable/renderabledisc/disc_with_hole.asset

diff --git a/data/assets/examples/discs.asset b/data/assets/examples/discs.asset
deleted file mode 100644
index f24420bd08..0000000000
--- a/data/assets/examples/discs.asset
+++ /dev/null
@@ -1,63 +0,0 @@
--- @TODO (emmbr 2020-02-03) Potential threading issue later on? This will run on the main thread
-local cyanTexture = openspace.createSingleColorImage("example_disc_color1", { 0.0, 1.0, 1.0 })
-local purpleTexture = openspace.createSingleColorImage("example_disc_color2", { 0.5, 0.0, 0.5 })
-
-local BasicDisc = {
-  Identifier = "BasicDisc",
-  Renderable = {
-    Type = "RenderableDisc",
-    Texture = cyanTexture,
-    Size = 1e10,
-    Width = 0.5
-  },
-  GUI = {
-    Name = "Basic Disc",
-    Path = "/Examples/Discs"
-  }
-}
-
--- Elliptic discs can be created using a non-uniform scaling
--- For a full disc, use a width of 1.0
-local FullEllipticDisc = {
-  Identifier = "FullEllipticDisc",
-  Transform = {
-    Scale = {
-      Type = "NonUniformStaticScale",
-      Scale = { 2.0, 1.0, 1.0 }
-    }
-  },
-  Renderable = {
-    Type = "RenderableDisc",
-    Texture = purpleTexture,
-    Size = 2e10,
-    Width = 1.0
-  },
-  GUI = {
-    Name = "Full Elliptic Disc",
-    Path = "/Examples/Discs"
-  }
-}
-
-
-asset.onInitialize(function()
-  openspace.addSceneGraphNode(BasicDisc)
-  openspace.addSceneGraphNode(FullEllipticDisc)
-end)
-
-asset.onDeinitialize(function()
-  openspace.removeSceneGraphNode(FullEllipticDisc)
-  openspace.removeSceneGraphNode(BasicDisc)
-end)
-
-asset.export(BasicDisc)
-asset.export(FullEllipticDisc)
-
-
-
-asset.meta = {
-  Name = "Example Discs",
-  Description = [[Examples of different types of rendered discs.]],
-  Author = "OpenSpace Team",
-  URL = "http://openspaceproject.com",
-  License = "MIT license"
-}
diff --git a/data/assets/examples/renderable/renderabledisc/disc.asset b/data/assets/examples/renderable/renderabledisc/disc.asset
new file mode 100644
index 0000000000..5de79cc778
--- /dev/null
+++ b/data/assets/examples/renderable/renderabledisc/disc.asset
@@ -0,0 +1,30 @@
+-- Basic
+-- This example creates a disc with a single color and a radius of 100 meters.
+--
+-- This renderable requires a texture to be loaded, even for just a single color. Use the
+-- utility function that exists for creating single color textures for this purpose.
+local cyanTexture = openspace.createSingleColorImage(
+  "example_disc_color_cyan",
+  { 0.0, 1.0, 1.0 }
+)
+
+local Node = {
+  Identifier = "RenderableDisc_Example",
+  Renderable = {
+    Type = "RenderableDisc",
+    Size = 100.0,
+    Texture = cyanTexture
+  },
+  GUI = {
+    Name = "RenderableDisc - Basic",
+    Path = "/Examples"
+  }
+}
+
+asset.onInitialize(function()
+  openspace.addSceneGraphNode(Node)
+end)
+
+asset.onDeinitialize(function()
+  openspace.removeSceneGraphNode(Node)
+end)
diff --git a/data/assets/examples/renderable/renderabledisc/disc_ellipse.asset b/data/assets/examples/renderable/renderabledisc/disc_ellipse.asset
new file mode 100644
index 0000000000..2bdd4eb5f2
--- /dev/null
+++ b/data/assets/examples/renderable/renderabledisc/disc_ellipse.asset
@@ -0,0 +1,37 @@
+-- Ellipse
+-- This example creates a disc with an ellipic shape, using a non-uniform scaling.
+--
+-- This renderable requires a texture to be loaded, even for just a single color. Use the
+-- utility function that exists for creating single color textures for this purpose.
+local purpleTexture = openspace.createSingleColorImage(
+  "example_disc_color_purple",
+  { 0.5, 0.0, 0.5 }
+)
+
+local Node = {
+  Identifier = "RenderableDisc_Example_Ellipse",
+  Transform = {
+    -- Elliptic discs can be created using a non-uniform scaling
+    Scale = {
+      Type = "NonUniformStaticScale",
+      Scale = { 2.0, 1.0, 1.0 }
+    }
+  },
+  Renderable = {
+    Type = "RenderableDisc",
+    Size = 100.0,
+    Texture = purpleTexture
+  },
+  GUI = {
+    Name = "RenderableDisc - Ellipse",
+    Path = "/Examples"
+  }
+}
+
+asset.onInitialize(function()
+  openspace.addSceneGraphNode(Node)
+end)
+
+asset.onDeinitialize(function()
+  openspace.removeSceneGraphNode(Node)
+end)
diff --git a/data/assets/examples/renderable/renderabledisc/disc_with_hole.asset b/data/assets/examples/renderable/renderabledisc/disc_with_hole.asset
new file mode 100644
index 0000000000..ba4cb4de98
--- /dev/null
+++ b/data/assets/examples/renderable/renderabledisc/disc_with_hole.asset
@@ -0,0 +1,33 @@
+-- With Hole
+-- This example creates a disc that has a hole in it. By specifying a `Width` of 0.5, the
+-- disc will stop halfway from the edge to the center point. The disc is rendered with a
+-- single color and an outer radius of 100 meters.
+--
+-- This renderable requires a texture to be loaded, even for just a single color. Use the
+-- utility function that exists for creating single color textures for this purpose.
+local cyanTexture = openspace.createSingleColorImage(
+  "example_disc_color_cyan",
+  { 0.0, 1.0, 1.0 }
+)
+
+local Node = {
+  Identifier = "RenderableDisc_Example_WithHole",
+  Renderable = {
+    Type = "RenderableDisc",
+    Size = 100.0,
+    Width = 0.5,
+    Texture = cyanTexture
+  },
+  GUI = {
+    Name = "RenderableDisc - With Hole",
+    Path = "/Examples"
+  }
+}
+
+asset.onInitialize(function()
+  openspace.addSceneGraphNode(Node)
+end)
+
+asset.onDeinitialize(function()
+  openspace.removeSceneGraphNode(Node)
+end)
diff --git a/modules/base/rendering/renderabledisc.cpp b/modules/base/rendering/renderabledisc.cpp
index 4817025841..0a706f531d 100644
--- a/modules/base/rendering/renderabledisc.cpp
+++ b/modules/base/rendering/renderabledisc.cpp
@@ -68,6 +68,11 @@ namespace {
         openspace::properties::Property::Visibility::AdvancedUser
     };
 
+    // This renderable can be used to create a circular disc that is colored based on a
+    // one-dimensional texture.
+    //
+    // The disc will be filled i.e. a full circle, per default, but may also be made
+    // with a hole in the center using the `Width` parameter.
     struct [[codegen::Dictionary(RenderableDisc)]] Parameters {
         // [[codegen::verbatim(TextureInfo.description)]]
         std::filesystem::path texture;
@@ -90,16 +95,18 @@ documentation::Documentation RenderableDisc::Documentation() {
 RenderableDisc::RenderableDisc(const ghoul::Dictionary& dictionary)
     : Renderable(dictionary)
     , _texturePath(TextureInfo)
-    , _size(SizeInfo, 1.f, 0.f, 1e13f)
-    , _width(WidthInfo, 0.5f, 0.f, 1.f)
+    , _size(SizeInfo, 1.f, 0.001f, 1e13f)
+    , _width(WidthInfo, 1.f, 0.001f, 1.f)
 {
     const Parameters p = codegen::bake<Parameters>(dictionary);
 
+    addProperty(Fadeable::_opacity);
+
     _texturePath = p.texture.string();
     _texturePath.onChange([this]() { _texture->loadFromFile(_texturePath.value()); });
     addProperty(_texturePath);
 
-    _size.setExponent(13.f);
+    _size.setExponent(7.f);
     _size = p.size.value_or(_size);
     setBoundingSphere(_size);
     _size.onChange([this]() { _planeIsDirty = true; });
@@ -108,8 +115,6 @@ RenderableDisc::RenderableDisc(const ghoul::Dictionary& dictionary)
     _width = p.width.value_or(_width);
     addProperty(_width);
 
-    addProperty(Fadeable::_opacity);
-
     setRenderBin(Renderable::RenderBin::PostDeferredTransparent);
 }
 

From 5771427bd971fbe6d3e5b3f6ad844567357a9309 Mon Sep 17 00:00:00 2001
From: Alexander Bock <mail@alexanderbock.eu>
Date: Mon, 20 Jan 2025 11:26:38 +0100
Subject: [PATCH 690/701] Add the ability to specify longitude and latitude
 subdivisions in RenderableSphericalGrid (closes #3494)

---
 .../grids/renderablesphericalgrid.cpp         | 123 +++++++++++-------
 .../rendering/grids/renderablesphericalgrid.h |  15 +--
 2 files changed, 79 insertions(+), 59 deletions(-)

diff --git a/modules/base/rendering/grids/renderablesphericalgrid.cpp b/modules/base/rendering/grids/renderablesphericalgrid.cpp
index 12a53bc200..27d597048c 100644
--- a/modules/base/rendering/grids/renderablesphericalgrid.cpp
+++ b/modules/base/rendering/grids/renderablesphericalgrid.cpp
@@ -43,12 +43,37 @@ namespace {
         openspace::properties::Property::Visibility::NoviceUser
     };
 
+    constexpr openspace::properties::Property::PropertyInfo LongSegmentsInfo = {
+        "LongSegments",
+        "Number of Longitudinal Segments",
+        "The number of longitudinal segments the sphere is split into. Determines the "
+        "resolution of the rendered sphere in a left/right direction when looking "
+        "straight at the equator. Should be an even value (if an odd value is provided, "
+        "the value will be set to the new value minus one). If the `Segments` value is "
+        "provided as well, it will have precedence over this value",
+        openspace::properties::Property::Visibility::User
+    };
+
+    constexpr openspace::properties::Property::PropertyInfo LatSegmentsInfo = {
+        "LatSegments",
+        "Number of Latitudinal Segments",
+        "The number of latitudinal segments the sphere is split into. Determines the "
+        "resolution of the rendered sphere in a up/down direction when looking "
+        "straight at the equator. Should be an even value (if an odd value is provided, "
+        "the value will be set to the new value minus one). If the `Segments` value is "
+        "provided as well, it will have precedence over this value",
+        openspace::properties::Property::Visibility::User
+    };
+
     constexpr openspace::properties::Property::PropertyInfo SegmentsInfo = {
         "Segments",
         "Number of Segments",
         "The number of segments the sphere is split into. Determines the resolution "
         "of the rendered sphere. Should be an even value (if an odd value is provided, "
-        "the value will be set to the new value minus one).",
+        "the value will be set to the new value minus one). Setting this value is equal "
+        "to setting `LongSegments` and `LatSegments` to the same value. If this value is "
+        "specified, it will overwrite the values provided in `LongSegments` and "
+        "`LatSegments`.",
         openspace::properties::Property::Visibility::User
     };
 
@@ -69,6 +94,12 @@ namespace {
         // [[codegen::verbatim(ColorInfo.description)]]
         std::optional<glm::vec3> color [[codegen::color()]];
 
+        // [[codegen::verbatim(LongSegmentsInfo.description)]]
+        std::optional<int> longSegments;
+
+        // [[codegen::verbatim(LatSegmentsInfo.description)]]
+        std::optional<int> latSegments;
+
         // [[codegen::verbatim(SegmentsInfo.description)]]
         std::optional<int> segments;
 
@@ -92,7 +123,8 @@ RenderableSphericalGrid::RenderableSphericalGrid(const ghoul::Dictionary& dictio
     : Renderable(dictionary)
     , _gridProgram(nullptr)
     , _color(ColorInfo, glm::vec3(0.5f), glm::vec3(0.f), glm::vec3(1.f))
-    , _segments(SegmentsInfo, 36, 4, 200)
+    , _longSegments(LongSegmentsInfo, 36, 4, 200)
+    , _latSegments(LatSegmentsInfo, 36, 4, 200)
     , _lineWidth(LineWidthInfo, 0.5f, 1.f, 20.f)
 {
     const Parameters p = codegen::bake<Parameters>(dictionary);
@@ -103,14 +135,19 @@ RenderableSphericalGrid::RenderableSphericalGrid(const ghoul::Dictionary& dictio
     _color.setViewOption(properties::Property::ViewOptions::Color);
     addProperty(_color);
 
-    _segments = p.segments.value_or(_segments);
-    _segments.onChange([this]() {
-        if (_segments.value() % 2 == 1) {
-            _segments = _segments - 1;
+    auto gridDirty = [this]() {
+        if (_longSegments.value() % 2 == 1) {
+            _longSegments = _longSegments - 1;
         }
         _gridIsDirty = true;
-    });
-    addProperty(_segments);
+    };
+    _longSegments = p.segments.value_or(p.longSegments.value_or(_longSegments));
+    _longSegments.onChange(gridDirty);
+    addProperty(_longSegments);
+
+    _latSegments = p.segments.value_or(p.latSegments.value_or(_latSegments));
+    _latSegments.onChange(gridDirty);
+    addProperty(_latSegments);
 
     _lineWidth = p.lineWidth.value_or(_lineWidth);
     addProperty(_lineWidth);
@@ -193,9 +230,10 @@ void RenderableSphericalGrid::render(const RenderData& data, RendererTasks&) {
     // Change GL state:
 #ifndef __APPLE__
     glLineWidth(_lineWidth);
-#else
+#else // ^^^^ __APPLE__ // !__APPLE__ vvvv
     glLineWidth(1.f);
-#endif
+#endif // __APPLE__
+
     glEnablei(GL_BLEND, 0);
     glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
     glEnable(GL_LINE_SMOOTH);
@@ -203,7 +241,7 @@ void RenderableSphericalGrid::render(const RenderData& data, RendererTasks&) {
 
     glBindVertexArray(_vaoID);
     glBindBuffer(GL_ELEMENT_ARRAY_BUFFER, _iBufferID);
-    glDrawElements(_mode, _isize, GL_UNSIGNED_INT, nullptr);
+    glDrawElements(GL_LINES, 6 * _longSegments * _latSegments, GL_UNSIGNED_INT, nullptr);
     glBindVertexArray(0);
 
     _gridProgram->deactivate();
@@ -222,14 +260,14 @@ void RenderableSphericalGrid::render(const RenderData& data, RendererTasks&) {
 
         const glm::dmat4 worldToModelTransform = glm::inverse(modelTransform);
         glm::vec3 orthoRight = glm::normalize(
-            glm::vec3(worldToModelTransform * glm::vec4(right, 0.0))
+            glm::vec3(worldToModelTransform * glm::vec4(right, 0.f))
         );
 
-        if (orthoRight == glm::vec3(0.0)) {
+        if (orthoRight == glm::vec3(0.f)) {
             const glm::vec3 otherVector = glm::vec3(lookup.y, lookup.x, lookup.z);
             right = glm::cross(viewDirection, otherVector);
             orthoRight = glm::normalize(
-                glm::vec3(worldToModelTransform * glm::vec4(right, 0.0))
+                glm::vec3(worldToModelTransform * glm::vec4(right, 0.f))
             );
         }
         const glm::vec3 orthoUp = glm::normalize(
@@ -244,28 +282,21 @@ void RenderableSphericalGrid::update(const UpdateData&) {
         return;
     }
 
-    _isize = 6 * _segments * _segments;
-    _vsize = (_segments + 1) * (_segments + 1);
-    _varray.resize(_vsize);
-    constexpr Vertex v = { 0.f, 0.f, 0.f };
-    std::fill(_varray.begin(), _varray.end(), v);
-    _iarray.resize(_isize);
-    std::fill(_iarray.begin(), _iarray.end(), 0);
+    unsigned int vertSize = (_longSegments + 1) * (_latSegments + 1);
+    std::vector<Vertex> vert = std::vector<Vertex>(vertSize, { 0.f, 0.f, 0.f });
+    unsigned int idxSize = 6 * _longSegments * _latSegments;
+    std::vector<int> idx = std::vector<int>(idxSize, 0);
 
     int nr = 0;
-    const float fsegments = static_cast<float>(_segments);
 
-    for (int nSegment = 0; nSegment <= _segments; ++nSegment) {
+    for (int lat = 0; lat <= _latSegments; ++lat) {
         // define an extra vertex around the y-axis due to texture mapping
-        for (int j = 0; j <= _segments; j++) {
-            const float fi = static_cast<float>(nSegment);
-            const float fj = static_cast<float>(j);
-
+        for (int lng = 0; lng <= _longSegments; lng++) {
             // inclination angle (north to south)
-            const float theta = fi * glm::pi<float>() / fsegments * 2.f;  // 0 -> PI
+            const float theta = lat * glm::pi<float>() / _latSegments * 2.f;  // 0 -> PI
 
             // azimuth angle (east to west)
-            const float phi = fj * glm::pi<float>() * 2.0f / fsegments;  // 0 -> 2*PI
+            const float phi = lng * 2.f * glm::pi<float>() / _longSegments;  // 0 -> 2*PI
 
             const float x = std::sin(phi) * std::sin(theta);  //
             const float y = std::cos(theta);                  // up
@@ -276,7 +307,7 @@ void RenderableSphericalGrid::update(const UpdateData&) {
                 normal = glm::normalize(normal);
             }
 
-            glm::vec4 tmp(x, y, z, 1.f);
+            glm::vec4 tmp = glm::vec4(x, y, z, 1.f);
             const glm::mat4 rot = glm::rotate(
                 glm::mat4(1.f),
                 glm::half_pi<float>(),
@@ -285,41 +316,35 @@ void RenderableSphericalGrid::update(const UpdateData&) {
             tmp = glm::vec4(glm::dmat4(rot) * glm::dvec4(tmp));
 
             for (int i = 0; i < 3; i++) {
-                _varray[nr].location[i] = tmp[i];
+                vert[nr].location[i] = tmp[i];
             }
             ++nr;
         }
     }
+
     nr = 0;
     // define indices for all triangles
-    for (int i = 1; i <= _segments; i++) {
-        for (int j = 0; j < _segments; j++) {
-            const int t = _segments + 1;
-            _iarray[nr] = t * (i - 1) + j + 0; ++nr;
-            _iarray[nr] = t * (i + 0) + j + 0; ++nr;
-            _iarray[nr] = t * (i + 0) + j + 1; ++nr;
-            _iarray[nr] = t * (i - 1) + j + 1; ++nr;
-            _iarray[nr] = t * (i - 1) + j + 0; ++nr;
+    for (int i = 1; i <= _latSegments; i++) {
+        for (int j = 0; j < _longSegments; j++) {
+            const int t = _longSegments + 1;
+            idx[nr] = t * (i - 1) + j + 0;  ++nr;
+            idx[nr] = t * (i + 0) + j + 0;  ++nr;
+            idx[nr] = t * (i + 0) + j + 1;  ++nr;
+            idx[nr] = t * (i - 1) + j + 1;  ++nr;
+            idx[nr] = t * (i - 1) + j + 0;  ++nr;
         }
     }
 
     glBindVertexArray(_vaoID);
     glBindBuffer(GL_ARRAY_BUFFER, _vBufferID);
-    glBufferData(
-        GL_ARRAY_BUFFER,
-        _vsize * sizeof(Vertex),
-        _varray.data(),
-        GL_STATIC_DRAW
-    );
-
+    glBufferData(GL_ARRAY_BUFFER, vertSize * sizeof(Vertex), vert.data(), GL_STATIC_DRAW);
     glVertexAttribPointer(0, 3, GL_FLOAT, GL_FALSE, sizeof(Vertex), nullptr);
 
     glBindBuffer(GL_ELEMENT_ARRAY_BUFFER, _iBufferID);
     glBufferData(
         GL_ELEMENT_ARRAY_BUFFER,
-        _isize * sizeof(int),
-        _iarray.data(),
-        GL_STATIC_DRAW
+        idxSize * sizeof(int),
+        idx.data(), GL_STATIC_DRAW
     );
 
     _gridIsDirty = false;
diff --git a/modules/base/rendering/grids/renderablesphericalgrid.h b/modules/base/rendering/grids/renderablesphericalgrid.h
index c86a7c8512..8901638fa7 100644
--- a/modules/base/rendering/grids/renderablesphericalgrid.h
+++ b/modules/base/rendering/grids/renderablesphericalgrid.h
@@ -35,10 +35,10 @@
 
 namespace ghoul::opengl { class ProgramObject; }
 
-namespace openspace::documentation { struct Documentation; }
-
 namespace openspace {
 
+namespace documentation { struct Documentation; }
+
 class RenderableSphericalGrid : public Renderable {
 public:
     RenderableSphericalGrid(const ghoul::Dictionary& dictionary);
@@ -63,20 +63,15 @@ protected:
     ghoul::opengl::ProgramObject* _gridProgram;
 
     properties::Vec3Property _color;
-    properties::IntProperty _segments;
+    properties::IntProperty _longSegments;
+    properties::IntProperty _latSegments;
     properties::FloatProperty _lineWidth;
 
-    bool _gridIsDirty = true;
-
     GLuint _vaoID = 0;
     GLuint _vBufferID = 0;
     GLuint _iBufferID = 0;
 
-    GLenum _mode = GL_LINES;
-    unsigned int _isize = 0;
-    unsigned int _vsize = 0;
-    std::vector<Vertex> _varray;
-    std::vector<int> _iarray;
+    bool _gridIsDirty = true;
 
     // Labels
     bool _hasLabels = false;

From ec717116f91aadccb8b80c8988c9178788dc1dcf Mon Sep 17 00:00:00 2001
From: Alexander Bock <mail@alexanderbock.eu>
Date: Mon, 20 Jan 2025 11:56:10 +0100
Subject: [PATCH 691/701] Don't update SceneGraph nodes unless they are fully
 initialiezed (closes #3498)

---
 src/scene/scenegraphnode.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/scene/scenegraphnode.cpp b/src/scene/scenegraphnode.cpp
index a40b9b479b..ba377be436 100644
--- a/src/scene/scenegraphnode.cpp
+++ b/src/scene/scenegraphnode.cpp
@@ -750,7 +750,7 @@ void SceneGraphNode::update(const UpdateData& data) {
     TracyPlot("VRAM", static_cast<int64_t>(global::openSpaceEngine->vramInUse()));
 #endif // TRACY_ENABLE
 
-    if (_state != State::Initialized && _state != State::GLInitialized) {
+    if (_state != State::GLInitialized) {
         return;
     }
     if (!isTimeFrameActive(data.time)) {

From 7401f5145e835bbe02472aee8e66e946107dbb22 Mon Sep 17 00:00:00 2001
From: Emma Broman <emma.broman@liu.se>
Date: Mon, 20 Jan 2025 15:58:01 +0100
Subject: [PATCH 692/701] Automatically reload texture for
 `RenderableSphereImageLocal` when file changes (#3500)

* Use `TextureComponent` for `RenderableSphereImageLocal`

Cleans up code and makes texture reload automatically if the file changes

* Move a faultily located include
---
 .../rendering/renderablesphereimagelocal.cpp  | 55 ++++---------------
 .../rendering/renderablesphereimagelocal.h    |  9 ++-
 .../rendering/renderableorbitdisc.h           |  3 +-
 3 files changed, 16 insertions(+), 51 deletions(-)

diff --git a/modules/base/rendering/renderablesphereimagelocal.cpp b/modules/base/rendering/renderablesphereimagelocal.cpp
index 383cd356c1..126e5f6912 100644
--- a/modules/base/rendering/renderablesphereimagelocal.cpp
+++ b/modules/base/rendering/renderablesphereimagelocal.cpp
@@ -44,11 +44,6 @@ namespace {
     struct [[codegen::Dictionary(RenderableSphereImageLocal)]] Parameters {
         // [[codegen::verbatim(TextureInfo.description)]]
         std::filesystem::path texture;
-
-        // If true, the image for this sphere will not be loaded at startup but rather
-        // when the image is shown for the first time. Additionally, if the sphere is
-        // disabled, the image will automatically be unloaded.
-        std::optional<bool> lazyLoading;
     };
 #include "renderablesphereimagelocal_codegen.cpp"
 } // namespace
@@ -70,24 +65,24 @@ RenderableSphereImageLocal::RenderableSphereImageLocal(
     const Parameters p = codegen::bake<Parameters>(dictionary);
 
     _texturePath = p.texture.string();
-    _textureFile = std::make_unique<ghoul::filesystem::File>(_texturePath.value());
-    _texturePath.onChange([this]() {
-        loadTexture();
-    });
+    _texturePath.onChange([this]() { _texture->loadFromFile(_texturePath.value()); });
     addProperty(_texturePath);
-    _textureFile->setCallback([this]() { _textureIsDirty = true; });
 }
 
 bool RenderableSphereImageLocal::isReady() const {
     return RenderableSphere::isReady() && _texture;
 }
 
+void RenderableSphereImageLocal::initialize() {
+    _texture = std::make_unique<TextureComponent>(2);
+    _texture->setFilterMode(ghoul::opengl::Texture::FilterMode::LinearMipMap);
+    _texture->setWrapping(ghoul::opengl::Texture::WrappingMode::ClampToEdge);
+}
+
 void RenderableSphereImageLocal::initializeGL() {
     RenderableSphere::initializeGL();
-
-    if (!_isLoadingLazily) {
-        loadTexture();
-    }
+    _texture->loadFromFile(_texturePath.value());
+    _texture->uploadToGpu();
 }
 
 void RenderableSphereImageLocal::deinitializeGL() {
@@ -98,41 +93,11 @@ void RenderableSphereImageLocal::deinitializeGL() {
 
 void RenderableSphereImageLocal::update(const UpdateData& data) {
     RenderableSphere::update(data);
-
-    if (_textureIsDirty) {
-        loadTexture();
-        _textureIsDirty = false;
-    }
+    _texture->update();
 }
 
 void RenderableSphereImageLocal::bindTexture() {
     _texture->bind();
 }
 
-void RenderableSphereImageLocal::loadTexture() {
-    if (_texturePath.value().empty()) {
-        return;
-    }
-
-    std::unique_ptr<ghoul::opengl::Texture> texture =
-        ghoul::io::TextureReader::ref().loadTexture(_texturePath.value(), 2);
-
-    if (!texture) {
-        LWARNINGC(
-            "RenderableSphereImageLocal",
-            std::format("Could not load texture from '{}'", absPath(_texturePath))
-        );
-        return;
-    }
-
-    LDEBUGC(
-        "RenderableSphereImageLocal",
-        std::format("Loaded texture from '{}'", absPath(_texturePath))
-    );
-    texture->uploadTexture();
-    texture->setFilter(ghoul::opengl::Texture::FilterMode::LinearMipMap);
-    texture->purgeFromRAM();
-    _texture = std::move(texture);
-}
-
 } // namespace openspace
diff --git a/modules/base/rendering/renderablesphereimagelocal.h b/modules/base/rendering/renderablesphereimagelocal.h
index 2a2abf092d..b77ff0e159 100644
--- a/modules/base/rendering/renderablesphereimagelocal.h
+++ b/modules/base/rendering/renderablesphereimagelocal.h
@@ -27,6 +27,8 @@
 
 #include <modules/base/rendering/renderablesphere.h>
 
+#include <openspace/rendering/texturecomponent.h>
+
 namespace ghoul::opengl { class Texture; }
 
 namespace openspace {
@@ -40,6 +42,7 @@ class RenderableSphereImageLocal : public RenderableSphere {
 public:
     RenderableSphereImageLocal(const ghoul::Dictionary& dictionary);
 
+    void initialize() override;
     void initializeGL() override;
     void deinitializeGL() override;
 
@@ -53,14 +56,10 @@ protected:
     void bindTexture() override;
 
 private:
-    void loadTexture();
 
     properties::StringProperty _texturePath;
 
-    std::unique_ptr<ghoul::filesystem::File> _textureFile;
-    std::unique_ptr<ghoul::opengl::Texture> _texture;
-    bool _isLoadingLazily = false;
-    bool _textureIsDirty = false;
+    std::unique_ptr<TextureComponent> _texture;
 };
 
 } // namespace openspace
diff --git a/modules/exoplanets/rendering/renderableorbitdisc.h b/modules/exoplanets/rendering/renderableorbitdisc.h
index dadaa3623a..42eb12173a 100644
--- a/modules/exoplanets/rendering/renderableorbitdisc.h
+++ b/modules/exoplanets/rendering/renderableorbitdisc.h
@@ -25,11 +25,12 @@
 #ifndef __OPENSPACE_MODULE_EXOPLANETS___RENDERABLEORBITDISC___H__
 #define __OPENSPACE_MODULE_EXOPLANETS___RENDERABLEORBITDISC___H__
 
+#include <openspace/rendering/renderable.h>
+
 #include <openspace/properties/stringproperty.h>
 #include <openspace/properties/scalar/floatproperty.h>
 #include <openspace/properties/vector/vec2property.h>
 #include <openspace/properties/vector/vec3property.h>
-#include <openspace/rendering/renderable.h>
 #include <openspace/rendering/texturecomponent.h>
 #include <openspace/util/planegeometry.h>
 #include <openspace/util/updatestructures.h>

From d4c4c92a5eead01ea1f8403144b614ad70c99330 Mon Sep 17 00:00:00 2001
From: Emma Broman <emma.broman@liu.se>
Date: Mon, 20 Jan 2025 15:58:37 +0100
Subject: [PATCH 693/701] Docs for `RenderableConstellationLines` and
 `RenderableConstellationBounds` (#3481)

* Update some of the base documentation to make more sense on the docs page

* Add description for `RenderableConstellationBounds`

* Add description for `RenderableConstellationLines` and names file and labels details

* Remove redundant info from description

* Apply suggestions from code review

Co-authored-by: Ylva Selling <ylva.selling@gmail.com>
Co-authored-by: Malin E <malin.ejdbo@gmail.com>

* Update constellation bound documentation based on review comments

* Update docs about labels for constellation lines as well

---------

Co-authored-by: Ylva Selling <ylva.selling@gmail.com>
Co-authored-by: Malin E <malin.ejdbo@gmail.com>
---
 .../renderableconstellationbounds.cpp         | 31 +++++++++++++++++--
 .../renderableconstellationlines.cpp          | 22 +++++++++++++
 .../renderableconstellationsbase.cpp          |  7 +++--
 3 files changed, 55 insertions(+), 5 deletions(-)

diff --git a/modules/space/rendering/renderableconstellationbounds.cpp b/modules/space/rendering/renderableconstellationbounds.cpp
index 9a5cde6bad..a0ae97a33a 100644
--- a/modules/space/rendering/renderableconstellationbounds.cpp
+++ b/modules/space/rendering/renderableconstellationbounds.cpp
@@ -47,7 +47,8 @@ namespace {
     constexpr openspace::properties::Property::PropertyInfo VertexInfo = {
         "File",
         "Vertex File Path",
-        "A file that contains the vertex locations of the constellations bounds.",
+        "A file that contains the vertex locations of the constellations bounds, as RA "
+        "Dec coordinates on the celestial sphere.",
         openspace::properties::Property::Visibility::AdvancedUser
     };
 
@@ -58,6 +59,32 @@ namespace {
         openspace::properties::Property::Visibility::NoviceUser
     };
 
+    // This `Renderable` type can be used to draw bounding shapes on the night sky, where
+    // each shape encapsulates a group of night sky objects, such as the stars of a
+    // constellation.
+    //
+    // The shapes are defined in a file where each line specifies a vertex location in RA
+    // Dec coordinates on the celestial sphere. Each coordinate must also be marked with
+    // an abbreviation for the corresponding constellation that the shapes encapsulates.
+    // This gives each line the following order: `RA Dec Abbreviation`. The units for the
+    // coordinate values are hours for RA, and degrees for Dec. An example of a line
+    // corresponding to a vertex location may look like this:
+    // `23.5357132 +35.1897736 AND`, where `AND` is the identifier of the constellation.
+    // In this case it is short for Andromeda.
+    //
+    // The abbreviations act as identifiers of the individual constellations and can
+    // be mapped to full names in the optional `NamesFile`. The names in this file are
+    // then the ones that will show in the user interface, for example. A line in the
+    // file should first include the abbreviation and then the full name. For example,
+    // for the `AND` abbreviation in the example above, the line would look like this:
+    // `AND Andromeda`.
+    //
+    // If labels were added, the full names in the `NamesFile` may also be used for the
+    // text of the labels. Note that labels are added using a different file, where each
+    // line may or may not include an identifier for that specific label, marked by `id`
+    // in the file. If a row in the label file has an `id` that matches the abbreviation
+    // of the constellation, the text of that label is replaced with the full name from
+    // the `NamesFile`.
     struct [[codegen::Dictionary(RenderableConstellationBounds)]] Parameters {
         // [[codegen::verbatim(VertexInfo.description)]]
         std::filesystem::path file;
@@ -289,7 +316,7 @@ bool RenderableConstellationBounds::loadVertexFile() {
         // Likewise, the declination is stored in degrees and needs to be converted
         dec = glm::radians(dec);
 
-        // Convert the (right ascension, declination) to rectangular coordinates)
+        // Convert the (right ascension, declination) to rectangular coordinates.
         // The 1.0 is the distance of the celestial sphere, we will scale that in the
         // render function
         std::array<double, 3> rectangularValues;
diff --git a/modules/space/rendering/renderableconstellationlines.cpp b/modules/space/rendering/renderableconstellationlines.cpp
index ccd483266d..0714fa8b73 100644
--- a/modules/space/rendering/renderableconstellationlines.cpp
+++ b/modules/space/rendering/renderableconstellationlines.cpp
@@ -78,6 +78,28 @@ namespace {
         openspace::properties::Property::Visibility::User
     };
 
+    // @TODO (2025-01-07, emmbr) I did not add any description of the file format below,
+    // since we intend for this to be changed in a relatively near future. When that is
+    // done, update the description.
+    // @TODO (2025-01-07, emmbr) Also need to update description of names file and labels
+    // as part of the labels rewrite
+
+    // This renderable can be used to draw constellations using lines. Each constellation
+    // corresponds to a group of lines between 3D positions that represent the star
+    // positions.
+    //
+    // Each constellation is given an abbreviation that acts as the identifier of the
+    // constellation. These abbreviations can be mapped to full names in the
+    // optional `NamesFile`. The names in this file are then the ones that will show
+    // in the user interface. A line in the `NamesFile` should first include the
+    // abbreviation and then the full name. For example: `AND Andromeda`.
+    //
+    // If labels were added, the full names in the `NamesFile` may also be used for the
+    // text of the labels. Note that labels are added using a different file, where each
+    // line may or may not include an identifier for that specific label, marked by `id`
+    // in the file. If a row in the label file has an `id` that matches the abbreviation
+    // of the constellation, the text of that label is replaced with the full name from
+    // the `NamesFile`.
     struct [[codegen::Dictionary(RenderableConstellationLines)]] Parameters {
         // [[codegen::verbatim(FileInfo.description)]]
         std::filesystem::path file;
diff --git a/modules/space/rendering/renderableconstellationsbase.cpp b/modules/space/rendering/renderableconstellationsbase.cpp
index cf41c2c873..359fc21eb3 100644
--- a/modules/space/rendering/renderableconstellationsbase.cpp
+++ b/modules/space/rendering/renderableconstellationsbase.cpp
@@ -51,14 +51,14 @@ namespace {
     constexpr openspace::properties::Property::PropertyInfo LineWidthInfo = {
         "LineWidth",
         "Line Width",
-        "The line width of the constellation.",
+        "The line width used for the constellation shape.",
         openspace::properties::Property::Visibility::NoviceUser
     };
 
     constexpr openspace::properties::Property::PropertyInfo SelectionInfo = {
         "ConstellationSelection",
         "Constellation Selection",
-        "The constellations that are selected are displayed on the celestial sphere.",
+        "The selected constellations are displayed on the celestial sphere.",
         openspace::properties::Property::Visibility::NoviceUser
     };
 
@@ -75,7 +75,8 @@ namespace {
         // [[codegen::verbatim(LineWidthInfo.description)]]
         std::optional<float> lineWidth;
 
-        // [[codegen::verbatim(SelectionInfo.description)]]
+        // A list of constellations (given as abbreviations) to show. If empty or
+        // excluded, all constellations will be shown.
         std::optional<std::vector<std::string>> selection;
 
         // [[codegen::verbatim(LabelsInfo.description)]]

From ad0e5b92dc7bc1270ab0a015936b452a5b8ae86f Mon Sep 17 00:00:00 2001
From: Roxeena <malin.ejdbo@gmail.com>
Date: Tue, 28 Jan 2025 10:45:57 +0100
Subject: [PATCH 694/701] Clean up _lua.inl include style

---
 modules/base/rendering/screenspacedashboard.cpp | 4 ++--
 src/navigation/pathnavigator.cpp                | 1 +
 src/scripting/scriptengine.cpp                  | 1 +
 src/util/spicemanager.cpp                       | 4 ++--
 4 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/modules/base/rendering/screenspacedashboard.cpp b/modules/base/rendering/screenspacedashboard.cpp
index b50466f75d..d77bc82460 100644
--- a/modules/base/rendering/screenspacedashboard.cpp
+++ b/modules/base/rendering/screenspacedashboard.cpp
@@ -36,6 +36,8 @@
 #include <ghoul/logging/logmanager.h>
 #include <optional>
 
+#include "screenspacedashboard_lua.inl"
+
 namespace {
     constexpr openspace::properties::Property::PropertyInfo UseMainInfo = {
         "UseMainDashboard",
@@ -60,8 +62,6 @@ namespace {
 #include "screenspacedashboard_codegen.cpp"
 } // namespace
 
-#include "screenspacedashboard_lua.inl"
-
 namespace openspace {
 
 documentation::Documentation ScreenSpaceDashboard::Documentation() {
diff --git a/src/navigation/pathnavigator.cpp b/src/navigation/pathnavigator.cpp
index 00aafb002b..7fba01b9f0 100644
--- a/src/navigation/pathnavigator.cpp
+++ b/src/navigation/pathnavigator.cpp
@@ -48,6 +48,7 @@
 #include <glm/gtx/quaternion.hpp>
 #include <glm/gtx/vector_angle.hpp>
 #include <vector>
+
 #include "pathnavigator_lua.inl"
 
 namespace {
diff --git a/src/scripting/scriptengine.cpp b/src/scripting/scriptengine.cpp
index f8b1915e2e..d4df9c276c 100644
--- a/src/scripting/scriptengine.cpp
+++ b/src/scripting/scriptengine.cpp
@@ -41,6 +41,7 @@
 #include <ghoul/ext/assimp/contrib/zip/src/zip.h>
 #include <filesystem>
 #include <fstream>
+
 #include "scriptengine_lua.inl"
 
 namespace {
diff --git a/src/util/spicemanager.cpp b/src/util/spicemanager.cpp
index 9a40c0de17..2af6dbb3b5 100644
--- a/src/util/spicemanager.cpp
+++ b/src/util/spicemanager.cpp
@@ -37,6 +37,8 @@
 #include "SpiceUsr.h"
 #include "SpiceZpr.h"
 
+#include "spicemanager_lua.inl"
+
 namespace {
     constexpr std::string_view _loggerCat = "SpiceManager";
 
@@ -64,8 +66,6 @@ namespace {
     }
 } // namespace
 
-#include "spicemanager_lua.inl"
-
 namespace openspace {
 
 SpiceManager* SpiceManager::_instance = nullptr;

From 3d3580fa65574193237adfae41f0950c6f1215e4 Mon Sep 17 00:00:00 2001
From: Emma Broman <emma.broman@liu.se>
Date: Wed, 29 Jan 2025 16:11:47 +0100
Subject: [PATCH 695/701] Polish and docs for `RenderableDistanceLabel` and
 docs for `RenderableNodeLine` (#3485)

* Update add add documentation for `RenderableDistanceLabel`

* Move distancelabel to `base` module and remove now empty `vislab` module

* Add examples for `RenderableNodeLine` and `RenderableDistanceLabel`

* Fix faultily formatted documentation ID for `RenderableNodeLine`

* Make `RenderableDistanceLabel` unit use units from distanceconversion file

And simplify how the different names for a unit are specified

* Use new distanceUnitList() function for other classes that uses the units

* Change default unit to correct option according to documentation

* Make the text property readonly for `RenderableDistanceLabel`

* Add property to specify the precision of the number

distance label precision to docs

* Add examples with different units and descriptors

* Add docs description to `RenderableNodeLine`

* Update name in one of the examples

* Remove redundant switch cases

* Apply suggestions from code review

Co-authored-by: Ylva Selling <ylva.selling@gmail.com>

---------

Co-authored-by: Ylva Selling <ylva.selling@gmail.com>
---
 .../distancelabel.asset                       |  27 +++
 .../distancelabel_unit.asset                  |  27 +++
 .../distancelabel_unit_customdescriptor.asset |  29 +++
 .../renderablenodeline/nodeline.asset         |  35 +++
 include/openspace/util/distanceconversion.h   | 208 ++++++------------
 modules/base/CMakeLists.txt                   |   2 +
 modules/base/basemodule.cpp                   |   3 +
 .../base/dashboard/dashboarditemdistance.cpp  |  16 +-
 .../base/dashboard/dashboarditemvelocity.cpp  |  16 +-
 .../rendering/renderabledistancelabel.cpp     |  74 +++++--
 .../rendering/renderabledistancelabel.h       |  13 +-
 modules/base/rendering/renderablelabel.h      |   4 +-
 modules/base/rendering/renderablemodel.cpp    |  14 +-
 modules/base/rendering/renderablenodeline.cpp |   9 +-
 modules/vislab/CMakeLists.txt                 |  37 ----
 modules/vislab/include.cmake                  |   1 -
 modules/vislab/vislabmodule.cpp               |  51 -----
 modules/vislab/vislabmodule.h                 |  47 ----
 18 files changed, 267 insertions(+), 346 deletions(-)
 create mode 100644 data/assets/examples/renderable/renderabledistancelabel/distancelabel.asset
 create mode 100644 data/assets/examples/renderable/renderabledistancelabel/distancelabel_unit.asset
 create mode 100644 data/assets/examples/renderable/renderabledistancelabel/distancelabel_unit_customdescriptor.asset
 create mode 100644 data/assets/examples/renderable/renderablenodeline/nodeline.asset
 rename modules/{vislab => base}/rendering/renderabledistancelabel.cpp (70%)
 rename modules/{vislab => base}/rendering/renderabledistancelabel.h (85%)
 delete mode 100644 modules/vislab/CMakeLists.txt
 delete mode 100644 modules/vislab/include.cmake
 delete mode 100644 modules/vislab/vislabmodule.cpp
 delete mode 100644 modules/vislab/vislabmodule.h

diff --git a/data/assets/examples/renderable/renderabledistancelabel/distancelabel.asset b/data/assets/examples/renderable/renderabledistancelabel/distancelabel.asset
new file mode 100644
index 0000000000..05d0ea6bc2
--- /dev/null
+++ b/data/assets/examples/renderable/renderabledistancelabel/distancelabel.asset
@@ -0,0 +1,27 @@
+-- Basic
+-- This example adds a distance label between two nodes in the scene, based on an existing
+-- [RenderableNodeLine](#base_renderable_nodeline). Note that the identifier of the
+-- `RenderableNodeLine` is accessed by importing another example asset, which also adds
+-- the node line to the scene.
+
+local nodelineAsset = asset.require("examples/renderable/renderablenodeline/nodeline")
+
+local Node = {
+  Identifier = "RenderableDistanceLabel_Example",
+  Renderable = {
+    Type = "RenderableDistanceLabel",
+    NodeLine = nodelineAsset.NodeLine.Identifier
+  },
+  GUI = {
+    Name = "RenderableDistanceLabel - Basic",
+    Path = "/Examples"
+  }
+}
+
+asset.onInitialize(function()
+  openspace.addSceneGraphNode(Node)
+end)
+
+asset.onDeinitialize(function()
+  openspace.removeSceneGraphNode(Node)
+end)
diff --git a/data/assets/examples/renderable/renderabledistancelabel/distancelabel_unit.asset b/data/assets/examples/renderable/renderabledistancelabel/distancelabel_unit.asset
new file mode 100644
index 0000000000..57b067cf5b
--- /dev/null
+++ b/data/assets/examples/renderable/renderabledistancelabel/distancelabel_unit.asset
@@ -0,0 +1,27 @@
+-- Set Unit
+-- Per default, the distance is displayed in meters. This example shows how to specify a
+-- specific unit, and how to set the precision of dislayed number.
+
+local nodelineAsset = asset.require("examples/renderable/renderablenodeline/nodeline")
+
+local Node = {
+  Identifier = "RenderableDistanceLabel_Example_Unit",
+  Renderable = {
+    Type = "RenderableDistanceLabel",
+    NodeLine = nodelineAsset.NodeLine.Identifier,
+    DistanceUnit = "AU",
+    Precision = 2
+  },
+  GUI = {
+    Name = "RenderableDistanceLabel - Unit",
+    Path = "/Examples"
+  }
+}
+
+asset.onInitialize(function()
+  openspace.addSceneGraphNode(Node)
+end)
+
+asset.onDeinitialize(function()
+  openspace.removeSceneGraphNode(Node)
+end)
diff --git a/data/assets/examples/renderable/renderabledistancelabel/distancelabel_unit_customdescriptor.asset b/data/assets/examples/renderable/renderabledistancelabel/distancelabel_unit_customdescriptor.asset
new file mode 100644
index 0000000000..4b1ba1686a
--- /dev/null
+++ b/data/assets/examples/renderable/renderabledistancelabel/distancelabel_unit_customdescriptor.asset
@@ -0,0 +1,29 @@
+-- Custom Unit Descriptor
+-- In addition to setting the unit, it is also possible to specify a custom unit
+-- descriptor, i.e. a text that will de displayed for the unit instead of the default one.
+-- Here, we write out "Astronomical Units" instead of using the default descriptor for AU.
+
+local nodelineAsset = asset.require("examples/renderable/renderablenodeline/nodeline")
+
+local Node = {
+  Identifier = "RenderableDistanceLabel_Example_CustomDescriptor",
+  Renderable = {
+    Type = "RenderableDistanceLabel",
+    NodeLine = nodelineAsset.NodeLine.Identifier,
+    DistanceUnit = "AU",
+    Precision = 2,
+    CustomUnitDescriptor = "Astronomical Units"
+  },
+  GUI = {
+    Name = "RenderableDistanceLabel - Custom Unit Descriptor",
+    Path = "/Examples"
+  }
+}
+
+asset.onInitialize(function()
+  openspace.addSceneGraphNode(Node)
+end)
+
+asset.onDeinitialize(function()
+  openspace.removeSceneGraphNode(Node)
+end)
diff --git a/data/assets/examples/renderable/renderablenodeline/nodeline.asset b/data/assets/examples/renderable/renderablenodeline/nodeline.asset
new file mode 100644
index 0000000000..8bc0ead9f2
--- /dev/null
+++ b/data/assets/examples/renderable/renderablenodeline/nodeline.asset
@@ -0,0 +1,35 @@
+-- Basic
+-- This example draws a line between two nodes in the scene, in this case the planets
+-- Earth and Mars.
+--
+-- Note that this example asset is used in another example, for
+-- [RenderableDistanceLabel](#base_renderable_distancelabel). Due to this, we export the
+-- `Node` table so we can access and refer to its identifier in the other example, the
+-- same way as we do for Earth and Mars in this asset.
+
+local earth = asset.require("scene/solarsystem/planets/earth/earth")
+local mars = asset.require("scene/solarsystem/planets/mars/mars")
+
+local Node = {
+  Identifier = "RenderableNodeLine_Example",
+  Renderable = {
+    Type = "RenderableNodeLine",
+    StartNode = earth.Earth.Identifier,
+    EndNode = mars.Mars.Identifier
+  },
+  GUI = {
+    Name = "RenderableNodeLine - Basic",
+    Path = "/Examples"
+  }
+}
+
+asset.onInitialize(function()
+  openspace.addSceneGraphNode(Node)
+end)
+
+asset.onDeinitialize(function()
+  openspace.removeSceneGraphNode(Node)
+end)
+
+-- Export the Node table so it can be used in another example
+asset.export("NodeLine", Node)
diff --git a/include/openspace/util/distanceconversion.h b/include/openspace/util/distanceconversion.h
index aba17dda6b..a0e51ea805 100644
--- a/include/openspace/util/distanceconversion.h
+++ b/include/openspace/util/distanceconversion.h
@@ -65,60 +65,11 @@ enum class DistanceUnit {
     League
 };
 
-// Assumption:  Unit names are sequential in memory
-constexpr std::string_view DistanceUnitNanometer = "Nanometer";
-constexpr std::string_view DistanceUnitMicrometer = "Micrometer";
-constexpr std::string_view DistanceUnitMillimeter = "Millimeter";
-constexpr std::string_view DistanceUnitCentimeter = "Centimeter";
-constexpr std::string_view DistanceUnitDecimeter = "Decimeter";
-constexpr std::string_view DistanceUnitMeter = "Meter";
-constexpr std::string_view DistanceUnitKilometer = "Kilometer";
-constexpr std::string_view DistanceUnitAU = "AU";
-constexpr std::string_view DistanceUnitLighthour = "Lighthour";
-constexpr std::string_view DistanceUnitLightday = "Lightday";
-constexpr std::string_view DistanceUnitLightmonth = "Lightmonth";
-constexpr std::string_view DistanceUnitLightyear = "Lightyear";
-constexpr std::string_view DistanceUnitParsec = "Parsec";
-constexpr std::string_view DistanceUnitKiloparsec = "Kiloparsec";
-constexpr std::string_view DistanceUnitMegaparsec = "Megaparsec";
-constexpr std::string_view DistanceUnitGigaparsec = "Gigaparsec";
-constexpr std::string_view DistanceUnitGigalightyear = "Gigalightyear";
-constexpr std::string_view DistanceUnitThou = "Thou";
-constexpr std::string_view DistanceUnitInch = "Inch";
-constexpr std::string_view DistanceUnitFoot = "Foot";
-constexpr std::string_view DistanceUnitYard = "Yard";
-constexpr std::string_view DistanceUnitChain = "Chain";
-constexpr std::string_view DistanceUnitFurlong = "Furlong";
-constexpr std::string_view DistanceUnitMile = "Mile";
-constexpr std::string_view DistanceUnitLeague = "League";
-
-
-// Assumption:  Unit names are sequential in memory
-constexpr std::string_view DistanceUnitNanometers = "Nanometers";
-constexpr std::string_view DistanceUnitMicrometers = "Micrometers";
-constexpr std::string_view DistanceUnitMillimeters = "Millimeters";
-constexpr std::string_view DistanceUnitCentimeters = "Centimeters";
-constexpr std::string_view DistanceUnitDecimeters = "Decimeters";
-constexpr std::string_view DistanceUnitMeters = "Meters";
-constexpr std::string_view DistanceUnitKilometers = "Kilometers";
-constexpr std::string_view DistanceUnitAUs = "AU";
-constexpr std::string_view DistanceUnitLighthours = "Lighthours";
-constexpr std::string_view DistanceUnitLightdays = "Lightdays";
-constexpr std::string_view DistanceUnitLightmonths = "Lightmonths";
-constexpr std::string_view DistanceUnitLightyears = "Lightyears";
-constexpr std::string_view DistanceUnitParsecs = "Parsecs";
-constexpr std::string_view DistanceUnitKiloparsecs = "Kiloparsecs";
-constexpr std::string_view DistanceUnitMegaparsecs = "Megaparsecs";
-constexpr std::string_view DistanceUnitGigaparsecs = "Gigaparsecs";
-constexpr std::string_view DistanceUnitGigalightyears = "Gigalightyears";
-constexpr std::string_view DistanceUnitThous = "Thou";
-constexpr std::string_view DistanceUnitInches = "Inches";
-constexpr std::string_view DistanceUnitFeet = "Feet";
-constexpr std::string_view DistanceUnitYards = "Yards";
-constexpr std::string_view DistanceUnitChains = "Chains";
-constexpr std::string_view DistanceUnitFurlongs = "Furlongs";
-constexpr std::string_view DistanceUnitMiles = "Miles";
-constexpr std::string_view DistanceUnitLeagues = "Leagues";
+struct DistanceUnitName {
+    std::string_view singular;
+    std::string_view plural;
+    std::string_view abbreviation;
+};
 
 constexpr std::array<DistanceUnit, static_cast<int>(DistanceUnit::League) + 1>
 DistanceUnits = {
@@ -132,114 +83,85 @@ DistanceUnits = {
     DistanceUnit::Furlong, DistanceUnit::Mile, DistanceUnit::League
 };
 
-constexpr std::array<std::string_view, static_cast<int>(DistanceUnit::League) + 1>
-DistanceUnitNamesSingular = {
-    DistanceUnitNanometer, DistanceUnitMicrometer, DistanceUnitMillimeter,
-    DistanceUnitCentimeter, DistanceUnitDecimeter, DistanceUnitMeter,
-    DistanceUnitKilometer, DistanceUnitAU, DistanceUnitLighthour,
-    DistanceUnitLightday, DistanceUnitLightmonth, DistanceUnitLightyear,
-    DistanceUnitParsec, DistanceUnitKiloparsec, DistanceUnitMegaparsec,
-    DistanceUnitGigaparsec, DistanceUnitGigalightyear, DistanceUnitThou, DistanceUnitInch,
-    DistanceUnitFoot, DistanceUnitYard, DistanceUnitChain, DistanceUnitFurlong,
-    DistanceUnitMile, DistanceUnitLeague
-};
-
-constexpr std::array<std::string_view, static_cast<int>(DistanceUnit::League) + 1>
-DistanceUnitNamesPlural = {
-    DistanceUnitNanometers, DistanceUnitMicrometers, DistanceUnitMillimeters,
-    DistanceUnitCentimeters, DistanceUnitDecimeters, DistanceUnitMeters,
-    DistanceUnitKilometers, DistanceUnitAUs, DistanceUnitLighthours,
-    DistanceUnitLightdays, DistanceUnitLightmonths, DistanceUnitLightyears,
-    DistanceUnitParsecs, DistanceUnitKiloparsecs, DistanceUnitMegaparsecs,
-    DistanceUnitGigaparsecs, DistanceUnitGigalightyears, DistanceUnitThous,
-    DistanceUnitInches, DistanceUnitFeet, DistanceUnitYards, DistanceUnitChains,
-    DistanceUnitFurlongs, DistanceUnitMile, DistanceUnitLeague
-};
+// Note that the syntax here is required when initializing constexpr std::arrays with structs
+constexpr std::array<DistanceUnitName, static_cast<int>(DistanceUnit::League) + 1>
+DistanceUnitNames {{
+    { "Nanometer", "Nanometers", "nm" },
+    { "Micrometer", "Micrometers", "um" },
+    { "Millimeter", "Millimeters", "mm" },
+    { "Centimeter", "Centimeters", "cm" },
+    { "Decimeter", "Decimeters", "dm" },
+    { "Meter", "Meters", "m" },
+    { "Kilometer", "Kilometers", "km" },
+    { "AU", "AU", "au" },
+    { "Lighthour", "Lighthours", "lh" },
+    { "Lightday", "Lightdays", "ld" },
+    { "Lightmonth", "Lightmonths", "lm" },
+    { "Lightyear", "Lightyears", "ly" },
+    { "Parsec", "Parsecs", "pc" },
+    { "Kiloparsec", "Kiloparsecs", "kpc" },
+    { "Megaparsec", "Megaparsecs", "Mpc" },
+    { "Gigaparsec", "Gigaparsecs", "Gpc" },
+    { "Gigalightyear", "Gigalightyears", "Gly" },
+    { "Thou", "Thou", "th" },
+    { "Inch", "Inches", "in" },
+    { "Foot", "Feet", "ft" },
+    { "Yard", "Yards", "yd" },
+    { "Chain", "Chains", "ch" },
+    { "Furlong", "Furlongs", "fur" },
+    { "Mile", "Miles", "mi" },
+    { "League", "Leagues", "league"}
+}};
 
 constexpr bool isValidDistanceUnitName(std::string_view name) {
-    for (std::string_view val : DistanceUnitNamesSingular) {
-        if (val == name) {
-            return true;
-        }
-    }
-
-    for (std::string_view val : DistanceUnitNamesPlural) {
-        if (val == name) {
+    for (DistanceUnit unit : DistanceUnits) {
+        const DistanceUnitName unitName = DistanceUnitNames[static_cast<int>(unit)];
+        if (name == unitName.singular || name == unitName.plural ||
+            name == unitName.abbreviation)
+        {
             return true;
         }
     }
     return false;
 }
 
-constexpr std::string_view nameForDistanceUnit(DistanceUnit unit, bool pluralForm = false)
+constexpr std::string_view nameForDistanceUnit(DistanceUnit unit, bool usePluralForm = false)
 {
-    switch (unit) {
-        case DistanceUnit::Nanometer:
-        case DistanceUnit::Micrometer:
-        case DistanceUnit::Millimeter:
-        case DistanceUnit::Centimeter:
-        case DistanceUnit::Decimeter:
-        case DistanceUnit::Meter:
-        case DistanceUnit::Kilometer:
-        case DistanceUnit::AU:
-        case DistanceUnit::Lighthour:
-        case DistanceUnit::Lightday:
-        case DistanceUnit::Lightmonth:
-        case DistanceUnit::Lightyear:
-        case DistanceUnit::Parsec:
-        case DistanceUnit::Kiloparsec:
-        case DistanceUnit::Megaparsec:
-        case DistanceUnit::Gigaparsec:
-        case DistanceUnit::Gigalightyear:
-        case DistanceUnit::Thou:
-        case DistanceUnit::Inch:
-        case DistanceUnit::Foot:
-        case DistanceUnit::Yard:
-        case DistanceUnit::Chain:
-        case DistanceUnit::Furlong:
-        case DistanceUnit::Mile:
-        case DistanceUnit::League:
-            if (pluralForm) {
-                return DistanceUnitNamesPlural[static_cast<int>(unit)];
-            }
-            else {
-                return DistanceUnitNamesSingular[static_cast<int>(unit)];
-            }
-        default:
-            throw ghoul::MissingCaseException();
-    }
+    const DistanceUnitName unitName = DistanceUnitNames[static_cast<int>(unit)];
+    return usePluralForm ? unitName.plural : unitName.singular;
+}
+
+constexpr std::string_view abbreviationForDistanceUnit(DistanceUnit unit) {
+    return DistanceUnitNames[static_cast<int>(unit)].abbreviation;
 }
 
 constexpr DistanceUnit distanceUnitFromString(std::string_view unitName) {
-    int found = -1;
     int i = 0;
-    for (std::string_view val : DistanceUnitNamesSingular) {
-        if (val == unitName) {
-            found = i;
-            break;
+    for (DistanceUnit unit : DistanceUnits) {
+        const DistanceUnitName name = DistanceUnitNames[static_cast<int>(unit)];
+        if (name.singular == unitName || name.plural == unitName ||
+            name.abbreviation == unitName)
+        {
+            return static_cast<DistanceUnit>(i);
         }
         i++;
     }
 
-    i = 0;
-    for (std::string_view val : DistanceUnitNamesPlural) {
-        if (val == unitName) {
-            found = i;
-            break;
-        }
-        i++;
-    }
-
-
-    if (found != -1) {
-        return static_cast<DistanceUnit>(found);
-    }
-    else {
-        throw ghoul::MissingCaseException();
-    }
+    throw ghoul::MissingCaseException();
 }
 
-
+constexpr std::vector<std::string> distanceUnitList() {
+    std::vector<std::string> res(DistanceUnits.size());
+    std::transform(
+        DistanceUnits.begin(),
+        DistanceUnits.end(),
+        res.begin(),
+        [](DistanceUnit unit) {
+            return std::string(nameForDistanceUnit(unit));
+        }
+    );
+    return res;
+}
 
 std::pair<double, std::string_view> simplifyDistance(double meters,
     bool forceSingularForm = false);
diff --git a/modules/base/CMakeLists.txt b/modules/base/CMakeLists.txt
index 9f6c3ceeae..61be03a2d6 100644
--- a/modules/base/CMakeLists.txt
+++ b/modules/base/CMakeLists.txt
@@ -50,6 +50,7 @@ set(HEADER_FILES
   rendering/pointcloud/sizemappingcomponent.h
   rendering/renderablecartesianaxes.h
   rendering/renderabledisc.h
+  rendering/renderabledistancelabel.h
   rendering/renderablelabel.h
   rendering/renderablemodel.h
   rendering/renderablenodearrow.h
@@ -113,6 +114,7 @@ set(SOURCE_FILES
   rendering/pointcloud/sizemappingcomponent.cpp
   rendering/renderablecartesianaxes.cpp
   rendering/renderabledisc.cpp
+  rendering/renderabledistancelabel.cpp
   rendering/renderablelabel.cpp
   rendering/renderablemodel.cpp
   rendering/renderablenodearrow.cpp
diff --git a/modules/base/basemodule.cpp b/modules/base/basemodule.cpp
index 80f8aeefee..431df77e85 100644
--- a/modules/base/basemodule.cpp
+++ b/modules/base/basemodule.cpp
@@ -49,6 +49,7 @@
 #include <modules/base/rendering/pointcloud/sizemappingcomponent.h>
 #include <modules/base/rendering/renderablecartesianaxes.h>
 #include <modules/base/rendering/renderabledisc.h>
+#include <modules/base/rendering/renderabledistancelabel.h>
 #include <modules/base/rendering/renderablelabel.h>
 #include <modules/base/rendering/renderablemodel.h>
 #include <modules/base/rendering/renderablenodearrow.h>
@@ -138,6 +139,7 @@ void BaseModule::internalInitialize(const ghoul::Dictionary&) {
     fRenderable->registerClass<RenderableBoxGrid>("RenderableBoxGrid");
     fRenderable->registerClass<RenderableCartesianAxes>("RenderableCartesianAxes");
     fRenderable->registerClass<RenderableDisc>("RenderableDisc");
+    fRenderable->registerClass<RenderableDistanceLabel>("RenderableDistanceLabel");
     fRenderable->registerClass<RenderableGrid>("RenderableGrid");
     fRenderable->registerClass<RenderableLabel>("RenderableLabel");
     fRenderable->registerClass<RenderableModel>("RenderableModel");
@@ -230,6 +232,7 @@ std::vector<documentation::Documentation> BaseModule::documentations() const {
         RenderableBoxGrid::Documentation(),
         RenderableCartesianAxes::Documentation(),
         RenderableDisc::Documentation(),
+        RenderableDistanceLabel::Documentation(),
         RenderableGrid::Documentation(),
         RenderableInterpolatedPoints::Documentation(),
         RenderableLabel::Documentation(),
diff --git a/modules/base/dashboard/dashboarditemdistance.cpp b/modules/base/dashboard/dashboarditemdistance.cpp
index c67d041e67..6fb3205e37 100644
--- a/modules/base/dashboard/dashboarditemdistance.cpp
+++ b/modules/base/dashboard/dashboarditemdistance.cpp
@@ -106,19 +106,6 @@ namespace {
         openspace::properties::Property::Visibility::AdvancedUser
     };
 
-    std::vector<std::string> unitList() {
-        std::vector<std::string> res(openspace::DistanceUnits.size());
-        std::transform(
-            openspace::DistanceUnits.begin(),
-            openspace::DistanceUnits.end(),
-            res.begin(),
-            [](openspace::DistanceUnit unit) {
-                return std::string(nameForDistanceUnit(unit));
-            }
-        );
-        return res;
-    }
-
     struct [[codegen::Dictionary(DashboardItemDistance)]] Parameters {
         enum class [[codegen::map(Type)]] TypeInfo {
             Node,
@@ -143,7 +130,8 @@ namespace {
         std::optional<bool> simplification;
 
         // [[codegen::verbatim(RequestedUnitInfo.description)]]
-        std::optional<std::string> requestedUnit [[codegen::inlist(unitList())]];
+        std::optional<std::string> requestedUnit
+            [[codegen::inlist(openspace::distanceUnitList())]];
 
         // [[codegen::verbatim(FormatStringInfo.description)]]
         std::optional<std::string> formatString;
diff --git a/modules/base/dashboard/dashboarditemvelocity.cpp b/modules/base/dashboard/dashboarditemvelocity.cpp
index ac51ea2b6f..f76d2c8076 100644
--- a/modules/base/dashboard/dashboarditemvelocity.cpp
+++ b/modules/base/dashboard/dashboarditemvelocity.cpp
@@ -57,25 +57,13 @@ namespace {
         openspace::properties::Property::Visibility::User
     };
 
-    std::vector<std::string> unitList() {
-        std::vector<std::string> res(openspace::DistanceUnits.size());
-        std::transform(
-            openspace::DistanceUnits.begin(),
-            openspace::DistanceUnits.end(),
-            res.begin(),
-            [](openspace::DistanceUnit unit) {
-                return std::string(nameForDistanceUnit(unit));
-            }
-        );
-        return res;
-    }
-
     struct [[codegen::Dictionary(DashboardItemVelocity)]] Parameters {
         // [[codegen::verbatim(SimplificationInfo.description)]]
         std::optional<bool> simplification;
 
         // [[codegen::verbatim(RequestedUnitInfo.description)]]
-        std::optional<std::string> requestedUnit [[codegen::inlist(unitList())]];
+        std::optional<std::string> requestedUnit
+            [[codegen::inlist(openspace::distanceUnitList())]];
     };
 #include "dashboarditemvelocity_codegen.cpp"
 
diff --git a/modules/vislab/rendering/renderabledistancelabel.cpp b/modules/base/rendering/renderabledistancelabel.cpp
similarity index 70%
rename from modules/vislab/rendering/renderabledistancelabel.cpp
rename to modules/base/rendering/renderabledistancelabel.cpp
index 9a49becdf1..7de7c4cf41 100644
--- a/modules/vislab/rendering/renderabledistancelabel.cpp
+++ b/modules/base/rendering/renderabledistancelabel.cpp
@@ -22,7 +22,7 @@
  * OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                                         *
  ****************************************************************************************/
 
-#include <modules/vislab/rendering/renderabledistancelabel.h>
+#include <modules/base/rendering/renderabledistancelabel.h>
 
 #include <modules/base/rendering/renderablenodeline.h>
 #include <openspace/documentation/documentation.h>
@@ -30,6 +30,7 @@
 #include <openspace/engine/globals.h>
 #include <openspace/rendering/renderengine.h>
 #include <openspace/scene/scene.h>
+#include <openspace/util/distanceconversion.h>
 #include <ghoul/logging/logmanager.h>
 #include <optional>
 #include <string>
@@ -46,12 +47,9 @@ namespace {
         openspace::properties::Property::Visibility::AdvancedUser
     };
 
-    // @TODO (2024-04-26, emmbr) The unit and custom unit descriptor are confusing and
-    // should be reimplemented. Why are we using an int value for the unit??
-
     constexpr openspace::properties::Property::PropertyInfo DistanceUnitInfo = {
         "DistanceUnit",
-        "Distance Unit",
+        "Display Distance Unit",
         "The unit in which the distance value should be displayed. Defaults to 'km' if "
         "not specified.",
         openspace::properties::Property::Visibility::User
@@ -61,19 +59,40 @@ namespace {
         "CustomUnitDescriptor",
         "Custom Unit Descriptor",
         "Property to define a custom unit descriptor to use to describe the distance "
-        "value. Defaults to the units SI descriptor if not specified.",
+        "value. Defaults to the selected unit's SI descriptor if not specified.",
         openspace::properties::Property::Visibility::AdvancedUser
     };
 
+    constexpr openspace::properties::Property::PropertyInfo PrecisionInfo = {
+        "Precision",
+        "Precision",
+        "The precision in which to to show the distance number, i.e. the number of "
+        "digits after the decimal point.",
+        openspace::properties::Property::Visibility::User
+    };
+
+    // This `Renderable` creates a label that shows the distance between two nodes, based
+    // on an existing [RenderableNodeLine](#base_renderable_nodeline). The label
+    // will be placed halfway between the two scene graph nodes that the line connects.
+    //
+    // The unit in which the distance is displayed can be customized, as well as the
+    // precision of the number.
     struct [[codegen::Dictionary(RenderableDistanceLabel)]] Parameters {
-        // [[codegen::verbatim(NodeLineInfo.description)]]
+        // The identifier of a scene graph node with a
+        // [RenderableNodeLine](#base_renderable_nodeline) that this label
+        // should track. The label text will be updating based on the distance from the
+        // node line's start and end.
         std::string nodeLine;
 
         // [[codegen::verbatim(DistanceUnitInfo.description)]]
-        std::optional<int> distanceUnit;
+        std::optional<std::string> distanceUnit
+            [[codegen::inlist(openspace::distanceUnitList())]];
 
         // [[codegen::verbatim(CustomUnitDescriptorInfo.description)]]
         std::optional<std::string> customUnitDescriptor;
+
+        // [[codegen::verbatim(PrecisionInfo.description)]]
+        std::optional<int> precision [[codegen::greaterequal(0)]];
     };
 #include "renderabledistancelabel_codegen.cpp"
 } // namespace
@@ -81,25 +100,42 @@ namespace {
 namespace openspace {
 
 documentation::Documentation RenderableDistanceLabel::Documentation() {
-    return codegen::doc<Parameters>("vislab_renderable_distance_label");
+    return codegen::doc<Parameters>("base_renderable_distancelabel");
 }
 
 RenderableDistanceLabel::RenderableDistanceLabel(const ghoul::Dictionary& dictionary)
     : RenderableLabel(dictionary)
     , _nodelineId(NodeLineInfo)
-    , _distanceUnit(DistanceUnitInfo, 1, 0, 11)
+    , _distanceUnit(DistanceUnitInfo, properties::OptionProperty::DisplayType::Dropdown)
     , _customUnitDescriptor(CustomUnitDescriptorInfo)
+    , _precision(PrecisionInfo, 0, 0, 10)
 {
     const Parameters p = codegen::bake<Parameters>(dictionary);
 
     _nodelineId = p.nodeLine;
     addProperty(_nodelineId);
 
-    _distanceUnit = p.distanceUnit.value_or(_distanceUnit);
+    for (const DistanceUnit u : DistanceUnits) {
+        _distanceUnit.addOption(
+            static_cast<int>(u),
+            std::string(nameForDistanceUnit(u))
+        );
+    }
+    _distanceUnit = static_cast<int>(DistanceUnit::Kilometer);
+    if (p.distanceUnit.has_value()) {
+        const DistanceUnit unit = distanceUnitFromString(*p.distanceUnit);
+        _distanceUnit = static_cast<int>(unit);
+    }
     addProperty(_distanceUnit);
 
     _customUnitDescriptor = p.customUnitDescriptor.value_or(_customUnitDescriptor);
     addProperty(_customUnitDescriptor);
+
+    _precision = p.precision.value_or(_precision);
+    addProperty(_precision);
+
+    // The text will be updated automatically, so set the property to readonly
+    _text.setReadOnly(true);
 }
 
 void RenderableDistanceLabel::update(const UpdateData&) {
@@ -120,22 +156,18 @@ void RenderableDistanceLabel::update(const UpdateData&) {
             return;
         }
 
-        // Get used unit scale
-        const float scale = unit(_distanceUnit);
+        const DistanceUnit unit = static_cast<DistanceUnit>(_distanceUnit.value());
 
         // Get unit descriptor text
-        std::string_view unitDescriptor = toString(_distanceUnit);
+        std::string_view unitDescriptor = abbreviationForDistanceUnit(unit);
         if (!_customUnitDescriptor.value().empty()) {
             unitDescriptor = _customUnitDescriptor;
         }
 
-        // Get distance as string and remove fractional part
-        std::string distanceText = std::to_string(
-            std::round(nodeline->distance() / scale)
-        );
-        const int pos = static_cast<int>(distanceText.find('.'));
-        const std::string subStr = distanceText.substr(pos);
-        distanceText.erase(pos, subStr.size());
+        // Get distance as string
+        const double convertedDistance = convertMeters(nodeline->distance(), unit);
+
+        std::string distanceText = std::format("{:.{}f}", convertedDistance, _precision.value());
 
         // Create final label text and set it
         const std::string finalText = std::format("{} {}", distanceText, unitDescriptor);
diff --git a/modules/vislab/rendering/renderabledistancelabel.h b/modules/base/rendering/renderabledistancelabel.h
similarity index 85%
rename from modules/vislab/rendering/renderabledistancelabel.h
rename to modules/base/rendering/renderabledistancelabel.h
index 7bd48d8fa3..0f785b2da7 100644
--- a/modules/vislab/rendering/renderabledistancelabel.h
+++ b/modules/base/rendering/renderabledistancelabel.h
@@ -22,11 +22,15 @@
  * OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                                         *
  ****************************************************************************************/
 
-#ifndef __OPENSPACE_MODULE_VISLAB___RENDERABLEDISTANCELABEL___H__
-#define __OPENSPACE_MODULE_VISLAB___RENDERABLEDISTANCELABEL___H__
+#ifndef __OPENSPACE_MODULE_BASE___RENDERABLEDISTANCELABEL___H__
+#define __OPENSPACE_MODULE_BASE___RENDERABLEDISTANCELABEL___H__
 
 #include <modules/base/rendering/renderablelabel.h>
 
+#include <openspace/properties/optionproperty.h>
+#include <openspace/properties/scalar/intproperty.h>
+#include <openspace/properties/stringproperty.h>
+
 namespace openspace {
 
 namespace documentation { struct Documentation; }
@@ -40,11 +44,12 @@ public:
 
 private:
      properties::StringProperty _nodelineId;
-     properties::IntProperty _distanceUnit;
+     properties::OptionProperty _distanceUnit;
      properties::StringProperty _customUnitDescriptor;
+     properties::IntProperty _precision;
      bool _errorThrown = false;
 };
 
 } // namespace openspace
 
-#endif // __OPENSPACE_MODULE_VISLAB___RENDERABLEDISTANCELABEL___H__
+#endif // __OPENSPACE_MODULE_BASE___RENDERABLEDISTANCELABEL___H__
diff --git a/modules/base/rendering/renderablelabel.h b/modules/base/rendering/renderablelabel.h
index 5708dd6198..c6684c8c60 100644
--- a/modules/base/rendering/renderablelabel.h
+++ b/modules/base/rendering/renderablelabel.h
@@ -73,6 +73,8 @@ public:
 protected:
     properties::OptionProperty _blendMode;
 
+    properties::StringProperty _text;
+
     float unit(int unit) const;
 
     std::string_view toString(int unit) const;
@@ -92,8 +94,6 @@ private:
     properties::FloatProperty _size;
     properties::IVec2Property _minMaxSize;
 
-    properties::StringProperty _text;
-
     properties::BoolProperty _enableFadingEffect;
     properties::Vec2Property _fadeWidths;
     properties::Vec2Property _fadeDistances;
diff --git a/modules/base/rendering/renderablemodel.cpp b/modules/base/rendering/renderablemodel.cpp
index 7541f2b554..a22ddf579c 100644
--- a/modules/base/rendering/renderablemodel.cpp
+++ b/modules/base/rendering/renderablemodel.cpp
@@ -319,19 +319,11 @@ RenderableModel::RenderableModel(const ghoul::Dictionary& dictionary)
             const std::string stringUnit = std::get<std::string>(*p.modelScale);
 
             // Find matching unit name in list of supported unit names
-            DistanceUnit distanceUnit;
-            bool wasFound = false;
-            for (int i = 0; i < DistanceUnitNamesSingular.size(); ++i) {
-                if (stringUnit == DistanceUnitNamesSingular[i]) {
-                    wasFound = true;
-                    distanceUnit = DistanceUnits[i];
-                }
-            }
-
-            if (wasFound) {
+            try {
+                DistanceUnit distanceUnit = distanceUnitFromString(stringUnit);
                 _modelScale = toMeter(distanceUnit);
             }
-            else {
+            catch (const ghoul::MissingCaseException& e) {
                 std::string message = std::format("The given unit name '{}' does not "
                     "match any currently supported unit names", stringUnit);
                 LERROR(message);
diff --git a/modules/base/rendering/renderablenodeline.cpp b/modules/base/rendering/renderablenodeline.cpp
index 6d9642dec8..369da08cbc 100644
--- a/modules/base/rendering/renderablenodeline.cpp
+++ b/modules/base/rendering/renderablenodeline.cpp
@@ -114,6 +114,13 @@ namespace {
         return diffPos;
     }
 
+    // This `Renderable` connects two scene graph nodes by drawing a line between them.
+    // The line will update dynamically if the position of the nodes change.
+    //
+    // One use case for the `RenderableNodeLine` is to visualize the distance between two
+    // objects. For this, a [RenderableDistanceLabel](#base_renderable_distancelabel) can
+    // also be added to show the distance as a number. That renderable is designed to show
+    // the distance between the start and end node for a given `RenderableNodeLine`.
     struct [[codegen::Dictionary(RenderableNodeLine)]] Parameters {
         // [[codegen::verbatim(StartNodeInfo.description)]]
         std::optional<std::string> startNode [[codegen::identifier()]];
@@ -142,7 +149,7 @@ namespace {
 namespace openspace {
 
 documentation::Documentation RenderableNodeLine::Documentation() {
-    return codegen::doc<Parameters>("base_renderable_renderablenodeline");
+    return codegen::doc<Parameters>("base_renderable_nodeline");
 }
 
 RenderableNodeLine::RenderableNodeLine(const ghoul::Dictionary& dictionary)
diff --git a/modules/vislab/CMakeLists.txt b/modules/vislab/CMakeLists.txt
deleted file mode 100644
index adf95601e7..0000000000
--- a/modules/vislab/CMakeLists.txt
+++ /dev/null
@@ -1,37 +0,0 @@
-##########################################################################################
-#                                                                                        #
-# OpenSpace                                                                              #
-#                                                                                        #
-# Copyright (c) 2014-2025                                                                #
-#                                                                                        #
-# Permission is hereby granted, free of charge, to any person obtaining a copy of this   #
-# software and associated documentation files (the "Software"), to deal in the Software  #
-# without restriction, including without limitation the rights to use, copy, modify,     #
-# merge, publish, distribute, sublicense, and/or sell copies of the Software, and to     #
-# permit persons to whom the Software is furnished to do so, subject to the following    #
-# conditions:                                                                            #
-#                                                                                        #
-# The above copyright notice and this permission notice shall be included in all copies  #
-# or substantial portions of the Software.                                               #
-#                                                                                        #
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED,    #
-# INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A          #
-# PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT     #
-# HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF   #
-# CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE   #
-# OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                                          #
-##########################################################################################
-
-include(${PROJECT_SOURCE_DIR}/support/cmake/module_definition.cmake)
-
-set(HEADER_FILES
-  rendering/renderabledistancelabel.h
-)
-source_group("Header Files" FILES ${HEADER_FILES})
-
-set(SOURCE_FILES
-  rendering/renderabledistancelabel.cpp
-)
-source_group("Source Files" FILES ${SOURCE_FILES})
-
-create_new_module("VisLab" vislab_module ${HEADER_FILES} ${SOURCE_FILES})
diff --git a/modules/vislab/include.cmake b/modules/vislab/include.cmake
deleted file mode 100644
index ffea0ac430..0000000000
--- a/modules/vislab/include.cmake
+++ /dev/null
@@ -1 +0,0 @@
-set(DEFAULT_MODULE ON)
diff --git a/modules/vislab/vislabmodule.cpp b/modules/vislab/vislabmodule.cpp
deleted file mode 100644
index d1f6a1b43c..0000000000
--- a/modules/vislab/vislabmodule.cpp
+++ /dev/null
@@ -1,51 +0,0 @@
-/*****************************************************************************************
- *                                                                                       *
- * OpenSpace                                                                             *
- *                                                                                       *
- * Copyright (c) 2014-2025                                                               *
- *                                                                                       *
- * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
- * software and associated documentation files (the "Software"), to deal in the Software *
- * without restriction, including without limitation the rights to use, copy, modify,    *
- * merge, publish, distribute, sublicense, and/or sell copies of the Software, and to    *
- * permit persons to whom the Software is furnished to do so, subject to the following   *
- * conditions:                                                                           *
- *                                                                                       *
- * The above copyright notice and this permission notice shall be included in all copies *
- * or substantial portions of the Software.                                              *
- *                                                                                       *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED,   *
- * INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A         *
- * PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT    *
- * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF  *
- * CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE  *
- * OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                                         *
- ****************************************************************************************/
-
-#include <modules/vislab/vislabmodule.h>
-
-#include <modules/vislab/rendering/renderabledistancelabel.h>
-#include <openspace/documentation/documentation.h>
-#include <openspace/util/factorymanager.h>
-#include <ghoul/misc/assert.h>
-#include <ghoul/misc/templatefactory.h>
-
-namespace openspace {
-
-VisLabModule::VisLabModule() : OpenSpaceModule(Name) {}
-
-void VisLabModule::internalInitialize(const ghoul::Dictionary&) {
-    ghoul::TemplateFactory<Renderable>* renderableFactory =
-        FactoryManager::ref().factory<Renderable>();
-    ghoul_assert(renderableFactory, "No renderable factory existed");
-
-    renderableFactory->registerClass<RenderableDistanceLabel>("RenderableDistanceLabel");
-}
-
-std::vector<documentation::Documentation>VisLabModule::documentations() const {
-    return {
-        RenderableDistanceLabel::Documentation()
-    };
-}
-
-} // namespace openspace
diff --git a/modules/vislab/vislabmodule.h b/modules/vislab/vislabmodule.h
deleted file mode 100644
index 48829ca8cc..0000000000
--- a/modules/vislab/vislabmodule.h
+++ /dev/null
@@ -1,47 +0,0 @@
-/*****************************************************************************************
- *                                                                                       *
- * OpenSpace                                                                             *
- *                                                                                       *
- * Copyright (c) 2014-2025                                                               *
- *                                                                                       *
- * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
- * software and associated documentation files (the "Software"), to deal in the Software *
- * without restriction, including without limitation the rights to use, copy, modify,    *
- * merge, publish, distribute, sublicense, and/or sell copies of the Software, and to    *
- * permit persons to whom the Software is furnished to do so, subject to the following   *
- * conditions:                                                                           *
- *                                                                                       *
- * The above copyright notice and this permission notice shall be included in all copies *
- * or substantial portions of the Software.                                              *
- *                                                                                       *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED,   *
- * INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A         *
- * PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT    *
- * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF  *
- * CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE  *
- * OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                                         *
- ****************************************************************************************/
-
-#ifndef __OPENSPACE_MODULE_VISLAB___VISLABMODULE___H__
-#define __OPENSPACE_MODULE_VISLAB___VISLABMODULE___H__
-
-#include <openspace/util/openspacemodule.h>
-
-namespace openspace {
-
-class VisLabModule : public OpenSpaceModule {
-public:
-    constexpr static const char* Name = "VisLab";
-
-    VisLabModule();
-
-    std::vector<documentation::Documentation> documentations() const override;
-
-
-private:
-    void internalInitialize(const ghoul::Dictionary&) override;
-};
-
-} // namespace openspace
-
-#endif // __OPENSPACE_MODULE_VISLAB___VISLABMODULE___H__

From 8a5d57a441eb8f6e59ecdbe4a969f6a62a1be2ca Mon Sep 17 00:00:00 2001
From: David Wagner <david@marvid.fr>
Date: Fri, 31 Jan 2025 08:27:38 +0100
Subject: [PATCH 696/701] cmake: honor OPENSPACE_HAVE_TESTS at more places
 (#3503)

- Don't build the codegen unit tests if the OpenSpace unit tests are
  disabled;
- Dropagate the value of this option to Ghoul's corresponding option,
  unless Ghoul's option value has been forced;
---
 CMakeLists.txt                | 9 ++++-----
 apps/OpenSpace/CMakeLists.txt | 4 ++++
 ext/CMakeLists.txt            | 4 ++++
 3 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index c97abd15d3..f5c36c3087 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -183,11 +183,6 @@ add_subdirectory("${CMAKE_CURRENT_SOURCE_DIR}/modules")
 end_header("End: Configuring Modules")
 
 
-add_subdirectory(support/coding/codegen/tests)
-set_target_properties(run_test_codegen PROPERTIES FOLDER "Unit Tests/support")
-set_target_properties(codegentest PROPERTIES FOLDER "Unit Tests")
-
-
 begin_header("Configuring Applications")
 add_subdirectory(apps)
 end_header("End: Configuring Applications")
@@ -200,6 +195,10 @@ endif ()
 
 option(OPENSPACE_HAVE_TESTS "Activate the OpenSpace unit tests" ON)
 if (OPENSPACE_HAVE_TESTS)
+  add_subdirectory(support/coding/codegen/tests)
+  set_target_properties(run_test_codegen PROPERTIES FOLDER "Unit Tests/support")
+  set_target_properties(codegentest PROPERTIES FOLDER "Unit Tests")
+
   begin_header("Generating OpenSpace unit test")
   add_subdirectory(tests)
   end_header()
diff --git a/apps/OpenSpace/CMakeLists.txt b/apps/OpenSpace/CMakeLists.txt
index 2df78b12af..240d706377 100644
--- a/apps/OpenSpace/CMakeLists.txt
+++ b/apps/OpenSpace/CMakeLists.txt
@@ -116,6 +116,10 @@ set(SGCT_DEP_INCLUDE_FMT OFF CACHE BOOL "" FORCE)
 set(SGCT_DEP_INCLUDE_SCN OFF CACHE BOOL "" FORCE)
 set(SGCT_DEP_INCLUDE_CATCH2 OFF CACHE BOOL "" FORCE)
 
+if (NOT OPENSPACE_HAVE_TESTS)
+  # Unless overriden, disable sgct tests if OpenSpace tests are disabled
+  set(SGCT_BUILD_TESTS FALSE CACHE BOOL "Enable ghoul unit tests")
+endif()
 add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/ext/sgct)
 target_link_libraries(OpenSpace PRIVATE sgct)
 
diff --git a/ext/CMakeLists.txt b/ext/CMakeLists.txt
index cea0e12481..2a42f99780 100644
--- a/ext/CMakeLists.txt
+++ b/ext/CMakeLists.txt
@@ -45,6 +45,10 @@ if (APPLE)
 endif ()
 
 # Ghoul
+if (NOT OPENSPACE_HAVE_TESTS)
+  # Unless overriden, disable ghoul tests if OpenSpace tests are disabled
+  set(GHOUL_HAVE_TESTS FALSE CACHE BOOL "Enable ghoul unit tests")
+endif()
 add_subdirectory(ghoul)
 if (TARGET GhoulTest)
   set_target_properties(GhoulTest PROPERTIES FOLDER "Unit Tests")

From 7df0a0e9279d86852ad28a33f8a9f5bab5f7b2e8 Mon Sep 17 00:00:00 2001
From: Alexander Bock <mail@alexanderbock.eu>
Date: Sun, 2 Feb 2025 11:51:31 +0100
Subject: [PATCH 697/701] Handle gif files as videos instead of images

---
 scripts/drag_drop_handler.lua | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/scripts/drag_drop_handler.lua b/scripts/drag_drop_handler.lua
index e15db99429..045e681d1b 100644
--- a/scripts/drag_drop_handler.lua
+++ b/scripts/drag_drop_handler.lua
@@ -25,14 +25,14 @@ basename_without_extension = basename:sub(0, #basename - extension:len())
 local is_image_file = function(extension)
   return extension == ".png" or extension == ".jpg" or extension == ".jpeg" or
          extension == ".tif" or extension == ".tga" or extension == ".bmp" or
-         extension == ".psd" or extension == ".gif" or extension == ".hdr" or
+         extension == ".psd"  or extension == ".hdr" or
          extension == ".pic" or extension == ".pnm"
 end
 
 local is_video_file = function(extension)
   return extension == ".mp4" or extension == ".webm" or extension == ".mkv" or
          extension == ".avi" or extension == ".mov" or extension == ".wmv" or
-         extension == ".mpg" or extension == ".m4v"
+         extension == ".mpg" or extension == ".m4v" or extension == ".gif"
 end
 
 local is_asset_file = function(extension)

From 0e89cc3d601247469d588d6585f11c78d0d26862 Mon Sep 17 00:00:00 2001
From: Alexander Bock <mail@alexanderbock.eu>
Date: Sun, 2 Feb 2025 20:49:06 +0100
Subject: [PATCH 698/701] Print configuration syntax error into the log and not
 only the console

---
 apps/OpenSpace/main.cpp | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/apps/OpenSpace/main.cpp b/apps/OpenSpace/main.cpp
index 961627079c..7f4791a55f 100644
--- a/apps/OpenSpace/main.cpp
+++ b/apps/OpenSpace/main.cpp
@@ -1496,7 +1496,14 @@ int main(int argc, char* argv[]) {
     LDEBUG("Parsing commandline arguments");
     sgct::Configuration config = parseArguments(arg);
     LDEBUG("Loading cluster information");
-    config::Cluster cluster = loadCluster(absPath(windowConfiguration).string());
+    config::Cluster cluster;
+    try {
+        loadCluster(absPath(windowConfiguration).string());
+    }
+    catch (const std::runtime_error& e) {
+        LFATALC("main", e.what());
+        exit(EXIT_FAILURE);
+    }
 
     LDEBUG("Setting callbacks");
     Engine::Callbacks callbacks = {

From 0c9aa9c6660a6975fc5f49c25432477c4eff589b Mon Sep 17 00:00:00 2001
From: Alexander Bock <mail@alexanderbock.eu>
Date: Mon, 3 Feb 2025 19:05:22 +0100
Subject: [PATCH 699/701] Fix previously introduced bug and update SGCT
 repository

---
 apps/OpenSpace/ext/sgct | 2 +-
 apps/OpenSpace/main.cpp | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/apps/OpenSpace/ext/sgct b/apps/OpenSpace/ext/sgct
index 965bdc4fee..70696c272f 160000
--- a/apps/OpenSpace/ext/sgct
+++ b/apps/OpenSpace/ext/sgct
@@ -1 +1 @@
-Subproject commit 965bdc4fee73b2ec74eafaa0d85fbbdc0be7657e
+Subproject commit 70696c272f54ad515f78baff4a1a798e52dd13d4
diff --git a/apps/OpenSpace/main.cpp b/apps/OpenSpace/main.cpp
index 7f4791a55f..da300bcdb1 100644
--- a/apps/OpenSpace/main.cpp
+++ b/apps/OpenSpace/main.cpp
@@ -1498,7 +1498,7 @@ int main(int argc, char* argv[]) {
     LDEBUG("Loading cluster information");
     config::Cluster cluster;
     try {
-        loadCluster(absPath(windowConfiguration).string());
+        cluster = loadCluster(absPath(windowConfiguration).string());
     }
     catch (const std::runtime_error& e) {
         LFATALC("main", e.what());

From 098a41b8bf24f67b7ce62abdcd4024267ae4c1af Mon Sep 17 00:00:00 2001
From: Alexander Bock <mail@alexanderbock.eu>
Date: Mon, 3 Feb 2025 19:17:27 +0100
Subject: [PATCH 700/701] Show node ID in frame information overlay

---
 modules/debugging/debuggingmodule.cpp | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/modules/debugging/debuggingmodule.cpp b/modules/debugging/debuggingmodule.cpp
index 725cf50543..55df018e7e 100644
--- a/modules/debugging/debuggingmodule.cpp
+++ b/modules/debugging/debuggingmodule.cpp
@@ -106,7 +106,7 @@ DebuggingModule::DebuggingModule()
             WindowDelegate* del = global::windowDelegate;
 
             glm::vec2 penPosition = glm::vec2(
-                global::renderEngine->fontResolution().x / 2 - 50,
+                global::renderEngine->fontResolution().x / 2 - 70,
                 global::renderEngine->fontResolution().y / 3
             );
 
@@ -122,13 +122,14 @@ DebuggingModule::DebuggingModule()
                 }
             }(frustum);
 
+            std::string node = std::to_string(del->currentNode());
             std::string sgFn = std::to_string(del->swapGroupFrameNumber());
             std::string dt = std::to_string(del->deltaTime());
             std::string avgDt = std::to_string(del->averageDeltaTime());
 
             const std::string res = std::format(
-                "Frame: {} {}\nSwap group frame: {}\nDt: {}\nAvg Dt: {}",
-                fn, fr, sgFn, dt, avgDt
+                "Node: {}\n\nFrame: {} {}\nSwap group frame: {}\nDt: {}\nAvg Dt: {}",
+                node, fn, fr, sgFn, dt, avgDt
             );
             RenderFont(*_fontFrameInfo, penPosition, res);
         }

From 8a567245e5d71cf5431f8fffd39a373059dd876c Mon Sep 17 00:00:00 2001
From: Alexander Bock <mail@alexanderbock.eu>
Date: Mon, 3 Feb 2025 19:50:29 +0100
Subject: [PATCH 701/701] Use the correct period lengths for Neptune and Uranus

Can do that now as we have an increased-range default SPICE kernel
---
 .../solarsystem/planets/neptune/trail.asset   | 13 +----------
 .../solarsystem/planets/uranus/trail.asset    |  2 +-
 modules/galaxy/shaders/points_vs.glsl         | 22 +++++++++----------
 3 files changed, 13 insertions(+), 24 deletions(-)

diff --git a/data/assets/scene/solarsystem/planets/neptune/trail.asset b/data/assets/scene/solarsystem/planets/neptune/trail.asset
index 37596384bb..80dea527af 100644
--- a/data/assets/scene/solarsystem/planets/neptune/trail.asset
+++ b/data/assets/scene/solarsystem/planets/neptune/trail.asset
@@ -14,18 +14,7 @@ local NeptuneTrail = {
       Observer = coreKernels.ID.SolarSystemBarycenter
     },
     Color = { 0.2, 0.5, 1.0 },
-    -- Period = 60200,
-    -- Yes, this period is wrong, but the SPICE kernel we load by default only
-    -- goes back to 1850.  Neptunes orbit is 164 years, which would mean that we
-    -- exceed the SPICE kernel if we go back before 2014, if we try to compute the
-    -- entire orbit.  Cutting the orbit length to 100 years allows us to go back
-    -- to 1950 instead, which is good enough.
-    -- If the positions are needed before that, a different set of kernels are
-    -- needed, namely:
-    -- https://naif.jpl.nasa.gov/pub/naif/generic_kernels/spk/planets/de431_part-1.bsp
-    -- https://naif.jpl.nasa.gov/pub/naif/generic_kernels/spk/planets/de431_part-2.bsp
-    -- that cover a larger time span:  -13201-MAY-06 00:00 to  17191-MAR-15 00:00
-    Period = 36500,
+    Period = 60189.018,
     Resolution = 1000
   },
   Tag = { "planetTrail_solarSystem", "planetTrail_giants" },
diff --git a/data/assets/scene/solarsystem/planets/uranus/trail.asset b/data/assets/scene/solarsystem/planets/uranus/trail.asset
index f48433f149..ef649343ca 100644
--- a/data/assets/scene/solarsystem/planets/uranus/trail.asset
+++ b/data/assets/scene/solarsystem/planets/uranus/trail.asset
@@ -14,7 +14,7 @@ local UranusTrail = {
       Observer = coreKernels.ID.SolarSystemBarycenter
     },
     Color = { 0.60, 0.95, 1.00 },
-    Period = 30588.740,
+    Period = 30685.4,
     Resolution = 1000
   },
   Tag = { "planetTrail_solarSystem", "planetTrail_giants" },
diff --git a/modules/galaxy/shaders/points_vs.glsl b/modules/galaxy/shaders/points_vs.glsl
index bf13c8255b..e6afd467ac 100644
--- a/modules/galaxy/shaders/points_vs.glsl
+++ b/modules/galaxy/shaders/points_vs.glsl
@@ -42,18 +42,18 @@ const double PARSEC = 3.08567756E16;
 
 
 void main() {
-	vs_position = vec4(in_position, 1.0);
-	dvec4 dpos = dvec4(vs_position);
+  vs_position = vec4(in_position, 1.0);
+  dvec4 dpos = dvec4(vs_position);
 
-	double distanceToStar = length(dpos.xyz - eyePosition);
-	vs_starBrightness = clamp(float(8000.0 * PARSEC / distanceToStar), 0.0, 1.0);
+  double distanceToStar = length(dpos.xyz - eyePosition);
+  vs_starBrightness = clamp(float(8000.0 * PARSEC / distanceToStar), 0.0, 1.0);
 
-	dpos.xyz *= 8.0;
-	dpos = modelMatrix * dpos;
-	dpos /= PARSEC;
+  dpos.xyz *= 8.0;
+  dpos = modelMatrix * dpos;
+  dpos /= PARSEC;
 
-	vec4 positionScreenSpace = z_normalization(vec4(viewProjectionMatrix * dpos));
-	vs_color = in_color;
-	vs_screenSpaceDepth = positionScreenSpace.w;
-	gl_Position = positionScreenSpace;
+  vec4 positionScreenSpace = z_normalization(vec4(viewProjectionMatrix * dpos));
+  vs_color = in_color;
+  vs_screenSpaceDepth = positionScreenSpace.w;
+  gl_Position = positionScreenSpace;
 }